diff --git a/.gitignore b/.gitignore
index bc60297aa..91dbe985b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ awscpu
 
 .coverage
 
-bin/
+# bin/
 build/
 vendor
 
diff --git a/.gitmodules b/.gitmodules
index ab3130d82..a22f89cdc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,23 @@
 [submodule "aptos-core"]
-	path = third-party/aptos-core
+	path = vendors/aptos-core
 	url = https://github.com/movemntdev/aptos-core
 	branch = m1
 [submodule "x25519-dalek"]
-	path = third-party/x25519-dalek
+	path = vendors/x25519-dalek
 	url = https://github.com/movemntdev/x25519-dalek
 [submodule "ed25519-dalek"]
-	path = third-party/ed25519-dalek
+	path = vendors/ed25519-dalek
 	url = https://github.com/movemntdev/ed25519-dalek
 [submodule "ecosystem/evm-runtime"]
 	path = ecosystem/evm-runtime
 	url = https://github.com/movemntdev/move-evm-swap-backend
 [submodule "ecosystem/subnet-request-proxy"]
-	path = ecosystem/subnet-request-proxy
+	path = m1/subnet-request-proxy
 	url = https://github.com/movemntdev/subnet-request-proxy
 [submodule "aptos-pre-core-v2"]
-	path = third-party/aptos-core-1.7
+	path = vendors/aptos-core-1.7
 	url = https://github.com/movemntdev/aptos-core
 	branch = testnet
+[submodule "m1/third-party/sui"]
+	path = vendors/sui
+	url = https://github.com/movemntdev/sui
diff --git a/canonical/.cargo/config.toml b/canonical/.cargo/config.toml
new file mode 100644
index 000000000..f93b5556e
--- /dev/null
+++ b/canonical/.cargo/config.toml
@@ -0,0 +1,33 @@
+[alias]
+xclippy = [
+  "clippy",
+  "--workspace",
+  "--all-targets",
+  "--",
+  "-Dwarnings",
+  "-Wclippy::all",
+  "-Aclippy::upper_case_acronyms",
+  "-Aclippy::enum-variant-names",
+  "-Aclippy::result-large-err",
+  "-Aclippy::mutable-key-type",
+]
+
+[build]
+rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
+
+# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
+
+# 64 bit MSVC
+[target.x86_64-pc-windows-msvc]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-C",
+  "force-frame-pointers=yes",
+  "-C",
+  "force-unwind-tables=yes",
+  "-C",
+  "link-arg=/STACK:8000000" # Set stack to 8 MB
+]
diff --git a/canonical/.gitignore b/canonical/.gitignore
new file mode 100644
index 000000000..1de565933
--- /dev/null
+++ b/canonical/.gitignore
@@ -0,0 +1 @@
+target
\ No newline at end of file
diff --git a/canonical/Cargo.lock b/canonical/Cargo.lock
new file mode 100644
index 000000000..83fd646a5
--- /dev/null
+++ b/canonical/Cargo.lock
@@ -0,0 +1,11695 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
+[[package]]
+name = "ahash"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+dependencies = [
+ "getrandom 0.2.10",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy 0.7.25",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anemo"
+version = "0.0.0"
+source = "git+https://github.com/mystenlabs/anemo.git?rev=1169850e6af127397068cd86764c29b1d49dbe35#1169850e6af127397068cd86764c29b1d49dbe35"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "bincode",
+ "bytes",
+ "ed25519",
+ "futures 0.3.28",
+ "hex",
+ "http",
+ "matchit 0.5.0",
+ "pin-project-lite",
+ "pkcs8 0.9.0",
+ "quinn",
+ "quinn-proto",
+ "rand 0.8.5",
+ "rcgen 0.9.3",
+ "ring 0.16.20",
+ "rustls",
+ "rustls-webpki",
+ "serde 1.0.190",
+ "serde_json",
+ "socket2 0.5.5",
+ "tap",
+ "thiserror",
+ "tokio",
+ "tokio-util 0.7.10",
+ "tower",
+ "tracing",
+ "x509-parser 0.14.0",
+]
+
+[[package]]
+name = "anemo-build"
+version = "0.0.0"
+source = "git+https://github.com/mystenlabs/anemo.git?rev=1169850e6af127397068cd86764c29b1d49dbe35#1169850e6af127397068cd86764c29b1d49dbe35"
+dependencies = [
+ "prettyplease 0.1.25",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "anemo-tower"
+version = "0.0.0"
+source = "git+https://github.com/mystenlabs/anemo.git?rev=1169850e6af127397068cd86764c29b1d49dbe35#1169850e6af127397068cd86764c29b1d49dbe35"
+dependencies = [
+ "anemo",
+ "bytes",
+ "dashmap",
+ "futures 0.3.28",
+ "governor",
+ "nonzero_ext",
+ "pin-project-lite",
+ "tokio",
+ "tower",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+dependencies = [
+ "backtrace",
+]
+
+[[package]]
+name = "aptos-aggregator"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-state-view",
+ "aptos-types",
+ "bcs 0.1.4",
+ "better_any",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-table-extension",
+ "once_cell",
+ "smallvec",
+]
+
+[[package]]
+name = "aptos-bitvec"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "serde 1.0.190",
+ "serde_bytes",
+]
+
+[[package]]
+name = "aptos-block-executor"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-aggregator",
+ "aptos-infallible",
+ "aptos-logger",
+ "aptos-metrics-core",
+ "aptos-mvhashmap",
+ "aptos-state-view",
+ "aptos-types",
+ "aptos-vm-logging",
+ "arc-swap",
+ "bcs 0.1.4",
+ "crossbeam",
+ "dashmap",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "num_cpus",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "rayon",
+]
+
+[[package]]
+name = "aptos-block-partitioner"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-logger",
+ "aptos-metrics-core",
+ "aptos-types",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "dashmap",
+ "itertools 0.10.5",
+ "move-core-types 0.0.4-canonical-aptos",
+ "once_cell",
+ "rand 0.7.3",
+ "rayon",
+]
+
+[[package]]
+name = "aptos-crypto"
+version = "0.0.3-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-crypto-derive",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+ "bcs 0.1.4",
+ "blst",
+ "bytes",
+ "curve25519-dalek",
+ "digest 0.9.0",
+ "ed25519-dalek",
+ "hex",
+ "hkdf 0.10.0",
+ "libsecp256k1",
+ "more-asserts",
+ "once_cell",
+ "proptest",
+ "proptest-derive",
+ "rand 0.7.3",
+ "rand_core 0.5.1",
+ "ring 0.16.20",
+ "serde 1.0.190",
+ "serde-name 0.1.2",
+ "serde_bytes",
+ "sha2 0.10.8",
+ "sha2 0.9.9",
+ "static_assertions",
+ "thiserror",
+ "tiny-keccak",
+ "x25519-dalek",
+]
+
+[[package]]
+name = "aptos-crypto-derive"
+version = "0.0.3-canonical-aptos"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "aptos-framework"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-aggregator",
+ "aptos-crypto",
+ "aptos-gas-algebra-ext",
+ "aptos-move-stdlib",
+ "aptos-sdk-builder",
+ "aptos-state-view",
+ "aptos-types",
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "base64 0.13.1",
+ "bcs 0.1.4",
+ "better_any",
+ "blake2-rfc",
+ "blst",
+ "clap 4.4.7",
+ "codespan-reporting",
+ "curve25519-dalek",
+ "flate2",
+ "hex",
+ "include_dir 0.7.3",
+ "itertools 0.10.5",
+ "libsecp256k1",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-docgen 0.1.0-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "move-package 0.1.0-canonical-aptos",
+ "move-prover 0.1.0-canonical-aptos",
+ "move-prover-boogie-backend 0.1.0-canonical-aptos",
+ "move-stackless-bytecode 0.1.0-canonical-aptos",
+ "move-table-extension",
+ "move-vm-runtime 0.1.0-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "num-traits 0.2.17",
+ "once_cell",
+ "rand 0.7.3",
+ "rand_core 0.5.1",
+ "rayon",
+ "ripemd",
+ "serde 1.0.190",
+ "serde_bytes",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "sha2 0.10.8",
+ "sha2 0.9.9",
+ "sha3 0.9.1",
+ "siphasher",
+ "smallvec",
+ "tempfile",
+ "thiserror",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "aptos-gas"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-framework",
+ "aptos-gas-algebra-ext",
+ "aptos-global-constants",
+ "aptos-logger",
+ "aptos-move-stdlib",
+ "aptos-package-builder",
+ "aptos-types",
+ "aptos-vm-types",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "move-table-extension",
+ "move-vm-types 0.1.0-canonical-aptos",
+]
+
+[[package]]
+name = "aptos-gas-algebra-ext"
+version = "0.0.1-canonical-aptos"
+dependencies = [
+ "move-core-types 0.0.4-canonical-aptos",
+]
+
+[[package]]
+name = "aptos-global-constants"
+version = "0.1.0-canonical-aptos"
+
+[[package]]
+name = "aptos-infallible"
+version = "0.1.0-canonical-aptos"
+
+[[package]]
+name = "aptos-log-derive"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "aptos-logger"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "aptos-infallible",
+ "aptos-log-derive",
+ "aptos-node-identity",
+ "backtrace",
+ "chrono",
+ "erased-serde",
+ "futures 0.3.28",
+ "hostname",
+ "once_cell",
+ "prometheus",
+ "serde 1.0.190",
+ "serde_json",
+ "strum",
+ "strum_macros",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "aptos-memory-usage-tracker"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "aptos-gas",
+ "aptos-types",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+]
+
+[[package]]
+name = "aptos-metrics-core"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "prometheus",
+]
+
+[[package]]
+name = "aptos-move-stdlib"
+version = "0.1.1-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "hex",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-docgen 0.1.0-canonical-aptos",
+ "move-errmapgen 0.1.0-canonical-aptos",
+ "move-prover 0.1.0-canonical-aptos",
+ "move-vm-runtime 0.1.0-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "sha2 0.9.9",
+ "sha3 0.9.1",
+ "smallvec",
+ "walkdir",
+]
+
+[[package]]
+name = "aptos-mvhashmap"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-aggregator",
+ "aptos-crypto",
+ "aptos-infallible",
+ "aptos-types",
+ "bcs 0.1.4",
+ "crossbeam",
+ "dashmap",
+]
+
+[[package]]
+name = "aptos-node-identity"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-types",
+ "claims",
+ "hostname",
+ "once_cell",
+]
+
+[[package]]
+name = "aptos-package-builder"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-framework",
+ "itertools 0.10.5",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-package 0.1.0-canonical-aptos",
+ "tempfile",
+]
+
+[[package]]
+name = "aptos-scratchpad"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "aptos-crypto",
+ "aptos-infallible",
+ "aptos-metrics-core",
+ "aptos-types",
+ "bitvec 1.0.1",
+ "itertools 0.10.5",
+ "once_cell",
+ "rayon",
+ "thiserror",
+]
+
+[[package]]
+name = "aptos-sdk-builder"
+version = "0.2.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-types",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "heck 0.3.3",
+ "move-core-types 0.0.4-canonical-aptos",
+ "once_cell",
+ "regex",
+ "serde-generate",
+ "serde-reflection 0.3.5",
+ "serde_yaml 0.8.26",
+ "textwrap 0.15.2",
+]
+
+[[package]]
+name = "aptos-secure-net"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "aptos-logger",
+ "aptos-metrics-core",
+ "once_cell",
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "aptos-speculative-state-helper"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-infallible",
+ "crossbeam",
+ "once_cell",
+ "rayon",
+]
+
+[[package]]
+name = "aptos-state-view"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-types",
+ "bcs 0.1.4",
+ "serde 1.0.190",
+ "serde_bytes",
+ "serde_json",
+]
+
+[[package]]
+name = "aptos-storage-interface"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-crypto",
+ "aptos-logger",
+ "aptos-metrics-core",
+ "aptos-scratchpad",
+ "aptos-secure-net",
+ "aptos-state-view",
+ "aptos-types",
+ "aptos-vm",
+ "arr_macro",
+ "bcs 0.1.4",
+ "crossbeam-channel",
+ "dashmap",
+ "itertools 0.10.5",
+ "move-core-types 0.0.4-canonical-aptos",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "rayon",
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "aptos-types"
+version = "0.0.3-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-bitvec",
+ "aptos-crypto",
+ "aptos-crypto-derive",
+ "arr_macro",
+ "bcs 0.1.4",
+ "chrono",
+ "derivative",
+ "hex",
+ "itertools 0.10.5",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-table-extension",
+ "num-derive",
+ "num-traits 0.2.17",
+ "once_cell",
+ "rand 0.7.3",
+ "rayon",
+ "serde 1.0.190",
+ "serde_bytes",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "thiserror",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "aptos-utils"
+version = "0.1.0-canonical-aptos"
+
+[[package]]
+name = "aptos-vm"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-aggregator",
+ "aptos-block-executor",
+ "aptos-block-partitioner",
+ "aptos-crypto",
+ "aptos-crypto-derive",
+ "aptos-framework",
+ "aptos-gas",
+ "aptos-infallible",
+ "aptos-logger",
+ "aptos-memory-usage-tracker",
+ "aptos-metrics-core",
+ "aptos-move-stdlib",
+ "aptos-mvhashmap",
+ "aptos-state-view",
+ "aptos-types",
+ "aptos-utils",
+ "aptos-vm-logging",
+ "aptos-vm-types",
+ "bcs 0.1.4",
+ "dashmap",
+ "fail 0.5.1",
+ "futures 0.3.28",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-utils 0.1.0-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-table-extension",
+ "move-vm-runtime 0.1.0-canonical-aptos",
+ "move-vm-test-utils 0.1.0-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "num_cpus",
+ "once_cell",
+ "ouroboros 0.15.6",
+ "rand 0.7.3",
+ "rayon",
+ "serde 1.0.190",
+ "serde_json",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "aptos-vm-logging"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "aptos-crypto",
+ "aptos-logger",
+ "aptos-metrics-core",
+ "aptos-speculative-state-helper",
+ "aptos-state-view",
+ "aptos-types",
+ "arc-swap",
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "aptos-vm-types"
+version = "0.0.1-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "aptos-aggregator",
+ "aptos-state-view",
+ "aptos-types",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "ark-bls12-381"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bn254"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "ark-std",
+ "blake2",
+ "derivative",
+ "digest 0.10.7",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools 0.10.5",
+ "num-traits 0.2.17",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.7",
+ "itertools 0.10.5",
+ "num-bigint",
+ "num-traits 0.2.17",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits 0.2.17",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc"
+dependencies = [
+ "ark-crypto-primitives",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
+dependencies = [
+ "ark-ff",
+ "ark-std",
+ "tracing",
+]
+
+[[package]]
+name = "ark-secp256r1"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3975a01b0a6e3eae0f72ec7ca8598a6620fc72fa5981f6f5cca33b7cd788f633"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
+dependencies = [
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits 0.2.17",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "arr_macro"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a105bfda48707cf19220129e78fca01e9639433ffaef4163546ed8fb04120a5"
+dependencies = [
+ "arr_macro_impl",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "arr_macro_impl"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
+dependencies = [
+ "proc-macro-hack",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+dependencies = [
+ "nodrop",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "asn1-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+dependencies = [
+ "asn1-rs-derive",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom 7.1.3",
+ "num-traits 0.2.17",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
+dependencies = [
+ "brotli",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "async-task"
+version = "4.3.0"
+source = "git+https://github.com/mystenmark/async-task?rev=4e45b26e11126b191701b9b2ce5e2346b8d7682f#4e45b26e11126b191701b9b2ce5e2346b8d7682f"
+
+[[package]]
+name = "async-trait"
+version = "0.1.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "atomic_float"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62af46d040ba9df09edc6528dae9d8e49f5f3e82f55b7d2ec31a733c38dbc49d"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "auto_impl"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "auto_ops"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "autotools"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "avalanche-types"
+version = "0.0.398"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94736aaa736be8376620b7dd3714d4c65a6d8740457e76277dd6ad93d19f7e64"
+dependencies = [
+ "async-trait",
+ "base64 0.21.5",
+ "bech32",
+ "blst",
+ "bs58 0.5.0",
+ "bytes",
+ "cert-manager",
+ "chrono",
+ "cmp-manager",
+ "ecdsa 0.16.8",
+ "ethers-core",
+ "futures 0.3.28",
+ "hex",
+ "hmac 0.12.1",
+ "http",
+ "hyper",
+ "jsonrpc-core",
+ "k256 0.13.1",
+ "lazy_static 1.4.0",
+ "log",
+ "num-derive",
+ "num-traits 0.2.17",
+ "prefix-manager",
+ "primitive-types 0.12.2",
+ "prost 0.11.9",
+ "protoc-gen-prost",
+ "protoc-gen-tonic",
+ "rand 0.8.5",
+ "ring 0.16.20",
+ "ripemd",
+ "rust-embed",
+ "semver",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 3.4.0",
+ "serde_yaml 0.9.27",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "spki 0.7.2",
+ "strum",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+ "tonic-health 0.9.2",
+ "tonic-reflection",
+ "tower-service",
+ "url 2.4.1",
+ "zerocopy 0.6.5",
+ "zeroize",
+]
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "base64 0.21.5",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "headers",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit 0.7.3",
+ "memchr",
+ "mime",
+ "percent-encoding 2.3.0",
+ "pin-project-lite",
+ "rustversion",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
+ "sync_wrapper",
+ "tokio",
+ "tokio-tungstenite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-server"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063"
+dependencies = [
+ "arc-swap",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "backoff"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
+dependencies = [
+ "futures-core",
+ "getrandom 0.2.10",
+ "instant",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "tokio",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base-x"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+
+[[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "base64-url"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c5b0a88aa36e9f095ee2e2b13fb8c5e4313e022783aedacc123328c0084916d"
+dependencies = [
+ "base64 0.21.5",
+]
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bcs"
+version = "0.1.4"
+source = "git+https://github.com/aptos-labs/bcs.git?rev=d31fab9d81748e2594be5cd5cdf845786a30562d#d31fab9d81748e2594be5cd5cdf845786a30562d"
+dependencies = [
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "bcs"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a"
+dependencies = [
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
+[[package]]
+name = "better_any"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b359aebd937c17c725e19efcb661200883f04c49c53e7132224dac26da39d4a0"
+dependencies = [
+ "better_typeid_derive",
+]
+
+[[package]]
+name = "better_typeid_derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.65.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static 1.4.0",
+ "lazycell",
+ "peeking_take_while",
+ "prettyplease 0.2.15",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "bip32"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30ed1d6f8437a487a266c8293aeb95b61a23261273e3e02912cdb8b68bf798b"
+dependencies = [
+ "bs58 0.4.0",
+ "hmac 0.12.1",
+ "k256 0.11.6",
+ "once_cell",
+ "pbkdf2",
+ "rand_core 0.6.4",
+ "ripemd",
+ "sha2 0.10.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitcoin-private"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
+dependencies = [
+ "bitcoin-private",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
+[[package]]
+name = "bitmaps"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "bitvec"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+dependencies = [
+ "funty 1.1.0",
+ "radium 0.6.2",
+ "tap",
+ "wyz 0.2.0",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty 2.0.0",
+ "radium 0.7.0",
+ "tap",
+ "wyz 0.5.1",
+]
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "blake2-rfc"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
+dependencies = [
+ "arrayvec 0.4.12",
+ "constant_time_eq 0.1.5",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "cc",
+ "cfg-if",
+ "constant_time_eq 0.3.0",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "block-padding 0.2.1",
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blst"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b"
+dependencies = [
+ "cc",
+ "glob",
+ "threadpool",
+ "zeroize",
+]
+
+[[package]]
+name = "brotli"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+dependencies = [
+ "sha2 0.9.9",
+]
+
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "sha2 0.10.8",
+ "tinyvec",
+]
+
+[[package]]
+name = "bstr"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
+dependencies = [
+ "memchr",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "bulletproofs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40e698f1df446cc6246afd823afbe2d121134d089c9102c1dd26d1264991ba32"
+dependencies = [
+ "byteorder",
+ "clear_on_drop",
+ "curve25519-dalek-ng",
+ "digest 0.9.0",
+ "merlin",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "serde 1.0.190",
+ "serde_derive",
+ "sha3 0.9.1",
+ "subtle-ng",
+ "thiserror",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "bytecount"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
+
+[[package]]
+name = "bytemuck"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "bytes-varint"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54c1820c7c366b9d26c47143e1604454105a59969aade54e4f695d96acc8332f"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+
+[[package]]
+name = "canonical-block-executor"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-channel",
+ "avalanche-types",
+ "base64 0.21.5",
+ "bcs 0.1.6",
+ "bytes",
+ "chrono",
+ "derivative",
+ "dirs 5.0.1",
+ "env_logger",
+ "futures 0.3.28",
+ "hex",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "log",
+ "movement-sdk",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sui-adapter-latest",
+ "sui-core",
+ "sui-types",
+ "tokio",
+ "tonic 0.8.3",
+]
+
+[[package]]
+name = "canonical-move-natives"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-channel",
+ "avalanche-types",
+ "base64 0.21.5",
+ "bcs 0.1.6",
+ "bytes",
+ "chrono",
+ "derivative",
+ "dirs 5.0.1",
+ "env_logger",
+ "futures 0.3.28",
+ "hex",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "log",
+ "movement-sdk",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sui-adapter-latest",
+ "sui-types",
+ "tokio",
+ "tonic 0.8.3",
+]
+
+[[package]]
+name = "canonical-move-resolver"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-storage-interface",
+ "async-channel",
+ "avalanche-types",
+ "base64 0.21.5",
+ "bcs 0.1.6",
+ "bytes",
+ "chrono",
+ "derivative",
+ "dirs 5.0.1",
+ "env_logger",
+ "futures 0.3.28",
+ "hex",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "log",
+ "movement-sdk",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sui-adapter-latest",
+ "sui-types",
+ "tokio",
+ "tonic 0.8.3",
+]
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cert-manager"
+version = "0.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "166da6fda67aa44381158b8ad9c3b28d842951791c431ce61333e62cb9b05d5b"
+dependencies = [
+ "log",
+ "rand 0.8.5",
+ "random-manager",
+ "rcgen 0.10.0",
+ "rsa 0.9.3",
+ "rustls",
+ "rustls-pemfile",
+ "x509-parser 0.15.1",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom 7.1.3",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits 0.2.17",
+ "serde 1.0.190",
+ "wasm-bindgen",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "chrono-tz"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76"
+dependencies = [
+ "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
+dependencies = [
+ "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "claims"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6995bbe186456c36307f8ea36be3eefe42f49d106896414e18efc4fb2f846b5"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim 0.8.0",
+ "textwrap 0.11.0",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "clap"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.10.0",
+ "terminal_size",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+
+[[package]]
+name = "clear_on_drop"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38508a63f4979f0048febc9966fadbd48e5dab31fd0ec6a3f151bbf4a74f7423"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cmp-manager"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f5e2b424191b35b798b06e6c67fa5a5440a098925d931d7e91511d7d8fe275"
+
+[[package]]
+name = "codespan"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e"
+dependencies = [
+ "codespan-reporting",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "serde 1.0.190",
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "collectable"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08abddbaad209601e53c7dd4308d8c04c06f17bb7df006434e586a22b83be45a"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "colored"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+dependencies = [
+ "is-terminal",
+ "lazy_static 1.4.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "config"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
+dependencies = [
+ "lazy_static 1.4.0",
+ "nom 5.1.3",
+ "rust-ini",
+ "serde 1.0.190",
+ "serde-hjson",
+ "serde_json",
+ "toml",
+ "yaml-rust",
+]
+
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static 1.4.0",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
+dependencies = [
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags 1.3.2",
+ "crossterm_winapi",
+ "libc",
+ "mio",
+ "parking_lot 0.12.1",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "typenum",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-ng"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "serde 1.0.190",
+ "subtle-ng",
+ "zeroize",
+]
+
+[[package]]
+name = "darling"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+dependencies = [
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core 0.20.3",
+ "darling_macro 0.20.3",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "strsim 0.10.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "strsim 0.10.0",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+dependencies = [
+ "darling_core 0.14.4",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core 0.20.3",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.2",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
+[[package]]
+name = "data-encoding-macro"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
+dependencies = [
+ "data-encoding",
+ "data-encoding-macro-internal",
+]
+
+[[package]]
+name = "data-encoding-macro-internal"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
+dependencies = [
+ "data-encoding",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "der"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468 0.6.0",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468 0.7.0",
+ "zeroize",
+]
+
+[[package]]
+name = "der-parser"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+dependencies = [
+ "asn1-rs",
+ "displaydoc",
+ "nom 7.1.3",
+ "num-bigint",
+ "num-traits 0.2.17",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+dependencies = [
+ "darling 0.14.4",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+dependencies = [
+ "derive_builder_core",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case 0.4.0",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "deunicode"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6"
+
+[[package]]
+name = "difference"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+
+[[package]]
+name = "difflib"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer 0.10.4",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "directories"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+
+[[package]]
+name = "ecdsa"
+version = "0.14.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+dependencies = [
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+dependencies = [
+ "der 0.7.8",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.6",
+ "rfc6979 0.4.0",
+ "signature 2.1.0",
+ "spki 0.7.2",
+]
+
+[[package]]
+name = "ed25519"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+dependencies = [
+ "pkcs8 0.9.0",
+ "serde 1.0.190",
+ "signature 1.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "ed25519-consensus"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b"
+dependencies = [
+ "curve25519-dalek-ng",
+ "hex",
+ "rand_core 0.6.4",
+ "serde 1.0.190",
+ "sha2 0.9.9",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand 0.7.3",
+ "serde 1.0.190",
+ "serde_bytes",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+dependencies = [
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest 0.10.7",
+ "ff 0.12.1",
+ "generic-array",
+ "group 0.12.1",
+ "rand_core 0.6.4",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.3",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pem-rfc7468 0.7.0",
+ "pkcs8 0.10.2",
+ "rand_core 0.6.4",
+ "sec1 0.7.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "enum-compat-util"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "serde_yaml 0.8.26",
+]
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
+dependencies = [
+ "once_cell",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "erasable"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f11890ce181d47a64e5d1eb4b6caba0e7bae911a356723740d058a5d0340b7d"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "erased-serde"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ethabi"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
+dependencies = [
+ "ethereum-types",
+ "hex",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+ "serde_json",
+ "sha3 0.10.8",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash 0.8.0",
+ "impl-codec 0.6.0",
+ "impl-rlp",
+ "impl-serde 0.4.0",
+ "scale-info",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash 0.8.0",
+ "impl-codec 0.6.0",
+ "impl-rlp",
+ "impl-serde 0.4.0",
+ "primitive-types 0.12.2",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "ethers-core"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6da5fa198af0d3be20c19192df2bd9590b92ce09a8421e793bec8851270f1b05"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bytes",
+ "chrono",
+ "elliptic-curve 0.13.6",
+ "ethabi",
+ "generic-array",
+ "hex",
+ "k256 0.13.1",
+ "num_enum",
+ "open-fastrlp",
+ "rand 0.8.5",
+ "rlp",
+ "serde 1.0.190",
+ "serde_json",
+ "strum",
+ "tempfile",
+ "thiserror",
+ "tiny-keccak",
+ "unicode-xid 0.2.4",
+]
+
+[[package]]
+name = "ethnum"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c"
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fail"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6"
+dependencies = [
+ "lazy_static 1.4.0",
+ "log",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "fail"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c"
+dependencies = [
+ "log",
+ "once_cell",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "fastcrypto"
+version = "0.1.7"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=517ec93ad2eba1807c9508f14953814a33523edc#517ec93ad2eba1807c9508f14953814a33523edc"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "ark-ec",
+ "ark-ff",
+ "ark-secp256r1",
+ "ark-serialize",
+ "auto_ops",
+ "base64ct",
+ "bincode",
+ "blake2",
+ "blake3",
+ "blst",
+ "bs58 0.4.0",
+ "bulletproofs",
+ "cbc",
+ "ctr",
+ "curve25519-dalek-ng",
+ "derive_more",
+ "digest 0.10.7",
+ "ecdsa 0.16.8",
+ "ed25519-consensus",
+ "elliptic-curve 0.13.6",
+ "eyre",
+ "fastcrypto-derive",
+ "generic-array",
+ "hex",
+ "hkdf 0.12.3",
+ "lazy_static 1.4.0",
+ "merlin",
+ "once_cell",
+ "p256",
+ "rand 0.8.5",
+ "readonly",
+ "rfc6979 0.4.0",
+ "rsa 0.8.2",
+ "schemars",
+ "secp256k1",
+ "serde 1.0.190",
+ "serde_bytes",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "signature 2.1.0",
+ "static_assertions",
+ "thiserror",
+ "tokio",
+ "typenum",
+ "zeroize",
+]
+
+[[package]]
+name = "fastcrypto-derive"
+version = "0.1.3"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=517ec93ad2eba1807c9508f14953814a33523edc#517ec93ad2eba1807c9508f14953814a33523edc"
+dependencies = [
+ "convert_case 0.6.0",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "fastcrypto-tbls"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=517ec93ad2eba1807c9508f14953814a33523edc#517ec93ad2eba1807c9508f14953814a33523edc"
+dependencies = [
+ "bcs 0.1.6",
+ "bincode",
+ "digest 0.10.7",
+ "fastcrypto",
+ "fastcrypto-derive",
+ "hex",
+ "itertools 0.10.5",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "sha3 0.10.8",
+ "tap",
+ "tracing",
+ "typenum",
+ "zeroize",
+]
+
+[[package]]
+name = "fastcrypto-zkp"
+version = "0.1.2"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=517ec93ad2eba1807c9508f14953814a33523edc#517ec93ad2eba1807c9508f14953814a33523edc"
+dependencies = [
+ "ark-bls12-381",
+ "ark-bn254",
+ "ark-ec",
+ "ark-ff",
+ "ark-groth16",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "bcs 0.1.6",
+ "blst",
+ "byte-slice-cast",
+ "derive_more",
+ "fastcrypto",
+ "im",
+ "num-bigint",
+ "once_cell",
+ "poseidon-ark",
+ "regex",
+ "reqwest",
+ "rustls-webpki",
+ "schemars",
+ "serde 1.0.190",
+ "serde_json",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "fdlimit"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ff"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+dependencies = [
+ "byteorder",
+ "rand 0.8.5",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand 0.8.5",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flate2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "fnv"
+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.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding 2.3.0",
+]
+
+[[package]]
+name = "fragile"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+ "num_cpus",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+
+[[package]]
+name = "futures-task"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+
+[[package]]
+name = "futures-timer"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+
+[[package]]
+name = "futures-util"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+dependencies = [
+ "futures 0.1.31",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "serde 1.0.190",
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gettid"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34b20f40277dfb8a9dec7e2e945f6d8ff711e733c8f2a2c9b257562764b4c60d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "git-version"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c"
+dependencies = [
+ "git-version-macro",
+]
+
+[[package]]
+name = "git-version-macro"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "globset"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "globwalk"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
+dependencies = [
+ "bitflags 1.3.2",
+ "ignore",
+ "walkdir",
+]
+
+[[package]]
+name = "governor"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
+dependencies = [
+ "cfg-if",
+ "dashmap",
+ "futures 0.3.28",
+ "futures-timer",
+ "no-std-compat",
+ "nonzero_ext",
+ "parking_lot 0.12.1",
+ "quanta",
+ "rand 0.8.5",
+ "smallvec",
+]
+
+[[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util 0.7.10",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.7",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash 0.8.6",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "hdrhistogram"
+version = "7.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
+dependencies = [
+ "base64 0.13.1",
+ "byteorder",
+ "crossbeam-channel",
+ "flate2",
+ "nom 7.1.3",
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64 0.21.5",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f"
+dependencies = [
+ "digest 0.9.0",
+ "hmac 0.10.1",
+]
+
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac 0.12.1",
+]
+
+[[package]]
+name = "hmac"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
+dependencies = [
+ "crypto-mac 0.8.0",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
+dependencies = [
+ "crypto-mac 0.10.1",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "hmac-drbg"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
+dependencies = [
+ "digest 0.9.0",
+ "generic-array",
+ "hmac 0.8.1",
+]
+
+[[package]]
+name = "hmac-sha512"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e806677ce663d0a199541030c816847b36e8dc095f70dae4a4f4ad63da5383"
+
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
+]
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-range-header"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.4.10",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[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.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "ignore"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+dependencies = [
+ "globset",
+ "lazy_static 1.4.0",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
+
+[[package]]
+name = "im"
+version = "15.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
+dependencies = [
+ "bitmaps",
+ "rand_core 0.6.4",
+ "rand_xoshiro",
+ "sized-chunks",
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+dependencies = [
+ "parity-scale-codec 2.3.1",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec 3.6.5",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "include_dir"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b56e147e6187d61e9d0f039f10e070d0c0a887e24fe0bb9ca3f29bfde62cab"
+dependencies = [
+ "glob",
+ "include_dir_impl",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "include_dir"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+dependencies = [
+ "glob",
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_impl"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df"
+dependencies = [
+ "anyhow",
+ "proc-macro-hack",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding 0.3.3",
+ "generic-array",
+]
+
+[[package]]
+name = "insta"
+version = "1.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
+dependencies = [
+ "console",
+ "lazy_static 1.4.0",
+ "linked-hash-map",
+ "pest",
+ "pest_derive",
+ "serde 1.0.190",
+ "similar",
+ "yaml-rust",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "integer-encoding"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
+
+[[package]]
+name = "internment"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996"
+dependencies = [
+ "ahash 0.7.7",
+ "dashmap",
+ "hashbrown 0.12.3",
+ "once_cell",
+ "parking_lot 0.12.1",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "iri-string"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f0f7638c1e223529f1bfdc48c8b133b9e0b434094d1d28473161ee48b235f78"
+dependencies = [
+ "nom 7.1.3",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi 0.3.3",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "jobserver"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json_to_table"
+version = "0.6.0"
+source = "git+https://github.com/zhiburt/tabled/?rev=e449317a1c02eb6b29e409ad6617e5d9eb7b3bd4#e449317a1c02eb6b29e409ad6617e5d9eb7b3bd4"
+dependencies = [
+ "serde_json",
+ "tabled",
+]
+
+[[package]]
+name = "jsonrpc-client-transports"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
+dependencies = [
+ "derive_more",
+ "futures 0.3.28",
+ "jsonrpc-core",
+ "jsonrpc-pubsub",
+ "log",
+ "serde 1.0.190",
+ "serde_json",
+ "url 1.7.2",
+]
+
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+dependencies = [
+ "futures 0.3.28",
+ "futures-executor",
+ "futures-util",
+ "log",
+ "serde 1.0.190",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "jsonrpc-core-client"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
+dependencies = [
+ "futures 0.3.28",
+ "jsonrpc-client-transports",
+]
+
+[[package]]
+name = "jsonrpc-derive"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2"
+dependencies = [
+ "proc-macro-crate 0.1.5",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "jsonrpc-pubsub"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011"
+dependencies = [
+ "futures 0.3.28",
+ "jsonrpc-core",
+ "lazy_static 1.4.0",
+ "log",
+ "parking_lot 0.11.2",
+ "rand 0.7.3",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "k256"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.8",
+ "elliptic-curve 0.13.6",
+ "once_cell",
+ "sha2 0.10.8",
+ "signature 2.1.0",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin 0.5.2",
+]
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec 0.5.2",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "librocksdb-sys"
+version = "0.11.0+8.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
+dependencies = [
+ "bindgen",
+ "bzip2-sys",
+ "cc",
+ "glob",
+ "libc",
+ "libz-sys",
+ "lz4-sys",
+ "zstd-sys",
+]
+
+[[package]]
+name = "libsecp256k1"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
+dependencies = [
+ "arrayref",
+ "base64 0.13.1",
+ "digest 0.9.0",
+ "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "sha2 0.9.9",
+ "typenum",
+]
+
+[[package]]
+name = "libsecp256k1-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "lru"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "lz4-sys"
+version = "1.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "mach2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
+[[package]]
+name = "match_opt"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "405ba1524a1e6ae755334d6966380c60ec40157e0155f9032dd3c294b6384da9"
+
+[[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 = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "matchit"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "memmap2"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "merlin"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
+dependencies = [
+ "byteorder",
+ "keccak",
+ "rand_core 0.6.4",
+ "zeroize",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "minibytes"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/mysticeti?rev=318d61d27f47d257d99a86983d835e9e9756bc59#318d61d27f47d257d99a86983d835e9e9756bc59"
+dependencies = [
+ "memmap2",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mockall"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "lazy_static 1.4.0",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
+dependencies = [
+ "cfg-if",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "more-asserts"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
+
+[[package]]
+name = "move-abigen"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "heck 0.3.3",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-abigen"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "heck 0.3.3",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-abstract-stack"
+version = "0.0.1-canonical-sui"
+
+[[package]]
+name = "move-binary-format"
+version = "0.0.3-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "backtrace",
+ "indexmap 1.9.3",
+ "move-core-types 0.0.4-canonical-aptos",
+ "once_cell",
+ "ref-cast",
+ "serde 1.0.190",
+ "variant_count",
+]
+
+[[package]]
+name = "move-binary-format"
+version = "0.0.3-canonical-sui"
+dependencies = [
+ "anyhow",
+ "enum-compat-util",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-proc-macros",
+ "ref-cast",
+ "serde 1.0.190",
+ "variant_count",
+]
+
+[[package]]
+name = "move-borrow-graph"
+version = "0.0.1-canonical-aptos"
+
+[[package]]
+name = "move-borrow-graph"
+version = "0.0.1-canonical-sui"
+
+[[package]]
+name = "move-bytecode-source-map"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-bytecode-source-map"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-bytecode-utils"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "petgraph 0.5.1",
+ "serde-reflection 0.3.6",
+]
+
+[[package]]
+name = "move-bytecode-utils"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "petgraph 0.5.1",
+ "serde-reflection 0.3.6",
+]
+
+[[package]]
+name = "move-bytecode-verifier"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "fail 0.4.0",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-borrow-graph 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "petgraph 0.5.1",
+ "typed-arena",
+]
+
+[[package]]
+name = "move-bytecode-verifier"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-borrow-graph 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "petgraph 0.5.1",
+]
+
+[[package]]
+name = "move-bytecode-verifier-v0"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-borrow-graph 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "petgraph 0.5.1",
+]
+
+[[package]]
+name = "move-bytecode-verifier-v1"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-borrow-graph 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "petgraph 0.5.1",
+]
+
+[[package]]
+name = "move-command-line-common"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "difference",
+ "dirs-next",
+ "hex",
+ "move-core-types 0.0.4-canonical-aptos",
+ "num-bigint",
+ "once_cell",
+ "serde 1.0.190",
+ "sha2 0.9.9",
+ "walkdir",
+]
+
+[[package]]
+name = "move-command-line-common"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "difference",
+ "dirs-next",
+ "hex",
+ "move-core-types 0.0.4-canonical-sui",
+ "num-bigint",
+ "once_cell",
+ "serde 1.0.190",
+ "sha2 0.9.9",
+ "walkdir",
+]
+
+[[package]]
+name = "move-compiler"
+version = "0.0.1-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "codespan-reporting",
+ "difference",
+ "hex",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-borrow-graph 0.0.1-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-to-bytecode 0.1.0-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "num-bigint",
+ "once_cell",
+ "petgraph 0.5.1",
+ "regex",
+ "sha3 0.9.1",
+ "tempfile",
+ "walkdir",
+]
+
+[[package]]
+name = "move-compiler"
+version = "0.0.1-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "clap 4.4.7",
+ "codespan-reporting",
+ "hex",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-borrow-graph 0.0.1-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-to-bytecode 0.1.0-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "once_cell",
+ "petgraph 0.5.1",
+ "regex",
+ "serde 1.0.190",
+ "tempfile",
+]
+
+[[package]]
+name = "move-core-types"
+version = "0.0.4-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "ethnum",
+ "hex",
+ "num",
+ "once_cell",
+ "primitive-types 0.10.1",
+ "rand 0.8.5",
+ "ref-cast",
+ "serde 1.0.190",
+ "serde_bytes",
+ "uint",
+]
+
+[[package]]
+name = "move-core-types"
+version = "0.0.4-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "enum-compat-util",
+ "ethnum",
+ "hex",
+ "move-proc-macros",
+ "num",
+ "once_cell",
+ "primitive-types 0.10.1",
+ "rand 0.8.5",
+ "ref-cast",
+ "serde 1.0.190",
+ "serde_bytes",
+ "uint",
+]
+
+[[package]]
+name = "move-coverage"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "codespan",
+ "colored",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "once_cell",
+ "petgraph 0.5.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-coverage"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "clap 4.4.7",
+ "codespan",
+ "colored",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "petgraph 0.5.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-disassembler"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "clap 4.4.7",
+ "colored",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-coverage 0.1.0-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+]
+
+[[package]]
+name = "move-disassembler"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "clap 4.4.7",
+ "colored",
+ "hex",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-coverage 0.1.0-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+]
+
+[[package]]
+name = "move-docgen"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "itertools 0.10.5",
+ "log",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "num",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-docgen"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "itertools 0.10.5",
+ "log",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "num",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-errmapgen"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "log",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-errmapgen"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-ir-to-bytecode"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "codespan-reporting",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-to-bytecode-syntax 0.1.0-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "ouroboros 0.9.5",
+ "thiserror",
+]
+
+[[package]]
+name = "move-ir-to-bytecode"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "codespan-reporting",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-to-bytecode-syntax 0.1.0-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "ouroboros 0.17.2",
+]
+
+[[package]]
+name = "move-ir-to-bytecode-syntax"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "hex",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+]
+
+[[package]]
+name = "move-ir-to-bytecode-syntax"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "hex",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+]
+
+[[package]]
+name = "move-ir-types"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "hex",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-ir-types"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "hex",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-model"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "internment",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-disassembler 0.1.0-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "num",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+ "trace",
+]
+
+[[package]]
+name = "move-model"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "internment",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-disassembler 0.1.0-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "num",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-package"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "clap 4.4.7",
+ "colored",
+ "dirs-next",
+ "itertools 0.10.5",
+ "move-abigen 0.1.0-canonical-aptos",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-source-map 0.1.0-canonical-aptos",
+ "move-bytecode-utils 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-docgen 0.1.0-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "move-symbol-pool 0.1.0-canonical-aptos",
+ "named-lock",
+ "once_cell",
+ "petgraph 0.5.1",
+ "ptree",
+ "regex",
+ "reqwest",
+ "serde 1.0.190",
+ "serde_yaml 0.8.26",
+ "sha2 0.9.9",
+ "tempfile",
+ "toml",
+ "walkdir",
+ "whoami",
+]
+
+[[package]]
+name = "move-package"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "clap 4.4.7",
+ "colored",
+ "move-abigen 0.1.0-canonical-sui",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-source-map 0.1.0-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-docgen 0.1.0-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "named-lock",
+ "once_cell",
+ "petgraph 0.5.1",
+ "regex",
+ "serde 1.0.190",
+ "serde_yaml 0.8.26",
+ "sha2 0.9.9",
+ "tempfile",
+ "toml",
+ "treeline",
+ "walkdir",
+ "whoami",
+]
+
+[[package]]
+name = "move-proc-macros"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "enum-compat-util",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "move-prover"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "atty",
+ "clap 4.4.7",
+ "codespan",
+ "codespan-reporting",
+ "futures 0.3.28",
+ "hex",
+ "itertools 0.10.5",
+ "log",
+ "move-abigen 0.1.0-canonical-aptos",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-docgen 0.1.0-canonical-aptos",
+ "move-errmapgen 0.1.0-canonical-aptos",
+ "move-ir-types 0.1.0-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "move-prover-boogie-backend 0.1.0-canonical-aptos",
+ "move-stackless-bytecode 0.1.0-canonical-aptos",
+ "num",
+ "once_cell",
+ "pretty",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "simplelog",
+ "tokio",
+ "toml",
+]
+
+[[package]]
+name = "move-prover"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "clap 4.4.7",
+ "codespan-reporting",
+ "itertools 0.10.5",
+ "log",
+ "move-abigen 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-docgen 0.1.0-canonical-sui",
+ "move-errmapgen 0.1.0-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "move-prover-boogie-backend 0.1.0-canonical-sui",
+ "move-stackless-bytecode 0.1.0-canonical-sui",
+ "once_cell",
+ "serde 1.0.190",
+ "simplelog",
+ "toml",
+]
+
+[[package]]
+name = "move-prover-boogie-backend"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "codespan",
+ "codespan-reporting",
+ "futures 0.3.28",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "move-stackless-bytecode 0.1.0-canonical-aptos",
+ "num",
+ "once_cell",
+ "pretty",
+ "rand 0.8.5",
+ "regex",
+ "serde 1.0.190",
+ "serde_json",
+ "tera",
+ "tokio",
+]
+
+[[package]]
+name = "move-prover-boogie-backend"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "codespan",
+ "codespan-reporting",
+ "futures 0.3.28",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "move-stackless-bytecode 0.1.0-canonical-sui",
+ "num",
+ "once_cell",
+ "pretty",
+ "rand 0.8.5",
+ "regex",
+ "serde 1.0.190",
+ "tera",
+ "tokio",
+]
+
+[[package]]
+name = "move-read-write-set-types"
+version = "0.0.3-canonical-sui"
+dependencies = [
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-stackless-bytecode"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "codespan",
+ "codespan-reporting",
+ "ethnum",
+ "im",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-borrow-graph 0.0.1-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-command-line-common 0.1.0-canonical-aptos",
+ "move-compiler 0.0.1-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-ir-to-bytecode 0.1.0-canonical-aptos",
+ "move-model 0.1.0-canonical-aptos",
+ "num",
+ "once_cell",
+ "paste",
+ "petgraph 0.5.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-stackless-bytecode"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "codespan",
+ "codespan-reporting",
+ "ethnum",
+ "im",
+ "itertools 0.10.5",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-model 0.1.0-canonical-sui",
+ "move-read-write-set-types",
+ "num",
+ "paste",
+ "petgraph 0.5.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-stdlib"
+version = "0.1.1-canonical-sui"
+dependencies = [
+ "anyhow",
+ "hex",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-docgen 0.1.0-canonical-sui",
+ "move-errmapgen 0.1.0-canonical-sui",
+ "move-prover 0.1.0-canonical-sui",
+ "move-vm-runtime 0.1.0-canonical-sui",
+ "move-vm-types 0.1.0-canonical-sui",
+ "sha2 0.9.9",
+ "sha3 0.9.1",
+ "smallvec",
+ "walkdir",
+]
+
+[[package]]
+name = "move-stdlib-v0"
+version = "0.1.1-canonical-sui"
+dependencies = [
+ "anyhow",
+ "hex",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-docgen 0.1.0-canonical-sui",
+ "move-errmapgen 0.1.0-canonical-sui",
+ "move-prover 0.1.0-canonical-sui",
+ "move-vm-runtime-v0",
+ "move-vm-types 0.1.0-canonical-sui",
+ "sha2 0.9.9",
+ "sha3 0.9.1",
+ "smallvec",
+ "walkdir",
+]
+
+[[package]]
+name = "move-stdlib-v1"
+version = "0.1.1-canonical-sui"
+dependencies = [
+ "anyhow",
+ "hex",
+ "log",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-docgen 0.1.0-canonical-sui",
+ "move-errmapgen 0.1.0-canonical-sui",
+ "move-prover 0.1.0-canonical-sui",
+ "move-vm-runtime-v1",
+ "move-vm-types 0.1.0-canonical-sui",
+ "sha2 0.9.9",
+ "sha3 0.9.1",
+ "smallvec",
+ "walkdir",
+]
+
+[[package]]
+name = "move-symbol-pool"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-symbol-pool"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "once_cell",
+ "phf",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-table-extension"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.4",
+ "better_any",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-vm-runtime 0.1.0-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "once_cell",
+ "sha3 0.9.1",
+ "smallvec",
+]
+
+[[package]]
+name = "move-vm-config"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-binary-format 0.0.3-canonical-sui",
+]
+
+[[package]]
+name = "move-vm-profiler"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-vm-config",
+ "once_cell",
+ "serde 1.0.190",
+ "serde_json",
+]
+
+[[package]]
+name = "move-vm-runtime"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "better_any",
+ "fail 0.4.0",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-bytecode-verifier 0.1.0-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "once_cell",
+ "parking_lot 0.11.2",
+ "sha3 0.9.1",
+ "tracing",
+]
+
+[[package]]
+name = "move-vm-runtime"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "better_any",
+ "fail 0.4.0",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-types 0.1.0-canonical-sui",
+ "once_cell",
+ "parking_lot 0.11.2",
+ "sha3 0.9.1",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "move-vm-runtime-v0"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "better_any",
+ "fail 0.4.0",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-verifier-v0",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-types 0.1.0-canonical-sui",
+ "once_cell",
+ "parking_lot 0.11.2",
+ "sha3 0.9.1",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "move-vm-runtime-v1"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "better_any",
+ "fail 0.4.0",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-verifier-v1",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-types 0.1.0-canonical-sui",
+ "once_cell",
+ "parking_lot 0.11.2",
+ "sha3 0.9.1",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "move-vm-test-utils"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "anyhow",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "move-table-extension",
+ "move-vm-types 0.1.0-canonical-aptos",
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-vm-test-utils"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-profiler",
+ "move-vm-types 0.1.0-canonical-sui",
+ "once_cell",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "move-vm-types"
+version = "0.1.0-canonical-aptos"
+dependencies = [
+ "bcs 0.1.4",
+ "move-binary-format 0.0.3-canonical-aptos",
+ "move-core-types 0.0.4-canonical-aptos",
+ "once_cell",
+ "serde 1.0.190",
+ "smallvec",
+]
+
+[[package]]
+name = "move-vm-types"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-profiler",
+ "serde 1.0.190",
+ "smallvec",
+]
+
+[[package]]
+name = "movement-sdk"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "msim"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=1a52783d6600ecc22e15253a982f77881bd47c77#1a52783d6600ecc22e15253a982f77881bd47c77"
+dependencies = [
+ "ahash 0.7.7",
+ "async-task",
+ "bincode",
+ "bytes",
+ "cc",
+ "downcast-rs",
+ "erasable",
+ "futures 0.3.28",
+ "lazy_static 1.4.0",
+ "libc",
+ "msim-macros",
+ "naive-timer",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "real_tokio",
+ "serde 1.0.190",
+ "socket2 0.4.10",
+ "tap",
+ "tokio-util 0.7.7",
+ "toml",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "msim-macros"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=1a52783d6600ecc22e15253a982f77881bd47c77#1a52783d6600ecc22e15253a982f77881bd47c77"
+dependencies = [
+ "darling 0.14.4",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "multiaddr"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
+dependencies = [
+ "arrayref",
+ "byteorder",
+ "data-encoding",
+ "log",
+ "multibase",
+ "multihash",
+ "percent-encoding 2.3.0",
+ "serde 1.0.190",
+ "static_assertions",
+ "unsigned-varint",
+ "url 2.4.1",
+]
+
+[[package]]
+name = "multibase"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404"
+dependencies = [
+ "base-x",
+ "data-encoding",
+ "data-encoding-macro",
+]
+
+[[package]]
+name = "multihash"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
+dependencies = [
+ "core2",
+ "multihash-derive",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "multimap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
+[[package]]
+name = "mysten-common"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "futures 0.3.28",
+ "parking_lot 0.12.1",
+ "tokio",
+ "workspace-hack",
+]
+
+[[package]]
+name = "mysten-metrics"
+version = "0.7.0-canonical-sui"
+dependencies = [
+ "async-trait",
+ "axum",
+ "dashmap",
+ "futures 0.3.28",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "prometheus-closure-metric",
+ "scopeguard",
+ "tap",
+ "tokio",
+ "tracing",
+ "uuid",
+ "workspace-hack",
+]
+
+[[package]]
+name = "mysten-network"
+version = "0.2.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "bcs 0.1.6",
+ "bytes",
+ "eyre",
+ "futures 0.3.28",
+ "http",
+ "multiaddr",
+ "serde 1.0.190",
+ "snap",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.10.2",
+ "tonic-health 0.10.2",
+ "tower",
+ "tower-http",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "mysten-util-mem"
+version = "0.11.0-canonical-sui"
+dependencies = [
+ "cfg-if",
+ "ed25519-consensus",
+ "fastcrypto",
+ "fastcrypto-tbls",
+ "hashbrown 0.12.3",
+ "impl-trait-for-tuples",
+ "indexmap 1.9.3",
+ "mysten-util-mem-derive",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "roaring",
+ "smallvec",
+ "workspace-hack",
+]
+
+[[package]]
+name = "mysten-util-mem-derive"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "syn 1.0.109",
+ "synstructure",
+ "workspace-hack",
+]
+
+[[package]]
+name = "mysticeti-core"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/mysticeti?rev=318d61d27f47d257d99a86983d835e9e9756bc59#318d61d27f47d257d99a86983d835e9e9756bc59"
+dependencies = [
+ "async-trait",
+ "axum",
+ "bincode",
+ "blake2",
+ "crc32fast",
+ "digest 0.10.7",
+ "ed25519-consensus",
+ "eyre",
+ "futures 0.3.28",
+ "gettid",
+ "hex",
+ "hyper",
+ "libc",
+ "memmap2",
+ "minibytes",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_yaml 0.9.27",
+ "tabled",
+ "tempfile",
+ "tokio",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+ "zeroize",
+]
+
+[[package]]
+name = "naive-timer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034a0ad7deebf0c2abcf2435950a6666c3c15ea9d8fad0c0f48efa8a7f843fed"
+
+[[package]]
+name = "named-lock"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a3eb6b7c682b65d1f631ec3176829d72ab450b3aacdd3f719bf220822e59ac"
+dependencies = [
+ "libc",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
+[[package]]
+name = "narwhal-config"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "fastcrypto",
+ "fastcrypto-tbls",
+ "match_opt",
+ "mysten-network",
+ "mysten-util-mem",
+ "narwhal-crypto",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "thiserror",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-crypto"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "fastcrypto",
+ "fastcrypto-tbls",
+ "serde 1.0.190",
+ "shared-crypto",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-executor"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "async-trait",
+ "bcs 0.1.6",
+ "bincode",
+ "bytes",
+ "fastcrypto",
+ "futures 0.3.28",
+ "mockall",
+ "mysten-metrics",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-network",
+ "narwhal-primary",
+ "narwhal-storage",
+ "narwhal-types",
+ "prometheus",
+ "serde 1.0.190",
+ "sui-protocol-config",
+ "thiserror",
+ "tokio",
+ "tonic 0.10.2",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-network"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-tower",
+ "anyhow",
+ "async-trait",
+ "axum",
+ "axum-server",
+ "backoff",
+ "bytes",
+ "dashmap",
+ "futures 0.3.28",
+ "mysten-common",
+ "mysten-metrics",
+ "narwhal-crypto",
+ "narwhal-types",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "quinn-proto",
+ "rand 0.8.5",
+ "sui-macros",
+ "tokio",
+ "tower",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-node"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "arc-swap",
+ "async-trait",
+ "axum",
+ "bytes",
+ "cfg-if",
+ "clap 4.4.7",
+ "eyre",
+ "fastcrypto",
+ "futures 0.3.28",
+ "mysten-metrics",
+ "mysten-network",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-executor",
+ "narwhal-network",
+ "narwhal-primary",
+ "narwhal-storage",
+ "narwhal-types",
+ "narwhal-worker",
+ "prometheus",
+ "rand 0.8.5",
+ "reqwest",
+ "sui-keys",
+ "sui-protocol-config",
+ "sui-types",
+ "telemetry-subscribers",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "tracing-subscriber",
+ "url 2.4.1",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-primary"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-tower",
+ "anyhow",
+ "async-trait",
+ "backoff",
+ "bcs 0.1.6",
+ "bytes",
+ "cfg-if",
+ "fastcrypto",
+ "fastcrypto-tbls",
+ "futures 0.3.28",
+ "governor",
+ "itertools 0.10.5",
+ "mysten-common",
+ "mysten-metrics",
+ "mysten-network",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-network",
+ "narwhal-storage",
+ "narwhal-types",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "rand 0.8.5",
+ "sui-macros",
+ "sui-protocol-config",
+ "tap",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-storage"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "fastcrypto",
+ "futures 0.3.28",
+ "lru",
+ "mysten-common",
+ "narwhal-config",
+ "narwhal-types",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "sui-macros",
+ "tap",
+ "tempfile",
+ "tokio",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-test-utils"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "fastcrypto",
+ "fdlimit",
+ "indexmap 1.9.3",
+ "itertools 0.10.5",
+ "mysten-metrics",
+ "mysten-network",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-executor",
+ "narwhal-network",
+ "narwhal-node",
+ "narwhal-primary",
+ "narwhal-storage",
+ "narwhal-types",
+ "narwhal-worker",
+ "once_cell",
+ "prometheus",
+ "rand 0.8.5",
+ "sui-protocol-config",
+ "telemetry-subscribers",
+ "tempfile",
+ "tokio",
+ "tonic 0.10.2",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-types"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-build",
+ "anyhow",
+ "base64 0.21.5",
+ "bcs 0.1.6",
+ "bytes",
+ "derive_builder",
+ "enum_dispatch",
+ "fastcrypto",
+ "fastcrypto-tbls",
+ "futures 0.3.28",
+ "indexmap 1.9.3",
+ "mockall",
+ "mysten-common",
+ "mysten-metrics",
+ "mysten-network",
+ "mysten-util-mem",
+ "narwhal-config",
+ "narwhal-crypto",
+ "once_cell",
+ "prometheus",
+ "proptest",
+ "proptest-derive",
+ "prost 0.12.1",
+ "prost-build 0.12.1",
+ "protobuf-src",
+ "rand 0.8.5",
+ "roaring",
+ "rustversion",
+ "serde 1.0.190",
+ "serde_with 2.3.3",
+ "sui-protocol-config",
+ "thiserror",
+ "tokio",
+ "tonic 0.10.2",
+ "tonic-build 0.10.2",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "narwhal-worker"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-tower",
+ "anyhow",
+ "arc-swap",
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "eyre",
+ "fastcrypto",
+ "futures 0.3.28",
+ "governor",
+ "itertools 0.10.5",
+ "mysten-metrics",
+ "mysten-network",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-network",
+ "narwhal-types",
+ "prometheus",
+ "rand 0.8.5",
+ "sui-protocol-config",
+ "tap",
+ "thiserror",
+ "tokio",
+ "tonic 0.10.2",
+ "tower",
+ "tracing",
+ "typed-store",
+ "workspace-hack",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static 1.4.0",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
+[[package]]
+name = "nom"
+version = "5.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
+dependencies = [
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nonzero_ext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
+
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
+[[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 = "num"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits 0.2.17",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static 1.4.0",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits 0.2.17",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+dependencies = [
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+dependencies = [
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.3",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "object_store"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f930c88a43b1c3f6e776dfe495b4afab89882dbc81530c632db2ed65451ebcb4"
+dependencies = [
+ "async-trait",
+ "base64 0.21.5",
+ "bytes",
+ "chrono",
+ "futures 0.3.28",
+ "humantime",
+ "hyper",
+ "itertools 0.11.0",
+ "parking_lot 0.12.1",
+ "percent-encoding 2.3.0",
+ "quick-xml",
+ "rand 0.8.5",
+ "reqwest",
+ "ring 0.16.20",
+ "rustls-pemfile",
+ "serde 1.0.190",
+ "serde_json",
+ "snafu",
+ "tokio",
+ "tracing",
+ "url 2.4.1",
+ "walkdir",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
+dependencies = [
+ "asn1-rs",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "open-fastrlp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
+dependencies = [
+ "arrayvec 0.7.4",
+ "auto_impl",
+ "bytes",
+ "ethereum-types",
+ "open-fastrlp-derive",
+]
+
+[[package]]
+name = "open-fastrlp-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
+dependencies = [
+ "bytes",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
+dependencies = [
+ "bitflags 2.4.1",
+ "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 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "opentelemetry"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
+dependencies = [
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+]
+
+[[package]]
+name = "opentelemetry-otlp"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "http",
+ "opentelemetry-proto",
+ "opentelemetry-semantic-conventions",
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+ "prost 0.11.9",
+ "thiserror",
+ "tokio",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "opentelemetry-proto"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
+dependencies = [
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+ "prost 0.11.9",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269"
+dependencies = [
+ "opentelemetry",
+]
+
+[[package]]
+name = "opentelemetry_api"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
+dependencies = [
+ "futures-channel",
+ "futures-util",
+ "indexmap 1.9.3",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "thiserror",
+ "urlencoding",
+]
+
+[[package]]
+name = "opentelemetry_sdk"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
+dependencies = [
+ "async-trait",
+ "crossbeam-channel",
+ "futures-channel",
+ "futures-executor",
+ "futures-util",
+ "once_cell",
+ "opentelemetry_api",
+ "ordered-float 3.9.2",
+ "percent-encoding 2.3.0",
+ "rand 0.8.5",
+ "regex",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits 0.2.17",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeff60e3e37407a80ead3e9458145b456e978c4068cddbfea6afb48572962ca"
+dependencies = [
+ "ouroboros_macro 0.9.5",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro 0.15.6",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro 0.17.2",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03f2cb802b5bdfdf52f1ffa0b54ce105e4d346e91990dd571f86c91321ad49e2"
+dependencies = [
+ "Inflector",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
+dependencies = [
+ "Inflector",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa 0.16.8",
+ "elliptic-curve 0.13.6",
+ "primeorder",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "papergrid"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae7891b22598926e4398790c8fe6447930c72a67d36d983a49d6ce682ce83290"
+dependencies = [
+ "bytecount",
+ "fnv",
+ "unicode-width",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bitvec 0.20.4",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive 2.3.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bitvec 1.0.1",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive 3.6.5",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "parse-zoneinfo"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
+dependencies = [
+ "regex",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "pest"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5"
+dependencies = [
+ "memchr",
+ "thiserror",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
+dependencies = [
+ "fixedbitset 0.2.0",
+ "indexmap 1.9.3",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+dependencies = [
+ "fixedbitset 0.4.2",
+ "indexmap 2.1.0",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs1"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
+dependencies = [
+ "der 0.6.1",
+ "pkcs8 0.9.0",
+ "spki 0.6.0",
+ "zeroize",
+]
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der 0.7.8",
+ "pkcs8 0.10.2",
+ "spki 0.7.2",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.2",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "polyval"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
+
+[[package]]
+name = "poseidon-ark"
+version = "0.0.1"
+source = "git+https://github.com/arnaucube/poseidon-ark.git?rev=ff7f5e05d55667b4ffba129b837da780c4c5c849#ff7f5e05d55667b4ffba129b837da780c4c5c849"
+dependencies = [
+ "ark-bn254",
+ "ark-ff",
+ "ark-std",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "predicates"
+version = "2.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
+dependencies = [
+ "difflib",
+ "float-cmp",
+ "itertools 0.10.5",
+ "normalize-line-endings",
+ "predicates-core",
+ "regex",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
+[[package]]
+name = "prefix-manager"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21965b29633f6d9b2ebc05ba4c348173389e38da66de71dcd0b2bd8b9cde713c"
+
+[[package]]
+name = "pretty"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9940b913ee56ddd94aec2d3cd179dd47068236f42a1a6415ccf9d880ce2a61"
+dependencies = [
+ "arrayvec 0.5.2",
+ "typed-arena",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4"
+dependencies = [
+ "elliptic-curve 0.13.6",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+dependencies = [
+ "fixed-hash 0.7.0",
+ "impl-codec 0.5.1",
+ "impl-serde 0.3.2",
+ "uint",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
+dependencies = [
+ "fixed-hash 0.8.0",
+ "impl-codec 0.6.0",
+ "impl-rlp",
+ "impl-serde 0.4.0",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+dependencies = [
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+dependencies = [
+ "thiserror",
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+dependencies = [
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prometheus"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static 1.4.0",
+ "memchr",
+ "parking_lot 0.12.1",
+ "protobuf",
+ "thiserror",
+]
+
+[[package]]
+name = "prometheus-closure-metric"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "prometheus",
+ "protobuf",
+ "workspace-hack",
+]
+
+[[package]]
+name = "proptest"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags 2.4.1",
+ "lazy_static 1.4.0",
+ "num-traits 0.2.17",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_xorshift",
+ "regex-syntax 0.7.5",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "proptest-derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc"
+dependencies = [
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.1",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
+dependencies = [
+ "bytes",
+ "heck 0.4.1",
+ "itertools 0.10.5",
+ "lazy_static 1.4.0",
+ "log",
+ "multimap",
+ "petgraph 0.6.4",
+ "prettyplease 0.1.25",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
+ "regex",
+ "syn 1.0.109",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac"
+dependencies = [
+ "bytes",
+ "heck 0.4.1",
+ "itertools 0.11.0",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph 0.6.4",
+ "prettyplease 0.2.15",
+ "prost 0.12.1",
+ "prost-types 0.12.1",
+ "regex",
+ "syn 2.0.39",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
+dependencies = [
+ "anyhow",
+ "itertools 0.11.0",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost 0.11.9",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+dependencies = [
+ "prost 0.12.1",
+]
+
+[[package]]
+name = "protobuf"
+version = "2.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
+dependencies = [
+ "bytes",
+]
+
+[[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 = "protoc-gen-prost"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10dfa031ad41fdcfb180de73ece3ed076250f1132a13ad6bba218699f612fb95"
+dependencies = [
+ "once_cell",
+ "prost 0.11.9",
+ "prost-build 0.11.9",
+ "prost-types 0.11.9",
+ "regex",
+]
+
+[[package]]
+name = "protoc-gen-tonic"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "725a07a704f9cf7a956b302c21d81b5516ed5ee6cfbbf827edb69beeaae6cc30"
+dependencies = [
+ "heck 0.4.1",
+ "prettyplease 0.1.25",
+ "prost 0.11.9",
+ "prost-build 0.11.9",
+ "prost-types 0.11.9",
+ "protoc-gen-prost",
+ "regex",
+ "syn 1.0.109",
+ "tonic-build 0.8.4",
+]
+
+[[package]]
+name = "ptree"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "config",
+ "directories",
+ "petgraph 0.6.4",
+ "serde 1.0.190",
+ "serde-value",
+ "tint",
+]
+
+[[package]]
+name = "quanta"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "mach2",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-xml"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+dependencies = [
+ "memchr",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "quinn"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
+dependencies = [
+ "bytes",
+ "futures-io",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "ring 0.16.20",
+ "rustc-hash",
+ "rustls",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
+dependencies = [
+ "bytes",
+ "libc",
+ "socket2 0.5.5",
+ "tracing",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "quote"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+dependencies = [
+ "proc-macro2 0.4.30",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2 1.0.69",
+]
+
+[[package]]
+name = "radium"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.10",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "random-manager"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2557c07161d4d805cd7e711d0648b292be9e727d9678d078bab052278cd1b71"
+dependencies = [
+ "bs58 0.4.0",
+ "lazy_static 1.4.0",
+ "primitive-types 0.12.2",
+ "rand 0.8.5",
+ "ring 0.16.20",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "10.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "rayon"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
+dependencies = [
+ "pem",
+ "ring 0.16.20",
+ "time",
+ "yasna",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+dependencies = [
+ "pem",
+ "ring 0.16.20",
+ "time",
+ "x509-parser 0.14.0",
+ "yasna",
+]
+
+[[package]]
+name = "readonly"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8f439da1766942fe069954da6058b2e6c1760eb878bae76f5be9fc29f56f574"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "real_tokio"
+version = "1.28.1"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e4693500118d5e79ce098ee6dfc2c48f3ef19e45#e4693500118d5e79ce098ee6dfc2c48f3ef19e45"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.4.10",
+ "tokio-macros 2.1.0 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e4693500118d5e79ce098ee6dfc2c48f3ef19e45)",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+dependencies = [
+ "getrandom 0.2.10",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
+]
+
+[[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",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[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.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "reqwest"
+version = "0.11.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+dependencies = [
+ "base64 0.21.5",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding 2.3.0",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_urlencoded",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tokio-util 0.7.10",
+ "tower-service",
+ "url 2.4.1",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots",
+ "winreg",
+]
+
+[[package]]
+name = "retain_mut"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
+
+[[package]]
+name = "rfc6979"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+dependencies = [
+ "crypto-bigint 0.4.9",
+ "hmac 0.12.1",
+ "zeroize",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+dependencies = [
+ "cc",
+ "getrandom 0.2.10",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rlp-derive",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "roaring"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "retain_mut",
+]
+
+[[package]]
+name = "rocksdb"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
+dependencies = [
+ "libc",
+ "librocksdb-sys",
+]
+
+[[package]]
+name = "rsa"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55a77d189da1fee555ad95b7e50e7457d91c0e089ec68ca69ad2989413bbdab4"
+dependencies = [
+ "byteorder",
+ "digest 0.10.7",
+ "num-bigint-dig",
+ "num-integer",
+ "num-iter",
+ "num-traits 0.2.17",
+ "pkcs1 0.4.1",
+ "pkcs8 0.9.0",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+ "signature 2.1.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
+dependencies = [
+ "const-oid",
+ "digest 0.10.7",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits 0.2.17",
+ "pkcs1 0.7.5",
+ "pkcs8 0.10.2",
+ "rand_core 0.6.4",
+ "signature 2.1.0",
+ "spki 0.7.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rust-embed"
+version = "6.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661"
+dependencies = [
+ "rust-embed-impl",
+ "rust-embed-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-impl"
+version = "6.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "rust-embed-utils",
+ "syn 2.0.39",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-utils"
+version = "7.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
+dependencies = [
+ "sha2 0.10.8",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom 7.1.3",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
+dependencies = [
+ "log",
+ "ring 0.17.5",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64 0.21.5",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.5",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scale-info"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
+dependencies = [
+ "cfg-if",
+ "derive_more",
+ "parity-scale-codec 3.6.5",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
+dependencies = [
+ "dyn-clone",
+ "either",
+ "schemars_derive",
+ "serde 1.0.190",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.5",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.8",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+dependencies = [
+ "bitcoin_hashes",
+ "rand 0.8.5",
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
+
+[[package]]
+name = "serde"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-generate"
+version = "0.20.6"
+source = "git+https://github.com/aptos-labs/serde-reflection?rev=839aed62a20ddccf043c08961cfe74875741ccba#839aed62a20ddccf043c08961cfe74875741ccba"
+dependencies = [
+ "bcs 0.1.6",
+ "bincode",
+ "heck 0.3.3",
+ "include_dir 0.6.2",
+ "maplit",
+ "serde 1.0.190",
+ "serde-reflection 0.3.5",
+ "serde_bytes",
+ "serde_yaml 0.8.26",
+ "structopt",
+ "textwrap 0.13.4",
+]
+
+[[package]]
+name = "serde-hjson"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
+dependencies = [
+ "lazy_static 1.4.0",
+ "num-traits 0.1.43",
+ "regex",
+ "serde 0.8.23",
+]
+
+[[package]]
+name = "serde-name"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12c47087018ec281d1cdab673d36aea22d816b54d498264029c05d5fa1910da6"
+dependencies = [
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "serde-name"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b5b14ebbcc4e4f2b3642fa99c388649da58d1dc3308c7d109f39f565d1710f0"
+dependencies = [
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "serde-reflection"
+version = "0.3.5"
+source = "git+https://github.com/aptos-labs/serde-reflection?rev=839aed62a20ddccf043c08961cfe74875741ccba#839aed62a20ddccf043c08961cfe74875741ccba"
+dependencies = [
+ "once_cell",
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "serde-reflection"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895"
+dependencies = [
+ "once_cell",
+ "serde 1.0.190",
+ "thiserror",
+]
+
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float 2.10.1",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+dependencies = [
+ "indexmap 2.1.0",
+ "itoa",
+ "ryu",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+dependencies = [
+ "itoa",
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[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 1.0.190",
+]
+
+[[package]]
+name = "serde_with"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+dependencies = [
+ "base64 0.13.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with_macros 2.3.3",
+ "time",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64 0.21.5",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.1.0",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with_macros 3.4.0",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde 1.0.190",
+ "yaml-rust",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+dependencies = [
+ "indexmap 2.1.0",
+ "itoa",
+ "ryu",
+ "serde 1.0.190",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha3"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "keccak",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest 0.10.7",
+ "keccak",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static 1.4.0",
+]
+
+[[package]]
+name = "shared-crypto"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "eyre",
+ "fastcrypto",
+ "serde 1.0.190",
+ "serde_repr",
+ "workspace-hack",
+]
+
+[[package]]
+name = "shlex"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "similar"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+
+[[package]]
+name = "simplelog"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720"
+dependencies = [
+ "chrono",
+ "log",
+ "termcolor",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "sized-chunks"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
+dependencies = [
+ "bitmaps",
+ "typenum",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slip10_ed25519"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be0ff28bf14f9610a342169084e87a4f435ad798ec528dc7579a3678fa9dc9a"
+dependencies = [
+ "hmac-sha512",
+]
+
+[[package]]
+name = "slug"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4"
+dependencies = [
+ "deunicode",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
+[[package]]
+name = "snafu"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
+dependencies = [
+ "doc-comment",
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "snap"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "standalone-sui-subnet"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "aptos-types",
+ "async-channel",
+ "avalanche-types",
+ "base64 0.21.5",
+ "bcs 0.1.6",
+ "bytes",
+ "chrono",
+ "derivative",
+ "dirs 5.0.1",
+ "env_logger",
+ "futures 0.3.28",
+ "hex",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "log",
+ "movement-sdk",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sui-adapter-latest",
+ "sui-types",
+ "tokio",
+ "tonic 0.8.3",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "structopt"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+dependencies = [
+ "clap 2.34.0",
+ "lazy_static 1.4.0",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "rustversion",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
+
+[[package]]
+name = "sui-adapter-latest"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "leb128",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-runtime 0.1.0-canonical-sui",
+ "move-vm-types 0.1.0-canonical-sui",
+ "parking_lot 0.12.1",
+ "serde 1.0.190",
+ "sui-macros",
+ "sui-move-natives-latest",
+ "sui-protocol-config",
+ "sui-types",
+ "sui-verifier-latest",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-adapter-v0"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "leb128",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier-v0",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-runtime-v0",
+ "move-vm-types 0.1.0-canonical-sui",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "serde 1.0.190",
+ "sui-macros",
+ "sui-move-natives-v0",
+ "sui-protocol-config",
+ "sui-types",
+ "sui-verifier-v0",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-adapter-v1"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "leb128",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier-v1",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-runtime-v1",
+ "move-vm-types 0.1.0-canonical-sui",
+ "parking_lot 0.12.1",
+ "serde 1.0.190",
+ "sui-macros",
+ "sui-move-natives-v1",
+ "sui-protocol-config",
+ "sui-types",
+ "sui-verifier-v1",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-archival"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "byteorder",
+ "bytes",
+ "fastcrypto",
+ "futures 0.3.28",
+ "indicatif",
+ "num_enum",
+ "object_store",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "sui-config",
+ "sui-simulator",
+ "sui-storage",
+ "sui-types",
+ "tokio",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-config"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anyhow",
+ "bcs 0.1.6",
+ "csv",
+ "dirs 4.0.0",
+ "fastcrypto",
+ "narwhal-config",
+ "once_cell",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_with 2.3.3",
+ "serde_yaml 0.8.26",
+ "sui-keys",
+ "sui-protocol-config",
+ "sui-simulator",
+ "sui-storage",
+ "sui-types",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-core"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "arc-swap",
+ "async-trait",
+ "bcs 0.1.6",
+ "bytes",
+ "chrono",
+ "dashmap",
+ "either",
+ "enum_dispatch",
+ "eyre",
+ "fastcrypto",
+ "fastcrypto-zkp",
+ "futures 0.3.28",
+ "im",
+ "indexmap 1.9.3",
+ "itertools 0.10.5",
+ "lru",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-package 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "mysten-common",
+ "mysten-metrics",
+ "mysten-network",
+ "mysticeti-core",
+ "narwhal-config",
+ "narwhal-crypto",
+ "narwhal-executor",
+ "narwhal-network",
+ "narwhal-node",
+ "narwhal-test-utils",
+ "narwhal-types",
+ "narwhal-worker",
+ "num_cpus",
+ "object_store",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "prometheus",
+ "rand 0.8.5",
+ "rocksdb",
+ "scopeguard",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "shared-crypto",
+ "signature 1.6.4",
+ "sui-archival",
+ "sui-config",
+ "sui-execution",
+ "sui-framework",
+ "sui-genesis-builder",
+ "sui-json-rpc-types",
+ "sui-macros",
+ "sui-move-build",
+ "sui-network",
+ "sui-protocol-config",
+ "sui-simulator",
+ "sui-storage",
+ "sui-swarm-config",
+ "sui-transaction-checks",
+ "sui-types",
+ "tap",
+ "telemetry-subscribers",
+ "tempfile",
+ "thiserror",
+ "tokio",
+ "tokio-retry",
+ "tokio-stream",
+ "tracing",
+ "typed-store",
+ "typed-store-derive",
+ "workspace-hack",
+ "zeroize",
+]
+
+[[package]]
+name = "sui-enum-compat-util"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "serde_yaml 0.8.26",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-execution"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-bytecode-verifier-v0",
+ "move-bytecode-verifier-v1",
+ "move-vm-config",
+ "move-vm-runtime 0.1.0-canonical-sui",
+ "move-vm-runtime-v0",
+ "move-vm-runtime-v1",
+ "sui-adapter-latest",
+ "sui-adapter-v0",
+ "sui-adapter-v1",
+ "sui-move-natives-latest",
+ "sui-move-natives-v0",
+ "sui-move-natives-v1",
+ "sui-protocol-config",
+ "sui-types",
+ "sui-verifier-latest",
+ "sui-verifier-v0",
+ "sui-verifier-v1",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-framework"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-package 0.1.0-canonical-sui",
+ "once_cell",
+ "serde 1.0.190",
+ "sui-move-build",
+ "sui-types",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-framework-snapshot"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "git-version",
+ "serde 1.0.190",
+ "serde_json",
+ "sui-framework",
+ "sui-protocol-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-genesis-builder"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "camino",
+ "fastcrypto",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_with 2.3.3",
+ "serde_yaml 0.8.26",
+ "shared-crypto",
+ "sui-config",
+ "sui-execution",
+ "sui-framework",
+ "sui-framework-snapshot",
+ "sui-protocol-config",
+ "sui-simulator",
+ "sui-types",
+ "tempfile",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-json"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "fastcrypto",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "schemars",
+ "serde 1.0.190",
+ "serde_json",
+ "sui-framework",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-json-rpc-types"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bcs 0.1.6",
+ "colored",
+ "enum_dispatch",
+ "fastcrypto",
+ "itertools 0.10.5",
+ "json_to_table",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "mysten-metrics",
+ "schemars",
+ "serde 1.0.190",
+ "serde_json",
+ "serde_with 2.3.3",
+ "sui-enum-compat-util",
+ "sui-json",
+ "sui-macros",
+ "sui-protocol-config",
+ "sui-types",
+ "tabled",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-keys"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "bip32",
+ "fastcrypto",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_json",
+ "shared-crypto",
+ "signature 1.6.4",
+ "slip10_ed25519",
+ "sui-types",
+ "tiny-bip39",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-macros"
+version = "0.7.0-canonical-sui"
+dependencies = [
+ "futures 0.3.28",
+ "once_cell",
+ "sui-proc-macros",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-move-build"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "fastcrypto",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-compiler 0.0.1-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-package 0.1.0-canonical-sui",
+ "move-symbol-pool 0.1.0-canonical-sui",
+ "serde-reflection 0.3.6",
+ "sui-types",
+ "sui-verifier-latest",
+ "tempfile",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-move-natives-latest"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "better_any",
+ "fastcrypto",
+ "fastcrypto-zkp",
+ "linked-hash-map",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-stdlib",
+ "move-vm-runtime 0.1.0-canonical-sui",
+ "move-vm-types 0.1.0-canonical-sui",
+ "smallvec",
+ "sui-protocol-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-move-natives-v0"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "better_any",
+ "fastcrypto",
+ "fastcrypto-zkp",
+ "linked-hash-map",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-stdlib-v0",
+ "move-vm-runtime-v0",
+ "move-vm-types 0.1.0-canonical-sui",
+ "smallvec",
+ "sui-protocol-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-move-natives-v1"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "bcs 0.1.6",
+ "better_any",
+ "fastcrypto",
+ "fastcrypto-zkp",
+ "linked-hash-map",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-stdlib-v1",
+ "move-vm-runtime-v1",
+ "move-vm-types 0.1.0-canonical-sui",
+ "smallvec",
+ "sui-protocol-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-network"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-build",
+ "anemo-tower",
+ "anyhow",
+ "dashmap",
+ "futures 0.3.28",
+ "governor",
+ "mysten-metrics",
+ "mysten-network",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "sui-archival",
+ "sui-config",
+ "sui-storage",
+ "sui-swarm-config",
+ "sui-types",
+ "tap",
+ "tokio",
+ "tonic 0.10.2",
+ "tonic-build 0.10.2",
+ "tower",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-proc-macros"
+version = "0.7.0-canonical-sui"
+dependencies = [
+ "msim-macros",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "sui-enum-compat-util",
+ "syn 2.0.39",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-protocol-config"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "clap 4.4.7",
+ "insta",
+ "schemars",
+ "serde 1.0.190",
+ "serde_with 2.3.3",
+ "sui-protocol-config-macros",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-protocol-config-macros"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-simulator"
+version = "0.7.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anemo-tower",
+ "fastcrypto",
+ "lru",
+ "move-package 0.1.0-canonical-sui",
+ "msim",
+ "narwhal-network",
+ "rand 0.8.5",
+ "sui-framework",
+ "sui-move-build",
+ "sui-types",
+ "telemetry-subscribers",
+ "tempfile",
+ "tower",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-storage"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "backoff",
+ "base64-url",
+ "bcs 0.1.6",
+ "byteorder",
+ "bytes",
+ "chrono",
+ "clap 4.4.7",
+ "eyre",
+ "fastcrypto",
+ "futures 0.3.28",
+ "hyper",
+ "hyper-rustls",
+ "indicatif",
+ "integer-encoding",
+ "itertools 0.10.5",
+ "lru",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "mysten-metrics",
+ "num_enum",
+ "object_store",
+ "parking_lot 0.12.1",
+ "percent-encoding 2.3.0",
+ "prometheus",
+ "reqwest",
+ "rocksdb",
+ "serde 1.0.190",
+ "sui-json-rpc-types",
+ "sui-protocol-config",
+ "sui-types",
+ "tap",
+ "telemetry-subscribers",
+ "tempfile",
+ "tokio",
+ "tracing",
+ "typed-store",
+ "typed-store-derive",
+ "url 2.4.1",
+ "workspace-hack",
+ "zstd",
+]
+
+[[package]]
+name = "sui-swarm-config"
+version = "0.0.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anyhow",
+ "fastcrypto",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "narwhal-config",
+ "prometheus",
+ "rand 0.8.5",
+ "serde 1.0.190",
+ "serde_with 2.3.3",
+ "serde_yaml 0.8.26",
+ "shared-crypto",
+ "sui-config",
+ "sui-genesis-builder",
+ "sui-protocol-config",
+ "sui-simulator",
+ "sui-types",
+ "tempfile",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-transaction-checks"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "fastcrypto-zkp",
+ "once_cell",
+ "sui-config",
+ "sui-execution",
+ "sui-macros",
+ "sui-protocol-config",
+ "sui-types",
+ "tracing",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-types"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "anemo",
+ "anyhow",
+ "bcs 0.1.6",
+ "bincode",
+ "byteorder",
+ "derivative",
+ "derive_more",
+ "enum_dispatch",
+ "eyre",
+ "fastcrypto",
+ "fastcrypto-zkp",
+ "im",
+ "indexmap 1.9.3",
+ "itertools 0.10.5",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-command-line-common 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-disassembler 0.1.0-canonical-sui",
+ "move-ir-types 0.1.0-canonical-sui",
+ "move-vm-profiler",
+ "move-vm-test-utils 0.1.0-canonical-sui",
+ "move-vm-types 0.1.0-canonical-sui",
+ "mysten-metrics",
+ "mysten-network",
+ "narwhal-config",
+ "narwhal-crypto",
+ "once_cell",
+ "prometheus",
+ "proptest",
+ "proptest-derive",
+ "rand 0.8.5",
+ "roaring",
+ "schemars",
+ "serde 1.0.190",
+ "serde-name 0.2.1",
+ "serde_json",
+ "serde_with 2.3.3",
+ "shared-crypto",
+ "signature 1.6.4",
+ "static_assertions",
+ "strum",
+ "strum_macros",
+ "sui-enum-compat-util",
+ "sui-macros",
+ "sui-protocol-config",
+ "tap",
+ "thiserror",
+ "tonic 0.10.2",
+ "tracing",
+ "typed-store-error",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-verifier-latest"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier 0.1.0-canonical-sui",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-verifier-v0"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier-v0",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "sui-protocol-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "sui-verifier-v1"
+version = "0.1.0-canonical-sui"
+dependencies = [
+ "move-abstract-stack",
+ "move-binary-format 0.0.3-canonical-sui",
+ "move-bytecode-utils 0.1.0-canonical-sui",
+ "move-bytecode-verifier-v1",
+ "move-core-types 0.0.4-canonical-sui",
+ "move-vm-config",
+ "sui-types",
+ "workspace-hack",
+]
+
+[[package]]
+name = "syn"
+version = "0.15.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+dependencies = [
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "unicode-xid 0.1.0",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "unicode-xid 0.2.4",
+]
+
+[[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 = "tabled"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce69a5028cd9576063ec1f48edb2c75339fd835e6094ef3e05b3a079bf594a6"
+dependencies = [
+ "papergrid",
+ "tabled_derive",
+ "unicode-width",
+]
+
+[[package]]
+name = "tabled_derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99f688a08b54f4f02f0a3c382aefdb7884d3d69609f785bd253dc033243e3fe4"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "telemetry-subscribers"
+version = "0.2.0-canonical-sui"
+dependencies = [
+ "atomic_float",
+ "bytes",
+ "bytes-varint",
+ "clap 4.4.7",
+ "crossterm",
+ "futures 0.3.28",
+ "once_cell",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "opentelemetry-proto",
+ "opentelemetry_api",
+ "prometheus",
+ "prost 0.11.9",
+ "tokio",
+ "tonic 0.9.2",
+ "tracing",
+ "tracing-appender",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "workspace-hack",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.4.1",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tera"
+version = "1.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8"
+dependencies = [
+ "chrono",
+ "chrono-tz",
+ "globwalk",
+ "humansize",
+ "lazy_static 1.4.0",
+ "percent-encoding 2.3.0",
+ "pest",
+ "pest_derive",
+ "rand 0.8.5",
+ "regex",
+ "serde 1.0.190",
+ "serde_json",
+ "slug",
+ "unic-segment",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "termtree"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835"
+dependencies = [
+ "smawk",
+ "unicode-width",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde 1.0.190",
+ "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.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tint"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7af24570664a3074673dbbf69a65bdae0ae0b72f2949b1adfbacb736ee4d6896"
+dependencies = [
+ "lazy_static 0.2.11",
+]
+
+[[package]]
+name = "tiny-bip39"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
+dependencies = [
+ "anyhow",
+ "hmac 0.12.1",
+ "once_cell",
+ "pbkdf2",
+ "rand 0.8.5",
+ "rustc-hash",
+ "sha2 0.10.8",
+ "thiserror",
+ "unicode-normalization",
+ "wasm-bindgen",
+ "zeroize",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.5.5",
+ "tokio-macros 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tracing",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e4693500118d5e79ce098ee6dfc2c48f3ef19e45#e4693500118d5e79ce098ee6dfc2c48f3ef19e45"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[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-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util 0.7.10",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.7"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e4693500118d5e79ce098ee6dfc2c48f3ef19e45#e4693500118d5e79ce098ee6dfc2c48f3ef19e45"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-util",
+ "hashbrown 0.12.3",
+ "pin-project-lite",
+ "real_tokio",
+ "slab",
+ "tracing",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde 1.0.190",
+]
+
+[[package]]
+name = "tonic"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.13.1",
+ "bytes",
+ "flate2",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding 2.3.0",
+ "pin-project",
+ "prost 0.11.9",
+ "prost-derive 0.11.9",
+ "tokio",
+ "tokio-stream",
+ "tokio-util 0.7.10",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "tracing-futures",
+]
+
+[[package]]
+name = "tonic"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+dependencies = [
+ "async-trait",
+ "axum",
+ "base64 0.21.5",
+ "bytes",
+ "flate2",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding 2.3.0",
+ "pin-project",
+ "prost 0.11.9",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.21.5",
+ "bytes",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding 2.3.0",
+ "pin-project",
+ "prost 0.12.1",
+ "rustls",
+ "rustls-pemfile",
+ "tokio",
+ "tokio-rustls",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
+dependencies = [
+ "prettyplease 0.1.25",
+ "proc-macro2 1.0.69",
+ "prost-build 0.11.9",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
+dependencies = [
+ "prettyplease 0.2.15",
+ "proc-macro2 1.0.69",
+ "prost-build 0.12.1",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "tonic-health"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "080964d45894b90273d2b1dd755fdd114560db8636bb41cea615213c45043c4d"
+dependencies = [
+ "async-stream",
+ "prost 0.11.9",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "tonic-health"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f80db390246dfb46553481f6024f0082ba00178ea495dbb99e70ba9a4fafb5e1"
+dependencies = [
+ "async-stream",
+ "prost 0.12.1",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.10.2",
+]
+
+[[package]]
+name = "tonic-reflection"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0543d7092032041fbeac1f2c84304537553421a11a623c2301b12ef0264862c7"
+dependencies = [
+ "prost 0.11.9",
+ "prost-types 0.11.9",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "hdrhistogram",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
+ "tokio",
+ "tokio-util 0.7.10",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+dependencies = [
+ "async-compression",
+ "base64 0.13.1",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-range-header",
+ "httpdate",
+ "iri-string",
+ "mime",
+ "mime_guess",
+ "percent-encoding 2.3.0",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util 0.7.10",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "trace"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ad0c048e114d19d1140662762bfdb10682f3bc806d8be18af846600214dd9af"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-appender"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
+dependencies = [
+ "crossbeam-channel",
+ "time",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-opentelemetry"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8"
+dependencies = [
+ "once_cell",
+ "opentelemetry",
+ "opentelemetry_sdk",
+ "smallvec",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-serde"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+dependencies = [
+ "serde 1.0.190",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "serde 1.0.190",
+ "serde_json",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "time",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-serde",
+]
+
+[[package]]
+name = "treeline"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror",
+ "url 2.4.1",
+ "utf-8",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+[[package]]
+name = "typed-store"
+version = "0.4.0-canonical-sui"
+dependencies = [
+ "async-trait",
+ "bcs 0.1.6",
+ "bincode",
+ "collectable",
+ "eyre",
+ "fdlimit",
+ "hdrhistogram",
+ "itertools 0.10.5",
+ "msim",
+ "once_cell",
+ "ouroboros 0.17.2",
+ "prometheus",
+ "rand 0.8.5",
+ "rocksdb",
+ "serde 1.0.190",
+ "sui-macros",
+ "tap",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "typed-store-error",
+ "workspace-hack",
+]
+
+[[package]]
+name = "typed-store-derive"
+version = "0.3.0-canonical-sui"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 1.0.109",
+ "workspace-hack",
+]
+
+[[package]]
+name = "typed-store-error"
+version = "0.4.0-canonical-sui"
+dependencies = [
+ "serde 1.0.190",
+ "thiserror",
+ "workspace-hack",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-segment"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23"
+dependencies = [
+ "unic-ucd-segment",
+]
+
+[[package]]
+name = "unic-ucd-segment"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+
+[[package]]
+name = "unsigned-varint"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+dependencies = [
+ "idna 0.1.5",
+ "matches",
+ "percent-encoding 1.0.1",
+]
+
+[[package]]
+name = "url"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+dependencies = [
+ "form_urlencoded",
+ "idna 0.4.0",
+ "percent-encoding 2.3.0",
+]
+
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "uuid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+dependencies = [
+ "getrandom 0.2.10",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "variant_count"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124"
+dependencies = [
+ "quote 1.0.33",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+dependencies = [
+ "quote 1.0.33",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+
+[[package]]
+name = "wasm-streams"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "whoami"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[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 = "workspace-hack"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01"
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "x25519-dalek"
+version = "1.2.0"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core 0.5.1",
+ "zeroize",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
+dependencies = [
+ "asn1-rs",
+ "base64 0.13.1",
+ "data-encoding",
+ "der-parser",
+ "lazy_static 1.4.0",
+ "nom 7.1.3",
+ "oid-registry",
+ "ring 0.16.20",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
+dependencies = [
+ "asn1-rs",
+ "data-encoding",
+ "der-parser",
+ "lazy_static 1.4.0",
+ "nom 7.1.3",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96f8f25c15a0edc9b07eb66e7e6e97d124c0505435c382fde1ab7ceb188aa956"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive 0.6.5",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+dependencies = [
+ "zerocopy-derive 0.7.25",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "855e0f6af9cd72b87d8a6c586f3cb583f5cdcc62c2c80869d8cd7e96fdf7ee20"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "zstd"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "6.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.9+zstd.1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/canonical/Cargo.toml b/canonical/Cargo.toml
new file mode 100644
index 000000000..f43d12285
--- /dev/null
+++ b/canonical/Cargo.toml
@@ -0,0 +1,54 @@
+[workspace]
+resolver = "2"
+members = [
+
+    "canonical-move-resolver",
+    "canonical-move-natives",
+
+    "canonical-block-executor",
+
+    "canonical-types"
+
+]
+
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+authors = ["Liam Monninger <liam@movementlabs.xyz>"]
+homepage = "https://www.movementlabs.xyz"
+publish = false
+repository = "https://github.com/movemntdev/m2"
+rust-version = "1.70"
+
+# testing
+
+[workspace.dependencies]
+# internal
+canonical-types = { path = "../canonical-types" }
+
+# general
+anyhow = "1.0.44"
+futures = "0.3.17"
+rand = "0.8.4"
+bcs = "0.1.0"
+
+# aptos
+aptos-framework = { path = "../vendors/aptos-core/aptos-move/framework" }
+aptos-vm = { path = "../vendors/aptos-core/aptos-move/aptos-vm" }
+aptos-types = { path = "../vendors/aptos-core/types" }
+aptos-executor = { path = "../vendors/aptos-core/execution/executor" }
+aptos-executor-types = { path = "../vendors/aptos-core/execution/executor-types" }
+aptos-storage-interface = { path = "../vendors/aptos-core/storage/storage-interface" }
+
+# sui
+sui-adapter-latest = { path = "../vendors/sui/sui-execution/latest/sui-adapter" }
+sui-types = { path = "../vendors/sui/crates/sui-types" }
+sui-core = { path = "../vendors/sui/crates/sui-core" }
+
+# movement
+movement-sdk = { path = "../movement-sdk/movement-sdk" }
+
+# patches
+[replace]
+"move-abigen:0.1.0" = { path = "../vendors/sui/external-crates/move/move-prover/move-abigen" }
\ No newline at end of file
diff --git a/canonical/canonical-block-executor/Cargo.toml b/canonical/canonical-block-executor/Cargo.toml
new file mode 100644
index 000000000..15a1300db
--- /dev/null
+++ b/canonical/canonical-block-executor/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "canonical-block-executor"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+avalanche-types = { version = "0.0.398", features = ["subnet", "codec_base64"] }
+tokio = { version = "1.25.0", features = ["fs", "rt-multi-thread"] }
+tonic = { version = "0.8.3", features = ["gzip"] }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.93" # https://github.com/serde-rs/json/releases
+serde_with = { version = "2.2.0", features = ["hex"] }
+log = "0.4.17"
+dirs = "5.0.1"
+hex = "0.4.3"
+bytes = "1.4.0"
+env_logger = "0.10.0"
+base64 = { version = "0.21.0" }
+chrono = "0.4.23"
+derivative = "2.2.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0" }
+jsonrpc-derive = "18.0.0"
+async-channel = "1.9.0"
+
+anyhow = { workspace = true }
+futures = { workspace = true }
+rand = { workspace = true }
+bcs = { workspace = true }
+movement-sdk = { workspace = true }
+
+# sui
+# todo: conflicting rocksdb means we can't use workspace
+# todo: likely movement-sdk will move into its own workspace
+# todo: once that happens, we can move sui into its own workspace
+# todo: we will have to reconcile the two when we begin on the canonical VM
+sui-adapter-latest = { workspace = true }
+sui-types = { workspace = true }
+sui-core = { workspace = true }
diff --git a/canonical/canonical-block-executor/src/canonical_block_executor/mod.rs b/canonical/canonical-block-executor/src/canonical_block_executor/mod.rs
new file mode 100644
index 000000000..a977943da
--- /dev/null
+++ b/canonical/canonical-block-executor/src/canonical_block_executor/mod.rs
@@ -0,0 +1,71 @@
+use movement_sdk::{ExecutionLayer};
+use canonical_move_resolver::CanonicalMoveResolver;
+use canonical_types::{Transaction, Block};
+
+pub mod sui_block_executor;
+
+// todo: this will likely be a wrapper around some kind of 
+// todo: type-state pattern structs that handle the bootstrapping
+// todo: or else we will move that to a higher order
+// todo: good thing to consider for the movement_sdk
+pub struct CanonicalBlockExecutionLayer<'state> {
+    move_resolver : CanonicalMoveResolver<'state>
+}
+
+impl <'state> CanonicalBlockExecutionLayer<'state> {
+
+    fn get_aptos_vm(){
+        unimplemented!();
+    }
+
+    fn get_sui_executor(){
+        unimplemented!();
+    }
+
+    /// Filters the block to just Aptos transactions.
+    fn get_aptos_block(block : Block){
+        unimplemented!();
+    }
+
+    /// Filters the block to just Sui transactions.
+    /// Sui blocks are a fundamentally new construct.
+    /// Sui does not have blocks in its original form.
+    /// Concurrency considerations have not been made.
+    fn get_sui_block(block : Block){
+        unimplemented!();
+    }
+
+    /// Executes a canonical block.
+    /// Canonical blocks in V1 are split into their respective transaction blocks.
+    /// This is done to accommodate a transaction flow that is compatible with their respective RPCs.
+    /// While Aptos has an original notion of blocks, Sui does not.
+    /// Aptos transactions will thus be executed concurrently, insofar as Block-STM allows.
+    /// Sui transactions will for now be executed sequentially.
+    /// The order of Sui and Aptos execution must be deterministic.
+    /// For now, we propose Sui transactions are executed first, then Aptos.
+    /// We can opt for a more balance strategy at a later date.
+    fn execute(block : Block){
+
+        // 1. Execute the Sui block.
+        let sui_block = self.get_sui_block(block);
+        let sui_executor = self.get_sui_executor();
+
+        // all sui transactions will be sequential for now
+        for transaction in sui_block {
+            
+            sui_executor.execute_transaction_to_effects(
+                transaction,
+                ....
+            );
+
+        }
+
+        // 2. Execute the Aptos block
+        let aptos_block = self.get_aptos_block(block);
+        let aptos_executor = self.get_aptos_executor();
+        aptos_executor.execute_block(aptos_block);
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/README.md b/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/README.md
new file mode 100644
index 000000000..276417aac
--- /dev/null
+++ b/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/README.md
@@ -0,0 +1,4 @@
+# `sui-block-executor`
+**Note**: This may be worthy of its own crate--even outside of the canonical development altogether--as we plan to reuse it in the future.
+
+Sui does not have blocks by default. However, it is possible to use Sui's notion of checkpoints to create an execution model that is similar to blocks. Furthermore, we can disentangle this execution from consensus by using the checkpoint runtime by itself. This is the approach currently adopted in this module.
\ No newline at end of file
diff --git a/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/mod.rs b/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/mod.rs
new file mode 100644
index 000000000..f72504abc
--- /dev/null
+++ b/canonical/canonical-block-executor/src/canonical_block_executor/sui_block_executor/mod.rs
@@ -0,0 +1,53 @@
+use std::sync::{
+    Arc
+};
+
+use tokio::sync::{RwLock};
+
+use sui_core::checkpoints::checkpoint_executor::{
+    CheckpointExecutor
+};
+
+#[derive(Debug, Clone)]
+pub struct SuiBlockExecutor {
+    checkpoint_executor: Arc<RwLock<CheckpointExecutor>>
+}
+
+/*async fn init_executor_test(
+    buffer_size: usize,
+    store: Arc<CheckpointStore>,
+) -> (
+    Arc<AuthorityState>,
+    CheckpointExecutor,
+    Arc<StateAccumulator>,
+    Sender<VerifiedCheckpoint>,
+    CommitteeFixture,
+) {
+    let network_config =
+        sui_swarm_config::network_config_builder::ConfigBuilder::new_with_temp_dir().build();
+    let state = TestAuthorityBuilder::new()
+        .with_network_config(&network_config)
+        .build()
+        .await;
+
+    let (checkpoint_sender, _): (Sender<VerifiedCheckpoint>, Receiver<VerifiedCheckpoint>) =
+        broadcast::channel(buffer_size);
+
+    let accumulator = StateAccumulator::new(state.database.clone());
+    let accumulator = Arc::new(accumulator);
+
+    let executor = CheckpointExecutor::new_for_tests(
+        checkpoint_sender.subscribe(),
+        store.clone(),
+        state.database.clone(),
+        state.transaction_manager().clone(),
+        accumulator.clone(),
+    );
+    (
+        state,
+        executor,
+        accumulator,
+        checkpoint_sender,
+        CommitteeFixture::from_network_config(&network_config),
+    )
+}*/
diff --git a/canonical/canonical-block-executor/src/lib.rs b/canonical/canonical-block-executor/src/lib.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/canonical/canonical-move-natives/Cargo.toml b/canonical/canonical-move-natives/Cargo.toml
new file mode 100644
index 000000000..e313416ae
--- /dev/null
+++ b/canonical/canonical-move-natives/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "canonical-move-natives"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+avalanche-types = { version = "0.0.398", features = ["subnet", "codec_base64"] }
+tokio = { version = "1.25.0", features = ["fs", "rt-multi-thread"] }
+tonic = { version = "0.8.3", features = ["gzip"] }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.93" # https://github.com/serde-rs/json/releases
+serde_with = { version = "2.2.0", features = ["hex"] }
+log = "0.4.17"
+dirs = "5.0.1"
+hex = "0.4.3"
+bytes = "1.4.0"
+env_logger = "0.10.0"
+base64 = { version = "0.21.0" }
+chrono = "0.4.23"
+derivative = "2.2.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0" }
+jsonrpc-derive = "18.0.0"
+async-channel = "1.9.0"
+
+anyhow = { workspace = true }
+futures = { workspace = true }
+rand = { workspace = true }
+bcs = { workspace = true }
+movement-sdk = { workspace = true }
+
+# sui
+# todo: conflicting rocksdb means we can't use workspace
+# todo: likely movement-sdk will move into its own workspace
+# todo: once that happens, we can move sui into its own workspace
+# todo: we will have to reconcile the two when we begin on the canonical VM
+sui-adapter-latest = { workspace = true }
+sui-types = { workspace = true }
diff --git a/canonical/canonical-move-natives/README.md b/canonical/canonical-move-natives/README.md
new file mode 100644
index 000000000..995c67b8a
--- /dev/null
+++ b/canonical/canonical-move-natives/README.md
@@ -0,0 +1,7 @@
+# `canonical-move-natives`
+This crate is used to create the move function tables for both the `AptosVm` and `SuiExecutor` by wrapping over the `CanonicalMoveResolver`.
+
+In both cases, the natives table SHALL consist of
+- Move stdlib natives (automatically compatible).
+- Aptos natives (needs investigation).
+- Sui natives (should be compatible via the resolver).
\ No newline at end of file
diff --git a/canonical/canonical-move-natives/src/canonical_move_natives/mod.rs b/canonical/canonical-move-natives/src/canonical_move_natives/mod.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/canonical/canonical-move-natives/src/lib.rs b/canonical/canonical-move-natives/src/lib.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/canonical/canonical-move-resolver/Cargo.toml b/canonical/canonical-move-resolver/Cargo.toml
new file mode 100644
index 000000000..3cab1a044
--- /dev/null
+++ b/canonical/canonical-move-resolver/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "canonical-move-resolver"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+avalanche-types = { version = "0.0.398", features = ["subnet", "codec_base64"] }
+tokio = { version = "1.25.0", features = ["fs", "rt-multi-thread"] }
+tonic = { version = "0.8.3", features = ["gzip"] }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.93" # https://github.com/serde-rs/json/releases
+serde_with = { version = "2.2.0", features = ["hex"] }
+log = "0.4.17"
+dirs = "5.0.1"
+hex = "0.4.3"
+bytes = "1.4.0"
+env_logger = "0.10.0"
+base64 = { version = "0.21.0" }
+chrono = "0.4.23"
+derivative = "2.2.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0" }
+jsonrpc-derive = "18.0.0"
+async-channel = "1.9.0"
+
+anyhow = { workspace = true }
+futures = { workspace = true }
+rand = { workspace = true }
+bcs = { workspace = true }
+movement-sdk = { workspace = true }
+
+# aptos
+aptos-storage-interface = { workspace = true }
+
+# sui
+# todo: conflicting rocksdb means we can't use workspace
+# todo: likely movement-sdk will move into its own workspace
+# todo: once that happens, we can move sui into its own workspace
+# todo: we will have to reconcile the two when we begin on the canonical VM
+sui-adapter-latest = { workspace = true }
+sui-types = { workspace = true }
diff --git a/canonical/canonical-move-resolver/README.md b/canonical/canonical-move-resolver/README.md
new file mode 100644
index 000000000..6dc555f52
--- /dev/null
+++ b/canonical/canonical-move-resolver/README.md
@@ -0,0 +1 @@
+# Canonical VM
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/canonical_move_resolver/aptos.rs b/canonical/canonical-move-resolver/src/canonical_move_resolver/aptos.rs
new file mode 100644
index 000000000..d3c89d8ba
--- /dev/null
+++ b/canonical/canonical-move-resolver/src/canonical_move_resolver/aptos.rs
@@ -0,0 +1,5 @@
+/// An easy way to do this is actually to wrap over the reader-writer, 
+/// rather than directly implementing the move resolver.
+mod db_reader_writer {
+
+}
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/canonical_move_resolver/mod.rs b/canonical/canonical-move-resolver/src/canonical_move_resolver/mod.rs
new file mode 100644
index 000000000..51c58957f
--- /dev/null
+++ b/canonical/canonical-move-resolver/src/canonical_move_resolver/mod.rs
@@ -0,0 +1,30 @@
+pub mod aptos;
+pub mod sui;
+
+/// This is where the common resolver should be defined. 
+/// Essentially, it will be composed of a Sui resolver and an Aptos resolver.
+/// First, we will check for an Aptos struct.
+/// Then, we will check for a Sui object.
+
+// todo: skeleton
+pub struct CommonResolver<'state> {
+    aptos_resolver : AptosResolver<'state>,
+    sui_resolver : SuiResolver<'state>
+}
+
+// todo: skeleton
+impl <'state>ResourceResolver for CommonResolver<'state> {
+
+    fn get_resource() {
+
+        // aptos resolver takes priority
+        match self.aptos_resolver.get_resource() {
+            Some(resource) => Some(resource),
+            None=>{
+                self.sui_resolver.get_resource()
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/canonical_move_resolver/sui.rs b/canonical/canonical-move-resolver/src/canonical_move_resolver/sui.rs
new file mode 100644
index 000000000..71ef8ef01
--- /dev/null
+++ b/canonical/canonical-move-resolver/src/canonical_move_resolver/sui.rs
@@ -0,0 +1,3 @@
+/*impl Into<SuiResolver> for {
+
+}*/
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/lib.rs b/canonical/canonical-move-resolver/src/lib.rs
new file mode 100644
index 000000000..729916a6c
--- /dev/null
+++ b/canonical/canonical-move-resolver/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod util;
+pub mod canonical_move_resolver;
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/main.rs b/canonical/canonical-move-resolver/src/main.rs
new file mode 100644
index 000000000..d83a47485
--- /dev/null
+++ b/canonical/canonical-move-resolver/src/main.rs
@@ -0,0 +1,3 @@
+pub fn main() {
+    unimplemented!()
+}
\ No newline at end of file
diff --git a/canonical/canonical-move-resolver/src/util/mod.rs b/canonical/canonical-move-resolver/src/util/mod.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/canonical/canonical-rpc/Cargo.toml b/canonical/canonical-rpc/Cargo.toml
new file mode 100644
index 000000000..4d5d13620
--- /dev/null
+++ b/canonical/canonical-rpc/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "canonical-rpc"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+avalanche-types = { version = "0.0.398", features = ["subnet", "codec_base64"] }
+tokio = { version = "1.25.0", features = ["fs", "rt-multi-thread"] }
+tonic = { version = "0.8.3", features = ["gzip"] }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.93" # https://github.com/serde-rs/json/releases
+serde_with = { version = "2.2.0", features = ["hex"] }
+log = "0.4.17"
+dirs = "5.0.1"
+hex = "0.4.3"
+bytes = "1.4.0"
+env_logger = "0.10.0"
+base64 = { version = "0.21.0" }
+chrono = "0.4.23"
+derivative = "2.2.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0" }
+jsonrpc-derive = "18.0.0"
+async-channel = "1.9.0"
+
+anyhow = { workspace = true }
+futures = { workspace = true }
+rand = { workspace = true }
+bcs = { workspace = true }
+movement-sdk = { workspace = true }
+
+# sui
+# todo: conflicting rocksdb means we can't use workspace
+# todo: likely movement-sdk will move into its own workspace
+# todo: once that happens, we can move sui into its own workspace
+# todo: we will have to reconcile the two when we begin on the canonical VM
+sui-adapter-latest = { workspace = true }
+sui-types = { workspace = true }
diff --git a/canonical/canonical-rpc/README.md b/canonical/canonical-rpc/README.md
new file mode 100644
index 000000000..b6f9785a9
--- /dev/null
+++ b/canonical/canonical-rpc/README.md
@@ -0,0 +1,6 @@
+# `canonical-rpc`
+The canonical RPC is the complete RPC implementation for the Canonical Move VM. It contains:
+- `canonical/` routes which are routes supporting the combined execution of Aptos and Sui.
+- `aptos/` routes which are compatible with the upstream Aptos RPC.
+- `sui/` routes which are compatible with the upstream Sui RPC.
+- `movement/` routes which are derived as a consequence of implementing within the `movement-sdk` framework.
\ No newline at end of file
diff --git a/canonical/canonical-rpc/src/lib.rs b/canonical/canonical-rpc/src/lib.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/canonical/canonical-types/Cargo.toml b/canonical/canonical-types/Cargo.toml
new file mode 100644
index 000000000..a0bb537b1
--- /dev/null
+++ b/canonical/canonical-types/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "standalone-sui-subnet"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+avalanche-types = { version = "0.0.398", features = ["subnet", "codec_base64"] }
+tokio = { version = "1.25.0", features = ["fs", "rt-multi-thread"] }
+tonic = { version = "0.8.3", features = ["gzip"] }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.93" # https://github.com/serde-rs/json/releases
+serde_with = { version = "2.2.0", features = ["hex"] }
+log = "0.4.17"
+dirs = "5.0.1"
+hex = "0.4.3"
+bytes = "1.4.0"
+env_logger = "0.10.0"
+base64 = { version = "0.21.0" }
+chrono = "0.4.23"
+derivative = "2.2.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0" }
+jsonrpc-derive = "18.0.0"
+async-channel = "1.9.0"
+
+anyhow = { workspace = true }
+futures = { workspace = true }
+rand = { workspace = true }
+bcs = { workspace = true }
+movement-sdk = { workspace = true }
+
+# sui
+sui-adapter-latest = { workspace = true }
+sui-types = { workspace = true }
+
+aptos-types = { workspace = true}
diff --git a/canonical/canonical-types/src/block/block.rs b/canonical/canonical-types/src/block/block.rs
new file mode 100644
index 000000000..943380a06
--- /dev/null
+++ b/canonical/canonical-types/src/block/block.rs
@@ -0,0 +1,51 @@
+// todo: reduce import depth
+use crate::transaction::transaction::Transaction;
+use aptos_types::transaction::Transaction as AptosTransaction;
+
+#[derive(Clone, Debug)]
+pub struct Block(Vec<Transaction>);
+
+impl Block {
+
+    pub fn new(transactions: Vec<Transaction>) -> Self {
+        Block(transactions)
+    }
+
+    /// Filters transactions to those enums which contain Aptos transactions.
+    pub fn filter_aptos_transactions(&self) -> Vec<Transaction> {
+        self.0.iter().filter(|t| t.is_aptos()).cloned().collect()
+    }
+
+    /// Extracts Aptos transactions refs from the block.
+    pub fn extract_aptos_transaction_refs(&self) -> Vec<&AptosTransaction> {
+        self.0.iter().filter_map(|transactions| {
+            match transactions {
+                Transaction::Aptos(aptos_transaction) => Some(aptos_transaction),
+                _ => None
+            }
+        }).collect()
+    }
+
+    /// Extracts Aptos transactions from the block.
+    pub fn extract_aptos_transactions(&self) -> Vec<AptosTransaction> {
+        self.0.iter().filter_map(|transactions| {
+            match transactions {
+                Transaction::Aptos(aptos_transaction) => Some(aptos_transaction.clone()),
+                _ => None
+            }
+        }).collect()
+    }
+
+}
+
+impl Into<Vec<Transaction>> for Block {
+    fn into(self) -> Vec<Transaction> {
+        self.0
+    }
+}
+
+impl Into<Block> for Vec<Transaction> {
+    fn into(self) -> Block {
+        Block(self)
+    }
+}
\ No newline at end of file
diff --git a/canonical/canonical-types/src/block/mod.rs b/canonical/canonical-types/src/block/mod.rs
new file mode 100644
index 000000000..49bc7d4bf
--- /dev/null
+++ b/canonical/canonical-types/src/block/mod.rs
@@ -0,0 +1 @@
+pub mod block;
\ No newline at end of file
diff --git a/canonical/canonical-types/src/lib.rs b/canonical/canonical-types/src/lib.rs
new file mode 100644
index 000000000..cc8af46d5
--- /dev/null
+++ b/canonical/canonical-types/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod transaction;
+pub mod block;
\ No newline at end of file
diff --git a/canonical/canonical-types/src/transaction/mod.rs b/canonical/canonical-types/src/transaction/mod.rs
new file mode 100644
index 000000000..be9dda049
--- /dev/null
+++ b/canonical/canonical-types/src/transaction/mod.rs
@@ -0,0 +1 @@
+pub mod transaction;
\ No newline at end of file
diff --git a/canonical/canonical-types/src/transaction/transaction.rs b/canonical/canonical-types/src/transaction/transaction.rs
new file mode 100644
index 000000000..a99bbff1d
--- /dev/null
+++ b/canonical/canonical-types/src/transaction/transaction.rs
@@ -0,0 +1,28 @@
+use aptos_types::transaction::{Transaction as AptosTransaction};
+use sui_types::transaction::{Transaction as SuiTransaction};
+
+#[derive(Clone, Debug)]
+pub enum Transaction {
+    Aptos(AptosTransaction),
+    Sui(SuiTransaction)
+}
+
+impl Transaction {
+
+
+
+    pub fn is_aptos(&self) -> bool {
+        match self {
+            Transaction::Aptos(_) => true,
+            Transaction::Sui(_) => false
+        }
+    }
+
+    pub fn is_sui(&self) -> bool {
+        match self {
+            Transaction::Aptos(_) => false,
+            Transaction::Sui(_) => true
+        }
+    }
+
+}
diff --git a/canonical/rust-toolchain b/canonical/rust-toolchain
new file mode 100644
index 000000000..832e9afb6
--- /dev/null
+++ b/canonical/rust-toolchain
@@ -0,0 +1 @@
+1.70.0
diff --git a/canonical/rustfmt.toml b/canonical/rustfmt.toml
new file mode 100644
index 000000000..f1c193bbc
--- /dev/null
+++ b/canonical/rustfmt.toml
@@ -0,0 +1,11 @@
+combine_control_expr = false
+edition = "2021"
+imports_granularity = "Crate"
+format_macro_matchers = true
+group_imports = "One"
+hex_literal_case = "Upper"
+match_block_trailing_comma = true
+newline_style = "Unix"
+overflow_delimited_expr = true
+reorder_impl_items = true
+use_field_init_shorthand = true
diff --git a/docker/compose/m1.local.dockercompose.yml b/docker/compose/m1.local.dockercompose.yml
new file mode 100644
index 000000000..2c53c0f2d
--- /dev/null
+++ b/docker/compose/m1.local.dockercompose.yml
@@ -0,0 +1,39 @@
+version: '3.8'
+
+services:
+  node_service:
+    build:
+      context: ../..
+      dockerfile: services/local/subnet-request-proxy.dockerfile
+    ports:
+      - "3000:3000" # Replace with actual port numbers
+    networks:
+      - app-network
+    environment:
+      SUBNET_SOCKET_ADDRESS: 0.0.0.0:9650
+
+  ubuntu_service:
+    build:
+      context: ../..
+      dockerfile: services/local/anr.dockerfile
+    ports:
+      - "9650:9650"
+      - "8090:8090"
+      - "8070:8070"
+    networks:
+      - app-network
+
+  postgresql_service:
+    image: postgres:latest
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
diff --git a/docker/services/local/anr.dockerfile b/docker/services/local/anr.dockerfile
new file mode 100644
index 000000000..d66674e2f
--- /dev/null
+++ b/docker/services/local/anr.dockerfile
@@ -0,0 +1,28 @@
+# Use Ubuntu latest as the base image
+FROM ubuntu:latest
+
+# Set the working directory in the container
+WORKDIR /usr/src/app
+
+# Install necessary tools and dependencies
+RUN apt-get update && apt-get install -y curl build-essential
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+# Install Go
+RUN apt-get install -y golang
+
+# Copy the contents of your working directory to the container
+COPY . .
+
+# Make the script executable
+RUN chmod +x ./m1/scripts/run.debug.sh
+
+EXPOSE 9650
+EXPOSE 8070
+EXPOSE 8090
+
+# Run the script
+CMD cd ./m1 && ./scripts/run.debug.sh
diff --git a/docker/services/local/subnet-request-proxy.dockerfile b/docker/services/local/subnet-request-proxy.dockerfile
new file mode 100644
index 000000000..908a1c81b
--- /dev/null
+++ b/docker/services/local/subnet-request-proxy.dockerfile
@@ -0,0 +1,29 @@
+# Use Node.js version 20 as the base image
+FROM node:20
+
+# Set the working directory inside the container
+WORKDIR /usr/src/app
+
+# Copy package.json and package-lock.json (or yarn.lock) from your local directory to the container
+COPY ./m1/subnet-request-proxy/package*.json ./
+# If you are using yarn, you might want to copy yarn.lock instead
+# COPY ./m1/subnet-request-proxy/yarn.lock ./
+
+# Install dependencies
+RUN npm install
+# If you are using yarn, use this command instead
+# RUN yarn install
+
+# Copy the rest of your application's source code from your local directory to the container
+COPY ./m1/subnet-request-proxy .
+
+# Set environment variables
+ENV PORT=3000
+ENV SUBNET_ALIAS=subnet
+ENV SUBNET_SOCKET_ADDRESS="0.0.0.0:9650"
+
+# Expose the port the app runs on
+EXPOSE ${PORT}
+
+# Define the command to run your app (make sure app.js is the entry point of your app)
+CMD ["node", "app.js"]
diff --git a/m1/.gitignore b/m1/.gitignore
index f2f9e58ec..28b51c0f9 100644
--- a/m1/.gitignore
+++ b/m1/.gitignore
@@ -1,2 +1,4 @@
 target
-Cargo.lock
\ No newline at end of file
+Cargo.lock
+avalanchego
+plugins
\ No newline at end of file
diff --git a/m1/Cargo.toml b/m1/Cargo.toml
index cf49f9a37..ae2db931b 100644
--- a/m1/Cargo.toml
+++ b/m1/Cargo.toml
@@ -4,6 +4,7 @@ members = [
     "subnet",
     "movement",
     "movement-benchmark",
+    "tests/e2e"
 ]
 
 [workspace.package]
@@ -70,179 +71,179 @@ jemallocator = { version = "0.3.2", features = [
 ] }
 
 # MOVE DEPENDENCIES
-move-abigen = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover/move-abigen" }
-move-binary-format = { path = "../third-party/aptos-core-1.7/third_party/move/move-binary-format" }
-move-bytecode-verifier = { path = "../third-party/aptos-core-1.7/third_party/move/move-bytecode-verifier" }
-move-bytecode-utils = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-bytecode-utils" }
-move-cli = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-cli" }
-move-command-line-common = { path = "../third-party/aptos-core-1.7/third_party/move/move-command-line-common" }
-move-coverage = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-coverage" }
-move-compiler = { path = "../third-party/aptos-core-1.7/third_party/move/move-compiler" }
-move-core-types = { path = "../third-party/aptos-core-1.7/third_party/move/move-core/types" }
-move-docgen = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover/move-docgen" }
-move-disassembler = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-disassembler" }
-move-ir-types = { path = "../third-party/aptos-core-1.7/third_party/move/move-ir/types" }
-move-ir-compiler = { path = "../third-party/aptos-core-1.7/third_party/move/move-ir-compiler" }
-move-bytecode-source-map = { path = "../third-party/aptos-core-1.7/third_party/move/move-ir-compiler/move-bytecode-source-map" }
-move-model = { path = "../third-party/aptos-core-1.7/third_party/move/move-model" }
-move-package = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-package" }
-move-prover = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover" }
-move-prover-boogie-backend = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover/boogie-backend" }
-move-stackless-bytecode = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover/bytecode" }
+move-abigen = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover/move-abigen" }
+move-binary-format = { path = "../vendors/aptos-core-1.7/third_party/move/move-binary-format" }
+move-bytecode-verifier = { path = "../vendors/aptos-core-1.7/third_party/move/move-bytecode-verifier" }
+move-bytecode-utils = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-bytecode-utils" }
+move-cli = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-cli" }
+move-command-line-common = { path = "../vendors/aptos-core-1.7/third_party/move/move-command-line-common" }
+move-coverage = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-coverage" }
+move-compiler = { path = "../vendors/aptos-core-1.7/third_party/move/move-compiler" }
+move-core-types = { path = "../vendors/aptos-core-1.7/third_party/move/move-core/types" }
+move-docgen = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover/move-docgen" }
+move-disassembler = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-disassembler" }
+move-ir-types = { path = "../vendors/aptos-core-1.7/third_party/move/move-ir/types" }
+move-ir-compiler = { path = "../vendors/aptos-core-1.7/third_party/move/move-ir-compiler" }
+move-bytecode-source-map = { path = "../vendors/aptos-core-1.7/third_party/move/move-ir-compiler/move-bytecode-source-map" }
+move-model = { path = "../vendors/aptos-core-1.7/third_party/move/move-model" }
+move-package = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-package" }
+move-prover = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover" }
+move-prover-boogie-backend = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover/boogie-backend" }
+move-stackless-bytecode = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover/bytecode" }
 aptos-move-stdlib = { path = "aptos-move/framework/move-stdlib" }
-move-prover-test-utils = { path = "../third-party/aptos-core-1.7/third_party/move/move-prover/test-utils" }
-move-resource-viewer = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-resource-viewer" }
-move-symbol-pool = { path = "../third-party/aptos-core-1.7/third_party/move/move-symbol-pool" }
-move-table-extension = { path = "../third-party/aptos-core-1.7/third_party/move/extensions/move-table-extension" }
-move-transactional-test-runner = { path = "../third-party/aptos-core-1.7/third_party/move/testing-infra/transactional-test-runner" }
-move-unit-test = { path = "../third-party/aptos-core-1.7/third_party/move/tools/move-unit-test", features = ["table-extension"] }
-move-vm-runtime = { path = "../third-party/aptos-core-1.7/third_party/move/move-vm/runtime" }
-move-vm-test-utils = { path = "../third-party/aptos-core-1.7/third_party/move/move-vm/test-utils", features = ["table-extension"] }
-move-vm-types = { path = "../third-party/aptos-core-1.7/third_party/move/move-vm/types" }
-read-write-set = { path = "../third-party/aptos-core-1.7/third_party/move/tools/read-write-set" }
-read-write-set-dynamic = { path = "../third-party/aptos-core-1.7/third_party/move/tools/read-write-set/dynamic" }
+move-prover-test-utils = { path = "../vendors/aptos-core-1.7/third_party/move/move-prover/test-utils" }
+move-resource-viewer = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-resource-viewer" }
+move-symbol-pool = { path = "../vendors/aptos-core-1.7/third_party/move/move-symbol-pool" }
+move-table-extension = { path = "../vendors/aptos-core-1.7/third_party/move/extensions/move-table-extension" }
+move-transactional-test-runner = { path = "../vendors/aptos-core-1.7/third_party/move/testing-infra/transactional-test-runner" }
+move-unit-test = { path = "../vendors/aptos-core-1.7/third_party/move/tools/move-unit-test", features = ["table-extension"] }
+move-vm-runtime = { path = "../vendors/aptos-core-1.7/third_party/move/move-vm/runtime" }
+move-vm-test-utils = { path = "../vendors/aptos-core-1.7/third_party/move/move-vm/test-utils", features = ["table-extension"] }
+move-vm-types = { path = "../vendors/aptos-core-1.7/third_party/move/move-vm/types" }
+read-write-set = { path = "../vendors/aptos-core-1.7/third_party/move/tools/read-write-set" }
+read-write-set-dynamic = { path = "../vendors/aptos-core-1.7/third_party/move/tools/read-write-set/dynamic" }
 
 # aptos
 # TODO: pleas remove unused dependencies
-aptos = { path = "../third-party/aptos-core-1.7/crates/aptos" }
-aptos-accumulator = { path = "../third-party/aptos-core-1.7/storage/accumulator" }
-aptos-aggregator = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-aggregator" }
-aptos-api = { path = "../third-party/aptos-core-1.7/api" }
-aptos-api-test-context = { path = "../third-party/aptos-core-1.7/api/test-context" }
-aptos-api-types = { path = "../third-party/aptos-core-1.7/api/types" }
-aptos-backup-cli = { path = "../third-party/aptos-core-1.7/storage/backup/backup-cli" }
-aptos-backup-service = { path = "../third-party/aptos-core-1.7/storage/backup/backup-service" }
-aptos-bounded-executor = { path = "../third-party/aptos-core-1.7/crates/bounded-executor" }
-aptos-block-executor = { path = "../third-party/aptos-core-1.7/aptos-move/block-executor" }
-aptos-bitvec = { path = "../third-party/aptos-core-1.7/crates/aptos-bitvec" }
-aptos-build-info = { path = "../third-party/aptos-core-1.7/crates/aptos-build-info" }
-aptos-cached-packages = { path = "../third-party/aptos-core-1.7/aptos-move/framework/cached-packages" }
-aptos-channels = { path = "../third-party/aptos-core-1.7/crates/channel" }
-aptos-cli-common = { path = "../third-party/aptos-core-1.7/crates/aptos-cli-common" }
-aptos-compression = { path = "../third-party/aptos-core-1.7/crates/aptos-compression" }
-aptos-consensus = { path = "../third-party/aptos-core-1.7/consensus" }
-aptos-consensus-notifications = { path = "../third-party/aptos-core-1.7/state-sync/inter-component/consensus-notifications" }
-aptos-consensus-types = { path = "../third-party/aptos-core-1.7/consensus/consensus-types" }
-aptos-config = { path = "../third-party/aptos-core-1.7/config" }
-aptos-crash-handler = { path = "../third-party/aptos-core-1.7/crates/crash-handler" }
-aptos-crypto = { path = "../third-party/aptos-core-1.7/crates/aptos-crypto" }
-aptos-crypto-derive = { path = "../third-party/aptos-core-1.7/crates/aptos-crypto-derive" }
-aptos-data-client = { path = "../third-party/aptos-core-1.7/state-sync/aptos-data-client" }
-aptos-data-streaming-service = { path = "../third-party/aptos-core-1.7/state-sync/state-sync-v2/data-streaming-service" }
-aptos-db = { path = "../third-party/aptos-core-1.7/storage/aptosdb" }
-aptos-db-indexer = { path = "../third-party/aptos-core-1.7/storage/indexer" }
-aptos-db-tool = { path = "../third-party/aptos-core-1.7/storage/db-tool" }
-aptos-debugger = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-debugger" }
-aptos-event-notifications = { path = "../third-party/aptos-core-1.7/state-sync/inter-component/event-notifications" }
-aptos-executable-store = { path = "../third-party/aptos-core-1.7/storage/executable-store" }
-aptos-executor = { path = "../third-party/aptos-core-1.7/execution/executor" }
-aptos-block-partitioner = { path = "../third-party/aptos-core-1.7/execution/block-partitioner" }
-aptos-enum-conversion-derive = { path = "../third-party/aptos-core-1.7/crates/aptos-enum-conversion-derive" }
-aptos-executor-service = { path = "../third-party/aptos-core-1.7/execution/executor-service" }
-aptos-executor-test-helpers = { path = "../third-party/aptos-core-1.7/execution/executor-test-helpers" }
-aptos-executor-types = { path = "../third-party/aptos-core-1.7/execution/executor-types" }
-aptos-faucet-cli = { path = "../third-party/aptos-core-1.7/crates/aptos-faucet/cli" }
-aptos-faucet-core = { path = "../third-party/aptos-core-1.7/crates/aptos-faucet/core" }
-aptos-faucet-service = { path = "../third-party/aptos-core-1.7/crates/aptos-faucet/service" }
-aptos-faucet-metrics-server = { path = "../third-party/aptos-core-1.7/crates/aptos-faucet/metrics-server" }
-aptos-fallible = { path = "../third-party/aptos-core-1.7/crates/fallible" }
-aptos-forge = { path = "../third-party/aptos-core-1.7/testsuite/forge" }
-aptos-framework = { path = "../third-party/aptos-core-1.7/aptos-move/framework" }
-aptos-fuzzer = { path = "../third-party/aptos-core-1.7/testsuite/aptos-fuzzer" }
-fuzzer = { path = "../third-party/aptos-core-1.7/testsuite/fuzzer" }
-aptos-gas = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-gas" }
-aptos-gas-algebra-ext = { path = "../third-party/aptos-core-1.7/aptos-move/gas-algebra-ext" }
-aptos-gas-profiling = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-gas-profiling" }
-aptos-genesis = { path = "../third-party/aptos-core-1.7/crates/aptos-genesis" }
-aptos-github-client = { path = "../third-party/aptos-core-1.7/secure/storage/github" }
-aptos-global-constants = { path = "../third-party/aptos-core-1.7/config/global-constants" }
-aptos-id-generator = { path = "../third-party/aptos-core-1.7/crates/aptos-id-generator" }
-aptos-indexer = { path = "../third-party/aptos-core-1.7/crates/indexer" }
-aptos-indexer-grpc-cache-worker = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-cache-worker" }
-aptos-indexer-grpc-data-service = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-data-service" }
-aptos-indexer-grpc-file-store = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-file-store" }
-aptos-indexer-grpc-post-processor = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-post-processor" }
-aptos-indexer-grpc-fullnode = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-fullnode" }
-aptos-indexer-grpc-utils = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-utils" }
-aptos-indexer-grpc-parser = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-parser" }
-aptos-indexer-grpc-server-framework = { path = "../third-party/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-server-framework" }
-aptos-infallible = { path = "../third-party/aptos-core-1.7/crates/aptos-infallible" }
-aptos-inspection-service = { path = "../third-party/aptos-core-1.7/crates/aptos-inspection-service" }
-aptos-jellyfish-merkle = { path = "../third-party/aptos-core-1.7/storage/jellyfish-merkle" }
-aptos-keygen = { path = "../third-party/aptos-core-1.7/crates/aptos-keygen" }
-aptos-language-e2e-tests = { path = "../third-party/aptos-core-1.7/aptos-move/e2e-tests" }
-aptos-ledger = { path = "../third-party/aptos-core-1.7/crates/aptos-ledger" }
-aptos-log-derive = { path = "../third-party/aptos-core-1.7/crates/aptos-log-derive" }
-aptos-logger = { path = "../third-party/aptos-core-1.7/crates/aptos-logger" }
-aptos-memory-usage-tracker = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-memory-usage-tracker" }
-aptos-mempool = { path = "../third-party/aptos-core-1.7/mempool" }
-aptos-mempool-notifications = { path = "../third-party/aptos-core-1.7/state-sync/inter-component/mempool-notifications" }
-aptos-memsocket = { path = "../third-party/aptos-core-1.7/network/memsocket" }
-aptos-metrics-core = { path = "../third-party/aptos-core-1.7/crates/aptos-metrics-core" }
-aptos-move-examples = { path = "../third-party/aptos-core-1.7/aptos-move/move-examples" }
-aptos-moving-average = { path = "../third-party/aptos-core-1.7/crates/moving-average" }
-aptos-mvhashmap = { path = "../third-party/aptos-core-1.7/aptos-move/mvhashmap" }
-aptos-netcore = { path = "../third-party/aptos-core-1.7/network/netcore" }
-aptos-network = { path = "../third-party/aptos-core-1.7/network" }
-aptos-network-builder = { path = "../third-party/aptos-core-1.7/network/builder" }
-aptos-network-checker = { path = "../third-party/aptos-core-1.7/crates/aptos-network-checker" }
-aptos-network-discovery = { path = "../third-party/aptos-core-1.7/network/discovery" }
-aptos-node = { path = "../third-party/aptos-core-1.7/aptos-node" }
-aptos-node-checker = { path = "../third-party/aptos-core-1.7/ecosystem/node-checker" }
-aptos-node-identity = { path = "../third-party/aptos-core-1.7/crates/aptos-node-identity" }
-aptos-node-resource-metrics = { path = "../third-party/aptos-core-1.7/crates/node-resource-metrics" }
-aptos-num-variants = { path = "../third-party/aptos-core-1.7/crates/num-variants" }
-aptos-openapi = { path = "../third-party/aptos-core-1.7/crates/aptos-openapi" }
-aptos-package-builder = { path = "../third-party/aptos-core-1.7/aptos-move/package-builder" }
-aptos-peer-monitoring-service-client = { path = "../third-party/aptos-core-1.7/network/peer-monitoring-service/client" }
-aptos-peer-monitoring-service-server = { path = "../third-party/aptos-core-1.7/network/peer-monitoring-service/server" }
-aptos-peer-monitoring-service-types = { path = "../third-party/aptos-core-1.7/network/peer-monitoring-service/types" }
-aptos-proptest-helpers = { path = "../third-party/aptos-core-1.7/crates/aptos-proptest-helpers" }
-aptos-protos = { path = "../third-party/aptos-core-1.7/crates/aptos-protos" }
-aptos-proxy = { path = "../third-party/aptos-core-1.7/crates/proxy" }
-aptos-push-metrics = { path = "../third-party/aptos-core-1.7/crates/aptos-push-metrics" }
-aptos-rate-limiter = { path = "../third-party/aptos-core-1.7/crates/aptos-rate-limiter" }
-aptos-release-builder = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-release-builder" }
-aptos-resource-viewer = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-resource-viewer" }
-aptos-rest-client = { path = "../third-party/aptos-core-1.7/crates/aptos-rest-client" }
-aptos-retrier = { path = "../third-party/aptos-core-1.7/crates/aptos-retrier" }
-aptos-rocksdb-options = { path = "../third-party/aptos-core-1.7/storage/rocksdb-options" }
-aptos-rosetta = { path = "../third-party/aptos-core-1.7/crates/aptos-rosetta" }
-aptos-runtimes = { path = "../third-party/aptos-core-1.7/crates/aptos-runtimes" }
-aptos-safety-rules = { path = "../third-party/aptos-core-1.7/consensus/safety-rules" }
-aptos-schemadb = { path = "../third-party/aptos-core-1.7/storage/schemadb" }
-aptos-scratchpad = { path = "../third-party/aptos-core-1.7/storage/scratchpad" }
-aptos-sdk = { path = "../third-party/aptos-core-1.7/sdk" }
-aptos-sdk-builder = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-sdk-builder" }
-aptos-secure-net = { path = "../third-party/aptos-core-1.7/secure/net" }
-aptos-secure-storage = { path = "../third-party/aptos-core-1.7/secure/storage" }
-aptos-short-hex-str = { path = "../third-party/aptos-core-1.7/crates/short-hex-str" }
-aptos-speculative-state-helper = { path = "../third-party/aptos-core-1.7/crates/aptos-speculative-state-helper" }
-aptos-state-sync-driver = { path = "../third-party/aptos-core-1.7/state-sync/state-sync-v2/state-sync-driver" }
-aptos-state-view = { path = "../third-party/aptos-core-1.7/storage/state-view" }
-aptos-storage-interface = { path = "../third-party/aptos-core-1.7/storage/storage-interface" }
-aptos-storage-service-client = { path = "../third-party/aptos-core-1.7/state-sync/storage-service/client" }
-aptos-storage-service-notifications = { path = "../third-party/aptos-core-1.7/state-sync/inter-component/storage-service-notifications" }
-aptos-storage-service-types = { path = "../third-party/aptos-core-1.7/state-sync/storage-service/types" }
-aptos-storage-service-server = { path = "../third-party/aptos-core-1.7/state-sync/storage-service/server" }
-aptos-telemetry = { path = "../third-party/aptos-core-1.7/crates/aptos-telemetry" }
-aptos-telemetry-service = { path = "../third-party/aptos-core-1.7/crates/aptos-telemetry-service" }
-aptos-temppath = { path = "../third-party/aptos-core-1.7/crates/aptos-temppath" }
-aptos-testcases = { path = "../third-party/aptos-core-1.7/testsuite/testcases" }
-aptos-time-service = { path = "../third-party/aptos-core-1.7/crates/aptos-time-service", features = [
+aptos = { path = "../vendors/aptos-core-1.7/crates/aptos" }
+aptos-accumulator = { path = "../vendors/aptos-core-1.7/storage/accumulator" }
+aptos-aggregator = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-aggregator" }
+aptos-api = { path = "../vendors/aptos-core-1.7/api" }
+aptos-api-test-context = { path = "../vendors/aptos-core-1.7/api/test-context" }
+aptos-api-types = { path = "../vendors/aptos-core-1.7/api/types" }
+aptos-backup-cli = { path = "../vendors/aptos-core-1.7/storage/backup/backup-cli" }
+aptos-backup-service = { path = "../vendors/aptos-core-1.7/storage/backup/backup-service" }
+aptos-bounded-executor = { path = "../vendors/aptos-core-1.7/crates/bounded-executor" }
+aptos-block-executor = { path = "../vendors/aptos-core-1.7/aptos-move/block-executor" }
+aptos-bitvec = { path = "../vendors/aptos-core-1.7/crates/aptos-bitvec" }
+aptos-build-info = { path = "../vendors/aptos-core-1.7/crates/aptos-build-info" }
+aptos-cached-packages = { path = "../vendors/aptos-core-1.7/aptos-move/framework/cached-packages" }
+aptos-channels = { path = "../vendors/aptos-core-1.7/crates/channel" }
+aptos-cli-common = { path = "../vendors/aptos-core-1.7/crates/aptos-cli-common" }
+aptos-compression = { path = "../vendors/aptos-core-1.7/crates/aptos-compression" }
+aptos-consensus = { path = "../vendors/aptos-core-1.7/consensus" }
+aptos-consensus-notifications = { path = "../vendors/aptos-core-1.7/state-sync/inter-component/consensus-notifications" }
+aptos-consensus-types = { path = "../vendors/aptos-core-1.7/consensus/consensus-types" }
+aptos-config = { path = "../vendors/aptos-core-1.7/config" }
+aptos-crash-handler = { path = "../vendors/aptos-core-1.7/crates/crash-handler" }
+aptos-crypto = { path = "../vendors/aptos-core-1.7/crates/aptos-crypto" }
+aptos-crypto-derive = { path = "../vendors/aptos-core-1.7/crates/aptos-crypto-derive" }
+aptos-data-client = { path = "../vendors/aptos-core-1.7/state-sync/aptos-data-client" }
+aptos-data-streaming-service = { path = "../vendors/aptos-core-1.7/state-sync/state-sync-v2/data-streaming-service" }
+aptos-db = { path = "../vendors/aptos-core-1.7/storage/aptosdb" }
+aptos-db-indexer = { path = "../vendors/aptos-core-1.7/storage/indexer" }
+aptos-db-tool = { path = "../vendors/aptos-core-1.7/storage/db-tool" }
+aptos-debugger = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-debugger" }
+aptos-event-notifications = { path = "../vendors/aptos-core-1.7/state-sync/inter-component/event-notifications" }
+aptos-executable-store = { path = "../vendors/aptos-core-1.7/storage/executable-store" }
+aptos-executor = { path = "../vendors/aptos-core-1.7/execution/executor" }
+aptos-block-partitioner = { path = "../vendors/aptos-core-1.7/execution/block-partitioner" }
+aptos-enum-conversion-derive = { path = "../vendors/aptos-core-1.7/crates/aptos-enum-conversion-derive" }
+aptos-executor-service = { path = "../vendors/aptos-core-1.7/execution/executor-service" }
+aptos-executor-test-helpers = { path = "../vendors/aptos-core-1.7/execution/executor-test-helpers" }
+aptos-executor-types = { path = "../vendors/aptos-core-1.7/execution/executor-types" }
+aptos-faucet-cli = { path = "../vendors/aptos-core-1.7/crates/aptos-faucet/cli" }
+aptos-faucet-core = { path = "../vendors/aptos-core-1.7/crates/aptos-faucet/core" }
+aptos-faucet-service = { path = "../vendors/aptos-core-1.7/crates/aptos-faucet/service" }
+aptos-faucet-metrics-server = { path = "../vendors/aptos-core-1.7/crates/aptos-faucet/metrics-server" }
+aptos-fallible = { path = "../vendors/aptos-core-1.7/crates/fallible" }
+aptos-forge = { path = "../vendors/aptos-core-1.7/testsuite/forge" }
+aptos-framework = { path = "../vendors/aptos-core-1.7/aptos-move/framework" }
+aptos-fuzzer = { path = "../vendors/aptos-core-1.7/testsuite/aptos-fuzzer" }
+fuzzer = { path = "../vendors/aptos-core-1.7/testsuite/fuzzer" }
+aptos-gas = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-gas" }
+aptos-gas-algebra-ext = { path = "../vendors/aptos-core-1.7/aptos-move/gas-algebra-ext" }
+aptos-gas-profiling = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-gas-profiling" }
+aptos-genesis = { path = "../vendors/aptos-core-1.7/crates/aptos-genesis" }
+aptos-github-client = { path = "../vendors/aptos-core-1.7/secure/storage/github" }
+aptos-global-constants = { path = "../vendors/aptos-core-1.7/config/global-constants" }
+aptos-id-generator = { path = "../vendors/aptos-core-1.7/crates/aptos-id-generator" }
+aptos-indexer = { path = "../vendors/aptos-core-1.7/crates/indexer" }
+aptos-indexer-grpc-cache-worker = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-cache-worker" }
+aptos-indexer-grpc-data-service = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-data-service" }
+aptos-indexer-grpc-file-store = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-file-store" }
+aptos-indexer-grpc-post-processor = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-post-processor" }
+aptos-indexer-grpc-fullnode = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-fullnode" }
+aptos-indexer-grpc-utils = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-utils" }
+aptos-indexer-grpc-parser = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-parser" }
+aptos-indexer-grpc-server-framework = { path = "../vendors/aptos-core-1.7/ecosystem/indexer-grpc/indexer-grpc-server-framework" }
+aptos-infallible = { path = "../vendors/aptos-core-1.7/crates/aptos-infallible" }
+aptos-inspection-service = { path = "../vendors/aptos-core-1.7/crates/aptos-inspection-service" }
+aptos-jellyfish-merkle = { path = "../vendors/aptos-core-1.7/storage/jellyfish-merkle" }
+aptos-keygen = { path = "../vendors/aptos-core-1.7/crates/aptos-keygen" }
+aptos-language-e2e-tests = { path = "../vendors/aptos-core-1.7/aptos-move/e2e-tests" }
+aptos-ledger = { path = "../vendors/aptos-core-1.7/crates/aptos-ledger" }
+aptos-log-derive = { path = "../vendors/aptos-core-1.7/crates/aptos-log-derive" }
+aptos-logger = { path = "../vendors/aptos-core-1.7/crates/aptos-logger" }
+aptos-memory-usage-tracker = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-memory-usage-tracker" }
+aptos-mempool = { path = "../vendors/aptos-core-1.7/mempool" }
+aptos-mempool-notifications = { path = "../vendors/aptos-core-1.7/state-sync/inter-component/mempool-notifications" }
+aptos-memsocket = { path = "../vendors/aptos-core-1.7/network/memsocket" }
+aptos-metrics-core = { path = "../vendors/aptos-core-1.7/crates/aptos-metrics-core" }
+aptos-move-examples = { path = "../vendors/aptos-core-1.7/aptos-move/move-examples" }
+aptos-moving-average = { path = "../vendors/aptos-core-1.7/crates/moving-average" }
+aptos-mvhashmap = { path = "../vendors/aptos-core-1.7/aptos-move/mvhashmap" }
+aptos-netcore = { path = "../vendors/aptos-core-1.7/network/netcore" }
+aptos-network = { path = "../vendors/aptos-core-1.7/network" }
+aptos-network-builder = { path = "../vendors/aptos-core-1.7/network/builder" }
+aptos-network-checker = { path = "../vendors/aptos-core-1.7/crates/aptos-network-checker" }
+aptos-network-discovery = { path = "../vendors/aptos-core-1.7/network/discovery" }
+aptos-node = { path = "../vendors/aptos-core-1.7/aptos-node" }
+aptos-node-checker = { path = "../vendors/aptos-core-1.7/ecosystem/node-checker" }
+aptos-node-identity = { path = "../vendors/aptos-core-1.7/crates/aptos-node-identity" }
+aptos-node-resource-metrics = { path = "../vendors/aptos-core-1.7/crates/node-resource-metrics" }
+aptos-num-variants = { path = "../vendors/aptos-core-1.7/crates/num-variants" }
+aptos-openapi = { path = "../vendors/aptos-core-1.7/crates/aptos-openapi" }
+aptos-package-builder = { path = "../vendors/aptos-core-1.7/aptos-move/package-builder" }
+aptos-peer-monitoring-service-client = { path = "../vendors/aptos-core-1.7/network/peer-monitoring-service/client" }
+aptos-peer-monitoring-service-server = { path = "../vendors/aptos-core-1.7/network/peer-monitoring-service/server" }
+aptos-peer-monitoring-service-types = { path = "../vendors/aptos-core-1.7/network/peer-monitoring-service/types" }
+aptos-proptest-helpers = { path = "../vendors/aptos-core-1.7/crates/aptos-proptest-helpers" }
+aptos-protos = { path = "../vendors/aptos-core-1.7/crates/aptos-protos" }
+aptos-proxy = { path = "../vendors/aptos-core-1.7/crates/proxy" }
+aptos-push-metrics = { path = "../vendors/aptos-core-1.7/crates/aptos-push-metrics" }
+aptos-rate-limiter = { path = "../vendors/aptos-core-1.7/crates/aptos-rate-limiter" }
+aptos-release-builder = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-release-builder" }
+aptos-resource-viewer = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-resource-viewer" }
+aptos-rest-client = { path = "../vendors/aptos-core-1.7/crates/aptos-rest-client" }
+aptos-retrier = { path = "../vendors/aptos-core-1.7/crates/aptos-retrier" }
+aptos-rocksdb-options = { path = "../vendors/aptos-core-1.7/storage/rocksdb-options" }
+aptos-rosetta = { path = "../vendors/aptos-core-1.7/crates/aptos-rosetta" }
+aptos-runtimes = { path = "../vendors/aptos-core-1.7/crates/aptos-runtimes" }
+aptos-safety-rules = { path = "../vendors/aptos-core-1.7/consensus/safety-rules" }
+aptos-schemadb = { path = "../vendors/aptos-core-1.7/storage/schemadb" }
+aptos-scratchpad = { path = "../vendors/aptos-core-1.7/storage/scratchpad" }
+aptos-sdk = { path = "../vendors/aptos-core-1.7/sdk" }
+aptos-sdk-builder = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-sdk-builder" }
+aptos-secure-net = { path = "../vendors/aptos-core-1.7/secure/net" }
+aptos-secure-storage = { path = "../vendors/aptos-core-1.7/secure/storage" }
+aptos-short-hex-str = { path = "../vendors/aptos-core-1.7/crates/short-hex-str" }
+aptos-speculative-state-helper = { path = "../vendors/aptos-core-1.7/crates/aptos-speculative-state-helper" }
+aptos-state-sync-driver = { path = "../vendors/aptos-core-1.7/state-sync/state-sync-v2/state-sync-driver" }
+aptos-state-view = { path = "../vendors/aptos-core-1.7/storage/state-view" }
+aptos-storage-interface = { path = "../vendors/aptos-core-1.7/storage/storage-interface" }
+aptos-storage-service-client = { path = "../vendors/aptos-core-1.7/state-sync/storage-service/client" }
+aptos-storage-service-notifications = { path = "../vendors/aptos-core-1.7/state-sync/inter-component/storage-service-notifications" }
+aptos-storage-service-types = { path = "../vendors/aptos-core-1.7/state-sync/storage-service/types" }
+aptos-storage-service-server = { path = "../vendors/aptos-core-1.7/state-sync/storage-service/server" }
+aptos-telemetry = { path = "../vendors/aptos-core-1.7/crates/aptos-telemetry" }
+aptos-telemetry-service = { path = "../vendors/aptos-core-1.7/crates/aptos-telemetry-service" }
+aptos-temppath = { path = "../vendors/aptos-core-1.7/crates/aptos-temppath" }
+aptos-testcases = { path = "../vendors/aptos-core-1.7/testsuite/testcases" }
+aptos-time-service = { path = "../vendors/aptos-core-1.7/crates/aptos-time-service", features = [
     "async",
 ] }
-aptos-transaction-emitter-lib = { path = "../third-party/aptos-core-1.7/crates/transaction-emitter-lib" }
-aptos-transaction-generator-lib = { path = "../third-party/aptos-core-1.7/crates/transaction-generator-lib" }
-aptos-transactional-test-harness = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-transactional-test-harness" }
-aptos-types = { path = "../third-party/aptos-core-1.7/types" }
-aptos-utils = { path = "../third-party/aptos-core-1.7/aptos-utils" }
-aptos-validator-interface = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-validator-interface" }
-aptos-vault-client = { path = "../third-party/aptos-core-1.7/secure/storage/vault" }
-aptos-vm = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-vm" }
-aptos-vm-logging = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-vm-logging" }
-aptos-vm-genesis = { path = "../third-party/aptos-core-1.7/aptos-move/vm-genesis" }
-aptos-vm-types = { path = "../third-party/aptos-core-1.7/aptos-move/aptos-vm-types" }
-aptos-vm-validator = { path = "../third-party/aptos-core-1.7/vm-validator" }
-aptos-warp-webserver = { path = "../third-party/aptos-core-1.7/crates/aptos-warp-webserver" }
-aptos-writeset-generator = { path = "../third-party/aptos-core-1.7/aptos-move/writeset-transaction-generator" }
+aptos-transaction-emitter-lib = { path = "../vendors/aptos-core-1.7/crates/transaction-emitter-lib" }
+aptos-transaction-generator-lib = { path = "../vendors/aptos-core-1.7/crates/transaction-generator-lib" }
+aptos-transactional-test-harness = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-transactional-test-harness" }
+aptos-types = { path = "../vendors/aptos-core-1.7/types" }
+aptos-utils = { path = "../vendors/aptos-core-1.7/aptos-utils" }
+aptos-validator-interface = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-validator-interface" }
+aptos-vault-client = { path = "../vendors/aptos-core-1.7/secure/storage/vault" }
+aptos-vm = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-vm" }
+aptos-vm-logging = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-vm-logging" }
+aptos-vm-genesis = { path = "../vendors/aptos-core-1.7/aptos-move/vm-genesis" }
+aptos-vm-types = { path = "../vendors/aptos-core-1.7/aptos-move/aptos-vm-types" }
+aptos-vm-validator = { path = "../vendors/aptos-core-1.7/vm-validator" }
+aptos-warp-webserver = { path = "../vendors/aptos-core-1.7/crates/aptos-warp-webserver" }
+aptos-writeset-generator = { path = "../vendors/aptos-core-1.7/aptos-move/writeset-transaction-generator" }
diff --git a/m1/DEBUGGING.md b/m1/DEBUGGING.md
new file mode 100644
index 000000000..12385797f
--- /dev/null
+++ b/m1/DEBUGGING.md
@@ -0,0 +1,62 @@
+# Debugging
+The easiest way to debug the M1 subnet is to run it locally with...
+```shell
+./scripts/run.debug.sh
+```
+
+This will run an `avalanche-network-runner` local cluster with the M1 subnet. The cluster will have the following critical services:
+- `0.0.0.0:9650`: the Avalanche node RPC.
+- `0.0.0.0:8090`: the gRPC indexer stream.
+
+Eventually, you should see an output like this to the terminal:
+```shell
+[node3] ------------inner_build_block 98dbf4c1----
+[node4] ------------inner_build_block 98dbf4c1----
+[node5] ------------inner_build_block 98dbf4c1----
+[node4] -----accept----1---
+[node5] -----accept----1---
+[node3] -----accept----1---
+[node2] -----accept----1---
+[node1] ------------inner_build_block 98dbf4c1----
+[node1] -----accept----1---
+[node1] [2023-11-17T14:34:47Z INFO  subnet::vm] submit_transaction length 257
+[node1] ----------notify_block_ready----success------------------
+[node1] ----build_block pool tx count-------1------
+[node1] --------vm_build_block------mo5UvUGgwVEEbCcgeb9JRRXvpr4UeT4yUFufS2R9UA7kXvSNQ---
+[node4] ------------inner_build_block 850f6c4d----
+[node1] ------------inner_build_block 850f6c4d----
+[node1] -----accept----1---
+[node4] -----accept----1---
+[node2] ------------inner_build_block 850f6c4d----
+[node2] -----accept----1---
+[node5] ------------inner_build_block 850f6c4d----
+[node3] ------------inner_build_block 850f6c4d----
+```
+
+## `subnet-request-proxy`
+Running these without any supporting services will suffice for core protocol debugging. However, you will often want to check the e2e behavior of things like CLI and the JavaScript SDK. For that, you will need to start the `subnet-request-proxy` which is responsible for serving an Aptos-compatible API. 
+
+To start the `subnet-request-proxy` natively on your machine, cd into the `subnet-request-proxy` directory and run:
+```shell
+npm i
+SUBNET_SOCKET_ADDRESS="0.0.0.0:9650" npm run start
+```
+
+## Indexer Database
+In order for the indexer to write to the database listening on port `5432`, you will need to start a local PostgreSQL instance. The easiest way to do this is with Docker:
+```shell
+docker run --name m1-indexer-db -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgres
+```
+If you are not running the database, the trailer thread in the M1 subnet will panick. However, this will not affect the rest of the execution.
+
+# WIP
+We are pursuing several improvements to local debugging and testing.
+
+## Docker Compose
+We are working on a Docker Compose file which will allow you to run all services locally without additional setup.
+
+## Simulated Network Activity Prologue
+We are working to provide a script which will simulate the network activity which to provide an option to test against a more realistic network. This will be particularly useful for testing the indexer.
+
+## Improved Parameterization
+We are working on exposing more of the variables through to the runner scripts which network the services, for example, port numbers and the Avalanche node config.
diff --git a/m1/INDEXER_FIX.md b/m1/INDEXER_FIX.md
new file mode 100644
index 000000000..077c5d91e
--- /dev/null
+++ b/m1/INDEXER_FIX.md
@@ -0,0 +1,13 @@
+# Indexer Fix
+See https://github.com/movemntdev/M1/issues/80.
+
+## Running
+@lmonninger has added additional support for running locally via an ANR usage more similar to that used in `timestampvm-rs`. To run locally, you'll need to run the following commands:
+```bash
+cd m1
+./scripts/tests.debug.sh
+```
+
+@lmonninger plans to continue to expand this e2e testing suite over the course of the day to provide better automated checks against the indexer and help others debug.
+
+For now, contributors should attempt the continued streaming failure against the indexer when using grpcurl.
\ No newline at end of file
diff --git a/m1/JavaScript-client/.eslintignore b/m1/JavaScript-client/.eslintignore
deleted file mode 100644
index 4123c09b0..000000000
--- a/m1/JavaScript-client/.eslintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules
-packages/**/node_modules/
-dist/**
-**/*.test.ts
diff --git a/m1/JavaScript-client/.eslintrc.js b/m1/JavaScript-client/.eslintrc.js
deleted file mode 100644
index 86745e95f..000000000
--- a/m1/JavaScript-client/.eslintrc.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-    node: true,
-  },
-  ignorePatterns: ["*.js", "examples/*", "src/indexer/generated/**", "scripts/publish_ans_contract.ts"],
-  extends: ["airbnb-base", "airbnb-typescript/base", "prettier"],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ["tsconfig.json"],
-    ecmaVersion: "latest",
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {
-    quotes: ["error", "double"],
-    "max-len": ["error", 120],
-    "import/extensions": ["error", "never"],
-    "max-classes-per-file": ["error", 10],
-    "import/prefer-default-export": "off",
-    "object-curly-newline": "off",
-    "no-use-before-define": "off",
-    "no-unused-vars": "off",
-    "@typescript-eslint/no-use-before-define": ["error", { functions: false, classes: false }],
-    "@typescript-eslint/no-unused-vars": ["error"],
-  },
-  settings: {
-    "import/resolver": {
-      node: {
-        extensions: [".js", ".jsx", ".ts", ".tsx"],
-      },
-    },
-  },
-};
diff --git a/m1/JavaScript-client/.gitignore b/m1/JavaScript-client/.gitignore
deleted file mode 100644
index afdee0d21..000000000
--- a/m1/JavaScript-client/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.env
-.DS_Store
-*/**/.DS_Store
-npm-debug.log
-.npm/
-/coverage
-/tmp
-node_modules
-.idea/
-.history/
-.vscode/
-dist/
-.nyc_output/
-build/
-
-# Doc generation output
-docs/
\ No newline at end of file
diff --git a/m1/JavaScript-client/.npmignore b/m1/JavaScript-client/.npmignore
deleted file mode 100644
index 5f7ebc026..000000000
--- a/m1/JavaScript-client/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-coverage
-node_modules
-.aptos
-.env
diff --git a/m1/JavaScript-client/.nvmrc b/m1/JavaScript-client/.nvmrc
deleted file mode 100644
index 15a541691..000000000
--- a/m1/JavaScript-client/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-v16.14.0n
diff --git a/m1/JavaScript-client/.prettierignore b/m1/JavaScript-client/.prettierignore
deleted file mode 100644
index 9543bddf6..000000000
--- a/m1/JavaScript-client/.prettierignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src/generated/*
-src/indexer/generated/**
diff --git a/m1/JavaScript-client/.versionrc.json b/m1/JavaScript-client/.versionrc.json
deleted file mode 100644
index 94df5f411..000000000
--- a/m1/JavaScript-client/.versionrc.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "types": [
-    { "type": "feat", "section": "Features" },
-    { "type": "fix", "section": "Bug Fixes" },
-    { "type": "chore", "hidden": true },
-    { "type": "docs", "hidden": true },
-    { "type": "style", "hidden": true },
-    { "type": "refactor", "hidden": true },
-    { "type": "perf", "hidden": true },
-    { "type": "test", "hidden": true }
-  ],
-  "skip": {
-    "bump": true,
-    "commit": true,
-    "tag": true
-  },
-  "path": ".",
-  "header": "# Changelog\n\nAll notable changes to this project will be documented in this file.\n\nNote: This changelog is generated automatically.\n\n"
-}
diff --git a/m1/JavaScript-client/CHANGELOG.md b/m1/JavaScript-client/CHANGELOG.md
deleted file mode 100644
index 6509817cd..000000000
--- a/m1/JavaScript-client/CHANGELOG.md
+++ /dev/null
@@ -1,225 +0,0 @@
-# Aptos TS SDK Changelog
-
-All notable changes to the Aptos Node SDK will be captured in this file. This changelog is written by hand for now. It adheres to the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-**Note:** The Aptos TS SDK does not follow semantic version while we are in active development. Instead, breaking changes will be announced with each devnet cut. Once we launch our mainnet, the SDK will follow semantic versioning closely.
-
-## Unreleased
-
-## 1.8.5 (2023-04-29)
-
-- Add local tests for `AnsClient`
-- Add `AptosToken` plugin to support tokenv2
-- Add generic support to input params in move entry functions
-- Add signature verification method to AptosAccount.
-
-## 1.8.4 (2023-04-13)
-
-- Move `TypeTagParser` from `builder_utils.ts` to `type_tag.ts`
-- Update `StructTag.fromString()` to use and relies on TypeTagParser
-
-## 1.8.3 (2023-04-10)
-
-- Add `publish-ans-contract` script and pnpm command for tests
-- Revert User-Agent header from both `AptosClient` and `IndexerClient` due to a browser error
-
-## 1.8.2 (2023-04-06)
-
-- Introduce `AnsClient` class to support ANS (Aptos Names Service) data fetching queries
-- Add `User-Agent` header to `AptosClient` and `IndexerClient` queries
-- Add Indexer queries to `IndexerClient` - `getAccountCoinsData`, `getAccountTokensCount`, `getAccountTransactionsCount`, `getAccountTransactionsData`, `getCurrentDelegatorBalancesCount`, `getDelegatedStakingActivities`, `getTokensActivitiesCount`, `getTokenData`, `getTokenOwnersData`, `getTopUserTransactions`, `getUserTransactions`
-- Add convertion layer to `IndexerClient` queries to handle missing `0x`
-- Add validation layer to `IndexerClient` to validate queried account address is in the long format, i.e 66 chars long (0x<64 chars>)
-- Change `queryIndexer` function in `IndexerClient` class visibility to public
-- Add mint Aptos Name function `mintAptosName()` to `AnsClient` class
-
-## 1.7.2 (2023-03-13)
-
-- `CoinClient` and `TokenClient` to use remote ABI instead of local ABIs
-- Reorganize SDK files structure for a better readability and maintainability
-- Add `getIndexerLedgerInfo` query to `IndexerClient`
-
-## 1.7.1 (2023-03-02)
-
-- Fix IndexerClient error parsing using JSON.stringify() to display the error message correctly on the console
-
-## 1.7.0 (2023-03-01)
-
-- Add Indexer support. We introduce a new class `IndexerClient` that queries our Indexer to support data shaping fetching and providing users with a seamless experience.
-- Introduces a `Provider` class we can initialize and query our blockchain by hiding the underlying implementation (fullnode vs indexer)
-
-## 1.6.0 (2023-01-20)
-
-- Add support to Move view functions
-
-## 1.5.0 (2023-01-05)
-
-- Export classes from property_map_serde
-- User can specify token string property type using "string", "String" or "0x1::string::String" to serde the string token property on-chain
-- Use `getAccountResource` to replace `getAccountResources` in `CoinClient#checkBalance`, which can reduce network load.
-
-## 1.4.0 (2022-11-30)
-
-- Add missing fields to TokenData class
-- Add PropertyMap and PropertyValue type to match on-chain data
-- Support token property map deseralizer to read the property map in the original data format.
-- Allow `checkBalance` in `CoinClient` to take in a `MaybeHexString` as well as `AptosAccount`, since users might want to check the balance of accounts they don't own (which is generally how you use `AptosAccount`).
-- Similar to `checkBalance`, allow `transfer` in `CoinClient` to take in a `MaybeHexString` for the `receiver` argument.
-- Add a new `createReceiverIfMissing` argument to `transfer` in `CoinClient`. If set, the `0x1::aptos_account::transfer` function will be called instead of `0x1::coin::transfer`, which will create the account on chain if it doesn't exist instead of failing.
-
-## 1.3.17 (2022-11-08)
-
-- Support computing resource account address based off a source address and a seed
-- Exported ABI types
-- `getAccountModules` and `getAccountResources` now use pagination under the hood. This addresses the issue raised here: https://github.com/aptos-labs/aptos-core/issues/5298. The changes are non-breaking, if you use these functions with an older node that hasn't updated to include the relevant support in its API service, it will still work as it did before.
-- To support the above, the generated client has been updated to attach the headers to the response object, as per the changes here: https://github.com/aptos-labs/openapi-typescript-codegen/compare/v0.23.0...aptos-labs:openapi-typescript-codegen:0.24.0?expand=1. Consider this an implementation detail, not a supported part of the SDK interface.
-- Add functions to token client support
-  - direct transfer with opt-in
-  - burn token by owner
-  - burn token by creator
-  - mutate token properties
-- Add property map serializer to serialize input to BCS encode
-
-## 1.3.16 (2022-10-12)
-
-- Add `estimatePrioritizedGasUnitPrice` to the simulation interface. If set to true, the estimated gas unit price is higher than the original estimate. Therefore, transactions have a higher chance to be executed during congestion period.
-- `esitmateGasPrice` now returns `deprioritized_gas_estimate` and `prioritized_gas_estimate` along with `gas_estimate`. `deprioritized_gas_estimate` is a conservative price estimate. Users might end up paying less gas eventually, but the transaction execution is deprioritized by the block chain. On the other hand, `prioritized_gas_estimate` is a higher price esitmate. Transactions need to be executed sooner could use `prioritized_gas_estimate`.
-
-## 1.3.15 (2022-09-30)
-
-- **[Breaking Changes]** Following the deprecation notice in the release notes of 1.3.13, the following breaking changes have landed in this release. Please see the notes from last release for information on the new endpoints you must migrate to:
-  - The `getEventsByEventKey` function has been removed.
-  - The `key` field in the `Event` struct has been removed.
-- Turn on `strict` in tsconfig
-
-## 1.3.14 (2022-09-20)
-
-- Enable SDK axios client to carry cookies for both the browser and node environments.
-- Added new functions `getBlockByHeight` and `getBlockByVersion`.
-
-## 1.3.13 (2022-09-15)
-
-- Increase the default wait time for `waitForTransactionWithResult` to 20s.
-- A new function called `getEventsByCreationNumber` has been added, corresponding to the new endpoint on the API. For more information on this change, see the [API changelog](https://github.com/aptos-labs/aptos-core/blob/main/api/doc/CHANGELOG.md) for API version 1.1.0.
-- **[Deprecated]** The `getEventsByEventKey` function is now deprecated. In the next release it will be removed entirely. You must migrate to the new function, `getEventsByCreationNumber`, by then.
-- Included in the `Event` struct (which is what the events endpoints return) is a new field called `guid`. This is a more easily interpretable representation of an event identifier than the `key` field. See the [API changelog](https://github.com/aptos-labs/aptos-core/blob/main/api/doc/CHANGELOG.md) for an example of the new field.
-- **[Deprecated]** The `key` field in the `Event` struct is now deprecated. In the next release it will be removed entirely. You must migrate to using the `guid` field by then.
-- Removed NPM dependencies ed25519-hd-key and typescript-memoize.
-- Added IIFE bundle that can be served from CDN. No NPM is required to use the SDK in browser environment.
-
-## 1.3.12 (2022-09-08)
-
-- Feature to rotate auth key for single signature account
-
-## 1.3.11 (2022-08-31)
-
-- Upgraded typescript version from 4.7.4 to 4.8.2, as well as linter package versions.
-- **[Breaking Change]** ModuleBundle transaction support is removed. Instead, SDK users should use `AptosClient.publishPackage` to publish Move packages.
-- Expose detailed API errors.
-- Accept stringified values as transaction payload parameters.
-
-## 1.3.10 (2022-08-26)
-
-- Fix the bug in `waitForTransactionWithResult`. When API returns `404`, the function should continue waiting rather than returning early. The reason is that the txn might not be committed promptly. `waitForTransactionWithResult` should either timeout or get an error in such case.
-
-## 1.3.9 (2022-08-25)
-
-- **[Breaking Change]** Reimplemented the JSON transaction submission interfaces with BCS. This is a breaking change. `createSigningMessage` is removed. Before the changes, the transaction payloads take string aruguments. But now, Typescript payload arguments have to match the smart contract arugment types. e.g. `number` matches `u8`, `number | bigint` matches `u64` and `u128`, etc.
-- **[Breaking Change]** `getTokenBalance` and `getTokenBalanceForAccount` have been renamed to `getToken` and `getTokenForAccount`, since they were never getting just the balance, but the full token.
-- Added `CoinClient` to help working with coins. This contains common operations such as `transfer`, `checkBalance`, etc.
-- Added `generateSignSubmitWaitForTransaction`, a function that provides a simple way to execute the full end to end transaction submission flow. You may also leverage `generateSignSubmit`, a helper that does the same but without waiting, instead returning teh transaction hash.
-- Added `fromDerivePath` to `AptosAccount`. You can use this to create an `AptosAccount` (which is a local representation of an account) using a bip44 path and mnemonics.
-
-## 1.3.7 (2022-08-17)
-
-- Add a transaction builder that is able to serialize transaction arguments with remote ABIs. Remote ABIs are fetchable through REST APIs. With the remote ABI transaction builder, developers can build BCS transactions by only providing the native JS values.
-- Make all functions that accept `BigInt` parameters accept `BigInt | number` instead.
-
-## 1.3.6 (2022-08-10)
-
-- Switch back to representing certain move types (MoveModuleId, MoveStructTag, ScriptFunctionId) as strings, for both requests and responses. This reverts the change made in 1.3.2. See [#2663](https://github.com/aptos-labs/aptos-core/pull/2663) for more.
-- Represent certain fields with slightly different snake casing, e.g. `ed25519_signature` now instead of `ed_25519_signature`.
-- Add generated types for healthcheck endpoint.
-- If the given URL is missing `/v1`, the `AptosClient` constructor will add it for you. You can opt out of this behavior by setting `doNotFixNodeUrl` to true when calling the constructor.
-
-## 1.3.5 (2022-08-08)
-
-- Re-expose BCS and items from `transaction_builder/builder` from the root of the module.
-
-## 1.3.4 (2022-08-07)
-
-- Downscaled default value for `max_gas`.
-
-## 1.3.3 (2022-08-05)
-
-- Update the token clients to submit transactions through BCS interface. The new token client doesn't hex-code "name", "decription" and "uri" any more. String properties are passed and saved just as strings.
-- Expose `buildTransactionPayload` from ABI transaction builder. In some scenarios, developers just want to get a TransactionPayload rather than a RawTransaction.
-
-## 1.3.2 (2022-08-04)
-
-This special entry does not conform to the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) as there are noteworthy breaking changes with necessary rationale. Future entries will follow this format.
-
-This release updates the SDK to work with V1 of the Aptos Node API. There are some key changes between V0 and V1 that you can read about in the [API changelog](https://github.com/aptos-labs/aptos-core/blob/main/api/doc/v1/CHANGELOG.md), refer to the notes for version 1.0.0. Accordingly, this SDK version represents breaking changes compared to 1.2.1.
-
-- The SDK now communicates by default with the `/v1` path of the API. It will not work correctly with the v0 API. If you provide a path yourself when instantiating a client, make sure you include `/v1`, e.g. http://fullnode.devnet.aptoslabs.com/v1.
-- As of this release, the API, API spec, client generated from that spec, SDK wrapper, and examples are all tested together in CI. Previously it was possible for these to be out of sync, or in some cases, they would test against a different deployment entirely, such as devnet. Now we make the guarantee that all these pieces from the same commit work together. Notably this means exactly that; there is no guarantee that the latest version of the SDK will work with a particular Aptos network, such as devnet, except for a network built from the same commit as the SDK.
-- The generated client within the SDK is generated using a different tool, [openapi-typescript-codegen](https://www.npmjs.com/package/openapi-typescript-codegen). Most of these changes are transparent to the user, as we continue to wrap the generated client, but some of the generated types are different, which we mention here.
-- Token types are no longer exposed from the generated client (under `Types`) as they are no longer part of the API (indeed, they never truly were). Instead you can find these definitions exposed at `TokenTypes`.
-- Some functions, such as for getting account resources and events, no longer accept resource types as concatenated strings. For example:
-
-```tsx
-# Before:
-const aptosCoin = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
-# After
-const aptosCoin = const aptosCoin = {
-    address: "0x1",
-    module: "coin",
-    name: "CoinStore",
-    generic_type_params: ["0x1::aptos_coin::AptosCoin"],
-};
-```
-
-- Similarly, some endpoints no longer return this data as a string, but in a structured format, e.g. `MoveStructTag`. Remember to use something like `lodash.isEqual` to do equality checks with these structs.
-- To help work with these different formats, functions for converting between them have been added to `utils`.
-- A new function, `waitForTransactionWithResult`, has been added to help wait for a transaction and then get access to the response from the server once the function exits.
-
-For help with migration, we recommend you see the updated examples under `examples/`, they demonstrate how to deal with some of these changes, such as the more structured responses. We are also available to assist in the [Aptos Discord](https://discord.com/invite/aptoslabs).
-
-**Deprecation Notice**: On September 1st we will remove the v0 API from the running nodes. As a user of the TS SDK, the best way you can migrate prior to this is by upgrading to version 1.3.2 or higher of the SDK. We will repeatedly remind developers of this upcoming deprecation as we approach that date.
-
-## 1.3.1 (2022-08-04)
-
-See release notes for 1.3.2.
-
-## 1.3.0 (2022-08-03)
-
-See release notes for 1.3.2.
-
-## 1.2.1 (2022-07-23)
-
-**Note:** This entry and earlier do not conform to the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-### Features
-
-- Deprecate getTokenBalance api in SDK ([2ec554e](https://github.com/aptos-labs/aptos-core/commit/2ec554e6e40a81cee4e760f6f84ef7362c570240))
-- Memoize chain id in aptos client ([#1589](https://github.com/aptos-labs/aptos-core/issues/1589)) ([4a6453b](https://github.com/aptos-labs/aptos-core/commit/4a6453bf0e620247557854053b661446bff807a7))
-- **Multiagent:** Support multiagent transaction submission ([#1543](https://github.com/aptos-labs/aptos-core/issues/1543)) ([0f0c70e](https://github.com/aptos-labs/aptos-core/commit/0f0c70e8ed2fefa952f0c89b7edb78edc174cb49))
-- Support retrieving token balance for any account ([7f93c21](https://github.com/aptos-labs/aptos-core/commit/7f93c2100f8b8e848461a0b5a395bfb76ade8667))
-
-### Bug Fixes
-
-- Get rid of "natual" calls ([#1678](https://github.com/aptos-labs/aptos-core/issues/1678)) ([54601f7](https://github.com/aptos-labs/aptos-core/commit/54601f79206ea0f8b8b1b0d6599d31832fc4d195))
-
-## 1.2.0 (2022-06-28)
-
-### Features
-
-- Vector tests for transaction signing ([6210c10](https://github.com/aptos-labs/aptos-core/commit/6210c10d3192fd0417b35709545fae850099e4d4))
-- Add royalty support for NFT tokens ([93a2cd0](https://github.com/aptos-labs/aptos-core/commit/93a2cd0bfd644725ac524f419e94077e0b16343b))
-- Add transaction builder examples ([a710a50](https://github.com/aptos-labs/aptos-core/commit/a710a50e8177258d9c0766762b3c2959fc231259))
-- Support transaction simulation ([93073bf](https://github.com/aptos-labs/aptos-core/commit/93073bf1b508d00cfa1f8bb441ed57085fd08a82))
-
-### Bug Fixes
-
-- Fix a typo, natual now becomes natural ([1b7d295](https://github.com/aptos-labs/aptos-core/commit/1b7d2957b79a5d2821ada0c5096cf43c412e0c2d)), closes [#1526](https://github.com/aptos-labs/aptos-core/issues/1526)
-- Fix Javascript example ([5781fee](https://github.com/aptos-labs/aptos-core/commit/5781fee74b8f2b065e7f04c2f76952026860751d)), closes [#1405](https://github.com/aptos-labs/aptos-core/issues/1405)
diff --git a/m1/JavaScript-client/CONTRIBUTING.md b/m1/JavaScript-client/CONTRIBUTING.md
deleted file mode 100644
index bb0a90406..000000000
--- a/m1/JavaScript-client/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contribution Guidelines for Typescript SDK
-
-- Coding Styles
-  - File names must use Snake case. For example, `aptos_account.ts` .
-  - Class names must use Pascal case. For example, `class AuthenticationKey` .
-  - Function and method names must use Camel case. For example, `derivedAddress(): HexString` .
-  - Constants must use all caps (upper case) words separated by `_`. For example, `MAX_U8_NUMBER` .
-- Comments
-  - Comments are required for new classes and functions.
-  - Comments should follow the TSDoc standard, [https://tsdoc.org/](https://tsdoc.org/).
-- Lints and Formats
-  - ESlint (eslint) and Prettier (prettier) should be used for code checking and code formatting. Make sure to run `pnpm lint` and `pnpm fmt` after making changes to the code.
-- Tests
-  - Unit tests are required for any non-trivial changes you make.
-  - The Jest testing framework is used in the repo and we recommend you use it. See Jest: [https://jestjs.io/](https://jestjs.io/).
-  - Make sure to run `pnpm test` after making changes.
-- Commits
-  - Commit messages follow the [Angular convention](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#summary).
diff --git a/m1/JavaScript-client/README.md b/m1/JavaScript-client/README.md
deleted file mode 100644
index d5c674e36..000000000
--- a/m1/JavaScript-client/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# SDK for Movement Node API
-
-## Quickstart
-
-The public SDK downloaded from [npmjs](https://www.npmjs.com/package/movement-sdk) is compatible with the [movement testnet](https://seed-node1.movementlabs.xyz). To start building, run below command in your project directory:
-
-```bash
-pnpm add movement-sdk
-```
diff --git a/m1/JavaScript-client/examples/README.md b/m1/JavaScript-client/examples/README.md
deleted file mode 100644
index bfd9ff25d..000000000
--- a/m1/JavaScript-client/examples/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-**NOTE**: These examples are tested to work with the [latest SDK published to npmjs](https://www.npmjs.com/package/aptos), not the SDK in the parent directory. Accordingly, these examples should be run against devnet. This is how the examples work by default.
-
-If you'd like to learn more about how these examples work, please see the following tutorials:
-- [Your first transaction](https://aptos.dev/tutorials/your-first-transaction-sdk)
-- [Your first NFT](https://aptos.dev/tutorials/your-first-nft-sdk)
diff --git a/m1/JavaScript-client/examples/javascript/index.js b/m1/JavaScript-client/examples/javascript/index.js
deleted file mode 100644
index 1711417df..000000000
--- a/m1/JavaScript-client/examples/javascript/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-require("dotenv").config();
-
-const aptos = require("aptos");
-
-const NODE_URL = process.env.APTOS_NODE_URL || "https://fullnode.devnet.aptoslabs.com";
-const FAUCET_URL = process.env.APTOS_FAUCET_URL || "https://faucet.devnet.aptoslabs.com";
-
-const aptosCoin = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
-
-(async () => {
-  const client = new aptos.AptosClient(NODE_URL);
-  const faucetClient = new aptos.FaucetClient(NODE_URL, FAUCET_URL, null);
-  const tokenClient = new aptos.TokenClient(client);
-
-  const account1 = new aptos.AptosAccount();
-  await faucetClient.fundAccount(account1.address(), 100_000_000);
-  let resources = await client.getAccountResources(account1.address());
-  let accountResource = resources.find((r) => r.type === aptosCoin);
-  console.log(`account1 coins: ${accountResource.data.coin.value}. Should be 100_000_000!`);
-
-  const account2 = new aptos.AptosAccount();
-  await faucetClient.fundAccount(account2.address(), 0);
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r) => r.type === aptosCoin);
-  console.log(`account2 coins: ${accountResource.data.coin.value}. Should be 0!`);
-
-  const payload = {
-    type: "entry_function_payload",
-    function: "0x1::coin::transfer",
-    type_arguments: ["0x1::aptos_coin::AptosCoin"],
-    arguments: [account2.address().hex(), 717],
-  };
-  const txnRequest = await client.generateTransaction(account1.address(), payload);
-  const signedTxn = await client.signTransaction(account1, txnRequest);
-  const transactionRes = await client.submitTransaction(signedTxn);
-  await client.waitForTransaction(transactionRes.hash);
-
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r) => r.type === aptosCoin);
-  console.log(`account2 coins: ${accountResource.data.coin.value}. Should be 717!`);
-
-  const provider = new aptos.Provider(aptos.Network.DEVNET);
-  console.log("\n=== Checking if indexer devnet chainId same as fullnode chainId  ===");
-  const indexerLedgerInfo = await provider.getIndexerLedgerInfo();
-  const fullNodeChainId = await provider.getChainId();
-
-  console.log(`\n fullnode chain id is: ${fullNodeChainId}, indexer chain id is: ${indexerLedgerInfo}`);
-  if (indexerLedgerInfo.ledger_infos[0].chain_id !== fullNodeChainId) {
-    console.log(`\n fullnode chain id and indexer chain id are not synced, skipping rest of tests`);
-    return;
-  }
-
-  console.log("=== Creating account1's NFT Collection and Token ===");
-
-  const collectionName = "Alice's";
-  const tokenName = "Alice's first token";
-
-  // Create the collection.
-  // :!:>section_4
-  const txnHash1 = await tokenClient.createCollection(
-    account1,
-    collectionName,
-    "Alice's simple collection",
-    "https://alice.com",
-  ); // <:!:section_4
-  await client.waitForTransaction(txnHash1, { checkSuccess: true });
-
-  // Create a token in that collection.
-  // :!:>section_5
-  const txnHash2 = await tokenClient.createToken(
-    account1,
-    collectionName,
-    tokenName,
-    "Alice's simple token",
-    1,
-    "https://aptos.dev/img/nyan.jpeg",
-  ); // <:!:section_5
-  await client.waitForTransaction(txnHash2, { checkSuccess: true });
-
-  const nfts = await provider.getAccountNFTs(account1.address().hex());
-  console.log(`account1 current token ownership: ${nfts.current_token_ownerships[0].amount}. Should be 1`);
-})();
diff --git a/m1/JavaScript-client/examples/javascript/package.json b/m1/JavaScript-client/examples/javascript/package.json
deleted file mode 100644
index 615f91e60..000000000
--- a/m1/JavaScript-client/examples/javascript/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "js-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "node index.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "aptos": "latest",
-    "dotenv": "16.0.2"
-  }
-}
diff --git a/m1/JavaScript-client/examples/javascript/pnpm-lock.yaml b/m1/JavaScript-client/examples/javascript/pnpm-lock.yaml
deleted file mode 100644
index c853ae473..000000000
--- a/m1/JavaScript-client/examples/javascript/pnpm-lock.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-lockfileVersion: '6.0'
-
-dependencies:
-  aptos:
-    specifier: latest
-    version: 1.7.2
-  dotenv:
-    specifier: 16.0.2
-    version: 16.0.2
-
-packages:
-
-  /@noble/hashes@1.1.3:
-    resolution: {integrity: sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==}
-    dev: false
-
-  /@scure/base@1.1.1:
-    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
-    dev: false
-
-  /@scure/bip39@1.1.0:
-    resolution: {integrity: sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/base': 1.1.1
-    dev: false
-
-  /aptos@1.7.2:
-    resolution: {integrity: sha512-unM7bPbu3UGoVB/EhTvA+QDo8nqb6pDfqttsKwC7nYavQnl4t5dxCoFfIFcbijBtSOTfo4is5ldi4Uz4cY9ESA==}
-    engines: {node: '>=11.0.0'}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/bip39': 1.1.0
-      axios: 0.27.2
-      form-data: 4.0.0
-      tweetnacl: 1.0.3
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-    dev: false
-
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      delayed-stream: 1.0.0
-    dev: false
-
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
-  /dotenv@16.0.2:
-    resolution: {integrity: sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /follow-redirects@1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
-
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      mime-db: 1.52.0
-    dev: false
-
-  /tweetnacl@1.0.3:
-    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
-    dev: false
diff --git a/m1/JavaScript-client/examples/typescript-esm/index.ts b/m1/JavaScript-client/examples/typescript-esm/index.ts
deleted file mode 100644
index 42d68089f..000000000
--- a/m1/JavaScript-client/examples/typescript-esm/index.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/* eslint-disable no-console */
-import { AptosClient, AptosAccount, FaucetClient, BCS, TxnBuilderTypes, Provider, Network, TokenClient } from "aptos";
-import assert from "assert";
-
-const NODE_URL = process.env.APTOS_NODE_URL || "https://fullnode.devnet.aptoslabs.com";
-const FAUCET_URL = process.env.APTOS_FAUCET_URL || "https://faucet.devnet.aptoslabs.com";
-
-export const aptosCoinStore = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
-
-const {
-  AccountAddress,
-  TypeTagStruct,
-  EntryFunction,
-  StructTag,
-  TransactionPayloadEntryFunction,
-  RawTransaction,
-  ChainId,
-} = TxnBuilderTypes;
-
-/**
- * This code example demonstrates the process of moving test coins from one account to another.
- */
-(async () => {
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL);
-  const tokenClient = new TokenClient(client);
-
-  // Generates key pair for a new account
-  const account1 = new AptosAccount();
-  await faucetClient.fundAccount(account1.address(), 100_000_000);
-  let resources = await client.getAccountResources(account1.address());
-  let accountResource = resources.find((r: any) => r.type === aptosCoinStore);
-  let balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 100_000_000);
-  console.log(`account1 coins: ${balance}. Should be 100_000_000!`);
-
-  const account2 = new AptosAccount();
-  // Creates the second account and fund the account with 0 AptosCoin
-  await faucetClient.fundAccount(account2.address(), 0);
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r: any) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 0);
-  console.log(`account2 coins: ${balance}. Should be 0!`);
-
-  const token = new TypeTagStruct(StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-
-  // TS SDK support 3 types of transaction payloads: `EntryFunction`, `Script` and `Module`.
-  // See https://aptos-labs.github.io/ts-sdk-doc/ for the details.
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(
-      // Fully qualified module name, `AccountAddress::ModuleName`
-      "0x1::coin",
-      // Module function
-      "transfer",
-      // The coin type to transfer
-      [token],
-      // Arguments for function `transfer`: receiver account address and amount to transfer
-      [BCS.bcsToBytes(AccountAddress.fromHex(account2.address())), BCS.bcsSerializeUint64(717)],
-    ),
-  );
-
-  const [{ sequence_number: sequenceNumber }, chainId] = await Promise.all([
-    client.getAccount(account1.address()),
-    client.getChainId(),
-  ]);
-
-  // See class definiton here
-  // https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.RawTransaction.html#constructor.
-  const rawTxn = new RawTransaction(
-    // Transaction sender account address
-    AccountAddress.fromHex(account1.address()),
-    BigInt(sequenceNumber),
-    entryFunctionPayload,
-    // Max gas unit to spend
-    BigInt(10000),
-    // Gas price per unit
-    BigInt(100),
-    // Expiration timestamp. Transaction is discarded if it is not executed within 10 seconds from now.
-    BigInt(Math.floor(Date.now() / 1000) + 10),
-    new ChainId(chainId),
-  );
-
-  // Sign the raw transaction with account1's private key
-  const bcsTxn = AptosClient.generateBCSTransaction(account1, rawTxn);
-
-  const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-  await client.waitForTransaction(transactionRes.hash);
-
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r: any) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 717);
-  console.log(`account2 coins: ${balance}. Should be 717!`);
-
-  const provider = new Provider(Network.DEVNET);
-  console.log("\n=== Checking if indexer devnet chainId same as fullnode chainId  ===");
-  const indexerLedgerInfo = await provider.getIndexerLedgerInfo();
-  const fullNodeChainId = await provider.getChainId();
-
-  console.log(`\n fullnode chain id is: ${fullNodeChainId}, indexer chain id is: ${indexerLedgerInfo}`);
-  if (indexerLedgerInfo.ledger_infos[0].chain_id !== fullNodeChainId) {
-    console.log(`\n fullnode chain id and indexer chain id are not synced, skipping rest of tests`);
-    return;
-  }
-
-  console.log("=== Creating account1's NFT Collection and Token ===");
-
-  const collectionName = "Alice's";
-  const tokenName = "Alice's first token";
-
-  // Create the collection.
-  // :!:>section_4
-  const txnHash1 = await tokenClient.createCollection(
-    account1,
-    collectionName,
-    "Alice's simple collection",
-    "https://alice.com",
-  ); // <:!:section_4
-  await client.waitForTransaction(txnHash1, { checkSuccess: true });
-
-  // Create a token in that collection.
-  // :!:>section_5
-  const txnHash2 = await tokenClient.createToken(
-    account1,
-    collectionName,
-    tokenName,
-    "Alice's simple token",
-    1,
-    "https://aptos.dev/img/nyan.jpeg",
-  ); // <:!:section_5
-  await client.waitForTransaction(txnHash2, { checkSuccess: true });
-
-  const nfts = await provider.getAccountNFTs(account1.address().hex());
-  console.log(`account1 current token ownership: ${nfts.current_token_ownerships[0].amount}. Should be 1`);
-})();
diff --git a/m1/JavaScript-client/examples/typescript-esm/package.json b/m1/JavaScript-client/examples/typescript-esm/package.json
deleted file mode 100644
index d4a7b9bfa..000000000
--- a/m1/JavaScript-client/examples/typescript-esm/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "ts-test-esm",
-  "version": "1.0.0",
-  "description": "",
-  "main": "./dist/index.js",
-  "type": "module",
-  "scripts": {
-    "build": "rm -rf dist/* && tsc -p .",
-    "test": "pnpm build && node ./dist/index.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "aptos": "latest"
-  },
-  "devDependencies": {
-    "typescript": "4.8.2"
-  }
-}
diff --git a/m1/JavaScript-client/examples/typescript-esm/pnpm-lock.yaml b/m1/JavaScript-client/examples/typescript-esm/pnpm-lock.yaml
deleted file mode 100644
index f0c6b7599..000000000
--- a/m1/JavaScript-client/examples/typescript-esm/pnpm-lock.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-lockfileVersion: '6.0'
-
-dependencies:
-  aptos:
-    specifier: latest
-    version: 1.7.2
-
-devDependencies:
-  typescript:
-    specifier: 4.8.2
-    version: 4.8.2
-
-packages:
-
-  /@noble/hashes@1.1.3:
-    resolution: {integrity: sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==}
-    dev: false
-
-  /@scure/base@1.1.1:
-    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
-    dev: false
-
-  /@scure/bip39@1.1.0:
-    resolution: {integrity: sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/base': 1.1.1
-    dev: false
-
-  /aptos@1.7.2:
-    resolution: {integrity: sha512-unM7bPbu3UGoVB/EhTvA+QDo8nqb6pDfqttsKwC7nYavQnl4t5dxCoFfIFcbijBtSOTfo4is5ldi4Uz4cY9ESA==}
-    engines: {node: '>=11.0.0'}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/bip39': 1.1.0
-      axios: 0.27.2
-      form-data: 4.0.0
-      tweetnacl: 1.0.3
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-    dev: false
-
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      delayed-stream: 1.0.0
-    dev: false
-
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
-  /follow-redirects@1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
-
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      mime-db: 1.52.0
-    dev: false
-
-  /tweetnacl@1.0.3:
-    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
-    dev: false
-
-  /typescript@4.8.2:
-    resolution: {integrity: sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
diff --git a/m1/JavaScript-client/examples/typescript-esm/tsconfig.json b/m1/JavaScript-client/examples/typescript-esm/tsconfig.json
deleted file mode 100644
index 4acc21c3b..000000000
--- a/m1/JavaScript-client/examples/typescript-esm/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "allowJs": true,
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "outDir": "./dist",
-    "sourceMap": true,
-    "target": "es2020",
-    "pretty": true
-  },
-  "include": [
-    "*.ts"
-  ],
-  "paths": {
-    "@aptos/*": "../..",
-  }
-}
diff --git a/m1/JavaScript-client/examples/typescript/bcs_transaction.ts b/m1/JavaScript-client/examples/typescript/bcs_transaction.ts
deleted file mode 100644
index 13f2b21fa..000000000
--- a/m1/JavaScript-client/examples/typescript/bcs_transaction.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* eslint-disable no-console */
-
-import dotenv from "dotenv";
-dotenv.config();
-
-import { AptosClient, AptosAccount, FaucetClient, BCS, TxnBuilderTypes } from "aptos";
-import { aptosCoinStore } from "./common";
-import assert from "assert";
-
-const NODE_URL = process.env.APTOS_NODE_URL || "https://fullnode.devnet.aptoslabs.com";
-const FAUCET_URL = process.env.APTOS_FAUCET_URL || "https://faucet.devnet.aptoslabs.com";
-
-const {
-  AccountAddress,
-  TypeTagStruct,
-  EntryFunction,
-  StructTag,
-  TransactionPayloadEntryFunction,
-  RawTransaction,
-  ChainId,
-} = TxnBuilderTypes;
-
-/**
- * This code example demonstrates the process of moving test coins from one account to another.
- */
-(async () => {
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL);
-
-  // Generates key pair for a new account
-  const account1 = new AptosAccount();
-  await faucetClient.fundAccount(account1.address(), 100_000_000);
-  let resources = await client.getAccountResources(account1.address());
-  let accountResource = resources.find((r) => r.type === aptosCoinStore);
-  let balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 100_000_000);
-  console.log(`account1 coins: ${balance}. Should be 100000000!`);
-
-  const account2 = new AptosAccount();
-  // Creates the second account and fund the account with 0 AptosCoin
-  await faucetClient.fundAccount(account2.address(), 0);
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 0);
-  console.log(`account2 coins: ${balance}. Should be 0!`);
-
-  const token = new TypeTagStruct(StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-
-  // TS SDK support 3 types of transaction payloads: `EntryFunction`, `Script` and `Module`.
-  // See https://aptos-labs.github.io/ts-sdk-doc/ for the details.
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(
-      // Fully qualified module name, `AccountAddress::ModuleName`
-      "0x1::coin",
-      // Module function
-      "transfer",
-      // The coin type to transfer
-      [token],
-      // Arguments for function `transfer`: receiver account address and amount to transfer
-      [BCS.bcsToBytes(AccountAddress.fromHex(account2.address())), BCS.bcsSerializeUint64(717)],
-    ),
-  );
-
-  const [{ sequence_number: sequenceNumber }, chainId] = await Promise.all([
-    client.getAccount(account1.address()),
-    client.getChainId(),
-  ]);
-
-  // See class definiton here
-  // https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.RawTransaction.html#constructor.
-  const rawTxn = new RawTransaction(
-    // Transaction sender account address
-    AccountAddress.fromHex(account1.address()),
-    BigInt(sequenceNumber),
-    entryFunctionPayload,
-    // Max gas unit to spend
-    BigInt(2000),
-    // Gas price per unit
-    BigInt(100),
-    // Expiration timestamp. Transaction is discarded if it is not executed within 10 seconds from now.
-    BigInt(Math.floor(Date.now() / 1000) + 10),
-    new ChainId(chainId),
-  );
-
-  // Sign the raw transaction with account1's private key
-  const bcsTxn = AptosClient.generateBCSTransaction(account1, rawTxn);
-
-  const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-  await client.waitForTransaction(transactionRes.hash);
-
-  resources = await client.getAccountResources(account2.address());
-  accountResource = resources.find((r) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 717);
-  console.log(`account2 coins: ${balance}. Should be 717!`);
-})();
diff --git a/m1/JavaScript-client/examples/typescript/call_aptos_cli.ts b/m1/JavaScript-client/examples/typescript/call_aptos_cli.ts
deleted file mode 100644
index d50ee6e28..000000000
--- a/m1/JavaScript-client/examples/typescript/call_aptos_cli.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-const ffi = require("ffi-napi");
-
-const lib = ffi.Library("../../../../../target/release/libaptos", {
-  run_aptos_sync: ["char *", ["string"]], // run the aptos CLI synchronously
-  run_aptos_async: ["char *", ["string"]], // run the aptos CLI asynchronously
-  free_cstring: ["void", ["char *"]], // free the return pointer memory allocated by the aptos CLI
-});
-
-const args_run_local_testnet = ["aptos", "node", "run-local-testnet", "--with-faucet"];
-const args_aptos_info = ["aptos", "info"];
-
-(async () => {
-  console.log("Running aptos CLI from Typescript");
-  const aptos_info = lib.run_aptos_sync(args_aptos_info.join(" "));
-  const run_local_testnet = lib.run_aptos_async(args_run_local_testnet.join(" "));
-  try {
-    console.log(`Aptos Info: ${aptos_info.readCString()}`);
-    console.log(`Run Local Testnet: ${run_local_testnet.readCString()}`);
-  } catch (error) {
-    console.error(error);
-  } finally {
-    // free the string pointer memory allocated by the aptos CLI
-    lib.free_cstring(aptos_info);
-    lib.free_cstring(run_local_testnet);
-  }
-
-  console.log("Finish aptos CLI");
-})();
diff --git a/m1/JavaScript-client/examples/typescript/common.ts b/m1/JavaScript-client/examples/typescript/common.ts
deleted file mode 100644
index e11898af6..000000000
--- a/m1/JavaScript-client/examples/typescript/common.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-//:!:>section_1
-export const NODE_URL = process.env.APTOS_NODE_URL || "https://fullnode.devnet.aptoslabs.com";
-export const FAUCET_URL = process.env.APTOS_FAUCET_URL || "https://faucet.devnet.aptoslabs.com";
-//<:!:section_1
-
-export const aptosCoinStore = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
diff --git a/m1/JavaScript-client/examples/typescript/multisig_account.ts b/m1/JavaScript-client/examples/typescript/multisig_account.ts
deleted file mode 100644
index 81518f979..000000000
--- a/m1/JavaScript-client/examples/typescript/multisig_account.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-/* eslint-disable no-console */
-
-import dotenv from "dotenv";
-dotenv.config();
-
-import { AptosClient, AptosAccount, FaucetClient, BCS, TxnBuilderTypes } from "aptos";
-import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
-import { aptosCoinStore, FAUCET_URL, NODE_URL } from "./common";
-import assert from "assert";
-
-const { AccountAddress, EntryFunction, MultiSig, MultiSigTransactionPayload, TransactionPayloadMultisig } =
-  TxnBuilderTypes;
-
-/**
- * This code example demonstrates the new multisig account module and transaction execution flow.
- */
-(async () => {
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL);
-
-  // Create and fund 3 accounts that will be the owners of the multisig account.
-  const owner1 = new AptosAccount();
-  const owner2 = new AptosAccount();
-  const owner3 = new AptosAccount();
-  const owner4 = new AptosAccount();
-  await faucetClient.fundAccount(owner1.address(), 100_000_000);
-  await faucetClient.fundAccount(owner2.address(), 100_000_000);
-  await faucetClient.fundAccount(owner3.address(), 100_000_000);
-
-  // Step 1: Setup a 2-of-3 multisig account
-  // ===========================================================================================
-  const createMultisig = await client.generateTransaction(owner1.address(), {
-    function: "0x1::multisig_account::create_with_owners",
-    type_arguments: [],
-    arguments: [[owner2.address().hex(), owner3.address().hex()], 2, ["Shaka"], [BCS.bcsSerializeStr("Bruh")]],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner1, createMultisig.payload);
-  // Find the multisig account address.
-  let ownedMultisigAccounts = await client.getAccountResource(
-    owner1.address(),
-    "0x1::multisig_account::OwnedMultisigAccounts",
-  );
-  const multisigAddress = (ownedMultisigAccounts?.data as any).multisig_accounts[0];
-  assert((await getSignatureThreshold(client, multisigAddress)) == 2);
-  assert((await getNumberOfOwners(client, multisigAddress)) == 3);
-
-  // Fund the multisig account for transfers.
-  await faucetClient.fundAccount(multisigAddress, 100_000_000);
-
-  // Step 2: Create a multisig transaction to send 1_000_000 coins to an account.
-  // We'll be including the full payload to be stored on chain.
-  // ===========================================================================================
-  const recipient = new AptosAccount();
-  const transferTxPayload = new MultiSigTransactionPayload(
-    EntryFunction.natural(
-      "0x1::aptos_account",
-      "transfer",
-      [],
-      [BCS.bcsToBytes(AccountAddress.fromHex(recipient.address())), BCS.bcsSerializeUint64(1_000_000)],
-    ),
-  );
-  const multisigTxExecution = new TransactionPayloadMultisig(
-    new MultiSig(AccountAddress.fromHex(multisigAddress), transferTxPayload),
-  );
-  const [simulationResp] = await client.simulateTransaction(
-    owner2,
-    await client.generateRawTransaction(owner2.address(), multisigTxExecution),
-  );
-  assert(simulationResp.success);
-
-  // Create the multisig tx on chain.
-  const createMultisigTx = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::create_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, BCS.bcsToBytes(transferTxPayload)],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, createMultisigTx.payload);
-
-  // Owner 1 rejects but owner 3 approves.
-  await rejectAndApprove(client, owner1, owner3, multisigAddress, 1);
-
-  // Owner 2 can now execute the transactions as it already has 2 approvals (from owners 2 and 3).
-  await client.generateSignSubmitWaitForTransaction(owner2, multisigTxExecution);
-  let accountResource = await client.getAccountResource(recipient.address(), aptosCoinStore);
-  let balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 1_000_000);
-
-  // Step 3: Create another multisig transaction to send 1_000_000 coins but use payload hash instead.
-  // ===========================================================================================
-  const transferTxPayloadHash = sha3Hash.create();
-  transferTxPayloadHash.update(BCS.bcsToBytes(transferTxPayload));
-  const createMultisigTxWithHash = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::create_transaction_with_hash",
-    type_arguments: [],
-    arguments: [multisigAddress, transferTxPayloadHash.digest()],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, createMultisigTxWithHash.payload);
-  await rejectAndApprove(client, owner1, owner3, multisigAddress, 2);
-
-  const multisigTxExecution2 = new TransactionPayloadMultisig(
-    new MultiSig(AccountAddress.fromHex(multisigAddress), transferTxPayload),
-  );
-  await client.generateSignSubmitWaitForTransaction(owner2, multisigTxExecution2);
-  accountResource = await client.getAccountResource(recipient.address(), aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 2_000_000);
-
-  // Step 4: Create 2 multisig transactions: one to add a new owner and another one to remove it.
-  // ===========================================================================================
-  const owner_4 = new AptosAccount();
-  const addOwnerPayload = new MultiSigTransactionPayload(
-    EntryFunction.natural(
-      "0x1::multisig_account",
-      "add_owner",
-      [],
-      [BCS.bcsToBytes(AccountAddress.fromHex(owner_4.address()))],
-    ),
-  );
-  const addOwnerTx = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::create_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, BCS.bcsToBytes(addOwnerPayload)],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, addOwnerTx.payload);
-  await rejectAndApprove(client, owner1, owner3, multisigAddress, 3);
-  await client.generateSignSubmitWaitForTransaction(
-    owner2,
-    new TransactionPayloadMultisig(new MultiSig(AccountAddress.fromHex(multisigAddress))),
-  );
-  // The multisig account should now have 4 owners.
-  assert((await getNumberOfOwners(client, multisigAddress)) == 4);
-
-  const removeOwnerPayload = new MultiSigTransactionPayload(
-    EntryFunction.natural(
-      "0x1::multisig_account",
-      "remove_owner",
-      [],
-      [BCS.bcsToBytes(AccountAddress.fromHex(owner_4.address()))],
-    ),
-  );
-  const removeOwnerTx = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::create_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, BCS.bcsToBytes(removeOwnerPayload)],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, removeOwnerTx.payload);
-  await rejectAndApprove(client, owner1, owner3, multisigAddress, 4);
-  await client.generateSignSubmitWaitForTransaction(
-    owner2,
-    new TransactionPayloadMultisig(new MultiSig(AccountAddress.fromHex(multisigAddress))),
-  );
-  // The multisig account should now have 3 owners.
-  assert((await getNumberOfOwners(client, multisigAddress)) == 3);
-
-  // Step 5: Create a multisig transactions to change the signature threshold to 3-of-3.
-  // ===========================================================================================
-  const changeSigThresholdPayload = new MultiSigTransactionPayload(
-    EntryFunction.natural("0x1::multisig_account", "update_signatures_required", [], [BCS.bcsSerializeUint64(3)]),
-  );
-  const changeSigThresholdTx = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::create_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, BCS.bcsToBytes(changeSigThresholdPayload)],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, changeSigThresholdTx.payload);
-  await rejectAndApprove(client, owner1, owner3, multisigAddress, 5);
-  await client.generateSignSubmitWaitForTransaction(
-    owner2,
-    new TransactionPayloadMultisig(new MultiSig(AccountAddress.fromHex(multisigAddress))),
-  );
-  // The multisig account should now be 3-of-3.
-  assert((await getSignatureThreshold(client, multisigAddress)) == 3);
-})();
-
-const rejectAndApprove = async (
-  client: AptosClient,
-  owner1: AptosAccount,
-  owner2: AptosAccount,
-  multisigAddress: string,
-  transactionId: number,
-) => {
-  let rejectTx = await client.generateTransaction(owner1.address(), {
-    function: "0x1::multisig_account::reject_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, transactionId],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner1, rejectTx.payload);
-  let approveTx = await client.generateTransaction(owner2.address(), {
-    function: "0x1::multisig_account::approve_transaction",
-    type_arguments: [],
-    arguments: [multisigAddress, transactionId],
-  });
-  await client.generateSignSubmitWaitForTransaction(owner2, approveTx.payload);
-};
-
-const getNumberOfOwners = async (client: AptosClient, multisigAddress: string): Promise<number> => {
-  const multisigAccountResource = await client.getAccountResource(
-    multisigAddress,
-    "0x1::multisig_account::MultisigAccount",
-  );
-  return Number((multisigAccountResource.data as any).owners.length);
-};
-
-const getSignatureThreshold = async (client: AptosClient, multisigAddress: string): Promise<number> => {
-  const multisigAccountResource = await client.getAccountResource(
-    multisigAddress,
-    "0x1::multisig_account::MultisigAccount",
-  );
-  return Number((multisigAccountResource.data as any).num_signatures_required);
-};
diff --git a/m1/JavaScript-client/examples/typescript/multisig_transaction.ts b/m1/JavaScript-client/examples/typescript/multisig_transaction.ts
deleted file mode 100644
index 17a59b937..000000000
--- a/m1/JavaScript-client/examples/typescript/multisig_transaction.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/* eslint-disable no-console */
-
-import dotenv from "dotenv";
-dotenv.config();
-
-import { AptosClient, AptosAccount, FaucetClient, BCS, TransactionBuilderMultiEd25519, TxnBuilderTypes } from "aptos";
-import { aptosCoinStore } from "./common";
-import assert from "assert";
-
-const NODE_URL = process.env.APTOS_NODE_URL || "https://fullnode.devnet.aptoslabs.com";
-const FAUCET_URL = process.env.APTOS_FAUCET_URL || "https://faucet.devnet.aptoslabs.com";
-
-/**
- * This code example demonstrates the process of moving test coins from one multisig
- * account to a single signature account.
- */
-(async () => {
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL);
-
-  // Genereate 3 key pairs and account instances
-  const account1 = new AptosAccount();
-  const account2 = new AptosAccount();
-  const account3 = new AptosAccount();
-
-  // Create a 2 out of 3 MultiEd25519PublicKey. '2 out of 3' means for a multisig transaction
-  // to be executed, at least 2 accounts must have signed the transaction.
-  // See https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.MultiEd25519PublicKey.html#constructor
-  const multiSigPublicKey = new TxnBuilderTypes.MultiEd25519PublicKey(
-    [
-      new TxnBuilderTypes.Ed25519PublicKey(account1.signingKey.publicKey),
-      new TxnBuilderTypes.Ed25519PublicKey(account2.signingKey.publicKey),
-      new TxnBuilderTypes.Ed25519PublicKey(account3.signingKey.publicKey),
-    ],
-    // Threshold
-    2,
-  );
-
-  // Each Aptos account stores an auth key. Initial account address can be derived from auth key.
-  // See https://aptos.dev/concepts/accounts for more details.
-  const authKey = TxnBuilderTypes.AuthenticationKey.fromMultiEd25519PublicKey(multiSigPublicKey);
-
-  // Derive the multisig account address and fund the address with 5000 AptosCoin.
-  const mutisigAccountAddress = authKey.derivedAddress();
-  await faucetClient.fundAccount(mutisigAccountAddress, 100_000_000);
-
-  let resources = await client.getAccountResources(mutisigAccountAddress);
-  let accountResource = resources.find((r) => r.type === aptosCoinStore);
-  let balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 100_000_000);
-  console.log(`multisig account coins: ${balance}. Should be 100000000!`);
-
-  const account4 = new AptosAccount();
-  // Creates a receiver account and fund the account with 0 AptosCoin
-  await faucetClient.fundAccount(account4.address(), 0);
-  resources = await client.getAccountResources(account4.address());
-  accountResource = resources.find((r) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 0);
-  console.log(`account4 coins: ${balance}. Should be 0!`);
-
-  const token = new TxnBuilderTypes.TypeTagStruct(TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-
-  // TS SDK support 3 types of transaction payloads: `EntryFunction`, `Script` and `Module`.
-  // See https://aptos-labs.github.io/ts-sdk-doc/ for the details.
-  const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-    TxnBuilderTypes.EntryFunction.natural(
-      // Fully qualified module name, `AccountAddress::ModuleName`
-      "0x1::coin",
-      // Module function
-      "transfer",
-      // The coin type to transfer
-      [token],
-      // Arguments for function `transfer`: receiver account address and amount to transfer
-      [BCS.bcsToBytes(TxnBuilderTypes.AccountAddress.fromHex(account4.address())), BCS.bcsSerializeUint64(123)],
-    ),
-  );
-
-  const [{ sequence_number: sequenceNumber }, chainId] = await Promise.all([
-    client.getAccount(mutisigAccountAddress),
-    client.getChainId(),
-  ]);
-
-  // See class definiton here
-  // https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.RawTransaction.html#constructor.
-  const rawTxn = new TxnBuilderTypes.RawTransaction(
-    // Transaction sender account address
-    TxnBuilderTypes.AccountAddress.fromHex(mutisigAccountAddress),
-    BigInt(sequenceNumber),
-    entryFunctionPayload,
-    // Max gas unit to spend
-    BigInt(10000),
-    // Gas price per unit
-    BigInt(100),
-    // Expiration timestamp. Transaction is discarded if it is not executed within 10 seconds from now.
-    BigInt(Math.floor(Date.now() / 1000) + 10),
-    new TxnBuilderTypes.ChainId(chainId),
-  );
-
-  // account1 and account3 sign the transaction
-  const txnBuilder = new TransactionBuilderMultiEd25519((signingMessage: TxnBuilderTypes.SigningMessage) => {
-    const sigHexStr1 = account1.signBuffer(signingMessage);
-    const sigHexStr3 = account3.signBuffer(signingMessage);
-
-    // Bitmap masks which public key has signed transaction.
-    // See https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.MultiEd25519Signature.html#createBitmap
-    const bitmap = TxnBuilderTypes.MultiEd25519Signature.createBitmap([0, 2]);
-
-    // See https://aptos-labs.github.io/ts-sdk-doc/classes/TxnBuilderTypes.MultiEd25519Signature.html#constructor
-    const muliEd25519Sig = new TxnBuilderTypes.MultiEd25519Signature(
-      [
-        new TxnBuilderTypes.Ed25519Signature(sigHexStr1.toUint8Array()),
-        new TxnBuilderTypes.Ed25519Signature(sigHexStr3.toUint8Array()),
-      ],
-      bitmap,
-    );
-
-    return muliEd25519Sig;
-  }, multiSigPublicKey);
-
-  const bcsTxn = txnBuilder.sign(rawTxn);
-  const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-  await client.waitForTransaction(transactionRes.hash);
-
-  resources = await client.getAccountResources(mutisigAccountAddress);
-  accountResource = resources.find((r) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  console.log(`multisig account coins: ${balance}.`);
-
-  resources = await client.getAccountResources(account4.address());
-  accountResource = resources.find((r) => r.type === aptosCoinStore);
-  balance = parseInt((accountResource?.data as any).coin.value);
-  assert(balance === 123);
-  console.log(`account4 coins: ${balance}. Should be 123!`);
-})();
diff --git a/m1/JavaScript-client/examples/typescript/package.json b/m1/JavaScript-client/examples/typescript/package.json
deleted file mode 100644
index 46e700c5d..000000000
--- a/m1/JavaScript-client/examples/typescript/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "ts-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "bcs_transaction": "ts-node bcs_transaction.ts",
-    "multisig_account": "ts-node multisig_account.ts",
-    "multisig_transaction": "ts-node multisig_transaction.ts",
-    "simple_nft": "ts-node simple_nft.ts",
-    "transfer_coin": "ts-node transfer_coin.ts",
-    "test": "run-s bcs_transaction multisig_transaction simple_nft transfer_coin",
-    "your_coin": "ts-node your_coin.ts",
-    "call_aptos_cli": "ts-node call_aptos_cli.ts"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "aptos": "latest",
-    "dotenv": "16.0.1",
-    "ffi-napi": "^4.0.3",
-    "ref-array-di": "^1.2.2"
-  },
-  "devDependencies": {
-    "@types/ffi-napi": "^4.0.7",
-    "@types/node": "18.6.2",
-    "npm-run-all": "4.1.5",
-    "ts-node": "10.9.1",
-    "typescript": "4.8.2"
-  }
-}
diff --git a/m1/JavaScript-client/examples/typescript/pnpm-lock.yaml b/m1/JavaScript-client/examples/typescript/pnpm-lock.yaml
deleted file mode 100644
index 71fba9cfa..000000000
--- a/m1/JavaScript-client/examples/typescript/pnpm-lock.yaml
+++ /dev/null
@@ -1,1076 +0,0 @@
-lockfileVersion: '6.0'
-
-dependencies:
-  aptos:
-    specifier: latest
-    version: 1.8.4
-  dotenv:
-    specifier: 16.0.1
-    version: 16.0.1
-  ffi-napi:
-    specifier: ^4.0.3
-    version: 4.0.3
-  ref-array-di:
-    specifier: ^1.2.2
-    version: 1.2.2
-
-devDependencies:
-  '@types/ffi-napi':
-    specifier: ^4.0.7
-    version: 4.0.7
-  '@types/node':
-    specifier: 18.6.2
-    version: 18.6.2
-  npm-run-all:
-    specifier: 4.1.5
-    version: 4.1.5
-  ts-node:
-    specifier: 10.9.1
-    version: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-  typescript:
-    specifier: 4.8.2
-    version: 4.8.2
-
-packages:
-
-  /@cspotcode/source-map-support@0.8.1:
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.9
-    dev: true
-
-  /@jridgewell/resolve-uri@3.1.0:
-    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
-  /@jridgewell/sourcemap-codec@1.4.14:
-    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-    dev: true
-
-  /@jridgewell/trace-mapping@0.3.9:
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /@noble/hashes@1.1.3:
-    resolution: {integrity: sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==}
-    dev: false
-
-  /@scure/base@1.1.1:
-    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
-    dev: false
-
-  /@scure/bip39@1.1.0:
-    resolution: {integrity: sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/base': 1.1.1
-    dev: false
-
-  /@tsconfig/node10@1.0.9:
-    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
-    dev: true
-
-  /@tsconfig/node12@1.0.11:
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-    dev: true
-
-  /@tsconfig/node14@1.0.3:
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-    dev: true
-
-  /@tsconfig/node16@1.0.3:
-    resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
-    dev: true
-
-  /@types/ffi-napi@4.0.7:
-    resolution: {integrity: sha512-2CvLfgxCUUSj7qVab6/uFLyVpgVd2gEV4H/TQEHHn6kZTV8iTesz9uo0bckhwzsh71atutOv8P3JmvRX2ZvpZg==}
-    dependencies:
-      '@types/node': 18.6.2
-      '@types/ref-napi': 3.0.7
-      '@types/ref-struct-di': 1.1.9
-    dev: true
-
-  /@types/node@18.6.2:
-    resolution: {integrity: sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==}
-    dev: true
-
-  /@types/ref-napi@3.0.7:
-    resolution: {integrity: sha512-CzPwr36VkezSpaJGdQX/UrczMSDsDgsWQQFEfQkS799Ft7n/s183a53lsql7RwVq+Ik4yLEgI84pRnLC0XXRlA==}
-    dependencies:
-      '@types/node': 18.6.2
-    dev: true
-
-  /@types/ref-struct-di@1.1.9:
-    resolution: {integrity: sha512-B1FsB1BhG1VLx0+IqBaAPXEPH0wCOb+Glaaw/i+nRUwDKFtSqWOziGnTRw05RyrBbrDsMiM0tVWmaujrs016Sw==}
-    dependencies:
-      '@types/ref-napi': 3.0.7
-    dev: true
-
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
-
-  /acorn@8.8.2:
-    resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-    dependencies:
-      color-convert: 1.9.3
-    dev: true
-
-  /aptos@1.8.4:
-    resolution: {integrity: sha512-LWasWcz8+SMj4nCGQzB8kC0P/b2PRraUSjIQmeQH6jJ4O2WqS4MASzQZdk3vkG+i5O2dgLRgDK2QUZaxHqfydQ==}
-    engines: {node: '>=11.0.0'}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/bip39': 1.1.0
-      axios: 0.27.2
-      form-data: 4.0.0
-      tweetnacl: 1.0.3
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-    dev: true
-
-  /array-index@1.0.0:
-    resolution: {integrity: sha512-jesyNbBkLQgGZMSwA1FanaFjalb1mZUGxGeUEkSDidzgrbjBGhvizJkaItdhkt8eIHFOJC7nDsrXk+BaehTdRw==}
-    dependencies:
-      debug: 2.6.9
-      es6-symbol: 3.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-    dev: false
-
-  /available-typed-arrays@1.0.5:
-    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-    dev: true
-
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-    dev: true
-
-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
-    dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.2.0
-    dev: true
-
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-    dev: true
-
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-    dependencies:
-      color-name: 1.1.3
-    dev: true
-
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-    dev: true
-
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      delayed-stream: 1.0.0
-    dev: false
-
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-    dev: true
-
-  /create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-    dev: true
-
-  /cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
-    dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.1
-      shebang-command: 1.2.0
-      which: 1.3.1
-    dev: true
-
-  /d@1.0.1:
-    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
-    dependencies:
-      es5-ext: 0.10.62
-      type: 1.2.0
-    dev: false
-
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.0.0
-    dev: false
-
-  /debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: false
-
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: false
-
-  /define-properties@1.2.0:
-    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.0
-      object-keys: 1.1.1
-    dev: true
-
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
-  /diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-    dev: true
-
-  /dotenv@16.0.1:
-    resolution: {integrity: sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
-    dependencies:
-      is-arrayish: 0.2.1
-    dev: true
-
-  /es-abstract@1.21.1:
-    resolution: {integrity: sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      es-set-tostringtag: 2.0.1
-      es-to-primitive: 1.2.1
-      function-bind: 1.1.1
-      function.prototype.name: 1.1.5
-      get-intrinsic: 1.2.0
-      get-symbol-description: 1.0.0
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      has: 1.0.3
-      has-property-descriptors: 1.0.0
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.5
-      is-array-buffer: 3.0.2
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-typed-array: 1.1.10
-      is-weakref: 1.0.2
-      object-inspect: 1.12.3
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.4.3
-      safe-regex-test: 1.0.0
-      string.prototype.trimend: 1.0.6
-      string.prototype.trimstart: 1.0.6
-      typed-array-length: 1.0.4
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.9
-    dev: true
-
-  /es-set-tostringtag@2.0.1:
-    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.0
-      has: 1.0.3
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-    dev: true
-
-  /es5-ext@0.10.62:
-    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
-    engines: {node: '>=0.10'}
-    requiresBuild: true
-    dependencies:
-      es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
-      next-tick: 1.1.0
-    dev: false
-
-  /es6-iterator@2.0.3:
-    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
-    dependencies:
-      d: 1.0.1
-      es5-ext: 0.10.62
-      es6-symbol: 3.1.3
-    dev: false
-
-  /es6-symbol@3.1.3:
-    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
-    dependencies:
-      d: 1.0.1
-      ext: 1.7.0
-    dev: false
-
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-    dev: true
-
-  /ext@1.7.0:
-    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
-    dependencies:
-      type: 2.7.2
-    dev: false
-
-  /ffi-napi@4.0.3:
-    resolution: {integrity: sha512-PMdLCIvDY9mS32RxZ0XGb95sonPRal8aqRhLbeEtWKZTe2A87qRFG9HjOhvG8EX2UmQw5XNRMIOT+1MYlWmdeg==}
-    engines: {node: '>=10'}
-    requiresBuild: true
-    dependencies:
-      debug: 4.3.4
-      get-uv-event-loop-napi-h: 1.0.6
-      node-addon-api: 3.2.1
-      node-gyp-build: 4.6.0
-      ref-napi: 3.0.3
-      ref-struct-di: 1.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /follow-redirects@1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
-    dependencies:
-      is-callable: 1.2.7
-    dev: true
-
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
-
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: true
-
-  /function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      es-abstract: 1.21.1
-      functions-have-names: 1.2.3
-    dev: true
-
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-    dev: true
-
-  /get-intrinsic@1.2.0:
-    resolution: {integrity: sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-symbols: 1.0.3
-    dev: true
-
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.0
-    dev: true
-
-  /get-symbol-from-current-process-h@1.0.2:
-    resolution: {integrity: sha512-syloC6fsCt62ELLrr1VKBM1ggOpMdetX9hTrdW77UQdcApPHLmf7CI7OKcN1c9kYuNxKcDe4iJ4FY9sX3aw2xw==}
-    dev: false
-
-  /get-uv-event-loop-napi-h@1.0.6:
-    resolution: {integrity: sha512-t5c9VNR84nRoF+eLiz6wFrEp1SE2Acg0wS+Ysa2zF0eROes+LzOfuTaVHxGy8AbS8rq7FHEJzjnCZo1BupwdJg==}
-    dependencies:
-      get-symbol-from-current-process-h: 1.0.2
-    dev: false
-
-  /globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-properties: 1.2.0
-    dev: true
-
-  /gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-    dependencies:
-      get-intrinsic: 1.2.0
-    dev: true
-
-  /graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-    dev: true
-
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-    dev: true
-
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-    dependencies:
-      get-intrinsic: 1.2.0
-    dev: true
-
-  /has-proto@1.0.1:
-    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.1
-    dev: true
-
-  /hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
-    dev: true
-
-  /internal-slot@1.0.5:
-    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.0
-      has: 1.0.3
-      side-channel: 1.0.4
-    dev: true
-
-  /is-array-buffer@3.0.2:
-    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.0
-      is-typed-array: 1.1.10
-    dev: true
-
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-    dev: true
-
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
-    dependencies:
-      has-bigints: 1.0.2
-    dev: true
-
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /is-core-module@2.11.0:
-    resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
-    dependencies:
-      call-bind: 1.0.2
-    dev: true
-
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
-  /is-typed-array@1.1.10:
-    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-    dependencies:
-      call-bind: 1.0.2
-    dev: true
-
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-    dev: true
-
-  /json-parse-better-errors@1.0.2:
-    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
-    dev: true
-
-  /load-json-file@4.0.0:
-    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
-    engines: {node: '>=4'}
-    dependencies:
-      graceful-fs: 4.2.10
-      parse-json: 4.0.0
-      pify: 3.0.0
-      strip-bom: 3.0.0
-    dev: true
-
-  /make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-    dev: true
-
-  /memorystream@0.3.1:
-    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
-    engines: {node: '>= 0.10.0'}
-    dev: true
-
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      mime-db: 1.52.0
-    dev: false
-
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
-    dependencies:
-      brace-expansion: 1.1.11
-    dev: true
-
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-    dev: false
-
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: false
-
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-    dev: false
-
-  /next-tick@1.1.0:
-    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
-    dev: false
-
-  /nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-    dev: true
-
-  /node-addon-api@3.2.1:
-    resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==}
-    dev: false
-
-  /node-gyp-build@4.6.0:
-    resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==}
-    hasBin: true
-    dev: false
-
-  /normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
-    dependencies:
-      hosted-git-info: 2.8.9
-      resolve: 1.22.1
-      semver: 5.7.1
-      validate-npm-package-license: 3.0.4
-    dev: true
-
-  /npm-run-all@4.1.5:
-    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
-    engines: {node: '>= 4'}
-    hasBin: true
-    dependencies:
-      ansi-styles: 3.2.1
-      chalk: 2.4.2
-      cross-spawn: 6.0.5
-      memorystream: 0.3.1
-      minimatch: 3.1.2
-      pidtree: 0.3.1
-      read-pkg: 3.0.0
-      shell-quote: 1.8.0
-      string.prototype.padend: 3.1.4
-    dev: true
-
-  /object-inspect@1.12.3:
-    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-    dev: true
-
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-    dev: true
-
-  /parse-json@4.0.0:
-    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: '>=4'}
-    dependencies:
-      error-ex: 1.3.2
-      json-parse-better-errors: 1.0.2
-    dev: true
-
-  /path-key@2.0.1:
-    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-    dev: true
-
-  /path-type@3.0.0:
-    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
-    engines: {node: '>=4'}
-    dependencies:
-      pify: 3.0.0
-    dev: true
-
-  /pidtree@0.3.1:
-    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
-
-  /pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /read-pkg@3.0.0:
-    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
-    engines: {node: '>=4'}
-    dependencies:
-      load-json-file: 4.0.0
-      normalize-package-data: 2.5.0
-      path-type: 3.0.0
-    dev: true
-
-  /ref-array-di@1.2.2:
-    resolution: {integrity: sha512-jhCmhqWa7kvCVrWhR/d7RemkppqPUdxEil1CtTtm7FkZV8LcHHCK3Or9GinUiFP5WY3k0djUkMvhBhx49Jb2iA==}
-    dependencies:
-      array-index: 1.0.0
-      debug: 3.2.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /ref-napi@3.0.3:
-    resolution: {integrity: sha512-LiMq/XDGcgodTYOMppikEtJelWsKQERbLQsYm0IOOnzhwE9xYZC7x8txNnFC9wJNOkPferQI4vD4ZkC0mDyrOA==}
-    engines: {node: '>= 10.0'}
-    requiresBuild: true
-    dependencies:
-      debug: 4.3.4
-      get-symbol-from-current-process-h: 1.0.2
-      node-addon-api: 3.2.1
-      node-gyp-build: 4.6.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /ref-struct-di@1.1.1:
-    resolution: {integrity: sha512-2Xyn/0Qgz89VT+++WP0sTosdm9oeowLP23wRJYhG4BFdMUrLj3jhwHZNEytYNYgtPKLNTP3KJX4HEgBvM1/Y2g==}
-    dependencies:
-      debug: 3.2.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      functions-have-names: 1.2.3
-    dev: true
-
-  /resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.11.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-    dev: true
-
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.0
-      is-regex: 1.1.4
-    dev: true
-
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
-    hasBin: true
-    dev: true
-
-  /shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      shebang-regex: 1.0.0
-    dev: true
-
-  /shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /shell-quote@1.8.0:
-    resolution: {integrity: sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==}
-    dev: true
-
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.0
-      object-inspect: 1.12.3
-    dev: true
-
-  /spdx-correct@3.2.0:
-    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
-    dependencies:
-      spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.13
-    dev: true
-
-  /spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
-    dev: true
-
-  /spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
-    dependencies:
-      spdx-exceptions: 2.3.0
-      spdx-license-ids: 3.0.13
-    dev: true
-
-  /spdx-license-ids@3.0.13:
-    resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==}
-    dev: true
-
-  /string.prototype.padend@3.1.4:
-    resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      es-abstract: 1.21.1
-    dev: true
-
-  /string.prototype.trimend@1.0.6:
-    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      es-abstract: 1.21.1
-    dev: true
-
-  /string.prototype.trimstart@1.0.6:
-    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      es-abstract: 1.21.1
-    dev: true
-
-  /strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-    dependencies:
-      has-flag: 3.0.0
-    dev: true
-
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /ts-node@10.9.1(@types/node@18.6.2)(typescript@4.8.2):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.3
-      '@types/node': 18.6.2
-      acorn: 8.8.2
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 4.8.2
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
-    dev: true
-
-  /tweetnacl@1.0.3:
-    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
-    dev: false
-
-  /type@1.2.0:
-    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
-    dev: false
-
-  /type@2.7.2:
-    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
-    dev: false
-
-  /typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
-    dependencies:
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      is-typed-array: 1.1.10
-    dev: true
-
-  /typescript@4.8.2:
-    resolution: {integrity: sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-    dependencies:
-      call-bind: 1.0.2
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-    dev: true
-
-  /v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-    dev: true
-
-  /validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
-    dependencies:
-      spdx-correct: 3.2.0
-      spdx-expression-parse: 3.0.1
-    dev: true
-
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-    dev: true
-
-  /which-typed-array@1.1.9:
-    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-      is-typed-array: 1.1.10
-    dev: true
-
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-    dependencies:
-      isexe: 2.0.0
-    dev: true
-
-  /yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
-    dev: true
diff --git a/m1/JavaScript-client/examples/typescript/simple_nft.ts b/m1/JavaScript-client/examples/typescript/simple_nft.ts
deleted file mode 100644
index 1ef576290..000000000
--- a/m1/JavaScript-client/examples/typescript/simple_nft.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable no-console */
-
-import dotenv from "dotenv";
-dotenv.config();
-
-import { AptosClient, AptosAccount, FaucetClient, TokenClient, CoinClient, Network, Provider } from "aptos";
-import { NODE_URL, FAUCET_URL } from "./common";
-
-(async () => {
-  // Create API and faucet clients.
-  // :!:>section_1a
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL); // <:!:section_1a
-
-  // Create client for working with the token module.
-  // :!:>section_1b
-  const tokenClient = new TokenClient(client); // <:!:section_1b
-
-  // Create a coin client for checking account balances.
-  const coinClient = new CoinClient(client);
-
-  // Create accounts.
-  // :!:>section_2
-  const alice = new AptosAccount();
-  const bob = new AptosAccount(); // <:!:section_2
-
-  console.log("=== network ===");
-  console.log(NODE_URL);
-
-  // Print out account addresses.
-  console.log("=== Addresses ===");
-  console.log(`Alice: ${alice.address()}`);
-  console.log(`Bob: ${bob.address()}`);
-  console.log("");
-
-  // Fund accounts.
-  // :!:>section_3
-  await faucetClient.fundAccount(alice.address(), 100_000_000);
-  await faucetClient.fundAccount(bob.address(), 100_000_000); // <:!:section_3
-
-  console.log("=== Initial Coin Balances ===");
-  console.log(`Alice: ${await coinClient.checkBalance(alice)}`);
-  console.log(`Bob: ${await coinClient.checkBalance(bob)}`);
-  console.log("");
-
-  console.log("=== Creating Collection and Token ===");
-
-  const collectionName = "Alice's";
-  const tokenName = "Alice's first token";
-  const tokenPropertyVersion = 0;
-
-  const tokenId = {
-    token_data_id: {
-      creator: alice.address().hex(),
-      collection: collectionName,
-      name: tokenName,
-    },
-    property_version: `${tokenPropertyVersion}`,
-  };
-
-  // Create the collection.
-  // :!:>section_4
-  const txnHash1 = await tokenClient.createCollection(
-    alice,
-    collectionName,
-    "Alice's simple collection",
-    "https://alice.com",
-  ); // <:!:section_4
-  await client.waitForTransaction(txnHash1, { checkSuccess: true });
-
-  // Create a token in that collection.
-  // :!:>section_5
-  const txnHash2 = await tokenClient.createToken(
-    alice,
-    collectionName,
-    tokenName,
-    "Alice's simple token",
-    1,
-    "https://aptos.dev/img/nyan.jpeg",
-  ); // <:!:section_5
-  await client.waitForTransaction(txnHash2, { checkSuccess: true });
-
-  // Print the collection data.
-  // :!:>section_6
-  const collectionData = await tokenClient.getCollectionData(alice.address(), collectionName);
-  console.log(`Alice's collection: ${JSON.stringify(collectionData, null, 4)}`); // <:!:section_6
-
-  // Get the token balance.
-  // :!:>section_7
-  const aliceBalance1 = await tokenClient.getToken(
-    alice.address(),
-    collectionName,
-    tokenName,
-    `${tokenPropertyVersion}`,
-  );
-  console.log(`Alice's token balance: ${aliceBalance1["amount"]}`); // <:!:section_7
-
-  // Get the token data.
-  // :!:>section_8
-  const tokenData = await tokenClient.getTokenData(alice.address(), collectionName, tokenName);
-  console.log(`Alice's token data: ${JSON.stringify(tokenData, null, 4)}`); // <:!:section_8
-
-  // Alice offers one token to Bob.
-  console.log("\n=== Transferring the token to Bob ===");
-  // :!:>section_9
-  const txnHash3 = await tokenClient.offerToken(
-    alice,
-    bob.address(),
-    alice.address(),
-    collectionName,
-    tokenName,
-    1,
-    tokenPropertyVersion,
-  ); // <:!:section_9
-  await client.waitForTransaction(txnHash3, { checkSuccess: true });
-
-  // Bob claims the token Alice offered him.
-  // :!:>section_10
-  const txnHash4 = await tokenClient.claimToken(
-    bob,
-    alice.address(),
-    alice.address(),
-    collectionName,
-    tokenName,
-    tokenPropertyVersion,
-  ); // <:!:section_10
-  await client.waitForTransaction(txnHash4, { checkSuccess: true });
-
-  // Print their balances.
-  const aliceBalance2 = await tokenClient.getToken(
-    alice.address(),
-    collectionName,
-    tokenName,
-    `${tokenPropertyVersion}`,
-  );
-  const bobBalance2 = await tokenClient.getTokenForAccount(bob.address(), tokenId);
-  console.log(`Alice's token balance: ${aliceBalance2["amount"]}`);
-  console.log(`Bob's token balance: ${bobBalance2["amount"]}`);
-
-  console.log("\n=== Transferring the token back to Alice using MultiAgent ===");
-  // :!:>section_11
-  let txnHash5 = await tokenClient.directTransferToken(
-    bob,
-    alice,
-    alice.address(),
-    collectionName,
-    tokenName,
-    1,
-    tokenPropertyVersion,
-  ); // <:!:section_11
-  await client.waitForTransaction(txnHash5, { checkSuccess: true });
-
-  // Print out their balances one last time.
-  const aliceBalance3 = await tokenClient.getToken(
-    alice.address(),
-    collectionName,
-    tokenName,
-    `${tokenPropertyVersion}`,
-  );
-  const bobBalance3 = await tokenClient.getTokenForAccount(bob.address(), tokenId);
-  console.log(`Alice's token balance: ${aliceBalance3["amount"]}`);
-  console.log(`Bob's token balance: ${bobBalance3["amount"]}`);
-
-  const provider = new Provider(Network.DEVNET);
-  console.log("\n=== Checking if indexer devnet chainId same as fullnode chainId  ===");
-  const indexerLedgerInfo = await provider.getIndexerLedgerInfo();
-  const fullNodeChainId = await provider.getChainId();
-
-  console.log(
-    `\n fullnode chain id is: ${fullNodeChainId}, indexer chain id is: ${indexerLedgerInfo.ledger_infos[0].chain_id}`,
-  );
-
-  if (indexerLedgerInfo.ledger_infos[0].chain_id !== fullNodeChainId) {
-    console.log(`\n fullnode chain id and indexer chain id are not synced, skipping rest of tests`);
-    return;
-  }
-
-  console.log("\n=== Getting Alices's NFTs ===");
-  const aliceNfts = await provider.getAccountNFTs(alice.address().hex());
-  console.log(`Alice current token ownership: ${aliceNfts.current_token_ownerships[0].amount}. Should be 1`);
-
-  console.log("\n=== Getting Bob's NFTs ===");
-  const bobNfts = await provider.getAccountNFTs(bob.address().hex());
-  console.log(`Bob current token ownership: ${bobNfts.current_token_ownerships.length}. Should be 0`);
-})();
diff --git a/m1/JavaScript-client/examples/typescript/transfer_coin.ts b/m1/JavaScript-client/examples/typescript/transfer_coin.ts
deleted file mode 100644
index 20fb899dc..000000000
--- a/m1/JavaScript-client/examples/typescript/transfer_coin.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable no-console */
-
-import dotenv from "dotenv";
-dotenv.config();
-
-import { AptosClient, AptosAccount, CoinClient, FaucetClient } from "aptos";
-import { NODE_URL, FAUCET_URL } from "./common";
-
-(async () => {
-  // Create API and faucet clients.
-  // :!:>section_1
-  const client = new AptosClient(NODE_URL);
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL); // <:!:section_1
-
-  // Create client for working with the coin module.
-  // :!:>section_1a
-  const coinClient = new CoinClient(client); // <:!:section_1a
-
-  // Create accounts.
-  // :!:>section_2
-  const alice = new AptosAccount();
-  const bob = new AptosAccount(); // <:!:section_2
-
-  // Print out account addresses.
-  console.log("=== Addresses ===");
-  console.log(`Alice: ${alice.address()}`);
-  console.log(`Bob: ${bob.address()}`);
-  console.log("");
-
-  // Fund accounts.
-  // :!:>section_3
-  await faucetClient.fundAccount(alice.address(), 100_000_000);
-  await faucetClient.fundAccount(bob.address(), 0); // <:!:section_3
-
-  // Print out initial balances.
-  console.log("=== Initial Balances ===");
-  // :!:>section_4
-  console.log(`Alice: ${await coinClient.checkBalance(alice)}`);
-  console.log(`Bob: ${await coinClient.checkBalance(bob)}`); // <:!:section_4
-  console.log("");
-
-  // Have Alice send Bob some AptosCoins.
-  // :!:>section_5
-  let txnHash = await coinClient.transfer(alice, bob, 1_000, { gasUnitPrice: BigInt(100) }); // <:!:section_5
-  // :!:>section_6a
-  await client.waitForTransaction(txnHash); // <:!:section_6a
-
-  // Print out intermediate balances.
-  console.log("=== Intermediate Balances ===");
-  console.log(`Alice: ${await coinClient.checkBalance(alice)}`);
-  console.log(`Bob: ${await coinClient.checkBalance(bob)}`);
-  console.log("");
-
-  // Have Alice send Bob some more AptosCoins.
-  txnHash = await coinClient.transfer(alice, bob, 1_000, { gasUnitPrice: BigInt(100) });
-  // :!:>section_6b
-  await client.waitForTransaction(txnHash, { checkSuccess: true }); // <:!:section_6b
-
-  // Print out final balances.
-  console.log("=== Final Balances ===");
-  console.log(`Alice: ${await coinClient.checkBalance(alice)}`);
-  console.log(`Bob: ${await coinClient.checkBalance(bob)}`);
-  console.log("");
-})();
diff --git a/m1/JavaScript-client/examples/typescript/tsconfig.json b/m1/JavaScript-client/examples/typescript/tsconfig.json
deleted file mode 100644
index b6381f2d6..000000000
--- a/m1/JavaScript-client/examples/typescript/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "allowJs": true,
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "module": "commonjs",
-    "noImplicitAny": true,
-    "outDir": "./dist",
-    "sourceMap": true,
-    "target": "es2020",
-    "pretty": true
-  },
-  "include": [
-    "src",
-    "*.ts"
-  ],
-  "paths": {
-    "@aptos/*": "../..",
-  }
-}
diff --git a/m1/JavaScript-client/examples/typescript/your_coin.ts b/m1/JavaScript-client/examples/typescript/your_coin.ts
deleted file mode 100644
index 9460b863d..000000000
--- a/m1/JavaScript-client/examples/typescript/your_coin.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import assert from "assert";
-import fs from "fs";
-import path from "path";
-import { NODE_URL, FAUCET_URL } from "./common";
-import { AptosAccount, AptosClient, TxnBuilderTypes, MaybeHexString, HexString, FaucetClient } from "aptos";
-/**
-  This example depends on the MoonCoin.move module having already been published to the destination blockchain.
-
-  One method to do so is to use the CLI:
-      * Acquire the Aptos CLI, see https://aptos.dev/cli-tools/aptos-cli-tool/install-aptos-cli
-      * `pnpm your_coin ~/aptos-core/aptos-move/move-examples/moon_coin`.
-      * Open another terminal and `aptos move compile --package-dir ~/aptos-core/aptos-move/move-examples/moon_coin --save-metadata --named-addresses MoonCoin=<Alice address from above step>`.
-      * Return to the first terminal and press enter.
- */
-
-const readline = require("readline").createInterface({
-  input: process.stdin,
-  output: process.stdout,
-});
-
-class CoinClient extends AptosClient {
-  constructor() {
-    super(NODE_URL);
-  }
-
-  /** Register the receiver account to receive transfers for the new coin. */
-  async registerCoin(coinTypeAddress: HexString, coinReceiver: AptosAccount): Promise<string> {
-    const rawTxn = await this.generateTransaction(coinReceiver.address(), {
-      function: "0x1::managed_coin::register",
-      type_arguments: [`${coinTypeAddress.hex()}::moon_coin::MoonCoin`],
-      arguments: [],
-    });
-
-    const bcsTxn = await this.signTransaction(coinReceiver, rawTxn);
-    const pendingTxn = await this.submitTransaction(bcsTxn);
-
-    return pendingTxn.hash;
-  }
-
-  /** Mints the newly created coin to a specified receiver address */
-  async transferCoin(sender: AptosAccount, receiverAddress: HexString, amount: number | bigint): Promise<string> {
-    const rawTxn = await this.generateTransaction(sender.address(), {
-      function: "0x1::aptos_account::transfer_coins",
-      type_arguments: [`${sender.address()}::moon_coin::MoonCoin`],
-      arguments: [receiverAddress.hex(), amount],
-    });
-
-    const bcsTxn = await this.signTransaction(sender, rawTxn);
-    const pendingTxn = await this.submitTransaction(bcsTxn);
-
-    return pendingTxn.hash;
-  }
-
-  /** Mints the newly created coin to a specified receiver address */
-  async mintCoin(minter: AptosAccount, receiverAddress: HexString, amount: number | bigint): Promise<string> {
-    const rawTxn = await this.generateTransaction(minter.address(), {
-      function: "0x1::managed_coin::mint",
-      type_arguments: [`${minter.address()}::moon_coin::MoonCoin`],
-      arguments: [receiverAddress.hex(), amount],
-    });
-
-    const bcsTxn = await this.signTransaction(minter, rawTxn);
-    const pendingTxn = await this.submitTransaction(bcsTxn);
-
-    return pendingTxn.hash;
-  }
-
-  /** Return the balance of the newly created coin */
-  async getBalance(accountAddress: MaybeHexString, coinTypeAddress: HexString): Promise<string | number> {
-    try {
-      const resource = await this.getAccountResource(
-        accountAddress,
-        `0x1::coin::CoinStore<${coinTypeAddress.hex()}::moon_coin::MoonCoin>`,
-      );
-
-      return parseInt((resource.data as any)["coin"]["value"]);
-    } catch (_) {
-      return 0;
-    }
-  }
-}
-
-/** run our demo! */
-async function main() {
-  assert(process.argv.length == 3, "Expecting an argument that points to the moon_coin directory.");
-
-  const client = new CoinClient();
-  const faucetClient = new FaucetClient(NODE_URL, FAUCET_URL);
-
-  // Create two accounts, Alice and Bob, and fund Alice but not Bob
-  const alice = new AptosAccount();
-  const bob = new AptosAccount();
-
-  console.log("\n=== Addresses ===");
-  console.log(`Alice: ${alice.address()}`);
-  console.log(`Bob: ${bob.address()}`);
-
-  await faucetClient.fundAccount(alice.address(), 100_000_000);
-  await faucetClient.fundAccount(bob.address(), 100_000_000);
-
-  await new Promise<void>((resolve) => {
-    readline.question("Update the module with Alice's address, compile, and press enter.", () => {
-      resolve();
-      readline.close();
-    });
-  });
-
-  // :!:>publish
-  const modulePath = process.argv[2];
-  const packageMetadata = fs.readFileSync(path.join(modulePath, "build", "Examples", "package-metadata.bcs"));
-  const moduleData = fs.readFileSync(path.join(modulePath, "build", "Examples", "bytecode_modules", "moon_coin.mv"));
-
-  console.log("Publishing MoonCoin package.");
-  let txnHash = await client.publishPackage(alice, new HexString(packageMetadata.toString("hex")).toUint8Array(), [
-    new TxnBuilderTypes.Module(new HexString(moduleData.toString("hex")).toUint8Array()),
-  ]);
-  await client.waitForTransaction(txnHash, { checkSuccess: true }); // <:!:publish
-
-  console.log(`Bob's initial MoonCoin balance: ${await client.getBalance(bob.address(), alice.address())}.`);
-  console.log("Alice mints herself some of the new coin.");
-  txnHash = await client.registerCoin(alice.address(), alice);
-  await client.waitForTransaction(txnHash, { checkSuccess: true });
-  txnHash = await client.mintCoin(alice, alice.address(), 100);
-  await client.waitForTransaction(txnHash, { checkSuccess: true });
-
-  console.log("Alice transfers the newly minted coins to Bob.");
-  txnHash = await client.transferCoin(alice, bob.address(), 100);
-  await client.waitForTransaction(txnHash, { checkSuccess: true });
-  console.log(`Bob's updated MoonCoin balance: ${await client.getBalance(bob.address(), alice.address())}.`);
-}
-
-if (require.main === module) {
-  main().then((resp) => console.log(resp));
-}
diff --git a/m1/JavaScript-client/jest.config.js b/m1/JavaScript-client/jest.config.js
deleted file mode 100644
index 885816192..000000000
--- a/m1/JavaScript-client/jest.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @type {import("ts-jest/dist/types").InitialOptionsTsJest} */
-module.exports = {
-  preset: "ts-jest",
-  moduleNameMapper: {
-    "^(\\.{1,2}/.*)\\.js$": "$1",
-  },
-  testEnvironment: "node",
-  coveragePathIgnorePatterns: ["generated/*", "./aptos_types/*", "utils/memoize-decorator.ts", "utils/hd-key.ts"],
-  testPathIgnorePatterns: ["dist/*"],
-  collectCoverage: true,
-  setupFiles: ["dotenv/config"],
-  coverageThreshold: {
-    global: {
-      branches: 50, // 90,
-      functions: 50, // 95,
-      lines: 50, // 95,
-      statements: 50, // 95,
-    },
-  },
-};
diff --git a/m1/JavaScript-client/package.json b/m1/JavaScript-client/package.json
deleted file mode 100644
index 12af11d1b..000000000
--- a/m1/JavaScript-client/package.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "name": "movement-sdk",
-  "description": "Movement SDK",
-  "packageManager": "pnpm@8.3.1",
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=11.0.0"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    }
-  },
-  "scripts": {
-    "prepack": "pnpm build",
-    "build": "pnpm build:clean && pnpm _build:node && pnpm _build:browser",
-    "build:clean": "rm -rf dist",
-    "_build:browser": "tsup --platform browser --format iife --global-name movementSDK --minify",
-    "_build:node": "tsup --format cjs,esm --dts",
-    "lint": "eslint \"**/*.ts\"",
-    "test": "pnpm run publish-ans-contract && jest",
-    "_fmt": "prettier 'scripts/**/*.ts' 'src/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' '.eslintrc.js'",
-    "fmt": "pnpm _fmt --write",
-    "fmt:check": "pnpm _fmt --check",
-    "cov:clean": "rm -rf coverage",
-    "generate-client": "openapi -i ../../../api/doc/spec.yaml -o ./src/generated -c axios --name AptosGeneratedClient --exportSchemas true",
-    "checked-publish": "scripts/checked_publish.sh",
-    "generate-ts-docs": "scripts/generate_ts_docs.sh",
-    "indexer-codegen": "graphql-codegen --config ./src/indexer/codegen.yml",
-    "publish-ans-contract": "ts-node ./scripts/publish_ans_contract.ts"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/movemntdev/movement-subnet"
-  },
-  "homepage": "https://docs.movementlabs.xyz/",
-  "author": "movementdev",
-  "keywords": [
-    "Movement",
-    "Movement Labs",
-    "Move"
-  ],
-  "dependencies": {
-    "@noble/hashes": "1.1.3",
-    "@scure/bip39": "1.1.0",
-    "axios": "0.27.2",
-    "form-data": "4.0.0",
-    "tweetnacl": "1.0.3"
-  },
-  "devDependencies": {
-    "@graphql-codegen/cli": "^2.13.5",
-    "@graphql-codegen/import-types-preset": "^2.2.3",
-    "@graphql-codegen/typescript": "^2.7.3",
-    "@graphql-codegen/typescript-graphql-request": "^4.5.8",
-    "@graphql-codegen/typescript-operations": "^2.5.3",
-    "@types/jest": "28.1.8",
-    "@types/node": "18.6.2",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
-    "dotenv": "16.0.2",
-    "eslint": "8.23.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
-    "graphql": "^16.5.0",
-    "graphql-request": "^5.1.0",
-    "jest": "28.1.3",
-    "openapi-typescript-codegen": "https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
-    "ts-node": "10.9.1",
-    "tsup": "6.2.3",
-    "typedoc": "^0.23.20",
-    "typescript": "4.8.2"
-  },
-  "version": "1.0.3"
-}
diff --git a/m1/JavaScript-client/pnpm-lock.yaml b/m1/JavaScript-client/pnpm-lock.yaml
deleted file mode 100644
index 7efcb0398..000000000
--- a/m1/JavaScript-client/pnpm-lock.yaml
+++ /dev/null
@@ -1,6984 +0,0 @@
-lockfileVersion: '6.0'
-
-dependencies:
-  '@noble/hashes':
-    specifier: 1.1.3
-    version: 1.1.3
-  '@scure/bip39':
-    specifier: 1.1.0
-    version: 1.1.0
-  axios:
-    specifier: 0.27.2
-    version: 0.27.2
-  form-data:
-    specifier: 4.0.0
-    version: 4.0.0
-  tweetnacl:
-    specifier: 1.0.3
-    version: 1.0.3
-
-devDependencies:
-  '@graphql-codegen/cli':
-    specifier: ^2.13.5
-    version: 2.16.5(@babel/core@7.19.6)(@types/node@18.6.2)(graphql@16.6.0)(typescript@4.8.2)
-  '@graphql-codegen/import-types-preset':
-    specifier: ^2.2.3
-    version: 2.2.6(graphql@16.6.0)
-  '@graphql-codegen/typescript':
-    specifier: ^2.7.3
-    version: 2.8.8(graphql@16.6.0)
-  '@graphql-codegen/typescript-graphql-request':
-    specifier: ^4.5.8
-    version: 4.5.8(graphql-request@5.1.0)(graphql-tag@2.12.6)(graphql@16.6.0)
-  '@graphql-codegen/typescript-operations':
-    specifier: ^2.5.3
-    version: 2.5.13(graphql@16.6.0)
-  '@types/jest':
-    specifier: 28.1.8
-    version: 28.1.8
-  '@types/node':
-    specifier: 18.6.2
-    version: 18.6.2
-  '@typescript-eslint/eslint-plugin':
-    specifier: 5.36.2
-    version: 5.36.2(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)(typescript@4.8.2)
-  '@typescript-eslint/parser':
-    specifier: 5.36.2
-    version: 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-  dotenv:
-    specifier: 16.0.2
-    version: 16.0.2
-  eslint:
-    specifier: 8.23.0
-    version: 8.23.0
-  eslint-config-airbnb-base:
-    specifier: 15.0.0
-    version: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.23.0)
-  eslint-config-airbnb-typescript:
-    specifier: 17.0.0
-    version: 17.0.0(@typescript-eslint/eslint-plugin@5.36.2)(@typescript-eslint/parser@5.36.2)(eslint-plugin-import@2.26.0)(eslint@8.23.0)
-  eslint-config-prettier:
-    specifier: 8.5.0
-    version: 8.5.0(eslint@8.23.0)
-  eslint-plugin-import:
-    specifier: 2.26.0
-    version: 2.26.0(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)
-  graphql:
-    specifier: ^16.5.0
-    version: 16.6.0
-  graphql-request:
-    specifier: ^5.1.0
-    version: 5.1.0(graphql@16.6.0)
-  jest:
-    specifier: 28.1.3
-    version: 28.1.3(@types/node@18.6.2)(ts-node@10.9.1)
-  openapi-typescript-codegen:
-    specifier: https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz
-    version: '@github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz'
-  prettier:
-    specifier: 2.6.2
-    version: 2.6.2
-  ts-jest:
-    specifier: 28.0.8
-    version: 28.0.8(@babel/core@7.19.6)(esbuild@0.15.13)(jest@28.1.3)(typescript@4.8.2)
-  ts-loader:
-    specifier: 9.3.1
-    version: 9.3.1(typescript@4.8.2)(webpack@5.80.0)
-  ts-node:
-    specifier: 10.9.1
-    version: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-  tsup:
-    specifier: 6.2.3
-    version: 6.2.3(ts-node@10.9.1)(typescript@4.8.2)
-  typedoc:
-    specifier: ^0.23.20
-    version: 0.23.20(typescript@4.8.2)
-  typescript:
-    specifier: 4.8.2
-    version: 4.8.2
-
-packages:
-
-  /@ampproject/remapping@2.2.0:
-    resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.1.1
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
-
-  /@apidevtools/json-schema-ref-parser@9.0.9:
-    resolution: {integrity: sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==}
-    dependencies:
-      '@jsdevtools/ono': 7.1.3
-      '@types/json-schema': 7.0.11
-      call-me-maybe: 1.0.2
-      js-yaml: 4.1.0
-    dev: true
-
-  /@ardatan/relay-compiler@12.0.0(graphql@16.6.0):
-    resolution: {integrity: sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==}
-    hasBin: true
-    peerDependencies:
-      graphql: '*'
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/generator': 7.20.14
-      '@babel/parser': 7.20.15
-      '@babel/runtime': 7.20.13
-      '@babel/traverse': 7.20.13
-      '@babel/types': 7.20.7
-      babel-preset-fbjs: 3.4.0(@babel/core@7.19.6)
-      chalk: 4.1.2
-      fb-watchman: 2.0.2
-      fbjs: 3.0.4
-      glob: 7.2.3
-      graphql: 16.6.0
-      immutable: 3.7.6
-      invariant: 2.2.4
-      nullthrows: 1.1.1
-      relay-runtime: 12.0.0
-      signedsource: 1.0.0
-      yargs: 15.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@ardatan/sync-fetch@0.0.1:
-    resolution: {integrity: sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==}
-    engines: {node: '>=14'}
-    dependencies:
-      node-fetch: 2.6.9
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /@babel/code-frame@7.18.6:
-    resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
-
-  /@babel/compat-data@7.20.1:
-    resolution: {integrity: sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/compat-data@7.20.14:
-    resolution: {integrity: sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/core@7.19.6:
-    resolution: {integrity: sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.1
-      '@babel/helper-compilation-targets': 7.20.0(@babel/core@7.19.6)
-      '@babel/helper-module-transforms': 7.19.6
-      '@babel/helpers': 7.20.1
-      '@babel/parser': 7.20.1
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.1
-      '@babel/types': 7.20.0
-      convert-source-map: 1.9.0
-      debug: 4.3.4
-      gensync: 1.0.0-beta.2
-      json5: 2.2.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/generator@7.20.1:
-    resolution: {integrity: sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.0
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: true
-
-  /@babel/generator@7.20.14:
-    resolution: {integrity: sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: true
-
-  /@babel/helper-annotate-as-pure@7.18.6:
-    resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/helper-compilation-targets@7.20.0(@babel/core@7.19.6):
-    resolution: {integrity: sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.20.1
-      '@babel/core': 7.19.6
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      semver: 6.3.0
-    dev: true
-
-  /@babel/helper-compilation-targets@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.20.14
-      '@babel/core': 7.19.6
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 6.3.0
-    dev: true
-
-  /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.19.6):
-    resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-environment-visitor@7.18.9:
-    resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-function-name@7.19.0:
-    resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/helper-hoist-variables@7.18.6:
-    resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/helper-member-expression-to-functions@7.20.7:
-    resolution: {integrity: sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/helper-module-imports@7.18.6:
-    resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/helper-module-transforms@7.19.6:
-    resolution: {integrity: sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.19.4
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.1
-      '@babel/types': 7.20.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-module-transforms@7.20.11:
-    resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.20.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.13
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-optimise-call-expression@7.18.6:
-    resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/helper-plugin-utils@7.19.0:
-    resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-plugin-utils@7.20.2:
-    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-replace-supers@7.20.7:
-    resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.13
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-simple-access@7.19.4:
-    resolution: {integrity: sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/helper-simple-access@7.20.2:
-    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/helper-skip-transparent-expression-wrappers@7.20.0:
-    resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/helper-split-export-declaration@7.18.6:
-    resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/helper-string-parser@7.19.4:
-    resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-validator-identifier@7.19.1:
-    resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-validator-option@7.18.6:
-    resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helpers@7.20.1:
-    resolution: {integrity: sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.1
-      '@babel/types': 7.20.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/highlight@7.18.6:
-    resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: true
-
-  /@babel/parser@7.20.1:
-    resolution: {integrity: sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/parser@7.20.15:
-    resolution: {integrity: sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.19.6)
-      '@babel/helper-plugin-utils': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.20.14
-      '@babel/core': 7.19.6
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.19.6)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.19.6)
-    dev: true
-
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.19.6):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.19.6):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.19.6):
-    resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.19.6):
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.19.6):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.19.6):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.19.6):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.19.6):
-    resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-transform-arrow-functions@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-block-scoping@7.20.15(@babel/core@7.19.6):
-    resolution: {integrity: sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-classes@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.19.6)
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-computed-properties@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/template': 7.20.7
-    dev: true
-
-  /@babel/plugin-transform-destructuring@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.19.6):
-    resolution: {integrity: sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.19.6)
-    dev: true
-
-  /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.19.6):
-    resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.19.6):
-    resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.19.6)
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-literals@7.18.9(@babel/core@7.19.6):
-    resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-modules-commonjs@7.20.11(@babel/core@7.19.6):
-    resolution: {integrity: sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-module-transforms': 7.20.11
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-simple-access': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-parameters@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-react-jsx@7.20.13(@babel/core@7.19.6):
-    resolution: {integrity: sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.19.6)
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.19.6):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.19.6):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-    dev: true
-
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.19.6):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/runtime@7.20.13:
-    resolution: {integrity: sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-    dev: true
-
-  /@babel/template@7.18.10:
-    resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.1
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@babel/template@7.20.7:
-    resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.15
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/traverse@7.20.1:
-    resolution: {integrity: sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.1
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.1
-      '@babel/types': 7.20.0
-      debug: 4.3.4
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/traverse@7.20.13:
-    resolution: {integrity: sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.14
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.15
-      '@babel/types': 7.20.7
-      debug: 4.3.4
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/types@7.20.0:
-    resolution: {integrity: sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.19.4
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-    dev: true
-
-  /@babel/types@7.20.7:
-    resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.19.4
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-    dev: true
-
-  /@bcoe/v8-coverage@0.2.3:
-    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
-    dev: true
-
-  /@cspotcode/source-map-support@0.8.1:
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.9
-    dev: true
-
-  /@esbuild/android-arm@0.15.13:
-    resolution: {integrity: sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.15.13:
-    resolution: {integrity: sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@eslint/eslintrc@1.3.3:
-    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.3.4
-      espree: 9.4.0
-      globals: 13.17.0
-      ignore: 5.2.0
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/add@3.2.3(graphql@16.6.0):
-    resolution: {integrity: sha512-sQOnWpMko4JLeykwyjFTxnhqjd/3NOG2OyMuvK76Wnnwh8DRrNf2VEs2kmSvLl7MndMlOj7Kh5U154dVcvhmKQ==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.4.1
-    dev: true
-
-  /@graphql-codegen/cli@2.16.5(@babel/core@7.19.6)(@types/node@18.6.2)(graphql@16.6.0)(typescript@4.8.2):
-    resolution: {integrity: sha512-XYPIp+q7fB0xAGSAoRykiTe4oY80VU+z+dw5nuv4mLY0+pv7+pa2C6Nwhdw7a65lXOhFviBApWCCZeqd54SMnA==}
-    hasBin: true
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@babel/generator': 7.20.14
-      '@babel/template': 7.20.7
-      '@babel/types': 7.20.7
-      '@graphql-codegen/core': 2.6.8(graphql@16.6.0)
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-tools/apollo-engine-loader': 7.3.23(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/code-file-loader': 7.3.18(@babel/core@7.19.6)(graphql@16.6.0)
-      '@graphql-tools/git-loader': 7.2.17(@babel/core@7.19.6)(graphql@16.6.0)
-      '@graphql-tools/github-loader': 7.3.24(@babel/core@7.19.6)(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/graphql-file-loader': 7.5.15(graphql@16.6.0)
-      '@graphql-tools/json-file-loader': 7.4.16(graphql@16.6.0)
-      '@graphql-tools/load': 7.8.11(graphql@16.6.0)
-      '@graphql-tools/prisma-loader': 7.2.60(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/url-loader': 7.17.9(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@whatwg-node/fetch': 0.6.6(@types/node@18.6.2)
-      chalk: 4.1.2
-      chokidar: 3.5.3
-      cosmiconfig: 7.1.0
-      cosmiconfig-typescript-loader: 4.3.0(@types/node@18.6.2)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.8.2)
-      debounce: 1.2.1
-      detect-indent: 6.1.0
-      graphql: 16.6.0
-      graphql-config: 4.4.1(@types/node@18.6.2)(cosmiconfig-typescript-loader@4.3.0)(graphql@16.6.0)
-      inquirer: 8.2.5
-      is-glob: 4.0.3
-      json-to-pretty-yaml: 1.2.2
-      listr2: 4.0.5
-      log-symbols: 4.1.0
-      shell-quote: 1.8.0
-      string-env-interpolation: 1.0.1
-      ts-log: 2.2.5
-      ts-node: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-      tslib: 2.5.0
-      yaml: 1.10.2
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@swc/core'
-      - '@swc/wasm'
-      - '@types/node'
-      - bufferutil
-      - cosmiconfig-toml-loader
-      - encoding
-      - enquirer
-      - supports-color
-      - typescript
-      - utf-8-validate
-    dev: true
-
-  /@graphql-codegen/core@2.6.8(graphql@16.6.0):
-    resolution: {integrity: sha512-JKllNIipPrheRgl+/Hm/xuWMw9++xNQ12XJR/OHHgFopOg4zmN3TdlRSyYcv/K90hCFkkIwhlHFUQTfKrm8rxQ==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-tools/schema': 9.0.15(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.4.1
-    dev: true
-
-  /@graphql-codegen/import-types-preset@2.2.6(graphql@16.6.0):
-    resolution: {integrity: sha512-Lo2ITOln3UVdyyEPiijj8bVhVg0Ghp/JzHXA2LXxrJVCRbXizQhVC2vjiaWTjMskPt9Zub0yIoce4+RrbsXKcg==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/add': 3.2.3(graphql@16.6.0)
-      '@graphql-codegen/plugin-helpers': 2.7.2(graphql@16.6.0)
-      '@graphql-codegen/visitor-plugin-common': 2.13.1(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/plugin-helpers@2.7.2(graphql@16.6.0):
-    resolution: {integrity: sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-tools/utils': 8.13.1(graphql@16.6.0)
-      change-case-all: 1.0.14
-      common-tags: 1.8.2
-      graphql: 16.6.0
-      import-from: 4.0.0
-      lodash: 4.17.21
-      tslib: 2.4.1
-    dev: true
-
-  /@graphql-codegen/plugin-helpers@3.1.2(graphql@16.6.0):
-    resolution: {integrity: sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      change-case-all: 1.0.15
-      common-tags: 1.8.2
-      graphql: 16.6.0
-      import-from: 4.0.0
-      lodash: 4.17.21
-      tslib: 2.4.1
-    dev: true
-
-  /@graphql-codegen/schema-ast@2.6.1(graphql@16.6.0):
-    resolution: {integrity: sha512-5TNW3b1IHJjCh07D2yQNGDQzUpUl2AD+GVe1Dzjqyx/d2Fn0TPMxLsHsKPS4Plg4saO8FK/QO70wLsP7fdbQ1w==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.4.1
-    dev: true
-
-  /@graphql-codegen/typescript-graphql-request@4.5.8(graphql-request@5.1.0)(graphql-tag@2.12.6)(graphql@16.6.0):
-    resolution: {integrity: sha512-XsuAA35Ou03LsklNgnIWXZ5HOHsJ5w1dBuDKtvqM9rD0cAI8x0f4TY0n6O1EraSBSvyHLP3npb1lOTPZzG2TjA==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-      graphql-request: ^3.4.0 || ^4.0.0 || ^5.0.0
-      graphql-tag: ^2.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 2.7.2(graphql@16.6.0)
-      '@graphql-codegen/visitor-plugin-common': 2.13.1(graphql@16.6.0)
-      auto-bind: 4.0.0
-      graphql: 16.6.0
-      graphql-request: 5.1.0(graphql@16.6.0)
-      graphql-tag: 2.12.6(graphql@16.6.0)
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/typescript-operations@2.5.13(graphql@16.6.0):
-    resolution: {integrity: sha512-3vfR6Rx6iZU0JRt29GBkFlrSNTM6t+MSLF86ChvL4d/Jfo/JYAGuB3zNzPhirHYzJPCvLOAx2gy9ID1ltrpYiw==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-codegen/typescript': 2.8.8(graphql@16.6.0)
-      '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@16.6.0)
-      auto-bind: 4.0.0
-      graphql: 16.6.0
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/typescript@2.8.8(graphql@16.6.0):
-    resolution: {integrity: sha512-A0oUi3Oy6+DormOlrTC4orxT9OBZkIglhbJBcDmk34jAKKUgesukXRd4yOhmTrnbchpXz2T8IAOFB3FWIaK4Rw==}
-    peerDependencies:
-      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-codegen/schema-ast': 2.6.1(graphql@16.6.0)
-      '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@16.6.0)
-      auto-bind: 4.0.0
-      graphql: 16.6.0
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/visitor-plugin-common@2.13.1(graphql@16.6.0):
-    resolution: {integrity: sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 2.7.2(graphql@16.6.0)
-      '@graphql-tools/optimize': 1.3.1(graphql@16.6.0)
-      '@graphql-tools/relay-operation-optimizer': 6.5.16(graphql@16.6.0)
-      '@graphql-tools/utils': 8.13.1(graphql@16.6.0)
-      auto-bind: 4.0.0
-      change-case-all: 1.0.14
-      dependency-graph: 0.11.0
-      graphql: 16.6.0
-      graphql-tag: 2.12.6(graphql@16.6.0)
-      parse-filepath: 1.0.2
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-codegen/visitor-plugin-common@2.13.8(graphql@16.6.0):
-    resolution: {integrity: sha512-IQWu99YV4wt8hGxIbBQPtqRuaWZhkQRG2IZKbMoSvh0vGeWb3dB0n0hSgKaOOxDY+tljtOf9MTcUYvJslQucMQ==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.6.0)
-      '@graphql-tools/optimize': 1.3.1(graphql@16.6.0)
-      '@graphql-tools/relay-operation-optimizer': 6.5.16(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      auto-bind: 4.0.0
-      change-case-all: 1.0.15
-      dependency-graph: 0.11.0
-      graphql: 16.6.0
-      graphql-tag: 2.12.6(graphql@16.6.0)
-      parse-filepath: 1.0.2
-      tslib: 2.4.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-tools/apollo-engine-loader@7.3.23(@types/node@18.6.2)(graphql@16.6.0):
-    resolution: {integrity: sha512-OGS0fGUeqBn2NNSfDBVIV7mjch6/7M4JCxvA7fpvVUAmdjjnQ6Z/CGyLIH2bv1eNv75gX/Kkj3baI0lwAWzsXw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@whatwg-node/fetch': 0.6.6(@types/node@18.6.2)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - encoding
-    dev: true
-
-  /@graphql-tools/batch-execute@8.5.16(graphql@16.6.0):
-    resolution: {integrity: sha512-x/gXA6R1Q/qigT5LDesZYemErzFYvBBuTaVgiIJuE2wG6oMV1cln0O35Z7WVQw6H3I4vF7cCG7c7wKSoC+3z4Q==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      dataloader: 2.1.0
-      graphql: 16.6.0
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    dev: true
-
-  /@graphql-tools/code-file-loader@7.3.18(@babel/core@7.19.6)(graphql@16.6.0):
-    resolution: {integrity: sha512-DK0YjsJWKkLF6HQYuuqiDwMr9rwRojm8yR/T+J8vXCOR4ndYa1EvUm9wRHPhxHVOYeptO2u+APoWNEhuMN9Hbw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/graphql-tag-pluck': 7.4.4(@babel/core@7.19.6)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      globby: 11.1.0
-      graphql: 16.6.0
-      tslib: 2.5.0
-      unixify: 1.0.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-    dev: true
-
-  /@graphql-tools/delegate@9.0.25(graphql@16.6.0):
-    resolution: {integrity: sha512-M7DMrPx8uEjXUshkki0ufcL//9Dj12eR3vykvteFB6odYL9cX5dhZC9l1D2IdQRuHzLMskhkhRtfnXRoa82KTA==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/batch-execute': 8.5.16(graphql@16.6.0)
-      '@graphql-tools/executor': 0.0.13(graphql@16.6.0)
-      '@graphql-tools/schema': 9.0.15(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      dataloader: 2.1.0
-      graphql: 16.6.0
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    dev: true
-
-  /@graphql-tools/executor-graphql-ws@0.0.9(graphql@16.6.0):
-    resolution: {integrity: sha512-S323OGzc8TQHOw8n7pFSl1+oG5pzhQhXRmgW6sAvA1F79FLjQ95TltEa6jSH7Jqw+tZobMyylJ13CQ1zFDjBPg==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@repeaterjs/repeater': 3.0.4
-      '@types/ws': 8.5.4
-      graphql: 16.6.0
-      graphql-ws: 5.11.3(graphql@16.6.0)
-      isomorphic-ws: 5.0.0(ws@8.12.0)
-      tslib: 2.5.0
-      ws: 8.12.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
-
-  /@graphql-tools/executor-http@0.1.4(@types/node@18.6.2)(graphql@16.6.0):
-    resolution: {integrity: sha512-6NGxLA9Z/cSOLExxfgddXqoS9JHr0QzvC4YmrjeMz533eW/SDnCf+4803PxkLi0j5CUTUPBnt9hC79l1AD2rZQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@repeaterjs/repeater': 3.0.4
-      '@whatwg-node/fetch': 0.6.5(@types/node@18.6.2)
-      dset: 3.1.2
-      extract-files: 11.0.0
-      graphql: 16.6.0
-      meros: 1.2.1(@types/node@18.6.2)
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    transitivePeerDependencies:
-      - '@types/node'
-    dev: true
-
-  /@graphql-tools/executor-legacy-ws@0.0.7(graphql@16.6.0):
-    resolution: {integrity: sha512-tSBJE/uv/r0iQjsU16QZkRLLCT0cmVWPqn8NVuAp3yqEeYlU7bzf38L4wNYTn46OHIYElFxXBFsGgMdyvrQLzg==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@types/ws': 8.5.4
-      graphql: 16.6.0
-      isomorphic-ws: 5.0.0(ws@8.12.0)
-      tslib: 2.5.0
-      ws: 8.12.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
-
-  /@graphql-tools/executor@0.0.13(graphql@16.6.0):
-    resolution: {integrity: sha512-bZ7QdUV5URLCjD/WuDkvyROYoDVoueTN5W1PatkcN949lwIwEKXUW6y3gRSpiZjXw8IH4/NmN3xPk10OT1emRw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@graphql-typed-document-node/core': 3.1.1(graphql@16.6.0)
-      '@repeaterjs/repeater': 3.0.4
-      graphql: 16.6.0
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    dev: true
-
-  /@graphql-tools/git-loader@7.2.17(@babel/core@7.19.6)(graphql@16.6.0):
-    resolution: {integrity: sha512-VbJQEgjy3oH0IQvkCJFKsIatep9Qv8mToBf0QSMXvS9fZkLM5wwTM4KPtw0Loim/1BAAnomBpHy6I4kiwqYU4A==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/graphql-tag-pluck': 7.4.4(@babel/core@7.19.6)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      is-glob: 4.0.3
-      micromatch: 4.0.5
-      tslib: 2.5.0
-      unixify: 1.0.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-    dev: true
-
-  /@graphql-tools/github-loader@7.3.24(@babel/core@7.19.6)(@types/node@18.6.2)(graphql@16.6.0):
-    resolution: {integrity: sha512-URlH4tJFk/a97tIFTzAZuQTiFiQrwKjr0fKGohbyKMMycBf82XZ6F199PZP3GtigNmzTqV/vTkf1VLTJU97jRw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/graphql-tag-pluck': 7.4.4(@babel/core@7.19.6)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@whatwg-node/fetch': 0.6.6(@types/node@18.6.2)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/node'
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-tools/graphql-file-loader@7.5.15(graphql@16.6.0):
-    resolution: {integrity: sha512-K6yOfKkQdXQRBl+UY4FzGdoSzGG09GLPZv4q7OFp8do16CXhaxAI+kmJvsvrutSyBfLETPTkCHtzFmdRmTeLpg==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/import': 6.7.16(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      globby: 11.1.0
-      graphql: 16.6.0
-      tslib: 2.5.0
-      unixify: 1.0.0
-    dev: true
-
-  /@graphql-tools/graphql-tag-pluck@7.4.4(@babel/core@7.19.6)(graphql@16.6.0):
-    resolution: {integrity: sha512-yHIEcapR/kVSrn4W4Nf3FYpJKPcoGvJbdbye8TnW3dD5GkG4UqVnKuyqFvQPOhgqXKbloFZqUhNqEuyqxqIPRw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@babel/parser': 7.20.15
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.19.6)
-      '@babel/traverse': 7.20.13
-      '@babel/types': 7.20.7
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-    dev: true
-
-  /@graphql-tools/import@6.7.16(graphql@16.6.0):
-    resolution: {integrity: sha512-m07u+8YsBtKg5w5BG04KFTd59PCAPMAy5Dv/NlR4zCiH/Zbpy5PoetokCZKDrFHYUzjPlm8r//vfCG+JTvHw7g==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      resolve-from: 5.0.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/json-file-loader@7.4.16(graphql@16.6.0):
-    resolution: {integrity: sha512-9MsqpwIrCx0l880V0dud01DhkwYwqCIlZlCA3bN+TExWa9U3aZhyPO/5BWQU6W52wKk61TvyN6agUa+f4R7jVQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      globby: 11.1.0
-      graphql: 16.6.0
-      tslib: 2.5.0
-      unixify: 1.0.0
-    dev: true
-
-  /@graphql-tools/load@7.8.11(graphql@16.6.0):
-    resolution: {integrity: sha512-pVn3fYP/qZ3m2NE86gSexyZpEmvTSUe+OIRfWBM60a4L/SycMxgVfYB5+PyDCzruFZg/didIG3v7RfPlZ7zNTQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/schema': 9.0.15(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      p-limit: 3.1.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/merge@8.3.17(graphql@16.6.0):
-    resolution: {integrity: sha512-CLzz49lc6BavPhH9gPRm0sJeNA7kC/tF/jLUTQsyef6xj82Jw3rqIJ9PE+bk1cqPCOG01WLOfquBu445OMDO2g==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/optimize@1.3.1(graphql@16.6.0):
-    resolution: {integrity: sha512-5j5CZSRGWVobt4bgRRg7zhjPiSimk+/zIuColih8E8DxuFOaJ+t0qu7eZS5KXWBkjcd4BPNuhUPpNlEmHPqVRQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      graphql: 16.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/prisma-loader@7.2.60(@types/node@18.6.2)(graphql@16.6.0):
-    resolution: {integrity: sha512-6C/Hicwu/luLlaIqSud3YHJ1HbrIsZ0jHfxWju9aWs3dJLSwRv8Lgw1eHSoWFDEZjc+zNETYNe9GgUwt4BBZzQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/url-loader': 7.17.9(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@types/js-yaml': 4.0.5
-      '@types/json-stable-stringify': 1.0.34
-      '@types/jsonwebtoken': 9.0.1
-      chalk: 4.1.2
-      debug: 4.3.4
-      dotenv: 16.0.2
-      graphql: 16.6.0
-      graphql-request: 5.1.0(graphql@16.6.0)
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      isomorphic-fetch: 3.0.0
-      js-yaml: 4.1.0
-      json-stable-stringify: 1.0.2
-      jsonwebtoken: 9.0.0
-      lodash: 4.17.21
-      scuid: 1.1.0
-      tslib: 2.5.0
-      yaml-ast-parser: 0.0.43
-    transitivePeerDependencies:
-      - '@types/node'
-      - bufferutil
-      - encoding
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /@graphql-tools/relay-operation-optimizer@6.5.16(graphql@16.6.0):
-    resolution: {integrity: sha512-g7P11WqrU6h/sRSe6KJULsNUt+5rdwD7mQpnjpKouhXAz/iNKwiUS0BEkkLjkneDkRVvrX0oqBB43VaMaW+gpQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@ardatan/relay-compiler': 12.0.0(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
-
-  /@graphql-tools/schema@9.0.15(graphql@16.6.0):
-    resolution: {integrity: sha512-p2DbpkOBcsi+yCEjwoS+r4pJ5z+3JjlJdhbPkCwC4q8lGf5r93dVYrExOrqGKTU5kxLXI/mxabSxcunjNIsDIg==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/merge': 8.3.17(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    dev: true
-
-  /@graphql-tools/url-loader@7.17.9(@types/node@18.6.2)(graphql@16.6.0):
-    resolution: {integrity: sha512-qAXQ9Tr/Am2hEelGVLCfO/YOyCMzCd4FyWMRRqcoMYIaK91arIb5X13pgILD28SUN+6H3NDsx7fgq/Z/OhwGrQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/delegate': 9.0.25(graphql@16.6.0)
-      '@graphql-tools/executor-graphql-ws': 0.0.9(graphql@16.6.0)
-      '@graphql-tools/executor-http': 0.1.4(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/executor-legacy-ws': 0.0.7(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      '@graphql-tools/wrap': 9.3.4(graphql@16.6.0)
-      '@types/ws': 8.5.4
-      '@whatwg-node/fetch': 0.6.6(@types/node@18.6.2)
-      graphql: 16.6.0
-      isomorphic-ws: 5.0.0(ws@8.12.0)
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-      ws: 8.12.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - bufferutil
-      - encoding
-      - utf-8-validate
-    dev: true
-
-  /@graphql-tools/utils@8.13.1(graphql@16.6.0):
-    resolution: {integrity: sha512-qIh9yYpdUFmctVqovwMdheVNJqFh+DQNWIhX87FJStfXYnmweBUDATok9fWPleKeFwxnW8IapKmY8m8toJEkAw==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      graphql: 16.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/utils@9.2.0(graphql@16.6.0):
-    resolution: {integrity: sha512-s3lEG1iYkyYEnKCWrIFECX3XH2wmZvbg6Ir3udCvIDynq+ydaO7JQXobclpPtwSJtjlS353haF//6V7mnBQ4bg==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-typed-document-node/core': 3.1.1(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@graphql-tools/wrap@9.3.4(graphql@16.6.0):
-    resolution: {integrity: sha512-MJY6lZqi+j96izjOYOLk5fys34oiLt7U34SQ4Wd6V/sy1utVMbh2H7XiZAuDJ38JIKmr72qN7kLgNcnNOxXjHQ==}
-    peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@graphql-tools/delegate': 9.0.25(graphql@16.6.0)
-      '@graphql-tools/schema': 9.0.15(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      graphql: 16.6.0
-      tslib: 2.5.0
-      value-or-promise: 1.0.12
-    dev: true
-
-  /@graphql-typed-document-node/core@3.1.1(graphql@16.6.0):
-    resolution: {integrity: sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      graphql: 16.6.0
-    dev: true
-
-  /@humanwhocodes/config-array@0.10.7:
-    resolution: {integrity: sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==}
-    engines: {node: '>=10.10.0'}
-    dependencies:
-      '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@humanwhocodes/gitignore-to-minimatch@1.0.2:
-    resolution: {integrity: sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==}
-    dev: true
-
-  /@humanwhocodes/module-importer@1.0.1:
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
-    dev: true
-
-  /@humanwhocodes/object-schema@1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
-    dev: true
-
-  /@istanbuljs/load-nyc-config@1.1.0:
-    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      camelcase: 5.3.1
-      find-up: 4.1.0
-      get-package-type: 0.1.0
-      js-yaml: 3.14.1
-      resolve-from: 5.0.0
-    dev: true
-
-  /@istanbuljs/schema@0.1.3:
-    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /@jest/console@28.1.3:
-    resolution: {integrity: sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      chalk: 4.1.2
-      jest-message-util: 28.1.3
-      jest-util: 28.1.3
-      slash: 3.0.0
-    dev: true
-
-  /@jest/core@28.1.3(ts-node@10.9.1):
-    resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/console': 28.1.3
-      '@jest/reporters': 28.1.3
-      '@jest/test-result': 28.1.3
-      '@jest/transform': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      ci-info: 3.5.0
-      exit: 0.1.2
-      graceful-fs: 4.2.10
-      jest-changed-files: 28.1.3
-      jest-config: 28.1.3(@types/node@18.6.2)(ts-node@10.9.1)
-      jest-haste-map: 28.1.3
-      jest-message-util: 28.1.3
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.3
-      jest-resolve-dependencies: 28.1.3
-      jest-runner: 28.1.3
-      jest-runtime: 28.1.3
-      jest-snapshot: 28.1.3
-      jest-util: 28.1.3
-      jest-validate: 28.1.3
-      jest-watcher: 28.1.3
-      micromatch: 4.0.5
-      pretty-format: 28.1.3
-      rimraf: 3.0.2
-      slash: 3.0.0
-      strip-ansi: 6.0.1
-    transitivePeerDependencies:
-      - supports-color
-      - ts-node
-    dev: true
-
-  /@jest/environment@28.1.3:
-    resolution: {integrity: sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/fake-timers': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      jest-mock: 28.1.3
-    dev: true
-
-  /@jest/expect-utils@28.1.3:
-    resolution: {integrity: sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      jest-get-type: 28.0.2
-    dev: true
-
-  /@jest/expect@28.1.3:
-    resolution: {integrity: sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      expect: 28.1.3
-      jest-snapshot: 28.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/fake-timers@28.1.3:
-    resolution: {integrity: sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      '@sinonjs/fake-timers': 9.1.2
-      '@types/node': 18.6.2
-      jest-message-util: 28.1.3
-      jest-mock: 28.1.3
-      jest-util: 28.1.3
-    dev: true
-
-  /@jest/globals@28.1.3:
-    resolution: {integrity: sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.3
-      '@jest/expect': 28.1.3
-      '@jest/types': 28.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/reporters@28.1.3:
-    resolution: {integrity: sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 28.1.3
-      '@jest/test-result': 28.1.3
-      '@jest/transform': 28.1.3
-      '@jest/types': 28.1.3
-      '@jridgewell/trace-mapping': 0.3.17
-      '@types/node': 18.6.2
-      chalk: 4.1.2
-      collect-v8-coverage: 1.0.1
-      exit: 0.1.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 5.2.1
-      istanbul-lib-report: 3.0.0
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
-      jest-message-util: 28.1.3
-      jest-util: 28.1.3
-      jest-worker: 28.1.3
-      slash: 3.0.0
-      string-length: 4.0.2
-      strip-ansi: 6.0.1
-      terminal-link: 2.1.1
-      v8-to-istanbul: 9.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/schemas@28.1.3:
-    resolution: {integrity: sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@sinclair/typebox': 0.24.51
-    dev: true
-
-  /@jest/source-map@28.1.2:
-    resolution: {integrity: sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      callsites: 3.1.0
-      graceful-fs: 4.2.10
-    dev: true
-
-  /@jest/test-result@28.1.3:
-    resolution: {integrity: sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/console': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/istanbul-lib-coverage': 2.0.4
-      collect-v8-coverage: 1.0.1
-    dev: true
-
-  /@jest/test-sequencer@28.1.3:
-    resolution: {integrity: sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/test-result': 28.1.3
-      graceful-fs: 4.2.10
-      jest-haste-map: 28.1.3
-      slash: 3.0.0
-    dev: true
-
-  /@jest/transform@28.1.3:
-    resolution: {integrity: sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@babel/core': 7.19.6
-      '@jest/types': 28.1.3
-      '@jridgewell/trace-mapping': 0.3.17
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 1.9.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 28.1.3
-      jest-regex-util: 28.0.2
-      jest-util: 28.1.3
-      micromatch: 4.0.5
-      pirates: 4.0.5
-      slash: 3.0.0
-      write-file-atomic: 4.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@jest/types@28.1.3:
-    resolution: {integrity: sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/schemas': 28.1.3
-      '@types/istanbul-lib-coverage': 2.0.4
-      '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.6.2
-      '@types/yargs': 17.0.13
-      chalk: 4.1.2
-    dev: true
-
-  /@jridgewell/gen-mapping@0.1.1:
-    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /@jridgewell/gen-mapping@0.3.2:
-    resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
-
-  /@jridgewell/resolve-uri@3.1.0:
-    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
-  /@jridgewell/set-array@1.1.2:
-    resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
-  /@jridgewell/source-map@0.3.3:
-    resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
-
-  /@jridgewell/sourcemap-codec@1.4.14:
-    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-    dev: true
-
-  /@jridgewell/trace-mapping@0.3.17:
-    resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /@jridgewell/trace-mapping@0.3.9:
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /@jsdevtools/ono@7.1.3:
-    resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
-    dev: true
-
-  /@noble/hashes@1.1.3:
-    resolution: {integrity: sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==}
-    dev: false
-
-  /@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-    dev: true
-
-  /@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.13.0
-    dev: true
-
-  /@peculiar/asn1-schema@2.3.3:
-    resolution: {integrity: sha512-6GptMYDMyWBHTUKndHaDsRZUO/XMSgIns2krxcm2L7SEExRHwawFvSwNBhqNPR9HJwv3MruAiF1bhN0we6j6GQ==}
-    dependencies:
-      asn1js: 3.0.5
-      pvtsutils: 1.3.2
-      tslib: 2.5.0
-    dev: true
-
-  /@peculiar/json-schema@1.1.12:
-    resolution: {integrity: sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /@peculiar/webcrypto@1.4.1:
-    resolution: {integrity: sha512-eK4C6WTNYxoI7JOabMoZICiyqRRtJB220bh0Mbj5RwRycleZf9BPyZoxsTvpP0FpmVS2aS13NKOuh5/tN3sIRw==}
-    engines: {node: '>=10.12.0'}
-    dependencies:
-      '@peculiar/asn1-schema': 2.3.3
-      '@peculiar/json-schema': 1.1.12
-      pvtsutils: 1.3.2
-      tslib: 2.5.0
-      webcrypto-core: 1.7.5
-    dev: true
-
-  /@repeaterjs/repeater@3.0.4:
-    resolution: {integrity: sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==}
-    dev: true
-
-  /@scure/base@1.1.1:
-    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
-    dev: false
-
-  /@scure/bip39@1.1.0:
-    resolution: {integrity: sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==}
-    dependencies:
-      '@noble/hashes': 1.1.3
-      '@scure/base': 1.1.1
-    dev: false
-
-  /@sinclair/typebox@0.24.51:
-    resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
-    dev: true
-
-  /@sinonjs/commons@1.8.4:
-    resolution: {integrity: sha512-RpmQdHVo8hCEHDVpO39zToS9jOhR6nw+/lQAzRNq9ErrGV9IeHM71XCn68svVl/euFeVW6BWX4p35gkhbOcSIQ==}
-    dependencies:
-      type-detect: 4.0.8
-    dev: true
-
-  /@sinonjs/fake-timers@9.1.2:
-    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
-    dependencies:
-      '@sinonjs/commons': 1.8.4
-    dev: true
-
-  /@tootallnate/once@2.0.0:
-    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
-    engines: {node: '>= 10'}
-    dev: true
-
-  /@tsconfig/node10@1.0.9:
-    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
-    dev: true
-
-  /@tsconfig/node12@1.0.11:
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-    dev: true
-
-  /@tsconfig/node14@1.0.3:
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-    dev: true
-
-  /@tsconfig/node16@1.0.3:
-    resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
-    dev: true
-
-  /@types/babel__core@7.1.19:
-    resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
-    dependencies:
-      '@babel/parser': 7.20.1
-      '@babel/types': 7.20.0
-      '@types/babel__generator': 7.6.4
-      '@types/babel__template': 7.4.1
-      '@types/babel__traverse': 7.18.2
-    dev: true
-
-  /@types/babel__generator@7.6.4:
-    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@types/babel__template@7.4.1:
-    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
-    dependencies:
-      '@babel/parser': 7.20.1
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@types/babel__traverse@7.18.2:
-    resolution: {integrity: sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==}
-    dependencies:
-      '@babel/types': 7.20.0
-    dev: true
-
-  /@types/eslint-scope@3.7.4:
-    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
-    dependencies:
-      '@types/eslint': 8.37.0
-      '@types/estree': 1.0.1
-    dev: true
-
-  /@types/eslint@8.37.0:
-    resolution: {integrity: sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==}
-    dependencies:
-      '@types/estree': 1.0.1
-      '@types/json-schema': 7.0.11
-    dev: true
-
-  /@types/estree@1.0.1:
-    resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==}
-    dev: true
-
-  /@types/graceful-fs@4.1.5:
-    resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
-    dependencies:
-      '@types/node': 18.6.2
-    dev: true
-
-  /@types/istanbul-lib-coverage@2.0.4:
-    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
-    dev: true
-
-  /@types/istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-    dev: true
-
-  /@types/istanbul-reports@3.0.1:
-    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
-    dependencies:
-      '@types/istanbul-lib-report': 3.0.0
-    dev: true
-
-  /@types/jest@28.1.8:
-    resolution: {integrity: sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==}
-    dependencies:
-      expect: 28.1.3
-      pretty-format: 28.1.3
-    dev: true
-
-  /@types/js-yaml@4.0.5:
-    resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
-    dev: true
-
-  /@types/json-schema@7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
-    dev: true
-
-  /@types/json-stable-stringify@1.0.34:
-    resolution: {integrity: sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==}
-    dev: true
-
-  /@types/json5@0.0.29:
-    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
-    dev: true
-
-  /@types/jsonwebtoken@9.0.1:
-    resolution: {integrity: sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==}
-    dependencies:
-      '@types/node': 18.6.2
-    dev: true
-
-  /@types/node@18.6.2:
-    resolution: {integrity: sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==}
-    dev: true
-
-  /@types/parse-json@4.0.0:
-    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
-    dev: true
-
-  /@types/prettier@2.7.1:
-    resolution: {integrity: sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==}
-    dev: true
-
-  /@types/stack-utils@2.0.1:
-    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
-    dev: true
-
-  /@types/ws@8.5.4:
-    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
-    dependencies:
-      '@types/node': 18.6.2
-    dev: true
-
-  /@types/yargs-parser@21.0.0:
-    resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
-    dev: true
-
-  /@types/yargs@17.0.13:
-    resolution: {integrity: sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==}
-    dependencies:
-      '@types/yargs-parser': 21.0.0
-    dev: true
-
-  /@typescript-eslint/eslint-plugin@5.36.2(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)(typescript@4.8.2):
-    resolution: {integrity: sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      '@typescript-eslint/scope-manager': 5.36.2
-      '@typescript-eslint/type-utils': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      '@typescript-eslint/utils': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      debug: 4.3.4
-      eslint: 8.23.0
-      functional-red-black-tree: 1.0.1
-      ignore: 5.2.0
-      regexpp: 3.2.0
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.8.2)
-      typescript: 4.8.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/parser@5.36.2(eslint@8.23.0)(typescript@4.8.2):
-    resolution: {integrity: sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/scope-manager': 5.36.2
-      '@typescript-eslint/types': 5.36.2
-      '@typescript-eslint/typescript-estree': 5.36.2(typescript@4.8.2)
-      debug: 4.3.4
-      eslint: 8.23.0
-      typescript: 4.8.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/scope-manager@5.36.2:
-    resolution: {integrity: sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.36.2
-      '@typescript-eslint/visitor-keys': 5.36.2
-    dev: true
-
-  /@typescript-eslint/type-utils@5.36.2(eslint@8.23.0)(typescript@4.8.2):
-    resolution: {integrity: sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/typescript-estree': 5.36.2(typescript@4.8.2)
-      '@typescript-eslint/utils': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      debug: 4.3.4
-      eslint: 8.23.0
-      tsutils: 3.21.0(typescript@4.8.2)
-      typescript: 4.8.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/types@5.36.2:
-    resolution: {integrity: sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/typescript-estree@5.36.2(typescript@4.8.2):
-    resolution: {integrity: sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.36.2
-      '@typescript-eslint/visitor-keys': 5.36.2
-      debug: 4.3.4
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.8.2)
-      typescript: 4.8.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/utils@5.36.2(eslint@8.23.0)(typescript@4.8.2):
-    resolution: {integrity: sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@types/json-schema': 7.0.11
-      '@typescript-eslint/scope-manager': 5.36.2
-      '@typescript-eslint/types': 5.36.2
-      '@typescript-eslint/typescript-estree': 5.36.2(typescript@4.8.2)
-      eslint: 8.23.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0(eslint@8.23.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
-  /@typescript-eslint/visitor-keys@5.36.2:
-    resolution: {integrity: sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.36.2
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
-  /@webassemblyjs/ast@1.11.5:
-    resolution: {integrity: sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==}
-    dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.5
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-    dev: true
-
-  /@webassemblyjs/floating-point-hex-parser@1.11.5:
-    resolution: {integrity: sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==}
-    dev: true
-
-  /@webassemblyjs/helper-api-error@1.11.5:
-    resolution: {integrity: sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==}
-    dev: true
-
-  /@webassemblyjs/helper-buffer@1.11.5:
-    resolution: {integrity: sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==}
-    dev: true
-
-  /@webassemblyjs/helper-numbers@1.11.5:
-    resolution: {integrity: sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==}
-    dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.5
-      '@webassemblyjs/helper-api-error': 1.11.5
-      '@xtuc/long': 4.2.2
-    dev: true
-
-  /@webassemblyjs/helper-wasm-bytecode@1.11.5:
-    resolution: {integrity: sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==}
-    dev: true
-
-  /@webassemblyjs/helper-wasm-section@1.11.5:
-    resolution: {integrity: sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/helper-buffer': 1.11.5
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-      '@webassemblyjs/wasm-gen': 1.11.5
-    dev: true
-
-  /@webassemblyjs/ieee754@1.11.5:
-    resolution: {integrity: sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==}
-    dependencies:
-      '@xtuc/ieee754': 1.2.0
-    dev: true
-
-  /@webassemblyjs/leb128@1.11.5:
-    resolution: {integrity: sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==}
-    dependencies:
-      '@xtuc/long': 4.2.2
-    dev: true
-
-  /@webassemblyjs/utf8@1.11.5:
-    resolution: {integrity: sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==}
-    dev: true
-
-  /@webassemblyjs/wasm-edit@1.11.5:
-    resolution: {integrity: sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/helper-buffer': 1.11.5
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-      '@webassemblyjs/helper-wasm-section': 1.11.5
-      '@webassemblyjs/wasm-gen': 1.11.5
-      '@webassemblyjs/wasm-opt': 1.11.5
-      '@webassemblyjs/wasm-parser': 1.11.5
-      '@webassemblyjs/wast-printer': 1.11.5
-    dev: true
-
-  /@webassemblyjs/wasm-gen@1.11.5:
-    resolution: {integrity: sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-      '@webassemblyjs/ieee754': 1.11.5
-      '@webassemblyjs/leb128': 1.11.5
-      '@webassemblyjs/utf8': 1.11.5
-    dev: true
-
-  /@webassemblyjs/wasm-opt@1.11.5:
-    resolution: {integrity: sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/helper-buffer': 1.11.5
-      '@webassemblyjs/wasm-gen': 1.11.5
-      '@webassemblyjs/wasm-parser': 1.11.5
-    dev: true
-
-  /@webassemblyjs/wasm-parser@1.11.5:
-    resolution: {integrity: sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/helper-api-error': 1.11.5
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-      '@webassemblyjs/ieee754': 1.11.5
-      '@webassemblyjs/leb128': 1.11.5
-      '@webassemblyjs/utf8': 1.11.5
-    dev: true
-
-  /@webassemblyjs/wast-printer@1.11.5:
-    resolution: {integrity: sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.5
-      '@xtuc/long': 4.2.2
-    dev: true
-
-  /@whatwg-node/events@0.0.2:
-    resolution: {integrity: sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w==}
-    dev: true
-
-  /@whatwg-node/fetch@0.6.5(@types/node@18.6.2):
-    resolution: {integrity: sha512-3XQ78RAMX8Az0LlUqMoGM3jbT+FE0S+IKr4yiTiqzQ5S/pNxD52K/kFLcLQiEbL+3rkk/glCHqjxF1QI5155Ig==}
-    dependencies:
-      '@peculiar/webcrypto': 1.4.1
-      '@whatwg-node/node-fetch': 0.0.1(@types/node@18.6.2)
-      busboy: 1.6.0
-      urlpattern-polyfill: 6.0.2
-      web-streams-polyfill: 3.2.1
-    transitivePeerDependencies:
-      - '@types/node'
-    dev: true
-
-  /@whatwg-node/fetch@0.6.6(@types/node@18.6.2):
-    resolution: {integrity: sha512-8kB/Pp0knQVjbm3O15h1ATKOZ7n8GXMow3z8ptVTaRmiOMnCnA9bn7gKTLWFBdD84zzWFzPp6C9pB3vsndJKlQ==}
-    dependencies:
-      '@peculiar/webcrypto': 1.4.1
-      '@whatwg-node/node-fetch': 0.0.2(@types/node@18.6.2)
-      busboy: 1.6.0
-      urlpattern-polyfill: 6.0.2
-      web-streams-polyfill: 3.2.1
-    transitivePeerDependencies:
-      - '@types/node'
-    dev: true
-
-  /@whatwg-node/node-fetch@0.0.1(@types/node@18.6.2):
-    resolution: {integrity: sha512-dMbh604yf2jl37IzvYGA6z3heQg3dMzlqoNsiNToe46SVmKusfJXGf4KYIuiJTzh9mEEu/uVF//QakUfsLJpwA==}
-    peerDependencies:
-      '@types/node': ^18.0.6
-    dependencies:
-      '@types/node': 18.6.2
-      '@whatwg-node/events': 0.0.2
-      busboy: 1.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@whatwg-node/node-fetch@0.0.2(@types/node@18.6.2):
-    resolution: {integrity: sha512-Xs3kunumaSWTHDjKJATP9r2AhwhwPh8miQQHi3aI64MwBSrFsolBUUyCkOJe2geDuHggoNycfnU85HP528odWg==}
-    peerDependencies:
-      '@types/node': ^18.0.6
-    dependencies:
-      '@types/node': 18.6.2
-      '@whatwg-node/events': 0.0.2
-      busboy: 1.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /@xtuc/ieee754@1.2.0:
-    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
-    dev: true
-
-  /@xtuc/long@4.2.2:
-    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
-    dev: true
-
-  /acorn-import-assertions@1.8.0(acorn@8.8.1):
-    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
-    peerDependencies:
-      acorn: ^8
-    dependencies:
-      acorn: 8.8.1
-    dev: true
-
-  /acorn-jsx@5.3.2(acorn@8.8.1):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      acorn: 8.8.1
-    dev: true
-
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
-
-  /acorn@8.8.1:
-    resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
-  /agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
-    dependencies:
-      debug: 4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /aggregate-error@3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
-    dependencies:
-      clean-stack: 2.2.0
-      indent-string: 4.0.0
-    dev: true
-
-  /ajv-keywords@3.5.2(ajv@6.12.6):
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
-    dependencies:
-      ajv: 6.12.6
-    dev: true
-
-  /ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-    dev: true
-
-  /ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.21.3
-    dev: true
-
-  /ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-    dependencies:
-      color-convert: 1.9.3
-    dev: true
-
-  /ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
-    dependencies:
-      color-convert: 2.0.1
-    dev: true
-
-  /ansi-styles@5.2.0:
-    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /any-promise@1.3.0:
-    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
-    dev: true
-
-  /anymatch@3.1.2:
-    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-    dev: true
-
-  /arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-    dev: true
-
-  /argparse@1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
-    dependencies:
-      sprintf-js: 1.0.3
-    dev: true
-
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-    dev: true
-
-  /array-includes@3.1.5:
-    resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-      get-intrinsic: 1.1.3
-      is-string: 1.0.7
-    dev: true
-
-  /array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /array.prototype.flat@1.3.1:
-    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-      es-shim-unscopables: 1.0.0
-    dev: true
-
-  /asap@2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-    dev: true
-
-  /asn1js@3.0.5:
-    resolution: {integrity: sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==}
-    engines: {node: '>=12.0.0'}
-    dependencies:
-      pvtsutils: 1.3.2
-      pvutils: 1.1.3
-      tslib: 2.5.0
-    dev: true
-
-  /astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
-  /auto-bind@4.0.0:
-    resolution: {integrity: sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /babel-jest@28.1.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@jest/transform': 28.1.3
-      '@types/babel__core': 7.1.19
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 28.1.3(@babel/core@7.19.6)
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-istanbul@6.1.1:
-    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/helper-plugin-utils': 7.19.0
-      '@istanbuljs/load-nyc-config': 1.1.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-instrument: 5.2.1
-      test-exclude: 6.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-jest-hoist@28.1.3:
-    resolution: {integrity: sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.0
-      '@types/babel__core': 7.1.19
-      '@types/babel__traverse': 7.18.2
-    dev: true
-
-  /babel-plugin-syntax-trailing-function-commas@7.0.0-beta.0:
-    resolution: {integrity: sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==}
-    dev: true
-
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.19.6):
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.19.6)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.19.6)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.19.6)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.19.6)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.19.6)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.19.6)
-    dev: true
-
-  /babel-preset-fbjs@3.4.0(@babel/core@7.19.6):
-    resolution: {integrity: sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.19.6)
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.19.6)
-      '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-block-scoping': 7.20.15(@babel/core@7.19.6)
-      '@babel/plugin-transform-classes': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-computed-properties': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-destructuring': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.19.6)
-      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.19.6)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.19.6)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.19.6)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.19.6)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-react-display-name': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-react-jsx': 7.20.13(@babel/core@7.19.6)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.19.6)
-      '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.19.6)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.19.6)
-      babel-plugin-syntax-trailing-function-commas: 7.0.0-beta.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-preset-jest@28.1.3(@babel/core@7.19.6):
-    resolution: {integrity: sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.19.6
-      babel-plugin-jest-hoist: 28.1.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.19.6)
-    dev: true
-
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-    dev: true
-
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
-
-  /binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
-    dependencies:
-      buffer: 5.7.1
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-    dev: true
-
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-    dev: true
-
-  /brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-    dependencies:
-      balanced-match: 1.0.2
-    dev: true
-
-  /braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: '>=8'}
-    dependencies:
-      fill-range: 7.0.1
-    dev: true
-
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-    dependencies:
-      caniuse-lite: 1.0.30001429
-      electron-to-chromium: 1.4.284
-      node-releases: 2.0.6
-      update-browserslist-db: 1.0.10(browserslist@4.21.4)
-    dev: true
-
-  /bs-logger@0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: '>= 6'}
-    dependencies:
-      fast-json-stable-stringify: 2.1.0
-    dev: true
-
-  /bser@2.1.1:
-    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
-    dependencies:
-      node-int64: 0.4.0
-    dev: true
-
-  /buffer-equal-constant-time@1.0.1:
-    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
-    dev: true
-
-  /buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-    dev: true
-
-  /buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-    dev: true
-
-  /bundle-require@3.1.2(esbuild@0.15.13):
-    resolution: {integrity: sha512-Of6l6JBAxiyQ5axFxUM6dYeP/W7X2Sozeo/4EYB9sJhL+dqL7TKjg+shwxp6jlu/6ZSERfsYtIpSJ1/x3XkAEA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    peerDependencies:
-      esbuild: '>=0.13'
-    dependencies:
-      esbuild: 0.15.13
-      load-tsconfig: 0.2.3
-    dev: true
-
-  /busboy@1.6.0:
-    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
-    engines: {node: '>=10.16.0'}
-    dependencies:
-      streamsearch: 1.1.0
-    dev: true
-
-  /cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
-    dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.1.3
-    dev: true
-
-  /call-me-maybe@1.0.2:
-    resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==}
-    dev: true
-
-  /callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /camel-case@4.1.2:
-    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
-    dependencies:
-      pascal-case: 3.1.2
-      tslib: 2.5.0
-    dev: true
-
-  /camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /camelcase@6.3.0:
-    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /caniuse-lite@1.0.30001429:
-    resolution: {integrity: sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==}
-    dev: true
-
-  /capital-case@1.0.4:
-    resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case-first: 2.0.2
-    dev: true
-
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-    dev: true
-
-  /chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
-    dev: true
-
-  /change-case-all@1.0.14:
-    resolution: {integrity: sha512-CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA==}
-    dependencies:
-      change-case: 4.1.2
-      is-lower-case: 2.0.2
-      is-upper-case: 2.0.2
-      lower-case: 2.0.2
-      lower-case-first: 2.0.2
-      sponge-case: 1.0.1
-      swap-case: 2.0.2
-      title-case: 3.0.3
-      upper-case: 2.0.2
-      upper-case-first: 2.0.2
-    dev: true
-
-  /change-case-all@1.0.15:
-    resolution: {integrity: sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==}
-    dependencies:
-      change-case: 4.1.2
-      is-lower-case: 2.0.2
-      is-upper-case: 2.0.2
-      lower-case: 2.0.2
-      lower-case-first: 2.0.2
-      sponge-case: 1.0.1
-      swap-case: 2.0.2
-      title-case: 3.0.3
-      upper-case: 2.0.2
-      upper-case-first: 2.0.2
-    dev: true
-
-  /change-case@4.1.2:
-    resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
-    dependencies:
-      camel-case: 4.1.2
-      capital-case: 1.0.4
-      constant-case: 3.0.4
-      dot-case: 3.0.4
-      header-case: 2.0.4
-      no-case: 3.0.4
-      param-case: 3.0.4
-      pascal-case: 3.1.2
-      path-case: 3.0.4
-      sentence-case: 3.0.4
-      snake-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /char-regex@1.0.2:
-    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
-    dev: true
-
-  /chokidar@3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
-    engines: {node: '>= 8.10.0'}
-    dependencies:
-      anymatch: 3.1.2
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /chrome-trace-event@1.0.3:
-    resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
-    engines: {node: '>=6.0'}
-    dev: true
-
-  /ci-info@3.5.0:
-    resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
-    dev: true
-
-  /cjs-module-lexer@1.2.2:
-    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
-    dev: true
-
-  /clean-stack@2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
-    dependencies:
-      restore-cursor: 3.1.0
-    dev: true
-
-  /cli-spinners@2.7.0:
-    resolution: {integrity: sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /cli-truncate@2.1.0:
-    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: '>=8'}
-    dependencies:
-      slice-ansi: 3.0.0
-      string-width: 4.2.3
-    dev: true
-
-  /cli-width@3.0.0:
-    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
-    engines: {node: '>= 10'}
-    dev: true
-
-  /cliui@6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 6.2.0
-    dev: true
-
-  /cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-    dev: true
-
-  /clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
-    dev: true
-
-  /co@4.6.0:
-    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
-    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
-    dev: true
-
-  /collect-v8-coverage@1.0.1:
-    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
-    dev: true
-
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-    dependencies:
-      color-name: 1.1.3
-    dev: true
-
-  /color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
-    dependencies:
-      color-name: 1.1.4
-    dev: true
-
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-    dev: true
-
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-    dev: true
-
-  /colorette@2.0.19:
-    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
-    dev: true
-
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      delayed-stream: 1.0.0
-
-  /commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-    dev: true
-
-  /commander@4.1.1:
-    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /commander@9.4.1:
-    resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
-    engines: {node: ^12.20.0 || >=14}
-    dev: true
-
-  /common-tags@1.8.2:
-    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
-    engines: {node: '>=4.0.0'}
-    dev: true
-
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-    dev: true
-
-  /confusing-browser-globals@1.0.11:
-    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
-    dev: true
-
-  /constant-case@3.0.4:
-    resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case: 2.0.2
-    dev: true
-
-  /convert-source-map@1.9.0:
-    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
-    dev: true
-
-  /cosmiconfig-typescript-loader@4.3.0(@types/node@18.6.2)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.8.2):
-    resolution: {integrity: sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==}
-    engines: {node: '>=12', npm: '>=6'}
-    peerDependencies:
-      '@types/node': '*'
-      cosmiconfig: '>=7'
-      ts-node: '>=10'
-      typescript: '>=3'
-    dependencies:
-      '@types/node': 18.6.2
-      cosmiconfig: 7.1.0
-      ts-node: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-      typescript: 4.8.2
-    dev: true
-
-  /cosmiconfig@7.1.0:
-    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-      yaml: 1.10.2
-    dev: true
-
-  /cosmiconfig@8.0.0:
-    resolution: {integrity: sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==}
-    engines: {node: '>=14'}
-    dependencies:
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-    dev: true
-
-  /create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-    dev: true
-
-  /cross-fetch@3.1.5:
-    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
-    dependencies:
-      node-fetch: 2.6.7
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: '>= 8'}
-    dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
-    dev: true
-
-  /dataloader@2.1.0:
-    resolution: {integrity: sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ==}
-    dev: true
-
-  /debounce@1.2.1:
-    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
-    dev: true
-
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.0.0
-    dev: true
-
-  /debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: true
-
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: true
-
-  /decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-    dev: true
-
-  /deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-    dev: true
-
-  /deepmerge@4.2.2:
-    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
-    dependencies:
-      clone: 1.0.4
-    dev: true
-
-  /define-properties@1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.0
-      object-keys: 1.1.1
-    dev: true
-
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
-  /dependency-graph@0.11.0:
-    resolution: {integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==}
-    engines: {node: '>= 0.6.0'}
-    dev: true
-
-  /detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /detect-newline@3.1.0:
-    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /diff-sequences@28.1.1:
-    resolution: {integrity: sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dev: true
-
-  /diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-    dev: true
-
-  /dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-    dependencies:
-      path-type: 4.0.0
-    dev: true
-
-  /doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      esutils: 2.0.3
-    dev: true
-
-  /doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      esutils: 2.0.3
-    dev: true
-
-  /dot-case@3.0.4:
-    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /dotenv@16.0.2:
-    resolution: {integrity: sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==}
-    engines: {node: '>=12'}
-    dev: true
-
-  /dset@3.1.2:
-    resolution: {integrity: sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /ecdsa-sig-formatter@1.0.11:
-    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
-    dependencies:
-      safe-buffer: 5.2.1
-    dev: true
-
-  /electron-to-chromium@1.4.284:
-    resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
-    dev: true
-
-  /emittery@0.10.2:
-    resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==}
-    engines: {node: '>=12'}
-    dev: true
-
-  /emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
-    dev: true
-
-  /enhanced-resolve@5.10.0:
-    resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      graceful-fs: 4.2.10
-      tapable: 2.2.1
-    dev: true
-
-  /enhanced-resolve@5.13.0:
-    resolution: {integrity: sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      graceful-fs: 4.2.10
-      tapable: 2.2.1
-    dev: true
-
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
-    dependencies:
-      is-arrayish: 0.2.1
-    dev: true
-
-  /es-abstract@1.20.4:
-    resolution: {integrity: sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      es-to-primitive: 1.2.1
-      function-bind: 1.1.1
-      function.prototype.name: 1.1.5
-      get-intrinsic: 1.1.3
-      get-symbol-description: 1.0.0
-      has: 1.0.3
-      has-property-descriptors: 1.0.0
-      has-symbols: 1.0.3
-      internal-slot: 1.0.3
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-weakref: 1.0.2
-      object-inspect: 1.12.2
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.4.3
-      safe-regex-test: 1.0.0
-      string.prototype.trimend: 1.0.5
-      string.prototype.trimstart: 1.0.5
-      unbox-primitive: 1.0.2
-    dev: true
-
-  /es-module-lexer@1.2.1:
-    resolution: {integrity: sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==}
-    dev: true
-
-  /es-shim-unscopables@1.0.0:
-    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-    dev: true
-
-  /esbuild-android-64@0.15.13:
-    resolution: {integrity: sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-android-arm64@0.15.13:
-    resolution: {integrity: sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-darwin-64@0.15.13:
-    resolution: {integrity: sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-darwin-arm64@0.15.13:
-    resolution: {integrity: sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-freebsd-64@0.15.13:
-    resolution: {integrity: sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-freebsd-arm64@0.15.13:
-    resolution: {integrity: sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-32@0.15.13:
-    resolution: {integrity: sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-64@0.15.13:
-    resolution: {integrity: sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-arm64@0.15.13:
-    resolution: {integrity: sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-arm@0.15.13:
-    resolution: {integrity: sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-mips64le@0.15.13:
-    resolution: {integrity: sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-ppc64le@0.15.13:
-    resolution: {integrity: sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-riscv64@0.15.13:
-    resolution: {integrity: sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-s390x@0.15.13:
-    resolution: {integrity: sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-netbsd-64@0.15.13:
-    resolution: {integrity: sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-openbsd-64@0.15.13:
-    resolution: {integrity: sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-sunos-64@0.15.13:
-    resolution: {integrity: sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-32@0.15.13:
-    resolution: {integrity: sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-64@0.15.13:
-    resolution: {integrity: sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-arm64@0.15.13:
-    resolution: {integrity: sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild@0.15.13:
-    resolution: {integrity: sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.15.13
-      '@esbuild/linux-loong64': 0.15.13
-      esbuild-android-64: 0.15.13
-      esbuild-android-arm64: 0.15.13
-      esbuild-darwin-64: 0.15.13
-      esbuild-darwin-arm64: 0.15.13
-      esbuild-freebsd-64: 0.15.13
-      esbuild-freebsd-arm64: 0.15.13
-      esbuild-linux-32: 0.15.13
-      esbuild-linux-64: 0.15.13
-      esbuild-linux-arm: 0.15.13
-      esbuild-linux-arm64: 0.15.13
-      esbuild-linux-mips64le: 0.15.13
-      esbuild-linux-ppc64le: 0.15.13
-      esbuild-linux-riscv64: 0.15.13
-      esbuild-linux-s390x: 0.15.13
-      esbuild-netbsd-64: 0.15.13
-      esbuild-openbsd-64: 0.15.13
-      esbuild-sunos-64: 0.15.13
-      esbuild-windows-32: 0.15.13
-      esbuild-windows-64: 0.15.13
-      esbuild-windows-arm64: 0.15.13
-    dev: true
-
-  /escalade@3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-    dev: true
-
-  /escape-string-regexp@2.0.0:
-    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.26.0)(eslint@8.23.0):
-    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    peerDependencies:
-      eslint: ^7.32.0 || ^8.2.0
-      eslint-plugin-import: ^2.25.2
-    dependencies:
-      confusing-browser-globals: 1.0.11
-      eslint: 8.23.0
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)
-      object.assign: 4.1.4
-      object.entries: 1.1.5
-      semver: 6.3.0
-    dev: true
-
-  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.36.2)(@typescript-eslint/parser@5.36.2)(eslint-plugin-import@2.26.0)(eslint@8.23.0):
-    resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.13.0
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^7.32.0 || ^8.2.0
-      eslint-plugin-import: ^2.25.3
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 5.36.2(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)(typescript@4.8.2)
-      '@typescript-eslint/parser': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      eslint: 8.23.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.23.0)
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.36.2)(eslint@8.23.0)
-    dev: true
-
-  /eslint-config-prettier@8.5.0(eslint@8.23.0):
-    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
-    dependencies:
-      eslint: 8.23.0
-    dev: true
-
-  /eslint-import-resolver-node@0.3.6:
-    resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
-    dependencies:
-      debug: 3.2.7
-      resolve: 1.22.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.36.2)(eslint-import-resolver-node@0.3.6)(eslint@8.23.0):
-    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      debug: 3.2.7
-      eslint: 8.23.0
-      eslint-import-resolver-node: 0.3.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.36.2)(eslint@8.23.0):
-    resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 5.36.2(eslint@8.23.0)(typescript@4.8.2)
-      array-includes: 3.1.5
-      array.prototype.flat: 1.3.1
-      debug: 2.6.9
-      doctrine: 2.1.0
-      eslint: 8.23.0
-      eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.36.2)(eslint-import-resolver-node@0.3.6)(eslint@8.23.0)
-      has: 1.0.3
-      is-core-module: 2.11.0
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.values: 1.1.5
-      resolve: 1.22.1
-      tsconfig-paths: 3.14.1
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-    dev: true
-
-  /eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-    dev: true
-
-  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-    dev: true
-
-  /eslint-utils@3.0.0(eslint@8.23.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
-    dependencies:
-      eslint: 8.23.0
-      eslint-visitor-keys: 2.1.0
-    dev: true
-
-  /eslint-visitor-keys@2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /eslint-visitor-keys@3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /eslint@8.23.0:
-    resolution: {integrity: sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      '@eslint/eslintrc': 1.3.3
-      '@humanwhocodes/config-array': 0.10.7
-      '@humanwhocodes/gitignore-to-minimatch': 1.0.2
-      '@humanwhocodes/module-importer': 1.0.1
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.1.1
-      eslint-utils: 3.0.0(eslint@8.23.0)
-      eslint-visitor-keys: 3.3.0
-      espree: 9.4.0
-      esquery: 1.4.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      functional-red-black-tree: 1.0.1
-      glob-parent: 6.0.2
-      globals: 13.17.0
-      globby: 11.1.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.0
-      import-fresh: 3.3.0
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.1
-      regexpp: 3.2.0
-      strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /espree@9.4.0:
-    resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2(acorn@8.8.1)
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
-  /esprima@4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
-
-  /esquery@1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
-    engines: {node: '>=0.10'}
-    dependencies:
-      estraverse: 5.3.0
-    dev: true
-
-  /esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
-    dependencies:
-      estraverse: 5.3.0
-    dev: true
-
-  /estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
-    dev: true
-
-  /estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
-    dev: true
-
-  /esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /events@3.3.0:
-    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
-    engines: {node: '>=0.8.x'}
-    dev: true
-
-  /execa@5.1.1:
-    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: '>=10'}
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 2.1.0
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
-    dev: true
-
-  /exit@0.1.2:
-    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
-
-  /expect@28.1.3:
-    resolution: {integrity: sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/expect-utils': 28.1.3
-      jest-get-type: 28.0.2
-      jest-matcher-utils: 28.1.3
-      jest-message-util: 28.1.3
-      jest-util: 28.1.3
-    dev: true
-
-  /external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
-    dependencies:
-      chardet: 0.7.0
-      iconv-lite: 0.4.24
-      tmp: 0.0.33
-    dev: true
-
-  /extract-files@11.0.0:
-    resolution: {integrity: sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==}
-    engines: {node: ^12.20 || >= 14.13}
-    dev: true
-
-  /extract-files@9.0.0:
-    resolution: {integrity: sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==}
-    engines: {node: ^10.17.0 || ^12.0.0 || >= 13.7.0}
-    dev: true
-
-  /fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
-    dev: true
-
-  /fast-glob@3.2.12:
-    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
-    engines: {node: '>=8.6.0'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.5
-    dev: true
-
-  /fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-    dev: true
-
-  /fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-    dev: true
-
-  /fastq@1.13.0:
-    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
-    dependencies:
-      reusify: 1.0.4
-    dev: true
-
-  /fb-watchman@2.0.2:
-    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
-    dependencies:
-      bser: 2.1.1
-    dev: true
-
-  /fbjs-css-vars@1.0.2:
-    resolution: {integrity: sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==}
-    dev: true
-
-  /fbjs@3.0.4:
-    resolution: {integrity: sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==}
-    dependencies:
-      cross-fetch: 3.1.5
-      fbjs-css-vars: 1.0.2
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      promise: 7.3.1
-      setimmediate: 1.0.5
-      ua-parser-js: 0.7.33
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
-    dependencies:
-      escape-string-regexp: 1.0.5
-    dev: true
-
-  /file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    dependencies:
-      flat-cache: 3.0.4
-    dev: true
-
-  /fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      to-regex-range: 5.0.1
-    dev: true
-
-  /find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
-    dependencies:
-      locate-path: 5.0.0
-      path-exists: 4.0.0
-    dev: true
-
-  /find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
-    dependencies:
-      locate-path: 6.0.0
-      path-exists: 4.0.0
-    dev: true
-
-  /flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    dependencies:
-      flatted: 3.2.7
-      rimraf: 3.0.2
-    dev: true
-
-  /flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
-    dev: true
-
-  /follow-redirects@1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: true
-
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
-
-  /fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 6.1.0
-      universalify: 2.0.0
-    dev: true
-
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
-    dev: true
-
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: true
-
-  /function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-      functions-have-names: 1.2.3
-    dev: true
-
-  /functional-red-black-tree@1.0.1:
-    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
-    dev: true
-
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-    dev: true
-
-  /gensync@1.0.0-beta.2:
-    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-    dev: true
-
-  /get-intrinsic@1.1.3:
-    resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-symbols: 1.0.3
-    dev: true
-
-  /get-package-type@0.1.0:
-    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: '>=8.0.0'}
-    dev: true
-
-  /get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-    dev: true
-
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
-    dependencies:
-      is-glob: 4.0.3
-    dev: true
-
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      is-glob: 4.0.3
-    dev: true
-
-  /glob-to-regexp@0.4.1:
-    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
-    dev: true
-
-  /glob@7.1.6:
-    resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-    dev: true
-
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-    dev: true
-
-  /globals@11.12.0:
-    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /globals@13.17.0:
-    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.20.2
-    dev: true
-
-  /globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
-    dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.2.12
-      ignore: 5.2.0
-      merge2: 1.4.1
-      slash: 3.0.0
-    dev: true
-
-  /graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-    dev: true
-
-  /grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
-    dev: true
-
-  /graphql-config@4.4.1(@types/node@18.6.2)(cosmiconfig-typescript-loader@4.3.0)(graphql@16.6.0):
-    resolution: {integrity: sha512-B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ==}
-    engines: {node: '>= 10.0.0'}
-    peerDependencies:
-      cosmiconfig-toml-loader: ^1.0.0
-      cosmiconfig-typescript-loader: ^4.0.0
-      graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    peerDependenciesMeta:
-      cosmiconfig-toml-loader:
-        optional: true
-      cosmiconfig-typescript-loader:
-        optional: true
-    dependencies:
-      '@graphql-tools/graphql-file-loader': 7.5.15(graphql@16.6.0)
-      '@graphql-tools/json-file-loader': 7.4.16(graphql@16.6.0)
-      '@graphql-tools/load': 7.8.11(graphql@16.6.0)
-      '@graphql-tools/merge': 8.3.17(graphql@16.6.0)
-      '@graphql-tools/url-loader': 7.17.9(@types/node@18.6.2)(graphql@16.6.0)
-      '@graphql-tools/utils': 9.2.0(graphql@16.6.0)
-      cosmiconfig: 8.0.0
-      cosmiconfig-typescript-loader: 4.3.0(@types/node@18.6.2)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.8.2)
-      graphql: 16.6.0
-      minimatch: 4.2.1
-      string-env-interpolation: 1.0.1
-      tslib: 2.5.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - bufferutil
-      - encoding
-      - utf-8-validate
-    dev: true
-
-  /graphql-request@5.1.0(graphql@16.6.0):
-    resolution: {integrity: sha512-0OeRVYigVwIiXhNmqnPDt+JhMzsjinxHE7TVy3Lm6jUzav0guVcL0lfSbi6jVTRAxcbwgyr6yrZioSHxf9gHzw==}
-    peerDependencies:
-      graphql: 14 - 16
-    dependencies:
-      '@graphql-typed-document-node/core': 3.1.1(graphql@16.6.0)
-      cross-fetch: 3.1.5
-      extract-files: 9.0.0
-      form-data: 3.0.1
-      graphql: 16.6.0
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /graphql-tag@2.12.6(graphql@16.6.0):
-    resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    dependencies:
-      graphql: 16.6.0
-      tslib: 2.5.0
-    dev: true
-
-  /graphql-ws@5.11.3(graphql@16.6.0):
-    resolution: {integrity: sha512-fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      graphql: '>=0.11 <=16'
-    dependencies:
-      graphql: 16.6.0
-    dev: true
-
-  /graphql@16.6.0:
-    resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==}
-    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
-    dev: true
-
-  /handlebars@4.7.7:
-    resolution: {integrity: sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==}
-    engines: {node: '>=0.4.7'}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.7
-      neo-async: 2.6.2
-      source-map: 0.6.1
-      wordwrap: 1.0.0
-    optionalDependencies:
-      uglify-js: 3.17.4
-    dev: true
-
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-    dev: true
-
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-    dependencies:
-      get-intrinsic: 1.1.3
-    dev: true
-
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.1
-    dev: true
-
-  /header-case@2.0.4:
-    resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
-    dependencies:
-      capital-case: 1.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-    dev: true
-
-  /http-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
-    engines: {node: '>= 6'}
-    dependencies:
-      '@tootallnate/once': 2.0.0
-      agent-base: 6.0.2
-      debug: 4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /human-signals@2.1.0:
-    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: '>=10.17.0'}
-    dev: true
-
-  /iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: 2.1.2
-    dev: true
-
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-    dev: true
-
-  /ignore@5.2.0:
-    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
-    engines: {node: '>= 4'}
-    dev: true
-
-  /immutable@3.7.6:
-    resolution: {integrity: sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==}
-    engines: {node: '>=0.8.0'}
-    dev: true
-
-  /import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
-    dependencies:
-      parent-module: 1.0.1
-      resolve-from: 4.0.0
-    dev: true
-
-  /import-from@4.0.0:
-    resolution: {integrity: sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==}
-    engines: {node: '>=12.2'}
-    dev: true
-
-  /import-local@3.1.0:
-    resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
-    engines: {node: '>=8'}
-    hasBin: true
-    dependencies:
-      pkg-dir: 4.2.0
-      resolve-cwd: 3.0.0
-    dev: true
-
-  /imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
-    dev: true
-
-  /indent-string@4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    dependencies:
-      once: 1.4.0
-      wrappy: 1.0.2
-    dev: true
-
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-    dev: true
-
-  /inquirer@8.2.5:
-    resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
-    engines: {node: '>=12.0.0'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-width: 3.0.0
-      external-editor: 3.1.0
-      figures: 3.2.0
-      lodash: 4.17.21
-      mute-stream: 0.0.8
-      ora: 5.4.1
-      run-async: 2.4.1
-      rxjs: 7.8.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-    dev: true
-
-  /internal-slot@1.0.3:
-    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.1.3
-      has: 1.0.3
-      side-channel: 1.0.4
-    dev: true
-
-  /invariant@2.2.4:
-    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
-    dependencies:
-      loose-envify: 1.4.0
-    dev: true
-
-  /is-absolute@1.0.0:
-    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-relative: 1.0.0
-      is-windows: 1.0.2
-    dev: true
-
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-    dev: true
-
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
-    dependencies:
-      has-bigints: 1.0.2
-    dev: true
-
-  /is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
-    dependencies:
-      binary-extensions: 2.2.0
-    dev: true
-
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /is-core-module@2.11.0:
-    resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /is-generator-fn@2.1.0:
-    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extglob: 2.1.1
-    dev: true
-
-  /is-interactive@1.0.0:
-    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /is-lower-case@2.0.2:
-    resolution: {integrity: sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-    dev: true
-
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-relative@1.0.0:
-    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-unc-path: 1.0.0
-    dev: true
-
-  /is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
-    dependencies:
-      call-bind: 1.0.2
-    dev: true
-
-  /is-stream@2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
-  /is-unc-path@1.0.0:
-    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      unc-path-regex: 0.1.2
-    dev: true
-
-  /is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /is-upper-case@2.0.2:
-    resolution: {integrity: sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-    dependencies:
-      call-bind: 1.0.2
-    dev: true
-
-  /is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-    dev: true
-
-  /isomorphic-fetch@3.0.0:
-    resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==}
-    dependencies:
-      node-fetch: 2.6.9
-      whatwg-fetch: 3.6.2
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /isomorphic-ws@5.0.0(ws@8.12.0):
-    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
-    peerDependencies:
-      ws: '*'
-    dependencies:
-      ws: 8.12.0
-    dev: true
-
-  /istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /istanbul-lib-instrument@5.2.1:
-    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/parser': 7.20.1
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
-    engines: {node: '>=8'}
-    dependencies:
-      istanbul-lib-coverage: 3.2.0
-      make-dir: 3.1.0
-      supports-color: 7.2.0
-    dev: true
-
-  /istanbul-lib-source-maps@4.0.1:
-    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
-    engines: {node: '>=10'}
-    dependencies:
-      debug: 4.3.4
-      istanbul-lib-coverage: 3.2.0
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /istanbul-reports@3.1.5:
-    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
-    engines: {node: '>=8'}
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.0
-    dev: true
-
-  /jest-changed-files@28.1.3:
-    resolution: {integrity: sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      execa: 5.1.1
-      p-limit: 3.1.0
-    dev: true
-
-  /jest-circus@28.1.3:
-    resolution: {integrity: sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.3
-      '@jest/expect': 28.1.3
-      '@jest/test-result': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 0.7.0
-      is-generator-fn: 2.1.0
-      jest-each: 28.1.3
-      jest-matcher-utils: 28.1.3
-      jest-message-util: 28.1.3
-      jest-runtime: 28.1.3
-      jest-snapshot: 28.1.3
-      jest-util: 28.1.3
-      p-limit: 3.1.0
-      pretty-format: 28.1.3
-      slash: 3.0.0
-      stack-utils: 2.0.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-cli@28.1.3(@types/node@18.6.2)(ts-node@10.9.1):
-    resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/core': 28.1.3(ts-node@10.9.1)
-      '@jest/test-result': 28.1.3
-      '@jest/types': 28.1.3
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.10
-      import-local: 3.1.0
-      jest-config: 28.1.3(@types/node@18.6.2)(ts-node@10.9.1)
-      jest-util: 28.1.3
-      jest-validate: 28.1.3
-      prompts: 2.4.2
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - supports-color
-      - ts-node
-    dev: true
-
-  /jest-config@28.1.3(@types/node@18.6.2)(ts-node@10.9.1):
-    resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    peerDependencies:
-      '@types/node': '*'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      '@babel/core': 7.19.6
-      '@jest/test-sequencer': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      babel-jest: 28.1.3(@babel/core@7.19.6)
-      chalk: 4.1.2
-      ci-info: 3.5.0
-      deepmerge: 4.2.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-circus: 28.1.3
-      jest-environment-node: 28.1.3
-      jest-get-type: 28.0.2
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.3
-      jest-runner: 28.1.3
-      jest-util: 28.1.3
-      jest-validate: 28.1.3
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 28.1.3
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-      ts-node: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-diff@28.1.3:
-    resolution: {integrity: sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 28.1.1
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-docblock@28.1.1:
-    resolution: {integrity: sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      detect-newline: 3.1.0
-    dev: true
-
-  /jest-each@28.1.3:
-    resolution: {integrity: sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      chalk: 4.1.2
-      jest-get-type: 28.0.2
-      jest-util: 28.1.3
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-environment-node@28.1.3:
-    resolution: {integrity: sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.3
-      '@jest/fake-timers': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      jest-mock: 28.1.3
-      jest-util: 28.1.3
-    dev: true
-
-  /jest-get-type@28.0.2:
-    resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dev: true
-
-  /jest-haste-map@28.1.3:
-    resolution: {integrity: sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      '@types/graceful-fs': 4.1.5
-      '@types/node': 18.6.2
-      anymatch: 3.1.2
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.10
-      jest-regex-util: 28.0.2
-      jest-util: 28.1.3
-      jest-worker: 28.1.3
-      micromatch: 4.0.5
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /jest-leak-detector@28.1.3:
-    resolution: {integrity: sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-matcher-utils@28.1.3:
-    resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 28.1.3
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-message-util@28.1.3:
-    resolution: {integrity: sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@jest/types': 28.1.3
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 28.1.3
-      slash: 3.0.0
-      stack-utils: 2.0.5
-    dev: true
-
-  /jest-mock@28.1.3:
-    resolution: {integrity: sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-    dev: true
-
-  /jest-pnp-resolver@1.2.2(jest-resolve@28.1.3):
-    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
-    engines: {node: '>=6'}
-    peerDependencies:
-      jest-resolve: '*'
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
-    dependencies:
-      jest-resolve: 28.1.3
-    dev: true
-
-  /jest-regex-util@28.0.2:
-    resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dev: true
-
-  /jest-resolve-dependencies@28.1.3:
-    resolution: {integrity: sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      jest-regex-util: 28.0.2
-      jest-snapshot: 28.1.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-resolve@28.1.3:
-    resolution: {integrity: sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      jest-haste-map: 28.1.3
-      jest-pnp-resolver: 1.2.2(jest-resolve@28.1.3)
-      jest-util: 28.1.3
-      jest-validate: 28.1.3
-      resolve: 1.22.1
-      resolve.exports: 1.1.0
-      slash: 3.0.0
-    dev: true
-
-  /jest-runner@28.1.3:
-    resolution: {integrity: sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/console': 28.1.3
-      '@jest/environment': 28.1.3
-      '@jest/test-result': 28.1.3
-      '@jest/transform': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      chalk: 4.1.2
-      emittery: 0.10.2
-      graceful-fs: 4.2.10
-      jest-docblock: 28.1.1
-      jest-environment-node: 28.1.3
-      jest-haste-map: 28.1.3
-      jest-leak-detector: 28.1.3
-      jest-message-util: 28.1.3
-      jest-resolve: 28.1.3
-      jest-runtime: 28.1.3
-      jest-util: 28.1.3
-      jest-watcher: 28.1.3
-      jest-worker: 28.1.3
-      p-limit: 3.1.0
-      source-map-support: 0.5.13
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-runtime@28.1.3:
-    resolution: {integrity: sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.3
-      '@jest/fake-timers': 28.1.3
-      '@jest/globals': 28.1.3
-      '@jest/source-map': 28.1.2
-      '@jest/test-result': 28.1.3
-      '@jest/transform': 28.1.3
-      '@jest/types': 28.1.3
-      chalk: 4.1.2
-      cjs-module-lexer: 1.2.2
-      collect-v8-coverage: 1.0.1
-      execa: 5.1.1
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      jest-haste-map: 28.1.3
-      jest-message-util: 28.1.3
-      jest-mock: 28.1.3
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.3
-      jest-snapshot: 28.1.3
-      jest-util: 28.1.3
-      slash: 3.0.0
-      strip-bom: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-snapshot@28.1.3:
-    resolution: {integrity: sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@babel/core': 7.19.6
-      '@babel/generator': 7.20.1
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.19.6)
-      '@babel/traverse': 7.20.1
-      '@babel/types': 7.20.0
-      '@jest/expect-utils': 28.1.3
-      '@jest/transform': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/babel__traverse': 7.18.2
-      '@types/prettier': 2.7.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.19.6)
-      chalk: 4.1.2
-      expect: 28.1.3
-      graceful-fs: 4.2.10
-      jest-diff: 28.1.3
-      jest-get-type: 28.0.2
-      jest-haste-map: 28.1.3
-      jest-matcher-utils: 28.1.3
-      jest-message-util: 28.1.3
-      jest-util: 28.1.3
-      natural-compare: 1.4.0
-      pretty-format: 28.1.3
-      semver: 7.3.8
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jest-util@28.1.3:
-    resolution: {integrity: sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      chalk: 4.1.2
-      ci-info: 3.5.0
-      graceful-fs: 4.2.10
-      picomatch: 2.3.1
-    dev: true
-
-  /jest-validate@28.1.3:
-    resolution: {integrity: sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.3
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 28.0.2
-      leven: 3.1.0
-      pretty-format: 28.1.3
-    dev: true
-
-  /jest-watcher@28.1.3:
-    resolution: {integrity: sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/test-result': 28.1.3
-      '@jest/types': 28.1.3
-      '@types/node': 18.6.2
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      emittery: 0.10.2
-      jest-util: 28.1.3
-      string-length: 4.0.2
-    dev: true
-
-  /jest-worker@27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
-    dependencies:
-      '@types/node': 18.6.2
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
-
-  /jest-worker@28.1.3:
-    resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@types/node': 18.6.2
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
-
-  /jest@28.1.3(@types/node@18.6.2)(ts-node@10.9.1):
-    resolution: {integrity: sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-    dependencies:
-      '@jest/core': 28.1.3(ts-node@10.9.1)
-      '@jest/types': 28.1.3
-      import-local: 3.1.0
-      jest-cli: 28.1.3(@types/node@18.6.2)(ts-node@10.9.1)
-    transitivePeerDependencies:
-      - '@types/node'
-      - supports-color
-      - ts-node
-    dev: true
-
-  /joycon@3.1.1:
-    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: true
-
-  /js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
-    hasBin: true
-    dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
-    dev: true
-
-  /js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
-    dependencies:
-      argparse: 2.0.1
-    dev: true
-
-  /jsesc@2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
-
-  /json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
-    dev: true
-
-  /json-schema-ref-parser@9.0.9:
-    resolution: {integrity: sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==}
-    engines: {node: '>=10'}
-    deprecated: Please switch to @apidevtools/json-schema-ref-parser
-    dependencies:
-      '@apidevtools/json-schema-ref-parser': 9.0.9
-    dev: true
-
-  /json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-    dev: true
-
-  /json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-    dev: true
-
-  /json-stable-stringify@1.0.2:
-    resolution: {integrity: sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==}
-    dependencies:
-      jsonify: 0.0.1
-    dev: true
-
-  /json-to-pretty-yaml@1.2.2:
-    resolution: {integrity: sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==}
-    engines: {node: '>= 0.2.0'}
-    dependencies:
-      remedial: 1.0.8
-      remove-trailing-spaces: 1.0.8
-    dev: true
-
-  /json5@1.0.1:
-    resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.7
-    dev: true
-
-  /json5@2.2.1:
-    resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dev: true
-
-  /jsonc-parser@3.2.0:
-    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
-    dev: true
-
-  /jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
-    dependencies:
-      universalify: 2.0.0
-    optionalDependencies:
-      graceful-fs: 4.2.10
-    dev: true
-
-  /jsonify@0.0.1:
-    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
-    dev: true
-
-  /jsonwebtoken@9.0.0:
-    resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==}
-    engines: {node: '>=12', npm: '>=6'}
-    dependencies:
-      jws: 3.2.2
-      lodash: 4.17.21
-      ms: 2.1.3
-      semver: 7.3.8
-    dev: true
-
-  /jwa@1.4.1:
-    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
-    dependencies:
-      buffer-equal-constant-time: 1.0.1
-      ecdsa-sig-formatter: 1.0.11
-      safe-buffer: 5.2.1
-    dev: true
-
-  /jws@3.2.2:
-    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
-    dependencies:
-      jwa: 1.4.1
-      safe-buffer: 5.2.1
-    dev: true
-
-  /kleur@3.0.3:
-    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /leven@3.1.0:
-    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-    dev: true
-
-  /lilconfig@2.0.6:
-    resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-    dev: true
-
-  /listr2@4.0.5:
-    resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
-    dependencies:
-      cli-truncate: 2.1.0
-      colorette: 2.0.19
-      log-update: 4.0.0
-      p-map: 4.0.0
-      rfdc: 1.3.0
-      rxjs: 7.8.0
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-    dev: true
-
-  /load-tsconfig@0.2.3:
-    resolution: {integrity: sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
-
-  /loader-runner@4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
-    dev: true
-
-  /locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-locate: 4.1.0
-    dev: true
-
-  /locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
-    dependencies:
-      p-locate: 5.0.0
-    dev: true
-
-  /lodash.memoize@4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-    dev: true
-
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-    dev: true
-
-  /lodash.sortby@4.7.0:
-    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
-    dev: true
-
-  /lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-    dev: true
-
-  /log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
-    dependencies:
-      chalk: 4.1.2
-      is-unicode-supported: 0.1.0
-    dev: true
-
-  /log-update@4.0.0:
-    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      cli-cursor: 3.1.0
-      slice-ansi: 4.0.0
-      wrap-ansi: 6.2.0
-    dev: true
-
-  /loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-    dependencies:
-      js-tokens: 4.0.0
-    dev: true
-
-  /lower-case-first@2.0.2:
-    resolution: {integrity: sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /lower-case@2.0.2:
-    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /lru-cache@5.1.1:
-    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
-    dependencies:
-      yallist: 3.1.1
-    dev: true
-
-  /lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
-    dependencies:
-      yallist: 4.0.0
-    dev: true
-
-  /lunr@2.3.9:
-    resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==}
-    dev: true
-
-  /make-dir@3.1.0:
-    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: '>=8'}
-    dependencies:
-      semver: 6.3.0
-    dev: true
-
-  /make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-    dev: true
-
-  /makeerror@1.0.12:
-    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
-    dependencies:
-      tmpl: 1.0.5
-    dev: true
-
-  /map-cache@0.2.2:
-    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /marked@4.2.2:
-    resolution: {integrity: sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ==}
-    engines: {node: '>= 12'}
-    hasBin: true
-    dev: true
-
-  /merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-    dev: true
-
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /meros@1.2.1(@types/node@18.6.2):
-    resolution: {integrity: sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g==}
-    engines: {node: '>=13'}
-    peerDependencies:
-      '@types/node': '>=13'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-    dependencies:
-      '@types/node': 18.6.2
-    dev: true
-
-  /micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
-    dependencies:
-      braces: 3.0.2
-      picomatch: 2.3.1
-    dev: true
-
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      mime-db: 1.52.0
-
-  /mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
-    dependencies:
-      brace-expansion: 1.1.11
-    dev: true
-
-  /minimatch@4.2.1:
-    resolution: {integrity: sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 1.1.11
-    dev: true
-
-  /minimatch@5.1.0:
-    resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
-  /minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
-    dev: true
-
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-    dev: true
-
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: true
-
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-    dev: true
-
-  /mute-stream@0.0.8:
-    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
-    dev: true
-
-  /mz@2.7.0:
-    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
-    dependencies:
-      any-promise: 1.3.0
-      object-assign: 4.1.1
-      thenify-all: 1.6.0
-    dev: true
-
-  /natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-    dev: true
-
-  /neo-async@2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
-    dev: true
-
-  /no-case@3.0.4:
-    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
-    dependencies:
-      lower-case: 2.0.2
-      tslib: 2.5.0
-    dev: true
-
-  /node-fetch@2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: true
-
-  /node-fetch@2.6.9:
-    resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: true
-
-  /node-int64@0.4.0:
-    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
-    dev: true
-
-  /node-releases@2.0.6:
-    resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==}
-    dev: true
-
-  /normalize-path@2.1.1:
-    resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      remove-trailing-separator: 1.1.0
-    dev: true
-
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /npm-run-path@4.0.1:
-    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: '>=8'}
-    dependencies:
-      path-key: 3.1.1
-    dev: true
-
-  /nullthrows@1.1.1:
-    resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==}
-    dev: true
-
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /object-inspect@1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
-    dev: true
-
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-    dev: true
-
-  /object.entries@1.1.5:
-    resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-    dev: true
-
-  /object.values@1.1.5:
-    resolution: {integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-    dev: true
-
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-    dependencies:
-      wrappy: 1.0.2
-    dev: true
-
-  /onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-    dependencies:
-      mimic-fn: 2.1.0
-    dev: true
-
-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-      word-wrap: 1.2.3
-    dev: true
-
-  /ora@5.4.1:
-    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      bl: 4.1.0
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-spinners: 2.7.0
-      is-interactive: 1.0.0
-      is-unicode-supported: 0.1.0
-      log-symbols: 4.1.0
-      strip-ansi: 6.0.1
-      wcwidth: 1.0.1
-    dev: true
-
-  /os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-try: 2.2.0
-    dev: true
-
-  /p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      yocto-queue: 0.1.0
-    dev: true
-
-  /p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-limit: 2.3.0
-    dev: true
-
-  /p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
-    dependencies:
-      p-limit: 3.1.0
-    dev: true
-
-  /p-map@4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      aggregate-error: 3.1.0
-    dev: true
-
-  /p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /param-case@3.0.4:
-    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
-    dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
-    dependencies:
-      callsites: 3.1.0
-    dev: true
-
-  /parse-filepath@1.0.2:
-    resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      is-absolute: 1.0.0
-      map-cache: 0.2.2
-      path-root: 0.1.1
-    dev: true
-
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.2.4
-    dev: true
-
-  /pascal-case@3.1.2:
-    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /path-case@3.0.4:
-    resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
-    dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-    dev: true
-
-  /path-root-regex@0.1.2:
-    resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /path-root@0.1.1:
-    resolution: {integrity: sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      path-root-regex: 0.1.2
-    dev: true
-
-  /path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-    dev: true
-
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: true
-
-  /pirates@4.0.5:
-    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /pkg-dir@4.2.0:
-    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      find-up: 4.1.0
-    dev: true
-
-  /postcss-load-config@3.1.4(ts-node@10.9.1):
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.0.6
-      ts-node: 10.9.1(@types/node@18.6.2)(typescript@4.8.2)
-      yaml: 1.10.2
-    dev: true
-
-  /prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
-
-  /prettier@2.6.2:
-    resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    dev: true
-
-  /pretty-format@28.1.3:
-    resolution: {integrity: sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/schemas': 28.1.3
-      ansi-regex: 5.0.1
-      ansi-styles: 5.2.0
-      react-is: 18.2.0
-    dev: true
-
-  /promise@7.3.1:
-    resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
-    dependencies:
-      asap: 2.0.6
-    dev: true
-
-  /prompts@2.4.2:
-    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: '>= 6'}
-    dependencies:
-      kleur: 3.0.3
-      sisteransi: 1.0.5
-    dev: true
-
-  /punycode@2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /pvtsutils@1.3.2:
-    resolution: {integrity: sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /pvutils@1.1.3:
-    resolution: {integrity: sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-    dev: true
-
-  /randombytes@2.1.0:
-    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
-    dependencies:
-      safe-buffer: 5.2.1
-    dev: true
-
-  /react-is@18.2.0:
-    resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
-    dev: true
-
-  /readable-stream@3.6.0:
-    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      inherits: 2.0.4
-      string_decoder: 1.3.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      picomatch: 2.3.1
-    dev: true
-
-  /regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-    dev: true
-
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      functions-have-names: 1.2.3
-    dev: true
-
-  /regexpp@3.2.0:
-    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /relay-runtime@12.0.0:
-    resolution: {integrity: sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==}
-    dependencies:
-      '@babel/runtime': 7.20.13
-      fbjs: 3.0.4
-      invariant: 2.2.4
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
-  /remedial@1.0.8:
-    resolution: {integrity: sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==}
-    dev: true
-
-  /remove-trailing-separator@1.1.0:
-    resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
-    dev: true
-
-  /remove-trailing-spaces@1.0.8:
-    resolution: {integrity: sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==}
-    dev: true
-
-  /require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /require-main-filename@2.0.0:
-    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
-    dev: true
-
-  /resolve-cwd@3.0.0:
-    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
-    engines: {node: '>=8'}
-    dependencies:
-      resolve-from: 5.0.0
-    dev: true
-
-  /resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /resolve.exports@1.1.0:
-    resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.11.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-    dev: true
-
-  /restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-    dev: true
-
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-    dev: true
-
-  /rfdc@1.3.0:
-    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
-    dev: true
-
-  /rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    hasBin: true
-    dependencies:
-      glob: 7.2.3
-    dev: true
-
-  /rollup@2.79.1:
-    resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /run-async@2.4.1:
-    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
-    engines: {node: '>=0.12.0'}
-    dev: true
-
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
-    dependencies:
-      queue-microtask: 1.2.3
-    dev: true
-
-  /rxjs@7.8.0:
-    resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-    dev: true
-
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      is-regex: 1.1.4
-    dev: true
-
-  /safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-    dev: true
-
-  /schema-utils@3.1.2:
-    resolution: {integrity: sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==}
-    engines: {node: '>= 10.13.0'}
-    dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
-    dev: true
-
-  /scuid@1.1.0:
-    resolution: {integrity: sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==}
-    dev: true
-
-  /semver@6.3.0:
-    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
-    hasBin: true
-    dev: true
-
-  /semver@7.3.8:
-    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: 6.0.0
-    dev: true
-
-  /sentence-case@3.0.4:
-    resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.5.0
-      upper-case-first: 2.0.2
-    dev: true
-
-  /serialize-javascript@6.0.1:
-    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
-    dependencies:
-      randombytes: 2.1.0
-    dev: true
-
-  /set-blocking@2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
-    dev: true
-
-  /setimmediate@1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-    dev: true
-
-  /shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
-    dependencies:
-      shebang-regex: 3.0.0
-    dev: true
-
-  /shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /shell-quote@1.8.0:
-    resolution: {integrity: sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==}
-    dev: true
-
-  /shiki@0.11.1:
-    resolution: {integrity: sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==}
-    dependencies:
-      jsonc-parser: 3.2.0
-      vscode-oniguruma: 1.6.2
-      vscode-textmate: 6.0.0
-    dev: true
-
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      object-inspect: 1.12.2
-    dev: true
-
-  /signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-    dev: true
-
-  /signedsource@1.0.0:
-    resolution: {integrity: sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==}
-    dev: true
-
-  /sisteransi@1.0.5:
-    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
-    dev: true
-
-  /slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /slice-ansi@3.0.0:
-    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
-  /snake-case@3.0.4:
-    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
-    dependencies:
-      dot-case: 3.0.4
-      tslib: 2.5.0
-    dev: true
-
-  /source-map-support@0.5.13:
-    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
-    dev: true
-
-  /source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
-    dev: true
-
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /source-map@0.8.0-beta.0:
-    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
-    engines: {node: '>= 8'}
-    dependencies:
-      whatwg-url: 7.1.0
-    dev: true
-
-  /sponge-case@1.0.1:
-    resolution: {integrity: sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /sprintf-js@1.0.3:
-    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
-    dev: true
-
-  /stack-utils@2.0.5:
-    resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
-    engines: {node: '>=10'}
-    dependencies:
-      escape-string-regexp: 2.0.0
-    dev: true
-
-  /streamsearch@1.1.0:
-    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
-    engines: {node: '>=10.0.0'}
-    dev: true
-
-  /string-env-interpolation@1.0.1:
-    resolution: {integrity: sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==}
-    dev: true
-
-  /string-length@4.0.2:
-    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      char-regex: 1.0.2
-      strip-ansi: 6.0.1
-    dev: true
-
-  /string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-    dev: true
-
-  /string.prototype.trimend@1.0.5:
-    resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-    dev: true
-
-  /string.prototype.trimstart@1.0.5:
-    resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.4
-    dev: true
-
-  /string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
-    dependencies:
-      safe-buffer: 5.2.1
-    dev: true
-
-  /strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-regex: 5.0.1
-    dev: true
-
-  /strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /strip-final-newline@2.0.0:
-    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /sucrase@3.28.0:
-    resolution: {integrity: sha512-TK9600YInjuiIhVM3729rH4ZKPOsGeyXUwY+Ugu9eilNbdTFyHr6XcAGYbRVZPDgWj6tgI7bx95aaJjHnbffag==}
-    engines: {node: '>=8'}
-    hasBin: true
-    dependencies:
-      commander: 4.1.1
-      glob: 7.1.6
-      lines-and-columns: 1.2.4
-      mz: 2.7.0
-      pirates: 4.0.5
-      ts-interface-checker: 0.1.13
-    dev: true
-
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-    dependencies:
-      has-flag: 3.0.0
-    dev: true
-
-  /supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
-    dev: true
-
-  /supports-color@8.1.1:
-    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
-    engines: {node: '>=10'}
-    dependencies:
-      has-flag: 4.0.0
-    dev: true
-
-  /supports-hyperlinks@2.3.0:
-    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-    dev: true
-
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /swap-case@2.0.2:
-    resolution: {integrity: sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /terminal-link@2.1.1:
-    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      supports-hyperlinks: 2.3.0
-    dev: true
-
-  /terser-webpack-plugin@5.3.7(esbuild@0.15.13)(webpack@5.80.0):
-    resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      esbuild: 0.15.13
-      jest-worker: 27.5.1
-      schema-utils: 3.1.2
-      serialize-javascript: 6.0.1
-      terser: 5.17.1
-      webpack: 5.80.0(esbuild@0.15.13)
-    dev: true
-
-  /terser@5.17.1:
-    resolution: {integrity: sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      '@jridgewell/source-map': 0.3.3
-      acorn: 8.8.1
-      commander: 2.20.3
-      source-map-support: 0.5.21
-    dev: true
-
-  /test-exclude@6.0.0:
-    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@istanbuljs/schema': 0.1.3
-      glob: 7.2.3
-      minimatch: 3.1.2
-    dev: true
-
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-    dev: true
-
-  /thenify-all@1.6.0:
-    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      thenify: 3.3.1
-    dev: true
-
-  /thenify@3.3.1:
-    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
-    dependencies:
-      any-promise: 1.3.0
-    dev: true
-
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-    dev: true
-
-  /title-case@3.0.3:
-    resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
-    dependencies:
-      os-tmpdir: 1.0.2
-    dev: true
-
-  /tmpl@1.0.5:
-    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
-    dev: true
-
-  /to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
-    dependencies:
-      is-number: 7.0.0
-    dev: true
-
-  /tr46@0.0.3:
-    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: true
-
-  /tr46@1.0.1:
-    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
-    dependencies:
-      punycode: 2.1.1
-    dev: true
-
-  /tree-kill@1.2.2:
-    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
-    hasBin: true
-    dev: true
-
-  /ts-interface-checker@0.1.13:
-    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
-    dev: true
-
-  /ts-jest@28.0.8(@babel/core@7.19.6)(esbuild@0.15.13)(jest@28.1.3)(typescript@4.8.2):
-    resolution: {integrity: sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@jest/types': ^28.0.0
-      babel-jest: ^28.0.0
-      esbuild: '*'
-      jest: ^28.0.0
-      typescript: '>=4.3'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@jest/types':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@babel/core': 7.19.6
-      bs-logger: 0.2.6
-      esbuild: 0.15.13
-      fast-json-stable-stringify: 2.1.0
-      jest: 28.1.3(@types/node@18.6.2)(ts-node@10.9.1)
-      jest-util: 28.1.3
-      json5: 2.2.1
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.8
-      typescript: 4.8.2
-      yargs-parser: 21.1.1
-    dev: true
-
-  /ts-loader@9.3.1(typescript@4.8.2)(webpack@5.80.0):
-    resolution: {integrity: sha512-OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      typescript: '*'
-      webpack: ^5.0.0
-    dependencies:
-      chalk: 4.1.2
-      enhanced-resolve: 5.10.0
-      micromatch: 4.0.5
-      semver: 7.3.8
-      typescript: 4.8.2
-      webpack: 5.80.0(esbuild@0.15.13)
-    dev: true
-
-  /ts-log@2.2.5:
-    resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==}
-    dev: true
-
-  /ts-node@10.9.1(@types/node@18.6.2)(typescript@4.8.2):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.3
-      '@types/node': 18.6.2
-      acorn: 8.8.1
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 4.8.2
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
-    dev: true
-
-  /tsconfig-paths@3.14.1:
-    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
-    dependencies:
-      '@types/json5': 0.0.29
-      json5: 1.0.1
-      minimist: 1.2.7
-      strip-bom: 3.0.0
-    dev: true
-
-  /tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
-    dev: true
-
-  /tslib@2.4.1:
-    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
-    dev: true
-
-  /tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
-    dev: true
-
-  /tsup@6.2.3(ts-node@10.9.1)(typescript@4.8.2):
-    resolution: {integrity: sha512-J5Pu2Dx0E1wlpIEsVFv9ryzP1pZ1OYsJ2cBHZ7GrKteytNdzaSz5hmLX7/nAxtypq+jVkVvA79d7S83ETgHQ5w==}
-    engines: {node: '>=14'}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': ^1
-      postcss: ^8.4.12
-      typescript: ^4.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      postcss:
-        optional: true
-      typescript:
-        optional: true
-    dependencies:
-      bundle-require: 3.1.2(esbuild@0.15.13)
-      cac: 6.7.14
-      chokidar: 3.5.3
-      debug: 4.3.4
-      esbuild: 0.15.13
-      execa: 5.1.1
-      globby: 11.1.0
-      joycon: 3.1.1
-      postcss-load-config: 3.1.4(ts-node@10.9.1)
-      resolve-from: 5.0.0
-      rollup: 2.79.1
-      source-map: 0.8.0-beta.0
-      sucrase: 3.28.0
-      tree-kill: 1.2.2
-      typescript: 4.8.2
-    transitivePeerDependencies:
-      - supports-color
-      - ts-node
-    dev: true
-
-  /tsutils@3.21.0(typescript@4.8.2):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
-    dependencies:
-      tslib: 1.14.1
-      typescript: 4.8.2
-    dev: true
-
-  /tweetnacl@1.0.3:
-    resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==}
-    dev: false
-
-  /type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      prelude-ls: 1.2.1
-    dev: true
-
-  /type-detect@4.0.8:
-    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /typedoc@0.23.20(typescript@4.8.2):
-    resolution: {integrity: sha512-nfb4Mx05ZZZXux3zPcLuc7+3TVePDW3jTdEBqXdQzJUyEILxoprgPIiTChbvci9crkqNJG9YESmfCptuh9Gn3g==}
-    engines: {node: '>= 14.14'}
-    hasBin: true
-    peerDependencies:
-      typescript: 4.6.x || 4.7.x || 4.8.x
-    dependencies:
-      lunr: 2.3.9
-      marked: 4.2.2
-      minimatch: 5.1.0
-      shiki: 0.11.1
-      typescript: 4.8.2
-    dev: true
-
-  /typescript@4.8.2:
-    resolution: {integrity: sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
-  /ua-parser-js@0.7.33:
-    resolution: {integrity: sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==}
-    dev: true
-
-  /uglify-js@3.17.4:
-    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
-    engines: {node: '>=0.8.0'}
-    hasBin: true
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-    dependencies:
-      call-bind: 1.0.2
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-    dev: true
-
-  /unc-path-regex@0.1.2:
-    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
-    engines: {node: '>= 10.0.0'}
-    dev: true
-
-  /unixify@1.0.0:
-    resolution: {integrity: sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      normalize-path: 2.1.1
-    dev: true
-
-  /update-browserslist-db@1.0.10(browserslist@4.21.4):
-    resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-    dependencies:
-      browserslist: 4.21.4
-      escalade: 3.1.1
-      picocolors: 1.0.0
-    dev: true
-
-  /upper-case-first@2.0.2:
-    resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /upper-case@2.0.2:
-    resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
-    dependencies:
-      tslib: 2.5.0
-    dev: true
-
-  /uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
-    dependencies:
-      punycode: 2.1.1
-    dev: true
-
-  /urlpattern-polyfill@6.0.2:
-    resolution: {integrity: sha512-5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg==}
-    dependencies:
-      braces: 3.0.2
-    dev: true
-
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-    dev: true
-
-  /v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-    dev: true
-
-  /v8-to-istanbul@9.0.1:
-    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
-    engines: {node: '>=10.12.0'}
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      '@types/istanbul-lib-coverage': 2.0.4
-      convert-source-map: 1.9.0
-    dev: true
-
-  /value-or-promise@1.0.12:
-    resolution: {integrity: sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==}
-    engines: {node: '>=12'}
-    dev: true
-
-  /vscode-oniguruma@1.6.2:
-    resolution: {integrity: sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==}
-    dev: true
-
-  /vscode-textmate@6.0.0:
-    resolution: {integrity: sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==}
-    dev: true
-
-  /walker@1.0.8:
-    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
-    dependencies:
-      makeerror: 1.0.12
-    dev: true
-
-  /watchpack@2.4.0:
-    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-    dev: true
-
-  /wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
-    dependencies:
-      defaults: 1.0.4
-    dev: true
-
-  /web-streams-polyfill@3.2.1:
-    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /webcrypto-core@1.7.5:
-    resolution: {integrity: sha512-gaExY2/3EHQlRNNNVSrbG2Cg94Rutl7fAaKILS1w8ZDhGxdFOaw6EbCfHIxPy9vt/xwp5o0VQAx9aySPF6hU1A==}
-    dependencies:
-      '@peculiar/asn1-schema': 2.3.3
-      '@peculiar/json-schema': 1.1.12
-      asn1js: 3.0.5
-      pvtsutils: 1.3.2
-      tslib: 2.5.0
-    dev: true
-
-  /webidl-conversions@3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: true
-
-  /webidl-conversions@4.0.2:
-    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
-    dev: true
-
-  /webpack-sources@3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-    dev: true
-
-  /webpack@5.80.0(esbuild@0.15.13):
-    resolution: {integrity: sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-    dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 1.0.1
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/wasm-edit': 1.11.5
-      '@webassemblyjs/wasm-parser': 1.11.5
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0(acorn@8.8.1)
-      browserslist: 4.21.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.13.0
-      es-module-lexer: 1.2.1
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.1.2
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.7(esbuild@0.15.13)(webpack@5.80.0)
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-    dev: true
-
-  /whatwg-fetch@3.6.2:
-    resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==}
-    dev: true
-
-  /whatwg-url@5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
-    dev: true
-
-  /whatwg-url@7.1.0:
-    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
-    dependencies:
-      lodash.sortby: 4.7.0
-      tr46: 1.0.1
-      webidl-conversions: 4.0.2
-    dev: true
-
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-    dev: true
-
-  /which-module@2.0.0:
-    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
-    dev: true
-
-  /which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
-    dependencies:
-      isexe: 2.0.0
-    dev: true
-
-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /wordwrap@1.0.0:
-    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
-    dev: true
-
-  /wrap-ansi@6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
-  /wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-    dev: true
-
-  /write-file-atomic@4.0.2:
-    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 3.0.7
-    dev: true
-
-  /ws@8.12.0:
-    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
-
-  /y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
-    dev: true
-
-  /y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /yallist@3.1.1:
-    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
-    dev: true
-
-  /yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-    dev: true
-
-  /yaml-ast-parser@0.0.43:
-    resolution: {integrity: sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==}
-    dev: true
-
-  /yaml@1.10.2:
-    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-    dev: true
-
-  /yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-    dev: true
-
-  /yargs@15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
-    dependencies:
-      cliui: 6.0.0
-      decamelize: 1.2.0
-      find-up: 4.1.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 4.2.3
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 18.1.3
-    dev: true
-
-  /yargs@17.6.2:
-    resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
-    engines: {node: '>=12'}
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-    dev: true
-
-  /yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-    dev: true
-
-  '@github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz':
-    resolution: {tarball: https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz}
-    name: openapi-typescript-codegen
-    version: 0.24.0
-    hasBin: true
-    dependencies:
-      camelcase: 6.3.0
-      commander: 9.4.1
-      fs-extra: 10.1.0
-      handlebars: 4.7.7
-      json-schema-ref-parser: 9.0.9
-    dev: true
diff --git a/m1/JavaScript-client/scripts/check.sh b/m1/JavaScript-client/scripts/check.sh
deleted file mode 100644
index 456f83026..000000000
--- a/m1/JavaScript-client/scripts/check.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# This script performs various validity checks prior to publishing a package
-# to npm.js, such as checking the version and the changelog.
-
-set -e
-
-cd "$(dirname "$0")"
-cd ..
-
-# Get the latest version of the package on npm.js
-PUBLISHED_VERSION=`npm show aptos version`
-
-# Get the version from the local package.json file.
-NEW_VERSION=`node -p -e "require('./package.json').version"`
-
-# Exit happily if the version is the same.
-if [ "$NEW_VERSION" = "$PUBLISHED_VERSION" ]; then
-    echo "Version is the same. Exiting gracefully."
-    exit 0
-fi
-
-# Functions to help check if the version went backwards.
-verlte() {
-    [ "$1" = "$(printf "$1\n$2" | sort -V | head -n1)" ]
-}
-
-# Ensure the version didn't go backwards.
-if verlte $NEW_VERSION $PUBLISHED_VERSION; then
-    echo "ERROR: The version number went backwards. Aborting."
-    exit 1
-fi
-
-# Ensure there is an entry for the new version in the changelog.
-if ! grep -q "# $NEW_VERSION" CHANGELOG.md; then
-    echo "ERROR: The changelog does not contain an entry for the new version. Aborting."
-    exit 1
-fi
-
-echo "Version and changelog look good"
diff --git a/m1/JavaScript-client/scripts/checked_publish.sh b/m1/JavaScript-client/scripts/checked_publish.sh
deleted file mode 100644
index 62fdec1cd..000000000
--- a/m1/JavaScript-client/scripts/checked_publish.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# This script publishes the package to npm.js, first perfoming validity checks.
-# This script can be used locally or in CI safely.
-# It assumes the package has already been installed, built, and tested.
-
-set -e
-
-cd "$(dirname "$0")"
-cd ..
-
-# Make sure everything is valid.
-. scripts/check.sh
-
-# Finally, publish the package. We assume it has been built
-pnpm publish --non-interactive
diff --git a/m1/JavaScript-client/scripts/generate_ts_docs.sh b/m1/JavaScript-client/scripts/generate_ts_docs.sh
deleted file mode 100644
index 019920187..000000000
--- a/m1/JavaScript-client/scripts/generate_ts_docs.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# This script helps you regenerate the TS docs at https://github.com/aptos-labs/ts-sdk-doc.
-
-DOCS_DIR=/tmp/ts-sdk-doc
-
-set -e
-
-cd "$(dirname "$0")"
-cd ..
-
-# Generate the TS docs to a temporary directory.
-rm -rf /tmp/generated-ts-docs
-typedoc src/index.ts --out /tmp/generated-ts-docs
-
-# Clone the ts-sdk-doc repo.
-rm -rf /tmp/ts-sdk-doc
-git clone git@github.com:aptos-labs/ts-sdk-doc.git $DOCS_DIR
-
-# Copy the generated docs into the ts-sdk-doc repo.
-rm -rf $DOCS_DIR/*
-mv /tmp/generated-ts-docs/* $DOCS_DIR
-
-# Copy in a basic README
-echo "# TS SDK Docs" > $DOCS_DIR/README.md
-echo "" >> $DOCS_DIR/README.md
-echo 'Generated from `ecosystem/typescript/sdk/` in [aptos-core](https://github.com/aptos-labs/aptos-core/tree/main/ecosystem/typescript/sdk) using `pnpm generate-ts-docs`.' >> $DOCS_DIR/README.md
-
-# Done!
-echo
-echo "Generated docs to $DOCS_DIR"
-echo "From here, ensure that the changes look good. If so, copy the changes into a checkout of the ts-sdk-doc repo and make a PR!"
diff --git a/m1/JavaScript-client/scripts/publish_ans_contract.ts b/m1/JavaScript-client/scripts/publish_ans_contract.ts
deleted file mode 100644
index f851e13e7..000000000
--- a/m1/JavaScript-client/scripts/publish_ans_contract.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-const { execSync } = require("child_process");
-require("dotenv").config();
-
-/**
- * TS SDK supports ANS. Since ANS contract is not part of aptos-framework
- * we need to get the ANS contract, publish it to local testnet and test against it.
- * This script clones the aptos-names-contracts repo {@link https://github.com/aptos-labs/aptos-names-contracts},
- * uses a pre created account address and private key to fund that account and
- * then publish the contract under that account.
- * After the contract is published, we delete the cloned repo folder.
- *
- * This script runs when testing locally and on CI (as part of sdk-release.yaml) using `pnpm test`.
- */
-
-// on local publishing we want to use `aptos` commnads and on CI we want to use `docker`
-const APTOS_INVOCATION = process.env.APTOS_INVOCATION || "aptos";
-// environment we use when testing
-const APTOS_NODE_URL = process.env.APTOS_NODE_URL;
-const APTOS_FAUCET_URL = process.env.APTOS_FAUCET_URL;
-// ans account we use to publish the contract
-const ANS_REPO_LOCATION = process.env.ANS_REPO_LOCATION || "/tmp/ans";
-const ANS_TEST_ACCOUNT_PRIVATE_KEY =
-  process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY || "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
-const ANS_TEST_ACCOUNT_ADDRESS =
-  process.env.ANS_TEST_ACCOUNT_ADDRESS || "585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
-
-try {
-  deleteAnsFolder();
-  // 1. Clone ANS repository into the current directory
-  console.log("---clone ANS repository---");
-  execSync(`git clone https://github.com/aptos-labs/aptos-names-contracts.git ${ANS_REPO_LOCATION}`, {
-    stdio: "inherit",
-  });
-
-  // 2. fund ans account
-  console.log("---funding account---");
-  execSync(
-    `${APTOS_INVOCATION} account fund-with-faucet --account ${ANS_TEST_ACCOUNT_ADDRESS} --faucet-url ${APTOS_FAUCET_URL} --url ${APTOS_NODE_URL}`,
-    { stdio: "inherit" },
-  );
-
-  // 3. publish ans modules under the ans account
-  console.log("---publish ans modules---");
-  execSync(
-    `${APTOS_INVOCATION} move publish --package-dir /tmp/ans/core --assume-yes --private-key=${ANS_TEST_ACCOUNT_PRIVATE_KEY} --named-addresses aptos_names=0x${ANS_TEST_ACCOUNT_ADDRESS},aptos_names_admin=0x${ANS_TEST_ACCOUNT_ADDRESS},aptos_names_funds=0x${ANS_TEST_ACCOUNT_ADDRESS} --url=${APTOS_NODE_URL}`,
-    { stdio: "inherit" },
-  );
-
-  // 4. Delete aptos-names-contracts folder created by the git clone command
-  console.log("---module published, deleting aptos-names-contracts folder---");
-  deleteAnsFolder();
-} catch (error: any) {
-  console.error("An error occurred:");
-  console.error("Status", error?.status);
-  console.error("parsed stdout", error?.stdout?.toString("utf8"));
-  console.error("parsed stderr", error?.stderr?.toString("utf8"));
-  deleteAnsFolder();
-  process.exit(1);
-}
-
-function deleteAnsFolder() {
-  execSync("rm -rf /tmp/ans", { stdio: "inherit" });
-}
diff --git a/m1/JavaScript-client/src/account/aptos_account.ts b/m1/JavaScript-client/src/account/aptos_account.ts
deleted file mode 100644
index f7490f05b..000000000
--- a/m1/JavaScript-client/src/account/aptos_account.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import nacl from "tweetnacl";
-import * as bip39 from "@scure/bip39";
-import { bytesToHex } from "@noble/hashes/utils";
-import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
-import { derivePath } from "../utils/hd-key";
-import { HexString, MaybeHexString, Memoize } from "../utils";
-import * as Gen from "../generated/index";
-import { AccountAddress, AuthenticationKey, Ed25519PublicKey } from "../aptos_types";
-import { bcsToBytes } from "../bcs";
-
-export interface AptosAccountObject {
-  address?: Gen.HexEncodedBytes;
-  publicKeyHex?: Gen.HexEncodedBytes;
-  privateKeyHex: Gen.HexEncodedBytes;
-}
-
-/**
- * Class for creating and managing Aptos account
- */
-export class AptosAccount {
-  /**
-   * A private key and public key, associated with the given account
-   */
-  readonly signingKey: nacl.SignKeyPair;
-
-  /**
-   * Address associated with the given account
-   */
-  private readonly accountAddress: HexString;
-
-  static fromAptosAccountObject(obj: AptosAccountObject): AptosAccount {
-    return new AptosAccount(HexString.ensure(obj.privateKeyHex).toUint8Array(), obj.address);
-  }
-
-  /**
-   * Test derive path
-   */
-  static isValidPath(path: string): boolean {
-    return /^m\/44'\/637'\/[0-9]+'\/[0-9]+'\/[0-9]+'+$/.test(path);
-  }
-
-  /**
-   * Creates new account with bip44 path and mnemonics,
-   * @param path. (e.g. m/44'/637'/0'/0'/0')
-   * Detailed description: {@link https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki}
-   * @param mnemonics.
-   * @returns AptosAccount
-   */
-  static fromDerivePath(path: string, mnemonics: string): AptosAccount {
-    if (!AptosAccount.isValidPath(path)) {
-      throw new Error("Invalid derivation path");
-    }
-
-    const normalizeMnemonics = mnemonics
-      .trim()
-      .split(/\s+/)
-      .map((part) => part.toLowerCase())
-      .join(" ");
-
-    const { key } = derivePath(path, bytesToHex(bip39.mnemonicToSeedSync(normalizeMnemonics)));
-
-    return new AptosAccount(key);
-  }
-
-  /**
-   * Creates new account instance. Constructor allows passing in an address,
-   * to handle account key rotation, where auth_key != public_key
-   * @param privateKeyBytes  Private key from which account key pair will be generated.
-   * If not specified, new key pair is going to be created.
-   * @param address Account address (e.g. 0xe8012714cd17606cee7188a2a365eef3fe760be598750678c8c5954eb548a591).
-   * If not specified, a new one will be generated from public key
-   */
-  constructor(privateKeyBytes?: Uint8Array | undefined, address?: MaybeHexString) {
-    if (privateKeyBytes) {
-      this.signingKey = nacl.sign.keyPair.fromSeed(privateKeyBytes.slice(0, 32));
-    } else {
-      this.signingKey = nacl.sign.keyPair();
-    }
-    this.accountAddress = HexString.ensure(address || this.authKey().hex());
-  }
-
-  /**
-   * This is the key by which Aptos account is referenced.
-   * It is the 32-byte of the SHA-3 256 cryptographic hash
-   * of the public key(s) concatenated with a signature scheme identifier byte
-   * @returns Address associated with the given account
-   */
-  address(): HexString {
-    return this.accountAddress;
-  }
-
-  /**
-   * This key enables account owners to rotate their private key(s)
-   * associated with the account without changing the address that hosts their account.
-   * See here for more info: {@link https://aptos.dev/concepts/accounts#single-signer-authentication}
-   * @returns Authentication key for the associated account
-   */
-  @Memoize()
-  authKey(): HexString {
-    const pubKey = new Ed25519PublicKey(this.signingKey.publicKey);
-    const authKey = AuthenticationKey.fromEd25519PublicKey(pubKey);
-    return authKey.derivedAddress();
-  }
-
-  /**
-   * Takes source address and seeds and returns the resource account address
-   * @param sourceAddress Address used to derive the resource account
-   * @param seed The seed bytes
-   * @returns The resource account address
-   */
-
-  static getResourceAccountAddress(sourceAddress: MaybeHexString, seed: Uint8Array): HexString {
-    const source = bcsToBytes(AccountAddress.fromHex(sourceAddress));
-
-    const bytes = new Uint8Array([...source, ...seed, AuthenticationKey.DERIVE_RESOURCE_ACCOUNT_SCHEME]);
-
-    const hash = sha3Hash.create();
-    hash.update(bytes);
-
-    return HexString.fromUint8Array(hash.digest());
-  }
-
-  /**
-   * This key is generated with Ed25519 scheme.
-   * Public key is used to check a signature of transaction, signed by given account
-   * @returns The public key for the associated account
-   */
-  pubKey(): HexString {
-    return HexString.fromUint8Array(this.signingKey.publicKey);
-  }
-
-  /**
-   * Signs specified `buffer` with account's private key
-   * @param buffer A buffer to sign
-   * @returns A signature HexString
-   */
-  signBuffer(buffer: Uint8Array): HexString {
-    const signature = nacl.sign.detached(buffer, this.signingKey.secretKey);
-    return HexString.fromUint8Array(signature);
-  }
-
-  /**
-   * Signs specified `hexString` with account's private key
-   * @param hexString A regular string or HexString to sign
-   * @returns A signature HexString
-   */
-  signHexString(hexString: MaybeHexString): HexString {
-    const toSign = HexString.ensure(hexString).toUint8Array();
-    return this.signBuffer(toSign);
-  }
-
-  /**
-   * Verifies the signature of the message with the public key of the account
-   * @param message a signed message
-   * @param signature the signature of the message
-   */
-  verifySignature(message: MaybeHexString, signature: MaybeHexString): boolean {
-    const rawMessage = HexString.ensure(message).toUint8Array();
-    const rawSignature = HexString.ensure(signature).toUint8Array();
-    return nacl.sign.detached.verify(rawMessage, rawSignature, this.signingKey.publicKey);
-  }
-
-  /**
-   * Derives account address, public key and private key
-   * @returns AptosAccountObject instance.
-   * @example An example of the returned AptosAccountObject object
-   * ```
-   * {
-   *    address: "0xe8012714cd17606cee7188a2a365eef3fe760be598750678c8c5954eb548a591",
-   *    publicKeyHex: "0xf56d8524faf79fbc0f48c13aeed3b0ce5dd376b4db93b8130a107c0a5e04ba04",
-   *    privateKeyHex: `0x009c9f7c992a06cfafe916f125d8adb7a395fca243e264a8e56a4b3e6accf940
-   *      d2b11e9ece3049ce60e3c7b4a1c58aebfa9298e29a30a58a67f1998646135204`
-   * }
-   * ```
-   */
-  toPrivateKeyObject(): AptosAccountObject {
-    return {
-      address: this.address().hex(),
-      publicKeyHex: this.pubKey().hex(),
-      privateKeyHex: HexString.fromUint8Array(this.signingKey.secretKey.slice(0, 32)).hex(),
-    };
-  }
-}
-
-// Returns an account address as a HexString given either an AptosAccount or a MaybeHexString.
-export function getAddressFromAccountOrAddress(accountOrAddress: AptosAccount | MaybeHexString): HexString {
-  return accountOrAddress instanceof AptosAccount ? accountOrAddress.address() : HexString.ensure(accountOrAddress);
-}
diff --git a/m1/JavaScript-client/src/account/index.ts b/m1/JavaScript-client/src/account/index.ts
deleted file mode 100644
index 3af1a448c..000000000
--- a/m1/JavaScript-client/src/account/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./aptos_account";
diff --git a/m1/JavaScript-client/src/aptos_types/abi.ts b/m1/JavaScript-client/src/aptos_types/abi.ts
deleted file mode 100644
index 1dd3ad23d..000000000
--- a/m1/JavaScript-client/src/aptos_types/abi.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Deserializer, Serializer, Bytes, Seq, deserializeVector, serializeVector } from "../bcs";
-
-import { ModuleId } from "./transaction";
-
-import { TypeTag } from "./type_tag";
-
-export class TypeArgumentABI {
-  /**
-   * Constructs a TypeArgumentABI instance.
-   * @param name
-   */
-  constructor(public readonly name: string) {}
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeStr(this.name);
-  }
-
-  static deserialize(deserializer: Deserializer): TypeArgumentABI {
-    const name = deserializer.deserializeStr();
-    return new TypeArgumentABI(name);
-  }
-}
-
-export class ArgumentABI {
-  /**
-   * Constructs an ArgumentABI instance.
-   * @param name
-   * @param type_tag
-   */
-  constructor(public readonly name: string, public readonly type_tag: TypeTag) {}
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeStr(this.name);
-    this.type_tag.serialize(serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): ArgumentABI {
-    const name = deserializer.deserializeStr();
-    const typeTag = TypeTag.deserialize(deserializer);
-    return new ArgumentABI(name, typeTag);
-  }
-}
-
-export abstract class ScriptABI {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): ScriptABI {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return TransactionScriptABI.load(deserializer);
-      case 1:
-        return EntryFunctionABI.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for TransactionPayload: ${index}`);
-    }
-  }
-}
-
-export class TransactionScriptABI extends ScriptABI {
-  /**
-   * Constructs a TransactionScriptABI instance.
-   * @param name Entry function name
-   * @param doc
-   * @param code
-   * @param ty_args
-   * @param args
-   */
-  constructor(
-    public readonly name: string,
-    public readonly doc: string,
-    public readonly code: Bytes,
-    public readonly ty_args: Seq<TypeArgumentABI>,
-    public readonly args: Seq<ArgumentABI>,
-  ) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    serializer.serializeStr(this.name);
-    serializer.serializeStr(this.doc);
-    serializer.serializeBytes(this.code);
-    serializeVector<TypeArgumentABI>(this.ty_args, serializer);
-    serializeVector<ArgumentABI>(this.args, serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionScriptABI {
-    const name = deserializer.deserializeStr();
-    const doc = deserializer.deserializeStr();
-    const code = deserializer.deserializeBytes();
-    const tyArgs = deserializeVector(deserializer, TypeArgumentABI);
-    const args = deserializeVector(deserializer, ArgumentABI);
-    return new TransactionScriptABI(name, doc, code, tyArgs, args);
-  }
-}
-
-export class EntryFunctionABI extends ScriptABI {
-  /**
-   * Constructs a EntryFunctionABI instance
-   * @param name
-   * @param module_name Fully qualified module id
-   * @param doc
-   * @param ty_args
-   * @param args
-   */
-  constructor(
-    public readonly name: string,
-    public readonly module_name: ModuleId,
-    public readonly doc: string,
-    public readonly ty_args: Seq<TypeArgumentABI>,
-    public readonly args: Seq<ArgumentABI>,
-  ) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-    serializer.serializeStr(this.name);
-    this.module_name.serialize(serializer);
-    serializer.serializeStr(this.doc);
-    serializeVector<TypeArgumentABI>(this.ty_args, serializer);
-    serializeVector<ArgumentABI>(this.args, serializer);
-  }
-
-  static load(deserializer: Deserializer): EntryFunctionABI {
-    const name = deserializer.deserializeStr();
-    const moduleName = ModuleId.deserialize(deserializer);
-    const doc = deserializer.deserializeStr();
-    const tyArgs = deserializeVector(deserializer, TypeArgumentABI);
-    const args = deserializeVector(deserializer, ArgumentABI);
-    return new EntryFunctionABI(name, moduleName, doc, tyArgs, args);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/account_address.ts b/m1/JavaScript-client/src/aptos_types/account_address.ts
deleted file mode 100644
index 3417f0d3d..000000000
--- a/m1/JavaScript-client/src/aptos_types/account_address.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { HexString, MaybeHexString } from "../utils";
-import { Serializer, Deserializer, Bytes } from "../bcs";
-
-export class AccountAddress {
-  static readonly LENGTH: number = 32;
-
-  readonly address: Bytes;
-
-  static CORE_CODE_ADDRESS: AccountAddress = AccountAddress.fromHex("0x1");
-
-  constructor(address: Bytes) {
-    if (address.length !== AccountAddress.LENGTH) {
-      throw new Error("Expected address of length 32");
-    }
-    this.address = address;
-  }
-
-  /**
-   * Creates AccountAddress from a hex string.
-   * @param addr Hex string can be with a prefix or without a prefix,
-   *   e.g. '0x1aa' or '1aa'. Hex string will be left padded with 0s if too short.
-   */
-  static fromHex(addr: MaybeHexString): AccountAddress {
-    let address = HexString.ensure(addr);
-
-    // If an address hex has odd number of digits, padd the hex string with 0
-    // e.g. '1aa' would become '01aa'.
-    if (address.noPrefix().length % 2 !== 0) {
-      address = new HexString(`0${address.noPrefix()}`);
-    }
-
-    const addressBytes = address.toUint8Array();
-
-    if (addressBytes.length > AccountAddress.LENGTH) {
-      // eslint-disable-next-line quotes
-      throw new Error("Hex string is too long. Address's length is 32 bytes.");
-    } else if (addressBytes.length === AccountAddress.LENGTH) {
-      return new AccountAddress(addressBytes);
-    }
-
-    const res: Bytes = new Uint8Array(AccountAddress.LENGTH);
-    res.set(addressBytes, AccountAddress.LENGTH - addressBytes.length);
-
-    return new AccountAddress(res);
-  }
-
-  /**
-   * Checks if the string is a valid AccountAddress
-   * @param addr Hex string can be with a prefix or without a prefix,
-   *   e.g. '0x1aa' or '1aa'. Hex string will be left padded with 0s if too short.
-   */
-  static isValid(addr: MaybeHexString): boolean {
-    // At least one zero is required
-    if (addr === "") {
-      return false;
-    }
-
-    let address = HexString.ensure(addr);
-
-    // If an address hex has odd number of digits, padd the hex string with 0
-    // e.g. '1aa' would become '01aa'.
-    if (address.noPrefix().length % 2 !== 0) {
-      address = new HexString(`0${address.noPrefix()}`);
-    }
-
-    const addressBytes = address.toUint8Array();
-
-    return addressBytes.length <= AccountAddress.LENGTH;
-  }
-
-  /**
-   * Return a hex string from account Address.
-   */
-  toHexString(): MaybeHexString {
-    return HexString.fromUint8Array(this.address).hex();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeFixedBytes(this.address);
-  }
-
-  static deserialize(deserializer: Deserializer): AccountAddress {
-    return new AccountAddress(deserializer.deserializeFixedBytes(AccountAddress.LENGTH));
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/authentication_key.ts b/m1/JavaScript-client/src/aptos_types/authentication_key.ts
deleted file mode 100644
index 74f9b7683..000000000
--- a/m1/JavaScript-client/src/aptos_types/authentication_key.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
-import { HexString } from "../utils";
-import { Bytes } from "../bcs";
-import { MultiEd25519PublicKey } from "./multi_ed25519";
-import { Ed25519PublicKey } from "./ed25519";
-
-/**
- * Each account stores an authentication key. Authentication key enables account owners to rotate
- * their private key(s) associated with the account without changing the address that hosts their account.
- * @see {@link * https://aptos.dev/concepts/accounts | Account Basics}
- *
- * Account addresses can be derived from AuthenticationKey
- */
-export class AuthenticationKey {
-  static readonly LENGTH: number = 32;
-
-  static readonly MULTI_ED25519_SCHEME: number = 1;
-
-  static readonly ED25519_SCHEME: number = 0;
-
-  static readonly DERIVE_RESOURCE_ACCOUNT_SCHEME: number = 255;
-
-  readonly bytes: Bytes;
-
-  constructor(bytes: Bytes) {
-    if (bytes.length !== AuthenticationKey.LENGTH) {
-      throw new Error("Expected a byte array of length 32");
-    }
-    this.bytes = bytes;
-  }
-
-  /**
-   * Converts a K-of-N MultiEd25519PublicKey to AuthenticationKey with:
-   * `auth_key = sha3-256(p_1 | … | p_n | K | 0x01)`. `K` represents the K-of-N required for
-   * authenticating the transaction. `0x01` is the 1-byte scheme for multisig.
-   */
-  static fromMultiEd25519PublicKey(publicKey: MultiEd25519PublicKey): AuthenticationKey {
-    const pubKeyBytes = publicKey.toBytes();
-
-    const bytes = new Uint8Array(pubKeyBytes.length + 1);
-    bytes.set(pubKeyBytes);
-    bytes.set([AuthenticationKey.MULTI_ED25519_SCHEME], pubKeyBytes.length);
-
-    const hash = sha3Hash.create();
-    hash.update(bytes);
-
-    return new AuthenticationKey(hash.digest());
-  }
-
-  static fromEd25519PublicKey(publicKey: Ed25519PublicKey): AuthenticationKey {
-    const pubKeyBytes = publicKey.value;
-
-    const bytes = new Uint8Array(pubKeyBytes.length + 1);
-    bytes.set(pubKeyBytes);
-    bytes.set([AuthenticationKey.ED25519_SCHEME], pubKeyBytes.length);
-
-    const hash = sha3Hash.create();
-    hash.update(bytes);
-
-    return new AuthenticationKey(hash.digest());
-  }
-
-  /**
-   * Derives an account address from AuthenticationKey. Since current AccountAddress is 32 bytes,
-   * AuthenticationKey bytes are directly translated to AccountAddress.
-   */
-  derivedAddress(): HexString {
-    return HexString.fromUint8Array(this.bytes);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/authenticator.ts b/m1/JavaScript-client/src/aptos_types/authenticator.ts
deleted file mode 100644
index ffbe57913..000000000
--- a/m1/JavaScript-client/src/aptos_types/authenticator.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable @typescript-eslint/naming-convention */
-import { AccountAddress } from "./account_address";
-import { Serializer, Deserializer, Seq, deserializeVector, serializeVector } from "../bcs";
-import { Ed25519PublicKey, Ed25519Signature } from "./ed25519";
-import { MultiEd25519PublicKey, MultiEd25519Signature } from "./multi_ed25519";
-
-export abstract class TransactionAuthenticator {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): TransactionAuthenticator {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return TransactionAuthenticatorEd25519.load(deserializer);
-      case 1:
-        return TransactionAuthenticatorMultiEd25519.load(deserializer);
-      case 2:
-        return TransactionAuthenticatorMultiAgent.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for TransactionAuthenticator: ${index}`);
-    }
-  }
-}
-
-export class TransactionAuthenticatorEd25519 extends TransactionAuthenticator {
-  /**
-   * An authenticator for single signature.
-   *
-   * @param public_key Client's public key.
-   * @param signature Signature of a raw transaction.
-   * @see {@link https://aptos.dev/guides/creating-a-signed-transaction/ | Creating a Signed Transaction}
-   * for details about generating a signature.
-   */
-  constructor(public readonly public_key: Ed25519PublicKey, public readonly signature: Ed25519Signature) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    this.public_key.serialize(serializer);
-    this.signature.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionAuthenticatorEd25519 {
-    const public_key = Ed25519PublicKey.deserialize(deserializer);
-    const signature = Ed25519Signature.deserialize(deserializer);
-    return new TransactionAuthenticatorEd25519(public_key, signature);
-  }
-}
-
-export class TransactionAuthenticatorMultiEd25519 extends TransactionAuthenticator {
-  /**
-   * An authenticator for multiple signatures.
-   *
-   * @param public_key
-   * @param signature
-   *
-   */
-  constructor(public readonly public_key: MultiEd25519PublicKey, public readonly signature: MultiEd25519Signature) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-    this.public_key.serialize(serializer);
-    this.signature.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionAuthenticatorMultiEd25519 {
-    const public_key = MultiEd25519PublicKey.deserialize(deserializer);
-    const signature = MultiEd25519Signature.deserialize(deserializer);
-    return new TransactionAuthenticatorMultiEd25519(public_key, signature);
-  }
-}
-
-export class TransactionAuthenticatorMultiAgent extends TransactionAuthenticator {
-  constructor(
-    public readonly sender: AccountAuthenticator,
-    public readonly secondary_signer_addresses: Seq<AccountAddress>,
-    public readonly secondary_signers: Seq<AccountAuthenticator>,
-  ) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(2);
-    this.sender.serialize(serializer);
-    serializeVector<AccountAddress>(this.secondary_signer_addresses, serializer);
-    serializeVector<AccountAuthenticator>(this.secondary_signers, serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionAuthenticatorMultiAgent {
-    const sender = AccountAuthenticator.deserialize(deserializer);
-    const secondary_signer_addresses = deserializeVector(deserializer, AccountAddress);
-    const secondary_signers = deserializeVector(deserializer, AccountAuthenticator);
-    return new TransactionAuthenticatorMultiAgent(sender, secondary_signer_addresses, secondary_signers);
-  }
-}
-
-export abstract class AccountAuthenticator {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): AccountAuthenticator {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return AccountAuthenticatorEd25519.load(deserializer);
-      case 1:
-        return AccountAuthenticatorMultiEd25519.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for AccountAuthenticator: ${index}`);
-    }
-  }
-}
-
-export class AccountAuthenticatorEd25519 extends AccountAuthenticator {
-  constructor(public readonly public_key: Ed25519PublicKey, public readonly signature: Ed25519Signature) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    this.public_key.serialize(serializer);
-    this.signature.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): AccountAuthenticatorEd25519 {
-    const public_key = Ed25519PublicKey.deserialize(deserializer);
-    const signature = Ed25519Signature.deserialize(deserializer);
-    return new AccountAuthenticatorEd25519(public_key, signature);
-  }
-}
-
-export class AccountAuthenticatorMultiEd25519 extends AccountAuthenticator {
-  constructor(public readonly public_key: MultiEd25519PublicKey, public readonly signature: MultiEd25519Signature) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-    this.public_key.serialize(serializer);
-    this.signature.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): AccountAuthenticatorMultiEd25519 {
-    const public_key = MultiEd25519PublicKey.deserialize(deserializer);
-    const signature = MultiEd25519Signature.deserialize(deserializer);
-    return new AccountAuthenticatorMultiEd25519(public_key, signature);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/ed25519.ts b/m1/JavaScript-client/src/aptos_types/ed25519.ts
deleted file mode 100644
index 1385e289e..000000000
--- a/m1/JavaScript-client/src/aptos_types/ed25519.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Bytes, Deserializer, Serializer } from "../bcs";
-
-export class Ed25519PublicKey {
-  static readonly LENGTH: number = 32;
-
-  readonly value: Bytes;
-
-  constructor(value: Bytes) {
-    if (value.length !== Ed25519PublicKey.LENGTH) {
-      throw new Error(`Ed25519PublicKey length should be ${Ed25519PublicKey.LENGTH}`);
-    }
-    this.value = value;
-  }
-
-  toBytes(): Bytes {
-    return this.value;
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.value);
-  }
-
-  static deserialize(deserializer: Deserializer): Ed25519PublicKey {
-    const value = deserializer.deserializeBytes();
-    return new Ed25519PublicKey(value);
-  }
-}
-
-export class Ed25519Signature {
-  static readonly LENGTH = 64;
-
-  constructor(public readonly value: Bytes) {
-    if (value.length !== Ed25519Signature.LENGTH) {
-      throw new Error(`Ed25519Signature length should be ${Ed25519Signature.LENGTH}`);
-    }
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.value);
-  }
-
-  static deserialize(deserializer: Deserializer): Ed25519Signature {
-    const value = deserializer.deserializeBytes();
-    return new Ed25519Signature(value);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/identifier.ts b/m1/JavaScript-client/src/aptos_types/identifier.ts
deleted file mode 100644
index 229f155f5..000000000
--- a/m1/JavaScript-client/src/aptos_types/identifier.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Deserializer, Serializer } from "../bcs";
-
-export class Identifier {
-  constructor(public value: string) {}
-
-  public serialize(serializer: Serializer): void {
-    serializer.serializeStr(this.value);
-  }
-
-  static deserialize(deserializer: Deserializer): Identifier {
-    const value = deserializer.deserializeStr();
-    return new Identifier(value);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/index.ts b/m1/JavaScript-client/src/aptos_types/index.ts
deleted file mode 100644
index 4c4ff9836..000000000
--- a/m1/JavaScript-client/src/aptos_types/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export * from "./abi";
-export * from "./account_address";
-export * from "./authenticator";
-export * from "./transaction";
-export * from "./type_tag";
-export * from "./identifier";
-export * from "./ed25519";
-export * from "./multi_ed25519";
-export * from "./authentication_key";
-export * from "./rotation_proof_challenge";
-
-export type SigningMessage = Uint8Array;
diff --git a/m1/JavaScript-client/src/aptos_types/multi_ed25519.ts b/m1/JavaScript-client/src/aptos_types/multi_ed25519.ts
deleted file mode 100644
index ad72c7a0b..000000000
--- a/m1/JavaScript-client/src/aptos_types/multi_ed25519.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable no-bitwise */
-import { Bytes, Deserializer, Seq, Serializer, Uint8 } from "../bcs";
-import { Ed25519PublicKey, Ed25519Signature } from "./ed25519";
-
-/**
- * MultiEd25519 currently supports at most 32 signatures.
- */
-const MAX_SIGNATURES_SUPPORTED = 32;
-
-export class MultiEd25519PublicKey {
-  /**
-   * Public key for a K-of-N multisig transaction. A K-of-N multisig transaction means that for such a
-   * transaction to be executed, at least K out of the N authorized signers have signed the transaction
-   * and passed the check conducted by the chain.
-   *
-   * @see {@link
-   * https://aptos.dev/guides/creating-a-signed-transaction#multisignature-transactions | Creating a Signed Transaction}
-   *
-   * @param public_keys A list of public keys
-   * @param threshold At least "threshold" signatures must be valid
-   */
-  constructor(public readonly public_keys: Seq<Ed25519PublicKey>, public readonly threshold: Uint8) {
-    if (threshold > MAX_SIGNATURES_SUPPORTED) {
-      throw new Error(`"threshold" cannot be larger than ${MAX_SIGNATURES_SUPPORTED}`);
-    }
-  }
-
-  /**
-   * Converts a MultiEd25519PublicKey into bytes with: bytes = p1_bytes | ... | pn_bytes | threshold
-   */
-  toBytes(): Bytes {
-    const bytes = new Uint8Array(this.public_keys.length * Ed25519PublicKey.LENGTH + 1);
-    this.public_keys.forEach((k: Ed25519PublicKey, i: number) => {
-      bytes.set(k.value, i * Ed25519PublicKey.LENGTH);
-    });
-
-    bytes[this.public_keys.length * Ed25519PublicKey.LENGTH] = this.threshold;
-
-    return bytes;
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.toBytes());
-  }
-
-  static deserialize(deserializer: Deserializer): MultiEd25519PublicKey {
-    const bytes = deserializer.deserializeBytes();
-    const threshold = bytes[bytes.length - 1];
-
-    const keys: Seq<Ed25519PublicKey> = [];
-
-    for (let i = 0; i < bytes.length - 1; i += Ed25519PublicKey.LENGTH) {
-      const begin = i;
-      keys.push(new Ed25519PublicKey(bytes.subarray(begin, begin + Ed25519PublicKey.LENGTH)));
-    }
-    return new MultiEd25519PublicKey(keys, threshold);
-  }
-}
-
-export class MultiEd25519Signature {
-  static BITMAP_LEN: Uint8 = 4;
-
-  /**
-   * Signature for a K-of-N multisig transaction.
-   *
-   * @see {@link
-   * https://aptos.dev/guides/creating-a-signed-transaction#multisignature-transactions | Creating a Signed Transaction}
-   *
-   * @param signatures A list of ed25519 signatures
-   * @param bitmap 4 bytes, at most 32 signatures are supported. If Nth bit value is `1`, the Nth
-   * signature should be provided in `signatures`. Bits are read from left to right
-   */
-  constructor(public readonly signatures: Seq<Ed25519Signature>, public readonly bitmap: Uint8Array) {
-    if (bitmap.length !== MultiEd25519Signature.BITMAP_LEN) {
-      throw new Error(`"bitmap" length should be ${MultiEd25519Signature.BITMAP_LEN}`);
-    }
-  }
-
-  /**
-   * Converts a MultiEd25519Signature into bytes with `bytes = s1_bytes | ... | sn_bytes | bitmap`
-   */
-  toBytes(): Bytes {
-    const bytes = new Uint8Array(this.signatures.length * Ed25519Signature.LENGTH + MultiEd25519Signature.BITMAP_LEN);
-    this.signatures.forEach((k: Ed25519Signature, i: number) => {
-      bytes.set(k.value, i * Ed25519Signature.LENGTH);
-    });
-
-    bytes.set(this.bitmap, this.signatures.length * Ed25519Signature.LENGTH);
-
-    return bytes;
-  }
-
-  /**
-   * Helper method to create a bitmap out of the specified bit positions
-   * @param bits The bitmap positions that should be set. A position starts at index 0.
-   * Valid position should range between 0 and 31.
-   * @example
-   * Here's an example of valid `bits`
-   * ```
-   * [0, 2, 31]
-   * ```
-   * `[0, 2, 31]` means the 1st, 3rd and 32nd bits should be set in the bitmap.
-   * The result bitmap should be 0b1010000000000000000000000000001
-   *
-   * @returns bitmap that is 32bit long
-   */
-  static createBitmap(bits: Seq<Uint8>): Uint8Array {
-    // Bits are read from left to right. e.g. 0b10000000 represents the first bit is set in one byte.
-    // The decimal value of 0b10000000 is 128.
-    const firstBitInByte = 128;
-    const bitmap = new Uint8Array([0, 0, 0, 0]);
-
-    // Check if duplicates exist in bits
-    const dupCheckSet = new Set();
-
-    bits.forEach((bit: number) => {
-      if (bit >= MAX_SIGNATURES_SUPPORTED) {
-        throw new Error(`Invalid bit value ${bit}.`);
-      }
-
-      if (dupCheckSet.has(bit)) {
-        throw new Error("Duplicated bits detected.");
-      }
-
-      dupCheckSet.add(bit);
-
-      const byteOffset = Math.floor(bit / 8);
-
-      let byte = bitmap[byteOffset];
-
-      byte |= firstBitInByte >> bit % 8;
-
-      bitmap[byteOffset] = byte;
-    });
-
-    return bitmap;
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.toBytes());
-  }
-
-  static deserialize(deserializer: Deserializer): MultiEd25519Signature {
-    const bytes = deserializer.deserializeBytes();
-    const bitmap = bytes.subarray(bytes.length - 4);
-
-    const sigs: Seq<Ed25519Signature> = [];
-
-    for (let i = 0; i < bytes.length - bitmap.length; i += Ed25519Signature.LENGTH) {
-      const begin = i;
-      sigs.push(new Ed25519Signature(bytes.subarray(begin, begin + Ed25519Signature.LENGTH)));
-    }
-    return new MultiEd25519Signature(sigs, bitmap);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/rotation_proof_challenge.ts b/m1/JavaScript-client/src/aptos_types/rotation_proof_challenge.ts
deleted file mode 100644
index eb3b6942e..000000000
--- a/m1/JavaScript-client/src/aptos_types/rotation_proof_challenge.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AccountAddress } from "./account_address";
-import { Serializer } from "../bcs";
-
-export class RotationProofChallenge {
-  constructor(
-    public readonly accountAddress: AccountAddress,
-    public readonly moduleName: string,
-    public readonly structName: string,
-    public readonly sequenceNumber: number | bigint,
-    public readonly originator: AccountAddress,
-    public readonly currentAuthKey: AccountAddress,
-    public readonly newPublicKey: Uint8Array,
-  ) {}
-
-  serialize(serializer: Serializer): void {
-    this.accountAddress.serialize(serializer);
-    serializer.serializeStr(this.moduleName);
-    serializer.serializeStr(this.structName);
-    serializer.serializeU64(this.sequenceNumber);
-    this.originator.serialize(serializer);
-    this.currentAuthKey.serialize(serializer);
-    serializer.serializeBytes(this.newPublicKey);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/token_types.ts b/m1/JavaScript-client/src/aptos_types/token_types.ts
deleted file mode 100644
index 3200c2bb3..000000000
--- a/m1/JavaScript-client/src/aptos_types/token_types.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { deserializePropertyMap, PropertyMap, PropertyValue } from "../utils/property_map_serde";
-
-export { PropertyMap, PropertyValue };
-export class TokenData {
-  /** Unique name within this creator's account for this Token's collection */
-  collection: string;
-
-  /** Description of Token */
-  description: string;
-
-  /** Name of Token */
-  name: string;
-
-  /** Optional maximum number of this Token */
-  maximum?: number;
-
-  /** Total number of this type of Token */
-  supply: number;
-
-  /** URL for additional information / media */
-  uri: string;
-
-  /** default properties of token data */
-  default_properties: PropertyMap;
-
-  /** mutability config of tokendata fields */
-  mutability_config: boolean[];
-
-  constructor(
-    collection: string,
-    description: string,
-    name: string,
-    maximum: number,
-    supply: number,
-    uri: string,
-    default_properties: any,
-    mutability_config: boolean[],
-  ) {
-    this.collection = collection;
-    this.description = description;
-    this.name = name;
-    this.maximum = maximum;
-    this.supply = supply;
-    this.uri = uri;
-    this.default_properties = deserializePropertyMap(default_properties);
-    this.mutability_config = mutability_config;
-  }
-}
-
-export interface TokenDataId {
-  /** Token creator address */
-  creator: string;
-
-  /** Unique name within this creator's account for this Token's collection */
-  collection: string;
-
-  /** Name of Token */
-  name: string;
-}
-
-export interface TokenId {
-  token_data_id: TokenDataId;
-
-  /** version number of the property map */
-  property_version: string;
-}
-
-/** server will return string for u64 */
-type U64 = string;
-
-export class Token {
-  id: TokenId;
-
-  /** server will return string for u64 */
-  amount: U64;
-
-  /** the property map of the token */
-  token_properties: PropertyMap;
-
-  constructor(id: TokenId, amount: U64, token_properties: any) {
-    this.id = id;
-    this.amount = amount;
-    this.token_properties = deserializePropertyMap(token_properties);
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/transaction.ts b/m1/JavaScript-client/src/aptos_types/transaction.ts
deleted file mode 100644
index c3d611dd5..000000000
--- a/m1/JavaScript-client/src/aptos_types/transaction.ts
+++ /dev/null
@@ -1,700 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable max-classes-per-file */
-import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
-import { HexString } from "../utils";
-import {
-  Deserializer,
-  Serializer,
-  Uint64,
-  Bytes,
-  Seq,
-  Uint8,
-  Uint128,
-  deserializeVector,
-  serializeVector,
-  bcsToBytes,
-  Uint16,
-  Uint256,
-} from "../bcs";
-import { TransactionAuthenticator } from "./authenticator";
-import { Identifier } from "./identifier";
-import { TypeTag } from "./type_tag";
-import { AccountAddress } from "./account_address";
-
-export class RawTransaction {
-  /**
-   * RawTransactions contain the metadata and payloads that can be submitted to Aptos chain for execution.
-   * RawTransactions must be signed before Aptos chain can execute them.
-   *
-   * @param sender Account address of the sender.
-   * @param sequence_number Sequence number of this transaction. This must match the sequence number stored in
-   *   the sender's account at the time the transaction executes.
-   * @param payload Instructions for the Aptos Blockchain, including publishing a module,
-   *   execute a entry function or execute a script payload.
-   * @param max_gas_amount Maximum total gas to spend for this transaction. The account must have more
-   *   than this gas or the transaction will be discarded during validation.
-   * @param gas_unit_price Price to be paid per gas unit.
-   * @param expiration_timestamp_secs The blockchain timestamp at which the blockchain would discard this transaction.
-   * @param chain_id The chain ID of the blockchain that this transaction is intended to be run on.
-   */
-  constructor(
-    public readonly sender: AccountAddress,
-    public readonly sequence_number: Uint64,
-    public readonly payload: TransactionPayload,
-    public readonly max_gas_amount: Uint64,
-    public readonly gas_unit_price: Uint64,
-    public readonly expiration_timestamp_secs: Uint64,
-    public readonly chain_id: ChainId,
-  ) {}
-
-  serialize(serializer: Serializer): void {
-    this.sender.serialize(serializer);
-    serializer.serializeU64(this.sequence_number);
-    this.payload.serialize(serializer);
-    serializer.serializeU64(this.max_gas_amount);
-    serializer.serializeU64(this.gas_unit_price);
-    serializer.serializeU64(this.expiration_timestamp_secs);
-    this.chain_id.serialize(serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): RawTransaction {
-    const sender = AccountAddress.deserialize(deserializer);
-    const sequence_number = deserializer.deserializeU64();
-    const payload = TransactionPayload.deserialize(deserializer);
-    const max_gas_amount = deserializer.deserializeU64();
-    const gas_unit_price = deserializer.deserializeU64();
-    const expiration_timestamp_secs = deserializer.deserializeU64();
-    const chain_id = ChainId.deserialize(deserializer);
-    return new RawTransaction(
-      sender,
-      sequence_number,
-      payload,
-      max_gas_amount,
-      gas_unit_price,
-      expiration_timestamp_secs,
-      chain_id,
-    );
-  }
-}
-
-export class Script {
-  /**
-   * Scripts contain the Move bytecodes payload that can be submitted to Aptos chain for execution.
-   * @param code Move bytecode
-   * @param ty_args Type arguments that bytecode requires.
-   *
-   * @example
-   * A coin transfer function has one type argument "CoinType".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   * @param args Arugments to bytecode function.
-   *
-   * @example
-   * A coin transfer function has three arugments "from", "to" and "amount".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   */
-  constructor(
-    public readonly code: Bytes,
-    public readonly ty_args: Seq<TypeTag>,
-    public readonly args: Seq<TransactionArgument>,
-  ) {}
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.code);
-    serializeVector<TypeTag>(this.ty_args, serializer);
-    serializeVector<TransactionArgument>(this.args, serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): Script {
-    const code = deserializer.deserializeBytes();
-    const ty_args = deserializeVector(deserializer, TypeTag);
-    const args = deserializeVector(deserializer, TransactionArgument);
-    return new Script(code, ty_args, args);
-  }
-}
-
-export class EntryFunction {
-  /**
-   * Contains the payload to run a function within a module.
-   * @param module_name Fully qualified module name. ModuleId consists of account address and module name.
-   * @param function_name The function to run.
-   * @param ty_args Type arguments that move function requires.
-   *
-   * @example
-   * A coin transfer function has one type argument "CoinType".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   * @param args Arugments to the move function.
-   *
-   * @example
-   * A coin transfer function has three arugments "from", "to" and "amount".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   */
-  constructor(
-    public readonly module_name: ModuleId,
-    public readonly function_name: Identifier,
-    public readonly ty_args: Seq<TypeTag>,
-    public readonly args: Seq<Bytes>,
-  ) {}
-
-  /**
-   *
-   * @param module Fully qualified module name in format "AccountAddress::module_name" e.g. "0x1::coin"
-   * @param func Function name
-   * @param ty_args Type arguments that move function requires.
-   *
-   * @example
-   * A coin transfer function has one type argument "CoinType".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   * @param args Arugments to the move function.
-   *
-   * @example
-   * A coin transfer function has three arugments "from", "to" and "amount".
-   * ```
-   * public(script) fun transfer<CoinType>(from: &signer, to: address, amount: u64,)
-   * ```
-   * @returns
-   */
-  static natural(module: string, func: string, ty_args: Seq<TypeTag>, args: Seq<Bytes>): EntryFunction {
-    return new EntryFunction(ModuleId.fromStr(module), new Identifier(func), ty_args, args);
-  }
-
-  /**
-   * `natual` is deprecated, please use `natural`
-   *
-   * @deprecated.
-   */
-  static natual(module: string, func: string, ty_args: Seq<TypeTag>, args: Seq<Bytes>): EntryFunction {
-    return EntryFunction.natural(module, func, ty_args, args);
-  }
-
-  serialize(serializer: Serializer): void {
-    this.module_name.serialize(serializer);
-    this.function_name.serialize(serializer);
-    serializeVector<TypeTag>(this.ty_args, serializer);
-
-    serializer.serializeU32AsUleb128(this.args.length);
-    this.args.forEach((item: Bytes) => {
-      serializer.serializeBytes(item);
-    });
-  }
-
-  static deserialize(deserializer: Deserializer): EntryFunction {
-    const module_name = ModuleId.deserialize(deserializer);
-    const function_name = Identifier.deserialize(deserializer);
-    const ty_args = deserializeVector(deserializer, TypeTag);
-
-    const length = deserializer.deserializeUleb128AsU32();
-    const list: Seq<Bytes> = [];
-    for (let i = 0; i < length; i += 1) {
-      list.push(deserializer.deserializeBytes());
-    }
-
-    const args = list;
-    return new EntryFunction(module_name, function_name, ty_args, args);
-  }
-}
-
-export class MultiSigTransactionPayload {
-  /**
-   * Contains the payload to run a multisig account transaction.
-   * @param transaction_payload The payload of the multisig transaction. This can only be EntryFunction for now but
-   * Script might be supported in the future.
-   */
-  constructor(public readonly transaction_payload: EntryFunction) {}
-
-  serialize(serializer: Serializer): void {
-    // We can support multiple types of inner transaction payload in the future.
-    // For now it's only EntryFunction but if we support more types, we need to serialize with the right enum values
-    // here
-    serializer.serializeU32AsUleb128(0);
-    this.transaction_payload.serialize(serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): MultiSigTransactionPayload {
-    // TODO: Support other types of payload beside EntryFunction.
-    // This is the enum value indicating which type of payload the multisig tx contains.
-    deserializer.deserializeUleb128AsU32();
-    return new MultiSigTransactionPayload(EntryFunction.deserialize(deserializer));
-  }
-}
-
-export class MultiSig {
-  /**
-   * Contains the payload to run a multisig account transaction.
-   * @param multisig_address The multisig account address the transaction will be executed as.
-   * @param transaction_payload The payload of the multisig transaction. This is optional when executing a multisig
-   *  transaction whose payload is already stored on chain.
-   */
-  constructor(
-    public readonly multisig_address: AccountAddress,
-    public readonly transaction_payload?: MultiSigTransactionPayload,
-  ) {}
-
-  serialize(serializer: Serializer): void {
-    this.multisig_address.serialize(serializer);
-    // Options are encoded with an extra u8 field before the value - 0x0 is none and 0x1 is present.
-    // We use serializeBool below to create this prefix value.
-    if (this.transaction_payload === undefined) {
-      serializer.serializeBool(false);
-    } else {
-      serializer.serializeBool(true);
-      this.transaction_payload.serialize(serializer);
-    }
-  }
-
-  static deserialize(deserializer: Deserializer): MultiSig {
-    const multisig_address = AccountAddress.deserialize(deserializer);
-    const payloadPresent = deserializer.deserializeBool();
-    let transaction_payload;
-    if (payloadPresent) {
-      transaction_payload = MultiSigTransactionPayload.deserialize(deserializer);
-    }
-    return new MultiSig(multisig_address, transaction_payload);
-  }
-}
-
-export class Module {
-  /**
-   * Contains the bytecode of a Move module that can be published to the Aptos chain.
-   * @param code Move bytecode of a module.
-   */
-  constructor(public readonly code: Bytes) {}
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeBytes(this.code);
-  }
-
-  static deserialize(deserializer: Deserializer): Module {
-    const code = deserializer.deserializeBytes();
-    return new Module(code);
-  }
-}
-
-export class ModuleId {
-  /**
-   * Full name of a module.
-   * @param address The account address.
-   * @param name The name of the module under the account at "address".
-   */
-  constructor(public readonly address: AccountAddress, public readonly name: Identifier) {}
-
-  /**
-   * Converts a string literal to a ModuleId
-   * @param moduleId String literal in format "AccountAddress::module_name",
-   *   e.g. "0x1::coin"
-   * @returns
-   */
-  static fromStr(moduleId: string): ModuleId {
-    const parts = moduleId.split("::");
-    if (parts.length !== 2) {
-      throw new Error("Invalid module id.");
-    }
-    return new ModuleId(AccountAddress.fromHex(new HexString(parts[0])), new Identifier(parts[1]));
-  }
-
-  serialize(serializer: Serializer): void {
-    this.address.serialize(serializer);
-    this.name.serialize(serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): ModuleId {
-    const address = AccountAddress.deserialize(deserializer);
-    const name = Identifier.deserialize(deserializer);
-    return new ModuleId(address, name);
-  }
-}
-
-export class ChangeSet {
-  serialize(serializer: Serializer): void {
-    throw new Error("Not implemented.");
-  }
-
-  static deserialize(deserializer: Deserializer): ChangeSet {
-    throw new Error("Not implemented.");
-  }
-}
-
-export class WriteSet {
-  serialize(serializer: Serializer): void {
-    throw new Error("Not implmented.");
-  }
-
-  static deserialize(deserializer: Deserializer): WriteSet {
-    throw new Error("Not implmented.");
-  }
-}
-
-export class SignedTransaction {
-  /**
-   * A SignedTransaction consists of a raw transaction and an authenticator. The authenticator
-   * contains a client's public key and the signature of the raw transaction.
-   *
-   * @see {@link https://aptos.dev/guides/creating-a-signed-transaction/ | Creating a Signed Transaction}
-   *
-   * @param raw_txn
-   * @param authenticator Contains a client's public key and the signature of the raw transaction.
-   *   Authenticator has 3 flavors: single signature, multi-signature and multi-agent.
-   *   @see authenticator.ts for details.
-   */
-  constructor(public readonly raw_txn: RawTransaction, public readonly authenticator: TransactionAuthenticator) {}
-
-  serialize(serializer: Serializer): void {
-    this.raw_txn.serialize(serializer);
-    this.authenticator.serialize(serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): SignedTransaction {
-    const raw_txn = RawTransaction.deserialize(deserializer);
-    const authenticator = TransactionAuthenticator.deserialize(deserializer);
-    return new SignedTransaction(raw_txn, authenticator);
-  }
-}
-
-export abstract class RawTransactionWithData {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): RawTransactionWithData {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return MultiAgentRawTransaction.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for RawTransactionWithData: ${index}`);
-    }
-  }
-}
-
-export class MultiAgentRawTransaction extends RawTransactionWithData {
-  constructor(
-    public readonly raw_txn: RawTransaction,
-    public readonly secondary_signer_addresses: Seq<AccountAddress>,
-  ) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    // enum variant index
-    serializer.serializeU32AsUleb128(0);
-    this.raw_txn.serialize(serializer);
-    serializeVector<TransactionArgument>(this.secondary_signer_addresses, serializer);
-  }
-
-  static load(deserializer: Deserializer): MultiAgentRawTransaction {
-    const rawTxn = RawTransaction.deserialize(deserializer);
-    const secondarySignerAddresses = deserializeVector(deserializer, AccountAddress);
-
-    return new MultiAgentRawTransaction(rawTxn, secondarySignerAddresses);
-  }
-}
-
-export abstract class TransactionPayload {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): TransactionPayload {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return TransactionPayloadScript.load(deserializer);
-      // TODO: change to 1 once ModuleBundle has been removed from rust
-      case 2:
-        return TransactionPayloadEntryFunction.load(deserializer);
-      case 3:
-        return TransactionPayloadMultisig.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for TransactionPayload: ${index}`);
-    }
-  }
-}
-
-export class TransactionPayloadScript extends TransactionPayload {
-  constructor(public readonly value: Script) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionPayloadScript {
-    const value = Script.deserialize(deserializer);
-    return new TransactionPayloadScript(value);
-  }
-}
-
-export class TransactionPayloadEntryFunction extends TransactionPayload {
-  constructor(public readonly value: EntryFunction) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(2);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionPayloadEntryFunction {
-    const value = EntryFunction.deserialize(deserializer);
-    return new TransactionPayloadEntryFunction(value);
-  }
-}
-
-export class TransactionPayloadMultisig extends TransactionPayload {
-  constructor(public readonly value: MultiSig) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(3);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionPayloadMultisig {
-    const value = MultiSig.deserialize(deserializer);
-    return new TransactionPayloadMultisig(value);
-  }
-}
-
-export class ChainId {
-  constructor(public readonly value: Uint8) {}
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU8(this.value);
-  }
-
-  static deserialize(deserializer: Deserializer): ChainId {
-    const value = deserializer.deserializeU8();
-    return new ChainId(value);
-  }
-}
-
-export abstract class TransactionArgument {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): TransactionArgument {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return TransactionArgumentU8.load(deserializer);
-      case 1:
-        return TransactionArgumentU64.load(deserializer);
-      case 2:
-        return TransactionArgumentU128.load(deserializer);
-      case 3:
-        return TransactionArgumentAddress.load(deserializer);
-      case 4:
-        return TransactionArgumentU8Vector.load(deserializer);
-      case 5:
-        return TransactionArgumentBool.load(deserializer);
-      case 6:
-        return TransactionArgumentU16.load(deserializer);
-      case 7:
-        return TransactionArgumentU32.load(deserializer);
-      case 8:
-        return TransactionArgumentU256.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for TransactionArgument: ${index}`);
-    }
-  }
-}
-
-export class TransactionArgumentU8 extends TransactionArgument {
-  constructor(public readonly value: Uint8) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    serializer.serializeU8(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU8 {
-    const value = deserializer.deserializeU8();
-    return new TransactionArgumentU8(value);
-  }
-}
-
-export class TransactionArgumentU16 extends TransactionArgument {
-  constructor(public readonly value: Uint16) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(6);
-    serializer.serializeU16(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU16 {
-    const value = deserializer.deserializeU16();
-    return new TransactionArgumentU16(value);
-  }
-}
-
-export class TransactionArgumentU32 extends TransactionArgument {
-  constructor(public readonly value: Uint16) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(7);
-    serializer.serializeU32(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU32 {
-    const value = deserializer.deserializeU32();
-    return new TransactionArgumentU32(value);
-  }
-}
-
-export class TransactionArgumentU64 extends TransactionArgument {
-  constructor(public readonly value: Uint64) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-    serializer.serializeU64(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU64 {
-    const value = deserializer.deserializeU64();
-    return new TransactionArgumentU64(value);
-  }
-}
-
-export class TransactionArgumentU128 extends TransactionArgument {
-  constructor(public readonly value: Uint128) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(2);
-    serializer.serializeU128(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU128 {
-    const value = deserializer.deserializeU128();
-    return new TransactionArgumentU128(value);
-  }
-}
-
-export class TransactionArgumentU256 extends TransactionArgument {
-  constructor(public readonly value: Uint256) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(8);
-    serializer.serializeU256(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU256 {
-    const value = deserializer.deserializeU256();
-    return new TransactionArgumentU256(value);
-  }
-}
-
-export class TransactionArgumentAddress extends TransactionArgument {
-  constructor(public readonly value: AccountAddress) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(3);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentAddress {
-    const value = AccountAddress.deserialize(deserializer);
-    return new TransactionArgumentAddress(value);
-  }
-}
-
-export class TransactionArgumentU8Vector extends TransactionArgument {
-  constructor(public readonly value: Bytes) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(4);
-    serializer.serializeBytes(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentU8Vector {
-    const value = deserializer.deserializeBytes();
-    return new TransactionArgumentU8Vector(value);
-  }
-}
-
-export class TransactionArgumentBool extends TransactionArgument {
-  constructor(public readonly value: boolean) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(5);
-    serializer.serializeBool(this.value);
-  }
-
-  static load(deserializer: Deserializer): TransactionArgumentBool {
-    const value = deserializer.deserializeBool();
-    return new TransactionArgumentBool(value);
-  }
-}
-
-export abstract class Transaction {
-  abstract serialize(serializer: Serializer): void;
-
-  abstract hash(): Bytes;
-
-  getHashSalt(): Bytes {
-    const hash = sha3Hash.create();
-    hash.update("APTOS::Transaction");
-    return hash.digest();
-  }
-
-  static deserialize(deserializer: Deserializer): Transaction {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return UserTransaction.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for Transaction: ${index}`);
-    }
-  }
-}
-
-export class UserTransaction extends Transaction {
-  constructor(public readonly value: SignedTransaction) {
-    super();
-  }
-
-  hash(): Bytes {
-    const hash = sha3Hash.create();
-    hash.update(this.getHashSalt());
-    hash.update(bcsToBytes(this));
-    return hash.digest();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): UserTransaction {
-    return new UserTransaction(SignedTransaction.deserialize(deserializer));
-  }
-}
diff --git a/m1/JavaScript-client/src/aptos_types/type_tag.ts b/m1/JavaScript-client/src/aptos_types/type_tag.ts
deleted file mode 100644
index 293103605..000000000
--- a/m1/JavaScript-client/src/aptos_types/type_tag.ts
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable max-classes-per-file */
-import { AccountAddress } from "./account_address";
-import { Deserializer, Seq, Serializer, deserializeVector, serializeVector } from "../bcs";
-import { Identifier } from "./identifier";
-
-export abstract class TypeTag {
-  abstract serialize(serializer: Serializer): void;
-
-  static deserialize(deserializer: Deserializer): TypeTag {
-    const index = deserializer.deserializeUleb128AsU32();
-    switch (index) {
-      case 0:
-        return TypeTagBool.load(deserializer);
-      case 1:
-        return TypeTagU8.load(deserializer);
-      case 2:
-        return TypeTagU64.load(deserializer);
-      case 3:
-        return TypeTagU128.load(deserializer);
-      case 4:
-        return TypeTagAddress.load(deserializer);
-      case 5:
-        return TypeTagSigner.load(deserializer);
-      case 6:
-        return TypeTagVector.load(deserializer);
-      case 7:
-        return TypeTagStruct.load(deserializer);
-      case 8:
-        return TypeTagU16.load(deserializer);
-      case 9:
-        return TypeTagU32.load(deserializer);
-      case 10:
-        return TypeTagU256.load(deserializer);
-      default:
-        throw new Error(`Unknown variant index for TypeTag: ${index}`);
-    }
-  }
-}
-
-export class TypeTagBool extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(0);
-  }
-
-  static load(deserializer: Deserializer): TypeTagBool {
-    return new TypeTagBool();
-  }
-}
-
-export class TypeTagU8 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU8 {
-    return new TypeTagU8();
-  }
-}
-
-export class TypeTagU16 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU16 {
-    return new TypeTagU16();
-  }
-}
-
-export class TypeTagU32 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU32 {
-    return new TypeTagU32();
-  }
-}
-
-export class TypeTagU64 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(2);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU64 {
-    return new TypeTagU64();
-  }
-}
-
-export class TypeTagU128 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(3);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU128 {
-    return new TypeTagU128();
-  }
-}
-
-export class TypeTagU256 extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(1);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagU256 {
-    return new TypeTagU256();
-  }
-}
-
-export class TypeTagAddress extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(4);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagAddress {
-    return new TypeTagAddress();
-  }
-}
-
-export class TypeTagSigner extends TypeTag {
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(5);
-  }
-
-  static load(_deserializer: Deserializer): TypeTagSigner {
-    return new TypeTagSigner();
-  }
-}
-
-export class TypeTagVector extends TypeTag {
-  constructor(public readonly value: TypeTag) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(6);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TypeTagVector {
-    const value = TypeTag.deserialize(deserializer);
-    return new TypeTagVector(value);
-  }
-}
-
-export class TypeTagStruct extends TypeTag {
-  constructor(public readonly value: StructTag) {
-    super();
-  }
-
-  serialize(serializer: Serializer): void {
-    serializer.serializeU32AsUleb128(7);
-    this.value.serialize(serializer);
-  }
-
-  static load(deserializer: Deserializer): TypeTagStruct {
-    const value = StructTag.deserialize(deserializer);
-    return new TypeTagStruct(value);
-  }
-
-  isStringTypeTag(): boolean {
-    if (
-      this.value.module_name.value === "string" &&
-      this.value.name.value === "String" &&
-      this.value.address.toHexString() === AccountAddress.fromHex("0x1").toHexString()
-    ) {
-      return true;
-    }
-    return false;
-  }
-}
-
-export class StructTag {
-  constructor(
-    public readonly address: AccountAddress,
-    public readonly module_name: Identifier,
-    public readonly name: Identifier,
-    public readonly type_args: Seq<TypeTag>,
-  ) {}
-
-  /**
-   * Converts a string literal to a StructTag
-   * @param structTag String literal in format "AcountAddress::module_name::ResourceName",
-   *   e.g. "0x1::aptos_coin::AptosCoin"
-   * @returns
-   */
-  static fromString(structTag: string): StructTag {
-    // Use the TypeTagParser to parse the string literal into a TypeTagStruct
-    const typeTagStruct = new TypeTagParser(structTag).parseTypeTag() as TypeTagStruct;
-
-    // Convert and return as a StructTag
-    return new StructTag(
-      typeTagStruct.value.address,
-      typeTagStruct.value.module_name,
-      typeTagStruct.value.name,
-      typeTagStruct.value.type_args,
-    );
-  }
-
-  serialize(serializer: Serializer): void {
-    this.address.serialize(serializer);
-    this.module_name.serialize(serializer);
-    this.name.serialize(serializer);
-    serializeVector<TypeTag>(this.type_args, serializer);
-  }
-
-  static deserialize(deserializer: Deserializer): StructTag {
-    const address = AccountAddress.deserialize(deserializer);
-    const moduleName = Identifier.deserialize(deserializer);
-    const name = Identifier.deserialize(deserializer);
-    const typeArgs = deserializeVector(deserializer, TypeTag);
-    return new StructTag(address, moduleName, name, typeArgs);
-  }
-}
-
-export const stringStructTag = new StructTag(
-  AccountAddress.fromHex("0x1"),
-  new Identifier("string"),
-  new Identifier("String"),
-  [],
-);
-
-function bail(message: string) {
-  throw new TypeTagParserError(message);
-}
-
-function isWhiteSpace(c: string): boolean {
-  if (c.match(/\s/)) {
-    return true;
-  }
-  return false;
-}
-
-function isValidAlphabetic(c: string): boolean {
-  if (c.match(/[_A-Za-z0-9]/g)) {
-    return true;
-  }
-  return false;
-}
-
-// Generic format is T<digits> - for example T1, T2, T10
-function isGeneric(c: string): boolean {
-  if (c.match(/T\d+/g)) {
-    return true;
-  }
-  return false;
-}
-
-type TokenType = string;
-type TokenValue = string;
-type Token = [TokenType, TokenValue];
-
-// Returns Token and Token byte size
-function nextToken(tagStr: string, pos: number): [Token, number] {
-  const c = tagStr[pos];
-  if (c === ":") {
-    if (tagStr.slice(pos, pos + 2) === "::") {
-      return [["COLON", "::"], 2];
-    }
-    bail("Unrecognized token.");
-  } else if (c === "<") {
-    return [["LT", "<"], 1];
-  } else if (c === ">") {
-    return [["GT", ">"], 1];
-  } else if (c === ",") {
-    return [["COMMA", ","], 1];
-  } else if (isWhiteSpace(c)) {
-    let res = "";
-    for (let i = pos; i < tagStr.length; i += 1) {
-      const char = tagStr[i];
-      if (isWhiteSpace(char)) {
-        res = `${res}${char}`;
-      } else {
-        break;
-      }
-    }
-    return [["SPACE", res], res.length];
-  } else if (isValidAlphabetic(c)) {
-    let res = "";
-    for (let i = pos; i < tagStr.length; i += 1) {
-      const char = tagStr[i];
-      if (isValidAlphabetic(char)) {
-        res = `${res}${char}`;
-      } else {
-        break;
-      }
-    }
-    if (isGeneric(res)) {
-      return [["GENERIC", res], res.length];
-    }
-    return [["IDENT", res], res.length];
-  }
-  throw new Error("Unrecognized token.");
-}
-
-function tokenize(tagStr: string): Token[] {
-  let pos = 0;
-  const tokens = [];
-  while (pos < tagStr.length) {
-    const [token, size] = nextToken(tagStr, pos);
-    if (token[0] !== "SPACE") {
-      tokens.push(token);
-    }
-    pos += size;
-  }
-  return tokens;
-}
-
-/**
- * Parser to parse a type tag string
- */
-export class TypeTagParser {
-  private readonly tokens: Token[];
-
-  private readonly typeTags: string[] = [];
-
-  constructor(tagStr: string, typeTags?: string[]) {
-    this.tokens = tokenize(tagStr);
-    this.typeTags = typeTags || [];
-  }
-
-  private consume(targetToken: string) {
-    const token = this.tokens.shift();
-    if (!token || token[1] !== targetToken) {
-      bail("Invalid type tag.");
-    }
-  }
-
-  private parseCommaList(endToken: TokenValue, allowTraillingComma: boolean): TypeTag[] {
-    const res: TypeTag[] = [];
-    if (this.tokens.length <= 0) {
-      bail("Invalid type tag.");
-    }
-
-    while (this.tokens[0][1] !== endToken) {
-      res.push(this.parseTypeTag());
-
-      if (this.tokens.length > 0 && this.tokens[0][1] === endToken) {
-        break;
-      }
-
-      this.consume(",");
-      if (this.tokens.length > 0 && this.tokens[0][1] === endToken && allowTraillingComma) {
-        break;
-      }
-
-      if (this.tokens.length <= 0) {
-        bail("Invalid type tag.");
-      }
-    }
-    return res;
-  }
-
-  parseTypeTag(): TypeTag {
-    if (this.tokens.length === 0) {
-      bail("Invalid type tag.");
-    }
-
-    // Pop left most element out
-    const [tokenTy, tokenVal] = this.tokens.shift()!;
-
-    if (tokenVal === "u8") {
-      return new TypeTagU8();
-    }
-    if (tokenVal === "u16") {
-      return new TypeTagU16();
-    }
-    if (tokenVal === "u32") {
-      return new TypeTagU32();
-    }
-    if (tokenVal === "u64") {
-      return new TypeTagU64();
-    }
-    if (tokenVal === "u128") {
-      return new TypeTagU128();
-    }
-    if (tokenVal === "u256") {
-      return new TypeTagU256();
-    }
-    if (tokenVal === "bool") {
-      return new TypeTagBool();
-    }
-    if (tokenVal === "address") {
-      return new TypeTagAddress();
-    }
-    if (tokenVal === "vector") {
-      this.consume("<");
-      const res = this.parseTypeTag();
-      this.consume(">");
-      return new TypeTagVector(res);
-    }
-    if (tokenVal === "string") {
-      return new StructTag(AccountAddress.fromHex("0x1"), new Identifier("string"), new Identifier("String"), []);
-    }
-    if (tokenTy === "IDENT" && (tokenVal.startsWith("0x") || tokenVal.startsWith("0X"))) {
-      const address = tokenVal;
-      this.consume("::");
-      const [moduleTokenTy, module] = this.tokens.shift()!;
-      if (moduleTokenTy !== "IDENT") {
-        bail("Invalid type tag.");
-      }
-      this.consume("::");
-      const [nameTokenTy, name] = this.tokens.shift()!;
-      if (nameTokenTy !== "IDENT") {
-        bail("Invalid type tag.");
-      }
-
-      // an Object `0x1::object::Object<T>` doesn't hold a real type, it points to an address
-      // therefore, we parse it as an address and dont need to care/parse the `T` type
-      if (module === "object" && name === "Object") {
-        // to support a nested type tag, i.e 0x1::some_module::SomeResource<0x1::object::Object<T>>, we want
-        // to remove the `<T>` part from the tokens list so we dont parse it and can keep parse the type tag.
-        this.tokens.splice(0, 3);
-        return new TypeTagAddress();
-      }
-
-      let tyTags: TypeTag[] = [];
-      // Check if the struct has ty args
-      if (this.tokens.length > 0 && this.tokens[0][1] === "<") {
-        this.consume("<");
-        tyTags = this.parseCommaList(">", true);
-        this.consume(">");
-      }
-
-      const structTag = new StructTag(
-        AccountAddress.fromHex(address),
-        new Identifier(module),
-        new Identifier(name),
-        tyTags,
-      );
-      return new TypeTagStruct(structTag);
-    }
-    if (tokenTy === "GENERIC") {
-      if (this.typeTags.length === 0) {
-        bail("Can't convert generic type since no typeTags were specified.");
-      }
-      // a generic tokenVal has the format of `T<digit>`, for example `T1`.
-      // The digit (i.e 1) indicates the the index of this type in the typeTags array.
-      // For a tokenVal == T1, should be parsed as the type in typeTags[1]
-      const idx = parseInt(tokenVal.substring(1), 10);
-      return new TypeTagParser(this.typeTags[idx]).parseTypeTag();
-    }
-
-    throw new Error("Invalid type tag.");
-  }
-}
-
-export class TypeTagParserError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "TypeTagParserError";
-  }
-}
diff --git a/m1/JavaScript-client/src/bcs/consts.ts b/m1/JavaScript-client/src/bcs/consts.ts
deleted file mode 100644
index 85ed2a8bf..000000000
--- a/m1/JavaScript-client/src/bcs/consts.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Uint128, Uint16, Uint32, Uint64, Uint8, Uint256 } from "./types";
-
-// Upper bound values for uint8, uint16, uint64 and uint128
-export const MAX_U8_NUMBER: Uint8 = 2 ** 8 - 1;
-export const MAX_U16_NUMBER: Uint16 = 2 ** 16 - 1;
-export const MAX_U32_NUMBER: Uint32 = 2 ** 32 - 1;
-export const MAX_U64_BIG_INT: Uint64 = BigInt(2 ** 64) - BigInt(1);
-export const MAX_U128_BIG_INT: Uint128 = BigInt(2 ** 128) - BigInt(1);
-export const MAX_U256_BIG_INT: Uint256 = BigInt(2 ** 256) - BigInt(1);
diff --git a/m1/JavaScript-client/src/bcs/deserializer.ts b/m1/JavaScript-client/src/bcs/deserializer.ts
deleted file mode 100644
index 337011a63..000000000
--- a/m1/JavaScript-client/src/bcs/deserializer.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable no-bitwise */
-import { MAX_U32_NUMBER } from "./consts";
-import { Bytes, Uint128, Uint16, Uint256, Uint32, Uint64, Uint8 } from "./types";
-
-export class Deserializer {
-  private buffer: ArrayBuffer;
-
-  private offset: number;
-
-  constructor(data: Bytes) {
-    // copies data to prevent outside mutation of buffer.
-    this.buffer = new ArrayBuffer(data.length);
-    new Uint8Array(this.buffer).set(data, 0);
-    this.offset = 0;
-  }
-
-  private read(length: number): ArrayBuffer {
-    if (this.offset + length > this.buffer.byteLength) {
-      throw new Error("Reached to the end of buffer");
-    }
-
-    const bytes = this.buffer.slice(this.offset, this.offset + length);
-    this.offset += length;
-    return bytes;
-  }
-
-  /**
-   * Deserializes a string. UTF8 string is supported. Reads the string's bytes length "l" first,
-   * and then reads "l" bytes of content. Decodes the byte array into a string.
-   *
-   * BCS layout for "string": string_length | string_content. string_length is the bytes length of
-   * the string that is uleb128 encoded. string_length is a u32 integer.
-   *
-   * @example
-   * ```ts
-   * const deserializer = new Deserializer(new Uint8Array([24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e,
-   * 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2, 0x88, 0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab]));
-   * assert(deserializer.deserializeStr() === "çå∞≠¢õß∂ƒ∫");
-   * ```
-   */
-  deserializeStr(): string {
-    const value = this.deserializeBytes();
-    const textDecoder = new TextDecoder();
-    return textDecoder.decode(value);
-  }
-
-  /**
-   * Deserializes an array of bytes.
-   *
-   * BCS layout for "bytes": bytes_length | bytes. bytes_length is the length of the bytes array that is
-   * uleb128 encoded. bytes_length is a u32 integer.
-   */
-  deserializeBytes(): Bytes {
-    const len = this.deserializeUleb128AsU32();
-    return new Uint8Array(this.read(len));
-  }
-
-  /**
-   * Deserializes an array of bytes. The number of bytes to read is already known.
-   *
-   */
-  deserializeFixedBytes(len: number): Bytes {
-    return new Uint8Array(this.read(len));
-  }
-
-  /**
-   * Deserializes a boolean value.
-   *
-   * BCS layout for "boolean": One byte. "0x01" for True and "0x00" for False.
-   */
-  deserializeBool(): boolean {
-    const bool = new Uint8Array(this.read(1))[0];
-    if (bool !== 1 && bool !== 0) {
-      throw new Error("Invalid boolean value");
-    }
-    return bool === 1;
-  }
-
-  /**
-   * Deserializes a uint8 number.
-   *
-   * BCS layout for "uint8": One byte. Binary format in little-endian representation.
-   */
-  deserializeU8(): Uint8 {
-    return new DataView(this.read(1)).getUint8(0);
-  }
-
-  /**
-   * Deserializes a uint16 number.
-   *
-   * BCS layout for "uint16": Two bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const deserializer = new Deserializer(new Uint8Array([0x34, 0x12]));
-   * assert(deserializer.deserializeU16() === 4660);
-   * ```
-   */
-  deserializeU16(): Uint16 {
-    return new DataView(this.read(2)).getUint16(0, true);
-  }
-
-  /**
-   * Deserializes a uint32 number.
-   *
-   * BCS layout for "uint32": Four bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const deserializer = new Deserializer(new Uint8Array([0x78, 0x56, 0x34, 0x12]));
-   * assert(deserializer.deserializeU32() === 305419896);
-   * ```
-   */
-  deserializeU32(): Uint32 {
-    return new DataView(this.read(4)).getUint32(0, true);
-  }
-
-  /**
-   * Deserializes a uint64 number.
-   *
-   * BCS layout for "uint64": Eight bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const deserializer = new Deserializer(new Uint8Array([0x00, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12]));
-   * assert(deserializer.deserializeU64() === 1311768467750121216);
-   * ```
-   */
-  deserializeU64(): Uint64 {
-    const low = this.deserializeU32();
-    const high = this.deserializeU32();
-
-    // combine the two 32-bit values and return (little endian)
-    return BigInt((BigInt(high) << BigInt(32)) | BigInt(low));
-  }
-
-  /**
-   * Deserializes a uint128 number.
-   *
-   * BCS layout for "uint128": Sixteen bytes. Binary format in little-endian representation.
-   */
-  deserializeU128(): Uint128 {
-    const low = this.deserializeU64();
-    const high = this.deserializeU64();
-
-    // combine the two 64-bit values and return (little endian)
-    return BigInt((high << BigInt(64)) | low);
-  }
-
-  /**
-   * Deserializes a uint256 number.
-   *
-   * BCS layout for "uint256": Thirty-two bytes. Binary format in little-endian representation.
-   */
-  deserializeU256(): Uint256 {
-    const low = this.deserializeU128();
-    const high = this.deserializeU128();
-
-    // combine the two 128-bit values and return (little endian)
-    return BigInt((high << BigInt(128)) | low);
-  }
-
-  /**
-   * Deserializes a uleb128 encoded uint32 number.
-   *
-   * BCS use uleb128 encoding in two cases: (1) lengths of variable-length sequences and (2) tags of enum values
-   */
-  deserializeUleb128AsU32(): Uint32 {
-    let value: bigint = BigInt(0);
-    let shift = 0;
-
-    while (value < MAX_U32_NUMBER) {
-      const byte = this.deserializeU8();
-      value |= BigInt(byte & 0x7f) << BigInt(shift);
-
-      if ((byte & 0x80) === 0) {
-        break;
-      }
-      shift += 7;
-    }
-
-    if (value > MAX_U32_NUMBER) {
-      throw new Error("Overflow while parsing uleb128-encoded uint32 value");
-    }
-
-    return Number(value);
-  }
-}
diff --git a/m1/JavaScript-client/src/bcs/helper.ts b/m1/JavaScript-client/src/bcs/helper.ts
deleted file mode 100644
index 21059c0ae..000000000
--- a/m1/JavaScript-client/src/bcs/helper.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Deserializer } from "./deserializer";
-import { Serializer } from "./serializer";
-import { AnyNumber, Bytes, Seq, Uint16, Uint32, Uint8 } from "./types";
-
-interface Serializable {
-  serialize(serializer: Serializer): void;
-}
-
-/**
- * Serializes a vector values that are "Serializable".
- */
-export function serializeVector<T extends Serializable>(value: Seq<T>, serializer: Serializer): void {
-  serializer.serializeU32AsUleb128(value.length);
-  value.forEach((item: T) => {
-    item.serialize(serializer);
-  });
-}
-
-/**
- * Serializes a vector with specified item serialization function.
- * Very dynamic function and bypasses static typechecking.
- */
-export function serializeVectorWithFunc(value: any[], func: string): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU32AsUleb128(value.length);
-  const f = (serializer as any)[func];
-  value.forEach((item) => {
-    f.call(serializer, item);
-  });
-  return serializer.getBytes();
-}
-
-/**
- * Deserializes a vector of values.
- */
-export function deserializeVector(deserializer: Deserializer, cls: any): any[] {
-  const length = deserializer.deserializeUleb128AsU32();
-  const list: Seq<typeof cls> = [];
-  for (let i = 0; i < length; i += 1) {
-    list.push(cls.deserialize(deserializer));
-  }
-  return list;
-}
-
-export function bcsToBytes<T extends Serializable>(value: T): Bytes {
-  const serializer = new Serializer();
-  value.serialize(serializer);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeUint64(value: AnyNumber): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU64(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeU8(value: Uint8): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU8(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeU16(value: Uint16): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU16(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeU32(value: Uint32): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU32(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeU128(value: AnyNumber): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeU128(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeBool(value: boolean): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeBool(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeStr(value: string): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeStr(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeBytes(value: Bytes): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeBytes(value);
-  return serializer.getBytes();
-}
-
-export function bcsSerializeFixedBytes(value: Bytes): Bytes {
-  const serializer = new Serializer();
-  serializer.serializeFixedBytes(value);
-  return serializer.getBytes();
-}
diff --git a/m1/JavaScript-client/src/bcs/index.ts b/m1/JavaScript-client/src/bcs/index.ts
deleted file mode 100644
index db399051d..000000000
--- a/m1/JavaScript-client/src/bcs/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export * from "./types";
-export * from "./serializer";
-export * from "./deserializer";
-export * from "./helper";
diff --git a/m1/JavaScript-client/src/bcs/serializer.ts b/m1/JavaScript-client/src/bcs/serializer.ts
deleted file mode 100644
index b60bdbb66..000000000
--- a/m1/JavaScript-client/src/bcs/serializer.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable no-bitwise */
-import {
-  MAX_U128_BIG_INT,
-  MAX_U16_NUMBER,
-  MAX_U32_NUMBER,
-  MAX_U64_BIG_INT,
-  MAX_U8_NUMBER,
-  MAX_U256_BIG_INT,
-} from "./consts";
-import { AnyNumber, Bytes, Uint16, Uint32, Uint8 } from "./types";
-
-export class Serializer {
-  private buffer: ArrayBuffer;
-
-  private offset: number;
-
-  constructor() {
-    this.buffer = new ArrayBuffer(64);
-    this.offset = 0;
-  }
-
-  private ensureBufferWillHandleSize(bytes: number) {
-    while (this.buffer.byteLength < this.offset + bytes) {
-      const newBuffer = new ArrayBuffer(this.buffer.byteLength * 2);
-      new Uint8Array(newBuffer).set(new Uint8Array(this.buffer));
-      this.buffer = newBuffer;
-    }
-  }
-
-  protected serialize(values: Bytes) {
-    this.ensureBufferWillHandleSize(values.length);
-    new Uint8Array(this.buffer, this.offset).set(values);
-    this.offset += values.length;
-  }
-
-  private serializeWithFunction(
-    fn: (byteOffset: number, value: number, littleEndian?: boolean) => void,
-    bytesLength: number,
-    value: number,
-  ) {
-    this.ensureBufferWillHandleSize(bytesLength);
-    const dv = new DataView(this.buffer, this.offset);
-    fn.apply(dv, [0, value, true]);
-    this.offset += bytesLength;
-  }
-
-  /**
-   * Serializes a string. UTF8 string is supported. Serializes the string's bytes length "l" first,
-   * and then serializes "l" bytes of the string content.
-   *
-   * BCS layout for "string": string_length | string_content. string_length is the bytes length of
-   * the string that is uleb128 encoded. string_length is a u32 integer.
-   *
-   * @example
-   * ```ts
-   * const serializer = new Serializer();
-   * serializer.serializeStr("çå∞≠¢õß∂ƒ∫");
-   * assert(serializer.getBytes() === new Uint8Array([24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e,
-   * 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2, 0x88, 0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab]));
-   * ```
-   */
-  serializeStr(value: string): void {
-    const textEncoder = new TextEncoder();
-    this.serializeBytes(textEncoder.encode(value));
-  }
-
-  /**
-   * Serializes an array of bytes.
-   *
-   * BCS layout for "bytes": bytes_length | bytes. bytes_length is the length of the bytes array that is
-   * uleb128 encoded. bytes_length is a u32 integer.
-   */
-  serializeBytes(value: Bytes): void {
-    this.serializeU32AsUleb128(value.length);
-    this.serialize(value);
-  }
-
-  /**
-   * Serializes an array of bytes with known length. Therefore length doesn't need to be
-   * serialized to help deserialization.  When deserializing, the number of
-   * bytes to deserialize needs to be passed in.
-   */
-  serializeFixedBytes(value: Bytes): void {
-    this.serialize(value);
-  }
-
-  /**
-   * Serializes a boolean value.
-   *
-   * BCS layout for "boolean": One byte. "0x01" for True and "0x00" for False.
-   */
-  serializeBool(value: boolean): void {
-    if (typeof value !== "boolean") {
-      throw new Error("Value needs to be a boolean");
-    }
-    const byteValue = value ? 1 : 0;
-    this.serialize(new Uint8Array([byteValue]));
-  }
-
-  /**
-   * Serializes a uint8 number.
-   *
-   * BCS layout for "uint8": One byte. Binary format in little-endian representation.
-   */
-  @checkNumberRange(0, MAX_U8_NUMBER)
-  serializeU8(value: Uint8): void {
-    this.serialize(new Uint8Array([value]));
-  }
-
-  /**
-   * Serializes a uint16 number.
-   *
-   * BCS layout for "uint16": Two bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const serializer = new Serializer();
-   * serializer.serializeU16(4660);
-   * assert(serializer.getBytes() === new Uint8Array([0x34, 0x12]));
-   * ```
-   */
-  @checkNumberRange(0, MAX_U16_NUMBER)
-  serializeU16(value: Uint16): void {
-    this.serializeWithFunction(DataView.prototype.setUint16, 2, value);
-  }
-
-  /**
-   * Serializes a uint32 number.
-   *
-   * BCS layout for "uint32": Four bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const serializer = new Serializer();
-   * serializer.serializeU32(305419896);
-   * assert(serializer.getBytes() === new Uint8Array([0x78, 0x56, 0x34, 0x12]));
-   * ```
-   */
-  @checkNumberRange(0, MAX_U32_NUMBER)
-  serializeU32(value: Uint32): void {
-    this.serializeWithFunction(DataView.prototype.setUint32, 4, value);
-  }
-
-  /**
-   * Serializes a uint64 number.
-   *
-   * BCS layout for "uint64": Eight bytes. Binary format in little-endian representation.
-   * @example
-   * ```ts
-   * const serializer = new Serializer();
-   * serializer.serializeU64(1311768467750121216);
-   * assert(serializer.getBytes() === new Uint8Array([0x00, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12]));
-   * ```
-   */
-  @checkNumberRange(BigInt(0), MAX_U64_BIG_INT)
-  serializeU64(value: AnyNumber): void {
-    const low = BigInt(value.toString()) & BigInt(MAX_U32_NUMBER);
-    const high = BigInt(value.toString()) >> BigInt(32);
-
-    // write little endian number
-    this.serializeU32(Number(low));
-    this.serializeU32(Number(high));
-  }
-
-  /**
-   * Serializes a uint128 number.
-   *
-   * BCS layout for "uint128": Sixteen bytes. Binary format in little-endian representation.
-   */
-  @checkNumberRange(BigInt(0), MAX_U128_BIG_INT)
-  serializeU128(value: AnyNumber): void {
-    const low = BigInt(value.toString()) & MAX_U64_BIG_INT;
-    const high = BigInt(value.toString()) >> BigInt(64);
-
-    // write little endian number
-    this.serializeU64(low);
-    this.serializeU64(high);
-  }
-
-  /**
-   * Serializes a uint256 number.
-   *
-   * BCS layout for "uint256": Sixteen bytes. Binary format in little-endian representation.
-   */
-  @checkNumberRange(BigInt(0), MAX_U256_BIG_INT)
-  serializeU256(value: AnyNumber): void {
-    const low = BigInt(value.toString()) & MAX_U128_BIG_INT;
-    const high = BigInt(value.toString()) >> BigInt(128);
-
-    // write little endian number
-    this.serializeU128(low);
-    this.serializeU128(high);
-  }
-
-  /**
-   * Serializes a uint32 number with uleb128.
-   *
-   * BCS use uleb128 encoding in two cases: (1) lengths of variable-length sequences and (2) tags of enum values
-   */
-  @checkNumberRange(0, MAX_U32_NUMBER)
-  serializeU32AsUleb128(val: Uint32): void {
-    let value = val;
-    const valueArray = [];
-    while (value >>> 7 !== 0) {
-      valueArray.push((value & 0x7f) | 0x80);
-      value >>>= 7;
-    }
-    valueArray.push(value);
-    this.serialize(new Uint8Array(valueArray));
-  }
-
-  /**
-   * Returns the buffered bytes
-   */
-  getBytes(): Bytes {
-    return new Uint8Array(this.buffer).slice(0, this.offset);
-  }
-}
-
-/**
- * Creates a decorator to make sure the arg value of the decorated function is within a range.
- * @param minValue The arg value of decorated function must >= minValue
- * @param maxValue The arg value of decorated function must <= maxValue
- * @param message Error message
- */
-function checkNumberRange<T extends AnyNumber>(minValue: T, maxValue: T, message?: string) {
-  return (target: unknown, propertyKey: string, descriptor: PropertyDescriptor) => {
-    const childFunction = descriptor.value;
-    // eslint-disable-next-line no-param-reassign
-    descriptor.value = function deco(value: AnyNumber) {
-      const valueBigInt = BigInt(value.toString());
-      if (valueBigInt > BigInt(maxValue.toString()) || valueBigInt < BigInt(minValue.toString())) {
-        throw new Error(message || "Value is out of range");
-      }
-      childFunction.apply(this, [value]);
-    };
-    return descriptor;
-  };
-}
diff --git a/m1/JavaScript-client/src/bcs/types.ts b/m1/JavaScript-client/src/bcs/types.ts
deleted file mode 100644
index f834aa976..000000000
--- a/m1/JavaScript-client/src/bcs/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export type Seq<T> = T[];
-
-export type Uint8 = number;
-export type Uint16 = number;
-export type Uint32 = number;
-export type Uint64 = bigint;
-export type Uint128 = bigint;
-export type Uint256 = bigint;
-export type AnyNumber = bigint | number;
-export type Bytes = Uint8Array;
diff --git a/m1/JavaScript-client/src/generated/AptosGeneratedClient.ts b/m1/JavaScript-client/src/generated/AptosGeneratedClient.ts
deleted file mode 100644
index d7d0952b9..000000000
--- a/m1/JavaScript-client/src/generated/AptosGeneratedClient.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { BaseHttpRequest } from './core/BaseHttpRequest';
-import type { OpenAPIConfig } from './core/OpenAPI';
-import { AxiosHttpRequest } from './core/AxiosHttpRequest';
-
-import { AccountsService } from './services/AccountsService';
-import { BlocksService } from './services/BlocksService';
-import { EventsService } from './services/EventsService';
-import { GeneralService } from './services/GeneralService';
-import { TablesService } from './services/TablesService';
-import { TransactionsService } from './services/TransactionsService';
-import { ViewService } from './services/ViewService';
-
-type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
-
-export class AptosGeneratedClient {
-
-    public readonly accounts: AccountsService;
-    public readonly blocks: BlocksService;
-    public readonly events: EventsService;
-    public readonly general: GeneralService;
-    public readonly tables: TablesService;
-    public readonly transactions: TransactionsService;
-    public readonly view: ViewService;
-
-    public readonly request: BaseHttpRequest;
-
-    constructor(config?: Partial<OpenAPIConfig>, HttpRequest: HttpRequestConstructor = AxiosHttpRequest) {
-        this.request = new HttpRequest({
-            BASE: config?.BASE ?? '/v1',
-            VERSION: config?.VERSION ?? '1.2.0',
-            WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
-            CREDENTIALS: config?.CREDENTIALS ?? 'include',
-            TOKEN: config?.TOKEN,
-            USERNAME: config?.USERNAME,
-            PASSWORD: config?.PASSWORD,
-            HEADERS: config?.HEADERS,
-            ENCODE_PATH: config?.ENCODE_PATH,
-        });
-
-        this.accounts = new AccountsService(this.request);
-        this.blocks = new BlocksService(this.request);
-        this.events = new EventsService(this.request);
-        this.general = new GeneralService(this.request);
-        this.tables = new TablesService(this.request);
-        this.transactions = new TransactionsService(this.request);
-        this.view = new ViewService(this.request);
-    }
-}
-
diff --git a/m1/JavaScript-client/src/generated/core/ApiError.ts b/m1/JavaScript-client/src/generated/core/ApiError.ts
deleted file mode 100644
index 99d792996..000000000
--- a/m1/JavaScript-client/src/generated/core/ApiError.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: any;
-    public readonly request: ApiRequestOptions;
-
-    constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
-        super(message);
-
-        this.name = 'ApiError';
-        this.url = response.url;
-        this.status = response.status;
-        this.statusText = response.statusText;
-        this.body = response.body;
-        this.request = request;
-    }
-}
diff --git a/m1/JavaScript-client/src/generated/core/ApiRequestOptions.ts b/m1/JavaScript-client/src/generated/core/ApiRequestOptions.ts
deleted file mode 100644
index c7b77538c..000000000
--- a/m1/JavaScript-client/src/generated/core/ApiRequestOptions.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type ApiRequestOptions = {
-    readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
-    readonly url: string;
-    readonly path?: Record<string, any>;
-    readonly cookies?: Record<string, any>;
-    readonly headers?: Record<string, any>;
-    readonly query?: Record<string, any>;
-    readonly formData?: Record<string, any>;
-    readonly body?: any;
-    readonly mediaType?: string;
-    readonly responseHeader?: string;
-    readonly errors?: Record<number, string>;
-};
diff --git a/m1/JavaScript-client/src/generated/core/ApiResult.ts b/m1/JavaScript-client/src/generated/core/ApiResult.ts
deleted file mode 100644
index b095dc770..000000000
--- a/m1/JavaScript-client/src/generated/core/ApiResult.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type ApiResult = {
-    readonly url: string;
-    readonly ok: boolean;
-    readonly status: number;
-    readonly statusText: string;
-    readonly body: any;
-};
diff --git a/m1/JavaScript-client/src/generated/core/AxiosHttpRequest.ts b/m1/JavaScript-client/src/generated/core/AxiosHttpRequest.ts
deleted file mode 100644
index 9f6cb3144..000000000
--- a/m1/JavaScript-client/src/generated/core/AxiosHttpRequest.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import { BaseHttpRequest } from './BaseHttpRequest';
-import type { CancelablePromise } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
-import { request as __request } from './request';
-
-export class AxiosHttpRequest extends BaseHttpRequest {
-
-    constructor(config: OpenAPIConfig) {
-        super(config);
-    }
-
-    /**
-     * Request method
-     * @param options The request options from the service
-     * @returns CancelablePromise<T>
-     * @throws ApiError
-     */
-    public request<T>(options: ApiRequestOptions): CancelablePromise<T> {
-        return __request(this.config, options);
-    }
-}
diff --git a/m1/JavaScript-client/src/generated/core/BaseHttpRequest.ts b/m1/JavaScript-client/src/generated/core/BaseHttpRequest.ts
deleted file mode 100644
index 1b9700475..000000000
--- a/m1/JavaScript-client/src/generated/core/BaseHttpRequest.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { CancelablePromise } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
-
-export abstract class BaseHttpRequest {
-
-    constructor(public readonly config: OpenAPIConfig) {}
-
-    public abstract request<T>(options: ApiRequestOptions): CancelablePromise<T>;
-}
diff --git a/m1/JavaScript-client/src/generated/core/CancelablePromise.ts b/m1/JavaScript-client/src/generated/core/CancelablePromise.ts
deleted file mode 100644
index 26ad30391..000000000
--- a/m1/JavaScript-client/src/generated/core/CancelablePromise.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export class CancelError extends Error {
-
-    constructor(message: string) {
-        super(message);
-        this.name = 'CancelError';
-    }
-
-    public get isCancelled(): boolean {
-        return true;
-    }
-}
-
-export interface OnCancel {
-    readonly isResolved: boolean;
-    readonly isRejected: boolean;
-    readonly isCancelled: boolean;
-
-    (cancelHandler: () => void): void;
-}
-
-export class CancelablePromise<T> implements Promise<T> {
-    readonly [Symbol.toStringTag]!: string;
-
-    private _isResolved: boolean;
-    private _isRejected: boolean;
-    private _isCancelled: boolean;
-    private readonly _cancelHandlers: (() => void)[];
-    private readonly _promise: Promise<T>;
-    private _resolve?: (value: T | PromiseLike<T>) => void;
-    private _reject?: (reason?: any) => void;
-
-    constructor(
-        executor: (
-            resolve: (value: T | PromiseLike<T>) => void,
-            reject: (reason?: any) => void,
-            onCancel: OnCancel
-        ) => void
-    ) {
-        this._isResolved = false;
-        this._isRejected = false;
-        this._isCancelled = false;
-        this._cancelHandlers = [];
-        this._promise = new Promise<T>((resolve, reject) => {
-            this._resolve = resolve;
-            this._reject = reject;
-
-            const onResolve = (value: T | PromiseLike<T>): void => {
-                if (this._isResolved || this._isRejected || this._isCancelled) {
-                    return;
-                }
-                this._isResolved = true;
-                this._resolve?.(value);
-            };
-
-            const onReject = (reason?: any): void => {
-                if (this._isResolved || this._isRejected || this._isCancelled) {
-                    return;
-                }
-                this._isRejected = true;
-                this._reject?.(reason);
-            };
-
-            const onCancel = (cancelHandler: () => void): void => {
-                if (this._isResolved || this._isRejected || this._isCancelled) {
-                    return;
-                }
-                this._cancelHandlers.push(cancelHandler);
-            };
-
-            Object.defineProperty(onCancel, 'isResolved', {
-                get: (): boolean => this._isResolved,
-            });
-
-            Object.defineProperty(onCancel, 'isRejected', {
-                get: (): boolean => this._isRejected,
-            });
-
-            Object.defineProperty(onCancel, 'isCancelled', {
-                get: (): boolean => this._isCancelled,
-            });
-
-            return executor(onResolve, onReject, onCancel as OnCancel);
-        });
-    }
-
-    public then<TResult1 = T, TResult2 = never>(
-        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
-        onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
-    ): Promise<TResult1 | TResult2> {
-        return this._promise.then(onFulfilled, onRejected);
-    }
-
-    public catch<TResult = never>(
-        onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-    ): Promise<T | TResult> {
-        return this._promise.catch(onRejected);
-    }
-
-    public finally(onFinally?: (() => void) | null): Promise<T> {
-        return this._promise.finally(onFinally);
-    }
-
-    public cancel(): void {
-        if (this._isResolved || this._isRejected || this._isCancelled) {
-            return;
-        }
-        this._isCancelled = true;
-        if (this._cancelHandlers.length) {
-            try {
-                for (const cancelHandler of this._cancelHandlers) {
-                    cancelHandler();
-                }
-            } catch (error) {
-                console.warn('Cancellation threw an error', error);
-                return;
-            }
-        }
-        this._cancelHandlers.length = 0;
-        this._reject?.(new CancelError('Request aborted'));
-    }
-
-    public get isCancelled(): boolean {
-        return this._isCancelled;
-    }
-}
diff --git a/m1/JavaScript-client/src/generated/core/OpenAPI.ts b/m1/JavaScript-client/src/generated/core/OpenAPI.ts
deleted file mode 100644
index 33a73c184..000000000
--- a/m1/JavaScript-client/src/generated/core/OpenAPI.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ApiRequestOptions } from './ApiRequestOptions';
-
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-type Headers = Record<string, string>;
-
-export type OpenAPIConfig = {
-    BASE: string;
-    VERSION: string;
-    WITH_CREDENTIALS: boolean;
-    CREDENTIALS: 'include' | 'omit' | 'same-origin';
-    TOKEN?: string | Resolver<string>;
-    USERNAME?: string | Resolver<string>;
-    PASSWORD?: string | Resolver<string>;
-    HEADERS?: Headers | Resolver<Headers>;
-    ENCODE_PATH?: (path: string) => string;
-};
-
-export const OpenAPI: OpenAPIConfig = {
-    BASE: '/v1',
-    VERSION: '1.2.0',
-    WITH_CREDENTIALS: false,
-    CREDENTIALS: 'include',
-    TOKEN: undefined,
-    USERNAME: undefined,
-    PASSWORD: undefined,
-    HEADERS: undefined,
-    ENCODE_PATH: undefined,
-};
diff --git a/m1/JavaScript-client/src/generated/core/request.ts b/m1/JavaScript-client/src/generated/core/request.ts
deleted file mode 100644
index 286644d1f..000000000
--- a/m1/JavaScript-client/src/generated/core/request.ts
+++ /dev/null
@@ -1,418 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import axios from 'axios';
-import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
-import FormData from 'form-data';
-
-import { ApiError } from './ApiError';
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
-
-interface Cookie {
-  name: string;
-  value: string;
-  expires?: Date;
-  path?: string;
-  sameSite?: "Lax" | "None" | "Strict";
-  secure?: boolean;
-}
-
-class CookieJar {
-  constructor(private jar = new Map<string, Cookie[]>()) {}
-
-  setCookie(url: URL, cookieStr: string) {
-    const key = url.origin.toLowerCase();
-    if (!this.jar.has(key)) {
-      this.jar.set(key, []);
-    }
-
-    const cookie = CookieJar.parse(cookieStr);
-    this.jar.set(key, [...(this.jar.get(key)?.filter((c) => c.name !== cookie.name) || []), cookie]);
-  }
-
-  getCookies(url: URL): Cookie[] {
-    const key = url.origin.toLowerCase();
-    if (!this.jar.get(key)) {
-      return [];
-    }
-
-    // Filter out expired cookies
-    return this.jar.get(key)?.filter((cookie) => !cookie.expires || cookie.expires > new Date()) || [];
-  }
-
-  static parse(str: string): Cookie {
-    if (typeof str !== "string") {
-      throw new Error("argument str must be a string");
-    }
-
-    const parts = str.split(";").map((part) => part.trim());
-
-    let cookie: Cookie;
-
-    if (parts.length > 0) {
-      const [name, value] = parts[0].split("=");
-      if (!name || !value) {
-        throw new Error("Invalid cookie");
-      }
-
-      cookie = {
-        name,
-        value,
-      };
-    } else {
-      throw new Error("Invalid cookie");
-    }
-
-    parts.slice(1).forEach((part) => {
-      const [name, value] = part.split("=");
-      if (!name.trim()) {
-        throw new Error("Invalid cookie");
-      }
-
-      const nameLow = name.toLowerCase();
-      // eslint-disable-next-line quotes
-      const val = value?.charAt(0) === "'" || value?.charAt(0) === '"' ? value?.slice(1, -1) : value;
-      if (nameLow === "expires") {
-        cookie.expires = new Date(val);
-      }
-      if (nameLow === "path") {
-        cookie.path = val;
-      }
-      if (nameLow === "samesite") {
-        if (val !== "Lax" && val !== "None" && val !== "Strict") {
-          throw new Error("Invalid cookie SameSite value");
-        }
-        cookie.sameSite = val;
-      }
-      if (nameLow === "secure") {
-        cookie.secure = true;
-      }
-    });
-
-    return cookie;
-  }
-}
-
-const jar = new CookieJar();
-
-axios.interceptors.response.use((response) => {
-  if (Array.isArray(response.headers["set-cookie"])) {
-    response.headers["set-cookie"].forEach((c) => {
-      jar.setCookie(new URL(response.config.url!), c);
-    });
-  }
-  return response;
-});
-
-axios.interceptors.request.use(function (config) {
-  const cookies = jar.getCookies(new URL(config.url!));
-
-  if (cookies?.length > 0 && config.headers) {
-    config.headers.cookie = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join("; ");
-  }
-  return config;
-});
-
-const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
-    return value !== undefined && value !== null;
-};
-
-const isString = (value: any): value is string => {
-    return typeof value === 'string';
-};
-
-const isStringWithValue = (value: any): value is string => {
-    return isString(value) && value !== '';
-};
-
-const isBlob = (value: any): value is Blob => {
-    return (
-        typeof value === 'object' &&
-        typeof value.type === 'string' &&
-        typeof value.stream === 'function' &&
-        typeof value.arrayBuffer === 'function' &&
-        typeof value.constructor === 'function' &&
-        typeof value.constructor.name === 'string' &&
-        /^(Blob|File)$/.test(value.constructor.name) &&
-        /^(Blob|File)$/.test(value[Symbol.toStringTag])
-    );
-};
-
-const isFormData = (value: any): value is FormData => {
-    return value instanceof FormData;
-};
-
-const isSuccess = (status: number): boolean => {
-    return status >= 200 && status < 300;
-};
-
-const base64 = (str: string): string => { return btoa(str); };
-
-const getQueryString = (params: Record<string, any>): string => {
-    const qs: string[] = [];
-
-    const append = (key: string, value: any) => {
-        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-    };
-
-    const process = (key: string, value: any) => {
-        if (isDefined(value)) {
-            if (Array.isArray(value)) {
-                value.forEach(v => {
-                    process(key, v);
-                });
-            } else if (typeof value === 'object') {
-                Object.entries(value).forEach(([k, v]) => {
-                    process(`${key}[${k}]`, v);
-                });
-            } else {
-                append(key, value);
-            }
-        }
-    };
-
-    Object.entries(params).forEach(([key, value]) => {
-        process(key, value);
-    });
-
-    if (qs.length > 0) {
-        return `?${qs.join('&')}`;
-    }
-
-    return '';
-};
-
-const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
-    const encoder = config.ENCODE_PATH || encodeURI;
-
-    const path = options.url
-        .replace('{api-version}', config.VERSION)
-        .replace(/{(.*?)}/g, (substring: string, group: string) => {
-            if (options.path?.hasOwnProperty(group)) {
-                return encoder(String(options.path[group]));
-            }
-            return substring;
-        });
-
-    const url = `${config.BASE}${path}`;
-    if (options.query) {
-        return `${url}${getQueryString(options.query)}`;
-    }
-    return url;
-};
-
-const getFormData = (options: ApiRequestOptions): FormData | undefined => {
-    if (options.formData) {
-        const formData = new FormData();
-
-        const process = (key: string, value: any) => {
-            if (isString(value) || isBlob(value)) {
-                formData.append(key, value);
-            } else {
-                formData.append(key, JSON.stringify(value));
-            }
-        };
-
-        Object.entries(options.formData)
-            .filter(([_, value]) => isDefined(value))
-            .forEach(([key, value]) => {
-                if (Array.isArray(value)) {
-                    value.forEach(v => process(key, v));
-                } else {
-                    process(key, value);
-                }
-            });
-
-        return formData;
-    }
-    return undefined;
-};
-
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-
-const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
-    if (typeof resolver === 'function') {
-        return (resolver as Resolver<T>)(options);
-    }
-    return resolver;
-};
-
-const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {
-    const token = await resolve(options, config.TOKEN);
-    const username = await resolve(options, config.USERNAME);
-    const password = await resolve(options, config.PASSWORD);
-    const additionalHeaders = await resolve(options, config.HEADERS);
-    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {}
-
-    const headers = Object.entries({
-        Accept: 'application/json',
-        ...additionalHeaders,
-        ...options.headers,
-        ...formHeaders,
-    })
-    .filter(([_, value]) => isDefined(value))
-    .reduce((headers, [key, value]) => ({
-        ...headers,
-        [key]: String(value),
-    }), {} as Record<string, string>);
-
-    if (isStringWithValue(token)) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
-
-    if (isStringWithValue(username) && isStringWithValue(password)) {
-        const credentials = base64(`${username}:${password}`);
-        headers['Authorization'] = `Basic ${credentials}`;
-    }
-
-    if (options.body) {
-        if (options.mediaType) {
-            headers['Content-Type'] = options.mediaType;
-        } else if (isBlob(options.body)) {
-            headers['Content-Type'] = options.body.type || 'application/octet-stream';
-        } else if (isString(options.body)) {
-            headers['Content-Type'] = 'text/plain';
-        } else if (!isFormData(options.body)) {
-            headers['Content-Type'] = 'application/json';
-        }
-    }
-
-    return headers;
-};
-
-const getRequestBody = (options: ApiRequestOptions): any => {
-    if (options.body) {
-        return options.body;
-    }
-    return undefined;
-};
-
-const sendRequest = async <T>(
-    config: OpenAPIConfig,
-    options: ApiRequestOptions,
-    url: string,
-    body: any,
-    formData: FormData | undefined,
-    headers: Record<string, string>,
-    onCancel: OnCancel
-): Promise<AxiosResponse<T>> => {
-    const source = axios.CancelToken.source();
-
-    const requestConfig: AxiosRequestConfig = {
-        url,
-        headers,
-        data: body ?? formData,
-        method: options.method,
-        withCredentials: config.WITH_CREDENTIALS,
-        cancelToken: source.token,
-    };
-
-    const isBCS = Object.keys(config.HEADERS || {})
-    .filter((k) => k.toLowerCase() === "accept")
-    .map((k) => (config.HEADERS as Record<string, string>)[k])
-    .includes("application/x-bcs");
-  if (isBCS) {
-    requestConfig.responseType = "arraybuffer";
-  }
-
-    onCancel(() => source.cancel('The user aborted a request.'));
-
-    try {
-        return await axios.request(requestConfig);
-    } catch (error) {
-        const axiosError = error as AxiosError<T>;
-        if (axiosError.response) {
-            return axiosError.response;
-        }
-        throw error;
-    }
-};
-
-const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
-    if (responseHeader) {
-        const content = response.headers[responseHeader];
-        if (isString(content)) {
-            return content;
-        }
-    }
-    return undefined;
-};
-
-const getResponseBody = (response: AxiosResponse<any>): any => {
-    if (response.status !== 204) {
-        return response.data;
-    }
-    return undefined;
-};
-
-const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
-    const errors: Record<number, string> = {
-        400: 'Bad Request',
-        401: 'Unauthorized',
-        403: 'Forbidden',
-        404: 'Not Found',
-        429: 'Too Many Requests',
-        500: 'Internal Server Error',
-        502: 'Bad Gateway',
-        503: 'Service Unavailable',
-        ...options.errors,
-    }
-
-    const error = errors[result.status];
-    if (error) {
-        throw new ApiError(options, result, error);
-    }
-
-    if (!result.ok) {
-        throw new ApiError(options, result, 'Generic Error');
-    }
-};
-
-/**
- * Request method
- * @param config The OpenAPI configuration object
- * @param options The request options from the service
- * @returns CancelablePromise<T>
- * @throws ApiError
- */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
-    return new CancelablePromise(async (resolve, reject, onCancel) => {
-        try {
-            const url = getUrl(config, options);
-            const formData = getFormData(options);
-            const body = getRequestBody(options);
-            const headers = await getHeaders(config, options, formData);
-
-            if (!onCancel.isCancelled) {
-                const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel);
-                const responseBody = getResponseBody(response);
-                const responseHeader = getResponseHeader(response, options.responseHeader);
-
-                const result: ApiResult = {
-                    url,
-                    ok: isSuccess(response.status),
-                    status: response.status,
-                    statusText: response.statusText,
-                    body: responseHeader ?? responseBody,
-                };
-
-                catchErrorCodes(options, result);
-
-                // Attach the response headers to the output. This is a hack to fix
-                // https://github.com/ferdikoomen/openapi-typescript-codegen/issues/1295
-                const out = result.body;
-                try {
-                    out["__headers"] = response.headers;
-                } catch (_) {}
-
-                resolve(out);
-            }
-        } catch (error) {
-            reject(error);
-        }
-    });
-};
diff --git a/m1/JavaScript-client/src/generated/index.ts b/m1/JavaScript-client/src/generated/index.ts
deleted file mode 100644
index e925af3a8..000000000
--- a/m1/JavaScript-client/src/generated/index.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export { AptosGeneratedClient } from './AptosGeneratedClient';
-
-export { ApiError } from './core/ApiError';
-export { BaseHttpRequest } from './core/BaseHttpRequest';
-export { CancelablePromise, CancelError } from './core/CancelablePromise';
-export { OpenAPI } from './core/OpenAPI';
-export type { OpenAPIConfig } from './core/OpenAPI';
-
-export type { AccountData } from './models/AccountData';
-export type { AccountSignature } from './models/AccountSignature';
-export type { AccountSignature_Ed25519Signature } from './models/AccountSignature_Ed25519Signature';
-export type { AccountSignature_MultiEd25519Signature } from './models/AccountSignature_MultiEd25519Signature';
-export type { Address } from './models/Address';
-export type { AptosError } from './models/AptosError';
-export { AptosErrorCode } from './models/AptosErrorCode';
-export type { Block } from './models/Block';
-export type { BlockMetadataTransaction } from './models/BlockMetadataTransaction';
-export type { DecodedTableData } from './models/DecodedTableData';
-export type { DeletedTableData } from './models/DeletedTableData';
-export type { DeleteModule } from './models/DeleteModule';
-export type { DeleteResource } from './models/DeleteResource';
-export type { DeleteTableItem } from './models/DeleteTableItem';
-export type { DirectWriteSet } from './models/DirectWriteSet';
-export type { Ed25519Signature } from './models/Ed25519Signature';
-export type { EncodeSubmissionRequest } from './models/EncodeSubmissionRequest';
-export type { EntryFunctionId } from './models/EntryFunctionId';
-export type { EntryFunctionPayload } from './models/EntryFunctionPayload';
-export type { Event } from './models/Event';
-export type { EventGuid } from './models/EventGuid';
-export type { GasEstimation } from './models/GasEstimation';
-export type { GenesisPayload } from './models/GenesisPayload';
-export type { GenesisPayload_WriteSetPayload } from './models/GenesisPayload_WriteSetPayload';
-export type { GenesisTransaction } from './models/GenesisTransaction';
-export type { HashValue } from './models/HashValue';
-export type { HealthCheckSuccess } from './models/HealthCheckSuccess';
-export type { HexEncodedBytes } from './models/HexEncodedBytes';
-export type { IdentifierWrapper } from './models/IdentifierWrapper';
-export type { IndexResponse } from './models/IndexResponse';
-export type { ModuleBundlePayload } from './models/ModuleBundlePayload';
-export type { MoveAbility } from './models/MoveAbility';
-export type { MoveFunction } from './models/MoveFunction';
-export type { MoveFunctionGenericTypeParam } from './models/MoveFunctionGenericTypeParam';
-export { MoveFunctionVisibility } from './models/MoveFunctionVisibility';
-export type { MoveModule } from './models/MoveModule';
-export type { MoveModuleBytecode } from './models/MoveModuleBytecode';
-export type { MoveModuleId } from './models/MoveModuleId';
-export type { MoveResource } from './models/MoveResource';
-export type { MoveScriptBytecode } from './models/MoveScriptBytecode';
-export type { MoveStruct } from './models/MoveStruct';
-export type { MoveStructField } from './models/MoveStructField';
-export type { MoveStructGenericTypeParam } from './models/MoveStructGenericTypeParam';
-export type { MoveStructTag } from './models/MoveStructTag';
-export type { MoveStructValue } from './models/MoveStructValue';
-export type { MoveType } from './models/MoveType';
-export type { MoveValue } from './models/MoveValue';
-export type { MultiAgentSignature } from './models/MultiAgentSignature';
-export type { MultiEd25519Signature } from './models/MultiEd25519Signature';
-export type { MultisigPayload } from './models/MultisigPayload';
-export type { MultisigTransactionPayload } from './models/MultisigTransactionPayload';
-export type { PendingTransaction } from './models/PendingTransaction';
-export type { RawTableItemRequest } from './models/RawTableItemRequest';
-export { RoleType } from './models/RoleType';
-export type { ScriptPayload } from './models/ScriptPayload';
-export type { ScriptWriteSet } from './models/ScriptWriteSet';
-export type { StateCheckpointTransaction } from './models/StateCheckpointTransaction';
-export type { StateKeyWrapper } from './models/StateKeyWrapper';
-export type { SubmitTransactionRequest } from './models/SubmitTransactionRequest';
-export type { TableItemRequest } from './models/TableItemRequest';
-export type { Transaction } from './models/Transaction';
-export type { Transaction_BlockMetadataTransaction } from './models/Transaction_BlockMetadataTransaction';
-export type { Transaction_GenesisTransaction } from './models/Transaction_GenesisTransaction';
-export type { Transaction_PendingTransaction } from './models/Transaction_PendingTransaction';
-export type { Transaction_StateCheckpointTransaction } from './models/Transaction_StateCheckpointTransaction';
-export type { Transaction_UserTransaction } from './models/Transaction_UserTransaction';
-export type { TransactionPayload } from './models/TransactionPayload';
-export type { TransactionPayload_EntryFunctionPayload } from './models/TransactionPayload_EntryFunctionPayload';
-export type { TransactionPayload_ModuleBundlePayload } from './models/TransactionPayload_ModuleBundlePayload';
-export type { TransactionPayload_MultisigPayload } from './models/TransactionPayload_MultisigPayload';
-export type { TransactionPayload_ScriptPayload } from './models/TransactionPayload_ScriptPayload';
-export type { TransactionsBatchSingleSubmissionFailure } from './models/TransactionsBatchSingleSubmissionFailure';
-export type { TransactionsBatchSubmissionResult } from './models/TransactionsBatchSubmissionResult';
-export type { TransactionSignature } from './models/TransactionSignature';
-export type { TransactionSignature_Ed25519Signature } from './models/TransactionSignature_Ed25519Signature';
-export type { TransactionSignature_MultiAgentSignature } from './models/TransactionSignature_MultiAgentSignature';
-export type { TransactionSignature_MultiEd25519Signature } from './models/TransactionSignature_MultiEd25519Signature';
-export type { U128 } from './models/U128';
-export type { U256 } from './models/U256';
-export type { U64 } from './models/U64';
-export type { UserTransaction } from './models/UserTransaction';
-export type { VersionedEvent } from './models/VersionedEvent';
-export type { ViewRequest } from './models/ViewRequest';
-export type { WriteModule } from './models/WriteModule';
-export type { WriteResource } from './models/WriteResource';
-export type { WriteSet } from './models/WriteSet';
-export type { WriteSet_DirectWriteSet } from './models/WriteSet_DirectWriteSet';
-export type { WriteSet_ScriptWriteSet } from './models/WriteSet_ScriptWriteSet';
-export type { WriteSetChange } from './models/WriteSetChange';
-export type { WriteSetChange_DeleteModule } from './models/WriteSetChange_DeleteModule';
-export type { WriteSetChange_DeleteResource } from './models/WriteSetChange_DeleteResource';
-export type { WriteSetChange_DeleteTableItem } from './models/WriteSetChange_DeleteTableItem';
-export type { WriteSetChange_WriteModule } from './models/WriteSetChange_WriteModule';
-export type { WriteSetChange_WriteResource } from './models/WriteSetChange_WriteResource';
-export type { WriteSetChange_WriteTableItem } from './models/WriteSetChange_WriteTableItem';
-export type { WriteSetPayload } from './models/WriteSetPayload';
-export type { WriteTableItem } from './models/WriteTableItem';
-
-export { $AccountData } from './schemas/$AccountData';
-export { $AccountSignature } from './schemas/$AccountSignature';
-export { $AccountSignature_Ed25519Signature } from './schemas/$AccountSignature_Ed25519Signature';
-export { $AccountSignature_MultiEd25519Signature } from './schemas/$AccountSignature_MultiEd25519Signature';
-export { $Address } from './schemas/$Address';
-export { $AptosError } from './schemas/$AptosError';
-export { $AptosErrorCode } from './schemas/$AptosErrorCode';
-export { $Block } from './schemas/$Block';
-export { $BlockMetadataTransaction } from './schemas/$BlockMetadataTransaction';
-export { $DecodedTableData } from './schemas/$DecodedTableData';
-export { $DeletedTableData } from './schemas/$DeletedTableData';
-export { $DeleteModule } from './schemas/$DeleteModule';
-export { $DeleteResource } from './schemas/$DeleteResource';
-export { $DeleteTableItem } from './schemas/$DeleteTableItem';
-export { $DirectWriteSet } from './schemas/$DirectWriteSet';
-export { $Ed25519Signature } from './schemas/$Ed25519Signature';
-export { $EncodeSubmissionRequest } from './schemas/$EncodeSubmissionRequest';
-export { $EntryFunctionId } from './schemas/$EntryFunctionId';
-export { $EntryFunctionPayload } from './schemas/$EntryFunctionPayload';
-export { $Event } from './schemas/$Event';
-export { $EventGuid } from './schemas/$EventGuid';
-export { $GasEstimation } from './schemas/$GasEstimation';
-export { $GenesisPayload } from './schemas/$GenesisPayload';
-export { $GenesisPayload_WriteSetPayload } from './schemas/$GenesisPayload_WriteSetPayload';
-export { $GenesisTransaction } from './schemas/$GenesisTransaction';
-export { $HashValue } from './schemas/$HashValue';
-export { $HealthCheckSuccess } from './schemas/$HealthCheckSuccess';
-export { $HexEncodedBytes } from './schemas/$HexEncodedBytes';
-export { $IdentifierWrapper } from './schemas/$IdentifierWrapper';
-export { $IndexResponse } from './schemas/$IndexResponse';
-export { $ModuleBundlePayload } from './schemas/$ModuleBundlePayload';
-export { $MoveAbility } from './schemas/$MoveAbility';
-export { $MoveFunction } from './schemas/$MoveFunction';
-export { $MoveFunctionGenericTypeParam } from './schemas/$MoveFunctionGenericTypeParam';
-export { $MoveFunctionVisibility } from './schemas/$MoveFunctionVisibility';
-export { $MoveModule } from './schemas/$MoveModule';
-export { $MoveModuleBytecode } from './schemas/$MoveModuleBytecode';
-export { $MoveModuleId } from './schemas/$MoveModuleId';
-export { $MoveResource } from './schemas/$MoveResource';
-export { $MoveScriptBytecode } from './schemas/$MoveScriptBytecode';
-export { $MoveStruct } from './schemas/$MoveStruct';
-export { $MoveStructField } from './schemas/$MoveStructField';
-export { $MoveStructGenericTypeParam } from './schemas/$MoveStructGenericTypeParam';
-export { $MoveStructTag } from './schemas/$MoveStructTag';
-export { $MoveStructValue } from './schemas/$MoveStructValue';
-export { $MoveType } from './schemas/$MoveType';
-export { $MoveValue } from './schemas/$MoveValue';
-export { $MultiAgentSignature } from './schemas/$MultiAgentSignature';
-export { $MultiEd25519Signature } from './schemas/$MultiEd25519Signature';
-export { $MultisigPayload } from './schemas/$MultisigPayload';
-export { $MultisigTransactionPayload } from './schemas/$MultisigTransactionPayload';
-export { $PendingTransaction } from './schemas/$PendingTransaction';
-export { $RawTableItemRequest } from './schemas/$RawTableItemRequest';
-export { $RoleType } from './schemas/$RoleType';
-export { $ScriptPayload } from './schemas/$ScriptPayload';
-export { $ScriptWriteSet } from './schemas/$ScriptWriteSet';
-export { $StateCheckpointTransaction } from './schemas/$StateCheckpointTransaction';
-export { $StateKeyWrapper } from './schemas/$StateKeyWrapper';
-export { $SubmitTransactionRequest } from './schemas/$SubmitTransactionRequest';
-export { $TableItemRequest } from './schemas/$TableItemRequest';
-export { $Transaction } from './schemas/$Transaction';
-export { $Transaction_BlockMetadataTransaction } from './schemas/$Transaction_BlockMetadataTransaction';
-export { $Transaction_GenesisTransaction } from './schemas/$Transaction_GenesisTransaction';
-export { $Transaction_PendingTransaction } from './schemas/$Transaction_PendingTransaction';
-export { $Transaction_StateCheckpointTransaction } from './schemas/$Transaction_StateCheckpointTransaction';
-export { $Transaction_UserTransaction } from './schemas/$Transaction_UserTransaction';
-export { $TransactionPayload } from './schemas/$TransactionPayload';
-export { $TransactionPayload_EntryFunctionPayload } from './schemas/$TransactionPayload_EntryFunctionPayload';
-export { $TransactionPayload_ModuleBundlePayload } from './schemas/$TransactionPayload_ModuleBundlePayload';
-export { $TransactionPayload_MultisigPayload } from './schemas/$TransactionPayload_MultisigPayload';
-export { $TransactionPayload_ScriptPayload } from './schemas/$TransactionPayload_ScriptPayload';
-export { $TransactionsBatchSingleSubmissionFailure } from './schemas/$TransactionsBatchSingleSubmissionFailure';
-export { $TransactionsBatchSubmissionResult } from './schemas/$TransactionsBatchSubmissionResult';
-export { $TransactionSignature } from './schemas/$TransactionSignature';
-export { $TransactionSignature_Ed25519Signature } from './schemas/$TransactionSignature_Ed25519Signature';
-export { $TransactionSignature_MultiAgentSignature } from './schemas/$TransactionSignature_MultiAgentSignature';
-export { $TransactionSignature_MultiEd25519Signature } from './schemas/$TransactionSignature_MultiEd25519Signature';
-export { $U128 } from './schemas/$U128';
-export { $U256 } from './schemas/$U256';
-export { $U64 } from './schemas/$U64';
-export { $UserTransaction } from './schemas/$UserTransaction';
-export { $VersionedEvent } from './schemas/$VersionedEvent';
-export { $ViewRequest } from './schemas/$ViewRequest';
-export { $WriteModule } from './schemas/$WriteModule';
-export { $WriteResource } from './schemas/$WriteResource';
-export { $WriteSet } from './schemas/$WriteSet';
-export { $WriteSet_DirectWriteSet } from './schemas/$WriteSet_DirectWriteSet';
-export { $WriteSet_ScriptWriteSet } from './schemas/$WriteSet_ScriptWriteSet';
-export { $WriteSetChange } from './schemas/$WriteSetChange';
-export { $WriteSetChange_DeleteModule } from './schemas/$WriteSetChange_DeleteModule';
-export { $WriteSetChange_DeleteResource } from './schemas/$WriteSetChange_DeleteResource';
-export { $WriteSetChange_DeleteTableItem } from './schemas/$WriteSetChange_DeleteTableItem';
-export { $WriteSetChange_WriteModule } from './schemas/$WriteSetChange_WriteModule';
-export { $WriteSetChange_WriteResource } from './schemas/$WriteSetChange_WriteResource';
-export { $WriteSetChange_WriteTableItem } from './schemas/$WriteSetChange_WriteTableItem';
-export { $WriteSetPayload } from './schemas/$WriteSetPayload';
-export { $WriteTableItem } from './schemas/$WriteTableItem';
-
-export { AccountsService } from './services/AccountsService';
-export { BlocksService } from './services/BlocksService';
-export { EventsService } from './services/EventsService';
-export { GeneralService } from './services/GeneralService';
-export { TablesService } from './services/TablesService';
-export { TransactionsService } from './services/TransactionsService';
-export { ViewService } from './services/ViewService';
diff --git a/m1/JavaScript-client/src/generated/models/AccountData.ts b/m1/JavaScript-client/src/generated/models/AccountData.ts
deleted file mode 100644
index 8df40aa85..000000000
--- a/m1/JavaScript-client/src/generated/models/AccountData.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-import type { U64 } from './U64';
-
-/**
- * Account data
- *
- * A simplified version of the onchain Account resource
- */
-export type AccountData = {
-    sequence_number: U64;
-    authentication_key: HexEncodedBytes;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/AccountSignature.ts b/m1/JavaScript-client/src/generated/models/AccountSignature.ts
deleted file mode 100644
index 576d1507d..000000000
--- a/m1/JavaScript-client/src/generated/models/AccountSignature.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { AccountSignature_Ed25519Signature } from './AccountSignature_Ed25519Signature';
-import type { AccountSignature_MultiEd25519Signature } from './AccountSignature_MultiEd25519Signature';
-
-/**
- * Account signature scheme
- *
- * The account signature scheme allows you to have two types of accounts:
- *
- * 1. A single Ed25519 key account, one private key
- * 2. A k-of-n multi-Ed25519 key account, multiple private keys, such that k-of-n must sign a transaction.
- */
-export type AccountSignature = (AccountSignature_Ed25519Signature | AccountSignature_MultiEd25519Signature);
-
diff --git a/m1/JavaScript-client/src/generated/models/AccountSignature_Ed25519Signature.ts b/m1/JavaScript-client/src/generated/models/AccountSignature_Ed25519Signature.ts
deleted file mode 100644
index 3d91da519..000000000
--- a/m1/JavaScript-client/src/generated/models/AccountSignature_Ed25519Signature.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Ed25519Signature } from './Ed25519Signature';
-
-export type AccountSignature_Ed25519Signature = ({
-    type: string;
-} & Ed25519Signature);
-
diff --git a/m1/JavaScript-client/src/generated/models/AccountSignature_MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/models/AccountSignature_MultiEd25519Signature.ts
deleted file mode 100644
index 11acab2eb..000000000
--- a/m1/JavaScript-client/src/generated/models/AccountSignature_MultiEd25519Signature.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MultiEd25519Signature } from './MultiEd25519Signature';
-
-export type AccountSignature_MultiEd25519Signature = ({
-    type: string;
-} & MultiEd25519Signature);
-
diff --git a/m1/JavaScript-client/src/generated/models/Address.ts b/m1/JavaScript-client/src/generated/models/Address.ts
deleted file mode 100644
index 03c32f6b4..000000000
--- a/m1/JavaScript-client/src/generated/models/Address.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * A hex encoded 32 byte Aptos account address.
- *
- * This is represented in a string as a 64 character hex string, sometimes
- * shortened by stripping leading 0s, and adding a 0x.
- *
- * For example, address 0x0000000000000000000000000000000000000000000000000000000000000001 is represented as 0x1.
- *
- */
-export type Address = string;
diff --git a/m1/JavaScript-client/src/generated/models/AptosError.ts b/m1/JavaScript-client/src/generated/models/AptosError.ts
deleted file mode 100644
index ed24d5524..000000000
--- a/m1/JavaScript-client/src/generated/models/AptosError.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { AptosErrorCode } from './AptosErrorCode';
-
-/**
- * This is the generic struct we use for all API errors, it contains a string
- * message and an Aptos API specific error code.
- */
-export type AptosError = {
-    /**
-     * A message describing the error
-     */
-    message: string;
-    error_code: AptosErrorCode;
-    /**
-     * A code providing VM error details when submitting transactions to the VM
-     */
-    vm_error_code?: number;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/AptosErrorCode.ts b/m1/JavaScript-client/src/generated/models/AptosErrorCode.ts
deleted file mode 100644
index 317b13b1b..000000000
--- a/m1/JavaScript-client/src/generated/models/AptosErrorCode.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * These codes provide more granular error information beyond just the HTTP
- * status code of the response.
- */
-export enum AptosErrorCode {
-    ACCOUNT_NOT_FOUND = 'account_not_found',
-    RESOURCE_NOT_FOUND = 'resource_not_found',
-    MODULE_NOT_FOUND = 'module_not_found',
-    STRUCT_FIELD_NOT_FOUND = 'struct_field_not_found',
-    VERSION_NOT_FOUND = 'version_not_found',
-    TRANSACTION_NOT_FOUND = 'transaction_not_found',
-    TABLE_ITEM_NOT_FOUND = 'table_item_not_found',
-    BLOCK_NOT_FOUND = 'block_not_found',
-    VERSION_PRUNED = 'version_pruned',
-    BLOCK_PRUNED = 'block_pruned',
-    INVALID_INPUT = 'invalid_input',
-    INVALID_TRANSACTION_UPDATE = 'invalid_transaction_update',
-    SEQUENCE_NUMBER_TOO_OLD = 'sequence_number_too_old',
-    VM_ERROR = 'vm_error',
-    HEALTH_CHECK_FAILED = 'health_check_failed',
-    MEMPOOL_IS_FULL = 'mempool_is_full',
-    INTERNAL_ERROR = 'internal_error',
-    WEB_FRAMEWORK_ERROR = 'web_framework_error',
-    BCS_NOT_SUPPORTED = 'bcs_not_supported',
-    API_DISABLED = 'api_disabled',
-}
diff --git a/m1/JavaScript-client/src/generated/models/Block.ts b/m1/JavaScript-client/src/generated/models/Block.ts
deleted file mode 100644
index e6c2a57e3..000000000
--- a/m1/JavaScript-client/src/generated/models/Block.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HashValue } from './HashValue';
-import type { Transaction } from './Transaction';
-import type { U64 } from './U64';
-
-/**
- * A Block with or without transactions
- *
- * This contains the information about a transactions along with
- * associated transactions if requested
- */
-export type Block = {
-    block_height: U64;
-    block_hash: HashValue;
-    block_timestamp: U64;
-    first_version: U64;
-    last_version: U64;
-    /**
-     * The transactions in the block in sequential order
-     */
-    transactions?: Array<Transaction>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/BlockMetadataTransaction.ts b/m1/JavaScript-client/src/generated/models/BlockMetadataTransaction.ts
deleted file mode 100644
index 9ec5828de..000000000
--- a/m1/JavaScript-client/src/generated/models/BlockMetadataTransaction.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { Event } from './Event';
-import type { HashValue } from './HashValue';
-import type { U64 } from './U64';
-import type { WriteSetChange } from './WriteSetChange';
-
-/**
- * A block metadata transaction
- *
- * This signifies the beginning of a block, and contains information
- * about the specific block
- */
-export type BlockMetadataTransaction = {
-    version: U64;
-    hash: HashValue;
-    state_change_hash: HashValue;
-    event_root_hash: HashValue;
-    state_checkpoint_hash?: HashValue;
-    gas_used: U64;
-    /**
-     * Whether the transaction was successful
-     */
-    success: boolean;
-    /**
-     * The VM status of the transaction, can tell useful information in a failure
-     */
-    vm_status: string;
-    accumulator_root_hash: HashValue;
-    /**
-     * Final state of resources changed by the transaction
-     */
-    changes: Array<WriteSetChange>;
-    id: HashValue;
-    epoch: U64;
-    round: U64;
-    /**
-     * The events emitted at the block creation
-     */
-    events: Array<Event>;
-    /**
-     * Previous block votes
-     */
-    previous_block_votes_bitvec: Array<number>;
-    proposer: Address;
-    /**
-     * The indices of the proposers who failed to propose
-     */
-    failed_proposer_indices: Array<number>;
-    timestamp: U64;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DecodedTableData.ts b/m1/JavaScript-client/src/generated/models/DecodedTableData.ts
deleted file mode 100644
index 83571f4fe..000000000
--- a/m1/JavaScript-client/src/generated/models/DecodedTableData.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Decoded table data
- */
-export type DecodedTableData = {
-    /**
-     * Key of table in JSON
-     */
-    key: any;
-    /**
-     * Type of key
-     */
-    key_type: string;
-    /**
-     * Value of table in JSON
-     */
-    value: any;
-    /**
-     * Type of value
-     */
-    value_type: string;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DeleteModule.ts b/m1/JavaScript-client/src/generated/models/DeleteModule.ts
deleted file mode 100644
index 44d49ce0c..000000000
--- a/m1/JavaScript-client/src/generated/models/DeleteModule.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { MoveModuleId } from './MoveModuleId';
-
-/**
- * Delete a module
- */
-export type DeleteModule = {
-    address: Address;
-    /**
-     * State key hash
-     */
-    state_key_hash: string;
-    module: MoveModuleId;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DeleteResource.ts b/m1/JavaScript-client/src/generated/models/DeleteResource.ts
deleted file mode 100644
index ff863a949..000000000
--- a/m1/JavaScript-client/src/generated/models/DeleteResource.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { MoveStructTag } from './MoveStructTag';
-
-/**
- * Delete a resource
- */
-export type DeleteResource = {
-    address: Address;
-    /**
-     * State key hash
-     */
-    state_key_hash: string;
-    resource: MoveStructTag;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DeleteTableItem.ts b/m1/JavaScript-client/src/generated/models/DeleteTableItem.ts
deleted file mode 100644
index c2655d4f5..000000000
--- a/m1/JavaScript-client/src/generated/models/DeleteTableItem.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DeletedTableData } from './DeletedTableData';
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-/**
- * Delete a table item
- */
-export type DeleteTableItem = {
-    state_key_hash: string;
-    handle: HexEncodedBytes;
-    key: HexEncodedBytes;
-    data?: DeletedTableData;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DeletedTableData.ts b/m1/JavaScript-client/src/generated/models/DeletedTableData.ts
deleted file mode 100644
index ccf4fd6e9..000000000
--- a/m1/JavaScript-client/src/generated/models/DeletedTableData.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Deleted table data
- */
-export type DeletedTableData = {
-    /**
-     * Deleted key
-     */
-    key: any;
-    /**
-     * Deleted key type
-     */
-    key_type: string;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/DirectWriteSet.ts b/m1/JavaScript-client/src/generated/models/DirectWriteSet.ts
deleted file mode 100644
index 1c09731f0..000000000
--- a/m1/JavaScript-client/src/generated/models/DirectWriteSet.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Event } from './Event';
-import type { WriteSetChange } from './WriteSetChange';
-
-export type DirectWriteSet = {
-    changes: Array<WriteSetChange>;
-    events: Array<Event>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/Ed25519Signature.ts b/m1/JavaScript-client/src/generated/models/Ed25519Signature.ts
deleted file mode 100644
index 27686cec8..000000000
--- a/m1/JavaScript-client/src/generated/models/Ed25519Signature.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-/**
- * A single Ed25519 signature
- */
-export type Ed25519Signature = {
-    public_key: HexEncodedBytes;
-    signature: HexEncodedBytes;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/EncodeSubmissionRequest.ts b/m1/JavaScript-client/src/generated/models/EncodeSubmissionRequest.ts
deleted file mode 100644
index 52e6f903e..000000000
--- a/m1/JavaScript-client/src/generated/models/EncodeSubmissionRequest.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { TransactionPayload } from './TransactionPayload';
-import type { U64 } from './U64';
-
-/**
- * Request to encode a submission
- */
-export type EncodeSubmissionRequest = {
-    sender: Address;
-    sequence_number: U64;
-    max_gas_amount: U64;
-    gas_unit_price: U64;
-    expiration_timestamp_secs: U64;
-    payload: TransactionPayload;
-    /**
-     * Secondary signer accounts of the request for Multi-agent
-     */
-    secondary_signers?: Array<Address>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/EntryFunctionId.ts b/m1/JavaScript-client/src/generated/models/EntryFunctionId.ts
deleted file mode 100644
index f38310d0c..000000000
--- a/m1/JavaScript-client/src/generated/models/EntryFunctionId.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Entry function id is string representation of a entry function defined on-chain.
- *
- * Format: `{address}::{module name}::{function name}`
- *
- * Both `module name` and `function name` are case-sensitive.
- *
- */
-export type EntryFunctionId = string;
diff --git a/m1/JavaScript-client/src/generated/models/EntryFunctionPayload.ts b/m1/JavaScript-client/src/generated/models/EntryFunctionPayload.ts
deleted file mode 100644
index 78a3ee67d..000000000
--- a/m1/JavaScript-client/src/generated/models/EntryFunctionPayload.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntryFunctionId } from './EntryFunctionId';
-import type { MoveType } from './MoveType';
-
-/**
- * Payload which runs a single entry function
- */
-export type EntryFunctionPayload = {
-    function: EntryFunctionId;
-    /**
-     * Type arguments of the function
-     */
-    type_arguments: Array<MoveType>;
-    /**
-     * Arguments of the function
-     */
-    arguments: Array<any>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/Event.ts b/m1/JavaScript-client/src/generated/models/Event.ts
deleted file mode 100644
index a160a00cc..000000000
--- a/m1/JavaScript-client/src/generated/models/Event.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EventGuid } from './EventGuid';
-import type { MoveType } from './MoveType';
-import type { U64 } from './U64';
-
-/**
- * An event from a transaction
- */
-export type Event = {
-    guid: EventGuid;
-    sequence_number: U64;
-    type: MoveType;
-    /**
-     * The JSON representation of the event
-     */
-    data: any;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/EventGuid.ts b/m1/JavaScript-client/src/generated/models/EventGuid.ts
deleted file mode 100644
index 928ad847f..000000000
--- a/m1/JavaScript-client/src/generated/models/EventGuid.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { U64 } from './U64';
-
-export type EventGuid = {
-    creation_number: U64;
-    account_address: Address;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/GasEstimation.ts b/m1/JavaScript-client/src/generated/models/GasEstimation.ts
deleted file mode 100644
index f8ebd6993..000000000
--- a/m1/JavaScript-client/src/generated/models/GasEstimation.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Struct holding the outputs of the estimate gas API
- */
-export type GasEstimation = {
-    /**
-     * The deprioritized estimate for the gas unit price
-     */
-    deprioritized_gas_estimate?: number;
-    /**
-     * The current estimate for the gas unit price
-     */
-    gas_estimate: number;
-    /**
-     * The prioritized estimate for the gas unit price
-     */
-    prioritized_gas_estimate?: number;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/GenesisPayload.ts b/m1/JavaScript-client/src/generated/models/GenesisPayload.ts
deleted file mode 100644
index 66d653a68..000000000
--- a/m1/JavaScript-client/src/generated/models/GenesisPayload.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { GenesisPayload_WriteSetPayload } from './GenesisPayload_WriteSetPayload';
-
-/**
- * The writeset payload of the Genesis transaction
- */
-export type GenesisPayload = GenesisPayload_WriteSetPayload;
-
diff --git a/m1/JavaScript-client/src/generated/models/GenesisPayload_WriteSetPayload.ts b/m1/JavaScript-client/src/generated/models/GenesisPayload_WriteSetPayload.ts
deleted file mode 100644
index a61275063..000000000
--- a/m1/JavaScript-client/src/generated/models/GenesisPayload_WriteSetPayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteSetPayload } from './WriteSetPayload';
-
-export type GenesisPayload_WriteSetPayload = ({
-    type: string;
-} & WriteSetPayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/GenesisTransaction.ts b/m1/JavaScript-client/src/generated/models/GenesisTransaction.ts
deleted file mode 100644
index 563a8be8f..000000000
--- a/m1/JavaScript-client/src/generated/models/GenesisTransaction.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Event } from './Event';
-import type { GenesisPayload } from './GenesisPayload';
-import type { HashValue } from './HashValue';
-import type { U64 } from './U64';
-import type { WriteSetChange } from './WriteSetChange';
-
-/**
- * The genesis transaction
- *
- * This only occurs at the genesis transaction (version 0)
- */
-export type GenesisTransaction = {
-    version: U64;
-    hash: HashValue;
-    state_change_hash: HashValue;
-    event_root_hash: HashValue;
-    state_checkpoint_hash?: HashValue;
-    gas_used: U64;
-    /**
-     * Whether the transaction was successful
-     */
-    success: boolean;
-    /**
-     * The VM status of the transaction, can tell useful information in a failure
-     */
-    vm_status: string;
-    accumulator_root_hash: HashValue;
-    /**
-     * Final state of resources changed by the transaction
-     */
-    changes: Array<WriteSetChange>;
-    payload: GenesisPayload;
-    /**
-     * Events emitted during genesis
-     */
-    events: Array<Event>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/HashValue.ts b/m1/JavaScript-client/src/generated/models/HashValue.ts
deleted file mode 100644
index a296dd84c..000000000
--- a/m1/JavaScript-client/src/generated/models/HashValue.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type HashValue = string;
diff --git a/m1/JavaScript-client/src/generated/models/HealthCheckSuccess.ts b/m1/JavaScript-client/src/generated/models/HealthCheckSuccess.ts
deleted file mode 100644
index ff98f0ed7..000000000
--- a/m1/JavaScript-client/src/generated/models/HealthCheckSuccess.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Representation of a successful healthcheck
- */
-export type HealthCheckSuccess = {
-    message: string;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/HexEncodedBytes.ts b/m1/JavaScript-client/src/generated/models/HexEncodedBytes.ts
deleted file mode 100644
index d4a21baf0..000000000
--- a/m1/JavaScript-client/src/generated/models/HexEncodedBytes.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * All bytes (Vec<u8>) data is represented as hex-encoded string prefixed with `0x` and fulfilled with
- * two hex digits per byte.
- *
- * Unlike the `Address` type, HexEncodedBytes will not trim any zeros.
- *
- */
-export type HexEncodedBytes = string;
diff --git a/m1/JavaScript-client/src/generated/models/IdentifierWrapper.ts b/m1/JavaScript-client/src/generated/models/IdentifierWrapper.ts
deleted file mode 100644
index 8bf5d9a71..000000000
--- a/m1/JavaScript-client/src/generated/models/IdentifierWrapper.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type IdentifierWrapper = string;
diff --git a/m1/JavaScript-client/src/generated/models/IndexResponse.ts b/m1/JavaScript-client/src/generated/models/IndexResponse.ts
deleted file mode 100644
index 1ca2519b1..000000000
--- a/m1/JavaScript-client/src/generated/models/IndexResponse.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { RoleType } from './RoleType';
-import type { U64 } from './U64';
-
-/**
- * The struct holding all data returned to the client by the
- * index endpoint (i.e., GET "/").  Only for responding in JSON
- */
-export type IndexResponse = {
-    /**
-     * Chain ID of the current chain
-     */
-    chain_id: number;
-    epoch: U64;
-    ledger_version: U64;
-    oldest_ledger_version: U64;
-    ledger_timestamp: U64;
-    node_role: RoleType;
-    oldest_block_height: U64;
-    block_height: U64;
-    /**
-     * Git hash of the build of the API endpoint.  Can be used to determine the exact
-     * software version used by the API endpoint.
-     */
-    git_hash?: string;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/ModuleBundlePayload.ts b/m1/JavaScript-client/src/generated/models/ModuleBundlePayload.ts
deleted file mode 100644
index be34a1f42..000000000
--- a/m1/JavaScript-client/src/generated/models/ModuleBundlePayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveModuleBytecode } from './MoveModuleBytecode';
-
-export type ModuleBundlePayload = {
-    modules: Array<MoveModuleBytecode>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveAbility.ts b/m1/JavaScript-client/src/generated/models/MoveAbility.ts
deleted file mode 100644
index 311c5db90..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveAbility.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type MoveAbility = string;
diff --git a/m1/JavaScript-client/src/generated/models/MoveFunction.ts b/m1/JavaScript-client/src/generated/models/MoveFunction.ts
deleted file mode 100644
index 4ce3ad729..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveFunction.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { IdentifierWrapper } from './IdentifierWrapper';
-import type { MoveFunctionGenericTypeParam } from './MoveFunctionGenericTypeParam';
-import type { MoveFunctionVisibility } from './MoveFunctionVisibility';
-import type { MoveType } from './MoveType';
-
-/**
- * Move function
- */
-export type MoveFunction = {
-    name: IdentifierWrapper;
-    visibility: MoveFunctionVisibility;
-    /**
-     * Whether the function can be called as an entry function directly in a transaction
-     */
-    is_entry: boolean;
-    /**
-     * Whether the function is a view function or not
-     */
-    is_view: boolean;
-    /**
-     * Generic type params associated with the Move function
-     */
-    generic_type_params: Array<MoveFunctionGenericTypeParam>;
-    /**
-     * Parameters associated with the move function
-     */
-    params: Array<MoveType>;
-    /**
-     * Return type of the function
-     */
-    return: Array<MoveType>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveFunctionGenericTypeParam.ts b/m1/JavaScript-client/src/generated/models/MoveFunctionGenericTypeParam.ts
deleted file mode 100644
index c0776fe5c..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveFunctionGenericTypeParam.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveAbility } from './MoveAbility';
-
-/**
- * Move function generic type param
- */
-export type MoveFunctionGenericTypeParam = {
-    /**
-     * Move abilities tied to the generic type param and associated with the function that uses it
-     */
-    constraints: Array<MoveAbility>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveFunctionVisibility.ts b/m1/JavaScript-client/src/generated/models/MoveFunctionVisibility.ts
deleted file mode 100644
index a1684d5c8..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveFunctionVisibility.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Move function visibility
- */
-export enum MoveFunctionVisibility {
-    PRIVATE = 'private',
-    PUBLIC = 'public',
-    FRIEND = 'friend',
-}
diff --git a/m1/JavaScript-client/src/generated/models/MoveModule.ts b/m1/JavaScript-client/src/generated/models/MoveModule.ts
deleted file mode 100644
index f2d127ff2..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveModule.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { IdentifierWrapper } from './IdentifierWrapper';
-import type { MoveFunction } from './MoveFunction';
-import type { MoveModuleId } from './MoveModuleId';
-import type { MoveStruct } from './MoveStruct';
-
-/**
- * A Move module
- */
-export type MoveModule = {
-    address: Address;
-    name: IdentifierWrapper;
-    /**
-     * Friends of the module
-     */
-    friends: Array<MoveModuleId>;
-    /**
-     * Public functions of the module
-     */
-    exposed_functions: Array<MoveFunction>;
-    /**
-     * Structs of the module
-     */
-    structs: Array<MoveStruct>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveModuleBytecode.ts b/m1/JavaScript-client/src/generated/models/MoveModuleBytecode.ts
deleted file mode 100644
index 9348d1053..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveModuleBytecode.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-import type { MoveModule } from './MoveModule';
-
-/**
- * Move module bytecode along with it's ABI
- */
-export type MoveModuleBytecode = {
-    bytecode: HexEncodedBytes;
-    abi?: MoveModule;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveModuleId.ts b/m1/JavaScript-client/src/generated/models/MoveModuleId.ts
deleted file mode 100644
index 5ad74349b..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveModuleId.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Move module id is a string representation of Move module.
- *
- * Format: `{address}::{module name}`
- *
- * `address` should be hex-encoded 32 byte account address that is prefixed with `0x`.
- *
- * Module name is case-sensitive.
- *
- */
-export type MoveModuleId = string;
diff --git a/m1/JavaScript-client/src/generated/models/MoveResource.ts b/m1/JavaScript-client/src/generated/models/MoveResource.ts
deleted file mode 100644
index 544bfa47b..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveResource.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveStructTag } from './MoveStructTag';
-import type { MoveStructValue } from './MoveStructValue';
-
-/**
- * A parsed Move resource
- */
-export type MoveResource = {
-    type: MoveStructTag;
-    data: MoveStructValue;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveScriptBytecode.ts b/m1/JavaScript-client/src/generated/models/MoveScriptBytecode.ts
deleted file mode 100644
index 109a6cf6b..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveScriptBytecode.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-import type { MoveFunction } from './MoveFunction';
-
-/**
- * Move script bytecode
- */
-export type MoveScriptBytecode = {
-    bytecode: HexEncodedBytes;
-    abi?: MoveFunction;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveStruct.ts b/m1/JavaScript-client/src/generated/models/MoveStruct.ts
deleted file mode 100644
index 74dd1d876..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveStruct.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { IdentifierWrapper } from './IdentifierWrapper';
-import type { MoveAbility } from './MoveAbility';
-import type { MoveStructField } from './MoveStructField';
-import type { MoveStructGenericTypeParam } from './MoveStructGenericTypeParam';
-
-/**
- * A move struct
- */
-export type MoveStruct = {
-    name: IdentifierWrapper;
-    /**
-     * Whether the struct is a native struct of Move
-     */
-    is_native: boolean;
-    /**
-     * Abilities associated with the struct
-     */
-    abilities: Array<MoveAbility>;
-    /**
-     * Generic types associated with the struct
-     */
-    generic_type_params: Array<MoveStructGenericTypeParam>;
-    /**
-     * Fields associated with the struct
-     */
-    fields: Array<MoveStructField>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveStructField.ts b/m1/JavaScript-client/src/generated/models/MoveStructField.ts
deleted file mode 100644
index 3f20b0bfb..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveStructField.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { IdentifierWrapper } from './IdentifierWrapper';
-import type { MoveType } from './MoveType';
-
-/**
- * Move struct field
- */
-export type MoveStructField = {
-    name: IdentifierWrapper;
-    type: MoveType;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveStructGenericTypeParam.ts b/m1/JavaScript-client/src/generated/models/MoveStructGenericTypeParam.ts
deleted file mode 100644
index 5ff3317db..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveStructGenericTypeParam.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveAbility } from './MoveAbility';
-
-/**
- * Move generic type param
- */
-export type MoveStructGenericTypeParam = {
-    /**
-     * Move abilities tied to the generic type param and associated with the type that uses it
-     */
-    constraints: Array<MoveAbility>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveStructTag.ts b/m1/JavaScript-client/src/generated/models/MoveStructTag.ts
deleted file mode 100644
index 254235ddd..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveStructTag.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * String representation of a MoveStructTag (on-chain Move struct type). This exists so you
- * can specify MoveStructTags as path / query parameters, e.g. for get_events_by_event_handle.
- *
- * It is a combination of:
- * 1. `move_module_address`, `module_name` and `struct_name`, all joined by `::`
- * 2. `struct generic type parameters` joined by `, `
- *
- * Examples:
- * * `0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>`
- * * `0x1::account::Account`
- *
- * Note:
- * 1. Empty chars should be ignored when comparing 2 struct tag ids.
- * 2. When used in an URL path, should be encoded by url-encoding (AKA percent-encoding).
- *
- * See [doc](https://aptos.dev/concepts/accounts) for more details.
- *
- */
-export type MoveStructTag = string;
diff --git a/m1/JavaScript-client/src/generated/models/MoveStructValue.ts b/m1/JavaScript-client/src/generated/models/MoveStructValue.ts
deleted file mode 100644
index 11d4da457..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveStructValue.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * This is a JSON representation of some data within an account resource. More specifically,
- * it is a map of strings to arbitrary JSON values / objects, where the keys are top level
- * fields within the given resource.
- *
- * To clarify, you might query for 0x1::account::Account and see the example data.
- *
- * Move `bool` type value is serialized into `boolean`.
- *
- * Move `u8`, `u16` and `u32` type value is serialized into `integer`.
- *
- * Move `u64`, `u128` and `u256` type value is serialized into `string`.
- *
- * Move `address` type value (32 byte Aptos account address) is serialized into a HexEncodedBytes string.
- * For example:
- * - `0x1`
- * - `0x1668f6be25668c1a17cd8caf6b8d2f25`
- *
- * Move `vector` type value is serialized into `array`, except `vector<u8>` which is serialized into a
- * HexEncodedBytes string with `0x` prefix.
- * For example:
- * - `vector<u64>{255, 255}` => `["255", "255"]`
- * - `vector<u8>{255, 255}` => `0xffff`
- *
- * Move `struct` type value is serialized into `object` that looks like this (except some Move stdlib types, see the following section):
- * ```json
- * {
-     * field1_name: field1_value,
-     * field2_name: field2_value,
-     * ......
-     * }
-     * ```
-     *
-     * For example:
-     * `{ "created": "0xa550c18", "role_id": "0" }`
-     *
-     * **Special serialization for Move stdlib types**:
-     * - [0x1::string::String](https://github.com/aptos-labs/aptos-core/blob/main/language/move-stdlib/docs/ascii.md)
-     * is serialized into `string`. For example, struct value `0x1::string::String{bytes: b"Hello World!"}`
-     * is serialized as `"Hello World!"` in JSON.
-     *
-     */
-    export type MoveStructValue = {
-    };
-
diff --git a/m1/JavaScript-client/src/generated/models/MoveType.ts b/m1/JavaScript-client/src/generated/models/MoveType.ts
deleted file mode 100644
index 226183770..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveType.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * String representation of an on-chain Move type tag that is exposed in transaction payload.
- * Values:
- * - bool
- * - u8
- * - u16
- * - u32
- * - u64
- * - u128
- * - u256
- * - address
- * - signer
- * - vector: `vector<{non-reference MoveTypeId}>`
- * - struct: `{address}::{module_name}::{struct_name}::<{generic types}>`
- *
- * Vector type value examples:
- * - `vector<u8>`
- * - `vector<vector<u64>>`
- * - `vector<0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>>`
- *
- * Struct type value examples:
- * - `0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>
- * - `0x1::account::Account`
- *
- * Note:
- * 1. Empty chars should be ignored when comparing 2 struct tag ids.
- * 2. When used in an URL path, should be encoded by url-encoding (AKA percent-encoding).
- *
- */
-export type MoveType = string;
diff --git a/m1/JavaScript-client/src/generated/models/MoveValue.ts b/m1/JavaScript-client/src/generated/models/MoveValue.ts
deleted file mode 100644
index 899490be8..000000000
--- a/m1/JavaScript-client/src/generated/models/MoveValue.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { HexEncodedBytes } from './HexEncodedBytes';
-import type { MoveStructValue } from './MoveStructValue';
-import type { U128 } from './U128';
-import type { U256 } from './U256';
-import type { U64 } from './U64';
-
-/**
- * An enum of the possible Move value types
- */
-export type MoveValue = (number | U64 | U128 | U256 | boolean | Address | Array<MoveValue> | HexEncodedBytes | MoveStructValue | string);
-
diff --git a/m1/JavaScript-client/src/generated/models/MultiAgentSignature.ts b/m1/JavaScript-client/src/generated/models/MultiAgentSignature.ts
deleted file mode 100644
index f07b81734..000000000
--- a/m1/JavaScript-client/src/generated/models/MultiAgentSignature.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { AccountSignature } from './AccountSignature';
-import type { Address } from './Address';
-
-/**
- * Multi agent signature for multi agent transactions
- *
- * This allows you to have transactions across multiple accounts
- */
-export type MultiAgentSignature = {
-    sender: AccountSignature;
-    /**
-     * The other involved parties' addresses
-     */
-    secondary_signer_addresses: Array<Address>;
-    /**
-     * The associated signatures, in the same order as the secondary addresses
-     */
-    secondary_signers: Array<AccountSignature>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/models/MultiEd25519Signature.ts
deleted file mode 100644
index 29809a29c..000000000
--- a/m1/JavaScript-client/src/generated/models/MultiEd25519Signature.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-/**
- * A Ed25519 multi-sig signature
- *
- * This allows k-of-n signing for a transaction
- */
-export type MultiEd25519Signature = {
-    /**
-     * The public keys for the Ed25519 signature
-     */
-    public_keys: Array<HexEncodedBytes>;
-    /**
-     * Signature associated with the public keys in the same order
-     */
-    signatures: Array<HexEncodedBytes>;
-    /**
-     * The number of signatures required for a successful transaction
-     */
-    threshold: number;
-    bitmap: HexEncodedBytes;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MultisigPayload.ts b/m1/JavaScript-client/src/generated/models/MultisigPayload.ts
deleted file mode 100644
index 9100a74b3..000000000
--- a/m1/JavaScript-client/src/generated/models/MultisigPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { MultisigTransactionPayload } from './MultisigTransactionPayload';
-
-/**
- * A multisig transaction that allows an owner of a multisig account to execute a pre-approved
- * transaction as the multisig account.
- */
-export type MultisigPayload = {
-    multisig_address: Address;
-    transaction_payload?: MultisigTransactionPayload;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/MultisigTransactionPayload.ts b/m1/JavaScript-client/src/generated/models/MultisigTransactionPayload.ts
deleted file mode 100644
index d3191b538..000000000
--- a/m1/JavaScript-client/src/generated/models/MultisigTransactionPayload.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntryFunctionPayload } from './EntryFunctionPayload';
-
-export type MultisigTransactionPayload = EntryFunctionPayload;
-
diff --git a/m1/JavaScript-client/src/generated/models/PendingTransaction.ts b/m1/JavaScript-client/src/generated/models/PendingTransaction.ts
deleted file mode 100644
index 2b4ad87fd..000000000
--- a/m1/JavaScript-client/src/generated/models/PendingTransaction.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { HashValue } from './HashValue';
-import type { TransactionPayload } from './TransactionPayload';
-import type { TransactionSignature } from './TransactionSignature';
-import type { U64 } from './U64';
-
-/**
- * A transaction waiting in mempool
- */
-export type PendingTransaction = {
-    hash: HashValue;
-    sender: Address;
-    sequence_number: U64;
-    max_gas_amount: U64;
-    gas_unit_price: U64;
-    expiration_timestamp_secs: U64;
-    payload: TransactionPayload;
-    signature?: TransactionSignature;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/RawTableItemRequest.ts b/m1/JavaScript-client/src/generated/models/RawTableItemRequest.ts
deleted file mode 100644
index e8fc0f8ec..000000000
--- a/m1/JavaScript-client/src/generated/models/RawTableItemRequest.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-/**
- * Table Item request for the GetTableItemRaw API
- */
-export type RawTableItemRequest = {
-    key: HexEncodedBytes;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/RoleType.ts b/m1/JavaScript-client/src/generated/models/RoleType.ts
deleted file mode 100644
index f0b5c207d..000000000
--- a/m1/JavaScript-client/src/generated/models/RoleType.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export enum RoleType {
-    VALIDATOR = 'validator',
-    FULL_NODE = 'full_node',
-}
diff --git a/m1/JavaScript-client/src/generated/models/ScriptPayload.ts b/m1/JavaScript-client/src/generated/models/ScriptPayload.ts
deleted file mode 100644
index 52cb0a057..000000000
--- a/m1/JavaScript-client/src/generated/models/ScriptPayload.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveScriptBytecode } from './MoveScriptBytecode';
-import type { MoveType } from './MoveType';
-
-/**
- * Payload which runs a script that can run multiple functions
- */
-export type ScriptPayload = {
-    code: MoveScriptBytecode;
-    /**
-     * Type arguments of the function
-     */
-    type_arguments: Array<MoveType>;
-    /**
-     * Arguments of the function
-     */
-    arguments: Array<any>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/ScriptWriteSet.ts b/m1/JavaScript-client/src/generated/models/ScriptWriteSet.ts
deleted file mode 100644
index 469b78079..000000000
--- a/m1/JavaScript-client/src/generated/models/ScriptWriteSet.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { ScriptPayload } from './ScriptPayload';
-
-export type ScriptWriteSet = {
-    execute_as: Address;
-    script: ScriptPayload;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/StateCheckpointTransaction.ts b/m1/JavaScript-client/src/generated/models/StateCheckpointTransaction.ts
deleted file mode 100644
index bfe5b5dbc..000000000
--- a/m1/JavaScript-client/src/generated/models/StateCheckpointTransaction.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HashValue } from './HashValue';
-import type { U64 } from './U64';
-import type { WriteSetChange } from './WriteSetChange';
-
-/**
- * A state checkpoint transaction
- */
-export type StateCheckpointTransaction = {
-    version: U64;
-    hash: HashValue;
-    state_change_hash: HashValue;
-    event_root_hash: HashValue;
-    state_checkpoint_hash?: HashValue;
-    gas_used: U64;
-    /**
-     * Whether the transaction was successful
-     */
-    success: boolean;
-    /**
-     * The VM status of the transaction, can tell useful information in a failure
-     */
-    vm_status: string;
-    accumulator_root_hash: HashValue;
-    /**
-     * Final state of resources changed by the transaction
-     */
-    changes: Array<WriteSetChange>;
-    timestamp: U64;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/StateKeyWrapper.ts b/m1/JavaScript-client/src/generated/models/StateKeyWrapper.ts
deleted file mode 100644
index d3939a43e..000000000
--- a/m1/JavaScript-client/src/generated/models/StateKeyWrapper.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Representation of a StateKey as a hex string. This is used for cursor based pagination.
- *
- */
-export type StateKeyWrapper = string;
diff --git a/m1/JavaScript-client/src/generated/models/SubmitTransactionRequest.ts b/m1/JavaScript-client/src/generated/models/SubmitTransactionRequest.ts
deleted file mode 100644
index b850d3f54..000000000
--- a/m1/JavaScript-client/src/generated/models/SubmitTransactionRequest.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { TransactionPayload } from './TransactionPayload';
-import type { TransactionSignature } from './TransactionSignature';
-import type { U64 } from './U64';
-
-/**
- * A request to submit a transaction
- *
- * This requires a transaction and a signature of it
- */
-export type SubmitTransactionRequest = {
-    sender: Address;
-    sequence_number: U64;
-    max_gas_amount: U64;
-    gas_unit_price: U64;
-    expiration_timestamp_secs: U64;
-    payload: TransactionPayload;
-    signature: TransactionSignature;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/TableItemRequest.ts b/m1/JavaScript-client/src/generated/models/TableItemRequest.ts
deleted file mode 100644
index 18b44286d..000000000
--- a/m1/JavaScript-client/src/generated/models/TableItemRequest.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MoveType } from './MoveType';
-
-/**
- * Table Item request for the GetTableItem API
- */
-export type TableItemRequest = {
-    key_type: MoveType;
-    value_type: MoveType;
-    /**
-     * The value of the table item's key
-     */
-    key: any;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction.ts b/m1/JavaScript-client/src/generated/models/Transaction.ts
deleted file mode 100644
index 0d6bd99e8..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Transaction_BlockMetadataTransaction } from './Transaction_BlockMetadataTransaction';
-import type { Transaction_GenesisTransaction } from './Transaction_GenesisTransaction';
-import type { Transaction_PendingTransaction } from './Transaction_PendingTransaction';
-import type { Transaction_StateCheckpointTransaction } from './Transaction_StateCheckpointTransaction';
-import type { Transaction_UserTransaction } from './Transaction_UserTransaction';
-
-/**
- * Enum of the different types of transactions in Aptos
- */
-export type Transaction = (Transaction_PendingTransaction | Transaction_UserTransaction | Transaction_GenesisTransaction | Transaction_BlockMetadataTransaction | Transaction_StateCheckpointTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionPayload.ts b/m1/JavaScript-client/src/generated/models/TransactionPayload.ts
deleted file mode 100644
index 0115a2974..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionPayload.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TransactionPayload_EntryFunctionPayload } from './TransactionPayload_EntryFunctionPayload';
-import type { TransactionPayload_ModuleBundlePayload } from './TransactionPayload_ModuleBundlePayload';
-import type { TransactionPayload_MultisigPayload } from './TransactionPayload_MultisigPayload';
-import type { TransactionPayload_ScriptPayload } from './TransactionPayload_ScriptPayload';
-
-/**
- * An enum of the possible transaction payloads
- */
-export type TransactionPayload = (TransactionPayload_EntryFunctionPayload | TransactionPayload_ScriptPayload | TransactionPayload_ModuleBundlePayload | TransactionPayload_MultisigPayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionPayload_EntryFunctionPayload.ts b/m1/JavaScript-client/src/generated/models/TransactionPayload_EntryFunctionPayload.ts
deleted file mode 100644
index d44e5d89a..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionPayload_EntryFunctionPayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntryFunctionPayload } from './EntryFunctionPayload';
-
-export type TransactionPayload_EntryFunctionPayload = ({
-    type: string;
-} & EntryFunctionPayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionPayload_ModuleBundlePayload.ts b/m1/JavaScript-client/src/generated/models/TransactionPayload_ModuleBundlePayload.ts
deleted file mode 100644
index 0193cb9d9..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionPayload_ModuleBundlePayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ModuleBundlePayload } from './ModuleBundlePayload';
-
-export type TransactionPayload_ModuleBundlePayload = ({
-    type: string;
-} & ModuleBundlePayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionPayload_MultisigPayload.ts b/m1/JavaScript-client/src/generated/models/TransactionPayload_MultisigPayload.ts
deleted file mode 100644
index 01023dd71..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionPayload_MultisigPayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MultisigPayload } from './MultisigPayload';
-
-export type TransactionPayload_MultisigPayload = ({
-    type: string;
-} & MultisigPayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionPayload_ScriptPayload.ts b/m1/JavaScript-client/src/generated/models/TransactionPayload_ScriptPayload.ts
deleted file mode 100644
index 9e7feb973..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionPayload_ScriptPayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ScriptPayload } from './ScriptPayload';
-
-export type TransactionPayload_ScriptPayload = ({
-    type: string;
-} & ScriptPayload);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionSignature.ts b/m1/JavaScript-client/src/generated/models/TransactionSignature.ts
deleted file mode 100644
index b3861fbdb..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionSignature.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TransactionSignature_Ed25519Signature } from './TransactionSignature_Ed25519Signature';
-import type { TransactionSignature_MultiAgentSignature } from './TransactionSignature_MultiAgentSignature';
-import type { TransactionSignature_MultiEd25519Signature } from './TransactionSignature_MultiEd25519Signature';
-
-/**
- * An enum representing the different transaction signatures available
- */
-export type TransactionSignature = (TransactionSignature_Ed25519Signature | TransactionSignature_MultiEd25519Signature | TransactionSignature_MultiAgentSignature);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionSignature_Ed25519Signature.ts b/m1/JavaScript-client/src/generated/models/TransactionSignature_Ed25519Signature.ts
deleted file mode 100644
index 0667d1e8b..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionSignature_Ed25519Signature.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Ed25519Signature } from './Ed25519Signature';
-
-export type TransactionSignature_Ed25519Signature = ({
-    type: string;
-} & Ed25519Signature);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiAgentSignature.ts b/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiAgentSignature.ts
deleted file mode 100644
index e74d911d9..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiAgentSignature.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MultiAgentSignature } from './MultiAgentSignature';
-
-export type TransactionSignature_MultiAgentSignature = ({
-    type: string;
-} & MultiAgentSignature);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiEd25519Signature.ts
deleted file mode 100644
index 1f6dc58ad..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionSignature_MultiEd25519Signature.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { MultiEd25519Signature } from './MultiEd25519Signature';
-
-export type TransactionSignature_MultiEd25519Signature = ({
-    type: string;
-} & MultiEd25519Signature);
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction_BlockMetadataTransaction.ts b/m1/JavaScript-client/src/generated/models/Transaction_BlockMetadataTransaction.ts
deleted file mode 100644
index 82067d747..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction_BlockMetadataTransaction.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { BlockMetadataTransaction } from './BlockMetadataTransaction';
-
-export type Transaction_BlockMetadataTransaction = ({
-    type: string;
-} & BlockMetadataTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction_GenesisTransaction.ts b/m1/JavaScript-client/src/generated/models/Transaction_GenesisTransaction.ts
deleted file mode 100644
index 3bb44fd02..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction_GenesisTransaction.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { GenesisTransaction } from './GenesisTransaction';
-
-export type Transaction_GenesisTransaction = ({
-    type: string;
-} & GenesisTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction_PendingTransaction.ts b/m1/JavaScript-client/src/generated/models/Transaction_PendingTransaction.ts
deleted file mode 100644
index c593c7642..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction_PendingTransaction.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { PendingTransaction } from './PendingTransaction';
-
-export type Transaction_PendingTransaction = ({
-    type: string;
-} & PendingTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction_StateCheckpointTransaction.ts b/m1/JavaScript-client/src/generated/models/Transaction_StateCheckpointTransaction.ts
deleted file mode 100644
index 90eeda700..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction_StateCheckpointTransaction.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { StateCheckpointTransaction } from './StateCheckpointTransaction';
-
-export type Transaction_StateCheckpointTransaction = ({
-    type: string;
-} & StateCheckpointTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/Transaction_UserTransaction.ts b/m1/JavaScript-client/src/generated/models/Transaction_UserTransaction.ts
deleted file mode 100644
index 8feeed7c2..000000000
--- a/m1/JavaScript-client/src/generated/models/Transaction_UserTransaction.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { UserTransaction } from './UserTransaction';
-
-export type Transaction_UserTransaction = ({
-    type: string;
-} & UserTransaction);
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionsBatchSingleSubmissionFailure.ts b/m1/JavaScript-client/src/generated/models/TransactionsBatchSingleSubmissionFailure.ts
deleted file mode 100644
index 98f81af61..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionsBatchSingleSubmissionFailure.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { AptosError } from './AptosError';
-
-/**
- * Information telling which batch submission transactions failed
- */
-export type TransactionsBatchSingleSubmissionFailure = {
-    error: AptosError;
-    /**
-     * The index of which transaction failed, same as submission order
-     */
-    transaction_index: number;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/TransactionsBatchSubmissionResult.ts b/m1/JavaScript-client/src/generated/models/TransactionsBatchSubmissionResult.ts
deleted file mode 100644
index 43c5d62f8..000000000
--- a/m1/JavaScript-client/src/generated/models/TransactionsBatchSubmissionResult.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TransactionsBatchSingleSubmissionFailure } from './TransactionsBatchSingleSubmissionFailure';
-
-/**
- * Batch transaction submission result
- *
- * Tells which transactions failed
- */
-export type TransactionsBatchSubmissionResult = {
-    /**
-     * Summary of the failed transactions
-     */
-    transaction_failures: Array<TransactionsBatchSingleSubmissionFailure>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/U128.ts b/m1/JavaScript-client/src/generated/models/U128.ts
deleted file mode 100644
index d391d4afb..000000000
--- a/m1/JavaScript-client/src/generated/models/U128.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * A string containing a 128-bit unsigned integer.
- *
- * We represent u128 values as a string to ensure compatibility with languages such
- * as JavaScript that do not parse u128s in JSON natively.
- *
- */
-export type U128 = string;
diff --git a/m1/JavaScript-client/src/generated/models/U256.ts b/m1/JavaScript-client/src/generated/models/U256.ts
deleted file mode 100644
index 092d56d8e..000000000
--- a/m1/JavaScript-client/src/generated/models/U256.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * A string containing a 256-bit unsigned integer.
- *
- * We represent u256 values as a string to ensure compatibility with languages such
- * as JavaScript that do not parse u256s in JSON natively.
- *
- */
-export type U256 = string;
diff --git a/m1/JavaScript-client/src/generated/models/U64.ts b/m1/JavaScript-client/src/generated/models/U64.ts
deleted file mode 100644
index f8f542c60..000000000
--- a/m1/JavaScript-client/src/generated/models/U64.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * A string containing a 64-bit unsigned integer.
- *
- * We represent u64 values as a string to ensure compatibility with languages such
- * as JavaScript that do not parse u64s in JSON natively.
- *
- */
-export type U64 = string;
diff --git a/m1/JavaScript-client/src/generated/models/UserTransaction.ts b/m1/JavaScript-client/src/generated/models/UserTransaction.ts
deleted file mode 100644
index 4aa4e67a3..000000000
--- a/m1/JavaScript-client/src/generated/models/UserTransaction.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { Event } from './Event';
-import type { HashValue } from './HashValue';
-import type { TransactionPayload } from './TransactionPayload';
-import type { TransactionSignature } from './TransactionSignature';
-import type { U64 } from './U64';
-import type { WriteSetChange } from './WriteSetChange';
-
-/**
- * A transaction submitted by a user to change the state of the blockchain
- */
-export type UserTransaction = {
-    version: U64;
-    hash: HashValue;
-    state_change_hash: HashValue;
-    event_root_hash: HashValue;
-    state_checkpoint_hash?: HashValue;
-    gas_used: U64;
-    /**
-     * Whether the transaction was successful
-     */
-    success: boolean;
-    /**
-     * The VM status of the transaction, can tell useful information in a failure
-     */
-    vm_status: string;
-    accumulator_root_hash: HashValue;
-    /**
-     * Final state of resources changed by the transaction
-     */
-    changes: Array<WriteSetChange>;
-    sender: Address;
-    sequence_number: U64;
-    max_gas_amount: U64;
-    gas_unit_price: U64;
-    expiration_timestamp_secs: U64;
-    payload: TransactionPayload;
-    signature?: TransactionSignature;
-    /**
-     * Events generated by the transaction
-     */
-    events: Array<Event>;
-    timestamp: U64;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/VersionedEvent.ts b/m1/JavaScript-client/src/generated/models/VersionedEvent.ts
deleted file mode 100644
index c9934c820..000000000
--- a/m1/JavaScript-client/src/generated/models/VersionedEvent.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EventGuid } from './EventGuid';
-import type { MoveType } from './MoveType';
-import type { U64 } from './U64';
-
-/**
- * An event from a transaction with a version
- */
-export type VersionedEvent = {
-    version: U64;
-    guid: EventGuid;
-    sequence_number: U64;
-    type: MoveType;
-    /**
-     * The JSON representation of the event
-     */
-    data: any;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/ViewRequest.ts b/m1/JavaScript-client/src/generated/models/ViewRequest.ts
deleted file mode 100644
index 5fa124b8e..000000000
--- a/m1/JavaScript-client/src/generated/models/ViewRequest.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntryFunctionId } from './EntryFunctionId';
-import type { MoveType } from './MoveType';
-
-/**
- * View request for the Move View Function API
- */
-export type ViewRequest = {
-    function: EntryFunctionId;
-    /**
-     * Type arguments of the function
-     */
-    type_arguments: Array<MoveType>;
-    /**
-     * Arguments of the function
-     */
-    arguments: Array<any>;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteModule.ts b/m1/JavaScript-client/src/generated/models/WriteModule.ts
deleted file mode 100644
index b032cc913..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteModule.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { MoveModuleBytecode } from './MoveModuleBytecode';
-
-/**
- * Write a new module or update an existing one
- */
-export type WriteModule = {
-    address: Address;
-    /**
-     * State key hash
-     */
-    state_key_hash: string;
-    data: MoveModuleBytecode;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteResource.ts b/m1/JavaScript-client/src/generated/models/WriteResource.ts
deleted file mode 100644
index 2bccf200e..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteResource.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { Address } from './Address';
-import type { MoveResource } from './MoveResource';
-
-/**
- * Write a resource or update an existing one
- */
-export type WriteResource = {
-    address: Address;
-    /**
-     * State key hash
-     */
-    state_key_hash: string;
-    data: MoveResource;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSet.ts b/m1/JavaScript-client/src/generated/models/WriteSet.ts
deleted file mode 100644
index ea06d3e63..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSet.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteSet_DirectWriteSet } from './WriteSet_DirectWriteSet';
-import type { WriteSet_ScriptWriteSet } from './WriteSet_ScriptWriteSet';
-
-/**
- * The associated writeset with a payload
- */
-export type WriteSet = (WriteSet_ScriptWriteSet | WriteSet_DirectWriteSet);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange.ts
deleted file mode 100644
index dfcc2cb63..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteSetChange_DeleteModule } from './WriteSetChange_DeleteModule';
-import type { WriteSetChange_DeleteResource } from './WriteSetChange_DeleteResource';
-import type { WriteSetChange_DeleteTableItem } from './WriteSetChange_DeleteTableItem';
-import type { WriteSetChange_WriteModule } from './WriteSetChange_WriteModule';
-import type { WriteSetChange_WriteResource } from './WriteSetChange_WriteResource';
-import type { WriteSetChange_WriteTableItem } from './WriteSetChange_WriteTableItem';
-
-/**
- * A final state change of a transaction on a resource or module
- */
-export type WriteSetChange = (WriteSetChange_DeleteModule | WriteSetChange_DeleteResource | WriteSetChange_DeleteTableItem | WriteSetChange_WriteModule | WriteSetChange_WriteResource | WriteSetChange_WriteTableItem);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteModule.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteModule.ts
deleted file mode 100644
index 3c4252969..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteModule.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DeleteModule } from './DeleteModule';
-
-export type WriteSetChange_DeleteModule = ({
-    type: string;
-} & DeleteModule);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteResource.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteResource.ts
deleted file mode 100644
index bfb9924b6..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteResource.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DeleteResource } from './DeleteResource';
-
-export type WriteSetChange_DeleteResource = ({
-    type: string;
-} & DeleteResource);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteTableItem.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteTableItem.ts
deleted file mode 100644
index d82340222..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_DeleteTableItem.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DeleteTableItem } from './DeleteTableItem';
-
-export type WriteSetChange_DeleteTableItem = ({
-    type: string;
-} & DeleteTableItem);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteModule.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteModule.ts
deleted file mode 100644
index 924d279b8..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteModule.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteModule } from './WriteModule';
-
-export type WriteSetChange_WriteModule = ({
-    type: string;
-} & WriteModule);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteResource.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteResource.ts
deleted file mode 100644
index e7d4f6be5..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteResource.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteResource } from './WriteResource';
-
-export type WriteSetChange_WriteResource = ({
-    type: string;
-} & WriteResource);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteTableItem.ts b/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteTableItem.ts
deleted file mode 100644
index 087c9765a..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetChange_WriteTableItem.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteTableItem } from './WriteTableItem';
-
-export type WriteSetChange_WriteTableItem = ({
-    type: string;
-} & WriteTableItem);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSetPayload.ts b/m1/JavaScript-client/src/generated/models/WriteSetPayload.ts
deleted file mode 100644
index c15ea62f2..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSetPayload.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { WriteSet } from './WriteSet';
-
-/**
- * A writeset payload, used only for genesis
- */
-export type WriteSetPayload = {
-    write_set: WriteSet;
-};
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSet_DirectWriteSet.ts b/m1/JavaScript-client/src/generated/models/WriteSet_DirectWriteSet.ts
deleted file mode 100644
index 552e98d48..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSet_DirectWriteSet.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DirectWriteSet } from './DirectWriteSet';
-
-export type WriteSet_DirectWriteSet = ({
-    type: string;
-} & DirectWriteSet);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteSet_ScriptWriteSet.ts b/m1/JavaScript-client/src/generated/models/WriteSet_ScriptWriteSet.ts
deleted file mode 100644
index e7304a8a8..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteSet_ScriptWriteSet.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ScriptWriteSet } from './ScriptWriteSet';
-
-export type WriteSet_ScriptWriteSet = ({
-    type: string;
-} & ScriptWriteSet);
-
diff --git a/m1/JavaScript-client/src/generated/models/WriteTableItem.ts b/m1/JavaScript-client/src/generated/models/WriteTableItem.ts
deleted file mode 100644
index 6fbaa2b02..000000000
--- a/m1/JavaScript-client/src/generated/models/WriteTableItem.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DecodedTableData } from './DecodedTableData';
-import type { HexEncodedBytes } from './HexEncodedBytes';
-
-/**
- * Change set to write a table item
- */
-export type WriteTableItem = {
-    state_key_hash: string;
-    handle: HexEncodedBytes;
-    key: HexEncodedBytes;
-    value: HexEncodedBytes;
-    data?: DecodedTableData;
-};
-
diff --git a/m1/JavaScript-client/src/generated/schemas/$AccountData.ts b/m1/JavaScript-client/src/generated/schemas/$AccountData.ts
deleted file mode 100644
index 04582cd5e..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AccountData.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AccountData = {
-    description: `Account data
-
-    A simplified version of the onchain Account resource`,
-    properties: {
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        authentication_key: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$AccountSignature.ts b/m1/JavaScript-client/src/generated/schemas/$AccountSignature.ts
deleted file mode 100644
index 2a36b5d67..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AccountSignature.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AccountSignature = {
-    type: 'one-of',
-    description: `Account signature scheme
-
-    The account signature scheme allows you to have two types of accounts:
-
-    1. A single Ed25519 key account, one private key
-    2. A k-of-n multi-Ed25519 key account, multiple private keys, such that k-of-n must sign a transaction.`,
-    contains: [{
-        type: 'AccountSignature_Ed25519Signature',
-    }, {
-        type: 'AccountSignature_MultiEd25519Signature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$AccountSignature_Ed25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$AccountSignature_Ed25519Signature.ts
deleted file mode 100644
index 2a16d8b91..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AccountSignature_Ed25519Signature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AccountSignature_Ed25519Signature = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'Ed25519Signature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$AccountSignature_MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$AccountSignature_MultiEd25519Signature.ts
deleted file mode 100644
index 73d0cfed8..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AccountSignature_MultiEd25519Signature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AccountSignature_MultiEd25519Signature = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'MultiEd25519Signature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Address.ts b/m1/JavaScript-client/src/generated/schemas/$Address.ts
deleted file mode 100644
index 0e5400c7c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Address.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Address = {
-    type: 'string',
-    description: `A hex encoded 32 byte Aptos account address.
-
-    This is represented in a string as a 64 character hex string, sometimes
-    shortened by stripping leading 0s, and adding a 0x.
-
-    For example, address 0x0000000000000000000000000000000000000000000000000000000000000001 is represented as 0x1.
-    `,
-    format: 'hex',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$AptosError.ts b/m1/JavaScript-client/src/generated/schemas/$AptosError.ts
deleted file mode 100644
index 72390bbcb..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AptosError.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AptosError = {
-    description: `This is the generic struct we use for all API errors, it contains a string
-    message and an Aptos API specific error code.`,
-    properties: {
-        message: {
-            type: 'string',
-            description: `A message describing the error`,
-            isRequired: true,
-        },
-        error_code: {
-            type: 'AptosErrorCode',
-            isRequired: true,
-        },
-        vm_error_code: {
-            type: 'number',
-            description: `A code providing VM error details when submitting transactions to the VM`,
-            format: 'uint64',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$AptosErrorCode.ts b/m1/JavaScript-client/src/generated/schemas/$AptosErrorCode.ts
deleted file mode 100644
index 57dc2d105..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$AptosErrorCode.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $AptosErrorCode = {
-    type: 'Enum',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Block.ts b/m1/JavaScript-client/src/generated/schemas/$Block.ts
deleted file mode 100644
index 970ba6106..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Block.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Block = {
-    description: `A Block with or without transactions
-
-    This contains the information about a transactions along with
-    associated transactions if requested`,
-    properties: {
-        block_height: {
-            type: 'U64',
-            isRequired: true,
-        },
-        block_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        block_timestamp: {
-            type: 'U64',
-            isRequired: true,
-        },
-        first_version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        last_version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        transactions: {
-            type: 'array',
-            contains: {
-                type: 'Transaction',
-            },
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$BlockMetadataTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$BlockMetadataTransaction.ts
deleted file mode 100644
index 434bf4eab..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$BlockMetadataTransaction.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $BlockMetadataTransaction = {
-    description: `A block metadata transaction
-
-    This signifies the beginning of a block, and contains information
-    about the specific block`,
-    properties: {
-        version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_change_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        event_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_checkpoint_hash: {
-            type: 'HashValue',
-        },
-        gas_used: {
-            type: 'U64',
-            isRequired: true,
-        },
-        success: {
-            type: 'boolean',
-            description: `Whether the transaction was successful`,
-            isRequired: true,
-        },
-        vm_status: {
-            type: 'string',
-            description: `The VM status of the transaction, can tell useful information in a failure`,
-            isRequired: true,
-        },
-        accumulator_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        changes: {
-            type: 'array',
-            contains: {
-                type: 'WriteSetChange',
-            },
-            isRequired: true,
-        },
-        id: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        epoch: {
-            type: 'U64',
-            isRequired: true,
-        },
-        round: {
-            type: 'U64',
-            isRequired: true,
-        },
-        events: {
-            type: 'array',
-            contains: {
-                type: 'Event',
-            },
-            isRequired: true,
-        },
-        previous_block_votes_bitvec: {
-            type: 'array',
-            contains: {
-                type: 'number',
-                format: 'uint8',
-            },
-            isRequired: true,
-        },
-        proposer: {
-            type: 'Address',
-            isRequired: true,
-        },
-        failed_proposer_indices: {
-            type: 'array',
-            contains: {
-                type: 'number',
-                format: 'uint32',
-            },
-            isRequired: true,
-        },
-        timestamp: {
-            type: 'U64',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DecodedTableData.ts b/m1/JavaScript-client/src/generated/schemas/$DecodedTableData.ts
deleted file mode 100644
index 75bd13d27..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DecodedTableData.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DecodedTableData = {
-    description: `Decoded table data`,
-    properties: {
-        key: {
-            description: `Key of table in JSON`,
-            properties: {
-            },
-            isRequired: true,
-        },
-        key_type: {
-            type: 'string',
-            description: `Type of key`,
-            isRequired: true,
-        },
-        value: {
-            description: `Value of table in JSON`,
-            properties: {
-            },
-            isRequired: true,
-        },
-        value_type: {
-            type: 'string',
-            description: `Type of value`,
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DeleteModule.ts b/m1/JavaScript-client/src/generated/schemas/$DeleteModule.ts
deleted file mode 100644
index e9c4c7fb1..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DeleteModule.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DeleteModule = {
-    description: `Delete a module`,
-    properties: {
-        address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        state_key_hash: {
-            type: 'string',
-            description: `State key hash`,
-            isRequired: true,
-        },
-        module: {
-            type: 'MoveModuleId',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DeleteResource.ts b/m1/JavaScript-client/src/generated/schemas/$DeleteResource.ts
deleted file mode 100644
index 61e39a709..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DeleteResource.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DeleteResource = {
-    description: `Delete a resource`,
-    properties: {
-        address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        state_key_hash: {
-            type: 'string',
-            description: `State key hash`,
-            isRequired: true,
-        },
-        resource: {
-            type: 'MoveStructTag',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DeleteTableItem.ts b/m1/JavaScript-client/src/generated/schemas/$DeleteTableItem.ts
deleted file mode 100644
index 1e6412633..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DeleteTableItem.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DeleteTableItem = {
-    description: `Delete a table item`,
-    properties: {
-        state_key_hash: {
-            type: 'string',
-            isRequired: true,
-        },
-        handle: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        key: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        data: {
-            type: 'DeletedTableData',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DeletedTableData.ts b/m1/JavaScript-client/src/generated/schemas/$DeletedTableData.ts
deleted file mode 100644
index c617e3b9f..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DeletedTableData.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DeletedTableData = {
-    description: `Deleted table data`,
-    properties: {
-        key: {
-            description: `Deleted key`,
-            properties: {
-            },
-            isRequired: true,
-        },
-        key_type: {
-            type: 'string',
-            description: `Deleted key type`,
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$DirectWriteSet.ts b/m1/JavaScript-client/src/generated/schemas/$DirectWriteSet.ts
deleted file mode 100644
index fc121ffea..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$DirectWriteSet.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $DirectWriteSet = {
-    properties: {
-        changes: {
-            type: 'array',
-            contains: {
-                type: 'WriteSetChange',
-            },
-            isRequired: true,
-        },
-        events: {
-            type: 'array',
-            contains: {
-                type: 'Event',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Ed25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$Ed25519Signature.ts
deleted file mode 100644
index c1a87faad..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Ed25519Signature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Ed25519Signature = {
-    description: `A single Ed25519 signature`,
-    properties: {
-        public_key: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        signature: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$EncodeSubmissionRequest.ts b/m1/JavaScript-client/src/generated/schemas/$EncodeSubmissionRequest.ts
deleted file mode 100644
index f27f97993..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$EncodeSubmissionRequest.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $EncodeSubmissionRequest = {
-    description: `Request to encode a submission`,
-    properties: {
-        sender: {
-            type: 'Address',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        max_gas_amount: {
-            type: 'U64',
-            isRequired: true,
-        },
-        gas_unit_price: {
-            type: 'U64',
-            isRequired: true,
-        },
-        expiration_timestamp_secs: {
-            type: 'U64',
-            isRequired: true,
-        },
-        payload: {
-            type: 'TransactionPayload',
-            isRequired: true,
-        },
-        secondary_signers: {
-            type: 'array',
-            contains: {
-                type: 'Address',
-            },
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$EntryFunctionId.ts b/m1/JavaScript-client/src/generated/schemas/$EntryFunctionId.ts
deleted file mode 100644
index 7e1f80c07..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$EntryFunctionId.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $EntryFunctionId = {
-    type: 'string',
-    description: `Entry function id is string representation of a entry function defined on-chain.
-
-    Format: \`{address}::{module name}::{function name}\`
-
-    Both \`module name\` and \`function name\` are case-sensitive.
-    `,
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$EntryFunctionPayload.ts b/m1/JavaScript-client/src/generated/schemas/$EntryFunctionPayload.ts
deleted file mode 100644
index 4cdddc0aa..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$EntryFunctionPayload.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $EntryFunctionPayload = {
-    description: `Payload which runs a single entry function`,
-    properties: {
-        function: {
-            type: 'EntryFunctionId',
-            isRequired: true,
-        },
-        type_arguments: {
-            type: 'array',
-            contains: {
-                type: 'MoveType',
-            },
-            isRequired: true,
-        },
-        arguments: {
-            type: 'array',
-            contains: {
-                properties: {
-                },
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Event.ts b/m1/JavaScript-client/src/generated/schemas/$Event.ts
deleted file mode 100644
index 83b84ca12..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Event.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Event = {
-    description: `An event from a transaction`,
-    properties: {
-        guid: {
-            type: 'EventGuid',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        type: {
-            type: 'MoveType',
-            isRequired: true,
-        },
-        data: {
-            description: `The JSON representation of the event`,
-            properties: {
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$EventGuid.ts b/m1/JavaScript-client/src/generated/schemas/$EventGuid.ts
deleted file mode 100644
index 773e5b9a9..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$EventGuid.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $EventGuid = {
-    properties: {
-        creation_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        account_address: {
-            type: 'Address',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$GasEstimation.ts b/m1/JavaScript-client/src/generated/schemas/$GasEstimation.ts
deleted file mode 100644
index 22dc555dc..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$GasEstimation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $GasEstimation = {
-    description: `Struct holding the outputs of the estimate gas API`,
-    properties: {
-        deprioritized_gas_estimate: {
-            type: 'number',
-            description: `The deprioritized estimate for the gas unit price`,
-            format: 'uint64',
-        },
-        gas_estimate: {
-            type: 'number',
-            description: `The current estimate for the gas unit price`,
-            isRequired: true,
-            format: 'uint64',
-        },
-        prioritized_gas_estimate: {
-            type: 'number',
-            description: `The prioritized estimate for the gas unit price`,
-            format: 'uint64',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$GenesisPayload.ts b/m1/JavaScript-client/src/generated/schemas/$GenesisPayload.ts
deleted file mode 100644
index bbc3ca1bd..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$GenesisPayload.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $GenesisPayload = {
-    type: 'one-of',
-    description: `The writeset payload of the Genesis transaction`,
-    contains: [{
-        type: 'GenesisPayload_WriteSetPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$GenesisPayload_WriteSetPayload.ts b/m1/JavaScript-client/src/generated/schemas/$GenesisPayload_WriteSetPayload.ts
deleted file mode 100644
index 4d81069d3..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$GenesisPayload_WriteSetPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $GenesisPayload_WriteSetPayload = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'WriteSetPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$GenesisTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$GenesisTransaction.ts
deleted file mode 100644
index 96846f1fd..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$GenesisTransaction.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $GenesisTransaction = {
-    description: `The genesis transaction
-
-    This only occurs at the genesis transaction (version 0)`,
-    properties: {
-        version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_change_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        event_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_checkpoint_hash: {
-            type: 'HashValue',
-        },
-        gas_used: {
-            type: 'U64',
-            isRequired: true,
-        },
-        success: {
-            type: 'boolean',
-            description: `Whether the transaction was successful`,
-            isRequired: true,
-        },
-        vm_status: {
-            type: 'string',
-            description: `The VM status of the transaction, can tell useful information in a failure`,
-            isRequired: true,
-        },
-        accumulator_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        changes: {
-            type: 'array',
-            contains: {
-                type: 'WriteSetChange',
-            },
-            isRequired: true,
-        },
-        payload: {
-            type: 'GenesisPayload',
-            isRequired: true,
-        },
-        events: {
-            type: 'array',
-            contains: {
-                type: 'Event',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$HashValue.ts b/m1/JavaScript-client/src/generated/schemas/$HashValue.ts
deleted file mode 100644
index 69bc6ed19..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$HashValue.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $HashValue = {
-    type: 'string',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$HealthCheckSuccess.ts b/m1/JavaScript-client/src/generated/schemas/$HealthCheckSuccess.ts
deleted file mode 100644
index bb42237d6..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$HealthCheckSuccess.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $HealthCheckSuccess = {
-    description: `Representation of a successful healthcheck`,
-    properties: {
-        message: {
-            type: 'string',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$HexEncodedBytes.ts b/m1/JavaScript-client/src/generated/schemas/$HexEncodedBytes.ts
deleted file mode 100644
index 69282bbad..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$HexEncodedBytes.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $HexEncodedBytes = {
-    type: 'string',
-    description: `All bytes (Vec<u8>) data is represented as hex-encoded string prefixed with \`0x\` and fulfilled with
-    two hex digits per byte.
-
-    Unlike the \`Address\` type, HexEncodedBytes will not trim any zeros.
-    `,
-    format: 'hex',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$IdentifierWrapper.ts b/m1/JavaScript-client/src/generated/schemas/$IdentifierWrapper.ts
deleted file mode 100644
index b139a50fc..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$IdentifierWrapper.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $IdentifierWrapper = {
-    type: 'string',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$IndexResponse.ts b/m1/JavaScript-client/src/generated/schemas/$IndexResponse.ts
deleted file mode 100644
index a9e1f9cfa..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$IndexResponse.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $IndexResponse = {
-    description: `The struct holding all data returned to the client by the
-    index endpoint (i.e., GET "/").  Only for responding in JSON`,
-    properties: {
-        chain_id: {
-            type: 'number',
-            description: `Chain ID of the current chain`,
-            isRequired: true,
-            format: 'uint8',
-        },
-        epoch: {
-            type: 'U64',
-            isRequired: true,
-        },
-        ledger_version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        oldest_ledger_version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        ledger_timestamp: {
-            type: 'U64',
-            isRequired: true,
-        },
-        node_role: {
-            type: 'RoleType',
-            isRequired: true,
-        },
-        oldest_block_height: {
-            type: 'U64',
-            isRequired: true,
-        },
-        block_height: {
-            type: 'U64',
-            isRequired: true,
-        },
-        git_hash: {
-            type: 'string',
-            description: `Git hash of the build of the API endpoint.  Can be used to determine the exact
-            software version used by the API endpoint.`,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$ModuleBundlePayload.ts b/m1/JavaScript-client/src/generated/schemas/$ModuleBundlePayload.ts
deleted file mode 100644
index 714ba9aac..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$ModuleBundlePayload.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $ModuleBundlePayload = {
-    properties: {
-        modules: {
-            type: 'array',
-            contains: {
-                type: 'MoveModuleBytecode',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveAbility.ts b/m1/JavaScript-client/src/generated/schemas/$MoveAbility.ts
deleted file mode 100644
index 40c3cd3c0..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveAbility.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveAbility = {
-    type: 'string',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveFunction.ts b/m1/JavaScript-client/src/generated/schemas/$MoveFunction.ts
deleted file mode 100644
index a813733b7..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveFunction.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveFunction = {
-    description: `Move function`,
-    properties: {
-        name: {
-            type: 'IdentifierWrapper',
-            isRequired: true,
-        },
-        visibility: {
-            type: 'MoveFunctionVisibility',
-            isRequired: true,
-        },
-        is_entry: {
-            type: 'boolean',
-            description: `Whether the function can be called as an entry function directly in a transaction`,
-            isRequired: true,
-        },
-        is_view: {
-            type: 'boolean',
-            description: `Whether the function is a view function or not`,
-            isRequired: true,
-        },
-        generic_type_params: {
-            type: 'array',
-            contains: {
-                type: 'MoveFunctionGenericTypeParam',
-            },
-            isRequired: true,
-        },
-        params: {
-            type: 'array',
-            contains: {
-                type: 'MoveType',
-            },
-            isRequired: true,
-        },
-        return: {
-            type: 'array',
-            contains: {
-                type: 'MoveType',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveFunctionGenericTypeParam.ts b/m1/JavaScript-client/src/generated/schemas/$MoveFunctionGenericTypeParam.ts
deleted file mode 100644
index 9d739aacd..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveFunctionGenericTypeParam.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveFunctionGenericTypeParam = {
-    description: `Move function generic type param`,
-    properties: {
-        constraints: {
-            type: 'array',
-            contains: {
-                type: 'MoveAbility',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveFunctionVisibility.ts b/m1/JavaScript-client/src/generated/schemas/$MoveFunctionVisibility.ts
deleted file mode 100644
index 25ea8043c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveFunctionVisibility.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveFunctionVisibility = {
-    type: 'Enum',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveModule.ts b/m1/JavaScript-client/src/generated/schemas/$MoveModule.ts
deleted file mode 100644
index 38a42525a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveModule.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveModule = {
-    description: `A Move module`,
-    properties: {
-        address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        name: {
-            type: 'IdentifierWrapper',
-            isRequired: true,
-        },
-        friends: {
-            type: 'array',
-            contains: {
-                type: 'MoveModuleId',
-            },
-            isRequired: true,
-        },
-        exposed_functions: {
-            type: 'array',
-            contains: {
-                type: 'MoveFunction',
-            },
-            isRequired: true,
-        },
-        structs: {
-            type: 'array',
-            contains: {
-                type: 'MoveStruct',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveModuleBytecode.ts b/m1/JavaScript-client/src/generated/schemas/$MoveModuleBytecode.ts
deleted file mode 100644
index 801d994ec..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveModuleBytecode.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveModuleBytecode = {
-    description: `Move module bytecode along with it's ABI`,
-    properties: {
-        bytecode: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        abi: {
-            type: 'MoveModule',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveModuleId.ts b/m1/JavaScript-client/src/generated/schemas/$MoveModuleId.ts
deleted file mode 100644
index 338679c7a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveModuleId.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveModuleId = {
-    type: 'string',
-    description: `Move module id is a string representation of Move module.
-
-    Format: \`{address}::{module name}\`
-
-    \`address\` should be hex-encoded 32 byte account address that is prefixed with \`0x\`.
-
-    Module name is case-sensitive.
-    `,
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveResource.ts b/m1/JavaScript-client/src/generated/schemas/$MoveResource.ts
deleted file mode 100644
index e1abb5a01..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveResource.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveResource = {
-    description: `A parsed Move resource`,
-    properties: {
-        type: {
-            type: 'MoveStructTag',
-            isRequired: true,
-        },
-        data: {
-            type: 'MoveStructValue',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveScriptBytecode.ts b/m1/JavaScript-client/src/generated/schemas/$MoveScriptBytecode.ts
deleted file mode 100644
index 3951245ac..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveScriptBytecode.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveScriptBytecode = {
-    description: `Move script bytecode`,
-    properties: {
-        bytecode: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        abi: {
-            type: 'MoveFunction',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveStruct.ts b/m1/JavaScript-client/src/generated/schemas/$MoveStruct.ts
deleted file mode 100644
index 8d79ad36c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveStruct.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveStruct = {
-    description: `A move struct`,
-    properties: {
-        name: {
-            type: 'IdentifierWrapper',
-            isRequired: true,
-        },
-        is_native: {
-            type: 'boolean',
-            description: `Whether the struct is a native struct of Move`,
-            isRequired: true,
-        },
-        abilities: {
-            type: 'array',
-            contains: {
-                type: 'MoveAbility',
-            },
-            isRequired: true,
-        },
-        generic_type_params: {
-            type: 'array',
-            contains: {
-                type: 'MoveStructGenericTypeParam',
-            },
-            isRequired: true,
-        },
-        fields: {
-            type: 'array',
-            contains: {
-                type: 'MoveStructField',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveStructField.ts b/m1/JavaScript-client/src/generated/schemas/$MoveStructField.ts
deleted file mode 100644
index 7ab94104a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveStructField.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveStructField = {
-    description: `Move struct field`,
-    properties: {
-        name: {
-            type: 'IdentifierWrapper',
-            isRequired: true,
-        },
-        type: {
-            type: 'MoveType',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveStructGenericTypeParam.ts b/m1/JavaScript-client/src/generated/schemas/$MoveStructGenericTypeParam.ts
deleted file mode 100644
index b4a60c99c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveStructGenericTypeParam.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveStructGenericTypeParam = {
-    description: `Move generic type param`,
-    properties: {
-        constraints: {
-            type: 'array',
-            contains: {
-                type: 'MoveAbility',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveStructTag.ts b/m1/JavaScript-client/src/generated/schemas/$MoveStructTag.ts
deleted file mode 100644
index 0bd557c6c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveStructTag.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveStructTag = {
-    type: 'string',
-    description: `String representation of a MoveStructTag (on-chain Move struct type). This exists so you
-    can specify MoveStructTags as path / query parameters, e.g. for get_events_by_event_handle.
-
-    It is a combination of:
-    1. \`move_module_address\`, \`module_name\` and \`struct_name\`, all joined by \`::\`
-    2. \`struct generic type parameters\` joined by \`, \`
-
-    Examples:
-     * \`0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>\`
-     * \`0x1::account::Account\`
-
-    Note:
-    1. Empty chars should be ignored when comparing 2 struct tag ids.
-    2. When used in an URL path, should be encoded by url-encoding (AKA percent-encoding).
-
-    See [doc](https://aptos.dev/concepts/accounts) for more details.
-    `,
-    pattern: '^0x[0-9a-zA-Z:_<>]+$',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveStructValue.ts b/m1/JavaScript-client/src/generated/schemas/$MoveStructValue.ts
deleted file mode 100644
index bff113d62..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveStructValue.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveStructValue = {
-    description: `This is a JSON representation of some data within an account resource. More specifically,
-    it is a map of strings to arbitrary JSON values / objects, where the keys are top level
-    fields within the given resource.
-
-    To clarify, you might query for 0x1::account::Account and see the example data.
-
-    Move \`bool\` type value is serialized into \`boolean\`.
-
-    Move \`u8\`, \`u16\` and \`u32\` type value is serialized into \`integer\`.
-
-    Move \`u64\`, \`u128\` and \`u256\` type value is serialized into \`string\`.
-
-    Move \`address\` type value (32 byte Aptos account address) is serialized into a HexEncodedBytes string.
-    For example:
-    - \`0x1\`
-    - \`0x1668f6be25668c1a17cd8caf6b8d2f25\`
-
-    Move \`vector\` type value is serialized into \`array\`, except \`vector<u8>\` which is serialized into a
-    HexEncodedBytes string with \`0x\` prefix.
-    For example:
-    - \`vector<u64>{255, 255}\` => \`["255", "255"]\`
-    - \`vector<u8>{255, 255}\` => \`0xffff\`
-
-    Move \`struct\` type value is serialized into \`object\` that looks like this (except some Move stdlib types, see the following section):
-    \`\`\`json
-    {
-        field1_name: field1_value,
-        field2_name: field2_value,
-        ......
-    }
-    \`\`\`
-
-    For example:
-    \`{ "created": "0xa550c18", "role_id": "0" }\`
-
-     **Special serialization for Move stdlib types**:
-    - [0x1::string::String](https://github.com/aptos-labs/aptos-core/blob/main/language/move-stdlib/docs/ascii.md)
-    is serialized into \`string\`. For example, struct value \`0x1::string::String{bytes: b"Hello World!"}\`
-    is serialized as \`"Hello World!"\` in JSON.
-    `,
-    properties: {
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveType.ts b/m1/JavaScript-client/src/generated/schemas/$MoveType.ts
deleted file mode 100644
index 56f4279bd..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveType.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveType = {
-    type: 'string',
-    description: `String representation of an on-chain Move type tag that is exposed in transaction payload.
-    Values:
-    - bool
-    - u8
-    - u16
-    - u32
-    - u64
-    - u128
-    - u256
-    - address
-    - signer
-    - vector: \`vector<{non-reference MoveTypeId}>\`
-    - struct: \`{address}::{module_name}::{struct_name}::<{generic types}>\`
-
-    Vector type value examples:
-    - \`vector<u8>\`
-    - \`vector<vector<u64>>\`
-    - \`vector<0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>>\`
-
-    Struct type value examples:
-    - \`0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>
-    - \`0x1::account::Account\`
-
-    Note:
-    1. Empty chars should be ignored when comparing 2 struct tag ids.
-    2. When used in an URL path, should be encoded by url-encoding (AKA percent-encoding).
-    `,
-    pattern: '^(bool|u8|u64|u128|address|signer|vector<.+>|0x[0-9a-zA-Z:_<, >]+)$',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MoveValue.ts b/m1/JavaScript-client/src/generated/schemas/$MoveValue.ts
deleted file mode 100644
index c4ac27bf7..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MoveValue.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MoveValue = {
-    type: 'any-of',
-    description: `An enum of the possible Move value types`,
-    contains: [{
-        type: 'number',
-        format: 'uint8',
-    }, {
-        type: 'number',
-        format: 'uint16',
-    }, {
-        type: 'number',
-        format: 'uint32',
-    }, {
-        type: 'U64',
-    }, {
-        type: 'U128',
-    }, {
-        type: 'U256',
-    }, {
-        type: 'boolean',
-    }, {
-        type: 'Address',
-    }, {
-        type: 'array',
-        contains: {
-            type: 'MoveValue',
-        },
-    }, {
-        type: 'HexEncodedBytes',
-    }, {
-        type: 'MoveStructValue',
-    }, {
-        type: 'string',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MultiAgentSignature.ts b/m1/JavaScript-client/src/generated/schemas/$MultiAgentSignature.ts
deleted file mode 100644
index 3c1cff182..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MultiAgentSignature.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MultiAgentSignature = {
-    description: `Multi agent signature for multi agent transactions
-
-    This allows you to have transactions across multiple accounts`,
-    properties: {
-        sender: {
-            type: 'AccountSignature',
-            isRequired: true,
-        },
-        secondary_signer_addresses: {
-            type: 'array',
-            contains: {
-                type: 'Address',
-            },
-            isRequired: true,
-        },
-        secondary_signers: {
-            type: 'array',
-            contains: {
-                type: 'AccountSignature',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$MultiEd25519Signature.ts
deleted file mode 100644
index 1af586f67..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MultiEd25519Signature.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MultiEd25519Signature = {
-    description: `A Ed25519 multi-sig signature
-
-    This allows k-of-n signing for a transaction`,
-    properties: {
-        public_keys: {
-            type: 'array',
-            contains: {
-                type: 'HexEncodedBytes',
-            },
-            isRequired: true,
-        },
-        signatures: {
-            type: 'array',
-            contains: {
-                type: 'HexEncodedBytes',
-            },
-            isRequired: true,
-        },
-        threshold: {
-            type: 'number',
-            description: `The number of signatures required for a successful transaction`,
-            isRequired: true,
-            format: 'uint8',
-        },
-        bitmap: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MultisigPayload.ts b/m1/JavaScript-client/src/generated/schemas/$MultisigPayload.ts
deleted file mode 100644
index 3db2ec250..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MultisigPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MultisigPayload = {
-    description: `A multisig transaction that allows an owner of a multisig account to execute a pre-approved
-    transaction as the multisig account.`,
-    properties: {
-        multisig_address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        transaction_payload: {
-            type: 'MultisigTransactionPayload',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$MultisigTransactionPayload.ts b/m1/JavaScript-client/src/generated/schemas/$MultisigTransactionPayload.ts
deleted file mode 100644
index d1f7dec50..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$MultisigTransactionPayload.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $MultisigTransactionPayload = {
-    type: 'any-of',
-    contains: [{
-        type: 'EntryFunctionPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$PendingTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$PendingTransaction.ts
deleted file mode 100644
index cffa02859..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$PendingTransaction.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $PendingTransaction = {
-    description: `A transaction waiting in mempool`,
-    properties: {
-        hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        sender: {
-            type: 'Address',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        max_gas_amount: {
-            type: 'U64',
-            isRequired: true,
-        },
-        gas_unit_price: {
-            type: 'U64',
-            isRequired: true,
-        },
-        expiration_timestamp_secs: {
-            type: 'U64',
-            isRequired: true,
-        },
-        payload: {
-            type: 'TransactionPayload',
-            isRequired: true,
-        },
-        signature: {
-            type: 'TransactionSignature',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$RawTableItemRequest.ts b/m1/JavaScript-client/src/generated/schemas/$RawTableItemRequest.ts
deleted file mode 100644
index b8fc9f023..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$RawTableItemRequest.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $RawTableItemRequest = {
-    description: `Table Item request for the GetTableItemRaw API`,
-    properties: {
-        key: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$RoleType.ts b/m1/JavaScript-client/src/generated/schemas/$RoleType.ts
deleted file mode 100644
index 2f64bda0b..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$RoleType.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $RoleType = {
-    type: 'Enum',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$ScriptPayload.ts b/m1/JavaScript-client/src/generated/schemas/$ScriptPayload.ts
deleted file mode 100644
index cf52931c6..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$ScriptPayload.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $ScriptPayload = {
-    description: `Payload which runs a script that can run multiple functions`,
-    properties: {
-        code: {
-            type: 'MoveScriptBytecode',
-            isRequired: true,
-        },
-        type_arguments: {
-            type: 'array',
-            contains: {
-                type: 'MoveType',
-            },
-            isRequired: true,
-        },
-        arguments: {
-            type: 'array',
-            contains: {
-                properties: {
-                },
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$ScriptWriteSet.ts b/m1/JavaScript-client/src/generated/schemas/$ScriptWriteSet.ts
deleted file mode 100644
index 81effeee1..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$ScriptWriteSet.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $ScriptWriteSet = {
-    properties: {
-        execute_as: {
-            type: 'Address',
-            isRequired: true,
-        },
-        script: {
-            type: 'ScriptPayload',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$StateCheckpointTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$StateCheckpointTransaction.ts
deleted file mode 100644
index 608c8980a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$StateCheckpointTransaction.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $StateCheckpointTransaction = {
-    description: `A state checkpoint transaction`,
-    properties: {
-        version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_change_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        event_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_checkpoint_hash: {
-            type: 'HashValue',
-        },
-        gas_used: {
-            type: 'U64',
-            isRequired: true,
-        },
-        success: {
-            type: 'boolean',
-            description: `Whether the transaction was successful`,
-            isRequired: true,
-        },
-        vm_status: {
-            type: 'string',
-            description: `The VM status of the transaction, can tell useful information in a failure`,
-            isRequired: true,
-        },
-        accumulator_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        changes: {
-            type: 'array',
-            contains: {
-                type: 'WriteSetChange',
-            },
-            isRequired: true,
-        },
-        timestamp: {
-            type: 'U64',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$StateKeyWrapper.ts b/m1/JavaScript-client/src/generated/schemas/$StateKeyWrapper.ts
deleted file mode 100644
index e4b0eb8ec..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$StateKeyWrapper.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $StateKeyWrapper = {
-    type: 'string',
-    description: `Representation of a StateKey as a hex string. This is used for cursor based pagination.
-    `,
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$SubmitTransactionRequest.ts b/m1/JavaScript-client/src/generated/schemas/$SubmitTransactionRequest.ts
deleted file mode 100644
index 4740d4a7d..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$SubmitTransactionRequest.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $SubmitTransactionRequest = {
-    description: `A request to submit a transaction
-
-    This requires a transaction and a signature of it`,
-    properties: {
-        sender: {
-            type: 'Address',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        max_gas_amount: {
-            type: 'U64',
-            isRequired: true,
-        },
-        gas_unit_price: {
-            type: 'U64',
-            isRequired: true,
-        },
-        expiration_timestamp_secs: {
-            type: 'U64',
-            isRequired: true,
-        },
-        payload: {
-            type: 'TransactionPayload',
-            isRequired: true,
-        },
-        signature: {
-            type: 'TransactionSignature',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TableItemRequest.ts b/m1/JavaScript-client/src/generated/schemas/$TableItemRequest.ts
deleted file mode 100644
index 6cd81ea5c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TableItemRequest.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TableItemRequest = {
-    description: `Table Item request for the GetTableItem API`,
-    properties: {
-        key_type: {
-            type: 'MoveType',
-            isRequired: true,
-        },
-        value_type: {
-            type: 'MoveType',
-            isRequired: true,
-        },
-        key: {
-            description: `The value of the table item's key`,
-            properties: {
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction.ts
deleted file mode 100644
index 0aa1e257d..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction = {
-    type: 'one-of',
-    description: `Enum of the different types of transactions in Aptos`,
-    contains: [{
-        type: 'Transaction_PendingTransaction',
-    }, {
-        type: 'Transaction_UserTransaction',
-    }, {
-        type: 'Transaction_GenesisTransaction',
-    }, {
-        type: 'Transaction_BlockMetadataTransaction',
-    }, {
-        type: 'Transaction_StateCheckpointTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionPayload.ts
deleted file mode 100644
index 9f8d72da2..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionPayload = {
-    type: 'one-of',
-    description: `An enum of the possible transaction payloads`,
-    contains: [{
-        type: 'TransactionPayload_EntryFunctionPayload',
-    }, {
-        type: 'TransactionPayload_ScriptPayload',
-    }, {
-        type: 'TransactionPayload_ModuleBundlePayload',
-    }, {
-        type: 'TransactionPayload_MultisigPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_EntryFunctionPayload.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_EntryFunctionPayload.ts
deleted file mode 100644
index e7ea8d6c8..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_EntryFunctionPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionPayload_EntryFunctionPayload = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'EntryFunctionPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ModuleBundlePayload.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ModuleBundlePayload.ts
deleted file mode 100644
index 4ee6f0add..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ModuleBundlePayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionPayload_ModuleBundlePayload = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'ModuleBundlePayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_MultisigPayload.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_MultisigPayload.ts
deleted file mode 100644
index 18ee4df67..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_MultisigPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionPayload_MultisigPayload = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'MultisigPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ScriptPayload.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ScriptPayload.ts
deleted file mode 100644
index d15b4c865..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionPayload_ScriptPayload.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionPayload_ScriptPayload = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'ScriptPayload',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionSignature.ts
deleted file mode 100644
index 08df557f2..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionSignature = {
-    type: 'one-of',
-    description: `An enum representing the different transaction signatures available`,
-    contains: [{
-        type: 'TransactionSignature_Ed25519Signature',
-    }, {
-        type: 'TransactionSignature_MultiEd25519Signature',
-    }, {
-        type: 'TransactionSignature_MultiAgentSignature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_Ed25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_Ed25519Signature.ts
deleted file mode 100644
index 2f754f0cb..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_Ed25519Signature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionSignature_Ed25519Signature = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'Ed25519Signature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiAgentSignature.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiAgentSignature.ts
deleted file mode 100644
index c6c6ce5fd..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiAgentSignature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionSignature_MultiAgentSignature = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'MultiAgentSignature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiEd25519Signature.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiEd25519Signature.ts
deleted file mode 100644
index e6ffaf205..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionSignature_MultiEd25519Signature.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionSignature_MultiEd25519Signature = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'MultiEd25519Signature',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction_BlockMetadataTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction_BlockMetadataTransaction.ts
deleted file mode 100644
index 55aa7c461..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction_BlockMetadataTransaction.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction_BlockMetadataTransaction = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'BlockMetadataTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction_GenesisTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction_GenesisTransaction.ts
deleted file mode 100644
index adb40078a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction_GenesisTransaction.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction_GenesisTransaction = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'GenesisTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction_PendingTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction_PendingTransaction.ts
deleted file mode 100644
index 8663a50be..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction_PendingTransaction.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction_PendingTransaction = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'PendingTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction_StateCheckpointTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction_StateCheckpointTransaction.ts
deleted file mode 100644
index 19435016f..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction_StateCheckpointTransaction.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction_StateCheckpointTransaction = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'StateCheckpointTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$Transaction_UserTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$Transaction_UserTransaction.ts
deleted file mode 100644
index b0bbf989c..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$Transaction_UserTransaction.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $Transaction_UserTransaction = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'UserTransaction',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSingleSubmissionFailure.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSingleSubmissionFailure.ts
deleted file mode 100644
index 2f6465cc3..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSingleSubmissionFailure.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionsBatchSingleSubmissionFailure = {
-    description: `Information telling which batch submission transactions failed`,
-    properties: {
-        error: {
-            type: 'AptosError',
-            isRequired: true,
-        },
-        transaction_index: {
-            type: 'number',
-            description: `The index of which transaction failed, same as submission order`,
-            isRequired: true,
-            format: 'uint64',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSubmissionResult.ts b/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSubmissionResult.ts
deleted file mode 100644
index 3e04e03ca..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$TransactionsBatchSubmissionResult.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $TransactionsBatchSubmissionResult = {
-    description: `Batch transaction submission result
-
-    Tells which transactions failed`,
-    properties: {
-        transaction_failures: {
-            type: 'array',
-            contains: {
-                type: 'TransactionsBatchSingleSubmissionFailure',
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$U128.ts b/m1/JavaScript-client/src/generated/schemas/$U128.ts
deleted file mode 100644
index 645248548..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$U128.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $U128 = {
-    type: 'string',
-    description: `A string containing a 128-bit unsigned integer.
-
-    We represent u128 values as a string to ensure compatibility with languages such
-    as JavaScript that do not parse u128s in JSON natively.
-    `,
-    format: 'uint128',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$U256.ts b/m1/JavaScript-client/src/generated/schemas/$U256.ts
deleted file mode 100644
index 20e7c0e14..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$U256.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $U256 = {
-    type: 'string',
-    description: `A string containing a 256-bit unsigned integer.
-
-    We represent u256 values as a string to ensure compatibility with languages such
-    as JavaScript that do not parse u256s in JSON natively.
-    `,
-    format: 'uint256',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$U64.ts b/m1/JavaScript-client/src/generated/schemas/$U64.ts
deleted file mode 100644
index c98a054b1..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$U64.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $U64 = {
-    type: 'string',
-    description: `A string containing a 64-bit unsigned integer.
-
-    We represent u64 values as a string to ensure compatibility with languages such
-    as JavaScript that do not parse u64s in JSON natively.
-    `,
-    format: 'uint64',
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$UserTransaction.ts b/m1/JavaScript-client/src/generated/schemas/$UserTransaction.ts
deleted file mode 100644
index 2ef0ed7ee..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$UserTransaction.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $UserTransaction = {
-    description: `A transaction submitted by a user to change the state of the blockchain`,
-    properties: {
-        version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_change_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        event_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        state_checkpoint_hash: {
-            type: 'HashValue',
-        },
-        gas_used: {
-            type: 'U64',
-            isRequired: true,
-        },
-        success: {
-            type: 'boolean',
-            description: `Whether the transaction was successful`,
-            isRequired: true,
-        },
-        vm_status: {
-            type: 'string',
-            description: `The VM status of the transaction, can tell useful information in a failure`,
-            isRequired: true,
-        },
-        accumulator_root_hash: {
-            type: 'HashValue',
-            isRequired: true,
-        },
-        changes: {
-            type: 'array',
-            contains: {
-                type: 'WriteSetChange',
-            },
-            isRequired: true,
-        },
-        sender: {
-            type: 'Address',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        max_gas_amount: {
-            type: 'U64',
-            isRequired: true,
-        },
-        gas_unit_price: {
-            type: 'U64',
-            isRequired: true,
-        },
-        expiration_timestamp_secs: {
-            type: 'U64',
-            isRequired: true,
-        },
-        payload: {
-            type: 'TransactionPayload',
-            isRequired: true,
-        },
-        signature: {
-            type: 'TransactionSignature',
-        },
-        events: {
-            type: 'array',
-            contains: {
-                type: 'Event',
-            },
-            isRequired: true,
-        },
-        timestamp: {
-            type: 'U64',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$VersionedEvent.ts b/m1/JavaScript-client/src/generated/schemas/$VersionedEvent.ts
deleted file mode 100644
index 7e935382a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$VersionedEvent.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $VersionedEvent = {
-    description: `An event from a transaction with a version`,
-    properties: {
-        version: {
-            type: 'U64',
-            isRequired: true,
-        },
-        guid: {
-            type: 'EventGuid',
-            isRequired: true,
-        },
-        sequence_number: {
-            type: 'U64',
-            isRequired: true,
-        },
-        type: {
-            type: 'MoveType',
-            isRequired: true,
-        },
-        data: {
-            description: `The JSON representation of the event`,
-            properties: {
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$ViewRequest.ts b/m1/JavaScript-client/src/generated/schemas/$ViewRequest.ts
deleted file mode 100644
index 28994b8e4..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$ViewRequest.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $ViewRequest = {
-    description: `View request for the Move View Function API`,
-    properties: {
-        function: {
-            type: 'EntryFunctionId',
-            isRequired: true,
-        },
-        type_arguments: {
-            type: 'array',
-            contains: {
-                type: 'MoveType',
-            },
-            isRequired: true,
-        },
-        arguments: {
-            type: 'array',
-            contains: {
-                properties: {
-                },
-            },
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteModule.ts b/m1/JavaScript-client/src/generated/schemas/$WriteModule.ts
deleted file mode 100644
index cd41e48e8..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteModule.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteModule = {
-    description: `Write a new module or update an existing one`,
-    properties: {
-        address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        state_key_hash: {
-            type: 'string',
-            description: `State key hash`,
-            isRequired: true,
-        },
-        data: {
-            type: 'MoveModuleBytecode',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteResource.ts b/m1/JavaScript-client/src/generated/schemas/$WriteResource.ts
deleted file mode 100644
index aff2055a8..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteResource.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteResource = {
-    description: `Write a resource or update an existing one`,
-    properties: {
-        address: {
-            type: 'Address',
-            isRequired: true,
-        },
-        state_key_hash: {
-            type: 'string',
-            description: `State key hash`,
-            isRequired: true,
-        },
-        data: {
-            type: 'MoveResource',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSet.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSet.ts
deleted file mode 100644
index a6a86944e..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSet.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSet = {
-    type: 'one-of',
-    description: `The associated writeset with a payload`,
-    contains: [{
-        type: 'WriteSet_ScriptWriteSet',
-    }, {
-        type: 'WriteSet_DirectWriteSet',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange.ts
deleted file mode 100644
index c6c2edb0a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange = {
-    type: 'one-of',
-    description: `A final state change of a transaction on a resource or module`,
-    contains: [{
-        type: 'WriteSetChange_DeleteModule',
-    }, {
-        type: 'WriteSetChange_DeleteResource',
-    }, {
-        type: 'WriteSetChange_DeleteTableItem',
-    }, {
-        type: 'WriteSetChange_WriteModule',
-    }, {
-        type: 'WriteSetChange_WriteResource',
-    }, {
-        type: 'WriteSetChange_WriteTableItem',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteModule.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteModule.ts
deleted file mode 100644
index 2ec713287..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteModule.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_DeleteModule = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'DeleteModule',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteResource.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteResource.ts
deleted file mode 100644
index 8346da07a..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteResource.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_DeleteResource = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'DeleteResource',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteTableItem.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteTableItem.ts
deleted file mode 100644
index ae905f573..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_DeleteTableItem.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_DeleteTableItem = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'DeleteTableItem',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteModule.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteModule.ts
deleted file mode 100644
index d0ec80fb5..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteModule.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_WriteModule = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'WriteModule',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteResource.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteResource.ts
deleted file mode 100644
index 9febd5b83..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteResource.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_WriteResource = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'WriteResource',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteTableItem.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteTableItem.ts
deleted file mode 100644
index eb8d77dee..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetChange_WriteTableItem.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetChange_WriteTableItem = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'WriteTableItem',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSetPayload.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSetPayload.ts
deleted file mode 100644
index abe858d63..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSetPayload.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSetPayload = {
-    description: `A writeset payload, used only for genesis`,
-    properties: {
-        write_set: {
-            type: 'WriteSet',
-            isRequired: true,
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSet_DirectWriteSet.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSet_DirectWriteSet.ts
deleted file mode 100644
index d9d893581..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSet_DirectWriteSet.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSet_DirectWriteSet = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'DirectWriteSet',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteSet_ScriptWriteSet.ts b/m1/JavaScript-client/src/generated/schemas/$WriteSet_ScriptWriteSet.ts
deleted file mode 100644
index b3a3ebeee..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteSet_ScriptWriteSet.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteSet_ScriptWriteSet = {
-    type: 'all-of',
-    contains: [{
-        properties: {
-            type: {
-                type: 'string',
-                isRequired: true,
-            },
-        },
-    }, {
-        type: 'ScriptWriteSet',
-    }],
-} as const;
diff --git a/m1/JavaScript-client/src/generated/schemas/$WriteTableItem.ts b/m1/JavaScript-client/src/generated/schemas/$WriteTableItem.ts
deleted file mode 100644
index 1d1273fdc..000000000
--- a/m1/JavaScript-client/src/generated/schemas/$WriteTableItem.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export const $WriteTableItem = {
-    description: `Change set to write a table item`,
-    properties: {
-        state_key_hash: {
-            type: 'string',
-            isRequired: true,
-        },
-        handle: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        key: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        value: {
-            type: 'HexEncodedBytes',
-            isRequired: true,
-        },
-        data: {
-            type: 'DecodedTableData',
-        },
-    },
-} as const;
diff --git a/m1/JavaScript-client/src/generated/services/AccountsService.ts b/m1/JavaScript-client/src/generated/services/AccountsService.ts
deleted file mode 100644
index 08f87cba6..000000000
--- a/m1/JavaScript-client/src/generated/services/AccountsService.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { AccountData } from '../models/AccountData';
-import type { Address } from '../models/Address';
-import type { IdentifierWrapper } from '../models/IdentifierWrapper';
-import type { MoveModuleBytecode } from '../models/MoveModuleBytecode';
-import type { MoveResource } from '../models/MoveResource';
-import type { MoveStructTag } from '../models/MoveStructTag';
-import type { StateKeyWrapper } from '../models/StateKeyWrapper';
-import type { U64 } from '../models/U64';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class AccountsService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Get account
-     * Return the authentication key and the sequence number for an account
-     * address. Optionally, a ledger version can be specified. If the ledger
-     * version is not specified in the request, the latest ledger version is used.
-     * @param address Address of account with or without a `0x` prefix
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns AccountData
-     * @throws ApiError
-     */
-    public getAccount(
-        address: Address,
-        ledgerVersion?: U64,
-    ): CancelablePromise<AccountData> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}',
-            path: {
-                'address': address,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-        });
-    }
-
-    /**
-     * Get account resources
-     * Retrieves all account resources for a given account and a specific ledger version.  If the
-     * ledger version is not specified in the request, the latest ledger version is used.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param address Address of account with or without a `0x` prefix
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @param start Cursor specifying where to start for pagination
-     *
-     * This cursor cannot be derived manually client-side. Instead, you must
-     * call this endpoint once without this query parameter specified, and
-     * then use the cursor returned in the X-Aptos-Cursor header in the
-     * response.
-     * @param limit Max number of account resources to retrieve
-     *
-     * If not provided, defaults to default page size.
-     * @returns MoveResource
-     * @throws ApiError
-     */
-    public getAccountResources(
-        address: Address,
-        ledgerVersion?: U64,
-        start?: StateKeyWrapper,
-        limit?: number,
-    ): CancelablePromise<Array<MoveResource>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/resources',
-            path: {
-                'address': address,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-    /**
-     * Get account modules
-     * Retrieves all account modules' bytecode for a given account at a specific ledger version.
-     * If the ledger version is not specified in the request, the latest ledger version is used.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param address Address of account with or without a `0x` prefix
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @param start Cursor specifying where to start for pagination
-     *
-     * This cursor cannot be derived manually client-side. Instead, you must
-     * call this endpoint once without this query parameter specified, and
-     * then use the cursor returned in the X-Aptos-Cursor header in the
-     * response.
-     * @param limit Max number of account modules to retrieve
-     *
-     * If not provided, defaults to default page size.
-     * @returns MoveModuleBytecode
-     * @throws ApiError
-     */
-    public getAccountModules(
-        address: Address,
-        ledgerVersion?: U64,
-        start?: StateKeyWrapper,
-        limit?: number,
-    ): CancelablePromise<Array<MoveModuleBytecode>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/modules',
-            path: {
-                'address': address,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-    /**
-     * Get account resource
-     * Retrieves an individual resource from a given account and at a specific ledger version. If the
-     * ledger version is not specified in the request, the latest ledger version is used.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param address Address of account with or without a `0x` prefix
-     * @param resourceType Name of struct to retrieve e.g. `0x1::account::Account`
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns MoveResource
-     * @throws ApiError
-     */
-    public getAccountResource(
-        address: Address,
-        resourceType: MoveStructTag,
-        ledgerVersion?: U64,
-    ): CancelablePromise<MoveResource> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/resource/{resource_type}',
-            path: {
-                'address': address,
-                'resource_type': resourceType,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-        });
-    }
-
-    /**
-     * Get account module
-     * Retrieves an individual module from a given account and at a specific ledger version. If the
-     * ledger version is not specified in the request, the latest ledger version is used.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param address Address of account with or without a `0x` prefix
-     * @param moduleName Name of module to retrieve e.g. `coin`
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns MoveModuleBytecode
-     * @throws ApiError
-     */
-    public getAccountModule(
-        address: Address,
-        moduleName: IdentifierWrapper,
-        ledgerVersion?: U64,
-    ): CancelablePromise<MoveModuleBytecode> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/module/{module_name}',
-            path: {
-                'address': address,
-                'module_name': moduleName,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/BlocksService.ts b/m1/JavaScript-client/src/generated/services/BlocksService.ts
deleted file mode 100644
index b9dbe17b5..000000000
--- a/m1/JavaScript-client/src/generated/services/BlocksService.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Block } from '../models/Block';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class BlocksService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Get blocks by height
-     * This endpoint allows you to get the transactions in a block
-     * and the corresponding block information.
-     *
-     * Transactions are limited by max default transactions size.  If not all transactions
-     * are present, the user will need to query for the rest of the transactions via the
-     * get transactions API.
-     *
-     * If the block is pruned, it will return a 410
-     * @param blockHeight Block height to lookup.  Starts at 0
-     * @param withTransactions If set to true, include all transactions in the block
-     *
-     * If not provided, no transactions will be retrieved
-     * @returns Block
-     * @throws ApiError
-     */
-    public getBlockByHeight(
-        blockHeight: number,
-        withTransactions?: boolean,
-    ): CancelablePromise<Block> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/blocks/by_height/{block_height}',
-            path: {
-                'block_height': blockHeight,
-            },
-            query: {
-                'with_transactions': withTransactions,
-            },
-        });
-    }
-
-    /**
-     * Get blocks by version
-     * This endpoint allows you to get the transactions in a block
-     * and the corresponding block information given a version in the block.
-     *
-     * Transactions are limited by max default transactions size.  If not all transactions
-     * are present, the user will need to query for the rest of the transactions via the
-     * get transactions API.
-     *
-     * If the block has been pruned, it will return a 410
-     * @param version Ledger version to lookup block information for.
-     * @param withTransactions If set to true, include all transactions in the block
-     *
-     * If not provided, no transactions will be retrieved
-     * @returns Block
-     * @throws ApiError
-     */
-    public getBlockByVersion(
-        version: number,
-        withTransactions?: boolean,
-    ): CancelablePromise<Block> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/blocks/by_version/{version}',
-            path: {
-                'version': version,
-            },
-            query: {
-                'with_transactions': withTransactions,
-            },
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/EventsService.ts b/m1/JavaScript-client/src/generated/services/EventsService.ts
deleted file mode 100644
index 9396944b1..000000000
--- a/m1/JavaScript-client/src/generated/services/EventsService.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Address } from '../models/Address';
-import type { IdentifierWrapper } from '../models/IdentifierWrapper';
-import type { MoveStructTag } from '../models/MoveStructTag';
-import type { U64 } from '../models/U64';
-import type { VersionedEvent } from '../models/VersionedEvent';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class EventsService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Get events by creation number
-     * Event types are globally identifiable by an account `address` and
-     * monotonically increasing `creation_number`, one per event type emitted
-     * to the given account. This API returns events corresponding to that
-     * that event type.
-     * @param address Hex-encoded 32 byte Aptos account, with or without a `0x` prefix, for
-     * which events are queried. This refers to the account that events were
-     * emitted to, not the account hosting the move module that emits that
-     * event type.
-     * @param creationNumber Creation number corresponding to the event stream originating
-     * from the given account.
-     * @param start Starting sequence number of events.
-     *
-     * If unspecified, by default will retrieve the most recent events
-     * @param limit Max number of events to retrieve.
-     *
-     * If unspecified, defaults to default page size
-     * @returns VersionedEvent
-     * @throws ApiError
-     */
-    public getEventsByCreationNumber(
-        address: Address,
-        creationNumber: U64,
-        start?: U64,
-        limit?: number,
-    ): CancelablePromise<Array<VersionedEvent>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/events/{creation_number}',
-            path: {
-                'address': address,
-                'creation_number': creationNumber,
-            },
-            query: {
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-    /**
-     * Get events by event handle
-     * This API uses the given account `address`, `eventHandle`, and `fieldName`
-     * to build a key that can globally identify an event types. It then uses this
-     * key to return events emitted to the given account matching that event type.
-     * @param address Hex-encoded 32 byte Aptos account, with or without a `0x` prefix, for
-     * which events are queried. This refers to the account that events were
-     * emitted to, not the account hosting the move module that emits that
-     * event type.
-     * @param eventHandle Name of struct to lookup event handle e.g. `0x1::account::Account`
-     * @param fieldName Name of field to lookup event handle e.g. `withdraw_events`
-     * @param start Starting sequence number of events.
-     *
-     * If unspecified, by default will retrieve the most recent
-     * @param limit Max number of events to retrieve.
-     *
-     * If unspecified, defaults to default page size
-     * @returns VersionedEvent
-     * @throws ApiError
-     */
-    public getEventsByEventHandle(
-        address: Address,
-        eventHandle: MoveStructTag,
-        fieldName: IdentifierWrapper,
-        start?: U64,
-        limit?: number,
-    ): CancelablePromise<Array<VersionedEvent>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/events/{event_handle}/{field_name}',
-            path: {
-                'address': address,
-                'event_handle': eventHandle,
-                'field_name': fieldName,
-            },
-            query: {
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/GeneralService.ts b/m1/JavaScript-client/src/generated/services/GeneralService.ts
deleted file mode 100644
index 3b06ef495..000000000
--- a/m1/JavaScript-client/src/generated/services/GeneralService.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { HealthCheckSuccess } from '../models/HealthCheckSuccess';
-import type { IndexResponse } from '../models/IndexResponse';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class GeneralService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Show OpenAPI explorer
-     * Provides a UI that you can use to explore the API. You can also
-     * retrieve the API directly at `/spec.yaml` and `/spec.json`.
-     * @returns string
-     * @throws ApiError
-     */
-    public spec(): CancelablePromise<string> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/spec',
-        });
-    }
-
-    /**
-     * Check basic node health
-     * By default this endpoint just checks that it can get the latest ledger
-     * info and then returns 200.
-     *
-     * If the duration_secs param is provided, this endpoint will return a
-     * 200 if the following condition is true:
-     *
-     * `server_latest_ledger_info_timestamp >= server_current_time_timestamp - duration_secs`
-     * @param durationSecs Threshold in seconds that the server can be behind to be considered healthy
-     *
-     * If not provided, the healthcheck will always succeed
-     * @returns HealthCheckSuccess
-     * @throws ApiError
-     */
-    public healthy(
-        durationSecs?: number,
-    ): CancelablePromise<HealthCheckSuccess> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/-/healthy',
-            query: {
-                'duration_secs': durationSecs,
-            },
-        });
-    }
-
-    /**
-     * Get ledger info
-     * Get the latest ledger information, including data such as chain ID,
-     * role type, ledger versions, epoch, etc.
-     * @returns IndexResponse
-     * @throws ApiError
-     */
-    public getLedgerInfo(): CancelablePromise<IndexResponse> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/',
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/TablesService.ts b/m1/JavaScript-client/src/generated/services/TablesService.ts
deleted file mode 100644
index ce909f85e..000000000
--- a/m1/JavaScript-client/src/generated/services/TablesService.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Address } from '../models/Address';
-import type { MoveValue } from '../models/MoveValue';
-import type { RawTableItemRequest } from '../models/RawTableItemRequest';
-import type { TableItemRequest } from '../models/TableItemRequest';
-import type { U64 } from '../models/U64';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class TablesService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Get table item
-     * Get a table item at a specific ledger version from the table identified by {table_handle}
-     * in the path and the "key" (TableItemRequest) provided in the request body.
-     *
-     * This is a POST endpoint because the "key" for requesting a specific
-     * table item (TableItemRequest) could be quite complex, as each of its
-     * fields could themselves be composed of other structs. This makes it
-     * impractical to express using query params, meaning GET isn't an option.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param tableHandle Table handle hex encoded 32-byte string
-     * @param requestBody
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns MoveValue
-     * @throws ApiError
-     */
-    public getTableItem(
-        tableHandle: Address,
-        requestBody: TableItemRequest,
-        ledgerVersion?: U64,
-    ): CancelablePromise<MoveValue> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/tables/{table_handle}/item',
-            path: {
-                'table_handle': tableHandle,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-    /**
-     * Get raw table item
-     * Get a table item at a specific ledger version from the table identified by {table_handle}
-     * in the path and the "key" (RawTableItemRequest) provided in the request body.
-     *
-     * The `get_raw_table_item` requires only a serialized key comparing to the full move type information
-     * comparing to the `get_table_item` api, and can only return the query in the bcs format.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param tableHandle Table handle hex encoded 32-byte string
-     * @param requestBody
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns MoveValue
-     * @throws ApiError
-     */
-    public getRawTableItem(
-        tableHandle: Address,
-        requestBody: RawTableItemRequest,
-        ledgerVersion?: U64,
-    ): CancelablePromise<MoveValue> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/tables/{table_handle}/raw_item',
-            path: {
-                'table_handle': tableHandle,
-            },
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/TransactionsService.ts b/m1/JavaScript-client/src/generated/services/TransactionsService.ts
deleted file mode 100644
index 4f9ea4b2a..000000000
--- a/m1/JavaScript-client/src/generated/services/TransactionsService.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { Address } from '../models/Address';
-import type { EncodeSubmissionRequest } from '../models/EncodeSubmissionRequest';
-import type { GasEstimation } from '../models/GasEstimation';
-import type { HashValue } from '../models/HashValue';
-import type { HexEncodedBytes } from '../models/HexEncodedBytes';
-import type { PendingTransaction } from '../models/PendingTransaction';
-import type { SubmitTransactionRequest } from '../models/SubmitTransactionRequest';
-import type { Transaction } from '../models/Transaction';
-import type { TransactionsBatchSubmissionResult } from '../models/TransactionsBatchSubmissionResult';
-import type { U64 } from '../models/U64';
-import type { UserTransaction } from '../models/UserTransaction';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class TransactionsService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Get transactions
-     * Retrieve on-chain committed transactions. The page size and start ledger version
-     * can be provided to get a specific sequence of transactions.
-     *
-     * If the version has been pruned, then a 410 will be returned.
-     *
-     * To retrieve a pending transaction, use /transactions/by_hash.
-     * @param start Ledger version to start list of transactions
-     *
-     * If not provided, defaults to showing the latest transactions
-     * @param limit Max number of transactions to retrieve.
-     *
-     * If not provided, defaults to default page size
-     * @returns Transaction
-     * @throws ApiError
-     */
-    public getTransactions(
-        start?: U64,
-        limit?: number,
-    ): CancelablePromise<Array<Transaction>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/transactions',
-            query: {
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-    /**
-     * Submit transaction
-     * This endpoint accepts transaction submissions in two formats.
-     *
-     * To submit a transaction as JSON, you must submit a SubmitTransactionRequest.
-     * To build this request, do the following:
-     *
-     * 1. Encode the transaction as BCS. If you are using a language that has
-     * native BCS support, make sure of that library. If not, you may take
-     * advantage of /transactions/encode_submission. When using this
-     * endpoint, make sure you trust the node you're talking to, as it is
-     * possible they could manipulate your request.
-     * 2. Sign the encoded transaction and use it to create a TransactionSignature.
-     * 3. Submit the request. Make sure to use the "application/json" Content-Type.
-     *
-     * To submit a transaction as BCS, you must submit a SignedTransaction
-     * encoded as BCS. See SignedTransaction in types/src/transaction/mod.rs.
-     * Make sure to use the `application/x.aptos.signed_transaction+bcs` Content-Type.
-     * @param requestBody
-     * @returns PendingTransaction
-     * @throws ApiError
-     */
-    public submitTransaction(
-        requestBody: SubmitTransactionRequest,
-    ): CancelablePromise<PendingTransaction> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/transactions',
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-    /**
-     * Get transaction by hash
-     * Look up a transaction by its hash. This is the same hash that is returned
-     * by the API when submitting a transaction (see PendingTransaction).
-     *
-     * When given a transaction hash, the server first looks for the transaction
-     * in storage (on-chain, committed). If no on-chain transaction is found, it
-     * looks the transaction up by hash in the mempool (pending, not yet committed).
-     *
-     * To create a transaction hash by yourself, do the following:
-     * 1. Hash message bytes: "RawTransaction" bytes + BCS bytes of [Transaction](https://aptos-labs.github.io/aptos-core/aptos_types/transaction/enum.Transaction.html).
-     * 2. Apply hash algorithm `SHA3-256` to the hash message bytes.
-     * 3. Hex-encode the hash bytes with `0x` prefix.
-     * @param txnHash Hash of transaction to retrieve
-     * @returns Transaction
-     * @throws ApiError
-     */
-    public getTransactionByHash(
-        txnHash: HashValue,
-    ): CancelablePromise<Transaction> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/transactions/by_hash/{txn_hash}',
-            path: {
-                'txn_hash': txnHash,
-            },
-        });
-    }
-
-    /**
-     * Get transaction by version
-     * Retrieves a transaction by a given version. If the version has been
-     * pruned, a 410 will be returned.
-     * @param txnVersion Version of transaction to retrieve
-     * @returns Transaction
-     * @throws ApiError
-     */
-    public getTransactionByVersion(
-        txnVersion: U64,
-    ): CancelablePromise<Transaction> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/transactions/by_version/{txn_version}',
-            path: {
-                'txn_version': txnVersion,
-            },
-        });
-    }
-
-    /**
-     * Get account transactions
-     * Retrieves on-chain committed transactions from an account. If the start
-     * version is too far in the past, a 410 will be returned.
-     *
-     * If no start version is given, it will start at version 0.
-     *
-     * To retrieve a pending transaction, use /transactions/by_hash.
-     * @param address Address of account with or without a `0x` prefix
-     * @param start Account sequence number to start list of transactions
-     *
-     * If not provided, defaults to showing the latest transactions
-     * @param limit Max number of transactions to retrieve.
-     *
-     * If not provided, defaults to default page size
-     * @returns Transaction
-     * @throws ApiError
-     */
-    public getAccountTransactions(
-        address: Address,
-        start?: U64,
-        limit?: number,
-    ): CancelablePromise<Array<Transaction>> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/accounts/{address}/transactions',
-            path: {
-                'address': address,
-            },
-            query: {
-                'start': start,
-                'limit': limit,
-            },
-        });
-    }
-
-    /**
-     * Submit batch transactions
-     * This allows you to submit multiple transactions.  The response has three outcomes:
-     *
-     * 1. All transactions succeed, and it will return a 202
-     * 2. Some transactions succeed, and it will return the failed transactions and a 206
-     * 3. No transactions succeed, and it will also return the failed transactions and a 206
-     *
-     * To submit a transaction as JSON, you must submit a SubmitTransactionRequest.
-     * To build this request, do the following:
-     *
-     * 1. Encode the transaction as BCS. If you are using a language that has
-     * native BCS support, make sure to use that library. If not, you may take
-     * advantage of /transactions/encode_submission. When using this
-     * endpoint, make sure you trust the node you're talking to, as it is
-     * possible they could manipulate your request.
-     * 2. Sign the encoded transaction and use it to create a TransactionSignature.
-     * 3. Submit the request. Make sure to use the "application/json" Content-Type.
-     *
-     * To submit a transaction as BCS, you must submit a SignedTransaction
-     * encoded as BCS. See SignedTransaction in types/src/transaction/mod.rs.
-     * Make sure to use the `application/x.aptos.signed_transaction+bcs` Content-Type.
-     * @param requestBody
-     * @returns TransactionsBatchSubmissionResult
-     * @throws ApiError
-     */
-    public submitBatchTransactions(
-        requestBody: Array<SubmitTransactionRequest>,
-    ): CancelablePromise<TransactionsBatchSubmissionResult> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/transactions/batch',
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-    /**
-     * Simulate transaction
-     * The output of the transaction will have the exact transaction outputs and events that running
-     * an actual signed transaction would have.  However, it will not have the associated state
-     * hashes, as they are not updated in storage.  This can be used to estimate the maximum gas
-     * units for a submitted transaction.
-     *
-     * To use this, you must:
-     * - Create a SignedTransaction with a zero-padded signature.
-     * - Submit a SubmitTransactionRequest containing a UserTransactionRequest containing that signature.
-     *
-     * To use this endpoint with BCS, you must submit a SignedTransaction
-     * encoded as BCS. See SignedTransaction in types/src/transaction/mod.rs.
-     * @param requestBody
-     * @param estimateMaxGasAmount If set to true, the max gas value in the transaction will be ignored
-     * and the maximum possible gas will be used
-     * @param estimateGasUnitPrice If set to true, the gas unit price in the transaction will be ignored
-     * and the estimated value will be used
-     * @param estimatePrioritizedGasUnitPrice If set to true, the transaction will use a higher price than the original
-     * estimate.
-     * @returns UserTransaction
-     * @throws ApiError
-     */
-    public simulateTransaction(
-        requestBody: SubmitTransactionRequest,
-        estimateMaxGasAmount?: boolean,
-        estimateGasUnitPrice?: boolean,
-        estimatePrioritizedGasUnitPrice?: boolean,
-    ): CancelablePromise<Array<UserTransaction>> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/transactions/simulate',
-            query: {
-                'estimate_max_gas_amount': estimateMaxGasAmount,
-                'estimate_gas_unit_price': estimateGasUnitPrice,
-                'estimate_prioritized_gas_unit_price': estimatePrioritizedGasUnitPrice,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-    /**
-     * Encode submission
-     * This endpoint accepts an EncodeSubmissionRequest, which internally is a
-     * UserTransactionRequestInner (and optionally secondary signers) encoded
-     * as JSON, validates the request format, and then returns that request
-     * encoded in BCS. The client can then use this to create a transaction
-     * signature to be used in a SubmitTransactionRequest, which it then
-     * passes to the /transactions POST endpoint.
-     *
-     * To be clear, this endpoint makes it possible to submit transaction
-     * requests to the API from languages that do not have library support for
-     * BCS. If you are using an SDK that has BCS support, such as the official
-     * Rust, TypeScript, or Python SDKs, you do not need to use this endpoint.
-     *
-     * To sign a message using the response from this endpoint:
-     * - Decode the hex encoded string in the response to bytes.
-     * - Sign the bytes to create the signature.
-     * - Use that as the signature field in something like Ed25519Signature, which you then use to build a TransactionSignature.
-     * @param requestBody
-     * @returns HexEncodedBytes
-     * @throws ApiError
-     */
-    public encodeSubmission(
-        requestBody: EncodeSubmissionRequest,
-    ): CancelablePromise<HexEncodedBytes> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/transactions/encode_submission',
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-    /**
-     * Estimate gas price
-     * Currently, the gas estimation is handled by taking the median of the last 100,000 transactions
-     * If a user wants to prioritize their transaction and is willing to pay, they can pay more
-     * than the gas price.  If they're willing to wait longer, they can pay less.  Note that the
-     * gas price moves with the fee market, and should only increase when demand outweighs supply.
-     *
-     * If there have been no transactions in the last 100,000 transactions, the price will be 1.
-     * @returns GasEstimation
-     * @throws ApiError
-     */
-    public estimateGasPrice(): CancelablePromise<GasEstimation> {
-        return this.httpRequest.request({
-            method: 'GET',
-            url: '/estimate_gas_price',
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/generated/services/ViewService.ts b/m1/JavaScript-client/src/generated/services/ViewService.ts
deleted file mode 100644
index 8b4d40df7..000000000
--- a/m1/JavaScript-client/src/generated/services/ViewService.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { MoveValue } from '../models/MoveValue';
-import type { U64 } from '../models/U64';
-import type { ViewRequest } from '../models/ViewRequest';
-
-import type { CancelablePromise } from '../core/CancelablePromise';
-import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-
-export class ViewService {
-
-    constructor(public readonly httpRequest: BaseHttpRequest) {}
-
-    /**
-     * Execute view function of a module
-     * Execute the Move function with the given parameters and return its execution result.
-     *
-     * The Aptos nodes prune account state history, via a configurable time window.
-     * If the requested ledger version has been pruned, the server responds with a 410.
-     * @param requestBody
-     * @param ledgerVersion Ledger version to get state of account
-     *
-     * If not provided, it will be the latest version
-     * @returns MoveValue
-     * @throws ApiError
-     */
-    public view(
-        requestBody: ViewRequest,
-        ledgerVersion?: U64,
-    ): CancelablePromise<Array<MoveValue>> {
-        return this.httpRequest.request({
-            method: 'POST',
-            url: '/view',
-            query: {
-                'ledger_version': ledgerVersion,
-            },
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
-
-}
diff --git a/m1/JavaScript-client/src/index.ts b/m1/JavaScript-client/src/index.ts
deleted file mode 100644
index 6e1cbbf76..000000000
--- a/m1/JavaScript-client/src/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export * from "./account";
-export * from "./providers";
-export * as BCS from "./bcs";
-export * from "./utils/hex_string";
-export * from "./plugins";
-export * from "./transaction_builder";
-export * as TokenTypes from "./aptos_types/token_types";
-export * as Types from "./generated/index";
-export { derivePath } from "./utils/hd-key";
-export {
-  deserializePropertyMap,
-  deserializeValueBasedOnTypeTag,
-  getPropertyValueRaw,
-} from "./utils/property_map_serde";
-export { Network, CustomEndpoints } from "./utils/api-endpoints";
diff --git a/m1/JavaScript-client/src/indexer/codegen.yml b/m1/JavaScript-client/src/indexer/codegen.yml
deleted file mode 100644
index a9e72503f..000000000
--- a/m1/JavaScript-client/src/indexer/codegen.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-overwrite: true
-documents: src/indexer/queries/**/*.graphql
-schema: https://indexer.mainnet.aptoslabs.com/v1/graphql
-generates:
-  src/indexer/generated/types.ts:
-    plugins:
-      - typescript
-  src/indexer/generated/operations.ts:
-    preset: import-types-preset
-    presetConfig:
-      typesPath: ./types
-    plugins:
-      - typescript-operations
-  src/indexer/generated/queries.ts:
-    preset: import-types-preset
-    presetConfig:
-      typesPath: ./operations
-    plugins:
-      - typescript-graphql-request
-    config:
-      documentMode: string
-      documentVariableSuffix: ""
diff --git a/m1/JavaScript-client/src/indexer/generated/operations.ts b/m1/JavaScript-client/src/indexer/generated/operations.ts
deleted file mode 100644
index 361f2a666..000000000
--- a/m1/JavaScript-client/src/indexer/generated/operations.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import * as Types from './types';
-
-export type GetAccountCoinsDataQueryVariables = Types.Exact<{
-  owner_address?: Types.InputMaybe<Types.Scalars['String']>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetAccountCoinsDataQuery = { __typename?: 'query_root', current_coin_balances: Array<{ __typename?: 'current_coin_balances', amount: any, coin_type: string, coin_info?: { __typename?: 'coin_infos', name: string, decimals: number, symbol: string } | null }> };
-
-export type GetAccountCurrentTokensQueryVariables = Types.Exact<{
-  address: Types.Scalars['String'];
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetAccountCurrentTokensQuery = { __typename?: 'query_root', current_token_ownerships: Array<{ __typename?: 'current_token_ownerships', amount: any, last_transaction_version: any, property_version: any, current_token_data?: { __typename?: 'current_token_datas', creator_address: string, collection_name: string, description: string, metadata_uri: string, name: string, token_data_id_hash: string, collection_data_id_hash: string } | null, current_collection_data?: { __typename?: 'current_collection_datas', metadata_uri: string, supply: any, description: string, collection_name: string, collection_data_id_hash: string, table_handle: string, creator_address: string } | null }> };
-
-export type TokenDataFieldsFragment = { __typename?: 'current_token_datas', creator_address: string, collection_name: string, description: string, metadata_uri: string, name: string, token_data_id_hash: string, collection_data_id_hash: string };
-
-export type CollectionDataFieldsFragment = { __typename?: 'current_collection_datas', metadata_uri: string, supply: any, description: string, collection_name: string, collection_data_id_hash: string, table_handle: string, creator_address: string };
-
-export type GetAccountTokensCountQueryVariables = Types.Exact<{
-  owner_address?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetAccountTokensCountQuery = { __typename?: 'query_root', current_token_ownerships_aggregate: { __typename?: 'current_token_ownerships_aggregate', aggregate?: { __typename?: 'current_token_ownerships_aggregate_fields', count: number } | null } };
-
-export type GetAccountTransactionsCountQueryVariables = Types.Exact<{
-  address?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetAccountTransactionsCountQuery = { __typename?: 'query_root', move_resources_aggregate: { __typename?: 'move_resources_aggregate', aggregate?: { __typename?: 'move_resources_aggregate_fields', count: number } | null } };
-
-export type GetAccountTransactionsDataQueryVariables = Types.Exact<{
-  address?: Types.InputMaybe<Types.Scalars['String']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetAccountTransactionsDataQuery = { __typename?: 'query_root', move_resources: Array<{ __typename?: 'move_resources', transaction_version: any }> };
-
-export type GetCurrentDelegatorBalancesCountQueryVariables = Types.Exact<{
-  poolAddress?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetCurrentDelegatorBalancesCountQuery = { __typename?: 'query_root', current_delegator_balances_aggregate: { __typename?: 'current_delegator_balances_aggregate', aggregate?: { __typename?: 'current_delegator_balances_aggregate_fields', count: number } | null } };
-
-export type GetDelegatedStakingActivitiesQueryVariables = Types.Exact<{
-  delegatorAddress?: Types.InputMaybe<Types.Scalars['String']>;
-  poolAddress?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetDelegatedStakingActivitiesQuery = { __typename?: 'query_root', delegated_staking_activities: Array<{ __typename?: 'delegated_staking_activities', amount: any, delegator_address: string, event_index: any, event_type: string, pool_address: string, transaction_version: any }> };
-
-export type GetIndexerLedgerInfoQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type GetIndexerLedgerInfoQuery = { __typename?: 'query_root', ledger_infos: Array<{ __typename?: 'ledger_infos', chain_id: any }> };
-
-export type GetTokenActivitiesQueryVariables = Types.Exact<{
-  idHash: Types.Scalars['String'];
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetTokenActivitiesQuery = { __typename?: 'query_root', token_activities: Array<{ __typename?: 'token_activities', creator_address: string, collection_name: string, name: string, token_data_id_hash: string, collection_data_id_hash: string, from_address?: string | null, to_address?: string | null, transaction_version: any, transaction_timestamp: any, property_version: any, transfer_type: string, event_sequence_number: any, token_amount: any }> };
-
-export type GetTokenActivitiesCountQueryVariables = Types.Exact<{
-  token_id?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetTokenActivitiesCountQuery = { __typename?: 'query_root', token_activities_aggregate: { __typename?: 'token_activities_aggregate', aggregate?: { __typename?: 'token_activities_aggregate_fields', count: number } | null } };
-
-export type GetTokenDataQueryVariables = Types.Exact<{
-  token_id?: Types.InputMaybe<Types.Scalars['String']>;
-}>;
-
-
-export type GetTokenDataQuery = { __typename?: 'query_root', current_token_datas: Array<{ __typename?: 'current_token_datas', token_data_id_hash: string, name: string, collection_name: string, creator_address: string, default_properties: any, largest_property_version: any, maximum: any, metadata_uri: string, payee_address: string, royalty_points_denominator: any, royalty_points_numerator: any, supply: any }> };
-
-export type GetTokenOwnersDataQueryVariables = Types.Exact<{
-  token_id?: Types.InputMaybe<Types.Scalars['String']>;
-  property_version?: Types.InputMaybe<Types.Scalars['numeric']>;
-}>;
-
-
-export type GetTokenOwnersDataQuery = { __typename?: 'query_root', current_token_ownerships: Array<{ __typename?: 'current_token_ownerships', owner_address: string }> };
-
-export type GetTopUserTransactionsQueryVariables = Types.Exact<{
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetTopUserTransactionsQuery = { __typename?: 'query_root', user_transactions: Array<{ __typename?: 'user_transactions', version: any }> };
-
-export type GetUserTransactionsQueryVariables = Types.Exact<{
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
-  start_version?: Types.InputMaybe<Types.Scalars['bigint']>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-}>;
-
-
-export type GetUserTransactionsQuery = { __typename?: 'query_root', user_transactions: Array<{ __typename?: 'user_transactions', version: any }> };
diff --git a/m1/JavaScript-client/src/indexer/generated/queries.ts b/m1/JavaScript-client/src/indexer/generated/queries.ts
deleted file mode 100644
index 9ef4ccac4..000000000
--- a/m1/JavaScript-client/src/indexer/generated/queries.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import * as Types from './operations';
-
-import { GraphQLClient } from 'graphql-request';
-import * as Dom from 'graphql-request/dist/types.dom';
-export const TokenDataFieldsFragmentDoc = `
-    fragment TokenDataFields on current_token_datas {
-  creator_address
-  collection_name
-  description
-  metadata_uri
-  name
-  token_data_id_hash
-  collection_data_id_hash
-}
-    `;
-export const CollectionDataFieldsFragmentDoc = `
-    fragment CollectionDataFields on current_collection_datas {
-  metadata_uri
-  supply
-  description
-  collection_name
-  collection_data_id_hash
-  table_handle
-  creator_address
-}
-    `;
-export const GetAccountCoinsData = `
-    query getAccountCoinsData($owner_address: String, $offset: Int, $limit: Int) {
-  current_coin_balances(
-    where: {owner_address: {_eq: $owner_address}}
-    offset: $offset
-    limit: $limit
-  ) {
-    amount
-    coin_type
-    coin_info {
-      name
-      decimals
-      symbol
-    }
-  }
-}
-    `;
-export const GetAccountCurrentTokens = `
-    query getAccountCurrentTokens($address: String!, $offset: Int, $limit: Int) {
-  current_token_ownerships(
-    where: {owner_address: {_eq: $address}, amount: {_gt: 0}}
-    order_by: [{last_transaction_version: desc}, {creator_address: asc}, {collection_name: asc}, {name: asc}]
-    offset: $offset
-    limit: $limit
-  ) {
-    amount
-    current_token_data {
-      ...TokenDataFields
-    }
-    current_collection_data {
-      ...CollectionDataFields
-    }
-    last_transaction_version
-    property_version
-  }
-}
-    ${TokenDataFieldsFragmentDoc}
-${CollectionDataFieldsFragmentDoc}`;
-export const GetAccountTokensCount = `
-    query getAccountTokensCount($owner_address: String) {
-  current_token_ownerships_aggregate(
-    where: {owner_address: {_eq: $owner_address}, amount: {_gt: "0"}}
-  ) {
-    aggregate {
-      count
-    }
-  }
-}
-    `;
-export const GetAccountTransactionsCount = `
-    query getAccountTransactionsCount($address: String) {
-  move_resources_aggregate(
-    where: {address: {_eq: $address}}
-    distinct_on: transaction_version
-  ) {
-    aggregate {
-      count
-    }
-  }
-}
-    `;
-export const GetAccountTransactionsData = `
-    query getAccountTransactionsData($address: String, $limit: Int, $offset: Int) {
-  move_resources(
-    where: {address: {_eq: $address}}
-    order_by: {transaction_version: desc}
-    distinct_on: transaction_version
-    limit: $limit
-    offset: $offset
-  ) {
-    transaction_version
-  }
-}
-    `;
-export const GetCurrentDelegatorBalancesCount = `
-    query getCurrentDelegatorBalancesCount($poolAddress: String) {
-  current_delegator_balances_aggregate(
-    where: {pool_type: {_eq: "active_shares"}, pool_address: {_eq: $poolAddress}, amount: {_gt: "0"}}
-    distinct_on: delegator_address
-  ) {
-    aggregate {
-      count
-    }
-  }
-}
-    `;
-export const GetDelegatedStakingActivities = `
-    query getDelegatedStakingActivities($delegatorAddress: String, $poolAddress: String) {
-  delegated_staking_activities(
-    where: {delegator_address: {_eq: $delegatorAddress}, pool_address: {_eq: $poolAddress}}
-  ) {
-    amount
-    delegator_address
-    event_index
-    event_type
-    pool_address
-    transaction_version
-  }
-}
-    `;
-export const GetIndexerLedgerInfo = `
-    query getIndexerLedgerInfo {
-  ledger_infos {
-    chain_id
-  }
-}
-    `;
-export const GetTokenActivities = `
-    query getTokenActivities($idHash: String!, $offset: Int, $limit: Int) {
-  token_activities(
-    where: {token_data_id_hash: {_eq: $idHash}}
-    order_by: {transaction_version: desc}
-    offset: $offset
-    limit: $limit
-  ) {
-    creator_address
-    collection_name
-    name
-    token_data_id_hash
-    collection_data_id_hash
-    from_address
-    to_address
-    transaction_version
-    transaction_timestamp
-    property_version
-    transfer_type
-    event_sequence_number
-    token_amount
-  }
-}
-    `;
-export const GetTokenActivitiesCount = `
-    query getTokenActivitiesCount($token_id: String) {
-  token_activities_aggregate(where: {token_data_id_hash: {_eq: $token_id}}) {
-    aggregate {
-      count
-    }
-  }
-}
-    `;
-export const GetTokenData = `
-    query getTokenData($token_id: String) {
-  current_token_datas(where: {token_data_id_hash: {_eq: $token_id}}) {
-    token_data_id_hash
-    name
-    collection_name
-    creator_address
-    default_properties
-    largest_property_version
-    maximum
-    metadata_uri
-    payee_address
-    royalty_points_denominator
-    royalty_points_numerator
-    supply
-  }
-}
-    `;
-export const GetTokenOwnersData = `
-    query getTokenOwnersData($token_id: String, $property_version: numeric) {
-  current_token_ownerships(
-    where: {token_data_id_hash: {_eq: $token_id}, property_version: {_eq: $property_version}}
-  ) {
-    owner_address
-  }
-}
-    `;
-export const GetTopUserTransactions = `
-    query getTopUserTransactions($limit: Int) {
-  user_transactions(limit: $limit, order_by: {version: desc}) {
-    version
-  }
-}
-    `;
-export const GetUserTransactions = `
-    query getUserTransactions($limit: Int, $start_version: bigint, $offset: Int) {
-  user_transactions(
-    limit: $limit
-    order_by: {version: desc}
-    where: {version: {_lte: $start_version}}
-    offset: $offset
-  ) {
-    version
-  }
-}
-    `;
-
-export type SdkFunctionWrapper = <T>(action: (requestHeaders?:Record<string, string>) => Promise<T>, operationName: string, operationType?: string) => Promise<T>;
-
-
-const defaultWrapper: SdkFunctionWrapper = (action, _operationName, _operationType) => action();
-
-export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper = defaultWrapper) {
-  return {
-    getAccountCoinsData(variables?: Types.GetAccountCoinsDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountCoinsDataQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountCoinsDataQuery>(GetAccountCoinsData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountCoinsData', 'query');
-    },
-    getAccountCurrentTokens(variables: Types.GetAccountCurrentTokensQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountCurrentTokensQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountCurrentTokensQuery>(GetAccountCurrentTokens, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountCurrentTokens', 'query');
-    },
-    getAccountTokensCount(variables?: Types.GetAccountTokensCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTokensCountQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTokensCountQuery>(GetAccountTokensCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTokensCount', 'query');
-    },
-    getAccountTransactionsCount(variables?: Types.GetAccountTransactionsCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTransactionsCountQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTransactionsCountQuery>(GetAccountTransactionsCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTransactionsCount', 'query');
-    },
-    getAccountTransactionsData(variables?: Types.GetAccountTransactionsDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTransactionsDataQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTransactionsDataQuery>(GetAccountTransactionsData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTransactionsData', 'query');
-    },
-    getCurrentDelegatorBalancesCount(variables?: Types.GetCurrentDelegatorBalancesCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetCurrentDelegatorBalancesCountQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetCurrentDelegatorBalancesCountQuery>(GetCurrentDelegatorBalancesCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getCurrentDelegatorBalancesCount', 'query');
-    },
-    getDelegatedStakingActivities(variables?: Types.GetDelegatedStakingActivitiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetDelegatedStakingActivitiesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetDelegatedStakingActivitiesQuery>(GetDelegatedStakingActivities, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getDelegatedStakingActivities', 'query');
-    },
-    getIndexerLedgerInfo(variables?: Types.GetIndexerLedgerInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetIndexerLedgerInfoQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetIndexerLedgerInfoQuery>(GetIndexerLedgerInfo, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getIndexerLedgerInfo', 'query');
-    },
-    getTokenActivities(variables: Types.GetTokenActivitiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenActivitiesQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenActivitiesQuery>(GetTokenActivities, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenActivities', 'query');
-    },
-    getTokenActivitiesCount(variables?: Types.GetTokenActivitiesCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenActivitiesCountQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenActivitiesCountQuery>(GetTokenActivitiesCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenActivitiesCount', 'query');
-    },
-    getTokenData(variables?: Types.GetTokenDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenDataQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenDataQuery>(GetTokenData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenData', 'query');
-    },
-    getTokenOwnersData(variables?: Types.GetTokenOwnersDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenOwnersDataQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenOwnersDataQuery>(GetTokenOwnersData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenOwnersData', 'query');
-    },
-    getTopUserTransactions(variables?: Types.GetTopUserTransactionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTopUserTransactionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTopUserTransactionsQuery>(GetTopUserTransactions, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTopUserTransactions', 'query');
-    },
-    getUserTransactions(variables?: Types.GetUserTransactionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetUserTransactionsQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<Types.GetUserTransactionsQuery>(GetUserTransactions, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUserTransactions', 'query');
-    }
-  };
-}
-export type Sdk = ReturnType<typeof getSdk>;
\ No newline at end of file
diff --git a/m1/JavaScript-client/src/indexer/generated/types.ts b/m1/JavaScript-client/src/indexer/generated/types.ts
deleted file mode 100644
index 524660678..000000000
--- a/m1/JavaScript-client/src/indexer/generated/types.ts
+++ /dev/null
@@ -1,4975 +0,0 @@
-export type Maybe<T> = T | null;
-export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
-/** All built-in and custom scalars, mapped to their actual values */
-export type Scalars = {
-  ID: string;
-  String: string;
-  Boolean: boolean;
-  Int: number;
-  Float: number;
-  bigint: any;
-  jsonb: any;
-  numeric: any;
-  timestamp: any;
-};
-
-/** Boolean expression to compare columns of type "Boolean". All fields are combined with logical 'AND'. */
-export type Boolean_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['Boolean']>;
-  _gt?: InputMaybe<Scalars['Boolean']>;
-  _gte?: InputMaybe<Scalars['Boolean']>;
-  _in?: InputMaybe<Array<Scalars['Boolean']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['Boolean']>;
-  _lte?: InputMaybe<Scalars['Boolean']>;
-  _neq?: InputMaybe<Scalars['Boolean']>;
-  _nin?: InputMaybe<Array<Scalars['Boolean']>>;
-};
-
-/** Boolean expression to compare columns of type "Int". All fields are combined with logical 'AND'. */
-export type Int_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['Int']>;
-  _gt?: InputMaybe<Scalars['Int']>;
-  _gte?: InputMaybe<Scalars['Int']>;
-  _in?: InputMaybe<Array<Scalars['Int']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['Int']>;
-  _lte?: InputMaybe<Scalars['Int']>;
-  _neq?: InputMaybe<Scalars['Int']>;
-  _nin?: InputMaybe<Array<Scalars['Int']>>;
-};
-
-/** Boolean expression to compare columns of type "String". All fields are combined with logical 'AND'. */
-export type String_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['String']>;
-  _gt?: InputMaybe<Scalars['String']>;
-  _gte?: InputMaybe<Scalars['String']>;
-  /** does the column match the given case-insensitive pattern */
-  _ilike?: InputMaybe<Scalars['String']>;
-  _in?: InputMaybe<Array<Scalars['String']>>;
-  /** does the column match the given POSIX regular expression, case insensitive */
-  _iregex?: InputMaybe<Scalars['String']>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  /** does the column match the given pattern */
-  _like?: InputMaybe<Scalars['String']>;
-  _lt?: InputMaybe<Scalars['String']>;
-  _lte?: InputMaybe<Scalars['String']>;
-  _neq?: InputMaybe<Scalars['String']>;
-  /** does the column NOT match the given case-insensitive pattern */
-  _nilike?: InputMaybe<Scalars['String']>;
-  _nin?: InputMaybe<Array<Scalars['String']>>;
-  /** does the column NOT match the given POSIX regular expression, case insensitive */
-  _niregex?: InputMaybe<Scalars['String']>;
-  /** does the column NOT match the given pattern */
-  _nlike?: InputMaybe<Scalars['String']>;
-  /** does the column NOT match the given POSIX regular expression, case sensitive */
-  _nregex?: InputMaybe<Scalars['String']>;
-  /** does the column NOT match the given SQL regular expression */
-  _nsimilar?: InputMaybe<Scalars['String']>;
-  /** does the column match the given POSIX regular expression, case sensitive */
-  _regex?: InputMaybe<Scalars['String']>;
-  /** does the column match the given SQL regular expression */
-  _similar?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "address_version_from_events" */
-export type Address_Version_From_Events = {
-  __typename?: 'address_version_from_events';
-  account_address?: Maybe<Scalars['String']>;
-  coin_activities: Array<Coin_Activities>;
-  token_activities: Array<Token_Activities>;
-  token_activities_aggregate: Token_Activities_Aggregate;
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-
-/** columns and relationships of "address_version_from_events" */
-export type Address_Version_From_EventsCoin_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Activities_Order_By>>;
-  where?: InputMaybe<Coin_Activities_Bool_Exp>;
-};
-
-
-/** columns and relationships of "address_version_from_events" */
-export type Address_Version_From_EventsToken_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-/** columns and relationships of "address_version_from_events" */
-export type Address_Version_From_EventsToken_Activities_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-/** Boolean expression to filter rows from the table "address_version_from_events". All fields are combined with a logical 'AND'. */
-export type Address_Version_From_Events_Bool_Exp = {
-  _and?: InputMaybe<Array<Address_Version_From_Events_Bool_Exp>>;
-  _not?: InputMaybe<Address_Version_From_Events_Bool_Exp>;
-  _or?: InputMaybe<Array<Address_Version_From_Events_Bool_Exp>>;
-  account_address?: InputMaybe<String_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "address_version_from_events". */
-export type Address_Version_From_Events_Order_By = {
-  account_address?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "address_version_from_events" */
-export enum Address_Version_From_Events_Select_Column {
-  /** column name */
-  AccountAddress = 'account_address',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "address_version_from_events" */
-export type Address_Version_From_Events_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Address_Version_From_Events_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Address_Version_From_Events_Stream_Cursor_Value_Input = {
-  account_address?: InputMaybe<Scalars['String']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** Boolean expression to compare columns of type "bigint". All fields are combined with logical 'AND'. */
-export type Bigint_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['bigint']>;
-  _gt?: InputMaybe<Scalars['bigint']>;
-  _gte?: InputMaybe<Scalars['bigint']>;
-  _in?: InputMaybe<Array<Scalars['bigint']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['bigint']>;
-  _lte?: InputMaybe<Scalars['bigint']>;
-  _neq?: InputMaybe<Scalars['bigint']>;
-  _nin?: InputMaybe<Array<Scalars['bigint']>>;
-};
-
-/** columns and relationships of "coin_activities" */
-export type Coin_Activities = {
-  __typename?: 'coin_activities';
-  activity_type: Scalars['String'];
-  amount: Scalars['numeric'];
-  block_height: Scalars['bigint'];
-  coin_type: Scalars['String'];
-  entry_function_id_str?: Maybe<Scalars['String']>;
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_index?: Maybe<Scalars['bigint']>;
-  event_sequence_number: Scalars['bigint'];
-  is_gas_fee: Scalars['Boolean'];
-  is_transaction_success: Scalars['Boolean'];
-  owner_address: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "coin_activities". All fields are combined with a logical 'AND'. */
-export type Coin_Activities_Bool_Exp = {
-  _and?: InputMaybe<Array<Coin_Activities_Bool_Exp>>;
-  _not?: InputMaybe<Coin_Activities_Bool_Exp>;
-  _or?: InputMaybe<Array<Coin_Activities_Bool_Exp>>;
-  activity_type?: InputMaybe<String_Comparison_Exp>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  block_height?: InputMaybe<Bigint_Comparison_Exp>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  entry_function_id_str?: InputMaybe<String_Comparison_Exp>;
-  event_account_address?: InputMaybe<String_Comparison_Exp>;
-  event_creation_number?: InputMaybe<Bigint_Comparison_Exp>;
-  event_index?: InputMaybe<Bigint_Comparison_Exp>;
-  event_sequence_number?: InputMaybe<Bigint_Comparison_Exp>;
-  is_gas_fee?: InputMaybe<Boolean_Comparison_Exp>;
-  is_transaction_success?: InputMaybe<Boolean_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "coin_activities". */
-export type Coin_Activities_Order_By = {
-  activity_type?: InputMaybe<Order_By>;
-  amount?: InputMaybe<Order_By>;
-  block_height?: InputMaybe<Order_By>;
-  coin_type?: InputMaybe<Order_By>;
-  entry_function_id_str?: InputMaybe<Order_By>;
-  event_account_address?: InputMaybe<Order_By>;
-  event_creation_number?: InputMaybe<Order_By>;
-  event_index?: InputMaybe<Order_By>;
-  event_sequence_number?: InputMaybe<Order_By>;
-  is_gas_fee?: InputMaybe<Order_By>;
-  is_transaction_success?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "coin_activities" */
-export enum Coin_Activities_Select_Column {
-  /** column name */
-  ActivityType = 'activity_type',
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  BlockHeight = 'block_height',
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  EntryFunctionIdStr = 'entry_function_id_str',
-  /** column name */
-  EventAccountAddress = 'event_account_address',
-  /** column name */
-  EventCreationNumber = 'event_creation_number',
-  /** column name */
-  EventIndex = 'event_index',
-  /** column name */
-  EventSequenceNumber = 'event_sequence_number',
-  /** column name */
-  IsGasFee = 'is_gas_fee',
-  /** column name */
-  IsTransactionSuccess = 'is_transaction_success',
-  /** column name */
-  OwnerAddress = 'owner_address',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "coin_activities" */
-export type Coin_Activities_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Coin_Activities_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Coin_Activities_Stream_Cursor_Value_Input = {
-  activity_type?: InputMaybe<Scalars['String']>;
-  amount?: InputMaybe<Scalars['numeric']>;
-  block_height?: InputMaybe<Scalars['bigint']>;
-  coin_type?: InputMaybe<Scalars['String']>;
-  entry_function_id_str?: InputMaybe<Scalars['String']>;
-  event_account_address?: InputMaybe<Scalars['String']>;
-  event_creation_number?: InputMaybe<Scalars['bigint']>;
-  event_index?: InputMaybe<Scalars['bigint']>;
-  event_sequence_number?: InputMaybe<Scalars['bigint']>;
-  is_gas_fee?: InputMaybe<Scalars['Boolean']>;
-  is_transaction_success?: InputMaybe<Scalars['Boolean']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "coin_balances" */
-export type Coin_Balances = {
-  __typename?: 'coin_balances';
-  amount: Scalars['numeric'];
-  coin_type: Scalars['String'];
-  coin_type_hash: Scalars['String'];
-  owner_address: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "coin_balances". All fields are combined with a logical 'AND'. */
-export type Coin_Balances_Bool_Exp = {
-  _and?: InputMaybe<Array<Coin_Balances_Bool_Exp>>;
-  _not?: InputMaybe<Coin_Balances_Bool_Exp>;
-  _or?: InputMaybe<Array<Coin_Balances_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  coin_type_hash?: InputMaybe<String_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "coin_balances". */
-export type Coin_Balances_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  coin_type?: InputMaybe<Order_By>;
-  coin_type_hash?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "coin_balances" */
-export enum Coin_Balances_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  CoinTypeHash = 'coin_type_hash',
-  /** column name */
-  OwnerAddress = 'owner_address',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "coin_balances" */
-export type Coin_Balances_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Coin_Balances_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Coin_Balances_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  coin_type?: InputMaybe<Scalars['String']>;
-  coin_type_hash?: InputMaybe<Scalars['String']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "coin_infos" */
-export type Coin_Infos = {
-  __typename?: 'coin_infos';
-  coin_type: Scalars['String'];
-  coin_type_hash: Scalars['String'];
-  creator_address: Scalars['String'];
-  decimals: Scalars['Int'];
-  name: Scalars['String'];
-  supply_aggregator_table_handle?: Maybe<Scalars['String']>;
-  supply_aggregator_table_key?: Maybe<Scalars['String']>;
-  symbol: Scalars['String'];
-  transaction_created_timestamp: Scalars['timestamp'];
-  transaction_version_created: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "coin_infos". All fields are combined with a logical 'AND'. */
-export type Coin_Infos_Bool_Exp = {
-  _and?: InputMaybe<Array<Coin_Infos_Bool_Exp>>;
-  _not?: InputMaybe<Coin_Infos_Bool_Exp>;
-  _or?: InputMaybe<Array<Coin_Infos_Bool_Exp>>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  coin_type_hash?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  decimals?: InputMaybe<Int_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  supply_aggregator_table_handle?: InputMaybe<String_Comparison_Exp>;
-  supply_aggregator_table_key?: InputMaybe<String_Comparison_Exp>;
-  symbol?: InputMaybe<String_Comparison_Exp>;
-  transaction_created_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version_created?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "coin_infos". */
-export type Coin_Infos_Order_By = {
-  coin_type?: InputMaybe<Order_By>;
-  coin_type_hash?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  decimals?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  supply_aggregator_table_handle?: InputMaybe<Order_By>;
-  supply_aggregator_table_key?: InputMaybe<Order_By>;
-  symbol?: InputMaybe<Order_By>;
-  transaction_created_timestamp?: InputMaybe<Order_By>;
-  transaction_version_created?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "coin_infos" */
-export enum Coin_Infos_Select_Column {
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  CoinTypeHash = 'coin_type_hash',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  Decimals = 'decimals',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  SupplyAggregatorTableHandle = 'supply_aggregator_table_handle',
-  /** column name */
-  SupplyAggregatorTableKey = 'supply_aggregator_table_key',
-  /** column name */
-  Symbol = 'symbol',
-  /** column name */
-  TransactionCreatedTimestamp = 'transaction_created_timestamp',
-  /** column name */
-  TransactionVersionCreated = 'transaction_version_created'
-}
-
-/** Streaming cursor of the table "coin_infos" */
-export type Coin_Infos_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Coin_Infos_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Coin_Infos_Stream_Cursor_Value_Input = {
-  coin_type?: InputMaybe<Scalars['String']>;
-  coin_type_hash?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  decimals?: InputMaybe<Scalars['Int']>;
-  name?: InputMaybe<Scalars['String']>;
-  supply_aggregator_table_handle?: InputMaybe<Scalars['String']>;
-  supply_aggregator_table_key?: InputMaybe<Scalars['String']>;
-  symbol?: InputMaybe<Scalars['String']>;
-  transaction_created_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version_created?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "coin_supply" */
-export type Coin_Supply = {
-  __typename?: 'coin_supply';
-  coin_type: Scalars['String'];
-  coin_type_hash: Scalars['String'];
-  supply: Scalars['numeric'];
-  transaction_epoch: Scalars['bigint'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "coin_supply". All fields are combined with a logical 'AND'. */
-export type Coin_Supply_Bool_Exp = {
-  _and?: InputMaybe<Array<Coin_Supply_Bool_Exp>>;
-  _not?: InputMaybe<Coin_Supply_Bool_Exp>;
-  _or?: InputMaybe<Array<Coin_Supply_Bool_Exp>>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  coin_type_hash?: InputMaybe<String_Comparison_Exp>;
-  supply?: InputMaybe<Numeric_Comparison_Exp>;
-  transaction_epoch?: InputMaybe<Bigint_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "coin_supply". */
-export type Coin_Supply_Order_By = {
-  coin_type?: InputMaybe<Order_By>;
-  coin_type_hash?: InputMaybe<Order_By>;
-  supply?: InputMaybe<Order_By>;
-  transaction_epoch?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "coin_supply" */
-export enum Coin_Supply_Select_Column {
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  CoinTypeHash = 'coin_type_hash',
-  /** column name */
-  Supply = 'supply',
-  /** column name */
-  TransactionEpoch = 'transaction_epoch',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "coin_supply" */
-export type Coin_Supply_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Coin_Supply_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Coin_Supply_Stream_Cursor_Value_Input = {
-  coin_type?: InputMaybe<Scalars['String']>;
-  coin_type_hash?: InputMaybe<Scalars['String']>;
-  supply?: InputMaybe<Scalars['numeric']>;
-  transaction_epoch?: InputMaybe<Scalars['bigint']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "collection_datas" */
-export type Collection_Datas = {
-  __typename?: 'collection_datas';
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  description: Scalars['String'];
-  description_mutable: Scalars['Boolean'];
-  maximum: Scalars['numeric'];
-  maximum_mutable: Scalars['Boolean'];
-  metadata_uri: Scalars['String'];
-  supply: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-  uri_mutable: Scalars['Boolean'];
-};
-
-/** Boolean expression to filter rows from the table "collection_datas". All fields are combined with a logical 'AND'. */
-export type Collection_Datas_Bool_Exp = {
-  _and?: InputMaybe<Array<Collection_Datas_Bool_Exp>>;
-  _not?: InputMaybe<Collection_Datas_Bool_Exp>;
-  _or?: InputMaybe<Array<Collection_Datas_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  description?: InputMaybe<String_Comparison_Exp>;
-  description_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  maximum?: InputMaybe<Numeric_Comparison_Exp>;
-  maximum_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  metadata_uri?: InputMaybe<String_Comparison_Exp>;
-  supply?: InputMaybe<Numeric_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  uri_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "collection_datas". */
-export type Collection_Datas_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  description?: InputMaybe<Order_By>;
-  description_mutable?: InputMaybe<Order_By>;
-  maximum?: InputMaybe<Order_By>;
-  maximum_mutable?: InputMaybe<Order_By>;
-  metadata_uri?: InputMaybe<Order_By>;
-  supply?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  uri_mutable?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "collection_datas" */
-export enum Collection_Datas_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  Description = 'description',
-  /** column name */
-  DescriptionMutable = 'description_mutable',
-  /** column name */
-  Maximum = 'maximum',
-  /** column name */
-  MaximumMutable = 'maximum_mutable',
-  /** column name */
-  MetadataUri = 'metadata_uri',
-  /** column name */
-  Supply = 'supply',
-  /** column name */
-  TableHandle = 'table_handle',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  UriMutable = 'uri_mutable'
-}
-
-/** Streaming cursor of the table "collection_datas" */
-export type Collection_Datas_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Collection_Datas_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Collection_Datas_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  description?: InputMaybe<Scalars['String']>;
-  description_mutable?: InputMaybe<Scalars['Boolean']>;
-  maximum?: InputMaybe<Scalars['numeric']>;
-  maximum_mutable?: InputMaybe<Scalars['Boolean']>;
-  metadata_uri?: InputMaybe<Scalars['String']>;
-  supply?: InputMaybe<Scalars['numeric']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  uri_mutable?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** columns and relationships of "current_ans_lookup" */
-export type Current_Ans_Lookup = {
-  __typename?: 'current_ans_lookup';
-  /** An array relationship */
-  all_token_ownerships: Array<Current_Token_Ownerships>;
-  /** An aggregate relationship */
-  all_token_ownerships_aggregate: Current_Token_Ownerships_Aggregate;
-  domain: Scalars['String'];
-  expiration_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  registered_address?: Maybe<Scalars['String']>;
-  subdomain: Scalars['String'];
-};
-
-
-/** columns and relationships of "current_ans_lookup" */
-export type Current_Ans_LookupAll_Token_OwnershipsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-/** columns and relationships of "current_ans_lookup" */
-export type Current_Ans_LookupAll_Token_Ownerships_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-/** Boolean expression to filter rows from the table "current_ans_lookup". All fields are combined with a logical 'AND'. */
-export type Current_Ans_Lookup_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Ans_Lookup_Bool_Exp>>;
-  _not?: InputMaybe<Current_Ans_Lookup_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Ans_Lookup_Bool_Exp>>;
-  all_token_ownerships?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-  domain?: InputMaybe<String_Comparison_Exp>;
-  expiration_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  registered_address?: InputMaybe<String_Comparison_Exp>;
-  subdomain?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_ans_lookup". */
-export type Current_Ans_Lookup_Order_By = {
-  all_token_ownerships_aggregate?: InputMaybe<Current_Token_Ownerships_Aggregate_Order_By>;
-  domain?: InputMaybe<Order_By>;
-  expiration_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  registered_address?: InputMaybe<Order_By>;
-  subdomain?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_ans_lookup" */
-export enum Current_Ans_Lookup_Select_Column {
-  /** column name */
-  Domain = 'domain',
-  /** column name */
-  ExpirationTimestamp = 'expiration_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  RegisteredAddress = 'registered_address',
-  /** column name */
-  Subdomain = 'subdomain'
-}
-
-/** Streaming cursor of the table "current_ans_lookup" */
-export type Current_Ans_Lookup_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Ans_Lookup_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Ans_Lookup_Stream_Cursor_Value_Input = {
-  domain?: InputMaybe<Scalars['String']>;
-  expiration_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  registered_address?: InputMaybe<Scalars['String']>;
-  subdomain?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "current_coin_balances" */
-export type Current_Coin_Balances = {
-  __typename?: 'current_coin_balances';
-  amount: Scalars['numeric'];
-  /** An object relationship */
-  coin_info?: Maybe<Coin_Infos>;
-  coin_type: Scalars['String'];
-  coin_type_hash: Scalars['String'];
-  last_transaction_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  owner_address: Scalars['String'];
-};
-
-/** Boolean expression to filter rows from the table "current_coin_balances". All fields are combined with a logical 'AND'. */
-export type Current_Coin_Balances_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Coin_Balances_Bool_Exp>>;
-  _not?: InputMaybe<Current_Coin_Balances_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Coin_Balances_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  coin_info?: InputMaybe<Coin_Infos_Bool_Exp>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  coin_type_hash?: InputMaybe<String_Comparison_Exp>;
-  last_transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_coin_balances". */
-export type Current_Coin_Balances_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  coin_info?: InputMaybe<Coin_Infos_Order_By>;
-  coin_type?: InputMaybe<Order_By>;
-  coin_type_hash?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_coin_balances" */
-export enum Current_Coin_Balances_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  CoinTypeHash = 'coin_type_hash',
-  /** column name */
-  LastTransactionTimestamp = 'last_transaction_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  OwnerAddress = 'owner_address'
-}
-
-/** Streaming cursor of the table "current_coin_balances" */
-export type Current_Coin_Balances_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Coin_Balances_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Coin_Balances_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  coin_type?: InputMaybe<Scalars['String']>;
-  coin_type_hash?: InputMaybe<Scalars['String']>;
-  last_transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "current_collection_datas" */
-export type Current_Collection_Datas = {
-  __typename?: 'current_collection_datas';
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  description: Scalars['String'];
-  description_mutable: Scalars['Boolean'];
-  last_transaction_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  maximum: Scalars['numeric'];
-  maximum_mutable: Scalars['Boolean'];
-  metadata_uri: Scalars['String'];
-  supply: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  uri_mutable: Scalars['Boolean'];
-};
-
-/** Boolean expression to filter rows from the table "current_collection_datas". All fields are combined with a logical 'AND'. */
-export type Current_Collection_Datas_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Collection_Datas_Bool_Exp>>;
-  _not?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Collection_Datas_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  description?: InputMaybe<String_Comparison_Exp>;
-  description_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  last_transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  maximum?: InputMaybe<Numeric_Comparison_Exp>;
-  maximum_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  metadata_uri?: InputMaybe<String_Comparison_Exp>;
-  supply?: InputMaybe<Numeric_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-  uri_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_collection_datas". */
-export type Current_Collection_Datas_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  description?: InputMaybe<Order_By>;
-  description_mutable?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  maximum?: InputMaybe<Order_By>;
-  maximum_mutable?: InputMaybe<Order_By>;
-  metadata_uri?: InputMaybe<Order_By>;
-  supply?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-  uri_mutable?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_collection_datas" */
-export enum Current_Collection_Datas_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  Description = 'description',
-  /** column name */
-  DescriptionMutable = 'description_mutable',
-  /** column name */
-  LastTransactionTimestamp = 'last_transaction_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  Maximum = 'maximum',
-  /** column name */
-  MaximumMutable = 'maximum_mutable',
-  /** column name */
-  MetadataUri = 'metadata_uri',
-  /** column name */
-  Supply = 'supply',
-  /** column name */
-  TableHandle = 'table_handle',
-  /** column name */
-  UriMutable = 'uri_mutable'
-}
-
-/** Streaming cursor of the table "current_collection_datas" */
-export type Current_Collection_Datas_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Collection_Datas_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Collection_Datas_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  description?: InputMaybe<Scalars['String']>;
-  description_mutable?: InputMaybe<Scalars['Boolean']>;
-  last_transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  maximum?: InputMaybe<Scalars['numeric']>;
-  maximum_mutable?: InputMaybe<Scalars['Boolean']>;
-  metadata_uri?: InputMaybe<Scalars['String']>;
-  supply?: InputMaybe<Scalars['numeric']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-  uri_mutable?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** columns and relationships of "current_collection_ownership_view" */
-export type Current_Collection_Ownership_View = {
-  __typename?: 'current_collection_ownership_view';
-  collection_data_id_hash?: Maybe<Scalars['String']>;
-  collection_name?: Maybe<Scalars['String']>;
-  creator_address?: Maybe<Scalars['String']>;
-  distinct_tokens?: Maybe<Scalars['bigint']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  owner_address?: Maybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "current_collection_ownership_view". All fields are combined with a logical 'AND'. */
-export type Current_Collection_Ownership_View_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Collection_Ownership_View_Bool_Exp>>;
-  _not?: InputMaybe<Current_Collection_Ownership_View_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Collection_Ownership_View_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  distinct_tokens?: InputMaybe<Bigint_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_collection_ownership_view". */
-export type Current_Collection_Ownership_View_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  distinct_tokens?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_collection_ownership_view" */
-export enum Current_Collection_Ownership_View_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  DistinctTokens = 'distinct_tokens',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  OwnerAddress = 'owner_address'
-}
-
-/** Streaming cursor of the table "current_collection_ownership_view" */
-export type Current_Collection_Ownership_View_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Collection_Ownership_View_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Collection_Ownership_View_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  distinct_tokens?: InputMaybe<Scalars['bigint']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "current_delegator_balances" */
-export type Current_Delegator_Balances = {
-  __typename?: 'current_delegator_balances';
-  amount: Scalars['numeric'];
-  delegator_address: Scalars['String'];
-  last_transaction_version: Scalars['bigint'];
-  pool_address: Scalars['String'];
-  pool_type: Scalars['String'];
-  table_handle: Scalars['String'];
-};
-
-/** aggregated selection of "current_delegator_balances" */
-export type Current_Delegator_Balances_Aggregate = {
-  __typename?: 'current_delegator_balances_aggregate';
-  aggregate?: Maybe<Current_Delegator_Balances_Aggregate_Fields>;
-  nodes: Array<Current_Delegator_Balances>;
-};
-
-/** aggregate fields of "current_delegator_balances" */
-export type Current_Delegator_Balances_Aggregate_Fields = {
-  __typename?: 'current_delegator_balances_aggregate_fields';
-  avg?: Maybe<Current_Delegator_Balances_Avg_Fields>;
-  count: Scalars['Int'];
-  max?: Maybe<Current_Delegator_Balances_Max_Fields>;
-  min?: Maybe<Current_Delegator_Balances_Min_Fields>;
-  stddev?: Maybe<Current_Delegator_Balances_Stddev_Fields>;
-  stddev_pop?: Maybe<Current_Delegator_Balances_Stddev_Pop_Fields>;
-  stddev_samp?: Maybe<Current_Delegator_Balances_Stddev_Samp_Fields>;
-  sum?: Maybe<Current_Delegator_Balances_Sum_Fields>;
-  var_pop?: Maybe<Current_Delegator_Balances_Var_Pop_Fields>;
-  var_samp?: Maybe<Current_Delegator_Balances_Var_Samp_Fields>;
-  variance?: Maybe<Current_Delegator_Balances_Variance_Fields>;
-};
-
-
-/** aggregate fields of "current_delegator_balances" */
-export type Current_Delegator_Balances_Aggregate_FieldsCountArgs = {
-  columns?: InputMaybe<Array<Current_Delegator_Balances_Select_Column>>;
-  distinct?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** aggregate avg on columns */
-export type Current_Delegator_Balances_Avg_Fields = {
-  __typename?: 'current_delegator_balances_avg_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Boolean expression to filter rows from the table "current_delegator_balances". All fields are combined with a logical 'AND'. */
-export type Current_Delegator_Balances_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Delegator_Balances_Bool_Exp>>;
-  _not?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Delegator_Balances_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  delegator_address?: InputMaybe<String_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  pool_address?: InputMaybe<String_Comparison_Exp>;
-  pool_type?: InputMaybe<String_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** aggregate max on columns */
-export type Current_Delegator_Balances_Max_Fields = {
-  __typename?: 'current_delegator_balances_max_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  delegator_address?: Maybe<Scalars['String']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  pool_address?: Maybe<Scalars['String']>;
-  pool_type?: Maybe<Scalars['String']>;
-  table_handle?: Maybe<Scalars['String']>;
-};
-
-/** aggregate min on columns */
-export type Current_Delegator_Balances_Min_Fields = {
-  __typename?: 'current_delegator_balances_min_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  delegator_address?: Maybe<Scalars['String']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  pool_address?: Maybe<Scalars['String']>;
-  pool_type?: Maybe<Scalars['String']>;
-  table_handle?: Maybe<Scalars['String']>;
-};
-
-/** Ordering options when selecting data from "current_delegator_balances". */
-export type Current_Delegator_Balances_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  delegator_address?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  pool_address?: InputMaybe<Order_By>;
-  pool_type?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_delegator_balances" */
-export enum Current_Delegator_Balances_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  DelegatorAddress = 'delegator_address',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  PoolAddress = 'pool_address',
-  /** column name */
-  PoolType = 'pool_type',
-  /** column name */
-  TableHandle = 'table_handle'
-}
-
-/** aggregate stddev on columns */
-export type Current_Delegator_Balances_Stddev_Fields = {
-  __typename?: 'current_delegator_balances_stddev_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_pop on columns */
-export type Current_Delegator_Balances_Stddev_Pop_Fields = {
-  __typename?: 'current_delegator_balances_stddev_pop_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_samp on columns */
-export type Current_Delegator_Balances_Stddev_Samp_Fields = {
-  __typename?: 'current_delegator_balances_stddev_samp_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Streaming cursor of the table "current_delegator_balances" */
-export type Current_Delegator_Balances_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Delegator_Balances_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Delegator_Balances_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  delegator_address?: InputMaybe<Scalars['String']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  pool_address?: InputMaybe<Scalars['String']>;
-  pool_type?: InputMaybe<Scalars['String']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-};
-
-/** aggregate sum on columns */
-export type Current_Delegator_Balances_Sum_Fields = {
-  __typename?: 'current_delegator_balances_sum_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** aggregate var_pop on columns */
-export type Current_Delegator_Balances_Var_Pop_Fields = {
-  __typename?: 'current_delegator_balances_var_pop_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate var_samp on columns */
-export type Current_Delegator_Balances_Var_Samp_Fields = {
-  __typename?: 'current_delegator_balances_var_samp_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate variance on columns */
-export type Current_Delegator_Balances_Variance_Fields = {
-  __typename?: 'current_delegator_balances_variance_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** columns and relationships of "current_staking_pool_voter" */
-export type Current_Staking_Pool_Voter = {
-  __typename?: 'current_staking_pool_voter';
-  last_transaction_version: Scalars['bigint'];
-  staking_pool_address: Scalars['String'];
-  voter_address: Scalars['String'];
-};
-
-/** Boolean expression to filter rows from the table "current_staking_pool_voter". All fields are combined with a logical 'AND'. */
-export type Current_Staking_Pool_Voter_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Staking_Pool_Voter_Bool_Exp>>;
-  _not?: InputMaybe<Current_Staking_Pool_Voter_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Staking_Pool_Voter_Bool_Exp>>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  staking_pool_address?: InputMaybe<String_Comparison_Exp>;
-  voter_address?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_staking_pool_voter". */
-export type Current_Staking_Pool_Voter_Order_By = {
-  last_transaction_version?: InputMaybe<Order_By>;
-  staking_pool_address?: InputMaybe<Order_By>;
-  voter_address?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_staking_pool_voter" */
-export enum Current_Staking_Pool_Voter_Select_Column {
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  StakingPoolAddress = 'staking_pool_address',
-  /** column name */
-  VoterAddress = 'voter_address'
-}
-
-/** Streaming cursor of the table "current_staking_pool_voter" */
-export type Current_Staking_Pool_Voter_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Staking_Pool_Voter_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Staking_Pool_Voter_Stream_Cursor_Value_Input = {
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  staking_pool_address?: InputMaybe<Scalars['String']>;
-  voter_address?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "current_table_items" */
-export type Current_Table_Items = {
-  __typename?: 'current_table_items';
-  decoded_key: Scalars['jsonb'];
-  decoded_value?: Maybe<Scalars['jsonb']>;
-  is_deleted: Scalars['Boolean'];
-  key: Scalars['String'];
-  key_hash: Scalars['String'];
-  last_transaction_version: Scalars['bigint'];
-  table_handle: Scalars['String'];
-};
-
-
-/** columns and relationships of "current_table_items" */
-export type Current_Table_ItemsDecoded_KeyArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-
-/** columns and relationships of "current_table_items" */
-export type Current_Table_ItemsDecoded_ValueArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "current_table_items". All fields are combined with a logical 'AND'. */
-export type Current_Table_Items_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Table_Items_Bool_Exp>>;
-  _not?: InputMaybe<Current_Table_Items_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Table_Items_Bool_Exp>>;
-  decoded_key?: InputMaybe<Jsonb_Comparison_Exp>;
-  decoded_value?: InputMaybe<Jsonb_Comparison_Exp>;
-  is_deleted?: InputMaybe<Boolean_Comparison_Exp>;
-  key?: InputMaybe<String_Comparison_Exp>;
-  key_hash?: InputMaybe<String_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_table_items". */
-export type Current_Table_Items_Order_By = {
-  decoded_key?: InputMaybe<Order_By>;
-  decoded_value?: InputMaybe<Order_By>;
-  is_deleted?: InputMaybe<Order_By>;
-  key?: InputMaybe<Order_By>;
-  key_hash?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_table_items" */
-export enum Current_Table_Items_Select_Column {
-  /** column name */
-  DecodedKey = 'decoded_key',
-  /** column name */
-  DecodedValue = 'decoded_value',
-  /** column name */
-  IsDeleted = 'is_deleted',
-  /** column name */
-  Key = 'key',
-  /** column name */
-  KeyHash = 'key_hash',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  TableHandle = 'table_handle'
-}
-
-/** Streaming cursor of the table "current_table_items" */
-export type Current_Table_Items_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Table_Items_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Table_Items_Stream_Cursor_Value_Input = {
-  decoded_key?: InputMaybe<Scalars['jsonb']>;
-  decoded_value?: InputMaybe<Scalars['jsonb']>;
-  is_deleted?: InputMaybe<Scalars['Boolean']>;
-  key?: InputMaybe<Scalars['String']>;
-  key_hash?: InputMaybe<Scalars['String']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "current_token_datas" */
-export type Current_Token_Datas = {
-  __typename?: 'current_token_datas';
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  /** An object relationship */
-  current_collection_data?: Maybe<Current_Collection_Datas>;
-  default_properties: Scalars['jsonb'];
-  description: Scalars['String'];
-  description_mutable: Scalars['Boolean'];
-  largest_property_version: Scalars['numeric'];
-  last_transaction_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  maximum: Scalars['numeric'];
-  maximum_mutable: Scalars['Boolean'];
-  metadata_uri: Scalars['String'];
-  name: Scalars['String'];
-  payee_address: Scalars['String'];
-  properties_mutable: Scalars['Boolean'];
-  royalty_mutable: Scalars['Boolean'];
-  royalty_points_denominator: Scalars['numeric'];
-  royalty_points_numerator: Scalars['numeric'];
-  supply: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  uri_mutable: Scalars['Boolean'];
-};
-
-
-/** columns and relationships of "current_token_datas" */
-export type Current_Token_DatasDefault_PropertiesArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "current_token_datas". All fields are combined with a logical 'AND'. */
-export type Current_Token_Datas_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Token_Datas_Bool_Exp>>;
-  _not?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Token_Datas_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-  default_properties?: InputMaybe<Jsonb_Comparison_Exp>;
-  description?: InputMaybe<String_Comparison_Exp>;
-  description_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  largest_property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  last_transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  maximum?: InputMaybe<Numeric_Comparison_Exp>;
-  maximum_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  metadata_uri?: InputMaybe<String_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  payee_address?: InputMaybe<String_Comparison_Exp>;
-  properties_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  royalty_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  royalty_points_denominator?: InputMaybe<Numeric_Comparison_Exp>;
-  royalty_points_numerator?: InputMaybe<Numeric_Comparison_Exp>;
-  supply?: InputMaybe<Numeric_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  uri_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_token_datas". */
-export type Current_Token_Datas_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Order_By>;
-  default_properties?: InputMaybe<Order_By>;
-  description?: InputMaybe<Order_By>;
-  description_mutable?: InputMaybe<Order_By>;
-  largest_property_version?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  maximum?: InputMaybe<Order_By>;
-  maximum_mutable?: InputMaybe<Order_By>;
-  metadata_uri?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  payee_address?: InputMaybe<Order_By>;
-  properties_mutable?: InputMaybe<Order_By>;
-  royalty_mutable?: InputMaybe<Order_By>;
-  royalty_points_denominator?: InputMaybe<Order_By>;
-  royalty_points_numerator?: InputMaybe<Order_By>;
-  supply?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  uri_mutable?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_token_datas" */
-export enum Current_Token_Datas_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  DefaultProperties = 'default_properties',
-  /** column name */
-  Description = 'description',
-  /** column name */
-  DescriptionMutable = 'description_mutable',
-  /** column name */
-  LargestPropertyVersion = 'largest_property_version',
-  /** column name */
-  LastTransactionTimestamp = 'last_transaction_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  Maximum = 'maximum',
-  /** column name */
-  MaximumMutable = 'maximum_mutable',
-  /** column name */
-  MetadataUri = 'metadata_uri',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  PayeeAddress = 'payee_address',
-  /** column name */
-  PropertiesMutable = 'properties_mutable',
-  /** column name */
-  RoyaltyMutable = 'royalty_mutable',
-  /** column name */
-  RoyaltyPointsDenominator = 'royalty_points_denominator',
-  /** column name */
-  RoyaltyPointsNumerator = 'royalty_points_numerator',
-  /** column name */
-  Supply = 'supply',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  UriMutable = 'uri_mutable'
-}
-
-/** Streaming cursor of the table "current_token_datas" */
-export type Current_Token_Datas_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Token_Datas_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Token_Datas_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  default_properties?: InputMaybe<Scalars['jsonb']>;
-  description?: InputMaybe<Scalars['String']>;
-  description_mutable?: InputMaybe<Scalars['Boolean']>;
-  largest_property_version?: InputMaybe<Scalars['numeric']>;
-  last_transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  maximum?: InputMaybe<Scalars['numeric']>;
-  maximum_mutable?: InputMaybe<Scalars['Boolean']>;
-  metadata_uri?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
-  payee_address?: InputMaybe<Scalars['String']>;
-  properties_mutable?: InputMaybe<Scalars['Boolean']>;
-  royalty_mutable?: InputMaybe<Scalars['Boolean']>;
-  royalty_points_denominator?: InputMaybe<Scalars['numeric']>;
-  royalty_points_numerator?: InputMaybe<Scalars['numeric']>;
-  supply?: InputMaybe<Scalars['numeric']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  uri_mutable?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** columns and relationships of "current_token_ownerships" */
-export type Current_Token_Ownerships = {
-  __typename?: 'current_token_ownerships';
-  amount: Scalars['numeric'];
-  /** An object relationship */
-  aptos_name?: Maybe<Current_Ans_Lookup>;
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  /** An object relationship */
-  current_collection_data?: Maybe<Current_Collection_Datas>;
-  /** An object relationship */
-  current_token_data?: Maybe<Current_Token_Datas>;
-  last_transaction_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  name: Scalars['String'];
-  owner_address: Scalars['String'];
-  property_version: Scalars['numeric'];
-  table_type: Scalars['String'];
-  token_data_id_hash: Scalars['String'];
-  token_properties: Scalars['jsonb'];
-};
-
-
-/** columns and relationships of "current_token_ownerships" */
-export type Current_Token_OwnershipsToken_PropertiesArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** aggregated selection of "current_token_ownerships" */
-export type Current_Token_Ownerships_Aggregate = {
-  __typename?: 'current_token_ownerships_aggregate';
-  aggregate?: Maybe<Current_Token_Ownerships_Aggregate_Fields>;
-  nodes: Array<Current_Token_Ownerships>;
-};
-
-/** aggregate fields of "current_token_ownerships" */
-export type Current_Token_Ownerships_Aggregate_Fields = {
-  __typename?: 'current_token_ownerships_aggregate_fields';
-  avg?: Maybe<Current_Token_Ownerships_Avg_Fields>;
-  count: Scalars['Int'];
-  max?: Maybe<Current_Token_Ownerships_Max_Fields>;
-  min?: Maybe<Current_Token_Ownerships_Min_Fields>;
-  stddev?: Maybe<Current_Token_Ownerships_Stddev_Fields>;
-  stddev_pop?: Maybe<Current_Token_Ownerships_Stddev_Pop_Fields>;
-  stddev_samp?: Maybe<Current_Token_Ownerships_Stddev_Samp_Fields>;
-  sum?: Maybe<Current_Token_Ownerships_Sum_Fields>;
-  var_pop?: Maybe<Current_Token_Ownerships_Var_Pop_Fields>;
-  var_samp?: Maybe<Current_Token_Ownerships_Var_Samp_Fields>;
-  variance?: Maybe<Current_Token_Ownerships_Variance_Fields>;
-};
-
-
-/** aggregate fields of "current_token_ownerships" */
-export type Current_Token_Ownerships_Aggregate_FieldsCountArgs = {
-  columns?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  distinct?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** order by aggregate values of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Aggregate_Order_By = {
-  avg?: InputMaybe<Current_Token_Ownerships_Avg_Order_By>;
-  count?: InputMaybe<Order_By>;
-  max?: InputMaybe<Current_Token_Ownerships_Max_Order_By>;
-  min?: InputMaybe<Current_Token_Ownerships_Min_Order_By>;
-  stddev?: InputMaybe<Current_Token_Ownerships_Stddev_Order_By>;
-  stddev_pop?: InputMaybe<Current_Token_Ownerships_Stddev_Pop_Order_By>;
-  stddev_samp?: InputMaybe<Current_Token_Ownerships_Stddev_Samp_Order_By>;
-  sum?: InputMaybe<Current_Token_Ownerships_Sum_Order_By>;
-  var_pop?: InputMaybe<Current_Token_Ownerships_Var_Pop_Order_By>;
-  var_samp?: InputMaybe<Current_Token_Ownerships_Var_Samp_Order_By>;
-  variance?: InputMaybe<Current_Token_Ownerships_Variance_Order_By>;
-};
-
-/** aggregate avg on columns */
-export type Current_Token_Ownerships_Avg_Fields = {
-  __typename?: 'current_token_ownerships_avg_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by avg() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Avg_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** Boolean expression to filter rows from the table "current_token_ownerships". All fields are combined with a logical 'AND'. */
-export type Current_Token_Ownerships_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Token_Ownerships_Bool_Exp>>;
-  _not?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Token_Ownerships_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  aptos_name?: InputMaybe<Current_Ans_Lookup_Bool_Exp>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-  last_transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-  property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  table_type?: InputMaybe<String_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  token_properties?: InputMaybe<Jsonb_Comparison_Exp>;
-};
-
-/** aggregate max on columns */
-export type Current_Token_Ownerships_Max_Fields = {
-  __typename?: 'current_token_ownerships_max_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  collection_data_id_hash?: Maybe<Scalars['String']>;
-  collection_name?: Maybe<Scalars['String']>;
-  creator_address?: Maybe<Scalars['String']>;
-  last_transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  name?: Maybe<Scalars['String']>;
-  owner_address?: Maybe<Scalars['String']>;
-  property_version?: Maybe<Scalars['numeric']>;
-  table_type?: Maybe<Scalars['String']>;
-  token_data_id_hash?: Maybe<Scalars['String']>;
-};
-
-/** order by max() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Max_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  table_type?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-};
-
-/** aggregate min on columns */
-export type Current_Token_Ownerships_Min_Fields = {
-  __typename?: 'current_token_ownerships_min_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  collection_data_id_hash?: Maybe<Scalars['String']>;
-  collection_name?: Maybe<Scalars['String']>;
-  creator_address?: Maybe<Scalars['String']>;
-  last_transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  name?: Maybe<Scalars['String']>;
-  owner_address?: Maybe<Scalars['String']>;
-  property_version?: Maybe<Scalars['numeric']>;
-  table_type?: Maybe<Scalars['String']>;
-  token_data_id_hash?: Maybe<Scalars['String']>;
-};
-
-/** order by min() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Min_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  table_type?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-};
-
-/** Ordering options when selecting data from "current_token_ownerships". */
-export type Current_Token_Ownerships_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  aptos_name?: InputMaybe<Current_Ans_Lookup_Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Order_By>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  table_type?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  token_properties?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_token_ownerships" */
-export enum Current_Token_Ownerships_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  LastTransactionTimestamp = 'last_transaction_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  OwnerAddress = 'owner_address',
-  /** column name */
-  PropertyVersion = 'property_version',
-  /** column name */
-  TableType = 'table_type',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  TokenProperties = 'token_properties'
-}
-
-/** aggregate stddev on columns */
-export type Current_Token_Ownerships_Stddev_Fields = {
-  __typename?: 'current_token_ownerships_stddev_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by stddev() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Stddev_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** aggregate stddev_pop on columns */
-export type Current_Token_Ownerships_Stddev_Pop_Fields = {
-  __typename?: 'current_token_ownerships_stddev_pop_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by stddev_pop() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Stddev_Pop_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** aggregate stddev_samp on columns */
-export type Current_Token_Ownerships_Stddev_Samp_Fields = {
-  __typename?: 'current_token_ownerships_stddev_samp_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by stddev_samp() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Stddev_Samp_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** Streaming cursor of the table "current_token_ownerships" */
-export type Current_Token_Ownerships_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Token_Ownerships_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Token_Ownerships_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  last_transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  name?: InputMaybe<Scalars['String']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-  property_version?: InputMaybe<Scalars['numeric']>;
-  table_type?: InputMaybe<Scalars['String']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  token_properties?: InputMaybe<Scalars['jsonb']>;
-};
-
-/** aggregate sum on columns */
-export type Current_Token_Ownerships_Sum_Fields = {
-  __typename?: 'current_token_ownerships_sum_fields';
-  amount?: Maybe<Scalars['numeric']>;
-  last_transaction_version?: Maybe<Scalars['bigint']>;
-  property_version?: Maybe<Scalars['numeric']>;
-};
-
-/** order by sum() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Sum_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** aggregate var_pop on columns */
-export type Current_Token_Ownerships_Var_Pop_Fields = {
-  __typename?: 'current_token_ownerships_var_pop_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by var_pop() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Var_Pop_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** aggregate var_samp on columns */
-export type Current_Token_Ownerships_Var_Samp_Fields = {
-  __typename?: 'current_token_ownerships_var_samp_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by var_samp() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Var_Samp_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** aggregate variance on columns */
-export type Current_Token_Ownerships_Variance_Fields = {
-  __typename?: 'current_token_ownerships_variance_fields';
-  amount?: Maybe<Scalars['Float']>;
-  last_transaction_version?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-};
-
-/** order by variance() on columns of table "current_token_ownerships" */
-export type Current_Token_Ownerships_Variance_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-};
-
-/** columns and relationships of "current_token_pending_claims" */
-export type Current_Token_Pending_Claims = {
-  __typename?: 'current_token_pending_claims';
-  amount: Scalars['numeric'];
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  /** An object relationship */
-  current_collection_data?: Maybe<Current_Collection_Datas>;
-  /** An object relationship */
-  current_token_data?: Maybe<Current_Token_Datas>;
-  from_address: Scalars['String'];
-  last_transaction_timestamp: Scalars['timestamp'];
-  last_transaction_version: Scalars['bigint'];
-  name: Scalars['String'];
-  property_version: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  to_address: Scalars['String'];
-  /** An object relationship */
-  token?: Maybe<Tokens>;
-  token_data_id_hash: Scalars['String'];
-};
-
-/** Boolean expression to filter rows from the table "current_token_pending_claims". All fields are combined with a logical 'AND'. */
-export type Current_Token_Pending_Claims_Bool_Exp = {
-  _and?: InputMaybe<Array<Current_Token_Pending_Claims_Bool_Exp>>;
-  _not?: InputMaybe<Current_Token_Pending_Claims_Bool_Exp>;
-  _or?: InputMaybe<Array<Current_Token_Pending_Claims_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-  from_address?: InputMaybe<String_Comparison_Exp>;
-  last_transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  last_transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-  to_address?: InputMaybe<String_Comparison_Exp>;
-  token?: InputMaybe<Tokens_Bool_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "current_token_pending_claims". */
-export type Current_Token_Pending_Claims_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  current_collection_data?: InputMaybe<Current_Collection_Datas_Order_By>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Order_By>;
-  from_address?: InputMaybe<Order_By>;
-  last_transaction_timestamp?: InputMaybe<Order_By>;
-  last_transaction_version?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-  to_address?: InputMaybe<Order_By>;
-  token?: InputMaybe<Tokens_Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "current_token_pending_claims" */
-export enum Current_Token_Pending_Claims_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  FromAddress = 'from_address',
-  /** column name */
-  LastTransactionTimestamp = 'last_transaction_timestamp',
-  /** column name */
-  LastTransactionVersion = 'last_transaction_version',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  PropertyVersion = 'property_version',
-  /** column name */
-  TableHandle = 'table_handle',
-  /** column name */
-  ToAddress = 'to_address',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash'
-}
-
-/** Streaming cursor of the table "current_token_pending_claims" */
-export type Current_Token_Pending_Claims_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Current_Token_Pending_Claims_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Current_Token_Pending_Claims_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  from_address?: InputMaybe<Scalars['String']>;
-  last_transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  last_transaction_version?: InputMaybe<Scalars['bigint']>;
-  name?: InputMaybe<Scalars['String']>;
-  property_version?: InputMaybe<Scalars['numeric']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-  to_address?: InputMaybe<Scalars['String']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-};
-
-/** ordering argument of a cursor */
-export enum Cursor_Ordering {
-  /** ascending ordering of the cursor */
-  Asc = 'ASC',
-  /** descending ordering of the cursor */
-  Desc = 'DESC'
-}
-
-/** columns and relationships of "delegated_staking_activities" */
-export type Delegated_Staking_Activities = {
-  __typename?: 'delegated_staking_activities';
-  amount: Scalars['numeric'];
-  delegator_address: Scalars['String'];
-  event_index: Scalars['bigint'];
-  event_type: Scalars['String'];
-  pool_address: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "delegated_staking_activities". All fields are combined with a logical 'AND'. */
-export type Delegated_Staking_Activities_Bool_Exp = {
-  _and?: InputMaybe<Array<Delegated_Staking_Activities_Bool_Exp>>;
-  _not?: InputMaybe<Delegated_Staking_Activities_Bool_Exp>;
-  _or?: InputMaybe<Array<Delegated_Staking_Activities_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  delegator_address?: InputMaybe<String_Comparison_Exp>;
-  event_index?: InputMaybe<Bigint_Comparison_Exp>;
-  event_type?: InputMaybe<String_Comparison_Exp>;
-  pool_address?: InputMaybe<String_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "delegated_staking_activities". */
-export type Delegated_Staking_Activities_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  delegator_address?: InputMaybe<Order_By>;
-  event_index?: InputMaybe<Order_By>;
-  event_type?: InputMaybe<Order_By>;
-  pool_address?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "delegated_staking_activities" */
-export enum Delegated_Staking_Activities_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  DelegatorAddress = 'delegator_address',
-  /** column name */
-  EventIndex = 'event_index',
-  /** column name */
-  EventType = 'event_type',
-  /** column name */
-  PoolAddress = 'pool_address',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "delegated_staking_activities" */
-export type Delegated_Staking_Activities_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Delegated_Staking_Activities_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Delegated_Staking_Activities_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  delegator_address?: InputMaybe<Scalars['String']>;
-  event_index?: InputMaybe<Scalars['bigint']>;
-  event_type?: InputMaybe<Scalars['String']>;
-  pool_address?: InputMaybe<Scalars['String']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "events" */
-export type Events = {
-  __typename?: 'events';
-  account_address: Scalars['String'];
-  creation_number: Scalars['bigint'];
-  data: Scalars['jsonb'];
-  event_index?: Maybe<Scalars['bigint']>;
-  sequence_number: Scalars['bigint'];
-  transaction_block_height: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-  type: Scalars['String'];
-};
-
-
-/** columns and relationships of "events" */
-export type EventsDataArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "events". All fields are combined with a logical 'AND'. */
-export type Events_Bool_Exp = {
-  _and?: InputMaybe<Array<Events_Bool_Exp>>;
-  _not?: InputMaybe<Events_Bool_Exp>;
-  _or?: InputMaybe<Array<Events_Bool_Exp>>;
-  account_address?: InputMaybe<String_Comparison_Exp>;
-  creation_number?: InputMaybe<Bigint_Comparison_Exp>;
-  data?: InputMaybe<Jsonb_Comparison_Exp>;
-  event_index?: InputMaybe<Bigint_Comparison_Exp>;
-  sequence_number?: InputMaybe<Bigint_Comparison_Exp>;
-  transaction_block_height?: InputMaybe<Bigint_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  type?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "events". */
-export type Events_Order_By = {
-  account_address?: InputMaybe<Order_By>;
-  creation_number?: InputMaybe<Order_By>;
-  data?: InputMaybe<Order_By>;
-  event_index?: InputMaybe<Order_By>;
-  sequence_number?: InputMaybe<Order_By>;
-  transaction_block_height?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  type?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "events" */
-export enum Events_Select_Column {
-  /** column name */
-  AccountAddress = 'account_address',
-  /** column name */
-  CreationNumber = 'creation_number',
-  /** column name */
-  Data = 'data',
-  /** column name */
-  EventIndex = 'event_index',
-  /** column name */
-  SequenceNumber = 'sequence_number',
-  /** column name */
-  TransactionBlockHeight = 'transaction_block_height',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  Type = 'type'
-}
-
-/** Streaming cursor of the table "events" */
-export type Events_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Events_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Events_Stream_Cursor_Value_Input = {
-  account_address?: InputMaybe<Scalars['String']>;
-  creation_number?: InputMaybe<Scalars['bigint']>;
-  data?: InputMaybe<Scalars['jsonb']>;
-  event_index?: InputMaybe<Scalars['bigint']>;
-  sequence_number?: InputMaybe<Scalars['bigint']>;
-  transaction_block_height?: InputMaybe<Scalars['bigint']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  type?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "indexer_status" */
-export type Indexer_Status = {
-  __typename?: 'indexer_status';
-  db: Scalars['String'];
-  is_indexer_up: Scalars['Boolean'];
-};
-
-/** Boolean expression to filter rows from the table "indexer_status". All fields are combined with a logical 'AND'. */
-export type Indexer_Status_Bool_Exp = {
-  _and?: InputMaybe<Array<Indexer_Status_Bool_Exp>>;
-  _not?: InputMaybe<Indexer_Status_Bool_Exp>;
-  _or?: InputMaybe<Array<Indexer_Status_Bool_Exp>>;
-  db?: InputMaybe<String_Comparison_Exp>;
-  is_indexer_up?: InputMaybe<Boolean_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "indexer_status". */
-export type Indexer_Status_Order_By = {
-  db?: InputMaybe<Order_By>;
-  is_indexer_up?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "indexer_status" */
-export enum Indexer_Status_Select_Column {
-  /** column name */
-  Db = 'db',
-  /** column name */
-  IsIndexerUp = 'is_indexer_up'
-}
-
-/** Streaming cursor of the table "indexer_status" */
-export type Indexer_Status_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Indexer_Status_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Indexer_Status_Stream_Cursor_Value_Input = {
-  db?: InputMaybe<Scalars['String']>;
-  is_indexer_up?: InputMaybe<Scalars['Boolean']>;
-};
-
-export type Jsonb_Cast_Exp = {
-  String?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Boolean expression to compare columns of type "jsonb". All fields are combined with logical 'AND'. */
-export type Jsonb_Comparison_Exp = {
-  _cast?: InputMaybe<Jsonb_Cast_Exp>;
-  /** is the column contained in the given json value */
-  _contained_in?: InputMaybe<Scalars['jsonb']>;
-  /** does the column contain the given json value at the top level */
-  _contains?: InputMaybe<Scalars['jsonb']>;
-  _eq?: InputMaybe<Scalars['jsonb']>;
-  _gt?: InputMaybe<Scalars['jsonb']>;
-  _gte?: InputMaybe<Scalars['jsonb']>;
-  /** does the string exist as a top-level key in the column */
-  _has_key?: InputMaybe<Scalars['String']>;
-  /** do all of these strings exist as top-level keys in the column */
-  _has_keys_all?: InputMaybe<Array<Scalars['String']>>;
-  /** do any of these strings exist as top-level keys in the column */
-  _has_keys_any?: InputMaybe<Array<Scalars['String']>>;
-  _in?: InputMaybe<Array<Scalars['jsonb']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['jsonb']>;
-  _lte?: InputMaybe<Scalars['jsonb']>;
-  _neq?: InputMaybe<Scalars['jsonb']>;
-  _nin?: InputMaybe<Array<Scalars['jsonb']>>;
-};
-
-/** columns and relationships of "ledger_infos" */
-export type Ledger_Infos = {
-  __typename?: 'ledger_infos';
-  chain_id: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "ledger_infos". All fields are combined with a logical 'AND'. */
-export type Ledger_Infos_Bool_Exp = {
-  _and?: InputMaybe<Array<Ledger_Infos_Bool_Exp>>;
-  _not?: InputMaybe<Ledger_Infos_Bool_Exp>;
-  _or?: InputMaybe<Array<Ledger_Infos_Bool_Exp>>;
-  chain_id?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "ledger_infos". */
-export type Ledger_Infos_Order_By = {
-  chain_id?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "ledger_infos" */
-export enum Ledger_Infos_Select_Column {
-  /** column name */
-  ChainId = 'chain_id'
-}
-
-/** Streaming cursor of the table "ledger_infos" */
-export type Ledger_Infos_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Ledger_Infos_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Ledger_Infos_Stream_Cursor_Value_Input = {
-  chain_id?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "move_resources" */
-export type Move_Resources = {
-  __typename?: 'move_resources';
-  address: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** aggregated selection of "move_resources" */
-export type Move_Resources_Aggregate = {
-  __typename?: 'move_resources_aggregate';
-  aggregate?: Maybe<Move_Resources_Aggregate_Fields>;
-  nodes: Array<Move_Resources>;
-};
-
-/** aggregate fields of "move_resources" */
-export type Move_Resources_Aggregate_Fields = {
-  __typename?: 'move_resources_aggregate_fields';
-  avg?: Maybe<Move_Resources_Avg_Fields>;
-  count: Scalars['Int'];
-  max?: Maybe<Move_Resources_Max_Fields>;
-  min?: Maybe<Move_Resources_Min_Fields>;
-  stddev?: Maybe<Move_Resources_Stddev_Fields>;
-  stddev_pop?: Maybe<Move_Resources_Stddev_Pop_Fields>;
-  stddev_samp?: Maybe<Move_Resources_Stddev_Samp_Fields>;
-  sum?: Maybe<Move_Resources_Sum_Fields>;
-  var_pop?: Maybe<Move_Resources_Var_Pop_Fields>;
-  var_samp?: Maybe<Move_Resources_Var_Samp_Fields>;
-  variance?: Maybe<Move_Resources_Variance_Fields>;
-};
-
-
-/** aggregate fields of "move_resources" */
-export type Move_Resources_Aggregate_FieldsCountArgs = {
-  columns?: InputMaybe<Array<Move_Resources_Select_Column>>;
-  distinct?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** aggregate avg on columns */
-export type Move_Resources_Avg_Fields = {
-  __typename?: 'move_resources_avg_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Boolean expression to filter rows from the table "move_resources". All fields are combined with a logical 'AND'. */
-export type Move_Resources_Bool_Exp = {
-  _and?: InputMaybe<Array<Move_Resources_Bool_Exp>>;
-  _not?: InputMaybe<Move_Resources_Bool_Exp>;
-  _or?: InputMaybe<Array<Move_Resources_Bool_Exp>>;
-  address?: InputMaybe<String_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** aggregate max on columns */
-export type Move_Resources_Max_Fields = {
-  __typename?: 'move_resources_max_fields';
-  address?: Maybe<Scalars['String']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** aggregate min on columns */
-export type Move_Resources_Min_Fields = {
-  __typename?: 'move_resources_min_fields';
-  address?: Maybe<Scalars['String']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** Ordering options when selecting data from "move_resources". */
-export type Move_Resources_Order_By = {
-  address?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "move_resources" */
-export enum Move_Resources_Select_Column {
-  /** column name */
-  Address = 'address',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** aggregate stddev on columns */
-export type Move_Resources_Stddev_Fields = {
-  __typename?: 'move_resources_stddev_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_pop on columns */
-export type Move_Resources_Stddev_Pop_Fields = {
-  __typename?: 'move_resources_stddev_pop_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_samp on columns */
-export type Move_Resources_Stddev_Samp_Fields = {
-  __typename?: 'move_resources_stddev_samp_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Streaming cursor of the table "move_resources" */
-export type Move_Resources_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Move_Resources_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Move_Resources_Stream_Cursor_Value_Input = {
-  address?: InputMaybe<Scalars['String']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** aggregate sum on columns */
-export type Move_Resources_Sum_Fields = {
-  __typename?: 'move_resources_sum_fields';
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** aggregate var_pop on columns */
-export type Move_Resources_Var_Pop_Fields = {
-  __typename?: 'move_resources_var_pop_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate var_samp on columns */
-export type Move_Resources_Var_Samp_Fields = {
-  __typename?: 'move_resources_var_samp_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate variance on columns */
-export type Move_Resources_Variance_Fields = {
-  __typename?: 'move_resources_variance_fields';
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Boolean expression to compare columns of type "numeric". All fields are combined with logical 'AND'. */
-export type Numeric_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['numeric']>;
-  _gt?: InputMaybe<Scalars['numeric']>;
-  _gte?: InputMaybe<Scalars['numeric']>;
-  _in?: InputMaybe<Array<Scalars['numeric']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['numeric']>;
-  _lte?: InputMaybe<Scalars['numeric']>;
-  _neq?: InputMaybe<Scalars['numeric']>;
-  _nin?: InputMaybe<Array<Scalars['numeric']>>;
-};
-
-/** column ordering options */
-export enum Order_By {
-  /** in ascending order, nulls last */
-  Asc = 'asc',
-  /** in ascending order, nulls first */
-  AscNullsFirst = 'asc_nulls_first',
-  /** in ascending order, nulls last */
-  AscNullsLast = 'asc_nulls_last',
-  /** in descending order, nulls first */
-  Desc = 'desc',
-  /** in descending order, nulls first */
-  DescNullsFirst = 'desc_nulls_first',
-  /** in descending order, nulls last */
-  DescNullsLast = 'desc_nulls_last'
-}
-
-/** columns and relationships of "processor_status" */
-export type Processor_Status = {
-  __typename?: 'processor_status';
-  last_success_version: Scalars['bigint'];
-  processor: Scalars['String'];
-};
-
-/** Boolean expression to filter rows from the table "processor_status". All fields are combined with a logical 'AND'. */
-export type Processor_Status_Bool_Exp = {
-  _and?: InputMaybe<Array<Processor_Status_Bool_Exp>>;
-  _not?: InputMaybe<Processor_Status_Bool_Exp>;
-  _or?: InputMaybe<Array<Processor_Status_Bool_Exp>>;
-  last_success_version?: InputMaybe<Bigint_Comparison_Exp>;
-  processor?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "processor_status". */
-export type Processor_Status_Order_By = {
-  last_success_version?: InputMaybe<Order_By>;
-  processor?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "processor_status" */
-export enum Processor_Status_Select_Column {
-  /** column name */
-  LastSuccessVersion = 'last_success_version',
-  /** column name */
-  Processor = 'processor'
-}
-
-/** Streaming cursor of the table "processor_status" */
-export type Processor_Status_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Processor_Status_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Processor_Status_Stream_Cursor_Value_Input = {
-  last_success_version?: InputMaybe<Scalars['bigint']>;
-  processor?: InputMaybe<Scalars['String']>;
-};
-
-/** columns and relationships of "proposal_votes" */
-export type Proposal_Votes = {
-  __typename?: 'proposal_votes';
-  num_votes: Scalars['numeric'];
-  proposal_id: Scalars['bigint'];
-  should_pass: Scalars['Boolean'];
-  staking_pool_address: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-  voter_address: Scalars['String'];
-};
-
-/** aggregated selection of "proposal_votes" */
-export type Proposal_Votes_Aggregate = {
-  __typename?: 'proposal_votes_aggregate';
-  aggregate?: Maybe<Proposal_Votes_Aggregate_Fields>;
-  nodes: Array<Proposal_Votes>;
-};
-
-/** aggregate fields of "proposal_votes" */
-export type Proposal_Votes_Aggregate_Fields = {
-  __typename?: 'proposal_votes_aggregate_fields';
-  avg?: Maybe<Proposal_Votes_Avg_Fields>;
-  count: Scalars['Int'];
-  max?: Maybe<Proposal_Votes_Max_Fields>;
-  min?: Maybe<Proposal_Votes_Min_Fields>;
-  stddev?: Maybe<Proposal_Votes_Stddev_Fields>;
-  stddev_pop?: Maybe<Proposal_Votes_Stddev_Pop_Fields>;
-  stddev_samp?: Maybe<Proposal_Votes_Stddev_Samp_Fields>;
-  sum?: Maybe<Proposal_Votes_Sum_Fields>;
-  var_pop?: Maybe<Proposal_Votes_Var_Pop_Fields>;
-  var_samp?: Maybe<Proposal_Votes_Var_Samp_Fields>;
-  variance?: Maybe<Proposal_Votes_Variance_Fields>;
-};
-
-
-/** aggregate fields of "proposal_votes" */
-export type Proposal_Votes_Aggregate_FieldsCountArgs = {
-  columns?: InputMaybe<Array<Proposal_Votes_Select_Column>>;
-  distinct?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** aggregate avg on columns */
-export type Proposal_Votes_Avg_Fields = {
-  __typename?: 'proposal_votes_avg_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Boolean expression to filter rows from the table "proposal_votes". All fields are combined with a logical 'AND'. */
-export type Proposal_Votes_Bool_Exp = {
-  _and?: InputMaybe<Array<Proposal_Votes_Bool_Exp>>;
-  _not?: InputMaybe<Proposal_Votes_Bool_Exp>;
-  _or?: InputMaybe<Array<Proposal_Votes_Bool_Exp>>;
-  num_votes?: InputMaybe<Numeric_Comparison_Exp>;
-  proposal_id?: InputMaybe<Bigint_Comparison_Exp>;
-  should_pass?: InputMaybe<Boolean_Comparison_Exp>;
-  staking_pool_address?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  voter_address?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** aggregate max on columns */
-export type Proposal_Votes_Max_Fields = {
-  __typename?: 'proposal_votes_max_fields';
-  num_votes?: Maybe<Scalars['numeric']>;
-  proposal_id?: Maybe<Scalars['bigint']>;
-  staking_pool_address?: Maybe<Scalars['String']>;
-  transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-  voter_address?: Maybe<Scalars['String']>;
-};
-
-/** aggregate min on columns */
-export type Proposal_Votes_Min_Fields = {
-  __typename?: 'proposal_votes_min_fields';
-  num_votes?: Maybe<Scalars['numeric']>;
-  proposal_id?: Maybe<Scalars['bigint']>;
-  staking_pool_address?: Maybe<Scalars['String']>;
-  transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-  voter_address?: Maybe<Scalars['String']>;
-};
-
-/** Ordering options when selecting data from "proposal_votes". */
-export type Proposal_Votes_Order_By = {
-  num_votes?: InputMaybe<Order_By>;
-  proposal_id?: InputMaybe<Order_By>;
-  should_pass?: InputMaybe<Order_By>;
-  staking_pool_address?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  voter_address?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "proposal_votes" */
-export enum Proposal_Votes_Select_Column {
-  /** column name */
-  NumVotes = 'num_votes',
-  /** column name */
-  ProposalId = 'proposal_id',
-  /** column name */
-  ShouldPass = 'should_pass',
-  /** column name */
-  StakingPoolAddress = 'staking_pool_address',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  VoterAddress = 'voter_address'
-}
-
-/** aggregate stddev on columns */
-export type Proposal_Votes_Stddev_Fields = {
-  __typename?: 'proposal_votes_stddev_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_pop on columns */
-export type Proposal_Votes_Stddev_Pop_Fields = {
-  __typename?: 'proposal_votes_stddev_pop_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_samp on columns */
-export type Proposal_Votes_Stddev_Samp_Fields = {
-  __typename?: 'proposal_votes_stddev_samp_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Streaming cursor of the table "proposal_votes" */
-export type Proposal_Votes_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Proposal_Votes_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Proposal_Votes_Stream_Cursor_Value_Input = {
-  num_votes?: InputMaybe<Scalars['numeric']>;
-  proposal_id?: InputMaybe<Scalars['bigint']>;
-  should_pass?: InputMaybe<Scalars['Boolean']>;
-  staking_pool_address?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  voter_address?: InputMaybe<Scalars['String']>;
-};
-
-/** aggregate sum on columns */
-export type Proposal_Votes_Sum_Fields = {
-  __typename?: 'proposal_votes_sum_fields';
-  num_votes?: Maybe<Scalars['numeric']>;
-  proposal_id?: Maybe<Scalars['bigint']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** aggregate var_pop on columns */
-export type Proposal_Votes_Var_Pop_Fields = {
-  __typename?: 'proposal_votes_var_pop_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate var_samp on columns */
-export type Proposal_Votes_Var_Samp_Fields = {
-  __typename?: 'proposal_votes_var_samp_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate variance on columns */
-export type Proposal_Votes_Variance_Fields = {
-  __typename?: 'proposal_votes_variance_fields';
-  num_votes?: Maybe<Scalars['Float']>;
-  proposal_id?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-export type Query_Root = {
-  __typename?: 'query_root';
-  /** fetch data from the table: "address_version_from_events" */
-  address_version_from_events: Array<Address_Version_From_Events>;
-  coin_activities: Array<Coin_Activities>;
-  /** fetch data from the table: "coin_activities" using primary key columns */
-  coin_activities_by_pk?: Maybe<Coin_Activities>;
-  /** fetch data from the table: "coin_balances" */
-  coin_balances: Array<Coin_Balances>;
-  /** fetch data from the table: "coin_balances" using primary key columns */
-  coin_balances_by_pk?: Maybe<Coin_Balances>;
-  /** fetch data from the table: "coin_infos" */
-  coin_infos: Array<Coin_Infos>;
-  /** fetch data from the table: "coin_infos" using primary key columns */
-  coin_infos_by_pk?: Maybe<Coin_Infos>;
-  /** fetch data from the table: "coin_supply" */
-  coin_supply: Array<Coin_Supply>;
-  /** fetch data from the table: "coin_supply" using primary key columns */
-  coin_supply_by_pk?: Maybe<Coin_Supply>;
-  /** fetch data from the table: "collection_datas" */
-  collection_datas: Array<Collection_Datas>;
-  /** fetch data from the table: "collection_datas" using primary key columns */
-  collection_datas_by_pk?: Maybe<Collection_Datas>;
-  /** fetch data from the table: "current_ans_lookup" */
-  current_ans_lookup: Array<Current_Ans_Lookup>;
-  /** fetch data from the table: "current_ans_lookup" using primary key columns */
-  current_ans_lookup_by_pk?: Maybe<Current_Ans_Lookup>;
-  /** fetch data from the table: "current_coin_balances" */
-  current_coin_balances: Array<Current_Coin_Balances>;
-  /** fetch data from the table: "current_coin_balances" using primary key columns */
-  current_coin_balances_by_pk?: Maybe<Current_Coin_Balances>;
-  /** fetch data from the table: "current_collection_datas" */
-  current_collection_datas: Array<Current_Collection_Datas>;
-  /** fetch data from the table: "current_collection_datas" using primary key columns */
-  current_collection_datas_by_pk?: Maybe<Current_Collection_Datas>;
-  /** fetch data from the table: "current_collection_ownership_view" */
-  current_collection_ownership_view: Array<Current_Collection_Ownership_View>;
-  /** fetch data from the table: "current_delegator_balances" */
-  current_delegator_balances: Array<Current_Delegator_Balances>;
-  /** fetch aggregated fields from the table: "current_delegator_balances" */
-  current_delegator_balances_aggregate: Current_Delegator_Balances_Aggregate;
-  /** fetch data from the table: "current_delegator_balances" using primary key columns */
-  current_delegator_balances_by_pk?: Maybe<Current_Delegator_Balances>;
-  /** fetch data from the table: "current_staking_pool_voter" */
-  current_staking_pool_voter: Array<Current_Staking_Pool_Voter>;
-  /** fetch data from the table: "current_staking_pool_voter" using primary key columns */
-  current_staking_pool_voter_by_pk?: Maybe<Current_Staking_Pool_Voter>;
-  /** fetch data from the table: "current_table_items" */
-  current_table_items: Array<Current_Table_Items>;
-  /** fetch data from the table: "current_table_items" using primary key columns */
-  current_table_items_by_pk?: Maybe<Current_Table_Items>;
-  /** fetch data from the table: "current_token_datas" */
-  current_token_datas: Array<Current_Token_Datas>;
-  /** fetch data from the table: "current_token_datas" using primary key columns */
-  current_token_datas_by_pk?: Maybe<Current_Token_Datas>;
-  /** fetch data from the table: "current_token_ownerships" */
-  current_token_ownerships: Array<Current_Token_Ownerships>;
-  /** fetch aggregated fields from the table: "current_token_ownerships" */
-  current_token_ownerships_aggregate: Current_Token_Ownerships_Aggregate;
-  /** fetch data from the table: "current_token_ownerships" using primary key columns */
-  current_token_ownerships_by_pk?: Maybe<Current_Token_Ownerships>;
-  /** fetch data from the table: "current_token_pending_claims" */
-  current_token_pending_claims: Array<Current_Token_Pending_Claims>;
-  /** fetch data from the table: "current_token_pending_claims" using primary key columns */
-  current_token_pending_claims_by_pk?: Maybe<Current_Token_Pending_Claims>;
-  /** fetch data from the table: "delegated_staking_activities" */
-  delegated_staking_activities: Array<Delegated_Staking_Activities>;
-  /** fetch data from the table: "delegated_staking_activities" using primary key columns */
-  delegated_staking_activities_by_pk?: Maybe<Delegated_Staking_Activities>;
-  /** fetch data from the table: "events" */
-  events: Array<Events>;
-  /** fetch data from the table: "events" using primary key columns */
-  events_by_pk?: Maybe<Events>;
-  /** fetch data from the table: "indexer_status" */
-  indexer_status: Array<Indexer_Status>;
-  /** fetch data from the table: "indexer_status" using primary key columns */
-  indexer_status_by_pk?: Maybe<Indexer_Status>;
-  /** fetch data from the table: "ledger_infos" */
-  ledger_infos: Array<Ledger_Infos>;
-  /** fetch data from the table: "ledger_infos" using primary key columns */
-  ledger_infos_by_pk?: Maybe<Ledger_Infos>;
-  /** fetch data from the table: "move_resources" */
-  move_resources: Array<Move_Resources>;
-  /** fetch aggregated fields from the table: "move_resources" */
-  move_resources_aggregate: Move_Resources_Aggregate;
-  /** fetch data from the table: "processor_status" */
-  processor_status: Array<Processor_Status>;
-  /** fetch data from the table: "processor_status" using primary key columns */
-  processor_status_by_pk?: Maybe<Processor_Status>;
-  /** fetch data from the table: "proposal_votes" */
-  proposal_votes: Array<Proposal_Votes>;
-  /** fetch aggregated fields from the table: "proposal_votes" */
-  proposal_votes_aggregate: Proposal_Votes_Aggregate;
-  /** fetch data from the table: "proposal_votes" using primary key columns */
-  proposal_votes_by_pk?: Maybe<Proposal_Votes>;
-  /** fetch data from the table: "table_items" */
-  table_items: Array<Table_Items>;
-  /** fetch data from the table: "table_items" using primary key columns */
-  table_items_by_pk?: Maybe<Table_Items>;
-  /** fetch data from the table: "table_metadatas" */
-  table_metadatas: Array<Table_Metadatas>;
-  /** fetch data from the table: "table_metadatas" using primary key columns */
-  table_metadatas_by_pk?: Maybe<Table_Metadatas>;
-  token_activities: Array<Token_Activities>;
-  token_activities_aggregate: Token_Activities_Aggregate;
-  /** fetch data from the table: "token_activities" using primary key columns */
-  token_activities_by_pk?: Maybe<Token_Activities>;
-  /** fetch data from the table: "token_datas" */
-  token_datas: Array<Token_Datas>;
-  /** fetch data from the table: "token_datas" using primary key columns */
-  token_datas_by_pk?: Maybe<Token_Datas>;
-  /** fetch data from the table: "token_ownerships" */
-  token_ownerships: Array<Token_Ownerships>;
-  /** fetch data from the table: "token_ownerships" using primary key columns */
-  token_ownerships_by_pk?: Maybe<Token_Ownerships>;
-  /** fetch data from the table: "tokens" */
-  tokens: Array<Tokens>;
-  /** fetch data from the table: "tokens" using primary key columns */
-  tokens_by_pk?: Maybe<Tokens>;
-  /** fetch data from the table: "user_transactions" */
-  user_transactions: Array<User_Transactions>;
-  /** fetch data from the table: "user_transactions" using primary key columns */
-  user_transactions_by_pk?: Maybe<User_Transactions>;
-};
-
-
-export type Query_RootAddress_Version_From_EventsArgs = {
-  distinct_on?: InputMaybe<Array<Address_Version_From_Events_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Address_Version_From_Events_Order_By>>;
-  where?: InputMaybe<Address_Version_From_Events_Bool_Exp>;
-};
-
-
-export type Query_RootCoin_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Activities_Order_By>>;
-  where?: InputMaybe<Coin_Activities_Bool_Exp>;
-};
-
-
-export type Query_RootCoin_Activities_By_PkArgs = {
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_sequence_number: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootCoin_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Balances_Order_By>>;
-  where?: InputMaybe<Coin_Balances_Bool_Exp>;
-};
-
-
-export type Query_RootCoin_Balances_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  owner_address: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootCoin_InfosArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Infos_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Infos_Order_By>>;
-  where?: InputMaybe<Coin_Infos_Bool_Exp>;
-};
-
-
-export type Query_RootCoin_Infos_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-};
-
-
-export type Query_RootCoin_SupplyArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Supply_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Supply_Order_By>>;
-  where?: InputMaybe<Coin_Supply_Bool_Exp>;
-};
-
-
-export type Query_RootCoin_Supply_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootCollection_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Collection_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Collection_Datas_Order_By>>;
-  where?: InputMaybe<Collection_Datas_Bool_Exp>;
-};
-
-
-export type Query_RootCollection_Datas_By_PkArgs = {
-  collection_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootCurrent_Ans_LookupArgs = {
-  distinct_on?: InputMaybe<Array<Current_Ans_Lookup_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Ans_Lookup_Order_By>>;
-  where?: InputMaybe<Current_Ans_Lookup_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Ans_Lookup_By_PkArgs = {
-  domain: Scalars['String'];
-  subdomain: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Coin_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Current_Coin_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Coin_Balances_Order_By>>;
-  where?: InputMaybe<Current_Coin_Balances_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Coin_Balances_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  owner_address: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Collection_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Current_Collection_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Collection_Datas_Order_By>>;
-  where?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Collection_Datas_By_PkArgs = {
-  collection_data_id_hash: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Collection_Ownership_ViewArgs = {
-  distinct_on?: InputMaybe<Array<Current_Collection_Ownership_View_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Collection_Ownership_View_Order_By>>;
-  where?: InputMaybe<Current_Collection_Ownership_View_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Delegator_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Current_Delegator_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Delegator_Balances_Order_By>>;
-  where?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Delegator_Balances_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Current_Delegator_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Delegator_Balances_Order_By>>;
-  where?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Delegator_Balances_By_PkArgs = {
-  delegator_address: Scalars['String'];
-  pool_address: Scalars['String'];
-  pool_type: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Staking_Pool_VoterArgs = {
-  distinct_on?: InputMaybe<Array<Current_Staking_Pool_Voter_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Staking_Pool_Voter_Order_By>>;
-  where?: InputMaybe<Current_Staking_Pool_Voter_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Staking_Pool_Voter_By_PkArgs = {
-  staking_pool_address: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Table_ItemsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Table_Items_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Table_Items_Order_By>>;
-  where?: InputMaybe<Current_Table_Items_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Table_Items_By_PkArgs = {
-  key_hash: Scalars['String'];
-  table_handle: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Token_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Datas_Order_By>>;
-  where?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Token_Datas_By_PkArgs = {
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Token_OwnershipsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Token_Ownerships_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Token_Ownerships_By_PkArgs = {
-  owner_address: Scalars['String'];
-  property_version: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Query_RootCurrent_Token_Pending_ClaimsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Pending_Claims_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Pending_Claims_Order_By>>;
-  where?: InputMaybe<Current_Token_Pending_Claims_Bool_Exp>;
-};
-
-
-export type Query_RootCurrent_Token_Pending_Claims_By_PkArgs = {
-  from_address: Scalars['String'];
-  property_version: Scalars['numeric'];
-  to_address: Scalars['String'];
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Query_RootDelegated_Staking_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Delegated_Staking_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Delegated_Staking_Activities_Order_By>>;
-  where?: InputMaybe<Delegated_Staking_Activities_Bool_Exp>;
-};
-
-
-export type Query_RootDelegated_Staking_Activities_By_PkArgs = {
-  event_index: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootEventsArgs = {
-  distinct_on?: InputMaybe<Array<Events_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Events_Order_By>>;
-  where?: InputMaybe<Events_Bool_Exp>;
-};
-
-
-export type Query_RootEvents_By_PkArgs = {
-  account_address: Scalars['String'];
-  creation_number: Scalars['bigint'];
-  sequence_number: Scalars['bigint'];
-};
-
-
-export type Query_RootIndexer_StatusArgs = {
-  distinct_on?: InputMaybe<Array<Indexer_Status_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Indexer_Status_Order_By>>;
-  where?: InputMaybe<Indexer_Status_Bool_Exp>;
-};
-
-
-export type Query_RootIndexer_Status_By_PkArgs = {
-  db: Scalars['String'];
-};
-
-
-export type Query_RootLedger_InfosArgs = {
-  distinct_on?: InputMaybe<Array<Ledger_Infos_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Ledger_Infos_Order_By>>;
-  where?: InputMaybe<Ledger_Infos_Bool_Exp>;
-};
-
-
-export type Query_RootLedger_Infos_By_PkArgs = {
-  chain_id: Scalars['bigint'];
-};
-
-
-export type Query_RootMove_ResourcesArgs = {
-  distinct_on?: InputMaybe<Array<Move_Resources_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Move_Resources_Order_By>>;
-  where?: InputMaybe<Move_Resources_Bool_Exp>;
-};
-
-
-export type Query_RootMove_Resources_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Move_Resources_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Move_Resources_Order_By>>;
-  where?: InputMaybe<Move_Resources_Bool_Exp>;
-};
-
-
-export type Query_RootProcessor_StatusArgs = {
-  distinct_on?: InputMaybe<Array<Processor_Status_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Processor_Status_Order_By>>;
-  where?: InputMaybe<Processor_Status_Bool_Exp>;
-};
-
-
-export type Query_RootProcessor_Status_By_PkArgs = {
-  processor: Scalars['String'];
-};
-
-
-export type Query_RootProposal_VotesArgs = {
-  distinct_on?: InputMaybe<Array<Proposal_Votes_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Proposal_Votes_Order_By>>;
-  where?: InputMaybe<Proposal_Votes_Bool_Exp>;
-};
-
-
-export type Query_RootProposal_Votes_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Proposal_Votes_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Proposal_Votes_Order_By>>;
-  where?: InputMaybe<Proposal_Votes_Bool_Exp>;
-};
-
-
-export type Query_RootProposal_Votes_By_PkArgs = {
-  proposal_id: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-  voter_address: Scalars['String'];
-};
-
-
-export type Query_RootTable_ItemsArgs = {
-  distinct_on?: InputMaybe<Array<Table_Items_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Table_Items_Order_By>>;
-  where?: InputMaybe<Table_Items_Bool_Exp>;
-};
-
-
-export type Query_RootTable_Items_By_PkArgs = {
-  transaction_version: Scalars['bigint'];
-  write_set_change_index: Scalars['bigint'];
-};
-
-
-export type Query_RootTable_MetadatasArgs = {
-  distinct_on?: InputMaybe<Array<Table_Metadatas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Table_Metadatas_Order_By>>;
-  where?: InputMaybe<Table_Metadatas_Bool_Exp>;
-};
-
-
-export type Query_RootTable_Metadatas_By_PkArgs = {
-  handle: Scalars['String'];
-};
-
-
-export type Query_RootToken_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-export type Query_RootToken_Activities_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-export type Query_RootToken_Activities_By_PkArgs = {
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_sequence_number: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootToken_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Token_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Datas_Order_By>>;
-  where?: InputMaybe<Token_Datas_Bool_Exp>;
-};
-
-
-export type Query_RootToken_Datas_By_PkArgs = {
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootToken_OwnershipsArgs = {
-  distinct_on?: InputMaybe<Array<Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Query_RootToken_Ownerships_By_PkArgs = {
-  property_version: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootTokensArgs = {
-  distinct_on?: InputMaybe<Array<Tokens_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Tokens_Order_By>>;
-  where?: InputMaybe<Tokens_Bool_Exp>;
-};
-
-
-export type Query_RootTokens_By_PkArgs = {
-  property_version: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Query_RootUser_TransactionsArgs = {
-  distinct_on?: InputMaybe<Array<User_Transactions_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<User_Transactions_Order_By>>;
-  where?: InputMaybe<User_Transactions_Bool_Exp>;
-};
-
-
-export type Query_RootUser_Transactions_By_PkArgs = {
-  version: Scalars['bigint'];
-};
-
-export type Subscription_Root = {
-  __typename?: 'subscription_root';
-  /** fetch data from the table: "address_version_from_events" */
-  address_version_from_events: Array<Address_Version_From_Events>;
-  /** fetch data from the table in a streaming manner : "address_version_from_events" */
-  address_version_from_events_stream: Array<Address_Version_From_Events>;
-  coin_activities: Array<Coin_Activities>;
-  /** fetch data from the table: "coin_activities" using primary key columns */
-  coin_activities_by_pk?: Maybe<Coin_Activities>;
-  /** fetch data from the table in a streaming manner : "coin_activities" */
-  coin_activities_stream: Array<Coin_Activities>;
-  /** fetch data from the table: "coin_balances" */
-  coin_balances: Array<Coin_Balances>;
-  /** fetch data from the table: "coin_balances" using primary key columns */
-  coin_balances_by_pk?: Maybe<Coin_Balances>;
-  /** fetch data from the table in a streaming manner : "coin_balances" */
-  coin_balances_stream: Array<Coin_Balances>;
-  /** fetch data from the table: "coin_infos" */
-  coin_infos: Array<Coin_Infos>;
-  /** fetch data from the table: "coin_infos" using primary key columns */
-  coin_infos_by_pk?: Maybe<Coin_Infos>;
-  /** fetch data from the table in a streaming manner : "coin_infos" */
-  coin_infos_stream: Array<Coin_Infos>;
-  /** fetch data from the table: "coin_supply" */
-  coin_supply: Array<Coin_Supply>;
-  /** fetch data from the table: "coin_supply" using primary key columns */
-  coin_supply_by_pk?: Maybe<Coin_Supply>;
-  /** fetch data from the table in a streaming manner : "coin_supply" */
-  coin_supply_stream: Array<Coin_Supply>;
-  /** fetch data from the table: "collection_datas" */
-  collection_datas: Array<Collection_Datas>;
-  /** fetch data from the table: "collection_datas" using primary key columns */
-  collection_datas_by_pk?: Maybe<Collection_Datas>;
-  /** fetch data from the table in a streaming manner : "collection_datas" */
-  collection_datas_stream: Array<Collection_Datas>;
-  /** fetch data from the table: "current_ans_lookup" */
-  current_ans_lookup: Array<Current_Ans_Lookup>;
-  /** fetch data from the table: "current_ans_lookup" using primary key columns */
-  current_ans_lookup_by_pk?: Maybe<Current_Ans_Lookup>;
-  /** fetch data from the table in a streaming manner : "current_ans_lookup" */
-  current_ans_lookup_stream: Array<Current_Ans_Lookup>;
-  /** fetch data from the table: "current_coin_balances" */
-  current_coin_balances: Array<Current_Coin_Balances>;
-  /** fetch data from the table: "current_coin_balances" using primary key columns */
-  current_coin_balances_by_pk?: Maybe<Current_Coin_Balances>;
-  /** fetch data from the table in a streaming manner : "current_coin_balances" */
-  current_coin_balances_stream: Array<Current_Coin_Balances>;
-  /** fetch data from the table: "current_collection_datas" */
-  current_collection_datas: Array<Current_Collection_Datas>;
-  /** fetch data from the table: "current_collection_datas" using primary key columns */
-  current_collection_datas_by_pk?: Maybe<Current_Collection_Datas>;
-  /** fetch data from the table in a streaming manner : "current_collection_datas" */
-  current_collection_datas_stream: Array<Current_Collection_Datas>;
-  /** fetch data from the table: "current_collection_ownership_view" */
-  current_collection_ownership_view: Array<Current_Collection_Ownership_View>;
-  /** fetch data from the table in a streaming manner : "current_collection_ownership_view" */
-  current_collection_ownership_view_stream: Array<Current_Collection_Ownership_View>;
-  /** fetch data from the table: "current_delegator_balances" */
-  current_delegator_balances: Array<Current_Delegator_Balances>;
-  /** fetch aggregated fields from the table: "current_delegator_balances" */
-  current_delegator_balances_aggregate: Current_Delegator_Balances_Aggregate;
-  /** fetch data from the table: "current_delegator_balances" using primary key columns */
-  current_delegator_balances_by_pk?: Maybe<Current_Delegator_Balances>;
-  /** fetch data from the table in a streaming manner : "current_delegator_balances" */
-  current_delegator_balances_stream: Array<Current_Delegator_Balances>;
-  /** fetch data from the table: "current_staking_pool_voter" */
-  current_staking_pool_voter: Array<Current_Staking_Pool_Voter>;
-  /** fetch data from the table: "current_staking_pool_voter" using primary key columns */
-  current_staking_pool_voter_by_pk?: Maybe<Current_Staking_Pool_Voter>;
-  /** fetch data from the table in a streaming manner : "current_staking_pool_voter" */
-  current_staking_pool_voter_stream: Array<Current_Staking_Pool_Voter>;
-  /** fetch data from the table: "current_table_items" */
-  current_table_items: Array<Current_Table_Items>;
-  /** fetch data from the table: "current_table_items" using primary key columns */
-  current_table_items_by_pk?: Maybe<Current_Table_Items>;
-  /** fetch data from the table in a streaming manner : "current_table_items" */
-  current_table_items_stream: Array<Current_Table_Items>;
-  /** fetch data from the table: "current_token_datas" */
-  current_token_datas: Array<Current_Token_Datas>;
-  /** fetch data from the table: "current_token_datas" using primary key columns */
-  current_token_datas_by_pk?: Maybe<Current_Token_Datas>;
-  /** fetch data from the table in a streaming manner : "current_token_datas" */
-  current_token_datas_stream: Array<Current_Token_Datas>;
-  /** fetch data from the table: "current_token_ownerships" */
-  current_token_ownerships: Array<Current_Token_Ownerships>;
-  /** fetch aggregated fields from the table: "current_token_ownerships" */
-  current_token_ownerships_aggregate: Current_Token_Ownerships_Aggregate;
-  /** fetch data from the table: "current_token_ownerships" using primary key columns */
-  current_token_ownerships_by_pk?: Maybe<Current_Token_Ownerships>;
-  /** fetch data from the table in a streaming manner : "current_token_ownerships" */
-  current_token_ownerships_stream: Array<Current_Token_Ownerships>;
-  /** fetch data from the table: "current_token_pending_claims" */
-  current_token_pending_claims: Array<Current_Token_Pending_Claims>;
-  /** fetch data from the table: "current_token_pending_claims" using primary key columns */
-  current_token_pending_claims_by_pk?: Maybe<Current_Token_Pending_Claims>;
-  /** fetch data from the table in a streaming manner : "current_token_pending_claims" */
-  current_token_pending_claims_stream: Array<Current_Token_Pending_Claims>;
-  /** fetch data from the table: "delegated_staking_activities" */
-  delegated_staking_activities: Array<Delegated_Staking_Activities>;
-  /** fetch data from the table: "delegated_staking_activities" using primary key columns */
-  delegated_staking_activities_by_pk?: Maybe<Delegated_Staking_Activities>;
-  /** fetch data from the table in a streaming manner : "delegated_staking_activities" */
-  delegated_staking_activities_stream: Array<Delegated_Staking_Activities>;
-  /** fetch data from the table: "events" */
-  events: Array<Events>;
-  /** fetch data from the table: "events" using primary key columns */
-  events_by_pk?: Maybe<Events>;
-  /** fetch data from the table in a streaming manner : "events" */
-  events_stream: Array<Events>;
-  /** fetch data from the table: "indexer_status" */
-  indexer_status: Array<Indexer_Status>;
-  /** fetch data from the table: "indexer_status" using primary key columns */
-  indexer_status_by_pk?: Maybe<Indexer_Status>;
-  /** fetch data from the table in a streaming manner : "indexer_status" */
-  indexer_status_stream: Array<Indexer_Status>;
-  /** fetch data from the table: "ledger_infos" */
-  ledger_infos: Array<Ledger_Infos>;
-  /** fetch data from the table: "ledger_infos" using primary key columns */
-  ledger_infos_by_pk?: Maybe<Ledger_Infos>;
-  /** fetch data from the table in a streaming manner : "ledger_infos" */
-  ledger_infos_stream: Array<Ledger_Infos>;
-  /** fetch data from the table: "move_resources" */
-  move_resources: Array<Move_Resources>;
-  /** fetch aggregated fields from the table: "move_resources" */
-  move_resources_aggregate: Move_Resources_Aggregate;
-  /** fetch data from the table in a streaming manner : "move_resources" */
-  move_resources_stream: Array<Move_Resources>;
-  /** fetch data from the table: "processor_status" */
-  processor_status: Array<Processor_Status>;
-  /** fetch data from the table: "processor_status" using primary key columns */
-  processor_status_by_pk?: Maybe<Processor_Status>;
-  /** fetch data from the table in a streaming manner : "processor_status" */
-  processor_status_stream: Array<Processor_Status>;
-  /** fetch data from the table: "proposal_votes" */
-  proposal_votes: Array<Proposal_Votes>;
-  /** fetch aggregated fields from the table: "proposal_votes" */
-  proposal_votes_aggregate: Proposal_Votes_Aggregate;
-  /** fetch data from the table: "proposal_votes" using primary key columns */
-  proposal_votes_by_pk?: Maybe<Proposal_Votes>;
-  /** fetch data from the table in a streaming manner : "proposal_votes" */
-  proposal_votes_stream: Array<Proposal_Votes>;
-  /** fetch data from the table: "table_items" */
-  table_items: Array<Table_Items>;
-  /** fetch data from the table: "table_items" using primary key columns */
-  table_items_by_pk?: Maybe<Table_Items>;
-  /** fetch data from the table in a streaming manner : "table_items" */
-  table_items_stream: Array<Table_Items>;
-  /** fetch data from the table: "table_metadatas" */
-  table_metadatas: Array<Table_Metadatas>;
-  /** fetch data from the table: "table_metadatas" using primary key columns */
-  table_metadatas_by_pk?: Maybe<Table_Metadatas>;
-  /** fetch data from the table in a streaming manner : "table_metadatas" */
-  table_metadatas_stream: Array<Table_Metadatas>;
-  token_activities: Array<Token_Activities>;
-  token_activities_aggregate: Token_Activities_Aggregate;
-  /** fetch data from the table: "token_activities" using primary key columns */
-  token_activities_by_pk?: Maybe<Token_Activities>;
-  /** fetch data from the table in a streaming manner : "token_activities" */
-  token_activities_stream: Array<Token_Activities>;
-  /** fetch data from the table: "token_datas" */
-  token_datas: Array<Token_Datas>;
-  /** fetch data from the table: "token_datas" using primary key columns */
-  token_datas_by_pk?: Maybe<Token_Datas>;
-  /** fetch data from the table in a streaming manner : "token_datas" */
-  token_datas_stream: Array<Token_Datas>;
-  /** fetch data from the table: "token_ownerships" */
-  token_ownerships: Array<Token_Ownerships>;
-  /** fetch data from the table: "token_ownerships" using primary key columns */
-  token_ownerships_by_pk?: Maybe<Token_Ownerships>;
-  /** fetch data from the table in a streaming manner : "token_ownerships" */
-  token_ownerships_stream: Array<Token_Ownerships>;
-  /** fetch data from the table: "tokens" */
-  tokens: Array<Tokens>;
-  /** fetch data from the table: "tokens" using primary key columns */
-  tokens_by_pk?: Maybe<Tokens>;
-  /** fetch data from the table in a streaming manner : "tokens" */
-  tokens_stream: Array<Tokens>;
-  /** fetch data from the table: "user_transactions" */
-  user_transactions: Array<User_Transactions>;
-  /** fetch data from the table: "user_transactions" using primary key columns */
-  user_transactions_by_pk?: Maybe<User_Transactions>;
-  /** fetch data from the table in a streaming manner : "user_transactions" */
-  user_transactions_stream: Array<User_Transactions>;
-};
-
-
-export type Subscription_RootAddress_Version_From_EventsArgs = {
-  distinct_on?: InputMaybe<Array<Address_Version_From_Events_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Address_Version_From_Events_Order_By>>;
-  where?: InputMaybe<Address_Version_From_Events_Bool_Exp>;
-};
-
-
-export type Subscription_RootAddress_Version_From_Events_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Address_Version_From_Events_Stream_Cursor_Input>>;
-  where?: InputMaybe<Address_Version_From_Events_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Activities_Order_By>>;
-  where?: InputMaybe<Coin_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_Activities_By_PkArgs = {
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_sequence_number: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootCoin_Activities_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Coin_Activities_Stream_Cursor_Input>>;
-  where?: InputMaybe<Coin_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Balances_Order_By>>;
-  where?: InputMaybe<Coin_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_Balances_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  owner_address: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootCoin_Balances_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Coin_Balances_Stream_Cursor_Input>>;
-  where?: InputMaybe<Coin_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_InfosArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Infos_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Infos_Order_By>>;
-  where?: InputMaybe<Coin_Infos_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_Infos_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-};
-
-
-export type Subscription_RootCoin_Infos_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Coin_Infos_Stream_Cursor_Input>>;
-  where?: InputMaybe<Coin_Infos_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_SupplyArgs = {
-  distinct_on?: InputMaybe<Array<Coin_Supply_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Coin_Supply_Order_By>>;
-  where?: InputMaybe<Coin_Supply_Bool_Exp>;
-};
-
-
-export type Subscription_RootCoin_Supply_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootCoin_Supply_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Coin_Supply_Stream_Cursor_Input>>;
-  where?: InputMaybe<Coin_Supply_Bool_Exp>;
-};
-
-
-export type Subscription_RootCollection_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Collection_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Collection_Datas_Order_By>>;
-  where?: InputMaybe<Collection_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCollection_Datas_By_PkArgs = {
-  collection_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootCollection_Datas_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Collection_Datas_Stream_Cursor_Input>>;
-  where?: InputMaybe<Collection_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Ans_LookupArgs = {
-  distinct_on?: InputMaybe<Array<Current_Ans_Lookup_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Ans_Lookup_Order_By>>;
-  where?: InputMaybe<Current_Ans_Lookup_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Ans_Lookup_By_PkArgs = {
-  domain: Scalars['String'];
-  subdomain: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Ans_Lookup_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Ans_Lookup_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Ans_Lookup_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Coin_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Current_Coin_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Coin_Balances_Order_By>>;
-  where?: InputMaybe<Current_Coin_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Coin_Balances_By_PkArgs = {
-  coin_type_hash: Scalars['String'];
-  owner_address: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Coin_Balances_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Coin_Balances_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Coin_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Collection_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Current_Collection_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Collection_Datas_Order_By>>;
-  where?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Collection_Datas_By_PkArgs = {
-  collection_data_id_hash: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Collection_Datas_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Collection_Datas_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Collection_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Collection_Ownership_ViewArgs = {
-  distinct_on?: InputMaybe<Array<Current_Collection_Ownership_View_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Collection_Ownership_View_Order_By>>;
-  where?: InputMaybe<Current_Collection_Ownership_View_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Collection_Ownership_View_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Collection_Ownership_View_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Collection_Ownership_View_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Delegator_BalancesArgs = {
-  distinct_on?: InputMaybe<Array<Current_Delegator_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Delegator_Balances_Order_By>>;
-  where?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Delegator_Balances_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Current_Delegator_Balances_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Delegator_Balances_Order_By>>;
-  where?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Delegator_Balances_By_PkArgs = {
-  delegator_address: Scalars['String'];
-  pool_address: Scalars['String'];
-  pool_type: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Delegator_Balances_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Delegator_Balances_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Delegator_Balances_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Staking_Pool_VoterArgs = {
-  distinct_on?: InputMaybe<Array<Current_Staking_Pool_Voter_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Staking_Pool_Voter_Order_By>>;
-  where?: InputMaybe<Current_Staking_Pool_Voter_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Staking_Pool_Voter_By_PkArgs = {
-  staking_pool_address: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Staking_Pool_Voter_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Staking_Pool_Voter_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Staking_Pool_Voter_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Table_ItemsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Table_Items_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Table_Items_Order_By>>;
-  where?: InputMaybe<Current_Table_Items_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Table_Items_By_PkArgs = {
-  key_hash: Scalars['String'];
-  table_handle: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Table_Items_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Table_Items_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Table_Items_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Datas_Order_By>>;
-  where?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_Datas_By_PkArgs = {
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Token_Datas_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Token_Datas_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_OwnershipsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_Ownerships_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_Ownerships_By_PkArgs = {
-  owner_address: Scalars['String'];
-  property_version: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Token_Ownerships_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Token_Ownerships_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_Pending_ClaimsArgs = {
-  distinct_on?: InputMaybe<Array<Current_Token_Pending_Claims_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Current_Token_Pending_Claims_Order_By>>;
-  where?: InputMaybe<Current_Token_Pending_Claims_Bool_Exp>;
-};
-
-
-export type Subscription_RootCurrent_Token_Pending_Claims_By_PkArgs = {
-  from_address: Scalars['String'];
-  property_version: Scalars['numeric'];
-  to_address: Scalars['String'];
-  token_data_id_hash: Scalars['String'];
-};
-
-
-export type Subscription_RootCurrent_Token_Pending_Claims_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Current_Token_Pending_Claims_Stream_Cursor_Input>>;
-  where?: InputMaybe<Current_Token_Pending_Claims_Bool_Exp>;
-};
-
-
-export type Subscription_RootDelegated_Staking_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Delegated_Staking_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Delegated_Staking_Activities_Order_By>>;
-  where?: InputMaybe<Delegated_Staking_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootDelegated_Staking_Activities_By_PkArgs = {
-  event_index: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootDelegated_Staking_Activities_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Delegated_Staking_Activities_Stream_Cursor_Input>>;
-  where?: InputMaybe<Delegated_Staking_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootEventsArgs = {
-  distinct_on?: InputMaybe<Array<Events_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Events_Order_By>>;
-  where?: InputMaybe<Events_Bool_Exp>;
-};
-
-
-export type Subscription_RootEvents_By_PkArgs = {
-  account_address: Scalars['String'];
-  creation_number: Scalars['bigint'];
-  sequence_number: Scalars['bigint'];
-};
-
-
-export type Subscription_RootEvents_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Events_Stream_Cursor_Input>>;
-  where?: InputMaybe<Events_Bool_Exp>;
-};
-
-
-export type Subscription_RootIndexer_StatusArgs = {
-  distinct_on?: InputMaybe<Array<Indexer_Status_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Indexer_Status_Order_By>>;
-  where?: InputMaybe<Indexer_Status_Bool_Exp>;
-};
-
-
-export type Subscription_RootIndexer_Status_By_PkArgs = {
-  db: Scalars['String'];
-};
-
-
-export type Subscription_RootIndexer_Status_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Indexer_Status_Stream_Cursor_Input>>;
-  where?: InputMaybe<Indexer_Status_Bool_Exp>;
-};
-
-
-export type Subscription_RootLedger_InfosArgs = {
-  distinct_on?: InputMaybe<Array<Ledger_Infos_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Ledger_Infos_Order_By>>;
-  where?: InputMaybe<Ledger_Infos_Bool_Exp>;
-};
-
-
-export type Subscription_RootLedger_Infos_By_PkArgs = {
-  chain_id: Scalars['bigint'];
-};
-
-
-export type Subscription_RootLedger_Infos_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Ledger_Infos_Stream_Cursor_Input>>;
-  where?: InputMaybe<Ledger_Infos_Bool_Exp>;
-};
-
-
-export type Subscription_RootMove_ResourcesArgs = {
-  distinct_on?: InputMaybe<Array<Move_Resources_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Move_Resources_Order_By>>;
-  where?: InputMaybe<Move_Resources_Bool_Exp>;
-};
-
-
-export type Subscription_RootMove_Resources_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Move_Resources_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Move_Resources_Order_By>>;
-  where?: InputMaybe<Move_Resources_Bool_Exp>;
-};
-
-
-export type Subscription_RootMove_Resources_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Move_Resources_Stream_Cursor_Input>>;
-  where?: InputMaybe<Move_Resources_Bool_Exp>;
-};
-
-
-export type Subscription_RootProcessor_StatusArgs = {
-  distinct_on?: InputMaybe<Array<Processor_Status_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Processor_Status_Order_By>>;
-  where?: InputMaybe<Processor_Status_Bool_Exp>;
-};
-
-
-export type Subscription_RootProcessor_Status_By_PkArgs = {
-  processor: Scalars['String'];
-};
-
-
-export type Subscription_RootProcessor_Status_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Processor_Status_Stream_Cursor_Input>>;
-  where?: InputMaybe<Processor_Status_Bool_Exp>;
-};
-
-
-export type Subscription_RootProposal_VotesArgs = {
-  distinct_on?: InputMaybe<Array<Proposal_Votes_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Proposal_Votes_Order_By>>;
-  where?: InputMaybe<Proposal_Votes_Bool_Exp>;
-};
-
-
-export type Subscription_RootProposal_Votes_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Proposal_Votes_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Proposal_Votes_Order_By>>;
-  where?: InputMaybe<Proposal_Votes_Bool_Exp>;
-};
-
-
-export type Subscription_RootProposal_Votes_By_PkArgs = {
-  proposal_id: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-  voter_address: Scalars['String'];
-};
-
-
-export type Subscription_RootProposal_Votes_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Proposal_Votes_Stream_Cursor_Input>>;
-  where?: InputMaybe<Proposal_Votes_Bool_Exp>;
-};
-
-
-export type Subscription_RootTable_ItemsArgs = {
-  distinct_on?: InputMaybe<Array<Table_Items_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Table_Items_Order_By>>;
-  where?: InputMaybe<Table_Items_Bool_Exp>;
-};
-
-
-export type Subscription_RootTable_Items_By_PkArgs = {
-  transaction_version: Scalars['bigint'];
-  write_set_change_index: Scalars['bigint'];
-};
-
-
-export type Subscription_RootTable_Items_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Table_Items_Stream_Cursor_Input>>;
-  where?: InputMaybe<Table_Items_Bool_Exp>;
-};
-
-
-export type Subscription_RootTable_MetadatasArgs = {
-  distinct_on?: InputMaybe<Array<Table_Metadatas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Table_Metadatas_Order_By>>;
-  where?: InputMaybe<Table_Metadatas_Bool_Exp>;
-};
-
-
-export type Subscription_RootTable_Metadatas_By_PkArgs = {
-  handle: Scalars['String'];
-};
-
-
-export type Subscription_RootTable_Metadatas_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Table_Metadatas_Stream_Cursor_Input>>;
-  where?: InputMaybe<Table_Metadatas_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_ActivitiesArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_Activities_AggregateArgs = {
-  distinct_on?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Activities_Order_By>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_Activities_By_PkArgs = {
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_sequence_number: Scalars['bigint'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootToken_Activities_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Token_Activities_Stream_Cursor_Input>>;
-  where?: InputMaybe<Token_Activities_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_DatasArgs = {
-  distinct_on?: InputMaybe<Array<Token_Datas_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Datas_Order_By>>;
-  where?: InputMaybe<Token_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_Datas_By_PkArgs = {
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootToken_Datas_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Token_Datas_Stream_Cursor_Input>>;
-  where?: InputMaybe<Token_Datas_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_OwnershipsArgs = {
-  distinct_on?: InputMaybe<Array<Token_Ownerships_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Token_Ownerships_Order_By>>;
-  where?: InputMaybe<Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Subscription_RootToken_Ownerships_By_PkArgs = {
-  property_version: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootToken_Ownerships_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Token_Ownerships_Stream_Cursor_Input>>;
-  where?: InputMaybe<Token_Ownerships_Bool_Exp>;
-};
-
-
-export type Subscription_RootTokensArgs = {
-  distinct_on?: InputMaybe<Array<Tokens_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<Tokens_Order_By>>;
-  where?: InputMaybe<Tokens_Bool_Exp>;
-};
-
-
-export type Subscription_RootTokens_By_PkArgs = {
-  property_version: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootTokens_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<Tokens_Stream_Cursor_Input>>;
-  where?: InputMaybe<Tokens_Bool_Exp>;
-};
-
-
-export type Subscription_RootUser_TransactionsArgs = {
-  distinct_on?: InputMaybe<Array<User_Transactions_Select_Column>>;
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  order_by?: InputMaybe<Array<User_Transactions_Order_By>>;
-  where?: InputMaybe<User_Transactions_Bool_Exp>;
-};
-
-
-export type Subscription_RootUser_Transactions_By_PkArgs = {
-  version: Scalars['bigint'];
-};
-
-
-export type Subscription_RootUser_Transactions_StreamArgs = {
-  batch_size: Scalars['Int'];
-  cursor: Array<InputMaybe<User_Transactions_Stream_Cursor_Input>>;
-  where?: InputMaybe<User_Transactions_Bool_Exp>;
-};
-
-/** columns and relationships of "table_items" */
-export type Table_Items = {
-  __typename?: 'table_items';
-  decoded_key: Scalars['jsonb'];
-  decoded_value?: Maybe<Scalars['jsonb']>;
-  key: Scalars['String'];
-  table_handle: Scalars['String'];
-  transaction_version: Scalars['bigint'];
-  write_set_change_index: Scalars['bigint'];
-};
-
-
-/** columns and relationships of "table_items" */
-export type Table_ItemsDecoded_KeyArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-
-/** columns and relationships of "table_items" */
-export type Table_ItemsDecoded_ValueArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "table_items". All fields are combined with a logical 'AND'. */
-export type Table_Items_Bool_Exp = {
-  _and?: InputMaybe<Array<Table_Items_Bool_Exp>>;
-  _not?: InputMaybe<Table_Items_Bool_Exp>;
-  _or?: InputMaybe<Array<Table_Items_Bool_Exp>>;
-  decoded_key?: InputMaybe<Jsonb_Comparison_Exp>;
-  decoded_value?: InputMaybe<Jsonb_Comparison_Exp>;
-  key?: InputMaybe<String_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  write_set_change_index?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "table_items". */
-export type Table_Items_Order_By = {
-  decoded_key?: InputMaybe<Order_By>;
-  decoded_value?: InputMaybe<Order_By>;
-  key?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  write_set_change_index?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "table_items" */
-export enum Table_Items_Select_Column {
-  /** column name */
-  DecodedKey = 'decoded_key',
-  /** column name */
-  DecodedValue = 'decoded_value',
-  /** column name */
-  Key = 'key',
-  /** column name */
-  TableHandle = 'table_handle',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  WriteSetChangeIndex = 'write_set_change_index'
-}
-
-/** Streaming cursor of the table "table_items" */
-export type Table_Items_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Table_Items_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Table_Items_Stream_Cursor_Value_Input = {
-  decoded_key?: InputMaybe<Scalars['jsonb']>;
-  decoded_value?: InputMaybe<Scalars['jsonb']>;
-  key?: InputMaybe<Scalars['String']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  write_set_change_index?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "table_metadatas" */
-export type Table_Metadatas = {
-  __typename?: 'table_metadatas';
-  handle: Scalars['String'];
-  key_type: Scalars['String'];
-  value_type: Scalars['String'];
-};
-
-/** Boolean expression to filter rows from the table "table_metadatas". All fields are combined with a logical 'AND'. */
-export type Table_Metadatas_Bool_Exp = {
-  _and?: InputMaybe<Array<Table_Metadatas_Bool_Exp>>;
-  _not?: InputMaybe<Table_Metadatas_Bool_Exp>;
-  _or?: InputMaybe<Array<Table_Metadatas_Bool_Exp>>;
-  handle?: InputMaybe<String_Comparison_Exp>;
-  key_type?: InputMaybe<String_Comparison_Exp>;
-  value_type?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "table_metadatas". */
-export type Table_Metadatas_Order_By = {
-  handle?: InputMaybe<Order_By>;
-  key_type?: InputMaybe<Order_By>;
-  value_type?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "table_metadatas" */
-export enum Table_Metadatas_Select_Column {
-  /** column name */
-  Handle = 'handle',
-  /** column name */
-  KeyType = 'key_type',
-  /** column name */
-  ValueType = 'value_type'
-}
-
-/** Streaming cursor of the table "table_metadatas" */
-export type Table_Metadatas_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Table_Metadatas_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Table_Metadatas_Stream_Cursor_Value_Input = {
-  handle?: InputMaybe<Scalars['String']>;
-  key_type?: InputMaybe<Scalars['String']>;
-  value_type?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to compare columns of type "timestamp". All fields are combined with logical 'AND'. */
-export type Timestamp_Comparison_Exp = {
-  _eq?: InputMaybe<Scalars['timestamp']>;
-  _gt?: InputMaybe<Scalars['timestamp']>;
-  _gte?: InputMaybe<Scalars['timestamp']>;
-  _in?: InputMaybe<Array<Scalars['timestamp']>>;
-  _is_null?: InputMaybe<Scalars['Boolean']>;
-  _lt?: InputMaybe<Scalars['timestamp']>;
-  _lte?: InputMaybe<Scalars['timestamp']>;
-  _neq?: InputMaybe<Scalars['timestamp']>;
-  _nin?: InputMaybe<Array<Scalars['timestamp']>>;
-};
-
-/** columns and relationships of "token_activities" */
-export type Token_Activities = {
-  __typename?: 'token_activities';
-  coin_amount?: Maybe<Scalars['numeric']>;
-  coin_type?: Maybe<Scalars['String']>;
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  /** An object relationship */
-  current_token_data?: Maybe<Current_Token_Datas>;
-  event_account_address: Scalars['String'];
-  event_creation_number: Scalars['bigint'];
-  event_index?: Maybe<Scalars['bigint']>;
-  event_sequence_number: Scalars['bigint'];
-  from_address?: Maybe<Scalars['String']>;
-  name: Scalars['String'];
-  property_version: Scalars['numeric'];
-  to_address?: Maybe<Scalars['String']>;
-  token_amount: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-  transfer_type: Scalars['String'];
-};
-
-/** aggregated selection of "token_activities" */
-export type Token_Activities_Aggregate = {
-  __typename?: 'token_activities_aggregate';
-  aggregate?: Maybe<Token_Activities_Aggregate_Fields>;
-  nodes: Array<Token_Activities>;
-};
-
-/** aggregate fields of "token_activities" */
-export type Token_Activities_Aggregate_Fields = {
-  __typename?: 'token_activities_aggregate_fields';
-  avg?: Maybe<Token_Activities_Avg_Fields>;
-  count: Scalars['Int'];
-  max?: Maybe<Token_Activities_Max_Fields>;
-  min?: Maybe<Token_Activities_Min_Fields>;
-  stddev?: Maybe<Token_Activities_Stddev_Fields>;
-  stddev_pop?: Maybe<Token_Activities_Stddev_Pop_Fields>;
-  stddev_samp?: Maybe<Token_Activities_Stddev_Samp_Fields>;
-  sum?: Maybe<Token_Activities_Sum_Fields>;
-  var_pop?: Maybe<Token_Activities_Var_Pop_Fields>;
-  var_samp?: Maybe<Token_Activities_Var_Samp_Fields>;
-  variance?: Maybe<Token_Activities_Variance_Fields>;
-};
-
-
-/** aggregate fields of "token_activities" */
-export type Token_Activities_Aggregate_FieldsCountArgs = {
-  columns?: InputMaybe<Array<Token_Activities_Select_Column>>;
-  distinct?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** aggregate avg on columns */
-export type Token_Activities_Avg_Fields = {
-  __typename?: 'token_activities_avg_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Boolean expression to filter rows from the table "token_activities". All fields are combined with a logical 'AND'. */
-export type Token_Activities_Bool_Exp = {
-  _and?: InputMaybe<Array<Token_Activities_Bool_Exp>>;
-  _not?: InputMaybe<Token_Activities_Bool_Exp>;
-  _or?: InputMaybe<Array<Token_Activities_Bool_Exp>>;
-  coin_amount?: InputMaybe<Numeric_Comparison_Exp>;
-  coin_type?: InputMaybe<String_Comparison_Exp>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Bool_Exp>;
-  event_account_address?: InputMaybe<String_Comparison_Exp>;
-  event_creation_number?: InputMaybe<Bigint_Comparison_Exp>;
-  event_index?: InputMaybe<Bigint_Comparison_Exp>;
-  event_sequence_number?: InputMaybe<Bigint_Comparison_Exp>;
-  from_address?: InputMaybe<String_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  to_address?: InputMaybe<String_Comparison_Exp>;
-  token_amount?: InputMaybe<Numeric_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  transfer_type?: InputMaybe<String_Comparison_Exp>;
-};
-
-/** aggregate max on columns */
-export type Token_Activities_Max_Fields = {
-  __typename?: 'token_activities_max_fields';
-  coin_amount?: Maybe<Scalars['numeric']>;
-  coin_type?: Maybe<Scalars['String']>;
-  collection_data_id_hash?: Maybe<Scalars['String']>;
-  collection_name?: Maybe<Scalars['String']>;
-  creator_address?: Maybe<Scalars['String']>;
-  event_account_address?: Maybe<Scalars['String']>;
-  event_creation_number?: Maybe<Scalars['bigint']>;
-  event_index?: Maybe<Scalars['bigint']>;
-  event_sequence_number?: Maybe<Scalars['bigint']>;
-  from_address?: Maybe<Scalars['String']>;
-  name?: Maybe<Scalars['String']>;
-  property_version?: Maybe<Scalars['numeric']>;
-  to_address?: Maybe<Scalars['String']>;
-  token_amount?: Maybe<Scalars['numeric']>;
-  token_data_id_hash?: Maybe<Scalars['String']>;
-  transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-  transfer_type?: Maybe<Scalars['String']>;
-};
-
-/** aggregate min on columns */
-export type Token_Activities_Min_Fields = {
-  __typename?: 'token_activities_min_fields';
-  coin_amount?: Maybe<Scalars['numeric']>;
-  coin_type?: Maybe<Scalars['String']>;
-  collection_data_id_hash?: Maybe<Scalars['String']>;
-  collection_name?: Maybe<Scalars['String']>;
-  creator_address?: Maybe<Scalars['String']>;
-  event_account_address?: Maybe<Scalars['String']>;
-  event_creation_number?: Maybe<Scalars['bigint']>;
-  event_index?: Maybe<Scalars['bigint']>;
-  event_sequence_number?: Maybe<Scalars['bigint']>;
-  from_address?: Maybe<Scalars['String']>;
-  name?: Maybe<Scalars['String']>;
-  property_version?: Maybe<Scalars['numeric']>;
-  to_address?: Maybe<Scalars['String']>;
-  token_amount?: Maybe<Scalars['numeric']>;
-  token_data_id_hash?: Maybe<Scalars['String']>;
-  transaction_timestamp?: Maybe<Scalars['timestamp']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-  transfer_type?: Maybe<Scalars['String']>;
-};
-
-/** Ordering options when selecting data from "token_activities". */
-export type Token_Activities_Order_By = {
-  coin_amount?: InputMaybe<Order_By>;
-  coin_type?: InputMaybe<Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  current_token_data?: InputMaybe<Current_Token_Datas_Order_By>;
-  event_account_address?: InputMaybe<Order_By>;
-  event_creation_number?: InputMaybe<Order_By>;
-  event_index?: InputMaybe<Order_By>;
-  event_sequence_number?: InputMaybe<Order_By>;
-  from_address?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  to_address?: InputMaybe<Order_By>;
-  token_amount?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  transfer_type?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "token_activities" */
-export enum Token_Activities_Select_Column {
-  /** column name */
-  CoinAmount = 'coin_amount',
-  /** column name */
-  CoinType = 'coin_type',
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  EventAccountAddress = 'event_account_address',
-  /** column name */
-  EventCreationNumber = 'event_creation_number',
-  /** column name */
-  EventIndex = 'event_index',
-  /** column name */
-  EventSequenceNumber = 'event_sequence_number',
-  /** column name */
-  FromAddress = 'from_address',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  PropertyVersion = 'property_version',
-  /** column name */
-  ToAddress = 'to_address',
-  /** column name */
-  TokenAmount = 'token_amount',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  TransferType = 'transfer_type'
-}
-
-/** aggregate stddev on columns */
-export type Token_Activities_Stddev_Fields = {
-  __typename?: 'token_activities_stddev_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_pop on columns */
-export type Token_Activities_Stddev_Pop_Fields = {
-  __typename?: 'token_activities_stddev_pop_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate stddev_samp on columns */
-export type Token_Activities_Stddev_Samp_Fields = {
-  __typename?: 'token_activities_stddev_samp_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** Streaming cursor of the table "token_activities" */
-export type Token_Activities_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Token_Activities_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Token_Activities_Stream_Cursor_Value_Input = {
-  coin_amount?: InputMaybe<Scalars['numeric']>;
-  coin_type?: InputMaybe<Scalars['String']>;
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  event_account_address?: InputMaybe<Scalars['String']>;
-  event_creation_number?: InputMaybe<Scalars['bigint']>;
-  event_index?: InputMaybe<Scalars['bigint']>;
-  event_sequence_number?: InputMaybe<Scalars['bigint']>;
-  from_address?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
-  property_version?: InputMaybe<Scalars['numeric']>;
-  to_address?: InputMaybe<Scalars['String']>;
-  token_amount?: InputMaybe<Scalars['numeric']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  transfer_type?: InputMaybe<Scalars['String']>;
-};
-
-/** aggregate sum on columns */
-export type Token_Activities_Sum_Fields = {
-  __typename?: 'token_activities_sum_fields';
-  coin_amount?: Maybe<Scalars['numeric']>;
-  event_creation_number?: Maybe<Scalars['bigint']>;
-  event_index?: Maybe<Scalars['bigint']>;
-  event_sequence_number?: Maybe<Scalars['bigint']>;
-  property_version?: Maybe<Scalars['numeric']>;
-  token_amount?: Maybe<Scalars['numeric']>;
-  transaction_version?: Maybe<Scalars['bigint']>;
-};
-
-/** aggregate var_pop on columns */
-export type Token_Activities_Var_Pop_Fields = {
-  __typename?: 'token_activities_var_pop_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate var_samp on columns */
-export type Token_Activities_Var_Samp_Fields = {
-  __typename?: 'token_activities_var_samp_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** aggregate variance on columns */
-export type Token_Activities_Variance_Fields = {
-  __typename?: 'token_activities_variance_fields';
-  coin_amount?: Maybe<Scalars['Float']>;
-  event_creation_number?: Maybe<Scalars['Float']>;
-  event_index?: Maybe<Scalars['Float']>;
-  event_sequence_number?: Maybe<Scalars['Float']>;
-  property_version?: Maybe<Scalars['Float']>;
-  token_amount?: Maybe<Scalars['Float']>;
-  transaction_version?: Maybe<Scalars['Float']>;
-};
-
-/** columns and relationships of "token_datas" */
-export type Token_Datas = {
-  __typename?: 'token_datas';
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  default_properties: Scalars['jsonb'];
-  description: Scalars['String'];
-  description_mutable: Scalars['Boolean'];
-  largest_property_version: Scalars['numeric'];
-  maximum: Scalars['numeric'];
-  maximum_mutable: Scalars['Boolean'];
-  metadata_uri: Scalars['String'];
-  name: Scalars['String'];
-  payee_address: Scalars['String'];
-  properties_mutable: Scalars['Boolean'];
-  royalty_mutable: Scalars['Boolean'];
-  royalty_points_denominator: Scalars['numeric'];
-  royalty_points_numerator: Scalars['numeric'];
-  supply: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-  uri_mutable: Scalars['Boolean'];
-};
-
-
-/** columns and relationships of "token_datas" */
-export type Token_DatasDefault_PropertiesArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "token_datas". All fields are combined with a logical 'AND'. */
-export type Token_Datas_Bool_Exp = {
-  _and?: InputMaybe<Array<Token_Datas_Bool_Exp>>;
-  _not?: InputMaybe<Token_Datas_Bool_Exp>;
-  _or?: InputMaybe<Array<Token_Datas_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  default_properties?: InputMaybe<Jsonb_Comparison_Exp>;
-  description?: InputMaybe<String_Comparison_Exp>;
-  description_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  largest_property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  maximum?: InputMaybe<Numeric_Comparison_Exp>;
-  maximum_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  metadata_uri?: InputMaybe<String_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  payee_address?: InputMaybe<String_Comparison_Exp>;
-  properties_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  royalty_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-  royalty_points_denominator?: InputMaybe<Numeric_Comparison_Exp>;
-  royalty_points_numerator?: InputMaybe<Numeric_Comparison_Exp>;
-  supply?: InputMaybe<Numeric_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-  uri_mutable?: InputMaybe<Boolean_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "token_datas". */
-export type Token_Datas_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  default_properties?: InputMaybe<Order_By>;
-  description?: InputMaybe<Order_By>;
-  description_mutable?: InputMaybe<Order_By>;
-  largest_property_version?: InputMaybe<Order_By>;
-  maximum?: InputMaybe<Order_By>;
-  maximum_mutable?: InputMaybe<Order_By>;
-  metadata_uri?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  payee_address?: InputMaybe<Order_By>;
-  properties_mutable?: InputMaybe<Order_By>;
-  royalty_mutable?: InputMaybe<Order_By>;
-  royalty_points_denominator?: InputMaybe<Order_By>;
-  royalty_points_numerator?: InputMaybe<Order_By>;
-  supply?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-  uri_mutable?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "token_datas" */
-export enum Token_Datas_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  DefaultProperties = 'default_properties',
-  /** column name */
-  Description = 'description',
-  /** column name */
-  DescriptionMutable = 'description_mutable',
-  /** column name */
-  LargestPropertyVersion = 'largest_property_version',
-  /** column name */
-  Maximum = 'maximum',
-  /** column name */
-  MaximumMutable = 'maximum_mutable',
-  /** column name */
-  MetadataUri = 'metadata_uri',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  PayeeAddress = 'payee_address',
-  /** column name */
-  PropertiesMutable = 'properties_mutable',
-  /** column name */
-  RoyaltyMutable = 'royalty_mutable',
-  /** column name */
-  RoyaltyPointsDenominator = 'royalty_points_denominator',
-  /** column name */
-  RoyaltyPointsNumerator = 'royalty_points_numerator',
-  /** column name */
-  Supply = 'supply',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version',
-  /** column name */
-  UriMutable = 'uri_mutable'
-}
-
-/** Streaming cursor of the table "token_datas" */
-export type Token_Datas_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Token_Datas_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Token_Datas_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  default_properties?: InputMaybe<Scalars['jsonb']>;
-  description?: InputMaybe<Scalars['String']>;
-  description_mutable?: InputMaybe<Scalars['Boolean']>;
-  largest_property_version?: InputMaybe<Scalars['numeric']>;
-  maximum?: InputMaybe<Scalars['numeric']>;
-  maximum_mutable?: InputMaybe<Scalars['Boolean']>;
-  metadata_uri?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
-  payee_address?: InputMaybe<Scalars['String']>;
-  properties_mutable?: InputMaybe<Scalars['Boolean']>;
-  royalty_mutable?: InputMaybe<Scalars['Boolean']>;
-  royalty_points_denominator?: InputMaybe<Scalars['numeric']>;
-  royalty_points_numerator?: InputMaybe<Scalars['numeric']>;
-  supply?: InputMaybe<Scalars['numeric']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-  uri_mutable?: InputMaybe<Scalars['Boolean']>;
-};
-
-/** columns and relationships of "token_ownerships" */
-export type Token_Ownerships = {
-  __typename?: 'token_ownerships';
-  amount: Scalars['numeric'];
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  name: Scalars['String'];
-  owner_address?: Maybe<Scalars['String']>;
-  property_version: Scalars['numeric'];
-  table_handle: Scalars['String'];
-  table_type?: Maybe<Scalars['String']>;
-  token_data_id_hash: Scalars['String'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "token_ownerships". All fields are combined with a logical 'AND'. */
-export type Token_Ownerships_Bool_Exp = {
-  _and?: InputMaybe<Array<Token_Ownerships_Bool_Exp>>;
-  _not?: InputMaybe<Token_Ownerships_Bool_Exp>;
-  _or?: InputMaybe<Array<Token_Ownerships_Bool_Exp>>;
-  amount?: InputMaybe<Numeric_Comparison_Exp>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  owner_address?: InputMaybe<String_Comparison_Exp>;
-  property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  table_handle?: InputMaybe<String_Comparison_Exp>;
-  table_type?: InputMaybe<String_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "token_ownerships". */
-export type Token_Ownerships_Order_By = {
-  amount?: InputMaybe<Order_By>;
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  owner_address?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  table_handle?: InputMaybe<Order_By>;
-  table_type?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "token_ownerships" */
-export enum Token_Ownerships_Select_Column {
-  /** column name */
-  Amount = 'amount',
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  OwnerAddress = 'owner_address',
-  /** column name */
-  PropertyVersion = 'property_version',
-  /** column name */
-  TableHandle = 'table_handle',
-  /** column name */
-  TableType = 'table_type',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "token_ownerships" */
-export type Token_Ownerships_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Token_Ownerships_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Token_Ownerships_Stream_Cursor_Value_Input = {
-  amount?: InputMaybe<Scalars['numeric']>;
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
-  owner_address?: InputMaybe<Scalars['String']>;
-  property_version?: InputMaybe<Scalars['numeric']>;
-  table_handle?: InputMaybe<Scalars['String']>;
-  table_type?: InputMaybe<Scalars['String']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "tokens" */
-export type Tokens = {
-  __typename?: 'tokens';
-  collection_data_id_hash: Scalars['String'];
-  collection_name: Scalars['String'];
-  creator_address: Scalars['String'];
-  name: Scalars['String'];
-  property_version: Scalars['numeric'];
-  token_data_id_hash: Scalars['String'];
-  token_properties: Scalars['jsonb'];
-  transaction_timestamp: Scalars['timestamp'];
-  transaction_version: Scalars['bigint'];
-};
-
-
-/** columns and relationships of "tokens" */
-export type TokensToken_PropertiesArgs = {
-  path?: InputMaybe<Scalars['String']>;
-};
-
-/** Boolean expression to filter rows from the table "tokens". All fields are combined with a logical 'AND'. */
-export type Tokens_Bool_Exp = {
-  _and?: InputMaybe<Array<Tokens_Bool_Exp>>;
-  _not?: InputMaybe<Tokens_Bool_Exp>;
-  _or?: InputMaybe<Array<Tokens_Bool_Exp>>;
-  collection_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  collection_name?: InputMaybe<String_Comparison_Exp>;
-  creator_address?: InputMaybe<String_Comparison_Exp>;
-  name?: InputMaybe<String_Comparison_Exp>;
-  property_version?: InputMaybe<Numeric_Comparison_Exp>;
-  token_data_id_hash?: InputMaybe<String_Comparison_Exp>;
-  token_properties?: InputMaybe<Jsonb_Comparison_Exp>;
-  transaction_timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  transaction_version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "tokens". */
-export type Tokens_Order_By = {
-  collection_data_id_hash?: InputMaybe<Order_By>;
-  collection_name?: InputMaybe<Order_By>;
-  creator_address?: InputMaybe<Order_By>;
-  name?: InputMaybe<Order_By>;
-  property_version?: InputMaybe<Order_By>;
-  token_data_id_hash?: InputMaybe<Order_By>;
-  token_properties?: InputMaybe<Order_By>;
-  transaction_timestamp?: InputMaybe<Order_By>;
-  transaction_version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "tokens" */
-export enum Tokens_Select_Column {
-  /** column name */
-  CollectionDataIdHash = 'collection_data_id_hash',
-  /** column name */
-  CollectionName = 'collection_name',
-  /** column name */
-  CreatorAddress = 'creator_address',
-  /** column name */
-  Name = 'name',
-  /** column name */
-  PropertyVersion = 'property_version',
-  /** column name */
-  TokenDataIdHash = 'token_data_id_hash',
-  /** column name */
-  TokenProperties = 'token_properties',
-  /** column name */
-  TransactionTimestamp = 'transaction_timestamp',
-  /** column name */
-  TransactionVersion = 'transaction_version'
-}
-
-/** Streaming cursor of the table "tokens" */
-export type Tokens_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: Tokens_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type Tokens_Stream_Cursor_Value_Input = {
-  collection_data_id_hash?: InputMaybe<Scalars['String']>;
-  collection_name?: InputMaybe<Scalars['String']>;
-  creator_address?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
-  property_version?: InputMaybe<Scalars['numeric']>;
-  token_data_id_hash?: InputMaybe<Scalars['String']>;
-  token_properties?: InputMaybe<Scalars['jsonb']>;
-  transaction_timestamp?: InputMaybe<Scalars['timestamp']>;
-  transaction_version?: InputMaybe<Scalars['bigint']>;
-};
-
-/** columns and relationships of "user_transactions" */
-export type User_Transactions = {
-  __typename?: 'user_transactions';
-  block_height: Scalars['bigint'];
-  entry_function_id_str: Scalars['String'];
-  epoch: Scalars['bigint'];
-  expiration_timestamp_secs: Scalars['timestamp'];
-  gas_unit_price: Scalars['numeric'];
-  max_gas_amount: Scalars['numeric'];
-  parent_signature_type: Scalars['String'];
-  sender: Scalars['String'];
-  sequence_number: Scalars['bigint'];
-  timestamp: Scalars['timestamp'];
-  version: Scalars['bigint'];
-};
-
-/** Boolean expression to filter rows from the table "user_transactions". All fields are combined with a logical 'AND'. */
-export type User_Transactions_Bool_Exp = {
-  _and?: InputMaybe<Array<User_Transactions_Bool_Exp>>;
-  _not?: InputMaybe<User_Transactions_Bool_Exp>;
-  _or?: InputMaybe<Array<User_Transactions_Bool_Exp>>;
-  block_height?: InputMaybe<Bigint_Comparison_Exp>;
-  entry_function_id_str?: InputMaybe<String_Comparison_Exp>;
-  epoch?: InputMaybe<Bigint_Comparison_Exp>;
-  expiration_timestamp_secs?: InputMaybe<Timestamp_Comparison_Exp>;
-  gas_unit_price?: InputMaybe<Numeric_Comparison_Exp>;
-  max_gas_amount?: InputMaybe<Numeric_Comparison_Exp>;
-  parent_signature_type?: InputMaybe<String_Comparison_Exp>;
-  sender?: InputMaybe<String_Comparison_Exp>;
-  sequence_number?: InputMaybe<Bigint_Comparison_Exp>;
-  timestamp?: InputMaybe<Timestamp_Comparison_Exp>;
-  version?: InputMaybe<Bigint_Comparison_Exp>;
-};
-
-/** Ordering options when selecting data from "user_transactions". */
-export type User_Transactions_Order_By = {
-  block_height?: InputMaybe<Order_By>;
-  entry_function_id_str?: InputMaybe<Order_By>;
-  epoch?: InputMaybe<Order_By>;
-  expiration_timestamp_secs?: InputMaybe<Order_By>;
-  gas_unit_price?: InputMaybe<Order_By>;
-  max_gas_amount?: InputMaybe<Order_By>;
-  parent_signature_type?: InputMaybe<Order_By>;
-  sender?: InputMaybe<Order_By>;
-  sequence_number?: InputMaybe<Order_By>;
-  timestamp?: InputMaybe<Order_By>;
-  version?: InputMaybe<Order_By>;
-};
-
-/** select columns of table "user_transactions" */
-export enum User_Transactions_Select_Column {
-  /** column name */
-  BlockHeight = 'block_height',
-  /** column name */
-  EntryFunctionIdStr = 'entry_function_id_str',
-  /** column name */
-  Epoch = 'epoch',
-  /** column name */
-  ExpirationTimestampSecs = 'expiration_timestamp_secs',
-  /** column name */
-  GasUnitPrice = 'gas_unit_price',
-  /** column name */
-  MaxGasAmount = 'max_gas_amount',
-  /** column name */
-  ParentSignatureType = 'parent_signature_type',
-  /** column name */
-  Sender = 'sender',
-  /** column name */
-  SequenceNumber = 'sequence_number',
-  /** column name */
-  Timestamp = 'timestamp',
-  /** column name */
-  Version = 'version'
-}
-
-/** Streaming cursor of the table "user_transactions" */
-export type User_Transactions_Stream_Cursor_Input = {
-  /** Stream column input with initial value */
-  initial_value: User_Transactions_Stream_Cursor_Value_Input;
-  /** cursor ordering */
-  ordering?: InputMaybe<Cursor_Ordering>;
-};
-
-/** Initial value of the column from where the streaming should start */
-export type User_Transactions_Stream_Cursor_Value_Input = {
-  block_height?: InputMaybe<Scalars['bigint']>;
-  entry_function_id_str?: InputMaybe<Scalars['String']>;
-  epoch?: InputMaybe<Scalars['bigint']>;
-  expiration_timestamp_secs?: InputMaybe<Scalars['timestamp']>;
-  gas_unit_price?: InputMaybe<Scalars['numeric']>;
-  max_gas_amount?: InputMaybe<Scalars['numeric']>;
-  parent_signature_type?: InputMaybe<Scalars['String']>;
-  sender?: InputMaybe<Scalars['String']>;
-  sequence_number?: InputMaybe<Scalars['bigint']>;
-  timestamp?: InputMaybe<Scalars['timestamp']>;
-  version?: InputMaybe<Scalars['bigint']>;
-};
diff --git a/m1/JavaScript-client/src/indexer/queries/getAccountCoinsData.graphql b/m1/JavaScript-client/src/indexer/queries/getAccountCoinsData.graphql
deleted file mode 100644
index 15bb54c62..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getAccountCoinsData.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-query getAccountCoinsData($owner_address: String, $offset: Int, $limit: Int) {
-  current_coin_balances(where: { owner_address: { _eq: $owner_address } }, offset: $offset, limit: $limit) {
-    amount
-    coin_type
-    coin_info {
-      name
-      decimals
-      symbol
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getAccountCurrentTokens.graphql b/m1/JavaScript-client/src/indexer/queries/getAccountCurrentTokens.graphql
deleted file mode 100644
index 87dc86c55..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getAccountCurrentTokens.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-query getAccountCurrentTokens($address: String!, $offset: Int, $limit: Int) {
-  current_token_ownerships(
-    where: { owner_address: { _eq: $address }, amount: { _gt: 0 } }
-    order_by: [{ last_transaction_version: desc }, { creator_address: asc }, { collection_name: asc }, { name: asc }]
-    offset: $offset
-    limit: $limit
-  ) {
-    amount
-    current_token_data {
-      ...TokenDataFields
-    }
-    current_collection_data {
-      ...CollectionDataFields
-    }
-    last_transaction_version
-    property_version
-  }
-}
-
-fragment TokenDataFields on current_token_datas {
-  creator_address
-  collection_name
-  description
-  metadata_uri
-  name
-  token_data_id_hash
-  collection_data_id_hash
-}
-
-fragment CollectionDataFields on current_collection_datas {
-  metadata_uri
-  supply
-  description
-  collection_name
-  collection_data_id_hash
-  table_handle
-  creator_address
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getAccountTokensCount.graphql b/m1/JavaScript-client/src/indexer/queries/getAccountTokensCount.graphql
deleted file mode 100644
index 0ce7eb9d5..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getAccountTokensCount.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-query getAccountTokensCount($owner_address: String) {
-  current_token_ownerships_aggregate(where: { owner_address: { _eq: $owner_address }, amount: { _gt: "0" } }) {
-    aggregate {
-      count
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsCount.graphql b/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsCount.graphql
deleted file mode 100644
index e27c6e7a6..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsCount.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-query getAccountTransactionsCount($address: String) {
-  move_resources_aggregate(where: { address: { _eq: $address } }, distinct_on: transaction_version) {
-    aggregate {
-      count
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsData.graphql b/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsData.graphql
deleted file mode 100644
index 3a9ac0ce8..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getAccountTransactionsData.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-query getAccountTransactionsData($address: String, $limit: Int, $offset: Int) {
-  move_resources(
-    where: { address: { _eq: $address } }
-    order_by: { transaction_version: desc }
-    distinct_on: transaction_version
-    limit: $limit
-    offset: $offset
-  ) {
-    transaction_version
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getCurrentDelegatorBalancesCount.graphql b/m1/JavaScript-client/src/indexer/queries/getCurrentDelegatorBalancesCount.graphql
deleted file mode 100644
index a07f051e8..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getCurrentDelegatorBalancesCount.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-query getCurrentDelegatorBalancesCount($poolAddress: String) {
-  current_delegator_balances_aggregate(
-    where: { pool_type: { _eq: "active_shares" }, pool_address: { _eq: $poolAddress }, amount: { _gt: "0" } }
-    distinct_on: delegator_address
-  ) {
-    aggregate {
-      count
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getDelegatedStakingActivities.graphql b/m1/JavaScript-client/src/indexer/queries/getDelegatedStakingActivities.graphql
deleted file mode 100644
index 70083e243..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getDelegatedStakingActivities.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-query getDelegatedStakingActivities($delegatorAddress: String, $poolAddress: String) {
-  delegated_staking_activities(
-    where: { delegator_address: { _eq: $delegatorAddress }, pool_address: { _eq: $poolAddress } }
-  ) {
-    amount
-    delegator_address
-    event_index
-    event_type
-    pool_address
-    transaction_version
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getLedgerInfo.graphql b/m1/JavaScript-client/src/indexer/queries/getLedgerInfo.graphql
deleted file mode 100644
index c4c6eb476..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getLedgerInfo.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-query getIndexerLedgerInfo {
-  ledger_infos {
-    chain_id
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getTokenActivities.graphql b/m1/JavaScript-client/src/indexer/queries/getTokenActivities.graphql
deleted file mode 100644
index ab7af8887..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getTokenActivities.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-query getTokenActivities($idHash: String!, $offset: Int, $limit: Int) {
-  token_activities(
-    where: { token_data_id_hash: { _eq: $idHash } }
-    order_by: { transaction_version: desc }
-    offset: $offset
-    limit: $limit
-  ) {
-    creator_address
-    collection_name
-    name
-    token_data_id_hash
-    collection_data_id_hash
-    from_address
-    to_address
-    transaction_version
-    transaction_timestamp
-    property_version
-    transfer_type
-    event_sequence_number
-    token_amount
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getTokenActivitiesCount.graphql b/m1/JavaScript-client/src/indexer/queries/getTokenActivitiesCount.graphql
deleted file mode 100644
index 6f8d2e994..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getTokenActivitiesCount.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-query getTokenActivitiesCount($token_id: String) {
-  token_activities_aggregate(where: { token_data_id_hash: { _eq: $token_id } }) {
-    aggregate {
-      count
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getTokenData.graphql b/m1/JavaScript-client/src/indexer/queries/getTokenData.graphql
deleted file mode 100644
index 3fec6d925..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getTokenData.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-query getTokenData($token_id: String) {
-  current_token_datas(where: { token_data_id_hash: { _eq: $token_id } }) {
-    token_data_id_hash
-    name
-    collection_name
-    creator_address
-    default_properties
-    largest_property_version
-    maximum
-    metadata_uri
-    payee_address
-    royalty_points_denominator
-    royalty_points_numerator
-    supply
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getTokenOwnersData.graphql b/m1/JavaScript-client/src/indexer/queries/getTokenOwnersData.graphql
deleted file mode 100644
index 3dcc3dece..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getTokenOwnersData.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-query getTokenOwnersData($token_id: String, $property_version: numeric) {
-  current_token_ownerships(
-    where: { token_data_id_hash: { _eq: $token_id }, property_version: { _eq: $property_version } }
-  ) {
-    owner_address
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getTopUserTransactions.graphql b/m1/JavaScript-client/src/indexer/queries/getTopUserTransactions.graphql
deleted file mode 100644
index b93cbc858..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getTopUserTransactions.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-query getTopUserTransactions($limit: Int) {
-  user_transactions(limit: $limit, order_by: { version: desc }) {
-    version
-  }
-}
diff --git a/m1/JavaScript-client/src/indexer/queries/getUserTransactions.graphql b/m1/JavaScript-client/src/indexer/queries/getUserTransactions.graphql
deleted file mode 100644
index 529f43ac3..000000000
--- a/m1/JavaScript-client/src/indexer/queries/getUserTransactions.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-query getUserTransactions($limit: Int, $start_version: bigint, $offset: Int) {
-  user_transactions(
-    limit: $limit
-    order_by: { version: desc }
-    where: { version: { _lte: $start_version } }
-    offset: $offset
-  ) {
-    version
-  }
-}
diff --git a/m1/JavaScript-client/src/plugins/ans_client.ts b/m1/JavaScript-client/src/plugins/ans_client.ts
deleted file mode 100644
index 7fe21411d..000000000
--- a/m1/JavaScript-client/src/plugins/ans_client.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import { AptosClient, ApiError, Provider, OptionalTransactionArgs } from "../providers";
-import * as Gen from "../generated/index";
-import { AptosAccount } from "../account";
-import { TransactionBuilderRemoteABI } from "../transaction_builder";
-
-const ansContractsMap: Record<string, string> = {
-  testnet: "0x5f8fd2347449685cf41d4db97926ec3a096eaf381332be4f1318ad4d16a8497c",
-  mainnet: "0x867ed1f6bf916171b1de3ee92849b8978b7d1b9e0a8cc982a3d19d535dfd9c0c",
-};
-
-// Each name component can only have lowercase letters, number or hyphens, and cannot start or end with a hyphen.
-const nameComponentPattern = /^[a-z\d][a-z\d-]{1,61}[a-z\d]$/;
-
-const namePattern = new RegExp(
-  "^" +
-    // Optional subdomain (cannot be followed by .apt)
-    "(?:(?<subdomain>[^.]+)\\.(?!apt$))?" +
-    // Domain
-    "(?<domain>[^.]+)" +
-    // Optional .apt suffix
-    "(?:\\.apt)?" +
-    "$",
-);
-
-type ReverseLookupRegistryV1 = {
-  registry: {
-    handle: string;
-  };
-};
-
-type NameRegistryV1 = {
-  registry: {
-    handle: string;
-  };
-};
-
-export class AnsClient {
-  contractAddress: string;
-
-  provider: Provider;
-
-  /**
-   * Creates new AnsClient instance
-   * @param provider Provider instance
-   * @param contractAddress An optional contract address.
-   * If there is no contract address matching to the provided network
-   * then the AnsClient class expects a contract address -
-   * this is to support both mainnet/testnet networks and local development.
-   */
-  constructor(provider: Provider, contractAddress?: string) {
-    this.provider = provider;
-    if (!ansContractsMap[this.provider.network] && !contractAddress) {
-      throw new Error("Error: For custom providers, you must pass in a contract address");
-    }
-    this.contractAddress = ansContractsMap[this.provider.network] ?? contractAddress;
-  }
-
-  /**
-   * Returns the primary name for the given account address
-   * @param address An account address
-   * @returns Account's primary name | null if there is no primary name defined
-   */
-  async getPrimaryNameByAddress(address: string): Promise<string | null> {
-    const ansResource: Gen.MoveResource = await this.provider.getAccountResource(
-      this.contractAddress,
-      `${this.contractAddress}::domains::ReverseLookupRegistryV1`,
-    );
-    const data = ansResource.data as ReverseLookupRegistryV1;
-    const { handle } = data.registry;
-    const domainsTableItemRequest = {
-      key_type: "address",
-      value_type: `${this.contractAddress}::domains::NameRecordKeyV1`,
-      key: address,
-    };
-    try {
-      const item = await this.provider.getTableItem(handle, domainsTableItemRequest);
-      return item.subdomain_name.vec[0] ? `${item.subdomain_name.vec[0]}.${item.domain_name}` : item.domain_name;
-    } catch (error: any) {
-      // if item not found, response is 404 error - meaning item not found
-      if (error.status === 404) {
-        return null;
-      }
-      throw new Error(error);
-    }
-  }
-
-  /**
-   * Returns the target account address for the given name
-   * @param name ANS name
-   * @returns Account address | null
-   */
-  async getAddressByName(name: string): Promise<string | null> {
-    const { domain, subdomain } = name.match(namePattern)?.groups ?? {};
-    if (!domain) return null;
-    if (subdomain) return this.getAddressBySubdomainName(domain, subdomain);
-    return this.getAddressByDomainName(domain);
-  }
-
-  /**
-   * Mint a new Aptos name
-   *
-   * @param account AptosAccount where collection will be created
-   * @param domainName Aptos domain name to mint
-   * @param years year duration of the domain name
-   * @returns The hash of the pending transaction submitted to the API
-   */
-  async mintAptosName(
-    account: AptosAccount,
-    domainName: string,
-    years: number = 1,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<Gen.HashValue> {
-    // check if the name is valid
-    if (domainName.match(nameComponentPattern) === null) {
-      throw new ApiError(400, `Name ${domainName} is not valid`);
-    }
-    // check if the name is available
-    const address = await this.getAddressByName(domainName);
-    if (address !== null) {
-      throw new ApiError(400, `Name ${domainName} is not available`);
-    }
-
-    const builder = new TransactionBuilderRemoteABI(this.provider.aptosClient, {
-      sender: account.address(),
-      ...extraArgs,
-    });
-    const rawTxn = await builder.build(`${this.contractAddress}::domains::register_domain`, [], [domainName, years]);
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.provider.submitSignedBCSTransaction(bcsTxn);
-
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Initialize reverse lookup for contract owner
-   *
-   * @param owner the `aptos_names` AptosAccount
-   * @returns The hash of the pending transaction submitted to the API
-   */
-  async initReverseLookupRegistry(owner: AptosAccount, extraArgs?: OptionalTransactionArgs): Promise<Gen.HashValue> {
-    const builder = new TransactionBuilderRemoteABI(this.provider.aptosClient, {
-      sender: owner.address(),
-      ...extraArgs,
-    });
-    const rawTxn = await builder.build(`${this.contractAddress}::domains::init_reverse_lookup_registry_v1`, [], []);
-
-    const bcsTxn = AptosClient.generateBCSTransaction(owner, rawTxn);
-    const pendingTransaction = await this.provider.submitSignedBCSTransaction(bcsTxn);
-
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Returns the account address for the given domain name
-   * @param domain domain name
-   * @example
-   * if name is `aptos.apt`
-   * domain = aptos
-   *
-   * @returns account address | null
-   */
-  private async getAddressByDomainName(domain: string) {
-    if (domain.match(nameComponentPattern) === null) return null;
-    const ansResource: { type: Gen.MoveStructTag; data: any } = await this.provider.getAccountResource(
-      this.contractAddress,
-      `${this.contractAddress}::domains::NameRegistryV1`,
-    );
-    const data = ansResource.data as NameRegistryV1;
-    const { handle } = data.registry;
-    const domainsTableItemRequest = {
-      key_type: `${this.contractAddress}::domains::NameRecordKeyV1`,
-      value_type: `${this.contractAddress}::domains::NameRecordV1`,
-      key: {
-        subdomain_name: { vec: [] },
-        domain_name: domain,
-      },
-    };
-
-    try {
-      const item = await this.provider.getTableItem(handle, domainsTableItemRequest);
-      return item.target_address.vec[0];
-    } catch (error: any) {
-      // if item not found, response is 404 error - meaning item not found
-      if (error.status === 404) {
-        return null;
-      }
-      throw new Error(error);
-    }
-  }
-
-  /**
-   * Returns the account address for the given subdomain_name
-   * @param domain domain name
-   * @param subdomain subdomain name
-   * @example
-   * if name is `dev.aptos.apt`
-   * domain = aptos
-   * subdomain = dev
-   *
-   * @returns account address | null
-   */
-  private async getAddressBySubdomainName(domain: string, subdomain: string): Promise<string | null> {
-    if (domain.match(nameComponentPattern) === null) return null;
-    if (subdomain.match(nameComponentPattern) === null) return null;
-    const ansResource: { type: Gen.MoveStructTag; data: any } = await this.provider.getAccountResource(
-      this.contractAddress,
-      `${this.contractAddress}::domains::NameRegistryV1`,
-    );
-    const data = ansResource.data as NameRegistryV1;
-    const { handle } = data.registry;
-    const domainsTableItemRequest = {
-      key_type: `${this.contractAddress}::domains::NameRecordKeyV1`,
-      value_type: `${this.contractAddress}::domains::NameRecordV1`,
-      key: {
-        subdomain_name: { vec: [subdomain] },
-        domain_name: domain,
-      },
-    };
-
-    try {
-      const item = await this.provider.getTableItem(handle, domainsTableItemRequest);
-      return item.target_address.vec[0];
-    } catch (error: any) {
-      // if item not found, response is 404 error - meaning item not found
-      if (error.status === 404) {
-        return null;
-      }
-      throw new Error(error);
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/plugins/aptos_token.ts b/m1/JavaScript-client/src/plugins/aptos_token.ts
deleted file mode 100644
index 5d98bb8a4..000000000
--- a/m1/JavaScript-client/src/plugins/aptos_token.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable max-len */
-
-import { AptosAccount } from "../account/aptos_account";
-import { AnyNumber } from "../bcs";
-import { MAX_U64_BIG_INT } from "../bcs/consts";
-import { Provider } from "../providers";
-import { AptosClient, OptionalTransactionArgs } from "../providers/aptos_client";
-import { TransactionBuilderRemoteABI } from "../transaction_builder";
-import { HexString, MaybeHexString } from "../utils";
-import { getPropertyValueRaw, getSinglePropertyValueRaw } from "../utils/property_map_serde";
-
-export interface CreateCollectionOptions {
-  royaltyNumerator?: number;
-  royaltyDenominator?: number;
-  mutableDescription?: boolean;
-  mutableRoyalty?: boolean;
-  mutableURI?: boolean;
-  mutableTokenDescription?: boolean;
-  mutableTokenName?: boolean;
-  mutableTokenProperties?: boolean;
-  mutableTokenURI?: boolean;
-  tokensBurnableByCreator?: boolean;
-  tokensFreezableByCreator?: boolean;
-}
-
-const PropertyTypeMap = {
-  BOOLEAN: "bool",
-  U8: "u8",
-  U16: "u16",
-  U32: "u32",
-  U64: "u64",
-  U128: "u128",
-  U256: "u256",
-  ADDRESS: "address",
-  VECTOR: "vector<u8>",
-  STRING: "string",
-};
-
-export type PropertyType = keyof typeof PropertyTypeMap;
-
-/**
- * Class for managing aptos_token
- */
-export class AptosToken {
-  readonly provider: Provider;
-
-  private readonly tokenType: string = "0x4::token::Token";
-
-  /**
-   * Creates new AptosToken instance
-   *
-   * @param provider Provider instance
-   */
-  constructor(provider: Provider) {
-    this.provider = provider;
-  }
-
-  private async submitTransaction(
-    account: AptosAccount,
-    funcName: string,
-    typeArgs: string[],
-    args: any[],
-    extraArgs?: OptionalTransactionArgs,
-  ) {
-    const builder = new TransactionBuilderRemoteABI(this.provider, {
-      sender: account.address(),
-      ...extraArgs,
-    });
-    const rawTxn = await builder.build(`0x4::aptos_token::${funcName}`, typeArgs, args);
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.provider.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Creates a new collection within the specified account
-   *
-   * @param creator AptosAccount where collection will be created
-   * @param description Collection description
-   * @param name Collection name
-   * @param uri URL to additional info about collection
-   * @param options CreateCollectionOptions type. By default all values set to `true` or `0`
-   * @returns The hash of the transaction submitted to the API
-   */
-  async createCollection(
-    creator: AptosAccount,
-    description: string,
-    name: string,
-    uri: string,
-    maxSupply: AnyNumber = MAX_U64_BIG_INT,
-    options?: CreateCollectionOptions,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "create_collection",
-      [],
-      [
-        description,
-        maxSupply,
-        name,
-        uri,
-        options?.mutableDescription ?? true,
-        options?.mutableRoyalty ?? true,
-        options?.mutableURI ?? true,
-        options?.mutableTokenDescription ?? true,
-        options?.mutableTokenName ?? true,
-        options?.mutableTokenProperties ?? true,
-        options?.mutableTokenURI ?? true,
-        options?.tokensBurnableByCreator ?? true,
-        options?.tokensFreezableByCreator ?? true,
-        options?.royaltyNumerator ?? 0,
-        options?.royaltyDenominator ?? 0,
-      ],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Mint a new token within the specified account
-   *
-   * @param account AptosAccount where token will be created
-   * @param collection Name of collection, that token belongs to
-   * @param description Token description
-   * @param name Token name
-   * @param uri URL to additional info about token
-   * @param propertyKeys the property keys for storing on-chain properties
-   * @param propertyTypes the type of property values
-   * @param propertyValues the property values to be stored on-chain
-   * @returns The hash of the transaction submitted to the API
-   */
-  async mint(
-    account: AptosAccount,
-    collection: string,
-    description: string,
-    name: string,
-    uri: string,
-    propertyKeys: Array<string> = [],
-    propertyTypes: Array<string> = [],
-    propertyValues: Array<string> = [],
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      account,
-      "mint",
-      [],
-      [
-        collection,
-        description,
-        name,
-        uri,
-        propertyKeys,
-        propertyTypes,
-        getPropertyValueRaw(propertyValues, propertyTypes),
-      ],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Mint a soul bound token into a recipient's account
-   *
-   * @param account AptosAccount that mints the token
-   * @param collection Name of collection, that token belongs to
-   * @param description Token description
-   * @param name Token name
-   * @param uri URL to additional info about token
-   * @param recipient AptosAccount where token will be created
-   * @param propertyKeys the property keys for storing on-chain properties
-   * @param propertyTypes the type of property values
-   * @param propertyValues the property values to be stored on-chain
-   * @returns The hash of the transaction submitted to the API
-   */
-  async mintSoulBound(
-    account: AptosAccount,
-    collection: string,
-    description: string,
-    name: string,
-    uri: string,
-    recipient: AptosAccount,
-    propertyKeys: Array<string> = [],
-    propertyTypes: Array<string> = [],
-    propertyValues: Array<string> = [],
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      account,
-      "mint_soul_bound",
-      [],
-      [
-        collection,
-        description,
-        name,
-        uri,
-        propertyKeys,
-        propertyTypes,
-        getPropertyValueRaw(propertyValues, propertyTypes),
-        recipient.address().hex(),
-      ],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Burn a token by its creator
-   * @param creator Creator account
-   * @param token Token address
-   * @returns The hash of the transaction submitted to the API
-   */
-  async burnToken(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "burn",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex()],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Freeze token transfer ability
-   * @param creator Creator account
-   * @param token Token address
-   * @returns The hash of the transaction submitted to the API
-   */
-  async freezeTokenTransafer(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "freeze_transfer",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex()],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Unfreeze token transfer ability
-   * @param creator Creator account
-   * @param token Token address
-   * @returns The hash of the transaction submitted to the API
-   */
-  async unfreezeTokenTransafer(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "unfreeze_transfer",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex()],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Set token description
-   * @param creator Creator account
-   * @param token Token address
-   * @param description Token description
-   * @returns The hash of the transaction submitted to the API
-   */
-  async setTokenDescription(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    description: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "set_description",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex(), description],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Set token name
-   * @param creator Creator account
-   * @param token Token address
-   * @param name Token name
-   * @returns The hash of the transaction submitted to the API
-   */
-  async setTokenName(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    name: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "set_name",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex(), name],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Set token URI
-   * @param creator Creator account
-   * @param token Token address
-   * @param uri Token uri
-   * @returns The hash of the transaction submitted to the API
-   */
-  async setTokenURI(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    uri: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "set_uri",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex(), uri],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Add token property
-   * @param creator Creator account
-   * @param token Token address
-   * @param key the property key for storing on-chain property
-   * @param type the type of property value
-   * @param value the property value to be stored on-chain
-   * @returns The hash of the transaction submitted to the API
-   */
-  async addTokenProperty(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    propertyKey: string,
-    propertyType: PropertyType,
-    propertyValue: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "add_property",
-      [tokenType || this.tokenType],
-      [
-        HexString.ensure(token).hex(),
-        propertyKey,
-        PropertyTypeMap[propertyType],
-        getSinglePropertyValueRaw(propertyValue, PropertyTypeMap[propertyType]),
-      ],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Remove token property
-   * @param creator Creator account
-   * @param token Token address
-   * @param key the property key stored on-chain
-   * @returns The hash of the transaction submitted to the API
-   */
-  async removeTokenProperty(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    propertyKey: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "remove_property",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex(), propertyKey],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Update token property
-   * @param creator Creator account
-   * @param token Token address
-   * @param key the property key stored on-chain
-   * @param type the property typed stored on-chain
-   * @param value the property value to be stored on-chain
-   * @returns The hash of the transaction submitted to the API
-   */
-  async updateTokenProperty(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    propertyKey: string,
-    propertyType: PropertyType,
-    propertyValue: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    return this.submitTransaction(
-      creator,
-      "update_property",
-      [tokenType || this.tokenType],
-      [
-        HexString.ensure(token).hex(),
-        propertyKey,
-        PropertyTypeMap[propertyType],
-        getSinglePropertyValueRaw(propertyValue, PropertyTypeMap[propertyType]),
-      ],
-      extraArgs,
-    );
-  }
-
-  async addTypedProperty(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    propertyKey: string,
-    propertyType: PropertyType,
-    propertyValue: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ) {
-    return this.submitTransaction(
-      creator,
-      "add_typed_property",
-      [tokenType || this.tokenType, PropertyTypeMap[propertyType]],
-      [HexString.ensure(token).hex(), propertyKey, propertyValue],
-      extraArgs,
-    );
-  }
-
-  async updateTypedProperty(
-    creator: AptosAccount,
-    token: MaybeHexString,
-    propertyKey: string,
-    propertyType: PropertyType,
-    propertyValue: string,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ) {
-    return this.submitTransaction(
-      creator,
-      "update_typed_property",
-      [tokenType || this.tokenType, PropertyTypeMap[propertyType]],
-      [HexString.ensure(token).hex(), propertyKey, propertyValue],
-      extraArgs,
-    );
-  }
-
-  /**
-   * Transfer a token ownership.
-   * We can transfer a token only when the token is not frozen (i.e. owner transfer is not disabled such as for soul bound tokens)
-   * @param owner The account of the current token owner
-   * @param token Token address
-   * @param recipient Recipient address
-   * @returns The hash of the transaction submitted to the API
-   */
-  async transferTokenOwnership(
-    owner: AptosAccount,
-    token: MaybeHexString,
-    recipient: MaybeHexString,
-    tokenType?: string,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.provider.aptosClient, {
-      sender: owner.address(),
-      ...extraArgs,
-    });
-    const rawTxn = await builder.build(
-      "0x1::object::transfer",
-      [tokenType || this.tokenType],
-      [HexString.ensure(token).hex(), HexString.ensure(recipient).hex()],
-    );
-    const bcsTxn = AptosClient.generateBCSTransaction(owner, rawTxn);
-    const pendingTransaction = await this.provider.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-}
diff --git a/m1/JavaScript-client/src/plugins/coin_client.ts b/m1/JavaScript-client/src/plugins/coin_client.ts
deleted file mode 100644
index 8eff1e09d..000000000
--- a/m1/JavaScript-client/src/plugins/coin_client.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosAccount, getAddressFromAccountOrAddress } from "../account/aptos_account";
-import { AptosClient, OptionalTransactionArgs } from "../providers/aptos_client";
-import { MaybeHexString, APTOS_COIN } from "../utils";
-import { TransactionBuilderRemoteABI } from "../transaction_builder";
-
-/**
- * Class for working with the coin module, such as transferring coins and
- * checking balances.
- */
-export class CoinClient {
-  aptosClient: AptosClient;
-
-  /**
-   * Creates new CoinClient instance
-   * @param aptosClient AptosClient instance
-   */
-  constructor(aptosClient: AptosClient) {
-    this.aptosClient = aptosClient;
-  }
-
-  /**
-   * Generate, sign, and submit a transaction to the Aptos blockchain API to
-   * transfer coins from one account to another. By default it transfers
-   * 0x1::aptos_coin::AptosCoin, but you can specify a different coin type
-   * with the `coinType` argument.
-   *
-   * You may set `createReceiverIfMissing` to true if you want to create the
-   * receiver account if it does not exist on chain yet. If you do not set
-   * this to true, the transaction will fail if the receiver account does not
-   * exist on-chain.
-   *
-   * @param from Account sending the coins
-   * @param to Account to receive the coins
-   * @param amount Number of coins to transfer
-   * @param extraArgs Extra args for building the transaction or configuring how
-   * the client should submit and wait for the transaction
-   * @returns The hash of the transaction submitted to the API
-   */
-  // :!:>transfer
-  async transfer(
-    from: AptosAccount,
-    to: AptosAccount | MaybeHexString,
-    amount: number | bigint,
-    extraArgs?: OptionalTransactionArgs & {
-      // The coin type to use, defaults to 0x1::aptos_coin::AptosCoin
-      coinType?: string;
-      // If set, create the `receiver` account if it doesn't exist on-chain.
-      // This is done by calling `0x1::aptos_account::transfer` instead, which
-      // will create the account on-chain first if it doesn't exist before
-      // transferring the coins to it.
-      // If this is the first time an account has received the specified coinType,
-      // and this is set to false, the transaction would fail.
-      createReceiverIfMissing?: boolean;
-    },
-  ): Promise<string> {
-    // If none is explicitly given, use 0x1::aptos_coin::AptosCoin as the coin type.
-    const coinTypeToTransfer = extraArgs?.coinType ?? APTOS_COIN;
-
-    // If we should create the receiver account if it doesn't exist on-chain,
-    // use the `0x1::aptos_account::transfer` function.
-    const func = extraArgs?.createReceiverIfMissing ? "0x1::aptos_account::transfer_coins" : "0x1::coin::transfer";
-
-    // Get the receiver address from the AptosAccount or MaybeHexString.
-    const toAddress = getAddressFromAccountOrAddress(to);
-
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: from.address(), ...extraArgs });
-    const rawTxn = await builder.build(func, [coinTypeToTransfer], [toAddress, amount]);
-
-    const bcsTxn = AptosClient.generateBCSTransaction(from, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  } // <:!:transfer
-
-  /**
-   * Get the balance of the account. By default it checks the balance of
-   * 0x1::aptos_coin::AptosCoin, but you can specify a different coin type.
-   *
-   * @param account Account that you want to get the balance of.
-   * @param extraArgs Extra args for checking the balance.
-   * @returns Promise that resolves to the balance as a bigint.
-   */
-  // :!:>checkBalance
-  async checkBalance(
-    account: AptosAccount | MaybeHexString,
-    extraArgs?: {
-      // The coin type to use, defaults to 0x1::aptos_coin::AptosCoin
-      coinType?: string;
-    },
-  ): Promise<bigint> {
-    const coinType = extraArgs?.coinType ?? APTOS_COIN;
-    const typeTag = `0x1::coin::CoinStore<${coinType}>`;
-    const address = getAddressFromAccountOrAddress(account);
-    const accountResource = await this.aptosClient.getAccountResource(address, typeTag);
-    return BigInt((accountResource.data as any).coin.value);
-  } // <:!:checkBalance
-}
diff --git a/m1/JavaScript-client/src/plugins/faucet_client.ts b/m1/JavaScript-client/src/plugins/faucet_client.ts
deleted file mode 100644
index 4f854205f..000000000
--- a/m1/JavaScript-client/src/plugins/faucet_client.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/** Faucet creates and funds accounts. This is a thin wrapper around that. */
-import { AptosClient } from "../providers/aptos_client";
-import { OpenAPIConfig } from "../generated";
-import { AxiosHttpRequest } from "../generated/core/AxiosHttpRequest";
-import { HexString, MaybeHexString, DEFAULT_TXN_TIMEOUT_SEC } from "../utils";
-
-/**
- * Class for requsting tokens from faucet
- */
-export class FaucetClient extends AptosClient {
-  faucetRequester: AxiosHttpRequest;
-
-  /**
-   * Establishes a connection to Aptos node
-   * @param nodeUrl A url of the Aptos Node API endpoint
-   * @param faucetUrl A faucet url
-   * @param config An optional config for inner axios instance
-   * Detailed config description: {@link https://github.com/axios/axios#request-config}
-   */
-  constructor(nodeUrl: string, faucetUrl: string, config?: Partial<OpenAPIConfig>) {
-    super(nodeUrl, config);
-
-    if (!faucetUrl) {
-      throw new Error("Faucet URL cannot be empty.");
-    }
-    // Build a requester configured to talk to the faucet.
-    this.faucetRequester = new AxiosHttpRequest({
-      BASE: faucetUrl,
-      VERSION: config?.VERSION ?? "0.1.0",
-      WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
-      CREDENTIALS: config?.CREDENTIALS ?? "include",
-      TOKEN: config?.TOKEN,
-      USERNAME: config?.USERNAME,
-      PASSWORD: config?.PASSWORD,
-      HEADERS: config?.HEADERS,
-      ENCODE_PATH: config?.ENCODE_PATH,
-    });
-  }
-
-  /**
-   * This creates an account if it does not exist and mints the specified amount of
-   * coins into that account
-   * @param address Hex-encoded 16 bytes Aptos account address wich mints tokens
-   * @param amount Amount of tokens to mint
-   * @param timeoutSecs
-   * @returns Hashes of submitted transactions
-   */
-  async fundAccount(address: MaybeHexString, amount: number, timeoutSecs = DEFAULT_TXN_TIMEOUT_SEC): Promise<string[]> {
-    const tnxHashes = await this.faucetRequester.request<Array<string>>({
-      method: "POST",
-      url: "/mint",
-      query: {
-        address: HexString.ensure(address).noPrefix(),
-        amount,
-      },
-    });
-
-    const promises: Promise<void>[] = [];
-    for (let i = 0; i < tnxHashes.length; i += 1) {
-      const tnxHash = tnxHashes[i];
-      promises.push(this.waitForTransaction(tnxHash, { timeoutSecs }));
-    }
-    await Promise.all(promises);
-    return tnxHashes;
-  }
-}
diff --git a/m1/JavaScript-client/src/plugins/index.ts b/m1/JavaScript-client/src/plugins/index.ts
deleted file mode 100644
index 00f561a26..000000000
--- a/m1/JavaScript-client/src/plugins/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./token_client";
-export * from "./aptos_token";
-export * from "./coin_client";
-export * from "./faucet_client";
diff --git a/m1/JavaScript-client/src/plugins/token_client.ts b/m1/JavaScript-client/src/plugins/token_client.ts
deleted file mode 100644
index 507f143a9..000000000
--- a/m1/JavaScript-client/src/plugins/token_client.ts
+++ /dev/null
@@ -1,672 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable max-len */
-
-import { AptosAccount } from "../account/aptos_account";
-import { AptosClient, OptionalTransactionArgs } from "../providers/aptos_client";
-import * as TokenTypes from "../aptos_types/token_types";
-import * as Gen from "../generated/index";
-import { HexString, MaybeHexString } from "../utils";
-import { TransactionBuilder, TransactionBuilderRemoteABI, TxnBuilderTypes } from "../transaction_builder";
-import { MAX_U64_BIG_INT } from "../bcs/consts";
-import { AnyNumber, bcsToBytes, Bytes } from "../bcs";
-import { getPropertyValueRaw, PropertyMap } from "../utils/property_map_serde";
-import { Token, TokenData } from "../aptos_types/token_types";
-
-/**
- * Class for creating, minting and managing minting NFT collections and tokens
- */
-export class TokenClient {
-  aptosClient: AptosClient;
-
-  /**
-   * Creates new TokenClient instance
-   *
-   * @param aptosClient AptosClient instance
-   */
-  constructor(aptosClient: AptosClient) {
-    this.aptosClient = aptosClient;
-  }
-
-  /**
-   * Creates a new NFT collection within the specified account
-   *
-   * @param account AptosAccount where collection will be created
-   * @param name Collection name
-   * @param description Collection description
-   * @param uri URL to additional info about collection
-   * @param maxAmount Maximum number of `token_data` allowed within this collection
-   * @returns The hash of the transaction submitted to the API
-   */
-  // :!:>createCollection
-  async createCollection(
-    account: AptosAccount,
-    name: string,
-    description: string,
-    uri: string,
-    maxAmount: AnyNumber = MAX_U64_BIG_INT,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    // <:!:createCollection
-
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::create_collection_script",
-      [],
-      [name, description, uri, maxAmount, [false, false, false]],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Creates a new NFT within the specified account
-   *
-   * @param account AptosAccount where token will be created
-   * @param collectionName Name of collection, that token belongs to
-   * @param name Token name
-   * @param description Token description
-   * @param supply Token supply
-   * @param uri URL to additional info about token
-   * @param max The maxium of tokens can be minted from this token
-   * @param royalty_payee_address the address to receive the royalty, the address can be a shared account address.
-   * @param royalty_points_denominator the denominator for calculating royalty
-   * @param royalty_points_numerator the numerator for calculating royalty
-   * @param property_keys the property keys for storing on-chain properties
-   * @param property_values the property values to be stored on-chain
-   * @param property_types the type of property values
-   * @returns The hash of the transaction submitted to the API
-   */
-  // :!:>createToken
-  async createToken(
-    account: AptosAccount,
-    collectionName: string,
-    name: string,
-    description: string,
-    supply: number,
-    uri: string,
-    max: AnyNumber = MAX_U64_BIG_INT,
-    royalty_payee_address: MaybeHexString = account.address(),
-    royalty_points_denominator: number = 0,
-    royalty_points_numerator: number = 0,
-    property_keys: Array<string> = [],
-    property_values: Array<string> = [],
-    property_types: Array<string> = [],
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    // <:!:createToken
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-
-    const rawTxn = await builder.build(
-      "0x3::token::create_token_script",
-      [],
-      [
-        collectionName,
-        name,
-        description,
-        supply,
-        max,
-        uri,
-        royalty_payee_address,
-        royalty_points_denominator,
-        royalty_points_numerator,
-        [false, false, false, false, false],
-        property_keys,
-        getPropertyValueRaw(property_values, property_types),
-        property_types,
-      ],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Creates a new NFT within the specified account
-   *
-   * @param account AptosAccount where token will be created
-   * @param collectionName Name of collection, that token belongs to
-   * @param name Token name
-   * @param description Token description
-   * @param supply Token supply
-   * @param uri URL to additional info about token
-   * @param max The maxium of tokens can be minted from this token
-   * @param royalty_payee_address the address to receive the royalty, the address can be a shared account address.
-   * @param royalty_points_denominator the denominator for calculating royalty
-   * @param royalty_points_numerator the numerator for calculating royalty
-   * @param property_keys the property keys for storing on-chain properties
-   * @param property_values the property values to be stored on-chain
-   * @param property_types the type of property values
-   * @param mutability_config configs which field is mutable
-   * @returns The hash of the transaction submitted to the API
-   */
-  // :!:>createToken
-  async createTokenWithMutabilityConfig(
-    account: AptosAccount,
-    collectionName: string,
-    name: string,
-    description: string,
-    supply: AnyNumber,
-    uri: string,
-    max: AnyNumber = MAX_U64_BIG_INT,
-    royalty_payee_address: MaybeHexString = account.address(),
-    royalty_points_denominator: AnyNumber = 0,
-    royalty_points_numerator: AnyNumber = 0,
-    property_keys: Array<string> = [],
-    property_values: Array<Bytes> = [],
-    property_types: Array<string> = [],
-    mutability_config: Array<boolean> = [false, false, false, false, false],
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    // <:!:createToken
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::create_token_script",
-      [],
-      [
-        collectionName,
-        name,
-        description,
-        supply,
-        max,
-        uri,
-        royalty_payee_address,
-        royalty_points_denominator,
-        royalty_points_numerator,
-        mutability_config,
-        property_keys,
-        property_values,
-        property_types,
-      ],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Transfers specified amount of tokens from account to receiver
-   *
-   * @param account AptosAccount where token from which tokens will be transfered
-   * @param receiver  Hex-encoded 32 byte Aptos account address to which tokens will be transfered
-   * @param creator Hex-encoded 32 byte Aptos account address to which created tokens
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param amount Amount of tokens which will be transfered
-   * @param property_version the version of token PropertyMap with a default value 0.
-   * @returns The hash of the transaction submitted to the API
-   */
-  async offerToken(
-    account: AptosAccount,
-    receiver: MaybeHexString,
-    creator: MaybeHexString,
-    collectionName: string,
-    name: string,
-    amount: number,
-    property_version: number = 0,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token_transfers::offer_script",
-      [],
-      [receiver, creator, collectionName, name, property_version, amount],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Claims a token on specified account
-   *
-   * @param account AptosAccount which will claim token
-   * @param sender Hex-encoded 32 byte Aptos account address which holds a token
-   * @param creator Hex-encoded 32 byte Aptos account address which created a token
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param property_version the version of token PropertyMap with a default value 0.
-   * @returns The hash of the transaction submitted to the API
-   */
-  async claimToken(
-    account: AptosAccount,
-    sender: MaybeHexString,
-    creator: MaybeHexString,
-    collectionName: string,
-    name: string,
-    property_version: number = 0,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token_transfers::claim_script",
-      [],
-      [sender, creator, collectionName, name, property_version],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Removes a token from pending claims list
-   *
-   * @param account AptosAccount which will remove token from pending list
-   * @param receiver Hex-encoded 32 byte Aptos account address which had to claim token
-   * @param creator Hex-encoded 32 byte Aptos account address which created a token
-   * @param collectionName Name of collection where token is strored
-   * @param name Token name
-   * @param property_version the version of token PropertyMap with a default value 0.
-   * @returns The hash of the transaction submitted to the API
-   */
-  async cancelTokenOffer(
-    account: AptosAccount,
-    receiver: MaybeHexString,
-    creator: MaybeHexString,
-    collectionName: string,
-    name: string,
-    property_version: number = 0,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token_transfers::cancel_offer_script",
-      [],
-      [receiver, creator, collectionName, name, property_version],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Directly transfer the specified amount of tokens from account to receiver
-   * using a single multi signature transaction.
-   *
-   * @param sender AptosAccount where token from which tokens will be transfered
-   * @param receiver Hex-encoded 32 byte Aptos account address to which tokens will be transfered
-   * @param creator Hex-encoded 32 byte Aptos account address to which created tokens
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param amount Amount of tokens which will be transfered
-   * @param property_version the version of token PropertyMap with a default value 0.
-   * @returns The hash of the transaction submitted to the API
-   */
-  async directTransferToken(
-    sender: AptosAccount,
-    receiver: AptosAccount,
-    creator: MaybeHexString,
-    collectionName: string,
-    name: string,
-    amount: AnyNumber,
-    propertyVersion: AnyNumber = 0,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: sender.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::direct_transfer_script",
-      [],
-      [creator, collectionName, name, propertyVersion, amount],
-    );
-
-    const multiAgentTxn = new TxnBuilderTypes.MultiAgentRawTransaction(rawTxn, [
-      TxnBuilderTypes.AccountAddress.fromHex(receiver.address()),
-    ]);
-
-    const senderSignature = new TxnBuilderTypes.Ed25519Signature(
-      sender.signBuffer(TransactionBuilder.getSigningMessage(multiAgentTxn)).toUint8Array(),
-    );
-
-    const senderAuthenticator = new TxnBuilderTypes.AccountAuthenticatorEd25519(
-      new TxnBuilderTypes.Ed25519PublicKey(sender.signingKey.publicKey),
-      senderSignature,
-    );
-
-    const receiverSignature = new TxnBuilderTypes.Ed25519Signature(
-      receiver.signBuffer(TransactionBuilder.getSigningMessage(multiAgentTxn)).toUint8Array(),
-    );
-
-    const receiverAuthenticator = new TxnBuilderTypes.AccountAuthenticatorEd25519(
-      new TxnBuilderTypes.Ed25519PublicKey(receiver.signingKey.publicKey),
-      receiverSignature,
-    );
-
-    const multiAgentAuthenticator = new TxnBuilderTypes.TransactionAuthenticatorMultiAgent(
-      senderAuthenticator,
-      [TxnBuilderTypes.AccountAddress.fromHex(receiver.address())], // Secondary signer addresses
-      [receiverAuthenticator], // Secondary signer authenticators
-    );
-
-    const bcsTxn = bcsToBytes(new TxnBuilderTypes.SignedTransaction(rawTxn, multiAgentAuthenticator));
-
-    const transactionRes = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-
-    return transactionRes.hash;
-  }
-
-  /**
-   * User opt-in or out direct transfer through a boolean flag
-   *
-   * @param sender AptosAccount where the token will be transferred
-   * @param optIn boolean value indicates user want to opt-in or out of direct transfer
-   * @returns The hash of the transaction submitted to the API
-   */
-  async optInTokenTransfer(sender: AptosAccount, optIn: boolean, extraArgs?: OptionalTransactionArgs): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: sender.address(), ...extraArgs });
-    const rawTxn = await builder.build("0x3::token::opt_in_direct_transfer", [], [optIn]);
-    const bcsTxn = AptosClient.generateBCSTransaction(sender, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Directly transfer token to a receiver. The receiver should have opted in to direct transfer
-   *
-   * @param sender AptosAccount where the token will be transferred
-   * @param creator  address of the token creator
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param property_version the version of token PropertyMap
-   * @param amount Amount of tokens which will be transfered
-   * @returns The hash of the transaction submitted to the API
-   */
-  async transferWithOptIn(
-    sender: AptosAccount,
-    creator: MaybeHexString,
-    collectionName: string,
-    tokenName: string,
-    propertyVersion: AnyNumber,
-    receiver: MaybeHexString,
-    amount: AnyNumber,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: sender.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::transfer_with_opt_in",
-      [],
-      [creator, collectionName, tokenName, propertyVersion, receiver, amount],
-    );
-    const bcsTxn = AptosClient.generateBCSTransaction(sender, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * BurnToken by Creator
-   *
-   * @param creator creator of the token
-   * @param ownerAddress address of the token owner
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param amount Amount of tokens which will be transfered
-   * @param property_version the version of token PropertyMap
-   * @returns The hash of the transaction submitted to the API
-   */
-  async burnByCreator(
-    creator: AptosAccount,
-    ownerAddress: MaybeHexString,
-    collection: String,
-    name: String,
-    PropertyVersion: AnyNumber,
-    amount: AnyNumber,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: creator.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::burn_by_creator",
-      [],
-      [ownerAddress, collection, name, PropertyVersion, amount],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(creator, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * BurnToken by Owner
-   *
-   * @param owner creator of the token
-   * @param creatorAddress address of the token creator
-   * @param collectionName Name of collection where token is stored
-   * @param name Token name
-   * @param amount Amount of tokens which will be transfered
-   * @param property_version the version of token PropertyMap
-   * @returns The hash of the transaction submitted to the API
-   */
-  async burnByOwner(
-    owner: AptosAccount,
-    creatorAddress: MaybeHexString,
-    collection: String,
-    name: String,
-    PropertyVersion: AnyNumber,
-    amount: AnyNumber,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: owner.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::burn",
-      [],
-      [creatorAddress, collection, name, PropertyVersion, amount],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(owner, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * creator mutates the properties of the tokens
-   *
-   * @param account AptosAccount who modifies the token properties
-   * @param tokenOwner the address of account owning the token
-   * @param creator the creator of the token
-   * @param collection_name the name of the token collection
-   * @param tokenName the name of created token
-   * @param propertyVersion the property_version of the token to be modified
-   * @param amount the number of tokens to be modified
-   *
-   * @returns The hash of the transaction submitted to the API
-   */
-  async mutateTokenProperties(
-    account: AptosAccount,
-    tokenOwner: HexString,
-    creator: HexString,
-    collection_name: string,
-    tokenName: string,
-    propertyVersion: AnyNumber,
-    amount: AnyNumber,
-    keys: Array<string>,
-    values: Array<Bytes>,
-    types: Array<string>,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const builder = new TransactionBuilderRemoteABI(this.aptosClient, { sender: account.address(), ...extraArgs });
-    const rawTxn = await builder.build(
-      "0x3::token::mutate_token_properties",
-      [],
-      [tokenOwner, creator, collection_name, tokenName, propertyVersion, amount, keys, values, types],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account, rawTxn);
-    const pendingTransaction = await this.aptosClient.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-  }
-
-  /**
-   * Queries collection data
-   * @param creator Hex-encoded 32 byte Aptos account address which created a collection
-   * @param collectionName Collection name
-   * @returns Collection data in below format
-   * ```
-   *  Collection {
-   *    // Describes the collection
-   *    description: string,
-   *    // Unique name within this creators account for this collection
-   *    name: string,
-   *    // URL for additional information/media
-   *    uri: string,
-   *    // Total number of distinct Tokens tracked by the collection
-   *    count: number,
-   *    // Optional maximum number of tokens allowed within this collections
-   *    maximum: number
-   *  }
-   * ```
-   */
-  async getCollectionData(creator: MaybeHexString, collectionName: string): Promise<any> {
-    const resources = await this.aptosClient.getAccountResources(creator);
-    const accountResource: { type: Gen.MoveStructTag; data: any } = resources.find(
-      (r) => r.type === "0x3::token::Collections",
-    )!;
-    const { handle }: { handle: string } = accountResource.data.collection_data;
-    const getCollectionTableItemRequest: Gen.TableItemRequest = {
-      key_type: "0x1::string::String",
-      value_type: "0x3::token::CollectionData",
-      key: collectionName,
-    };
-
-    const collectionTable = await this.aptosClient.getTableItem(handle, getCollectionTableItemRequest);
-    return collectionTable;
-  }
-
-  /**
-   * Queries token data from collection
-   *
-   * @param creator Hex-encoded 32 byte Aptos account address which created a token
-   * @param collectionName Name of collection, which holds a token
-   * @param tokenName Token name
-   * @returns Token data in below format
-   * ```
-   * TokenData {
-   *     // Unique name within this creators account for this Token's collection
-   *     collection: string;
-   *     // Describes this Token
-   *     description: string;
-   *     // The name of this Token
-   *     name: string;
-   *     // Optional maximum number of this type of Token.
-   *     maximum: number;
-   *     // Total number of this type of Token
-   *     supply: number;
-   *     /// URL for additional information / media
-   *     uri: string;
-   *   }
-   * ```
-   */
-  // :!:>getTokenData
-  async getTokenData(
-    creator: MaybeHexString,
-    collectionName: string,
-    tokenName: string,
-  ): Promise<TokenTypes.TokenData> {
-    const creatorHex = creator instanceof HexString ? creator.hex() : creator;
-    const collection: { type: Gen.MoveStructTag; data: any } = await this.aptosClient.getAccountResource(
-      creatorHex,
-      "0x3::token::Collections",
-    );
-    const { handle } = collection.data.token_data;
-    const tokenDataId = {
-      creator: creatorHex,
-      collection: collectionName,
-      name: tokenName,
-    };
-
-    const getTokenTableItemRequest: Gen.TableItemRequest = {
-      key_type: "0x3::token::TokenDataId",
-      value_type: "0x3::token::TokenData",
-      key: tokenDataId,
-    };
-
-    // We know the response will be a struct containing TokenData, hence the
-    // implicit cast.
-    const rawTokenData = await this.aptosClient.getTableItem(handle, getTokenTableItemRequest);
-    return new TokenData(
-      rawTokenData.collection,
-      rawTokenData.description,
-      rawTokenData.name,
-      rawTokenData.maximum,
-      rawTokenData.supply,
-      rawTokenData.uri,
-      rawTokenData.default_properties,
-      rawTokenData.mutability_config,
-    );
-  } // <:!:getTokenData
-
-  /**
-   * Queries token balance for the token creator
-   */
-  async getToken(
-    creator: MaybeHexString,
-    collectionName: string,
-    tokenName: string,
-    property_version: string = "0",
-  ): Promise<TokenTypes.Token> {
-    const tokenDataId: TokenTypes.TokenDataId = {
-      creator: creator instanceof HexString ? creator.hex() : creator,
-      collection: collectionName,
-      name: tokenName,
-    };
-    return this.getTokenForAccount(creator, {
-      token_data_id: tokenDataId,
-      property_version,
-    });
-  }
-
-  /**
-   * Queries token balance for a token account
-   * @param account Hex-encoded 32 byte Aptos account address which created a token
-   * @param tokenId token id
-   *
-   * TODO: Update this:
-   * @example
-   * ```
-   * {
-   *   creator: '0x1',
-   *   collection: 'Some collection',
-   *   name: 'Awesome token'
-   * }
-   * ```
-   * @returns Token object in below format
-   * ```
-   * Token {
-   *   id: TokenId;
-   *   value: number;
-   * }
-   * ```
-   */
-  async getTokenForAccount(account: MaybeHexString, tokenId: TokenTypes.TokenId): Promise<TokenTypes.Token> {
-    const tokenStore: { type: Gen.MoveStructTag; data: any } = await this.aptosClient.getAccountResource(
-      account instanceof HexString ? account.hex() : account,
-      "0x3::token::TokenStore",
-    );
-    const { handle } = tokenStore.data.tokens;
-
-    const getTokenTableItemRequest: Gen.TableItemRequest = {
-      key_type: "0x3::token::TokenId",
-      value_type: "0x3::token::Token",
-      key: tokenId,
-    };
-
-    try {
-      const rawToken = await this.aptosClient.getTableItem(handle, getTokenTableItemRequest);
-      return new Token(rawToken.id, rawToken.amount, rawToken.token_properties);
-    } catch (error: any) {
-      if (error?.status === 404) {
-        return {
-          id: tokenId,
-          amount: "0",
-          token_properties: new PropertyMap(),
-        };
-      }
-      return error;
-    }
-  }
-}
diff --git a/m1/JavaScript-client/src/providers/aptos_client.ts b/m1/JavaScript-client/src/providers/aptos_client.ts
deleted file mode 100644
index 935e977ae..000000000
--- a/m1/JavaScript-client/src/providers/aptos_client.ts
+++ /dev/null
@@ -1,1001 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import {
-  clear,
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_MAX_GAS_AMOUNT,
-  DEFAULT_TXN_TIMEOUT_SEC,
-  fixNodeUrl,
-  HexString,
-  paginateWithCursor,
-  MaybeHexString,
-  Memoize,
-  sleep,
-  APTOS_COIN,
-} from "../utils";
-import { AptosAccount } from "../account/aptos_account";
-import * as Gen from "../generated/index";
-import {
-  TxnBuilderTypes,
-  TransactionBuilderEd25519,
-  TransactionBuilderRemoteABI,
-  RemoteABIBuilderConfig,
-  TransactionBuilderMultiEd25519,
-} from "../transaction_builder";
-import {
-  bcsSerializeBytes,
-  bcsSerializeU8,
-  bcsToBytes,
-  Bytes,
-  Seq,
-  Serializer,
-  serializeVector,
-  Uint64,
-  AnyNumber,
-} from "../bcs";
-import { Ed25519PublicKey, MultiEd25519PublicKey } from "../aptos_types";
-
-export interface OptionalTransactionArgs {
-  maxGasAmount?: Uint64;
-  gasUnitPrice?: Uint64;
-  expireTimestamp?: Uint64;
-}
-
-interface PaginationArgs {
-  start?: AnyNumber;
-  limit?: number;
-}
-
-/**
- * Provides methods for retrieving data from Aptos node.
- * For more detailed API specification see {@link https://fullnode.devnet.aptoslabs.com/v1/spec}
- */
-export class AptosClient {
-  client: Gen.AptosGeneratedClient;
-
-  readonly nodeUrl: string;
-
-  /**
-   * Build a client configured to connect to an Aptos node at the given URL.
-   *
-   * Note: If you forget to append `/v1` to the URL, the client constructor
-   * will automatically append it. If you don't want this URL processing to
-   * take place, set doNotFixNodeUrl to true.
-   *
-   * @param nodeUrl URL of the Aptos Node API endpoint.
-   * @param config Additional configuration options for the generated Axios client.
-   */
-  constructor(nodeUrl: string, config?: Partial<Gen.OpenAPIConfig>, doNotFixNodeUrl: boolean = false) {
-    if (!nodeUrl) {
-      throw new Error("Node URL cannot be empty.");
-    }
-    const conf = config === undefined || config === null ? {} : { ...config };
-
-    if (doNotFixNodeUrl) {
-      this.nodeUrl = nodeUrl;
-    } else {
-      this.nodeUrl = fixNodeUrl(nodeUrl);
-    }
-    conf.BASE = this.nodeUrl;
-
-    // Do not carry cookies when `WITH_CREDENTIALS` is explicitly set to `false`. By default, cookies will be sent
-    if (config?.WITH_CREDENTIALS === false) {
-      conf.WITH_CREDENTIALS = false;
-    } else {
-      conf.WITH_CREDENTIALS = true;
-    }
-    this.client = new Gen.AptosGeneratedClient(conf);
-  }
-
-  /**
-   * Queries an Aptos account by address
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @returns Core account resource, used for identifying account and transaction execution
-   * @example An example of the returned account
-   * ```
-   * {
-   *    sequence_number: "1",
-   *    authentication_key: "0x5307b5f4bc67829097a8ba9b43dba3b88261eeccd1f709d9bde240fc100fbb69"
-   * }
-   * ```
-   */
-  @parseApiError
-  async getAccount(accountAddress: MaybeHexString): Promise<Gen.AccountData> {
-    return this.client.accounts.getAccount(HexString.ensure(accountAddress).hex());
-  }
-
-  /**
-   * Queries transactions sent by given account
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @param query Optional pagination object
-   * @param query.start The sequence number of the start transaction of the page. Default is 0.
-   * @param query.limit The max number of transactions should be returned for the page. Default is 25.
-   * @returns An array of on-chain transactions, sent by account
-   */
-  @parseApiError
-  async getAccountTransactions(accountAddress: MaybeHexString, query?: PaginationArgs): Promise<Gen.Transaction[]> {
-    return this.client.transactions.getAccountTransactions(
-      HexString.ensure(accountAddress).hex(),
-      query?.start?.toString(),
-      query?.limit,
-    );
-  }
-
-  /**
-   * Queries modules associated with given account
-   *
-   * Note: In order to get all account modules, this function may call the API
-   * multiple times as it paginates.
-   *
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @param query.ledgerVersion Specifies ledger version of transactions. By default latest version will be used
-   * @returns Account modules array for a specific ledger version.
-   * Module is represented by MoveModule interface. It contains module `bytecode` and `abi`,
-   * which is JSON representation of a module
-   */
-  @parseApiError
-  async getAccountModules(
-    accountAddress: MaybeHexString,
-    query?: { ledgerVersion?: AnyNumber },
-  ): Promise<Gen.MoveModuleBytecode[]> {
-    // Note: This function does not expose a `limit` parameter because it might
-    // be ambiguous how this is being used. Is it being passed to getAccountModules
-    // to limit the number of items per response, or does it limit the total output
-    // of this function? We avoid this confusion by not exposing the parameter at all.
-    const f = this.client.accounts.getAccountModules.bind({ httpRequest: this.client.request });
-    const out = await paginateWithCursor(f, accountAddress, 1000, query);
-    return out;
-  }
-
-  /**
-   * Queries module associated with given account by module name
-   *
-   * Note: In order to get all account resources, this function may call the API
-   * multiple times as it paginates.
-   *
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @param moduleName The name of the module
-   * @param query.ledgerVersion Specifies ledger version of transactions. By default latest version will be used
-   * @returns Specified module.
-   * Module is represented by MoveModule interface. It contains module `bytecode` and `abi`,
-   * which JSON representation of a module
-   */
-  @parseApiError
-  async getAccountModule(
-    accountAddress: MaybeHexString,
-    moduleName: string,
-    query?: { ledgerVersion?: AnyNumber },
-  ): Promise<Gen.MoveModuleBytecode> {
-    return this.client.accounts.getAccountModule(
-      HexString.ensure(accountAddress).hex(),
-      moduleName,
-      query?.ledgerVersion?.toString(),
-    );
-  }
-
-  /**
-   * Queries all resources associated with given account
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @param query.ledgerVersion Specifies ledger version of transactions. By default latest version will be used
-   * @returns Account resources for a specific ledger version
-   */
-  @parseApiError
-  async getAccountResources(
-    accountAddress: MaybeHexString,
-    query?: { ledgerVersion?: AnyNumber },
-  ): Promise<Gen.MoveResource[]> {
-    const f = this.client.accounts.getAccountResources.bind({ httpRequest: this.client.request });
-    const out = await paginateWithCursor(f, accountAddress, 9999, query);
-    return out;
-  }
-
-  /**
-   * Queries resource associated with given account by resource type
-   * @param accountAddress Hex-encoded 32 byte Aptos account address
-   * @param resourceType String representation of an on-chain Move struct type
-   * @param query.ledgerVersion Specifies ledger version of transactions. By default latest version will be used
-   * @returns Account resource of specified type and ledger version
-   * @example An example of an account resource
-   * ```
-   * {
-   *    type: "0x1::aptos_coin::AptosCoin",
-   *    data: { value: 6 }
-   * }
-   * ```
-   */
-  @parseApiError
-  async getAccountResource(
-    accountAddress: MaybeHexString,
-    resourceType: Gen.MoveStructTag,
-    query?: { ledgerVersion?: AnyNumber },
-  ): Promise<Gen.MoveResource> {
-    return this.client.accounts.getAccountResource(
-      HexString.ensure(accountAddress).hex(),
-      resourceType,
-      query?.ledgerVersion?.toString(),
-    );
-  }
-
-  /** Generates a signed transaction that can be submitted to the chain for execution. */
-  static generateBCSTransaction(accountFrom: AptosAccount, rawTxn: TxnBuilderTypes.RawTransaction): Uint8Array {
-    const txnBuilder = new TransactionBuilderEd25519((signingMessage: TxnBuilderTypes.SigningMessage) => {
-      // @ts-ignore
-      const sigHexStr = accountFrom.signBuffer(signingMessage);
-      return new TxnBuilderTypes.Ed25519Signature(sigHexStr.toUint8Array());
-    }, accountFrom.pubKey().toUint8Array());
-
-    return txnBuilder.sign(rawTxn);
-  }
-
-  /**
-   * Note: Unless you have a specific reason for using this, it'll probably be simpler
-   * to use `simulateTransaction`.
-   *
-   * Generates a BCS transaction that can be submitted to the chain for simulation.
-   *
-   * @param accountFrom The account that will be used to send the transaction
-   * for simulation.
-   * @param rawTxn The raw transaction to be simulated, likely created by calling
-   * the `generateTransaction` function.
-   * @returns The BCS encoded signed transaction, which you should then pass into
-   * the `submitBCSSimulation` function.
-   */
-  static generateBCSSimulation(accountFrom: AptosAccount, rawTxn: TxnBuilderTypes.RawTransaction): Uint8Array {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const txnBuilder = new TransactionBuilderEd25519((_signingMessage: TxnBuilderTypes.SigningMessage) => {
-      // @ts-ignore
-      const invalidSigBytes = new Uint8Array(64);
-      return new TxnBuilderTypes.Ed25519Signature(invalidSigBytes);
-    }, accountFrom.pubKey().toUint8Array());
-
-    return txnBuilder.sign(rawTxn);
-  }
-
-  /** Generates an entry function transaction request that can be submitted to produce a raw transaction that
-   * can be signed, which upon being signed can be submitted to the blockchain
-   * This function fetches the remote ABI and uses it to serialized the data, therefore
-   * users don't need to handle serialization by themselves.
-   * @param sender Hex-encoded 32 byte Aptos account address of transaction sender
-   * @param payload Entry function transaction payload type
-   * @param options Options allow to overwrite default transaction options.
-   * @returns A raw transaction object
-   */
-  async generateTransaction(
-    sender: MaybeHexString,
-    payload: Gen.EntryFunctionPayload,
-    options?: Partial<Gen.SubmitTransactionRequest>,
-  ): Promise<TxnBuilderTypes.RawTransaction> {
-    const config: RemoteABIBuilderConfig = { sender };
-    if (options?.sequence_number) {
-      config.sequenceNumber = options.sequence_number;
-    }
-
-    if (options?.gas_unit_price) {
-      config.gasUnitPrice = options.gas_unit_price;
-    }
-
-    if (options?.max_gas_amount) {
-      config.maxGasAmount = options.max_gas_amount;
-    }
-
-    if (options?.expiration_timestamp_secs) {
-      const timestamp = Number.parseInt(options.expiration_timestamp_secs, 10);
-      config.expSecFromNow = timestamp - Math.floor(Date.now() / 1000);
-    }
-
-    const builder = new TransactionBuilderRemoteABI(this, config);
-    return builder.build(payload.function, payload.type_arguments, payload.arguments);
-  }
-
-  /** Converts a transaction request produced by `generateTransaction` into a properly
-   * signed transaction, which can then be submitted to the blockchain
-   * @param accountFrom AptosAccount of transaction sender
-   * @param rawTransaction A raw transaction generated by `generateTransaction` method
-   * @returns A transaction, signed with sender account
-   */
-  // eslint-disable-next-line class-methods-use-this
-  async signTransaction(
-    accountFrom: AptosAccount,
-    rawTransaction: TxnBuilderTypes.RawTransaction,
-  ): Promise<Uint8Array> {
-    return Promise.resolve(AptosClient.generateBCSTransaction(accountFrom, rawTransaction));
-  }
-
-  /**
-   * Event types are globally identifiable by an account `address` and
-   * monotonically increasing `creation_number`, one per event type emitted
-   * to the given account. This API returns events corresponding to that
-   * that event type.
-   * @param address Hex-encoded 32 byte Aptos account, with or without a `0x` prefix,
-   * for which events are queried. This refers to the account that events were emitted
-   * to, not the account hosting the move module that emits that event type.
-   * @param creationNumber Creation number corresponding to the event type.
-   * @returns Array of events assotiated with the given account and creation number.
-   */
-  @parseApiError
-  async getEventsByCreationNumber(
-    address: MaybeHexString,
-    creationNumber: AnyNumber | string,
-    query?: PaginationArgs,
-  ): Promise<Gen.Event[]> {
-    return this.client.events.getEventsByCreationNumber(
-      HexString.ensure(address).hex(),
-      creationNumber.toString(),
-      query?.start?.toString(),
-      query?.limit,
-    );
-  }
-
-  /**
-   * This API uses the given account `address`, `eventHandle`, and `fieldName`
-   * to build a key that can globally identify an event types. It then uses this
-   * key to return events emitted to the given account matching that event type.
-   * @param address Hex-encoded 32 byte Aptos account, with or without a `0x` prefix,
-   * for which events are queried. This refers to the account that events were emitted
-   * to, not the account hosting the move module that emits that event type.
-   * @param eventHandleStruct String representation of an on-chain Move struct type.
-   * (e.g. `0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>`)
-   * @param fieldName The field name of the EventHandle in the struct
-   * @param query Optional query object
-   * @param query.start The start sequence number in the EVENT STREAM, defaulting to the latest event.
-   * The events are returned in the reverse order of sequence number
-   * @param query.limit The number of events to be returned. The default is 25.
-   * @returns Array of events
-   */
-  @parseApiError
-  async getEventsByEventHandle(
-    address: MaybeHexString,
-    eventHandleStruct: Gen.MoveStructTag,
-    fieldName: string,
-    query?: PaginationArgs,
-  ): Promise<Gen.Event[]> {
-    return this.client.events.getEventsByEventHandle(
-      HexString.ensure(address).hex(),
-      eventHandleStruct,
-      fieldName,
-      query?.start?.toString(),
-      query?.limit,
-    );
-  }
-
-  /**
-   * Submits a signed transaction to the transaction endpoint.
-   * @param signedTxn A transaction, signed by `signTransaction` method
-   * @returns Transaction that is accepted and submitted to mempool
-   */
-  async submitTransaction(signedTxn: Uint8Array): Promise<Gen.PendingTransaction> {
-    return this.submitSignedBCSTransaction(signedTxn);
-  }
-
-  /**
-   * Generates and submits a transaction to the transaction simulation
-   * endpoint. For this we generate a transaction with a fake signature.
-   *
-   * @param accountOrPubkey The sender or sender's public key. When private key is available, `AptosAccount` instance
-   * can be used to send the transaction for simulation. If private key is not available, sender's public key can be
-   * used to send the transaction for simulation.
-   * @param rawTransaction The raw transaction to be simulated, likely created
-   * by calling the `generateTransaction` function.
-   * @param query.estimateGasUnitPrice If set to true, the gas unit price in the
-   * transaction will be ignored and the estimated value will be used.
-   * @param query.estimateMaxGasAmount If set to true, the max gas value in the
-   * transaction will be ignored and the maximum possible gas will be used.
-   * @param query.estimatePrioritizedGasUnitPrice If set to true, the transaction will use a higher price than the
-   * original estimate.
-   * @returns The BCS encoded signed transaction, which you should then provide
-   *
-   */
-  async simulateTransaction(
-    accountOrPubkey: AptosAccount | Ed25519PublicKey | MultiEd25519PublicKey,
-    rawTransaction: TxnBuilderTypes.RawTransaction,
-    query?: {
-      estimateGasUnitPrice?: boolean;
-      estimateMaxGasAmount?: boolean;
-      estimatePrioritizedGasUnitPrice: boolean;
-    },
-  ): Promise<Gen.UserTransaction[]> {
-    let signedTxn: Uint8Array;
-
-    if (accountOrPubkey instanceof AptosAccount) {
-      signedTxn = AptosClient.generateBCSSimulation(accountOrPubkey, rawTransaction);
-    } else if (accountOrPubkey instanceof MultiEd25519PublicKey) {
-      const txnBuilder = new TransactionBuilderMultiEd25519(() => {
-        const { threshold } = accountOrPubkey;
-        const bits: Seq<number> = [];
-        const signatures: TxnBuilderTypes.Ed25519Signature[] = [];
-        for (let i = 0; i < threshold; i += 1) {
-          bits.push(i);
-          signatures.push(new TxnBuilderTypes.Ed25519Signature(new Uint8Array(64)));
-        }
-        const bitmap = TxnBuilderTypes.MultiEd25519Signature.createBitmap(bits);
-        return new TxnBuilderTypes.MultiEd25519Signature(signatures, bitmap);
-      }, accountOrPubkey);
-
-      signedTxn = txnBuilder.sign(rawTransaction);
-    } else {
-      const txnBuilder = new TransactionBuilderEd25519(() => {
-        const invalidSigBytes = new Uint8Array(64);
-        return new TxnBuilderTypes.Ed25519Signature(invalidSigBytes);
-      }, accountOrPubkey.toBytes());
-
-      signedTxn = txnBuilder.sign(rawTransaction);
-    }
-    return this.submitBCSSimulation(signedTxn, query);
-  }
-
-  /**
-   * Submits a signed transaction to the endpoint that takes BCS payload
-   *
-   * @param signedTxn A BCS transaction representation
-   * @returns Transaction that is accepted and submitted to mempool
-   */
-  @parseApiError
-  async submitSignedBCSTransaction(signedTxn: Uint8Array): Promise<Gen.PendingTransaction> {
-    // Need to construct a customized post request for transactions in BCS payload
-    return this.client.request.request<Gen.PendingTransaction>({
-      url: "/transactions",
-      method: "POST",
-      body: signedTxn,
-      mediaType: "application/x.aptos.signed_transaction+bcs",
-    });
-  }
-
-  /**
-   * Submits the BCS serialization of a signed transaction to the simulation endpoint.
-   *
-   * @param bcsBody The output of `generateBCSSimulation`.
-   * @param query?.estimateGasUnitPrice If set to true, the gas unit price in the
-   * transaction will be ignored and the estimated value will be used.
-   * @param query?.estimateMaxGasAmount If set to true, the max gas value in the
-   * transaction will be ignored and the maximum possible gas will be used.
-   * @param query?.estimatePrioritizedGasUnitPrice If set to true, the transaction will use a higher price than the
-   * original estimate.
-   * @returns Simulation result in the form of UserTransaction.
-   */
-  @parseApiError
-  async submitBCSSimulation(
-    bcsBody: Uint8Array,
-    query?: {
-      estimateGasUnitPrice?: boolean;
-      estimateMaxGasAmount?: boolean;
-      estimatePrioritizedGasUnitPrice?: boolean;
-    },
-  ): Promise<Gen.UserTransaction[]> {
-    // Need to construct a customized post request for transactions in BCS payload.
-    const queryParams = {
-      estimate_gas_unit_price: query?.estimateGasUnitPrice ?? false,
-      estimate_max_gas_amount: query?.estimateMaxGasAmount ?? false,
-      estimate_prioritized_gas_unit_price: query?.estimatePrioritizedGasUnitPrice ?? false,
-    };
-    return this.client.request.request<Gen.UserTransaction[]>({
-      url: "/transactions/simulate",
-      query: queryParams,
-      method: "POST",
-      body: bcsBody,
-      mediaType: "application/x.aptos.signed_transaction+bcs",
-    });
-  }
-
-  /**
-   * Queries on-chain transactions. This function will not return pending
-   * transactions. For that, use `getTransactionsByHash`.
-   *
-   * @param query Optional pagination object
-   * @param query.start The start transaction version of the page. Default is the latest ledger version
-   * @param query.limit The max number of transactions should be returned for the page. Default is 25
-   * @returns Array of on-chain transactions
-   */
-  @parseApiError
-  async getTransactions(query?: PaginationArgs): Promise<Gen.Transaction[]> {
-    return this.client.transactions.getTransactions(query?.start?.toString(), query?.limit);
-  }
-
-  /**
-   * @param txnHash - Transaction hash should be hex-encoded bytes string with 0x prefix.
-   * @returns Transaction from mempool (pending) or on-chain (committed) transaction
-   */
-  @parseApiError
-  async getTransactionByHash(txnHash: string): Promise<Gen.Transaction> {
-    return this.client.transactions.getTransactionByHash(txnHash);
-  }
-
-  /**
-   * @param txnVersion - Transaction version is an uint64 number.
-   * @returns On-chain transaction. Only on-chain transactions have versions, so this
-   * function cannot be used to query pending transactions.
-   */
-  @parseApiError
-  async getTransactionByVersion(txnVersion: AnyNumber): Promise<Gen.Transaction> {
-    return this.client.transactions.getTransactionByVersion(txnVersion.toString());
-  }
-
-  /**
-   * Defines if specified transaction is currently in pending state
-   * @param txnHash A hash of transaction
-   *
-   * To create a transaction hash:
-   *
-   * 1. Create hash message bytes: "Aptos::Transaction" bytes + BCS bytes of Transaction.
-   * 2. Apply hash algorithm SHA3-256 to the hash message bytes.
-   * 3. Hex-encode the hash bytes with 0x prefix.
-   *
-   * @returns `true` if transaction is in pending state and `false` otherwise
-   */
-  async transactionPending(txnHash: string): Promise<boolean> {
-    try {
-      const response = await this.client.transactions.getTransactionByHash(txnHash);
-      return response.type === "pending_transaction";
-    } catch (e: any) {
-      if (e?.status === 404) {
-        return true;
-      }
-      throw e;
-    }
-  }
-
-  /**
-   * Wait for a transaction to move past pending state.
-   *
-   * There are 4 possible outcomes:
-   * 1. Transaction is processed and successfully committed to the blockchain.
-   * 2. Transaction is rejected for some reason, and is therefore not committed
-   *    to the blockchain.
-   * 3. Transaction is committed but execution failed, meaning no changes were
-   *    written to the blockchain state.
-   * 4. Transaction is not processed within the specified timeout.
-   *
-   * In case 1, this function resolves with the transaction response returned
-   * by the API.
-   *
-   * In case 2, the function will throw an ApiError, likely with an HTTP status
-   * code indicating some problem with the request (e.g. 400).
-   *
-   * In case 3, if `checkSuccess` is false (the default), this function returns
-   * the transaction response just like in case 1, in which the `success` field
-   * will be false. If `checkSuccess` is true, it will instead throw a
-   * FailedTransactionError.
-   *
-   * In case 4, this function throws a WaitForTransactionError.
-   *
-   * @param txnHash The hash of a transaction previously submitted to the blockchain.
-   * @param extraArgs.timeoutSecs Timeout in seconds. Defaults to 20 seconds.
-   * @param extraArgs.checkSuccess See above. Defaults to false.
-   * @returns See above.
-   *
-   * @example
-   * ```
-   * const rawTransaction = await this.generateRawTransaction(sender.address(), payload, extraArgs);
-   * const bcsTxn = AptosClient.generateBCSTransaction(sender, rawTransaction);
-   * const pendingTransaction = await this.submitSignedBCSTransaction(bcsTxn);
-   * const transasction = await this.aptosClient.waitForTransactionWithResult(pendingTransaction.hash);
-   * ```
-   */
-  async waitForTransactionWithResult(
-    txnHash: string,
-    extraArgs?: { timeoutSecs?: number; checkSuccess?: boolean },
-  ): Promise<Gen.Transaction> {
-    const timeoutSecs = extraArgs?.timeoutSecs ?? DEFAULT_TXN_TIMEOUT_SEC;
-    const checkSuccess = extraArgs?.checkSuccess ?? false;
-
-    let isPending = true;
-    let count = 0;
-    let lastTxn: Gen.Transaction | undefined;
-    while (isPending) {
-      if (count >= timeoutSecs) {
-        break;
-      }
-      try {
-        // eslint-disable-next-line no-await-in-loop
-        lastTxn = await this.client.transactions.getTransactionByHash(txnHash);
-        isPending = lastTxn.type === "pending_transaction";
-        if (!isPending) {
-          break;
-        }
-      } catch (e) {
-        // In short, this means we will retry if it was an ApiError and the code was 404 or 5xx.
-        const isApiError = e instanceof Gen.ApiError;
-        const isRequestError = isApiError && e.status !== 404 && e.status >= 400 && e.status < 500;
-        if (!isApiError || isRequestError) {
-          throw e;
-        }
-      }
-      // eslint-disable-next-line no-await-in-loop
-      await sleep(1000);
-      count += 1;
-    }
-
-    // There is a chance that lastTxn is still undefined. Let's throw some error here
-    if (lastTxn === undefined) {
-      throw new Error(`Waiting for transaction ${txnHash} failed`);
-    }
-
-    if (isPending) {
-      throw new WaitForTransactionError(
-        `Waiting for transaction ${txnHash} timed out after ${timeoutSecs} seconds`,
-        lastTxn,
-      );
-    }
-    if (!checkSuccess) {
-      return lastTxn;
-    }
-    if (!(lastTxn as any)?.success) {
-      throw new FailedTransactionError(
-        `Transaction ${txnHash} committed to the blockchain but execution failed`,
-        lastTxn,
-      );
-    }
-    return lastTxn;
-  }
-
-  /**
-   * This function works the same as `waitForTransactionWithResult` except it
-   * doesn't return the transaction in those cases, it returns nothing. For
-   * more information, see the documentation for `waitForTransactionWithResult`.
-   */
-  async waitForTransaction(
-    txnHash: string,
-    extraArgs?: { timeoutSecs?: number; checkSuccess?: boolean },
-  ): Promise<void> {
-    await this.waitForTransactionWithResult(txnHash, extraArgs);
-  }
-
-  /**
-   * Queries the latest ledger information
-   * @returns Latest ledger information
-   * @example Example of returned data
-   * ```
-   * {
-   *   chain_id: 15,
-   *   epoch: 6,
-   *   ledgerVersion: "2235883",
-   *   ledger_timestamp:"1654580922321826"
-   * }
-   * ```
-   */
-  @parseApiError
-  async getLedgerInfo(): Promise<Gen.IndexResponse> {
-    return this.client.general.getLedgerInfo();
-  }
-
-  /**
-   * @returns Current chain id
-   */
-  @Memoize()
-  async getChainId(): Promise<number> {
-    const result = await this.getLedgerInfo();
-    return result.chain_id;
-  }
-
-  /**
-   * Gets a table item for a table identified by the handle and the key for the item.
-   * Key and value types need to be passed in to help with key serialization and value deserialization.
-   * @param handle A pointer to where that table is stored
-   * @param data Object, that describes table item
-   * @param data.key_type Move type of table key (e.g. `vector<u8>`)
-   * @param data.value_type Move type of table value (e.g. `u64`)
-   * @param data.key Value of table key
-   * @returns Table item value rendered in JSON
-   */
-  @parseApiError
-  async getTableItem(handle: string, data: Gen.TableItemRequest, query?: { ledgerVersion?: AnyNumber }): Promise<any> {
-    const tableItem = await this.client.tables.getTableItem(handle, data, query?.ledgerVersion?.toString());
-    return tableItem;
-  }
-
-  /**
-   * Generates a raw transaction out of a transaction payload
-   * @param accountFrom
-   * @param payload
-   * @param extraArgs
-   * @returns A raw transaction object
-   */
-  async generateRawTransaction(
-    accountFrom: HexString,
-    payload: TxnBuilderTypes.TransactionPayload,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<TxnBuilderTypes.RawTransaction> {
-    const [{ sequence_number: sequenceNumber }, chainId, { gas_estimate: gasEstimate }] = await Promise.all([
-      this.getAccount(accountFrom),
-      this.getChainId(),
-      extraArgs?.gasUnitPrice ? Promise.resolve({ gas_estimate: extraArgs.gasUnitPrice }) : this.estimateGasPrice(),
-    ]);
-
-    const { maxGasAmount, gasUnitPrice, expireTimestamp } = {
-      maxGasAmount: BigInt(DEFAULT_MAX_GAS_AMOUNT),
-      gasUnitPrice: BigInt(gasEstimate),
-      expireTimestamp: BigInt(Math.floor(Date.now() / 1000) + DEFAULT_TXN_EXP_SEC_FROM_NOW),
-      ...extraArgs,
-    };
-
-    return new TxnBuilderTypes.RawTransaction(
-      TxnBuilderTypes.AccountAddress.fromHex(accountFrom),
-      BigInt(sequenceNumber),
-      payload,
-      maxGasAmount,
-      gasUnitPrice,
-      expireTimestamp,
-      new TxnBuilderTypes.ChainId(chainId),
-    );
-  }
-
-  /**
-   * Helper for generating, signing, and submitting a transaction.
-   *
-   * @param sender AptosAccount of transaction sender.
-   * @param payload Transaction payload.
-   * @param extraArgs Extra args for building the transaction payload.
-   * @returns The transaction response from the API.
-   */
-  async generateSignSubmitTransaction(
-    sender: AptosAccount,
-    payload: TxnBuilderTypes.TransactionPayload,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    // :!:>generateSignSubmitTransactionInner
-    const rawTransaction = await this.generateRawTransaction(sender.address(), payload, extraArgs);
-    const bcsTxn = AptosClient.generateBCSTransaction(sender, rawTransaction);
-    const pendingTransaction = await this.submitSignedBCSTransaction(bcsTxn);
-    return pendingTransaction.hash;
-    // <:!:generateSignSubmitTransactionInner
-  }
-
-  /**
-   * Publishes a move package. `packageMetadata` and `modules` can be generated with command
-   * `aptos move compile --save-metadata [ --included-artifacts=<...> ]`.
-   * @param sender
-   * @param packageMetadata package metadata bytes
-   * @param modules bytecodes of modules
-   * @param extraArgs
-   * @returns Transaction hash
-   */
-  async publishPackage(
-    sender: AptosAccount,
-    packageMetadata: Bytes,
-    modules: Seq<TxnBuilderTypes.Module>,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<string> {
-    const codeSerializer = new Serializer();
-    serializeVector(modules, codeSerializer);
-
-    const payload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x1::code",
-        "publish_package_txn",
-        [],
-        [bcsSerializeBytes(packageMetadata), codeSerializer.getBytes()],
-      ),
-    );
-
-    return this.generateSignSubmitTransaction(sender, payload, extraArgs);
-  }
-
-  /**
-   * Helper for generating, submitting, and waiting for a transaction, and then
-   * checking whether it was committed successfully. Under the hood this is just
-   * `generateSignSubmitTransaction` and then `waitForTransactionWithResult`, see
-   * those for information about the return / error semantics of this function.
-   */
-  async generateSignSubmitWaitForTransaction(
-    sender: AptosAccount,
-    payload: TxnBuilderTypes.TransactionPayload,
-    extraArgs?: OptionalTransactionArgs & {
-      checkSuccess?: boolean;
-      timeoutSecs?: number;
-    },
-  ): Promise<Gen.Transaction> {
-    const txnHash = await this.generateSignSubmitTransaction(sender, payload, extraArgs);
-    return this.waitForTransactionWithResult(txnHash, extraArgs);
-  }
-
-  @parseApiError
-  @Memoize({
-    ttlMs: 5 * 60 * 1000, // cache result for 5min
-    tags: ["gas_estimates"],
-  })
-  async estimateGasPrice(): Promise<Gen.GasEstimation> {
-    return this.client.transactions.estimateGasPrice();
-  }
-
-  @parseApiError
-  async estimateMaxGasAmount(forAccount: MaybeHexString): Promise<Uint64> {
-    // Only Aptos utility coin is accepted as gas
-    const typeTag = `0x1::coin::CoinStore<${APTOS_COIN}>`;
-
-    const [{ gas_estimate: gasUnitPrice }, resources] = await Promise.all([
-      this.estimateGasPrice(),
-      this.getAccountResources(forAccount),
-    ]);
-
-    const accountResource = resources.find((r) => r.type === typeTag);
-    const balance = BigInt((accountResource!.data as any).coin.value);
-    return balance / BigInt(gasUnitPrice);
-  }
-
-  /**
-   * Rotate an account's auth key. After rotation, only the new private key can be used to sign txns for
-   * the account.
-   * WARNING: You must create a new instance of AptosAccount after using this function.
-   * @param forAccount Account of which the auth key will be rotated
-   * @param toPrivateKeyBytes New private key
-   * @param extraArgs Extra args for building the transaction payload.
-   * @returns PendingTransaction
-   */
-  async rotateAuthKeyEd25519(
-    forAccount: AptosAccount,
-    toPrivateKeyBytes: Uint8Array,
-    extraArgs?: OptionalTransactionArgs,
-  ): Promise<Gen.PendingTransaction> {
-    const { sequence_number: sequenceNumber, authentication_key: authKey } = await this.getAccount(
-      forAccount.address(),
-    );
-
-    const helperAccount = new AptosAccount(toPrivateKeyBytes);
-
-    const challenge = new TxnBuilderTypes.RotationProofChallenge(
-      TxnBuilderTypes.AccountAddress.CORE_CODE_ADDRESS,
-      "account",
-      "RotationProofChallenge",
-      BigInt(sequenceNumber),
-      TxnBuilderTypes.AccountAddress.fromHex(forAccount.address()),
-      new TxnBuilderTypes.AccountAddress(new HexString(authKey).toUint8Array()),
-      helperAccount.pubKey().toUint8Array(),
-    );
-
-    const challengeHex = HexString.fromUint8Array(bcsToBytes(challenge));
-
-    const proofSignedByCurrentPrivateKey = forAccount.signHexString(challengeHex);
-
-    const proofSignedByNewPrivateKey = helperAccount.signHexString(challengeHex);
-
-    const payload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x1::account",
-        "rotate_authentication_key",
-        [],
-        [
-          bcsSerializeU8(0), // ed25519 scheme
-          bcsSerializeBytes(forAccount.pubKey().toUint8Array()),
-          bcsSerializeU8(0), // ed25519 scheme
-          bcsSerializeBytes(helperAccount.pubKey().toUint8Array()),
-          bcsSerializeBytes(proofSignedByCurrentPrivateKey.toUint8Array()),
-          bcsSerializeBytes(proofSignedByNewPrivateKey.toUint8Array()),
-        ],
-      ),
-    );
-
-    const rawTransaction = await this.generateRawTransaction(forAccount.address(), payload, extraArgs);
-    const bcsTxn = AptosClient.generateBCSTransaction(forAccount, rawTransaction);
-    return this.submitSignedBCSTransaction(bcsTxn);
-  }
-
-  /**
-   * Lookup the original address by the current derived address
-   * @param addressOrAuthKey
-   * @returns original address
-   */
-  async lookupOriginalAddress(addressOrAuthKey: MaybeHexString): Promise<HexString> {
-    const resource = await this.getAccountResource("0x1", "0x1::account::OriginatingAddress");
-
-    const {
-      address_map: { handle },
-    } = resource.data as any;
-
-    const origAddress = await this.getTableItem(handle, {
-      key_type: "address",
-      value_type: "address",
-      key: HexString.ensure(addressOrAuthKey).hex(),
-    });
-
-    return new HexString(origAddress);
-  }
-
-  /**
-   * Get block by height
-   *
-   * @param blockHeight Block height to lookup.  Starts at 0
-   * @param withTransactions If set to true, include all transactions in the block
-   *
-   * @returns Block
-   */
-  @parseApiError
-  async getBlockByHeight(blockHeight: number, withTransactions?: boolean): Promise<Gen.Block> {
-    return this.client.blocks.getBlockByHeight(blockHeight, withTransactions);
-  }
-
-  /**
-   * Get block by block transaction version
-   *
-   * @param version Ledger version to lookup block information for
-   * @param withTransactions If set to true, include all transactions in the block
-   *
-   * @returns Block
-   */
-  @parseApiError
-  async getBlockByVersion(version: number, withTransactions?: boolean): Promise<Gen.Block> {
-    return this.client.blocks.getBlockByVersion(version, withTransactions);
-  }
-
-  /**
-   * Call for a move view function
-   *
-   * @param payload Transaction payload
-   * @param version (optional) Ledger version to lookup block information for
-   *
-   * @returns MoveValue[]
-   */
-  @parseApiError
-  async view(payload: Gen.ViewRequest, ledger_version?: string): Promise<Gen.MoveValue[]> {
-    return this.client.view.view(payload, ledger_version);
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  clearCache(tags: string[]) {
-    clear(tags);
-  }
-}
-
-export class ApiError extends Error {
-  constructor(
-    public readonly status: number,
-    public readonly message: string,
-    public readonly errorCode?: string,
-    public readonly vmErrorCode?: string,
-  ) {
-    super(message);
-  }
-}
-
-/**
- * This error is used by `waitForTransactionWithResult` when waiting for a
- * transaction times out.
- */
-export class WaitForTransactionError extends Error {
-  public readonly lastSubmittedTransaction: Gen.Transaction | undefined;
-
-  constructor(message: string, lastSubmittedTransaction: Gen.Transaction | undefined) {
-    super(message);
-    this.lastSubmittedTransaction = lastSubmittedTransaction;
-  }
-}
-
-/**
- * This error is used by `waitForTransactionWithResult` if `checkSuccess` is true.
- * See that function for more information.
- */
-export class FailedTransactionError extends Error {
-  public readonly transaction: Gen.Transaction;
-
-  constructor(message: string, transaction: Gen.Transaction) {
-    super(message);
-    this.transaction = transaction;
-  }
-}
-
-/**
- * Creates a decorator to parse Gen.ApiError and return a wrapped error that is more developer friendly
- */
-function parseApiError(target: unknown, propertyKey: string, descriptor: PropertyDescriptor) {
-  const childFunction = descriptor.value;
-  // eslint-disable-next-line no-param-reassign
-  descriptor.value = async function wrapper(...args: any[]) {
-    try {
-      // We need to explicitly await here so that the function is called and
-      // potentially throws an error. If we just return without awaiting, the
-      // promise is returned directly and the catch block cannot trigger.
-      const res = await childFunction.apply(this, [...args]);
-      return res;
-    } catch (e) {
-      if (e instanceof Gen.ApiError) {
-        throw new ApiError(
-          e.status,
-          JSON.stringify({ message: e.message, ...e.body }),
-          e.body?.error_code,
-          e.body?.vm_error_code,
-        );
-      }
-      throw e;
-    }
-  };
-  return descriptor;
-}
diff --git a/m1/JavaScript-client/src/providers/index.ts b/m1/JavaScript-client/src/providers/index.ts
deleted file mode 100644
index a6528d3ca..000000000
--- a/m1/JavaScript-client/src/providers/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./indexer";
-export * from "./aptos_client";
-export * from "./provider";
diff --git a/m1/JavaScript-client/src/providers/indexer.ts b/m1/JavaScript-client/src/providers/indexer.ts
deleted file mode 100644
index 1aed15808..000000000
--- a/m1/JavaScript-client/src/providers/indexer.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-import axios from "axios";
-
-import { AnyNumber } from "../bcs/types";
-import { HexString, MaybeHexString } from "../utils";
-import {
-  GetAccountTokensCountQuery,
-  GetAccountCoinsDataQuery,
-  GetAccountCurrentTokensQuery,
-  GetAccountTransactionsCountQuery,
-  GetAccountTransactionsDataQuery,
-  GetCurrentDelegatorBalancesCountQuery,
-  GetDelegatedStakingActivitiesQuery,
-  GetIndexerLedgerInfoQuery,
-  GetTokenActivitiesCountQuery,
-  GetTokenActivitiesQuery,
-  GetTokenDataQuery,
-  GetTokenOwnersDataQuery,
-  GetTopUserTransactionsQuery,
-  GetUserTransactionsQuery,
-} from "../indexer/generated/operations";
-import {
-  GetAccountTokensCount,
-  GetAccountCoinsData,
-  GetAccountCurrentTokens,
-  GetAccountTransactionsCount,
-  GetAccountTransactionsData,
-  GetCurrentDelegatorBalancesCount,
-  GetDelegatedStakingActivities,
-  GetIndexerLedgerInfo,
-  GetTokenActivities,
-  GetTokenActivitiesCount,
-  GetTokenData,
-  GetTokenOwnersData,
-  GetTopUserTransactions,
-  GetUserTransactions,
-} from "../indexer/generated/queries";
-
-/**
- * Controls the number of results that are returned and the starting position of those results.
- * limit specifies the maximum number of items or records to return in a query result.
- * offset parameter specifies the starting position of the query result within the set of data.
- * For example, if you want to retrieve records 11-20,
- * you would set the offset parameter to 10 (i.e., the index of the first record to retrieve is 10)
- * and the limit parameter to 10 (i.e., the number of records to retrieve is 10))
- */
-interface PaginationArgs {
-  offset?: AnyNumber;
-  limit?: number;
-}
-
-type GraphqlQuery = {
-  query: string;
-  variables?: {};
-};
-/**
- * Provides methods for retrieving data from Aptos Indexer.
- * For more detailed Queries specification see
- * {@link https://cloud.hasura.io/public/graphiql?endpoint=https://indexer.mainnet.aptoslabs.com/v1/graphql}
- */
-export class IndexerClient {
-  endpoint: string;
-
-  /**
-   * @param endpoint URL of the Aptos Indexer API endpoint.
-   */
-  constructor(endpoint: string) {
-    this.endpoint = endpoint;
-  }
-
-  /**
-   * Indexer only accepts address in the long format, i.e a 66 chars long -> 0x<64 chars>
-   * This method makes sure address is 66 chars long.
-   * @param address
-   */
-  static validateAddress(address: string): void {
-    if (address.length < 66) {
-      throw new Error("Address needs to be 66 chars long.");
-    }
-  }
-
-  /**
-   * Builds a axios client call to fetch data from Aptos Indexer.
-   *
-   * @param graphqlQuery A GraphQL query to pass in the `data` axios call.
-   */
-  async queryIndexer<T>(graphqlQuery: GraphqlQuery): Promise<T> {
-    const { data } = await axios.post(this.endpoint, graphqlQuery);
-    if (data.errors) {
-      throw new Error(`Indexer data error ${JSON.stringify(data.errors, null, " ")}`);
-    }
-    return data.data;
-  }
-
-  /**
-   * Queries Indexer Ledger Info
-   *
-   * @returns GetLedgerInfoQuery response type
-   */
-  async getIndexerLedgerInfo(): Promise<GetIndexerLedgerInfoQuery> {
-    const graphqlQuery = {
-      query: GetIndexerLedgerInfo,
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries an Aptos account's NFTs by owner address
-   *
-   * @param ownerAddress Hex-encoded 32 byte Aptos account address
-   * @returns GetAccountCurrentTokensQuery response type
-   */
-  async getAccountNFTs(ownerAddress: MaybeHexString, options?: PaginationArgs): Promise<GetAccountCurrentTokensQuery> {
-    const address = HexString.ensure(ownerAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetAccountCurrentTokens,
-      variables: { address, offset: options?.offset, limit: options?.limit },
-    };
-
-    return this.queryIndexer<GetAccountCurrentTokensQuery>(graphqlQuery);
-  }
-
-  /**
-   * Queries a token activities by token id hash
-   *
-   * @param idHash token id hash
-   * @returns GetTokenActivitiesQuery response type
-   */
-  async getTokenActivities(idHash: string, options?: PaginationArgs): Promise<GetTokenActivitiesQuery> {
-    const graphqlQuery = {
-      query: GetTokenActivities,
-      variables: { idHash, offset: options?.offset, limit: options?.limit },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries an account coin data
-   *
-   * @param ownerAddress Owner address
-   * @returns GetAccountCoinsDataQuery response type
-   */
-  async getAccountCoinsData(ownerAddress: MaybeHexString, options?: PaginationArgs): Promise<GetAccountCoinsDataQuery> {
-    const address = HexString.ensure(ownerAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetAccountCoinsData,
-      variables: { owner_address: address, offset: options?.offset, limit: options?.limit },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Gets the count of tokens owned by an account
-   *
-   * @param ownerAddress Owner address
-   * @returns AccountTokensCountQuery response type
-   */
-  async getAccountTokensCount(ownerAddress: MaybeHexString): Promise<GetAccountTokensCountQuery> {
-    const address = HexString.ensure(ownerAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetAccountTokensCount,
-      variables: { owner_address: address },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Gets the count of transactions submitted by an account
-   *
-   * @param address Account address
-   * @returns GetAccountTransactionsCountQuery response type
-   */
-  async getAccountTransactionsCount(accountAddress: MaybeHexString): Promise<GetAccountTransactionsCountQuery> {
-    const address = HexString.ensure(accountAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetAccountTransactionsCount,
-      variables: { address },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries an account transactions data
-   *
-   * @param address Account address
-   * @returns GetAccountTransactionsDataQuery response type
-   */
-  async getAccountTransactionsData(
-    accountAddress: MaybeHexString,
-    options?: PaginationArgs,
-  ): Promise<GetAccountTransactionsDataQuery> {
-    const address = HexString.ensure(accountAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetAccountTransactionsData,
-      variables: { address, offset: options?.offset, limit: options?.limit },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries delegated staking activities
-   *
-   * @param delegatorAddress Delegator address
-   * @param poolAddress Pool address
-   * @returns GetDelegatedStakingActivitiesQuery response type
-   */
-  async getDelegatedStakingActivities(
-    delegatorAddress: MaybeHexString,
-    poolAddress: MaybeHexString,
-  ): Promise<GetDelegatedStakingActivitiesQuery> {
-    const delegator = HexString.ensure(delegatorAddress).hex();
-    const pool = HexString.ensure(poolAddress).hex();
-    IndexerClient.validateAddress(delegator);
-    IndexerClient.validateAddress(pool);
-    const graphqlQuery = {
-      query: GetDelegatedStakingActivities,
-      variables: {
-        delegatorAddress: delegator,
-        poolAddress: pool,
-      },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Gets the count of token's activities
-   *
-   * @param tokenId Token ID
-   * @returns GetTokenActivitiesCountQuery response type
-   */
-  async getTokenActivitiesCount(tokenId: string): Promise<GetTokenActivitiesCountQuery> {
-    const graphqlQuery = {
-      query: GetTokenActivitiesCount,
-      variables: { token_id: tokenId },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries token data
-   *
-   * @param tokenId Token ID
-   * @returns GetTokenDataQuery response type
-   */
-  async getTokenData(tokenId: string): Promise<GetTokenDataQuery> {
-    const graphqlQuery = {
-      query: GetTokenData,
-      variables: { token_id: tokenId },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries token owners data
-   *
-   * @param tokenId Token ID
-   * @param propertyVersion Property version
-   * @returns GetTokenOwnersDataQuery response type
-   */
-  async getTokenOwnersData(tokenId: string, propertyVersion: number): Promise<GetTokenOwnersDataQuery> {
-    const graphqlQuery = {
-      query: GetTokenOwnersData,
-      variables: { token_id: tokenId, property_version: propertyVersion },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries top user transactions
-   *
-   * @param limit
-   * @returns GetTopUserTransactionsQuery response type
-   */
-  async getTopUserTransactions(limit: number): Promise<GetTopUserTransactionsQuery> {
-    const graphqlQuery = {
-      query: GetTopUserTransactions,
-      variables: { limit },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries top user transactions
-   *
-   * @returns GetUserTransactionsQuery response type
-   */
-  async getUserTransactions(startVersion?: number, options?: PaginationArgs): Promise<GetUserTransactionsQuery> {
-    const graphqlQuery = {
-      query: GetUserTransactions,
-      variables: { start_version: startVersion, offset: options?.offset, limit: options?.limit },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-
-  /**
-   * Queries current delegator balances count
-   *
-   * @returns GetCurrentDelegatorBalancesCountQuery response type
-   */
-  async getCurrentDelegatorBalancesCount(poolAddress: MaybeHexString): Promise<GetCurrentDelegatorBalancesCountQuery> {
-    const address = HexString.ensure(poolAddress).hex();
-    IndexerClient.validateAddress(address);
-    const graphqlQuery = {
-      query: GetCurrentDelegatorBalancesCount,
-      variables: { poolAddress: address },
-    };
-    return this.queryIndexer(graphqlQuery);
-  }
-}
diff --git a/m1/JavaScript-client/src/providers/provider.ts b/m1/JavaScript-client/src/providers/provider.ts
deleted file mode 100644
index 23de25271..000000000
--- a/m1/JavaScript-client/src/providers/provider.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { AptosClient } from "./aptos_client";
-import { IndexerClient } from "./indexer";
-
-import * as Gen from "../generated/index";
-import { CustomEndpoints, Network, NetworkToIndexerAPI, NetworkToNodeAPI } from "../utils";
-
-type NetworkWithCustom = Network | "CUSTOM";
-/**
- * Builds a Provider class with an aptos client configured to connect to an Aptos node
- * and indexer client configured to connect to Aptos Indexer.
- *
- * It creates AptosClient and IndexerClient instances based on the network or custom endpoints provided.
- *
- * This class holds both AptosClient and IndexerClient classes's methods and properties so we
- * can instantiate the Provider class and use it to query full node and/or Indexer.
- *
- * @example An example of how to use this class
- * ```
- * const provider = new Provider(Network.DEVNET)
- * const account = await provider.getAccount("0x123");
- * const accountNFTs = await provider.getAccountNFTs("0x123");
- * ```
- *
- * @param network enum of type Network - MAINNET | TESTNET | DEVENET or custom endpoints of type CustomEndpoints
- * @param config AptosClient config arg - additional configuration options for the generated Axios client.
- */
-export class Provider {
-  aptosClient: AptosClient;
-
-  indexerClient: IndexerClient;
-
-  network: NetworkWithCustom;
-
-  constructor(
-    network: Network | CustomEndpoints,
-    config?: Partial<Gen.OpenAPIConfig>,
-    doNotFixNodeUrl: boolean = false,
-  ) {
-    let fullNodeUrl = null;
-    let indexerUrl = null;
-
-    if (typeof network === "object" && isCustomEndpoints(network)) {
-      fullNodeUrl = network.fullnodeUrl;
-      indexerUrl = network.indexerUrl;
-      this.network = "CUSTOM";
-    } else {
-      fullNodeUrl = NetworkToNodeAPI[network];
-      indexerUrl = NetworkToIndexerAPI[network];
-      this.network = network;
-    }
-
-    if (!fullNodeUrl || !indexerUrl) {
-      throw new Error("network is not provided");
-    }
-
-    this.aptosClient = new AptosClient(fullNodeUrl, config, doNotFixNodeUrl);
-    this.indexerClient = new IndexerClient(indexerUrl);
-  }
-}
-
-export interface Provider extends AptosClient, IndexerClient {}
-
-/**
-In TypeScript, we can’t inherit or extend from more than one class,
-Mixins helps us to get around that by creating a partial classes 
-that we can combine to form a single class that contains all the methods and properties from the partial classes.
-{@link https://www.typescriptlang.org/docs/handbook/mixins.html#alternative-pattern}
-
-Here, we combine AptosClient and IndexerClient classes into one Provider class that holds all 
-methods and properties from both classes.
-*/
-function applyMixin(targetClass: any, baseClass: any, baseClassProp: string) {
-  Object.getOwnPropertyNames(baseClass.prototype).forEach((propertyName) => {
-    const propertyDescriptor = Object.getOwnPropertyDescriptor(baseClass.prototype, propertyName);
-    if (!propertyDescriptor) return;
-    // eslint-disable-next-line func-names
-    propertyDescriptor.value = function (...args: any) {
-      return (this as any)[baseClassProp][propertyName](...args);
-    };
-    Object.defineProperty(targetClass.prototype, propertyName, propertyDescriptor);
-  });
-}
-
-applyMixin(Provider, AptosClient, "aptosClient");
-applyMixin(Provider, IndexerClient, "indexerClient");
-
-// use exhaustive type predicates
-function isCustomEndpoints(network: CustomEndpoints): network is CustomEndpoints {
-  return (
-    network.fullnodeUrl !== undefined &&
-    typeof network.fullnodeUrl === "string" &&
-    network.indexerUrl !== undefined &&
-    typeof network.indexerUrl === "string"
-  );
-}
diff --git a/m1/JavaScript-client/src/tests/e2e/ans_client.test.ts b/m1/JavaScript-client/src/tests/e2e/ans_client.test.ts
deleted file mode 100644
index 641058e51..000000000
--- a/m1/JavaScript-client/src/tests/e2e/ans_client.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { AptosAccount } from "../../account";
-import { AnsClient } from "../../plugins/ans_client";
-import { Provider } from "../../providers";
-import { HexString, Network } from "../../utils";
-import { ANS_OWNER_ADDRESS, ANS_OWNER_PK, getFaucetClient, longTestTimeout, NODE_URL } from "../unit/test_helper.test";
-
-const alice = new AptosAccount();
-const ACCOUNT_ADDRESS = alice.address().hex();
-// generate random name so we can run the test against local tesnet without the need to re-run it each time.
-// This will produce a string anywhere between zero and 12 characters long, usually 11 characters, only lower-case and numbers
-const DOMAIN_NAME = Math.random().toString(36).slice(2);
-
-describe("ANS", () => {
-  beforeAll(async () => {
-    const faucetClient = getFaucetClient();
-    await faucetClient.fundAccount(alice.address(), 100_000_000_000);
-  }, longTestTimeout);
-
-  test("fails to create a new ANS class instance", () => {
-    const provider = new Provider({ fullnodeUrl: "full-node-url", indexerUrl: "indexer-url" });
-    expect(() => new AnsClient(provider)).toThrow("Error: For custom providers, you must pass in a contract address");
-  });
-
-  test("creates a new ANS class instance", () => {
-    const provider = new Provider({ fullnodeUrl: "full-node-url", indexerUrl: "indexer-url" });
-    const ans_client = new AnsClient(provider, ANS_OWNER_ADDRESS);
-    expect(ans_client).toHaveProperty("contractAddress");
-  });
-
-  test("sets the contract address to be the provided one", () => {
-    const provider = new Provider({ fullnodeUrl: "full-node-url", indexerUrl: "indexer-url" });
-    const ans_client = new AnsClient(provider, ANS_OWNER_ADDRESS);
-    expect(ans_client.contractAddress).toEqual(ANS_OWNER_ADDRESS);
-  });
-
-  test("sets the contract address to be the one that matches the provided node url", () => {
-    const provider = new Provider(Network.TESTNET);
-    const ans_client = new AnsClient(provider, ANS_OWNER_ADDRESS);
-    expect(ans_client.contractAddress).toEqual("0x5f8fd2347449685cf41d4db97926ec3a096eaf381332be4f1318ad4d16a8497c");
-  });
-
-  test(
-    "init reverse lookup registry for contract admin",
-    async () => {
-      const owner = new AptosAccount(new HexString(ANS_OWNER_PK).toUint8Array());
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans_client = new AnsClient(provider, ANS_OWNER_ADDRESS);
-      const txnHash = await ans_client.initReverseLookupRegistry(owner);
-      await provider.waitForTransactionWithResult(txnHash, { checkSuccess: true });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "mint name",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const txnHash = await ans.mintAptosName(alice, DOMAIN_NAME);
-      await provider.waitForTransactionWithResult(txnHash, { checkSuccess: true });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "get name by address",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const name = await ans.getPrimaryNameByAddress(ACCOUNT_ADDRESS);
-      expect(name).toEqual(DOMAIN_NAME);
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "get address by name",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(DOMAIN_NAME);
-      expect(address).toEqual(ACCOUNT_ADDRESS);
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "get address by name with .apt",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(`${DOMAIN_NAME}.apt`);
-      expect(address).toEqual(ACCOUNT_ADDRESS);
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "get address by subdomain_name",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(`sub.${DOMAIN_NAME}`);
-      expect(address).toBeNull;
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "get address by subdomain_name with .apt",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(`sub.${DOMAIN_NAME}.apt`);
-      expect(address).toBeNull;
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "returns null for an invalid domain",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(`${DOMAIN_NAME}-`);
-      expect(address).toBeNull;
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "returns null for an invalid subdomain",
-    async () => {
-      const provider = new Provider({ fullnodeUrl: NODE_URL, indexerUrl: NODE_URL });
-      const ans = new AnsClient(provider, ANS_OWNER_ADDRESS);
-
-      const address = await ans.getAddressByName(`sub.${DOMAIN_NAME}.apt-`);
-      expect(address).toBeNull;
-    },
-    longTestTimeout,
-  );
-});
diff --git a/m1/JavaScript-client/src/tests/e2e/aptos_client.test.ts b/m1/JavaScript-client/src/tests/e2e/aptos_client.test.ts
deleted file mode 100644
index de0a6e21c..000000000
--- a/m1/JavaScript-client/src/tests/e2e/aptos_client.test.ts
+++ /dev/null
@@ -1,658 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosClient } from "../../providers/aptos_client";
-import * as Gen from "../../generated/index";
-import { AptosAccount } from "../../account/aptos_account";
-import {
-  TxnBuilderTypes,
-  TransactionBuilderMultiEd25519,
-  TransactionBuilderRemoteABI,
-} from "../../transaction_builder";
-import { AptosToken, TokenClient } from "../../plugins";
-import { HexString } from "../../utils";
-import { getFaucetClient, longTestTimeout, NODE_URL, PROVIDER_LOCAL_NETWORK_CONFIG } from "../unit/test_helper.test";
-import { bcsSerializeUint64, bcsToBytes } from "../../bcs";
-import { AccountAddress, Ed25519PublicKey, stringStructTag, TypeTagStruct } from "../../aptos_types";
-import { Provider } from "../../providers";
-import { BCS } from "../..";
-
-const account = "0x1::account::Account";
-
-const aptosCoin = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
-
-const coinTransferFunction = "0x1::coin::transfer";
-
-test("node url empty", () => {
-  expect(() => {
-    const client = new AptosClient("");
-    client.getAccount("0x1");
-  }).toThrow("Node URL cannot be empty.");
-});
-
-test("gets genesis account", async () => {
-  const client = new AptosClient(NODE_URL);
-  const genesisAccount = await client.getAccount("0x1");
-  expect(genesisAccount.authentication_key.length).toBe(66);
-  expect(genesisAccount.sequence_number).not.toBeNull();
-});
-
-test("gets transactions", async () => {
-  const client = new AptosClient(NODE_URL);
-  const transactions = await client.getTransactions();
-  expect(transactions.length).toBeGreaterThan(0);
-});
-
-test("gets genesis resources", async () => {
-  const client = new AptosClient(NODE_URL);
-  const resources = await client.getAccountResources("0x1");
-  const accountResource = resources.find((r) => r.type === account);
-  expect(accountResource).toBeDefined();
-});
-
-test("gets the Account resource", async () => {
-  const client = new AptosClient(NODE_URL);
-  const accountResource = await client.getAccountResource("0x1", account);
-  expect(accountResource).toBeDefined();
-});
-
-test("gets ledger info", async () => {
-  const client = new AptosClient(NODE_URL);
-  const ledgerInfo = await client.getLedgerInfo();
-  expect(ledgerInfo.chain_id).toBeGreaterThan(1);
-  expect(parseInt(ledgerInfo.ledger_version, 10)).toBeGreaterThan(0);
-});
-
-test("gets account modules", async () => {
-  const client = new AptosClient(NODE_URL);
-  const modules = await client.getAccountModules("0x1");
-  const module = modules.find((r) => r.abi!.name === "aptos_coin");
-  expect(module!.abi!.address).toBe("0x1");
-});
-
-test("gets the AptosCoin module", async () => {
-  const client = new AptosClient(NODE_URL);
-  const module = await client.getAccountModule("0x1", "aptos_coin");
-  expect(module!.abi!.address).toBe("0x1");
-});
-
-test(
-  "submits bcs transaction",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    await faucetClient.fundAccount(account1.address(), 100_000_000);
-    let resources = await client.getAccountResources(account1.address());
-    let accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("100000000");
-
-    const account2 = new AptosAccount();
-    await faucetClient.fundAccount(account2.address(), 0);
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("0");
-
-    const token = new TxnBuilderTypes.TypeTagStruct(TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-
-    const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x1::coin",
-        "transfer",
-        [token],
-        [bcsToBytes(TxnBuilderTypes.AccountAddress.fromHex(account2.address())), bcsSerializeUint64(717)],
-      ),
-    );
-
-    const rawTxn = await client.generateRawTransaction(account1.address(), entryFunctionPayload);
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account1, rawTxn);
-    const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-    await client.waitForTransaction(transactionRes.hash);
-
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("717");
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits generic type bcs transaction",
-  async () => {
-    const provider = new Provider(PROVIDER_LOCAL_NETWORK_CONFIG);
-    const aptosToken = new AptosToken(provider);
-    const account1 = new AptosAccount();
-    const faucetClient = getFaucetClient();
-
-    await faucetClient.fundAccount(account1.address(), 100_000_000);
-    let resources = await provider.getAccountResources(account1.address());
-    let accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("100000000");
-
-    let tokenAddress = "";
-
-    await provider.waitForTransaction(
-      await aptosToken.createCollection(account1, "Collection description", "Collection Name", "https://aptos.dev", 5, {
-        royaltyNumerator: 10,
-        royaltyDenominator: 10,
-      }),
-    );
-    const txn = await provider.waitForTransactionWithResult(
-      await aptosToken.mint(
-        account1,
-        "Collection Name",
-        "Token Description",
-        "Token Name",
-        "https://aptos.dev/img/nyan.jpeg",
-        ["key"],
-        ["bool"],
-        ["true"],
-      ),
-      { checkSuccess: true },
-    );
-    tokenAddress = (txn as Gen.UserTransaction).events[0].data.token;
-    console.log(tokenAddress);
-
-    const token = new TxnBuilderTypes.TypeTagStruct(TxnBuilderTypes.StructTag.fromString("0x4::token::Token"));
-    const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x4::aptos_token",
-        "add_typed_property",
-        [token, new TypeTagStruct(stringStructTag)],
-        [
-          BCS.bcsToBytes(AccountAddress.fromHex(tokenAddress)),
-          BCS.bcsSerializeStr("bcsKey"),
-          BCS.bcsSerializeStr("bcs value"),
-        ],
-      ),
-    );
-    const rawTxn = await provider.generateRawTransaction(account1.address(), entryFunctionPayload);
-    const bcsTxn = AptosClient.generateBCSTransaction(account1, rawTxn);
-    const transactionRes = await provider.submitSignedBCSTransaction(bcsTxn);
-    await provider.waitForTransaction(transactionRes.hash, { checkSuccess: true });
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits transaction with remote ABI",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    await faucetClient.fundAccount(account1.address(), 100_000_000);
-    let resources = await client.getAccountResources(account1.address());
-    let accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("100000000");
-
-    const account2 = new AptosAccount();
-    await faucetClient.fundAccount(account2.address(), 0);
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("0");
-
-    const builder = new TransactionBuilderRemoteABI(client, { sender: account1.address() });
-    const rawTxn = await builder.build(
-      "0x1::coin::transfer",
-      ["0x1::aptos_coin::AptosCoin"],
-      [account2.address(), 400],
-    );
-
-    const bcsTxn = AptosClient.generateBCSTransaction(account1, rawTxn);
-    const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-    await client.waitForTransaction(transactionRes.hash);
-
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("400");
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits multisig transaction simulation",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    const account2 = new AptosAccount();
-    const account3 = new AptosAccount();
-    const multiSigPublicKey = new TxnBuilderTypes.MultiEd25519PublicKey(
-      [
-        new TxnBuilderTypes.Ed25519PublicKey(account1.signingKey.publicKey),
-        new TxnBuilderTypes.Ed25519PublicKey(account2.signingKey.publicKey),
-        new TxnBuilderTypes.Ed25519PublicKey(account3.signingKey.publicKey),
-      ],
-      2,
-    );
-
-    const authKey = TxnBuilderTypes.AuthenticationKey.fromMultiEd25519PublicKey(multiSigPublicKey);
-
-    const mutisigAccountAddress = authKey.derivedAddress();
-    await faucetClient.fundAccount(mutisigAccountAddress, 50000000);
-
-    let resources = await client.getAccountResources(mutisigAccountAddress);
-    let accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("50000000");
-
-    const account4 = new AptosAccount();
-    await faucetClient.fundAccount(account4.address(), 0);
-    resources = await client.getAccountResources(account4.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("0");
-
-    const token = new TxnBuilderTypes.TypeTagStruct(TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-
-    const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x1::coin",
-        "transfer",
-        [token],
-        [bcsToBytes(TxnBuilderTypes.AccountAddress.fromHex(account4.address())), bcsSerializeUint64(123)],
-      ),
-    );
-
-    const rawTxn = await client.generateRawTransaction(mutisigAccountAddress, entryFunctionPayload);
-
-    const txnBuilder = new TransactionBuilderMultiEd25519((signingMessage: TxnBuilderTypes.SigningMessage) => {
-      const sigHexStr1 = account1.signBuffer(signingMessage);
-      const sigHexStr3 = account3.signBuffer(signingMessage);
-      const bitmap = TxnBuilderTypes.MultiEd25519Signature.createBitmap([0, 2]);
-
-      const muliEd25519Sig = new TxnBuilderTypes.MultiEd25519Signature(
-        [
-          new TxnBuilderTypes.Ed25519Signature(sigHexStr1.toUint8Array()),
-          new TxnBuilderTypes.Ed25519Signature(sigHexStr3.toUint8Array()),
-        ],
-        bitmap,
-      );
-
-      return muliEd25519Sig;
-    }, multiSigPublicKey);
-
-    // simulate transaction
-    const [simulateTransactionRes] = await client.simulateTransaction(multiSigPublicKey, rawTxn, {
-      estimateGasUnitPrice: true,
-      estimateMaxGasAmount: true,
-      estimatePrioritizedGasUnitPrice: true,
-    });
-
-    expect(parseInt(simulateTransactionRes.gas_used, 10) > 0);
-    expect(simulateTransactionRes.success);
-
-    const bcsTxn = txnBuilder.sign(rawTxn);
-    const transactionRes = await client.submitSignedBCSTransaction(bcsTxn);
-
-    await client.waitForTransaction(transactionRes.hash);
-
-    resources = await client.getAccountResources(account4.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as any).coin.value).toBe("123");
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits json transaction simulation",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    const account2 = new AptosAccount();
-    const txns1 = await faucetClient.fundAccount(account1.address(), 1000000);
-    const txns2 = await faucetClient.fundAccount(account2.address(), 1000000);
-    const tx1 = await client.getTransactionByHash(txns1[0]);
-    const tx2 = await client.getTransactionByHash(txns2[0]);
-    expect(tx1.type).toBe("user_transaction");
-    expect(tx2.type).toBe("user_transaction");
-    const checkAptosCoin = async () => {
-      const resources1 = await client.getAccountResources(account1.address());
-      const resources2 = await client.getAccountResources(account2.address());
-      const account1Resource = resources1.find((r) => r.type === aptosCoin);
-      const account2Resource = resources2.find((r) => r.type === aptosCoin);
-      expect((account1Resource!.data as { coin: { value: string } }).coin.value).toBe("1000000");
-      expect((account2Resource!.data as { coin: { value: string } }).coin.value).toBe("1000000");
-    };
-    await checkAptosCoin();
-
-    const payload: Gen.TransactionPayload = {
-      type: "entry_function_payload",
-      function: coinTransferFunction,
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account2.address().hex(), 100000],
-    };
-    const txnRequest = await client.generateTransaction(account1.address(), payload);
-    [account1, new Ed25519PublicKey(account1.pubKey().toUint8Array())].forEach(async (accountOrAddress) => {
-      const transactionRes = (
-        await client.simulateTransaction(accountOrAddress, txnRequest, {
-          estimateGasUnitPrice: true,
-          estimateMaxGasAmount: true,
-          estimatePrioritizedGasUnitPrice: true,
-        })
-      )[0];
-      expect(parseInt(transactionRes.gas_used, 10) > 0);
-      expect(transactionRes.success);
-      const account2AptosCoin = transactionRes.changes.filter((change) => {
-        if (change.type !== "write_resource") {
-          return false;
-        }
-        const write = change as Gen.WriteResource;
-
-        return (
-          write.address === account2.address().hex() &&
-          write.data.type === aptosCoin &&
-          (write.data.data as { coin: { value: string } }).coin.value === "1100000"
-        );
-      });
-      expect(account2AptosCoin).toHaveLength(1);
-    });
-    await checkAptosCoin();
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits bcs transaction simulation",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    const account2 = new AptosAccount();
-    const txns1 = await faucetClient.fundAccount(account1.address(), 100_000_000);
-    const txns2 = await faucetClient.fundAccount(account2.address(), 100_000_000);
-    const tx1 = await client.getTransactionByHash(txns1[0]);
-    const tx2 = await client.getTransactionByHash(txns2[0]);
-    expect(tx1.type).toBe("user_transaction");
-    expect(tx2.type).toBe("user_transaction");
-    const checkAptosCoin = async () => {
-      const resources1 = await client.getAccountResources(account1.address());
-      const resources2 = await client.getAccountResources(account2.address());
-      const account1Resource = resources1.find((r) => r.type === aptosCoin);
-      const account2Resource = resources2.find((r) => r.type === aptosCoin);
-      expect((account1Resource!.data as { coin: { value: string } }).coin.value).toBe("100000000");
-      expect((account2Resource!.data as { coin: { value: string } }).coin.value).toBe("100000000");
-    };
-    await checkAptosCoin();
-
-    const token = new TxnBuilderTypes.TypeTagStruct(TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin"));
-    const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
-      TxnBuilderTypes.EntryFunction.natural(
-        "0x1::coin",
-        "transfer",
-        [token],
-        [bcsToBytes(TxnBuilderTypes.AccountAddress.fromHex(account2.address())), bcsSerializeUint64(1000)],
-      ),
-    );
-
-    const rawTxn = await client.generateRawTransaction(account1.address(), entryFunctionPayload);
-
-    const bcsTxn = AptosClient.generateBCSSimulation(account1, rawTxn);
-    const transactionRes = (await client.submitBCSSimulation(bcsTxn))[0];
-    expect(parseInt(transactionRes.gas_used, 10) > 0);
-    expect(transactionRes.success);
-    const account2AptosCoin = transactionRes.changes.filter((change) => {
-      if (change.type !== "write_resource") {
-        return false;
-      }
-      const write = change as Gen.WriteResource;
-
-      return (
-        write.address === account2.address().toShortString() &&
-        write.data.type === aptosCoin &&
-        (write.data.data as { coin: { value: string } }).coin.value === "100001000"
-      );
-    });
-    expect(account2AptosCoin).toHaveLength(1);
-    await checkAptosCoin();
-  },
-  longTestTimeout,
-);
-
-test(
-  "submits multiagent transaction",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-    const tokenClient = new TokenClient(client);
-
-    const alice = new AptosAccount();
-    const bob = new AptosAccount();
-
-    // Fund both Alice's and Bob's Account
-    await faucetClient.fundAccount(alice.address(), 100000000);
-    await faucetClient.fundAccount(bob.address(), 100000000);
-
-    const collectionName = "AliceCollection";
-    const tokenName = "Alice Token";
-
-    async function ensureTxnSuccess(txnHashPromise: Promise<string>) {
-      const txnHash = await txnHashPromise;
-      const txn = await client.waitForTransactionWithResult(txnHash);
-      expect((txn as any)?.success).toBe(true);
-    }
-
-    // Create collection and token on Alice's account
-    await ensureTxnSuccess(
-      tokenClient.createCollection(alice, collectionName, "Alice's simple collection", "https://aptos.dev"),
-    );
-
-    await ensureTxnSuccess(
-      tokenClient.createToken(
-        alice,
-        collectionName,
-        tokenName,
-        "Alice's simple token",
-        1,
-        "https://aptos.dev/img/nyan.jpeg",
-        1000,
-        alice.address(),
-        0,
-        0,
-        ["key"],
-        ["2"],
-        ["u64"],
-      ),
-    );
-
-    const propertyVersion = 0;
-    const tokenId = {
-      token_data_id: {
-        creator: alice.address().hex(),
-        collection: collectionName,
-        name: tokenName,
-      },
-      property_version: `${propertyVersion}`,
-    };
-
-    // Transfer Token from Alice's Account to Bob's Account
-    await tokenClient.getCollectionData(alice.address().hex(), collectionName);
-    let aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("1");
-
-    const txnHash = await tokenClient.directTransferToken(
-      alice,
-      bob,
-      alice.address(),
-      collectionName,
-      tokenName,
-      1,
-      propertyVersion,
-    );
-
-    await client.waitForTransaction(txnHash, { checkSuccess: true });
-
-    aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("0");
-
-    const bobBalance = await tokenClient.getTokenForAccount(bob.address().hex(), tokenId);
-    expect(bobBalance.amount).toBe("1");
-  },
-  longTestTimeout,
-);
-
-test(
-  "publishes a package",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount(
-      new HexString("0x883fdd67576e5fdceb370ba665b8af8856d0cae63fd808b8d16077c6b008ea8c").toUint8Array(),
-    );
-    await faucetClient.fundAccount(account1.address(), 100_000_000);
-
-    const txnHash = await client.publishPackage(
-      account1,
-      new HexString(
-        // eslint-disable-next-line max-len
-        "084578616d706c657301000000000000000040314137344146383742383132393043323533323938383036373846304137444637393737373637383734334431434345443230413446354345334238464446388f011f8b08000000000002ff3dccc10ac2300c06e07b9ea2f46ee70b78f0a02f31c6886d74a55d5b1a51417c7713c1915c927cf9c7863ee18d2628b89239187b7ae1da32b18507758eb5e872efa42cc088217462269e60a19ceb7cc9d527bf60fcb9594da0462550f151d9b1dd2b9fbba43f6b4f82de465e302b776e90befe8f03aadd6db3351ff802f2294cdfa100000001076d6573736167658f051f8b08000000000002ff95555d6bdb30147dcfafb8ed20d8c52c1d8c3194a6ec83b0be747be8dec6108a7d9d983a5226c94dc3f07f9f2cd98e6cc769e787884857e79e73bfb4154991236c30cf055de5227e8c372ce3846c5129b646f83b01f3150a41e984109452c879774f656b8e834d2d33be3e6eb29d168aa6926d712fe423212c8e45c175dfc27979c2ea64329b910b722b518942c6682d0d6e116bb877f4ee449ea0840d53f088879a6cf5d5f409381e843cd835ea1b5023979bc57a5404ec4ac8b25aee184f72bca95d7db586f6e0d6c19486df8d21d8f23b41d0bb65592652ec226323247a6c5329b6f445ca5a9cb7291d81d96c063f37681c640ab86894c2cef03434ac4d2cb8d2b0fcfe83de2f1f1e3e7f5b12283ebc87055ccf1dc8ae58e5590c69c1618dbaf11bb0249104aa5fb311f669008bff149939eaa5e728942985525f04f89c29ad6e3a66b7163d8cc0d618215c689a9a1249028f6718ce5bb0abe94a18d33d5de762c5f293686f6be67e806a6d2616f260152a5fa12b4b23cd5675345649a1857a51708e1a6a485a11322176c0a6015c14a94883696de289cb52082e46c2e4e185a1e7ccd6b57842aa450b198d52eb75423476d06f91264284e3de6dd2cd68a71ca575f1cbb0fd5b02e60a7bc4aab819c24d5ae8c6b15f4027e5745be8b3d1990f40fd56337057d3a197a666ba97ebc980db4c3bd5c1d47887f1ebddb845a726c230193ebd6146fc09108bdde174eeca9eec718a260003ada5df2a6f7e6954ba89a931ff74fdfc2efc3dd646dc60d398717aa6a3c25736cdff34cbd8e342482c9169a44d51a44252a7a85b1d27f846d0767ca1d38fc1eaf2ae7a2423f8d2be9297d5341acc362ff6fdd119c262f10a543f9ddeec6b776be2e5a49cfc0325c63f11c007000000000300000000000000000000000000000000000000000000000000000000000000010e4170746f734672616d65776f726b00000000000000000000000000000000000000000000000000000000000000010b4170746f735374646c696200000000000000000000000000000000000000000000000000000000000000010a4d6f76655374646c696200",
-      ).toUint8Array(),
-      [
-        new TxnBuilderTypes.Module(
-          new HexString(
-            // eslint-disable-next-line max-len
-            "a11ceb0b050000000c01000c020c12031e20043e04054228076ad50108bf024006ff020a108903450ace03150ce3035f0dc20404000001010102010301040105000606000007080005080700030e040106010009000100000a020300020f0404000410060000011106080106031209030106040705070105010802020c08020001030305080207080101060c010800010b0301090002070b030109000900076d657373616765076163636f756e74056572726f72056576656e74067369676e657206737472696e67124d6573736167654368616e67654576656e740d4d657373616765486f6c64657206537472696e670b6765745f6d6573736167650b7365745f6d6573736167650c66726f6d5f6d6573736167650a746f5f6d657373616765156d6573736167655f6368616e67655f6576656e74730b4576656e7448616e646c65096e6f745f666f756e640a616464726573735f6f66106e65775f6576656e745f68616e646c650a656d69745f6576656e746766284c3984add58e00d20ba272a40d33d5b4ea33c08a904254e28fdff97b9f000000000000000000000000000000000000000000000000000000000000000103080000000000000000126170746f733a3a6d657461646174615f7630310100000000000000000b454e4f5f4d4553534147451b5468657265206973206e6f206d6573736167652070726573656e740002020b08020c08020102020008020d0b030108000001000101030b0a002901030607001102270b002b0110001402010104010105210e0011030c020a022901200308050f0e000b010e00380012012d0105200b022a010c040a041000140c030a040f010b030a01120038010b010b040f0015020100010100",
-          ).toUint8Array(),
-        ),
-      ],
-    );
-
-    await client.waitForTransaction(txnHash);
-
-    const txn = await client.getTransactionByHash(txnHash);
-    expect((txn as any).success).toBeTruthy();
-  },
-  longTestTimeout,
-);
-
-test(
-  "rotates auth key ed25519",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const alice = new AptosAccount();
-    await faucetClient.fundAccount(alice.address(), 100_000_000);
-
-    const helperAccount = new AptosAccount();
-
-    const pendingTxn = await client.rotateAuthKeyEd25519(alice, helperAccount.signingKey.secretKey);
-
-    await client.waitForTransaction(pendingTxn.hash);
-
-    const origAddressHex = await client.lookupOriginalAddress(helperAccount.address());
-    // Sometimes the returned addresses do not have leading 0s. To be safe, converting hex addresses to AccountAddress
-    const origAddress = TxnBuilderTypes.AccountAddress.fromHex(origAddressHex);
-    const aliceAddress = TxnBuilderTypes.AccountAddress.fromHex(alice.address());
-
-    expect(HexString.fromUint8Array(bcsToBytes(origAddress)).hex()).toBe(
-      HexString.fromUint8Array(bcsToBytes(aliceAddress)).hex(),
-    );
-  },
-  longTestTimeout,
-);
-
-test(
-  "gets block by height",
-  async () => {
-    const blockHeight = 100;
-    const client = new AptosClient(NODE_URL);
-    const block = await client.getBlockByHeight(blockHeight);
-    expect(block.block_height).toBe(blockHeight.toString());
-  },
-  longTestTimeout,
-);
-
-test(
-  "gets block by version",
-  async () => {
-    const version = 100;
-    const client = new AptosClient(NODE_URL);
-    const block = await client.getBlockByVersion(version);
-    expect(parseInt(block.first_version, 10)).toBeLessThanOrEqual(version);
-    expect(parseInt(block.last_version, 10)).toBeGreaterThanOrEqual(version);
-  },
-  longTestTimeout,
-);
-
-test(
-  "estimates max gas amount",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const alice = new AptosAccount();
-    await faucetClient.fundAccount(alice.address(), 10000000);
-
-    const maxGasAmount = await client.estimateMaxGasAmount(alice.address());
-
-    expect(maxGasAmount).toBeGreaterThan(BigInt(0));
-  },
-  longTestTimeout,
-);
-
-test(
-  "view function",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const alice = new AptosAccount();
-    await faucetClient.fundAccount(alice.address(), 100_000_000);
-
-    const payload: Gen.ViewRequest = {
-      function: "0x1::coin::balance",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [alice.address().hex()],
-    };
-
-    const balance = await client.view(payload);
-
-    expect(balance[0]).toBe("100000000");
-  },
-  longTestTimeout,
-);
-
-test(
-  "view function with a struct return type",
-  async () => {
-    // This test is just to show that the view function supports a struct return type.
-    // We test against get_collection_mutability_config although
-    // b/c at the time of writing this is the only view function on the move side
-    // that can easily test a struct return type.
-
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-    const tokenClient = new TokenClient(client);
-
-    const alice = new AptosAccount();
-    // Fund Alice's Account
-    await faucetClient.fundAccount(alice.address(), 100000000);
-
-    const collectionName = "AliceCollection";
-
-    // Create collection on Alice's account
-    await client.waitForTransaction(
-      await tokenClient.createCollection(alice, collectionName, "Alice's simple collection", "https://aptos.dev"),
-      { checkSuccess: true },
-    );
-
-    const payload: Gen.ViewRequest = {
-      function: "0x3::token::get_collection_mutability_config",
-      type_arguments: [],
-      arguments: [alice.address().hex(), collectionName],
-    };
-
-    const collection = await client.view(payload);
-    expect(collection[0]).toMatchObject({ description: false, maximum: false, uri: false });
-  },
-  longTestTimeout,
-);
diff --git a/m1/JavaScript-client/src/tests/e2e/aptos_token.test.ts b/m1/JavaScript-client/src/tests/e2e/aptos_token.test.ts
deleted file mode 100644
index 525841a14..000000000
--- a/m1/JavaScript-client/src/tests/e2e/aptos_token.test.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { AptosAccount } from "../../account";
-import { UserTransaction } from "../../generated";
-import { AptosToken } from "../../plugins";
-import { Provider } from "../../providers";
-import { PROVIDER_LOCAL_NETWORK_CONFIG, getFaucetClient, longTestTimeout } from "../unit/test_helper.test";
-
-const provider = new Provider(PROVIDER_LOCAL_NETWORK_CONFIG);
-const faucetClient = getFaucetClient();
-const aptosToken = new AptosToken(provider);
-
-const alice = new AptosAccount();
-const bob = new AptosAccount();
-
-const collectionName = "AliceCollection";
-const tokenName = "Alice Token";
-let tokenAddress = "";
-
-describe("token objects", () => {
-  beforeAll(async () => {
-    // Fund Alice's Account
-    await faucetClient.fundAccount(alice.address(), 100000000);
-  }, longTestTimeout);
-
-  test(
-    "create collection",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.createCollection(alice, "Alice's simple collection", collectionName, "https://aptos.dev", 5, {
-          royaltyNumerator: 10,
-          royaltyDenominator: 10,
-        }),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "mint",
-    async () => {
-      const txn = await provider.waitForTransactionWithResult(
-        await aptosToken.mint(
-          alice,
-          collectionName,
-          "Alice's simple token",
-          tokenName,
-          "https://aptos.dev/img/nyan.jpeg",
-          ["key"],
-          ["bool"],
-          ["true"],
-        ),
-        { checkSuccess: true },
-      );
-      tokenAddress = (txn as UserTransaction).events[0].data.token;
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "mint soul bound",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.mintSoulBound(
-          alice,
-          collectionName,
-          "Alice's simple soul bound token",
-          "Alice's soul bound token",
-          "https://aptos.dev/img/nyan.jpeg",
-          bob,
-          ["key"],
-          ["bool"],
-          ["true"],
-        ),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "freeze transfer",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.freezeTokenTransafer(alice, tokenAddress), {
-        checkSuccess: true,
-      });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "unfreeze token transfer",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.unfreezeTokenTransafer(alice, tokenAddress), {
-        checkSuccess: true,
-      });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "set token description",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.setTokenDescription(alice, tokenAddress, "my updated token description"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "set token name",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.setTokenName(alice, tokenAddress, "my updated token name"), {
-        checkSuccess: true,
-      });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "set token uri",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.setTokenName(alice, tokenAddress, "https://aptos.dev/img/hero.jpg"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "add token property",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.addTokenProperty(alice, tokenAddress, "newKey", "BOOLEAN", "true"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "add typed property",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.addTypedProperty(alice, tokenAddress, "newTypedKey", "VECTOR", "[hello,world]"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "update typed property",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.updateTypedProperty(alice, tokenAddress, "newTypedKey", "U8", "2"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "update token property",
-    async () => {
-      await provider.waitForTransaction(
-        await aptosToken.updateTokenProperty(alice, tokenAddress, "newKey", "U8", "5"),
-        { checkSuccess: true },
-      );
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "remove token property",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.removeTokenProperty(alice, tokenAddress, "newKey"), {
-        checkSuccess: true,
-      });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "transfer token ownership",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.transferTokenOwnership(alice, tokenAddress, bob.address()), {
-        checkSuccess: true,
-      });
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "burn token",
-    async () => {
-      await provider.waitForTransaction(await aptosToken.burnToken(alice, tokenAddress), { checkSuccess: true });
-    },
-    longTestTimeout,
-  );
-});
diff --git a/m1/JavaScript-client/src/tests/e2e/coin_client.test.ts b/m1/JavaScript-client/src/tests/e2e/coin_client.test.ts
deleted file mode 100644
index ba489becc..000000000
--- a/m1/JavaScript-client/src/tests/e2e/coin_client.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosClient } from "../../providers/aptos_client";
-import { getFaucetClient, longTestTimeout, NODE_URL } from "../unit/test_helper.test";
-import { AptosAccount } from "../../account/aptos_account";
-import { CoinClient } from "../../plugins/coin_client";
-
-test(
-  "transfer and checkBalance works",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-    const coinClient = new CoinClient(client);
-
-    const alice = new AptosAccount();
-    const bob = new AptosAccount();
-    await faucetClient.fundAccount(alice.address(), 100_000_000);
-    await faucetClient.fundAccount(bob.address(), 0);
-
-    await client.waitForTransaction(await coinClient.transfer(alice, bob, 42), { checkSuccess: true });
-
-    expect(await coinClient.checkBalance(bob)).toBe(BigInt(42));
-
-    // Test that `createReceiverIfMissing` works.
-    const jemima = new AptosAccount();
-    await client.waitForTransaction(await coinClient.transfer(alice, jemima, 717, { createReceiverIfMissing: true }), {
-      checkSuccess: true,
-    });
-
-    // Check that using a string address instead of an account works with `checkBalance`.
-    expect(await coinClient.checkBalance(jemima.address().hex())).toBe(BigInt(717));
-  },
-  longTestTimeout,
-);
diff --git a/m1/JavaScript-client/src/tests/e2e/faucet_client.test.ts b/m1/JavaScript-client/src/tests/e2e/faucet_client.test.ts
deleted file mode 100644
index d4dd6e205..000000000
--- a/m1/JavaScript-client/src/tests/e2e/faucet_client.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosClient } from "../../providers";
-import { FaucetClient } from "../../plugins";
-import { AptosAccount } from "../../account";
-import { HexString } from "../../utils";
-import * as Gen from "../../generated/index";
-
-import { NODE_URL, getFaucetClient, longTestTimeout } from "../unit/test_helper.test";
-
-const aptosCoin = "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>";
-
-test("faucet url empty", () => {
-  expect(() => {
-    const faucetClient = new FaucetClient("http://localhost:8080", "");
-    faucetClient.getAccount("0x1");
-  }).toThrow("Faucet URL cannot be empty.");
-});
-
-test(
-  "full tutorial faucet flow",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-
-    const account1 = new AptosAccount();
-    const txns = await faucetClient.fundAccount(account1.address(), 10000000);
-    const tx0 = await client.getTransactionByHash(txns[0]);
-    expect(tx0.type).toBe("user_transaction");
-    let resources = await client.getAccountResources(account1.address());
-    let accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as { coin: { value: string } }).coin.value).toBe("10000000");
-
-    const account2 = new AptosAccount();
-    await faucetClient.fundAccount(account2.address(), 0);
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as { coin: { value: string } }).coin.value).toBe("0");
-
-    const payload: Gen.TransactionPayload_EntryFunctionPayload = {
-      type: "entry_function_payload",
-      function: "0x1::coin::transfer",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account2.address().hex(), 717],
-    };
-
-    const txnRequest = await client.generateTransaction(account1.address(), payload, { max_gas_amount: "2000" });
-    const signedTxn = await client.signTransaction(account1, txnRequest);
-    const transactionRes = await client.submitTransaction(signedTxn);
-    const txn = await client.waitForTransactionWithResult(transactionRes.hash);
-    expect((txn as any)?.success).toBe(true);
-
-    resources = await client.getAccountResources(account2.address());
-    accountResource = resources.find((r) => r.type === aptosCoin);
-    expect((accountResource!.data as { coin: { value: string } }).coin.value).toBe("717");
-
-    const res = await client.getAccountTransactions(account1.address(), { start: BigInt(0) });
-    const tx = res.find((e) => e.type === "user_transaction") as Gen.UserTransaction;
-    expect(new HexString(tx.sender).toShortString()).toBe(account1.address().toShortString());
-
-    const events = await client.getEventsByEventHandle(tx.sender, aptosCoin, "withdraw_events");
-    expect(events[0].type).toBe("0x1::coin::WithdrawEvent");
-
-    const eventSubset = await client.getEventsByEventHandle(tx.sender, aptosCoin, "withdraw_events", {
-      start: BigInt(0),
-      limit: 1,
-    });
-    expect(eventSubset[0].type).toBe("0x1::coin::WithdrawEvent");
-
-    const events2 = await client.getEventsByCreationNumber(
-      events[0].guid.account_address,
-      events[0].guid.creation_number,
-    );
-    expect(events2[0].type).toBe("0x1::coin::WithdrawEvent");
-  },
-  longTestTimeout,
-);
diff --git a/m1/JavaScript-client/src/tests/e2e/indexer.test.ts b/m1/JavaScript-client/src/tests/e2e/indexer.test.ts
deleted file mode 100644
index d62a55bd6..000000000
--- a/m1/JavaScript-client/src/tests/e2e/indexer.test.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import { AptosAccount } from "../../account/aptos_account";
-import { AptosClient } from "../../providers/aptos_client";
-import { bcsSerializeBool } from "../../bcs";
-import { FaucetClient } from "../../plugins/faucet_client";
-import { IndexerClient } from "../../providers/indexer";
-import { TokenClient } from "../../plugins/token_client";
-import { FAUCET_AUTH_TOKEN, longTestTimeout } from "../unit/test_helper.test";
-import { Network, NetworkToIndexerAPI, NetworkToNodeAPI, sleep } from "../../utils";
-
-const aptosClient = new AptosClient(NetworkToNodeAPI[Network.TESTNET]);
-const faucetClient = new FaucetClient(
-  "https://fullnode.testnet.aptoslabs.com",
-  "https://faucet.testnet.aptoslabs.com",
-  { TOKEN: FAUCET_AUTH_TOKEN },
-);
-const tokenClient = new TokenClient(aptosClient);
-const alice = new AptosAccount();
-const collectionName = "AliceCollection";
-const tokenName = "Alice Token";
-const indexerClient = new IndexerClient(NetworkToIndexerAPI[Network.TESTNET]);
-
-describe("Indexer", () => {
-  it("should throw an error when account address is not valid", async () => {
-    expect(async () => {
-      await indexerClient.getAccountNFTs("702ca08576f66393140967fef983bb6bf160dafeb73de9c4ddac4d2dc");
-    }).rejects.toThrow("Address needs to be 66 chars long.");
-
-    expect(async () => {
-      await indexerClient.getAccountNFTs("0x702ca08576f66393140967fef983bb6bf160dafeb73de9c4ddac4d2dc");
-    }).rejects.toThrow("Address needs to be 66 chars long.");
-  });
-
-  it("should not throw an error when account address is missing 0x", async () => {
-    expect(async () => {
-      await indexerClient.getAccountNFTs("790a34c702ca08576f66393140967fef983bb6bf160dafeb73de9c4ddac4d2dc");
-    }).not.toThrow("Address needs to be 66 chars long.");
-  });
-
-  beforeAll(async () => {
-    await faucetClient.fundAccount(alice.address(), 100000000);
-    // Create collection and token on Alice's account
-    await aptosClient.waitForTransaction(
-      await tokenClient.createCollection(alice, collectionName, "Alice's simple collection", "https://aptos.dev"),
-      { checkSuccess: true },
-    );
-    await aptosClient.waitForTransaction(
-      await tokenClient.createTokenWithMutabilityConfig(
-        alice,
-        collectionName,
-        tokenName,
-        "Alice's simple token",
-        1,
-        "https://aptos.dev/img/nyan.jpeg",
-        1000,
-        alice.address(),
-        1,
-        0,
-        ["TOKEN_BURNABLE_BY_OWNER"],
-        [bcsSerializeBool(true)],
-        ["bool"],
-        [false, false, false, false, true],
-      ),
-      { checkSuccess: true },
-    );
-  }, longTestTimeout);
-
-  describe("get data", () => {
-    jest.retryTimes(5);
-    beforeEach(async () => {
-      await sleep(1000);
-    });
-    it(
-      "gets account NFTs",
-      async () => {
-        const accountNFTs = await indexerClient.getAccountNFTs(alice.address().hex());
-        expect(accountNFTs.current_token_ownerships).toHaveLength(1);
-        expect(accountNFTs.current_token_ownerships[0]).toHaveProperty("current_token_data");
-        expect(accountNFTs.current_token_ownerships[0]).toHaveProperty("current_collection_data");
-        expect(accountNFTs.current_token_ownerships[0].current_token_data?.name).toBe("Alice Token");
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets token activities",
-      async () => {
-        const accountNFTs = await indexerClient.getAccountNFTs(alice.address().hex());
-        const tokenActivity = await indexerClient.getTokenActivities(
-          accountNFTs.current_token_ownerships[0].current_token_data!.token_data_id_hash,
-        );
-        expect(tokenActivity.token_activities).toHaveLength(2);
-        expect(tokenActivity.token_activities[0]).toHaveProperty("from_address");
-        expect(tokenActivity.token_activities[0]).toHaveProperty("to_address");
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets account coin data",
-      async () => {
-        const accountCoinData = await indexerClient.getAccountCoinsData(alice.address().hex());
-        expect(accountCoinData.current_coin_balances[0].coin_type).toEqual("0x1::aptos_coin::AptosCoin");
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets account token count",
-      async () => {
-        const accountTokenCount = await indexerClient.getAccountTokensCount(alice.address().hex());
-        expect(accountTokenCount.current_token_ownerships_aggregate.aggregate?.count).toEqual(1);
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets account transactions count",
-      async () => {
-        const accountTransactionsCount = await indexerClient.getAccountTransactionsCount(alice.address().hex());
-        expect(accountTransactionsCount.move_resources_aggregate.aggregate?.count).toEqual(3);
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets account transactions data",
-      async () => {
-        const accountTransactionsData = await indexerClient.getAccountTransactionsData(alice.address().hex());
-        expect(accountTransactionsData.move_resources[0]).toHaveProperty("transaction_version");
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets token activities count",
-      async () => {
-        const accountNFTs = await indexerClient.getAccountNFTs(alice.address().hex());
-        const tokenActivitiesCount = await indexerClient.getTokenActivitiesCount(
-          accountNFTs.current_token_ownerships[0].current_token_data!.token_data_id_hash,
-        );
-        expect(tokenActivitiesCount.token_activities_aggregate.aggregate?.count).toBe(2);
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets token data",
-      async () => {
-        const accountNFTs = await indexerClient.getAccountNFTs(alice.address().hex());
-        const tokenData = await indexerClient.getTokenData(
-          accountNFTs.current_token_ownerships[0].current_token_data!.token_data_id_hash,
-        );
-        expect(tokenData.current_token_datas[0].name).toEqual("Alice Token");
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets token owners data",
-      async () => {
-        const accountNFTs = await indexerClient.getAccountNFTs(alice.address().hex());
-        const tokenOwnersData = await indexerClient.getTokenOwnersData(
-          accountNFTs.current_token_ownerships[0].current_token_data!.token_data_id_hash,
-          0,
-        );
-        expect(tokenOwnersData.current_token_ownerships[0].owner_address).toEqual(alice.address().hex());
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets top user transactions",
-      async () => {
-        const topUserTransactions = await indexerClient.getTopUserTransactions(5);
-        expect(topUserTransactions.user_transactions.length).toEqual(5);
-      },
-      longTestTimeout,
-    );
-
-    it(
-      "gets user transactions",
-      async () => {
-        const userTransactions = await indexerClient.getUserTransactions(482294669, { limit: 4 });
-        expect(userTransactions.user_transactions[0].version).toEqual(482294669);
-        expect(userTransactions.user_transactions.length).toEqual(4);
-      },
-      longTestTimeout,
-    );
-
-    test("gets indexer ledger info", async () => {
-      const ledgerInfo = await indexerClient.getIndexerLedgerInfo();
-      expect(ledgerInfo.ledger_infos[0].chain_id).toBeGreaterThan(1);
-    });
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/e2e/provider.test.ts b/m1/JavaScript-client/src/tests/e2e/provider.test.ts
deleted file mode 100644
index d9667bfb2..000000000
--- a/m1/JavaScript-client/src/tests/e2e/provider.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { AptosAccount } from "../../account/aptos_account";
-import { AptosClient } from "../../providers/aptos_client";
-import { bcsSerializeBool } from "../../bcs";
-import { Provider } from "../../providers/provider";
-import { FaucetClient } from "../../plugins/faucet_client";
-import { TokenClient } from "../../plugins/token_client";
-import { Network, NetworkToIndexerAPI, NetworkToNodeAPI, sleep } from "../../utils";
-import { FAUCET_AUTH_TOKEN, longTestTimeout } from "../unit/test_helper.test";
-
-describe("Provider", () => {
-  const faucetClient = new FaucetClient(
-    "https://fullnode.testnet.aptoslabs.com",
-    "https://faucet.testnet.aptoslabs.com",
-    { TOKEN: FAUCET_AUTH_TOKEN },
-  );
-  const alice = new AptosAccount();
-
-  it("uses provided network as API", async () => {
-    const provider = new Provider(Network.TESTNET);
-    expect(provider.aptosClient.nodeUrl).toBe(NetworkToNodeAPI[Network.TESTNET]);
-    expect(provider.indexerClient.endpoint).toBe(NetworkToIndexerAPI[Network.TESTNET]);
-  });
-
-  it("uses custom endpoints as API", async () => {
-    const provider = new Provider({ fullnodeUrl: "full-node-url", indexerUrl: "indexer-url" });
-    expect(provider.aptosClient.nodeUrl).toBe("full-node-url/v1");
-    expect(provider.indexerClient.endpoint).toBe("indexer-url");
-  });
-
-  it("throws error when endpoint not provided", async () => {
-    expect(() => {
-      new Provider({ fullnodeUrl: "", indexerUrl: "" });
-    }).toThrow("network is not provided");
-  });
-
-  describe("requests", () => {
-    beforeAll(async () => {
-      await faucetClient.fundAccount(alice.address(), 100000000);
-    });
-
-    describe("query full node", () => {
-      it("gets genesis account from fullnode", async () => {
-        const provider = new Provider(Network.TESTNET);
-        const genesisAccount = await provider.getAccount("0x1");
-        expect(genesisAccount.authentication_key.length).toBe(66);
-        expect(genesisAccount.sequence_number).not.toBeNull();
-      });
-    });
-
-    describe("query indexer", () => {
-      const aptosClient = new AptosClient("https://fullnode.testnet.aptoslabs.com");
-      const tokenClient = new TokenClient(aptosClient);
-      const collectionName = "AliceCollection";
-      const tokenName = "Alice Token";
-
-      beforeAll(async () => {
-        // Create collection and token on Alice's account
-        await aptosClient.waitForTransaction(
-          await tokenClient.createCollection(alice, collectionName, "Alice's simple collection", "https://aptos.dev"),
-          { checkSuccess: true },
-        );
-
-        await aptosClient.waitForTransaction(
-          await tokenClient.createTokenWithMutabilityConfig(
-            alice,
-            collectionName,
-            tokenName,
-            "Alice's simple token",
-            1,
-            "https://aptos.dev/img/nyan.jpeg",
-            1000,
-            alice.address(),
-            1,
-            0,
-            ["TOKEN_BURNABLE_BY_OWNER"],
-            [bcsSerializeBool(true)],
-            ["bool"],
-            [false, false, false, false, true],
-          ),
-          { checkSuccess: true },
-        );
-      }, longTestTimeout);
-
-      jest.retryTimes(5);
-      beforeEach(async () => {
-        await sleep(1000);
-      });
-
-      it("gets account NFTs from indexer", async () => {
-        let provider = new Provider(Network.TESTNET);
-        const accountNFTs = await provider.getAccountNFTs(alice.address().hex(), { limit: 20, offset: 0 });
-        expect(accountNFTs.current_token_ownerships).toHaveLength(1);
-        expect(accountNFTs.current_token_ownerships[0]).toHaveProperty("current_token_data");
-        expect(accountNFTs.current_token_ownerships[0]).toHaveProperty("current_collection_data");
-        expect(accountNFTs.current_token_ownerships[0].current_token_data?.name).toBe("Alice Token");
-      });
-    });
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/e2e/token_client.test.ts b/m1/JavaScript-client/src/tests/e2e/token_client.test.ts
deleted file mode 100644
index 930b0cc21..000000000
--- a/m1/JavaScript-client/src/tests/e2e/token_client.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosAccount } from "../../account/aptos_account";
-import { AptosClient } from "../../providers/aptos_client";
-import { TokenClient } from "../../plugins/token_client";
-
-import { getFaucetClient, longTestTimeout, NODE_URL } from "../unit/test_helper.test";
-import { bcsSerializeBool } from "../../bcs";
-
-test(
-  "full tutorial nft token flow",
-  async () => {
-    const client = new AptosClient(NODE_URL);
-    const faucetClient = getFaucetClient();
-    const tokenClient = new TokenClient(client);
-
-    const alice = new AptosAccount();
-    const bob = new AptosAccount();
-
-    // Fund both Alice's and Bob's Account
-    await faucetClient.fundAccount(alice.address(), 100000000);
-    await faucetClient.fundAccount(bob.address(), 100000000);
-
-    const collectionName = "AliceCollection";
-    const tokenName = "Alice Token";
-
-    // Create collection and token on Alice's account
-    await client.waitForTransaction(
-      await tokenClient.createCollection(alice, collectionName, "Alice's simple collection", "https://aptos.dev"),
-      { checkSuccess: true },
-    );
-
-    await client.waitForTransaction(
-      await tokenClient.createTokenWithMutabilityConfig(
-        alice,
-        collectionName,
-        tokenName,
-        "Alice's simple token",
-        2,
-        "https://aptos.dev/img/nyan.jpeg",
-        1000,
-        alice.address(),
-        1,
-        0,
-        ["TOKEN_BURNABLE_BY_OWNER"],
-        [bcsSerializeBool(true)],
-        ["bool"],
-        [false, false, false, false, true],
-      ),
-      { checkSuccess: true },
-    );
-
-    const tokenId = {
-      token_data_id: {
-        creator: alice.address().hex(),
-        collection: collectionName,
-        name: tokenName,
-      },
-      property_version: "0",
-    };
-
-    // Transfer Token from Alice's Account to Bob's Account
-    await tokenClient.getCollectionData(alice.address().hex(), collectionName);
-    let aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("2");
-    const tokenData = await tokenClient.getTokenData(alice.address().hex(), collectionName, tokenName);
-    expect(tokenData.name).toBe(tokenName);
-
-    await client.waitForTransaction(
-      await tokenClient.offerToken(alice, bob.address().hex(), alice.address().hex(), collectionName, tokenName, 1),
-      { checkSuccess: true },
-    );
-    aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("1");
-
-    await client.waitForTransaction(
-      await tokenClient.cancelTokenOffer(alice, bob.address().hex(), alice.address().hex(), collectionName, tokenName),
-      { checkSuccess: true },
-    );
-    aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("2");
-
-    await client.waitForTransaction(
-      await tokenClient.offerToken(alice, bob.address().hex(), alice.address().hex(), collectionName, tokenName, 1),
-      { checkSuccess: true },
-    );
-    aliceBalance = await tokenClient.getTokenForAccount(alice.address().hex(), tokenId);
-    expect(aliceBalance.amount).toBe("1");
-
-    await client.waitForTransaction(
-      await tokenClient.claimToken(bob, alice.address().hex(), alice.address().hex(), collectionName, tokenName),
-      { checkSuccess: true },
-    );
-
-    const bobBalance = await tokenClient.getTokenForAccount(bob.address().hex(), tokenId);
-    expect(bobBalance.amount).toBe("1");
-
-    // default token property is configured to be mutable and then alice can make bob burn token after token creation
-    // test mutate Bob's token properties and allow owner to burn this token
-    let a = await tokenClient.mutateTokenProperties(
-      alice,
-      bob.address(),
-      alice.address(),
-      collectionName,
-      tokenName,
-      0,
-      1,
-      ["test"],
-      [bcsSerializeBool(true)],
-      ["bool"],
-    );
-    await client.waitForTransactionWithResult(a);
-
-    const newTokenId = {
-      token_data_id: {
-        creator: alice.address().hex(),
-        collection: collectionName,
-        name: tokenName,
-      },
-      property_version: "1",
-    };
-    const mutated_token = await tokenClient.getTokenForAccount(bob.address().hex(), newTokenId);
-    // expect property map deserialization works
-    expect(mutated_token.token_properties.data["test"].value).toBe("true");
-    expect(mutated_token.token_properties.data["TOKEN_BURNABLE_BY_OWNER"].value).toBe("true");
-
-    // burn the token by owner
-    var txn_hash = await tokenClient.burnByOwner(bob, alice.address(), collectionName, tokenName, 1, 1);
-    await client.waitForTransactionWithResult(txn_hash);
-    const newbalance = await tokenClient.getTokenForAccount(bob.address().hex(), newTokenId);
-    expect(newbalance.amount).toBe("0");
-
-    //bob opt_in directly transfer and alice transfer token to bob directly
-    txn_hash = await tokenClient.optInTokenTransfer(bob, true);
-    await client.waitForTransactionWithResult(txn_hash);
-
-    // alice still have one token with property version 0.
-    txn_hash = await tokenClient.transferWithOptIn(
-      alice,
-      alice.address(),
-      collectionName,
-      tokenName,
-      0,
-      bob.address(),
-      1,
-    );
-    await client.waitForTransactionWithResult(txn_hash);
-    const balance = await tokenClient.getTokenForAccount(bob.address().hex(), tokenId);
-    expect(balance.amount).toBe("1");
-  },
-  longTestTimeout,
-);
diff --git a/m1/JavaScript-client/src/tests/unit/abi.test.ts b/m1/JavaScript-client/src/tests/unit/abi.test.ts
deleted file mode 100644
index 3755e7967..000000000
--- a/m1/JavaScript-client/src/tests/unit/abi.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { HexString } from "../../utils";
-import { Deserializer, Serializer } from "../../bcs";
-import { ScriptABI, EntryFunctionABI, TransactionScriptABI, ArgumentABI } from "../../aptos_types/abi";
-import { TypeTagAddress, TypeTagU64 } from "../../aptos_types";
-import { ModuleId } from "../../aptos_types";
-
-// eslint-disable-next-line operator-linebreak
-const SCRIPT_FUNCTION_ABI =
-  // eslint-disable-next-line max-len
-  "010E6372656174655F6163636F756E740000000000000000000000000000000000000000000000000000000000000001074163636F756E7420204261736963206163636F756E74206372656174696F6E206D6574686F64732E000108617574685F6B657904";
-
-// eslint-disable-next-line operator-linebreak
-const TRANSACTION_SCRIPT_ABI =
-  // eslint-disable-next-line max-len
-  "00046D61696E0F20412074657374207363726970742E8B01A11CEB0B050000000501000403040A050E0B071924083D200000000101020301000003010400020C0301050001060C0101074163636F756E74065369676E65720A616464726573735F6F66096578697374735F617400000000000000000000000000000000000000000000000000000000000000010000010A0E0011000C020B021101030705090B0127020001016902";
-
-describe("ABI", () => {
-  it("parses create_account successfully", async () => {
-    const name = "create_account";
-    const doc = " Basic account creation methods.";
-    const typeArgABIs = [new ArgumentABI("auth_key", new TypeTagAddress())];
-
-    const abi = new EntryFunctionABI(name, ModuleId.fromStr("0x1::Account"), doc, [], typeArgABIs);
-    const serializer = new Serializer();
-    abi.serialize(serializer);
-    expect(HexString.fromUint8Array(serializer.getBytes()).noPrefix()).toBe(SCRIPT_FUNCTION_ABI.toLowerCase());
-
-    const deserializer = new Deserializer(new HexString(SCRIPT_FUNCTION_ABI).toUint8Array());
-    const entryFunctionABI = ScriptABI.deserialize(deserializer) as EntryFunctionABI;
-    const { address: moduleAddress, name: moduleName } = entryFunctionABI.module_name;
-    expect(entryFunctionABI.name).toBe("create_account");
-    expect(HexString.fromUint8Array(moduleAddress.address).toShortString()).toBe("0x1");
-    expect(moduleName.value).toBe("Account");
-    expect(entryFunctionABI.doc.trim()).toBe("Basic account creation methods.");
-
-    const arg = entryFunctionABI.args[0];
-    expect(arg.name).toBe("auth_key");
-    expect(arg.type_tag instanceof TypeTagAddress).toBeTruthy();
-  });
-
-  it("parses script abi successfully", async () => {
-    const name = "main";
-    // eslint-disable-next-line max-len
-    const code =
-      "0xa11ceb0b050000000501000403040a050e0b071924083d200000000101020301000003010400020c0301050001060c0101074163636f756e74065369676e65720a616464726573735f6f66096578697374735f617400000000000000000000000000000000000000000000000000000000000000010000010a0e0011000c020b021101030705090b012702";
-    const doc = " A test script.";
-    const typeArgABIs = [new ArgumentABI("i", new TypeTagU64())];
-    const abi = new TransactionScriptABI(name, doc, HexString.ensure(code).toUint8Array(), [], typeArgABIs);
-    const serializer = new Serializer();
-    abi.serialize(serializer);
-    expect(HexString.fromUint8Array(serializer.getBytes()).noPrefix()).toBe(TRANSACTION_SCRIPT_ABI.toLowerCase());
-
-    const deserializer = new Deserializer(new HexString(TRANSACTION_SCRIPT_ABI).toUint8Array());
-    const transactionScriptABI = ScriptABI.deserialize(deserializer) as TransactionScriptABI;
-    expect(transactionScriptABI.name).toBe("main");
-    expect(transactionScriptABI.doc.trim()).toBe("A test script.");
-
-    expect(HexString.fromUint8Array(transactionScriptABI.code).hex()).toBe(code);
-
-    const arg = transactionScriptABI.args[0];
-    expect(arg.name).toBe("i");
-    expect(arg.type_tag instanceof TypeTagU64).toBeTruthy();
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/account_address.test.ts b/m1/JavaScript-client/src/tests/unit/account_address.test.ts
deleted file mode 100644
index 687c531f8..000000000
--- a/m1/JavaScript-client/src/tests/unit/account_address.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AccountAddress } from "../../aptos_types";
-
-const ADDRESS_LONG = "000000000000000000000000000000000000000000000000000000000a550c18";
-const ADDRESS_SHORT = "a550c18";
-
-describe("AccountAddress", () => {
-  it("gets created from full hex string", async () => {
-    const addr = AccountAddress.fromHex(ADDRESS_LONG);
-    expect(Buffer.from(addr.address).toString("hex")).toBe(ADDRESS_LONG);
-  });
-
-  it("gets created from short hex string", async () => {
-    const addr = AccountAddress.fromHex(ADDRESS_SHORT);
-    expect(Buffer.from(addr.address).toString("hex")).toBe(ADDRESS_LONG);
-  });
-
-  it("gets created from prefixed full hex string", async () => {
-    const addr = AccountAddress.fromHex(`0x${ADDRESS_LONG}`);
-    expect(Buffer.from(addr.address).toString("hex")).toBe(ADDRESS_LONG);
-  });
-
-  it("gets created from prefixed short hex string", async () => {
-    const addr = AccountAddress.fromHex(`0x${ADDRESS_SHORT}`);
-    expect(Buffer.from(addr.address).toString("hex")).toBe(ADDRESS_LONG);
-  });
-
-  it("gets created from prefixed short hex string with leading 0s", async () => {
-    const addr = AccountAddress.fromHex(`0x000${ADDRESS_SHORT}`);
-    expect(Buffer.from(addr.address).toString("hex")).toBe(ADDRESS_LONG);
-  });
-
-  it("throws exception when initiating from a long hex string", async () => {
-    expect(() => {
-      AccountAddress.fromHex(`1${ADDRESS_LONG}`);
-      // eslint-disable-next-line quotes
-    }).toThrow("Hex string is too long. Address's length is 32 bytes.");
-  });
-
-  it("throws exception when initiating from a long hex string", async () => {
-    expect(() => {
-      AccountAddress.fromHex(`1${ADDRESS_LONG}`);
-      // eslint-disable-next-line quotes
-    }).toThrow("Hex string is too long. Address's length is 32 bytes.");
-  });
-
-  it("isValid short with 0x", async () => {
-    expect(AccountAddress.isValid(`0x${ADDRESS_SHORT}`)).toBe(true);
-  });
-
-  it("isValid short with leading 0s 0x", async () => {
-    expect(AccountAddress.isValid(`0x000${ADDRESS_SHORT}`)).toBe(true);
-  });
-
-  it("isValid short with leading 0s 0x", async () => {
-    expect(AccountAddress.isValid(`0x000${ADDRESS_SHORT}`)).toBe(true);
-  });
-
-  it("isValid long with leading 0s without 0x", async () => {
-    expect(AccountAddress.isValid(`${ADDRESS_LONG}`)).toBe(true);
-  });
-
-  it("isValid long with leading 0s with 0x", async () => {
-    expect(AccountAddress.isValid(`0x${ADDRESS_LONG}`)).toBe(true);
-  });
-
-  it("not isValid empty string", async () => {
-    expect(AccountAddress.isValid("")).toBe(false);
-  });
-
-  it("not isValid too long without 0x", async () => {
-    expect(AccountAddress.isValid(`00${ADDRESS_LONG}`)).toBe(false);
-  });
-
-  it("not isValid too long with 0x", async () => {
-    expect(AccountAddress.isValid(`0x00${ADDRESS_LONG}`)).toBe(false);
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/aptos_account.test.ts b/m1/JavaScript-client/src/tests/unit/aptos_account.test.ts
deleted file mode 100644
index cdbaf82e0..000000000
--- a/m1/JavaScript-client/src/tests/unit/aptos_account.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosAccount, AptosAccountObject, getAddressFromAccountOrAddress } from "../../account";
-import { HexString } from "../../utils";
-import nacl from "tweetnacl";
-
-const aptosAccountObject: AptosAccountObject = {
-  address: "0x978c213990c4833df71548df7ce49d54c759d6b6d932de22b24d56060b7af2aa",
-  privateKeyHex:
-    // eslint-disable-next-line max-len
-    "0xc5338cd251c22daa8c9c9cc94f498cc8a5c7e1d2e75287a5dda91096fe64efa5de19e5d1880cac87d57484ce9ed2e84cf0f9599f12e7cc3a52e4e7657a763f2c",
-  publicKeyHex: "0xde19e5d1880cac87d57484ce9ed2e84cf0f9599f12e7cc3a52e4e7657a763f2c",
-};
-
-const mnemonic = "shoot island position soft burden budget tooth cruel issue economy destroy above";
-
-test("generates random accounts", () => {
-  const a1 = new AptosAccount();
-  const a2 = new AptosAccount();
-  expect(a1.authKey()).not.toBe(a2.authKey());
-  expect(a1.address().hex()).not.toBe(a2.address().hex());
-});
-
-test("generates derive path accounts", () => {
-  const address = "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30";
-  const a1 = AptosAccount.fromDerivePath("m/44'/637'/0'/0'/0'", mnemonic);
-  expect(a1.address().hex()).toBe(address);
-});
-
-test("generates derive path accounts", () => {
-  expect(() => {
-    AptosAccount.fromDerivePath("", mnemonic);
-  }).toThrow(new Error("Invalid derivation path"));
-});
-
-test("accepts custom address", () => {
-  const address = "0x777";
-  const a1 = new AptosAccount(undefined, address);
-  expect(a1.address().hex()).toBe(address);
-});
-
-test("Deserializes from AptosAccountObject", () => {
-  const a1 = AptosAccount.fromAptosAccountObject(aptosAccountObject);
-  expect(a1.address().hex()).toBe(aptosAccountObject.address);
-  expect(a1.pubKey().hex()).toBe(aptosAccountObject.publicKeyHex);
-});
-
-test("Deserializes from AptosAccountObject without address", () => {
-  const privateKeyObject = { privateKeyHex: aptosAccountObject.privateKeyHex };
-  const a1 = AptosAccount.fromAptosAccountObject(privateKeyObject);
-  expect(a1.address().hex()).toBe(aptosAccountObject.address);
-  expect(a1.pubKey().hex()).toBe(aptosAccountObject.publicKeyHex);
-});
-
-test("Serializes/Deserializes", () => {
-  const a1 = new AptosAccount();
-  const a2 = AptosAccount.fromAptosAccountObject(a1.toPrivateKeyObject());
-  expect(a1.authKey().hex()).toBe(a2.authKey().hex());
-  expect(a1.address().hex()).toBe(a2.address().hex());
-});
-
-test("Signs and verifies strings", () => {
-  const a1 = AptosAccount.fromAptosAccountObject(aptosAccountObject);
-  const messageHex = "0x7777";
-  const expectedSignedMessage =
-    "0xc5de9e40ac00b371cd83b1c197fa5b665b7449b33cd3cdd305bb78222e06a671a49625ab9aea8a039d4bb70e275768084d62b094bc1b31964f2357b7c1af7e0d";
-  expect(a1.signHexString(messageHex).hex()).toBe(expectedSignedMessage);
-  expect(a1.verifySignature(messageHex, expectedSignedMessage)).toBe(true);
-  expect(a1.verifySignature(messageHex + "00", expectedSignedMessage)).toBe(false);
-});
-
-test("Gets the resource account address", () => {
-  const sourceAddress = "0xca843279e3427144cead5e4d5999a3d0";
-  const seed = new Uint8Array([1]);
-
-  expect(AptosAccount.getResourceAccountAddress(sourceAddress, seed).hex()).toBe(
-    "0xcbed05b37b6981a57f535c1f5d136734df822abaf4cd30c51c9b4d60eae79d5d",
-  );
-});
-
-test("Test getAddressFromAccountOrAddress", () => {
-  const account = AptosAccount.fromAptosAccountObject(aptosAccountObject);
-  expect(getAddressFromAccountOrAddress(aptosAccountObject.address!).toString()).toBe(aptosAccountObject.address);
-  expect(getAddressFromAccountOrAddress(HexString.ensure(aptosAccountObject.address!)).toString()).toBe(
-    aptosAccountObject.address,
-  );
-  expect(getAddressFromAccountOrAddress(account).toString()).toBe(aptosAccountObject.address);
-});
diff --git a/m1/JavaScript-client/src/tests/unit/builder.test.ts b/m1/JavaScript-client/src/tests/unit/builder.test.ts
deleted file mode 100644
index 6e66ee6cc..000000000
--- a/m1/JavaScript-client/src/tests/unit/builder.test.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import { TransactionBuilderRemoteABI } from "../../transaction_builder";
-import { AptosClient } from "../../providers";
-import { getFaucetClient, longTestTimeout, NODE_URL } from "./test_helper.test";
-import { AptosAccount } from "../../account";
-import {
-  RawTransaction,
-  TransactionPayloadEntryFunction,
-  TypeTagBool,
-  TypeTagStruct,
-  TypeTagU8,
-  TypeTagVector,
-} from "../../aptos_types";
-import { HexString } from "../../utils";
-
-describe.only("TransactionBuilderRemoteABI", () => {
-  test(
-    "generates raw txn from an entry function",
-    async () => {
-      const client = new AptosClient(NODE_URL);
-      const alice = new AptosAccount();
-      const faucetClient = getFaucetClient();
-      await faucetClient.fundAccount(alice.address(), 100000000);
-      // Create an instance of the class
-      const builder = new TransactionBuilderRemoteABI(client, { sender: alice.address() });
-
-      // Spy on the fetchABI method
-      const fetchABISpy = jest.spyOn(builder, "fetchABI");
-
-      // Mock the implementation of the fetchABI method to return a mock data
-      const abi = new Map();
-      abi.set("0x1::some_modules::SomeName", {
-        fullName: "0x1::some_modules::SomeName",
-        name: "SomeName",
-        is_entry: true,
-        is_view: false,
-        generic_type_params: [],
-        params: ["&signer", "0x1::string::String"],
-        return: [],
-        visibility: "public",
-      });
-      fetchABISpy.mockResolvedValue(abi);
-
-      // Call the build method with some arguments
-      const rawTxn = await builder.build("0x1::some_modules::SomeName", [], ["key"]);
-      expect(rawTxn instanceof RawTransaction).toBeTruthy();
-      expect(rawTxn.sender.address).toEqual(new HexString(alice.address().hex()).toUint8Array());
-      expect(rawTxn.payload instanceof TransactionPayloadEntryFunction).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.module_name.name.value).toBe("some_modules");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.function_name.value).toBe("SomeName");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args).toHaveLength(0);
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.args).toHaveLength(1);
-
-      // Restore the original implementation of the fetch method
-      fetchABISpy.mockRestore();
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "generates raw txn from an entry function with Object type",
-    async () => {
-      const client = new AptosClient(NODE_URL);
-      const alice = new AptosAccount();
-      const faucetClient = getFaucetClient();
-      await faucetClient.fundAccount(alice.address(), 100000000);
-      // Create an instance of the class
-      const builder = new TransactionBuilderRemoteABI(client, { sender: alice.address() });
-
-      // Spy on the fetchABI method
-      const fetchABISpy = jest.spyOn(builder, "fetchABI");
-
-      // Mock the implementation of the fetchABI method to return a mock data
-      const abi = new Map();
-      abi.set("0x1::some_modules::SomeName", {
-        fullName: "0x1::some_modules::SomeName",
-        name: "SomeName",
-        is_entry: true,
-        is_view: false,
-        generic_type_params: [
-          {
-            constraints: ["key"],
-          },
-        ],
-        params: ["&signer", "0x1::object::Object<T>", "0x1::string::String"],
-        return: [],
-        visibility: "public",
-      });
-      fetchABISpy.mockResolvedValue(abi);
-
-      // Call the build method with some arguments
-      const rawTxn = await builder.build(
-        "0x1::some_modules::SomeName",
-        ["0x1::type::SomeType"],
-        ["0x2b4d540735a4e128fda896f988415910a45cab41c9ddd802b32dd16e8f9ca3cd", "key"],
-      );
-
-      expect(rawTxn instanceof RawTransaction).toBeTruthy();
-      expect(rawTxn.sender.address).toEqual(new HexString(alice.address().hex()).toUint8Array());
-      expect(rawTxn.payload instanceof TransactionPayloadEntryFunction).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.module_name.name.value).toBe("some_modules");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.function_name.value).toBe("SomeName");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args).toHaveLength(1);
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.args).toHaveLength(2);
-
-      // Restore the original implementation of the fetch method
-      fetchABISpy.mockRestore();
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "generates raw txn from a generic entry function",
-    async () => {
-      const client = new AptosClient(NODE_URL);
-      const alice = new AptosAccount();
-      const faucetClient = getFaucetClient();
-      await faucetClient.fundAccount(alice.address(), 100000000);
-      // Create an instance of the class
-      const builder = new TransactionBuilderRemoteABI(client, { sender: alice.address() });
-
-      // Spy on the fetchABI method
-      const fetchABISpy = jest.spyOn(builder, "fetchABI");
-
-      // Mock the implementation of the fetchABI method to return a mock data
-      const abi = new Map();
-      abi.set("0x1::some_modules::SomeName", {
-        fullName: "0x1::some_modules::SomeName",
-        name: "SomeName",
-        is_entry: true,
-        is_view: false,
-        generic_type_params: [
-          {
-            constraints: ["key"],
-          },
-          {
-            constraints: ["drop"],
-          },
-        ],
-        params: ["&signer", "0x1::object::Object<T>", "0x1::string::String", "T1"],
-        return: [],
-        visibility: "public",
-      });
-      fetchABISpy.mockResolvedValue(abi);
-
-      // Call the build method with some arguments
-      const rawTxn = await builder.build(
-        "0x1::some_modules::SomeName",
-        ["0x1::type::SomeType", "vector<u8>"],
-        ["0x2b4d540735a4e128fda896f988415910a45cab41c9ddd802b32dd16e8f9ca3cd", "key", "[hello,world]"],
-      );
-
-      expect(rawTxn instanceof RawTransaction).toBeTruthy();
-      expect(rawTxn.sender.address).toEqual(new HexString(alice.address().hex()).toUint8Array());
-      expect(rawTxn.payload instanceof TransactionPayloadEntryFunction).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.module_name.name.value).toBe("some_modules");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.function_name.value).toBe("SomeName");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args).toHaveLength(2);
-      expect(
-        (rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args[0] instanceof TypeTagStruct,
-      ).toBeTruthy();
-      expect(
-        (rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args[1] instanceof TypeTagVector,
-      ).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.args).toHaveLength(3);
-
-      // Restore the original implementation of the fetch method
-      fetchABISpy.mockRestore();
-    },
-    longTestTimeout,
-  );
-
-  test(
-    "generates raw txn from an entry function with multiple generic params",
-    async () => {
-      const client = new AptosClient(NODE_URL);
-      const alice = new AptosAccount();
-      const faucetClient = getFaucetClient();
-      await faucetClient.fundAccount(alice.address(), 100000000);
-      // Create an instance of the class
-      const builder = new TransactionBuilderRemoteABI(client, { sender: alice.address() });
-
-      // Spy on the fetchABI method
-      const fetchABISpy = jest.spyOn(builder, "fetchABI");
-
-      // Mock the implementation of the fetchABI method to return a mock data
-      const abi = new Map();
-      abi.set("0x1::some_modules::SomeName", {
-        fullName: "0x1::some_modules::SomeName",
-        name: "SomeName",
-        is_entry: true,
-        is_view: false,
-        generic_type_params: [
-          {
-            constraints: ["key"],
-          },
-          {
-            constraints: ["drop"],
-          },
-          {
-            constraints: ["key"],
-          },
-        ],
-        params: ["&signer", "T0", "0x1::string::String", "T1", "T2"],
-        return: [],
-        visibility: "public",
-      });
-      fetchABISpy.mockResolvedValue(abi);
-
-      // Call the build method with some arguments
-      const rawTxn = await builder.build(
-        "0x1::some_modules::SomeName",
-        ["bool", "vector<u8>", "u8"],
-        ["true", "key", "[hello,world]", "6"],
-      );
-
-      expect(rawTxn instanceof RawTransaction).toBeTruthy();
-      expect(rawTxn.sender.address).toEqual(new HexString(alice.address().hex()).toUint8Array());
-      expect(rawTxn.payload instanceof TransactionPayloadEntryFunction).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.module_name.name.value).toBe("some_modules");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.function_name.value).toBe("SomeName");
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args).toHaveLength(3);
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args[0] instanceof TypeTagBool).toBeTruthy();
-      expect(
-        (rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args[1] instanceof TypeTagVector,
-      ).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.ty_args[2] instanceof TypeTagU8).toBeTruthy();
-      expect((rawTxn.payload as TransactionPayloadEntryFunction).value.args).toHaveLength(4);
-
-      // Restore the original implementation of the fetch method
-      fetchABISpy.mockRestore();
-    },
-    longTestTimeout,
-  );
-});
diff --git a/m1/JavaScript-client/src/tests/unit/builder_utils.test.ts b/m1/JavaScript-client/src/tests/unit/builder_utils.test.ts
deleted file mode 100644
index 885765d29..000000000
--- a/m1/JavaScript-client/src/tests/unit/builder_utils.test.ts
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { HexString } from "../../utils";
-import {
-  AccountAddress,
-  Identifier,
-  StructTag,
-  TransactionArgumentAddress,
-  TransactionArgumentBool,
-  TransactionArgumentU128,
-  TransactionArgumentU64,
-  TransactionArgumentU8,
-  TransactionArgumentU8Vector,
-  TypeTagAddress,
-  TypeTagBool,
-  TypeTagParser,
-  TypeTagStruct,
-  TypeTagU128,
-  TypeTagU16,
-  TypeTagU256,
-  TypeTagU32,
-  TypeTagU64,
-  TypeTagU8,
-  TypeTagVector,
-} from "../../aptos_types";
-import { Serializer } from "../../bcs";
-import {
-  argToTransactionArgument,
-  serializeArg,
-  ensureBoolean,
-  ensureNumber,
-  ensureBigInt,
-} from "../../transaction_builder/builder_utils";
-
-describe("BuilderUtils", () => {
-  it("parses a bool TypeTag", async () => {
-    expect(new TypeTagParser("bool").parseTypeTag() instanceof TypeTagBool).toBeTruthy();
-  });
-
-  it("parses a u8 TypeTag", async () => {
-    expect(new TypeTagParser("u8").parseTypeTag() instanceof TypeTagU8).toBeTruthy();
-  });
-
-  it("parses a u16 TypeTag", async () => {
-    expect(new TypeTagParser("u16").parseTypeTag() instanceof TypeTagU16).toBeTruthy();
-  });
-
-  it("parses a u32 TypeTag", async () => {
-    expect(new TypeTagParser("u32").parseTypeTag() instanceof TypeTagU32).toBeTruthy();
-  });
-
-  it("parses a u64 TypeTag", async () => {
-    expect(new TypeTagParser("u64").parseTypeTag() instanceof TypeTagU64).toBeTruthy();
-  });
-
-  it("parses a u128 TypeTag", async () => {
-    expect(new TypeTagParser("u128").parseTypeTag() instanceof TypeTagU128).toBeTruthy();
-  });
-
-  it("parses a u256 TypeTag", async () => {
-    expect(new TypeTagParser("u256").parseTypeTag() instanceof TypeTagU256).toBeTruthy();
-  });
-
-  it("parses a address TypeTag", async () => {
-    expect(new TypeTagParser("address").parseTypeTag() instanceof TypeTagAddress).toBeTruthy();
-  });
-
-  it("parses a vector TypeTag", async () => {
-    const vectorAddress = new TypeTagParser("vector<address>").parseTypeTag();
-    expect(vectorAddress instanceof TypeTagVector).toBeTruthy();
-    expect((vectorAddress as TypeTagVector).value instanceof TypeTagAddress).toBeTruthy();
-
-    const vectorU64 = new TypeTagParser(" vector < u64 > ").parseTypeTag();
-    expect(vectorU64 instanceof TypeTagVector).toBeTruthy();
-    expect((vectorU64 as TypeTagVector).value instanceof TypeTagU64).toBeTruthy();
-  });
-
-  it("parses a sturct TypeTag", async () => {
-    const assertStruct = (struct: TypeTagStruct, accountAddress: string, moduleName: string, structName: string) => {
-      expect(HexString.fromUint8Array(struct.value.address.address).toShortString()).toBe(accountAddress);
-      expect(struct.value.module_name.value).toBe(moduleName);
-      expect(struct.value.name.value).toBe(structName);
-    };
-    const coin = new TypeTagParser("0x1::test_coin::Coin").parseTypeTag();
-    expect(coin instanceof TypeTagStruct).toBeTruthy();
-    assertStruct(coin as TypeTagStruct, "0x1", "test_coin", "Coin");
-
-    const aptosCoin = new TypeTagParser(
-      "0x1::coin::CoinStore < 0x1::test_coin::AptosCoin1 ,  0x1::test_coin::AptosCoin2 > ",
-    ).parseTypeTag();
-    expect(aptosCoin instanceof TypeTagStruct).toBeTruthy();
-    assertStruct(aptosCoin as TypeTagStruct, "0x1", "coin", "CoinStore");
-
-    const aptosCoinTrailingComma = new TypeTagParser(
-      "0x1::coin::CoinStore < 0x1::test_coin::AptosCoin1 ,  0x1::test_coin::AptosCoin2, > ",
-    ).parseTypeTag();
-    expect(aptosCoinTrailingComma instanceof TypeTagStruct).toBeTruthy();
-    assertStruct(aptosCoinTrailingComma as TypeTagStruct, "0x1", "coin", "CoinStore");
-
-    const structTypeTags = (aptosCoin as TypeTagStruct).value.type_args;
-    expect(structTypeTags.length).toBe(2);
-
-    const structTypeTag1 = structTypeTags[0];
-    assertStruct(structTypeTag1 as TypeTagStruct, "0x1", "test_coin", "AptosCoin1");
-
-    const structTypeTag2 = structTypeTags[1];
-    assertStruct(structTypeTag2 as TypeTagStruct, "0x1", "test_coin", "AptosCoin2");
-
-    const coinComplex = new TypeTagParser(
-      // eslint-disable-next-line max-len
-      "0x1::coin::CoinStore < 0x2::coin::LPCoin < 0x1::test_coin::AptosCoin1 <u8>, vector<0x1::test_coin::AptosCoin2 > > >",
-    ).parseTypeTag();
-
-    expect(coinComplex instanceof TypeTagStruct).toBeTruthy();
-    assertStruct(coinComplex as TypeTagStruct, "0x1", "coin", "CoinStore");
-    const coinComplexTypeTag = (coinComplex as TypeTagStruct).value.type_args[0];
-    assertStruct(coinComplexTypeTag as TypeTagStruct, "0x2", "coin", "LPCoin");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin::CoinStore<0x1::test_coin::AptosCoin").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin::CoinStore<0x1::test_coin>").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1:test_coin::AptosCoin").parseTypeTag();
-    }).toThrow("Unrecognized token.");
-
-    expect(() => {
-      new TypeTagParser("0x!::test_coin::AptosCoin").parseTypeTag();
-    }).toThrow("Unrecognized token.");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin::AptosCoin<").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin::CoinStore<0x1::test_coin::AptosCoin,").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1::<::CoinStore<0x1::test_coin::AptosCoin,").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("0x1::test_coin::><0x1::test_coin::AptosCoin,").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-
-    expect(() => {
-      new TypeTagParser("u3").parseTypeTag();
-    }).toThrow("Invalid type tag.");
-  });
-
-  it("serializes a boolean arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(true, new TypeTagBool(), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x01]));
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg(123, new TypeTagBool(), serializer);
-    }).toThrow(/Invalid arg/);
-  });
-
-  it("serializes a u8 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(255, new TypeTagU8(), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u8", new TypeTagU8(), serializer);
-    }).toThrow(/Invalid number string/);
-  });
-
-  it("serializes a u16 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(0x7fff, new TypeTagU16(), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff, 0x7f]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u16", new TypeTagU16(), serializer);
-    }).toThrow(/Invalid number string/);
-  });
-
-  it("serializes a u32 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(0x01020304, new TypeTagU32(), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x04, 0x03, 0x02, 0x01]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u32", new TypeTagU32(), serializer);
-    }).toThrow(/Invalid number string/);
-  });
-
-  it("serializes a u64 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(BigInt("18446744073709551615"), new TypeTagU64(), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u64", new TypeTagU64(), serializer);
-    }).toThrow(/^Cannot convert/);
-  });
-
-  it("serializes a u128 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(BigInt("340282366920938463463374607431768211455"), new TypeTagU128(), serializer);
-    expect(serializer.getBytes()).toEqual(
-      new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    );
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u128", new TypeTagU128(), serializer);
-    }).toThrow(/^Cannot convert/);
-  });
-
-  it("serializes a u256 arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(
-      BigInt("0x0001020304050607080910111213141516171819202122232425262728293031"),
-      new TypeTagU256(),
-      serializer,
-    );
-    expect(serializer.getBytes()).toEqual(
-      new Uint8Array([
-        0x31, 0x30, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14,
-        0x13, 0x12, 0x11, 0x10, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-      ]),
-    );
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg("u256", new TypeTagU256(), serializer);
-    }).toThrow(/^Cannot convert/);
-  });
-
-  it("serializes an AccountAddress arg", async () => {
-    let serializer = new Serializer();
-    serializeArg("0x1", new TypeTagAddress(), serializer);
-    expect(HexString.fromUint8Array(serializer.getBytes()).toShortString()).toEqual("0x1");
-
-    serializer = new Serializer();
-    serializeArg(AccountAddress.fromHex("0x1"), new TypeTagAddress(), serializer);
-    expect(HexString.fromUint8Array(serializer.getBytes()).toShortString()).toEqual("0x1");
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg(123456, new TypeTagAddress(), serializer);
-    }).toThrow("Invalid account address.");
-  });
-
-  it("serializes a vector arg", async () => {
-    let serializer = new Serializer();
-    serializeArg([255], new TypeTagVector(new TypeTagU8()), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x1, 0xff]));
-
-    serializer = new Serializer();
-    serializeArg("abc", new TypeTagVector(new TypeTagU8()), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x3, 0x61, 0x62, 0x63]));
-
-    serializer = new Serializer();
-    serializeArg(new Uint8Array([0x61, 0x62, 0x63]), new TypeTagVector(new TypeTagU8()), serializer);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x3, 0x61, 0x62, 0x63]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg(123456, new TypeTagVector(new TypeTagU8()), serializer);
-    }).toThrow("Invalid vector args.");
-  });
-
-  it("serializes a struct arg", async () => {
-    let serializer = new Serializer();
-    serializeArg(
-      "abc",
-      new TypeTagStruct(
-        new StructTag(AccountAddress.fromHex("0x1"), new Identifier("string"), new Identifier("String"), []),
-      ),
-      serializer,
-    );
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x3, 0x61, 0x62, 0x63]));
-
-    serializer = new Serializer();
-    expect(() => {
-      serializeArg(
-        "abc",
-        new TypeTagStruct(
-          new StructTag(AccountAddress.fromHex("0x3"), new Identifier("token"), new Identifier("Token"), []),
-        ),
-        serializer,
-      );
-    }).toThrow("The only supported struct arg is of type 0x1::string::String");
-  });
-
-  it("throws at unrecognized arg types", async () => {
-    const serializer = new Serializer();
-    expect(() => {
-      // @ts-ignore
-      serializeArg(123456, "unknown_type", serializer);
-    }).toThrow("Unsupported arg type.");
-  });
-
-  it("converts a boolean TransactionArgument", async () => {
-    const res = argToTransactionArgument(true, new TypeTagBool());
-    expect((res as TransactionArgumentBool).value).toEqual(true);
-    expect(() => {
-      argToTransactionArgument(123, new TypeTagBool());
-    }).toThrow(/Invalid arg/);
-  });
-
-  it("converts a u8 TransactionArgument", async () => {
-    const res = argToTransactionArgument(123, new TypeTagU8());
-    expect((res as TransactionArgumentU8).value).toEqual(123);
-    expect(() => {
-      argToTransactionArgument("u8", new TypeTagBool());
-    }).toThrow(/Invalid boolean string/);
-  });
-
-  it("converts a u64 TransactionArgument", async () => {
-    const res = argToTransactionArgument(123, new TypeTagU64());
-    expect((res as TransactionArgumentU64).value).toEqual(BigInt(123));
-    expect(() => {
-      argToTransactionArgument("u64", new TypeTagU64());
-    }).toThrow(/Cannot convert/);
-  });
-
-  it("converts a u128 TransactionArgument", async () => {
-    const res = argToTransactionArgument(123, new TypeTagU128());
-    expect((res as TransactionArgumentU128).value).toEqual(BigInt(123));
-    expect(() => {
-      argToTransactionArgument("u128", new TypeTagU128());
-    }).toThrow(/Cannot convert/);
-  });
-
-  it("converts an AccountAddress TransactionArgument", async () => {
-    let res = argToTransactionArgument("0x1", new TypeTagAddress()) as TransactionArgumentAddress;
-    expect(HexString.fromUint8Array(res.value.address).toShortString()).toEqual("0x1");
-
-    res = argToTransactionArgument(AccountAddress.fromHex("0x2"), new TypeTagAddress()) as TransactionArgumentAddress;
-    expect(HexString.fromUint8Array(res.value.address).toShortString()).toEqual("0x2");
-
-    expect(() => {
-      argToTransactionArgument(123456, new TypeTagAddress());
-    }).toThrow("Invalid account address.");
-  });
-
-  it("converts a vector TransactionArgument", async () => {
-    const res = argToTransactionArgument(
-      new Uint8Array([0x1]),
-      new TypeTagVector(new TypeTagU8()),
-    ) as TransactionArgumentU8Vector;
-    expect(res.value).toEqual(new Uint8Array([0x1]));
-
-    expect(() => {
-      argToTransactionArgument(123456, new TypeTagVector(new TypeTagU8()));
-    }).toThrow(/.*should be an instance of Uint8Array$/);
-  });
-
-  it("throws at unrecognized TransactionArgument types", async () => {
-    expect(() => {
-      // @ts-ignore
-      argToTransactionArgument(123456, "unknown_type");
-    }).toThrow("Unknown type for TransactionArgument.");
-  });
-
-  it("ensures a boolean", async () => {
-    expect(ensureBoolean(false)).toBe(false);
-    expect(ensureBoolean(true)).toBe(true);
-    expect(ensureBoolean("true")).toBe(true);
-    expect(ensureBoolean("false")).toBe(false);
-    expect(() => ensureBoolean("True")).toThrow("Invalid boolean string.");
-  });
-
-  it("ensures a number", async () => {
-    expect(ensureNumber(10)).toBe(10);
-    expect(ensureNumber("123")).toBe(123);
-    expect(() => ensureNumber("True")).toThrow("Invalid number string.");
-  });
-
-  it("ensures a bigint", async () => {
-    expect(ensureBigInt(10)).toBe(BigInt(10));
-    expect(ensureBigInt("123")).toBe(BigInt(123));
-    expect(() => ensureBigInt("True")).toThrow(/^Cannot convert/);
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/deserializer.test.ts b/m1/JavaScript-client/src/tests/unit/deserializer.test.ts
deleted file mode 100644
index 5baee4494..000000000
--- a/m1/JavaScript-client/src/tests/unit/deserializer.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Deserializer } from "../../bcs/deserializer";
-
-describe("BCS Deserializer", () => {
-  it("deserializes a non-empty string", () => {
-    const deserializer = new Deserializer(
-      new Uint8Array([
-        24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e, 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2, 0x88,
-        0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab,
-      ]),
-    );
-    expect(deserializer.deserializeStr()).toBe("çå∞≠¢õß∂ƒ∫");
-  });
-
-  it("deserializes an empty string", () => {
-    const deserializer = new Deserializer(new Uint8Array([0]));
-    expect(deserializer.deserializeStr()).toBe("");
-  });
-
-  it("deserializes dynamic length bytes", () => {
-    const deserializer = new Deserializer(new Uint8Array([5, 0x41, 0x70, 0x74, 0x6f, 0x73]));
-    expect(deserializer.deserializeBytes()).toEqual(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-  });
-
-  it("deserializes dynamic length bytes with zero elements", () => {
-    const deserializer = new Deserializer(new Uint8Array([0]));
-    expect(deserializer.deserializeBytes()).toEqual(new Uint8Array([]));
-  });
-
-  it("deserializes fixed length bytes", () => {
-    const deserializer = new Deserializer(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-    expect(deserializer.deserializeFixedBytes(5)).toEqual(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-  });
-
-  it("deserializes fixed length bytes with zero element", () => {
-    const deserializer = new Deserializer(new Uint8Array([]));
-    expect(deserializer.deserializeFixedBytes(0)).toEqual(new Uint8Array([]));
-  });
-
-  it("deserializes a boolean value", () => {
-    let deserializer = new Deserializer(new Uint8Array([0x01]));
-    expect(deserializer.deserializeBool()).toEqual(true);
-    deserializer = new Deserializer(new Uint8Array([0x00]));
-    expect(deserializer.deserializeBool()).toEqual(false);
-  });
-
-  it("throws when dserializing a boolean with disallowed values", () => {
-    expect(() => {
-      const deserializer = new Deserializer(new Uint8Array([0x12]));
-      deserializer.deserializeBool();
-    }).toThrow("Invalid boolean value");
-  });
-
-  it("deserializes a uint8", () => {
-    const deserializer = new Deserializer(new Uint8Array([0xff]));
-    expect(deserializer.deserializeU8()).toEqual(255);
-  });
-
-  it("deserializes a uint16", () => {
-    let deserializer = new Deserializer(new Uint8Array([0xff, 0xff]));
-    expect(deserializer.deserializeU16()).toEqual(65535);
-    deserializer = new Deserializer(new Uint8Array([0x34, 0x12]));
-    expect(deserializer.deserializeU16()).toEqual(4660);
-  });
-
-  it("deserializes a uint32", () => {
-    let deserializer = new Deserializer(new Uint8Array([0xff, 0xff, 0xff, 0xff]));
-    expect(deserializer.deserializeU32()).toEqual(4294967295);
-    deserializer = new Deserializer(new Uint8Array([0x78, 0x56, 0x34, 0x12]));
-    expect(deserializer.deserializeU32()).toEqual(305419896);
-  });
-
-  it("deserializes a uint64", () => {
-    let deserializer = new Deserializer(new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]));
-    expect(deserializer.deserializeU64()).toEqual(BigInt("18446744073709551615"));
-    deserializer = new Deserializer(new Uint8Array([0x00, 0xef, 0xcd, 0xab, 0x78, 0x56, 0x34, 0x12]));
-    expect(deserializer.deserializeU64()).toEqual(BigInt("1311768467750121216"));
-  });
-
-  it("deserializes a uint128", () => {
-    let deserializer = new Deserializer(
-      new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    );
-    expect(deserializer.deserializeU128()).toEqual(BigInt("340282366920938463463374607431768211455"));
-    deserializer = new Deserializer(
-      new Uint8Array([0x00, 0xef, 0xcd, 0xab, 0x78, 0x56, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    );
-    expect(deserializer.deserializeU128()).toEqual(BigInt("1311768467750121216"));
-  });
-  it("deserializes a uint256", () => {
-    let deserializer = new Deserializer(
-      new Uint8Array([
-        0x31, 0x30, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x20, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14,
-        0x13, 0x12, 0x11, 0x10, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-      ]),
-    );
-    expect(deserializer.deserializeU256()).toEqual(
-      BigInt("0x0001020304050607080910111213141516171819202122232425262728293031"),
-    );
-  });
-
-  it("deserializes a uleb128", () => {
-    let deserializer = new Deserializer(new Uint8Array([0xcd, 0xea, 0xec, 0x31]));
-    expect(deserializer.deserializeUleb128AsU32()).toEqual(104543565);
-
-    deserializer = new Deserializer(new Uint8Array([0xff, 0xff, 0xff, 0xff, 0x0f]));
-    expect(deserializer.deserializeUleb128AsU32()).toEqual(4294967295);
-  });
-
-  it("throws when deserializing a uleb128 with out ranged value", () => {
-    expect(() => {
-      const deserializer = new Deserializer(new Uint8Array([0x80, 0x80, 0x80, 0x80, 0x10]));
-      deserializer.deserializeUleb128AsU32();
-    }).toThrow("Overflow while parsing uleb128-encoded uint32 value");
-  });
-
-  it("throws when deserializing against buffer that has been drained", () => {
-    expect(() => {
-      const deserializer = new Deserializer(
-        new Uint8Array([
-          24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e, 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2,
-          0x88, 0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab,
-        ]),
-      );
-
-      deserializer.deserializeStr();
-      deserializer.deserializeStr();
-    }).toThrow("Reached to the end of buffer");
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/helper.test.ts b/m1/JavaScript-client/src/tests/unit/helper.test.ts
deleted file mode 100644
index fc5241844..000000000
--- a/m1/JavaScript-client/src/tests/unit/helper.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AccountAddress } from "../../aptos_types";
-import { Deserializer } from "../../bcs/deserializer";
-import {
-  bcsSerializeBool,
-  bcsSerializeBytes,
-  bcsSerializeFixedBytes,
-  bcsSerializeStr,
-  bcsSerializeU128,
-  bcsSerializeU16,
-  bcsSerializeU32,
-  bcsSerializeU8,
-  bcsSerializeUint64,
-  bcsToBytes,
-  deserializeVector,
-  serializeVector,
-  serializeVectorWithFunc,
-} from "../../bcs/helper";
-import { Serializer } from "../../bcs/serializer";
-
-test("serializes and deserializes a vector of serializables", () => {
-  const address0 = AccountAddress.fromHex("0x1");
-  const address1 = AccountAddress.fromHex("0x2");
-
-  const serializer = new Serializer();
-  serializeVector([address0, address1], serializer);
-
-  const addresses: AccountAddress[] = deserializeVector(new Deserializer(serializer.getBytes()), AccountAddress);
-
-  expect(addresses[0].address).toEqual(address0.address);
-  expect(addresses[1].address).toEqual(address1.address);
-});
-
-test("bcsToBytes", () => {
-  const address = AccountAddress.fromHex("0x1");
-  bcsToBytes(address);
-
-  expect(bcsToBytes(address)).toEqual(
-    new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]),
-  );
-});
-
-test("bcsSerializeU8", () => {
-  expect(bcsSerializeU8(255)).toEqual(new Uint8Array([0xff]));
-});
-
-test("bcsSerializeU16", () => {
-  expect(bcsSerializeU16(65535)).toEqual(new Uint8Array([0xff, 0xff]));
-});
-
-test("bcsSerializeU32", () => {
-  expect(bcsSerializeU32(4294967295)).toEqual(new Uint8Array([0xff, 0xff, 0xff, 0xff]));
-});
-
-test("bcsSerializeU64", () => {
-  expect(bcsSerializeUint64(BigInt("18446744073709551615"))).toEqual(
-    new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-  );
-});
-
-test("bcsSerializeU128", () => {
-  expect(bcsSerializeU128(BigInt("340282366920938463463374607431768211455"))).toEqual(
-    new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-  );
-});
-
-test("bcsSerializeBool", () => {
-  expect(bcsSerializeBool(true)).toEqual(new Uint8Array([0x01]));
-});
-
-test("bcsSerializeStr", () => {
-  expect(bcsSerializeStr("çå∞≠¢õß∂ƒ∫")).toEqual(
-    new Uint8Array([
-      24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e, 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2, 0x88,
-      0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab,
-    ]),
-  );
-});
-
-test("bcsSerializeBytes", () => {
-  expect(bcsSerializeBytes(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]))).toEqual(
-    new Uint8Array([5, 0x41, 0x70, 0x74, 0x6f, 0x73]),
-  );
-});
-
-test("bcsSerializeFixedBytes", () => {
-  expect(bcsSerializeFixedBytes(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]))).toEqual(
-    new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]),
-  );
-});
-
-test("serializeVectorWithFunc", () => {
-  expect(serializeVectorWithFunc([false, true], "serializeBool")).toEqual(new Uint8Array([0x2, 0x0, 0x1]));
-});
diff --git a/m1/JavaScript-client/src/tests/unit/hex_string.test.ts b/m1/JavaScript-client/src/tests/unit/hex_string.test.ts
deleted file mode 100644
index 60b6cd48f..000000000
--- a/m1/JavaScript-client/src/tests/unit/hex_string.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { HexString } from "../../utils";
-
-const withoutPrefix = "007711b4d0";
-const withPrefix = `0x${withoutPrefix}`;
-
-function validate(hexString: HexString) {
-  expect(hexString.hex()).toBe(withPrefix);
-  expect(hexString.toString()).toBe(withPrefix);
-  expect(`${hexString}`).toBe(withPrefix);
-  expect(hexString.noPrefix()).toBe(withoutPrefix);
-}
-
-test("from/to Uint8Array", () => {
-  const hs = new HexString(withoutPrefix);
-  expect(HexString.fromUint8Array(hs.toUint8Array()).hex()).toBe(withPrefix);
-});
-
-test("accepts input without prefix", () => {
-  const hs = new HexString(withoutPrefix);
-  validate(hs);
-});
-
-test("accepts input with prefix", () => {
-  const hs = new HexString(withPrefix);
-  validate(hs);
-});
-
-test("ensures input when string", () => {
-  const hs = HexString.ensure(withoutPrefix);
-  validate(hs);
-});
-
-test("ensures input when HexString", () => {
-  const hs1 = new HexString(withPrefix);
-  const hs = HexString.ensure(hs1);
-  validate(hs);
-});
-
-test("short address form correct", () => {
-  const hs1 = new HexString(withoutPrefix);
-  expect(hs1.toShortString()).toBe("0x7711b4d0");
-  const hs2 = new HexString("0x2185b82cef9bc46249ff2dbc56c265f6a0e3bdb7b9498cc45e4f6e429530fdc0");
-  expect(hs2.toShortString()).toBe("0x2185b82cef9bc46249ff2dbc56c265f6a0e3bdb7b9498cc45e4f6e429530fdc0");
-});
diff --git a/m1/JavaScript-client/src/tests/unit/misc.test.ts b/m1/JavaScript-client/src/tests/unit/misc.test.ts
deleted file mode 100644
index 958f940e1..000000000
--- a/m1/JavaScript-client/src/tests/unit/misc.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { AptosClient } from "../../providers/aptos_client";
-
-test("test fixNodeUrl", () => {
-  expect(new AptosClient("https://test.com").client.request.config.BASE).toBe("https://test.com/v1");
-  expect(new AptosClient("https://test.com/").client.request.config.BASE).toBe("https://test.com/v1");
-  expect(new AptosClient("https://test.com/v1").client.request.config.BASE).toBe("https://test.com/v1");
-  expect(new AptosClient("https://test.com/v1/").client.request.config.BASE).toBe("https://test.com/v1");
-  expect(new AptosClient("https://test.com", {}, true).client.request.config.BASE).toBe("https://test.com");
-});
diff --git a/m1/JavaScript-client/src/tests/unit/multi_ed25519.test.ts b/m1/JavaScript-client/src/tests/unit/multi_ed25519.test.ts
deleted file mode 100644
index 7e489c47a..000000000
--- a/m1/JavaScript-client/src/tests/unit/multi_ed25519.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable max-len */
-import { HexString } from "../../utils";
-import { bcsToBytes, Deserializer } from "../../bcs";
-import { Ed25519PublicKey, Ed25519Signature } from "../../aptos_types/ed25519";
-import { MultiEd25519PublicKey, MultiEd25519Signature } from "../../aptos_types/multi_ed25519";
-
-describe("MultiEd25519", () => {
-  it("public key serializes to bytes correctly", async () => {
-    const publicKey1 = "b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200";
-    const publicKey2 = "aef3f4a4b8eca1dfc343361bf8e436bd42de9259c04b8314eb8e2054dd6e82ab";
-    const publicKey3 = "8a5762e21ac1cdb3870442c77b4c3af58c7cedb8779d0270e6d4f1e2f7367d74";
-
-    const pubKeyMultiSig = new MultiEd25519PublicKey(
-      [
-        new Ed25519PublicKey(new HexString(publicKey1).toUint8Array()),
-        new Ed25519PublicKey(new HexString(publicKey2).toUint8Array()),
-        new Ed25519PublicKey(new HexString(publicKey3).toUint8Array()),
-      ],
-      2,
-    );
-
-    expect(HexString.fromUint8Array(pubKeyMultiSig.toBytes()).noPrefix()).toEqual(
-      "b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200aef3f4a4b8eca1dfc343361bf8e436bd42de9259c04b8314eb8e2054dd6e82ab8a5762e21ac1cdb3870442c77b4c3af58c7cedb8779d0270e6d4f1e2f7367d7402",
-    );
-  });
-
-  it("public key deserializes from bytes correctly", async () => {
-    const publicKey1 = "b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200";
-    const publicKey2 = "aef3f4a4b8eca1dfc343361bf8e436bd42de9259c04b8314eb8e2054dd6e82ab";
-    const publicKey3 = "8a5762e21ac1cdb3870442c77b4c3af58c7cedb8779d0270e6d4f1e2f7367d74";
-
-    const pubKeyMultiSig = new MultiEd25519PublicKey(
-      [
-        new Ed25519PublicKey(new HexString(publicKey1).toUint8Array()),
-        new Ed25519PublicKey(new HexString(publicKey2).toUint8Array()),
-        new Ed25519PublicKey(new HexString(publicKey3).toUint8Array()),
-      ],
-      2,
-    );
-    const deserialzed = MultiEd25519PublicKey.deserialize(new Deserializer(bcsToBytes(pubKeyMultiSig)));
-    expect(HexString.fromUint8Array(deserialzed.toBytes()).noPrefix()).toEqual(
-      HexString.fromUint8Array(pubKeyMultiSig.toBytes()).noPrefix(),
-    );
-  });
-
-  it("signature serializes to bytes correctly", async () => {
-    // eslint-disable-next-line operator-linebreak
-    const sig1 =
-      "e6f3ba05469b2388492397840183945d4291f0dd3989150de3248e06b4cefe0ddf6180a80a0f04c045ee8f362870cb46918478cd9b56c66076f94f3efd5a8805";
-    // eslint-disable-next-line operator-linebreak
-    const sig2 =
-      "2ae0818b7e51b853f1e43dc4c89a1f5fabc9cb256030a908f9872f3eaeb048fb1e2b4ffd5a9d5d1caedd0c8b7d6155ed8071e913536fa5c5a64327b6f2d9a102";
-    const bitmap = "c0000000";
-
-    const multisig = new MultiEd25519Signature(
-      [
-        new Ed25519Signature(new HexString(sig1).toUint8Array()),
-        new Ed25519Signature(new HexString(sig2).toUint8Array()),
-      ],
-      new HexString(bitmap).toUint8Array(),
-    );
-
-    expect(HexString.fromUint8Array(multisig.toBytes()).noPrefix()).toEqual(
-      "e6f3ba05469b2388492397840183945d4291f0dd3989150de3248e06b4cefe0ddf6180a80a0f04c045ee8f362870cb46918478cd9b56c66076f94f3efd5a88052ae0818b7e51b853f1e43dc4c89a1f5fabc9cb256030a908f9872f3eaeb048fb1e2b4ffd5a9d5d1caedd0c8b7d6155ed8071e913536fa5c5a64327b6f2d9a102c0000000",
-    );
-  });
-
-  it("signature deserializes from bytes correctly", async () => {
-    // eslint-disable-next-line operator-linebreak
-    const sig1 =
-      "e6f3ba05469b2388492397840183945d4291f0dd3989150de3248e06b4cefe0ddf6180a80a0f04c045ee8f362870cb46918478cd9b56c66076f94f3efd5a8805";
-    // eslint-disable-next-line operator-linebreak
-    const sig2 =
-      "2ae0818b7e51b853f1e43dc4c89a1f5fabc9cb256030a908f9872f3eaeb048fb1e2b4ffd5a9d5d1caedd0c8b7d6155ed8071e913536fa5c5a64327b6f2d9a102";
-    const bitmap = "c0000000";
-
-    const multisig = new MultiEd25519Signature(
-      [
-        new Ed25519Signature(new HexString(sig1).toUint8Array()),
-        new Ed25519Signature(new HexString(sig2).toUint8Array()),
-      ],
-      new HexString(bitmap).toUint8Array(),
-    );
-
-    const deserialzed = MultiEd25519Signature.deserialize(new Deserializer(bcsToBytes(multisig)));
-    expect(HexString.fromUint8Array(deserialzed.toBytes()).noPrefix()).toEqual(
-      HexString.fromUint8Array(multisig.toBytes()).noPrefix(),
-    );
-  });
-
-  it("creates a valid bitmap", () => {
-    expect(MultiEd25519Signature.createBitmap([0, 2, 31])).toEqual(
-      new Uint8Array([0b10100000, 0b00000000, 0b00000000, 0b00000001]),
-    );
-  });
-
-  it("throws exception when creating a bitmap with wrong bits", async () => {
-    expect(() => {
-      MultiEd25519Signature.createBitmap([32]);
-    }).toThrow("Invalid bit value 32.");
-  });
-
-  it("throws exception when creating a bitmap with duplicate bits", async () => {
-    expect(() => {
-      MultiEd25519Signature.createBitmap([2, 2]);
-    }).toThrow("Duplicated bits detected.");
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/property_map_serde.test.ts b/m1/JavaScript-client/src/tests/unit/property_map_serde.test.ts
deleted file mode 100644
index ae64deb3c..000000000
--- a/m1/JavaScript-client/src/tests/unit/property_map_serde.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { deserializeValueBasedOnTypeTag, getPropertyType, getPropertyValueRaw } from "../../utils/property_map_serde";
-import {
-  bcsSerializeBool,
-  bcsSerializeStr,
-  bcsSerializeU128,
-  bcsSerializeU8,
-  bcsSerializeUint64,
-  bcsToBytes,
-  Bytes,
-} from "../../bcs";
-import { AccountAddress } from "../../aptos_types";
-import { HexString } from "../../utils";
-
-test("test property_map_serializer", () => {
-  function isSame(array1: Bytes, array2: Bytes): boolean {
-    return array1.length === array2.length && array1.every((element, index) => element === array2[index]);
-  }
-  const values = [
-    "false",
-    "10",
-    "18446744073709551615",
-    "340282366920938463463374607431768211455",
-    "hello",
-    "0x1",
-    "I am a string",
-  ];
-  const types = ["bool", "u8", "u64", "u128", "0x1::string::String", "address", "string"];
-  const newValues = getPropertyValueRaw(values, types);
-  expect(isSame(newValues[0], bcsSerializeBool(false))).toBe(true);
-  expect(isSame(newValues[1], bcsSerializeU8(10))).toBe(true);
-  expect(isSame(newValues[2], bcsSerializeUint64(18446744073709551615n))).toBe(true);
-  expect(isSame(newValues[3], bcsSerializeU128(340282366920938463463374607431768211455n))).toBe(true);
-  expect(isSame(newValues[4], bcsSerializeStr(values[4]))).toBe(true);
-  expect(isSame(newValues[5], bcsToBytes(AccountAddress.fromHex(new HexString("0x1"))))).toBe(true);
-});
-
-test("test propertymap deserializer", () => {
-  function toHexString(data: Bytes): string {
-    return HexString.fromUint8Array(data).hex();
-  }
-  const values = [
-    "false",
-    "10",
-    "18446744073709551615",
-    "340282366920938463463374607431768211455",
-    "hello",
-    "0x0000000000000000000000000000000000000000000000000000000000000001",
-    "I am a string",
-  ];
-  const types = ["bool", "u8", "u64", "u128", "0x1::string::String", "address", "string"];
-  const newValues = getPropertyValueRaw(values, types);
-  for (let i = 0; i < values.length; i += 1) {
-    expect(deserializeValueBasedOnTypeTag(getPropertyType(types[i]), toHexString(newValues[i]))).toBe(values[i]);
-  }
-});
diff --git a/m1/JavaScript-client/src/tests/unit/serializer.test.ts b/m1/JavaScript-client/src/tests/unit/serializer.test.ts
deleted file mode 100644
index 4d6942a3f..000000000
--- a/m1/JavaScript-client/src/tests/unit/serializer.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { Serializer } from "../../bcs/serializer";
-
-describe("BCS Serializer", () => {
-  let serializer: Serializer;
-
-  beforeEach(() => {
-    serializer = new Serializer();
-  });
-
-  it("serializes a non-empty string", () => {
-    serializer.serializeStr("çå∞≠¢õß∂ƒ∫");
-    expect(serializer.getBytes()).toEqual(
-      new Uint8Array([
-        24, 0xc3, 0xa7, 0xc3, 0xa5, 0xe2, 0x88, 0x9e, 0xe2, 0x89, 0xa0, 0xc2, 0xa2, 0xc3, 0xb5, 0xc3, 0x9f, 0xe2, 0x88,
-        0x82, 0xc6, 0x92, 0xe2, 0x88, 0xab,
-      ]),
-    );
-  });
-
-  it("serializes an empty string", () => {
-    serializer.serializeStr("");
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0]));
-  });
-
-  it("serializes dynamic length bytes", () => {
-    serializer.serializeBytes(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([5, 0x41, 0x70, 0x74, 0x6f, 0x73]));
-  });
-
-  it("serializes dynamic length bytes with zero elements", () => {
-    serializer.serializeBytes(new Uint8Array([]));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0]));
-  });
-
-  it("serializes fixed length bytes", () => {
-    serializer.serializeFixedBytes(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x41, 0x70, 0x74, 0x6f, 0x73]));
-  });
-
-  it("serializes fixed length bytes with zero element", () => {
-    serializer.serializeFixedBytes(new Uint8Array([]));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([]));
-  });
-
-  it("serializes a boolean value", () => {
-    serializer.serializeBool(true);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x01]));
-
-    serializer = new Serializer();
-    serializer.serializeBool(false);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x00]));
-  });
-
-  it("throws when serializing a boolean value with wrong data type", () => {
-    expect(() => {
-      // @ts-ignore
-      serializer.serializeBool(12);
-    }).toThrow("Value needs to be a boolean");
-  });
-
-  it("serializes a uint8", () => {
-    serializer.serializeU8(255);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff]));
-  });
-
-  it("throws when serializing uint8 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU8(256);
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU8(-1);
-    }).toThrow("Value is out of range");
-  });
-
-  it("serializes a uint16", () => {
-    serializer.serializeU16(65535);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff, 0xff]));
-
-    serializer = new Serializer();
-    serializer.serializeU16(4660);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x34, 0x12]));
-  });
-
-  it("throws when serializing uint16 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU16(65536);
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU16(-1);
-    }).toThrow("Value is out of range");
-  });
-
-  it("serializes a uint32", () => {
-    serializer.serializeU32(4294967295);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff, 0xff, 0xff, 0xff]));
-
-    serializer = new Serializer();
-    serializer.serializeU32(305419896);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x78, 0x56, 0x34, 0x12]));
-  });
-
-  it("throws when serializing uint32 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU32(4294967296);
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU32(-1);
-    }).toThrow("Value is out of range");
-  });
-
-  it("serializes a uint64", () => {
-    serializer.serializeU64(BigInt("18446744073709551615"));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]));
-
-    serializer = new Serializer();
-    serializer.serializeU64(BigInt("1311768467750121216"));
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0x00, 0xef, 0xcd, 0xab, 0x78, 0x56, 0x34, 0x12]));
-  });
-
-  it("throws when serializing uint64 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU64(BigInt("18446744073709551616"));
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU64(-1);
-    }).toThrow("Value is out of range");
-  });
-
-  it("serializes a uint128", () => {
-    serializer.serializeU128(BigInt("340282366920938463463374607431768211455"));
-    expect(serializer.getBytes()).toEqual(
-      new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    );
-
-    serializer = new Serializer();
-    serializer.serializeU128(BigInt("1311768467750121216"));
-    expect(serializer.getBytes()).toEqual(
-      new Uint8Array([0x00, 0xef, 0xcd, 0xab, 0x78, 0x56, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    );
-  });
-
-  it("throws when serializing uint128 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU128(BigInt("340282366920938463463374607431768211456"));
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU128(-1);
-    }).toThrow("Value is out of range");
-  });
-
-  it("serializes a uleb128", () => {
-    serializer.serializeU32AsUleb128(104543565);
-    expect(serializer.getBytes()).toEqual(new Uint8Array([0xcd, 0xea, 0xec, 0x31]));
-  });
-
-  it("throws when serializing uleb128 with out of range value", () => {
-    expect(() => {
-      serializer.serializeU32AsUleb128(4294967296);
-    }).toThrow("Value is out of range");
-
-    expect(() => {
-      serializer = new Serializer();
-      serializer.serializeU32AsUleb128(-1);
-    }).toThrow("Value is out of range");
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/test_helper.test.ts b/m1/JavaScript-client/src/tests/unit/test_helper.test.ts
deleted file mode 100644
index 679e1d77f..000000000
--- a/m1/JavaScript-client/src/tests/unit/test_helper.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { FaucetClient } from "../../plugins/faucet_client";
-import { OpenAPIConfig } from "../../generated";
-import { CustomEndpoints } from "../../utils/api-endpoints";
-
-export const NODE_URL = process.env.APTOS_NODE_URL!;
-export const FAUCET_URL = process.env.APTOS_FAUCET_URL!;
-export const API_TOKEN = process.env.API_TOKEN!;
-export const FAUCET_AUTH_TOKEN = process.env.FAUCET_AUTH_TOKEN!;
-export const PROVIDER_LOCAL_NETWORK_CONFIG: CustomEndpoints = { fullnodeUrl: NODE_URL, indexerUrl: NODE_URL };
-
-// account to use for ANS tests, this account matches the one in sdk-release.yaml
-export const ANS_OWNER_ADDRESS = "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
-export const ANS_OWNER_PK = "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
-
-/**
- * Returns an instance of a FaucetClient with NODE_URL and FAUCET_URL from the
- * environment. If the FAUCET_AUTH_TOKEN environment variable is set, it will
- * pass that along in the header in the format the faucet expects.
- */
-export function getFaucetClient(): FaucetClient {
-  const config: Partial<OpenAPIConfig> = {};
-  if (process.env.FAUCET_AUTH_TOKEN) {
-    config.HEADERS = { Authorization: `Bearer ${process.env.FAUCET_AUTH_TOKEN}` };
-  }
-  return new FaucetClient(NODE_URL, FAUCET_URL, config);
-}
-
-test("noop", () => {
-  // All TS files are compiled by default into the npm package
-  // Adding this empty test allows us to:
-  // 1. Guarantee that this test library won't get compiled
-  // 2. Prevent jest from exploding when it finds a file with no tests in it
-});
-
-export const longTestTimeout = 120 * 1000;
diff --git a/m1/JavaScript-client/src/tests/unit/transaction_builder.test.ts b/m1/JavaScript-client/src/tests/unit/transaction_builder.test.ts
deleted file mode 100644
index a154638de..000000000
--- a/m1/JavaScript-client/src/tests/unit/transaction_builder.test.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/* eslint-disable max-len */
-import nacl from "tweetnacl";
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
-import { bcsSerializeBool, bcsSerializeUint64, bcsToBytes, Bytes } from "../../bcs";
-import { HexString } from "../../utils";
-
-import { TransactionBuilderEd25519, TransactionBuilder } from "../../transaction_builder/index";
-import {
-  ChainId,
-  Ed25519Signature,
-  RawTransaction,
-  Script,
-  EntryFunction,
-  StructTag,
-  TransactionArgumentAddress,
-  TransactionArgumentU8,
-  TransactionArgumentU8Vector,
-  TransactionPayloadScript,
-  TransactionPayloadEntryFunction,
-  TypeTagStruct,
-  TransactionArgumentU16,
-  TransactionArgumentU32,
-  TransactionArgumentU256,
-  AccountAddress,
-  TypeTagBool,
-} from "../../aptos_types";
-
-const ADDRESS_1 = "0x1222";
-const ADDRESS_2 = "0xdd";
-const ADDRESS_3 = "0x0a550c18";
-const ADDRESS_4 = "0x01";
-const PRIVATE_KEY = "9bf49a6a0755f953811fce125f2683d50429c3bb49e074147e0089a52eae155f";
-const TXN_EXPIRE = "18446744073709551615";
-
-function hexSignedTxn(signedTxn: Uint8Array): string {
-  return bytesToHex(signedTxn);
-}
-
-function sign(rawTxn: RawTransaction): Bytes {
-  const privateKeyBytes = new HexString(PRIVATE_KEY).toUint8Array();
-  const signingKey = nacl.sign.keyPair.fromSeed(privateKeyBytes.slice(0, 32));
-  const { publicKey } = signingKey;
-
-  const txnBuilder = new TransactionBuilderEd25519(
-    (signingMessage) => new Ed25519Signature(nacl.sign(signingMessage, signingKey.secretKey).slice(0, 64)),
-    publicKey,
-  );
-
-  return txnBuilder.sign(rawTxn);
-}
-
-test("throws when preparing signing message with invalid payload", () => {
-  expect(() => {
-    // @ts-ignore
-    TransactionBuilder.getSigningMessage("invalid");
-  }).toThrow("Unknown transaction type.");
-});
-
-test("serialize entry function payload with no type args", () => {
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(
-      `${ADDRESS_1}::aptos_coin`,
-      "transfer",
-      [],
-      [bcsToBytes(AccountAddress.fromHex(ADDRESS_2)), bcsSerializeUint64(1)],
-    ),
-  );
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(new HexString(ADDRESS_3)),
-    BigInt(0),
-    entryFunctionPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000200000000000000000000000000000000000000000000000000000000000012220a6170746f735f636f696e087472616e7366657200022000000000000000000000000000000000000000000000000000000000000000dd080100000000000000d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200409c570996380897f38b8d7008d726fb45d6ded0689216e56b73f523492cba92deb6671c27e9a44d2a6fdfdb497420d00c621297a23d6d0298895e0d58cff6060c",
-  );
-});
-
-test("serialize entry function payload with type args", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`${ADDRESS_4}::aptos_coin::AptosCoin`));
-
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(
-      `${ADDRESS_1}::coin`,
-      "transfer",
-      [token],
-      [bcsToBytes(AccountAddress.fromHex(ADDRESS_2)), bcsSerializeUint64(1)],
-    ),
-  );
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    entryFunctionPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c18000000000000000002000000000000000000000000000000000000000000000000000000000000122204636f696e087472616e73666572010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e00022000000000000000000000000000000000000000000000000000000000000000dd080100000000000000d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a4920040112162f543ca92b4f14c1b09b7f52894a127f5428b0d407c09c8efb3a136cff50e550aea7da1226f02571d79230b80bd79096ea0d796789ad594b8fbde695404",
-  );
-});
-
-test("serialize entry function payload with type args but no function args", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`${ADDRESS_4}::aptos_coin::AptosCoin`));
-
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(`${ADDRESS_1}::coin`, "fake_func", [token], []),
-  );
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    entryFunctionPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c18000000000000000002000000000000000000000000000000000000000000000000000000000000122204636f696e0966616b655f66756e63010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0000d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200400e2d1cc4a27893cbae36d8b6a7150977c7620e065f359840413c5478a25f20a383250a9cdcb4fd71f7d171856f38972da30a9d10072e164614d96379004aa500",
-  );
-});
-
-test("serialize entry function payload with generic type args and function args", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`0x14::token::Token`));
-
-  const entryFunctionPayload = new TransactionPayloadEntryFunction(
-    EntryFunction.natural(
-      `${ADDRESS_1}::aptos_token`,
-      "fake_typed_func",
-      [token, new TypeTagBool()],
-      [bcsToBytes(AccountAddress.fromHex(ADDRESS_2)), bcsSerializeBool(true)],
-    ),
-  );
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    entryFunctionPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000200000000000000000000000000000000000000000000000000000000000012220b6170746f735f746f6b656e0f66616b655f74797065645f66756e630207000000000000000000000000000000000000000000000000000000000000001405746f6b656e05546f6b656e0000022000000000000000000000000000000000000000000000000000000000000000dd0101d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a4920040367085186aeef58a0256fc64ecb86b88a86f8a8e42151e0e9aae1ab6d426c4968f2cab664261ea6bb868869154fe6e946c082774741d5143e57a1d802fd1b700",
-  );
-});
-
-test("serialize script payload with no type args and no function args", () => {
-  const script = hexToBytes("a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102");
-
-  const scriptPayload = new TransactionPayloadScript(new Script(script, [], []));
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    scriptPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000026a11ceb0b030000000105000100000000050601000000000000000600000000000000001a01020000d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a4920040266935990105df40f3a82a3f41ad9ceb4b79451495403dd976191382bb07f8c9b401702968a64b5176762e62036f75c6fc2b770a0988716e41d469fff2349a08",
-  );
-});
-
-test("serialize script payload with type args but no function args", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`${ADDRESS_4}::aptos_coin::AptosCoin`));
-
-  const script = hexToBytes("a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102");
-
-  const scriptPayload = new TransactionPayloadScript(new Script(script, [token], []));
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    scriptPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000026a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0000d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a4920040bd241a6f31dfdfca0031ca5874fbf81800b5f632642321a11c41b4fead4b41d808617e91dd655fde7e9f263127f07bb5d56c7c925fe797728dcc9b55be120604",
-  );
-});
-
-test("serialize script payload with type arg and function arg", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`${ADDRESS_4}::aptos_coin::AptosCoin`));
-
-  const argU8 = new TransactionArgumentU8(2);
-
-  const script = hexToBytes("a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102");
-
-  const scriptPayload = new TransactionPayloadScript(new Script(script, [token], [argU8]));
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    scriptPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000026a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e00010002d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200409936b8d22cec685e720761f6c6135e020911f1a26e220e2a0f3317f5a68942531987259ac9e8688158c77df3e7136637056047d9524edad88ee45d61a9346602",
-  );
-});
-
-test("serialize script payload with one type arg and two function args", () => {
-  const token = new TypeTagStruct(StructTag.fromString(`${ADDRESS_4}::aptos_coin::AptosCoin`));
-
-  const argU8Vec = new TransactionArgumentU8Vector(bcsSerializeUint64(1));
-  const argAddress = new TransactionArgumentAddress(AccountAddress.fromHex("0x01"));
-
-  const script = hexToBytes("a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102");
-
-  const scriptPayload = new TransactionPayloadScript(new Script(script, [token], [argU8Vec, argAddress]));
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    scriptPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c1800000000000000000026a11ceb0b030000000105000100000000050601000000000000000600000000000000001a0102010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e000204080100000000000000030000000000000000000000000000000000000000000000000000000000000001d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a492004055c7499795ea68d7acfa64a58f19efa2ba3b977fa58ae93ae8c0732c0f6d6dd084d92bbe4edc2a0d687031cae90da117abfac16ebd902e764bdc38a2154a2102",
-  );
-});
-
-test("serialize script payload with new integer types (u16, u32, u256) as args", () => {
-  const argU16 = new TransactionArgumentU16(0xf111);
-  const argU32 = new TransactionArgumentU32(0xf1111111);
-  const argU256 = new TransactionArgumentU256(
-    BigInt("0xf111111111111111111111111111111111111111111111111111111111111111"),
-  );
-
-  const script = hexToBytes("");
-
-  const scriptPayload = new TransactionPayloadScript(new Script(script, [], [argU16, argU32, argU256]));
-
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(ADDRESS_3),
-    BigInt(0),
-    scriptPayload,
-    BigInt(2000),
-    BigInt(0),
-    BigInt(TXN_EXPIRE),
-    new ChainId(4),
-  );
-
-  const signedTxn = sign(rawTxn);
-
-  expect(hexSignedTxn(signedTxn)).toBe(
-    "000000000000000000000000000000000000000000000000000000000a550c180000000000000000000000030611f107111111f10811111111111111111111111111111111111111111111111111111111111111f1d0070000000000000000000000000000ffffffffffffffff040020b9c6ee1630ef3e711144a648db06bbb2284f7274cfbee53ffcee503cc1a49200409402b773f66cf5444efe4de38a026cf9b34e0327798ea01f0695db8e8e0888e20387b08f504b620dcffbc382e3ac141c0ec9a820c5f58b5da2eec589a9e86b0b",
-  );
-});
diff --git a/m1/JavaScript-client/src/tests/unit/transaction_vector.test.ts b/m1/JavaScript-client/src/tests/unit/transaction_vector.test.ts
deleted file mode 100644
index 861fbaf0c..000000000
--- a/m1/JavaScript-client/src/tests/unit/transaction_vector.test.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * Do fuzzing tests with test vectors. The test vectors are produced by the same code
- * used by the Aptos Blockchain. The test vectors are arrays of JSON objects.
- * Each JSON object contains randomized inputs to Transaction Builder and BCS and
- * the expected outputs.
- */
-
-import path from "path";
-import nacl from "tweetnacl";
-import fs from "fs";
-import { bytesToHex } from "@noble/hashes/utils";
-import {
-  AccountAddress,
-  ChainId,
-  RawTransaction,
-  EntryFunction,
-  StructTag,
-  TypeTag,
-  TypeTagVector,
-  TransactionPayloadEntryFunction,
-  Identifier,
-  TypeTagStruct,
-  TypeTagAddress,
-  TypeTagBool,
-  TypeTagU8,
-  TypeTagU64,
-  TypeTagU128,
-  TypeTagSigner,
-  Ed25519Signature,
-  TransactionPayloadScript,
-  Script,
-  TransactionArgument,
-  TransactionArgumentBool,
-  TransactionArgumentU8,
-  TransactionArgumentU64,
-  TransactionArgumentAddress,
-  TransactionArgumentU8Vector,
-  TransactionArgumentU128,
-} from "../../aptos_types";
-import { HexString } from "../../utils";
-import { TransactionBuilderEd25519 } from "../../transaction_builder/builder";
-
-// eslint-disable-next-line operator-linebreak
-const VECTOR_FILES_ROOT_DIR =
-  process.env.VECTOR_FILES_ROOT_DIR || path.resolve(__dirname, "..", "..", "..", "..", "..", "..", "api", "goldens");
-
-const ENTRY_FUNCTION_VECTOR = path.join(
-  VECTOR_FILES_ROOT_DIR,
-  "aptos_api__tests__transaction_vector_test__test_entry_function_payload.json",
-);
-
-const SCRIPT_VECTOR = path.join(
-  VECTOR_FILES_ROOT_DIR,
-  "aptos_api__tests__transaction_vector_test__test_script_payload.json",
-);
-
-function parseTypeTag(typeTag: any): TypeTag {
-  if (typeTag.vector) {
-    return new TypeTagVector(parseTypeTag(typeTag.vector));
-  }
-
-  if (typeTag.struct) {
-    const {
-      address,
-      module,
-      name,
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      type_args,
-    }: {
-      address: string;
-      module: string;
-      name: string;
-      type_args: any[];
-    } = typeTag.struct;
-
-    const typeArgs = type_args.map((arg) => parseTypeTag(arg));
-    const structTag = new StructTag(
-      AccountAddress.fromHex(address),
-      new Identifier(module),
-      new Identifier(name),
-      typeArgs,
-    );
-
-    return new TypeTagStruct(structTag);
-  }
-
-  switch (typeTag) {
-    case "bool":
-      return new TypeTagBool();
-    case "u8":
-      return new TypeTagU8();
-    case "u64":
-      return new TypeTagU64();
-    case "u128":
-      return new TypeTagU128();
-    case "address":
-      return new TypeTagAddress();
-    case "signer":
-      return new TypeTagSigner();
-    default:
-      throw new Error("Unknown type tag");
-  }
-}
-
-function parseTransactionArgument(arg: any): TransactionArgument {
-  const argHasOwnProperty = (propertyName: string) => Object.prototype.hasOwnProperty.call(arg, propertyName);
-  if (argHasOwnProperty("U8")) {
-    // arg.U8 is a number
-    return new TransactionArgumentU8(arg.U8);
-  }
-
-  if (argHasOwnProperty("U64")) {
-    // arg.U64 is a string literal
-    return new TransactionArgumentU64(BigInt(arg.U64));
-  }
-
-  if (argHasOwnProperty("U128")) {
-    // arg.U128 is a string literal
-    return new TransactionArgumentU128(BigInt(arg.U128));
-  }
-
-  if (argHasOwnProperty("Address")) {
-    // arg.Address is a hex string
-    return new TransactionArgumentAddress(AccountAddress.fromHex(arg.Address));
-  }
-
-  if (argHasOwnProperty("U8Vector")) {
-    // arg.U8Vector is a hex string
-    return new TransactionArgumentU8Vector(new HexString(arg.U8Vector).toUint8Array());
-  }
-
-  if (argHasOwnProperty("Bool")) {
-    return new TransactionArgumentBool(arg.Bool);
-  }
-
-  throw new Error("Invalid Transaction Argument");
-}
-
-function sign(rawTxn: RawTransaction, privateKey: string): string {
-  const privateKeyBytes = new HexString(privateKey).toUint8Array();
-  const signingKey = nacl.sign.keyPair.fromSeed(privateKeyBytes.slice(0, 32));
-  const { publicKey } = signingKey;
-
-  const txnBuilder = new TransactionBuilderEd25519(
-    (signingMessage) => new Ed25519Signature(nacl.sign(signingMessage, signingKey.secretKey).slice(0, 64)),
-    publicKey,
-  );
-
-  return bytesToHex(txnBuilder.sign(rawTxn));
-}
-
-type IRawTxn = {
-  // hex string for an AccountAddress
-  sender: string;
-  // u64 string literal
-  sequence_number: string;
-  // u64 string literal
-  max_gas_amount: string;
-  // u64 string literal
-  gas_unit_price: string;
-  // u64 string literal
-  expiration_timestamp_secs: string;
-
-  chain_id: number;
-};
-
-function verify(
-  raw_txn: IRawTxn,
-  payload: TransactionPayloadEntryFunction | TransactionPayloadScript,
-  private_key: string,
-  expected_output: string,
-) {
-  const rawTxn = new RawTransaction(
-    AccountAddress.fromHex(raw_txn.sender),
-    BigInt(raw_txn.sequence_number),
-    payload,
-    BigInt(raw_txn.max_gas_amount),
-    BigInt(raw_txn.gas_unit_price),
-    BigInt(raw_txn.expiration_timestamp_secs),
-    new ChainId(raw_txn.chain_id),
-  );
-
-  const signedTxn = sign(rawTxn, private_key);
-
-  expect(signedTxn).toBe(expected_output);
-}
-
-describe("Transaction builder vector test", () => {
-  it("should pass on entry function payload", () => {
-    const vector: any[] = JSON.parse(fs.readFileSync(ENTRY_FUNCTION_VECTOR, "utf8"));
-    vector.forEach(({ raw_txn, signed_txn_bcs, private_key }) => {
-      const payload = raw_txn.payload.EntryFunction;
-      const entryFunctionPayload = new TransactionPayloadEntryFunction(
-        EntryFunction.natural(
-          `${payload.module.address}::${payload.module.name}`,
-          payload.function,
-          payload.ty_args.map((tag: any) => parseTypeTag(tag)),
-          payload.args.map((arg: any) => new HexString(arg).toUint8Array()),
-        ),
-      );
-
-      verify(raw_txn, entryFunctionPayload, private_key, signed_txn_bcs);
-    });
-  });
-
-  it("should pass on script payload", () => {
-    const vector: any[] = JSON.parse(fs.readFileSync(SCRIPT_VECTOR, "utf8"));
-    vector.forEach(({ raw_txn, signed_txn_bcs, private_key }) => {
-      const payload = raw_txn.payload.Script;
-      // payload.code is hex string
-      const code = new HexString(payload.code).toUint8Array();
-      const scriptPayload = new TransactionPayloadScript(
-        new Script(
-          code,
-          payload.ty_args.map((tag: any) => parseTypeTag(tag)),
-          payload.args.map((arg: any) => parseTransactionArgument(arg)),
-        ),
-      );
-
-      verify(raw_txn, scriptPayload, private_key, signed_txn_bcs);
-    });
-  });
-});
diff --git a/m1/JavaScript-client/src/tests/unit/type_tag.test.ts b/m1/JavaScript-client/src/tests/unit/type_tag.test.ts
deleted file mode 100644
index 8b14a1dc8..000000000
--- a/m1/JavaScript-client/src/tests/unit/type_tag.test.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-  StructTag,
-  TypeTagAddress,
-  TypeTagBool,
-  TypeTagParser,
-  TypeTagParserError,
-  TypeTagStruct,
-} from "../../aptos_types/type_tag";
-
-const expectedTypeTag = {
-  string: "0x0000000000000000000000000000000000000000000000000000000000000001::some_module::SomeResource",
-  address: "0x0000000000000000000000000000000000000000000000000000000000000001",
-  module_name: "some_module",
-  name: "SomeResource",
-};
-
-describe("StructTag", () => {
-  test("make sure StructTag.fromString works with un-nested type tag", () => {
-    const structTag = StructTag.fromString(expectedTypeTag.string);
-    expect(structTag.address.toHexString()).toEqual(expectedTypeTag.address);
-    expect(structTag.module_name.value).toEqual(expectedTypeTag.module_name);
-    expect(structTag.name.value).toEqual(expectedTypeTag.name);
-    expect(structTag.type_args.length).toEqual(0);
-  });
-
-  test("make sure StructTag.fromString works with nested type tag", () => {
-    const structTag = StructTag.fromString(
-      `${expectedTypeTag.string}<${expectedTypeTag.string}, ${expectedTypeTag.string}>`,
-    );
-    expect(structTag.address.toHexString()).toEqual(expectedTypeTag.address);
-    expect(structTag.module_name.value).toEqual(expectedTypeTag.module_name);
-    expect(structTag.name.value).toEqual(expectedTypeTag.name);
-    expect(structTag.type_args.length).toEqual(2);
-
-    // make sure the nested type tag is correct
-    for (const typeArg of structTag.type_args) {
-      const nestedTypeTag = typeArg as TypeTagStruct;
-      expect(nestedTypeTag.value.address.toHexString()).toEqual(expectedTypeTag.address);
-      expect(nestedTypeTag.value.module_name.value).toEqual(expectedTypeTag.module_name);
-      expect(nestedTypeTag.value.name.value).toEqual(expectedTypeTag.name);
-      expect(nestedTypeTag.value.type_args.length).toEqual(0);
-    }
-  });
-});
-
-describe("TypeTagParser", () => {
-  test("make sure parseTypeTag throws TypeTagParserError 'Invalid type tag' if invalid format", () => {
-    let typeTag = "0x000";
-    let parser = new TypeTagParser(typeTag);
-
-    try {
-      parser.parseTypeTag();
-    } catch (error) {
-      expect(error).toBeInstanceOf(TypeTagParserError);
-      const typeTagError = error as TypeTagParserError;
-      expect(typeTagError.message).toEqual("Invalid type tag.");
-    }
-
-    typeTag = "0x1::some_module::SomeResource<0x1>";
-    parser = new TypeTagParser(typeTag);
-    expect(() => parser.parseTypeTag()).toThrowError("Invalid type tag.");
-  });
-
-  test("make sure parseTypeTag works with un-nested type tag", () => {
-    const parser = new TypeTagParser(expectedTypeTag.string);
-    const result = parser.parseTypeTag() as TypeTagStruct;
-    expect(result.value.address.toHexString()).toEqual(expectedTypeTag.address);
-    expect(result.value.module_name.value).toEqual(expectedTypeTag.module_name);
-    expect(result.value.name.value).toEqual(expectedTypeTag.name);
-    expect(result.value.type_args.length).toEqual(0);
-  });
-
-  test("make sure parseTypeTag works with nested type tag", () => {
-    const typeTag = "0x1::some_module::SomeResource<0x1::some_module::SomeResource, 0x1::some_module::SomeResource>";
-    const parser = new TypeTagParser(typeTag);
-    const result = parser.parseTypeTag() as TypeTagStruct;
-    expect(result.value.address.toHexString()).toEqual(expectedTypeTag.address);
-    expect(result.value.module_name.value).toEqual(expectedTypeTag.module_name);
-    expect(result.value.name.value).toEqual(expectedTypeTag.name);
-    expect(result.value.type_args.length).toEqual(2);
-
-    // make sure the nested type tag is correct
-    for (const typeArg of result.value.type_args) {
-      const nestedTypeTag = typeArg as TypeTagStruct;
-      expect(nestedTypeTag.value.address.toHexString()).toEqual(expectedTypeTag.address);
-      expect(nestedTypeTag.value.module_name.value).toEqual(expectedTypeTag.module_name);
-      expect(nestedTypeTag.value.name.value).toEqual(expectedTypeTag.name);
-      expect(nestedTypeTag.value.type_args.length).toEqual(0);
-    }
-  });
-
-  describe("parse Object type", () => {
-    test("TypeTagParser successfully parses an Object type", () => {
-      const typeTag = "0x1::object::Object<T>";
-      const parser = new TypeTagParser(typeTag);
-      const result = parser.parseTypeTag();
-      expect(result instanceof TypeTagAddress).toBeTruthy();
-    });
-
-    test("TypeTagParser successfully parses a strcut with a nested Object type", () => {
-      const typeTag = "0x1::some_module::SomeResource<0x1::object::Object<T>>";
-      const parser = new TypeTagParser(typeTag);
-      const result = parser.parseTypeTag() as TypeTagStruct;
-      expect(result.value.address.toHexString()).toEqual(expectedTypeTag.address);
-      expect(result.value.module_name.value).toEqual("some_module");
-      expect(result.value.name.value).toEqual("SomeResource");
-      expect(result.value.type_args[0] instanceof TypeTagAddress).toBeTruthy();
-    });
-
-    test("TypeTagParser successfully parses a strcut with a nested Object and Struct types", () => {
-      const typeTag = "0x1::some_module::SomeResource<0x4::object::Object<T>, 0x1::some_module::SomeResource>";
-      const parser = new TypeTagParser(typeTag);
-      const result = parser.parseTypeTag() as TypeTagStruct;
-      expect(result.value.address.toHexString()).toEqual(expectedTypeTag.address);
-      expect(result.value.module_name.value).toEqual("some_module");
-      expect(result.value.name.value).toEqual("SomeResource");
-      expect(result.value.type_args.length).toEqual(2);
-      expect(result.value.type_args[0] instanceof TypeTagAddress).toBeTruthy();
-      expect(result.value.type_args[1] instanceof TypeTagStruct).toBeTruthy();
-    });
-  });
-
-  describe("supports generic types", () => {
-    test("throws an error when the type to use is not provided", () => {
-      const typeTag = "T0";
-      const parser = new TypeTagParser(typeTag);
-      expect(() => {
-        parser.parseTypeTag();
-      }).toThrow("Can't convert generic type since no typeTags were specified.");
-    });
-
-    test("successfully parses a generic type tag to the provided type", () => {
-      const typeTag = "T0";
-      const parser = new TypeTagParser(typeTag, ["bool"]);
-      const result = parser.parseTypeTag();
-      expect(result instanceof TypeTagBool).toBeTruthy();
-    });
-  });
-});
diff --git a/m1/JavaScript-client/src/transaction_builder/builder.ts b/m1/JavaScript-client/src/transaction_builder/builder.ts
deleted file mode 100644
index 62f0821a3..000000000
--- a/m1/JavaScript-client/src/transaction_builder/builder.ts
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
-import {
-  Ed25519PublicKey,
-  Ed25519Signature,
-  MultiEd25519PublicKey,
-  MultiEd25519Signature,
-  RawTransaction,
-  SignedTransaction,
-  TransactionAuthenticatorEd25519,
-  TransactionAuthenticatorMultiEd25519,
-  SigningMessage,
-  MultiAgentRawTransaction,
-  AccountAddress,
-  EntryFunction,
-  Identifier,
-  ChainId,
-  Script,
-  TransactionPayload,
-  TransactionArgument,
-  TransactionPayloadEntryFunction,
-  TransactionPayloadScript,
-  ModuleId,
-  TypeTagParser,
-} from "../aptos_types";
-import { bcsToBytes, Bytes, Deserializer, Serializer, Uint64, Uint8 } from "../bcs";
-import { ArgumentABI, EntryFunctionABI, ScriptABI, TransactionScriptABI, TypeArgumentABI } from "../aptos_types/abi";
-import { argToTransactionArgument, serializeArg } from "./builder_utils";
-import * as Gen from "../generated/index";
-import {
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_MAX_GAS_AMOUNT,
-  HexString,
-  MaybeHexString,
-  MemoizeExpiring,
-} from "../utils";
-
-export { TypeTagParser } from "../aptos_types";
-
-const RAW_TRANSACTION_SALT = "APTOS::RawTransaction";
-const RAW_TRANSACTION_WITH_DATA_SALT = "APTOS::RawTransactionWithData";
-
-type AnyRawTransaction = RawTransaction | MultiAgentRawTransaction;
-
-/**
- * Function that takes in a Signing Message (serialized raw transaction)
- *  and returns a signature
- */
-export type SigningFn = (txn: SigningMessage) => Ed25519Signature | MultiEd25519Signature;
-
-export class TransactionBuilder<F extends SigningFn> {
-  protected readonly signingFunction: F;
-
-  constructor(signingFunction: F, public readonly rawTxnBuilder?: TransactionBuilderABI) {
-    this.signingFunction = signingFunction;
-  }
-
-  /**
-   * Builds a RawTransaction. Relays the call to TransactionBuilderABI.build
-   * @param func
-   * @param ty_tags
-   * @param args
-   */
-  build(func: string, ty_tags: string[], args: any[]): RawTransaction {
-    if (!this.rawTxnBuilder) {
-      throw new Error("this.rawTxnBuilder doesn't exist.");
-    }
-
-    return this.rawTxnBuilder.build(func, ty_tags, args);
-  }
-
-  /** Generates a Signing Message out of a raw transaction. */
-  static getSigningMessage(rawTxn: AnyRawTransaction): SigningMessage {
-    const hash = sha3Hash.create();
-    if (rawTxn instanceof RawTransaction) {
-      hash.update(RAW_TRANSACTION_SALT);
-    } else if (rawTxn instanceof MultiAgentRawTransaction) {
-      hash.update(RAW_TRANSACTION_WITH_DATA_SALT);
-    } else {
-      throw new Error("Unknown transaction type.");
-    }
-
-    const prefix = hash.digest();
-
-    const body = bcsToBytes(rawTxn);
-
-    const mergedArray = new Uint8Array(prefix.length + body.length);
-    mergedArray.set(prefix);
-    mergedArray.set(body, prefix.length);
-
-    return mergedArray;
-  }
-}
-
-/**
- * Provides signing method for signing a raw transaction with single public key.
- */
-export class TransactionBuilderEd25519 extends TransactionBuilder<SigningFn> {
-  private readonly publicKey: Uint8Array;
-
-  constructor(signingFunction: SigningFn, publicKey: Uint8Array, rawTxnBuilder?: TransactionBuilderABI) {
-    super(signingFunction, rawTxnBuilder);
-    this.publicKey = publicKey;
-  }
-
-  rawToSigned(rawTxn: RawTransaction): SignedTransaction {
-    const signingMessage = TransactionBuilder.getSigningMessage(rawTxn);
-    const signature = this.signingFunction(signingMessage);
-
-    const authenticator = new TransactionAuthenticatorEd25519(
-      new Ed25519PublicKey(this.publicKey),
-      signature as Ed25519Signature,
-    );
-
-    return new SignedTransaction(rawTxn, authenticator);
-  }
-
-  /** Signs a raw transaction and returns a bcs serialized transaction. */
-  sign(rawTxn: RawTransaction): Bytes {
-    return bcsToBytes(this.rawToSigned(rawTxn));
-  }
-}
-
-/**
- * Provides signing method for signing a raw transaction with multisig public key.
- */
-export class TransactionBuilderMultiEd25519 extends TransactionBuilder<SigningFn> {
-  private readonly publicKey: MultiEd25519PublicKey;
-
-  constructor(signingFunction: SigningFn, publicKey: MultiEd25519PublicKey) {
-    super(signingFunction);
-    this.publicKey = publicKey;
-  }
-
-  rawToSigned(rawTxn: RawTransaction): SignedTransaction {
-    const signingMessage = TransactionBuilder.getSigningMessage(rawTxn);
-    const signature = this.signingFunction(signingMessage);
-
-    const authenticator = new TransactionAuthenticatorMultiEd25519(this.publicKey, signature as MultiEd25519Signature);
-
-    return new SignedTransaction(rawTxn, authenticator);
-  }
-
-  /** Signs a raw transaction and returns a bcs serialized transaction. */
-  sign(rawTxn: RawTransaction): Bytes {
-    return bcsToBytes(this.rawToSigned(rawTxn));
-  }
-}
-
-/**
- * Config for creating raw transactions.
- */
-interface ABIBuilderConfig {
-  sender: MaybeHexString | AccountAddress;
-  sequenceNumber: Uint64 | string;
-  gasUnitPrice: Uint64 | string;
-  maxGasAmount?: Uint64 | string;
-  expSecFromNow?: number | string;
-  chainId: Uint8 | string;
-}
-
-/**
- * Builds raw transactions based on ABI
- */
-export class TransactionBuilderABI {
-  private readonly abiMap: Map<string, ScriptABI>;
-
-  private readonly builderConfig: Partial<ABIBuilderConfig>;
-
-  /**
-   * Constructs a TransactionBuilderABI instance
-   * @param abis List of binary ABIs.
-   * @param builderConfig Configs for creating a raw transaction.
-   */
-  constructor(abis: Bytes[], builderConfig?: ABIBuilderConfig) {
-    this.abiMap = new Map<string, ScriptABI>();
-
-    abis.forEach((abi) => {
-      const deserializer = new Deserializer(abi);
-      const scriptABI = ScriptABI.deserialize(deserializer);
-      let k: string;
-      if (scriptABI instanceof EntryFunctionABI) {
-        const funcABI = scriptABI as EntryFunctionABI;
-        const { address: addr, name: moduleName } = funcABI.module_name;
-        k = `${HexString.fromUint8Array(addr.address).toShortString()}::${moduleName.value}::${funcABI.name}`;
-      } else {
-        const funcABI = scriptABI as TransactionScriptABI;
-        k = funcABI.name;
-      }
-
-      if (this.abiMap.has(k)) {
-        throw new Error("Found conflicting ABI interfaces");
-      }
-
-      this.abiMap.set(k, scriptABI);
-    });
-
-    this.builderConfig = {
-      maxGasAmount: BigInt(DEFAULT_MAX_GAS_AMOUNT),
-      expSecFromNow: DEFAULT_TXN_EXP_SEC_FROM_NOW,
-      ...builderConfig,
-    };
-  }
-
-  private static toBCSArgs(abiArgs: any[], args: any[]): Bytes[] {
-    if (abiArgs.length !== args.length) {
-      throw new Error("Wrong number of args provided.");
-    }
-
-    return args.map((arg, i) => {
-      const serializer = new Serializer();
-      serializeArg(arg, abiArgs[i].type_tag, serializer);
-      return serializer.getBytes();
-    });
-  }
-
-  private static toTransactionArguments(abiArgs: any[], args: any[]): TransactionArgument[] {
-    if (abiArgs.length !== args.length) {
-      throw new Error("Wrong number of args provided.");
-    }
-
-    return args.map((arg, i) => argToTransactionArgument(arg, abiArgs[i].type_tag));
-  }
-
-  setSequenceNumber(seqNumber: Uint64 | string) {
-    this.builderConfig.sequenceNumber = BigInt(seqNumber);
-  }
-
-  /**
-   * Builds a TransactionPayload. For dApps, chain ID and account sequence numbers are only known to the wallet.
-   * Instead of building a RawTransaction (requires chainID and sequenceNumber), dApps can build a TransactionPayload
-   * and pass the payload to the wallet for signing and sending.
-   * @param func Fully qualified func names, e.g. 0x1::Coin::transfer
-   * @param ty_tags TypeTag strings
-   * @param args Function arguments
-   * @returns TransactionPayload
-   */
-  buildTransactionPayload(func: string, ty_tags: string[], args: any[]): TransactionPayload {
-    const typeTags = ty_tags.map((ty_arg) => new TypeTagParser(ty_arg).parseTypeTag());
-
-    let payload: TransactionPayload;
-
-    if (!this.abiMap.has(func)) {
-      throw new Error(`Cannot find function: ${func}`);
-    }
-
-    const scriptABI = this.abiMap.get(func);
-
-    if (scriptABI instanceof EntryFunctionABI) {
-      const funcABI = scriptABI as EntryFunctionABI;
-      const bcsArgs = TransactionBuilderABI.toBCSArgs(funcABI.args, args);
-      payload = new TransactionPayloadEntryFunction(
-        new EntryFunction(funcABI.module_name, new Identifier(funcABI.name), typeTags, bcsArgs),
-      );
-    } else if (scriptABI instanceof TransactionScriptABI) {
-      const funcABI = scriptABI as TransactionScriptABI;
-      const scriptArgs = TransactionBuilderABI.toTransactionArguments(funcABI.args, args);
-
-      payload = new TransactionPayloadScript(new Script(funcABI.code, typeTags, scriptArgs));
-    } else {
-      /* istanbul ignore next */
-      throw new Error("Unknown ABI format.");
-    }
-
-    return payload;
-  }
-
-  /**
-   * Builds a RawTransaction
-   * @param func Fully qualified func names, e.g. 0x1::Coin::transfer
-   * @param ty_tags TypeTag strings.
-   * @example Below are valid value examples
-   * ```
-   * // Structs are in format `AccountAddress::ModuleName::StructName`
-   * 0x1::aptos_coin::AptosCoin
-   * // Vectors are in format `vector<other_tag_string>`
-   * vector<0x1::aptos_coin::AptosCoin>
-   * bool
-   * u8
-   * u16
-   * u32
-   * u64
-   * u128
-   * u256
-   * address
-   * ```
-   * @param args Function arguments
-   * @returns RawTransaction
-   */
-  build(func: string, ty_tags: string[], args: any[]): RawTransaction {
-    const { sender, sequenceNumber, gasUnitPrice, maxGasAmount, expSecFromNow, chainId } = this.builderConfig;
-
-    if (!gasUnitPrice) {
-      throw new Error("No gasUnitPrice provided.");
-    }
-
-    const senderAccount = sender instanceof AccountAddress ? sender : AccountAddress.fromHex(sender!);
-    const expTimestampSec = BigInt(Math.floor(Date.now() / 1000) + Number(expSecFromNow));
-    const payload = this.buildTransactionPayload(func, ty_tags, args);
-
-    if (payload) {
-      return new RawTransaction(
-        senderAccount,
-        BigInt(sequenceNumber!),
-        payload,
-        BigInt(maxGasAmount!),
-        BigInt(gasUnitPrice!),
-        expTimestampSec,
-        new ChainId(Number(chainId)),
-      );
-    }
-
-    throw new Error("Invalid ABI.");
-  }
-}
-
-export type RemoteABIBuilderConfig = Partial<Omit<ABIBuilderConfig, "sender">> & {
-  sender: MaybeHexString | AccountAddress;
-};
-
-interface AptosClientInterface {
-  getAccountModules: (accountAddress: MaybeHexString) => Promise<Gen.MoveModuleBytecode[]>;
-  getAccount: (accountAddress: MaybeHexString) => Promise<Gen.AccountData>;
-  getChainId: () => Promise<number>;
-  estimateGasPrice: () => Promise<Gen.GasEstimation>;
-}
-
-/**
- * This transaction builder downloads JSON ABIs from the fullnodes.
- * It then translates the JSON ABIs to the format that is accepted by TransactionBuilderABI
- */
-export class TransactionBuilderRemoteABI {
-  // We don't want the builder to depend on the actual AptosClient. There might be circular dependencies.
-  constructor(
-    private readonly aptosClient: AptosClientInterface,
-    private readonly builderConfig: RemoteABIBuilderConfig,
-  ) {}
-
-  // Cache for 10 minutes
-  @MemoizeExpiring(10 * 60 * 1000)
-  async fetchABI(addr: string) {
-    const modules = await this.aptosClient.getAccountModules(addr);
-    const abis = modules
-      .map((module) => module.abi)
-      .flatMap((abi) =>
-        abi!.exposed_functions
-          .filter((ef) => ef.is_entry)
-          .map(
-            (ef) =>
-              ({
-                fullName: `${abi!.address}::${abi!.name}::${ef.name}`,
-                ...ef,
-              } as Gen.MoveFunction & { fullName: string }),
-          ),
-      );
-
-    const abiMap = new Map<string, Gen.MoveFunction & { fullName: string }>();
-    abis.forEach((abi) => {
-      abiMap.set(abi.fullName, abi);
-    });
-
-    return abiMap;
-  }
-
-  /**
-   * Builds a raw transaction. Only support script function a.k.a entry function payloads
-   *
-   * @param func fully qualified function name in format <address>::<module>::<function>, e.g. 0x1::coins::transfer
-   * @param ty_tags
-   * @param args
-   * @returns RawTransaction
-   */
-  async build(func: Gen.EntryFunctionId, ty_tags: Gen.MoveType[], args: any[]): Promise<RawTransaction> {
-    /* eslint no-param-reassign: ["off"] */
-    const normlize = (s: string) => s.replace(/^0[xX]0*/g, "0x");
-    func = normlize(func);
-    const funcNameParts = func.split("::");
-    if (funcNameParts.length !== 3) {
-      throw new Error(
-        // eslint-disable-next-line max-len
-        "'func' needs to be a fully qualified function name in format <address>::<module>::<function>, e.g. 0x1::coins::transfer",
-      );
-    }
-
-    const [addr, module] = func.split("::");
-
-    // Downloads the JSON abi
-    const abiMap = await this.fetchABI(addr);
-    if (!abiMap.has(func)) {
-      throw new Error(`${func} doesn't exist.`);
-    }
-
-    const funcAbi = abiMap.get(func);
-
-    // Remove all `signer` and `&signer` from argument list because the Move VM injects those arguments. Clients do not
-    // need to care about those args. `signer` and `&signer` are required be in the front of the argument list. But we
-    // just loop through all arguments and filter out `signer` and `&signer`.
-    const abiArgs = funcAbi!.params.filter((param) => param !== "signer" && param !== "&signer");
-
-    // Convert abi string arguments to TypeArgumentABI
-    const typeArgABIs = abiArgs.map(
-      (abiArg, i) => new ArgumentABI(`var${i}`, new TypeTagParser(abiArg, ty_tags).parseTypeTag()),
-    );
-
-    const entryFunctionABI = new EntryFunctionABI(
-      funcAbi!.name,
-      ModuleId.fromStr(`${addr}::${module}`),
-      "", // Doc string
-      funcAbi!.generic_type_params.map((_, i) => new TypeArgumentABI(`${i}`)),
-      typeArgABIs,
-    );
-
-    const { sender, ...rest } = this.builderConfig;
-
-    const senderAddress = sender instanceof AccountAddress ? HexString.fromUint8Array(sender.address) : sender;
-
-    const [{ sequence_number: sequenceNumber }, chainId, { gas_estimate: gasUnitPrice }] = await Promise.all([
-      rest?.sequenceNumber
-        ? Promise.resolve({ sequence_number: rest?.sequenceNumber })
-        : this.aptosClient.getAccount(senderAddress),
-      rest?.chainId ? Promise.resolve(rest?.chainId) : this.aptosClient.getChainId(),
-      rest?.gasUnitPrice ? Promise.resolve({ gas_estimate: rest?.gasUnitPrice }) : this.aptosClient.estimateGasPrice(),
-    ]);
-
-    const builderABI = new TransactionBuilderABI([bcsToBytes(entryFunctionABI)], {
-      sender,
-      sequenceNumber,
-      chainId,
-      gasUnitPrice: BigInt(gasUnitPrice),
-      ...rest,
-    });
-
-    return builderABI.build(func, ty_tags, args);
-  }
-}
diff --git a/m1/JavaScript-client/src/transaction_builder/builder_utils.ts b/m1/JavaScript-client/src/transaction_builder/builder_utils.ts
deleted file mode 100644
index c8d6c2789..000000000
--- a/m1/JavaScript-client/src/transaction_builder/builder_utils.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { HexString } from "../utils";
-import {
-  TypeTag,
-  TypeTagBool,
-  TypeTagU8,
-  TypeTagU16,
-  TypeTagU32,
-  TypeTagU64,
-  TypeTagU128,
-  TypeTagU256,
-  TypeTagAddress,
-  AccountAddress,
-  TypeTagVector,
-  TypeTagStruct,
-  TransactionArgument,
-  TransactionArgumentBool,
-  TransactionArgumentU16,
-  TransactionArgumentU32,
-  TransactionArgumentU64,
-  TransactionArgumentU128,
-  TransactionArgumentU256,
-  TransactionArgumentAddress,
-  TransactionArgumentU8,
-  TransactionArgumentU8Vector,
-} from "../aptos_types";
-import { Serializer } from "../bcs";
-
-function assertType(val: any, types: string[] | string, message?: string) {
-  if (!types?.includes(typeof val)) {
-    throw new Error(
-      message || `Invalid arg: ${val} type should be ${types instanceof Array ? types.join(" or ") : types}`,
-    );
-  }
-}
-
-export function ensureBoolean(val: boolean | string): boolean {
-  assertType(val, ["boolean", "string"]);
-  if (typeof val === "boolean") {
-    return val;
-  }
-
-  if (val === "true") {
-    return true;
-  }
-  if (val === "false") {
-    return false;
-  }
-
-  throw new Error("Invalid boolean string.");
-}
-
-export function ensureNumber(val: number | string): number {
-  assertType(val, ["number", "string"]);
-  if (typeof val === "number") {
-    return val;
-  }
-
-  const res = Number.parseInt(val, 10);
-  if (Number.isNaN(res)) {
-    throw new Error("Invalid number string.");
-  }
-
-  return res;
-}
-
-export function ensureBigInt(val: number | bigint | string): bigint {
-  assertType(val, ["number", "bigint", "string"]);
-  return BigInt(val);
-}
-
-export function serializeArg(argVal: any, argType: TypeTag, serializer: Serializer) {
-  if (argType instanceof TypeTagBool) {
-    serializer.serializeBool(ensureBoolean(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU8) {
-    serializer.serializeU8(ensureNumber(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU16) {
-    serializer.serializeU16(ensureNumber(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU32) {
-    serializer.serializeU32(ensureNumber(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU64) {
-    serializer.serializeU64(ensureBigInt(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU128) {
-    serializer.serializeU128(ensureBigInt(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagU256) {
-    serializer.serializeU256(ensureBigInt(argVal));
-    return;
-  }
-  if (argType instanceof TypeTagAddress) {
-    let addr: AccountAddress;
-    if (typeof argVal === "string" || argVal instanceof HexString) {
-      addr = AccountAddress.fromHex(argVal);
-    } else if (argVal instanceof AccountAddress) {
-      addr = argVal;
-    } else {
-      throw new Error("Invalid account address.");
-    }
-    addr.serialize(serializer);
-    return;
-  }
-  if (argType instanceof TypeTagVector) {
-    // We are serializing a vector<u8>
-    if (argType.value instanceof TypeTagU8) {
-      if (argVal instanceof Uint8Array) {
-        serializer.serializeBytes(argVal);
-        return;
-      }
-
-      if (typeof argVal === "string") {
-        serializer.serializeStr(argVal);
-        return;
-      }
-    }
-
-    if (!Array.isArray(argVal)) {
-      throw new Error("Invalid vector args.");
-    }
-
-    serializer.serializeU32AsUleb128(argVal.length);
-
-    argVal.forEach((arg) => serializeArg(arg, argType.value, serializer));
-    return;
-  }
-
-  if (argType instanceof TypeTagStruct) {
-    const { address, module_name: moduleName, name } = (argType as TypeTagStruct).value;
-    if (
-      `${HexString.fromUint8Array(address.address).toShortString()}::${moduleName.value}::${name.value}` !==
-      "0x1::string::String"
-    ) {
-      throw new Error("The only supported struct arg is of type 0x1::string::String");
-    }
-    assertType(argVal, ["string"]);
-
-    serializer.serializeStr(argVal);
-    return;
-  }
-  throw new Error("Unsupported arg type.");
-}
-
-export function argToTransactionArgument(argVal: any, argType: TypeTag): TransactionArgument {
-  if (argType instanceof TypeTagBool) {
-    return new TransactionArgumentBool(ensureBoolean(argVal));
-  }
-  if (argType instanceof TypeTagU8) {
-    return new TransactionArgumentU8(ensureNumber(argVal));
-  }
-  if (argType instanceof TypeTagU16) {
-    return new TransactionArgumentU16(ensureNumber(argVal));
-  }
-  if (argType instanceof TypeTagU32) {
-    return new TransactionArgumentU32(ensureNumber(argVal));
-  }
-  if (argType instanceof TypeTagU64) {
-    return new TransactionArgumentU64(ensureBigInt(argVal));
-  }
-  if (argType instanceof TypeTagU128) {
-    return new TransactionArgumentU128(ensureBigInt(argVal));
-  }
-  if (argType instanceof TypeTagU256) {
-    return new TransactionArgumentU256(ensureBigInt(argVal));
-  }
-  if (argType instanceof TypeTagAddress) {
-    let addr: AccountAddress;
-    if (typeof argVal === "string" || argVal instanceof HexString) {
-      addr = AccountAddress.fromHex(argVal);
-    } else if (argVal instanceof AccountAddress) {
-      addr = argVal;
-    } else {
-      throw new Error("Invalid account address.");
-    }
-    return new TransactionArgumentAddress(addr);
-  }
-  if (argType instanceof TypeTagVector && argType.value instanceof TypeTagU8) {
-    if (!(argVal instanceof Uint8Array)) {
-      throw new Error(`${argVal} should be an instance of Uint8Array`);
-    }
-    return new TransactionArgumentU8Vector(argVal);
-  }
-
-  throw new Error("Unknown type for TransactionArgument.");
-}
diff --git a/m1/JavaScript-client/src/transaction_builder/index.ts b/m1/JavaScript-client/src/transaction_builder/index.ts
deleted file mode 100644
index eea089f9c..000000000
--- a/m1/JavaScript-client/src/transaction_builder/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export * from "./builder";
-export * as TxnBuilderTypes from "../aptos_types";
diff --git a/m1/JavaScript-client/src/utils/api-endpoints.ts b/m1/JavaScript-client/src/utils/api-endpoints.ts
deleted file mode 100644
index 7645b8278..000000000
--- a/m1/JavaScript-client/src/utils/api-endpoints.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export const NetworkToIndexerAPI: Record<string, string> = {
-  mainnet: "https://indexer.mainnet.aptoslabs.com/v1/graphql",
-  testnet: "https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql",
-  devnet: "https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql",
-};
-
-export const NetworkToNodeAPI: Record<string, string> = {
-  mainnet: "https://fullnode.mainnet.aptoslabs.com/v1",
-  testnet: "https://fullnode.testnet.aptoslabs.com/v1",
-  devnet: "https://fullnode.devnet.aptoslabs.com/v1",
-};
-
-export enum Network {
-  MAINNET = "mainnet",
-  TESTNET = "testnet",
-  DEVNET = "devnet",
-}
-
-export interface CustomEndpoints {
-  fullnodeUrl: string;
-  indexerUrl: string;
-}
diff --git a/m1/JavaScript-client/src/utils/hd-key.ts b/m1/JavaScript-client/src/utils/hd-key.ts
deleted file mode 100644
index 32ffd9324..000000000
--- a/m1/JavaScript-client/src/utils/hd-key.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import nacl from "tweetnacl";
-import { hmac } from "@noble/hashes/hmac";
-import { sha512 } from "@noble/hashes/sha512";
-import { hexToBytes } from "@noble/hashes/utils";
-
-type Hex = string;
-type Path = string;
-
-type Keys = {
-  key: Uint8Array;
-  chainCode: Uint8Array;
-};
-
-const pathRegex = /^m(\/[0-9]+')+$/;
-
-const replaceDerive = (val: string): string => val.replace("'", "");
-
-const HMAC_KEY = "ed25519 seed";
-const HARDENED_OFFSET = 0x80000000;
-
-export const getMasterKeyFromSeed = (seed: Hex): Keys => {
-  const h = hmac.create(sha512, HMAC_KEY);
-  const I = h.update(hexToBytes(seed)).digest();
-  const IL = I.slice(0, 32);
-  const IR = I.slice(32);
-  return {
-    key: IL,
-    chainCode: IR,
-  };
-};
-
-export const CKDPriv = ({ key, chainCode }: Keys, index: number): Keys => {
-  const buffer = new ArrayBuffer(4);
-  new DataView(buffer).setUint32(0, index);
-  const indexBytes = new Uint8Array(buffer);
-  const zero = new Uint8Array([0]);
-  const data = new Uint8Array([...zero, ...key, ...indexBytes]);
-
-  const I = hmac.create(sha512, chainCode).update(data).digest();
-  const IL = I.slice(0, 32);
-  const IR = I.slice(32);
-  return {
-    key: IL,
-    chainCode: IR,
-  };
-};
-
-export const getPublicKey = (privateKey: Uint8Array, withZeroByte = true): Uint8Array => {
-  const keyPair = nacl.sign.keyPair.fromSeed(privateKey);
-  const signPk = keyPair.secretKey.subarray(32);
-  const zero = new Uint8Array([0]);
-  return withZeroByte ? new Uint8Array([...zero, ...signPk]) : signPk;
-};
-
-export const isValidPath = (path: string): boolean => {
-  if (!pathRegex.test(path)) {
-    return false;
-  }
-  return !path
-    .split("/")
-    .slice(1)
-    .map(replaceDerive)
-    .some(Number.isNaN as any);
-};
-
-export const derivePath = (path: Path, seed: Hex, offset = HARDENED_OFFSET): Keys => {
-  if (!isValidPath(path)) {
-    throw new Error("Invalid derivation path");
-  }
-
-  const { key, chainCode } = getMasterKeyFromSeed(seed);
-  const segments = path
-    .split("/")
-    .slice(1)
-    .map(replaceDerive)
-    .map((el) => parseInt(el, 10));
-
-  return segments.reduce((parentKeys, segment) => CKDPriv(parentKeys, segment + offset), { key, chainCode });
-};
diff --git a/m1/JavaScript-client/src/utils/hex_string.ts b/m1/JavaScript-client/src/utils/hex_string.ts
deleted file mode 100644
index 2fa228b60..000000000
--- a/m1/JavaScript-client/src/utils/hex_string.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
-import { HexEncodedBytes } from "../generated";
-
-// eslint-disable-next-line no-use-before-define
-export type MaybeHexString = HexString | string | HexEncodedBytes;
-
-/**
- * A util class for working with hex strings.
- * Hex strings are strings that are prefixed with `0x`
- */
-export class HexString {
-  /// We want to make sure this hexString has the `0x` hex prefix
-  private readonly hexString: string;
-
-  /**
-   * Creates new hex string from Buffer
-   * @param buffer A buffer to convert
-   * @returns New HexString
-   */
-  static fromBuffer(buffer: Uint8Array): HexString {
-    return HexString.fromUint8Array(buffer);
-  }
-
-  /**
-   * Creates new hex string from Uint8Array
-   * @param arr Uint8Array to convert
-   * @returns New HexString
-   */
-  static fromUint8Array(arr: Uint8Array): HexString {
-    return new HexString(bytesToHex(arr));
-  }
-
-  /**
-   * Ensures `hexString` is instance of `HexString` class
-   * @param hexString String to check
-   * @returns New HexString if `hexString` is regular string or `hexString` if it is HexString instance
-   * @example
-   * ```
-   *  const regularString = "string";
-   *  const hexString = new HexString("string"); // "0xstring"
-   *  HexString.ensure(regularString); // "0xstring"
-   *  HexString.ensure(hexString); // "0xstring"
-   * ```
-   */
-  static ensure(hexString: MaybeHexString): HexString {
-    if (typeof hexString === "string") {
-      return new HexString(hexString);
-    }
-    return hexString;
-  }
-
-  /**
-   * Creates new HexString instance from regular string. If specified string already starts with "0x" prefix,
-   * it will not add another one
-   * @param hexString String to convert
-   * @example
-   * ```
-   *  const string = "string";
-   *  new HexString(string); // "0xstring"
-   * ```
-   */
-  constructor(hexString: string | HexEncodedBytes) {
-    if (hexString.startsWith("0x")) {
-      this.hexString = hexString;
-    } else {
-      this.hexString = `0x${hexString}`;
-    }
-  }
-
-  /**
-   * Getter for inner hexString
-   * @returns Inner hex string
-   */
-  hex(): string {
-    return this.hexString;
-  }
-
-  /**
-   * Getter for inner hexString without prefix
-   * @returns Inner hex string without prefix
-   * @example
-   * ```
-   *  const hexString = new HexString("string"); // "0xstring"
-   *  hexString.noPrefix(); // "string"
-   * ```
-   */
-  noPrefix(): string {
-    return this.hexString.slice(2);
-  }
-
-  /**
-   * Overrides default `toString` method
-   * @returns Inner hex string
-   */
-  toString(): string {
-    return this.hex();
-  }
-
-  /**
-   * Trimmes extra zeroes in the begining of a string
-   * @returns Inner hexString without leading zeroes
-   * @example
-   * ```
-   *  new HexString("0x000000string").toShortString(); // result = "0xstring"
-   * ```
-   */
-  toShortString(): string {
-    const trimmed = this.hexString.replace(/^0x0*/, "");
-    return `0x${trimmed}`;
-  }
-
-  /**
-   * Converts hex string to a Uint8Array
-   * @returns Uint8Array from inner hexString without prefix
-   */
-  toUint8Array(): Uint8Array {
-    return Uint8Array.from(hexToBytes(this.noPrefix()));
-  }
-}
diff --git a/m1/JavaScript-client/src/utils/index.ts b/m1/JavaScript-client/src/utils/index.ts
deleted file mode 100644
index dfeaacc64..000000000
--- a/m1/JavaScript-client/src/utils/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./misc";
-export * from "./memoize-decorator";
-export * from "./pagination_helpers";
-export * from "./api-endpoints";
-export * from "./hex_string";
diff --git a/m1/JavaScript-client/src/utils/memoize-decorator.ts b/m1/JavaScript-client/src/utils/memoize-decorator.ts
deleted file mode 100644
index 291c87819..000000000
--- a/m1/JavaScript-client/src/utils/memoize-decorator.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Credits to https://github.com/darrylhodgins/typescript-memoize
- */
-
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-restricted-syntax */
-
-interface MemoizeArgs {
-  // ttl in milliseconds for cached items. After `ttlMs`, cached items are evicted automatically. If no `ttlMs`
-  // is provided, cached items won't get auto-evicted.
-  ttlMs?: number;
-  // produces the cache key based on `args`.
-  hashFunction?: boolean | ((...args: any[]) => any);
-  // cached items can be taged with `tags`. `tags` can be used to evict cached items
-  tags?: string[];
-}
-
-export function Memoize(args?: MemoizeArgs | MemoizeArgs["hashFunction"]) {
-  let hashFunction: MemoizeArgs["hashFunction"];
-  let ttlMs: MemoizeArgs["ttlMs"];
-  let tags: MemoizeArgs["tags"];
-
-  if (typeof args === "object") {
-    hashFunction = args.hashFunction;
-    ttlMs = args.ttlMs;
-    tags = args.tags;
-  } else {
-    hashFunction = args;
-  }
-
-  return (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<any>) => {
-    if (descriptor.value != null) {
-      descriptor.value = getNewFunction(descriptor.value, hashFunction, ttlMs, tags);
-    } else if (descriptor.get != null) {
-      descriptor.get = getNewFunction(descriptor.get, hashFunction, ttlMs, tags);
-    } else {
-      throw new Error("Only put a Memoize() decorator on a method or get accessor.");
-    }
-  };
-}
-
-export function MemoizeExpiring(ttlMs: number, hashFunction?: MemoizeArgs["hashFunction"]) {
-  return Memoize({
-    ttlMs,
-    hashFunction,
-  });
-}
-
-const clearCacheTagsMap: Map<string, Map<any, any>[]> = new Map();
-
-export function clear(tags: string[]): number {
-  const cleared: Set<Map<any, any>> = new Set();
-  for (const tag of tags) {
-    const maps = clearCacheTagsMap.get(tag);
-    if (maps) {
-      for (const mp of maps) {
-        if (!cleared.has(mp)) {
-          mp.clear();
-          cleared.add(mp);
-        }
-      }
-    }
-  }
-  return cleared.size;
-}
-
-function getNewFunction(
-  originalMethod: () => void,
-  hashFunction?: MemoizeArgs["hashFunction"],
-  ttlMs: number = 0,
-  tags?: MemoizeArgs["tags"],
-) {
-  const propMapName = Symbol("__memoized_map__");
-
-  // The function returned here gets called instead of originalMethod.
-  // eslint-disable-next-line func-names
-  return function (...args: any[]) {
-    let returnedValue: any;
-
-    // @ts-ignore
-    const that: any = this;
-
-    // Get or create map
-    // eslint-disable-next-line no-prototype-builtins
-    if (!that.hasOwnProperty(propMapName)) {
-      Object.defineProperty(that, propMapName, {
-        configurable: false,
-        enumerable: false,
-        writable: false,
-        value: new Map<any, any>(),
-      });
-    }
-    const myMap: Map<any, any> = that[propMapName];
-
-    if (Array.isArray(tags)) {
-      for (const tag of tags) {
-        if (clearCacheTagsMap.has(tag)) {
-          clearCacheTagsMap.get(tag)!.push(myMap);
-        } else {
-          clearCacheTagsMap.set(tag, [myMap]);
-        }
-      }
-    }
-
-    if (hashFunction || args.length > 0 || ttlMs > 0) {
-      let hashKey: any;
-
-      // If true is passed as first parameter, will automatically use every argument, passed to string
-      if (hashFunction === true) {
-        hashKey = args.map((a) => a.toString()).join("!");
-      } else if (hashFunction) {
-        hashKey = hashFunction.apply(that, args);
-      } else {
-        // eslint-disable-next-line prefer-destructuring
-        hashKey = args[0];
-      }
-
-      const timestampKey = `${hashKey}__timestamp`;
-      let isExpired: boolean = false;
-      if (ttlMs > 0) {
-        if (!myMap.has(timestampKey)) {
-          // "Expired" since it was never called before
-          isExpired = true;
-        } else {
-          const timestamp = myMap.get(timestampKey);
-          isExpired = Date.now() - timestamp > ttlMs;
-        }
-      }
-
-      if (myMap.has(hashKey) && !isExpired) {
-        returnedValue = myMap.get(hashKey);
-      } else {
-        returnedValue = originalMethod.apply(that, args as any);
-        myMap.set(hashKey, returnedValue);
-        if (ttlMs > 0) {
-          myMap.set(timestampKey, Date.now());
-        }
-      }
-    } else {
-      const hashKey = that;
-      if (myMap.has(hashKey)) {
-        returnedValue = myMap.get(hashKey);
-      } else {
-        returnedValue = originalMethod.apply(that, args as any);
-        myMap.set(hashKey, returnedValue);
-      }
-    }
-
-    return returnedValue;
-  };
-}
diff --git a/m1/JavaScript-client/src/utils/misc.ts b/m1/JavaScript-client/src/utils/misc.ts
deleted file mode 100644
index fca18b0f3..000000000
--- a/m1/JavaScript-client/src/utils/misc.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-export type Nullable<T> = { [P in keyof T]: T[P] | null };
-
-export type AnyObject = { [key: string]: any };
-
-export async function sleep(timeMs: number): Promise<null> {
-  return new Promise((resolve) => {
-    setTimeout(resolve, timeMs);
-  });
-}
-
-export const DEFAULT_VERSION_PATH_BASE = "/v1";
-
-export function fixNodeUrl(nodeUrl: string): string {
-  let out = `${nodeUrl}`;
-  if (out.endsWith("/")) {
-    out = out.substring(0, out.length - 1);
-  }
-  if (!out.endsWith(DEFAULT_VERSION_PATH_BASE)) {
-    out = `${out}${DEFAULT_VERSION_PATH_BASE}`;
-  }
-  return out;
-}
-
-export const DEFAULT_MAX_GAS_AMOUNT = 200000;
-// Transaction expire timestamp
-export const DEFAULT_TXN_EXP_SEC_FROM_NOW = 20;
-// How long does SDK wait for txhn to finish
-export const DEFAULT_TXN_TIMEOUT_SEC = 20;
-export const APTOS_COIN = "0x1::aptos_coin::AptosCoin";
diff --git a/m1/JavaScript-client/src/utils/pagination_helpers.ts b/m1/JavaScript-client/src/utils/pagination_helpers.ts
deleted file mode 100644
index 3d903715d..000000000
--- a/m1/JavaScript-client/src/utils/pagination_helpers.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { AnyNumber } from "../bcs";
-import { HexString, MaybeHexString } from "./hex_string";
-
-/// This function is a helper for paginating using a function wrapping an API
-export async function paginateWithCursor<T>(
-  apiFunction: (
-    address: string,
-    ledgerVersion?: string | undefined,
-    start?: string | undefined,
-    limit?: number | undefined,
-  ) => Promise<T[]>,
-  accountAddress: MaybeHexString,
-  limitPerRequest: number,
-  query?: { ledgerVersion?: AnyNumber },
-): Promise<T[]> {
-  const out = [];
-  let cursor: string | undefined;
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    // eslint-disable-next-line no-await-in-loop
-    const response = await apiFunction(
-      HexString.ensure(accountAddress).hex(),
-      query?.ledgerVersion?.toString(),
-      cursor,
-      limitPerRequest,
-    );
-    // Response is the main response, i.e. the T[]. Attached to that are the headers as `__headers`.
-    // eslint-disable-next-line no-underscore-dangle
-    cursor = (response as any).__headers["x-aptos-cursor"];
-    // Now that we have the cursor (if any), we remove the headers before
-    // adding these to the output of this function.
-    // eslint-disable-next-line no-underscore-dangle
-    delete (response as any).__headers;
-    out.push(...response);
-    if (cursor === null || cursor === undefined) {
-      break;
-    }
-  }
-  return out;
-}
diff --git a/m1/JavaScript-client/src/utils/property_map_serde.ts b/m1/JavaScript-client/src/utils/property_map_serde.ts
deleted file mode 100644
index b3b0d3d70..000000000
--- a/m1/JavaScript-client/src/utils/property_map_serde.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Bytes, Deserializer, Serializer } from "../bcs";
-import { serializeArg } from "../transaction_builder/builder_utils";
-import {
-  stringStructTag,
-  TypeTag,
-  TypeTagAddress,
-  TypeTagBool,
-  TypeTagParser,
-  TypeTagStruct,
-  TypeTagU128,
-  TypeTagU64,
-  TypeTagU8,
-} from "../aptos_types";
-import { HexString } from "./hex_string";
-
-export class PropertyValue {
-  type: string;
-
-  value: any;
-
-  constructor(type: string, value: string) {
-    this.type = type;
-    this.value = value;
-  }
-}
-
-export class PropertyMap {
-  data: { [key: string]: PropertyValue };
-
-  constructor() {
-    this.data = {};
-  }
-
-  setProperty(key: string, value: PropertyValue) {
-    this.data[key] = value;
-  }
-}
-
-export function getPropertyType(typ: string): TypeTag {
-  let typeTag: TypeTag;
-  if (typ === "string" || typ === "String") {
-    typeTag = new TypeTagStruct(stringStructTag);
-  } else {
-    typeTag = new TypeTagParser(typ).parseTypeTag();
-  }
-  return typeTag;
-}
-
-export function getPropertyValueRaw(values: Array<string>, types: Array<string>): Array<Bytes> {
-  if (values.length !== types.length) {
-    throw new Error("Length of property values and types not match");
-  }
-
-  const results = new Array<Bytes>();
-  types.forEach((typ, index) => {
-    try {
-      const typeTag = getPropertyType(typ);
-      const serializer = new Serializer();
-      serializeArg(values[index], typeTag, serializer);
-      results.push(serializer.getBytes());
-    } catch (error) {
-      // if not support type, just use the raw string bytes
-      results.push(new TextEncoder().encode(values[index]));
-    }
-  });
-  return results;
-}
-
-export function getSinglePropertyValueRaw(value: string, type: string): Uint8Array {
-  if (!value || !type) {
-    throw new Error("value or type can not be empty");
-  }
-
-  try {
-    const typeTag = getPropertyType(type);
-    const serializer = new Serializer();
-    serializeArg(value, typeTag, serializer);
-    return serializer.getBytes();
-  } catch (error) {
-    // if not support type, just use the raw string bytes
-    return new TextEncoder().encode(value);
-  }
-}
-
-export function deserializePropertyMap(rawPropertyMap: any): PropertyMap {
-  const entries = rawPropertyMap.map.data;
-  const pm = new PropertyMap();
-  entries.forEach((prop: any) => {
-    const { key } = prop;
-    const val: string = prop.value.value;
-    const typ: string = prop.value.type;
-    const typeTag = getPropertyType(typ);
-    const newValue = deserializeValueBasedOnTypeTag(typeTag, val);
-    const pv = new PropertyValue(typ, newValue);
-    pm.setProperty(key, pv);
-  });
-  return pm;
-}
-
-export function deserializeValueBasedOnTypeTag(tag: TypeTag, val: string): string {
-  const de = new Deserializer(new HexString(val).toUint8Array());
-  let res: string = "";
-  if (tag instanceof TypeTagU8) {
-    res = de.deserializeU8().toString();
-  } else if (tag instanceof TypeTagU64) {
-    res = de.deserializeU64().toString();
-  } else if (tag instanceof TypeTagU128) {
-    res = de.deserializeU128().toString();
-  } else if (tag instanceof TypeTagBool) {
-    res = de.deserializeBool() ? "true" : "false";
-  } else if (tag instanceof TypeTagAddress) {
-    res = HexString.fromUint8Array(de.deserializeFixedBytes(32)).hex();
-  } else if (tag instanceof TypeTagStruct && (tag as TypeTagStruct).isStringTypeTag()) {
-    res = de.deserializeStr();
-  } else {
-    res = val;
-  }
-  return res;
-}
diff --git a/m1/JavaScript-client/src/version.ts b/m1/JavaScript-client/src/version.ts
deleted file mode 100644
index c58a1f0ac..000000000
--- a/m1/JavaScript-client/src/version.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// hardcoded for now, we would want to have it injected dynamically
-export const VERSION = "1.8.5";
diff --git a/m1/JavaScript-client/tsconfig.json b/m1/JavaScript-client/tsconfig.json
deleted file mode 100644
index f7996b6de..000000000
--- a/m1/JavaScript-client/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "allowJs": true,
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "outDir": "./dist",
-    "sourceMap": true,
-    "strict": true,
-    "target": "es2020",
-    "pretty": true
-  },
-  "include": ["src"]
-}
diff --git a/m1/JavaScript-client/tsup.config.js b/m1/JavaScript-client/tsup.config.js
deleted file mode 100644
index b02abb274..000000000
--- a/m1/JavaScript-client/tsup.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/index.ts"],
-  splitting: false,
-  sourcemap: true,
-  target: "es2018",
-});
diff --git a/m1/JavaScript-client/yarn.lock b/m1/JavaScript-client/yarn.lock
deleted file mode 100644
index cbd0bd57b..000000000
--- a/m1/JavaScript-client/yarn.lock
+++ /dev/null
@@ -1,6110 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@apidevtools/json-schema-ref-parser@9.0.9":
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#d720f9256e3609621280584f2b47ae165359268b"
-  integrity sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==
-  dependencies:
-    "@jsdevtools/ono" "^7.1.3"
-    "@types/json-schema" "^7.0.6"
-    call-me-maybe "^1.0.1"
-    js-yaml "^4.1.0"
-
-"@ardatan/relay-compiler@12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106"
-  integrity sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==
-  dependencies:
-    "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
-    "@babel/parser" "^7.14.0"
-    "@babel/runtime" "^7.0.0"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
-    babel-preset-fbjs "^3.4.0"
-    chalk "^4.0.0"
-    fb-watchman "^2.0.0"
-    fbjs "^3.0.0"
-    glob "^7.1.1"
-    immutable "~3.7.6"
-    invariant "^2.2.4"
-    nullthrows "^1.1.1"
-    relay-runtime "12.0.0"
-    signedsource "^1.0.0"
-    yargs "^15.3.1"
-
-"@ardatan/sync-fetch@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz#3385d3feedceb60a896518a1db857ec1e945348f"
-  integrity sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==
-  dependencies:
-    node-fetch "^2.6.1"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
-  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/compat-data@^7.20.0":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
-  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
-
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
-  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
-
-"@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92"
-  integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.2"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.1"
-    "@babel/parser" "^7.20.2"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/core@^7.14.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
-  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.4"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.4"
-    "@babel/types" "^7.21.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
-
-"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
-  dependencies:
-    "@babel/types" "^7.21.4"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.20.1", "@babel/generator@^7.20.2", "@babel/generator@^7.7.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.2.tgz#c2e89e22613a039285c1e7b749e2cd0b30b9a481"
-  integrity sha512-SD75PMIK6i9H8G/tfGvB4KKl4Nw6Ssos9nGgYwxbgyTP0iX/Z55DveoH86rmUB/YHTQQ+ZC0F7xxaY8l2OF44Q==
-  dependencies:
-    "@babel/types" "^7.20.2"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
-  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
-  dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-validator-option" "^7.21.0"
-    browserslist "^4.21.3"
-    lru-cache "^5.1.1"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
-  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
-  dependencies:
-    "@babel/compat-data" "^7.20.0"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    semver "^6.3.0"
-
-"@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
-  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
-  dependencies:
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-transforms@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
-  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
-
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
-  dependencies:
-    "@babel/types" "^7.20.0"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helper-validator-option@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
-
-"@babel/helpers@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9"
-  integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.0"
-
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
-
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.2.tgz#9aeb9b92f64412b5f81064d46f6a1ac0881337f4"
-  integrity sha512-afk318kh2uKbo7BEj2QtEi8HVCGrwHUffrYDy7dgVcSa2j9lY3LDjPzcyGdpX7xgm35aWqvciZJ4WKmdF/SxYg==
-
-"@babel/parser@^7.14.0", "@babel/parser@^7.16.8", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
-  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
-
-"@babel/plugin-proposal-class-properties@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
-  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz#3e37fca4f06d93567c1cd9b75156422e90a67107"
-  integrity sha512-l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/plugin-syntax-import-meta@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.18.6":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
-  integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
-  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-classes@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
-
-"@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
-  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz#6aeca0adcb81dc627c8986e770bfaa4d9812aff5"
-  integrity sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-flow" "^7.18.6"
-
-"@babel/plugin-transform-for-of@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-function-name@^7.0.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-literals@^7.0.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-member-expression-literals@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-modules-commonjs@^7.0.0":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
-
-"@babel/plugin-transform-object-super@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
-  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-property-literals@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
-  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2"
-  integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-jsx" "^7.18.6"
-    "@babel/types" "^7.21.0"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-spread@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-
-"@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/runtime@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/template@^7.18.10", "@babel/template@^7.3.3":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
-"@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
-  dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.20.1", "@babel/traverse@^7.7.2":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
-  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.1"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.1"
-    "@babel/types" "^7.20.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
-  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
-  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
-"@esbuild/android-arm@0.15.13":
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.13.tgz#ce11237a13ee76d5eae3908e47ba4ddd380af86a"
-  integrity sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==
-
-"@esbuild/linux-loong64@0.15.13":
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz#64e8825bf0ce769dac94ee39d92ebe6272020dfc"
-  integrity sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==
-
-"@eslint/eslintrc@^1.3.1":
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
-  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.4.0"
-    globals "^13.15.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@graphql-codegen/add@^3.2.1":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.3.tgz#f1ecee085987e7c21841edc4b1fd48877c663e1a"
-  integrity sha512-sQOnWpMko4JLeykwyjFTxnhqjd/3NOG2OyMuvK76Wnnwh8DRrNf2VEs2kmSvLl7MndMlOj7Kh5U154dVcvhmKQ==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.1"
-    tslib "~2.4.0"
-
-"@graphql-codegen/cli@^2.13.5":
-  version "2.16.5"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-2.16.5.tgz#b3b5eeec357af01c1cb72f6a4ea96e52bd49e662"
-  integrity sha512-XYPIp+q7fB0xAGSAoRykiTe4oY80VU+z+dw5nuv4mLY0+pv7+pa2C6Nwhdw7a65lXOhFviBApWCCZeqd54SMnA==
-  dependencies:
-    "@babel/generator" "^7.18.13"
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.18.13"
-    "@graphql-codegen/core" "^2.6.8"
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-tools/apollo-engine-loader" "^7.3.6"
-    "@graphql-tools/code-file-loader" "^7.3.13"
-    "@graphql-tools/git-loader" "^7.2.13"
-    "@graphql-tools/github-loader" "^7.3.20"
-    "@graphql-tools/graphql-file-loader" "^7.5.0"
-    "@graphql-tools/json-file-loader" "^7.4.1"
-    "@graphql-tools/load" "^7.8.0"
-    "@graphql-tools/prisma-loader" "^7.2.49"
-    "@graphql-tools/url-loader" "^7.13.2"
-    "@graphql-tools/utils" "^9.0.0"
-    "@whatwg-node/fetch" "^0.6.0"
-    chalk "^4.1.0"
-    chokidar "^3.5.2"
-    cosmiconfig "^7.0.0"
-    cosmiconfig-typescript-loader "^4.3.0"
-    debounce "^1.2.0"
-    detect-indent "^6.0.0"
-    graphql-config "^4.4.0"
-    inquirer "^8.0.0"
-    is-glob "^4.0.1"
-    json-to-pretty-yaml "^1.2.2"
-    listr2 "^4.0.5"
-    log-symbols "^4.0.0"
-    shell-quote "^1.7.3"
-    string-env-interpolation "^1.0.1"
-    ts-log "^2.2.3"
-    ts-node "^10.9.1"
-    tslib "^2.4.0"
-    yaml "^1.10.0"
-    yargs "^17.0.0"
-
-"@graphql-codegen/core@^2.6.8":
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-2.6.8.tgz#00c4011e3619ddbc6af5e41b2f254d6f6759556e"
-  integrity sha512-JKllNIipPrheRgl+/Hm/xuWMw9++xNQ12XJR/OHHgFopOg4zmN3TdlRSyYcv/K90hCFkkIwhlHFUQTfKrm8rxQ==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.1"
-    "@graphql-tools/schema" "^9.0.0"
-    "@graphql-tools/utils" "^9.1.1"
-    tslib "~2.4.0"
-
-"@graphql-codegen/import-types-preset@^2.2.3":
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/import-types-preset/-/import-types-preset-2.2.6.tgz#aab292d93f79bffc09bc12a51843c3272b526475"
-  integrity sha512-Lo2ITOln3UVdyyEPiijj8bVhVg0Ghp/JzHXA2LXxrJVCRbXizQhVC2vjiaWTjMskPt9Zub0yIoce4+RrbsXKcg==
-  dependencies:
-    "@graphql-codegen/add" "^3.2.1"
-    "@graphql-codegen/plugin-helpers" "^2.7.2"
-    "@graphql-codegen/visitor-plugin-common" "2.13.1"
-    tslib "~2.4.0"
-
-"@graphql-codegen/plugin-helpers@^2.7.2":
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.2.tgz#6544f739d725441c826a8af6a49519f588ff9bed"
-  integrity sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg==
-  dependencies:
-    "@graphql-tools/utils" "^8.8.0"
-    change-case-all "1.0.14"
-    common-tags "1.8.2"
-    import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/plugin-helpers@^3.0.0", "@graphql-codegen/plugin-helpers@^3.1.1", "@graphql-codegen/plugin-helpers@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz#69a2e91178f478ea6849846ade0a59a844d34389"
-  integrity sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==
-  dependencies:
-    "@graphql-tools/utils" "^9.0.0"
-    change-case-all "1.0.15"
-    common-tags "1.8.2"
-    import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/schema-ast@^2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-2.6.1.tgz#8ba1b38827c034b51ecd3ce88622c2ae6cd3fe1a"
-  integrity sha512-5TNW3b1IHJjCh07D2yQNGDQzUpUl2AD+GVe1Dzjqyx/d2Fn0TPMxLsHsKPS4Plg4saO8FK/QO70wLsP7fdbQ1w==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-tools/utils" "^9.0.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/typescript-graphql-request@^4.5.8":
-  version "4.5.9"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-graphql-request/-/typescript-graphql-request-4.5.9.tgz#d8a9488b7419cabf2ca98ae3936e82b9d244f2e9"
-  integrity sha512-Vtv5qymUXcR4UFdHOlJHzK5TN+CZUwMwFDGb3n4Gjcr4yln1BWbUb7DXgD0GHzpXwDIj5G2XmJnFtr0jihBfrg==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.0.0"
-    "@graphql-codegen/visitor-plugin-common" "2.13.1"
-    auto-bind "~4.0.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/typescript-operations@^2.5.3":
-  version "2.5.13"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-2.5.13.tgz#f286c37f9c023356aacaa983ebd32e9e021a05ca"
-  integrity sha512-3vfR6Rx6iZU0JRt29GBkFlrSNTM6t+MSLF86ChvL4d/Jfo/JYAGuB3zNzPhirHYzJPCvLOAx2gy9ID1ltrpYiw==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-codegen/typescript" "^2.8.8"
-    "@graphql-codegen/visitor-plugin-common" "2.13.8"
-    auto-bind "~4.0.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/typescript@^2.7.3", "@graphql-codegen/typescript@^2.8.8":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-2.8.8.tgz#8c3b9153e334db43c65f8f31ced69b4c60d14861"
-  integrity sha512-A0oUi3Oy6+DormOlrTC4orxT9OBZkIglhbJBcDmk34jAKKUgesukXRd4yOhmTrnbchpXz2T8IAOFB3FWIaK4Rw==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-codegen/schema-ast" "^2.6.1"
-    "@graphql-codegen/visitor-plugin-common" "2.13.8"
-    auto-bind "~4.0.0"
-    tslib "~2.4.0"
-
-"@graphql-codegen/visitor-plugin-common@2.13.1":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b"
-  integrity sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^2.7.2"
-    "@graphql-tools/optimize" "^1.3.0"
-    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
-    "@graphql-tools/utils" "^8.8.0"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.14"
-    dependency-graph "^0.11.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "~2.4.0"
-
-"@graphql-codegen/visitor-plugin-common@2.13.8":
-  version "2.13.8"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.8.tgz#09bc6317b227e5a278f394f4cef0d6c2d1910597"
-  integrity sha512-IQWu99YV4wt8hGxIbBQPtqRuaWZhkQRG2IZKbMoSvh0vGeWb3dB0n0hSgKaOOxDY+tljtOf9MTcUYvJslQucMQ==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-tools/optimize" "^1.3.0"
-    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
-    "@graphql-tools/utils" "^9.0.0"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.15"
-    dependency-graph "^0.11.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "~2.4.0"
-
-"@graphql-tools/apollo-engine-loader@^7.3.6":
-  version "7.3.26"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-7.3.26.tgz#91e54460d5579933e42a2010b8688c3459c245d8"
-  integrity sha512-h1vfhdJFjnCYn9b5EY1Z91JTF0KB3hHVJNQIsiUV2mpQXZdeOXQoaWeYEKaiI5R6kwBw5PP9B0fv3jfUIG8LyQ==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/utils" "^9.2.1"
-    "@whatwg-node/fetch" "^0.8.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/batch-execute@^8.5.21":
-  version "8.5.21"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.21.tgz#dce327cab43bf6d7389e607f603369724c93ce06"
-  integrity sha512-DDyCPUSUjc0he/I9byguxohW/owQyVEO/gJcXLFAbHtTjORci3gRaRwLw24j0WaP+ZAlxYTMQs1HSlyJFaUArA==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    dataloader "^2.2.2"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/code-file-loader@^7.3.13":
-  version "7.3.23"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.23.tgz#33793f9a1f8e74981f8ae6ec4ab7061f9713db15"
-  integrity sha512-8Wt1rTtyTEs0p47uzsPJ1vAtfAx0jmxPifiNdmo9EOCuUPyQGEbMaik/YkqZ7QUFIEYEQu+Vgfo8tElwOPtx5Q==
-  dependencies:
-    "@graphql-tools/graphql-tag-pluck" "7.5.2"
-    "@graphql-tools/utils" "^9.2.1"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/delegate@^9.0.31":
-  version "9.0.34"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.34.tgz#50a877b3645bf5275d12c6f8a422cefdfe16bdad"
-  integrity sha512-qVTeq+0nxiDo54f28r0tOoXE6nipzGyDp5uuNMJJRvmIWjFGiyOBI8IsynPvLb2nCwhcpaTVJ2Bqswk/3DNO4w==
-  dependencies:
-    "@graphql-tools/batch-execute" "^8.5.21"
-    "@graphql-tools/executor" "^0.0.19"
-    "@graphql-tools/schema" "^9.0.19"
-    "@graphql-tools/utils" "^9.2.1"
-    dataloader "^2.2.2"
-    tslib "^2.5.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/executor-graphql-ws@^0.0.14":
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.14.tgz#e0f53fc4cfc8a06cc461b2bc1edb4bb9a8e837ed"
-  integrity sha512-P2nlkAsPZKLIXImFhj0YTtny5NQVGSsKnhi7PzXiaHSXc6KkzqbWZHKvikD4PObanqg+7IO58rKFpGXP7eeO+w==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    "@repeaterjs/repeater" "3.0.4"
-    "@types/ws" "^8.0.0"
-    graphql-ws "5.12.1"
-    isomorphic-ws "5.0.0"
-    tslib "^2.4.0"
-    ws "8.13.0"
-
-"@graphql-tools/executor-http@^0.1.7", "@graphql-tools/executor-http@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-0.1.9.tgz#ddd74ef376b4a2ed59c622acbcca068890854a30"
-  integrity sha512-tNzMt5qc1ptlHKfpSv9wVBVKCZ7gks6Yb/JcYJluxZIT4qRV+TtOFjpptfBU63usgrGVOVcGjzWc/mt7KhmmpQ==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    "@repeaterjs/repeater" "^3.0.4"
-    "@whatwg-node/fetch" "^0.8.1"
-    dset "^3.1.2"
-    extract-files "^11.0.0"
-    meros "^1.2.1"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/executor-legacy-ws@^0.0.11":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.11.tgz#a1e12be8279e92a363a23d4105461a34cd9e389e"
-  integrity sha512-4ai+NnxlNfvIQ4c70hWFvOZlSUN8lt7yc+ZsrwtNFbFPH/EroIzFMapAxM9zwyv9bH38AdO3TQxZ5zNxgBdvUw==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    "@types/ws" "^8.0.0"
-    isomorphic-ws "5.0.0"
-    tslib "^2.4.0"
-    ws "8.13.0"
-
-"@graphql-tools/executor@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.19.tgz#df3e0aa03923cebc6a4ff9bad76a8fd4c8e34eb5"
-  integrity sha512-JYxuxseH7GGQ9olamrK73xUA05q/bKZ1efnYglSD6/05pb+Gz+VXDK8Y3pWha10aM6c529t//6hzJ5T/99Be5Q==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    "@graphql-typed-document-node/core" "3.2.0"
-    "@repeaterjs/repeater" "^3.0.4"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/git-loader@^7.2.13":
-  version "7.2.22"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.2.22.tgz#b937273adae69a992d5d1d2e43bc1df21b6654d3"
-  integrity sha512-9rpHggHiOeqA7/ZlKD3c5yXk5bPGw0zkIgKMerjCmFAQAZ6CEVfsa7nAzEWQxn6rpdaBft4/0A56rPMrsUwGBA==
-  dependencies:
-    "@graphql-tools/graphql-tag-pluck" "7.5.2"
-    "@graphql-tools/utils" "^9.2.1"
-    is-glob "4.0.3"
-    micromatch "^4.0.4"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/github-loader@^7.3.20":
-  version "7.3.28"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-7.3.28.tgz#a7166b136e8442bd8b3ab943ad3b66c84bcabfcf"
-  integrity sha512-OK92Lf9pmxPQvjUNv05b3tnVhw0JRfPqOf15jZjyQ8BfdEUrJoP32b4dRQQem/wyRL24KY4wOfArJNqzpsbwCA==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/executor-http" "^0.1.9"
-    "@graphql-tools/graphql-tag-pluck" "^7.4.6"
-    "@graphql-tools/utils" "^9.2.1"
-    "@whatwg-node/fetch" "^0.8.0"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/graphql-file-loader@^7.3.7", "@graphql-tools/graphql-file-loader@^7.5.0":
-  version "7.5.17"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.17.tgz#7c281617ea3ab4db4d42a2bdb49850f2b937f0f9"
-  integrity sha512-hVwwxPf41zOYgm4gdaZILCYnKB9Zap7Ys9OhY1hbwuAuC4MMNY9GpUjoTU3CQc3zUiPoYStyRtUGkHSJZ3HxBw==
-  dependencies:
-    "@graphql-tools/import" "6.7.18"
-    "@graphql-tools/utils" "^9.2.1"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/graphql-tag-pluck@7.5.2", "@graphql-tools/graphql-tag-pluck@^7.4.6":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.5.2.tgz#502f1e066e19d832ebdeba5f571d7636dc27572d"
-  integrity sha512-RW+H8FqOOLQw0BPXaahYepVSRjuOHw+7IL8Opaa5G5uYGOBxoXR7DceyQ7BcpMgktAOOmpDNQ2WtcboChOJSRA==
-  dependencies:
-    "@babel/parser" "^7.16.8"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/import@6.7.18":
-  version "6.7.18"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.7.18.tgz#ad092d8a4546bb6ffc3e871e499eec7ac368680b"
-  integrity sha512-XQDdyZTp+FYmT7as3xRWH/x8dx0QZA2WZqfMF5EWb36a0PiH7WwlRQYIdyYXj8YCLpiWkeBXgBRHmMnwEYR8iQ==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    resolve-from "5.0.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/json-file-loader@^7.3.7", "@graphql-tools/json-file-loader@^7.4.1":
-  version "7.4.18"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.4.18.tgz#d78ae40979bde51cfc59717757354afc9e35fba2"
-  integrity sha512-AJ1b6Y1wiVgkwsxT5dELXhIVUPs/u3VZ8/0/oOtpcoyO/vAeM5rOvvWegzicOOnQw8G45fgBRMkkRfeuwVt6+w==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    globby "^11.0.3"
-    tslib "^2.4.0"
-    unixify "^1.0.0"
-
-"@graphql-tools/load@^7.5.5", "@graphql-tools/load@^7.8.0":
-  version "7.8.14"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.8.14.tgz#f2356f9a5f658a42e33934ae036e4b2cadf2d1e9"
-  integrity sha512-ASQvP+snHMYm+FhIaLxxFgVdRaM0vrN9wW2BKInQpktwWTXVyk+yP5nQUCEGmn0RTdlPKrffBaigxepkEAJPrg==
-  dependencies:
-    "@graphql-tools/schema" "^9.0.18"
-    "@graphql-tools/utils" "^9.2.1"
-    p-limit "3.1.0"
-    tslib "^2.4.0"
-
-"@graphql-tools/merge@^8.2.6", "@graphql-tools/merge@^8.4.1":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.1.tgz#52879e5f73565f504ceea04fcd9ef90a6e733c62"
-  integrity sha512-hssnPpZ818mxgl5+GfyOOSnnflAxiaTn1A1AojZcIbh4J52sS1Q0gSuBR5VrnUDjuxiqoCotpXdAQl+K+U6KLQ==
-  dependencies:
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/optimize@^1.3.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.4.0.tgz#20d6a9efa185ef8fc4af4fd409963e0907c6e112"
-  integrity sha512-dJs/2XvZp+wgHH8T5J2TqptT9/6uVzIYvA6uFACha+ufvdMBedkfR4b4GbT8jAKLRARiqRTxy3dctnwkTM2tdw==
-  dependencies:
-    tslib "^2.4.0"
-
-"@graphql-tools/prisma-loader@^7.2.49":
-  version "7.2.71"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.71.tgz#7540bfabcc9717c10c1ebdb359d265f721205199"
-  integrity sha512-FuIvhRrkduqPdj3QX0/anCxGViEETfoZ/1NvotfM6iVO1XxR75VXvP/iyKGbK6XvYRXwSstgj2DetlQnqdgXhA==
-  dependencies:
-    "@graphql-tools/url-loader" "^7.17.18"
-    "@graphql-tools/utils" "^9.2.1"
-    "@types/js-yaml" "^4.0.0"
-    "@types/json-stable-stringify" "^1.0.32"
-    "@whatwg-node/fetch" "^0.8.2"
-    chalk "^4.1.0"
-    debug "^4.3.1"
-    dotenv "^16.0.0"
-    graphql-request "^6.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    jose "^4.11.4"
-    js-yaml "^4.0.0"
-    json-stable-stringify "^1.0.1"
-    lodash "^4.17.20"
-    scuid "^1.1.0"
-    tslib "^2.4.0"
-    yaml-ast-parser "^0.0.43"
-
-"@graphql-tools/relay-operation-optimizer@^6.5.0":
-  version "6.5.18"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.18.tgz#a1b74a8e0a5d0c795b8a4d19629b654cf66aa5ab"
-  integrity sha512-mc5VPyTeV+LwiM+DNvoDQfPqwQYhPV/cl5jOBjTgSniyaq8/86aODfMkrE2OduhQ5E00hqrkuL2Fdrgk0w1QJg==
-  dependencies:
-    "@ardatan/relay-compiler" "12.0.0"
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/schema@^9.0.0", "@graphql-tools/schema@^9.0.18", "@graphql-tools/schema@^9.0.19":
-  version "9.0.19"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7"
-  integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w==
-  dependencies:
-    "@graphql-tools/merge" "^8.4.1"
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-tools/url-loader@^7.13.2", "@graphql-tools/url-loader@^7.17.18", "@graphql-tools/url-loader@^7.9.7":
-  version "7.17.18"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.17.18.tgz#3e253594d23483e4c0dd3a4c3dd2ad5cd0141192"
-  integrity sha512-ear0CiyTj04jCVAxi7TvgbnGDIN2HgqzXzwsfcqiVg9cvjT40NcMlZ2P1lZDgqMkZ9oyLTV8Bw6j+SyG6A+xPw==
-  dependencies:
-    "@ardatan/sync-fetch" "^0.0.1"
-    "@graphql-tools/delegate" "^9.0.31"
-    "@graphql-tools/executor-graphql-ws" "^0.0.14"
-    "@graphql-tools/executor-http" "^0.1.7"
-    "@graphql-tools/executor-legacy-ws" "^0.0.11"
-    "@graphql-tools/utils" "^9.2.1"
-    "@graphql-tools/wrap" "^9.4.2"
-    "@types/ws" "^8.0.0"
-    "@whatwg-node/fetch" "^0.8.0"
-    isomorphic-ws "^5.0.0"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.11"
-    ws "^8.12.0"
-
-"@graphql-tools/utils@^8.8.0":
-  version "8.13.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.13.1.tgz#b247607e400365c2cd87ff54654d4ad25a7ac491"
-  integrity sha512-qIh9yYpdUFmctVqovwMdheVNJqFh+DQNWIhX87FJStfXYnmweBUDATok9fWPleKeFwxnW8IapKmY8m8toJEkAw==
-  dependencies:
-    tslib "^2.4.0"
-
-"@graphql-tools/utils@^9.0.0", "@graphql-tools/utils@^9.1.1", "@graphql-tools/utils@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
-  integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    tslib "^2.4.0"
-
-"@graphql-tools/wrap@^9.4.2":
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.4.2.tgz#30835587c4c73be1780908a7cb077d8013aa2703"
-  integrity sha512-DFcd9r51lmcEKn0JW43CWkkI2D6T9XI1juW/Yo86i04v43O9w2/k4/nx2XTJv4Yv+iXwUw7Ok81PGltwGJSDSA==
-  dependencies:
-    "@graphql-tools/delegate" "^9.0.31"
-    "@graphql-tools/schema" "^9.0.18"
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-    value-or-promise "^1.0.12"
-
-"@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
-  integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
-
-"@humanwhocodes/config-array@^0.10.4":
-  version "0.10.7"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
-  integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@jest/console@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
-  integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-
-"@jest/core@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
-  integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/reporters" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^28.1.3"
-    jest-config "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-resolve-dependencies "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    jest-watcher "^28.1.3"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
-"@jest/environment@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e"
-  integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==
-  dependencies:
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-
-"@jest/expect-utils@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
-  integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
-  dependencies:
-    jest-get-type "^28.0.2"
-
-"@jest/expect@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
-  integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
-  dependencies:
-    expect "^28.1.3"
-    jest-snapshot "^28.1.3"
-
-"@jest/fake-timers@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e"
-  integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@sinonjs/fake-timers" "^9.1.2"
-    "@types/node" "*"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
-"@jest/globals@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
-  integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/types" "^28.1.3"
-
-"@jest/reporters@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
-  integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^5.1.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^9.0.1"
-
-"@jest/schemas@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
-  integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
-  dependencies:
-    "@sinclair/typebox" "^0.24.1"
-
-"@jest/source-map@^28.1.2":
-  version "28.1.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
-  integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.13"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
-
-"@jest/test-result@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
-  integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
-  integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    slash "^3.0.0"
-
-"@jest/transform@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
-  integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.1"
-
-"@jest/types@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
-  integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.0":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
-
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
-  dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.17":
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
-  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
-  dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
-
-"@jsdevtools/ono@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
-  integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
-
-"@noble/hashes@1.1.3", "@noble/hashes@~1.1.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.3.tgz#360afc77610e0a61f3417e497dcf36862e4f8111"
-  integrity sha512-CE0FCR57H2acVI5UOzIGSSIYxZ6v/HOhDR0Ro9VLyhnzLwx0o8W1mmgaqlEUx4049qJDlIBRztv5k+MM8vbO3A==
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@peculiar/asn1-schema@^2.3.6":
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz#3dd3c2ade7f702a9a94dfb395c192f5fa5d6b922"
-  integrity sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==
-  dependencies:
-    asn1js "^3.0.5"
-    pvtsutils "^1.3.2"
-    tslib "^2.4.0"
-
-"@peculiar/json-schema@^1.1.12":
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz#fe61e85259e3b5ba5ad566cb62ca75b3d3cd5339"
-  integrity sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==
-  dependencies:
-    tslib "^2.0.0"
-
-"@peculiar/webcrypto@^1.4.0":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz#078b3e8f598e847b78683dc3ba65feb5029b93a7"
-  integrity sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==
-  dependencies:
-    "@peculiar/asn1-schema" "^2.3.6"
-    "@peculiar/json-schema" "^1.1.12"
-    pvtsutils "^1.3.2"
-    tslib "^2.5.0"
-    webcrypto-core "^1.7.7"
-
-"@repeaterjs/repeater@3.0.4", "@repeaterjs/repeater@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca"
-  integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==
-
-"@scure/base@~1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
-  integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==
-
-"@scure/bip39@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.0.tgz#92f11d095bae025f166bef3defcc5bf4945d419a"
-  integrity sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==
-  dependencies:
-    "@noble/hashes" "~1.1.1"
-    "@scure/base" "~1.1.0"
-
-"@sinclair/typebox@^0.24.1":
-  version "0.24.51"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
-  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
-
-"@sinonjs/commons@^1.7.0":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.4.tgz#d1f2d80f1bd0f2520873f161588bd9b7f8567120"
-  integrity sha512-RpmQdHVo8hCEHDVpO39zToS9jOhR6nw+/lQAzRNq9ErrGV9IeHM71XCn68svVl/euFeVW6BWX4p35gkhbOcSIQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
-  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
-
-"@types/babel__core@^7.1.14":
-  version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309"
-  integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
-"@types/jest@28.1.8":
-  version "28.1.8"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.8.tgz#6936409f3c9724ea431efd412ea0238a0f03b09b"
-  integrity sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==
-  dependencies:
-    expect "^28.0.0"
-    pretty-format "^28.0.0"
-
-"@types/js-yaml@^4.0.0":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
-  integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
-
-"@types/json-schema@^7.0.6", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-stable-stringify@^1.0.32":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75"
-  integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
-
-"@types/node@*":
-  version "18.11.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
-  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
-
-"@types/node@18.6.2":
-  version "18.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.2.tgz#ffc5f0f099d27887c8d9067b54e55090fcd54126"
-  integrity sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
-"@types/prettier@^2.1.5":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
-  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
-
-"@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
-
-"@types/ws@^8.0.0":
-  version "8.5.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
-
-"@types/yargs@^17.0.8":
-  version "17.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
-  integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@typescript-eslint/eslint-plugin@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
-  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/type-utils" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
-    debug "^4.3.4"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.2.0"
-    regexpp "^3.2.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
-  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
-  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
-  dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
-
-"@typescript-eslint/type-utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
-  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
-  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
-
-"@typescript-eslint/typescript-estree@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
-  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
-  dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
-  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
-  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
-  dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    eslint-visitor-keys "^3.3.0"
-
-"@whatwg-node/events@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.2.tgz#7b7107268d2982fc7b7aff5ee6803c64018f84dd"
-  integrity sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w==
-
-"@whatwg-node/events@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.3.tgz#13a65dd4f5893f55280f766e29ae48074927acad"
-  integrity sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==
-
-"@whatwg-node/fetch@^0.6.0":
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.6.9.tgz#6cc694cc0378e27b8dfed427c5bf633eda6972b9"
-  integrity sha512-JfrBCJdMu9n9OARc0e/hPHcD98/8Nz1CKSdGYDg6VbObDkV/Ys30xe5i/wPOatYbxuvatj1kfWeHf7iNX3i17w==
-  dependencies:
-    "@peculiar/webcrypto" "^1.4.0"
-    "@whatwg-node/node-fetch" "^0.0.5"
-    busboy "^1.6.0"
-    urlpattern-polyfill "^6.0.2"
-    web-streams-polyfill "^3.2.1"
-
-"@whatwg-node/fetch@^0.8.0", "@whatwg-node/fetch@^0.8.1", "@whatwg-node/fetch@^0.8.2":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.8.8.tgz#48c6ad0c6b7951a73e812f09dd22d75e9fa18cae"
-  integrity sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg==
-  dependencies:
-    "@peculiar/webcrypto" "^1.4.0"
-    "@whatwg-node/node-fetch" "^0.3.6"
-    busboy "^1.6.0"
-    urlpattern-polyfill "^8.0.0"
-    web-streams-polyfill "^3.2.1"
-
-"@whatwg-node/node-fetch@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.0.5.tgz#bebf18891088e5e2fc449dea8d1bc94af5ec38df"
-  integrity sha512-hbccmaSZaItdsRuBKBEEhLoO+5oXJPxiyd0kG2xXd0Dh3Rt+vZn4pADHxuSiSHLd9CM+S2z4+IxlEGbWUgiz9g==
-  dependencies:
-    "@whatwg-node/events" "^0.0.2"
-    busboy "^1.6.0"
-    tslib "^2.3.1"
-
-"@whatwg-node/node-fetch@^0.3.6":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz#e28816955f359916e2d830b68a64493124faa6d0"
-  integrity sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==
-  dependencies:
-    "@whatwg-node/events" "^0.0.3"
-    busboy "^1.6.0"
-    fast-querystring "^1.1.1"
-    fast-url-parser "^1.1.3"
-    tslib "^2.3.1"
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^8.4.1, acorn@^8.8.0:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
-  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
-
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv@^6.10.0, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
-
-anymatch@^3.0.3, anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-array-includes@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
-  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-    get-intrinsic "^1.1.1"
-    is-string "^1.0.7"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array.prototype.flat@^1.2.5:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
-
-asn1js@^3.0.1, asn1js@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz#5ea36820443dbefb51cc7f88a2ebb5b462114f38"
-  integrity sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==
-  dependencies:
-    pvtsutils "^1.3.2"
-    pvutils "^1.1.3"
-    tslib "^2.4.0"
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-auto-bind@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
-  integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
-
-axios@0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
-  dependencies:
-    follow-redirects "^1.14.9"
-    form-data "^4.0.0"
-
-babel-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
-  integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
-  dependencies:
-    "@jest/transform" "^28.1.3"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^28.1.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
-babel-plugin-istanbul@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
-    test-exclude "^6.0.0"
-
-babel-plugin-jest-hoist@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
-  integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
-  integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
-
-babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-
-babel-preset-fbjs@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
-  integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-property-literals" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
-
-babel-preset-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
-  integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
-  dependencies:
-    babel-plugin-jest-hoist "^28.1.3"
-    babel-preset-current-node-syntax "^1.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browserslist@^4.21.3:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
-  dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
-
-bs-logger@0.x:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
-  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
-  dependencies:
-    fast-json-stable-stringify "2.x"
-
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-bundle-require@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-3.1.2.tgz#1374a7bdcb8b330a7ccc862ccbf7c137cc43ad27"
-  integrity sha512-Of6l6JBAxiyQ5axFxUM6dYeP/W7X2Sozeo/4EYB9sJhL+dqL7TKjg+shwxp6jlu/6ZSERfsYtIpSJ1/x3XkAEA==
-  dependencies:
-    load-tsconfig "^0.2.0"
-
-busboy@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
-  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
-  dependencies:
-    streamsearch "^1.1.0"
-
-cac@^6.7.12:
-  version "6.7.14"
-  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
-  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-call-me-maybe@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
-  integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.2.0, camelcase@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001430"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001430.tgz#638a8ae00b5a8a97e66ff43733b2701f81b101fa"
-  integrity sha512-IB1BXTZKPDVPM7cnV4iaKaHxckvdr/3xtctB3f7Hmenx3qYBhGtTZ//7EllK66aKXW98Lx0+7Yr0kxBtIt3tzg==
-
-capital-case@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
-  integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
-
-chalk@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-change-case-all@1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz#bac04da08ad143278d0ac3dda7eccd39280bfba1"
-  integrity sha512-CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA==
-  dependencies:
-    change-case "^4.1.2"
-    is-lower-case "^2.0.2"
-    is-upper-case "^2.0.2"
-    lower-case "^2.0.2"
-    lower-case-first "^2.0.2"
-    sponge-case "^1.0.1"
-    swap-case "^2.0.2"
-    title-case "^3.0.3"
-    upper-case "^2.0.2"
-    upper-case-first "^2.0.2"
-
-change-case-all@1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
-  integrity sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==
-  dependencies:
-    change-case "^4.1.2"
-    is-lower-case "^2.0.2"
-    is-upper-case "^2.0.2"
-    lower-case "^2.0.2"
-    lower-case-first "^2.0.2"
-    sponge-case "^1.0.1"
-    swap-case "^2.0.2"
-    title-case "^3.0.3"
-    upper-case "^2.0.2"
-    upper-case-first "^2.0.2"
-
-change-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
-  integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==
-  dependencies:
-    camel-case "^4.1.2"
-    capital-case "^1.0.4"
-    constant-case "^3.0.4"
-    dot-case "^3.0.4"
-    header-case "^2.0.4"
-    no-case "^3.0.4"
-    param-case "^3.0.4"
-    pascal-case "^3.1.2"
-    path-case "^3.0.4"
-    sentence-case "^3.0.4"
-    snake-case "^3.0.4"
-    tslib "^2.0.3"
-
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chokidar@^3.5.1, chokidar@^3.5.2:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-ci-info@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
-  integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
-
-cjs-module-lexer@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
-  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-spinners@^2.5.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.8.0.tgz#e97a3e2bd00e6d85aa0c13d7f9e3ce236f7787fc"
-  integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ==
-
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
-
-collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.16:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
-commander@^9.3.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
-  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
-
-common-tags@1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-confusing-browser-globals@^1.0.10:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
-  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
-
-constant-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
-  integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case "^2.0.2"
-
-convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
-cosmiconfig-typescript-loader@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073"
-  integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==
-
-cosmiconfig@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
-  integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==
-  dependencies:
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-cross-fetch@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-dataloader@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
-  integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==
-
-debounce@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
-  dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-dependency-graph@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
-  integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
-
-detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
-
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
-diff-sequences@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
-  integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-dotenv@16.0.2:
-  version "16.0.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.2.tgz#0b0f8652c016a3858ef795024508cddc4bffc5bf"
-  integrity sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==
-
-dotenv@^16.0.0:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
-
-dset@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a"
-  integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==
-
-electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
-
-emittery@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
-  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-enhanced-resolve@^5.0.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
-  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5, es-abstract@^1.20.4:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
-  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
-es-shim-unscopables@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
-  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
-  dependencies:
-    has "^1.0.3"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-esbuild-android-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz#5f25864055dbd62e250f360b38b4c382224063af"
-  integrity sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==
-
-esbuild-android-arm64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz#d8820f999314efbe8e0f050653a99ff2da632b0f"
-  integrity sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==
-
-esbuild-darwin-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz#99ae7fdaa43947b06cd9d1a1c3c2c9f245d81fd0"
-  integrity sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==
-
-esbuild-darwin-arm64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz#bafa1814354ad1a47adcad73de416130ef7f55e3"
-  integrity sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==
-
-esbuild-freebsd-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz#84ef85535c5cc38b627d1c5115623b088d1de161"
-  integrity sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==
-
-esbuild-freebsd-arm64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz#033f21de434ec8e0c478054b119af8056763c2d8"
-  integrity sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==
-
-esbuild-linux-32@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz#54290ea8035cba0faf1791ce9ae6693005512535"
-  integrity sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==
-
-esbuild-linux-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz#4264249281ea388ead948614b57fb1ddf7779a2c"
-  integrity sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==
-
-esbuild-linux-arm64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz#9323c333924f97a02bdd2ae8912b36298acb312d"
-  integrity sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==
-
-esbuild-linux-arm@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz#b407f47b3ae721fe4e00e19e9f19289bef87a111"
-  integrity sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==
-
-esbuild-linux-mips64le@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz#bdf905aae5c0bcaa8f83567fe4c4c1bdc1f14447"
-  integrity sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==
-
-esbuild-linux-ppc64le@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz#2911eae1c90ff58a3bd3259cb557235df25aa3b4"
-  integrity sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==
-
-esbuild-linux-riscv64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz#1837c660be12b1d20d2a29c7189ea703f93e9265"
-  integrity sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==
-
-esbuild-linux-s390x@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz#d52880ece229d1bd10b2d936b792914ffb07c7fc"
-  integrity sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==
-
-esbuild-netbsd-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz#de14da46f1d20352b43e15d97a80a8788275e6ed"
-  integrity sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==
-
-esbuild-openbsd-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz#45e8a5fd74d92ad8f732c43582369c7990f5a0ac"
-  integrity sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==
-
-esbuild-sunos-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz#f646ac3da7aac521ee0fdbc192750c87da697806"
-  integrity sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==
-
-esbuild-windows-32@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz#fb4fe77c7591418880b3c9b5900adc4c094f2401"
-  integrity sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==
-
-esbuild-windows-64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz#1fca8c654392c0c31bdaaed168becfea80e20660"
-  integrity sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==
-
-esbuild-windows-arm64@0.15.13:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz#4ffd01b6b2888603f1584a2fe96b1f6a6f2b3dd8"
-  integrity sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==
-
-esbuild@^0.15.1:
-  version "0.15.13"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.13.tgz#7293480038feb2bafa91d3f6a20edab3ba6c108a"
-  integrity sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==
-  optionalDependencies:
-    "@esbuild/android-arm" "0.15.13"
-    "@esbuild/linux-loong64" "0.15.13"
-    esbuild-android-64 "0.15.13"
-    esbuild-android-arm64 "0.15.13"
-    esbuild-darwin-64 "0.15.13"
-    esbuild-darwin-arm64 "0.15.13"
-    esbuild-freebsd-64 "0.15.13"
-    esbuild-freebsd-arm64 "0.15.13"
-    esbuild-linux-32 "0.15.13"
-    esbuild-linux-64 "0.15.13"
-    esbuild-linux-arm "0.15.13"
-    esbuild-linux-arm64 "0.15.13"
-    esbuild-linux-mips64le "0.15.13"
-    esbuild-linux-ppc64le "0.15.13"
-    esbuild-linux-riscv64 "0.15.13"
-    esbuild-linux-s390x "0.15.13"
-    esbuild-netbsd-64 "0.15.13"
-    esbuild-openbsd-64 "0.15.13"
-    esbuild-sunos-64 "0.15.13"
-    esbuild-windows-32 "0.15.13"
-    esbuild-windows-64 "0.15.13"
-    esbuild-windows-arm64 "0.15.13"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-config-airbnb-base@15.0.0, eslint-config-airbnb-base@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
-  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
-  dependencies:
-    confusing-browser-globals "^1.0.10"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-    semver "^6.3.0"
-
-eslint-config-airbnb-typescript@17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz#360dbcf810b26bbcf2ff716198465775f1c49a07"
-  integrity sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==
-  dependencies:
-    eslint-config-airbnb-base "^15.0.0"
-
-eslint-config-prettier@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
-
-eslint-import-resolver-node@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
-  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
-  dependencies:
-    debug "^3.2.7"
-    resolve "^1.20.0"
-
-eslint-module-utils@^2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
-  dependencies:
-    debug "^3.2.7"
-
-eslint-plugin-import@2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
-  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
-  dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flat "^1.2.5"
-    debug "^2.6.9"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.3"
-    has "^1.0.3"
-    is-core-module "^2.8.1"
-    is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.values "^1.1.5"
-    resolve "^1.22.0"
-    tsconfig-paths "^3.14.1"
-
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint@8.23.0:
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
-  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.1"
-    "@humanwhocodes/config-array" "^0.10.4"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
-    globby "^11.1.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-
-espree@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
-  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
-
-expect@^28.0.0, expect@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
-  integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
-  dependencies:
-    "@jest/expect-utils" "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extract-files@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
-  integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
-
-extract-files@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
-  integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==
-
-fast-decode-uri-component@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
-  integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fast-querystring@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.1.tgz#f4c56ef56b1a954880cfd8c01b83f9e1a3d3fda2"
-  integrity sha512-qR2r+e3HvhEFmpdHMv//U8FnFlnYjaC6QKDuaXALDkw2kvHO8WDjxH+f/rHGR4Me4pnk8p9JAkRNTjYHAKRn2Q==
-  dependencies:
-    fast-decode-uri-component "^1.0.1"
-
-fast-url-parser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
-  integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==
-  dependencies:
-    punycode "^1.3.2"
-
-fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
-  dependencies:
-    reusify "^1.0.4"
-
-fb-watchman@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
-  dependencies:
-    bser "2.1.1"
-
-fbjs-css-vars@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
-  integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
-
-fbjs@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6"
-  integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==
-  dependencies:
-    cross-fetch "^3.1.5"
-    fbjs-css-vars "^1.0.0"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.30"
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
-
-follow-redirects@^1.14.9:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
-form-data@4.0.0, form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-fs-extra@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fsevents@^2.3.2, fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-functions-have-names@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.3"
-
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob@7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globals@^13.15.0:
-  version "13.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
-  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
-  dependencies:
-    type-fest "^0.20.2"
-
-globby@^11.0.3, globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
-graphql-config@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.5.0.tgz#257c2338950b8dce295a27f75c5f6c39f8f777b2"
-  integrity sha512-x6D0/cftpLUJ0Ch1e5sj1TZn6Wcxx4oMfmhaG9shM0DKajA9iR+j1z86GSTQ19fShbGvrSSvbIQsHku6aQ6BBw==
-  dependencies:
-    "@graphql-tools/graphql-file-loader" "^7.3.7"
-    "@graphql-tools/json-file-loader" "^7.3.7"
-    "@graphql-tools/load" "^7.5.5"
-    "@graphql-tools/merge" "^8.2.6"
-    "@graphql-tools/url-loader" "^7.9.7"
-    "@graphql-tools/utils" "^9.0.0"
-    cosmiconfig "8.0.0"
-    jiti "1.17.1"
-    minimatch "4.2.3"
-    string-env-interpolation "1.0.1"
-    tslib "^2.4.0"
-
-graphql-request@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-5.2.0.tgz#a05fb54a517d91bb2d7aefa17ade4523dc5ebdca"
-  integrity sha512-pLhKIvnMyBERL0dtFI3medKqWOz/RhHdcgbZ+hMMIb32mEPa5MJSzS4AuXxfI4sRAu6JVVk5tvXuGfCWl9JYWQ==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    cross-fetch "^3.1.5"
-    extract-files "^9.0.0"
-    form-data "^3.0.0"
-
-graphql-request@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.0.0.tgz#9c8b6a0c341f289e049936d03cc9205300faae1c"
-  integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.2.0"
-    cross-fetch "^3.1.5"
-
-graphql-tag@^2.11.0:
-  version "2.12.6"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
-  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
-  dependencies:
-    tslib "^2.1.0"
-
-graphql-ws@5.12.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.12.1.tgz#c62d5ac54dbd409cc6520b0b39de374b3d59d0dd"
-  integrity sha512-umt4f5NnMK46ChM2coO36PTFhHouBrK9stWWBczERguwYrGnPNxJ9dimU6IyOBfOkC6Izhkg4H8+F51W/8CYDg==
-
-graphql@^16.5.0:
-  version "16.6.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
-  integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==
-
-handlebars@^4.7.7:
-  version "4.7.7"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
-  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
-  dependencies:
-    minimist "^1.2.5"
-    neo-async "^2.6.0"
-    source-map "^0.6.1"
-    wordwrap "^1.0.0"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
-  dependencies:
-    get-intrinsic "^1.1.1"
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-header-case@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063"
-  integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==
-  dependencies:
-    capital-case "^1.0.4"
-    tslib "^2.0.3"
-
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-immutable@~3.7.6:
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
-  integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-from@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
-  integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
-
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3, inherits@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inquirer@^8.0.0:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
-  integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^7.0.0"
-
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
-  dependencies:
-    has "^1.0.3"
-
-is-date-object@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
-is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
-is-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz#1c0884d3012c841556243483aa5d522f47396d2a"
-  integrity sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==
-  dependencies:
-    tslib "^2.0.3"
-
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-is-upper-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649"
-  integrity sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==
-  dependencies:
-    tslib "^2.0.3"
-
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isomorphic-ws@5.0.0, isomorphic-ws@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
-  integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
-
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
-
-istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
-  dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.2.0"
-    semver "^6.3.0"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-jest-changed-files@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
-  integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
-  dependencies:
-    execa "^5.0.0"
-    p-limit "^3.1.0"
-
-jest-circus@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
-  integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    p-limit "^3.1.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-cli@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
-  integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
-  dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    import-local "^3.0.2"
-    jest-config "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    prompts "^2.0.1"
-    yargs "^17.3.1"
-
-jest-config@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
-  integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    babel-jest "^28.1.3"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^28.1.3"
-    jest-environment-node "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    micromatch "^4.0.4"
-    parse-json "^5.2.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    strip-json-comments "^3.1.1"
-
-jest-diff@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
-  integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^28.1.1"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-docblock@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
-  integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
-  dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
-  integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    jest-util "^28.1.3"
-    pretty-format "^28.1.3"
-
-jest-environment-node@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
-  integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
-jest-get-type@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
-  integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
-
-jest-haste-map@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
-  integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
-jest-leak-detector@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
-  integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
-  dependencies:
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-matcher-utils@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
-  integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-message-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
-  integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^28.1.3"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-mock@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
-  integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-
-jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
-
-jest-regex-util@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
-  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
-
-jest-resolve-dependencies@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
-  integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
-  dependencies:
-    jest-regex-util "^28.0.2"
-    jest-snapshot "^28.1.3"
-
-jest-resolve@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
-  integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
-  dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    resolve "^1.20.0"
-    resolve.exports "^1.1.0"
-    slash "^3.0.0"
-
-jest-runner@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
-  integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/environment" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    graceful-fs "^4.2.9"
-    jest-docblock "^28.1.1"
-    jest-environment-node "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-leak-detector "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-resolve "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-util "^28.1.3"
-    jest-watcher "^28.1.3"
-    jest-worker "^28.1.3"
-    p-limit "^3.1.0"
-    source-map-support "0.5.13"
-
-jest-runtime@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
-  integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/globals" "^28.1.3"
-    "@jest/source-map" "^28.1.2"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-
-jest-snapshot@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
-  integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/babel__traverse" "^7.0.6"
-    "@types/prettier" "^2.1.5"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-haste-map "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    natural-compare "^1.4.0"
-    pretty-format "^28.1.3"
-    semver "^7.3.5"
-
-jest-util@^28.0.0, jest-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
-  integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-validate@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
-  integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    leven "^3.1.0"
-    pretty-format "^28.1.3"
-
-jest-watcher@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
-  integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    jest-util "^28.1.3"
-    string-length "^4.0.1"
-
-jest-worker@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest@28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b"
-  integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==
-  dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    import-local "^3.0.2"
-    jest-cli "^28.1.3"
-
-jiti@1.17.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.17.1.tgz#264daa43ee89a03e8be28c3d712ccc4eb9f1e8ed"
-  integrity sha512-NZIITw8uZQFuzQimqjUxIrIcEdxYDFIe/0xYfIlVXTkiBjjyBEvgasj5bb0/cHtPRD/NziPbT312sFrkI5ALpw==
-
-jose@^4.11.4:
-  version "4.14.2"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.2.tgz#f126e2805555882f0d86d1f84bcf00481d5ab3bf"
-  integrity sha512-Fcbi5lskAiSvs8qhdQBusANZWwyATdp7IxgHJTXiaU74sbVjX9uAw+myDPvI8pNo2wXKHECXCR63hqhRkN/SSQ==
-
-joycon@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
-  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^4.0.0, js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-ref-parser@^9.0.9:
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#66ea538e7450b12af342fa3d5b8458bc1e1e013f"
-  integrity sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==
-  dependencies:
-    "@apidevtools/json-schema-ref-parser" "9.0.9"
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json-stable-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
-  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
-  dependencies:
-    jsonify "^0.0.1"
-
-json-to-pretty-yaml@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz#f4cd0bd0a5e8fe1df25aaf5ba118b099fd992d5b"
-  integrity sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==
-  dependencies:
-    remedial "^1.0.7"
-    remove-trailing-spaces "^1.0.6"
-
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
-json5@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonify@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
-  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-lilconfig@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
-  integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
-
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
-listr2@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
-  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.5"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
-
-load-tsconfig@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.3.tgz#08af3e7744943caab0c75f8af7f1703639c3ef1f"
-  integrity sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ==
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.memoize@4.x:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
-
-lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^4.0.0, log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lower-case-first@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-2.0.2.tgz#64c2324a2250bf7c37c5901e76a5b5309301160b"
-  integrity sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==
-  dependencies:
-    tslib "^2.0.3"
-
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-lunr@^2.3.9:
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
-  integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
-
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-make-error@1.x, make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
-  dependencies:
-    tmpl "1.0.5"
-
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-marked@^4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.5.tgz#979813dfc1252cc123a79b71b095759a32f42a5d"
-  integrity sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-meros@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz#056f7a76e8571d0aaf3c7afcbe7eb6407ff7329e"
-  integrity sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g==
-
-micromatch@^4.0.0, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimatch@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6"
-  integrity sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff"
-  integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mz@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-neo-async@^2.6.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^2.6.1:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-nullthrows@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
-  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
-
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-inspect@^1.12.2, object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2, object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0, onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-"openapi-typescript-codegen@https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz":
-  version "0.24.0"
-  resolved "https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz#36a66aa2dc0d02ffc75b87c0b16fac12f273a42a"
-  dependencies:
-    camelcase "^6.3.0"
-    commander "^9.3.0"
-    fs-extra "^10.1.0"
-    handlebars "^4.7.7"
-    json-schema-ref-parser "^9.0.9"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-filepath@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
-parse-json@^5.0.0, parse-json@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f"
-  integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
-  dependencies:
-    path-root-regex "^0.1.0"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pirates@^4.0.1, pirates@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
-
-pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-postcss-load-config@^3.0.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
-  integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
-  dependencies:
-    lilconfig "^2.0.5"
-    yaml "^1.10.2"
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prettier@2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
-  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
-
-pretty-format@^28.0.0, pretty-format@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
-  integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    ansi-regex "^5.0.1"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-prompts@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-punycode@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-pvtsutils@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de"
-  integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==
-  dependencies:
-    tslib "^2.4.0"
-
-pvutils@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
-  integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
-
-readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-relay-runtime@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"
-  integrity sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    fbjs "^3.0.0"
-    invariant "^2.2.4"
-
-remedial@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0"
-  integrity sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
-
-remove-trailing-spaces@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz#4354d22f3236374702f58ee373168f6d6887ada7"
-  integrity sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@5.0.0, resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
-
-resolve@^1.20.0, resolve@^1.22.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup@^2.74.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-rxjs@^7.5.5:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-regex "^1.1.4"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-scuid@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
-  integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==
-
-semver@7.x, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-sentence-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
-  integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
-shiki@^0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.12.1.tgz#26fce51da12d055f479a091a5307470786f300cd"
-  integrity sha512-aieaV1m349rZINEBkjxh2QbBvFFQOlgqYTNtCal82hHj4dDZ76oMlQIX+C7ryerBTDiga3e5NfH6smjdJ02BbQ==
-  dependencies:
-    jsonc-parser "^3.2.0"
-    vscode-oniguruma "^1.7.0"
-    vscode-textmate "^8.0.0"
-
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signedsource@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
-  integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
-
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-snake-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
-  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@0.8.0-beta.0:
-  version "0.8.0-beta.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
-  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
-  dependencies:
-    whatwg-url "^7.0.0"
-
-source-map@^0.6.0, source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sponge-case@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c"
-  integrity sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==
-  dependencies:
-    tslib "^2.0.3"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
-streamsearch@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
-  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
-
-string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
-  integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
-
-string-length@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-sucrase@^3.20.3:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.28.0.tgz#7fd8b3118d2155fcdf291088ab77fa6eefd63c4c"
-  integrity sha512-TK9600YInjuiIhVM3729rH4ZKPOsGeyXUwY+Ugu9eilNbdTFyHr6XcAGYbRVZPDgWj6tgI7bx95aaJjHnbffag==
-  dependencies:
-    commander "^4.0.0"
-    glob "7.1.6"
-    lines-and-columns "^1.1.6"
-    mz "^2.7.0"
-    pirates "^4.0.1"
-    ts-interface-checker "^0.1.9"
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-hyperlinks@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
-  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-swap-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz#671aedb3c9c137e2985ef51c51f9e98445bf70d9"
-  integrity sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==
-  dependencies:
-    tslib "^2.0.3"
-
-tapable@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
-through@^2.3.6, through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-title-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"
-  integrity sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==
-  dependencies:
-    tslib "^2.0.3"
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==
-  dependencies:
-    punycode "^2.1.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-ts-interface-checker@^0.1.9:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
-  integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
-
-ts-jest@28.0.8:
-  version "28.0.8"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
-  integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
-  dependencies:
-    bs-logger "0.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^28.0.0"
-    json5 "^2.2.1"
-    lodash.memoize "4.x"
-    make-error "1.x"
-    semver "7.x"
-    yargs-parser "^21.0.1"
-
-ts-loader@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.1.tgz#fe25cca56e3e71c1087fe48dc67f4df8c59b22d4"
-  integrity sha512-OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
-ts-log@^2.2.3:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623"
-  integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==
-
-ts-node@10.9.1, ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
-tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
-tslib@~2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
-  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
-
-tsup@6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/tsup/-/tsup-6.2.3.tgz#87f57b2e53d49f1c1ab89aba21fed96aaab0ec9f"
-  integrity sha512-J5Pu2Dx0E1wlpIEsVFv9ryzP1pZ1OYsJ2cBHZ7GrKteytNdzaSz5hmLX7/nAxtypq+jVkVvA79d7S83ETgHQ5w==
-  dependencies:
-    bundle-require "^3.1.0"
-    cac "^6.7.12"
-    chokidar "^3.5.1"
-    debug "^4.3.1"
-    esbuild "^0.15.1"
-    execa "^5.0.0"
-    globby "^11.0.3"
-    joycon "^3.0.1"
-    postcss-load-config "^3.0.1"
-    resolve-from "^5.0.0"
-    rollup "^2.74.1"
-    source-map "0.8.0-beta.0"
-    sucrase "^3.20.3"
-    tree-kill "^1.2.2"
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-tweetnacl@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
-  integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-detect@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-typedoc@^0.23.20:
-  version "0.23.24"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.24.tgz#01cf32c09f2c19362e72a9ce1552d6e5b48c4fef"
-  integrity sha512-bfmy8lNQh+WrPYcJbtjQ6JEEsVl/ce1ZIXyXhyW+a1vFrjO39t6J8sL/d6FfAGrJTc7McCXgk9AanYBSNvLdIA==
-  dependencies:
-    lunr "^2.3.9"
-    marked "^4.2.5"
-    minimatch "^5.1.2"
-    shiki "^0.12.1"
-
-typescript@4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
-
-ua-parser-js@^0.7.30:
-  version "0.7.35"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307"
-  integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==
-
-uglify-js@^3.1.4:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
-
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
-  dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-unixify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
-  integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==
-  dependencies:
-    normalize-path "^2.1.1"
-
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
-upper-case-first@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
-  integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==
-  dependencies:
-    tslib "^2.0.3"
-
-upper-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a"
-  integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==
-  dependencies:
-    tslib "^2.0.3"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urlpattern-polyfill@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-6.0.2.tgz#a193fe773459865a2a5c93b246bb794b13d07256"
-  integrity sha512-5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg==
-  dependencies:
-    braces "^3.0.2"
-
-urlpattern-polyfill@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
-  integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
-
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-v8-to-istanbul@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
-  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-
-value-or-promise@^1.0.11, value-or-promise@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
-  integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
-
-vscode-oniguruma@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-textmate@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
-  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
-
-walker@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
-  dependencies:
-    makeerror "1.0.12"
-
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
-web-streams-polyfill@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
-  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
-
-webcrypto-core@^1.7.7:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.7.tgz#06f24b3498463e570fed64d7cab149e5437b162c"
-  integrity sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==
-  dependencies:
-    "@peculiar/asn1-schema" "^2.3.6"
-    "@peculiar/json-schema" "^1.1.12"
-    asn1js "^3.0.1"
-    pvtsutils "^1.3.2"
-    tslib "^2.4.0"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wordwrap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write-file-atomic@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-ws@8.13.0, ws@^8.12.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml-ast-parser@^0.0.43:
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
-  integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
-
-yaml@^1.10.0, yaml@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^21.0.1, yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@^15.3.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.0.0:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^17.3.1:
-  version "17.6.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/m1/genesis/movementLocal b/m1/genesis/movementLocal
new file mode 100644
index 000000000..b6fc4c620
--- /dev/null
+++ b/m1/genesis/movementLocal
@@ -0,0 +1 @@
+hello
\ No newline at end of file
diff --git a/m1/scripts/anr.sh b/m1/scripts/anr.sh
index e3482af12..c4973d0af 100755
--- a/m1/scripts/anr.sh
+++ b/m1/scripts/anr.sh
@@ -14,7 +14,11 @@ export SUBNET_ID=srEXiWaHZNDcVtfHLb38cFiwKVLJ8xnhDF5qpWbYdowxEiyid
 
 echo $SUBNET_ID
 # Copy the subnet binary to the plugin dir
+<<<<<<< HEAD
 # cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/${SUBNET_ID}
+=======
+cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/${SUBNET_ID}
+>>>>>>> indexer-fix
 # cp ./target/debug/subnet ${AVALANCHEGO_PLUGIN_PATH}/subnet
 
 # Start the avalanche-network-runner
diff --git a/m1/scripts/build.debug.sh b/m1/scripts/build.debug.sh
new file mode 100755
index 000000000..024d11299
--- /dev/null
+++ b/m1/scripts/build.debug.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -xue
+
+if ! [[ "$0" =~ scripts/build.debug.sh ]]; then
+  echo "must be run from m1"
+  exit 255
+fi
+
+PROTOC_VERSION=$(protoc --version | cut -f2 -d' ')
+if [[ "${PROTOC_VERSION}" == "" ]] || [[ "${PROTOC_VERSION}" < 3.15.0 ]]; then
+  echo "protoc must be installed and the version must be greater than 3.15.0"
+  exit 255
+fi
+
+# "--bin" can be specified multiple times for each directory in "bin/*" or workspaces
+cargo build -p subnet --bin subnet
+
+./target/debug/subnet --help
+
+./target/debug/subnet genesis "hello world"
+./target/debug/subnet vm-id timestampvm
\ No newline at end of file
diff --git a/m1/scripts/build.release.sh b/m1/scripts/build.release.sh
new file mode 100755
index 000000000..7d596856f
--- /dev/null
+++ b/m1/scripts/build.release.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -xue
+
+if ! [[ "$0" =~ scripts/build.release.sh ]]; then
+  echo "must be run from repository root"
+  exit 255
+fi
+
+PROTOC_VERSION=$(protoc --version | cut -f2 -d' ')
+if [[ "${PROTOC_VERSION}" == "" ]] || [[ "${PROTOC_VERSION}" < 3.15.0 ]]; then
+  echo "protoc must be installed and the version must be greater than 3.15.0"
+  exit 255
+fi
+
+# "--bin" can be specified multiple times for each directory in "bin/*" or workspaces
+cargo build -p subnet \
+--release \
+--bin subnet
+
+./target/release/subnet --help
+
+./target/release/subnet genesis "hello world"
+./target/release/subnet vm-id timestampvm
diff --git a/m1/scripts/fuji.sh b/m1/scripts/fuji.sh
new file mode 100755
index 000000000..86d9b9538
--- /dev/null
+++ b/m1/scripts/fuji.sh
@@ -0,0 +1,7 @@
+VM_NAME="movement"
+VM_ID="b6z34iYog6Qm8uUWmssHYWDhShhufDBtLo75K9nHwU69GTs8o"
+SUBNET_ID="K4GygGTpKkNzzjiLfZVsmQduGqSFztJx4nk52CvA1afcFAhsH"
+
+cargo build -p subnet
+cp ./target/debug/subnet ~/.avalanchego/plugins/$VM_ID
+./avalanchego --http-host=0.0.0.0 --network-id="fuji" --track-subnets "$SUBNET_ID"
\ No newline at end of file
diff --git a/m1/scripts/run.debug.sh b/m1/scripts/run.debug.sh
new file mode 100755
index 000000000..129663a69
--- /dev/null
+++ b/m1/scripts/run.debug.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+if ! [[ "$0" =~ scripts/run.debug.sh ]]; then
+  echo "must be run from the m1 directory"
+  exit 255
+fi
+
+SUBNET_TIMEOUT=300000 ./scripts/tests.debug.sh 
\ No newline at end of file
diff --git a/m1/scripts/start-subnet.sh b/m1/scripts/start-subnet.sh
index e17dafd8b..64808a239 100755
--- a/m1/scripts/start-subnet.sh
+++ b/m1/scripts/start-subnet.sh
@@ -7,7 +7,11 @@ echo hello > /tmp/subnet.genesis.json
 avalanche-network-runner control start \
 --log-level debug \
 --endpoint="0.0.0.0:8080" \
+<<<<<<< HEAD
 --avalanchego-path="${AVALANCHEGO_EXEC_PATH}"
+=======
+--avalanchego-path="${AVALANCHEGO_EXEC_PATH}" \
+>>>>>>> indexer-fix
 --blockchain-specs '[{"vm_name":"subnet","genesis":"/tmp/subnet.genesis.json","blockchain_alias":"movement"}]' \
 
 # avalanche-network-runner control create-blockchains '[{"vm_name":"movement", "subnet_id": "srEXiWaHZNDcVtfHLb38cFiwKVLJ8xnhDF5qpWbYdowxEiyid"}]' \
diff --git a/m1/scripts/tests.debug.sh b/m1/scripts/tests.debug.sh
new file mode 100755
index 000000000..645bf2fed
--- /dev/null
+++ b/m1/scripts/tests.debug.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+if ! [[ "$0" =~ scripts/tests.debug.sh ]]; then
+  echo "must be run from the m1 directory"
+  exit 255
+fi
+
+./scripts/build.debug.sh \
+&& VM_PLUGIN_PATH=$(pwd)/target/debug/subnet \
+./scripts/tests.e2e.sh
\ No newline at end of file
diff --git a/m1/scripts/tests.e2e.sh b/m1/scripts/tests.e2e.sh
new file mode 100755
index 000000000..73b614048
--- /dev/null
+++ b/m1/scripts/tests.e2e.sh
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+set -e
+
+# build timestampvm binary
+# ./scripts/build.release.sh
+#
+# download from github, keep network running
+# VM_PLUGIN_PATH=$(pwd)/target/release/timestampvm ./scripts/tests.e2e.sh
+#
+# download from github, shut down network
+# NETWORK_RUNNER_ENABLE_SHUTDOWN=1 VM_PLUGIN_PATH=$(pwd)/target/release/timestampvm ./scripts/tests.e2e.sh
+#
+# use custom avalanchego binary
+# VM_PLUGIN_PATH=$(pwd)/target/release/timestampvm ./scripts/tests.e2e.sh ~/go/src/github.com/ava-labs/avalanchego/build/avalanchego
+#
+if ! [[ "$0" =~ scripts/tests.e2e.sh ]]; then
+  echo "must be run from repository root"
+  exit 255
+fi
+
+AVALANCHEGO_PATH=${1:-""}
+echo AVALANCHEGO_PATH: ${AVALANCHEGO_PATH}
+echo VM_PLUGIN_PATH: ${VM_PLUGIN_PATH}
+
+#################################
+# download avalanche-network-runner
+# https://github.com/ava-labs/avalanche-network-runner
+# TODO: use "go install -v github.com/ava-labs/avalanche-network-runner/cmd/avalanche-network-runner@v${NETWORK_RUNNER_VERSION}"
+GOOS=$(go env GOOS)
+NETWORK_RUNNER_VERSION=1.7.1
+DOWNLOAD_PATH=/tmp/avalanche-network-runner.tar.gz
+DOWNLOAD_URL=https://github.com/ava-labs/avalanche-network-runner/releases/download/v${NETWORK_RUNNER_VERSION}/avalanche-network-runner_${NETWORK_RUNNER_VERSION}_linux_amd64.tar.gz
+if [[ ${GOOS} == "darwin" ]]; then
+  DOWNLOAD_URL=https://github.com/ava-labs/avalanche-network-runner/releases/download/v${NETWORK_RUNNER_VERSION}/avalanche-network-runner_${NETWORK_RUNNER_VERSION}_darwin_amd64.tar.gz
+fi
+echo ${DOWNLOAD_URL}
+
+rm -f ${DOWNLOAD_PATH}
+rm -f /tmp/avalanche-network-runner
+
+echo "downloading avalanche-network-runner ${NETWORK_RUNNER_VERSION} at ${DOWNLOAD_URL}"
+curl -L ${DOWNLOAD_URL} -o ${DOWNLOAD_PATH}
+
+echo "extracting downloaded avalanche-network-runner"
+tar xzvf ${DOWNLOAD_PATH} -C /tmp
+/tmp/avalanche-network-runner -h
+
+#################################
+# run "avalanche-network-runner" server
+echo "launch avalanche-network-runner in the background"
+/tmp/avalanche-network-runner \
+server \
+--log-level debug \
+--port=":12342" \
+--disable-grpc-gateway &
+NETWORK_RUNNER_PID=${!}
+sleep 5
+
+#################################
+echo "running e2e tests"
+NETWORK_RUNNER_GRPC_ENDPOINT=http://127.0.0.1:12342 \
+AVALANCHEGO_PATH=${AVALANCHEGO_PATH} \
+VM_PLUGIN_PATH=${VM_PLUGIN_PATH} \
+RUST_LOG=debug \
+cargo test --all-features --package e2e -- --show-output --nocapture
+
+#################################
+echo ""
+echo ""
+if [ -z "$NETWORK_RUNNER_ENABLE_SHUTDOWN" ]
+then
+  echo "SKIPPED SHUTDOWN..."
+  echo ""
+  echo "RUN FOLLOWING TO CLEAN UP:"
+  echo "pkill -P ${NETWORK_RUNNER_PID} || true"
+  echo "kill -2 ${NETWORK_RUNNER_PID} || true"
+  echo ""
+else 
+  echo "SHUTTING DOWN..."
+  echo ""
+  # "e2e.test" already terminates the cluster for "test" mode
+  # just in case tests are aborted, manually terminate them again
+  echo "network-runner RPC server was running on NETWORK_RUNNER_PID ${NETWORK_RUNNER_PID} as test mode; terminating the process..."
+  pkill -P ${NETWORK_RUNNER_PID} || true
+  kill -2 ${NETWORK_RUNNER_PID} || true
+fi
+
+echo "TEST SUCCESS"
diff --git a/m1/scripts/tests.lint.sh b/m1/scripts/tests.lint.sh
new file mode 100755
index 000000000..8035efca6
--- /dev/null
+++ b/m1/scripts/tests.lint.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -xue
+
+if ! [[ "$0" =~ scripts/tests.lint.sh ]]; then
+  echo "must be run from repository root"
+  exit 255
+fi
+
+# https://rust-lang.github.io/rustup/installation/index.html
+# rustup toolchain install nightly --allow-downgrade --profile minimal --component clippy
+#
+# https://github.com/rust-lang/rustfmt
+# rustup component add rustfmt
+# rustup component add rustfmt --toolchain nightly
+# rustup component add clippy
+# rustup component add clippy --toolchain nightly
+
+rustup default stable
+cargo fmt --all --verbose -- --check
+
+# TODO: enable nightly fmt
+rustup default nightly
+cargo +nightly fmt --all -- --config-path .rustfmt.nightly.toml --verbose --check || true
+
+# TODO: enable this
+cargo +nightly clippy --all --all-features -- -D warnings || true
+
+rustup default stable
+
+echo "ALL SUCCESS!"
diff --git a/m1/scripts/tests.unit.sh b/m1/scripts/tests.unit.sh
new file mode 100755
index 000000000..0f9daed91
--- /dev/null
+++ b/m1/scripts/tests.unit.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -xue
+
+if ! [[ "$0" =~ scripts/tests.unit.sh ]]; then
+  echo "must be run from repository root"
+  exit 255
+fi
+
+RUST_LOG=debug cargo test --all --all-features \
+--exclude e2e \
+-- --show-output
+
+echo "ALL SUCCESS!"
diff --git a/m1/scripts/tests.unused.sh b/m1/scripts/tests.unused.sh
new file mode 100755
index 000000000..3cb93c9e0
--- /dev/null
+++ b/m1/scripts/tests.unused.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -xue
+
+if ! [[ "$0" =~ scripts/tests.unused.sh ]]; then
+  echo "must be run from repository root"
+  exit 255
+fi
+
+# cargo install cargo-udeps --locked
+# https://github.com/est31/cargo-udeps
+cargo install cargo-udeps --locked
+cargo +nightly udeps
+
+echo "ALL SUCCESS!"
diff --git a/m1/subnet-request-proxy b/m1/subnet-request-proxy
new file mode 160000
index 000000000..e538ec536
--- /dev/null
+++ b/m1/subnet-request-proxy
@@ -0,0 +1 @@
+Subproject commit e538ec536ed845020bdd23268bc8c5a6a2140f91
diff --git a/m1/subnet/Cargo.toml b/m1/subnet/Cargo.toml
index 112355a0d..aaf8934f9 100644
--- a/m1/subnet/Cargo.toml
+++ b/m1/subnet/Cargo.toml
@@ -49,3 +49,9 @@ aptos-vm-genesis = { workspace = true }
 bcs = { workspace = true }
 aptos-node = { workspace = true, features = ["indexer"] }
 aptos-indexer-grpc-fullnode = { workspace = true }
+aptos-protos = { workspace = true }
+aptos-indexer = { workspace = true }
+
+# differs from workspace
+clap = { version = "4.4.8", features = ["cargo", "derive"] } 
+uuid = "1.5.0"
diff --git a/m1/subnet/src/bin/subnet/genesis.rs b/m1/subnet/src/bin/subnet/genesis.rs
new file mode 100644
index 000000000..b364f1808
--- /dev/null
+++ b/m1/subnet/src/bin/subnet/genesis.rs
@@ -0,0 +1,11 @@
+use clap::{arg, Command};
+
+pub const NAME: &str = "genesis";
+
+#[must_use]
+pub fn command() -> Command {
+    Command::new(NAME)
+        .about("Write a genesis file")
+        .arg(arg!(<DATA> "Genesis message data"))
+        .arg_required_else_help(true)
+}
diff --git a/m1/subnet/src/bin/subnet/main.rs b/m1/subnet/src/bin/subnet/main.rs
new file mode 100644
index 000000000..4c13cb444
--- /dev/null
+++ b/m1/subnet/src/bin/subnet/main.rs
@@ -0,0 +1,49 @@
+pub mod genesis;
+pub mod vm_id;
+
+use std::io;
+
+use avalanche_types::{subnet as avasubnet};
+use clap::{crate_version, Command};
+use subnet::run_subnet;
+
+pub const APP_NAME: &str = "subnet";
+
+#[tokio::main]
+async fn main() -> io::Result<()> {
+    let matches = Command::new(APP_NAME)
+        .version(crate_version!())
+        .about("Subnet")
+        .subcommands(vec![genesis::command(), vm_id::command()])
+        .get_matches();
+
+    // ref. https://github.com/env-logger-rs/env_logger/issues/47
+    env_logger::init_from_env(
+        env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+    );
+
+    match matches.subcommand() {
+        Some((genesis::NAME, sub_matches)) => {
+            let data = sub_matches.get_one::<String>("DATA").expect("required");
+            let genesis = data;
+            println!("{genesis}");
+
+            Ok(())
+        }
+
+        Some((vm_id::NAME, sub_matches)) => {
+            let vm_name = sub_matches.get_one::<String>("VM_NAME").expect("required");
+            let id = avasubnet::vm_name_to_id(vm_name)?;
+            println!("{id}");
+
+            Ok(())
+        }
+
+        _ => {
+            log::info!("starting subnet");
+            run_subnet().await?;
+            
+            Ok(())
+        }
+    }
+}
diff --git a/m1/subnet/src/bin/subnet/vm_id.rs b/m1/subnet/src/bin/subnet/vm_id.rs
new file mode 100644
index 000000000..45602115f
--- /dev/null
+++ b/m1/subnet/src/bin/subnet/vm_id.rs
@@ -0,0 +1,11 @@
+use clap::{arg, Command};
+
+pub const NAME: &str = "vm-id";
+
+#[must_use]
+pub fn command() -> Command {
+    Command::new(NAME)
+        .about("Converts a given Vm name string to Vm Id")
+        .arg(arg!(<VM_NAME> "A name of the Vm"))
+        .arg_required_else_help(true)
+}
diff --git a/m1/subnet/src/lib.rs b/m1/subnet/src/lib.rs
new file mode 100644
index 000000000..86da69662
--- /dev/null
+++ b/m1/subnet/src/lib.rs
@@ -0,0 +1,16 @@
+pub mod api;
+pub mod block;
+pub mod state;
+pub mod vm;
+
+use std::io;
+
+use avalanche_types::subnet;
+use tokio::sync::broadcast::{self, Receiver, Sender};
+
+pub async fn run_subnet() -> io::Result<()> {
+    let (stop_ch_tx, stop_ch_rx): (Sender<()>, Receiver<()>) = broadcast::channel(1);
+    let vm_server = subnet::rpc::vm::server::Server::new(vm::Vm::new(), stop_ch_tx);
+    log::info!("readying server");
+    subnet::rpc::vm::serve(vm_server, stop_ch_rx).await
+}
\ No newline at end of file
diff --git a/m1/subnet/src/main.rs b/m1/subnet/src/main.rs
deleted file mode 100644
index f79bd7bb4..000000000
--- a/m1/subnet/src/main.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::io;
-
-use avalanche_types::subnet;
-use tokio::sync::broadcast::{self, Receiver, Sender};
-
-mod vm;
-mod state;
-mod block;
-mod api;
-
-#[tokio::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(
-        env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
-    );
-    let (stop_ch_tx, stop_ch_rx): (Sender<()>, Receiver<()>) = broadcast::channel(1);
-    let vm_server = subnet::rpc::vm::server::Server::new(vm::Vm::new(), stop_ch_tx);
-    subnet::rpc::vm::serve(vm_server, stop_ch_rx).await
-}
diff --git a/m1/subnet/src/vm/mod.rs b/m1/subnet/src/vm/mod.rs
index 54b3a98db..c8a67b3c4 100644
--- a/m1/subnet/src/vm/mod.rs
+++ b/m1/subnet/src/vm/mod.rs
@@ -56,14 +56,23 @@ use aptos_types::validator_signer::ValidatorSigner;
 use aptos_vm::AptosVM;
 use aptos_vm_genesis::{GENESIS_KEYPAIR, test_genesis_change_set_and_validators};
 use aptos_node::indexer::bootstrap_indexer;
-use aptos_indexer_grpc_fullnode::runtime::bootstrap as bootstrap_indexer_grpc;
+use aptos_indexer::runtime::run_forever;
+// use aptos_indexer_grpc_fullnode::runtime::bootstrap as bootstrap_indexer_grpc;
+use aptos_indexer_grpc_fullnode::runtime::FullnodeDataService;
+use aptos_protos::internal::fullnode::v1::fullnode_data_server::{FullnodeData, FullnodeDataServer};
+use std::net::ToSocketAddrs;
 
 use crate::{block::Block, state};
 use crate::api::chain_handlers::{AccountStateArgs, BlockArgs, ChainHandler, ChainService, GetTransactionByVersionArgs, PageArgs, RpcEventHandleReq, RpcEventNumReq, RpcReq, RpcRes, RpcTableReq};
 use crate::api::static_handlers::{StaticHandler, StaticService};
+use tonic::{transport::Server, Request, Response, Status};
+use uuid::Uuid;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 const MOVE_DB_DIR: &str = ".move-chain-data";
+pub fn get_db_name(suffix : &str) -> String {
+    format!("{}-{}", MOVE_DB_DIR, suffix)
+}
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct AptosData(
@@ -1302,7 +1311,9 @@ impl Vm {
         Ok(())
     }
 
-    async fn init_aptos(&mut self) {
+    async fn init_aptos(&mut self, uuid : &str) {
+
+        let db_name = get_db_name(uuid);
 
         // generate the test genesis
         let (genesis, validators) = test_genesis_change_set_and_validators(Some(1));
@@ -1316,7 +1327,7 @@ impl Vm {
         let genesis_txn = Transaction::GenesisTransaction(WriteSetPayload::Direct(genesis));
         let p = format!("{}/{}",
                         dirs::home_dir().unwrap().to_str().unwrap(),
-                        MOVE_DB_DIR);
+                        db_name);
         if !fs::metadata(p.clone().as_str()).is_ok() {
             fs::create_dir_all(p.as_str()).unwrap();
         }
@@ -1341,14 +1352,39 @@ impl Vm {
         let (mempool_client_sender,
             mut mempool_client_receiver) = futures_mpsc::channel::<MempoolClientRequest>(10);
         let sender = MempoolClientSender::from(mempool_client_sender.clone());
-        let node_config = NodeConfig::default();
+        let mut node_config = NodeConfig::default();
+
+
+        node_config.indexer.enabled = true;
+        // indexer config
+        node_config.indexer.processor = Some("default_processor".to_string());
+        node_config.indexer.check_chain_id = Some(false);
+        node_config.indexer.skip_migrations = Some(false);
+        node_config.indexer.fetch_tasks = Some(4);
+        node_config.indexer.processor_tasks = Some(4);
+        node_config.indexer.emit_every = Some(4);
+        node_config.indexer.batch_size = Some(8);
+        node_config.indexer.gap_lookback_versions = Some(4);
+
+        node_config.indexer_grpc.enabled = true;
+
+        // indexer_grpc config
+        // let processor_task_count = node_config.indexer_grpc.processor_task_count.unwrap();
+        // let processor_batch_size = node_config.indexer_grpc.processor_batch_size.unwrap();
+        // let output_batch_size = node_config.indexer_grpc.output_batch_size.unwrap();
+        // let address = node_config.indexer_grpc.address.clone().unwrap();
+        node_config.indexer_grpc.processor_batch_size = Some(4);
+        node_config.indexer_grpc.processor_task_count = Some(4);
+        node_config.indexer_grpc.output_batch_size = Some(4);
+        node_config.indexer_grpc.address = Some(String::from("0.0.0.0"));
+
         let context = Context::new(ChainId::test(),
                                    db.1.reader.clone(),
                                    sender, node_config.clone());
 
         // initialze the raw api
         self.api_context = Some(context.clone());
-        let service = get_raw_api_service(Arc::new(context));
+        let service = get_raw_api_service(Arc::new(context.clone()));
         self.api_service = Some(service);
         self.core_mempool = Some(Arc::new(RwLock::new(CoreMempool::new(&node_config))));
         self.check_pending_tx().await;
@@ -1370,12 +1406,38 @@ impl Vm {
             }
         });
 
-        // start the indexer service
-        tokio::task::spawn(async move {
-            bootstrap_indexer_grpc(&node_config, ChainId::test(), db.1.reader.clone(), mempool_client_sender.clone()).unwrap();
-            bootstrap_indexer(&node_config, ChainId::test(), db.1.reader.clone(), MempoolClientSender::from(mempool_client_sender.clone())).unwrap();
-        });
+        // start the indexer services (this is already sent to the background, so I think we're good)
+        // bootstrap_indexer_grpc(&node_config, ChainId::test(), db.1.reader.clone(), mempool_client_sender.clone()).unwrap();
+        let indexer_context = Arc::new(context.clone());
+        let indexer_config = node_config.indexer.clone();
+        let server = FullnodeDataService {
+            context: indexer_context.clone(),
+            processor_task_count: 4,
+            processor_batch_size: 4,
+            output_batch_size: 4,
+        };
+
+        tokio::spawn(async move {
+
+            println!("Starting indexer gRPC service.");
+            match Server::builder()
+                .add_service(FullnodeDataServer::new(server))
+                .serve(String::from("0.0.0.0:8090").to_socket_addrs().unwrap().next().unwrap())
+                .await
+            {
+                Ok(_) => {
+                    println!("Indexer ");
+                },
+                Err(e) => {
+                    eprintln!("Failed to start server");
+                }
+            }
 
+        });
+        tokio::spawn(async move {
+            println!("Starting indexer trailer.");
+            run_forever(indexer_config, indexer_context.clone()).await;
+        });
 
     }
 }
@@ -1673,6 +1735,8 @@ impl CommonVm for Vm
         _fxs: &[snow::engine::common::vm::Fx],
         app_sender: Self::AppSender,
     ) -> io::Result<()> {
+        let uuid = Uuid::new_v4().to_string();
+        log::info!("initializing M1 Vm {}", uuid);
         let mut vm_state = self.state.write().await;
         vm_state.ctx = ctx.clone();
         let current = db_manager.current().await?;
@@ -1686,7 +1750,8 @@ impl CommonVm for Vm
         self.app_sender = Some(app_sender);
         drop(vm_state);
 
-        self.init_aptos().await;
+        
+        self.init_aptos(&uuid).await;
         let mut vm_state = self.state.write().await;
         let genesis = "hello world";
         let has_last_accepted = state.has_last_accepted_block().await?;
diff --git a/m1/tests/e2e/Cargo.toml b/m1/tests/e2e/Cargo.toml
new file mode 100644
index 000000000..7a48f4c2c
--- /dev/null
+++ b/m1/tests/e2e/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "e2e"
+version = "0.0.0"
+edition = "2021"
+rust-version = "1.70"
+publish = false
+description = "e2e tests for timestampvm"
+license = "BSD-3-Clause"
+homepage = "https://avax.network"
+
+[dependencies]
+
+[dev-dependencies]
+avalanche-installer = "0.0.77"
+avalanche-network-runner-sdk = "0.3.3" # https://crates.io/crates/avalanche-network-runner-sdk
+avalanche-types = { version = "0.1.4", features = ["jsonrpc_client", "subnet"] } # https://crates.io/crates/avalanche-types
+env_logger = "0.10.1"
+log = "0.4.19"
+random-manager = "0.0.5"
+serde_json = "1.0.108" # https://github.com/serde-rs/json/releases
+tempfile = "3.8.1"
+subnet = { path = "../../subnet" }
+tokio = { workspace = true } # https://github.com/tokio-rs/tokio/releases
+
diff --git a/m1/tests/e2e/src/lib.rs b/m1/tests/e2e/src/lib.rs
new file mode 100644
index 000000000..6e11c1a50
--- /dev/null
+++ b/m1/tests/e2e/src/lib.rs
@@ -0,0 +1,31 @@
+#[cfg(test)]
+mod tests;
+
+#[must_use]
+pub fn get_network_runner_grpc_endpoint() -> (String, bool) {
+    match std::env::var("NETWORK_RUNNER_GRPC_ENDPOINT") {
+        Ok(s) => (s, true),
+        _ => (String::new(), false),
+    }
+}
+
+#[must_use]
+pub fn get_network_runner_enable_shutdown() -> bool {
+    matches!(std::env::var("NETWORK_RUNNER_ENABLE_SHUTDOWN"), Ok(_))
+}
+
+#[must_use]
+pub fn get_avalanchego_path() -> (String, bool) {
+    match std::env::var("AVALANCHEGO_PATH") {
+        Ok(s) => (s, true),
+        _ => (String::new(), false),
+    }
+}
+
+#[must_use]
+pub fn get_vm_plugin_path() -> (String, bool) {
+    match std::env::var("VM_PLUGIN_PATH") {
+        Ok(s) => (s, true),
+        _ => (String::new(), false),
+    }
+}
diff --git a/m1/tests/e2e/src/tests/mod.rs b/m1/tests/e2e/src/tests/mod.rs
new file mode 100644
index 000000000..c1285fbf9
--- /dev/null
+++ b/m1/tests/e2e/src/tests/mod.rs
@@ -0,0 +1,236 @@
+use std::{
+    io,
+    fs::{self, File},
+    path::Path,
+    str::FromStr,
+    thread,
+    time::{Duration, Instant}, io::Write,
+};
+
+use avalanche_network_runner_sdk::{BlockchainSpec, Client, GlobalConfig, StartRequest};
+use avalanche_types::{ids, jsonrpc::client::info as avalanche_sdk_info, subnet};
+
+const AVALANCHEGO_VERSION: &str = "v1.10.9";
+
+// todo: extracted from genesis method
+// todo: really we should use a genesis once more 
+pub fn sync_genesis(byte_string : &str, file_path: &str) -> io::Result<()> {
+    log::info!("syncing genesis to '{}'", file_path);
+
+    let path = Path::new(file_path);
+    let parent_dir = path.parent().expect("Invalid path");
+    fs::create_dir_all(parent_dir)?;
+
+    let d = byte_string.as_bytes();
+
+    let mut f = File::create(file_path)?;
+    f.write_all(&d)?;
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn e2e() {
+    let _ = env_logger::builder()
+        .filter_level(log::LevelFilter::Info)
+        .is_test(true)
+        .try_init();
+
+    let (ep, is_set) = crate::get_network_runner_grpc_endpoint();
+    assert!(is_set);
+
+    let cli = Client::new(&ep).await;
+
+    log::info!("ping...");
+    let resp = cli.ping().await.expect("failed ping");
+    log::info!("network-runner is running (ping response {:?})", resp);
+
+    let (vm_plugin_path, exists) = crate::get_vm_plugin_path();
+    log::info!("Vm Plugin path: {vm_plugin_path}");
+    assert!(exists);
+    assert!(Path::new(&vm_plugin_path).exists());
+
+    let vm_id = Path::new(&vm_plugin_path)
+        .file_stem()
+        .unwrap()
+        .to_str()
+        .unwrap()
+        .to_string();
+    // ! for now, we hardcode the id to be subnet for orchestration
+    let vm_id = subnet::vm_name_to_id("subnet").unwrap();
+
+    let (mut avalanchego_exec_path, _) = crate::get_avalanchego_path();
+    let plugins_dir = if !avalanchego_exec_path.is_empty() {
+        let parent_dir = Path::new(&avalanchego_exec_path)
+            .parent()
+            .expect("unexpected None parent");
+        parent_dir
+            .join("plugins")
+            .as_os_str()
+            .to_str()
+            .unwrap()
+            .to_string()
+    } else {
+        let exec_path = avalanche_installer::avalanchego::github::download(
+            None,
+            None,
+            Some(AVALANCHEGO_VERSION.to_string()),
+        )
+        .await
+        .unwrap();
+        avalanchego_exec_path = exec_path;
+        avalanche_installer::avalanchego::get_plugin_dir(&avalanchego_exec_path)
+    };
+
+    log::info!(
+        "copying vm plugin {} to {}/{}",
+        vm_plugin_path,
+        plugins_dir,
+        vm_id
+    );
+
+    fs::create_dir(&plugins_dir).unwrap();
+    fs::copy(
+        &vm_plugin_path,
+        Path::new(&plugins_dir).join(vm_id.to_string()),
+    )
+    .unwrap();
+
+    // write some random genesis file
+    let genesis = random_manager::secure_string(10);
+    
+    let genesis_file_path = random_manager::tmp_path(10, None).unwrap();
+    sync_genesis(genesis.as_ref(), &genesis_file_path).unwrap();
+
+    log::info!(
+        "starting {} with avalanchego {}, genesis file path {}",
+        vm_id,
+        &avalanchego_exec_path,
+        genesis_file_path,
+    );
+    let resp = cli
+        .start(StartRequest {
+            exec_path: avalanchego_exec_path,
+            num_nodes: Some(5),
+            plugin_dir: plugins_dir,
+            global_node_config: Some(
+                serde_json::to_string(&GlobalConfig {
+                    log_level: String::from("info"),
+                })
+                .unwrap(),
+            ),
+            blockchain_specs: vec![BlockchainSpec {
+                vm_name: String::from("subnet"),
+                genesis: genesis_file_path.to_string(),
+                // blockchain_alias : String::from("subnet"), // todo: this doesn't always work oddly enough, need to debug
+                ..Default::default()
+            }],
+            ..Default::default()
+        })
+        .await
+        .expect("failed start");
+    log::info!(
+        "started avalanchego cluster with network-runner: {:?}",
+        resp
+    );
+
+    // enough time for network-runner to get ready
+    thread::sleep(Duration::from_secs(20));
+
+    log::info!("checking cluster healthiness...");
+    let mut ready = false;
+
+    let timeout = Duration::from_secs(300);
+    let interval = Duration::from_secs(15);
+    let start = Instant::now();
+    let mut cnt: u128 = 0;
+    loop {
+        let elapsed = start.elapsed();
+        if elapsed.gt(&timeout) {
+            break;
+        }
+
+        let itv = {
+            if cnt == 0 {
+                // first poll with no wait
+                Duration::from_secs(1)
+            } else {
+                interval
+            }
+        };
+        thread::sleep(itv);
+
+        ready = {
+            match cli.health().await {
+                Ok(_) => {
+                    log::info!("healthy now!");
+                    true
+                }
+                Err(e) => {
+                    log::warn!("not healthy yet {}", e);
+                    false
+                }
+            }
+        };
+        if ready {
+            break;
+        }
+
+        cnt += 1;
+    }
+    assert!(ready);
+
+    log::info!("checking status...");
+    let mut status = cli.status().await.expect("failed status");
+    loop {
+        let elapsed = start.elapsed();
+        if elapsed.gt(&timeout) {
+            break;
+        }
+
+        if let Some(ci) = &status.cluster_info {
+            if !ci.custom_chains.is_empty() {
+                break;
+            }
+        }
+
+        log::info!("retrying checking status...");
+        thread::sleep(interval);
+        status = cli.status().await.expect("failed status");
+    }
+
+    assert!(status.cluster_info.is_some());
+    let cluster_info = status.cluster_info.unwrap();
+    let mut rpc_eps: Vec<String> = Vec::new();
+    for (node_name, iv) in cluster_info.node_infos.into_iter() {
+        log::info!("{}: {}", node_name, iv.uri);
+        rpc_eps.push(iv.uri.clone());
+    }
+    let mut blockchain_id = ids::Id::empty();
+    for (k, v) in cluster_info.custom_chains.iter() {
+        log::info!("custom chain info: {}={:?}", k, v);
+        if v.chain_name == "subnet" {
+            blockchain_id = ids::Id::from_str(&v.chain_id).unwrap();
+            break;
+        }
+    }
+    log::info!("avalanchego RPC endpoints: {:?}", rpc_eps);
+
+    let resp = avalanche_sdk_info::get_network_id(&rpc_eps[0])
+        .await
+        .unwrap();
+    let network_id = resp.result.unwrap().network_id;
+    log::info!("network Id: {}", network_id);
+
+    // keep alive by sleeping for duration provided by SUBNET_TIMEOUT environment variable
+    // use sensible default
+    let timeout = Duration::from_secs(
+        std::env::var("SUBNET_TIMEOUT")
+            .unwrap_or_else(|_| "0".to_string())
+            .parse::<u64>()
+            .unwrap(),
+    );
+    log::info!("sleeping for {} seconds", timeout.as_secs());
+    thread::sleep(timeout);
+
+}
diff --git a/movement-sdk/.cargo/config.toml b/movement-sdk/.cargo/config.toml
new file mode 100644
index 000000000..f93b5556e
--- /dev/null
+++ b/movement-sdk/.cargo/config.toml
@@ -0,0 +1,33 @@
+[alias]
+xclippy = [
+  "clippy",
+  "--workspace",
+  "--all-targets",
+  "--",
+  "-Dwarnings",
+  "-Wclippy::all",
+  "-Aclippy::upper_case_acronyms",
+  "-Aclippy::enum-variant-names",
+  "-Aclippy::result-large-err",
+  "-Aclippy::mutable-key-type",
+]
+
+[build]
+rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
+
+# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
+
+# 64 bit MSVC
+[target.x86_64-pc-windows-msvc]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-C",
+  "force-frame-pointers=yes",
+  "-C",
+  "force-unwind-tables=yes",
+  "-C",
+  "link-arg=/STACK:8000000" # Set stack to 8 MB
+]
diff --git a/movement-sdk/.gitignore b/movement-sdk/.gitignore
new file mode 100644
index 000000000..1de565933
--- /dev/null
+++ b/movement-sdk/.gitignore
@@ -0,0 +1 @@
+target
\ No newline at end of file
diff --git a/movement-sdk/Cargo.lock b/movement-sdk/Cargo.lock
new file mode 100644
index 000000000..82498141b
--- /dev/null
+++ b/movement-sdk/Cargo.lock
@@ -0,0 +1,3069 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "asn1-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+dependencies = [
+ "asn1-rs-derive",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "auto_impl"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "avalanche-types"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "768d08fdaf7a9fcd16062f00af5985a729357bbdedb83eb5a8f196424c0186fe"
+dependencies = [
+ "async-trait",
+ "base64 0.21.5",
+ "bech32",
+ "blst",
+ "bs58 0.5.0",
+ "bytes",
+ "cert-manager",
+ "chrono",
+ "cmp-manager",
+ "ecdsa",
+ "ethers-core",
+ "futures",
+ "hex",
+ "hmac",
+ "http",
+ "hyper",
+ "jsonrpc-core",
+ "k256",
+ "lazy_static",
+ "log",
+ "num-derive",
+ "num-traits",
+ "prefix-manager",
+ "primitive-types",
+ "prost",
+ "rand",
+ "ring 0.16.20",
+ "ripemd",
+ "rust-embed",
+ "semver",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "serde_yaml",
+ "sha2",
+ "sha3",
+ "spki",
+ "strum",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+ "tonic-health",
+ "tonic-reflection",
+ "tower-service",
+ "url",
+ "zerocopy",
+ "zeroize",
+]
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blst"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b"
+dependencies = [
+ "cc",
+ "glob",
+ "threadpool",
+ "zeroize",
+]
+
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "sha2",
+ "tinyvec",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cert-manager"
+version = "0.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "166da6fda67aa44381158b8ad9c3b28d842951791c431ce61333e62cb9b05d5b"
+dependencies = [
+ "log",
+ "rand",
+ "random-manager",
+ "rcgen",
+ "rsa",
+ "rustls",
+ "rustls-pemfile",
+ "x509-parser 0.15.1",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "channel-avalanche"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "avalanche-types",
+ "movement-sdk",
+ "tokio",
+ "tonic 0.8.3",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "cmp-manager"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f5e2b424191b35b798b06e6c67fa5a5440a098925d931d7e91511d7d8fe275"
+
+[[package]]
+name = "const-oid"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "der-parser"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+dependencies = [
+ "asn1-rs",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "pkcs8",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "ethabi"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
+dependencies = [
+ "ethereum-types",
+ "hex",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha3",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "ethers-core"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6da5fa198af0d3be20c19192df2bd9590b92ce09a8421e793bec8851270f1b05"
+dependencies = [
+ "arrayvec",
+ "bytes",
+ "chrono",
+ "elliptic-curve",
+ "ethabi",
+ "generic-array",
+ "hex",
+ "k256",
+ "num_enum",
+ "open-fastrlp",
+ "rand",
+ "rlp",
+ "serde",
+ "serde_json",
+ "strum",
+ "tempfile",
+ "thiserror",
+ "tiny-keccak",
+ "unicode-xid",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+
+[[package]]
+name = "futures-task"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+
+[[package]]
+name = "futures-util"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 2.1.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.4.10",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.2",
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+dependencies = [
+ "futures",
+ "futures-executor",
+ "futures-util",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2",
+ "signature",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin 0.5.2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "movement-sdk"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "serde",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
+dependencies = [
+ "asn1-rs",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "open-fastrlp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
+dependencies = [
+ "arrayvec",
+ "auto_impl",
+ "bytes",
+ "ethereum-types",
+ "open-fastrlp-derive",
+]
+
+[[package]]
+name = "open-fastrlp-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
+dependencies = [
+ "bytes",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "prefix-manager"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21965b29633f6d9b2ebc05ba4c348173389e38da66de71dcd0b2bd8b9cde713c"
+
+[[package]]
+name = "primitive-types"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "random-manager"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2557c07161d4d805cd7e711d0648b292be9e727d9678d078bab052278cd1b71"
+dependencies = [
+ "bs58 0.4.0",
+ "lazy_static",
+ "primitive-types",
+ "rand",
+ "ring 0.16.20",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+dependencies = [
+ "pem",
+ "ring 0.16.20",
+ "time",
+ "x509-parser 0.14.0",
+ "yasna",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rlp-derive",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rust-embed"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40"
+dependencies = [
+ "rust-embed-impl",
+ "rust-embed-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-impl"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rust-embed-utils",
+ "syn 2.0.38",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-utils"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada"
+dependencies = [
+ "sha2",
+ "walkdir",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
+dependencies = [
+ "log",
+ "ring 0.17.5",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.5",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.5",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scale-info"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
+dependencies = [
+ "cfg-if",
+ "derive_more",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.5",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.192"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.192"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+dependencies = [
+ "base64 0.21.5",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.1.0",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+dependencies = [
+ "indexmap 2.1.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "itoa",
+ "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.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.5.5",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "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_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tonic"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.13.1",
+ "bytes",
+ "flate2",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "prost-derive",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "tracing-futures",
+]
+
+[[package]]
+name = "tonic"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+dependencies = [
+ "async-trait",
+ "axum",
+ "base64 0.21.5",
+ "bytes",
+ "flate2",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic-health"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "080964d45894b90273d2b1dd755fdd114560db8636bb41cea615213c45043c4d"
+dependencies = [
+ "async-stream",
+ "prost",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "tonic-reflection"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0543d7092032041fbeac1f2c84304537553421a11a623c2301b12ef0264862c7"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tokio",
+ "tokio-stream",
+ "tonic 0.9.2",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+
+[[package]]
+name = "web-sys"
+version = "0.3.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winnow"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
+dependencies = [
+ "asn1-rs",
+ "base64 0.13.1",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "ring 0.16.20",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
+dependencies = [
+ "asn1-rs",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96f8f25c15a0edc9b07eb66e7e6e97d124c0505435c382fde1ab7ceb188aa956"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "855e0f6af9cd72b87d8a6c586f3cb583f5cdcc62c2c80869d8cd7e96fdf7ee20"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
diff --git a/movement-sdk/Cargo.toml b/movement-sdk/Cargo.toml
new file mode 100644
index 000000000..685f92bbd
--- /dev/null
+++ b/movement-sdk/Cargo.toml
@@ -0,0 +1,24 @@
+[workspace]
+resolver = "2"
+members = [
+    "movement-sdk",
+    "movement-sdk-avalanche"
+]
+
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+authors = ["Liam Monninger <liam@movementlabs.xyz>"]
+homepage = "https://www.movementlabs.xyz"
+publish = false
+repository = "https://github.com/movemntdev/m2"
+rust-version = "1.70"
+
+[workspace.dependencies]
+async-trait = { version = "0.1" } 
+anyhow = { version = "1" }     # For flexible error handling
+avalanche-types = { version = "0.1.3", features = ["subnet", "codec_base64"] }
+movement-sdk = { path = "movement-sdk" }
+tokio = { version = "1.21.0", features = ["full"] }
+serde = { version = "1.0", features = ["derive"] }
\ No newline at end of file
diff --git a/movement-sdk/movement-sdk-avalanche/Cargo.toml b/movement-sdk/movement-sdk-avalanche/Cargo.toml
new file mode 100644
index 000000000..fcc4c733a
--- /dev/null
+++ b/movement-sdk/movement-sdk-avalanche/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "channel-avalanche"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+async-trait = { workspace = true }
+anyhow = { workspace = true }
+avalanche-types = { workspace = true }
+movement-sdk = { workspace = true }
+tokio = { workspace = true }
+tonic = { version = "0.8.3", features = ["gzip"] }
\ No newline at end of file
diff --git a/movement-sdk/movement-sdk-avalanche/src/data_availability/mod.rs b/movement-sdk/movement-sdk-avalanche/src/data_availability/mod.rs
new file mode 100644
index 000000000..c98ee9dea
--- /dev/null
+++ b/movement-sdk/movement-sdk-avalanche/src/data_availability/mod.rs
@@ -0,0 +1,82 @@
+use avalanche_types::{
+    choices,
+    ids::{self, Id},
+    subnet::rpc::consensus::snowman::{
+        Decidable,
+        Block
+    }
+};
+use movement_sdk::DataAvailabilityLayer;
+use std::sync::Arc;
+use tokio::sync::RwLock;
+use std::io;
+
+#[derive(Debug, Clone)]
+pub struct AvalancheBlock<
+    Block, 
+    BlockId,
+    DA : DataAvailabilityLayer<Block = Block, BlockId = BlockId>
+>{
+    pub inner_block: Block,
+    pub data_availability_layer: Arc<RwLock<DA>>,
+}
+
+impl <
+    Block, 
+    BlockId,
+    DA : DataAvailabilityLayer<Block = Block, BlockId = BlockId>
+> AvalancheBlock<Block, BlockId, DA> {
+
+    pub fn new(
+        inner_block: Block,
+        data_availability_layer: Arc<RwLock<DA>>,
+    ) -> Self {
+        Self {
+            inner_block,
+            data_availability_layer,
+        }
+    }
+
+}
+
+impl <
+    Block, 
+    BlockId,
+    DA : DataAvailabilityLayer<Block = Block, BlockId = BlockId>
+> Into<AvalancheBlock<Block, BlockId, DA>> for (Block, Arc<RwLock<DA>>) {
+    fn into(self) -> AvalancheBlock<Block, BlockId, DA> {
+        AvalancheBlock::new(self.0, self.1)
+    }
+}
+
+#[async_trait::async_trait]
+impl <
+    Block : Sync + Clone, 
+    BlockId,
+    DA : DataAvailabilityLayer<Block = Block, BlockId = BlockId> + Sync + Send
+> Decidable for AvalancheBlock<Block, BlockId, DA> {
+    
+    async fn id(&self) -> ids::Id {
+        unimplemented!("todo: implement id");
+        // ids::Id::empty()
+    }
+
+    /// Implements "snowman.Block.choices.Decidable"
+    async fn status(&self) -> choices::status::Status {
+        unimplemented!("todo: implement status");
+        // choices::status::Status::Unknown(String::from("unimplemented"))
+    }
+
+    async fn accept(&mut self) -> io::Result<()> {
+        let data_availability_layer = self.data_availability_layer.read().await;
+        data_availability_layer.accept_block(self.inner_block.clone()).await?;
+        Ok(())
+    }
+
+    async fn reject(&mut self) -> io::Result<()> {
+        let data_availability_layer = self.data_availability_layer.read().await;
+        data_availability_layer.reject_block(self.inner_block.clone()).await?;
+        Ok(())
+    }
+
+}
\ No newline at end of file
diff --git a/movement-sdk/movement-sdk-avalanche/src/lib.rs b/movement-sdk/movement-sdk-avalanche/src/lib.rs
new file mode 100644
index 000000000..15cca4a90
--- /dev/null
+++ b/movement-sdk/movement-sdk-avalanche/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod data_availability;
+pub mod proposer;
\ No newline at end of file
diff --git a/movement-sdk/movement-sdk-avalanche/src/proposer/mod.rs b/movement-sdk/movement-sdk-avalanche/src/proposer/mod.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/movement-sdk/movement-sdk/Cargo.toml b/movement-sdk/movement-sdk/Cargo.toml
new file mode 100644
index 000000000..84038dd3f
--- /dev/null
+++ b/movement-sdk/movement-sdk/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "movement-sdk"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+async-trait = { workspace = true }
+anyhow = { workspace = true }
+serde = { workspace = true }
\ No newline at end of file
diff --git a/movement-sdk/movement-sdk/src/lib.rs b/movement-sdk/movement-sdk/src/lib.rs
new file mode 100644
index 000000000..7d87be97b
--- /dev/null
+++ b/movement-sdk/movement-sdk/src/lib.rs
@@ -0,0 +1,204 @@
+use async_trait::async_trait;
+use core::fmt::Debug;
+use serde::{Deserialize, Serialize};
+
+pub trait Layer : Debug + Clone {
+
+}
+
+// Top-level definition of traits.
+// Complex extensions and integrations should be defined in the submodules.
+#[async_trait]
+pub trait SequencerLayer : Layer {
+
+    type Transaction;
+    type TransactionId;
+    
+    // Receives a transaction and internally sends it on to the next layer.
+    async fn receive_transaction(
+        &self,
+        transaction: Self::Transaction
+    ) -> Result<(), anyhow::Error>;
+
+    // Gets a received transaction.
+    async fn get_transaction(
+        &self,
+        transaction_id: Self::TransactionId
+    ) -> Result<Option<Self::Transaction>, anyhow::Error>;
+
+}
+
+#[async_trait]
+pub trait ProposerLayer : Layer {
+
+    type Transaction;
+    type Block;
+    type BlockId;
+
+    /// Gets the next transaction from the previous layer.
+    async fn get_next_transaction(
+        &self
+    ) -> Result<Option<Self::Transaction>, anyhow::Error>;
+
+    /// Constructs a block from some transactions
+    async fn build_block(
+        &self,
+    ) -> Result<Self::Block, anyhow::Error>;
+
+    /// Sends a constructed block to the next layer.
+    async fn send_block(
+        &self,
+        block: Self::Block
+    ) -> Result<(), anyhow::Error>;
+
+    /// Gets a constructed and sent block
+    async fn get_block(
+        &self,
+        block_id: Self::BlockId
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+
+}
+
+#[async_trait]
+pub trait DataAvailabilityLayer : Layer {
+
+    type Block;
+    type BlockId;
+
+    /// Gets the next block from the previous layer.
+    async fn get_next_block(
+        &self
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+    /// Accepts a block, effectively sending it to the next layer or place retrievable from the next layer, i.e., the execution layer.
+    async fn accept_block(
+        &self,
+        block: Self::Block
+    ) -> Result<(), anyhow::Error>;
+
+    /// Rejects a block (sometimes this won't be used).
+    async fn reject_block(
+        &self,
+        block: Self::Block
+    ) -> Result<(), anyhow::Error>;
+
+    /// Gets a block that was either accepted or rejected by the data availability layer.
+    async fn get_block(
+        &self,
+        block_id: Self::BlockId
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+}
+
+#[async_trait]
+pub trait ExecutionLayer : Layer {
+
+    type Block;
+    type BlockId;
+    type ChangeSet;
+
+    // Gets the next block from the previous layer.
+    async fn get_next_block(
+        &self
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+    // Executes a block and produces a change set.
+    async fn execute_block(
+        &self,
+        block: Self::Block
+    ) -> Result<Self::ChangeSet, anyhow::Error>;
+
+    // Sends a change set to the next layer,  i.e., the storage layer.
+    async fn send_change_set(
+        &self,
+        change_set: Self::ChangeSet
+    ) -> Result<(), anyhow::Error>;
+
+    // Gets an executed block
+    async fn get_block(
+        &self,
+        block_id: Self::BlockId
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+}
+
+#[async_trait]
+pub trait StorageLayer : Layer {
+
+    type Block;
+    type BlockId;
+    type ChangeSet;
+    type StateEntry;
+    type Address;
+
+    // Gets the next change set from the previous layer.
+    async fn get_next_change_set(
+        &self
+    ) -> Result<Option<Self::ChangeSet>, anyhow::Error>;
+
+    // Applies a change set to the storage layer.
+    async fn derive_state(
+        &self,
+        change_set: Self::ChangeSet
+    ) -> Result<(), anyhow::Error>;
+
+    // Gets a state entry from the storage layer.
+    async fn get_state_entry(
+        &self,
+        address: Self::Address
+    ) -> Result<Option<Self::StateEntry>, anyhow::Error>;
+
+    // Gets an applied change set
+    async fn get_change_set(
+        &self,
+        block_id: Self::BlockId
+    ) -> Result<Option<Self::ChangeSet>, anyhow::Error>;
+
+}
+
+#[async_trait]
+pub trait SettlementLayer : Layer {
+
+    type Block;
+    type BlockId;
+    type Commitment;
+
+    // Gets the next block from the previous layer
+    async fn get_next_block(
+        &self
+    ) -> Result<Option<Self::Block>, anyhow::Error>;
+
+    // Gets a commitment from the previous layer
+    async fn build_commitment(
+        &self,
+    ) -> Result<Self::Commitment, anyhow::Error>;
+
+    // Applies a commitment to itself
+    async fn apply_commitment(
+        &self,
+        commitment: Self::Commitment
+    ) -> Result<(), anyhow::Error>;
+
+
+}
+
+#[async_trait]
+pub trait MessagingLayer : Layer {
+
+    type Message;
+
+    // Sends a message to other layers.
+    async fn send_message(
+        &self,
+        message: Self::Message
+    ) -> Result<(), anyhow::Error>;
+
+    // Receives a message from another layer and handles it internally.
+    async fn receive_message(
+        &self,
+        message: Self::Message
+    ) -> Result<(), anyhow::Error>;
+
+
+}
\ No newline at end of file
diff --git a/scripts/movementctl.sh b/scripts/movementctl.sh
index 94d386431..c20f24e8a 100755
--- a/scripts/movementctl.sh
+++ b/scripts/movementctl.sh
@@ -10,11 +10,11 @@
 # Usage: movementctl [start/stop] [fuji/local/subnet-proxy] [--foreground]
 #
 # Author: Liam Monninger
-# Version: 1.0
+# Version: 2.0
 ################################################################################
 
 VM_NAME="movement"
-SUBNET_ID="2gLyawqthdiyrJktJmdnDAb1XVc6xwJXU6iJKu3Uwj21F2mXAK"
+SUBNET_ID="K4GygGTpKkNzzjiLfZVsmQduGqSFztJx4nk52CvA1afcFAhsH"
 PID_DIR="$HOME/.movement/pid"
 mkdir -p "$PID_DIR"
 
@@ -39,24 +39,10 @@ function start_avalanchego() {
 # Starts the avalanche-network-runner server
 function start_avalanche_network_runner() {
   if [[ $RUN_IN_FOREGROUND == "true" ]]; then
-    # Start a new tmux session in detached mode and run the first command
-    tmux new-session -d -s lnet 'avalanche-network-runner server --log-level debug'
-
-    # Introduce a delay (e.g., 5 seconds)
-    sleep 5
-
-    # Run the second command in the current terminal
-    avalanche-network-runner control create-blockchains '[{"vm_name":"'$VM_NAME'", "subnet_id": "'$SUBNET_ID'"}]'
-
-    tmux attach-session -t lnet
-
+    SUBNET_TIMEOUT=10000000000000 $HOME/.movement/M1/m1/run.debug.sh
   else
-    avalanche-network-runner server --log-level debug &
+    SUBNET_TIMEOUT=10000000000000 $HOME/.movement/M1/m1/run.debug.sh &
     echo $! >> "$PID_DIR/avalanche_network_runner.pid"
-    # Introduce a delay (e.g., 5 seconds)
-    sleep 5
-    # Run the second command in the current terminal
-    avalanche-network-runner control create-blockchains '[{"vm_name":"'$VM_NAME'", "subnet_id": "'$SUBNET_ID'"}]'
   fi
 }
 
@@ -106,7 +92,7 @@ function stop_process() {
 function start() {
   case $1 in
     fuji)
-      start_avalanchego "fuji" "2gLyawqthdiyrJktJmdnDAb1XVc6xwJXU6iJKu3Uwj21F2mXAK"
+      start_avalanchego "fuji" $SUBNET_ID
       ;;
     local)
       start_avalanche_network_runner
diff --git a/third-party/aptos-core b/third-party/aptos-core
deleted file mode 160000
index 0c4e264c8..000000000
--- a/third-party/aptos-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c4e264c85e8ee905a4f96a29834d200f37d35ef
diff --git a/third-party/aptos-core-1.7 b/third-party/aptos-core-1.7
deleted file mode 160000
index 94ff2f0d9..000000000
--- a/third-party/aptos-core-1.7
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 94ff2f0d9e35441ab9fc57a459f64e1afa5ca70d
diff --git a/vendors/aptos-core b/vendors/aptos-core
new file mode 160000
index 000000000..e4c39ec37
--- /dev/null
+++ b/vendors/aptos-core
@@ -0,0 +1 @@
+Subproject commit e4c39ec37274a141b2b4c859285897f5b43d8a71
diff --git a/vendors/aptos-core-1.7 b/vendors/aptos-core-1.7
new file mode 160000
index 000000000..94d5867d5
--- /dev/null
+++ b/vendors/aptos-core-1.7
@@ -0,0 +1 @@
+Subproject commit 94d5867d5d48aba93b24615096c25982184d56fb
diff --git a/third-party/ed25519-dalek b/vendors/ed25519-dalek
similarity index 100%
rename from third-party/ed25519-dalek
rename to vendors/ed25519-dalek
diff --git a/vendors/move/Cargo.lock b/vendors/move/Cargo.lock
new file mode 100644
index 000000000..782f16950
--- /dev/null
+++ b/vendors/move/Cargo.lock
@@ -0,0 +1,4533 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom 0.2.9",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anstream"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+
+[[package]]
+name = "async-trait"
+version = "0.1.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bcs"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd3ffe8b19a604421a5d461d4a70346223e535903fbc3067138bddbebddcf77"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "better_any"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b359aebd937c17c725e19efcb661200883f04c49c53e7132224dac26da39d4a0"
+dependencies = [
+ "better_typeid_derive",
+]
+
+[[package]]
+name = "better_typeid_derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitmaps"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "bitvec"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake2b_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.5.2",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
+[[package]]
+name = "bstr"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "bytecode-interpreter-crypto"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "curve25519-dalek-fiat",
+ "ed25519-dalek-fiat",
+ "sha2 0.9.9",
+ "sha3",
+]
+
+[[package]]
+name = "bytecode-interpreter-testsuite"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "datatest-stable",
+ "move-command-line-common",
+ "move-prover-test-utils",
+ "move-stackless-bytecode-interpreter",
+ "move-stdlib",
+ "move-unit-test",
+]
+
+[[package]]
+name = "bytecode-verifier-libfuzzer"
+version = "0.0.0"
+dependencies = [
+ "arbitrary",
+ "libfuzzer-sys",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-core-types",
+]
+
+[[package]]
+name = "bytecode-verifier-tests"
+version = "0.1.0"
+dependencies = [
+ "fail",
+ "hex",
+ "invalid-mutations",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-core-types",
+ "move-vm-config",
+ "petgraph",
+ "proptest",
+]
+
+[[package]]
+name = "bytecode-verifier-transactional-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+ "move-transactional-test-runner",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cassowary"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-integer",
+ "num-traits",
+ "time",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "chrono-tz"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde"
+dependencies = [
+ "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c"
+dependencies = [
+ "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term 0.12.1",
+ "atty",
+ "bitflags",
+ "strsim 0.8.0",
+ "textwrap 0.11.0",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+dependencies = [
+ "atty",
+ "bitflags",
+ "clap_derive 3.2.18",
+ "clap_lex 0.2.4",
+ "indexmap",
+ "once_cell",
+ "strsim 0.10.0",
+ "termcolor",
+ "textwrap 0.16.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
+dependencies = [
+ "clap_builder",
+ "clap_derive 4.4.0",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex 0.5.1",
+ "strsim 0.10.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+
+[[package]]
+name = "codespan"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e"
+dependencies = [
+ "codespan-reporting",
+ "serde",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "serde",
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "colored"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+dependencies = [
+ "atty",
+ "lazy_static",
+ "winapi",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "criterion"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+dependencies = [
+ "atty",
+ "cast",
+ "clap 2.34.0",
+ "criterion-plot",
+ "csv",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-cpu-time"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63aaaf47e457badbcb376c65a49d0f182c317ebd97dc6d1ced94c8e1d09c0f3a"
+dependencies = [
+ "criterion",
+ "libc",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
+dependencies = [
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "486d44227f71a1ef39554c0dc47e44b9f4139927c75043312690c3f476d1d788"
+dependencies = [
+ "bitflags",
+ "crossterm_winapi 0.8.0",
+ "libc",
+ "mio 0.7.14",
+ "parking_lot 0.11.2",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c"
+dependencies = [
+ "bitflags",
+ "crossterm_winapi 0.9.0",
+ "libc",
+ "mio 0.7.14",
+ "parking_lot 0.11.2",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "csv"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "curve25519-dalek-fiat"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "cxx"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "scratch",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if",
+ "hashbrown",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.7",
+]
+
+[[package]]
+name = "datatest-stable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eaf86e44e9f0a21f6e42d8e7f83c9ee049f081745eeed1c6f47a613c76e5977"
+dependencies = [
+ "libtest-mimic",
+ "regex",
+ "walkdir",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "deunicode"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
+
+[[package]]
+name = "difference"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+dependencies = [
+ "block-buffer 0.10.4",
+ "crypto-common",
+]
+
+[[package]]
+name = "dir-diff"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b"
+dependencies = [
+ "walkdir",
+]
+
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+dependencies = [
+ "libc",
+ "redox_users 0.3.5",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users 0.4.3",
+ "winapi",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
+
+[[package]]
+name = "ed25519"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+dependencies = [
+ "serde",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-dalek-fiat"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97c6ac152eba578c1c53d2cefe8ad02e239e3d6f971b0f1ef3cb54cd66037fa0"
+dependencies = [
+ "curve25519-dalek-fiat",
+ "ed25519",
+ "rand 0.8.5",
+ "serde",
+ "serde_bytes",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "enum-compat-util"
+version = "0.1.0"
+dependencies = [
+ "serde_yaml",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "ethnum"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04"
+
+[[package]]
+name = "fail"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6"
+dependencies = [
+ "lazy_static",
+ "log",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "file_diff"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5"
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+dependencies = [
+ "byteorder",
+ "rand 0.8.5",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "globset"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "globwalk"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
+dependencies = [
+ "bitflags",
+ "ignore",
+ "walkdir",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-literal"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+
+[[package]]
+name = "humansize"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
+[[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 = "ignore"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+dependencies = [
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
+
+[[package]]
+name = "im"
+version = "15.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
+dependencies = [
+ "bitmaps",
+ "rand_core 0.6.4",
+ "rand_xoshiro",
+ "sized-chunks",
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "internment"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996"
+dependencies = [
+ "ahash",
+ "dashmap",
+ "hashbrown",
+ "once_cell",
+ "parking_lot 0.12.1",
+]
+
+[[package]]
+name = "invalid-mutations"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+ "move-core-types",
+ "proptest",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "language-benchmarks"
+version = "0.1.0"
+dependencies = [
+ "criterion",
+ "criterion-cpu-time",
+ "move-binary-format",
+ "move-compiler",
+ "move-core-types",
+ "move-stdlib",
+ "move-vm-runtime",
+ "move-vm-test-utils",
+ "move-vm-types",
+ "once_cell",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.141"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+
+[[package]]
+name = "libtest-mimic"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79529479c298f5af41375b0c1a77ef670d450b4c9cd7949d2b43af08121b20ec"
+dependencies = [
+ "clap 3.2.23",
+ "termcolor",
+ "threadpool",
+]
+
+[[package]]
+name = "link-cplusplus"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+
+[[package]]
+name = "lock_api"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if",
+ "serde",
+]
+
+[[package]]
+name = "lsp-server"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c351c75989da23b355226dc188dc2b52538a7f4f218d70fd7393c6b62b110444"
+dependencies = [
+ "crossbeam-channel",
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "lsp-types"
+version = "0.90.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3"
+dependencies = [
+ "bitflags",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "url",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "memoffset"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memory-stats"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f79cf9964c5c9545493acda1263f1912f8d2c56c8a2ffee2606cb960acaacc"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "mio"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "module-generation"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-core-types",
+ "move-ir-to-bytecode",
+ "move-ir-types",
+ "move-symbol-pool",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "move-abigen"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "codespan-reporting",
+ "datatest-stable",
+ "heck 0.3.3",
+ "log",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-command-line-common",
+ "move-core-types",
+ "move-model",
+ "move-prover",
+ "move-prover-test-utils",
+ "serde",
+ "tempfile",
+]
+
+[[package]]
+name = "move-abstract-stack"
+version = "0.0.1"
+
+[[package]]
+name = "move-analyzer"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "crossbeam",
+ "derivative",
+ "dunce",
+ "im",
+ "lsp-server",
+ "lsp-types",
+ "move-command-line-common",
+ "move-compiler",
+ "move-ir-types",
+ "move-package",
+ "move-symbol-pool",
+ "serde_json",
+ "tempfile",
+ "url",
+]
+
+[[package]]
+name = "move-binary-format"
+version = "0.0.3"
+dependencies = [
+ "anyhow",
+ "arbitrary",
+ "enum-compat-util",
+ "getrandom 0.2.9",
+ "move-core-types",
+ "move-proc-macros",
+ "proptest",
+ "proptest-derive",
+ "ref-cast",
+ "serde",
+ "serde_json",
+ "variant_count",
+]
+
+[[package]]
+name = "move-borrow-graph"
+version = "0.0.1"
+
+[[package]]
+name = "move-bytecode-source-map"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "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"
+dependencies = [
+ "anyhow",
+ "move-binary-format",
+ "move-core-types",
+ "petgraph",
+ "serde-reflection",
+]
+
+[[package]]
+name = "move-bytecode-verifier"
+version = "0.1.0"
+dependencies = [
+ "hex-literal",
+ "invalid-mutations",
+ "move-abstract-stack",
+ "move-binary-format",
+ "move-borrow-graph",
+ "move-core-types",
+ "move-vm-config",
+ "petgraph",
+]
+
+[[package]]
+name = "move-bytecode-viewer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "crossterm 0.21.0",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-disassembler",
+ "regex",
+ "tui",
+]
+
+[[package]]
+name = "move-cli"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "colored",
+ "datatest-stable",
+ "difference",
+ "move-binary-format",
+ "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-package",
+ "move-prover",
+ "move-read-write-set-types",
+ "move-stdlib",
+ "move-unit-test",
+ "move-vm-profiler",
+ "move-vm-runtime",
+ "move-vm-test-utils",
+ "move-vm-types",
+ "serde_yaml",
+ "tempfile",
+ "toml_edit 0.14.4",
+ "walkdir",
+]
+
+[[package]]
+name = "move-command-line-common"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "difference",
+ "dirs-next",
+ "hex",
+ "move-core-types",
+ "num-bigint",
+ "once_cell",
+ "serde",
+ "sha2 0.9.9",
+ "walkdir",
+]
+
+[[package]]
+name = "move-compiler"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "datatest-stable",
+ "hex",
+ "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-stdlib",
+ "move-symbol-pool",
+ "once_cell",
+ "petgraph",
+ "regex",
+ "serde",
+ "tempfile",
+]
+
+[[package]]
+name = "move-compiler-transactional-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+ "move-transactional-test-runner",
+]
+
+[[package]]
+name = "move-core-types"
+version = "0.0.4"
+dependencies = [
+ "anyhow",
+ "arbitrary",
+ "bcs",
+ "enum-compat-util",
+ "ethnum",
+ "hex",
+ "move-proc-macros",
+ "num",
+ "once_cell",
+ "primitive-types",
+ "proptest",
+ "proptest-derive",
+ "rand 0.8.5",
+ "ref-cast",
+ "regex",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "uint",
+]
+
+[[package]]
+name = "move-coverage"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "clap 4.4.1",
+ "codespan",
+ "colored",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-command-line-common",
+ "move-core-types",
+ "move-ir-types",
+ "petgraph",
+ "serde",
+]
+
+[[package]]
+name = "move-disassembler"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "clap 4.4.1",
+ "colored",
+ "hex",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-coverage",
+ "move-ir-types",
+]
+
+[[package]]
+name = "move-docgen"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "datatest-stable",
+ "itertools",
+ "log",
+ "move-compiler",
+ "move-model",
+ "move-prover",
+ "move-prover-test-utils",
+ "num",
+ "once_cell",
+ "regex",
+ "serde",
+ "tempfile",
+]
+
+[[package]]
+name = "move-errmapgen"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "codespan-reporting",
+ "datatest-stable",
+ "move-command-line-common",
+ "move-core-types",
+ "move-model",
+ "move-prover",
+ "serde",
+]
+
+[[package]]
+name = "move-explain"
+version = "0.1.0"
+dependencies = [
+ "bcs",
+ "clap 4.4.1",
+ "move-command-line-common",
+ "move-core-types",
+]
+
+[[package]]
+name = "move-ir-compiler"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "clap 4.4.1",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-bytecode-verifier",
+ "move-command-line-common",
+ "move-ir-to-bytecode",
+ "serde_json",
+]
+
+[[package]]
+name = "move-ir-compiler-transactional-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+ "move-transactional-test-runner",
+]
+
+[[package]]
+name = "move-ir-to-bytecode"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "codespan-reporting",
+ "log",
+ "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",
+]
+
+[[package]]
+name = "move-ir-to-bytecode-syntax"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "move-command-line-common",
+ "move-core-types",
+ "move-ir-types",
+ "move-symbol-pool",
+]
+
+[[package]]
+name = "move-ir-types"
+version = "0.1.0"
+dependencies = [
+ "hex",
+ "move-command-line-common",
+ "move-core-types",
+ "move-symbol-pool",
+ "once_cell",
+ "serde",
+]
+
+[[package]]
+name = "move-model"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "datatest-stable",
+ "internment",
+ "itertools",
+ "log",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-disassembler",
+ "move-ir-types",
+ "move-prover-test-utils",
+ "move-symbol-pool",
+ "num",
+ "once_cell",
+ "regex",
+ "serde",
+]
+
+[[package]]
+name = "move-package"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "colored",
+ "datatest-stable",
+ "move-abigen",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-bytecode-utils",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-docgen",
+ "move-model",
+ "move-symbol-pool",
+ "named-lock",
+ "once_cell",
+ "petgraph",
+ "regex",
+ "serde",
+ "serde_yaml",
+ "sha2 0.9.9",
+ "tempfile",
+ "toml",
+ "treeline",
+ "walkdir",
+ "whoami",
+]
+
+[[package]]
+name = "move-proc-macros"
+version = "0.1.0"
+dependencies = [
+ "enum-compat-util",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "move-prover"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "datatest-stable",
+ "itertools",
+ "log",
+ "move-abigen",
+ "move-command-line-common",
+ "move-compiler",
+ "move-docgen",
+ "move-errmapgen",
+ "move-model",
+ "move-prover-boogie-backend",
+ "move-prover-test-utils",
+ "move-stackless-bytecode",
+ "once_cell",
+ "serde",
+ "shell-words",
+ "simplelog",
+ "tempfile",
+ "toml",
+ "walkdir",
+]
+
+[[package]]
+name = "move-prover-boogie-backend"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "codespan",
+ "codespan-reporting",
+ "futures",
+ "itertools",
+ "log",
+ "move-binary-format",
+ "move-command-line-common",
+ "move-core-types",
+ "move-model",
+ "move-stackless-bytecode",
+ "num",
+ "once_cell",
+ "pretty",
+ "rand 0.8.5",
+ "regex",
+ "serde",
+ "tera",
+ "tokio",
+]
+
+[[package]]
+name = "move-prover-test-utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "move-command-line-common",
+ "prettydiff",
+ "regex",
+]
+
+[[package]]
+name = "move-read-write-set-types"
+version = "0.0.3"
+dependencies = [
+ "move-binary-format",
+ "move-core-types",
+ "serde",
+]
+
+[[package]]
+name = "move-stackless-bytecode"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "codespan",
+ "codespan-reporting",
+ "datatest-stable",
+ "ethnum",
+ "im",
+ "itertools",
+ "log",
+ "move-binary-format",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-model",
+ "move-prover-test-utils",
+ "move-read-write-set-types",
+ "move-stdlib",
+ "num",
+ "paste",
+ "petgraph",
+ "serde",
+]
+
+[[package]]
+name = "move-stackless-bytecode-interpreter"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bytecode-interpreter-crypto",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "datatest-stable",
+ "itertools",
+ "move-binary-format",
+ "move-core-types",
+ "move-model",
+ "move-prover-test-utils",
+ "move-stackless-bytecode",
+ "num",
+]
+
+[[package]]
+name = "move-stdlib"
+version = "0.1.1"
+dependencies = [
+ "anyhow",
+ "dir-diff",
+ "file_diff",
+ "hex",
+ "log",
+ "move-binary-format",
+ "move-cli",
+ "move-command-line-common",
+ "move-core-types",
+ "move-docgen",
+ "move-errmapgen",
+ "move-package",
+ "move-prover",
+ "move-unit-test",
+ "move-vm-runtime",
+ "move-vm-types",
+ "sha2 0.9.9",
+ "sha3",
+ "smallvec",
+ "tempfile",
+ "walkdir",
+]
+
+[[package]]
+name = "move-symbol-pool"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "phf",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "move-transactional-test-runner"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "clap 4.4.1",
+ "datatest-stable",
+ "difference",
+ "move-binary-format",
+ "move-bytecode-source-map",
+ "move-cli",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-disassembler",
+ "move-ir-compiler",
+ "move-ir-types",
+ "move-stdlib",
+ "move-symbol-pool",
+ "move-vm-config",
+ "move-vm-runtime",
+ "move-vm-test-utils",
+ "move-vm-types",
+ "once_cell",
+ "rayon",
+ "regex",
+ "tempfile",
+ "tokio",
+]
+
+[[package]]
+name = "move-unit-test"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "better_any",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "colored",
+ "datatest-stable",
+ "difference",
+ "itertools",
+ "move-binary-format",
+ "move-bytecode-utils",
+ "move-command-line-common",
+ "move-compiler",
+ "move-core-types",
+ "move-ir-types",
+ "move-model",
+ "move-stackless-bytecode-interpreter",
+ "move-stdlib",
+ "move-symbol-pool",
+ "move-vm-profiler",
+ "move-vm-runtime",
+ "move-vm-test-utils",
+ "move-vm-types",
+ "once_cell",
+ "rayon",
+ "regex",
+]
+
+[[package]]
+name = "move-vm-config"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+]
+
+[[package]]
+name = "move-vm-integration-tests"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "fail",
+ "memory-stats",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-compiler",
+ "move-core-types",
+ "move-stdlib",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-runtime",
+ "move-vm-test-utils",
+ "move-vm-types",
+ "tempfile",
+]
+
+[[package]]
+name = "move-vm-profiler"
+version = "0.1.0"
+dependencies = [
+ "move-vm-config",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "move-vm-runtime"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "better_any",
+ "fail",
+ "hex",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-compiler",
+ "move-core-types",
+ "move-ir-compiler",
+ "move-vm-config",
+ "move-vm-profiler",
+ "move-vm-types",
+ "once_cell",
+ "parking_lot 0.11.2",
+ "proptest",
+ "sha3",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "move-vm-test-utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "move-binary-format",
+ "move-core-types",
+ "move-vm-profiler",
+ "move-vm-types",
+ "once_cell",
+ "serde",
+]
+
+[[package]]
+name = "move-vm-transactional-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+ "move-transactional-test-runner",
+]
+
+[[package]]
+name = "move-vm-types"
+version = "0.1.0"
+dependencies = [
+ "bcs",
+ "move-binary-format",
+ "move-core-types",
+ "move-vm-profiler",
+ "proptest",
+ "serde",
+ "smallvec",
+]
+
+[[package]]
+name = "named-lock"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a3eb6b7c682b65d1f631ec3176829d72ab450b3aacdd3f719bf220822e59ac"
+dependencies = [
+ "libc",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+dependencies = [
+ "winapi",
+]
+
+[[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 = "num"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
+
+[[package]]
+name = "ouroboros"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parity-scale-codec"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+dependencies = [
+ "arrayvec 0.7.2",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.7",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "parse-zoneinfo"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
+dependencies = [
+ "regex",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "pest"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122"
+dependencies = [
+ "thiserror",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2 0.10.6",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+dependencies = [
+ "siphasher",
+ "uncased",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "plotters"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "pretty"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9940b913ee56ddd94aec2d3cd179dd47068236f42a1a6415ccf9d880ce2a61"
+dependencies = [
+ "arrayvec 0.5.2",
+ "typed-arena",
+]
+
+[[package]]
+name = "prettydiff"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bc9e8bdfe446d34975ff774fbb4a2b944d17054f6b5845ec132d4fb9ff8f559"
+dependencies = [
+ "ansi_term 0.9.0",
+ "prettytable-rs",
+ "structopt",
+]
+
+[[package]]
+name = "prettytable-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
+dependencies = [
+ "atty",
+ "csv",
+ "encode_unicode",
+ "lazy_static",
+ "term",
+ "unicode-width",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-serde",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.8",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proptest"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "byteorder",
+ "lazy_static",
+ "num-traits",
+ "quick-error 2.0.1",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "proptest-derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc"
+dependencies = [
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "prover-mutation"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "codespan-reporting",
+ "itertools",
+ "log",
+ "move-compiler",
+ "move-model",
+ "move-prover",
+ "move-stackless-bytecode",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quote"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+dependencies = [
+ "proc-macro2 0.4.30",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2 1.0.63",
+]
+
+[[package]]
+name = "radium"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.9",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+dependencies = [
+ "getrandom 0.1.16",
+ "redox_syscall 0.1.57",
+ "rust-argon2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom 0.2.9",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "regex"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "rust-argon2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+dependencies = [
+ "base64",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustix"
+version = "0.37.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error 1.2.3",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "scratch"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
+
+[[package]]
+name = "serde"
+version = "1.0.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-reflection"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895"
+dependencies = [
+ "once_cell",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
+[[package]]
+name = "serializer-tests"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+ "proptest",
+ "proptest-derive",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "sha3"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "keccak",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio 0.7.14",
+ "signal-hook",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+
+[[package]]
+name = "simplelog"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720"
+dependencies = [
+ "chrono",
+ "log",
+ "termcolor",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "sized-chunks"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
+dependencies = [
+ "bitmaps",
+ "typenum",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slug"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373"
+dependencies = [
+ "deunicode",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spec-flatten"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.4.1",
+ "itertools",
+ "move-compiler",
+ "move-model",
+ "move-prover",
+ "move-stackless-bytecode",
+ "pretty",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "structopt"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
+dependencies = [
+ "clap 2.34.0",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "syn 0.15.44",
+]
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "syn"
+version = "0.15.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+dependencies = [
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "unicode-xid",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "tera"
+version = "1.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c"
+dependencies = [
+ "chrono",
+ "chrono-tz",
+ "globwalk",
+ "humansize",
+ "lazy_static",
+ "percent-encoding",
+ "pest",
+ "pest_derive",
+ "rand 0.8.5",
+ "regex",
+ "serde",
+ "serde_json",
+ "slug",
+ "unic-segment",
+]
+
+[[package]]
+name = "term"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+dependencies = [
+ "byteorder",
+ "dirs",
+ "winapi",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "test-generation"
+version = "0.1.0"
+dependencies = [
+ "clap 4.4.1",
+ "crossbeam-channel",
+ "getrandom 0.2.9",
+ "hex",
+ "itertools",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
+[[package]]
+name = "thiserror"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "mio 0.8.6",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+
+[[package]]
+name = "toml_edit"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
+dependencies = [
+ "combine",
+ "indexmap",
+ "itertools",
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "treeline"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
+
+[[package]]
+name = "tui"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ed0a32c88b039b73f1b6c5acbd0554bfa5b6be94467375fd947c4de3a02271"
+dependencies = [
+ "bitflags",
+ "cassowary",
+ "crossterm 0.22.1",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "uncased"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-segment"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23"
+dependencies = [
+ "unic-ucd-segment",
+]
+
+[[package]]
+name = "unic-ucd-segment"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8parse"
+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 = "variant_count"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124"
+dependencies = [
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+dependencies = [
+ "quote 1.0.28",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 1.0.109",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+
+[[package]]
+name = "web-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "whoami"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.28",
+ "syn 2.0.22",
+]
diff --git a/vendors/move/Cargo.toml b/vendors/move/Cargo.toml
new file mode 100644
index 000000000..47c9eeb72
--- /dev/null
+++ b/vendors/move/Cargo.toml
@@ -0,0 +1,171 @@
+[workspace]
+resolver = "2"
+
+members = [
+    "crates/*",
+]
+
+# Dependencies that should be kept in sync through the whole workspace
+[workspace.dependencies]
+aes-gcm = "0.8.0"
+anyhow = "1.0.52"
+arbitrary = { version = "1.1.7", features = ["derive", "derive_arbitrary"] }
+async-trait = "0.1.42"
+bcs = "0.1.4"
+better_any = "0.1.1"
+bitvec = "0.19.4"
+byteorder = "1.4.3"
+bytes = "1.0.1"
+chrono = "0.4.19"
+clap = { version = "4", features = ["derive"] }
+codespan = "0.11.1"
+codespan-reporting = "0.11.1"
+colored = "2.0.0"
+criterion = "0.3.4"
+criterion-cpu-time = "0.1.0"
+crossbeam = "0.8"
+crossbeam-channel = "0.5.0"
+crossterm = "0.21"
+curve25519-dalek = { version = "0.1.0", package = "curve25519-dalek-fiat", default-features = false, features = ["std", "u64_backend"] }
+datatest-stable = "0.1.1"
+derivative = "2.2.0"
+difference = "2.0.0"
+digest = "0.9.0"
+dir-diff = "0.3.2"
+dirs-next = "2.0.0"
+dunce = "1.0.2"
+ed25519-dalek = { version = "0.1.0", package = "ed25519-dalek-fiat", default-features = false, features = ["std", "serde", "u64_backend"] }
+ethnum = "1.0.4"
+fail = "0.4.0"
+file_diff = "1.0.0"
+futures = "0.3.12"
+getrandom = "0.2.9"
+heck = "0.3.2"
+hex = "0.4.3"
+hex-literal = "0.3.4"
+hkdf = "0.10.0"
+im = "15.1.0"
+internment = { version = "0.5.0", features = [ "arc"] }
+itertools = "0.10.0"
+libfuzzer-sys = "0.4"
+log = { version = "0.4.14", features = ["serde"] }
+lsp-server = "0.5.1"
+lsp-types = "0.90.1"
+memory-stats = "1.0.0"
+mirai-annotations = "1.10.1"
+named-lock = "0.2.0"
+num = "0.4.0"
+num-bigint = "0.4.0"
+num_cpus = "1.13.0"
+once_cell = "1.7.2"
+ouroboros = "0.17.2"
+parking_lot = "0.11.1"
+paste = "1.0.5"
+petgraph = "0.5.1"
+phf = { version = "0.11", features = ["macros"] }
+plotters = { version = "0.3.0", default_features = false, features = ["evcxr", "line_series", "histogram"]}
+pretty = "0.10.0"
+prettydiff = "0.4.0"
+primitive-types = { version = "0.10.1", features = ["impl-serde"]}
+proc-macro2 = "1.0.24"
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+quote = "1.0.9"
+rand = "0.8.0"
+rayon = "1.5.0"
+ref-cast = "1.0.6"
+regex = "1.5.5"
+ripemd160 = "0.9.1"
+serde = { version = "1.0.124", features = ["derive"] }
+serde-name = "0.1.1"
+serde-reflection = "0.3.2"
+serde_bytes = "0.11.5"
+serde_json = "1.0.64"
+serde_yaml = "0.8.26"
+sha2 = "0.9.3"
+sha3 = "0.9.1"
+shell-words = "1.0.0"
+simplelog = "0.9.0"
+smallvec = "1.6.1"
+static_assertions = "1.1.0"
+syn = { version = "1.0.64", features = ["derive"] }
+tempfile = "3.2.0"
+tera = "1.16.0"
+thiserror = "1.0.24"
+tiny-keccak = { version = "2.0.2", features = ["sha3"] }
+tokio = { version = "1.18.2", features = ["full"] }
+toml = "0.5.8"
+toml_edit =  { version = "0.14.3", features = ["easy"] }
+tracing = "0.1.26"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+treeline = "0.1.0"
+tui = "0.17.0"
+uint = "0.9.4"
+url = "2.2.2"
+variant_count = "1.1.0"
+walkdir = "2.3.1"
+whoami = { version = "1.2.1" }
+x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std", "u64_backend"] }
+z3tracer = "0.8.0"
+
+bytecode-interpreter-crypto = { path = "crates/bytecode-interpreter-crypto" }
+enum-compat-util = { path = "crates/enum-compat-util"}
+invalid-mutations = { path = "crates/invalid-mutations" }
+module-generation = { path = "crates/module-generation" }
+move-abigen = { path = "crates/move-abigen" }
+move-abstract-stack = { path = "crates/move-abstract-stack" }
+move-binary-format = { path = "crates/move-binary-format" }
+move-borrow-graph = { path = "crates/move-borrow-graph" }
+move-bytecode-source-map = { path = "crates/move-bytecode-source-map" }
+move-bytecode-utils = { path = "crates/move-bytecode-utils" }
+move-bytecode-verifier = { path = "crates/move-bytecode-verifier" }
+move-bytecode-viewer = { path = "crates/move-bytecode-viewer" }
+move-cli = { path = "crates/move-cli" }
+move-command-line-common = { path = "crates/move-command-line-common" }
+move-compiler = { path = "crates/move-compiler" }
+move-core-types = { path = "crates/move-core-types" }
+move-coverage = { path = "crates/move-coverage" }
+move-disassembler = { path = "crates/move-disassembler" }
+move-docgen = { path = "crates/move-docgen" }
+move-errmapgen = { path = "crates/move-errmapgen" }
+move-ir-compiler = { path = "crates/move-ir-compiler" }
+move-ir-to-bytecode = { path = "crates/move-ir-to-bytecode" }
+move-ir-to-bytecode-syntax = { path = "crates/move-ir-to-bytecode-syntax" }
+move-ir-types = { path = "crates/move-ir-types" }
+move-model = { path = "crates/move-model" }
+move-package = { path = "crates/move-package" }
+move-proc-macros = { path = "crates/move-proc-macros"}
+move-prover = { path = "crates/move-prover" }
+move-prover-boogie-backend = { path = "crates/move-prover-boogie-backend" }
+move-prover-test-utils = { path = "crates/move-prover-test-utils" }
+move-read-write-set-types = { path = "crates/move-read-write-set-types" }
+move-stackless-bytecode = { path = "crates/move-stackless-bytecode" }
+move-stackless-bytecode-interpreter = { path = "crates/move-stackless-bytecode-interpreter" }
+move-stdlib = { path = "crates/move-stdlib" }
+move-symbol-pool = { path = "crates/move-symbol-pool" }
+move-transactional-test-runner = { path = "crates/move-transactional-test-runner" }
+move-unit-test = { path = "crates/move-unit-test" }
+move-vm-config = { path = "crates/move-vm-config" }
+move-vm-profiler = { path = "crates/move-vm-profiler" }
+move-vm-runtime = { path = "crates/move-vm-runtime" }
+move-vm-test-utils = { path = "crates/move-vm-test-utils" }
+move-vm-types = { path = "crates/move-vm-types" }
+prover_bytecode = { path = "crates/move-stackless-bytecode", package="move-stackless-bytecode" }
+
+[profile.bench]
+debug = true
+
+[profile.dev]
+debug = true
+
+[profile.test.package.move-vm-integration-tests]
+# opt-level 2 for move-compiler reduces the size of some of its
+# (recursive) stack frames by up to 10x, avoiding stack overflows.
+opt-level = 3
+
+# use release settings to reduce memory pressure in the linking step in CI
+[profile.ci]
+inherits = "test"
+debug = 0 # for saving disk space during linking
+incremental = false
+codegen-units = 16
diff --git a/vendors/move/README.md b/vendors/move/README.md
new file mode 100644
index 000000000..0acf524c9
--- /dev/null
+++ b/vendors/move/README.md
@@ -0,0 +1,24 @@
+---
+id: move-language
+title: Move Language
+custom_edit_url: https://github.com/move-language/move/edit/main/language/README.md
+---
+
+
+Move is a new programming language developed to provide a safe and programmable foundation for the Diem Blockchain.
+
+## Overview
+
+The Move language directory consists of four main parts:
+
+- [virtual machine](move-vm/) (VM) &mdash; contains the bytecode format, a bytecode interpreter, and infrastructure for executing a block of transactions. This directory also contains the infrastructure to generate the genesis block.
+
+- [bytecode verifier](move-bytecode-verifier/) &mdash; contains a static analysis tool for rejecting invalid Move bytecode. The virtual machine runs the bytecode verifier on any new Move code it encounters before executing it. The compiler runs the bytecode verifier on its output and surfaces the errors to the programmer.
+
+- [move-compiler](move-compiler/) &mdash; contains the Move source language compiler.
+
+- [standard library](move-stdlib/) &mdash; contains the standard library transaction scripts.
+
+## Exploring the Move language
+
+- You can find many small Move examples in the [tests](move-compiler/tests/move_check/) directory. The easiest way to experiment with Move is to create a new test in this directory and run it with `cargo test`.
diff --git a/vendors/move/changes/1-friend-visibility.md b/vendors/move/changes/1-friend-visibility.md
new file mode 100644
index 000000000..4ce2dfa3e
--- /dev/null
+++ b/vendors/move/changes/1-friend-visibility.md
@@ -0,0 +1,195 @@
+# Friend Visibility
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Friend visibility is a new feature in Move version 1.2 to give more control about where a function can be used. Previously a function had either public or private visibility, where a public function is accessible anywhere but a private function can be called only from within the module where it is defined. Friend-visible functions can be called only from explicitly allowed modules.
+
+## Motivations
+
+### Overly Permissive Function Visibility Model
+
+The simple public/private visibility scheme required using public visibility for “limited-access” functions, i.e., functions that:
+
+* are designed to have limited access by a known and specific set of modules only (i.e., an allowlist), and
+* should not be accessed by any other modules outside this specific allowlist.
+
+Take all the `initialize` functions in the Diem framework as an example. In theory, the `initialize` functions should only be used by the `Genesis` module and never be exposed to any other modules nor scripts. However, due to the limitation in the current visibility model, these `initialize` functions have to be made `public` (in order for the `Genesis` module to call them) and both runtime capability checks and static verification are enforced to make sure that these functions will abort if not called from a genesis state.
+
+### Inflexibility in Future Module Updates
+
+Public functions have very restricted updating rules: a public function can never be deleted or renamed, and its function signature can never be altered. The rationale behind this restriction is that a public function is a contract made to the whole world and once the contract is made, the API should not be easily altered, as altering the API might break code that tries to invoke the public function. The owner of the public function has no control on who can invoke the function. In fact, knowing all the call sites requires a global scan of all code published in storage, which is not always possible nor scalable in a blockchain network with an open-publishing model.
+
+In contrast, a friend function is only a contract made to the friends of a module, and furthermore, the module owner controls the membership of the friend list. That is, the module owner has complete knowledge of which modules may access a friend function. As a result, it is much easier to update a friend function because only the modules in the friend list needs to be coordinated for the change. This is especially true when a friend function and all its friend modules are maintained by the same owner.
+
+### Simplification Opportunities for Specification and Verification
+
+Friend visibility can help simplify specification writing and verification with the Move prover. For example, given a friend function and its host module’s friend list, we can easily and exhaustively find all callsites of the friend function. With this information, we could, as an option, completely skip the specification of a friend function and inline the implementation into the caller. This may lead to further simplification in the verification techniques and allows stronger properties to be proved. In contrast, for a public function, it is necessary to write complete and accurate specifications for the function.
+
+## Description
+
+Friend visibility expands the set of possible visibility levels:
+
+* private (no modifier)
+* `public(friend)`
+* `public(script)`, and
+* `public`.
+
+These respectively correspond to `Private`, `Friend`, `Script`, and `Public` in the Move bytecode file format. Script visibility addresses an orthogonal problem in the Diem Framework and more details can be found in the [Script Visibility](2-script-visibility.md) change description.
+
+Beside the new `public(friend)` modifier, each module is allowed to have a friend list, specifiable as zero or more
+`friend <address::name>` statements that list the modules trusted by the host module. Modules in the friend list are permitted to call a `public(friend)` function defined in the host module, but a non-friend module is prohibited from accessing a `public(friend)` function.
+
+### New Visibility Modifier
+
+`public(friend)` is a new visibility modifier that can be applied to any function definition in a module. A `public(friend)` function can be invoked by any other functions in the same module (say module `M`), or any function defined in one of the modules in the friend list of module `M`.
+
+Besides this visibility rule, `public(friend)` functions follow the same rules as any other module function, meaning they can invoke other functions in the same module (except `public(script)` functions), create new struct instances, access the global storage (of types declared in that module), etc.
+
+### Friend List Declarations
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+* `friend <address::name>` — friend declaration using fully qualified  module name
+* `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+
+A module may have multiple friend declarations, and the union of all the friend modules is recorded in the friend list, which is a new section in the bytecode file format. For readability, friend declarations should generally be placed near the beginning of the module definition. Note that Move scripts cannot declare friend modules as the concept of friend functions does not even exist in scripts.
+
+Friend declarations are subject to the following rules:
+
+* A module cannot declare itself as a friend.
+    * e.g., `0x2::M` cannot declare `0x2::M` as a friend.
+* Friend modules must be within the same account address.
+    * e.g., `0x2::M` cannot declare `0x3::N` as a friend.
+    * Note: this is not a technical requirement but rather a policy decision which may be relaxed later.
+* Friends relationships cannot create cyclic module dependencies.
+    * Cycles are not allowed in the friend relationships. E.g., `0x2::A` friends `0x2::B` friends `0x2::C` friends `0x2::A` is not allowed.
+    * More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module). If that friend module is already used, either directly or transitively, a cycle of dependencies would be created. E.g., a cycle would be created if `0x2::A` friends `0x2::B` and `0x2::A` also calls a function `0x2::B::foo().`
+* Friends must exist when the module is published.
+    * e.g., `0x2::M` cannot declare `0x2::X` as a friend if `0x2::X` cannot be resolved by the loader.
+* The friend list for a module cannot contain duplicates.
+
+## Examples
+
+A typical module with `public(friend)` functions and its friend modules is shown in the following example:
+
+```
+address 0x2 {
+  module A {
+    // friend declaration via fully qualified module name
+    friend 0x2::B;
+
+    // friend declaration via module alias
+    use 0x2::C;
+    friend C;
+
+    public(friend) fun foo() {
+      // a friend function can call other non-script functions in the same module
+      i_am_private();
+      i_am_public();
+      bar();
+    }
+    public(friend) fun bar() {}
+
+    fun i_am_private() {
+      // other functions in the same module can also call friend functions
+      bar();
+    }
+    public fun i_am_public() {
+      // other functions in the same module can also call friend functions
+      bar();
+    }
+  }
+
+  module B {
+    use 0x2::A;
+
+    public fun foo() {
+      // as a friend of 0x2::A, functions in B can call friend functions in A
+      A::foo();
+    }
+
+    public fun bar() {
+      0x2::A::bar();
+    }
+  }
+}
+```
+
+## Alternatives
+
+### Granularity of the Friend List
+
+* Module-to-Module (adopted)
+    * Module `B` is a friend of module `A` — any function in module `B` can access any friend function in module `A`
+    * Modules have been the trust boundary in Move language, as evidenced by:
+        * the existing visibility model where public and private are defined with regard to the hosting module of a particular function;
+        * the design of Struct / Resource type where only the module that defines the Struct / Resource may access the internals of the type.
+    * Therefore, it is more natural for modules to be the trust boundary of friend function accesses as well.
+    * Another reason is that it resonates with the granularity of the friend feature found in other languages (e.g., C++).
+* Module-to-Function
+    * Module `B` is a friend of function `foo()` — any function in module `B` can call the friend function `foo()`
+    * This is a more fine-grained version of Module-to-Module friendship declaration and is also found in other languages (e.g., C++ also supports Module-to-Function friendship). The reasons we did not choose this option are mostly 1) it breaks the mental model that modules are the boundaries in Move, and 2) it may lead to the case where a module (e.g., module `A`) is a friend of every friend function and `friend A` needs to be specified repeatedly for each friend function.
+* Function-to-Module
+    * Function `foo()` is a friend of module `A` — function `foo()` can call any friend function in module `A`
+    * The reason this option is not chosen is because it seems weird to express, as a developer, that we trust function `0x3::B::foo()` but not function `0x3::B::bar()`, especially given that both `bar()` and `foo()` reside in the same module by `0x3::B`. We could not contemplate a valid use case for this scenario.
+* Function-to-Function
+    * Function `foo()` is a friend of function `bar()` — function `foo()` can call friend function `bar()`
+    * Besides the reason that it feels weird trusting one function in a module but not another (similar to the Function-to-Module option), we feel that this scheme is too fine-grained and would cause inflexibility in development, especially on function name updates. To illustrate, suppose `foo()` is a private function in module `B`, and `bar()` is a friend function in module `A`. This scheme requires that when the private function `foo` is renamed, something in module A needs to be updated as well! Function `foo()` is no longer “private” to module `B` under this scheme.
+
+### Location of Friend Declarations
+
+* Callee-side declaration (adopted)
+    * The code owner who develops the module is responsible for specifying who can be a friend of this module at the time of writing the source code. If later the developers want to add / remove new friends, they can always update the friend list and re-publish the module on-chain (subject to updatability and compatibility checking).
+    * This is the most natural way of defining the friend list, since the friend list is embedded the same source file as the module source code. Compared with the alternative — caller-side declaration — it is cognitively easier for developers to figure out who may interact with the friend functions and how the friend functions should be hardened by looking within the same file.
+* Caller-side declaration
+    * An alternative thinking is to have the user of a friend function to “request” friendship permission, instead of having the owner of the friend function to “grant” friendship. To illustrate, if module `B` wants to access some friend functions in module `A`, then, the friendship with module `A` will be declared in the source code of module `B` (while the callee-side declaration requires that the friendship is declared in the source code of module `A`).
+    * A major drawback in this alternative is that the code owner does not have a list of friend relationships if the developers do not actively maintain one. For friend relationships, the source of truth is likely to be stored on-chain either via 1) a VM-updatable section in on-chain module bytecode, or 2) a new `FriendList` entity in users’ accounts. More importantly, by looking at the source code of a module, the developers have no clue who can access the friend function and how the interaction may happen.
+
+### Publishing Order
+
+Cross-module references complicate the process for publishing those modules. The issue can be illustrated in the following:
+
+```
+address 0x2 {
+  module M {
+    friend 0x2::N;
+    public(friend) fun foo() {}
+  }
+  module N {
+    use 0x2::M;
+    fun bar() { M::foo(); }
+  }
+}
+```
+
+Suppose we define two modules `M` and `N` like the above:
+
+* Module `N` depends on `M` because `N` contains `use 0x2::M`
+* But, at the same time, module `M` refers to `N` because `M` specifies `friend 0x2::N`
+
+Now think about how we should publish them on-chain....
+
+* With the current one-module-at-a-time publishing model:
+    * Obviously module `M` has to be published first. Otherwise, publishing module `N` first will make `N::bar()` fail miserably, while publishing `M` first should have no bad effects because no one can call `M::foo()` anyway.
+    * But, when publishing `M`, the bytecode verifier sees the visibility constraint, and it is a pointer to a nonexistent function `N::bar()`. The bytecode verifier will *not* try to resolve this function handle. It *must* tolerate that this visibility constraint is a forward declaration.
+    * A risk associated with the above procedure is the possibility of a race condition when publishing module `N`. Suppose both Alice and Eve can publish to `0x2`. When `M` is published, both Alice and Eve see that `M` declares `N` as a friend. Eve may race against Alice to publish module `N` first, with a bad `bar()` function, to exploit the trust the developer of module `M` placed on Alice.
+    * A solution to this problem is enforcing a safer but more convoluted module publication flow that still uses the one-module-at-a-time publishing model. For the example above, the flow would require three steps:
+        * publish an empty module `N` as a place holder
+        * publish module `M`
+        * publish the updated module `N` that uses the friend function `M`
+* With a future multi-signer, multi-module publication model:
+    * To avoid a convoluted module publishing flow, another solution is to use a multi-signer + multi-module publication model that allows a bundle of modules to be published / updated atomically, even if these modules reside in different user accounts. In the above case, if we could publish `M` and `N` atomically in one transaction, there would be no risk of a race condition and there is no need to go through the three-step module publishing flow.
+
+### Other Schemes for “Shared” Visibility
+
+* Address visibility
+    * Java uses a “package” concept that maps to a given location (namespace) which could roughly be thought of as an address (the address the modules are published under). Addresses in Move could serve the role of “package” in Java. With that approach, we could do something like `public(address)` — or just `internal` — that would allow for cross module visibility, but just under that address. The owner of that address would control all publishing into that address. This kind of visibility would be easy to enforce by a verifier given the address constraints. That is, the target function when linking would have to be in a module published under the same address.
+    * The problem with this model is that we have no way to control subsequent publishing into that address, which could violate the principle in Move that all bindings are known when one publishes and they cannot be altered. If publishing under the same address gave someone access to the internal state of other modules it would be possible to read and alter state that was originally intended to be private to a group of modules.
+* Package visibility
+    * This is the the .NET CLR model of “internal” visibility, i.e., things that get compiled together can access each other's internal state based merely on the fact that they are compiled together. In Move, “compiled together” really means published together, so a bundle would require a change in publishing (and the module publish transaction) that would have to accept a list of modules rather than a single one. That would give the verifier a chance to control access across modules. That is, cross module calls towards internal visibility would be allowed if the modules are in the same publish unit (bundle).
+    * However, without some extra information to identify the modules in a bundle, this approach implies that visibility/accessibility cannot be verified after publishing (e.g., while loading). The VM would have to assume that every internal access is good because it has no way to verify it after the publishing time.
+    * Versioning or upgrades could create problems with this model too, if a version would leave behind some modules that would keep visibility permission but were not intended to. That is something to analyze in more detail and it may or may not be a problem. Essentially the problem is whether verification at publishing time is enough to ensure correctness. It may be argued that the VM knowing the module bundle before and after could be enough to build the dependency graph before and after, and to report errors if any permission inconsistency is detected.
+    * Alternatively, modules could declare the “bundle” to which they belong. The binary format could have an entry for the set of modules published together, and those would define the scope when checking internal visibility/accessibility. The bundle would still be published together but then the bytecode verifier would have knowledge of which modules to take into account when verifying internal access.
+    * Friend visibility for selected modules fundamentally provides more fine grained access control than package visibility with bundles of modules. And, since Move does not yet have a concept of multi-module packages, friend visibility is a better option.
diff --git a/vendors/move/changes/2-script-visibility.md b/vendors/move/changes/2-script-visibility.md
new file mode 100644
index 000000000..afb780fdb
--- /dev/null
+++ b/vendors/move/changes/2-script-visibility.md
@@ -0,0 +1,127 @@
+# Script Visibility
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Script visibility is a new feature in Move version 1.2 to allow module functions to be safely and directly invoked much like scripts. Previously a function had either public or private visibility, where a public function is accessible anywhere but a private function can be called only from within the module where it is defined. A function with script visibility can be invoked directly, much like scripts, and is restricted to only being callable from scripts or other script visible functions.
+
+## Motivations
+
+### Managing the Hash-based Allow-list
+
+In the Diem Framework, there was a hash-based allowlist of valid scripts that could be sent to the network. If the hash of a script was present in the list, the script could be executed. Otherwise, the transaction was rejected.
+
+This solution worked but was rather cumbersome, especially if all the hash values change due to something like a new Move bytecode version. In an upgrade scenario, the allowlist would have to be upgraded in the same write-set transaction. While this difficult upgrade path could work, it would not scale well in the future. To the extent possible, Diem should continue to support old transactions, both to ease the upgrade process for clients and also to allow pre-signed transactions that are rarely updated (e.g., for emergency key rotations). The allowlist would then need to include all the old hash values from previous releases, and it would quickly grow in size and become hard to manage. Script visibility solves this problem by including the allowed scripts as part of the Diem Framework instead of tracking their hash values.
+
+### Diem Framework Updates
+
+At some time in the future, when Diem allows arbitrary transactions with script-functions, public APIs in the Diem Framework will be extremely difficult to change, but for now, it is still important to evolve the framework with critical changes that are incompatible with scripts from previous versions. This conflicts with the desire to continue supporting transactions from previous releases. With script visibility, the contents of the supported scripts can evolve along with the framework because the Move bytecodes for those scripts are not contained within the transactions, but are instead stored on chain as part of the framework.
+
+### Meaningless Wrappers
+
+Many of the scripts we have seen are simple wrappers around a single function call or two.  These scripts did not contain any interesting ad-hoc computation (and could not be doing so in the Diem Framework with its allow list). It would be convenient if a module writer could autogenerate scripts for certain functions, or simply mark which functions could be invoked directly, as if they were scripts.
+
+## Description
+
+The `script` visibility level solves these problems. In the previous version of Move, functions in a module could be declared as either `public` or private (`Public` or `Private` in the Move bytecode file format).  With this change, the possible visibility levels are now: private (no modifier), `public(friend)`, `public(script)`, and `public`. These respectively correspond to `Private`, `Friend`, `Script`, and `Public` in the file format. (See the [Friend Visibility](1-friend-visibility.md) change description for more details on that new feature.)
+
+A `public(script)` function can only be called from 1) other `public(script)` functions, or 2) from transaction scripts. And, if the function has a signature that meets the necessary restrictions for a script-function, it can be invoked directly by the Move VM as if it was a script.
+
+### New Visibility Modifier
+
+`public(script)` is a new visibility modifier that can be applied to any module’s functions. A `public(script)` function can be invoked by any other `public(script)` function (whether or not it is in the same module) or by a script-function. Besides this visibility rule, `public(script)` functions follow the same rules as any other module function, meaning they can invoke private functions, create new struct instances, access global storage (of types declared in that module), etc.
+
+Unlike script-functions, the signature of `public(script)` functions is not restricted. Any signature that is valid for another module function is a valid signature for a `public(script)` function. But, to be invoked by the Move VM as a script, the `public(script)` function must meet the same restrictions of a script-function. In other words, while every script-function has a restricted signature, the restrictions of a `public(script)` function are checked dynamically when used as an entry point to execution.
+
+### New VM Entry Point
+
+A new entry point `execute_script_function` is added to the VM to allow the invocation of a `public(script)` function in published modules. The entry point takes the following signature:
+
+```
+fn execute_script_function(
+    &self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    data_store: &mut impl DataStore,
+    cost_strategy: &mut CostStrategy,
+    log_context: &impl LogContext,
+) -> VMResult<()>
+```
+
+The entry point is designed to be similar to the existing `execute_script` entry point, with only one change:
+
+* argument `script: Vec<u8>` (i.e., a serialized script in raw bytes) is replaced by a pair of `module: &ModuleId` and `function_name: &IdentStr` that uniquely identifies a `public(script)` function in a published module (assuming the function exists).
+
+The VM will reject the execution with proper status codes in the following situations:
+
+* the `module` or `function_name` does not exist
+* the function being pointed to is not a `public(script)` function
+* the signature of the `public(script)` function does not pass the script signature check:
+    * All `signer` arguments must occur before non-`signer` arguments
+    * The function does not return any value
+    * Each non-`signer` type in function type arguments is a valid type for a constant
+        * Ostensibly, the type has the `copy` ability and is not a struct
+    * Each type in the function type variables is closed, i.e., does not refer to other type variables
+* the `senders`, `args`, or `ty_args` do not match the declared function signature.
+
+## Examples
+
+The feature is best used when you have a script that is a simple wrapper around a function in a module:
+
+```
+script {
+    fun call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount)
+    }
+}
+```
+
+Changing the module’s function from `public` to `public(script)` will remove the need for this simple wrapper script:
+
+```
+address 0x42 {
+module M {
+    ...
+    // Replace previous "public" visibility...
+    public(script) fun foo(account: signer, amount: u64) {
+        ...
+    }
+}
+}
+```
+
+However, keep in mind that the function can now only be called from other `public(script)` functions or script-functions.
+
+```
+address 0x43 {
+module Other {
+    fun private_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // ERROR Now invalid
+    }
+
+    public fun public_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // ERROR Now invalid
+    }
+
+    public(script) fun script_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // Still a valid call
+    }
+}
+}
+
+script {
+    fun still_valid(account: signer) {
+        0x42::M::foo(account, 0) // Still a valid call
+    }
+}
+```
+
+## Alternatives
+
+We did not see many other options that would address the script versioning problem caused by the hash-based allowlist. Converting transaction scripts into `public(script)` functions that are published and change alongside the corresponding module was the most straightforward solution.
+
+For the issue of meaningless wrappers alone, we considered compiler support to have scripts auto-generated. The generation by the compiler would be relatively simple, but it is unnecessary in the presence of `public(script)` functions.
diff --git a/vendors/move/changes/3-abilities.md b/vendors/move/changes/3-abilities.md
new file mode 100644
index 000000000..ce1f08efc
--- /dev/null
+++ b/vendors/move/changes/3-abilities.md
@@ -0,0 +1,439 @@
+# Abilities
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Abilities are a new feature in Move version 1.2 to give more control over what actions are permissible for values of a given type. Previously in Move’s type system, there were copyable values and `resource` values. In this old system, copyable values were unrestricted, but resource values could not be copied and had to be used. With abilities, Move’s type system grants more fine grained control, allowing types to specifically allow certain operations for their values that were previously implicitly allowed/denied depending on the “kind” (copyable or resource).
+
+## Motivations
+
+Move’s kind system (copyable vs. resource structs) has been great, but it is not expressive enough for certain applications. Resource types are very powerful, but the system bundles up a lot of behavior into one kind, which does not always meet application needs. In the Diem Framework, there has been a need for a “hot potato” type for capabilities—that is some type that cannot be copied or dropped (like a resource), but cannot be stored in global storage. It is then a “hot potato” since you must keep passing it around and it must be consumed before the transaction completes. A type with these restrictions would allow the Move prover to verify the usage of these specific capabilities.
+
+Extending the kind system just to handle this “hot potato” example is likely not the best future-proof solution. A more granular system can give programmers more control to implement not only “hot potato” types but also serve yet unknown needs. As such, we want the new system to be flexible enough to be extended in the future without requiring another large refactoring of the type system.
+
+## Description
+
+The kinds copyable and resource are replaced by four new *abilities*. These abilities gate access to various bytecode instructions. In order for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+### The Abilities
+
+The four added abilities are `copy`, `drop`, `store`, and `key`. Broken down in detail:
+
+* `copy`
+    * Allows values of types with this ability to be copied
+    * Gates: `CopyLoc` and `ReadRef`
+    * If a value has `copy`, all values reachable inside of that value have `copy`.
+* `drop`
+    * Allows values of types with this ability to be popped/dropped.
+        * Ownership does not *have* to be transferred
+    * Gates: `Pop`, `WriteRef`, `StLoc`, `Eq` and `Neq`
+    * Values left in local variables must have `drop` when the function returns with `Ret`
+    * If a value has `drop`, all values reachable inside of that value have `drop`.
+* `store`
+    * Allows values of types with this ability to exist inside a struct in global storage
+        * But not necessarily as a top-level value in global storage
+    * This is the only ability currently that is not directly checked by an operation. But it is indirectly checked when `key` is checked
+    * If a value has `store`, all values reachable inside of that value have `store`.
+* `key`
+    * Allows the type to serve as a key for global storage operations
+        * Letting values of types with this ability exist at the top-level of global storage
+    * Gates: `MoveTo`, `MoveFrom`, `BorrowGlobal`, `BorrowGlobalMut`, and `Exists`
+    * If a value has `key`, all values reachable inside of that value have `store`.
+
+### Primitive Types
+
+Most primitive types all have `copy`, `drop`, and `store` with the exception of `signer`.
+
+* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities with Generic Types](#Conditional-Abilities-with-Generic-Types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+### Annotating Structs
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+```
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case `Ignorable` has the `drop` ability, and `Pair` has `copy`, `drop`, and `store`.
+
+When declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`
+* `drop`, all fields must have `drop`
+* `store`, all fields must have `store`
+* `key`, all fields must have `store`
+    * `key` is the only ability currently that doesn’t require itself.
+
+For example:
+
+```
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+```
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+### Basic Examples
+
+**Copy**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+
+fun example(x: u64, s: S) {
+    let x2 = copy x; // Valid, 'u64' has 'copy'
+    let s2 = copy s; // Valid, 'S' has 'copy'
+}
+
+fun invalid(account: signer, n: NoAbilities) {
+    let a2 = copy account; // Invalid, 'signer' does not have 'copy'
+    let n2 = copy n; // Invalid, 'NoAbilities' does not have 'drop'
+}
+```
+
+**Drop**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+
+fun unused() {
+    true; // Valid, 'bool' has 'drop'
+    S { f: false }; // Valid, 'S' has 'drop'
+}
+
+fun left_in_local(account: signer): u64 {
+    let b = true;
+    let s = S { f: false };
+    // Valid return: 'account', 'b', and 's' have values
+    // but 'signer', 'bool', and 'S' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    NoAbilities {}; // Invalid, Cannot ignore 'NoAbilities' without 'drop'
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = NoAbilities{};
+    // Invalid return: 'n' has a value and 'NoAbilities' does not have 'drop'
+    0
+
+}
+```
+
+**Store**
+
+```
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: u64, // Valid, 'u64' has 'store'
+    // no: signer, Invalid, 'signer' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: u64, // Valid, 'u64' has 'store'
+    inner: MyInnerResource, // Valid, 'MyInnerResource' has 'store'
+    // no: signer, Invalid, 'signer' does not have 'store'
+}
+```
+
+**Key**
+
+```
+struct NoAbilities {}
+struct MyResource has key { f: u64 }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+    let has_resource = exists<MyResource>(addr); // Valid, 'MyResource' has 'key'
+    if (!has_resource) {
+        move_to(account, MyResource { f: 0 }) // Valid, 'MyResource' has 'key'
+    };
+    let r = borrow_global_mut<MyResource>(addr) // Valid, 'MyResource' has 'key'
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   let has_it = exists<NoAbilities>(addr); // Invalid, 'NoAbilities' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr); // Invalid, does not have 'key'
+   move_to(account, NoAbilities {}); // Invalid, 'NoAbilities' does not have 'key'
+   borrow_global<NoAbilities>(addr); // Invalid, 'NoAbilities' does not have 'key'
+}
+```
+
+### Constraining Generics
+
+Abilities can used to constrain generics, meaning that only types with that ability can instantiate that type parameter. This can be used on both function and struct type parameters:
+
+```
+fun foo<T: copy>(x: T): (T, T) { (copy x, x) }
+struct CopyCup<T: copy> has copy { item: T }
+```
+
+Type parameters can have more than one constraint, signified with `+`
+
+```
+fun bar<T: copy + drop>(x: T): T { copy x }
+struct AllCup<T: copy + drop + store + key> has copy, drop, store, key { item: T }
+```
+
+### Conditional Abilities with Generic Types
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+```
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+The type parameter `T` is assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. That means:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+This behavior might be a bit confusing at first, but it is extremely useful for collection-like types. Consider `vector`: we could consider it to have the following type declaration:
+
+```
+vector<T> has copy, drop, store;
+```
+
+With this, you can copy a `vector` value only if the inner elements can be copied. You can ignore a `vector` value only if the inner elements can be ignored/dropped. And, a `vector` can be in global storage only if the inner elements can be in global storage.
+
+### More Examples
+
+**Conditional Copy**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'drop' because 'S' has 'drop'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    let c_n2 = copy c_n;
+}
+```
+
+**Drop**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+
+}
+```
+
+**Store**
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+**Key**
+
+```
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
+
+### Backwards Compatibility
+
+The new ability system is backwards compatible with the kind system in nearly all cases. At the bytecode level, old modules and scripts with kinds can be loaded as if they were written with abilities.
+
+For any struct:
+
+* If it was declared as a “copyable”, non-`resource` struct, the struct will be given the abilities `copy`, `drop`, and `store`.
+* If it was declared as a `resource`, the struct will be given the abilities `store` and `key`.
+* For type parameters:
+    * `copyable` becomes `copy + drop`
+    * `resource` becomes `key`
+    * `store` is not given as it is not needed in the constraint position. Any usage will still work.
+
+For any function:
+
+* For type parameters:
+    * `copyable` becomes `copy + drop + store`
+    * `resource` becomes `key + drop`
+    * `store` is needed as it is not simple to determine if the type parameter will be used with global storage operations.
+
+Putting these rules together, the old code
+
+```
+struct S<T: copyable> {}
+resource struct R<T1: resource, T2> {}
+
+fun foo<Tc: copyable, Tr: resource, T>() {}
+```
+
+will be loaded as if it was written as:
+
+```
+struct S<T: copy + drop> has copy, drop, store {}
+struct R<T1: key, T2> {}
+
+fun foo<Tc: copy + drop + store, Tr: key + store, T: store>() {}
+```
+
+This leads to one spot where there is a breaking change, namely any function instantiated with `signer` as a type parameter will not now load because the type parameter will  have the `store` constraint—all old function type parameters are given the `store` constraint—but `signer` does not have `store`. Given the restricted usage of `signer`, this is likely an extreme edge case, and we do not foresee it being an issue in practice for any project.
+
+## Alternatives
+
+### Extending the Kind System
+
+For the main motivating example for this change, it was considered to add a “hot potato” kind to the system.
+In the kind system there was:
+
+* `Copyable` which corresponds to `copy + drop + store`,
+* `Resource` which corresponds to `key + store`
+* `All` which sometimes corresponds to `store` and sometimes to no-ability
+
+Often this was viewed with a sub-kinding system where `Copyable <: All`  and `Resource <: All`. Adding a `HotPotato` kind to this system would be bit tricky, possibly giving a hierarchy of `Copyable <: All` and `Resource <: HotPotato <: All`. But, this could become a mess if:
+
+* There needed to be an `AllWithStore` kind, giving `Copyable <: AllWithStore <: All` and `Resource <: AllWithStore <: All` and `Resource <: HotPotato <: All`.
+* If any other kind was added, the complexity could quickly explode.
+
+The complexity around this sub-kinding approach led to the more granular approach described above with abilities. We were particularly worried about needing another kind in a year or two and having the whole thing collapse. With abilities, we can easily add new ones over time if needed.
+
+### Explicit Conditional Abilities
+
+The current rules around generics being conditional for generic types might be potentially confusing, especially given the keyword `has`. For instance:
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+```
+
+Despite effectively saying “has copy” and “has drop” and “has store”, `Cup<T>` may or may not have the ability depending on what `T` is. This might be rather confusing. It was considered then that for generic types you would write:
+
+```
+struct Cup<T> has ?copy, ?drop, ?store { item: T }
+```
+
+This would mean exactly what it means today, where it may or may not have the ability depending on `T` and then using `has` without the question mark `?`
+
+```
+struct Ex<T> has copy {}
+```
+
+would be equivalent to:
+
+```
+struct Ex<T: copy> has ?copy {}
+```
+
+The potential problem then comes in that there are a lot of combinations that are meaningless. So, in many cases the compiler would yell at you that there is really just one valid choice.
+
+* `struct Ex<T: copy> has copy` is sort of redundant and could just be `struct Ex<T> has copy`.
+* For a non-generic type, `struct Ex has ?copy` is meaningless in some way, as every instance has the ability, and it is the same as `struct Ex has copy`.
+
+In short, having the option to have the question mark `?` caused there to be more cases and possibly more confusion. Furthermore this system was not more expressive, as a programmer could always annotate the generic `struct Cup<T: copy> has copy`, this would force every instance to have `copy` in a more explicit manner. In short, just having one option and one rule that might be a bit more confusing in the way it reads at first, but reduces the amount of complexity to consider when declaring a new struct.
+
+### Alternative Names
+
+Many different names were considered for all aspects of the abilities system.
+
+* For the name “ability” itself, “kinds”, “traits”, “type classes”, and “interfaces” were all considered. But these items used in other programming languages are usually used to describe programmer-defined items. There is no way for programmers to define their own abilities. Additionally, abilities do not give anything that looks like dynamic dispatch. So, while those other names might be more familiar, we worried they would be too misleading.
+* `copyable` and `dropable` and `storable` were all considered, but they felt too wordy. Shorter names felt more appropriate.
+* `mustuse` or `mustmove` were considered for `drop`, but again, the more concise name felt better even if the others were more informative.
+* `resource` was considered instead of `key`. The `key` ability is very similar to the `resource` keyword in many cases, but it felt very weird that something like a `Coin` which might have been `resource struct Coin` in the old system, would not be `struct Coin has store` and would not be a “resource”. Thus we are saving the word “resource” to be used in documentation for any time that does not have `copy` or `drop`.
diff --git a/vendors/move/changes/4-unit-testing.md b/vendors/move/changes/4-unit-testing.md
new file mode 100644
index 000000000..464d1ce30
--- /dev/null
+++ b/vendors/move/changes/4-unit-testing.md
@@ -0,0 +1,345 @@
+# Unit Testing
+
+* Status: Implemented in Move 1.3
+
+## Introduction
+
+Unit testing is a new feature in Move version 1.3 to allow Move programmers to more easily and concisely test individual functions and features. Previously, the only way to test Move code was using more heavyweight expected-value and transaction-based tests via the Move CLI and Diem functional test framework. Additionally, it was hard — if not impossible — to set up arbitrary state for testing, to test non-public functions, and to have test-only dependencies, functions, and datatypes. With the new Move unit testing feature these are all possible and easy to express.
+
+## Motivation
+
+Being able to test code thoroughly is an essential ability when developing Move code. However, without a unit testing framework for Move, achieving high test coverage for both public and private functions that is clear and easily maintainable is a challenging task.
+
+Move unit tests are written in the module whose functionality they are testing. Because of this, unit tests have access to private functions and can freely construct and publish instances of datatypes defined in the module. This allows a more declarative and transparent style of testing as compared to previous options, where complex sequences of transactions could be needed to set up the state in a specific manner to test a particular code path in a function.
+
+Sometimes there are cross-module data dependencies, functions, or datatypes that you would like to have for testing purposes only. Move unit tests allow expressing that modules, and module members (`use`s, functions, and datatypes) are for testing purposes only. When members are annotated as `#[test_only]` or `#[test]` they will not appear in the compiled bytecode outside of testing. For those familiar with Rust, this is similar to `#[cfg(test)]` and `#[test]` respectively.
+
+## Description
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail (abort). These annotations can be placed on a function with any visibility. Whenever any module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+
+### Testing Annotations: Their Meaning and Usage
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+```
+#[test] // OK
+fun this_is_a_test() { ... }
+
+#[test] // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the annotated test should abort — however the exact abort code is not checked. The test will be marked as failing only if the test fails with a non-abort error, or does not abort. Only functions that have the `#[test]` annotation can also be annotated as an  #`[expected_failure]`.
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_should_abort_and_pass() { abort 1 }
+
+#[test, expected_failure] // Can have multiple in one attribute. This test will pass.
+public(script) fun this_other_test_should_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do  not have to be the same, but they must be able to be matched up with each other by name.
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+```
+#[test(arg = @0xC0FFEE)] // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// somewhere a named address is declared
+#[test_only] // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+```
+#[test, expected_failure(abort_code = 1)] // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+```
+#[test_only] // test only attributes can be attached to modules
+module ABC { ... }
+
+#[test_only] // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. to uses
+use 0x1::SomeOtherModule;
+
+#[test_only] // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+### Running Unit Tests
+
+Unit tests can be compiled and run by the `move-unit-test` crate. It is designed to work out-of-the box, so all you need to start running tests is to pass the files—or directories containing files—that you wish to test (and all dependencies):
+
+```
+$ cargo run --bin move-unit-test <move_file_or_dir_containing_move_modules_1> ... <move_file_or_dir_containing_move_modules_n>
+```
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+A test will be marked as timing out if it exceeds the maximum gas that can be executed for any single test. When a gas table is not provided, each bytecode instruction is assigned a gas cost of 1 unit. This bound can be changed using the options below, and its default value is set to 5000 gas units. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing, and to help debug failing tests. These are:
+
+```
+FLAGS:
+        --stackless         Use the stackless bytecode interpreter to run the tests and cross check its results with the
+                            execution result from Move VM
+    -g, --state_on_error    Show the storage state at the end of execution of a failing test
+    -h, --help              Prints help information
+    -l, --list              List all tests
+    -s, --statistics        Report test statistics at the end of testing
+    -V, --version           Prints version information
+    -v, --verbose           Verbose mode
+
+OPTIONS:
+    -f, --filter <filter>                A filter string to determine which unit tests to run
+    -i, --gas_limit <gas_limit>          Bound the amount of gas used by any one test. [default: 1_000_000]
+    -t, --threads <num_threads>          Number of threads to use for running tests [default: 8]
+
+ARGS:
+    <sources>...    Source files
+```
+
+While each of these flags and options are fairly self-explanatory, it is worth mentioning that when filtering tests with the `-f` option, any test whose fully qualified name (i.e., `address::module::function_name`) contains the `<filter>` string will be run.
+
+### Compilation
+
+You should always use the unit testing framework for unit testing Move code. However, there may be times when you may wish to include test-only code outside of unit testing. In such scenarios Move source code can be compiled with test-code included by passing the `--test` flag to the Move compiler.
+
+## Examples
+
+A simple module using some of the unit testing features is shown in the following example:
+
+```
+// filename: MyModule.move
+module 0x1::MyModule {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert(has_coin(@0x1), 0);
+        assert(has_coin(@0x2), 1);
+        assert(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### Running Tests
+
+```
+$ cargo run --bin move-unit-test MyModule.move
+Running Move unit tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### Using Test Flags
+
+#### `-f <str>` or `--filter <str>`
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -f zero_coin
+Running Move unit tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` or `--gas_limit <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+```
+cargo run --bin move-unit-test <dir> -i 0 MyModule.move
+Running Move unit tests
+[ TIMEOUT ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::MyModule::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::MyModule::test_has_coin
+
+Test failures:
+
+Failures in 0x1::MyModule:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` or `--statistics`
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the `MyModule` example above:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -s
+Running tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+
+Test Statistics:
+
+┌───────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                   │    Time    │   Gas Used   │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::make_sure_non_zero_coin_passes │   0.005    │             1             │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::make_sure_zero_coin_fails      │   0.003    │             1             │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::test_has_coin                  │   0.004    │             1             │
+└───────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` or `--state-on-error`
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `MyModule` example:
+
+```
+module 0x1::MyModule {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert(has_coin(@0x1), 0);
+        assert(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get get the following output:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -g
+Running tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+[ FAIL    ] 0x1::MyModule::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::MyModule:
+
+┌── test_has_coin_bad ──────
+│ error:
+│
+│     ┌── MyModule.move:46:9 ───
+│     │
+│  46 │         assert(has_coin(@0x2), 1);
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│     ·
+│  43 │     fun test_has_coin_bad(a: signer) {
+│     │         ----------------- In this function in 0x1::MyModule
+│     │
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::MyModule::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
+
+## Ongoing Work
+
+Support for test-only native functions is currently being added to the unit testing framework. With this addition comes a new way of creating an arbitrary number of `signer` values in test-only code. We expect these features to be available in release 1.4.
+
+We also plan to support running Move unit tests from the Move CLI and expect that this to be supported in release 1.4.
+
+## Alternatives
+
+In the development of unit tests, there were a couple of alternatives considered, some of which you as a Move programmer have at your disposal already, so we highlight the differences here.
+
+### Expected Value Tests
+
+Move already supports [expected value tests](https://github.com/move-language/move/tree/main/language/tools/move-cli#testing-with-the-move-cli) in the Move CLI, however these cover a different aspect of testing for Move. In particular, there is no concept of test-only code and test-only dependencies, which makes testing non-public functions much more difficult. Additionally, each expected value test entry must be a transaction or script function. Because of this, the expected value tests rely on a specific Move adapter implementation, whereas the unit tests do not rely on an adapter implementation and rely solely on the Move compiler and VM.
+
+Due to the design of unit tests, unit tests make it easier to test the individual units of code that comprise a Move module. However, because the unit tests do not require or use an adapter, they do not support certain features that you may  wish to test. E.g., there is no way in Move unit tests to query if a specific event has been emitted.
+
+### Test Modules
+
+The unit tests for Move are function and annotation based: each test and test-only members are declared by attaching an annotation to them. During development we also considered a module-based approach where a separate test module could be declared that contained the tests for a module (and that the compiler would inline so the tests could access private functions and construct datatypes declared in the module). We decided against supporting such an option at this time for simplicity, and to make the additional syntax and the semantics as close as possible to what currently exists in Move, but that option could still be added in the future.
diff --git a/vendors/move/changes/5-named-addresses.md b/vendors/move/changes/5-named-addresses.md
new file mode 100644
index 000000000..936db6803
--- /dev/null
+++ b/vendors/move/changes/5-named-addresses.md
@@ -0,0 +1,200 @@
+# Named Addresses
+
+- Status: Implemented in Move 1.4, updated in Move 1.5
+
+## Introduction
+
+Named addresses are a new source language only feature. (That is, the named address feature is
+compiled away and not present in the Move bytecode format). The feature allows names to be used in
+place of numerical values in any spot where addresses are used. Named addresses are declared as top
+level elements (outside of modules and scripts) in Move Packages, or passed as
+arguments to the Move compiler.
+
+With the landing of this feature, Move standard library modules now reside under the address `Std`,
+e.g. `std::vector`. Similarly, Diem Framework modules now reside under the address `DiemFramework`,
+e.g. `DiemFramework::XUS`.
+
+Named address declarations are opaque, meaning they must be accessed via the name and not their
+underlying numeric value. Any existing code must be updated to use named addresses when accessing
+standard library or Diem Framework modules.
+
+Alongside this change, there is new syntax for address literals when used as expression values, e.g.
+`let addr = @0x42;`.
+
+## Motivations
+
+Fixed, numerical addresses were "good enough" for the language starting off, but the inability to
+set addresses via a configuration at build time severely hinders code portability and usability.
+Additionally, the lack of named address support has been painful both for account configuration in
+testing and for basic readability of code.
+
+To combat this, we are adding named addresses. They compile down to the same address system that
+exists today, but it greatly increases the portability, testability, and readability of source
+language programs.
+
+## Description
+
+### New Address Literal Syntax
+
+Addresses now come in two flavors, named or numerical. The syntax for a named address follows the
+same rules for any named identifier in Move. The syntax of a numerical address is no longer
+restricted to `0x`-prefixed values, and now any valid numerical literal can be used.
+
+To make room for the named address feature, address expression values have a new syntax. This new
+syntax reduces the complexity around named addresses as it prevents shadowing issues around module
+members (specifically constants) and local variables.
+
+In the old syntax, all address values began with `0x` and this hex prefix could not be used for
+integer values. In the new syntax, all address values are prefixed with `@`. Following the `@`
+operator any valid address can be used. For example:
+
+```move
+let _: u8 = 0x1u8;
+let _: u64 = 0x42u64;
+let _: u128 = 0x42u128;
+let a1: address = @std;
+let a2: address = @66;
+let a3: address = @0x42;
+```
+
+You can think of `@` as an operator that takes an address from being a namespace item to an
+expression item.
+
+Named addresses are not declared in Move source code. Instead they
+must be declared---and given a value---when invoking the Move compiler. E.g.,
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0x42 ...
+```
+
+A named address can be used in both module accesses and as expression values (with the new
+`@` syntax)
+
+```move
+script {
+    fun example() {
+        MyAddr::M::foo(@MyAddr);
+    }
+}
+```
+
+A named address can be used multiple times throughout a program.
+
+```move
+// file1.move
+module MyAddr::M {
+    ...
+}
+```
+
+```move
+// file2.move
+address MyAddr {
+module N {
+    ...
+}
+}
+```
+
+### Assigning Named Addresses
+
+Named addresses can only be assigned a value by passing their value as a parameter to the compiler with `<addr_name>=<number value>`:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE ...
+```
+
+An address can be assigned any number of times on the command line as long as it is given only _one_ value.
+The following would be fine, since the address `MyAddr` is given the same value in both assignments:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE MyAddr=12648430 ... # decimal representation of 0xC0FFEE
+```
+
+Assigning `MyAddr` two different values will result in an error:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE MyAddr=0xDEADBEEF... # ERROR!
+```
+
+### Opaqueness
+
+Address assignments, and the name system as whole, only exist at the source
+language level and during compilation. Names will be fully substituted for
+their value at the byte code level. So the example from before would be
+equivalent to
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::M::foo(@0xC0FFEE);
+    }
+}
+```
+
+But at the source language level, the two are not interchangeable. If we had the declaration:
+
+```move
+module MyAddr::M {
+    public fun bar() {}
+}
+```
+
+The function `M::bar` _must_ be accessed through the `MyAddr` named address, not through the
+numerical value assigned to it.
+
+For example:
+
+```move
+script {
+    fun example() {
+        // ERROR! 0xC0FFEE::M::bar();
+        MyAddr::M::bar()
+    }
+}
+```
+
+## Move Standard Library and Diem Framework Modules
+
+As mentioned above, all standard library modules now live in `Std` and all Diem Framework modules
+live in `DiemFramework`. The `DiemFramework` address is set to `0x1` and this hard-coded assignment
+will be fine. However, our hope is to allow `Std` to be assigned different numerical values
+depending on the deployment of those modules. For now, `Std` has a hardcoded assignment of `0x1`.
+See the 'Future Work' section below for details about how this might work in the future.
+
+## Backwards Compatibility
+
+Since, all standard library modules and all Diem Framework modules live in `Std` and `DiemFramework`
+respectively, source code must be updated to use those named addresses. The named addresses are
+opaque, so the numeric values can no longer be used to access the modules. For example, any use of
+`0x1::Vector` must now be `std::vector`.
+
+Note, as this is just a syntactic change, the compiled module binaries will not be affected.
+
+## Update for release 1.5
+
+The support for assigning values to named addresses in Move source code and declaring named addresses in release 1.4
+
+```move
+address MyAddr = 0x19;
+```
+
+and
+
+```move
+address MyAddr;
+```
+
+was removed.
+
+Support for assigning address values was added to the command line and compiler
+options were added for use in Move packages and the Move command line as described above.
+
+
+## Future Work
+
+Named address support will be expanded in a new package system. The intent is that with this system,
+a Move program will never assign a value to a named address within the `*.move` files. Instead, all
+assignment of a named addresses will exist in a config file, similar to Rust's `Cargo.toml` files.
+To enable this package system, additional support will likely be needed from the compiler for
+configuring and assigning named addreses.
diff --git a/vendors/move/changes/6-phantom-type-params.md b/vendors/move/changes/6-phantom-type-params.md
new file mode 100644
index 000000000..81c454e2a
--- /dev/null
+++ b/vendors/move/changes/6-phantom-type-params.md
@@ -0,0 +1,112 @@
+# Phantom Type Parameters
+
+- Status: Implemented in Move 1.4
+
+## Introduction
+
+A _phantom type parameter_ is one that doesn't show up at runtime, but is checked statically at
+compile time. Phantom type parameters can be useful in a couple of situations. For example, the
+struct `Event::EventHandle<T>` in the Move Standard library doesn't contain any field of type `T`,
+but uses the type parameter to ensure at the type level that the handle can only be used for
+messages of type `T`. Another prominent example is `Diem::Diem<CoinType>`, which is generic on a
+`CoinType` specifying the currency of the coin and allowing code to be written generically on any
+currency. As a last example, the capabilities in `Vault` also rely heavily on phantom type
+parameters.
+
+Previously, Move's type system didn't make a difference on whether a type parameter was phantom, but
+with this new feature, a struct's type parameter can be explicitly declared as phantom. A parameter
+declared as phantom is not considered when computing the
+[conditional abilities with generic types](3-abilities.md#Conditional-Abilities-with-Generic-Types).
+For this relaxed rule to be sound, Move's type system guarantees that a parameter declared as
+phantom is either not used at all in the struct definition, or it is only used as an argument to
+type parameters also declared as phantom.
+
+## Motivations
+
+Previously, defining a struct `S` with a phantom type parameter required spurious ability
+annotations to satisfy the requirements of the abilities declared for `S`. This resulted in
+increased chance of bugs and security vulnerability because types had to be weakened with
+unnecessary ability declarations. Moreover, the spurious annotations were infectious, requiring many
+functions generic on the phantom type parameter to also include the necessary constraints. With the
+new feature, arguments to phantom type parameters are not considered when deriving the abilities for
+generic types, thus avoiding the need for spurious ability annotations.
+
+For example, `Diem::Diem<CoinType>` is declared with the ability `key`. This required all arguments
+to `CoinType` to be declared with `store`. Specifically, the types `XUS::XUS` and `XDX::XDX` were
+forced to have a `store` annotation even though they were never stored in global storage! Moreover
+the extra `store` requirement polluted the entire Diem Framework and many functions had to specify
+extra `store` constraints on their type parameters. With the new feature, `Diem::Diem<CoinType>` now
+declares `CoinType` to be phantom which avoids the spurious `store` annotations sprinkled over the
+code.
+
+## Description
+
+### Declaration
+
+In a struct definition a type parameter can be declared as phantom by adding the `phantom` keyword
+before its declaration. If a type parameter is declared as phantom we say it is a phantom type
+parameter. When defining a struct, Move's type checker ensures that every phantom type parameter is
+either not used inside the struct definition or it is only used as an argument to a phantom type
+parameter.
+
+More formally, if a type is used as an argument to a phantom type parameter we say the type appears
+in _phantom position_. With this definition in place, the rule for the correct use of phantom
+parameters can be specified as follows: **A phantom type parameter can only appear in phantom
+position**.
+
+The following two examples show valid uses of phantom parameters. In the first one, the parameter
+`T1` is not used at all inside the struct definition. In the second one, the parameter `T1` is only
+used as an argument to a phantom type parameter.
+
+```
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 does not appear inside the struct definition
+
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 appears in phantom position
+```
+
+The following code shows examples of violations of the rule:
+
+```
+
+struct S1<phantom T> { f: T }
+                          ^
+                          Error: Not a phantom position
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             Error: Not a phantom position
+```
+
+### Instantiation
+
+When instantiating a struct, the arguments to phantom parameters are excluded when deriving the
+struct abilities. For example, consider the following code:
+
+```
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+Consider now the type `S<HasCopy, NoCopy>`. Since `S` is defined with `copy` and all non-phantom
+arguments have copy then `S<HasCopy, NoCopy>` also has copy.
+
+### Phantom Type Parameters with Ability Constraints
+
+Ability constraints and phantom type parameters are orthogonal features in the sense that phantom
+parameters can be declared with ability constraints. When instantiating a phantom type parameter
+with an ability constraint, the type argument has to satisfy that constraint, even though the
+parameter is phantom. For example, the following definition is perfectly valid:
+
+```
+struct S<phantom T: copy> {}
+```
+
+The usual restrictions apply and `T` can only be instantiated with arguments having `copy`.
diff --git a/vendors/move/changes/7-packages.md b/vendors/move/changes/7-packages.md
new file mode 100644
index 000000000..dae0e7179
--- /dev/null
+++ b/vendors/move/changes/7-packages.md
@@ -0,0 +1,327 @@
+# Packages
+
+* Status: Implemented in Move 1.5
+
+## Introduction
+
+Packages are a new source feature to allow Move programmers to more easily
+re-use code and share it across projects.  The Move package system allows
+programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by named addresses;
+* Use a package in Move code and instantiate its named addresses;
+* Build packages; and
+* Work with a common interface around compiled Move artifacts.
+
+## Motivation
+
+Until now, when writing Move you had no easy options of being able to
+package Move code into reusable chunks that could be used by others. There
+was no common compiled object model or on-disk representation of compiled
+Move code and its associated artifacts, e.g., source maps and generated
+documentation. And finally, there was no way of easily managing named
+addresses that spanned "logical groupings" of Move code.
+
+The Move package system aims to make these actions easier by providing a
+common compiled-object model and access to both compiled bytecode and
+  associated compilation artifacts along with ways to:
+* Declare logical packages of Move code;
+* Import and use packages;
+* Compile and generate associated compilation artifacts from packages; and
+* Manage--expose and instantiate--named addresses in packages.
+
+## Package Layout and Manifest Syntax
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+```
+a_move_package
+├── Move.toml      (required)
+├── sources        (required)
+├── examples       (optional, test & dev mode)
+├── scripts        (optional)
+├── doc_templates  (optional)
+└── tests          (optional, test mode)
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any [documentation
+templates](../move-prover/doc/user/docgen.md) present in the
+`doc_templates` directory.
+
+### Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+```
+[package]
+name = <string>                  # e.g., "MoveStdlib"
+version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+[addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+# One or more lines declaring named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., Std = "_" or Addr = "0xC0FFEECAFE"
+
+[dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+# One or more lines declaring dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } }
+
+[dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., Std = "_" or Addr = "0xC0FFEECAFE"
+
+[dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+
+An example of the most minimal package manifest:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+license = "Apache 2.0"
+
+[addresses]
+AddressToBeFilledIn = "_"
+SpecifiedAddress = "0xB0B"
+
+[dependencies]
+MoveStdlib = { local = "<some_path>/move-stdlib", addr_subst = { "Std" = "0x1" } }
+
+[dev-addresses] # For use when developing this module
+AddressToBeFilledIn = "0x101010101"
+```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+## Named Addresses During Compilation
+
+Recall that Move has [named addresses](./5-named-addresses.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+## Declaration
+
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+```move
+module NamedAddr::A {
+    public fun x(): address { @NamedAddr }
+}
+```
+
+We could in `example_pkg/Move.toml` declare the named address `NamedAddr` in
+two different ways. The first:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "_"
+```
+
+Declares `NamedAddr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `NamedAddr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `NamedAddr`, and the package can then be
+instantiated later on by an importing package.
+
+`NamedAddr` can also be declared as:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "0xCAFE"
+```
+
+which states that the named address `NamedAddr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+## Scoping and Renaming of Named Addresses
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `NamedAddr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+```
+[package]
+name = "P"
+...
+[dependencies]
+P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+P2 = { local = "some_path_to_P2"  }
+```
+
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+```
+module N::A {
+    public fun x(): address { @P1N }
+}
+```
+
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+### Instantiation
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `NamedAddr` would be uninstantiated:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "_"
+
+[dev-addresses]
+NamedAddr = "0xC0FFEE"
+```
+
+## Usage, Artifacts, and Data Structures
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+### Usage
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
+
+## Future Work
+
+We intend on adding support for the following features over time:
+* Adding a flag to print the named addresses in scope and their values for each
+  of the dependencies of the package being built.
+* Support renaming multiple names from dependencies to one named address, e.g.
+  the following will not work today, but we'd like to support it:
+    ```
+    ...
+    [dependencies]
+    A = { local = "...", addr_subst = { "Addr" = "A" } }
+    B = { local = "...", addr_subst = { "Addr" = "B" } }
+    ```
+* Default importation of the Move standard library: currently the Move standard
+  library must be imported in the package in order to use unit testing
+  features.
diff --git a/vendors/move/crates/benchmarks/.gitignore b/vendors/move/crates/benchmarks/.gitignore
new file mode 100644
index 000000000..13a3d7626
--- /dev/null
+++ b/vendors/move/crates/benchmarks/.gitignore
@@ -0,0 +1,2 @@
+# Criterion puts its benchmark results under the target directory in here, not at the top (workspace) level.
+/target/
diff --git a/vendors/move/crates/benchmarks/Cargo.toml b/vendors/move/crates/benchmarks/Cargo.toml
new file mode 100644
index 000000000..ef28268d3
--- /dev/null
+++ b/vendors/move/crates/benchmarks/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "language-benchmarks"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move language benchmarks"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+criterion = "0.3.4"
+criterion-cpu-time = "0.1.0"
+move-binary-format = { path = "../move-binary-format" }
+once_cell = "1.7.2"
+proptest = "1.0.0"
+
+move-bytecode-verifier = { path = "../move-bytecode-verifier" }
+move-compiler = { path = "../move-compiler" }
+move-core-types = { path = "../move-core-types" }
+move-stdlib = { path = "../move-stdlib" }
+move-vm-runtime = { path = "../move-vm/runtime" }
+move-vm-test-utils = { path = "../move-vm/test-utils" }
+move-vm-types = { path = "../move-vm/types" }
+
+[[bench]]
+name = "vm_benches"
+harness = false
diff --git a/vendors/move/crates/benchmarks/README.md b/vendors/move/crates/benchmarks/README.md
new file mode 100644
index 000000000..271756946
--- /dev/null
+++ b/vendors/move/crates/benchmarks/README.md
@@ -0,0 +1,34 @@
+# Profiling MoveVM with Instrument
+This doc is going to talk about how to run performance benchmarks on macOS.
+
+## Step 1: Get latest Xcode and open Instrument
+
+Instrument can be found in Xcode > Open Developer Tool > Instrument.
+![](https://i.imgur.com/QCwJBim.png)
+
+
+
+## Step 2: Choose a benchmark suite.
+
+We currently have four local benchmark candidates:
+- `executor_benchmark` in `diem/executor`
+- `txn_bench` in `diem/language/benchmark`
+- `Arith` and `call` benchmark in `diem/language/benchmark`
+
+The first item is a comprehensive benchmark of diem adapter, executor and storage that generates a block of p2p transactions and tries to execute and commit it to the DiemDB in local storage. The second item is a benchmark of Diem adapter only with a fake executor and an in-memory storage that executes randomly generated p2p transactions. The third item, although it’s still invoking Diem adapter, is mostly testing on the MoveVM’s ability of handling simple arithmetic operations and call stacks.
+
+## Step 3: Select the running process in Instrument.
+Open instrument and create a time profiler project.
+
+![](https://i.imgur.com/dbLht9f.png)
+
+Launch the benchmark target in the terminal, and select it in Instrument.
+
+![](https://i.imgur.com/LU10tZC.jpg)
+
+
+## Step 4: Get analysis!
+
+Here’s an example trace from running the benchmark
+
+![](https://i.imgur.com/BAoprNq.jpg)
diff --git a/vendors/move/crates/benchmarks/benches/vm_benches.rs b/vendors/move/crates/benchmarks/benches/vm_benches.rs
new file mode 100644
index 000000000..3482e15c0
--- /dev/null
+++ b/vendors/move/crates/benchmarks/benches/vm_benches.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::{criterion_group, criterion_main, measurement::Measurement, Criterion};
+use language_benchmarks::{measurement::cpu_time_measurement, move_vm::bench};
+
+//
+// MoveVM benchmarks
+//
+
+fn arith<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "arith");
+}
+
+fn call<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "call");
+}
+
+fn natives<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "natives");
+}
+
+criterion_group!(
+    name = vm_benches;
+    config = cpu_time_measurement();
+    targets = arith,
+    call,
+    natives
+);
+
+criterion_main!(vm_benches);
diff --git a/vendors/move/crates/benchmarks/src/bench.move b/vendors/move/crates/benchmarks/src/bench.move
new file mode 100644
index 000000000..fc9b4d205
--- /dev/null
+++ b/vendors/move/crates/benchmarks/src/bench.move
@@ -0,0 +1,112 @@
+// `cargo bench` will call a public function in this module.
+// The Module must be called `Bench` and the set of public functions are callable from the bench (Rust code).
+// `benches/transaction.rs` contains the calling code.
+// The idea is that you build your scenario with a public entry point and a bunch of private functions as needed.
+module 0x1::Bench {
+    use std::vector;
+
+    //
+    // Global helpers
+    //
+    fun check(check: bool, code: u64) {
+        if (check) () else abort code
+    }
+
+    //
+    // `arith` benchmark
+    //
+    public fun arith() {
+        let i = 0;
+        // 10000 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 10000) {
+            1;
+            10 + 3;
+            10;
+            7 + 5;
+            let x = 1;
+            let y = x + 3;
+            check(x + y == 5, 10);
+            i = i + 1;
+        };
+    }
+
+    //
+    // `call` benchmark
+    //
+    public fun call() {
+        let i = 0;
+        // 3000 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 3000) {
+            let b = call_1(@0x0, 128);
+            call_2(b);
+            i = i + 1;
+        };
+    }
+
+    fun call_1(addr: address, val: u64): bool {
+        let b = call_1_1(&addr);
+        call_1_2(val, val);
+        b
+    }
+
+    fun call_1_1(_addr: &address): bool {
+        true
+    }
+
+    fun call_1_2(val1: u64, val2: u64): bool {
+        val1 == val2
+    }
+
+    fun call_2(b: bool) {
+        call_2_1(b);
+        check(call_2_2() == 400, 200);
+    }
+
+    fun call_2_1(b: bool) {
+        check(b == b, 100)
+    }
+
+    fun call_2_2(): u64 {
+        100 + 300
+    }
+
+    //
+    // `natives` benchmark
+    //
+    fun test_vector_ops<T>(x1: T, x2: T): (T, T) {
+        let v: vector<T> = vector::empty();
+        check(vector::length(&v) == 0, 100);
+        vector::push_back(&mut v, x1);
+        check(vector::length(&v) == 1, 101);
+        vector::push_back(&mut v, x2);
+        check(vector::length(&v) == 2, 102);
+        vector::swap(&mut v, 0, 1);
+        x1 = vector::pop_back(&mut v);
+        check(vector::length(&v) == 1, 103);
+        x2 = vector::pop_back(&mut v);
+        check(vector::length(&v) == 0, 104);
+        vector::destroy_empty(v);
+        (x1, x2)
+    }
+
+    fun test_vector() {
+        test_vector_ops<u8>(1u8, 2u8);
+        test_vector_ops<u64>(1u64, 2u64);
+        test_vector_ops<u128>(1u128, 2u128);
+        test_vector_ops<bool>(true, false);
+        test_vector_ops<address>(@0x1, @0x2);
+        test_vector_ops<vector<u8>>(vector::empty(), vector::empty());
+    }
+
+    public fun natives() {
+        let i = 0;
+        // 300 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 300) {
+            test_vector();
+            i = i + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/benchmarks/src/lib.rs b/vendors/move/crates/benchmarks/src/lib.rs
new file mode 100644
index 000000000..8f6293149
--- /dev/null
+++ b/vendors/move/crates/benchmarks/src/lib.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod measurement;
+pub mod move_vm;
diff --git a/vendors/move/crates/benchmarks/src/measurement.rs b/vendors/move/crates/benchmarks/src/measurement.rs
new file mode 100644
index 000000000..83b10dda9
--- /dev/null
+++ b/vendors/move/crates/benchmarks/src/measurement.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::Criterion;
+use criterion_cpu_time::PosixTime;
+
+pub fn cpu_time_measurement() -> Criterion<PosixTime> {
+    Criterion::default().with_measurement(PosixTime::UserAndSystemTime)
+}
+
+pub fn wall_time_measurement() -> Criterion {
+    Criterion::default()
+}
diff --git a/vendors/move/crates/benchmarks/src/move_vm.rs b/vendors/move/crates/benchmarks/src/move_vm.rs
new file mode 100644
index 000000000..2f03c7e63
--- /dev/null
+++ b/vendors/move/crates/benchmarks/src/move_vm.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::{measurement::Measurement, Criterion};
+use move_binary_format::CompiledModule;
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, CORE_CODE_ADDRESS},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::BlankStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+use once_cell::sync::Lazy;
+use std::path::PathBuf;
+
+static MOVE_BENCH_SRC_PATH: Lazy<PathBuf> = Lazy::new(|| {
+    vec![env!("CARGO_MANIFEST_DIR"), "src", "bench.move"]
+        .into_iter()
+        .collect()
+});
+
+/// Entry point for the bench, provide a function name to invoke in Module Bench in bench.move.
+pub fn bench<M: Measurement + 'static>(c: &mut Criterion<M>, fun: &str) {
+    let modules = compile_modules();
+    let move_vm = MoveVM::new(move_stdlib::natives::all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
+    ))
+    .unwrap();
+    execute(c, &move_vm, modules, fun);
+}
+
+// Compile `bench.move` and its dependencies
+fn compile_modules() -> Vec<CompiledModule> {
+    let mut src_files = move_stdlib::move_stdlib_files();
+    src_files.push(MOVE_BENCH_SRC_PATH.to_str().unwrap().to_owned());
+    let (_files, compiled_units) = Compiler::from_files(
+        src_files,
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()
+    .expect("Error compiling...");
+    compiled_units
+        .into_iter()
+        .map(|unit| match unit {
+            AnnotatedCompiledUnit::Module(annot_unit) => annot_unit.named_module.module,
+            AnnotatedCompiledUnit::Script(_) => {
+                panic!("Expected a module but received a script")
+            },
+        })
+        .collect()
+}
+
+// execute a given function in the Bench module
+fn execute<M: Measurement + 'static>(
+    c: &mut Criterion<M>,
+    move_vm: &MoveVM,
+    modules: Vec<CompiledModule>,
+    fun: &str,
+) {
+    // establish running context
+    let storage = BlankStorage::new();
+    let sender = CORE_CODE_ADDRESS;
+    let mut session = move_vm.new_session(&storage);
+
+    // TODO: we may want to use a real gas meter to make benchmarks more realistic.
+
+    for module in modules {
+        let mut mod_blob = vec![];
+        module
+            .serialize(&mut mod_blob)
+            .expect("Module serialization error");
+        session
+            .publish_module(mod_blob, sender, &mut UnmeteredGasMeter)
+            .expect("Module must load");
+    }
+
+    // module and function to call
+    let module_id = ModuleId::new(sender, Identifier::new("Bench").unwrap());
+    let fun_name = IdentStr::new(fun).unwrap_or_else(|_| panic!("Invalid identifier name {}", fun));
+
+    // benchmark
+    c.bench_function(fun, |b| {
+        b.iter(|| {
+            session
+                .execute_function_bypass_visibility(
+                    &module_id,
+                    fun_name,
+                    vec![],
+                    Vec::<Vec<u8>>::new(),
+                    &mut UnmeteredGasMeter,
+                )
+                .unwrap_or_else(|err| {
+                    panic!(
+                        "{:?}::{} failed with {:?}",
+                        &module_id,
+                        fun,
+                        err.into_vm_status()
+                    )
+                })
+        })
+    });
+}
diff --git a/vendors/move/crates/bytecode-interpreter-crypto/Cargo.toml b/vendors/move/crates/bytecode-interpreter-crypto/Cargo.toml
new file mode 100644
index 000000000..73bada86d
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-crypto/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "bytecode-interpreter-crypto"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+
+# external dependencies
+anyhow = "1.0.71"
+curve25519-dalek.workspace = true
+ed25519-dalek.workspace = true
+sha2.workspace = true
+sha3.workspace = true
diff --git a/vendors/move/crates/bytecode-interpreter-crypto/src/lib.rs b/vendors/move/crates/bytecode-interpreter-crypto/src/lib.rs
new file mode 100644
index 000000000..2bbe1dfc7
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-crypto/src/lib.rs
@@ -0,0 +1,102 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file duplicates the code in the diem-crypto crate to support
+//! - native function implementation for the stackless bytecode interpreter, and
+//! - decoupling of Move crates from Diem crates.
+//!
+//! This is expected to be a temporary solution only. Once we properly
+//! restructure the stackless interpreter like what we did to the Move VM,
+//! native functions will likely be implemented in a Diem crate (most likely
+//! diem-framework) and be passed into the VM for execution. In this way we no
+//! longer need to worry about depending on diem-crypto.
+
+use anyhow::{bail, Result};
+use ed25519_dalek::{
+    PublicKey as Ed25519PublicKey, Signature as Ed25519Signature,
+    PUBLIC_KEY_LENGTH as ED25519_PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH as ED25519_SIGNATURE_LENGTH,
+};
+use sha2::{Digest, Sha256};
+use sha3::Sha3_256;
+use std::cmp::Ordering;
+
+/// The order of ed25519 as defined in [RFC8032](https://tools.ietf.org/html/rfc8032).
+const L: [u8; 32] = [
+    0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+];
+
+// Hash functions
+pub fn sha2_256_of(bytes: &[u8]) -> Vec<u8> {
+    Sha256::digest(bytes).to_vec()
+}
+
+pub fn sha3_256_of(bytes: &[u8]) -> Vec<u8> {
+    Sha3_256::digest(bytes).to_vec()
+}
+
+// Ed25519
+fn validate_public_key(bytes: &[u8]) -> bool {
+    // We need to access the Edwards point which is not directly accessible from
+    // ed25519_dalek::PublicKey, so we need to do some custom deserialization.
+    if bytes.len() != ED25519_PUBLIC_KEY_LENGTH {
+        return false;
+    }
+
+    let mut bits = [0u8; ED25519_PUBLIC_KEY_LENGTH];
+    bits.copy_from_slice(&bytes[..ED25519_PUBLIC_KEY_LENGTH]);
+
+    let compressed = curve25519_dalek::edwards::CompressedEdwardsY(bits);
+    let point = match compressed.decompress() {
+        None => return false,
+        Some(point) => point,
+    };
+
+    // Check if the point lies on a small subgroup. This is required
+    // when using curves with a small cofactor (in ed25519, cofactor = 8).
+    !point.is_small_order()
+}
+
+pub fn ed25519_deserialize_public_key(bytes: &[u8]) -> Result<Ed25519PublicKey> {
+    if !validate_public_key(bytes) {
+        bail!("Invalid public key bytes");
+    }
+    Ok(Ed25519PublicKey::from_bytes(bytes)?)
+}
+
+fn validate_signature(bytes: &[u8]) -> bool {
+    if bytes.len() != ED25519_SIGNATURE_LENGTH {
+        return false;
+    }
+    for i in (0..32).rev() {
+        match bytes[32 + i].cmp(&L[i]) {
+            Ordering::Less => return true,
+            Ordering::Greater => return false,
+            _ => (),
+        }
+    }
+    // As this stage S == L which implies a non canonical S.
+    false
+}
+
+pub fn ed25519_deserialize_signature(bytes: &[u8]) -> Result<Ed25519Signature> {
+    if !validate_signature(bytes) {
+        bail!("Invalid signature bytes");
+    }
+    Ok(Ed25519Signature::from_bytes(bytes)?)
+}
+
+pub fn ed25519_verify_signature(
+    key: &Ed25519PublicKey,
+    sig: &Ed25519Signature,
+    msg: &[u8],
+) -> Result<()> {
+    if !validate_public_key(&key.to_bytes()) {
+        bail!("Malleable public key");
+    }
+    if !validate_signature(&sig.to_bytes()) {
+        bail!("Malleable signature");
+    }
+    Ok(key.verify_strict(msg, sig)?)
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/Cargo.toml b/vendors/move/crates/bytecode-interpreter-testsuite/Cargo.toml
new file mode 100644
index 000000000..841d90517
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "bytecode-interpreter-testsuite"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+
+# diem dependencies
+move-stackless-bytecode-interpreter.workspace = true
+move-command-line-common.workspace = true
+move-prover-test-utils.workspace = true
+move-stdlib.workspace = true
+move-unit-test.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+datatest-stable.workspace = true
+
+[[test]]
+name = "concrete_check_testsuite"
+harness = false
+
+[dependencies]
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.exp
new file mode 100644
index 000000000..1fc1059fd
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.exp
@@ -0,0 +1,12 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::add_ok
+[ PASS    ] 0x2::A::add_overflow
+[ PASS    ] 0x2::A::div_by_zero
+[ PASS    ] 0x2::A::div_ok
+[ PASS    ] 0x2::A::mod_by_zero
+[ PASS    ] 0x2::A::mod_ok
+[ PASS    ] 0x2::A::mul_ok
+[ PASS    ] 0x2::A::mul_overflow
+[ PASS    ] 0x2::A::sub_ok
+[ PASS    ] 0x2::A::sub_underflow
+Test result: OK. Total tests: 10; passed: 10; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.move
new file mode 100644
index 000000000..869b3e623
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/arithmetics.move
@@ -0,0 +1,61 @@
+module 0x2::A {
+    #[test]
+    public fun add_ok(): u8 {
+        let a = 1 + 2;
+        a
+    }
+
+    #[test, expected_failure]
+    public fun add_overflow(): u8 {
+        let a = 255 + 1;
+        a
+    }
+
+    #[test]
+    public fun sub_ok(): u64 {
+        let a = 1 - 1;
+        a
+    }
+
+    #[test, expected_failure]
+    public fun sub_underflow(): u64 {
+        let a = 1 - 2;
+        a
+    }
+
+    #[test]
+    public fun mul_ok(): u8 {
+        let a = 2 * 3;
+        a
+    }
+
+    #[test, expected_failure]
+    public fun mul_overflow(): u8 {
+        let a = 16 * 16;
+        a
+    }
+
+    #[test]
+    public fun div_ok(): u128 {
+        let a = 5 / 2;
+        a
+    }
+
+    #[test, expected_failure]
+    public fun div_by_zero(): u128 {
+        let a = 5 / 0;
+        a
+    }
+
+    #[test]
+    public fun mod_ok(): u128 {
+        let a = 5 % 2;
+        a
+    }
+
+    #[test, expected_failure]
+    public fun mod_by_zero(): u128 {
+        let a = 5 % 0;
+        a
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.exp
new file mode 100644
index 000000000..4096a421a
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::bcs_ops
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.move
new file mode 100644
index 000000000..c6087dbd2
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bcs.move
@@ -0,0 +1,38 @@
+module 0x2::A {
+    use std::bcs;
+
+    #[test]
+    public fun bcs_ops() {
+        // address
+        /* deactivate because of variable address size
+        let addr = @0x89b9f9d1fadc027cf9532d6f99041522;
+        let expected_output = x"89b9f9d1fadc027cf9532d6f99041522";
+        assert!(bcs::to_bytes(&addr) == expected_output, 8001);
+        */
+
+        // bool
+        let b = true;
+        let expected_output = x"01";
+        assert!(bcs::to_bytes(&b) == expected_output, 8002);
+
+        // u8
+        let i = 1u8;
+        let expected_output = x"01";
+        assert!(bcs::to_bytes(&i) == expected_output, 8003);
+
+        // u64
+        let i = 1u64;
+        let expected_output = x"0100000000000000";
+        assert!(bcs::to_bytes(&i) == expected_output, 8004);
+
+        // u128
+        let i = 1u128;
+        let expected_output = x"01000000000000000000000000000000";
+        assert!(bcs::to_bytes(&i) == expected_output, 8005);
+
+        // vector<u8>
+        let v = x"0f";
+        let expected_output = x"010f";
+        assert!(bcs::to_bytes(&v) == expected_output, 8006);
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.exp
new file mode 100644
index 000000000..f2bb3f334
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.exp
@@ -0,0 +1,7 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::bitand
+[ PASS    ] 0x2::A::bitor
+[ PASS    ] 0x2::A::bitxor
+[ PASS    ] 0x2::A::shl
+[ PASS    ] 0x2::A::shr
+Test result: OK. Total tests: 5; passed: 5; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.move
new file mode 100644
index 000000000..22cab2c4b
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/bitwise.move
@@ -0,0 +1,31 @@
+module 0x2::A {
+    #[test]
+    public fun bitand(): u8 {
+        let a = 0x1 & 0x2;
+        a
+    }
+
+    #[test]
+    public fun bitor(): u8 {
+        let a = 0x1 | 0x2;
+        a
+    }
+
+    #[test]
+    public fun bitxor(): u8 {
+        let a = 0x1 ^ 0x2;
+        a
+    }
+
+    #[test]
+    public fun shl(): u8 {
+        let a = 0x1 << 2;
+        a
+    }
+
+    #[test]
+    public fun shr(): u8 {
+        let a = 0x10 >> 2;
+        a
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.exp
new file mode 100644
index 000000000..e7da95feb
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.exp
@@ -0,0 +1,67 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::simple_number_min_range_failure
+[ FAIL    ] 0x2::A::simple_number_range_failure
+[ FAIL    ] 0x2::A::vector_choose_min_unsatisfied_predicate
+[ PASS    ] 0x2::A::vector_choose_success
+[ FAIL    ] 0x2::A::vector_choose_unsatisfied_predicate
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── simple_number_min_range_failure ──────
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/choice.move:56:42
+│    │
+│ 56 │         ensures result <= (choose min x: u64 where x >= 4);
+│    │                                          ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/choice.move:56:17
+│    │
+│ 56 │         ensures result <= (choose min x: u64 where x >= 4);
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── simple_number_range_failure ──────
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/choice.move:49:38
+│    │
+│ 49 │         ensures result <= (choose x: u64 where x >= 4);
+│    │                                      ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/choice.move:49:17
+│    │
+│ 49 │         ensures result <= (choose x: u64 where x >= 4);
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── vector_choose_min_unsatisfied_predicate ──────
+│ error: failed to evaluate expression: choose min fails to satisfy a predicate
+│    ┌─ tests/concrete_check/choice.move:42:68
+│    │
+│ 42 │         let post choice_min = choose min i in 0..len(result) where result[i] == 3;
+│    │                                                                    ^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── vector_choose_unsatisfied_predicate ──────
+│ error: failed to evaluate expression: choose fails to satisfy a predicate
+│    ┌─ tests/concrete_check/choice.move:29:60
+│    │
+│ 29 │         let post choice = choose i in 0..len(result) where result[i] == 3;
+│    │                                                            ^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 1; failed: 4
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.move
new file mode 100644
index 000000000..030bfa1bf
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/choice.move
@@ -0,0 +1,58 @@
+module 0x2::A {
+    use std::vector;
+
+    #[test]
+    public fun vector_choose_success(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_success {
+        let post choice = choose i in 0..len(result) where result[i] == 1;
+        ensures choice == 0 || choice == 2;
+        ensures (choose min i in 0..len(result) where result[i] == 1) == 0;
+    }
+
+    #[test]
+    public fun vector_choose_unsatisfied_predicate(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_unsatisfied_predicate {
+        let post choice = choose i in 0..len(result) where result[i] == 3;
+    }
+
+    #[test]
+    public fun vector_choose_min_unsatisfied_predicate(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_min_unsatisfied_predicate {
+        let post choice_min = choose min i in 0..len(result) where result[i] == 3;
+    }
+
+    #[test]
+    public fun simple_number_range_failure(): u64 { 1 }
+
+    spec simple_number_range_failure {
+        ensures result <= (choose x: u64 where x >= 4);
+    }
+
+    #[test]
+    public fun simple_number_min_range_failure(): u64 { 1 }
+
+    spec simple_number_min_range_failure {
+        ensures result <= (choose min x: u64 where x >= 4);
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.exp
new file mode 100644
index 000000000..437f3b48f
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::compare
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.move
new file mode 100644
index 000000000..0bcfd926a
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/comparison.move
@@ -0,0 +1,8 @@
+module 0x2::A {
+    #[test]
+    public fun compare(): (bool, bool, bool, bool, bool, bool) {
+        let a = 1;
+        let b = 2;
+        (a < b, a <= b, a >= b, a > b, a == b, a != b)
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.exp
new file mode 100644
index 000000000..14fea56e3
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::destroy
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.move
new file mode 100644
index 000000000..46bfd2c07
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/destroy.move
@@ -0,0 +1,19 @@
+module 0x2::A {
+    struct S {
+        f1: bool,
+        f2: u64,
+    }
+
+    #[allow(unused_function)]
+    fun foo(s: &S): u64 {
+        s.f2
+    }
+
+    #[test]
+    public fun destroy(): S {
+        let s = S { f1: true, f2: 42 };
+        let p = &s;
+        let _ = p;
+        s
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.exp
new file mode 100644
index 000000000..48c75830b
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::do_nothing
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.move
new file mode 100644
index 000000000..2279f5987
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/empty.move
@@ -0,0 +1,4 @@
+module 0x2::A {
+    #[test]
+    public fun do_nothing() {}
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.exp
new file mode 100644
index 000000000..f1120823a
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.exp
@@ -0,0 +1,6 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::call_imm_ref
+[ PASS    ] 0x2::A::call_mut_ref
+[ PASS    ] 0x2::A::call_return_mut_ref
+[ PASS    ] 0x2::A::call_val
+Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.move
new file mode 100644
index 000000000..a5a63baa0
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/function_call.move
@@ -0,0 +1,47 @@
+module 0x2::A {
+    public fun handle_val(x: u64): u64 {
+        x + 1
+    }
+
+    public fun handle_imm_ref(x: &u64): u64 {
+        *x + 1
+    }
+
+    public fun handle_mut_ref(x: &mut u64) {
+        *x = 1;
+    }
+
+    public fun return_mut_ref(x: &mut u64): &mut u64 {
+        x
+    }
+
+    #[test]
+    public fun call_val(): u64 {
+        let a = 0u64;
+        handle_val(a)
+    }
+
+    #[test]
+    public fun call_imm_ref(): u64 {
+        let a = 0u64;
+        let b = &a;
+        handle_imm_ref(b)
+    }
+
+    #[test]
+    public fun call_mut_ref(): u64 {
+        let a = 0u64;
+        let b = &mut a;
+        handle_mut_ref(b);
+        a
+    }
+
+    #[test]
+    public fun call_return_mut_ref(): u64 {
+        let a = 0u64;
+        let b = &mut a;
+        let c = return_mut_ref(b);
+        handle_mut_ref(c);
+        a
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.exp
new file mode 100644
index 000000000..30578ec20
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.exp
@@ -0,0 +1,4 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::if_else_1
+[ PASS    ] 0x2::A::if_else_2
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.move
new file mode 100644
index 000000000..7a790d828
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/if_else.move
@@ -0,0 +1,20 @@
+module 0x2::A {
+    #[test]
+    public fun if_else_1(): (u64, u64) {
+        let a = 1;
+        let b = 2;
+        let r = if (a > b) { &mut a } else  { &mut b };
+        *r = 3;
+        (a, b)
+    }
+
+    #[test]
+    public fun if_else_2(): (u64, u64) {
+        let a = 2;
+        let b = 1;
+        let r = if (a > b) { &mut a } else  { &mut b };
+        *r = 3;
+        (a, b)
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.exp
new file mode 100644
index 000000000..5f37c1768
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::load_constant
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.move
new file mode 100644
index 000000000..56ead1551
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant.move
@@ -0,0 +1,8 @@
+module 0x2::A {
+    #[test]
+    public fun load_constant () {
+        let _a = true;
+        let _b = 0u8;
+        let _c = 0x1;
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp
new file mode 100644
index 000000000..cfa142534
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::load_constant_number_literal_u128
+[ PASS    ] 0x2::A::load_constant_number_literal_u64
+[ PASS    ] 0x2::A::load_constant_number_literal_u8
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move
new file mode 100644
index 000000000..4e8006dd4
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move
@@ -0,0 +1,22 @@
+module 0x2::A {
+    #[test]
+    public fun load_constant_number_literal_u8() {
+        let a = 1_0u8;
+        let b: u8 = 10;
+        assert!(a == b, 1);
+    }
+
+    #[test]
+    public fun load_constant_number_literal_u64() {
+        let a = 100_000u64;
+        let b = 100000;
+        assert!(a == b, 1);
+    }
+
+    #[test]
+    public fun load_constant_number_literal_u128() {
+        let a = 100_000_000000000000u128;
+        let b: u128 = 100000000000000000;
+        assert!(a == b, 1);
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.exp
new file mode 100644
index 000000000..404457a9b
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.exp
@@ -0,0 +1,4 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::local_imm_ref
+[ PASS    ] 0x2::A::local_mut_ref
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.move
new file mode 100644
index 000000000..87651fe5a
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/local_ref.move
@@ -0,0 +1,16 @@
+module 0x2::A {
+    #[test]
+    public fun local_imm_ref(): u64 {
+        let a = 0;
+        let b = &a;
+        *b
+    }
+
+    #[test]
+    public fun local_mut_ref(): u64 {
+        let a = 0;
+        let b = &mut a;
+        *b = 1;
+        a
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.exp
new file mode 100644
index 000000000..be28cc6e9
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.exp
@@ -0,0 +1,2 @@
+Running Move unit tests
+Test result: OK. Total tests: 0; passed: 0; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.move
new file mode 100644
index 000000000..81263623f
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/loop.move
@@ -0,0 +1,20 @@
+module 0x2::A {
+    // #[test]
+    public fun loop_ind_var() {
+        let i = 0;
+        while (i < 10) {
+            i = i + 1;
+        };
+    }
+
+    // #[test]
+    public fun loop_ind_ref() {
+        let i = 0;
+        let p = &mut i;
+        while (*p < 10) {
+            *p = *p + 1;
+        };
+    }
+
+    // TODO(mengxu): needs to fill the havoc-ed value
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.exp
new file mode 100644
index 000000000..2552ef2f1
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.exp
@@ -0,0 +1,4 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::pack
+[ PASS    ] 0x2::A::unpack
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.move
new file mode 100644
index 000000000..910546f67
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/pack_unpack.move
@@ -0,0 +1,20 @@
+module 0x2::A {
+    struct S {
+        f1: bool,
+        f2: u64,
+    }
+
+    #[test]
+    public fun pack(): S {
+        S { f1: true, f2: 1 }
+    }
+
+    #[test]
+    public fun unpack(): (bool, u64) {
+        let s = S { f1: true, f2: 1 };
+        let x1: bool;
+        let x2: u64;
+        S { f1: x1, f2: x2 } = s;
+        (x1, x2)
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.exp
new file mode 100644
index 000000000..837a47506
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.exp
@@ -0,0 +1,31 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::check_arithmetics_div0
+[ FAIL    ] 0x2::A::check_arithmetics_mod0
+[ PASS    ] 0x2::A::check_arithmetics_ok
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── check_arithmetics_div0 ──────
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/property/arithmetics.move:17:20
+│    │
+│ 17 │             assert 5 / 0 == 1;
+│    │                    ^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── check_arithmetics_mod0 ──────
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/property/arithmetics.move:24:20
+│    │
+│ 24 │             assert 5 % 0 == 1;
+│    │                    ^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 1; failed: 2
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.move
new file mode 100644
index 000000000..261b66736
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/arithmetics.move
@@ -0,0 +1,27 @@
+module 0x2::A {
+    #[test]
+    public fun check_arithmetics_ok() {
+        spec {
+            // there is no overflow/underflow in spec expressions
+            assert 255u8 + 1u64 == 256u128;
+            assert 1u8 - 2u64 < 0;
+            assert 255u8 * 255u8 == 255u128 * 255u128;
+            assert 5 / 2 == 2;
+            assert 5 % 2 == 1;
+        };
+    }
+
+    #[test]
+    public fun check_arithmetics_div0() {
+        spec {
+            assert 5 / 0 == 1;
+        };
+    }
+
+    #[test]
+    public fun check_arithmetics_mod0() {
+        spec {
+            assert 5 % 0 == 1;
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.exp
new file mode 100644
index 000000000..79084579d
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.exp
@@ -0,0 +1,32 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::check_const_fail
+[ PASS    ] 0x2::A::check_const_pass
+[ FAIL    ] 0x2::A::check_local_fail
+[ PASS    ] 0x2::A::check_local_pass
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── check_const_fail ──────
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/basics.move:12:20
+│    │
+│ 12 │             assert false;
+│    │                    ^^^^^
+│
+│
+└──────────────────
+
+
+┌── check_local_fail ──────
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/basics.move:29:20
+│    │
+│ 29 │             assert a;
+│    │                    ^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 2; failed: 2
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.move
new file mode 100644
index 000000000..416a525dd
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/basics.move
@@ -0,0 +1,33 @@
+module 0x2::A {
+    #[test]
+    public fun check_const_pass() {
+        spec {
+            assert true;
+        };
+    }
+
+    #[test]
+    public fun check_const_fail() {
+        spec {
+            assert false;
+        };
+    }
+
+    #[test]
+    public fun check_local_pass(): bool {
+        let a = true;
+        spec {
+            assert a;
+        };
+        a
+    }
+
+    #[test]
+    public fun check_local_fail(): bool {
+        let a = false;
+        spec {
+            assert a;
+        };
+        a
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.exp
new file mode 100644
index 000000000..6c2d609b3
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.exp
@@ -0,0 +1,25 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::check_bitwise_fail
+[ PASS    ] 0x2::A::check_bitwise_ok
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── check_bitwise_fail ──────
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/bitwise.move:14:20
+│    │
+│ 14 │             assert 0x1u128 ^ 0x2 != 0x3u64;
+│    │                    ^^^^^^^^^^^^^^^^^^^^^^^
+│
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/bitwise.move:15:20
+│    │
+│ 15 │             assert 0x100u64 >> 16 != 0;
+│    │                    ^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.move
new file mode 100644
index 000000000..a61f9af99
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/bitwise.move
@@ -0,0 +1,18 @@
+module 0x2::A {
+    #[test]
+    public fun check_bitwise_ok() {
+        spec {
+            assert 0x1u8 & 0x2u64 == 0u128;
+            assert 0x1u128 | 0x2u64 == 0x3u8;
+            assert 0x1u8 << 8 == 0x100;
+        };
+    }
+
+    #[test]
+    public fun check_bitwise_fail() {
+        spec {
+            assert 0x1u128 ^ 0x2 != 0x3u64;
+            assert 0x100u64 >> 16 != 0;
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.exp
new file mode 100644
index 000000000..a91fe6501
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.exp
@@ -0,0 +1,19 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::check_boolean_fail
+[ PASS    ] 0x2::A::check_boolean_ok
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── check_boolean_fail ──────
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/boolean.move:13:20
+│    │
+│ 13 │             assert true ==> false;
+│    │                    ^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.move
new file mode 100644
index 000000000..b5d71d43b
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/boolean.move
@@ -0,0 +1,16 @@
+module 0x2::A {
+    #[test]
+    public fun check_boolean_ok() {
+        spec {
+            assert true && false == false;
+            assert true || false == true;
+        };
+    }
+
+    #[test]
+    public fun check_boolean_fail() {
+        spec {
+            assert true ==> false;
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.exp
new file mode 100644
index 000000000..1a2f4a264
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::check_call_move
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.move
new file mode 100644
index 000000000..95c27226c
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_move.move
@@ -0,0 +1,33 @@
+module 0x2::A {
+    struct S1 has copy, drop {
+        f1: bool,
+        f2: u64,
+    }
+
+    struct S2<T: copy> has copy, drop {
+        f1: bool,
+        f2: T,
+    }
+
+    #[allow(unused_function)]
+    fun move_plain(s: &S1): u64 {
+        s.f2
+    }
+
+    #[allow(unused_function)]
+    fun move_generic<T: copy>(s: &S2<T>): T {
+        *&s.f2
+    }
+
+    #[test]
+    public fun check_call_move() {
+        let s1 = S1 { f1: true, f2: 42 };
+        let s2 = S2 { f1: false, f2: s1 };
+        let p1 = &s2.f2;
+        let p2 = &s2;
+        spec {
+            assert move_plain(p1) == 42;
+            assert move_generic(p2) == s1;
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.exp
new file mode 100644
index 000000000..33d5251c4
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::check_call_spec
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.move
new file mode 100644
index 000000000..3af06a256
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/call_spec.move
@@ -0,0 +1,31 @@
+module 0x2::A {
+    struct S1 has copy, drop {
+        f1: bool,
+        f2: u64,
+    }
+
+    struct S2<T: copy> has copy, drop {
+        f1: bool,
+        f2: T,
+    }
+
+    spec fun spec_plain(s: S1): u64 {
+        s.f2
+    }
+
+    spec fun spec_generic<T: copy>(s: S2<T>): T {
+        s.f2
+    }
+
+    #[test]
+    public fun check_call_spec() {
+        let s1 = S1 { f1: true, f2: 42 };
+        let s2 = S2 { f1: false, f2: s1 };
+        let p1 = &s2.f2;
+        let p2 = &s2;
+        spec {
+            assert spec_plain(p1) == 42;
+            assert spec_generic(p2) == s1;
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.exp
new file mode 100644
index 000000000..57f195339
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::check_lambda
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.move
new file mode 100644
index 000000000..71dddc672
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/lambda.move
@@ -0,0 +1,16 @@
+module 0x2::A {
+    #[test]
+    public fun check_lambda() {
+        spec {
+            assert f2() == 2;
+        };
+    }
+    spec module {
+        fun f1(f: |u64| u64): u64 {
+            f(1u64)
+        }
+        fun f2(): num {
+            f1(|x| x + 1)
+        }
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.exp
new file mode 100644
index 000000000..9243ecbb2
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::check_struct
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.move
new file mode 100644
index 000000000..100262ec2
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/struct.move
@@ -0,0 +1,18 @@
+module 0x2::A {
+    struct S has drop {
+        f1: bool,
+        f2: u64,
+    }
+
+    #[test]
+    public fun check_struct() {
+        let a = S { f1: true, f2: 42 };
+        let b = S { f1: true, f2: 0 };
+        spec {
+            assert a != b;
+            assert a.f1 == b.f1;
+            assert a == update_field(b, f2, 42);
+            assert b != S { f1: false, f2: 0 };
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.exp
new file mode 100644
index 000000000..4e6547667
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::check_vector
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.move
new file mode 100644
index 000000000..8a91436f1
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/property/vector.move
@@ -0,0 +1,27 @@
+module 0x2::A {
+    use std::vector;
+
+    #[test]
+    public fun check_vector() {
+        let a = vector::empty();
+        let b = vector::empty();
+        spec {
+            assert len(a) == 0;
+            assert a == vec();
+        };
+
+        vector::push_back(&mut a, 42u128);
+        vector::push_back(&mut b, 0u128);
+        spec {
+            assert len(a) == 1;
+            assert a == vec(42);
+            assert a[0] == 42;
+            assert contains(a, 42);
+            assert index_of(a, 42) == 0;
+            assert update(b, 0, 42) == a;
+            assert concat(a, b) == concat(vec(42), vec(0));
+            assert in_range(a, 0);
+            assert !in_range(b, 2);
+        };
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.exp
new file mode 100644
index 000000000..eea1d1a1d
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.exp
@@ -0,0 +1,49 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::init_vector_failure
+[ PASS    ] 0x2::A::init_vector_success
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── init_vector_failure ──────
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/quantifier.move:27:27
+│    │
+│ 27 │         ensures exists i: u64 where (i == len(result) - 1): result[i] == 1;
+│    │                           ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/quantifier.move:27:17
+│    │
+│ 27 │         ensures exists i: u64 where (i == len(result) - 1): result[i] == 1;
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/quantifier.move:28:27
+│    │
+│ 28 │         ensures exists i: u64: (i == len(result) - 1) ==> result[i] == 1;
+│    │                           ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/quantifier.move:28:17
+│    │
+│ 28 │         ensures exists i: u64: (i == len(result) - 1) ==> result[i] == 1;
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/quantifier.move:29:27
+│    │
+│ 29 │         ensures exists i: u64: result[i] == 1;
+│    │                           ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/quantifier.move:29:17
+│    │
+│ 29 │         ensures exists i: u64: result[i] == 1;
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.move
new file mode 100644
index 000000000..aeff92fdd
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/quantifier.move
@@ -0,0 +1,31 @@
+module 0x2::A {
+    use std::vector;
+
+   #[test]
+    public fun init_vector_success(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        v
+    }
+
+    spec init_vector_success {
+        ensures forall num in result: num > 0;
+        ensures exists num in result: num == 2;
+        ensures exists i in 0..len(result): result[i] == 1;
+    }
+
+    #[test]
+    public fun init_vector_failure(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        v
+    }
+
+    spec init_vector_failure {
+        ensures exists i: u64 where (i == len(result) - 1): result[i] == 1;
+        ensures exists i: u64: (i == len(result) - 1) ==> result[i] == 1;
+        ensures exists i: u64: result[i] == 1;
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.exp
new file mode 100644
index 000000000..6fe1a0517
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::return_ref_path
+[ PASS    ] 0x2::A::return_ref_path_vec_1
+[ PASS    ] 0x2::A::return_ref_root
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.move
new file mode 100644
index 000000000..93d1d22d6
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/return_mut_ref.move
@@ -0,0 +1,63 @@
+module 0x2::A {
+    use std::vector;
+
+    struct X has copy, drop { value: u64 }
+    struct Y has copy, drop { value: u64 }
+    struct Z has copy, drop { value: u64, x: X }
+    struct V has copy, drop { is: vector<u64>, ts: vector<X> }
+
+    // Return reference with different root
+    fun return_ref_different_root(cond: bool, x: &mut X, y: &mut Y): &mut u64 {
+        if (cond) &mut x.value else &mut y.value
+    }
+
+    #[test]
+    public fun return_ref_root(): (X, Y) {
+        let x = X { value: 1 };
+        let y = Y { value: 2 };
+        let p = return_ref_different_root(true, &mut x, &mut y);
+        *p = 5;
+        let q = return_ref_different_root(false, &mut x, &mut y);
+        *q = 6;
+        (x, y)
+    }
+
+    // Return reference with different path
+    fun return_ref_different_path(cond: bool, z: &mut Z): &mut u64 {
+        if (cond) &mut z.value else &mut z.x.value
+    }
+
+    #[test]
+    public fun return_ref_path(): (Z, Z) {
+        let z1 = Z { value: 1, x: X { value: 2 } };
+        let p = return_ref_different_path(true, &mut z1);
+        *p = 5;
+        let z2 = Z { value: 1, x: X { value: 2 } };
+        let q = return_ref_different_path(false, &mut z2);
+        *q = 6;
+        (z1, z2)
+    }
+
+    // Return reference with different path in vec
+    fun return_ref_different_path_vec(cond: bool, v: &mut V, i1: u64, i2: u64): &mut u64 {
+        if (cond) {
+            vector::borrow_mut(&mut v.is, i1)
+        } else {
+            vector::borrow_mut(&mut v.is, i2)
+        }
+    }
+
+    #[test]
+    public fun return_ref_path_vec_1(): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        let v = V { is, ts };
+        let p = return_ref_different_path_vec(true, &mut v, 0, 1);
+        *p = 5;
+        let q = return_ref_different_path_vec(false, &mut v, 0, 1);
+        *q = 6;
+        v
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.exp b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.exp
new file mode 100644
index 000000000..98bef1228
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::vector_ops
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.move b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.move
new file mode 100644
index 000000000..216d4ab21
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check/vector.move
@@ -0,0 +1,35 @@
+module 0x2::A {
+    use std::vector;
+
+    struct Foo has drop {}
+    struct Bar {}
+
+    fun test_natives<T>(x1: T, x2: T): (T, T) {
+        let v: vector<T> = vector::empty();
+        assert!(vector::length(&v) == 0, 100);
+        vector::push_back(&mut v, x1);
+        assert!(vector::length(&v) == 1, 101);
+        vector::push_back(&mut v, x2);
+        assert!(vector::length(&v) == 2, 102);
+        vector::swap(&mut v, 0, 1);
+        x1 = vector::pop_back(&mut v);
+        assert!(vector::length(&v) == 1, 103);
+        x2 = vector::pop_back(&mut v);
+        assert!(vector::length(&v) == 0, 104);
+        vector::destroy_empty(v);
+        (x1, x2)
+    }
+
+    #[test]
+    public fun vector_ops() {
+        test_natives<u8>(1u8, 2u8);
+        test_natives<u64>(1u64, 2u64);
+        test_natives<u128>(1u128, 2u128);
+        test_natives<bool>(true, false);
+        test_natives<address>(@0x1, @0x2);
+
+        test_natives<vector<u8>>(vector::empty(), vector::empty());
+        test_natives<Foo>(Foo {}, Foo {});
+        (Bar {}, Bar {}) = test_natives<Bar>(Bar {}, Bar {});
+    }
+}
diff --git a/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check_testsuite.rs b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check_testsuite.rs
new file mode 100644
index 000000000..329ac0773
--- /dev/null
+++ b/vendors/move/crates/bytecode-interpreter-testsuite/tests/concrete_check_testsuite.rs
@@ -0,0 +1,40 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{env, path::Path};
+
+use move_command_line_common::{env::read_bool_env_var, testing::EXP_EXT};
+use move_prover_test_utils::baseline_test::verify_or_update_baseline;
+use move_stdlib::move_stdlib_files;
+use move_unit_test::UnitTestingConfig;
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    env::set_var("NO_COLOR", "1");
+
+    let source_files = vec![path.to_str().unwrap().to_owned()];
+    let config = UnitTestingConfig {
+        gas_limit: Some(5000),
+        num_threads: 1,
+        source_files,
+        dep_files: move_stdlib_files(),
+        check_stackless_vm: true,
+        verbose: read_bool_env_var("VERBOSE"),
+        named_address_values: move_stdlib::move_stdlib_named_addresses()
+            .into_iter()
+            .collect(),
+
+        ..UnitTestingConfig::default_with_bound(None)
+    };
+
+    let test_plan = config.build_test_plan().unwrap();
+    let mut buffer = vec![];
+    config.run_and_report_unit_tests(test_plan, None, None, &mut buffer)?;
+    let output = String::from_utf8(buffer)?;
+
+    let baseline_path = path.with_extension(EXP_EXT);
+    verify_or_update_baseline(&baseline_path, &output)?;
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests/concrete_check", r".*\.move$");
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/.gitignore b/vendors/move/crates/bytecode-verifier-libfuzzer/.gitignore
new file mode 100644
index 000000000..a0925114d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/.gitignore
@@ -0,0 +1,3 @@
+target
+corpus
+artifacts
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/Cargo.toml b/vendors/move/crates/bytecode-verifier-libfuzzer/Cargo.toml
new file mode 100644
index 000000000..23ba1eb8c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "bytecode-verifier-libfuzzer"
+version = "0.0.0"
+authors = ["Diem Association <opensource@diem.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys.workspace = true
+arbitrary.workspace = true
+move-bytecode-verifier.workspace = true
+move-core-types = { workspace = true, features = ["fuzzing"] }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+
+# Prevent this from interfering with workspaces
+#[workspace]
+#members = ["."]
+
+[[bin]]
+name = "code_unit"
+path = "fuzz_targets/code_unit.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "compiled_module"
+path = "fuzz_targets/compiled_module.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "mixed"
+path = "fuzz_targets/mixed.rs"
+test = false
+doc = false
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/README.md b/vendors/move/crates/bytecode-verifier-libfuzzer/README.md
new file mode 100644
index 000000000..633a4797a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/README.md
@@ -0,0 +1,4 @@
+See the [Rust fuzzing book](https://rust-fuzz.github.io/book/)
+for how to use the fuzz targets in this directory. Notice that
+`cargo +nightly fuzz run <target>` need to be executed in the parent
+directory; nightly is required.
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/code_unit.rs b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/code_unit.rs
new file mode 100644
index 000000000..7548af284
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/code_unit.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex,
+    SignatureToken::{Address, Bool, U128, U64},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|code_unit: CodeUnit| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/compiled_module.rs b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/compiled_module.rs
new file mode 100644
index 000000000..ea2859b19
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/compiled_module.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use libfuzzer_sys::fuzz_target;
+use move_binary_format::file_format::CompiledModule;
+
+fuzz_target!(|module: CompiledModule| {
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/mixed.rs b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/mixed.rs
new file mode 100644
index 000000000..fb2bc6edc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-libfuzzer/fuzz_targets/mixed.rs
@@ -0,0 +1,97 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, Bytecode, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex, SignatureToken,
+    SignatureToken::{Address, Bool},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use arbitrary::Arbitrary;
+use libfuzzer_sys::fuzz_target;
+
+#[derive(Arbitrary, Debug)]
+struct Mixed {
+    code: Vec<Bytecode>,
+    abilities: AbilitySet,
+    param_types: Vec<SignatureToken>,
+    return_type: Option<SignatureToken>,
+}
+
+fuzz_target!(|mix: Mixed| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: mix.abilities,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(mix.param_types));
+    module.signatures.push(Signature(
+        mix.return_type.map(|s| vec![s]).unwrap_or_default(),
+    ));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: mix.code,
+        locals: SignatureIndex(0),
+    };
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/crates/bytecode-verifier-tests/Cargo.toml b/vendors/move/crates/bytecode-verifier-tests/Cargo.toml
new file mode 100644
index 000000000..8f09b316f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "bytecode-verifier-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem bytecode verifier tests"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+petgraph.workspace = true
+proptest.workspace = true
+fail = { workspace = true, features = ["failpoints"] }
+hex.workspace = true
+
+invalid-mutations.workspace = true
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier.workspace = true
+move-core-types.workspace = true
+move-vm-config.workspace = true
+
+[features]
+fuzzing = ["move-binary-format/fuzzing"]
+
+[dependencies]
diff --git a/vendors/move/crates/bytecode-verifier-tests/METER_TESTING.md b/vendors/move/crates/bytecode-verifier-tests/METER_TESTING.md
new file mode 100644
index 000000000..2f1865f6e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/METER_TESTING.md
@@ -0,0 +1,5 @@
+This testsuite can be run in a specific way to print the time until a 'complex' program is detected or accepted. Call as in:
+
+```
+cargo test --release -- --nocapture 1>/dev/null
+```
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/lib.rs b/vendors/move/crates/bytecode-verifier-tests/src/lib.rs
new file mode 100644
index 000000000..211d2cd3a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/lib.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+#[cfg(test)]
+pub mod support;
+
+#[cfg(test)]
+pub mod unit_tests;
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/support/mod.rs b/vendors/move/crates/bytecode-verifier-tests/src/support/mod.rs
new file mode 100644
index 000000000..5b55cfc59
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/support/mod.rs
@@ -0,0 +1,36 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, IdentifierIndex,
+        ModuleHandleIndex, SignatureIndex,
+    },
+    CompiledModule,
+};
+
+/// Create a dummy module to wrap the bytecode program in local@code
+pub fn dummy_procedure_module(code: Vec<Bytecode>) -> CompiledModule {
+    let mut module = empty_module();
+    let code_unit = CodeUnit {
+        code,
+        ..Default::default()
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        ..Default::default()
+    };
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+    module.function_defs.push(fun_def);
+    module
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs
new file mode 100644
index 000000000..08bbdca20
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::ability_field_requirements;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_ability_transitivity(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(ability_field_requirements::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/binary_samples.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
new file mode 100644
index 000000000..2c506070c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Tests in here are based on binary representation of modules taken from production. Those tests
+//! may fail over time if the representation becomes out of date, then they can be removed.
+//! Right now the serve to calibrate the metering working as expected. Those tests represent
+//! cases which we want to continue to succeed.
+
+use crate::unit_tests::production_config;
+use move_binary_format::{errors::VMResult, CompiledModule};
+use move_bytecode_verifier::{meter::BoundMeter, verifier};
+
+#[allow(unused)]
+fn run_binary_test(name: &str, bytes: &str) -> VMResult<()> {
+    let bytes = hex::decode(bytes).expect("invalid hex string");
+    let m = CompiledModule::deserialize_with_defaults(&bytes).expect("invalid module");
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    verifier::verify_module_with_config_for_test(name, &config, &m, &mut meter)
+}
+
+#[test]
+fn sample_price_oracle() {
+    let code =
+    "a11ceb0b050000000c01001602162003368a0104c0011405d401a80607fc07f90308f50b6006d50c9b3210f03e770ae73f170cfe3f951e0d935e060000010101020103010401050006020702080209020a000b0800000c0800080d070004170402030100010318070009190700071c0700000e000100000f0201010000100201010000110302000012030200001304020000140506000015050600080f080900071d0a0100081e080900071f0a0b0007200a010006210c01000122020f01000123020c01000424110b020300042511120203000a261314000527020f0100022803180004290219020304092a1a1b00032b1a0f00042c1c02020302020e0e0e0f0e10101110130e1016111615101810020608020201030001060c02060c0304030103010203010908060303080603010301030106080201080601060806010101020502060800080508040802010900010804020804080502060b0302090009010900010609010208050301080202080406080102080403ae010a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a02080508000708000a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050105010b030209000901010a0201080503070b0302090009010900090193010508000708000a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a02080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805010708000b03030101010301030103010b01030101010301030103010c70726963655f6f7261636c6504636f696e067369676e657206737472696e67057461626c6509747970655f696e666f046d617468036936340570726963651070726963655f6964656e74696669657204707974681250726963654964656e7469666965724d61700e54657374507269636553746f72650550726963650c666f726d61745f7072696365096765745f7072696365126765745f70726963655f666f725f746573740a696e697469616c697a6512696e697469616c697a655f746573746e6574127365745f7468726573686f6c645f73656373107369676e65645f7536345f6d696e75730f7369676e65645f7536345f706c757304696e666f055461626c6506537472696e670f50726963654964656e7469666965720e7468726573686f6c645f736563730b70726963655f7461626c6503493634196765745f6d61676e69747564655f69665f706f736974697665086765745f6578706f0f6765745f69735f6e65676174697665196765745f6d61676e69747564655f69665f6e6567617469766506706f775f31300673796d626f6c08646563696d616c7308636f6e7461696e7306626f72726f77176765745f70726963655f6e6f5f6f6c6465725f7468616e09747970655f6e616d650a616464726573735f6f66036e65770d66726f6d5f627974655f76656304757466380675707365727414812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed00000000000000000000000000000000000000000000000000000000000000017e783b349d3e89cf5931af376ebeadbfab855b3fa239b7ada8f5a92fbea6b3870308700000000000000003086d0000000000000003086e0000000000000003081000000000000000052014812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed0a0221202b9ab1e972a281585084148ba1389800799bd4be63b957507db1349314e474450a020504414156450a022120bd640cddb72063e2ede34c6a0baf6699759b9837fcb06aa0e2fbcecb9b65fde70a02040341434d0a0221202a01deaec9e51a579277b34b122399984d0bbf57e2458a7e42fecd2829867a0d0a0204034144410a022120fa17ceaf30d19ba51112fdcc750cc83454776f47fb0112e4af07f15f4bb1ebc00a020504414c474f0a0221206d0af467543fc7daedf7abed96423877560c8d03725f3e5c87516774982a679c0a020403414e430a02212015add95022ae13563a11992e727c91bdb6b55bc183d9d747436c80a483d8c8640a0204034150450a02212003ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d50a0204034150540a022120b881c6dad5dd3dc9a83222f8032fb439859288119afc742d43adc305cef151cc0a0204034153520a022120681e0eb7acf9a2a3384927684d932560fb6f67c6beb21baa0f110e993b2653860a02060541544c41530a0221208ff1200345393bb25be4f4eeb2d97234e91f7e6213f3745a694b1436e700f2710a02040341544d0a022120b00b60f88b03a6a625a8d1c048c3f66653edf217439983d037e7222c4e6128190a02050441544f4d0a0221204cbd623d7aa47003fff1cd75c3f96cb24a660014b697d91cfb7adcd204b952020a020504415553540a02212093da3352f9f1d105fdfe4971cfa80e9dd777bfc5d0f683ebb6e1294b92137bb70a020504415641580a022120b7e3904c08ddd9c0c10c6d207d390fd19e87eb6aab96304f571ed94caebdefa00a0204034158530a0221209d23a47f843f5c9284832ae6e76e4aa067dc6072a58f151d39a65a4cc792ef9f0a0204034241520a0221203dd2b63686a450ec7290df3a1e0b583c0481f651351edfa7636f39aed55cf8a30a0204034243480a0221207f981f906d7cfe93f618804f1de89e0199ead306edc022d3230b3e8305f391b00a020504424554480a0221202f95862b045670cd22bee3114c39763a4a08beeb663b145d283c31d7d1101c4f0a020403424e420a0221201ce9069708fb49e2f1b062fa4f1be0bb151475ca506939d6d8c14386d49f43dc0a02040342525a0a022120e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b430a0204034254430a022120097d687437374051c75160d648800f021086bc8edf469f11284491fda81923150a0204034254540a0221205bc91f13e412c07599167bae86f07543f076a638962b8d6017ec19dab4a828140a020504425553440a0221202dd14c7c38aa7066c7a508aac299ebcde5165b07d5d9f2d94dfbfe41f0bc5f2e0a0204034339380a0221202356af9529a1064d41e32d617e2ce1dca5733afa901daba9e2b68dee5d53ecf90a02050443414b450a02212015ecddd26d49e1a8f1de9376ebebc03916ede873447c1255d2d5891b92ce57170a02060543424554480a022120bd4dbcbfd90e6bc6c583e07ffcb5cb6d09a0c7b1221805211ace08c8378596270a0204034348520a022120e799f456b358a2534aa1b45141d454ac04b444ed23b1440b778549bb758f2b5c0a02040343485a0a0221209c479b12a2b2c1051715d4d462dd7a6abbb6dccabf3af31a53f6130a1cd88efc0a020504434954590a0221208517b35589b5f1f6ad626da2379ff592d5101b63aa661d75b7a883fdbda023f00a020504434f50450a0221204e53c6ef1f2f9952facdcf64551edb6d2a550985484ccce6a0477cae4c1bca3e0a020403434f570a0221208f218655050a1476b780185e89f19d2b1e1f49e9bd629efad6ac547a946bf6ab0a020504435553440a022120b0948a5e5313200c632b51bb5ca32f6de0d36e9950a942d19751e833f70dabfd0a0204034441490a022120dcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c0a020504444f47450a022120ca3eed9b267293f6595901c734c7525ce8ef49adafe8284606ceb307afa2ca5b0a020403444f540a022120ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace0a0204034554480a022120c80657b7f6f3eac27218d09d5a4e54e47b25768d9f5e10ac15fe2cf9008814000a020504464944410a0221202fb245b9a84554a0f15aa123cbb5f64cd263b59e9a87d80148cbffab50c69f300a020504464c4f570a0221205c6c0d2386e3352356c3ab84434fafb5ea067ac2678a38a338c4a69ddc4bdb0c0a02040346544d0a0221206c75e52531ec5fd3ef253f6062956a8508a2f03fa0a209fb7fbc51efd9d35f880a0204034654540a022120301377b122716cee1a498e7930a1836c0b1db84667cc78bbbcbad6c330ea6afb0a02040347414c0a0221200781209c28fda797616212b7f94d77af3a01f3e94a5d421760aef020cf2bcb510a02050447414c410a022120baa284eaf23edf975b371ba2818772f93dbae72836bbdea28b07d40f3cf8b4850a020403474d540a0221206034b1f68b9363dff2cf9d53b1a88fb4d0929c65f34d532db53738853efc00ad0a020504474f46580a02212095609d32c98a467a72ac419f2e64bb2b8dbd5b00b74f3a0fd72f42343af1743d0a0205044858524f0a0221207a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff5920a020403494e4a0a022120a4702f0f5818258783a1e47f453cb20b0fbec32ca67260e1d19dfcdd6a4d0ebb0a020605494e5445520a02212081a21b01c15b8d01f6cdfed65e00987cc4c901858c821b2089344987de3102e90a0204034a45540a022120ee42016c303126bd9263724e00f83a8114e84518c6e8ffc9738c001cc301daff0a0204034a53540a022120abe4f2b264560a397f38eec024369356e5c1ea4f7aab94729369f144b3d977790a0204034a55560a022120d1d95644ffc11ca502f21e067a7814144c56b37018515ced4335a886a827a3050a0206054c415a494f0a0221206e3f3fa8253588df9326580180233eb791e03b443a3ba7a1d892e73874e19a540a0204034c54430a022120e6ccd3f878cf338e6732bf59f60943e8ca2c28402fc4d9c258503b2edbe74a310a0205044c554e410a0221204456d442a152fd1f972b18459263ef467d3c29fb9d667e30c463b086691fbc790a0205044c554e430a0221205de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac520a0206054d415449430a0221201888f463c27997174f97d2a36af29bf4648b61a5f69e67c45505a80f826bb7850a0205044d424f580a02212027d108eb764c912f49d3453a21dd95516619b1c45d0b607ee58a137ac8a6f32d0a0205044d45414e0a022120dfaeafde7f8ad3cb9ddbcc85ed7ae7e53910e7ab377fd75921920f97c80a8edc0a0204034d45520a0221200b46c1c04e9c914037cc4e0561a7e6787f6db0b89b7b65281f0f6fea1ce45a740a0204034d49520a0221205b70af49d639eefe11f20df47a0c0760123291bb5bc55053faf797d1ff9059830a0205044d4e474f0a022120c2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a40a0205044d534f4c0a022120c415de8d2eba7db216527dff4b60e8f3a5311c740dadb233e13e12547e2267500a0205044e4541520a02212005934526b94a9fbe4c4ce0c3792213032f086ee4bf58f2168a7085361af9bdc10a0203024f470a022120c572690504b42b57a3f7aed6bd4aae08cbeeebdadcf130646a692fe73ec1e0090a0204034f4e450a02212037505261e557e251290b8c8899453064e8d760ed5c65a779726f2490980da74c0a0205044f5243410a0221200afa3199e0899270a74ddcf5cc960d3c6c4414b4ca71024af1a62786dd24f52a0a020504504f52540a02212088e2d5cbd2474766abffb2a67a58755a2cc19beb3b309e1ded1e357253aa36230a020605504f52544f0a0221203d253019d38099c0fe918291bd08c9b887f4306a44d7d472c8031529141f275a0a0204035053470a022120fd0690232b0fae5efdc402c1b9aac74176383ff7daf87d021554bda24a38e0ec0a020504524143410a02212091568baa8beb53db23eb3fb7f22c6e8bd303d103919e19733f2bb642d3e7987a0a0204035241590a0221206ed3c7c4427ae2f91707495fc5a891b30795d93dbb3931782ddd77a5d8cb6db70a0204035342520a0221201021a42d623ab4fe0bf8c47fd21cc10636e39e07f91e9b2478551e137d512aaa0a02070653434e534f4c0a022120f8d030e4ef460b91ad23eabbbb27aec463e3c30ecc8d5c4b71e92f54a36ccdbd0a020504534c4e440a0221209fb0bd29fe51481b61df41e650346cc374b13c2bab2e3610364cd834a592025a0a020403534e590a022120ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d0a020403534f4c0a02212023245bb74254e65a98cc3ff4a37443d79f527e44e449750ad304538b006f21bc0a02040353524d0a022120a1a6465f4c2ebf244c31d80bc95c27345a3424e428c2def33eced9e90d3f701b0a0206055354534f4c0a0221204457960559b812558bb0f8cb7912f8bcb843eb801a3133ef45be998630ff8c050a020403544c4d0a022120433faaa801ecdb6618e3897177a118b273a8e18cc3ff545aadfc207d58d028f70a020504545553440a022120eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a0a020504555344430a0221202b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b0a020504555344540a022120ef94acc2fb09eb976c6eb3000bab898cab891d5b800702cd1dc88e61d7c3c5e60a020504555354430a0221207507a4629ad0143550666bce2e7cae0b961a0f624f821feaab642fe1be632f5c0a0204035641490a022120b216f7ca372b318985903866e0b6dc44a14564828c49f36d0d363805aa76335c0a02040357494e0a022120b82449fd728133488d2d41131cffe763f9c1693b73c544d9ef6aaa371060dd250a020403574f4f0a022120831624f51c7bd4499fe5e0f16dfa2fd22584ae4bdc496bbbbe9ba831b2d9bce90a0204035856530a02212026852e2d0696e25e6adaad2d7ca3a1f2f15aab68d317ace14d41b4128a7e780f0a0204035a42430a022120d6b3bc030a8bbb7dd9de46fb564c34bb7f860dead8985eb16a49cdc62f8ab3a50a02212073dc009953c83c944690037ea477df627657f45c14f16ad3a61089c5a3f9f4f20a02212008f781a893bc9340140c5f89c8a96f438bcfae4d1474cc0f688e3a52892c73180a0221204204a764d9e0ca8db0fd43b62728265bf82671ce8a8b4bfedba13672be12de620a022120cb1743d0e3e3eace7e84b8230dc082829813e3ab04e91b503c08e9a441c0ea8b0a02212044a93dddd8effa54ea51076c4e851b6cbbfd938e82eb90197de38fe8876bb66e0a022120c11efd88a9b2c96bc84bccd6ce4aa05bebad7aa760dbe5f2f00ef90c4abd50cc0a02212061226d39beea19d334f17c2febce27e12646d84675924ebb02b9cdaea68727e30a022120d7566a3ba7f7286ed54f4ae7e983f4420ae0b1e0f3892e11f9c4ab107bbad7b90a02212030029479598797290e3638a1712c29bde2367d0eca794f778b25b5a472f192de0a022120fc309467defa4b198c6b5bd59c08db4b9dfb27ddbcc32f31560f217b4ff8fc2b0a022120ecf553770d9b10965f8fb64771e93f5690a182edc32be4a3236e0caaa6e0581a0a022120457064c555edae5b6b89267e992be4c58be5375f0e9ca9749391c7094f7d90330a022120f9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b0a022120eb3b5720301b36fa074260e6e27e2cfff3a7c6bbb47564eb218a9a7f2a8c01930a02212006c532524fabd49cc142815502d785e4f34ec3bd035480efb770568d423f46c60a022120c098773aa18ebb7e84d5ee7ea7d97105ab2015a329f670012398cd2c8f5cc6ca0a0221200d10b9ccdc9af1d65cd4bafabf4e34db01c0ce83abba190230eaf26d7592cd210a022120970541e943e11d1bf1d4d763bc8e70995f613dc682f727045a866312312a63760a02212013ac8c71e4e1c61dece57bea76163d393bf75cd0db8e52981e1564fa592698cb0a022120b59d65c2e10af17c0d6f7d10be8d64c0c13dd15d957c4c39763b4cc55e5919370a02212087a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de4120a02212031775e1d6897129e8a84eeba975778fb50015b88039e9bc140bbd839694ac0ae0a02212036032e522b810babd8e3148e9f0d588af9e95e93b97ffb58566b837fdbd31f7f0a022120ca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a60a0221206660d7629213995af8aa169ad6a1cf1a725765d3741b7e7a27825f884a701b960a022120aa67a6594d0e1578faa3bba80bec5b31e461b945e4fbab59eeab38ece09335fb0a0221209b7bfd7654cbb80099d5edc0a29159afc9e9b4636c811cf8c3b95bd11dd8e3dd0a0221200184a60a47ab7c23fcb828d727b05748ef52433fb5ae96f775cc98c9049d8c2c0a0221206354d685c247f1efc36f967617beffa2ebd5a95d8ffe17de4498505c923067b80a02212021adabf73ad61903c1872fa220f84d3b1b9990cec2047f8317e2a67efcd1764e0a022120c999fe8a75bf9528931deb832e2934dd1ac138757d7f2c1398675b6f521d556f0a02212087fd5a8d0bf026239f98b53311d2cec2ee171e853f545e1ad742e092a97ef8600a02212051ae9b785e6aeb288955720faef15f63ee3ae21af38114ade8b3fc3d3831b5ad0a0221202d9315a88f3019f8efa88dfe9c0f0843712da0bac814461e27733f6b83eb51b30a0221202245aec1db780b8dc9f710173256996164f0a65f25a975453e4202a54371d2ea0a022120077e345652cb98edba89815a63a0ede724eba12d7a10c8498e0e762d581aca6b0a022120997e0bf451cb36b4aea096e6b5c254d700922211dd933d9d17c467f0d6f343210a022120677dbbf4f68b5cb996a40dfae338b87d5efb2e12a9b2686d1ca16d69b3d7f2040a0221206de025a4cf28124f8ea6cb8085f860096dbc36d9c40002e221fc449337e065b20a022120d2c2c1f2bba8e0964f9589e060c2ee97f5e19057267ac3284caef3bd50bd2cb50a02212070bf2974182b6ebf4eac64977170074315e7a07d7b58a963758060924ee9a1920a0221209f2acb902ee5c3a8e41c643164a498ed3089c99df3477189babd3682801340750a02212052800482aa2666c0d2621f8f0a8c19ee6e5e5039a65524e268315501b3355fbb0a0221202f317bea04ce89adb8acc85a1a68d20d6e89976d5e86306570a0bb3107e4916a0a022120b5366e5ded52c3db5d81635a624a39d81eb8c639427fc79c539e5c91e17c84940a0221207f57ca775216655022daa88e41c380529211cde01a1517735dbcf30e4a02bdaa0a02212027e867f0f4f61076456d1a73b14c7edc1cf5cef4f4d6193a33424288f11bd0f40a0221209b245faf19d2f3306b58821ef60b194d7b67eb5250635059d8eaae4a36337b280a02212085dafbfa99c733fdd33649551666958ca8f82fd0d849746e093b770caab249d20a0221206b86b78584e182c61729267d73593f48b6a929f3218234769281513cbe5e87ee0a0204035041490a0221201e761bb4e6b1e4d7899b618d389516ddbdfbdb858018b71c45cb6ade57c96f620a0221207730809b4a4656325b7fbc8157fd803c3da170727c541afc4db37773246258b10a022120cb9372930932694b8a74dd5599c0f9e236575f434faf05141d95803a91f044ed0a022120341d9502b1e6bc445036fd76f57bc824c09254a754289878b52a40eb067d2a0b0a022120f9917668f24038a383e51c0b019f5d9645d6785c6bf9a0d48483edf82ba5caec0a022120dd51a67a1b4d0702abf5b5385631b7d3e586993eadacf2e0d900c0a81edcffdd0a022120b5d2cee0b86bb0571db898ae7b9f288c5e272fa486d41a5bf375b52a0249d94c0a022120fe650f0367d4a7ef9815a593ea15d36593f0643aaaf0149bb04be67ab851decd0a02212078ec25615d53d2486db101e829f77615c4408cbbd543088714b9f267da44591a0a022120b718e659619a031b41c6ea9122f146859a82d4a7edc17c55b1e5188e8b4c1d1c0a020504535445500a02212013f7925c9186b8cca50dde4bbf2d4fa9705052cceb6f2fc79df827e2b37d6f3b0a0221200adbf6463e27f60f171bcc498703a4282d1954ec3a85e1f6698b48ecde18c00e0a0221201bd1c59cd425aebf8a931c1b2a902b9a11e7d18dc68021e4a35a5cf24220a6c70a02212041f3625971ca2ed2263e78573fe5ce23e13d2558ed3f2e47ab0f84fb9e7ae7220a0221201fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c15880a022120026d1f1cf9f1c0ee92eb55696d3bd2393075b611c4f468ae5b967175edc4c25c0a022120eca4f9c5ce7cbef8a349fa9f6c12b23ac45b9ad91c4d1808c6a2dda841f95a020a022120834d3f05278b6f5c963670f437a2267c160914707328f888418902106bcd13d70a022120bf517e0f7ccfc307f0b2fa93b99a737641933989af6af769c928725989c21e660a0221206ff709bf1f0fdb46d991ae6839163df1e050d143429d737fc650b6b2143478080a02212064abe8a459058c60d55427f62be3dc4942c0ba93d1eb5cb85117b70b8e4651ad126170746f733a3a6d657461646174615f763063036d000000000000001a4552525f4e4f545f454e4f5547485f5045524d495353494f4e53006e00000000000000134552525f544f4b454e5f4e4f545f464f554e44007000000000000000174552525f414c52454144595f494e495449414c495a454400000202160b0302080408051a030102011b0b03020804030000000007440a0011080c020e0211090c080b00110a0c050600000000000000000c0a090c090b0a0b0907030911070c090c0a0e05110b0c070a07031a051e0e05110c0c0305210e0511090c030b030c060b0a0b090b060b0711070c090c0a0b0a0b090b01340911060c090c0a0b090335053c0b080b0a33110d1a0c0405420b080b0a33110d180c040b04020101000200010d26070429010304050638000238010c0338020c0007042b000c010a0110000a03380303160b01010702270a0110000b033804140c020b020b0110011411120c040e040b001100020200000101151438050c0007042b010c010a0110020a003806030e0b01010702270b0110020b0038071402030104010017a4060a00111407042103090b00010701270a00111429002003120b00010700273808063c0000000000000012000c6b0a000b6b2d000b0011142a000c6c070511160c020a6c0f00070611170b023809070711160c040a6c0f00070811170b043809070911160c060a6c0f00070a11170b063809070b11160c080a6c0f00070c11170b083809070d11160c0a0a6c0f00070e11170b0a3809070f11160c0c0a6c0f00071011170b0c3809071111160c0e0a6c0f00071211170b0e3809071311160c100a6c0f00071411170b103809071511160c120a6c0f00071611170b123809071711160c140a6c0f00071811170b143809071911160c160a6c0f00071a11170b163809071b11160c180a6c0f00071c11170b183809071d11160c1a0a6c0f00071e11170b1a3809071f11160c1c0a6c0f00072011170b1c3809072111160c1e0a6c0f00072211170b1e3809072311160c200a6c0f00072411170b203809072511160c220a6c0f00072611170b223809072711160c240a6c0f00072811170b243809072911160c260a6c0f00072a11170b263809072b11160c280a6c0f00072c11170b283809072d11160c2a0a6c0f00072e11170b2a3809072f11160c2c0a6c0f00073011170b2c3809073111160c2e0a6c0f00073211170b2e3809073311160c300a6c0f00073411170b303809073511160c320a6c0f00073611170b323809073711160c340a6c0f00073811170b343809073911160c360a6c0f00073a11170b363809073b11160c380a6c0f00073c11170b383809073d11160c3a0a6c0f00073e11170b3a3809073f11160c3c0a6c0f00074011170b3c3809074111160c3e0a6c0f00074211170b3e3809074311160c400a6c0f00074411170b403809074511160c420a6c0f00074611170b423809074711160c440a6c0f00074811170b443809074911160c460a6c0f00074a11170b463809074b11160c480a6c0f00074c11170b483809074d11160c4a0a6c0f00074e11170b4a3809074f11160c4c0a6c0f00075011170b4c3809075111160c4e0a6c0f00075211170b4e3809075311160c500a6c0f00075411170b503809075511160c520a6c0f00075611170b523809075711160c540a6c0f00075811170b543809075911160c560a6c0f00075a11170b563809075b11160c580a6c0f00075c11170b583809075d11160c5a0a6c0f00075e11170b5a3809075f11160c5c0a6c0f00076011170b5c3809076111160c5e0a6c0f00076211170b5e3809076311160c600a6c0f00076411170b603809076511160c620a6c0f00076611170b623809076711160c640a6c0f00076811170b643809076911160c660a6c0f00076a11170b663809076b11160c680a6c0f00076c11170b683809076d11160c6a0a6c0f00076e11170b6a3809076f11160c6e0a6c0f00077011170b6e3809077111160c700a6c0f00077211170b703809077311160c720a6c0f00077411170b723809077511160c740a6c0f00077611170b743809077711160c760a6c0f00077811170b763809077911160c780a6c0f00077a11170b783809077b11160c7a0a6c0f00077c11170b7a3809077d11160c7c0a6c0f00077e11170b7c3809077f11160c7e0a6c0f0007800111170b7e380907810111160c80010a6c0f0007820111170b8001380907830111160c82010a6c0f0007840111170b8201380907850111160c84010a6c0f0007860111170b8401380907870111160c86010a6c0f0007880111170b8601380907890111160c88010a6c0f00078a0111170b88013809078b0111160c8a010a6c0f00078c0111170b8a013809078d0111160c8c010a6c0f00078e0111170b8c013809078f0111160c8e010a6c0f0007900111170b8e01380907910111160c90010a6c0f0007920111170b9001380907930111160c92010a6c0f0007940111170b9201380907950111160c94010a6c0f0007960111170b9401380907970111160c96010a6c0f0007980111170b9601380907990111160c98010a6c0f00079a0111170b98013809079b0111160c9a010a6c0f00079c0111170b9a013809079d0111160c9c010a6c0f00079e0111170b9c013809079f0111160c9e010a6c0f0007a00111170b9e01380907a10111160ca0010a6c0f0007a20111170ba001380907a30111160ca2010a6c0f0007a40111170ba201380907a50111160ca4010a6c0f0007a60111170ba401380907a70111160ca6010a6c0f0007a80111170ba601380907a90111160ca8010a6c0f0007aa0111170ba801380907ab0111160caa010a6c0f0007ac0111170baa01380907ad0111160cac010a6c0f0007ae0111170bac01380907af0111160cae010b6c0f0007b00111170bae0138090204010401001da7050a0011140c010a01070421030b0b00010701270a00111429002003140b0001070027380806504600000000000012000c020b000b022d000b012a000c0307b10111160c4c0a030f00070611170b4c380907b20111160c6d0a030f00070a11170b6d380907b30111160c780a030f00070c11170b78380907b40111160c83010a030f00070e11170b8301380907b50111160c8e010a030f00071011170b8e01380907b60111160c520a030f00071211170b52380907b70111160c5d0a030f00071611170b5d380907b80111160c650a030f00071a11170b65380907b90111160c660a030f00071e11170b66380907ba0111160c670a030f00072411170b67380907bb0111160c680a030f00072611170b68380907bc0111160c690a030f00072811170b69380907bd0111160c6a0a030f00072a11170b6a380907be0111160c6b0a030f00072c11170b6b380907bf0111160c6c0a030f00072e11170b6c380907c00111160c6e0a030f00073011170b6e380907c10111160c6f0a030f00073211170b6f380907c20111160c700a030f00073811170b70380907c30111160c710a030f00073e11170b71380907c40111160c720a030f00074011170b72380907c50111160c730a030f00074211170b73380907c60111160c740a030f00074411170b74380907c70111160c750a030f00074611170b75380907c80111160c760a030f00074811170b76380907c90111160c770a030f00074a11170b77380907ca0111160c790a030f00074c11170b79380907cb0111160c7a0a030f00074e11170b7a380907cc0111160c7b0a030f00075011170b7b380907cd0111160c7c0a030f00075211170b7c380907ce0111160c7d0a030f00075411170b7d380907cf0111160c7e0a030f00075611170b7e380907d00111160c7f0a030f00075811170b7f380907d10111160c80010a030f00075a11170b8001380907d20111160c81010a030f00075c11170b8101380907d30111160c82010a030f00075e11170b8201380907d40111160c84010a030f00076211170b8401380907d50111160c85010a030f00076411170b8501380907d60111160c86010a030f00076a11170b8601380907d70111160c87010a030f00076c11170b8701380907d80111160c88010a030f00076e11170b8801380907d90111160c89010a030f00077011170b8901380907da0111160c8a010a030f00077211170b8a01380907db0111160c8b010a030f00077411170b8b01380907dc0111160c8c010a030f00077611170b8c01380907dd0111160c8d010a030f00077811170b8d01380907de0111160c8f010a030f00077a11170b8f01380907df0111160c90010a030f00077c11170b9001380907e00111160c91010a030f00077e11170b9101380907e10111160c92010a030f0007820111170b9201380907e20111160c93010a030f0007840111170b9301380907e30111160c4d0a030f0007e40111170b4d380907e50111160c4e0a030f0007860111170b4e380907e60111160c4f0a030f00078c0111170b4f380907e70111160c500a030f00078e0111170b50380907e80111160c510a030f0007900111170b51380907e90111160c530a030f0007920111170b53380907ea0111160c540a030f0007940111170b54380907eb0111160c550a030f0007960111170b55380907ec0111160c560a030f0007980111170b56380907ed0111160c570a030f00079a0111170b57380907ee0111160c580a030f0007ef0111170b58380907f00111160c590a030f00079c0111170b59380907f10111160c5a0a030f00079e0111170b5a380907f20111160c5b0a030f0007a00111170b5b380907f30111160c5c0a030f0007a20111170b5c380907f40111160c5e0a030f0007a40111170b5e380907f50111160c5f0a030f0007a60111170b5f380907f60111160c600a030f0007a80111170b60380907f70111160c610a030f0007aa0111170b61380907f80111160c620a030f0007ac0111170b62380907f90111160c630a030f0007ae0111170b63380907fa0111160c640b030f0007b00111170b6438090205010401001e120a00111407042103090b00010701270b0011142a000c020b010b020f011502060000001f5d0a010a031f0305051c0a020a0026030a05110b020b0017090c070c0405170b000b0217080c070c040b040b070c060c05055a0a01031f05230a03200c080525090c080b080328052f0b000b0216080c0e0c0d05560b01200b031f0335053c0b000b0216090c0c0c0b05520a000a0226034105480b000b0217090c0a0c09054e0b020b0017080c0a0c090b090b0a0c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060207000000205e0a010a031f03050508080c0705140a0120030c05100a03200c040512090c040b040c070b070317051e0b000b02160b010c060c05055b0b01032105250b03200c080527090c080b08032a05410a000a0224032f05360b000b0217080c0a0c09053c0b020b0017090c0a0c090b090b0a0c0e0c0d05570a020a00240346054d0b020b0017080c0c0c0b05530b000b0217090c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060200000001010000";
+    let res = run_binary_test("sample_price_oracle", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_aptosd_swap() {
+    let code = "a11ceb0b050000000c0100160216300346ee0104b4022205d602960407ec06de0708ca0e40068a0f8b01109510f9010a8e12520ce012e80e0dc821160000010101020103010401050106010700080009000a000b0700000c0700000d0800000e0700000f07000a28040207000400042b0401060102380800083a0000063c070100000010000100001102010000120101000013030100001401010000150101000016020100001701040000180506000019010700001a020100001b020100001c010100001d000100001e020100001f02010000200001000021000100092f01090009300105000a310b0c02070604320e01010607330205000934010f0009350104000936010f000a37110f020704033900010100033b02010100093d0104000a3e1617020704063f180f01000640191a01000a411b1c02070409421d010005431f040005441f0400094501200009460104000947010f0009480901000a490125020704014a022601060a4b1128020704140a150d1a0a1b121c1315141e0a1f052005210a151e290a2a0d2a142a1e2b0a1b1303060c05030001060c02060c0301030105050303030303010a050c03030303030505070b0502050803070b0502050803070802070803070b0601080401020205080303070b050209000901090009010107090101080402070b060109000900010108070b05020508030501070b06010800030107080207080302060b05020900090109000108070108080108002d0b0901050b0901050b0901050c0b0901050b0901050b0901050b0901050b090105030303030303070b06010801070b06010801070b06010801070b0601080103070803070803070803070803070b0502050803070b0502050803070b0502050803070b0502050803070b090105070b090105070b090105070b09010503030b0901050b0901050b0901050b090105070802070802070802070802070802030301060b050209000901010b0901090001060b0901090001070b0901090001090002070b0502090009010900030709010b090109000b09010900020503010801020303010c04010103030a03030303030505070b0502050803070b0502050803070803070b0901050b090105070803070b0502050803070b0901050b0901050a050a0b0502050803060c030c0b060108040c0b060108000c0b060108010c010b050209000901010b060109000c0b0901050c070b0502050803050b090105070b06010801060803070b0502050803070b0901050b090105070802060c030609010b090109000b090109000d6170746f737061645f73776170076163636f756e740a6170746f735f636f696e04636f696e056576656e74066d6174683634066f7074696f6e067369676e65720d6170746f737061645f636f696e06636f6e6669670e6974657261626c655f7461626c65104269644170746f735061644576656e7417446973747269627574654170746f737061644576656e74114c61756e636850616452656769737472790f546f6b656e446973747269627574650e57686974654c6973744576656e740c61646457686974654c6973740c6173736572745f61646d696e136173736572745f6e6f5f656d657267656e63790b6269644170746f735061640d64697374726962757465416c6c0e64697374726962757465417470701064697374726962757465536561736f6e0f67657453776170546f74616c4269640c67657457686974654c6973740d67657457686974654c697374730a696e697469616c697a650f6c61756e6368506164536561736f6e09726566756e64416c6c0b726566756e644170746f730b7265736574536561736f6e0f77686974654c697374536561736f6e0d77697468647261774170746f731077697468647261774170746f73506164036361700362696408696e766573746f72106469737472696275746564546f6b656e06726566756e6409696e766573746f72730d4974657261626c655461626c6508746f74616c426964126269646170746f737061645f6576656e74730b4576656e7448616e646c6519646973747269627574656170746f737061645f6576656e74731077686974656c6973745f6576656e74730b64697374726962757465640c676574537761705374617465126765745265736f757263654164647265737317626f72726f775f6d75745f776974685f64656661756c740a656d69745f6576656e740a616464726573735f6f660b6973456d657267656e63791467657453776170436f6e6669674861726443617011697342797061737357686974654c69737408636f6e7461696e73094170746f73436f696e087472616e736665720c4170746f73506164436f696e087265676973746572064f7074696f6e1a67657453776170436f6e666967417074546f417074745261746508686561645f6b65790769735f736f6d6507657874726163740f626f72726f775f697465725f6d75740a6d696e7441747070546f036d696e036d6178116765745265736f757263655369676e65721467657453776170436f6e666967536f66744361701967657453776170436f6e666967456e61626c65526566756e640c736574537761705374617465036e6577106e65775f6576656e745f68616e646c650b626f72726f775f6974657241376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d0000000000000000000000000000000000000000000000000000000000000001030800e87648170000000308950100000000000003089a0100000000000003089b010000000000000308930100000000000003089801000000000000030896010000000000000308970100000000000003089901000000000000020104020105020101020103020102052041376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d126170746f733a3a6d657461646174615f7630e4010893010000000000000f4552525f5045524d495353494f4e530095010000000000000d4552525f454d455247454e4359009601000000000000104552525f534541534f4e5f454e444544009701000000000000144552525f534541534f4e5f4e4f545f5245534554009801000000000000114552525f534541534f4e5f414354495645009901000000000000104552525f534541534f4e5f5354415445009a01000000000000134552525f484152444341505f52454143484544009b01000000000000144552525f4e4f545f494e5f57484954454c4953540b6572726f7220636f64657300020322032303240501020522032303250326032405020205270b050205080329032a0b060108002c0b060108012d0b06010804030206220323032e03250326032405040206220323032e032503260324050001000102083c0b0011011112070d21030807082711132a020c0c0a0c0f000c0b0b0c0f010c0e0b0b0c0a0a010c090b010c080b0a0b090600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b08120338000c0d0b020a0d0f02150b0e0a0d1002140a0d1003140a0d1004140a0d1005140a0d1005140b0d10061412043801020100000001080b001116070e210307070427020200000001061117200305070127020301000102106111021112070c2103090b000107082711180c0611132a020c0811190c040a080f000a0011160c030c020b022e0b0338020c070b040b071e03250b00010b08010703270a081007140b062503310b00010b08010702270a081007140a01160a080f07150a080f080c050a0011130a0138030a0038040b080f000a00111607000600000000000000000600000000000000000600000000000000000600000000000000000b001116120338000c090b010a090f03150b050a091002140a091003140b091006141200380502040000010215a00311180c13111d0c2b11132a020c260b261007140c2c0b2c0a13250310055c11132a020c270a270f000c180b270f090c0f0a182e38060c010d010c1c0a1c2e3807032405550a180b1c380838090c22010c140a141003140a140f0a150a14100a140a2b180a140f04150a141006140a1410041411220a0f0a141002140a141003140a141004140a141005140b141006141201380a0d220c1c051f0b1c010b18010b0f01059f030b130c0a11132a020c2a0a2a0f000c1b0b2a0f090c120a1b2e38060c040d040c1f0a1f2e3807037205c3010a1b0b1f380838090c23010c170a171002140c0d0a171003140c0b0b0d0b0b11230a0a11230c090a0906000000000000000024038c0105b4010a090a170f0a150a090a2b180a170f04150b0a0b09170c0a0a171006140a1710041411220a120a171002140a171003140a171004140a171005140b171006141201380a05b6010b17010a0a0600000000000000002503bb0105c0010b1b010b120105c3010d230c1f056d0a0a0600000000000000002403c80105b30211132a020c280a280f000c190b280f090c100a192e38060c000d000c1d0a1d2e380703dc0105b3020a190b1d380838090c24010c150a151003140a15100a141706000000000000000011240a0a11230c200a200600000000000000002403f40105a4020a15100a140a20160a150f0a150a200a2b180c210a151004140a21160a150f04150b0a0b20170c0a0a151006140b2111220a100a151002140a151003140a151004140a151005140b151006141201380a05a6020b15010a0a0600000000000000002503ab0205b0020b19010b100105b3020d240c1d05d7010b0a0600000000000000002503b90206a1860100000000002711132a020c290a290f000c1a0b290f090c110a1a2e38060c020d020c1e0a1e2e380703cd020599030a1a0b1e380838090c25010c160a161003140c0c0a16100a140c0e0a0c0a0e2603e8020b1a010b16010b1101061127000000000000270b0c0b0e1706000000000000000011240a160f05150a161005140600000000000000002403f70205940311250c030e030a161006140a16100514110d0a110a161002140a161003140a161004140a161005140b161006141201380a0596030b16010d250c1e05c8020b1e010b1a010b1101020500000102211a11260c0211132a021007140c0311270c010b01030c05110b030b02230c000513090c000b0003160518110c05191104020601000102010f0b00110111021112070c210309070827070911281105070a1128020701000102010511132b02100714020801000102222511132a020f000c090b090c080a000c070b000c060b080b070600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b06120338000c0a0a0a1002140a0a1003140a0a100a140a0a1004140b0a100514020901000102232611132a020f000c03400500000000000000000c060a032e38060c000d000c040a042e3807031105200a030b04380838090c05010c020d060b0210061444050d050c04050c0b04010b03010b06020a01000024220b00110111250c0a0e0a0c02380b0c0111250c040e04380c0c0511250c060e06380d0c0711250c080e08380e0c090b020b010600000000000000000b070b090b0512022d02070b1128020b010000010b0b0011011112070d210308070827070c1128020c00000102274a11132a020c0a0a0a0f000c070b0a0f090c050a072e38060c000d000c0811250c010e010c0b0a082e3807031805410a070b0838080c030c020b022e0b03380f0c09010c060a0b0a061006140a06100314110d0a050a061002140a061003140a061004140a061005140b061006141201380a0d090c0805130b0b010b08010b07010b0501020d00000001050b000b010b023803020e010000010b0b0011011112070a210308070627070b1128020f010000010b0b0011011112070b210308070727070d1128021001000020090b00110111250c030e030b010b023803021101000020090b00110111250c030e030b010b02381002020002040300030103030304030502010202020303020000";
+    let res = run_binary_test("sample_aptosd_swap", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_router() {
+    let code = "a11ceb0b050000000a01000e020e0603148f0104a3012805cb018f0207da03f90208d30640069307a00110b3082b0cde08db110000010101020003000400050006010a0401000100070000000008010202000000090102020000020b050600050c060700050d050200030e0207020000040f02070200000410020a0200000111020c01000612000d000113020f01000414020a0200000115100f0100031611120200000117130201000418020d0200000519140d00041a1500020000041b020a020000041c020d020000051d140d00031e111202000006080609070907080808090b0b0e0c080d0b0e080f0b100812080f0e0809090e130914091209160802040403060c030300030404043501010101010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b0001090103030303030303030404030301010404010404040503030303030301060c0105010102090009010209010900010301090001020104010901010b0001090002060c0308060c070b00010900070b00010901030301030302030302050b000109000305040106060c010303030432010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b000109010303030303030404030301010404010404040505030303030303030306726f7574657204636f696e067369676e657203616d6d0b636c6f625f6d61726b657403666565047574696c0873696d706c69667918737761705f636f696e5f666f725f65786163745f636f696e18737761705f65786163745f636f696e5f666f725f636f696e04436f696e0a616464726573735f6f660a6665655f65786973747316696e697469616c697a655f6665655f64656661756c740b706f6f6c5f6578697374730d6d61726b65745f657869737473086c6f745f73697a6508646563696d616c7303657870047a65726f0c6e5f6269645f6c6576656c730877697468647261771d636f696e5f737761705f636f696e5f666f725f65786163745f636f696e076465706f7369740b626573745f6269645f61750c73756274726163745f66656516706c6163655f6f726465725f666f725f726f757465720c6e5f61736b5f6c6576656c730b626573745f61736b5f6175076164645f6665651d636f696e5f737761705f65786163745f636f696e5f666f725f636f696e49661cd59c0b89440313af587bc99c3d38614d9a52479eb3f7c7c766d580c30b00000000000000000000000000000000000000000000000000000000000000010308c9000000000000000308ca000000000000000308c800000000000000030804000000000000000308070000000000000003086500000000000000030866000000000000000308030000000000000003080200000000000000030864000000000000000308ffffffffffffffff0308050000000000000003080100000000000000030868000000000000000308670000000000000003080600000000000000126170746f733a3a6d657461646174615f7630170104000000000000000c45544553545f4641494c4544000001000003190a000c030a010c040a01320000000000000000000000000000000022030905120b000a01190c020b010c000b020c0105040b030a001a0b040b001a020101040004ec030a0011030c310a311104200308050a0a0011053800030d0510080c03051238010c030b030c2d38020c2a38030c290a2d0b291f031d05fb0138040c27320a000000000000000000000000000000380535110a0c0e0600000000000000000c320600000000000000000c3438060c1a0a340a0223032f05340a320a01230c060536090c060b06033905eb01380706000000000000000021033e055f0a000a010a321738080c140b000d140d1a0a010a32170a020a34170906000000000000000006000000000000000038090c210c1d0a310b14380a0b320b21160c320b340b1d160c3405eb01380b0c130a310a130811110c120a020a3417350a0e180a121a340c090b090a272303750596010a000a010a321738080c180b000d180d1a0a010a32170a020a34170906000000000000000006000000000000000038090c230c1f0a310b18380a0b320b23160c320b340b1f160c3405eb010a0e0a1211000c250c2b0a000a010a321738080c190a000d190d1a0a010a32170a020a3417080b2b340b253438090c240c200a310b19380a0b320b24160c320b340b20160c340a340a022303c20105c7010a320a01230c0805c901090c080b0803cc0105ea010a020a3417350a0e180b121a340c0a0a000907060b13340b0a3200000000000000000000000000000000380c0c2e0c0d0b320b0d34160c320b340b2e34160c34052a0b320b012503f1010707270b340b022103f7010708270b310b1a380d05eb030a2d0a2a1f03800205b203380e0c28320a000000000000000000000000000000380f35110a0c0f0600000000000000000c330600000000000000000c3538060c1b0a350a02230392020597020a330a01230c04059902090c040b04039c0205a20338100600000000000000002103a10205a402080c0505aa020a020a35170a28230c050b0503ad0205ce020a000a010a331738080c150b000d150d1b0a010a33170a020a35170906000000000000000006000000000000000038090c220c1e0a310b15380a0b330b22160c330b350b1e160c3505a20338110c110a310a110811150c100b100a0f11000c260c2c0a000a010a331738080c160a000d160d1b0a010a33170a020a3517080b2c340b263438090c360c370a310b16380a0b330b36160c330b350b37160c350a350a02230381030586030a330a01230c07058803090c070b07038b0305a1030a000807060b11340a020a3517320000000000000000000000000000000038120c2f0c0b0b330b2f34160c330b350b0b34160c35058d020b330b012503a8030707270b350b022103ae030708270b310b1b380d05eb030b2d03b50305cd030a000a0138080c1738060c1c0b000d170d1c0b010b0209060000000000000000060000000000000000380901010a310b17380a0b310b1c380d05eb030b2a03d00305e7030b00080705070a0a02320000000000000000000000000000000038120c300c0c0b0c340b022103e0030707270b30340b012503eb030708270b0001070c27020201040016d1030a0011030c2b0a2b1104200308050a0a0011053800030d0510080c03051238010c030b030c2738020c2438030c230a270a231f031d05b70138040c21320a000000000000000000000000000000380535110a0c0a0600000000000000000c2d0600000000000000000c2f38060c160a2d0a0123032f05a70138070600000000000000002103340537080c04053d0a010a2d170a21230c040b040340055f0a000a010a2d1738080c100b000d100d160a010a2d170600000000000000000906000000000000000006000000000000000038130c1c0c190a2b0b10380a0b2d0b1c160c2d0b2f0b19160c2f05a701380b0c0f0a2b0a0f0811110c0e0b0e0a0a11000c1f0c250a000a010a2d1738080c140a000d140d160a010a2d17060000000000000000080b25340b1f3438130c310c330a2b0b14380a0b2d0b31160c2d0b2f0b33160c2f0a2d0a012303900105a6010a000907060b0f340a010a2d173200000000000000000000000000000000380c0c280c080b2d0b0834160c2d0b2f0b2834160c2f052a0b2d0b012103ad010707270b2f0b022603b3010708270b2b0b16380d05d0030a270b241f03bc01059403380e0c22320a000000000000000000000000000000380f35110a0c0b0600000000000000000c2e0600000000000000000c3038060c180a2e0a012303ce0105840338100600000000000000002103d30105f2010a000a010a2e1738080c150b000d150d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1d0c1a0a2b0b15380a0b2e0b1d160c2e0b300b1a160c3005840338110c0d0a2b0a0d0811150c0c0a010a2e17350a0b180a0c1a340c050b050a222303880205a7020a000a010a2e1738080c110b000d110d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1e0c1b0a2b0b11380a0b2e0b1e160c2e0b300b1b160c300584030a0b0a0c11000c200c260a000a010a2e1738080c120a000d120d180a010a2e17060000000000000000080b26340b203438130c320c340a2b0b12380a0b2e0b32160c2e0b300b34160c300a2e0a012303d1020583030a010a2e17350a0b180b0c1a340c060a000807060b0d340a06320000000000000000000000000000000038120c2a0c070a07340b062503ee020b0001061111000000000000270a2a340a010a2e172503f9020b0001062222000000000000270b2e0b2a34160c2e0b300b0734160c3005c9010b2e0b0121038a030707270b300b02260390030708270b2b0b18380d05d0030b2703970305b2030a000a0138080c1338060c170a000d130d170b010b0209060000000000000000060000000000000000381301010b0011030c2c0a2c0b17380d0b2c0b13380a05d0030b2303b50305cc030b000907050600000000000000000a013200000000000000000000000000000000380c0c290c090b09340b012103c5030707270b29340b022603d0030708270b0001070c270200";
+    let res = run_binary_test("sample_router", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_pool() {
+    let code = "a11ceb0b050000000c010020022079039901c90204e2036605c804fd0507c50aa80c08ed166006cd17c101108e19bb020ac91bd4020c9d1eb3250dd043340000010101020103010401050106010701080109010a020b000c000d000e000f0010070000110600001206000013060000140600001508000000040000160800001708000018060000190600001a0600001b0600071d07000b2707000b3a0700053c040106010344040100010245080009470402030100010b480400084e0402030100010b6c07000e7807000e7b07000e7e07000e80010700001c000100001e020100001f030100002002010000210201000022020100002300010000240201000025040100002605010000280607000029080100002a090100002b0a0100002c0b01000658050d0008590f07020300045a101000085b1213020300045c101000035d15160100035e17010100035f1810010005601a0101060b611e1c000b621f06000b632010000b64212200096524010203000a66250101000867122a0203000a682c2d01000a672e2f01000967312a0203000b69320100096a3301020300036b340101000d6d393a000c6d393a0009593b070203000b6e1c3c000b6f3d10000b703d10000b713d0d0003723e16010007733f1d000d74393a000c74393a000975013302030408654401020300087501460203040176054701060b7706100008790f490203000e7a4b4a000e7c4c4d000f7d4e0101040e7f3951000e81010e5300100e1011121114141514161417191c231d1c17261728120e1e111f2b202b12302123232324141735173617371f1c201c27232c1417403023103031303111310e17453211320e32303345333733263319333533363328334035303511384d384a3851350e385303060c04030006060c040a050a080d0a080d0a0306060c04020303030b060c020a050a080d0a080d0a03030303030201060c01080e010103060c05080d02060c0407060c03030303030302060c05040b11010812070805070806070808010502050a0402060b150209000901090001030204080602070b15020900090109000107090101081202060c03010b1101090002070b110109000b1101090001060b1101090001080202070b100109000900070708050303070806070808080f0a080f01080f01080d0405080d080d030305080d080d0205080f03060c080f0301081402080f081403070b1302090009010900090102070a09000a0900010803030708050708060708080108041a06040604030b1101081205080d070a0405020307080503030303030307080803080f0a080f0b1302080f0814040302070a04010901010402060a090006090002010302070a0900030109000208000a0402070b130209000901090002060c0814010b13020900090102050b1101090001080c01080b0108092c03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b11010812030307080503030303030303070806070b150204080603060816030503080f0a080f0503030303030602030303030302060b13020900090109000108160106081602070b1101090003010a0201080a2b03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b110108120307080503030303030303070806070b150204080603060816030503080f0a080f08070805030303070806070808080f0a080f0d01050b1101081206080d060507080507040303070808080f0a080f0b1302080f081403070b15020900090109000901010801010b150209000901010b10010900080800030403060a040608060708080a0817010609010108170d05030305080d020303020a080f0304030405080d0a040a081701081802060c09000206080607080817030303020303030303020303030303020303030303030301081902060a0407080801081a04506f6f6c076163636f756e740a6170746f735f636f696e04636f696e056572726f72056576656e74067369676e657206737472696e67057461626c65117461626c655f776974685f6c656e67746806766563746f7205746f6b656e104578706f6e656e7469616c43757276650b4c696e6561724375727665054d6f64656c04566965770c436f6c6c656374696f6e49640f437265617465506f6f6c4576656e74144465706f736974436f696e506f6f6c4576656e74154465706f736974546f6b656e506f6f6c4576656e740d45646974506f6f6c4576656e740a4576656e7453746f726508506f6f6c4775696405506f6f6c730f52656d6f7665506f6f6c4576656e7409537761704576656e74155769746864726177436f696e506f6f6c4576656e74165769746864726177546f6b656e506f6f6c4576656e740b4465706f736974436f696e06537472696e670c4465706f736974546f6b656e0845646974506f6f6c0a52656d6f7665506f6f6c1753776170436f696e466f7253706563696669634e4654730f537761704e465473466f72436f696e0c5769746864726177436f696e0d5769746864726177546f6b656e066372656174650b696e69745f6d6f64756c650b546f6b656e4461746149640a69735f6572633131353515766965775f636f6c6c656374696f6e5f706f6f6c7309766965775f706f6f6c0f766965775f70726963655f63616c630f766965775f757365725f706f6f6c7312636f6c6c656374696f6e5f63726561746f720f636f6c6c656374696f6e5f6e616d650763726561746f7207706f6f6c5f69640a73706f745f70726963650563757276650564656c7461116c705f6665655f6d756c7469706c69657204747970650673656e646572136465706f7369745f636f696e5f616d6f756e7405636f696e7309746f6b656e5f69647307546f6b656e49640b6372656174655f706f6f6c0b4576656e7448616e646c650b72656d6f76655f706f6f6c126465706f7369745f746f6b656e5f706f6f6c116465706f7369745f636f696e5f706f6f6c1377697468647261775f746f6b656e5f706f6f6c1277697468647261775f636f696e5f706f6f6c09656469745f706f6f6c047377617004436f696e094170746f73436f696e06746f6b656e730f5461626c65576974684c656e67746805546f6b656e0c7472616e73616374696f6e7317746f74616c5f7472616e73616374696f6e5f76616c75650f6c705f6665655f6561726e696e677305636f756e7405706f6f6c73055461626c650a757365725f706f6f6c7310636f6c6c656374696f6e5f706f6f6c730b636f696e5f616d6f756e740c70726f746f636f6c5f6665650e70726f746f636f6c5f70617965650b726f79616c74795f6665650d726f79616c74795f7061796565066c705f6665651477697468647261775f636f696e5f616d6f756e740a616464726573735f6f6608636f6e7461696e7310696e76616c69645f617267756d656e740a626f72726f775f6d7574117065726d697373696f6e5f64656e696564087769746864726177056d657267650576616c75650a656d69745f6576656e74136372656174655f746f6b656e5f69645f726177146372656174655f746f6b656e5f646174615f69640a62616c616e63655f6f660e77697468647261775f746f6b656e0361646406617070656e640672656d6f766508696e6465785f6f660d6465706f7369745f746f6b656e0d64657374726f795f656d707479076465706f73697407526f79616c74790a676574427579496e666f0b6765745f726f79616c7479176765745f726f79616c74795f64656e6f6d696e61746f72156765745f726f79616c74795f6e756d657261746f72116765745f726f79616c74795f7061796565076578747261637404757466380b67657453656c6c496e666f036e6577106e65775f6576656e745f68616e646c65156765745f746f6b656e646174615f6d6178696d756d08506f6f6c5669657706626f72726f7709706f6f6c5f7669657713436f6c6c656374696f6e506f6f6c735669657715636f6c6c656374696f6e5f706f6f6c735f7669657704766965770d507269636543616c63566965770f70726963655f63616c635f766965770d55736572506f6f6c73566965770f757365725f706f6f6c735f76696577ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf0940000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000303086600000000000000030869000000000000000308680000000000000003086e000000000000000308670000000000000003086a0000000000000003086b0000000000000003086c000000000000000308650000000000000003086d000000000000000520ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf09403086400000000000000052000000000000000000000000000000000000000000000000000000000000000000a0204036275790a02050473656c6c126170746f733a3a6d657461646174615f7630a6020a6500000000000000074552525f4e554d006600000000000000134552525f444946465f434f4c4c454354494f4e006700000000000000124552525f4e4f545f45584953545f504f4f4c006800000000000000154552525f494e56414c49445f504f4f4c5f54595045006900000000000000154552525f494e56414c49445f504f4f4c5f41524753006a000000000000001c4552525f4e4f545f4558495453545f544f4b454e5f494e5f504f4f4c006b00000000000000124552525f4e4f545f484156455f544f4b454e006c00000000000000144552525f4e4f545f504f4f4c5f43524541544f52006d00000000000000184552525f504f4f4c5f4e4f545f454e4f5547485f434f494e006e00000000000000114552525f49535f313135355f544f4b454e000002022d052e080d0102092f0530042d052e080d3103320233033403350202020a360530042d052e080d37033803310332023303340303020a360530042d052e080d390a080f3803310332023303340304020730042d052e080d31033202330334030502083b0b100108013d0b100108093e0b100108033f0b10010802400b1001080c410b1001080b420b10010804430b1001080a06020e2f053103380b11010812460b1302080f08142d052e080d3202330334033502390a080f49034a044b030702014c040802034d0b15020408064f0b1502050a04500b150208000a0409020c2f0530042d052e080d3103320233033403350249034a044b030a0210360530042d052e080d310332023303390a080f510352035305540355055603380335080d0b020a360530042d052e080d5703380331033202330334030c020a360530042d052e080d390a080f380331033202330334030001000205080c61070a2a080c06070a2a050c040a0610000a00110f3800040d05160b00010b06010b040107041111270a0610010a013801041c05250b00010b06010b040107041111270b060f010a0138020c050a051002140a00110f210432053b0b00010b05010b040107071113270a000a0238030c030a050f030b0338040b040f040b00110f0b010a051005140a051006140b020a05100338050a051007140a051008140a051009140b05100a1412023806020101000205081bd801070a2a080c0a070a2a050c060a0a10000a00110f3800040d05160b00010b0a010b060107041111270a0a10010a013801041c05250b00010b0a010b060107041111270b0a0f010a0138020c09401c00000000000000000c0c0a091002140a00110f210434053d0b00010b09010b060107071113270e02410d0c080600000000000000000c070a070a082304b60105470e020a07420d0a09100521044f05580b00010b09010b060107001111270e030a07421d0a09100621046005690b00010b09010b060107001111270e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0b0e020a07420d140e030a07421d140e040a07421d141119110a20048c010595010b00010b09010b060107031111270d0c0a0b441c0a00110f0a0b111a0601000000000000002604a00105a9010b00010b09010b060107061111270a090f0b0a0b0a000b0b060100000000000000111b38070b07060100000000000000160c0705420a090f0c0a0c38080b060f0d0b00110f0b010a091005140a091006140b0c0a09100338050a091007140a091008140a091009140b09100a1412033809020201000205082759070a2a080c08070a2a050c060a0810000a00110f3800040d05160b00010b08010b060107041111270a0810010a013801041c05250b00010b08010b060107041111270b080f010a0138020c070a071002140b00110f21043205390b07010b060107071113270a020a070f08150a040a070f09150a030a070f07150a050a070f0a150b060f0e0b010a071005140b071006140b030b020b040b051204380a0203010002050829dc01070a2a080c17070a2a050c100a1710000a00110f3800040d05160b00010b17010b100107041111270a170f000a00110f380b0c1f0a1710010a0138010422052d0b1f010b00010b17010b100107041111270a170f010a01380c13060c150c1c0c1d010c1e0c160c0f0c0e0c0b0c0a0c1b0c090c180c0d0a0d0a00110f21044605510b1f010b00010b17010b100107071113270a1f0e010c062e0b06380d0c12010b1f0b12380e010b170f0f0a0a0a0b1200380f0c0c0a0c0e010c072e0b07380d0c13046d05760b00010b10010b0c0107051111270b0c0b13380e010600000000000000000c110e02410d0c14401c00000000000000000c1a0a110a142304a5010586010e020a11420d140e030a11421d140e040a11421d140e050a1142101411180c190d1a0a19441c0a000d1b0b19381011220b11060100000000000000160c110581010b1b38110e0938050c080a00110f0b0938120a100f100a0d0a010a0a0a0b0b1a0600000000000000000600000000000000003100060000000000000000060000000000000000120c38130a100f110b0d0a010a0a0a0b0b080600000000000000000600000000000000003100060000000000000000060000000000000000120b38140b100f120b00110f0b010b0a0b0b0b180b0e0b0f0b160b1e0b1d0b1c0b15120938150204010002050838d502070a2a080f010c2a070a2a050c210a2a0a010c102e0b103801040f05180b00010b2a010b210107041111270e02410d0c270b2a0a0138020c290a2910081431012104380a291007140a291009140a270a29100a14070b11250c0a0c090c080c070c060c1d055a0a29100814310221043f05480b00010b29010b210107021111270a291007140a291009140a270a29100a14070b11260c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c240c2b0c1f0c250c26310021046905720b00010b29010b21010701111127070c0600000000000000000600000000000000000c2f0c2d0c2e0b260a290f07150b250a290f0915401c00000000000000000c310a000a1f38030c1e0600000000000000000c220a220a272304f401058d010e020a22420d140e030a22421d140e040a22421d140e050a2242101411180c300a29100c0e3038160c2304a60105af010b00010b29010b210107051111270a290f0c0b233817010d310a30441c0a29100b0a30381804bd0105c6010b00010b29010b210107051111270a000a290f0b0a30381011220b3011280c0b0e0b0c2c0a2c11290c200a2c112a0c280b2c112b0c2e0a200600000000000000002204ef010a1f0a271a0b28180b201a0c2d0b2f0a2d160c2f0a2e0d1e0a2d381938120b22060100000000000000160c220588010a291013140a1f35160a290f13150a29101414060100000000000000160a290f1415070a0d1e0a2b381938120a290f030b1e38040b210f150c1c0b00110f0c0c0b010c0d0a291005140c0e0a291006140c0f0a291007140c110a291008140c120a291009140c130b310c140b1f0a2b160b2d160c150b2b0c160b2f0c170b2e0c180b240c19070d112d0c1a0b29100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a02050100020508418c03070a2a080f010c29070a2a050c200a290a010c102e0b103801040f05180b00010b29010b200107041111270e02410d0c250b290a0138020c280a2810081431012104380a281007140a281009140a250a28100a14070b112e0c0a0c090c080c070c060c1d055a0a28100814310221043f05480b00010b28010b200107021111270a281007140a281009140a250a28100a14070b112f0c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c220c2a0c270c230c24310021046905720b00010b28010b20010701111127070c0600000000000000000600000000000000000c2e0c2c0c2d401c00000000000000000c300a280f030a270a2a1738190c1e0600000000000000000c210a210a2523049a020588010e020a21420d0a281005210490010599010b00010b28010b200107001111270e030a21421d0a2810062104a10105aa010b00010b28010b200107001111270e020a21420d140e030a21421d140e040a21421d140e050a2142101411180c2f0e020a21420d140e030a21421d140e040a21421d141119110a2004cd0105d6010b00010b28010b200107031111270d300a2f441c0a00110f0a2f111a0601000000000000002604e10105ea010b00010b28010b200107061111270a280f0b0a2f0a000a2f060100000000000000111b38070b2f11280c0b0e0b0c2b0a2b11290c1f0a2b112a0c260b2b112b0c2d0a1f060000000000000000220495020a270a251a0b26180b1f1a0c2c0b2e0a2c160c2e0a2d0d1e0a2c381938120b21060100000000000000160c210583010a280f0c0a303808070a0a280f030a2a381938120b240a280f07150b230a280f09150a00110f0b1e38120a281013140a270a2a170b2e1735160a280f13150a28101414060100000000000000160a280f14150b200f150c1c0b00110f0c0c0b010c0d0a281005140c0e0a281006140c0f0a281007140c110a281008140c120a281009140c130b300c140b270a2a170a2c170c150b2a0c160b2c0c170b2d0c180b220c19070e112d0c1a0b28100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a020601000205082770070a2a080c05070a2a050c030a0510000a00110f3800040d05160b00010b05010b030107041111270a0510010a013801041c05250b00010b05010b030107041111270b050f010a0138020c040a041002140a00110f210432053b0b00010b04010b030107071113270a04100338050a02260442054b0b00010b04010b030107091111270a00110f0a040f030a02381938120b030f110b00110f0b010a041005140a041006140b020a04100338050a041007140a041008140a041009140b04100a14120b38140207010002050842a901070a2a080c0b070a2a050c060a0b10000a00110f3800040d05160b00010b0b010b060107041111270a0b10010a013801041c05250b00010b0b010b060107041111270b0b0f010a0138020c0a401c00000000000000000c0d0a0a1002140a00110f210434053d0b00010b0a010b060107071113270e02410d0c090600000000000000000c070a070a0923048b0105470e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0c0a0a100c0e0c38160c08046005690b00010b0a010b060107051111270a0a0f0c0b083817010d0d0a0c441c0a0a100b0a0c381804770580010b00010b0a010b060107051111270a000a0a0f0b0b0c381011220b07060100000000000000160c0705420b060f100b00110f0b010a0a1005140a0a1006140b0d0a0a100338050a0a1007140a0a1008140a0a1009140b0a100a14120c38130208010003050708439f02070a2a080c14070a2a070f160c11070a2a050c10381b0c170e02410d0c130a13060000000000000000240414051f0b00010b14010b11010b100107081111270e02060000000000000000420d0c0f0e03060000000000000000421d0c0e0a14100f0a0f140a0e141200381c20043a0a140f0f0a0f140a0e141200402b0000000000000000381d0a140f0f0a0f140a0e141200380f0a1114442b401c00000000000000000c160600000000000000000c120a120a132304b001054e0a0f0e020a12420d21045b0a0e0e030a12421d210c0b055d090c0b0b0b0460056f0b00010b14010b11010b10010b0f010b0e0107001111270e020a12420d140e030a12421d140e040a12421d141119110a20048001058f010b00010b14010b11010b10010b0f010b0e0107031111270e020a12420d140e030a12421d140e040a12421d140e050a1242101411180c150d160a15441c0d170a150a000b15060100000000000000111b38070b12060100000000000000160c1205490a100f0d0a00110f0a11140a0f140a0e140a160a060a070a010a080a09120338090a000a0638030c0d0a100f040a00110f0a11140a0f140a0e140a060b060a070a010a080a09120238060a140f010a11140a00110f0a070b0d0b170a0f140a0e140a010a080a090a0a0b1606000000000000000032000000000000000000000000000000000600000000000000001206381e0a140f000a00110f0c0c2e0b0c38002004ff010a140f000a00110f402b0000000000000000381f0b140f000a00110f380b0a1114442b0b100f170b00110f0a11140b0f140b0e140b070b010b080b090b0a120138200a11143201000000000000000000000000000000160b11150209000000011e0a0038213822382312082d080a00320000000000000000000000000000000012072d070a000a0038240a0038250a0038260a0038270a0038280a0038290a00382a0b00382b12052d05020a00000001060601000000000000000b0011342120020b010401084876070a2a080c090a010a0212000c030a09100f0a03381c040d05130b00010b0901063f05000000000000270a09100f0b03382c0c07404a00000000000000000c0a0a07412b0c060600000000000000000c040a040a0623046b05240a070a04422b140c050a0910010a053801042f05370b00010b09010b0701063f05000000000000270a0910010b05382d0c080d0a0a081002140a081007140a08100338050a081005140a081006140a081008140a081009140a08100a140a081018140a08100c140a081014140a081013140b081019141136444a0b04060100000000000000160c04051f0b09010b000b010b020b07140b0a1137382e020c010401084f40070a2a080c030a0310010a013801040905100b00010b030107041111270b0310010b01382d0c020b000a021002140a021007140a02100338050a021005140a021006140a021008140a021009140a02100a140a021018140a02100c140a021014140a021013140b021019141136382f020d0104005087010b010600000000000000002104380a020601000000000000002104150b030b040b050b06070b11250c090c080c070c180c170c16052b0b0206020000000000000021041a051f0b000107021111270b030b040b050b06070b11260c090c080c070c180c170c160b160b170b180b070b080b090c150c140c130c120c110c10056b0a020601000000000000002104490b030b040b050b06070b112e0c0f0c0e0c0d0c0c0c0b0c0a055f0b0206020000000000000021044e05530b000107021111270b030b040b050b06070b112f0c0f0c0e0c0d0c0c0c0b0c0a0b0a0b0b0b0c0b0d0b0e0b0f0c150c140c130c120c110c100b100b110b120b130b140b150c1a0c1d0c190c1b0c1c310021047a057e0b0001064705000000000000270b000b1c0b1b0b190b1d0b1a11393830020e01040108521b070a2a080c030a0310000a0138000409050f0b00010b0301063f05000000000000270b0310000a0138310c020b000b010b0214113a383202080108000600060205030604060506010606060706080603060a050205060802050405050501060c060b0507070005000609060d00";
+    let res = run_binary_test("sample_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_farming() {
+    let code = "a11ceb0b050000000e01001e021e2603447c04c00158059802c80107e003bb04089b08a00106bb09e101109c0b780a940c3e0bd20c040cd60cd10d0da71a080eaf1a060000010101020103010401050106000700080209020a0309030a0409040a000b0800000c0e0200010001000d0c0200010001011106000513070002230401000107240000000e000100000f0201020000032104050001220607000525090a000e26010c0200000c26010c0200000a26010c0200000427001200022812140100022915160100022a17010100082b150101000d2c1a010200000b2c1a01020000092c1a010200000d2d1b010200000b2d1b01020000092d1b01020000062e011400050b050d050e050f05100511060b060d060e060f06100611070b070d070e070f0710071109130a130b1309180a180b1809190a190b190c130c180d0b0e0b0f0b0d0d0e0d0f0d0d0e0d100e0e0e100f0e0f10100b110b120b01060c0009060c0303030303030303020c080302060c0501080301060803010c2001010101010101010101030303030308040b050108060b050109000b050109010708000b0102090009010b0102090009010b020209000901070b020209000901050c0a0b0102090009010503030303010a0201080402090009010101020901090002080609000209000806020806090102090108060105010900010302060c03010b0501090002050b0501090001090101080603060c030305060c03030303010b010209000901076661726d696e67076163636f756e7404636f696e107265736f757263655f6163636f756e74067369676e657206737472696e670974696d657374616d700d6661756365745f746f6b656e73076c656e64696e6706726f7574657204737761700a4d6f64756c65446174610c506f736974696f6e496e666f0f506f736974696f6e496e666f4465780b696e69745f6d6f64756c65166c657665726167655f7969656c645f6661726d696e670a7369676e65725f636170105369676e65724361706162696c697479086465785f6e616d6506537472696e670b7369676e65725f616464720a637265617465645f617406737461747573086c657665726167650e737570706c79416d6f756e745f780e737570706c79416d6f756e745f790e737570706c79416d6f756e745f7a0e626f72726f77416d6f756e745f780e626f72726f77416d6f756e745f790e626f72726f77416d6f756e745f7a10706f736974696f6e496e666f5f70616e10706f736974696f6e496e666f5f6c697110706f736974696f6e496e666f5f6175781d72657472696576655f7265736f757263655f6163636f756e745f6361701d6372656174655f7369676e65725f776974685f6361706162696c69747904436f696e03455a4d04757466380f69735f706169725f637265617465640a616464726573735f6f660762616c616e6365087769746864726177076465706f73697406626f72726f7710737761705f65786163745f696e7075740d6164645f6c69717569646974790b6e6f775f7365636f6e64734d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf4100000000000000000000000000000000000000000000000000000000000000015e40a5bf7ab741784d3a99d96d8e2ddc6706ee06e5f509a3314a74c9e53746f5b30dd6a14dd7626ac8a37bc964914f07e3dc38d629637f1087f9f7186f1e0909c4911c40cf758ec21c0ebf0e547933ef6bb0f53ad581c08d2ecc7ad11364be1b030804000000000000000520f67b2452fd82768002ec6c28568713b9359a596585dc1a4bf85fce6b0e3754020308020000000000000003080300000000000000030801000000000000000308ffffffffffffffff0410e80300000000000000000000000000000308000000000000000005204d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf41052000000000000000000000000000000000000000000000000000000000000000000a020c0b50616e63616b65537761700a020b0a4c6971756964537761700a020d0c4155582045786368616e6765126170746f733a3a6d657461646174615f763064030100000000000000164552524f525f4e4f545f435245415445445f50414952000200000000000000184552524f525f494e53554646494349454e545f4153534554000300000000000000174552524f525f494e56414c49445f504152414d5f4445580000020110080301020b1208041405150316011703180319031a031b031c031d030202031e0a0b0102090009011f0a0b010209000901200a0b010209000901020b010b00000000030c0b00070111020c020e0211030c010e010b0212002d000201010402000208ee04070a1104010a010600000000000000002103080536070a11040c183800030e0511080c09051338010c090b0903190b00010704273802031c051f080c0b052138030c0b0b0b03270b00010704273804032a052d080c0c052f38050c0c0b0c03350b0001070427059f010a0106010000000000000021033b0569070b11040c18380603410544080c0d054638070c0d0b0d034c0b00010704273808034f0552080c0e055438090c0e0b0e035a0b0001070427380a035d0560080c0f0562380b0c0f0b0f03680b0001070427059f010a0106020000000000000021036e059b01070c11040c18380c03740577080c100579380d0c100b10037f0b0001070427380e038201058501080c11058701380f0c110b11038d010b00010704273810039001059301080c1205950138110c120b12039f010b00010704270b000107032707082a000c1c0b1c100011030c220e2211080c210a030600000000000000002403ae0105c1010a00110838120c160b160a032403ba010b00010702270a000a0338130c1a07080b1a38140a040600000000000000002403c60105d9010a00110838150c170b170a042403d2010b00010702270a000a0438160c1b07080b1b38170a050600000000000000002403de0105f1010a00110838180c150b150a052403ea010b00010702270a000a0538190c1907080b19381a0a060600000000000000002403f60105f9010e220a06381b0a070600000000000000002403fe010581020e220a07381c0a0806000000000000000024038502070838120c26070838150c280a030a06160602000000000000001a0600000000000000002403940205bd020a010600000000000000002103990205a2020e220a030a06160602000000000000001a060000000000000000381d05bd020a010601000000000000002103a70205b0020e220a030a06160602000000000000001a060000000000000000381e05bd020a010602000000000000002103b50205bd020e220a030a06160602000000000000001a060000000000000000381f0a040a07160602000000000000001a0600000000000000002403c60205ef020a010600000000000000002103cb0205d4020e220a040a07160602000000000000001a060000000000000000382005ef020a010601000000000000002103d90205e2020e220a040a07160602000000000000001a060000000000000000382105ef020a010602000000000000002103e70205ef020e220a040a07160602000000000000001a06000000000000000038220a050a08160602000000000000001a0600000000000000002403f80205b9030a010600000000000000002103fd02058e030e220a050a08160602000000000000001a06000000000000000038230e220a050a08160602000000000000001a060000000000000000382405b9030a010601000000000000002103930305a4030e220a050a08160602000000000000001a06000000000000000038250e220a050a08160602000000000000001a060000000000000000382605b9030a010602000000000000002103a90305b9030e220a050a08160602000000000000001a06000000000000000038270e220a050a08160602000000000000001a0600000000000000003828070838120c25070838150c270a030b25160b26170c130a040b27160b28170c140a130600000000000000002403d00305d5030a14060000000000000000240c0a05d703090c0a0b0a03da0305eb040a010600000000000000002103df0305e6030e220b130b14060000000000000000060000000000000000382905fd030a010601000000000000002103eb0305f2030e220b130b14060000000000000000060000000000000000382a05fd030a010602000000000000002103f70305fd030e220b130b14060000000000000000060000000000000000382b0b0011080c240a213b002003850405ba040b180b241113080b020b030b040b050b060b070b0839010c1d401c000000000000000001401c0000000000000000401c0000000000000000401c000000000000000039000c1f0a0106000000000000000021039e0405a3040d1f36000b1d441c05b6040a010601000000000000002103a80405ad040d1f36010b1d441c05b6040b010602000000000000002103b20405b6040d1f36020b1d441c0e220b1f3f0005ea040b213c000c200b180b241113080b020b030b040b050b060b070b0839010c1e0a010600000000000000002103cf0405d4040b2036000b1e441c05ea040a010601000000000000002103d90405de040b2036010b1e441c05ea040b010602000000000000002103e30405e8040b2036020b1e441c05ea040b200105ed040b0001020000020002010202010b020b030b00";
+    let res = run_binary_test("sample_farming", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_whitelist() {
+    let code = "a11ceb0b050000000c01000602060c03123a044c0805545707ab01660891024006d102988b0210e98d02d7010ac08f02090cc98f02a2470debd6020200000101010200030800020a04020301000100040001000005020100000603040000070201000008000100010b0203000204070102030002060a04020300020c010c02030402080d0e020300060607060806090602060c050001060c01050101020507080002050203070b010209000901090009010305070b010205020708000106080002060b0102090009010900010b01020502010b01020900090102070b01020900090109000109010977686974656c697374067369676e6572057461626c650957686974656c69737403616464086164645f6d616e7908636f6e7461696e730a696e697469616c697a650672656d6f766507656e7472696573055461626c650a616464726573735f6f66036e65774419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1000000000000000000000000000000000000000000000000000000000000000103082003000000000000030822030000000000000308210300000000000005204419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1052000000000000000000000000000000000000000000000000000000000000000000520000000000000000000000000000000000000000000000000000000000000000105200000000000000000000000000000000000000000000000000000000000000002052000000000000000000000000000000000000000000000000000000000000000030520000000000000000000000000000000000000000000000000000000000000000405200000000000000000000000000000000000000000000000000000000000000005052000000000000000000000000000000000000000000000000000000000000000060520000000000000000000000000000000000000000000000000000000000000000705200000000000000000000000000000000000000000000000000000000000000008052000000000000000000000000000000000000000000000000000000000000000090520000000000000000000000000000000000000000000000000000000000000001005200000000000000000000000000000000000000000000000000000000000000011052000000000000000000000000000000000000000000000000000000000000000120520000000000000000000000000000000000000000000000000000000000000001305200000000000000000000000000000000000000000000000000000000000000014052000000000000000000000000000000000000000000000000000000000000000150520000000000000000000000000000000000000000000000000000000000000001605200000000000000000000000000000000000000000000000000000000000000017052000000000000000000000000000000000000000000000000000000000000000180520000000000000000000000000000000000000000000000000000000000000001905200000000000000000000000000000000000000000000000000000000000000020052000000000000000000000000000000000000000000000000000000000000000210520000000000000000000000000000000000000000000000000000000000000002205200000000000000000000000000000000000000000000000000000000000000023052000000000000000000000000000000000000000000000000000000000000000240520000000000000000000000000000000000000000000000000000000000000002505200000000000000000000000000000000000000000000000000000000000000026052000000000000000000000000000000000000000000000000000000000000000270520000000000000000000000000000000000000000000000000000000000000002805200000000000000000000000000000000000000000000000000000000000000029052000000000000000000000000000000000000000000000000000000000000000300520000000000000000000000000000000000000000000000000000000000000003105200000000000000000000000000000000000000000000000000000000000000032052000000000000000000000000000000000000000000000000000000000000000330520000000000000000000000000000000000000000000000000000000000000003405200000000000000000000000000000000000000000000000000000000000000035052000000000000000000000000000000000000000000000000000000000000000360520000000000000000000000000000000000000000000000000000000000000003705200000000000000000000000000000000000000000000000000000000000000038052000000000000000000000000000000000000000000000000000000000000000390520000000000000000000000000000000000000000000000000000000000000004005200000000000000000000000000000000000000000000000000000000000000041052000000000000000000000000000000000000000000000000000000000000000420520000000000000000000000000000000000000000000000000000000000000004305200000000000000000000000000000000000000000000000000000000000000044052000000000000000000000000000000000000000000000000000000000000000450520000000000000000000000000000000000000000000000000000000000000004605200000000000000000000000000000000000000000000000000000000000000047052000000000000000000000000000000000000000000000000000000000000000480520000000000000000000000000000000000000000000000000000000000000004905200000000000000000000000000000000000000000000000000000000000000050052000000000000000000000000000000000000000000000000000000000000000510520000000000000000000000000000000000000000000000000000000000000005205200000000000000000000000000000000000000000000000000000000000000053052000000000000000000000000000000000000000000000000000000000000000540520000000000000000000000000000000000000000000000000000000000000005505200000000000000000000000000000000000000000000000000000000000000056052000000000000000000000000000000000000000000000000000000000000000570520000000000000000000000000000000000000000000000000000000000000005805200000000000000000000000000000000000000000000000000000000000000059052000000000000000000000000000000000000000000000000000000000000000600520000000000000000000000000000000000000000000000000000000000000006105200000000000000000000000000000000000000000000000000000000000000062052000000000000000000000000000000000000000000000000000000000000000630520000000000000000000000000000000000000000000000000000000000000006405200000000000000000000000000000000000000000000000000000000000000065052000000000000000000000000000000000000000000000000000000000000000660520000000000000000000000000000000000000000000000000000000000000006705200000000000000000000000000000000000000000000000000000000000000068052000000000000000000000000000000000000000000000000000000000000000690520000000000000000000000000000000000000000000000000000000000000007005200000000000000000000000000000000000000000000000000000000000000071052000000000000000000000000000000000000000000000000000000000000000720520000000000000000000000000000000000000000000000000000000000000007305200000000000000000000000000000000000000000000000000000000000000074052000000000000000000000000000000000000000000000000000000000000000750520000000000000000000000000000000000000000000000000000000000000007605200000000000000000000000000000000000000000000000000000000000000077052000000000000000000000000000000000000000000000000000000000000000780520000000000000000000000000000000000000000000000000000000000000007905200000000000000000000000000000000000000000000000000000000000000080052000000000000000000000000000000000000000000000000000000000000000810520000000000000000000000000000000000000000000000000000000000000008205200000000000000000000000000000000000000000000000000000000000000083052000000000000000000000000000000000000000000000000000000000000000840520000000000000000000000000000000000000000000000000000000000000008505200000000000000000000000000000000000000000000000000000000000000086052000000000000000000000000000000000000000000000000000000000000000870520000000000000000000000000000000000000000000000000000000000000008805200000000000000000000000000000000000000000000000000000000000000089052000000000000000000000000000000000000000000000000000000000000000900520000000000000000000000000000000000000000000000000000000000000009105200000000000000000000000000000000000000000000000000000000000000092052000000000000000000000000000000000000000000000000000000000000000930520000000000000000000000000000000000000000000000000000000000000009405200000000000000000000000000000000000000000000000000000000000000095052000000000000000000000000000000000000000000000000000000000000000960520000000000000000000000000000000000000000000000000000000000000009705200000000000000000000000000000000000000000000000000000000000000098052000000000000000000000000000000000000000000000000000000000000000990520000000000000000000000000000000000000000000000000000000000000010005200000000000000000000000000000000000000000000000000000000000000101052000000000000000000000000000000000000000000000000000000000000001020520000000000000000000000000000000000000000000000000000000000000010305200000000000000000000000000000000000000000000000000000000000000104052000000000000000000000000000000000000000000000000000000000000001050520000000000000000000000000000000000000000000000000000000000000010605200000000000000000000000000000000000000000000000000000000000000107052000000000000000000000000000000000000000000000000000000000000001080520000000000000000000000000000000000000000000000000000000000000010905200000000000000000000000000000000000000000000000000000000000000110052000000000000000000000000000000000000000000000000000000000000001110520000000000000000000000000000000000000000000000000000000000000011205200000000000000000000000000000000000000000000000000000000000000113052000000000000000000000000000000000000000000000000000000000000001140520000000000000000000000000000000000000000000000000000000000000011505200000000000000000000000000000000000000000000000000000000000000116052000000000000000000000000000000000000000000000000000000000000001170520000000000000000000000000000000000000000000000000000000000000011805200000000000000000000000000000000000000000000000000000000000000119052000000000000000000000000000000000000000000000000000000000000001200520000000000000000000000000000000000000000000000000000000000000012105200000000000000000000000000000000000000000000000000000000000000122052000000000000000000000000000000000000000000000000000000000000001230520000000000000000000000000000000000000000000000000000000000000012405200000000000000000000000000000000000000000000000000000000000000125052000000000000000000000000000000000000000000000000000000000000001260520000000000000000000000000000000000000000000000000000000000000012705200000000000000000000000000000000000000000000000000000000000000128052000000000000000000000000000000000000000000000000000000000000001290520000000000000000000000000000000000000000000000000000000000000013005200000000000000000000000000000000000000000000000000000000000000131052000000000000000000000000000000000000000000000000000000000000001320520000000000000000000000000000000000000000000000000000000000000013305200000000000000000000000000000000000000000000000000000000000000134052000000000000000000000000000000000000000000000000000000000000001350520000000000000000000000000000000000000000000000000000000000000013605200000000000000000000000000000000000000000000000000000000000000137052000000000000000000000000000000000000000000000000000000000000001380520000000000000000000000000000000000000000000000000000000000000013905200000000000000000000000000000000000000000000000000000000000000140052000000000000000000000000000000000000000000000000000000000000001410520000000000000000000000000000000000000000000000000000000000000014205200000000000000000000000000000000000000000000000000000000000000143052000000000000000000000000000000000000000000000000000000000000001440520000000000000000000000000000000000000000000000000000000000000014505200000000000000000000000000000000000000000000000000000000000000146052000000000000000000000000000000000000000000000000000000000000001470520000000000000000000000000000000000000000000000000000000000000014805200000000000000000000000000000000000000000000000000000000000000149052000000000000000000000000000000000000000000000000000000000000001500520000000000000000000000000000000000000000000000000000000000000015105200000000000000000000000000000000000000000000000000000000000000152052000000000000000000000000000000000000000000000000000000000000001530520000000000000000000000000000000000000000000000000000000000000015405200000000000000000000000000000000000000000000000000000000000000155052000000000000000000000000000000000000000000000000000000000000001560520000000000000000000000000000000000000000000000000000000000000015705200000000000000000000000000000000000000000000000000000000000000158052000000000000000000000000000000000000000000000000000000000000001590520000000000000000000000000000000000000000000000000000000000000016005200000000000000000000000000000000000000000000000000000000000000161052000000000000000000000000000000000000000000000000000000000000001620520000000000000000000000000000000000000000000000000000000000000016305200000000000000000000000000000000000000000000000000000000000000164052000000000000000000000000000000000000000000000000000000000000001650520000000000000000000000000000000000000000000000000000000000000016605200000000000000000000000000000000000000000000000000000000000000167052000000000000000000000000000000000000000000000000000000000000001680520000000000000000000000000000000000000000000000000000000000000016905200000000000000000000000000000000000000000000000000000000000000170052000000000000000000000000000000000000000000000000000000000000001710520000000000000000000000000000000000000000000000000000000000000017205200000000000000000000000000000000000000000000000000000000000000173052000000000000000000000000000000000000000000000000000000000000001740520000000000000000000000000000000000000000000000000000000000000017505200000000000000000000000000000000000000000000000000000000000000176052000000000000000000000000000000000000000000000000000000000000001770520000000000000000000000000000000000000000000000000000000000000017805200000000000000000000000000000000000000000000000000000000000000179052000000000000000000000000000000000000000000000000000000000000001800520000000000000000000000000000000000000000000000000000000000000018105200000000000000000000000000000000000000000000000000000000000000182052000000000000000000000000000000000000000000000000000000000000001830520000000000000000000000000000000000000000000000000000000000000018405200000000000000000000000000000000000000000000000000000000000000185052000000000000000000000000000000000000000000000000000000000000001860520000000000000000000000000000000000000000000000000000000000000018705200000000000000000000000000000000000000000000000000000000000000188052000000000000000000000000000000000000000000000000000000000000001890520000000000000000000000000000000000000000000000000000000000000019005200000000000000000000000000000000000000000000000000000000000000191052000000000000000000000000000000000000000000000000000000000000001920520000000000000000000000000000000000000000000000000000000000000019305200000000000000000000000000000000000000000000000000000000000000194052000000000000000000000000000000000000000000000000000000000000001950520000000000000000000000000000000000000000000000000000000000000019605200000000000000000000000000000000000000000000000000000000000000197052000000000000000000000000000000000000000000000000000000000000001980520000000000000000000000000000000000000000000000000000000000000019905200000000000000000000000000000000000000000000000000000000000000200052000000000000000000000000000000000000000000000000000000000000002010520000000000000000000000000000000000000000000000000000000000000020205200000000000000000000000000000000000000000000000000000000000000203052000000000000000000000000000000000000000000000000000000000000002040520000000000000000000000000000000000000000000000000000000000000020505200000000000000000000000000000000000000000000000000000000000000206052000000000000000000000000000000000000000000000000000000000000002070520000000000000000000000000000000000000000000000000000000000000020805200000000000000000000000000000000000000000000000000000000000000209052000000000000000000000000000000000000000000000000000000000000002100520000000000000000000000000000000000000000000000000000000000000021105200000000000000000000000000000000000000000000000000000000000000212052000000000000000000000000000000000000000000000000000000000000002130520000000000000000000000000000000000000000000000000000000000000021405200000000000000000000000000000000000000000000000000000000000000215052000000000000000000000000000000000000000000000000000000000000002160520000000000000000000000000000000000000000000000000000000000000021705200000000000000000000000000000000000000000000000000000000000000218052000000000000000000000000000000000000000000000000000000000000002190520000000000000000000000000000000000000000000000000000000000000022005200000000000000000000000000000000000000000000000000000000000000221052000000000000000000000000000000000000000000000000000000000000002220520000000000000000000000000000000000000000000000000000000000000022305200000000000000000000000000000000000000000000000000000000000000224052000000000000000000000000000000000000000000000000000000000000002250520000000000000000000000000000000000000000000000000000000000000022605200000000000000000000000000000000000000000000000000000000000000227052000000000000000000000000000000000000000000000000000000000000002280520000000000000000000000000000000000000000000000000000000000000022905200000000000000000000000000000000000000000000000000000000000000230052000000000000000000000000000000000000000000000000000000000000002310520000000000000000000000000000000000000000000000000000000000000023205200000000000000000000000000000000000000000000000000000000000000233052000000000000000000000000000000000000000000000000000000000000002340520000000000000000000000000000000000000000000000000000000000000023505200000000000000000000000000000000000000000000000000000000000000236052000000000000000000000000000000000000000000000000000000000000002370520000000000000000000000000000000000000000000000000000000000000023805200000000000000000000000000000000000000000000000000000000000000239052000000000000000000000000000000000000000000000000000000000000002400520000000000000000000000000000000000000000000000000000000000000024105200000000000000000000000000000000000000000000000000000000000000242052000000000000000000000000000000000000000000000000000000000000002430520000000000000000000000000000000000000000000000000000000000000024405200000000000000000000000000000000000000000000000000000000000000245052000000000000000000000000000000000000000000000000000000000000002460520000000000000000000000000000000000000000000000000000000000000024705200000000000000000000000000000000000000000000000000000000000000248052000000000000000000000000000000000000000000000000000000000000002490520000000000000000000000000000000000000000000000000000000000000025005200000000000000000000000000000000000000000000000000000000000000251052000000000000000000000000000000000000000000000000000000000000002520520000000000000000000000000000000000000000000000000000000000000025305200000000000000000000000000000000000000000000000000000000000000254052000000000000000000000000000000000000000000000000000000000000002550520000000000000000000000000000000000000000000000000000000000000025605200000000000000000000000000000000000000000000000000000000000000257052000000000000000000000000000000000000000000000000000000000000002580520000000000000000000000000000000000000000000000000000000000000025905200000000000000000000000000000000000000000000000000000000000000260052000000000000000000000000000000000000000000000000000000000000002610520000000000000000000000000000000000000000000000000000000000000026205200000000000000000000000000000000000000000000000000000000000000263052000000000000000000000000000000000000000000000000000000000000002640520000000000000000000000000000000000000000000000000000000000000026505200000000000000000000000000000000000000000000000000000000000000266052000000000000000000000000000000000000000000000000000000000000002670520000000000000000000000000000000000000000000000000000000000000026805200000000000000000000000000000000000000000000000000000000000000269052000000000000000000000000000000000000000000000000000000000000002700520000000000000000000000000000000000000000000000000000000000000027105200000000000000000000000000000000000000000000000000000000000000272052000000000000000000000000000000000000000000000000000000000000002730520000000000000000000000000000000000000000000000000000000000000027405200000000000000000000000000000000000000000000000000000000000000275052000000000000000000000000000000000000000000000000000000000000002760520000000000000000000000000000000000000000000000000000000000000027705200000000000000000000000000000000000000000000000000000000000000278052000000000000000000000000000000000000000000000000000000000000002790520000000000000000000000000000000000000000000000000000000000000028005200000000000000000000000000000000000000000000000000000000000000281052000000000000000000000000000000000000000000000000000000000000002820520000000000000000000000000000000000000000000000000000000000000028305200000000000000000000000000000000000000000000000000000000000000284052000000000000000000000000000000000000000000000000000000000000002850520000000000000000000000000000000000000000000000000000000000000028605200000000000000000000000000000000000000000000000000000000000000287052000000000000000000000000000000000000000000000000000000000000002880520000000000000000000000000000000000000000000000000000000000000028905200000000000000000000000000000000000000000000000000000000000000290052000000000000000000000000000000000000000000000000000000000000002910520000000000000000000000000000000000000000000000000000000000000029205200000000000000000000000000000000000000000000000000000000000000293052000000000000000000000000000000000000000000000000000000000000002940520000000000000000000000000000000000000000000000000000000000000029505200000000000000000000000000000000000000000000000000000000000000296052000000000000000000000000000000000000000000000000000000000000002970520000000000000000000000000000000000000000000000000000000000000029805200000000000000000000000000000000000000000000000000000000000000299052000000000000000000000000000000000000000000000000000000000000003000520000000000000000000000000000000000000000000000000000000000000030105200000000000000000000000000000000000000000000000000000000000000302052000000000000000000000000000000000000000000000000000000000000003030520000000000000000000000000000000000000000000000000000000000000030405200000000000000000000000000000000000000000000000000000000000000305052000000000000000000000000000000000000000000000000000000000000003060520000000000000000000000000000000000000000000000000000000000000030705200000000000000000000000000000000000000000000000000000000000000308052000000000000000000000000000000000000000000000000000000000000003090520000000000000000000000000000000000000000000000000000000000000031005200000000000000000000000000000000000000000000000000000000000000311052000000000000000000000000000000000000000000000000000000000000003120520000000000000000000000000000000000000000000000000000000000000031305200000000000000000000000000000000000000000000000000000000000000314052000000000000000000000000000000000000000000000000000000000000003150520000000000000000000000000000000000000000000000000000000000000031605200000000000000000000000000000000000000000000000000000000000000317052000000000000000000000000000000000000000000000000000000000000003180520000000000000000000000000000000000000000000000000000000000000031905200000000000000000000000000000000000000000000000000000000000000320052000000000000000000000000000000000000000000000000000000000000003210520000000000000000000000000000000000000000000000000000000000000032205200000000000000000000000000000000000000000000000000000000000000323052000000000000000000000000000000000000000000000000000000000000003240520000000000000000000000000000000000000000000000000000000000000032505200000000000000000000000000000000000000000000000000000000000000326052000000000000000000000000000000000000000000000000000000000000003270520000000000000000000000000000000000000000000000000000000000000032805200000000000000000000000000000000000000000000000000000000000000329052000000000000000000000000000000000000000000000000000000000000003300520000000000000000000000000000000000000000000000000000000000000033105200000000000000000000000000000000000000000000000000000000000000332052000000000000000000000000000000000000000000000000000000000000003330520000000000000000000000000000000000000000000000000000000000000033405200000000000000000000000000000000000000000000000000000000000000335052000000000000000000000000000000000000000000000000000000000000003360520000000000000000000000000000000000000000000000000000000000000033705200000000000000000000000000000000000000000000000000000000000000338052000000000000000000000000000000000000000000000000000000000000003390520000000000000000000000000000000000000000000000000000000000000034005200000000000000000000000000000000000000000000000000000000000000341052000000000000000000000000000000000000000000000000000000000000003420520000000000000000000000000000000000000000000000000000000000000034305200000000000000000000000000000000000000000000000000000000000000344052000000000000000000000000000000000000000000000000000000000000003450520000000000000000000000000000000000000000000000000000000000000034605200000000000000000000000000000000000000000000000000000000000000347052000000000000000000000000000000000000000000000000000000000000003480520000000000000000000000000000000000000000000000000000000000000034905200000000000000000000000000000000000000000000000000000000000000350052000000000000000000000000000000000000000000000000000000000000003510520000000000000000000000000000000000000000000000000000000000000035205200000000000000000000000000000000000000000000000000000000000000353052000000000000000000000000000000000000000000000000000000000000003540520000000000000000000000000000000000000000000000000000000000000035505200000000000000000000000000000000000000000000000000000000000000356052000000000000000000000000000000000000000000000000000000000000003570520000000000000000000000000000000000000000000000000000000000000035805200000000000000000000000000000000000000000000000000000000000000359052000000000000000000000000000000000000000000000000000000000000003600520000000000000000000000000000000000000000000000000000000000000036105200000000000000000000000000000000000000000000000000000000000000362052000000000000000000000000000000000000000000000000000000000000003630520000000000000000000000000000000000000000000000000000000000000036405200000000000000000000000000000000000000000000000000000000000000365052000000000000000000000000000000000000000000000000000000000000003660520000000000000000000000000000000000000000000000000000000000000036705200000000000000000000000000000000000000000000000000000000000000368052000000000000000000000000000000000000000000000000000000000000003690520000000000000000000000000000000000000000000000000000000000000037005200000000000000000000000000000000000000000000000000000000000000371052000000000000000000000000000000000000000000000000000000000000003720520000000000000000000000000000000000000000000000000000000000000037305200000000000000000000000000000000000000000000000000000000000000374052000000000000000000000000000000000000000000000000000000000000003750520000000000000000000000000000000000000000000000000000000000000037605200000000000000000000000000000000000000000000000000000000000000377052000000000000000000000000000000000000000000000000000000000000003780520000000000000000000000000000000000000000000000000000000000000037905200000000000000000000000000000000000000000000000000000000000000380052000000000000000000000000000000000000000000000000000000000000003810520000000000000000000000000000000000000000000000000000000000000038205200000000000000000000000000000000000000000000000000000000000000383052000000000000000000000000000000000000000000000000000000000000003840520000000000000000000000000000000000000000000000000000000000000038505200000000000000000000000000000000000000000000000000000000000000386052000000000000000000000000000000000000000000000000000000000000003870520000000000000000000000000000000000000000000000000000000000000038805200000000000000000000000000000000000000000000000000000000000000389052000000000000000000000000000000000000000000000000000000000000003900520000000000000000000000000000000000000000000000000000000000000039105200000000000000000000000000000000000000000000000000000000000000392052000000000000000000000000000000000000000000000000000000000000003930520000000000000000000000000000000000000000000000000000000000000039405200000000000000000000000000000000000000000000000000000000000000395052000000000000000000000000000000000000000000000000000000000000003960520000000000000000000000000000000000000000000000000000000000000039705200000000000000000000000000000000000000000000000000000000000000398052000000000000000000000000000000000000000000000000000000000000003990520000000000000000000000000000000000000000000000000000000000000040005200000000000000000000000000000000000000000000000000000000000000401052000000000000000000000000000000000000000000000000000000000000004020520000000000000000000000000000000000000000000000000000000000000040305200000000000000000000000000000000000000000000000000000000000000404052000000000000000000000000000000000000000000000000000000000000004050520000000000000000000000000000000000000000000000000000000000000040605200000000000000000000000000000000000000000000000000000000000000407052000000000000000000000000000000000000000000000000000000000000004080520000000000000000000000000000000000000000000000000000000000000040905200000000000000000000000000000000000000000000000000000000000000410052000000000000000000000000000000000000000000000000000000000000004110520000000000000000000000000000000000000000000000000000000000000041205200000000000000000000000000000000000000000000000000000000000000413052000000000000000000000000000000000000000000000000000000000000004140520000000000000000000000000000000000000000000000000000000000000041505200000000000000000000000000000000000000000000000000000000000000416052000000000000000000000000000000000000000000000000000000000000004170520000000000000000000000000000000000000000000000000000000000000041805200000000000000000000000000000000000000000000000000000000000000419052000000000000000000000000000000000000000000000000000000000000004200520000000000000000000000000000000000000000000000000000000000000042105200000000000000000000000000000000000000000000000000000000000000422052000000000000000000000000000000000000000000000000000000000000004230520000000000000000000000000000000000000000000000000000000000000042405200000000000000000000000000000000000000000000000000000000000000425052000000000000000000000000000000000000000000000000000000000000004260520000000000000000000000000000000000000000000000000000000000000042705200000000000000000000000000000000000000000000000000000000000000428052000000000000000000000000000000000000000000000000000000000000004290520000000000000000000000000000000000000000000000000000000000000043005200000000000000000000000000000000000000000000000000000000000000431052000000000000000000000000000000000000000000000000000000000000004320520000000000000000000000000000000000000000000000000000000000000043305200000000000000000000000000000000000000000000000000000000000000434052000000000000000000000000000000000000000000000000000000000000004350520000000000000000000000000000000000000000000000000000000000000043605200000000000000000000000000000000000000000000000000000000000000437052000000000000000000000000000000000000000000000000000000000000004380520000000000000000000000000000000000000000000000000000000000000043905200000000000000000000000000000000000000000000000000000000000000440052000000000000000000000000000000000000000000000000000000000000004410520000000000000000000000000000000000000000000000000000000000000044205200000000000000000000000000000000000000000000000000000000000000443052000000000000000000000000000000000000000000000000000000000000004440520000000000000000000000000000000000000000000000000000000000000044505200000000000000000000000000000000000000000000000000000000000000446052000000000000000000000000000000000000000000000000000000000000004470520000000000000000000000000000000000000000000000000000000000000044805200000000000000000000000000000000000000000000000000000000000000449052000000000000000000000000000000000000000000000000000000000000004500520000000000000000000000000000000000000000000000000000000000000045105200000000000000000000000000000000000000000000000000000000000000452052000000000000000000000000000000000000000000000000000000000000004530520000000000000000000000000000000000000000000000000000000000000045405200000000000000000000000000000000000000000000000000000000000000455052000000000000000000000000000000000000000000000000000000000000004560520000000000000000000000000000000000000000000000000000000000000045705200000000000000000000000000000000000000000000000000000000000000458052000000000000000000000000000000000000000000000000000000000000004590520000000000000000000000000000000000000000000000000000000000000046005200000000000000000000000000000000000000000000000000000000000000461052000000000000000000000000000000000000000000000000000000000000004620520000000000000000000000000000000000000000000000000000000000000046305200000000000000000000000000000000000000000000000000000000000000464052000000000000000000000000000000000000000000000000000000000000004650520000000000000000000000000000000000000000000000000000000000000046605200000000000000000000000000000000000000000000000000000000000000467052000000000000000000000000000000000000000000000000000000000000004680520000000000000000000000000000000000000000000000000000000000000046905200000000000000000000000000000000000000000000000000000000000000470052000000000000000000000000000000000000000000000000000000000000004710520000000000000000000000000000000000000000000000000000000000000047205200000000000000000000000000000000000000000000000000000000000000473052000000000000000000000000000000000000000000000000000000000000004740520000000000000000000000000000000000000000000000000000000000000047505200000000000000000000000000000000000000000000000000000000000000476052000000000000000000000000000000000000000000000000000000000000004770520000000000000000000000000000000000000000000000000000000000000047805200000000000000000000000000000000000000000000000000000000000000479052000000000000000000000000000000000000000000000000000000000000004800520000000000000000000000000000000000000000000000000000000000000048105200000000000000000000000000000000000000000000000000000000000000482052000000000000000000000000000000000000000000000000000000000000004830520000000000000000000000000000000000000000000000000000000000000048405200000000000000000000000000000000000000000000000000000000000000485052000000000000000000000000000000000000000000000000000000000000004860520000000000000000000000000000000000000000000000000000000000000048705200000000000000000000000000000000000000000000000000000000000000488052000000000000000000000000000000000000000000000000000000000000004890520000000000000000000000000000000000000000000000000000000000000049005200000000000000000000000000000000000000000000000000000000000000491052000000000000000000000000000000000000000000000000000000000000004920520000000000000000000000000000000000000000000000000000000000000049305200000000000000000000000000000000000000000000000000000000000000494052000000000000000000000000000000000000000000000000000000000000004950520000000000000000000000000000000000000000000000000000000000000049605200000000000000000000000000000000000000000000000000000000000000497052000000000000000000000000000000000000000000000000000000000000004980520000000000000000000000000000000000000000000000000000000000000049905200000000000000000000000000000000000000000000000000000000000000500052000000000000000000000000000000000000000000000000000000000000005010520000000000000000000000000000000000000000000000000000000000000050205200000000000000000000000000000000000000000000000000000000000000503052000000000000000000000000000000000000000000000000000000000000005040520000000000000000000000000000000000000000000000000000000000000050505200000000000000000000000000000000000000000000000000000000000000506052000000000000000000000000000000000000000000000000000000000000005070520000000000000000000000000000000000000000000000000000000000000050805200000000000000000000000000000000000000000000000000000000000000509052000000000000000000000000000000000000000000000000000000000000005100520000000000000000000000000000000000000000000000000000000000000051105200000000000000000000000000000000000000000000000000000000000000512052000000000000000000000000000000000000000000000000000000000000005130520000000000000000000000000000000000000000000000000000000000000051405200000000000000000000000000000000000000000000000000000000000000515052000000000000000000000000000000000000000000000000000000000000005160520000000000000000000000000000000000000000000000000000000000000051705200000000000000000000000000000000000000000000000000000000000000518052000000000000000000000000000000000000000000000000000000000000005190520000000000000000000000000000000000000000000000000000000000000052005200000000000000000000000000000000000000000000000000000000000000521052000000000000000000000000000000000000000000000000000000000000005220520000000000000000000000000000000000000000000000000000000000000052305200000000000000000000000000000000000000000000000000000000000000524052000000000000000000000000000000000000000000000000000000000000005250520000000000000000000000000000000000000000000000000000000000000052605200000000000000000000000000000000000000000000000000000000000000527052000000000000000000000000000000000000000000000000000000000000005280520000000000000000000000000000000000000000000000000000000000000052905200000000000000000000000000000000000000000000000000000000000000530052000000000000000000000000000000000000000000000000000000000000005310520000000000000000000000000000000000000000000000000000000000000053205200000000000000000000000000000000000000000000000000000000000000533052000000000000000000000000000000000000000000000000000000000000005340520000000000000000000000000000000000000000000000000000000000000053505200000000000000000000000000000000000000000000000000000000000000536052000000000000000000000000000000000000000000000000000000000000005370520000000000000000000000000000000000000000000000000000000000000053805200000000000000000000000000000000000000000000000000000000000000539052000000000000000000000000000000000000000000000000000000000000005400520000000000000000000000000000000000000000000000000000000000000054105200000000000000000000000000000000000000000000000000000000000000542052000000000000000000000000000000000000000000000000000000000000005430520000000000000000000000000000000000000000000000000000000000000054405200000000000000000000000000000000000000000000000000000000000000545052000000000000000000000000000000000000000000000000000000000000005460520000000000000000000000000000000000000000000000000000000000000054705200000000000000000000000000000000000000000000000000000000000000548052000000000000000000000000000000000000000000000000000000000000005490520000000000000000000000000000000000000000000000000000000000000055005200000000000000000000000000000000000000000000000000000000000000551052000000000000000000000000000000000000000000000000000000000000005520520000000000000000000000000000000000000000000000000000000000000055305200000000000000000000000000000000000000000000000000000000000000554052000000000000000000000000000000000000000000000000000000000000005550520000000000000000000000000000000000000000000000000000000000000055605200000000000000000000000000000000000000000000000000000000000000557052000000000000000000000000000000000000000000000000000000000000005580520000000000000000000000000000000000000000000000000000000000000055905200000000000000000000000000000000000000000000000000000000000000560052000000000000000000000000000000000000000000000000000000000000005610520000000000000000000000000000000000000000000000000000000000000056205200000000000000000000000000000000000000000000000000000000000000563052000000000000000000000000000000000000000000000000000000000000005640520000000000000000000000000000000000000000000000000000000000000056505200000000000000000000000000000000000000000000000000000000000000566052000000000000000000000000000000000000000000000000000000000000005670520000000000000000000000000000000000000000000000000000000000000056805200000000000000000000000000000000000000000000000000000000000000569052000000000000000000000000000000000000000000000000000000000000005700520000000000000000000000000000000000000000000000000000000000000057105200000000000000000000000000000000000000000000000000000000000000572052000000000000000000000000000000000000000000000000000000000000005730520000000000000000000000000000000000000000000000000000000000000057405200000000000000000000000000000000000000000000000000000000000000575052000000000000000000000000000000000000000000000000000000000000005760520000000000000000000000000000000000000000000000000000000000000057705200000000000000000000000000000000000000000000000000000000000000578052000000000000000000000000000000000000000000000000000000000000005790520000000000000000000000000000000000000000000000000000000000000058005200000000000000000000000000000000000000000000000000000000000000581052000000000000000000000000000000000000000000000000000000000000005820520000000000000000000000000000000000000000000000000000000000000058305200000000000000000000000000000000000000000000000000000000000000584052000000000000000000000000000000000000000000000000000000000000005850520000000000000000000000000000000000000000000000000000000000000058605200000000000000000000000000000000000000000000000000000000000000587052000000000000000000000000000000000000000000000000000000000000005880520000000000000000000000000000000000000000000000000000000000000058905200000000000000000000000000000000000000000000000000000000000000590052000000000000000000000000000000000000000000000000000000000000005910520000000000000000000000000000000000000000000000000000000000000059205200000000000000000000000000000000000000000000000000000000000000593052000000000000000000000000000000000000000000000000000000000000005940520000000000000000000000000000000000000000000000000000000000000059505200000000000000000000000000000000000000000000000000000000000000596052000000000000000000000000000000000000000000000000000000000000005970520000000000000000000000000000000000000000000000000000000000000059805200000000000000000000000000000000000000000000000000000000000000599052000000000000000000000000000000000000000000000000000000000000006000520000000000000000000000000000000000000000000000000000000000000060105200000000000000000000000000000000000000000000000000000000000000602052000000000000000000000000000000000000000000000000000000000000006030520000000000000000000000000000000000000000000000000000000000000060405200000000000000000000000000000000000000000000000000000000000000605052000000000000000000000000000000000000000000000000000000000000006060520000000000000000000000000000000000000000000000000000000000000060705200000000000000000000000000000000000000000000000000000000000000608052000000000000000000000000000000000000000000000000000000000000006090520000000000000000000000000000000000000000000000000000000000000061005200000000000000000000000000000000000000000000000000000000000000611052000000000000000000000000000000000000000000000000000000000000006120520000000000000000000000000000000000000000000000000000000000000061305200000000000000000000000000000000000000000000000000000000000000614052000000000000000000000000000000000000000000000000000000000000006150520000000000000000000000000000000000000000000000000000000000000061605200000000000000000000000000000000000000000000000000000000000000617052000000000000000000000000000000000000000000000000000000000000006180520000000000000000000000000000000000000000000000000000000000000061905200000000000000000000000000000000000000000000000000000000000000620052000000000000000000000000000000000000000000000000000000000000006210520000000000000000000000000000000000000000000000000000000000000062205200000000000000000000000000000000000000000000000000000000000000623052000000000000000000000000000000000000000000000000000000000000006240520000000000000000000000000000000000000000000000000000000000000062505200000000000000000000000000000000000000000000000000000000000000626052000000000000000000000000000000000000000000000000000000000000006270520000000000000000000000000000000000000000000000000000000000000062805200000000000000000000000000000000000000000000000000000000000000629052000000000000000000000000000000000000000000000000000000000000006300520000000000000000000000000000000000000000000000000000000000000063105200000000000000000000000000000000000000000000000000000000000000632052000000000000000000000000000000000000000000000000000000000000006330520000000000000000000000000000000000000000000000000000000000000063405200000000000000000000000000000000000000000000000000000000000000635052000000000000000000000000000000000000000000000000000000000000006360520000000000000000000000000000000000000000000000000000000000000063705200000000000000000000000000000000000000000000000000000000000000638052000000000000000000000000000000000000000000000000000000000000006390520000000000000000000000000000000000000000000000000000000000000064005200000000000000000000000000000000000000000000000000000000000000641052000000000000000000000000000000000000000000000000000000000000006420520000000000000000000000000000000000000000000000000000000000000064305200000000000000000000000000000000000000000000000000000000000000644052000000000000000000000000000000000000000000000000000000000000006450520000000000000000000000000000000000000000000000000000000000000064605200000000000000000000000000000000000000000000000000000000000000647052000000000000000000000000000000000000000000000000000000000000006480520000000000000000000000000000000000000000000000000000000000000064905200000000000000000000000000000000000000000000000000000000000000650052000000000000000000000000000000000000000000000000000000000000006510520000000000000000000000000000000000000000000000000000000000000065205200000000000000000000000000000000000000000000000000000000000000653052000000000000000000000000000000000000000000000000000000000000006540520000000000000000000000000000000000000000000000000000000000000065505200000000000000000000000000000000000000000000000000000000000000656052000000000000000000000000000000000000000000000000000000000000006570520000000000000000000000000000000000000000000000000000000000000065805200000000000000000000000000000000000000000000000000000000000000659052000000000000000000000000000000000000000000000000000000000000006600520000000000000000000000000000000000000000000000000000000000000066105200000000000000000000000000000000000000000000000000000000000000662052000000000000000000000000000000000000000000000000000000000000006630520000000000000000000000000000000000000000000000000000000000000066405200000000000000000000000000000000000000000000000000000000000000665052000000000000000000000000000000000000000000000000000000000000006660520000000000000000000000000000000000000000000000000000000000000066705200000000000000000000000000000000000000000000000000000000000000668052000000000000000000000000000000000000000000000000000000000000006690520000000000000000000000000000000000000000000000000000000000000067005200000000000000000000000000000000000000000000000000000000000000671052000000000000000000000000000000000000000000000000000000000000006720520000000000000000000000000000000000000000000000000000000000000067305200000000000000000000000000000000000000000000000000000000000000674052000000000000000000000000000000000000000000000000000000000000006750520000000000000000000000000000000000000000000000000000000000000067605200000000000000000000000000000000000000000000000000000000000000677052000000000000000000000000000000000000000000000000000000000000006780520000000000000000000000000000000000000000000000000000000000000067905200000000000000000000000000000000000000000000000000000000000000680052000000000000000000000000000000000000000000000000000000000000006810520000000000000000000000000000000000000000000000000000000000000068205200000000000000000000000000000000000000000000000000000000000000683052000000000000000000000000000000000000000000000000000000000000006840520000000000000000000000000000000000000000000000000000000000000068505200000000000000000000000000000000000000000000000000000000000000686052000000000000000000000000000000000000000000000000000000000000006870520000000000000000000000000000000000000000000000000000000000000068805200000000000000000000000000000000000000000000000000000000000000689052000000000000000000000000000000000000000000000000000000000000006900520000000000000000000000000000000000000000000000000000000000000069105200000000000000000000000000000000000000000000000000000000000000692052000000000000000000000000000000000000000000000000000000000000006930520000000000000000000000000000000000000000000000000000000000000069405200000000000000000000000000000000000000000000000000000000000000695052000000000000000000000000000000000000000000000000000000000000006960520000000000000000000000000000000000000000000000000000000000000069705200000000000000000000000000000000000000000000000000000000000000698052000000000000000000000000000000000000000000000000000000000000006990520000000000000000000000000000000000000000000000000000000000000070005200000000000000000000000000000000000000000000000000000000000000701052000000000000000000000000000000000000000000000000000000000000007020520000000000000000000000000000000000000000000000000000000000000070305200000000000000000000000000000000000000000000000000000000000000704052000000000000000000000000000000000000000000000000000000000000007050520000000000000000000000000000000000000000000000000000000000000070605200000000000000000000000000000000000000000000000000000000000000707052000000000000000000000000000000000000000000000000000000000000007080520000000000000000000000000000000000000000000000000000000000000070905200000000000000000000000000000000000000000000000000000000000000710052000000000000000000000000000000000000000000000000000000000000007110520000000000000000000000000000000000000000000000000000000000000071205200000000000000000000000000000000000000000000000000000000000000713052000000000000000000000000000000000000000000000000000000000000007140520000000000000000000000000000000000000000000000000000000000000071505200000000000000000000000000000000000000000000000000000000000000716052000000000000000000000000000000000000000000000000000000000000007170520000000000000000000000000000000000000000000000000000000000000071805200000000000000000000000000000000000000000000000000000000000000719052000000000000000000000000000000000000000000000000000000000000007200520000000000000000000000000000000000000000000000000000000000000072105200000000000000000000000000000000000000000000000000000000000000722052000000000000000000000000000000000000000000000000000000000000007230520000000000000000000000000000000000000000000000000000000000000072405200000000000000000000000000000000000000000000000000000000000000725052000000000000000000000000000000000000000000000000000000000000007260520000000000000000000000000000000000000000000000000000000000000072705200000000000000000000000000000000000000000000000000000000000000728052000000000000000000000000000000000000000000000000000000000000007290520000000000000000000000000000000000000000000000000000000000000073005200000000000000000000000000000000000000000000000000000000000000731052000000000000000000000000000000000000000000000000000000000000007320520000000000000000000000000000000000000000000000000000000000000073305200000000000000000000000000000000000000000000000000000000000000734052000000000000000000000000000000000000000000000000000000000000007350520000000000000000000000000000000000000000000000000000000000000073605200000000000000000000000000000000000000000000000000000000000000737052000000000000000000000000000000000000000000000000000000000000007380520000000000000000000000000000000000000000000000000000000000000073905200000000000000000000000000000000000000000000000000000000000000740052000000000000000000000000000000000000000000000000000000000000007410520000000000000000000000000000000000000000000000000000000000000074205200000000000000000000000000000000000000000000000000000000000000743052000000000000000000000000000000000000000000000000000000000000007440520000000000000000000000000000000000000000000000000000000000000074505200000000000000000000000000000000000000000000000000000000000000746052000000000000000000000000000000000000000000000000000000000000007470520000000000000000000000000000000000000000000000000000000000000074805200000000000000000000000000000000000000000000000000000000000000749052000000000000000000000000000000000000000000000000000000000000007500520000000000000000000000000000000000000000000000000000000000000075105200000000000000000000000000000000000000000000000000000000000000752052000000000000000000000000000000000000000000000000000000000000007530520000000000000000000000000000000000000000000000000000000000000075405200000000000000000000000000000000000000000000000000000000000000755052000000000000000000000000000000000000000000000000000000000000007560520000000000000000000000000000000000000000000000000000000000000075705200000000000000000000000000000000000000000000000000000000000000758052000000000000000000000000000000000000000000000000000000000000007590520000000000000000000000000000000000000000000000000000000000000076005200000000000000000000000000000000000000000000000000000000000000761052000000000000000000000000000000000000000000000000000000000000007620520000000000000000000000000000000000000000000000000000000000000076305200000000000000000000000000000000000000000000000000000000000000764052000000000000000000000000000000000000000000000000000000000000007650520000000000000000000000000000000000000000000000000000000000000076605200000000000000000000000000000000000000000000000000000000000000767052000000000000000000000000000000000000000000000000000000000000007680520000000000000000000000000000000000000000000000000000000000000076905200000000000000000000000000000000000000000000000000000000000000770052000000000000000000000000000000000000000000000000000000000000007710520000000000000000000000000000000000000000000000000000000000000077205200000000000000000000000000000000000000000000000000000000000000773052000000000000000000000000000000000000000000000000000000000000007740520000000000000000000000000000000000000000000000000000000000000077505200000000000000000000000000000000000000000000000000000000000000776052000000000000000000000000000000000000000000000000000000000000007770520000000000000000000000000000000000000000000000000000000000000077805200000000000000000000000000000000000000000000000000000000000000779052000000000000000000000000000000000000000000000000000000000000007800520000000000000000000000000000000000000000000000000000000000000078105200000000000000000000000000000000000000000000000000000000000000782052000000000000000000000000000000000000000000000000000000000000007830520000000000000000000000000000000000000000000000000000000000000078405200000000000000000000000000000000000000000000000000000000000000785052000000000000000000000000000000000000000000000000000000000000007860520000000000000000000000000000000000000000000000000000000000000078705200000000000000000000000000000000000000000000000000000000000000788052000000000000000000000000000000000000000000000000000000000000007890520000000000000000000000000000000000000000000000000000000000000079005200000000000000000000000000000000000000000000000000000000000000791052000000000000000000000000000000000000000000000000000000000000007920520000000000000000000000000000000000000000000000000000000000000079305200000000000000000000000000000000000000000000000000000000000000794052000000000000000000000000000000000000000000000000000000000000007950520000000000000000000000000000000000000000000000000000000000000079605200000000000000000000000000000000000000000000000000000000000000797052000000000000000000000000000000000000000000000000000000000000007980520000000000000000000000000000000000000000000000000000000000000079905200000000000000000000000000000000000000000000000000000000000000800052000000000000000000000000000000000000000000000000000000000000008010520000000000000000000000000000000000000000000000000000000000000080205200000000000000000000000000000000000000000000000000000000000000803052000000000000000000000000000000000000000000000000000000000000008040520000000000000000000000000000000000000000000000000000000000000080505200000000000000000000000000000000000000000000000000000000000000806052000000000000000000000000000000000000000000000000000000000000008070520000000000000000000000000000000000000000000000000000000000000080805200000000000000000000000000000000000000000000000000000000000000809052000000000000000000000000000000000000000000000000000000000000008100520000000000000000000000000000000000000000000000000000000000000081105200000000000000000000000000000000000000000000000000000000000000812052000000000000000000000000000000000000000000000000000000000000008130520000000000000000000000000000000000000000000000000000000000000081405200000000000000000000000000000000000000000000000000000000000000815052000000000000000000000000000000000000000000000000000000000000008160520000000000000000000000000000000000000000000000000000000000000081705200000000000000000000000000000000000000000000000000000000000000818052000000000000000000000000000000000000000000000000000000000000008190520000000000000000000000000000000000000000000000000000000000000082005200000000000000000000000000000000000000000000000000000000000000821052000000000000000000000000000000000000000000000000000000000000008220520000000000000000000000000000000000000000000000000000000000000082305200000000000000000000000000000000000000000000000000000000000000824052000000000000000000000000000000000000000000000000000000000000008250520000000000000000000000000000000000000000000000000000000000000082605200000000000000000000000000000000000000000000000000000000000000827052000000000000000000000000000000000000000000000000000000000000008280520000000000000000000000000000000000000000000000000000000000000082905200000000000000000000000000000000000000000000000000000000000000830052000000000000000000000000000000000000000000000000000000000000008310520000000000000000000000000000000000000000000000000000000000000083205200000000000000000000000000000000000000000000000000000000000000833052000000000000000000000000000000000000000000000000000000000000008340520000000000000000000000000000000000000000000000000000000000000083505200000000000000000000000000000000000000000000000000000000000000836052000000000000000000000000000000000000000000000000000000000000008370520000000000000000000000000000000000000000000000000000000000000083805200000000000000000000000000000000000000000000000000000000000000839052000000000000000000000000000000000000000000000000000000000000008400520000000000000000000000000000000000000000000000000000000000000084105200000000000000000000000000000000000000000000000000000000000000842052000000000000000000000000000000000000000000000000000000000000008430520000000000000000000000000000000000000000000000000000000000000084405200000000000000000000000000000000000000000000000000000000000000845052000000000000000000000000000000000000000000000000000000000000008460520000000000000000000000000000000000000000000000000000000000000084705200000000000000000000000000000000000000000000000000000000000000848052000000000000000000000000000000000000000000000000000000000000008490520000000000000000000000000000000000000000000000000000000000000085005200000000000000000000000000000000000000000000000000000000000000851052000000000000000000000000000000000000000000000000000000000000008520520000000000000000000000000000000000000000000000000000000000000085305200000000000000000000000000000000000000000000000000000000000000854052000000000000000000000000000000000000000000000000000000000000008550520000000000000000000000000000000000000000000000000000000000000085605200000000000000000000000000000000000000000000000000000000000000857052000000000000000000000000000000000000000000000000000000000000008580520000000000000000000000000000000000000000000000000000000000000085905200000000000000000000000000000000000000000000000000000000000000860052000000000000000000000000000000000000000000000000000000000000008610520000000000000000000000000000000000000000000000000000000000000086205200000000000000000000000000000000000000000000000000000000000000863052000000000000000000000000000000000000000000000000000000000000008640520000000000000000000000000000000000000000000000000000000000000086505200000000000000000000000000000000000000000000000000000000000000866052000000000000000000000000000000000000000000000000000000000000008670520000000000000000000000000000000000000000000000000000000000000086805200000000000000000000000000000000000000000000000000000000000000869052000000000000000000000000000000000000000000000000000000000000008700520000000000000000000000000000000000000000000000000000000000000087105200000000000000000000000000000000000000000000000000000000000000872052000000000000000000000000000000000000000000000000000000000000008730520000000000000000000000000000000000000000000000000000000000000087405200000000000000000000000000000000000000000000000000000000000000875052000000000000000000000000000000000000000000000000000000000000008760520000000000000000000000000000000000000000000000000000000000000087705200000000000000000000000000000000000000000000000000000000000000878052000000000000000000000000000000000000000000000000000000000000008790520000000000000000000000000000000000000000000000000000000000000088005200000000000000000000000000000000000000000000000000000000000000881052000000000000000000000000000000000000000000000000000000000000008820520000000000000000000000000000000000000000000000000000000000000088305200000000000000000000000000000000000000000000000000000000000000884052000000000000000000000000000000000000000000000000000000000000008850520000000000000000000000000000000000000000000000000000000000000088605200000000000000000000000000000000000000000000000000000000000000887052000000000000000000000000000000000000000000000000000000000000008880520000000000000000000000000000000000000000000000000000000000000088905200000000000000000000000000000000000000000000000000000000000000890052000000000000000000000000000000000000000000000000000000000000008910520000000000000000000000000000000000000000000000000000000000000089205200000000000000000000000000000000000000000000000000000000000000893052000000000000000000000000000000000000000000000000000000000000008940520000000000000000000000000000000000000000000000000000000000000089505200000000000000000000000000000000000000000000000000000000000000896052000000000000000000000000000000000000000000000000000000000000008970520000000000000000000000000000000000000000000000000000000000000089805200000000000000000000000000000000000000000000000000000000000000899052000000000000000000000000000000000000000000000000000000000000009000520000000000000000000000000000000000000000000000000000000000000090105200000000000000000000000000000000000000000000000000000000000000902052000000000000000000000000000000000000000000000000000000000000009030520000000000000000000000000000000000000000000000000000000000000090405200000000000000000000000000000000000000000000000000000000000000905052000000000000000000000000000000000000000000000000000000000000009060520000000000000000000000000000000000000000000000000000000000000090705200000000000000000000000000000000000000000000000000000000000000908052000000000000000000000000000000000000000000000000000000000000009090520000000000000000000000000000000000000000000000000000000000000091005200000000000000000000000000000000000000000000000000000000000000911052000000000000000000000000000000000000000000000000000000000000009120520000000000000000000000000000000000000000000000000000000000000091305200000000000000000000000000000000000000000000000000000000000000914052000000000000000000000000000000000000000000000000000000000000009150520000000000000000000000000000000000000000000000000000000000000091605200000000000000000000000000000000000000000000000000000000000000917052000000000000000000000000000000000000000000000000000000000000009180520000000000000000000000000000000000000000000000000000000000000091905200000000000000000000000000000000000000000000000000000000000000920052000000000000000000000000000000000000000000000000000000000000009210520000000000000000000000000000000000000000000000000000000000000092205200000000000000000000000000000000000000000000000000000000000000923052000000000000000000000000000000000000000000000000000000000000009240520000000000000000000000000000000000000000000000000000000000000092505200000000000000000000000000000000000000000000000000000000000000926052000000000000000000000000000000000000000000000000000000000000009270520000000000000000000000000000000000000000000000000000000000000092805200000000000000000000000000000000000000000000000000000000000000929052000000000000000000000000000000000000000000000000000000000000009300520000000000000000000000000000000000000000000000000000000000000093105200000000000000000000000000000000000000000000000000000000000000932052000000000000000000000000000000000000000000000000000000000000009330520000000000000000000000000000000000000000000000000000000000000093405200000000000000000000000000000000000000000000000000000000000000935052000000000000000000000000000000000000000000000000000000000000009360520000000000000000000000000000000000000000000000000000000000000093705200000000000000000000000000000000000000000000000000000000000000938052000000000000000000000000000000000000000000000000000000000000009390520000000000000000000000000000000000000000000000000000000000000094005200000000000000000000000000000000000000000000000000000000000000941052000000000000000000000000000000000000000000000000000000000000009420520000000000000000000000000000000000000000000000000000000000000094305200000000000000000000000000000000000000000000000000000000000000944052000000000000000000000000000000000000000000000000000000000000009450520000000000000000000000000000000000000000000000000000000000000094605200000000000000000000000000000000000000000000000000000000000000947052000000000000000000000000000000000000000000000000000000000000009480520000000000000000000000000000000000000000000000000000000000000094905200000000000000000000000000000000000000000000000000000000000000950052000000000000000000000000000000000000000000000000000000000000009510520000000000000000000000000000000000000000000000000000000000000095205200000000000000000000000000000000000000000000000000000000000000953052000000000000000000000000000000000000000000000000000000000000009540520000000000000000000000000000000000000000000000000000000000000095505200000000000000000000000000000000000000000000000000000000000000956052000000000000000000000000000000000000000000000000000000000000009570520000000000000000000000000000000000000000000000000000000000000095805200000000000000000000000000000000000000000000000000000000000000959052000000000000000000000000000000000000000000000000000000000000009600520000000000000000000000000000000000000000000000000000000000000096105200000000000000000000000000000000000000000000000000000000000000962052000000000000000000000000000000000000000000000000000000000000009630520000000000000000000000000000000000000000000000000000000000000096405200000000000000000000000000000000000000000000000000000000000000965052000000000000000000000000000000000000000000000000000000000000009660520000000000000000000000000000000000000000000000000000000000000096705200000000000000000000000000000000000000000000000000000000000000968052000000000000000000000000000000000000000000000000000000000000009690520000000000000000000000000000000000000000000000000000000000000097005200000000000000000000000000000000000000000000000000000000000000971052000000000000000000000000000000000000000000000000000000000000009720520000000000000000000000000000000000000000000000000000000000000097305200000000000000000000000000000000000000000000000000000000000000974052000000000000000000000000000000000000000000000000000000000000009750520000000000000000000000000000000000000000000000000000000000000097605200000000000000000000000000000000000000000000000000000000000000977052000000000000000000000000000000000000000000000000000000000000009780520000000000000000000000000000000000000000000000000000000000000097905200000000000000000000000000000000000000000000000000000000000000980052000000000000000000000000000000000000000000000000000000000000009810520000000000000000000000000000000000000000000000000000000000000098205200000000000000000000000000000000000000000000000000000000000000983052000000000000000000000000000000000000000000000000000000000000009840520000000000000000000000000000000000000000000000000000000000000098505200000000000000000000000000000000000000000000000000000000000000986052000000000000000000000000000000000000000000000000000000000000009870520000000000000000000000000000000000000000000000000000000000000098805200000000000000000000000000000000000000000000000000000000000000989052000000000000000000000000000000000000000000000000000000000000009900520000000000000000000000000000000000000000000000000000000000000099105200000000000000000000000000000000000000000000000000000000000000992052000000000000000000000000000000000000000000000000000000000000009930520000000000000000000000000000000000000000000000000000000000000099405200000000000000000000000000000000000000000000000000000000000000995052000000000000000000000000000000000000000000000000000000000000009960520000000000000000000000000000000000000000000000000000000000000099705200000000000000000000000000000000000000000000000000000000000000998052000000000000000000000000000000000000000000000000000000000000009990520e57eb8d10b6eed36a88a464538f8fcedbba7b1a71d6ed52124f77b835807d0fd05201c53ca351e7f26f963ced56cf18f9ebee56535170171b72a0addb4e1613776850520636b8e5a599cfe0833dbe141dbc093d65e0a497451ac21415fbf03698587c7b905204ea21cad94a85adb252b0a76b9826c67d7c697ca386d201752e38f19ed92a223126170746f733a3a6d657461646174615f7630c201032003000000000000134552525f414c52454144595f50524553454e542c4164647265737320697320616c72656164792070726573656e7420696e207468652077686974656c6973742e2103000000000000134552525f4e4f5f535543485f41444452455353214e6f2073756368206164647265737320696e207468652077686974656c6973742e2203000000000000134552525f4e4f545f494e495449414c495a45441d57686974656c697374206973206e6f7420696e697469616c697a65642e000201090b010205020001040100051d0b0011050c020b02070321030907012707032900030e0701270a01110220031407002707032a000c030b030f000b013101380002010104010008b01f0b0011050c010b01070321030907012707032a000c030b030f000c020a020704310138000a020705310138000a020706310138000a020707310138000a020708310138000a020709310138000a02070a310138000a02070b310138000a02070c310138000a02070d310138000a02070e310138000a02070f310138000a020710310138000a020711310138000a020712310138000a020713310138000a020714310138000a020715310138000a020716310138000a020717310138000a020718310138000a020719310138000a02071a310138000a02071b310138000a02071c310138000a02071d310138000a02071e310138000a02071f310138000a020720310138000a020721310138000a020722310138000a020723310138000a020724310138000a020725310138000a020726310138000a020727310138000a020728310138000a020729310138000a02072a310138000a02072b310138000a02072c310138000a02072d310138000a02072e310138000a02072f310138000a020730310138000a020731310138000a020732310138000a020733310138000a020734310138000a020735310138000a020736310138000a020737310138000a020738310138000a020739310138000a02073a310138000a02073b310138000a02073c310138000a02073d310138000a02073e310138000a02073f310138000a020740310138000a020741310138000a020742310138000a020743310138000a020744310138000a020745310138000a020746310138000a020747310138000a020748310138000a020749310138000a02074a310138000a02074b310138000a02074c310138000a02074d310138000a02074e310138000a02074f310138000a020750310138000a020751310138000a020752310138000a020753310138000a020754310138000a020755310138000a020756310138000a020757310138000a020758310138000a020759310138000a02075a310138000a02075b310138000a02075c310138000a02075d310138000a02075e310138000a02075f310138000a020760310138000a020761310138000a020762310138000a020763310138000a020764310138000a020765310138000a020766310138000a020767310138000a020768310138000a020769310138000a02076a310138000a02076b310138000a02076c310138000a02076d310138000a02076e310138000a02076f310138000a020770310138000a020771310138000a020772310138000a020773310138000a020774310138000a020775310138000a020776310138000a020777310138000a020778310138000a020779310138000a02077a310138000a02077b310138000a02077c310138000a02077d310138000a02077e310138000a02077f310138000a02078001310138000a02078101310138000a02078201310138000a02078301310138000a02078401310138000a02078501310138000a02078601310138000a02078701310138000a02078801310138000a02078901310138000a02078a01310138000a02078b01310138000a02078c01310138000a02078d01310138000a02078e01310138000a02078f01310138000a02079001310138000a02079101310138000a02079201310138000a02079301310138000a02079401310138000a02079501310138000a02079601310138000a02079701310138000a02079801310138000a02079901310138000a02079a01310138000a02079b01310138000a02079c01310138000a02079d01310138000a02079e01310138000a02079f01310138000a0207a001310138000a0207a101310138000a0207a201310138000a0207a301310138000a0207a401310138000a0207a501310138000a0207a601310138000a0207a701310138000a0207a801310138000a0207a901310138000a0207aa01310138000a0207ab01310138000a0207ac01310138000a0207ad01310138000a0207ae01310138000a0207af01310138000a0207b001310138000a0207b101310138000a0207b201310138000a0207b301310138000a0207b401310138000a0207b501310138000a0207b601310138000a0207b701310138000a0207b801310138000a0207b901310138000a0207ba01310138000a0207bb01310138000a0207bc01310138000a0207bd01310138000a0207be01310138000a0207bf01310138000a0207c001310138000a0207c101310138000a0207c201310138000a0207c301310138000a0207c401310138000a0207c501310138000a0207c601310138000a0207c701310138000a0207c801310138000a0207c901310138000a0207ca01310138000a0207cb01310138000a0207cc01310138000a0207cd01310138000a0207ce01310138000a0207cf01310138000a0207d001310138000a0207d101310138000a0207d201310138000a0207d301310138000a0207d401310138000a0207d501310138000a0207d601310138000a0207d701310138000a0207d801310138000a0207d901310138000a0207da01310138000a0207db01310138000a0207dc01310138000a0207dd01310138000a0207de01310138000a0207df01310138000a0207e001310138000a0207e101310138000a0207e201310138000a0207e301310138000a0207e401310138000a0207e501310138000a0207e601310138000a0207e701310138000a0207e801310138000a0207e901310138000a0207ea01310138000a0207eb01310138000a0207ec01310138000a0207ed01310138000a0207ee01310138000a0207ef01310138000a0207f001310138000a0207f101310138000a0207f201310138000a0207f301310138000a0207f401310138000a0207f501310138000a0207f601310138000a0207f701310138000a0207f801310138000a0207f901310138000a0207fa01310138000a0207fb01310138000a0207fc01310138000a0207fd01310138000a0207fe01310138000a0207ff01310138000a02078002310138000a02078102310138000a02078202310138000a02078302310138000a02078402310138000a02078502310138000a02078602310138000a02078702310138000a02078802310138000a02078902310138000a02078a02310138000a02078b02310138000a02078c02310138000a02078d02310138000a02078e02310138000a02078f02310138000a02079002310138000a02079102310138000a02079202310138000a02079302310138000a02079402310138000a02079502310138000a02079602310138000a02079702310138000a02079802310138000a02079902310138000a02079a02310138000a02079b02310138000a02079c02310138000a02079d02310138000a02079e02310138000a02079f02310138000a0207a002310138000a0207a102310138000a0207a202310138000a0207a302310138000a0207a402310138000a0207a502310138000a0207a602310138000a0207a702310138000a0207a802310138000a0207a902310138000a0207aa02310138000a0207ab02310138000a0207ac02310138000a0207ad02310138000a0207ae02310138000a0207af02310138000a0207b002310138000a0207b102310138000a0207b202310138000a0207b302310138000a0207b402310138000a0207b502310138000a0207b602310138000a0207b702310138000a0207b802310138000a0207b902310138000a0207ba02310138000a0207bb02310138000a0207bc02310138000a0207bd02310138000a0207be02310138000a0207bf02310138000a0207c002310138000a0207c102310138000a0207c202310138000a0207c302310138000a0207c402310138000a0207c502310138000a0207c602310138000a0207c702310138000a0207c802310138000a0207c902310138000a0207ca02310138000a0207cb02310138000a0207cc02310138000a0207cd02310138000a0207ce02310138000a0207cf02310138000a0207d002310138000a0207d102310138000a0207d202310138000a0207d302310138000a0207d402310138000a0207d502310138000a0207d602310138000a0207d702310138000a0207d802310138000a0207d902310138000a0207da02310138000a0207db02310138000a0207dc02310138000a0207dd02310138000a0207de02310138000a0207df02310138000a0207e002310138000a0207e102310138000a0207e202310138000a0207e302310138000a0207e402310138000a0207e502310138000a0207e602310138000a0207e702310138000a0207e802310138000a0207e902310138000a0207ea02310138000a0207eb02310138000a0207ec02310138000a0207ed02310138000a0207ee02310138000a0207ef02310138000a0207f002310138000a0207f102310138000a0207f202310138000a0207f302310138000a0207f402310138000a0207f502310138000a0207f602310138000a0207f702310138000a0207f802310138000a0207f902310138000a0207fa02310138000a0207fb02310138000a0207fc02310138000a0207fd02310138000a0207fe02310138000a0207ff02310138000a02078003310138000a02078103310138000a02078203310138000a02078303310138000a02078403310138000a02078503310138000a02078603310138000a02078703310138000a02078803310138000a02078903310138000a02078a03310138000a02078b03310138000a02078c03310138000a02078d03310138000a02078e03310138000a02078f03310138000a02079003310138000a02079103310138000a02079203310138000a02079303310138000a02079403310138000a02079503310138000a02079603310138000a02079703310138000a02079803310138000a02079903310138000a02079a03310138000a02079b03310138000a02079c03310138000a02079d03310138000a02079e03310138000a02079f03310138000a0207a003310138000a0207a103310138000a0207a203310138000a0207a303310138000a0207a403310138000a0207a503310138000a0207a603310138000a0207a703310138000a0207a803310138000a0207a903310138000a0207aa03310138000a0207ab03310138000a0207ac03310138000a0207ad03310138000a0207ae03310138000a0207af03310138000a0207b003310138000a0207b103310138000a0207b203310138000a0207b303310138000a0207b403310138000a0207b503310138000a0207b603310138000a0207b703310138000a0207b803310138000a0207b903310138000a0207ba03310138000a0207bb03310138000a0207bc03310138000a0207bd03310138000a0207be03310138000a0207bf03310138000a0207c003310138000a0207c103310138000a0207c203310138000a0207c303310138000a0207c403310138000a0207c503310138000a0207c603310138000a0207c703310138000a0207c803310138000a0207c903310138000a0207ca03310138000a0207cb03310138000a0207cc03310138000a0207cd03310138000a0207ce03310138000a0207cf03310138000a0207d003310138000a0207d103310138000a0207d203310138000a0207d303310138000a0207d403310138000a0207d503310138000a0207d603310138000a0207d703310138000a0207d803310138000a0207d903310138000a0207da03310138000a0207db03310138000a0207dc03310138000a0207dd03310138000a0207de03310138000a0207df03310138000a0207e003310138000a0207e103310138000a0207e203310138000a0207e303310138000a0207e403310138000a0207e503310138000a0207e603310138000a0207e703310138000a0207e803310138000a0207e903310138000a0207ea03310138000a0207eb03310138000a0207ec03310138000a0207ed03310138000a0207ee03310138000a0207ef03310138000a0207f003310138000a0207f103310138000a0207f203310138000a0207f303310138000a0207f403310138000a0207f503310138000a0207f603310138000a0207f703310138000a0207f803310138000a0207f903310138000a0207fa03310138000a0207fb03310138000a0207fc03310138000a0207fd03310138000a0207fe03310138000a0207ff03310138000a02078004310138000a02078104310138000a02078204310138000a02078304310138000a02078404310138000a02078504310138000a02078604310138000a02078704310138000a02078804310138000a02078904310138000a02078a04310138000a02078b04310138000a02078c04310138000a02078d04310138000a02078e04310138000a02078f04310138000a02079004310138000a02079104310138000a02079204310138000a02079304310138000a02079404310138000a02079504310138000a02079604310138000a02079704310138000a02079804310138000a02079904310138000a02079a04310138000a02079b04310138000a02079c04310138000a02079d04310138000a02079e04310138000a02079f04310138000a0207a004310138000a0207a104310138000a0207a204310138000a0207a304310138000a0207a404310138000a0207a504310138000a0207a604310138000a0207a704310138000a0207a804310138000a0207a904310138000a0207aa04310138000a0207ab04310138000a0207ac04310138000a0207ad04310138000a0207ae04310138000a0207af04310138000a0207b004310138000a0207b104310138000a0207b204310138000a0207b304310138000a0207b404310138000a0207b504310138000a0207b604310138000a0207b704310138000a0207b804310138000a0207b904310138000a0207ba04310138000a0207bb04310138000a0207bc04310138000a0207bd04310138000a0207be04310138000a0207bf04310138000a0207c004310138000a0207c104310138000a0207c204310138000a0207c304310138000a0207c404310138000a0207c504310138000a0207c604310138000a0207c704310138000a0207c804310138000a0207c904310138000a0207ca04310138000a0207cb04310138000a0207cc04310138000a0207cd04310138000a0207ce04310138000a0207cf04310138000a0207d004310138000a0207d104310138000a0207d204310138000a0207d304310138000a0207d404310138000a0207d504310138000a0207d604310138000a0207d704310138000a0207d804310138000a0207d904310138000a0207da04310138000a0207db04310138000a0207dc04310138000a0207dd04310138000a0207de04310138000a0207df04310138000a0207e004310138000a0207e104310138000a0207e204310138000a0207e304310138000a0207e404310138000a0207e504310138000a0207e604310138000a0207e704310138000a0207e804310138000a0207e904310138000a0207ea04310138000a0207eb04310138000a0207ec04310138000a0207ed04310138000a0207ee04310138000a0207ef04310138000a0207f004310138000a0207f104310138000a0207f204310138000a0207f304310138000a0207f404310138000a0207f504310138000a0207f604310138000a0207f704310138000a0207f804310138000a0207f904310138000a0207fa04310138000a0207fb04310138000a0207fc04310138000a0207fd04310138000a0207fe04310138000a0207ff04310138000a02078005310138000a02078105310138000a02078205310138000a02078305310138000a02078405310138000a02078505310138000a02078605310138000a02078705310138000a02078805310138000a02078905310138000a02078a05310138000a02078b05310138000a02078c05310138000a02078d05310138000a02078e05310138000a02078f05310138000a02079005310138000a02079105310138000a02079205310138000a02079305310138000a02079405310138000a02079505310138000a02079605310138000a02079705310138000a02079805310138000a02079905310138000a02079a05310138000a02079b05310138000a02079c05310138000a02079d05310138000a02079e05310138000a02079f05310138000a0207a005310138000a0207a105310138000a0207a205310138000a0207a305310138000a0207a405310138000a0207a505310138000a0207a605310138000a0207a705310138000a0207a805310138000a0207a905310138000a0207aa05310138000a0207ab05310138000a0207ac05310138000a0207ad05310138000a0207ae05310138000a0207af05310138000a0207b005310138000a0207b105310138000a0207b205310138000a0207b305310138000a0207b405310138000a0207b505310138000a0207b605310138000a0207b705310138000a0207b805310138000a0207b905310138000a0207ba05310138000a0207bb05310138000a0207bc05310138000a0207bd05310138000a0207be05310138000a0207bf05310138000a0207c005310138000a0207c105310138000a0207c205310138000a0207c305310138000a0207c405310138000a0207c505310138000a0207c605310138000a0207c705310138000a0207c805310138000a0207c905310138000a0207ca05310138000a0207cb05310138000a0207cc05310138000a0207cd05310138000a0207ce05310138000a0207cf05310138000a0207d005310138000a0207d105310138000a0207d205310138000a0207d305310138000a0207d405310138000a0207d505310138000a0207d605310138000a0207d705310138000a0207d805310138000a0207d905310138000a0207da05310138000a0207db05310138000a0207dc05310138000a0207dd05310138000a0207de05310138000a0207df05310138000a0207e005310138000a0207e105310138000a0207e205310138000a0207e305310138000a0207e405310138000a0207e505310138000a0207e605310138000a0207e705310138000a0207e805310138000a0207e905310138000a0207ea05310138000a0207eb05310138000a0207ec05310138000a0207ed05310138000a0207ee05310138000a0207ef05310138000a0207f005310138000a0207f105310138000a0207f205310138000a0207f305310138000a0207f405310138000a0207f505310138000a0207f605310138000a0207f705310138000a0207f805310138000a0207f905310138000a0207fa05310138000a0207fb05310138000a0207fc05310138000a0207fd05310138000a0207fe05310138000a0207ff05310138000a02078006310138000a02078106310138000a02078206310138000a02078306310138000a02078406310138000a02078506310138000a02078606310138000a02078706310138000a02078806310138000a02078906310138000a02078a06310138000a02078b06310138000a02078c06310138000a02078d06310138000a02078e06310138000a02078f06310138000a02079006310138000a02079106310138000a02079206310138000a02079306310138000a02079406310138000a02079506310138000a02079606310138000a02079706310138000a02079806310138000a02079906310138000a02079a06310138000a02079b06310138000a02079c06310138000a02079d06310138000a02079e06310138000a02079f06310138000a0207a006310138000a0207a106310138000a0207a206310138000a0207a306310138000a0207a406310138000a0207a506310138000a0207a606310138000a0207a706310138000a0207a806310138000a0207a906310138000a0207aa06310138000a0207ab06310138000a0207ac06310138000a0207ad06310138000a0207ae06310138000a0207af06310138000a0207b006310138000a0207b106310138000a0207b206310138000a0207b306310138000a0207b406310138000a0207b506310138000a0207b606310138000a0207b706310138000a0207b806310138000a0207b906310138000a0207ba06310138000a0207bb06310138000a0207bc06310138000a0207bd06310138000a0207be06310138000a0207bf06310138000a0207c006310138000a0207c106310138000a0207c206310138000a0207c306310138000a0207c406310138000a0207c506310138000a0207c606310138000a0207c706310138000a0207c806310138000a0207c906310138000a0207ca06310138000a0207cb06310138000a0207cc06310138000a0207cd06310138000a0207ce06310138000a0207cf06310138000a0207d006310138000a0207d106310138000a0207d206310138000a0207d306310138000a0207d406310138000a0207d506310138000a0207d606310138000a0207d706310138000a0207d806310138000a0207d906310138000a0207da06310138000a0207db06310138000a0207dc06310138000a0207dd06310138000a0207de06310138000a0207df06310138000a0207e006310138000a0207e106310138000a0207e206310138000a0207e306310138000a0207e406310138000a0207e506310138000a0207e606310138000a0207e706310138000a0207e806310138000a0207e906310138000a0207ea06310138000a0207eb06310138000a0207ec06310138000a0207ed06310138000a0207ee06310138000a0207ef06310138000a0207f006310138000a0207f106310138000a0207f206310138000a0207f306310138000a0207f406310138000a0207f506310138000a0207f606310138000a0207f706310138000a0207f806310138000a0207f906310138000a0207fa06310138000a0207fb06310138000a0207fc06310138000a0207fd06310138000a0207fe06310138000a0207ff06310138000a02078007310138000a02078107310138000a02078207310138000a02078307310138000a02078407310138000a02078507310138000a02078607310138000a02078707310138000a02078807310138000a02078907310138000a02078a07310138000a02078b07310138000a02078c07310138000a02078d07310138000a02078e07310138000a02078f07310138000a02079007310138000a02079107310138000a02079207310138000a02079307310138000a02079407310138000a02079507310138000a02079607310138000a02079707310138000a02079807310138000a02079907310138000a02079a07310138000a02079b07310138000a02079c07310138000a02079d07310138000a02079e07310138000a02079f07310138000a0207a007310138000a0207a107310138000a0207a207310138000a0207a307310138000a0207a407310138000a0207a507310138000a0207a607310138000a0207a707310138000a0207a807310138000a0207a907310138000a0207aa07310138000a0207ab07310138000a0207ac07310138000a0207ad07310138000a0207ae07310138000a0207af07310138000a0207b007310138000a0207b107310138000a0207b207310138000a0207b307310138000a0207b407310138000a0207b507310138000a0207b607310138000a0207b707310138000a0207b807310138000a0207b907310138000a0207ba07310138000a0207bb07310138000a0207bc07310138000a0207bd07310138000a0207be07310138000a0207bf07310138000a0207c007310138000a0207c107310138000a0207c207310138000a0207c307310138000a0207c407310138000a0207c507310138000a0207c607310138000a0207c707310138000a0207c807310138000a0207c907310138000a0207ca07310138000a0207cb07310138000a0207cc07310138000a0207cd07310138000a0207ce07310138000a0207cf07310138000a0207d007310138000a0207d107310138000a0207d207310138000a0207d307310138000a0207d407310138000a0207d507310138000a0207d607310138000a0207d707310138000a0207d807310138000a0207d907310138000a0207da07310138000a0207db07310138000a0207dc07310138000a0207dd07310138000a0207de07310138000a0207df07310138000a0207e007310138000a0207e107310138000a0207e207310138000a0207e307310138000a0207e407310138000a0207e507310138000a0207e607310138000a0207e707310138000a0207e807310138000a0207e907310138000a0207ea07310138000b0207eb0731013800020201000100090807032b000c010b0110000b00380102030100000b1f38020c010d0107ec07310138000d0107ed07310138000d0107ee07310138000d0107ef07310138000d01071a310138000d01071b310138000b000b0112002d00020401040100051c0b0011050c020b02070321030907012707032900030e0701270a011102031307022707032a000c030b030f000b0138030102000000";
+    let res = run_binary_test("sample_whitelist", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_coin_store() {
+    let code = "a11ceb0b050000000e01001e021e0c032acb0604f5065405c907a41207ed19e80908d523800206d5252c108126420ac326090bcc26040cd026fd86010dcdad01020ecfad01040000010101020103020402050306030704080509050a0607060b070c070d000e08010001011104010001000f00010200000010010201000012030101000013040103000000001404010300000000150401030000000016040103000000001704010300000000180401030000000019040103000000001a040103000000001b040103000000001c040103000000001d040103000000001e040103000000001f0401030000000020040103000000002104010300000000220401030000000023040103000000002404010300000000250401030000000026040103000000002704010300000000280401030000000029040103000000002a040103000000002b040103000000002c040103000000002d040103000000002e040103000000002f0401030000000030040103000000003104010300000000320401030000000033050103000000003405010300000000350501030000000036050103000000003705010300000000380501030000000039050103000000003a050103000000003b050103000000003c050103000000003d050103000000003e050103000000003f0501030000000040050103000000004105010300000000420501030000000043050103000000004405010300000000450501030000000046050103000000004705010300000000480501030000000049050103000000004a050103000000004b050103000000004c050103000000004d050103000000004e050103000000004f050103000000005005010300000000510601010000520701010000530801010000540901020000005509010200000056000102000000570a010200000058070102000000590a01020000005a0b01020000005b0001020000005c0c0103000000005d0c01020000005e0c01020000005f0701010000600701010000610201010000620701010000630d01010000640e010100006502030100006601030100006702030100016810020100016911010100096a0114020000046b0100020000016c16030100016d01030100090b1819020000040b1a1b020000016e030101000c6f011d0200000b70031e020000066b0100030000000771221e030000000872010202000008730102020000087424000200000e6a01140200000d0b261e020000037508400002760202000165070301000477014200057801430200000a790100020000060b1a1b03000000011226010100017a48030100580f590f5a135a155b135c0f5d175e135e1559175d0f5f155f136017611361156215600f6320632164216513661366156515671568136815691562136420671369136c0f6e136f135c17702070215817710f720f020303000103010b010109000d030403040404010101010404040d0304030404010101010404040402060c0b0101090002060c0301060c0b030403040404010104040403060c030304060c0303010a060c03040403030404010102050303060c050301090001060b0101090002070b010109000b01010900230b010109000b010109010403040b010109000403040404040b010109010403030304040b010109000b010109000b01010901070b00010900040404040b010109000b010109000b0101090104040b0101090104040209000901020404020901090002070b0101090003010901040b01010900040b0101090104040b010109000b010109010b010109000b01010901040b01010900030b0101090103020b010109000b01010901250303030403040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b000109000404040b010109000b0101090003040404030b0101090104030403030303010b0101090122040303040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404040b0101090003040b010109000404030b0101090104040309000901090203090109000902020b010109000323040404040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040b0101090004040b0101090104040805070b01010900070b01010901030301040423040404040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b00010900040405040b0101090004040b010109000404040b01010901040402050b01010900240403040403040404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b010109010b010109000b01010900040b01010900040b010109010b0101090104040b01010900200303030403030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404030b01010900040303040b010109001d040303030404030404040403030304040b010109000b010109010b01010900070b000109000b01010901040403040b0101090003040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404050b01010900040b010109000b01010901040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b0101090004040b010109002603030304030403040404040403030304040b010109010b01010900070b00010900040405030b010109000b0101090104040b01010900040b01010900030b01010901040b01010901040304200303030b010109000b010109010403030403040404040403030304040b010109010b01010900070b000109000404030b010109000b01010901040303041d0303030403030304030404040403030304040b01010900070b0001090004040303040303030421030303040404030404030404040403030304040b010109010b01010900070b000109000404050b01010900030b010109000b01010901040303041f0303030404040304030404040403030304040b010109010b01010900070b0001090004040503040403040304230403030403040404040403030304040b010109000b01010901070b0001090004040503040b01010901040b010109000b01010900040b01010900030b01010901040b0101090104041d0b010109000b01010901040303030403040404040403030304040b010109000b01010901070b00010900040403040b010109000b0101090103041e04040403030404030404040403030304040b010109000b01010901070b000109000404050b0101090003040b010109000b0101090103041c040404030304030404040403030304040b010109000b01010901070b00010900040405030404030404240404040403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b01010901040b010109010b010109000b01010900040b01010900040b010109010b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b010109010b010109000b0101090104200404030303040304030404040403030304040b010109000b01010900070b000109000404050b01010901030b010109010b01010900040303041d040404030304030404040403030304040b010109000b01010900070b000109000404050b0101090103040b010109010b0101090003041e040404040404030404040403030304040b010109000b010109010b01010900070b000109000404050b01010901040b01010900040b010109010404240404040403040404040403030304040b010109000b010109000b01010901070b00010900040405040b010109000b0101090104040b01010900040b01010900040b01010901040b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b0001090004040504040b010109000b0101090104041f0404030303040304030404040403030304040b010109000b01010900070b00010900040405040304040303041c040404030304030404040403030304040b010109000b01010900070b000109000404050403040403041f04040404040404030404040403030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040404010b0001090001050d05030403070b000109000b01010901040b01010900040303030b01010900040302010101011a0504040404070b00010900070b000109010404030303030b01010901040404040b010109000b010109000b010109000b010109000b010109010b010109010b010109010b010109010f03030305040404030b010109010b01010901040b0101090003030b010109000e04040305040404030b010109000b01010901040b010109010b010109010b010109000f030303030305040404030b010109010403030301070b01010900030b0101090003070b000109000a636f696e5f73746f726504636f696e056572726f72067369676e65720f416e696d6553776170506f6f6c563116416e696d6553776170506f6f6c56314c6962726172790e6c69717569646974795f706f6f6c06726f7574657203616d6d09546f6b656e537761700f546f6b656e53776170436f6e66696704737761700a616d6d5f726f7574657208616d6d5f737761700b4d79436f696e53746f726512616e696d65737761705f73746172737761700762616c616e636504436f696e076465706f736974066c3073307431066c3073317430066c3173307431066c3173307432066c3173307433066c3173307434066c3173307435066c3173317430066c3173317432066c3173317433066c3173317434066c3173317435066c3173327430066c3173327431066c3173327433066c3173327434066c3173327435066c3173337430066c3173337431066c3173337432066c3173337434066c3173337435066c3173347430066c3173347431066c3173347432066c3173347433066c3173347435066c3173357430066c3173357431066c3173357432066c3173357433066c3173357434066c3273307431066c3273307432066c3273307433066c3273307434066c3273307435066c3273317430066c3273317432066c3273317433066c3273317434066c3273317435066c3273327430066c3273327431066c3273327433066c3273327434066c3273327435066c3273337430066c3273337431066c3273337432066c3273337434066c3273337435066c3273347430066c3273347431066c3273347432066c3273347433066c3273347435066c3273357430066c3273357431066c3273357432066c3273357433066c3273357434036e65770d6e65775f66726f6d5f6d61696e0d6e65775f66726f6d5f7a65726f047330743104733174301073696d706c655f616e696d65737761701373696d706c655f616e696d65737761705f76320f73696d706c655f73746172737761701273696d706c655f73746172737761705f76321273696d706c655f73746172737761705f76331273746172737761705f616e696d657377617012737761705f61625f6c69717569647377617008737761705f61757810737761705f70616e63616b6573776170127472616e736665725f66726f6d5f6d61696e197472616e736665725f66726f6d5f6d61696e5f736372697074107472616e736665725f746f5f6d61696e177472616e736665725f746f5f6d61696e5f736372697074117472616e736665725f746f5f6f74686572187472616e736665725f746f5f6f746865725f7363726970740877697468647261770c77697468647261775f616c6c0c77697468647261775f616e790576616c7565056d657267650c6765745f7265736572766573116765745f72657365727665735f73697a650765787472616374047a65726f0c64657374726f795f7a65726f0e746f6b656e5f726573657276657321737761705f65786163745f785f746f5f795f6469726563745f65787465726e616c18737761705f65786163745f636f696e5f666f725f636f696e04785f617504795f61751c737761705f65786163745f636f696e5f666f725f636f696e5f6d75740a616464726573735f6f66117065726d697373696f6e5f64656e6965640e6765745f61646d696e5f6461746107636f6d70617265116765745f706f756e646167655f726174650b657874726163745f616c6cd1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac000000000000000000000000000000000000000000000000000000000000000116fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12bd35135844473187163ca197ca93b2ab014370587bb0ed3befff9e902d6bb541c755e4c8d7a6ab6d56f9289d97c43c1c94bde75ec09147c90d35cd1be61c8fb9c7efb4076dbe143cbcd98cfaaa929ecfc8f299203dfff63b95ccb6bfe19850faec42a352cc65eca17a9fa85d0fc602295897ed6b8b8af6a6c79ef490eb8f9eba0308915f0100000000000520d1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac126170746f733a3a6d657461646174615f76302e01915f010000000000234552524f525f5448455f4f55545055545f4c4553535f5448414e5f4d494e5f5245435600000201010b01010900000f001700010400010206ffffffffffffffff270101000100010507013c0037003800020201000100010607013c0036000b0038010203010400010206ffffffffffffffff2704010400010206ffffffffffffffff2705010400010206ffffffffffffffff2706010400010206ffffffffffffffff2707010400010206ffffffffffffffff2708010400010206ffffffffffffffff2709010400010206ffffffffffffffff270a010400010206ffffffffffffffff270b010400010206ffffffffffffffff270c010400010206ffffffffffffffff270d010400010206ffffffffffffffff270e010400010206ffffffffffffffff270f010400010206ffffffffffffffff2710010400010206ffffffffffffffff2711010400010206ffffffffffffffff2712010400010206ffffffffffffffff2713010400010206ffffffffffffffff2714010400010206ffffffffffffffff2715010400010206ffffffffffffffff2716010400010206ffffffffffffffff2717010400010206ffffffffffffffff2718010400010206ffffffffffffffff2719010400010206ffffffffffffffff271a010400010206ffffffffffffffff271b010400010206ffffffffffffffff271c010400010206ffffffffffffffff271d010400010206ffffffffffffffff271e010400010206ffffffffffffffff271f010400010206ffffffffffffffff2720010400010206ffffffffffffffff2721010400010206ffffffffffffffff2722010400010206ffffffffffffffff27230104010012f1010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c180c1738040c10350b10350c1f0c1e0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1f160c110a170a1f180a111a0c0f0a1e0a18180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c2f0a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2f23045e054d0a270c2f0a0f0a11180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2f0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c240b150b18180b241a320b000000000000000000000000000000170c130a130b0c180c160b1f0b0a180a16160c250b160b1e180b251a320b000000000000000000000000000000170c1a0a1a0a04170b0317010b04340c1407013c000c230a23370038000c1b0a2336000b1438050c200b0804ab010b200b133806320000000000000000000000000000000038070c190c120c2d0c2805b401380632000000000000000000000000000000000b200b1338080c120c190c280c2d0d280b1238010d2d0b1938090b2d0c220a2336000b283801380a0c290b0704cd010b220600000000000000000b290b1a34380b0c0d0c0e05d5010b290b1a340b22060000000000000000380c0c0e0c0d0b0e0b0d0c210c2a0a2336000b2138010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404ea0105ee010b1c0b1d17270b2a380d0224010401001cef010b05040638020c2c0c26050d38030c2b0c2f0b2b0c260b2f0c2c0b260b2c0c190c180b060418380e0c0f0c0e0c0d0522380f0c300c290c2d0b290b2d0b300c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c1f0c1e0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1f160c120a180a1f180a121a0c100a1e0a19180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c310a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a3123047205610a2a0c310a100a12180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055c0b310b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1f0b0a180a17160c250b170b1e180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c230a23370038000c1b0a2336000b1538050c200b0804bd010b200b143806320000000000000000000000000000000038070c1a0c130c2e0c2705c601380632000000000000000000000000000000000b200b1438080c130c1a0c270c2e0d270b1338010d2e0b1a38090b2e0c210a2336000b273801380a0c280b2138100c220a2336000b2238010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404e80105ec010b1c0b1d17270b2838110225010401001fe8010b05040638020c2a0c24050d38030c290c2d0b290c240b2d0c2a0b240b2a0c170c160b06041738120c0f0c0e051e38130c260c2b0b260c0e0b2b0c0f0b0e350b0f350c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0d0a1c0a17180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2e0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2e23046a05590a270c2e0a0d0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2e0b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2c0c2805be01380632000000000000000000000000000000000b1e0b1238080c110c180c280c2c0d280b1138010d2c0b1838090b2c0c200a2136000b283801380a0c250b2006000000000000000038140c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b25381102260104010023f8010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c170c160b06041a3815353816350c0e0c0d05203817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2f23046a05590a290c2f0a0f0a10180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b7010b1e0a123806320000000000000000000000000000000038070c180c110c2d0c2a05c001380632000000000000000000000000000000000b1e0a1238080c110c180c2a0c2d0d2a0b1138010d2d0b1838090b2d0c200a2136000b2a3801380a0c270b240d200d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404f10105f5010b1a0b1b17270b28380d02270104010025e8010b05040638020c2b0c25050d38030c2a0c2e0b2a0c250b2e0c2b0b250b2b0c170c160b060417381a0c0e0c0d051e381b0c270c2c0b270b2c0c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104700a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2f23046805570a280c2f0a0f0a10180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2d0c2905be01380632000000000000000000000000000000000b1e0b1238080c110c180c290c2d0d290b1138010d2d0b1838090b2d0c1f0a2136000b293801380a0c260b240b1f381c0c200a2136000b2038010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b26381102280104010027f20138040c0e350b0e350c150c140b06040d38020c2b0c24051438030c290c2e0b290c240b2e0c2b0b240b2b0c1b0c1a0a0432000000000000000000000000000000002104660a150a0c180a0a1a0a1b160c0f0a140a1b180a0f1a0c0d0a1a0a15180a0c180a0a1a0b0f1a0c0f0a0d0a0f180a0b180a091a0c2f0a0d0a0f180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23045e054d0a250c2f0a0d0a0f180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505480b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c210b120b15180b211a320b000000000000000000000000000000170c100a100b0c180c130b1b0b0a180a13160c220b130b1a180b221a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c230a233c000c1f0a1f370038000c170a1f36000b1138050c1c0b0804ac010b1c06000000000000000038060b1034380c0c200c3005b40138060b10340b1c060000000000000000380b0c300c200b300b200c1d0c270b0704c4010b1d0b160b27320000000000000000000000000000000038080c280c2d0c2a0c2c05cd010b2732000000000000000000000000000000000b1d0b1638070c2d0c280c2c0c2a0d2a0b2838010d2c0b2d38090b2a0c1e0b2c0c260a1f36000b1e38010b170b02160c180b1f370038000c190a190a182404e80105ec010b180b1917270b233c0136010b26380902290104010028d90138040c11350b11350c190c180b06040e380e0c0f0c0e0c0d0518380f0c2a0c260c290b260b290b2a0c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c1e0c1d0a0432000000000000000000000000000000002104700a190a0c180a0a1a0a1e160c130a180a1e180a131a0c100a1d0a19180a0c180a0a1a0b131a0c130a100a13180a0b180a091a0c2b0a100a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2b23046805570a280c2b0a100a13180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2b0b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1e0b0a180a17160c250b170b1d180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c220a22370038000c1a0a2236000b1538050c1f0b0804b2010b1f06000000000000000038060b1434380c0c230c2c05ba0138060b14340b1f060000000000000000380b0c2c0c230b2c0b230c200c270b2038100c210a2236000b2138010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404d20105d6010b1b0b1c17270b273811022a0104010029d20138040c0f350b0f350c170c160b06040d38120c100c0e051438130c240c270b240c0e0b270c100b0e350b10350c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0d0a1b0a17180a0c180a0a1a0b111a0c110a0d0a11180a0b180a091a0c280a0d0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a28230460054f0a250c280a0d0a11180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b280b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2905b20138060b12340b1d060000000000000000380b0c290c210b290b210c1e0c260b1e06000000000000000038140c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b263811022b010401002ae20138040c10350b10350c170c160b0604103815353816350c0e0c0d05163817353818350c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a29230460054f0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c26054a0b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804ac010b1d06000000000000000038060a1234380c0c210c2a05b40138060a12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240d1e0d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b1e0c280b250c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404db0105df010b190b1a17270b28380d022c010401002bd20138040c10350b10350c170c160b06040d381a0c0e0c0d0514381b0c250c280b250b280c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104660a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2923045e054d0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605480b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2a05b20138060b12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b273811022d010401002cec010b050407380e0c0f0c0e0c0d0511380f0c310c240c2c0b240b2c0b310c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c170c160b06042138020c2e0c27052838030c2a0c300b2a0c270b300c2e0b270b2e0c1d0c1c0a04320000000000000000000000000000000021047a0a170a0c180a0a1a0a1d160c120a160a1d180a121a0c100a1c0a17180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c320a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a3223047205610a280c320a100a12180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c28055c0b320b10170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a0b0c180c150b1d0b0a180a15160c220b150b1c180b221a0c180a180a04170b0317010b04340c1307010c230a233c000c200a20370038000c190a2036000b133805381d0c1e380a0c250b0704be010b1e0b180b25320000000000000000000000000000000038080c290c2f0c2b0c2d05c7010b2532000000000000000000000000000000000b1e0b1838070c2f0c290c2d0c2b0d2b0b2938010d2d0b2f38090b2b0c1f0b2d0c260a2036000b1f38010b190b02160c1a0b20370038000c1b0a1b0a1a2404e20105e6010b1a0b1b17270b233c0136010b263809022e010401002dd5010b050407380e0c0f0c0e0c0d0511380f0c2b0c260c2a0b260b2a0b2b0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c1938040c14350b14350c200c1f0a0432000000000000000000000000000000002104700a1a0a0c180a0a1a0a20160c150a190a20180a151a0c120a1f0a1a180a0c180a0a1a0b151a0c150a120a15180a0b180a091a0c2c0a120a15180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23046805570a290c2c0a120a15180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905520b2c0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c240b170b1a180b241a0b0c180c180b200b0a180a18160c250b180b1f180b251a0c1b0a1b0a04170b0317010b04340c1607013c000c230a23370038000c1c0a2336000b163805381d0c21380a0c270b0704b1010b210600000000000000000b270b1b34380b0c100c1105b9010b270b1b340b21060000000000000000380c0c110c100b110b100c220c280a2336000b2238010b1c0b02160c1d0b23370038000c1e0a1e0a1d2404ce0105d2010b1d0b1e17270b28380d022f010401002ec6010b050407380e0c0f0c0e0c0d0511380f0c280c230c260b230b260b280c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c190c180b06042138120c130c11052838130c240c270b240c110b270c130b11350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805381d06000000000000000038140c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c17270230010401002fde010b050407380e0c0f0c0e0c0d0511380f0c2c0c270c2b0b270b2b0b2c0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c190b0604243815353816350c110c10052a3817353818350c110c100b100b110c1f0c1e0a04320000000000000000000000000000000021047c0a1a0a0c180a0a1a0a1f160c140a190a1f180a141a0c120a1e0a1a180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2d0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a2d23047405630a2a0c2d0a120a14180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055e0b2d0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c230b170b1a180b231a0c150a150b0c180c180b1f0b0a180a18160c240b180b1e180b241a0a04170b0317010b04340c1607010c250a253c000c220a22370038000c1b0a2236000b163805381d0c20380a0c280b250d200d280b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b280c260b200c290b260c210a2236000b2138010b1b0b02160c1c0b22370038000c1d0a1d0a1c2404d70105db010b1c0b1d17270b29380d02310104010030c8010b050407380e0c0f0c0e0c0d0511380f0c2a0c250c280b250b280b2a0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c190c180b060421381a0c110c100528381b0c260c290b260b290c110c100b100b110c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b153805381d0c1f0b240b1f381c0c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c172702320104010031e5010b05040638120c0f0c0e050d38130c220c2a0b220c0e0b2a0c0f0b0e350b0f350c150c140b06041938020c2c0c23052038030c280c2e0b280c230b2e0c2c0b230b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0d0a1a0a15180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2f0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23046a05590a250c2f0a0d0a10180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c1f0b120b15180b1f1a0b0c180c130b1b0b0a180a13160c200b130b1a180b201a0c160a160a04170b0317010b04340c1107010c210a213c000c1e0a1e370038000c170a1e36000b113805060000000000000000381e0c1d380a0c260b0704b7010b1d0b160b26320000000000000000000000000000000038080c270c2d0c290c2b05c0010b2632000000000000000000000000000000000b1d0b1638070c2d0c270c2b0c290d290b2738010d2b0b2d38090b290c1c0b2b0c240a1e36000b1c38010b170b02160c180b1e370038000c190a190a182404db0105df010b180b1917270b213c0136010b24380902330104010032ce010b05040638120c110c10050d38130c240c280b240c100b280c110b10350b11350c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c0f0a1d0a18180a0c180a0a1a0b131a0c130a0f0a13180a0b180a091a0c290a0f0a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a29230460054f0a250c290a0f0a13180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b290b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0b0c180c160b1e0b0a180a16160c230b160b1d180b231a0c190a190a04170b0317010b04340c1407013c000c210a21370038000c1a0a2136000b143805060000000000000000381e0c20380a0c260b0704aa010b200600000000000000000b260b1934380b0c0d0c0e05b2010b260b19340b20060000000000000000380c0c0e0c0d0b0e0b0d0c1f0c270a2136000b1f38010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c70105cb010b1b0b1c17270b27380d0234010401002ec6010b05040638120c120c11050d38130c230c260b230c110b260c120b11350b12350c190c180b06041a380e0c0f0c0e0c0d0524380f0c280c240c270b240b270b280c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805060000000000000000381e38100c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c172702350104010033d7010b05040638120c110c10050d38130c250c290b250c100b290c110b10350b11350c180c170b06041c3815353816350c0e0c0d05223817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104740a180a0c180a0a1a0a1d160c120a170a1d180a121a0c0f0a1c0a18180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c2a0a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2a23046c055b0a260c2a0a0f0a12180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605560b2a0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c210b150b18180b211a0c130a130b0c180c160b1d0b0a180a16160c220b160b1c180b221a0a04170b0317010b04340c1407010c230a233c000c200a20370038000c190a2036000b143805060000000000000000381e0c1f380a0c270b230d1f0d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c240b1f0c280b240c1e0a2036000b1e38010b190b02160c1a0b20370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02360104010034c1010b05040638120c110c10050d38130c230c260b230c100b260c110b10350b11350c170c160b060419381a0c0e0c0d0520381b0c240c270b240b270c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b133805060000000000000000381e0c1e0b220b1e381c0c1d0a1f36000b1d38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a172702370104010035f9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c150c140b06041938020c2c0c24052038030c2a0c2f0b2a0c240b2f0c2c0b240b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a3023046a05590a260c300a0f0a10180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605540b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a320b000000000000000000000000000000170b0c180c130b1b0b0a180a13160c210b130b1a180b211a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000a1138050c1c38060c270a220d1c0d270b11340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c230b1c0c280b230c1e0b0704cb010b1e0b160b28320000000000000000000000000000000038080c290c2e0c2b0c2d05d4010b2832000000000000000000000000000000000b1e0b1638070c2e0c290c2d0c2b0d2b0b2938010d2d0b2e38090b2b0c1d0b2d0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404ef0105f3010b180b1917270b223c0136010b25380902380104010036e4010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b230460054f0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27054a0b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a320b000000000000000000000000000000170b0c180c160b1e0b0a180a16160c240b160b1d180b241a320b000000000000000000000000000000170c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000a1438050c1f38060c280b250d1f0d280b14340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c260b1f0c290b260c210b0704c0010b210600000000000000000b290b1934380b0c0f0c1005c8010b290b19340b21060000000000000000380c0c100c0f0b100b0f0c200c2a0a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404dd0105e1010b1b0b1c17270b2a380d02390104010037e0010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c190c180b06041a380e0c110c100c0f0524380f0c2b0c260c2a0b260b2a0b2b0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2c0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23047405630a290c2c0a120a14180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c29055e0b2c0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a320b000000000000000000000000000000170b0c180c170b1e0b0a180a17160c230b170b1d180b231a320b000000000000000000000000000000170a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000a1538050c1f38060c270b240d1f0d270b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c250b1f0c280b2538100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404d90105dd010b1b0b1c17270b283811023a0104010038d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b06041938120c110c10052038130c240c280b240c100b280c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104740a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c290a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923046c055b0a250c290a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505560b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c210b150b1b180b211a320b000000000000000000000000000000170a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000a1338050c1d38060c260b220d1d0d260b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b260c230b1d0c270b2306000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404d20105d6010b190b1a17270b273811023b0104010039d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b060419381a0c100c0f0520381b0c250c290b250b290c100c0f0b0f0b100c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c110a1b0a17180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2a0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2a23046a05590a270c2a0a110a12180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2a0b11170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c220b150b1b180b221a320b000000000000000000000000000000170a04170b0317010b04340c1307010c230a233c000c200a20370038000c180a2036000a1338050c1d38060c280a230d1d0d280b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c240b1d0c260b240c1e0b230b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404d20105d6010b190b1a17270b263811023c010401003ae5010b050406381a0c0e0c0d050d381b0c230c2b0b230b2b0c0e0c0d0b0d0b0e0c150c140b06041738020c2d0c26051e38030c290c2f0b290c260b2f0c2d0b260b2d0c1b0c1a0a0432000000000000000000000000000000002104700a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a3023046805570a270c300a0f0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705520b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a0b0c180c130b1b0b0a180a13160c210b130b1a180b211a0c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000b1138050c1c0a220b1c38200c1e380a0c240b0704b7010b1e0b160b24320000000000000000000000000000000038080c280c2e0c2a0c2c05c0010b2432000000000000000000000000000000000b1e0b1638070c2e0c280c2c0c2a0d2a0b2838010d2c0b2e38090b2a0c1d0b2c0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404db0105df010b180b1917270b223c0136010b253809023d010401003bd0010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23045e054d0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a0b0c180c160b1e0b0a180a16160c240b160b1d180b241a0c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000b1438050c1f0b250b1f38200c21380a0c280b0704ac010b210600000000000000000b280b1934380b0c0f0c1005b4010b280b19340b21060000000000000000380c0c100c0f0b100b0f0c200c290a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404c90105cd010b1b0b1c17270b29380d023e010401003cc8010b050406381a0c0e0c0d050d381b0c250c280b250b280c0e0c0d0b0d0b0e0c190c180b060418380e0c110c100c0f0522380f0c2a0c260c290b260b290b2a0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b1538050c1f0b240b1f382038100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c1727023f010401003dc1010b050406381a0c0e0c0d050d381b0c230c260b230b260c0e0c0d0b0d0b0e0c170c160b06041738120c110c10051e38130c240c270b240c100b270c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b1338050c1d0b220b1d382006000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a17270240010401003ed7010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c170b06041a3815353816350c100c0f05203817353818350c100c0f0b0f0b100c1d0c1c0a0432000000000000000000000000000000002104720a180a0c180a0a1a0a1d160c120a170a1d180a121a0c110a1c0a18180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2b0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2b23046a05590a290c2b0a110a12180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0c130a130b0c180c160b1d0b0a180a16160c230b160b1c180b231a0a04170b0317010b04340c1407010c240a243c000c210a21370038000c190a2136000b1438050c1e0a240b1e38200c20380a0c270b240d200d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02410300003f070b0139000c020b000b023f0002420104003f140a00116a0701210406050b0b0001060000000000000000116b270a000b01382139000c020b000b023f0002430104003f120a00116a0701210406050b0b0001060000000000000000116b27380a39000c010b000b013f000244010400010206ffffffffffffffff2745010400010206ffffffffffffffff27460104000102060000000000000000274701040100415b0b00116a0c030a030701210408050b060000000000000000116b270a033c000c070a0736000b0138050c0a0e0a38000c04116d0101010c0e38040c0d0c0c0b04350610270000000000000b0e1735180c050a050b0d35180c0b0b0c353210270000000000000000000000000000180b05160c090b0b0b091a340c060a060b0226043c05400b07010700273822044a0b0a06000000000000000038060b06380c0c080c0f055138060b060b0a060000000000000000380b0c0f0c080b0736000b0f38010b033c0136010b0838090248010400010206000000000000000027490104000102060000000000000000274a010401004493010b00116a0c040a040701210408050b060000000000000000116b270b03044f38020c140c1238230c0d0c0f0a01350a0d0b0f1735180c050b120b0d35180a05160c0b0b050b14180b0b1a0c070a070b023524042e05300700270a043c000c090a0936000b0138050b073806320000000000000000000000000000000038070c1c0c180c1a0c160d160b1838010d1a0b1c38090b0936000b1638010b043c0136010b1a380905920138020c130c1538230c0e0c100a01350a0e0b101735180c060b130b0e35180a06160c0c0b060b15180b0c1a0c080a080b023524047005720700270a043c010c0a0a0a36010b0138240c11380a32000000000000000000000000000000000b110b0838070c1d0c190c1b0c170d170b1938010d1b0b1d38090b0a36010b1b38090b043c0036000b173801024b010400010206ffffffffffffffff274c0104010045650b00116a0c0d0a0d0701210408050b060000000000000000116b270b08041138120c0b0c0a051838130c160c170b160c0a0b170c0b0b0a350b0b350c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000b0438050c150b0904480b1506000000000000000038060b0c38250c130c18054f38060b0c0b1506000000000000000038260c180c130b180b130c1238110e1238270c110a110a0524045b055f0b050b1117270b0d3c0136010b123809024d0104010046650b00116a0c0d0a0d0701210408050b060000000000000000116b270b0804143815353816350c0b0c0a051a3817353818350c0b0c0a0b0a0b0b0c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000a0438050c1238060c160a0d0d120d160b040600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b160c150b120c170b150c130e1338270c110a110a05240459055d0b050b1117270b0d3c0136010b1338090b173811024e0104010047590b00116a0c0f0a0f0701210408050b060000000000000000116b270b080412380e0c0c0c0b0c0a051c380f0c180c160c170b160b170b180c0c0c0b0c0a0b0a0b0b0b0c010c0d350b0d350c120c110b030b07180c100b110b06180a10160c150b100b12180b151a340c0e0a0e0a0526043c05400b050b0e17270a0f3c0036000b043805381d0c140e1438270c130a130a0524044f05530b050b1317270b0f3c0136010b143809024f03000100030a0b000b0138210c0207013c0036000b02380102500004010026170a00116a0c020a020701210408050d0b0001060000000000000000116b270b000b0138210c030b023c0036000b033801025103000100260c07010c010a013c0036000b0038050c020b010b02382802520004010026150b00116a0c020a020701210408050b060000000000000000116b270a023c0036000b0138050c030b020b033828025303000100030a07013c0036000b0138050c020b000b02382802540004010026150b00116a0c030a030701210408050b060000000000000000116b270b033c0036000b0238050c040b010b043828025503000100010607013c0036000b003805025603000100010507013c0036003829025703000100491707013c000c030a03370038000c020a000b022404110b0336000b0038050c0105150b03360038290c010b01020000000f001700";
+    let res = run_binary_test("sample_coin_store", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_liquidity_pool() {
+    let code = "a11ceb0b050000000e0100240224ab0103cf01b6030485056405e905eb0507d40bde0d08b2196006921ab80110ca1bd8070aa223ef010b9125160ca725c9120df0372a0e9a38280000010101020103010401050106000700080009000a000b000c000d000e000f021002110012080300010001000100130003000100010001001406030001000100010015060300010001000100160803000100010001001706030001000100010018060300010001000100190800001a0603000100010001001b0603000100010001001c0603000100010001001d06030001000100010220040100010d210003000100010001033804010601024f05010001025105010001015b0600105e0700027305010001057407001185010700001e00010100001f01010300000000220203030000000023040503000000002401060300000000250107030000000026010403000000002701040300000000280107030000000029010403000000002a010403000000002b080100002c010903000000002d010903000000002e030203000000002f0a0b01000030050103000000003108010300000000320c010300000000330c010300000000340d010300000000350e030300000000360d0103000000085f010901000f6011120010611314000862010901001063151200106407120010651612000766010902000002671c0701000768011501000e691e0700026a1f200100022221010100036b230101060a6c010100046d0828000c6e0827000b2b0801000a2b0801000e6f0415000e7015070002712a010100022e2b2001000e722e070007750101010008760101010001773334000778013503000000022b36370100027938010100027a011401000e7b140700027c012001000b7d010701000b7e0107000931080103000000017f083a01060b80010128000b81010701000b82010701000983014101030000000684010107001186010444001187014415000e88010b150017101a101e1a01181f1b201b1f101f1d2210221d1618231b2422051808182c102c1d2d1b242c0f300030141824312f102f1d30303218331b341b17303510351d3710371d38303a183b393b2c3b223b3b3b313b3c3b3d3b3e2439243e243d3f18243b243c0603030404040400010b0c010b0d03090009010902020b0c0109000b0c010901020303030b0c0109000b0c0109010b010309000901090203040403010301060c010105030303030302040402060c0303070b04030900090109020303040b0c010900030b0c0109010307020208120812081204081201090004040304030108120206081206081201020104020812081201060b0403090009010902030900090109020b0103070b000309000901090204070b04030900090109020b0c01090003030b0c01090103030209000901010b0d0309000901090201060b0c0109000109010304040402070b0c01090003010b0c010900020b0c010900060b10010900010b050309000901090202070b0e01090009000601070b040309000901090203030b0c0109000b0c01090104030404060b040309000901090203060b0403090009010902030301081101050e0303070b0003090009010902030b0c010b0d0309000901090204070b04030900090109020303030303030302070b0c0109000b0c0109000203060b0f010900010b030309000901090206040404040404030303030b01070b0003090009010902070b04030900090109020303040303030403010902010b02030900090109020b0b00030900090109020b10010b0d030900090109020b13010b0d030900090109020b0f010b0d03090009010902081408140b04030900090109020c060807030301060811010c020814081405060c081408140201030b100109000b130109000b0f010900010b13010900010b0803090009010902010b0e010900010b0903090009010902010b0603090009010902010b0b03090009010902010b0a0309000901090202070b0003090009010902070b040309000901090208030303030b0c010900030b0c0109010303050b0c0109000b0c010901100103030303070b0e010b0903090009010902070b0003090009010902070b04030900090109020304030b0c0109000304030b0c01090108010103070b0003090009010902030404040108150e6c69717569646974795f706f6f6c076163636f756e7404636f696e056576656e74067369676e657206737472696e670974696d657374616d700b636f696e5f68656c706572066375727665730b64616f5f73746f7261676509656d657267656e63790d676c6f62616c5f636f6e6669670a6c705f6163636f756e74076c705f636f696e046d6174680c737461626c655f6375727665047532353607757136347836340b4576656e747353746f726509466c6173686c6f616e0e466c6173686c6f616e4576656e74134c697175696469747941646465644576656e740d4c6971756964697479506f6f6c154c697175696469747952656d6f7665644576656e74124f7261636c65557064617465644576656e7415506f6f6c4163636f756e744361706162696c69747910506f6f6c437265617465644576656e7409537761704576656e741155706461746544414f4665654576656e740e5570646174654665654576656e741c6173736572745f6c705f76616c75655f69735f696e63726561736564146173736572745f706f6f6c5f756e6c6f636b656404436f696e024c50046275726e09666c6173686c6f616e156765745f63756d756c61746976655f7072696365730b6765745f64616f5f666565136765745f64616f5f666565735f636f6e666967136765745f646563696d616c735f7363616c6573076765745f6665650f6765745f666565735f636f6e666967116765745f72657365727665735f73697a650a696e697469616c697a650e69735f706f6f6c5f6578697374730e69735f706f6f6c5f6c6f636b6564046d696e741e6e65775f72657365727665735f61667465725f666565735f7363616c65640d7061795f666c6173686c6f616e0872656769737465720b7365745f64616f5f666565077365745f6665651073706c69745f6665655f746f5f64616f04737761700d7570646174655f6f7261636c6513706f6f6c5f637265617465645f68616e646c650b4576656e7448616e646c65166c69717569646974795f61646465645f68616e646c65186c69717569646974795f72656d6f7665645f68616e646c650b737761705f68616e646c6510666c6173686c6f616e5f68616e646c65156f7261636c655f757064617465645f68616e646c65117570646174655f6665655f68616e646c65157570646174655f64616f5f6665655f68616e646c6506785f6c6f616e06795f6c6f616e04785f696e05785f6f757404795f696e05795f6f75740b61646465645f785f76616c0b61646465645f795f76616c126c705f746f6b656e735f72656365697665640e636f696e5f785f726573657276650e636f696e5f795f72657365727665146c6173745f626c6f636b5f74696d657374616d70176c6173745f70726963655f785f63756d756c6174697665176c6173745f70726963655f795f63756d756c61746976650b6c705f6d696e745f6361700e4d696e744361706162696c6974790b6c705f6275726e5f6361700e4275726e4361706162696c69747907785f7363616c6507795f7363616c65066c6f636b6564036665650764616f5f6665650e72657475726e65645f785f76616c0e72657475726e65645f795f76616c106c705f746f6b656e735f6275726e65640a7369676e65725f636170105369676e65724361706162696c6974790763726561746f72076e65775f66656504553235360969735f737461626c65086c705f76616c756507636f6d706172650f69735f756e636f7272656c617465640966726f6d5f753132380866726f6d5f753634036d756c0969735f736f727465640576616c756506737570706c790c6d756c5f6469765f7531323807657874726163740a656d69745f6576656e74136173736572745f6e6f5f656d657267656e63790a616464726573735f6f661372657472696576655f7369676e65725f6361700b6d756c5f746f5f753132380473717274056d65726765076d756c5f64697610467265657a654361706162696c69747906537472696e670e6173736572745f69735f636f696e126173736572745f76616c69645f63757276651d6372656174655f7369676e65725f776974685f6361706162696c6974791b67656e65726174655f6c705f6e616d655f616e645f73796d626f6c1264657374726f795f667265657a655f63617008646563696d616c7306706f775f3130047a65726f0f6765745f64656661756c745f666565136765745f64656661756c745f64616f5f666565106e65775f6576656e745f68616e646c650d6765745f6665655f61646d696e146173736572745f76616c69645f64616f5f666565106173736572745f76616c69645f666565076465706f7369740b6e6f775f7365636f6e64730755513634783634086672616374696f6e07746f5f753132380c6f766572666c6f775f61646449bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b00000000000000000000000000000000000000000000000000000000000000014e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81030864000000000000000308680000000000000003086e0000000000000003086a000000000000000308690000000000000003087000000000000000030866000000000000000308670000000000000003086d0000000000000003086b000000000000000308650000000000000003086f0000000000000003086c00000000000000030810270000000000000308e803000000000000052049bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b126170746f733a3a6d657461646174615f7630c3070d6400000000000000174552525f57524f4e475f504149525f4f52444552494e47335768656e20636f696e73207573656420746f20637265617465207061697220686176652077726f6e67206f72646572696e672e6500000000000000184552525f504f4f4c5f4558495354535f464f525f50414952245768656e207061697220616c726561647920657869737473206f6e206163636f756e742e6600000000000000204552525f4e4f545f454e4f5547485f494e495449414c5f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6700000000000000184552525f4e4f545f454e4f5547485f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6800000000000000114552525f454d5054595f434f494e5f494e335768656e20626f7468205820616e6420592070726f766964656420666f7220737761702061726520657175616c207a65726f2e6900000000000000124552525f494e434f52524543545f535741504b5768656e20696e636f727265637420494e732f4f55547320617267756d656e74732070617373656420647572696e67207377617020616e64206d61746820646f65736e277420776f726b2e6a00000000000000194552525f494e434f52524543545f4255524e5f56414c5545531d496e636f7272656374206c7020636f696e206275726e2076616c7565736b00000000000000174552525f504f4f4c5f444f45535f4e4f545f4558495354225768656e20706f6f6c20646f65736e27742065786973747320666f7220706169722e6c000000000000000f4552525f554e524541434841424c451353686f756c64206e65766572206f636375722e6d00000000000000284552525f4e4f545f454e4f5547485f5045524d495353494f4e535f544f5f494e495449414c495a45525768656e2060696e697469616c697a65282960207472616e73616374696f6e206973207369676e6564207769746820616e79206163636f756e74206f74686572207468616e20406c6971756964737761702e6e00000000000000134552525f454d5054595f434f494e5f4c4f414e385768656e20626f7468205820616e6420592070726f766964656420666f7220666c6173686c6f616e2061726520657175616c207a65726f2e6f00000000000000124552525f504f4f4c5f49535f4c4f434b4544145768656e20706f6f6c206973206c6f636b65642e70000000000000000d4552525f4e4f545f41444d494e165768656e2075736572206973206e6f742061646d696e000208370b0e010b0803090009010902390b0e010b03030900090109023a0b0e010b05030900090109023b0b0e010b09030900090109023c0b0e010b02030900090109023d0b0e010b06030900090109023e0b0e010b0b030900090109023f0b0e010b0a0309000901090201020240034103020204420343034403450303020346034703480304020c490b0c0109004a0b0c0109014b034c044d044e0b0f010b0d03090009010902500b10010b0d03090009010902520353035401550356030502035703580359030602024c044d040702015a08110802015c0509020442034303440345030a02015d030b02015d0304180018051801180318021808180a180b1809180618000000000f3c38000303051a0b020a000b030a0111180c0a0b040b000b050b0111180c080e080e0a11190c060b063102210319070427053b3801031d05390b020b03180c0b0b0b111b070d070d18111c111d0c0c0b04111b0b05111b111d0c090e090e0c11190c070b07310221033b070427070c27020100000104170c070f3d000c000b003700140921030b070b2702020100020004195938020304070027070f3b00030907092738030e0038040c02070f3c000c0538050c040a05370138060c070a05370238070c0a0a02350a07350a0411210c080a02350a0a350b0411210c0b0a0806000000000000000024032d05320a0b060000000000000000240c010534090c010b01033a0b05010703270a0536010a0838080c060a0536020a0b38090c090a050b070b0a380a0b000b053703380b070f3c010c030b0336040b080b0b0b023902380c0b060b0902030100020004243e112538020305070027070f3b00030a07092738030a000600000000000000002403100513080c0205170a01060000000000000000240c020b02031b070227070f3c000c030a03370138060c040a03370238070c050a0336010a0038080c060a0336020a0138090c07080a033600150b030b040b05380a0b060b070b000b013903020401000104251e112538020305070027070f3b00030a0709273803070f3d000c030a033705140c010a033706140c020b033707140c000b010b020b00020501000104171038020304070027070f3b000309070927070f3d000c000b003708140206010001040103380d0700020701000104171338020304070027070f3b000309070927070f3d000c000a003709140b00370a14020801000104171038020304070027070f3b000309070927070f3d000c000b00370b140209010001040103380e070d020a010001042619112538020305070027070f3b00030a0709273803070f3d000c000a00370138060c010b00370238070c020b010b02020b01040027150a001126070f2103090b00010708270a0011270c010a000b0112072d070a0011280b001129020c010000010738020304070027070f3b00020d01000104171038020304070027070f3b000309070927070f3d000c000b00370014020e01000200042976112538020305070027070f3b00030a070927380338050c07070f3c000c080a08370138060c0c0a08370238070c0f0e0038060c0b0e0138070c0e0a07320000000000000000000000000000000021032305350a0b0a0e112a112b0c050a05070e2403300b08010706270b05070e170c03054f0a0b350a070a0c3511210c0a0a0e350b070a0f3511210c0d0a0a0a0d230348054b0b0a0c02054d0b0d0c020b020c030b030c090a090600000000000000002403590b08010707270a0836010b00380f0a0836020b0138100a090a08370c38110c060b080b0c0b0f380a070f3c010c040b04360d0b0b0b0e0b09390438120b06020f0000002d3b38010303050c0b00070d112a0b020a04112a170c06051a38000310070c270b000b020a04070d112e17350c050b050c060b060c093801031f05280b01070d112a0b030b04112a170c0805363800032c070c270b010b030b04070d112e17350c070b070c080b080c0a0b090b0a021001000200042f6e112538020305070027070f3b00030a0709270b023a030c0b0c070e0038060c060e0138070c0a0a06060000000000000000240319051c080c0305200a0a060000000000000000240c030b030324070127070f3c000c050a05370138060c090a05370238070c0d0b090a07160c090b0d0a0b160c0d0a0536010b00380f0a0536020b0138100a05370138060a05370238070a060a0a0a05370b1438130c0c0c080a053709140a05370a140b09350b0d350b080b0c38140a050a060a0a3815090b05360015070f3c010c040b04360e0b060b070b0a0b0b390538160211010001073263112538173818380203090b00010700273819070f3b002003120b0001070a27070f2b070c090b09100f11310c08381a0c060c050e080b050b06310608381b0c040c030c020b03381c0600000000000000000c0a0600000000000000000c0b381d032e0534381e11360c0a381f11360c0b38203821060000000000000000320000000000000000000000000000000032000000000000000000000000000000000b040b020b0a0b0b093822113939000c070e080b073f000e0838230e0838240e0838250e0838260e0838270e0838280e0838290e08382a0e08382b39010c010d01360f0b0011263906382c0e080b013f01021201040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113d070f3c000c030a010b03360815070f3c010c020b0236100b013907382d021301040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113e070f3c000c030a010b03360b15070f3c010c020b0236110b013908382e0214000000403b0a00370b140c0a0a003708140c040a0a0a0418070019060000000000000000220311051a0b0a0b041807001a060100000000000000160c0305200b0a0b041807001a0c030b030c050b010a05070d112e0c060b020b05070d112e0c080a0036010b0638080c070b0036020b0838090c09070f0b070b09382f02150100020004427b112538020305070027070f3b00030a07092738030e0038060c0c0e0238070c100a0c0600000000000000002403160519080c04051d0a10060000000000000000240c040b040321070127070f3c000c0b0a0b370138060c0e0a0b370238070c120a0b36010b00380f0a0b36020b0238100a0b36010a0138080c0f0a0b36020a0338090c130a0b370138060a0b370238070a0c0a100a0b370b1438130c110c0d0a0b3709140a0b370a140a0e350a12350b0d350b113538140a0b0a0c0a1038150b0b0b0e0b12380a070f3c010c0a0b0a36120c090b0c0c050b100c060b010c070b030c080b090b050b070b060b08390938300b0f0b1302160000010043540a003707140c0711400c050a050b0717350c0a0a0a320000000000000000000000000000000024031005150a01060000000000000000220c030517090c030b03031a051f0a02060000000000000000220c040521090c040b040324054f0a020a01114111420a0a180c080b010b02114111420b0a180c090a003705140b0811430a003605150a003706140b0911430a00360615070f3c010c060b0636130a003705140a00370614390a38310b050b003607150204090400040104060002040304040402040b04070408040a04050001000407000000000700060003000500180118021803180418051806180718081809180a180b180c180d180e181018111812181318141800";
+    let res = run_binary_test("sample_liquidity_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions
new file mode 100644
index 000000000..6baf2ee61
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions
@@ -0,0 +1,10 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 2beb0a0e65962432af560e626fa109d269b07db8807968413425f0bb14bb3667 # shrinks to module = CompiledModule: { struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] }
+cc c14ae393a6eefae82c0f4ede2acaa0aa0e993c1bba3fe3e5958e6e31cb5d2957 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = []
+cc 88615e15ef42d29405cd91d6d0a573ccbeb833d0c7471f718ee794bc5ba399ca # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 }, 	StructDefinition { struct_handle: 2, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = [OutOfBoundsMutation { src_kind: StructDefinition, src_idx: Index(0), dst_kind: FieldDefinition, offset: 0 }]
+cc a34039f5d57751762a6eacf3ca3a2857781fb0bd0af0b7a06a9427f896f29aa9 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x2, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x0, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [ 				BrTrue(1),] } },] type_signatures: [ 	TypeSignature(Unit), 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = []
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
new file mode 100644
index 000000000..69df69c40
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
@@ -0,0 +1,464 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use invalid_mutations::bounds::{
+    ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
+    OutOfBoundsMutation,
+};
+use move_binary_format::{
+    check_bounds::BoundsChecker, file_format::*, file_format_common,
+    proptest_types::CompiledModuleStrategyGen,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use proptest::{collection::vec, prelude::*};
+
+#[test]
+fn empty_module_no_errors() {
+    BoundsChecker::verify_module(&basic_test_module()).unwrap();
+}
+
+#[test]
+fn empty_script_no_errors() {
+    BoundsChecker::verify_script(&basic_test_script()).unwrap();
+}
+
+#[test]
+fn invalid_default_module() {
+    BoundsChecker::verify_module(&CompiledModule {
+        version: file_format_common::VERSION_MAX,
+        ..Default::default()
+    })
+    .unwrap_err();
+}
+
+#[test]
+fn invalid_self_module_handle_index() {
+    let mut m = basic_test_module();
+    m.self_module_handle_idx = ModuleHandleIndex(12);
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_fn_return_() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].return_ = SignatureIndex(1);
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(m.signatures.len(), 2);
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_fn_parameters() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].parameters = SignatureIndex(1);
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_script_parameters() {
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.parameters = SignatureIndex(1);
+    s.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_struct_in_fn_return_() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].return_ = SignatureIndex(1);
+    m.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(1))]));
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 = TypeParameter(0);
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::INDEX_OUT_OF_BOUNDS
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_struct_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 = Struct(StructHandleIndex::new(3));
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::INDEX_OUT_OF_BOUNDS
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_struct_with_actuals_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 =
+                StructInstantiation(StructHandleIndex::new(0), vec![TypeParameter(0)]);
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_locals_id_in_call() {
+    use Bytecode::*;
+
+    let mut m = basic_test_module();
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_locals_id_in_call() {
+    use Bytecode::*;
+
+    let mut s = basic_test_script();
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_call() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_type_param_in_call() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.signatures.push(Signature(vec![TypeParameter(0)]));
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_struct_as_type_actual_in_exists() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_struct_as_type_argument_in_exists() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_friend_module_address() {
+    let mut m = basic_test_module();
+    m.friend_decls.push(ModuleHandle {
+        address: AddressIdentifierIndex::new(m.address_identifiers.len() as TableIndex),
+        name: IdentifierIndex::new(0),
+    });
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_friend_module_name() {
+    let mut m = basic_test_module();
+    m.friend_decls.push(ModuleHandle {
+        address: AddressIdentifierIndex::new(0),
+        name: IdentifierIndex::new(m.identifiers.len() as TableIndex),
+    });
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_missing_signature() {
+    // The basic test script includes parameters pointing to an empty signature.
+    let mut s = basic_test_script();
+    // Remove the empty signature from the script.
+    s.signatures.clear();
+    // Bounds-checking the script should now result in an out-of-bounds error.
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_signature_for_vector_operation() {
+    use Bytecode::*;
+
+    let skeleton = basic_test_module();
+    let sig_index = SignatureIndex(skeleton.signatures.len() as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+#[test]
+fn invalid_struct_for_vector_operation() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut skeleton = basic_test_module();
+    skeleton
+        .signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    let sig_index = SignatureIndex((skeleton.signatures.len() - 1) as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+#[test]
+fn invalid_type_param_for_vector_operation() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut skeleton = basic_test_module();
+    skeleton.signatures.push(Signature(vec![TypeParameter(0)]));
+    let sig_index = SignatureIndex((skeleton.signatures.len() - 1) as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+proptest! {
+    #[test]
+    fn valid_bounds(_module in CompiledModule::valid_strategy(20)) {
+        // valid_strategy will panic if there are any bounds check issues.
+    }
+}
+
+/// Ensure that valid modules that don't have any members (e.g. function args, struct fields) pass
+/// bounds checks.
+///
+/// There are some potentially tricky edge cases around ranges that are captured here.
+#[test]
+fn valid_bounds_no_members() {
+    let mut gen = CompiledModuleStrategyGen::new(20);
+    gen.zeros_all();
+    proptest!(|(_module in gen.generate())| {
+        // gen.generate() will panic if there are any bounds check issues.
+    });
+}
+
+proptest! {
+    #[test]
+    fn invalid_out_of_bounds(
+        module in CompiledModule::valid_strategy(20),
+        oob_mutations in vec(OutOfBoundsMutation::strategy(), 0..40),
+    ) {
+        let (module, expected_violations) = {
+            let oob_context = ApplyOutOfBoundsContext::new(module, oob_mutations);
+            oob_context.apply()
+        };
+
+        let actual_violations = BoundsChecker::verify_module(&module);
+        prop_assert_eq!(expected_violations.is_empty(), actual_violations.is_ok());
+    }
+
+    #[test]
+    fn code_unit_out_of_bounds(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec(CodeUnitBoundsMutation::strategy(), 0..40),
+    ) {
+        let expected_violations = {
+            let context = ApplyCodeUnitBoundsContext::new(&mut module, mutations);
+            context.apply()
+        };
+
+        let actual_violations = BoundsChecker::verify_module(&module);
+        prop_assert_eq!(expected_violations.is_empty(), actual_violations.is_ok());
+    }
+
+    #[test]
+    fn no_module_handles(
+        identifiers in vec(any::<Identifier>(), 0..20),
+        address_identifiers in vec(any::<AccountAddress>(), 0..20),
+    ) {
+        // If there are no module handles, the only other things that can be stored are intrinsic
+        // data.
+        let module = CompiledModule {
+            identifiers,
+            address_identifiers,
+            ..Default::default()
+        };
+
+        prop_assert_eq!(
+            BoundsChecker::verify_module(&module).map_err(|e| e.major_status()),
+            Err(StatusCode::NO_MODULE_HANDLES)
+        );
+    }
+}
+
+proptest! {
+    // Generating arbitrary compiled modules is really slow, possibly because of
+    // https://github.com/AltSysrq/proptest/issues/143.
+    #![proptest_config(ProptestConfig::with_cases(16))]
+
+    /// Make sure that garbage inputs don't crash the bounds checker.
+    #[test]
+    fn garbage_inputs(module in any_with::<CompiledModule>(16)) {
+        let _ = BoundsChecker::verify_module(&module);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
new file mode 100644
index 000000000..c43d62580
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
@@ -0,0 +1,27 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use fail::FailScenario;
+use move_binary_format::file_format::empty_module;
+use move_core_types::{
+    state::{self, VMState},
+    vm_status::StatusCode,
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::panic::{self, PanicInfo};
+
+#[ignore]
+#[test]
+fn test_unwind() {
+    let scenario = FailScenario::setup();
+    fail::cfg("verifier-failpoint-panic", "panic").unwrap();
+
+    panic::set_hook(Box::new(move |_: &PanicInfo<'_>| {
+        assert_eq!(state::get_state(), VMState::VERIFIER);
+    }));
+
+    let m = empty_module();
+    let res = move_bytecode_verifier::verify_module_with_config(&VerifierConfig::unbounded(), &m)
+        .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VERIFIER_INVARIANT_VIOLATION);
+    scenario.teardown();
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
new file mode 100644
index 000000000..7db6dfe70
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
@@ -0,0 +1,98 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::file_format::Bytecode;
+use move_bytecode_verifier::meter::DummyMeter;
+use move_bytecode_verifier::CodeUnitVerifier;
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+#[test]
+fn invalid_fallthrough_br_true() {
+    let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_false() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+// all non-branch instructions should trigger invalid fallthrough; just check one of them
+#[test]
+fn invalid_fallthrough_non_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn valid_fallthrough_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_ret() {
+    let module = dummy_procedure_module(vec![Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_abort() {
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn test_max_number_of_bytecode() {
+    let mut nops = vec![];
+    for _ in 0..u16::MAX - 1 {
+        nops.push(Bytecode::Nop);
+    }
+    nops.push(Bytecode::Ret);
+    let module = dummy_procedure_module(nops);
+
+    let result =
+        CodeUnitVerifier::verify_module(&VerifierConfig::unbounded(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn test_max_basic_blocks() {
+    let mut code = (0..17)
+        .map(|idx| Bytecode::Branch(idx + 1))
+        .collect::<Vec<_>>();
+    code.push(Bytecode::Ret);
+    let module = dummy_procedure_module(code);
+
+    let result = CodeUnitVerifier::verify_module(
+        &VerifierConfig {
+            max_basic_blocks: Some(16),
+            ..Default::default()
+        },
+        &module,
+        &mut DummyMeter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_BASIC_BLOCKS
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/constants_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
new file mode 100644
index 000000000..b446d72e4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
@@ -0,0 +1,273 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use move_binary_format::file_format::{empty_module, CompiledModule, Constant, SignatureToken};
+use move_bytecode_verifier::constants;
+use move_core_types::vm_status::StatusCode;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_generated(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(constants::verify_module(&module).is_ok());
+    }
+}
+
+#[test]
+fn valid_primitives() {
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        Constant {
+            type_: SignatureToken::Bool,
+            data: vec![0],
+        },
+        Constant {
+            type_: SignatureToken::U8,
+            data: vec![0],
+        },
+        Constant {
+            type_: SignatureToken::U16,
+            data: vec![0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U32,
+            data: vec![0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U64,
+            data: vec![0, 0, 0, 0, 0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U128,
+            data: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U256,
+            data: vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
+        },
+        Constant {
+            type_: SignatureToken::Address,
+            data: vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
+        },
+    ];
+    assert!(constants::verify_module(&module).is_ok());
+}
+
+#[test]
+fn invalid_primitives() {
+    malformed(SignatureToken::U8, vec![0, 0]);
+    malformed(SignatureToken::U16, vec![0, 0, 0, 0]);
+    malformed(SignatureToken::U32, vec![0, 0, 0]);
+    malformed(SignatureToken::U64, vec![0]);
+    malformed(SignatureToken::U128, vec![0]);
+    malformed(SignatureToken::U256, vec![0, 0]);
+    let data = vec![
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0,
+    ];
+    malformed(SignatureToken::Address, data);
+}
+
+#[test]
+fn valid_vectors() {
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..0xFFFF).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        // empty
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: double_vec(vec![0]),
+        },
+        // small
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        // large
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U16),
+            data: large_vec(vec![0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U32),
+            data: large_vec(vec![0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U64),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U128),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U256),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::Address),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        // double large
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U8)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U16)),
+            data: double_vec(large_vec(vec![0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U32)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U64)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U128)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U256)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Address)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+    ];
+    assert!(constants::verify_module(&module).is_ok());
+}
+
+#[test]
+fn invalid_vectors() {
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let too_large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..(0xFFFF + 1)).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    // wrong inner
+    malformed(tvec(SignatureToken::U16), vec![1, 0]);
+    malformed(tvec(SignatureToken::U32), vec![1, 0]);
+    malformed(tvec(SignatureToken::U64), vec![1, 0]);
+    malformed(
+        tvec(SignatureToken::Address),
+        vec![
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0,
+        ],
+    );
+    // wrong lens
+    malformed(tvec(SignatureToken::U8), vec![0, 0]);
+    malformed(tvec(SignatureToken::U8), vec![0, 1]);
+    malformed(tvec(SignatureToken::U8), vec![2, 1, 1, 1]);
+    malformed(tvec(tvec(SignatureToken::U8)), double_vec(vec![0, 0]));
+    // too large
+    malformed(tvec(SignatureToken::U8), too_large_vec(vec![0]));
+}
+
+#[test]
+fn invalid_types() {
+    invalid_type(SignatureToken::TypeParameter(0), vec![0]);
+    invalid_type(SignatureToken::TypeParameter(0xFA), vec![0]);
+    invalid_type(tvec(SignatureToken::TypeParameter(0)), vec![0]);
+    invalid_type(tvec(SignatureToken::TypeParameter(0xAF)), vec![0]);
+
+    invalid_type(SignatureToken::Signer, vec![0]);
+    invalid_type(tvec(SignatureToken::Signer), vec![0]);
+
+    // TODO cannot check structs are banned currently. This can be handled by IR and source lang
+    // tests
+    // invalid_type(SignatureToken::Struct(StructHandleIndex(0)), vec![0]);
+}
+
+fn tvec(s: SignatureToken) -> SignatureToken {
+    SignatureToken::Vector(Box::new(s))
+}
+
+fn malformed(type_: SignatureToken, data: Vec<u8>) {
+    error(type_, data, StatusCode::MALFORMED_CONSTANT_DATA)
+}
+
+fn invalid_type(type_: SignatureToken, data: Vec<u8>) {
+    error(type_, data, StatusCode::INVALID_CONSTANT_TYPE)
+}
+
+fn error(type_: SignatureToken, data: Vec<u8>, code: StatusCode) {
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant { type_, data }];
+    assert!(
+        constants::verify_module(&module)
+            .unwrap_err()
+            .major_status()
+            == code
+    )
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
new file mode 100644
index 000000000..35826cd72
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
@@ -0,0 +1,240 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::PartialVMResult,
+    file_format::{Bytecode, CompiledModule, FunctionDefinitionIndex, TableIndex},
+};
+use move_bytecode_verifier::{control_flow, meter::DummyMeter};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+fn verify_module(verifier_config: &VerifierConfig, module: &CompiledModule) -> PartialVMResult<()> {
+    for (idx, function_definition) in module
+        .function_defs()
+        .iter()
+        .enumerate()
+        .filter(|(_, def)| !def.is_native())
+    {
+        let current_function = FunctionDefinitionIndex(idx as TableIndex);
+        let code = function_definition
+            .code
+            .as_ref()
+            .expect("unexpected native function");
+
+        control_flow::verify_function(
+            verifier_config,
+            module,
+            current_function,
+            function_definition,
+            code,
+            &mut DummyMeter,
+        )?;
+    }
+    Ok(())
+}
+
+//**************************************************************************************************
+// Simple cases -  Copied from code unit verifier
+//**************************************************************************************************
+
+#[test]
+fn empty_bytecode() {
+    let module = dummy_procedure_module(vec![]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
+#[test]
+fn empty_bytecode_v5() {
+    let mut module = dummy_procedure_module(vec![]);
+    module.version = 5;
+
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_true() {
+    let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_false() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+// all non-branch instructions should trigger invalid fallthrough; just check one of them
+#[test]
+fn invalid_fallthrough_non_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn valid_fallthrough_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_ret() {
+    let module = dummy_procedure_module(vec![Bytecode::Ret]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_abort() {
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_exceed_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::LOOP_MAX_DEPTH_REACHED
+    );
+}
+
+#[test]
+fn non_loop_backward_jump() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn non_loop_backward_jump_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn irreducible_control_flow_graph() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdTrue,
+        Bytecode::BrTrue(3),
+        Bytecode::Nop,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn nested_loop_break() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loop_break_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_BREAK,
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
new file mode 100644
index 000000000..aec512c38
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
@@ -0,0 +1,294 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::dependencies;
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+
+fn mk_script_function_module() -> CompiledModule {
+    let m = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("M").unwrap(),    // Module name
+            Identifier::new("fn").unwrap(),   // Function name
+            Identifier::new("g_fn").unwrap(), // Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // fun g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        function_defs: vec![
+            // public(script)  fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // public(script) fun g_fn<T>() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]), // void
+        ],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    move_bytecode_verifier::verify_module_unmetered(&m).unwrap();
+    m
+}
+
+fn mk_invoking_module(use_generic: bool, valid: bool) -> CompiledModule {
+    let call = if use_generic {
+        Bytecode::CallGeneric(FunctionInstantiationIndex(0))
+    } else {
+        Bytecode::Call(FunctionHandleIndex(1))
+    };
+    let m = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+            // other module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(2),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("Test").unwrap(),    // Module name
+            Identifier::new("test_fn").unwrap(), // test name
+            Identifier::new("M").unwrap(),       // Other Module name
+            Identifier::new("fn").unwrap(),      // Other Function name
+            Identifier::new("g_fn").unwrap(),    // Other Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // Self::test_fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(1),
+                name: IdentifierIndex(3),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(1),
+                name: IdentifierIndex(4),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        // 0::M::g_fn<u64>()
+        function_instantiations: vec![FunctionInstantiation {
+            handle: FunctionHandleIndex(2),
+            type_parameters: SignatureIndex(1),
+        }],
+        function_defs: vec![
+            // fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: valid,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![call, Bytecode::Ret],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    move_bytecode_verifier::verify_module_unmetered(&m).unwrap();
+    m
+}
+
+fn mk_invoking_script(use_generic: bool) -> CompiledScript {
+    let call = if use_generic {
+        Bytecode::CallGeneric(FunctionInstantiationIndex(0))
+    } else {
+        Bytecode::Call(FunctionHandleIndex(0))
+    };
+    let s = CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // other module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        identifiers: vec![
+            Identifier::new("M").unwrap(),    // Other Module name
+            Identifier::new("fn").unwrap(),   // Other Function name
+            Identifier::new("g_fn").unwrap(), // Other Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // 0::M::fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        // 0::M::g_fn<u64>()
+        function_instantiations: vec![FunctionInstantiation {
+            handle: FunctionHandleIndex(1),
+            type_parameters: SignatureIndex(1),
+        }],
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![call, Bytecode::Ret],
+        },
+        signatures: vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+    };
+    move_bytecode_verifier::verify_script_unmetered(&s).unwrap();
+    s
+}
+
+#[test]
+
+// tests the deprecated Script visibility logic for < V5
+// tests correct permissible invocation of Script functions
+fn deprecated_script_visibility_checks_valid() {
+    let script_function_module = mk_script_function_module();
+    let deps = &[script_function_module];
+
+    // module uses script functions from script context
+    let is_valid = true;
+    let non_generic_call_mod = mk_invoking_module(false, is_valid);
+    let result = dependencies::verify_module(&non_generic_call_mod, deps);
+    assert!(result.is_ok());
+
+    let generic_call_mod = mk_invoking_module(true, is_valid);
+    let result = dependencies::verify_module(&generic_call_mod, deps);
+    assert!(result.is_ok());
+
+    // script uses script functions
+    let non_generic_call_script = mk_invoking_script(false);
+    let result = dependencies::verify_script(&non_generic_call_script, deps);
+    assert!(result.is_ok());
+
+    let generic_call_script = mk_invoking_script(true);
+    let result = dependencies::verify_script(&generic_call_script, deps);
+    assert!(result.is_ok());
+}
+
+#[test]
+// tests the deprecated Script visibility logic for < V5
+// tests correct non-permissible invocation of Script functions
+fn deprecated_script_visibility_checks_invalid() {
+    let script_function_module = mk_script_function_module();
+    let deps = &[script_function_module];
+
+    // module uses script functions from script context
+    let not_valid = false;
+    let non_generic_call_mod = mk_invoking_module(false, not_valid);
+    let result = dependencies::verify_module(&non_generic_call_mod, deps);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+    );
+
+    let generic_call_mod = mk_invoking_module(true, not_valid);
+    let result = dependencies::verify_module(&generic_call_mod, deps);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs
new file mode 100644
index 000000000..640af70c6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::DuplicationChecker;
+use proptest::prelude::*;
+
+#[test]
+fn duplicated_friend_decls() {
+    let mut m = basic_test_module();
+    let handle = ModuleHandle {
+        address: AddressIdentifierIndex::new(0),
+        name: IdentifierIndex::new(0),
+    };
+    m.friend_decls.push(handle.clone());
+    m.friend_decls.push(handle);
+    DuplicationChecker::verify_module(&m).unwrap_err();
+}
+
+proptest! {
+    #[test]
+    fn valid_duplication(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(DuplicationChecker::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
new file mode 100644
index 000000000..ef6e43bc1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
@@ -0,0 +1,740 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::InstructionConsistency;
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+
+// Make a Module with 2 structs and 2 resources with one field each, and 2 functions.
+// One of the struct/resource and one of the function is generic, the other "normal".
+// Also make a test function whose body will be filled by given test cases.
+fn make_module() -> CompiledModule {
+    CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("M").unwrap(),       // Module name
+            Identifier::new("S").unwrap(),       // Struct name
+            Identifier::new("GS").unwrap(),      // Generic struct name
+            Identifier::new("R").unwrap(),       // Resource name
+            Identifier::new("GR").unwrap(),      // Generic resource name
+            Identifier::new("f").unwrap(),       // Field name
+            Identifier::new("fn").unwrap(),      // Function name
+            Identifier::new("g_fn").unwrap(),    // Generic function name
+            Identifier::new("test_fn").unwrap(), // Test function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        struct_handles: vec![
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(3),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(4),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+        ],
+        struct_defs: vec![
+            // struct S { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(0),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GS<T> { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(1),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+            // struct R has key { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(2),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GR<T> has key { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(3),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+        ],
+        function_handles: vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(6),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // fun g_fn<T: key>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(7),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY | Ability::Key],
+            },
+            // fun test_fn(Sender)
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(8),
+                parameters: SignatureIndex(1),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+        ],
+        function_defs: vec![
+            // public fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // fun g_fn<T>() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // fun test_fn() { ... } - tests will fill up the code
+            FunctionDefinition {
+                function: FunctionHandleIndex(2),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]),                       // void
+            Signature(vec![SignatureToken::Signer]), // Signer
+        ],
+        constant_pool: vec![
+            // an address
+            Constant {
+                type_: SignatureToken::Address,
+                data: AccountAddress::random().to_vec(),
+            },
+        ],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    }
+}
+
+#[test]
+fn generic_call_to_non_generic_func() {
+    let mut module = make_module();
+    // bogus `CallGeneric fn()`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::CallGeneric(FunctionInstantiationIndex(0)),
+            Bytecode::Ret,
+        ],
+    });
+    module.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("CallGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_call_to_generic_func() {
+    let mut module = make_module();
+    // bogus `Call g_fn<T>()`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Call to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_pack_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `PackGeneric S`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("PackGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_pack_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `Pack GS<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(1)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Pack to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_unpack_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `UnpackGeneric S`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::UnpackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("UnpackGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_unpack_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `Unpack GS<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Unpack(StructDefinitionIndex(1)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Unpack to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_mut_borrow_field_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowFieldGeneric S.t`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::MutBorrowFieldGeneric(FieldInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module.field_instantiations.push(FieldInstantiation {
+        handle: FieldHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(0),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowFieldGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_mut_borrow_field_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowField GS<T>.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::MutBorrowField(FieldHandleIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(1),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowField to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_borrow_field_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowFieldGeneric S.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::ImmBorrowFieldGeneric(FieldInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module.field_instantiations.push(FieldInstantiation {
+        handle: FieldHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(0),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowFieldGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_borrow_field_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowField GS<T>.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::ImmBorrowField(FieldHandleIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(1),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowField to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_mut_borrow_global_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowGlobalGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MutBorrowGlobalGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowGlobalGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_mut_borrow_global_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowGlobal GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MutBorrowGlobal(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowGlobal to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_immut_borrow_global_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowGlobalGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ImmBorrowGlobalGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowGlobalGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_immut_borrow_global_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowGlobal GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ImmBorrowGlobal(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowGlobal to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_exists_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ExistsGeneric R`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ExistsGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ExistsGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_exists_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `Exists GR<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::Exists(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Exists to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_move_from_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveFromGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MoveFromGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Unpack(StructDefinitionIndex(2)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveFromGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_move_from_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveFrom GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MoveFrom(StructDefinitionIndex(3)),
+            Bytecode::UnpackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(3),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveFrom to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_move_to_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveToGeneric R`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::MoveLoc(0),
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(2)),
+            Bytecode::MoveToGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveToGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_move_to_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveTo GR<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::MoveLoc(0),
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::MoveTo(StructDefinitionIndex(3)),
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(3),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveTo to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/large_type_test.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
new file mode 100644
index 000000000..ab7e09e49
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
@@ -0,0 +1,159 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const NUM_LOCALS: u8 = 64;
+const NUM_CALLS: u16 = 77;
+const NUM_FUNCTIONS: u16 = 177;
+
+fn get_nested_vec_type(len: usize) -> SignatureToken {
+    let mut ret = SignatureToken::Bool;
+    for _ in 0..len {
+        ret = SignatureToken::Vector(Box::new(ret));
+    }
+    ret
+}
+
+#[test]
+fn test_large_types() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-37qw-jfpw-8899
+    let mut m = empty_module();
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(get_nested_vec_type(64))))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // returns_vecs
+    m.identifiers.push(Identifier::new("returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_and_returns_vecs
+    m.identifiers
+        .push(Identifier::new("takes_and_returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_vecs
+    m.identifiers.push(Identifier::new("takes_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(3),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(3),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // other fcts
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 4),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 4),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 4].code.as_mut().unwrap().code;
+        code.clear();
+        code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(3)));
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_large_types",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED,
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/limit_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
new file mode 100644
index 000000000..7da5767ee
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
@@ -0,0 +1,894 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::{
+    limits::LimitsVerifier, meter::DummyMeter, verify_module_with_config_for_test,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use move_vm_config::verifier::{VerifierConfig, DEFAULT_MAX_IDENTIFIER_LENGTH};
+
+#[test]
+fn test_function_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_struct_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_function_handle_parameters() {
+    let mut m = basic_test_module();
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+}
+
+#[test]
+fn big_vec_unpacks() {
+    const N_TYPE_PARAMS: usize = 16;
+    let mut st = SignatureToken::Vector(Box::new(SignatureToken::U8));
+    let type_params = vec![st; N_TYPE_PARAMS];
+    st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    const N_VEC_PUSH: u16 = 1000;
+    let mut code = vec![];
+    // 1. CopyLoc:     ...         -> ... st
+    // 2. VecPack:     ... st      -> ... Vec<st>
+    // 3. VecUnpack:   ... Vec<st> -> ... st, st, st, ... st
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1));
+        code.push(Bytecode::VecUnpack(SignatureIndex(1), 1 << 15));
+    }
+    // 1. VecPack:   ... st, st, st, ... st -> ... Vec<st>
+    // 2. Pop:       ... Vec<st>            -> ...
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1 << 15));
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize_with_defaults(&mvbytes).unwrap();
+
+    let res = verify_module_with_config_for_test(
+        "big_vec_unpacks",
+        &VerifierConfig {
+            max_loop_depth: Some(5),
+            max_generic_instantiation_length: Some(32),
+            max_function_parameters: Some(128),
+            max_basic_blocks: Some(1024),
+            max_push_size: Some(10000),
+            ..Default::default()
+        },
+        &module,
+        &mut DummyMeter,
+    );
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::VALUE_STACK_PUSH_OVERFLOW
+    );
+}
+
+const MAX_STRUCTS: usize = 200;
+const MAX_FIELDS: usize = 30;
+const MAX_FUNCTIONS: usize = 1000;
+
+#[test]
+fn max_struct_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 0);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    multi_struct(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_fields_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, MAX_FIELDS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_fields(&mut module, MAX_FIELDS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields(&mut module, MAX_FIELDS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields_except_one(&mut module, 0, 2, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 20);
+    multi_fields_except_one(&mut module, 19, MAX_FIELDS, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields_except_one(&mut module, 50, 1, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_functions_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_functions(&mut module, MAX_FUNCTIONS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_mixed_config_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_function_definitions: None,
+        max_struct_definitions: None,
+        max_fields_in_struct: None,
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 10);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 3);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_identifier_len() {
+    let config = production_config();
+    let max_ident = "z".repeat(
+        config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let good_module = leaf_module(&max_ident);
+
+    let res = LimitsVerifier::verify_module(&config, &good_module);
+    assert!(res.is_ok());
+
+    let config = production_config();
+    let max_ident = "z".repeat(
+        (config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize)
+            / 2,
+    );
+    let good_module = leaf_module(&max_ident);
+
+    let res = LimitsVerifier::verify_module(&config, &good_module);
+    assert!(res.is_ok());
+
+    let over_max_ident = "z".repeat(
+        1 + config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let bad_module = leaf_module(&over_max_ident);
+    let res = LimitsVerifier::verify_module(&config, &bad_module);
+
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::IDENTIFIER_TOO_LONG,
+    );
+
+    let over_max_ident = "zx".repeat(
+        1 + config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let bad_module = leaf_module(&over_max_ident);
+    let res = LimitsVerifier::verify_module(&config, &bad_module);
+
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::IDENTIFIER_TOO_LONG,
+    );
+}
+
+#[test]
+fn max_vec_len() {
+    let config = VerifierConfig {
+        max_constant_vector_len: Some(0xFFFF - 1),
+        ..Default::default()
+    };
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..0xFFFF).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    fn tvec(s: SignatureToken) -> SignatureToken {
+        SignatureToken::Vector(Box::new(s))
+    }
+
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant {
+        type_: tvec(SignatureToken::Bool),
+        data: large_vec(vec![0]),
+    }];
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_VECTOR_ELEMENTS,
+    );
+
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant {
+        type_: tvec(SignatureToken::U256),
+        data: large_vec(vec![
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]),
+    }];
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_VECTOR_ELEMENTS,
+    );
+
+    let config = VerifierConfig {
+        max_constant_vector_len: Some(0xFFFF),
+        ..Default::default()
+    };
+
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        // empty
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: double_vec(vec![0]),
+        },
+        // small
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        // large
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U16),
+            data: large_vec(vec![0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U32),
+            data: large_vec(vec![0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U64),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U128),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U256),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::Address),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        // double large
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U8)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U16)),
+            data: double_vec(large_vec(vec![0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U32)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U64)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U128)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U256)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Address)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+    ];
+    let res = LimitsVerifier::verify_module(&config, &module);
+
+    assert!(res.is_ok());
+}
+
+fn multi_struct(module: &mut CompiledModule, count: usize) {
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("A_{}", i)).unwrap());
+        module.struct_handles.push(StructHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        });
+        module.struct_defs.push(StructDefinition {
+            struct_handle: StructHandleIndex((module.struct_handles.len() - 1) as u16),
+            field_information: StructFieldInformation::Declared(vec![]),
+        });
+    }
+}
+
+fn multi_fields(module: &mut CompiledModule, count: usize) {
+    for def in &mut module.struct_defs {
+        let mut fields = vec![];
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_fields_except_one(module: &mut CompiledModule, idx: usize, count: usize, one: usize) {
+    for (struct_idx, def) in module.struct_defs.iter_mut().enumerate() {
+        let mut fields = vec![];
+        let count = if struct_idx == idx { one } else { count };
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_functions(module: &mut CompiledModule, count: usize) {
+    module.signatures.push(Signature(vec![]));
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("func_{}", i)).unwrap());
+        module.function_handles.push(FunctionHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            parameters: SignatureIndex((module.signatures.len() - 1) as u16),
+            return_: SignatureIndex((module.signatures.len() - 1) as u16),
+            type_parameters: vec![],
+        });
+        module.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex((module.function_handles.len() - 1) as u16),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex((module.signatures.len() - 1) as u16),
+                code: vec![Bytecode::Ret],
+            }),
+        });
+    }
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = AccountAddress::ONE;
+    module
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/locals.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/locals.rs
new file mode 100644
index 000000000..d39afa6d0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/locals.rs
@@ -0,0 +1,124 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_locals() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-jjqw-f9pc-525j
+    let mut m = empty_module();
+
+    const MAX_BASIC_BLOCKS: u16 = 1024;
+    const MAX_LOCALS: u8 = 255;
+    const NUM_FUNCTIONS: u16 = 16;
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: true,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("pwn").unwrap());
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS / 2 - MAX_LOCALS as u16 - 3) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue((code.len() + 2) as u16));
+            code.push(Bytecode::Ret);
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_locals",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
new file mode 100644
index 000000000..819b94127
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
@@ -0,0 +1,391 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{control_flow_graph::VMControlFlowGraph, file_format::Bytecode};
+use move_bytecode_verifier::loop_summary::{LoopPartition, LoopSummary};
+
+macro_rules! assert_node {
+    ( $summary:ident, $node:expr ; $block:expr, $preds:expr, $descs:expr, $backs:expr ) => {
+        let (s, n) = (&$summary, $node);
+        assert_eq!(s.block(n), $block, "Block");
+
+        let descs = $descs;
+        for d in descs {
+            assert!(s.is_descendant(n, *d), "{:?} -> {:?}", n, d)
+        }
+
+        assert_eq!(s.pred_edges(n), $preds, "Predecessor Edges");
+        assert_eq!(s.back_edges(n), $backs, "Back Edges");
+    };
+}
+
+#[test]
+fn linear_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(2),
+            /* B2, L1 */ Nop,
+            /*        */ Branch(4),
+            /* B4, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 4,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn non_loop_back_branch_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(3),
+            /* B2, L2 */ Ret,
+            /* B3, L1 */ Branch(2),
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branching_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L2 */ Nop,
+            /* B3, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[2]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    // Although L2 -> L1 is an edge in the CFG, it's not an edge in the DFST, so L2 is said to have
+    // no descendants.
+    assert!(!summary.is_descendant(n[2], n[1]));
+}
+
+#[test]
+fn looping_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 4,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branches_in_loops_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L3 */ Nop,
+            /* B3, L1 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 4);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3]],
+        /* backs */ &[n[1]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[3]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 5,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loops_in_branches_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0,  L0 */ LdTrue,
+            /*         */ BrTrue(8),
+            /* B2,  L5   */ Nop,
+            /* B3,  L6     */ LdFalse,
+            /*             */ BrFalse(3),
+            /* B5,  L7   */ LdTrue,
+            /*           */ BrTrue(2),
+            /* B7,  L8 */ Branch(13),
+            /* B8,  L1   */ Nop,
+            /* B9,  L2   */ LdTrue,
+            /*           */ BrTrue(8),
+            /* B11, L3   */ LdFalse,
+            /*           */ BrFalse(9),
+            /* B13, L4 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 9);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3], n[4], n[5], n[6], n[7], n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 8,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2], n[3], n[4]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 9,
+        /* preds */ &[n[1]],
+        /* descs */ &[n[3], n[4]],
+        /* backs */ &[n[3]]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 11,
+        /* preds */ &[n[2]],
+        /* descs */ &[n[4]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[4];
+        /* block */ 13,
+        /* preds */ &[n[3], n[8]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[5];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[6], n[7], n[8]],
+        /* backs */ &[n[7]]
+    );
+
+    assert_node!(
+        summary, n[6];
+        /* block */ 3,
+        /* preds */ &[n[5]],
+        /* descs */ &[n[7], n[8]],
+        /* backs */ &[n[6]]
+    );
+
+    assert_node!(
+        summary, n[7];
+        /* block */ 5,
+        /* preds */ &[n[6]],
+        /* descs */ &[n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[8];
+        /* block */ 7,
+        /* preds */ &[n[7]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    for id in &n {
+        assert_eq!(*id, partition.containing_loop(*id), "Self-parent {:?}", id);
+    }
+
+    assert_eq!(partition.collapse_loop(n[0], &[n[2]].into()), 1);
+    assert_eq!(partition.containing_loop(n[0]), n[0]);
+    assert_eq!(partition.containing_loop(n[1]), n[1]);
+    assert_eq!(partition.containing_loop(n[2]), n[0]);
+}
+
+#[test]
+fn nested_loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /* B1, L1   */ LdTrue,
+            /*          */ BrTrue(1),
+            /* B3, L2 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L3 */ LdTrue,
+            /*        */ BrTrue(0),
+            /* B7, L4 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    // Self-loop is a special case -- its depth should still be bumped.
+    assert_eq!(partition.collapse_loop(n[1], &[].into()), 1);
+    assert_eq!(partition.collapse_loop(n[0], &[n[1], n[2]].into()), 2);
+    assert_eq!(partition.collapse_loop(n[0], &[n[0], n[3]].into()), 3);
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
new file mode 100644
index 000000000..7e8324021
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const MAX_BASIC_BLOCKS: u16 = 1024;
+const MAX_LOCALS: u8 = 255;
+
+const NUM_FUNCTIONS: u16 = 16;
+
+#[test]
+fn many_backedges() {
+    let mut m = empty_module();
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS - MAX_LOCALS as u16 - 2) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(0))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "many_backedges",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
new file mode 100644
index 000000000..a9b65e033
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -0,0 +1,56 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_config::verifier::{
+    VerifierConfig, DEFAULT_MAX_CONSTANT_VECTOR_LEN, DEFAULT_MAX_IDENTIFIER_LENGTH,
+};
+
+pub mod ability_field_requirements_tests;
+pub mod binary_samples;
+pub mod bounds_tests;
+pub mod code_unit_tests;
+pub mod constants_tests;
+pub mod control_flow_tests;
+pub mod dependencies_tests;
+pub mod duplication_tests;
+pub mod generic_ops_tests;
+pub mod large_type_test;
+pub mod limit_tests;
+pub mod locals;
+pub mod loop_summary_tests;
+pub mod many_back_edges;
+pub mod multi_pass_tests;
+pub mod negative_stack_size_tests;
+pub mod reference_safety_tests;
+pub mod signature_tests;
+pub mod struct_defs_tests;
+pub mod vec_pack_tests;
+
+/// Configuration used in production.
+pub(crate) fn production_config() -> VerifierConfig {
+    VerifierConfig {
+        max_loop_depth: Some(5),
+        max_generic_instantiation_length: Some(32),
+        max_function_parameters: Some(128),
+        max_basic_blocks: Some(1024),
+        max_basic_blocks_in_script: Some(1024),
+        max_value_stack_size: 1024,
+        max_type_nodes: Some(256),
+        max_push_size: Some(10000),
+        max_dependency_depth: Some(100),
+        max_struct_definitions: Some(200),
+        max_fields_in_struct: Some(30),
+        max_function_definitions: Some(1000),
+
+        // Do not use back edge constraints as they are superseded by metering
+        max_back_edges_per_function: None,
+        max_back_edges_per_module: None,
+
+        // Same as the default.
+        max_per_fun_meter_units: Some(1000 * 8000),
+        max_per_mod_meter_units: Some(1000 * 8000),
+        max_constant_vector_len: Some(DEFAULT_MAX_CONSTANT_VECTOR_LEN),
+        max_idenfitier_len: Some(DEFAULT_MAX_IDENTIFIER_LENGTH),
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs
new file mode 100644
index 000000000..d244f6dd3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs
@@ -0,0 +1,23 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::CompiledModule;
+use move_bytecode_verifier::{
+    ability_field_requirements, constants, instantiation_loops::InstantiationLoopChecker,
+    DuplicationChecker, InstructionConsistency, RecursiveStructDefChecker, SignatureChecker,
+};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn check_verifier_passes(module in CompiledModule::valid_strategy(20)) {
+        DuplicationChecker::verify_module(&module).expect("DuplicationChecker failure");
+        SignatureChecker::verify_module(&module).expect("SignatureChecker failure");
+        InstructionConsistency::verify_module(&module).expect("InstructionConsistency failure");
+        constants::verify_module(&module).expect("constants failure");
+        ability_field_requirements::verify_module(&module).expect("ability_field_requirements failure");
+        RecursiveStructDefChecker::verify_module(&module).expect("RecursiveStructDefChecker failure");
+        InstantiationLoopChecker::verify_module(&module).expect("InstantiationLoopChecker failure");
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
new file mode 100644
index 000000000..3b1c387e4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
@@ -0,0 +1,51 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::file_format::Bytecode;
+use move_bytecode_verifier::meter::DummyMeter;
+use move_bytecode_verifier::CodeUnitVerifier;
+use move_core_types::vm_status::StatusCode;
+
+#[test]
+fn one_pop_no_push() {
+    let module = dummy_procedure_module(vec![Bytecode::Pop, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn one_pop_one_push() {
+    // Height: 0 + (-1 + 1) = 0 would have passed original usage verifier
+    let module = dummy_procedure_module(vec![Bytecode::ReadRef, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn two_pop_one_push() {
+    // Height: 0 + 1 + (-2 + 1) = 0 would have passed original usage verifier
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(0), Bytecode::Add, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn two_pop_no_push() {
+    let module = dummy_procedure_module(vec![Bytecode::WriteRef, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
new file mode 100644
index 000000000..35ae4385f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
@@ -0,0 +1,435 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_bicliques() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-xm6p-ffcq-5p2v
+    const NUM_LOCALS: u8 = 128;
+    const NUM_CALLS: u16 = 76;
+    const NUM_FUNCTIONS: u16 = 1;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // create take_and_return_references
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U64)))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+    m.identifiers
+        .push(Identifier::new("take_and_return_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+    let code = &mut m.function_defs[1].code.as_mut().unwrap().code;
+    for i in 0..NUM_LOCALS {
+        code.push(Bytecode::MoveLoc(i));
+    }
+    code.push(Bytecode::Ret);
+
+    // create swallow_references
+    m.identifiers
+        .push(Identifier::new("swallow_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 2),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 2].code.as_mut().unwrap().code;
+        for j in 0..NUM_LOCALS {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_bicliques",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state_large_graph() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const N: u8 = 127;
+    const NUM_NOP_BLOCKS: u16 = 950;
+    const NUM_FUNCTIONS: u16 = 18;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(N as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    m.identifiers
+        .push(Identifier::new("take_and_return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 3),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 3),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 3].code.as_mut().unwrap().code;
+        for j in 0..N {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        for j in 0..N {
+            code.push(Bytecode::StLoc(N + j));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state_large_graph",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const NUM_NOP_BLOCKS: u16 = 965;
+    const NUM_LOCALS: u8 = 32;
+    const NUM_FUNCTIONS: u16 = 21;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U8,
+        ))]));
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(NUM_LOCALS as usize - 1)
+            .collect(),
+    ));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create a path of length NUM_LOCALS - 1 in the borrow graph
+        for j in 0..(NUM_LOCALS - 2) {
+            // create Ref(new_id) and factor in empty-path edge id -> new_id
+            code.push(Bytecode::CopyLoc(1));
+            // can't leave those references on stack since basic blocks need to be stack-neutral
+            code.push(Bytecode::StLoc(j + 2));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            // create back edge to first block
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_copyloc_pop() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-2qvr-c9qp-wch7
+    const NUM_COPYLOCS: u16 = 1880;
+    const NUM_CHILDREN: u16 = 1020;
+    const NUM_FUNCTIONS: u16 = 2;
+
+    let mut m = empty_module();
+
+    // parameters of f0, f1, ...
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::U8)),
+        ))]));
+    // locals of f0, f1, ...
+    m.signatures.push(Signature(vec![
+        SignatureToken::Reference(Box::new(SignatureToken::Vector(Box::new(
+            SignatureToken::U8,
+        )))),
+        SignatureToken::U8, // ignore this, it's just here because I don't want to fix indices and the TypeParameter after removing the collision
+    ]));
+    // for VecImmBorrow
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8).take(1).collect(),
+    ));
+    m.signatures
+        .push(Signature(vec![SignatureToken::TypeParameter(0)]));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create NUM_CHLIDREN children of id
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::LdU64(0));
+            code.push(Bytecode::VecImmBorrow(SignatureIndex(3)));
+        }
+        // then do a whole lot of copylocs on that reference
+        for _ in 0..NUM_COPYLOCS {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::Pop);
+        }
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::Pop);
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_copyloc_pop",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
new file mode 100644
index 000000000..3f9989200
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -0,0 +1,227 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
+use move_binary_format::file_format::{
+    Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
+};
+use move_bytecode_verifier::{
+    meter::DummyMeter, verify_module_unmetered, verify_module_with_config_for_test,
+    SignatureChecker,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use proptest::{collection::vec, prelude::*, sample::Index as PropIndex};
+
+#[test]
+fn test_reference_of_reference() {
+    let mut m = basic_test_module();
+    m.signatures[0] = Signature(vec![Reference(Box::new(Reference(Box::new(
+        SignatureToken::Bool,
+    ))))]);
+    let errors = SignatureChecker::verify_module(&m);
+    assert!(errors.is_err());
+}
+
+proptest! {
+    #[test]
+    fn valid_signatures(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(SignatureChecker::verify_module(&module).is_ok())
+    }
+
+    #[test]
+    fn double_refs(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec((any::<PropIndex>(), any::<PropIndex>()), 0..20),
+    ) {
+        let context = SignatureRefMutation::new(&mut module, mutations);
+        let expected_violations = context.apply();
+
+        let result = SignatureChecker::verify_module(&module);
+
+        prop_assert_eq!(expected_violations, result.is_err());
+    }
+
+    #[test]
+    fn field_def_references(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec((any::<PropIndex>(), any::<PropIndex>()), 0..40),
+    ) {
+        let context = FieldRefMutation::new(&mut module, mutations);
+        let expected_violations = context.apply();
+
+        let result = SignatureChecker::verify_module(&module);
+
+        prop_assert_eq!(expected_violations, result.is_err());
+    }
+}
+
+#[test]
+fn no_verify_locals_good() {
+    let compiled_module_good = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        struct_handles: vec![],
+        signatures: vec![
+            Signature(vec![Address]),
+            Signature(vec![U64]),
+            Signature(vec![]),
+        ],
+        function_handles: vec![
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                return_: SignatureIndex(2),
+                parameters: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                return_: SignatureIndex(2),
+                parameters: SignatureIndex(1),
+                type_parameters: vec![],
+            },
+        ],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        identifiers: vec![
+            Identifier::new("Bad").unwrap(),
+            Identifier::new("blah").unwrap(),
+            Identifier::new("foo").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::new([0; AccountAddress::LENGTH])],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Ret],
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(1),
+                    code: vec![Ret],
+                }),
+            },
+        ],
+    };
+    assert!(verify_module_unmetered(&compiled_module_good).is_ok());
+}
+
+#[test]
+fn big_signature_test() {
+    const N_TYPE_PARAMS: usize = 5;
+    const INSTANTIATION_DEPTH: usize = 3;
+    const VECTOR_DEPTH: usize = 250;
+    let mut st = SignatureToken::U8;
+    for _ in 0..VECTOR_DEPTH {
+        st = SignatureToken::Vector(Box::new(st));
+    }
+    for _ in 0..INSTANTIATION_DEPTH {
+        let type_params = vec![st; N_TYPE_PARAMS];
+        st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    }
+
+    const N_READPOP: u16 = 7500;
+
+    let mut code = vec![];
+    // 1. ImmBorrowLoc: ... ref
+    // 2. ReadRef:      ... value
+    // 3. Pop:          ...
+    for _ in 0..N_READPOP {
+        code.push(Bytecode::ImmBorrowLoc(0));
+        code.push(Bytecode::ReadRef);
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize_with_defaults(&mvbytes).unwrap();
+
+    let res = verify_module_with_config_for_test(
+        "big_signature_test",
+        &production_config(),
+        &module,
+        &mut DummyMeter,
+    )
+    .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs
new file mode 100644
index 000000000..71fdc4660
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::RecursiveStructDefChecker;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_recursive_struct_defs(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(RecursiveStructDefChecker::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
new file mode 100644
index 000000000..672c255c7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
@@ -0,0 +1,71 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, Visibility,
+};
+use move_bytecode_verifier::meter::DummyMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+fn vec_sig(len: usize) -> SignatureToken {
+    if len > 0 {
+        SignatureToken::Vector(Box::new(vec_sig(len - 1)))
+    } else {
+        SignatureToken::U8
+    }
+}
+
+#[test]
+fn test_vec_pack() {
+    let mut m = empty_module();
+
+    let sig = SignatureIndex(m.signatures.len() as u16);
+    m.signatures.push(Signature(vec![vec_sig(255)]));
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Private,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(m.identifiers.len() as u16),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.identifiers
+        .push(Identifier::new("foo".to_string()).unwrap());
+
+    const COUNT: usize = 3000;
+
+    m.function_defs[0].code.as_mut().unwrap().code =
+        std::iter::once(&[Bytecode::VecPack(sig, 0)][..])
+            .chain(
+                std::iter::repeat(
+                    &[Bytecode::VecUnpack(sig, 1024), Bytecode::VecPack(sig, 1024)][..],
+                )
+                .take(COUNT),
+            )
+            .chain(std::iter::once(&[Bytecode::Pop, Bytecode::Ret][..]))
+            .flatten()
+            .cloned()
+            .collect();
+
+    let res = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_vec_pack",
+        &production_config(),
+        &m,
+        &mut DummyMeter,
+    )
+    .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VALUE_STACK_PUSH_OVERFLOW);
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/Cargo.toml b/vendors/move/crates/bytecode-verifier-transactional-tests/Cargo.toml
new file mode 100644
index 000000000..f1b90ffc4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "bytecode-verifier-transactional-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-transactional-test-runner.workspace = true
+
+[[test]]
+name = "tests"
+harness = false
+
+[dependencies]
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/src/lib.rs b/vendors/move/crates/bytecode-verifier-transactional-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.exp
new file mode 100644
index 000000000..af6b9936e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 9-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.mvir
new file mode 100644
index 000000000..a65a7e7f1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/procedure_args.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x42.Test {
+    public t(fr: u64) {
+    label b0:
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Test;
+
+entry foo() {
+label b0:
+    // args type mismatch
+    Test.t(true);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.mvir
new file mode 100644
index 000000000..d115c6fbb
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/resource_has_resource_field.mvir
@@ -0,0 +1,5 @@
+//# publish
+module 0x42.Test {
+    struct All has key, store, copy, drop { b: bool }
+    struct T { f: Self.All } // can drop abilities
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.exp
new file mode 100644
index 000000000..8fc6a9cda
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.mvir
new file mode 100644
index 000000000..b4ac76320
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/ability_field_requirements/unrestricted_has_resource_field.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x42.Test {
+import 0x1.XUS;
+    struct Coin has store { value: u64 }
+    struct T has copy, drop {
+        // does not have copy or drop
+        fc: Self.Coin,
+        fint: u64,
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.exp
new file mode 100644
index 000000000..0d1108cb0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-265:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir
new file mode 100644
index 000000000..409900827
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir
@@ -0,0 +1,265 @@
+//# publish
+module 0x1.M {
+    foo(
+        p1 : u8,
+        p2 : u8,
+        p3 : u8,
+        p4 : u8,
+        p5 : u8,
+        p6 : u8,
+        p7 : u8,
+        p8 : u8,
+        p9 : u8,
+        p10 : u8,
+        p11 : u8,
+        p12 : u8,
+        p13 : u8,
+        p14 : u8,
+        p15 : u8,
+        p16 : u8,
+        p17 : u8,
+        p18 : u8,
+        p19 : u8,
+        p20 : u8,
+        p21 : u8,
+        p22 : u8,
+        p23 : u8,
+        p24 : u8,
+        p25 : u8,
+        p26 : u8,
+        p27 : u8,
+        p28 : u8,
+        p29 : u8,
+        p30 : u8,
+        p31 : u8,
+        p32 : u8,
+        p33 : u8,
+        p34 : u8,
+        p35 : u8,
+        p36 : u8,
+        p37 : u8,
+        p38 : u8,
+        p39 : u8,
+        p40 : u8,
+        p41 : u8,
+        p42 : u8,
+        p43 : u8,
+        p44 : u8,
+        p45 : u8,
+        p46 : u8,
+        p47 : u8,
+        p48 : u8,
+        p49 : u8,
+        p50 : u8,
+        p51 : u8,
+        p52 : u8,
+        p53 : u8,
+        p54 : u8,
+        p55 : u8,
+        p56 : u8,
+        p57 : u8,
+        p58 : u8,
+        p59 : u8,
+        p60 : u8,
+        p61 : u8,
+        p62 : u8,
+        p63 : u8,
+        p64 : u8,
+        p65 : u8,
+        p66 : u8,
+        p67 : u8,
+        p68 : u8,
+        p69 : u8,
+        p70 : u8,
+        p71 : u8,
+        p72 : u8,
+        p73 : u8,
+        p74 : u8,
+        p75 : u8,
+        p76 : u8,
+        p77 : u8,
+        p78 : u8,
+        p79 : u8,
+        p80 : u8,
+        p81 : u8,
+        p82 : u8,
+        p83 : u8,
+        p84 : u8,
+        p85 : u8,
+        p86 : u8,
+        p87 : u8,
+        p88 : u8,
+        p89 : u8,
+        p90 : u8,
+        p91 : u8,
+        p92 : u8,
+        p93 : u8,
+        p94 : u8,
+        p95 : u8,
+        p96 : u8,
+        p97 : u8,
+        p98 : u8,
+        p99 : u8,
+        p100 : u8,
+        p101 : u8,
+        p102 : u8,
+        p103 : u8,
+        p104 : u8,
+        p105 : u8,
+        p106 : u8,
+        p107 : u8,
+        p108 : u8,
+        p109 : u8,
+        p110 : u8,
+        p111 : u8,
+        p112 : u8,
+        p113 : u8,
+        p114 : u8,
+        p115 : u8,
+        p116 : u8,
+        p117 : u8,
+        p118 : u8,
+        p119 : u8,
+        p120 : u8,
+        p121 : u8,
+        p122 : u8,
+        p123 : u8,
+        p124 : u8,
+        p125 : u8,
+        p126 : u8,
+        p127 : u8,
+        p128 : u8,
+    ) {
+        let x1 : u8;
+        let x2 : u8;
+        let x3 : u8;
+        let x4 : u8;
+        let x5 : u8;
+        let x6 : u8;
+        let x7 : u8;
+        let x8 : u8;
+        let x9 : u8;
+        let x10 : u8;
+        let x11 : u8;
+        let x12 : u8;
+        let x13 : u8;
+        let x14 : u8;
+        let x15 : u8;
+        let x16 : u8;
+        let x17 : u8;
+        let x18 : u8;
+        let x19 : u8;
+        let x20 : u8;
+        let x21 : u8;
+        let x22 : u8;
+        let x23 : u8;
+        let x24 : u8;
+        let x25 : u8;
+        let x26 : u8;
+        let x27 : u8;
+        let x28 : u8;
+        let x29 : u8;
+        let x30 : u8;
+        let x31 : u8;
+        let x32 : u8;
+        let x33 : u8;
+        let x34 : u8;
+        let x35 : u8;
+        let x36 : u8;
+        let x37 : u8;
+        let x38 : u8;
+        let x39 : u8;
+        let x40 : u8;
+        let x41 : u8;
+        let x42 : u8;
+        let x43 : u8;
+        let x44 : u8;
+        let x45 : u8;
+        let x46 : u8;
+        let x47 : u8;
+        let x48 : u8;
+        let x49 : u8;
+        let x50 : u8;
+        let x51 : u8;
+        let x52 : u8;
+        let x53 : u8;
+        let x54 : u8;
+        let x55 : u8;
+        let x56 : u8;
+        let x57 : u8;
+        let x58 : u8;
+        let x59 : u8;
+        let x60 : u8;
+        let x61 : u8;
+        let x62 : u8;
+        let x63 : u8;
+        let x64 : u8;
+        let x65 : u8;
+        let x66 : u8;
+        let x67 : u8;
+        let x68 : u8;
+        let x69 : u8;
+        let x70 : u8;
+        let x71 : u8;
+        let x72 : u8;
+        let x73 : u8;
+        let x74 : u8;
+        let x75 : u8;
+        let x76 : u8;
+        let x77 : u8;
+        let x78 : u8;
+        let x79 : u8;
+        let x80 : u8;
+        let x81 : u8;
+        let x82 : u8;
+        let x83 : u8;
+        let x84 : u8;
+        let x85 : u8;
+        let x86 : u8;
+        let x87 : u8;
+        let x88 : u8;
+        let x89 : u8;
+        let x90 : u8;
+        let x91 : u8;
+        let x92 : u8;
+        let x93 : u8;
+        let x94 : u8;
+        let x95 : u8;
+        let x96 : u8;
+        let x97 : u8;
+        let x98 : u8;
+        let x99 : u8;
+        let x100 : u8;
+        let x101 : u8;
+        let x102 : u8;
+        let x103 : u8;
+        let x104 : u8;
+        let x105 : u8;
+        let x106 : u8;
+        let x107 : u8;
+        let x108 : u8;
+        let x109 : u8;
+        let x110 : u8;
+        let x111 : u8;
+        let x112 : u8;
+        let x113 : u8;
+        let x114 : u8;
+        let x115 : u8;
+        let x116 : u8;
+        let x117 : u8;
+        let x118 : u8;
+        let x119 : u8;
+        let x120 : u8;
+        let x121 : u8;
+        let x122 : u8;
+        let x123 : u8;
+        let x124 : u8;
+        let x125 : u8;
+        let x126 : u8;
+        let x127 : u8;
+        let x128 : u8;
+    label b0:
+        return;
+    }
+}
+// check: TOO_MANY_LOCALS
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
new file mode 100644
index 000000000..f5cf0a779
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-264:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
new file mode 100644
index 000000000..654674e5b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
@@ -0,0 +1,264 @@
+//# publish
+module 0x1.M {
+    foo(p1: u8) {
+        let x1 : u8;
+        let x2 : u8;
+        let x3 : u8;
+        let x4 : u8;
+        let x5 : u8;
+        let x6 : u8;
+        let x7 : u8;
+        let x8 : u8;
+        let x9 : u8;
+        let x10 : u8;
+        let x11 : u8;
+        let x12 : u8;
+        let x13 : u8;
+        let x14 : u8;
+        let x15 : u8;
+        let x16 : u8;
+        let x17 : u8;
+        let x18 : u8;
+        let x19 : u8;
+        let x20 : u8;
+        let x21 : u8;
+        let x22 : u8;
+        let x23 : u8;
+        let x24 : u8;
+        let x25 : u8;
+        let x26 : u8;
+        let x27 : u8;
+        let x28 : u8;
+        let x29 : u8;
+        let x30 : u8;
+        let x31 : u8;
+        let x32 : u8;
+        let x33 : u8;
+        let x34 : u8;
+        let x35 : u8;
+        let x36 : u8;
+        let x37 : u8;
+        let x38 : u8;
+        let x39 : u8;
+        let x40 : u8;
+        let x41 : u8;
+        let x42 : u8;
+        let x43 : u8;
+        let x44 : u8;
+        let x45 : u8;
+        let x46 : u8;
+        let x47 : u8;
+        let x48 : u8;
+        let x49 : u8;
+        let x50 : u8;
+        let x51 : u8;
+        let x52 : u8;
+        let x53 : u8;
+        let x54 : u8;
+        let x55 : u8;
+        let x56 : u8;
+        let x57 : u8;
+        let x58 : u8;
+        let x59 : u8;
+        let x60 : u8;
+        let x61 : u8;
+        let x62 : u8;
+        let x63 : u8;
+        let x64 : u8;
+        let x65 : u8;
+        let x66 : u8;
+        let x67 : u8;
+        let x68 : u8;
+        let x69 : u8;
+        let x70 : u8;
+        let x71 : u8;
+        let x72 : u8;
+        let x73 : u8;
+        let x74 : u8;
+        let x75 : u8;
+        let x76 : u8;
+        let x77 : u8;
+        let x78 : u8;
+        let x79 : u8;
+        let x80 : u8;
+        let x81 : u8;
+        let x82 : u8;
+        let x83 : u8;
+        let x84 : u8;
+        let x85 : u8;
+        let x86 : u8;
+        let x87 : u8;
+        let x88 : u8;
+        let x89 : u8;
+        let x90 : u8;
+        let x91 : u8;
+        let x92 : u8;
+        let x93 : u8;
+        let x94 : u8;
+        let x95 : u8;
+        let x96 : u8;
+        let x97 : u8;
+        let x98 : u8;
+        let x99 : u8;
+        let x100 : u8;
+        let x101 : u8;
+        let x102 : u8;
+        let x103 : u8;
+        let x104 : u8;
+        let x105 : u8;
+        let x106 : u8;
+        let x107 : u8;
+        let x108 : u8;
+        let x109 : u8;
+        let x110 : u8;
+        let x111 : u8;
+        let x112 : u8;
+        let x113 : u8;
+        let x114 : u8;
+        let x115 : u8;
+        let x116 : u8;
+        let x117 : u8;
+        let x118 : u8;
+        let x119 : u8;
+        let x120 : u8;
+        let x121 : u8;
+        let x122 : u8;
+        let x123 : u8;
+        let x124 : u8;
+        let x125 : u8;
+        let x126 : u8;
+        let x127 : u8;
+        let x128 : u8;
+        let x129 : u8;
+        let x130 : u8;
+        let x131 : u8;
+        let x132 : u8;
+        let x133 : u8;
+        let x134 : u8;
+        let x135 : u8;
+        let x136 : u8;
+        let x137 : u8;
+        let x138 : u8;
+        let x139 : u8;
+        let x140 : u8;
+        let x141 : u8;
+        let x142 : u8;
+        let x143 : u8;
+        let x144 : u8;
+        let x145 : u8;
+        let x146 : u8;
+        let x147 : u8;
+        let x148 : u8;
+        let x149 : u8;
+        let x150 : u8;
+        let x151 : u8;
+        let x152 : u8;
+        let x153 : u8;
+        let x154 : u8;
+        let x155 : u8;
+        let x156 : u8;
+        let x157 : u8;
+        let x158 : u8;
+        let x159 : u8;
+        let x160 : u8;
+        let x161 : u8;
+        let x162 : u8;
+        let x163 : u8;
+        let x164 : u8;
+        let x165 : u8;
+        let x166 : u8;
+        let x167 : u8;
+        let x168 : u8;
+        let x169 : u8;
+        let x170 : u8;
+        let x171 : u8;
+        let x172 : u8;
+        let x173 : u8;
+        let x174 : u8;
+        let x175 : u8;
+        let x176 : u8;
+        let x177 : u8;
+        let x178 : u8;
+        let x179 : u8;
+        let x180 : u8;
+        let x181 : u8;
+        let x182 : u8;
+        let x183 : u8;
+        let x184 : u8;
+        let x185 : u8;
+        let x186 : u8;
+        let x187 : u8;
+        let x188 : u8;
+        let x189 : u8;
+        let x190 : u8;
+        let x191 : u8;
+        let x192 : u8;
+        let x193 : u8;
+        let x194 : u8;
+        let x195 : u8;
+        let x196 : u8;
+        let x197 : u8;
+        let x198 : u8;
+        let x199 : u8;
+        let x200 : u8;
+        let x201 : u8;
+        let x202 : u8;
+        let x203 : u8;
+        let x204 : u8;
+        let x205 : u8;
+        let x206 : u8;
+        let x207 : u8;
+        let x208 : u8;
+        let x209 : u8;
+        let x210 : u8;
+        let x211 : u8;
+        let x212 : u8;
+        let x213 : u8;
+        let x214 : u8;
+        let x215 : u8;
+        let x216 : u8;
+        let x217 : u8;
+        let x218 : u8;
+        let x219 : u8;
+        let x220 : u8;
+        let x221 : u8;
+        let x222 : u8;
+        let x223 : u8;
+        let x224 : u8;
+        let x225 : u8;
+        let x226 : u8;
+        let x227 : u8;
+        let x228 : u8;
+        let x229 : u8;
+        let x230 : u8;
+        let x231 : u8;
+        let x232 : u8;
+        let x233 : u8;
+        let x234 : u8;
+        let x235 : u8;
+        let x236 : u8;
+        let x237 : u8;
+        let x238 : u8;
+        let x239 : u8;
+        let x240 : u8;
+        let x241 : u8;
+        let x242 : u8;
+        let x243 : u8;
+        let x244 : u8;
+        let x245 : u8;
+        let x246 : u8;
+        let x247 : u8;
+        let x248 : u8;
+        let x249 : u8;
+        let x250 : u8;
+        let x251 : u8;
+        let x252 : u8;
+        let x253 : u8;
+        let x254 : u8;
+        let x255 : u8;
+    label b0:
+        return;
+    }
+}
+
+// check: TOO_MANY_LOCALS
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.exp
new file mode 100644
index 000000000..cb05a36a1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-263:
+Error: value (256) cannot exceed (255)
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.mvir
new file mode 100644
index 000000000..19a5030b3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.mvir
@@ -0,0 +1,263 @@
+//# publish
+module 0x1.M {
+    foo() {
+        let x1 : u8;
+        let x2 : u8;
+        let x3 : u8;
+        let x4 : u8;
+        let x5 : u8;
+        let x6 : u8;
+        let x7 : u8;
+        let x8 : u8;
+        let x9 : u8;
+        let x10 : u8;
+        let x11 : u8;
+        let x12 : u8;
+        let x13 : u8;
+        let x14 : u8;
+        let x15 : u8;
+        let x16 : u8;
+        let x17 : u8;
+        let x18 : u8;
+        let x19 : u8;
+        let x20 : u8;
+        let x21 : u8;
+        let x22 : u8;
+        let x23 : u8;
+        let x24 : u8;
+        let x25 : u8;
+        let x26 : u8;
+        let x27 : u8;
+        let x28 : u8;
+        let x29 : u8;
+        let x30 : u8;
+        let x31 : u8;
+        let x32 : u8;
+        let x33 : u8;
+        let x34 : u8;
+        let x35 : u8;
+        let x36 : u8;
+        let x37 : u8;
+        let x38 : u8;
+        let x39 : u8;
+        let x40 : u8;
+        let x41 : u8;
+        let x42 : u8;
+        let x43 : u8;
+        let x44 : u8;
+        let x45 : u8;
+        let x46 : u8;
+        let x47 : u8;
+        let x48 : u8;
+        let x49 : u8;
+        let x50 : u8;
+        let x51 : u8;
+        let x52 : u8;
+        let x53 : u8;
+        let x54 : u8;
+        let x55 : u8;
+        let x56 : u8;
+        let x57 : u8;
+        let x58 : u8;
+        let x59 : u8;
+        let x60 : u8;
+        let x61 : u8;
+        let x62 : u8;
+        let x63 : u8;
+        let x64 : u8;
+        let x65 : u8;
+        let x66 : u8;
+        let x67 : u8;
+        let x68 : u8;
+        let x69 : u8;
+        let x70 : u8;
+        let x71 : u8;
+        let x72 : u8;
+        let x73 : u8;
+        let x74 : u8;
+        let x75 : u8;
+        let x76 : u8;
+        let x77 : u8;
+        let x78 : u8;
+        let x79 : u8;
+        let x80 : u8;
+        let x81 : u8;
+        let x82 : u8;
+        let x83 : u8;
+        let x84 : u8;
+        let x85 : u8;
+        let x86 : u8;
+        let x87 : u8;
+        let x88 : u8;
+        let x89 : u8;
+        let x90 : u8;
+        let x91 : u8;
+        let x92 : u8;
+        let x93 : u8;
+        let x94 : u8;
+        let x95 : u8;
+        let x96 : u8;
+        let x97 : u8;
+        let x98 : u8;
+        let x99 : u8;
+        let x100 : u8;
+        let x101 : u8;
+        let x102 : u8;
+        let x103 : u8;
+        let x104 : u8;
+        let x105 : u8;
+        let x106 : u8;
+        let x107 : u8;
+        let x108 : u8;
+        let x109 : u8;
+        let x110 : u8;
+        let x111 : u8;
+        let x112 : u8;
+        let x113 : u8;
+        let x114 : u8;
+        let x115 : u8;
+        let x116 : u8;
+        let x117 : u8;
+        let x118 : u8;
+        let x119 : u8;
+        let x120 : u8;
+        let x121 : u8;
+        let x122 : u8;
+        let x123 : u8;
+        let x124 : u8;
+        let x125 : u8;
+        let x126 : u8;
+        let x127 : u8;
+        let x128 : u8;
+        let x129 : u8;
+        let x130 : u8;
+        let x131 : u8;
+        let x132 : u8;
+        let x133 : u8;
+        let x134 : u8;
+        let x135 : u8;
+        let x136 : u8;
+        let x137 : u8;
+        let x138 : u8;
+        let x139 : u8;
+        let x140 : u8;
+        let x141 : u8;
+        let x142 : u8;
+        let x143 : u8;
+        let x144 : u8;
+        let x145 : u8;
+        let x146 : u8;
+        let x147 : u8;
+        let x148 : u8;
+        let x149 : u8;
+        let x150 : u8;
+        let x151 : u8;
+        let x152 : u8;
+        let x153 : u8;
+        let x154 : u8;
+        let x155 : u8;
+        let x156 : u8;
+        let x157 : u8;
+        let x158 : u8;
+        let x159 : u8;
+        let x160 : u8;
+        let x161 : u8;
+        let x162 : u8;
+        let x163 : u8;
+        let x164 : u8;
+        let x165 : u8;
+        let x166 : u8;
+        let x167 : u8;
+        let x168 : u8;
+        let x169 : u8;
+        let x170 : u8;
+        let x171 : u8;
+        let x172 : u8;
+        let x173 : u8;
+        let x174 : u8;
+        let x175 : u8;
+        let x176 : u8;
+        let x177 : u8;
+        let x178 : u8;
+        let x179 : u8;
+        let x180 : u8;
+        let x181 : u8;
+        let x182 : u8;
+        let x183 : u8;
+        let x184 : u8;
+        let x185 : u8;
+        let x186 : u8;
+        let x187 : u8;
+        let x188 : u8;
+        let x189 : u8;
+        let x190 : u8;
+        let x191 : u8;
+        let x192 : u8;
+        let x193 : u8;
+        let x194 : u8;
+        let x195 : u8;
+        let x196 : u8;
+        let x197 : u8;
+        let x198 : u8;
+        let x199 : u8;
+        let x200 : u8;
+        let x201 : u8;
+        let x202 : u8;
+        let x203 : u8;
+        let x204 : u8;
+        let x205 : u8;
+        let x206 : u8;
+        let x207 : u8;
+        let x208 : u8;
+        let x209 : u8;
+        let x210 : u8;
+        let x211 : u8;
+        let x212 : u8;
+        let x213 : u8;
+        let x214 : u8;
+        let x215 : u8;
+        let x216 : u8;
+        let x217 : u8;
+        let x218 : u8;
+        let x219 : u8;
+        let x220 : u8;
+        let x221 : u8;
+        let x222 : u8;
+        let x223 : u8;
+        let x224 : u8;
+        let x225 : u8;
+        let x226 : u8;
+        let x227 : u8;
+        let x228 : u8;
+        let x229 : u8;
+        let x230 : u8;
+        let x231 : u8;
+        let x232 : u8;
+        let x233 : u8;
+        let x234 : u8;
+        let x235 : u8;
+        let x236 : u8;
+        let x237 : u8;
+        let x238 : u8;
+        let x239 : u8;
+        let x240 : u8;
+        let x241 : u8;
+        let x242 : u8;
+        let x243 : u8;
+        let x244 : u8;
+        let x245 : u8;
+        let x246 : u8;
+        let x247 : u8;
+        let x248 : u8;
+        let x249 : u8;
+        let x250 : u8;
+        let x251 : u8;
+        let x252 : u8;
+        let x253 : u8;
+        let x254 : u8;
+        let x255 : u8;
+        let x256 : u8;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.exp
new file mode 100644
index 000000000..b62ab7bb9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'publish'. lines 1-264:
+Error: value (256) cannot exceed (255)
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.mvir
new file mode 100644
index 000000000..38cf0ef31
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_params.mvir
@@ -0,0 +1,264 @@
+//# publish
+module 0x1.M {
+    foo(
+        p1 : u8,
+        p2 : u8,
+        p3 : u8,
+        p4 : u8,
+        p5 : u8,
+        p6 : u8,
+        p7 : u8,
+        p8 : u8,
+        p9 : u8,
+        p10 : u8,
+        p11 : u8,
+        p12 : u8,
+        p13 : u8,
+        p14 : u8,
+        p15 : u8,
+        p16 : u8,
+        p17 : u8,
+        p18 : u8,
+        p19 : u8,
+        p20 : u8,
+        p21 : u8,
+        p22 : u8,
+        p23 : u8,
+        p24 : u8,
+        p25 : u8,
+        p26 : u8,
+        p27 : u8,
+        p28 : u8,
+        p29 : u8,
+        p30 : u8,
+        p31 : u8,
+        p32 : u8,
+        p33 : u8,
+        p34 : u8,
+        p35 : u8,
+        p36 : u8,
+        p37 : u8,
+        p38 : u8,
+        p39 : u8,
+        p40 : u8,
+        p41 : u8,
+        p42 : u8,
+        p43 : u8,
+        p44 : u8,
+        p45 : u8,
+        p46 : u8,
+        p47 : u8,
+        p48 : u8,
+        p49 : u8,
+        p50 : u8,
+        p51 : u8,
+        p52 : u8,
+        p53 : u8,
+        p54 : u8,
+        p55 : u8,
+        p56 : u8,
+        p57 : u8,
+        p58 : u8,
+        p59 : u8,
+        p60 : u8,
+        p61 : u8,
+        p62 : u8,
+        p63 : u8,
+        p64 : u8,
+        p65 : u8,
+        p66 : u8,
+        p67 : u8,
+        p68 : u8,
+        p69 : u8,
+        p70 : u8,
+        p71 : u8,
+        p72 : u8,
+        p73 : u8,
+        p74 : u8,
+        p75 : u8,
+        p76 : u8,
+        p77 : u8,
+        p78 : u8,
+        p79 : u8,
+        p80 : u8,
+        p81 : u8,
+        p82 : u8,
+        p83 : u8,
+        p84 : u8,
+        p85 : u8,
+        p86 : u8,
+        p87 : u8,
+        p88 : u8,
+        p89 : u8,
+        p90 : u8,
+        p91 : u8,
+        p92 : u8,
+        p93 : u8,
+        p94 : u8,
+        p95 : u8,
+        p96 : u8,
+        p97 : u8,
+        p98 : u8,
+        p99 : u8,
+        p100 : u8,
+        p101 : u8,
+        p102 : u8,
+        p103 : u8,
+        p104 : u8,
+        p105 : u8,
+        p106 : u8,
+        p107 : u8,
+        p108 : u8,
+        p109 : u8,
+        p110 : u8,
+        p111 : u8,
+        p112 : u8,
+        p113 : u8,
+        p114 : u8,
+        p115 : u8,
+        p116 : u8,
+        p117 : u8,
+        p118 : u8,
+        p119 : u8,
+        p120 : u8,
+        p121 : u8,
+        p122 : u8,
+        p123 : u8,
+        p124 : u8,
+        p125 : u8,
+        p126 : u8,
+        p127 : u8,
+        p128 : u8,
+        p129 : u8,
+        p130 : u8,
+        p131 : u8,
+        p132 : u8,
+        p133 : u8,
+        p134 : u8,
+        p135 : u8,
+        p136 : u8,
+        p137 : u8,
+        p138 : u8,
+        p139 : u8,
+        p140 : u8,
+        p141 : u8,
+        p142 : u8,
+        p143 : u8,
+        p144 : u8,
+        p145 : u8,
+        p146 : u8,
+        p147 : u8,
+        p148 : u8,
+        p149 : u8,
+        p150 : u8,
+        p151 : u8,
+        p152 : u8,
+        p153 : u8,
+        p154 : u8,
+        p155 : u8,
+        p156 : u8,
+        p157 : u8,
+        p158 : u8,
+        p159 : u8,
+        p160 : u8,
+        p161 : u8,
+        p162 : u8,
+        p163 : u8,
+        p164 : u8,
+        p165 : u8,
+        p166 : u8,
+        p167 : u8,
+        p168 : u8,
+        p169 : u8,
+        p170 : u8,
+        p171 : u8,
+        p172 : u8,
+        p173 : u8,
+        p174 : u8,
+        p175 : u8,
+        p176 : u8,
+        p177 : u8,
+        p178 : u8,
+        p179 : u8,
+        p180 : u8,
+        p181 : u8,
+        p182 : u8,
+        p183 : u8,
+        p184 : u8,
+        p185 : u8,
+        p186 : u8,
+        p187 : u8,
+        p188 : u8,
+        p189 : u8,
+        p190 : u8,
+        p191 : u8,
+        p192 : u8,
+        p193 : u8,
+        p194 : u8,
+        p195 : u8,
+        p196 : u8,
+        p197 : u8,
+        p198 : u8,
+        p199 : u8,
+        p200 : u8,
+        p201 : u8,
+        p202 : u8,
+        p203 : u8,
+        p204 : u8,
+        p205 : u8,
+        p206 : u8,
+        p207 : u8,
+        p208 : u8,
+        p209 : u8,
+        p210 : u8,
+        p211 : u8,
+        p212 : u8,
+        p213 : u8,
+        p214 : u8,
+        p215 : u8,
+        p216 : u8,
+        p217 : u8,
+        p218 : u8,
+        p219 : u8,
+        p220 : u8,
+        p221 : u8,
+        p222 : u8,
+        p223 : u8,
+        p224 : u8,
+        p225 : u8,
+        p226 : u8,
+        p227 : u8,
+        p228 : u8,
+        p229 : u8,
+        p230 : u8,
+        p231 : u8,
+        p232 : u8,
+        p233 : u8,
+        p234 : u8,
+        p235 : u8,
+        p236 : u8,
+        p237 : u8,
+        p238 : u8,
+        p239 : u8,
+        p240 : u8,
+        p241 : u8,
+        p242 : u8,
+        p243 : u8,
+        p244 : u8,
+        p245 : u8,
+        p246 : u8,
+        p247 : u8,
+        p248 : u8,
+        p249 : u8,
+        p250 : u8,
+        p251 : u8,
+        p252 : u8,
+        p253 : u8,
+        p254 : u8,
+        p255 : u8,
+        p256 : u8,
+    ) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.exp
new file mode 100644
index 000000000..6f873d8ae
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.mvir
new file mode 100644
index 000000000..0c94589d3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_few_type_actuals.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    foo() {
+        // missing type arg
+        let x: Self.S<>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.exp
new file mode 100644
index 000000000..6f873d8ae
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.mvir
new file mode 100644
index 000000000..1ffbb5ded
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S { b: bool }
+
+    foo() {
+        // type arg mismatch
+        let x: Self.S<u64>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.exp
new file mode 100644
index 000000000..5495d3b88
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-7:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FieldDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.mvir
new file mode 100644
index 000000000..382035942
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_field_name.mvir
@@ -0,0 +1,7 @@
+//# publish
+module 0x1.M {
+    // duplicate field of the same name
+    struct T{f: u64, f: u64}
+}
+
+// check: DUPLICATE_ELEMENT
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.exp
new file mode 100644
index 000000000..86db5c831
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.mvir
new file mode 100644
index 000000000..0a1cd7d3b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_function_name.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x42.M {
+    // duplicate functions
+    f() { label b0: }
+    f() { label b0: }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.exp
new file mode 100644
index 000000000..cedea2736
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.mvir
new file mode 100644
index 000000000..f766be9ff
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/duplicate_struct_name.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x42.M {
+    // duplicate structs
+    struct T{b: bool}
+    struct T{x: u64}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.exp
new file mode 100644
index 000000000..1f49c06d2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::EmptyStruct'. Got VMError: {
+    major_status: ZERO_SIZED_STRUCT,
+    sub_status: None,
+    location: 0x1::EmptyStruct,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.mvir
new file mode 100644
index 000000000..5504e78c4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/empty_structs.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x1.EmptyStruct {
+  // no empty structs allowed
+  struct Empty { }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.exp
new file mode 100644
index 000000000..a0c4d8fa7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 5-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::B'. Got VMError: {
+    major_status: DUPLICATE_ELEMENT,
+    sub_status: None,
+    location: 0x42::B,
+    indices: [(ModuleHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.mvir
new file mode 100644
index 000000000..9c854cbab
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/check_duplication/friend_decl_duplicated.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x42.A {
+}
+
+//# publish
+module 0x42.B {
+    // duplicate friend decl
+    friend 0x42.A;
+    friend 0x42.A;
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.mvir
new file mode 100644
index 000000000..401d8a144
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_nested.mvir
@@ -0,0 +1,23 @@
+//# run
+module 0x42.m {
+// check valid breaks in control flow check
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    y = 0;
+label while:
+    jump_if (false) while_cont;
+label loop:
+    y = 5;
+    jump loop_cont;
+label loop_cont:
+    x = 3;
+    jump while_cont;
+label while_cont:
+    assert(move(x) == 3, 42);
+    assert(move(y) == 5, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.mvir
new file mode 100644
index 000000000..5c32d92f3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_simple.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+// simple breaks for control flow check
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if (false) while_cont;
+label while_body:
+    x = move(x) + 1;
+    jump while_cont;
+label while_cont:
+    assert(move(x) == 1, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.mvir
new file mode 100644
index 000000000..38f8b55f8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/break_unreachable.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+// simple breaks for control flow check
+entry foo() {
+    let x: u64;
+label b0:
+    x = 1;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    x = 3;
+    jump while_cont;
+    x = 5;
+    jump while_cont;
+label while_cont:
+    assert(move(x) == 3, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.mvir
new file mode 100644
index 000000000..b2c9b2fbf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return.mvir
@@ -0,0 +1,25 @@
+//# publish
+
+// TODO: we might need to modify this test if we enable unreachable code
+// checking in the verifier.
+
+module 0x1.Test {
+    public t(): u64 {
+    label b0:
+        return 100;
+        return 0;
+    }
+}
+
+//# run
+module 0x42.m {
+
+import 0x1.Test;
+entry foo() {
+    let x: u64;
+label b0:
+    x = Test.t();
+    assert(copy(x) == 100, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.mvir
new file mode 100644
index 000000000..b0b66d84a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/dead_return_local.mvir
@@ -0,0 +1,10 @@
+//# run
+module 0x42.m {
+// TODO: should the verifier allow dead code?
+entry foo() {
+label b0:
+    return;
+    assert(false, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.exp
new file mode 100644
index 000000000..b1cf67793
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INDEX_OUT_OF_BOUNDS,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.mvir
new file mode 100644
index 000000000..ba1908cc3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_5.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) loop;
+label b1:
+    assert(false, 42);
+    return;
+label loop:
+    jump loop_cont;
+    jump loop;
+label loop_cont:
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.exp
new file mode 100644
index 000000000..dda133494
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INDEX_OUT_OF_BOUNDS,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.mvir
new file mode 100644
index 000000000..fab3eff92
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_6.mvir
@@ -0,0 +1,21 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) loop;
+label b1:
+    assert(false, 42);
+    return;
+label loop:
+    jump_if (true) loop_b1;
+label loop_b0:
+    jump loop_cont;
+label loop_b1:
+    return;
+label loop_cont:
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.exp
new file mode 100644
index 000000000..7f94e2896
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INDEX_OUT_OF_BOUNDS,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.mvir
new file mode 100644
index 000000000..702eaa07c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/if_branch_diverges_8.mvir
@@ -0,0 +1,24 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) loop;
+label b1:
+    assert(false, 42);
+    return;
+label loop:
+    jump loop_cont;
+    jump_if (true) loop_b1;
+label loop_b0:
+    jump loop;
+label loop_b1:
+    return;
+label loop_cont:
+    jump b2;
+label b2:
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.exp
new file mode 100644
index 000000000..736704a82
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-8:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EMPTY_CODE_UNIT,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.mvir
new file mode 100644
index 000000000..478365205
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough1.mvir
@@ -0,0 +1,8 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0: // empty functions not allowed
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.exp
new file mode 100644
index 000000000..949448a2b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INVALID_FALL_THROUGH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.mvir
new file mode 100644
index 000000000..99c1d0890
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough2.mvir
@@ -0,0 +1,12 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+  let x: u64;
+label b0:
+  return;
+  // invalid fall through
+  x = 7;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.exp
new file mode 100644
index 000000000..bafbfc043
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INVALID_FALL_THROUGH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.mvir
new file mode 100644
index 000000000..ff2660e9e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/invalid_fallthrough3.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if_false(true) b2;
+label b1:
+    return;
+label b2:
+    return;
+label b3:
+    x = 7;
+    // invalid fall through
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp
new file mode 100644
index 000000000..14e08fc1d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 17-5497:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 65530)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir
new file mode 100644
index 000000000..1040e474d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir
@@ -0,0 +1,5497 @@
+//# publish
+module 0x1.test {
+    struct HotPotato { value: u64 }
+    public get_hot_potato(): Self.HotPotato {
+        label l0:
+        return HotPotato { value: 42 };
+    }
+
+    public destroy_hot_potato(potato: Self.HotPotato) {
+        label l0:
+        HotPotato {} = move(potato);
+        _ = ();
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.test;
+// check valid breaks in control flow check
+entry foo() {
+    let hot_potato_1: test.HotPotato;
+    let hot_potato_2: test.HotPotato;
+label start:
+    jump end;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return;
+label code:
+    hot_potato_1 = test.get_hot_potato();
+    hot_potato_2 = test.get_hot_potato();
+    hot_potato_1 = move(hot_potato_2);
+    test.destroy_hot_potato(move(hot_potato_1));
+    return;
+label end:
+    jump code;
+
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp
new file mode 100644
index 000000000..28246cbe4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5480:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 65529)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir
new file mode 100644
index 000000000..c21c3f68f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir
@@ -0,0 +1,5480 @@
+//# run
+module 0x42.m {
+// check valid breaks in control flow check
+entry foo() {
+    let v: vector<u64>;
+    let vref: &mut vector<u64>;
+    let r: &mut u64;
+label start:
+    jump end;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return;
+label code:
+    v = vec_pack_1<u64>(0);
+    vref = &mut v;
+    r = vec_mut_borrow<u64>(copy(vref), 0);
+    _ = vec_pop_back<u64>(copy(vref));
+    *copy(r) = 1;
+label end:
+    jump code;
+
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.move b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.move
new file mode 100644
index 000000000..d17230674
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_496.move
@@ -0,0 +1,18 @@
+//# publish
+module 0x42::test_case {
+    public fun test_loop(a: u64): u64 {
+        if (a == 2) {
+            1
+        } else if (a == 3) {
+            let i = 0;
+            let ret = 0;
+            while (i < a) {
+                ret = ret + i;
+                i = i + 1;
+            };
+            ret
+        } else {
+            abort 10000
+        }
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.move b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.move
new file mode 100644
index 000000000..cba6f8098
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/control_flow/regression_test_678.move
@@ -0,0 +1,22 @@
+//# publish
+module 0x42::test_case {
+    struct Foo has drop {}
+
+    fun bar(_foo: &mut Foo) {
+        /* ... */
+    }
+
+    fun remove_tx(foo: &mut Foo) {
+        let i = 0;
+        while (i < 64) {
+            i = i + 1;
+
+            bar(foo);
+            if (i < 30) {
+                continue
+            };
+
+            break
+        }
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.exp
new file mode 100644
index 000000000..c08c13cd9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 9-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::N'. Got VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.mvir
new file mode 100644
index 000000000..e26c71e3e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_friend_function_invalid.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x42.M {
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        // cannot call friend visible function if not a friend
+        M.foo();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.exp
new file mode 100644
index 000000000..06fdb10b9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 9-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.mvir
new file mode 100644
index 000000000..d76019508
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_private_function.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x42.M {
+    universal_truth(): u64 {
+    label b0:
+        return 42;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let x: u64;
+label b0:
+    // cannot call private/internal functions
+    x = M.universal_truth();
+    return;
+}
+}
+
+// check: LOOKUP_FAILED
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.mvir
new file mode 100644
index 000000000..c66388b7b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/access_public_function.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x42.M {
+    public universal_truth(): u64 {
+    label b0:
+        return 42;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let x: u64;
+label b0:
+    // can call public functions
+    x = M.universal_truth();
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.mvir
new file mode 100644
index 000000000..60938fe8d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/all_fields_accessible.mvir
@@ -0,0 +1,76 @@
+//# publish
+module 0x42.M {
+    struct A{x: u64}
+    struct B has drop {y: u64}
+
+    public a(x: u64): Self.A {
+    label b0:
+        return A{x: move(x)};
+    }
+
+    public b(y: u64): Self.B {
+    label b0:
+        return B{y: move(y)};
+    }
+
+    public set_a_with_b(a: &mut Self.A, b: &Self.B) {
+        let x_ref: &mut u64;
+        let y_ref: &u64;
+    label b0:
+        x_ref = &mut copy(a).A::x;
+        y_ref = &copy(b).B::y;
+        *move(x_ref) = *move(y_ref);
+        _ = move(a);
+        _ = move(b);
+        return;
+    }
+
+    public set_b_with_a(b: &mut Self.B, a: &Self.A) {
+        let x_ref: &u64;
+        let y_ref: &mut u64;
+    label b0:
+        y_ref = &mut copy(b).B::y;
+        x_ref = &copy(a).A::x;
+        *move(y_ref) = *move(x_ref);
+        _ = move(a);
+        _ = move(b);
+        return;
+    }
+
+    public destroy_a(a: Self.A) {
+        let x: u64;
+    label b0:
+        A{ x } = move(a);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let a: M.A;
+    let a_ref: &M.A;
+    let a_mut_ref: &mut M.A;
+    let b: M.B;
+    let b_ref: &M.B;
+    let b_mut_ref: &mut M.B;
+label b0:
+    a = M.a(0);
+    b = M.b(1);
+
+    a_mut_ref = &mut a;
+    b_ref = &b;
+    // can call public functions
+    M.set_a_with_b(move(a_mut_ref), move(b_ref));
+
+    a_ref = &a;
+    b_mut_ref = &mut b;
+    M.set_b_with_a(move(b_mut_ref), move(a_ref));
+
+    M.destroy_a(move(a));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.move b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.move
new file mode 100644
index 000000000..96a8df310
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.move
@@ -0,0 +1,22 @@
+//# publish
+module 0x42::m {
+public fun plus8(a: u8): u8 { a + 1 }
+public fun plus16(a: u16): u16 { a + 1 }
+public fun plus32(a: u32): u32 { a + 1 }
+public fun plus64(a: u64): u64 { a + 1 }
+public fun plus128(a: u128): u128 { a + 1 }
+public fun plus256(a: u256): u256 { a + 1 }
+}
+
+
+//# publish
+module 0x42::m_test {
+use 0x42::m;
+public fun test8() { m::plus8(1u8); }
+public fun test16() { m::plus16(1u16); }
+public fun test32() { m::plus32(1u32); }
+public fun test64() { m::plus64(1u64); }
+public fun test128() { m::plus128(1u128); }
+public fun test256() { m::plus256(1u256); }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.exp
new file mode 100644
index 000000000..4d389f1f2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 41-56:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.mvir
new file mode 100644
index 000000000..07ba3ffff
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/internal_function_invalid_call.mvir
@@ -0,0 +1,56 @@
+//# publish
+module 0x42.Test {
+    struct T has drop {value: u64}
+
+    initial_value(): u64 {
+    label b0:
+        return 42;
+    }
+
+    public new(): Self.T {
+        let initial_value: u64;
+    label b0:
+        initial_value = Self.initial_value();
+        return T{value: move(initial_value)};
+    }
+
+    public get_value(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::value;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public set_value(this: &mut Self.T, new_value: u64) {
+    label b0:
+        Self.internal_set_value(move(this), move(new_value));
+        return;
+    }
+
+    internal_set_value(this: &mut Self.T, new_value: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut copy(this).T::value;
+        *move(x) = move(new_value);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Test;
+
+entry foo() {
+    let obj: Test.T;
+    let ref: &Test.T;
+label b0:
+    obj = Test.new();
+    ref = &obj;
+    // calling an internal function with the wrong arguments will fail before visibility checks
+    // are done
+    Test.internal_set_value(move(ref), 1);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.mvir
new file mode 100644
index 000000000..c976ee669
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/non_internal_function_valid_call.mvir
@@ -0,0 +1,56 @@
+//# publish
+module 0x42.Test {
+    struct T has drop {value: u64}
+
+    initial_value(): u64 {
+    label b0:
+        return 42;
+    }
+
+    public new(): Self.T {
+        let initial_value: u64;
+    label b0:
+        initial_value = Self.initial_value();
+        return T{value: move(initial_value)};
+    }
+
+    public get_value(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::value;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public set_value(this: &mut Self.T, new_value: u64) {
+    label b0:
+        Self.internal_set_value(move(this), move(new_value));
+        return;
+    }
+
+    internal_set_value(this: &mut Self.T, new_value: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut copy(this).T::value;
+        *move(x) = move(new_value);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Test;
+
+entry foo() {
+    let obj: Test.T;
+    let ref: &Test.T;
+    let val: u64;
+label b0:
+    obj = Test.new();
+    ref = &obj;
+    val = Test.get_value(move(ref));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.exp
new file mode 100644
index 000000000..436ffccd0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.mvir
new file mode 100644
index 000000000..6b7706c82
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/dependencies/use_unpublished_module.mvir
@@ -0,0 +1,10 @@
+//# run
+module 0x42.m {
+// missing dep
+import 0x42.M;
+
+entry foo() {
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.exp
new file mode 100644
index 000000000..233693e52
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 5-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000044::N'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS,
+    sub_status: None,
+    location: 0x44::N,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.mvir
new file mode 100644
index 000000000..51a1578a1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_different_address.mvir
@@ -0,0 +1,9 @@
+//# publish
+module 0x43.M {
+}
+
+//# publish
+module 0x44.N {
+    // friends must be in the same address
+    friend 0x43.M;
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.exp
new file mode 100644
index 000000000..1cf0800e8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INVALID_FRIEND_DECL_WITH_SELF,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.mvir
new file mode 100644
index 000000000..ae0208cd2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/friends/friend_decl_self.mvir
@@ -0,0 +1,5 @@
+//# publish
+module 0x42.M {
+    // cannot be a friend with yourself
+    friend 0x42.M;
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.exp
new file mode 100644
index 000000000..88822b962
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-51:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'publish'. lines 53-70:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'publish'. lines 72-122:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.mvir
new file mode 100644
index 000000000..338a67ae2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.mvir
@@ -0,0 +1,122 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    a<T>() {
+    label b0:
+        Self.b<Self.S<T>, u64>();
+        return;
+    }
+
+    b<T1, T2>() {
+    label b0:
+        Self.f<T1>();
+        Self.c<Self.S<T2>, bool>();
+        return;
+    }
+
+    c<T1, T2>() {
+    label b0:
+        Self.c<u64, T1>();
+        Self.d<T2>();
+        Self.e<T2>();
+        return;
+    }
+
+    d<T>() {
+    label b0:
+        Self.b<u64, T>();
+        return;
+    }
+
+    e<T>() {
+    label b0:
+        return;
+    }
+
+    f<T>() {
+    label b0:
+        Self.g<T>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.f<Self.S<T>>();
+        return;
+    }
+}
+// There are two disjoint loops in the resulting graph, but only one error
+// loop: f#T --> g#T --S<T>--> f#T
+// loop: c#T1 --> c#T2 --> d#T --> b#T2 --S<T2>--> c#T1
+
+//# publish
+module 0x1.M2 {
+    struct S<T> { b: bool }
+
+    f<T>() {
+    label b0:
+        Self.g<T>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.f<Self.S<T>>();
+        return;
+    }
+}
+// loop: f#T --> g#T --S<T>--> f#T
+// check: LOOP_IN_INSTANTIATION_GRAPH
+
+//# publish
+
+module 0x1.M3 {
+    struct S<T> { b: bool }
+
+    a<T>() {
+    label b0:
+        Self.b<Self.S<T>, u64>();
+        return;
+    }
+
+    b<T1, T2>() {
+    label b0:
+        Self.f<T1>();
+        Self.c<Self.S<T2>, bool>();
+        return;
+    }
+
+    c<T1, T2>() {
+    label b0:
+        Self.c<u64, T1>();
+        Self.d<T2>();
+        Self.e<T2>();
+        return;
+    }
+
+    d<T>() {
+    label b0:
+        Self.b<u64, T>();
+        return;
+    }
+
+    e<T>() {
+    label b0:
+        return;
+    }
+
+    f<T>() {
+    label b0:
+        Self.g<T>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        // Switched to just <T> to isolate the loop
+        Self.f<T>();
+        return;
+    }
+}
+// loop: c#T1 --> c#T2 --> d#T --> b#T2 --S<T2>--> c#T1
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.mvir
new file mode 100644
index 000000000..e629305a0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    f<T>() {
+    label b0:
+        Self.g<T>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.f<T>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.mvir
new file mode 100644
index 000000000..36b0e3d5d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.mvir
@@ -0,0 +1,16 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T>() {
+    label b0:
+        Self.g<Self.S<T>>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.f<u64>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.mvir
new file mode 100644
index 000000000..35f8a8925
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.M {
+    f<T1, T2, T3>() {
+    label b0:
+        Self.g<T2, T3, T1>();
+        return;
+    }
+
+    g<T1, T2, T3>() {
+    label b0:
+        Self.h<T1, T2, T3>();
+        return;
+    }
+
+    h<T1, T2, T3>() {
+    label b0:
+        Self.f<T1, T2, T3>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.mvir
new file mode 100644
index 000000000..d351f5297
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T1, T2, T3>() {
+    label b0:
+        Self.g<T2, T3, T1>();
+        return;
+    }
+
+    g<T1, T2, T3>() {
+    label b0:
+        Self.h<T1, T2, Self.S<T3>>();
+        return;
+    }
+
+    h<T1, T2, T3>() {
+    label b0:
+        // The bool breaks the chain.
+        Self.f<T1, bool, T3>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp
new file mode 100644
index 000000000..3b9f372de
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.mvir
new file mode 100644
index 000000000..8633f2a89
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T1, T2, T3>() {
+    label b0:
+        Self.g<T2, T3, T1>();
+        return;
+    }
+
+    g<T1, T2, T3>() {
+    label b0:
+        // indirect loop (takes a while)
+        Self.h<T1, T2, Self.S<T3>>();
+        return;
+    }
+
+    h<T1, T2, T3>() {
+    label b0:
+        Self.f<T1, T2, T3>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.mvir
new file mode 100644
index 000000000..b829f04b1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    f<T1, T2>() {
+    label b0:
+        Self.g<u64, T1>();
+        return;
+    }
+
+    g<T1, T2>() {
+    label b0:
+        Self.f<bool, T1>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.mvir
new file mode 100644
index 000000000..fdd12bf42
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    f<T1, T2>() {
+    label b0:
+        Self.g<T2, T1>();
+        return;
+    }
+
+    g<T1, T2>() {
+    label b0:
+        Self.f<T1, T2>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp
new file mode 100644
index 000000000..6457e989d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.mvir
new file mode 100644
index 000000000..39bfec96c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T1, T2>() {
+    label b0:
+        Self.g<T2, T1>();
+        return;
+    }
+
+    g<T1, T2>() {
+    label b0:
+        // indirect loop with swap
+        Self.f<T1, Self.S<T2>>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.exp
new file mode 100644
index 000000000..e68aa0a00
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.mvir
new file mode 100644
index 000000000..17d06014e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.mvir
@@ -0,0 +1,20 @@
+//# publish
+
+// Not good: infinitely many types/instances.
+//           f<T>, g<S<T>>, f<S<T>>, g<S<S<T>>>, ...
+
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T>() {
+    label b0:
+        Self.g<Self.S<T>>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.f<T>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.exp
new file mode 100644
index 000000000..011ac8091
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.mvir
new file mode 100644
index 000000000..0dded5ba1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    foo<T>() {
+    label b0:
+        // loop
+        Self.foo<Self.S<Self.S<T>>>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.exp
new file mode 100644
index 000000000..e7a1ab8d9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.mvir
new file mode 100644
index 000000000..8d0b0a070
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.mvir
@@ -0,0 +1,13 @@
+//# publish
+
+module 0x1.M {
+    struct S<T> { b: bool }
+    struct R<T1, T2> { b: bool }
+
+    foo<T>() {
+    label b0:
+        // instantiation loop
+        Self.foo<Self.R<u64, Self.S<Self.S<T>>>>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.exp
new file mode 100644
index 000000000..f4a66de93
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.mvir
new file mode 100644
index 000000000..a2847b039
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_infinite_type_terminates.mvir
@@ -0,0 +1,45 @@
+//# publish
+
+module 0x1.M {
+    struct Box<T> { x: T }
+
+    unbox<T>(b: Self.Box<T>): T {
+        let x: T;
+    label b0:
+        Box<T> { x: x } = move(b);
+        return move(x);
+    }
+
+    f<T>(n: u64, x: T): T {
+    label b0:
+        jump_if (copy(n) == 0) b2;
+    label b1:
+        return Self.unbox<T>(Self.f<Self.Box<T>>(copy(n) - 1, Box<T> { x: move(x) }));
+    label b2:
+        return move(x);
+    }
+}
+
+// Function f calls an instance of itself instantiated with a boxed type, but it does
+// terminate properly if we allow new types to be created on the fly.
+//
+// As reference, the equivalent Haskell code compiles & terminates:
+//
+//   data Boxed a = Box a
+//
+//   unbox (Box a) = a
+//
+//   f :: Integer -> a -> a
+//   f 0 x = x
+//   f n x = unbox (f (n-1) (Box x))
+//
+//    main = do
+//      let x = 42
+//      putStrLn (show (f 5 x))
+//
+// Without the annotation f :: Integer -> a -> a GHC complains about not being able to
+// construct the infinite type a ~ Boxed a.
+//
+// We are taking a conservative approach and forbids such construction in move.
+
+// check: LOOP_IN_INSTANTIATION_GRAPH
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.mvir
new file mode 100644
index 000000000..2e4b63f44
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_just_type_params_ok.mvir
@@ -0,0 +1,11 @@
+//# publish
+
+// This is good as there is only one instance foo<T> for any T.
+
+module 0x1.M {
+    f<T>(x: T) {
+    label b0:
+        Self.f<T>(move(x));
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.mvir
new file mode 100644
index 000000000..52d442efd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_non_generic_type_ok.mvir
@@ -0,0 +1,11 @@
+//# publish
+
+// Good: two instances foo<T> & foo<u64> (if T != u64) for any T.
+
+module 0x1.M {
+    f<T>() {
+    label b0:
+        Self.f<u64>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.exp
new file mode 100644
index 000000000..e7a1ab8d9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.mvir
new file mode 100644
index 000000000..0bf3a7ece
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_one_arg_type_con.mvir
@@ -0,0 +1,13 @@
+//# publish
+
+// Bad! Can have infinitely many instances: f<T>, f<S<T>>, f<S<S<T>>>, ...
+
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T>(x: T) {
+    label b0:
+        Self.f<Self.S<T>>(S<T> { b: true });
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.exp
new file mode 100644
index 000000000..2d8767257
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.mvir
new file mode 100644
index 000000000..f9baf2ac9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/recursive_two_args_swapping_type_con.mvir
@@ -0,0 +1,14 @@
+//# publish
+
+// Similar to the case with one argument, but swaps the two type parameters.
+// f<T1, T2> => f<S<T2>, T1> => f<S<T1>, S<T2>> => f<S<S<T2>>, S<T1>> => ...
+
+module 0x1.M {
+    struct S<T> { x: T }
+
+    f<T1, T2>(a: T1, b: T2) {
+    label b0:
+        Self.f<Self.S<T2>, T1>(S<T2> { x: move(b) }, move(a));
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.exp
new file mode 100644
index 000000000..e68aa0a00
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: LOOP_IN_INSTANTIATION_GRAPH,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.mvir
new file mode 100644
index 000000000..1c553a73f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/two_loops.mvir
@@ -0,0 +1,20 @@
+//# publish
+
+// Two loops in the resulting graph.
+// One error for the loop.
+
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    f<T>() {
+    label b0:
+        Self.f<Self.S<T>>();
+        return;
+    }
+
+    g<T>() {
+    label b0:
+        Self.g<Self.S<T>>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.exp
new file mode 100644
index 000000000..4491ec255
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.mvir
new file mode 100644
index 000000000..b3ac1383f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unreleased_reference.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &mut u64;
+label b0:
+    x = 0;
+    x_ref = &mut x;
+    abort 0; // x_ref does not have to be released
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.exp
new file mode 100644
index 000000000..24aa88e99
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.mvir
new file mode 100644
index 000000000..c8bea4804
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/abort_unused_resource.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.M {
+    struct Coin { value: u64 }
+    zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let z: M.Coin;
+label b0:
+    z = M.zero();
+    abort 0; // valid that z is unused
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.mvir
new file mode 100644
index 000000000..16347e102
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_copy.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 5;
+    // valid copy
+    y = copy(x);
+    // valid copy
+    assert(copy(y) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.exp
new file mode 100644
index 000000000..894758b06
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.mvir
new file mode 100644
index 000000000..d1584a65f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_in_one_if_branch.mvir
@@ -0,0 +1,23 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    assert(false, 42);
+    jump b3;
+label b2:
+    x = 5;
+label b3:
+    jump_if_false (true) b5;
+label b4:
+    y = 5;
+label b5:
+    assert(copy(x) == copy(y), 42); // invalid copy
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.mvir
new file mode 100644
index 000000000..3936c6943
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_move.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 5;
+    // valid move
+    y = move(x);
+    // valid copy
+    assert(copy(y) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.exp
new file mode 100644
index 000000000..e729363f8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.mvir
new file mode 100644
index 000000000..024843695
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_resource.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.M {
+    struct Coin { value: u64 }
+    zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let z: M.Coin;
+label b0:
+    z = M.zero();
+    // invalid assignment
+    z = M.zero();
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.exp
new file mode 100644
index 000000000..c73237577
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.mvir
new file mode 100644
index 000000000..a14a23824
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 100;
+    jump b3;
+label b2:
+    assert(true, 42);
+label b3:
+    // invalid copy
+    assert(copy(x) == 100, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.exp
new file mode 100644
index 000000000..879f45604
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.mvir
new file mode 100644
index 000000000..02b698ebf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/assign_wrong_if_branch_no_else.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if_false (false) b2;
+label b1:
+    x = 100;
+label b2:
+    assert(copy(x) == 100, 42); // invalid copy
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.exp
new file mode 100644
index 000000000..7e91deac1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.mvir
new file mode 100644
index 000000000..16bb0817d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves.mvir
@@ -0,0 +1,21 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+    jump b3;
+label b2:
+    x = 1;
+    y = move(x);
+label b3:
+    // invalid copy
+    assert(copy(x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.mvir
new file mode 100644
index 000000000..09bd1097f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/branch_assigns_then_moves_then_assigns.mvir
@@ -0,0 +1,22 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+    jump b3;
+label b2:
+    x = 1;
+    y = move(x);
+    x = 5;
+label b3:
+    // valid copy
+    assert(copy(x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.mvir
new file mode 100644
index 000000000..20ba08c19
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/deep_return_branch_doesnt_assign.mvir
@@ -0,0 +1,23 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+    jump b5;
+label b2:
+    jump_if (false) b4;
+label b3:
+    return;
+label b4:
+    return;
+label b5:
+    // valid copy, other branches return
+    assert(copy(x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.exp
new file mode 100644
index 000000000..cc589d4ca
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.mvir
new file mode 100644
index 000000000..5e2ace86c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_assigns_if_doesnt.mvir
@@ -0,0 +1,20 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 42;
+    jump b3;
+label b2:
+    y = 0;
+label b3:
+    // invalid copy
+    assert(copy(y) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.exp
new file mode 100644
index 000000000..7e91deac1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.mvir
new file mode 100644
index 000000000..27120d943
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/else_moves_if_doesnt.mvir
@@ -0,0 +1,21 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    jump_if (true) b2;
+label b1:
+    y = move(x);
+    jump b3;
+label b2:
+    y = 0;
+label b3:
+    // invalid copy
+    assert(copy(x) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.exp
new file mode 100644
index 000000000..cc589d4ca
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.mvir
new file mode 100644
index 000000000..ae7f10a5d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_else_doesnt.mvir
@@ -0,0 +1,20 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    y = 0;
+    jump b3;
+label b2:
+    x = 42;
+label b3:
+    // invalid copy
+    assert(copy(x) == 42, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.exp
new file mode 100644
index 000000000..ae079aad7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.mvir
new file mode 100644
index 000000000..4033a4578
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_assigns_no_else.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if_false (true) b2;
+label b1:
+    x = 42;
+label b2:
+    // invalid copy, might not have a value
+    assert(copy(x) == 42, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.exp
new file mode 100644
index 000000000..7e91deac1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.mvir
new file mode 100644
index 000000000..9fe6ddb52
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_else_doesnt.mvir
@@ -0,0 +1,21 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    jump_if (true) b2;
+label b1:
+    y = 0;
+    jump b3;
+label b2:
+    y = move(x);
+label b3:
+    // invalid copy, might not have a value
+    assert(copy(x) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.exp
new file mode 100644
index 000000000..5d4753bd9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.mvir
new file mode 100644
index 000000000..c5936dab4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/if_moves_no_else.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    jump_if_false (true) b2;
+label b1:
+    y = move(x);
+label b2:
+    // invalid copy
+    assert(copy(x) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.exp
new file mode 100644
index 000000000..8fb0fb20b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 1 'publish'. lines 22-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 2 'publish'. lines 42-61:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 17)],
+}
+
+task 3 'publish'. lines 63-82:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 4 'publish'. lines 84-104:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: BORROWLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.mvir
new file mode 100644
index 000000000..116fd6161
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/join_failure.mvir
@@ -0,0 +1,104 @@
+//# publish
+module 0x1.M {
+    struct R { f:bool }
+    t0() {
+        let r: Self.R;
+        let f: bool;
+    label b0:
+        r = R{ f: false };
+        jump_if (true) b2;
+    label b1:
+        R{ f: f } = move(r);
+        r = R{ f: false };
+        jump b3;
+    label b2:
+        R{ f: f } = move(r);
+    label b3:
+        R{ f: f } = move(r); // invalid move loc
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct R { f:bool }
+    t0() {
+        let r: Self.R;
+        let f: bool;
+    label b0:
+        r = R{ f: false };
+        jump_if (true) b2;
+    label b1:
+        R{ f: f } = move(r);
+        r = R{ f: false };
+        jump b3;
+    label b2:
+        R{ f: f } = move(r);
+    label b3:
+        return; // resource unused
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct R { f:bool }
+    t0() {
+        let r: Self.R;
+        let f: bool;
+    label b0:
+        r = R{ f: false };
+        jump_if (true) b2;
+    label b1:
+        R{ f: f } = move(r);
+        r = R{ f: false };
+        jump b3;
+    label b2:
+        R{ f: f } = move(r);
+    label b3:
+        r = R{ f: false }; // invalid, still possibly a resource in r
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct R has copy, drop { f:bool }
+    t0() {
+        let r: Self.R;
+        let f: bool;
+    label b0:
+        r = R{ f: false };
+        jump_if (true) b2;
+    label b1:
+        R{ f: f } = move(r);
+        r = R{ f: false };
+        jump b3;
+    label b2:
+        R{ f: f } = move(r);
+    label b3:
+        R{ f: f } = copy(r); // invalid copy, r might not have a value
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct R { f:bool }
+    t0() {
+        let r: Self.R;
+        let ref: &Self.R;
+        let f: bool;
+    label b0:
+        r = R{ f: false };
+        jump_if (true) b2;
+    label b1:
+        R{ f: f } = move(r);
+        r = R{ f: false };
+        jump b3;
+    label b2:
+        R{ f: f } = move(r);
+    label b3:
+        ref = &r; // cannot borrow, might not have a value
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.exp
new file mode 100644
index 000000000..628f6042d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.mvir
new file mode 100644
index 000000000..a9d0ca907
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/move_before_assign.mvir
@@ -0,0 +1,14 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    // invalid move
+    y = move(x);
+    return;
+}
+
+}
+// check: MOVELOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.mvir
new file mode 100644
index 000000000..f934b27b7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_doesnt_assign.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+    jump b3;
+label b2:
+    return;
+label b3:
+    assert(copy(x) == 5, 42); // okay to use x
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.mvir
new file mode 100644
index 000000000..aca77a5bc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/return_branch_moves.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    jump_if (false) b2;
+label b1:
+    // okay to use x
+    assert(copy(x) == 0, 42);
+    return;
+label b2:
+    y = move(x);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.mvir
new file mode 100644
index 000000000..3475be2ad
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_st_loc_partial.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x42.M {
+    consume(s: signer) {
+    label b0:
+        Self.consume(move(s));
+        return;
+    }
+
+    t(cond: bool, s1: signer, s2: signer) {
+    label b0:
+        jump_if_false (move(cond)) b2;
+    label b1:
+        Self.consume(move(s1));
+    label b2:
+        s1 = move(s2);
+        Self.consume(move(s1));
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.mvir
new file mode 100644
index 000000000..4d9678e55
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x42.M {
+    t(s: signer) {
+    label b0:
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.mvir
new file mode 100644
index 000000000..68fdbc108
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/signer_unused_partial.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x42.M {
+    consume(s: signer) {
+    label b0:
+        Self.consume(move(s));
+        return;
+    }
+
+    t(cond: bool, s: signer) {
+    label b0:
+        jump_if_false (move(cond)) b2;
+    label b1:
+        Self.consume(move(s));
+    label b2:
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.exp
new file mode 100644
index 000000000..3dfc9e9dd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: COPYLOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.mvir
new file mode 100644
index 000000000..9e09b5a40
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/use_before_assign.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    // invalid copy
+    y = copy(x);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.exp
new file mode 100644
index 000000000..7a8a07c5b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.mvir
new file mode 100644
index 000000000..d025af3e1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/vector_ops_non_droppable_resource_not_destroyed.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x1.M {
+    struct R has store { b: bool }
+    f() {
+        let v: vector<Self.R>;
+    label b0:
+        v = vec_pack_0<Self.R>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.exp
new file mode 100644
index 000000000..2fba20f57
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.mvir
new file mode 100644
index 000000000..80ab85dfd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local.mvir
@@ -0,0 +1,23 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let b: bool;
+label b0:
+    x = 0;
+    b = true;
+label while:
+    jump_if_false (copy(b)) while_cont;
+label while_body:
+    y = move(x);
+    b = false;
+    jump while;
+label while_cont:
+    // invalid move
+    assert(move(y) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.exp
new file mode 100644
index 000000000..ee5528dbf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-27:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.mvir
new file mode 100644
index 000000000..3a5d266ae
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/locals_safety/while_move_local_2.mvir
@@ -0,0 +1,27 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let b: bool;
+label b0:
+    x = 0;
+    b = true;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    jump_if (copy(b)) while_b2;
+label while_b1:
+    x = move(y); // invalid move
+    jump while_b3;
+label while_b2:
+    y = move(x);
+label while_b3:
+    b = false;
+    jump while;
+label while_cont:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.exp
new file mode 100644
index 000000000..56a1524b0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.mvir
new file mode 100644
index 000000000..88370ec00
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_field_after_local.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public replace(t: &mut Self.T) {
+        let t_v: &mut u64;
+        let new_t: Self.T;
+    label b0:
+        t_v = &mut copy(t).T::v;
+        new_t = Self.new(1);
+        // cannot mutate, still borrowed
+        *move(t) = move(new_t);
+
+        *move(t_v) = 10000;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.exp
new file mode 100644
index 000000000..ea6e41089
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.mvir
new file mode 100644
index 000000000..3cbd74df1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_after_move.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &mut u64;
+    let dead: u64;
+label b0:
+    v = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    dead = move(v); // cannot move local, still borrowed
+    *move(ref_v) = 42;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.mvir
new file mode 100644
index 000000000..dfa095a5b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct.mvir
@@ -0,0 +1,56 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public replace(t: &mut Self.T) {
+        let t2: &mut Self.T;
+        let t_v: &mut u64;
+        let new_t: Self.T;
+    label b0:
+        t2 = copy(t);
+        t_v = &mut copy(t2).T::v;
+        *move(t_v) = 10000;
+
+        new_t = Self.new(1);
+        *move(t2) = move(new_t);
+        _ = move(t);
+        return;
+    }
+
+    public value(this: &mut Self.T): u64 {
+        let ref_v: &u64;
+    label b0:
+        ref_v = &move(this).T::v;
+        return *move(ref_v);
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x42.Tester;
+
+entry foo() {
+    let t: Tester.T;
+    let ref_t: &mut Tester.T;
+    let v_from_ref: u64;
+    let tt: &mut Tester.T;
+    let v_from_t: u64;
+label b0:
+    t = Tester.new(0);
+    ref_t = &mut t;
+    // valid as this is the only reference to t
+    Tester.replace(copy(ref_t));
+    v_from_ref = Tester.value(move(ref_t));
+    tt = &mut t;
+    v_from_t = Tester.value(move(tt));
+    assert(copy(v_from_ref) == 1, 42);
+    assert(copy(v_from_t) == 1, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.exp
new file mode 100644
index 000000000..58495357d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 36-63:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.mvir
new file mode 100644
index 000000000..a245464ed
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_struct_invalidated.mvir
@@ -0,0 +1,63 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public replace(t: &mut Self.T) {
+        let t2: &mut Self.T;
+        let t_v: &mut u64;
+        let new_t: Self.T;
+    label b0:
+        t2 = copy(t);
+        t_v = &mut copy(t2).T::v;
+        *move(t_v) = 10000;
+        new_t = Self.new(1);
+        *move(t2) = move(new_t);
+        _ = move(t);
+        return;
+    }
+
+    public value(this: &mut Self.T): u64 {
+        let ref_v: &u64;
+        let r: u64;
+    label b0:
+        ref_v = &copy(this).T::v;
+        r = *move(ref_v);
+        _ = move(this);
+        return move(r);
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x42.Tester;
+
+entry foo() {
+    let t: Tester.T;
+    let old_ref: &mut Tester.T;
+    let ref_t: &mut Tester.T;
+    let v_from_ref: u64;
+    let tt: &mut Tester.T;
+    let v_from_t: u64;
+    let no: u64;
+label b0:
+    t = Tester.new(0);
+    old_ref = &mut t;
+    ref_t = &mut t;
+    // cannot call replace, old_ref owns t
+    // this might be relaxed later
+    Tester.replace(copy(ref_t));
+    v_from_ref = Tester.value(move(ref_t));
+    tt = &mut t;
+    v_from_t = Tester.value(move(tt));
+    assert(copy(v_from_ref) == 1, 42);
+    assert(copy(v_from_t) == 1, 42);
+    no = Tester.value(move(old_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.mvir
new file mode 100644
index 000000000..bfef433d9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/assign_local_value.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &mut u64;
+label b0:
+    v = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    *copy(ref_v) = 42; // safe to modify ref
+    assert(*move(ref_v) == 42, 42);
+    assert(copy(v) == 42, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.mvir
new file mode 100644
index 000000000..e163af0e2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_copy_ok.mvir
@@ -0,0 +1,36 @@
+//# publish
+
+module 0x1.B {
+    struct T has drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &Self.T) {
+        let g: &u64;
+        let y: u64;
+    label b0:
+        g = &copy(this).T::g;
+        // can read g even with the live parent reference
+        y = *move(g);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.B;
+
+entry foo() {
+    let x: B.T;
+    let y: &B.T;
+label b0:
+    x = B.new(5);
+    y = &x;
+    B.t(move(y));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.mvir
new file mode 100644
index 000000000..8e14ad6a7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_field_ok.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.A {
+
+    struct T has drop {v: u64}
+    struct K has drop {f: Self.T}
+
+    public new_T(v: u64) : Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public new_K(f: Self.T) : Self.K {
+    label b0:
+        return K{f: move(f)};
+    }
+
+    public value(this: &Self.K) : u64 {
+        let k: &u64;
+    label b0:
+        k = &(&move(this).K::f).T::v; // valid field borrow
+        return *move(k);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let x: A.T;
+    let y: A.K;
+    let z: u64;
+label b0:
+    x = A.new_T(2);
+    y = A.new_K(move(x));
+    z = A.value(&y);
+    assert(move(z) == 2, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.exp
new file mode 100644
index 000000000..bf8c5677e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_UNAVAILABLE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.mvir
new file mode 100644
index 000000000..932b30c38
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_if.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let ref: &u64;
+label b0:
+    x = 5;
+    jump_if_false (true) b2;
+label b1:
+    ref = &x;
+label b2:
+    // cannot use reference as it was not assigned in all control flow paths
+    assert(*move(ref) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.mvir
new file mode 100644
index 000000000..ddc4f15af
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_in_loop.mvir
@@ -0,0 +1,12 @@
+
+//# publish
+module 0x42.m {
+foo() {
+    let x: u64;
+    let r: &u64;
+    label l0:
+    x = 0;
+    r = &x;
+    jump l0;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.exp
new file mode 100644
index 000000000..cefe0fe3a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: RET_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.mvir
new file mode 100644
index 000000000..b70119272
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_return_mutable_borrow_bad.mvir
@@ -0,0 +1,16 @@
+//# publish
+module 0x1.M {
+    struct X { f: Self.Y }
+    struct Y { g: u64, h: u64 }
+
+    t1(ref_x: &mut Self.X): &mut Self.Y * &u64  {
+        let ref_x_f: &mut Self.Y;
+        let ref_x_f_g: &u64;
+    label b0:
+        ref_x_f = &mut move(ref_x).X::f;
+        ref_x_f_g = & copy(ref_x_f).Y::g;
+
+        // mutable return value overlaps with other return value
+        return (move(ref_x_f), move(ref_x_f_g));
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.mvir
new file mode 100644
index 000000000..7d8876108
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/borrow_x_in_if_y_in_else.mvir
@@ -0,0 +1,23 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let ref: &u64;
+label b0:
+    x = 1;
+    y = 2;
+    jump_if (true) b2;
+label b1:
+    ref = &y;
+    jump b3;
+label b2:
+    ref = &x;
+    jump b3;
+label b3:
+    assert(*move(ref) == 1, 42); // valid to read reference even though different locals borrowed
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.mvir
new file mode 100644
index 000000000..2bb87d49f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed.mvir
@@ -0,0 +1,15 @@
+//# publish
+module 0x1.Tester {
+    t() {
+        let x: u64;
+        let r1: &u64;
+        let r2: &u64;
+    label b0:
+        x = 0;
+        r1 = &x;
+        r2 = &x;
+        // valid to copy even though x is imm borrowed
+        _ = copy(x) + copy(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.mvir
new file mode 100644
index 000000000..396ce19de
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x1.Tester {
+    struct T has copy { f: u64 }
+
+    t() {
+        let x: Self.T;
+        let r1: &u64;
+        let r2: &u64;
+        let f: u64;
+    label b0:
+        x = T { f: 0 };
+        r1 = &(&x).T::f;
+        r2 = &(&x).T::f;
+        // copy is valid here even though immutably borrowed
+        T { f: f } = copy(x);
+        _ = move(r1);
+        _ = move(r2);
+        T { f: f } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.exp
new file mode 100644
index 000000000..58c50b9f5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.mvir
new file mode 100644
index 000000000..6eb28582a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_field_invalid.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.Tester {
+    struct T has copy { f: u64 }
+
+    t() {
+        let x: Self.T;
+        let r1: &mut u64;
+        let f: u64;
+    label b0:
+        x = T { f: 0 };
+        r1 = &mut (&mut x).T::f;
+        // cannot copy x, data is partially owned by r1. violates ref trans
+        T { f: f } = copy(x);
+        T { f: f } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.mvir
new file mode 100644
index 000000000..6bc631f06
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.Tester {
+    t() {
+        let x: u64;
+        let y: u64;
+        let r1: &u64;
+        let r2: &u64;
+    label b0:
+        x = 0;
+        y = 0;
+        r1 = Self.foo(&x, &y);
+        r2 = Self.foo(&x, &y);
+        // valid to copy locals even though imm borrowed
+        _ = copy(x) + copy(x);
+        _ = copy(y) + copy(y);
+        return;
+    }
+
+    foo(r: &u64, r2: &u64): &u64 {
+    label b0:
+        return move(r2);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.exp
new file mode 100644
index 000000000..a666808ce
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.mvir
new file mode 100644
index 000000000..560f4717f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_indirect_invalid.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.Tester {
+    t() {
+        let x: u64;
+        let y: u64;
+        let r1: &mut u64;
+    label b0:
+        x = 0;
+        y = 0;
+        r1 = Self.foo(&mut x, &mut y);
+        // cannot copy, data is "owned" by r1. Would violate ref trans
+        _ = copy(x);
+        return;
+    }
+
+    foo(r: &mut u64, r2: &mut u64): &mut u64 {
+    label b0:
+        return move(r2);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.exp
new file mode 100644
index 000000000..e10bfcc93
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: COPYLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.mvir
new file mode 100644
index 000000000..6bfda4a15
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/copy_loc_borrowed_invalid.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x1.Tester {
+    t() {
+        let x: u64;
+        let r1: &mut u64;
+    label b0:
+        x = 0;
+        r1 = &mut x;
+        // cannot copy, data is "owned" by r1. Violates ref trans
+        _ = copy(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.mvir
new file mode 100644
index 000000000..7fe6aade8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_borrow_field_ok.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x1.M {
+    struct T has drop {f: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{f: move(g)};
+    }
+
+    public t(this: &Self.T) {
+        let y: u64;
+    label b0:
+        y = *&move(this).T::f; // valid deref/read
+        assert(copy(y) == 2, 42);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let x: M.T;
+    let x_ref: &M.T;
+label b0:
+    x = M.new(2);
+    x_ref = &x;
+    M.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.exp
new file mode 100644
index 000000000..ea6e41089
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.mvir
new file mode 100644
index 000000000..67ef4a292
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_copy_bad.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &mut u64;
+    let dead: u64;
+label b0:
+    x = 5;
+    x_ref = &mut x;
+    assert(*copy(x_ref) == 5, 42);
+    dead = move(x); // cannot move x, still borrowed
+    *move(x_ref) = 42;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.exp
new file mode 100644
index 000000000..de038a27c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.mvir
new file mode 100644
index 000000000..7b3c20a9e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_bad.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x1.M {
+    struct T {v : u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public compare(t1: &mut Self.T, t2: &mut Self.T) : bool {
+        let b: bool;
+        let x_ref: &mut u64;
+    label b0:
+        x_ref = &mut copy(t1).T::v;
+        b = move(t1) == move(t2); // cannot read from t1 as it is borrowed by x_ref
+        return move(b);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.mvir
new file mode 100644
index 000000000..c2b8c1b8c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/deref_eq_good.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x1.M {
+    struct T {v : u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    // valid ==
+    public compare1 (t1: &mut Self.T, t2: &mut Self.T) : bool {
+    label b0:
+        return move(t1) == move(t2);
+    }
+
+    public compare2 (t1: &mut Self.T, t2: &mut Self.T) : bool {
+        let b: bool;
+        let x_ref: &u64;
+    label b0:
+        x_ref = &copy(t1).T::v;
+        b = move(t1) == move(t2);
+        _ = move(x_ref);
+        return move(b);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.exp
new file mode 100644
index 000000000..7c78f043b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 1 'publish'. lines 15-27:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester2'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 2 'publish'. lines 29-41:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester3'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 3 'publish'. lines 43-55:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester4'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.mvir
new file mode 100644
index 000000000..583799c68
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_bad.mvir
@@ -0,0 +1,55 @@
+//# publish
+module 0x1.Tester {
+    eqtest1() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        // invalid read of mutable ref, does not currently own its data
+        _ = copy(r) == copy(r);
+        return;
+    }
+}
+
+//# publish
+module 0x1.Tester2 {
+    eqtest2() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        // invalid read of mutable ref, does not currently own its data
+        _ = copy(r) == move(r);
+        return;
+    }
+}
+
+//# publish
+module 0x1.Tester3 {
+    neqtest1() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        // invalid read of mutable ref, does not currently own its data
+        _ = copy(r) != copy(r);
+        return;
+    }
+}
+
+//# publish
+module 0x1.Tester4 {
+    neqtest2() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        // invalid read of mutable ref, does not currently own its data
+        _ = copy(r) != move(r);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.mvir
new file mode 100644
index 000000000..ce68a74b0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/eq_ok.mvir
@@ -0,0 +1,44 @@
+//# publish
+
+// testing valid usages of == and != over references
+module 0x1.Tester {
+    eqtest1() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy(r)) == freeze(copy(r));
+        return;
+    }
+
+    eqtest2() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy(r)) == freeze(move(r));
+        return;
+    }
+
+    neqtest1() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy(r)) != freeze(copy(r));
+        return;
+    }
+
+    neqtest2() {
+        let x: u64;
+        let r: &mut u64;
+    label b0:
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy(r)) != freeze(move(r));
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.exp
new file mode 100644
index 000000000..782b69655
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
+
+task 1 'publish'. lines 30-57:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 15)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.mvir
new file mode 100644
index 000000000..72e28070b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_1.mvir
@@ -0,0 +1,57 @@
+//# publish
+module 0x1.M {
+    struct X has drop { f: Self.Y }
+    struct Y has drop { g: u64, h: u64 }
+
+    t1() {
+        let x: Self.X;
+        let ref_x: &mut Self.X;
+        let ref_x_f: &mut Self.Y;
+        let ref_x_f_g: &mut u64;
+        let ref_x_f_h: &mut u64;
+    label b0:
+        x = X { f: Y { g: 0, h: 0 } };
+
+        ref_x = &mut x;
+        ref_x_f = &mut move(ref_x).X::f;
+        ref_x_f_g = &mut copy(ref_x_f).Y::g;
+
+        // Error: the argument for parameter b is borrowed
+        Self.foo(move(ref_x_f_g), move(ref_x_f));
+        return;
+    }
+
+    foo(a: &mut u64, b: &mut Self.Y) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    struct X has drop { f: Self.Y }
+    struct Y has drop { g: u64, h: u64 }
+    t2() {
+        let x: Self.X;
+        let ref_x: &mut Self.X;
+        let ref_x_f: &mut Self.Y;
+        let ref_x_f_g: &mut u64;
+        let ref_x_f_h: &mut u64;
+    label b0:
+        x = X { f: Y { g: 0, h: 0 } };
+
+        ref_x = &mut x;
+        ref_x_f = &mut move(ref_x).X::f;
+        ref_x_f_g = &mut copy(ref_x_f).Y::g;
+
+        // Error: the argument for parameter a is borrowed
+        Self.bar(move(ref_x_f), move(ref_x_f_g));
+        return;
+    }
+
+
+    bar(a: &mut Self.Y, b: &mut u64) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.exp
new file mode 100644
index 000000000..92041c10d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-31:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.mvir
new file mode 100644
index 000000000..3235257cd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_invalid_2.mvir
@@ -0,0 +1,31 @@
+//# publish
+module 0x1.M {
+    struct S { g: u64 }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let x1: u64;
+        let x2: u64;
+        let eps: &u64;
+        let g_mut: &mut u64;
+        let g_imm: &u64;
+    label b0:
+        x1 = 0;
+        x2 = 1;
+        jump_if (move(cond)) b2;
+    label b1:
+        eps = &x1;
+        jump b3;
+    label b2:
+        eps = Self.bar(copy(root));
+    label b3:
+        // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+        g_mut = &mut move(root).S::g;
+        g_imm = freeze(move(g_mut));
+        return;
+    }
+
+    bar(a: &mut Self.S): &u64 {
+    label b0:
+        return &move(a).S::g;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.mvir
new file mode 100644
index 000000000..eae2628d5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_1.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x1.M {
+    struct X has drop { f: Self.Y }
+    struct Y has drop { g: u64, h: u64 }
+
+    // tests deep borrows + releases
+    t1() {
+        let x: Self.X;
+        let ref_x: &mut Self.X;
+        let ref_x_f: &mut Self.Y;
+        let ref_x_f_g: &mut u64;
+        let ref_x_f_h: &mut u64;
+    label b0:
+        x = X { f: Y { g: 0, h: 0 } };
+
+        ref_x = &mut x;
+        ref_x_f = &mut move(ref_x).X::f;
+        ref_x_f_g = &mut move(ref_x_f).Y::g;
+
+        ref_x = &mut x;
+        ref_x_f = &mut move(ref_x).X::f;
+        ref_x_f_h = &mut move(ref_x_f).Y::h;
+
+        *copy(ref_x_f_g) = *copy(ref_x_f_h);
+        *copy(ref_x_f_h) = *copy(ref_x_f_g);
+
+        Self.foo(move(ref_x_f_g), move(ref_x_f_h));
+        return;
+    }
+
+    foo(a: &mut u64, b: &mut u64) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.mvir
new file mode 100644
index 000000000..d72bba680
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/factor_valid_2.mvir
@@ -0,0 +1,74 @@
+//# publish
+module 0x1.M {
+    struct S { g: u64 }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let x1: u64;
+        let x2: u64;
+        let eps: &u64;
+        let g: &u64;
+    label b0:
+        x1 = 0;
+        x2 = 1;
+        jump_if (move(cond)) b2;
+    label b1:
+        eps = &x1;
+        jump b3;
+    label b2:
+        eps = Self.bar(copy(root));
+        jump b3;
+    label b3:
+        g = &move(root).S::g; // valid to extend even though imm borrowed in one branch
+        return;
+    }
+
+    t2() {
+        let x1: u64;
+        let x2: u64;
+        let eps: &u64;
+    label b0:
+        x1 = 0;
+        x2 = 1;
+        eps = Self.foo(&x1, &x2);
+        Self.baz(&x1, move(eps)); // valid to call even though imm borrows overlap
+        return;
+    }
+
+    t3() {
+        let x1: u64;
+        let x2: u64;
+        let eps: &u64;
+    label b0:
+        x1 = 0;
+        x2 = 1;
+        eps = Self.foo(&x1, &x2);
+        Self.baz(freeze(&mut x1), move(eps)); // valid to call even though imm borrows overlap
+        return;
+    }
+
+    foo(a: &u64, b: &u64): &u64 {
+        let ret: &u64;
+    label b0:
+        jump_if (*copy(a) > *copy(b)) b2;
+    label b1:
+        ret = move(b);
+        _ = move(a);
+        jump b3;
+    label b2:
+        ret = move(a);
+        _ = move(b);
+        jump b3;
+    label b3:
+        return move(ret); // valid even though different references borrowed
+    }
+
+    bar(a: &mut Self.S): &u64 {
+    label b0:
+        return &move(a).S::g;
+    }
+
+    baz(a: &u64, b: &u64) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.mvir
new file mode 100644
index 000000000..ba1630fa4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x1.Tester {
+    import 0x1.signer;
+
+    struct Data has key { v1: u64, v2: u64 }
+    struct Box has key { f: u64 }
+
+    // the key struct is here to just give a feeling why the computation might not be reorderable
+    bump_and_pick(data: &mut Self.Data, b1: &mut Self.Box, b2: &mut Self.Box): &u64 {
+    label b0:
+        *&mut copy(b1).Box::f = *&copy(data).Data::v1;
+        *&mut copy(b2).Box::f = *&move(data).Data::v2;
+        jump_if (*&copy(b1).Box::f >= *&copy(b2).Box::f) b2;
+    label b1:
+        _ = move(b1);
+        return &move(b2).Box::f;
+    label b2:
+        _ = move(b2);
+        return &move(b1).Box::f;
+    }
+
+    larger_field(data: &mut Self.Data, b1: Self.Box, b2: Self.Box, drop: address, result: &mut u64) {
+        let returned_ref: &u64;
+        let dump: u64;
+    label b0:
+        assert(*&(&b1).Box::f == 0, 42);
+        assert(*&(&b2).Box::f == 0, 42);
+
+        returned_ref = Self.bump_and_pick(move(data), &mut b1, &mut b2);
+
+        // it is valid to immutably borrow the local
+        // even though a mut borrow + freeze would be invalid
+        assert(*&(&b1).Box::f != 0, 42);
+        assert(*&(&b2).Box::f != 0, 42);
+        assert(
+            // (*copy(returned_ref) == *&(&b1).Box::f) ^ (*copy(returned_ref) == *&(&b2).Box::f),
+            (*copy(returned_ref) == *&(&b1).Box::f) != (*copy(returned_ref) == *&(&b2).Box::f),
+            42
+        );
+
+        *move(result) = *move(returned_ref);
+        Box { dump } = move(b1);
+        Box { dump } = move(b2);
+
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.mvir
new file mode 100644
index 000000000..aca8724e3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x1.Tester {
+    struct X has key { f: u64 }
+
+    bump_and_give(x_ref: &mut Self.X, other: &u64): &u64 {
+    label b0:
+        _ = move(other);
+        *(&mut copy(x_ref).X::f) = *&mut copy(x_ref).X::f + 1;
+        return &move(x_ref).X::f;
+    }
+
+    contrived_example(result: &mut u64) {
+        let x: Self.X;
+        let other: u64;
+        let returned_ref: &u64;
+    label b0:
+        x = X { f: 0 };
+        other = 100;
+        returned_ref = Self.bump_and_give(&mut x, &other);
+        // it is valid to immutably borrow the local
+        // even though a mut borrow + freeze would be invalid
+        assert(*copy(returned_ref) == *&(&x).X::f, 42);
+        *move(result) = *move(returned_ref);
+        X { other } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.mvir
new file mode 100644
index 000000000..ece5f4a82
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_trivial_valid.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x1.Tester {
+    struct X has key { f: u64 }
+
+    bump_and_give(x_ref: &mut Self.X, other: &u64): &u64 {
+    label b0:
+        _ = move(other);
+        *(&mut copy(x_ref).X::f) = *&mut copy(x_ref).X::f + 1;
+        return &move(x_ref).X::f;
+    }
+
+    contrived_example(result: &mut u64) {
+        let x: Self.X;
+        let other: u64;
+        let returned_ref: &u64;
+    label b0:
+        x = X { f: 0 };
+        other = 100;
+        returned_ref = Self.bump_and_give(&mut x, &other);
+        // mut borrow the local + freeze is valid here
+        assert(*copy(returned_ref) == *&(freeze(&mut x)).X::f, 42);
+        *move(result) = *move(returned_ref);
+        X { other } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.mvir
new file mode 100644
index 000000000..c7bef57b0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_loc_valid.mvir
@@ -0,0 +1,45 @@
+//# publish
+module 0x1.Tester {
+    import 0x1.signer;
+
+    struct Data has key { v1: u64, v2: u64 }
+    struct Box has key { f: u64 }
+
+    // the key struct is here to just give a feeling why the computation might not be reorderable
+    bump_and_pick(data: &mut Self.Data, b1: &mut Self.Box, b2: &mut Self.Box): &u64  {
+    label b0:
+        *&mut copy(b1).Box::f = *&copy(data).Data::v1;
+        *&mut copy(b2).Box::f = *&move(data).Data::v2;
+        jump_if (*&copy(b1).Box::f >= *&copy(b2).Box::f) b2;
+    label b1:
+        _ = move(b1);
+        return &move(b2).Box::f;
+    label b2:
+        _ = move(b2);
+        return &move(b1).Box::f;
+    }
+
+    larger_field(data: &mut Self.Data, b1: Self.Box, b2: Self.Box, drop: address, result: &mut u64) {
+        let returned_ref: &u64;
+        let dump: u64;
+    label b0:
+        assert(*&(&b1).Box::f == 0, 42);
+        assert(*&(&b2).Box::f == 0, 42);
+
+        returned_ref = Self.bump_and_pick(move(data), &mut b1, &mut b2);
+
+        // it is valid to immutably extend the reference
+        // even though a mut extension + freeze would be invalid
+        assert(
+            // (*copy(returned_ref) == *&(&b1).Box::f) ^ (*copy(returned_ref) == *&(&b2).Box::f),
+            (*copy(returned_ref) == *&(&mut b1).Box::f) != (*copy(returned_ref) == *&(&mut b2).Box::f),
+            42
+        );
+
+        *move(result) = *move(returned_ref);
+        Box { dump } = move(b1);
+        Box { dump } = move(b2);
+
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.mvir
new file mode 100644
index 000000000..a3e85b9b6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut.mvir
@@ -0,0 +1,46 @@
+//# publish
+module 0x1.Tester {
+    import 0x1.signer;
+
+    struct Initializer has key { x: u64, y: u64 }
+    struct Point { x: u64, y: u64 }
+
+    // the key struct is here to just give a feeling why the computation might not be reorderable
+    set_and_pick(init: &mut Self.Initializer, p: &mut Self.Point): &mut u64 {
+    label b0:
+        *&mut copy(p).Point::x = *&copy(init).Initializer::x;
+        *&mut copy(p).Point::y = *&move(init).Initializer::y;
+        jump_if (*&copy(p).Point::x >= *&copy(p).Point::y) b2;
+    label b1:
+        return &mut move(p).Point::y;
+    label b2:
+        return &mut move(p).Point::x;
+    }
+
+    bump_and_give(u: &mut u64): &u64 {
+    label b0:
+        *copy(u) = *copy(u) + 1;
+        return freeze(move(u));
+    }
+
+    larger_field(init: &mut Self.Initializer, point_ref: &mut Self.Point): &u64 {
+        let field_ref: &mut u64;
+        let returned_ref: &u64;
+    label b0:
+        assert(*&copy(point_ref).Point::x == 0, 42);
+        assert(*&copy(point_ref).Point::y == 0, 42);
+
+        field_ref = Self.set_and_pick(move(init), copy(point_ref));
+        returned_ref = Self.bump_and_give(move(field_ref));
+
+        // it is valid to immutably extend the reference
+        // even though a mut extension + freeze would be invalid
+        assert(
+            (*copy(returned_ref) == *&copy(point_ref).Point::x) &&
+            (*copy(returned_ref) != *&move(point_ref).Point::y),
+            42
+        );
+
+        return move(returned_ref);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.exp
new file mode 100644
index 000000000..186848589
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-47:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 23)],
+}
+
+task 1 'publish'. lines 49-95:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester2'. Got VMError: {
+    major_status: FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester2,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 23)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.mvir
new file mode 100644
index 000000000..81b7d58d0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_invalid.mvir
@@ -0,0 +1,95 @@
+//# publish
+module 0x1.Tester {
+    import 0x1.signer;
+
+    struct Initializer has key { x: u64, y: u64 }
+    struct Point { x: u64, y: u64 }
+
+    // the key struct is here to just give a feeling why the computation might not be reorderable
+    set_and_pick(init: &mut Self.Initializer, p: &mut Self.Point): &mut u64 {
+    label b0:
+        *&mut copy(p).Point::x = *&copy(init).Initializer::x;
+        *&mut copy(p).Point::y = *&move(init).Initializer::y;
+        jump_if (*&copy(p).Point::x >= *&copy(p).Point::y) b2;
+    label b1:
+        return &mut move(p).Point::y;
+    label b2:
+        return &mut move(p).Point::x;
+    }
+
+    bump_and_give(u: &mut u64): &u64 {
+    label b0:
+        *copy(u) = *copy(u) + 1;
+        return freeze(move(u));
+    }
+
+    larger_field_1(init: &mut Self.Initializer, point_ref: &mut Self.Point): &u64 {
+        let field_ref: &mut u64;
+        let returned_ref: &u64;
+        let x_val: u64;
+    label b0:
+        assert(*&copy(point_ref).Point::x == 0, 42);
+        assert(*&copy(point_ref).Point::y == 0, 42);
+
+        field_ref = Self.set_and_pick(move(init), copy(point_ref));
+        // this borrow is invalid because of field_ref
+        x_val = *freeze(&mut move(point_ref).Point::x);
+        returned_ref = Self.bump_and_give(move(field_ref));
+
+        // imagine some more interesting check than this assert
+        assert(
+            *copy(returned_ref) == (move(x_val) + 1),
+            42
+        );
+
+        return move(returned_ref);
+    }
+}
+
+//# publish
+module 0x1.Tester2 {
+    import 0x1.signer;
+
+    struct Initializer has key { x: u64, y: u64 }
+    struct Point { x: u64, y: u64 }
+
+    // the key struct is here to just give a feeling why the computation might not be reorderable
+    set_and_pick(init: &mut Self.Initializer, p: &mut Self.Point): &mut u64 {
+    label b0:
+        *&mut copy(p).Point::x = *&copy(init).Initializer::x;
+        *&mut copy(p).Point::y = *&move(init).Initializer::y;
+        jump_if (*&copy(p).Point::x >= *&copy(p).Point::y) b2;
+    label b1:
+        return &mut move(p).Point::y;
+    label b2:
+        return &mut move(p).Point::x;
+    }
+
+    bump_and_give(u: &mut u64): &u64 {
+    label b0:
+        *copy(u) = *copy(u) + 1;
+        return freeze(move(u));
+    }
+
+    larger_field_2(init: &mut Self.Initializer, point_ref: &mut Self.Point): &u64 {
+        let field_ref: &mut u64;
+        let returned_ref: &u64;
+        let x_val: u64;
+    label b0:
+        assert(*&copy(point_ref).Point::x == 0, 42);
+        assert(*&copy(point_ref).Point::y == 0, 42);
+
+        field_ref = Self.set_and_pick(move(init), copy(point_ref));
+        // this freeze is invalid because of field_ref
+        x_val = *(&freeze(move(point_ref)).Point::x);
+        returned_ref = Self.bump_and_give(move(field_ref));
+
+        // imagine some more interesting check than this assert
+        assert(
+            *copy(returned_ref) == (move(x_val) + 1),
+            42
+        );
+
+        return move(returned_ref);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.mvir
new file mode 100644
index 000000000..562db54cf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.Tester {
+    struct X { f: u64 }
+
+    bump_and_give(x_ref: &mut Self.X): &u64 {
+    label b0:
+        *(&mut copy(x_ref).X::f) = *&mut copy(x_ref).X::f + 1;
+        return &move(x_ref).X::f;
+    }
+
+    contrived_example(x_ref: &mut Self.X): &u64 {
+        let returned_ref: &u64;
+    label b0:
+        returned_ref = Self.bump_and_give(copy(x_ref));
+        // it is valid to immutably extend the reference
+        // even though a mut extension + freeze would be invalid
+        assert(*copy(returned_ref) == *&move(x_ref).X::f, 42);
+        return move(returned_ref);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.exp
new file mode 100644
index 000000000..fd136e2a4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Tester'. Got VMError: {
+    major_status: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.mvir
new file mode 100644
index 000000000..87a3bc73f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/imm_borrow_on_mut_trivial_invalid.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x1.Tester {
+    struct X { f: u64 }
+
+    bump_and_give(x_ref: &mut Self.X): &u64 {
+    label b0:
+        *(&mut copy(x_ref).X::f) = *&mut copy(x_ref).X::f + 1;
+        return &move(x_ref).X::f;
+    }
+
+    contrived_example_no(x_ref: &mut Self.X): &u64 {
+        let returned_ref: &u64;
+    label b0:
+        returned_ref = Self.bump_and_give(copy(x_ref));
+        // ERROR Cannot mutably borrow from `x_ref` it is being borrowed by `returned_ref`
+        assert(*copy(returned_ref) == *freeze(&mut move(x_ref).X::f) + 1, 42);
+        return move(returned_ref);
+    }
+
+    contrived_example_valid(x_ref: &mut Self.X): &u64 {
+        let returned_ref: &u64;
+    label b0:
+        returned_ref = Self.bump_and_give(copy(x_ref));
+        // This is still valid, but might not be in other cases. See other Imm Borrow tests
+        // i.e. you might hit FreezeRefExistsMutableBorrowError
+        assert(*copy(returned_ref) == *(&freeze(move(x_ref)).X::f) + 1, 42);
+        return move(returned_ref);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.mvir
new file mode 100644
index 000000000..bcdae57a1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/join_borrow_unavailable_valid.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.M {
+    struct S { f: u64 }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let u: u64;
+        let x: &u64;
+    label b0:
+        u = 0;
+        jump_if (move(cond)) b2;
+    label b1:
+        _ = move(u);
+        x = &move(root).S::f;
+        jump b3;
+    label b2:
+        x = &u;
+        jump b3;
+    label b3:
+        // it is okay for the two branches to disagree on the state of u, even though it is
+        // borrowed in one branch
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.mvir
new file mode 100644
index 000000000..7d4250a49
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/move_one_branch.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x1.M {
+    t0(cond: bool) {
+        let x: u64;
+        let x_ref: &mut u64;
+    label b0:
+        x = 0;
+        x_ref = &mut x;
+        jump_if_false (move(cond)) b2;
+    label b1:
+        *move(x_ref) = 1;
+    label b2:
+        // safe to assign, as x is no longer borrowed
+        // even though the reference was only moved in one branch
+        x = 1;
+        return;
+    }
+
+    t1(cond: bool) {
+        let x: u64;
+        let x_ref: &mut u64;
+    label b0:
+        x = 0;
+        x_ref = &mut x;
+        jump_if (move(cond)) b2;
+    label b1:
+        jump b3;
+    label b2:
+        *move(x_ref) = 1;
+        jump b3;
+    label b3:
+        // safe to assign, as x is no longer borrowed
+        // even though the reference was only moved in one branch
+        x = 1;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.exp
new file mode 100644
index 000000000..80a12b091
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
+
+task 1 'publish'. lines 21-44:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.mvir
new file mode 100644
index 000000000..3fb3163c5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_invalid.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x1.M {
+    struct S { f: u64, g: u64, h: u64 }
+
+
+    t1(root: &mut Self.S, cond: bool) {
+        let x: &mut u64;
+    label b0:
+        jump_if (move(cond)) b2;
+    label b1:
+        x = &mut copy(root).S::g;
+        jump b3;
+    label b2:
+        x = &mut copy(root).S::f;
+    label b3:
+        *(&mut copy(root).S::f) = 1; // INVALID x is still borrowing f
+        return;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+
+    struct S { f: u64, g: u64, h: u64 }
+
+    t2(root: &mut Self.S, cond: bool) {
+        let x: &mut u64;
+    label b0:
+        jump_if (move(cond)) b2;
+    label b1:
+        x = &mut copy(root).S::g;
+        jump b3;
+    label b2:
+        x = &mut copy(root).S::f;
+    label b3:
+        Self.foo(move(x), &mut copy(root).S::f); // INVALID x and &mut root.f overlap
+        return;
+    }
+
+    foo(x: &mut u64, y: &mut u64) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.mvir
new file mode 100644
index 000000000..15848f596
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.M {
+    t1() {
+        let a: u64;
+        let r1: &mut u64;
+        let r2: &mut u64;
+    label b0:
+        a = 0;
+        r1 = &mut a;
+        r2 = &mut a;
+        // r1 owns the data, so it can be mutated, then r2 can mutate
+        // this might be relaxed later so either can be written to in either order
+        *move(r1) = 1;
+        *move(r2) = 2;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.exp
new file mode 100644
index 000000000..8b2edcf88
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.mvir
new file mode 100644
index 000000000..ef6588689
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutable_borrow_local_twice_invalid.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.M {
+    t1() {
+        let a: u64;
+        let r1: &mut u64;
+        let r2: &mut u64;
+    label b0:
+        a = 0;
+        r1 = &mut a;
+        r2 = &mut a;
+        // cannot write to r2, r1 "owns" the data....
+        // this might be improved upon later
+        *move(r2) = 2;
+        *move(r1) = 1;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.mvir
new file mode 100644
index 000000000..9027bdec1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_borrow_field_ok.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x42.Test {
+    struct T has drop {v: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{v: move(g)};
+    }
+
+    public thousand(t : &mut Self.T) {
+    label b0:
+        *(&mut move(t).T::v) = 1000;
+        return;
+    }
+
+    public value(this: &mut Self.T): u64 {
+        let y: &u64;
+    label b0:
+        y = &move(this).T::v;
+        return *move(y);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Test;
+
+entry foo() {
+    let x: Test.T;
+    let x_ref: u64;
+label b0:
+    x = Test.new(500);
+    Test.thousand(&mut x);
+    x_ref = Test.value(&mut x); // can read references through calls
+    assert(move(x_ref) == 1000, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.exp
new file mode 100644
index 000000000..509d5fddf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.mvir
new file mode 100644
index 000000000..39b003f44
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.A {
+    struct Coin has store { value: u64 }
+    struct T { f: Self.Coin }
+
+    public t(this: &mut Self.T, y: Self.T) {
+    label b0:
+        *move(this) = move(y); // cannot assign/mutate without drop ability
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.mvir
new file mode 100644
index 000000000..dcfe4807f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_resource_holder_2.mvir
@@ -0,0 +1,51 @@
+//# publish
+module 0x42.A {
+    struct Coin { balance: u64 }
+    struct A { c: Self.Coin }
+
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { balance: 0 };
+    }
+
+    public new(c: Self.Coin): Self.A {
+    label b0:
+        return A { c: move(c) };
+    }
+
+    public destroy_a(a: Self.A) {
+        let c: Self.Coin;
+        let balance: u64;
+    label b0:
+        A { c } = move(a);
+        Coin { balance } = move(c);
+        return;
+    }
+
+    public mutate(a_ref: &mut Self.A) {
+        let ref: &mut Self.Coin;
+        let ref_balance: &mut u64;
+    label b0:
+        // safe to modify resources inner values (if they have drop)
+        ref = &mut move(a_ref).A::c;
+        ref_balance = &mut move(ref).Coin::balance;
+        *move(ref_balance) = 100;
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.A;
+
+entry foo() {
+    let zero_resource: A.Coin;
+    let s: A.A;
+label b0:
+    zero_resource = A.zero();
+    s = A.new(move(zero_resource));
+    A.mutate(&mut s);
+    A.destroy_a(move(s));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.mvir
new file mode 100644
index 000000000..89bb9cd2d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x1.M {
+    t1() {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        x = 0;
+        y = &x;
+        y = &x; // it is okay to write to a local holding a reference, even if immutable
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.exp
new file mode 100644
index 000000000..f7f6be1fd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.mvir
new file mode 100644
index 000000000..9ee3d24b9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_invalid.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x1.M {
+    t1() {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        x = 0;
+        y = &x;
+        x = 0; // cannot write to x, still borrowed
+        return;
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.exp
new file mode 100644
index 000000000..06d18baed
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 1 'publish'. lines 19-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::N'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::N,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.mvir
new file mode 100644
index 000000000..8a4eb6849
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/mutate_with_borrowed_loc_struct_invalid.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x1.M {
+    struct X { b: bool }
+    struct S { z: u64 }
+    t1() {
+        let x: Self.X;
+        let y: &Self.X;
+        let b: bool;
+    label b0:
+        x = X { b: true };
+        y = &x;
+        x = X { b: true }; // cannot write to x, still borrowed
+        _ = move(y);
+        X { b } = move(x);
+        return;
+    }
+}
+
+//# publish
+module 0x1.N {
+    struct X { b: bool }
+    struct S { z: u64 }
+    t2() {
+        let s: Self.S;
+        let y: &Self.S;
+        let z: &u64;
+    label b0:
+        s = S { z: 2 };
+        y = &s;
+        z = &move(y).S::z;
+        s = S { z: 7 }; // cannot write to z, still borrowed
+        return;
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.mvir
new file mode 100644
index 000000000..e1a98e8ef
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/nested_mutate.mvir
@@ -0,0 +1,58 @@
+//# publish
+module 0x42.B {
+    struct T has drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &mut Self.T) {
+        let g: &mut u64;
+    label b0:
+        g = &mut copy(this).T::g;
+        *copy(g) = 2;
+        assert(*move(g) == 2, 42);
+        _ = move(this);
+        return;
+    }
+}
+
+//# publish
+module 0x42.A {
+    import 0x42.B;
+    struct T has drop {f: B.T}
+
+    public new(f: B.T): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &mut Self.T) {
+        let f: &mut B.T;
+    label b0:
+        f = &mut copy(this).T::f;
+        // safe to modify reference through nested calls
+        B.t(move(f));
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.A;
+import 0x42.B;
+
+entry foo() {
+    let b: B.T;
+    let x: A.T;
+    let x_ref: &mut A.T;
+label b0:
+    b = B.new(0);
+    x = A.new(move(b));
+    x_ref = &mut x;
+    A.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.exp
new file mode 100644
index 000000000..a5a6aa21c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: BORROWLOC_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.mvir
new file mode 100644
index 000000000..3a11e1067
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/no_borrow_ref.mvir
@@ -0,0 +1,14 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &u64;
+label b0:
+    v = 5;
+    ref_v = &v;
+    _ = &ref_v; // cannot borrow a reference
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.exp
new file mode 100644
index 000000000..bac0e5bb9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.mvir
new file mode 100644
index 000000000..f3b7d3d17
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_field_after_assign_local.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public replace(t: &mut Self.T) {
+        let t_v: &mut u64;
+        let new_t: Self.T;
+    label b0:
+        t_v = &mut copy(t).T::v;
+        new_t = Self.new(1);
+        *move(t) = move(new_t); // cannot write to t, still borrowed
+
+        assert(*move(t_v) == 1, 42);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.exp
new file mode 100644
index 000000000..5a7bb2217
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: READREF_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 18)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.mvir
new file mode 100644
index 000000000..da9638557
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_assign.mvir
@@ -0,0 +1,20 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let read_ref: &mut u64;
+    let assign_ref: &mut u64;
+    let no: u64;
+label b0:
+    v = 5;
+    read_ref = &mut v;
+    assign_ref = copy(read_ref);
+    *copy(assign_ref) = 0;
+    assert(*copy(assign_ref) == 0, 42);
+    no = *move(read_ref); // valid to read reference after assiging a copy!
+    _ = move(assign_ref);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.exp
new file mode 100644
index 000000000..a75f7d19c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.mvir
new file mode 100644
index 000000000..5b637ac4a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/read_local_ref_after_move.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &mut u64;
+    let dead: u64;
+label b0:
+    v = 5;
+    ref_v = &mut v;
+    dead = move(v); // cannot move v, it is still borrowed
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.mvir
new file mode 100644
index 000000000..98a385b96
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/ref_moved_one_branch.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x1.A {
+    struct S {value: u64}
+
+    public t(changed: bool, s: &mut Self.S) {
+    label b0:
+        // valid to move a reference in one branch and not the other
+        jump_if (move(changed)) b2;
+    label b1:
+        return;
+    label b2:
+        Self.foo(&mut move(s).S::value);
+        return;
+    }
+
+    foo(x: &mut u64) {
+    label b0:
+        *copy(x) = *copy(x) + 1;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.mvir
new file mode 100644
index 000000000..1f94bb952
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/release_cycle.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x1.M {
+    t0(cond: bool) {
+        let v: u64;
+        let x: &u64;
+        let y: &u64;
+    label b0:
+        v = 0;
+        jump_if (move(cond)) b2;
+    label b1:
+        y = &v;
+        x = copy(y);
+        jump b3;
+    label b2:
+        x = &v;
+        y = copy(x);
+        jump b3;
+    label b3:
+        // the relationship between the references can be viewed as cyclic
+        // reference_safety must be careful when releasing
+        _ = move(x);
+        _ = move(y);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.exp
new file mode 100644
index 000000000..e9f47104d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Tester'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x42::Tester,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.mvir
new file mode 100644
index 000000000..dc5d66c95
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_local_ref.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x42.Tester {
+    public no(): &u64 {
+        let x: u64;
+        let x_ref: &u64;
+    label b0:
+        x = 5;
+        x_ref = &x;
+        return move(x_ref); // cannot return references not rooted in params
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.mvir
new file mode 100644
index 000000000..5c53dfc58
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x1.M {
+    struct X has drop { y: Self.Y }
+    struct Y has drop { u: u64 }
+
+    t1() {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        x = 0;
+        y = &x;
+        return;
+    }
+
+    t2() {
+        let s: Self.X;
+        let x: &Self.X;
+        let y: &Self.Y;
+        let u: &u64;
+    label b0:
+        s = X { y: Y { u: 0 } };
+        x = &s;
+        y = &copy(x).X::y;
+        u = &copy(y).Y::u;
+        return; // all references are automatically released, return is safe
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.exp
new file mode 100644
index 000000000..d13601768
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'publish'. lines 32-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
+
+task 3 'publish'. lines 51-68:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.mvir
new file mode 100644
index 000000000..1e45cc016
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_invalid.mvir
@@ -0,0 +1,68 @@
+//# publish
+module 0x1.M {
+    struct X has drop { y: Self.Y }
+    struct Y has drop { u: u64 }
+
+    t1(): &u64 {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        x = 0;
+        y = &x;
+        // invalid return, borrowing a local
+        return move(y);
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    struct X has drop { y: Self.Y }
+    struct Y has drop { u: u64 }
+    t2(): &u64 {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        x = 0;
+        y = &x;
+        // invalid return, borrowing a local
+        return copy(y);
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    struct X has drop { y: Self.Y }
+    struct Y has drop { u: u64 }
+    t3(): &u64 {
+        let s: Self.X;
+        let x: &Self.X;
+        let y: &Self.Y;
+        let u: &u64;
+    label b0:
+        s = X { y: Y { u: 0 } };
+        x = &s;
+        y = &move(x).X::y;
+        u = &move(y).Y::u;
+        // invalid return, borrowing a local
+        return move(u);
+    }
+}
+
+//# publish
+module 0x1.M4 {
+    struct X has drop { y: Self.Y }
+    struct Y has drop { u: u64 }
+    t4(): &u64 {
+        let s: Self.X;
+        let x: &Self.X;
+        let y: &Self.Y;
+        let u: &u64;
+    label b0:
+        s = X { y: Y { u: 0 } };
+        x = &s;
+        y = &copy(x).X::y;
+        u = &copy(y).Y::u;
+        // invalid return, borrowing a local
+        return copy(u);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.exp
new file mode 100644
index 000000000..28a4b4f71
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.mvir
new file mode 100644
index 000000000..dfc763d96
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/return_with_borrowed_loc_resource_invalid.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x1.M {
+    struct X { u: u64 }
+
+    t() {
+        let s: Self.X;
+        let u: &u64;
+    label b0:
+        s = X { u: 0 };
+        u = &(&s).X::u;
+        return; // unused resource even though it is "used" via a borrow
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.mvir
new file mode 100644
index 000000000..d08a5477e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/simple_mutate.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x42.A {
+    struct T has drop {f: u64}
+
+    public new(f: u64): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &mut Self.T) {
+        let f: &mut u64;
+    label b0:
+        f = &mut copy(this).T::f;
+        // mutation allowed
+        *copy(f) = 2;
+        assert(*move(f) == 2, 42);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.A;
+
+entry foo() {
+    let x: A.T;
+    let x_ref: &mut A.T;
+label b0:
+    x = A.new(0);
+    x_ref = &mut x;
+    A.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.mvir
new file mode 100644
index 000000000..1e42df54d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/two_mutable_ref.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x42.M {
+    struct Foo {
+        a: u64,
+        b: u64,
+    }
+
+    public create_mutable_field_addresses(addr: &mut Self.Foo) {
+        let a_ref: &mut u64;
+        let b_ref: &mut u64;
+    label b0:
+        // multiple mutable references to same ref valid
+        a_ref = &mut copy(addr).Foo::a;
+        b_ref = &mut copy(addr).Foo::b;
+        _ = move(a_ref);
+        _ = move(b_ref);
+        _ = move(addr);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.exp
new file mode 100644
index 000000000..e9762e99a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 12-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.mvir
new file mode 100644
index 000000000..2f65fe21f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_after_move.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x42.B {
+    struct T has copy, drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T { g: move(g) };
+    }
+}
+
+
+//# publish
+module 0x42.A {
+    import 0x42.B;
+    struct T{value: B.T}
+    public new(m: B.T): Self.T {
+    label b0:
+        return T{value: move(m)};
+    }
+
+    public t(this: &mut Self.T) {
+        let ref1: &mut B.T;
+        let ref2: &mut B.T;
+        let b2: B.T;
+        let x: B.T;
+    label b0:
+        ref1 = &mut move(this).T::value;
+        ref2 = copy(ref1);
+        b2 = B.new(3);
+        // cannot write to ref1, ref2 still borrows
+        *move(ref1) = move(b2);
+
+        x = *move(ref2);
+
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.mvir
new file mode 100644
index 000000000..3387fa072
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_prefix_after_move.mvir
@@ -0,0 +1,56 @@
+//# publish
+module 0x42.B {
+    struct T has copy, drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &mut Self.T) {
+        let g: &mut u64;
+    label b0:
+        g = &mut move(this).T::g;
+        *move(g) = 3;
+        return;
+    }
+}
+
+//# publish
+module 0x42.A {
+    import 0x42.B;
+    struct T has drop {f: B.T}
+
+    public new(f: B.T): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &mut Self.T) {
+        let ref1: &mut B.T;
+        let ok: B.T;
+    label b0:
+        ref1 = &mut move(this).T::f;
+        B.t(copy(ref1));
+        ok = *move(ref1);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.A;
+import 0x42.B;
+
+entry foo() {
+    let b: B.T;
+    let x: A.T;
+    let x_ref: &mut A.T;
+label b0:
+    b = B.new(0);
+    x = A.new(move(b));
+    x_ref = &mut x;
+    A.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.exp
new file mode 100644
index 000000000..4a14be9c9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 19-41:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 12)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.mvir
new file mode 100644
index 000000000..7f7ad2bc5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/use_suffix_after_move.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x42.B {
+    struct T has drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &Self.T): &u64 {
+        let g: &u64;
+    label b0:
+        g = &move(this).T::g;
+        return move(g);
+    }
+}
+
+
+//# publish
+module 0x42.A {
+    import 0x42.B;
+    struct T{f: B.T}
+
+    public new(f: B.T): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &mut Self.T) {
+        let ref1: &mut B.T;
+        let ref2: &u64;
+        let b2: B.T;
+    label b0:
+        ref1 = &mut move(this).T::f;
+        ref2 = B.t(freeze(copy(ref1)));
+        b2 = B.new(3);
+        // cannot modify, ref2 still borrows ref1
+        *move(ref1) = move(b2);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.exp
new file mode 100644
index 000000000..1e4eb82c2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
+
+task 1 'run'. lines 20-38:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: BORROWLOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 12)],
+}
+
+task 2 'run'. lines 39-57:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 14)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.mvir
new file mode 100644
index 000000000..5dbacd904
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_double_borrow.mvir
@@ -0,0 +1,57 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_imm1: &u64;
+    let e_mut2: &mut u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    vec_push_back<u64>(&mut v, 1);
+
+    e_imm1 = vec_imm_borrow<u64>(&v, 0);
+    e_mut2 = vec_mut_borrow<u64>(&mut v, 1);
+
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_mut1: &mut u64;
+    let e_imm2: &u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    vec_push_back<u64>(&mut v, 1);
+
+    e_mut1 = vec_mut_borrow<u64>(&mut v, 0);
+    e_imm2 = vec_imm_borrow<u64>(&v, 1);
+
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_mut1: &mut u64;
+    let e_mut2: &mut u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    vec_push_back<u64>(&mut v, 1);
+
+    e_mut1 = vec_mut_borrow<u64>(&mut v, 0);
+    e_mut2 = vec_mut_borrow<u64>(&mut v, 1);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.exp
new file mode 100644
index 000000000..ab2723058
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
+
+task 1 'run'. lines 17-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: MOVELOC_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.mvir
new file mode 100644
index 000000000..28c85c1e8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_move_after_borrow.mvir
@@ -0,0 +1,32 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_imm: &u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    e_imm = vec_imm_borrow<u64>(&v, 0);
+
+    _ = move(v);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_mut: &mut u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    e_mut = vec_mut_borrow<u64>(&mut v, 0);
+
+    _ = move(v);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.exp
new file mode 100644
index 000000000..c4aa07bb2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 1 'run'. lines 17-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.mvir
new file mode 100644
index 000000000..400bca80e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/vector_ops_pop_after_borrow.mvir
@@ -0,0 +1,32 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_imm: &u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    e_imm = vec_imm_borrow<u64>(&v, 0);
+
+    _ = vec_pop_back<u64>(&mut v);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let e_mut: &mut u64;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    e_mut = vec_mut_borrow<u64>(&mut v, 0);
+
+    _ = vec_pop_back<u64>(&mut v);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.exp
new file mode 100644
index 000000000..7eb266510
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: WRITEREF_EXISTS_BORROW_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.mvir
new file mode 100644
index 000000000..0080afa0d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_invalid.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.M {
+    struct G has drop { v: u64 }
+    struct S has drop { g: Self.G }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let v_mut: &mut u64;
+        let g_mut: &mut Self.G;
+    label b0:
+        v_mut = &mut (&mut copy(root).S::g).G::v;
+        g_mut = &mut copy(root).S::g;
+
+        // INVALID cannot write with v_mut live
+        *move(g_mut) = G { v: 0 };
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.mvir
new file mode 100644
index 000000000..f08aca005
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid1.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.M {
+    struct G has drop { v1: u64, v2: u64 }
+    struct S { g1: Self.G, g2: Self.G }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let v1_mut: &mut u64;
+        let v2_mut: &mut u64;
+        let g2_mut: &mut Self.G;
+    label b0:
+        v1_mut = &mut (&mut copy(root).S::g1).G::v1;
+        v2_mut = &mut (&mut copy(root).S::g1).G::v2;
+
+        g2_mut = &mut copy(root).S::g2;
+
+        // all writes valid as they are on different fields/subtrees
+        *copy(g2_mut) = G { v1: 0, v2: 0 };
+        *copy(v2_mut) = 0;
+        *copy(v1_mut) = 1;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.mvir
new file mode 100644
index 000000000..d5f03cce3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/reference_safety/writeref_borrow_valid2.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x1.M {
+    struct S { f: u64, g: u64, h: u64 }
+
+    t1(root: &mut Self.S, cond: bool) {
+        let x: &mut u64;
+    label b0:
+        jump_if (move(cond)) b2;
+    label b1:
+        x = &mut copy(root).S::g;
+        jump b3;
+    label b2:
+        x = &mut copy(root).S::f;
+        jump b3;
+    label b3:
+        // can write even though f and g are borrowed
+        *(&mut copy(root).S::h) = 0;
+        return;
+    }
+
+    t2(root: &mut Self.S, cond: bool) {
+        let x: &mut u64;
+    label b0:
+        jump_if (move(cond)) b2;
+    label b1:
+        x = &mut copy(root).S::g;
+        jump b3;
+    label b2:
+        x = &mut copy(root).S::f;
+        jump b3;
+    label b3:
+        // can borrow even though f and g are borrowed
+        _ = &mut copy(root).S::f;
+        _ = &mut copy(root).S::g;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.exp
new file mode 100644
index 000000000..b134af1ae
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.exp
@@ -0,0 +1 @@
+processed 5 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.mvir
new file mode 100644
index 000000000..7105f5401
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_type_parameters_in_args.mvir
@@ -0,0 +1,46 @@
+//# run --type-args u64 --args 0
+module 0x1.m {
+// all invalid signatures
+entry foo<T: copy + drop>(x: T) {
+label b0:
+    return;
+}
+}
+
+
+//# run --type-args u8 --args 1u8
+module 0x2.m {
+
+entry foo<T>(x: &T) {
+label b0:
+    return;
+}
+
+}
+
+//# run --type-args u8 --args b"hello"
+module 0x3.m {
+
+entry foo<T: copy + drop>(v: vector<T>) {
+label b0:
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct Box<T> has drop { x: T }
+}
+
+
+//# run --type-args u8 --args 0u8
+module 0x4.m {
+// bit of a hack but works because structs have no overhead
+import 0x42.M;
+
+entry foo<T: copy + drop>(x: M.Box<M.Box<T>>) {
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.mvir
new file mode 100644
index 000000000..39f8c3dcb
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_generic_type_arg.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    struct Cup<T> { flag: u64 }
+}
+
+//# run --type-args 0x1::M::Cup<0x1::M::Cup<bool>>
+module 0x42.m {
+
+entry foo<T>() {
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.exp
new file mode 100644
index 000000000..be2432897
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-28:
+Error: Function execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.mvir
new file mode 100644
index 000000000..df27914fc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/script_with_type_parameters.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# run --type-args u64 u8 0x1::Coin::Coin
+module 0x42.m {
+
+entry foo<T1, T2: copy + drop, T3: key>() {
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.exp
new file mode 100644
index 000000000..42c6b5aa5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-8:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'run'. lines 10-17:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.mvir
new file mode 100644
index 000000000..e876f40e9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_double_signer.mvir
@@ -0,0 +1,26 @@
+//# run --signers 0x1
+module 0x42.m {
+// missing signer
+entry foo(s: signer, s2: signer) {
+label b0:
+    return;
+}
+}
+
+//# run --signers 0x1 --args 0
+module 0x1.m {
+// missing signer
+entry foo(s: signer, s2: signer,  u: u64,) {
+label b0:
+    return;
+}
+}
+
+//# run --args @0x1 0 @0x2
+module 0x2.m {
+// no longer an invalid signature, after V5
+entry foo(s: signer, u: u64, s2: signer) {
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.mvir
new file mode 100644
index 000000000..891a979a7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/signer_misplaced_signer_arg.mvir
@@ -0,0 +1,17 @@
+//# run --args 0 @0x1
+module 0x1.m {
+// no longer an invalid signature, after V5
+entry foo(u: u64, s: &signer) {
+label b0:
+    return;
+}
+}
+
+//# run --args 0 @0x1 1
+module 0x2.m {
+// no longer an invalid signature, after V5
+entry foo(u: u64, s: &signer, u2: u64) {
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.exp
new file mode 100644
index 000000000..e677b0f02
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 15-22:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 24-24:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.mvir
new file mode 100644
index 000000000..0e7d0b420
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/script_signature/struct_arguments.mvir
@@ -0,0 +1,24 @@
+//# publish
+
+// struct and struct ref arguments are now allowed
+// should abort indicating no verification errors occurred
+
+module 0x42.M {
+    struct S { f: u64 }
+
+    public entry foo(s: Self.S, i: &Self.S, m: &mut Self.S) {
+        label l0:
+        abort 0;
+    }
+}
+
+//# run --args 0 0 0
+module 0x42.m {
+import 0x42.M;
+entry foo(s: M.S, i: &M.S, m: &mut M.S) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run 0x42::M::foo --args 0 0 0
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.mvir
new file mode 100644
index 000000000..2fdae06fd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_all_ok.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    foo<T>() {
+        let x: Self.S<T>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.exp
new file mode 100644
index 000000000..b15334ba4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.mvir
new file mode 100644
index 000000000..0da0a3356
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_resource.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T: key> { b: bool }
+
+    foo<T>() {
+        // T does not have key
+        let x: Self.S<T>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.exp
new file mode 100644
index 000000000..b15334ba4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.mvir
new file mode 100644
index 000000000..56112a5f8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/all_as_unrestricted.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T: copy + drop> { b: bool }
+
+    foo<T>() {
+        // T does not have copy or drop
+        let x: Self.S<T>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.exp
new file mode 100644
index 000000000..2562da2c4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.exp
@@ -0,0 +1,73 @@
+processed 9 tasks
+
+task 1 'run'. lines 19-26:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 28-35:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 37-44:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 46-53:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x4::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 5 'run'. lines 55-62:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 64-71:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 73-80:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 82-89:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.mvir
new file mode 100644
index 000000000..9f40f1fdc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script.mvir
@@ -0,0 +1,89 @@
+//# publish
+module 0x1.M {
+    struct K has key { dummy: bool }
+
+    struct BoxCopy<T> has copy { f: T }
+    struct BoxDrop<T> has drop { f: T }
+    struct BoxStore<T> has store { f: T }
+    struct BoxKey<T> has key { f: T }
+
+    struct NeedsCopy<T: copy> { dummy: bool }
+    struct NeedsDrop<T: drop> { dummy: bool }
+    struct NeedsStore<T: store> { dummy: bool }
+    struct NeedsKey<T: key> { dummy: bool }
+}
+
+// tests various valid constraints in script arguments
+// all tests should abort, signaling they pass verification
+
+//# run --type-args u64 --args false
+module 0x1.m {
+import 0x1.M;
+entry foo<T: copy>(x: M.NeedsCopy<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x2.m {
+import 0x1.M;
+entry foo<T: drop>(x: M.NeedsDrop<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x3.m {
+import 0x1.M;
+entry foo<T: store>(x: M.NeedsStore<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args 0x1::M::K --args false
+module 0x4.m {
+import 0x1.M;
+entry foo<T: key>(x: M.NeedsKey<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x5.m {
+import 0x1.M;
+entry foo<T: copy>(x: M.NeedsCopy<M.BoxCopy<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x6.m {
+import 0x1.M;
+entry foo<T: drop>(x: M.NeedsDrop<M.BoxDrop<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x7.m {
+import 0x1.M;
+entry foo<T: store>(x: M.NeedsStore<M.BoxStore<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run --type-args u64 --args false
+module 0x8.m {
+import 0x1.M;
+entry foo<T: store>(x: M.NeedsKey<M.BoxKey<T>>) {
+    label l0:
+    abort 0;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.exp
new file mode 100644
index 000000000..4b177e4f0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.exp
@@ -0,0 +1,73 @@
+processed 9 tasks
+
+task 1 'run'. lines 17-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'run'. lines 26-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'run'. lines 35-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 4 'run'. lines 44-51:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 5 'run'. lines 53-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 6 'run'. lines 62-69:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 7 'run'. lines 71-78:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 8 'run'. lines 80-87:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.mvir
new file mode 100644
index 000000000..6b9ff3240
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/check_constraints_script_invalid.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x1.M {
+    struct BoxCopy<T> has copy { f: T }
+    struct BoxDrop<T> has drop { f: T }
+    struct BoxStore<T> has store { f: T }
+    struct BoxKey<T> has key { f: T }
+
+    struct NeedsCopy<T: copy> { dummy: bool }
+    struct NeedsDrop<T: drop> { dummy: bool }
+    struct NeedsStore<T: store> { dummy: bool }
+    struct NeedsKey<T: key> { dummy: bool }
+}
+
+// tests various invalid constraints in script arguments
+// all tests should give a constraint violation, even without type arguments passed in to 'run'
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: drop>(x: M.NeedsCopy<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: copy + store>(x: M.NeedsDrop<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: key>(x: M.NeedsStore<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T>(x: M.NeedsKey<T>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: store>(x: M.NeedsCopy<M.BoxCopy<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: key + store>(x: M.NeedsDrop<M.BoxDrop<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T>(x: M.NeedsStore<M.BoxStore<T>>) {
+    label l0:
+    abort 0;
+}
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo<T: drop>(x: M.NeedsKey<M.BoxKey<T>>) {
+    label l0:
+    abort 0;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.exp
new file mode 100644
index 000000000..3182feedc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 2), (FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.mvir
new file mode 100644
index 000000000..c122ee02f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_bytecode_instruction.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    id<T>(x: T) { label b0: return move(x); }
+
+    foo() {
+        let x: u64;
+        let y: &u64;
+    label b0:
+        y = &x;
+        // cannot use refs in generics
+        Self.id<&u64>(move(y));
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.exp
new file mode 100644
index 000000000..55b3a248e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.mvir
new file mode 100644
index 000000000..3c7fc5ab7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_for_struct.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    foo() {
+        // cannot use refs in generics
+        let s: Self.S<&u64>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.exp
new file mode 100644
index 000000000..d648d45c9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
+
+task 1 'publish'. lines 15-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 31-43:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 45-54:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'publish'. lines 56-65:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.mvir
new file mode 100644
index 000000000..d2f72ed8e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_as_type_actual_in_struct_inst_for_bytecode_instruction.mvir
@@ -0,0 +1,65 @@
+//# publish
+module 0x1.M {
+    import 0x1.signer;
+
+    struct Some<T> has key { item: T }
+
+    id<T>(x: T): T { label b0: abort(0); }
+    foo() {
+    label b0:
+        Self.id<Self.Some<&u64>>();
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct Some<T> { item: T }
+
+    foo() {
+        let x: u64;
+        let y: &u64;
+        let v: Self.Some<u64>;
+    label b0:
+        y = &x;
+        // cannot use refs in generics
+        v = Some<&u64> { item: move(y) };
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct Some<T> { item: T }
+
+    foo() {
+        let x: &u64;
+        let v: Self.Some<u64>;
+    label b0:
+        // cannot use refs in generics
+        Some<&u64> { item: x } = move(v);
+        return;
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct S<T> { v: T }
+
+    // cannot use refs in generics
+    foo(s: Self.S<&u64>): u64 {
+    label b0:
+        return *(*(&(&s).S::v));
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct S<T> { v: T }
+
+    // cannot use refs in generics
+    foo(s: Self.S<&u64>): u64 {
+    label b0:
+        return *(*(&mut (&mut s).S::v));
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.exp
new file mode 100644
index 000000000..5c57c63f5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.mvir
new file mode 100644
index 000000000..46a31af20
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_fields.mvir
@@ -0,0 +1,5 @@
+//# publish
+module 0x42.M {
+    // no refs in fields
+    struct Foo { x: &u64 }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.mvir
new file mode 100644
index 000000000..9b0f08d38
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/reference_in_locals_ok.mvir
@@ -0,0 +1,8 @@
+//# publish
+module 0x42.M {
+    foo() {
+        let x: &u64;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.mvir
new file mode 100644
index 000000000..7a858ab11
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_all_ok.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+    struct R { b: bool }
+
+    foo() {
+        // constraints satisfied
+        let x: Self.S<Self.R>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.exp
new file mode 100644
index 000000000..ec7bb4cd0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.mvir
new file mode 100644
index 000000000..43d82ddb3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/resource_as_unrestricted.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x1.M {
+    struct S<T: copy + drop> { b: bool }
+    struct R { b: bool }
+
+    foo() {
+        // R does not have copy or drop
+        let x: Self.S<Self.R>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.mvir
new file mode 100644
index 000000000..2a72281db
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_ok.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x1.M {
+    struct R has key { b: bool}
+    struct S<T1: key, T2: copy + drop> { b: bool }
+
+    foo() {
+        // satisfy constraints
+        let x: Self.S<Self.R, bool>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.exp
new file mode 100644
index 000000000..a6a85c403
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.mvir
new file mode 100644
index 000000000..7095d62b4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/two_type_actuals_reverse_order.mvir
@@ -0,0 +1,24 @@
+//# publish
+module 0x1.M {
+    struct S<T1: key, T2: copy + drop> { b: bool }
+
+    foo() {
+        // bool does not have key
+        let x: Self.S<bool, bool>;
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    struct R has key { b: bool }
+    struct S<T1: key, T2: copy + drop> { b: bool }
+
+    foo() {
+        // bool does not have key, R does not have copy+drop
+        let x: Self.S<bool, Self.R>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.mvir
new file mode 100644
index 000000000..f9cfb8203
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_all_ok.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T> { b: bool }
+
+    foo() {
+        // no constraint
+        let x: Self.S<bool>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.exp
new file mode 100644
index 000000000..b15334ba4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(Signature, 1), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.mvir
new file mode 100644
index 000000000..094a43222
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/unrestricted_as_resource.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct S<T: key> { b: bool }
+
+    foo() {
+        // bool does not have key
+        let x: Self.S<bool>;
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.exp
new file mode 100644
index 000000000..76bd17912
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'run'. lines 11-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'run'. lines 21-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(Signature, 0), (FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.mvir
new file mode 100644
index 000000000..38f0c4972
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/signature/vector_ops_invalid_type_args.mvir
@@ -0,0 +1,30 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = vec_pack_0<u64, bool>();
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = vec_pack_0<>();
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = vec_pack_0<&u64>();
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.exp
new file mode 100644
index 000000000..57ebe2fd2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.mvir
new file mode 100644
index 000000000..8bc4b3bd2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_negative_stack_size.mvir
@@ -0,0 +1,10 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    // negative stack size, abort takes an arg
+    abort;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.exp
new file mode 100644
index 000000000..3a16ca719
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-10:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.mvir
new file mode 100644
index 000000000..31664945d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_no_return.mvir
@@ -0,0 +1,10 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    // no return needed
+    abort 0;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.exp
new file mode 100644
index 000000000..de064d97b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.mvir
new file mode 100644
index 000000000..55b29920c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/abort_positive_stack_size.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x1.M {
+
+    public foo(): u64 {
+    label b0:
+        return 0;
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+label b0:
+    // positive stack size invalid even with abort
+    M.foo();
+    abort 0;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp
new file mode 100644
index 000000000..9cd487b84
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 31-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 41-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 51-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir
new file mode 100644
index 000000000..a6c68adf7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir
@@ -0,0 +1,60 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u8(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u16(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u32(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u64(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u128(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    to_u256(());
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp
new file mode 100644
index 000000000..a11ed8c4a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 12-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 23-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 34-44:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 45-55:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 56-66:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir
new file mode 100644
index 000000000..b1d50383d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir
@@ -0,0 +1,66 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u8(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u16(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u32(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u64(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u128(());
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3);
+    to_u256(());
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.mvir
new file mode 100644
index 000000000..6da510c3b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/consume_stack.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.M {
+    struct R has key { data: vector<u8> }
+
+    is_ok_(addr: &address, data: &vector<u8>): bool {
+    label b0:
+        return true;
+    }
+
+    fake(addr: address): &Self.R { label l0: abort(0); }
+
+    public is_ok(addr: address): bool {
+    label b0:
+        // correct stack usage
+        (&addr);
+        (0x1D8);
+        (&Self.fake().R::data);
+        Self.is_ok_();
+        return;
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.exp
new file mode 100644
index 000000000..f99343929
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.mvir
new file mode 100644
index 000000000..fe97928a8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/exp_in_if_and_else_branch.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    jump_if (true) b2;
+label b1:
+    // positive stack, but never reached when checking
+    (5);
+    jump b3;
+label b2:
+    // positive stack
+    (4);
+    jump b3;
+label b3:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.exp
new file mode 100644
index 000000000..c1805b156
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.mvir
new file mode 100644
index 000000000..2c3ee0f46
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_1.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x1.Test {
+    public baz(k: u64, l: u64, m: u64) : u64 {
+        let z: u64;
+    label b0:
+        z =  move(k) + move(l) + move(m);
+        return move(z);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+label b0:
+    // negative stack
+    Test.baz();
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.exp
new file mode 100644
index 000000000..9c8598de0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 24-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.mvir
new file mode 100644
index 000000000..af8863f0c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_call_negative_stack_err_2.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x1.A {
+    public push_u64(): u64  {
+    label b0:
+        return 42;
+    }
+
+    public push_bool(): bool {
+    label b0:
+        return true;
+    }
+
+    public foo(u: u64): u64 {
+    label b0:
+        return move(u) * 2;
+    }
+
+    public eat_stack(b: bool, u: u64) {
+    label b0:
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let ans: u64;
+label b0:
+    (A.push_bool(), A.push_u64());
+    ans = (A.foo());
+    // negative stack
+    (A.eat_stack());
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.exp
new file mode 100644
index 000000000..eb80ec803
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.mvir
new file mode 100644
index 000000000..1e41dfc79
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_pos_and_neg_stack_err.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.A {
+    public parity(u: u64): u64 * bool {
+    label b0:
+        return copy(u), (move(u) % 2 == 0);
+    }
+
+    public takes_bool(b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return 1;
+    }
+
+    public eat_stack(v: u64) {
+    label b0:
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let k: u64;
+    let ans: u64;
+    let e: u64;
+label b0:
+    k = 100;
+    // positive stack
+    ans = A.takes_bool(A.parity(move(k)));
+    assert(move(ans) == true, 42);
+    // negative stack, but never reached during checking
+    (A.eat_stack(), A.eat_stack());
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.exp
new file mode 100644
index 000000000..cd75a322e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.mvir
new file mode 100644
index 000000000..8ee20a4f7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_1.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x1.Test {
+    public foo(v: u64): u64 * u64 {
+        let one_less: u64;
+        let one_more: u64;
+    label b0:
+        one_less = copy(v) - 1;
+        one_more = move(v) + 1;
+        return move(one_less), move(one_more);
+    }
+
+    public bar(): u64 * u64 * u64 {
+    label b0:
+        return 500, 8, 256;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let y: u64;
+    let x0: u64;
+    let x1 : u64;
+label b0:
+    // positive stack
+    x0, x1 = Test.foo(Test.bar());
+    assert(move(x0) == 8, 42);
+    assert(move(x1) == 256, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.exp
new file mode 100644
index 000000000..817380ec0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.mvir
new file mode 100644
index 000000000..d093bfe94
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/function_composition_positive_stack_err_2.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x1.A {
+    public parity(u: u64): u64 * bool {
+    label b0:
+        return copy(u), (move(u) % 2 == 0);
+    }
+
+    public takes_bool(b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return 1;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let k: u64;
+    let ans: u64;
+label b0:
+    k = 100;
+    // positive stack
+    ans = A.takes_bool(A.parity(move(k)));
+    assert(move(ans) == true, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir
new file mode 100644
index 000000000..0f3bcf746
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    two(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _  = Self.two();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.B {
+    two(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.C {
+    two(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.D {
+    two(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.E {
+    two(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.F {
+    two(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp
new file mode 100644
index 000000000..14f3442e1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir
new file mode 100644
index 000000000..3c79aa538
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    three(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.A {
+    three(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp
new file mode 100644
index 000000000..e3e8ca2c3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir
new file mode 100644
index 000000000..d852de8a7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    two(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _  = Self.two();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.A {
+    two(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp
new file mode 100644
index 000000000..6ceba7ddc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 31-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 41-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 51-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir
new file mode 100644
index 000000000..51a47e9e9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir
@@ -0,0 +1,60 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u8);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u16);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u32);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u64);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u128);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    (3u256);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.exp
new file mode 100644
index 000000000..f83ed3391
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.mvir
new file mode 100644
index 000000000..9622ec276
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_negative_stack.mvir
@@ -0,0 +1,14 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    // negative stack
+    x, y, z = (1, 2);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.exp
new file mode 100644
index 000000000..71b1adad5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.mvir
new file mode 100644
index 000000000..b3b61ba78
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_bindings_positive_stack.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    // positive stack
+    x, y = (1, 2, 4);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.mvir
new file mode 100644
index 000000000..4f712c143
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values.mvir
@@ -0,0 +1,43 @@
+//# publish
+module 0x1.Test {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public test(i: &u64, x: Self.T): u64 * Self.T * bool {
+    label b0:
+        return *move(i), move(x), false;
+    }
+
+    public destroy(x: Self.T) {
+        let b: bool;
+    label b0:
+        T { b } = move(x);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+entry foo() {
+    let i: u64;
+    let t: Test.T;
+    let a: u64;
+    let x: Test.T;
+    let b: bool;
+label b0:
+    i = 0;
+    t = Test.new();
+    // correctly handles multiple function return values
+    a, x, b = Test.test(&i, move(t));
+    assert(move(a) == 0, 42);
+    Test.destroy(move(x));
+    assert(!move(b), 43);
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.exp
new file mode 100644
index 000000000..cbed82e8f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.mvir
new file mode 100644
index 000000000..7848d2d97
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_binding.mvir
@@ -0,0 +1,45 @@
+//# publish
+module 0x1.Test {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public test(i: &u64, x: Self.T): u64 * Self.T * bool {
+    label b0:
+        return *move(i), move(x), false;
+    }
+
+    public destroy(x: Self.T) {
+        let b: bool;
+    label b0:
+        T { b } = move(x);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let i: u64;
+    let t: Test.T;
+    let a: u64;
+    let b: bool;
+    let x: Test.T;
+    let z: address;
+label b0:
+    i = 0;
+    t = Test.new();
+    // too many stores/assignments, negative stack size
+    a, x, b, z = Test.test(&i, move(t));
+    assert(move(a) == 0, 42);
+    Test.destroy(move(x));
+    assert(!move(b), 43);
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.exp
new file mode 100644
index 000000000..892b8117e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.mvir
new file mode 100644
index 000000000..c87a256dd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_extra_value.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.Test {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public test(i: &u64, x: Self.T): u64 * Self.T * bool {
+    label b0:
+        // too many "return values", return wont consume them, positive stack size
+        return *move(i), move(x), false, 0x0;
+    }
+
+    public destroy(x: Self.T) {
+        let b: bool;
+    label b0:
+        T { b } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.exp
new file mode 100644
index 000000000..eb80ec803
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 23-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.mvir
new file mode 100644
index 000000000..13b4b9222
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_binding.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.Test {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public test(i: &u64, x: Self.T): u64 * Self.T * bool {
+    label b0:
+        return *move(i), move(x), false;
+    }
+
+    public destroy(x: Self.T) {
+        let b: bool;
+    label b0:
+        T { b } = move(x);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+entry foo() {
+    let i: u64;
+    let t: Test.T;
+    let a: u64;
+    let x: Test.T;
+label b0:
+    i = 0;
+    t = Test.new();
+    a, x = Test.test(&i, move(t));
+    assert(move(a) == 0, 42);
+    Test.destroy(move(x));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.exp
new file mode 100644
index 000000000..e7dbcda0a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.mvir
new file mode 100644
index 000000000..9a361944c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/multiple_return_values_missing_value.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.Test {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public test(i: &u64, x: Self.T): u64 * Self.T * bool {
+    label b0:
+        // too few values on stack for return, negative stack size
+        return *move(i), move(x);
+    }
+
+    public destroy(x: Self.T) {
+        let b: bool;
+    label b0:
+        T { b } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.mvir
new file mode 100644
index 000000000..ba04f9088
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_exact.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.A {
+    three(): u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2;
+    }
+
+    pop() {
+    label b0:
+        // correct amount of pops
+        _, _, _ = Self.three();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.exp
new file mode 100644
index 000000000..559dd0612
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.mvir
new file mode 100644
index 000000000..8dcf844a2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_negative.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.A {
+    three(): u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _, _ = Self.three();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.exp
new file mode 100644
index 000000000..269d1dd06
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.mvir
new file mode 100644
index 000000000..916930ed5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/pop_positive.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.A {
+    three(): u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2;
+    }
+
+    pop() {
+    label b0:
+        // positive stack size, missing pop
+        _, _ = Self.three();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.exp
new file mode 100644
index 000000000..99f3813d6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.mvir
new file mode 100644
index 000000000..99e178593
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_extra_binding.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.Test {
+    struct X { b: bool }
+    struct T { i: u64, x: Self.X }
+
+    public new_t(): Self.T {
+        let x: Self.X;
+    label b0:
+        x = X { b: true };
+        return T { i: 0, x: move(x) };
+    }
+
+    public destroy_t(t: Self.T): u64 * Self.X * bool {
+        let i: u64;
+        let x: Self.X;
+        let flag: bool;
+    label b0:
+        // extra binding, invalid positive stack size
+        T { i, x, b: flag } = move(t);
+        return move(i), move(x), move(flag);
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.exp
new file mode 100644
index 000000000..49c6e9980
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.mvir
new file mode 100644
index 000000000..424c00fdd
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/unpack_missing_binding.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.Test {
+    struct X { b: bool }
+    struct T { i: u64, x: Self.X, b: bool, y: u64 }
+
+    public new_t(): Self.T {
+        let x: Self.X;
+    label b0:
+        x = X { b: true };
+        return T { i: 0, x: move(x), b: false, y: 0 };
+    }
+
+    public destroy_t(t: Self.T): u64 * Self.X * bool {
+        let i: u64;
+        let x: Self.X;
+        let flag: bool;
+    label b0:
+        // unused item in unpack, invalid positive stack
+        T { i, x, b: flag } = move(t);
+        return move(i), move(x), move(flag);
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.exp
new file mode 100644
index 000000000..dcf2aa351
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'run'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 12-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 23-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 36-48:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.mvir
new file mode 100644
index 000000000..99085f299
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/stack_usage_verifier/vector_ops_pack_unpack.mvir
@@ -0,0 +1,48 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    v = vec_pack_0<bool>(true);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    v = vec_pack_1<bool>();
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+    let x: bool;
+label b0:
+    v = vec_pack_1<bool>(true);
+    x = vec_unpack_2<bool>(move(v));
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+    let x: bool;
+label b0:
+    v = vec_pack_1<bool>(true);
+    x = vec_unpack_0<bool>(move(v));
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.mvir
new file mode 100644
index 000000000..41fdd2b8c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/module_struct_shared_name.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x42.M {
+    struct M has drop { b: bool }
+    public new(): Self.M {
+    label b0:
+        return M{ b: true };
+    }
+}
+
+//# run
+module 0x42.m {
+
+import 0x42.M;
+
+entry foo() {
+    let x: M.M;
+label b0:
+    x = M.new();
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.exp
new file mode 100644
index 000000000..e6cc45c48
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.mvir
new file mode 100644
index 000000000..2b65d32be
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/mutual_recursive_struct.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x42.M {
+    // cannot have mutually recursive structs
+    struct A{b: Self.B}
+    struct B{a: Self.A}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.exp
new file mode 100644
index 000000000..86c3d6552
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.exp
@@ -0,0 +1,46 @@
+processed 6 tasks
+
+task 1 'publish'. lines 10-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M0'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M0,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 16-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 1)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 39-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 48-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: RECURSIVE_STRUCT_DEFINITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 3)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.mvir
new file mode 100644
index 000000000..5a7390373
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/recursive_struct.mvir
@@ -0,0 +1,58 @@
+//# publish
+module 0x1.Cup {
+    struct Cup<T> { f: T }
+    public cup<T>(f: T): Self.Cup<T> {
+    label b0:
+        return Cup<T> { f: move(f) };
+    }
+}
+
+//# publish
+module 0x1.M0 {
+    // recursive struct
+    struct Foo { f: Self.Foo }
+}
+
+//# publish
+module 0x1.M1 {
+    import 0x1.Cup;
+    // recursive struct
+    struct Foo { f: Cup.Cup<Self.Foo> }
+
+    // would blow up the stack
+    public foo(): Self.Foo {
+    label b0:
+        return Foo { f: Cup.cup<Self.Foo>(Self.foo()) };
+    }
+
+}
+
+//# publish
+module 0x1.M2 {
+    import 0x1.signer;
+
+    struct X { y: vector<Self.Y> }
+    struct Y { x: vector<Self.X> }
+
+}
+
+//# publish
+module 0x1.M3 {
+    import 0x1.Cup;
+
+    // recursive struct
+    struct Foo { f: Cup.Cup<Self.Foo> }
+
+}
+
+//# publish
+module 0x1.M3 {
+    import 0x1.Cup;
+
+    // indirect recursive struct
+    struct A { b: Self.B }
+    struct B { c: Self.C }
+    struct C { d: vector<Self.D> }
+    struct D { x: Cup.Cup<Cup.Cup<Cup.Cup<Self.A>>> }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.exp
new file mode 100644
index 000000000..380f15444
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-4:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 6-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 11-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 16-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.mvir
new file mode 100644
index 000000000..94d8606e1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/struct_defs/ref_in_struct.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x42.M1 {
+    struct S { x: &u64 }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S { x: &mut u64 }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T> { t: &T }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T> { t: &mut T }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/tests.rs b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.exp
new file mode 100644
index 000000000..509d5fddf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.mvir
new file mode 100644
index 000000000..97702f867
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.A {
+    struct Coin has store { value: u64 }
+    struct T { f: Self.Coin }
+
+    public t(resource1: Self.Coin, resource2: Self.Coin) {
+    label b0:
+        *&mut resource1 = move(resource2); // cannot mutate without drop ability
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.exp
new file mode 100644
index 000000000..04ab2b89d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.mvir
new file mode 100644
index 000000000..4f3eab0fa
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_local_resource_twice.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x42.A {
+    struct Coin has store { value: u64 }
+    struct T { f: Self.Coin }
+
+    public t(resource_ref: &mut Self.Coin, resource1: Self.Coin, resource2: Self.Coin) {
+    label b0:
+        // cannot modify without drop ability
+        *move(resource_ref) = move(resource1);
+        *move(resource_ref) = move(resource2);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.exp
new file mode 100644
index 000000000..a830d1e9b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.mvir
new file mode 100644
index 000000000..521ef3665
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_resource_type.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x42.A {
+    struct Coin has store { value: u64 }
+    struct T { f: Self.Coin }
+
+    public t(this: &mut Self.T, y: Self.Coin) {
+        let x: &mut Self.Coin;
+    label b0:
+        x = &mut move(this).T::f;
+        *move(x) = move(y); // cannot assign/mutate without drop ability
+        return;
+    }
+}
+// check: WRITEREF_WITHOUT_DROP_ABILITY
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.exp
new file mode 100644
index 000000000..ca80c7b64
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.mvir
new file mode 100644
index 000000000..833493d5c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/assign_wrong_type.mvir
@@ -0,0 +1,11 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = false; // invalid assignment
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.exp
new file mode 100644
index 000000000..d33c358b3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: BOOLEAN_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.mvir
new file mode 100644
index 000000000..374704b06
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/boolean_not_non_boolean.mvir
@@ -0,0 +1,12 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: bool;
+label b0:
+    x = !0;
+    return;
+}
+
+}
+// check: BOOLEAN_OP_TYPE_MISMATCH_ERROR
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.exp
new file mode 100644
index 000000000..22c3e9e7d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Token'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [(FunctionDefinition, 4)],
+    offsets: [(FunctionDefinitionIndex(4), 13)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.mvir
new file mode 100644
index 000000000..191086b1e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/cant_deref_resource.mvir
@@ -0,0 +1,42 @@
+//# publish
+module 0x1.Token {
+    import 0x1.signer;
+
+    struct T has key {v: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public value(this: &Self.T): u64 {
+        let vref: &u64;
+        let res: u64;
+    label b0:
+        vref = &move(this).T::v;
+        // T does not have copy
+        res = *move(vref);
+        return move(res);
+    }
+
+    public publish(account: &signer, t: Self.T) {
+    label b0:
+        abort(0);
+    }
+
+    fake(addr: address): &mut Self.T { label b0: abort(0); }
+
+    public test(account: &signer) {
+        let addr: address;
+        let t: Self.T;
+        let tref: &mut Self.T;
+        let y: Self.T;
+    label b0:
+        addr = signer.address_of(copy(account));
+        t = Self.new(0);
+        Self.publish(copy(account), move(t));
+        tref = Self.fake(move(addr));
+        y = *move(tref);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp
new file mode 100644
index 000000000..370ebe467
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp
@@ -0,0 +1,163 @@
+processed 18 tasks
+
+task 0 'run'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 31-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 41-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 5 'run'. lines 51-60:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 62-71:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 72-81:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 82-91:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 92-101:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 102-111:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 112-121:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'publish'. lines 123-131:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 13 'publish'. lines 133-141:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'publish'. lines 143-151:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'publish'. lines 153-161:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'publish'. lines 163-171:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 17 'publish'. lines 173-181:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir
new file mode 100644
index 000000000..cfd0b7af4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir
@@ -0,0 +1,181 @@
+//# run
+module 0x42.m {
+// tests bad casts/integer conversions
+entry foo() {
+label b0:
+    _ = to_u8(true);
+    return;
+}
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(true);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u128(true);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(true);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(true);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u256(true);
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(0x0);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(0x0);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u128(0x0);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(0x0);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(0x0);
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = to_u256(0x0);
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    f() {
+    label b0:
+        _ = to_u8(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    g() {
+    label b0:
+        _ = to_u64(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    h() {
+    label b0:
+        _ = to_u128(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    f() {
+    label b0:
+        _ = to_u16(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    g() {
+    label b0:
+        _ = to_u32(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    h() {
+    label b0:
+        _ = to_u256(S { x: true });
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.exp
new file mode 100644
index 000000000..125e602b1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: READREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.mvir
new file mode 100644
index 000000000..307b9e532
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_non_reference.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    y = *move(x); // cannot deref a u64
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.exp
new file mode 100644
index 000000000..de9a2c908
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: BOOLEAN_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.mvir
new file mode 100644
index 000000000..2a779a054
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/deref_not_reference_bad.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    y = *!move(x); // cannot deref a bool
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.exp
new file mode 100644
index 000000000..4649cb71e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.exp
@@ -0,0 +1,4 @@
+processed 2 tasks
+
+task 1 'run'. lines 22-35:
+Error: Unbound module alias Diem
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.mvir
new file mode 100644
index 000000000..c4c8ab201
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/destroy_resource_holder.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x42.A {
+
+    struct Coin has store { value: u64 }
+    struct A { c: Self.Coin }
+
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+
+    public destroy_a(a: Self.A) {
+    label b0:
+        A {} = move(a);
+        Self.destroy_zero();
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.A;
+
+entry foo() {
+    let zero_resource: Diem.Diem<XUS.XUS>;
+    let s: A.A;
+label b0:
+    zero_resource = Diem.zero<XUS.XUS>();
+    s = A.new(move(zero_resource));
+    A.destroy_a(move(s));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.exp
new file mode 100644
index 000000000..aba1abef1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.mvir
new file mode 100644
index 000000000..232453ec7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_one_ref.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &u64;
+    let no: bool;
+label b0:
+    x = 0;
+    x_ref = &x;
+    no = 0 == move(x_ref); // == type mismatch
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.mvir
new file mode 100644
index 000000000..5aa54e565
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_refs.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x1.Token {
+    struct T has key { b: bool }
+
+    public test() {
+        let t: Self.T;
+        let t_ref: &Self.T;
+        let b: bool;
+    label b0:
+        t = T{ b: true };
+        t_ref = &t;
+        assert(copy(t_ref) == move(t_ref), 42); // == works over refs, even if resources without drop
+        T{ b } = move(t);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Token;
+
+entry foo() {
+label b0:
+    Token.test();
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.exp
new file mode 100644
index 000000000..9f367810c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Token'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.mvir
new file mode 100644
index 000000000..13fa89cfc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/equality_resource_values.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.Token {
+    struct T has key { b: bool }
+
+    public test() {
+        let no: bool;
+    label b0:
+        no = T{ b: true } == T{ b: true }; // == requires drop
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.exp
new file mode 100644
index 000000000..1d655d3f6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: WRITEREF_NO_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 9)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.mvir
new file mode 100644
index 000000000..3851d7a61
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_makes_imm.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &mut u64;
+    let imm_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &mut x;
+    imm_ref = freeze(move(x_ref));
+    // cannot write to an imm ref, even if it is a frozen mut ref
+    *move(imm_ref) = 0;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.exp
new file mode 100644
index 000000000..d8e623b9e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-16:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: FREEZEREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.mvir
new file mode 100644
index 000000000..c842547a9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_on_imm.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let imm_ref: &u64;
+label b0:
+    x = 5;
+    imm_ref = &x;
+    // cannot freeze an imm ref
+    imm_ref = freeze(move(imm_ref));
+    _ = move(imm_ref);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.mvir
new file mode 100644
index 000000000..33dbc09d4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_valid.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &mut u64;
+    let imm_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &mut x;
+    // freeze type checks correctly
+    imm_ref = freeze(move(x_ref));
+    _ = move(imm_ref);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.exp
new file mode 100644
index 000000000..d4c5434f9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.mvir
new file mode 100644
index 000000000..9ffbe66ea
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/freeze_wrong_type.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &mut u64;
+    let imm_ref: &bool;
+label b0:
+    x = 5;
+    x_ref = &mut x;
+    // freeze, correct ref kind, wrong type
+    imm_ref = freeze(move(x_ref));
+    _ = move(imm_ref);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.mvir
new file mode 100644
index 000000000..7e9b9d4d3
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_borrow_field.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x1.M {
+    struct Foo<T>{ x: T }
+
+    baz(x: u64) {
+    label b0:
+        return;
+    }
+
+    bar<T>(x: Self.Foo<u64>) {
+        let y: &mut u64;
+        let z: u64;
+    label b0:
+        y = &mut (&mut x).Foo<u64>::x;
+        _ = move(y);
+        Foo<u64> { x: z } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.exp
new file mode 100644
index 000000000..69762fde1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.mvir
new file mode 100644
index 000000000..32e4aeda9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_call.mvir
@@ -0,0 +1,15 @@
+//# publish
+module 0x1.M {
+    id<T>(x: T): T {
+    label b0:
+        return move(x);
+    }
+
+    foo<T: key>(x: T)  {
+        let y: T;
+    label b0:
+        y = Self.id<T>(move(x));
+        y = copy(y); // type does not have copy
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.mvir
new file mode 100644
index 000000000..574f95be0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_imm_borrow_field.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.M {
+    struct Foo<T>{ x: T }
+
+    baz(x: u64) {
+    label b0:
+        return;
+    }
+
+    bar<T>(x: Self.Foo<u64>) {
+        let ref: &Self.Foo<u64>;
+        let y: &u64;
+        let z: u64;
+    label b0:
+        ref = &x;
+        y = &(&x).Foo<u64>::x;
+        _ = move(ref);
+        _ = move(y);
+        Foo<u64> { x: z } = move(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.mvir
new file mode 100644
index 000000000..d9ef85f77
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_pack.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct Foo<T1, T2> { x: T1, y: T2 }
+
+    foo<T>(x: T): Self.Foo<u64, T> {
+        let f: Self.Foo<u64, T>;
+    label b0:
+        f = Foo<u64, T> { x: 42, y: move(x) };
+        return move(f);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.exp
new file mode 100644
index 000000000..6e22edc07
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.mvir
new file mode 100644
index 000000000..37c45a848
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_struct_non_nominal_resource.mvir
@@ -0,0 +1,12 @@
+//# publish
+module 0x1.M {
+    struct R { b: bool }
+    struct Box<T> { x: T }
+
+    foo(x: Self.Box<Self.R>): Self.Box<Self.R> {
+        let y: Self.Box<Self.R>;
+    label b0:
+        y = copy(x); // type does not have copy
+        return move(y);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.exp
new file mode 100644
index 000000000..1a4232f28
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.mvir
new file mode 100644
index 000000000..0e418042a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_all.mvir
@@ -0,0 +1,9 @@
+//# publish
+module 0x1.M {
+    foo<T>(x: T): T {
+        let y: T;
+    label b0:
+        y = copy(x); // generic does not have copy
+        return move(y);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.exp
new file mode 100644
index 000000000..1a4232f28
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.mvir
new file mode 100644
index 000000000..7442838c9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_type_param_resource.mvir
@@ -0,0 +1,9 @@
+//# publish
+module 0x1.M {
+    foo<T: key>(x: T) {
+        let y: T;
+    label b0:
+        y = copy(x); // generic does not have copy
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.exp
new file mode 100644
index 000000000..59701471c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.mvir
new file mode 100644
index 000000000..61d1cc178
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_abilities_unpack.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x1.M {
+    struct Foo<T> { x: T }
+
+    baz<T>(x: Self.Foo<T>) {
+        let y: T;
+    label b0:
+        Foo<T> { x: y } = move(x);
+        return; // unused type parameter value without drop
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.mvir
new file mode 100644
index 000000000..c3095185b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_call.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.M {
+    struct Foo { f: bool }
+
+    public id<T>(x: T): T {
+    label b0:
+        return move(x);
+    }
+
+    public bar<T1, T2>(x: T1, y: T2) {
+    label b0:
+        abort 0;
+    }
+
+    foo() {
+        let x: Self.Foo;
+    label b0:
+        _ = Self.id<u64>(3);
+        x = Self.id<Self.Foo>(Foo { f: false });
+        Self.bar<Self.Foo, bool>(move(x), false);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.mvir
new file mode 100644
index 000000000..317dbb6e7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow.mvir
@@ -0,0 +1,9 @@
+//# publish
+module 0x1.M {
+    struct X has drop { v: u64 }
+    struct S<T> has drop { f: T }
+    t(s: Self.S<Self.X>): u64 {
+    label b0:
+        return *(&(&(&s).S<Self.X>::f).X::v);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.mvir
new file mode 100644
index 000000000..6e228febb
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_field_borrow_after_call.mvir
@@ -0,0 +1,14 @@
+//# publish
+
+module 0x1.M {
+    struct X has drop { v: u64 }
+    id<T>(x: &T): &T {
+    label b0:
+        return move(x);
+    }
+
+    t(x: Self.X): u64 {
+    label b0:
+        return *(&Self.id<Self.X>(&x).X::v);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.mvir
new file mode 100644
index 000000000..1571fe64b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_function_def.mvir
@@ -0,0 +1,19 @@
+//# publish
+
+// This test checks that for each function definition
+//   1) type parameters have correct kind constraints
+//   2) variables have correct types
+
+module 0x1.M {
+    public id<T>(x: T): T {
+    label b0:
+        return move(x);
+    }
+
+    public foo<T1, T2, T3: key, T4: copy + drop>(x1: T4, x2: T3) {
+        let x3: T2;
+        let x4: T1;
+    label b0:
+        abort 0;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.mvir
new file mode 100644
index 000000000..a49ba03b6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_id_function.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x1.M {
+    public id<T>(x: T): T {
+    label b0:
+        return move(x);
+    }
+}
+
+
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    y = 42;
+    x = M.id<u64>(move(y));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.exp
new file mode 100644
index 000000000..11bd781f9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 21-30:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 32-41:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(1), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.mvir
new file mode 100644
index 000000000..b1bfbf6fe
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_function.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.M {
+    struct R has key { f: bool }
+
+    public foo<T>(x: T) {
+    label b0:
+        abort 0;
+    }
+
+    public bar<T1, T2: key, T3: copy + drop>(x: T3, y: T2, z: T1) {
+    label b0:
+        abort 0;
+    }
+
+    public r(): Self.R {
+    label b0:
+        return R { f: false };
+    }
+}
+
+//# run
+module 0x1.m {
+import 0x1.M;
+
+entry foo() {
+label b0:
+    M.foo<u64>(0);
+    abort 0;
+}
+}
+
+//# run
+module 0x2.m {
+import 0x1.M;
+
+entry foo() {
+label b0:
+    M.bar<u64, M.R, bool>(false, M.r(), 0);
+    abort 0;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.mvir
new file mode 100644
index 000000000..e0c3b495c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_import_struct.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x1.M {
+    struct Foo<T> has key { x: T }
+
+    struct Bar<T1, T2: key, T3: copy + drop> { x: T3, y: T2, z: T1 }
+}
+
+//# run
+module 0x1.m {
+import 0x1.M;
+
+entry foo() {
+    let x: M.Foo<u64>;
+label b0:
+    return;
+}
+}
+
+//# run
+module 0x2.m {
+import 0x1.M;
+
+entry foo() {
+    let x: M.Bar<u64, M.Foo<u64>, bool>;
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.mvir
new file mode 100644
index 000000000..7e91ea293
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_option.mvir
@@ -0,0 +1,39 @@
+//# publish
+
+// example using generics in a few common/interesting/non-trivial ways
+module 0x42.Option {
+    import 0x1.vector;
+
+    struct T<E> has copy, drop, store {
+        v: vector<E>
+    }
+
+    public none<E: store>(): Self.T<E> {
+    label b0:
+        return T<E> { v: vector.empty<E>() };
+    }
+
+    public some<E: store>(e: E): Self.T<E> {
+        let v: vector<E>;
+    label b0:
+        v = vector.empty<E>();
+        vector.push_back<E>(&mut v, move(e));
+        return T<E> { v: move(v) };
+    }
+
+    public unwrap_or<E: copy + drop + store>(x: Self.T<E>, e: E): E {
+        let v: vector<E>;
+    label b0:
+        T<E> { v: v } = move(x);
+        jump_if (vector.is_empty<E>(&v)) b2;
+    label b1:
+        return vector.pop_back<E>(&mut v);
+    label b2:
+        return move(e);
+    }
+
+    public really_none<E: copy + drop + store>(): Self.T<E> {
+    label b0:
+        return Self.unwrap_or<Self.T<E>>(Self.none<Self.T<E>>(), Self.none<E>());
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.mvir
new file mode 100644
index 000000000..7d49fc36f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_pack.mvir
@@ -0,0 +1,24 @@
+//# publish
+module 0x1.M {
+    struct Foo<T> { x: T }
+
+    foo() {
+        let x: Self.Foo<u64>;
+    label b0:
+        x = Foo<u64> { x : 42 }; // valid
+        abort 0;
+    }
+}
+
+//# publish
+module 0x1.N {
+    struct Foo<T1, T2: key> { x: T1, y: T2 }
+    struct Bar has key { f: bool }
+
+    foo() {
+        let x: Self.Foo<u64, Self.Bar>;
+    label b0:
+        x = Foo<u64, Self.Bar> { x : 42, y: Bar { f: false } }; // valid
+        abort 0;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.mvir
new file mode 100644
index 000000000..4c98c1df9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_struct_def.mvir
@@ -0,0 +1,10 @@
+//# publish
+
+// This test checks that for each struct definition
+//   1) type parameters have correct kind constraints
+//   2) fields have correct types
+
+module 0x1.M {
+    struct Foo<T> { x: T }
+    struct Bar<T1, T2, T3: key, T4: copy + drop> { x1: T2, x2: T3, x3: T4, x4: T1 }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.mvir
new file mode 100644
index 000000000..74b746057
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/generic_unpack.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x1.M {
+    struct Foo<T> { x: T }
+
+    foo() {
+        let x: u64;
+    label b0:
+        Foo<u64> { x: x } = Foo<u64> { x: 42 }; // valid
+        return;
+    }
+}
+
+//# publish
+module 0x1.N {
+    struct Foo<T1: copy + drop, T2> { x: T1, y: T2 }
+
+    foo() {
+        let x: u64;
+        let y: bool;
+    label b0:
+        // valid
+        Foo<u64, bool> { x: x, y: y }  = Foo<u64, bool> { x: 42, y: true };
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.exp
new file mode 100644
index 000000000..3a1e5ebb8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.exp
@@ -0,0 +1,1720 @@
+processed 191 tasks
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 15-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 26-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 37-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-57:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 59-68:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 70-79:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 81-90:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 92-101:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 103-112:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 114-123:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 125-134:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'publish'. lines 136-144:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 13 'publish'. lines 146-154:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 14 'publish'. lines 156-168:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 15 'run'. lines 169-178:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 180-189:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 17 'run'. lines 191-200:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 18 'run'. lines 202-211:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 19 'run'. lines 213-222:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 20 'run'. lines 224-233:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 21 'run'. lines 235-244:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 22 'run'. lines 246-255:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 23 'run'. lines 257-266:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 24 'run'. lines 268-277:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 25 'run'. lines 279-288:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 26 'run'. lines 290-299:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 27 'publish'. lines 301-309:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 28 'publish'. lines 311-319:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 29 'publish'. lines 321-333:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 30 'run'. lines 334-343:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 31 'run'. lines 345-354:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 32 'run'. lines 356-365:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 33 'run'. lines 367-376:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 34 'run'. lines 378-387:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 35 'run'. lines 389-398:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 36 'run'. lines 400-409:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 37 'run'. lines 411-420:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 38 'run'. lines 422-431:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 39 'run'. lines 433-442:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 40 'run'. lines 444-453:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 41 'run'. lines 455-464:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 42 'publish'. lines 466-474:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 43 'publish'. lines 476-484:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 44 'publish'. lines 486-498:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 45 'run'. lines 499-508:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 46 'run'. lines 510-519:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 47 'run'. lines 521-530:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 48 'run'. lines 532-541:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 49 'run'. lines 543-552:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 50 'run'. lines 554-563:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 51 'run'. lines 565-574:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 52 'run'. lines 576-585:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 53 'run'. lines 587-596:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 54 'run'. lines 598-607:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 55 'run'. lines 609-618:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 56 'run'. lines 620-629:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 57 'publish'. lines 631-639:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 58 'publish'. lines 641-649:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 59 'publish'. lines 651-663:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 60 'run'. lines 664-673:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 61 'run'. lines 675-684:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 62 'run'. lines 686-695:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 63 'run'. lines 697-706:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 64 'run'. lines 708-717:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 65 'run'. lines 719-728:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 66 'run'. lines 730-739:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 67 'run'. lines 741-750:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 68 'run'. lines 752-761:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 69 'run'. lines 763-772:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 70 'run'. lines 774-783:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 71 'run'. lines 785-794:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 72 'publish'. lines 796-804:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 73 'publish'. lines 806-814:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 74 'publish'. lines 816-828:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 75 'run'. lines 829-838:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 76 'run'. lines 840-849:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 77 'run'. lines 851-860:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 78 'run'. lines 862-871:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 79 'run'. lines 873-882:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 80 'run'. lines 884-893:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 81 'run'. lines 895-904:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 82 'run'. lines 906-915:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 83 'run'. lines 917-926:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 84 'run'. lines 928-937:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 85 'run'. lines 939-948:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 86 'run'. lines 950-959:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 87 'publish'. lines 961-969:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 88 'publish'. lines 971-979:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 89 'publish'. lines 981-993:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 90 'run'. lines 994-1003:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 91 'run'. lines 1005-1014:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 92 'run'. lines 1016-1025:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 93 'run'. lines 1027-1036:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 94 'run'. lines 1038-1047:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 95 'run'. lines 1049-1058:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 96 'run'. lines 1060-1069:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 97 'run'. lines 1071-1080:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 98 'run'. lines 1082-1091:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 99 'run'. lines 1093-1102:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 100 'run'. lines 1104-1113:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 101 'run'. lines 1115-1124:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 102 'publish'. lines 1126-1134:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 103 'publish'. lines 1136-1144:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 104 'publish'. lines 1146-1158:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 105 'run'. lines 1159-1168:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 106 'run'. lines 1170-1179:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 107 'run'. lines 1181-1190:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 108 'run'. lines 1192-1201:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 109 'run'. lines 1203-1212:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 110 'run'. lines 1214-1223:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 111 'run'. lines 1225-1234:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 112 'run'. lines 1236-1245:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 113 'run'. lines 1247-1256:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 114 'run'. lines 1258-1267:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 115 'publish'. lines 1269-1277:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 116 'publish'. lines 1279-1290:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 117 'run'. lines 1291-1300:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 118 'run'. lines 1302-1311:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 119 'run'. lines 1313-1322:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 120 'run'. lines 1324-1333:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 121 'run'. lines 1335-1344:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 122 'run'. lines 1346-1355:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 123 'run'. lines 1357-1366:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 124 'run'. lines 1368-1377:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 125 'run'. lines 1379-1388:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 126 'run'. lines 1390-1399:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 127 'publish'. lines 1401-1409:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 128 'publish'. lines 1411-1423:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: EQUALITY_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 129 'run'. lines 1424-1433:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 130 'run'. lines 1435-1444:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 131 'run'. lines 1446-1455:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 132 'run'. lines 1457-1466:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 133 'run'. lines 1468-1477:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 134 'run'. lines 1479-1488:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 135 'run'. lines 1490-1499:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 136 'run'. lines 1501-1510:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 137 'run'. lines 1512-1521:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 138 'run'. lines 1523-1534:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 139 'run'. lines 1535-1544:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 140 'run'. lines 1546-1555:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 141 'run'. lines 1557-1566:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 142 'run'. lines 1568-1577:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 143 'run'. lines 1579-1588:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 144 'run'. lines 1590-1599:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 145 'run'. lines 1601-1610:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 146 'run'. lines 1612-1621:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 147 'run'. lines 1623-1632:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 148 'run'. lines 1634-1645:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 149 'run'. lines 1646-1655:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 150 'run'. lines 1657-1666:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 151 'run'. lines 1668-1677:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 152 'run'. lines 1679-1688:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 153 'run'. lines 1690-1699:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 154 'run'. lines 1701-1710:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 155 'run'. lines 1712-1721:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 156 'run'. lines 1723-1732:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 157 'run'. lines 1734-1743:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 158 'run'. lines 1745-1756:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 159 'run'. lines 1757-1766:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 160 'run'. lines 1768-1777:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 161 'run'. lines 1779-1788:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 162 'run'. lines 1790-1799:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 163 'run'. lines 1801-1810:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 164 'run'. lines 1812-1821:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 165 'run'. lines 1823-1832:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 166 'run'. lines 1834-1843:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 167 'run'. lines 1845-1854:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 168 'run'. lines 1856-1867:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 169 'run'. lines 1868-1877:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 170 'run'. lines 1879-1888:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 171 'run'. lines 1890-1899:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 172 'run'. lines 1901-1910:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 173 'run'. lines 1912-1921:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 174 'run'. lines 1923-1932:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 175 'run'. lines 1934-1943:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 176 'run'. lines 1945-1954:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 177 'publish'. lines 1956-1964:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 178 'publish'. lines 1966-1974:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 179 'publish'. lines 1976-1988:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 180 'run'. lines 1989-1998:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 181 'run'. lines 2000-2009:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 182 'run'. lines 2011-2020:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 183 'run'. lines 2022-2031:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 184 'run'. lines 2033-2042:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 185 'run'. lines 2044-2053:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 186 'run'. lines 2055-2064:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 187 'run'. lines 2066-2075:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 188 'publish'. lines 2077-2085:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 189 'publish'. lines 2087-2095:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 190 'publish'. lines 2097-2105:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.mvir
new file mode 100644
index 000000000..acd94ba77
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integer_binary_operators_types_mismatch.mvir
@@ -0,0 +1,2105 @@
+//# run
+module 0x42.m {
+
+// tests multiple type mismatches for int operations
+// !!!! generated file, do NOT edit manually !!!!
+
+// operator +
+entry foo() {
+label b0:
+    _ = 0u8 + 0u64;
+    return;
+}
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 + 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 + 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 + 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 + 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 + 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 + true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true + 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true + true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 + 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 + 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 + 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 + (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) + 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) + (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator -
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 - 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 - 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 - 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 - 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 - 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 - 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 - true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true - 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true - true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 - 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 - 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 - 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 - (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) - 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) - (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator *
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 * 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 * 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 * 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 * 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 * 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 * 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 * true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true * 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true * true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 * 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 * 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 * 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 * (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) * 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) * (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator /
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 / 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 / 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 / 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 / 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 / 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 / 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 / true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true / 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true / true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 / 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 / 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 / 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 / (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) / 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) / (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator &
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 & 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 & 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 & 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 & 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 & 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 & 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 & true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true & 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true & true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 & 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 & 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 & 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 & (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) & 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) & (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator |
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 | 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 | 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 | 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 | 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 | 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 | 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 | true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true | 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true | true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 | 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 | 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 | 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 | (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) | 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) | (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator ^
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 ^ 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 ^ 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 ^ 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 ^ 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 ^ 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 ^ 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 ^ true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true ^ 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true ^ true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 ^ 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 ^ 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 ^ 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 ^ (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) ^ 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) ^ (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator ==
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 == 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 == 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 == 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 == 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 == 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 == 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 == true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true == 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 == 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 == 0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 == (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) == 0;
+        return;
+    }
+}
+
+
+// operator !=
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 != 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 != 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 != 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 != 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 != 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 != 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 != true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true != 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 != 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 != 0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 != (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) != 0;
+        return;
+    }
+}
+
+
+
+// operator <
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 < 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 < 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 < 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 < 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 < 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 < 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 < true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true < 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 < 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 < 0;
+    return;
+}
+
+}
+
+// operator >
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 > 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 > 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 > 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 > 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 > 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 > 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 > true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true > 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 > 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 > 0;
+    return;
+}
+
+}
+
+// operator <=
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 <= 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 <= 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 <= 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 <= 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 <= 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 <= 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 <= true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true <= 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 <= 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 <= 0;
+    return;
+}
+
+}
+
+// operator >=
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 >= 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 >= 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 >= 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 >= 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 >= 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 >= 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >= true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true >= 0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >= 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 >= 0;
+    return;
+}
+
+}
+
+// operator <<
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 << true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 << 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 << 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 << 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true << 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true << true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 << 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 << 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 << (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) << 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) << (R { x: true });
+        return;
+    }
+}
+
+
+
+// operator >>
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >> true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >> 0x0;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >> 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0 >> 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true >> 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = true >> true;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 >> 0u8;
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 0x0 >> 0x0;
+    return;
+}
+
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    f() {
+    label b0:
+        _ = 0 >> (R { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    g() {
+    label b0:
+        _ = (R { x: true }) >> 0;
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct R { x: bool }
+    h() {
+    label b0:
+        _ = (R { x: true }) >> (R { x: true });
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.mvir
new file mode 100644
index 000000000..3738c081c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/integers_valid.mvir
@@ -0,0 +1,125 @@
+//# publish
+module 0x42.tu8 {
+test() {
+let x: u8;
+label l0:
+    x = 0u8;
+    x = 100u8;
+    x = 1u8 + 1u8;
+    x = 1u8 - 1u8;
+    x = 1u8 * 1u8;
+    x = 1u8 / 1u8;
+    x = 1u8 % 1u8;
+    x = 1u8 & 1u8;
+    x = 1u8 | 1u8;
+    x = 1u8 ^ 1u8;
+    x = 1u8 << 1u8;
+    x = 1u8 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu16 {
+test() {
+let x: u16;
+label l0:
+  x = 0u16;
+  x = 100u16;
+  x = 1u16 + 1u16;
+  x = 1u16 - 1u16;
+  x = 1u16 * 1u16;
+  x = 1u16 / 1u16;
+  x = 1u16 % 1u16;
+  x = 1u16 & 1u16;
+  x = 1u16 | 1u16;
+  x = 1u16 ^ 1u16;
+  x = 1u16 << 1u8;
+  x = 1u16 >> 1u8;
+  return;
+}
+}
+
+//# publish
+module 0x42.tu32 {
+test() {
+let x: u32;
+label l0:
+    x = 0u32;
+    x = 100u32;
+    x = 1u32 + 1u32;
+    x = 1u32 - 1u32;
+    x = 1u32 * 1u32;
+    x = 1u32 / 1u32;
+    x = 1u32 % 1u32;
+    x = 1u32 & 1u32;
+    x = 1u32 | 1u32;
+    x = 1u32 ^ 1u32;
+    x = 1u32 << 1u8;
+    x = 1u32 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu64 {
+test() {
+let x: u64;
+label l0:
+  x = 0u64;
+  x = 100u64;
+  x = 1u64 + 1u64;
+  x = 1u64 - 1u64;
+  x = 1u64 * 1u64;
+  x = 1u64 / 1u64;
+  x = 1u64 % 1u64;
+  x = 1u64 & 1u64;
+  x = 1u64 | 1u64;
+  x = 1u64 ^ 1u64;
+  x = 1u64 << 1u8;
+  x = 1u64 >> 1u8;
+  return;
+}
+}
+
+//# publish
+module 0x42.tu128 {
+test() {
+let x: u128;
+label l0:
+    x = 0u128;
+    x = 100u128;
+    x = 1u128 + 1u128;
+    x = 1u128 - 1u128;
+    x = 1u128 * 1u128;
+    x = 1u128 / 1u128;
+    x = 1u128 % 1u128;
+    x = 1u128 & 1u128;
+    x = 1u128 | 1u128;
+    x = 1u128 ^ 1u128;
+    x = 1u128 << 1u8;
+    x = 1u128 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu256 {
+test() {
+let x: u256;
+label l0:
+    x = 0u256;
+    x = 100u256;
+    x = 1u256 + 1u256;
+    x = 1u256 - 1u256;
+    x = 1u256 * 1u256;
+    x = 1u256 / 1u256;
+    x = 1u256 % 1u256;
+    x = 1u256 & 1u256;
+    x = 1u256 | 1u256;
+    x = 1u256 ^ 1u256;
+    x = 1u256 << 1u8;
+    x = 1u256 >> 1u8;
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.exp
new file mode 100644
index 000000000..9927b5107
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: WRITEREF_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.mvir
new file mode 100644
index 000000000..e6e954b2c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_field_write.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x42.Test {
+    struct T{fr: bool}
+
+    public new(): Self.T {
+    label b0:
+        return T{fr: false};
+    }
+
+    public no(this: &mut Self.T) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fr;
+        // type mismatch on assignment/mutation
+        *move(x) = 0;
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.exp
new file mode 100644
index 000000000..b1ff69815
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::RTest'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x42::RTest,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.mvir
new file mode 100644
index 000000000..a931053f2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/invalid_resource_write.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x42.RTest {
+    struct Coin has store { value: u64 }
+    struct T { f: Self.Coin }
+
+      public update(t: &mut Self.T, i: Self.Coin) {
+        let x: &mut Self.Coin;
+      label b0:
+        x = &mut move(t).T::f;
+        // cannot assign to ref where type does not have drop
+        *move(x) = move(i);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.exp
new file mode 100644
index 000000000..5e1d9de7a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Token'. Got VMError: {
+    major_status: BORROWFIELD_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Token,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.mvir
new file mode 100644
index 000000000..3a9807281
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_borrow_from_imm_ref.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x42.Token {
+    struct T{value: u64}
+    public new(m: u64): Self.T {
+    label b0:
+        return T{value: copy(m)};
+    }
+    public destroy(t: Self.T) {
+        let value: u64;
+    label b0:
+        T {value} = move(t);
+        return;
+    }
+
+    public bump_value(this: &Self.T) {
+        let val: &mut u64;
+        let x: u64;
+    label b0:
+        // cannot mut borrow imm reff
+        val = &mut move(this).T::value;
+        x = *copy(val) + 1;
+        *move(val) = copy(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.mvir
new file mode 100644
index 000000000..aeee94c83
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_from_get_resource.mvir
@@ -0,0 +1,65 @@
+//# publish
+module 0x42.Token {
+    import 0x1.signer;
+
+    struct T has key {balance: u64}
+
+    public new(balance: u64): Self.T  {
+    label b0:
+        return T{balance: copy(balance)};
+    }
+
+    public value(this: &Self.T): u64 {
+        let b: u64;
+        let b_ref: &u64;
+    label b0:
+        b_ref = &move(this).T::balance;
+        b = *move(b_ref);
+        return move(b);
+    }
+
+    public bump(this: &mut Self.T) {
+        let val: &mut u64;
+        let x: u64;
+    label b0:
+        val = &mut move(this).T::balance;
+        x = *copy(val) + 1;
+        *move(val) = copy(x);
+        return;
+    }
+
+    public publish(account: &signer, t: Self.T) {
+    label b0:
+        abort(0);
+    }
+
+    fake(addr: address): &mut Self.T { label b0: abort(0); }
+
+    public test(account: &signer) {
+        let z: Self.T;
+        let addr1: address;
+        let struct1: &mut Self.T;
+        let imm_struct1: &Self.T;
+        let struct1_original_balance: u64;
+        let struct1_new_balance: u64;
+    label b0:
+        z = Self.new(0);
+        Self.publish(copy(account), move(z));
+
+        addr1 = signer.address_of(move(account));
+        // returns mut reference, test its usage
+        struct1 = Self.fake(copy(addr1));
+
+        imm_struct1 = freeze(copy(struct1));
+        struct1_original_balance = Self.value(move(imm_struct1));
+        assert(move(struct1_original_balance) == 0, 42);
+
+        Self.bump(copy(struct1));
+
+        imm_struct1 = freeze(move(struct1));
+        struct1_new_balance = Self.value(move(imm_struct1));
+        assert(move(struct1_new_balance) == 1, 43);
+
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.exp
new file mode 100644
index 000000000..db9153197
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Token'. Got VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Token,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [(FunctionDefinitionIndex(2), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.mvir
new file mode 100644
index 000000000..615090275
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/mut_call_with_imm_ref.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x42.Token {
+    struct T{value: u64}
+    public new(m: u64): Self.T {
+    label b0:
+        return T{value: copy(m)};
+    }
+    public destroy(t: Self.T) {
+        let value: u64;
+    label b0:
+        T {value} = move(t);
+        return;
+    }
+
+    public read_value(this: &Self.T): u64 {
+        let val: &u64;
+    label b0:
+        val = &copy(this).T::value;
+        // type mismatch, cannot make imm to mut
+        Self.bump_value(move(this));
+        return *move(val);
+    }
+
+    public bump_value(this: &mut Self.T) {
+        let val: &mut u64;
+        let x: u64;
+    label b0:
+        val = &mut move(this).T::value;
+        x = *copy(val) + 1;
+        *move(val) = copy(x);
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp
new file mode 100644
index 000000000..9e70f3442
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.exp
@@ -0,0 +1,46 @@
+processed 6 tasks
+
+task 1 'publish'. lines 10-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'publish'. lines 24-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: POP_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'publish'. lines 38-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'publish'. lines 51-61:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'publish'. lines 63-74:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M9'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M9,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.mvir
new file mode 100644
index 000000000..5e843b4c5
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_bad.mvir
@@ -0,0 +1,74 @@
+//# publish
+
+// This file contains tests checking that type arguments used in phantom position
+// (phantom arguments) are not considered when deriving the abilities for a struct.
+
+module 0x1.M1 {
+    struct NoAbilities { a: bool }
+}
+
+//# publish
+module 0x1.M2 {
+    import 0x1.M1;
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+
+    // `WriteRef` requires drop
+    f(ref: &mut Self.HasDrop<M1.NoAbilities, M1.NoAbilities>) {
+    label b0:
+        *move(ref) = HasDrop<M1.NoAbilities, M1.NoAbilities> { a : true };
+        return;
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    import 0x1.M1;
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+
+    // `Pop` requires drop
+    f() {
+    label b0:
+        _ = HasDrop<M1.NoAbilities, M1.NoAbilities> { a: true };
+        return;
+    }
+ }
+
+//# publish
+ module 0x1.M4 {
+    import 0x1.M1;
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+
+    // Leaving value in local requires drop
+    f(x: Self.HasDrop<M1.NoAbilities, M1.NoAbilities>) {
+    label b0:
+        return;
+    }
+ }
+
+//# publish
+ module 0x1.M5 {
+    import 0x1.M1;
+    struct HasCopy<phantom T1, T2> has copy { a : bool }
+
+    // `CopyLoc` requires copy
+    f(x: Self.HasCopy<M1.NoAbilities, M1.NoAbilities>): Self.HasCopy<M1.NoAbilities, M1.NoAbilities> * Self.HasCopy<M1.NoAbilities, M1.NoAbilities> {
+    label b0:
+        return (copy(x), move(x));
+    }
+ }
+
+//# publish
+module 0x1.M9 {
+    import 0x1.M1;
+
+    struct HasStore<phantom T1, T2> has store { a: bool }
+    struct RequireStore<T: store> { a: bool }
+
+    f(): Self.RequireStore<Self.HasStore<M1.NoAbilities, M1.NoAbilities>> {
+    label b0:
+        return RequireStore<Self.HasStore<M1.NoAbilities, M1.NoAbilities>> { a: true };
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.mvir
new file mode 100644
index 000000000..1a54ba91d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/bytecode_ops_abilities_ok.mvir
@@ -0,0 +1,45 @@
+//# publish
+
+// Test checking that type arguments used in phantom position (phantom arguments)
+// are not considered when deriving the abilities for a struct by checking against
+// abilities required for specific bytecode operatiosn.
+
+module 0x1.M {
+    struct NoAbilities { a: bool }
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a : bool }
+    struct HasStore<phantom T1, T2> has store { a: bool }
+    struct HasKey<phantom T1, T2> has key { a : bool }
+    struct RequireStore<T: store> { a: bool }
+
+    // `WriteRef` requires drop
+    f1(ref: &mut Self.HasDrop<Self.NoAbilities, u64>) {
+    label b0:
+        *move(ref) = HasDrop<Self.NoAbilities, u64> { a: true };
+        return;
+    }
+
+    // `Pop` requires drop
+    f2() {
+    label b0:
+        _ = HasDrop<Self.NoAbilities, u64> { a: true };
+        return;
+    }
+
+    // Leaving value in local requires drop
+    f3(x: Self.HasDrop<Self.NoAbilities, u64>) {
+    label b0:
+        return;
+    }
+
+    // `CopyLoc` requires copy
+    f4(x: Self.HasCopy<Self.NoAbilities, u64>): Self.HasCopy<Self.NoAbilities, u64> * Self.HasCopy<Self.NoAbilities, u64> {
+    label b0:
+        return (copy(x), move(x));
+    }
+
+    f8(): Self.RequireStore<Self.HasStore<Self.NoAbilities, u64>> {
+    label b0:
+        return RequireStore<Self.HasStore<Self.NoAbilities, u64>> { a: true };
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.exp
new file mode 100644
index 000000000..4df09dd1d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.exp
@@ -0,0 +1,37 @@
+processed 6 tasks
+
+task 1 'publish'. lines 7-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FieldDefinition, 0), (StructDefinition, 1)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 17-34:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FieldDefinition, 0), (StructDefinition, 5)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 36-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(Signature, 0), (FunctionDefinition, 1)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 60-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(Signature, 0), (FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.mvir
new file mode 100644
index 000000000..ced372110
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_bad.mvir
@@ -0,0 +1,75 @@
+//# publish
+module 0x1.M1 {
+    struct NoAbilities { a: bool }
+    struct HasAbilities<phantom T1, T2> has drop, copy, store, key { a: bool }
+}
+
+//# publish
+module 0x1.M2 {
+    import 0x1.M1;
+
+    struct S1<T: drop + copy + store + key> { a: bool }
+    struct S2 {
+        a: Self.S1<M1.HasAbilities<M1.NoAbilities, M1.NoAbilities>>,
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    import 0x1.M1;
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a: bool }
+    struct HasStore<phantom T1, T2> has store { a: bool }
+    struct HasKey<phantom T1, T2> has key { a: bool }
+
+    struct S1<T1: drop, T2: copy, T3: store, T4: key> { a: bool }
+    struct S2 {
+        a: Self.S1< Self.HasDrop<M1.NoAbilities, M1.NoAbilities>,
+                    Self.HasCopy<M1.NoAbilities, M1.NoAbilities>,
+                    Self.HasStore<M1.NoAbilities, M1.NoAbilities>,
+                    Self.HasKey<M1.NoAbilities, M1.NoAbilities>
+                  >
+    }
+}
+
+//# publish
+module 0x1.M4 {
+    import 0x1.M1;
+
+    f1<T: drop + copy + store + key>() { label b0: return; }
+    f2() {
+    label b0:
+        Self.f1<M1.HasAbilities<M1.NoAbilities, M1.NoAbilities>>();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.M3Valid {
+    import 0x1.M1;
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a: bool }
+    struct HasStore<phantom T1, T2> has store { a: bool }
+    struct HasKey<phantom T1, T2> has key { a: bool }
+
+}
+
+//# publish
+module 0x1.M5 {
+    import 0x1.M1;
+    import 0x1.M3Valid;
+
+    f1<T1: drop, T2: copy, T3: store, T4: key>() { label b0: return; }
+    f2() {
+    label b0:
+        Self.f1< M3Valid.HasDrop<M1.NoAbilities, M1.NoAbilities>,
+                 M3Valid.HasCopy<M1.NoAbilities, M1.NoAbilities>,
+                 M3Valid.HasStore<M1.NoAbilities, M1.NoAbilities>,
+                 M3Valid.HasKey<M1.NoAbilities, M1.NoAbilities>
+               >();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.mvir
new file mode 100644
index 000000000..c59b6a17d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/constraints_abilities_ok.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.M {
+    struct NoAbilities { a: bool }
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a: bool }
+    struct HasStore<phantom T1, T2> has store { a: bool }
+    struct HasKey<phantom T1, T2> has key { a: bool }
+    struct HasAbilities<phantom T1, T2> has drop, copy, store, key { a: bool }
+
+    struct S1<T: drop + copy + store + key> { a: bool }
+    struct S2 {
+        a: Self.S1<Self.HasAbilities<Self.NoAbilities, u64>>,
+    }
+
+    struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: bool }
+    struct S4 {
+        a: Self.S3< Self.HasDrop<Self.NoAbilities, u64>,
+                    Self.HasCopy<Self.NoAbilities, u64>,
+                    Self.HasStore<Self.NoAbilities, u64>,
+                    Self.HasKey<Self.NoAbilities, u64>
+                  >
+    }
+
+    f1<T: drop + copy + store + key>() { label b0: return; }
+    f2() {
+    label b0:
+        Self.f1<Self.HasAbilities<Self.NoAbilities, u64>>();
+        return;
+    }
+
+    f3<T1: drop, T2: copy, T3: store, T4: key>() { label b0: return; }
+    f4() {
+    label b0:
+        Self.f3< Self.HasDrop<Self.NoAbilities, u64>,
+                 Self.HasCopy<Self.NoAbilities, u64>,
+                 Self.HasStore<Self.NoAbilities, u64>,
+                 Self.HasKey<Self.NoAbilities, u64>
+               >();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.exp
new file mode 100644
index 000000000..43e65b417
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.exp
@@ -0,0 +1,37 @@
+processed 5 tasks
+
+task 1 'publish'. lines 16-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 37-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: FIELD_MISSING_TYPE_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.mvir
new file mode 100644
index 000000000..27420506f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_bad.mvir
@@ -0,0 +1,42 @@
+//# publish
+
+// Negative version of tests in fields_abilities_ok instantiating the non-phantom
+// parameter with a type without the required abilities.
+
+module 0x1.M1 {
+    struct NoAbilities { a: bool }
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a : bool }
+    struct HasStore<phantom T1, T2> has store { a : bool }
+    struct HasKey<phantom T1, T2> has key { a : bool }
+
+}
+
+//# publish
+module 0x1.M2 {
+    import 0x1.M1;
+
+    struct S has drop { a: M1.HasDrop<M1.NoAbilities, M1.NoAbilities> }
+}
+
+//# publish
+module 0x1.M3 {
+    import 0x1.M1;
+
+    struct S has copy { a: M1.HasCopy<M1.NoAbilities, M1.NoAbilities> }
+}
+
+//# publish
+module 0x1.M4 {
+    import 0x1.M1;
+
+    struct S has store { a: M1.HasStore<M1.NoAbilities, M1.NoAbilities> }
+}
+
+//# publish
+module 0x1.M5 {
+    import 0x1.M1;
+
+    struct S has key { a: M1.HasStore<M1.NoAbilities, M1.NoAbilities> }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.mvir
new file mode 100644
index 000000000..f42204d00
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/fields_abilities_ok.mvir
@@ -0,0 +1,18 @@
+//# publish
+
+// This module checks that phantom arguments are not considered by checking against
+// the abilities required for the fields of a struct.
+
+module 0x1.M {
+    struct NoAbilities { a: bool }
+
+    struct HasDrop<phantom T1, T2> has drop { a: bool }
+    struct HasCopy<phantom T1, T2> has copy { a : bool }
+    struct HasStore<phantom T1, T2> has store { a : bool }
+    struct HasKey<phantom T1, T2> has key { a : bool }
+
+    struct S1 has drop { a: Self.HasDrop<Self.NoAbilities, u64> }
+    struct S2 has copy { a: Self.HasCopy<Self.NoAbilities, u64> }
+    struct S3 has store { a: Self.HasStore<Self.NoAbilities, u64> }
+    struct S4 has key { a: Self.HasStore<Self.NoAbilities, u64> }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.exp
new file mode 100644
index 000000000..2dd0de877
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 21-28:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FieldDefinition, 0), (StructDefinition, 1)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 30-39:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FieldDefinition, 0), (StructDefinition, 2)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 41-47:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: INVALID_PHANTOM_TYPE_PARAM_POSITION,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 5 'publish'. lines 49-56:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M6'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x1::M6,
+    indices: [(FieldDefinition, 0), (StructDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.mvir
new file mode 100644
index 000000000..2eeaa025b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_bad.mvir
@@ -0,0 +1,56 @@
+//# publish
+
+// Tests checking incorrect struct declarations using phantom parameters
+// in illegal positions.
+
+module 0x1.M1 {
+    // A phantom parameter cannot be used as the type of a field
+    struct S1<phantom T> {
+        a: T
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    // The parameter of vector is non-phantom and a phantom parameter shouldn't be allowed in that position
+    struct S2<phantom T> {
+        a: vector<T>
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    // A phantom parameter cannot be used as the argument to a non-phantom parameter
+    struct S1<T> { f: bool }
+    struct S2<phantom T> {
+        a: Self.S1<T>
+    }
+}
+
+//# publish
+module 0x1.M4 {
+    // More complicated test where the phantom position violation is inside another
+    // type argument.
+    struct S1<T> { a: T}
+    struct S2<T> { a : T }
+    struct S3<phantom T> {
+        a: Self.S1<Self.S2<T>>
+    }
+}
+
+//# publish
+module 0x1.M5 {
+    // Mixing phantom and non-phantom parameters
+    struct S<T1, phantom T2, T3> {
+        a: T2
+    }
+}
+
+//# publish
+module 0x1.M6 {
+    // Phantom parameters should satisfy constraints
+    struct S1<phantom T: copy> { a: bool }
+    struct S2<phantom T> {
+        a: Self.S1<T>
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.mvir
new file mode 100644
index 000000000..6cf2dd6cc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/phantom_params/struct_definition_ok.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x1.M1 {
+    // Not using a phantom parameter at all is ok.
+    struct S1<phantom T> {
+        a: u64
+    }
+
+    // Phantom parameters can be used in phantom position.
+    struct S2<phantom T> {
+        a: Self.S1<T>,
+        b: vector<Self.S1<T>>
+    }
+
+    // It's ok to not use a non-phantom parameter (backward-compatibility).
+    struct S3<T> {
+        a: u64
+    }
+
+    // Mixing phantom and non-phantom parameters
+    struct S4<phantom T1, T2, phantom T3, T4> {
+        a: T2,
+        b: T4
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    import 0x1.M1;
+
+    // Phantom position across modules
+    struct S<phantom T> {
+        a: M1.S2<M1.S1<T>>
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    // Phantom parameters should be allowed to be declared with constraints.
+
+    struct S1<phantom T: copy> {
+        a: u64
+    }
+
+    struct S2<phantom T: copy + drop + store> {
+        a: Self.S1<T>
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.exp
new file mode 100644
index 000000000..b6ee37c18
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 11-24:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CALL_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.mvir
new file mode 100644
index 000000000..bc557a6e6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_args_subtype.mvir
@@ -0,0 +1,24 @@
+//# publish
+
+module 0x42.Test {
+    public t(fr: &u64) {
+    label b0:
+        _ = move(fr);
+        return;
+     }
+}
+
+//# run
+module 0x42.m {
+
+import 0x42.Test;
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+    // arg type mismatch, no implicit freeze
+    Test.t(&mut x);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.exp
new file mode 100644
index 000000000..b1a59d8fc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.mvir
new file mode 100644
index 000000000..047b267f0
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_subtype.mvir
@@ -0,0 +1,9 @@
+//# publish
+
+module 0x42.Test {
+    public no(r: &mut u64): &u64 {
+    label b0:
+        // return type mismatch, no implicit freeze
+        return move(r);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.exp
new file mode 100644
index 000000000..b1a59d8fc
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-9:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.mvir
new file mode 100644
index 000000000..69db36fe7
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/procedure_return_invalid_type.mvir
@@ -0,0 +1,9 @@
+//# publish
+
+module 0x42.Test {
+    public no(): u64 {
+    label b0:
+        // return type mismatch
+        return false;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.exp
new file mode 100644
index 000000000..4d754d64d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 34-44:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.mvir
new file mode 100644
index 000000000..c4c7b958e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(s: &Self.S<T>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(s: &mut Self.S<T>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged--missing type argument
+    public bad_sig<T>(s: &Self.S) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct Box<T> { t: T }
+    struct S<T: copy> { t: T }
+
+    // should be rejected
+    public bad_sig<T>(v: Self.Box<Self.S<T>>): Self.Box<Self.S<T>> {
+    label b0:
+        return move(v);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.exp
new file mode 100644
index 000000000..6ce6fc50c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 25-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 38-54:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 56-72:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M5,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.mvir
new file mode 100644
index 000000000..0eafaeb05
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/ref_type_param_exploits.mvir
@@ -0,0 +1,72 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // note: T does not have copy
+    // if this worked, it would be very bad because `T` can be (e.g.) a Coin
+    public copy_inner<T>(s: &Self.S<T>): T { // should get flagged w/ constraint not satisfied
+    label b0:
+        return *&move(s).S<T>::t;
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> has copy { t: T }
+
+    // note: T does not have copy
+    // if this worked, it would be very bad because `T` can be (e.g.) a Coin
+    public copy_direct<T>(s: &Self.S<T>): Self.S<T> { // should get flagged w/ constraint not satisfied
+    label b0:
+        return *move(s);
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: store> has store { t: T }
+
+    // note: T does not have store
+    // if this worked, it would be very bad because `T` can be (e.g.) a hot potato
+    public store_inner<T>(s: &mut Self.S<T>, t: T) { // should get flagged w/ constraint not satisfied
+    label b0:
+        *&mut move(s).S<T>::t = move(t);
+        return;
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: &Self.S<T>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): Self.S<u64> {
+    let x: Self.S<u64>;
+    label b0:
+        x = S<u64> { t: 10 };
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
+
+//# publish
+module 0x42.M5 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: &Self.S<T>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(s: signer): Self.S<signer> {
+    let x: Self.S<signer>;
+    label b0:
+        x = S<u64> { t: move(s) };
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.exp
new file mode 100644
index 000000000..f3a7de94e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.mvir
new file mode 100644
index 000000000..69598020b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/release.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x1.M {
+    struct Coin { value: u64 }
+    t(): Self.Coin {
+    label b0:
+        // cannot pop without the drop ability
+        _ = Coin { value: 0 };
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.exp
new file mode 100644
index 000000000..f8cfe0681
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: PACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.mvir
new file mode 100644
index 000000000..4c7aa6e7a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/resource_instantiate_bad_type.mvir
@@ -0,0 +1,14 @@
+//# publish
+
+module 0x42.Test {
+    struct A { b: bool }
+    struct B { b: bool }
+    struct T { ft: Self.B }
+
+    public t1(x: Self.A): Self.T {
+    label b0:
+        // arg type mismatch
+        return T{ft: move(x)};
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.exp
new file mode 100644
index 000000000..63337530d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'publish'. lines 15-27:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: RET_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'publish'. lines 29-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 3 'publish'. lines 42-53:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.mvir
new file mode 100644
index 000000000..e0e97d3a4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/return_type_mismatch_and_unused_resource.mvir
@@ -0,0 +1,53 @@
+//# publish
+module 0x1.M {
+    struct R { flag: bool }
+
+    // Type checking is done before memory safety checks
+    // wrong return type
+    t1(): bool {
+        let c: Self.R;
+    label b0:
+        c = R { flag: false };
+        return 0;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    // Type checking is done before memory safety checks
+    // wrong return type
+    t2(): bool {
+        let u: u64;
+        let r: &u64;
+    label b0:
+        u = 0;
+        r = &u;
+        return move(r);
+    }
+}
+
+//# publish
+module 0x1.M {
+    struct R { flag: bool }
+
+    t1(): u64 {
+        let c: Self.R;
+    label b0:
+        c = R { flag: false };
+        // unused resource
+        return 0;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    t2(): &u64 {
+        let u: u64;
+        let r: &u64;
+    label b0:
+        u = 0;
+        r = &u;
+        // unused resource
+        return move(r);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.exp
new file mode 100644
index 000000000..c1dde036e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-8:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.mvir
new file mode 100644
index 000000000..93ae9b1c8
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc.mvir
@@ -0,0 +1,8 @@
+//# publish
+module 0x42.M {
+    t(s: signer): signer {
+    label b0:
+        // signer does not have copy
+        return copy(s);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.exp
new file mode 100644
index 000000000..0325d662d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.mvir
new file mode 100644
index 000000000..f2f48fc7f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_copy_loc_transitive.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.M {
+    struct S<T> has copy { s: T }
+    t(s: signer): Self.S<signer> {
+        let x: Self.S<signer>;
+    label b0:
+        x = S<signer> { s: move(s) };
+        // error signer does not have copy
+        return copy(x);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.exp
new file mode 100644
index 000000000..4f4e59805
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(Signature, 0), (FunctionDefinition, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.mvir
new file mode 100644
index 000000000..1678cb52e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_does_not_have_store.mvir
@@ -0,0 +1,15 @@
+//# publish
+module 0x42.M {
+    struct S<T> {
+        f: T,
+    }
+
+    needs_store<T: store>() { label b0: return; }
+
+    t(account: &signer, s: signer) {
+    label b0:
+        // error signer does not have store
+        Self.needs_store<Self.S<signer>>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.mvir
new file mode 100644
index 000000000..e48ec999f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_equality.mvir
@@ -0,0 +1,11 @@
+//# run --signers 0x1
+module 0x42.m {
+
+entry foo(s: signer) {
+label b0:
+    assert(&s == &s, 42);
+    assert(!(&s != &s), 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.exp
new file mode 100644
index 000000000..8bad38762
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-8:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.mvir
new file mode 100644
index 000000000..3a39e5f4b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref.mvir
@@ -0,0 +1,8 @@
+//# publish
+module 0x42.M {
+    t(s: &signer): signer {
+    label b0:
+        // cannot copy signer
+        return *copy(s);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.exp
new file mode 100644
index 000000000..91e9dd2f2
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'publish'. lines 13-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.mvir
new file mode 100644
index 000000000..6b65dc8d6
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_read_ref_transitive.mvir
@@ -0,0 +1,23 @@
+//# publish
+module 0x42.M {
+    struct S<T> { s: T }
+    t(s: signer): Self.S<signer> {
+        let x: Self.S<signer>;
+    label b0:
+        x = S<signer> { s: move(s) };
+        // cannot copy signer
+        return *&x;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S<T> { s: T }
+    t(s: signer): signer {
+        let x: Self.S<signer>;
+    label b0:
+        x = S<signer> { s: move(s) };
+        // cannot copy signer
+        return *(&(&x).S<signer>::s);
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.mvir
new file mode 100644
index 000000000..33bfd0c22
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_st_loc.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.M {
+    t(s1: signer, s2: signer) {
+    label b0:
+        s1 = move(s2);
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.mvir
new file mode 100644
index 000000000..b2eb9336e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_transitive.mvir
@@ -0,0 +1,16 @@
+//# publish
+module 0x42.M {
+    struct S<T> has drop {
+        f: T,
+    }
+
+    t(s: signer) {
+        let x: Self.S<signer>;
+    label b0:
+        x = S<signer> { f: move(s) };
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.mvir
new file mode 100644
index 000000000..bd9d88548
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/signer_write_ref.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.M {
+    t(sref: &mut signer, s: signer) {
+    label b0:
+        *copy(sref) = move(s);
+        return;
+    }
+}
+
+// Used to be invalid
+// Now valid because signer has drop
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.exp
new file mode 100644
index 000000000..65b2121ae
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-12:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M1'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x1::M1,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'publish'. lines 14-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x1::M2,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'publish'. lines 27-37:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
+    major_status: READREF_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M3,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'publish'. lines 39-50:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M4'. Got VMError: {
+    major_status: WRITEREF_WITHOUT_DROP_ABILITY,
+    sub_status: None,
+    location: 0x1::M4,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'publish'. lines 52-62:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M5'. Got VMError: {
+    major_status: COPYLOC_WITHOUT_COPY_ABILITY,
+    sub_status: None,
+    location: 0x1::M5,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.mvir
new file mode 100644
index 000000000..dbcbbe7cf
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/struct_kind_inference.mvir
@@ -0,0 +1,62 @@
+//# publish
+// ensure that generic structs instantiated with struct types behave like resources
+module 0x1.M1 {
+    struct MyResource { b: bool }
+    struct S<T> { t: T }
+
+    // verifer should reject; didn't move resource;
+    public p(s: Self.S<Self.MyResource>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x1.M2 {
+    struct MyResource { b: bool }
+    struct S<T> { t: T }
+
+    // verifier should reject; drops s2 on the floor
+    public p(s1: Self.S<Self.MyResource>, s2: Self.S<Self.MyResource>): Self.S<Self.MyResource> {
+    label b0:
+        s1 = move(s2);
+        return move(s1);
+    }
+}
+
+//# publish
+module 0x1.M3 {
+    struct MyResource { b: bool }
+    struct S<T> { t: T }
+
+    // verifier should reject; copies s
+    public p(s: &Self.S<Self.MyResource>): Self.S<Self.MyResource> {
+    label b0:
+        return *move(s);
+    }
+}
+
+//# publish
+module 0x1.M4 {
+    struct MyResource { b: bool }
+    struct S<T> { t: T }
+
+    // verifier should reject; drops s1 on the floor
+    public p(s1: &mut Self.S<Self.MyResource>, s2: Self.S<Self.MyResource>) {
+    label b0:
+        *move(s1) = move(s2);
+        return;
+    }
+}
+
+//# publish
+module 0x1.M5 {
+    struct MyResource { b: bool }
+    struct S<T> { t: T }
+
+    // verifier should reject; copies s
+    public p(s: Self.S<Self.MyResource>): Self.S<Self.MyResource> * Self.S<Self.MyResource> {
+    label b0:
+        return (copy(s), move(s));
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.exp
new file mode 100644
index 000000000..f06938b6a
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.mvir
new file mode 100644
index 000000000..d38188b4f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/type_error_after_branch.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+
+
+entry foo(b: bool) {
+  let x: u64;
+label b0:
+  jump_if (move(b)) b2;
+label b1:
+  x = 3;
+  jump b3;
+label b2:
+  x = 2;
+label b3:
+  x = true; // type error here
+  return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.mvir
new file mode 100644
index 000000000..552d9d15e
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_resource.mvir
@@ -0,0 +1,51 @@
+//# publish
+module 0x1.Test {
+    struct X { b: bool }
+    struct T { i: u64, x: Self.X, b: bool }
+
+    public new_x(): Self.X {
+    label b0:
+        return X { b: true };
+    }
+
+    public new_t(x: Self.X): Self.T {
+    label b0:
+        return T { i: 0, x: move(x), b: false };
+    }
+
+    public destroy_x(x: Self.X) {
+        let b: bool;
+    label b0:
+        X { b } = move(x);
+        return;
+    }
+
+    // can unpack a resource and return it
+    public destroy_t(t: Self.T): u64 * Self.X * bool {
+        let i: u64;
+        let x: Self.X;
+        let flag: bool;
+    label b0:
+        T { i, x, b: flag } = move(t);
+        return move(i), move(x), move(flag);
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let x: Test.X;
+    let i: u64;
+    let t: Test.T;
+    let b: bool;
+label b0:
+    x = Test.new_x();
+    t = Test.new_t(move(x));
+    i, x, b = Test.destroy_t(move(t));
+    Test.destroy_x(move(x));
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.exp
new file mode 100644
index 000000000..776bf6054
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-19:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::Test'. Got VMError: {
+    major_status: UNPACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x1::Test,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.mvir
new file mode 100644
index 000000000..7f64ff169
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unpack_wrong_type.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x1.Test {
+    struct X { b: bool }
+    struct T { b: bool }
+
+    public new_t(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    public destroy_t(t: Self.T) {
+        let b: bool;
+    label b0:
+        // wrong struct in unpack
+        X { b } = move(t);
+        return;
+    }
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.mvir
new file mode 100644
index 000000000..0cd8850fe
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x42.Test {
+    struct T has drop {fint: u64, fv: bool}
+
+    public t1(fint: u64, fv: bool): Self.T {
+    label b0:
+        return T{fint: move(fint), fv: move(fv)};
+    }
+
+    public t2(fint: u64): Self.T {
+    label b0:
+        return T{fint:  move(fint), fv: false};
+    }
+}
+
+//# run
+
+module 0x42.m {
+import 0x42.Test;
+
+entry foo() {
+    let t1: Test.T;
+    let t2: Test.T;
+label b0:
+    t1 = Test.t1(0, false);
+    t2 = Test.t2(0);
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.exp
new file mode 100644
index 000000000..6603cc326
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Test'. Got VMError: {
+    major_status: PACK_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::Test,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.mvir
new file mode 100644
index 000000000..9e987f11c
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unrestricted_instantiate_bad_type.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x42.Test {
+    struct T{fint: u64}
+
+    public t1(): Self.T {
+    label b0:
+        // arg type mismatch
+        return T{fint: false};
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.exp
new file mode 100644
index 000000000..df341dbc4
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 18-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.mvir
new file mode 100644
index 000000000..594869d25
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/unused_resource_holder.mvir
@@ -0,0 +1,33 @@
+//# publish
+
+module 0x42.A {
+    struct Coin has store { value: u64 }
+    struct T { g: Self.Coin }
+
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public new(g: Self.Coin): Self.T {
+    label b0:
+        return T {g: move(g)};
+    }
+
+}
+
+//# run
+module 0x42.m {
+
+import 0x42.A;
+
+entry foo() {
+    let zero_resource: A.Coin;
+    let s: A.T;
+label b0:
+    zero_resource = A.zero();
+    // unused resources
+    s = A.new(move(zero_resource));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp
new file mode 100644
index 000000000..d2d0379f1
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp
@@ -0,0 +1,73 @@
+processed 8 tasks
+
+task 0 'run'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 1 'run'. lines 12-25:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'run'. lines 26-41:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 3 'run'. lines 42-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
+
+task 4 'run'. lines 59-75:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
+
+task 5 'run'. lines 76-95:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 6 'run'. lines 96-107:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 108-121:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir
new file mode 100644
index 000000000..871f9cf18
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir
@@ -0,0 +1,121 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+label b0:
+    v = vec_pack_0<bool>();
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let v_mut: &mut vector<bool>;
+label b0:
+    v = vec_pack_0<u8>();
+    v_mut = &mut v;
+
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let v_imm: &vector<u8>;
+    let v_len: u8;
+label b0:
+    v = vec_pack_0<u8>();
+    v_imm = &v;
+    v_len = vec_len<u8>(move(v_imm));
+
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let v_mut: &mut vector<u8>;
+    let e: u64;
+label b0:
+    e = 0;
+    v = vec_pack_0<u8>();
+    v_mut = &mut v;
+    vec_push_back<u8>(move(v_mut), move(e));
+
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let v_mut: &mut vector<u8>;
+    let e: u64;
+label b0:
+    v = vec_pack_0<u8>();
+    v_mut = &mut v;
+    vec_push_back<u8>(copy(v_mut), 0);
+
+    e = vec_pop_back<u8>(move(v_mut));
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let v_mut: &mut vector<u8>;
+    let i1: u8;
+    let i2: u128;
+label b0:
+    i1 = 0;
+    i2 = 1;
+    v = vec_pack_0<u8>();
+    v_mut = &mut v;
+    vec_swap<u8>(move(v_mut), move(i1), move(i2));
+
+    return;
+}
+
+}
+// push int on the stack, then try to pack into vector of the wrong type
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    v = vec_pack_1<bool>(28u8);
+    return;
+}
+
+}
+// create vector<T>, try to unpack into different type
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+    let x: bool;
+    let y: bool;
+label b0:
+    v = vec_pack_2<u8>(1u8, 0u8);
+    x, y = vec_unpack_2<bool>(move(v));
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.exp
new file mode 100644
index 000000000..f17f2c02b
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'run'. lines 1-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 1 'run'. lines 15-29:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 31-42:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 3 'run'. lines 44-56:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.mvir
new file mode 100644
index 000000000..ff593222d
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_pack_mismatch.mvir
@@ -0,0 +1,56 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    (1);                // 0
+    vec_pack_1<bool>(); // 1
+    v = ();             // 2
+    return;             // 3
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    (0);                // 0
+    (false);            // 1
+    vec_pack_2<bool>(); // 2
+    v = ();             // 3
+    return;             // 4
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u8>;
+label b0:
+    (1u8, false, 2u8);
+    v = vec_pack_3<u8>();
+    return;
+}
+
+}
+
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<bool>;
+label b0:
+    (false, 0, 0, 0);
+    v = vec_pack_3<bool>();
+    _ = ();
+    return;
+}
+
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.exp
new file mode 100644
index 000000000..1417dd426
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.mvir
new file mode 100644
index 000000000..4568022f9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: vector<Self.S<T>>): vector<Self.S<T>> {
+    label b0:
+        return move(v);
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: &vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: &mut vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.exp b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.exp
new file mode 100644
index 000000000..394bd4191
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 24-40:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 42-58:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.mvir b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.mvir
new file mode 100644
index 000000000..85de858a9
--- /dev/null
+++ b/vendors/move/crates/bytecode-verifier-transactional-tests/tests/type_safety/vector_type_param_exploits.mvir
@@ -0,0 +1,58 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy + drop> has copy, drop { t: T }
+
+    // it would be bad if this worked because T could be (e.g.) a coin
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: vector<Self.S<T>>): vector<Self.S<T>> {
+    label b0:
+        return copy(v);
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: drop> has drop { t: T }
+
+    // it would be bad if this worked because T could be (e.g.) a hot potato
+    public bad_sig<T>(v: vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: vector<Self.S<T>>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): vector<Self.S<u64>> {
+    let x: vector<Self.S<u64>>;
+    label b0:
+        x = vec_pack_0<Self.S<u64>>();
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: vector<Self.S<T>>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): vector<Self.S<signer>> {
+    let x: vector<Self.S<signer>>;
+    label b0:
+        x = vec_pack_0<Self.S<signer>>();
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
diff --git a/vendors/move/crates/changes/1-friend-visibility.md b/vendors/move/crates/changes/1-friend-visibility.md
new file mode 100644
index 000000000..4ce2dfa3e
--- /dev/null
+++ b/vendors/move/crates/changes/1-friend-visibility.md
@@ -0,0 +1,195 @@
+# Friend Visibility
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Friend visibility is a new feature in Move version 1.2 to give more control about where a function can be used. Previously a function had either public or private visibility, where a public function is accessible anywhere but a private function can be called only from within the module where it is defined. Friend-visible functions can be called only from explicitly allowed modules.
+
+## Motivations
+
+### Overly Permissive Function Visibility Model
+
+The simple public/private visibility scheme required using public visibility for “limited-access” functions, i.e., functions that:
+
+* are designed to have limited access by a known and specific set of modules only (i.e., an allowlist), and
+* should not be accessed by any other modules outside this specific allowlist.
+
+Take all the `initialize` functions in the Diem framework as an example. In theory, the `initialize` functions should only be used by the `Genesis` module and never be exposed to any other modules nor scripts. However, due to the limitation in the current visibility model, these `initialize` functions have to be made `public` (in order for the `Genesis` module to call them) and both runtime capability checks and static verification are enforced to make sure that these functions will abort if not called from a genesis state.
+
+### Inflexibility in Future Module Updates
+
+Public functions have very restricted updating rules: a public function can never be deleted or renamed, and its function signature can never be altered. The rationale behind this restriction is that a public function is a contract made to the whole world and once the contract is made, the API should not be easily altered, as altering the API might break code that tries to invoke the public function. The owner of the public function has no control on who can invoke the function. In fact, knowing all the call sites requires a global scan of all code published in storage, which is not always possible nor scalable in a blockchain network with an open-publishing model.
+
+In contrast, a friend function is only a contract made to the friends of a module, and furthermore, the module owner controls the membership of the friend list. That is, the module owner has complete knowledge of which modules may access a friend function. As a result, it is much easier to update a friend function because only the modules in the friend list needs to be coordinated for the change. This is especially true when a friend function and all its friend modules are maintained by the same owner.
+
+### Simplification Opportunities for Specification and Verification
+
+Friend visibility can help simplify specification writing and verification with the Move prover. For example, given a friend function and its host module’s friend list, we can easily and exhaustively find all callsites of the friend function. With this information, we could, as an option, completely skip the specification of a friend function and inline the implementation into the caller. This may lead to further simplification in the verification techniques and allows stronger properties to be proved. In contrast, for a public function, it is necessary to write complete and accurate specifications for the function.
+
+## Description
+
+Friend visibility expands the set of possible visibility levels:
+
+* private (no modifier)
+* `public(friend)`
+* `public(script)`, and
+* `public`.
+
+These respectively correspond to `Private`, `Friend`, `Script`, and `Public` in the Move bytecode file format. Script visibility addresses an orthogonal problem in the Diem Framework and more details can be found in the [Script Visibility](2-script-visibility.md) change description.
+
+Beside the new `public(friend)` modifier, each module is allowed to have a friend list, specifiable as zero or more
+`friend <address::name>` statements that list the modules trusted by the host module. Modules in the friend list are permitted to call a `public(friend)` function defined in the host module, but a non-friend module is prohibited from accessing a `public(friend)` function.
+
+### New Visibility Modifier
+
+`public(friend)` is a new visibility modifier that can be applied to any function definition in a module. A `public(friend)` function can be invoked by any other functions in the same module (say module `M`), or any function defined in one of the modules in the friend list of module `M`.
+
+Besides this visibility rule, `public(friend)` functions follow the same rules as any other module function, meaning they can invoke other functions in the same module (except `public(script)` functions), create new struct instances, access the global storage (of types declared in that module), etc.
+
+### Friend List Declarations
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+* `friend <address::name>` — friend declaration using fully qualified  module name
+* `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+
+A module may have multiple friend declarations, and the union of all the friend modules is recorded in the friend list, which is a new section in the bytecode file format. For readability, friend declarations should generally be placed near the beginning of the module definition. Note that Move scripts cannot declare friend modules as the concept of friend functions does not even exist in scripts.
+
+Friend declarations are subject to the following rules:
+
+* A module cannot declare itself as a friend.
+    * e.g., `0x2::M` cannot declare `0x2::M` as a friend.
+* Friend modules must be within the same account address.
+    * e.g., `0x2::M` cannot declare `0x3::N` as a friend.
+    * Note: this is not a technical requirement but rather a policy decision which may be relaxed later.
+* Friends relationships cannot create cyclic module dependencies.
+    * Cycles are not allowed in the friend relationships. E.g., `0x2::A` friends `0x2::B` friends `0x2::C` friends `0x2::A` is not allowed.
+    * More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module). If that friend module is already used, either directly or transitively, a cycle of dependencies would be created. E.g., a cycle would be created if `0x2::A` friends `0x2::B` and `0x2::A` also calls a function `0x2::B::foo().`
+* Friends must exist when the module is published.
+    * e.g., `0x2::M` cannot declare `0x2::X` as a friend if `0x2::X` cannot be resolved by the loader.
+* The friend list for a module cannot contain duplicates.
+
+## Examples
+
+A typical module with `public(friend)` functions and its friend modules is shown in the following example:
+
+```
+address 0x2 {
+  module A {
+    // friend declaration via fully qualified module name
+    friend 0x2::B;
+
+    // friend declaration via module alias
+    use 0x2::C;
+    friend C;
+
+    public(friend) fun foo() {
+      // a friend function can call other non-script functions in the same module
+      i_am_private();
+      i_am_public();
+      bar();
+    }
+    public(friend) fun bar() {}
+
+    fun i_am_private() {
+      // other functions in the same module can also call friend functions
+      bar();
+    }
+    public fun i_am_public() {
+      // other functions in the same module can also call friend functions
+      bar();
+    }
+  }
+
+  module B {
+    use 0x2::A;
+
+    public fun foo() {
+      // as a friend of 0x2::A, functions in B can call friend functions in A
+      A::foo();
+    }
+
+    public fun bar() {
+      0x2::A::bar();
+    }
+  }
+}
+```
+
+## Alternatives
+
+### Granularity of the Friend List
+
+* Module-to-Module (adopted)
+    * Module `B` is a friend of module `A` — any function in module `B` can access any friend function in module `A`
+    * Modules have been the trust boundary in Move language, as evidenced by:
+        * the existing visibility model where public and private are defined with regard to the hosting module of a particular function;
+        * the design of Struct / Resource type where only the module that defines the Struct / Resource may access the internals of the type.
+    * Therefore, it is more natural for modules to be the trust boundary of friend function accesses as well.
+    * Another reason is that it resonates with the granularity of the friend feature found in other languages (e.g., C++).
+* Module-to-Function
+    * Module `B` is a friend of function `foo()` — any function in module `B` can call the friend function `foo()`
+    * This is a more fine-grained version of Module-to-Module friendship declaration and is also found in other languages (e.g., C++ also supports Module-to-Function friendship). The reasons we did not choose this option are mostly 1) it breaks the mental model that modules are the boundaries in Move, and 2) it may lead to the case where a module (e.g., module `A`) is a friend of every friend function and `friend A` needs to be specified repeatedly for each friend function.
+* Function-to-Module
+    * Function `foo()` is a friend of module `A` — function `foo()` can call any friend function in module `A`
+    * The reason this option is not chosen is because it seems weird to express, as a developer, that we trust function `0x3::B::foo()` but not function `0x3::B::bar()`, especially given that both `bar()` and `foo()` reside in the same module by `0x3::B`. We could not contemplate a valid use case for this scenario.
+* Function-to-Function
+    * Function `foo()` is a friend of function `bar()` — function `foo()` can call friend function `bar()`
+    * Besides the reason that it feels weird trusting one function in a module but not another (similar to the Function-to-Module option), we feel that this scheme is too fine-grained and would cause inflexibility in development, especially on function name updates. To illustrate, suppose `foo()` is a private function in module `B`, and `bar()` is a friend function in module `A`. This scheme requires that when the private function `foo` is renamed, something in module A needs to be updated as well! Function `foo()` is no longer “private” to module `B` under this scheme.
+
+### Location of Friend Declarations
+
+* Callee-side declaration (adopted)
+    * The code owner who develops the module is responsible for specifying who can be a friend of this module at the time of writing the source code. If later the developers want to add / remove new friends, they can always update the friend list and re-publish the module on-chain (subject to updatability and compatibility checking).
+    * This is the most natural way of defining the friend list, since the friend list is embedded the same source file as the module source code. Compared with the alternative — caller-side declaration — it is cognitively easier for developers to figure out who may interact with the friend functions and how the friend functions should be hardened by looking within the same file.
+* Caller-side declaration
+    * An alternative thinking is to have the user of a friend function to “request” friendship permission, instead of having the owner of the friend function to “grant” friendship. To illustrate, if module `B` wants to access some friend functions in module `A`, then, the friendship with module `A` will be declared in the source code of module `B` (while the callee-side declaration requires that the friendship is declared in the source code of module `A`).
+    * A major drawback in this alternative is that the code owner does not have a list of friend relationships if the developers do not actively maintain one. For friend relationships, the source of truth is likely to be stored on-chain either via 1) a VM-updatable section in on-chain module bytecode, or 2) a new `FriendList` entity in users’ accounts. More importantly, by looking at the source code of a module, the developers have no clue who can access the friend function and how the interaction may happen.
+
+### Publishing Order
+
+Cross-module references complicate the process for publishing those modules. The issue can be illustrated in the following:
+
+```
+address 0x2 {
+  module M {
+    friend 0x2::N;
+    public(friend) fun foo() {}
+  }
+  module N {
+    use 0x2::M;
+    fun bar() { M::foo(); }
+  }
+}
+```
+
+Suppose we define two modules `M` and `N` like the above:
+
+* Module `N` depends on `M` because `N` contains `use 0x2::M`
+* But, at the same time, module `M` refers to `N` because `M` specifies `friend 0x2::N`
+
+Now think about how we should publish them on-chain....
+
+* With the current one-module-at-a-time publishing model:
+    * Obviously module `M` has to be published first. Otherwise, publishing module `N` first will make `N::bar()` fail miserably, while publishing `M` first should have no bad effects because no one can call `M::foo()` anyway.
+    * But, when publishing `M`, the bytecode verifier sees the visibility constraint, and it is a pointer to a nonexistent function `N::bar()`. The bytecode verifier will *not* try to resolve this function handle. It *must* tolerate that this visibility constraint is a forward declaration.
+    * A risk associated with the above procedure is the possibility of a race condition when publishing module `N`. Suppose both Alice and Eve can publish to `0x2`. When `M` is published, both Alice and Eve see that `M` declares `N` as a friend. Eve may race against Alice to publish module `N` first, with a bad `bar()` function, to exploit the trust the developer of module `M` placed on Alice.
+    * A solution to this problem is enforcing a safer but more convoluted module publication flow that still uses the one-module-at-a-time publishing model. For the example above, the flow would require three steps:
+        * publish an empty module `N` as a place holder
+        * publish module `M`
+        * publish the updated module `N` that uses the friend function `M`
+* With a future multi-signer, multi-module publication model:
+    * To avoid a convoluted module publishing flow, another solution is to use a multi-signer + multi-module publication model that allows a bundle of modules to be published / updated atomically, even if these modules reside in different user accounts. In the above case, if we could publish `M` and `N` atomically in one transaction, there would be no risk of a race condition and there is no need to go through the three-step module publishing flow.
+
+### Other Schemes for “Shared” Visibility
+
+* Address visibility
+    * Java uses a “package” concept that maps to a given location (namespace) which could roughly be thought of as an address (the address the modules are published under). Addresses in Move could serve the role of “package” in Java. With that approach, we could do something like `public(address)` — or just `internal` — that would allow for cross module visibility, but just under that address. The owner of that address would control all publishing into that address. This kind of visibility would be easy to enforce by a verifier given the address constraints. That is, the target function when linking would have to be in a module published under the same address.
+    * The problem with this model is that we have no way to control subsequent publishing into that address, which could violate the principle in Move that all bindings are known when one publishes and they cannot be altered. If publishing under the same address gave someone access to the internal state of other modules it would be possible to read and alter state that was originally intended to be private to a group of modules.
+* Package visibility
+    * This is the the .NET CLR model of “internal” visibility, i.e., things that get compiled together can access each other's internal state based merely on the fact that they are compiled together. In Move, “compiled together” really means published together, so a bundle would require a change in publishing (and the module publish transaction) that would have to accept a list of modules rather than a single one. That would give the verifier a chance to control access across modules. That is, cross module calls towards internal visibility would be allowed if the modules are in the same publish unit (bundle).
+    * However, without some extra information to identify the modules in a bundle, this approach implies that visibility/accessibility cannot be verified after publishing (e.g., while loading). The VM would have to assume that every internal access is good because it has no way to verify it after the publishing time.
+    * Versioning or upgrades could create problems with this model too, if a version would leave behind some modules that would keep visibility permission but were not intended to. That is something to analyze in more detail and it may or may not be a problem. Essentially the problem is whether verification at publishing time is enough to ensure correctness. It may be argued that the VM knowing the module bundle before and after could be enough to build the dependency graph before and after, and to report errors if any permission inconsistency is detected.
+    * Alternatively, modules could declare the “bundle” to which they belong. The binary format could have an entry for the set of modules published together, and those would define the scope when checking internal visibility/accessibility. The bundle would still be published together but then the bytecode verifier would have knowledge of which modules to take into account when verifying internal access.
+    * Friend visibility for selected modules fundamentally provides more fine grained access control than package visibility with bundles of modules. And, since Move does not yet have a concept of multi-module packages, friend visibility is a better option.
diff --git a/vendors/move/crates/changes/2-script-visibility.md b/vendors/move/crates/changes/2-script-visibility.md
new file mode 100644
index 000000000..afb780fdb
--- /dev/null
+++ b/vendors/move/crates/changes/2-script-visibility.md
@@ -0,0 +1,127 @@
+# Script Visibility
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Script visibility is a new feature in Move version 1.2 to allow module functions to be safely and directly invoked much like scripts. Previously a function had either public or private visibility, where a public function is accessible anywhere but a private function can be called only from within the module where it is defined. A function with script visibility can be invoked directly, much like scripts, and is restricted to only being callable from scripts or other script visible functions.
+
+## Motivations
+
+### Managing the Hash-based Allow-list
+
+In the Diem Framework, there was a hash-based allowlist of valid scripts that could be sent to the network. If the hash of a script was present in the list, the script could be executed. Otherwise, the transaction was rejected.
+
+This solution worked but was rather cumbersome, especially if all the hash values change due to something like a new Move bytecode version. In an upgrade scenario, the allowlist would have to be upgraded in the same write-set transaction. While this difficult upgrade path could work, it would not scale well in the future. To the extent possible, Diem should continue to support old transactions, both to ease the upgrade process for clients and also to allow pre-signed transactions that are rarely updated (e.g., for emergency key rotations). The allowlist would then need to include all the old hash values from previous releases, and it would quickly grow in size and become hard to manage. Script visibility solves this problem by including the allowed scripts as part of the Diem Framework instead of tracking their hash values.
+
+### Diem Framework Updates
+
+At some time in the future, when Diem allows arbitrary transactions with script-functions, public APIs in the Diem Framework will be extremely difficult to change, but for now, it is still important to evolve the framework with critical changes that are incompatible with scripts from previous versions. This conflicts with the desire to continue supporting transactions from previous releases. With script visibility, the contents of the supported scripts can evolve along with the framework because the Move bytecodes for those scripts are not contained within the transactions, but are instead stored on chain as part of the framework.
+
+### Meaningless Wrappers
+
+Many of the scripts we have seen are simple wrappers around a single function call or two.  These scripts did not contain any interesting ad-hoc computation (and could not be doing so in the Diem Framework with its allow list). It would be convenient if a module writer could autogenerate scripts for certain functions, or simply mark which functions could be invoked directly, as if they were scripts.
+
+## Description
+
+The `script` visibility level solves these problems. In the previous version of Move, functions in a module could be declared as either `public` or private (`Public` or `Private` in the Move bytecode file format).  With this change, the possible visibility levels are now: private (no modifier), `public(friend)`, `public(script)`, and `public`. These respectively correspond to `Private`, `Friend`, `Script`, and `Public` in the file format. (See the [Friend Visibility](1-friend-visibility.md) change description for more details on that new feature.)
+
+A `public(script)` function can only be called from 1) other `public(script)` functions, or 2) from transaction scripts. And, if the function has a signature that meets the necessary restrictions for a script-function, it can be invoked directly by the Move VM as if it was a script.
+
+### New Visibility Modifier
+
+`public(script)` is a new visibility modifier that can be applied to any module’s functions. A `public(script)` function can be invoked by any other `public(script)` function (whether or not it is in the same module) or by a script-function. Besides this visibility rule, `public(script)` functions follow the same rules as any other module function, meaning they can invoke private functions, create new struct instances, access global storage (of types declared in that module), etc.
+
+Unlike script-functions, the signature of `public(script)` functions is not restricted. Any signature that is valid for another module function is a valid signature for a `public(script)` function. But, to be invoked by the Move VM as a script, the `public(script)` function must meet the same restrictions of a script-function. In other words, while every script-function has a restricted signature, the restrictions of a `public(script)` function are checked dynamically when used as an entry point to execution.
+
+### New VM Entry Point
+
+A new entry point `execute_script_function` is added to the VM to allow the invocation of a `public(script)` function in published modules. The entry point takes the following signature:
+
+```
+fn execute_script_function(
+    &self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    data_store: &mut impl DataStore,
+    cost_strategy: &mut CostStrategy,
+    log_context: &impl LogContext,
+) -> VMResult<()>
+```
+
+The entry point is designed to be similar to the existing `execute_script` entry point, with only one change:
+
+* argument `script: Vec<u8>` (i.e., a serialized script in raw bytes) is replaced by a pair of `module: &ModuleId` and `function_name: &IdentStr` that uniquely identifies a `public(script)` function in a published module (assuming the function exists).
+
+The VM will reject the execution with proper status codes in the following situations:
+
+* the `module` or `function_name` does not exist
+* the function being pointed to is not a `public(script)` function
+* the signature of the `public(script)` function does not pass the script signature check:
+    * All `signer` arguments must occur before non-`signer` arguments
+    * The function does not return any value
+    * Each non-`signer` type in function type arguments is a valid type for a constant
+        * Ostensibly, the type has the `copy` ability and is not a struct
+    * Each type in the function type variables is closed, i.e., does not refer to other type variables
+* the `senders`, `args`, or `ty_args` do not match the declared function signature.
+
+## Examples
+
+The feature is best used when you have a script that is a simple wrapper around a function in a module:
+
+```
+script {
+    fun call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount)
+    }
+}
+```
+
+Changing the module’s function from `public` to `public(script)` will remove the need for this simple wrapper script:
+
+```
+address 0x42 {
+module M {
+    ...
+    // Replace previous "public" visibility...
+    public(script) fun foo(account: signer, amount: u64) {
+        ...
+    }
+}
+}
+```
+
+However, keep in mind that the function can now only be called from other `public(script)` functions or script-functions.
+
+```
+address 0x43 {
+module Other {
+    fun private_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // ERROR Now invalid
+    }
+
+    public fun public_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // ERROR Now invalid
+    }
+
+    public(script) fun script_call_foo(account: signer, amount: u64) {
+        0x42::M::foo(account, amount) // Still a valid call
+    }
+}
+}
+
+script {
+    fun still_valid(account: signer) {
+        0x42::M::foo(account, 0) // Still a valid call
+    }
+}
+```
+
+## Alternatives
+
+We did not see many other options that would address the script versioning problem caused by the hash-based allowlist. Converting transaction scripts into `public(script)` functions that are published and change alongside the corresponding module was the most straightforward solution.
+
+For the issue of meaningless wrappers alone, we considered compiler support to have scripts auto-generated. The generation by the compiler would be relatively simple, but it is unnecessary in the presence of `public(script)` functions.
diff --git a/vendors/move/crates/changes/3-abilities.md b/vendors/move/crates/changes/3-abilities.md
new file mode 100644
index 000000000..ce1f08efc
--- /dev/null
+++ b/vendors/move/crates/changes/3-abilities.md
@@ -0,0 +1,439 @@
+# Abilities
+
+* Status: Implemented in Move 1.2
+
+## Introduction
+
+Abilities are a new feature in Move version 1.2 to give more control over what actions are permissible for values of a given type. Previously in Move’s type system, there were copyable values and `resource` values. In this old system, copyable values were unrestricted, but resource values could not be copied and had to be used. With abilities, Move’s type system grants more fine grained control, allowing types to specifically allow certain operations for their values that were previously implicitly allowed/denied depending on the “kind” (copyable or resource).
+
+## Motivations
+
+Move’s kind system (copyable vs. resource structs) has been great, but it is not expressive enough for certain applications. Resource types are very powerful, but the system bundles up a lot of behavior into one kind, which does not always meet application needs. In the Diem Framework, there has been a need for a “hot potato” type for capabilities—that is some type that cannot be copied or dropped (like a resource), but cannot be stored in global storage. It is then a “hot potato” since you must keep passing it around and it must be consumed before the transaction completes. A type with these restrictions would allow the Move prover to verify the usage of these specific capabilities.
+
+Extending the kind system just to handle this “hot potato” example is likely not the best future-proof solution. A more granular system can give programmers more control to implement not only “hot potato” types but also serve yet unknown needs. As such, we want the new system to be flexible enough to be extended in the future without requiring another large refactoring of the type system.
+
+## Description
+
+The kinds copyable and resource are replaced by four new *abilities*. These abilities gate access to various bytecode instructions. In order for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+### The Abilities
+
+The four added abilities are `copy`, `drop`, `store`, and `key`. Broken down in detail:
+
+* `copy`
+    * Allows values of types with this ability to be copied
+    * Gates: `CopyLoc` and `ReadRef`
+    * If a value has `copy`, all values reachable inside of that value have `copy`.
+* `drop`
+    * Allows values of types with this ability to be popped/dropped.
+        * Ownership does not *have* to be transferred
+    * Gates: `Pop`, `WriteRef`, `StLoc`, `Eq` and `Neq`
+    * Values left in local variables must have `drop` when the function returns with `Ret`
+    * If a value has `drop`, all values reachable inside of that value have `drop`.
+* `store`
+    * Allows values of types with this ability to exist inside a struct in global storage
+        * But not necessarily as a top-level value in global storage
+    * This is the only ability currently that is not directly checked by an operation. But it is indirectly checked when `key` is checked
+    * If a value has `store`, all values reachable inside of that value have `store`.
+* `key`
+    * Allows the type to serve as a key for global storage operations
+        * Letting values of types with this ability exist at the top-level of global storage
+    * Gates: `MoveTo`, `MoveFrom`, `BorrowGlobal`, `BorrowGlobalMut`, and `Exists`
+    * If a value has `key`, all values reachable inside of that value have `store`.
+
+### Primitive Types
+
+Most primitive types all have `copy`, `drop`, and `store` with the exception of `signer`.
+
+* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities with Generic Types](#Conditional-Abilities-with-Generic-Types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+### Annotating Structs
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+```
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case `Ignorable` has the `drop` ability, and `Pair` has `copy`, `drop`, and `store`.
+
+When declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`
+* `drop`, all fields must have `drop`
+* `store`, all fields must have `store`
+* `key`, all fields must have `store`
+    * `key` is the only ability currently that doesn’t require itself.
+
+For example:
+
+```
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+```
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+### Basic Examples
+
+**Copy**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+
+fun example(x: u64, s: S) {
+    let x2 = copy x; // Valid, 'u64' has 'copy'
+    let s2 = copy s; // Valid, 'S' has 'copy'
+}
+
+fun invalid(account: signer, n: NoAbilities) {
+    let a2 = copy account; // Invalid, 'signer' does not have 'copy'
+    let n2 = copy n; // Invalid, 'NoAbilities' does not have 'drop'
+}
+```
+
+**Drop**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+
+fun unused() {
+    true; // Valid, 'bool' has 'drop'
+    S { f: false }; // Valid, 'S' has 'drop'
+}
+
+fun left_in_local(account: signer): u64 {
+    let b = true;
+    let s = S { f: false };
+    // Valid return: 'account', 'b', and 's' have values
+    // but 'signer', 'bool', and 'S' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    NoAbilities {}; // Invalid, Cannot ignore 'NoAbilities' without 'drop'
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = NoAbilities{};
+    // Invalid return: 'n' has a value and 'NoAbilities' does not have 'drop'
+    0
+
+}
+```
+
+**Store**
+
+```
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: u64, // Valid, 'u64' has 'store'
+    // no: signer, Invalid, 'signer' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: u64, // Valid, 'u64' has 'store'
+    inner: MyInnerResource, // Valid, 'MyInnerResource' has 'store'
+    // no: signer, Invalid, 'signer' does not have 'store'
+}
+```
+
+**Key**
+
+```
+struct NoAbilities {}
+struct MyResource has key { f: u64 }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+    let has_resource = exists<MyResource>(addr); // Valid, 'MyResource' has 'key'
+    if (!has_resource) {
+        move_to(account, MyResource { f: 0 }) // Valid, 'MyResource' has 'key'
+    };
+    let r = borrow_global_mut<MyResource>(addr) // Valid, 'MyResource' has 'key'
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   let has_it = exists<NoAbilities>(addr); // Invalid, 'NoAbilities' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr); // Invalid, does not have 'key'
+   move_to(account, NoAbilities {}); // Invalid, 'NoAbilities' does not have 'key'
+   borrow_global<NoAbilities>(addr); // Invalid, 'NoAbilities' does not have 'key'
+}
+```
+
+### Constraining Generics
+
+Abilities can used to constrain generics, meaning that only types with that ability can instantiate that type parameter. This can be used on both function and struct type parameters:
+
+```
+fun foo<T: copy>(x: T): (T, T) { (copy x, x) }
+struct CopyCup<T: copy> has copy { item: T }
+```
+
+Type parameters can have more than one constraint, signified with `+`
+
+```
+fun bar<T: copy + drop>(x: T): T { copy x }
+struct AllCup<T: copy + drop + store + key> has copy, drop, store, key { item: T }
+```
+
+### Conditional Abilities with Generic Types
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+```
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+The type parameter `T` is assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. That means:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+This behavior might be a bit confusing at first, but it is extremely useful for collection-like types. Consider `vector`: we could consider it to have the following type declaration:
+
+```
+vector<T> has copy, drop, store;
+```
+
+With this, you can copy a `vector` value only if the inner elements can be copied. You can ignore a `vector` value only if the inner elements can be ignored/dropped. And, a `vector` can be in global storage only if the inner elements can be in global storage.
+
+### More Examples
+
+**Conditional Copy**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'drop' because 'S' has 'drop'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    let c_n2 = copy c_n;
+}
+```
+
+**Drop**
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+
+}
+```
+
+**Store**
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+**Key**
+
+```
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
+
+### Backwards Compatibility
+
+The new ability system is backwards compatible with the kind system in nearly all cases. At the bytecode level, old modules and scripts with kinds can be loaded as if they were written with abilities.
+
+For any struct:
+
+* If it was declared as a “copyable”, non-`resource` struct, the struct will be given the abilities `copy`, `drop`, and `store`.
+* If it was declared as a `resource`, the struct will be given the abilities `store` and `key`.
+* For type parameters:
+    * `copyable` becomes `copy + drop`
+    * `resource` becomes `key`
+    * `store` is not given as it is not needed in the constraint position. Any usage will still work.
+
+For any function:
+
+* For type parameters:
+    * `copyable` becomes `copy + drop + store`
+    * `resource` becomes `key + drop`
+    * `store` is needed as it is not simple to determine if the type parameter will be used with global storage operations.
+
+Putting these rules together, the old code
+
+```
+struct S<T: copyable> {}
+resource struct R<T1: resource, T2> {}
+
+fun foo<Tc: copyable, Tr: resource, T>() {}
+```
+
+will be loaded as if it was written as:
+
+```
+struct S<T: copy + drop> has copy, drop, store {}
+struct R<T1: key, T2> {}
+
+fun foo<Tc: copy + drop + store, Tr: key + store, T: store>() {}
+```
+
+This leads to one spot where there is a breaking change, namely any function instantiated with `signer` as a type parameter will not now load because the type parameter will  have the `store` constraint—all old function type parameters are given the `store` constraint—but `signer` does not have `store`. Given the restricted usage of `signer`, this is likely an extreme edge case, and we do not foresee it being an issue in practice for any project.
+
+## Alternatives
+
+### Extending the Kind System
+
+For the main motivating example for this change, it was considered to add a “hot potato” kind to the system.
+In the kind system there was:
+
+* `Copyable` which corresponds to `copy + drop + store`,
+* `Resource` which corresponds to `key + store`
+* `All` which sometimes corresponds to `store` and sometimes to no-ability
+
+Often this was viewed with a sub-kinding system where `Copyable <: All`  and `Resource <: All`. Adding a `HotPotato` kind to this system would be bit tricky, possibly giving a hierarchy of `Copyable <: All` and `Resource <: HotPotato <: All`. But, this could become a mess if:
+
+* There needed to be an `AllWithStore` kind, giving `Copyable <: AllWithStore <: All` and `Resource <: AllWithStore <: All` and `Resource <: HotPotato <: All`.
+* If any other kind was added, the complexity could quickly explode.
+
+The complexity around this sub-kinding approach led to the more granular approach described above with abilities. We were particularly worried about needing another kind in a year or two and having the whole thing collapse. With abilities, we can easily add new ones over time if needed.
+
+### Explicit Conditional Abilities
+
+The current rules around generics being conditional for generic types might be potentially confusing, especially given the keyword `has`. For instance:
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+```
+
+Despite effectively saying “has copy” and “has drop” and “has store”, `Cup<T>` may or may not have the ability depending on what `T` is. This might be rather confusing. It was considered then that for generic types you would write:
+
+```
+struct Cup<T> has ?copy, ?drop, ?store { item: T }
+```
+
+This would mean exactly what it means today, where it may or may not have the ability depending on `T` and then using `has` without the question mark `?`
+
+```
+struct Ex<T> has copy {}
+```
+
+would be equivalent to:
+
+```
+struct Ex<T: copy> has ?copy {}
+```
+
+The potential problem then comes in that there are a lot of combinations that are meaningless. So, in many cases the compiler would yell at you that there is really just one valid choice.
+
+* `struct Ex<T: copy> has copy` is sort of redundant and could just be `struct Ex<T> has copy`.
+* For a non-generic type, `struct Ex has ?copy` is meaningless in some way, as every instance has the ability, and it is the same as `struct Ex has copy`.
+
+In short, having the option to have the question mark `?` caused there to be more cases and possibly more confusion. Furthermore this system was not more expressive, as a programmer could always annotate the generic `struct Cup<T: copy> has copy`, this would force every instance to have `copy` in a more explicit manner. In short, just having one option and one rule that might be a bit more confusing in the way it reads at first, but reduces the amount of complexity to consider when declaring a new struct.
+
+### Alternative Names
+
+Many different names were considered for all aspects of the abilities system.
+
+* For the name “ability” itself, “kinds”, “traits”, “type classes”, and “interfaces” were all considered. But these items used in other programming languages are usually used to describe programmer-defined items. There is no way for programmers to define their own abilities. Additionally, abilities do not give anything that looks like dynamic dispatch. So, while those other names might be more familiar, we worried they would be too misleading.
+* `copyable` and `dropable` and `storable` were all considered, but they felt too wordy. Shorter names felt more appropriate.
+* `mustuse` or `mustmove` were considered for `drop`, but again, the more concise name felt better even if the others were more informative.
+* `resource` was considered instead of `key`. The `key` ability is very similar to the `resource` keyword in many cases, but it felt very weird that something like a `Coin` which might have been `resource struct Coin` in the old system, would not be `struct Coin has store` and would not be a “resource”. Thus we are saving the word “resource” to be used in documentation for any time that does not have `copy` or `drop`.
diff --git a/vendors/move/crates/changes/4-unit-testing.md b/vendors/move/crates/changes/4-unit-testing.md
new file mode 100644
index 000000000..464d1ce30
--- /dev/null
+++ b/vendors/move/crates/changes/4-unit-testing.md
@@ -0,0 +1,345 @@
+# Unit Testing
+
+* Status: Implemented in Move 1.3
+
+## Introduction
+
+Unit testing is a new feature in Move version 1.3 to allow Move programmers to more easily and concisely test individual functions and features. Previously, the only way to test Move code was using more heavyweight expected-value and transaction-based tests via the Move CLI and Diem functional test framework. Additionally, it was hard — if not impossible — to set up arbitrary state for testing, to test non-public functions, and to have test-only dependencies, functions, and datatypes. With the new Move unit testing feature these are all possible and easy to express.
+
+## Motivation
+
+Being able to test code thoroughly is an essential ability when developing Move code. However, without a unit testing framework for Move, achieving high test coverage for both public and private functions that is clear and easily maintainable is a challenging task.
+
+Move unit tests are written in the module whose functionality they are testing. Because of this, unit tests have access to private functions and can freely construct and publish instances of datatypes defined in the module. This allows a more declarative and transparent style of testing as compared to previous options, where complex sequences of transactions could be needed to set up the state in a specific manner to test a particular code path in a function.
+
+Sometimes there are cross-module data dependencies, functions, or datatypes that you would like to have for testing purposes only. Move unit tests allow expressing that modules, and module members (`use`s, functions, and datatypes) are for testing purposes only. When members are annotated as `#[test_only]` or `#[test]` they will not appear in the compiled bytecode outside of testing. For those familiar with Rust, this is similar to `#[cfg(test)]` and `#[test]` respectively.
+
+## Description
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail (abort). These annotations can be placed on a function with any visibility. Whenever any module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+
+### Testing Annotations: Their Meaning and Usage
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+```
+#[test] // OK
+fun this_is_a_test() { ... }
+
+#[test] // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the annotated test should abort — however the exact abort code is not checked. The test will be marked as failing only if the test fails with a non-abort error, or does not abort. Only functions that have the `#[test]` annotation can also be annotated as an  #`[expected_failure]`.
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_should_abort_and_pass() { abort 1 }
+
+#[test, expected_failure] // Can have multiple in one attribute. This test will pass.
+public(script) fun this_other_test_should_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do  not have to be the same, but they must be able to be matched up with each other by name.
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+```
+#[test(arg = @0xC0FFEE)] // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// somewhere a named address is declared
+#[test_only] // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+```
+#[test, expected_failure(abort_code = 1)] // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+```
+#[test_only] // test only attributes can be attached to modules
+module ABC { ... }
+
+#[test_only] // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. to uses
+use 0x1::SomeOtherModule;
+
+#[test_only] // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+### Running Unit Tests
+
+Unit tests can be compiled and run by the `move-unit-test` crate. It is designed to work out-of-the box, so all you need to start running tests is to pass the files—or directories containing files—that you wish to test (and all dependencies):
+
+```
+$ cargo run --bin move-unit-test <move_file_or_dir_containing_move_modules_1> ... <move_file_or_dir_containing_move_modules_n>
+```
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+A test will be marked as timing out if it exceeds the maximum gas that can be executed for any single test. When a gas table is not provided, each bytecode instruction is assigned a gas cost of 1 unit. This bound can be changed using the options below, and its default value is set to 5000 gas units. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing, and to help debug failing tests. These are:
+
+```
+FLAGS:
+        --stackless         Use the stackless bytecode interpreter to run the tests and cross check its results with the
+                            execution result from Move VM
+    -g, --state_on_error    Show the storage state at the end of execution of a failing test
+    -h, --help              Prints help information
+    -l, --list              List all tests
+    -s, --statistics        Report test statistics at the end of testing
+    -V, --version           Prints version information
+    -v, --verbose           Verbose mode
+
+OPTIONS:
+    -f, --filter <filter>                A filter string to determine which unit tests to run
+    -i, --gas_limit <gas_limit>          Bound the amount of gas used by any one test. [default: 1_000_000]
+    -t, --threads <num_threads>          Number of threads to use for running tests [default: 8]
+
+ARGS:
+    <sources>...    Source files
+```
+
+While each of these flags and options are fairly self-explanatory, it is worth mentioning that when filtering tests with the `-f` option, any test whose fully qualified name (i.e., `address::module::function_name`) contains the `<filter>` string will be run.
+
+### Compilation
+
+You should always use the unit testing framework for unit testing Move code. However, there may be times when you may wish to include test-only code outside of unit testing. In such scenarios Move source code can be compiled with test-code included by passing the `--test` flag to the Move compiler.
+
+## Examples
+
+A simple module using some of the unit testing features is shown in the following example:
+
+```
+// filename: MyModule.move
+module 0x1::MyModule {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert(has_coin(@0x1), 0);
+        assert(has_coin(@0x2), 1);
+        assert(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### Running Tests
+
+```
+$ cargo run --bin move-unit-test MyModule.move
+Running Move unit tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### Using Test Flags
+
+#### `-f <str>` or `--filter <str>`
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -f zero_coin
+Running Move unit tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` or `--gas_limit <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+```
+cargo run --bin move-unit-test <dir> -i 0 MyModule.move
+Running Move unit tests
+[ TIMEOUT ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::MyModule::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::MyModule::test_has_coin
+
+Test failures:
+
+Failures in 0x1::MyModule:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` or `--statistics`
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the `MyModule` example above:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -s
+Running tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+
+Test Statistics:
+
+┌───────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                   │    Time    │   Gas Used   │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::make_sure_non_zero_coin_passes │   0.005    │             1             │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::make_sure_zero_coin_fails      │   0.003    │             1             │
+├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::MyModule::test_has_coin                  │   0.004    │             1             │
+└───────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` or `--state-on-error`
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `MyModule` example:
+
+```
+module 0x1::MyModule {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert(has_coin(@0x1), 0);
+        assert(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get get the following output:
+
+```
+$ cargo run --bin move-unit-test MyModule.move -g
+Running tests
+[ PASS    ] 0x1::MyModule::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::MyModule::make_sure_zero_coin_fails
+[ PASS    ] 0x1::MyModule::test_has_coin
+[ FAIL    ] 0x1::MyModule::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::MyModule:
+
+┌── test_has_coin_bad ──────
+│ error:
+│
+│     ┌── MyModule.move:46:9 ───
+│     │
+│  46 │         assert(has_coin(@0x2), 1);
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│     ·
+│  43 │     fun test_has_coin_bad(a: signer) {
+│     │         ----------------- In this function in 0x1::MyModule
+│     │
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::MyModule::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
+
+## Ongoing Work
+
+Support for test-only native functions is currently being added to the unit testing framework. With this addition comes a new way of creating an arbitrary number of `signer` values in test-only code. We expect these features to be available in release 1.4.
+
+We also plan to support running Move unit tests from the Move CLI and expect that this to be supported in release 1.4.
+
+## Alternatives
+
+In the development of unit tests, there were a couple of alternatives considered, some of which you as a Move programmer have at your disposal already, so we highlight the differences here.
+
+### Expected Value Tests
+
+Move already supports [expected value tests](https://github.com/move-language/move/tree/main/language/tools/move-cli#testing-with-the-move-cli) in the Move CLI, however these cover a different aspect of testing for Move. In particular, there is no concept of test-only code and test-only dependencies, which makes testing non-public functions much more difficult. Additionally, each expected value test entry must be a transaction or script function. Because of this, the expected value tests rely on a specific Move adapter implementation, whereas the unit tests do not rely on an adapter implementation and rely solely on the Move compiler and VM.
+
+Due to the design of unit tests, unit tests make it easier to test the individual units of code that comprise a Move module. However, because the unit tests do not require or use an adapter, they do not support certain features that you may  wish to test. E.g., there is no way in Move unit tests to query if a specific event has been emitted.
+
+### Test Modules
+
+The unit tests for Move are function and annotation based: each test and test-only members are declared by attaching an annotation to them. During development we also considered a module-based approach where a separate test module could be declared that contained the tests for a module (and that the compiler would inline so the tests could access private functions and construct datatypes declared in the module). We decided against supporting such an option at this time for simplicity, and to make the additional syntax and the semantics as close as possible to what currently exists in Move, but that option could still be added in the future.
diff --git a/vendors/move/crates/changes/5-named-addresses.md b/vendors/move/crates/changes/5-named-addresses.md
new file mode 100644
index 000000000..936db6803
--- /dev/null
+++ b/vendors/move/crates/changes/5-named-addresses.md
@@ -0,0 +1,200 @@
+# Named Addresses
+
+- Status: Implemented in Move 1.4, updated in Move 1.5
+
+## Introduction
+
+Named addresses are a new source language only feature. (That is, the named address feature is
+compiled away and not present in the Move bytecode format). The feature allows names to be used in
+place of numerical values in any spot where addresses are used. Named addresses are declared as top
+level elements (outside of modules and scripts) in Move Packages, or passed as
+arguments to the Move compiler.
+
+With the landing of this feature, Move standard library modules now reside under the address `Std`,
+e.g. `std::vector`. Similarly, Diem Framework modules now reside under the address `DiemFramework`,
+e.g. `DiemFramework::XUS`.
+
+Named address declarations are opaque, meaning they must be accessed via the name and not their
+underlying numeric value. Any existing code must be updated to use named addresses when accessing
+standard library or Diem Framework modules.
+
+Alongside this change, there is new syntax for address literals when used as expression values, e.g.
+`let addr = @0x42;`.
+
+## Motivations
+
+Fixed, numerical addresses were "good enough" for the language starting off, but the inability to
+set addresses via a configuration at build time severely hinders code portability and usability.
+Additionally, the lack of named address support has been painful both for account configuration in
+testing and for basic readability of code.
+
+To combat this, we are adding named addresses. They compile down to the same address system that
+exists today, but it greatly increases the portability, testability, and readability of source
+language programs.
+
+## Description
+
+### New Address Literal Syntax
+
+Addresses now come in two flavors, named or numerical. The syntax for a named address follows the
+same rules for any named identifier in Move. The syntax of a numerical address is no longer
+restricted to `0x`-prefixed values, and now any valid numerical literal can be used.
+
+To make room for the named address feature, address expression values have a new syntax. This new
+syntax reduces the complexity around named addresses as it prevents shadowing issues around module
+members (specifically constants) and local variables.
+
+In the old syntax, all address values began with `0x` and this hex prefix could not be used for
+integer values. In the new syntax, all address values are prefixed with `@`. Following the `@`
+operator any valid address can be used. For example:
+
+```move
+let _: u8 = 0x1u8;
+let _: u64 = 0x42u64;
+let _: u128 = 0x42u128;
+let a1: address = @std;
+let a2: address = @66;
+let a3: address = @0x42;
+```
+
+You can think of `@` as an operator that takes an address from being a namespace item to an
+expression item.
+
+Named addresses are not declared in Move source code. Instead they
+must be declared---and given a value---when invoking the Move compiler. E.g.,
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0x42 ...
+```
+
+A named address can be used in both module accesses and as expression values (with the new
+`@` syntax)
+
+```move
+script {
+    fun example() {
+        MyAddr::M::foo(@MyAddr);
+    }
+}
+```
+
+A named address can be used multiple times throughout a program.
+
+```move
+// file1.move
+module MyAddr::M {
+    ...
+}
+```
+
+```move
+// file2.move
+address MyAddr {
+module N {
+    ...
+}
+}
+```
+
+### Assigning Named Addresses
+
+Named addresses can only be assigned a value by passing their value as a parameter to the compiler with `<addr_name>=<number value>`:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE ...
+```
+
+An address can be assigned any number of times on the command line as long as it is given only _one_ value.
+The following would be fine, since the address `MyAddr` is given the same value in both assignments:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE MyAddr=12648430 ... # decimal representation of 0xC0FFEE
+```
+
+Assigning `MyAddr` two different values will result in an error:
+
+```bash
+cargo run --bin move-build --addresses MyAddr=0xC0FFEE MyAddr=0xDEADBEEF... # ERROR!
+```
+
+### Opaqueness
+
+Address assignments, and the name system as whole, only exist at the source
+language level and during compilation. Names will be fully substituted for
+their value at the byte code level. So the example from before would be
+equivalent to
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::M::foo(@0xC0FFEE);
+    }
+}
+```
+
+But at the source language level, the two are not interchangeable. If we had the declaration:
+
+```move
+module MyAddr::M {
+    public fun bar() {}
+}
+```
+
+The function `M::bar` _must_ be accessed through the `MyAddr` named address, not through the
+numerical value assigned to it.
+
+For example:
+
+```move
+script {
+    fun example() {
+        // ERROR! 0xC0FFEE::M::bar();
+        MyAddr::M::bar()
+    }
+}
+```
+
+## Move Standard Library and Diem Framework Modules
+
+As mentioned above, all standard library modules now live in `Std` and all Diem Framework modules
+live in `DiemFramework`. The `DiemFramework` address is set to `0x1` and this hard-coded assignment
+will be fine. However, our hope is to allow `Std` to be assigned different numerical values
+depending on the deployment of those modules. For now, `Std` has a hardcoded assignment of `0x1`.
+See the 'Future Work' section below for details about how this might work in the future.
+
+## Backwards Compatibility
+
+Since, all standard library modules and all Diem Framework modules live in `Std` and `DiemFramework`
+respectively, source code must be updated to use those named addresses. The named addresses are
+opaque, so the numeric values can no longer be used to access the modules. For example, any use of
+`0x1::Vector` must now be `std::vector`.
+
+Note, as this is just a syntactic change, the compiled module binaries will not be affected.
+
+## Update for release 1.5
+
+The support for assigning values to named addresses in Move source code and declaring named addresses in release 1.4
+
+```move
+address MyAddr = 0x19;
+```
+
+and
+
+```move
+address MyAddr;
+```
+
+was removed.
+
+Support for assigning address values was added to the command line and compiler
+options were added for use in Move packages and the Move command line as described above.
+
+
+## Future Work
+
+Named address support will be expanded in a new package system. The intent is that with this system,
+a Move program will never assign a value to a named address within the `*.move` files. Instead, all
+assignment of a named addresses will exist in a config file, similar to Rust's `Cargo.toml` files.
+To enable this package system, additional support will likely be needed from the compiler for
+configuring and assigning named addreses.
diff --git a/vendors/move/crates/changes/6-phantom-type-params.md b/vendors/move/crates/changes/6-phantom-type-params.md
new file mode 100644
index 000000000..81c454e2a
--- /dev/null
+++ b/vendors/move/crates/changes/6-phantom-type-params.md
@@ -0,0 +1,112 @@
+# Phantom Type Parameters
+
+- Status: Implemented in Move 1.4
+
+## Introduction
+
+A _phantom type parameter_ is one that doesn't show up at runtime, but is checked statically at
+compile time. Phantom type parameters can be useful in a couple of situations. For example, the
+struct `Event::EventHandle<T>` in the Move Standard library doesn't contain any field of type `T`,
+but uses the type parameter to ensure at the type level that the handle can only be used for
+messages of type `T`. Another prominent example is `Diem::Diem<CoinType>`, which is generic on a
+`CoinType` specifying the currency of the coin and allowing code to be written generically on any
+currency. As a last example, the capabilities in `Vault` also rely heavily on phantom type
+parameters.
+
+Previously, Move's type system didn't make a difference on whether a type parameter was phantom, but
+with this new feature, a struct's type parameter can be explicitly declared as phantom. A parameter
+declared as phantom is not considered when computing the
+[conditional abilities with generic types](3-abilities.md#Conditional-Abilities-with-Generic-Types).
+For this relaxed rule to be sound, Move's type system guarantees that a parameter declared as
+phantom is either not used at all in the struct definition, or it is only used as an argument to
+type parameters also declared as phantom.
+
+## Motivations
+
+Previously, defining a struct `S` with a phantom type parameter required spurious ability
+annotations to satisfy the requirements of the abilities declared for `S`. This resulted in
+increased chance of bugs and security vulnerability because types had to be weakened with
+unnecessary ability declarations. Moreover, the spurious annotations were infectious, requiring many
+functions generic on the phantom type parameter to also include the necessary constraints. With the
+new feature, arguments to phantom type parameters are not considered when deriving the abilities for
+generic types, thus avoiding the need for spurious ability annotations.
+
+For example, `Diem::Diem<CoinType>` is declared with the ability `key`. This required all arguments
+to `CoinType` to be declared with `store`. Specifically, the types `XUS::XUS` and `XDX::XDX` were
+forced to have a `store` annotation even though they were never stored in global storage! Moreover
+the extra `store` requirement polluted the entire Diem Framework and many functions had to specify
+extra `store` constraints on their type parameters. With the new feature, `Diem::Diem<CoinType>` now
+declares `CoinType` to be phantom which avoids the spurious `store` annotations sprinkled over the
+code.
+
+## Description
+
+### Declaration
+
+In a struct definition a type parameter can be declared as phantom by adding the `phantom` keyword
+before its declaration. If a type parameter is declared as phantom we say it is a phantom type
+parameter. When defining a struct, Move's type checker ensures that every phantom type parameter is
+either not used inside the struct definition or it is only used as an argument to a phantom type
+parameter.
+
+More formally, if a type is used as an argument to a phantom type parameter we say the type appears
+in _phantom position_. With this definition in place, the rule for the correct use of phantom
+parameters can be specified as follows: **A phantom type parameter can only appear in phantom
+position**.
+
+The following two examples show valid uses of phantom parameters. In the first one, the parameter
+`T1` is not used at all inside the struct definition. In the second one, the parameter `T1` is only
+used as an argument to a phantom type parameter.
+
+```
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 does not appear inside the struct definition
+
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 appears in phantom position
+```
+
+The following code shows examples of violations of the rule:
+
+```
+
+struct S1<phantom T> { f: T }
+                          ^
+                          Error: Not a phantom position
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             Error: Not a phantom position
+```
+
+### Instantiation
+
+When instantiating a struct, the arguments to phantom parameters are excluded when deriving the
+struct abilities. For example, consider the following code:
+
+```
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+Consider now the type `S<HasCopy, NoCopy>`. Since `S` is defined with `copy` and all non-phantom
+arguments have copy then `S<HasCopy, NoCopy>` also has copy.
+
+### Phantom Type Parameters with Ability Constraints
+
+Ability constraints and phantom type parameters are orthogonal features in the sense that phantom
+parameters can be declared with ability constraints. When instantiating a phantom type parameter
+with an ability constraint, the type argument has to satisfy that constraint, even though the
+parameter is phantom. For example, the following definition is perfectly valid:
+
+```
+struct S<phantom T: copy> {}
+```
+
+The usual restrictions apply and `T` can only be instantiated with arguments having `copy`.
diff --git a/vendors/move/crates/changes/7-packages.md b/vendors/move/crates/changes/7-packages.md
new file mode 100644
index 000000000..dae0e7179
--- /dev/null
+++ b/vendors/move/crates/changes/7-packages.md
@@ -0,0 +1,327 @@
+# Packages
+
+* Status: Implemented in Move 1.5
+
+## Introduction
+
+Packages are a new source feature to allow Move programmers to more easily
+re-use code and share it across projects.  The Move package system allows
+programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by named addresses;
+* Use a package in Move code and instantiate its named addresses;
+* Build packages; and
+* Work with a common interface around compiled Move artifacts.
+
+## Motivation
+
+Until now, when writing Move you had no easy options of being able to
+package Move code into reusable chunks that could be used by others. There
+was no common compiled object model or on-disk representation of compiled
+Move code and its associated artifacts, e.g., source maps and generated
+documentation. And finally, there was no way of easily managing named
+addresses that spanned "logical groupings" of Move code.
+
+The Move package system aims to make these actions easier by providing a
+common compiled-object model and access to both compiled bytecode and
+  associated compilation artifacts along with ways to:
+* Declare logical packages of Move code;
+* Import and use packages;
+* Compile and generate associated compilation artifacts from packages; and
+* Manage--expose and instantiate--named addresses in packages.
+
+## Package Layout and Manifest Syntax
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+```
+a_move_package
+├── Move.toml      (required)
+├── sources        (required)
+├── examples       (optional, test & dev mode)
+├── scripts        (optional)
+├── doc_templates  (optional)
+└── tests          (optional, test mode)
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any [documentation
+templates](../move-prover/doc/user/docgen.md) present in the
+`doc_templates` directory.
+
+### Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+```
+[package]
+name = <string>                  # e.g., "MoveStdlib"
+version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+[addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+# One or more lines declaring named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., Std = "_" or Addr = "0xC0FFEECAFE"
+
+[dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+# One or more lines declaring dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } }
+
+[dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., Std = "_" or Addr = "0xC0FFEECAFE"
+
+[dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+
+An example of the most minimal package manifest:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+license = "Apache 2.0"
+
+[addresses]
+AddressToBeFilledIn = "_"
+SpecifiedAddress = "0xB0B"
+
+[dependencies]
+MoveStdlib = { local = "<some_path>/move-stdlib", addr_subst = { "Std" = "0x1" } }
+
+[dev-addresses] # For use when developing this module
+AddressToBeFilledIn = "0x101010101"
+```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+## Named Addresses During Compilation
+
+Recall that Move has [named addresses](./5-named-addresses.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+## Declaration
+
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+```move
+module NamedAddr::A {
+    public fun x(): address { @NamedAddr }
+}
+```
+
+We could in `example_pkg/Move.toml` declare the named address `NamedAddr` in
+two different ways. The first:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "_"
+```
+
+Declares `NamedAddr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `NamedAddr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `NamedAddr`, and the package can then be
+instantiated later on by an importing package.
+
+`NamedAddr` can also be declared as:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "0xCAFE"
+```
+
+which states that the named address `NamedAddr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+## Scoping and Renaming of Named Addresses
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `NamedAddr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+```
+[package]
+name = "P"
+...
+[dependencies]
+P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+P2 = { local = "some_path_to_P2"  }
+```
+
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+```
+module N::A {
+    public fun x(): address { @P1N }
+}
+```
+
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+### Instantiation
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `NamedAddr` would be uninstantiated:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+NamedAddr = "_"
+
+[dev-addresses]
+NamedAddr = "0xC0FFEE"
+```
+
+## Usage, Artifacts, and Data Structures
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+### Usage
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
+
+## Future Work
+
+We intend on adding support for the following features over time:
+* Adding a flag to print the named addresses in scope and their values for each
+  of the dependencies of the package being built.
+* Support renaming multiple names from dependencies to one named address, e.g.
+  the following will not work today, but we'd like to support it:
+    ```
+    ...
+    [dependencies]
+    A = { local = "...", addr_subst = { "Addr" = "A" } }
+    B = { local = "...", addr_subst = { "Addr" = "B" } }
+    ```
+* Default importation of the Move standard library: currently the Move standard
+  library must be imported in the package in order to use unit testing
+  features.
diff --git a/vendors/move/crates/documentation/book/.gitignore b/vendors/move/crates/documentation/book/.gitignore
new file mode 100644
index 000000000..5a0bf0317
--- /dev/null
+++ b/vendors/move/crates/documentation/book/.gitignore
@@ -0,0 +1 @@
+/book
diff --git a/vendors/move/crates/documentation/book/README.md b/vendors/move/crates/documentation/book/README.md
new file mode 100644
index 000000000..6398c472d
--- /dev/null
+++ b/vendors/move/crates/documentation/book/README.md
@@ -0,0 +1,38 @@
+---
+id: move-book
+title: Move Book
+custom_edit_url: https://github.com/move-language/move/edit/main/language/documentation/book/README.md
+---
+
+In order to update the Move book and preview changes to it you'll need to
+install
+[`mdbook`](https://rust-lang.github.io/mdBook/guide/installation.html). You
+can do this via `cargo install mdbook`.
+
+After installing mdbook, you can preview changes via either `mdbook serve`,
+or if you want the output to change as you make changes to the book you can
+use `mdbook watch`. More information on options can be found at the [mdbook
+website](https://rust-lang.github.io/mdBook/).
+
+Once you are happy with your changes to the Move book, you can create a PR to
+update the Move book website. This is the process that has been used in
+the past and is known to work, but there may be a better way:
+
+1. Run `mdbook build` in this directory. This will create a directory
+called `book`. Copy this to some location `L` outside of the Move git tree.
+
+2. Make sure your upstream is up-to-date and checkout to `upstream/gh-pages`.
+
+3. Once you have checked out to `upstream/gh-pages`, make sure you are at the
+root of the repo. You should see a number of `.html` files. You can now
+move all contents in `L` to this location: `mv L/* .`
+
+4. Once this is done inspect things to make sure the book looks the way you
+want. If everything looks good submit a PR to the **`gh-pages`** branch of the
+main Move repo.
+
+After this the normal PR process is followed. Once the PR has been accepted and
+lands the updated Move book should be visible immediately.
+
+**NB:** When adding a new (sub)section to the book you _must_ include the new
+file in the `SUMMARY.md` file otherwise it will not appear in the updated book.
diff --git a/vendors/move/crates/documentation/book/book.toml b/vendors/move/crates/documentation/book/book.toml
new file mode 100644
index 000000000..8ead41f87
--- /dev/null
+++ b/vendors/move/crates/documentation/book/book.toml
@@ -0,0 +1,12 @@
+[book]
+title = "The Move Book"
+description = "Move book maintained by the Move core team."
+authors = ["The Move Contributors"]
+language = "en"
+multilingual = false
+src = "src"
+
+[output.html]
+git-repository-url = "https://github.com/move-language/move"
+git-repository-icon = "fa-github"
+edit-url-template = "https://github.com/move-language/move/edit/main/language/documentation/book/{path}"
diff --git a/vendors/move/crates/documentation/book/src/SUMMARY.md b/vendors/move/crates/documentation/book/src/SUMMARY.md
new file mode 100644
index 000000000..1ed9cbc12
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/SUMMARY.md
@@ -0,0 +1,45 @@
+# The Move Programming Language
+
+[Introduction](introduction.md)
+
+## Getting Started
+
+- [Modules and Scripts](modules-and-scripts.md)
+- [Move Tutorial](creating-coins.md)
+
+## Primitive Types
+
+- [Integers](integers.md)
+- [Bool](bool.md)
+- [Address](address.md)
+- [Vector](vector.md)
+- [Signer](signer.md)
+- [References](references.md)
+- [Tuples and Unit](tuples.md)
+
+## Basic Concepts
+
+- [Local Variables and Scopes](variables.md)
+- [Equality](equality.md)
+- [Abort and Assert](abort-and-assert.md)
+- [Conditionals](conditionals.md)
+- [While and Loop](loops.md)
+- [Functions](functions.md)
+- [Structs and Resources](structs-and-resources.md)
+- [Constants](constants.md)
+- [Generics](generics.md)
+- [Type Abilities](abilities.md)
+- [Uses and Aliases](uses.md)
+- [Friends](friends.md)
+- [Packages](packages.md)
+- [Unit Tests](unit-testing.md)
+
+## Global Storage
+
+- [Global Storage Structure](global-storage-structure.md)
+- [Global Storage Operators](global-storage-operators.md)
+
+## Reference
+
+- [Standard Library](standard-library.md)
+- [Coding Conventions](coding-conventions.md)
diff --git a/vendors/move/crates/documentation/book/src/abilities.md b/vendors/move/crates/documentation/book/src/abilities.md
new file mode 100644
index 000000000..2abe21b8e
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/abilities.md
@@ -0,0 +1,244 @@
+# Abilities
+
+Abilities are a typing feature in Move that control what actions are permissible for values of a given type. This system grants fine grained control over the "linear" typing behavior of values, as well as if and how values are used in global storage. This is implemented by gating access to certain bytecode instructions so that for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+<!-- TODO future section on detailed walk through maybe. We have some examples at the end but it might be helpful to explain why we have precisely this set of abilities
+
+If you are already somewhat familiar with abilities from writing Move programs, but are still confused as to what is going on, it might be helpful to skip to the [motivating walkthrough](#motivating-walkthrough) section to get an idea of what the system is setup in the way that it is. -->
+
+## The Four Abilities
+
+The four abilities are:
+
+* [`copy`](#copy)
+    * Allows values of types with this ability to be copied.
+* [`drop`](#drop)
+    * Allows values of types with this ability to be popped/dropped.
+* [`store`](#store)
+    * Allows values of types with this ability to exist inside a struct in global storage.
+* [`key`](#key)
+    * Allows the type to serve as a key for global storage operations.
+
+### `copy`
+
+The `copy` ability allows values of types with that ability to be copied. It gates the ability to copy values out of local variables with the [`copy`](./variables.md#move-and-copy) operator and to copy values via references with [dereference `*e`](./references.md#reading-and-writing-through-references).
+
+If a value has `copy`, all values contained inside of that value have `copy`.
+
+### `drop`
+
+The `drop` ability allows values of types with that ability to be dropped. By dropped, we mean that value is not transferred and is effectively destroyed as the Move program executes. As such, this ability gates the ability to ignore values in a multitude of locations, including:
+* not using the value in a local variable or parameter
+* not using the value in a [sequence via `;`](./variables.md#expression-blocks)
+* overwriting values in variables in [assignments](./variables.md#assignments)
+* overwriting values via references when [writing `*e1 = e2`](./references.md#reading-and-writing-through-references).
+
+If a value has `drop`, all values contained inside of that value have `drop`.
+
+### `store`
+
+The `store` ability allows values of types with this ability to exist inside of a struct (resource) in global storage, *but* not necessarily as a top-level resource in global storage. This is the only ability that does not directly gate an operation. Instead it gates the existence in global storage when used in tandem with `key`.
+
+If a value has `store`, all values contained inside of that value have `store`
+
+### `key`
+
+The `key` ability allows the type to serve as a key for [global storage operations](./global-storage-operators.md). It gates all global storage operations, so in order for a type to be used with `move_to`, `borrow_global`, `move_from`, etc., the type must have the `key` ability. Note that the operations still must be used in the module where the `key` type is defined (in a sense, the operations are private to the defining module).
+
+If a value has `key`, all values contained inside of that value have `store`. This is the only ability with this sort of asymmetry.
+
+## Builtin Types
+
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `drop`
+
+* `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities and Generic Types](#conditional-abilities-and-generic-types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+None of the primitive types have `key`, meaning none of them can be used directly with the [global storage operations](./global-storage-operators.md).
+
+## Annotating Structs
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+```move
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case: `Ignorable` has the `drop` ability. `Pair` has `copy`, `drop`, and `store`.
+
+
+All of these abilities have strong guarantees over these gated operations. The operation can be performed on the value only if it has that ability; even if the value is deeply nested inside of some other collection!
+
+As such: when declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for the abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`.
+* `drop`, all fields must have `drop`.
+* `store`, all fields must have `store`.
+* `key`, all fields must have `store`.
+    * `key` is the only ability currently that doesn’t require itself.
+
+For example:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+## Conditional Abilities and Generic Types
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+```
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+It might be very helpful if `Cup` could hold any type, regardless of its abilities. The type system can *see* the type parameter, so it should be able to remove abilities from `Cup` if it *sees* a type parameter that would violate the guarantees for that ability.
+
+This behavior might sound a bit confusing at first, but it might be more understandable if we think about collection types. We could consider the builtin type `vector` to have the following type declaration:
+
+```
+vector<T> has copy, drop, store;
+```
+
+We want `vector`s to work with any type. We don't want separate `vector` types for different abilities. So what are the rules we would want? Precisely the same that we would want with the field rules above.  So, it would be safe to copy a `vector` value only if the inner elements can be copied. It would be safe to ignore a `vector` value only if the inner elements can be ignored/dropped. And, it would be safe to put a `vector` in global storage only if the inner elements can be in global storage.
+
+To have this extra expressiveness, a type might not have all the abilities it was declared with depending on the instantiation of that type; instead, the abilities a type will have depends on both its declaration **and** its type arguments. For any type, type parameters are pessimistically assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. Taking `Cup` from above as an example:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+Here are examples for this conditional system for each ability:
+
+### Example: conditional `copy`
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'copy' because 'S' has 'copy'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'copy'
+    // because 'NoAbilities' does not have 'copy'
+    let c_n2 = copy c_n;
+}
+```
+
+### Example: conditional `drop`
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+}
+```
+
+### Example: conditional `store`
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+### Example: conditional `key`
+
+```
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
diff --git a/vendors/move/crates/documentation/book/src/abort-and-assert.md b/vendors/move/crates/documentation/book/src/abort-and-assert.md
new file mode 100644
index 000000000..ce3e87478
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/abort-and-assert.md
@@ -0,0 +1,207 @@
+# Abort and Assert
+
+[`return`](./functions.md) and `abort` are two control flow constructs that end execution, one for
+the current function and one for the entire transaction.
+
+More information on [`return` can be found in the linked section](./functions.md)
+
+## `abort`
+
+`abort` is an expression that takes one argument: an **abort code** of type `u64`. For example:
+
+```move
+abort 42
+```
+
+The `abort` expression halts execution the current function and reverts all changes made to global
+state by the current transaction. There is no mechanism for "catching" or otherwise handling an
+`abort`.
+
+Luckily, in Move transactions are all or nothing, meaning any changes to global storage are made all
+at once only if the transaction succeeds. Because of this transactional commitment of changes, after
+an abort there is no need to worry about backing out changes. While this approach is lacking in
+flexibility, it is incredibly simple and predictable.
+
+Similar to [`return`](./functions.md), `abort` is useful for exiting control flow when some
+condition cannot be met.
+
+In this example, the function will pop two items off of the vector, but will abort early if the
+vector does not have two items
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    if (vector::length(v) < 2) abort 42;
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+This is even more useful deep inside a control-flow construct. For example, this function checks
+that all numbers in the vector are less than the specified `bound`. And aborts otherwise
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        if (cur > bound) abort 42;
+        i = i + 1;
+    }
+}
+```
+
+### `assert`
+
+`assert` is a builtin, macro-like operation provided by the Move compiler. It takes two arguments, a
+condition of type `bool` and a code of type `u64`
+
+```move
+assert!(condition: bool, code: u64)
+```
+
+Since the operation is a macro, it must be invoked with the `!`. This is to convey that the
+arguments to `assert` are call-by-expression. In other words, `assert` is not a normal function and
+does not exist at the bytecode level. It is replaced inside the compiler with
+
+```move
+if (condition) () else abort code
+```
+
+`assert` is more commonly used than just `abort` by itself. The `abort` examples above can be
+rewritten using `assert`
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    assert!(vector::length(v) >= 2, 42); // Now uses 'assert'
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+and
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        assert!(cur <= bound, 42); // Now uses 'assert'
+        i = i + 1;
+    }
+}
+```
+
+Note that because the operation is replaced with this `if-else`, the argument for the `code` is not
+always evaluated. For example:
+
+```move
+assert!(true, 1 / 0)
+```
+
+Will not result in an arithmetic error, it is equivalent to
+
+```move
+if (true) () else (1 / 0)
+```
+
+So the arithmetic expression is never evaluated!
+
+### Abort codes in the Move VM
+
+When using `abort`, it is important to understand how the `u64` code will be used by the VM.
+
+Normally, after successful execution, the Move VM produces a change-set for the changes made to
+global storage (added/removed resources, updates to existing resources, etc).
+
+If an `abort` is reached, the VM will instead indicate an error. Included in that error will be two
+pieces of information:
+
+- The module that produced the abort (address and name)
+- The abort code.
+
+For example
+
+```move=
+address 0x2 {
+module example {
+    public fun aborts() {
+        abort 42
+    }
+}
+}
+
+script {
+    fun always_aborts() {
+        0x2::example::aborts()
+    }
+}
+```
+
+If a transaction, such as the script `always_aborts` above, calls `0x2::example::aborts`, the VM
+would produce an error that indicated the module `0x2::example` and the code `42`.
+
+This can be useful for having multiple aborts being grouped together inside a module.
+
+In this example, the module has two separate error codes used in multiple functions
+
+```move=
+address 0x42 {
+module example {
+
+    use std::vector;
+
+    const EMPTY_VECTOR: u64 = 0;
+    const INDEX_OUT_OF_BOUNDS: u64 = 1;
+
+    // move i to j, move j to k, move k to i
+    public fun rotate_three<T>(v: &mut vector<T>, i: u64, j: u64, k: u64) {
+        let n = vector::length(v);
+        assert!(n > 0, EMPTY_VECTOR);
+        assert!(i < n, INDEX_OUT_OF_BOUNDS);
+        assert!(j < n, INDEX_OUT_OF_BOUNDS);
+        assert!(k < n, INDEX_OUT_OF_BOUNDS);
+
+        vector::swap(v, i, k);
+        vector::swap(v, j, k);
+    }
+
+    public fun remove_twice<T>(v: &mut vector<T>, i: u64, j: u64): (T, T) {
+        let n = vector::length(v);
+        assert!(n > 0, EMPTY_VECTOR);
+        assert!(i < n, INDEX_OUT_OF_BOUNDS);
+        assert!(j < n, INDEX_OUT_OF_BOUNDS);
+        assert!(i > j, INDEX_OUT_OF_BOUNDS);
+
+        (vector::remove<T>(v, i), vector::remove<T>(v, j))
+    }
+}
+}
+```
+
+## The type of `abort`
+
+The `abort i` expression can have any type! This is because both constructs break from the normal
+control flow, so they never need to evaluate to the value of that type.
+
+The following are not useful, but they will type check
+
+```move
+let y: address = abort 0;
+```
+
+This behavior can be helpful in situations where you have a branching instruction that produces a
+value on some branches, but not all. For example:
+
+```move
+let b =
+    if (x == 0) false
+    else if (x == 1) true
+    else abort 42;
+//       ^^^^^^^^ `abort 42` has type `bool`
+```
diff --git a/vendors/move/crates/documentation/book/src/address.md b/vendors/move/crates/documentation/book/src/address.md
new file mode 100644
index 000000000..88d8b3f5e
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/address.md
@@ -0,0 +1,73 @@
+# Address
+
+`address` is a built-in type in Move that is used to represent locations (sometimes called accounts) in global storage. An `address` value is a 128-bit (16 byte) identifier. At a given address, two things can be stored: [Modules](./modules-and-scripts.md) and [Resources](./structs-and-resources.md).
+
+Although an `address` is a 128 bit integer under the hood, Move addresses are intentionally opaque---they cannot be created from integers, they do not support arithmetic operations, and they cannot be modified. Even though there might be interesting programs that would use such a feature (e.g., pointer arithmetic in C fills a similar niche), Move does not allow this dynamic behavior because it has been designed from the ground up to support static verification.
+
+You can use runtime address values (values of type `address`) to access resources at that address. You *cannot* access modules at runtime via address values.
+
+## Addresses and Their Syntax
+
+Addresses come in two flavors, named or numerical. The syntax for a named address follows the
+same rules for any named identifier in Move. The syntax of a numerical address is not restricted
+to hex-encoded values, and any valid [`u128` numerical value](./integers.md) can be used as an
+address value, e.g., `42`, `0xCAFE`, and `2021` are all valid numerical address
+literals.
+
+To distinguish when an address is being used in an expression context or not, the
+syntax when using an address differs depending on the context where it's used:
+* When an address is used as an expression the address must be prefixed by the `@` character, i.e., [`@<numerical_value>`](./integers.md) or `@<named_address_identifier>`.
+* Outside of expression contexts, the address may be written without the leading `@` character, i.e., [`<numerical_value>`](./integers.md) or `<named_address_identifier>`.
+
+In general, you can think of `@` as an operator that takes an address from being a namespace item to being an expression item.
+
+## Named Addresses
+
+Named addresses are a feature that allow identifiers to be used in place of
+numerical values in any spot where addresses are used, and not just at the
+value level.  Named addresses are declared and bound as top level elements
+(outside of modules and scripts) in Move Packages, or passed as arguments
+to the Move compiler.
+
+Named addresses only exist at the source language level and will be fully
+substituted for their value at the bytecode level. Because of this, modules
+and module members _must_ be accessed through the module's named address
+and not through the numerical value assigned to the named address during
+compilation, e.g., `use my_addr::foo` is _not_ equivalent to `use 0x2::foo`
+even if the Move program is compiled with `my_addr` set to `0x2`. This
+distinction is discussed in more detail in the section on [Modules and
+Scripts](./modules-and-scripts.md).
+
+### Examples
+
+```move
+let a1: address = @0x1; // shorthand for 0x00000000000000000000000000000001
+let a2: address = @0x42; // shorthand for 0x00000000000000000000000000000042
+let a3: address = @0xDEADBEEF; // shorthand for 0x000000000000000000000000DEADBEEF
+let a4: address = @0x0000000000000000000000000000000A;
+let a5: address = @std; // Assigns `a5` the value of the named address `std`
+let a6: address = @66;
+let a7: address = @0x42;
+
+module 66::some_module {   // Not in expression context, so no @ needed
+    use 0x1::other_module; // Not in expression context so no @ needed
+    use std::vector;       // Can use a named address as a namespace item when using other modules
+    ...
+}
+
+module std::other_module {  // Can use a named address as a namespace item to declare a module
+    ...
+}
+```
+
+## Global Storage Operations
+
+The primary purpose of `address` values are to interact with the global storage operations.
+
+`address` values are used with the `exists`, `borrow_global`, `borrow_global_mut`, and `move_from` [operations](./global-storage-operators.md).
+
+The only global storage operation that *does not* use `address` is `move_to`, which uses [`signer`](./signer.md).
+
+## Ownership
+
+As with the other scalar values built-in to the language, `address` values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/crates/documentation/book/src/bool.md b/vendors/move/crates/documentation/book/src/bool.md
new file mode 100644
index 000000000..6423a8c63
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/bool.md
@@ -0,0 +1,33 @@
+# Bool
+
+`bool` is Move's primitive type for boolean `true` and `false` values.
+
+## Literals
+
+Literals for `bool` are either `true` or `false`.
+
+## Operations
+
+### Logical
+
+`bool` supports three logical operations:
+
+| Syntax                    | Description                  | Equivalent Expression                                               |
+| ------------------------- | ---------------------------- | ------------------------------------------------------------------- |
+| `&&`                      | short-circuiting logical and | `p && q` is equivalent to `if (p) q else false`                     |
+| <code>&vert;&vert;</code> | short-circuiting logical or  | <code>p &vert;&vert; q</code> is equivalent to `if (p) true else q` |
+| `!`                       | logical negation             | `!p` is equivalent to `if (p) false else true`                      |
+
+### Control Flow
+
+`bool` values are used in several of Move's control-flow constructs:
+
+- [`if (bool) { ... }`](./conditionals.md)
+- [`while (bool) { .. }`](./loops.md)
+- [`assert!(bool, u64)`](./abort-and-assert.md)
+
+## Ownership
+
+As with the other scalar values built-in to the language, boolean values are implicitly copyable,
+meaning they can be copied without an explicit instruction such as
+[`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/crates/documentation/book/src/coding-conventions.md b/vendors/move/crates/documentation/book/src/coding-conventions.md
new file mode 100644
index 000000000..caea845e4
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/coding-conventions.md
@@ -0,0 +1,77 @@
+# Move Coding Conventions
+
+This section lays out some basic coding conventions for Move that the Move team has found helpful. These are only recommendations, and you should feel free to use other formatting guidelines and conventions if you have a preference for them.
+
+## Naming
+
+- **Module names**: should be lower snake case, e.g., `fixed_point32`, `vector`.
+- **Type names**: should be camel case if they are not a native type, e.g., `Coin`, `RoleId`.
+- **Function names**: should be lower snake case, e.g., `destroy_empty`.
+- **Constant names**: should be upper camel case and begin with an `E` if they represent error codes (e.g., `EIndexOutOfBounds`) and upper snake case if they represent a non-error value (e.g., `MIN_STAKE`).
+-
+- **Generic type names**: should be descriptive, or anti-descriptive where appropriate, e.g., `T` or `Element` for the Vector generic type parameter. Most of the time the "main" type in a module should be the same name as the module e.g., `option::Option`, `fixed_point32::FixedPoint32`.
+- **Module file names**: should be the same as the module name e.g., `Option.move`.
+- **Script file names**: should be lower snake case and should match the name of the “main” function in the script.
+- **Mixed file names**: If the file contains multiple modules and/or scripts, the file name should be lower snake case, where the name does not match any particular module/script inside.
+
+## Imports
+
+- All module `use` statements should be at the top of the module.
+- Functions should be imported and used fully qualified from the module in which they are declared, and not imported at the top level.
+- Types should be imported at the top-level. Where there are name clashes, `as` should be used to rename the type locally as appropriate.
+
+For example, if there is a module:
+
+```move
+module 0x1::foo {
+    struct Foo { }
+    const CONST_FOO: u64 = 0;
+    public fun do_foo(): Foo { Foo{} }
+    ...
+}
+```
+
+this would be imported and used as:
+
+```move
+module 0x1::bar {
+    use 0x1::foo::{Self, Foo};
+
+    public fun do_bar(x: u64): Foo {
+        if (x == 10) {
+            foo::do_foo()
+        } else {
+            abort 0
+        }
+    }
+    ...
+}
+```
+
+And, if there is a local name-clash when importing two modules:
+
+```move
+module other_foo {
+    struct Foo {}
+    ...
+}
+
+module 0x1::importer {
+    use 0x1::other_foo::Foo as OtherFoo;
+    use 0x1::foo::Foo;
+    ...
+}
+```
+
+## Comments
+
+- Each module, struct, and public function declaration should be commented.
+- Move has doc comments `///`, regular single-line comments `//`, block comments `/* */`, and block doc comments `/** */`.
+
+## Formatting
+
+The Move team plans to write an autoformatter to enforce formatting conventions. However, in the meantime:
+
+- Four space indentation should be used except for `script` and `address` blocks whose contents should not be indented.
+- Lines should be broken if they are longer than 100 characters.
+- Structs and constants should be declared before all functions in a module.
diff --git a/vendors/move/crates/documentation/book/src/conditionals.md b/vendors/move/crates/documentation/book/src/conditionals.md
new file mode 100644
index 000000000..35a7188b9
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/conditionals.md
@@ -0,0 +1,61 @@
+# Conditionals
+
+An `if` expression specifies that some code should only be evaluated if a certain condition is true. For example:
+
+```move
+if (x > 5) x = x - 5
+```
+
+The condition must be an expression of type `bool`.
+
+An `if` expression can optionally include an `else` clause to specify another expression to evaluate when the condition is false.
+
+```move
+if (y <= 10) y = y + 1 else y = 10
+```
+
+Either the "true" branch or the "false" branch will be evaluated, but not both. Either branch can be a single expression or an expression block.
+
+The conditional expressions may produce values so that the `if` expression has a result.
+
+```move
+let z = if (x < 100) x else 100;
+```
+
+The expressions in the true and false branches must have compatible types. For example:
+
+```move=
+// x and y must be u64 integers
+let maximum: u64 = if (x > y) x else y;
+
+// ERROR! branches different types
+let z = if (maximum < 10) 10u8 else 100u64;
+
+// ERROR! branches different types, as default false-branch is () not u64
+if (maximum >= 10) maximum;
+```
+
+If the `else` clause is not specified, the false branch defaults to the unit value. The following are equivalent:
+
+```move
+if (condition) true_branch // implied default: else ()
+if (condition) true_branch else ()
+```
+
+Commonly, [`if` expressions](./conditionals.md) are used in conjunction with expression blocks.
+
+```move
+let maximum = if (x > y) x else y;
+if (maximum < 10) {
+    x = x + 10;
+    y = y + 10;
+} else if (x >= 10 && y >= 10) {
+    x = x - 10;
+    y = y - 10;
+}
+```
+
+## Grammar for Conditionals
+
+> *if-expression* → **if (** *expression* **)** *expression* *else-clause*<sub>*opt*</sub>
+> *else-clause* → **else** *expression*
diff --git a/vendors/move/crates/documentation/book/src/constants.md b/vendors/move/crates/documentation/book/src/constants.md
new file mode 100644
index 000000000..c59f0107c
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/constants.md
@@ -0,0 +1,112 @@
+# Constants
+
+Constants are a way of giving a name to shared, static values inside of a `module` or `script`.
+
+The constant's must be known at compilation. The constant's value is stored in the compiled module
+or script. And each time the constant is used, a new copy of that value is made.
+
+## Declaration
+
+Constant declarations begin with the `const` keyword, followed by a name, a type, and a value. They
+can exist in either a script or module
+
+```text
+const <name>: <type> = <expression>;
+```
+
+For example
+
+```move=
+script {
+
+    const MY_ERROR_CODE: u64 = 0;
+
+    fun main(input: u64) {
+        assert!(input > 0, MY_ERROR_CODE);
+    }
+
+}
+
+address 0x42 {
+module example {
+
+    const MY_ADDRESS: address = @0x42;
+
+    public fun permissioned(s: &signer) {
+        assert!(std::signer::address_of(s) == MY_ADDRESS, 0);
+    }
+
+}
+}
+```
+
+## Naming
+
+Constants must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+const FLAG: bool = false;
+const MY_ERROR_CODE: u64 = 0;
+const ADDRESS_42: address = @0x42;
+```
+
+Even though you can use letters `a` to `z` in a constant. The
+[general style guidelines](./coding-conventions.md) are to use just uppercase letters `A` to `Z`,
+with underscores `_` between each word.
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+## Visibility
+
+`public` constants are not currently supported. `const` values can be used only in the declaring
+module.
+
+## Valid Expressions
+
+Currently, constants are limited to the primitive types `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, `address`, and
+`vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will
+come later.
+
+### Values
+
+Commonly, `const`s are assigned a simple value, or literal, of their type. For example
+
+```move
+const MY_BOOL: bool = false;
+const MY_ADDRESS: address = @0x70DD;
+const BYTES: vector<u8> = b"hello world";
+const HEX_BYTES: vector<u8> = x"DEADBEEF";
+```
+
+### Complex Expressions
+
+In addition to literals, constants can include more complex expressions, as long as the compiler is
+able to reduce the expression to a value at compile time.
+
+Currently, equality operations, all boolean operations, all bitwise operations, and all arithmetic
+operations can be used.
+
+```move
+const RULE: bool = true && false;
+const CAP: u64 = 10 * 100 + 1;
+const SHIFTY: u8 = {
+  (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
+};
+const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const REM: u256 = 57896044618658097711785492504343953926634992332820282019728792003956564819968 % 654321;
+const EQUAL: bool = 1 == 1;
+```
+
+If the operation would result in a runtime exception, the compiler will give an error that it is
+unable to generate the constant's value
+
+```move
+const DIV_BY_ZERO: u64 = 1 / 0; // error!
+const SHIFT_BY_A_LOT: u64 = 1 << 100; // error!
+const NEGATIVE_U64: u64 = 0 - 1; // error!
+```
+
+Note that constants cannot currently refer to other constants. This feature, along with support for
+other expressions, will be added in the future.
diff --git a/vendors/move/crates/documentation/book/src/creating-coins.md b/vendors/move/crates/documentation/book/src/creating-coins.md
new file mode 100644
index 000000000..b62b4f0d7
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/creating-coins.md
@@ -0,0 +1,3 @@
+# Move Tutorial
+
+Please refer to the [Move Tutorial](https://github.com/move-language/move/tree/main/language/documentation/tutorial).
diff --git a/vendors/move/crates/documentation/book/src/equality.md b/vendors/move/crates/documentation/book/src/equality.md
new file mode 100644
index 000000000..dbabfa66c
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/equality.md
@@ -0,0 +1,164 @@
+# Equality
+
+Move supports two equality operations `==` and `!=`
+
+## Operations
+
+| Syntax | Operation | Description                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | equal     | Returns `true` if the two operands have the same value, `false` otherwise   |
+| `!=`   | not equal | Returns `true` if the two operands have different values, `false` otherwise |
+
+### Typing
+
+Both the equal (`==`) and not-equal (`!=`) operations only work if both operands are the same type
+
+```move
+0 == 0; // `true`
+1u128 == 2u128; // `false`
+b"hello" != x"00"; // `true`
+```
+
+Equality and non-equality also work over user defined types!
+
+```move=
+address 0x42 {
+module example {
+    struct S has copy, drop { f: u64, s: vector<u8> }
+
+    fun always_true(): bool {
+        let s = S { f: 0, s: b"" };
+        // parens are not needed but added for clarity in this example
+        (copy s) == s
+    }
+
+    fun always_false(): bool {
+        let s = S { f: 0, s: b"" };
+        // parens are not needed but added for clarity in this example
+        (copy s) != s
+    }
+}
+}
+```
+
+If the operands have different types, there is a type checking error
+
+```move
+1u8 == 1u128; // ERROR!
+//     ^^^^^ expected an argument of type 'u8'
+b"" != 0; // ERROR!
+//     ^ expected an argument of type 'vector<u8>'
+```
+
+### Typing with references
+
+When comparing [references](./references.md), the type of the reference (immutable or mutable) does
+not matter. This means that you can compare an immutable `&` reference with a mutable one `&mut` of
+the same underlying type.
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == m; // `false`
+m == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+The above is equivalent to applying an explicit freeze to each mutable reference where needed
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == freeze(m); // `false`
+freeze(m) == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+But again, the underlying type must be the same type
+
+```move
+let i = &0;
+let s = &b"";
+
+i == s; // ERROR!
+//   ^ expected an argument of type '&u64'
+```
+
+## Restrictions
+
+Both `==` and `!=` consume the value when comparing them. As a result, the type system enforces that
+the type must have [`drop`](./abilities.md). Recall that without the
+[`drop` ability](./abilities.md), ownership must be transferred by the end of the function, and such
+values can only be explicitly destroyed within their declaring module. If these were used directly
+with either equality `==` or non-equality `!=`, the value would be destroyed which would break
+[`drop` ability](./abilities.md) safety guarantees!
+
+```move=
+address 0x42 {
+module example {
+    struct Coin has store { value: u64 }
+    fun invalid(c1: Coin, c2: Coin) {
+        c1 == c2 // ERROR!
+//      ^^    ^^ These resources would be destroyed!
+    }
+}
+}
+```
+
+But, a programmer can _always_ borrow the value first instead of directly comparing the value, and
+reference types have the [`drop` ability](./abilities.md). For example
+
+```move=
+address 0x42 {
+module example {
+    struct Coin as store { value: u64 }
+    fun swap_if_equal(c1: Coin, c2: Coin): (Coin, Coin) {
+        let are_equal = &c1 == &c2; // valid
+        if (are_equal) (c2, c1) else (c1, c2)
+    }
+}
+}
+```
+
+## Avoid Extra Copies
+
+While a programmer _can_ compare any value whose type has [`drop`](./abilities.md), a programmer
+should often compare by reference to avoid expensive copies.
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(copy v1 == copy v2, 42);
+//     ^^^^       ^^^^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(copy s1 == copy s2, 42);
+//     ^^^^       ^^^^
+use_two_foos(s1, s2);
+```
+
+This code is perfectly acceptable (assuming `Foo` has [`drop`](./abilities.md)), just not efficient.
+The highlighted copies can be removed and replaced with borrows
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(&v1 == &v2, 42);
+//     ^      ^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(&s1 == &s2, 42);
+//     ^      ^
+use_two_foos(s1, s2);
+```
+
+The efficiency of the `==` itself remains the same, but the `copy`s are removed and thus the program
+is more efficient.
diff --git a/vendors/move/crates/documentation/book/src/friends.md b/vendors/move/crates/documentation/book/src/friends.md
new file mode 100644
index 000000000..1dab74fe4
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/friends.md
@@ -0,0 +1,131 @@
+# Friends
+
+The `friend` syntax is used to declare modules that are trusted by the current module.
+A trusted module is allowed to call any function defined in the current module that have the `public(friend)` visibility.
+For details on function visibilities, please refer to the *Visibility* section in [Functions](./functions.md).
+
+## Friend declaration
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+- `friend <address::name>` — friend declaration using fully qualified module name like the example below, or
+
+  ```move
+  address 0x42 {
+  module a {
+      friend 0x42::b;
+  }
+  }
+  ```
+
+- `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+
+  ```move
+  address 0x42 {
+  module a {
+      use 0x42::b;
+      friend b;
+  }
+  }
+  ```
+
+A module may have multiple friend declarations, and the union of all the friend modules forms the friend list.
+In the example below, both `0x42::B` and `0x42::C` are considered as friends of `0x42::A`.
+
+```move
+address 0x42 {
+module a {
+    friend 0x42::b;
+    friend 0x42::c;
+}
+}
+```
+
+Unlike `use` statements, `friend` can only be declared in the module scope and not in the expression block scope.
+`friend` declarations may be located anywhere a top-level construct (e.g., `use`, `function`, `struct`, etc.) is allowed.
+However, for readability, it is advised to place friend declarations near the beginning of the module definition.
+
+Note that the concept of friendship does not apply to Move scripts:
+- A Move script cannot declare `friend` modules as doing so is considered meaningless: there is no mechanism to call the function defined in a script.
+- A Move module cannot declare `friend` scripts as well because scripts are ephemeral code snippets that are never published to global storage.
+
+### Friend declaration rules
+Friend declarations are subject to the following rules:
+
+- A module cannot declare itself as a friend.
+
+  ```move=
+  address 0x42 {
+  module m { friend Self; // ERROR! }
+  //                ^^^^ Cannot declare the module itself as a friend
+  }
+
+  address 0x43 {
+  module m { friend 0x43::M; // ERROR! }
+  //                ^^^^^^^ Cannot declare the module itself as a friend
+  }
+  ```
+
+- Friend modules must be known by the compiler
+
+  ```move=
+  address 0x42 {
+  module m { friend 0x42::nonexistent; // ERROR! }
+  //                ^^^^^^^^^^^^^^^^^ Unbound module '0x42::nonexistent'
+  }
+  ```
+
+- Friend modules must be within the same account address. (Note: this is not a technical requirement but rather a policy decision which *may* be relaxed later.)
+
+  ```move=
+  address 0x42 {
+  module m {}
+  }
+
+  address 0x43 {
+  module n { friend 0x42::m; // ERROR! }
+  //                ^^^^^^^ Cannot declare modules out of the current address as a friend
+  }
+  ```
+
+- Friends relationships cannot create cyclic module dependencies.
+
+  Cycles are not allowed in the friend relationships, e.g., the relation `0x2::a` friends `0x2::b` friends `0x2::c` friends `0x2::a` is not allowed.
+More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module).
+If that friend module is already used, either directly or transitively, a cycle of dependencies would be created.
+  ```move=
+  address 0x2 {
+  module a {
+      use 0x2::c;
+      friend 0x2::b;
+
+      public fun a() {
+          c::c()
+      }
+  }
+
+  module b {
+      friend 0x2::c; // ERROR!
+  //         ^^^^^^ This friend relationship creates a dependency cycle: '0x2::b' is a friend of '0x2::a' uses '0x2::c' is a friend of '0x2::b'
+  }
+
+  module c {
+      public fun c() {}
+  }
+  }
+  ```
+
+- The friend list for a module cannot contain duplicates.
+
+  ```move=
+  address 0x42 {
+  module a {}
+
+  module m {
+      use 0x42::a as aliased_a;
+      friend 0x42::A;
+      friend aliased_a; // ERROR!
+  //         ^^^^^^^^^ Duplicate friend declaration '0x42::a'. Friend declarations in a module must be unique
+  }
+  }
+  ```
diff --git a/vendors/move/crates/documentation/book/src/functions.md b/vendors/move/crates/documentation/book/src/functions.md
new file mode 100644
index 000000000..e95d533ff
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/functions.md
@@ -0,0 +1,560 @@
+# Functions
+
+Function syntax in Move is shared between module functions and script functions. Functions inside of modules are reusable, whereas script functions are only used once to invoke a transaction.
+
+## Declaration
+
+Functions are declared with the `fun` keyword followed by the function name, type parameters, parameters, a return type, acquires annotations, and finally the function body.
+
+```text
+fun <identifier><[type_parameters: constraint],*>([identifier: type],*): <return_type> <acquires [identifier],*> <function_body>
+```
+
+For example
+
+```move
+fun foo<T1, T2>(x: u64, y: T1, z: T2): (T2, T1, u64) { (z, y, x) }
+```
+
+### Visibility
+
+Module functions, by default, can only be called within the same module. These internal (sometimes called private) functions cannot be called from other modules or from scripts.
+
+```move=
+address 0x42 {
+module m {
+    fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+To allow access from other modules or from scripts, the function must be declared `public` or `public(friend)`.
+
+#### `public` visibility
+
+A `public` function can be called by *any* function defined in *any* module or script. As shown in the following example, a `public` function can be called by:
+- other functions defined in the same module,
+- functions defined in another module, or
+- the function defined in a script.
+
+There are also no restrictions for what the argument types a public function can take and its return type.
+
+```move=
+address 0x42 {
+module m {
+    public fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+```
+
+#### `public(friend)` visibility
+
+The `public(friend)` visibility modifier is a more restricted form of the `public` modifier to give more control about where a function can be used. A `public(friend)` function can be called by:
+- other functions defined in the same module, or
+- functions defined in modules which are explicitly specified in the **friend list** (see [Friends](./friends.md) on how to specify the friend list).
+
+Note that since we cannot declare a script to be a friend of a module, the functions defined in scripts can never call a `public(friend)` function.
+
+```move=
+address 0x42 {
+module m {
+    friend 0x42::n;  // friend declaration
+    public(friend) fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+```
+
+### `entry` modifier
+
+The `entry` modifier is designed to allow module functions to be safely and directly invoked much like scripts. This allows module writers to specify which functions can be to begin execution. The module writer then knows that any non-`entry` function will be called from a Move program already in execution.
+
+Essentially, `entry` functions are the "main" functions of a module, and they specify where Move programs start executing.
+
+Note though, an `entry` function _can_ still be called by other Move functions. So while they _can_ serve as the start of a Move program, they aren't restricted to that case.
+
+For example:
+
+```move=
+address 0x42 {
+module m {
+    public entry fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid!
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+
+module other {
+    public entry fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+```
+
+Even internal functions can be marked as `entry`! This lets you guarantee that the function is called only at the beginning of execution (assuming you do not call it elsewhere in your module)
+
+```move=
+address 0x42 {
+module m {
+    entry fun foo(): u64 { 0 } // valid! entry functions do not have to be public
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+
+module other {
+    public entry fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+Entry functions can take primitive types, String, and vector arguments but cannot take Structs (e.g. Option). They also
+must not have any return values.
+
+### Name
+
+Function names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, function names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+fun FOO() {}
+fun bar_42() {}
+fun _bAZ19() {}
+```
+
+### Type Parameters
+
+After the name, functions can have type parameters
+
+```move
+fun id<T>(x: T): T { x }
+fun example<T1: copy, T2>(x: T1, y: T2): (T1, T1, T2) { (copy x, x, y) }
+```
+
+For more details, see [Move generics](./generics.md).
+
+### Parameters
+
+Functions parameters are declared with a local variable name followed by a type annotation
+
+```move
+fun add(x: u64, y: u64): u64 { x + y }
+```
+
+We read this as `x` has type `u64`
+
+A function does not have to have any parameters at all.
+
+```move
+fun useless() { }
+```
+
+This is very common for functions that create new or empty data structures
+
+```move=
+address 0x42 {
+module example {
+  struct Counter { count: u64 }
+
+  fun new_counter(): Counter {
+      Counter { count: 0 }
+  }
+
+}
+}
+```
+
+### Acquires
+
+When a function accesses a resource using `move_from`, `borrow_global`, or `borrow_global_mut`, the function must indicate that it `acquires` that resource. This is then used by Move's type system to ensure the references into global storage are safe, specifically that there are no dangling references into global storage.
+
+```move=
+address 0x42 {
+module example {
+
+    struct Balance has key { value: u64 }
+
+    public fun add_balance(s: &signer, value: u64) {
+        move_to(s, Balance { value })
+    }
+
+    public fun extract_balance(addr: address): u64 acquires Balance {
+        let Balance { value } = move_from(addr); // acquires needed
+        value
+    }
+}
+}
+```
+
+`acquires` annotations must also be added for transitive calls within the module. Calls to these functions from another module do not need to annotated with these acquires because one module cannot access resources declared in another module--so the annotation is not needed to ensure reference safety.
+
+```move=
+address 0x42 {
+module example {
+
+    struct Balance has key { value: u64 }
+
+    public fun add_balance(s: &signer, value: u64) {
+        move_to(s, Balance { value })
+    }
+
+    public fun extract_balance(addr: address): u64 acquires Balance {
+        let Balance { value } = move_from(addr); // acquires needed
+        value
+    }
+
+    public fun extract_and_add(sender: address, receiver: &signer) acquires Balance {
+        let value = extract_balance(sender); // acquires needed here
+        add_balance(receiver, value)
+    }
+}
+}
+
+address 0x42 {
+module other {
+    fun extract_balance(addr: address): u64 {
+        0x42::example::extract_balance(addr) // no acquires needed
+    }
+}
+}
+```
+
+A function can `acquire` as many resources as it needs to
+
+```move=
+address 0x42 {
+module example {
+    use std::vector;
+
+    struct Balance has key { value: u64 }
+    struct Box<T> has key { items: vector<T> }
+
+    public fun store_two<Item1: store, Item2: store>(
+        addr: address,
+        item1: Item1,
+        item2: Item2,
+    ) acquires Balance, Box {
+        let balance = borrow_global_mut<Balance>(addr); // acquires needed
+        balance.value = balance.value - 2;
+        let box1 = borrow_global_mut<Box<Item1>>(addr); // acquires needed
+        vector::push_back(&mut box1.items, item1);
+        let box2 = borrow_global_mut<Box<Item2>>(addr); // acquires needed
+        vector::push_back(&mut box2.items, item2);
+    }
+}
+}
+```
+
+### Return type
+
+After the parameters, a function specifies its return type.
+
+```move
+fun zero(): u64 { 0 }
+```
+
+Here `: u64` indicates that the function's return type is `u64`.
+
+Using tuples, a function can return multiple values:
+
+```move
+fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
+```
+
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent:
+
+```move
+fun just_unit(): () { () }
+fun just_unit() { () }
+fun just_unit() { }
+```
+
+`script` functions must have a return type of unit `()`:
+
+```move
+script {
+    fun do_nothing() {
+    }
+}
+```
+
+As mentioned in the [tuples section](./tuples.md), these tuple "values" are virtual and do not exist at runtime. So for a function that returns unit `()`, it will not be returning any value at all during execution.
+
+### Function body
+
+A function's body is an expression block. The return value of the function is the last value in the sequence
+
+```move=
+fun example(): u64 {
+    let x = 0;
+    x = x + 1;
+    x // returns 'x'
+}
+```
+
+See [the section below for more information on returns](#returning-values)
+
+For more information on expression blocks, see [Move variables](./variables.md).
+
+### Native Functions
+
+Some functions do not have a body specified, and instead have the body provided by the VM. These functions are marked `native`.
+
+Without modifying the VM source code, a programmer cannot add new native functions. Furthermore, it is the intent that `native` functions are used for either standard library code or for functionality needed for the given Move environment.
+
+Most `native` functions you will likely see are in standard library code such as `vector`
+
+```move=
+module std::vector {
+    native public fun empty<Element>(): vector<Element>;
+    ...
+}
+```
+
+## Calling
+
+When calling a function, the name can be specified either through an alias or fully qualified
+
+```move=
+address 0x42 {
+module example {
+    public fun zero(): u64 { 0 }
+}
+}
+
+script {
+    use 0x42::example::{Self, zero};
+    fun call_zero() {
+        // With the `use` above all of these calls are equivalent
+        0x42::example::zero();
+        example::zero();
+        zero();
+    }
+}
+```
+
+When calling a function, an argument must be given for every parameter.
+
+```move=
+address 0x42 {
+module example {
+    public fun takes_none(): u64 { 0 }
+    public fun takes_one(x: u64): u64 { x }
+    public fun takes_two(x: u64, y: u64): u64 { x + y }
+    public fun takes_three(x: u64, y: u64, z: u64): u64 { x + y + z }
+}
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::takes_none();
+        example::takes_one(0);
+        example::takes_two(0, 1);
+        example::takes_three(0, 1, 2);
+    }
+}
+```
+
+Type arguments can be either specified or inferred. Both calls are equivalent.
+
+```move=
+address 0x42 {
+module example {
+    public fun id<T>(x: T): T { x }
+}
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::id(0);
+        example::id<u64>(0);
+    }
+}
+```
+
+For more details, see [Move generics](./generics.md).
+
+
+## Returning values
+
+The result of a function, its "return value", is the final value of its function body. For example
+
+```move=
+fun add(x: u64, y: u64): u64 {
+    x + y
+}
+```
+
+[As mentioned above](#function-body), the function's body is an [expression block](./variables.md). The expression block can sequence various statements, and the final expression in the block will be be the value of that block
+
+```move=
+fun double_and_add(x: u64, y: u64): u64 {
+    let double_x = x * 2;
+    let double_y = y * 2;
+    double_x + double_y
+}
+```
+
+The return value here is `double_x + double_y`
+
+### `return` expression
+
+A function implicitly returns the value that its body evaluates to. However, functions can also use the explicit `return` expression:
+
+```move
+fun f1(): u64 { return 0 }
+fun f2(): u64 { 0 }
+```
+
+These two functions are equivalent. In this slightly more involved example, the function subtracts two `u64` values, but returns early with `0` if the second value is too large:
+
+```move=
+fun safe_sub(x: u64, y: u64): u64 {
+    if (y > x) return 0;
+    x - y
+}
+```
+
+Note that the body of this function could also have been written as `if (y > x) 0 else x - y`.
+
+However `return` really shines is in exiting deep within other control flow constructs. In this example, the function iterates through a vector to find the index of a given value:
+
+```move=
+use std::vector;
+use std::option::{Self, Option};
+fun index_of<T>(v: &vector<T>, target: &T): Option<u64> {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        if (vector::borrow(v, i) == target) return option::some(i);
+        i = i + 1
+    };
+
+    option::none()
+}
+```
+
+Using `return` without an argument is shorthand for `return ()`. That is, the following two functions are equivalent:
+
+```move
+fun foo() { return }
+fun foo() { return () }
+```
+
+## Inline Functions
+
+Inline functions are functions which are expanded at caller side instead
+of compiled into Move bytecode. This allows to safe gas and may lead
+to faster execution. For example, one can define an inline function
+
+```move=
+inline fun percent(x: u64, y: u64):u64 { x * 100 / y }
+```
+
+Now, when call `percent(2, 200)` the compiler will inline the function
+definition as if the user has written `2 * 100 / 200`.
+
+### Function Parameters
+
+Inline functions support _function parameters_. This allows
+to define higher-order functions in Move which can comprehend common
+programming patterns. As inline functions are expanded at compilation time,
+this feature of function parameters can be supported without direct
+support for it in Move bytecode.
+
+Consider the following function (from the `vector` module):
+
+```move=
+/// Fold the function over the elements. For example, `fold(vector[1,2,3], 0, f)` will execute
+/// `f(f(f(0, 1), 2), 3)`
+public inline fun fold<Accumulator, Element>(
+    v: vector<Element>,
+    init: Accumulator,
+    f: |Accumulator,Element|Accumulator
+): Accumulator {
+  let accu = init;
+  foreach(v, |elem| accu = g(accu, elem));
+  accu
+}
+```
+
+Here, `foreach` is itself an inline function.
+
+In general, only lambda expressions can be passed to function parameters.
+Similar as the inline function itself, those lambdas are expanded at caller
+side. Notice that a lambda can access variables in the context, as in the
+example the variable `accu`.
diff --git a/vendors/move/crates/documentation/book/src/generics.md b/vendors/move/crates/documentation/book/src/generics.md
new file mode 100644
index 000000000..d7f0d437a
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/generics.md
@@ -0,0 +1,482 @@
+# Generics
+
+Generics can be used to define functions and structs over different input data types. This language feature is sometimes referred to as *parametric polymorphism*. In Move, we will often use the term generics interchangeably with type parameters and type arguments.
+
+Generics are commonly used in library code, such as in vector, to declare code that works over any possible instantiation (that satisfies the specified constraints). In other frameworks, generic code can sometimes be used to interact with global storage many different ways that all still share the same implementation.
+
+## Declaring Type Parameters
+
+Both functions and structs can take a list of type parameters in their signatures, enclosed by a pair of angle brackets `<...>`.
+
+### Generic Functions
+
+Type parameters for functions are placed after the function name and before the (value) parameter list. The following code defines a generic identity function that takes a value of any type and returns that value unchanged.
+
+```move
+fun id<T>(x: T): T {
+    // this type annotation is unnecessary but valid
+    (x: T)
+}
+```
+
+Once defined, the type parameter `T` can be used in parameter types, return types, and inside the function body.
+
+### Generic Structs
+
+Type parameters for structs are placed after the struct name, and can be used to name the types of the fields.
+
+```move
+struct Foo<T> has copy, drop { x: T }
+
+struct Bar<T1, T2> has copy, drop {
+    x: T1,
+    y: vector<T2>,
+}
+```
+
+Note that [type parameters do not have to be used](#unused-type-parameters)
+
+## Type Arguments
+
+### Calling Generic Functions
+
+When calling a generic function, one can specify the type arguments for the function's type parameters in a list enclosed by a pair of angle brackets.
+
+```move
+fun foo() {
+    let x = id<bool>(true);
+}
+```
+
+If you do not specify the type arguments, Move's [type inference](#type-inference) will supply them for you.
+
+### Using Generic Structs
+
+Similarly, one can attach a list of type arguments for the struct's type parameters when constructing or destructing values of generic types.
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: true };
+    let Foo<bool> { x } = foo;
+}
+```
+
+If you do not specify the type arguments, Move's [type inference](#type-inference) will supply them for you.
+
+### Type Argument Mismatch
+
+If you specify the type arguments and they conflict with the actual values supplied, an error will be given:
+
+```move
+fun foo() {
+    let x = id<u64>(true); // error! true is not a u64
+}
+```
+
+and similarly:
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: 0 }; // error! 0 is not a bool
+    let Foo<address> { x } = foo; // error! bool is incompatible with address
+}
+```
+
+## Type Inference
+
+In most cases, the Move compiler will be able to infer the type arguments so you don't have to write them down explicitly. Here's what the examples above would look like if we omit the type arguments:
+
+```move
+fun foo() {
+    let x = id(true);
+    //        ^ <bool> is inferred
+
+    let foo = Foo { x: true };
+    //           ^ <bool> is inferred
+
+    let Foo { x } = foo;
+    //     ^ <bool> is inferred
+}
+```
+
+Note: when the compiler is unable to infer the types, you'll need annotate them manually. A common scenario is to call a function with type parameters appearing only at return positions.
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        // let v = vector::new();
+        //                    ^ The compiler cannot figure out the element type.
+
+        let v = vector::new<u64>();
+        //                 ^~~~~ Must annotate manually.
+    }
+}
+}
+```
+
+However, the compiler will be able to infer the type if that return value is used later in that function:
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        let v = vector::new();
+        //                 ^ <u64> is inferred
+        vector::push_back(&mut v, 42);
+    }
+}
+}
+```
+
+## Unused Type Parameters
+
+For a struct definition,
+an unused type parameter is one that
+does not appear in any field defined in the struct,
+but is checked statically at compile time.
+Move allows unused type parameters so the following struct definition is valid:
+
+```move
+struct Foo<T> {
+    foo: u64
+}
+```
+
+This can be convenient when modeling certain concepts. Here is an example:
+
+```move
+address 0x2 {
+module m {
+    // Currency Specifiers
+    struct Currency1 {}
+    struct Currency2 {}
+
+    // A generic coin type that can be instantiated using a currency
+    // specifier type.
+    //   e.g. Coin<Currency1>, Coin<Currency2> etc.
+    struct Coin<Currency> has store {
+        value: u64
+    }
+
+    // Write code generically about all currencies
+    public fun mint_generic<Currency>(value: u64): Coin<Currency> {
+        Coin { value }
+    }
+
+    // Write code concretely about one currency
+    public fun mint_concrete(value: u64): Coin<Currency1> {
+        Coin { value }
+    }
+}
+}
+```
+
+In this example,
+`struct Coin<Currency>` is generic on the `Currency` type parameter,
+which specifies the currency of the coin and
+allows code to be written either
+generically on any currency or
+concretely on a specific currency.
+This genericity applies even when the `Currency` type parameter
+does not appear in any of the fields defined in `Coin`.
+
+### Phantom Type Parameters
+
+In the example above,
+although `struct Coin` asks for the `store` ability,
+neither `Coin<Currency1>` nor `Coin<Currency2>` will have the `store` ability.
+This is because of the rules for
+[Conditional Abilities and Generic Types](./abilities.md#conditional-abilities-and-generic-types)
+and the fact that `Currency1` and `Currency2` don't have the `store` ability,
+despite the fact that they are not even used in the body of `struct Coin`.
+This might cause some unpleasant consequences.
+For example, we are unable to put `Coin<Currency1>` into a wallet in the global storage.
+
+One possible solution would be to
+add spurious ability annotations to `Currency1` and `Currency2`
+(i.e., `struct Currency1 has store {}`).
+But, this might lead to bugs or security vulnerabilities
+because it weakens the types with unnecessary ability declarations.
+For example, we would never expect a resource in the global storage to have a field in type `Currency1`,
+but this would be possible with the spurious `store` ability.
+Moreover, the spurious annotations would be infectious,
+requiring many functions generic on the unused type parameter to also include the necessary constraints.
+
+Phantom type parameters solve this problem.
+Unused type parameters can be marked as *phantom* type parameters,
+which do not participate in the ability derivation for structs.
+In this way,
+arguments to phantom type parameters are not considered when deriving the abilities for generic types,
+thus avoiding the need for spurious ability annotations.
+For this relaxed rule to be sound,
+Move's type system guarantees that a parameter declared as `phantom` is either
+not used at all in the struct definition, or
+it is only used as an argument to type parameters also declared as `phantom`.
+
+#### Declaration
+
+In a struct definition
+a type parameter can be declared as phantom by adding the `phantom` keyword before its declaration.
+If a type parameter is declared as phantom we say it is a phantom type parameter.
+When defining a struct, Move's type checker ensures that every phantom type parameter is either
+not used inside the struct definition or
+it is only used as an argument to a phantom type parameter.
+
+More formally,
+if a type is used as an argument to a phantom type parameter
+we say the type appears in _phantom position_.
+With this definition in place,
+the rule for the correct use of phantom parameters can be specified as follows:
+**A phantom type parameter can only appear in phantom position**.
+
+The following two examples show valid uses of phantom parameters.
+In the first one,
+the parameter `T1` is not used at all inside the struct definition.
+In the second one, the parameter `T1` is only used as an argument to a phantom type parameter.
+
+```move
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 does not appear inside the struct definition
+
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 appears in phantom position
+```
+
+The following code shows examples of violations of the rule:
+
+```move
+struct S1<phantom T> { f: T }
+                          ^
+                          Error: Not a phantom position
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             Error: Not a phantom position
+```
+
+#### Instantiation
+
+When instantiating a struct,
+the arguments to phantom parameters are excluded when deriving the struct abilities.
+For example, consider the following code:
+
+```move
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+Consider now the type `S<HasCopy, NoCopy>`.
+Since `S` is defined with `copy` and all non-phantom arguments have `copy`
+then `S<HasCopy, NoCopy>` also has `copy`.
+
+#### Phantom Type Parameters with Ability Constraints
+
+Ability constraints and phantom type parameters are orthogonal features in the sense that
+phantom parameters can be declared with ability constraints.
+When instantiating a phantom type parameter with an ability constraint,
+the type argument has to satisfy that constraint,
+even though the parameter is phantom.
+For example, the following definition is perfectly valid:
+
+```move
+struct S<phantom T: copy> {}
+```
+
+The usual restrictions apply and `T` can only be instantiated with arguments having `copy`.
+
+## Constraints
+
+In the examples above, we have demonstrated how one can use type parameters to define "unknown" types that can be plugged in by callers at a later time. This however means the type system has little information about the type and has to perform checks in a very conservative way. In some sense, the type system must assume the worst case scenario for an unconstrained generic. Simply put, by default generic type parameters have no [abilities](./abilities.md).
+
+This is where constraints come into play: they offer a way to specify what properties these unknown types have so the type system can allow operations that would otherwise be unsafe.
+
+### Declaring Constraints
+
+Constraints can be imposed on type parameters using the following syntax.
+
+```move
+// T is the name of the type parameter
+T: <ability> (+ <ability>)*
+```
+
+The `<ability>` can be any of the four [abilities](./abilities.md), and a type parameter can be constrained with multiple abilities at once. So all of the following would be valid type parameter declarations:
+
+```move
+T: copy
+T: copy + drop
+T: copy + drop + store + key
+```
+
+### Verifying Constraints
+
+Constraints are checked at call sites so the following code won't compile.
+
+```move
+struct Foo<T: key> { x: T }
+
+struct Bar { x: Foo<u8> }
+//                  ^ error! u8 does not have 'key'
+
+struct Baz<T> { x: Foo<T> }
+//                     ^ error! T does not have 'key'
+```
+
+```move
+struct R {}
+
+fun unsafe_consume<T>(x: T) {
+    // error! x does not have 'drop'
+}
+
+fun consume<T: drop>(x: T) {
+    // valid!
+    // x will be dropped automatically
+}
+
+fun foo() {
+    let r = R {};
+    consume<R>(r);
+    //      ^ error! R does not have 'drop'
+}
+```
+
+```move
+struct R {}
+
+fun unsafe_double<T>(x: T) {
+    (copy x, x)
+    // error! x does not have 'copy'
+}
+
+fun double<T: copy>(x: T) {
+    (copy x, x) // valid!
+}
+
+fun foo(): (R, R) {
+    let r = R {};
+    double<R>(r)
+    //     ^ error! R does not have 'copy'
+}
+```
+
+For more information, see the abilities section on [conditional abilities and generic types](./abilities.md#conditional-abilities-and-generic-types).
+
+## Limitations on Recursions
+
+### Recursive Structs
+
+Generic structs can not contain fields of the same type, either directly or indirectly, even with different type arguments. All of the following struct definitions are invalid:
+
+```move
+struct Foo<T> {
+    x: Foo<u64> // error! 'Foo' containing 'Foo'
+}
+
+struct Bar<T> {
+    x: Bar<T> // error! 'Bar' containing 'Bar'
+}
+
+// error! 'A' and 'B' forming a cycle, which is not allowed either.
+struct A<T> {
+    x: B<T, u64>
+}
+
+struct B<T1, T2> {
+    x: A<T1>
+    y: A<T2>
+}
+```
+
+### Advanced Topic: Type-level Recursions
+
+Move allows generic functions to be called recursively. However, when used in combination with generic structs, this could create an infinite number of types in certain cases, and allowing this means adding unnecessary complexity to the compiler, vm and other language components. Therefore, such recursions are forbidden.
+
+Allowed:
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // Finitely many types -- allowed.
+    // foo<T> -> foo<T> -> foo<T> -> ... is valid
+    fun foo<T>() {
+        foo<T>();
+    }
+
+    // Finitely many types -- allowed.
+    // foo<T> -> foo<A<u64>> -> foo<A<u64>> -> ... is valid
+    fun foo<T>() {
+        foo<A<u64>>();
+    }
+}
+}
+```
+
+Not allowed:
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // Infinitely many types -- NOT allowed.
+    // error!
+    // foo<T> -> foo<A<T>> -> foo<A<A<T>>> -> ...
+    fun foo<T>() {
+        foo<Foo<T>>();
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module n {
+    struct A<T> {}
+
+    // Infinitely many types -- NOT allowed.
+    // error!
+    // foo<T1, T2> -> bar<T2, T1> -> foo<T2, A<T1>>
+    //   -> bar<A<T1>, T2> -> foo<A<T1>, A<T2>>
+    //   -> bar<A<T2>, A<T1>> -> foo<A<T2>, A<A<T1>>>
+    //   -> ...
+    fun foo<T1, T2>() {
+        bar<T2, T1>();
+    }
+
+    fun bar<T1, T2> {
+        foo<T1, A<T2>>();
+    }
+}
+}
+```
+
+Note, the check for type level recursions is based on a conservative analysis on the call sites and does NOT take control flow or runtime values into account.
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    fun foo<T>(n: u64) {
+        if (n > 0) {
+            foo<A<T>>(n - 1);
+        };
+    }
+}
+}
+```
+
+The function in the example above will technically terminate for any given input and therefore only creating finitely many types, but it is still considered invalid by Move's type system.
diff --git a/vendors/move/crates/documentation/book/src/global-storage-operators.md b/vendors/move/crates/documentation/book/src/global-storage-operators.md
new file mode 100644
index 000000000..19fd9d4f9
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/global-storage-operators.md
@@ -0,0 +1,250 @@
+# Global Storage - Operators
+
+Move programs can create, delete, and update [resources](./structs-and-resources.md) in global storage using the following five instructions:
+
+
+| Operation                              | Description                                                     | Aborts?                                 |
+---------------------------------------- |---------------------------------------------------------------- |---------------------------------------- |
+|`move_to<T>(&signer,T)`                 | Publish `T` under `signer.address`                              | If `signer.address` already holds a `T` |
+|`move_from<T>(address): T`              | Remove `T` from `address` and return it                         | If `address` does not hold a `T`        |
+|`borrow_global_mut<T>(address): &mut T` | Return a mutable reference to the `T` stored under `address`    | If `address` does not hold a `T`        |
+|`borrow_global<T>(address): &T`         | Return an immutable reference to the `T` stored under `address` | If `address` does not hold a `T`        |
+|`exists<T>(address): bool`              | Return `true` if a `T` is stored under `address`                |  Never                                  |
+
+
+Each of these instructions is parameterized by a type `T` with the [`key` ability](./abilities.md). However, each type `T` *must be declared in the current module*. This ensures that a resource can only be manipulated via the API exposed by its defining module. The instructions also take either an [`address`](./address.md) or [`&signer`](./signer.md) representing the account address where the resource of type `T` is stored.
+
+## References to resources
+
+References to global resources returned by `borrow_global` or `borrow_global_mut` mostly behave like references to local storage: they can be extended, read, and written using ordinary [reference operators](./references.md) and passed as arguments to other function. However, there is one important difference between local and global references: **a function cannot return a reference that points into global storage**. For example, these two functions will each fail to compile:
+
+```move
+struct R has key { f: u64 }
+// will not compile
+fun ret_direct_resource_ref_bad(a: address): &R {
+    borrow_global<R>(a) // error!
+}
+// also will not compile
+fun ret_resource_field_ref_bad(a: address): &u64 {
+    &borrow_global<R>(a).f // error!
+}
+```
+
+Move must enforce this restriction to guarantee absence of dangling references to global storage. [This](#reference-safety-for-global-resources) section contains much more detail for the interested reader.
+
+## Global storage operators with generics
+
+Global storage operations can be applied to generic resources with both instantiated and uninstantiated generic type parameters:
+
+```move
+struct Container<T> has key { t: T }
+
+// Publish a Container storing a type T of the caller's choosing
+fun publish_generic_container<T>(account: &signer, t: T) {
+    move_to<Container<T>>(account, Container { t })
+}
+
+/// Publish a container storing a u64
+fun publish_instantiated_generic_container(account: &signer, t: u64) {
+    move_to<Container<u64>>(account, Container { t })
+}
+```
+
+The ability to index into global storage via a type parameter chosen at runtime is a powerful Move feature known as *storage polymorphism*. For more on the design patterns enabled by this feature, see [Move generics](./generics.md).
+
+## Example: `Counter`
+
+The simple `Counter` module below exercises each of the five global storage operators. The API exposed by this module allows:
+
+- Anyone to publish a `Counter` resource under their account
+- Anyone to check if a `Counter` exists under any address
+- Anyone to read or increment the value of a `Counter` resource under any address
+- An account that stores a `Counter` resource to reset it to zero
+- An account that stores a `Counter` resource to remove and delete it
+
+```move
+address 0x42 {
+module counter {
+    use std::signer;
+
+    /// Resource that wraps an integer counter
+    struct Counter has key { i: u64 }
+
+    /// Publish a `Counter` resource with value `i` under the given `account`
+    public fun publish(account: &signer, i: u64) {
+      // "Pack" (create) a Counter resource. This is a privileged operation that
+      // can only be done inside the module that declares the `Counter` resource
+      move_to(account, Counter { i })
+    }
+
+    /// Read the value in the `Counter` resource stored at `addr`
+    public fun get_count(addr: address): u64 acquires Counter {
+        borrow_global<Counter>(addr).i
+    }
+
+    /// Increment the value of `addr`'s `Counter` resource
+    public fun increment(addr: address) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(addr).i;
+        *c_ref = *c_ref + 1
+    }
+
+    /// Reset the value of `account`'s `Counter` to 0
+    public fun reset(account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(signer::address_of(account)).i;
+        *c_ref = 0
+    }
+
+    /// Delete the `Counter` resource under `account` and return its value
+    public fun delete(account: &signer): u64 acquires Counter {
+        // remove the Counter resource
+        let c = move_from<Counter>(signer::address_of(account));
+        // "Unpack" the `Counter` resource into its fields. This is a
+        // privileged operation that can only be done inside the module
+        // that declares the `Counter` resource
+        let Counter { i } = c;
+        i
+    }
+
+    /// Return `true` if `addr` contains a `Counter` resource
+    public fun exists(addr: address): bool {
+        exists<Counter>(addr)
+    }
+}
+}
+```
+
+## Annotating functions with `acquires`
+
+In the `counter` example, you might have noticed that the `get_count`, `increment`, `reset`, and `delete` functions are annotated with `acquires Counter`. A Move function `m::f` must be annotated with `acquires T` if and only if:
+
+- The body of `m::f` contains a `move_from<T>`, `borrow_global_mut<T>`, or `borrow_global<T>` instruction, or
+- The body of `m::f` invokes a function `m::g` declared in the same module that is annotated with `acquires`
+
+For example, the following function inside `Counter` would need an `acquires` annotation:
+
+```move
+// Needs `acquires` because `increment` is annotated with `acquires`
+fun call_increment(addr: address): u64 acquires Counter {
+    counter::increment(addr)
+}
+```
+
+However, the same function *outside* `Counter` would not need an annotation:
+
+```move
+address 0x43 {
+module m {
+   use 0x42::counter;
+
+   // Ok. Only need annotation when resource acquired by callee is declared
+   // in the same module
+   fun call_increment(addr: address): u64 {
+       counter::increment(addr)
+   }
+}
+}
+```
+
+If a function touches multiple resources, it needs multiple `acquires`:
+
+```move=
+address 0x42 {
+module two_resources {
+    struct R1 has key { f: u64 }
+    struct R2 has key { g: u64 }
+
+    fun double_acquires(a: address): u64 acquires R1, R2 {
+        borrow_global<R1>(a).f + borrow_global<R2>.g
+    }
+}
+}
+```
+
+The `acquires` annotation does not take generic type parameters into account:
+
+```move=
+address 0x42 {
+module m {
+    struct R<T> has key { t: T }
+
+    // `acquires R`, not `acquires R<T>`
+    fun acquire_generic_resource<T: store>(a: addr) acquires R {
+        let _ = borrow_global<R<T>>(a);
+    }
+
+    // `acquires R`, not `acquires R<u64>
+    fun acquire_instantiated_generic_resource(a: addr) acquires R {
+        let _ = borrow_global<R<u64>>(a);
+    }
+}
+}
+```
+
+Finally: redundant `acquires` are not allowed. Adding this function inside `Counter` will result in a compilation error:
+
+```move
+// This code will not compile because the body of the function does not use a global
+// storage instruction or invoke a function with `acquires`
+fun redundant_acquires_bad() acquires Counter {}
+```
+
+For more information on `acquires`, see [Move functions](./functions.md).
+
+## Reference Safety For Global Resources
+
+Move prohibits returning global references and requires the `acquires` annotation to prevent dangling references. This allows Move to live up to its promise of static reference safety (i.e., no dangling references, no `null` or `nil` dereferences) for all [reference](./references.md) types.
+
+This example illustrates how the Move type system uses `acquires` to prevent a dangling reference:
+
+```move=
+address 0x42 {
+module dangling {
+    struct T has key { f: u64 }
+
+    fun borrow_then_remove_bad(a: address) acquires T {
+        let t_ref: &mut T = borrow_global_mut<T>(a);
+        let t = remove_t(a); // type system complains here
+        // t_ref now dangling!
+        let uh_oh = *&t_ref.f
+    }
+
+    fun remove_t(a: address): T acquires T {
+        move_from<T>(a)
+    }
+
+}
+}
+```
+
+In this code, line 6 acquires a reference to the `T` stored at address `a` in global storage. The callee `remove_t` then removes the value, which makes `t_ref` a dangling reference.
+
+Fortunately, this cannot happen because the type system will reject this program. The `acquires` annotation on `remove_t` lets the type system know that line 7 is dangerous, without having to recheck or introspect the body of `remove_t` separately!
+
+The restriction on returning global references prevents a similar, but even more insidious problem:
+
+```move=
+address 0x42 {
+module m1 {
+    struct T has key {}
+
+    public fun ret_t_ref(a: address): &T acquires T {
+        borrow_global<T>(a) // error! type system complains here
+    }
+
+    public fun remove_t(a: address) acquires T {
+        let T {} = move_from<T>(a);
+    }
+}
+
+module m2 {
+    fun borrow_then_remove_bad(a: address) {
+        let t_ref = m1::ret_t_ref(a);
+        let t = m1::remove_t(a); // t_ref now dangling!
+    }
+}
+}
+```
+
+Line 16 acquires a reference to a global resource `m1::T`, then line 17 removes that same resource, which makes `t_ref` dangle. In this case, `acquires` annotations do not help us because the `borrow_then_remove_bad` function is outside of the `m1` module that declares `T` (recall that `acquires` annotations can only be used for resources declared in the current module). Instead, the type system avoids this problem by preventing the return of a global reference at line 6.
+
+Fancier type systems that would allow returning global references without sacrificing reference safety are possible, and we may consider them in future iterations of Move. We chose the current design because it strikes a good balance between expressivity, annotation burden, and type system complexity.
diff --git a/vendors/move/crates/documentation/book/src/global-storage-structure.md b/vendors/move/crates/documentation/book/src/global-storage-structure.md
new file mode 100644
index 000000000..dc624e60c
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/global-storage-structure.md
@@ -0,0 +1,14 @@
+# Global Storage - Structure
+
+The purpose of Move programs is to [read from and write to](./global-storage-operators.md) tree-shaped persistent global storage. Programs cannot access the filesystem, network, or any other data outside of this tree.
+
+In pseudocode, the global storage looks something like:
+
+```move
+struct GlobalStorage {
+  resources: Map<(address, ResourceType), ResourceValue>
+  modules: Map<(address, ModuleName), ModuleBytecode>
+}
+```
+
+Structurally, global storage is a [forest](https://en.wikipedia.org/wiki/Tree_(graph_theory)) consisting of trees rooted at an account [`address`](./address.md). Each address can store both [resource](./structs-and-resources.md) data values and [module](./modules-and-scripts.md) code values. As the pseudocode above indicates, each `address` can store at most one resource value of a given type and at most one module with a given name.
diff --git a/vendors/move/crates/documentation/book/src/integers.md b/vendors/move/crates/documentation/book/src/integers.md
new file mode 100644
index 000000000..4864d2eff
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/integers.md
@@ -0,0 +1,153 @@
+# Integers
+
+Move supports six unsigned integer types: `u8`, `u16`, `u32`, `u64`, `u128`, and `u256`. Values of these types range from 0 to a maximum that depends on the size of the type.
+
+| Type                             | Value Range              |
+| -------------------------------- | ------------------------ |
+| Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 16-bit integer, `u16`   | 0 to 2<sup>16</sup> - 1  |
+| Unsigned 32-bit integer, `u32`   | 0 to 2<sup>32</sup> - 1  |
+| Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+| Unsigned 256-bit integer, `u256` | 0 to 2<sup>256</sup> - 1 |
+
+## Literals
+
+Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
+
+Number literals can be separated by underscores for grouping and readability. (e.g.,`1_234_5678`, `1_000u128`, `0xAB_CD_12_35`).
+
+If a literal is too large for its specified (or inferred) size range, an error is reported.
+
+### Examples
+
+```move
+// literals with explicit annotations;
+let explicit_u8 = 1u8;
+let explicit_u16 = 1u16;
+let explicit_u32 = 1u32;
+let explicit_u64 = 2u64;
+let explicit_u128 = 3u128;
+let explicit_u256 = 1u256;
+let explicit_u64_underscored = 154_322_973u64;
+
+// literals with simple inference
+let simple_u8: u8 = 1;
+let simple_u16: u16 = 1;
+let simple_u32: u32 = 1;
+let simple_u64: u64 = 2;
+let simple_u128: u128 = 3;
+let simple_u256: u256 = 1;
+
+// literals with more complex inference
+let complex_u8 = 1; // inferred: u8
+// right hand argument to shift must be u8
+let _unused = 10 << complex_u8;
+
+let x: u8 = 38;
+let complex_u8 = 2; // inferred: u8
+// arguments to `+` must have the same type
+let _unused = x + complex_u8;
+
+let complex_u128 = 133_876; // inferred: u128
+// inferred from function argument type
+function_that_takes_u128(complex_u128);
+
+// literals can be written in hex
+let hex_u8: u8 = 0x1;
+let hex_u16: u16 = 0x1BAE;
+let hex_u32: u32 = 0xDEAD80;
+let hex_u64: u64 = 0xCAFE;
+let hex_u128: u128 = 0xDEADBEEF;
+let hex_u256: u256 = 0x1123_456A_BCDE_F;
+```
+
+## Operations
+
+### Arithmetic
+
+Each of these types supports the same set of checked arithmetic operations. For all of these operations, both arguments (the left and right side operands) *must* be of the same type. If you need to operate over values of different types, you will need to first perform a [cast](#casting). Similarly, if you expect the result of the operation to be too large for the integer type, perform a [cast](#casting) to a larger size before performing the operation.
+
+All arithmetic operations abort instead of behaving in a way that mathematical integers would not (e.g., overflow, underflow, divide-by-zero).
+
+| Syntax | Operation | Aborts If
+|--------|-----------|-------------------------------------
+| `+` |addition | Result is too large for the integer type
+| `-` | subtraction | Result is less than zero
+| `*` | multiplication | Result is too large for the integer type
+| `%` | modular division | The divisor is `0`
+| `/` | truncating division | The divisor is `0`
+
+### Bitwise
+
+The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
+
+Bitwise operations do not abort.
+
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
+
+### Bit Shifts
+
+Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
+
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `16`, `32`, `64`, `128` or `256` for `u8`, `u16`, `u32`, `u64`, `u128` and `u256` respectively.
+
+| Syntax | Operation  | Aborts if
+|--------|------------|----------
+|`<<`    | shift left | Number of bits to shift by is greater than the size of the integer type
+|`>>`    | shift right| Number of bits to shift by is greater than the size of the integer type
+
+### Comparisons
+
+Integer types are the *only* types in Move that can use the comparison operators. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](#casting) one of them first.
+
+Comparison operations do not abort.
+
+| Syntax | Operation
+|--------|-----------
+| `<`    | less than
+| `>`    | greater than
+| `<=`   | less than or equal to
+| `>=`   | greater than or equal to
+
+### Equality
+
+Like all types with [`drop`](./abilities.md) in Move, all integer types support the ["equal"](./equality.md) and ["not equal"](./equality.md)  operations. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](#casting) one of them first.
+
+Equality operations do not abort.
+
+| Syntax | Operation
+|--------|----------
+| `==`   | equal
+| `!=`   | not equal
+
+For more details see the section on [equality](./equality.md)
+
+## Casting
+
+Integer types of one size can be cast to integer types of another size. Integers are the only types in Move that support casting.
+
+Casts *do not* truncate. Casting will abort if the result is too large for the specified type
+
+| Syntax     | Operation                                                                       | Aborts if
+|------------|---------------------------------------------------------------------------------|---------------------------------------
+| `(e as T)`| Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T`
+
+Here, the type of `e` must be `8`, `16`, `32`, `64`, `128` or `256` and `T` must be `u8`, `u16`, `u32`, `u64`, `u128` oe `u256`.
+
+For example:
+
+- `(x as u8)`
+- `(y as u16)`
+- `(873u16 as u32)`
+- `(2u8 as u64)`
+- `(1 + 3 as u128)`
+- `(4/2 + 12345 as u256)`
+
+## Ownership
+
+As with the other scalar values built-in to the language, integer values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/crates/documentation/book/src/introduction.md b/vendors/move/crates/documentation/book/src/introduction.md
new file mode 100644
index 000000000..c2417c517
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/introduction.md
@@ -0,0 +1,27 @@
+# Introduction
+
+Welcome to Move, a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. Move allows developers to write programs that flexibly manage and transfer assets, while providing the security and protections against attacks on those assets. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource types with move (hence the name) semantics as an explicit representation of digital assets, such as currency.
+
+## Who is Move for?
+
+Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
+
+The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
+
+### Hobbyists
+
+Understanding that the capability to create custom modules on the Diem Payment Network will not be available at launch, the hobbyist Move Developer is interested in learning the intricacies of the language. She will understand the basic syntax, the standard libraries available, and write example code that can be executed using the Move CLI. The Move Developer may even want to dig into understanding how the Move Virtual Machine executes the code she writes.
+
+### Core Contributor
+
+Beyond a hobbyist wanting to stay ahead of the curve for the core programming language is someone who may want to [contribute](https://diem.com/en-US/cla-sign/) directly to Move. Whether this includes submitting language improvements or even, in the future, adding core modules available on the Diem Payment Network, the core contributor will understand Move at a deep level.
+
+### Who Move is currently not targeting
+
+Currently, Move is not targeting developers who wish to create custom modules and contracts for use on the Diem Payment Network. We are also not targeting novice developers who expect a completely polished developer experience even in testing the language.
+
+## Where Do I Start?
+
+Begin with understanding [modules and scripts](./modules-and-scripts.md) and then work through the [Move Tutorial](./creating-coins.md).
diff --git a/vendors/move/crates/documentation/book/src/loops.md b/vendors/move/crates/documentation/book/src/loops.md
new file mode 100644
index 000000000..2dfac3fdd
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/loops.md
@@ -0,0 +1,184 @@
+# While and Loop
+
+Move offers two constructs for looping: `while` and `loop`.
+
+## `while` loops
+
+The `while` construct repeats the body (an expression of type unit) until the condition (an expression of type `bool`) evaluates to `false`.
+
+Here is an example of simple `while` loop that computes the sum of the numbers from `1` to `n`:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 1;
+    while (i <= n) {
+        sum = sum + i;
+        i = i + 1
+    };
+
+    sum
+}
+```
+
+Infinite loops are allowed:
+
+```move=
+fun foo() {
+    while (true) { }
+}
+```
+
+### `break`
+
+The `break` expression can be used to exit a loop before the condition evaluates to `false`. For example, this loop uses `break` to find the smallest factor of `n` that's greater than 1:
+
+```move
+fun smallest_factor(n: u64): u64 {
+    // assuming the input is not 0 or 1
+    let i = 2;
+    while (i <= n) {
+        if (n % i == 0) break;
+        i = i + 1
+    };
+
+    i
+}
+```
+
+The `break` expression cannot be used outside of a loop.
+
+### `continue`
+
+The `continue` expression skips the rest of the loop and continues to the next iteration. This loop uses `continue` to compute the sum of `1, 2, ..., n`, except when the number is divisible by 10:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    while (i < n) {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        sum = sum + i;
+    };
+
+    sum
+}
+```
+
+The `continue` expression cannot be used outside of a loop.
+
+### The type of `break` and `continue`
+
+`break` and `continue`, much like `return` and `abort`, can have any type. The following examples illustrate where this flexible typing can be helpful:
+
+```move
+fun pop_smallest_while_not_equal(
+    v1: vector<u64>,
+    v2: vector<u64>,
+): vector<u64> {
+    let result = vector::empty();
+    while (!vector::is_empty(&v1) && !vector::is_empty(&v2)) {
+        let u1 = *vector::borrow(&v1, vector::length(&v1) - 1);
+        let u2 = *vector::borrow(&v2, vector::length(&v2) - 1);
+        let popped =
+            if (u1 < u2) vector::pop_back(&mut v1)
+            else if (u2 < u1) vector::pop_back(&mut v2)
+            else break; // Here, `break` has type `u64`
+        vector::push_back(&mut result, popped);
+    };
+
+    result
+}
+```
+
+```move
+fun pick(
+    indexes: vector<u64>,
+    v1: &vector<address>,
+    v2: &vector<address>
+): vector<address> {
+    let len1 = vector::length(v1);
+    let len2 = vector::length(v2);
+    let result = vector::empty();
+    while (!vector::is_empty(&indexes)) {
+        let index = vector::pop_back(&mut indexes);
+        let chosen_vector =
+            if (index < len1) v1
+            else if (index < len2) v2
+            else continue; // Here, `continue` has type `&vector<address>`
+        vector::push_back(&mut result, *vector::borrow(chosen_vector, index))
+    };
+
+    result
+}
+```
+
+## The `loop` expression
+
+The `loop` expression repeats the loop body (an expression with type `()`) until it hits a `break`
+
+Without a `break`, the loop will continue forever
+
+```move
+fun foo() {
+    let i = 0;
+    loop { i = i + 1 }
+}
+```
+
+Here is an example that uses `loop` to write the `sum` function:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+As you might expect, `continue` can also be used inside a `loop`. Here is `sum_intermediate` from above rewritten using `loop` instead of `while`
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+## The type of `while` and `loop`
+
+Move loops are typed expressions. A `while` expression always has type `()`.
+
+```move
+let () = while (i < 10) { i = i + 1 };
+```
+
+If a `loop` contains a `break`, the expression has type unit `()`
+
+```move
+(loop { if (i < 10) i = i + 1 else break }: ());
+let () = loop { if (i < 10) i = i + 1 else break };
+```
+
+If `loop` does not have a `break`, `loop` can have any type much like `return`, `abort`, `break`, and `continue`.
+
+```move
+(loop (): u64);
+(loop (): address);
+(loop (): &vector<vector<u8>>);
+```
diff --git a/vendors/move/crates/documentation/book/src/modules-and-scripts.md b/vendors/move/crates/documentation/book/src/modules-and-scripts.md
new file mode 100644
index 000000000..f3580e4de
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/modules-and-scripts.md
@@ -0,0 +1,131 @@
+# Modules and Scripts
+
+Move has two different types of programs: ***Modules*** and ***Scripts***. Modules are libraries that define struct types along with functions that operate on these types. Struct types define the schema of Move's [global storage](./global-storage-structure.md), and module functions define the rules for updating storage. Modules themselves are also stored in global storage. Scripts are executable entrypoints similar to a `main` function in a conventional language. A script typically calls functions of a published module that perform updates to global storage. Scripts are ephemeral code snippets that are not published in global storage.
+
+A Move source file (or **compilation unit**) may contain multiple modules and scripts. However, publishing a module or executing a script are separate VM operations.
+
+## Syntax
+
+### Scripts
+
+A script has the following structure:
+
+```text
+script {
+    <use>*
+    <constants>*
+    fun <identifier><[type parameters: constraint]*>([identifier: type]*) <function_body>
+}
+```
+
+A `script` block must start with all of its [`use`](./uses.md) declarations, followed by any [constants](./constants.md) and (finally) the main
+[function](./functions.md) declaration.
+The main function can have any name (i.e., it need not be called `main`), is the only function in a script block, can have any number of
+arguments, and must not return a value. Here is an example with each of these components:
+
+```move
+script {
+    // Import the debug module published at the named account address std.
+    use std::debug;
+
+    const ONE: u64 = 1;
+
+    fun main(x: u64) {
+        let sum = x + ONE;
+        debug::print(&sum)
+    }
+}
+```
+
+Scripts have very limited power—they cannot declare friends, struct types or access global storage. Their primary purpose is to invoke module functions.
+
+### Modules
+
+A module has the following syntax:
+
+```text
+module <address>::<identifier> {
+    (<use> | <friend> | <type> | <function> | <constant>)*
+}
+```
+
+where `<address>` is a valid [named or literal address](./address.md).
+
+For example:
+
+```move
+module 0x42::test {
+    struct Example has copy, drop { i: u64 }
+
+    use std::debug;
+    friend 0x42::another_test;
+
+    const ONE: u64 = 1;
+
+    public fun print(x: u64) {
+        let sum = x + ONE;
+        let example = Example { i: sum };
+        debug::print(&sum)
+    }
+}
+```
+
+The `module 0x42::test` part specifies that the module `test` will be published under the [account address](./address.md) `0x42` in [global storage](./global-storage-structure.md).
+
+Modules can also be declared using [named addresses](./address.md). For example:
+
+```move
+module test_addr::test {
+    struct Example has copy, drop { a: address }
+
+    use std::debug;
+    friend test_addr::another_test;
+
+    public fun print() {
+        let example = Example { a: @test_addr };
+        debug::print(&example)
+    }
+}
+```
+
+Because named addresses only exist at the source language level and during compilation,
+named addresses will be fully substituted for their value at the bytecode
+level. For example if we had the following code:
+
+```move
+script {
+    fun example() {
+        my_addr::m::foo(@my_addr);
+    }
+}
+```
+
+and we compiled it with `my_addr` set to `0xC0FFEE`, then it would be equivalent
+to the following operationally:
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::m::foo(@0xC0FFEE);
+    }
+}
+```
+
+However at the source level, these _are not equivalent_—the function
+`m::foo` _must_ be accessed through the `my_addr` named address, and not through
+the numerical value assigned to that address.
+
+Module names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, module names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+module my_module {}
+module foo_bar_42 {}
+```
+
+Typically, module names start with an lowercase letter. A module named `my_module` should be stored in a source file named `my_module.move`.
+
+All elements inside a `module` block can appear in any order.
+Fundamentally, a module is a collection of [`types`](./structs-and-resources.md) and [`functions`](./functions.md).
+The [`use`](./uses.md) keyword is used to import types from other modules.
+The [`friend`](./friends.md) keyword specifies a list of trusted modules.
+The [`const`](./constants.md) keyword defines private constants that can be used in the functions of a module.
diff --git a/vendors/move/crates/documentation/book/src/overview.md b/vendors/move/crates/documentation/book/src/overview.md
new file mode 100644
index 000000000..d08bf4352
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/overview.md
@@ -0,0 +1,200 @@
+---
+id: overview
+title: Overview
+sidebar_label: Move
+---
+
+Move is a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+### Start Here
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/introduction-to-move.svg"
+    iconDark="img/introduction-to-move-dark.svg"
+    overlay="Understand Move’s background, current status and architecture"
+    title="Introduction"
+    to="/docs/move/move-introduction"
+  />
+  <SimpleTextCard
+    icon="img/modules-and-scripts.svg"
+    iconDark="img/modules-and-scripts-dark.svg"
+    overlay="Understand Move’s two different types of programs: Modules and Scripts"
+    title="Modules and Scripts"
+    to="/docs/move/move-modules-and-scripts"
+  />
+  <SimpleTextCard
+    icon="img/placeholder.svg"
+    iconDark="img/placeholder-dark.svg"
+    overlay="Play with Move directly as you create coins with the language"
+    title="First Tutorial: Creating Coins"
+    to="/docs/move/move-tutorial-creating-coins"
+  />
+</CardsWrapper>
+
+### Primitive Types
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="Move supports three unsigned integer types: u8, u64, and u128"
+    title="Integers"
+    to="/docs/move/move-integers"
+  />
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="bool is Move's primitive type for boolean true and false values."
+    title="Bool"
+    to="/docs/move/move-bool"
+  />
+  <SimpleTextCard
+    icon="img/address.svg"
+    iconDark="img/address-dark.svg"
+    overlay="address is a built-in type in Move that is used to represent locations in global storage"
+    title="Address"
+    to="/docs/move/move-address"
+  />
+  <SimpleTextCard
+    icon="img/vector.svg"
+    iconDark="img/vector-dark.svg"
+    overlay="vector<T> is the only primitive collection type provided by Move"
+    title="Vector"
+    to="/docs/move/move-vector"
+  />
+  <SimpleTextCard
+    icon="img/signer.svg"
+    iconDark="img/signer-dark.svg"
+    overlay="signer is a built-in Move resource type. A signer is a capability that allows the holder to act on behalf of a particular address"
+    title="Signer"
+    to="/docs/move/move-signer"
+  />
+  <SimpleTextCard
+    icon="img/move-references.svg"
+    iconDark="img/move-references-dark.svg"
+    overlay="Move has two types of references: immutable & and mutable &mut"
+    title="References"
+    to="/docs/move/move-references"
+  />
+  <SimpleTextCard
+    icon="img/tuples.svg"
+    iconDark="img/tuples-dark.svg"
+    overlay="In order to support multiple return values, Move has tuple-like expressions. We can consider unit() to be an empty tuple"
+    title="Tuples and Unit"
+    to="/docs/move/move-tuples-and-unit"
+  />
+</CardsWrapper>
+
+### Basic Concepts
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/local-variables-and-scopes.svg"
+    iconDark="img/local-variables-and-scopes-dark.svg"
+    overlay="Local variables in Move are lexically (statically) scoped"
+    title="Local Variables and Scopes"
+    to="/docs/move/move-variables"
+  />
+  <SimpleTextCard
+    icon="img/abort-and-return.svg"
+    iconDark="img/abort-and-return-dark.svg"
+    overlay="return and abort are two control flow constructs that end execution, one for the current function and one for the entire transaction"
+    title="Abort & Assert"
+    to="/docs/move/move-abort-and-assert"
+  />
+  <SimpleTextCard
+    icon="img/conditionals.svg"
+    iconDark="img/conditionals-dark.svg"
+    overlay="An if expression specifies that some code should only be evaluated if a certain condition is true"
+    title="Conditionals"
+    to="/docs/move/move-conditionals"
+  />
+  <SimpleTextCard
+    icon="img/loops.svg"
+    iconDark="img/loops-dark.svg"
+    overlay="Move offers two constructs for looping: while and loop"
+    title="While and Loop"
+    to="/docs/move/move-while-and-loop"
+  />
+  <SimpleTextCard
+    icon="img/functions.svg"
+    iconDark="img/functions-dark.svg"
+    overlay="Function syntax in Move is shared between module functions and script functions"
+    title="Functions"
+    to="/docs/move/move-functions"
+  />
+  <SimpleTextCard
+    icon="img/structs-and-resources.svg"
+    iconDark="img/structs-and-resources-dark.svg"
+    overlay="A struct is a user-defined data structure containing typed fields. A resource is a kind of struct that cannot be copied and cannot be dropped"
+    title="Structs and Resources"
+    to="/docs/move/move-structs-and-resources"
+  />
+  <SimpleTextCard
+    icon="img/constants.svg"
+    iconDark="img/constants-dark.svg"
+    overlay="Constants are a way of giving a name to shared, static values inside of a module or script"
+    title="Constants"
+    to="/docs/move/move-constants"
+  />
+  <SimpleTextCard
+    icon="img/generics.svg"
+    iconDark="img/generics-dark.svg"
+    overlay="Generics can be used to define functions and structs over different input data types"
+    title="Generics"
+    to="/docs/move/move-generics"
+  />
+  <SimpleTextCard
+    icon="img/equality.svg"
+    iconDark="img/equality-dark.svg"
+    overlay="Move supports two equality operations == and !="
+    title="Equality"
+    to="/docs/move/move-equality"
+  />
+  <SimpleTextCard
+    icon="img/uses-and-aliases.svg"
+    iconDark="img/uses-and-aliases-dark.svg"
+    overlay="The use syntax can be used to create aliases to members in other modules"
+    title="Uses & Aliases"
+    to="/docs/move/move-uses-and-aliases"
+  />
+</CardsWrapper>
+
+### Global Storage
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="The purpose of Move programs is to read from and write to persistent global storage"
+    title="Global Storage Structure"
+    to="/docs/move/move-global-storage-structure"
+  />
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="Move programs can create, delete, and update resources in global storage using five instructions"
+    title="Global Storage Operators"
+    to="/docs/move/move-global-storage-operators"
+  />
+</CardsWrapper>
+
+### Reference
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/standard-library.svg"
+    iconDark="img/standard-library-dark.svg"
+    overlay="The Move standard library exposes interfaces that implement functionality on vectors, option types, error codes and fixed-point numbers"
+    title="Standard Library"
+    to="/docs/move/move-standard-library"
+  />
+  <SimpleTextCard
+    icon="img/coding-conventions.svg"
+    iconDark="img/coding-conventions-dark.svg"
+    overlay="There are basic coding conventions when writing Move code"
+    title="Coding Conventions"
+    to="/docs/move/move-coding-conventions"
+  />
+</CardsWrapper>
diff --git a/vendors/move/crates/documentation/book/src/packages.md b/vendors/move/crates/documentation/book/src/packages.md
new file mode 100644
index 000000000..c4abace5c
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/packages.md
@@ -0,0 +1,292 @@
+# Packages
+
+Packages allow Move programmers to more easily re-use code and share it
+across projects. The Move package system allows programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by [named addresses](./address.md);
+* Import and use packages in other Move code and instantiate named addresses;
+* Build packages and generate associated compilation artifacts from packages; and
+* Work with a common interface around compiled Move artifacts.
+
+## Package Layout and Manifest Syntax
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+```
+a_move_package
+├── Move.toml      (required)
+├── sources        (required)
+├── examples       (optional, test & dev mode)
+├── scripts        (optional)
+├── doc_templates  (optional)
+└── tests          (optional, test mode)
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any documentation templates present in
+the `doc_templates` directory.
+
+### Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+```
+[package]
+name = <string>                  # e.g., "MoveStdlib"
+version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+[addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+# One or more lines declaring named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+[dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+# One or more lines declaring dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # local dependencies
+<string> = { git = <URL ending in .git>, subdir=<path to dir containing Move.toml inside git repo>, rev=<git commit hash>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # git dependencies
+
+[dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+[dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+
+An example of a minimal package manifest with one local dependency and one git dependency:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+license = "Apache 2.0"
+
+[addresses]
+address_to_be_filled_in = "_"
+specified_address = "0xB0B"
+
+[dependencies]
+# Local dependency
+LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
+# Git dependency
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b" }
+
+[dev-addresses] # For use when developing this module
+address_to_be_filled_in = "0x101010101"
+```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+## Named Addresses During Compilation
+
+Recall that Move has [named addresses](./address.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+### Declaration
+
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
+```move
+module named_addr::A {
+    public fun x(): address { @named_addr }
+}
+```
+
+We could in `example_pkg/Move.toml` declare the named address `named_addr` in
+two different ways. The first:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+```
+
+Declares `named_addr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `named_addr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `named_addr`, and the package can then be
+instantiated later on by an importing package.
+
+`named_addr` can also be declared as:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "0xCAFE"
+```
+
+which states that the named address `named_addr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+## Scoping and Renaming of Named Addresses
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `named_addr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+```
+[package]
+name = "P"
+...
+[dependencies]
+P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+P2 = { local = "some_path_to_P2"  }
+```
+
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+```
+module N::A {
+    public fun x(): address { @P1N }
+}
+```
+
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+### Instantiation
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `named_addr` would be uninstantiated:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+
+[dev-addresses]
+named_addr = "0xC0FFEE"
+```
+
+## Usage, Artifacts, and Data Structures
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+### Usage
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
diff --git a/vendors/move/crates/documentation/book/src/references.md b/vendors/move/crates/documentation/book/src/references.md
new file mode 100644
index 000000000..57a5b99e1
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/references.md
@@ -0,0 +1,235 @@
+# References
+
+Move has two types of references: immutable `&` and mutable `&mut`. Immutable references are read
+only, and cannot modify the underlying value (or any of its fields). Mutable references allow for
+modifications via a write through that reference. Move's type system enforces an ownership
+discipline that prevents reference errors.
+
+For more details on the rules of references, see [Structs and Resources](./structs-and-resources.md)
+
+## Reference Operators
+
+Move provides operators for creating and extending references as well as converting a mutable
+reference to an immutable one. Here and elsewhere, we use the notation `e: T` for "expression `e`
+has type `T`".
+
+| Syntax      | Type                                                  | Description                                                    |
+| ----------- | ----------------------------------------------------- | -------------------------------------------------------------- |
+| `&e`        | `&T` where `e: T` and `T` is a non-reference type     | Create an immutable reference to `e`                           |
+| `&mut e`    | `&mut T` where `e: T` and `T` is a non-reference type | Create a mutable reference to `e`.                             |
+| `&e.f`      | `&T` where `e.f: T`                                   | Create an immutable reference to field `f` of struct `e`.      |
+| `&mut e.f`  | `&mut T` where `e.f: T`                               | Create a mutable reference to field `f` of struct`e`.          |
+| `freeze(e)` | `&T` where `e: &mut T`                                | Convert the mutable reference `e` into an immutable reference. |
+
+The `&e.f` and `&mut e.f` operators can be used both to create a new reference into a struct or to
+extend an existing reference:
+
+```move
+let s = S { f: 10 };
+let f_ref1: &u64 = &s.f; // works
+let s_ref: &S = &s;
+let f_ref2: &u64 = &s_ref.f // also works
+```
+
+A reference expression with multiple fields works as long as both structs are in the same module:
+
+```move
+struct A { b: B }
+struct B { c : u64 }
+fun f(a: &A): &u64 {
+  &a.b.c
+}
+```
+
+Finally, note that references to references are not allowed:
+
+```move
+let x = 7;
+let y: &u64 = &x;
+let z: &&u64 = &y; // will not compile
+```
+
+## Reading and Writing Through References
+
+Both mutable and immutable references can be read to produce a copy of the referenced value.
+
+Only mutable references can be written. A write `*x = v` discards the value previously stored in `x`
+and updates it with `v`.
+
+Both operations use the C-like `*` syntax. However, note that a read is an expression, whereas a
+write is a mutation that must occur on the left hand side of an equals.
+
+| Syntax     | Type                                | Description                         |
+| ---------- | ----------------------------------- | ----------------------------------- |
+| `*e`       | `T` where `e` is `&T` or `&mut T`   | Read the value pointed to by `e`    |
+| `*e1 = e2` | `()` where `e1: &mut T` and `e2: T` | Update the value in `e1` with `e2`. |
+
+In order for a reference to be read, the underlying type must have the
+[`copy` ability](./abilities.md) as reading the reference creates a new copy of the value. This rule
+prevents the copying of resource values:
+
+```move=
+fun copy_resource_via_ref_bad(c: Coin) {
+    let c_ref = &c;
+    let counterfeit: Coin = *c_ref; // not allowed!
+    pay(c);
+    pay(counterfeit);
+}
+```
+
+Dually: in order for a reference to be written to, the underlying type must have the
+[`drop` ability](./abilities.md) as writing to the reference will discard (or "drop") the old value.
+This rule prevents the destruction of resource values:
+
+```move=
+fun destroy_resource_via_ref_bad(ten_coins: Coin, c: Coin) {
+    let ref = &mut ten_coins;
+    *ref = c; // not allowed--would destroy 10 coins!
+}
+```
+
+## `freeze` inference
+
+A mutable reference can be used in a context where an immutable reference is expected:
+
+```move
+let x = 7;
+let y: &u64 = &mut x;
+```
+
+This works because the under the hood, the compiler inserts `freeze` instructions where they are
+needed. Here are a few more examples of `freeze` inference in action:
+
+```move=
+fun takes_immut_returns_immut(x: &u64): &u64 { x }
+
+// freeze inference on return value
+fun takes_mut_returns_immut(x: &mut u64): &u64 { x }
+
+fun expression_examples() {
+    let x = 0;
+    let y = 0;
+    takes_immut_returns_immut(&x); // no inference
+    takes_immut_returns_immut(&mut x); // inferred freeze(&mut x)
+    takes_mut_returns_immut(&mut x); // no inference
+
+    assert!(&x == &mut y, 42); // inferred freeze(&mut y)
+}
+
+fun assignment_examples() {
+    let x = 0;
+    let y = 0;
+    let imm_ref: &u64 = &x;
+
+    imm_ref = &x; // no inference
+    imm_ref = &mut y; // inferred freeze(&mut y)
+}
+```
+
+### Subtyping
+
+With this `freeze` inference, the Move type checker can view `&mut T` as a subtype of `&T`. As shown
+above, this means that anywhere for any expression where a `&T` value is used, a `&mut T` value can
+also be used. This terminology is used in error messages to concisely indicate that a `&mut T` was
+needed where a `&T` was supplied. For example
+
+```move=
+address 0x42 {
+module example {
+    fun read_and_assign(store: &mut u64, new_value: &u64) {
+        *store = *new_value
+    }
+
+    fun subtype_examples() {
+        let x: &u64 = &0;
+        let y: &mut u64 = &mut 1;
+
+        x = &mut 1; // valid
+        y = &2; // invalid!
+
+        read_and_assign(y, x); // valid
+        read_and_assign(x, y); // invalid!
+    }
+}
+}
+```
+
+will yield the following error messages
+
+```text
+error:
+
+    ┌── example.move:12:9 ───
+    │
+ 12 │         y = &2; // invalid!
+    │         ^ Invalid assignment to local 'y'
+    ·
+ 12 │         y = &2; // invalid!
+    │             -- The type: '&{integer}'
+    ·
+  9 │         let y: &mut u64 = &mut 1;
+    │                -------- Is not a subtype of: '&mut u64'
+    │
+
+error:
+
+    ┌── example.move:15:9 ───
+    │
+ 15 │         read_and_assign(x, y); // invalid!
+    │         ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x42::example::read_and_assign'. Invalid argument for parameter 'store'
+    ·
+  8 │         let x: &u64 = &0;
+    │                ---- The type: '&u64'
+    ·
+  3 │     fun read_and_assign(store: &mut u64, new_value: &u64) {
+    │                                -------- Is not a subtype of: '&mut u64'
+    │
+```
+
+The only other types currently that has subtyping are [tuples](./tuples.md)
+
+## Ownership
+
+Both mutable and immutable references can always be copied and extended _even if there are existing
+copies or extensions of the same reference_:
+
+```move
+fun reference_copies(s: &mut S) {
+  let s_copy1 = s; // ok
+  let s_extension = &mut s.f; // also ok
+  let s_copy2 = s; // still ok
+  ...
+}
+```
+
+This might be surprising for programmers familiar with Rust's ownership system, which would reject
+the code above. Move's type system is more permissive in its treatment of
+[copies](./variables.md#move-and-copy), but equally strict in ensuring unique ownership of mutable
+references before writes.
+
+### References Cannot Be Stored
+
+References and tuples are the _only_ types that cannot be stored as a field value of structs, which
+also means that they cannot exist in global storage. All references created during program execution
+will be destroyed when a Move program terminates; they are entirely ephemeral. This invariant is
+also true for values of types without the `store` [ability](./abilities.md), but note that
+references and tuples go a step further by never being allowed in structs in the first place.
+
+This is another difference between Move and Rust, which allows references to be stored inside of
+structs.
+
+Currently, Move cannot support this because references cannot be
+[serialized](https://en.wikipedia.org/wiki/Serialization), but _every Move value must be
+serializable_. This requirement comes from Move's
+[persistent global storage](./global-storage-structure.md), which needs to serialize values to
+persist them across program executions. Structs can be written to global storage, and thus they must
+be serializable.
+
+One could imagine a fancier, more expressive, type system that would allow references to be stored
+in structs _and_ ban those structs from existing in global storage. We could perhaps allow
+references inside of structs that do not have the `store` [ability](./abilities.md), but that would
+not completely solve the problem: Move has a fairly complex system for tracking static reference
+safety, and this aspect of the type system would also have to be extended to support storing
+references inside of structs. In short, Move's type system (particularly the aspects around
+reference safety) would have to expand to support stored references. But it is something we are
+keeping an eye on as the language evolves.
diff --git a/vendors/move/crates/documentation/book/src/signer.md b/vendors/move/crates/documentation/book/src/signer.md
new file mode 100644
index 000000000..820963c8b
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/signer.md
@@ -0,0 +1,73 @@
+# Signer
+
+`signer` is a built-in Move resource type. A `signer` is a
+[capability](https://en.wikipedia.org/wiki/Object-capability_model) that allows the holder to act on
+behalf of a particular `address`. You can think of the native implementation as being:
+
+```move
+struct signer has drop { a: address }
+```
+
+A `signer` is somewhat similar to a Unix [UID](https://en.wikipedia.org/wiki/User_identifier) in
+that it represents a user authenticated by code _outside_ of Move (e.g., by checking a cryptographic
+signature or password).
+
+## Comparison to `address`
+
+A Move program can create any `address` value without special permission using address literals:
+
+```move
+let a1 = @0x1;
+let a2 = @0x2;
+// ... and so on for every other possible address
+```
+
+However, `signer` values are special because they cannot be created via literals or
+instructions--only by the Move VM. Before the VM runs a script with parameters of type `signer`, it
+will automatically create `signer` values and pass them into the script:
+
+```move
+script {
+    use std::signer;
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @0x42, 0);
+    }
+}
+```
+
+This script will abort with code `0` if the script is sent from any address other than `0x42`.
+
+A transaction script can have an arbitrary number of `signer`s as long as the `signer`s are a prefix
+to any other arguments. In other words, all of the `signer` arguments must come first:
+
+```move
+script {
+    use std::signer;
+    fun main(s1: signer, s2: signer, x: u64, y: u8) {
+        // ...
+    }
+}
+```
+
+This is useful for implementing _multi-signer scripts_ that atomically act with the authority of
+multiple parties. For example, an extension of the script above could perform an atomic currency
+swap between `s1` and `s2`.
+
+## `signer` Operators
+
+The `std::signer` standard library module provides two utility functions over `signer` values:
+
+| Function                                    | Description                                                    |
+| ------------------------------------------- | -------------------------------------------------------------  |
+| `signer::address_of(&signer): address`      | Return the `address` wrapped by this `&signer`.                |
+| `signer::borrow_address(&signer): &address` | Return a reference to the `address` wrapped by this `&signer`. |
+
+In addition, the `move_to<T>(&signer, T)` [global storage operator](./global-storage-operators.md)
+requires a `&signer` argument to publish a resource `T` under `signer.address`'s account. This
+ensures that only an authenticated user can elect to publish a resource under their `address`.
+
+## Ownership
+
+Unlike simple scalar values, `signer` values are not copyable, meaning they cannot be copied (from
+any operation whether it be through an explicit [`copy`](./variables.md#move-and-copy) instruction
+or through a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/vendors/move/crates/documentation/book/src/standard-library.md b/vendors/move/crates/documentation/book/src/standard-library.md
new file mode 100644
index 000000000..045c99aa4
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/standard-library.md
@@ -0,0 +1,542 @@
+# Standard Library
+
+The Move standard library exposes interfaces that implement the following functionality:
+* [Basic operations on vectors](#vector).
+* [Option types and operations on`Option` types](#option).
+* [A common error encoding code interface for abort codes](#errors).
+* [32-bit precision fixed-point numbers](#fixed_point32).
+
+## vector
+
+The `vector` module defines a number of operations over the primitive
+[`vector`](./vector.md) type. The module is published under the
+named address `Std` and consists of a number of native functions, as
+well as functions defined in Move. The API for this module is as follows.
+
+### Functions
+
+---------------------------------------------------------------------------
+
+Create an empty [`vector`](./vector.md).
+The `Element` type can be both a `resource` or `copyable` type.
+
+```move
+    native public fun empty<Element>(): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a vector of length `1` containing the passed in `element`.
+
+```move
+    public fun singleton<Element>(e: Element): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Destroy (deallocate) the vector `v`. Will abort if `v` is non-empty.
+*Note*: The emptiness restriction is due to the fact that `Element` can be a
+resource type, and destruction of a non-empty vector would violate
+[resource conservation](./structs-and-resources.md).
+
+```move
+    native public fun destroy_empty<Element>(v: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Acquire an [immutable reference](./references.md) to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+```move
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Acquire a [mutable reference](./references.md)
+to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+```move
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Empty and destroy the `other` vector, and push each of the elements in
+the `other` vector onto the `lhs` vector in the same order as they occurred in `other`.
+
+```move
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Push an element `e` of type `Element` onto the end of the vector `v`. May
+trigger a resizing of the underlying vector's memory.
+
+```move
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Pop an element from the end of the vector `v` in-place and return the owned
+value. Will abort if `v` is empty.
+
+```move
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Remove the element at index `i` in the vector `v` and return the owned value
+that was previously stored at `i` in `v`. All elements occurring at indices
+greater than `i` will be shifted down by 1. Will abort if `i` is out of bounds
+for `v`.
+
+```move
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the `i`th element of the vector `v` with the last element and then pop
+this element off of the back of the vector and return the owned value that
+was previously stored at index `i`.
+This operation is O(1), but does not preserve ordering of elements in the vector.
+Aborts if the index `i` is out of bounds for the vector `v`.
+
+```move
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the elements at the `i`'th and `j`'th indices in the vector `v`. Will
+abort if either of `i` or `j` are out of bounds for `v`.
+
+```move
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+```
+
+---------------------------------------------------------------------------
+
+Reverse the order of the elements in the vector `v` in-place.
+
+```move
+    public fun reverse<Element>(v: &mut vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Return the index of the first occurrence of an element in `v` that is
+equal to `e`. Returns `(true, index)` if such an element was found, and
+`(false, 0)` otherwise.
+
+```move
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64);
+```
+
+---------------------------------------------------------------------------
+
+Return if an element equal to `e` exists in the vector `v`.
+
+```move
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return the length of a `vector`.
+
+```move
+    native public fun length<Element>(v: &vector<Element>): u64;
+```
+
+---------------------------------------------------------------------------
+
+Return whether the vector `v` is empty.
+
+```move
+    public fun is_empty<Element>(v: &vector<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+## option
+
+The `option` module defines a generic option type `Option<T>` that represents a
+value of type `T` that may, or may not, be present. It is published under the named address `Std`.
+
+The Move option type is internally represented as a singleton vector, and may
+contain a value of `resource` or `copyable` kind.  If you are familiar with option
+types in other languages, the Move `Option` behaves similarly to those with a
+couple notable exceptions since the option can contain a value of kind `resource`.
+Particularly, certain operations such as `get_with_default` and
+`destroy_with_default` require that the element type `T` be of `copyable` kind.
+
+The API for the `option` module is as as follows
+
+### Types
+
+Generic type abstraction of a value that may, or may not, be present. Can contain
+a value of either `resource` or `copyable` kind.
+
+```move
+    struct Option<T>;
+```
+
+### Functions
+
+Create an empty `Option` of that can contain a value of `Element` type.
+
+```move
+    public fun none<Element>(): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a non-empty `Option` type containing a value `e` of type `Element`.
+
+```move
+    public fun some<Element>(e: T): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Return an immutable reference to the value inside the option `opt_elem`
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun borrow<Element>(opt_elem: &Option<Element>): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a reference to the value inside `opt_elem` if it contains one. If
+`opt_elem` does not contain a value the passed in `default_ref` reference will be returned.
+Does not abort.
+
+```move
+    public fun borrow_with_default<Element>(opt_elem: &Option<Element>, default_ref: &Element): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a mutable reference to the value inside `opt_elem`. Will abort if
+`opt_elem` does not contain a value.
+
+```move
+    public fun borrow_mut<Element>(opt_elem: &mut Option<Element>): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an option value that contains a value to one that is empty in-place by
+removing and returning the value stored inside `opt_elem`.
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun extract<Element>(opt_elem: &mut Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return the value contained inside the option `opt_elem` if it contains one.
+Will return the passed in `default` value if `opt_elem` does not contain a
+value. The `Element` type that the `Option` type is instantiated with must be
+of `copyable` kind in order for this function to be callable.
+
+```move
+    public fun get_with_default<Element: copyable>(opt_elem: &Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an empty option `opt_elem` to an option value that contains the value `e`.
+Will abort if `opt_elem` already contains a value.
+
+```move
+    public fun fill<Element>(opt_elem: &mut Option<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Swap the value currently contained in `opt_elem` with `new_elem` and return the
+previously contained value. Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun swap<Element>(opt_elem: &mut Option<Element>, e: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return true if `opt_elem` contains a value equal to the value of `e_ref`.
+Otherwise, `false` will be returned.
+
+```move
+    public fun contains<Element>(opt_elem: &Option<Element>, e_ref: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` does not contain a value.
+
+```move
+    public fun is_none<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` contains a value.
+
+```move
+    public fun is_some<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Unpack `opt_elem` and return the value that it contained.
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun destroy_some<Element>(opt_elem: Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in. If `opt_elem` contained a value it
+will be returned otherwise, the passed in `default` value will be returned.
+
+```move
+    public fun destroy_with_default<Element: copyable>(opt_elem: Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in, `opt_elem` must be empty and not
+contain a value. Will abort if `opt_elem` contains a value.
+
+```move
+    public fun destroy_none<Element>(opt_elem: Option<Element>);
+```
+
+## errors
+
+Recall that each abort code in Move is represented as an unsigned 64-bit integer. The `errors` module defines a common interface that can be used to "tag" each of these abort codes so that they can represent both the error **category** along with an error **reason**.
+
+Error categories are declared as constants in the `errors` module and are globally unique with respect to this module. Error reasons on the other hand are module-specific error codes, and can provide greater detail (perhaps, even a particular _reason_) about the specific error condition. This representation of a category and reason for each error code is done by dividing the abort code into two sections.
+
+The lower 8 bits of the abort code hold the *error category*. The remaining 56 bits of the abort code hold the *error reason*.
+The reason should be a unique number relative to the module which raised the error and can be used to obtain more information about the error at hand. It should mostly be used for diagnostic purposes as error reasons may change over time if the module is updated.
+
+| Category | Reason |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+Since error categories are globally stable, these present the most stable API and should in general be what is used by clients to determine the messages they may present to users (whereas the reason is useful for diagnostic purposes). There are public functions in the `errors` module for creating an abort code of each error category with a specific `reason` number (represented as a `u64`).
+
+### Constants
+
+The system is in a state where the performed operation is not allowed.
+
+```move
+    const INVALID_STATE: u8 = 1;
+```
+
+---------------------------------------------------------------------------
+A specific account address was required to perform an operation, but a different address from what was expected was encountered.
+
+```move
+    const REQUIRES_ADDRESS: u8 = 2;
+```
+
+---------------------------------------------------------------------------
+An account did not have the expected  role for this operation. Useful for Role Based Access Control (RBAC) error conditions.
+
+```move
+    const REQUIRES_ROLE: u8 = 3;
+```
+
+---------------------------------------------------------------------------
+An account did not not have a required capability. Useful for RBAC error conditions.
+
+```move
+    const REQUIRES_CAPABILITY: u8 = 4;
+```
+
+---------------------------------------------------------------------------
+A resource was expected, but did not exist under an address.
+
+```move
+    const NOT_PUBLISHED: u8 = 5;
+```
+
+---------------------------------------------------------------------------
+Attempted to publish a resource under an address where one was already published.
+
+```move
+    const ALREADY_PUBLISHED: u8 = 6;
+```
+
+---------------------------------------------------------------------------
+An argument provided for an operation was invalid.
+
+```move
+    const INVALID_ARGUMENT: u8 = 7;
+```
+
+---------------------------------------------------------------------------
+A limit on a value was exceeded.
+
+```move
+    const LIMIT_EXCEEDED: u8 = 8;
+```
+
+---------------------------------------------------------------------------
+An internal error (bug) has occurred.
+
+```move
+    const INTERNAL: u8 = 10;
+```
+
+---------------------------------------------------------------------------
+A custom error category for extension points.
+
+```move
+    const CUSTOM: u8 = 255;
+```
+
+---------------------------------------------------------------------------
+
+### Functions
+
+ Should be used in the case where invalid (global) state is encountered. Constructs an abort code with specified `reason` and category `INVALID_STATE`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun invalid_state(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account's address does not match a specific address. Constructs an abort code with specified `reason` and category `REQUIRES_ADDRESS`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_address(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a role did not match a required role when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_ROLE`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_role(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account did not have a required capability when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_CAPABILITY`. Should be Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_capability(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource did not exist where one was expected. Constructs an abort code with specified `reason` and category `NOT_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun not_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource already existed where one was about to be published. Constructs an abort code with specified `reason` and category `ALREADY_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun already_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an invalid argument was passed to a function/operation. Constructs an abort code with specified `reason` and category `INVALID_ARGUMENT`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun invalid_argument(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a limit on a specific value is reached, e.g., subtracting 1 from a value of 0. Constructs an abort code with specified `reason` and category `LIMIT_EXCEEDED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun limit_exceeded(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an internal error or bug was encountered. Constructs an abort code with specified `reason` and category `INTERNAL`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun internal(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Used for extension points, should be not used under most circumstances. Constructs an abort code with specified `reason` and category `CUSTOM`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun custom(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+
+## fixed_point32
+
+The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
+
+### Types
+
+Represents a fixed-point numeric number with 32 fractional bits.
+
+```move
+    struct FixedPoint32;
+```
+
+### Functions
+
+Multiply a u64 integer by a fixed-point number, truncating any fractional part of the product. This will abort if the product overflows.
+
+```move
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Divide a u64 integer by a fixed-point number, truncating any fractional part of the quotient. This will abort if the divisor is zero or if the quotient overflows.
+
+```move
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Create a fixed-point value from a rational number specified by its numerator and denominator. Calling this function should be preferred for using `fixed_point32::create_from_raw_value` which is also available. This will abort if the denominator is zero. It will also abort if the numerator is nonzero and the ratio is not in the range $2^{-32}\ldots2^{32}-1$. When specifying decimal fractions, be careful about rounding errors: if you round to display $N$ digits after the decimal point, you can use a denominator of $10^N$ to avoid numbers where the very small imprecision in the binary representation could change the rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+```move
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Create a fixedpoint value from a raw `u64` value.
+
+```move
+    public fun create_from_raw_value(value: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Returns `true` if the decimal value of `num` is equal to zero.
+
+```move
+    public fun is_zero(num: FixedPoint32): bool;
+```
+
+---------------------------------------------------------------------------
+Accessor for the raw `u64` value. Other less common operations, such as adding or subtracting `FixedPoint32` values, can be done using the raw values directly.
+
+```move
+    public fun get_raw_value(num: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
diff --git a/vendors/move/crates/documentation/book/src/structs-and-resources.md b/vendors/move/crates/documentation/book/src/structs-and-resources.md
new file mode 100644
index 000000000..a073a44cd
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/structs-and-resources.md
@@ -0,0 +1,527 @@
+# Structs and Resources
+
+A _struct_ is a user-defined data structure containing typed fields. Structs can store any
+non-reference type, including other structs.
+
+We often refer to struct values as _resources_ if they cannot be copied and cannot be dropped. In
+this case, resource values must have ownership transferred by the end of the function. This property
+makes resources particularly well served for defining global storage schemas or for representing
+important values (such as a token).
+
+By default, structs are linear and ephemeral. By this we mean that they: cannot be copied, cannot be
+dropped, and cannot be stored in global storage. This means that all values have to have ownership
+transferred (linear) and the values must be dealt with by the end of the program's execution
+(ephemeral). We can relax this behavior by giving the struct [abilities](./abilities.md) which allow
+values to be copied or dropped and also to be stored in global storage or to define global storage
+schemas.
+
+## Defining Structs
+
+Structs must be defined inside a module:
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar {}
+    struct Baz { foo: Foo, }
+    //                   ^ note: it is fine to have a trailing comma
+}
+}
+```
+
+Structs cannot be recursive, so the following definition is invalid:
+
+```move
+struct Foo { x: Foo }
+//              ^ error! Foo cannot contain Foo
+```
+
+As mentioned above: by default, a struct declaration is linear and ephemeral. So to allow the value
+to be used with certain operations (that copy it, drop it, store it in global storage, or use it as
+a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
+`has <ability>`:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64, y: bool }
+}
+}
+```
+
+For more details, see the [annotating structs](./abilities.md#annotating-structs) section.
+
+### Naming
+
+Structs must start with a capital letter `A` to `Z`. After the first letter, struct names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+struct Foo {}
+struct BAR {}
+struct B_a_z_4_2 {}
+```
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+## Using Structs
+
+### Creating Structs
+
+Values of a struct type can be created (or "packed") by indicating the struct name, followed by
+value for each field:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64, y: bool }
+    struct Baz has drop { foo: Foo }
+
+    fun example() {
+        let foo = Foo { x: 0, y: false };
+        let baz = Baz { foo: foo };
+    }
+}
+}
+```
+
+If you initialize a struct field with a local variable whose name is the same as the field, you can
+use the following shorthand:
+
+```move
+let baz = Baz { foo: foo };
+// is equivalent to
+let baz = Baz { foo };
+```
+
+This is called sometimes called "field name punning".
+
+### Destroying Structs via Pattern Matching
+
+Struct values can be destroyed by binding or assigning them patterns.
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar { foo: Foo }
+    struct Baz {}
+
+    fun example_destroy_foo() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: foo_y } = foo;
+        //        ^ shorthand for `x: x`
+
+        // two new bindings
+        //   x: u64 = 3
+        //   foo_y: bool = false
+    }
+
+    fun example_destroy_foo_wildcard() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: _ } = foo;
+
+        // only one new binding since y was bound to a wildcard
+        //   x: u64 = 3
+    }
+
+    fun example_destroy_foo_assignment() {
+        let x: u64;
+        let y: bool;
+        Foo { x, y } = Foo { x: 3, y: false };
+
+        // mutating existing variables x & y
+        //   x = 3, y = false
+    }
+
+    fun example_foo_ref() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &foo;
+
+        // two new bindings
+        //   x: &u64
+        //   y: &bool
+    }
+
+    fun example_foo_ref_mut() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &mut foo;
+
+        // two new bindings
+        //   x: &mut u64
+        //   y: &mut bool
+    }
+
+    fun example_destroy_bar() {
+        let bar = Bar { foo: Foo { x: 3, y: false } };
+        let Bar { foo: Foo { x, y } } = bar;
+        //             ^ nested pattern
+
+        // two new bindings
+        //   x: u64 = 3
+        //   y: bool = false
+    }
+
+    fun example_destroy_baz() {
+        let baz = Baz {};
+        let Baz {} = baz;
+    }
+}
+}
+```
+
+### Borrowing Structs and Fields
+
+The `&` and `&mut` operator can be used to create references to structs or fields. These examples
+include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref: &Foo = &foo;
+let y: bool = foo_ref.y;          // reading a field via a reference to the struct
+let x_ref: &u64 = &foo.x;
+
+let x_ref_mut: &mut u64 = &mut foo.x;
+*x_ref_mut = 42;            // modifying a field via a mutable reference
+```
+
+It is possible to borrow inner fields of nested structs:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+
+let x_ref = &bar.foo.x;
+```
+
+You can also borrow a field via a reference to a struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &foo;
+let x_ref = &foo_ref.x;
+// this has the same effect as let x_ref = &foo.x
+```
+
+### Reading and Writing Fields
+
+If you need to read and copy a field's value, you can then dereference the borrowed field:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo: copy foo };
+let x: u64 = *&foo.x;
+let y: bool = *&foo.y;
+let foo2: Foo = *&bar.foo;
+```
+
+If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
+any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
+
+```move
+let foo = Foo { x: 3, y: true };
+let x = foo.x;  // x == 3
+let y = foo.y;  // y == true
+```
+
+Dot operators can be chained to access nested fields:
+
+```move
+let baz = Baz { foo: Foo { x: 3, y: true } };
+let x = baz.foo.x; // x = 3;
+```
+
+However, this is not permitted for fields that contain non-primitive types, such a vector or another
+struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+let foo2: Foo = *&bar.foo;
+let foo3: Foo = bar.foo; // error! must add an explicit copy with *&
+```
+
+The reason behind this design decision is that copying a vector or another struct might be an
+expensive operation. It is important for a programmer to be aware of this copy and make others aware
+with the explicit syntax `*&`.
+
+In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
+field being a primitive type or some other struct.
+
+```move
+let foo = Foo { x: 3, y: true };
+foo.x = 42;     // foo = Foo { x: 42, y: true }
+foo.y = !foo.y; // foo = Foo { x: 42, y: false }
+let bar = Bar { foo };            // bar = Bar { foo: Foo { x: 42, y: false } }
+bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
+bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
+```
+
+The dot syntax also works via a reference to a struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &mut foo;
+foo_ref.x = foo_ref.x + 1;
+```
+
+## Privileged Struct Operations
+
+Most struct operations on a struct type `T` can only be performed inside the module that declares
+`T`:
+
+- Struct types can only be created ("packed"), destroyed ("unpacked") inside the module that defines
+  the struct.
+- The fields of a struct are only accessible inside the module that defines the struct.
+
+Following these rules, if you want to modify your struct outside the module, you will need to
+provide public APIs for them. The end of the chapter contains some examples of this.
+
+However, struct _types_ are always visible to another module or script:
+
+```move
+// m.move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64 }
+
+    public fun new_foo(): Foo {
+        Foo { x: 42 }
+    }
+}
+}
+```
+
+```move
+// n.move
+address 0x2 {
+module n {
+    use 0x2::m;
+
+    struct Wrapper has drop {
+        foo: m::Foo
+    }
+
+    fun f1(foo: m::Foo) {
+        let x = foo.x;
+        //      ^ error! cannot access fields of `foo` here
+    }
+
+    fun f2() {
+        let foo_wrapper = Wrapper { foo: m::new_foo() };
+    }
+}
+}
+```
+
+Note that structs do not have visibility modifiers (e.g., `public` or `private`).
+
+## Ownership
+
+As mentioned above in [Defining Structs](#defining-structs), structs are by default linear and
+ephemeral. This means they cannot be copied or dropped. This property can be very useful when
+modeling real world resources like money, as you do not want money to be duplicated or get lost in
+circulation.
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun copying_resource() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo; // error! 'copy'-ing requires the 'copy' ability
+        let foo_ref = &foo;
+        let another_copy = *foo_ref // error! dereference requires the 'copy' ability
+    }
+
+    public fun destroying_resource1() {
+        let foo = Foo { x: 100 };
+
+        // error! when the function returns, foo still contains a value.
+        // This destruction requires the 'drop' ability
+    }
+
+    public fun destroying_resource2(f: &mut Foo) {
+        *f = Foo { x: 100 } // error!
+                            // destroying the old value via a write requires the 'drop' ability
+    }
+}
+}
+```
+
+To fix the second example (`fun destroying_resource1`), you would need to manually "unpack" the
+resource:
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun destroying_resource1_fixed() {
+        let foo = Foo { x: 100 };
+        let Foo { x: _ } = foo;
+    }
+}
+}
+```
+
+Recall that you are only able to deconstruct a resource within the module in which it is defined.
+This can be leveraged to enforce certain invariants in a system, for example, conservation of money.
+
+If on the other hand, your struct does not represent something valuable, you can add the abilities
+`copy` and `drop` to get a struct value that might feel more familiar from other programming
+languages:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64 }
+
+    public fun run() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo;
+        // ^ this code copies foo, whereas `let x = foo` or
+        // `let x = move foo` both move foo
+
+        let x = foo.x;            // x = 100
+        let x_copy = foo_copy.x;  // x = 100
+
+        // both foo and foo_copy are implicitly discarded when the function returns
+    }
+}
+}
+```
+
+## Storing Resources in Global Storage
+
+Only structs with the `key` ability can be saved directly in
+[persistent global storage](./global-storage-operators.md). All values stored within those `key`
+structs must have the `store` ability. See the [ability](./abilities) and
+[global storage](./global-storage-operators.md) chapters for more detail.
+
+## Examples
+
+Here are two short examples of how you might use structs to represent valuable data (in the case of
+`Coin`) or more classical data (in the case of `Point` and `Circle`).
+
+### Example 1: Coin
+
+<!-- TODO link to access control for mint -->
+
+```move
+address 0x2 {
+module m {
+    // We do not want the Coin to be copied because that would be duplicating this "money",
+    // so we do not give the struct the 'copy' ability.
+    // Similarly, we do not want programmers to destroy coins, so we do not give the struct the
+    // 'drop' ability.
+    // However, we *want* users of the modules to be able to store this coin in persistent global
+    // storage, so we grant the struct the 'store' ability. This struct will only be inside of
+    // other resources inside of global storage, so we do not give the struct the 'key' ability.
+    struct Coin has store {
+        value: u64,
+    }
+
+    public fun mint(value: u64): Coin {
+        // You would want to gate this function with some form of access control to prevent
+        // anyone using this module from minting an infinite amount of coins.
+        Coin { value }
+    }
+
+    public fun withdraw(coin: &mut Coin, amount: u64): Coin {
+        assert!(coin.balance >= amount, 1000);
+        coin.value = coin.value - amount;
+        Coin { value: amount }
+    }
+
+    public fun deposit(coin: &mut Coin, other: Coin) {
+        let Coin { value } = other;
+        coin.value = coin.value + value;
+    }
+
+    public fun split(coin: Coin, amount: u64): (Coin, Coin) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun merge(coin1: Coin, coin2: Coin): Coin {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+
+    public fun destroy_zero(coin: Coin) {
+        let Coin { value } = coin;
+        assert!(value == 0, 1001);
+    }
+}
+}
+```
+
+### Example 2: Geometry
+
+```move
+address 0x2 {
+module point {
+    struct Point has copy, drop, store {
+        x: u64,
+        y: u64,
+    }
+
+    public fun new(x: u64, y: u64): Point {
+        Point {
+            x, y
+        }
+    }
+
+    public fun x(p: &Point): u64 {
+        p.x
+    }
+
+    public fun y(p: &Point): u64 {
+        p.y
+    }
+
+    fun abs_sub(a: u64, b: u64): u64 {
+        if (a < b) {
+            b - a
+        }
+        else {
+            a - b
+        }
+    }
+
+    public fun dist_squared(p1: &Point, p2: &Point): u64 {
+        let dx = abs_sub(p1.x, p2.x);
+        let dy = abs_sub(p1.y, p2.y);
+        dx*dx + dy*dy
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module circle {
+    use 0x2::point::{Self, Point};
+
+    struct Circle has copy, drop, store {
+        center: Point,
+        radius: u64,
+    }
+
+    public fun new(center: Point, radius: u64): Circle {
+        Circle { center, radius }
+    }
+
+    public fun overlaps(c1: &Circle, c2: &Circle): bool {
+        let d = point::dist_squared(&c1.center, &c2.center);
+        let r1 = c1.radius;
+        let r2 = c2.radius;
+        d*d <= r1*r1 + 2*r1*r2 + r2*r2
+    }
+}
+}
+```
diff --git a/vendors/move/crates/documentation/book/src/tuples.md b/vendors/move/crates/documentation/book/src/tuples.md
new file mode 100644
index 000000000..1f4575b81
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/tuples.md
@@ -0,0 +1,137 @@
+# Tuples and Unit
+
+Move does not fully support tuples as one might expect coming from another language with them as a
+[first-class value](https://en.wikipedia.org/wiki/First-class_citizen). However, in order to support multiple return values, Move has tuple-like
+expressions. These expressions do not result in a concrete value at runtime (there are no tuples in
+the bytecode), and as a result they are very limited: they can only appear in expressions (usually
+in the return position for a function); they cannot be bound to local variables; they cannot be
+stored in structs; and tuple types cannot be used to instantiate generics.
+
+Similarly, [unit `()`](https://en.wikipedia.org/wiki/Unit_type) is a type created by the Move source language in order to be expression based.
+The unit value `()` does not result in any runtime value. We can consider unit`()` to be an empty
+tuple, and any restrictions that apply to tuples also apply to unit.
+
+It might feel weird to have tuples in the language at all given these restrictions. But one of the
+most common use cases for tuples in other languages is for functions to allow functions to return
+multiple values. Some languages work around this by forcing the users to write structs that contain
+the multiple return values. However in Move, you cannot put references inside of
+[structs](./structs-and-resources.md). This required Move to support multiple return values. These
+multiple return values are all pushed on the stack at the bytecode level. At the source level, these
+multiple return values are represented using tuples.
+
+## Literals
+
+Tuples are created by a comma separated list of expressions inside of parentheses.
+
+| Syntax          | Type                                                                         | Description                                                  |
+| --------------- | ---------------------------------------------------------------------------- | ------------------------------------------------------------ |
+| `()`            | `(): ()`                                                                     | Unit, the empty tuple, or the tuple of arity 0               |
+| `(e1, ..., en)` | `(e1, ..., en): (T1, ..., Tn)` where `e_i: Ti` s.t. `0 < i <= n` and `n > 0` | A `n`-tuple, a tuple of arity `n`, a tuple with `n` elements |
+
+Note that `(e)` does not have type `(e): (t)`, in other words there is no tuple with one element. If
+there is only a single element inside of the parentheses, the parentheses are only used for
+disambiguation and do not carry any other special meaning.
+
+Sometimes, tuples with two elements are called "pairs" and tuples with three elements are called
+"triples."
+
+### Examples
+
+```move
+address 0x42 {
+module example {
+    // all 3 of these functions are equivalent
+
+    // when no return type is provided, it is assumed to be `()`
+    fun returns_unit_1() { }
+
+    // there is an implicit () value in empty expression blocks
+    fun returns_unit_2(): () { }
+
+    // explicit version of `returns_unit_1` and `returns_unit_2`
+    fun returns_unit_3(): () { () }
+
+
+    fun returns_3_values(): (u64, bool, address) {
+        (0, false, @0x42)
+    }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) {
+        (x, 0, 1, b"foobar")
+    }
+}
+}
+```
+
+## Operations
+
+The only operation that can be done on tuples currently is destructuring.
+
+### Destructuring
+
+For tuples of any size, they can be destructured in either a `let` binding or in an assignment.
+
+For example:
+
+```move
+address 0x42 {
+module example {
+    // all 3 of these functions are equivalent
+    fun returns_unit() {}
+    fun returns_2_values(): (bool, bool) { (true, false) }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) { (x, 0, 1, b"foobar") }
+
+    fun examples(cond: bool) {
+        let () = ();
+        let (x, y): (u8, u64) = (0, 1);
+        let (a, b, c, d) = (@0x0, 0, false, b"");
+
+        () = ();
+        (x, y) = if (cond) (1, 2) else (3, 4);
+        (a, b, c, d) = (@0x1, 1, true, b"1");
+    }
+
+    fun examples_with_function_calls() {
+        let () = returns_unit();
+        let (x, y): (bool, bool) = returns_2_values();
+        let (a, b, c, d) = returns_4_values(&0);
+
+        () = returns_unit();
+        (x, y) = returns_2_values();
+        (a, b, c, d) = returns_4_values(&1);
+    }
+}
+}
+```
+
+For more details, see [Move Variables](./variables.md).
+
+## Subtyping
+
+Along with references, tuples are the only types that have [subtyping](https://en.wikipedia.org/wiki/Subtyping) in Move. Tuples do have
+subtyping only in the sense that subtype with references (in a covariant way).
+
+For example:
+
+```move
+let x: &u64 = &0;
+let y: &mut u64 = &mut 1;
+
+// (&u64, &mut u64) is a subtype of (&u64, &u64)
+// since &mut u64 is a subtype of &u64
+let (a, b): (&u64, &u64) = (x, y);
+
+// (&mut u64, &mut u64) is a subtype of (&u64, &u64)
+// since &mut u64 is a subtype of &u64
+let (c, d): (&u64, &u64) = (y, y);
+
+// error! (&u64, &mut u64) is NOT a subtype of (&mut u64, &mut u64)
+// since &u64 is NOT a subtype of &mut u64
+let (e, f): (&mut u64, &mut u64) = (x, y);
+```
+
+## Ownership
+
+As mentioned above, tuple values don't really exist at runtime. And currently they cannot be stored
+into local variables because of this (but it is likely that this feature will come soon). As such,
+tuples can only be moved currently, as copying them would require putting them into a local variable
+first.
diff --git a/vendors/move/crates/documentation/book/src/unit-testing.md b/vendors/move/crates/documentation/book/src/unit-testing.md
new file mode 100644
index 000000000..75649da19
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/unit-testing.md
@@ -0,0 +1,316 @@
+# Unit Tests
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail. These annotations can be placed on a function with any visibility. Whenever a module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+## Testing Annotations: Their Meaning and Usage
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+```
+#[test] // OK
+fun this_is_a_test() { ... }
+
+#[test] // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the test should is expected to raise an error. You can ensure that a test is aborting with a specific abort code by annotating it with `#[expected_failure(abort_code = <code>)]`, if it then fails with a different abort code or with a non-abort error the test will fail. Only functions that have the `#[test]` annotation can also be annotated as an #`[expected_failure]`.
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_will_abort_and_pass() { abort 1 }
+
+#[test]
+#[expected_failure]
+public fun test_will_error_and_pass() { 1/0; }
+
+#[test]
+#[expected_failure(abort_code = 0)]
+public fun test_will_error_and_fail() { 1/0; }
+
+#[test, expected_failure] // Can have multiple in one attribute. This test will pass.
+public fun this_other_test_will_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do not have to be the same, but they must be able to be matched up with each other by name.
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+```
+#[test(arg = @0xC0FFEE)] // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// somewhere a named address is declared
+#[test_only] // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+```
+#[test, expected_failure(abort_code = 1)] // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+```
+#[test_only] // test only attributes can be attached to modules
+module abc { ... }
+
+#[test_only] // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. to uses
+use 0x1::some_other_module;
+
+#[test_only] // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+## Running Unit Tests
+
+Unit tests for a Move package can be run with the [`move test`
+command](./packages.md).
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
+
+```
+$ move -h
+```
+
+## Example
+
+A simple module using some of the unit testing features is shown in the following example:
+
+First create an empty package and change directory into it:
+
+```
+$ move new TestExample; cd TestExample
+```
+
+Next add the following to the `Move.toml`:
+
+```
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b", addr_subst = { "std" = "0x1" } }
+```
+
+Next add the following module under the `sources` directory:
+
+```
+// filename: sources/my_module.move
+module 0x1::my_module {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert!(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+        assert!(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### Running Tests
+
+You can then run these tests with the `move test` command:
+
+```
+$ move test
+BUILDING MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### Using Test Flags
+
+#### `-f <str>` or `--filter <str>`
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+```
+$ move test -f zero_coin
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` or `--gas_used <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+```
+$ move test -i 0
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ TIMEOUT ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::my_module::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::my_module::test_has_coin
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` or `--statistics`
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
+
+```
+$ move test -s
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+
+Test Statistics:
+
+┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                    │    Time    │   Gas Used   │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_zero_coin_fails      │   0.008    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::test_has_coin                  │   0.008    │             1             │
+└────────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` or `--state-on-error`
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `my_module` example:
+
+```
+module 0x1::my_module {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get the following output when running the tests:
+
+```
+$ move test -g
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+[ FAIL    ] 0x1::my_module::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── test_has_coin_bad ──────
+│ error[E11001]: test failure
+│    ┌─ /home/tzakian/TestExample/sources/my_module.move:47:10
+│    │
+│ 44 │      fun test_has_coin_bad(a: signer) {
+│    │          ----------------- In this function in 0x1::my_module
+│    ·
+│ 47 │          assert!(has_coin(@0x2), 1);
+│    │          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::my_module::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
diff --git a/vendors/move/crates/documentation/book/src/uses.md b/vendors/move/crates/documentation/book/src/uses.md
new file mode 100644
index 000000000..5e7edf8d9
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/uses.md
@@ -0,0 +1,359 @@
+# Uses and Aliases
+
+The `use` syntax can be used to create aliases to members in other modules. `use` can be used to
+create aliases that last either for the entire module, or for a given expression block scope.
+
+## Syntax
+
+There are several different syntax cases for `use`. Starting with the most simple, we have the
+following for creating aliases to other modules
+
+```move
+use <address>::<module name>;
+use <address>::<module name> as <module alias name>;
+```
+
+For example
+
+```move
+use std::vector;
+use std::vector as V;
+```
+
+`use std::vector;` introduces an alias `vector` for `std::vector`. This means that anywhere you
+would want to use the module name `std::vector` (assuming this `use` is in scope), you could use
+`vector` instead. `use std::vector;` is equivalent to `use std::vector as vector;`
+
+Similarly `use std::vector as V;` would let you use `V` instead of `std::vector`
+
+```move=
+use std::vector;
+use std::vector as V;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = vector::empty();
+    let v3 = V::empty();
+    (v1, v2, v3)
+}
+```
+
+If you want to import a specific module member (such as a function, struct, or constant). You can
+use the following syntax.
+
+```move
+use <address>::<module name>::<module member>;
+use <address>::<module name>::<module member> as <member alias>;
+```
+
+For example
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+```
+
+This would let you use the function `std::vector::empty` without full qualification. Instead you
+could use `empty` and `empty_vec` respectively. Again, `use std::vector::empty;` is equivalent to
+`use std::vector::empty as empty;`
+
+```move=
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = empty();
+    let v3 = empty_vec();
+    (v1, v2, v3)
+}
+```
+
+If you want to add aliases for multiple module members at once, you can do so with the following
+syntax
+
+```move
+use <address>::<module name>::{<module member>, <module member> as <member alias> ... };
+```
+
+For example
+
+```move=
+use std::vector::{push_back, length as len, pop_back};
+
+fun swap_last_two<T>(v: &mut vector<T>) {
+    assert!(len(v) >= 2, 42);
+    let last = pop_back(v);
+    let second_to_last = pop_back(v);
+    push_back(v, last);
+    push_back(v, second_to_last)
+}
+```
+
+If you need to add an alias to the Module itself in addition to module members, you can do that in a
+single `use` using `Self`. `Self` is a member of sorts that refers to the module.
+
+```move
+use std::vector::{Self, empty};
+```
+
+For clarity, all of the following are equivalent:
+
+```move
+use std::vector;
+use std::vector as vector;
+use std::vector::Self;
+use std::vector::Self as vector;
+use std::vector::{Self};
+use std::vector::{Self as vector};
+```
+
+If needed, you can have as many aliases for any item as you like
+
+```move=
+use std::vector::{
+    Self,
+    Self as V,
+    length,
+    length as len,
+};
+
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    // all options available given the `use` above
+    assert!(vector::length(v) > 1, 42);
+    assert!(V::length(v) > 1, 42);
+    assert!(length(v) > 1, 42);
+    assert!(len(v) > 1, 42);
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+## Inside a `module`
+
+Inside of a `module` all `use` declarations are usable regardless of the order of declaration.
+
+```move=
+address 0x42 {
+module example {
+    use std::vector;
+
+    fun example(): vector<u8> {
+        let v = empty();
+        vector::push_back(&mut v, 0);
+        vector::push_back(&mut v, 10);
+        v
+    }
+
+    use std::vector::empty;
+}
+}
+```
+
+The aliases declared by `use` in the module usable within that module.
+
+Additionally, the aliases introduced cannot conflict with other module members. See
+[Uniqueness](#uniqueness) for more details
+
+## Inside an expression
+
+You can add `use` declarations to the beginning of any expression block
+
+```move=
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        use std::vector::{empty, push_back};
+
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    }
+}
+}
+```
+
+As with `let`, the aliases introduced by `use` in an expression block are removed at the end of that
+block.
+
+```move=
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        let result = {
+            use std::vector::{empty, push_back};
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 10);
+            v
+        };
+        result
+    }
+
+}
+}
+```
+
+Attempting to use the alias after the block ends will result in an error
+
+```move=
+fun example(): vector<u8> {
+    let result = {
+        use std::vector::{empty, push_back};
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    };
+    let v2 = empty(); // ERROR!
+//           ^^^^^ unbound function 'empty'
+    result
+}
+```
+
+Any `use` must be the first item in the block. If the `use` comes after any expression or `let`, it
+will result in a parsing error
+
+```move=
+{
+    let x = 0;
+    use std::vector; // ERROR!
+    let v = vector::empty();
+}
+```
+
+## Naming rules
+
+Aliases must follow the same rules as other module members. This means that aliases to structs or
+constants must start with `A` to `Z`
+
+```move=
+address 0x42 {
+module data {
+    struct S {}
+    const FLAG: bool = false;
+    fun foo() {}
+}
+module example {
+    use 0x42::data::{
+        S as s, // ERROR!
+        FLAG as fLAG, // ERROR!
+        foo as FOO,  // valid
+        foo as bar, // valid
+    };
+}
+}
+```
+
+## Uniqueness
+
+Inside a given scope, all aliases introduced by `use` declarations must be unique.
+
+For a module, this means aliases introduced by `use` cannot overlap
+
+```move=
+address 0x42 {
+module example {
+
+    use std::vector::{empty as foo, length as foo}; // ERROR!
+    //                                        ^^^ duplicate 'foo'
+
+    use std::vector::empty as bar;
+
+    use std::vector::length as bar; // ERROR!
+    //                         ^^^ duplicate 'bar'
+
+}
+}
+```
+
+And, they cannot overlap with any of the module's other members
+
+```move=
+address 0x42 {
+module data {
+    struct S {}
+}
+module example {
+    use 0x42::data::S;
+
+    struct S { value: u64 } // ERROR!
+    //     ^ conflicts with alias 'S' above
+}
+}
+```
+
+Inside of an expression block, they cannot overlap with each other, but they can
+[shadow](#shadowing) other aliases or names from an outer scope
+
+## Shadowing
+
+`use` aliases inside of an expression block can shadow names (module members or aliases) from the
+outer scope. As with shadowing of locals, the shadowing ends at the end of the expression block;
+
+```move=
+address 0x42 {
+module example {
+
+    struct WrappedVector { vec: vector<u64> }
+
+    fun empty(): WrappedVector {
+        WrappedVector { vec: std::vector::empty() }
+    }
+
+    fun example1(): (WrappedVector, WrappedVector) {
+        let vec = {
+            use std::vector::{empty, push_back};
+            // 'empty' now refers to std::vector::empty
+
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 1);
+            push_back(&mut v, 10);
+            v
+        };
+        // 'empty' now refers to Self::empty
+
+        (empty(), WrappedVector { vec })
+    }
+
+    fun example2(): (WrappedVector, WrappedVector) {
+        use std::vector::{empty, push_back};
+        let w: WrappedVector = {
+            use 0x42::example::empty;
+            empty()
+        };
+        push_back(&mut w.vec, 0);
+        push_back(&mut w.vec, 1);
+        push_back(&mut w.vec, 10);
+
+        let vec = empty();
+        push_back(&mut vec, 0);
+        push_back(&mut vec, 1);
+        push_back(&mut vec, 10);
+
+        (w, WrappedVector { vec })
+    }
+}
+}
+```
+
+## Unused Use or Alias
+
+An unused `use` will result in an error
+
+```move=
+address 0x42 {
+module example {
+    use std::vector::{empty, push_back}; // ERROR!
+    //                       ^^^^^^^^^ unused alias 'push_back'
+
+    fun example(): vector<u8> {
+        empty()
+    }
+}
+}
+```
diff --git a/vendors/move/crates/documentation/book/src/variables.md b/vendors/move/crates/documentation/book/src/variables.md
new file mode 100644
index 000000000..e16738adb
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/variables.md
@@ -0,0 +1,741 @@
+# Local Variables and Scope
+
+Local variables in Move are lexically (statically) scoped. New variables are introduced with the
+keyword `let`, which will shadow any previous local with the same name. Locals are mutable and can
+be updated both directly and via a mutable reference.
+
+## Declaring Local Variables
+
+### `let` bindings
+
+Move programs use `let` to bind variable names to values:
+
+```move
+let x = 1;
+let y = x + x:
+```
+
+`let` can also be used without binding a value to the local.
+
+```move
+let x;
+```
+
+The local can then be assigned a value later.
+
+```move
+let x;
+if (cond) {
+  x = 1
+} else {
+  x = 0
+}
+```
+
+This can be very helpful when trying to extract a value from a loop when a default value cannot be
+provided.
+
+```move
+let x;
+let cond = true;
+let i = 0;
+loop {
+    (x, cond) = foo(i);
+    if (!cond) break;
+    i = i + 1;
+}
+```
+
+### Variables must be assigned before use
+
+Move's type system prevents a local variable from being used before it has been assigned.
+
+```move
+let x;
+x + x // ERROR!
+```
+
+```move
+let x;
+if (cond) x = 0;
+x + x // ERROR!
+```
+
+```move
+let x;
+while (cond) x = 0;
+x + x // ERROR!
+```
+
+### Valid variable names
+
+Variable names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, and digits `0`
+to `9`. Variable names must start with either an underscore `_` or a letter `a` through `z`. They
+_cannot_ start with uppercase letters.
+
+```move
+// all valid
+let x = e;
+let _x = e;
+let _A = e;
+let x0 = e;
+let xA = e;
+let foobar_123 = e;
+
+// all invalid
+let X = e; // ERROR!
+let Foo = e; // ERROR!
+```
+
+### Type annotations
+
+The type of a local variable can almost always be inferred by Move's type system. However, Move
+allows explicit type annotations that can be useful for readability, clarity, or debuggability. The
+syntax for adding a type annotation is:
+
+```move
+let x: T = e; // "Variable x of type T is initialized to expression e"
+```
+
+Some examples of explicit type annotations:
+
+```move
+address 0x42 {
+module example {
+
+    struct S { f: u64, g: u64 }
+
+    fun annotated() {
+        let u: u8 = 0;
+        let b: vector<u8> = b"hello";
+        let a: address = @0x0;
+        let (x, y): (&u64, &mut u64) = (&0, &mut 1);
+        let S { f, g: f2 }: S = S { f: 0, g: 1 };
+    }
+}
+}
+```
+
+Note that the type annotations must always be to the right of the pattern:
+
+```move
+let (x: &u64, y: &mut u64) = (&0, &mut 1); // ERROR! should be let (x, y): ... =
+```
+
+### When annotations are necessary
+
+In some cases, a local type annotation is required if the type system cannot infer the type. This
+commonly occurs when the type argument for a generic type cannot be inferred. For example:
+
+```move
+let _v1 = vector::empty(); // ERROR!
+//        ^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+let v2: vector<u64> = vector::empty(); // no error
+```
+
+In a rarer case, the type system might not be able to infer a type for divergent code (where all the
+following code is unreachable). Both `return` and [`abort`](./abort-and-assert.md) are expressions
+and can have any type. A [`loop`](./loops.md) has type `()` if it has a `break`, but if there is no
+break out of the `loop`, it could have any type. If these types cannot be inferred, a type
+annotation is required. For example, this code:
+
+```move
+let a: u8 = return ();
+let b: bool = abort 0;
+let c: signer = loop ();
+
+let x = return (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let y = abort 0; // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let z = loop (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+```
+
+Adding type annotations to this code will expose other errors about dead code or unused local
+variables, but the example is still helpful for understanding this problem.
+
+### Multiple declarations with tuples
+
+`let` can introduce more than one local at a time using tuples. The locals declared inside the
+parenthesis are initialized to the corresponding values from the tuple.
+
+```move
+let () = ();
+let (x0, x1) = (0, 1);
+let (y0, y1, y2) = (0, 1, 2);
+let (z0, z1, z2, z3) = (0, 1, 2, 3);
+```
+
+The type of the expression must match the arity of the tuple pattern exactly.
+
+```move
+let (x, y) = (0, 1, 2); // ERROR!
+let (x, y, z, q) = (0, 1, 2); // ERROR!
+```
+
+You cannot declare more than one local with the same name in a single `let`.
+
+```move
+let (x, x) = 0; // ERROR!
+```
+
+### Multiple declarations with structs
+
+`let` can also introduce more than one local at a time when destructuring (or matching against) a
+struct. In this form, the `let` creates a set of local variables that are initialized to the values
+of the fields from a struct. The syntax looks like this:
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+Here is a more complicated example:
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+    struct Y { x1: X, x2: X }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    fun example() {
+        let Y { x1: X { f }, x2 } = Y { x1: new_x(), x2: new_x() };
+        assert!(f + x2.f == 2, 42);
+
+        let Y { x1: X { f: f1 }, x2: X { f: f2 } } = Y { x1: new_x(), x2: new_x() };
+        assert!(f1 + f2 == 2, 42);
+    }
+}
+}
+```
+
+Fields of structs can serve double duty, identifying the field to bind _and_ the name of the
+variable. This is sometimes referred to as punning.
+
+```move
+let X { f } = e;
+```
+
+is equivalent to:
+
+```move
+let X { f: f } = e;
+```
+
+As shown with tuples, you cannot declare more than one local with the same name in a single `let`.
+
+```move
+let Y { x1: x, x2: x } = e; // ERROR!
+```
+
+### Destructuring against references
+
+In the examples above for structs, the bound value in the let was moved, destroying the struct value
+and binding its fields.
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+In this scenario the struct value `T { f1: 1, f2: 2 }` no longer exists after the `let`.
+
+If you wish instead to not move and destroy the struct value, you can borrow each of its fields. For
+example:
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &t;
+// local1: &u64
+// local2: &u64
+```
+
+And similarly with mutable references:
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &mut t;
+// local1: &mut u64
+// local2: &mut u64
+```
+
+This behavior can also work with nested structs.
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+    struct Y { x1: X, x2: X }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    fun example() {
+        let y = Y { x1: new_x(), x2: new_x() };
+
+        let Y { x1: X { f }, x2 } = &y;
+        assert!(*f + x2.f == 2, 42);
+
+        let Y { x1: X { f: f1 }, x2: X { f: f2 } } = &mut y;
+        *f1 = *f1 + 1;
+        *f2 = *f2 + 1;
+        assert!(*f1 + *f2 == 4, 42);
+    }
+}
+}
+```
+
+### Ignoring Values
+
+In `let` bindings, it is often helpful to ignore some values. Local variables that start with `_`
+will be ignored and not introduce a new variable
+
+```move
+fun three(): (u64, u64, u64) {
+    (0, 1, 2)
+}
+```
+
+```move
+let (x1, _, z1) = three();
+let (x2, _y, z2) = three();
+assert!(x1 + z1 == x2 + z2, 42);
+```
+
+This can be necessary at times as the compiler will error on unused local variables
+
+```move
+let (x1, y, z1) = three(); // ERROR!
+//       ^ unused local 'y'
+```
+
+### General `let` grammar
+
+All of the different structures in `let` can be combined! With that we arrive at this general
+grammar for `let` statements:
+
+> _let-binding_ → **let** _pattern-or-list_ _type-annotation_<sub>_opt_</sub>
+> _initializer_<sub>_opt_</sub> > _pattern-or-list_ → _pattern_ | **(** _pattern-list_ **)** >
+> _pattern-list_ → _pattern_ **,**<sub>_opt_</sub> | _pattern_ **,** _pattern-list_ >
+> _type-annotation_ → **:** _type_ _initializer_ → **=** _expression_
+
+The general term for the item that introduces the bindings is a _pattern_. The pattern serves to
+both destructure data (possibly recursively) and introduce the bindings. The pattern grammar is as
+follows:
+
+> _pattern_ → _local-variable_ | _struct-type_ **{** _field-binding-list_ **}** >
+> _field-binding-list_ → _field-binding_ **,**<sub>_opt_</sub> | _field-binding_ **,**
+> _field-binding-list_ > _field-binding_ → _field_ | _field_ **:** _pattern_
+
+A few concrete examples with this grammar applied:
+
+```move
+    let (x, y): (u64, u64) = (0, 1);
+//       ^                           local-variable
+//       ^                           pattern
+//          ^                        local-variable
+//          ^                        pattern
+//          ^                        pattern-list
+//       ^^^^                        pattern-list
+//      ^^^^^^                       pattern-or-list
+//            ^^^^^^^^^^^^           type-annotation
+//                         ^^^^^^^^  initializer
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding
+
+    let Foo { f, g: x } = Foo { f: 0, g: 1 };
+//      ^^^                                    struct-type
+//            ^                                field
+//            ^                                field-binding
+//               ^                             field
+//                  ^                          local-variable
+//                  ^                          pattern
+//               ^^^^                          field-binding
+//            ^^^^^^^                          field-binding-list
+//      ^^^^^^^^^^^^^^^                        pattern
+//      ^^^^^^^^^^^^^^^                        pattern-or-list
+//                      ^^^^^^^^^^^^^^^^^^^^   initializer
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding
+```
+
+## Mutations
+
+### Assignments
+
+After the local is introduced (either by `let` or as a function parameter), the local can be
+modified via an assignment:
+
+```move
+x = e
+```
+
+Unlike `let` bindings, assignments are expressions. In some languages, assignments return the value
+that was assigned, but in Move, the type of any assignment is always `()`.
+
+```move
+(x = e: ())
+```
+
+Practically, assignments being expressions means that they can be used without adding a new
+expression block with braces (`{`...`}`).
+
+```move
+let x = 0;
+if (cond) x = 1 else x = 2;
+```
+
+The assignment uses the same pattern syntax scheme as `let` bindings:
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    // This example will complain about unused variables and assignments.
+    fun example() {
+       let (x, _, z) = (0, 1, 3);
+       let (x, y, f, g);
+
+       (X { f }, X { f: x }) = (new_x(), new_x());
+       assert!(f + x == 2, 42);
+
+       (x, y, z, f, _, g) = (0, 0, 0, 0, 0, 0);
+    }
+}
+}
+```
+
+Note that a local variable can only have one type, so the type of the local cannot change between
+assignments.
+
+```move
+let x;
+x = 0;
+x = false; // ERROR!
+```
+
+### Mutating through a reference
+
+In addition to directly modifying a local with assignment, a local can be modified via a mutable
+reference `&mut`.
+
+```move
+let x = 0;
+let r = &mut x;
+*r = 1;
+assert!(x == 1, 42);
+```
+
+This is particularly useful if either:
+
+(1) You want to modify different variables depending on some condition.
+
+```move
+let x = 0;
+let y = 1;
+let r = if (cond) &mut x else &mut y;
+*r = *r + 1;
+```
+
+(2) You want another function to modify your local value.
+
+```move
+let x = 0;
+modify_ref(&mut x);
+```
+
+This sort of modification is how you modify structs and vectors!
+
+```move
+let v = vector::empty();
+vector::push_back(&mut v, 100);
+assert!(*vector::borrow(&v, 0) == 100, 42);
+```
+
+For more details, see [Move references](./references.md).
+
+## Scopes
+
+Any local declared with `let` is available for any subsequent expression, _within that scope_.
+Scopes are declared with expression blocks, `{`...`}`.
+
+Locals cannot be used outside of the declared scope.
+
+```move
+let x = 0;
+{
+    let y = 1;
+};
+x + y // ERROR!
+//  ^ unbound local 'y'
+```
+
+But, locals from an outer scope _can_ be used in a nested scope.
+
+```move
+{
+    let x = 0;
+    {
+        let y = x + 1; // valid
+    }
+}
+```
+
+Locals can be mutated in any scope where they are accessible. That mutation survives with the local,
+regardless of the scope that performed the mutation.
+
+```move
+let x = 0;
+x = x + 1;
+assert!(x == 1, 42);
+{
+    x = x + 1;
+    assert!(x == 2, 42);
+};
+assert!(x == 2, 42);
+```
+
+### Expression Blocks
+
+An expression block is a series of statements separated by semicolons (`;`). The resulting value of
+an expression block is the value of the last expression in the block.
+
+```move
+{ let x = 1; let y = 1; x + y }
+```
+
+In this example, the result of the block is `x + y`.
+
+A statement can be either a `let` declaration or an expression. Remember that assignments (`x = e`)
+are expressions of type `()`.
+
+```move
+{ let x; let y = 1; x = 1; x + y }
+```
+
+Function calls are another common expression of type `()`. Function calls that modify data are
+commonly used as statements.
+
+```move
+{ let v = vector::empty(); vector::push_back(&mut v, 1); v }
+```
+
+This is not just limited to `()` types---any expression can be used as a statement in a sequence!
+
+```move
+{
+    let x = 0;
+    x + 1; // value is discarded
+    x + 2; // value is discarded
+    b"hello"; // value is discarded
+}
+```
+
+But! If the expression contains a resource (a value without the `drop` [ability](./abilities.md)),
+you will get an error. This is because Move's type system guarantees that any value that is dropped
+has the `drop` [ability](./abilities.md). (Ownership must be transferred or the value must be
+explicitly destroyed within its declaring module.)
+
+```move
+{
+    let x = 0;
+    Coin { value: x }; // ERROR!
+//  ^^^^^^^^^^^^^^^^^ unused value without the `drop` ability
+    x
+}
+```
+
+If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
+there is an implicit [unit `()` value](https://en.wikipedia.org/wiki/Unit_type). Similarly, if the expression block is empty, there is an
+implicit unit `()` value.
+
+```move
+// Both are equivalent
+{ x = x + 1; 1 / x; }
+{ x = x + 1; 1 / x; () }
+```
+
+```move
+// Both are equivalent
+{ }
+{ () }
+```
+
+An expression block is itself an expression and can be used anyplace an expression is used. (Note:
+The body of a function is also an expression block, but the function body cannot be replaced by
+another expression.)
+
+```move
+let my_vector: vector<vector<u8>> = {
+    let v = vector::empty();
+    vector::push_back(&mut v, b"hello");
+    vector::push_back(&mut v, b"goodbye");
+    v
+};
+```
+
+(The type annotation is not needed in this example and only added for clarity.)
+
+### Shadowing
+
+If a `let` introduces a local variable with a name already in scope, that previous variable can no
+longer be accessed for the rest of this scope. This is called _shadowing_.
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = 1; // x is shadowed
+assert!(x == 1, 42);
+```
+
+When a local is shadowed, it does not need to retain the same type as before.
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = b"hello"; // x is shadowed
+assert!(x == b"hello", 42);
+```
+
+After a local is shadowed, the value stored in the local still exists, but will no longer be
+accessible. This is important to keep in mind with values of types without the
+[`drop` ability](./abilities.md), as ownership of the value must be transferred by the end of the
+function.
+
+```move
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+
+        fun unused_resource(): Coin {
+            let x = Coin { value: 0 }; // ERROR!
+//              ^ This local still contains a value without the `drop` ability
+            x.value = 1;
+            let x = Coin { value: 10 };
+            x
+//          ^ Invalid return
+        }
+    }
+}
+```
+
+When a local is shadowed inside a scope, the shadowing only remains for that scope. The shadowing is
+gone once that scope ends.
+
+```move
+let x = 0;
+{
+    let x = 1;
+    assert!(x == 1, 42);
+};
+assert!(x == 0, 42);
+```
+
+Remember, locals can change type when they are shadowed.
+
+```move
+let x = 0;
+{
+    let x = b"hello";
+    assert!(x = b"hello", 42);
+};
+assert!(x == 0, 42);
+```
+
+## Move and Copy
+
+All local variables in Move can be used in two ways, either by `move` or `copy`. If one or the other
+is not specified, the Move compiler is able to infer whether a `copy` or a `move` should be used.
+This means that in all of the examples above, a `move` or a `copy` would be inserted by the
+compiler. A local variable cannot be used without the use of `move` or `copy`.
+
+`copy` will likely feel the most familiar coming from other programming languages, as it creates a
+new copy of the value inside of the variable to use in that expression. With `copy`, the local
+variable can be used more than once.
+
+```move
+let x = 0;
+let y = copy x + 1;
+let z = copy x + 2;
+```
+
+Any value with the `copy` [ability](./abilities.md) can be copied in this way.
+
+`move` takes the value out of the local variable _without_ copying the data. After a `move` occurs,
+the local variable is unavailable.
+
+```move
+let x = 1;
+let y = move x + 1;
+//      ------ Local was moved here
+let z = move x + 2; // Error!
+//      ^^^^^^ Invalid usage of local 'x'
+y + z
+```
+
+### Safety
+
+Move's type system will prevent a value from being used after it is moved. This is the same safety
+check described in [`let` declaration](#let-bindings) that prevents local variables from being used
+before it is assigned a value.
+
+<!-- For more information, see TODO future section on ownership and move semantics. -->
+
+### Inference
+
+As mentioned above, the Move compiler will infer a `copy` or `move` if one is not indicated. The
+algorithm for doing so is quite simple:
+
+- Any scalar value with the `copy` [ability](./abilities.md) is given a `copy`.
+- Any reference (both mutable `&mut` and immutable `&`) is given a `copy`.
+  - Except under special circumstances where it is made a `move` for predictable borrow checker
+    errors.
+- Any other value is given a `move`.
+  - This means that even though other values might be have the `copy` [ability](./abilities.md), it
+    must be done _explicitly_ by the programmer.
+  - This is to prevent accidental copies of large data structures.
+
+For example:
+
+```move
+let s = b"hello";
+let foo = Foo { f: 0 };
+let coin = Coin { value: 0 };
+
+let s2 = s; // move
+let foo2 = foo; // move
+let coin2 = coin; // move
+
+let x = 0;
+let b = false;
+let addr = @0x42;
+let x_ref = &x;
+let coin_ref = &mut coin2;
+
+let x2 = x; // copy
+let b2 = b; // copy
+let addr2 = @0x42; // copy
+let x_ref2 = x_ref; // copy
+let coin_ref2 = coin_ref; // copy
+```
diff --git a/vendors/move/crates/documentation/book/src/vector.md b/vendors/move/crates/documentation/book/src/vector.md
new file mode 100644
index 000000000..ad18a7e91
--- /dev/null
+++ b/vendors/move/crates/documentation/book/src/vector.md
@@ -0,0 +1,169 @@
+# Vector
+
+`vector<T>` is the only primitive collection type provided by Move. A `vector<T>` is a homogenous
+collection of `T`'s that can grow or shrink by pushing/popping values off the "end".
+
+A `vector<T>` can be instantiated with any type `T`. For example, `vector<u64>`, `vector<address>`,
+`vector<0x42::MyModule::MyResource>`, and `vector<vector<u8>>` are all valid vector types.
+
+## Literals
+
+### General `vector` Literals
+
+Vectors of any type can be created with `vector` literals.
+
+| Syntax                | Type                                                                          | Description                                |
+| --------------------- | ----------------------------------------------------------------------------- | ------------------------------------------ |
+| `vector[]`            | `vector[]: vector<T>` where `T` is any single, non-reference type             | An empty vector                            |
+| `vector[e1, ..., en]` | `vector[e1, ..., en]: vector<T>` where `e_i: T` s.t. `0 < i <= n` and `n > 0` | A vector with `n` elements (of length `n`) |
+
+In these cases, the type of the `vector` is inferred, either from the element type or from the
+vector's usage. If the type cannot be inferred, or simply for added clarity, the type can be
+specified explicitly:
+
+```move
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
+
+#### Example Vector Literals
+
+```move
+(vector[]: vector<bool>);
+(vector[0u8, 1u8, 2u8]: vector<u8>);
+(vector<u128>[]: vector<u128>);
+(vector<address>[@0x42, @0x100]: vector<address>);
+```
+
+### `vector<u8>` literals
+
+A common use-case for vectors in Move is to represent "byte arrays", which are represented with
+`vector<u8>`. These values are often used for cryptographic purposes, such as a public key or a hash
+result. These values are so common that specific syntax is provided to make the values more
+readable, as opposed to having to use `vector[]` where each individual `u8` value is specified in
+numeric form.
+
+There are currently two supported types of `vector<u8>` literals, *byte strings* and *hex strings*.
+
+#### Byte Strings
+
+Byte strings are quoted string literals prefixed by a `b`, e.g. `b"Hello!\n"`.
+
+These are ASCII encoded strings that allow for escape sequences. Currently, the supported escape
+sequences are:
+
+| Escape Sequence | Description                                    |
+| --------------- | ---------------------------------------------- |
+| `\n`            | New line (or Line feed)                        |
+| `\r`            | Carriage return                                |
+| `\t`            | Tab                                            |
+| `\\`            | Backslash                                      |
+| `\0`            | Null                                           |
+| `\"`            | Quote                                          |
+| `\xHH`          | Hex escape, inserts the hex byte sequence `HH` |
+
+#### Hex Strings
+
+Hex strings are quoted string literals prefixed by a `x`, e.g. `x"48656C6C6F210A"`.
+
+Each byte pair, ranging from `00` to `FF`, is interpreted as hex encoded `u8` value. So each byte
+pair corresponds to a single entry in the resulting `vector<u8>`.
+
+#### Example String Literals
+
+```move
+script {
+fun byte_and_hex_strings() {
+    assert!(b"" == x"", 0);
+    assert!(b"Hello!\n" == x"48656C6C6F210A", 1);
+    assert!(b"\x48\x65\x6C\x6C\x6F\x21\x0A" == x"48656C6C6F210A", 2);
+    assert!(
+        b"\"Hello\tworld!\"\n \r \\Null=\0" ==
+            x"2248656C6C6F09776F726C6421220A200D205C4E756C6C3D00",
+        3
+    );
+}
+}
+```
+
+## Operations
+
+`vector` supports the following operations via the `std::vector` module in the Move standard
+library:
+
+| Function                                                   | Description                                                                                                                                                     | Aborts?                        |
+| ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
+| `vector::empty<T>(): vector<T>`                            | Create an empty vector that can store values of type `T`                                                                                                        | Never                          |
+| `vector::singleton<T>(t: T): vector<T>`                    | Create a vector of size 1 containing `t`                                                                                                                        | Never                          |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | Add `t` to the end of `v`                                                                                                                                       | Never                          |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | Remove and return the last element in `v`                                                                                                                       | If `v` is empty                |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | Return an immutable reference to the `T` at index `i`                                                                                                           | If `i` is not in bounds        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | Return a mutable reference to the `T` at index `i`                                                                                                              | If `i` is not in bounds        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | Delete `v`                                                                                                                                                      | If `v` is not empty            |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | Add the elements in `v2` to the end of `v1`                                                                                                                     | Never                          |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | Return true if `e` is in the vector `v`. Otherwise, returns false                                                                                                | Never                          |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | Swaps the elements at the `i`th and `j`th indices in the vector `v`                                                                                             | If `i` or `j` is out of bounds |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | Reverses the order of the elements in the vector `v` in place                                                                                                   | Never                          |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | Return `(true, i)` if `e` is in the vector `v` at index `i`. Otherwise, returns `(false, 0)`                                                                    | Never                          |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | Remove the `i`th element of the vector `v`, shifting all subsequent elements. This is O(n) and preserves ordering of elements in the vector                     | If `i` is out of bounds        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | Swap the `i`th element of the vector `v` with the last element and then pop the element, This is O(1), but does not preserve ordering of elements in the vector  | If `i` is out of bounds        |
+
+More operations may be added over time.
+
+## Example
+
+```move
+use std::vector;
+
+let v = vector::empty<u64>();
+vector::push_back(&mut v, 5);
+vector::push_back(&mut v, 6);
+
+assert!(*vector::borrow(&v, 0) == 5, 42);
+assert!(*vector::borrow(&v, 1) == 6, 42);
+assert!(vector::pop_back(&mut v) == 6, 42);
+assert!(vector::pop_back(&mut v) == 5, 42);
+```
+
+## Destroying and copying `vector`s
+
+Some behaviors of `vector<T>` depend on the abilities of the element type, `T`. For example, vectors
+containing elements that do not have `drop` cannot be implicitly discarded like `v` in the example
+above--they must be explicitly destroyed with `vector::destroy_empty`.
+
+Note that `vector::destroy_empty` will abort at runtime unless `vec` contains zero elements:
+
+```move
+fun destroy_any_vector<T>(vec: vector<T>) {
+    vector::destroy_empty(vec) // deleting this line will cause a compiler error
+}
+```
+
+But no error would occur for dropping a vector that contains elements with `drop`:
+
+```move
+fun destroy_droppable_vector<T: drop>(vec: vector<T>) {
+    // valid!
+    // nothing needs to be done explicitly to destroy the vector
+}
+```
+
+Similarly, vectors cannot be copied unless the element type has `copy`. In other words, a
+`vector<T>` has `copy` if and only if `T` has `copy`. However, even copyable vectors are never
+implicitly copied:
+
+```move
+let x = vector::singleton<u64>(10);
+let y = copy x; // compiler error without the copy!
+```
+
+Copies of large vectors can be expensive, so the compiler requires explicit `copy`'s to make it
+easier to see where they are happening.
+
+For more details see the sections on [type abilities](./abilities.md) and [generics](./generics.md).
+
+## Ownership
+
+As mentioned [above](#destroying-and-copying-vectors), `vector` values can be copied only if the
+elements can be copied. In that case, the copy must be explicit via a
+[`copy`](./variables.md#move-and-copy) or a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/.gitignore b/vendors/move/crates/documentation/book/translations/move-book-zh/.gitignore
new file mode 100644
index 000000000..7585238ef
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/.gitignore
@@ -0,0 +1 @@
+book
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/CONTRIBUTING.md b/vendors/move/crates/documentation/book/translations/move-book-zh/CONTRIBUTING.md
new file mode 100644
index 000000000..8d7724ea5
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/CONTRIBUTING.md
@@ -0,0 +1,74 @@
+# Contributing to Move Book Chinese Version
+
+感谢您有兴趣为**《Move Book 中文版》**做出贡献！有很多方法可以做出贡献，我们感谢所有这些方式。
+
+本翻译项目由 [*Move 中文社区（MoveCC）*](https://github.com/move-cc)[发起](https://github.com/move-language/move/issues/353)，并与 [MoveDAO 社区](https://github.com/move-dao)共同初步完善。
+
+目前工作仍在进行中！
+
+欢迎所有对 Move 感兴趣的朋友一起加入到《Move Book 中文版》的翻译工作中。
+
+## 提交 PR 的 Commits 格式
+
+```text
+[move-book-zh] 关于这个 PR 的描述信息
+```
+
+## 文档规范
+
+请参考：[中文技术文档的写作规范](https://github.com/ruanyf/document-style-guide)
+
+### 断句
+
+本书使用 Markdown 作为源文件，使用 [mdBook](https://github.com/rust-lang/mdBook) 作为渲染引擎。
+
+由于中英文有所区别，换行后渲染引擎会自动追加一个空格。为了优化视觉体验，中文一个段落内不必换行，保持中文的段内容为一个物理行。
+
+英文是由空格分隔的文本，所以不存在上述问题。
+
+### 中英文混排规范
+
+文中出现中英文混排时，中文与英文之间需要添加一个空格。如果英文单词结尾，此时单词与标点符号之间不添加空格。
+
+### 数字规范
+
+数字之间需要添加一个空格，如果数字带有英文单位，那么数字与英文单位之间不能添加空格。如果数字后带有中文单位，需要添加一个空格。
+
+```text
+正确：如果一个 1s 的帧被划分为 10 个时隙，每个时隙为 100ms。
+
+错误：如果一个1s的帧被划分为10个时隙，每个时隙为100ms。
+
+错误：如果一个 1 s 的帧被划分为10个时隙，每个时隙为 100 ms。
+```
+
+### 逗号问题
+
+英文中，没有顿号这种标点符号，逗号常用分隔并列的句子成分或结构。
+
+英文中，像 `and` 并列词的前面通常会有一个 `,`，但在中文里表示对象之间的并列关系时，`和`的前面不能带逗号。
+
+```text
+War, famine, and flood are terrible.
+战争, 饥荒和洪水都是很可怕的。
+```
+
+### 冒号和逗号的使用场景规范
+
+冒号通常用在“问、答、说、指出、宣布、证明、表明、例如”一类动词后面，表示提起下文。
+如果在较短的提示句子中，需要将 `：` 改为 `，`；如果提示内容比较多，则使用 `：` 来提起下文：
+
+示例1，提起的内容短少：
+
+```text
+十六进制字符串是以 x 为前缀的带引号的字符串文字，例如x'48656C6C6F210A'
+```
+
+示例2，提起的内容多：
+
+```text
+在这些情况下，vector 的类型是从元素类型或从动态数组的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/README.md b/vendors/move/crates/documentation/book/translations/move-book-zh/README.md
new file mode 100644
index 000000000..9de276331
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/README.md
@@ -0,0 +1,73 @@
+## 参与贡献的重要提示
+
+《Move Book 中文版》翻译工作还在持续进行中，如果你愿意贡献你的一份力量，欢迎提交 pr 或 issue。
+
+为了方便翻译工作的进行，在提交 pr 时请不要删除英文原文的内容！
+
+在贡献之前请阅读[官方的贡献指南](https://github.com/move-language/move/blob/main/CONTRIBUTING.md)和[《Move Book 中文版》的贡献指南](./CONTRIBUTING.md)。
+
+# Move Book 中文版
+
+区块链技术的发展经历了两个阶段，比特币（BTC）开启了*区块链1.0时代*，以太坊（ETH）开启了*区块链2.0时代*。
+以太坊的出现为区块链带来了*智能合约*这一关键技术，让区块链不只停留在记账这一单的目的，而是带来更多的应用拓展性。
+遗憾的是，智能合约如同一把双刃剑，在带来众多丰富功能拓展的同时，也容易让智能合约开发者无意间引入不安全的代码，让链的资产受到威胁。
+
+编写简单、安全、易部署的智能合约应该是*区块链3.0时代*应该关注的重点，**面向资源编程**的 [Move 语言](https://github.com/move-language/move)，无疑给这个问题提供了一个很好的解决方案。
+
+本书是 [Move Book](https://move-language.github.io/move/) 的中文版。
+
+## 快速开始
+
+本书使用 [mdBook](https://rust-lang.github.io/mdBook/) 构建。
+
+1. 使用 Cargo 安装 mdBook：
+
+```shell
+cargo install mdbook
+```
+
+2. 下载
+
+```shell
+git clone https://github.com/move-language/move.git
+```
+
+3. 构建并预览
+
+```shell
+cd language/documentation/book/translations/move-book-zh
+mdbook serve --open
+```
+
+## Contributors ✨
+
+[各章节译者](Translators.md)
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/Kusou1"><img src="https://avatars.githubusercontent.com/u/57334674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zhang</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Code">💻</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Documentation">📖</a> <a href="#translation-Kusou1" title="Translation">🌍</a> <a href="#infra-Kusou1" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/ruy1su"><img src="https://avatars.githubusercontent.com/u/9391802?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ruyisu</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Code">💻</a> <a href="#translation-ruy1su" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Aruy1su" title="Reviewed Pull Requests">🚇</a></td>
+    <td align="center"><a href="https://github.com/lshoo"><img src="https://avatars.githubusercontent.com/u/670440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lshoo</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Code">💻</a> <a href="#translation-lshoo" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Documentation">📖</a> <a href="#ideas-lshoo" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Alshoo" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/Container-00"><img src="https://avatars.githubusercontent.com/u/61052480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Container</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Code">💻</a> <a href="#translation-Container-00" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3AContainer-00" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/nosalt99"><img src="https://avatars.githubusercontent.com/u/22558493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nosalt</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Code">💻</a> <a href="#translation-nosalt99" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Documentation">📖</a> <a href="#infra-nosalt99" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/geometryolife"><img src="https://avatars.githubusercontent.com/u/54882546?v=4?s=100" width="100px;" alt=""/><br /><sub><b>geometryolife</b></sub></a><br /><a href="https://github.com/move-language/move/commits?author=geometryolife" title="Code">💻</a> <a href="#translation-geometryolife" title="Translation">🌍</a> <a href="#talk-geometryolife" title="Talks">📢</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/666thi"><img src="https://avatars.githubusercontent.com/u/109965699?v=4?s=100" width="100px;" alt=""/><br /><sub><b>666thi</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=666thi" title="Code">💻</a> <a href="#translation-666thi" title="Translation">🌍</a> <a href="#talk-666thi" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/MagicGordon"><img src="https://avatars.githubusercontent.com/u/19465870?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MagicGordon</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=MagicGordon" title="Code">💻</a> <a href="#translation-MagicGordon" title="Translation">🌍</a> <a href="#talk-MagicGordon" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xixifusi1984"><img src="https://avatars.githubusercontent.com/u/39210551?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xixifusi1984</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xixifusi1984" title="Code">💻</a> <a href="#translation-xixifusi1984" title="Translation">🌍</a> <a href="#talk-xixifusi1984" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/yvvw"><img src="https://avatars.githubusercontent.com/u/15168529?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yvvw</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=yvvw" title="Code">💻</a> <a href="#translation-yvvw" title="Translation">🌍</a> <a href="#talk-yvvw" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xiaochuan891102"><img src="https://avatars.githubusercontent.com/u/109952533?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xiaochuan891102</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xiaochuan891102" title="Code">💻</a> <a href="#translation-xiaochuan891102" title="Translation">🌍</a> <a href="#talk-xiaochuan891102" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/stephenLee"><img src="https://avatars.githubusercontent.com/u/1144508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stephenLee</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=stephenLee" title="Code">💻</a> <a href="#translation-stephenLee" title="Translation">🌍</a> <a href="#talk-stephenLee" title="Talks">📢</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/Translators.md b/vendors/move/crates/documentation/book/translations/move-book-zh/Translators.md
new file mode 100644
index 000000000..35bce4ce5
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/Translators.md
@@ -0,0 +1,30 @@
+|    | 章节                       | 译者                                           | 校对                                                                                |
+|----|----------------------------|------------------------------------------------|-------------------------------------------------------------------------------------|
+| 0  | Intoduction                | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 1  | Modules and Scripts        | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 2  | Move Tutorial              | loadi、[@leego](https://github.com/leego)      | [@Joe Chen](https://github.com/geometryolife)                                       |
+| 3  | Integers                   | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 4  | Bool                       | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 5  | Address                    | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 6  | Vector                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 7  | Signer                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 8  | References                 | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 9  | Tuples and Unit            | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 10 | Local Variables and Scopes | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 11 | Equality                   | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 12 | Abort and Assert           | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 13 | Conditionals               | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 14 | While and Loop             | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 15 | Functions                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 16 | Structs and Resource       | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 17 | Constants                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 18 | Generics                   | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 19 | Type Abilities             | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 20 | Uses and Aliases           | 小川                                           | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 21 | Friends                    | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 22 | Packages                   | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 23 | Unit Test                  | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 24 | Global Storage Structure   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 25 | Global Storage Operators   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 26 | Standard Library           | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 27 | Coding Conventions         | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/book.toml b/vendors/move/crates/documentation/book/translations/move-book-zh/book.toml
new file mode 100644
index 000000000..1f51aef58
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/book.toml
@@ -0,0 +1,7 @@
+[book]
+authors = ["The Move Contributors"]
+description = "Move book maintained by the Move Chinese contributors."
+language = "zh"
+multilingual = false
+src = "src"
+title = "Move Book 中文版"
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/SUMMARY.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/SUMMARY.md
new file mode 100644
index 000000000..4b75899b4
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/SUMMARY.md
@@ -0,0 +1,45 @@
+# The Move Programming Language
+
+[引言（Introduction）](introduction.md)
+
+## Getting Started
+
+- [模块和脚本（Modules and Scripts）](modules-and-scripts.md)
+- [Move 教程（Move Tutorial）](move-tutorial.md)
+
+## Primitive Types
+
+- [整数（Integers）](integers.md)
+- [布尔类型（Bool）](bool.md)
+- [地址（Address）](address.md)
+- [向量（Vector）](vector.md)
+- [签名（Signer）](signer.md)
+- [引用（References）](references.md)
+- [元组和单值（Tuples and Unit）](tuples.md)
+
+## Basic Concepts
+
+- [局部变量和作用域（Local Variables and Scopes）](variables.md)
+- [等式（Equality）](equality.md)
+- [中止和断言（Abort and Assert）](abort-and-assert.md)
+- [条件语句（Conditionals）](conditionals.md)
+- [循环（While and Loop）](loops.md)
+- [函数（Functions）](functions.md)
+- [结构体和资源（Structs and Resources）](structs-and-resources.md)
+- [常量（Constants）](constants.md)
+- [泛型（Generics）](generics.md)
+- [类型能力（Type Abilities）](abilities.md)
+- [导入和别名（Uses and Aliases）](uses.md)
+- [友元函数（Friends）](friends.md)
+- [程序包（Packages）](packages.md)
+- [单元测试（Unit Tests）](unit-testing.md)
+
+## Global Storage
+
+- [全局存储结构（Global Storage Structure）](global-storage-structure.md)
+- [全局存储操作（Global Storage Operators）](global-storage-operators.md)
+
+## Reference
+
+- [标准库（Standard Library）](standard-library.md)
+- [Move 编码约定（Coding Conventions）](coding-conventions.md)
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/abilities.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/abilities.md
new file mode 100644
index 000000000..440362288
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/abilities.md
@@ -0,0 +1,321 @@
+# 能力 (abilities)
+
+Abilities are a typing feature in Move that control what actions are permissible for values of a given type. This system grants fine grained control over the "linear" typing behavior of values, as well as if and how values are used in global storage. This is implemented by gating access to certain bytecode instructions so that for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+能力是 Move 语言中的一种类型特性，用于控制对给定类型的值允许哪些操作。 该系统对值的“线性”类型行为以及值如何在全局存储中使用提供细粒度控制。这是通过对某些字节码指令的进行访问控制来实现的，因此对于要与字节码指令一起使用的值，它必须具有所需的能力(如果需要的话，并非每条指令都由能力控制)
+
+## 四种能力 (The Four Abilities)
+
+The four abilities are:
+
+* [`copy`](#copy)
+    * Allows values of types with this ability to be copied.
+* [`drop`](#drop)
+    * Allows values of types with this ability to be popped/dropped.
+* [`store`](#store)
+    * Allows values of types with this ability to exist inside a struct in global storage.
+* [`key`](#key)
+    * Allows the type to serve as a key for global storage operations.
+
+这四种能力分别是：
+
+* [`copy`](#copy) 复制
+  * 允许此类型的值被复制
+
+* [`drop`](#drop) 丢弃
+  * 允许此类型的值被弹出/丢弃
+
+* [`store`](#store) 存储
+  * 允许此类型的值存在于全局存储的某个结构体中
+
+* [`key`](#key) 键值
+  * 允许此类型作为全局存储中的键(具有 `key` 能力的类型才能保存到全局存储中)
+
+
+### `copy`
+
+The `copy` ability allows values of types with that ability to be copied. It gates the ability to copy values out of local variables with the [`copy`](./variables.md#move-and-copy) operator and to copy values via references with [dereference `*e`](./references.md#reading-and-writing-through-references).
+
+If a value has `copy`, all values contained inside of that value have `copy`.
+
+`copy` 能力允许具有此能力的类型的值被复制。 它限制了从本地变量通过 [`copy`](./variables.md#.move-and-copy)能力复制值以及通过 [`dereference *e`](./references.html#reading-and-writing-through-references)复制值这两种情况之外的复制操作。
+
+如果一个值具有 `copy` 能力，那么这个值内部的所有值都有 `copy` 能力。
+
+### `drop`
+
+The `drop` ability allows values of types with that ability to be dropped. By dropped, we mean that value is not transferred and is effectively destroyed as the Move program executes. As such, this ability gates the ability to ignore values in a multitude of locations, including:
+* not using the value in a local variable or parameter
+* not using the value in a [sequence via `;`](./variables.md#expression-blocks)
+* overwriting values in variables in [assignments](./variables.md#assignments)
+* overwriting values via references when [writing `*e1 = e2`](./references.md#reading-and-writing-through-references).
+
+If a value has `drop`, all values contained inside of that value have `drop`.
+
+`drop` 能力允许类型的值被丢弃。丢弃的意思程序执行后值会被有效的销毁而不必被转移。因此，这个能力限制在多个位置忽略使用值的可能性，包括：
+* 未被使用的局部变量或者参数
+* 未被使用的 [`sequence` via `;`](./variables.md#expression-blocks)中的值
+* 覆盖[赋值(assignments)](./variables.html#assignments)变量中的值
+* [写入(writing) `*e1 = e2`](https://move-language.github.io/move/references.html#reading-and-writing-through-references) 时通过引用覆盖的值。
+
+如果一个值具有 `drop` 能力，那么这个值内部的所有值都有 `drop` 能力。
+
+### `store`
+
+The `store` ability allows values of types with this ability to exist inside of a struct (resource) in global storage, *but* not necessarily as a top-level resource in global storage. This is the only ability that does not directly gate an operation. Instead it gates the existence in global storage when used in tandem with `key`.
+
+If a value has `store`, all values contained inside of that value have `store`
+
+`store` 能力允许具有这种能力的类型的值位于[全局存储](./global-storage-operators.html)中的结构体(资源)内, *但不一定是* 全局存储中的顶级资源。这是唯一不直接限制操作的能力。相反，当(`store`)与 `key` 一起使用时，它对全局存储中的可行性进行把关。。
+
+如果一个值具有 `store` 能力，那么这个值内部的所有值都有 `store` 能力。
+
+### `key`
+
+The `key` ability allows the type to serve as a key for [global storage operations](./global-storage-operators.md). It gates all global storage operations, so in order for a type to be used with `move_to`, `borrow_global`, `move_from`, etc., the type must have the `key` ability. Note that the operations still must be used in the module where the `key` type is defined (in a sense, the operations are private to the defining module).
+
+If a value has `key`, all values contained inside of that value have `store`. This is the only ability with this sort of asymmetry.
+
+`key` 能力允许此类型作为[全局存储](./global-storage-operators.html)中的键。它会限制所有[全局存储](./global-storage-operators.html)中的操作，因此一个类型如果与 `move_to`, `borrow_global`, `move_from` 等一起使用，那么这个类型必须具备 `key` 能力。请注意，这些操作仍然必须在定义 `key` 类型的模块中使用(从某种意义上说，这些操作是此模块的私有操作)。
+
+如果有一个值有 `key` 能力，那么这个值包含的所有字段值也都具有 `store` 能力，`key` 能力是唯一一个具有非对称的能力。
+
+## Builtin Types (内置类型)
+
+
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `store`
+
+* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities and Generic Types](#conditional-abilities-and-generic-types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+None of the primitive types have `key`, meaning none of them can be used directly with the [global storage operations](./global-storage-operators.md).
+
+几乎所有内置的基本类型具都有 `copy`，`drop`，以及 `store` 能力，`singer` 除外，它只有 `drop` 能力(原文是 `store` 有误，译者注)
+
+* `bool`, `u8`, `u64`, `u128`, `address` 都具有 `copy`, `drop`, 以及 `store` 能力。
+* `signer` 具有 `drop` 能力。 不能被复制以及不能被存放在全局存储中
+* `vector<T>` 可能具有 `copy`，`drop`，以及`store` 能力，这依赖于 `T` 具有的能力。 查看 [条件能力与泛型类型](#conditional-abilities-and-generic-types)获取详情
+* 不可变引用 `&` 和可变引用 `&mut` 都具有 `copy` 和 `drop` 能力。
+    * 这是指复制和删除引用本身，而不是它们所引用的内容。
+    * 引用不能出现在全局存储中，因此它们没有 `store` 能力。
+
+所有基本类型都没有 `key`，这意味着它们都不能直接用于[全局存储操作](./global-storage-operators.html)。
+
+## Annotating Structs (标注结构体)
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+要声明一个 `struct` 具有某个能力，它在结构体名称之后, 在字段之前用 `has <ability>` 声明。例如：
+
+```move
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case: `Ignorable` has the `drop` ability. `Pair` has `copy`, `drop`, and `store`.
+
+在这个例子中：`Ignorable` 具有 `drop` 能力。 `Pair` 具有 `copy`、`drop` 和 `store` 能力。
+
+All of these abilities have strong guarantees over these gated operations. The operation can be performed on the value only if it has that ability; even if the value is deeply nested inside of some other collection!
+
+所有这些能力对这些访问操作都有强有力的保证。只有具有该能力，才能对值执行对应的操作；即使该值深层嵌套在其他集合中！
+
+As such: when declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for the abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`.
+* `drop`, all fields must have `drop`.
+* `store`, all fields must have `store`.
+* `key`, all fields must have `store`.
+    * `key` is the only ability currently that doesn’t require itself.
+
+因此：在声明结构体的能力时，对字段提出了某些要求。所有字段都必须满足这些约束。这些规则是必要的，以便结构体满足上述功能的可达性规则。如果一个结构被声明为具有某能力：
+
+* `copy`， 所有的字段必须具有 `copy` 能力。
+* `drop`，所有的字段必须具有 `drop` 能力。
+* `store`，所有的字段必须具有 `store` 能力。
+* `key`，所有的字段必须具有 `store` 能力。`key` 是目前唯一不需要包含自身的能力。
+
+例如:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+类似的：
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+## Conditional Abilities and Generic Types (条件能力与泛型类型)
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+在泛型类型上标注能力时，并非该类型的所有实例都保证具有该能力。考虑这个结构体声明：
+
+```move
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+
+It might be very helpful if `Cup` could hold any type, regardless of its abilities. The type system can *see* the type parameter, so it should be able to remove abilities from `Cup` if it *sees* a type parameter that would violate the guarantees for that ability.
+
+This behavior might sound a bit confusing at first, but it might be more understandable if we think about collection types. We could consider the builtin type `vector` to have the following type declaration:
+
+如果 `Cup` 可以容纳任何类型，可能会很有帮助，不管它的能力如何。类型系统可以 *看到* 类型参数，因此，如果它 *发现* 一个类型参数违反了对该能力的保证，它应该能够从 `Cup` 中删除能力。
+
+这种行为一开始可能听起来有点令人困惑，但如果我们考虑一下集合类型，它可能会更容易理解。我们可以认为内置类型 `Vector` 具有以下类型声明：
+
+```move
+vector<T> has copy, drop, store;
+```
+
+We want `vector`s to work with any type. We don't want separate `vector` types for different abilities. So what are the rules we would want? Precisely the same that we would want with the field rules above.  So, it would be safe to copy a `vector` value only if the inner elements can be copied. It would be safe to ignore a `vector` value only if the inner elements can be ignored/dropped. And, it would be safe to put a `vector` in global storage only if the inner elements can be in global storage.
+
+To have this extra expressiveness, a type might not have all the abilities it was declared with depending on the instantiation of that type; instead, the abilities a type will have depends on both its declaration **and** its type arguments. For any type, type parameters are pessimistically assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. Taking `Cup` from above as an example:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+我们希望 `vector` 适用于任何类型。我们不希望针对不同的能力使用不同的 `vector` 类型。那么我们想要的规则是什么？与上面的字段规则完全相同。因此，仅当可以复制内部元素时，复制`vector` 值才是安全的。仅当可以忽略/丢弃内部元素时，忽略 `vector` 值才是安全的。而且，仅当内部元素可以在全局存储中时，将向量放入全局存储中才是安全的。
+
+为了具有这种额外的表现力，一个类型可能不具备它声明的所有能力，具体取决于该类型的实例化；相反，一个类型的能力取决于它的声明 **和** 它的类型参数。对于任何类型，类型参数都被悲观地假定为在结构体内部使用，因此只有在类型参数满足上述字段要求时才授予这些能力。以上面的 `Cup` 为例：
+
+* `Cup` 拥有 `copy` 能力 仅当 `T` 拥有 `copy` 能力时。
+* `Cup` 拥有 `drop` 能力 仅当 `T` 拥有 `drop` 能力时。
+* `Cup` 拥有 `store` 能力 仅当 `T` 拥有 `store` 能力时。
+* `Cup` 拥有 `key` 能力 仅当 `T` 拥有 `store` 能力时。
+
+Here are examples for this conditional system for each ability:
+
+以下是每个能力的条件系统的示例：
+
+### Example: conditional `copy`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'copy' because 'S' has 'copy'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'copy'
+    // because 'NoAbilities' does not have 'copy'
+    let c_n2 = copy c_n;
+}
+```
+
+### Example: conditional `drop`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+}
+```
+
+### Example: conditional `store`
+
+```move
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+### Example: conditional `key`
+
+```move
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/abort-and-assert.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/abort-and-assert.md
new file mode 100644
index 000000000..314940ee1
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/abort-and-assert.md
@@ -0,0 +1,255 @@
+# 中止和断言 (Abort and Assert)
+
+[`return`](./functions.md) and `abort` are two control flow constructs that end execution, one for
+the current function and one for the entire transaction.
+
+More information on [`return` can be found in the linked section](./functions.md)
+
+[`return`](./functions.md) 和 `abort` 是两种结束程序执行的控制流结构。前者针对当前函数，后者针对整个事务。
+
+ [`return`](./functions.md)的更多信息可以参考链接中的文章。
+
+## `abort` 中止
+
+`abort` is an expression that takes one argument: an **abort code** of type `u64`. For example:
+
+`abort` 表达式只接受一个参数: 类型为 `u64` 的**中止代码**。例如：
+
+```move
+abort 42
+```
+
+The `abort` expression halts execution the current function and reverts all changes made to global
+state by the current transaction. There is no mechanism for "catching" or otherwise handling an `abort`.
+
+`abort` 表达式会中止执行当前函数并恢复当前事务对全局状态所做的所有更改。Move语言没有“捉捕”或者额外处理`abort`的机制。
+
+Luckily, in Move transactions are all or nothing, meaning any changes to global storage are made all
+at once only if the transaction succeeds. Because of this transactional commitment of changes, after
+an abort there is no need to worry about backing out changes. While this approach is lacking in
+flexibility, it is incredibly simple and predictable.
+
+幸运的是，在Move里事务的计算要么完全执行要么完全不执行。这意味着只有在事务成功时，任何对全局存储状态的改变才会被一并执行。
+由于这种对于所有更改的事务承诺，在 `abort` 之后我们不需要担心去回滚任何更改。尽管这种方法缺少灵活性，它还是非常简单和可预测的。
+
+
+Similar to [`return`](./functions.md), `abort` is useful for exiting control flow when some condition cannot be met.
+
+In this example, the function will pop two items off of the vector, but will abort early if the vector does not have two items
+
+与 [`return`](./functions.md)相似, 在一些条件无法被满足的时候，`abort` 可以被用于退出控制流(control flow)。
+
+在以下示例中，目标函数会从vector里弹出两个元素，但是如果vector中并没有两个元素，函数会提前中止。
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    if (vector::length(v) < 2) abort 42;
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+This is even more useful deep inside a control-flow construct. For example, this function checks
+that all numbers in the vector are less than the specified `bound`. And aborts otherwise
+
+这在控制流结构的深处甚至会更有用。例如，此函数检查vector中是否所有数字都小于指定的边界(`bound`)。否则函数中止：
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        if (cur > bound) abort 42;
+        i = i + 1;
+    }
+}
+```
+
+### `assert` 断言
+
+`assert` is a builtin, macro-like operation provided by the Move compiler. It takes two arguments, a condition of type `bool` and a code of type `u64`
+
+`assert` 是 Move 编译器提供的内置的类宏(macro-like)操作。它需要两个参数：一个 `bool` 类型的条件和一个 `u64` 类型的错误状态码(类似HTTP中的StatusCode: 404, 500等，译者注)
+
+```move
+assert!(condition: bool, code: u64)
+```
+
+Since the operation is a macro, it must be invoked with the `!`. This is to convey that the
+arguments to `assert` are call-by-expression. In other words, `assert` is not a normal function and
+does not exist at the bytecode level. It is replaced inside the compiler with
+
+由于该操作是一个宏，因此必须使用 `!` 调用它。这是为了表达 `assert` 的参数属于表达式调用(call-by-expression)。换句话说，`assert` 不是一个正常的函数，并且在字节码(bytecode)级别不存在。它在编译器内部被替换为以下代码：
+
+```move
+if (condition) () else abort code
+```
+
+`assert` is more commonly used than just `abort` by itself. The `abort` examples above can be rewritten using `assert`
+
+`assert` 比 `abort` 本身更常用。上面的 `abort` 示例可以使用 `assert` 重写
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    assert!(vector::length(v) >= 2, 42); // 现在使用'assert'
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+和
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        assert!(cur <= bound, 42); // 现在使用 'assert'
+        i = i + 1;
+    }
+}
+```
+
+Note that because the operation is replaced with this `if-else`, the argument for the `code` is not
+always evaluated. For example:
+
+请注意，因为此操作被替换为 `if-else`，这段 `代码` 的参数不是总是被执行(evaluated)。例如：
+
+```move
+assert!(true, 1 / 0)
+```
+
+Will not result in an arithmetic error, it is equivalent to
+
+不会导致算术错误，因为它相当于：
+
+```move
+if (true) () else (1 / 0)
+```
+
+So the arithmetic expression is never evaluated!
+
+所以这个算术表达式永远不会被执行(evaluated)！
+
+### Abort codes in the Move VM (Move虚拟机中的中止代码)
+
+When using `abort`, it is important to understand how the `u64` code will be used by the VM.
+
+Normally, after successful execution, the Move VM produces a change-set for the changes made to
+global storage (added/removed resources, updates to existing resources, etc).
+
+当使用 `abort` 时，理解虚拟机将如何使用 `u64` 代码是非常重要的。
+
+通常，在成功执行后，Move 虚拟机会为对全局存储(添加/删除资源、更新现有资源等)所做的更改生成一个更改集。
+
+If an `abort` is reached, the VM will instead indicate an error. Included in that error will be two
+pieces of information:
+
+- The module that produced the abort (address and name)
+- The abort code.
+
+For example
+
+如果执行到 `abort` 代码，虚拟机将指示错误。该错误中包含两块信息：
+
+- 发生中止的模块(地址和名称)
+- 错误状态码。
+
+例如
+
+```move=
+address 0x2 {
+    module example {
+        public fun aborts() {
+            abort 42
+        }
+    }
+}
+
+script {
+    fun always_aborts() {
+        0x2::example::aborts()
+    }
+}
+```
+
+If a transaction, such as the script `always_aborts` above, calls `0x2::example::aborts`, the VM
+would produce an error that indicated the module `0x2::example` and the code `42`.
+
+This can be useful for having multiple aborts being grouped together inside a module.
+
+In this example, the module has two separate error codes used in multiple functions
+
+如果一个事务，例如上面的脚本 `always_aborts` 调用了 `0x2::example::aborts`，虚拟机将产生一个指示模块 `0x2::example` 和错误状态码 `42` 的错误。
+
+这在一个模块内将多个中止功能组合起来会很有用。
+
+在以下示例中，模块有两个单独的错误状态码，用于多个函数
+
+```move=
+address 0x42 {
+    module example {
+
+        use std::vector;
+
+        const EMPTY_VECTOR: u64 = 0;
+        const INDEX_OUT_OF_BOUNDS: u64 = 1;
+
+        // 移动 i 到 j, 移动 j 到 k, 移动 k 到 i
+        public fun rotate_three<T>(v: &mut vector<T>, i: u64, j: u64, k: u64) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(k < n, INDEX_OUT_OF_BOUNDS);
+
+            vector::swap(v, i, k);
+            vector::swap(v, j, k);
+        }
+
+        public fun remove_twice<T>(v: &mut vector<T>, i: u64, j: u64): (T, T) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(i > j, INDEX_OUT_OF_BOUNDS);
+
+            (vector::remove<T>(v, i), vector::remove<T>(v, j))
+        }
+    }
+}
+```
+
+## The type of `abort` (`abort` 的类型)
+
+The `abort i` expression can have any type! This is because both constructs break from the normal
+control flow, so they never need to evaluate to the value of that type.
+
+The following are not useful, but they will type check
+
+`abort i` 表达式可以有任何类型！这是因为这两种构造都打破了正常控制流，因此他们永远不需要计算该类型的值。
+
+以下的示例不是特别有用，但它们会做类型检查
+
+```move
+let y: address = abort 0;
+```
+
+This behavior can be helpful in situations where you have a branching instruction that produces a
+value on some branches, but not all. For example:
+
+在您有一个分支指令，并且这个指令会产生某些分支(不是全部)的值的时候，这种行为会非常有用。例如：
+
+```move
+let b =
+    if (x == 0) false
+    else if (x == 1) true
+    else abort 42;
+//       ^^^^^^^^ `abort 42` 的类型是 `bool`
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/address.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/address.md
new file mode 100644
index 000000000..1a5edc9d9
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/address.md
@@ -0,0 +1,58 @@
+# 地址
+
+`地址（address）`是 Move 中的内置类型，用于表示全局存储中的的位置（有时称为账户）。`地址（address）` 值是一个 128 位（16 字节）标识符。在一个给定的地址，可以存储两样东西：[模块（Module）](./modules-and-scripts.md)和[资源（Resources）](./structs-and-resources.md)。
+
+虽然`地址（address）`在底层是一个 128 位整数，但 Move 语言有意让其不透明 —— 它们不能从整数创建，不支持算术运算，也不能修改。即使可能有一些有趣的程序会使用这种特性（例如，C 中的指针算法实现了类似壁龛（niche）的功能），但 Move 语言不允许这种动态行为，因为它从头开始就被设计为支持静态验证。*（壁龛指安装在墙壁上的小格子或在墙身上留出的作为贮藏设施的空间，最早在宗教上是指排放佛像的小空间，现在多用在家庭装修上，因其不占建筑面积，使用比较方便，深受大家喜爱，Joe 注）*
+
+你可以通过运行时地址值（`address` 类型的值）来访问该地址处的资源。但*无法*在运行时通过地址值访问模块。
+
+## 地址及其语法
+
+地址有两种形式：*命名的*或*数值的*。命名地址的语法遵循 Move 命名标识符的规则。数值地址的语法不受十六进制编码值的限制，任何有效的 [`u128` 数值](./integers.md)都可以用作地址值。例如，`42`，`0xCFAE` 和 `2021` 都是合法有效的数值地址字面量（literal）。
+
+为了区分何时在表达式上下文中使用地址，使用地址时的语法根据使用地址的上下文而有所不同：
+
+* 当地址被用作表达式时，地址必须以 `@` 字符为前缀，例如：[`@<numerical_value>`](./integers.md) 或 `@<named_address_identifier>`。
+* 在表达式上下文之外，地址可以不带前缀字符 `@`。例如：[`<numerical_value>`](./integers.md) 或 `<named_address_identifier>`。
+
+通常，可以将 `@` 视为将地址从命名空间项变为表达式项的运算符。
+
+## 命名地址
+
+命名地址是一项特性，它允许在使用地址的任何地方使用标识符代替数值，而不仅仅是在值级别。命名地址被声明并绑定为 Move 包中的顶级元素（模块和脚本之外）或作为参数传递给 Move 编译器。
+
+命名地址仅存在于源语言级别，并将在字节码级别完全替代它们的值。因此，模块和模块成员*必须*通过模块的命名地址而不是编译期间分配给命名地址的数值来访问，例如：`use my_addr::foo` *不等于* `use 0x2::foo`，即使 Move 程序编译时将 `my_addr` 设置成 `0x2`。这个区别在[模块和脚本](./modules-and-scripts.md)一节中有更详细的讨论。
+
+### 例子
+
+```move
+let a1: address = @0x1; // 0x00000000000000000000000000000001 的缩写
+let a2: address = @0x42; // 0x00000000000000000000000000000042 的缩写
+let a3: address = @0xDEADBEEF; // 0x000000000000000000000000DEADBEEF 的缩写
+let a4: address = @0x0000000000000000000000000000000A;
+let a5: address = @std; // 将命名地址 `std` 的值赋给 `a5`
+let a6: address = @66;
+let a7: address = @0x42;
+
+module 66::some_module {   // 不在表达式上下文中，所以不需要 @
+    use 0x1::other_module; // 不在表达式上下文中，所以不需要 @
+    use std::vector;       // 使用其他模块时，可以使用命名地址作为命名空间项
+    ...
+}
+
+module std::other_module {  // 可以使用命名地址作为命名空间项来声明模块
+    ...
+}
+```
+
+## 全局存储操作
+
+`address` 值主要用来与全局存储操作进行交互。
+
+`address` 值与 `exists`、`borrow_global`、`borrow_global_mut` 和 `move_from` [操作（operation）](./global-storage-operators.md)一起使用。
+
+唯一*不使用* `address` 的全局存储操作是 `move_to`，它使用了 [`signer`](./signer.md)。
+
+## 所有权
+
+与 Move 语言内置的其他标量值一样，`address` 值是隐式可复制的，这意味着它们可以在没有显式指令（例如 [`copy`](./variables.md#移动和复制)）的情况下复制。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/bool.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/bool.md
new file mode 100644
index 000000000..d49844ddb
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/bool.md
@@ -0,0 +1,49 @@
+# 布尔类型 (Bool)
+
+`bool`is Move's primitive type for boolean `true` and `false`values.
+
+`bool` 是 Move 布尔基本类型，有 `true` 和 `false` 两个值。
+
+## 字面量 (Literals)
+
+Literals for `bool` are either `true` or `false` .
+
+布尔类型字面值只能是 `true` 或者 `false`中的一个 。
+
+## 操作 (Operations)
+
+### 逻辑运算 (Logical)
+
+`bool`supports three logical operations:
+
+| Syntax                    | Description                  | Equivalent Expression                                               |
+| ------------------------- | ---------------------------- | ------------------------------------------------------------------- |
+| `&&`                      | short-circuiting logical and | `p && q` is equivalent to `if (p) q else false`                     |
+| <code>&vert;&vert;</code> | short-circuiting logical or  | <code>p &vert;&vert; q</code> is equivalent to `if (p) true else q` |
+| `!`                       | logical negation             | `!p` is equivalent to `if (p) false else true`                      |
+
+
+`bool` 支持三种逻辑运算：
+
+| 句法 | 描述                  | Equivalent Expression                           |
+| ------ | ---------------------------- | ----------------------------------------------- |
+| `&&`   | 短路逻辑与(short-circuiting logical and) | `p && q` 等价于 `if (p) q else false` |
+| <code>&vert;&vert;</code>   | 短路逻辑或(short-circuiting logical or)  | `p || q` 等价于 `if (p) true else q`  |
+| `!`    | 逻辑非(logical negation)            | `!p` 等价于 `if (p) false else true`  |
+
+
+### 控制流 (Control Flow)
+
+`bool`values are used in several of Move's control-flow constructs:
+
+布尔值用于 Move 的多个控制流结构中：
+
+- [`if (bool) { ... }`](./conditionals.html)
+- [`while (bool) { .. }`](/loops.html)
+- [`assert!(bool, u64)`](./abort-and-assert.html)
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, boolean values are implicitly copyable, meaning they can be copied without an explicit instruction such as `[copy](<https://move-language.github.io/move/variables.html#move-and-copy>).`
+
+与语言内置的其他标量值一样，布尔值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/coding-conventions.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/coding-conventions.md
new file mode 100644
index 000000000..0ea7920b8
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/coding-conventions.md
@@ -0,0 +1,76 @@
+# Move 编码约定
+
+本节列出了 Move 团队认为有用的一些基本的 Move 编码约定。这些只是建议，如果你喜欢其他格式指南和约定，你可以随时使用它们。
+
+## 命名
+
+- **模块名称**：应该使用小写的蛇形命名法，例如：`fixed_point32`、`vector`。
+- **类型名称**：如果不是原生数据类型，则应使用驼峰命名法，例如：`Coin`、`RoleId`。
+- **函数名称**：应该使用小写的蛇形命名法，例如：`destroy_empty`。
+- **常量名称**：应该使用大写的蛇形命名法，例如：`REQUIRES_CAPABILITY`。
+- 泛型类型应该具备描述性，当然在适当的情况下也可以是反描述性的，例如：Vector 泛型类型的参数可以是 `T` 或 `Element`。大多数情况下，模块中的“主”类型命名应该与模块名相同，例如：`option::Option`，`fixed_point32::FixedPoint32`。
+- **模块文件名称**：应该与模块名相同，例如：`Option.move`。
+- **脚本文件名称**：应该使用小写的蛇形命名法，并且应该与脚本中的“主”函数名匹配。
+- **混合文件名称**：如果文件包含多个模块和/或脚本，文件命名应该使用小写的蛇形命名法，并且不需要与内部的任何特定模块/脚本名匹配。
+
+## 导入
+
+- 所有模块的 `use` 语句都应该位于模块的顶部。
+- 函数应该从声明它们的模块中完全限定地导入和使用, 而不是在顶部导入。
+- 类型应该在顶部导入。如果存在名称冲突，应使用 `as` 在本地适当地重命名类型。
+
+例如，如果有一个模块：
+
+```move
+module 0x1::foo {
+    struct Foo { }
+    const CONST_FOO: u64 = 0;
+    public fun do_foo(): Foo { Foo{} }
+    ...
+}
+```
+
+此时将被导入并使用：
+
+```move
+module 0x1::bar {
+    use 0x1::foo::{Self, Foo};
+
+    public fun do_bar(x: u64): Foo {
+        if (x == 10) {
+            foo::do_foo()
+        } else {
+            abort 0
+        }
+    }
+    ...
+}
+```
+
+并且，如果在导入两个模块时存在本地名称冲突：
+
+```move
+module other_foo {
+    struct Foo {}
+    ...
+}
+
+module 0x1::importer {
+    use 0x1::other_foo::Foo as OtherFoo;
+    use 0x1::foo::Foo;
+    ...
+}
+```
+
+## 注释
+
+- 每个模块、结构体和公共函数声明都应该有对应的注释。
+- Move 有文档注释 `///`，常规单行注释 `//`，块注释 `/* */`，和块文档注释 `/** */`。
+
+## 格式化
+
+Move 团队计划编写一个自动格式化程序来执行格式化约定。然而，在此期间：
+
+- 除 `script` 和 `address` 块外，其他的内容应使用四个空格的缩进。
+- 每行代码，如果超过 100 个字符，应该换行。
+- 结构体和常量应该在模块中的所有函数之前声明。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/conditionals.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/conditionals.md
new file mode 100644
index 000000000..0edbb8c42
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/conditionals.md
@@ -0,0 +1,78 @@
+# 条件语句 (Conditionals)
+
+An `if` expression specifies that some code should only be evaluated if a certain condition is true. For example:
+
+`if` 语句可以用来指定一块代码块，但只在判断条件(condition)为true时才会被执行。例如:
+
+```move
+if (x > 5) x = x - 5
+```
+
+The condition must be an expression of type `bool`.
+
+An `if` expression can optionally include an `else` clause to specify another expression to evaluate when the condition is false.
+
+条件语句(condition)必须是 `bool` 类型的表达式。
+
+`if` 语句可选包含 `else` 子句，以指定当条件(condition)为 false 时要执行的另一个代码块。
+
+```move
+if (y <= 10) y = y + 1 else y = 10
+```
+
+Either the "true" branch or the "false" branch will be evaluated, but not both. Either branch can be a single expression or an expression block.
+
+The conditional expressions may produce values so that the `if` expression has a result.
+
+无论是"true"分支还是"false"分支都会被执行，但不会同时执行.其中任何一个分支都可以是单行代码或代码块。条件表达式会产生值，所以 `if` 表达式会有一个结果。
+
+```move
+let z = if (x < 100) x else 100;
+```
+
+The expressions in the true and false branches must have compatible types. For example:
+
+true 和 false 分支的表达式类型必须是一致的,例如:
+
+```move=
+// x和y必须是u64整型
+// x and y must be u64 integers
+let maximum: u64 = if (x > y) x else y;
+
+// 错误！分支的类型不一致
+// (ERROR! branches different types)
+let z = if (maximum < 10) 10u8 else 100u64;
+
+// 错误！分支的类型不一致,false-branch默认是()不是u64
+// ERROR! branches different types, as default false-branch is () not u64
+if (maximum >= 10) maximum;
+```
+
+If the `else` clause is not specified, the false branch defaults to the unit value. The following are equivalent:
+
+如果`else`子句未定义，false分支默认为 unit 。下面的例子是相等价的:
+
+```move
+if (condition) true_branch // implied default: else ()
+if (condition) true_branch else ()
+```
+
+Commonly, [`if` expressions](./conditionals.md) are used in conjunction with expression blocks.
+
+一般来说, [`if` 表达式](./conditionals.md)与多个表达式块结合使用.
+
+```move
+let maximum = if (x > y) x else y;
+if (maximum < 10) {
+    x = x + 10;
+    y = y + 10;
+} else if (x >= 10 && y >= 10) {
+    x = x - 10;
+    y = y - 10;
+}
+```
+
+## 条件语句的语法 (Grammar for Conditionals)
+
+> *if-expression* → **if (** *expression* **)** *expression* *else-clause*<sub>*opt*</sub>
+> *else-clause* → **else** *expression*
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/constants.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/constants.md
new file mode 100644
index 000000000..380322e8f
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/constants.md
@@ -0,0 +1,136 @@
+# 常量 (Constants)
+
+Constants are a way of giving a name to shared, static values inside of a `module` or `script`.
+
+The constant's must be known at compilation. The constant's value is stored in the compiled module
+or script. And each time the constant is used, a new copy of that value is made.
+
+常量是一种对 `module` 或 `script` 内的共享静态值进行命名的方法(类似变量，但值不变，译者注)。
+
+常量必须在编译时知道。常量的值存储在编译模块或脚本中。每次使用该常量时，都会生成该值的新副本。
+
+## 声明 (Declaration)
+
+Constant declarations begin with the `const` keyword, followed by a name, a type, and a value. They
+can exist in either a script or module
+
+常量声明以 `const` 关键字开头，后跟名称、类型和值。他们可以存在于脚本或模块中
+
+```text
+const <name>: <type> = <expression>;
+```
+
+例如
+
+```move=
+script {
+
+    const MY_ERROR_CODE: u64 = 0;
+
+    fun main(input: u64) {
+        assert!(input > 0, MY_ERROR_CODE);
+    }
+
+}
+
+address 0x42 {
+    module example {
+
+        const MY_ADDRESS: address = @0x42;
+
+        public fun permissioned(s: &signer) {
+            assert!(std::signer::address_of(s) == MY_ADDRESS, 0);
+        }
+
+    }
+}
+```
+
+## 命名 (Naming)
+
+Constants must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+常量必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，常量名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+const FLAG: bool = false;
+const MY_ERROR_CODE: u64 = 0;
+const ADDRESS_42: address = @0x42;
+```
+
+Even though you can use letters `a` to `z` in a constant. The
+[general style guidelines](./coding-conventions.md) are to use just uppercase letters `A` to `Z`,
+with underscores `_` between each word.
+
+虽然你可以在常量中使用字母 `a` 到 `z`。但[通用风格指南](./coding-conventions.md) 只使用大写字母 `A` 到 `Z`，每个单词之间有下划线`_`。
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。此限制未来可能会保留或删除。
+
+## 可见性 (Visibility)
+
+`public` constants are not currently supported. `const` values can be used only in the declaring
+module.
+
+当前不支持 `public` 常量。 `const` 值只能在声明的模块中使用。
+
+## 有效表达式 (Valid Expressions)
+
+Currently, constants are limited to the primitive types `bool`, `u8`, `u64`, `u128`, `address`, and
+`vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will come later.
+
+目前，常量仅限于原始类型 `bool`、`u8`、`u64`、`u128`、`address` 和`vector<u8>`。其他 `vector` 值(除了“string”风格的字面量)将在不远的将来获得支持。
+
+### 值 (Values)
+
+Commonly, `const`s are assigned a simple value, or literal, of their type. For example
+
+通常，`const` (常量)会被分配一个对应类型的简单值或字面量。例如
+
+```move
+const MY_BOOL: bool = false;
+const MY_ADDRESS: address = @0x70DD;
+const BYTES: vector<u8> = b"hello world";
+const HEX_BYTES: vector<u8> = x"DEADBEEF";
+```
+
+### 复杂表达式 (Complex Expressions)
+
+
+In addition to literals, constants can include more complex expressions, as long as the compiler is
+able to reduce the expression to a value at compile time.
+
+Currently, equality operations, all boolean operations, all bitwise operations, and all arithmetic
+operations can be used.
+
+除了字面量，常量还可以包含更复杂的表达式，只要编译器能够在编译时将表达式归纳(reduce)为一个值。
+
+目前，相等运算、所有布尔运算、所有按位运算和所有算术运算可以使用。
+
+```move
+const RULE: bool = true && false;
+const CAP: u64 = 10 * 100 + 1;
+const SHIFTY: u8 = {
+  (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
+};
+const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const EQUAL: bool = 1 == 1;
+```
+
+If the operation would result in a runtime exception, the compiler will give an error that it is
+unable to generate the constant's value
+
+如果操作会导致运行时异常，编译器会给出无法生成常量值的错误。
+
+```move
+const DIV_BY_ZERO: u64 = 1 / 0; // error!
+const SHIFT_BY_A_LOT: u64 = 1 << 100; // error!
+const NEGATIVE_U64: u64 = 0 - 1; // error!
+```
+
+Note that constants cannot currently refer to other constants. This feature, along with support for
+other expressions, will be added in the future.
+
+请注意，常量当前不能引用其他常量。此功能会在将来和支持其他表达方式一起被补充。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/creating-coins.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/creating-coins.md
new file mode 100644
index 000000000..1f06df9a0
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/creating-coins.md
@@ -0,0 +1,7 @@
+# Move Tutorial
+
+Please refer to the [Move Tutorial](https://github.com/move-language/move/tree/main/language/documentation/tutorial).
+
+# Move 教程
+
+请参阅 [Move 教程](https://github.com/move-language/move/tree/main/language/documentation/tutorial)。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/equality.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/equality.md
new file mode 100644
index 000000000..2abe89623
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/equality.md
@@ -0,0 +1,192 @@
+
+# 等式 (Equality)
+
+Move supports two equality operations `==` and `!=`
+
+Move 支持两种等式操作： `==` 和 `!=`
+
+## 操作 (Operations)
+
+| Syntax | Operation | Description                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | equal     | Returns `true` if the two operands have the same value, `false` otherwise   |
+| `!=`   | not equal | Returns `true` if the two operands have different values, `false` otherwise |
+
+| 语法 | 操作 | 描述                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | 相等     | 如果两个操作数(operands)值相同，返回 `true` , 否则返回 `false`  |
+| `!=`   | 不相等 | 如果两个操作数(operands)值不相同，返回 `true` , 否则返回 `false`  |
+
+### 类型校验 (Typing)
+
+Both the equal (`==`) and not-equal (`!=`) operations only work if both operands are the same type.
+
+只有当左右两个操作数类型相同，相等操作 (`==`) 与不等操作 (`!=`) 才能正常使用。
+
+```move
+0 == 0; // `true`
+1u128 == 2u128; // `false`
+b"hello" != x"00"; // `true`
+```
+
+Equality and non-equality also work over user defined types!
+
+等式与不等式也可以在用户自定义的类型下使用！
+
+```move=
+address 0x42 {
+    module example {
+        struct S has copy, drop { f: u64, s: vector<u8> }
+
+        fun always_true(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) == s
+        }
+
+        fun always_false(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) != s
+        }
+    }
+}
+```
+
+If the operands have different types, there is a type checking error.
+
+如果两边操作数的类型不同，则会出现类型检测错误。
+
+```move
+1u8 == 1u128; // 错误!
+//     ^^^^^ 期望此变量的类型是 'u8'
+b"" != 0; // 错误!
+//     ^ 期望此变量的类型是 'vector<u8>'
+```
+
+### 引用变量的类型校验 (Typing with references)
+
+When comparing [references](./references.md), the type of the reference (immutable or mutable) does
+not matter. This means that you can compare an immutable `&` reference with a mutable one `&mut` of
+the same underlying type.
+
+当比较[引用变量](./references.md)时，引用的类别(不可变更的或可变更的(immutable or mutable))无关紧要。这意味着我们可以拿一个不可变更的 `&` 引用变量和另一个有相同相关类型的可变更的 `&mut ` 引用变量进行比较。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == m; // `false`
+m == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+The above is equivalent to applying an explicit freeze to each mutable reference where needed
+
+在需要时，对每个可变引用使用显式冻结(explicit freeze)的结果与上述情况一致。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == freeze(m); // `false`
+freeze(m) == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+But again, the underlying type must be the same type
+
+但同样的，我们需要两边操作数的类型一致
+
+```move
+let i = &0;
+let s = &b"";
+
+i == s; // 错误!
+//   ^ 期望此变量的类型是 '&u64'
+```
+
+## 限制 (Restrictions)
+
+Both `==` and `!=` consume the value when comparing them. As a result, the type system enforces that
+the type must have [`drop`](./abilities.md). Recall that without the [`drop` ability](./abilities.md),
+ownership must be transferred by the end of the function, and such values can only be explicitly destroyed
+within their declaring module. If these were used directly with either equality `==` or non-equality `!=`,
+the value would be destroyed which would break [`drop` ability](./abilities.md) safety guarantees!
+
+`==` 和 `!=` 会在比较不同变量的时候消耗 (consume)它们所包含的值，所以 Move 的类型系统会强制要求这些类型含有[`drop` 能力](./abilities.md)。回想一下，变量在没有[`drop` 能力](./abilities.md)时，所有权必须在函数结束前进行转移，而且这些值只能在其声明模块中被明确销毁(explicitly destroyed)。如果它们被直接使用于等式 `==` 或不等式 `!=` ，其值会被销毁并且这会打破[`drop` 能力](./abilities.md)的安全保证！
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+        fun invalid(c1: Coin, c2: Coin) {
+            c1 == c2 // 错误!
+    //      ^^    ^^ 这些资源将会被销毁!
+        }
+    }
+}
+```
+
+
+But, a programmer can _always_ borrow the value first instead of directly comparing the value, and
+reference types have the [`drop` ability](./abilities.md). For example
+
+然而, 程序员 _总是_ 可以优先借用变量的值，而不直接比较它们的值。这样一来，引用变量的类型将会拥有[`drop` 能力](./abilities.md)。例如：
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin as store { value: u64 }
+        fun swap_if_equal(c1: Coin, c2: Coin): (Coin, Coin) {
+            let are_equal = &c1 == &c2; // 合规范的
+            if (are_equal) (c2, c1) else (c1, c2)
+        }
+    }
+}
+```
+
+## 避免额外的复制 (Avoid Extra Copies)
+
+While a programmer _can_ compare any value whose type has [`drop`](./abilities.md), a programmer
+should often compare by reference to avoid expensive copies.
+
+当程序员 _可以_ 比较其类型含有[`drop` 能力](./abilities.md)的任意值时，他们应该尽可能多地使用引用变量来比较，以此来避免昂贵的复制。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(copy v1 == copy v2, 42);
+//     ^^^^       ^^^^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(copy s1 == copy s2, 42);
+//     ^^^^       ^^^^
+use_two_foos(s1, s2);
+```
+
+This code is perfectly acceptable (assuming `Foo` has [`drop`](./abilities.md)), just not efficient.
+The highlighted copies can be removed and replaced with borrows
+
+以上代码是完全可以接受的(假设`Foo`具备[`drop`](./abilities.md)能力)，但它不是最有效的写法。突出显示的副本可以删除并替换为借用。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(&v1 == &v2, 42);
+//     ^      ^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(&s1 == &s2, 42);
+//     ^      ^
+use_two_foos(s1, s2);
+```
+
+The efficiency of the `==` itself remains the same, but the `copy`s are removed and thus the program is more efficient.
+
+`==` 本身的效率还是和之前一样，但是 `copy` 操作被移除后整个程序会比之前更有效率。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/friends.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/friends.md
new file mode 100644
index 000000000..238dce84f
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/friends.md
@@ -0,0 +1,154 @@
+# 友元函数（Friends）
+
+The `friend` syntax is used to declare modules that are trusted by the current module.
+A trusted module is allowed to call any function defined in the current module that have the `public(friend)` visibility.
+For details on function visibilities, please refer to the *Visibility* section in [Functions](./functions.md).
+
+友元语法用于声明当前模块信任的其它模块。受信任的模块可以调用当前模块中定义的任何具有`公开（友元）`可见性的函数。有关函数可见性的详细信息，请参阅[函数](./functions.md)中的可见性部分。
+
+## 友元声明（Friend declaration）
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+一个模块可以通过友元声明语句将其他模块声明为友元，格式为：
+
+- `friend <address::name>` — friend declaration using fully qualified module name like the example below, or
+-	`friend <address::name>—` 使用完全合格的模块名称的友元声明，如下例所示，或
+
+    ```
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+    }
+    }
+    ```
+
+- `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+- `friend <module-name-alias>—` 使用模块名称别名的友元声明，其中模块别名是通过use语句引入的。
+
+   ```move
+  address 0x42 {
+  module a {
+      use 0x42::b;
+      friend b;
+  }
+  }
+  ```
+
+A module may have multiple friend declarations, and the union of all the friend modules forms the friend list.
+In the example below, both `0x42::B` and `0x42::C` are considered as friends of `0x42::A`.
+
+一个模块可能有多个友元声明，所有好友模块的并集形成友元列表。在下面的示例中`，0x42::B`和`0x42::C`都被视为 的友元函数`0x42::A`。
+
+   ```move
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+        friend 0x42::c;
+    }
+    }
+  ```
+
+Unlike `use` statements, `friend` can only be declared in the module scope and not in the expression block scope.
+`friend` declarations may be located anywhere a top-level construct (e.g., `use`, `function`, `struct`, etc.) is allowed.
+However, for readability, it is advised to place friend declarations near the beginning of the module definition.
+
+与`use`语句不同，`friend`只能在模块作用域内声明，而不能在表达式块的作用域内声明。`friend`声明可以位于允许顶层构造的任何位置（例如， `use`， `function，struct`等）是被允许的。但是，为了可读性，建议将友元声明放在模块定义的开头附近。
+
+Note that the concept of friendship does not apply to Move scripts:
+- A Move script cannot declare `friend` modules as doing so is considered meaningless: there is no mechanism to call the function defined in a script.
+- A Move module cannot declare `friend` scripts as well because scripts are ephemeral code snippets that are never published to global storage.
+
+请注意，友元关系（friendship）的概念不适用于 Move 脚本：
+-	`Move` 脚本不能声明`friend`模块，因为这样做被认为是无意义的：没有机制可以调用脚本中定义的函数。
+-	`Move` 模块也不能声明`friend`脚本，因为脚本是永远不会发布到全局存储的临时代码片段。
+
+### 友元声明规则（Friend declaration rules）
+Friend declarations are subject to the following rules:
+友元声明须遵守以下规则：
+
+- A module cannot declare itself as a friend
+- 一个模块不能将自己声明为友元。
+
+   ```move=
+  address 0x42 {
+  module m { friend Self; // 错误! }
+  //                ^^^^ 不能将自己声明为友元
+  }
+
+  address 0x43 {
+  module m { friend 0x43::M; // 错误! }
+  //                ^^^^^^^ 不能将自己声明为友元
+  }
+  ```
+
+- Friend modules must be known by the compiler
+- 编译器必须知道友元模块
+
+   ```move=
+  address 0x42 {
+  module m { friend 0x42::nonexistent; // 错误! }
+  //                ^^^^^^^^^^^^^^^^^ 未绑定的模块 '0x42::nonexistent'
+  }
+  ```
+
+ - Friend modules must be within the same account address. (Note: this is not a technical requirement but rather a policy decision which *may* be relaxed later.)
+
+ -	友元模块必须在同一个账号地址内。（注：这不是技术要求，而是以后可能放宽的决策。)
+
+    ```move
+    address 0x42 {
+    module m {}
+    }
+
+    address 0x43 {
+    module n { friend 0x42::m; // 错误! }
+    //                ^^^^^^^ 不能声明当前地址外的模块作为友元
+    }
+    ```
+
+-	友元关系不能创建循环模块依赖关系（Friends relationships cannot create cyclic module dependencies）
+
+Cycles are not allowed in the friend relationships, e.g., the relation `0x2::a` friends `0x2::b` friends `0x2::c` friends `0x2::a` is not allowed.
+More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module).
+If that friend module is already used, either directly or transitively, a cycle of dependencies would be created.
+
+友元关系中不允许循环，例如 `0x2::a` 友元 `0x2::b` 友元 `0x2::c` 友元`0x2::a`是不允许的。更普遍地，声明一个友元模块会将对当前模块的依赖添加到友元模块（因为目的是让友元调用当前模块中的函数）。如果该友元模块已被直接或传递地使用，则将形成一个依赖循环。
+
+   ```move
+  address 0x2 {
+  module a {
+      use 0x2::c;
+      friend 0x2::b;
+
+      public fun a() {
+          c::c()
+      }
+  }
+
+  module b {
+      friend 0x2::c; // 错误!
+  //         ^^^^^^ 这个友元关系形成了一个依赖循环:  '0x2::a' 使用了 '0x2::c' 但'0x2::b' 同时是 '0x2::a'和'0x2::b' 的友元
+  }
+
+  module c {
+      public fun c() {}
+  }
+  }
+```
+
+- The friend list for a module cannot contain duplicates.
+-	模块的友元列表不能包含重复项。
+
+   ```move=
+  address 0x42 {
+  module a {}
+
+  module m {
+      use 0x42::a as aliased_a;
+      friend 0x42::A;
+      friend aliased_a; // 错误!
+  //         ^^^^^^^^^ 重复的友元声明 '0x42::a'. 模块内的友元声明必须是唯一的
+  }
+  }
+  ```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/functions.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/functions.md
new file mode 100644
index 000000000..e0fb8d2a0
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/functions.md
@@ -0,0 +1,607 @@
+# 函数 (Functions)
+
+Function syntax in Move is shared between module functions and script functions. Functions inside of modules are reusable, whereas script functions are only used once to invoke a transaction.
+
+Move中的函数语法在模块函数和脚本函数之间是一致的。模块内部的函数可重复使用，而脚本的函数只能被使用一次用来调用事务。
+
+# 声明 (Declaration)
+
+Functions are declared with the `fun` keyword followed by the function name, type parameters, parameters, a return type, acquires annotations, and finally the function body.
+
+函数使用 `fun` 关键字声明，后跟函数名称、类型参数、参数、返回类型、获取标注(annotation)，最后是函数体。
+
+```text
+fun <identifier><[type_parameters: constraint],*>([identifier: type],*): <return_type> <acquires [identifier],*> <function_body>
+```
+
+例如
+
+```move
+fun foo<T1, T2>(x: u64, y: T1, z: T2): (T2, T1, u64) { (z, y, x) }
+```
+
+### 可见性 (Visibility)
+
+Module functions, by default, can only be called within the same module. These internal (sometimes called private) functions cannot be called from other modules or from scripts.
+
+默认情况下，模块函数只能在同一个模块内调用。这些内部(有时称为私有)函数不能从其他模块或脚本中调用。
+
+```move=
+address 0x42 {
+    module m {
+        fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+To allow access from other modules or from scripts, the function must be declared `public` or `public(friend)`.
+
+要允许从其他模块或脚本访问，该函数必须声明为 `public` 或 `public(friend)`。
+
+#### `public` 可见性 (`public` visibility)
+
+A `public` function can be called by *any* function defined in *any* module or script. As shown in the following example, a `public` function can be called by:
+- other functions defined in the same module,
+- functions defined in another module, or
+- the function defined in a script.
+
+`public` 函数可以被任何模块或脚本中定义的任何函数调用。如以下示例所示，可以通过以下方式调用 `public` 函数：
+
+- 在同一模块中定义的其他函数
+- 在另一个模块中定义的函数
+- 在脚本中定义的函数
+
+```move=
+address 0x42 {
+    module m {
+        public fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+```
+
+#### `public(friend)` 可见性 (`public(friend)` visibility)
+
+The `public(friend)` visibility modifier is a more restricted form of the `public` modifier to give more control about where a function can be used. A `public(friend)` function can be called by:
+- other functions defined in the same module, or
+- functions defined in modules which are explicitly specified in the **friend list** (see [Friends](./friends.md) on how to specify the friend list).
+
+Note that since we cannot declare a script to be a friend of a module, the functions defined in scripts can never call a `public(friend)` function.
+
+`public(friend)` 可见性修饰符是一种比 `public` 修饰符限制更严格的形式，可以更好地控制函数的使用位置。 `public(friend)` 函数可以通过以下方式调用：
+
+- 在同一模块中定义的其他函数，或者在 **friend list** 中明确指定的模块中定义的函数(请参阅 [Friends](./friends.md) 了解如何指定友元(friends)列表)。
+
+请注意，由于我们不能将脚本声明为模块的友元关系，因此脚本中定义的函数永远不能调用 `public(friend)` 函数。
+
+```move=
+address 0x42 {
+    module m {
+        friend 0x42::n;  // friend declaration
+        public(friend) fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+```
+
+### `entry` 修饰符 (`entry` modifier)
+
+The `entry` modifier is designed to allow module functions to be safely and directly invoked much like scripts. This allows module writers to specify which functions can be to begin execution. The module writer then knows that any non-`entry` function will be called from a Move program already in execution.
+
+Essentially, `entry` functions are the "main" functions of a module, and they specify where Move programs start executing.
+
+Note though, an `entry` function _can_ still be called by other Move functions. So while they _can_ serve as the start of a Move program, they aren't restricted to that case.
+
+`entry` 修饰符旨在允许像脚本一样安全直接地调用模块函数。这允许模块编写者指定哪些函数可以成为开始执行的入口。这样模块编写者就知道任何非`entry`函数都是从已经在执行的 Move 程序中被调用的。
+
+本质上，`entry` 函数是模块的“main”函数，它们指定 Move 程序开始执行的位置。
+
+但请注意，`entry` 函数仍可被其他 Move 函数调用。因此，虽然它们 _可以_ 作为 Move 程序的入口，但它们并不局限于这种用法。
+
+例如：
+
+```move=
+address 0x42 {
+    module m {
+        public entry fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid!
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+```
+
+Even internal functions can be marked as `entry`! This lets you guarantee that the function is called only at the beginning of execution (assuming you do not call it elsewhere in your module)
+
+甚至内部函数也可以标记为 `entry`！这使你可以保证仅在开始执行时调用该函数(假如你没有在模块中的其他地方调用它)
+
+```move=
+address 0x42 {
+    module m {
+        entry fun foo(): u64 { 0 } // valid! entry functions do not have to be public
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+### 函数名 (Name)
+
+Function names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, function names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+函数名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，函数名称可以包含下划线 `_`、字母 `a` 到 `z` 、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+fun FOO() {}
+fun bar_42() {}
+fun _bAZ19() {}
+```
+
+### 类型参数 (Type Parameters)
+
+After the name, functions can have type parameters
+
+函数名后可以有类型参数
+
+```move
+fun id<T>(x: T): T { x }
+fun example<T1: copy, T2>(x: T1, y: T2): (T1, T1, T2) { (copy x, x, y) }
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [移动泛型](./generics.md)。
+
+### 参数 (Parameters)
+
+Functions parameters are declared with a local variable name followed by a type annotation
+
+函数参数使用局部变量名，后跟类型标注的方式进行声明。
+
+```move
+fun add(x: u64, y: u64): u64 { x + y }
+```
+
+We read this as `x` has type `u64`
+
+A function does not have to have any parameters at all.
+
+(上面代码中的函数参数) 我们读为：`x` 参数的类型是 `u64` 。
+
+函数可以没有任何参数。
+
+```move
+fun useless() { }
+```
+
+This is very common for functions that create new or empty data structures
+
+在函数中创建新或空的数据结构是常见的用法。
+
+```move=
+address 0x42 {
+    module example {
+        struct Counter { count: u64 }
+
+        fun new_counter(): Counter {
+            Counter { count: 0 }
+        }
+
+    }
+}
+```
+
+### Acquires
+
+When a function accesses a resource using `move_from`, `borrow_global`, or `borrow_global_mut`, the function must indicate that it `acquires` that resource. This is then used by Move's type system to ensure the references into global storage are safe, specifically that there are no dangling references into global storage.
+
+当一个函数使用 `move_from`、`borrow_global` 或 `borrow_global_mut` 访问资源时，则该函数必须表明它 `获取(acquires)` 该资源。然后 Move 的类型系统使用它来确保对全局存储的引用是安全的，特别是没有对全局存储的悬垂引用(dangling references)。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+    }
+}
+```
+`acquires` annotations must also be added for transitive calls within the module. Calls to these functions from another module do not need to annotated with these acquires because one module cannot access resources declared in another module--so the annotation is not needed to ensure reference safety.
+
+`acquires` 标注也必须为模块内有传递性的调用添加。从另一个模块对这些函数的调用不需要使用 `acquires` 进行注释，因为一个模块无法访问在另一个模块中声明的资源——因此不需要用标注来确保引用安全。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+
+        public fun extract_and_add(sender: address, receiver: &signer) acquires Balance {
+            let value = extract_balance(sender); // acquires needed here
+            add_balance(receiver, value)
+        }
+    }
+}
+
+address 0x42 {
+    module other {
+        fun extract_balance(addr: address): u64 {
+            0x42::example::extract_balance(addr) // no acquires needed
+        }
+    }
+}
+```
+
+A function can `acquire` as many resources as it needs to
+
+函数可以根据需要 `acquire` 尽可能多的资源。
+
+```move=
+address 0x42 {
+    module example {
+        use std::vector;
+
+        struct Balance has key { value: u64 }
+        struct Box<T> has key { items: vector<T> }
+
+        public fun store_two<Item1: store, Item2: store>(
+            addr: address,
+            item1: Item1,
+            item2: Item2,
+        ) acquires Balance, Box {
+            let balance = borrow_global_mut<Balance>(addr); // acquires needed
+            balance.value = balance.value - 2;
+            let box1 = borrow_global_mut<Box<Item1>>(addr); // acquires needed
+            vector::push_back(&mut box1.items, item1);
+            let box2 = borrow_global_mut<Box<Item2>>(addr); // acquires needed
+            vector::push_back(&mut box2.items, item2);
+        }
+    }
+}
+```
+
+### 返回类型 (Return type)
+
+After the parameters, a function specifies its return type.
+
+在参数之后，函数指定其返回类型。
+
+```move
+fun zero(): u64 { 0 }
+```
+
+Here `: u64` indicates that the function's return type is `u64`.
+
+Using tuples, a function can return multiple values
+
+这里 `: u64` 表示函数的返回类型是 `u64`。
+
+使用元组，一个函数可以返回多个值：
+
+```move
+fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
+```
+
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent
+
+如果未指定返回类型，则该函数具有隐式返回类型单值 `()`。这些函数是等价的：
+
+```move
+fun just_unit(): () { () }
+fun just_unit() { () }
+fun just_unit() { }
+```
+
+`script` functions must have a return type of unit `()`
+
+`script` 函数的返回类型必须为单值 `()`（不能是任何其他类型，例如 `bool`、`u64` 等，注者注）：
+
+```move
+script {
+    fun do_nothing() {
+    }
+}
+```
+
+As mentioned in the [tuples section](./tuples.md), these tuple "values" are virtual and do not exist at runtime. So for a function that returns unit `()`, it will not be returning any value at all during execution.
+
+如[元组部分](./tuples.md)所述，这些元组“值”是虚拟的（virtual），且在运行时不存在。因此，对于返回单值 `()` 的函数，它在执行期间根本不会返回任何值。
+
+### Function body (函数体)
+
+A function's body is an expression block. The return value of the function is the last value in the sequence
+
+函数体是一个表达式块。函数的返回值是序列中最后一个表达式的值。
+
+```move=
+fun example(): u64 {
+    let x = 0;
+    x = x + 1;
+    x // returns 'x'
+}
+```
+
+See [the section below for more information on returns](#returning-values)
+
+请参阅[有关返回值的更多信息](#returning-values)
+
+For more information on expression blocks, see [Move variables](./variables.md).
+
+有关表达式块的更多信息，请参阅 [Move variables](./variables.md)。
+
+### Native Functions
+
+Some functions do not have a body specified, and instead have the body provided by the VM. These functions are marked `native`.
+
+Without modifying the VM source code, a programmer cannot add new native functions. Furthermore, it is the intent that `native` functions are used for either standard library code or for functionality needed for the given Move environment.
+
+Most `native` functions you will likely see are in standard library code such as `vecto
+
+有些函数没有函数体，而是由 Move VM 提供的函数体。这些函数被标记为 `native`。
+
+如果不修改 Move VM 源代码，程序员就无法添加新的 `native` 函数。此外，`native` 函数的意图是用于标准库代码或 Move 环境所需的基础功能。
+
+你看到的大多数 `native` 函数可能都在标准库代码中，例如 `vector`
+
+```move=
+module std::vector {
+    native public fun empty<Element>(): vector<Element>;
+    ...
+}
+```
+
+## 调用 (Calling)
+
+When calling a function, the name can be specified either through an alias or fully qualified
+
+调用函数时，名称可以通过别名或完全限定名指定
+
+```move=
+address 0x42 {
+    module example {
+        public fun zero(): u64 { 0 }
+    }
+}
+
+script {
+    use 0x42::example::{Self, zero};
+    fun call_zero() {
+        // With the `use` above all of these calls are equivalent
+        0x42::example::zero();
+        example::zero();
+        zero();
+    }
+}
+```
+
+When calling a function, an argument must be given for every parameter.
+
+调用函数时，每个参数必须指定一个值。
+
+```move=
+address 0x42 {
+    module example {
+        public fun takes_none(): u64 { 0 }
+        public fun takes_one(x: u64): u64 { x }
+        public fun takes_two(x: u64, y: u64): u64 { x + y }
+        public fun takes_three(x: u64, y: u64, z: u64): u64 { x + y + z }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::takes_none();
+        example::takes_one(0);
+        example::takes_two(0, 1);
+        example::takes_three(0, 1, 2);
+    }
+}
+```
+
+Type arguments can be either specified or inferred. Both calls are equivalent.
+
+函数的类型参数可以被指定或推断出来。以下两个调用是等价的。
+
+```move=
+address 0x42 {
+    module example {
+        public fun id<T>(x: T): T { x }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::id(0);
+        example::id<u64>(0);
+    }
+}
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [Move generics](./generics.md)。
+
+
+## Returning values (返回值)
+
+The result of a function, its "return value", is the final value of its function body. For example
+
+一个函数的结果，也就是它的“返回值”，是函数体的最后一个值。例如：
+
+```move=
+fun add(x: u64, y: u64): u64 {
+    x + y
+}
+```
+
+[As mentioned above](#function-body), the function's body is an [expression block](./variables.md). The expression block can sequence various statements, and the final expression in the block will be be the value of that block
+
+[如上所述](#function-body)，函数体是一个[表达式块](./variables.md)。表达式块中可以有各种各种语句，块中最后一个表达式将是该表达式块的值。
+
+```move=
+fun double_and_add(x: u64, y: u64): u64 {
+    let double_x = x * 2;
+    let double_y = y * 2;
+    double_x + double_y
+}
+```
+
+The return value here is `double_x + double_y`
+
+这里的返回值是 `double_x + double_y`
+
+###  `return` 表达式 (`return` expression)
+
+A function implicitly returns the value that its body evaluates to. However, functions can also use the explicit `return` expression:
+
+函数隐式返回其函数体计算的值。但是，函数也可以使用显式的 `return` 表达式：
+
+```move
+fun f1(): u64 { return 0 }
+fun f2(): u64 { 0 }
+```
+
+
+These two functions are equivalent. In this slightly more involved example, the function subtracts two `u64` values, but returns early with `0` if the second value is too large:
+
+这两个功能是等价的。在下面这个稍微复杂的示例中，该函数返回两个 `u64` 值相减的结果，但如果第二个值大于第一个值，则提前返回 `0` ：
+
+```move=
+fun safe_sub(x: u64, y: u64): u64 {
+    if (y > x) return 0;
+    x - y
+}
+```
+
+Note that the body of this function could also have been written as `if (y > x) 0 else x - y`.
+
+However `return` really shines is in exiting deep within other control flow constructs. In this example, the function iterates through a vector to find the index of a given value:
+
+请注意，这个函数的函数体也可以写成 `if (y > x) 0 else x - y`。
+
+然而，`return` 真正的亮点在于在其他控制流结构的深处退出。在此示例中，函数遍历数组以查找给定值的索引：
+
+```move=
+use std::vector;
+use std::option::{Self, Option};
+fun index_of<T>(v: &vector<T>, target: &T): Option<u64> {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        if (vector::borrow(v, i) == target) return option::some(i);
+        i = i + 1
+    };
+
+    option::none()
+}
+```
+
+Using `return` without an argument is shorthand for `return ()`. That is, the following two functions are equivalent:
+
+使用不带参数的 `return` 是 `return ()` 的简写。即以下两个函数是等价的：
+
+```move
+fun foo() { return }
+fun foo() { return () }
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/generics.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/generics.md
new file mode 100644
index 000000000..c5553d269
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/generics.md
@@ -0,0 +1,422 @@
+# 泛型
+
+泛型可用于定义具有不同输入数据类型的函数和结构体。这种语言特性有时被称为*参数多态*（parametric polymorphism）。在 Move 中，我们经常将术语泛型与类型形参（type parameter）和类型实参（type argument）互换使用。*（有些书籍的中文翻译通常将 type parameter 和 type argument 不加以区别地翻译为“类型参数”，译者注）*
+
+泛型通常用于库（library）代码中，例如向量中，声明适用于任何可能的实例化（满足指定约束）的代码。在其他框架中，泛型代码有时可用多种不同的方式与全局存储进行交互，这些方式有着相同的实现。
+
+## 声明类型参数
+
+函数和结构体都可以在其签名中带上类型参数列表，由一对尖括号括起来 `<...>`。
+
+### 泛型函数
+
+函数的类型参数放在函数名称之后和（值）参数列表之前。以下代码定义了一个泛型标识函数，该函数接受任何类型的值并返回原值。
+
+```move
+fun id<T>(x: T): T {
+    // 此类型标注是不必要但有效的
+    (x: T)
+}
+```
+
+一旦定义，类型参数 `T` 就可以在参数类型、返回类型和函数体内使用。
+
+### 泛型结构体
+
+结构体的类型参数放在结构名称之后，可用于命名字段的类型。
+
+```move
+struct Foo<T> has copy, drop { x: T }
+
+struct Bar<T1, T2> has copy, drop {
+    x: T1,
+    y: vector<T2>,
+}
+```
+
+请注意，[未使用的类型参数](#未使用的类型参数)。
+
+## 类型实参
+
+### 调用泛型函数
+
+调用泛型函数时，可以在由一对尖括号括起来的列表中为函数的类型形参指定类型实参。
+
+```move
+fun foo() {
+    let x = id<bool>(true);
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 使用泛型结构体
+
+类似地，在构造或销毁泛型类型的值时，可以为结构体的类型参数附加一个类型实参列表。
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: true };
+    let Foo<bool> { x } = foo;
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 类型实参不匹配
+
+如果你指定类型实参并且它们与提供的实际值冲突，则会报错：
+
+```move
+fun foo() {
+    let x = id<u64>(true); // 错误！true 不是 u64
+}
+```
+
+同样地：
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: 0 }; // 错误！0 不是布尔值
+    let Foo<address> { x } = foo; // 错误！bool 与 address 不兼容
+}
+```
+
+## 类型推断
+
+在大多数情况下，Move 编译器能够推断类型实参，因此你不必显式地写下它们。如果我们省略类型实参，上面的例子会是这样的：
+
+```move
+fun foo() {
+    let x = id(true);
+    //        ^ 被推断为 <bool>
+
+    let foo = Foo { x: true };
+    //           ^ 被推断为 <bool>
+
+    let Foo { x } = foo;
+    //     ^ 被推断为 <bool>
+}
+```
+
+注意：当编译器无法推断类型时，你需要手动标注它们。一个常见的场景是调用一个函数，其类型参数只出现在返回位置。
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        // let v = vector::new();
+        //                    ^ 编译器无法确定元素类型。
+
+        let v = vector::new<u64>();
+        //                 ^~~~~ 必须手动标注。
+    }
+}
+}
+```
+
+但是，如果稍后在该函数中使用该返回值，编译器将能够推断其类型：
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        let v = vector::new();
+        //                 ^ 被推断为 <u64>
+        vector::push_back(&mut v, 42);
+    }
+}
+}
+```
+
+## 未使用的类型参数
+
+对于结构体定义，未使用的类型参数是没有出现在结构体定义的任何字段中，但在编译时静态检查的类型参数。Move 允许未使用的类型参数，因此以下结构体定义有效：
+
+```move
+struct Foo<T> {
+    foo: u64
+}
+```
+
+这在对某些概念建模时会很方便。这是一个例子：
+
+```move
+address 0x2 {
+module m {
+    // 货币说明符
+    struct Currency1 {}
+    struct Currency2 {}
+
+    // 可以使用货币说明符类型实例化的泛型钱币类型。
+    // 例如 Coin<Currency1>, Coin<Currency2> 等。
+    struct Coin<Currency> has store {
+        value: u64
+    }
+
+    // 泛型地编写有关所有货币的代码
+    public fun mint_generic<Currency>(value: u64): Coin<Currency> {
+        Coin { value }
+    }
+
+    // 具体编写关于一种货币的代码
+    public fun mint_concrete(value: u64): Coin<Currency1> {
+        Coin { value }
+    }
+}
+}
+```
+
+在此示例中，`struct Coin<Currency>` 是类型参数为 `Currency` 的泛型结构体，该参数指定钱币的货币（类型），并允许将代码泛型地写入任何货币或具体地写入特定货币。即使 `Currency` 类型参数未出现在 `Coin` 中定义的任何字段中，这种通用性也适用。
+
+### 虚类型参数
+
+在上面的例子中，虽然 `struct Coin` 要求有 `store` 能力，但 `Coin<Currency1>` 和 `Coin<Currency2>` 都没有 `store` 能力。这实际是因为[条件能力与泛型类型](./abilities.md#条件能力与泛型类型)的规则以及 `Currency1` 和 `Currency2` 没有 `store` 能力，尽管它们甚至没有在 `struct Coin` 的结构体中使用。这可能会导致一些不合意的后果。例如，我们无法将 `Coin<Currency1>` 放入全局存储中的钱包。
+
+一种可能的解决方案是向 `Currency1` 和 `Currency2` 添加伪能力（spurious ability）标注（例如：`struct Currency1 has store {}`）。但是，这可能会导致错误（bug）或安全漏洞，因为它削弱了类型，引入了不必要的能力声明。例如，我们永远不会期望全局存储中的资源有一个类型为 `Currency1` 的字段，但是通过伪 `store` 能力这是有可能的。此外，伪标注具有传染性，需要在许多未使用类型参数的泛型函数上也包含必要的约束。
+
+虚类型（phantom type）参数解决了这个问题。未使用的类型参数可以标记为 *phantom* 类型参数，不参与结构体的能力推导。这样，在派生泛型类型的能力时，不考虑虚类型参数的实参，从而避免了对伪能力标注的需要。为了使这个宽松的规则合理，Move 的类型系统保证声明为 `phantom` 的参数要么在结构体定义根本不使用，要么仅用作声明为 `phantom` 的类型参数的实参。
+
+#### 声明
+
+在结构定义中，可以通过在声明前添加 `phantom` 关键字来将类型参数声明为 phantom。如果一个类型参数被声明为 phantom，我们就说它是一个虚类型参数。在定义结构时，Move 的类型检查器确保每个虚类型参数要么未在结构定义中使用，要么仅用作虚类型参数的实参。
+
+更正式地说，如果一个类型被用作虚类型参数的实参，我们说该类型出现在_虚位置_。有了这个定义，正确使用虚参数的规则可以指定如下：**虚类型参数只能出现在虚位置**。
+
+以下两个示例显示了虚参数的合法使用。在第一个中，结构定义中根本没有使用参数 `T1`。在第二个中，参数 `T1` 仅用作虚类型参数的实参。
+
+```move
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 没有出现在结构定义中
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 出现在虚位置
+```
+
+以下代码展示违反规则的示例：
+
+```move
+struct S1<phantom T> { f: T }
+                          ^
+                          错误：不是虚位置
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             错误：不是虚位置
+```
+
+#### 实例化
+
+实例化结构时，在派生结构能力时排除虚参数的实参。例如，考虑以下代码：
+
+```move
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+现在考虑类型 `S<HasCopy, NoCopy>`。因为 `S` 是用 `copy` 定义的，并且所有非虚参数都有 copy 能力，所以 `S<HasCopy, NoCopy>` 也有 copy 能力。
+
+#### 具有能力约束的虚类型参数
+
+能力约束和虚类型参数是正交特征，虚参数可以用能力约束来声明。当实例化具有能力约束的虚类型参数时，类型实参必须满足该约束，即使该参数是虚的（phantom）。例如，以下定义是完全有效的：
+
+```move
+struct S<phantom T: copy> {}
+```
+
+通常用来限制应用并且 `T` 只能用具有 `copy` 的实参实例化。
+
+## 约束
+
+在上面的示例中，我们演示了如何使用类型参数来定义稍后可以由调用者插入的“未知”类型。然而，这意味着类型系统几乎没有关于类型的信息，并且必须以非常保守的方式执行检查。在某种意义上，类型系统必须为不受约束的泛型假设最坏的情况。简单地说，默认泛型类型参数没有[能力](./abilities.md)。
+
+这就是约束发挥作用的地方：它们提供了一种方法来指定这些未知类型具有哪些属性，以便类型系统可以允许在其他情况下不安全的操作。
+
+### 声明约束
+
+可以使用以下语法对类型参数施加约束。
+
+```move
+// T 是类型参数的名称
+T: <ability> (+ <ability>)*
+```
+
+`<ability>` 可以是四种[能力](./abilities.md)中的任何一种，一个类型参数可以同时被多种能力约束。因此，以下所有内容都是有效的类型参数声明：
+
+```move
+T: copy
+T: copy + drop
+T: copy + drop + store + key
+```
+
+### 验证约束
+
+在调用点检查约束，所以下面的代码不会编译。
+
+```move
+struct Foo<T: key> { x: T }
+
+struct Bar { x: Foo<u8> }
+//                  ^ 错误！u8 没有 'key'
+
+struct Baz<T> { x: Foo<T> }
+//                     ^ 错误！ t 没有 'key'
+```
+
+```move
+struct R {}
+
+fun unsafe_consume<T>(x: T) {
+    // 错误！x 没有 'drop'
+}
+
+fun consume<T: drop>(x: T) {
+    // 合法！
+    // x 会被自动删除
+}
+
+fun foo() {
+    let r = R {};
+    consume<R>(r);
+    //      ^ 错误！r 没有 'drop'
+}
+```
+
+```move
+struct R {}
+
+fun unsafe_double<T>(x: T) {
+    (copy x, x)
+    // 错误！x 没有 'copy'
+}
+
+fun double<T: copy>(x: T) {
+    (copy x, x) // 合法！
+}
+
+fun foo(): (R, R) {
+    let r = R {};
+    double<R>(r)
+    //     ^ 错误！R 没有 'error'
+}
+```
+
+有关详细信息，请参阅有关[条件能力与泛型类型](./abilities.md#conditional-abilities-and-generic-types)。
+
+## 递归的限制
+
+### 递归结构体
+
+泛型结构不能直接或间接包含相同类型的字段，即使具有不同类型的参数也是如此。以下所有结构定义均无效：
+
+```move
+struct Foo<T> {
+    x: Foo<u64> // 错误！'Foo' 包含 'Foo'
+}
+
+struct Bar<T> {
+    x: Bar<T> // 错误！'Bar' 包含 'Bar'
+}
+
+// 错误！'A' 和 'B' 形成一个循环，这也是不允许的。
+struct A<T> {
+    x: B<T, u64>
+}
+
+struct B<T1, T2> {
+    x: A<T1>
+    y: A<T2>
+}
+```
+
+### 高级主题：类型级递归
+
+Move 允许递归调用泛型函数。然而，当与泛型结构体结合使用时，在某些情况下这可能会创建无限数量的类型，这意味着会给编译器、虚拟机（mv）和其他语言组件增加不必要的复杂性。因此，这样的递归是被禁止的。
+
+被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<T> -> foo<T> -> ... is valid
+    fun foo<T>() {
+        foo<T>();
+    }
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<A<u64>> -> foo<A<u64>> -> ... is valid
+    fun foo<T>() {
+        foo<A<u64>>();
+    }
+}
+}
+```
+
+不被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T> -> foo<A<T>> -> foo<A<A<T>>> -> ...
+    fun foo<T>() {
+        foo<Foo<T>>();
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module n {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T1, T2> -> bar<T2, T1> -> foo<T2, A<T1>>
+    //   -> bar<A<T1>, T2> -> foo<A<T1>, A<T2>>
+    //   -> bar<A<T2>, A<T1>> -> foo<A<T2>, A<A<T1>>>
+    //   -> ...
+    fun foo<T1, T2>() {
+        bar<T2, T1>();
+    }
+
+    fun bar<T1, T2> {
+        foo<T1, A<T2>>();
+    }
+}
+}
+```
+
+请注意，类型级递归的检查基于对调用点的保守分析，所以不考虑控制流或运行时值。
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    fun foo<T>(n: u64) {
+        if (n > 0) {
+            foo<A<T>>(n - 1);
+        };
+    }
+}
+}
+```
+
+上面示例中的函数在技术上将终止任何给定的输入，因此只会创建有限多种类型，但它仍然被 Move 的类型系统视为无效的。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-operators.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-operators.md
new file mode 100644
index 000000000..d31b2959f
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-operators.md
@@ -0,0 +1,312 @@
+# 全局存储 - 操作（Global Storage - Operators）
+
+Move programs can create, delete, and update [resources](./structs-and-resources.md) in global storage using the following five instructions:
+
+Move程序可以使用下面五种指令创建、删除、更新全局存储中的[资源](./structs-and-resources.md)：
+
+| Operation                              | Description                                                     | Aborts?                                 |
+---------------------------------------- |---------------------------------------------------------------- |---------------------------------------- |
+|`move_to<T>(&signer,T)`                 | Publish `T` under `signer.address`                              | If `signer.address` already holds a `T` |
+|`move_from<T>(address): T`              | Remove `T` from `address` and return it                         | If `address` does not hold a `T`        |
+|`borrow_global_mut<T>(address): &mut T` | Return a mutable reference to the `T` stored under `address`    | If `address` does not hold a `T`        |
+|`borrow_global<T>(address): &T`         | Return an immutable reference to the `T` stored under `address` | If `address` does not hold a `T`        |
+|`exists<T>(address): bool`              | Return `true` if a `T` is stored under `address`                |  Never
+
+| 操作符                                 | 描述                                                   | 出错                           |
+---------------------------------------- |------------------------------------------------------ |---------------------------------- |
+|`move_to<T>(&signer,T)`                 | 在 `signer.address` 下发布 `T`                         | 如果 `signer.address` 已经存在 `T` |
+|`move_from<T>(address): T`              | 从 `address` 下删除 `T` 并返回                         | 如果 `address` 下没有 `T`           |
+|`borrow_global_mut<T>(address): &mut T` | 返回 `address` 下 `T` 的可变引用 mutable reference      | 如果 `address` 下没有 `T`          |
+|`borrow_global<T>(address): &T`         | 返回 `address` 下 `T` 的不可变引用 immutable reference  | 如果 `address` 下没有 `T`          |
+|`exists<T>(address): bool`              | 返回 `address` 下的 `T`                                | 永远不会                           |
+                            |
+
+Each of these instructions is parameterized by a type `T` with the [`key` ability](./abilities.md). However, each type `T` *must be declared in the current module*. This ensures that a resource can only be manipulated via the API exposed by its defining module. The instructions also take either an [`address`](./address.md) or [`&signer`](./signer.md) representing the account address where the resource of type `T` is stored.
+
+每个指令的参数 `T` 都具有 [`key` 能力](./abilities.md)。然而，类型 `T` *必须在当前模块*中声明。这确保资源只能通过当前模块暴露的 API 来操作。指令在存储 `T` 类型资源的同时，使用 [`address`](./address.md) 或 [`&signer`](./signer.md) 表示账户地址。
+
+
+## 资源参考（References to resources）
+
+References to global resources returned by `borrow_global` or `borrow_global_mut` mostly behave like references to local storage: they can be extended, read, and written using ordinary [reference operators](./references.md) and passed as arguments to other function. However, there is one important difference between local and global references: **a function cannot return a reference that points into global storage**. For example, these two functions will each fail to compile:
+
+`borrow_global` 或 `borrow_global_mut` 指令返回的全局资源引用在大多数情况下类似本地存储的引用：它们可以通过[引用操作](./references.md)进行拓展、读和写，也可以作为其它函数的参数。然而本地引用和全局引用有个重要差异：**函数不能返回指向全局存储的引用**。例如，下面两个函数编译会失败：
+
+
+```move
+struct R has key { f: u64 }
+// 不能编译 // will not compile
+fun ret_direct_resource_ref_bad(a: address): &R {
+    borrow_global<R>(a) // error!
+}
+// 也不能编译 // also will not compile
+fun ret_resource_field_ref_bad(a: address): &u64 {
+    &borrow_global<R>(a).f // error!
+}
+```
+
+Move must enforce this restriction to guarantee absence of dangling references to global storage. [This](#reference-safety-for-global-resources) section contains much more detail for the interested reader.
+
+Move必须强制这种限制来保证全局存储引用不会出现空引用。对于感兴趣的读者，[此节](#全局资源引用安全)包含了更多的细节。
+
+
+## 使用泛型的全局存储操作（Global storage operators with generics）
+
+Global storage operations can be applied to generic resources with both instantiated and uninstantiated generic type parameters:
+
+全局存储操作可以与实例化和未实例化的泛型资源参数使用：
+
+
+```move
+struct Container<T> has key { t: T }
+
+/// 发布用于存储调用者提供 T 类型对象的 Container /// Publish a Container storing a type T of the caller's choosing
+fun publish_generic_container<T>(account: &signer, t: T) {
+    move_to<Container<T>>(account, Container { t })
+}
+
+/// 发布存储 u64 类型的 Container /// Publish a container storing a u64
+fun publish_instantiated_generic_container(account: &signer, t: u64) {
+    move_to<Container<u64>>(account, Container { t })
+}
+```
+
+The ability to index into global storage via a type parameter chosen at runtime is a powerful Move feature known as *storage polymorphism*. For more on the design patterns enabled by this feature, see [Move generics](./generics.md).
+
+能够通过参数类型在运行时中索引全局存储的能力是 Move 的强大特性，该特性称之为*存储多态性*。关于此特性更多的设计模式，请参考[Move泛型](./generics.md)这节。
+
+## 示例： `Counter` （Example: `Counter`）
+
+The simple `Counter` module below exercises each of the five global storage operators. The API exposed by this module allows:
+
+- Anyone to publish a `Counter` resource under their account
+- Anyone to check if a `Counter` exists under any address
+- Anyone to read or increment the value of a `Counter` resource under any address
+- An account that stores a `Counter` resource to reset it to zero
+- An account that stores a `Counter` resource to remove and delete it
+
+下面简单的 `Counter` 模块使用五种全局存储操作。该模块暴露的API允许：
+
+- 任何人可以在他们的账户下发布 `Counter` 资源。
+- 任何人可以检查任何地址下是否包含 `Counter`。
+- 任何人可以读或增加任何地址下的 `Counter` 值。
+- 存储 `Counter` 资源的账号可以将其重置为 0。
+- 存储 `Counter` 资源的账号可以删除该对象。
+
+```move
+address 0x42 {
+module counter {
+    use std::signer;
+
+    /// 包含整数的资源 /// Resource that wraps an integer counter
+    struct Counter has key { i: u64 }
+
+    /// 给定账户下发布带有 `i` 值的 `Counter` 资源 /// Publish a `Counter` resource with value `i` under the given `account`
+    public fun publish(account: &signer, i: u64) {
+      // “打包"（创建）Counter 资源。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Pack" (create) a Counter resource. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+      move_to(account, Counter { i })
+    }
+
+    /// 读取 `addr` 地址下 `Counter` 内的值 /// Read the value in the `Counter` resource stored at `addr`
+    public fun get_count(addr: address): u64 acquires Counter {
+        borrow_global<Counter>(addr).i
+    }
+
+    /// 增加 `addr` 地址下 `Counter` 内的值 /// Increment the value of `addr`'s `Counter` resource
+    public fun increment(addr: address) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(addr).i;
+        *c_ref = *c_ref + 1
+    }
+
+    /// 将 `account` 的 `Counter` 重置为 0 /// Reset the value of `account`'s `Counter` to 0
+    public fun reset(account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(signer::address_of(account)).i;
+        *c_ref = 0
+    }
+
+    /// 删除 `account` 的 `Counter` 资源并返回其内值 /// Delete the `Counter` resource under `account` and return its value
+    public fun delete(account: &signer): u64 acquires Counter {
+        // 删除 Counter 资源 // remove the Counter resource
+        let c = move_from<Counter>(signer::address_of(account));
+        // 将 `Counter` 资源“拆”为字段。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Unpack" the `Counter` resource into its fields. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+        let Counter { i } = c;
+        i
+    }
+
+    /// 如果 `addr` 下包含 `Counter` 资源，则返回 `true`。 /// Return `true` if `addr` contains a `Counter` resource
+    public fun exists(addr: address): bool {
+        exists<Counter>(addr)
+    }
+}
+}
+```
+
+## `acquires` 函数标注（Annotating functions with `acquires`）
+
+In the `counter` example, you might have noticed that the `get_count`, `increment`, `reset`, and `delete` functions are annotated with `acquires Counter`. A Move function `m::f` must be annotated with `acquires T` if and only if:
+
+- The body of `m::f` contains a `move_from<T>`, `borrow_global_mut<T>`, or `borrow_global<T>` instruction, or
+- The body of `m::f` invokes a function `m::g` declared in the same module that is annotated with `acquires`
+
+在 `counter` 例子中，可以注意到 `get_count`、`increment`、`reset` 和 `delete` 方法都使用 `acquires Counter` 进行标注。函数 `m::f` 在且仅在下述情况必须使用 `acquires T` 进行标注：
+
+- `m::f` 的主体包含 `move_from<T>`、`borrow_global_mut<T>` 或 `borrow_global<T>` 指令调用
+- `m::f` 的主体调用了同模块内被 `acquires` 注解的 `m::g` 的函数
+
+For example, the following function inside `Counter` would need an `acquires` annotation:
+
+例如，下面 `Counter` 内的函数需要使用 `acquires` 标注：
+
+```move
+// 由于 `increment` 使用了 `acquires` 标注，所以函数需要 `acquires` // Needs `acquires` because `increment` is annotated with `acquires`
+fun call_increment(addr: address): u64 acquires Counter {
+    counter::increment(addr)
+}
+```
+
+However, the same function *outside* `Counter` would not need an annotation:
+
+然而，在 `Counter` *外面*的函数则不需要进行标注：
+
+
+```move
+address 0x43 {
+module m {
+   use 0x42::counter;
+
+   // 可以，仅在函数声明在同一模块内时需要标注 // Ok. Only need annotation when resource acquired by callee is declared in the same module
+   fun call_increment(addr: address): u64 {
+       counter::increment(addr)
+   }
+}
+}
+```
+
+If a function touches multiple resources, it needs multiple `acquires`:
+
+如果函数需要多个资源，`acquires` 则需要多个参数：
+
+```move=
+address 0x42 {
+module two_resources {
+    struct R1 has key { f: u64 }
+    struct R2 has key { g: u64 }
+
+    fun double_acquires(a: address): u64 acquires R1, R2 {
+        borrow_global<R1>(a).f + borrow_global<R2>.g
+    }
+}
+}
+```
+
+The `acquires` annotation does not take generic type parameters into account:
+
+`acquires` 标注不会将泛型类型参数纳入声明中：
+
+
+```move=
+address 0x42 {
+module m {
+    struct R<T> has key { t: T }
+
+    // 效果为 `acquires R` 而不是 `acquires R<T>` // `acquires R`, not `acquires R<T>`
+    fun acquire_generic_resource<T: store>(a: addr) acquires R {
+        let _ = borrow_global<R<T>>(a);
+    }
+
+    // 效果为 `acquires R` 而不是 `acquiresR<u64>` // `acquires R`, not `acquires R<u64>
+    fun acquire_instantiated_generic_resource(a: addr) acquires R {
+        let _ = borrow_global<R<u64>>(a);
+    }
+}
+}
+```
+
+Finally: redundant `acquires` are not allowed. Adding this function inside `Counter` will result in a compilation error:
+
+最后：不允许使用不必要的 `acquires`。在 `Counter` 内添加下述方法将会导致编译错误：
+
+
+```move
+// 下面代码不会编译，因为函数体没有使用全局存储指令也没调用使用 `acquires` 注解的函数 // This code will not compile because the body of the function does not use a global storage instruction or invoke a function with `acquires`
+fun redundant_acquires_bad() acquires Counter {}
+```
+
+For more information on `acquires`, see [Move functions](./functions.md).
+
+关于 `acquires` 更多信息，参见 [Move 函数](./functions.md)。
+
+## 全局资源引用安全（Reference Safety For Global Resources）
+
+Move prohibits returning global references and requires the `acquires` annotation to prevent dangling references. This allows Move to live up to its promise of static reference safety (i.e., no dangling references, no `null` or `nil` dereferences) for all [reference](./references.md) types.
+
+Move 禁止返回全局引用并且需要使用 `acquires` 标注来防止空引用。这使 Move 保证了所有[引用](./references.md)类型的静态引用安全性（例如，没有空引用、不会解引用 `null` 或 `nil` 对象）。
+
+This example illustrates how the Move type system uses `acquires` to prevent a dangling reference:
+
+这个例子展示了 Move 类型系统如何通过使用 `acquires` 来防止空引用：
+
+```move=
+address 0x42 {
+module dangling {
+    struct T has key { f: u64 }
+
+    fun borrow_then_remove_bad(a: address) acquires T {
+        let t_ref: &mut T = borrow_global_mut<T>(a);
+        let t = remove_t(a); // 类型系统不允许 t_ref 这种空引用 // type system complains here
+        // t_ref now dangling!
+        let uh_oh = *&t_ref.f
+    }
+
+    fun remove_t(a: address): T acquires T {
+        move_from<T>(a)
+    }
+
+}
+}
+```
+
+In this code, line 6 acquires a reference to the `T` stored at address `a` in global storage. The callee `remove_t` then removes the value, which makes `t_ref` a dangling reference.
+
+代码中第六行获取了 `a` 地址在全局存储中 `T` 类型资源的引用。`remove_t` 调用删除了该值，使 `t_ref` 变成空引用。
+
+
+Fortunately, this cannot happen because the type system will reject this program. The `acquires` annotation on `remove_t` lets the type system know that line 7 is dangerous, without having to recheck or introspect the body of `remove_t` separately!
+
+幸运的是，由于类型系统拒绝编译程序导致这种情况不会发生。`remove_t` 方法的 `acquires` 标注让类型系统知道第七行是危险的，不需要再分析 `remove_t` 的函数体。
+
+The restriction on returning global references prevents a similar, but even more insidious problem:
+
+禁止返回全局引用的限制同时也防止了类似却更隐晦的问题：
+
+```move=
+address 0x42 {
+module m1 {
+    struct T has key {}
+
+    public fun ret_t_ref(a: address): &T acquires T {
+        borrow_global<T>(a) // 报错 类型系统在这不能继续编译 // error! type system complains here
+    }
+
+    public fun remove_t(a: address) acquires T {
+        let T {} = move_from<T>(a);
+    }
+}
+
+module m2 {
+    fun borrow_then_remove_bad(a: address) {
+        let t_ref = m1::ret_t_ref(a);
+        let t = m1::remove_t(a); // t_ref 为空引用 // t_ref now dangling!
+    }
+}
+}
+```
+
+Line 16 acquires a reference to a global resource `m1::T`, then line 17 removes that same resource, which makes `t_ref` dangle. In this case, `acquires` annotations do not help us because the `borrow_then_remove_bad` function is outside of the `m1` module that declares `T` (recall that `acquires` annotations can only be used for resources declared in the current module). Instead, the type system avoids this problem by preventing the return of a global reference at line 6.
+
+第十六行获取了全局资源 `m1::T` 类型的引用，然后第十七行删除了同一资源，这使 `t_ref` 变成空引用。在这个例子中，`acquires` 标注没有帮助到我们，因为 `borrow_then_remove_bad` 函数在声明了 `T` 类型（回顾 `acquires` 标注只用在声明此类型的模块内）的 `m1` 模块外。然而禁止返回全局引用的规则使第六行避免了这个问题。
+
+
+Fancier type systems that would allow returning global references without sacrificing reference safety are possible, and we may consider them in future iterations of Move. We chose the current design because it strikes a good balance between expressivity, annotation burden, and type system complexity.
+
+允许返回全局引用而尽可能不牺牲引用安全的高级类型系统是可行的，我们将会在 Move 未来的迭代过程中考虑此事。我们选择目前的设计方式是因为它很好的平衡了语言表现力、复杂的标注和复杂的类型系统三者的关系。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-structure.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-structure.md
new file mode 100644
index 000000000..763d253d5
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/global-storage-structure.md
@@ -0,0 +1,14 @@
+# 全局存储 —— 结构
+
+Move 程序的目的是[读取和写入](./global-storage-operators.md)树形的持久全局存储。程序不能访问文件系统、网络或任何此树以外的数据。
+
+在伪代码中，全局存储看起来像：
+
+```move
+struct GlobalStorage {
+  resources: Map<(address, ResourceType), ResourceValue>
+  modules: Map<(address, ModuleName), ModuleBytecode>
+}
+```
+
+从结构上讲，全局存储是一个[森林（forest）](https://en.wikipedia.org/wiki/Tree_(graph_theory))，这个森林由以账户[地址（`address`）](./address.md)为根的树组成。每个地址可以存储[资源（resource）](./structs-and-resources.md)数据和[模块（module）](./modules-and-scripts.md)代码。如上面的伪代码所示，每个地址（`address`）最多可以存储一个给定类型的资源值，最多可以存储一个给定名称的模块。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/integers.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/integers.md
new file mode 100644
index 000000000..a1a70430b
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/integers.md
@@ -0,0 +1,214 @@
+# 整数 (Integers)
+
+Move supports three unsigned integer types: `u8`, `u64`, and `u128`. Values of these types range from 0 to a maximum that depends on the size of the type.
+
+| Type                             | Value Range              |
+| -------------------------------- | ------------------------ |
+| Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+Move 支持三种无符号整数类型：`u8`、`u64` 和 `u128`。这些类型的值范围从 0 到最大值，最大值的具体取值取决于整数类型。
+
+| 类型                      | 取值范围                 |
+|---------------------------|--------------------------|
+| 无符号 8位 整数, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| 无符号 64位 整数, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| 无符号 128位 整数, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+## 字面值(Literal)
+
+Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
+
+If a literal is too large for its specified (or inferred) size range, an error is reported.
+
+(在Move中)这些类型的字面值指定为数字序列(例如：112)或十六进制文字(例如：0xFF), 可以选择将字面值的类型定义为后缀, 例如 `112u8`。如果未指定类型，编译器将尝试从使用字面值的上下文推断类型。如果无法推断类型，则默认为 `u64。
+
+如果字面值太大，超出其指定的(或推断的)大小范围，则会报错。
+
+### 例如：
+
+```jsx
+// literals with explicit annotations;
+let explicit_u8 = 1u8;
+let explicit_u64 = 2u64;
+let explicit_u128 = 3u128;
+
+// literals with simple inference
+let simple_u8: u8 = 1;
+let simple_u64: u64 = 2;
+let simple_u128: u128 = 3;
+
+// literals with more complex inference
+let complex_u8 = 1; // inferred: u8
+// right hand argument to shift must be u8
+let _unused = 10 << complex_u8;
+
+let x: u8 = 0;
+let complex_u8 = 2; // inferred: u8
+// arguments to `+` must have the same type
+let _unused = x + complex_u8;
+
+let complex_u128 = 3; // inferred: u128
+// inferred from function argument type
+function_that_takes_u128(complex_u128);
+
+// literals can be written in hex
+let hex_u8: u8 = 0x1;
+let hex_u64: u64 = 0xCAFE;
+let hex_u128: u128 = 0xDEADBEEF;
+```
+
+## 运算集 (Operations)
+
+### 算术运算 (Arithmetic)
+
+Each of these types supports the same set of checked arithmetic operations. For all of these operations, both arguments (the left and right side operands) must be of the same type. If you need to operate over values of different types, you will need to first perform a cast. Similarly, if you expect the result of the operation to be too large for the integer type, perform a cast to a larger size before performing the operation.
+
+每一种(无符号整数)类型都支持相同算术运算集。对于所有这些运算，两个参数(左侧和右侧操作数)必须是同一类型。如果您需要对不同类型的值进行运算，则需要首先执行强制转换。同样，如果您预计运算结果对于当下整数类型来说太大，请在执行运算之前将之转换为更大的整数类型。
+
+All arithmetic operations abort instead of behaving in a way that mathematical integers would not (e.g., overflow, underflow, divide-by-zero).
+
+| Syntax | Operation           | Aborts If                                |
+| ------ | ------------------- | ---------------------------------------- |
+| `+`    | addition            | Result is too large for the integer type |
+| `-`    | subtraction         | Result is less than zero                 |
+| `*`    | multiplication      | Result is too large for the integer type |
+| `%`    | modular division    | The divisor is `0`                       |
+| `/`    | truncating division | The divisor is `0`                       |
+
+### [Bitwise](https://move-language.github.io/move/integers.html#bitwise)
+
+算术运算在遇到异常时将会中止，而不是以上溢、下溢、被零除等数学整数未定义的的方式输出结果。
+
+| 句法 | 操作           | 中止条件                                |
+| ------ | ------------| ---------------------------------------- |
+| `+`    | 加法         | 结果对于整数类型来说太大了 |
+| `-`    | 减法         | 结果小于零                 |
+| `*`    | 乘法         | 结果对于整数类型来说太大了 |
+| `%`    | 取余运算     | 除数为 `0`                       |
+| `/`    | 截断除法     | 除数为 `0`                       |
+
+### 位运算 (Bitwise)
+
+The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
+
+Bitwise operations do not abort.
+
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
+
+整数类型支持下列位运算，即将每个数字视为一系列单独的位：0 或 1，而不是整型数值。
+
+位运算不会中止。
+
+| 语法                | 操作符   | 描述                       |
+|---------------------|----------|----------------------------|
+| `&`                 | 按位和   | 对每个位成对执行布尔值和   |
+| <code>&#124;</code> | 按位或   | 对每个位成对执行布尔值或   |
+| `^`                 | 按位异或 | 对每个位成对执行布尔值异或 |
+
+### 位移 (Bit shift)
+
+Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
+
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `64`, or `128` for `u8`, `u64`, and `u128` respectively.
+
+| Syntax | Operation   | Aborts if                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | shift left  | Number of bits to shift by is greater than the size of the integer type |
+| `>>`   | shift right | Number of bits to shift by is greater than the size of the integer type |
+
+与按位运算类似，每种整数类型都支持位移(bit shifts)。但与其他运算不同的是，右侧操作数(要移位多少位)必须始终是 `u8`  并且不需要与左侧操作数类型(您要移位的数字)匹配。
+
+如果要移位的位数分别大于或等于 `8`、`64`, `u128` 或 `128` 的 `u8`, `u64`, 则移位可以中止。
+
+| 句法 | 操作   | 中止条件                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | 左移  | 要移位的位数大于整数类型的大小 |
+| `>>`   | 右移 | 要移位的位数大于整数类型的大小 |
+
+### 比较运算 (Comparisons)
+
+Integer types are the *only* types in Move that can use the comparison operators. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Comparison operations do not abort.
+
+| Syntax | Operation                |
+| ------ | ------------------------ |
+| `<`    | less than                |
+| `>`    | greater than             |
+| `<=`   | less than or equal to    |
+| `>=`   | greater than or equal to |
+
+整数类型是 Move 中唯一可以使用比较(Comparisons)运算符的类型。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+比较操作不会中止。
+
+| 句法 | 操作                |
+| ------ | ------------------------ |
+| `<`    | 小于                |
+| `>`    | 大于             |
+| `<=`   | 小于等于    |
+| `>=`   | 大于等于 |
+
+###  相等 (Equality)
+
+Like all types with [`drop`](https://move-language.github.io/move/abilities.html) in Move, all integer types support the ["equal"](https://move-language.github.io/move/equality.html) and ["not equal"](https://move-language.github.io/move/equality.html) operations. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Equality operations do not abort.
+
+| Syntax | Operation |
+| ------ | --------- |
+| `==`   | equal     |
+| `!=`   | not equal |
+
+For more details see the section on [equality](https://move-language.github.io/move/equality.html)
+
+与 Move 中的所有具有[`drop`](./chapter_19_abilities.html)能力的类型一样，所有整数类型都支持 ["equal(等于)"](./chapter_11_equality.html) 和 ["not equal(不等于)](./chapter_11_equality.html)运算。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+相等(Equality)运算不会中止。
+
+| 句法 | 操作 |
+| ------ | --------- |
+| `==`   | 等于     |
+| `!=`   | 不等于 |
+
+更多细节可以参考[相等]([equality](https://move-language.github.io/move/equality.html))章节。
+
+## 转换 (Casting)
+
+Integer types of one size can be cast to integer types of another size. Integers are the only types in Move that support casting.
+
+Casts *do not* truncate. Casting will abort if the result is too large for the specified type
+
+| Syntax     | Operation                                            | Aborts if                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T` |
+
+Here, the type of `e` must be `u8`, `u64`, or `u128` and `T` must be `u8`, `u64`, or `u128`.
+
+For example:
+
+- `(x as u8)`
+- `(2u8 as u64)`
+- `(1 + 3 as u128)`
+
+一种大小的整数类型可以转换为另一种大小的整数类型。整数是 Move 中唯一支持强制转换的类型。
+
+强制转换不会截断。如果结果对于指定类型来说太大，则转换将中止。
+
+| Syntax     | 操作                                            | 中止条件                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | 将整数表达式 `e` 转换为整数类型 `T` | `e` 太大而不能表示为 `T` |
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, integer values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](https://move-language.github.io/move/variables.html#move-and-copy).
+
+与语言内置的其他标量值一样，整数值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/introduction.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/introduction.md
new file mode 100644
index 000000000..5e3ea6f79
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/introduction.md
@@ -0,0 +1,47 @@
+# 引言 (Introduction)
+
+Welcome to Move, a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. Move allows developers to write programs that flexibly manage and transfer assets, while providing the security and protections against attacks on those assets. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+欢迎来到Move的世界，Move是一种安全、沙盒式和形式化验证的下一代编程语言，它的第一个用例是 Diem 区块链(当时名字叫Libra, 脸书团队开发的项目, 译者注), Move 为其实现提供了基础。 Move 允许开发人员编写灵活管理和转移数字资产的程序，同时提供安全保护，防止对那些链上资产的攻击。不仅如此，Move 也可用于区块链世界之外的开发场景。
+
+Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource types with move (hence the name) semantics as an explicit representation of digital assets, such as currency.
+
+Move 的诞生从[Rust](https://www.rust-lang.org/)中吸取了灵感，Move也是因为使用具有移动(move)语义的资源类型作为数字资产(例如货币)的显式表示而得名。
+
+## Move是为谁准备的？(Who is Move for?)
+
+Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
+
+Move语言被设计和创建为安全、可验证， 同时兼顾灵活性的编程语言。Move的第一个应用场景是用于Diem区块链的开发。现在，Move语言仍在不断发展中。Move 还有成为其他区块链，甚至非区块链用例开发语言的潜质。
+
+Given custom Move modules will not be supported at the [launch](https://diem.com/white-paper/#whats-next) of the Diem Payment Network (DPN), we are targeting an early Move Developer persona.
+
+鉴于在 Diem 支付网络 (DPN) [启动](https://diem.com/white-paper/#whats-next)时将不支持自定义 Move 模块(custom Move modules)，我们的目标是早期的 Move 开发人员。
+
+The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
+
+早期的 Move 开发人员应该是具有一定编程经验的程序员，他们愿意了解编程语言核心，并探索它的用法。
+
+### 爱好者 (Hobbyists)
+
+Understanding that the capability to create custom modules on the Diem Payment Network will not be available at launch, the hobbyist Move Developer is interested in learning the intricacies of the language. She will understand the basic syntax, the standard libraries available, and write example code that can be executed using the Move CLI. The Move Developer may even want to dig into understanding how the Move Virtual Machine executes the code she writes.
+
+作为(Move语言)爱好者角色，首先需要明白在Diem支付网络上创建自定义模块(custom modules)是不可能的，其次，你还要对探索这门语言的复杂性保持兴趣。你将了解基本语法、可用的标准库，并编写可以用的Move CLI执行的示例代码。如果可能，你甚至可以去尝试体验Move虚拟机如何执行你自己编写的代码。
+
+### 核心贡献者 (Core Contributor)
+
+Beyond a hobbyist wanting to stay ahead of the curve for the core programming language is someone who may want to [contribute](https://diem.com/en-US/cla-sign/) directly to Move. Whether this includes submitting language improvements or even, in the future, adding core modules available on the Diem Payment Network, the core contributor will understand Move at a deep level.
+
+核心贡献者指那些超越爱好者并想在核心编程语言方面保持领先，还直接为 Move 做出[贡献](https://diem.com/en-US/cla-sign/)的人。无论是提交语言改进，甚至未来添加 Diem 支付网络上可用的核心模块等，核心贡献者都将深入了解Move。
+
+### Move不适用于哪些人？(Who Move is currently not targeting)
+
+Currently, Move is not targeting developers who wish to create custom modules and contracts for use on the Diem Payment Network. We are also not targeting novice developers who expect a completely polished developer experience even in testing the language.
+
+目前，Move 并不适用那些希望在在 Diem 支付网络上创建自定义模块和合约的开发人员。我们也不针对期望在测试语言时就能获得完美开发体验的初学开发者。
+
+## 从哪里开始？(Where Do I Start?)
+
+Begin with understanding [modules and scripts](https://move-language.github.io/move/modules-and-scripts.html) and then work through the [Move Tutorial](https://move-language.github.io/move/creating-coins.html).
+
+你可以从了解模块和脚本([modules and scripts](./modules-and-scripts.html))开始，然后跟随Move教程([Move Tutorial](./move-tutorial.html))进行练习。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/loops.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/loops.md
new file mode 100644
index 000000000..34626ed28
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/loops.md
@@ -0,0 +1,215 @@
+# While and Loop
+
+Move offers two constructs for looping: `while` and `loop`.
+
+Move 提供了两种循环结构: `while` and `loop`.
+
+## `while` 循环
+
+The `while` construct repeats the body (an expression of type unit) until the condition (an expression of type `bool`) evaluates to `false`.
+
+Here is an example of simple `while` loop that computes the sum of the numbers from `1` to `n`:
+
+`while` 会重复执行结构(一个 `unit` 类型的表达式), 直到条件语句(`bool` 类型的表达式)运算结果为 `false`。
+
+下面是一个简单的 `while` 循环的例子，计算从 `1` 到 `n` 数字之和:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 1;
+    while (i <= n) {
+        sum = sum + i;
+        i = i + 1
+    };
+
+    sum
+}
+```
+
+Infinite loops are allowed:
+
+无限循环是被允许的:
+
+```move=
+fun foo() {
+    while (true) { }
+}
+```
+
+### `break`
+
+The `break` expression can be used to exit a loop before the condition evaluates to `false`. For example, this loop uses `break` to find the smallest factor of `n` that's greater than 1:
+
+`break` 表达式可用于在条件计算结果为 `false` 之前退出循环。例如，这个循环使用 `break` 查找 `n` 大于1的最小因子:
+
+```move
+fun smallest_factor(n: u64): u64 {
+    // assuming the input is not 0 or 1
+    let i = 2;
+    while (i <= n) {
+        if (n % i == 0) break;
+        i = i + 1
+    };
+
+    i
+}
+```
+
+The `break` expression cannot be used outside of a loop.
+
+`break` 表达式不能在循环之外使用。
+
+### `continue`
+
+The `continue` expression skips the rest of the loop and continues to the next iteration. This loop uses `continue` to compute the sum of `1, 2, ..., n`, except when the number is divisible by 10:
+
+`continue` 表达式跳过当前循环的剩余部分, 并继续下一轮迭代。下面的例子, 使用 `continue` 去计算 `1, 2, ..., n` 的总和，过滤掉不能被10整除的数:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    while (i < n) {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        sum = sum + i;
+    };
+
+    sum
+}
+```
+
+The `continue` expression cannot be used outside of a loop.
+
+`continue` 表达式不能在循环之外使用。
+
+### The type of `break` and `continue`
+
+`break` and `continue`, much like `return` and `abort`, can have any type. The following examples illustrate where this flexible typing can be helpful:
+
+`break` and `continue`, 和 `return` and `abort`  很相像, 可以是任何类型。下面的例子说明了这种灵活的类型在那些方面有帮助:
+
+```move
+fun pop_smallest_while_not_equal(
+    v1: vector<u64>,
+    v2: vector<u64>,
+): vector<u64> {
+    let result = vector::empty();
+    while (!vector::is_empty(&v1) && !vector::is_empty(&v2)) {
+        let u1 = *vector::borrow(&v1, vector::length(&v1) - 1);
+        let u2 = *vector::borrow(&v2, vector::length(&v2) - 1);
+        let popped =
+            if (u1 < u2) vector::pop_back(&mut v1)
+            else if (u2 < u1) vector::pop_back(&mut v2)
+            else break; // Here, `break` has type `u64`
+        vector::push_back(&mut result, popped);
+    };
+
+    result
+}
+
+fun pick(
+    indexes: vector<u64>,
+    v1: &vector<address>,
+    v2: &vector<address>
+): vector<address> {
+    let len1 = vector::length(v1);
+    let len2 = vector::length(v2);
+    let result = vector::empty();
+    while (!vector::is_empty(&indexes)) {
+        let index = vector::pop_back(&mut indexes);
+        let chosen_vector =
+            if (index < len1) v1
+            else if (index < len2) v2
+            else continue; // Here, `continue` has type `&vector<address>`
+        vector::push_back(&mut result, *vector::borrow(chosen_vector, index))
+    };
+
+    result
+}
+```
+
+## `loop`表达式
+
+The `loop` expression repeats the loop body (an expression with type `()`) until it hits a `break`
+
+Without a `break`, the loop will continue forever
+
+`loop` 表达式重复循环体(类型为unit()的表达式) ，直到遇到 `break` 为止。
+
+(下面的代码中)没有 `break`, 循环将一直执行。
+
+```move
+fun foo() {
+    let i = 0;
+    loop { i = i + 1 }
+}
+```
+
+Here is an example that uses `loop` to write the `sum` function:
+
+这是一个使用 `loop` 编写 `sum` 函数的示例(可与 `while` 循环比较):
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+As you might expect, `continue` can also be used inside a `loop`. Here is `sum_intermediate` from above rewritten using `loop` instead of `while`
+
+正如你所料, `continue` 也可以在 `loop` 中使用。这是上面的 `sum_intermediate` 使用 `loop` 代替 `while` 重写的:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+## `while` and `loop` 的类型
+
+Move loops are typed expressions. A `while` expression always has type `()`.
+
+Move 循环是有类型化的表达式。 `while` 表达式始终具有 `()` 类型。
+
+```move
+let () = while (i < 10) { i = i + 1 };
+```
+
+If a `loop` contains a `break`, the expression has type unit `()`
+
+如果 `loop` 中包含 `break` , 这个表达式的类型则为 unit `()`
+
+
+```move
+(loop { if (i < 10) i = i + 1 else break }: ());
+let () = loop { if (i < 10) i = i + 1 else break };
+```
+
+If `loop` does not have a `break`, `loop` can have any type much like `return`, `abort`, `break`, and `continue`.
+
+如果 `loop` 不包含 `break`, `loop` 可以是任何类型, 就像`return`, `abort`, `break`, 和 `continue`。
+
+```move
+(loop (): u64);
+(loop (): address);
+(loop (): &vector<vector<u8>>);
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/modules-and-scripts.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
new file mode 100644
index 000000000..9dbca68eb
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
@@ -0,0 +1,119 @@
+# 模块和脚本
+
+Move 有两种不同类型的程序：***模块（Module）***和***脚本（Script）***。模块是定义结构类型以及对这些类型进行操作的函数的库。*结构类型*定义了 Move 的[全局存储](./global-storage-structure.md)的模式，*模块函数*定义了更新存储的规则。模块本身也存储在全局存储中。脚本是[可执行文件](https://en.wikipedia.org/wiki/Executable)的入口点，类似于传统语言中的主函数 `main`。脚本通常调用已发布模块的函数来更新全局存储。脚本是临时代码片段，不会发布在全局存储中。
+
+一个 Move 源文件（或**编译单元**）可能包含多个模块和脚本。然而，发布模块或执行脚本都是独立的虚拟机（VM）操作。
+
+## 语法
+
+### 脚本
+
+脚本具有以下结构：
+
+```text
+script {
+    <use>*
+    <constants>*
+    fun <identifier><[type parameters: constraint]*>([identifier: type]*) <function_body>
+}
+```
+
+一个 `script` 块必须以它的所有 [`use`](./uses.md) 声明开头，然后是[常量（constant）](./constants.md)声明，最后是主[函数](./functions.md)声明。主函数的名称可以是任意的（也就是说，它不一定命名为 `main`），它是脚本块中唯一的函数，可以有任意数量的参数，并且不能有返回值。下面是每个组件的示例：
+
+```move
+script {
+    // 导入在命名账户地址 std 上发布的 debug 模块。
+    use std::debug;
+
+    const ONE: u64 = 1;
+
+    fun main(x: u64) {
+        let sum = x + ONE;
+        debug::print(&sum)
+    }
+}
+```
+
+脚本（Script）的功能非常有限 —— 它们不能声明友元（friend）、结构类型或访问全局存储。他们的主要作用主要是调用*模块函数*。
+
+### 模块
+
+模块具有以下结构：
+
+```text
+module <address>::<identifier> {
+    (<use> | <friend> | <type> | <function> | <constant>)*
+}
+```
+
+其中 `<address>` 是一个有效的[命名或字面量地址](./address.md)。
+
+例子：
+
+```move
+module 0x42::test {
+    struct Example has copy, drop { i: u64 }
+
+    use std::debug;
+    friend 0x42::another_test;
+
+    const ONE: u64 = 1;
+
+    public fun print(x: u64) {
+        let sum = x + ONE;
+        let example = Example { i: sum };
+        debug::print(&sum)
+    }
+}
+```
+
+`module 0x42::test` 这部分指定模块 `test` 将在[全局存储](./global-storage-structure.md)的[账户地址](./address.md) `0x42` 下发布。
+
+模块也可以使用[命名地址](./address.md)来声明，例如：
+
+```move
+module test_addr::test {
+    struct Example has copy, drop { a: address }
+
+    use std::debug;
+    friend test_addr::another_test;
+
+    public fun print() {
+        let example = Example { a: @test_addr };
+        debug::print(&example)
+    }
+}
+```
+
+因为命名地址只存在于源语言级别和编译期间，所以命名地址将在字节码级别彻底替换它们的值。例如，如果我们有以下代码：
+
+```move
+script {
+    fun example() {
+        my_addr::m::foo(@my_addr);
+    }
+}
+```
+
+我们在把 `my_addr` 设置为 `0xC0FFEE` 的情况下编译它，那么它在操作上等同于以下内容：
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::m::foo(@0xC0FFEE);
+    }
+}
+```
+
+然而，在源代码级别，这些是*不等价的* —— 函数 `m::foo` *必须*通过 `my_addr` 命名地址来访问，而不是通过分配给该地址的数值来访问。
+
+模块名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，模块名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+module my_module {}
+module foo_bar_42 {}
+```
+
+通常，模块名称以小写字母开头。名为 `my_module` 的模块应该存储在名为 `my_module.move` 的源文件中。
+
+`module` 块内的所有元素都可以按任意顺序出现。从根本上说，模块是[`类型（type）`](./structs-and-resources.md)和[`函数（function）`](./functions.md)的集合。[`use`](./uses.md) 关键字用来从其他模块导入类型。[`friend`](./friends.md) 关键字指定一个可信的模块列表。[`const`](./constants.md) 关键字定义了可以在模块函数中使用的私有常量。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/move-tutorial.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/move-tutorial.md
new file mode 100644
index 000000000..209d54950
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/move-tutorial.md
@@ -0,0 +1,970 @@
+# Move 教程(Move Tutorial)
+
+Welcome to the Move Tutorial! In this tutorial, we are going to go through some steps of developing Move code including design, implementation, unit testing and formal verification of Move modules.
+
+欢迎来到 Move 语言教程，在本教程中，我们通过一些具体的步骤进行 Move 语言代码的开发，包括 Move 模块的设计、实现、单元测试和形式化验证。
+
+There are nine steps in total:
+
+- [Step 0: Installation](#Step0)
+- [Step 1: Writing my first Move module](#Step1)
+- [Step 2: Adding unit tests to my first Move module](#Step2)
+- [Step 3: Designing my `BasicCoin` module](#Step3)
+- [Step 4: Implementing my `BasicCoin` module](#Step4)
+- [Step 5: Adding and using unit tests with the `BasicCoin` module](#Step5)
+- [Step 6: Making my `BasicCoin` module generic](#Step6)
+- [Step 7: Use the Move prover](#Step7)
+- [Step 8: Writing formal specifications for the `BasicCoin` module](#Step8)
+
+整个过程共包含9个步骤：
+
+- [Step 0: 安装 Move 开发环境](#Step0)
+- [Step 1: 编写第一个 Move 模块(Move Module)](#Step1)
+- [Step 2: 给模块(Module)添加单元测试](#Step2)
+- [Step 3: 设计自己的 `BasicCoin` 模块(Module)](#Step3)
+- [Step 4: `BasicCoin` 模块(Module)的实现](#Step4)
+- [Step 5: 给 `BasicCoin` 模块添加单元测试](#Step5)
+- [Step 6: 使用泛型(generic)编写 `BasicCoin` 模块](#Step6)
+- [Step 7: 使用 `Move prover`](#Step7)
+- [Step 8: 为 `BasicCoin` 模块编写形式化规范(formal specifications)](#Step8)
+
+Each step is designed to be self-contained in the corresponding `step_x` folder. For example, if you would
+like to skip the contents in step 1 through 4, feel free to jump to step 5 since all the code we have written
+before step 5 will be in `step_5` folder. At the end of some steps, we also include
+additional material on more advanced topics.
+
+其中每一步都被设计为自包含的文件夹, 相应名字为 `step_x`。 例如，如果您愿意跳过 `step 1` 到 `step 4` 的内容，可直接跳到 `step 5`，因为所有在 `step 5` 之前的代码均在在`step_5` 文件夹之下。在部分步骤结束时，我们还引入有关更高级主题的附加资料。
+
+Now let's get started!
+
+好了，我们现在开始！
+
+## Step 0: 安装 Move 开发环境<span id="Step0"><span> (Step 0: Installation)
+
+If you haven't already, open your terminal and clone [the Move repository](https://github.com/move-language/move):
+
+如果您还没有安装过 Move，首先打开命令终端(terminal) 并clone [Move代码库](https://github.com/move-language/move):
+
+```bash
+git clone https://github.com/move-language/move.git
+```
+
+Go to the `move` directory and run the `dev_setup.sh` script:
+
+进入到 `move` 文件夹下，执行 `dev_setup.sh` 脚本:
+
+```bash
+cd move
+./scripts/dev_setup.sh -ypt
+```
+
+Follow the script's prompts in order to install all of Move's dependencies.
+
+The script adds environment variable definitions to your `~/.profile` file.
+Include them by running this command:
+
+根据脚本命令的提示，按顺序安装 Move 的所有依赖项。
+脚本将会将(move命令所在路径)环境变量写入到 `~/.profile` 文件中。
+
+执行如下命令使环境变量生效：
+
+```bash
+source ~/.profile
+````
+
+Next, install Move's command-line tool by running this commands:
+
+然后执行如下命令来安装 Move 命令行工具：
+
+```bash
+cargo install --path language/tools/move-cli
+```
+
+You can check that it is working by running the following command:
+
+通过如下运行命令可以检查 move 命令是否可正常：
+
+```bash
+move --help
+```
+You should see something like this along with a list and description of a number of commands:
+
+您应该会看到类似这样的内容以及许多命令的列表和描述：
+
+```
+move-package
+Execute a package command. Executed in the current directory or the closest containing Move package
+
+USAGE:
+    move [OPTIONS] <SUBCOMMAND>
+
+OPTIONS:
+        --abi                          Generate ABIs for packages
+...
+```
+
+If you want to find what commands are available and what they do, running
+a command or subcommand with the `--help` flag will print documentation.
+
+如果想了解有支持哪引命令及其作用, 执行命令或子命令时添加 `--help` 标记，此时会打印帮助文档。
+
+Before running the next steps, `cd` to the tutorial directory:
+
+在执行下一步骤之前，请先执行 `cd` 命令进入到教程对应目录下:
+
+```bash
+cd <path_to_move>/language/documentation/tutorial
+```
+
+<details>
+
+<summary>Visual Studio Code Move 支持 (Visual Studio Code Move Support)</summary>
+
+There is official Move support for Visual Studio Code. You need to install
+the move analyzer first:
+
+Visual Studio Code 有正式的 Move 语言支持, 您需要先安装 `move analyzer` :
+
+```bash
+cargo install --path language/move-analyzer
+```
+
+Now you can install the VS extension by opening VS Code, searching for the "move-analyzer" in the Extension Pane, and installing it. More detailed instructions can be found
+in the extension's [README](https://github.com/move-language/move/tree/main/language/move-analyzer/editors/code).
+
+现在您可以打开 VS Code 并安装 Move 扩展插件了，在扩展页面下找到 `move-analyzer` 并安装即可。关于扩展的详细信息可以查看扩展的[README](https://github.com/move-language/move/tree/main/language/move-analyzer/editors/code)。
+</details>
+
+## Step 1: 编写第一个Move模块<span id="Step1"><span> (Writing my first Move module)
+
+Change directory into the [`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin) directory.
+You should see a directory called `sources` -- this is the place where all
+the Move code for this package lives. You should also see a
+`Move.toml` file as well. This file specifies dependencies and other information about
+the package; if you're familiar with Rust and Cargo, the `Move.toml` file
+is similar to the `Cargo.toml` file, and the `sources` directory similar to
+the `src` directory.
+
+切换当前目录到[`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin)下，您将看到 `sources` 子目录 -- 这个包(package)下所有的 Move 代码都在此目录中，同时您还会看到一个 `Move.toml` 文件。该文件指定当前包的依赖列表和其他信息。
+如果您熟悉 `Rust` 和 `Cargo`，那 `Move.toml` 文件类似 `Cargo.toml` 文件， `sources` 目录类似 `src` 目录(它们的作用是一样的)
+
+Let's take a look at some Move code! Open up
+[`sources/FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move) in
+your editor of choice. The first thing you'll see is this:
+
+来一起看看 Move 语言代码内容！ 用你的编辑器打开[`sources/FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move)文件，会看到如下内容：
+
+```
+// sources/FirstModule.move
+module 0xCAFE::BasicCoin {
+    ...
+}
+```
+
+This is defining a Move
+[module](https://move-language.github.io/move/modules-and-scripts.html). Modules are the
+building block of Move code, and are defined with a specific address -- the address that the module can be published under.
+In this case, the `BasicCoin` module can only be published under `0xCAFE`.
+
+这是一个 `Move` [module(模块)](./chpater_1_modules-and-scripts.html)的定义。
+模块是 Move 语言的代码块, 并且它使用指定的地址(address)进行定义 -- 模块只能在该地址下发布。
+当前 `BasicCoin` 模块只能被发布在 `0xCAFE` 地址下。
+
+Let's now take a look at the next part of this file where we define a [struct](https://move-language.github.io/move/structs-and-resources.html) to represent a `Coin` with a given `value`:
+
+再看这个文件的下一部分，这里定义了一个具有字段 `value` 的[结构体](./structs-and-resources.html) `Coin`：
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+    ...
+}
+```
+
+Looking at the rest of the file, we see a function definition that creates a `Coin` struct and stores it under an account:
+
+再看文件剩余部分，我们会看到一个函数，它会创建一个 `Coin` 结构体，并将其保存在某个账号(account)下：
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+}
+```
+
+Let's take a look at this function and what it's saying:
+* It takes a [`signer`](https://move-language.github.io/move/signer.html) -- an
+  unforgeable token that represents control over a particular address, and
+  a `value` to mint.
+* It creates a `Coin` with the given value and stores it under the
+  `account` using the `move_to` operator.
+
+Let's make sure it builds! This can be done with the `build` command from within the package folder ([`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/)):
+
+让我们来看看这个函数和它的含义:
+* 此函数需要一个[`signer`](./signer.html)参数 -- 表示不可伪造的 token 受此特定地址的控制; 和一个需要铸造的数量参数 `value`。
+* 此函数使用给定的参数值铸造一个 `Coin`，然后通过 `move_to` 操作将其保存在(全局存储中)给定的 `account` 账户下。
+
+我们需要确保它真的执行，这可以通过在包文件夹([`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/))下的运行 `build` 命令来完成：
+
+```bash
+move build
+```
+
+<details>
+
+<summary>进阶概念及参考引用 (Advanced concepts and references)</summary>
+
+* You can create an empty Move package by calling:
+    ```bash
+    move new <pkg_name>
+    ```
+* Move code can also live a number of other places.  More information on the
+  Move package system can be found in the [Move book](https://move-language.github.io/move/packages.html)
+* More information on the `Move.toml` file can be found in the [package section of the Move book](https://move-language.github.io/move/packages.html#movetoml).
+* Move also supports the idea of [named addresses](https://move-language.github.io/move/address.html#named-addresses), Named addresses are a way to parametrize Move source code so that you can compile the module using different values for `NamedAddr` to get different bytecode that you can deploy, depending on what address(es) you control. They are used quite frequently, and can be defined in the `Move.toml` file in the `[addresses]` section, e.g.,
+    ```
+    [addresses]
+    SomeNamedAddress = "0xC0FFEE"
+    ```
+
+* 你可以通过以下命令创建一个空的 Move 包(move package):
+    ```bash
+    move new <pkg_name>
+    ```
+* Move 代码也可以放在其他很多地方, 更多关于 Move 包系统的信息请参阅[Move book](./packages.html)
+* 更多关于 `Move.toml` 文件的信息可以参阅[package section of the Move book](./packages.html#movetoml).
+* Move语言也支持命名地址的概念([named addresses](./address.html#named-addresses)), 命名地址是一种参数化 Move 源代码的方法，
+  就是如果对 `NamedAddr` 使用的不同赋值编译，编译后会获得部署到你控制地址的不同字节码. 这种用法很常见，一般都将地址变量其定义在 `Move.toml` 文件
+  的 `[addresses]` 部分. 例如:
+    ```
+    [addresses]
+    SomeNamedAddress = "0xC0FFEE"
+    ```
+
+* [Structures](https://move-language.github.io/move/structs-and-resources.html) in Move can be given different
+  [abilities](https://move-language.github.io/move/abilities.html) that describe what can be done with that type. There are four different abilities:
+    - `copy`: Allows values of types with this ability to be copied.
+    - `drop`: Allows values of types with this ability to be popped/dropped.
+    - `store`: Allows values of types with this ability to exist inside a struct in global storage.
+    - `key`: Allows the type to serve as a key for global storage operations.
+
+    So in the `BasicCoin` module we are saying that the `Coin` struct can be used as a key
+    in global storage and, because it has no other abilities, it cannot be
+    copied, dropped, or stored as a non-key value in storage. So you can't copy
+    coins, and you also can't lose coins by accident!
+* [Functions](https://move-language.github.io/move/functions.html) are default
+    private, and can also be `public`,
+    [`public(friend)`](https://move-language.github.io/move/friends.html), or
+    `public(script)`. The last of these states that this function can be
+    called from a transaction script. `public(script)` functions can also be
+    called by other `public(script)` functions.
+* `move_to` is one of the [five different global storage operators](https://move-language.github.io/move/global-storage-operators.html).
+
+* Move [结构体](./chpater_16_structs-and-resources.html)可以通过给类型设定不同的能力[abilities](./chapter_19_abilities.html)让类型下支持对应的行为. 有四种能力:
+    - `copy`: 允许此类型的值被复制
+    - `drop`: 允许此类型的值被弹出/丢弃
+    - `store`: 允许此类型的值存在于全局存储的某个结构体中
+    - `key`: 允许此类型作为全局存储中的键(具有 `key` 能力的类型才能保存到全局存储中)
+
+    所以 `BasicCoin` 模块下的 `Coin` 结构体可以用作全局存储(global storage)的键(key)， 因为它又不具备其他能力，它不能
+    被拷贝，不能被丢弃, 也不能作为非key来保存在(全局)存储里. 你无法复制 `Coin`，也不会意外弄丢它.
+* 函数[Functions](./functions.html)默认是私有的(private), 也可以声明为 `public` [`public(friend)`](https://move-language.github.io/move/friends.html), `public(script)`. 最后一个声明(指 `public(script)`)的函数可以被事务脚本调用。`public(script)` 函数也可以被其他 `public(script)` 函数调用。(注意：在最新版本的 Move中，`public(script)` 已经被废弃，被`public entry` 取代，下同，译者注)
+* `move_to` 是[五种不同的全局存储操作](./global-storage-operators.html)之一
+
+</details>
+
+## Step 2: 给模块(Module)添加单元测试<span id="Step2"><span> (Adding unit tests to my first Move module)
+
+Now that we've taken a look at our first Move module, we'll take a look at a test to make sure minting works the way we expect it to by changing directory to [`step_2/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin).  Unit tests in Move are similar to unit tests in Rust if you're familiar with them -- tests are annotated with `#[test]` and written like normal Move functions.
+
+You can run the tests with the `move test` command: (原文是 `package test`，应该有误)
+
+现在我们已经完成了我们的第一个 Move 模块，我们将切换到目录[`step_2/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin)下并完成一个测试，确保铸币按我们预期的方式工作。
+如果你熟悉它们(Move 和 Rust)的话，Move 中的单元测试类似于 Rust 中的单元测试 —— 测试代码使用 `#[test]` 注解，并像编写普通的 Move 函数一样。
+
+可以通过 `move test` 命令来执行测试:
+
+```bash
+move test
+```
+
+Let's now take a look at the contents of the [`FirstModule.move`file](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move). The first new thing you'll
+see is this test:
+
+现在我们来完成文件[`FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move)的具体内容，你将看到的第一个新事项是这个测试:
+
+```
+module 0xCAFE::BasicCoin {
+    ...
+    // Declare a unit test. It takes a signer called `account` with an
+    // address value of `0xC0FFEE`.
+    #[test(account = @0xC0FFEE)]
+    fun test_mint_10(account: signer) acquires Coin {
+        let addr = signer::address_of(&account);
+        mint(account, 10);
+        // Make sure there is a `Coin` resource under `addr` with a value of `10`.
+        // We can access this resource and its value since we are in the
+        // same module that defined the `Coin` resource.
+        assert!(borrow_global<Coin>(addr).value == 10, 0);
+    }
+}
+```
+
+This is declaring a unit test called `test_mint_10` that mints a `Coin` struct under the `account` with a `value` of `10`. It is then checking that the minted
+coin in storage has the value that is expected with the `assert!` call. If the assertion fails the unit test will fail.
+
+这里声明了一个命名为 `test_mint_10` 的单元测试，它在 `account` 账户地址下铸造了一个包含 `value` 为 `10`的 `Coin`，然后通过 `assert!` 断言检查已经铸造成功并保存在(全局)存储中的 `Coin` 的值是否与期望值一致。如果断言 `assert` 执行失败，则单元测试失败。
+
+<details>
+
+<summary>进阶概念及参考练习 (Advanced concepts and exercises)</summary>
+
+* There are a number of test-related annotations that are worth exploring, they can be found
+  [here](https://github.com/move-language/move/blob/main/language/changes/4-unit-testing.md#testing-annotations-their-meaning-and-usage).
+  You'll see some of these used in Step 5.
+* Before running unit tests, you'll always need to add a dependency on the Move
+  standard library. This can be done by adding an entry to the `[dependencies]`
+  section of the `Move.toml`, e.g.,
+
+  ```toml
+  [dependencies]
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "Std" = "0x1" } }
+  ```
+
+  Note that you may need to alter the path to point to the `move-stdlib` directory under
+  `<path_to_move>/language`. You can also specify git dependencies. You can read more on Move
+  package dependencies [here](https://move-language.github.io/move/packages.html#movetoml).
+
+* 很多测试相关的注解(annotations)都值得仔细探索, 参阅[用法](https://github.com/move-language/move/blob/main/language/changes/4-unit-testing.md#testing-annotations-their-meaning-and-usage)。 在 `Step 5` 中会看到更多用法.
+
+* 执行测试之前，需要设定Move标准库依赖关系，找到 `Move.toml` 并在 `[dependencies]` 段内进行设定, 例如
+
+  ```toml
+  [dependencies]
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "Std" = "0x1" } }
+  ```
+注意, 需要修改 `<path_to_move>/language` 中的内容来匹配实际 `move-stdlib` 所在的目录路径. 也可以用 `git` 方式指定依赖, 关于 Move 包依赖(package denpendices)信息可参阅[package文档](./packages.html#movetoml)
+
+#### 练习 (Exercises)
+
+* Change the assertion to `11` so that the test fails. Find a flag that you can pass to the `move test` command that will show you the global state when the test fails. It should look something like this:
+
+* 将断言值改为 `11` 将导致断言执行失败, 找一个可以传递给 `move test` 命令的标志，当测试失败时它会显示全局状态。看起来像这样：
+  ```
+    ┌── test_mint_10 ──────
+    │ error[E11001]: test failure
+    │    ┌─ ./sources/FirstModule.move:24:9
+    │    │
+    │ 18 │     fun test_mint_10(account: signer) acquires Coin {
+    │    │         ------------ In this function in 0xcafe::BasicCoin
+    │    ·
+    │ 24 │         assert!(borrow_global<Coin>(addr).value == 11, 0);
+    │    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 0 here
+    │
+    │
+    │ ────── Storage state at point of failure ──────
+    │ 0xc0ffee:
+    │       => key 0xcafe::BasicCoin::Coin {
+    │           value: 10
+    │       }
+    │
+    └──────────────────
+  ```
+
+* Find a flag that allows you to gather test coverage information, and then play around with using the `move coverage` command to look at coverage statistics and source coverage.
+
+* 找一个允许您收集测试覆盖率信息的标志，然后使用 `move coverage` 命令查看覆盖率统计信息和源码覆盖率。
+
+</details>
+
+## Step 3: 设计 `BasicCoin` 模块(Module)<span id="Step3"><span> (Designing my `BasicCoin` module)
+
+In this section, we are going to design a module implementing a basic coin and balance interface, where coins can be minted and transferred between balances held under different addresses.
+
+在本节中，我们将设计一个具有基本代币和余额(balance)接口功能的模块，通过他们来实现币的挖矿铸造，不同地址之下钱包的转账。
+
+The signatures of the public Move function are the following:
+
+Move 语言的 `public function` 签名如下：
+
+```
+/// Publish an empty balance resource under `account`'s address. This function must be called before
+/// minting or transferring to the account.
+public fun publish_balance(account: &signer) { ... }
+
+/// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance { ... }
+
+/// Returns the balance of `owner`.
+public fun balance_of(owner: address): u64 acquires Balance { ... }
+
+/// Transfers `amount` of tokens from `from` to `to`.
+public fun transfer(from: &signer, to: address, amount: u64) acquires Balance { ... }
+```
+
+Next we look at the data structs we need for this module.
+
+接下来再看本模块所需要各数据结构.
+
+A Move module doesn't have its own storage. Instead, Move "global storage" (what we call our
+blockchain state) is indexed by addresses. Under each address there are Move modules (code) and Move resources (values).
+
+Move 语言的模块没有自己的数据存储，相反的是 Move 语言提供按地址(addresses) 索引的 **全局存储** (也是就是我们所说的区块链状态(blockchain state)).
+每个地址之下包含有 Move 模块(代码)和 Move 资源 (数据)。
+
+The global storage looks roughly like this in Rust syntax:
+
+在 Rust 语法中，全局存储看起来有点像这样：
+
+```rust
+struct GlobalStorage {
+    resources: Map<address, Map<ResourceType, ResourceValue>>
+    modules: Map<address, Map<ModuleName, ModuleBytecode>>
+}
+```
+
+The Move resource storage under each address is a map from types to values. (An observant reader might observe that this means each address can only have one value of each type.) This conveniently provides us a native mapping indexed by addresses.
+In our `BasicCoin` module, we define the following `Balance` resource representing the number of coins each address holds:
+
+每个地址下的 Move 资源存储是一个类型到数值的映射。(细心的读者也许已经注意到每个地址, 每个类型下只能对应一个具体值)。这方便地为我们提供了一个按地址索引的本地映射。
+在 `BasicCoin` 模块中，定义了每个 `Balance` (钱包，余额)资源表示每个地址下持有的币的数量：
+
+```
+/// Struct representing the balance of each address.
+struct Balance has key {
+    coin: Coin // same Coin from Step 1
+}
+```
+
+Roughly the Move blockchain state should look like this:
+
+区块链状态(`Move blockchain state`)看起来大致如下：
+
+![](https://raw.githubusercontent.com/move-language/move/main/language/documentation/tutorial/diagrams/move_state.png)
+
+#### 进阶主题 (Advanced topics) ：
+
+<summary><code>public(script)</code> functions</summary>
+
+Only functions with `public(script)` visibility can be invoked directly in transactions. So if you would like to call the `transfer` method directly from a transaction, you'll want to change its signature to:
+
+只有`public(script)`可见行的函数才能直接被交易调用，所以如果你要直接在交易内调用`transfer`方法，那么需要将函数签改成如下格式:
+
+```
+public(script) fun transfer(from: signer, to: address, amount: u64) acquires Balance { ... }
+```
+Read more on Move function visibilities [here](https://move-language.github.io/move/functions.html#visibility).
+
+关于函数可见性的更多信息，请参阅[Move function visibilities](./functions.html#visibility)。
+
+</details>
+<details>
+<summary>与 Ethereum/Solidity 的比较 (Comparison with Ethereum/Solidity)</summary>
+
+In most Ethereum [ERC-20]((https://ethereum.org/en/developers/docs/standards/tokens/erc-20/)) contracts, the balance of each address is stored in a _state variable_ of type <code>mapping(address => uint256)</code>. This state variable is stored in the storage of a particular smart contract.
+
+在大多数以太坊[ERC-20]((https://ethereum.org/en/developers/docs/standards/tokens/erc-20/))智能合约中，各个账户地址下的余额保存在类型为 <code>mapping(address => uint256)</code>的 __状态变量__ 中，此状态变量存储在具体的智能合约内部存储中。
+
+The Ethereum blockchain state might look like this:
+
+以太坊区块链的状态看起来大致如下:
+
+![](https://raw.githubusercontent.com/move-language/move/main/language/documentation/tutorial/diagrams/solidity_state.png)
+</details>
+
+## Step 4: 实现 `BasicCoin` 模块span id="Step4"><span> (Implementing my `BasicCoin` module)
+
+We have created a Move package for you in folder `step_4` called `BasicCoin`. The `sources` folder contains source code for all your Move modules in the package, including `BasicCoin.move`. In this section, we will take a closer look at the implementation of the methods inside [`BasicCoin.move`](https://github.com/move-language/move/blob/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move).
+
+我们已经在 `step_4` 文件夹上创建了名叫 `BasicCoin` 的 Move 包。`sources` 文件夹包含所有的 Move 包(package)的模块源码，包括 `BasicCoin.move`。 在本节中，我们将仔细研究[`BasicCoin.move`](https://github.com/move-language/move/blob/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move)内部方法的实现。
+
+### 编译代码 (Compiling our code)
+
+Let's first try building the code using Move package by running the following command in [`step_4/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin) folder:
+
+首先尝试在文件夹[`step_4/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin)中运行以下命令，使用 Move 包构建代码：
+
+```bash
+move build
+```
+
+### 方法的实现 (Implementation of methods)
+
+Now let's take a closer look at the implementation of the methods inside [`BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move).
+
+现在仔细看看[`BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move)中内部方法的实现。
+
+<details>
+
+<summary><code>publish_balance</code>方法 (Method <code>publish_balance</code>)</summary>
+
+This method publishes a `Balance` resource to a given address. Since this resource is needed to receive coins through minting or transferring, `publish_balance` method must be called by a user before they can receive money, including the module owner.
+
+此方法将 `Balance` 资源发布到指定地址名下。由于此资源需要通过铸造或转账来接收代币，必须由用户先调用方法 `publish_balance` 才能接收钱，包括模块所有者。
+
+This method uses a `move_to` operation to publish the resource:
+
+此方法使用 `move_to` 操作来发布资源：
+
+```
+let empty_coin = Coin { value: 0 };
+move_to(account, Balance { coin:  empty_coin });
+```
+
+</details>
+<details>
+
+<summary><code>mint</code>方法 (Method <code>mint</code>)</summary>）
+
+Here we require that `mint` must be approved by the module owner. We enforce this using the assert statement:
+`mint` method mints coins to a given account.
+
+`mint` 方法将代币铸造到指定的帐户。在此我们要求 `mint` 必须得到模块所有者的批准。我们使用 `assert` 语句强制执行此操作：
+
+```
+assert!(signer::address_of(&module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+```
+
+Assert statements in Move can be used in this way: `assert!(<predicate>, <abort_code>);`. This means that if the `<predicate>` is false, then abort the transaction with `<abort_code>`. Here `MODULE_OWNER` and `ENOT_MODULE_OWNER` are both constants defined at the beginning of the module. And `errors` module defines common error categories we can use.
+It is important to note that Move is transactional in its execution -- so if an [abort](https://move-language.github.io/move/abort-and-assert.html) is raised no unwinding of state needs to be performed, as no changes from that transaction will be persisted to the blockchain.
+
+Move 中的 `assert` 语句可以这样使用：`assert!(<predicate>, <abort_code>);`。这意味着如果 `<predicate>` 为假，则使用中止错误码 `<abort_code>` 来终止交易。此处的 `MODULE_OWNER` 和 `ENOT_MODULE_OWNER` 都是在模块开头定义的常量。`errors` 模块定义了我们可以使用的常见错误种类。重点是我们需要注意 Move 在其执行过程中是事务性的-- 因此，如果触发[中止(abort)](./chapter_12_abort-and-assert.html)，并不用回退已执行状态的，因为该事务的任何更改都不会持久保存到区块链。
+
+We then deposit a coin with value `amount` to the balance of `mint_addr`.
+
+然后将数量为 `amount` 的代币存入 `mint_addr` 的余额中。
+
+```
+deposit(mint_addr, Coin { value: amount });
+```
+</details>
+
+<details>
+
+<summary><code>balance_of</code>方法 (Method <code>balance_of</code>)</summary>
+
+We use `borrow_global`, one of the global storage operators, to read from the global storage.
+
+我们使用全局存储操作之一的 `borrow_global` 从全局存储中读取资源(数据)。
+
+```
+borrow_global<Balance>(owner).coin.value
+                 |       |       \    /
+        resource type  address  field names
+```
+</details>
+
+<details>
+
+<summary><code>transfer</code>方法 (Method <code>transfer</code>)</summary>
+
+This function withdraws tokens from `from`'s balance and deposits the tokens into `to`s balance. We take a closer look at `withdraw` helper function:
+
+该函数从 `from` 的余额中提取代币并将代币存入 `to` 的余额中。我们仔细研究帮助函数 `withdraw`：
+
+```
+fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+    let balance = balance_of(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin { value: amount }
+}
+```
+
+At the beginning of the method, we assert that the withdrawing account has enough balance. We then use `borrow_global_mut` to get a mutable reference to the global storage, and `&mut` is used to create a [mutable reference](https://move-language.github.io/move/references.html) to a field of a struct. We then modify the balance through this mutable reference and return a new coin with the withdrawn amount.
+
+在方法开始，我们断言提款账户有足够的余额。然后我们使用 `borrow_global_mut` 来获得全局存储的可变引用，并用 `&mut` 创建结构体字段的[可变引用](./references.html)。然后我们通过这个可变引用修改余额并返回一个带有提取金额的新代币。
+
+</details>
+
+### 练习 (Exercises)
+
+There are two `TODO`s in our module, left as exercises for the reader:
+- Finish implementing the `publish_balance` method.
+- Implement the `deposit` method.
+
+在模块中有两个 TODOs，留给读者练习：
+- 完成 `publish_balance` 方法的实现。
+- 实现 `deposit` 方法。
+
+The solution to this exercise can be found in [`step_4_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4_sol) folder.
+
+此练习的解决方案可以在[`step_4_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4_sol)文件夹中找到。
+
+**额外练习** (**Bonus exercise**)
+
+- What would happen if we deposit too many tokens to a balance?
+- 如果我们在余额中存入太多会发生什么？
+
+
+## Step 5: 在模块 `BasicCoin` 中添加和使用单元测试<span id="Step5"><span> (Adding and using unit tests with the `BasicCoin` module<span id="Step5"><span>)
+
+In this step we're going to take a look at all the different unit tests we've written to cover the code we wrote in step 4. We're also going to take a look at some tools we can use to help us write tests.
+
+在这一步中，来看看我们为覆盖在 `step 4` 中编写的代码而编写的所有不同的单元测试。还将看看我们可以用来帮助我们编写测试用例的一些工具。
+
+To get started, run the `move test` command in the [`step_5/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin) folder
+
+首先，请在文件夹 [`step_5/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin)中 运行 `move test` 命令。
+
+```bash
+move test
+```
+You should see something like this:
+
+您应该看到如下内容：
+
+```
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING BasicCoin
+Running Move unit tests
+[ PASS    ] 0xcafe::BasicCoin::can_withdraw_amount
+[ PASS    ] 0xcafe::BasicCoin::init_check_balance
+[ PASS    ] 0xcafe::BasicCoin::init_non_owner
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_already_exists
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_has_zero
+[ PASS    ] 0xcafe::BasicCoin::withdraw_dne
+[ PASS    ] 0xcafe::BasicCoin::withdraw_too_much
+Test result: OK. Total tests: 7; passed: 7; failed: 0
+```
+
+Taking a look at the tests in the [`BasicCoin` module](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move) we've tried to keep each unit test to testing one particular behavior.
+
+看看 [`BasicCoin` ](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move)模块中的测试，我们试图让每个单元测试都测试一个具体的行为。
+
+<details>
+<summary>Exercise (练习)</summary>
+
+After taking a look at the tests, try and write a unit test called `balance_of_dne` in the `BasicCoin` module that tests the case where a `Balance` resource doesn't exist under the address that `balance_of` is being called on. It should only be a couple lines!
+
+在查看测试之后，尝试在 `BasicCoin` 模块中编写一个单元测试 `balance_of_dne`，测试地址没有 `Balance` 资源的情况，调用 `balance_of` 方法的执行结果。它应该只有几行代码。
+
+The solution to this exercise can be found in [`step_5_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5_sol).
+
+练习的答案可以在[`step_5_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5_sol)中找到。
+
+</details>
+
+## Step 6: `BasicCoin` 模块泛型化<span id="Step6"><span>（Making my `BasicCoin` module generic<span id="Step6"><span>）
+
+In Move, we can use generics to define functions and structs over different input data types. Generics are a great building block for library code. In this section, we are going to make our simple `BasicCoin` module generic so that it can serve as a library module that can be used by other user modules.
+
+在 Move 语言中，我们可以使用泛型来定义不同输入数据类型的函数和结构体。泛型是库代码的重要组成部分。在本节中，我们将使我们的简单 `BasicCoin` 模块泛型化，以便它可以用作其他用户模块可以使用的模块库。
+
+First, we add type parameters to our data structs:
+
+首先，我们将类型参数添加到我们的数据结构中：
+
+```
+struct Coin<phantom CoinType> has store {
+    value: u64
+}
+
+struct Balance<phantom CoinType> has key {
+    coin: Coin<CoinType>
+}
+```
+
+We also add type parameters to our methods in the same manner. For example, `withdraw` becomes the following:
+
+我们还以相同的方式将类型参数添加到我们的方法中。例如，`withdraw` 变成如下：
+
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+    let balance = balance_of<CoinType>(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin<CoinType> { value: amount }
+}
+```
+
+Take a look at [`step_6/BasicCoin/sources/BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move) to see the full implementation.
+
+查看[`step_6/BasicCoin/sources/BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move)完整的实现。
+
+At this point, readers who are familiar with Ethereum might notice that this module serves a similar purpose as the [ERC20 token standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/), which provides an interface for implementing fungible tokens in smart contracts. One key advantage of using generics is the ability to reuse code since the generic library module already provides a standard implementation and the instantiating module can provide customizations by wrapping the standard implementation.
+
+此时，熟悉以太坊的读者可能会注意到，该模块的用途与[ERC20 token standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/)类似，后者提供了在智能合约中实现可替代代币的接口。使用泛型的一个关键优势是能够重用代码，因为泛型模块库已经提供了标准实现，并且实例化模块可以通过包装标准实现提供定制化功能。
+
+We provide a little module called [`MyOddCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move) that instantiates the `Coin` type and customizes its transfer policy: only odd number of coins can be transferred. We also include two [tests](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move) to test this behavior. You can use the commands you learned in step 2 and step 5 to run the tests.
+
+我们提供了一个称为[`MyOddCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move)并实例化 `Coin` 类型并自定义其转移策略的小模块：只能转移奇数个代币。其还包括两个 [tests](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move)来测试这种行为。您可以使用在第 2 步和第 5 步中学到的命令来运行测试。
+
+
+#### 进阶主题 (Advanced topics):
+
+<details>
+
+<summary><code>phantom</code> 类型参数 (<code>phantom</code> type parameters)</summary>
+
+In definitions of both `Coin` and `Balance`, we declare the type parameter `CoinType` to be phantom because `CoinType` is not used in the struct definition or is only used as a phantom type parameter.
+
+在 `Coin` 和 `Balance `的定义中，我们将类型参数 `CoinType` 声明为phantom，因为 `CoinType` 没有在结构体定义中使用或仅用作 phantom 类型参数。
+
+Read more about phantom type parameters <a href="https://move-language.github.io/move/generics.html#phantom-type-parameters">here</a>.
+
+阅读更多有关 [phantom 类型参数](./generics.md#phantom-type-parameters) 信息.
+
+</details>
+
+## 进阶步骤 (Advanced steps)
+
+Before moving on to the next steps, let's make sure you have all the prover dependencies installed.
+
+在继续下一步之前，确保您已安装所有的验证器依赖项。
+
+Try running `boogie /version `. If an error message shows up saying "command not found: boogie", you will have to run the setup script and source your profile:
+
+尝试运行 `boogie /version` 。如果出现错误消息“找不到命令：boogie”，您将必须运行安装脚本并更新环境配置(`source ~/.profile`)：
+
+```bash
+# run the following in move repo root directory
+./scripts/dev_setup.sh -yp
+source ~/.profile
+```
+
+## Step 7:  使用Move验证器<span id="Step7"><span>（Use the Move prover<span id="Step7"><span>）
+
+Smart contracts deployed on the blockchain may manipulate high-value assets. As a technique that uses strict mathematical methods to describe behavior and reason correctness of computer systems, formal verification has been used in blockchains to prevent bugs in smart contracts. [The Move prover](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md) is an evolving formal verification tool for smart contracts written in the Move language. The user can specify functional properties of smart contracts using the [Move Specification Language (MSL)](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) and then use the prover to automatically check them statically. To illustrate how the prover is used, we have added the following code snippet to the [BasicCoin.move](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move):
+
+部署在区块链上的智能合约可能会操纵高价值资产。作为一种使用严格的数学方式来描述计算机系统的行为和推理正确性的技术，形式化验证已被用于区块链，以防止智能合约中错误的产生。 [Move验证器](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)是一种在进化中、用Move 语言编写的智能合约形式化验证工具。用户可以使用[Move语言规范(Move Specification Language (MSL))](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md)指定智能合约的功能属性，然后使用验证器自动静态检查它们。
+为了说明如何使用验证器，我们在[BasicCoin.move](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move)中添加了以下代码片段：
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+    }
+```
+
+Informally speaking, the block `spec balance_of {...}` contains the property specification of the method `balance_of`.
+
+通俗地说，代码块 `spec balance_of {...}` 包含 `balance_of` 方法的属性规范说明。
+
+Let's first run the prover using the following command inside [`BasicCoin` directory](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/):
+
+首先在[`BasicCoin` directory](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/)目录中使用以下命令运行验证器。
+
+```bash
+move prove
+```
+
+which outputs the following error information:
+
+它输出以下错误信息：
+
+```
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ ./sources/BasicCoin.move:38:5
+   │
+35 │           borrow_global<Balance<CoinType>>(owner).coin.value
+   │           ------------- 由于执行失败这里发生中止
+   ·
+38 │ ╭     spec balance_of {
+39 │ │         pragma aborts_if_is_strict;
+40 │ │     }
+   │ ╰─────^
+   │
+   =     at ./sources/BasicCoin.move:34: balance_of
+   =         owner = 0x29
+   =     at ./sources/BasicCoin.move:35: balance_of
+   =         中止
+
+Error: exiting with verification errors
+```
+
+The prover basically tells us that we need to explicitly specify the condition under which the function `balance_of` will abort, which is caused by calling the function `borrow_global` when `owner` does not own the resource `Balance<CoinType>`. To remove this error information, we add an `aborts_if` condition as follows:
+
+验证器大体上告诉我们，我们需要明确指定函数 `balance_of` 中止的条件，中止原因是 `owner`(函数调用者)在没有资源 `Balance<CoinType>` 的情况下调用 `borrow_global` 函数导致的。要去掉此错误信息，我们添加如下 `aborts_if` 条件：
+
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+```
+
+After adding this condition, try running the `prove` command again to confirm that there are no verification errors:
+
+添加此条件后，再次尝试运行prove命令，确认没有验证错误：
+
+```bash
+move prove
+```
+
+Apart from the abort condition, we also want to define the functional properties. In Step 8, we will give more detailed introduction to the prover by specifying properties for the methods defined the `BasicCoin` module.
+
+除了中止条件，我们还想定义功能属性。在第 8 步中，我们将通过为定义 `BasicCoin` 模块的方法指定属性来更详细地介绍验证器。
+
+
+## 第 8 步：为 `BasicCoin` 模块编写正式规范<span id="Step8"><span>（Write formal specifications for the `BasicCoin` module）<span id="Step8"><span>
+
+<details>
+
+<summary> 取款方法 (Method withdraw) </summary>
+
+The signature of the method `withdraw` is given below:
+
+ 取款(`withdraw`) 方法的签名如下：
+
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance
+```
+
+The method withdraws tokens with value `amount` from the address `addr` and returns a created Coin of value `amount`.  The method `withdraw` aborts when 1) `addr` does not have the resource `Balance<CoinType>` or 2) the number of tokens in `addr` is smaller than `amount`. We can define conditions like this:
+
+该方法从地址 `addr` 中提取数量为 `amount` 的代币，然后创建数量为 `amount` 的代币并将其返回。当出现如下情况会中止：
+  1) 地址 `addr` 没有资源 `Balance<CoinType>`，或
+  2) 地址 `addr` 中的代币数量小于 `amount` 时，`withdraw` 。
+
+我们可以这样定义条件：
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+    }
+```
+
+As we can see here, a spec block can contain let bindings which introduce names for expressions. `global<T>(address): T` is a built-in function that returns the resource value at `addr`. `balance` is the number of tokens owned by `addr`. `exists<T>(address): bool` is a built-in function that returns true if the resource T exists at address. Two `aborts_if` clauses correspond to the two conditions mentioned above. In general, if a function has more than one `aborts_if` condition, those conditions are or-ed with each other. By default, if a user wants to specify aborts conditions, all possible conditions need to be listed. Otherwise, the prover will generate a verification error. However, if `pragma aborts_if_is_partial` is defined in the spec block, the combined aborts condition (the or-ed individual conditions) only *imply* that the function aborts. The reader can refer to the [MSL](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) document for more information.
+
+正如我们在这里看到的，一个 spec 块可以包含 `let` 绑定，它为表达式引入名称。
+`global<T>(address): T` 是一个返回 `addr` 资源值的内置函数。`balance` 是 `addr` 拥有的代币数量。
+`exists<T>(address): bool` 是一个内置函数，如果指定的地址(address)在(全局存储中)有资源 `T` 则返回 `true` 。
+两个 `aborts_if` 子句对应上述两个条件。通常，如果一个函数有多个 `aborts_if` 条件，这些条件之间是相互对等的。默认情况下，如果用户想要指定中止条件，则需要列出所有可能的条件。否则验证器将产生验证错误。
+但是，如果在 `spec` 代码块中定义了 `pragma aborts_if_is_partial`，则组合中止条件（或对等的单个条件）仅 *暗示* 函数中止。
+读者可以参考 [MSL](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) 文档了解更多信息。
+
+The next step is to define functional properties, which are described in the two `ensures` clauses below. First, by using the `let post` binding, `balance_post` represents the balance of `addr` after the execution, which should be equal to `balance - amount`. Then, the return value (denoted as `result`) should be a coin with value `amount`.
+
+下一步是定义功能属性，这些属性在下面的两个 `ensures` 子句中进行了描述。首先，通过使用 `let post` 绑定，`balance_post` 表示地址 `addr` 执行后的余额，应该等于 `balance - amount`。那么，返回值（表示为 `result` ）应该是一个价值为 `amount` 的代币。
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance - amount;
+        ensures result == Coin<CoinType> { value: amount };
+    }
+```
+</details>
+
+<details>
+
+<summary> 存款方法 (Method deposit) </summary>
+
+The signature of the method `deposit` is given below:
+
+存款(`deposit`)方法的签名如下：
+
+```
+fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance
+```
+
+The method deposits the `check` into `addr`. The specification is defined below:
+
+该方法将代币 `check` 存入地址 `addr`. 规范定义如下：
+
+```
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+```
+
+`balance` represents the number of tokens in `addr` before execution and `check_value` represents the number of tokens to be deposited. The method would abort if 1) `addr` does not have the resource `Balance<CoinType>` or 2) the sum of `balance` and `check_value` is greater than the maxium value of the type `u64`. The functional property checks that the balance is correctly updated after the execution.
+
+`balance` 表示 `addr` 执行前的代币数量，`check_value` 表示要存入的代币数量。方法出现如下情况将会中止：
+    1) 地址 `addr` 没有 `Balance<CoinType>` 资源， 或
+    2) `balance` 与 `check_value` 之和大于 `u64` 的最大值。
+
+该功能属性检查执行后余额是否正确更新。
+
+
+</details>
+
+<details>
+
+<summary> 转账方法 (Method transfer) </summary>
+
+The signature of the method `transfer` is given below:
+
+转账(`transfer`)方法的签名如下：
+
+```
+public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance
+```
+
+The method transfers the `amount` of coin from the account of `from` to the address `to`. The specification is given below:
+
+该方法将数量为 `amount` 的代币从帐户 `from` 转账给地址 `to`。规范如下：
+
+```
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+```
+
+`addr_from` is the address of `from`. Then the balances of `addr_from` and `to` before and after the execution are obtained.
+The `ensures` clauses specify that the `amount` number of tokens is deducted from `addr_from` and added to `to`. However, the prover will generate the error information as below:
+
+`addr_from` 是账户 `from` 的地址，然后获取执行前两个地址 `addr_from` 和 `to` 的余额。
+ `ensures` 子句指定从 `addr_from` 减去 `amount` 数量的代币，添加到 `to`。然而，验证器会生成以下错误：
+
+```
+error: post-condition does not hold
+   ┌─ ./sources/BasicCoin.move:57:9
+   │
+62 │         ensures balance_from_post == balance_from - amount;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   ...
+```
+
+The property is not held when `addr_from` is equal to `to`. As a result, we could add an assertion `assert!(from_addr != to)` in the method to make sure that `addr_from` is not equal to `to`.
+
+当 `addr_from` 等于 `to` 时，这个属性无效。因此，我们可以在方法中添加一个断言，`assert!(from_addr != to)` 来确保 `addr_from` 不等于 `to`。
+
+</details>
+
+
+<details>
+
+<summary> 练习 (Exercises) </summary>
+
+- Implement the `aborts_if` conditions for the `transfer` method.
+- 为` transfer` 方法实现 `aborts_if` 条件。
+- Implement the specification for the `mint` and `publish_balance` method.
+- 为 `mint` 和 `publish_balance` 方法实现规范。
+
+The solution to this exercise can be found in [`step_8_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_8_sol).
+
+练习的解答可以在 [`step_8_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_8_sol)中找到。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/overview.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/overview.md
new file mode 100644
index 000000000..d08bf4352
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/overview.md
@@ -0,0 +1,200 @@
+---
+id: overview
+title: Overview
+sidebar_label: Move
+---
+
+Move is a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+### Start Here
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/introduction-to-move.svg"
+    iconDark="img/introduction-to-move-dark.svg"
+    overlay="Understand Move’s background, current status and architecture"
+    title="Introduction"
+    to="/docs/move/move-introduction"
+  />
+  <SimpleTextCard
+    icon="img/modules-and-scripts.svg"
+    iconDark="img/modules-and-scripts-dark.svg"
+    overlay="Understand Move’s two different types of programs: Modules and Scripts"
+    title="Modules and Scripts"
+    to="/docs/move/move-modules-and-scripts"
+  />
+  <SimpleTextCard
+    icon="img/placeholder.svg"
+    iconDark="img/placeholder-dark.svg"
+    overlay="Play with Move directly as you create coins with the language"
+    title="First Tutorial: Creating Coins"
+    to="/docs/move/move-tutorial-creating-coins"
+  />
+</CardsWrapper>
+
+### Primitive Types
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="Move supports three unsigned integer types: u8, u64, and u128"
+    title="Integers"
+    to="/docs/move/move-integers"
+  />
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="bool is Move's primitive type for boolean true and false values."
+    title="Bool"
+    to="/docs/move/move-bool"
+  />
+  <SimpleTextCard
+    icon="img/address.svg"
+    iconDark="img/address-dark.svg"
+    overlay="address is a built-in type in Move that is used to represent locations in global storage"
+    title="Address"
+    to="/docs/move/move-address"
+  />
+  <SimpleTextCard
+    icon="img/vector.svg"
+    iconDark="img/vector-dark.svg"
+    overlay="vector<T> is the only primitive collection type provided by Move"
+    title="Vector"
+    to="/docs/move/move-vector"
+  />
+  <SimpleTextCard
+    icon="img/signer.svg"
+    iconDark="img/signer-dark.svg"
+    overlay="signer is a built-in Move resource type. A signer is a capability that allows the holder to act on behalf of a particular address"
+    title="Signer"
+    to="/docs/move/move-signer"
+  />
+  <SimpleTextCard
+    icon="img/move-references.svg"
+    iconDark="img/move-references-dark.svg"
+    overlay="Move has two types of references: immutable & and mutable &mut"
+    title="References"
+    to="/docs/move/move-references"
+  />
+  <SimpleTextCard
+    icon="img/tuples.svg"
+    iconDark="img/tuples-dark.svg"
+    overlay="In order to support multiple return values, Move has tuple-like expressions. We can consider unit() to be an empty tuple"
+    title="Tuples and Unit"
+    to="/docs/move/move-tuples-and-unit"
+  />
+</CardsWrapper>
+
+### Basic Concepts
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/local-variables-and-scopes.svg"
+    iconDark="img/local-variables-and-scopes-dark.svg"
+    overlay="Local variables in Move are lexically (statically) scoped"
+    title="Local Variables and Scopes"
+    to="/docs/move/move-variables"
+  />
+  <SimpleTextCard
+    icon="img/abort-and-return.svg"
+    iconDark="img/abort-and-return-dark.svg"
+    overlay="return and abort are two control flow constructs that end execution, one for the current function and one for the entire transaction"
+    title="Abort & Assert"
+    to="/docs/move/move-abort-and-assert"
+  />
+  <SimpleTextCard
+    icon="img/conditionals.svg"
+    iconDark="img/conditionals-dark.svg"
+    overlay="An if expression specifies that some code should only be evaluated if a certain condition is true"
+    title="Conditionals"
+    to="/docs/move/move-conditionals"
+  />
+  <SimpleTextCard
+    icon="img/loops.svg"
+    iconDark="img/loops-dark.svg"
+    overlay="Move offers two constructs for looping: while and loop"
+    title="While and Loop"
+    to="/docs/move/move-while-and-loop"
+  />
+  <SimpleTextCard
+    icon="img/functions.svg"
+    iconDark="img/functions-dark.svg"
+    overlay="Function syntax in Move is shared between module functions and script functions"
+    title="Functions"
+    to="/docs/move/move-functions"
+  />
+  <SimpleTextCard
+    icon="img/structs-and-resources.svg"
+    iconDark="img/structs-and-resources-dark.svg"
+    overlay="A struct is a user-defined data structure containing typed fields. A resource is a kind of struct that cannot be copied and cannot be dropped"
+    title="Structs and Resources"
+    to="/docs/move/move-structs-and-resources"
+  />
+  <SimpleTextCard
+    icon="img/constants.svg"
+    iconDark="img/constants-dark.svg"
+    overlay="Constants are a way of giving a name to shared, static values inside of a module or script"
+    title="Constants"
+    to="/docs/move/move-constants"
+  />
+  <SimpleTextCard
+    icon="img/generics.svg"
+    iconDark="img/generics-dark.svg"
+    overlay="Generics can be used to define functions and structs over different input data types"
+    title="Generics"
+    to="/docs/move/move-generics"
+  />
+  <SimpleTextCard
+    icon="img/equality.svg"
+    iconDark="img/equality-dark.svg"
+    overlay="Move supports two equality operations == and !="
+    title="Equality"
+    to="/docs/move/move-equality"
+  />
+  <SimpleTextCard
+    icon="img/uses-and-aliases.svg"
+    iconDark="img/uses-and-aliases-dark.svg"
+    overlay="The use syntax can be used to create aliases to members in other modules"
+    title="Uses & Aliases"
+    to="/docs/move/move-uses-and-aliases"
+  />
+</CardsWrapper>
+
+### Global Storage
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="The purpose of Move programs is to read from and write to persistent global storage"
+    title="Global Storage Structure"
+    to="/docs/move/move-global-storage-structure"
+  />
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="Move programs can create, delete, and update resources in global storage using five instructions"
+    title="Global Storage Operators"
+    to="/docs/move/move-global-storage-operators"
+  />
+</CardsWrapper>
+
+### Reference
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/standard-library.svg"
+    iconDark="img/standard-library-dark.svg"
+    overlay="The Move standard library exposes interfaces that implement functionality on vectors, option types, error codes and fixed-point numbers"
+    title="Standard Library"
+    to="/docs/move/move-standard-library"
+  />
+  <SimpleTextCard
+    icon="img/coding-conventions.svg"
+    iconDark="img/coding-conventions-dark.svg"
+    overlay="There are basic coding conventions when writing Move code"
+    title="Coding Conventions"
+    to="/docs/move/move-coding-conventions"
+  />
+</CardsWrapper>
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/packages.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/packages.md
new file mode 100644
index 000000000..4ab185d12
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/packages.md
@@ -0,0 +1,348 @@
+# 程序包(packages)
+
+Packages allow Move programmers to more easily re-use code and share it
+across projects. The Move package system allows programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by [named addresses](./address.md);
+* Import and use packages in other Move code and instantiate named addresses;
+* Build packages and generate associated compilation artifacts from packages; and
+* Work with a common interface around compiled Move artifacts.
+
+包允许 `Move` 程序员更轻松地重用代码并在项目之间共享。`Move` 包系统允许程序员轻松地：
+* 定义一个包含 `Move`代码的包；
+* 通过命名地址参数化包；
+* 在其他 `Move` 代码中导入和使用包并实例化命名地址；
+* 构建包并从包中生成相关的编译源代码；
+* 使用围绕已编译 `Move` 工件的通用接口。
+
+## 包布局和清单语法（Package Layout and Manifest Syntax）
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+`Move` 包源目录包含一个`Move.toml`包清单文件以及一组子目录：
+
+```
+     a_move_package
+        ├── Move.toml      (required)（需要的）
+        ├── sources        (required)（需要的）
+        ├── examples       (optional, test & dev mode)（可选的，测试 & 开发者模式）
+        ├── scripts        (optional)（可选的）
+        ├── doc_templates  (optional)（可选的）
+        └── tests          (optional, test mode)（可选的，测试模式）
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+标记为`required` 的目录必须存在才可以将该目录作为 `Move` 包并进行编译。可选目录被视为可存在的，如果存在，将包含在编译过程里。根据使用 （`test`或`dev`）构建包的模式，`tests`和`examples` 目录也将包含在内。
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+`sources`目录可以包含 `Move` 模块和 `Move` 脚本（事务脚本和包含脚本函数的模块）。`Example`目录可以保留仅用于开发和/或用作教程目的附加代码，当在 `test` 或者`dev`模式之外时，这些附加代码编译时不会被包括进来。
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any documentation templates present in
+the `doc_templates` directory.
+
+`scripts`目录是被支持的，如果包作者需要，事物脚本可以从模块中分离。如果该`scripts`目录存在，则编译时将始终包含该目录。
+Move将使用存在于`doc_templates` 目录的任何模板构建文档。
+
+
+### 包清单 Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+Move 包清单在`Move.toml`文件中定义，并具有以下语法。可选字段标有`*`，`+`表示一个或多个元素：
+```
+    [package]
+    name = <string>                  # e.g., "MoveStdlib"
+    version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+    license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+    authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+    [addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+    # One or more lines declaring named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+    # One or more lines declaring dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # local dependencies
+    <string> = { git = <URL ending in .git>, subdir=<path to dir containing Move.toml inside git repo>, rev=<git commit hash>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # git dependencies
+
+    [dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+An example of a minimal package manifest with one local dependency and one git dependency:
+
+一个具有局部依赖项和一个 git 依赖项的最小包清单示例：
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+一个包括 Move 标准库并从中使用地址值`0x1`实例化命名地址`Std`的更标准的包清单示例：
+
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+    license = "Apache 2.0"
+
+    [addresses]
+    address_to_be_filled_in = "_"
+    specified_address = "0xB0B"
+
+    [dependencies]
+    # Local dependency
+    LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
+    # Git dependency
+    MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b" }
+
+    [dev-addresses] # For use when developing this module
+    address_to_be_filled_in = "0x101010101"
+  ```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+包清单中的大部分段落都是不言自明的，但命名地址可能有点难以理解，因此值得更详细地检查它们。
+
+## 编译期间的命名地址（Named Addresses During Compilation）
+
+Recall that Move has [named addresses](./address.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+回想一下，Move 具有命名地址，并且不能在 Move 中声明命名地址。正因为如此，到目前为止，命名地址及其值都需要在命令行上传递给编译器。但使用 Move 包系统时这将不再需要，您可以在包中声明命名地址，实例化范围内的其他命名地址，并从 Move 包系统清单文件中的其他包重命名命名地址，让我们分别来看看这些:
+
+### 声明（Declaration）
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
+假设我们有一个Move模块，`example_pkg/sources/A.move`如下所示:
+
+```move
+    module named_addr::A {
+        public fun x(): address { @named_addr }
+    }
+```
+
+We could in `example_pkg/Move.toml` declare the named address `named_addr` in
+two different ways. The first:
+
+我们可以用两种不同`example_pkg/Move.toml`的方式声明命名地址`named_addr`。首先：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "_"
+```
+
+Declares `named_addr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `named_addr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `named_addr`, and the package can then be
+instantiated later on by an importing package.
+
+声明`named_addr`为包`ExamplePkg`中的命名地址，并且 _该地址可以是任何有效的地址值_。因此，导入包可以选择命名地址的值作为`named_addr`它希望的任何地址。直观地，您可以将其视为通过命名地址`named_addr`参数化包 `ExamplePkg`，然后稍后通过导入包使包被实例化。
+
+`named_addr` can also be declared as:
+
+`named_addr`也可以声明为：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "0xCAFE"
+```
+
+which states that the named address `named_addr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+这表明命名的地址`named_addr`是准确的`0xCAFE`并且不能更改。这很有用，因此其他导入包可以使用这个命名地址，而无需担心分配给它的确切值。
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+使用这两种不同的声明方法，有关命名地址的信息可以通过两种方式在包图中流动：
+*  前者（“未分配的命名地址”）允许命名地址值从进口站点流向申报站点。
+*  后者（“分配的命名地址”）允许命名地址值从包图中的声明站点向上流动到使用站点。
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+通过这两种在整个包图中流动命名地址信息的方法，了解范围和重命名的规则变得很重要。
+
+## 命名地址的作用域和重命名（Scoping and Renaming of Named Addresses）
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+在包`P`中的命名地址`N`如果满足以下条件，则在作用域内：
+
+ 1. 它声明了一个命名地址`N`；或者
+ 2. `P`的传递依赖项之一中的包声明了命名地址`N`，并且封装图在`P`和没有重命名的声明包`N`之间有一个依赖路径。
+
+ Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `named_addr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+ 此外，包中的每个命名地址都会被导出。由于这个和上面的范围规则，每个包都可以被视为带有一组命名地址，当包被导入时，这些地址将被带入作用域，例如，如果包`ExamplePkg`被导入，则该导入会将命名地址`named_addr`带入作用域。 因此，如果`P`导入两个包`P1`并且`P2`都声明了一个命名地址`N`，在`P`中则会出现以下问题：当`N`被引用于`P`时我们指的是哪个`N`？来自`P1`或来自`P2`的`N`？ 为了防止命名地址来自哪个包的这种歧义，我们强制一个包中所有依赖项引入的范围集是不相交的，并提供一种在将命名地址带入范围的包被导入时重命名命名地址的方法。
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+导入时重命名一个命名地址可以在我们的`P`,`P1`和`P2`上面的示例中完成：
+```
+    [package]
+    name = "P"
+    ...
+    [dependencies]
+    P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+    P2 = { local = "some_path_to_P2"  }
+```
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+这种重命名`N`指的是`P2`中的`N`并且`P1N`将指 `P1`中的`N`：
+```
+    module N::A {
+        public fun x(): address { @P1N }
+    }
+```
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+重要的是要注意 _重命名不是局部的_：一旦一个命名地址`N`在一个包`P`中被重命名为`N2`，所有导入`P`的包都不会看到`N`但只会看到`N2`，除非`N`是从`P`外引入的。这就是为什么本节开头的范围规则中的规则 (2) 特别说明了“在`P`和没有重命名的声明包`N` 的封装图中的依赖路径” 。
+
+### 实例化（Instantiation）
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+只要命名地址始终具有相同的值，就可以在封装图中多次实例化命名地址。如果在整个封装图中使用不同的值实例化相同的命名地址（无论是否重命名），则会出现错误。
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `named_addr` would be uninstantiated:
+
+只有当所有命名地址都解析为一个值时，才能编译 Move 包。如果包希望公开未实例化的命名地址，则会出现问题。这就是`[dev-addresses]`段要解决的问题。此段可以设置命名地址的值，但不能引入任何命名地址。此外， `dev`模式下仅根包中的`[dev-addresses]`会被包括进来。例如，具有以下清单的根包将不会在`dev`模式之外编译，因为`named_addr`不会被实例化：
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+
+[dev-addresses]
+named_addr = "0xC0FFEE"
+```
+## 用法、源代码和数据结构（ Usage, Artifacts, and Data Structures）
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+Move 软件包系统带有一个命令行选项，作为 Move CLI 的一部分move `<flags> <command>` `<command_flags>`。除非提供特定路径，否则所有包命令都将在当前工作目录中运行。可以通过运行`move --help`找到 Move CLI 的命令和标志的完整列表。
+
+### 用法（Usage）
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+一个包可以通过 Move CLI 命令，或是当作Rust函数`compile_package`的库命令来编译。 这种编译方法将创建一个编译包`CompiledPackage` 保存已编译的字节码以及其他编译内存中的源代码（源映射、文档、ABIs）。这个`CompiledPackage`可以转换为`OnDiskPackage`，反之亦然——后者是文件系统中的编译包 `CompiledPackage`数据，它的格式如下：
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
+
+有关这些数据结构和如何将 Move 包系统用作 Rust 库的更多信息，请参阅 `move-package` 箱（crate） 。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/references.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/references.md
new file mode 100644
index 000000000..2a23f0cb2
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/references.md
@@ -0,0 +1,289 @@
+# 引用(references)
+
+Move has two types of references: immutable `&` and mutable `&mut`. Immutable references are read
+only, and cannot modify the underlying value (or any of its fields). Mutable references allow for
+modifications via a write through that reference. Move's type system enforces an ownership
+discipline that prevents reference errors.
+
+Move 支持两种类型的引用：不可变引用 `&` 和可变引用 `&mut`。不可变引用是只读的，不能修改相关值(或其任何字段)。可变引用通过写入该引用进行修改。Move的类型系统强制执行所有权规则，以避免引用错误。
+
+For more details on the rules of references, see [Structs and Resources](./structs-and-resources.md)
+
+更多有关引用规则的详细信息，请参阅：[结构和资源](./structs-and-resources.html).
+
+## 引用运算符 (Reference Operators)
+
+Move provides operators for creating and extending references as well as converting a mutable
+reference to an immutable one. Here and elsewhere, we use the notation `e: T` for "expression `e`
+has type `T`".
+
+Move 提供了用于创建和扩展引用以及将可变引用转换为不可变引用的运算符。在这里和其他地方，我们使用符号 `e: T` 来表示“表达式 `e` 的类型是 `T` ”
+
+| Syntax      | Type                                                  | Description                                                    |
+| ----------- | ----------------------------------------------------- | -------------------------------------------------------------- |
+| `&e`        | `&T` where `e: T` and `T` is a non-reference type     | Create an immutable reference to `e`                           |
+| `&mut e`    | `&mut T` where `e: T` and `T` is a non-reference type | Create a mutable reference to `e`.                             |
+| `&e.f`      | `&T` where `e.f: T`                                   | Create an immutable reference to field `f` of struct `e`.      |
+| `&mut e.f`  | `&mut T` where `e.f: T`                               | Create a mutable reference to field `f` of struct`e`.          |
+| `freeze(e)` | `&T` where `e: &mut T`                                | Convert the mutable reference `e` into an immutable reference. |
+
+| 语法 | 类型 | 描述 |
+| ------      | ------ |------ |
+| `&e`        | `&T` 其中 `e: T` 和 `T` 是非引用类型      | 创建一个不可变的引用 `e`
+| `&mut e`    | `&mut T` 其中 `e: T` 和 `T` 是非引用类型  | 创建一个可变的引用 `e`
+| `&e.f`      | `&T` 其中 `e.f: T`                       | 创建结构 `e` 的字段 `f` 的不可变引用
+| `&mut e.f`  | `&mut T` 其中`e.f: T`                    | 创建结构 `e` 的字段 `f` 的可变引用
+| `freeze(e)` | `&T` 其中`e: &mut T`                     | 将可变引用 `e` 转换为不可变引用
+
+The `&e.f` and `&mut e.f` operators can be used both to create a new reference into a struct or to extend an existing reference:
+
+`&e.f`和`&mut e.f`运算符既可以用于在结构中创建新引用，也可以用于扩展现有引用：
+
+```move
+let s = S { f: 10 };
+let f_ref1: &u64 = &s.f; // works
+let s_ref: &S = &s;
+let f_ref2: &u64 = &s_ref.f // also works
+```
+
+A reference expression with multiple fields works as long as both structs are in the same module:
+
+只要两个结构都在同一个模块中，具有多个字段的引用表达式就可以工作：
+
+```move
+struct A { b: B }
+struct B { c : u64 }
+fun f(a: &A): &u64 {
+  &a.b.c
+}
+```
+
+Finally, note that references to references are not allowed:
+
+最后，请注意，不允许引用"引用"(Move不支持多重引用, 但Rust可以，译者注)：
+
+```move
+let x = 7;
+let y: &u64 = &x;
+let z: &&u64 = &y; // will not compile
+```
+
+## 通过引用读取和写入
+
+Both mutable and immutable references can be read to produce a copy of the referenced value.
+
+Only mutable references can be written. A write `*x = v` discards the value previously stored in `x`
+and updates it with `v`.
+
+可以读取可变和不可变引用以生成引用值的副本。
+
+只能写入可变引用。写入表达式 `*x = v` 会丢弃先前存储在x中的值，并用 `v` 更新。
+
+Both operations use the C-like `*` syntax. However, note that a read is an expression, whereas a
+write is a mutation that must occur on the left hand side of an equals.
+
+两种操作都使用类 C `*` 语法。但是请注意，读取是一个表达式，而写入是一个必须发生在等号左侧的改动。
+
+| Syntax     | Type                                | Description                         |
+| ---------- | ----------------------------------- | ----------------------------------- |
+| `*e`       | `T` where `e` is `&T` or `&mut T`   | Read the value pointed to by `e`    |
+| `*e1 = e2` | `()` where `e1: &mut T` and `e2: T` | Update the value in `e1` with `e2`. |
+
+| 语法 | 类型 | 描述 |
+| ------ | ------ |------ |
+| `*e` | `T` 其中 `e` 为 `&T` 或 `&mut T` | 读取 `e` 所指向的值
+| `*e1 = e2` | () 其中 `e1: &mut T` 和 `e2: T` | 用 `e2` 更新 `e1` 中的值
+
+In order for a reference to be read, the underlying type must have the
+[`copy` ability](./abilities.md) as reading the reference creates a new copy of the value. This rule
+prevents the copying of resource values:
+
+为了读取引用，相关类型必须具备[`copy` 能力](./abilities.html)，因为读取引用会创建值的新副本。此规则防止复制资源值：
+
+```move=
+fun copy_resource_via_ref_bad(c: Coin) {
+    let c_ref = &c;
+    let counterfeit: Coin = *c_ref; // not allowed!
+    pay(c);
+    pay(counterfeit);
+}
+```
+
+Dually: in order for a reference to be written to, the underlying type must have the
+[`drop` ability](./abilities.md) as writing to the reference will discard (or "drop") the old value.
+This rule prevents the destruction of resource values:
+
+双重性：为了写入引用，相关类型必须具备[`drop` 能力](./abilities.html)，因为写入引用将丢弃(或“删除”)旧值。此规则可防止破坏资源值：
+
+```move=
+fun destroy_resource_via_ref_bad(ten_coins: Coin, c: Coin) {
+    let ref = &mut ten_coins;
+    *ref = c; // not allowed--would destroy 10 coins!
+}
+```
+
+## `freeze` 推断 (`freeze` inference)
+
+A mutable reference can be used in a context where an immutable reference is expected:
+
+可变引用可以在预期不可变引用的上下文中使用：
+
+```move
+let x = 7;
+let y: &mut u64 = &mut x;
+```
+
+This works because the under the hood, the compiler inserts `freeze` instructions where they are
+needed. Here are a few more examples of `freeze` inference in action:
+
+这是因为编译器会在底层需要的地方插入 `freeze` 指令。以下是更多 `freeze` 实际推断行为的示例：
+
+```move=
+fun takes_immut_returns_immut(x: &u64): &u64 { x }
+
+// freeze inference on return value
+fun takes_mut_returns_immut(x: &mut u64): &u64 { x }
+
+fun expression_examples() {
+    let x = 0;
+    let y = 0;
+    takes_immut_returns_immut(&x); // no inference
+    takes_immut_returns_immut(&mut x); // inferred freeze(&mut x)
+    takes_mut_returns_immut(&mut x); // no inference
+
+    assert!(&x == &mut y, 42); // inferred freeze(&mut y)
+}
+
+fun assignment_examples() {
+    let x = 0;
+    let y = 0;
+    let imm_ref: &u64 = &x;
+
+    imm_ref = &x; // no inference
+    imm_ref = &mut y; // inferred freeze(&mut y)
+}
+```
+
+###  子类型化 (Subtyping)
+
+With this `freeze` inference, the Move type checker can view `&mut T` as a subtype of `&T`. As shown
+above, this means that anywhere for any expression where a `&T` value is used, a `&mut T` value can
+also be used. This terminology is used in error messages to concisely indicate that a `&mut T` was
+needed where a `&T` was supplied. For example
+
+通过freeze推断，Move 类型检查器可以将 `&mut T` 视为 `&T` 的子类型。 如上所示，这意味着对于使用 `&T` 值的任何表达式，也可以使用 `&mut T` 值。此术语用于错误消息中，以简明扼要地表明在提供 `&T` 的地方需要 `&mut T` 。例如:
+
+```move=
+address 0x42 {
+    module example {
+        fun read_and_assign(store: &mut u64, new_value: &u64) {
+            *store = *new_value
+        }
+
+        fun subtype_examples() {
+            let x: &u64 = &0;
+            let y: &mut u64 = &mut 1;
+
+            x = &mut 1; // valid
+            y = &2; // invalid!
+
+            read_and_assign(y, x); // valid
+            read_and_assign(x, y); // invalid!
+        }
+    }
+}
+```
+
+will yield the following error messages
+
+将产生以下错误消息
+
+```text
+error:
+    ┌── example.move:12:9 ───
+    │
+ 12 │         y = &2; // invalid!
+    │         ^ Invalid assignment to local 'y'
+    ·
+ 12 │         y = &2; // invalid!
+    │             -- The type: '&{integer}'
+    ·
+  9 │         let y: &mut u64 = &mut 1;
+    │                -------- Is not a subtype of: '&mut u64'
+    │
+
+error:
+    ┌── example.move:15:9 ───
+    │
+ 15 │         read_and_assign(x, y); // invalid!
+    │         ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x42::example::read_and_assign'. Invalid argument for parameter 'store'
+    ·
+  8 │         let x: &u64 = &0;
+    │                ---- The type: '&u64'
+    ·
+  3 │     fun read_and_assign(store: &mut u64, new_value: &u64) {
+    │                                -------- Is not a subtype of: '&mut u64'
+    │
+```
+
+The only other types currently that has subtyping are [tuples](./tuples.md)
+
+当前唯一具有子类型的其他类型是[tuple(元组)](./tuples.html)
+
+## 所有权 (Ownership)
+
+Both mutable and immutable references can always be copied and extended _even if there are existing
+copies or extensions of the same reference_:
+
+_即使同一引用存在现有副本或扩展_，可变引用和不可变引用始终可以被复制和扩展：
+
+```move
+fun reference_copies(s: &mut S) {
+  let s_copy1 = s; // ok
+  let s_extension = &mut s.f; // also ok
+  let s_copy2 = s; // still ok
+  ...
+}
+```
+
+This might be surprising for programmers familiar with Rust's ownership system, which would reject
+the code above. Move's type system is more permissive in its treatment of
+[copies](./variables.md#move-and-copy), but equally strict in ensuring unique ownership of mutable
+references before writes.
+
+对于熟悉 Rust 所有权系统的程序员来说，这可能会令人惊讶，因为他们会拒绝上面的代码。Move 的类型系统在处理[副本](./variables.html#move-and-copy)方面更加宽松 ，但在写入前确保可变引用的唯一所有权方面同样严格。
+
+### 无法存储引用 (References Cannot Be Stored)
+
+References and tuples are the _only_ types that cannot be stored as a field value of structs, which
+also means that they cannot exist in global storage. All references created during program execution
+will be destroyed when a Move program terminates; they are entirely ephemeral. This invariant is
+also true for values of types without the `store` [ability](./abilities.md), but note that
+references and tuples go a step further by never being allowed in structs in the first place.
+
+This is another difference between Move and Rust, which allows references to be stored inside of
+structs.
+
+引用和元组是唯一不能存储为结构的字段值的类型，这也意味着它们不能存在于全局存储中。当 Move 程序终止时，程序执行期间创建的所有引用都将被销毁；它们完全是短暂的。这种不变式也适用于没有[`store` 能力](./chatper_19_abilities.html)的类型的值，但请注意，引用和元组更进一步，从一开始就不允许出现在结构中。
+
+这是 Move 和 Rust 之间的另一个区别，后者允许将引用存储在结构内。
+
+Currently, Move cannot support this because references cannot be
+[serialized](https://en.wikipedia.org/wiki/Serialization), but _every Move value must be
+serializable_. This requirement comes from Move's
+[persistent global storage](./global-storage-structure.md), which needs to serialize values to
+persist them across program executions. Structs can be written to global storage, and thus they must
+be serializable.
+
+One could imagine a fancier, more expressive, type system that would allow references to be stored
+in structs _and_ ban those structs from existing in global storage. We could perhaps allow
+references inside of structs that do not have the `store` [ability](./abilities.md), but that would
+not completely solve the problem: Move has a fairly complex system for tracking static reference
+safety, and this aspect of the type system would also have to be extended to support storing
+references inside of structs. In short, Move's type system (particularly the aspects around
+reference safety) would have to expand to support stored references. But it is something we are
+keeping an eye on as the language evolves.
+
+目前，Move 无法支持这一点，因为引用无法被[序列化](https://en.wikipedia.org/wiki/Serialization)，但 _每个 Move 值都必须是可序列化的_。这个要求来自于 Move 的 [持久化全局存储](./global-storage-structure.html)，它需要在程序执行期间序列化值以持久化它们。结构体可以写入全局存储，因此它们必须是可序列化的。
+
+可以想象一种更奇特、更有表现力的类型系统，它允许将引用存储在结构中，并禁止这些结构存在于全局存储中。我们也许可以允许在没有[`store` 能力](./abilities.html)的结构内部使用引用，但这并不能完全解决问题：Move 有一个相当复杂的系统来跟踪静态引用安全性，并且类型系统的这一方面也必须扩展以支持在结构内部存储引用。简而言之，Move 的类型系统(尤其是与引用安全相关的方面)需要扩展以支持存储的引用。随着语言的发展，我们正在关注这一点。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/signer.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/signer.md
new file mode 100644
index 000000000..2bba515c0
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/signer.md
@@ -0,0 +1,60 @@
+# 签名者
+
+`签名者（signer）`是 Move 内置的资源类型。`签名者（signer）`是一种允许持有者代表特定`地址（address）`行使权力的[能力（capability）](https://en.wikipedia.org/wiki/Object-capability_model)。你可以将原生实现（native implementation）视为：
+
+```move
+struct signer has drop { a: address }
+```
+
+`signer` 有点像 Unix [UID](https://en.wikipedia.org/wiki/User_identifier)，因为它表示一个通过 Move *之外*的代码（例如，通过检查加密签名或密码）进行身份验证的用户。
+
+## 与 `address` 的比较
+
+Move 程序可以使用地址字面量（literal）创建任何`地址（address）`值，而无需特殊许可：
+
+```move
+let a1 = @0x1;
+let a2 = @0x2;
+// ... 等等，所有其他可能的地址
+```
+
+但是，`signer` 值是特殊的，因为它们不能通过字面量或者指令创建 —— 只能通过 Move 虚拟机（VM）创建。在虚拟机运行带有 `signer` 类型参数的脚本之前，它会自动创建 `signer` 值并将它们传递给脚本：
+
+```move
+script {
+    use std::signer;
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @0x42, 0);
+    }
+}
+```
+
+如果脚本是从 `0x42` 以外的任何地址发送的，则此脚本将中止并返回代码 `0`。
+
+交易脚本可以有任意数量的 `signer`，只要 `signer` 参数排在其他参数前面。换句话说，所有 `signer` 参数都必须放在第一位。
+
+```move
+script {
+    use std::signer;
+    fun main(s1: signer, s2: signer, x: u64, y: u8) {
+        // ...
+    }
+}
+```
+
+这对于实现具有多方权限原子行为的*多重签名脚本（multi-signer scripts）*很有用。例如，上述脚本的扩展可以在 `s1` 和 `s2` 之间执行原子货币交换。
+
+## `signer` 操作符
+
+`std::signer` 标准库模块为 `signer` 提供了两个实用函数：
+
+| 函数                                        | 描述                                                          |
+| ------------------------------------------- | ------------------------------------------------------------- |
+| `signer::address_of(&signer): address`      | 返回由 `&signer` 包装的地址值。                               |
+| `signer::borrow_address(&signer): &address` | 返回由 `&signer` 包装的地址的引用。                           |
+
+此外，`move_to<T>(&signer, T)` [全局存储](./global-storage-operators.md)操作符需要一个 `&signer` 参数在 `signer.address` 的帐户下发布资源 `T`。这确保了只有经过身份验证的用户才能在其地址下发布资源。
+
+## 所有权
+
+与简单的标量值不同，`signer` 值是不可复制的，这意味着他们不能被复制（通过任何操作，无论是通过显式 [`copy`](./variables.md#移动和复制)指令还是通过[解引用（dereference）`*`](./references.md#通过引用读取和写入)）。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/standard-library.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/standard-library.md
new file mode 100644
index 000000000..85c8d9f43
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/standard-library.md
@@ -0,0 +1,695 @@
+# 标准库（Standard Library）
+
+The Move standard library exposes interfaces that implement the following functionality:
+* [Basic operations on vectors](#vector).
+* [Option types and operations on`Option` types](#option).
+* [A common error encoding code interface for abort codes](#errors).
+* [32-bit precision fixed-point numbers](#fixed_point32).
+
+Move标准库公开了实现以下功能的接口:
+* [向量的基本操作](#向量).
+* [Option类型与基本操作](#option).
+* [终止码的常见错误编码接口](#errors).
+* [32位精确定点数字](#fixed_point32).
+
+## 向量（vector）
+
+
+The `vector` module defines a number of operations over the primitive
+[`vector`](./vector.md) type. The module is published under the
+named address `Std` and consists of a number of native functions, as
+well as functions defined in Move. The API for this module is as follows.
+
+`向量`模块在原生类型[`向量`](./vector.md)上定义了许多操作。该模块以命名地址`Std`发布，并由许多原生函数以及在Move中定义的函数组成。此模块的API如下所示:
+
+### 函数（Functions）
+
+---------------------------------------------------------------------------
+
+Create an empty [`vector`](./vector.md).
+The `Element` type can be both a `resource` or `copyable` type.
+
+创建一个空的[`向量`](./vector.md)。
+`Element`类型可以是`资源`或`可复制`类型。
+
+```move
+    native public fun empty<Element>(): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a vector of length `1` containing the passed in `element`.
+
+创建一个长度为`1`的vector，并且包含传入的`element`。
+
+```move
+    public fun singleton<Element>(e: Element): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Destroy (deallocate) the vector `v`. Will abort if `v` is non-empty.
+*Note*: The emptiness restriction is due to the fact that `Element` can be a
+resource type, and destruction of a non-empty vector would violate
+[resource conservation](./structs-and-resources.md).
+
+销毁(释放)向量`v`。如果`v`非空操作将终止。
+*注意*:空的限制是由于`Element`可以是资源类型，而销毁非空的向量会违反[资源保护机制](./structs-and-resources.md)。
+
+```move
+    native public fun destroy_empty<Element>(v: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Acquire an [immutable reference](./references.md) to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[不可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Acquire a [mutable reference](./references.md)
+to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Empty and destroy the `other` vector, and push each of the elements in
+the `other` vector onto the `lhs` vector in the same order as they occurred in `other`.
+
+清空并销毁`other`动态数组，并将`other`向量中的每个元素按顺序添加到`lhs`动态数组。
+
+```move
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Push an element `e` of type `Element` onto the end of the vector `v`. May
+trigger a resizing of the underlying vector's memory.
+
+将类型为`Element`的元素`e`添加到向量`v`的末尾。可能触发底层向量内存的大小调整。
+
+```move
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Pop an element from the end of the vector `v` in-place and return the owned
+value. Will abort if `v` is empty.
+
+从向量`v`的末尾取出一个元素并返回。如果`v`为空将终止操作。
+
+```move
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Remove the element at index `i` in the vector `v` and return the owned value
+that was previously stored at `i` in `v`. All elements occurring at indices
+greater than `i` will be shifted down by 1. Will abort if `i` is out of bounds
+for `v`.
+
+移除向量`v`中索引`i`处的元素，并返回之前存储在`v`中的`i`处的值。所有下标大于`i`的元素将向前移动1个位置。如果`i`超出了`v`的范围，操作将会终止。
+
+```move
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the `i`th element of the vector `v` with the last element and then pop
+this element off of the back of the vector and return the owned value that
+was previously stored at index `i`.
+This operation is O(1), but does not preserve ordering of elements in the vector.
+Aborts if the index `i` is out of bounds for the vector `v`.
+
+将向量`v`的第`i`个元素与最后一个元素交换，然后将这个元素从向量的后面取出，并返回之前存储在索引`i`处的所有元素的值。
+这个操作时间复杂度是O(1)，但是不保持向量容器中元素的顺序。
+如果索引`i`超出了向量`v`的边界，则操作终止。
+
+```move
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the elements at the `i`'th and `j`'th indices in the vector `v`. Will
+abort if either of `i` or `j` are out of bounds for `v`.
+
+交换向量`v`中下标为第`i`和第`j`的元素。如果`i`或`j`中的任何一个超出了`v`的范围，则操作将终止。
+
+```move
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+```
+
+---------------------------------------------------------------------------
+
+Reverse the order of the elements in the vector `v` in-place.
+
+将向量v中的元素顺序颠倒。
+
+```move
+    public fun reverse<Element>(v: &mut vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Return the index of the first occurrence of an element in `v` that is
+equal to `e`. Returns `(true, index)` if such an element was found, and
+`(false, 0)` otherwise.
+
+返回`v`中第一个与`e`相等的元素的索引。如果找到这样的元素，则返回`(true, index)`，否则返回`(false, 0)`。
+
+```move
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64);
+```
+
+---------------------------------------------------------------------------
+Return if an element equal to `e` exists in the vector `v`.
+
+如果向量`v`中存在等于`e`的元素，则返回true, 否则返回false。
+
+```move
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+Return the length of a `vector`.
+
+返回`向量`的长度。
+
+```move
+    native public fun length<Element>(v: &vector<Element>): u64;
+```
+
+---------------------------------------------------------------------------
+Return whether the vector `v` is empty.
+
+如果向量`v`中没有元素，则返回true, 否则返回false。
+
+```move
+    public fun is_empty<Element>(v: &vector<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+## 选项（option）
+
+The `option` module defines a generic option type `Option<T>` that represents a
+value of type `T` that may, or may not, be present. It is published under the named address `Std`.
+
+`option`模块定义了一个泛型option类型`Option<T>`，它表示类型为`T`的值可能存在，也可能不存在。它发布在命名地址`Std`下。
+
+The Move option type is internally represented as a singleton vector, and may
+contain a value of `resource` or `copyable` kind.  If you are familiar with option
+types in other languages, the Move `Option` behaves similarly to those with a
+couple notable exceptions since the option can contain a value of kind `resource`.
+Particularly, certain operations such as `get_with_default` and
+`destroy_with_default` require that the element type `T` be of `copyable` kind.
+
+Move option类型在内部表示为一个单例向量，可能包含`资源`或`可复制`类型的值。如果你熟悉其他语言中的option类型，Move `Option`的行为与那些类似，但有几个显著的例外，因为option可以包含一个类型为`资源`的值。
+特别地，某些操作如`get_with_default`和`destroy_with_default`要求元素类型`T`为`可复制`类型。
+
+The API for the `option` module is as as follows
+
+`option`模块的API如下所示:
+
+### 类型（Types）
+
+Generic type abstraction of a value that may, or may not, be present. Can contain
+a value of either `resource` or `copyable` kind.
+
+一个值的泛型类型的抽象，可能存在，也可能不存在。它可以包含`资源`或`可复制`类型的值。
+
+```move
+    struct Option<T>;
+```
+
+### 函数（Functions）
+
+Create an empty `Option` of that can contain a value of `Element` type.
+
+创建一个可以包含`Element`类型值的空`Option`。
+
+```move
+    public fun none<Element>(): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a non-empty `Option` type containing a value `e` of type `Element`.
+
+创建一个非空的`Option`类型，包含类型为`Element`的值`e`。
+
+```move
+    public fun some<Element>(e: T): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Return an immutable reference to the value inside the option `opt_elem`
+Will abort if `opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的不可变引用,如果`opt_elem`不包含值，则将终止操作。
+
+```move
+    public fun borrow<Element>(opt_elem: &Option<Element>): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a reference to the value inside `opt_elem` if it contains one. If
+`opt_elem` does not contain a value the passed in `default_ref` reference will be returned.
+Does not abort.
+
+如果`opt_elem`中包含值，则返回该值的引用。如果`opt_elem`不包含值，将返回传入的`default_ref`引用。不会终止操作。
+
+```move
+    public fun borrow_with_default<Element>(opt_elem: &Option<Element>, default_ref: &Element): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a mutable reference to the value inside `opt_elem`. Will abort if
+`opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的可变引用。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun borrow_mut<Element>(opt_elem: &mut Option<Element>): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an option value that contains a value to one that is empty in-place by
+removing and returning the value stored inside `opt_elem`.
+Will abort if `opt_elem` does not contain a value.
+
+通过删除并返回存储在`opt_elem`中的值，将包含值的`opt_elem`转换为空option类型。
+如果`opt_elem`不包含值，则将终止。
+
+```move
+    public fun extract<Element>(opt_elem: &mut Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return the value contained inside the option `opt_elem` if it contains one.
+Will return the passed in `default` value if `opt_elem` does not contain a
+value. The `Element` type that the `Option` type is instantiated with must be
+of `copyable` kind in order for this function to be callable.
+
+如果`opt_elem`中包含值，则返回该值。
+如果`opt_elem`不包含值，将返回传入的`default`值。`default`类型必须是`可复制`类型，这样该函数才能被调用。
+
+```move
+    public fun get_with_default<Element: copyable>(opt_elem: &Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an empty option `opt_elem` to an option value that contains the value `e`.
+Will abort if `opt_elem` already contains a value.
+
+将空option类型`opt_elem`转换为包含值`e`的option类。
+如果`opt_elem`已经包含值，则操作将终止。
+
+```move
+    public fun fill<Element>(opt_elem: &mut Option<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Swap the value currently contained in `opt_elem` with `new_elem` and return the
+previously contained value. Will abort if `opt_elem` does not contain a value.
+
+将`opt_elem`当前包含的值与`new_elem`交换，并返回先前包含的值。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun swap<Element>(opt_elem: &mut Option<Element>, e: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return true if `opt_elem` contains a value equal to the value of `e_ref`.
+Otherwise, `false` will be returned.
+
+如果`opt_elem`包含一个等于`e_ref`的值，则返回`true`。否则，将返回`false`。
+
+```move
+    public fun contains<Element>(opt_elem: &Option<Element>, e_ref: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` does not contain a value.
+
+如果`opt_elem`不包含值，则返回`true`。
+
+```move
+    public fun is_none<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` contains a value.
+
+如果`opt_elem`包含值，则返回`true`。
+
+```move
+    public fun is_some<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Unpack `opt_elem` and return the value that it contained.
+Will abort if `opt_elem` does not contain a value.
+
+解包`opt_elem`并返回它所包含的值。
+如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun destroy_some<Element>(opt_elem: Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in. If `opt_elem` contained a value it
+will be returned otherwise, the passed in `default` value will be returned.
+
+销毁传入的`opt_elem`。如果`opt_elem`包含值，它将被返回，否则将返回传入的`default`值。
+
+```move
+    public fun destroy_with_default<Element: copyable>(opt_elem: Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in, `opt_elem` must be empty and not
+contain a value. Will abort if `opt_elem` contains a value.
+
+销毁传入的`opt_elem`，`opt_elem`必须为空且不包含值。如果`opt_elem`包含一个值，则会终止操作。
+
+```move
+    public fun destroy_none<Element>(opt_elem: Option<Element>);
+```
+
+## 错误（errors）
+
+Recall that each abort code in Move is represented as an unsigned 64-bit integer. The `errors` module defines a common interface that can be used to "tag" each of these abort codes so that they can represent both the error **category** along with an error **reason**.
+
+回想一下，Move中的每个终止代码都表示为无符号64位整数。`errors`模块定义了一个通用接口，可用于"标记"每个终止代码，以便它们既可以表示错误**类别**，也可以表示错误**原因**。
+
+Error categories are declared as constants in the `errors` module and are globally unique with respect to this module. Error reasons on the other hand are module-specific error codes, and can provide greater detail (perhaps, even a particular _reason_) about the specific error condition. This representation of a category and reason for each error code is done by dividing the abort code into two sections.
+
+错误类别在`errors`模块中声明为常量，并且对该模块来说是全局唯一的。另一方面，错误原因是特定于模块的错误代码，可以提供关于特定错误条件的更详细的信息(甚至可能是一个特定的_reason_)。每个错误代码的类别和原因的这种表示是通过将终止代码分成两部分来完成的。
+
+The lower 8 bits of the abort code hold the *error category*. The remaining 56 bits of the abort code hold the *error reason*.
+The reason should be a unique number relative to the module which raised the error and can be used to obtain more information about the error at hand. It should mostly be used for diagnostic purposes as error reasons may change over time if the module is updated.
+
+| Category | Reason |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+Since error categories are globally stable, these present the most stable API and should in general be what is used by clients to determine the messages they may present to users (whereas the reason is useful for diagnostic purposes). There are public functions in the `errors` module for creating an abort code of each error category with a specific `reason` number (represented as a `u64`).
+
+终止代码的较低8位保存*错误类别*。终止代码的其余56位包含*错误原因*。
+原因应该是相对于引发错误的模块的唯一数字，并且可以用来获取关于当前错误的更多信息。它应该主要用于诊断目的，因为如果模块更新，错误原因可能会随着时间的推移而变化。
+
+| 类型 | 原因 |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+由于错误类别是全局稳定的，所以它们提供了稳定的API，通常应该由客户端用来确定它们可能向用户提供的消息(而原因则用于诊断目的)。在`errors`模块中有一些公共函数，用于创建每个错误类别的带有特定`原因`号的终止代码(表示为`u64`)。
+
+### 常量（Constants）
+
+The system is in a state where the performed operation is not allowed.
+
+系统处于不允许操作的状态。
+
+```move
+    const INVALID_STATE: u8 = 1;
+```
+
+---------------------------------------------------------------------------
+A specific account address was required to perform an operation, but a different address from what was expected was encounterd.
+
+执行操作需要一个特定的帐户地址，但遇到的地址与预期的不同。
+
+```move
+    const REQUIRES_ADDRESS: u8 = 2;
+```
+
+---------------------------------------------------------------------------
+An account did not have the expected  role for this operation. Useful for Role Based Access Control (RBAC) error conditions.
+
+帐户没有此操作的预期角色。用于基于角色访问控制(RBAC)错误。
+
+```move
+    const REQUIRES_ROLE: u8 = 3;
+```
+
+---------------------------------------------------------------------------
+An account did not not have a required capability. Useful for RBAC error conditions.
+
+帐户没有所需的能力。用于RBAC错误。
+
+```move
+    const REQUIRES_CAPABILITY: u8 = 4;
+```
+
+---------------------------------------------------------------------------
+A resource was expected, but did not exist under an address.
+
+地址下不存在期望的资源。
+
+```move
+    const NOT_PUBLISHED: u8 = 5;
+```
+
+---------------------------------------------------------------------------
+Attempted to publish a resource under an address where one was already published.
+
+试图在已发布资源的地址发布资源。
+
+```move
+    const ALREADY_PUBLISHED: u8 = 6;
+```
+
+---------------------------------------------------------------------------
+An argument provided for an operation was invalid.
+
+为操作提供的参数无效。
+
+```move
+    const INVALID_ARGUMENT: u8 = 7;
+```
+
+---------------------------------------------------------------------------
+A limit on a value was exceeded.
+
+超过了一个值的限制。
+
+```move
+    const LIMIT_EXCEEDED: u8 = 8;
+```
+
+---------------------------------------------------------------------------
+An internal error (bug) has occurred.
+
+发生了内部错误(bug)。
+
+```move
+    const INTERNAL: u8 = 10;
+```
+
+---------------------------------------------------------------------------
+A custom error category for extension points.
+
+扩展自定义错误类别。
+
+```move
+    const CUSTOM: u8 = 255;
+```
+
+---------------------------------------------------------------------------
+
+### 函数（Functions）
+
+ Should be used in the case where invalid (global) state is encountered. Constructs an abort code with specified `reason` and category `INVALID_STATE`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到无效(全局)状态的情况下应使用。构造一个具有指定的`reason`和类别`INVALID_STATE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_state(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account's address does not match a specific address. Constructs an abort code with specified `reason` and category `REQUIRES_ADDRESS`. Will abort if `reason` does not fit in 56 bits.
+
+当账户地址与特定地址不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ADDRESS`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_address(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a role did not match a required role when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_ROLE`. Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，角色与所需角色不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ROLE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_role(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account did not have a required capability when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_CAPABILITY`. Should be Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，帐户没有必要的能力时应使用。构造一个具有指定的`reason`和类别`REQUIRES_CAPABILITY`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_capability(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource did not exist where one was expected. Constructs an abort code with specified `reason` and category `NOT_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+在需要资源的地方不存在资源时应使用。构造一个具有指定的`reason`和类别`NOT_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun not_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource already existed where one was about to be published. Constructs an abort code with specified `reason` and category `ALREADY_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+要发布资源的地方已经存在资源时使用。构造一个具有指定的`reason`和类别`ALREADY_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun already_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an invalid argument was passed to a function/operation. Constructs an abort code with specified `reason` and category `INVALID_ARGUMENT`. Will abort if `reason` does not fit in 56 bits.
+
+当向函数/操作传递无效参数时使用。构造一个具有指定的`reason`和类别`INVALID_ARGUMENT`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_argument(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a limit on a specific value is reached, e.g., subtracting 1 from a value of 0. Constructs an abort code with specified `reason` and category `LIMIT_EXCEEDED`. Will abort if `reason` does not fit in 56 bits.
+
+当达到特定值的限制时应使用，例如，0减去1。构造一个具有指定的`reason`和类别`LIMIT_EXCEEDED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun limit_exceeded(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an internal error or bug was encountered. Constructs an abort code with specified `reason` and category `INTERNAL`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到内部错误或错误时使用。构造一个具有指定的`reason`和类别`INTERNAL`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun internal(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Used for extension points, should be not used under most circumstances. Constructs an abort code with specified `reason` and category `CUSTOM`. Will abort if `reason` does not fit in 56 bits.
+
+用于扩展，大多数情况下不应使用。构造一个具有指定的`reason`和类别`CUSTOM`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun custom(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+
+## 32位精确定点数字（fixed_point32）
+
+The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
+
+`fixed_point32`模块定义了一个具有32个整数位和32个小数位的定点数值类型。在内部，它被表示为一个`u64`整数，包装在一个结构中，形成一个唯一的`fixed_point32`类型。由于数字表示是二进制的，一些十进制值可能不能完全表示，但它在小数点之前和之后都提供了9位以上的十进制精度(总共18位)。为了进行比较，双精度浮点数的精度小于16位十进制数字，因此在使用浮点数将这些值转换为十进制时应该小心。
+
+### 类型（Types）
+Represents a fixed-point numeric number with 32 fractional bits.
+
+表示具有32个小数位的定点数字。
+
+```move
+    struct FixedPoint32;
+```
+
+### 函数（Functions）
+
+Multiply a u64 integer by a fixed-point number, truncating any fractional part of the product. This will abort if the product overflows.
+
+当u64整数乘以定点数，截断乘积的任何小数部分。如果乘积溢出，该操作将终止。
+
+```move
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Divide a u64 integer by a fixed-point number, truncating any fractional part of the quotient. This will abort if the divisor is zero or if the quotient overflows.
+
+当u64整数除以定点数，截断商的任何小数部分。如果除数为零或商溢出，该操作将终止。
+
+```move
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Create a fixed-point value from a rational number specified by its numerator and denominator. Calling this function should be preferred for using `fixed_point32::create_from_raw_value` which is also available. This will abort if the denominator is zero. It will also abort if the numerator is nonzero and the ratio is not in the range $2^{-32}\ldots2^{32}-1$. When specifying decimal fractions, be careful about rounding errors: if you round to display $N$ digits after the decimal point, you can use a denominator of $10^N$ to avoid numbers where the very small imprecision in the binary representation could change the rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+根据分子和分母指定的有理数创建定点值。如果`fixed_point32::create_from_raw_value`函数可用，应优先使用。如果分母为零，该操作将终止。如果分子非零且比值不在$2^{-32}\ldots2^{32}-1$范围内，该操作将终止。指定小数时，请注意四舍五入错误：如果要对小数点后$N$位进行四舍五入，则可以用$10^N$做分母，这样就能避免精确度丢失问题，例如，0.0125将四舍五入到0.012而不是0.013。
+
+```move
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Create a fixedpoint value from a raw `u64` value.
+
+通过`u64`原始值创建一个定点值。
+
+```move
+    public fun create_from_raw_value(value: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Returns `true` if the decimal value of `num` is equal to zero.
+
+如果`num`的十进制值等于0，则返回`true`。
+
+```move
+    public fun is_zero(num: FixedPoint32): bool;
+```
+
+---------------------------------------------------------------------------
+Accessor for the raw `u64` value. Other less common operations, such as adding or subtracting `FixedPoint32` values, can be done using the raw values directly.
+
+获取`u64`原始值的方法。其他不太常见的操作，例如添加或减去`FixedPoint32`值，可以直接使用原始值来完成。
+
+```move
+    public fun get_raw_value(num: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/structs-and-resources.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/structs-and-resources.md
new file mode 100644
index 000000000..9dcf97c95
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/structs-and-resources.md
@@ -0,0 +1,591 @@
+# 结构体和资源
+
+A _struct_ is a user-defined data structure containing typed fields. Structs can store any
+non-reference type, including other structs.
+
+***结构体***（struct）是包含类型字段的自定义数据结构。结构体可以存储任何非引用类型，包括其他结构。
+
+We often refer to struct values as _resources_ if they cannot be copied and cannot be dropped. In
+this case, resource values must have ownership transferred by the end of the function. This property
+makes resources particularly well served for defining global storage schemas or for representing
+important values (such as a token).
+
+如果结构值无法复制且无法删除，我们通常将其称为***资源***（resource）。在这种情况下，资源值必须在函数结束时转移所有权。这个属性使资源特别适合定义全局存储模式或表示重要的值（如 token）。
+
+By default, structs are linear and ephemeral. By this we mean that they: cannot be copied, cannot be
+dropped, and cannot be stored in global storage. This means that all values have to have ownership
+transferred (linear) and the values must be dealt with by the end of the program's execution
+(ephemeral). We can relax this behavior by giving the struct [abilities](./abilities.md) which allow
+values to be copied or dropped and also to be stored in global storage or to define global storage
+schemas.
+
+默认情况下，结构体是线性的和临时的。我们的意思是它们：不能被复制，不能被删除，不能被存储在全局存储中。这意味着所有值都必须转移所有权（线性），并且必须在程序执行结束时处理这些值（临时）。我们可以通过赋予结构体允许复制或删除值以及将值存储在全局存储中或定义全局存储模式的[能力](./abilities.md)来放松这种行为（减轻限制）。
+
+## 定义结构体
+
+Structs must be defined inside a module:
+
+结构体必须在模块内定义：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar {}
+    struct Baz { foo: Foo, }
+    //                   ^ 注意：尾随逗号是可以的
+}
+}
+```
+
+Structs cannot be recursive, so the following definition is invalid:
+
+结构体不能递归（定义），所以下面的定义是无效的：
+
+```move
+struct Foo { x: Foo }
+//              ^ 错误！ Foo 不能包含 Foo
+```
+
+As mentioned above: by default, a struct declaration is linear and ephemeral. So to allow the value
+to be used with certain operations (that copy it, drop it, store it in global storage, or use it as
+a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
+`has <ability>`:
+
+如上所述：默认情况下，结构体声明是线性且临时的。因此，为了允许将值用于某些操作（复制、删除、将其存储在全局存储中或将其用作存储模式），可以通过使用 `has <ability>` 标注它们来授予结构体[能力](./abilities.md)：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64, y: bool }
+}
+}
+```
+
+For more details, see the [annotating structs](./abilities.md#annotating-structs) section.
+
+有关更多详细信息，请参阅[标注结构体](./abilities.md#标注结构体)部分。
+
+### 命名
+
+Structs must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+结构体必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，结构体名称可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+struct Foo {}
+struct BAR {}
+struct B_a_z_4_2 {}
+```
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。以后可能会也可能不会删除这个限制。
+
+## 使用结构体
+
+### 创建结构体
+
+Values of a struct type can be created (or "packed") by indicating the struct name, followed by
+value for each field:
+
+可以通过写明结构体名称来创建（或“打包”）结构体类型的值，然后是每个字段的值：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64, y: bool }
+    struct Baz has drop { foo: Foo }
+
+    fun example() {
+        let foo = Foo { x: 0, y: false };
+        let baz = Baz { foo: foo };
+    }
+}
+}
+```
+
+If you initialize a struct field with a local variable whose name is the same as the field, you can
+use the following shorthand:
+
+如果使用与字段名相同的局部变量初始化结构体字段，则可以使用以下简写：
+
+```move
+let baz = Baz { foo: foo };
+// 相当于
+let baz = Baz { foo };
+```
+
+This is called sometimes called "field name punning".
+
+这有时称为“字段名双关语”。
+
+### 通过模式匹配销毁结构体
+
+Struct values can be destroyed by binding or assigning them patterns.
+
+结构值可以通过绑定或赋值模式来销毁。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar { foo: Foo }
+    struct Baz {}
+
+    fun example_destroy_foo() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: foo_y } = foo;
+        //        ^ `x: x` 的简写
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   foo_y: bool = false
+    }
+
+    fun example_destroy_foo_wildcard() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: _ } = foo;
+
+        // 由于 y 绑定到通配符，因此只有一个新绑定
+        //   x: u64 = 3
+    }
+
+    fun example_destroy_foo_assignment() {
+        let x: u64;
+        let y: bool;
+        Foo { x, y } = Foo { x: 3, y: false };
+
+        // 改变现有变量 x 和 y
+        //   x = 3, y = false
+    }
+
+    fun example_foo_ref() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &foo;
+
+        // 两个新绑定
+        //   x: &u64
+        //   y: &bool
+    }
+
+    fun example_foo_ref_mut() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &mut foo;
+
+        // 两个新绑定
+        //   x: &mut u64
+        //   y: &mut bool
+    }
+
+    fun example_destroy_bar() {
+        let bar = Bar { foo: Foo { x: 3, y: false } };
+        let Bar { foo: Foo { x, y } } = bar;
+        //             ^ 嵌套模式
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   y: bool = false
+    }
+
+    fun example_destroy_baz() {
+        let baz = Baz {};
+        let Baz {} = baz;
+    }
+}
+}
+```
+
+### 借用结构体和字段
+
+The `&` and `&mut` operator can be used to create references to structs or fields. These examples
+include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
+
+`&` 和 `&mut` 运算符可用于创建对结构体或字段的引用。这些例子包括一些可选的类型标注（例如，`: &Foo`）来演示操作的类型。
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref: &Foo = &foo;
+let y: bool = foo_ref.y;          // 通过对结构体的引用读取字段
+let x_ref: &u64 = &foo.x;
+
+let x_ref_mut: &mut u64 = &mut foo.x;
+*x_ref_mut = 42;            // 通过可变引用修改字段
+```
+
+It is possible to borrow inner fields of nested structs.
+
+可以借用嵌套结构体的内部字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+
+let x_ref = &bar.foo.x;
+```
+
+You can also borrow a field via a reference to a struct.
+
+你还可以通过对结构体的引用来借用字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &foo;
+let x_ref = &foo_ref.x;
+// 这与 let x_ref = &foo.x 的效果相同
+```
+
+### 读写字段
+
+If you need to read and copy a field's value, you can then dereference the borrowed field
+
+如果你需要读取和复制字段的值，则可以解引用借用的字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo: copy foo };
+let x: u64 = *&foo.x;
+let y: bool = *&foo.y;
+let foo2: Foo = *&bar.foo;
+```
+
+If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
+any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
+
+如果该字段是隐式可复制的，则点运算符可用于读取结构体的字段而无需任何借用。（只有具有 `copy` 能力的标量值是隐式可复制的。）
+
+```move
+let foo = Foo { x: 3, y: true };
+let x = foo.x;  // x == 3
+let y = foo.y;  // y == true
+```
+
+Dot operators can be chained to access nested fields.
+
+点运算符可以链式访问嵌套字段：
+
+```move
+let baz = Baz { foo: Foo { x: 3, y: true } };
+let x = baz.foo.x; // x = 3;
+```
+
+However, this is not permitted for fields that contain non-primitive types, such a vector or another
+struct
+
+但是，对于包含非原始类型（例如向量或其他结构体）的字段，这是不允许的：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+let foo2: Foo = *&bar.foo;
+let foo3: Foo = bar.foo; // 错误！必须使用 *& 添加显式复制
+```
+
+The reason behind this design decision is that copying a vector or another struct might be an
+expensive operation. It is important for a programmer to be aware of this copy and make others aware
+with the explicit syntax `*&`
+
+In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
+field being a primitive type or some other struct
+
+这个设计决策背后的原因是复制一个向量或另一个结构体可能是一项昂贵的操作。对于程序员来说，了解这个复制（操作）并使用显式语法 `*&` 让其他人意识到是很重要的。
+
+除了从字段中读取之外，点语法还可用于修改字段，无论该字段是原始类型还是其他结构体。
+
+```move
+let foo = Foo { x: 3, y: true };
+foo.x = 42;     // foo = Foo { x: 42, y: true }
+foo.y = !foo.y; // foo = Foo { x: 42, y: false }
+let bar = Bar { foo };            // bar = Bar { foo: Foo { x: 42, y: false } }
+bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
+bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
+```
+
+The dot syntax also works via a reference to a struct
+
+点语法也适用于对结构体的引用：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &mut foo;
+foo_ref.x = foo_ref.x + 1;
+```
+
+## 私有结构体操作
+
+Most struct operations on a struct type `T` can only be performed inside the module that declares
+`T`:
+
+- Struct types can only be created ("packed"), destroyed ("unpacked") inside the module that defines
+  the struct.
+- The fields of a struct are only accessible inside the module that defines the struct.
+
+Following these rules, if you want to modify your struct outside the module, you will need to
+provide public APIs for them. The end of the chapter contains some examples of this.
+
+However, struct _types_ are always visible to another module or script:
+
+大多数对结构体类型 `T` 的结构体操作只能在声明 `T` 的模块内执行：
+
+- 结构体类型只能在定义结构体的模块内创建（“打包”）、销毁（“解包”）。
+- 结构体的字段只能在定义结构体的模块内部访问。
+
+按照这些规则，如果你想在模块之外修改你的结构体，你需要为他们提供公共 API。本章的最后包含了这方面的一些例子。
+
+但是，结构体类型始终对其他模块或脚本可见：
+
+```move
+// m.move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64 }
+
+    public fun new_foo(): Foo {
+        Foo { x: 42 }
+    }
+}
+}
+```
+
+```move
+// n.move
+address 0x2 {
+module n {
+    use 0x2::m;
+
+    struct Wrapper has drop {
+        foo: m::Foo
+    }
+
+    fun f1(foo: m::Foo) {
+        let x = foo.x;
+        //      ^ 错误！此处无法访问 `foo` 的字段
+    }
+
+    fun f2() {
+        let foo_wrapper = Wrapper { foo: m::new_foo() };
+    }
+}
+}
+```
+
+Note that structs do not have visibility modifiers (e.g., `public` or `private`).
+
+请注意，结构体没有可见性修饰符（例如，`public` 或 `private`）。
+
+## 所有权
+
+As mentioned above in [Defining Structs](#defining-structs), structs are by default linear and
+ephemeral. This means they cannot be copied or dropped. This property can be very useful when
+modeling real world resources like money, as you do not want money to be duplicated or get lost in
+circulation.
+正如上面[定义结构体](#定义结构体)中提到的，结构体默认是线性的和临时的。这意味着它们不能被复制或删除。在模拟货币等现实世界资源时，此属性非常有用，因为你不希望货币被复制或在流通中丢失。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun copying_resource() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo; // 错误！“复制”需要“复制”能力
+        let foo_ref = &foo;
+        let another_copy = *foo_ref // 错误！解引用需要“复制”能力
+    }
+
+    public fun destroying_resource1() {
+        let foo = Foo { x: 100 };
+
+        // 错误！当函数返回时，foo 仍然包含一个值。
+        // 这种销毁需要“drop”能力
+    }
+
+    public fun destroying_resource2(f: &mut Foo) {
+        *f = Foo { x: 100 } // 错误！通过写入销毁旧值需要“drop”能力
+    }
+}
+}
+```
+
+To fix the second example (`fun dropping_resource`), you would need to manually "unpack" the resource:
+
+要修复第二个示例（`fun destroying_resource1`），你需要手动“解包”资源：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun destroying_resource1_fixed() {
+        let foo = Foo { x: 100 };
+        let Foo { x: _ } = foo;
+    }
+}
+}
+```
+
+Recall that you are only able to deconstruct a resource within the module in which it is defined.
+This can be leveraged to enforce certain invariants in a system, for example, conservation of money.
+
+If on the other hand, your struct does not represent something valuable, you can add the abilities
+`copy` and `drop` to get a struct value that might feel more familiar from other programming
+languages:
+
+回想一下，你只能在定义资源的模块中解构资源。这可以用来在系统中强制执行某些不变量，例如货币守恒。
+
+另一方面，如果你的结构体不代表有价值的东西，你可以添加 `copy` 和 `drop` 能力来获取一个结构值，这感觉可能会与其他编程语言更相似。
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64 }
+
+    public fun run() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo;
+        // ^ 此代码复制 foo，而 `let x = foo` 或
+        // `let x = move foo` 都移动 foo
+
+        let x = foo.x;            // x = 100
+        let x_copy = foo_copy.x;  // x = 100
+
+        // 函数返回时 foo 和 foo_copy 都被隐式丢弃
+    }
+}
+}
+```
+
+## 在全局存储中存储资源
+
+Only structs with the `key` ability can be saved directly in
+[persistent global storage](./global-storage-operators.md). All values stored within those `key`
+structs must have the `store` abilities. See the [ability](./abilities] and
+[global storage](./global-storage-operators.md) chapters for more detail.
+
+只有具有 `key` 能力的结构体才能直接保存在[持久性全局存储](./global-storage-operators.md)中。存储在这些 `key` 结构体中的所有值都必须具有 `store` 能力。有关更多详细信息，请参阅[能力](./abilities.md)和[全局存储](./global-storage-operators.md)章节。
+
+## 示例
+
+Here are two short examples of how you might use structs to represent valuable data (in the case of
+`Coin`) or more classical data (in the case of `Point` and `Circle`)
+
+这里有两个简短的示例，说明如何使用结构体来表示有价值的数据（在 `Coin` 的情况下）或更经典的数据（在 `Point` 和 `Circle` 的情况下）。
+
+### 示例 1：Coin
+
+<!-- TODO link to access control for mint -->
+
+```move
+address 0x2 {
+module m {
+    // 我们不希望钱币（Coin）被复制，因为那会复制这个“钱”，
+    // 所以我们不会给结构体“copy”能力。
+    // 同样，我们不希望程序员销毁钱币，所以我们不会给结构体“drop”能力。
+    // 但是，我们*希望*模块的用户能够将这个钱币存储在持久的全局存储中，
+    // 所以我们授予结构体“store”能力。
+    // 这个结构体只会在全局存储内的其他资源中，因此我们不会赋予该结构体“key”能力。
+    struct Coin has store {
+        value: u64,
+    }
+
+    public fun mint(value: u64): Coin {
+        // 你可能希望通过某种形式的访问控制来关闭此（铸币）功能，以防止使用此模块的任何人铸造无限数量的钱币。
+        Coin { value }
+    }
+
+    public fun withdraw(coin: &mut Coin, amount: u64): Coin {
+        assert!(coin.balance >= amount, 1000);
+        coin.value = coin.value - amount;
+        Coin { value: amount }
+    }
+
+    public fun deposit(coin: &mut Coin, other: Coin) {
+        let Coin { value } = other;
+        coin.value = coin.value + value;
+    }
+
+    public fun split(coin: Coin, amount: u64): (Coin, Coin) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun merge(coin1: Coin, coin2: Coin): Coin {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+
+    public fun destroy_zero(coin: Coin) {
+        let Coin { value } = coin;
+        assert!(value == 0, 1001);
+    }
+}
+}
+```
+
+### 示例 2：Geometry
+
+```move
+address 0x2 {
+module point {
+    struct Point has copy, drop, store {
+        x: u64,
+        y: u64,
+    }
+
+    public fun new(x: u64, y: u64): Point {
+        Point {
+            x, y
+        }
+    }
+
+    public fun x(p: &Point): u64 {
+        p.x
+    }
+
+    public fun y(p: &Point): u64 {
+        p.y
+    }
+
+    fun abs_sub(a: u64, b: u64): u64 {
+        if (a < b) {
+            b - a
+        }
+        else {
+            a - b
+        }
+    }
+
+    public fun dist_squared(p1: &Point, p2: &Point): u64 {
+        let dx = abs_sub(p1.x, p2.x);
+        let dy = abs_sub(p1.y, p2.y);
+        dx*dx + dy*dy
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module circle {
+    use 0x2::point::{Self, Point};
+
+    struct Circle has copy, drop, store {
+        center: Point,
+        radius: u64,
+    }
+
+    public fun new(center: Point, radius: u64): Circle {
+        Circle { center, radius }
+    }
+
+    public fun overlaps(c1: &Circle, c2: &Circle): bool {
+        let d = point::dist_squared(&c1.center, &c2.center);
+        let r1 = c1.radius;
+        let r2 = c2.radius;
+        d*d <= r1*r1 + 2*r1*r2 + r2*r2
+    }
+}
+}
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/tuples.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/tuples.md
new file mode 100644
index 000000000..b3182e8c2
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/tuples.md
@@ -0,0 +1,117 @@
+# 元组和单值
+
+Move 不完全支持元组，因为人们可能期望像来自另一种语言的元组一样将它们作为[头等值（即头等公民）](https://zh.wikipedia.org/wiki/%E9%A0%AD%E7%AD%89%E7%89%A9%E4%BB%B6)。但是，为了支持多个返回值，Move 具有类似元组的表达式。这些表达式在运行时不会产生具体的值（字节码中没有元组），因此它们非常有限：它们只能出现在表达式中（通常在函数的返回位置）；它们不能绑定到局部变量；它们不能存储在结构中；元组类型不能用于实例化泛型。
+
+类似地，[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B) 是 Move 源语言创建的一种以表达式为基础的类型。单值 `()` 不会产生任何运行时值。我们可以认为单值 `()` 是一个空元组，适用于元组的任何限制也适用于单值。
+
+考虑到这些限制，在语言中使用元组可能会感觉很奇怪。但其他语言中，元组最常见的用例之一是函数 —— 允许函数返回多个值。一些语言通过强制用户编写包含多个返回值的结构来解决这个问题。但是在 Move 中，您不能将引用放在[结构体](./structs-and-resources.md)中。这需要 Move 支持多个返回值。这些多个返回值都在字节码级别被压入到堆栈中。在源码级别，这些多个返回值使用元组表示。
+
+## 字面量
+
+元组（tuple）是由括号内以逗号分隔的表达式列表创建的。
+
+| 语法            | 类型                                                                        | 描述                                    |
+|-----------------|-----------------------------------------------------------------------------|-----------------------------------------|
+| `()`            | `(): ()`                                                                    | 单值、空元组或 0 元素元组               |
+| `(e1, ..., en)` | `(e1, ..., en): (T1, ..., Tn)` 其中 `e_i: Ti` 满足 `0 < i <= n` and `n > 0` | n 元组、n 元素元组、带有 n 个元素的元组 |
+
+注意 `(e)` 没有类型 `(e): (t)`，换句话说，没有一个元素的元组。如果括号内只有一个元素，则括号仅用于消除歧义，不带有任何其他特殊含义。
+
+有时，具有两个元素的元组称为“二元组（pairs）”，而具有三个元素的元组称为“三元组（triples）”。
+
+### 例子
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+
+    // 当没有提供返回类型时，假定为 `()`
+    fun returns_unit_1() { }
+
+    // 空表达式块中存在隐式 () 值
+    fun returns_unit_2(): () { }
+
+    // `returns_unit_1` 和 `returns_unit_2` 的显式版本
+    fun returns_unit_3(): () { () }
+
+
+    fun returns_3_values(): (u64, bool, address) {
+        (0, false, @0x42)
+    }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) {
+        (x, 0, 1, b"foobar")
+    }
+}
+}
+```
+
+## 操作
+
+目前唯一可以对元组执行的操作是解构（destructuring）。
+
+### 解构
+
+对于任何大小的元组，它们可以在 `let` 绑定或赋值中被解构。
+
+例如：
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+    fun returns_unit() {}
+    fun returns_2_values(): (bool, bool) { (true, false) }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) { (x, 0, 1, b"foobar") }
+
+    fun examples(cond: bool) {
+        let () = ();
+        let (x, y): (u8, u64) = (0, 1);
+        let (a, b, c, d) = (@0x0, 0, false, b"");
+
+        () = ();
+        (x, y) = if (cond) (1, 2) else (3, 4);
+        (a, b, c, d) = (@0x1, 1, true, b"1");
+    }
+
+    fun examples_with_function_calls() {
+        let () = returns_unit();
+        let (x, y): (bool, bool) = returns_2_values();
+        let (a, b, c, d) = returns_4_values(&0);
+
+        () = returns_unit();
+        (x, y) = returns_2_values();
+        (a, b, c, d) = returns_4_values(&1);
+    }
+}
+}
+```
+
+有关更多详细信息，请参阅 [Move 变量](./variables.md)。
+
+## 子类型
+
+除了引用，元组是唯一在 Move 中具有[子类型（subtyping）](https://zh.wikipedia.org/wiki/%E5%AD%90%E7%B1%BB%E5%9E%8B)的类型。元组只有在具有引用的子类型（以协变方式）的意义上才具有子类型。
+
+例如:
+
+```move
+let x: &u64 = &0;
+let y: &mut u64 = &mut 1;
+
+// (&u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (a, b): (&u64, &u64) = (x, y);
+
+// (&mut u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (c, d): (&u64, &u64) = (y, y);
+
+// 错误！(&u64, &mut u64) 不是 (&mut u64, &mut u64) 的子类型
+// 因为 &u64 不是 &mut u64 的子类型
+let (e, f): (&mut u64, &mut u64) = (x, y);
+```
+
+## 所有权
+
+如上所述，元组值在运行时并不真正存在。由于这个原因，目前它们不能存储到局部变量中（但这个功能很可能很快就会出现）。因此，元组目前只能移动，因为复制它们需要先将它们放入局部变量中。
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/unit-testing.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/unit-testing.md
new file mode 100644
index 000000000..24f1fa5fc
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/unit-testing.md
@@ -0,0 +1,367 @@
+# 单元测试 (Unit Tests)
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+Move 语言中存在三种单元测试标注：
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail. These annotations can be placed on a function with any visibility. Whenever a module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+它们分别把函数、模块或模块成员（`use` 声明，函数 function，或结构体 struct）标记为只用于测试的代码，同时也标记期望失败的测试。这些标注可以用在任何可见性（visibility）函数上。无论何种情况，被标注为 `#[test_only]` 或 `#[test]` 的模块或模块成员除非用于测试，其它情况都不会被编译成字节码。
+
+## 测试注解：含义和使用方法（Testing Annotations: Their Meaning and Usage）
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+`#[test]` 和 `#[expected_failure]` 两个注解均可以在有、无参数情况下使用。
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+没有参数的 `#[test]` 标记只能用于没有参数的函数。表示该函数作为单元测试函数被运行。
+
+```
+#[test] // 正确 // OK
+fun this_is_a_test() { ... }
+
+#[test] // 编译失败，因为函数需要参数 // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the test should is expected to raise an error. You can ensure that a test is aborting with a specific abort code by annotating it with `#[expected_failure(abort_code = <code>)]`, if it then fails with a different abort code or with a non-abort error the test will fail. Only functions that have the `#[test]` annotation can also be annotated as an #`[expected_failure]`.
+
+测试也可以使用 `#[expected_failure]` 标注，表示该函数会抛出错误。你可以使用 `#[expected_failure(abort_code = <code>)]` 这种方式方式确保此测试会被指定错误码打断，如果抛出不同错误码或没有抛出错误测试将失败。只有被 `#[test]` 标注的函数才能使用 `#[expected_failure]` 标注。
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_will_abort_and_pass() { abort 1 }
+
+#[test]
+#[expected_failure]
+public fun test_will_error_and_pass() { 1/0; }
+
+#[test]
+#[expected_failure(abort_code = 0)]
+public fun test_will_error_and_fail() { 1/0; }
+
+#[test, expected_failure] // 可以合并多个属性。测试将会通过。 // Can have multiple in one attribute. This test will pass.
+public fun this_other_test_will_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do not have to be the same, but they must be able to be matched up with each other by name.
+
+测试标注可以采用 `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]` 这种形式指定参数。如果函数使用这样的标注，函数的参数则必须为 `<param_name_1>, ..., <param_name_n>` 的形式。参数在函数中的顺序不必与注解中顺序一致，但必须要能根据参数名匹配。
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+只有 `signer` 类型可以用作测试参数。使用非 `signer` 类型参数，测试将会失败。
+
+```
+#[test(arg = @0xC0FFEE)] // 正确 // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // 不正确: 参数名不匹配 // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // 正确，多参数情况下必须为每个参数提供值。 // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// 在某处声明一个命名地址（named address） // somewhere a named address is declared
+#[test_only] // 命名地址支持 test-only 注解 // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // 支持命名地址！ // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+预期失败的标注使用 `#[expected_failure(abort_code = <u64>)]` 这种形式。如果函数被这样标注，测试错误码必须为 `<u64>`。任何其它的错误或错误码都会失败。
+
+```
+#[test, expected_failure(abort_code = 1)] // 这个测试会失败 // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // 这个测试会通过 // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+模块和它的成员可以被声明为仅测试用。这种情况它们只会在测试模式下编译。此外，在非测试模式下，任何被 `#[test_only]` 标记的模块都会在编译时报错。
+
+```
+#[test_only] // test only 属性可以用于模块  // test only attributes can be attached to modules
+module abc { ... }
+
+#[test_only] // test only 属性可以用于命名地址 // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. 用于 use 声明 // .. to uses
+use 0x1::some_other_module;
+
+#[test_only] // .. 用于结构体 // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. 用于函数。只能在测试函数中调用，但自身不是测试 // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+## 运行单元测试（Running Unit Tests）
+
+Unit tests for a Move package can be run with the [`move test`
+command](./packages.md).
+
+使用 [`move test` 命令](./packages.md)运行包中的单元测试。
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+运行测试的结果包括 `PASS`、`FAIL` 或 `TIMEOUT`。如果测试失败，将会尽可能的提供执行失败的位置及函数名信息。请看下面的例子。
+
+A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+任何测试执行超过最大数量指令限制将会标记成超时。可以通过参数调整此限制，默认值为 5000 条指令。此外，虽然测试结果是确定的，但由于测试默认并行执行，所以测试结果的顺序是不确定的，除非使用单线程模式（见下述参数）。
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
+
+存在大量参数细粒度调整测试工具的行为，帮助调试失败的测试。可以通过 help 参数查看。
+
+```
+$ move -h
+```
+
+## 示例（Example）
+
+A simple module using some of the unit testing features is shown in the following example:
+
+下面例子展示了一个简单的使用了单元测试特性的模块：
+
+First create an empty package and change directory into it:
+
+首先创建一个空 package 进入目录：
+
+```
+$ move new TestExample; cd TestExample
+```
+
+Next add the following to the `Move.toml`:
+
+接下来添加下面内容到 `Move.toml` 文件：
+
+```
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b", addr_subst = { "std" = "0x1" } }
+```
+
+Next add the following module under the `sources` directory:
+
+接下来在 `sources` 目录下添加下述模块：
+
+```
+// 文件路径: sources/my_module.move // filename: sources/my_module.move
+module 0x1::my_module {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert!(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // 如果不关心错误码也可以使用 #[expected_failure] // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // 仅用作测试的帮助方法 // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+        assert!(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### 运行测试（Running Tests）
+
+You can then run these tests with the `move test` command:
+
+你可以使用 `move test` 命令运行测试。
+
+```
+$ move test
+BUILDING MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### 使用测试参数（Using Test Flags）
+
+#### `-f <str>` 或 `--filter <str>`（`-f <str>` or `--filter <str>`）
+
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+仅运行名字包含 `<str>` 字符的测试。例如只想运行名字包含 `"zero_coin"` 的测试：
+
+
+```
+$ move test -f zero_coin
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` 或 `--gas_used <bound>`（`-i <bound>` or `--gas_used <bound>`）
+
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+调整测试指令限制为 `<bound>`：
+
+```
+$ move test -i 0
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ TIMEOUT ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::my_module::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::my_module::test_has_coin
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` 或 `--statistics`（`-s` or `--statistics`）
+
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
+
+使用此参数你可以得到每个测试的运行报告及执行指令的统计信息。例如查看上述示例的统计数据：
+
+```
+$ move test -s
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+
+Test Statistics:
+
+┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                    │    Time    │   Gas Used   │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_zero_coin_fails      │   0.008    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::test_has_coin                  │   0.008    │             1             │
+└────────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` 或 `--state-on-error`（`-g` or `--state-on-error`）
+
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `my_module` example:
+
+这个参数会在测试失败情况下打印全局状态。如在 `my_module` 模块中添加下述失败测试：
+
+```
+module 0x1::my_module {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get get the following output when running the tests:
+
+当运行测试时我们将得到下面的输出：
+
+```
+$ move test -g
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+[ FAIL    ] 0x1::my_module::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── test_has_coin_bad ──────
+│ error[E11001]: test failure
+│    ┌─ /home/tzakian/TestExample/sources/my_module.move:47:10
+│    │
+│ 44 │      fun test_has_coin_bad(a: signer) {
+│    │          ----------------- In this function in 0x1::my_module
+│    ·
+│ 47 │          assert!(has_coin(@0x2), 1);
+│    │          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::my_module::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/uses.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/uses.md
new file mode 100644
index 000000000..79918badf
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/uses.md
@@ -0,0 +1,376 @@
+# 使用与别名（Uses and Aliases）
+
+The `use` syntax can be used to create aliases to members in other modules. `use` can be used to
+create aliases that last either for the entire module, or for a given expression block scope.
+
+`use` 语法可用于为其他模块中的成员创建别名。 `use` 可用于创建持续整个模块或给定表达式块范围的别名。
+
+## 语法（Syntax）
+There are several different syntax cases for `use`. Starting with the most simple, we have the
+following for creating aliases to other modules
+
+这里有几种不同的语法案例可供使用。从最简单的开始，我们有以下例子用于为其他模块创建别名
+
+```move
+use <address>::<module name>;
+use <address>::<module name> as <module alias name>;
+```
+For example
+举例
+```move
+use std::vector;
+use std::vector as V;
+```
+
+`use std::vector;` introduces an alias `vector` for `std::vector`. This means that anywhere you
+would want to use the module name `std::vector` (assuming this `use` is in scope), you could use
+`vector` instead. `use std::vector;` is equivalent to `use std::vector as vector;`
+
+`use std::vector；`为 `std::vector` 引入别名向量。这意味着在任何您想使用模块名称 `std::vector` 的地方（假设此`use`在作用域内），您都可以使用 `vector` 代替使用`std::vector`;
+
+Similarly `use std::vector as V;` would let you use `V` instead of `std::vector`
+
+同样使用 `std::vector as V`;会让你使用 `V` 代替 `std::vector`
+
+```move
+use std::vector;
+use std::vector as V;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = vector::empty();
+    let v3 = V::empty();
+    (v1, v2, v3)
+}
+```
+If you want to import a specific module member (such as a function, struct, or constant). You can
+use the following syntax.
+
+如果要导入特定的模块成员（例如函数、结构或常量）。您可以使用以下语法。
+```move
+use <address>::<module name>::<module member>;
+use <address>::<module name>::<module member> as <member alias>;
+```
+For example
+举例
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+```
+
+This would let you use the function `std::vector::empty` without full qualification. Instead you
+could use `empty` and `empty_vec` respectively. Again, `use std::vector::empty;` is equivalent to
+`use std::vector::empty as empty;`
+
+这将允许您在没有前缀限定的情况下使用函数 `std::vector::empty`。相反，您可以分别使用 `empty` 和 `empty_vec`，使用 `std::vector::empty;`使用`empty` 相当于使用`std::vector::empty`;
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = empty();
+    let v3 = empty_vec();
+    (v1, v2, v3)
+}
+```
+If you want to add aliases for multiple module members at once, you can do so with the following
+syntax
+
+如果要一次为多个模块成员添加别名，可以使用以下语法
+```move
+use <address>::<module name>::{<module member>, <module member> as <member alias> ... };
+```
+For example
+举例
+
+```move
+use std::vector::{push_back, length as len, pop_back};
+
+fun swap_last_two<T>(v: &mut vector<T>) {
+    assert!(len(v) >= 2, 42);
+    let last = pop_back(v);
+    let second_to_last = pop_back(v);
+    push_back(v, last);
+    push_back(v, second_to_last)
+}
+```
+
+If you need to add an alias to the Module itself in addition to module members, you can do that in a
+single `use` using `Self`. `Self` is a member of sorts that refers to the module.
+
+如果除了模块成员之外，您还需要为模块本身添加别名，您可以使用 `Self` 在一次`use`中完成。 `Self` 是指模块的各种成员。
+```move
+use std::vector::{Self, empty};
+For clarity, all of the following are equivalent:
+```
+For clarity, all of the following are equivalent:
+
+为清晰起见，以下所有内容都是等效的：
+```move
+use std::vector;
+use std::vector as vector;
+use std::vector::Self;
+use std::vector::Self as vector;
+use std::vector::{Self};
+use std::vector::{Self as vector};
+```
+If needed, you can have as many aliases for any item as you like
+
+如果需要，您可以为任何项目设置任意数量的别名
+
+```move
+use std::vector::{
+    Self,
+    Self as V,
+    length,
+    length as len,
+};
+
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    // all options available given the `use` above
+    assert!(vector::length(v) > 1, 42);
+    assert!(V::length(v) > 1, 42);
+    assert!(length(v) > 1, 42);
+    assert!(len(v) > 1, 42);
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+## 模块内部（Inside a `module`）
+Inside of a `module` all `use` declarations are usable regardless of the order of declaration.
+
+在模块内部，无论声明顺序如何，所有 `use` 声明都是可用的。
+```move
+address 0x42 {
+module example {
+    use std::vector;
+
+    fun example(): vector<u8> {
+        let v = empty();
+        vector::push_back(&mut v, 0);
+        vector::push_back(&mut v, 10);
+        v
+    }
+
+    use std::vector::empty;
+}
+}
+```
+The aliases declared by `use` in the module usable within that module.
+
+在该模块中可用的模块中使用声明的别名。
+
+Additionally, the aliases introduced cannot conflict with other module members. See
+[Uniqueness](#uniqueness) for more details
+
+此外，引入的别名不能与其他模块成员冲突。有关详细信息，请参阅[唯一性](#uniqueness)。
+
+## 表达式内部（Inside an expression）
+You can add `use` declarations to the beginning of any expression block
+
+您可以将 `use` 声明添加到任何表达式块的开头
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        use std::vector::{empty, push_back};
+
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    }
+}
+}
+```
+As with `let`, the aliases introduced by `use` in an expression block are removed at the end of that
+block.
+
+与 `let` 一样，在表达式块中使用 `use` 引入的别名在该块的末尾被删除。
+
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        let result = {
+            use std::vector::{empty, push_back};
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 10);
+            v
+        };
+        result
+    }
+
+}
+}
+```
+Attempting to use the alias after the block ends will result in an error
+
+在块结束后尝试使用别名将导致错误
+```move
+fun example(): vector<u8> {
+    let result = {
+        use std::vector::{empty, push_back};
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    };
+    let v2 = empty(); // 错误!
+//           ^^^^^ 未绑定的函数 'empty'
+    结果
+}
+```
+Any `use` must be the first item in the block. If the `use` comes after any expression or `let`, it
+will result in a parsing error
+
+任何使用都必须是块中的第一项。如果 use 出现在任何表达式或 let 之后，则会导致解析错误
+```move
+{
+    let x = 0;
+    use std::vector; // 错误!
+    let v = vector::empty();
+}
+```
+
+## 命名规则（Naming rules）
+Aliases must follow the same rules as other module members. This means that aliases to structs or
+constants must start with `A` to `Z`
+
+别名必须遵循与其他模块成员相同的规则。这意味着结构或常量的别名必须以 `A` 到 `Z` 开头
+```move
+address 0x42 {
+module data {
+    struct S {}
+    const FLAG: bool = false;
+    fun foo() {}
+}
+module example {
+    use 0x42::data::{
+        S as s, // 错误!
+        FLAG as fLAG, // 错误!
+        foo as FOO,  // 有效
+        foo as bar, // 有效
+    };
+}
+}
+```
+## 唯一性（Uniqueness）
+Inside a given scope, all aliases introduced by `use` declarations must be unique.
+
+在给定范围内，所有由 use 声明引入的别名必须是唯一的。
+
+For a module, this means aliases introduced by `use` cannot overlap
+
+对于一个模块，这意味着使用引入的别名不能重复
+```move
+address 0x42 {
+module example {
+
+    use std::vector::{empty as foo, length as foo}; // ERROR!
+    //                                        ^^^ duplicate 'foo'
+
+    use std::vector::empty as bar;
+
+    use std::vector::length as bar; // 错误!
+    //                         ^^^ 重复的 'bar'
+
+}
+}
+```
+And, they cannot overlap with any of the module's other members
+
+而且，它们不能与模块的任何其他成员重复
+```move
+address 0x42 {
+module data {
+    struct S {}
+}
+module example {
+    use 0x42::data::S;
+
+    struct S { value: u64 } // ERROR!
+    //     ^ conflicts with alias 'S' above
+}
+}
+```
+Inside of an expression block, they cannot overlap with each other, but they can
+[shadow](#shadowing) other aliases or names from an outer scope
+
+在表达式块内部，它们不能相互重复，但它们可以遮蔽外部作用域中的其他别名或名称
+
+## 遮蔽（Shadowing）
+`use` aliases inside of an expression block can shadow names (module members or aliases) from the
+outer scope. As with shadowing of locals, the shadowing ends at the end of the expression block;
+
+在表达式块内使用别名可以覆盖外部作用域的名称（模块成员或别名）。当遮蔽局部变量时，遮蔽会在表达式块的末尾结束；
+```move
+address 0x42 {
+module example {
+
+    struct WrappedVector { vec: vector<u64> }
+
+    fun empty(): WrappedVector {
+        WrappedVector { vec: std::vector::empty() }
+    }
+
+    fun example1(): (WrappedVector, WrappedVector) {
+        let vec = {
+            use std::vector::{empty, push_back};
+            // 'empty' 现在指向 std::vector::empty
+
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 1);
+            push_back(&mut v, 10);
+            v
+        };
+        // 'empty' 现在指向 Self::empty
+
+        (empty(), WrappedVector { vec })
+    }
+
+    fun example2(): (WrappedVector, WrappedVector) {
+        use std::vector::{empty, push_back};
+        let w: WrappedVector = {
+            use 0x42::example::empty;
+            empty()
+        };
+        push_back(&mut w.vec, 0);
+        push_back(&mut w.vec, 1);
+        push_back(&mut w.vec, 10);
+
+        let vec = empty();
+        push_back(&mut vec, 0);
+        push_back(&mut vec, 1);
+        push_back(&mut vec, 10);
+
+        (w, WrappedVector { vec })
+    }
+}
+}
+```
+
+## 未使用的Use或别名（Unused Use or Alias）
+An unused `use` will result in an error
+
+未使用的 `use` 会导致错误
+```move
+address 0x42 {
+module example {
+    use std::vector::{empty, push_back}; // ERROR!
+    //                       ^^^^^^^^^ 未使用的别名 'push_back'
+
+    fun example(): vector<u8> {
+        empty()
+    }
+}
+}
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/variables.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/variables.md
new file mode 100644
index 000000000..3625728ef
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/variables.md
@@ -0,0 +1,879 @@
+# 局部变量和作用域（Local Variables and Scopes）
+
+Local variables in Move are lexically (statically) scoped. New variables are introduced with the
+keyword `let`, which will shadow any previous local with the same name. Locals are mutable and can
+be updated both directly and via a mutable reference.
+
+在 Move 语言中，局部变量的解析依赖于词法作用域（lexically scoped）或静态作用域（statically scoped）。使用关键字 `let` 引入新的变量，它将隐藏任何以前的同名局部变量。局部变量是可变的（Rust 中的变量默认不可变，译者注），可以直接更新，也可以通过可变引用更新。
+
+## 声明局部变量（Declaring Local Variables）
+
+### `let` 绑定（`let` bindings）
+
+Move programs use `let` to bind variable names to values:
+
+Move 程序使用 `let` 给变量名绑定一个值：
+
+```move
+let x = 1;
+let y = x + x:
+```
+
+`let` can also be used without binding a value to the local.
+
+`let` 使用时也可以不绑定任何数值给局部变量。
+
+```move
+let x;
+```
+
+The local can then be assigned a value later.
+
+然后可以稍后为局部变量赋一个值。
+
+```move
+let x;
+if (cond) {
+  x = 1
+} else {
+  x = 0
+}
+```
+
+This can be very helpful when trying to extract a value from a loop when a default value cannot be provided.
+
+当无法提供默认值时，这在尝试从循环中提取值时非常有用。
+
+```move
+let x;
+let cond = true;
+let i = 0;
+loop {
+    (x, cond) = foo(i);
+    if (!cond) break;
+    i = i + 1;
+}
+```
+
+### 变量必须在使用前赋值（Variables must be assigned before use）
+
+Move's type system prevents a local variable from being used before it has been assigned.
+
+Move 的类型系统防止在赋值之前使用局部变量。
+
+```move
+let x;
+x + x // ERROR!
+```
+
+```move
+let x;
+if (cond) x = 0;
+x + x // ERROR!
+```
+
+```move
+let x;
+while (cond) x = 0;
+x + x // ERROR!
+```
+
+### 有效的变量名（Valid variable names）
+
+Variable names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, and digits `0`
+to `9`. Variable names must start with either an underscore `_` or a letter `a` through `z`. They
+_cannot_ start with uppercase letters.
+
+变量名可以包含下划线 `_`、小写字母 `a` 到 `z`、大写字母 `A` 到 `Z`、和数字 `0` 到 `9`。变量名必须以下划线 `_` 或者以小写字母`a`到`z`开头。它们*不能*以大写字母开头。
+
+```move
+// 全部有效
+let x = e;
+let _x = e;
+let _A = e;
+let x0 = e;
+let xA = e;
+let foobar_123 = e;
+
+// 全部无效
+let X = e; // ERROR!
+let Foo = e; // ERROR!
+```
+
+### 类型标注（Type annotations）
+
+The type of a local variable can almost always be inferred by Move's type system. However, Move
+allows explicit type annotations that can be useful for readability, clarity, or debuggability. The
+syntax for adding a type annotation is:
+
+局部变量的类型几乎总是可以通过 Move 的类型系统推断出来。但是，Move 允许显式类型标注，这对可读性、清晰性或可调试性很有用。添加类型标注的语法如下：
+
+```move
+let x: T = e; // “T 类型的变量 x 被初始化为表达式 e”
+```
+
+Some examples of explicit type annotations:
+
+一些显式类型标注的示例：
+
+```move
+address 0x42 {
+module example {
+
+    struct S { f: u64, g: u64 }
+
+    fun annotated() {
+        let u: u8 = 0;
+        let b: vector<u8> = b"hello";
+        let a: address = @0x0;
+        let (x, y): (&u64, &mut u64) = (&0, &mut 1);
+        let S { f, g: f2 }: S = S { f: 0, g: 1 };
+    }
+}
+}
+```
+
+Note that the type annotations must always be to the right of the pattern:
+
+请注意，类型标注必须始终位于变量模式的右侧：
+
+```move
+let (x: &u64, y: &mut u64) = (&0, &mut 1); // 错误！正确写法是 let (x, y): ... =
+```
+
+### 何时需要类型标注（When annotations are necessary）
+
+In some cases, a local type annotation is required if the type system cannot infer the type. This
+commonly occurs when the type argument for a generic type cannot be inferred. For example:
+
+在某些情况下，如果类型系统无法推断类型，则需要局部类型标注。这通常发生在无法推断某个泛型（generic type）的类型参数时，比如：
+
+```move
+let _v1 = vector::empty(); // 错误！
+//        ^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation （无法推断此类型。尝试添加标注）
+let v2: vector<u64> = vector::empty(); // 没有错误
+```
+
+In a rarer case, the type system might not be able to infer a type for divergent code (where all the
+following code is unreachable). Both `return` and [`abort`](./abort-and-assert.md) are expressions
+and can have any type. A [`loop`](./loops.md) has type `()` if it has a `break`, but if there is no
+break out of the `loop`, it could have any type. If these types cannot be inferred, a type
+annotation is required. For example, this code:
+
+在极少数情况下，Move 的类型系统可能无法推断出一段发散式代码（divergent code）的类型（后面所有代码无法访问）。在 Move 语言中，`return` 和 [`abort`](./abort-and-assert.md) 都属于表达式，它们可以返回任何类型。如果一段 [`loop`](./loops.md) 有 `break`，那么它的返回类型是 `()`，但是如果它不包含 `break`，它的返回类型可以是任何类型。如果无法推断出这些类型，那么类型标注是必须的。例如，这段代码：
+
+```move
+let a: u8 = return ();
+let b: bool = abort 0;
+let c: signer = loop ();
+
+let x = return (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let y = abort 0; // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let z = loop (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+```
+
+Adding type annotations to this code will expose other errors about dead code or unused local
+variables, but the example is still helpful for understanding this problem.
+
+在这段代码中添加类型标注会暴露其他关于死代码或未使用的局部变量的错误，但该示例仍然有助于理解这个问题。
+
+### 元组式的多个变量声明（Multiple declarations with tuples）
+
+`let` can introduce more than one local at a time using tuples. The locals declared inside the
+parenthesis are initialized to the corresponding values from the tuple.
+
+`let` 可以使用元组一次引入多个局部变量。在括号内声明的局部变量会被初始化为元组中的对应值。
+
+```move
+let () = ();
+let (x0, x1) = (0, 1);
+let (y0, y1, y2) = (0, 1, 2);
+let (z0, z1, z2, z3) = (0, 1, 2, 3);
+```
+
+The type of the expression must match the arity of the tuple pattern exactly.
+
+表达式的类型必须与元组模式的数量完全匹配。
+
+```move
+let (x, y) = (0, 1, 2); // 错误！
+let (x, y, z, q) = (0, 1, 2); // 错误！
+```
+
+You cannot declare more than one local with the same name in a single `let`.
+
+你不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let (x, x) = 0; // 错误！
+```
+
+### 结构体式的多个变量声明（Multiple declarations with structs）
+
+`let` can also introduce more than one local at a time when destructuring (or matching against) a
+struct. In this form, the `let` creates a set of local variables that are initialized to the values
+of the fields from a struct. The syntax looks like this:
+
+`let` 还可以在解构（或匹配）结构体时一次引入多个局部变量。在这种形式中，`let` 创建了一组局部变量，这些变量被初始化为结构体中字段的值。语法如下所示：
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+Here is a more complicated example:
+
+这是一个更复杂的示例：
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let Y { x1: X { f }, x2 } = Y { x1: new_x(), x2: new_x() };
+            assert!(f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = Y { x1: new_x(), x2: new_x() };
+            assert!(f1 + f2 == 2, 42);
+        }
+    }
+}
+```
+
+Fields of structs can serve double duty, identifying the field to bind _and_ the name of the
+variable. This is sometimes referred to as punning.
+
+结构体的字段可以起到双重作用：识别要绑定的字段*和*命名变量。这有时被称为双关语。
+
+```move
+let X { f } = e;
+```
+
+is equivalent to:
+
+等价于：
+
+```move
+let X { f: f } = e;
+```
+
+As shown with tuples, you cannot declare more than one local with the same name in a single `let`.
+
+如元组所示，您不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let Y { x1: x, x2: x } = e; // 错误！（两个 x 同名了）
+```
+
+### 针对引用进行解构（Destructuring against references）
+
+In the examples above for structs, the bound value in the let was moved, destroying the struct value
+and binding its fields.
+
+在上面的结构体示例中，`let` 中绑定的值被移动了，这销毁了结构体的值并同时绑定了它的字段（到变量）。
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+In this scenario the struct value `T { f1: 1, f2: 2 }` no longer exists after the `let`.
+
+If you wish instead to not move and destroy the struct value, you can borrow each of its fields. For
+example:
+
+在这种场景下结构体的值 `T { f1: 1, f2: 2 }` 会在 `let` 后消失。
+
+如果您希望不移动和销毁结构体的值，则可以借用其中的每个字段。例如：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &t;
+// local1: &u64
+// local2: &u64
+```
+
+And similarly with mutable references:
+
+可变引用也类似：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &mut t;
+// local1: &mut u64
+// local2: &mut u64
+```
+
+This behavior can also work with nested structs.
+
+此行为也适用于嵌套结构体。
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let y = Y { x1: new_x(), x2: new_x() };
+
+            let Y { x1: X { f }, x2 } = &y;
+            assert!(*f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = &mut y;
+            *f1 = *f1 + 1;
+            *f2 = *f2 + 1;
+            assert!(*f1 + *f2 == 4, 42);
+        }
+    }
+}
+```
+
+### 忽略值（Ignoring Values）
+
+In `let` bindings, it is often helpful to ignore some values. Local variables that start with `_`
+will be ignored and not introduce a new variable
+
+在 `let` 绑定中，忽略某些值通常很有帮助。以 `_` 开头的局部变量将被忽略并且不会引入新变量。
+
+```move
+fun three(): (u64, u64, u64) {
+    (0, 1, 2)
+}
+```
+
+```move
+let (x1, _, z1) = three();
+let (x2, _y, z2) = three();
+assert!(x1 + z1 == x2 + z2, 42);
+```
+
+This can be necessary at times as the compiler will error on unused local variables。
+
+这有时是必要的，因为编译器会在未使用的局部变量上报错。
+
+```move
+let (x1, y, z1) = three(); // 错误！
+//       ^ 未被使用的局部变量 'y'
+```
+
+### 通用的 `let` 语法（General `let` grammar）
+
+All of the different structures in `let` can be combined! With that we arrive at this general
+grammar for `let` statements:
+
+`let` 中所有不同的结构体都可以组合！这样，我们就得出了 `let` 语句的通用语法：
+
+> _let-binding_ → **let** _pattern-or-list_ _type-annotation_<sub>_opt_</sub>
+> _initializer_<sub>_opt_</sub> > _pattern-or-list_ → _pattern_ | **(** _pattern-list_ **)** >
+> _pattern-list_ → _pattern_ **,**<sub>_opt_</sub> | _pattern_ **,** _pattern-list_ >
+> _type-annotation_ → **:** _type_ _initializer_ → **=** _expression_
+
+The general term for the item that introduces the bindings is a _pattern_. The pattern serves to
+both destructure data (possibly recursively) and introduce the bindings. The pattern grammar is as
+follows:
+
+引入绑定的项的通用术语是 *模式（pattern）*。该模式用于解构数据（可能是递归的）并引入绑定。模式语法如下：
+
+> _pattern_ → _local-variable_ | _struct-type_ **{** _field-binding-list_ **}** >
+> _field-binding-list_ → _field-binding_ **,**<sub>_opt_</sub> | _field-binding_ **,**
+> _field-binding-list_ > _field-binding_ → _field_ | _field_ **:** _pattern_
+
+A few concrete examples with this grammar applied:
+
+应用此语法的一些具体示例：
+
+```move
+    let (x, y): (u64, u64) = (0, 1);
+//       ^                           local-variable（局部变量）
+//       ^                           pattern（模式）
+//          ^                        local-variable（局部变量）
+//          ^                        pattern（模式）
+//          ^                        pattern-list（模式列表）
+//       ^^^^                        pattern-list（模式列表）
+//      ^^^^^^                       pattern-or-list（模式或列表）
+//            ^^^^^^^^^^^^           type-annotation（类型标注）
+//                         ^^^^^^^^  initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+
+    let Foo { f, g: x } = Foo { f: 0, g: 1 };
+//      ^^^                                    struct-type（结构类型）
+//            ^                                field（字段）
+//            ^                                field-binding（字段绑定）
+//               ^                             field（字段）
+//                  ^                          local-variable（局部变量）
+//                  ^                          pattern（模式）
+//               ^^^^                          field-binding（字段绑定）
+//            ^^^^^^^                          field-binding-list（字段绑定列表）
+//      ^^^^^^^^^^^^^^^                        pattern（模式）
+//      ^^^^^^^^^^^^^^^                        pattern-or-list（模式或列表）
+//                      ^^^^^^^^^^^^^^^^^^^^   initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+```
+
+## 变更（Mutations）
+
+### 赋值（Assignments）
+
+After the local is introduced (either by `let` or as a function parameter), the local can be
+modified via an assignment:
+
+在引入局部变量后（通过 `let` 或作为函数参数），可以通过赋值来修改局部变量：
+
+```move
+x = e
+```
+
+Unlike `let` bindings, assignments are expressions. In some languages, assignments return the value
+that was assigned, but in Move, the type of any assignment is always `()`.
+
+与 `let` 绑定不同，赋值是表达式。在某些语言中，赋值会返回被赋予的值，但在 Move 语言中，任何赋值的返回类型始终是 `()`。
+
+```move
+(x = e: ())
+```
+
+Practically, assignments being expressions means that they can be used without adding a new
+expression block with braces (`{`...`}`).
+
+实际上，赋值作为表达式意味着它们可以在不添加带有大括号（`{`...`}`）的新表达式块（expression block）的情况下使用。
+
+```move
+let x = 0;
+if (cond) x = 1 else x = 2;
+```
+
+The assignment uses the same pattern syntax scheme as `let` bindings:
+
+赋值使用与 `let` 绑定相同的模式语法方案：
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    // 这个例子会因为存在未使用的变量和赋值而报错。
+    fun example() {
+       let (x, _, z) = (0, 1, 3);
+       let (x, y, f, g);
+
+       (X { f }, X { f: x }) = (new_x(), new_x());
+       assert!(f + x == 2, 42);
+
+       (x, y, z, f, _, g) = (0, 0, 0, 0, 0, 0);
+    }
+}
+}
+```
+
+Note that a local variable can only have one type, so the type of the local cannot change between
+assignments.
+
+注意，一个局部变量只能有一种类型，所以局部变量的类型不能在赋值之间（多次赋值）改变。
+
+```move
+let x;
+x = 0;
+x = false; // 错误！
+```
+
+### 通过引用进行变更（Mutating through a reference）
+
+In addition to directly modifying a local with assignment, a local can be modified via a mutable
+reference `&mut`.
+
+除了通过赋值直接修改局部变量外，还可以通过可变引用 `&mut` 的方式修改局部变量。
+
+```move
+let x = 0;
+let r = &mut x;
+*r = 1;
+assert!(x == 1, 42);
+```
+
+This is particularly useful if either:
+
+(1) You want to modify different variables depending on some condition.
+
+这在以下情况下特别有用：
+
+(1) 你想根据某些条件修改不同的变量。
+
+```move
+let x = 0;
+let y = 1;
+let r = if (cond) &mut x else &mut y;
+*r = *r + 1;
+```
+
+(2) You want another function to modify your local value.
+
+(2) 你想要另一个函数来修改你的局部变量值。
+
+```move
+let x = 0;
+modify_ref(&mut x);
+```
+
+This sort of modification is how you modify structs and vectors!
+
+这种修改方法就是你修改结构体和向量的方式！
+
+```move
+let v = vector::empty();
+vector::push_back(&mut v, 100);
+assert!(*vector::borrow(&v, 0) == 100, 42);
+```
+
+For more details, see [Move references](./references.md).
+
+有关更多详细信息，请参阅 [Move 引用](./references.md)。
+
+## 作用域（Scopes）
+
+Any local declared with `let` is available for any subsequent expression, _within that scope_.
+Scopes are declared with expression blocks, `{`...`}`.
+
+Locals cannot be used outside of the declared scope.
+
+使用 `let` 声明的任何局部变量都可用于*该作用域内*的任何后续表达式。作用域用表达式块（expression blocks）声明，`{`...`}`。
+
+局部变量不能在声明的作用域之外使用。
+
+```move
+let x = 0;
+{
+    let y = 1;
+};
+x + y // 错误！
+//  ^ unbound local 'y'（未绑定的局部变量“y”）
+```
+
+But, locals from an outer scope _can_ be used in a nested scope.
+
+但是，来自外部作用域的本地变量*可以*在嵌套作用域中使用。
+
+```move
+{
+    let x = 0;
+    {
+        let y = x + 1; // 有效的
+    }
+}
+```
+
+Locals can be mutated in any scope where they are accessible. That mutation survives with the local,
+regardless of the scope that performed the mutation.
+
+局部变量可以在允许访问的任何作用域内进行变更。无论执行变更的作用域如何，这种变更会跟随局部变量的生命周期。
+
+```move
+let x = 0;
+x = x + 1;
+assert!(x == 1, 42);
+{
+    x = x + 1;
+    assert!(x == 2, 42);
+};
+assert!(x == 2, 42);
+```
+
+### 表达式块（Expression Blocks）
+
+An expression block is a series of statements separated by semicolons (`;`). The resulting value of
+an expression block is the value of the last expression in the block.
+
+表达式块是由分号（`;`）分隔的一系列语句。表达式块的结果值是块中最后一个表达式的值。
+
+```move
+{ let x = 1; let y = 1; x + y }
+```
+
+In this example, the result of the block is `x + y`.
+
+A statement can be either a `let` declaration or an expression. Remember that assignments (`x = e`)
+are expressions of type `()`.
+
+在此示例中, 此区块的结果是 `x + y`.
+
+语句可以是 `let` 声明或表达式。请记住，赋值（`x = e`）是 `()` 类型的表达式。
+
+```move
+{ let x; let y = 1; x = 1; x + y }
+```
+
+Function calls are another common expression of type `()`. Function calls that modify data are
+commonly used as statements.
+
+函数调用是 `()` 类型的另一种常见表达方式。修改数据的函数调用通常被用作语句。
+
+```move
+{ let v = vector::empty(); vector::push_back(&mut v, 1); v }
+```
+
+This is not just limited to `()` types---any expression can be used as a statement in a sequence!
+
+这不仅限于 `()` 类型 —— 任何表达式都可以用作序列中的语句！
+
+```move
+{
+    let x = 0;
+    x + 1; // 值会被丢弃
+    x + 2; // 值会被丢弃
+    b"hello"; // 值会被丢弃
+}
+```
+
+But! If the expression contains a resource (a value without the `drop` [ability](./abilities.md)),
+you will get an error. This is because Move's type system guarantees that any value that is dropped
+has the `drop` [ability](./abilities.md). (Ownership must be transferred or the value must be
+explicitly destroyed within its declaring module.)
+
+但是！如果表达式包含资源（没有 `drop` [能力](./abilities.md)的值），你将收到错误消息。这是因为 Move 的类型系统保证任何被删除的值都具有 `drop` [能力](./abilities.md)。（必须转移所有权，或者必须在其声明模块中显式销毁该值。）
+
+```move
+{
+    let x = 0;
+    Coin { value: x }; // 错误！
+//  ^^^^^^^^^^^^^^^^^ unused value without the `drop` ability（未使用没有 `drop` 能力的值）
+    x
+}
+```
+
+If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
+there is an implicit unit `()` value. Similarly, if the expression block is empty, there is an
+implicit unit `()` value.
+
+如果块中不存在最终表达式 —— 也就是说，如果有一个尾随分号 `;`，则含有一个隐式的[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B)。同样，如果表达式块为空，那么也存在隐式的单值 `()`。
+
+```move
+// 两者是等价的
+{ x = x + 1; 1 / x; }
+{ x = x + 1; 1 / x; () }
+```
+
+```move
+// 两者是等价的
+{ }
+{ () }
+```
+
+An expression block is itself an expression and can be used anyplace an expression is used. (Note:
+The body of a function is also an expression block, but the function body cannot be replaced by
+another expression.)
+
+表达式块本身就是一个表达式，可以在任何使用表达式的地方使用。（注意：函数体也是一个表达式块，但函数体不能被另一个表达式替换。）
+
+```move
+let my_vector: vector<vector<u8>> = {
+    let v = vector::empty();
+    vector::push_back(&mut v, b"hello");
+    vector::push_back(&mut v, b"goodbye");
+    v
+};
+```
+
+(The type annotation is not needed in this example and only added for clarity.)
+
+（此示例中不需要类型标注，只是为了清楚起见而添加。）
+
+### 遮蔽（Shadowing）
+
+If a `let` introduces a local variable with a name already in scope, that previous variable can no
+longer be accessed for the rest of this scope. This is called _shadowing_.
+
+如果一个 `let` 引入了一个名称已经在作用域中的局部变量，则该作用域的剩余部分将无法再访问先前的变量。这称为*遮蔽（shadowing）*。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = 1; // x 被遮蔽了
+assert!(x == 1, 42);
+```
+
+When a local is shadowed, it does not need to retain the same type as before.
+
+当局部变量被遮蔽时，它不需要保留与以前相同的类型。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = b"hello"; // x 被遮蔽了
+assert!(x == b"hello", 42);
+```
+
+After a local is shadowed, the value stored in the local still exists, but will no longer be
+accessible. This is important to keep in mind with values of types without the
+[`drop` ability](./abilities.md), as ownership of the value must be transferred by the end of the
+function.
+
+在局部变量被遮蔽后，存储在局部变量的值仍然存在，但是将不再可访问。对于没有 [`drop` 能力](./abilities.md)的类型的值，请记住这一点很重要，因为值的所有权必须在函数结束时转移。
+
+```move
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+
+        fun unused_resource(): Coin {
+            let x = Coin { value: 0 }; // ERROR!
+//              ^ This local still contains a value without the `drop` ability（这个局部变量仍然包含一个没有 `drop` 能力的值）
+            x.value = 1;
+            let x = Coin { value: 10 };
+            x
+//          ^ Invalid return（无效的返回）
+        }
+    }
+}
+```
+
+When a local is shadowed inside a scope, the shadowing only remains for that scope. The shadowing is
+gone once that scope ends.
+
+当局部变量在作用域内被遮蔽时，该遮蔽作用仅保留在该作用域内。一旦该作用域结束，遮蔽作用就消失了。
+
+```move
+let x = 0;
+{
+    let x = 1;
+    assert!(x == 1, 42);
+};
+assert!(x == 0, 42);
+```
+
+Remember, locals can change type when they are shadowed.
+
+请记住，局部变量在被遮蔽时可以更改类型。
+
+```move
+let x = 0;
+{
+    let x = b"hello";
+    assert!(x = b"hello", 42);
+};
+assert!(x == 0, 42);
+```
+
+## 移动和复制（Move and Copy）
+
+All local variables in Move can be used in two ways, either by `move` or `copy`. If one or the other
+is not specified, the Move compiler is able to infer whether a `copy` or a `move` should be used.
+This means that in all of the examples above, a `move` or a `copy` would be inserted by the
+compiler. A local variable cannot be used without the use of `move` or `copy`.
+
+`copy` will likely feel the most familiar coming from other programming languages, as it creates a
+new copy of the value inside of the variable to use in that expression. With `copy`, the local
+variable can be used more than once.
+
+Move 中的所有局部变量都可以通过两种方式使用，通过 `move` 或 `copy`。如果未指定其中之一，则 Move 编译器能够推断应该使用 `copy` 还是 `move`。这意味着在上述所有示例中，编译器将插入 `move` 或 `copy`。如果不使用 `move` 或 `copy`，就不能使用局部变量。
+
+`copy` 对来自其他编程语言的开发者来说可能会觉得最熟悉，因为它会在变量内部创建一个新的副本值以在该表达式中使用。使用 `copy`，局部变量可以被多次使用。
+
+```move
+let x = 0;
+let y = copy x + 1;
+let z = copy x + 2;
+```
+
+Any value with the `copy` [ability](./abilities.md) can be copied in this way.
+
+`move` takes the value out of the local variable _without_ copying the data. After a `move` occurs,
+the local variable is unavailable.
+
+任何具有 `copy` [能力](./abilities.md)的值都可以通过这种方式复制。
+
+`move` 从局部变量中取出值*而不是*复制数据。`移动（move）`发生后，局部变量将不可用。
+
+```move
+let x = 1;
+let y = move x + 1;
+//      ------ Local was moved here（局部变量被移动到这里了）
+let z = move x + 2; // 错误！
+//      ^^^^^^ Invalid usage of local 'x'（局部变量“x”的无效使用方式）
+y + z
+```
+
+### 安全性（Safety）
+
+Move's type system will prevent a value from being used after it is moved. This is the same safety
+check described in [`let` declaration](#let-bindings) that prevents local variables from being used
+before it is assigned a value.
+
+Move 的类型系统会阻止一个值在移动后被使用。这与 [`let` 声明](#let-绑定let-bindings)中描述的防止在局部变量被赋值之前使用的安全检查相同。
+
+<!-- For more information, see TODO future section on ownership and move semantics. -->
+
+<!-- 如了解更多信息, 参阅未来所有权和移动语义的部分 (TODO )。 -->
+
+### 推断（Inference）
+
+As mentioned above, the Move compiler will infer a `copy` or `move` if one is not indicated. The
+algorithm for doing so is quite simple:
+
+- Any scalar value with the `copy` [ability](./abilities.md) is given a `copy`.
+- Any reference (both mutable `&mut` and immutable `&`) is given a `copy`.
+  - Except under special circumstances where it is made a `move` for predictable borrow checker errors.
+- Any other value is given a `move`.
+  - This means that even though other values might be have the `copy` [ability](./abilities.md), it must be done _explicitly_ by the programmer.
+  - This is to prevent accidental copies of large data structures.
+
+如上所述，如果未指明，Move 编译器将推断出 `copy` 还是 `move`。这样做的算法非常简单：
+
+- 任何带有 `copy` [能力](./abilities.md)的标量值都被赋予了 `copy`。
+- 任何引用（可变的 `&mut` 和不可变的 `&`）都被赋予 `copy`。
+  - 除非在可预测的借用检查器错误的特殊情况下，会进行 `move` 操作。
+- 任何其他值都被赋予 `move`。
+  - 这意味着即使其他值可能具有 `copy` [能力](./abilities.md)，它也必须由程序员*显式*声明。
+  - 这是为了防止意外地复制很大的数据结构。
+
+例如：
+
+```move
+let s = b"hello";
+let foo = Foo { f: 0 };
+let coin = Coin { value: 0 };
+
+let s2 = s; // 移动
+let foo2 = foo; // 移动
+let coin2 = coin; // 移动
+
+let x = 0;
+let b = false;
+let addr = @0x42;
+let x_ref = &x;
+let coin_ref = &mut coin2;
+
+let x2 = x; // 复制
+let b2 = b; // 复制
+let addr2 = @0x42; // 复制
+let x_ref2 = x_ref; // 复制
+let coin_ref2 = coin_ref; // 复制
+```
diff --git a/vendors/move/crates/documentation/book/translations/move-book-zh/src/vector.md b/vendors/move/crates/documentation/book/translations/move-book-zh/src/vector.md
new file mode 100644
index 000000000..286892a28
--- /dev/null
+++ b/vendors/move/crates/documentation/book/translations/move-book-zh/src/vector.md
@@ -0,0 +1,152 @@
+# 向量
+
+`vector<T>` 是 Move 提供的唯一原始集合类型。`vector<T>` 是类型为 `T` 的同构集合，可以通过从"末端"推入/弹出（出栈/入栈，译者注）值来增长或缩小。
+*（与 Rust 一样，向量（vector）是一种可以存放任何类型的可变大小的容器，也可称为[动态数组](https://en.wikipedia.org/wiki/Dynamic_array)，与 Python 中的[列表（list）](https://computersciencewiki.org/index.php/Lists)不同，译者注）*
+
+`vector<T>` 可以用任何类型 `T` 实例化。例如，`vector<u64>`、`vector<address>`、`vector<0x42::MyModuel::MyResource>` 和 `vector<vector<u8>>` 都是有效的向量类型。
+
+## 字面量
+
+### 通用 `vector` 字面量
+
+任何类型的向量都可以通过 `vector` 字面量创建。
+
+| 语法                  | 类型                                                                          | 描述                              |
+|-----------------------|-------------------------------------------------------------------------------|-----------------------------------|
+| `vector[]`            | `vector[]: vector<T>` 其中 `T` 是任何单一的非引用类型                         | 一个空向量                        |
+| `vector[e1, ..., en]` | `vector[e1, ..., en]: vector<T>` where `e_i: T` 满足 `0 < i <= n` and `n > 0` | 带有 `n` 个元素（长度为 n）的向量 |
+
+在这些情况下，`vector` 的类型是从元素类型或从向量的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+```move
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
+
+#### 向量字面量示例
+
+```move
+(vector[]: vector<bool>);
+(vector[0u8, 1u8, 2u8]: vector<u8>);
+(vector<u128>[]: vector<u128>);
+(vector<address>[@0x42, @0x100]: vector<address>);
+```
+
+### `vector<u8>` 字面量
+
+Move 中向量的一个常见用例是表示“字节数组”，用 `vector<u8>` 表示。这些值通常用于加密目的，例如公钥或哈希结果。这些值非常常见，以至于提供了特定的语法以使值更具可读性，而不是必须使用 `vector[]`，其中每个单独的 `u8` 值都以数字形式指定。
+
+目前支持两种类型的 `vector<u8>` 字面量，*字节字符串*和*十六进制字符串*。
+
+#### 字节字符串
+
+字节字符串是带引号的字符串字面量，以 `b` 为前缀，例如，`b"Hello!\n"`。
+
+这些是允许转义序列的 ASCII 编码字符串。目前，支持的转义序列如下：
+
+| 转义序列 | 描述                                        |
+|----------|---------------------------------------------|
+| `\n`     | 换行                                        |
+| `\r`     | 回车                                        |
+| `\t`     | 制表符                                      |
+| `\\`     | 反斜杠                                      |
+| `\0`     | Null                                        |
+| `\"`     | 引号                                        |
+| `\xHH`   | 十六进制进制转义，插入十六进制字节序列 `HH` |
+
+#### 十六进制字符串
+
+十六进制字符串是以 `x` 为前缀的带引号的字符串字面量，例如，`x"48656C6C6F210A"`。
+
+每个字节对，范围从 `00` 到 `FF` 都被解析为十六进制编码的 `u8` 值。所以每个字节对对应于结果 `vector<u8>` 的单个条目。
+
+#### 字符串字面量示例
+
+```move
+script {
+    fun byte_and_hex_strings() {
+        assert!(b"" == x"", 0);
+        assert!(b"Hello!\n" == x"48656C6C6F210A", 1);
+        assert!(b"\x48\x65\x6C\x6C\x6F\x21\x0A" == x"48656C6C6F210A", 2);
+        assert!(
+            b"\"Hello\tworld!\"\n \r \\Null=\0" ==
+                x"2248656C6C6F09776F726C6421220A200D205C4E756C6C3D00",
+            3
+        );
+    }
+}
+```
+
+## 操作
+
+`vector` 通过 Move 标准库里的 `std::vector` 模块支持以下操作：
+
+| 函数                                                       | 描述                                                                                                         | 中止条件             |
+|------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|----------------------|
+| `vector::empty<T>(): vector<T>`                            | 创建一个可以存储 `T` 类型值的空向量                                                                          | 永不中止             |
+| `vector::singleton<T>(t: T): vector<T>`                    | 创建一个包含 `t` 的大小为 1 的向量                                                                           | 永不中止             |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | 将 `t` 添加到 `v` 的尾部                                                                                     | 永不中止             |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | 移除并返回 `v` 中的最后一个元素                                                                              | 如果 `v` 是空向量    |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | 返回在索引 `i` 处对 `T` 的不可变引用                                                                         | 如果 `i` 越界        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | 返回在索引 `i` 处对 `T` 的可变引用                                                                           | 如果 `i` 越界        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | 销毁 `v` 向量                                                                                                | 如果 `v` 不是空向量  |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | 将 `v2` 中的元素添加到 `v1` 的末尾                                                                           | 永不中止             |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | 如果 `e` 在向量 `v` 里返回 true，否则返回 false                                                              | 永不中止             |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | 交换向量 `v` 中第 `i` 个和第 `j` 个索引处的元素                                                              | 如果 `i` 或 `j` 越界 |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | 反转向量 `v` 中元素的顺序                                                                                    | 永不中止             |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | 如果 `e` 在索引 `i` 处的向量中，则返回 `(true, i)`。否则返回`(false, 0)`                                     | 永不中止             |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | 移除向量 `v` 中的第 `i` 个元素，移动所有后续元素。这里的时间复杂度是 O(n)，并且保留了向量中元素的顺序        | 如果 `i` 越界        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | 将向量中的第 `i` 个元素与最后一个元素交换，然后弹出该元素。这里的时间复杂度是 O(1)，但是不保留向量中的元素顺序 | 如果 `i` 越界        |
+
+随着时间的推移可能会增加更多操作。
+
+## 示例
+
+```move
+use std::vector;
+
+let v = vector::empty<u64>();
+vector::push_back(&mut v, 5);
+vector::push_back(&mut v, 6);
+
+assert!(*vector::borrow(&v, 0) == 5, 42);
+assert!(*vector::borrow(&v, 1) == 6, 42);
+assert!(vector::pop_back(&mut v) == 6, 42);
+assert!(vector::pop_back(&mut v) == 5, 42);
+```
+
+## 销毁和复制 `vector`
+
+`vector<T>` 的某些行为取决于元素类型 `T` 的能力（ability），例如：如果向量中包含不具有 `drop` 能力的元素，那么不能像上面例子中的 `v` 一样隐式丢弃 —— 它们必须用 `vector::destroy_empty` 显式销毁。
+
+请注意，除非向量 `vec` 包含零个元素，否则 `vector::destroy_empty` 将在运行时中止：
+
+```move
+fun destroy_any_vector<T>(vec: vector<T>) {
+    vector::destroy_empty(vec) // 删除此行将导致编译器错误
+}
+```
+
+但是删除包含带有 `drop` 能力的元素的向量不会发生错误：
+
+```move
+fun destroy_droppable_vector<T: drop>(vec: vector<T>) {
+    // 有效！
+    // 不需要明确地做任何事情来销毁向量
+}
+```
+
+同样，除非元素类型具有 `copy` 能力，否则无法复制向量。换句话说，当且仅当 `T` 具有 `copy` 能力时，`vector<T>` 才具有 `copy` 能力。然而，即使是可复制的向量也永远不会被隐式复制：
+
+```move
+let x = vector::singleton<u64>(10);
+let y = copy x; // 没有 copy 将导致编译器错误！
+```
+
+大向量的复制可能很昂贵，因此编译器需要显式 `copy` 以便更容易查看它们发生的位置。
+
+有关更多详细信息，请参阅[类型能力](./abilities.md)和[泛型](./generics.md)部分。
+
+## 所有权
+
+[如上所述](#销毁和复制-vector)，`vector` 值只有在元素值可以复制的时候才能复制。在这种情况下，复制必须通过显式 [`copy`](./variables.md#移动和复制) 或者[解引用 `*`](./references.md#通过引用读取和写入)。
diff --git a/vendors/move/crates/documentation/coding_guidelines.md b/vendors/move/crates/documentation/coding_guidelines.md
new file mode 100644
index 000000000..9df7fbd49
--- /dev/null
+++ b/vendors/move/crates/documentation/coding_guidelines.md
@@ -0,0 +1,343 @@
+---
+id: coding-guidelines
+title: Coding Guidelines
+---
+
+This document describes the coding guidelines for the Move Rust codebase.
+
+## Code formatting
+
+All code formatting is enforced with [rustfmt](https://github.com/rust-lang/rustfmt) with a project-specific configuration.  Below is an example command to adhere to the Move project conventions.
+
+```
+$ cargo xfmt
+```
+
+## Code analysis
+
+[Clippy](https://github.com/rust-lang/rust-clippy) is used to catch common mistakes and is run as a part of continuous integration.  Before submitting your code for review, you can run clippy with our configuration:
+
+```
+$ cargo xclippy --all-targets
+```
+
+In general, we follow the recommendations from [rust-lang-nursery](https://rust-lang.github.io/api-guidelines/) and [The Rust Programming Language](https://doc.rust-lang.org/book/).  The remainder of this guide provides detailed guidelines on specific topics in order to achieve uniformity of the codebase.
+
+## Code documentation
+
+Any public fields, functions, and methods should be documented with [Rustdoc](https://doc.rust-lang.org/book/ch14-02-publishing-to-crates-io.html#making-useful-documentation-comments).
+
+ Please follow the conventions as detailed below for modules, structs, enums, and functions.  The *single line* is used as a preview when navigating Rustdoc.  As an example, see the 'Structs' and 'Enums' sections in the [collections](https://doc.rust-lang.org/std/collections/index.html) Rustdoc.
+
+ ```
+ /// [Single line] One line summary description
+ ///
+ /// [Longer description] Multiple lines, inline code
+ /// examples, invariants, purpose, usage, etc.
+ [Attributes] If attributes exist, add after Rustdoc
+ ```
+
+Example below:
+
+```rust
+/// Represents (x, y) of a 2-dimensional grid
+///
+/// A line is defined by 2 instances.
+/// A plane is defined by 3 instances.
+#[repr(C)]
+struct Point {
+    x: i32,
+    y: i32,
+}
+```
+
+### Terminology
+
+The Move codebase uses inclusive terminology (similar to other projects such as [the Linux kernel](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb)).  The terms below are recommended when appropriate.
+* allowlist - a set of entities allowed access
+* blocklist - a set of entities that are blocked from access
+* primary/leader/main - a primary entity
+* secondary/replica/follower - a secondary entity
+
+### Constants and fields
+
+Describe the purpose and definition of this data. If the unit is a measurement of time, include it, e.g., `TIMEOUT_MS` for timeout in milliseconds.
+
+### Functions and methods
+
+Document the following for each function:
+
+* The action the method performs - “This method *adds* a new transaction to the mempool.” Use *active voice* and *present tense* (i.e. adds/creates/checks/updates/deletes).
+* Describe how and why to use this method.
+* Any condition that must be met _before_ calling the method.
+* State conditions under which the function will `panic!()` or returns an `Error`
+* Brief description of return values.
+* Any special behavior that is not obvious
+
+### README.md for top-level directories and other major components
+
+Each major component of Move needs to have a `README.md` file.
+
+This file should contain:
+
+ * The *conceptual* *documentation* of the component.
+ * A link to the external API documentation for the component.
+ * A link to the main license of the project.
+ * A link to the main contributing guide for the project.
+
+A template for readmes:
+
+```markdown
+# Component Name
+
+[Summary line: Start with one sentence about this component.]
+
+## Overview
+
+* Describe the purpose of this component and how the code in
+this directory works.
+* Describe the interaction of the code in this directory with
+the other components.
+* Describe the security model and assumptions about the crates
+in this directory. Examples of how to describe the security
+assumptions will be added in the future.
+
+## Implementation Details
+
+* Describe how the component is modeled. For example, why is the
+  code organized the way it is?
+* Other relevant implementation details.
+
+## Binary, Argument, and Crate Naming
+
+Most tools that we use everyday (rustc, cargo, git, rg, etc.) use dashes `-` as
+a separator for binary names and arguments and the [GNU software
+manual](https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html)
+dictates that long options should "consist of `--` followed by a name made of
+alphanumeric characters and dashes". As such dashes `-` should be used as
+separators in both binary names and command line arguments.
+
+In addition, it is generally accepted by many in the Rust community that dashes
+`-` should be used as separators in crate names, i.e. `x25519-dalek`.
+
+## Code suggestions
+
+In the following sections, we have suggested some best practices for a uniform codebase. We will investigate and identify the practices that can be enforced using Clippy. This information will evolve and improve over time.
+
+### Attributes
+
+Make sure to use the appropriate attributes for handling dead code:
+
+```
+// For code that is intended for production usage in the future
+#[allow(dead_code)]
+// For code that is only intended for testing and
+// has no intended production use
+#[cfg(test)]
+```
+
+### Avoid Deref polymorphism
+
+Don't abuse the Deref trait to emulate inheritance between structs, and thus reuse methods.  For more information, read [here](https://github.com/rust-unofficial/patterns/blob/master/anti_patterns/deref.md).
+
+### Comments
+
+We recommend that you use `//` and `///` comments rather than block comments `/* ... */` for uniformity and simpler grepping.
+
+### Concurrent types
+
+Concurrent types such as [`CHashMap`](https://docs.rs/crate/chashmap), [`AtomicUsize`](https://doc.rust-lang.org/std/sync/atomic/struct.AtomicUsize.html), etc. have an immutable borrow on self i.e. `fn foo_mut(&self,...)` in order to support concurrent access on interior mutating methods. Good practices (such as those in the examples mentioned) avoid exposing synchronization primitives externally (e.g. `Mutex`, `RwLock`) and document the method semantics and invariants clearly.
+
+*When to use channels vs concurrent types?*
+
+Listed below are high-level suggestions based on experience:
+
+* Channels are for ownership transfer, decoupling of types, and coarse-grained messages.  They fit well for transferring ownership of data, distributing units of work, and communicating async results.  Furthermore, they help break circular dependencies (e.g. `struct Foo` contains an `Arc<Bar>` and `struct Bar` contains an `Arc<Foo>` that leads to complex initialization).
+
+* Concurrent types (e.g. such as [`CHashMap`](https://docs.rs/crate/chashmap) or structs that have interior mutability building on [`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html), [`RwLock`](https://doc.rust-lang.org/std/sync/struct.RwLock.html), etc.) are better suited for caches and states.
+
+### Error handling
+
+Error handling suggestions follow the [Rust book guidance](https://doc.rust-lang.org/book/ch09-00-error-handling.html).  Rust groups errors into two major categories: recoverable and unrecoverable errors.  Recoverable errors should be handled with [Result](https://doc.rust-lang.org/std/result/).  Our suggestions on unrecoverable errors are listed below:
+
+*Panic*
+
+* `unwrap()` - Unwrap should only be used for test code.  For all other use cases, prefer `expect()`. The only exception is if the error message is custom-generated, in which case use `.unwrap_or_else(|| panic!("error: {}", foo))`.
+* `expect()` - Expect should be invoked when a system invariant is expected to be preserved.  `expect()` is preferred over `unwrap()` and should contain a detailed error message on failure in most cases.
+* `assert!()` - This macro is kept in both debug/release and should be used to protect invariants of the system as necessary.
+* `unreachable!()` - This macro will panic on code that should not be reached (violating an invariant) and can be used where appropriate.
+
+In production (non-test) code, outside of lock management,  all unrecoverable errors should be cleanly documented describing why said event is unrecoverable. For example, if the system is now in a bad state, state what that state is and the motivation for why a crash / restart is more effective than resolving it within a running system, and what if any steps an operator would need to take to resolve the issue.
+
+### Generics
+
+Generics allow dynamic behavior (similar to [`trait`](https://doc.rust-lang.org/book/ch10-02-traits.html) methods) with static dispatch.  As the number of generic type parameters increases, the difficulty of using the type/method also increases (e.g. consider the combination of trait bounds required for this type, duplicate trait bounds on related types, etc.).  In order to avoid this complexity, we generally try to avoid using a large number of generic type parameters.  We have found that converting code with a large number of generic objects to trait objects with dynamic dispatch often simplifies our code.
+
+### Getters/setters
+
+In general, we follow naming recommendations for getters as specified [here](https://rust-lang.github.io/api-guidelines/naming.html#getter-names-follow-rust-convention-c-getter) and for setters as defined [here](https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#gettersetter-apis).
+
+Getters/setters should be avoided for [`struct`](https://doc.rust-lang.org/book/ch05-00-structs.html) types in the C spirit: compound, passive data structures without internal invariants. Adding them only increases the complexity and number of lines of code without improving the developer experience.
+
+```rust
+struct Foo {
+    size: usize,
+    key_to_value: HashMap<u32, u32>
+}
+
+impl Foo {
+    /// Simple getter follows xxx pattern
+    fn size(&self) -> usize {
+        self.size
+    }
+
+    /// Setter follows set_xxx pattern
+    fn set_foo(&mut self, size: usize){
+        self.size = size;
+    }
+
+    /// Complex getter follows get_xxx pattern
+    fn get_value(&self, key: u32) -> Option<&u32> {
+        self.key_to_value.get(&key)
+    }
+}
+```
+
+### Integer Arithmetic
+
+As every integer operation (`+`, `-`, `/`, `*`, etc.) implies edge-cases (e.g. overflows `u64::MAX + 1`, underflows `0u64 -1`, division by zero, etc.),
+we use checked arithmetic instead of directly using math symbols.
+It forces us to think of edge-cases, and handle them explicitely.
+This is a brief and simplified mini guide of the different functions that exist to handle integer arithmetic:
+
+* [checked_](https://doc.rust-lang.org/std/primitive.u32.html#method.checked_add): use this function if you want to handle overflows and underflows as a special edge-case. It returns `None` if an underflow or overflow has happened, and `Some(operation_result)` otherwise.
+* [overflowing_](https://doc.rust-lang.org/std/primitive.u32.html#method.overflowing_add): use this function if you want the result of an overflow to potentially wrap around (e.g. `u64::MAX.overflow_add(10) == (9, true)`). It returns the underflowed or overflowed result as well as a flag indicating if an overflow has occured or not.
+* [wrapping_](https://doc.rust-lang.org/std/primitive.u32.html#method.wrapping_add): this is similar to overflowing operations, except that it returns the result directly. Use this function if you are sure that you want to handle underflows and overflows by wrapping around.
+* [saturating_](https://doc.rust-lang.org/std/primitive.u32.html#method.saturating_add): if an overflow occurs, the result is kept within the boundary of the type (e.g. `u64::MAX.saturating_add(1) == u64::MAX`).
+
+### Logging
+
+We currently use [log](https://docs.rs/log/) for logging.
+
+* [error!](https://docs.rs/log/0.4.14/log/macro.error.html) - Error-level messages have the highest urgency in [log](https://docs.rs/log/).  An unexpected error has occurred (e.g. exceeded the maximum number of retries to complete an RPC or inability to store data to local storage).
+* [warn!](https://docs.rs/log/0.4.14/log/macro.warn.html) - Warn-level messages help notify admins about automatically handled issues (e.g. retrying a failed network connection or receiving the same message multiple times, etc.).
+* [info!](https://docs.rs/log/0.4.14/log/macro.info.html) - Info-level messages are well suited for "one-time" events (such as logging state on one-time startup and shutdown) or periodic events that are not frequently occurring - e.g. changing the validator set every day.
+* [debug!](https://docs.rs/log/0.4.14/log/macro.debug.html) - Debug-level messages can occur frequently (i.e. potentially > 1 message per second) and are not typically expected to be enabled in production.
+* [trace!](https://docs.rs/log/0.4.14/log/macro.trace.html) - Trace-level logging is typically only used for function entry/exit.
+
+### Testing
+
+*Unit tests*
+
+We follow the general guidance provided [here](https://doc.rust-lang.org/book/ch11-03-test-organization.html). Ideally, all code should be unit tested.  Unit tests should be in the same file as the code it is testing though in a distinct module, using the following syntax:
+
+```rust
+struct Foo {
+}
+
+impl Foo {
+  pub fn magic_number() -> u8 {
+    42
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  #test
+  fn verify_magic_number() {
+    assert_eq!(Foo::magic_number(), 42);
+  }
+}
+```
+
+*Property-based tests*
+
+Move contains [property-based tests](https://blog.jessitron.com/2013/04/25/property-based-testing-what-is-it/) written in Rust using the [`proptest` framework](https://github.com/AltSysrq/proptest). Property-based tests generate random test cases and assert that invariants, also called *properties*, hold for the code under test.
+
+Some examples of properties tested in Move:
+
+* Every serializer and deserializer pair is tested for correctness with random inputs to the serializer. Any pair of functions that are inverses of each other can be tested this way.
+* The results of executing common transactions through the VM are tested using randomly generated scenarios and verified with an *Oracle*.
+
+A tutorial for `proptest` can be found in the [`proptest` book](https://altsysrq.github.io/proptest-book/proptest/getting-started.html).
+
+References:
+
+* [What is Property Based Testing?](https://hypothesis.works/articles/what-is-property-based-testing/) (includes a comparison with fuzzing)
+* [An introduction to property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing/)
+* [Choosing properties for property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing-2/)
+
+### Conditional compilation of tests
+
+Move [conditionally
+compiles](https://doc.rust-lang.org/stable/reference/conditional-compilation.html)
+code that is *only relevant for tests, but does not consist of tests* (unitary
+or otherwise). Examples of this include proptest strategies, implementations
+and derivations of specific traits (e.g. the occasional `Clone`), helper
+functions, etc. Since Cargo is [currently not equipped for automatically activating features
+in tests/benchmarks](https://github.com/rust-lang/cargo/issues/2911), we rely on two
+conditions to perform this conditional compilation:
+- the test flag, which is activated by dependent test code in the same crate
+  as the conditional test-only code.
+- the `fuzzing` custom feature, which is used to enable fuzzing and testing
+related code in downstream crates. Note that this must be passed explicitly to
+`cargo xtest` and `cargo x bench`. Never use this in `[dependencies]` unless
+the crate is only for testing.
+
+As a consequence, it is recommended that you set up your test-only code in the following fashion.
+
+**For production crates:**
+
+Production crates are defined as the set of crates that create externally published artifacts.
+
+For the sake of example, we'll consider you are defining a test-only helper function `foo` in `foo_crate`:
+
+1. Define the `fuzzing` flag in `foo_crate/Cargo.toml` and make it non-default:
+    ```toml
+    [features]
+    default = []
+    fuzzing = []
+    ```
+2. Annotate your test-only helper `foo` with both the `test` flag (for in-crate callers) and the `"fuzzing"` custom feature (for out-of-crate callers):
+    ```rust
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn foo() { ... }
+    ```
+3. (optional) Use `cfg_attr` to make test-only trait derivations conditional:
+    ```rust
+    #[cfg_attr(any(test, feature = "testing"), derive(FooTrait))]
+    #[derive(Debug, Display, ...)] // inconditional derivations
+    struct Foo { ... }
+    ```
+4. (optional) Set up feature transitivity for crates that call crates that have test-only members. Let's say it's the case of `bar_crate`, which, through its test helpers, calls into `foo_crate` to use your test-only `foo`. Here's how you would set up `bar_crate/Cargo.toml`:
+    ```toml
+    [features]
+    default = []
+    fuzzing = ["foo_crate/fuzzing"]
+    ```
+
+**For test-only crates:**
+
+Test-only crates do not create published artifacts. They consist of tests, benchmarks or other code that verifies
+the correctness or performance of published artifacts. Test-only crates are
+explicitly listed in `x.toml` under `[workspace.test-only]`.
+
+These crates do not need to use the above setup. Instead, they can enable the `fuzzing` feature in production crates
+directly.
+
+```toml
+[dependencies]
+foo_crate = { path = "...", features = ["fuzzing"] }
+```
+
+*A final note on integration tests*: All tests that use conditional test-only
+elements in another crate need to activate the "fuzzing" feature through the
+`[features]` section in their `Cargo.toml`. [Integration
+tests](https://doc.rust-lang.org/rust-by-example/testing/integration_testing.html)
+can neither rely on the `test` flag nor do they have a proper `Cargo.toml` for
+feature activation. In the Move codebase, we therefore recommend that
+*integration tests which depend on test-only code in their tested crate* be
+extracted to their own test-only crate. See `language/move-binary-format/serializer_tests`
+for an example of such an extracted integration test.
+
+*Note for developers*: The reason we use a feature re-export (in the `[features]` section of the `Cargo.toml` is that a profile is not enough to activate the `"fuzzing"` feature flag. See [cargo-issue #291](https://github.com/rust-lang/cargo/issues/2911) for details).
diff --git a/vendors/move/crates/documentation/examples/diem-framework/build_all.sh b/vendors/move/crates/documentation/examples/diem-framework/build_all.sh
new file mode 100644
index 000000000..cb5a07535
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/build_all.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- build
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/cli/Cargo.toml b/vendors/move/crates/documentation/examples/diem-framework/crates/cli/Cargo.toml
new file mode 100644
index 000000000..0a335595a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/cli/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "df-cli"
+version = "0.1.0"
+description = "CLI frontend for the Move compiler and VM (with Diem Framework)"
+authors = ["Diem Association <opensource@diem.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+clap = { version = "3.1.8", features = ["derive"] }
+
+bcs = "0.1.4"
+move-cli = { path = "../../../../../move-cli" }
+move-core-types = { path = "../../../../../move-core-types" }
+
+move-stdlib = { path = "../../../../../move-stdlib" }
+move-vm-test-utils = { path = "../../../../../move-vm/test-utils" }
+move-vm-types = { path = "../../../../../move-vm/types" }
+
+diem-framework-natives = { path = "../natives" }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/cli/src/main.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/cli/src/main.rs
new file mode 100644
index 000000000..ec83cef14
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/cli/src/main.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use clap::Parser;
+use move_cli::{Command, Move};
+use move_core_types::{errmap::ErrorMapping, language_storage::CORE_CODE_ADDRESS};
+use move_vm_test_utils::gas_schedule::{
+    new_from_instructions, zero_cost_instruction_table, CostTable,
+};
+
+#[derive(Parser)]
+pub struct DfCli {
+    #[clap(flatten)]
+    move_args: Move,
+
+    #[clap(subcommand)]
+    cmd: DfCommands,
+}
+
+#[derive(Parser)]
+pub enum DfCommands {
+    #[clap(flatten)]
+    Command(Command),
+    // extra commands available only in df-cli can be added below
+}
+
+fn cost_table() -> CostTable {
+    let instruction_table = zero_cost_instruction_table();
+    new_from_instructions(instruction_table)
+}
+
+fn main() -> Result<()> {
+    // let error_descriptions: ErrorMapping =
+    //     bcs::from_bytes(diem_framework_releases::current_error_descriptions())?;
+
+    let natives = move_stdlib::natives::all_natives(
+        CORE_CODE_ADDRESS,
+        // We may want to switch to a different gas schedule in the future, but for now,
+        // the all-zero one should be enough.
+        move_stdlib::natives::GasParameters::zeros(),
+    )
+    .into_iter()
+    .chain(move_stdlib::natives::nursery_natives(
+        CORE_CODE_ADDRESS,
+        // We may want to switch to a different gas schedule in the future, but for now,
+        // the all-zero one should be enough.
+        move_stdlib::natives::NurseryGasParameters::zeros(),
+    ))
+    .chain(diem_framework_natives::all_natives(CORE_CODE_ADDRESS))
+    .collect::<Vec<_>>();
+
+    let args = DfCli::parse();
+    match args.cmd {
+        DfCommands::Command(cmd) => move_cli::run_cli(
+            natives,
+            &cost_table(),
+            // TODO: implement this
+            &ErrorMapping::default(),
+            args.move_args,
+            cmd,
+        ),
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml
new file mode 100644
index 000000000..f9a6e08ba
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "diem-crypto-derive"
+version = "0.0.3"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0.24"
+quote = "1.0.9"
+syn = { version = "1.0.64", features = ["derive"] }
+
+[dev-dependencies]
+anyhow = "1.0.52"
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/hasher.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/hasher.rs
new file mode 100644
index 000000000..af9c1eb01
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/hasher.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/// Converts a camel-case string to snake-case
+pub fn camel_to_snake(text: &str) -> String {
+    let mut out = String::with_capacity(text.len());
+    let mut first = true;
+    text.chars().for_each(|c| {
+        if !first && c.is_uppercase() {
+            out.push('_');
+            out.extend(c.to_lowercase());
+        } else if first {
+            first = false;
+            out.extend(c.to_lowercase());
+        } else {
+            out.push(c);
+        }
+    });
+    out
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/lib.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/lib.rs
new file mode 100644
index 000000000..d0ec0f769
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/lib.rs
@@ -0,0 +1,447 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! # Derive macros for crypto operations
+//! This crate contains four types of derive macros:
+//!
+//! - the `SilentDebug` and SilentDisplay macros are meant to be used on private key types, and
+//!   elide their input for confidentiality.
+//! - the `Deref` macro helps derive the canonical instances on new types.
+//! - the derive macros for `diem_crypto::traits`, namely `ValidCryptoMaterial`, `PublicKey`, `PrivateKey`,
+//!   `VerifyingKey`, `SigningKey` and `Signature` are meant to be derived on simple unions of types
+//!   implementing these traits.
+//! - the derive macro for `diem_crypto::hash::CryptoHasher`, which defines
+//!   the domain-separation hasher structures described in `diem_crypto::hash`
+//!   (look there for details). This derive macro has for sole difference that it
+//!   automatically picks a unique salt for you, using the Serde name. For a container `Foo`,
+//!   this is usually equivalent to:
+//!   ```ignore
+//!   define_hasher! {
+//!    (
+//!         FooHasher,
+//!         FOO_HASHER,
+//!         b"Foo"
+//!     )
+//!   }
+//!   ```
+//!
+//! # Unions of Signing Traits, in detail
+//!
+//! Those types typically come into play when you need to accept several
+//! alternatives at runtime for several signature and verification schemes
+//! (ex: BLS or EdDSA, see below). In this case, it is possible to declare
+//! a triplet of enum types that each describe a 'sum type' (coproduct) of these
+//! alternatives. This happens to be a signing scheme itself (it has
+//! canonical signature, signing & verifying key types, and verifies all
+//! expected properties by trivial dispatch).
+//!
+//! The macros below let you define this type of union trivially under two conditions:
+//! - that the variant tags for the enum have the same name, i.e. if the BLS variant for the
+//!   `SignatureUnion` is `SignatureUnion::BLS(BLS12381Signature)`, then the variant of the
+//!   `PublicKeyUnion` for BLS must also be `PublicKeyUnion::BLS`,
+//! - that you specify the associated types `PrivateKeyType`, `SignatureType` and `PublicKeyType`
+//!   for each of the three unions. `PrivateKeyType` provides the value for the
+//!   `VerifyingKeyMaterial` and `PublicKeyMaterial` associated types, `PublicKeyType` provides the
+//!   valid for the `SigningKeyMaterial` and `PrivateKeyMaterial` associated types and
+//!   `SignatureType` provides the value for the `SignatureMaterial` associated type.
+//!
+//! ## Example
+//!
+//! ```ignore
+//! # #[macro_use] extern crate crypto-derive;
+//! use diem_crypto::{
+//!     hash::HashValue,
+//!     bls12381::{BLS12381PrivateKey, BLS12381PublicKey, BLS12381Signature},
+//!     ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature},
+//! };
+//! use diem_crypto_derive::{
+//!     SilentDebug, PrivateKey, PublicKey, Signature, SigningKey, ValidCryptoMaterial, VerifyingKey,
+//! };
+//!
+//! /// Generic public key enum
+//! #[derive(
+//!     Debug, Clone, PartialEq, Eq, Hash, ValidCryptoMaterial, PublicKey, VerifyingKey,
+//! )]
+//! #[PrivateKeyType = "GenericPrivateKey"]
+//! #[SignatureType = "GenericSignature"]
+//! pub enum GenericPublicKey {
+//!     /// Ed25519 public key
+//!     Ed(Ed25519PublicKey),
+//!     /// BLS12-381 public key
+//!     BLS(BLS12381PublicKey),
+//! }
+//! /// Generic private key enum
+//! #[derive(SilentDebug, ValidCryptoMaterial, PrivateKey, SigningKey)]
+//! #[PublicKeyType = "GenericPublicKey"]
+//! #[SignatureType = "GenericSignature"]
+//! pub enum GenericPrivateKey {
+//!     /// Ed25519 private key
+//!     Ed(Ed25519PrivateKey),
+//!     /// BLS12-381 private key
+//!     BLS(BLS12381PrivateKey),
+//! }
+//! /// Generic signature enum
+//! #[allow(clippy::large_enum_variant)]
+//! #[derive(Clone, Debug, PartialEq, Eq, Hash, Signature)]
+//! #[PrivateKeyType = "GenericPrivateKey"]
+//! #[PublicKeyType = "GenericPublicKey"]
+//! pub enum GenericSignature {
+//!     /// Ed25519 signature
+//!     Ed(Ed25519Signature),
+//!     /// BLS12-381 signature
+//!     BLS(BLS12381Signature),
+//! }
+//! ```
+
+#![forbid(unsafe_code)]
+
+extern crate proc_macro;
+
+mod hasher;
+mod unions;
+
+use hasher::camel_to_snake;
+use proc_macro::TokenStream;
+use proc_macro2::Span;
+use quote::quote;
+use std::iter::FromIterator;
+use syn::{parse_macro_input, parse_quote, Data, DeriveInput, Ident};
+use unions::*;
+
+#[proc_macro_derive(SilentDisplay)]
+pub fn silent_display(source: TokenStream) -> TokenStream {
+    let ast: DeriveInput = syn::parse(source).expect("Incorrect macro input");
+    let name = &ast.ident;
+    let gen = quote! {
+        // In order to ensure that secrets are never leaked, Display is elided
+        impl ::std::fmt::Display for #name {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                write!(f, "<elided secret for {}>", stringify!(#name))
+            }
+        }
+    };
+    gen.into()
+}
+
+#[proc_macro_derive(SilentDebug)]
+pub fn silent_debug(source: TokenStream) -> TokenStream {
+    let ast: DeriveInput = syn::parse(source).expect("Incorrect macro input");
+    let name = &ast.ident;
+    let gen = quote! {
+        // In order to ensure that secrets are never leaked, Debug is elided
+        impl ::std::fmt::Debug for #name {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                write!(f, "<elided secret for {}>", stringify!(#name))
+            }
+        }
+    };
+    gen.into()
+}
+
+/// Deserialize from a human readable format where applicable
+#[proc_macro_derive(DeserializeKey)]
+pub fn deserialize_key(source: TokenStream) -> TokenStream {
+    let ast: DeriveInput = syn::parse(source).expect("Incorrect macro input");
+    let name = &ast.ident;
+    let name_string = name.to_string();
+    let gen = quote! {
+        impl<'de> ::serde::Deserialize<'de> for #name {
+            fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+            where
+                D: ::serde::Deserializer<'de>,
+            {
+                if deserializer.is_human_readable() {
+                    let encoded_key = <String>::deserialize(deserializer)?;
+                    ValidCryptoMaterialStringExt::from_encoded_string(encoded_key.as_str())
+                        .map_err(<D::Error as ::serde::de::Error>::custom)
+                } else {
+                    // In order to preserve the Serde data model and help analysis tools,
+                    // make sure to wrap our value in a container with the same name
+                    // as the original type.
+                    #[derive(::serde::Deserialize)]
+                    #[serde(rename = #name_string)]
+                    struct Value<'a>(&'a [u8]);
+
+                    let value = Value::deserialize(deserializer)?;
+                    #name::try_from(value.0).map_err(|s| {
+                        <D::Error as ::serde::de::Error>::custom(format!("{} with {}", s, #name_string))
+                    })
+                }
+            }
+        }
+    };
+    gen.into()
+}
+
+/// Serialize into a human readable format where applicable
+#[proc_macro_derive(SerializeKey)]
+pub fn serialize_key(source: TokenStream) -> TokenStream {
+    let ast: DeriveInput = syn::parse(source).expect("Incorrect macro input");
+    let name = &ast.ident;
+    let name_string = name.to_string();
+    let gen = quote! {
+        impl ::serde::Serialize for #name {
+            fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+            where
+                S: ::serde::Serializer,
+            {
+                if serializer.is_human_readable() {
+                    self.to_encoded_string()
+                        .map_err(<S::Error as ::serde::ser::Error>::custom)
+                        .and_then(|str| serializer.serialize_str(&str[..]))
+                } else {
+                    // See comment in deserialize_key.
+                    serializer.serialize_newtype_struct(
+                        #name_string,
+                        serde_bytes::Bytes::new(&ValidCryptoMaterial::to_bytes(self).as_slice()),
+                    )
+                }
+            }
+        }
+    };
+    gen.into()
+}
+
+#[proc_macro_derive(Deref)]
+pub fn derive_deref(input: TokenStream) -> TokenStream {
+    let item = syn::parse(input).expect("Incorrect macro input");
+    let (field_ty, field_access) = parse_newtype_fields(&item);
+
+    let name = &item.ident;
+    let (impl_generics, ty_generics, where_clause) = item.generics.split_for_impl();
+
+    quote!(
+        impl #impl_generics ::std::ops::Deref for #name #ty_generics
+        #where_clause
+        {
+            type Target = #field_ty;
+
+            fn deref(&self) -> &Self::Target {
+                #field_access
+            }
+        }
+    )
+    .into()
+}
+
+#[proc_macro_derive(ValidCryptoMaterial)]
+pub fn derive_enum_valid_crypto_material(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    match ast.data {
+        Data::Enum(ref variants) => impl_enum_valid_crypto_material(name, variants),
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(ValidCryptoMaterial)] is only defined for enums")
+        },
+    }
+}
+
+#[proc_macro_derive(PublicKey, attributes(PrivateKeyType))]
+pub fn derive_enum_publickey(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    let private_key_type = get_type_from_attrs(&ast.attrs, "PrivateKeyType").unwrap();
+    match ast.data {
+        Data::Enum(ref variants) => impl_enum_publickey(name, private_key_type, variants),
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(PublicKey)] is only defined for enums")
+        },
+    }
+}
+
+#[proc_macro_derive(PrivateKey, attributes(PublicKeyType))]
+pub fn derive_enum_privatekey(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    let public_key_type = get_type_from_attrs(&ast.attrs, "PublicKeyType").unwrap();
+    match ast.data {
+        Data::Enum(ref variants) => impl_enum_privatekey(name, public_key_type, variants),
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(PrivateKey)] is only defined for enums")
+        },
+    }
+}
+
+#[proc_macro_derive(VerifyingKey, attributes(PrivateKeyType, SignatureType))]
+pub fn derive_enum_verifyingkey(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    let private_key_type = get_type_from_attrs(&ast.attrs, "PrivateKeyType").unwrap();
+    let signature_type = get_type_from_attrs(&ast.attrs, "SignatureType").unwrap();
+    match ast.data {
+        Data::Enum(ref variants) => {
+            impl_enum_verifyingkey(name, private_key_type, signature_type, variants)
+        },
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(PrivateKey)] is only defined for enums")
+        },
+    }
+}
+
+#[proc_macro_derive(SigningKey, attributes(PublicKeyType, SignatureType))]
+pub fn derive_enum_signingkey(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    let public_key_type = get_type_from_attrs(&ast.attrs, "PublicKeyType").unwrap();
+    let signature_type = get_type_from_attrs(&ast.attrs, "SignatureType").unwrap();
+    match ast.data {
+        Data::Enum(ref variants) => {
+            impl_enum_signingkey(name, public_key_type, signature_type, variants)
+        },
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(PrivateKey)] is only defined for enums")
+        },
+    }
+}
+
+#[proc_macro_derive(Signature, attributes(PublicKeyType, PrivateKeyType))]
+pub fn derive_enum_signature(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    let name = &ast.ident;
+    let public_key_type = get_type_from_attrs(&ast.attrs, "PublicKeyType").unwrap();
+    let private_key_type = get_type_from_attrs(&ast.attrs, "PrivateKeyType").unwrap();
+    match ast.data {
+        Data::Enum(ref variants) => {
+            impl_enum_signature(name, public_key_type, private_key_type, variants)
+        },
+        Data::Struct(_) | Data::Union(_) => {
+            panic!("#[derive(PrivateKey)] is only defined for enums")
+        },
+    }
+}
+
+// There is a unit test for this logic in the crypto crate, at
+// diem_crypto::unit_tests::cryptohasher — you may have to modify it if you
+// edit the below.
+#[proc_macro_derive(CryptoHasher)]
+pub fn hasher_dispatch(input: TokenStream) -> TokenStream {
+    let item = parse_macro_input!(input as DeriveInput);
+    let hasher_name = Ident::new(
+        &format!("{}Hasher", &item.ident.to_string()),
+        Span::call_site(),
+    );
+    let snake_name = camel_to_snake(&item.ident.to_string());
+    let static_seed_name = Ident::new(
+        &format!("{}_SEED", snake_name.to_uppercase()),
+        Span::call_site(),
+    );
+
+    let static_hasher_name = Ident::new(
+        &format!("{}_HASHER", snake_name.to_uppercase()),
+        Span::call_site(),
+    );
+    let type_name = &item.ident;
+    let param = if item.generics.params.is_empty() {
+        quote!()
+    } else {
+        let args = proc_macro2::TokenStream::from_iter(
+            std::iter::repeat(quote!(())).take(item.generics.params.len()),
+        );
+        quote!(<#args>)
+    };
+
+    let out = quote!(
+        /// Cryptographic hasher for an BCS-serializable #item
+        #[derive(Clone)]
+        pub struct #hasher_name(diem_crypto::hash::DefaultHasher);
+
+        static #static_seed_name: diem_crypto::_once_cell::sync::OnceCell<[u8; 32]> = diem_crypto::_once_cell::sync::OnceCell::new();
+
+        impl #hasher_name {
+            fn new() -> Self {
+                let name = diem_crypto::_serde_name::trace_name::<#type_name #param>()
+                    .expect("The `CryptoHasher` macro only applies to structs and enums");
+                #hasher_name(
+                    diem_crypto::hash::DefaultHasher::new(&name.as_bytes()))
+            }
+        }
+
+        static #static_hasher_name: diem_crypto::_once_cell::sync::Lazy<#hasher_name> =
+            diem_crypto::_once_cell::sync::Lazy::new(|| #hasher_name::new());
+
+
+        impl std::default::Default for #hasher_name
+        {
+            fn default() -> Self {
+                #static_hasher_name.clone()
+            }
+        }
+
+        impl diem_crypto::hash::CryptoHasher for #hasher_name {
+            fn seed() -> &'static [u8; 32] {
+                #static_seed_name.get_or_init(|| {
+                    let name = diem_crypto::_serde_name::trace_name::<#type_name #param>()
+                        .expect("The `CryptoHasher` macro only applies to structs and enums.").as_bytes();
+                    diem_crypto::hash::DefaultHasher::prefixed_hash(&name)
+                })
+            }
+
+            fn update(&mut self, bytes: &[u8]) {
+                self.0.update(bytes);
+            }
+
+            fn finish(self) -> diem_crypto::hash::HashValue {
+                self.0.finish()
+            }
+        }
+
+        impl std::io::Write for #hasher_name {
+            fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
+                use diem_crypto::hash::CryptoHasher;
+
+                self.0.update(bytes);
+                Ok(bytes.len())
+            }
+            fn flush(&mut self) -> std::io::Result<()> {
+                Ok(())
+            }
+        }
+
+    );
+    out.into()
+}
+
+#[proc_macro_derive(BCSCryptoHash)]
+pub fn bcs_crypto_hash_dispatch(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+    let name = &ast.ident;
+    let hasher_name = Ident::new(&format!("{}Hasher", &name.to_string()), Span::call_site());
+    let error_msg = syn::LitStr::new(
+        &format!("BCS serialization of {} should not fail", name),
+        Span::call_site(),
+    );
+    let generics = add_trait_bounds(ast.generics);
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    let out = quote!(
+        impl #impl_generics diem_crypto::hash::CryptoHash for #name #ty_generics #where_clause {
+            type Hasher = #hasher_name;
+
+            fn hash(&self) -> diem_crypto::hash::HashValue {
+                use diem_crypto::hash::CryptoHasher;
+
+                let mut state = Self::Hasher::default();
+                bcs::serialize_into(&mut state, &self).expect(#error_msg);
+                state.finish()
+            }
+        }
+    );
+    out.into()
+}
+
+fn add_trait_bounds(mut generics: syn::Generics) -> syn::Generics {
+    for param in generics.params.iter_mut() {
+        if let syn::GenericParam::Type(type_param) = param {
+            type_param.bounds.push(parse_quote!(Serialize));
+        }
+    }
+    generics
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/unions.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/unions.rs
new file mode 100644
index 000000000..fbd813abf
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto-derive/src/unions.rs
@@ -0,0 +1,309 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{DataEnum, Ident};
+
+pub fn parse_newtype_fields(item: &syn::DeriveInput) -> (syn::Type, proc_macro2::TokenStream) {
+    let fields = match item.data {
+        syn::Data::Struct(ref body) => body.fields.iter().collect::<Vec<&syn::Field>>(),
+        _ => vec![],
+    };
+
+    let field_ty = match fields.len() {
+        1 => Some(fields[0].ty.clone()),
+        _ => None,
+    };
+    let field_ty = field_ty.expect("#[derive(Deref)] can only be used on structs with one field.");
+
+    let field_name = match fields[0].ident {
+        Some(ref ident) => quote!(#ident),
+        None => quote!(0),
+    };
+
+    match field_ty {
+        syn::Type::Reference(syn::TypeReference { elem, .. }) => (*elem, quote!(self.#field_name)),
+        x => (x, quote!(&self.#field_name)),
+    }
+}
+
+pub fn impl_enum_tryfrom(name: &Ident, variants: &DataEnum) -> proc_macro2::TokenStream {
+    // the TryFrom dispatch
+    let mut try_iter = variants.variants.iter();
+    let first_variant = try_iter
+        .next()
+        .expect("#[derive(ValidCryptoMaterial] requires a non-empty enum.");
+    let first_variant_ident = &first_variant.ident;
+    let first_variant_arg = &first_variant
+        .fields
+        .iter()
+        .next()
+        .expect("Unrecognized enum for key types")
+        .ty;
+
+    let mut try_chain = quote! {
+        #first_variant_arg::try_from(bytes).and_then(|key| Ok(#name::#first_variant_ident(key)))
+    };
+    for variant in try_iter {
+        let variant_ident = &variant.ident;
+        let variant_arg = &variant
+            .fields
+            .iter()
+            .next()
+            .expect("Unrecognized enum for key types")
+            .ty;
+        try_chain.extend(quote!{
+            .or_else(|_err| #variant_arg::try_from(bytes).and_then(|key| Ok(#name::#variant_ident(key))))
+        })
+    }
+
+    quote! {
+        impl core::convert::TryFrom<&[u8]> for #name {
+            type Error = diem_crypto::CryptoMaterialError;
+            fn try_from(bytes: &[u8]) -> std::result::Result<#name, Self::Error> {
+                #try_chain
+            }
+        }
+    }
+}
+
+fn match_enum_to_bytes(name: &Ident, variants: &DataEnum) -> proc_macro2::TokenStream {
+    // the ValidCryptoMaterial dispatch proper
+    let mut match_arms = quote! {};
+    for variant in variants.variants.iter() {
+        let variant_ident = &variant.ident;
+
+        match_arms.extend(quote! {
+            #name::#variant_ident(key) => key.to_bytes().to_vec(),
+        });
+    }
+    match_arms
+}
+
+pub fn impl_enum_valid_crypto_material(name: &Ident, variants: &DataEnum) -> TokenStream {
+    let mut try_from = impl_enum_tryfrom(name, variants);
+
+    let to_bytes_arms = match_enum_to_bytes(name, variants);
+
+    try_from.extend(quote! {
+
+        impl diem_crypto::ValidCryptoMaterial for #name {
+            fn to_bytes(&self) -> Vec<u8> {
+                match self {
+                    #to_bytes_arms
+                }
+            }
+        }
+    });
+    try_from.into()
+}
+
+pub fn get_type_from_attrs(attrs: &[syn::Attribute], attr_name: &str) -> syn::Result<syn::LitStr> {
+    attrs
+        .iter()
+        .find(|attr| attr.path.is_ident(attr_name))
+        .map_or_else(
+            || {
+                Err(syn::Error::new(
+                    proc_macro2::Span::call_site(),
+                    format!("Could not find attribute {}", attr_name),
+                ))
+            },
+            |attr| match attr.parse_meta()? {
+                syn::Meta::NameValue(meta) => {
+                    if let syn::Lit::Str(lit) = &meta.lit {
+                        Ok(lit.clone())
+                    } else {
+                        Err(syn::Error::new_spanned(
+                            meta,
+                            &format!("Could not parse {} attribute", attr_name)[..],
+                        ))
+                    }
+                },
+                bad => Err(syn::Error::new_spanned(
+                    bad,
+                    &format!("Could not parse {} attribute", attr_name)[..],
+                )),
+            },
+        )
+}
+
+pub fn impl_enum_publickey(
+    name: &Ident,
+    private_key_type: syn::LitStr,
+    variants: &DataEnum,
+) -> TokenStream {
+    let pkt: syn::Type = private_key_type.parse().unwrap();
+    let mut from_match_arms = quote! {};
+    for variant in variants.variants.iter() {
+        let variant_ident = &variant.ident;
+
+        from_match_arms.extend(quote! {
+            #pkt::#variant_ident(key) => #name::#variant_ident(key.into()),
+        });
+    }
+    let mut res = quote! {
+        impl From<&#pkt> for #name {
+            fn from(public_key: &#pkt) -> Self {
+                match public_key {
+                    #from_match_arms
+                }
+            }
+        }
+    };
+    res.extend(quote! {
+        impl diem_crypto::PublicKey for #name {
+            type PrivateKeyMaterial = #pkt;
+        }
+    });
+    res.into()
+}
+
+pub fn impl_enum_privatekey(
+    name: &Ident,
+    public_key_type: syn::LitStr,
+    _variants: &DataEnum,
+) -> TokenStream {
+    let pkt: syn::Type = public_key_type.parse().unwrap();
+    let res = quote! {
+        impl diem_crypto::PrivateKey for #name {
+            type PublicKeyMaterial = #pkt;
+        }
+    };
+    res.into()
+}
+
+pub fn impl_enum_verifyingkey(
+    name: &Ident,
+    private_key_type: syn::LitStr,
+    signature_type: syn::LitStr,
+    _variants: &DataEnum,
+) -> TokenStream {
+    let pkt: syn::Type = private_key_type.parse().unwrap();
+    let st: syn::Type = signature_type.parse().unwrap();
+    let res = quote! {
+        impl diem_crypto::VerifyingKey for #name {
+            type SigningKeyMaterial = #pkt;
+            type SignatureMaterial = #st;
+        }
+        impl diem_crypto::private::Sealed for #name {}
+    };
+    res.into()
+}
+
+pub fn impl_enum_signingkey(
+    name: &Ident,
+    public_key_type: syn::LitStr,
+    signature_type: syn::LitStr,
+    variants: &DataEnum,
+) -> TokenStream {
+    let pkt: syn::Type = public_key_type.parse().unwrap();
+    let st: syn::Type = signature_type.parse().unwrap();
+
+    let mut match_arms_arbitrary = quote! {};
+    let mut match_struct_arms = quote! {};
+    for variant in variants.variants.iter() {
+        let variant_ident = &variant.ident;
+
+        match_struct_arms.extend(quote! {
+            #name::#variant_ident(key) => Self::SignatureMaterial::#variant_ident(key.sign(message)),
+        });
+        match_arms_arbitrary.extend(quote! {
+            #name::#variant_ident(key) => Self::SignatureMaterial::#variant_ident(key.sign_arbitrary_message(message)),
+        });
+    }
+    let res = quote! {
+        impl diem_crypto::SigningKey for #name {
+            type VerifyingKeyMaterial = #pkt;
+            type SignatureMaterial = #st;
+
+            fn sign<T: diem_crypto::hash::CryptoHash + serde::Serialize>(&self, message: &T) -> Self::SignatureMaterial {
+                match self {
+                    #match_struct_arms
+                }
+            }
+
+            #[cfg(test)]
+            fn sign_arbitrary_message(&self, message: &[u8]) -> Self::SignatureMaterial {
+                match self {
+                    #match_arms_arbitrary
+                }
+            }
+        }
+        impl diem_crypto::private::Sealed for #name {}
+    };
+    res.into()
+}
+
+pub fn impl_enum_signature(
+    name: &Ident,
+    public_key_type: syn::LitStr,
+    private_key_type: syn::LitStr,
+    variants: &DataEnum,
+) -> TokenStream {
+    let priv_kt: syn::Type = private_key_type.parse().unwrap();
+    let pub_kt: syn::Type = public_key_type.parse().unwrap();
+    let mut res = impl_enum_tryfrom(name, variants);
+    let to_bytes_arms = match_enum_to_bytes(name, variants);
+
+    let mut match_arms = quote! {};
+    for variant in variants.variants.iter() {
+        let variant_ident = &variant.ident;
+
+        match_arms.extend(quote! {
+            (#name::#variant_ident(sig), #pub_kt::#variant_ident(pk)) => {
+                sig.verify_arbitrary_msg(message, pk)
+            }
+        })
+    }
+
+    let mut match_struct_arms = quote! {};
+    for variant in variants.variants.iter() {
+        let variant_ident = &variant.ident;
+
+        match_struct_arms.extend(quote! {
+            (#name::#variant_ident(sig), #pub_kt::#variant_ident(pk)) => {
+                sig.verify(message, pk)
+            }
+        })
+    }
+
+    res.extend(quote! {
+
+        impl diem_crypto::Signature for #name {
+            type VerifyingKeyMaterial = #pub_kt;
+            type SigningKeyMaterial = #priv_kt;
+
+            fn verify<T: diem_crypto::hash::CryptoHash + serde::Serialize>(&self, message: &T, public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), diem_crypto::error::Error> {
+                match (self, public_key) {
+                    #match_struct_arms
+                    _ => diem_crypto::error::bail!(
+                        "provided the wrong alternative in {:?}!",
+                        (self, public_key)
+                    ),
+                }
+            }
+
+            fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), diem_crypto::error::Error> {
+                match (self, public_key) {
+                    #match_arms
+                    _ => diem_crypto::error::bail!(
+                        "provided the wrong alternative in {:?}!",
+                        (self, public_key)
+                    ),
+                }
+            }
+
+            fn to_bytes(&self) -> Vec<u8> {
+                match self {
+                    #to_bytes_arms
+                }
+            }
+        }
+
+        impl diem_crypto::private::Sealed for #name {}
+    });
+    res.into()
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/Cargo.toml b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/Cargo.toml
new file mode 100644
index 000000000..01036751e
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name = "diem-crypto"
+version = "0.0.3"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+aes-gcm = "0.8.0"
+anyhow = "1.0.52"
+bytes = "1.0.1"
+curve25519-dalek = { version = "0.1.0", package = "curve25519-dalek-fiat", default-features = false, features = ["std"] }
+diem-crypto-derive = { path = "../crypto-derive" }
+digest = "0.9.0"
+ed25519-dalek = { version = "0.1.0", package = "ed25519-dalek-fiat", default-features = false, features = ["std", "serde"] }
+hex = "0.4.3"
+hkdf = "0.10.0"
+mirai-annotations = "1.10.1"
+once_cell = "1.7.2"
+proptest = { version = "1.0.0", optional = true }
+proptest-derive = { version = "0.3.0", optional = true }
+rand = "0.8.0"
+rand_core = { version = "0.6.2", default-features = false }
+serde = { version = "1.0.124", features = ["derive"] }
+serde-name = "0.1.1"
+serde_bytes = "0.11.5"
+sha2 = "0.9.3"
+static_assertions = "1.1.0"
+thiserror = "1.0.24"
+tiny-keccak = { version = "2.0.2", features = ["sha3"] }
+x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std"] }
+
+bcs = "0.1.4"
+
+[dev-dependencies]
+bitvec = "0.19.4"
+byteorder = "1.4.3"
+criterion = "0.3.4"
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+ripemd160 = "0.9.1"
+serde_json = "1.0.64"
+sha3 = "0.9.1"
+# TODO: some tests will fail if this is set to 1.0.63
+trybuild = "=1.0.53"
+
+[features]
+default = ["fiat"]
+assert-private-keys-not-cloneable = []
+cloneable-private-keys = []
+fuzzing = ["proptest", "proptest-derive", "cloneable-private-keys"]
+fiat = ["curve25519-dalek/fiat_u64_backend", "ed25519-dalek/fiat_u64_backend", "x25519-dalek/fiat_u64_backend"]
+u64 = ["curve25519-dalek/u64_backend", "ed25519-dalek/u64_backend", "x25519-dalek/u64_backend"]
+u32 = ["curve25519-dalek/u32_backend", "ed25519-dalek/u32_backend", "x25519-dalek/u32_backend"]
+
+[[bench]]
+name = "noise"
+harness = false
+
+[[bench]]
+name = "ed25519"
+harness = false
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/README.md b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/README.md
new file mode 100644
index 000000000..b27dcb6fd
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/README.md
@@ -0,0 +1,29 @@
+The crypto component hosts all the implementations of cryptographic primitives we use in Diem: hashing, signing, and key derivation/generation. The parts of the library using traits.rs contains the crypto API enforcing type safety, verifiable random functions, EdDSA & MultiEdDSA signatures.
+
+## Overview
+
+Diem makes use of several cryptographic algorithms:
+
+* SHA-3 as the main hash function. It is standardized in [FIPS 202](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf). It is based on the [tiny_keccak](https://docs.rs/tiny-keccak/1.4.2/tiny_keccak/) library.
+* HKDF: HMAC-based Extract-and-Expand Key Derivation Function (HKDF) based on [RFC 5869](https://tools.ietf.org/html/rfc5869). It is used to generate keys from a salt (optional), seed, and application-info (optional).
+* traits.rs introduces new abstractions for the crypto API.
+* Ed25519 performs signatures using the new API design based on [ed25519-dalek](https://docs.rs/ed25519-dalek/1.0.0-pre.1/ed25519_dalek/) library with additional security checks (e.g. for malleability).
+* X25519 to perform key exchanges. It is used to secure communications between validators via the [Noise Protocol Framework](http://www.noiseprotocol.org/noise.html). It is based on the x25519-dalek library.
+
+## How is this module organized?
+```
+    crypto/src
+    ├── hash.rs             # Hash function (SHA-3)
+    ├── hkdf.rs             # HKDF implementation (HMAC-based Extract-and-Expand Key Derivation Function based on RFC 5869)
+    ├── macros/             # Derivations for SilentDebug and SilentDisplay
+    ├── utils.rs            # Serialization utility functions
+    ├── lib.rs
+    ├── ed25519.rs          # Ed25519 implementation of the signing/verification API in traits.rs
+    ├── multi_ed25519.rs    # MultiEd25519 implementation of the signing/verification API in traits.rs
+    ├── x25519.rs           # X25519 wrapper
+    ├── test_utils.rs
+    ├── traits.rs           # New API design and the necessary abstractions
+    └── unit_tests/         # Tests
+```
+
+Note: This crate historically had support for BLS12381, ECVRF, and SlIP-0010, though were removed due to lack of use. The last git revision before there removal is 00301524.
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/ed25519.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/ed25519.rs
new file mode 100644
index 000000000..7c176c552
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/ed25519.rs
@@ -0,0 +1,34 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[macro_use]
+extern crate criterion;
+
+use criterion::Criterion;
+use diem_crypto_derive::{BCSCryptoHash, CryptoHasher};
+use rand::{prelude::ThreadRng, thread_rng};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, CryptoHasher, BCSCryptoHash, Serialize, Deserialize)]
+pub struct TestDiemCrypto(pub String);
+
+use diem_crypto::{
+    ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature},
+    traits::{Signature, SigningKey, Uniform},
+};
+
+fn verify(c: &mut Criterion) {
+    let mut csprng: ThreadRng = thread_rng();
+    let priv_key = Ed25519PrivateKey::generate(&mut csprng);
+    let pub_key: Ed25519PublicKey = (&priv_key).into();
+    let msg = TestDiemCrypto("".to_string());
+    let sig: Ed25519Signature = priv_key.sign(&msg);
+
+    c.bench_function("Ed25519 signature verification", move |b| {
+        b.iter(|| sig.verify(&msg, &pub_key))
+    });
+}
+
+criterion_group!(ed25519_benches, verify);
+criterion_main!(ed25519_benches);
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/noise.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/noise.rs
new file mode 100644
index 000000000..2a2186b36
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/benches/noise.rs
@@ -0,0 +1,132 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Don't forget to run this benchmark with AES-NI enable.
+//! You can do this by building with the following flags:
+//! `RUSTFLAGS="-Ctarget-cpu=skylake -Ctarget-feature=+aes,+sse2,+sse4.1,+ssse3"`.
+//!
+
+#[macro_use]
+extern crate criterion;
+
+use criterion::{Criterion, Throughput};
+use diem_crypto::{
+    noise::{handshake_init_msg_len, handshake_resp_msg_len, NoiseConfig, AES_GCM_TAGLEN},
+    test_utils::TEST_SEED,
+    x25519, Uniform as _, ValidCryptoMaterial as _,
+};
+use rand::SeedableRng;
+use std::convert::TryFrom as _;
+
+const MSG_SIZE: usize = 4096;
+
+fn benchmarks(c: &mut Criterion) {
+    // bench the handshake
+    let mut group = c.benchmark_group("handshake");
+    group.throughput(Throughput::Elements(1));
+    group.bench_function("xx", |b| {
+        // setup keys first
+        let mut rng = ::rand::rngs::StdRng::from_seed(TEST_SEED);
+        let initiator_static = x25519::PrivateKey::generate(&mut rng);
+        let initiator_static = initiator_static.to_bytes();
+        let responder_static = x25519::PrivateKey::generate(&mut rng);
+        let responder_public = responder_static.public_key();
+        let responder_static = responder_static.to_bytes();
+
+        let mut first_message = [0u8; handshake_init_msg_len(0)];
+        let mut second_message = [0u8; handshake_init_msg_len(0)];
+
+        b.iter(|| {
+            let initiator_static =
+                x25519::PrivateKey::try_from(initiator_static.clone().as_slice()).unwrap();
+            let responder_static =
+                x25519::PrivateKey::try_from(responder_static.clone().as_slice()).unwrap();
+
+            let initiator = NoiseConfig::new(initiator_static);
+            let responder = NoiseConfig::new(responder_static);
+
+            let initiator_state = initiator
+                .initiate_connection(
+                    &mut rng,
+                    b"prologue",
+                    responder_public,
+                    None,
+                    &mut first_message,
+                )
+                .unwrap();
+
+            let _ = responder
+                .respond_to_client_and_finalize(
+                    &mut rng,
+                    b"prologue",
+                    &first_message,
+                    None,
+                    &mut second_message,
+                )
+                .unwrap();
+            let _ = initiator
+                .finalize_connection(initiator_state, &second_message)
+                .unwrap();
+        })
+    });
+    group.finish();
+
+    let mut transport_group = c.benchmark_group("transport");
+    transport_group.throughput(Throughput::Bytes(MSG_SIZE as u64 * 2));
+    transport_group.bench_function("AES-GCM throughput", |b| {
+        let mut buffer_msg = [0u8; MSG_SIZE * 2];
+
+        // setup keys first
+        let mut rng = ::rand::rngs::StdRng::from_seed(TEST_SEED);
+        let initiator_static = x25519::PrivateKey::generate(&mut rng);
+        let responder_static = x25519::PrivateKey::generate(&mut rng);
+        let responder_public = responder_static.public_key();
+
+        // handshake first
+        let initiator = NoiseConfig::new(initiator_static);
+        let responder = NoiseConfig::new(responder_static);
+
+        let mut first_message = [0u8; handshake_init_msg_len(0)];
+        let mut second_message = [0u8; handshake_resp_msg_len(0)];
+
+        let initiator_state = initiator
+            .initiate_connection(
+                &mut rng,
+                b"prologue",
+                responder_public,
+                None,
+                &mut first_message,
+            )
+            .unwrap();
+        let (_, mut responder_session) = responder
+            .respond_to_client_and_finalize(
+                &mut rng,
+                b"prologue",
+                &first_message,
+                None,
+                &mut second_message,
+            )
+            .unwrap();
+        let (_, mut initiator_session) = initiator
+            .finalize_connection(initiator_state, &second_message)
+            .unwrap();
+
+        // bench throughput post-handshake
+        b.iter(move || {
+            let auth_tag = initiator_session
+                .write_message_in_place(&mut buffer_msg[..MSG_SIZE])
+                .expect("session should not be closed");
+
+            buffer_msg[MSG_SIZE..MSG_SIZE + AES_GCM_TAGLEN].copy_from_slice(&auth_tag);
+
+            let _plaintext = responder_session
+                .read_message_in_place(&mut buffer_msg[..MSG_SIZE + AES_GCM_TAGLEN])
+                .expect("session should not be closed");
+        })
+    });
+    transport_group.finish();
+}
+
+criterion_group!(benches, benchmarks);
+criterion_main!(benches);
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/compat.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/compat.rs
new file mode 100644
index 000000000..3151db781
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/compat.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Wrapper structs for types that need [RustCrypto](https://github.com/RustCrypto)
+//! traits implemented.
+
+use digest::{
+    consts::{U136, U32},
+    generic_array::GenericArray,
+    BlockInput, Digest, FixedOutput, Reset, Update,
+};
+use tiny_keccak::{Hasher, Sha3};
+
+/// A wrapper for [`tiny_keccak::Sha3::v256`] that
+/// implements RustCrypto [`digest`] traits [`BlockInput`], [`Update`], [`Reset`],
+/// and [`FixedOutput`]. Consequently, this wrapper can be used in RustCrypto
+/// APIs that require a hash function (usually something that impls [`Digest`]).
+#[derive(Clone)]
+pub struct Sha3_256(Sha3);
+
+// ensure that we impl all of the sub-traits required for the Digest trait alias
+static_assertions::assert_impl_all!(Sha3_256: Digest);
+
+impl Default for Sha3_256 {
+    #[inline]
+    fn default() -> Self {
+        Self(Sha3::v256())
+    }
+}
+
+impl BlockInput for Sha3_256 {
+    type BlockSize = U136;
+}
+
+impl Update for Sha3_256 {
+    #[inline]
+    fn update(&mut self, data: impl AsRef<[u8]>) {
+        self.0.update(data.as_ref());
+    }
+}
+
+impl Reset for Sha3_256 {
+    #[inline]
+    fn reset(&mut self) {
+        *self = Self::default();
+    }
+}
+
+impl FixedOutput for Sha3_256 {
+    type OutputSize = U32;
+
+    #[inline]
+    fn finalize_into(self, out: &mut GenericArray<u8, Self::OutputSize>) {
+        self.0.finalize(out.as_mut());
+    }
+
+    #[inline]
+    fn finalize_into_reset(&mut self, out: &mut GenericArray<u8, Self::OutputSize>) {
+        self.clone().finalize_into(out);
+        Reset::reset(self)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs
new file mode 100644
index 000000000..498b3bbe1
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs
@@ -0,0 +1,557 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides an API for the PureEdDSA signature scheme over the ed25519 twisted
+//! Edwards curve as defined in [RFC8032](https://tools.ietf.org/html/rfc8032).
+//!
+//! Signature verification also checks and rejects non-canonical signatures.
+//!
+//! # Examples
+//!
+//! ```
+//! use diem_crypto_derive::{CryptoHasher, BCSCryptoHash};
+//! use diem_crypto::{
+//!     ed25519::*,
+//!     traits::{Signature, SigningKey, Uniform},
+//! };
+//! use rand::{rngs::StdRng, SeedableRng};
+//! use serde::{Serialize, Deserialize};
+//!
+//! #[derive(Serialize, Deserialize, CryptoHasher, BCSCryptoHash)]
+//! pub struct TestCryptoDocTest(String);
+//! let message = TestCryptoDocTest("Test message".to_string());
+//!
+//! let mut rng: StdRng = SeedableRng::from_seed([0; 32]);
+//! let private_key = Ed25519PrivateKey::generate(&mut rng);
+//! let public_key: Ed25519PublicKey = (&private_key).into();
+//! let signature = private_key.sign(&message);
+//! assert!(signature.verify(&message, &public_key).is_ok());
+//! ```
+//! **Note**: The above example generates a private key using a private function intended only for
+//! testing purposes. Production code should find an alternate means for secure key generation.
+#![allow(clippy::integer_arithmetic)]
+
+use crate::{
+    hash::{CryptoHash, CryptoHasher},
+    traits::*,
+};
+use anyhow::{anyhow, Result};
+use core::convert::TryFrom;
+use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay};
+pub use ed25519_dalek;
+use mirai_annotations::*;
+use serde::Serialize;
+use std::{cmp::Ordering, fmt};
+
+/// The length of the Ed25519PrivateKey
+pub const ED25519_PRIVATE_KEY_LENGTH: usize = ed25519_dalek::SECRET_KEY_LENGTH;
+/// The length of the Ed25519PublicKey
+pub const ED25519_PUBLIC_KEY_LENGTH: usize = ed25519_dalek::PUBLIC_KEY_LENGTH;
+/// The length of the Ed25519Signature
+pub const ED25519_SIGNATURE_LENGTH: usize = ed25519_dalek::SIGNATURE_LENGTH;
+
+/// The order of ed25519 as defined in [RFC8032](https://tools.ietf.org/html/rfc8032).
+const L: [u8; 32] = [
+    0xED, 0xD3, 0xF5, 0x5C, 0x1A, 0x63, 0x12, 0x58, 0xD6, 0x9C, 0xF7, 0xA2, 0xDE, 0xF9, 0xDE, 0x14,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+];
+
+/// An Ed25519 private key
+#[derive(DeserializeKey, SerializeKey, SilentDebug, SilentDisplay)]
+pub struct Ed25519PrivateKey(ed25519_dalek::SecretKey);
+
+#[cfg(feature = "assert-private-keys-not-cloneable")]
+static_assertions::assert_not_impl_any!(Ed25519PrivateKey: Clone);
+
+#[cfg(any(test, feature = "cloneable-private-keys"))]
+impl Clone for Ed25519PrivateKey {
+    fn clone(&self) -> Self {
+        let serialized: &[u8] = &(self.to_bytes());
+        Ed25519PrivateKey::try_from(serialized).unwrap()
+    }
+}
+
+/// An Ed25519 public key
+#[derive(DeserializeKey, Clone, SerializeKey)]
+pub struct Ed25519PublicKey(ed25519_dalek::PublicKey);
+
+#[cfg(mirai)]
+use crate::tags::ValidatedPublicKeyTag;
+#[cfg(not(mirai))]
+struct ValidatedPublicKeyTag {}
+
+/// An Ed25519 signature
+#[derive(DeserializeKey, Clone, SerializeKey)]
+pub struct Ed25519Signature(ed25519_dalek::Signature);
+
+impl Ed25519PrivateKey {
+    /// The length of the Ed25519PrivateKey
+    pub const LENGTH: usize = ed25519_dalek::SECRET_KEY_LENGTH;
+
+    /// Serialize an Ed25519PrivateKey.
+    pub fn to_bytes(&self) -> [u8; ED25519_PRIVATE_KEY_LENGTH] {
+        self.0.to_bytes()
+    }
+
+    /// Deserialize an Ed25519PrivateKey without any validation checks apart from expected key size.
+    fn from_bytes_unchecked(
+        bytes: &[u8],
+    ) -> std::result::Result<Ed25519PrivateKey, CryptoMaterialError> {
+        match ed25519_dalek::SecretKey::from_bytes(bytes) {
+            Ok(dalek_secret_key) => Ok(Ed25519PrivateKey(dalek_secret_key)),
+            Err(_) => Err(CryptoMaterialError::DeserializationError),
+        }
+    }
+
+    /// Private function aimed at minimizing code duplication between sign
+    /// methods of the SigningKey implementation. This should remain private.
+    fn sign_arbitrary_message(&self, message: &[u8]) -> Ed25519Signature {
+        let secret_key: &ed25519_dalek::SecretKey = &self.0;
+        let public_key: Ed25519PublicKey = self.into();
+        let expanded_secret_key: ed25519_dalek::ExpandedSecretKey =
+            ed25519_dalek::ExpandedSecretKey::from(secret_key);
+        let sig = expanded_secret_key.sign(message.as_ref(), &public_key.0);
+        Ed25519Signature(sig)
+    }
+}
+
+impl Ed25519PublicKey {
+    /// Serialize an Ed25519PublicKey.
+    pub fn to_bytes(&self) -> [u8; ED25519_PUBLIC_KEY_LENGTH] {
+        self.0.to_bytes()
+    }
+
+    /// Deserialize an Ed25519PublicKey without any validation checks apart from expected key size.
+    pub(crate) fn from_bytes_unchecked(
+        bytes: &[u8],
+    ) -> std::result::Result<Ed25519PublicKey, CryptoMaterialError> {
+        match ed25519_dalek::PublicKey::from_bytes(bytes) {
+            Ok(dalek_public_key) => Ok(Ed25519PublicKey(dalek_public_key)),
+            Err(_) => Err(CryptoMaterialError::DeserializationError),
+        }
+    }
+
+    /// Deserialize an Ed25519PublicKey from its representation as an x25519
+    /// public key, along with an indication of sign. This is meant to
+    /// compensate for the poor key storage capabilities of key management
+    /// solutions, and NOT to promote double usage of keys under several
+    /// schemes, which would lead to BAD vulnerabilities.
+    ///
+    /// Arguments:
+    /// - `x25519_bytes`: bit representation of a public key in clamped
+    ///            Montgomery form, a.k.a. the x25519 public key format.
+    /// - `negative`: whether to interpret the given point as a negative point,
+    ///               as the Montgomery form erases the sign byte. By XEdDSA
+    ///               convention, if you expect to ever convert this back to an
+    ///               x25519 public key, you should pass `false` for this
+    ///               argument.
+    #[cfg(test)]
+    pub(crate) fn from_x25519_public_bytes(
+        x25519_bytes: &[u8],
+        negative: bool,
+    ) -> Result<Self, CryptoMaterialError> {
+        if x25519_bytes.len() != 32 {
+            return Err(CryptoMaterialError::DeserializationError);
+        }
+        let key_bits = {
+            let mut bits = [0u8; 32];
+            bits.copy_from_slice(x25519_bytes);
+            bits
+        };
+        let mtg_point = curve25519_dalek::montgomery::MontgomeryPoint(key_bits);
+        let sign = u8::from(negative);
+        let ed_point = mtg_point
+            .to_edwards(sign)
+            .ok_or(CryptoMaterialError::DeserializationError)?;
+        Ed25519PublicKey::try_from(&ed_point.compress().as_bytes()[..])
+    }
+}
+
+impl Ed25519Signature {
+    /// The length of the Ed25519Signature
+    pub const LENGTH: usize = ed25519_dalek::SIGNATURE_LENGTH;
+
+    /// Serialize an Ed25519Signature.
+    pub fn to_bytes(&self) -> [u8; ED25519_SIGNATURE_LENGTH] {
+        self.0.to_bytes()
+    }
+
+    /// Deserialize an Ed25519Signature without any validation checks (malleability)
+    /// apart from expected key size.
+    pub(crate) fn from_bytes_unchecked(
+        bytes: &[u8],
+    ) -> std::result::Result<Ed25519Signature, CryptoMaterialError> {
+        match ed25519_dalek::Signature::try_from(bytes) {
+            Ok(dalek_signature) => Ok(Ed25519Signature(dalek_signature)),
+            Err(_) => Err(CryptoMaterialError::DeserializationError),
+        }
+    }
+
+    /// return an all-zero signature (for test only)
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn dummy_signature() -> Self {
+        Self::from_bytes_unchecked(&[0u8; Self::LENGTH]).unwrap()
+    }
+
+    /// Check for correct size and third-party based signature malleability issues.
+    /// This method is required to ensure that given a valid signature for some message under some
+    /// key, an attacker cannot produce another valid signature for the same message and key.
+    ///
+    /// According to [RFC8032](https://tools.ietf.org/html/rfc8032), signatures comprise elements
+    /// {R, S} and we should enforce that S is of canonical form (smaller than L, where L is the
+    /// order of edwards25519 curve group) to prevent signature malleability. Without this check,
+    /// one could add a multiple of L into S and still pass signature verification, resulting in
+    /// a distinct yet valid signature.
+    ///
+    /// This method does not check the R component of the signature, because R is hashed during
+    /// signing and verification to compute h = H(ENC(R) || ENC(A) || M), which means that a
+    /// third-party cannot modify R without being detected.
+    ///
+    /// Note: It's true that malicious signers can already produce varying signatures by
+    /// choosing a different nonce, so this method protects against malleability attacks performed
+    /// by a non-signer.
+    pub fn check_malleability(bytes: &[u8]) -> std::result::Result<(), CryptoMaterialError> {
+        if bytes.len() != ED25519_SIGNATURE_LENGTH {
+            return Err(CryptoMaterialError::WrongLengthError);
+        }
+        if !check_s_lt_l(&bytes[32..]) {
+            return Err(CryptoMaterialError::CanonicalRepresentationError);
+        }
+        Ok(())
+    }
+}
+
+///////////////////////
+// PrivateKey Traits //
+///////////////////////
+
+impl PrivateKey for Ed25519PrivateKey {
+    type PublicKeyMaterial = Ed25519PublicKey;
+}
+
+impl SigningKey for Ed25519PrivateKey {
+    type SignatureMaterial = Ed25519Signature;
+    type VerifyingKeyMaterial = Ed25519PublicKey;
+
+    fn sign<T: CryptoHash + Serialize>(&self, message: &T) -> Ed25519Signature {
+        Ed25519PrivateKey::sign_arbitrary_message(self, signing_message(message).as_ref())
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn sign_arbitrary_message(&self, message: &[u8]) -> Ed25519Signature {
+        Ed25519PrivateKey::sign_arbitrary_message(self, message)
+    }
+}
+
+impl Uniform for Ed25519PrivateKey {
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: ::rand::RngCore + ::rand::CryptoRng,
+    {
+        Ed25519PrivateKey(ed25519_dalek::SecretKey::generate(rng))
+    }
+}
+
+impl PartialEq<Self> for Ed25519PrivateKey {
+    fn eq(&self, other: &Self) -> bool {
+        self.to_bytes() == other.to_bytes()
+    }
+}
+
+impl Eq for Ed25519PrivateKey {}
+
+// We could have a distinct kind of validation for the PrivateKey, for
+// ex. checking the derived PublicKey is valid?
+impl TryFrom<&[u8]> for Ed25519PrivateKey {
+    type Error = CryptoMaterialError;
+
+    /// Deserialize an Ed25519PrivateKey. This method will also check for key validity.
+    fn try_from(bytes: &[u8]) -> std::result::Result<Ed25519PrivateKey, CryptoMaterialError> {
+        // Note that the only requirement is that the size of the key is 32 bytes, something that
+        // is already checked during deserialization of ed25519_dalek::SecretKey
+        // Also, the underlying ed25519_dalek implementation ensures that the derived public key
+        // is safe and it will not lie in a small-order group, thus no extra check for PublicKey
+        // validation is required.
+        Ed25519PrivateKey::from_bytes_unchecked(bytes)
+    }
+}
+
+impl Length for Ed25519PrivateKey {
+    fn length(&self) -> usize {
+        Self::LENGTH
+    }
+}
+
+impl ValidCryptoMaterial for Ed25519PrivateKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes().to_vec()
+    }
+}
+
+impl Genesis for Ed25519PrivateKey {
+    fn genesis() -> Self {
+        let mut buf = [0u8; ED25519_PRIVATE_KEY_LENGTH];
+        buf[ED25519_PRIVATE_KEY_LENGTH - 1] = 1;
+        Self::try_from(buf.as_ref()).unwrap()
+    }
+}
+
+//////////////////////
+// PublicKey Traits //
+//////////////////////
+
+// Implementing From<&PrivateKey<...>> allows to derive a public key in a more elegant fashion
+impl From<&Ed25519PrivateKey> for Ed25519PublicKey {
+    fn from(private_key: &Ed25519PrivateKey) -> Self {
+        let secret: &ed25519_dalek::SecretKey = &private_key.0;
+        let public: ed25519_dalek::PublicKey = secret.into();
+        Ed25519PublicKey(public)
+    }
+}
+
+// We deduce PublicKey from this
+impl PublicKey for Ed25519PublicKey {
+    type PrivateKeyMaterial = Ed25519PrivateKey;
+}
+
+impl std::hash::Hash for Ed25519PublicKey {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let encoded_pubkey = self.to_bytes();
+        state.write(&encoded_pubkey);
+    }
+}
+
+// Those are required by the implementation of hash above
+impl PartialEq for Ed25519PublicKey {
+    fn eq(&self, other: &Ed25519PublicKey) -> bool {
+        self.to_bytes() == other.to_bytes()
+    }
+}
+
+impl Eq for Ed25519PublicKey {}
+
+// We deduce VerifyingKey from pointing to the signature material
+// we get the ability to do `pubkey.validate(msg, signature)`
+impl VerifyingKey for Ed25519PublicKey {
+    type SignatureMaterial = Ed25519Signature;
+    type SigningKeyMaterial = Ed25519PrivateKey;
+}
+
+impl fmt::Display for Ed25519PublicKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", hex::encode(self.0.as_bytes()))
+    }
+}
+
+impl fmt::Debug for Ed25519PublicKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Ed25519PublicKey({})", self)
+    }
+}
+
+impl TryFrom<&[u8]> for Ed25519PublicKey {
+    type Error = CryptoMaterialError;
+
+    /// Deserialize an Ed25519PublicKey. This method will also check for key validity, for instance
+    ///  it will only deserialize keys that are safe against small subgroup attacks.
+    fn try_from(bytes: &[u8]) -> std::result::Result<Ed25519PublicKey, CryptoMaterialError> {
+        // We need to access the Edwards point which is not directly accessible from
+        // ed25519_dalek::PublicKey, so we need to do some custom deserialization.
+        if bytes.len() != ED25519_PUBLIC_KEY_LENGTH {
+            return Err(CryptoMaterialError::WrongLengthError);
+        }
+
+        let mut bits = [0u8; ED25519_PUBLIC_KEY_LENGTH];
+        bits.copy_from_slice(&bytes[..ED25519_PUBLIC_KEY_LENGTH]);
+
+        let compressed = curve25519_dalek::edwards::CompressedEdwardsY(bits);
+        let point = compressed
+            .decompress()
+            .ok_or(CryptoMaterialError::DeserializationError)?;
+
+        // Check if the point lies on a small subgroup. This is required
+        // when using curves with a small cofactor (in ed25519, cofactor = 8).
+        if point.is_small_order() {
+            return Err(CryptoMaterialError::SmallSubgroupError);
+        }
+
+        // Unfortunately, tuple struct `PublicKey` is private so we cannot
+        // Ok(Ed25519PublicKey(ed25519_dalek::PublicKey(compressed, point)))
+        // and we have to again invoke deserialization.
+        let public_key = Ed25519PublicKey::from_bytes_unchecked(bytes)?;
+        add_tag!(&public_key, ValidatedPublicKeyTag); // This key has gone through validity checks.
+        Ok(public_key)
+    }
+}
+
+impl Length for Ed25519PublicKey {
+    fn length(&self) -> usize {
+        ED25519_PUBLIC_KEY_LENGTH
+    }
+}
+
+impl ValidCryptoMaterial for Ed25519PublicKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.0.to_bytes().to_vec()
+    }
+}
+
+//////////////////////
+// Signature Traits //
+//////////////////////
+
+impl Signature for Ed25519Signature {
+    type SigningKeyMaterial = Ed25519PrivateKey;
+    type VerifyingKeyMaterial = Ed25519PublicKey;
+
+    /// Verifies that the provided signature is valid for the provided
+    /// message, according to the RFC8032 algorithm. This strict verification performs the
+    /// recommended check of 5.1.7 §3, on top of the required RFC8032 verifications.
+    fn verify<T: CryptoHash + Serialize>(
+        &self,
+        message: &T,
+        public_key: &Ed25519PublicKey,
+    ) -> Result<()> {
+        // Public keys should be validated to be safe against small subgroup attacks, etc.
+        precondition!(has_tag!(public_key, ValidatedPublicKeyTag));
+        let mut bytes = <T::Hasher as CryptoHasher>::seed().to_vec();
+        bcs::serialize_into(&mut bytes, &message)
+            .map_err(|_| CryptoMaterialError::SerializationError)?;
+        Self::verify_arbitrary_msg(self, &bytes, public_key)
+    }
+
+    /// Checks that `self` is valid for an arbitrary &[u8] `message` using `public_key`.
+    /// Outside of this crate, this particular function should only be used for native signature
+    /// verification in move
+    fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Ed25519PublicKey) -> Result<()> {
+        // Public keys should be validated to be safe against small subgroup attacks, etc.
+        precondition!(has_tag!(public_key, ValidatedPublicKeyTag));
+        Ed25519Signature::check_malleability(&self.to_bytes())?;
+
+        public_key
+            .0
+            .verify_strict(message, &self.0)
+            .map_err(|e| anyhow!("{}", e))
+            .and(Ok(()))
+    }
+
+    fn to_bytes(&self) -> Vec<u8> {
+        self.0.to_bytes().to_vec()
+    }
+
+    /// Batch signature verification as described in the original EdDSA article
+    /// by Bernstein et al. "High-speed high-security signatures". Current implementation works for
+    /// signatures on the same message and it checks for malleability.
+    #[cfg(feature = "batch")]
+    fn batch_verify<T: CryptoHash + Serialize>(
+        message: &T,
+        keys_and_signatures: Vec<(Self::VerifyingKeyMaterial, Self)>,
+    ) -> Result<()> {
+        for (_, sig) in keys_and_signatures.iter() {
+            Ed25519Signature::check_malleability(&sig.to_bytes())?
+        }
+        let mut message_bytes = <T::Hasher as CryptoHasher>::seed().to_vec();
+        bcs::serialize_into(&mut message_bytes, &message)
+            .map_err(|_| CryptoMaterialError::SerializationError)?;
+
+        let batch_argument = keys_and_signatures
+            .iter()
+            .map(|(key, signature)| (key.0, signature.0));
+        let (dalek_public_keys, dalek_signatures): (Vec<_>, Vec<_>) = batch_argument.unzip();
+        let message_ref = &(&message_bytes)[..];
+        // The original batching algorithm works for different messages and it expects as many
+        // messages as the number of signatures. In our case, we just populate the same
+        // message to meet dalek's api requirements.
+        let messages = vec![message_ref; dalek_signatures.len()];
+        ed25519_dalek::verify_batch(&messages[..], &dalek_signatures[..], &dalek_public_keys[..])
+            .map_err(|e| anyhow!("{}", e))?;
+        Ok(())
+    }
+}
+
+impl Length for Ed25519Signature {
+    fn length(&self) -> usize {
+        ED25519_SIGNATURE_LENGTH
+    }
+}
+
+impl ValidCryptoMaterial for Ed25519Signature {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes().to_vec()
+    }
+}
+
+impl std::hash::Hash for Ed25519Signature {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let encoded_signature = self.to_bytes();
+        state.write(&encoded_signature);
+    }
+}
+
+impl TryFrom<&[u8]> for Ed25519Signature {
+    type Error = CryptoMaterialError;
+
+    fn try_from(bytes: &[u8]) -> std::result::Result<Ed25519Signature, CryptoMaterialError> {
+        Ed25519Signature::check_malleability(bytes)?;
+        Ed25519Signature::from_bytes_unchecked(bytes)
+    }
+}
+
+// Those are required by the implementation of hash above
+impl PartialEq for Ed25519Signature {
+    fn eq(&self, other: &Ed25519Signature) -> bool {
+        self.to_bytes()[..] == other.to_bytes()[..]
+    }
+}
+
+impl Eq for Ed25519Signature {}
+
+impl fmt::Display for Ed25519Signature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", hex::encode(&self.0.to_bytes()[..]))
+    }
+}
+
+impl fmt::Debug for Ed25519Signature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Ed25519Signature({})", self)
+    }
+}
+
+/// Check if S < L to capture invalid signatures.
+fn check_s_lt_l(s: &[u8]) -> bool {
+    for i in (0..32).rev() {
+        match s[i].cmp(&L[i]) {
+            Ordering::Less => return true,
+            Ordering::Greater => return false,
+            _ => {},
+        }
+    }
+    // As this stage S == L which implies a non canonical S.
+    false
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+use crate::test_utils::{self, KeyPair};
+
+/// Produces a uniformly random ed25519 keypair from a seed
+#[cfg(any(test, feature = "fuzzing"))]
+pub fn keypair_strategy() -> impl Strategy<Value = KeyPair<Ed25519PrivateKey, Ed25519PublicKey>> {
+    test_utils::uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl proptest::arbitrary::Arbitrary for Ed25519PublicKey {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        crate::test_utils::uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+            .prop_map(|v| v.public_key)
+            .boxed()
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/error.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/error.rs
new file mode 100644
index 000000000..3bc914d96
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/error.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Rexport the error types needed for the various crypto traits
+
+pub use anyhow::{bail, Error};
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hash.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hash.rs
new file mode 100644
index 000000000..3768c1f83
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hash.rs
@@ -0,0 +1,694 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines traits and implementations of
+//! [cryptographic hash functions](https://en.wikipedia.org/wiki/Cryptographic_hash_function)
+//! for the Diem project.
+//!
+//! It is designed to help authors protect against two types of real world attacks:
+//!
+//! 1. **Semantic Ambiguity**: imagine that Alice has a private key and is using
+//!    two different applications, X and Y. X asks Alice to sign a message saying
+//!    "I am Alice". Alice accepts to sign this message in the context of X. However,
+//!    unbeknownst to Alice, in application Y, messages beginning with the letter "I"
+//!    represent transfers. " am " represents a transfer of 500 coins and "Alice"
+//!    can be interpreted as a destination address. When Alice signed the message she
+//!    needed to be aware of how other applications might interpret that message.
+//!
+//! 2. **Format Ambiguity**: imagine a program that hashes a pair of strings.
+//!    To hash the strings `a` and `b` it hashes `a + "||" + b`. The pair of
+//!    strings `a="foo||", b = "bar"` and `a="foo", b = "||bar"` result in the
+//!    same input to the hash function and therefore the same hash. This
+//!    creates a collision.
+//!
+//! Regarding (1), this library makes it easy for Diem developers to create as
+//! many new "hashable" Rust types as needed so that each Rust type hashed and signed
+//! in Diem has a unique meaning, that is, unambiguously captures the intent of a signer.
+//!
+//! Regarding (2), this library provides the `CryptoHasher` abstraction to easily manage
+//! cryptographic seeds for hashing. Hashing seeds aim to ensure that
+//! the hashes of values of a given type `MyNewStruct` never collide with hashes of values
+//! from another type.
+//!
+//! Finally, to prevent format ambiguity within a same type `MyNewStruct` and facilitate protocol
+//! specifications, we use [Binary Canonical Serialization (BCS)](https://docs.rs/bcs/)
+//! as the recommended solution to write Rust values into a hasher.
+//!
+//! # Quick Start
+//!
+//! To obtain a `hash()` method for any new type `MyNewStruct`, it is (strongly) recommended to
+//! use the derive macros of `serde` and `diem_crypto_derive` as follows:
+//! ```
+//! use diem_crypto::hash::CryptoHash;
+//! use diem_crypto_derive::{CryptoHasher, BCSCryptoHash};
+//! use serde::{Deserialize, Serialize};
+//! #[derive(Serialize, Deserialize, CryptoHasher, BCSCryptoHash)]
+//! struct MyNewStruct { /*...*/ }
+//!
+//! let value = MyNewStruct { /*...*/ };
+//! value.hash();
+//! ```
+//!
+//! Under the hood, this will generate a new implementation `MyNewStructHasher` for the trait
+//! `CryptoHasher` and implement the trait `CryptoHash` for `MyNewStruct` using BCS.
+//!
+//! # Implementing New Hashers
+//!
+//! The trait `CryptoHasher` captures the notion of a pre-seeded hash function, aka a "hasher".
+//! New implementations can be defined in two ways.
+//!
+//! ## Derive macro (recommended)
+//!
+//! For any new structure `MyNewStruct` that needs to be hashed, it is recommended to simply
+//! use the derive macro [`CryptoHasher`](https://doc.rust-lang.org/reference/procedural-macros.html).
+//!
+//! ```
+//! use diem_crypto_derive::CryptoHasher;
+//! use serde::Deserialize;
+//! #[derive(Deserialize, CryptoHasher)]
+//! #[serde(rename = "OptionalCustomSerdeName")]
+//! struct MyNewStruct { /*...*/ }
+//! ```
+//!
+//! The macro `CryptoHasher` will define a hasher automatically called `MyNewStructHasher`, and derive a salt
+//! using the name of the type as seen by the Serde library. In the example above, this name
+//! was changed using the Serde parameter `rename`: the salt will be based on the value `OptionalCustomSerdeName`
+//! instead of the default name `MyNewStruct`.
+//!
+//! ## Customized hashers
+//!
+//! **IMPORTANT:** Do NOT use this for new code unless you know what you are doing.
+//!
+//! This library also provides a few customized hashers defined in the code as follows:
+//!
+//! ```
+//! # // To get around that there's no way to doc-test a non-exported macro:
+//! # macro_rules! define_hasher { ($e:expr) => () }
+//! define_hasher! { (MyNewDataHasher, MY_NEW_DATA_HASHER, MY_NEW_DATA_SEED, b"MyUniqueSaltString") }
+//! ```
+//!
+//! # Using a hasher directly
+//!
+//! **IMPORTANT:** Do NOT use this for new code unless you know what you are doing.
+//!
+//! ```
+//! use diem_crypto::hash::{CryptoHasher, TestOnlyHasher};
+//!
+//! let mut hasher = TestOnlyHasher::default();
+//! hasher.update("Test message".as_bytes());
+//! let hash_value = hasher.finish();
+//! ```
+#![allow(clippy::integer_arithmetic)]
+use bytes::Bytes;
+use hex::FromHex;
+use mirai_annotations::*;
+use once_cell::sync::{Lazy, OnceCell};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use rand::{rngs::OsRng, Rng};
+use serde::{de, ser};
+use std::{
+    self,
+    convert::{AsRef, TryFrom},
+    fmt,
+    str::FromStr,
+};
+use tiny_keccak::{Hasher, Sha3};
+
+/// A prefix used to begin the salt of every diem hashable structure. The salt
+/// consists in this global prefix, concatenated with the specified
+/// serialization name of the struct.
+pub(crate) const DIEM_HASH_PREFIX: &[u8] = b"DIEM::";
+
+/// Output value of our hash function. Intentionally opaque for safety and modularity.
+#[derive(Clone, Copy, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+pub struct HashValue {
+    hash: [u8; HashValue::LENGTH],
+}
+
+impl HashValue {
+    /// The length of the hash in bytes.
+    pub const LENGTH: usize = 32;
+    /// The length of the hash in bits.
+    pub const LENGTH_IN_BITS: usize = Self::LENGTH * 8;
+
+    /// Create a new [`HashValue`] from a byte array.
+    pub fn new(hash: [u8; HashValue::LENGTH]) -> Self {
+        HashValue { hash }
+    }
+
+    /// Create from a slice (e.g. retrieved from storage).
+    pub fn from_slice<T: AsRef<[u8]>>(bytes: T) -> Result<Self, HashValueParseError> {
+        <[u8; Self::LENGTH]>::try_from(bytes.as_ref())
+            .map_err(|_| HashValueParseError)
+            .map(Self::new)
+    }
+
+    /// Dumps into a vector.
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.hash.to_vec()
+    }
+
+    /// Creates a zero-initialized instance.
+    pub const fn zero() -> Self {
+        HashValue {
+            hash: [0; HashValue::LENGTH],
+        }
+    }
+
+    /// Create a cryptographically random instance.
+    pub fn random() -> Self {
+        let mut rng = OsRng;
+        let hash: [u8; HashValue::LENGTH] = rng.gen();
+        HashValue { hash }
+    }
+
+    /// Creates a random instance with given rng. Useful in unit tests.
+    pub fn random_with_rng<R: Rng>(rng: &mut R) -> Self {
+        let hash: [u8; HashValue::LENGTH] = rng.gen();
+        HashValue { hash }
+    }
+
+    /// Convenience function that computes a `HashValue` internally equal to
+    /// the sha3_256 of a byte buffer. It will handle hasher creation, data
+    /// feeding and finalization.
+    ///
+    /// Note this will not result in the `<T as CryptoHash>::hash()` for any
+    /// reasonable struct T, as this computes a sha3 without any ornaments.
+    pub fn sha3_256_of(buffer: &[u8]) -> Self {
+        let mut sha3 = Sha3::v256();
+        sha3.update(buffer);
+        HashValue::from_keccak(sha3)
+    }
+
+    #[cfg(test)]
+    pub fn from_iter_sha3<'a, I>(buffers: I) -> Self
+    where
+        I: IntoIterator<Item = &'a [u8]>,
+    {
+        let mut sha3 = Sha3::v256();
+        for buffer in buffers {
+            sha3.update(buffer);
+        }
+        HashValue::from_keccak(sha3)
+    }
+
+    fn as_ref_mut(&mut self) -> &mut [u8] {
+        &mut self.hash[..]
+    }
+
+    fn from_keccak(state: Sha3) -> Self {
+        let mut hash = Self::zero();
+        state.finalize(hash.as_ref_mut());
+        hash
+    }
+
+    /// Returns the `index`-th bit in the bytes.
+    pub fn bit(&self, index: usize) -> bool {
+        assume!(index < Self::LENGTH_IN_BITS); // assumed precondition
+        let pos = index / 8;
+        let bit = 7 - index % 8;
+        (self.hash[pos] >> bit) & 1 != 0
+    }
+
+    /// Returns the `index`-th nibble in the bytes.
+    pub fn nibble(&self, index: usize) -> u8 {
+        assume!(index < Self::LENGTH * 2); // assumed precondition
+        let pos = index / 2;
+        let shift = if index % 2 == 0 { 4 } else { 0 };
+        (self.hash[pos] >> shift) & 0x0F
+    }
+
+    /// Returns a `HashValueBitIterator` over all the bits that represent this `HashValue`.
+    pub fn iter_bits(&self) -> HashValueBitIterator<'_> {
+        HashValueBitIterator::new(self)
+    }
+
+    /// Constructs a `HashValue` from an iterator of bits.
+    pub fn from_bit_iter(
+        iter: impl ExactSizeIterator<Item = bool>,
+    ) -> Result<Self, HashValueParseError> {
+        if iter.len() != Self::LENGTH_IN_BITS {
+            return Err(HashValueParseError);
+        }
+
+        let mut buf = [0; Self::LENGTH];
+        for (i, bit) in iter.enumerate() {
+            if bit {
+                buf[i / 8] |= 1 << (7 - i % 8);
+            }
+        }
+        Ok(Self::new(buf))
+    }
+
+    /// Returns the length of common prefix of `self` and `other` in bits.
+    pub fn common_prefix_bits_len(&self, other: HashValue) -> usize {
+        self.iter_bits()
+            .zip(other.iter_bits())
+            .take_while(|(x, y)| x == y)
+            .count()
+    }
+
+    /// Full hex representation of a given hash value.
+    pub fn to_hex(&self) -> String {
+        format!("{:x}", self)
+    }
+
+    /// Full hex representation of a given hash value with `0x` prefix.
+    pub fn to_hex_literal(&self) -> String {
+        format!("{:#x}", self)
+    }
+
+    /// Parse a given hex string to a hash value.
+    pub fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self, HashValueParseError> {
+        <[u8; Self::LENGTH]>::from_hex(hex)
+            .map_err(|_| HashValueParseError)
+            .map(Self::new)
+    }
+
+    /// Create a hash value whose contents are just the given integer. Useful for
+    /// generating basic mock hash values.
+    ///
+    /// Ex: HashValue::from_u64(0x1234) => HashValue([0, .., 0, 0x12, 0x34])
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn from_u64(v: u64) -> Self {
+        let mut hash = [0u8; Self::LENGTH];
+        let bytes = v.to_be_bytes();
+        hash[Self::LENGTH - bytes.len()..].copy_from_slice(&bytes[..]);
+        Self::new(hash)
+    }
+}
+
+impl ser::Serialize for HashValue {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: ser::Serializer,
+    {
+        if serializer.is_human_readable() {
+            serializer.serialize_str(&self.to_hex())
+        } else {
+            // In order to preserve the Serde data model and help analysis tools,
+            // make sure to wrap our value in a container with the same name
+            // as the original type.
+            serializer
+                .serialize_newtype_struct("HashValue", serde_bytes::Bytes::new(&self.hash[..]))
+        }
+    }
+}
+
+impl<'de> de::Deserialize<'de> for HashValue {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: de::Deserializer<'de>,
+    {
+        if deserializer.is_human_readable() {
+            let encoded_hash = <String>::deserialize(deserializer)?;
+            HashValue::from_hex(encoded_hash.as_str())
+                .map_err(<D::Error as ::serde::de::Error>::custom)
+        } else {
+            // See comment in serialize.
+            #[derive(::serde::Deserialize)]
+            #[serde(rename = "HashValue")]
+            struct Value<'a>(&'a [u8]);
+
+            let value = Value::deserialize(deserializer)?;
+            Self::from_slice(value.0).map_err(<D::Error as ::serde::de::Error>::custom)
+        }
+    }
+}
+
+impl Default for HashValue {
+    fn default() -> Self {
+        HashValue::zero()
+    }
+}
+
+impl AsRef<[u8; HashValue::LENGTH]> for HashValue {
+    fn as_ref(&self) -> &[u8; HashValue::LENGTH] {
+        &self.hash
+    }
+}
+
+impl std::ops::Deref for HashValue {
+    type Target = [u8; Self::LENGTH];
+
+    fn deref(&self) -> &Self::Target {
+        &self.hash
+    }
+}
+
+impl std::ops::Index<usize> for HashValue {
+    type Output = u8;
+
+    fn index(&self, s: usize) -> &u8 {
+        self.hash.index(s)
+    }
+}
+
+impl fmt::Binary for HashValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        for byte in &self.hash {
+            write!(f, "{:08b}", byte)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::LowerHex for HashValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "0x")?;
+        }
+        for byte in &self.hash {
+            write!(f, "{:02x}", byte)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Debug for HashValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "HashValue(")?;
+        <Self as fmt::LowerHex>::fmt(self, f)?;
+        write!(f, ")")?;
+        Ok(())
+    }
+}
+
+/// Will print shortened (4 bytes) hash
+impl fmt::Display for HashValue {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        for byte in self.hash.iter().take(4) {
+            write!(f, "{:02x}", byte)?;
+        }
+        Ok(())
+    }
+}
+
+impl From<HashValue> for Bytes {
+    fn from(value: HashValue) -> Bytes {
+        Bytes::copy_from_slice(value.hash.as_ref())
+    }
+}
+
+impl FromStr for HashValue {
+    type Err = HashValueParseError;
+
+    fn from_str(s: &str) -> Result<Self, HashValueParseError> {
+        HashValue::from_hex(s)
+    }
+}
+
+/// Parse error when attempting to construct a HashValue
+#[derive(Clone, Copy, Debug)]
+pub struct HashValueParseError;
+
+impl fmt::Display for HashValueParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "unable to parse HashValue")
+    }
+}
+
+impl std::error::Error for HashValueParseError {}
+
+/// An iterator over `HashValue` that generates one bit for each iteration.
+pub struct HashValueBitIterator<'a> {
+    /// The reference to the bytes that represent the `HashValue`.
+    hash_bytes: &'a [u8],
+    pos: std::ops::Range<usize>,
+    // invariant hash_bytes.len() == HashValue::LENGTH;
+    // invariant pos.end == hash_bytes.len() * 8;
+}
+
+impl<'a> HashValueBitIterator<'a> {
+    /// Constructs a new `HashValueBitIterator` using given `HashValue`.
+    fn new(hash_value: &'a HashValue) -> Self {
+        HashValueBitIterator {
+            hash_bytes: hash_value.as_ref(),
+            pos: (0..HashValue::LENGTH_IN_BITS),
+        }
+    }
+
+    /// Returns the `index`-th bit in the bytes.
+    fn get_bit(&self, index: usize) -> bool {
+        assume!(index < self.pos.end); // assumed precondition
+        assume!(self.hash_bytes.len() == HashValue::LENGTH); // invariant
+        assume!(self.pos.end == self.hash_bytes.len() * 8); // invariant
+        let pos = index / 8;
+        let bit = 7 - index % 8;
+        (self.hash_bytes[pos] >> bit) & 1 != 0
+    }
+}
+
+impl<'a> std::iter::Iterator for HashValueBitIterator<'a> {
+    type Item = bool;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.pos.next().map(|x| self.get_bit(x))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.pos.size_hint()
+    }
+}
+
+impl<'a> std::iter::DoubleEndedIterator for HashValueBitIterator<'a> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.pos.next_back().map(|x| self.get_bit(x))
+    }
+}
+
+impl<'a> std::iter::ExactSizeIterator for HashValueBitIterator<'a> {}
+
+/// A type that can be cryptographically hashed to produce a `HashValue`.
+///
+/// In most cases, this trait should not be implemented manually but rather derived using
+/// the macros `serde::Serialize`, `CryptoHasher`, and `BCSCryptoHash`.
+pub trait CryptoHash {
+    /// The associated `Hasher` type which comes with a unique salt for this type.
+    type Hasher: CryptoHasher;
+
+    /// Hashes the object and produces a `HashValue`.
+    fn hash(&self) -> HashValue;
+}
+
+/// A trait for representing the state of a cryptographic hasher.
+pub trait CryptoHasher: Default + std::io::Write {
+    /// the seed used to initialize hashing `Self` before the serialization bytes of the actual value
+    fn seed() -> &'static [u8; 32];
+
+    /// Write bytes into the hasher.
+    fn update(&mut self, bytes: &[u8]);
+
+    /// Finish constructing the [`HashValue`].
+    fn finish(self) -> HashValue;
+
+    /// Convenience method to compute the hash of a complete byte slice.
+    fn hash_all(bytes: &[u8]) -> HashValue {
+        let mut hasher = Self::default();
+        hasher.update(bytes);
+        hasher.finish()
+    }
+}
+
+/// The default hasher underlying generated implementations of `CryptoHasher`.
+#[doc(hidden)]
+#[derive(Clone)]
+pub struct DefaultHasher {
+    state: Sha3,
+}
+
+impl DefaultHasher {
+    #[doc(hidden)]
+    /// This function does not return a HashValue in the sense of our usual
+    /// hashes, but a construction of initial bytes that are fed into any hash
+    /// provided we're passed  a (bcs) serialization name as argument.
+    pub fn prefixed_hash(buffer: &[u8]) -> [u8; HashValue::LENGTH] {
+        // The salt is initial material we prefix to actual value bytes for
+        // domain separation. Its length is variable.
+        let salt: Vec<u8> = [DIEM_HASH_PREFIX, buffer].concat();
+        // The seed is a fixed-length hash of the salt, thereby preventing
+        // suffix attacks on the domain separation bytes.
+        HashValue::sha3_256_of(&salt[..]).hash
+    }
+
+    #[doc(hidden)]
+    pub fn new(typename: &[u8]) -> Self {
+        let mut state = Sha3::v256();
+        if !typename.is_empty() {
+            state.update(&Self::prefixed_hash(typename));
+        }
+        DefaultHasher { state }
+    }
+
+    #[doc(hidden)]
+    pub fn update(&mut self, bytes: &[u8]) {
+        self.state.update(bytes);
+    }
+
+    #[doc(hidden)]
+    pub fn finish(self) -> HashValue {
+        let mut hasher = HashValue::default();
+        self.state.finalize(hasher.as_ref_mut());
+        hasher
+    }
+}
+
+impl fmt::Debug for DefaultHasher {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "DefaultHasher: state = Sha3")
+    }
+}
+
+macro_rules! define_hasher {
+    (
+        $(#[$attr:meta])*
+        ($hasher_type: ident, $hasher_name: ident, $seed_name: ident, $salt: expr)
+    ) => {
+
+        #[derive(Clone, Debug)]
+        $(#[$attr])*
+        pub struct $hasher_type(DefaultHasher);
+
+        impl $hasher_type {
+            fn new() -> Self {
+                $hasher_type(DefaultHasher::new($salt))
+            }
+        }
+
+        static $hasher_name: Lazy<$hasher_type> = Lazy::new(|| { $hasher_type::new() });
+        static $seed_name: OnceCell<[u8; 32]> = OnceCell::new();
+
+        impl Default for $hasher_type {
+            fn default() -> Self {
+                $hasher_name.clone()
+            }
+        }
+
+        impl CryptoHasher for $hasher_type {
+            fn seed() -> &'static [u8;32] {
+                $seed_name.get_or_init(|| {
+                    DefaultHasher::prefixed_hash($salt)
+                })
+            }
+
+            fn update(&mut self, bytes: &[u8]) {
+                self.0.update(bytes);
+            }
+
+            fn finish(self) -> HashValue {
+                self.0.finish()
+            }
+        }
+
+        impl std::io::Write for $hasher_type {
+            fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
+                self.0.update(bytes);
+                Ok(bytes.len())
+            }
+            fn flush(&mut self) -> std::io::Result<()> {
+                Ok(())
+            }
+        }
+    };
+}
+
+define_hasher! {
+    /// The hasher used to compute the hash of an internal node in the transaction accumulator.
+    (
+        TransactionAccumulatorHasher,
+        TRANSACTION_ACCUMULATOR_HASHER,
+        TRANSACTION_ACCUMULATOR_SEED,
+        b"TransactionAccumulator"
+    )
+}
+
+define_hasher! {
+    /// The hasher used to compute the hash of an internal node in the event accumulator.
+    (
+        EventAccumulatorHasher,
+        EVENT_ACCUMULATOR_HASHER,
+        EVENT_ACCUMULATOR_SEED,
+        b"EventAccumulator"
+    )
+}
+
+define_hasher! {
+    /// The hasher used to compute the hash of an internal node in the Sparse Merkle Tree.
+    (
+        SparseMerkleInternalHasher,
+        SPARSE_MERKLE_INTERNAL_HASHER,
+        SPARSE_MERKLE_INTERNAL_SEED,
+        b"SparseMerkleInternal"
+    )
+}
+
+define_hasher! {
+    /// The hasher used to compute the hash of an internal node in the transaction accumulator.
+    (
+        VoteProposalHasher,
+        VOTE_PROPOSAL_HASHER,
+        VOTE_PROPOSAL_SEED,
+        b"VoteProposalHasher"
+    )
+}
+
+define_hasher! {
+    /// The hasher used only for testing. It doesn't have a salt.
+    (TestOnlyHasher, TEST_ONLY_HASHER, TEST_ONLY_SEED, b"")
+}
+
+fn create_literal_hash(word: &str) -> HashValue {
+    let mut s = word.as_bytes().to_vec();
+    assert!(s.len() <= HashValue::LENGTH);
+    s.resize(HashValue::LENGTH, 0);
+    HashValue::from_slice(&s).expect("Cannot fail")
+}
+
+/// Placeholder hash of `Accumulator`.
+pub static ACCUMULATOR_PLACEHOLDER_HASH: Lazy<HashValue> =
+    Lazy::new(|| create_literal_hash("ACCUMULATOR_PLACEHOLDER_HASH"));
+
+/// Placeholder hash of `SparseMerkleTree`.
+pub static SPARSE_MERKLE_PLACEHOLDER_HASH: Lazy<HashValue> =
+    Lazy::new(|| create_literal_hash("SPARSE_MERKLE_PLACEHOLDER_HASH"));
+
+/// Block id reserved as the id of parent block of the genesis block.
+pub static PRE_GENESIS_BLOCK_ID: Lazy<HashValue> =
+    Lazy::new(|| create_literal_hash("PRE_GENESIS_BLOCK_ID"));
+
+/// Genesis block id is used as a parent of the very first block executed by the executor.
+pub static GENESIS_BLOCK_ID: Lazy<HashValue> = Lazy::new(|| {
+    // This maintains the invariant that block.id() == block.hash(), for
+    // the genesis block and allows us to (de/)serialize it consistently
+    HashValue::new([
+        0x5E, 0x10, 0xBA, 0xD4, 0x5B, 0x35, 0xED, 0x92, 0x9C, 0xD6, 0xD2, 0xC7, 0x09, 0x8B, 0x13,
+        0x5D, 0x02, 0xDD, 0x25, 0x9A, 0xE8, 0x8A, 0x8D, 0x09, 0xF4, 0xEB, 0x5F, 0xBA, 0xE9, 0xA6,
+        0xF6, 0xE4,
+    ])
+});
+
+/// Provides a test_only_hash() method that can be used in tests on types that implement
+/// `serde::Serialize`.
+///
+/// # Example
+/// ```
+/// use diem_crypto::hash::TestOnlyHash;
+///
+/// b"hello world".test_only_hash();
+/// ```
+pub trait TestOnlyHash {
+    /// Generates a hash used only for tests.
+    fn test_only_hash(&self) -> HashValue;
+}
+
+impl<T: ser::Serialize + ?Sized> TestOnlyHash for T {
+    fn test_only_hash(&self) -> HashValue {
+        let bytes = bcs::to_bytes(self).expect("serialize failed during hash.");
+        let mut hasher = TestOnlyHasher::default();
+        hasher.update(&bytes);
+        hasher.finish()
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hkdf.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hkdf.rs
new file mode 100644
index 000000000..71ee00942
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/hkdf.rs
@@ -0,0 +1,199 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! An implementation of HKDF, the HMAC-based Extract-and-Expand Key Derivation Function for the
+//! Diem project based on [RFC 5869](https://tools.ietf.org/html/rfc5869).
+//!
+//! The key derivation function (KDF) is intended to support a wide range of applications and
+//! requirements, and is conservative in its use of cryptographic hash functions. In particular,
+//! this implementation is compatible with hash functions that output 256 bits or more, such as
+//! SHA256, SHA3-256 and SHA512.
+//!
+//! HKDF follows the "extract-then-expand" paradigm, where the KDF logically consists of two
+//! modules: the first stage takes the input keying material (the seed) and "extracts" from it a
+//! fixed-length pseudorandom key, and then the second stage "expands" this key into several
+//! additional pseudorandom keys (the output of the KDF). For convenience, a function that runs both
+//! steps in a single call is provided. Note that along with an initial high-entropy seed, a user
+//! can optionally provide salt and app-info byte-arrays for extra security guarantees and domain
+//! separation.
+//!
+//! # Applications
+//!
+//! HKDF is intended for use in a wide variety of KDF applications (see [Key derivation function](https://en.wikipedia.org/wiki/Key_derivation_function)), including:
+//! a) derivation of keys from an origin high-entropy master seed. This is the recommended approach
+//! for generating keys in Diem, especially when a True Random Generator is not available.
+//! b) derivation of session keys from a shared Diffie-Hellman value in a key-agreement protocol.
+//! c) combining entropy from multiple sources of randomness, such as entropy collected
+//! from system events, user's keystrokes, /dev/urandom etc. The combined seed can then be used to
+//! generate cryptographic keys for account, network and transaction signing keys among the others.
+//! d) hierarchical private key derivation, similarly to Bitcoin's BIP32 protocol for easier key
+//! management.
+//! e) hybrid key generation that combines a master seed with a PRNG output for extra security
+//! guarantees against a master seed leak or low PRNG entropy.
+//!
+//! # Recommendations
+//!
+//! **Salt**
+//! HKDF can operate with and without random 'salt'. The use of salt adds to the strength of HKDF,
+//! ensuring independence between different uses of the hash function, supporting
+//! "source-independent" extraction, and strengthening the HKDF use. The salt value should be a
+//! random string of the same length as the hash output. A shorter or less random salt value can
+//! still make a contribution to the security of the output key material. Salt values should be
+//! independent of the input keying material. In particular, an application needs to make sure that
+//! salt values are not chosen or manipulated by an attacker.
+//!
+//! *Application info*
+//! Key expansion accepts an optional 'info' value to which the application assigns some meaning.
+//! Its objective is to bind the derived key material to application- and context-specific
+//! information.  For example, 'info' may contain a protocol number, algorithm identifier,
+//! child key number (similarly to [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)), etc. The only technical requirement for 'info' is that
+//! it be independent of the seed.
+//!
+//! **Which function to use: extract, expand or both?**
+//! Unless absolutely sure of what they are doing, applications should use both steps — if only for
+//! the sake of compatibility with the general case.
+//!
+//! # Example
+//!
+//! Run HKDF extract-then-expand so as to return 64 bytes, using 'salt', 'seed' and 'info' as
+//! inputs.
+//! ```
+//! use diem_crypto::hkdf::Hkdf;
+//! use sha2::Sha256;
+//!
+//! // some bytes required for this example.
+//! let raw_bytes = [2u8; 10];
+//! // define salt
+//! let salt = Some(&raw_bytes[0..4]);
+//! // define seed - in production this is recommended to be a 32 bytes or longer random seed.
+//! let seed = [3u8; 32];
+//! // define application info
+//! let info = Some(&raw_bytes[4..10]);
+//!
+//! // HKDF extract-then-expand 64-bytes output
+//! let derived_bytes = Hkdf::<Sha256>::extract_then_expand(salt, &seed, info, 64);
+//! assert_eq!(derived_bytes.unwrap().len(), 64)
+//! ```
+
+use digest::{
+    generic_array::{self, ArrayLength},
+    BlockInput, FixedOutput, Reset, Update,
+};
+use generic_array::typenum::{IsGreaterOrEqual, True, U32};
+use std::marker::PhantomData;
+use thiserror::Error;
+
+/// Hash function is not supported if its output is less than 32 bits.
+type DMinimumSize = U32;
+
+/// Seed (ikm = initial key material) is not accepted if its size is less than 16 bytes. This is a
+/// precautionary measure to prevent HKDF misuse. 128 bits is the minimum accepted seed entropy
+/// length in the majority of today's applications to avoid brute forcing.
+/// Note that for Ed25519 keys, random seeds of at least 32 bytes are recommended.
+const MINIMUM_SEED_LENGTH: usize = 16;
+
+/// Structure representing the HKDF, capable of HKDF-Extract and HKDF-Expand operations, as defined
+/// in RFC 5869.
+#[derive(Clone, Debug)]
+pub struct Hkdf<D>
+where
+    D: Update + BlockInput + FixedOutput + Reset + Default + Clone,
+    D::BlockSize: ArrayLength<u8>,
+    D::OutputSize: ArrayLength<u8>,
+    D::OutputSize: IsGreaterOrEqual<DMinimumSize, Output = True>,
+{
+    _marker: PhantomData<D>,
+}
+
+impl<D> Hkdf<D>
+where
+    D: Update + BlockInput + FixedOutput + Reset + Default + Clone,
+    D::BlockSize: ArrayLength<u8> + Clone,
+    D::OutputSize: ArrayLength<u8>,
+    D::OutputSize: IsGreaterOrEqual<DMinimumSize, Output = True>,
+{
+    /// The RFC5869 HKDF-Extract operation.
+    pub fn extract(salt: Option<&[u8]>, ikm: &[u8]) -> Result<Vec<u8>, HkdfError> {
+        if ikm.len() < MINIMUM_SEED_LENGTH {
+            return Err(HkdfError::InvalidSeedLengthError);
+        }
+        Ok(Hkdf::<D>::extract_no_ikm_check(salt, ikm))
+    }
+
+    fn extract_no_ikm_check(salt: Option<&[u8]>, ikm: &[u8]) -> Vec<u8> {
+        let (arr, _hkdf) = hkdf::Hkdf::<D>::extract(salt, ikm);
+        arr.to_vec()
+    }
+
+    /// The RFC5869 HKDF-Expand operation.
+    pub fn expand(prk: &[u8], info: Option<&[u8]>, length: usize) -> Result<Vec<u8>, HkdfError> {
+        // According to RFC5869, MAX_OUTPUT_LENGTH <= 255 * HashLen — which is
+        // checked below.
+        // We specifically exclude a zero size length as well.
+        if length == 0 {
+            return Err(HkdfError::InvalidOutputLengthError);
+        }
+
+        let hkdf =
+            hkdf::Hkdf::<D>::from_prk(prk).map_err(|_| HkdfError::WrongPseudorandomKeyError)?;
+        let mut okm = vec![0u8; length];
+        hkdf.expand(info.unwrap_or(&[]), &mut okm)
+            // length > D::OutputSize::to_usize() * 255
+            .map_err(|_| HkdfError::InvalidOutputLengthError)?;
+        Ok(okm)
+    }
+
+    /// HKDF Extract then Expand operation as a single step.
+    pub fn extract_then_expand(
+        salt: Option<&[u8]>,
+        ikm: &[u8],
+        info: Option<&[u8]>,
+        length: usize,
+    ) -> Result<Vec<u8>, HkdfError> {
+        let prk = Hkdf::<D>::extract(salt, ikm)?;
+        Hkdf::<D>::expand(&prk, info, length)
+    }
+
+    /// CAUTION: This is not recommended because it does not take an ikm (seed) as an input and
+    /// thus, it is not fully compliant with the HKDF RFC (which always expects a non-zero ikm).
+    /// Please use `extract_then_expand` instead, unless you know what you are doing.
+    ///
+    /// This api is currently required by the Noise protocol [HKDF specs](https://noiseprotocol.org/noise.html#hash-functions).
+    ///
+    /// HKDF Extract then Expand operation as a single step, but without an ikm input.
+    pub fn extract_then_expand_no_ikm(
+        salt: Option<&[u8]>,
+        info: Option<&[u8]>,
+        length: usize,
+    ) -> Result<Vec<u8>, HkdfError> {
+        let prk = Hkdf::<D>::extract_no_ikm_check(salt, &[]);
+        Hkdf::<D>::expand(&prk, info, length)
+    }
+}
+
+/// An error type for HKDF key derivation issues.
+///
+/// This enum reflects there are various causes of HKDF failures, including:
+/// a) requested HKDF output size exceeds the maximum allowed or is zero.
+/// b) hash functions outputting less than 32 bits are not supported (i.e., SHA1 is not supported).
+/// c) small PRK value in HKDF-Expand according to RFC 5869.
+/// d) any other underlying HMAC error.
+#[derive(Clone, Debug, PartialEq, Eq, Error)]
+pub enum HkdfError {
+    /// HKDF expand output exceeds the maximum allowed or is zero.
+    #[error("HKDF expand error - requested output size exceeds the maximum allowed or is zero")]
+    InvalidOutputLengthError,
+    /// PRK on HKDF-Expand should not be less than the underlying hash output bits.
+    #[error(
+        "HKDF expand error - the pseudorandom key input ('prk' in RFC 5869) \
+         is less than the underlying hash output bits"
+    )]
+    WrongPseudorandomKeyError,
+    /// HMAC key related error; unlikely to happen because every key size is accepted in HMAC.
+    #[error("HMAC key error")]
+    MACKeyError,
+    /// HKDF extract input seed should not be less than the minimum accepted.
+    #[error("HKDF extract error - input seed is too small")]
+    InvalidSeedLengthError,
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/lib.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/lib.rs
new file mode 100644
index 000000000..b7c4679c5
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/lib.rs
@@ -0,0 +1,69 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+#![deny(missing_docs)]
+//! This feature gets turned on only if diem-crypto is compiled via MIRAI in a nightly build.
+#![cfg_attr(mirai, allow(incomplete_features), feature(const_generics))]
+
+//! A library supplying various cryptographic primitives
+pub mod compat;
+pub mod ed25519;
+pub mod error;
+pub mod hash;
+pub mod hkdf;
+pub mod multi_ed25519;
+pub mod noise;
+pub mod test_utils;
+pub mod traits;
+pub mod validatable;
+pub mod x25519;
+
+#[cfg(test)]
+mod unit_tests;
+
+#[cfg(mirai)]
+mod tags;
+
+pub use self::traits::*;
+pub use hash::HashValue;
+// Reexport once_cell and serde_name for use in CryptoHasher Derive implementation.
+#[doc(hidden)]
+pub use once_cell as _once_cell;
+#[doc(hidden)]
+pub use serde_name as _serde_name;
+
+// We use formally verified arithmetic
+// in maintained forks of the dalek suite of libraries ({curve, ed,
+// x}25519-dalek). This is controlled by a feature in the forked crates
+// ('fiat_u64_backend'), which we turn on by default.
+#[cfg(not(any(feature = "fiat", feature = "u64", feature = "u32")))]
+compile_error!(
+    "no dalek arithmetic backend cargo feature enabled! \
+     please enable one of: fiat, u64, u32"
+);
+
+#[cfg(all(feature = "fiat", feature = "u64"))]
+compile_error!(
+    "at most one dalek arithmetic backend cargo feature should be enabled! \
+     please enable exactly one of: fiat, u64, u32"
+);
+
+#[cfg(all(feature = "fiat", feature = "u32"))]
+compile_error!(
+    "at most one dalek arithmetic backend cargo feature should be enabled! \
+     please enable exactly one of: fiat, u64, u32"
+);
+
+#[cfg(all(feature = "u64", feature = "u32"))]
+compile_error!(
+    "at most one dalek arithmetic backend cargo feature should be enabled! \
+     please enable exactly one of: fiat, u64, u32"
+);
+
+// MIRAI's tag analysis makes use of the incomplete const_generics feature, so the module
+// containing the definitions of MIRAI tag types should not get compiled in a release build.
+// The code below fails a build of the crate if mirai is on but debug_assertions is not.
+#[cfg(all(mirai, not(debug_assertions)))]
+compile_error!("MIRAI can only be used to compile the crate in a debug build!");
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/multi_ed25519.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/multi_ed25519.rs
new file mode 100644
index 000000000..3c418818b
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/multi_ed25519.rs
@@ -0,0 +1,643 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides an API for the accountable threshold multi-sig PureEdDSA signature scheme
+//! over the ed25519 twisted Edwards curve as defined in [RFC8032](https://tools.ietf.org/html/rfc8032).
+//!
+//! Signature verification also checks and rejects non-canonical signatures.
+
+use crate::{
+    ed25519::{
+        Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature, ED25519_PRIVATE_KEY_LENGTH,
+        ED25519_PUBLIC_KEY_LENGTH, ED25519_SIGNATURE_LENGTH,
+    },
+    hash::{CryptoHash, CryptoHasher},
+    traits::*,
+};
+use anyhow::{anyhow, Result};
+use core::convert::TryFrom;
+use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay};
+use mirai_annotations::*;
+use rand::Rng;
+use serde::Serialize;
+use std::{convert::TryInto, fmt};
+
+const MAX_NUM_OF_KEYS: usize = 32;
+const BITMAP_NUM_OF_BYTES: usize = 4;
+
+/// Vector of private keys in the multi-key Ed25519 structure along with the threshold.
+#[derive(DeserializeKey, Eq, PartialEq, SilentDisplay, SilentDebug, SerializeKey)]
+pub struct MultiEd25519PrivateKey {
+    private_keys: Vec<Ed25519PrivateKey>,
+    threshold: u8,
+}
+
+#[cfg(feature = "assert-private-keys-not-cloneable")]
+static_assertions::assert_not_impl_any!(MultiEd25519PrivateKey: Clone);
+
+/// Vector of public keys in the multi-key Ed25519 structure along with the threshold.
+#[derive(Clone, DeserializeKey, Eq, PartialEq, SerializeKey)]
+pub struct MultiEd25519PublicKey {
+    public_keys: Vec<Ed25519PublicKey>,
+    threshold: u8,
+}
+
+#[cfg(mirai)]
+use crate::tags::ValidatedPublicKeyTag;
+#[cfg(not(mirai))]
+struct ValidatedPublicKeyTag {}
+
+/// Vector of the multi-key signatures along with a 32bit [u8; 4] bitmap required to map signatures
+/// with their corresponding public keys.
+///
+/// Note that bits are read from left to right. For instance, in the following bitmap
+/// [0b0001_0000, 0b0000_0000, 0b0000_0000, 0b0000_0001], the 3rd and 31st positions are set.
+#[derive(Clone, DeserializeKey, Eq, PartialEq, SerializeKey)]
+pub struct MultiEd25519Signature {
+    signatures: Vec<Ed25519Signature>,
+    bitmap: [u8; BITMAP_NUM_OF_BYTES],
+}
+
+impl MultiEd25519PrivateKey {
+    /// Construct a new MultiEd25519PrivateKey.
+    pub fn new(
+        private_keys: Vec<Ed25519PrivateKey>,
+        threshold: u8,
+    ) -> std::result::Result<Self, CryptoMaterialError> {
+        let num_of_keys = private_keys.len();
+        if threshold == 0 || num_of_keys < threshold as usize {
+            Err(CryptoMaterialError::ValidationError)
+        } else if num_of_keys > MAX_NUM_OF_KEYS {
+            Err(CryptoMaterialError::WrongLengthError)
+        } else {
+            Ok(MultiEd25519PrivateKey {
+                private_keys,
+                threshold,
+            })
+        }
+    }
+
+    /// Serialize a MultiEd25519PrivateKey.
+    pub fn to_bytes(&self) -> Vec<u8> {
+        to_bytes(&self.private_keys, self.threshold)
+    }
+}
+
+impl MultiEd25519PublicKey {
+    /// Construct a new MultiEd25519PublicKey.
+    /// --- Rules ---
+    /// a) threshold cannot be zero.
+    /// b) public_keys.len() should be equal to or larger than threshold.
+    /// c) support up to MAX_NUM_OF_KEYS public keys.
+    pub fn new(
+        public_keys: Vec<Ed25519PublicKey>,
+        threshold: u8,
+    ) -> std::result::Result<Self, CryptoMaterialError> {
+        let num_of_keys = public_keys.len();
+        if threshold == 0 || num_of_keys < threshold as usize {
+            Err(CryptoMaterialError::ValidationError)
+        } else if num_of_keys > MAX_NUM_OF_KEYS {
+            Err(CryptoMaterialError::WrongLengthError)
+        } else {
+            Ok(MultiEd25519PublicKey {
+                public_keys,
+                threshold,
+            })
+        }
+    }
+
+    /// Getter public_keys
+    pub fn public_keys(&self) -> &Vec<Ed25519PublicKey> {
+        &self.public_keys
+    }
+
+    /// Getter threshold
+    pub fn threshold(&self) -> &u8 {
+        &self.threshold
+    }
+
+    /// Serialize a MultiEd25519PublicKey.
+    pub fn to_bytes(&self) -> Vec<u8> {
+        to_bytes(&self.public_keys, self.threshold)
+    }
+}
+
+///////////////////////
+// PrivateKey Traits //
+///////////////////////
+
+/// Convenient method to create a MultiEd25519PrivateKey from a single Ed25519PrivateKey.
+impl From<&Ed25519PrivateKey> for MultiEd25519PrivateKey {
+    fn from(ed_private_key: &Ed25519PrivateKey) -> Self {
+        MultiEd25519PrivateKey {
+            private_keys: vec![Ed25519PrivateKey::try_from(&ed_private_key.to_bytes()[..]).unwrap()],
+            threshold: 1u8,
+        }
+    }
+}
+
+impl PrivateKey for MultiEd25519PrivateKey {
+    type PublicKeyMaterial = MultiEd25519PublicKey;
+}
+
+impl SigningKey for MultiEd25519PrivateKey {
+    type SignatureMaterial = MultiEd25519Signature;
+    type VerifyingKeyMaterial = MultiEd25519PublicKey;
+
+    fn sign<T: CryptoHash + Serialize>(&self, message: &T) -> MultiEd25519Signature {
+        let mut bitmap = [0u8; BITMAP_NUM_OF_BYTES];
+        let signatures: Vec<Ed25519Signature> = self
+            .private_keys
+            .iter()
+            .take(self.threshold as usize)
+            .enumerate()
+            .map(|(i, item)| {
+                bitmap_set_bit(&mut bitmap, i);
+                item.sign(message)
+            })
+            .collect();
+
+        MultiEd25519Signature { signatures, bitmap }
+    }
+
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn sign_arbitrary_message(&self, message: &[u8]) -> MultiEd25519Signature {
+        let mut signatures: Vec<Ed25519Signature> = Vec::with_capacity(self.threshold as usize);
+        let mut bitmap = [0u8; BITMAP_NUM_OF_BYTES];
+        signatures.extend(
+            self.private_keys
+                .iter()
+                .take(self.threshold as usize)
+                .enumerate()
+                .map(|(i, item)| {
+                    bitmap_set_bit(&mut bitmap, i);
+                    item.sign_arbitrary_message(message)
+                }),
+        );
+        MultiEd25519Signature { signatures, bitmap }
+    }
+}
+
+// Generating a random K out-of N key for testing.
+impl Uniform for MultiEd25519PrivateKey {
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: ::rand::RngCore + ::rand::CryptoRng,
+    {
+        let num_of_keys = rng.gen_range(1..=MAX_NUM_OF_KEYS);
+        let mut private_keys: Vec<Ed25519PrivateKey> = Vec::with_capacity(num_of_keys);
+        for _ in 0..num_of_keys {
+            private_keys.push(
+                Ed25519PrivateKey::try_from(
+                    &ed25519_dalek::SecretKey::generate(rng).to_bytes()[..],
+                )
+                .unwrap(),
+            );
+        }
+        let threshold = rng.gen_range(1..=num_of_keys) as u8;
+        MultiEd25519PrivateKey {
+            private_keys,
+            threshold,
+        }
+    }
+}
+
+impl TryFrom<&[u8]> for MultiEd25519PrivateKey {
+    type Error = CryptoMaterialError;
+
+    /// Deserialize an Ed25519PrivateKey. This method will also check for key and threshold validity.
+    fn try_from(bytes: &[u8]) -> std::result::Result<MultiEd25519PrivateKey, CryptoMaterialError> {
+        if bytes.is_empty() {
+            return Err(CryptoMaterialError::WrongLengthError);
+        }
+        let threshold = check_and_get_threshold(bytes, ED25519_PRIVATE_KEY_LENGTH)?;
+
+        let private_keys: Result<Vec<Ed25519PrivateKey>, _> = bytes
+            .chunks_exact(ED25519_PRIVATE_KEY_LENGTH)
+            .map(Ed25519PrivateKey::try_from)
+            .collect();
+
+        private_keys.map(|private_keys| MultiEd25519PrivateKey {
+            private_keys,
+            threshold,
+        })
+    }
+}
+
+impl Length for MultiEd25519PrivateKey {
+    fn length(&self) -> usize {
+        self.private_keys.len() * ED25519_PRIVATE_KEY_LENGTH + 1
+    }
+}
+
+impl ValidCryptoMaterial for MultiEd25519PrivateKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes()
+    }
+}
+
+impl Genesis for MultiEd25519PrivateKey {
+    fn genesis() -> Self {
+        let mut buf = [0u8; ED25519_PRIVATE_KEY_LENGTH];
+        buf[ED25519_PRIVATE_KEY_LENGTH - 1] = 1u8;
+        MultiEd25519PrivateKey {
+            private_keys: vec![Ed25519PrivateKey::try_from(buf.as_ref()).unwrap()],
+            threshold: 1u8,
+        }
+    }
+}
+
+//////////////////////
+// PublicKey Traits //
+//////////////////////
+
+/// Convenient method to create a MultiEd25519PublicKey from a single Ed25519PublicKey.
+impl From<Ed25519PublicKey> for MultiEd25519PublicKey {
+    fn from(ed_public_key: Ed25519PublicKey) -> Self {
+        MultiEd25519PublicKey {
+            public_keys: vec![ed_public_key],
+            threshold: 1u8,
+        }
+    }
+}
+
+/// Implementing From<&PrivateKey<...>> allows to derive a public key in a more elegant fashion.
+impl From<&MultiEd25519PrivateKey> for MultiEd25519PublicKey {
+    fn from(private_key: &MultiEd25519PrivateKey) -> Self {
+        let public_keys = private_key
+            .private_keys
+            .iter()
+            .map(PrivateKey::public_key)
+            .collect();
+        MultiEd25519PublicKey {
+            public_keys,
+            threshold: private_key.threshold,
+        }
+    }
+}
+
+/// We deduce PublicKey from this.
+impl PublicKey for MultiEd25519PublicKey {
+    type PrivateKeyMaterial = MultiEd25519PrivateKey;
+}
+
+#[allow(clippy::derive_hash_xor_eq)]
+impl std::hash::Hash for MultiEd25519PublicKey {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let encoded_pubkey = self.to_bytes();
+        state.write(&encoded_pubkey);
+    }
+}
+
+impl TryFrom<&[u8]> for MultiEd25519PublicKey {
+    type Error = CryptoMaterialError;
+
+    /// Deserialize a MultiEd25519PublicKey. This method will also check for key and threshold
+    /// validity, and will only deserialize keys that are safe against small subgroup attacks.
+    fn try_from(bytes: &[u8]) -> std::result::Result<MultiEd25519PublicKey, CryptoMaterialError> {
+        if bytes.is_empty() {
+            return Err(CryptoMaterialError::WrongLengthError);
+        }
+        let threshold = check_and_get_threshold(bytes, ED25519_PUBLIC_KEY_LENGTH)?;
+        let public_keys: Result<Vec<Ed25519PublicKey>, _> = bytes
+            .chunks_exact(ED25519_PUBLIC_KEY_LENGTH)
+            .map(Ed25519PublicKey::try_from)
+            .collect();
+        public_keys.map(|public_keys| {
+            let public_key = MultiEd25519PublicKey {
+                public_keys,
+                threshold,
+            };
+            add_tag!(&public_key, ValidatedPublicKeyTag);
+            public_key
+        })
+    }
+}
+
+/// We deduce VerifyingKey from pointing to the signature material
+/// we get the ability to do `pubkey.validate(msg, signature)`
+impl VerifyingKey for MultiEd25519PublicKey {
+    type SignatureMaterial = MultiEd25519Signature;
+    type SigningKeyMaterial = MultiEd25519PrivateKey;
+}
+
+impl fmt::Display for MultiEd25519PublicKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", hex::encode(self.to_bytes()))
+    }
+}
+
+impl fmt::Debug for MultiEd25519PublicKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "MultiEd25519PublicKey({})", self)
+    }
+}
+
+impl Length for MultiEd25519PublicKey {
+    fn length(&self) -> usize {
+        self.public_keys.len() * ED25519_PUBLIC_KEY_LENGTH + 1
+    }
+}
+
+impl ValidCryptoMaterial for MultiEd25519PublicKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes()
+    }
+}
+
+impl MultiEd25519Signature {
+    /// This method will also sort signatures based on index.
+    pub fn new(
+        signatures: Vec<(Ed25519Signature, u8)>,
+    ) -> std::result::Result<Self, CryptoMaterialError> {
+        let num_of_sigs = signatures.len();
+        if num_of_sigs == 0 || num_of_sigs > MAX_NUM_OF_KEYS {
+            return Err(CryptoMaterialError::ValidationError);
+        }
+
+        let mut sorted_signatures = signatures;
+        sorted_signatures.sort_by(|a, b| a.1.cmp(&b.1));
+
+        let mut bitmap = [0u8; BITMAP_NUM_OF_BYTES];
+
+        // Check if all indexes are unique and < MAX_NUM_OF_KEYS
+        let (sigs, indexes): (Vec<_>, Vec<_>) = sorted_signatures.iter().cloned().unzip();
+        for i in indexes {
+            // If an index is out of range.
+            if i < MAX_NUM_OF_KEYS as u8 {
+                // if an index has been set already (thus, there is a duplicate).
+                if bitmap_get_bit(bitmap, i as usize) {
+                    return Err(CryptoMaterialError::BitVecError(
+                        "Duplicate signature index".to_string(),
+                    ));
+                } else {
+                    bitmap_set_bit(&mut bitmap, i as usize);
+                }
+            } else {
+                return Err(CryptoMaterialError::BitVecError(
+                    "Signature index is out of range".to_string(),
+                ));
+            }
+        }
+        Ok(MultiEd25519Signature {
+            signatures: sigs,
+            bitmap,
+        })
+    }
+
+    /// Creates a new MultiEd25519signature by given signatures and bitmap.
+    pub fn new_with_signatures_and_bitmap(
+        signatures: Vec<Ed25519Signature>,
+        bitmap: [u8; BITMAP_NUM_OF_BYTES],
+    ) -> Self {
+        Self { signatures, bitmap }
+    }
+
+    /// Getter signatures.
+    pub fn signatures(&self) -> &Vec<Ed25519Signature> {
+        &self.signatures
+    }
+
+    /// Getter bitmap.
+    pub fn bitmap(&self) -> &[u8; BITMAP_NUM_OF_BYTES] {
+        &self.bitmap
+    }
+
+    /// Serialize a MultiEd25519Signature in the form of sig0||sig1||..sigN||bitmap.
+    pub fn to_bytes(&self) -> Vec<u8> {
+        let mut bytes: Vec<u8> = self
+            .signatures
+            .iter()
+            .flat_map(|sig| sig.to_bytes().to_vec())
+            .collect();
+        bytes.extend(&self.bitmap[..]);
+        bytes
+    }
+}
+
+//////////////////////
+// Signature Traits //
+//////////////////////
+
+impl TryFrom<&[u8]> for MultiEd25519Signature {
+    type Error = CryptoMaterialError;
+
+    /// Deserialize a MultiEd25519Signature. This method will also check for malleable signatures
+    /// and bitmap validity.
+    fn try_from(bytes: &[u8]) -> std::result::Result<MultiEd25519Signature, CryptoMaterialError> {
+        let length = bytes.len();
+        let bitmap_num_of_bytes = length % ED25519_SIGNATURE_LENGTH;
+        let num_of_sigs = length / ED25519_SIGNATURE_LENGTH;
+
+        if num_of_sigs == 0
+            || num_of_sigs > MAX_NUM_OF_KEYS
+            || bitmap_num_of_bytes != BITMAP_NUM_OF_BYTES
+        {
+            return Err(CryptoMaterialError::WrongLengthError);
+        }
+
+        let bitmap = match bytes[length - BITMAP_NUM_OF_BYTES..].try_into() {
+            Ok(bitmap) => bitmap,
+            Err(_) => return Err(CryptoMaterialError::DeserializationError),
+        };
+        if bitmap_count_ones(bitmap) != num_of_sigs as u32 {
+            return Err(CryptoMaterialError::DeserializationError);
+        }
+
+        let signatures: Result<Vec<Ed25519Signature>, _> = bytes
+            .chunks_exact(ED25519_SIGNATURE_LENGTH)
+            .map(Ed25519Signature::try_from)
+            .collect();
+        signatures.map(|signatures| MultiEd25519Signature { signatures, bitmap })
+    }
+}
+
+impl Length for MultiEd25519Signature {
+    fn length(&self) -> usize {
+        self.signatures.len() * ED25519_SIGNATURE_LENGTH + BITMAP_NUM_OF_BYTES
+    }
+}
+
+#[allow(clippy::derive_hash_xor_eq)]
+impl std::hash::Hash for MultiEd25519Signature {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let encoded_signature = self.to_bytes();
+        state.write(&encoded_signature);
+    }
+}
+
+impl fmt::Display for MultiEd25519Signature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", hex::encode(&self.to_bytes()[..]))
+    }
+}
+
+impl fmt::Debug for MultiEd25519Signature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "MultiEd25519Signature({})", self)
+    }
+}
+
+impl ValidCryptoMaterial for MultiEd25519Signature {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes()
+    }
+}
+
+impl Signature for MultiEd25519Signature {
+    type SigningKeyMaterial = MultiEd25519PrivateKey;
+    type VerifyingKeyMaterial = MultiEd25519PublicKey;
+
+    fn verify<T: CryptoHash + Serialize>(
+        &self,
+        message: &T,
+        public_key: &MultiEd25519PublicKey,
+    ) -> Result<()> {
+        // Public keys should be validated to be safe against small subgroup attacks, etc.
+        precondition!(has_tag!(public_key, ValidatedPublicKeyTag));
+        let mut bytes = <T as CryptoHash>::Hasher::seed().to_vec();
+        bcs::serialize_into(&mut bytes, &message)
+            .map_err(|_| CryptoMaterialError::SerializationError)?;
+        Self::verify_arbitrary_msg(self, &bytes, public_key)
+    }
+
+    /// Checks that `self` is valid for an arbitrary &[u8] `message` using `public_key`.
+    /// Outside of this crate, this particular function should only be used for native signature
+    /// verification in Move.
+    fn verify_arbitrary_msg(
+        &self,
+        message: &[u8],
+        public_key: &MultiEd25519PublicKey,
+    ) -> Result<()> {
+        // Public keys should be validated to be safe against small subgroup attacks, etc.
+        precondition!(has_tag!(public_key, ValidatedPublicKeyTag));
+        match bitmap_last_set_bit(self.bitmap) {
+            Some(last_bit) if last_bit as usize <= public_key.length() => (),
+            _ => {
+                return Err(anyhow!(
+                    "{}",
+                    CryptoMaterialError::BitVecError("Signature index is out of range".to_string())
+                ))
+            },
+        };
+        if bitmap_count_ones(self.bitmap) < public_key.threshold as u32 {
+            return Err(anyhow!(
+                "{}",
+                CryptoMaterialError::BitVecError(
+                    "Not enough signatures to meet the threshold".to_string()
+                )
+            ));
+        }
+        let mut bitmap_index = 0;
+        // TODO use deterministic batch verification when gets available.
+        for sig in &self.signatures {
+            while !bitmap_get_bit(self.bitmap, bitmap_index) {
+                bitmap_index += 1;
+            }
+            sig.verify_arbitrary_msg(message, &public_key.public_keys[bitmap_index])?;
+            bitmap_index += 1;
+        }
+        Ok(())
+    }
+
+    fn to_bytes(&self) -> Vec<u8> {
+        self.to_bytes()
+    }
+}
+
+impl From<Ed25519Signature> for MultiEd25519Signature {
+    fn from(ed_signature: Ed25519Signature) -> Self {
+        MultiEd25519Signature {
+            signatures: vec![ed_signature],
+            // "1000_0000 0000_0000 0000_0000 0000_0000"
+            bitmap: [0b1000_0000u8, 0u8, 0u8, 0u8],
+        }
+    }
+}
+
+//////////////////////
+// Helper functions //
+//////////////////////
+
+// Helper function required to MultiEd25519 keys to_bytes to add the threshold.
+fn to_bytes<T: ValidCryptoMaterial>(keys: &[T], threshold: u8) -> Vec<u8> {
+    let mut bytes: Vec<u8> = keys
+        .iter()
+        .flat_map(ValidCryptoMaterial::to_bytes)
+        .collect();
+    bytes.push(threshold);
+    bytes
+}
+
+// Helper method to get threshold from a serialized MultiEd25519 key payload.
+fn check_and_get_threshold(
+    bytes: &[u8],
+    key_size: usize,
+) -> std::result::Result<u8, CryptoMaterialError> {
+    let payload_length = bytes.len();
+    if bytes.is_empty() {
+        return Err(CryptoMaterialError::WrongLengthError);
+    }
+    let threshold_num_of_bytes = payload_length % key_size;
+    let num_of_keys = payload_length / key_size;
+    let threshold_byte = bytes[bytes.len() - 1];
+
+    if num_of_keys == 0 || num_of_keys > MAX_NUM_OF_KEYS || threshold_num_of_bytes != 1 {
+        Err(CryptoMaterialError::WrongLengthError)
+    } else if threshold_byte == 0 || threshold_byte > num_of_keys as u8 {
+        Err(CryptoMaterialError::ValidationError)
+    } else {
+        Ok(threshold_byte)
+    }
+}
+
+fn bitmap_set_bit(input: &mut [u8; BITMAP_NUM_OF_BYTES], index: usize) {
+    let bucket = index / 8;
+    // It's always invoked with index < 32, thus there is no need to check range.
+    let bucket_pos = index - (bucket * 8);
+    input[bucket] |= 128 >> bucket_pos as u8;
+}
+
+// Helper method to get the input's bit at index.
+fn bitmap_get_bit(input: [u8; BITMAP_NUM_OF_BYTES], index: usize) -> bool {
+    let bucket = index / 8;
+    // It's always invoked with index < 32, thus there is no need to check range.
+    let bucket_pos = index - (bucket * 8);
+    (input[bucket] & (128 >> bucket_pos as u8)) != 0
+}
+
+// Returns the number of set bits.
+fn bitmap_count_ones(input: [u8; BITMAP_NUM_OF_BYTES]) -> u32 {
+    input.iter().map(|a| a.count_ones()).sum()
+}
+
+// Find the last set bit.
+fn bitmap_last_set_bit(input: [u8; BITMAP_NUM_OF_BYTES]) -> Option<u8> {
+    input
+        .iter()
+        .rev()
+        .enumerate()
+        .find(|(_, byte)| byte != &&0u8)
+        .map(|(i, byte)| (8 * (BITMAP_NUM_OF_BYTES - i) - byte.trailing_zeros() as usize - 1) as u8)
+}
+
+#[test]
+fn bitmap_tests() {
+    let mut bitmap = [0b0100_0000u8, 0b1111_1111u8, 0u8, 0b1000_0000u8];
+    assert!(!bitmap_get_bit(bitmap, 0));
+    assert!(bitmap_get_bit(bitmap, 1));
+    for i in 8..16 {
+        assert!(bitmap_get_bit(bitmap, i));
+    }
+    for i in 16..24 {
+        assert!(!bitmap_get_bit(bitmap, i));
+    }
+    assert!(bitmap_get_bit(bitmap, 24));
+    assert!(!bitmap_get_bit(bitmap, 31));
+    assert_eq!(bitmap_last_set_bit(bitmap), Some(24));
+
+    bitmap_set_bit(&mut bitmap, 30);
+    assert!(bitmap_get_bit(bitmap, 30));
+    assert_eq!(bitmap_last_set_bit(bitmap), Some(30));
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/noise.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/noise.rs
new file mode 100644
index 000000000..043e6ac7c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/noise.rs
@@ -0,0 +1,722 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Noise is a [protocol framework](https://noiseprotocol.org/) which we use in Diem to
+//! encrypt and authenticate communications between nodes of the network.
+//!
+//! This file implements a stripped-down version of Noise_IK_25519_AESGCM_SHA256.
+//! This means that only the parts that we care about (the IK handshake) are implemented.
+//!
+//! Note that to benefit from hardware support for AES, you must build this crate with the following
+//! flags: `RUSTFLAGS="-Ctarget-cpu=skylake -Ctarget-feature=+aes,+sse2,+sse4.1,+ssse3"`.
+//!
+//! Usage example:
+//!
+//! ```
+//! use diem_crypto::{noise, x25519, traits::*};
+//! use rand::prelude::*;
+//!
+//! # fn main() -> Result<(), diem_crypto::noise::NoiseError> {
+//! let mut rng = rand::thread_rng();
+//! let initiator_static = x25519::PrivateKey::generate(&mut rng);
+//! let responder_static = x25519::PrivateKey::generate(&mut rng);
+//! let responder_public = responder_static.public_key();
+//!
+//! let initiator = noise::NoiseConfig::new(initiator_static);
+//! let responder = noise::NoiseConfig::new(responder_static);
+//!
+//! let payload1 = b"the client can send an optional payload in the first message";
+//! let mut buffer = vec![0u8; noise::handshake_init_msg_len(payload1.len())];
+//! let initiator_state = initiator
+//!   .initiate_connection(&mut rng, b"prologue", responder_public, Some(payload1), &mut buffer)?;
+//!
+//! let payload2 = b"the server can send an optional payload as well as part of the handshake";
+//! let mut buffer2 = vec![0u8; noise::handshake_resp_msg_len(payload2.len())];
+//! let (received_payload, mut responder_session) = responder
+//!   .respond_to_client_and_finalize(&mut rng, b"prologue", &buffer, Some(payload2), &mut buffer2)?;
+//! assert_eq!(received_payload.as_slice(), &payload1[..]);
+//!
+//! let (received_payload, mut initiator_session) = initiator
+//!   .finalize_connection(initiator_state, &buffer2)?;
+//! assert_eq!(received_payload.as_slice(), &payload2[..]);
+//!
+//! let message_sent = b"hello world".to_vec();
+//! let mut buffer = message_sent.clone();
+//! let auth_tag = initiator_session
+//!   .write_message_in_place(&mut buffer)?;
+//! buffer.extend_from_slice(&auth_tag);
+//!
+//! let received_message = responder_session
+//!   .read_message_in_place(&mut buffer)?;
+//!
+//! assert_eq!(received_message, message_sent.as_slice());
+//!
+//! # Ok(())
+//! # }
+//! ```
+//!
+#![allow(clippy::integer_arithmetic)]
+
+use crate::{hash::HashValue, hkdf::Hkdf, traits::Uniform as _, x25519};
+use aes_gcm::{
+    aead::{generic_array::GenericArray, Aead, AeadInPlace, NewAead, Payload},
+    Aes256Gcm,
+};
+use sha2::Digest;
+use std::{
+    convert::TryFrom as _,
+    io::{Cursor, Read as _, Write as _},
+};
+use thiserror::Error;
+
+//
+// Useful constants
+// ----------------
+//
+
+/// A noise message cannot be larger than 65535 bytes as per the specification.
+pub const MAX_SIZE_NOISE_MSG: usize = 65535;
+
+/// The authentication tag length of AES-GCM.
+pub const AES_GCM_TAGLEN: usize = 16;
+
+/// The only Noise handshake protocol that we implement in this file.
+const PROTOCOL_NAME: &[u8] = b"Noise_IK_25519_AESGCM_SHA256\0\0\0\0";
+
+/// The nonce size we use for AES-GCM.
+const AES_NONCE_SIZE: usize = 12;
+
+/// A handy const fn to get the expanded size of a plaintext after encryption
+pub const fn encrypted_len(plaintext_len: usize) -> usize {
+    plaintext_len + AES_GCM_TAGLEN
+}
+
+/// A handy const fn to get the size of a plaintext from a ciphertext size
+pub const fn decrypted_len(ciphertext_len: usize) -> usize {
+    ciphertext_len - AES_GCM_TAGLEN
+}
+
+/// A handy const fn to get the size of the first handshake message
+pub const fn handshake_init_msg_len(payload_len: usize) -> usize {
+    // e
+    let e_len = x25519::PUBLIC_KEY_SIZE;
+    // encrypted s
+    let enc_s_len = encrypted_len(x25519::PUBLIC_KEY_SIZE);
+    // encrypted payload
+    let enc_payload_len = encrypted_len(payload_len);
+    //
+    e_len + enc_s_len + enc_payload_len
+}
+
+/// A handy const fn to get the size of the second handshake message
+pub const fn handshake_resp_msg_len(payload_len: usize) -> usize {
+    // e
+    let e_len = x25519::PUBLIC_KEY_SIZE;
+    // encrypted payload
+    let enc_payload_len = encrypted_len(payload_len);
+    //
+    e_len + enc_payload_len
+}
+
+/// This implementation relies on the fact that the hash function used has a 256-bit output
+#[rustfmt::skip]
+const _: [(); 32] = [(); HashValue::LENGTH];
+
+//
+// Errors
+// ------
+//
+
+/// A NoiseError enum represents the different types of error that noise can return to users of the crate
+#[derive(Debug, Error)]
+pub enum NoiseError {
+    /// the received message is too short to contain the expected data
+    #[error("noise: the received message is too short to contain the expected data")]
+    MsgTooShort,
+
+    /// HKDF has failed (in practice there is no reason for HKDF to fail)
+    #[error("noise: HKDF has failed")]
+    Hkdf,
+
+    /// encryption has failed (in practice there is no reason for encryption to fail)
+    #[error("noise: encryption has failed")]
+    Encrypt,
+
+    /// could not decrypt the received data (most likely the data was tampered with
+    #[error("noise: could not decrypt the received data")]
+    Decrypt,
+
+    /// the public key received is of the wrong format
+    #[error("noise: the public key received is of the wrong format")]
+    WrongPublicKeyReceived,
+
+    /// session was closed due to decrypt error
+    #[error("noise: session was closed due to decrypt error")]
+    SessionClosed,
+
+    /// the payload that we are trying to send is too large
+    #[error("noise: the payload that we are trying to send is too large")]
+    PayloadTooLarge,
+
+    /// the message we received is too large
+    #[error("noise: the message we received is too large")]
+    ReceivedMsgTooLarge,
+
+    /// the response buffer passed as argument is too small
+    #[error("noise: the response buffer passed as argument is too small")]
+    ResponseBufferTooSmall,
+
+    /// the nonce exceeds the maximum u64 value (in practice this should not happen)
+    #[error("noise: the nonce exceeds the maximum u64 value")]
+    NonceOverflow,
+}
+
+//
+// helpers
+// -------
+//
+
+fn hash(data: &[u8]) -> Vec<u8> {
+    sha2::Sha256::digest(data).to_vec()
+}
+
+fn hkdf(ck: &[u8], dh_output: Option<&[u8]>) -> Result<(Vec<u8>, Vec<u8>), NoiseError> {
+    let dh_output = dh_output.unwrap_or(&[]);
+    let hkdf_output = if dh_output.is_empty() {
+        Hkdf::<sha2::Sha256>::extract_then_expand_no_ikm(Some(ck), None, 64)
+    } else {
+        Hkdf::<sha2::Sha256>::extract_then_expand(Some(ck), dh_output, None, 64)
+    };
+
+    let hkdf_output = hkdf_output.map_err(|_| NoiseError::Hkdf)?;
+    let (k1, k2) = hkdf_output.split_at(32);
+    Ok((k1.to_vec(), k2.to_vec()))
+}
+
+fn mix_hash(h: &mut Vec<u8>, data: &[u8]) {
+    h.extend_from_slice(data);
+    *h = hash(h);
+}
+
+fn mix_key(ck: &mut Vec<u8>, dh_output: &[u8]) -> Result<Vec<u8>, NoiseError> {
+    let (new_ck, k) = hkdf(ck, Some(dh_output))?;
+    *ck = new_ck;
+    Ok(k)
+}
+
+//
+// Noise implementation
+// --------------------
+//
+
+/// A key holder structure used for both initiators and responders.
+#[derive(Debug)]
+pub struct NoiseConfig {
+    private_key: x25519::PrivateKey,
+    public_key: x25519::PublicKey,
+}
+
+/// Refer to the Noise protocol framework specification in order to understand these fields.
+#[cfg_attr(test, derive(Clone))]
+pub struct InitiatorHandshakeState {
+    /// rolling hash
+    h: Vec<u8>,
+    /// chaining key
+    ck: Vec<u8>,
+    /// ephemeral key
+    e: x25519::PrivateKey,
+    /// remote static key used
+    rs: x25519::PublicKey,
+}
+
+/// Refer to the Noise protocol framework specification in order to understand these fields.
+#[cfg_attr(test, derive(Clone))]
+pub struct ResponderHandshakeState {
+    /// rolling hash
+    h: Vec<u8>,
+    /// chaining key
+    ck: Vec<u8>,
+    /// remote static key received
+    rs: x25519::PublicKey,
+    /// remote ephemeral key receiced
+    re: x25519::PublicKey,
+}
+
+impl NoiseConfig {
+    /// A peer must create a NoiseConfig through this function before being able to connect with other peers.
+    pub fn new(private_key: x25519::PrivateKey) -> Self {
+        // we could take a public key as argument, and it would be faster, but this is cleaner
+        let public_key = private_key.public_key();
+        Self {
+            private_key,
+            public_key,
+        }
+    }
+
+    /// Handy getter to access the configuration's public key
+    pub fn public_key(&self) -> x25519::PublicKey {
+        self.public_key
+    }
+
+    //
+    // Initiator
+    // ---------
+
+    /// An initiator can use this function to initiate a handshake with a known responder.
+    pub fn initiate_connection(
+        &self,
+        rng: &mut (impl rand::RngCore + rand::CryptoRng),
+        prologue: &[u8],
+        remote_public: x25519::PublicKey,
+        payload: Option<&[u8]>,
+        response_buffer: &mut [u8],
+    ) -> Result<InitiatorHandshakeState, NoiseError> {
+        // checks
+        let payload_len = payload.map(<[u8]>::len).unwrap_or(0);
+        let buffer_size_required = handshake_init_msg_len(payload_len);
+        if buffer_size_required > MAX_SIZE_NOISE_MSG {
+            return Err(NoiseError::PayloadTooLarge);
+        }
+        if response_buffer.len() < buffer_size_required {
+            return Err(NoiseError::ResponseBufferTooSmall);
+        }
+        // initialize
+        let mut h = PROTOCOL_NAME.to_vec();
+        let mut ck = PROTOCOL_NAME.to_vec();
+        let rs = remote_public; // for naming consistency with the specification
+        mix_hash(&mut h, prologue);
+        mix_hash(&mut h, rs.as_slice());
+
+        // -> e
+        let e = x25519::PrivateKey::generate(rng);
+        let e_pub = e.public_key();
+
+        mix_hash(&mut h, e_pub.as_slice());
+        let mut response_buffer = Cursor::new(response_buffer);
+        response_buffer
+            .write(e_pub.as_slice())
+            .map_err(|_| NoiseError::ResponseBufferTooSmall)?;
+
+        // -> es
+        let dh_output = e.diffie_hellman(&rs);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // -> s
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let msg_and_ad = Payload {
+            msg: self.public_key.as_slice(),
+            aad: &h,
+        };
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let encrypted_static = aead
+            .encrypt(nonce, msg_and_ad)
+            .map_err(|_| NoiseError::Encrypt)?;
+
+        mix_hash(&mut h, &encrypted_static);
+        response_buffer
+            .write(&encrypted_static)
+            .map_err(|_| NoiseError::ResponseBufferTooSmall)?;
+
+        // -> ss
+        let dh_output = self.private_key.diffie_hellman(&rs);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // -> payload
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let msg_and_ad = Payload {
+            msg: payload.unwrap_or(&[]),
+            aad: &h,
+        };
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let encrypted_payload = aead
+            .encrypt(nonce, msg_and_ad)
+            .map_err(|_| NoiseError::Encrypt)?;
+
+        mix_hash(&mut h, &encrypted_payload);
+
+        response_buffer
+            .write(&encrypted_payload)
+            .map_err(|_| NoiseError::ResponseBufferTooSmall)?;
+
+        // return
+        let handshake_state = InitiatorHandshakeState { h, ck, e, rs };
+        Ok(handshake_state)
+    }
+
+    /// A client can call this to finalize a connection, after receiving an answer from a server.
+    pub fn finalize_connection(
+        &self,
+        handshake_state: InitiatorHandshakeState,
+        received_message: &[u8],
+    ) -> Result<(Vec<u8>, NoiseSession), NoiseError> {
+        // checks
+        if received_message.len() > MAX_SIZE_NOISE_MSG {
+            return Err(NoiseError::ReceivedMsgTooLarge);
+        }
+        // retrieve handshake state
+        let InitiatorHandshakeState {
+            mut h,
+            mut ck,
+            e,
+            rs,
+        } = handshake_state;
+
+        // <- e
+        let mut re = [0u8; x25519::PUBLIC_KEY_SIZE];
+        let mut cursor = Cursor::new(received_message);
+        cursor
+            .read_exact(&mut re)
+            .map_err(|_| NoiseError::MsgTooShort)?;
+        mix_hash(&mut h, &re);
+        let re = x25519::PublicKey::from(re);
+
+        // <- ee
+        let dh_output = e.diffie_hellman(&re);
+        mix_key(&mut ck, &dh_output)?;
+
+        // <- se
+        let dh_output = self.private_key.diffie_hellman(&re);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // <- payload
+        let offset = cursor.position() as usize;
+        let received_encrypted_payload = &cursor.into_inner()[offset..];
+
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let ct_and_ad = Payload {
+            msg: received_encrypted_payload,
+            aad: &h,
+        };
+        let received_payload = aead
+            .decrypt(nonce, ct_and_ad)
+            .map_err(|_| NoiseError::Decrypt)?;
+
+        // split
+        let (k1, k2) = hkdf(&ck, None)?;
+        let session = NoiseSession::new(k1, k2, rs);
+
+        //
+        Ok((received_payload, session))
+    }
+
+    //
+    // Responder
+    // ---------
+    // There are two ways to use this API:
+    // - either use `parse_client_init_message()` followed by `respond_to_client()`
+    // - or use the all-in-one `respond_to_client_and_finalize()`
+    //
+    // the reason for the first deconstructed API is that we might want to do
+    // some validation of the received initiator's public key which might
+    //
+
+    /// A responder can accept a connection by first parsing an initiator message.
+    /// The function respond_to_client is usually called after this to respond to the initiator.
+    pub fn parse_client_init_message(
+        &self,
+        prologue: &[u8],
+        received_message: &[u8],
+    ) -> Result<
+        (
+            x25519::PublicKey,       // initiator's public key
+            ResponderHandshakeState, // state to be used in respond_to_client
+            Vec<u8>,                 // payload received
+        ),
+        NoiseError,
+    > {
+        // checks
+        if received_message.len() > MAX_SIZE_NOISE_MSG {
+            return Err(NoiseError::ReceivedMsgTooLarge);
+        }
+        // initialize
+        let mut h = PROTOCOL_NAME.to_vec();
+        let mut ck = PROTOCOL_NAME.to_vec();
+        mix_hash(&mut h, prologue);
+        mix_hash(&mut h, self.public_key.as_slice());
+
+        // buffer message received
+        let mut cursor = Cursor::new(received_message);
+
+        // <- e
+        let mut re = [0u8; x25519::PUBLIC_KEY_SIZE];
+        cursor
+            .read_exact(&mut re)
+            .map_err(|_| NoiseError::MsgTooShort)?;
+        mix_hash(&mut h, &re);
+        let re = x25519::PublicKey::from(re);
+
+        // <- es
+        let dh_output = self.private_key.diffie_hellman(&re);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // <- s
+        let mut encrypted_remote_static = [0u8; x25519::PUBLIC_KEY_SIZE + AES_GCM_TAGLEN];
+        cursor
+            .read_exact(&mut encrypted_remote_static)
+            .map_err(|_| NoiseError::MsgTooShort)?;
+
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let ct_and_ad = Payload {
+            msg: &encrypted_remote_static,
+            aad: &h,
+        };
+        let rs = aead
+            .decrypt(nonce, ct_and_ad)
+            .map_err(|_| NoiseError::Decrypt)?;
+        let rs = x25519::PublicKey::try_from(rs.as_slice())
+            .map_err(|_| NoiseError::WrongPublicKeyReceived)?;
+        mix_hash(&mut h, &encrypted_remote_static);
+
+        // <- ss
+        let dh_output = self.private_key.diffie_hellman(&rs);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // <- payload
+        let offset = cursor.position() as usize;
+        let received_encrypted_payload = &cursor.into_inner()[offset..];
+
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let ct_and_ad = Payload {
+            msg: received_encrypted_payload,
+            aad: &h,
+        };
+        let received_payload = aead
+            .decrypt(nonce, ct_and_ad)
+            .map_err(|_| NoiseError::Decrypt)?;
+        mix_hash(&mut h, received_encrypted_payload);
+
+        // return
+        let handshake_state = ResponderHandshakeState { h, ck, rs, re };
+        Ok((rs, handshake_state, received_payload))
+    }
+
+    /// A responder can respond to an initiator by calling this function with the state obtained,
+    /// after calling parse_client_init_message
+    pub fn respond_to_client(
+        &self,
+        rng: &mut (impl rand::RngCore + rand::CryptoRng),
+        handshake_state: ResponderHandshakeState,
+        payload: Option<&[u8]>,
+        response_buffer: &mut [u8],
+    ) -> Result<NoiseSession, NoiseError> {
+        // checks
+        let payload_len = payload.map(<[u8]>::len).unwrap_or(0);
+        let buffer_size_required = handshake_resp_msg_len(payload_len);
+        if buffer_size_required > MAX_SIZE_NOISE_MSG {
+            return Err(NoiseError::PayloadTooLarge);
+        }
+        if response_buffer.len() < buffer_size_required {
+            return Err(NoiseError::ResponseBufferTooSmall);
+        }
+
+        // retrieve handshake state
+        let ResponderHandshakeState {
+            mut h,
+            mut ck,
+            rs,
+            re,
+        } = handshake_state;
+
+        // -> e
+        let e = x25519::PrivateKey::generate(rng);
+        let e_pub = e.public_key();
+
+        mix_hash(&mut h, e_pub.as_slice());
+        let mut response_buffer = Cursor::new(response_buffer);
+        response_buffer
+            .write(e_pub.as_slice())
+            .map_err(|_| NoiseError::ResponseBufferTooSmall)?;
+
+        // -> ee
+        let dh_output = e.diffie_hellman(&re);
+        mix_key(&mut ck, &dh_output)?;
+
+        // -> se
+        let dh_output = e.diffie_hellman(&rs);
+        let k = mix_key(&mut ck, &dh_output)?;
+
+        // -> payload
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&k));
+
+        let msg_and_ad = Payload {
+            msg: payload.unwrap_or(&[]),
+            aad: &h,
+        };
+        let nonce = GenericArray::from_slice(&[0u8; AES_NONCE_SIZE]);
+        let encrypted_payload = aead
+            .encrypt(nonce, msg_and_ad)
+            .map_err(|_| NoiseError::Encrypt)?;
+        mix_hash(&mut h, &encrypted_payload);
+        response_buffer
+            .write(&encrypted_payload)
+            .map_err(|_| NoiseError::ResponseBufferTooSmall)?;
+
+        // split
+        let (k1, k2) = hkdf(&ck, None)?;
+        let session = NoiseSession::new(k2, k1, rs);
+
+        //
+        Ok(session)
+    }
+
+    /// This function is a one-call that replaces calling the two functions parse_client_init_message
+    /// and respond_to_client consecutively
+    pub fn respond_to_client_and_finalize(
+        &self,
+        rng: &mut (impl rand::RngCore + rand::CryptoRng),
+        prologue: &[u8],
+        received_message: &[u8],
+        payload: Option<&[u8]>,
+        response_buffer: &mut [u8],
+    ) -> Result<
+        (
+            Vec<u8>,      // the payload the initiator sent
+            NoiseSession, // The created session
+        ),
+        NoiseError,
+    > {
+        let (_, handshake_state, received_payload) =
+            self.parse_client_init_message(prologue, received_message)?;
+        let session = self.respond_to_client(rng, handshake_state, payload, response_buffer)?;
+        Ok((received_payload, session))
+    }
+}
+
+//
+// Post-Handshake
+// --------------
+
+/// A NoiseSession is produced after a successful Noise handshake, and can be use to encrypt and decrypt messages to the other peer.
+#[cfg_attr(test, derive(Clone))]
+pub struct NoiseSession {
+    /// a session can be marked as invalid if it has seen a decryption failure
+    valid: bool,
+    /// the public key of the other peer
+    remote_public_key: x25519::PublicKey,
+    /// key used to encrypt messages to the other peer
+    write_key: Vec<u8>,
+    /// associated nonce (in practice the maximum u64 value cannot be reached)
+    write_nonce: u64,
+    /// key used to decrypt messages received from the other peer
+    read_key: Vec<u8>,
+    /// associated nonce (in practice the maximum u64 value cannot be reached)
+    read_nonce: u64,
+}
+
+impl NoiseSession {
+    fn new(write_key: Vec<u8>, read_key: Vec<u8>, remote_public_key: x25519::PublicKey) -> Self {
+        Self {
+            valid: true,
+            remote_public_key,
+            write_key,
+            write_nonce: 0,
+            read_key,
+            read_nonce: 0,
+        }
+    }
+
+    /// create a dummy session with 0 keys
+    #[cfg(any(test, feature = "fuzzing"))]
+    pub fn new_for_testing() -> Self {
+        Self::new(
+            vec![0u8; 32],
+            vec![0u8; 32],
+            [0u8; x25519::PUBLIC_KEY_SIZE].into(),
+        )
+    }
+
+    /// obtain remote static public key
+    pub fn get_remote_static(&self) -> x25519::PublicKey {
+        self.remote_public_key
+    }
+
+    /// encrypts a message for the other peers (post-handshake)
+    /// the function encrypts in place, and returns the authentication tag as result
+    pub fn write_message_in_place(&mut self, message: &mut [u8]) -> Result<Vec<u8>, NoiseError> {
+        // checks
+        if !self.valid {
+            return Err(NoiseError::SessionClosed);
+        }
+        if message.len() > MAX_SIZE_NOISE_MSG - AES_GCM_TAGLEN {
+            return Err(NoiseError::PayloadTooLarge);
+        }
+
+        // encrypt in place
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&self.write_key));
+        let mut nonce = [0u8; 4].to_vec();
+        nonce.extend_from_slice(&self.write_nonce.to_be_bytes());
+        let nonce = GenericArray::from_slice(&nonce);
+
+        let authentication_tag = aead
+            .encrypt_in_place_detached(nonce, b"", message)
+            .map_err(|_| NoiseError::Encrypt)?;
+
+        // increment nonce
+        self.write_nonce = self
+            .write_nonce
+            .checked_add(1)
+            .ok_or(NoiseError::NonceOverflow)?;
+
+        // return a subslice without the authentication tag
+        Ok(authentication_tag.to_vec())
+    }
+
+    /// decrypts a message from the other peer (post-handshake)
+    /// the function decrypts in place, and returns a subslice without the auth tag
+    pub fn read_message_in_place<'a>(
+        &mut self,
+        message: &'a mut [u8],
+    ) -> Result<&'a [u8], NoiseError> {
+        // checks
+        if !self.valid {
+            return Err(NoiseError::SessionClosed);
+        }
+        if message.len() > MAX_SIZE_NOISE_MSG {
+            self.valid = false;
+            return Err(NoiseError::ReceivedMsgTooLarge);
+        }
+        if message.len() < AES_GCM_TAGLEN {
+            self.valid = false;
+            return Err(NoiseError::ResponseBufferTooSmall);
+        }
+
+        // decrypt in place
+        let aead = Aes256Gcm::new(GenericArray::from_slice(&self.read_key));
+
+        let mut nonce = [0u8; 4].to_vec();
+        nonce.extend_from_slice(&self.read_nonce.to_be_bytes());
+        let nonce = GenericArray::from_slice(&nonce);
+
+        let (buffer, authentication_tag) = message.split_at_mut(message.len() - AES_GCM_TAGLEN);
+        let authentication_tag = GenericArray::from_slice(authentication_tag);
+        aead.decrypt_in_place_detached(nonce, b"", buffer, authentication_tag)
+            .map_err(|_| {
+                self.valid = false;
+                NoiseError::Decrypt
+            })?;
+
+        // increment nonce
+        self.read_nonce = self
+            .read_nonce
+            .checked_add(1)
+            .ok_or(NoiseError::NonceOverflow)?;
+
+        // return a subslice of the buffer representing the decrypted plaintext
+        Ok(buffer)
+    }
+}
+
+impl std::fmt::Debug for NoiseSession {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "NoiseSession[...]")
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/tags.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/tags.rs
new file mode 100644
index 000000000..9473c6b7a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/tags.rs
@@ -0,0 +1,20 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides definitions of tag types to be used by MIRAI analyzing diem-crypto.
+//! This module gets compiled only if the diem-crypto is compiled via MIRAI in a debug build.
+
+use mirai_annotations::*;
+
+/// A MIRAI tag type that tracks if a public key is checked to protect against invalid point
+/// attacks, small subgroup attacks, and typos. This tag type is only used at compilation time.
+/// This type should only be accessible inside diem-crypto.
+pub type ValidatedPublicKeyTag = ValidatedPublicKeyTagKind<VALIDATED_PUBLIC_KEY_TAG_MASK>;
+
+/// A generic tag type intended to only be used by ValidatedPublicKeyTag
+pub struct ValidatedPublicKeyTagKind<const MASK: TagPropagationSet> {}
+
+/// The propagation set of ValidatedPublicKeyTag. An empty propagation set is used to make sure that
+/// ValidatedPublicKeyTag can only be explicitly attached to public keys.
+const VALIDATED_PUBLIC_KEY_TAG_MASK: TagPropagationSet = tag_propagation_set!();
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs
new file mode 100644
index 000000000..ecb936716
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs
@@ -0,0 +1,215 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Internal module containing convenience utility functions mainly for testing
+
+use crate::traits::Uniform;
+use serde::{Deserialize, Serialize};
+
+/// A deterministic seed for PRNGs related to keys
+pub const TEST_SEED: [u8; 32] = [0u8; 32];
+
+/// A keypair consisting of a private and public key
+#[cfg_attr(feature = "cloneable-private-keys", derive(Clone))]
+#[derive(Serialize, Deserialize, PartialEq, Eq)]
+pub struct KeyPair<S, P>
+where
+    for<'a> P: From<&'a S>,
+{
+    /// the private key component
+    pub private_key: S,
+    /// the public key component
+    pub public_key: P,
+}
+
+impl<S, P> From<S> for KeyPair<S, P>
+where
+    for<'a> P: From<&'a S>,
+{
+    fn from(private_key: S) -> Self {
+        KeyPair {
+            public_key: (&private_key).into(),
+            private_key,
+        }
+    }
+}
+
+impl<S, P> Uniform for KeyPair<S, P>
+where
+    S: Uniform,
+    for<'a> P: From<&'a S>,
+{
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: ::rand::RngCore + ::rand::CryptoRng,
+    {
+        let private_key = S::generate(rng);
+        private_key.into()
+    }
+}
+
+/// A pair consisting of a private and public key
+impl<S, P> Uniform for (S, P)
+where
+    S: Uniform,
+    for<'a> P: From<&'a S>,
+{
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: ::rand::RngCore + ::rand::CryptoRng,
+    {
+        let private_key = S::generate(rng);
+        let public_key = (&private_key).into();
+        (private_key, public_key)
+    }
+}
+
+impl<Priv, Pub> std::fmt::Debug for KeyPair<Priv, Pub>
+where
+    Priv: Serialize,
+    Pub: Serialize + for<'a> From<&'a Priv>,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let mut v = bcs::to_bytes(&self.private_key).unwrap();
+        v.extend(&bcs::to_bytes(&self.public_key).unwrap());
+        write!(f, "{}", hex::encode(&v[..]))
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+#[cfg(any(test, feature = "fuzzing"))]
+use rand::{rngs::StdRng, SeedableRng};
+
+/// Produces a uniformly random keypair from a seed
+#[cfg(any(test, feature = "fuzzing"))]
+pub fn uniform_keypair_strategy<Priv, Pub>() -> impl Strategy<Value = KeyPair<Priv, Pub>>
+where
+    Pub: Serialize + for<'a> From<&'a Priv>,
+    Priv: Serialize + Uniform,
+{
+    // The no_shrink is because keypairs should be fixed -- shrinking would cause a different
+    // keypair to be generated, which appears to not be very useful.
+    any::<[u8; 32]>()
+        .prop_map(|seed| {
+            let mut rng = StdRng::from_seed(seed);
+            KeyPair::<Priv, Pub>::generate(&mut rng)
+        })
+        .no_shrink()
+}
+
+/// Produces a uniformly random keypair from a seed and the user can alter this sleed slightly.
+/// Useful for circumstances where you want two disjoint keypair generations that may interact with
+/// each other.
+#[cfg(any(test, feature = "fuzzing"))]
+pub fn uniform_keypair_strategy_with_perturbation<Priv, Pub>(
+    perturbation: u8,
+) -> impl Strategy<Value = KeyPair<Priv, Pub>>
+where
+    Pub: Serialize + for<'a> From<&'a Priv>,
+    Priv: Serialize + Uniform,
+{
+    // The no_shrink is because keypairs should be fixed -- shrinking would cause a different
+    // keypair to be generated, which appears to not be very useful.
+    any::<[u8; 32]>()
+        .prop_map(move |mut seed| {
+            for elem in seed.iter_mut() {
+                *elem = elem.saturating_add(perturbation);
+            }
+            let mut rng = StdRng::from_seed(seed);
+            KeyPair::<Priv, Pub>::generate(&mut rng)
+        })
+        .no_shrink()
+}
+
+/// This struct provides a means of testing signing and verification through
+/// BCS serialization and domain separation
+#[cfg(any(test, feature = "fuzzing"))]
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TestDiemCrypto(pub String);
+
+// the following block is macro expanded from derive(CryptoHasher, BCSCryptoHash)
+
+/// Cryptographic hasher for an BCS-serializable #item
+#[cfg(any(test, feature = "fuzzing"))]
+pub struct TestDiemCryptoHasher(crate::hash::DefaultHasher);
+#[cfg(any(test, feature = "fuzzing"))]
+impl ::core::clone::Clone for TestDiemCryptoHasher {
+    #[inline]
+    fn clone(&self) -> TestDiemCryptoHasher {
+        match *self {
+            TestDiemCryptoHasher(ref __self_0_0) => {
+                TestDiemCryptoHasher(::core::clone::Clone::clone(__self_0_0))
+            },
+        }
+    }
+}
+#[cfg(any(test, feature = "fuzzing"))]
+static TEST_DIEM_CRYPTO_SEED: crate::_once_cell::sync::OnceCell<[u8; 32]> =
+    crate::_once_cell::sync::OnceCell::new();
+#[cfg(any(test, feature = "fuzzing"))]
+impl TestDiemCryptoHasher {
+    fn new() -> Self {
+        let name = crate::_serde_name::trace_name::<TestDiemCrypto>()
+            .expect("The `CryptoHasher` macro only applies to structs and enums");
+        TestDiemCryptoHasher(crate::hash::DefaultHasher::new(name.as_bytes()))
+    }
+}
+#[cfg(any(test, feature = "fuzzing"))]
+static TEST_DIEM_CRYPTO_HASHER: crate::_once_cell::sync::Lazy<TestDiemCryptoHasher> =
+    crate::_once_cell::sync::Lazy::new(TestDiemCryptoHasher::new);
+#[cfg(any(test, feature = "fuzzing"))]
+impl std::default::Default for TestDiemCryptoHasher {
+    fn default() -> Self {
+        TEST_DIEM_CRYPTO_HASHER.clone()
+    }
+}
+#[cfg(any(test, feature = "fuzzing"))]
+impl crate::hash::CryptoHasher for TestDiemCryptoHasher {
+    fn seed() -> &'static [u8; 32] {
+        TEST_DIEM_CRYPTO_SEED.get_or_init(|| {
+            let name = crate::_serde_name::trace_name::<TestDiemCrypto>()
+                .expect("The `CryptoHasher` macro only applies to structs and enums.")
+                .as_bytes();
+            crate::hash::DefaultHasher::prefixed_hash(name)
+        })
+    }
+
+    fn update(&mut self, bytes: &[u8]) {
+        self.0.update(bytes);
+    }
+
+    fn finish(self) -> crate::hash::HashValue {
+        self.0.finish()
+    }
+}
+#[cfg(any(test, feature = "fuzzing"))]
+impl std::io::Write for TestDiemCryptoHasher {
+    fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
+        self.0.update(bytes);
+        Ok(bytes.len())
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
+#[cfg(any(test, feature = "fuzzing"))]
+impl crate::hash::CryptoHash for TestDiemCrypto {
+    type Hasher = TestDiemCryptoHasher;
+
+    fn hash(&self) -> crate::hash::HashValue {
+        use crate::hash::CryptoHasher;
+        let mut state = Self::Hasher::default();
+        bcs::serialize_into(&mut state, &self)
+            .expect("BCS serialization of TestDiemCrypto should not fail");
+        state.finish()
+    }
+}
+
+/// Produces a random TestDiemCrypto signable / verifiable struct.
+#[cfg(any(test, feature = "fuzzing"))]
+pub fn random_serializable_struct() -> impl Strategy<Value = TestDiemCrypto> {
+    (String::arbitrary()).prop_map(TestDiemCrypto).no_shrink()
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/traits.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/traits.rs
new file mode 100644
index 000000000..22d905757
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/traits.rs
@@ -0,0 +1,311 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides a generic set of traits for dealing with cryptographic primitives.
+//!
+//! For examples on how to use these traits, see the implementations of the [`ed25519`] or
+//! [`bls12381`] modules.
+
+use crate::hash::{CryptoHash, CryptoHasher};
+use anyhow::Result;
+use core::convert::{From, TryFrom};
+use rand::{rngs::StdRng, CryptoRng, RngCore, SeedableRng};
+use serde::{de::DeserializeOwned, Serialize};
+use std::{fmt::Debug, hash::Hash};
+use thiserror::Error;
+
+/// An error type for key and signature validation issues, see [`ValidCryptoMaterial`][ValidCryptoMaterial].
+///
+/// This enum reflects there are two interesting causes of validation
+/// failure for the ingestion of key or signature material: deserialization errors
+/// (often, due to mangled material or curve equation failure for ECC) and
+/// validation errors (material recognizable but unacceptable for use,
+/// e.g. unsafe).
+#[derive(Clone, Debug, PartialEq, Eq, Error)]
+#[error("{:?}", self)]
+pub enum CryptoMaterialError {
+    /// Struct to be signed does not serialize correctly.
+    SerializationError,
+    /// Key or signature material does not deserialize correctly.
+    DeserializationError,
+    /// Key or signature material deserializes, but is otherwise not valid.
+    ValidationError,
+    /// Key, threshold or signature material does not have the expected size.
+    WrongLengthError,
+    /// Part of the signature or key is not canonical resulting to malleability issues.
+    CanonicalRepresentationError,
+    /// A curve point (i.e., a public key) lies on a small group.
+    SmallSubgroupError,
+    /// A curve point (i.e., a public key) does not satisfy the curve equation.
+    PointNotOnCurveError,
+    /// BitVec errors in accountable multi-sig schemes.
+    BitVecError(String),
+}
+
+/// The serialized length of the data that enables macro derived serialization and deserialization.
+pub trait Length {
+    /// The serialized length of the data
+    fn length(&self) -> usize;
+}
+
+/// Key or more generally crypto material with a notion of byte validation.
+///
+/// A type family for material that knows how to serialize and
+/// deserialize, as well as validate byte-encoded material. The
+/// validation must be implemented as a [`TryFrom`][TryFrom] which
+/// classifies its failures against the above
+/// [`CryptoMaterialError`][CryptoMaterialError].
+///
+/// This provides an implementation for a validation that relies on a
+/// round-trip to bytes and corresponding [`TryFrom`][TryFrom].
+pub trait ValidCryptoMaterial:
+    // The for<'a> exactly matches the assumption "deserializable from any lifetime".
+    for<'a> TryFrom<&'a [u8], Error = CryptoMaterialError> + Serialize + DeserializeOwned
+{
+    /// Convert the valid crypto material to bytes.
+    fn to_bytes(&self) -> Vec<u8>;
+}
+
+/// An extension to to/from Strings for [`ValidCryptoMaterial`][ValidCryptoMaterial].
+///
+/// Relies on [`hex`][::hex] for string encoding / decoding.
+/// No required fields, provides a default implementation.
+pub trait ValidCryptoMaterialStringExt: ValidCryptoMaterial {
+    /// When trying to convert from bytes, we simply decode the string into
+    /// bytes before checking if we can convert.
+    fn from_encoded_string(encoded_str: &str) -> std::result::Result<Self, CryptoMaterialError> {
+        let bytes_out = ::hex::decode(encoded_str);
+        // We defer to `try_from` to make sure we only produce valid crypto materials.
+        bytes_out
+            // We reinterpret a failure to serialize: key is mangled someway.
+            .or(Err(CryptoMaterialError::DeserializationError))
+            .and_then(|ref bytes| Self::try_from(bytes))
+    }
+    /// A function to encode into hex-string after serializing.
+    fn to_encoded_string(&self) -> Result<String> {
+        Ok(::hex::encode(self.to_bytes()))
+    }
+}
+
+// There's nothing required in this extension, so let's just derive it
+// for anybody that has a ValidCryptoMaterial.
+impl<T: ValidCryptoMaterial> ValidCryptoMaterialStringExt for T {}
+
+/// A type family for key material that should remain secret and has an
+/// associated type of the [`PublicKey`][PublicKey] family.
+pub trait PrivateKey: Sized {
+    /// We require public / private types to be coupled, i.e. their
+    /// associated type is each other.
+    type PublicKeyMaterial: PublicKey<PrivateKeyMaterial = Self>;
+
+    /// Returns the associated public key
+    fn public_key(&self) -> Self::PublicKeyMaterial {
+        self.into()
+    }
+}
+
+/// A type family of valid keys that know how to sign.
+///
+/// This trait has a requirement on a `pub(crate)` marker trait meant to
+/// specifically limit its implementations to the present crate.
+///
+/// A trait for a [`ValidCryptoMaterial`][ValidCryptoMaterial] which knows how to sign a
+/// message, and return an associated `Signature` type.
+pub trait SigningKey:
+    PrivateKey<PublicKeyMaterial = <Self as SigningKey>::VerifyingKeyMaterial>
+    + ValidCryptoMaterial
+    + private::Sealed
+{
+    /// The associated verifying key type for this signing key.
+    type VerifyingKeyMaterial: VerifyingKey<SigningKeyMaterial = Self>;
+    /// The associated signature type for this signing key.
+    type SignatureMaterial: Signature<SigningKeyMaterial = Self>;
+
+    /// Signs an object that has an distinct domain-separation hasher and
+    /// that we know how to serialize. There is no pre-hashing into a
+    /// `HashValue` to be done by the caller.
+    ///
+    /// Note: this assumes serialization is unfaillible. See diem_common::bcs::ser
+    /// for a discussion of this assumption.
+    fn sign<T: CryptoHash + Serialize>(&self, message: &T) -> Self::SignatureMaterial;
+
+    /// Signs a non-hash input message. For testing only.
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn sign_arbitrary_message(&self, message: &[u8]) -> Self::SignatureMaterial;
+
+    /// Returns the associated verifying key
+    fn verifying_key(&self) -> Self::VerifyingKeyMaterial {
+        self.public_key()
+    }
+}
+
+/// Returns the signing message for the given message.
+/// It is used by `SigningKey#sign` function.
+pub fn signing_message<T: CryptoHash + Serialize>(message: &T) -> Vec<u8> {
+    let mut bytes = <T::Hasher as CryptoHasher>::seed().to_vec();
+    bcs::serialize_into(&mut bytes, &message)
+        .map_err(|_| CryptoMaterialError::SerializationError)
+        .expect("Serialization of signable material should not fail.");
+    bytes
+}
+
+/// A type for key material that can be publicly shared, and in asymmetric
+/// fashion, can be obtained from a [`PrivateKey`][PrivateKey]
+/// reference.
+/// This convertibility requirement ensures the existence of a
+/// deterministic, canonical public key construction from a private key.
+pub trait PublicKey: Sized + Clone + Eq + Hash +
+    // This unsightly turbofish type parameter is the precise constraint
+    // needed to require that there exists an
+    //
+    // ```
+    // impl From<&MyPrivateKeyMaterial> for MyPublicKeyMaterial
+    // ```
+    //
+    // declaration, for any `MyPrivateKeyMaterial`, `MyPublicKeyMaterial`
+    // on which we register (respectively) `PublicKey` and `PrivateKey`
+    // implementations.
+    for<'a> From<&'a <Self as PublicKey>::PrivateKeyMaterial> {
+    /// We require public / private types to be coupled, i.e. their
+    /// associated type is each other.
+    type PrivateKeyMaterial: PrivateKey<PublicKeyMaterial = Self>;
+}
+
+/// A type family of public keys that are used for signing.
+///
+/// This trait has a requirement on a `pub(crate)` marker trait meant to
+/// specifically limit its implementations to the present crate.
+///
+/// It is linked to a type of the Signature family, which carries the
+/// verification implementation.
+pub trait VerifyingKey:
+    PublicKey<PrivateKeyMaterial = <Self as VerifyingKey>::SigningKeyMaterial>
+    + ValidCryptoMaterial
+    + private::Sealed
+{
+    /// The associated signing key type for this verifying key.
+    type SigningKeyMaterial: SigningKey<VerifyingKeyMaterial = Self>;
+    /// The associated signature type for this verifying key.
+    type SignatureMaterial: Signature<VerifyingKeyMaterial = Self>;
+
+    /// We provide the striaghtfoward implementation which dispatches to the signature.
+    fn verify_struct_signature<T: CryptoHash + Serialize>(
+        &self,
+        message: &T,
+        signature: &Self::SignatureMaterial,
+    ) -> Result<()> {
+        signature.verify(message, self)
+    }
+
+    /// We provide the implementation which dispatches to the signature.
+    fn batch_verify<T: CryptoHash + Serialize>(
+        message: &T,
+        keys_and_signatures: Vec<(Self, Self::SignatureMaterial)>,
+    ) -> Result<()> {
+        Self::SignatureMaterial::batch_verify(message, keys_and_signatures)
+    }
+}
+
+/// A type family for signature material that knows which public key type
+/// is needed to verify it, and given such a public key, knows how to
+/// verify.
+///
+/// This trait simply requires an association to some type of the
+/// [`PublicKey`][PublicKey] family of which we are the `SignatureMaterial`.
+///
+/// This trait has a requirement on a `pub(crate)` marker trait meant to
+/// specifically limit its implementations to the present crate.
+///
+/// It should be possible to write a generic signature function that
+/// checks signature material passed as `&[u8]` and only returns Ok when
+/// that material de-serializes to a signature of the expected concrete
+/// scheme. This would be done as an extension trait of
+/// [`Signature`][Signature].
+pub trait Signature:
+    for<'a> TryFrom<&'a [u8], Error = CryptoMaterialError>
+    + Sized
+    + Debug
+    + Clone
+    + Eq
+    + Hash
+    + private::Sealed
+{
+    /// The associated verifying key type for this signature.
+    type VerifyingKeyMaterial: VerifyingKey<SignatureMaterial = Self>;
+    /// The associated signing key type for this signature
+    type SigningKeyMaterial: SigningKey<SignatureMaterial = Self>;
+
+    /// Verification for a struct we unabmiguously know how to serialize and
+    /// that we have a domain separation prefix for.
+    fn verify<T: CryptoHash + Serialize>(
+        &self,
+        message: &T,
+        public_key: &Self::VerifyingKeyMaterial,
+    ) -> Result<()>;
+
+    /// Native verification function.
+    fn verify_arbitrary_msg(
+        &self,
+        message: &[u8],
+        public_key: &Self::VerifyingKeyMaterial,
+    ) -> Result<()>;
+
+    /// Convert the signature into a byte representation.
+    fn to_bytes(&self) -> Vec<u8>;
+
+    /// The implementer can override a batch verification implementation
+    /// that by default iterates over each signature. More efficient
+    /// implementations exist and should be implemented for many schemes.
+    fn batch_verify<T: CryptoHash + Serialize>(
+        message: &T,
+        keys_and_signatures: Vec<(Self::VerifyingKeyMaterial, Self)>,
+    ) -> Result<()> {
+        for (key, signature) in keys_and_signatures {
+            signature.verify(message, &key)?
+        }
+        Ok(())
+    }
+}
+
+/// A type family for schemes which know how to generate key material from
+/// a cryptographically-secure [`CryptoRng`][::rand::CryptoRng].
+pub trait Uniform {
+    /// Generate key material from an RNG. This should generally not be used for production
+    /// purposes even with a good source of randomness. When possible use hardware crypto to generate and
+    /// store private keys.
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: RngCore + CryptoRng;
+
+    /// Generate a random key using the shared TEST_SEED
+    fn generate_for_testing() -> Self
+    where
+        Self: Sized,
+    {
+        let mut rng: StdRng = SeedableRng::from_seed(crate::test_utils::TEST_SEED);
+        Self::generate(&mut rng)
+    }
+}
+
+/// A type family with a by-convention notion of genesis private key.
+pub trait Genesis: PrivateKey {
+    /// Produces the genesis private key.
+    fn genesis() -> Self;
+}
+
+/// A pub(crate) mod hiding a Sealed trait and its implementations, allowing
+/// us to make sure implementations are constrained to the crypto crate.
+// See https://rust-lang.github.io/api-guidelines/future-proofing.html#sealed-traits-protect-against-downstream-implementations-c-sealed
+pub(crate) mod private {
+    pub trait Sealed {}
+
+    // Implement for the ed25519, multi-ed25519 signatures
+    impl Sealed for crate::ed25519::Ed25519PrivateKey {}
+    impl Sealed for crate::ed25519::Ed25519PublicKey {}
+    impl Sealed for crate::ed25519::Ed25519Signature {}
+
+    impl Sealed for crate::multi_ed25519::MultiEd25519PrivateKey {}
+    impl Sealed for crate::multi_ed25519::MultiEd25519PublicKey {}
+    impl Sealed for crate::multi_ed25519::MultiEd25519Signature {}
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/bcs_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/bcs_test.rs
new file mode 100644
index 000000000..fe6e78bfb
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/bcs_test.rs
@@ -0,0 +1,112 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    ed25519::{
+        Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature, ED25519_PRIVATE_KEY_LENGTH,
+        ED25519_PUBLIC_KEY_LENGTH, ED25519_SIGNATURE_LENGTH,
+    },
+    multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey, MultiEd25519Signature},
+    test_utils::{TestDiemCrypto, TEST_SEED},
+    Signature, SigningKey, Uniform,
+};
+use rand::{rngs::StdRng, SeedableRng};
+use std::convert::TryFrom;
+
+#[test]
+fn ed25519_bcs_material() {
+    use std::borrow::Cow;
+
+    let private_key =
+        Ed25519PrivateKey::try_from([1u8; ED25519_PRIVATE_KEY_LENGTH].as_ref()).unwrap();
+    let public_key = Ed25519PublicKey::from(&private_key);
+
+    let serialized_public_key = bcs::to_bytes(&Cow::Borrowed(&public_key)).unwrap();
+    // Expected size should be 1 byte due to BCS length prefix + 32 bytes for the raw key bytes
+    assert_eq!(serialized_public_key.len(), 1 + ED25519_PUBLIC_KEY_LENGTH);
+
+    // Ensure public key serialization - deserialization is stable and deterministic
+    let deserialized_public_key: Ed25519PublicKey =
+        bcs::from_bytes(&serialized_public_key).unwrap();
+    assert_eq!(deserialized_public_key, public_key);
+
+    let message = TestDiemCrypto("Hello, World".to_string());
+    let signature: Ed25519Signature = private_key.sign(&message);
+
+    let serialized_signature = bcs::to_bytes(&Cow::Borrowed(&signature)).unwrap();
+    // Expected size should be 1 byte due to BCS length prefix + 64 bytes for the raw signature bytes
+    assert_eq!(serialized_signature.len(), 1 + ED25519_SIGNATURE_LENGTH);
+
+    // Ensure signature serialization - deserialization is stable and deterministic
+    let deserialized_signature: Ed25519Signature = bcs::from_bytes(&serialized_signature).unwrap();
+    assert_eq!(deserialized_signature, signature);
+
+    // Verify signature
+    let verified_signature = signature.verify(&message, &public_key);
+    assert!(verified_signature.is_ok())
+}
+
+#[test]
+fn multi_ed25519_bcs_material() {
+    use std::borrow::Cow;
+
+    // Helper function to generate N ed25519 private keys.
+    fn generate_keys(n: usize) -> Vec<Ed25519PrivateKey> {
+        let mut rng = StdRng::from_seed(TEST_SEED);
+        (0..n)
+            .map(|_| Ed25519PrivateKey::generate(&mut rng))
+            .collect()
+    }
+
+    let num_of_keys = 10;
+    let threshold = 7;
+    let private_keys_10 = generate_keys(num_of_keys);
+    let multi_private_key_7of10 = MultiEd25519PrivateKey::new(private_keys_10, threshold).unwrap();
+    let multi_public_key_7of10 = MultiEd25519PublicKey::from(&multi_private_key_7of10);
+
+    let serialized_multi_public_key =
+        bcs::to_bytes(&Cow::Borrowed(&multi_public_key_7of10)).unwrap();
+
+    // Expected size due to specialization is
+    // 2 bytes for BCS length prefix (due to ULEB128)
+    // + 10 * single_pub_key_size bytes (each key is the compressed Edwards Y coordinate)
+    // + 1 byte for the threshold
+    assert_eq!(
+        serialized_multi_public_key.len(),
+        2 + num_of_keys * ED25519_PUBLIC_KEY_LENGTH + 1
+    );
+
+    let deserialized_multi_public_key: MultiEd25519PublicKey =
+        bcs::from_bytes(&serialized_multi_public_key).unwrap();
+    assert_eq!(deserialized_multi_public_key, multi_public_key_7of10);
+
+    let message = TestDiemCrypto("Hello, World".to_string());
+
+    // Verifying a 7-of-10 signature against a public key with the same threshold should pass.
+    let multi_signature_7of10: MultiEd25519Signature = multi_private_key_7of10.sign(&message);
+
+    let serialized_multi_signature = bcs::to_bytes(&Cow::Borrowed(&multi_signature_7of10)).unwrap();
+    // Expected size due to specialization is
+    // 2 bytes for BCS length prefix (due to ULEB128)
+    // + 7 * single_signature_size bytes (each sig is of the form (R,s),
+    // a 32B compressed Edwards Y coordinate concatenated with a 32B scalar)
+    // + 4 bytes for the bitmap (the bitmap can hold up to 32 bits)
+    assert_eq!(
+        serialized_multi_signature.len(),
+        2 + threshold as usize * ED25519_SIGNATURE_LENGTH + 4
+    );
+
+    // Verify bitmap
+    assert_eq!(multi_signature_7of10.bitmap(), &[
+        0b1111_1110,
+        0u8,
+        0u8,
+        0u8
+    ]);
+
+    // Verify signature
+    assert!(multi_signature_7of10
+        .verify(&message, &multi_public_key_7of10)
+        .is_ok());
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compat_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compat_test.rs
new file mode 100644
index 000000000..c76350515
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compat_test.rs
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compat;
+use digest::Digest;
+use proptest::{collection::vec, prelude::*};
+
+// sanity check our compatibility layer by testing some basic SHA3-256 test vectors.
+#[test]
+fn check_basic_sha3_256_test_vectors() {
+    let one_million_a = vec![b'a'; 1_000_000];
+
+    let tests: [(&[u8], &[u8]); 4] = [
+        (
+            b"",
+            b"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a",
+        ),
+        (
+            b"abc",
+            b"3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532",
+        ),
+        (
+            b"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+            b"41c0dba2a9d6240849100376a8235e2c82e1b9998a999e21db32dd97496d3376",
+        ),
+        (
+            &one_million_a,
+            b"5c8875ae474a3634ba4fd55ec85bffd661f32aca75c6d699d0cdcb6c115891c1",
+        ),
+    ];
+
+    for (input, expected_output) in &tests {
+        let expected_output = hex::decode(expected_output).unwrap();
+        let output1 = compat::Sha3_256::digest(input);
+        let output2 = sha3::Sha3_256::digest(input);
+        assert_eq!(&expected_output, &output1.as_slice());
+        assert_eq!(&expected_output, &output2.as_slice());
+    }
+}
+
+proptest! {
+    // check that RustCrypto SHA3-256 and our compatibility wrapper over tiny-keccak
+    // SHA3-256 have the exact same behaviour for random inputs.
+    #[test]
+    fn sha3_256_compatibility_test(
+        updates in vec(vec(any::<u8>(), 0..200), 0..10)
+    ) {
+        let mut hasher1 = compat::Sha3_256::default();
+        let mut hasher2 = sha3::Sha3_256::default();
+
+        for update in updates {
+            hasher1.update(&update);
+            hasher2.update(&update);
+
+            let out1 = hasher1.clone().finalize();
+            let out2 = hasher2.clone().finalize();
+            assert_eq!(&out1, &out2);
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test.rs
new file mode 100644
index 000000000..3a5567990
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test.rs
@@ -0,0 +1,30 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use diem_crypto::{
+    ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
+    multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey},
+    test_utils::KeyPair,
+    traits::*,
+};
+use diem_crypto_derive::{CryptoHasher, BCSCryptoHash};
+use rand::{prelude::ThreadRng, thread_rng};
+use serde::{Deserialize, Serialize};
+
+#[derive(CryptoHasher, BCSCryptoHash, Serialize, Deserialize)]
+struct TestTypedSemantics(String);
+
+fn main() {
+    let mut csprng: ThreadRng = thread_rng();
+    let ed25519_keypair: KeyPair<Ed25519PrivateKey, Ed25519PublicKey> =
+        KeyPair::generate(&mut csprng);
+
+    let message = TestTypedSemantics(String::from("hello_world"));
+    let signature = ed25519_keypair.private_key.sign(&message);
+
+    let multi_ed25519_keypair: KeyPair<MultiEd25519PrivateKey, MultiEd25519PublicKey> =
+        KeyPair::generate(&mut csprng);
+
+    signature.verify(&message, &multi_ed25519_keypair.public_key);
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj.rs
new file mode 100644
index 000000000..df3495613
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use diem_crypto::traits::*;
+
+fn main() {
+    let mut l: Vec<Box<dyn Signature>> = vec![];
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs
new file mode 100644
index 000000000..a00eeea14
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use diem_crypto::traits::*;
+
+fn main() {
+    let mut l: Vec<Box<dyn PublicKey>> = vec![];
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs
new file mode 100644
index 000000000..df3495613
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use diem_crypto::traits::*;
+
+fn main() {
+    let mut l: Vec<Box<dyn Signature>> = vec![];
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/small_kdf.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/small_kdf.rs
new file mode 100644
index 000000000..2a5e85ff0
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/compilation/small_kdf.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+fn main() {
+    // Test for ripemd160, output_length < 256
+    let ripemd = diem_crypto::hkdf::Hkdf::<ripemd160::Ripemd160>::extract(None, &[]);
+    assert!(ripemd.is_ok());
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cross_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cross_test.rs
new file mode 100644
index 000000000..6ebc0fb94
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cross_test.rs
@@ -0,0 +1,130 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This is necessary for the derive macros which rely on being used in a
+// context where the crypto crate is external
+use crate as diem_crypto;
+use crate::{
+    ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature},
+    multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey, MultiEd25519Signature},
+    test_utils::{random_serializable_struct, uniform_keypair_strategy},
+    traits::*,
+};
+use diem_crypto_derive::{
+    PrivateKey, PublicKey, Signature, SigningKey, SilentDebug, ValidCryptoMaterial, VerifyingKey,
+};
+use proptest::prelude::*;
+use serde::{Deserialize, Serialize};
+
+// Here we aim to make a point about how we can build an enum generically
+// on top of a few choice signing scheme types. This enum implements the
+// VerifyingKey, SigningKey for precisely the types selected for that enum
+// (here, Ed25519(PublicKey|PrivateKey|Signature) and MultiEd25519(...)).
+//
+// Note that we do not break type safety (see towards the end), and that
+// this enum can safely be put into the usual collection (Vec, HashMap).
+//
+
+#[derive(
+    Serialize,
+    Deserialize,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    Hash,
+    ValidCryptoMaterial,
+    PublicKey,
+    VerifyingKey,
+)]
+#[PrivateKeyType = "PrivateK"]
+#[SignatureType = "Sig"]
+enum PublicK {
+    Ed(Ed25519PublicKey),
+    MultiEd(MultiEd25519PublicKey),
+}
+
+#[derive(Serialize, Deserialize, SilentDebug, ValidCryptoMaterial, PrivateKey, SigningKey)]
+#[PublicKeyType = "PublicK"]
+#[SignatureType = "Sig"]
+enum PrivateK {
+    Ed(Ed25519PrivateKey),
+    MultiEd(MultiEd25519PrivateKey),
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Signature)]
+#[PublicKeyType = "PublicK"]
+#[PrivateKeyType = "PrivateK"]
+enum Sig {
+    Ed(Ed25519Signature),
+    MultiEd(MultiEd25519Signature),
+}
+
+///////////////////////////////////////////////////////
+// End of declarations — let's now prove type safety //
+///////////////////////////////////////////////////////
+proptest! {
+    #![proptest_config(ProptestConfig::with_cases(20))]
+
+    #[test]
+    #[allow(deprecated)]
+    fn test_keys_mix(
+        message in random_serializable_struct(),
+        ed_keypair1 in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>(),
+        ed_keypair2 in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>(),
+        med_keypair in uniform_keypair_strategy::<MultiEd25519PrivateKey, MultiEd25519PublicKey>()
+    ) {
+        // this is impossible to write statically, due to the trait not being
+        // object-safe (voluntarily), see unsupported_sigs below
+        // let mut l: Vec<Box<dyn PrivateKey>> = vec![];
+        let mut l: Vec<Ed25519PrivateKey> = vec![ed_keypair1.private_key];
+        let ed_key = l.pop().unwrap();
+        let signature = ed_key.sign(&message);
+
+        // This is business as usual
+        prop_assert!(signature.verify(&message, &ed_keypair1.public_key).is_ok());
+
+        // signature-publickey mixups are statically impossible, see unsupported_sigs below
+        let mut l2: Vec<PrivateK> = vec![
+            PrivateK::MultiEd(med_keypair.private_key),
+            PrivateK::Ed(ed_keypair2.private_key),
+        ];
+
+        let ed_key = l2.pop().unwrap();
+        let ed_signature = ed_key.sign(&message);
+
+        // This is still business as usual
+        let ed_pubkey2 = PublicK::Ed(ed_keypair2.public_key);
+        let good_sigver = ed_signature.verify(&message, &ed_pubkey2);
+        prop_assert!(good_sigver.is_ok(), "{:?}", good_sigver);
+
+        // but this still fails, as expected
+        let med_pubkey = PublicK::MultiEd(med_keypair.public_key);
+        let bad_sigver = ed_signature.verify(&message, &med_pubkey);
+        prop_assert!(bad_sigver.is_err(), "{:?}", bad_sigver);
+
+        // And now just in case we're confused again, we pop in the
+        // reverse direction
+        let med_key = l2.pop().unwrap();
+        let med_signature = med_key.sign(&message);
+
+        // This is still business as usual
+        let good_sigver = med_signature.verify(&message, &med_pubkey);
+        prop_assert!(good_sigver.is_ok(), "{:?}", good_sigver);
+
+        // but this still fails, as expected
+        let bad_sigver = med_signature.verify(&message, &ed_pubkey2);
+        prop_assert!(bad_sigver.is_err(), "{:?}", bad_sigver);
+    }
+}
+
+#[test]
+fn unsupported_sigs() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("src/unit_tests/compilation/cross_test.rs");
+    t.compile_fail("src/unit_tests/compilation/cross_test_trait_obj.rs");
+    t.compile_fail("src/unit_tests/compilation/cross_test_trait_obj_sig.rs");
+    t.compile_fail("src/unit_tests/compilation/cross_test_trait_obj_pub.rs");
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cryptohasher.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cryptohasher.rs
new file mode 100644
index 000000000..cd205e4a1
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/cryptohasher.rs
@@ -0,0 +1,109 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Test file for the procedural macros CryptoHasher and BCSCryptoHash.
+
+use crate as diem_crypto;
+use crate::{
+    hash::{CryptoHash, CryptoHasher, DIEM_HASH_PREFIX},
+    HashValue,
+};
+use diem_crypto_derive::{BCSCryptoHash, CryptoHasher};
+use serde::{Deserialize, Serialize};
+use tiny_keccak::{Hasher, Sha3};
+
+// The expected use case.
+#[derive(Serialize, Deserialize, CryptoHasher, BCSCryptoHash)]
+pub struct Foo {
+    a: u64,
+    b: u32,
+}
+
+// Used for testing the seed in FooHasher.
+pub struct Bar {}
+
+// Complex example with generics and serde-rename.
+#[derive(Serialize, Deserialize, CryptoHasher, BCSCryptoHash)]
+#[serde(rename = "Foo")]
+pub struct Baz<T> {
+    a: T,
+    b: u32,
+}
+
+impl CryptoHash for Bar {
+    type Hasher = FooHasher;
+
+    fn hash(&self) -> HashValue {
+        let state = Self::Hasher::default();
+        state.finish()
+    }
+}
+
+#[test]
+fn test_cryptohasher_name() {
+    let mut salt = DIEM_HASH_PREFIX.to_vec();
+    salt.extend_from_slice(b"Foo");
+
+    let value = Bar {};
+    let expected = {
+        let mut digest = Sha3::v256();
+        digest.update(HashValue::sha3_256_of(&salt[..]).as_ref());
+        let mut hasher_bytes = [0u8; 32];
+        digest.finalize(&mut hasher_bytes);
+        hasher_bytes
+    };
+    let actual = CryptoHash::hash(&value);
+    assert_eq!(&expected, actual.as_ref());
+}
+
+#[test]
+fn test_bcs_cryptohash() {
+    let mut salt = DIEM_HASH_PREFIX.to_vec();
+    salt.extend_from_slice(b"Foo");
+
+    let value = Foo { a: 5, b: 1025 };
+    let expected = {
+        let mut digest = Sha3::v256();
+        digest.update(HashValue::sha3_256_of(&salt[..]).as_ref());
+        digest.update(&bcs::to_bytes(&value).unwrap());
+        let mut hasher_bytes = [0u8; 32];
+        digest.finalize(&mut hasher_bytes);
+        hasher_bytes
+    };
+    let actual = CryptoHash::hash(&value);
+    assert_eq!(&expected, actual.as_ref());
+}
+
+#[test]
+fn test_bcs_cryptohash_with_generics() {
+    let value = Baz { a: 5u64, b: 1025 };
+    let expected = CryptoHash::hash(&Foo { a: 5, b: 1025 });
+    let actual = CryptoHash::hash(&value);
+    assert_eq!(expected, actual);
+}
+
+fn prefixed_sha3(input: &[u8]) -> [u8; 32] {
+    let mut sha3 = ::tiny_keccak::Sha3::v256();
+    let salt: Vec<u8> = [DIEM_HASH_PREFIX, input].concat();
+    sha3.update(&salt);
+    let mut output = [0u8; 32];
+    sha3.finalize(&mut output);
+    output
+}
+
+#[test]
+fn test_cryptohasher_salt_access() {
+    // the salt for this simple struct is expected to be its name
+    assert_eq!(FooHasher::seed(), &prefixed_sha3(b"Foo"));
+    assert_eq!(<Foo as CryptoHash>::Hasher::seed(), &prefixed_sha3(b"Foo"));
+    assert_eq!(
+        <Baz<usize> as CryptoHash>::Hasher::seed(),
+        &prefixed_sha3(b"Foo")
+    );
+    assert_eq!(
+        <Baz<String> as CryptoHash>::Hasher::seed(),
+        &prefixed_sha3(b"Foo")
+    );
+    assert_eq!(<Bar as CryptoHash>::Hasher::seed(), &prefixed_sha3(b"Foo"));
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs
new file mode 100644
index 000000000..3d1deee2f
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs
@@ -0,0 +1,610 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate as diem_crypto;
+use crate::{
+    ed25519::{
+        Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature, ED25519_PRIVATE_KEY_LENGTH,
+        ED25519_PUBLIC_KEY_LENGTH, ED25519_SIGNATURE_LENGTH,
+    },
+    test_utils::{random_serializable_struct, uniform_keypair_strategy},
+    traits::*,
+    x25519,
+};
+use core::{
+    convert::TryFrom,
+    ops::{Add, Index, IndexMut, Mul, Neg},
+};
+use diem_crypto_derive::{BCSCryptoHash, CryptoHasher};
+use digest::Digest;
+use ed25519_dalek::ed25519::signature::{Signature as _, Verifier as _};
+use proptest::{collection::vec, prelude::*};
+use serde::{Deserialize, Serialize};
+use sha2::Sha512;
+
+#[derive(CryptoHasher, BCSCryptoHash, Serialize, Deserialize)]
+struct CryptoHashable(pub usize);
+
+// Takes a point in eight_torsion and finds its order
+fn eight_torsion_order(ep: curve25519_dalek::edwards::EdwardsPoint) -> usize {
+    let mut pt = ep;
+    let mut ord = 1;
+    for _i in 0..8 {
+        if pt == curve25519_dalek::edwards::EdwardsPoint::default() {
+            break;
+        } else {
+            pt = pt.add(ep);
+            ord += 1;
+        }
+    }
+    ord
+}
+
+proptest! {
+    #[test]
+    fn verify_canonicity_torsion(scalar in any::<[u8;32]>(), idx in 0usize..8usize){
+        let s = curve25519_dalek::scalar::Scalar::from_bytes_mod_order(scalar);
+        let s_b = curve25519_dalek::constants::ED25519_BASEPOINT_POINT.mul(s);
+        let torsion_component = curve25519_dalek::edwards::CompressedEdwardsY(EIGHT_TORSION[idx]).decompress().unwrap();
+        let torsioned = s_b.add(torsion_component);
+        let torsioned_bytes = torsioned.compress().to_bytes();
+        let deserialized = curve25519_dalek::edwards::CompressedEdwardsY(torsioned_bytes).decompress().unwrap();
+        prop_assert_eq!(deserialized, torsioned);
+    }
+
+
+    #[test]
+    fn verify_mul_torsion(idx in 0usize..8usize){
+        let torsion_component = curve25519_dalek::edwards::CompressedEdwardsY(EIGHT_TORSION[idx]).decompress().unwrap();
+        let mut order_bytes = [0u8;32];
+        order_bytes[..8].copy_from_slice(&(eight_torsion_order(torsion_component)).to_le_bytes());
+        let torsion_order = curve25519_dalek::scalar::Scalar::from_bits(order_bytes);
+
+        prop_assert_eq!(torsion_component.mul(torsion_order), curve25519_dalek::edwards::EdwardsPoint::default());
+    }
+
+    // In this test we demonstrate a signature that's not message-bound by only
+    // modifying the public key and the R component, under a pathological yet
+    // admissible s < l value for the signature
+    #[test]
+    fn verify_sig_malleable_torsion(keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>(), idx in 0usize..8usize){
+        let message = b"hello_world";
+        ///////////////////////////////////
+        // baseline signature components //
+        ///////////////////////////////////
+        let pub_key_bytes = keypair.public_key.to_bytes();
+        let priv_key_bytes = keypair.private_key.to_bytes();
+        let pub_key = ed25519_dalek::PublicKey::from_bytes(&pub_key_bytes).unwrap();
+        let secret_key = ed25519_dalek::SecretKey::from_bytes(&priv_key_bytes).unwrap();
+        let priv_key = ed25519_dalek::ExpandedSecretKey::from(&secret_key);
+        let signature = priv_key.sign(&message[..], &pub_key);
+        prop_assert!(pub_key.verify(&message[..], &signature).is_ok());
+
+        let torsion_component = curve25519_dalek::edwards::CompressedEdwardsY(EIGHT_TORSION[idx]).decompress().unwrap();
+
+        let mut r_bits = [0u8; 32];
+        r_bits.copy_from_slice(&signature.to_bytes()[..32]);
+
+        let r_point = curve25519_dalek::edwards::CompressedEdwardsY(r_bits).decompress().unwrap();
+        let mixed_r_point = r_point.add(torsion_component);
+        prop_assert_eq!(r_point.mul_by_cofactor(), mixed_r_point.mul_by_cofactor());
+
+        let pub_point = curve25519_dalek::edwards::CompressedEdwardsY(pub_key_bytes).decompress().unwrap();
+        let mixed_pub_point = pub_point.add(torsion_component);
+        prop_assert_eq!(pub_point.mul_by_cofactor(), mixed_pub_point.mul_by_cofactor());
+
+        //////////////////////////
+        // Compute k = H(R∥A∥m) //
+        //////////////////////////
+        let mut h: Sha512 = Sha512::default();
+        h.update(mixed_r_point.compress().to_bytes());
+        h.update(mixed_pub_point.compress().to_bytes());
+        h.update(message);
+        // curve25519_dalek is stuck on an old digest version, so we can't do
+        // Scalar::from_hash
+        let mut output = [0u8; 64];
+        output.copy_from_slice(h.finalize().as_slice());
+        let k = curve25519_dalek::scalar::Scalar::from_bytes_mod_order_wide(&output);
+
+        //////////////////////////////////////////////////////////////
+        // obtain the original r s.t. R = r B, to solve for s later //
+        //////////////////////////////////////////////////////////////
+        let mut expanded_priv_key = [0u8; 64];
+        let mut h: Sha512 = Sha512::default();
+        h.update(priv_key_bytes);
+        expanded_priv_key.copy_from_slice(h.finalize().as_slice());
+
+        let nonce = &expanded_priv_key[32..];
+        let mut h: Sha512 = Sha512::default();
+        h.update(nonce);
+        h.update(message);
+        // curve25519_dalek is stuck on an old digest version, so we can't do
+        // Scalar::from_hash
+        let mut output = [0u8; 64];
+        output.copy_from_slice(h.finalize().as_slice());
+        let original_r = curve25519_dalek::scalar::Scalar::from_bytes_mod_order_wide(&output);
+
+        // check r_point = original_r * basepoint
+        prop_assert_eq!(curve25519_dalek::constants::ED25519_BASEPOINT_POINT.mul(original_r), r_point);
+
+        //////////////////////////////////////////
+        // obtain the original a s.t. a * B = A //
+        //////////////////////////////////////////
+        let mut key_bytes = [0u8;32];
+        key_bytes.copy_from_slice(&expanded_priv_key[..32]);
+        key_bytes[0] &= 248;
+        key_bytes[31] &= 127;
+        key_bytes[31] |= 64;
+        let priv_scalar = curve25519_dalek::scalar::Scalar::from_bits(key_bytes);
+        // check pub_point = priv_scalar * basepoint
+        prop_assert_eq!(curve25519_dalek::constants::ED25519_BASEPOINT_POINT.mul(priv_scalar), pub_point);
+
+        //////////////////////////
+        // s = r + k a as usual //
+        //////////////////////////
+        let s = k * priv_scalar + original_r;
+        prop_assert!(s.is_canonical());
+
+        /////////////////////////////////////////////////////////////////////////////////
+        // Check the cofactored equation (modulo 8) before conversion to dalek formats //
+        /////////////////////////////////////////////////////////////////////////////////
+        let mut eight_scalar_bytes = [0u8;32];
+        eight_scalar_bytes[..8].copy_from_slice(&(8_usize).to_le_bytes());
+        let eight_scalar = curve25519_dalek::scalar::Scalar::from_bits(eight_scalar_bytes);
+
+        let r_candidate_point = curve25519_dalek::edwards::EdwardsPoint::vartime_double_scalar_mul_basepoint(&k, &(mixed_pub_point.neg().mul_by_cofactor()), &(s * eight_scalar));
+        prop_assert_eq!(mixed_r_point.mul_by_cofactor(), r_candidate_point);
+
+        ///////////////////////////////////////////////////////////
+        // convert byte strings in dalek terms and do API checks //
+        ///////////////////////////////////////////////////////////
+        let mixed_pub_key = ed25519_dalek::PublicKey::from_bytes(&mixed_pub_point.compress().to_bytes()).unwrap();
+        // check we would not have caught this mixed order point on PublicKey deserialization
+        prop_assert!(Ed25519PublicKey::try_from(&mixed_pub_point.compress().to_bytes()[..]).is_ok());
+
+        let mixed_signature_bits : Vec<u8> = [mixed_r_point.compress().to_bytes(), s.to_bytes()].concat();
+        // this will error if we don't have 0 ≤ s < l
+        let mixed_signature = ed25519_dalek::Signature::from_bytes(&mixed_signature_bits).unwrap();
+
+        // Check, however, that dalek is doing the raw equation check sB = R + kA
+        let permissive_passes = mixed_pub_key.verify(&message[..], &mixed_signature).is_ok();
+        let strict_passes = mixed_pub_key.verify_strict(&message[..], &mixed_signature).is_ok();
+
+        let torsion_order = eight_torsion_order(torsion_component);
+        let torsion_components_cancel = torsion_component + k * torsion_component == curve25519_dalek::edwards::EdwardsPoint::default();
+
+        prop_assert!(!permissive_passes || (torsion_order == 1) || torsion_components_cancel,
+                     "bad verification_state permissive passes {} strict passes {} mixed_order {:?} torsion_components_cancel {:?}",
+                     permissive_passes,
+                     strict_passes,
+                     torsion_order,
+                     torsion_components_cancel
+        );
+    }
+
+    // In this test we demonstrate a signature that's transformable by only
+    // modifying the public key and the R component, under a pathological yet
+    // admissible s < l value for the signature. It shows the difference
+    // between `verify` and `verify_strict` in ed25519-dalek
+    #[test]
+    fn verify_sig_strict_torsion(idx in 0usize..8usize){
+        let message = b"hello_world";
+
+        // Dalek only performs an order check, so this is allowed
+        let bad_scalar = curve25519_dalek::scalar::Scalar::zero();
+
+        let bad_component_1 = curve25519_dalek::edwards::CompressedEdwardsY(EIGHT_TORSION[idx]).decompress().unwrap();
+        let bad_component_2 = bad_component_1.neg();
+
+        // compute bad_pub_key, bad_signature
+        let bad_pub_key_point = bad_component_1; // we need this to cancel the hashed component of the verification equation
+
+        // we pick an evil R component
+        let bad_sig_point = bad_component_2;
+
+        let bad_key = ed25519_dalek::PublicKey::from_bytes(&bad_pub_key_point.compress().to_bytes()).unwrap();
+        // We check that we would have caught this one on the public key
+        prop_assert!(Ed25519PublicKey::try_from(&bad_pub_key_point.compress().to_bytes()[..]).is_err());
+
+        let bad_signature = ed25519_dalek::Signature::from_bytes(&[
+            &bad_sig_point.compress().to_bytes()[..],
+            &bad_scalar.to_bytes()[..]
+        ].concat()).unwrap();
+
+        // Seek k = H(R, A, M) ≡ 1 [8]
+        prop_assume!(bad_key.verify(&message[..], &bad_signature).is_ok());
+        prop_assert!(bad_key.verify_strict(&message[..], &bad_signature).is_err());
+
+    }
+
+
+    #[test]
+    fn convert_from_ed25519_publickey(keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()) {
+        let x25519_public_key = x25519::PublicKey::from_ed25519_public_bytes(&keypair.public_key.to_bytes()[..]).unwrap();
+
+        // Let's construct an x25519 private key from the ed25519 private key.
+        let x25519_privatekey = x25519::PrivateKey::from_ed25519_private_bytes(&keypair.private_key.to_bytes()[..]);
+
+        // This is the important part! We abandon the entire test if an x25519 private
+        // key can't be built from this ed25519 private key, thus "grinding"
+        // the RNG.
+        if x25519_privatekey.is_ok() {
+            // Now derive the public key from x25519_privatekey and see if it matches the public key that
+            // was created from the Ed25519PublicKey.
+            let x25519_publickey_2 = x25519_privatekey.unwrap().public_key();
+            assert_eq!(x25519_public_key, x25519_publickey_2);
+        }
+    }
+
+    #[test]
+    fn ed25519_and_x25519_privkeys(keypair in uniform_keypair_strategy::<x25519::PrivateKey, x25519::PublicKey>()){
+        let x25519_public_bytes = keypair.public_key.to_bytes();
+        let x25519_private_bytes = keypair.private_key.to_bytes();
+        //sanity-check
+        prop_assert_eq!(x25519_public_bytes.clone(), x25519::PublicKey::from(&keypair.private_key).to_bytes());
+
+        // always pass false if you hope to ever get back to the original public key
+        let ed25519_public = Ed25519PublicKey::from_x25519_public_bytes(&x25519_public_bytes, false).unwrap();
+        let x25519_backconverted_public = x25519::PublicKey::from_ed25519_public_bytes(&ed25519_public.to_bytes()[..]).unwrap();
+
+        let ed25519_private = Ed25519PrivateKey::try_from(&x25519_private_bytes[..]).unwrap();
+        let x25519_backconverted_private = x25519::PrivateKey::try_from(&ed25519_private.to_bytes()[..]).unwrap();
+
+        // Test that you can always retrieve a valid x25519 keypair after
+        // "serialization" as an ed25519 keypair
+        prop_assert_eq!(keypair.public_key, x25519_backconverted_public);
+        prop_assert_eq!(keypair.private_key, x25519_backconverted_private.clone());
+        prop_assert_eq!(x25519_backconverted_public, x25519::PublicKey::from(&x25519_backconverted_private));
+        // Note that the reverse is not true: converting to an x25519 private
+        // key mangles the ed25519 private key bits irreversibly !
+    }
+
+    #[test]
+    fn ed25519_to_x25519_roundtrip(keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()){
+        let ed25519_bytes = keypair.public_key.to_bytes();
+        let x25519 = x25519::PublicKey::from_ed25519_public_bytes(&ed25519_bytes).unwrap();
+        let x25519_bytes = x25519.as_slice();
+        let backconverted_ed_positive = Ed25519PublicKey::from_x25519_public_bytes(x25519_bytes, false).unwrap();
+        let backconverted_ed_negative = Ed25519PublicKey::from_x25519_public_bytes(x25519_bytes, true).unwrap();
+        prop_assert!(keypair.public_key == backconverted_ed_negative || keypair.public_key == backconverted_ed_positive);
+    }
+
+    #[test]
+    fn test_pub_key_deserialization(bits in any::<[u8; 32]>()){
+        let pt_deser = curve25519_dalek::edwards::CompressedEdwardsY(bits).decompress();
+        let pub_key = Ed25519PublicKey::try_from(&bits[..]);
+        let check = matches!((pt_deser, pub_key),
+            (Some(_), Ok(_)) // we agree with Dalek,
+            | (Some(_), Err(CryptoMaterialError::SmallSubgroupError)) // dalek does not detect pubkeys in a small subgroup,
+            | (None, Err(CryptoMaterialError::DeserializationError)) // we agree on point decompression failures,
+        );
+        prop_assert!(check);
+    }
+
+    #[test]
+    fn test_keys_encode(keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()) {
+        {
+            let encoded = keypair.private_key.to_encoded_string().unwrap();
+            // Hex encoding of a 32-bytes key is 64 (2 x 32) characters.
+            prop_assert_eq!(2 * ED25519_PRIVATE_KEY_LENGTH, encoded.len());
+            let decoded = Ed25519PrivateKey::from_encoded_string(&encoded);
+            prop_assert_eq!(Some(keypair.private_key), decoded.ok());
+        }
+        {
+            let encoded = keypair.public_key.to_encoded_string().unwrap();
+            // Hex encoding of a 32-bytes key is 64 (2 x 32) characters.
+            prop_assert_eq!(2 * ED25519_PUBLIC_KEY_LENGTH, encoded.len());
+            let decoded = Ed25519PublicKey::from_encoded_string(&encoded);
+            prop_assert_eq!(Some(keypair.public_key), decoded.ok());
+        }
+    }
+
+    #[test]
+    fn test_batch_verify(
+        message in random_serializable_struct(),
+        keypairs in proptest::array::uniform10(uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>())
+    ) {
+        let mut signatures: Vec<(Ed25519PublicKey, Ed25519Signature)> = keypairs.iter().map(|keypair| {
+            (keypair.public_key.clone(), keypair.private_key.sign(&message))
+        }).collect();
+        prop_assert!(Ed25519Signature::batch_verify(&message, signatures.clone()).is_ok());
+        // We swap message and signature for the last element,
+        // resulting in an incorrect signature
+        let (key, _sig) = signatures.pop().unwrap();
+        let other_sig = signatures.last().unwrap().clone().1;
+        signatures.push((key, other_sig));
+        prop_assert!(Ed25519Signature::batch_verify(&message, signatures).is_err());
+    }
+
+    #[test]
+    fn test_keys_custom_serialisation(
+        keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+    ) {
+        {
+            let serialized: &[u8] = &(keypair.private_key.to_bytes());
+            prop_assert_eq!(ED25519_PRIVATE_KEY_LENGTH, serialized.len());
+            let deserialized = Ed25519PrivateKey::try_from(serialized);
+            prop_assert_eq!(Some(keypair.private_key), deserialized.ok());
+        }
+        {
+            let serialized: &[u8] = &(keypair.public_key.to_bytes());
+            prop_assert_eq!(ED25519_PUBLIC_KEY_LENGTH, serialized.len());
+            let deserialized = Ed25519PublicKey::try_from(serialized);
+            prop_assert_eq!(Some(keypair.public_key), deserialized.ok());
+        }
+    }
+
+    #[test]
+    fn test_signature_verification_custom_serialisation(
+        message in random_serializable_struct(),
+        keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+    ) {
+        let signature = keypair.private_key.sign(&message);
+        let serialized: &[u8] = &(signature.to_bytes());
+        prop_assert_eq!(ED25519_SIGNATURE_LENGTH, serialized.len());
+        let deserialized = Ed25519Signature::try_from(serialized).unwrap();
+        prop_assert!(deserialized.verify(&message, &keypair.public_key).is_ok());
+    }
+
+    #[test]
+    fn test_signature_verification_from_arbitrary(
+        // this should be > 64 bits to go over the length of a default hash
+        msg in vec(proptest::num::u8::ANY, 1..128),
+        keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+    ) {
+        let signature = keypair.private_key.sign_arbitrary_message(&msg);
+        let serialized: &[u8] = &(signature.to_bytes());
+        prop_assert_eq!(ED25519_SIGNATURE_LENGTH, serialized.len());
+        let deserialized = Ed25519Signature::try_from(serialized).unwrap();
+        prop_assert!(deserialized.verify_arbitrary_msg(&msg, &keypair.public_key).is_ok());
+    }
+
+    #[test]
+    fn test_signature_verification_from_struct(
+        x in any::<usize>(),
+        keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+    ) {
+        let hashable = CryptoHashable(x);
+        let signature = keypair.private_key.sign(&hashable);
+        let serialized: &[u8] = &(signature.to_bytes());
+        prop_assert_eq!(ED25519_SIGNATURE_LENGTH, serialized.len());
+        let deserialized = Ed25519Signature::try_from(serialized).unwrap();
+        prop_assert!(deserialized.verify(&hashable, &keypair.public_key).is_ok());
+    }
+
+
+    // Check for canonical S.
+    #[test]
+    fn test_signature_malleability(
+        message in random_serializable_struct(),
+        keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+    ) {
+        let signature = keypair.private_key.sign(&message);
+        let mut serialized = signature.to_bytes();
+
+        let mut r_bytes: [u8; 32] = [0u8; 32];
+        r_bytes.copy_from_slice(&serialized[..32]);
+
+        let mut s_bytes: [u8; 32] = [0u8; 32];
+        s_bytes.copy_from_slice(&serialized[32..]);
+
+        // ed25519-dalek signing ensures a canonical S value.
+        let s = Scalar52::from_bytes(&s_bytes);
+
+        // adding L (order of the base point) so that S + L > L
+        let malleable_s = Scalar52::add(&s, &L);
+        let malleable_s_bytes = malleable_s.to_bytes();
+        // Update the signature (the S part).
+        serialized[32..].copy_from_slice(&malleable_s_bytes);
+
+        // Check that malleable signatures will pass verification and deserialization in dalek.
+        // Construct the corresponding dalek public key.
+        let _dalek_public_key = ed25519_dalek::PublicKey::from_bytes(
+            &keypair.public_key.to_bytes()
+        ).unwrap();
+
+        // Construct the corresponding dalek Signature. This signature is malleable.
+        let dalek_sig = ed25519_dalek::Signature::from_bytes(&serialized);
+
+        // ed25519_dalek will (post 2.0) deserialize the malleable
+        // signature. It does not detect it.
+        prop_assert!(dalek_sig.is_ok());
+
+        let serialized_malleable: &[u8] = &serialized;
+        // try_from will fail on malleable signatures. We detect malleable signatures
+        // during deserialization.
+        prop_assert_eq!(
+            Ed25519Signature::try_from(serialized_malleable),
+            Err(CryptoMaterialError::CanonicalRepresentationError)
+        );
+
+        // We expect from_bytes_unchecked deserialization to succeed, as dalek
+        // does not check for signature malleability. This method is pub(crate)
+        // and only used for test purposes.
+        let sig_unchecked = Ed25519Signature::from_bytes_unchecked(&serialized);
+        prop_assert!(sig_unchecked.is_ok());
+
+        // Update the signature by setting S = L to make it invalid.
+        serialized[32..].copy_from_slice(&L.to_bytes());
+        let serialized_malleable_l: &[u8] = &serialized;
+        // try_from will fail with CanonicalRepresentationError.
+        prop_assert_eq!(
+            Ed25519Signature::try_from(serialized_malleable_l),
+            Err(CryptoMaterialError::CanonicalRepresentationError)
+        );
+    }
+}
+
+// Test against known small subgroup public keys.
+#[test]
+fn test_publickey_smallorder() {
+    for torsion_point in &EIGHT_TORSION {
+        let serialized: &[u8] = torsion_point;
+        // We expect from_bytes_unchecked to pass, as it does not validate the key.
+        assert!(Ed25519PublicKey::from_bytes_unchecked(serialized).is_ok());
+        // from_bytes will fail on invalid key.
+        assert_eq!(
+            Ed25519PublicKey::try_from(serialized),
+            Err(CryptoMaterialError::SmallSubgroupError)
+        );
+    }
+}
+
+// The 8-torsion subgroup E[8].
+//
+// In the case of Curve25519, it is cyclic; the i-th element of
+// the array is [i]P, where P is a point of order 8
+// generating E[8].
+//
+// Thus E[8] is the points indexed by `0,2,4,6`, and
+// E[2] is the points indexed by `0,4`.
+//
+// The following byte arrays have been ported from curve25519-dalek /backend/serial/u64/constants.rs
+// and they represent the serialised version of the CompressedEdwardsY points.
+
+const EIGHT_TORSION: [[u8; 32]; 8] = [
+    [
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
+    ],
+    [
+        199, 23, 106, 112, 61, 77, 216, 79, 186, 60, 11, 118, 13, 16, 103, 15, 42, 32, 83, 250, 44,
+        57, 204, 198, 78, 199, 253, 119, 146, 172, 3, 122,
+    ],
+    [
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 128,
+    ],
+    [
+        38, 232, 149, 143, 194, 178, 39, 176, 69, 195, 244, 137, 242, 239, 152, 240, 213, 223, 172,
+        5, 211, 198, 51, 57, 177, 56, 2, 136, 109, 83, 252, 5,
+    ],
+    [
+        236, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127,
+    ],
+    [
+        38, 232, 149, 143, 194, 178, 39, 176, 69, 195, 244, 137, 242, 239, 152, 240, 213, 223, 172,
+        5, 211, 198, 51, 57, 177, 56, 2, 136, 109, 83, 252, 133,
+    ],
+    [
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
+    ],
+    [
+        199, 23, 106, 112, 61, 77, 216, 79, 186, 60, 11, 118, 13, 16, 103, 15, 42, 32, 83, 250, 44,
+        57, 204, 198, 78, 199, 253, 119, 146, 172, 3, 250,
+    ],
+];
+
+/// The `Scalar52` struct represents an element in
+/// ℤ/ℓℤ as 5 52-bit limbs.
+struct Scalar52(pub [u64; 5]);
+
+/// `L` is the order of base point, i.e. 2^252 + 27742317777372353535851937790883648493
+const L: Scalar52 = Scalar52([
+    0x0002_631A_5CF5_D3ED,
+    0x000D_EA2F_79CD_6581,
+    0x0000_0000_0014_DEF9,
+    0x0000_0000_0000_0000,
+    0x0000_1000_0000_0000,
+]);
+
+impl Scalar52 {
+    /// Return the zero scalar
+    fn zero() -> Scalar52 {
+        Scalar52([0, 0, 0, 0, 0])
+    }
+
+    /// Unpack a 32 byte / 256 bit scalar into 5 52-bit limbs.
+    fn from_bytes(bytes: &[u8; 32]) -> Scalar52 {
+        let mut words = [0u64; 4];
+        for i in 0..4 {
+            for j in 0..8 {
+                words[i] |= u64::from(bytes[(i * 8) + j]) << (j * 8) as u64;
+            }
+        }
+
+        let mask = (1u64 << 52) - 1;
+        let top_mask = (1u64 << 48) - 1;
+        let mut s = Scalar52::zero();
+
+        s[0] = words[0] & mask;
+        s[1] = ((words[0] >> 52) | (words[1] << 12)) & mask;
+        s[2] = ((words[1] >> 40) | (words[2] << 24)) & mask;
+        s[3] = ((words[2] >> 28) | (words[3] << 36)) & mask;
+        s[4] = (words[3] >> 16) & top_mask;
+
+        s
+    }
+
+    /// Pack the limbs of this `Scalar52` into 32 bytes
+    fn to_bytes(&self) -> [u8; 32] {
+        let mut s = [0u8; 32];
+
+        s[0] = self.0[0] as u8;
+        s[1] = (self.0[0] >> 8) as u8;
+        s[2] = (self.0[0] >> 16) as u8;
+        s[3] = (self.0[0] >> 24) as u8;
+        s[4] = (self.0[0] >> 32) as u8;
+        s[5] = (self.0[0] >> 40) as u8;
+        s[6] = ((self.0[0] >> 48) | (self.0[1] << 4)) as u8;
+        s[7] = (self.0[1] >> 4) as u8;
+        s[8] = (self.0[1] >> 12) as u8;
+        s[9] = (self.0[1] >> 20) as u8;
+        s[10] = (self.0[1] >> 28) as u8;
+        s[11] = (self.0[1] >> 36) as u8;
+        s[12] = (self.0[1] >> 44) as u8;
+        s[13] = self.0[2] as u8;
+        s[14] = (self.0[2] >> 8) as u8;
+        s[15] = (self.0[2] >> 16) as u8;
+        s[16] = (self.0[2] >> 24) as u8;
+        s[17] = (self.0[2] >> 32) as u8;
+        s[18] = (self.0[2] >> 40) as u8;
+        s[19] = ((self.0[2] >> 48) | (self.0[3] << 4)) as u8;
+        s[20] = (self.0[3] >> 4) as u8;
+        s[21] = (self.0[3] >> 12) as u8;
+        s[22] = (self.0[3] >> 20) as u8;
+        s[23] = (self.0[3] >> 28) as u8;
+        s[24] = (self.0[3] >> 36) as u8;
+        s[25] = (self.0[3] >> 44) as u8;
+        s[26] = self.0[4] as u8;
+        s[27] = (self.0[4] >> 8) as u8;
+        s[28] = (self.0[4] >> 16) as u8;
+        s[29] = (self.0[4] >> 24) as u8;
+        s[30] = (self.0[4] >> 32) as u8;
+        s[31] = (self.0[4] >> 40) as u8;
+
+        s
+    }
+
+    /// Compute `a + b` (without mod ℓ)
+    fn add(a: &Scalar52, b: &Scalar52) -> Scalar52 {
+        let mut sum = Scalar52::zero();
+        let mask = (1u64 << 52) - 1;
+
+        // a + b
+        let mut carry: u64 = 0;
+        for i in 0..5 {
+            carry = a[i] + b[i] + (carry >> 52);
+            sum[i] = carry & mask;
+        }
+
+        sum
+    }
+}
+
+impl Index<usize> for Scalar52 {
+    type Output = u64;
+
+    fn index(&self, _index: usize) -> &u64 {
+        &(self.0[_index])
+    }
+}
+
+impl IndexMut<usize> for Scalar52 {
+    fn index_mut(&mut self, _index: usize) -> &mut u64 {
+        &mut (self.0[_index])
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hash_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hash_test.rs
new file mode 100644
index 000000000..bd20d397c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hash_test.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::hash::*;
+use bitvec::prelude::*;
+use proptest::{collection::vec, prelude::*};
+use rand::{rngs::StdRng, SeedableRng};
+use serde::Serialize;
+use std::str::FromStr;
+
+#[derive(Serialize)]
+struct Foo(u32);
+
+#[test]
+fn test_default_hasher() {
+    assert_eq!(
+        Foo(3).test_only_hash(),
+        HashValue::from_iter_sha3(vec![bcs::to_bytes(&Foo(3)).unwrap().as_slice()]),
+    );
+    assert_eq!(
+        format!("{:x}", b"hello".test_only_hash()),
+        "3338be694f50c5f338814986cdf0686453a888b84f424d792af4b9202398f392",
+    );
+    assert_eq!(
+        format!("{:x}", b"world".test_only_hash()),
+        "420baf620e3fcd9b3715b42b92506e9304d56e02d3a103499a3a292560cb66b2",
+    );
+}
+
+#[test]
+fn test_primitive_type() {
+    let x = 0xF312_u16;
+    let mut wtr: Vec<u8> = vec![];
+    wtr.extend_from_slice(&x.to_le_bytes());
+    assert_eq!(x.test_only_hash(), HashValue::sha3_256_of(&wtr[..]));
+
+    let x = 0xFF00_1234_u32;
+    let mut wtr: Vec<u8> = vec![];
+    wtr.extend_from_slice(&x.to_le_bytes());
+    assert_eq!(x.test_only_hash(), HashValue::sha3_256_of(&wtr[..]));
+
+    let x = 0x89AB_CDEF_0123_4567_u64;
+    let mut wtr: Vec<u8> = vec![];
+    wtr.extend_from_slice(&x.to_le_bytes());
+    assert_eq!(x.test_only_hash(), HashValue::sha3_256_of(&wtr[..]));
+}
+
+#[test]
+fn test_from_slice() {
+    {
+        let zero_byte_vec = vec![0; 32];
+        assert_eq!(
+            HashValue::from_slice(zero_byte_vec).unwrap(),
+            HashValue::zero()
+        );
+    }
+    {
+        // The length is mismatched.
+        let zero_byte_vec = vec![0; 31];
+        assert!(HashValue::from_slice(zero_byte_vec).is_err());
+    }
+    {
+        let bytes = vec![1; 123];
+        assert!(HashValue::from_slice(&bytes[..]).is_err());
+    }
+}
+
+#[test]
+fn test_random_with_rng() {
+    let mut seed = [0u8; 32];
+    seed[..4].copy_from_slice(&[1, 2, 3, 4]);
+    let hash1;
+    let hash2;
+    {
+        let mut rng: StdRng = SeedableRng::from_seed(seed);
+        hash1 = HashValue::random_with_rng(&mut rng);
+    }
+    {
+        let mut rng: StdRng = SeedableRng::from_seed(seed);
+        hash2 = HashValue::random_with_rng(&mut rng);
+    }
+    assert_eq!(hash1, hash2);
+}
+
+#[test]
+#[allow(clippy::bool_assert_comparison)]
+fn test_hash_value_iter_bits() {
+    let hash = b"hello".test_only_hash();
+    let bits = hash.iter_bits().collect::<Vec<_>>();
+
+    assert_eq!(bits.len(), HashValue::LENGTH_IN_BITS);
+    assert_eq!(bits[0], false);
+    assert_eq!(bits[1], false);
+    assert_eq!(bits[2], true);
+    assert_eq!(bits[3], true);
+    assert_eq!(bits[4], false);
+    assert_eq!(bits[5], false);
+    assert_eq!(bits[6], true);
+    assert_eq!(bits[7], true);
+    assert_eq!(bits[248], true);
+    assert_eq!(bits[249], false);
+    assert_eq!(bits[250], false);
+    assert_eq!(bits[251], true);
+    assert_eq!(bits[252], false);
+    assert_eq!(bits[253], false);
+    assert_eq!(bits[254], true);
+    assert_eq!(bits[255], false);
+
+    let mut bits_rev = hash.iter_bits().rev().collect::<Vec<_>>();
+    bits_rev.reverse();
+    assert_eq!(bits, bits_rev);
+}
+
+#[test]
+fn test_hash_value_iterator_exact_size() {
+    let hash = b"hello".test_only_hash();
+
+    let mut iter = hash.iter_bits();
+    assert_eq!(iter.len(), HashValue::LENGTH_IN_BITS);
+    iter.next();
+    assert_eq!(iter.len(), HashValue::LENGTH_IN_BITS - 1);
+    iter.next_back();
+    assert_eq!(iter.len(), HashValue::LENGTH_IN_BITS - 2);
+
+    let iter_rev = hash.iter_bits().rev();
+    assert_eq!(iter_rev.len(), HashValue::LENGTH_IN_BITS);
+
+    let iter_skip = hash.iter_bits().skip(100);
+    assert_eq!(iter_skip.len(), HashValue::LENGTH_IN_BITS - 100);
+}
+
+#[test]
+fn test_fmt_binary() {
+    let hash = b"hello".test_only_hash();
+    let hash_str = format!("{:b}", hash);
+    assert_eq!(hash_str.len(), HashValue::LENGTH_IN_BITS);
+    for (bit, chr) in hash.iter_bits().zip(hash_str.chars()) {
+        assert_eq!(chr, if bit { '1' } else { '0' });
+    }
+}
+
+#[test]
+fn test_get_nibble() {
+    let mut bytes = [0u8; HashValue::LENGTH];
+    let mut nibbles = vec![];
+    for byte in bytes.iter_mut().take(HashValue::LENGTH) {
+        *byte = rand::thread_rng().gen();
+        nibbles.push(*byte >> 4);
+        nibbles.push(*byte & 0x0F);
+    }
+    let hash = HashValue::new(bytes);
+    for (i, nibble) in nibbles.iter().enumerate().take(HashValue::LENGTH * 2) {
+        assert_eq!(hash.nibble(i), *nibble);
+    }
+}
+
+#[test]
+fn test_common_prefix_bits_len() {
+    {
+        let hash1 = b"hello".test_only_hash();
+        let hash2 = b"HELLO".test_only_hash();
+        assert_eq!(hash1[0], 0b0011_0011);
+        assert_eq!(hash2[0], 0b1011_1000);
+        assert_eq!(hash1.common_prefix_bits_len(hash2), 0);
+    }
+    {
+        let hash1 = b"hello".test_only_hash();
+        let hash2 = b"world".test_only_hash();
+        assert_eq!(hash1[0], 0b0011_0011);
+        assert_eq!(hash2[0], 0b0100_0010);
+        assert_eq!(hash1.common_prefix_bits_len(hash2), 1);
+    }
+    {
+        let hash1 = b"hello".test_only_hash();
+        let hash2 = b"100011001000".test_only_hash();
+        assert_eq!(hash1[0], 0b0011_0011);
+        assert_eq!(hash2[0], 0b0011_0011);
+        assert_eq!(hash1[1], 0b0011_1000);
+        assert_eq!(hash2[1], 0b0010_0010);
+        assert_eq!(hash1.common_prefix_bits_len(hash2), 11);
+    }
+    {
+        let hash1 = b"hello".test_only_hash();
+        let hash2 = b"hello".test_only_hash();
+        assert_eq!(
+            hash1.common_prefix_bits_len(hash2),
+            HashValue::LENGTH_IN_BITS
+        );
+    }
+}
+
+proptest! {
+    #[test]
+    fn test_hashvalue_to_bits_roundtrip(hash in any::<HashValue>()) {
+        let bitvec: BitVec<Msb0, u8>  = hash.iter_bits().collect();
+        let bytes: Vec<u8> = bitvec.into();
+        let hash2 = HashValue::from_slice(bytes).unwrap();
+        prop_assert_eq!(hash, hash2);
+    }
+
+    #[test]
+    fn test_hashvalue_to_bits_inverse_roundtrip(bits in vec(any::<bool>(), HashValue::LENGTH_IN_BITS)) {
+        let bitvec: BitVec<Msb0, u8> = bits.iter().cloned().collect();
+        let bytes: Vec<u8> = bitvec.into();
+        let hash = HashValue::from_slice(bytes).unwrap();
+        let bits2: Vec<bool> = hash.iter_bits().collect();
+        prop_assert_eq!(bits, bits2);
+    }
+
+    #[test]
+    fn test_hashvalue_iter_bits_rev(hash in any::<HashValue>()) {
+        let bits1: Vec<bool> = hash.iter_bits().collect();
+        let mut bits2: Vec<bool> = hash.iter_bits().rev().collect();
+        bits2.reverse();
+        prop_assert_eq!(bits1, bits2);
+    }
+
+    #[test]
+    fn test_hashvalue_to_rev_bits_roundtrip(hash in any::<HashValue>()) {
+        let bitvec: BitVec<Lsb0, u8> = hash.iter_bits().rev().collect();
+        let mut bytes: Vec<u8> = bitvec.into();
+        bytes.reverse();
+        let hash2 = HashValue::from_slice(&bytes).unwrap();
+        prop_assert_eq!(hash, hash2);
+    }
+
+    #[test]
+    fn test_hashvalue_to_str_roundtrip(hash in any::<HashValue>()) {
+        let hash2 = HashValue::from_str(&hash.to_hex()).unwrap();
+        prop_assert_eq!(hash, hash2);
+    }
+
+    #[test]
+    fn test_hashvalue_to_hex_literal(hash in any::<HashValue>()) {
+        prop_assert_eq!(format!("0x{}", hash.to_hex()), hash.to_hex_literal());
+    }
+
+    #[test]
+    fn test_hashvalue_from_bit_iter(hash in any::<HashValue>()) {
+        let hash2 = HashValue::from_bit_iter(hash.iter_bits()).unwrap();
+        prop_assert_eq!(hash, hash2);
+
+        let bits1 = vec![false; HashValue::LENGTH_IN_BITS - 10];
+        prop_assert!(HashValue::from_bit_iter(bits1.into_iter()).is_err());
+
+        let bits2 = vec![false; HashValue::LENGTH_IN_BITS + 10];
+        prop_assert!(HashValue::from_bit_iter(bits2.into_iter()).is_err());
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs
new file mode 100644
index 000000000..a211e6c06
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs
@@ -0,0 +1,237 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{compat::Sha3_256, hkdf::*};
+use sha2::{Sha256, Sha512};
+
+// Testing against sha256 test vectors. Unfortunately the rfc does not provide test vectors for
+// sha3 and sha512.
+#[test]
+fn test_sha256_test_vectors() {
+    let tests = test_vectors_sha256();
+    for t in tests.iter() {
+        let ikm = hex::decode(t.ikm).unwrap();
+        let salt = hex::decode(t.salt).unwrap();
+        let info = hex::decode(t.info).unwrap();
+
+        let hkdf_extract = Hkdf::<Sha256>::extract(Option::from(&salt[..]), &ikm[..]).unwrap();
+        let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, Some(&info[..]), t.length);
+
+        assert!(hkdf_expand.is_ok());
+        assert_eq!(t.prk, hex::encode(hkdf_extract));
+        assert_eq!(t.okm, hex::encode(hkdf_expand.unwrap()));
+    }
+}
+
+// Testing against sha256 test vectors for the extract_then_expand function.
+#[test]
+fn test_extract_then_expand() {
+    let tests = test_vectors_sha256();
+    for t in tests.iter() {
+        let ikm = hex::decode(t.ikm).unwrap();
+        let salt = hex::decode(t.salt).unwrap();
+        let info = hex::decode(t.info).unwrap();
+
+        let hkdf_full = Hkdf::<Sha256>::extract_then_expand(
+            Option::from(&salt[..]),
+            &ikm[..],
+            Option::from(&info[..]),
+            t.length,
+        );
+
+        assert!(hkdf_full.is_ok());
+        assert_eq!(t.okm, hex::encode(hkdf_full.unwrap()));
+    }
+}
+
+#[test]
+fn test_sha256_output_length() {
+    // According to rfc, max_sha256_length <= 255 * HashLen bytes
+    let max_hash_length: usize = 255 * 32; // = 8160
+    let ikm = [0u8; 32];
+    // We extract once, then we reuse it.
+    let hkdf_extract = Hkdf::<Sha256>::extract(None, &ikm).unwrap();
+
+    // Test for max allowed (expected to pass)
+    let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, None, max_hash_length);
+    assert!(hkdf_expand.is_ok());
+    assert_eq!(hkdf_expand.unwrap().len(), max_hash_length);
+
+    // Test for max + 1 (expected to fail)
+    let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, None, max_hash_length + 1);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for 10_000 > max (expected to fail)
+    let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, None, 10_000);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for zero size output (expected to fail)
+    let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, None, 0);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+}
+
+// FIPS 202 approves HMAC-SHA3 and specifies the block sizes (see top of page 22).
+// SP 800-56C approves of HKDF-HMAC-hash as a randomness extractor with any approved hash function.
+// But in contrast, I can't find any NIST statement that explicitly approves the use of KMAC
+// as a randomness extractor.
+// But, it's debatable if this is a pointless construct, as HMAC only exists to cover up weaknesses
+// in Merkle-Damgard hashes, but sha3 (and Keccak) are sponge constructions, immune to length
+// extension attacks.
+#[test]
+fn test_sha3_256_output_length() {
+    let max_hash_length: usize = 255 * 32; // = 8160
+    let ikm = [0u8; 32];
+    let hkdf_extract = Hkdf::<Sha3_256>::extract(None, &ikm).unwrap();
+
+    // Test for max allowed (expected to pass)
+    let hkdf_expand = Hkdf::<Sha3_256>::expand(&hkdf_extract, None, max_hash_length);
+    assert!(hkdf_expand.is_ok());
+    assert_eq!(hkdf_expand.unwrap().len(), max_hash_length);
+
+    // Test for max + 1 (expected to fail)
+    let hkdf_expand = Hkdf::<Sha3_256>::expand(&hkdf_extract, None, max_hash_length + 1);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for 10_000 > max (expected to fail)
+    let hkdf_expand = Hkdf::<Sha3_256>::expand(&hkdf_extract, None, 10_000);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for zero size output (expected to fail)
+    let hkdf_expand = Hkdf::<Sha3_256>::expand(&hkdf_extract, None, 0);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+}
+
+#[test]
+fn test_sha512_output_length() {
+    let max_hash_length: usize = 255 * 64; // = 16320
+    let ikm = [0u8; 32];
+    let hkdf_extract = Hkdf::<Sha512>::extract(None, &ikm).unwrap();
+
+    // Test for max allowed (expected to pass)
+    let hkdf_expand = Hkdf::<Sha512>::expand(&hkdf_extract, None, max_hash_length);
+    assert!(hkdf_expand.is_ok());
+    assert_eq!(hkdf_expand.unwrap().len(), max_hash_length);
+
+    // Test for max + 1 (expected to fail)
+    let hkdf_expand = Hkdf::<Sha512>::expand(&hkdf_extract, None, max_hash_length + 1);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for 10_000 > max (expected to fail)
+    let hkdf_expand = Hkdf::<Sha512>::expand(&hkdf_extract, None, 20_000);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+
+    // Test for zero size output (expected to fail)
+    let hkdf_expand = Hkdf::<Sha512>::expand(&hkdf_extract, None, 0);
+    assert_eq!(
+        hkdf_expand.unwrap_err(),
+        HkdfError::InvalidOutputLengthError
+    );
+}
+
+#[test]
+fn unsupported_digest() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("src/unit_tests/compilation/small_kdf.rs");
+}
+
+#[test]
+fn test_ikm_size() {
+    // Test for 16 bytes seed.
+    let ikm16 = [0u8; 16];
+    assert!(Hkdf::<Sha256>::extract(None, &ikm16).is_ok());
+
+    // Test for 32 bytes seed.
+    let ikm32 = [0u8; 32];
+    assert!(Hkdf::<Sha256>::extract(None, &ikm32).is_ok());
+
+    // Test for 15 bytes seed.
+    let ikm15 = [0u8; 15];
+    assert_eq!(
+        Hkdf::<Sha256>::extract(None, &ikm15),
+        Err(HkdfError::InvalidSeedLengthError)
+    );
+
+    // Test for empty seed.
+    let ikm0 = [];
+    assert_eq!(
+        Hkdf::<Sha256>::extract(None, &ikm0),
+        Err(HkdfError::InvalidSeedLengthError)
+    );
+}
+
+// Test Vectors for sha256 from https://tools.ietf.org/html/rfc5869.
+struct Test<'a> {
+    ikm: &'a str,
+    salt: &'a str,
+    info: &'a str,
+    length: usize,
+    prk: &'a str,
+    okm: &'a str,
+}
+
+fn test_vectors_sha256<'a>() -> Vec<Test<'a>> {
+    vec![
+        Test {
+            // Test Case 1
+            ikm: "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+            salt: "000102030405060708090a0b0c",
+            info: "f0f1f2f3f4f5f6f7f8f9",
+            length: 42,
+            prk: "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5",
+            okm: "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b8\
+                  87185865",
+        },
+        Test {
+            // Test Case 2
+            ikm: "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425\
+                  262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b\
+                  4c4d4e4f",
+            salt: "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f80818283848\
+                   5868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aa\
+                   abacadaeaf",
+            info: "b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d\
+                   5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fa\
+                   fbfcfdfeff",
+            length: 82,
+            prk: "06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244",
+            okm: "b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7\
+                  827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5\
+                  c1f3434f1d87",
+        },
+        Test {
+            // Test Case 3
+            ikm: "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+            salt: "",
+            info: "",
+            length: 42,
+            prk: "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04",
+            okm: "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4\
+                  b61a96c8",
+        },
+    ]
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/mod.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/mod.rs
new file mode 100644
index 000000000..ea4aebd1d
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/mod.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod bcs_test;
+mod compat_test;
+mod cross_test;
+mod cryptohasher;
+mod ed25519_test;
+mod hash_test;
+mod hkdf_test;
+mod multi_ed25519_test;
+mod noise_test;
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/multi_ed25519_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/multi_ed25519_test.rs
new file mode 100644
index 000000000..e0aafd4e1
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/multi_ed25519_test.rs
@@ -0,0 +1,472 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    ed25519::{Ed25519PrivateKey, Ed25519PublicKey, ED25519_PUBLIC_KEY_LENGTH},
+    multi_ed25519::{MultiEd25519PrivateKey, MultiEd25519PublicKey, MultiEd25519Signature},
+    test_utils::{TestDiemCrypto, TEST_SEED},
+    traits::*,
+    CryptoMaterialError::{ValidationError, WrongLengthError},
+};
+use core::convert::TryFrom;
+use once_cell::sync::Lazy;
+use rand::{rngs::StdRng, SeedableRng};
+
+static MESSAGE: Lazy<TestDiemCrypto> = Lazy::new(|| TestDiemCrypto("Test Message".to_string()));
+fn message() -> &'static TestDiemCrypto {
+    &MESSAGE
+}
+
+// Helper function to generate N ed25519 private keys.
+fn generate_keys(n: usize) -> Vec<Ed25519PrivateKey> {
+    let mut rng = StdRng::from_seed(TEST_SEED);
+    (0..n)
+        .map(|_| Ed25519PrivateKey::generate(&mut rng))
+        .collect()
+}
+
+// Reused assertions in our tests.
+fn test_successful_public_key_serialization(original_keys: &[Ed25519PublicKey], threshold: u8) {
+    let n = original_keys.len();
+    let public_key: MultiEd25519PublicKey =
+        MultiEd25519PublicKey::new(original_keys.to_vec(), threshold).unwrap();
+    assert_eq!(public_key.threshold(), &threshold);
+    assert_eq!(public_key.public_keys().len(), n);
+    assert_eq!(public_key.public_keys(), &original_keys.to_vec());
+    let serialized = public_key.to_bytes();
+    assert_eq!(serialized.len(), n * ED25519_PUBLIC_KEY_LENGTH + 1);
+    let reserialized = MultiEd25519PublicKey::try_from(&serialized[..]);
+    assert!(reserialized.is_ok());
+    assert_eq!(public_key, reserialized.unwrap());
+}
+
+fn test_failed_public_key_serialization(
+    result: std::result::Result<MultiEd25519PublicKey, CryptoMaterialError>,
+    expected_error: CryptoMaterialError,
+) {
+    assert!(result.is_err());
+    assert_eq!(result.err().unwrap(), expected_error);
+}
+
+fn test_successful_signature_serialization(private_keys: &[Ed25519PrivateKey], threshold: u8) {
+    let multi_private_key = MultiEd25519PrivateKey::new(private_keys.to_vec(), threshold).unwrap();
+    let multi_public_key = MultiEd25519PublicKey::from(&multi_private_key);
+    let multi_signature = multi_private_key.sign(message());
+
+    // Serialize then Deserialize.
+    let multi_signature_serialized =
+        MultiEd25519Signature::try_from(&multi_signature.to_bytes()[..]);
+    assert!(multi_signature_serialized.is_ok());
+    let multi_signature_serialized_unwrapped = multi_signature_serialized.unwrap();
+    assert_eq!(multi_signature, multi_signature_serialized_unwrapped);
+    // Ensure that the signature verifies.
+    assert!(multi_signature.verify(message(), &multi_public_key).is_ok());
+}
+
+// Test multi-sig Ed25519 public key serialization.
+#[test]
+fn test_multi_ed25519_public_key_serialization() {
+    let pub_keys_1: Vec<_> = generate_keys(1).iter().map(|x| x.public_key()).collect();
+    let pub_keys_10: Vec<_> = generate_keys(10).iter().map(|x| x.public_key()).collect();
+    let pub_keys_32: Vec<_> = generate_keys(32).iter().map(|x| x.public_key()).collect();
+    let pub_keys_33: Vec<_> = generate_keys(33).iter().map(|x| x.public_key()).collect();
+
+    // Test 1-of-1
+    test_successful_public_key_serialization(&pub_keys_1, 1);
+    // Test 1-of-10
+    test_successful_public_key_serialization(&pub_keys_10, 1);
+    // Test 7-of-10
+    test_successful_public_key_serialization(&pub_keys_10, 7);
+    // Test 10-of-10
+    test_successful_public_key_serialization(&pub_keys_10, 10);
+    // Test 2-of-32
+    test_successful_public_key_serialization(&pub_keys_32, 2);
+    // Test 32-of-32
+    test_successful_public_key_serialization(&pub_keys_32, 32);
+
+    // Test 11-of-10 (should fail).
+    let multi_key_11of10 = MultiEd25519PublicKey::new(pub_keys_10.clone(), 11);
+    test_failed_public_key_serialization(multi_key_11of10, ValidationError);
+
+    // Test 0-of-10 (should fail).
+    let multi_key_0of10 = MultiEd25519PublicKey::new(pub_keys_10, 0);
+    test_failed_public_key_serialization(multi_key_0of10, ValidationError);
+
+    // Test 1-of-33 (should fail).
+    let multi_key_1of33 = MultiEd25519PublicKey::new(pub_keys_33, 1);
+    test_failed_public_key_serialization(multi_key_1of33, WrongLengthError);
+
+    // Test try_from empty bytes (should fail).
+    let multi_key_empty_bytes = MultiEd25519PublicKey::try_from(&[] as &[u8]);
+    test_failed_public_key_serialization(multi_key_empty_bytes, WrongLengthError);
+
+    // Test try_from 1 byte (should fail).
+    let multi_key_1_byte = MultiEd25519PublicKey::try_from(&[0u8][..]);
+    test_failed_public_key_serialization(multi_key_1_byte, WrongLengthError);
+
+    // Test try_from 31 bytes (should fail).
+    let multi_key_31_bytes =
+        MultiEd25519PublicKey::try_from(&[0u8; ED25519_PUBLIC_KEY_LENGTH - 1][..]);
+    test_failed_public_key_serialization(multi_key_31_bytes, WrongLengthError);
+
+    // Test try_from 32 bytes (should fail) because we always need ED25519_PUBLIC_KEY_LENGTH * N + 1
+    // bytes (thus 32N + 1).
+    let multi_key_32_bytes = MultiEd25519PublicKey::try_from(&[0u8; ED25519_PUBLIC_KEY_LENGTH][..]);
+    test_failed_public_key_serialization(multi_key_32_bytes, WrongLengthError);
+
+    // Test try_from 34 bytes (should fail).
+    let multi_key_34_bytes =
+        MultiEd25519PublicKey::try_from(&[0u8; ED25519_PUBLIC_KEY_LENGTH + 2][..]);
+    test_failed_public_key_serialization(multi_key_34_bytes, WrongLengthError);
+
+    // Test try_from 33 all zero bytes (size is fine, but it should fail due to
+    // validation issues).
+    let multi_key_33_zero_bytes =
+        MultiEd25519PublicKey::try_from(&[0u8; ED25519_PUBLIC_KEY_LENGTH + 1][..]);
+    test_failed_public_key_serialization(multi_key_33_zero_bytes, ValidationError);
+
+    let priv_keys_10 = generate_keys(10);
+    let pub_keys_10: Vec<_> = priv_keys_10.iter().map(|x| x.public_key()).collect();
+
+    let multi_private_key_7of10 = MultiEd25519PrivateKey::new(priv_keys_10, 7).unwrap();
+    let multi_public_key_7of10 = MultiEd25519PublicKey::new(pub_keys_10, 7).unwrap();
+
+    // Check that MultiEd25519PublicKey::from MultiEd25519PrivateKey works as expected.
+    let multi_public_key_7of10_from_multi_private_key =
+        MultiEd25519PublicKey::from(&multi_private_key_7of10);
+    assert_eq!(
+        multi_public_key_7of10_from_multi_private_key,
+        multi_public_key_7of10
+    );
+
+    // Check that MultiEd25519PublicKey::from Ed25519PublicKey works as expected.
+    let multi_public_key_from_ed25519 = MultiEd25519PublicKey::from(
+        multi_public_key_7of10_from_multi_private_key.public_keys()[0].clone(),
+    );
+    assert_eq!(multi_public_key_from_ed25519.public_keys().len(), 1);
+    assert_eq!(
+        &multi_public_key_from_ed25519.public_keys()[0],
+        &multi_public_key_7of10_from_multi_private_key.public_keys()[0]
+    );
+    assert_eq!(multi_public_key_from_ed25519.threshold(), &1u8);
+}
+
+// Test against known small subgroup public key.
+#[test]
+fn test_publickey_smallorder() {
+    // A small group point with threshold 1 (last byte).
+    // See EIGHT_TORSION in ed25519_test.rs for more about small group points.
+    let torsion_point_with_threshold_1: [u8; 33] = [
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 1,
+    ];
+
+    let torsion_key = MultiEd25519PublicKey::try_from(&torsion_point_with_threshold_1[..]);
+    assert!(torsion_key.is_err());
+    assert_eq!(
+        torsion_key.err().unwrap(),
+        CryptoMaterialError::SmallSubgroupError
+    );
+}
+
+// Test multi-sig Ed25519 signature serialization.
+#[test]
+#[allow(clippy::needless_collect)]
+fn test_multi_ed25519_signature_serialization() {
+    let priv_keys_3 = generate_keys(3);
+
+    // Test 1 of 3
+    test_successful_signature_serialization(&priv_keys_3, 1);
+    // Test 2 of 3
+    test_successful_signature_serialization(&priv_keys_3, 2);
+    // Test 3 of 3
+    test_successful_signature_serialization(&priv_keys_3, 3);
+
+    let priv_keys_32 = generate_keys(32);
+    // Test 1 of 32
+    test_successful_signature_serialization(&priv_keys_32, 1);
+    // Test 32 of 32
+    test_successful_signature_serialization(&priv_keys_32, 32);
+
+    // Construct from single Ed25519Signature.
+    let single_signature = priv_keys_3[0].sign(message());
+    let multi_signature = MultiEd25519Signature::from(single_signature.clone());
+    assert_eq!(1, multi_signature.signatures().len());
+    assert_eq!(multi_signature.signatures()[0], single_signature);
+    assert_eq!(multi_signature.bitmap(), &[0b1000_0000u8, 0u8, 0u8, 0u8]);
+    let multi_priv_key_1of3 = MultiEd25519PrivateKey::new(priv_keys_3.to_vec(), 1).unwrap();
+    let multi_pub_key_1of3 = MultiEd25519PublicKey::from(&multi_priv_key_1of3);
+    assert!(multi_signature
+        .verify(message(), &multi_pub_key_1of3)
+        .is_ok());
+
+    // We can construct signatures from 32 single signatures.
+    let sigs_32 = vec![single_signature.clone(); 32];
+    let indices: Vec<u8> = (0..32).collect();
+    let sig32_tuple = sigs_32.into_iter().zip(indices.into_iter()).collect();
+
+    let multi_sig32 = MultiEd25519Signature::new(sig32_tuple);
+    assert!(multi_sig32.is_ok());
+    let multi_sig32_unwrapped = multi_sig32.unwrap();
+    assert_eq!(multi_sig32_unwrapped.bitmap(), &[
+        0b1111_1111,
+        0b1111_1111,
+        0b1111_1111,
+        0b1111_1111
+    ]);
+    let pub_key_32 = vec![priv_keys_3[0].public_key(); 32];
+    let multi_pub_key_32 = MultiEd25519PublicKey::new(pub_key_32, 32).unwrap();
+    assert!(multi_sig32_unwrapped
+        .verify(message(), &multi_pub_key_32)
+        .is_ok());
+
+    // Fail to construct a MultiEd25519Signature object from 33 or more single signatures.
+    let sigs_33 = vec![single_signature.clone(); 33];
+    let indices: Vec<u8> = (0..33).collect();
+    let sig33_tuple = sigs_33.into_iter().zip(indices.into_iter()).collect();
+
+    let multi_sig33 = MultiEd25519Signature::new(sig33_tuple);
+    assert!(multi_sig33.is_err());
+    assert_eq!(
+        multi_sig33.err().unwrap(),
+        CryptoMaterialError::ValidationError
+    );
+
+    // Fail to construct a MultiEd25519Signature object if there are duplicated indexes.
+    let sigs_3 = vec![single_signature; 3];
+    let indices_with_duplicate = vec![0u8, 1u8, 1u8];
+    let sig3_tuple = sigs_3
+        .clone()
+        .into_iter()
+        .zip(indices_with_duplicate.into_iter())
+        .collect();
+
+    let multi_sig3 = MultiEd25519Signature::new(sig3_tuple);
+    assert!(multi_sig3.is_err());
+    assert_eq!(
+        multi_sig3.err().unwrap(),
+        CryptoMaterialError::BitVecError("Duplicate signature index".to_string())
+    );
+
+    // Fail to construct a MultiEd25519Signature object if an index is out of range.
+    let indices_with_out_of_range = vec![0u8, 33u8, 1u8];
+    let sig3_tuple = sigs_3
+        .into_iter()
+        .zip(indices_with_out_of_range.into_iter())
+        .collect();
+
+    let multi_sig3 = MultiEd25519Signature::new(sig3_tuple);
+    assert!(multi_sig3.is_err());
+    assert_eq!(
+        multi_sig3.err().unwrap(),
+        CryptoMaterialError::BitVecError("Signature index is out of range".to_string())
+    );
+}
+
+// Test multi-sig Ed25519 signature verification.
+#[test]
+fn test_multi_ed25519_signature_verification() {
+    let priv_keys_10 = generate_keys(10);
+    let pub_keys_10: Vec<_> = priv_keys_10.iter().map(|x| x.public_key()).collect();
+
+    let multi_private_key_7of10 = MultiEd25519PrivateKey::new(priv_keys_10.clone(), 7).unwrap();
+    let multi_public_key_7of10 = MultiEd25519PublicKey::from(&multi_private_key_7of10);
+
+    // Verifying a 7-of-10 signature against a public key with the same threshold should pass.
+    let multi_signature_7of10 = multi_private_key_7of10.sign(message());
+    assert_eq!(multi_signature_7of10.bitmap(), &[
+        0b1111_1110,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(multi_signature_7of10
+        .verify(message(), &multi_public_key_7of10)
+        .is_ok());
+
+    // Verifying a 7-of-10 signature against a public key with bigger threshold (i.e., 8) should fail.
+    let multi_public_key_8of10 = MultiEd25519PublicKey::new(pub_keys_10.clone(), 8).unwrap();
+    assert!(multi_signature_7of10
+        .verify(message(), &multi_public_key_8of10)
+        .is_err());
+
+    // Verifying a 7-of-10 signature against a public key with smaller threshold (i.e., 6) should pass.
+    let multi_public_key_6of10 = MultiEd25519PublicKey::new(pub_keys_10.clone(), 6).unwrap();
+    assert!(multi_signature_7of10
+        .verify(message(), &multi_public_key_6of10)
+        .is_ok());
+
+    // Verifying a 7-of-10 signature against a reordered MultiEd25519PublicKey should fail.
+    // To deterministically simulate reshuffling, we use a reversed vector of 10 keys.
+    // Note that because 10 is an even number, all of they keys will change position.
+    let mut pub_keys_10_reversed = pub_keys_10;
+    pub_keys_10_reversed.reverse();
+    let multi_public_key_7of10_reversed =
+        MultiEd25519PublicKey::new(pub_keys_10_reversed, 7).unwrap();
+    assert!(multi_signature_7of10
+        .verify(message(), &multi_public_key_7of10_reversed)
+        .is_err());
+
+    let priv_keys_3 = generate_keys(3);
+
+    let multi_private_key_1of3 = MultiEd25519PrivateKey::new(priv_keys_3.clone(), 1).unwrap();
+    let multi_public_key_1of3 = MultiEd25519PublicKey::from(&multi_private_key_1of3);
+
+    // Signing with the 2nd key must succeed.
+    let sig_with_2nd_key = priv_keys_3[1].sign(message());
+    let multi_sig_signed_by_2nd_key = MultiEd25519Signature::new(vec![(sig_with_2nd_key, 1)]);
+    assert!(multi_sig_signed_by_2nd_key.is_ok());
+    let multi_sig_signed_by_2nd_key_unwrapped = multi_sig_signed_by_2nd_key.unwrap();
+    assert_eq!(multi_sig_signed_by_2nd_key_unwrapped.bitmap(), &[
+        0b0100_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(multi_sig_signed_by_2nd_key_unwrapped
+        .verify(message(), &multi_public_key_1of3)
+        .is_ok());
+
+    // Signing with the 2nd key but using wrong index will fail.
+    let sig_with_2nd_key = priv_keys_3[1].sign(message());
+    let multi_sig_signed_by_2nd_key_wrong_index =
+        MultiEd25519Signature::new(vec![(sig_with_2nd_key.clone(), 2)]);
+    assert!(multi_sig_signed_by_2nd_key_wrong_index.is_ok());
+    let failed_multi_sig_signed_by_2nd_key_wrong_index = multi_sig_signed_by_2nd_key_wrong_index
+        .unwrap()
+        .verify(message(), &multi_public_key_1of3);
+    assert!(failed_multi_sig_signed_by_2nd_key_wrong_index.is_err());
+
+    // Signing with the 2nd and 3rd keys must succeed, even if we surpass the threshold.
+    let sig_with_3rd_key = priv_keys_3[2].sign(message());
+    let multi_sig_signed_by_2nd_and_3rd_key = MultiEd25519Signature::new(vec![
+        (sig_with_2nd_key.clone(), 1),
+        (sig_with_3rd_key.clone(), 2),
+    ]);
+    assert!(multi_sig_signed_by_2nd_and_3rd_key.is_ok());
+    let multi_sig_signed_by_2nd_and_3rd_key_unwrapped =
+        multi_sig_signed_by_2nd_and_3rd_key.unwrap();
+    assert_eq!(multi_sig_signed_by_2nd_and_3rd_key_unwrapped.bitmap(), &[
+        0b0110_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(multi_sig_signed_by_2nd_and_3rd_key_unwrapped
+        .verify(message(), &multi_public_key_1of3)
+        .is_ok());
+
+    // Signing with the 2nd and 3rd keys will fail if we swap indexes.
+    let multi_sig_signed_by_2nd_and_3rd_key_swapped = MultiEd25519Signature::new(vec![
+        (sig_with_2nd_key.clone(), 2),
+        (sig_with_3rd_key.clone(), 1),
+    ]);
+    let failed_multi_sig_signed_by_2nd_and_3rd_key_swapped =
+        multi_sig_signed_by_2nd_and_3rd_key_swapped
+            .unwrap()
+            .verify(message(), &multi_public_key_1of3);
+    assert!(failed_multi_sig_signed_by_2nd_and_3rd_key_swapped.is_err());
+
+    // Signing with the 2nd and an unrelated key. Although threshold is met, it should fail as
+    // we don't accept invalid signatures.
+    let sig_with_unrelated_key = priv_keys_10[9].sign(message());
+    let multi_sig_signed_by_2nd_and_unrelated_key = MultiEd25519Signature::new(vec![
+        (sig_with_2nd_key.clone(), 1),
+        (sig_with_unrelated_key, 2),
+    ]);
+    assert!(multi_sig_signed_by_2nd_and_unrelated_key.is_ok());
+    let failed_verified_sig = multi_sig_signed_by_2nd_and_unrelated_key
+        .unwrap()
+        .verify(message(), &multi_public_key_1of3);
+    assert!(failed_verified_sig.is_err());
+
+    // Testing all combinations for 2 of 3.
+    let multi_private_key_2of3 = MultiEd25519PrivateKey::new(priv_keys_3.clone(), 2).unwrap();
+    let multi_public_key_2of3 = MultiEd25519PublicKey::from(&multi_private_key_2of3);
+
+    let sig_with_1st_key = priv_keys_3[0].sign(message());
+
+    // Signing with the 1st and 2nd keys must succeed.
+    let signed_by_1st_and_2nd_key = MultiEd25519Signature::new(vec![
+        (sig_with_1st_key.clone(), 0),
+        (sig_with_2nd_key.clone(), 1),
+    ]);
+    assert!(signed_by_1st_and_2nd_key.is_ok());
+    let signed_by_1st_and_2nd_key_unwrapped = signed_by_1st_and_2nd_key.unwrap();
+    assert_eq!(signed_by_1st_and_2nd_key_unwrapped.bitmap(), &[
+        0b1100_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(signed_by_1st_and_2nd_key_unwrapped
+        .verify(message(), &multi_public_key_2of3)
+        .is_ok());
+
+    // Signing with the 1st and 3rd keys must succeed.
+    let signed_by_1st_and_3rd_key = MultiEd25519Signature::new(vec![
+        (sig_with_1st_key.clone(), 0),
+        (sig_with_3rd_key.clone(), 2),
+    ]);
+    assert!(signed_by_1st_and_3rd_key.is_ok());
+    let signed_by_1st_and_3rd_key_unwrapped = signed_by_1st_and_3rd_key.unwrap();
+    assert_eq!(signed_by_1st_and_3rd_key_unwrapped.bitmap(), &[
+        0b1010_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(signed_by_1st_and_3rd_key_unwrapped
+        .verify(message(), &multi_public_key_2of3)
+        .is_ok());
+
+    // Signing with the 2nd and 3rd keys must succeed.
+    let signed_by_2nd_and_3rd_key = MultiEd25519Signature::new(vec![
+        (sig_with_2nd_key.clone(), 1),
+        (sig_with_3rd_key.clone(), 2),
+    ]);
+    assert!(signed_by_2nd_and_3rd_key.is_ok());
+    let signed_by_2nd_and_3rd_key_unwrapped = signed_by_2nd_and_3rd_key.unwrap();
+    assert_eq!(signed_by_2nd_and_3rd_key_unwrapped.bitmap(), &[
+        0b0110_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(signed_by_2nd_and_3rd_key_unwrapped
+        .verify(message(), &multi_public_key_2of3)
+        .is_ok());
+
+    // Signing with the 2nd and 3rd keys must succeed.
+    let signed_by_all_3_keys = MultiEd25519Signature::new(vec![
+        (sig_with_1st_key, 0),
+        (sig_with_2nd_key.clone(), 1),
+        (sig_with_3rd_key, 2),
+    ]);
+    assert!(signed_by_all_3_keys.is_ok());
+    let signed_by_all_3_keys_unwrapped = signed_by_all_3_keys.unwrap();
+    assert_eq!(signed_by_all_3_keys_unwrapped.bitmap(), &[
+        0b1110_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(signed_by_all_3_keys_unwrapped
+        .verify(message(), &multi_public_key_2of3)
+        .is_ok());
+
+    // Signing with the 2nd only will fail.
+    let signed_by_2nd_key = MultiEd25519Signature::new(vec![(sig_with_2nd_key, 1)]);
+    assert!(signed_by_2nd_key.is_ok());
+    let signed_by_2nd_key_unwrapped = signed_by_2nd_key.unwrap();
+    assert_eq!(signed_by_2nd_key_unwrapped.bitmap(), &[
+        0b0100_0000,
+        0u8,
+        0u8,
+        0u8
+    ]);
+    assert!(signed_by_2nd_key_unwrapped
+        .verify(message(), &multi_public_key_2of3)
+        .is_err());
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/noise_test.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/noise_test.rs
new file mode 100644
index 000000000..19b954e8d
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/unit_tests/noise_test.rs
@@ -0,0 +1,533 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    noise::{handshake_init_msg_len, handshake_resp_msg_len, NoiseConfig, MAX_SIZE_NOISE_MSG},
+    test_utils::TEST_SEED,
+    x25519, Uniform as _,
+};
+use rand::SeedableRng;
+use serde::*;
+use std::{fs::File, io::BufReader, path::PathBuf};
+
+#[test]
+fn simple_handshake() {
+    // setup peers
+    let mut rng = ::rand::rngs::StdRng::from_seed(TEST_SEED);
+    let initiator_private = x25519::PrivateKey::generate(&mut rng);
+    let initiator_public = initiator_private.public_key();
+    let responder_private = x25519::PrivateKey::generate(&mut rng);
+    let responder_public = responder_private.public_key();
+    let initiator = NoiseConfig::new(initiator_private);
+    let responder = NoiseConfig::new(responder_private);
+
+    // test the two APIs
+    for i in 0..2 {
+        // initiator sends first message
+        let prologue = b"prologue";
+        let payload1 = b"payload1";
+        let mut first_message = vec![0u8; handshake_init_msg_len(payload1.len())];
+        let initiator_state = initiator
+            .initiate_connection(
+                &mut rng,
+                prologue,
+                responder_public,
+                Some(payload1),
+                &mut first_message,
+            )
+            .unwrap();
+
+        let payload2 = b"payload2";
+        let mut second_message = vec![0u8; handshake_resp_msg_len(payload2.len())];
+
+        // responder parses the first message and responds
+        let mut responder_session = if i == 0 {
+            let (received_payload, responder_session) = responder
+                .respond_to_client_and_finalize(
+                    &mut rng,
+                    prologue,
+                    &first_message,
+                    Some(payload2),
+                    &mut second_message,
+                )
+                .unwrap();
+            let remote_static = responder_session.get_remote_static();
+            assert_eq!(remote_static, initiator_public);
+            assert_eq!(received_payload, b"payload1");
+            responder_session
+        } else {
+            let payload2 = b"payload2";
+            let (remote_static, handshake_state, received_payload) = responder
+                .parse_client_init_message(prologue, &first_message)
+                .unwrap();
+            assert_eq!(remote_static, initiator_public);
+            assert_eq!(received_payload, b"payload1");
+
+            responder
+                .respond_to_client(
+                    &mut rng,
+                    handshake_state,
+                    Some(payload2),
+                    &mut second_message,
+                )
+                .unwrap()
+        };
+
+        // initiator parses the response
+        let (received_payload, mut initiator_session) = initiator
+            .finalize_connection(initiator_state, &second_message)
+            .unwrap();
+        assert_eq!(received_payload, b"payload2");
+
+        // session usage
+        let mut message_sent = b"payload".to_vec();
+        for i in 0..10 {
+            message_sent.push(i);
+            let mut message = message_sent.clone();
+            let received_message = if i % 2 == 0 {
+                let auth_tag = initiator_session
+                    .write_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                message.extend_from_slice(&auth_tag);
+                responder_session
+                    .read_message_in_place(&mut message)
+                    .expect("session should not be closed")
+            } else {
+                let auth_tag = responder_session
+                    .write_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                message.extend_from_slice(&auth_tag);
+                initiator_session
+                    .read_message_in_place(&mut message)
+                    .expect("session should not be closed")
+            };
+            assert_eq!(received_message, message_sent.as_slice());
+        }
+    }
+}
+
+#[test]
+fn test_vectors() {
+    // structures needed to deserialize test vectors
+    #[derive(Serialize, Deserialize)]
+    struct TestVectors {
+        vectors: Vec<TestVector>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    struct TestVector {
+        protocol_name: String,
+        init_prologue: String,
+        init_static: Option<String>,
+        init_ephemeral: String,
+        init_remote_static: Option<String>,
+        resp_static: Option<String>,
+        resp_ephemeral: Option<String>,
+        handshake_hash: String,
+        messages: Vec<TestMessage>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    struct TestMessage {
+        payload: String,
+        ciphertext: String,
+    }
+
+    // EphemeralRng is used to get deterministic ephemeral keys based on test vectors
+    struct EphemeralRng {
+        ephemeral: Vec<u8>,
+    }
+    impl rand::RngCore for EphemeralRng {
+        fn next_u32(&mut self) -> u32 {
+            unreachable!()
+        }
+
+        fn next_u64(&mut self) -> u64 {
+            unreachable!()
+        }
+
+        fn fill_bytes(&mut self, dest: &mut [u8]) {
+            dest.copy_from_slice(&self.ephemeral);
+        }
+
+        fn try_fill_bytes(&mut self, _dest: &mut [u8]) -> Result<(), rand::Error> {
+            unreachable!()
+        }
+    }
+    impl rand::CryptoRng for EphemeralRng {}
+
+    // test vectors are taken from the cacophony library
+    let mut test_vectors_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    test_vectors_path.push("test_vectors");
+    test_vectors_path.push("noise_cacophony.txt");
+    let test_vectors_path = test_vectors_path.to_str().unwrap();
+    let test_vectors_file = File::open(test_vectors_path).expect("missing noise test vectors");
+    let test_vectors: TestVectors =
+        serde_json::from_reader(BufReader::new(test_vectors_file)).unwrap();
+
+    // only go through Noise_IK_25519_AESGCM_SHA256 test vectors (don't exist for SHA-3)
+    let test_vector = test_vectors
+        .vectors
+        .iter()
+        .find(|vector| vector.protocol_name == "Noise_IK_25519_AESGCM_SHA256")
+        .expect("test vector for Noise_IK_25519_AESGCM_SHA256 should be in cacophony test vectors");
+
+    // initiate peers with test vector
+    use crate::traits::ValidCryptoMaterialStringExt;
+    let initiator_private =
+        x25519::PrivateKey::from_encoded_string(test_vector.init_static.as_ref().unwrap()).unwrap();
+    let initiator_public = initiator_private.public_key();
+    let responder_private =
+        x25519::PrivateKey::from_encoded_string(test_vector.resp_static.as_ref().unwrap()).unwrap();
+    let responder_public = responder_private.public_key();
+
+    let initiator = NoiseConfig::new(initiator_private);
+    let responder = NoiseConfig::new(responder_private);
+
+    // test the two APIs
+    for i in 0..2 {
+        // assert public keys
+        let init_remote_static =
+            hex::decode(test_vector.init_remote_static.as_ref().unwrap()).unwrap();
+        assert_eq!(responder_public.as_slice(), init_remote_static.as_slice());
+
+        // go through handshake test messages
+        let prologue = hex::decode(&test_vector.init_prologue).unwrap();
+        let mut messages = test_vector.messages.iter();
+
+        // first handshake message
+        let message = messages.next().unwrap();
+        let payload1 = hex::decode(&message.payload).unwrap();
+        let expected_ciphertext = hex::decode(&message.ciphertext).unwrap();
+        let init_ephemeral = hex::decode(&test_vector.init_ephemeral).unwrap();
+        let mut rng = EphemeralRng {
+            ephemeral: init_ephemeral,
+        };
+        let mut first_message = vec![0u8; handshake_init_msg_len(payload1.len())];
+        let initiator_state = initiator
+            .initiate_connection(
+                &mut rng,
+                &prologue,
+                responder_public,
+                Some(&payload1),
+                &mut first_message,
+            )
+            .unwrap();
+        assert_eq!(first_message, expected_ciphertext);
+
+        // second handshake message
+        let message = messages.next().unwrap();
+        let payload2 = hex::decode(&message.payload).unwrap();
+        let expected_ciphertext = hex::decode(&message.ciphertext).unwrap();
+
+        // responder part
+        let resp_ephemeral = hex::decode(test_vector.resp_ephemeral.as_ref().unwrap()).unwrap();
+        let mut rng = EphemeralRng {
+            ephemeral: resp_ephemeral,
+        };
+        let mut second_message = vec![0u8; handshake_resp_msg_len(payload2.len())];
+
+        let mut responder_session = if i == 0 {
+            let (received_payload, responder_session) = responder
+                .respond_to_client_and_finalize(
+                    &mut rng,
+                    &prologue,
+                    &first_message,
+                    Some(&payload2),
+                    &mut second_message,
+                )
+                .unwrap();
+            assert_eq!(payload1, received_payload);
+            responder_session
+        } else {
+            let (remote_static, handshake_state, received_payload) = responder
+                .parse_client_init_message(&prologue, &first_message)
+                .unwrap();
+            assert_eq!(remote_static, initiator_public);
+            assert_eq!(payload1, received_payload);
+
+            responder
+                .respond_to_client(
+                    &mut rng,
+                    handshake_state,
+                    Some(&payload2),
+                    &mut second_message,
+                )
+                .unwrap()
+        };
+
+        let remote_static = responder_session.get_remote_static();
+        assert_eq!(second_message, expected_ciphertext);
+        assert_eq!(remote_static, initiator_public);
+
+        // initiator part
+        let (received_payload, mut initiator_session) = initiator
+            .finalize_connection(initiator_state, &second_message)
+            .unwrap();
+        assert_eq!(payload2, received_payload);
+
+        // post-handshake messages
+        let mut client_turn = true;
+        for message in messages {
+            // decode
+            let payload = hex::decode(&message.payload).unwrap();
+            let expected_ciphertext = hex::decode(&message.ciphertext).unwrap();
+
+            // initiator and responder takes turn to send messages
+            let mut message = payload.clone();
+            if client_turn {
+                let auth_tag = initiator_session
+                    .write_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                message.extend_from_slice(&auth_tag);
+                assert_eq!(message, expected_ciphertext);
+
+                let received_payload = responder_session
+                    .read_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                assert_eq!(payload, received_payload);
+            } else {
+                let auth_tag = responder_session
+                    .write_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                message.extend_from_slice(&auth_tag);
+                assert_eq!(message, expected_ciphertext);
+
+                let received_payload = initiator_session
+                    .read_message_in_place(&mut message)
+                    .expect("session should not be closed");
+                assert_eq!(payload, received_payload);
+            }
+
+            // swap sender
+            client_turn = !client_turn;
+        }
+    }
+}
+
+// Negative tests
+// --------------
+//
+// things that should fail during the handshake:
+// - buffer to write is too small (should fail)
+// - message received is too small (should fail)
+// - message received is too big (should fail)
+// - message received is larger than max noise size (should fail)
+// - payload to write is larger than max noise size (should fail)
+//
+// things that should work during the handshake:
+// - buffer to write is too big
+//
+
+#[test]
+fn wrong_buffer_sizes() {
+    // setup peers
+    let mut rng = ::rand::rngs::StdRng::from_seed(TEST_SEED);
+    let initiator_private = x25519::PrivateKey::generate(&mut rng);
+    let responder_private = x25519::PrivateKey::generate(&mut rng);
+    let responder_public = responder_private.public_key();
+    let initiator = NoiseConfig::new(initiator_private);
+    let responder = NoiseConfig::new(responder_private);
+
+    // test the two APIs
+    for i in 0..2 {
+        // initiator sends first message with buffer too small (should fail)
+        let payload = b"payload";
+        let mut first_message_bad = vec![0u8; handshake_init_msg_len(payload.len()) - 1];
+        let res = initiator.initiate_connection(
+            &mut rng,
+            b"",
+            responder_public,
+            Some(payload),
+            &mut first_message_bad,
+        );
+
+        assert!(matches!(res, Err(_)));
+
+        // try again with payload too large (should fail)
+        let mut large_buffer = vec![0u8; MAX_SIZE_NOISE_MSG + 3];
+        let payload_too_large = vec![1u8; MAX_SIZE_NOISE_MSG - handshake_init_msg_len(0) + 1];
+        let res = initiator.initiate_connection(
+            &mut rng,
+            b"",
+            responder_public,
+            Some(&payload_too_large),
+            &mut large_buffer,
+        );
+
+        assert!(matches!(res, Err(_)));
+
+        // try again with buffer too large (should work)
+        let mut first_message_good = vec![0u8; handshake_init_msg_len(payload.len()) + 1];
+        let initiator_state = initiator
+            .initiate_connection(
+                &mut rng,
+                b"",
+                responder_public,
+                Some(payload),
+                &mut first_message_good,
+            )
+            .unwrap();
+
+        // responder parses the first message and responds
+        let mut second_message_small = vec![0u8; handshake_resp_msg_len(payload.len()) - 1];
+        let mut second_message_large = vec![0u8; handshake_resp_msg_len(payload.len()) + 1];
+
+        let (mut responder_session, second_message_large) = if i == 0 {
+            // with buffer too small (shouldn't work)
+            let res = responder.respond_to_client_and_finalize(
+                &mut rng,
+                b"",
+                &first_message_good[..first_message_good.len() - 1],
+                Some(payload),
+                &mut second_message_small,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with first message too large (shouldn't work)
+            let res = responder.respond_to_client_and_finalize(
+                &mut rng,
+                b"",
+                &first_message_good,
+                Some(payload),
+                &mut second_message_large,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with incorrect prologue (should fail)
+            let res = responder.respond_to_client_and_finalize(
+                &mut rng,
+                b"incorrect prologue",
+                &first_message_good[..first_message_good.len() - 1],
+                Some(payload),
+                &mut second_message_large,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with payload too large (should fail)
+            let mut large_buffer = vec![0u8; MAX_SIZE_NOISE_MSG + 3];
+            let payload_too_large = vec![1u8; MAX_SIZE_NOISE_MSG - handshake_resp_msg_len(0) + 1];
+            let res = responder.respond_to_client_and_finalize(
+                &mut rng,
+                b"",
+                &first_message_good[..first_message_good.len() - 1],
+                Some(&payload_too_large),
+                &mut large_buffer,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with correct first message and buffer too large (should work)
+            let (_, responder_session) = responder
+                .respond_to_client_and_finalize(
+                    &mut rng,
+                    b"",
+                    &first_message_good[..first_message_good.len() - 1],
+                    Some(payload),
+                    &mut second_message_large,
+                )
+                .unwrap();
+
+            (responder_session, second_message_large)
+        } else {
+            // with first message too large
+            let res = responder.parse_client_init_message(b"", &first_message_good);
+
+            assert!(matches!(res, Err(_)));
+
+            // with first message too small
+            let res = responder.parse_client_init_message(
+                b"",
+                &first_message_good[..first_message_good.len() - 2],
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with wrong prologue
+            let res = responder.parse_client_init_message(
+                b"incorrect prologue",
+                &first_message_good[..first_message_good.len() - 1],
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with first message of correct length
+            let (_, handshake_state, _) = responder
+                .parse_client_init_message(b"", &first_message_good[..first_message_good.len() - 1])
+                .unwrap();
+
+            // write to buffer to small (should fail)
+            let res = responder.respond_to_client(
+                &mut rng,
+                handshake_state.clone(),
+                Some(payload),
+                &mut second_message_small,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // with payload too large (should fail)
+            let mut large_buffer = vec![0u8; MAX_SIZE_NOISE_MSG + 3];
+            let payload_too_large = vec![1u8; MAX_SIZE_NOISE_MSG - handshake_resp_msg_len(0) + 1];
+            let res = responder.respond_to_client(
+                &mut rng,
+                handshake_state.clone(),
+                Some(&payload_too_large),
+                &mut large_buffer,
+            );
+
+            assert!(matches!(res, Err(_)));
+
+            // write to buffer too big (should work)
+            let responder_session = responder
+                .respond_to_client(
+                    &mut rng,
+                    handshake_state,
+                    Some(payload),
+                    &mut second_message_large,
+                )
+                .unwrap();
+
+            (responder_session, second_message_large)
+        };
+
+        // initiator parses the response too large (should fail)
+        let res = initiator.finalize_connection(initiator_state.clone(), &second_message_large);
+
+        assert!(matches!(res, Err(_)));
+
+        // initiator parses the response too small (should fail)
+        let res = initiator.finalize_connection(
+            initiator_state.clone(),
+            &second_message_large[..second_message_large.len() - 2],
+        );
+
+        assert!(matches!(res, Err(_)));
+
+        // initiator parses response of correct size
+        let (_, mut initiator_session) = initiator
+            .finalize_connection(
+                initiator_state.clone(),
+                &second_message_large[..second_message_large.len() - 1],
+            )
+            .unwrap();
+
+        // session usage
+        let mut message = b"".to_vec();
+
+        let auth_tag = initiator_session
+            .write_message_in_place(&mut message)
+            .expect("should work");
+
+        // message too short to have auth tag
+        let res = responder_session.read_message_in_place(&mut message);
+        assert!(matches!(res, Err(_)));
+
+        // session should be unusable now
+        message.extend_from_slice(&auth_tag);
+        let res = responder_session.read_message_in_place(&mut message);
+        assert!(matches!(res, Err(_)));
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/validatable.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/validatable.rs
new file mode 100644
index 000000000..76d987b70
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/validatable.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides the `Validate` trait and `Validatable` type in order to aid in deferred
+//! validation.
+
+use anyhow::Result;
+use once_cell::sync::OnceCell;
+use serde::{Deserialize, Serialize};
+use std::{convert::TryFrom, hash::Hash};
+
+/// The `Validate` trait is used in tandem with the `Validatable` type in order to provide deferred
+/// validation for types.
+///
+/// ## Trait Contract
+///
+/// Any type `V` which implement this trait must adhere to the following contract:
+///
+/// * `V` and `V::Unvalidated` are byte-for-byte equivalent.
+/// * `V` and `V::Unvalidated` have equivalent `Hash` implementations.
+/// * `V` and `V::Unvalidated` must have equivalent `Serialize` and `Deserialize` implementation.
+///   This means that `V` and `V:Unvalidated` have equivalent serialized formats and that you can
+///   deserialize a `V::Unvalidated` from a `V` that was previously serialized.
+pub trait Validate: Sized {
+    /// The unvalidated form of some type `V`
+    type Unvalidated;
+
+    /// Attempt to validate a `V::Unvalidated` and returning a validated `V` on success
+    fn validate(unvalidated: &Self::Unvalidated) -> Result<Self>;
+
+    /// Return the unvalidated form of type `V`
+    fn to_unvalidated(&self) -> Self::Unvalidated;
+}
+
+/// Used in connection with the `Validate` trait to be able to represent types which can benefit
+/// from deferred validation as a performance optimization.
+#[derive(Clone, Debug)]
+pub struct Validatable<V: Validate> {
+    unvalidated: V::Unvalidated,
+    maybe_valid: OnceCell<V>,
+}
+
+impl<V: Validate> Validatable<V> {
+    /// Create a new `Validatable` from a valid type
+    pub fn new_valid(valid: V) -> Self {
+        let unvalidated = valid.to_unvalidated();
+
+        let maybe_valid = OnceCell::new();
+        maybe_valid.set(valid).unwrap_or_else(|_| unreachable!());
+
+        Self {
+            unvalidated,
+            maybe_valid,
+        }
+    }
+
+    /// Create a new `Validatable` from an unvalidated type
+    pub fn new_unvalidated(unvalidated: V::Unvalidated) -> Self {
+        Self {
+            unvalidated,
+            maybe_valid: OnceCell::new(),
+        }
+    }
+
+    /// Return a reference to the unvalidated form `V::Unvalidated`
+    pub fn unvalidated(&self) -> &V::Unvalidated {
+        &self.unvalidated
+    }
+
+    /// Try to validate the unvalidated form returning `Some(&V)` on success and `None` on failure.
+    pub fn valid(&self) -> Option<&V> {
+        self.validate().ok()
+    }
+
+    // TODO maybe optimize to only try once and keep track when we fail
+    /// Attempt to validate `V::Unvalidated` and return a reference to a valid `V`
+    pub fn validate(&self) -> Result<&V> {
+        self.maybe_valid
+            .get_or_try_init(|| V::validate(&self.unvalidated))
+    }
+}
+
+impl<V> Serialize for Validatable<V>
+where
+    V: Validate + Serialize,
+    V::Unvalidated: Serialize,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.unvalidated.serialize(serializer)
+    }
+}
+
+impl<'de, V> Deserialize<'de> for Validatable<V>
+where
+    V: Validate,
+    V::Unvalidated: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let unvalidated = <V::Unvalidated>::deserialize(deserializer)?;
+        Ok(Self::new_unvalidated(unvalidated))
+    }
+}
+
+impl<V> PartialEq for Validatable<V>
+where
+    V: Validate,
+    V::Unvalidated: PartialEq,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.unvalidated == other.unvalidated
+    }
+}
+
+impl<V> Eq for Validatable<V>
+where
+    V: Validate,
+    V::Unvalidated: Eq,
+{
+}
+
+impl<V> Hash for Validatable<V>
+where
+    V: Validate,
+    V::Unvalidated: Hash,
+{
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.unvalidated.hash(state);
+    }
+}
+
+//
+// Implement for Ed25519
+//
+
+use crate::ed25519::{Ed25519PublicKey, ED25519_PUBLIC_KEY_LENGTH};
+
+/// An unvalidated `Ed25519PublicKey`
+#[derive(Debug, Clone, Eq)]
+pub struct UnvalidatedEd25519PublicKey([u8; ED25519_PUBLIC_KEY_LENGTH]);
+
+impl UnvalidatedEd25519PublicKey {
+    /// Return key as bytes
+    pub fn to_bytes(&self) -> [u8; ED25519_PUBLIC_KEY_LENGTH] {
+        self.0
+    }
+}
+
+impl Serialize for UnvalidatedEd25519PublicKey {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        if serializer.is_human_readable() {
+            let encoded = ::hex::encode(self.0);
+            serializer.serialize_str(&encoded)
+        } else {
+            // See comment in deserialize_key.
+            serializer.serialize_newtype_struct(
+                "Ed25519PublicKey",
+                serde_bytes::Bytes::new(self.0.as_ref()),
+            )
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for UnvalidatedEd25519PublicKey {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        if deserializer.is_human_readable() {
+            let encoded_key = <String>::deserialize(deserializer)?;
+            let bytes_out = ::hex::decode(encoded_key).map_err(D::Error::custom)?;
+            <[u8; ED25519_PUBLIC_KEY_LENGTH]>::try_from(bytes_out.as_ref())
+                .map(UnvalidatedEd25519PublicKey)
+                .map_err(D::Error::custom)
+        } else {
+            // In order to preserve the Serde data model and help analysis tools,
+            // make sure to wrap our value in a container with the same name
+            // as the original type.
+            #[derive(Deserialize)]
+            #[serde(rename = "Ed25519PublicKey")]
+            struct Value<'a>(&'a [u8]);
+
+            let value = Value::deserialize(deserializer)?;
+            <[u8; ED25519_PUBLIC_KEY_LENGTH]>::try_from(value.0)
+                .map(UnvalidatedEd25519PublicKey)
+                .map_err(D::Error::custom)
+        }
+    }
+}
+
+impl Hash for UnvalidatedEd25519PublicKey {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        state.write(&self.0)
+    }
+}
+
+impl PartialEq for UnvalidatedEd25519PublicKey {
+    fn eq(&self, other: &Self) -> bool {
+        self.0 == other.0
+    }
+}
+
+impl Validate for Ed25519PublicKey {
+    type Unvalidated = UnvalidatedEd25519PublicKey;
+
+    fn validate(unvalidated: &Self::Unvalidated) -> Result<Self> {
+        Self::try_from(unvalidated.0.as_ref()).map_err(Into::into)
+    }
+
+    fn to_unvalidated(&self) -> Self::Unvalidated {
+        UnvalidatedEd25519PublicKey(self.to_bytes())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        ed25519::{Ed25519PrivateKey, Ed25519PublicKey},
+        test_utils::uniform_keypair_strategy,
+        validatable::{UnvalidatedEd25519PublicKey, Validate},
+    };
+    use proptest::prelude::*;
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
+
+    proptest! {
+        #[test]
+        fn unvalidated_ed25519_public_key_equivalence(
+            keypair in uniform_keypair_strategy::<Ed25519PrivateKey, Ed25519PublicKey>()
+        ) {
+            let valid = keypair.public_key;
+            let unvalidated = valid.to_unvalidated();
+
+            prop_assert_eq!(&unvalidated, &UnvalidatedEd25519PublicKey(valid.to_bytes()));
+            prop_assert_eq!(&valid, &Ed25519PublicKey::validate(&unvalidated).unwrap());
+
+            // Ensure Serialize and Deserialize are implemented the same
+
+            // BCS - A non-human-readable format
+            {
+                let serialized_valid = bcs::to_bytes(&valid).unwrap();
+                let serialized_unvalidated = bcs::to_bytes(&unvalidated).unwrap();
+                prop_assert_eq!(&serialized_valid, &serialized_unvalidated);
+
+                let deserialized_valid_from_unvalidated: Ed25519PublicKey = bcs::from_bytes(&serialized_unvalidated).unwrap();
+                let deserialized_unvalidated_from_valid: UnvalidatedEd25519PublicKey = bcs::from_bytes(&serialized_valid).unwrap();
+
+                prop_assert_eq!(&valid, &deserialized_valid_from_unvalidated);
+                prop_assert_eq!(&unvalidated, &deserialized_unvalidated_from_valid);
+            }
+
+            // JSON A human-readable format
+            {
+                let serialized_valid = serde_json::to_string(&valid).unwrap();
+                let serialized_unvalidated = serde_json::to_string(&unvalidated).unwrap();
+                prop_assert_eq!(&serialized_valid, &serialized_unvalidated);
+
+                let deserialized_valid_from_unvalidated: Ed25519PublicKey = serde_json::from_str(&serialized_unvalidated).unwrap();
+                let deserialized_unvalidated_from_valid: UnvalidatedEd25519PublicKey = serde_json::from_str(&serialized_valid).unwrap();
+
+                prop_assert_eq!(&valid, &deserialized_valid_from_unvalidated);
+                prop_assert_eq!(&unvalidated, &deserialized_unvalidated_from_valid);
+            }
+
+
+            // Ensure Hash is implemented the same
+            let valid_hash = {
+                let mut hasher = DefaultHasher::new();
+                valid.hash(&mut hasher);
+                hasher.finish()
+            };
+
+            let unvalidated_hash = {
+                let mut hasher = DefaultHasher::new();
+                unvalidated.hash(&mut hasher);
+                hasher.finish()
+            };
+
+            prop_assert_eq!(valid_hash, unvalidated_hash);
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/x25519.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/x25519.rs
new file mode 100644
index 000000000..ebe847232
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/crypto/src/x25519.rs
@@ -0,0 +1,269 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! An abstraction of x25519 elliptic curve keys required for
+//! [Diffie-Hellman key exchange](https://en.wikipedia.org/wiki/Diffie%E2%80%93Hellman_key_exchange)
+//! in the Diem project.
+//! Ideally, only `x25519::PrivateKey` and `x25519::PublicKey` should be used throughout the
+//! codebase, until the bytes are actually used in cryptographic operations.
+//!
+//! # Examples
+//!
+//! ```
+//! use diem_crypto::{x25519, Uniform, test_utils::TEST_SEED};
+//! use rand::{rngs::StdRng, SeedableRng};
+//!
+//! // Derive an X25519 private key for testing.
+//! let mut rng: StdRng = SeedableRng::from_seed(TEST_SEED);
+//! let private_key = x25519::PrivateKey::generate(&mut rng);
+//! let public_key = private_key.public_key();
+//!
+//! // Deserialize an hexadecimal private or public key
+//! use diem_crypto::traits::ValidCryptoMaterialStringExt;
+//! # fn main() -> Result<(), diem_crypto::traits::CryptoMaterialError> {
+//! let private_key = "404acc8ec6a0f18df7359a6ee7823f19dd95616b10fed8bdb0de030e891b945a";
+//! let private_key = x25519::PrivateKey::from_encoded_string(&private_key)?;
+//! let public_key = "080e287879c918794170e258bfaddd75acac5b3e350419044655e4983a487120";
+//! let public_key = x25519::PublicKey::from_encoded_string(&public_key)?;
+//! # Ok(())
+//! # }
+//! ```
+//!
+
+use crate::{
+    traits::{self, CryptoMaterialError, ValidCryptoMaterial, ValidCryptoMaterialStringExt},
+    x25519,
+};
+use diem_crypto_derive::{DeserializeKey, SerializeKey, SilentDebug, SilentDisplay};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use rand::{CryptoRng, RngCore};
+use std::convert::{TryFrom, TryInto};
+//
+// Underlying Implementation
+// =========================
+//
+// We re-export the dalek-x25519 library,
+// This makes it easier to uniformalize build dalek-x25519 in diem-core.
+//
+pub use x25519_dalek;
+
+//
+// Main types and constants
+// ========================
+//
+
+/// Size of a X25519 private key
+pub const PRIVATE_KEY_SIZE: usize = 32;
+
+/// Size of a X25519 public key
+pub const PUBLIC_KEY_SIZE: usize = 32;
+
+/// Size of a X25519 shared secret
+pub const SHARED_SECRET_SIZE: usize = 32;
+
+/// This type should be used to deserialize a received private key
+#[derive(DeserializeKey, SilentDisplay, SilentDebug, SerializeKey)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Clone))]
+pub struct PrivateKey(x25519_dalek::StaticSecret);
+
+/// This type should be used to deserialize a received public key
+#[derive(
+    Default, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, SerializeKey, DeserializeKey,
+)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+pub struct PublicKey([u8; PUBLIC_KEY_SIZE]);
+
+//
+// Handy implementations
+// =====================
+//
+
+impl PrivateKey {
+    /// Obtain the public key part of a private key
+    pub fn public_key(&self) -> PublicKey {
+        let public_key: x25519_dalek::PublicKey = (&self.0).into();
+        PublicKey(public_key.as_bytes().to_owned())
+    }
+
+    /// To perform a key exchange with another public key
+    pub fn diffie_hellman(&self, remote_public_key: &PublicKey) -> [u8; SHARED_SECRET_SIZE] {
+        let remote_public_key = x25519_dalek::PublicKey::from(remote_public_key.0);
+        let shared_secret = self.0.diffie_hellman(&remote_public_key);
+        shared_secret.as_bytes().to_owned()
+    }
+
+    /// Deserialize an X25119 PrivateKey given the sha512 pre-image of a hash
+    /// whose least significant half is a canonical X25519 scalar, following
+    /// the XEdDSA approach.
+    ///
+    /// This will FAIL if the passed-in byte representation converts to a
+    /// non-canonical scalar in the X25519 sense (and thus cannot correspond to
+    /// a X25519 valid key without bit-mangling).
+    ///
+    /// This is meant to compensate for the poor key storage capabilities of some
+    /// key management solutions, and NOT to promote double usage of keys under
+    /// several schemes, which would lead to BAD vulnerabilities.
+    pub fn from_ed25519_private_bytes(private_slice: &[u8]) -> Result<Self, CryptoMaterialError> {
+        let ed25519_secretkey = ed25519_dalek::SecretKey::from_bytes(private_slice)
+            .map_err(|_| CryptoMaterialError::DeserializationError)?;
+        let expanded_key = ed25519_dalek::ExpandedSecretKey::from(&ed25519_secretkey);
+
+        let mut expanded_keypart = [0u8; 32];
+        expanded_keypart.copy_from_slice(&expanded_key.to_bytes()[..32]);
+        let potential_x25519 = x25519::PrivateKey::from(expanded_keypart);
+
+        // This checks for x25519 clamping & reduction, which is an RFC requirement
+        if potential_x25519.to_bytes()[..] != expanded_key.to_bytes()[..32] {
+            Err(CryptoMaterialError::DeserializationError)
+        } else {
+            Ok(potential_x25519)
+        }
+    }
+}
+
+impl PublicKey {
+    /// Obtain a slice reference to the underlying bytearray
+    pub fn as_slice(&self) -> &[u8] {
+        &self.0
+    }
+
+    /// Deserialize an X25119 PublicKey from its representation as an
+    /// Ed25519PublicKey, following the XEdDSA approach. This is meant to
+    /// compensate for the poor key storage capabilities of key management
+    /// solutions, and NOT to promote double usage of keys under several
+    /// schemes, which would lead to BAD vulnerabilities.
+    pub fn from_ed25519_public_bytes(ed25519_bytes: &[u8]) -> Result<Self, CryptoMaterialError> {
+        if ed25519_bytes.len() != 32 {
+            return Err(CryptoMaterialError::DeserializationError);
+        }
+        let ed_point = curve25519_dalek::edwards::CompressedEdwardsY::from_slice(ed25519_bytes)
+            .decompress()
+            .ok_or(CryptoMaterialError::DeserializationError)?;
+
+        Ok(x25519::PublicKey::from(ed_point.to_montgomery().to_bytes()))
+    }
+}
+
+//
+// Traits implementations
+// ======================
+//
+
+// private key part
+
+impl std::convert::From<[u8; PRIVATE_KEY_SIZE]> for PrivateKey {
+    fn from(private_key_bytes: [u8; PRIVATE_KEY_SIZE]) -> Self {
+        Self(x25519_dalek::StaticSecret::from(private_key_bytes))
+    }
+}
+
+impl std::convert::TryFrom<&[u8]> for PrivateKey {
+    type Error = traits::CryptoMaterialError;
+
+    fn try_from(private_key_bytes: &[u8]) -> Result<Self, Self::Error> {
+        let private_key_bytes: [u8; PRIVATE_KEY_SIZE] = private_key_bytes
+            .try_into()
+            .map_err(|_| traits::CryptoMaterialError::DeserializationError)?;
+        Ok(Self(x25519_dalek::StaticSecret::from(private_key_bytes)))
+    }
+}
+
+impl traits::PrivateKey for PrivateKey {
+    type PublicKeyMaterial = PublicKey;
+}
+
+impl traits::Uniform for PrivateKey {
+    fn generate<R>(rng: &mut R) -> Self
+    where
+        R: RngCore + CryptoRng,
+    {
+        Self(x25519_dalek::StaticSecret::new(rng))
+    }
+}
+
+// TODO: should this be gated under test flag? (mimoo)
+impl traits::ValidCryptoMaterial for PrivateKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.0.to_bytes().to_vec()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl PartialEq for PrivateKey {
+    fn eq(&self, other: &Self) -> bool {
+        self.to_bytes() == other.to_bytes()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl proptest::arbitrary::Arbitrary for PrivateKey {
+    type Parameters = ();
+    type Strategy = proptest::strategy::BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        use proptest::strategy::Strategy as _;
+        proptest::arbitrary::any::<[u8; 32]>()
+            .prop_map(PrivateKey::from)
+            .boxed()
+    }
+}
+
+// public key part
+
+impl From<&PrivateKey> for PublicKey {
+    fn from(private_key: &PrivateKey) -> Self {
+        private_key.public_key()
+    }
+}
+
+impl std::convert::From<[u8; PUBLIC_KEY_SIZE]> for PublicKey {
+    fn from(public_key_bytes: [u8; PUBLIC_KEY_SIZE]) -> Self {
+        Self(public_key_bytes)
+    }
+}
+
+impl std::convert::TryFrom<&[u8]> for PublicKey {
+    type Error = traits::CryptoMaterialError;
+
+    fn try_from(public_key_bytes: &[u8]) -> Result<Self, Self::Error> {
+        let public_key_bytes: [u8; PUBLIC_KEY_SIZE] = public_key_bytes
+            .try_into()
+            .map_err(|_| traits::CryptoMaterialError::WrongLengthError)?;
+        Ok(Self(public_key_bytes))
+    }
+}
+
+impl traits::PublicKey for PublicKey {
+    type PrivateKeyMaterial = PrivateKey;
+}
+
+impl traits::ValidCryptoMaterial for PublicKey {
+    fn to_bytes(&self) -> Vec<u8> {
+        self.0.to_vec()
+    }
+}
+
+impl std::fmt::Display for PublicKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", hex::encode(self.0))
+    }
+}
+
+impl std::fmt::Debug for PublicKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "x25519::PublicKey({})", self)
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+use crate::test_utils::{self, KeyPair};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+
+/// Produces a uniformly random ed25519 keypair from a seed
+#[cfg(any(test, feature = "fuzzing"))]
+pub fn keypair_strategy() -> impl Strategy<Value = KeyPair<PrivateKey, PublicKey>> {
+    test_utils::uniform_keypair_strategy::<PrivateKey, PublicKey>()
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/natives/Cargo.toml b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/Cargo.toml
new file mode 100644
index 000000000..84aa3fba8
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "diem-framework-natives"
+version = "0.0.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+move-binary-format = { path = "../../../../../move-binary-format" }
+move-core-types = { path = "../../../../../move-core-types" }
+move-vm-runtime = { path = "../../../../../move-vm/runtime" }
+move-vm-types = { path = "../../../../../move-vm/types" }
+
+diem-crypto = { path = "../crypto" }
+
+smallvec = "1.6.1"
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/account.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/account.rs
new file mode 100644
index 000000000..971da950b
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/account.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::NativeContext;
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use smallvec::smallvec;
+use std::collections::VecDeque;
+
+pub fn native_create_signer(
+    _context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let address = pop_arg!(arguments, AccountAddress);
+    Ok(NativeResult::ok(25.into(), smallvec![Value::signer(
+        address
+    )]))
+}
+
+/// NOTE: this function will be deprecated after the Diem v3 release, but must
+/// remain for replaying old transactions
+pub fn native_destroy_signer(
+    _context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    Ok(NativeResult::ok(213.into(), smallvec![]))
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/lib.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/lib.rs
new file mode 100644
index 000000000..d8d48c5b4
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/lib.rs
@@ -0,0 +1,45 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod account;
+pub mod signature;
+
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::{
+    make_table_from_iter, NativeFunction, NativeFunctionTable,
+};
+use std::sync::Arc;
+
+pub fn all_natives(diem_framework_addr: AccountAddress) -> NativeFunctionTable {
+    let natives: [(&str, &str, NativeFunction); 5] = [
+        // TODO: Remove once/if DPN is moved over to use the core framework
+        (
+            "DiemAccount",
+            "create_signer",
+            Arc::new(account::native_create_signer),
+        ),
+        (
+            "DiemAccount",
+            "destroy_signer",
+            Arc::new(account::native_destroy_signer),
+        ),
+        (
+            "Signature",
+            "ed25519_validate_pubkey",
+            Arc::new(signature::native_ed25519_publickey_validation),
+        ),
+        (
+            "Signature",
+            "ed25519_verify",
+            Arc::new(signature::native_ed25519_signature_verification),
+        ),
+        (
+            "Account",
+            "create_signer",
+            Arc::new(account::native_create_signer),
+        ),
+    ];
+
+    make_table_from_iter(diem_framework_addr, natives)
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/signature.rs b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/signature.rs
new file mode 100644
index 000000000..cab54afaa
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/crates/natives/src/signature.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use diem_crypto::{ed25519, traits::*};
+use move_binary_format::errors::PartialVMResult;
+use move_vm_runtime::native_functions::NativeContext;
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, convert::TryFrom};
+
+pub fn native_ed25519_publickey_validation(
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let key_bytes = pop_arg!(arguments, Vec<u8>);
+
+    let cost = 26 * usize::max(key_bytes.len(), 1) as u64;
+
+    // This deserialization performs point-on-curve and small subgroup checks
+    let valid = ed25519::Ed25519PublicKey::try_from(&key_bytes[..]).is_ok();
+    Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(valid)]))
+}
+
+pub fn native_ed25519_signature_verification(
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 3);
+
+    let msg = pop_arg!(arguments, Vec<u8>);
+    let pubkey = pop_arg!(arguments, Vec<u8>);
+    let signature = pop_arg!(arguments, Vec<u8>);
+
+    let cost = 62 * usize::max(msg.len(), 1) as u64;
+
+    let sig = match ed25519::Ed25519Signature::try_from(signature.as_slice()) {
+        Ok(sig) => sig,
+        Err(_) => {
+            return Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(false)]));
+        },
+    };
+    let pk = match ed25519::Ed25519PublicKey::try_from(pubkey.as_slice()) {
+        Ok(pk) => pk,
+        Err(_) => {
+            return Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(false)]));
+        },
+    };
+
+    let verify_result = sig.verify_arbitrary_msg(msg.as_slice(), &pk).is_ok();
+    Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(
+        verify_result
+    )]))
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/Move.toml b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/Move.toml
new file mode 100644
index 000000000..406314080
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/Move.toml
@@ -0,0 +1,15 @@
+[package]
+name = "DPNFramework"
+version = "1.5.0"
+
+[addresses]
+std = "0x1"
+DiemFramework = "0x1"
+DiemRoot = "0xA550C18"
+TreasuryCompliance = "0xB1E55ED"
+CurrencyInfo = "0xA550C18"
+VMReserved = "0x0"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountAdministrationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountAdministrationScripts.move
new file mode 100644
index 000000000..1cf3cf942
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountAdministrationScripts.move
@@ -0,0 +1,688 @@
+/// This module holds transactions that can be used to administer accounts in the Diem Framework.
+module DiemFramework::AccountAdministrationScripts {
+    use DiemFramework::DiemAccount;
+    use DiemFramework::RecoveryAddress;
+    use DiemFramework::SharedEd25519PublicKey;
+    use DiemFramework::SlidingNonce;
+    use DiemFramework::DualAttestation;
+    use DiemFramework::VASPDomain;
+    use DiemFramework::CRSN;
+
+    /// # Summary
+    /// Adds a zero `Currency` balance to the sending `account`. This will enable `account` to
+    /// send, receive, and hold `Diem::Diem<Currency>` coins. This transaction can be
+    /// successfully sent by any account that is allowed to hold balances
+    /// (e.g., VASP, Designated Dealer).
+    ///
+    /// # Technical Description
+    /// After the successful execution of this transaction the sending account will have a
+    /// `DiemAccount::Balance<Currency>` resource with zero balance published under it. Only
+    /// accounts that can hold balances can send this transaction, the sending account cannot
+    /// already have a `DiemAccount::Balance<Currency>` published under it.
+    ///
+    /// # Parameters
+    /// | Name       | Type     | Description                                                                                                                                         |
+    /// | ------     | ------   | -------------                                                                                                                                       |
+    /// | `Currency` | Type     | The Move type for the `Currency` being added to the sending account of the transaction. `Currency` must be an already-registered currency on-chain. |
+    /// | `account`  | `signer` | The signer of the sending account of the transaction.                                                                                               |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                             | Description                                                                |
+    /// | ----------------            | --------------                           | -------------                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `Diem::ECURRENCY_INFO`                  | The `Currency` is not a registered currency on-chain.                      |
+    /// | `Errors::INVALID_ARGUMENT`  | `DiemAccount::EROLE_CANT_STORE_BALANCE` | The sending `account`'s role does not permit balances.                     |
+    /// | `Errors::ALREADY_PUBLISHED` | `DiemAccount::EADD_EXISTING_CURRENCY`   | A balance for `Currency` is already published under the sending `account`. |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_child_vasp_account`
+    /// * `AccountCreationScripts::create_parent_vasp_account`
+    /// * `PaymentScripts::peer_to_peer_with_metadata`
+
+    public entry fun add_currency_to_account<Currency>(account: signer) {
+        DiemAccount::add_currency<Currency>(&account);
+    }
+    spec add_currency_to_account {
+        use std::errors;
+        use std::signer;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include DiemAccount::AddCurrencyAbortsIf<Currency>;
+        include DiemAccount::AddCurrencyEnsures<Currency>{addr: signer::address_of(account)};
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT,
+            errors::ALREADY_PUBLISHED;
+
+        /// **Access Control:**
+        /// The account must be allowed to hold balances. Only Designated Dealers, Parent VASPs,
+        /// and Child VASPs can hold balances [[D1]][ROLE][[D2]][ROLE][[D3]][ROLE][[D4]][ROLE][[D5]][ROLE][[D6]][ROLE][[D7]][ROLE].
+        aborts_if !Roles::can_hold_balance(account) with errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Stores the sending accounts ability to rotate its authentication key with a designated recovery
+    /// account. Both the sending and recovery accounts need to belong to the same VASP and
+    /// both be VASP accounts. After this transaction both the sending account and the
+    /// specified recovery account can rotate the sender account's authentication key.
+    ///
+    /// # Technical Description
+    /// Adds the `DiemAccount::KeyRotationCapability` for the sending account
+    /// (`to_recover_account`) to the `RecoveryAddress::RecoveryAddress` resource under
+    /// `recovery_address`. After this transaction has been executed successfully the account at
+    /// `recovery_address` and the `to_recover_account` may rotate the authentication key of
+    /// `to_recover_account` (the sender of this transaction).
+    ///
+    /// The sending account of this transaction (`to_recover_account`) must not have previously given away its unique key
+    /// rotation capability, and must be a VASP account. The account at `recovery_address`
+    /// must also be a VASP account belonging to the same VASP as the `to_recover_account`.
+    /// Additionally the account at `recovery_address` must have already initialized itself as
+    /// a recovery account address using the `AccountAdministrationScripts::create_recovery_address` transaction script.
+    ///
+    /// The sending account's (`to_recover_account`) key rotation capability is
+    /// removed in this transaction and stored in the `RecoveryAddress::RecoveryAddress`
+    /// resource stored under the account at `recovery_address`.
+    ///
+    /// # Parameters
+    /// | Name                 | Type      | Description                                                                                               |
+    /// | ------               | ------    | -------------                                                                                             |
+    /// | `to_recover_account` | `signer`  | The signer of the sending account of this transaction.                                                    |
+    /// | `recovery_address`   | `address` | The account address where the `to_recover_account`'s `DiemAccount::KeyRotationCapability` will be stored. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                              | Description                                                                                       |
+    /// | ----------------           | --------------                                            | -------------                                                                                     |
+    /// | `Errors::INVALID_STATE`    | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `to_recover_account` has already delegated/extracted its `DiemAccount::KeyRotationCapability`.    |
+    /// | `Errors::NOT_PUBLISHED`    | `RecoveryAddress::ERECOVERY_ADDRESS`                      | `recovery_address` does not have a `RecoveryAddress` resource published under it.                 |
+    /// | `Errors::INVALID_ARGUMENT` | `RecoveryAddress::EINVALID_KEY_ROTATION_DELEGATION`       | `to_recover_account` and `recovery_address` do not belong to the same VASP.                       |
+    /// | `Errors::LIMIT_EXCEEDED`   | ` RecoveryAddress::EMAX_KEYS_REGISTERED`                  | `RecoveryAddress::MAX_REGISTERED_KEYS` have already been registered with this `recovery_address`. |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::create_recovery_address`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_recovery_address`
+
+    public entry fun add_recovery_rotation_capability(to_recover_account: signer, recovery_address: address) {
+        RecoveryAddress::add_rotation_capability(
+            DiemAccount::extract_key_rotation_capability(&to_recover_account), recovery_address
+        )
+    }
+    spec add_recovery_rotation_capability {
+        use std::signer;
+        use std::errors;
+
+        include DiemAccount::TransactionChecks{sender: to_recover_account}; // properties checked by the prologue.
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf{account: to_recover_account};
+        include DiemAccount::ExtractKeyRotationCapabilityEnsures{account: to_recover_account};
+
+        let addr = signer::address_of(to_recover_account);
+        let rotation_cap = DiemAccount::spec_get_key_rotation_cap(addr);
+
+        include RecoveryAddress::AddRotationCapabilityAbortsIf{
+            to_recover: rotation_cap
+        };
+
+        ensures RecoveryAddress::spec_get_rotation_caps(recovery_address)[
+            len(RecoveryAddress::spec_get_rotation_caps(recovery_address)) - 1] == rotation_cap;
+
+        aborts_with [check]
+            errors::INVALID_STATE,
+            errors::NOT_PUBLISHED,
+            errors::LIMIT_EXCEEDED,
+            errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Rotates the authentication key of the sending account to the newly-specified ed25519 public key and
+    /// publishes a new shared authentication key derived from that public key under the sender's account.
+    /// Any account can send this transaction.
+    ///
+    /// # Technical Description
+    /// Rotates the authentication key of the sending account to the
+    /// authentication key derived from `public_key`
+    /// and publishes a `SharedEd25519PublicKey::SharedEd25519PublicKey` resource
+    /// containing the 32-byte ed25519 `public_key` and the `DiemAccount::KeyRotationCapability` for
+    /// `account` under `account`.
+    ///
+    /// # Parameters
+    /// | Name         | Type         | Description                                                                                        |
+    /// | ------       | ------       | -------------                                                                                      |
+    /// | `account`    | `signer`     | The signer of the sending account of the transaction.                                              |
+    /// | `public_key` | `vector<u8>` | A valid 32-byte Ed25519 public key for `account`'s authentication key to be rotated to and stored. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                                               | Description                                                                                         |
+    /// | ----------------            | --------------                                             | -------------                                                                                       |
+    /// | `Errors::INVALID_STATE`     | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `account` has already delegated/extracted its `DiemAccount::KeyRotationCapability` resource.       |
+    /// | `Errors::ALREADY_PUBLISHED` | `SharedEd25519PublicKey::ESHARED_KEY`                      | The `SharedEd25519PublicKey::SharedEd25519PublicKey` resource is already published under `account`. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SharedEd25519PublicKey::EMALFORMED_PUBLIC_KEY`            | `public_key` is an invalid ed25519 public key.                                                      |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::rotate_shared_ed25519_public_key`
+
+    public entry fun publish_shared_ed25519_public_key(account: signer, public_key: vector<u8>) {
+        SharedEd25519PublicKey::publish(&account, public_key)
+    }
+    spec publish_shared_ed25519_public_key {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include SharedEd25519PublicKey::PublishAbortsIf{key: public_key};
+        include SharedEd25519PublicKey::PublishEnsures{key: public_key};
+
+        aborts_with [check]
+            errors::INVALID_STATE,
+            errors::ALREADY_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Rotates the `account`'s authentication key to the supplied new authentication key. May be sent by any account.
+    ///
+    /// # Technical Description
+    /// Rotate the `account`'s `DiemAccount::DiemAccount` `authentication_key`
+    /// field to `new_key`. `new_key` must be a valid authentication key that
+    /// corresponds to an ed25519 public key,
+    /// and `account` must not have previously delegated its `DiemAccount::KeyRotationCapability`.
+    ///
+    /// # Parameters
+    /// | Name      | Type         | Description                                       |
+    /// | ------    | ------       | -------------                                     |
+    /// | `account` | `signer`     | Signer of the sending account of the transaction. |
+    /// | `new_key` | `vector<u8>` | New authentication key to be used for `account`.  |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                              | Description                                                                         |
+    /// | ----------------           | --------------                                            | -------------                                                                       |
+    /// | `Errors::INVALID_STATE`    | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `account` has already delegated/extracted its `DiemAccount::KeyRotationCapability`. |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EMALFORMED_AUTHENTICATION_KEY`              | `new_key` was an invalid length.                                                    |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce_admin`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_recovery_address`
+
+    public entry fun rotate_authentication_key(account: signer, new_key: vector<u8>) {
+        let key_rotation_capability = DiemAccount::extract_key_rotation_capability(&account);
+        DiemAccount::rotate_authentication_key(&key_rotation_capability, new_key);
+        DiemAccount::restore_key_rotation_capability(key_rotation_capability);
+    }
+    spec rotate_authentication_key {
+        use std::signer;
+        use std::errors;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        let account_addr = signer::address_of(account);
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf;
+        let key_rotation_capability = DiemAccount::spec_get_key_rotation_cap(account_addr);
+        include DiemAccount::RotateAuthenticationKeyAbortsIf{cap: key_rotation_capability, new_authentication_key: new_key};
+
+        /// This rotates the authentication key of `account` to `new_key`
+        include DiemAccount::RotateAuthenticationKeyEnsures{addr: account_addr, new_authentication_key: new_key};
+
+        aborts_with [check]
+            errors::INVALID_STATE,
+            errors::INVALID_ARGUMENT;
+
+        /// **Access Control:**
+        /// The account can rotate its own authentication key unless
+        /// it has delegrated the capability [[H18]][PERMISSION][[J18]][PERMISSION].
+        include DiemAccount::AbortsIfDelegatedKeyRotationCapability;
+    }
+
+    /// # Summary
+    /// Rotates the sender's authentication key to the supplied new authentication key. May be sent by
+    /// any account that has a sliding nonce resource published under it (usually this is Treasury
+    /// Compliance or Diem Root accounts).
+    ///
+    /// # Technical Description
+    /// Rotates the `account`'s `DiemAccount::DiemAccount` `authentication_key`
+    /// field to `new_key`. `new_key` must be a valid authentication key that
+    /// corresponds to an ed25519 public key,
+    /// and `account` must not have previously delegated its `DiemAccount::KeyRotationCapability`.
+    ///
+    /// # Parameters
+    /// | Name            | Type         | Description                                                                |
+    /// | ------          | ------       | -------------                                                              |
+    /// | `account`       | `signer`     | Signer of the sending account of the transaction.                          |
+    /// | `sliding_nonce` | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    /// | `new_key`       | `vector<u8>` | New authentication key to be used for `account`.                           |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                               | Description                                                                                |
+    /// | ----------------           | --------------                                             | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                             | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                             | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                             | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`                    | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::INVALID_STATE`    | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `account` has already delegated/extracted its `DiemAccount::KeyRotationCapability`.       |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EMALFORMED_AUTHENTICATION_KEY`              | `new_key` was an invalid length.                                                           |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::rotate_authentication_key`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce_admin`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_recovery_address`
+
+    public entry fun rotate_authentication_key_with_nonce(account: signer, sliding_nonce: u64, new_key: vector<u8>) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        let key_rotation_capability = DiemAccount::extract_key_rotation_capability(&account);
+        DiemAccount::rotate_authentication_key(&key_rotation_capability, new_key);
+        DiemAccount::restore_key_rotation_capability(key_rotation_capability);
+    }
+    spec rotate_authentication_key_with_nonce {
+        use std::signer;
+        use std::errors;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        let account_addr = signer::address_of(account);
+        include SlidingNonce::RecordNonceAbortsIf{ seq_nonce: sliding_nonce };
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf;
+        let key_rotation_capability = DiemAccount::spec_get_key_rotation_cap(account_addr);
+        include DiemAccount::RotateAuthenticationKeyAbortsIf{cap: key_rotation_capability, new_authentication_key: new_key};
+
+        /// This rotates the authentication key of `account` to `new_key`
+        include DiemAccount::RotateAuthenticationKeyEnsures{addr: account_addr, new_authentication_key: new_key};
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::INVALID_STATE,
+            errors::NOT_PUBLISHED;
+
+        /// **Access Control:**
+        /// The account can rotate its own authentication key unless
+        /// it has delegrated the capability [[H18]][PERMISSION][[J18]][PERMISSION].
+        include DiemAccount::AbortsIfDelegatedKeyRotationCapability;
+    }
+
+    /// # Summary
+    /// Rotates the specified account's authentication key to the supplied new authentication key. May
+    /// only be sent by the Diem Root account as a write set transaction.
+    ///
+    /// # Technical Description
+    /// Rotate the `account`'s `DiemAccount::DiemAccount` `authentication_key` field to `new_key`.
+    /// `new_key` must be a valid authentication key that corresponds to an ed25519
+    /// public key,
+    /// and `account` must not have previously delegated its `DiemAccount::KeyRotationCapability`.
+    ///
+    /// # Parameters
+    /// | Name            | Type         | Description                                                                                       |
+    /// | ------          | ------       | -------------                                                                                     |
+    /// | `dr_account`    | `signer`     | The signer of the sending account of the write set transaction. May only be the Diem Root signer. |
+    /// | `account`       | `signer`     | Signer of account specified in the `execute_as` field of the write set transaction.               |
+    /// | `sliding_nonce` | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction for Diem Root.          |
+    /// | `new_key`       | `vector<u8>` | New authentication key to be used for `account`.                                                  |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                              | Description                                                                                                |
+    /// | ----------------           | --------------                                            | -------------                                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                            | A `SlidingNonce` resource is not published under `dr_account`.                                             |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                            | The `sliding_nonce` in `dr_account` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                            | The `sliding_nonce` in `dr_account` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`                   | The `sliding_nonce` in` dr_account` has been previously recorded.                                          |
+    /// | `Errors::INVALID_STATE`    | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `account` has already delegated/extracted its `DiemAccount::KeyRotationCapability`.                        |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EMALFORMED_AUTHENTICATION_KEY`              | `new_key` was an invalid length.                                                                           |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::rotate_authentication_key`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_recovery_address`
+
+    public entry fun rotate_authentication_key_with_nonce_admin(dr_account: signer, account: signer, sliding_nonce: u64, new_key: vector<u8>) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        let key_rotation_capability = DiemAccount::extract_key_rotation_capability(&account);
+        DiemAccount::rotate_authentication_key(&key_rotation_capability, new_key);
+        DiemAccount::restore_key_rotation_capability(key_rotation_capability);
+    }
+    spec rotate_authentication_key_with_nonce_admin {
+        use std::signer;
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        let account_addr = signer::address_of(account);
+        include SlidingNonce::RecordNonceAbortsIf{ account: dr_account, seq_nonce: sliding_nonce };
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf;
+        let key_rotation_capability = DiemAccount::spec_get_key_rotation_cap(account_addr);
+        include DiemAccount::RotateAuthenticationKeyAbortsIf{cap: key_rotation_capability, new_authentication_key: new_key};
+
+        /// This rotates the authentication key of `account` to `new_key`
+        include DiemAccount::RotateAuthenticationKeyEnsures{addr: account_addr, new_authentication_key: new_key};
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::INVALID_STATE,
+            errors::NOT_PUBLISHED;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can process the admin scripts [[H9]][PERMISSION].
+        requires Roles::has_diem_root_role(dr_account); /// This is ensured by DiemAccount::writeset_prologue.
+        /// The account can rotate its own authentication key unless
+        /// it has delegrated the capability [[H18]][PERMISSION][[J18]][PERMISSION].
+        include DiemAccount::AbortsIfDelegatedKeyRotationCapability{account: account};
+    }
+
+    /// # Summary
+    /// Rotates the authentication key of a specified account that is part of a recovery address to a
+    /// new authentication key. Only used for accounts that are part of a recovery address (see
+    /// `AccountAdministrationScripts::add_recovery_rotation_capability` for account restrictions).
+    ///
+    /// # Technical Description
+    /// Rotates the authentication key of the `to_recover` account to `new_key` using the
+    /// `DiemAccount::KeyRotationCapability` stored in the `RecoveryAddress::RecoveryAddress` resource
+    /// published under `recovery_address`. `new_key` must be a valide authentication key .
+    /// This transaction can be sent either by the `to_recover` account, or by the account where the
+    /// `RecoveryAddress::RecoveryAddress` resource is published that contains `to_recover`'s `DiemAccount::KeyRotationCapability`.
+    ///
+    /// # Parameters
+    /// | Name               | Type         | Description                                                                                                                   |
+    /// | ------             | ------       | -------------                                                                                                                 |
+    /// | `account`          | `signer`     | Signer of the sending account of the transaction.                                                                             |
+    /// | `recovery_address` | `address`    | Address where `RecoveryAddress::RecoveryAddress` that holds `to_recover`'s `DiemAccount::KeyRotationCapability` is published. |
+    /// | `to_recover`       | `address`    | The address of the account whose authentication key will be updated.                                                          |
+    /// | `new_key`          | `vector<u8>` | New authentication key to be used for the account at the `to_recover` address.                                                |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                 | Description                                                                                                                                         |
+    /// | ----------------           | --------------                               | -------------                                                                                                                                       |
+    /// | `Errors::NOT_PUBLISHED`    | `RecoveryAddress::ERECOVERY_ADDRESS`         | `recovery_address` does not have a `RecoveryAddress::RecoveryAddress` resource published under it.                                                  |
+    /// | `Errors::INVALID_ARGUMENT` | `RecoveryAddress::ECANNOT_ROTATE_KEY`        | The address of `account` is not `recovery_address` or `to_recover`.                                                                                 |
+    /// | `Errors::INVALID_ARGUMENT` | `RecoveryAddress::EACCOUNT_NOT_RECOVERABLE`  | `to_recover`'s `DiemAccount::KeyRotationCapability`  is not in the `RecoveryAddress::RecoveryAddress`  resource published under `recovery_address`. |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EMALFORMED_AUTHENTICATION_KEY` | `new_key` was an invalid length.                                                                                                                    |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::rotate_authentication_key`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce`
+    /// * `AccountAdministrationScripts::rotate_authentication_key_with_nonce_admin`
+
+    public entry fun rotate_authentication_key_with_recovery_address(
+            account: signer,
+            recovery_address: address,
+            to_recover: address,
+            new_key: vector<u8>
+            ) {
+        RecoveryAddress::rotate_authentication_key(&account, recovery_address, to_recover, new_key)
+    }
+    spec rotate_authentication_key_with_recovery_address {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+        use std::signer;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include RecoveryAddress::RotateAuthenticationKeyAbortsIf;
+        include RecoveryAddress::RotateAuthenticationKeyEnsures;
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+
+        /// **Access Control:**
+        /// The delegatee at the recovery address has to hold the key rotation capability for
+        /// the address to recover. The address of the transaction signer has to be either
+        /// the delegatee's address or the address to recover [[H18]][PERMISSION][[J18]][PERMISSION].
+        let account_addr = signer::address_of(account);
+        aborts_if !RecoveryAddress::spec_holds_key_rotation_cap_for(recovery_address, to_recover) with errors::INVALID_ARGUMENT;
+        aborts_if !(account_addr == recovery_address || account_addr == to_recover) with errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Updates the url used for off-chain communication, and the public key used to verify dual
+    /// attestation on-chain. Transaction can be sent by any account that has dual attestation
+    /// information published under it. In practice the only such accounts are Designated Dealers and
+    /// Parent VASPs.
+    ///
+    /// # Technical Description
+    /// Updates the `base_url` and `compliance_public_key` fields of the `DualAttestation::Credential`
+    /// resource published under `account`. The `new_key` must be a valid ed25519 public key.
+    ///
+    /// # Events
+    /// Successful execution of this transaction emits two events:
+    /// * A `DualAttestation::ComplianceKeyRotationEvent` containing the new compliance public key, and
+    /// the blockchain time at which the key was updated emitted on the `DualAttestation::Credential`
+    /// `compliance_key_rotation_events` handle published under `account`; and
+    /// * A `DualAttestation::BaseUrlRotationEvent` containing the new base url to be used for
+    /// off-chain communication, and the blockchain time at which the url was updated emitted on the
+    /// `DualAttestation::Credential` `base_url_rotation_events` handle published under `account`.
+    ///
+    /// # Parameters
+    /// | Name      | Type         | Description                                                               |
+    /// | ------    | ------       | -------------                                                             |
+    /// | `account` | `signer`     | Signer of the sending account of the transaction.                         |
+    /// | `new_url` | `vector<u8>` | ASCII-encoded url to be used for off-chain communication with `account`.  |
+    /// | `new_key` | `vector<u8>` | New ed25519 public key to be used for on-chain dual attestation checking. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                           | Description                                                                |
+    /// | ----------------           | --------------                         | -------------                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `DualAttestation::ECREDENTIAL`         | A `DualAttestation::Credential` resource is not published under `account`. |
+    /// | `Errors::INVALID_ARGUMENT` | `DualAttestation::EINVALID_PUBLIC_KEY` | `new_key` is not a valid ed25519 public key.                               |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_parent_vasp_account`
+    /// * `AccountCreationScripts::create_designated_dealer`
+    /// * `AccountAdministrationScripts::rotate_dual_attestation_info`
+
+    public entry fun rotate_dual_attestation_info(account: signer, new_url: vector<u8>, new_key: vector<u8>) {
+        DualAttestation::rotate_base_url(&account, new_url);
+        DualAttestation::rotate_compliance_public_key(&account, new_key)
+    }
+    spec rotate_dual_attestation_info {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+        use std::signer;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include DualAttestation::RotateBaseUrlAbortsIf;
+        include DualAttestation::RotateBaseUrlEnsures;
+        include DualAttestation::RotateCompliancePublicKeyAbortsIf;
+        include DualAttestation::RotateCompliancePublicKeyEnsures;
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+
+        include DualAttestation::RotateBaseUrlEmits;
+        include DualAttestation::RotateCompliancePublicKeyEmits;
+
+        /// **Access Control:**
+        /// Only the account having Credential can rotate the info.
+        /// Credential is granted to either a Parent VASP or a designated dealer [[H17]][PERMISSION].
+        include DualAttestation::AbortsIfNoCredential{addr: signer::address_of(account)};
+    }
+
+    /// # Summary
+    /// Rotates the authentication key in a `SharedEd25519PublicKey`. This transaction can be sent by
+    /// any account that has previously published a shared ed25519 public key using
+    /// `AccountAdministrationScripts::publish_shared_ed25519_public_key`.
+    ///
+    /// # Technical Description
+    /// `public_key` must be a valid ed25519 public key.  This transaction first rotates the public key stored in `account`'s
+    /// `SharedEd25519PublicKey::SharedEd25519PublicKey` resource to `public_key`, after which it
+    /// rotates the `account`'s authentication key to the new authentication key derived from `public_key`
+    /// using the `DiemAccount::KeyRotationCapability` stored in `account`'s `SharedEd25519PublicKey::SharedEd25519PublicKey`.
+    ///
+    /// # Parameters
+    /// | Name         | Type         | Description                                           |
+    /// | ------       | ------       | -------------                                         |
+    /// | `account`    | `signer`     | The signer of the sending account of the transaction. |
+    /// | `public_key` | `vector<u8>` | 32-byte Ed25519 public key.                           |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                    | Description                                                                                   |
+    /// | ----------------           | --------------                                  | -------------                                                                                 |
+    /// | `Errors::NOT_PUBLISHED`    | `SharedEd25519PublicKey::ESHARED_KEY`           | A `SharedEd25519PublicKey::SharedEd25519PublicKey` resource is not published under `account`. |
+    /// | `Errors::INVALID_ARGUMENT` | `SharedEd25519PublicKey::EMALFORMED_PUBLIC_KEY` | `public_key` is an invalid ed25519 public key.                                                |
+    ///
+    /// # Related Scripts
+    /// * `AccountAdministrationScripts::publish_shared_ed25519_public_key`
+
+    public entry fun rotate_shared_ed25519_public_key(account: signer, public_key: vector<u8>) {
+        SharedEd25519PublicKey::rotate_key(&account, public_key)
+    }
+    spec rotate_shared_ed25519_public_key {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include SharedEd25519PublicKey::RotateKeyAbortsIf{new_public_key: public_key};
+        include SharedEd25519PublicKey::RotateKeyEnsures{new_public_key: public_key};
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Initializes the sending account as a recovery address that may be used by
+    /// other accounts belonging to the same VASP as `account`.
+    /// The sending account must be a VASP account, and can be either a child or parent VASP account.
+    /// Multiple recovery addresses can exist for a single VASP, but accounts in
+    /// each must be disjoint.
+    ///
+    /// # Technical Description
+    /// Publishes a `RecoveryAddress::RecoveryAddress` resource under `account`. It then
+    /// extracts the `DiemAccount::KeyRotationCapability` for `account` and adds
+    /// it to the resource. After the successful execution of this transaction
+    /// other accounts may add their key rotation to this resource so that `account`
+    /// may be used as a recovery account for those accounts.
+    ///
+    /// # Parameters
+    /// | Name      | Type     | Description                                           |
+    /// | ------    | ------   | -------------                                         |
+    /// | `account` | `signer` | The signer of the sending account of the transaction. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                                               | Description                                                                                   |
+    /// | ----------------            | --------------                                             | -------------                                                                                 |
+    /// | `Errors::INVALID_STATE`     | `DiemAccount::EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED` | `account` has already delegated/extracted its `DiemAccount::KeyRotationCapability`.          |
+    /// | `Errors::INVALID_ARGUMENT`  | `RecoveryAddress::ENOT_A_VASP`                             | `account` is not a VASP account.                                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `RecoveryAddress::EKEY_ROTATION_DEPENDENCY_CYCLE`          | A key rotation recovery cycle would be created by adding `account`'s key rotation capability. |
+    /// | `Errors::ALREADY_PUBLISHED` | `RecoveryAddress::ERECOVERY_ADDRESS`                       | A `RecoveryAddress::RecoveryAddress` resource has already been published under `account`.     |
+    ///
+    /// # Related Scripts
+    /// * `Script::add_recovery_rotation_capability`
+    /// * `Script::rotate_authentication_key_with_recovery_address`
+
+    public entry fun create_recovery_address(account: signer) {
+        RecoveryAddress::publish(&account, DiemAccount::extract_key_rotation_capability(&account))
+    }
+
+    spec create_recovery_address {
+        use std::signer;
+        use std::errors;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf;
+        include DiemAccount::ExtractKeyRotationCapabilityEnsures;
+
+        let account_addr = signer::address_of(account);
+        let rotation_cap = DiemAccount::spec_get_key_rotation_cap(account_addr);
+
+        include RecoveryAddress::PublishAbortsIf{
+            recovery_account: account,
+            rotation_cap: rotation_cap
+        };
+
+        ensures RecoveryAddress::spec_is_recovery_address(account_addr);
+        ensures len(RecoveryAddress::spec_get_rotation_caps(account_addr)) == 1;
+        ensures RecoveryAddress::spec_get_rotation_caps(account_addr)[0] == rotation_cap;
+
+        aborts_with [check]
+            errors::INVALID_STATE,
+            errors::INVALID_ARGUMENT,
+            errors::ALREADY_PUBLISHED;
+    }
+
+    /// # Summary
+    /// Publishes a `VASPDomain::VASPDomains` resource under a parent VASP account.
+    /// The sending account must be a parent VASP account.
+    ///
+    /// # Technical Description
+    /// Publishes a `VASPDomain::VASPDomains` resource under `account`.
+    /// The The `VASPDomain::VASPDomains` resource's `domains` field is a vector
+    /// of VASPDomain, and will be empty on at the end of processing this transaction.
+    ///
+    /// # Parameters
+    /// | Name      | Type     | Description                                           |
+    /// | ------    | ------   | -------------                                         |
+    /// | `account` | `signer` | The signer of the sending account of the transaction. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason              | Description                                                                    |
+    /// | ----------------            | --------------            | -------------                                                                  |
+    /// | `Errors::ALREADY_PUBLISHED` | `VASPDomain::EVASP_DOMAINS` | A `VASPDomain::VASPDomains` resource has already been published under `account`. |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EPARENT_VASP`     | The sending `account` was not a parent VASP account.                           |
+    public entry fun create_vasp_domains(account: signer) {
+        VASPDomain::publish_vasp_domains(&account)
+    }
+    spec create_vasp_domains {
+        use DiemFramework::Roles;
+        use std::errors;
+        use std::signer;
+
+        let vasp_addr = signer::address_of(account);
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include Roles::AbortsIfNotParentVasp;
+        include VASPDomain::PublishVASPDomainsAbortsIf { vasp_addr };
+        include VASPDomain::PublishVASPDomainsEnsures { vasp_addr };
+
+        aborts_with [check]
+            errors::ALREADY_PUBLISHED,
+            errors::REQUIRES_ROLE;
+    }
+
+    /// # Summary
+    /// Publishes a CRSN resource under `account` and opts the account in to
+    /// concurrent transaction processing. Upon successful execution of this
+    /// script, all further transactions sent from this account will be ordered
+    /// and processed according to DIP-168.
+    ///
+    /// # Technical Description
+    /// This publishes a `CRSN::CRSN` resource under `account` with `crsn_size`
+    /// number of slots. All slots will be initialized to the empty (unused)
+    /// state, and the CRSN resource's `min_nonce` field will be set to the transaction's
+    /// sequence number + 1.
+    ///
+    /// # Parameters
+    /// | Name        | Type     | Description                                           |
+    /// | ------      | ------   | -------------                                         |
+    /// | `account`   | `signer` | The signer of the sending account of the transaction. |
+    /// | `crsn_size` | `u64`    | The the number of slots the published CRSN will have. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason            | Description                                                    |
+    /// | ----------------           | --------------          | -------------                                                  |
+    /// | `Errors::INVALID_STATE`    | `CRSN::EHAS_CRSN`       | A `CRSN::CRSN` resource was already published under `account`. |
+    /// | `Errors::INVALID_ARGUMENT` | `CRSN::EZERO_SIZE_CRSN` | The `crsn_size` was zero.                                      |
+    public entry fun opt_in_to_crsn(account: signer, crsn_size: u64) {
+        DiemAccount::publish_crsn(&account, crsn_size)
+    }
+
+    /// # Summary
+    /// Shifts the window held by the CRSN resource published under `account`
+    /// by `shift_amount`. This will expire all unused slots in the CRSN at the
+    /// time of processing that are less than `shift_amount`. The exact
+    /// semantics are defined in DIP-168.
+    ///
+    /// # Technical Description
+    /// This shifts the slots in the published `CRSN::CRSN` resource under
+    /// `account` by `shift_amount`, and increments the CRSN's `min_nonce` field
+    /// by `shift_amount` as well. After this, it will shift the window over
+    /// any set bits. It is important to note that the sequence nonce of the
+    /// sending transaction must still lie within the range of the window in
+    /// order for this transaction to be processed successfully.
+    ///
+    /// # Parameters
+    /// | Name           | Type     | Description                                                 |
+    /// | ------         | ------   | -------------                                               |
+    /// | `account`      | `signer` | The signer of the sending account of the transaction.       |
+    /// | `shift_amount` | `u64`    | The amount to shift the window in the CRSN under `account`. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category          | Error Reason     | Description                                               |
+    /// | ----------------        | --------------   | -------------                                             |
+    /// | `Errors::INVALID_STATE` | `CRSN::ENO_CRSN` | A `CRSN::CRSN` resource is not published under `account`. |
+    public entry fun force_expire(account: signer, shift_amount: u64) {
+        CRSN::force_expire(&account, shift_amount)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountCreationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountCreationScripts.move
new file mode 100644
index 000000000..80c717ca5
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountCreationScripts.move
@@ -0,0 +1,510 @@
+module DiemFramework::AccountCreationScripts {
+    use DiemFramework::DiemAccount;
+    use DiemFramework::SlidingNonce;
+
+    /// # Summary
+    /// Creates a Child VASP account with its parent being the sending account of the transaction.
+    /// The sender of the transaction must be a Parent VASP account.
+    ///
+    /// # Technical Description
+    /// Creates a `ChildVASP` account for the sender `parent_vasp` at `child_address` with a balance of
+    /// `child_initial_balance` in `CoinType` and an initial authentication key of
+    /// `auth_key_prefix | child_address`.
+    ///
+    /// If `add_all_currencies` is true, the child address will have a zero balance in all available
+    /// currencies in the system.
+    ///
+    /// The new account will be a child account of the transaction sender, which must be a
+    /// Parent VASP account. The child account will be recorded against the limit of
+    /// child accounts of the creating Parent VASP account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `DiemAccount::CreateAccountEvent` with the `created` field being `child_address`,
+    /// and the `rold_id` field being `Roles::CHILD_VASP_ROLE_ID`. This is emitted on the
+    /// `DiemAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// Successful execution with a `child_initial_balance` greater than zero will additionaly emit:
+    /// * A `DiemAccount::SentPaymentEvent` with the `payee` field being `child_address`.
+    /// This is emitted on the Parent VASP's `DiemAccount::DiemAccount` `sent_events` handle.
+    /// * A `DiemAccount::ReceivedPaymentEvent` with the  `payer` field being the Parent VASP's address.
+    /// This is emitted on the new Child VASPS's `DiemAccount::DiemAccount` `received_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                    | Type         | Description                                                                                                                                 |
+    /// | ------                  | ------       | -------------                                                                                                                               |
+    /// | `CoinType`              | Type         | The Move type for the `CoinType` that the child account should be created with. `CoinType` must be an already-registered currency on-chain. |
+    /// | `parent_vasp`           | `signer`     | The reference of the sending account. Must be a Parent VASP account.                                                                        |
+    /// | `child_address`         | `address`    | Address of the to-be-created Child VASP account.                                                                                            |
+    /// | `auth_key_prefix`       | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account.                                                    |
+    /// | `add_all_currencies`    | `bool`       | Whether to publish balance resources for all known currencies when the account is created.                                                  |
+    /// | `child_initial_balance` | `u64`        | The initial balance in `CoinType` to give the child account when it's created.                                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                                             | Description                                                                              |
+    /// | ----------------            | --------------                                           | -------------                                                                            |
+    /// | `Errors::INVALID_ARGUMENT`  | `DiemAccount::EMALFORMED_AUTHENTICATION_KEY`            | The `auth_key_prefix` was not of length 32.                                              |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EPARENT_VASP`                                    | The sending account wasn't a Parent VASP account.                                        |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                                        | The `child_address` address is already taken.                                            |
+    /// | `Errors::LIMIT_EXCEEDED`    | `VASP::ETOO_MANY_CHILDREN`                               | The sending account has reached the maximum number of allowed child accounts.            |
+    /// | `Errors::NOT_PUBLISHED`     | `Diem::ECURRENCY_INFO`                                  | The `CoinType` is not a registered currency on-chain.                                    |
+    /// | `Errors::INVALID_STATE`     | `DiemAccount::EWITHDRAWAL_CAPABILITY_ALREADY_EXTRACTED` | The withdrawal capability for the sending account has already been extracted.            |
+    /// | `Errors::NOT_PUBLISHED`     | `DiemAccount::EPAYER_DOESNT_HOLD_CURRENCY`              | The sending account doesn't have a balance in `CoinType`.                                |
+    /// | `Errors::LIMIT_EXCEEDED`    | `DiemAccount::EINSUFFICIENT_BALANCE`                    | The sending account doesn't have at least `child_initial_balance` of `CoinType` balance. |
+    /// | `Errors::INVALID_ARGUMENT`  | `DiemAccount::ECANNOT_CREATE_AT_VM_RESERVED`            | The `child_address` is the reserved address 0x0.                                         |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_parent_vasp_account`
+    /// * `AccountAdministrationScripts::add_currency_to_account`
+    /// * `AccountAdministrationScripts::rotate_authentication_key`
+    /// * `AccountAdministrationScripts::add_recovery_rotation_capability`
+    /// * `AccountAdministrationScripts::create_recovery_address`
+
+    public entry fun create_child_vasp_account<CoinType>(
+        parent_vasp: signer,
+        child_address: address,
+        auth_key_prefix: vector<u8>,
+        add_all_currencies: bool,
+        child_initial_balance: u64
+    ) {
+        DiemAccount::create_child_vasp_account<CoinType>(
+            &parent_vasp,
+            child_address,
+            auth_key_prefix,
+            add_all_currencies,
+        );
+        // Give the newly created child `child_initial_balance` coins
+        if (child_initial_balance > 0) {
+            let vasp_withdrawal_cap = DiemAccount::extract_withdraw_capability(&parent_vasp);
+            DiemAccount::pay_from<CoinType>(
+                &vasp_withdrawal_cap, child_address, child_initial_balance, x"", x""
+            );
+            DiemAccount::restore_withdraw_capability(vasp_withdrawal_cap);
+        };
+    }
+
+    spec create_child_vasp_account {
+        use std::signer;
+        use std::errors;
+        use DiemFramework::DualAttestation;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: parent_vasp}; // properties checked by the prologue.
+        let parent_addr = signer::address_of(parent_vasp);
+        let parent_cap = DiemAccount::spec_get_withdraw_cap(parent_addr);
+        include DiemAccount::CreateChildVASPAccountAbortsIf<CoinType>{
+            parent: parent_vasp, new_account_address: child_address};
+        aborts_if child_initial_balance > max_u64() with errors::LIMIT_EXCEEDED;
+        include (child_initial_balance > 0) ==>
+            DiemAccount::ExtractWithdrawCapAbortsIf{sender_addr: parent_addr};
+        include (child_initial_balance > 0) ==> DualAttestation::AssertPaymentOkAbortsIf<CoinType>{
+            payer: parent_addr,
+            payee: child_address,
+            metadata: x"",
+            metadata_signature: x"",
+            value: child_initial_balance
+        };
+        include (child_initial_balance) > 0 ==>
+            DiemAccount::PayFromAbortsIfRestricted<CoinType>{
+                cap: parent_cap,
+                payee: child_address,
+                amount: child_initial_balance,
+                metadata: x"",
+            };
+        include DiemAccount::CreateChildVASPAccountEnsures<CoinType>{
+            parent_addr: parent_addr,
+            child_addr: child_address,
+        };
+        ensures DiemAccount::balance<CoinType>(child_address) == child_initial_balance;
+        ensures DiemAccount::balance<CoinType>(parent_addr)
+            == old(DiemAccount::balance<CoinType>(parent_addr)) - child_initial_balance;
+
+        aborts_with [check]
+            errors::REQUIRES_ROLE,
+            errors::ALREADY_PUBLISHED,
+            errors::LIMIT_EXCEEDED,
+            errors::NOT_PUBLISHED,
+            errors::INVALID_STATE,
+            errors::INVALID_ARGUMENT;
+
+        // TODO: fix emit specs below
+        /*
+        include DiemAccount::MakeAccountEmits{new_account_address: child_address};
+        include child_initial_balance > 0 ==>
+            DiemAccount::PayFromEmits<CoinType>{
+                cap: parent_cap,
+                payee: child_address,
+                amount: child_initial_balance,
+                metadata: x"",
+            };
+        */
+
+        /// **Access Control:**
+        /// Only Parent VASP accounts can create Child VASP accounts [[A7]][ROLE].
+        include Roles::AbortsIfNotParentVasp{account: parent_vasp};
+    }
+
+    /// # Summary
+    /// Creates a Validator Operator account. This transaction can only be sent by the Diem
+    /// Root account.
+    ///
+    /// # Technical Description
+    /// Creates an account with a Validator Operator role at `new_account_address`, with authentication key
+    /// `auth_key_prefix` | `new_account_address`. It publishes a
+    /// `ValidatorOperatorConfig::ValidatorOperatorConfig` resource with the specified `human_name`.
+    /// This script does not assign the validator operator to any validator accounts but only creates the account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `DiemAccount::CreateAccountEvent` with the `created` field being `new_account_address`,
+    /// and the `rold_id` field being `Roles::VALIDATOR_OPERATOR_ROLE_ID`. This is emitted on the
+    /// `DiemAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                  | Type         | Description                                                                              |
+    /// | ------                | ------       | -------------                                                                            |
+    /// | `dr_account`          | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.     |
+    /// | `sliding_nonce`       | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.               |
+    /// | `new_account_address` | `address`    | Address of the to-be-created Validator account.                                          |
+    /// | `auth_key_prefix`     | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account. |
+    /// | `human_name`          | `vector<u8>` | ASCII-encoded human name for the validator.                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `dr_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::EDIEM_ROOT`            | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EDIEM_ROOT`                    | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `new_account_address` address is already taken.                                        |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun create_validator_operator_account(
+        dr_account: signer,
+        sliding_nonce: u64,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        DiemAccount::create_validator_operator_account(
+            &dr_account,
+            new_account_address,
+            auth_key_prefix,
+            human_name,
+        );
+    }
+
+    /// Only Diem root may create Validator Operator accounts
+    /// Authentication: ValidatorAccountAbortsIf includes AbortsIfNotDiemRoot.
+    /// Checks that above table includes all error categories.
+    /// The verifier finds an abort that is not documented, and cannot occur in practice:
+    /// * REQUIRES_ROLE comes from `Roles::assert_diem_root`. However, assert_diem_root checks the literal
+    ///   Diem root address before checking the role, and the role abort is unreachable in practice, since
+    ///   only Diem root has the Diem root role.
+    spec create_validator_operator_account {
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: dr_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{seq_nonce: sliding_nonce, account: dr_account};
+        include DiemAccount::CreateValidatorOperatorAccountAbortsIf;
+        include DiemAccount::CreateValidatorOperatorAccountEnsures;
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ADDRESS,
+            errors::ALREADY_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        include DiemAccount::MakeAccountEmits;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can create Validator Operator accounts [[A4]][ROLE].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+    }
+
+    /// # Summary
+    /// Creates a Validator account. This transaction can only be sent by the Diem
+    /// Root account.
+    ///
+    /// # Technical Description
+    /// Creates an account with a Validator role at `new_account_address`, with authentication key
+    /// `auth_key_prefix` | `new_account_address`. It publishes a
+    /// `ValidatorConfig::ValidatorConfig` resource with empty `config`, and
+    /// `operator_account` fields. The `human_name` field of the
+    /// `ValidatorConfig::ValidatorConfig` is set to the passed in `human_name`.
+    /// This script does not add the validator to the validator set or the system,
+    /// but only creates the account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `DiemAccount::CreateAccountEvent` with the `created` field being `new_account_address`,
+    /// and the `rold_id` field being `Roles::VALIDATOR_ROLE_ID`. This is emitted on the
+    /// `DiemAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                  | Type         | Description                                                                              |
+    /// | ------                | ------       | -------------                                                                            |
+    /// | `dr_account`          | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.     |
+    /// | `sliding_nonce`       | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.               |
+    /// | `new_account_address` | `address`    | Address of the to-be-created Validator account.                                          |
+    /// | `auth_key_prefix`     | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account. |
+    /// | `human_name`          | `vector<u8>` | ASCII-encoded human name for the validator.                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `dr_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::EDIEM_ROOT`            | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EDIEM_ROOT`                    | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `new_account_address` address is already taken.                                        |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun create_validator_account(
+        dr_account: signer,
+        sliding_nonce: u64,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        DiemAccount::create_validator_account(
+            &dr_account,
+            new_account_address,
+            auth_key_prefix,
+            human_name,
+        );
+      }
+
+    /// Only Diem root may create Validator accounts
+    /// Authentication: ValidatorAccountAbortsIf includes AbortsIfNotDiemRoot.
+    /// Checks that above table includes all error categories.
+    /// The verifier finds an abort that is not documented, and cannot occur in practice:
+    /// * REQUIRES_ROLE comes from `Roles::assert_diem_root`. However, assert_diem_root checks the literal
+    ///   Diem root address before checking the role, and the role abort is unreachable in practice, since
+    ///   only Diem root has the Diem root role.
+    spec create_validator_account {
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: dr_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{seq_nonce: sliding_nonce, account: dr_account};
+        include DiemAccount::CreateValidatorAccountAbortsIf;
+        include DiemAccount::CreateValidatorAccountEnsures;
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ADDRESS,
+            errors::ALREADY_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        include DiemAccount::MakeAccountEmits;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can create Validator accounts [[A3]][ROLE].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+    }
+
+    /// # Summary
+    /// Creates a Parent VASP account with the specified human name. Must be called by the Treasury Compliance account.
+    ///
+    /// # Technical Description
+    /// Creates an account with the Parent VASP role at `address` with authentication key
+    /// `auth_key_prefix` | `new_account_address` and a 0 balance of type `CoinType`. If
+    /// `add_all_currencies` is true, 0 balances for all available currencies in the system will
+    /// also be added. This can only be invoked by an TreasuryCompliance account.
+    /// `sliding_nonce` is a unique nonce for operation, see `SlidingNonce` for details.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `DiemAccount::CreateAccountEvent` with the `created` field being `new_account_address`,
+    /// and the `rold_id` field being `Roles::PARENT_VASP_ROLE_ID`. This is emitted on the
+    /// `DiemAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                  | Type         | Description                                                                                                                                                    |
+    /// | ------                | ------       | -------------                                                                                                                                                  |
+    /// | `CoinType`            | Type         | The Move type for the `CoinType` currency that the Parent VASP account should be initialized with. `CoinType` must be an already-registered currency on-chain. |
+    /// | `tc_account`          | `signer`     | The signer of the sending account of this transaction. Must be the Treasury Compliance account.                                                                |
+    /// | `sliding_nonce`       | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                                                                     |
+    /// | `new_account_address` | `address`    | Address of the to-be-created Parent VASP account.                                                                                                              |
+    /// | `auth_key_prefix`     | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account.                                                                       |
+    /// | `human_name`          | `vector<u8>` | ASCII-encoded human name for the Parent VASP.                                                                                                                  |
+    /// | `add_all_currencies`  | `bool`       | Whether to publish balance resources for all known currencies when the account is created.                                                                     |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `tc_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::ETREASURY_COMPLIANCE`   | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::ETREASURY_COMPLIANCE`           | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::NOT_PUBLISHED`     | `Diem::ECURRENCY_INFO`                 | The `CoinType` is not a registered currency on-chain.                                      |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `new_account_address` address is already taken.                                        |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_child_vasp_account`
+    /// * `AccountAdministrationScripts::add_currency_to_account`
+    /// * `AccountAdministrationScripts::rotate_authentication_key`
+    /// * `AccountAdministrationScripts::add_recovery_rotation_capability`
+    /// * `AccountAdministrationScripts::create_recovery_address`
+    /// * `AccountAdministrationScripts::rotate_dual_attestation_info`
+
+    public entry fun create_parent_vasp_account<CoinType>(
+        tc_account: signer,
+        sliding_nonce: u64,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+        add_all_currencies: bool
+    ) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        DiemAccount::create_parent_vasp_account<CoinType>(
+            &tc_account,
+            new_account_address,
+            auth_key_prefix,
+            human_name,
+            add_all_currencies
+        );
+    }
+
+    spec create_parent_vasp_account {
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: tc_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{account: tc_account, seq_nonce: sliding_nonce};
+        include DiemAccount::CreateParentVASPAccountAbortsIf<CoinType>{creator_account: tc_account};
+        include DiemAccount::CreateParentVASPAccountEnsures<CoinType>;
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::REQUIRES_ADDRESS,
+            errors::NOT_PUBLISHED,
+            errors::ALREADY_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        include DiemAccount::MakeAccountEmits;
+
+        /// **Access Control:**
+        /// Only the Treasury Compliance account can create Parent VASP accounts [[A6]][ROLE].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+
+    /// # Summary
+    /// Creates a Designated Dealer account with the provided information, and initializes it with
+    /// default mint tiers. The transaction can only be sent by the Treasury Compliance account.
+    ///
+    /// # Technical Description
+    /// Creates an account with the Designated Dealer role at `addr` with authentication key
+    /// `auth_key_prefix` | `addr` and a 0 balance of type `Currency`. If `add_all_currencies` is true,
+    /// 0 balances for all available currencies in the system will also be added. This can only be
+    /// invoked by an account with the TreasuryCompliance role.
+    ///
+    /// At the time of creation the account is also initialized with default mint tiers of (500_000,
+    /// 5000_000, 50_000_000, 500_000_000), and preburn areas for each currency that is added to the
+    /// account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `DiemAccount::CreateAccountEvent` with the `created` field being `addr`,
+    /// and the `rold_id` field being `Roles::DESIGNATED_DEALER_ROLE_ID`. This is emitted on the
+    /// `DiemAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                 | Type         | Description                                                                                                                                         |
+    /// | ------               | ------       | -------------                                                                                                                                       |
+    /// | `Currency`           | Type         | The Move type for the `Currency` that the Designated Dealer should be initialized with. `Currency` must be an already-registered currency on-chain. |
+    /// | `tc_account`         | `signer`     | The signer of the sending account of this transaction. Must be the Treasury Compliance account.                                                     |
+    /// | `sliding_nonce`      | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                                                          |
+    /// | `addr`               | `address`    | Address of the to-be-created Designated Dealer account.                                                                                             |
+    /// | `auth_key_prefix`    | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account.                                                            |
+    /// | `human_name`         | `vector<u8>` | ASCII-encoded human name for the Designated Dealer.                                                                                                 |
+    /// | `add_all_currencies` | `bool`       | Whether to publish preburn, balance, and tier info resources for all known (SCS) currencies or just `Currency` when the account is created.         |
+    ///
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `tc_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::ETREASURY_COMPLIANCE`   | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::ETREASURY_COMPLIANCE`           | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::NOT_PUBLISHED`     | `Diem::ECURRENCY_INFO`                 | The `Currency` is not a registered currency on-chain.                                      |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `addr` address is already taken.                                                       |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::tiered_mint`
+    /// * `PaymentScripts::peer_to_peer_with_metadata`
+    /// * `AccountAdministrationScripts::rotate_dual_attestation_info`
+
+    public entry fun create_designated_dealer<Currency>(
+        tc_account: signer,
+        sliding_nonce: u64,
+        addr: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+        add_all_currencies: bool,
+    ) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        DiemAccount::create_designated_dealer<Currency>(
+            &tc_account,
+            addr,
+            auth_key_prefix,
+            human_name,
+            add_all_currencies
+        );
+    }
+
+    spec create_designated_dealer {
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: tc_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{account: tc_account, seq_nonce: sliding_nonce};
+        include DiemAccount::CreateDesignatedDealerAbortsIf<Currency>{
+            creator_account: tc_account, new_account_address: addr};
+        include DiemAccount::CreateDesignatedDealerEnsures<Currency>{new_account_address: addr};
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::REQUIRES_ADDRESS,
+            errors::NOT_PUBLISHED,
+            errors::ALREADY_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        include DiemAccount::MakeAccountEmits{new_account_address: addr};
+
+        /// **Access Control:**
+        /// Only the Treasury Compliance account can create Designated Dealer accounts [[A5]][ROLE].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountFreezing.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountFreezing.move
new file mode 100644
index 000000000..0859e92e0
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountFreezing.move
@@ -0,0 +1,235 @@
+/// Module which manages freezing of accounts.
+module DiemFramework::AccountFreezing {
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::Roles;
+    use std::event::{Self, EventHandle};
+    use std::errors;
+    use std::signer;
+    friend DiemFramework::DiemAccount;
+
+    struct FreezingBit has key {
+        /// If `is_frozen` is set true, the account cannot be used to send transactions or receive funds
+        is_frozen: bool,
+    }
+
+    struct FreezeEventsHolder has key {
+        freeze_event_handle: EventHandle<FreezeAccountEvent>,
+        unfreeze_event_handle: EventHandle<UnfreezeAccountEvent>,
+    }
+
+    /// Message for freeze account events
+    struct FreezeAccountEvent has drop, store {
+        /// The address that initiated freeze txn
+        initiator_address: address,
+        /// The address that was frozen
+        frozen_address: address,
+    }
+
+    /// Message for unfreeze account events
+    struct UnfreezeAccountEvent has drop, store {
+        /// The address that initiated unfreeze txn
+        initiator_address: address,
+        /// The address that was unfrozen
+        unfrozen_address: address,
+    }
+
+    /// A property expected of the `FreezeEventsHolder` resource didn't hold
+    const EFREEZE_EVENTS_HOLDER: u64 = 1;
+    /// The `FreezingBit` resource is in an invalid state
+    const EFREEZING_BIT: u64 = 2;
+    /// An attempt to freeze the Diem Root account was attempted
+    const ECANNOT_FREEZE_DIEM_ROOT: u64 = 3;
+    /// An attempt to freeze the Treasury & Compliance account was attempted
+    const ECANNOT_FREEZE_TC: u64 = 4;
+    /// The account is frozen
+    const EACCOUNT_FROZEN: u64 = 5;
+
+    public fun initialize(dr_account: &signer) {
+        DiemTimestamp::assert_genesis();
+        CoreAddresses::assert_diem_root(dr_account);
+        assert!(
+            !exists<FreezeEventsHolder>(signer::address_of(dr_account)),
+            errors::already_published(EFREEZE_EVENTS_HOLDER)
+        );
+        move_to(dr_account, FreezeEventsHolder {
+            freeze_event_handle: event::new_event_handle(dr_account),
+            unfreeze_event_handle: event::new_event_handle(dr_account),
+        });
+    }
+    spec initialize {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        let addr = signer::address_of(dr_account);
+        aborts_if exists<FreezeEventsHolder>(addr) with errors::ALREADY_PUBLISHED;
+        ensures exists<FreezeEventsHolder>(addr);
+    }
+
+    public(friend) fun create(account: &signer) {
+        let addr = signer::address_of(account);
+        assert!(!exists<FreezingBit>(addr), errors::already_published(EFREEZING_BIT));
+        move_to(account, FreezingBit { is_frozen: false })
+    }
+    spec create {
+        let addr = signer::address_of(account);
+        modifies global<FreezingBit>(addr);
+        aborts_if exists<FreezingBit>(addr) with errors::ALREADY_PUBLISHED;
+        ensures spec_account_is_not_frozen(addr);
+    }
+
+    /// Freeze the account at `addr`.
+    public fun freeze_account(
+        account: &signer,
+        frozen_address: address,
+    )
+    acquires FreezingBit, FreezeEventsHolder {
+        DiemTimestamp::assert_operating();
+        Roles::assert_treasury_compliance(account);
+        // The diem root account and TC cannot be frozen
+        assert!(frozen_address != @DiemRoot, errors::invalid_argument(ECANNOT_FREEZE_DIEM_ROOT));
+        assert!(frozen_address != @TreasuryCompliance, errors::invalid_argument(ECANNOT_FREEZE_TC));
+        assert!(exists<FreezingBit>(frozen_address), errors::not_published(EFREEZING_BIT));
+        borrow_global_mut<FreezingBit>(frozen_address).is_frozen = true;
+        let initiator_address = signer::address_of(account);
+        event::emit_event<FreezeAccountEvent>(
+            &mut borrow_global_mut<FreezeEventsHolder>(@DiemRoot).freeze_event_handle,
+            FreezeAccountEvent {
+                initiator_address,
+                frozen_address
+            },
+        );
+    }
+    spec freeze_account {
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotTreasuryCompliance;
+        aborts_if frozen_address == @DiemRoot with errors::INVALID_ARGUMENT;
+        aborts_if frozen_address == @TreasuryCompliance with errors::INVALID_ARGUMENT;
+        aborts_if !exists<FreezingBit>(frozen_address) with errors::NOT_PUBLISHED;
+        ensures spec_account_is_frozen(frozen_address);
+        include FreezeAccountEmits;
+    }
+    spec schema FreezeAccountEmits {
+        account: &signer;
+        frozen_address: address;
+        let handle = global<FreezeEventsHolder>(@DiemRoot).freeze_event_handle;
+        let msg = FreezeAccountEvent {
+            initiator_address: signer::address_of(account),
+            frozen_address
+        };
+        emits msg to handle;
+    }
+
+    /// Unfreeze the account at `addr`.
+    public fun unfreeze_account(
+        account: &signer,
+        unfrozen_address: address,
+    )
+    acquires FreezingBit, FreezeEventsHolder {
+        DiemTimestamp::assert_operating();
+        Roles::assert_treasury_compliance(account);
+        assert!(exists<FreezingBit>(unfrozen_address), errors::not_published(EFREEZING_BIT));
+        borrow_global_mut<FreezingBit>(unfrozen_address).is_frozen = false;
+        let initiator_address = signer::address_of(account);
+        event::emit_event<UnfreezeAccountEvent>(
+            &mut borrow_global_mut<FreezeEventsHolder>(@DiemRoot).unfreeze_event_handle,
+            UnfreezeAccountEvent {
+                initiator_address,
+                unfrozen_address
+            },
+        );
+    }
+    spec unfreeze_account {
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotTreasuryCompliance;
+        aborts_if !exists<FreezingBit>(unfrozen_address) with errors::NOT_PUBLISHED;
+        ensures !spec_account_is_frozen(unfrozen_address);
+        include UnfreezeAccountEmits;
+    }
+    spec schema UnfreezeAccountEmits {
+        account: &signer;
+        unfrozen_address: address;
+        let handle = global<FreezeEventsHolder>(@DiemRoot).unfreeze_event_handle;
+        let msg = UnfreezeAccountEvent {
+            initiator_address: signer::address_of(account),
+            unfrozen_address
+        };
+        emits msg to handle;
+    }
+
+    /// Returns if the account at `addr` is frozen.
+    public fun account_is_frozen(addr: address): bool
+    acquires FreezingBit {
+        exists<FreezingBit>(addr) && borrow_global<FreezingBit>(addr).is_frozen
+     }
+    spec account_is_frozen {
+        aborts_if false;
+        pragma opaque = true;
+        ensures result == spec_account_is_frozen(addr);
+    }
+
+    /// Assert that an account is not frozen.
+    public fun assert_not_frozen(account: address) acquires FreezingBit {
+        assert!(!account_is_frozen(account), errors::invalid_state(EACCOUNT_FROZEN));
+    }
+    spec assert_not_frozen {
+        pragma opaque;
+        include AbortsIfFrozen;
+    }
+    spec schema AbortsIfFrozen {
+        account: address;
+        aborts_if spec_account_is_frozen(account) with errors::INVALID_STATE;
+    }
+
+    #[test_only]
+    public fun create_for_test(account: &signer) {
+        create(account)
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Initialization
+    spec module {
+        /// `FreezeEventsHolder` always exists after genesis.
+        invariant [suspendable] DiemTimestamp::is_operating() ==>
+            exists<FreezeEventsHolder>(@DiemRoot);
+    }
+
+    /// # Access Control
+    spec module {
+        /// The account of DiemRoot is not freezable [[F1]][ROLE].
+        /// After genesis, FreezingBit of DiemRoot is always false.
+        invariant [suspendable] DiemTimestamp::is_operating() ==>
+            spec_account_is_not_frozen(@DiemRoot);
+
+        /// The account of TreasuryCompliance is not freezable [[F2]][ROLE].
+        /// After genesis, FreezingBit of TreasuryCompliance is always false.
+        invariant [suspendable] DiemTimestamp::is_operating() ==>
+            spec_account_is_not_frozen(@TreasuryCompliance);
+
+        /// resource struct FreezingBit persists
+        invariant update forall addr: address where old(exists<FreezingBit>(addr)): exists<FreezingBit>(addr);
+
+        /// resource struct FreezeEventsHolder is there forever after initialization
+        invariant [suspendable] DiemTimestamp::is_operating() ==> exists<FreezeEventsHolder>(@DiemRoot);
+
+        /// Only TreasuryCompliance can change the freezing bits of accounts [[H7]][PERMISSION].
+        invariant update forall addr: address where old(exists<FreezingBit>(addr)):
+            global<FreezingBit>(addr).is_frozen != old(global<FreezingBit>(addr).is_frozen)
+                ==> Roles::spec_signed_by_treasury_compliance_role();
+    }
+
+    /// # Helper Functions
+    spec module {
+
+        fun spec_account_is_frozen(addr: address): bool {
+            exists<FreezingBit>(addr) && global<FreezingBit>(addr).is_frozen
+        }
+
+        fun spec_account_is_not_frozen(addr: address): bool {
+            exists<FreezingBit>(addr) && !global<FreezingBit>(addr).is_frozen
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountLimits.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountLimits.move
new file mode 100644
index 000000000..bb86d3ba8
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/AccountLimits.move
@@ -0,0 +1,607 @@
+/// Module which manages account limits, like the amount of currency which can flow in or out over
+/// a given time period.
+module DiemFramework::AccountLimits {
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::signer;
+    friend DiemFramework::XDX;
+    friend DiemFramework::XUS;
+
+    /// An operations capability that restricts callers of this module since
+    /// the operations can mutate account states.
+    struct AccountLimitMutationCapability has store { }
+
+    /// A resource specifying the account limits per-currency. There is a default
+    /// "unlimited" `LimitsDefinition` resource for accounts published at`@DiemRoot`, but other
+    /// accounts may have different account limit definitons. In such cases, they will have a
+    /// `LimitsDefinition` published under their (root) account.
+    struct LimitsDefinition<phantom CoinType> has key {
+        /// The maximum inflow allowed during the specified time period.
+        max_inflow: u64,
+        /// The maximum outflow allowed during the specified time period.
+        max_outflow: u64,
+        /// Time period, specified in microseconds
+        time_period: u64,
+        /// The maximum amount that can be held
+        max_holding: u64,
+    }
+    spec LimitsDefinition {
+        invariant max_inflow > 0;
+        invariant max_outflow > 0;
+        invariant time_period > 0;
+        invariant max_holding > 0;
+    }
+
+    /// A struct holding account transaction information for the time window
+    /// starting at `window_start` and lasting for the `time_period` specified
+    /// in the limits definition at `limit_address`.
+    struct Window<phantom CoinType> has key {
+        /// Time window start in microseconds
+        window_start: u64,
+        /// The inflow during this time window
+        window_inflow: u64,
+        /// The inflow during this time window
+        window_outflow: u64,
+        /// The balance that this account has held during this time period.
+        tracked_balance: u64,
+        /// address storing the LimitsDefinition resource that governs this window
+        limit_address: address,
+    }
+
+    /// The `LimitsDefinition` resource is in an invalid state
+    const ELIMITS_DEFINITION: u64 = 0;
+    /// The `Window` resource is in an invalid state
+    const EWINDOW: u64 = 1;
+
+    /// 24 hours in microseconds
+    const ONE_DAY: u64 = 86400000000;
+    const MAX_U64: u64 = 18446744073709551615u64;
+
+    /// Grant a capability to call this module. This does not necessarily
+    /// need to be a unique capability.
+    public fun grant_mutation_capability(dr_account: &signer): AccountLimitMutationCapability {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+        AccountLimitMutationCapability{}
+    }
+    spec grant_mutation_capability {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+    }
+
+    /// Determines if depositing `amount` of `CoinType` coins into the
+    /// account at `addr` is amenable with their account limits.
+    /// Returns false if this deposit violates the account limits.
+    public fun update_deposit_limits<CoinType>(
+        amount: u64,
+        addr: address,
+        _cap: &AccountLimitMutationCapability,
+    ): bool acquires LimitsDefinition, Window {
+        assert!(exists<Window<CoinType>>(addr), errors::not_published(EWINDOW));
+        can_receive_and_update_window<CoinType>(
+            amount,
+            borrow_global_mut<Window<CoinType>>(addr),
+        )
+    }
+    spec update_deposit_limits {
+        pragma opaque;
+        modifies global<Window<CoinType>>(addr);
+        ensures exists<Window<CoinType>>(addr);
+        ensures global<Window<CoinType>>(addr).limit_address
+            == old(global<Window<CoinType>>(addr).limit_address);
+        include UpdateDepositLimitsAbortsIf<CoinType>;
+        include CanReceiveEnsures<CoinType>{receiving: global<Window<CoinType>>(addr)};
+    }
+    spec schema UpdateDepositLimitsAbortsIf<CoinType> {
+        amount: u64;
+        addr: address;
+        include AbortsIfNoWindow<CoinType>;
+        include CanReceiveAbortsIf<CoinType>{receiving: global<Window<CoinType>>(addr)};
+    }
+    spec schema AbortsIfNoWindow<CoinType> {
+        addr: address;
+        aborts_if !exists<Window<CoinType>>(addr) with errors::NOT_PUBLISHED;
+    }
+    spec fun spec_update_deposit_limits<CoinType>(amount: u64, addr: address): bool {
+        spec_receiving_limits_ok(global<Window<CoinType>>(addr), amount)
+    }
+
+    /// Determine if withdrawing `amount` of `CoinType` coins from
+    /// the account at `addr` would violate the account limits for that account.
+    /// Returns `false` if this withdrawal violates account limits.
+    public fun update_withdrawal_limits<CoinType>(
+        amount: u64,
+        addr: address,
+        _cap: &AccountLimitMutationCapability,
+    ): bool acquires LimitsDefinition, Window {
+        assert!(exists<Window<CoinType>>(addr), errors::not_published(EWINDOW));
+        can_withdraw_and_update_window<CoinType>(
+            amount,
+            borrow_global_mut<Window<CoinType>>(addr),
+        )
+    }
+    spec update_withdrawal_limits {
+        pragma opaque;
+        modifies global<Window<CoinType>>(addr);
+        ensures exists<Window<CoinType>>(addr);
+        include UpdateWithdrawalLimitsAbortsIf<CoinType>;
+        include CanWithdrawEnsures<CoinType>{sending: global<Window<CoinType>>(addr)};
+    }
+    spec schema UpdateWithdrawalLimitsAbortsIf<CoinType> {
+        amount: u64;
+        addr: address;
+        include AbortsIfNoWindow<CoinType>;
+        include CanWithdrawAbortsIf<CoinType>{sending: global<Window<CoinType>>(addr)};
+    }
+    spec fun spec_update_withdrawal_limits<CoinType>(amount: u64, addr: address): bool {
+        spec_withdrawal_limits_ok(global<Window<CoinType>>(addr), amount)
+    }
+
+    /// All accounts that could be subject to account limits will have a
+    /// `Window` for each currency they can hold published at the top level.
+    /// Root accounts for multi-account entities will hold this resource at
+    /// their root/parent account.
+    public fun publish_window<CoinType>(
+        dr_account: &signer,
+        to_limit: &signer,
+        limit_address: address,
+    ) {
+        Roles::assert_diem_root(dr_account);
+        assert!(exists<LimitsDefinition<CoinType>>(limit_address), errors::not_published(ELIMITS_DEFINITION));
+        Roles::assert_parent_vasp_or_child_vasp(to_limit);
+        assert!(
+            !exists<Window<CoinType>>(signer::address_of(to_limit)),
+            errors::already_published(EWINDOW)
+        );
+        move_to(
+            to_limit,
+            Window<CoinType> {
+                window_start: current_time(),
+                window_inflow: 0,
+                window_outflow: 0,
+                tracked_balance: 0,
+                limit_address,
+            }
+        )
+    }
+    spec publish_window {
+        include PublishWindowAbortsIf<CoinType>;
+        include PublishWindowEnsures<CoinType>;
+    }
+    spec schema PublishWindowAbortsIf<CoinType> {
+        dr_account: signer;
+        to_limit: signer;
+        limit_address: address;
+        /// Only ParentVASP and ChildVASP can have the account limits [[E1]][ROLE][[E2]][ROLE][[E3]][ROLE][[E4]][ROLE][[E5]][ROLE][[E6]][ROLE][[E7]][ROLE].
+        include Roles::AbortsIfNotParentVaspOrChildVasp{account: to_limit};
+
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        aborts_if !exists<LimitsDefinition<CoinType>>(limit_address) with errors::NOT_PUBLISHED;
+        aborts_if exists<Window<CoinType>>(signer::address_of(to_limit)) with errors::ALREADY_PUBLISHED;
+    }
+
+    spec schema PublishWindowEnsures<CoinType> {
+        to_limit: signer;
+        ensures global<Window<CoinType>>(signer::address_of(to_limit)).window_inflow == 0;
+        ensures global<Window<CoinType>>(signer::address_of(to_limit)).window_outflow == 0;
+        ensures global<Window<CoinType>>(signer::address_of(to_limit)).tracked_balance == 0;
+    }
+    /// Unrestricted limits are represented by setting all fields in the
+    /// limits definition to `MAX_U64`. Anyone can publish an unrestricted
+    /// limits since no windows will point to this limits definition unless the
+    /// TC account, or a caller with access to a `&AccountLimitMutationCapability` points a
+    /// window to it. Additionally, the TC controls the values held within this
+    /// resource once it's published.
+    public(friend) fun publish_unrestricted_limits<CoinType>(publish_account: &signer) {
+        assert!(
+            !exists<LimitsDefinition<CoinType>>(signer::address_of(publish_account)),
+            errors::already_published(ELIMITS_DEFINITION)
+        );
+        move_to(
+            publish_account,
+            LimitsDefinition<CoinType> {
+                max_inflow: MAX_U64,
+                max_outflow: MAX_U64,
+                max_holding: MAX_U64,
+                time_period: ONE_DAY,
+            }
+        )
+    }
+    spec publish_unrestricted_limits {
+        pragma delegate_invariants_to_caller;
+        include PublishUnrestrictedLimitsAbortsIf<CoinType>;
+    }
+    spec schema PublishUnrestrictedLimitsAbortsIf<CoinType> {
+        publish_account: signer;
+        aborts_if exists<LimitsDefinition<CoinType>>(signer::address_of(publish_account))
+            with errors::ALREADY_PUBLISHED;
+    }
+    spec schema PublishUnrestrictedLimitsEnsures<CoinType> {
+        publish_account: signer;
+        ensures exists<LimitsDefinition<CoinType>>(signer::address_of(publish_account));
+    }
+
+    // #[test_only]
+    // TODO: remove this comment when the relevant tests in functional and language-e2e testsuites
+    // are ported to the unit testing framework
+    public fun publish_unrestricted_limits_for_testing<CoinType>(publish_account: &signer) {
+        publish_unrestricted_limits<CoinType>(publish_account);
+    }
+    spec publish_unrestricted_limits_for_testing {
+        pragma verify = false;
+    }
+
+    /// Updates the `LimitsDefinition<CoinType>` resource at `limit_address`.
+    /// If any of the field arguments is `0` the corresponding field is not updated.
+    public fun update_limits_definition<CoinType>(
+        tc_account: &signer,
+        limit_address: address,
+        new_max_inflow: u64,
+        new_max_outflow: u64,
+        new_max_holding_balance: u64,
+        new_time_period: u64,
+    ) acquires LimitsDefinition {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(exists<LimitsDefinition<CoinType>>(limit_address), errors::not_published(ELIMITS_DEFINITION));
+
+        // As we don't have Optionals for txn scripts, in update_account_limit_definition.move
+        // we use 0 value to represent a None (ie no update to that variable)
+        let limits_def = borrow_global_mut<LimitsDefinition<CoinType>>(limit_address);
+        if (new_max_inflow > 0) { limits_def.max_inflow = new_max_inflow };
+        if (new_max_outflow > 0) { limits_def.max_outflow = new_max_outflow };
+        if (new_max_holding_balance > 0) { limits_def.max_holding = new_max_holding_balance };
+        if (new_time_period > 0) { limits_def.time_period = new_time_period };
+    }
+    spec update_limits_definition {
+        modifies global<LimitsDefinition<CoinType>>(limit_address);
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if !exists<LimitsDefinition<CoinType>>(limit_address) with errors::NOT_PUBLISHED;
+        ensures exists<LimitsDefinition<CoinType>>(limit_address);
+        let old_limits_def = global<LimitsDefinition<CoinType>>(limit_address);
+        let post new_limits_def = global<LimitsDefinition<CoinType>>(limit_address);
+        ensures new_max_inflow > 0 ==> new_limits_def.max_inflow == new_max_inflow;
+        ensures new_max_inflow == 0 ==> new_limits_def.max_inflow == old_limits_def.max_inflow;
+        ensures new_max_outflow > 0 ==> new_limits_def.max_outflow == new_max_outflow;
+        ensures new_max_outflow == 0 ==> new_limits_def.max_outflow == old_limits_def.max_outflow;
+        ensures new_max_holding_balance > 0 ==> new_limits_def.max_holding == new_max_holding_balance;
+        ensures new_max_holding_balance == 0 ==> new_limits_def.max_holding == old_limits_def.max_holding;
+        ensures new_time_period > 0 ==> new_limits_def.time_period == new_time_period;
+        ensures new_time_period == 0 ==> new_limits_def.time_period == old_limits_def.time_period;
+    }
+
+    /// Update either the `tracked_balance` or `limit_address` fields of the
+    /// `Window<CoinType>` stored under `window_address`.
+    /// * Since we don't track balances of accounts before they are limited, once
+    ///   they do become limited the approximate balance in `CoinType` held by
+    ///   the entity across all of its accounts will need to be set by the association.
+    ///   if `aggregate_balance` is set to zero the field is not updated.
+    /// * This updates the `limit_address` in the window resource to a new limits definition at
+    ///   `new_limit_address`. If the `aggregate_balance` needs to be updated
+    ///   but the `limit_address` should remain the same, the current
+    ///   `limit_address` needs to be passed in for `new_limit_address`.
+    public fun update_window_info<CoinType>(
+        tc_account: &signer,
+        window_address: address,
+        aggregate_balance: u64,
+        new_limit_address: address,
+    ) acquires Window {
+        Roles::assert_treasury_compliance(tc_account);
+        let window = borrow_global_mut<Window<CoinType>>(window_address);
+        if (aggregate_balance != 0)  { window.tracked_balance = aggregate_balance };
+        assert!(exists<LimitsDefinition<CoinType>>(new_limit_address), errors::not_published(ELIMITS_DEFINITION));
+        window.limit_address = new_limit_address;
+    }
+    spec update_window_info {
+        modifies global<Window<CoinType>>(window_address);
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if !exists<Window<CoinType>>(window_address);
+        aborts_if !exists<LimitsDefinition<CoinType>>(new_limit_address) with errors::NOT_PUBLISHED;
+        ensures exists<Window<CoinType>>(window_address);
+        let old_window = global<Window<CoinType>>(window_address);
+        let post new_window = global<Window<CoinType>>(window_address);
+        ensures aggregate_balance != 0 ==> new_window.tracked_balance == aggregate_balance;
+        ensures aggregate_balance == 0 ==> new_window.tracked_balance == old_window.tracked_balance;
+        ensures new_window.limit_address == new_limit_address;
+        ensures new_window.window_start == old_window.window_start;
+        ensures new_window.window_inflow == old_window.window_inflow;
+        ensures new_window.window_outflow == old_window.window_outflow;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Internal utiility functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// If the time window starting at `window.window_start` and lasting for
+    /// `limits_definition.time_period` has elapsed, resets the window and
+    /// the inflow and outflow records.
+    fun reset_window<CoinType>(window: &mut Window<CoinType>, limits_definition: &LimitsDefinition<CoinType>) {
+        let current_time = DiemTimestamp::now_microseconds();
+        assert!(window.window_start <= MAX_U64 - limits_definition.time_period, errors::limit_exceeded(EWINDOW));
+        if (current_time > window.window_start + limits_definition.time_period) {
+            window.window_start = current_time;
+            window.window_inflow = 0;
+            window.window_outflow = 0;
+        }
+    }
+    spec reset_window {
+        pragma opaque;
+        include ResetWindowAbortsIf<CoinType>;
+        include ResetWindowEnsures<CoinType>;
+    }
+    spec schema ResetWindowAbortsIf<CoinType> {
+        window: Window<CoinType>;
+        limits_definition: LimitsDefinition<CoinType>;
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if window.window_start + limits_definition.time_period > max_u64() with errors::LIMIT_EXCEEDED;
+    }
+    spec schema ResetWindowEnsures<CoinType> {
+        window: Window<CoinType>;
+        limits_definition: LimitsDefinition<CoinType>;
+        ensures window == old(spec_window_reset_with_limits(window, limits_definition));
+    }
+    spec module {
+        fun spec_window_expired<CoinType>(
+            window: Window<CoinType>,
+            limits_definition: LimitsDefinition<CoinType>
+        ): bool {
+            DiemTimestamp::spec_now_microseconds() > window.window_start + limits_definition.time_period
+        }
+        fun spec_window_reset_with_limits<CoinType>(
+            window: Window<CoinType>,
+            limits_definition: LimitsDefinition<CoinType>
+        ): Window<CoinType> {
+            if (spec_window_expired<CoinType>(window, limits_definition)) {
+                Window<CoinType>{
+                    limit_address: window.limit_address,
+                    tracked_balance: window.tracked_balance,
+                    window_start: DiemTimestamp::spec_now_microseconds(),
+                    window_inflow: 0,
+                    window_outflow: 0
+                }
+            } else {
+                window
+            }
+        }
+    }
+
+    /// Verify that the receiving account tracked by the `receiving` window
+    /// can receive `amount` funds without violating requirements
+    /// specified the `limits_definition` passed in.
+    /// If the receipt of `amount` doesn't violate the limits `amount` of
+    /// `CoinType` is recorded as received in the given `receiving` window.
+    fun can_receive_and_update_window<CoinType>(
+        amount: u64,
+        receiving: &mut Window<CoinType>,
+    ): bool acquires LimitsDefinition {
+        assert!(exists<LimitsDefinition<CoinType>>(receiving.limit_address), errors::not_published(ELIMITS_DEFINITION));
+        let limits_definition = borrow_global<LimitsDefinition<CoinType>>(receiving.limit_address);
+        // If the limits are unrestricted then don't do any more work.
+        if (is_unrestricted(limits_definition)) return true;
+
+        reset_window(receiving, limits_definition);
+        // Check that the inflow is OK
+        // TODO(wrwg): instead of aborting if the below additions overflow, we should perhaps just have ok false.
+        assert!(receiving.window_inflow <= MAX_U64 - amount, errors::limit_exceeded(EWINDOW));
+        let inflow_ok = (receiving.window_inflow + amount) <= limits_definition.max_inflow;
+        // Check that the holding after the deposit is OK
+        assert!(receiving.tracked_balance <= MAX_U64 - amount, errors::limit_exceeded(EWINDOW));
+        let holding_ok = (receiving.tracked_balance + amount) <= limits_definition.max_holding;
+        // The account with `receiving` window can receive the payment so record it.
+        if (inflow_ok && holding_ok) {
+            receiving.window_inflow = receiving.window_inflow + amount;
+            receiving.tracked_balance = receiving.tracked_balance + amount;
+        };
+        inflow_ok && holding_ok
+    }
+    spec can_receive_and_update_window {
+        pragma opaque;
+        include CanReceiveAbortsIf<CoinType>;
+        include CanReceiveEnsures<CoinType>;
+    }
+    spec schema CanReceiveAbortsIf<CoinType> {
+        amount: num;
+        receiving: Window<CoinType>;
+        aborts_if !exists<LimitsDefinition<CoinType>>(receiving.limit_address) with errors::NOT_PUBLISHED;
+        include !spec_window_unrestricted<CoinType>(receiving) ==> CanReceiveRestrictedAbortsIf<CoinType>;
+    }
+    spec schema CanReceiveRestrictedAbortsIf<CoinType> {
+        amount: num;
+        receiving: Window<CoinType>;
+        include ResetWindowAbortsIf<CoinType>{
+            window: receiving,
+            limits_definition: spec_window_limits<CoinType>(receiving)
+        };
+        aborts_if spec_window_reset(receiving).window_inflow + amount > max_u64() with errors::LIMIT_EXCEEDED;
+        aborts_if spec_window_reset(receiving).tracked_balance + amount > max_u64() with errors::LIMIT_EXCEEDED;
+    }
+    spec schema CanReceiveEnsures<CoinType> {
+        amount: num;
+        receiving: Window<CoinType>;
+        result: bool;
+        ensures result == spec_receiving_limits_ok(old(receiving), amount);
+        ensures
+            if (result && !spec_window_unrestricted(old(receiving)))
+                receiving == spec_update_inflow(spec_window_reset(old(receiving)), amount)
+            else
+                receiving == spec_window_reset(old(receiving)) || receiving == old(receiving);
+    }
+    /// Returns the limits associated with this window.
+    spec fun spec_window_limits<CoinType>(window: Window<CoinType>): LimitsDefinition<CoinType> {
+        global<LimitsDefinition<CoinType>>(window.limit_address)
+    }
+    /// Returns true of the window has unrestricted limits.
+    spec fun spec_window_unrestricted<CoinType>(window: Window<CoinType>): bool {
+        spec_is_unrestricted(spec_window_limits<CoinType>(window))
+    }
+    /// Resets wrapping variables of the given window.
+    spec fun spec_window_reset<CoinType>(window: Window<CoinType>): Window<CoinType> {
+        spec_window_reset_with_limits(window, spec_window_limits<CoinType>(window))
+    }
+    /// Checks whether receiving limits are satisfied.
+    spec fun spec_receiving_limits_ok<CoinType>(receiving: Window<CoinType>, amount: u64): bool {
+        spec_window_unrestricted(receiving) ||
+            spec_window_reset(receiving).window_inflow + amount
+                    <= spec_window_limits(receiving).max_inflow &&
+            spec_window_reset(receiving).tracked_balance + amount
+                    <= spec_window_limits(receiving).max_holding
+    }
+    spec fun spec_update_inflow<CoinType>(receiving: Window<CoinType>, amount: u64): Window<CoinType> {
+        update_field(update_field(receiving,
+            window_inflow, receiving.window_inflow + amount),
+            tracked_balance, receiving.tracked_balance + amount)
+    }
+
+    /// Verify that `amount` can be withdrawn from the account tracked
+    /// by the `sending` window without violating any limits specified
+    /// in its `limits_definition`.
+    /// If the withdrawal of `amount` doesn't violate the limits `amount` of
+    /// `CoinType` is recorded as withdrawn in the given `sending` window.
+    fun can_withdraw_and_update_window<CoinType>(
+        amount: u64,
+        sending: &mut Window<CoinType>,
+    ): bool acquires LimitsDefinition {
+        assert!(exists<LimitsDefinition<CoinType>>(sending.limit_address), errors::not_published(ELIMITS_DEFINITION));
+        let limits_definition = borrow_global<LimitsDefinition<CoinType>>(sending.limit_address);
+        // If the limits are unrestricted then don't do any more work.
+        if (is_unrestricted(limits_definition)) return true;
+
+        reset_window(sending, limits_definition);
+        // Check outflow is OK
+        assert!(sending.window_outflow <= MAX_U64 - amount, errors::limit_exceeded(EWINDOW));
+        let outflow_ok = sending.window_outflow + amount <= limits_definition.max_outflow;
+        // Flow is OK, so record it.
+        if (outflow_ok) {
+            sending.window_outflow = sending.window_outflow + amount;
+            sending.tracked_balance = if (amount >= sending.tracked_balance) 0
+                                       else sending.tracked_balance - amount;
+        };
+        outflow_ok
+    }
+    spec can_withdraw_and_update_window {
+        pragma opaque;
+        include CanWithdrawAbortsIf<CoinType>;
+        include CanWithdrawEnsures<CoinType>;
+    }
+    spec schema CanWithdrawAbortsIf<CoinType> {
+        amount: u64;
+        sending: &mut Window<CoinType>;
+        aborts_if !exists<LimitsDefinition<CoinType>>(sending.limit_address) with errors::NOT_PUBLISHED;
+        include !spec_window_unrestricted(sending) ==> CanWithdrawRestrictedAbortsIf<CoinType>;
+    }
+    spec schema CanWithdrawRestrictedAbortsIf<CoinType> {
+        amount: u64;
+        sending: &mut Window<CoinType>;
+        include ResetWindowAbortsIf<CoinType>{
+            window: sending,
+            limits_definition: spec_window_limits<CoinType>(sending)
+        };
+        aborts_if spec_window_reset(sending).window_outflow + amount > MAX_U64 with errors::LIMIT_EXCEEDED;
+    }
+    spec schema CanWithdrawEnsures<CoinType> {
+        result: bool;
+        amount: u64;
+        sending: &mut Window<CoinType>;
+        ensures result == spec_withdrawal_limits_ok(old(sending), amount);
+        ensures
+            if (result && !spec_window_unrestricted(old(sending)))
+                sending == spec_update_outflow(spec_window_reset(old(sending)), amount)
+            else
+                sending == spec_window_reset(old(sending)) || sending == old(sending);
+    }
+    /// Check whether withdrawal limits are satisfied.
+    spec fun spec_withdrawal_limits_ok<CoinType>(sending: Window<CoinType>, amount: u64): bool {
+        spec_window_unrestricted(sending) ||
+        spec_window_reset(sending).window_outflow + amount <= spec_window_limits(sending).max_outflow
+    }
+    /// Update outflow.
+    spec fun spec_update_outflow<CoinType>(sending: Window<CoinType>, amount: u64): Window<CoinType> {
+        update_field(update_field(sending,
+            window_outflow, sending.window_outflow + amount),
+            tracked_balance, if (amount >= sending.tracked_balance) 0
+                             else sending.tracked_balance - amount)
+    }
+
+    /// Determine whether the `LimitsDefinition` resource has no restrictions.
+    fun is_unrestricted<CoinType>(limits_def: &LimitsDefinition<CoinType>): bool {
+        limits_def.max_inflow == MAX_U64 &&
+        limits_def.max_outflow == MAX_U64 &&
+        limits_def.max_holding == MAX_U64 &&
+        limits_def.time_period == ONE_DAY
+    }
+    spec is_unrestricted {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_is_unrestricted(limits_def);
+    }
+    spec module {
+        /// Checks whether the limits definition is unrestricted.
+        fun spec_is_unrestricted<CoinType>(limits_def: LimitsDefinition<CoinType>): bool {
+            limits_def.max_inflow == max_u64() &&
+            limits_def.max_outflow == max_u64() &&
+            limits_def.max_holding == max_u64() &&
+            limits_def.time_period == 86400000000
+        }
+    }
+
+    public fun limits_definition_address<CoinType>(addr: address): address acquires Window {
+        borrow_global<Window<CoinType>>(addr).limit_address
+    }
+
+    public fun has_limits_published<CoinType>(addr: address): bool {
+        exists<LimitsDefinition<CoinType>>(addr)
+    }
+
+    public fun has_window_published<CoinType>(addr: address): bool {
+        exists<Window<CoinType>>(addr)
+    }
+    spec has_window_published {
+        ensures result == spec_has_window_published<CoinType>(addr);
+    }
+    spec module {
+        fun spec_has_window_published<CoinType>(addr: address): bool {
+            exists<Window<CoinType>>(addr)
+        }
+    }
+
+    fun current_time(): u64 {
+        if (DiemTimestamp::is_genesis()) 0 else DiemTimestamp::now_microseconds()
+    }
+
+    spec current_time(): u64 {
+        ensures DiemTimestamp::is_genesis() ==> result == 0;
+    }
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    spec module {
+        /// `LimitsDefinition<CoinType>` persists after publication.
+        invariant<CoinType> update
+            forall addr: address where old(exists<LimitsDefinition<CoinType>>(addr)):
+                exists<LimitsDefinition<CoinType>>(addr);
+
+        /// `Window<CoinType>` persists after publication
+        invariant<CoinType> update
+            forall window_addr: address where old(exists<Window<CoinType>>(window_addr)):
+                exists<Window<CoinType>>(window_addr);
+
+        /// Invariant that `LimitsDefinition` exists if a `Window` exists.
+        invariant<CoinType>
+           forall window_addr: address where exists<Window<CoinType>>(window_addr):
+                exists<LimitsDefinition<CoinType>>(global<Window<CoinType>>(window_addr).limit_address);
+    }
+
+    /// # Access Control
+
+    spec module {
+        /// Only ParentVASP and ChildVASP can have the account limits [[E1]][ROLE][[E2]][ROLE][[E3]][ROLE][[E4]][ROLE][[E5]][ROLE][[E6]][ROLE][[E7]][ROLE].
+        invariant<CoinType>
+            forall addr: address where exists<Window<CoinType>>(addr):
+                exists<Roles::RoleId>(addr) &&
+                (global<Roles::RoleId>(addr).role_id == Roles::PARENT_VASP_ROLE_ID ||
+                    global<Roles::RoleId>(addr).role_id == Roles::CHILD_VASP_ROLE_ID);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Authenticator.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Authenticator.move
new file mode 100644
index 000000000..bf683fb28
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Authenticator.move
@@ -0,0 +1,108 @@
+/// Move representation of the authenticator types used in Diem. The supported types are Ed25519 (single-sig)
+/// and MultiEd25519 (K-of-N multisig).
+module DiemFramework::Authenticator {
+    use std::errors;
+    use std::hash;
+    use std::bcs;
+    use std::vector;
+
+    /// A multi-ed25519 public key
+    struct MultiEd25519PublicKey has copy, drop, store {
+        /// vector of ed25519 public keys
+        public_keys: vector<vector<u8>>,
+        /// approval threshold
+        threshold: u8,
+    }
+
+    /// Scheme byte ID for ed25519
+    const SINGLE_ED25519_SCHEME_ID: u8 = 0;
+    /// Scheme byte ID for multi-ed25519
+    const MULTI_ED25519_SCHEME_ID: u8 = 1;
+
+    /// Maximum number of keys allowed in a MultiEd25519 public/private key
+    const MAX_MULTI_ED25519_KEYS: u64 = 32;
+
+    /// Threshold provided was 0 which can't be used to create a `MultiEd25519` key
+    const EZERO_THRESHOLD: u64 = 0;
+    /// Not enough keys were provided for the specified threshold when creating an `MultiEd25519` key
+    const ENOT_ENOUGH_KEYS_FOR_THRESHOLD: u64 = 1;
+    /// Too many keys were provided for the specified threshold when creating an `MultiEd25519` key
+    const ENUM_KEYS_ABOVE_MAX_THRESHOLD: u64 = 2;
+
+    /// Create a a multisig policy from a vector of ed25519 public keys and a threshold.
+    /// Note: this does *not* check uniqueness of keys. Repeated keys are convenient to
+    /// encode weighted multisig policies. For example Alice AND 1 of Bob or Carol is
+    /// public_key: {alice_key, alice_key, bob_key, carol_key}, threshold: 3
+    /// Aborts if threshold is zero or bigger than the length of `public_keys`.
+    public fun create_multi_ed25519(
+        public_keys: vector<vector<u8>>,
+        threshold: u8
+    ): MultiEd25519PublicKey {
+        // check threshold requirements
+        let len = vector::length(&public_keys);
+        assert!(threshold != 0, errors::invalid_argument(EZERO_THRESHOLD));
+        assert!(
+            (threshold as u64) <= len,
+            errors::invalid_argument(ENOT_ENOUGH_KEYS_FOR_THRESHOLD)
+        );
+        // the multied25519 signature scheme allows at most 32 keys
+        assert!(
+            len <= MAX_MULTI_ED25519_KEYS,
+            errors::invalid_argument(ENUM_KEYS_ABOVE_MAX_THRESHOLD)
+        );
+
+        MultiEd25519PublicKey { public_keys, threshold }
+    }
+
+    /// Compute an authentication key for the ed25519 public key `public_key`
+    public fun ed25519_authentication_key(public_key: vector<u8>): vector<u8> {
+        vector::push_back(&mut public_key, SINGLE_ED25519_SCHEME_ID);
+        hash::sha3_256(public_key)
+    }
+    spec ed25519_authentication_key {
+        pragma opaque = true;
+        aborts_if false;
+        ensures [abstract] result == spec_ed25519_authentication_key(public_key);
+    }
+    /// We use an uninterpreted function to represent the result of key construction. The actual value
+    /// does not matter for the verification of callers.
+    spec fun spec_ed25519_authentication_key(public_key: vector<u8>): vector<u8>;
+
+    /// Compute a multied25519 account authentication key for the policy `k`
+    public fun multi_ed25519_authentication_key(k: &MultiEd25519PublicKey): vector<u8> {
+        let public_keys = &k.public_keys;
+        let len = vector::length(public_keys);
+        let authentication_key_preimage = vector::empty();
+        let i = 0;
+        while (i < len) {
+            let public_key = *vector::borrow(public_keys, i);
+            vector::append(
+                &mut authentication_key_preimage,
+                public_key
+            );
+            i = i + 1;
+        };
+        vector::append(&mut authentication_key_preimage, bcs::to_bytes(&k.threshold));
+        vector::push_back(&mut authentication_key_preimage, MULTI_ED25519_SCHEME_ID);
+        hash::sha3_256(authentication_key_preimage)
+    }
+    spec multi_ed25519_authentication_key {
+        pragma opaque;
+        aborts_if false;
+        ensures [abstract] result == spec_multi_ed25519_authentication_key(k);
+    }
+    /// We use an uninterpreted function to represent the result of key construction. The actual value
+    /// does not matter for the verification of callers.
+    spec fun spec_multi_ed25519_authentication_key(k: MultiEd25519PublicKey): vector<u8>;
+
+    /// Return the public keys involved in the multisig policy `k`
+    public fun public_keys(k: &MultiEd25519PublicKey): &vector<vector<u8>> {
+        &k.public_keys
+    }
+
+    /// Return the threshold for the multisig policy `k`
+    public fun threshold(k: &MultiEd25519PublicKey): u8 {
+        *&k.threshold
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move
new file mode 100644
index 000000000..7880280dc
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move
@@ -0,0 +1,265 @@
+/// A module implementing conflict-resistant sequence numbers (CRSNs).
+/// The specification, and formal description of the acceptance and rejection
+/// criteria, force expiration and window shifting of CRSNs are described in DIP-168.
+
+module DiemFramework::CRSN {
+    use DiemFramework::Roles;
+    use std::bit_vector::{Self, BitVector};
+    use std::event::{Self, EventHandle};
+    use std::signer;
+    use std::errors;
+
+    friend DiemFramework::DiemAccount;
+
+    /// A CRSN  represents a finite slice or window of an "infinite" bitvector
+    /// starting at zero with a size `k` defined dynamically at the time of
+    /// publication of CRSN resource. The `min_nonce` defines the left-hand
+    /// side of the slice, and the slice's state is held in `slots` and is of size `k`.
+    /// Diagrammatically:
+    /// ```
+    /// 1111...000000100001000000...0100001000000...0000...
+    ///        ^             ...                ^
+    ///        |____..._____slots______...______|
+    ///     min_nonce                       min_nonce + k - 1
+    /// ```
+    struct CRSN has key {
+        min_nonce: u64,
+        size: u64,
+        slots: BitVector,
+        force_shift_events: EventHandle<ForceShiftEvent>,
+    }
+
+    /// Whenever a force shift is performed a `ForceShiftEvent` is emitted.
+    /// This is used to prove the absence of a transaction at a specific sequence nonce.
+    struct ForceShiftEvent has drop, store {
+        /// current LHS of the CRSN state
+        current_min_nonce: u64,
+        /// The amount the window is being shifted
+        shift_amount: u64,
+        /// The state of the bitvector just before the shift. The state of
+        /// the CRSN's bitvector is needed at the time of the shift to prove
+        /// that a CRSNs nonce was expired, and not already used by a transaction
+        /// in the past. This can be used to prove that a transaction can't
+        /// exist from an account because the slot was expired and not used.
+        /// Note: the sequence  nonce of the shifting transaction will not be set.
+        bits_at_shift: BitVector,
+    }
+
+    /// Flag stored in memory to turn on CRSNs
+    struct CRSNsAllowed has key { }
+
+    /// No CRSN resource exists
+    const ENO_CRSN: u64 = 0;
+    /// A CRSN resource wasn't expected, but one was found
+    const EHAS_CRSN: u64 = 1;
+    /// The size given to the CRSN at the time of publishing was zero, which is not supported
+    const EZERO_SIZE_CRSN: u64 = 2;
+    /// The size given to the CRSN at the time of publishing was larger than the largest allowed CRSN size
+    const ECRSN_SIZE_TOO_LARGE: u64 = 3;
+    /// the amount to shift the CRSN window was zero
+    const EINVALID_SHIFT: u64 = 4;
+    /// CRSNs are not yet permitted in the network
+    const ENOT_INITIALIZED: u64 = 5;
+    /// CRSNs were already initialized
+    const EALREADY_INITIALIZED: u64 = 6;
+
+    const MAX_CRSN_SIZE: u64 = 256;
+
+    public fun allow_crsns(account: &signer) {
+        Roles::assert_diem_root(account);
+        assert!(!exists<CRSNsAllowed>(signer::address_of(account)), errors::invalid_state(EALREADY_INITIALIZED));
+        move_to(account, CRSNsAllowed { })
+    }
+
+    /// Publish a DSN under `account`. Cannot already have a DSN published.
+    public(friend) fun publish(account: &signer, min_nonce: u64, size: u64) {
+        assert!(!has_crsn(signer::address_of(account)), errors::invalid_state(EHAS_CRSN));
+        assert!(size > 0, errors::invalid_argument(EZERO_SIZE_CRSN));
+        assert!(size <= MAX_CRSN_SIZE, errors::invalid_argument(ECRSN_SIZE_TOO_LARGE));
+        assert!(exists<CRSNsAllowed>(@DiemRoot), errors::invalid_state(ENOT_INITIALIZED));
+        move_to(account, CRSN {
+            min_nonce,
+            size,
+            slots: bit_vector::new(size),
+            force_shift_events: event::new_event_handle<ForceShiftEvent>(account),
+        })
+    }
+    spec publish {
+        include bit_vector::NewAbortsIf{length: size};
+        aborts_if !exists<CRSNsAllowed>(@DiemRoot) with errors::INVALID_STATE;
+        aborts_if has_crsn(signer::address_of(account)) with errors::INVALID_STATE;
+        aborts_if size == 0 with errors::INVALID_ARGUMENT;
+        aborts_if size > MAX_CRSN_SIZE with errors::INVALID_ARGUMENT;
+        ensures exists<CRSN>(signer::address_of(account));
+    }
+
+    /// Record `sequence_nonce` under the `account`. Returns true if
+    /// `sequence_nonce` is accepted, returns false if the `sequence_nonce` is rejected.
+    public(friend) fun record(account: &signer, sequence_nonce: u64): bool
+    acquires CRSN {
+        let addr = signer::address_of(account);
+        if (check(account, sequence_nonce)) {
+            // CRSN exists by `check`.
+            let crsn = borrow_global_mut<CRSN>(addr);
+            // accept nonce
+            let scaled_nonce = sequence_nonce - crsn.min_nonce;
+            bit_vector::set(&mut crsn.slots, scaled_nonce);
+            shift_window_right(crsn);
+            return true
+        } else if (exists<CRSN>(addr)) { // window was force shifted in this transaction
+            let crsn = borrow_global<CRSN>(addr);
+            if (crsn.min_nonce > sequence_nonce) return true
+        };
+
+        false
+    }
+    spec record {
+        pragma opaque;
+        // TODO: Complete this spec when BitVector (specially its use of loops)
+        // is completely specified. The behavior of this function is abstracted
+        // out for now in order to make a progress in verifying the epilogue
+        // functions in the DiemAccount module.
+        modifies global<CRSN>(signer::address_of(account));
+        aborts_if [abstract] false;
+        ensures [abstract] result == true;
+    }
+
+    /// A stateless version of `record`: returns `true` if the `sequence_nonce`
+    /// will be accepted, and `false` otherwise.
+    public(friend) fun check(account: &signer, sequence_nonce: u64): bool
+    acquires CRSN {
+        let addr = signer::address_of(account);
+        assert!(has_crsn(addr), errors::invalid_state(ENO_CRSN));
+        let crsn = borrow_global_mut<CRSN>(addr);
+
+        // Don't accept if it's outside of the window
+        if ((sequence_nonce < crsn.min_nonce) ||
+            ((sequence_nonce as u128) >= (crsn.min_nonce as u128) + (bit_vector::length(&crsn.slots) as u128))) {
+            false
+        } else {
+            // scaled nonce is the index in the window
+            let scaled_nonce = sequence_nonce - crsn.min_nonce;
+
+            // Bit already set, reject, otherwise accept
+            !bit_vector::is_index_set(&crsn.slots, scaled_nonce)
+        }
+    }
+    spec check {
+        modifies global<CRSN>(signer::address_of(account));
+        include CheckAbortsIf{addr: signer::address_of(account)};
+    }
+    spec schema CheckAbortsIf {
+        addr: address;
+        sequence_nonce: u64;
+        let crsn = global<CRSN>(addr);
+        let scaled_nonce = sequence_nonce - crsn.min_nonce;
+        aborts_if !has_crsn(addr) with errors::INVALID_STATE;
+        include has_crsn(addr) &&
+                (sequence_nonce >= crsn.min_nonce) &&
+                (sequence_nonce + crsn.min_nonce < bit_vector::length(crsn.slots))
+        ==> bit_vector::IsIndexSetAbortsIf{bitvector: crsn.slots, bit_index: scaled_nonce };
+    }
+    spec fun spec_check(addr: address, sequence_nonce: u64): bool {
+        let crsn = global<CRSN>(addr);
+        if ((sequence_nonce < crsn.min_nonce) ||
+            (sequence_nonce >= crsn.min_nonce + bit_vector::length(crsn.slots))) {
+            false
+        } else {
+            let scaled_nonce = sequence_nonce - crsn.min_nonce;
+            !bit_vector::spec_is_index_set(crsn.slots, scaled_nonce)
+        }
+    }
+
+    /// Force expire transactions by forcibly shifting the window by
+    /// `shift_amount`. After the window has been shifted by `shift_amount` it is
+    /// then shifted over set bits as define by the `shift_window_right` function.
+    public fun force_expire(account: &signer, shift_amount: u64)
+    acquires CRSN {
+        assert!(shift_amount > 0, errors::invalid_argument(EINVALID_SHIFT));
+        let addr = signer::address_of(account);
+        assert!(has_crsn(addr), errors::invalid_state(ENO_CRSN));
+        let crsn = borrow_global_mut<CRSN>(addr);
+
+        event::emit_event(&mut crsn.force_shift_events, ForceShiftEvent {
+            current_min_nonce: crsn.min_nonce,
+            shift_amount: shift_amount,
+            bits_at_shift: *&crsn.slots,
+        });
+
+        bit_vector::shift_left(&mut crsn.slots, shift_amount);
+
+        crsn.min_nonce = crsn.min_nonce + shift_amount;
+        // shift over any set bits
+        shift_window_right(crsn);
+    }
+
+    spec force_expire {
+        // TODO: this ensures may not hold
+        // let addr = signer::address_of(account);
+        // ensures global<CRSN>(addr).min_nonce == old(global<CRSN>(addr)).min_nonce + shift_amount;
+    }
+    /// Return whether this address has a CRSN resource published under it.
+    public fun has_crsn(addr: address): bool {
+        exists<CRSN>(addr)
+    }
+
+    fun shift_window_right(crsn: &mut CRSN) {
+        let index = bit_vector::longest_set_sequence_starting_at(&crsn.slots, 0);
+
+        // if there is no run of set bits return early
+        if (index == 0) return;
+        bit_vector::shift_left(&mut crsn.slots, index);
+        crsn.min_nonce = crsn.min_nonce + index;
+    }
+
+
+    /***************************************************************************/
+    // tests
+    /***************************************************************************/
+
+    #[test_only]
+    public fun test_publish(account: &signer, min_nonce: u64, size: u64) {
+        publish(account, min_nonce, size)
+    }
+
+    #[test_only]
+    public fun test_record(account: &signer, sequence_nonce: u64): bool
+    acquires CRSN {
+        record(account, sequence_nonce)
+    }
+
+    #[test_only]
+    public fun test_check(account: &signer, sequence_nonce: u64): bool
+    acquires CRSN {
+        check(account, sequence_nonce)
+    }
+
+    #[test_only]
+    public fun test_force_expire(account: &signer, shift_amount: u64)
+    acquires CRSN {
+        force_expire(account, shift_amount)
+    }
+
+    #[test_only]
+    public fun slots(account: address): BitVector
+    acquires CRSN {
+        *&borrow_global<CRSN>(account).slots
+    }
+
+    #[test_only]
+    public fun min_nonce(account: address): u64
+    acquires CRSN {
+        *&borrow_global<CRSN>(account).min_nonce
+    }
+
+    #[test_only]
+    public fun size(account: address): u64
+    acquires CRSN {
+        *&borrow_global<CRSN>(account).size
+    }
+
+    #[test_only]
+    public fun max_crsn_size(): u64 {
+        MAX_CRSN_SIZE
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ChainId.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ChainId.move
new file mode 100644
index 000000000..8d3ba1555
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ChainId.move
@@ -0,0 +1,60 @@
+/// The chain id distinguishes between different chains (e.g., testnet and the main Diem network).
+/// One important role is to prevent transactions intended for one chain from being executed on another.
+/// This code provides a container for storing a chain id and functions to initialize and get it.
+module DiemFramework::ChainId {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::signer;
+
+    struct ChainId has key {
+        id: u8
+    }
+
+    /// The `ChainId` resource was not in the required state
+    const ECHAIN_ID: u64 = 0;
+
+    /// Publish the chain ID `id` of this Diem instance under the DiemRoot account
+    public fun initialize(dr_account: &signer, id: u8) {
+        DiemTimestamp::assert_genesis();
+        CoreAddresses::assert_diem_root(dr_account);
+        assert!(!exists<ChainId>(signer::address_of(dr_account)), errors::already_published(ECHAIN_ID));
+        move_to(dr_account, ChainId { id })
+    }
+
+    spec initialize {
+        pragma opaque;
+        let dr_addr = signer::address_of(dr_account);
+        modifies global<ChainId>(dr_addr);
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        aborts_if exists<ChainId>(dr_addr) with errors::ALREADY_PUBLISHED;
+        ensures exists<ChainId>(dr_addr);
+    }
+
+    /// Return the chain ID of this Diem instance
+    public fun get(): u8 acquires ChainId {
+        DiemTimestamp::assert_operating();
+        borrow_global<ChainId>(@DiemRoot).id
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Initialization
+
+    spec module {
+        /// When Diem is operating, the chain id is always available.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> exists<ChainId>(@DiemRoot);
+
+        // Could also specify that ChainId is not stored on any other address, but it doesn't matter.
+    }
+
+    /// # Helper Functions
+
+    spec fun spec_get_chain_id(): u8 {
+        global<ChainId>(@DiemRoot).id
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CoreAddresses.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CoreAddresses.move
new file mode 100644
index 000000000..1d79e9fa4
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/CoreAddresses.move
@@ -0,0 +1,83 @@
+/// Module providing well-known addresses and related logic.
+///
+/// > Note: this module currently defines zero-argument functions like `Self::DIEM_ROOT_ADDRESS()` using capitalization
+/// > in the name, following the convention for constants. Eventually, those functions are planned to become actual
+/// > global constants, once the Move language supports this feature.
+module DiemFramework::CoreAddresses {
+    use std::errors;
+    use std::signer;
+
+    /// The operation can only be performed by the account at 0xA550C18 (Diem Root)
+    const EDIEM_ROOT: u64 = 0;
+    /// The operation can only be performed by the account at 0xB1E55ED (Treasury & Compliance)
+    const ETREASURY_COMPLIANCE: u64 = 1;
+    /// The operation can only be performed by the VM
+    const EVM: u64 = 2;
+    /// The operation can only be performed by the account where currencies are registered
+    const ECURRENCY_INFO: u64 = 3;
+
+    /// Assert that the account is the Diem root address.
+    public fun assert_diem_root(account: &signer) {
+        assert!(signer::address_of(account) == @DiemRoot, errors::requires_address(EDIEM_ROOT))
+    }
+    spec assert_diem_root {
+        pragma opaque;
+        include AbortsIfNotDiemRoot;
+    }
+
+    /// Specifies that a function aborts if the account does not have the Diem root address.
+    spec schema AbortsIfNotDiemRoot {
+        account: signer;
+        aborts_if signer::address_of(account) != @DiemRoot with errors::REQUIRES_ADDRESS;
+    }
+
+    /// Assert that the signer has the treasury compliance address.
+    public fun assert_treasury_compliance(account: &signer) {
+        assert!(
+            signer::address_of(account) == @TreasuryCompliance,
+            errors::requires_address(ETREASURY_COMPLIANCE)
+        )
+    }
+    spec assert_treasury_compliance {
+        pragma opaque;
+        include AbortsIfNotTreasuryCompliance;
+    }
+
+    /// Specifies that a function aborts if the account does not have the treasury compliance address.
+    spec schema AbortsIfNotTreasuryCompliance {
+        account: signer;
+        aborts_if signer::address_of(account) != @TreasuryCompliance
+            with errors::REQUIRES_ADDRESS;
+    }
+
+    /// Assert that the signer has the VM reserved address.
+    public fun assert_vm(account: &signer) {
+        assert!(signer::address_of(account) == @VMReserved, errors::requires_address(EVM))
+    }
+    spec assert_vm {
+        pragma opaque;
+        include AbortsIfNotVM;
+    }
+
+    /// Specifies that a function aborts if the account does not have the VM reserved address.
+    spec schema AbortsIfNotVM {
+        account: signer;
+        aborts_if signer::address_of(account) != @VMReserved with errors::REQUIRES_ADDRESS;
+    }
+
+    /// Assert that the signer has the currency info address.
+    public fun assert_currency_info(account: &signer) {
+        assert!(signer::address_of(account) == @CurrencyInfo, errors::requires_address(ECURRENCY_INFO))
+    }
+    spec assert_currency_info {
+        pragma opaque;
+        include AbortsIfNotCurrencyInfo;
+    }
+
+    /// Specifies that a function aborts if the account has not the currency info address.
+    spec schema AbortsIfNotCurrencyInfo {
+        account: signer;
+        aborts_if signer::address_of(account) != @CurrencyInfo with errors::REQUIRES_ADDRESS;
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DesignatedDealer.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DesignatedDealer.move
new file mode 100644
index 000000000..de4fb50b7
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DesignatedDealer.move
@@ -0,0 +1,221 @@
+/// Module providing functionality for designated dealers.
+module DiemFramework::DesignatedDealer {
+    use DiemFramework::Diem;
+    use DiemFramework::Roles;
+    use DiemFramework::XUS::XUS;
+    use std::errors;
+    use std::event;
+    use std::signer;
+    friend DiemFramework::DiemAccount;
+
+    /// A `DesignatedDealer` always holds this `Dealer` resource regardless of the
+    /// currencies it can hold. All `ReceivedMintEvent` events for all
+    /// currencies will be emitted on `mint_event_handle`.
+    struct Dealer has key {
+        /// Handle for mint events
+        mint_event_handle: event::EventHandle<ReceivedMintEvent>,
+    }
+
+    spec schema AbortsIfNoDealer {
+        dd_addr: address;
+        aborts_if !exists<Dealer>(dd_addr) with errors::NOT_PUBLISHED;
+    }
+
+    /// The `TierInfo` resource holds the information needed to track which
+    /// tier a mint to a DD needs to be in.
+    /// DEPRECATED: This resource is no longer used and will be removed from the system
+    // PreburnQueue published at top level in Diem.move
+    struct TierInfo<phantom CoinType> has key {
+        /// Time window start in microseconds
+        window_start: u64,
+        /// The minted inflow during this time window
+        window_inflow: u64,
+        /// 0-indexed array of tier upperbounds
+        tiers: vector<u64>,
+    }
+
+    /// Message for mint events
+    struct ReceivedMintEvent has drop, store {
+        /// The currency minted
+        currency_code: vector<u8>,
+        /// The address that receives the mint
+        destination_address: address,
+        /// The amount minted (in base units of `currency_code`)
+        amount: u64,
+    }
+
+    /// The `DesignatedDealer` resource is in an invalid state
+    const EDEALER: u64 = 0;
+    // Error codes 1 -- 3 were deprecated along with tiered minting in Diem Framework version 2
+    // const EINVALID_TIER_ADDITION: u64 = 1;
+    // const EINVALID_TIER_START: u64 = 2;
+    // const EINVALID_TIER_INDEX: u64 = 3;
+    /// A zero mint amount was provided
+    const EINVALID_MINT_AMOUNT: u64 = 4;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // To-be designated-dealer called functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Publishes a `Dealer` resource under `dd` with a `PreburnQueue`.
+    /// If `add_all_currencies = true` this will add a `PreburnQueue`,
+    /// for each known currency at launch.
+    public(friend) fun publish_designated_dealer_credential<CoinType>(
+        dd: &signer,
+        tc_account: &signer,
+        add_all_currencies: bool,
+    ){
+        Roles::assert_treasury_compliance(tc_account);
+        Roles::assert_designated_dealer(dd);
+        assert!(!exists<Dealer>(signer::address_of(dd)), errors::already_published(EDEALER));
+        move_to(dd, Dealer { mint_event_handle: event::new_event_handle<ReceivedMintEvent>(dd) });
+        if (add_all_currencies) {
+            add_currency<XUS>(dd, tc_account);
+        } else {
+            add_currency<CoinType>(dd, tc_account);
+        };
+    }
+    spec publish_designated_dealer_credential {
+        pragma opaque;
+
+        let dd_addr = signer::address_of(dd);
+
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include Roles::AbortsIfNotDesignatedDealer{account: dd};
+        aborts_if exists<Dealer>(dd_addr) with errors::ALREADY_PUBLISHED;
+        include if (add_all_currencies) AddCurrencyAbortsIf<XUS>{dd_addr: dd_addr}
+                else AddCurrencyAbortsIf<CoinType>{dd_addr: dd_addr};
+
+        modifies global<Dealer>(dd_addr);
+        ensures exists<Dealer>(dd_addr);
+        modifies global<event::EventHandleGenerator>(dd_addr);
+        modifies global<Diem::PreburnQueue<CoinType>>(dd_addr);
+        modifies global<Diem::PreburnQueue<XUS>>(dd_addr);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs by Treasury Compliance Account
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Adds the needed resources to the DD account `dd` in order to work with `CoinType`.
+    /// Public so that a currency can be added to a DD later on. Will require
+    /// multi-signer transactions in order to add a new currency to an existing DD.
+    public(friend) fun add_currency<CoinType>(dd: &signer, tc_account: &signer) {
+        Roles::assert_treasury_compliance(tc_account);
+        let dd_addr = signer::address_of(dd);
+        assert!(exists_at(dd_addr), errors::not_published(EDEALER));
+        Diem::publish_preburn_queue_to_account<CoinType>(dd, tc_account);
+    }
+    // #[test_only] TODO: uncomment once unit tests are fully migrated
+    public fun add_currency_for_test<CoinType>(dd: &signer, tc_account: &signer) {
+        add_currency<CoinType>(dd, tc_account)
+    }
+    spec add_currency {
+        pragma opaque;
+
+        let dd_addr = signer::address_of(dd);
+
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include Roles::AbortsIfNotDesignatedDealer{account: dd};
+        include AbortsIfNoDealer{dd_addr: dd_addr};
+        include AddCurrencyAbortsIf<CoinType>{dd_addr: dd_addr};
+
+        modifies global<Diem::PreburnQueue<CoinType>>(dd_addr);
+    }
+    spec schema AddCurrencyAbortsIf<CoinType> {
+        dd_addr: address;
+        include Diem::AbortsIfNoCurrency<CoinType>;
+        aborts_if Diem::is_synthetic_currency<CoinType>() with errors::INVALID_ARGUMENT;
+        aborts_if exists<Diem::PreburnQueue<CoinType>>(dd_addr) with errors::ALREADY_PUBLISHED;
+        aborts_if exists<Diem::Preburn<CoinType>>(dd_addr) with errors::INVALID_STATE;
+    }
+
+    public fun tiered_mint<CoinType>(
+        tc_account: &signer,
+        amount: u64,
+        dd_addr: address,
+        // tiers are deprecated. We continue to accept this argument for backward
+        // compatibility, but it will be ignored.
+        _tier_index: u64,
+    ): Diem::Diem<CoinType> acquires Dealer, TierInfo {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(amount > 0, errors::invalid_argument(EINVALID_MINT_AMOUNT));
+        assert!(exists_at(dd_addr), errors::not_published(EDEALER));
+
+        // Delete deprecated `TierInfo` resources.
+        // TODO: delete this code once there are no more TierInfo resources in the system
+        if (exists<TierInfo<CoinType>>(dd_addr)) {
+            let TierInfo { window_start: _, window_inflow: _, tiers: _ } = move_from<TierInfo<CoinType>>(dd_addr);
+        };
+
+        // Send ReceivedMintEvent
+        event::emit_event<ReceivedMintEvent>(
+            &mut borrow_global_mut<Dealer>(dd_addr).mint_event_handle,
+            ReceivedMintEvent {
+                currency_code: Diem::currency_code<CoinType>(),
+                destination_address: dd_addr,
+                amount
+            },
+        );
+        Diem::mint<CoinType>(tc_account, amount)
+    }
+    spec tiered_mint {
+        pragma opaque;
+
+        include TieredMintAbortsIf<CoinType>;
+        include TieredMintEmits<CoinType>;
+
+        modifies global<Dealer>(dd_addr);
+        ensures exists<Dealer>(dd_addr);
+        modifies global<Diem::CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<Diem::CurrencyInfo<CoinType>>(@CurrencyInfo);
+        modifies global<TierInfo<CoinType>>(dd_addr);
+        ensures !exists<TierInfo<CoinType>>(dd_addr);
+        let currency_info = global<Diem::CurrencyInfo<CoinType>>(@CurrencyInfo);
+        let post post_currency_info = global<Diem::CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures result.value == amount;
+        ensures post_currency_info == update_field(currency_info, total_value, currency_info.total_value + amount);
+    }
+    spec schema TieredMintAbortsIf<CoinType> {
+        tc_account: signer;
+        dd_addr: address;
+        amount: u64;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if amount == 0 with errors::INVALID_ARGUMENT;
+        include AbortsIfNoDealer;
+        aborts_if !exists<Diem::MintCapability<CoinType>>(signer::address_of(tc_account)) with errors::REQUIRES_CAPABILITY;
+        include Diem::MintAbortsIf<CoinType>{value: amount};
+    }
+    spec schema TieredMintEmits<CoinType> {
+        dd_addr: address;
+        amount: u64;
+        let handle = global<Dealer>(dd_addr).mint_event_handle;
+        let msg = ReceivedMintEvent {
+            currency_code: Diem::spec_currency_code<CoinType>(),
+            destination_address: dd_addr,
+            amount,
+        };
+        emits msg to handle;
+        include Diem::MintEmits<CoinType>{value: amount};
+    }
+
+    public fun exists_at(dd_addr: address): bool {
+        exists<Dealer>(dd_addr)
+    }
+    spec exists_at {
+        pragma opaque;
+        aborts_if false;
+        ensures result == exists<Dealer>(dd_addr);
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    spec module {
+        /// resource struct Dealer persists after publication
+        invariant update forall addr: address where old(exists<Dealer>(addr)): exists<Dealer>(addr);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Diem.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Diem.move
new file mode 100644
index 000000000..9681b7562
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Diem.move
@@ -0,0 +1,1940 @@
+/// The `Diem` module describes the concept of a coin in the Diem framework. It introduces the
+/// resource `Diem::Diem<CoinType>`, representing a coin of given coin type.
+/// The module defines functions operating on coins as well as functionality like
+/// minting and burning of coins.
+module DiemFramework::Diem {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::RegisteredCurrencies;
+    use DiemFramework::Roles;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::event::{Self, EventHandle};
+    use std::fixed_point32::{Self, FixedPoint32};
+    use std::signer;
+    use std::vector;
+
+    friend DiemFramework::DesignatedDealer;
+    friend DiemFramework::XDX;
+    friend DiemFramework::TransactionFee;
+
+    /// The `Diem` resource defines the Diem coin for each currency in
+    /// Diem. Each "coin" is coupled with a type `CoinType` specifying the
+    /// currency of the coin, and a `value` field specifying the value
+    /// of the coin (in the base units of the currency `CoinType`
+    /// and specified in the `CurrencyInfo` resource for that `CoinType`
+    /// published under the `@CurrencyInfo` account address).
+    struct Diem<phantom CoinType> has store {
+        /// The value of this coin in the base units for `CoinType`
+        value: u64
+    }
+
+    /// The `MintCapability` resource defines a capability to allow minting
+    /// of coins of `CoinType` currency by the holder of this capability.
+    /// This capability is held only either by the `@TreasuryCompliance`
+    /// account or the `DiemFramework::XDX` module (and `@DiemRoot` in testnet).
+    struct MintCapability<phantom CoinType> has key, store { }
+
+    /// The `BurnCapability` resource defines a capability to allow coins
+    /// of `CoinType` currency to be burned by the holder of it.
+    struct BurnCapability<phantom CoinType> has key, store { }
+
+    /// A `MintEvent` is emitted every time a Diem coin is minted. This
+    /// contains the `amount` minted (in base units of the currency being
+    /// minted) along with the `currency_code` for the coin(s) being
+    /// minted, and that is defined in the `currency_code` field of the
+    /// `CurrencyInfo` resource for the currency.
+    struct MintEvent has drop, store {
+        /// Funds added to the system
+        amount: u64,
+        /// ASCII encoded symbol for the coin type (e.g., "XDX")
+        currency_code: vector<u8>,
+    }
+
+    /// A `BurnEvent` is emitted every time a non-synthetic Diem coin
+    /// (i.e., a Diem coin with false `is_synthetic` field) is
+    /// burned. It contains the `amount` burned in base units for the
+    /// currency, along with the `currency_code` for the coins being burned
+    /// (and as defined in the `CurrencyInfo` resource for that currency).
+    /// It also contains the `preburn_address` from which the coin is
+    /// extracted for burning.
+    struct BurnEvent has drop, store {
+        /// Funds removed from the system
+        amount: u64,
+        /// ASCII encoded symbol for the coin type (e.g., "XDX")
+        currency_code: vector<u8>,
+        /// Address with the `PreburnQueue` resource that stored the now-burned funds
+        preburn_address: address,
+    }
+
+    /// A `PreburnEvent` is emitted every time an `amount` of funds with
+    /// a coin type `currency_code` is enqueued in the `PreburnQueue` resource under
+    /// the account at the address `preburn_address`.
+    struct PreburnEvent has drop, store {
+        /// The amount of funds waiting to be removed (burned) from the system
+        amount: u64,
+        /// ASCII encoded symbol for the coin type (e.g., "XDX")
+        currency_code: vector<u8>,
+        /// Address with the `PreburnQueue` resource that now holds the funds
+        preburn_address: address,
+    }
+
+    /// A `CancelBurnEvent` is emitted every time funds of `amount` in a `Preburn`
+    /// resource held in a `PreburnQueue` at `preburn_address` is canceled (removed from the
+    /// preburn queue, but not burned). The currency of the funds is given by the
+    /// `currency_code` as defined in the `CurrencyInfo` for that currency.
+    struct CancelBurnEvent has drop, store {
+        /// The amount of funds returned
+        amount: u64,
+        /// ASCII encoded symbol for the coin type (e.g., "XDX")
+        currency_code: vector<u8>,
+        /// Address of the `PreburnQueue` resource that held the now-returned funds.
+        preburn_address: address,
+    }
+
+    /// An `ToXDXExchangeRateUpdateEvent` is emitted every time the to-XDX exchange
+    /// rate for the currency given by `currency_code` is updated.
+    struct ToXDXExchangeRateUpdateEvent has drop, store {
+        /// The currency code of the currency whose exchange rate was updated.
+        currency_code: vector<u8>,
+        /// The new on-chain to-XDX exchange rate between the
+        /// `currency_code` currency and XDX. Represented in conversion
+        /// between the (on-chain) base-units for the currency and microdiem.
+        new_to_xdx_exchange_rate: u64,
+    }
+
+    /// The `CurrencyInfo<CoinType>` resource stores the various
+    /// pieces of information needed for a currency (`CoinType`) that is
+    /// registered on-chain. This resource _must_ be published under the
+    /// address given by `@CurrencyInfo` in order for the registration of
+    /// `CoinType` as a recognized currency on-chain to be successful. At
+    /// the time of registration, the `MintCapability<CoinType>` and
+    /// `BurnCapability<CoinType>` capabilities are returned to the caller.
+    /// Unless they are specified otherwise the fields in this resource are immutable.
+    struct CurrencyInfo<phantom CoinType> has key {
+        /// The total value for the currency represented by `CoinType`. Mutable.
+        total_value: u128,
+        /// Value of funds that are in the process of being burned.  Mutable.
+        preburn_value: u64,
+        /// The (rough) exchange rate from `CoinType` to `XDX`. Mutable.
+        to_xdx_exchange_rate: FixedPoint32,
+        /// Holds whether or not this currency is synthetic (contributes to the
+        /// off-chain reserve) or not. An example of such a synthetic
+        ///currency would be the XDX.
+        is_synthetic: bool,
+        /// The scaling factor for the coin (i.e. the amount to divide by
+        /// to get to the human-readable representation for this currency).
+        /// e.g. 10^6 for `XUS`
+        scaling_factor: u64,
+        /// The smallest fractional part (number of decimal places) to be
+        /// used in the human-readable representation for the currency (e.g.
+        /// 10^2 for `XUS` cents)
+        fractional_part: u64,
+        /// The code symbol for this `CoinType`. ASCII encoded.
+        /// e.g. for "XDX" this is x"584458". No character limit.
+        currency_code: vector<u8>,
+        /// Minting of new currency of CoinType is allowed only if this field is true.
+        /// We may want to disable the ability to mint further coins of a
+        /// currency while that currency is still around. This allows us to
+        /// keep the currency in circulation while disallowing further
+        /// creation of coins in the `CoinType` currency. Mutable.
+        can_mint: bool,
+        /// Event stream for minting and where `MintEvent`s will be emitted.
+        mint_events: EventHandle<MintEvent>,
+        /// Event stream for burning, and where `BurnEvent`s will be emitted.
+        burn_events: EventHandle<BurnEvent>,
+        /// Event stream for preburn requests, and where all
+        /// `PreburnEvent`s for this `CoinType` will be emitted.
+        preburn_events: EventHandle<PreburnEvent>,
+        /// Event stream for all cancelled preburn requests for this
+        /// `CoinType`.
+        cancel_burn_events: EventHandle<CancelBurnEvent>,
+        /// Event stream for emiting exchange rate change events
+        exchange_rate_update_events: EventHandle<ToXDXExchangeRateUpdateEvent>,
+    }
+
+    /// The maximum value for `CurrencyInfo.scaling_factor`
+    const MAX_SCALING_FACTOR: u64 = 10000000000;
+
+    /// Data structure invariant for CurrencyInfo.  Asserts that `CurrencyInfo.scaling_factor`
+    /// is always greater than 0 and not greater than `MAX_SCALING_FACTOR`
+    spec CurrencyInfo {
+        invariant 0 < scaling_factor && scaling_factor <= MAX_SCALING_FACTOR;
+    }
+
+    /// A holding area where funds that will subsequently be burned wait while their underlying
+    /// assets are moved off-chain.
+    /// This resource can only be created by the holder of a `BurnCapability`
+    /// or during an upgrade process to the `PreburnQueue` by a designated
+    /// dealer. An account that contains this address has the authority to
+    /// initiate a burn request. A burn request can be resolved by the holder
+    /// of a `BurnCapability` by either (1) burning the funds, or (2) returning
+    /// the funds to the account that initiated the burn request.
+    struct Preburn<phantom CoinType> has key, store {
+        /// A single pending burn amount. This is an element in the
+        /// `PreburnQueue` resource published under each Designated Dealer account.
+        to_burn: Diem<CoinType>,
+    }
+
+    /// A preburn request, along with (an opaque to Move) metadata that is
+    /// associated with the preburn request.
+    struct PreburnWithMetadata<phantom CoinType> has store {
+        preburn: Preburn<CoinType>,
+        metadata: vector<u8>,
+    }
+
+    /// A queue of preburn requests. This is a FIFO queue whose elements
+    /// are indexed by the value held within each preburn resource in the
+    /// `preburns` field. When burning or cancelling a burn of a given
+    /// `amount`, the `Preburn` resource with with the smallest index in this
+    /// queue matching `amount` in its `to_burn` coin's `value` field will be
+    /// removed and its contents either (1) burned, or (2) returned
+    /// back to the holding DD's account balance. Every `Preburn` resource in
+    /// the `PreburnQueue` must have a nonzero coin value within it.
+    /// This resource can be created by either the TreasuryCompliance
+    /// account, or during the upgrade process, by a designated dealer with an
+    /// existing `Preburn` resource in `CoinType`
+    struct PreburnQueue<phantom CoinType> has key {
+        /// The queue of preburn requests
+        preburns: vector<PreburnWithMetadata<CoinType>>,
+    }
+
+    spec PreburnQueue {
+        /// The number of outstanding preburn requests is bounded.
+        invariant len(preburns) <= MAX_OUTSTANDING_PREBURNS;
+        /// No preburn request can have a zero value.
+        /// The `value` field of any coin in a `Preburn` resource
+        /// within this field must be nonzero.
+        invariant forall i in 0..len(preburns): preburns[i].preburn.to_burn.value > 0;
+    }
+
+    /// Maximum u64 value.
+    const MAX_U64: u64 = 18446744073709551615;
+    /// Maximum u128 value.
+    const MAX_U128: u128 = 340282366920938463463374607431768211455;
+
+    /// A `BurnCapability` resource is in an unexpected state.
+    const EBURN_CAPABILITY: u64 = 0;
+    /// A property expected of a `CurrencyInfo` resource didn't hold
+    const ECURRENCY_INFO: u64 = 1;
+    /// A property expected of a `Preburn` resource didn't hold
+    const EPREBURN: u64 = 2;
+    /// The preburn slot is already occupied with coins to be burned.
+    const EPREBURN_OCCUPIED: u64 = 3;
+    /// A burn was attempted on `Preburn` resource that cointained no coins
+    const EPREBURN_EMPTY: u64 = 4;
+    /// Minting is not allowed for the specified currency
+    const EMINTING_NOT_ALLOWED: u64 = 5;
+    /// The currency specified is a synthetic (non-fiat) currency
+    const EIS_SYNTHETIC_CURRENCY: u64 = 6;
+    /// A property expected of the coin provided didn't hold
+    const ECOIN: u64 = 7;
+    /// The destruction of a non-zero coin was attempted. Non-zero coins must be burned.
+    const EDESTRUCTION_OF_NONZERO_COIN: u64 = 8;
+    /// A property expected of `MintCapability` didn't hold
+    const EMINT_CAPABILITY: u64 = 9;
+    /// A withdrawal greater than the value of the coin was attempted.
+    const EAMOUNT_EXCEEDS_COIN_VALUE: u64 = 10;
+    /// A property expected of the `PreburnQueue` resource didn't hold.
+    const EPREBURN_QUEUE: u64 = 11;
+    /// A preburn with a matching amount in the preburn queue was not found.
+    const EPREBURN_NOT_FOUND: u64 = 12;
+
+    /// The maximum number of preburn requests that can be outstanding for a
+    /// given designated dealer/currency.
+    const MAX_OUTSTANDING_PREBURNS: u64 = 256;
+
+    /// Initialization of the `Diem` module. Initializes the set of
+    /// registered currencies in the `DiemFramework::RegisteredCurrencies` on-chain
+    /// config, and publishes the `CurrencyRegistrationCapability` under the
+    /// `@DiemRoot`. This can only be called from genesis.
+    public fun initialize(
+        dr_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint
+        CoreAddresses::assert_diem_root(dr_account);
+        RegisteredCurrencies::initialize(dr_account);
+    }
+    spec initialize {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        include RegisteredCurrencies::InitializeAbortsIf;
+        include RegisteredCurrencies::InitializeEnsures;
+    }
+
+    /// Publishes the `BurnCapability` `cap` for the `CoinType` currency under `account`. `CoinType`
+    /// must be a registered currency type. The caller must pass a treasury compliance account.
+    public(friend) fun publish_burn_capability<CoinType>(
+        tc_account: &signer,
+        cap: BurnCapability<CoinType>,
+    ) {
+        Roles::assert_treasury_compliance(tc_account);
+        assert_is_currency<CoinType>();
+        assert!(
+            !exists<BurnCapability<CoinType>>(signer::address_of(tc_account)),
+            errors::already_published(EBURN_CAPABILITY)
+        );
+        move_to(tc_account, cap)
+    }
+    spec publish_burn_capability {
+        pragma delegate_invariants_to_caller;
+        aborts_if !spec_is_currency<CoinType>();
+        include PublishBurnCapAbortsIfs<CoinType>;
+    }
+    spec schema PublishBurnCapAbortsIfs<CoinType> {
+        tc_account: &signer;
+        /// Must abort if tc_account does not have the TreasuryCompliance role.
+        /// Only a TreasuryCompliance account can have the BurnCapability [[H3]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if exists<BurnCapability<CoinType>>(signer::address_of(tc_account)) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema PublishBurnCapEnsures<CoinType> {
+        tc_account: &signer;
+        ensures exists<BurnCapability<CoinType>>(signer::address_of(tc_account));
+    }
+
+    /// Mints `amount` of currency. The `account` must hold a
+    /// `MintCapability<CoinType>` at the top-level in order for this call
+    /// to be successful.
+    public fun mint<CoinType>(account: &signer, value: u64): Diem<CoinType>
+    acquires CurrencyInfo, MintCapability {
+        let addr = signer::address_of(account);
+        assert!(exists<MintCapability<CoinType>>(addr), errors::requires_capability(EMINT_CAPABILITY));
+        mint_with_capability(
+            value,
+            borrow_global<MintCapability<CoinType>>(addr)
+        )
+    }
+    spec mint {
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        /// Must abort if the account does not have the MintCapability [[H1]][PERMISSION].
+        aborts_if !exists<MintCapability<CoinType>>(signer::address_of(account)) with errors::REQUIRES_CAPABILITY;
+
+        include MintAbortsIf<CoinType>;
+        include MintEnsures<CoinType>;
+    }
+
+    /// Burns the coins held in the first `Preburn` request in the `PreburnQueue`
+    /// resource held under `preburn_address` that is equal to `amount`.
+    /// Calls to this functions will fail if the `account` does not have a
+    /// published `BurnCapability` for the `CoinType` published under it, or if
+    /// there is not a `Preburn` request in the `PreburnQueue` that does not
+    /// equal `amount`.
+    public fun burn<CoinType>(
+        account: &signer,
+        preburn_address: address,
+        amount: u64,
+    ) acquires BurnCapability, CurrencyInfo, PreburnQueue {
+        let addr = signer::address_of(account);
+        assert!(exists<BurnCapability<CoinType>>(addr), errors::requires_capability(EBURN_CAPABILITY));
+        burn_with_capability(
+            preburn_address,
+            borrow_global<BurnCapability<CoinType>>(addr),
+            amount
+        )
+    }
+    spec burn {
+        include BurnAbortsIf<CoinType>;
+        include BurnEnsures<CoinType>;
+        include BurnWithResourceCapEmits<CoinType>{preburn: spec_make_preburn(amount)};
+    }
+    spec schema BurnAbortsIf<CoinType> {
+        account: signer;
+        preburn_address: address;
+
+        /// Must abort if the account does not have the BurnCapability [[H3]][PERMISSION].
+        aborts_if !exists<BurnCapability<CoinType>>(signer::address_of(account)) with errors::REQUIRES_CAPABILITY;
+        include BurnWithCapabilityAbortsIf<CoinType>;
+    }
+    spec schema BurnEnsures<CoinType> {
+        account: signer;
+        preburn_address: address;
+        include BurnWithCapabilityEnsures<CoinType>;
+    }
+    spec schema AbortsIfNoPreburnQueue<CoinType> {
+        preburn_address: address;
+        aborts_if !exists<PreburnQueue<CoinType>>(preburn_address) with errors::NOT_PUBLISHED;
+    }
+
+    /// Cancels the `Preburn` request in the `PreburnQueue` resource held
+    /// under the `preburn_address` with a value equal to `amount`, and returns the coins.
+    /// Calls to this will fail if the sender does not have a published
+    /// `BurnCapability<CoinType>`, or if there is no preburn request
+    /// outstanding in the `PreburnQueue` resource under `preburn_address` with
+    /// a value equal to `amount`.
+    public fun cancel_burn<CoinType>(
+        account: &signer,
+        preburn_address: address,
+        amount: u64,
+    ): Diem<CoinType> acquires BurnCapability, CurrencyInfo, PreburnQueue {
+        assert_is_currency<CoinType>();
+        let addr = signer::address_of(account);
+        assert!(exists<BurnCapability<CoinType>>(addr), errors::requires_capability(EBURN_CAPABILITY));
+        cancel_burn_with_capability(
+            preburn_address,
+            borrow_global<BurnCapability<CoinType>>(addr),
+            amount,
+        )
+    }
+    spec cancel_burn {
+        let currency_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        let post post_currency_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        modifies global<PreburnQueue<CoinType>>(preburn_address);
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include CancelBurnAbortsIf<CoinType>;
+        include CancelBurnWithCapEnsures<CoinType>;
+        include CancelBurnWithCapEmits<CoinType>;
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<PreburnQueue<CoinType>>(preburn_address);
+        ensures post_currency_info == update_field(
+            currency_info,
+            preburn_value,
+            post_currency_info.preburn_value
+        );
+        ensures result.value == amount;
+        ensures result.value > 0;
+    }
+
+    spec schema CancelBurnAbortsIf<CoinType> {
+        account: signer;
+        preburn_address: address;
+        amount: u64;
+        /// Must abort if the account does not have the BurnCapability [[H3]][PERMISSION].
+        aborts_if !exists<BurnCapability<CoinType>>(signer::address_of(account)) with errors::REQUIRES_CAPABILITY;
+        include CancelBurnWithCapAbortsIf<CoinType>;
+    }
+
+
+    /// Mint a new `Diem` coin of `CoinType` currency worth `value`. The
+    /// caller must have a reference to a `MintCapability<CoinType>`. Only
+    /// the treasury compliance account or the `DiemFramework::XDX` module can acquire such a
+    /// reference.
+    public(friend) fun mint_with_capability<CoinType>(
+        value: u64,
+        _capability: &MintCapability<CoinType>
+    ): Diem<CoinType> acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        let currency_code = currency_code<CoinType>();
+        // update market cap resource to reflect minting
+        let info = borrow_global_mut<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        assert!(info.can_mint, errors::invalid_state(EMINTING_NOT_ALLOWED));
+        assert!(MAX_U128 - info.total_value >= (value as u128), errors::limit_exceeded(ECURRENCY_INFO));
+        info.total_value = info.total_value + (value as u128);
+        // don't emit mint events for synthetic currenices as this does not
+        // change the total value of fiat currencies held on-chain.
+        if (!info.is_synthetic) {
+            event::emit_event(
+                &mut info.mint_events,
+                MintEvent{
+                    amount: value,
+                    currency_code,
+                }
+            );
+        };
+
+        Diem<CoinType> { value }
+    }
+    spec mint_with_capability {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include MintAbortsIf<CoinType>;
+        include MintEnsures<CoinType>;
+        include MintEmits<CoinType>;
+    }
+    spec schema MintAbortsIf<CoinType> {
+        value: u64;
+        include AbortsIfNoCurrency<CoinType>;
+        aborts_if !spec_currency_info<CoinType>().can_mint with errors::INVALID_STATE;
+        aborts_if spec_currency_info<CoinType>().total_value + value > max_u128() with errors::LIMIT_EXCEEDED;
+    }
+    spec schema MintEnsures<CoinType> {
+        value: u64;
+        result: Diem<CoinType>;
+        let currency_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        let post post_currency_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures post_currency_info == update_field(currency_info, total_value, currency_info.total_value + value);
+        ensures result.value == value;
+    }
+    spec schema MintEmits<CoinType> {
+        value: u64;
+        let currency_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        let handle = currency_info.mint_events;
+        let msg = MintEvent{
+            amount: value,
+            currency_code: currency_info.currency_code,
+        };
+        emits msg to handle if !currency_info.is_synthetic;
+    }
+
+    /// Add the `coin` to the `preburn.to_burn` field in the `Preburn` resource
+    /// held in the preburn queue at the address `preburn_address` if it is
+    /// empty, otherwise raise a `EPREBURN_OCCUPIED` Error. Emits a
+    /// `PreburnEvent` to the `preburn_events` event stream in the
+    /// `CurrencyInfo` for the `CoinType` passed in. However, if the currency
+    /// being preburned is a synthetic currency (`is_synthetic = true`) then no
+    /// `PreburnEvent` will be emitted.
+    fun preburn_with_resource<CoinType>(
+        coin: Diem<CoinType>,
+        preburn: &mut Preburn<CoinType>,
+        preburn_address: address,
+    ) acquires CurrencyInfo {
+        let coin_value = value(&coin);
+        // Throw if already occupied
+        assert!(value(&preburn.to_burn) == 0, errors::invalid_state(EPREBURN_OCCUPIED));
+        deposit(&mut preburn.to_burn, coin);
+        let currency_code = currency_code<CoinType>();
+        let info = borrow_global_mut<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        assert!(MAX_U64 - info.preburn_value >= coin_value, errors::limit_exceeded(ECOIN));
+        info.preburn_value = info.preburn_value + coin_value;
+        // don't emit preburn events for synthetic currenices as this does not
+        // change the total value of fiat currencies held on-chain, and
+        // therefore no off-chain movement of the backing coins needs to be
+        // performed.
+        if (!info.is_synthetic) {
+            event::emit_event(
+                &mut info.preburn_events,
+                PreburnEvent{
+                    amount: coin_value,
+                    currency_code,
+                    preburn_address,
+                }
+            );
+        };
+    }
+    spec preburn_with_resource {
+        pragma delegate_invariants_to_caller;
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include PreburnWithResourceAbortsIf<CoinType>{amount: coin.value};
+        include PreburnEnsures<CoinType>{amount: coin.value};
+        include PreburnWithResourceEmits<CoinType>{amount: coin.value};
+    }
+    spec schema PreburnWithResourceAbortsIf<CoinType> {
+        amount: u64;
+        preburn: Preburn<CoinType>;
+        aborts_if preburn.to_burn.value > 0 with errors::INVALID_STATE;
+        include PreburnAbortsIf<CoinType>;
+    }
+    spec schema PreburnAbortsIf<CoinType> {
+        amount: u64;
+        include AbortsIfNoCurrency<CoinType>;
+        aborts_if spec_currency_info<CoinType>().preburn_value + amount > MAX_U64 with errors::LIMIT_EXCEEDED;
+    }
+    spec schema PreburnEnsures<CoinType> {
+        amount: u64;
+        preburn: Preburn<CoinType>;
+        let info = spec_currency_info<CoinType>();
+        let post post_info = spec_currency_info<CoinType>();
+        ensures post_info == update_field(info, preburn_value, info.preburn_value + amount);
+    }
+    spec schema PreburnWithResourceEmits<CoinType> {
+        amount: u64;
+        preburn_address: address;
+        let info = spec_currency_info<CoinType>();
+        let currency_code = spec_currency_code<CoinType>();
+        let handle = info.preburn_events;
+        let msg = PreburnEvent {
+            amount,
+            currency_code,
+            preburn_address,
+        };
+        emits msg to handle if !info.is_synthetic;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Treasury Compliance specific methods for DDs
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Create a `Preburn<CoinType>` resource.
+    /// This is useful for places where a module needs to be able to burn coins
+    /// outside of a Designated Dealer, e.g., for transaction fees, or for the XDX reserve.
+    public fun create_preburn<CoinType>(
+        tc_account: &signer
+    ): Preburn<CoinType> {
+        Roles::assert_treasury_compliance(tc_account);
+        assert_is_currency<CoinType>();
+        Preburn<CoinType> { to_burn: zero<CoinType>() }
+    }
+    spec create_preburn {
+        include CreatePreburnAbortsIf<CoinType>;
+    }
+    spec schema CreatePreburnAbortsIf<CoinType> {
+        tc_account: signer;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include AbortsIfNoCurrency<CoinType>;
+    }
+
+    /// Publish an empty `PreburnQueue` resource under the Designated Dealer
+    /// dealer account `account`.
+    fun publish_preburn_queue<CoinType>(
+        account: &signer
+    ) {
+        let account_addr = signer::address_of(account);
+        Roles::assert_designated_dealer(account);
+        assert_is_currency<CoinType>();
+        assert!(
+            !exists<Preburn<CoinType>>(account_addr),
+            errors::invalid_state(EPREBURN)
+        );
+        assert!(
+            !exists<PreburnQueue<CoinType>>(account_addr),
+            errors::already_published(EPREBURN_QUEUE)
+        );
+        move_to(account, PreburnQueue<CoinType> {
+            preburns: vector::empty()
+        })
+    }
+    spec publish_preburn_queue {
+        pragma opaque;
+        let account_addr = signer::address_of(account);
+        modifies global<PreburnQueue<CoinType>>(account_addr);
+        // the preburn queue cannot already exist
+        aborts_if exists<PreburnQueue<CoinType>>(account_addr) with errors::ALREADY_PUBLISHED;
+        // There cannot be a preburn resource published at the same time as a
+        // `PreburnQueue` resource of the same currency.
+        aborts_if exists<Preburn<CoinType>>(account_addr) with errors::INVALID_STATE;
+        include PublishPreburnQueueAbortsIf<CoinType>;
+        include PublishPreburnQueueEnsures<CoinType>;
+    }
+    spec schema PublishPreburnQueueAbortsIf<CoinType> {
+        account: signer;
+        include Roles::AbortsIfNotDesignatedDealer;
+        include AbortsIfNoCurrency<CoinType>;
+    }
+    spec schema PublishPreburnQueueEnsures<CoinType> {
+        account: signer;
+        let account_addr = signer::address_of(account);
+        // The preburn queue is published at the end of this function,
+        ensures exists<PreburnQueue<CoinType>>(account_addr);
+        // there cannot be a preburn resource for the same currency as the account,
+        ensures !exists<Preburn<CoinType>>(account_addr);
+        // and the preburn queue is empty
+        ensures vector::length(global<PreburnQueue<CoinType>>(account_addr).preburns) == 0;
+    }
+
+    /// Publish a `Preburn` resource under `account`. This function is
+    /// used for bootstrapping the designated dealer at account-creation
+    /// time, and the association TC account `tc_account` (at `@TreasuryCompliance`) is creating
+    /// this resource for the designated dealer `account`.
+    public(friend) fun publish_preburn_queue_to_account<CoinType>(
+        account: &signer,
+        tc_account: &signer
+    ) acquires CurrencyInfo {
+        Roles::assert_designated_dealer(account);
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(!is_synthetic_currency<CoinType>(), errors::invalid_argument(EIS_SYNTHETIC_CURRENCY));
+        publish_preburn_queue<CoinType>(account)
+    }
+    spec publish_preburn_queue_to_account {
+        pragma opaque;
+        let account_addr = signer::address_of(account);
+        modifies global<PreburnQueue<CoinType>>(account_addr);
+        /// The premission "PreburnCurrency" is granted to DesignatedDealer [[H4]][PERMISSION].
+        /// Must abort if the account does not have the DesignatedDealer role.
+        include Roles::AbortsIfNotDesignatedDealer;
+        /// PreburnQueue is published under the DesignatedDealer account.
+        include PublishPreburnQueueAbortsIf<CoinType>;
+        include PublishPreburnQueueEnsures<CoinType>;
+        ensures exists<PreburnQueue<CoinType>>(account_addr);
+
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include AbortsIfNoCurrency<CoinType>;
+        aborts_if is_synthetic_currency<CoinType>() with errors::INVALID_ARGUMENT;
+        aborts_if exists<PreburnQueue<CoinType>>(account_addr) with errors::ALREADY_PUBLISHED;
+        aborts_if exists<Preburn<CoinType>>(account_addr) with errors::INVALID_STATE;
+
+    }
+
+    // #[test_only] TODO: uncomment once unit tests are fully migrated
+    public fun publish_preburn_queue_to_account_for_test<CoinType>(
+           account: &signer,
+           tc_account: &signer
+    ) acquires CurrencyInfo {
+        publish_preburn_queue_to_account<CoinType>(account, tc_account)
+    }
+    spec publish_preburn_queue_to_account_for_test {
+        pragma verify = false;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    /// Upgrade a designated dealer account from using a single `Preburn`
+    /// resource to using a `PreburnQueue` resource so that multiple preburn
+    /// requests can be outstanding in the same currency for a designated dealer.
+    fun upgrade_preburn<CoinType>(account: &signer)
+    acquires Preburn, PreburnQueue {
+        Roles::assert_designated_dealer(account);
+        let sender = signer::address_of(account);
+        let preburn_exists = exists<Preburn<CoinType>>(sender);
+        let preburn_queue_exists = exists<PreburnQueue<CoinType>>(sender);
+        // The DD must already have an existing `Preburn` resource, and not a
+        // `PreburnQueue` resource already, in order to be upgraded.
+        if (preburn_exists && !preburn_queue_exists) {
+            let Preburn { to_burn } = move_from<Preburn<CoinType>>(sender);
+            publish_preburn_queue<CoinType>(account);
+            // If the DD has an old preburn balance, this is converted over
+            // into the new preburn queue when it's upgraded.
+            if (to_burn.value > 0)  {
+                add_preburn_to_queue(account, PreburnWithMetadata {
+                    preburn: Preburn { to_burn },
+                    metadata: x"",
+                })
+            } else {
+                destroy_zero(to_burn)
+            };
+        }
+    }
+    spec upgrade_preburn {
+        let account_addr = signer::address_of(account);
+        modifies global<Preburn<CoinType>>(account_addr);
+        modifies global<PreburnQueue<CoinType>>(account_addr);
+        include UpgradePreburnAbortsIf<CoinType>;
+        include UpgradePreburnEnsures<CoinType>;
+    }
+    spec schema UpgradePreburnAbortsIf<CoinType> {
+        account: signer;
+        let account_addr = signer::address_of(account);
+        let upgrade = exists<Preburn<CoinType>>(account_addr) && !exists<PreburnQueue<CoinType>>(account_addr);
+        /// Must abort if the account doesn't have the `PreburnQueue` or
+        /// `Preburn` resource to satisfy [[H4]][PERMISSION] of `preburn_to`.
+        include upgrade ==> PublishPreburnQueueAbortsIf<CoinType>;
+        include Roles::AbortsIfNotDesignatedDealer;
+    }
+    spec schema UpgradePreburnEnsures<CoinType> {
+        account: signer;
+        let account_addr = signer::address_of(account);
+        let upgrade = exists<Preburn<CoinType>>(account_addr) && !exists<PreburnQueue<CoinType>>(account_addr);
+        let preburn = global<Preburn<CoinType>>(account_addr);
+        ensures upgrade ==>
+            !exists<Preburn<CoinType>>(account_addr) && exists<PreburnQueue<CoinType>>(account_addr);
+        ensures upgrade && preburn.to_burn.value > 0 ==>
+            global<PreburnQueue<CoinType>>(account_addr).preburns ==
+                vec(PreburnWithMetadata { preburn, metadata: x"" });
+        ensures upgrade && preburn.to_burn.value == 0 ==>
+            global<PreburnQueue<CoinType>>(account_addr).preburns == vec();
+    }
+
+    /// Add the `preburn` request to the preburn queue of `account`, and check that the
+    /// number of preburn requests does not exceed `MAX_OUTSTANDING_PREBURNS`.
+    fun add_preburn_to_queue<CoinType>(account: &signer, preburn: PreburnWithMetadata<CoinType>)
+    acquires PreburnQueue {
+        let account_addr = signer::address_of(account);
+        assert!(exists<PreburnQueue<CoinType>>(account_addr), errors::invalid_state(EPREBURN_QUEUE));
+        assert!(value(&preburn.preburn.to_burn) > 0, errors::invalid_argument(EPREBURN));
+        let preburns = &mut borrow_global_mut<PreburnQueue<CoinType>>(account_addr).preburns;
+        assert!(
+            vector::length(preburns) < MAX_OUTSTANDING_PREBURNS,
+            errors::limit_exceeded(EPREBURN_QUEUE)
+        );
+        vector::push_back(preburns, preburn);
+    }
+    spec add_preburn_to_queue {
+        pragma opaque;
+        let account_addr = signer::address_of(account);
+        let preburns = global<PreburnQueue<CoinType>>(account_addr).preburns;
+        let post post_preburns = global<PreburnQueue<CoinType>>(account_addr).preburns;
+        modifies global<PreburnQueue<CoinType>>(account_addr);
+        aborts_if !exists<PreburnQueue<CoinType>>(account_addr) with errors::INVALID_STATE;
+        include AddPreburnToQueueAbortsIf<CoinType>;
+        ensures exists<PreburnQueue<CoinType>>(account_addr);
+        ensures vector::eq_push_back(post_preburns, preburns, preburn);
+    }
+    spec schema AddPreburnToQueueAbortsIf<CoinType> {
+        account: signer;
+        preburn: PreburnWithMetadata<CoinType>;
+        let account_addr = signer::address_of(account);
+        aborts_if preburn.preburn.to_burn.value == 0 with errors::INVALID_ARGUMENT;
+        aborts_if exists<PreburnQueue<CoinType>>(account_addr) &&
+            vector::length(global<PreburnQueue<CoinType>>(account_addr).preburns) >= MAX_OUTSTANDING_PREBURNS
+            with errors::LIMIT_EXCEEDED;
+    }
+
+    /// Sends `coin` to the preburn queue for `account`, where it will wait to either be burned
+    /// or returned to the balance of `account`.
+    /// Calls to this function will fail if:
+    /// * `account` does not have a `PreburnQueue<CoinType>` resource published under it; or
+    /// * the preburn queue is already at capacity (i.e., at `MAX_OUTSTANDING_PREBURNS`); or
+    /// * `coin` has a `value` field of zero.
+    public fun preburn_to<CoinType>(
+        account: &signer,
+        coin: Diem<CoinType>
+    ) acquires CurrencyInfo, Preburn, PreburnQueue {
+        Roles::assert_designated_dealer(account);
+        // any coin that is preburned needs to have a nonzero value
+        assert!(value(&coin) > 0, errors::invalid_argument(ECOIN));
+        let sender = signer::address_of(account);
+        // After an upgrade a `Preburn` resource no longer exists in this
+        // currency, and it is replaced with a `PreburnQueue` resource
+        // for the same currency.
+        upgrade_preburn<CoinType>(account);
+
+        let preburn = PreburnWithMetadata {
+            preburn: Preburn { to_burn: zero<CoinType>() },
+            metadata: x"",
+        };
+        preburn_with_resource(coin, &mut preburn.preburn, sender);
+        add_preburn_to_queue(account, preburn);
+    }
+    spec preburn_to {
+        pragma opaque;
+        pragma disable_invariants_in_body;
+        include PreburnToAbortsIf<CoinType>{amount: coin.value};
+        include PreburnToEnsures<CoinType>{amount: coin.value};
+        let account_addr = signer::address_of(account);
+        include PreburnWithResourceEmits<CoinType>{amount: coin.value, preburn_address: account_addr};
+    }
+    spec schema PreburnToAbortsIf<CoinType> {
+        account: signer;
+        amount: u64;
+        let account_addr = signer::address_of(account);
+        /// Must abort if the account doesn't have the PreburnQueue or Preburn resource, or has not
+        /// the correct role [[H4]][PERMISSION].
+        aborts_if !(exists<Preburn<CoinType>>(account_addr) || exists<PreburnQueue<CoinType>>(account_addr));
+        include Roles::AbortsIfNotDesignatedDealer;
+        include PreburnAbortsIf<CoinType>;
+        include UpgradePreburnAbortsIf<CoinType>;
+        include AddPreburnToQueueAbortsIf<CoinType>{preburn: PreburnWithMetadata{ preburn: spec_make_preburn(amount), metadata: x"" } };
+    }
+    spec schema PreburnToEnsures<CoinType> {
+        account: signer;
+        amount: u64;
+        let account_addr_for_preburn = signer::address_of(account);
+        /// Removes the preburn resource if it exists
+        modifies global<Preburn<CoinType>>(account_addr_for_preburn);
+        /// Publishes if it doesn't exists. Updates its state either way.
+        modifies global<PreburnQueue<CoinType>>(account_addr_for_preburn);
+        ensures exists<PreburnQueue<CoinType>>(account_addr_for_preburn);
+        // The preburn amount in the currency info can be updated.
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include PreburnEnsures<CoinType>{preburn: spec_make_preburn(amount)};
+    }
+
+    /// Remove the oldest preburn request in the `PreburnQueue<CoinType>`
+    /// resource published under `preburn_address` whose value is equal to `amount`.
+    /// Calls to this function will fail if:
+    /// * `preburn_address` doesn't have a `PreburnQueue<CoinType>` resource published under it; or
+    /// * a preburn request with the correct value for `amount` cannot be found in the preburn queue for `preburn_address`;
+    fun remove_preburn_from_queue<CoinType>(preburn_address: address, amount: u64): PreburnWithMetadata<CoinType>
+    acquires PreburnQueue {
+        assert!(exists<PreburnQueue<CoinType>>(preburn_address), errors::not_published(EPREBURN_QUEUE));
+        // We search from the head of the queue
+        let index = 0;
+        let preburn_queue = &mut borrow_global_mut<PreburnQueue<CoinType>>(preburn_address).preburns;
+        let queue_length = vector::length(preburn_queue);
+
+        while ({
+            spec {
+                invariant index <= queue_length;
+                invariant forall j in 0..index: preburn_queue[j].preburn.to_burn.value != amount;
+            };
+            (index < queue_length)
+        }) {
+            let elem = vector::borrow(preburn_queue, index);
+            if (value(&elem.preburn.to_burn) == amount) {
+                let preburn = vector::remove(preburn_queue, index);
+                // Make sure that the value is correct
+                return preburn
+            };
+            index = index + 1;
+        };
+
+        spec {
+            assert index == queue_length;
+            assert forall j in 0..queue_length: preburn_queue[j].preburn.to_burn.value != amount;
+        };
+
+        // If we didn't return already, we couldn't find a preburn with a matching value.
+        abort errors::invalid_state(EPREBURN_NOT_FOUND)
+    }
+    spec remove_preburn_from_queue {
+        pragma opaque;
+        modifies global<PreburnQueue<CoinType>>(preburn_address);
+        include RemovePreburnFromQueueAbortsIf<CoinType>;
+        include RemovePreburnFromQueueEnsures<CoinType>;
+        ensures result.preburn.to_burn.value == amount;
+    }
+    spec schema RemovePreburnFromQueueAbortsIf<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        let preburn_queue = global<PreburnQueue<CoinType>>(preburn_address).preburns;
+        aborts_if !exists<PreburnQueue<CoinType>>(preburn_address) with errors::NOT_PUBLISHED;
+        aborts_if forall i in 0..len(preburn_queue): preburn_queue[i].preburn.to_burn.value != amount with errors::INVALID_STATE;
+    }
+    /// > TODO: See this cannot currently be expressed in the MSL.
+    /// > See https://github.com/diem/diem/issues/7615 for more information.
+    spec schema RemovePreburnFromQueueEnsures<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        ensures old(exists<PreburnQueue<CoinType>>(preburn_address)) ==> exists<PreburnQueue<CoinType>>(preburn_address);
+        // let preburn_queue = global<PreburnQueue<CoinType>>(preburn_address).preburns;
+        // let preburn = Preburn { to_burn: Diem { value: amount }};
+        // let (found, index) = vector::index_of(preburn_queue, preburn);
+        // ensures found ==> vector::eq_remove_elem_at_index(index, preburn_queue, old(preburn_queue));
+    }
+
+    /// Permanently removes the coins in the oldest preburn request in the
+    /// `PreburnQueue` resource under `preburn_address` that has a `to_burn`
+    /// value of `amount` and updates the market cap accordingly.
+    /// This function can only be called by the holder of a `BurnCapability<CoinType>`.
+    /// Calls to this function will fail if the there is no `PreburnQueue<CoinType>`
+    /// resource under `preburn_address`, or, if there is no preburn request in
+    /// the preburn queue with a `to_burn` amount equal to `amount`.
+    public(friend) fun burn_with_capability<CoinType>(
+        preburn_address: address,
+        capability: &BurnCapability<CoinType>,
+        amount: u64,
+    ) acquires CurrencyInfo, PreburnQueue {
+
+        // Remove the preburn request
+        let PreburnWithMetadata{ preburn, metadata: _ } = remove_preburn_from_queue<CoinType>(preburn_address, amount);
+
+        // Burn the contained coins
+        burn_with_resource_cap(&mut preburn, preburn_address, capability);
+
+        let Preburn { to_burn } = preburn;
+        destroy_zero(to_burn);
+    }
+    spec burn_with_capability {
+        pragma delegate_invariants_to_caller;
+        include BurnWithResourceCapEmits<CoinType>{preburn: spec_make_preburn(amount)};
+        include BurnWithCapabilityAbortsIf<CoinType>;
+        include BurnWithCapabilityEnsures<CoinType>;
+    }
+    spec schema BurnWithCapabilityAbortsIf<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        let preburn = spec_make_preburn<CoinType>(amount);
+        include AbortsIfNoPreburnQueue<CoinType>;
+        include RemovePreburnFromQueueAbortsIf<CoinType>;
+        include BurnWithResourceCapAbortsIf<CoinType>{preburn: preburn};
+    }
+    spec schema BurnWithCapabilityEnsures<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        let preburn = spec_make_preburn<CoinType>(amount);
+        include BurnWithResourceCapEnsures<CoinType>{preburn: preburn};
+        include RemovePreburnFromQueueEnsures<CoinType>;
+    }
+
+    /// Permanently removes the coins held in the `Preburn` resource (in `to_burn` field)
+    /// that was stored in a `PreburnQueue` at `preburn_address` and updates the market cap accordingly.
+    /// This function can only be called by the holder of a `BurnCapability<CoinType>`.
+    /// Calls to this function will fail if the preburn `to_burn` area for `CoinType` is empty.
+    fun burn_with_resource_cap<CoinType>(
+        preburn: &mut Preburn<CoinType>,
+        preburn_address: address,
+        _capability: &BurnCapability<CoinType>
+    ) acquires CurrencyInfo {
+        let currency_code = currency_code<CoinType>();
+        // Abort if no coin present in preburn area
+        assert!(preburn.to_burn.value > 0, errors::invalid_state(EPREBURN_EMPTY));
+        // destroy the coin in Preburn area
+        let Diem { value } = withdraw_all<CoinType>(&mut preburn.to_burn);
+        // update the market cap
+        assert_is_currency<CoinType>();
+        let info = borrow_global_mut<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        assert!(info.total_value >= (value as u128), errors::limit_exceeded(ECURRENCY_INFO));
+        info.total_value = info.total_value - (value as u128);
+        assert!(info.preburn_value >= value, errors::limit_exceeded(EPREBURN));
+        info.preburn_value = info.preburn_value - value;
+        // don't emit burn events for synthetic currenices as this does not
+        // change the total value of fiat currencies held on-chain.
+        if (!info.is_synthetic) {
+            event::emit_event(
+                &mut info.burn_events,
+                BurnEvent {
+                    amount: value,
+                    currency_code,
+                    preburn_address,
+                }
+            );
+        };
+    }
+    spec burn_with_resource_cap {
+        pragma delegate_invariants_to_caller;
+        let pre_preburn = preburn;
+        include BurnWithResourceCapAbortsIf<CoinType>{preburn: pre_preburn};
+        include BurnWithResourceCapEnsures<CoinType>{preburn: pre_preburn};
+        include BurnWithResourceCapEmits<CoinType>{preburn: pre_preburn};
+    }
+    spec schema BurnWithResourceCapAbortsIf<CoinType> {
+        preburn: Preburn<CoinType>;
+        include AbortsIfNoCurrency<CoinType>;
+        let to_burn = preburn.to_burn.value;
+        let info = spec_currency_info<CoinType>();
+        aborts_if to_burn == 0 with errors::INVALID_STATE;
+        aborts_if info.total_value < to_burn with errors::LIMIT_EXCEEDED;
+        aborts_if info.preburn_value < to_burn with errors::LIMIT_EXCEEDED;
+    }
+    spec schema BurnWithResourceCapEnsures<CoinType> {
+        preburn: Preburn<CoinType>;
+        ensures spec_currency_info<CoinType>().total_value
+                == old(spec_currency_info<CoinType>().total_value) - preburn.to_burn.value;
+        ensures spec_currency_info<CoinType>().preburn_value
+                == old(spec_currency_info<CoinType>().preburn_value) - preburn.to_burn.value;
+    }
+    spec schema BurnWithResourceCapEmits<CoinType> {
+        preburn: Preburn<CoinType>;
+        preburn_address: address;
+        let info = spec_currency_info<CoinType>();
+        let currency_code = spec_currency_code<CoinType>();
+        let handle = info.burn_events;
+        emits BurnEvent {
+                amount: preburn.to_burn.value,
+                currency_code,
+                preburn_address,
+            }
+            to handle if !info.is_synthetic;
+    }
+
+    /// Cancels the oldest preburn request held in the `PreburnQueue` resource under
+    /// `preburn_address` with a `to_burn` amount matching `amount`. It then returns these coins to the caller.
+    /// This function can only be called by the holder of a
+    /// `BurnCapability<CoinType>`, and will fail if the `PreburnQueue<CoinType>` resource
+    /// at `preburn_address` does not contain a preburn request of the right amount.
+    fun cancel_burn_with_capability<CoinType>(
+        preburn_address: address,
+        _capability: &BurnCapability<CoinType>,
+        amount: u64,
+    ): Diem<CoinType> acquires CurrencyInfo, PreburnQueue {
+
+        // destroy the coin in the preburn area
+        let PreburnWithMetadata{ preburn: Preburn { to_burn }, metadata: _ } = remove_preburn_from_queue<CoinType>(preburn_address, amount);
+
+        // update the market cap
+        let currency_code = currency_code<CoinType>();
+        let info = borrow_global_mut<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        assert!(info.preburn_value >= amount, errors::limit_exceeded(EPREBURN));
+        info.preburn_value = info.preburn_value - amount;
+        // Don't emit cancel burn events for synthetic currencies. cancel_burn
+        // shouldn't be be used for synthetic coins in the first place.
+        if (!info.is_synthetic) {
+            event::emit_event(
+                &mut info.cancel_burn_events,
+                CancelBurnEvent {
+                    amount,
+                    currency_code,
+                    preburn_address,
+                }
+            );
+        };
+
+        to_burn
+    }
+    spec cancel_burn_with_capability {
+        pragma delegate_invariants_to_caller;
+        modifies global<PreburnQueue<CoinType>>(preburn_address);
+        modifies global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include CancelBurnWithCapAbortsIf<CoinType>;
+        include CancelBurnWithCapEnsures<CoinType>;
+        include CancelBurnWithCapEmits<CoinType>;
+        ensures exists<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures result.value == amount;
+        ensures result.value > 0;
+    }
+    spec schema CancelBurnWithCapAbortsIf<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        let info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        include AbortsIfNoCurrency<CoinType>;
+        include RemovePreburnFromQueueAbortsIf<CoinType>;
+        aborts_if info.preburn_value < amount with errors::LIMIT_EXCEEDED;
+    }
+    spec schema CancelBurnWithCapEnsures<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        include RemovePreburnFromQueueEnsures<CoinType>;
+        let info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        let post post_info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures post_info == update_field(info, preburn_value, info.preburn_value - amount);
+    }
+    spec schema CancelBurnWithCapEmits<CoinType> {
+        preburn_address: address;
+        amount: u64;
+        let info = spec_currency_info<CoinType>();
+        let currency_code = spec_currency_code<CoinType>();
+        let handle = info.cancel_burn_events;
+        emits CancelBurnEvent {
+               amount,
+               currency_code,
+               preburn_address,
+           }
+           to handle if !info.is_synthetic;
+    }
+
+    /// A shortcut for immediately burning a coin. This calls preburn followed by a subsequent burn, and is
+    /// used for administrative burns, like unpacking an XDX coin or charging fees.
+    public(friend) fun burn_now<CoinType>(
+        coin: Diem<CoinType>,
+        preburn: &mut Preburn<CoinType>,
+        preburn_address: address,
+        capability: &BurnCapability<CoinType>
+    ) acquires CurrencyInfo {
+        assert!(coin.value > 0, errors::invalid_argument(ECOIN));
+        preburn_with_resource(coin, preburn, preburn_address);
+        burn_with_resource_cap(preburn, preburn_address, capability);
+    }
+    spec burn_now {
+        pragma delegate_invariants_to_caller;
+        include BurnNowAbortsIf<CoinType>;
+        let info = spec_currency_info<CoinType>();
+        let post post_info = spec_currency_info<CoinType>();
+        include PreburnWithResourceEmits<CoinType>{amount: coin.value, preburn_address: preburn_address};
+        include BurnWithResourceCapEmits<CoinType>{preburn: Preburn<CoinType>{to_burn: coin}};
+        ensures preburn.to_burn.value == 0;
+        ensures post_info == update_field(info, total_value, info.total_value - coin.value);
+    }
+    spec schema BurnNowAbortsIf<CoinType> {
+        coin: Diem<CoinType>;
+        preburn: Preburn<CoinType>;
+        aborts_if coin.value == 0 with errors::INVALID_ARGUMENT;
+        include PreburnWithResourceAbortsIf<CoinType>{amount: coin.value};
+        // The aborts condition for the burn is simplified because of previous call to preburn.
+        let info = spec_currency_info<CoinType>();
+        aborts_if info.total_value < coin.value with errors::LIMIT_EXCEEDED;
+    }
+
+    /// Removes and returns the `BurnCapability<CoinType>` from `account`.
+    /// Calls to this function will fail if `account` does  not have a
+    /// published `BurnCapability<CoinType>` resource at the top-level.
+    public(friend) fun remove_burn_capability<CoinType>(account: &signer): BurnCapability<CoinType>
+    acquires BurnCapability {
+        let addr = signer::address_of(account);
+        assert!(exists<BurnCapability<CoinType>>(addr), errors::requires_capability(EBURN_CAPABILITY));
+        move_from<BurnCapability<CoinType>>(addr)
+    }
+    spec remove_burn_capability {
+        pragma delegate_invariants_to_caller;
+        include AbortsIfNoBurnCapability<CoinType>;
+    }
+    spec schema AbortsIfNoBurnCapability<CoinType> {
+        account: signer;
+        aborts_if !exists<BurnCapability<CoinType>>(signer::address_of(account)) with errors::REQUIRES_CAPABILITY;
+    }
+
+    /// Returns the total value of `Diem<CoinType>` that is waiting to be
+    /// burned throughout the system (i.e. the sum of all outstanding
+    /// preburn requests across all preburn resources for the `CoinType`
+    /// currency).
+    public fun preburn_value<CoinType>(): u64 acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).preburn_value
+    }
+
+    /// Create a new `Diem<CoinType>` with a value of `0`. Anyone can call
+    /// this and it will be successful as long as `CoinType` is a registered currency.
+    public fun zero<CoinType>(): Diem<CoinType> {
+        assert_is_currency<CoinType>();
+        Diem<CoinType> { value: 0 }
+    }
+
+    /// Returns the `value` of the passed in `coin`. The value is
+    /// represented in the base units for the currency represented by
+    /// `CoinType`.
+    public fun value<CoinType>(coin: &Diem<CoinType>): u64 {
+        coin.value
+    }
+
+    /// Removes `amount` of value from the passed in `coin`. Returns the
+    /// remaining balance of the passed in `coin`, along with another coin
+    /// with value equal to `amount`. Calls will fail if `amount > Diem::value(&coin)`.
+    public fun split<CoinType>(coin: Diem<CoinType>, amount: u64): (Diem<CoinType>, Diem<CoinType>) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+    spec split {
+        aborts_if coin.value < amount with errors::LIMIT_EXCEEDED;
+        ensures result_1.value == coin.value - amount;
+        ensures result_2.value == amount;
+    }
+
+
+    /// Withdraw `amount` from the passed-in `coin`, where the original coin is modified in place.
+    /// After this function is executed, the original `coin` will have
+    /// `value = original_value - amount`, and the new coin will have a `value = amount`.
+    /// Calls will abort if the passed-in `amount` is greater than the
+    /// value of the passed-in `coin`.
+    public fun withdraw<CoinType>(coin: &mut Diem<CoinType>, amount: u64): Diem<CoinType> {
+        // Check that `amount` is less than the coin's value
+        assert!(coin.value >= amount, errors::limit_exceeded(EAMOUNT_EXCEEDS_COIN_VALUE));
+        coin.value = coin.value - amount;
+        Diem { value: amount }
+    }
+    spec withdraw {
+        pragma opaque;
+        include WithdrawAbortsIf<CoinType>;
+        ensures coin.value == old(coin.value) - amount;
+        ensures result.value == amount;
+    }
+    spec schema WithdrawAbortsIf<CoinType> {
+        coin: Diem<CoinType>;
+        amount: u64;
+        aborts_if coin.value < amount with errors::LIMIT_EXCEEDED;
+    }
+
+    /// Return a `Diem<CoinType>` worth `coin.value` and reduces the `value` of the input `coin` to
+    /// zero. Does not abort.
+    public fun withdraw_all<CoinType>(coin: &mut Diem<CoinType>): Diem<CoinType> {
+        let val = coin.value;
+        withdraw(coin, val)
+    }
+    spec withdraw_all {
+        pragma opaque;
+        aborts_if false;
+        ensures result.value == old(coin.value);
+        ensures coin.value == 0;
+    }
+
+    /// Takes two coins as input, returns a single coin with the total value of both coins.
+    /// Destroys on of the input coins.
+    public fun join<CoinType>(coin1: Diem<CoinType>, coin2: Diem<CoinType>): Diem<CoinType>  {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+    spec join {
+        pragma opaque;
+        aborts_if coin1.value + coin2.value > max_u64() with errors::LIMIT_EXCEEDED;
+        ensures result.value == coin1.value + coin2.value;
+    }
+
+
+    /// "Merges" the two coins.
+    /// The coin passed in by reference will have a value equal to the sum of the two coins
+    /// The `check` coin is consumed in the process
+    public fun deposit<CoinType>(coin: &mut Diem<CoinType>, check: Diem<CoinType>) {
+        let Diem { value } = check;
+        assert!(MAX_U64 - coin.value >= value, errors::limit_exceeded(ECOIN));
+        coin.value = coin.value + value;
+    }
+    spec deposit {
+        pragma opaque;
+        include DepositAbortsIf<CoinType>;
+        ensures coin.value == old(coin.value) + check.value;
+    }
+    spec schema DepositAbortsIf<CoinType> {
+        coin: Diem<CoinType>;
+        check: Diem<CoinType>;
+        aborts_if coin.value + check.value > MAX_U64 with errors::LIMIT_EXCEEDED;
+    }
+
+    /// Destroy a zero-value coin. Calls will fail if the `value` in the passed-in `coin` is non-zero
+    /// so it is impossible to "burn" any non-zero amount of `Diem` without having
+    /// a `BurnCapability` for the specific `CoinType`.
+    public fun destroy_zero<CoinType>(coin: Diem<CoinType>) {
+        let Diem { value } = coin;
+        assert!(value == 0, errors::invalid_argument(EDESTRUCTION_OF_NONZERO_COIN))
+    }
+    spec destroy_zero {
+        pragma opaque;
+        aborts_if coin.value > 0 with errors::INVALID_ARGUMENT;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Definition of Currencies
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Register the type `CoinType` as a currency. Until the type is
+    /// registered as a currency it cannot be used as a coin/currency unit in Diem.
+    /// The passed-in `dr_account` must be a specific address (`@CurrencyInfo`) and
+    /// `dr_account` must also have the correct `DiemRoot` account role.
+    /// After the first registration of `CoinType` as a
+    /// currency, additional attempts to register `CoinType` as a currency
+    /// will abort.
+    /// When the `CoinType` is registered it publishes the
+    /// `CurrencyInfo<CoinType>` resource under the `@CurrencyInfo` and
+    /// adds the currency to the set of `RegisteredCurrencies`. It returns
+    /// `MintCapability<CoinType>` and `BurnCapability<CoinType>` resources.
+    public fun register_currency<CoinType>(
+        dr_account: &signer,
+        to_xdx_exchange_rate: FixedPoint32,
+        is_synthetic: bool,
+        scaling_factor: u64,
+        fractional_part: u64,
+        currency_code: vector<u8>,
+    ): (MintCapability<CoinType>, BurnCapability<CoinType>)
+    {
+        Roles::assert_diem_root(dr_account);
+        // Operational constraint that it must be stored under a specific address.
+        CoreAddresses::assert_currency_info(dr_account);
+        assert!(
+            !exists<CurrencyInfo<CoinType>>(signer::address_of(dr_account)),
+            errors::already_published(ECURRENCY_INFO)
+        );
+        assert!(0 < scaling_factor && scaling_factor <= MAX_SCALING_FACTOR, errors::invalid_argument(ECURRENCY_INFO));
+        move_to(dr_account, CurrencyInfo<CoinType> {
+            total_value: 0,
+            preburn_value: 0,
+            to_xdx_exchange_rate,
+            is_synthetic,
+            scaling_factor,
+            fractional_part,
+            currency_code: copy currency_code,
+            can_mint: true,
+            mint_events: event::new_event_handle<MintEvent>(dr_account),
+            burn_events: event::new_event_handle<BurnEvent>(dr_account),
+            preburn_events: event::new_event_handle<PreburnEvent>(dr_account),
+            cancel_burn_events: event::new_event_handle<CancelBurnEvent>(dr_account),
+            exchange_rate_update_events: event::new_event_handle<ToXDXExchangeRateUpdateEvent>(dr_account)
+        });
+        RegisteredCurrencies::add_currency_code(
+            dr_account,
+            currency_code,
+        );
+        (MintCapability<CoinType>{}, BurnCapability<CoinType>{})
+    }
+    spec register_currency {
+        include RegisterCurrencyAbortsIf<CoinType>;
+        include RegisterCurrencyEnsures<CoinType>;
+    }
+
+    spec schema RegisterCurrencyAbortsIf<CoinType> {
+        dr_account: signer;
+        currency_code: vector<u8>;
+        scaling_factor: u64;
+
+        /// Must abort if the signer does not have the DiemRoot role [[H8]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        aborts_if scaling_factor == 0 || scaling_factor > MAX_SCALING_FACTOR with errors::INVALID_ARGUMENT;
+        include CoreAddresses::AbortsIfNotCurrencyInfo{account: dr_account};
+        aborts_if exists<CurrencyInfo<CoinType>>(signer::address_of(dr_account))
+            with errors::ALREADY_PUBLISHED;
+        include RegisteredCurrencies::AddCurrencyCodeAbortsIf;
+    }
+
+    spec schema RegisterCurrencyEnsures<CoinType> {
+        is_synthetic: bool;
+        to_xdx_exchange_rate: FixedPoint32;
+        fractional_part: u64;
+        ensures spec_is_currency<CoinType>();
+        ensures is_synthetic_currency<CoinType>() == is_synthetic;
+        ensures spec_currency_info<CoinType>().total_value == 0;
+        ensures spec_currency_info<CoinType>().preburn_value == 0;
+        ensures spec_currency_info<CoinType>().fractional_part == fractional_part;
+    }
+
+    /// Registers a stable currency (SCS) coin -- i.e., a non-synthetic currency.
+    /// Resources are published on two distinct
+    /// accounts: The `CoinInfo` is published on the Diem root account, and the mint and
+    /// burn capabilities are published on a treasury compliance account.
+    /// This code allows different currencies to have different treasury compliance
+    /// accounts.
+    public fun register_SCS_currency<CoinType>(
+        dr_account: &signer,
+        tc_account: &signer,
+        to_xdx_exchange_rate: FixedPoint32,
+        scaling_factor: u64,
+        fractional_part: u64,
+        currency_code: vector<u8>,
+    ) {
+        Roles::assert_treasury_compliance(tc_account);
+        Roles::assert_diem_root(dr_account);
+        let (mint_cap, burn_cap) =
+            register_currency<CoinType>(
+                dr_account,
+                to_xdx_exchange_rate,
+                false,   // is_synthetic
+                scaling_factor,
+                fractional_part,
+                currency_code,
+            );
+        assert!(
+            !exists<MintCapability<CoinType>>(signer::address_of(tc_account)),
+            errors::already_published(EMINT_CAPABILITY)
+        );
+        move_to(tc_account, mint_cap);
+        publish_burn_capability<CoinType>(tc_account, burn_cap);
+    }
+
+    spec register_SCS_currency {
+        include RegisterSCSCurrencyAbortsIf<CoinType>;
+        include RegisterSCSCurrencyEnsures<CoinType>;
+    }
+    spec schema RegisterSCSCurrencyAbortsIf<CoinType> {
+        tc_account: signer;
+        dr_account: signer;
+        currency_code: vector<u8>;
+        scaling_factor: u64;
+
+        /// Must abort if tc_account does not have the TreasuryCompliance role.
+        /// Only a TreasuryCompliance account can have the MintCapability [[H1]][PERMISSION].
+        /// Only a TreasuryCompliance account can have the BurnCapability [[H3]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+
+        aborts_if exists<MintCapability<CoinType>>(signer::address_of(tc_account)) with errors::ALREADY_PUBLISHED;
+        include RegisterCurrencyAbortsIf<CoinType>;
+        include PublishBurnCapAbortsIfs<CoinType>;
+    }
+    spec schema RegisterSCSCurrencyEnsures<CoinType> {
+        tc_account: signer;
+        to_xdx_exchange_rate: FixedPoint32;
+        fractional_part: u64;
+        ensures spec_has_mint_capability<CoinType>(signer::address_of(tc_account));
+        ensures spec_xdx_exchange_rate<CoinType>() == to_xdx_exchange_rate;
+    }
+
+    /// Returns the total amount of currency minted of type `CoinType`.
+    public fun market_cap<CoinType>(): u128
+    acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).total_value
+    }
+    /// Returns the market cap of CoinType.
+    spec fun spec_market_cap<CoinType>(): u128 {
+        global<CurrencyInfo<CoinType>>(@CurrencyInfo).total_value
+    }
+
+    /// Returns the value of the coin in the `FromCoinType` currency in XDX.
+    /// This should only be used where a _rough_ approximation of the exchange
+    /// rate is needed.
+    public fun approx_xdx_for_value<FromCoinType>(from_value: u64): u64
+    acquires CurrencyInfo {
+        let xdx_exchange_rate = xdx_exchange_rate<FromCoinType>();
+        fixed_point32::multiply_u64(from_value, xdx_exchange_rate)
+    }
+    spec approx_xdx_for_value {
+        pragma opaque;
+        include ApproxXdmForValueAbortsIf<FromCoinType>;
+        ensures result == spec_approx_xdx_for_value<FromCoinType>(from_value);
+    }
+    spec schema ApproxXdmForValueAbortsIf<CoinType> {
+        from_value: num;
+        include AbortsIfNoCurrency<CoinType>;
+        let xdx_exchange_rate = spec_xdx_exchange_rate<CoinType>();
+        include fixed_point32::MultiplyAbortsIf{val: from_value, multiplier: xdx_exchange_rate};
+    }
+
+    /// Returns the value of the coin in the `FromCoinType` currency in XDX.
+    /// This should only be used where a rough approximation of the exchange
+    /// rate is needed.
+    public fun approx_xdx_for_coin<FromCoinType>(coin: &Diem<FromCoinType>): u64
+    acquires CurrencyInfo {
+        let from_value = value(coin);
+        approx_xdx_for_value<FromCoinType>(from_value)
+    }
+
+    /// Returns `true` if the type `CoinType` is a registered currency.
+    /// Returns `false` otherwise.
+    public fun is_currency<CoinType>(): bool {
+        exists<CurrencyInfo<CoinType>>(@CurrencyInfo)
+    }
+
+    public fun is_SCS_currency<CoinType>(): bool acquires CurrencyInfo {
+        is_currency<CoinType>() &&
+        !borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).is_synthetic
+    }
+
+
+    /// Returns `true` if `CoinType` is a synthetic currency as defined in
+    /// its `CurrencyInfo`. Returns `false` otherwise.
+    public fun is_synthetic_currency<CoinType>(): bool
+    acquires CurrencyInfo {
+        let addr = @CurrencyInfo;
+        exists<CurrencyInfo<CoinType>>(addr) &&
+            borrow_global<CurrencyInfo<CoinType>>(addr).is_synthetic
+    }
+
+    /// Returns the scaling factor for the `CoinType` currency as defined
+    /// in its `CurrencyInfo`.
+    public fun scaling_factor<CoinType>(): u64
+    acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).scaling_factor
+    }
+    spec fun spec_scaling_factor<CoinType>(): u64 {
+        global<CurrencyInfo<CoinType>>(@CurrencyInfo).scaling_factor
+    }
+
+    /// Returns the representable (i.e. real-world) fractional part for the
+    /// `CoinType` currency as defined in its `CurrencyInfo`.
+    public fun fractional_part<CoinType>(): u64
+    acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).fractional_part
+    }
+
+    /// Returns the currency code for the registered currency as defined in
+    /// its `CurrencyInfo` resource.
+    public fun currency_code<CoinType>(): vector<u8>
+    acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        *&borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).currency_code
+    }
+    spec currency_code {
+        pragma opaque;
+        include AbortsIfNoCurrency<CoinType>;
+        ensures result == spec_currency_code<CoinType>();
+    }
+    spec fun spec_currency_code<CoinType>(): vector<u8> {
+        spec_currency_info<CoinType>().currency_code
+    }
+
+    /// Updates the `to_xdx_exchange_rate` held in the `CurrencyInfo` for
+    /// `FromCoinType` to the new passed-in `xdx_exchange_rate`.
+    public fun update_xdx_exchange_rate<FromCoinType>(
+        tc_account: &signer,
+        xdx_exchange_rate: FixedPoint32
+    ) acquires CurrencyInfo {
+        Roles::assert_treasury_compliance(tc_account);
+        assert_is_currency<FromCoinType>();
+        // XDX is not allowed to update the exchange rate.
+        assert!(currency_code<FromCoinType>() != b"XDX", errors::invalid_argument(ECOIN));
+        let currency_info = borrow_global_mut<CurrencyInfo<FromCoinType>>(@CurrencyInfo);
+        currency_info.to_xdx_exchange_rate = xdx_exchange_rate;
+        event::emit_event(
+            &mut currency_info.exchange_rate_update_events,
+            ToXDXExchangeRateUpdateEvent {
+                currency_code: *&currency_info.currency_code,
+                new_to_xdx_exchange_rate: fixed_point32::get_raw_value(*&currency_info.to_xdx_exchange_rate),
+            }
+        );
+    }
+    spec update_xdx_exchange_rate {
+        include UpdateXDXExchangeRateAbortsIf<FromCoinType>;
+        include UpdateXDXExchangeRateEnsures<FromCoinType>;
+        include UpdateXDXExchangeRateEmits<FromCoinType>;
+    }
+
+    spec schema UpdateXDXExchangeRateAbortsIf<FromCoinType> {
+        tc_account: signer;
+        /// Must abort if the account does not have the TreasuryCompliance Role [[H5]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+
+        include AbortsIfNoCurrency<FromCoinType>;
+        aborts_if spec_currency_code<FromCoinType>() == b"XDX" with errors::INVALID_ARGUMENT;
+    }
+    spec schema UpdateXDXExchangeRateEnsures<FromCoinType> {
+        xdx_exchange_rate: FixedPoint32;
+        ensures spec_currency_info<FromCoinType>().to_xdx_exchange_rate == xdx_exchange_rate;
+    }
+
+    spec schema UpdateXDXExchangeRateEmits<FromCoinType> {
+        xdx_exchange_rate: FixedPoint32;
+        let handle = global<CurrencyInfo<FromCoinType>>(@CurrencyInfo).exchange_rate_update_events;
+        let msg = ToXDXExchangeRateUpdateEvent {
+            currency_code: global<CurrencyInfo<FromCoinType>>(@CurrencyInfo).currency_code,
+            new_to_xdx_exchange_rate: fixed_point32::get_raw_value(xdx_exchange_rate)
+        };
+        emits msg to handle;
+    }
+
+    /// Returns the (rough) exchange rate between `CoinType` and `XDX`
+    public fun xdx_exchange_rate<CoinType>(): FixedPoint32
+    acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        *&borrow_global<CurrencyInfo<CoinType>>(@CurrencyInfo).to_xdx_exchange_rate
+    }
+    spec xdx_exchange_rate {
+        pragma opaque;
+        include AbortsIfNoCurrency<CoinType>;
+        let info = global<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        ensures result == info.to_xdx_exchange_rate;
+    }
+
+    /// There may be situations in which we disallow the further minting of
+    /// coins in the system without removing the currency. This function
+    /// allows the association treasury compliance account to control whether or not further coins of
+    /// `CoinType` can be minted or not. If this is called with `can_mint = true`,
+    /// then minting is allowed, if `can_mint = false` then minting is
+    /// disallowed until it is turned back on via this function. All coins
+    /// start out in the default state of `can_mint = true`.
+    public fun update_minting_ability<CoinType>(
+        tc_account: &signer,
+        can_mint: bool,
+        )
+    acquires CurrencyInfo {
+        Roles::assert_treasury_compliance(tc_account);
+        assert_is_currency<CoinType>();
+        let currency_info = borrow_global_mut<CurrencyInfo<CoinType>>(@CurrencyInfo);
+        currency_info.can_mint = can_mint;
+    }
+    spec update_minting_ability {
+        include UpdateMintingAbilityAbortsIf<CoinType>;
+        include UpdateMintingAbilityEnsures<CoinType>;
+    }
+    spec schema UpdateMintingAbilityAbortsIf<CoinType> {
+        tc_account: signer;
+        include AbortsIfNoCurrency<CoinType>;
+        /// Only the TreasuryCompliance role can enable/disable minting [[H2]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+    spec schema UpdateMintingAbilityEnsures<CoinType> {
+        tc_account: signer;
+        can_mint: bool;
+        ensures spec_currency_info<CoinType>().can_mint == can_mint;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Helper functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Asserts that `CoinType` is a registered currency.
+    public fun assert_is_currency<CoinType>() {
+        assert!(is_currency<CoinType>(), errors::not_published(ECURRENCY_INFO));
+    }
+    spec assert_is_currency {
+        pragma opaque;
+        include AbortsIfNoCurrency<CoinType>;
+    }
+    spec schema AbortsIfNoCurrency<CoinType> {
+        aborts_if !spec_is_currency<CoinType>() with errors::NOT_PUBLISHED;
+    }
+
+    public fun assert_is_SCS_currency<CoinType>() acquires CurrencyInfo {
+        assert_is_currency<CoinType>();
+        assert!(is_SCS_currency<CoinType>(), errors::invalid_state(ECURRENCY_INFO));
+    }
+    spec schema AbortsIfNoSCSCurrency<CoinType> {
+        include AbortsIfNoCurrency<CoinType>;
+        aborts_if !is_SCS_currency<CoinType>() with errors::INVALID_STATE;
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // switch documentation context back to module level
+
+    /// # Access Control
+    // TODO: The XUS module now has the access control spec for XUS. The access
+    // control spec in this module can be removed when no longer necessary.
+
+    spec module {
+        /// Only mint functions can increase the total amount of currency [[H1]][PERMISSION].
+        apply TotalValueNotIncrease<CoinType> to *<CoinType>
+            except mint<CoinType>, mint_with_capability<CoinType>;
+
+        /// In order to successfully call `mint` and `mint_with_capability`, MintCapability is
+        /// required. MintCapability must be only granted to a TreasuryCompliance account [[H1]][PERMISSION].
+        /// Only `register_SCS_currency` creates MintCapability, which must abort if the account
+        /// does not have the TreasuryCompliance role [[H1]][PERMISSION].
+        apply PreserveMintCapAbsence<CoinType> to *<CoinType> except register_SCS_currency<CoinType>;
+        apply Roles::AbortsIfNotTreasuryCompliance{account: tc_account} to register_SCS_currency<CoinType>;
+
+        /// Only TreasuryCompliance can have MintCapability [[H1]][PERMISSION].
+        /// If an account has MintCapability, it is a TreasuryCompliance account.
+        invariant<CoinType>
+            forall mint_cap_owner: address where exists<MintCapability<CoinType>>(mint_cap_owner):
+                Roles::spec_has_treasury_compliance_role_addr(mint_cap_owner);
+
+        /// MintCapability is not transferrable [[J1]][PERMISSION].
+        apply PreserveMintCapExistence<CoinType> to *<CoinType>;
+
+        /// The permission "MintCurrency" is unique per currency [[I1]][PERMISSION].
+        /// At most one address has a mint capability for SCS CoinType
+        invariant<CoinType> is_SCS_currency<CoinType>() ==> (
+                forall mint_cap_owner1: address, mint_cap_owner2: address
+                    where (
+                        exists<MintCapability<CoinType>>(mint_cap_owner1) &&
+                        exists<MintCapability<CoinType>>(mint_cap_owner2)
+                    ): mint_cap_owner1 == mint_cap_owner2
+            );
+
+        /// If an address has a mint capability, it is an SCS currency.
+        invariant<CoinType>
+            forall addr3: address where spec_has_mint_capability<CoinType>(addr3):
+                is_SCS_currency<CoinType>();
+    }
+
+    /// ## Minting
+    // > TODO These can be simplified using global invariants
+
+    spec schema TotalValueNotIncrease<CoinType> {
+        /// The total amount of currency does not increase.
+        ensures old(spec_is_currency<CoinType>())
+            ==> spec_currency_info<CoinType>().total_value <= old(spec_currency_info<CoinType>().total_value);
+    }
+    spec schema PreserveMintCapExistence<CoinType> {
+        /// The existence of MintCapability is preserved.
+        ensures forall addr: address:
+            old(exists<MintCapability<CoinType>>(addr)) ==>
+                exists<MintCapability<CoinType>>(addr);
+    }
+    spec schema PreserveMintCapAbsence<CoinType> {
+        /// The absence of MintCapability is preserved.
+        ensures forall addr: address:
+            old(!exists<MintCapability<CoinType>>(addr)) ==>
+                !exists<MintCapability<CoinType>>(addr);
+    }
+
+    /// ## Burning
+
+    spec schema TotalValueNotDecrease<CoinType> {
+        /// The total amount of currency does not decrease.
+        ensures old(spec_is_currency<CoinType>())
+            ==> spec_currency_info<CoinType>().total_value >= old(spec_currency_info<CoinType>().total_value);
+    }
+    spec schema PreserveBurnCapExistence<CoinType> {
+        /// The existence of BurnCapability is preserved.
+        ensures forall addr: address:
+            old(exists<BurnCapability<CoinType>>(addr)) ==>
+                exists<BurnCapability<CoinType>>(addr);
+    }
+    spec schema PreserveBurnCapAbsence<CoinType> {
+        /// The absence of BurnCapability is preserved.
+        ensures forall addr: address:
+            old(!exists<BurnCapability<CoinType>>(addr)) ==>
+                !exists<BurnCapability<CoinType>>(addr);
+    }
+    spec module {
+        /// Only burn functions can decrease the total amount of currency [[H3]][PERMISSION].
+        apply TotalValueNotDecrease<CoinType> to *<CoinType>
+            except burn<CoinType>, burn_with_capability<CoinType>, burn_with_resource_cap<CoinType>,
+            burn_now<CoinType>;
+
+        /// In order to successfully call the burn functions, BurnCapability is required.
+        /// BurnCapability must be only granted to a TreasuryCompliance account [[H3]][PERMISSION].
+        /// Only `register_SCS_currency` and `publish_burn_capability` publish BurnCapability,
+        /// which must abort if the account does not have the TreasuryCompliance role [[H8]][PERMISSION].
+        apply PreserveBurnCapAbsence<CoinType> to *<CoinType>
+            except register_SCS_currency<CoinType>, publish_burn_capability<CoinType>;
+        apply Roles::AbortsIfNotTreasuryCompliance{account: tc_account} to register_SCS_currency<CoinType>;
+
+        /// Only TreasuryCompliance can have BurnCapability [[H3]][PERMISSION].
+        /// If an account has BurnCapability, it is a TreasuryCompliance account.
+        invariant<CoinType>
+            forall addr1: address:
+                exists<BurnCapability<CoinType>>(addr1) ==>
+                    Roles::spec_has_treasury_compliance_role_addr(addr1);
+
+        /// BurnCapability is not transferrable [[J3]][PERMISSION]. BurnCapability can be extracted from an
+        /// account, but is always moved back to the original account. This is the case in
+        /// `TransactionFee::burn_fees` which is the only user of `remove_burn_capability` and
+        /// `publish_burn_capability`.
+        apply PreserveBurnCapExistence<CoinType> to *<CoinType> except remove_burn_capability<CoinType>;
+
+        // The permission "BurnCurrency" is unique per currency [[I3]][PERMISSION]. At most one BurnCapability
+        // can exist for each SCS CoinType. It is because when a new CoinType is registered in
+        // `register_currency`, BurnCapability<CoinType> is packed (i.e., its instance is created)
+        // only one time.
+    }
+
+
+    /// ## Preburning
+
+    spec schema PreburnValueNotIncrease<CoinType> {
+        /// The preburn value of currency does not increase.
+        ensures old(spec_is_currency<CoinType>())
+            ==> spec_currency_info<CoinType>().preburn_value <= old(spec_currency_info<CoinType>().preburn_value);
+    }
+    spec schema PreburnValueNotDecrease<CoinType> {
+        /// The the preburn value of currency does not decrease.
+        ensures old(spec_is_currency<CoinType>())
+            ==> spec_currency_info<CoinType>().preburn_value >= old(spec_currency_info<CoinType>().preburn_value);
+    }
+    spec schema PreservePreburnQueueExistence<CoinType> {
+        /// The existence of the `PreburnQueue` resource is preserved.
+        ensures forall addr: address:
+            old(exists<PreburnQueue<CoinType>>(addr)) ==>
+                exists<PreburnQueue<CoinType>>(addr);
+    }
+    spec schema PreservePreburnQueueAbsence<CoinType> {
+        /// The absence of a `PreburnQueue` is preserved.
+        /// > NB: As part of the upgrade process, we also tie this in with the
+        ///       non-existence of a `Preburn` resource as well. Once the upgrade
+        ///       process is complete this additional existence check can be removed.
+        ensures forall addr: address:
+            old(!(exists<PreburnQueue<CoinType>>(addr) || exists<Preburn<CoinType>>(addr))) ==>
+                !exists<PreburnQueue<CoinType>>(addr);
+    }
+
+    spec module {
+        /// Only burn functions can decrease the preburn value of currency [[H4]][PERMISSION].
+        apply PreburnValueNotDecrease<CoinType> to *<CoinType>
+            except burn<CoinType>, burn_with_capability<CoinType>, burn_with_resource_cap<CoinType>,
+            burn_now<CoinType>, cancel_burn<CoinType>, cancel_burn_with_capability<CoinType>;
+
+        /// Only preburn functions can increase the preburn value of currency [[H4]][PERMISSION].
+        apply PreburnValueNotIncrease<CoinType> to *<CoinType>
+            except preburn_to<CoinType>, preburn_with_resource<CoinType>;
+
+        /// In order to successfully call the preburn functions, Preburn is required. Preburn must
+        /// be only granted to a DesignatedDealer account [[H4]][PERMISSION]. Only `publish_preburn_queue_to_account` and `publish_preburn_queue`
+        /// publishes `PreburnQueue`, which must abort if the account does not have the DesignatedDealer role [[H4]][PERMISSION].
+        apply Roles::AbortsIfNotDesignatedDealer to publish_preburn_queue<CoinType>, publish_preburn_queue_to_account<CoinType>;
+        apply PreservePreburnQueueAbsence<CoinType> to *<CoinType> except
+            publish_preburn_queue<CoinType>,
+            publish_preburn_queue_to_account<CoinType>;
+
+        /// Only DesignatedDealer can have PreburnQueue [[H3]][PERMISSION].
+        /// If an account has PreburnQueue, it is a DesignatedDealer account.
+        /// > NB: during the transition this holds for both `Preburn` and `PreburnQueue` resources.
+        invariant<CoinType>
+            forall addr1: address:
+                exists<PreburnQueue<CoinType>>(addr1) || exists<Preburn<CoinType>>(addr1) ==>
+                    Roles::spec_has_designated_dealer_role_addr(addr1);
+
+        /// If there is a preburn resource published, it must have a value of zero.
+        /// If there is a preburn resource published, there cannot also be a
+        /// `PreburnQueue` resource published under that same account for the
+        /// same currency.
+        /// > NB: This invariant is part of the upgrade process, eventually
+        ///       this will be removed once all DD's have been upgraded to
+        ///       using the `PreburnQueue`.
+        invariant<CoinType> forall dd_addr: address
+            where exists<Preburn<CoinType>>(dd_addr):
+                global<Preburn<CoinType>>(dd_addr).to_burn.value == 0 &&
+                !exists<PreburnQueue<CoinType>>(dd_addr);
+
+        /// If there is a `PreburnQueue` resource published, then there cannot
+        /// also be a `Preburn` resource for that same currency published under
+        /// the same address.
+        invariant<CoinType> forall dd_addr: address
+            where exists<PreburnQueue<CoinType>>(dd_addr):
+                !exists<Preburn<CoinType>>(dd_addr);
+
+        /// A `Preburn` resource can only be published holding a currency type.
+        invariant<CoinType> forall addr: address
+            where exists<Preburn<CoinType>>(addr):
+            spec_is_currency<CoinType>();
+
+        /// A `PreburnQueue` resource can only be published holding a currency type.
+        /// >TODO: This assertion is causing a violation for unknown reasons, probably
+        /// a prover bug.
+        // invariant<CoinType> forall addr: address
+        //     where exists<PreburnQueue<CoinType>>(addr):
+        //     spec_is_currency<CoinType>();
+
+        /// Preburn is not transferrable [[J4]][PERMISSION].
+        apply PreservePreburnQueueExistence<CoinType> to *<CoinType>;
+
+        /// resource struct `CurrencyInfo` is persistent
+        invariant<CoinType> update forall dr_addr: address
+            where old(exists<CurrencyInfo<CoinType>>(dr_addr)):
+                exists<CurrencyInfo<CoinType>>(dr_addr);
+
+        /// resource struct `PreburnQueue<CoinType>` is persistent
+        invariant<CoinType> update forall tc_addr: address
+            where old(exists<PreburnQueue<CoinType>>(tc_addr)):
+                exists<PreburnQueue<CoinType>>(tc_addr);
+
+        /// resource struct `MintCapability<CoinType>` is persistent
+        invariant<CoinType> update forall tc_addr: address
+            where old(exists<MintCapability<CoinType>>(tc_addr)):
+                exists<MintCapability<CoinType>>(tc_addr);
+    }
+
+
+    /// ## Update Exchange Rates
+    spec module {
+        /// Only TreasuryCompliance can change the exchange rate [[H5]][PERMISSION].
+        invariant<CoinType> update old(spec_is_currency<CoinType>()) ==>
+            ((spec_xdx_exchange_rate<CoinType>() != old(spec_xdx_exchange_rate<CoinType>()))
+                ==> Roles::spec_signed_by_treasury_compliance_role());
+    }
+
+    /// ## Enable/disable minting
+    spec module {
+        /// Only TreasuryCompliance can enable/disable minting [[H2]][PERMISSION].
+        invariant<CoinType> update old(spec_is_currency<CoinType>()) ==>
+            ((spec_can_mint<CoinType>() != old(spec_can_mint<CoinType>()))
+                ==> Roles::spec_signed_by_treasury_compliance_role());
+    }
+
+    /// ## Register new currency
+    spec module {
+        /// Only DiemRoot can register a new currency [[H8]][PERMISSION].
+        invariant<CoinType> update
+            !old(spec_is_currency<CoinType>()) && spec_is_currency<CoinType>()
+                ==> Roles::spec_signed_by_diem_root_role();
+    }
+
+
+    /// # Lemmas
+
+    spec module {
+        // These lemmas are needed to prove the uniqueness of MintCapability/BurnCapability.
+
+        /// If an address has a mint capability, it is a registered currency.
+        invariant<CoinType>
+            forall a: address where spec_has_mint_capability<CoinType>(a):
+                is_currency<CoinType>();
+
+        /// If an address has a burn capability, it is a registered currency.
+        invariant<CoinType>
+            forall a: address where spec_has_burn_capability<CoinType>(a):
+                is_currency<CoinType>();
+    }
+
+    /// # Helper Functions
+
+    spec module {
+        /// Checks whether currency is registered. Mirrors `Self::is_currency<CoinType>`.
+        fun spec_is_currency<CoinType>(): bool {
+            exists<CurrencyInfo<CoinType>>(@CurrencyInfo)
+        }
+
+        /// Returns currency information.
+        fun spec_currency_info<CoinType>(): CurrencyInfo<CoinType> {
+            global<CurrencyInfo<CoinType>>(@CurrencyInfo)
+        }
+
+        /// Specification version of `Self::approx_xdx_for_value`.
+        fun spec_approx_xdx_for_value<CoinType>(value: num):  num {
+            fixed_point32::spec_multiply_u64(value, spec_xdx_exchange_rate<CoinType>())
+        }
+
+        /// Returns the `to_xdx_exchange_rate` of CoinType
+        fun spec_xdx_exchange_rate<CoinType>(): FixedPoint32 {
+            global<CurrencyInfo<CoinType>>(@CurrencyInfo).to_xdx_exchange_rate
+        }
+
+        /// Returns the `to_xdx_exchange_rate` of CoinType
+        fun spec_can_mint<CoinType>(): bool {
+            global<CurrencyInfo<CoinType>>(@CurrencyInfo).can_mint
+        }
+
+        /// Checks whether the currency has a mint capability.
+        /// This is only relevant for SCS coins.
+        fun spec_has_mint_capability<CoinType>(addr: address): bool {
+            exists<MintCapability<CoinType>>(addr)
+        }
+
+        /// Returns true if a BurnCapability for CoinType exists at addr.
+        /// This is only relevant for SCS coins.
+        fun spec_has_burn_capability<CoinType>(addr: address): bool {
+            exists<BurnCapability<CoinType>>(addr)
+        }
+
+        /// Returns true if a PrebunQueue for CoinType exists at addr.
+        fun spec_has_preburn_queue<CoinType>(addr: address): bool {
+            exists<PreburnQueue<CoinType>>(addr)
+        }
+
+        /// Returns true if a Prebun for CoinType exists at addr.
+        fun spec_has_preburn<CoinType>(addr: address): bool {
+            exists<Preburn<CoinType>>(addr)
+        }
+
+        /// Returns the Preburn in the preburn queue.
+        fun spec_make_preburn<CoinType>(amount: u64): Preburn<CoinType> {
+            Preburn { to_burn: Diem { value: amount }}
+        }
+
+        fun spec_signed_by_mint_capability_owner<CoinType>(): bool {
+            (exists a: address: signer::is_txn_signer_addr(a)
+                && spec_has_mint_capability<CoinType>(a))
+        }
+
+        fun spec_signed_by_burn_capability_owner<CoinType>(): bool {
+            (exists a: address: signer::is_txn_signer_addr(a)
+                && spec_has_burn_capability<CoinType>(a))
+        }
+
+        fun spec_signed_by_preburn_queue_owner<CoinType>(): bool {
+            (exists a: address: signer::is_txn_signer_addr(a)
+            && spec_has_preburn_queue<CoinType>(a))
+        }
+
+        fun spec_signed_by_preburn_owner<CoinType>(): bool {
+            (exists a: address: signer::is_txn_signer_addr(a)
+            && spec_has_preburn<CoinType>(a))
+        }
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemAccount.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemAccount.move
new file mode 100644
index 000000000..4e01fc090
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemAccount.move
@@ -0,0 +1,2617 @@
+/// The `DiemAccount` module manages accounts. It defines the `DiemAccount` resource and
+/// numerous auxiliary data structures. It also defines the prolog and epilog that run
+/// before and after every transaction.
+
+module DiemFramework::DiemAccount {
+    use DiemFramework::AccountFreezing;
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::ChainId;
+    use DiemFramework::AccountLimits::{Self, AccountLimitMutationCapability};
+    use DiemFramework::XUS::XUS;
+    use DiemFramework::DualAttestation;
+    use DiemFramework::XDX::XDX;
+    use DiemFramework::DiemConfig;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::DiemTransactionPublishingOption;
+    use DiemFramework::SlidingNonce;
+    use DiemFramework::TransactionFee;
+    use DiemFramework::ValidatorConfig;
+    use DiemFramework::ValidatorOperatorConfig;
+    use DiemFramework::VASP;
+    use DiemFramework::DesignatedDealer;
+    use DiemFramework::Diem::{Self, Diem};
+    use DiemFramework::Roles;
+    use DiemFramework::VASPDomain;
+    use DiemFramework::CRSN;
+    use std::bcs;
+    use std::event::{Self, EventHandle};
+    use std::errors;
+    use std::hash;
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+
+    friend DiemFramework::AccountAdministrationScripts;
+
+    /// An `address` is a Diem Account iff it has a published DiemAccount resource.
+    struct DiemAccount has key {
+        /// The current authentication key.
+        /// This can be different from the key used to create the account
+        authentication_key: vector<u8>,
+        /// A `withdraw_capability` allows whoever holds this capability
+        /// to withdraw from the account. At the time of account creation
+        /// this capability is stored in this option. It can later be removed
+        /// by `extract_withdraw_capability` and also restored via `restore_withdraw_capability`.
+        withdraw_capability: Option<WithdrawCapability>,
+        /// A `key_rotation_capability` allows whoever holds this capability
+        /// the ability to rotate the authentication key for the account. At
+        /// the time of account creation this capability is stored in this
+        /// option. It can later be "extracted" from this field via
+        /// `extract_key_rotation_capability`, and can also be restored via
+        /// `restore_key_rotation_capability`.
+        key_rotation_capability: Option<KeyRotationCapability>,
+        /// Event handle to which ReceivePaymentEvents are emitted when
+        /// payments are received.
+        received_events: EventHandle<ReceivedPaymentEvent>,
+        /// Event handle to which SentPaymentEvents are emitted when
+        /// payments are sent.
+        sent_events: EventHandle<SentPaymentEvent>,
+        /// The current sequence number of the account.
+        /// Incremented by one each time a transaction is submitted by
+        /// this account.
+        sequence_number: u64,
+    }
+
+    /// A resource that holds the total value of currency of type `Token`
+    /// currently held by the account.
+    struct Balance<phantom Token> has key {
+        /// Stores the value of the balance in its balance field. A coin has
+        /// a `value` field. The amount of money in the balance is changed
+        /// by modifying this field.
+        coin: Diem<Token>,
+    }
+
+    /// The holder of WithdrawCapability for account_address can withdraw Diem from
+    /// account_address/DiemAccount/balance.
+    /// There is at most one WithdrawCapability in existence for a given address.
+    struct WithdrawCapability has store {
+        /// Address that WithdrawCapability was associated with when it was created.
+        /// This field does not change.
+        account_address: address,
+    }
+
+    /// The holder of KeyRotationCapability for account_address can rotate the authentication key for
+    /// account_address (i.e., write to account_address/DiemAccount/authentication_key).
+    /// There is at most one KeyRotationCapability in existence for a given address.
+    struct KeyRotationCapability has store {
+        /// Address that KeyRotationCapability was associated with when it was created.
+        /// This field does not change.
+        account_address: address,
+    }
+
+    /// A wrapper around an `AccountLimitMutationCapability` which is used to check for account limits
+    /// and to record freeze/unfreeze events.
+    struct AccountOperationsCapability has key {
+        limits_cap: AccountLimitMutationCapability,
+        creation_events: event::EventHandle<CreateAccountEvent>,
+    }
+
+    /// A resource that holds the event handle for all the past WriteSet transactions that have been committed on chain.
+    struct DiemWriteSetManager has key {
+        upgrade_events: event::EventHandle<Self::AdminTransactionEvent>,
+    }
+
+
+    /// Message for sent events
+    struct SentPaymentEvent has drop, store {
+        /// The amount of Diem<Token> sent
+        amount: u64,
+        /// The code symbol for the currency that was sent
+        currency_code: vector<u8>,
+        /// The address that was paid
+        payee: address,
+        /// Metadata associated with the payment
+        metadata: vector<u8>,
+    }
+
+    /// Message for received events
+    struct ReceivedPaymentEvent has drop, store {
+        /// The amount of Diem<Token> received
+        amount: u64,
+        /// The code symbol for the currency that was received
+        currency_code: vector<u8>,
+        /// The address that sent the coin
+        payer: address,
+        /// Metadata associated with the payment
+        metadata: vector<u8>,
+    }
+
+    /// Message for committed WriteSet transaction.
+    struct AdminTransactionEvent has drop, store {
+        // The block time when this WriteSet is committed.
+        committed_timestamp_secs: u64,
+    }
+
+    /// Message for creation of a new account
+    struct CreateAccountEvent has drop, store {
+        /// Address of the created account
+        created: address,
+        /// Role of the created account
+        role_id: u64
+    }
+
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// The `DiemAccount` resource is not in the required state
+    const EACCOUNT: u64 = 0;
+    /// Tried to deposit a coin whose value was zero
+    const ECOIN_DEPOSIT_IS_ZERO: u64 = 2;
+    /// Tried to deposit funds that would have surpassed the account's limits
+    const EDEPOSIT_EXCEEDS_LIMITS: u64 = 3;
+    /// Tried to create a balance for an account whose role does not allow holding balances
+    const EROLE_CANT_STORE_BALANCE: u64 = 4;
+    /// The account does not hold a large enough balance in the specified currency
+    const EINSUFFICIENT_BALANCE: u64 = 5;
+    /// The withdrawal of funds would have exceeded the the account's limits
+    const EWITHDRAWAL_EXCEEDS_LIMITS: u64 = 6;
+    /// The `WithdrawCapability` for this account has already been extracted
+    const EWITHDRAW_CAPABILITY_ALREADY_EXTRACTED: u64 = 7;
+    /// The provided authentication had an invalid length
+    const EMALFORMED_AUTHENTICATION_KEY: u64 = 8;
+    /// The `KeyRotationCapability` for this account has already been extracted
+    const EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED: u64 = 9;
+    /// An account cannot be created at the reserved VM address of 0x0
+    const ECANNOT_CREATE_AT_VM_RESERVED: u64 = 10;
+    /// The `WithdrawCapability` for this account is not extracted
+    const EWITHDRAW_CAPABILITY_NOT_EXTRACTED: u64 = 11;
+    /// Tried to add a balance in a currency that this account already has
+    const EADD_EXISTING_CURRENCY: u64 = 15;
+    /// Attempted to send funds to an account that does not exist
+    const EPAYEE_DOES_NOT_EXIST: u64 = 17;
+    /// Attempted to send funds in a currency that the receiving account does not hold.
+    /// e.g., `Diem<XDX>` to an account that exists, but does not have a `Balance<XDX>` resource
+    const EPAYEE_CANT_ACCEPT_CURRENCY_TYPE: u64 = 18;
+    /// Tried to withdraw funds in a currency that the account does hold
+    const EPAYER_DOESNT_HOLD_CURRENCY: u64 = 19;
+    /// An invalid amount of gas units was provided for execution of the transaction
+    const EGAS: u64 = 20;
+    /// The `AccountOperationsCapability` was not in the required state
+    const EACCOUNT_OPERATIONS_CAPABILITY: u64 = 22;
+    /// The `DiemWriteSetManager` was not in the required state
+    const EWRITESET_MANAGER: u64 = 23;
+    /// An account cannot be created at the reserved core code address of 0x1
+    const ECANNOT_CREATE_AT_CORE_CODE: u64 = 24;
+
+    /// Prologue errors. These are separated out from the other errors in this
+    /// module since they are mapped separately to major VM statuses, and are
+    /// important to the semantics of the system.
+    const PROLOGUE_EACCOUNT_FROZEN: u64 = 1000;
+    const PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY: u64 = 1001;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD: u64 = 1002;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW: u64 = 1003;
+    const PROLOGUE_EACCOUNT_DNE: u64 = 1004;
+    const PROLOGUE_ECANT_PAY_GAS_DEPOSIT: u64 = 1005;
+    const PROLOGUE_ETRANSACTION_EXPIRED: u64 = 1006;
+    const PROLOGUE_EBAD_CHAIN_ID: u64 = 1007;
+    const PROLOGUE_ESCRIPT_NOT_ALLOWED: u64 = 1008;
+    const PROLOGUE_EMODULE_NOT_ALLOWED: u64 = 1009;
+    const PROLOGUE_EINVALID_WRITESET_SENDER: u64 = 1010;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG: u64 = 1011;
+    const PROLOGUE_EBAD_TRANSACTION_FEE_CURRENCY: u64 = 1012;
+    const PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH: u64 = 1013;
+    const PROLOGUE_ESEQ_NONCE_INVALID: u64 = 1014;
+
+    /// Initialize this module. This is only callable from genesis.
+    public fun initialize(
+        dr_account: &signer,
+        dummy_auth_key_prefix: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint, not a privilege constraint.
+        CoreAddresses::assert_diem_root(dr_account);
+
+        create_diem_root_account(
+            copy dummy_auth_key_prefix,
+        );
+        create_treasury_compliance_account(
+            dr_account,
+            copy dummy_auth_key_prefix,
+        );
+    }
+
+    spec initialize {
+        pragma opaque;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        include CreateDiemRootAccountAbortsIf{auth_key_prefix: dummy_auth_key_prefix};
+        include CreateTreasuryComplianceAccountAbortsIf{auth_key_prefix: dummy_auth_key_prefix};
+        aborts_if exists<AccountFreezing::FreezingBit>(@TreasuryCompliance)
+            with errors::ALREADY_PUBLISHED;
+
+        // modifies and ensures needed to make this function opaque.
+        include CreateDiemRootAccountModifies;
+        include CreateDiemRootAccountEnsures;
+        include CreateTreasuryComplianceAccountModifies;
+        include CreateTreasuryComplianceAccountEnsures;
+    }
+
+    /// Return `true` if `addr` has already published account limits for `Token`
+    fun has_published_account_limits<Token>(addr: address): bool {
+        if (VASP::is_vasp(addr)) {
+            VASP::has_account_limits<Token>(addr)
+        }
+        else {
+            AccountLimits::has_window_published<Token>(addr)
+        }
+    }
+    spec fun spec_has_published_account_limits<Token>(addr: address): bool {
+        if (VASP::is_vasp(addr)) VASP::spec_has_account_limits<Token>(addr)
+        else AccountLimits::has_window_published<Token>(addr)
+    }
+
+    /// Returns whether we should track and record limits for the `payer` or `payee` account.
+    /// Depending on the `is_withdrawal` flag passed in we determine whether the
+    /// `payer` or `payee` account is being queried. `VASP->any` and
+    /// `any->VASP` transfers are tracked in the VASP.
+    fun should_track_limits_for_account<Token>(
+        payer: address, payee: address, is_withdrawal: bool
+    ): bool {
+        if (is_withdrawal) {
+            has_published_account_limits<Token>(payer) &&
+            VASP::is_vasp(payer) &&
+            !VASP::is_same_vasp(payer, payee)
+        } else {
+            has_published_account_limits<Token>(payee) &&
+            VASP::is_vasp(payee) &&
+            !VASP::is_same_vasp(payee, payer)
+        }
+    }
+    spec should_track_limits_for_account {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_should_track_limits_for_account<Token>(payer, payee, is_withdrawal);
+    }
+    spec fun spec_should_track_limits_for_account<Token>(
+        payer: address, payee: address, is_withdrawal: bool
+    ): bool {
+        if (is_withdrawal) {
+            spec_has_published_account_limits<Token>(payer) &&
+            VASP::is_vasp(payer) &&
+            !VASP::spec_is_same_vasp(payer, payee)
+        } else {
+            spec_has_published_account_limits<Token>(payee) &&
+            VASP::is_vasp(payee) &&
+            !VASP::spec_is_same_vasp(payee, payer)
+        }
+    }
+
+    /// Record a payment of `to_deposit` from `payer` to `payee` with the attached `metadata`
+    fun deposit<Token>(
+        payer: address,
+        payee: address,
+        to_deposit: Diem<Token>,
+        metadata: vector<u8>,
+        metadata_signature: vector<u8>,
+        dual_attestation: bool,
+    ) acquires DiemAccount, Balance, AccountOperationsCapability {
+        DiemTimestamp::assert_operating();
+        AccountFreezing::assert_not_frozen(payee);
+
+        // Check that the `to_deposit` coin is non-zero
+        let deposit_value = Diem::value(&to_deposit);
+        assert!(deposit_value > 0, errors::invalid_argument(ECOIN_DEPOSIT_IS_ZERO));
+        // Check that an account exists at `payee`
+        assert!(exists_at(payee), errors::not_published(EPAYEE_DOES_NOT_EXIST));
+        // Check that `payee` can accept payments in `Token`
+        assert!(
+            exists<Balance<Token>>(payee),
+            errors::invalid_argument(EPAYEE_CANT_ACCEPT_CURRENCY_TYPE)
+        );
+
+        if (dual_attestation) {
+            // Check that the payment complies with dual attestation rules
+            DualAttestation::assert_payment_ok<Token>(
+                payer, payee, deposit_value, copy metadata, metadata_signature
+            );
+        };
+
+        // Ensure that this deposit is compliant with the account limits on
+        // this account.
+        if (should_track_limits_for_account<Token>(payer, payee, false)) {
+            assert!(
+                AccountLimits::update_deposit_limits<Token>(
+                    deposit_value,
+                    VASP::parent_address(payee),
+                    &borrow_global<AccountOperationsCapability>(@DiemRoot).limits_cap
+                ),
+                errors::limit_exceeded(EDEPOSIT_EXCEEDS_LIMITS)
+            )
+        };
+
+        // Deposit the `to_deposit` coin
+        Diem::deposit(&mut borrow_global_mut<Balance<Token>>(payee).coin, to_deposit);
+
+        // Log a received event
+        event::emit_event<ReceivedPaymentEvent>(
+            &mut borrow_global_mut<DiemAccount>(payee).received_events,
+            ReceivedPaymentEvent {
+                amount: deposit_value,
+                currency_code: Diem::currency_code<Token>(),
+                payer,
+                metadata
+            }
+        );
+    }
+    spec deposit {
+        pragma opaque;
+        modifies global<Balance<Token>>(payee);
+        modifies global<DiemAccount>(payee);
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payee));
+        let amount = to_deposit.value;
+        include DepositAbortsIf<Token>{amount: amount};
+        include DepositOverflowAbortsIf<Token>{amount: amount};
+        include DepositEnsures<Token>{amount: amount};
+        include DepositEmits<Token>{amount: amount};
+        include dual_attestation ==> DualAttestation::AssertPaymentOkAbortsIf<Token>{value: amount};
+    }
+    spec schema DepositAbortsIf<Token> {
+        payer: address;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        include DepositAbortsIfRestricted<Token>;
+        include AccountFreezing::AbortsIfFrozen{account: payee};
+        aborts_if !exists<Balance<Token>>(payee) with errors::INVALID_ARGUMENT;
+        aborts_if !exists_at(payee) with errors::NOT_PUBLISHED;
+    }
+    spec schema DepositOverflowAbortsIf<Token> {
+        payee: address;
+        amount: u64;
+        aborts_if balance<Token>(payee) + amount > max_u64() with errors::LIMIT_EXCEEDED;
+    }
+    spec schema DepositAbortsIfRestricted<Token> {
+        payer: address;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if amount == 0 with errors::INVALID_ARGUMENT;
+        include
+            spec_should_track_limits_for_account<Token>(payer, payee, false) ==>
+            AccountLimits::UpdateDepositLimitsAbortsIf<Token> {
+                addr: VASP::spec_parent_address(payee),
+            };
+        aborts_if
+            spec_should_track_limits_for_account<Token>(payer, payee, false) &&
+                !AccountLimits::spec_update_deposit_limits<Token>(amount, VASP::spec_parent_address(payee))
+            with errors::LIMIT_EXCEEDED;
+        include Diem::AbortsIfNoCurrency<Token>;
+    }
+    spec schema DepositEnsures<Token> {
+        payee: address;
+        amount: u64;
+
+        // TODO(wrwg): precisely specify what changed in the modified resources using `update_field`
+        ensures exists<Balance<Token>>(payee);
+        ensures balance<Token>(payee) == old(balance<Token>(payee)) + amount;
+
+        ensures exists<DiemAccount>(payee);
+        ensures global<DiemAccount>(payee).withdraw_capability
+            == old(global<DiemAccount>(payee).withdraw_capability);
+        ensures global<DiemAccount>(payee).authentication_key
+            == old(global<DiemAccount>(payee).authentication_key);
+
+        ensures event::spec_guid_eq(global<DiemAccount>(payee).sent_events,
+                                    old(global<DiemAccount>(payee).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payee).received_events,
+                                    old(global<DiemAccount>(payee).received_events));
+    }
+    spec schema DepositEmits<Token> {
+        payer: address;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        let handle = global<DiemAccount>(payee).received_events;
+        let msg = ReceivedPaymentEvent {
+            amount,
+            currency_code: Diem::spec_currency_code<Token>(),
+            payer,
+            metadata
+        };
+        emits msg to handle;
+    }
+
+    /// Mint 'mint_amount' to 'designated_dealer_address' for 'tier_index' tier.
+    /// Max valid tier index is 3 since there are max 4 tiers per DD.
+    /// Sender should be treasury compliance account and receiver authorized DD.
+    public fun tiered_mint<Token>(
+        tc_account: &signer,
+        designated_dealer_address: address,
+        mint_amount: u64,
+        tier_index: u64,
+    ) acquires DiemAccount, Balance, AccountOperationsCapability {
+        Roles::assert_treasury_compliance(tc_account);
+        let coin = DesignatedDealer::tiered_mint<Token>(
+            tc_account, mint_amount, designated_dealer_address, tier_index
+        );
+        // Use the reserved address as the payer because the funds did not come from an existing
+        // balance
+        deposit(@VMReserved, designated_dealer_address, coin, x"", x"", false)
+    }
+
+    spec tiered_mint {
+        pragma opaque;
+        modifies global<DiemAccount>(designated_dealer_address);
+        modifies global<DesignatedDealer::Dealer>(designated_dealer_address);
+        modifies global<DesignatedDealer::TierInfo<Token>>(designated_dealer_address);
+        modifies global<Balance<Token>>(designated_dealer_address);
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(designated_dealer_address));
+        modifies global<Diem::CurrencyInfo<Token>>(@CurrencyInfo);
+        include TieredMintAbortsIf<Token>;
+        include TieredMintEnsures<Token>;
+        include TieredMintEmits<Token>;
+    }
+    spec schema TieredMintAbortsIf<Token> {
+        tc_account: signer;
+        designated_dealer_address: address;
+        mint_amount: u64;
+        tier_index: u64;
+        include DesignatedDealer::TieredMintAbortsIf<Token>{dd_addr: designated_dealer_address, amount: mint_amount};
+        include DepositAbortsIf<Token>{payer: @VMReserved,
+            payee: designated_dealer_address, amount: mint_amount, metadata: x""};
+        include DepositOverflowAbortsIf<Token>{payee: designated_dealer_address, amount: mint_amount};
+    }
+    spec schema TieredMintEnsures<Token> {
+        designated_dealer_address: address;
+        mint_amount: u64;
+        let dealer_balance = global<Balance<Token>>(designated_dealer_address).coin.value;
+        let post post_dealer_balance = global<Balance<Token>>(designated_dealer_address).coin.value;
+        let currency_info = global<Diem::CurrencyInfo<Token>>(@CurrencyInfo);
+        let post post_currency_info = global<Diem::CurrencyInfo<Token>>(@CurrencyInfo);
+        /// Total value of the currency increases by `amount`.
+        ensures post_currency_info == update_field(currency_info, total_value, currency_info.total_value + mint_amount);
+        /// The balance of designated dealer increases by `amount`.
+        ensures post_dealer_balance == dealer_balance + mint_amount;
+    }
+    spec schema TieredMintEmits<Token> {
+        tc_account: signer;
+        designated_dealer_address: address;
+        mint_amount: u64;
+        tier_index: u64;
+        include DepositEmits<Token>{
+            payer: @VMReserved,
+            payee: designated_dealer_address,
+            amount: mint_amount,
+            metadata: x""
+        };
+        include DesignatedDealer::TieredMintEmits<Token>{dd_addr: designated_dealer_address, amount: mint_amount};
+    }
+
+    // Cancel the burn request from `preburn_address` and return the funds.
+    // Fails if the sender does not have a published MintCapability.
+    public fun cancel_burn<Token>(
+        account: &signer,
+        preburn_address: address,
+        amount: u64,
+    ) acquires DiemAccount, Balance, AccountOperationsCapability {
+        let coin = Diem::cancel_burn<Token>(account, preburn_address, amount);
+        // record both sender and recipient as `preburn_address`: the coins are moving from
+        // `preburn_address`'s `Preburn` resource to its balance
+        deposit(preburn_address, preburn_address, coin, x"", x"", false)
+    }
+    spec cancel_burn {
+        include CancelBurnAbortsIf<Token>;
+        include Diem::CancelBurnWithCapEmits<Token>;
+        include Diem::CancelBurnWithCapEnsures<Token>;
+        include DepositEnsures<Token>{payee: preburn_address};
+        include DepositEmits<Token>{
+            payer: preburn_address,
+            payee: preburn_address,
+            amount: amount,
+            metadata: x""
+        };
+    }
+    spec schema CancelBurnAbortsIf<Token> {
+        account: signer;
+        preburn_address: address;
+        amount: u64;
+        include Diem::CancelBurnAbortsIf<Token>;
+        include DepositAbortsIf<Token>{
+            payer: preburn_address,
+            payee: preburn_address,
+            amount: amount,
+            metadata: x"",
+        };
+        include DepositOverflowAbortsIf<Token>{payee: preburn_address, amount: amount};
+    }
+
+    /// Helper to withdraw `amount` from the given account balance and return the withdrawn Diem<Token>
+    fun withdraw_from_balance<Token>(
+        payer: address,
+        payee: address,
+        balance: &mut Balance<Token>,
+        amount: u64
+    ): Diem<Token> acquires AccountOperationsCapability {
+        DiemTimestamp::assert_operating();
+        AccountFreezing::assert_not_frozen(payer);
+        // Make sure that this withdrawal is compliant with the limits on
+        // the account if it's a inter-VASP transfer,
+        if (should_track_limits_for_account<Token>(payer, payee, true)) {
+            let can_withdraw = AccountLimits::update_withdrawal_limits<Token>(
+                    amount,
+                    VASP::parent_address(payer),
+                    &borrow_global<AccountOperationsCapability>(@DiemRoot).limits_cap
+            );
+            assert!(can_withdraw, errors::limit_exceeded(EWITHDRAWAL_EXCEEDS_LIMITS));
+        };
+        let coin = &mut balance.coin;
+        // Abort if this withdrawal would make the `payer`'s balance go negative
+        assert!(Diem::value(coin) >= amount, errors::limit_exceeded(EINSUFFICIENT_BALANCE));
+        Diem::withdraw(coin, amount)
+    }
+    spec withdraw_from_balance {
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payer));
+        include WithdrawFromBalanceAbortsIf<Token>;
+        include WithdrawFromBalanceEnsures<Token>;
+    }
+    spec schema WithdrawFromBalanceAbortsIf<Token> {
+        payer: address;
+        payee: address;
+        balance: Balance<Token>;
+        amount: u64;
+        include WithdrawFromBalanceNoLimitsAbortsIf<Token>;
+        include
+            spec_should_track_limits_for_account<Token>(payer, payee, true) ==>
+            AccountLimits::UpdateWithdrawalLimitsAbortsIf<Token> {
+                addr: VASP::spec_parent_address(payer),
+            };
+        aborts_if
+            spec_should_track_limits_for_account<Token>(payer, payee, true) &&
+            (   !spec_has_account_operations_cap() ||
+                !AccountLimits::spec_update_withdrawal_limits<Token>(amount, VASP::spec_parent_address(payer))
+            )
+            with errors::LIMIT_EXCEEDED;
+    }
+    spec schema WithdrawFromBalanceNoLimitsAbortsIf<Token> {
+          payer: address;
+          payee: address;
+          balance: Balance<Token>;
+          amount: u64;
+          include DiemTimestamp::AbortsIfNotOperating;
+          include AccountFreezing::AbortsIfFrozen{account: payer};
+          aborts_if balance.coin.value < amount with errors::LIMIT_EXCEEDED;
+    }
+    spec schema WithdrawFromBalanceEnsures<Token> {
+        balance: Balance<Token>;
+        amount: u64;
+        result: Diem<Token>;
+        ensures balance.coin.value == old(balance.coin.value) - amount;
+        ensures result.value == amount;
+    }
+
+    /// Withdraw `amount` `Diem<Token>`'s from the account balance under
+    /// `cap.account_address`
+    fun withdraw_from<Token>(
+        cap: &WithdrawCapability,
+        payee: address,
+        amount: u64,
+        metadata: vector<u8>,
+    ): Diem<Token> acquires Balance, AccountOperationsCapability, DiemAccount {
+        DiemTimestamp::assert_operating();
+        let payer = cap.account_address;
+        assert!(exists_at(payer), errors::not_published(EACCOUNT));
+        assert!(exists<Balance<Token>>(payer), errors::not_published(EPAYER_DOESNT_HOLD_CURRENCY));
+        let account_balance = borrow_global_mut<Balance<Token>>(payer);
+        // Load the payer's account and emit an event to record the withdrawal
+        event::emit_event<SentPaymentEvent>(
+            &mut borrow_global_mut<DiemAccount>(payer).sent_events,
+            SentPaymentEvent {
+                amount,
+                currency_code: Diem::currency_code<Token>(),
+                payee,
+                metadata
+            },
+        );
+        withdraw_from_balance<Token>(payer, payee, account_balance, amount)
+    }
+    spec withdraw_from {
+        let payer = cap.account_address;
+        modifies global<Balance<Token>>(payer);
+        modifies global<DiemAccount>(payer);
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payer));
+        ensures exists<DiemAccount>(payer);
+        ensures global<DiemAccount>(payer).withdraw_capability
+                    == old(global<DiemAccount>(payer).withdraw_capability);
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).sent_events,
+                                    old(global<DiemAccount>(payer).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).received_events,
+                                    old(global<DiemAccount>(payer).received_events));
+        include WithdrawFromAbortsIf<Token>;
+        include WithdrawFromBalanceEnsures<Token>{balance: global<Balance<Token>>(payer)};
+        include WithdrawOnlyFromCapAddress<Token>;
+        include WithdrawFromEmits<Token>;
+    }
+    spec schema WithdrawFromAbortsIf<Token> {
+        cap: WithdrawCapability;
+        payee: address;
+        amount: u64;
+        let payer = cap.account_address;
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Diem::AbortsIfNoCurrency<Token>;
+        include WithdrawFromBalanceAbortsIf<Token>{payer, balance: global<Balance<Token>>(payer)};
+        aborts_if !exists_at(payer) with errors::NOT_PUBLISHED;
+        aborts_if !exists<Balance<Token>>(payer) with errors::NOT_PUBLISHED;
+    }
+    /// # Access Control
+    spec schema WithdrawOnlyFromCapAddress<Token> {
+        cap: WithdrawCapability;
+        /// Can only withdraw from the balances of cap.account_address [[H19]][PERMISSION].
+        ensures forall addr: address where old(exists<Balance<Token>>(addr)) && addr != cap.account_address:
+            balance<Token>(addr) == old(balance<Token>(addr));
+    }
+    spec schema WithdrawFromEmits<Token> {
+        cap: WithdrawCapability;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        let payer = cap.account_address;
+        let handle = global<DiemAccount>(payer).sent_events;
+        let msg = SentPaymentEvent {
+            amount,
+            currency_code: Diem::spec_currency_code<Token>(),
+            payee,
+            metadata
+        };
+        emits msg to handle;
+    }
+
+    /// Withdraw `amount` `Diem<Token>`'s from `cap.address` and send them to the `Preburn`
+    /// resource under `dd`.
+    public fun preburn<Token>(
+        dd: &signer,
+        cap: &WithdrawCapability,
+        amount: u64
+    ) acquires Balance, AccountOperationsCapability, DiemAccount {
+        Roles::assert_designated_dealer(dd);
+        DiemTimestamp::assert_operating();
+        Diem::preburn_to<Token>(dd, withdraw_from(cap, signer::address_of(dd), amount, x""))
+    }
+    spec preburn {
+        pragma opaque;
+        let dd_addr = signer::address_of(dd);
+        let payer = cap.account_address;
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payer));
+        modifies global<DiemAccount>(payer);
+        ensures exists<DiemAccount>(payer);
+        ensures global<DiemAccount>(payer).withdraw_capability
+                == old(global<DiemAccount>(payer).withdraw_capability);
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).sent_events,
+                                    old(global<DiemAccount>(payer).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).received_events,
+                                    old(global<DiemAccount>(payer).received_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(dd_addr).sent_events,
+                                    old(global<DiemAccount>(dd_addr).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(dd_addr).received_events,
+                                    old(global<DiemAccount>(dd_addr).received_events));
+        include PreburnAbortsIf<Token>;
+        include PreburnEnsures<Token>{dd, payer};
+        include PreburnEmits<Token>;
+    }
+    spec schema PreburnAbortsIf<Token> {
+        dd: signer;
+        cap: WithdrawCapability;
+        amount: u64;
+        include DiemTimestamp::AbortsIfNotOperating{};
+        include WithdrawFromAbortsIf<Token>{payee: signer::address_of(dd)};
+        include Diem::PreburnToAbortsIf<Token>{account: dd};
+    }
+    spec schema PreburnEnsures<Token> {
+        dd: signer;
+        payer: address;
+        amount: u64;
+        modifies global<Balance<Token>>(payer);
+        let payer_balance = global<Balance<Token>>(payer).coin.value;
+        let post post_payer_balance = global<Balance<Token>>(payer).coin.value;
+        /// The balance of payer decreases by `amount`.
+        ensures post_payer_balance == payer_balance - amount;
+        /// The value of preburn at `dd_addr` increases by `amount`;
+        include Diem::PreburnToEnsures<Token>{amount, account: dd};
+    }
+    spec schema PreburnEmits<Token> {
+        dd: signer;
+        cap: WithdrawCapability;
+        amount: u64;
+        let dd_addr = signer::address_of(dd);
+        include Diem::PreburnWithResourceEmits<Token>{preburn_address: dd_addr};
+        include WithdrawFromEmits<Token>{payee: dd_addr, metadata: x""};
+    }
+
+    /// Return a unique capability granting permission to withdraw from the sender's account balance.
+    public fun extract_withdraw_capability(
+        sender: &signer
+    ): WithdrawCapability acquires DiemAccount {
+        let sender_addr = signer::address_of(sender);
+        // Abort if we already extracted the unique withdraw capability for this account.
+        assert!(
+            !delegated_withdraw_capability(sender_addr),
+            errors::invalid_state(EWITHDRAW_CAPABILITY_ALREADY_EXTRACTED)
+        );
+        assert!(exists_at(sender_addr), errors::not_published(EACCOUNT));
+        let account = borrow_global_mut<DiemAccount>(sender_addr);
+        option::extract(&mut account.withdraw_capability)
+    }
+
+    spec extract_withdraw_capability {
+        pragma opaque;
+        let sender_addr = signer::address_of(sender);
+        modifies global<DiemAccount>(sender_addr);
+        include ExtractWithdrawCapAbortsIf{sender_addr};
+        ensures exists<DiemAccount>(sender_addr);
+        ensures result == old(spec_get_withdraw_cap(sender_addr));
+        ensures global<DiemAccount>(sender_addr) == update_field(old(global<DiemAccount>(sender_addr)),
+            withdraw_capability, option::spec_none());
+        ensures result.account_address == sender_addr;
+    }
+
+    spec schema ExtractWithdrawCapAbortsIf {
+        sender_addr: address;
+        aborts_if !exists_at(sender_addr) with errors::NOT_PUBLISHED;
+        aborts_if spec_holds_delegated_withdraw_capability(sender_addr) with errors::INVALID_STATE;
+    }
+
+    /// Return the withdraw capability to the account it originally came from
+    public fun restore_withdraw_capability(cap: WithdrawCapability)
+    acquires DiemAccount {
+        assert!(exists_at(cap.account_address), errors::not_published(EACCOUNT));
+        // Abort if the withdraw capability for this account is not extracted,
+        // indicating that the withdraw capability is not unique.
+        assert!(
+            delegated_withdraw_capability(cap.account_address),
+            errors::invalid_state(EWITHDRAW_CAPABILITY_NOT_EXTRACTED)
+        );
+        let account = borrow_global_mut<DiemAccount>(cap.account_address);
+        option::fill(&mut account.withdraw_capability, cap)
+    }
+
+    spec restore_withdraw_capability {
+        pragma opaque;
+        let cap_addr = cap.account_address;
+        modifies global<DiemAccount>(cap_addr);
+        ensures global<DiemAccount>(cap_addr) == update_field(old(global<DiemAccount>(cap_addr)),
+            withdraw_capability, option::spec_some(cap));
+        aborts_if !exists_at(cap_addr) with errors::NOT_PUBLISHED;
+        aborts_if !delegated_withdraw_capability(cap_addr) with errors::INVALID_STATE;
+        ensures spec_holds_own_withdraw_cap(cap_addr);
+    }
+
+    /// Withdraw `amount` Diem<Token> from the address embedded in `WithdrawCapability` and
+    /// deposits it into the `payee`'s account balance.
+    /// The included `metadata` will appear in the `SentPaymentEvent` and `ReceivedPaymentEvent`.
+    /// The `metadata_signature` will only be checked if this payment is subject to the dual
+    /// attestation protocol
+    public fun pay_from<Token>(
+        cap: &WithdrawCapability,
+        payee: address,
+        amount: u64,
+        metadata: vector<u8>,
+        metadata_signature: vector<u8>
+    ) acquires DiemAccount, Balance, AccountOperationsCapability {
+        deposit<Token>(
+            *&cap.account_address,
+            payee,
+            withdraw_from(cap, payee, amount, copy metadata),
+            metadata,
+            metadata_signature,
+            true
+        );
+    }
+
+    /// Withdraw `amount` Diem<Token> from the address embedded in `WithdrawCapability` and
+    /// deposits it into the `payee`'s account balance.
+    /// The included `metadata` will appear in the `SentPaymentEvent` and `ReceivedPaymentEvent`.
+    /// As `payee` is also signer of the transaction, no metadata signature is required for dual attestation.
+    public fun pay_by_signers<Token>(
+        cap: &WithdrawCapability,
+        payee: &signer,
+        amount: u64,
+        metadata: vector<u8>,
+    ) acquires DiemAccount, Balance, AccountOperationsCapability {
+        let payee_address = signer::address_of(payee);
+        deposit<Token>(
+            *&cap.account_address,
+            payee_address,
+            withdraw_from(cap, payee_address, amount, copy metadata),
+            metadata,
+            x"",
+            false
+        );
+    }
+
+    spec pay_from {
+        pragma opaque;
+
+        include PayFromWithoutDualAttestation<Token>{
+            payer: cap.account_address
+        };
+        include DualAttestation::AssertPaymentOkAbortsIf<Token>{
+            payer: cap.account_address,
+            value: amount
+        };
+    }
+
+    spec pay_by_signers {
+        pragma opaque;
+
+        include PayFromWithoutDualAttestation<Token>{
+            payer: cap.account_address,
+            payee: signer::address_of(payee)
+        };
+    }
+
+    spec schema PayFromWithoutDualAttestation<Token> {
+        payer: address;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+
+        modifies global<DiemAccount>(payer);
+        modifies global<DiemAccount>(payee);
+        modifies global<Balance<Token>>(payer);
+        modifies global<Balance<Token>>(payee);
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payer));
+        modifies global<AccountLimits::Window<Token>>(VASP::spec_parent_address(payee));
+        ensures exists_at(payer);
+        ensures exists_at(payee);
+        ensures exists<Balance<Token>>(payer);
+        ensures exists<Balance<Token>>(payee);
+        ensures global<DiemAccount>(payer).withdraw_capability
+            == old(global<DiemAccount>(payer).withdraw_capability);
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).sent_events,
+                                    old(global<DiemAccount>(payer).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payer).received_events,
+                                    old(global<DiemAccount>(payer).received_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payee).sent_events,
+                                    old(global<DiemAccount>(payee).sent_events));
+        ensures event::spec_guid_eq(global<DiemAccount>(payee).received_events,
+                                    old(global<DiemAccount>(payee).received_events));
+        include PayFromAbortsIf<Token>;
+        include PayFromEnsures<Token>{payer};
+        include PayFromEmits<Token>;
+    }
+
+    spec schema PayFromAbortsIf<Token> {
+        cap: WithdrawCapability;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        include DepositAbortsIf<Token>{payer: cap.account_address};
+        include cap.account_address != payee ==> DepositOverflowAbortsIf<Token>;
+        include WithdrawFromAbortsIf<Token>;
+    }
+    spec schema PayFromAbortsIfRestricted<Token> {
+        cap: WithdrawCapability;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        let payer = cap.account_address;
+        include DepositAbortsIfRestricted<Token>{payer: cap.account_address};
+        include WithdrawFromBalanceNoLimitsAbortsIf<Token>{payer, balance: global<Balance<Token>>(payer)};
+        aborts_if !exists<Balance<Token>>(payer) with errors::NOT_PUBLISHED;
+    }
+    spec schema PayFromEnsures<Token> {
+        payer: address;
+        payee: address;
+        amount: u64;
+        ensures payer == payee ==> balance<Token>(payer) == old(balance<Token>(payer));
+        ensures payer != payee ==> balance<Token>(payer) == old(balance<Token>(payer)) - amount;
+        ensures payer != payee ==> balance<Token>(payee) == old(balance<Token>(payee)) + amount;
+    }
+    spec schema PayFromEmits<Token> {
+        cap: WithdrawCapability;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+        let payer = cap.account_address;
+        include DepositEmits<Token>{payer: payer};
+        include WithdrawFromEmits<Token>;
+    }
+
+    /// Rotate the authentication key for the account under cap.account_address
+    public fun rotate_authentication_key(
+        cap: &KeyRotationCapability,
+        new_authentication_key: vector<u8>,
+    ) acquires DiemAccount  {
+        assert!(exists_at(cap.account_address), errors::not_published(EACCOUNT));
+        let sender_account_resource = borrow_global_mut<DiemAccount>(cap.account_address);
+        // Don't allow rotating to clearly invalid key
+        assert!(
+            vector::length(&new_authentication_key) == 32,
+            errors::invalid_argument(EMALFORMED_AUTHENTICATION_KEY)
+        );
+        sender_account_resource.authentication_key = new_authentication_key;
+    }
+    spec rotate_authentication_key {
+        include RotateAuthenticationKeyAbortsIf;
+        include RotateAuthenticationKeyEnsures{addr: cap.account_address};
+        include RotateOnlyKeyOfCapAddress;
+    }
+    spec schema RotateAuthenticationKeyAbortsIf {
+        cap: &KeyRotationCapability;
+        new_authentication_key: vector<u8>;
+        aborts_if !exists_at(cap.account_address) with errors::NOT_PUBLISHED;
+        aborts_if len(new_authentication_key) != 32 with errors::INVALID_ARGUMENT;
+    }
+    spec schema RotateAuthenticationKeyEnsures {
+        addr: address;
+        new_authentication_key: vector<u8>;
+        ensures global<DiemAccount>(addr).authentication_key == new_authentication_key;
+    }
+
+    /// # Access Control
+    spec schema RotateOnlyKeyOfCapAddress {
+        cap: KeyRotationCapability;
+        /// Can only rotate the authentication_key of cap.account_address [[H18]][PERMISSION].
+        ensures forall addr: address where addr != cap.account_address && old(exists_at(addr)):
+            global<DiemAccount>(addr).authentication_key == old(global<DiemAccount>(addr).authentication_key);
+    }
+
+    /// Return a unique capability granting permission to rotate the sender's authentication key
+    public fun extract_key_rotation_capability(account: &signer): KeyRotationCapability
+    acquires DiemAccount {
+        let account_address = signer::address_of(account);
+        // Abort if we already extracted the unique key rotation capability for this account.
+        assert!(
+            !delegated_key_rotation_capability(account_address),
+            errors::invalid_state(EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED)
+        );
+        assert!(exists_at(account_address), errors::not_published(EACCOUNT));
+        let account = borrow_global_mut<DiemAccount>(account_address);
+        option::extract(&mut account.key_rotation_capability)
+    }
+    spec extract_key_rotation_capability {
+        include ExtractKeyRotationCapabilityAbortsIf;
+        include ExtractKeyRotationCapabilityEnsures;
+    }
+    spec schema ExtractKeyRotationCapabilityAbortsIf {
+        account: signer;
+        let account_addr = signer::address_of(account);
+        aborts_if !exists_at(account_addr) with errors::NOT_PUBLISHED;
+        include AbortsIfDelegatedKeyRotationCapability;
+    }
+    spec schema AbortsIfDelegatedKeyRotationCapability {
+        account: signer;
+        aborts_if delegated_key_rotation_capability(signer::address_of(account)) with errors::INVALID_STATE;
+    }
+    spec schema ExtractKeyRotationCapabilityEnsures {
+        account: signer;
+        ensures delegated_key_rotation_capability(signer::address_of(account));
+    }
+
+    /// Return the key rotation capability to the account it originally came from
+    public fun restore_key_rotation_capability(cap: KeyRotationCapability)
+    acquires DiemAccount {
+        assert!(exists_at(cap.account_address), errors::not_published(EACCOUNT));
+        let account = borrow_global_mut<DiemAccount>(cap.account_address);
+        option::fill(&mut account.key_rotation_capability, cap)
+    }
+    spec restore_key_rotation_capability {
+        include RestoreKeyRotationCapabilityAbortsIf;
+        include RestoreKeyRotationCapabilityEnsures;
+    }
+    spec schema RestoreKeyRotationCapabilityAbortsIf {
+        cap: KeyRotationCapability;
+        aborts_if !exists_at(cap.account_address) with errors::NOT_PUBLISHED;
+        aborts_if !delegated_key_rotation_capability(cap.account_address) with option::EOPTION_IS_SET;
+    }
+    spec schema RestoreKeyRotationCapabilityEnsures {
+        cap: KeyRotationCapability;
+        ensures spec_holds_own_key_rotation_cap(cap.account_address);
+    }
+
+    /// Add balances for `Token` to `new_account`.  If `add_all_currencies` is true,
+    /// then add for both token types.
+    fun add_currencies_for_account<Token>(
+        new_account: &signer,
+        add_all_currencies: bool,
+    ) {
+        let new_account_addr = signer::address_of(new_account);
+        add_currency<Token>(new_account);
+        if (add_all_currencies) {
+            if (!exists<Balance<XUS>>(new_account_addr)) {
+                add_currency<XUS>(new_account);
+            };
+            if (!exists<Balance<XDX>>(new_account_addr)) {
+                add_currency<XDX>(new_account);
+            };
+        };
+    }
+
+    spec add_currencies_for_account {
+        let new_account_addr = signer::address_of(new_account);
+        aborts_if !Roles::spec_can_hold_balance_addr(new_account_addr) with errors::INVALID_ARGUMENT;
+        aborts_if exists<Balance<Token>>(new_account_addr) with errors::ALREADY_PUBLISHED;
+        aborts_if !exists_at(new_account_addr) with errors::NOT_PUBLISHED;
+        include AddCurrencyForAccountAbortsIf<Token>{addr: new_account_addr};
+        include AddCurrencyForAccountEnsures<Token>{addr: new_account_addr};
+    }
+
+    spec schema AddCurrencyForAccountAbortsIf<Token> {
+        addr: address;
+        add_all_currencies: bool;
+        include Diem::AbortsIfNoCurrency<Token>;
+        include add_all_currencies && !exists<Balance<XUS>>(addr)
+            ==> Diem::AbortsIfNoCurrency<XUS>;
+        include add_all_currencies && !exists<Balance<XDX>>(addr)
+            ==> Diem::AbortsIfNoCurrency<XDX>;
+    }
+
+    spec schema AddCurrencyForAccountEnsures<Token> {
+        addr: address;
+        add_all_currencies: bool;
+        include AddCurrencyEnsures<Token>;
+        include add_all_currencies && !exists<Balance<XUS>>(addr)
+            ==> AddCurrencyEnsures<XUS>;
+        include add_all_currencies && !exists<Balance<XDX>>(addr)
+            ==> AddCurrencyEnsures<XDX>;
+    }
+
+
+    /// Creates a new account with account at `new_account_address` with
+    /// authentication key `auth_key_prefix` | `fresh_address`.
+    /// Aborts if there is already an account at `new_account_address`.
+    ///
+    /// Creating an account at address 0x0 will abort as it is a reserved address for the MoveVM.
+    fun make_account(
+        new_account: &signer,
+        auth_key_prefix: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        let new_account_addr = signer::address_of(new_account);
+        // cannot create an account at the reserved address 0x0
+        assert!(
+            new_account_addr != @VMReserved,
+            errors::invalid_argument(ECANNOT_CREATE_AT_VM_RESERVED)
+        );
+        assert!(
+            new_account_addr != @DiemFramework,
+            errors::invalid_argument(ECANNOT_CREATE_AT_CORE_CODE)
+        );
+
+        // Construct authentication key.
+        let authentication_key = create_authentication_key(new_account, auth_key_prefix);
+
+        // Publish AccountFreezing::FreezingBit (initially not frozen)
+        AccountFreezing::create(new_account);
+        // The AccountOperationsCapability is published during Genesis, so it should
+        // always exist.  This is a sanity check.
+        assert!(
+            exists<AccountOperationsCapability>(@DiemRoot),
+            errors::not_published(EACCOUNT_OPERATIONS_CAPABILITY)
+        );
+        // Emit the CreateAccountEvent
+        event::emit_event(
+            &mut borrow_global_mut<AccountOperationsCapability>(@DiemRoot).creation_events,
+            CreateAccountEvent { created: new_account_addr, role_id: Roles::get_role_id(new_account_addr) },
+        );
+        move_to(
+            new_account,
+            DiemAccount {
+                authentication_key,
+                withdraw_capability: option::some(
+                    WithdrawCapability {
+                        account_address: new_account_addr
+                }),
+                key_rotation_capability: option::some(
+                    KeyRotationCapability {
+                        account_address: new_account_addr
+                }),
+                received_events: event::new_event_handle<ReceivedPaymentEvent>(new_account),
+                sent_events: event::new_event_handle<SentPaymentEvent>(new_account),
+                sequence_number: 0,
+            }
+        );
+    }
+    spec make_account {
+        pragma opaque;
+        // This is called from a context where invariants are disabled
+        let new_account_addr = signer::address_of(new_account);
+        requires !exists<DiemAccount>(new_account_addr);
+        modifies global<DiemAccount>(new_account_addr);
+        modifies global<event::EventHandleGenerator>(new_account_addr);
+        modifies global<AccountFreezing::FreezingBit>(new_account_addr);
+        requires exists<AccountOperationsCapability>(@DiemRoot);
+        modifies global<AccountOperationsCapability>(@DiemRoot);
+        ensures exists<AccountOperationsCapability>(@DiemRoot);
+        // Next requires is needed to prove invariant
+        // TODO: This may not be necessary now that invariants are disabled in callers.
+        requires exists<Roles::RoleId>(new_account_addr);
+        include MakeAccountAbortsIf{addr: new_account_addr};
+        ensures exists_at(new_account_addr);
+        ensures AccountFreezing::spec_account_is_not_frozen(new_account_addr);
+        let account_ops_cap = global<AccountOperationsCapability>(@DiemRoot);
+        let post post_account_ops_cap = global<AccountOperationsCapability>(@DiemRoot);
+        ensures post_account_ops_cap == update_field(account_ops_cap, creation_events, account_ops_cap.creation_events);
+        ensures spec_holds_own_key_rotation_cap(new_account_addr);
+        ensures spec_holds_own_withdraw_cap(new_account_addr);
+        include MakeAccountEmits{new_account_address: signer::address_of(new_account)};
+        include MakeAccountEnsures{addr: new_account_addr};
+
+    }
+    spec schema MakeAccountEnsures {
+        addr: address;
+        ensures global<DiemAccount>(addr).sequence_number == 0;
+    }
+    spec schema MakeAccountAbortsIf {
+        addr: address;
+        auth_key_prefix: vector<u8>;
+        aborts_if addr == @VMReserved with errors::INVALID_ARGUMENT;
+        aborts_if addr == @DiemFramework with errors::INVALID_ARGUMENT;
+        aborts_if exists<AccountFreezing::FreezingBit>(addr) with errors::ALREADY_PUBLISHED;
+        // There is an invariant below that says that there is always an AccountOperationsCapability
+        // after Genesis, so this can only abort during Genesis.
+        aborts_if DiemTimestamp::is_genesis()
+            && !exists<AccountOperationsCapability>(@DiemRoot)
+            with errors::NOT_PUBLISHED;
+        include CreateAuthenticationKeyAbortsIf;
+        // We do not need to specify aborts_if if account already exists, because make_account will
+        // abort because of a published FreezingBit, first.
+    }
+    spec schema MakeAccountEmits {
+        new_account_address: address;
+        let post handle = global<AccountOperationsCapability>(@DiemRoot).creation_events;
+        let post msg = CreateAccountEvent {
+            created: new_account_address,
+            role_id: Roles::spec_get_role_id(new_account_address)
+        };
+        emits msg to handle;
+    }
+
+    /// Construct an authentication key, aborting if the prefix is not valid.
+    fun create_authentication_key(account: &signer, auth_key_prefix: vector<u8>): vector<u8> {
+        let authentication_key = auth_key_prefix;
+        vector::append(
+            &mut authentication_key, bcs::to_bytes(signer::borrow_address(account))
+        );
+        /*
+        assert!(
+            vector::length(&authentication_key) == 64,
+            errors::invalid_argument(EMALFORMED_AUTHENTICATION_KEY)
+        );
+        */
+        authentication_key
+    }
+    spec create_authentication_key {
+        /// The specification of this function is abstracted to avoid the complexity of
+        /// vector concatenation of serialization results. The actual value of the key
+        /// is assumed to be irrelevant for callers. Instead the uninterpreted function
+        /// `spec_abstract_create_authentication_key` is used to represent the key value.
+        /// The aborts behavior is, however, preserved: the caller must provide a
+        /// key prefix of a specific length.
+        pragma opaque;
+        include [abstract] CreateAuthenticationKeyAbortsIf;
+        ensures [abstract]
+            result == spec_abstract_create_authentication_key(auth_key_prefix); // && len(result) == 64;
+    }
+    spec schema CreateAuthenticationKeyAbortsIf {
+        auth_key_prefix: vector<u8>;
+        aborts_if 16 + len(auth_key_prefix) != 32 with errors::INVALID_ARGUMENT;
+    }
+    spec fun spec_abstract_create_authentication_key(auth_key_prefix: vector<u8>): vector<u8>;
+
+
+    /// Creates the diem root account (during genesis). Publishes the Diem root role,
+    /// Publishes a SlidingNonce resource, sets up event generator, publishes
+    /// AccountOperationsCapability, WriteSetManager, and finally makes the account.
+    fun create_diem_root_account(
+        auth_key_prefix: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        DiemTimestamp::assert_genesis();
+        let dr_account = create_signer(@DiemRoot);
+        CoreAddresses::assert_diem_root(&dr_account);
+        Roles::grant_diem_root_role(&dr_account);
+        SlidingNonce::publish(&dr_account);
+
+        assert!(
+            !exists<AccountOperationsCapability>(@DiemRoot),
+            errors::already_published(EACCOUNT_OPERATIONS_CAPABILITY)
+        );
+        move_to(
+            &dr_account,
+            AccountOperationsCapability {
+                limits_cap: AccountLimits::grant_mutation_capability(&dr_account),
+                creation_events: event::new_event_handle<CreateAccountEvent>(&dr_account),
+            }
+        );
+        assert!(
+            !exists<DiemWriteSetManager>(@DiemRoot),
+            errors::already_published(EWRITESET_MANAGER)
+        );
+        move_to(
+            &dr_account,
+            DiemWriteSetManager {
+                upgrade_events: event::new_event_handle<Self::AdminTransactionEvent>(&dr_account),
+            }
+        );
+        make_account(&dr_account, auth_key_prefix)
+    }
+
+    spec create_diem_root_account {
+        pragma disable_invariants_in_body;
+        pragma opaque;
+        include CreateDiemRootAccountModifies;
+        include CreateDiemRootAccountAbortsIf;
+        include CreateDiemRootAccountEnsures;
+        include MakeAccountEmits{new_account_address: @DiemRoot};
+    }
+
+    spec schema CreateDiemRootAccountModifies {
+        let dr_addr = @DiemRoot;
+        modifies global<event::EventHandleGenerator>(dr_addr);
+        modifies global<DiemAccount>(dr_addr);
+        modifies global<AccountOperationsCapability>(dr_addr);
+        modifies global<DiemWriteSetManager>(dr_addr);
+        modifies global<SlidingNonce::SlidingNonce>(dr_addr);
+        modifies global<Roles::RoleId>(dr_addr);
+        modifies global<AccountFreezing::FreezingBit>(dr_addr);
+    }
+    spec schema CreateDiemRootAccountAbortsIf {
+        auth_key_prefix: vector<u8>;
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::GrantRole{addr: @DiemRoot, role_id: Roles::DIEM_ROOT_ROLE_ID};
+        aborts_if exists<SlidingNonce::SlidingNonce>(@DiemRoot)
+            with errors::ALREADY_PUBLISHED;
+        aborts_if exists<AccountOperationsCapability>(@DiemRoot)
+            with errors::ALREADY_PUBLISHED;
+        aborts_if exists<DiemWriteSetManager>(@DiemRoot)
+            with errors::ALREADY_PUBLISHED;
+        aborts_if exists<AccountFreezing::FreezingBit>(@DiemRoot)
+            with errors::ALREADY_PUBLISHED;
+        include CreateAuthenticationKeyAbortsIf;
+    }
+    spec schema CreateDiemRootAccountEnsures {
+        let dr_addr = @DiemRoot;
+        ensures exists<AccountOperationsCapability>(dr_addr);
+        ensures exists<DiemWriteSetManager>(dr_addr);
+        ensures exists<SlidingNonce::SlidingNonce>(dr_addr);
+        ensures Roles::spec_has_diem_root_role_addr(dr_addr);
+        ensures exists_at(dr_addr);
+        ensures AccountFreezing::spec_account_is_not_frozen(dr_addr);
+        ensures spec_holds_own_key_rotation_cap(dr_addr);
+        ensures spec_holds_own_withdraw_cap(dr_addr);
+    }
+
+    /// Create a treasury/compliance account at `new_account_address` with authentication key
+    /// `auth_key_prefix` | `new_account_address`.  Can only be called during genesis.
+    /// Also, publishes the treasury compliance role, the SlidingNonce resource, and
+    /// event handle generator, then makes the account.
+    fun create_treasury_compliance_account(
+        dr_account: &signer,
+        auth_key_prefix: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+        let new_account_address = @TreasuryCompliance;
+        let new_account = create_signer(new_account_address);
+        Roles::grant_treasury_compliance_role(&new_account, dr_account);
+        SlidingNonce::publish(&new_account);
+        VASPDomain::publish_vasp_domain_manager(&new_account);
+        make_account(&new_account, auth_key_prefix)
+    }
+    spec create_treasury_compliance_account {
+        pragma disable_invariants_in_body;
+        pragma opaque;
+        let tc_addr = @TreasuryCompliance;
+        include CreateTreasuryComplianceAccountModifies;
+        include CreateTreasuryComplianceAccountAbortsIf;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include MakeAccountAbortsIf{addr: @TreasuryCompliance};
+        include CreateTreasuryComplianceAccountEnsures;
+        let account_ops_cap = global<AccountOperationsCapability>(@DiemRoot);
+        let post post_account_ops_cap = global<AccountOperationsCapability>(@DiemRoot);
+        ensures post_account_ops_cap == update_field(account_ops_cap, creation_events, account_ops_cap.creation_events);
+        include MakeAccountEmits{new_account_address: @TreasuryCompliance};
+        aborts_if VASPDomain::tc_domain_manager_exists() with errors::ALREADY_PUBLISHED;
+    }
+    spec schema CreateTreasuryComplianceAccountModifies {
+        let tc_addr = @TreasuryCompliance;
+        modifies global<DiemAccount>(tc_addr);
+        modifies global<SlidingNonce::SlidingNonce>(tc_addr);
+        modifies global<Roles::RoleId>(tc_addr);
+        modifies global<AccountFreezing::FreezingBit>(tc_addr);
+        modifies global<AccountOperationsCapability>(@DiemRoot);
+        ensures exists<AccountOperationsCapability>(@DiemRoot);
+        modifies global<event::EventHandleGenerator>(@TreasuryCompliance);
+        modifies global<VASPDomain::VASPDomainManager>(tc_addr);
+    }
+    spec schema CreateTreasuryComplianceAccountAbortsIf {
+        dr_account: signer;
+        auth_key_prefix: vector<u8>;
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::GrantRole{addr: @TreasuryCompliance, role_id: Roles::TREASURY_COMPLIANCE_ROLE_ID};
+        aborts_if exists<SlidingNonce::SlidingNonce>(@TreasuryCompliance)
+            with errors::ALREADY_PUBLISHED;
+        aborts_if VASPDomain::tc_domain_manager_exists() with errors::ALREADY_PUBLISHED;
+    }
+    spec schema CreateTreasuryComplianceAccountEnsures {
+        let tc_addr = @TreasuryCompliance;
+        ensures Roles::spec_has_treasury_compliance_role_addr(tc_addr);
+        ensures exists_at(tc_addr);
+        ensures exists<SlidingNonce::SlidingNonce>(tc_addr);
+        ensures AccountFreezing::spec_account_is_not_frozen(tc_addr);
+        ensures spec_holds_own_key_rotation_cap(tc_addr);
+        ensures spec_holds_own_withdraw_cap(tc_addr);
+        ensures exists<VASPDomain::VASPDomainManager>(tc_addr);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Designated Dealer API
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Create a designated dealer account at `new_account_address` with authentication key
+    /// `auth_key_prefix` | `new_account_address`, for non synthetic CoinType.
+    /// Creates Preburn resource under account 'new_account_address'
+    public fun create_designated_dealer<CoinType>(
+        creator_account: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+        add_all_currencies: bool,
+    ) acquires AccountOperationsCapability {
+        DiemTimestamp::assert_operating();
+        Roles::assert_treasury_compliance(creator_account);
+        let new_dd_account = create_signer(new_account_address);
+        Roles::new_designated_dealer_role(creator_account, &new_dd_account);
+        DesignatedDealer::publish_designated_dealer_credential<CoinType>(&new_dd_account, creator_account, add_all_currencies);
+        DualAttestation::publish_credential(&new_dd_account, creator_account, human_name);
+        make_account(&new_dd_account, auth_key_prefix);
+        add_currencies_for_account<CoinType>(&new_dd_account, add_all_currencies)
+    }
+
+    spec create_designated_dealer {
+        pragma disable_invariants_in_body;
+        include CreateDesignatedDealerAbortsIf<CoinType>;
+        include CreateDesignatedDealerEnsures<CoinType>;
+        include MakeAccountEmits;
+    }
+
+    spec schema CreateDesignatedDealerAbortsIf<CoinType> {
+        creator_account: signer;
+        new_account_address: address;
+        auth_key_prefix: vector<u8>;
+        add_all_currencies: bool;
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotTreasuryCompliance{account: creator_account};
+        aborts_if exists<Roles::RoleId>(new_account_address) with errors::ALREADY_PUBLISHED;
+        aborts_if exists<DesignatedDealer::Dealer>(new_account_address) with errors::ALREADY_PUBLISHED;
+        include if (add_all_currencies) DesignatedDealer::AddCurrencyAbortsIf<XUS>{dd_addr: new_account_address}
+                else DesignatedDealer::AddCurrencyAbortsIf<CoinType>{dd_addr: new_account_address};
+        include AddCurrencyForAccountAbortsIf<CoinType>{addr: new_account_address};
+        include MakeAccountAbortsIf{addr: new_account_address};
+    }
+
+    spec schema CreateDesignatedDealerEnsures<CoinType> {
+        new_account_address: address;
+        ensures exists<DesignatedDealer::Dealer>(new_account_address);
+        ensures exists_at(new_account_address);
+        ensures Roles::spec_has_designated_dealer_role_addr(new_account_address);
+        include AddCurrencyForAccountEnsures<CoinType>{addr: new_account_address};
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // VASP methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Create an account with the ParentVASP role at `new_account_address` with authentication key
+    /// `auth_key_prefix` | `new_account_address`.  If `add_all_currencies` is true, 0 balances for
+    /// all available currencies in the system will also be added.
+    public fun create_parent_vasp_account<Token>(
+        creator_account: &signer,  // TreasuryCompliance
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+        add_all_currencies: bool
+    ) acquires AccountOperationsCapability {
+        Roles::assert_treasury_compliance(creator_account);
+        let new_account = create_signer(new_account_address);
+        Roles::new_parent_vasp_role(creator_account, &new_account);
+        VASP::publish_parent_vasp_credential(&new_account, creator_account);
+        DualAttestation::publish_credential(&new_account, creator_account, human_name);
+        VASPDomain::publish_vasp_domains(&new_account);
+        make_account(&new_account, auth_key_prefix);
+        add_currencies_for_account<Token>(&new_account, add_all_currencies);
+        spec {
+            assert exists<VASPDomain::VASPDomains>(signer::address_of(new_account));
+            assert Roles::spec_has_treasury_compliance_role_addr(signer::address_of(creator_account));
+        }
+    }
+
+    spec create_parent_vasp_account {
+        pragma disable_invariants_in_body;
+        include CreateParentVASPAccountAbortsIf<Token>;
+        include CreateParentVASPAccountEnsures<Token>;
+        include MakeAccountEmits;
+    }
+
+    spec schema CreateParentVASPAccountAbortsIf<Token> {
+        creator_account: signer;
+        new_account_address: address;
+        auth_key_prefix: vector<u8>;
+        add_all_currencies: bool;
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotTreasuryCompliance{account: creator_account};
+        include VASPDomain::PublishVASPDomainsAbortsIf{vasp_addr: new_account_address};
+        aborts_if exists<Roles::RoleId>(new_account_address) with errors::ALREADY_PUBLISHED;
+        aborts_if VASP::is_vasp(new_account_address) with errors::ALREADY_PUBLISHED;
+        include AddCurrencyForAccountAbortsIf<Token>{addr: new_account_address};
+        include MakeAccountAbortsIf{addr: new_account_address};
+    }
+
+    spec schema CreateParentVASPAccountEnsures<Token> {
+        new_account_address: address;
+        include VASP::PublishParentVASPEnsures{vasp_addr: new_account_address};
+        ensures exists_at(new_account_address);
+        ensures Roles::spec_has_parent_VASP_role_addr(new_account_address);
+        include AddCurrencyForAccountEnsures<Token>{addr: new_account_address};
+        include VASPDomain::PublishVASPDomainsEnsures{ vasp_addr: new_account_address };
+    }
+
+    /// Create an account with the ChildVASP role at `new_account_address` with authentication key
+    /// `auth_key_prefix` | `new_account_address` and a 0 balance of type `Token`. If
+    /// `add_all_currencies` is true, 0 balances for all avaialable currencies in the system will
+    /// also be added. This account will be a child of `creator`, which must be a ParentVASP.
+    public fun create_child_vasp_account<Token>(
+        parent: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        add_all_currencies: bool,
+    ) acquires AccountOperationsCapability {
+        DiemTimestamp::assert_operating();
+        Roles::assert_parent_vasp_role(parent);
+        let new_account = create_signer(new_account_address);
+        Roles::new_child_vasp_role(parent, &new_account);
+        VASP::publish_child_vasp_credential(
+            parent,
+            &new_account,
+        );
+        make_account(&new_account, auth_key_prefix);
+        add_currencies_for_account<Token>(&new_account, add_all_currencies);
+    }
+    spec create_child_vasp_account {
+        pragma disable_invariants_in_body;
+        include CreateChildVASPAccountAbortsIf<Token>;
+        include CreateChildVASPAccountEnsures<Token>{
+            parent_addr: signer::address_of(parent),
+            child_addr: new_account_address,
+        };
+        include AddCurrencyForAccountEnsures<Token>{addr: new_account_address};
+        include MakeAccountEmits;
+    }
+    spec schema CreateChildVASPAccountAbortsIf<Token> {
+        parent: signer;
+        new_account_address: address;
+        auth_key_prefix: vector<u8>;
+        add_all_currencies: bool;
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotParentVasp{account: parent};
+        aborts_if exists<Roles::RoleId>(new_account_address) with errors::ALREADY_PUBLISHED;
+        include VASP::PublishChildVASPAbortsIf{child_addr: new_account_address};
+        include AddCurrencyForAccountAbortsIf<Token>{addr: new_account_address};
+        include MakeAccountAbortsIf{addr: new_account_address};
+    }
+    spec schema CreateChildVASPAccountEnsures<Token> {
+        parent_addr: address;
+        child_addr: address;
+        add_all_currencies: bool;
+        include VASP::PublishChildVASPEnsures;
+        ensures exists_at(child_addr);
+        ensures Roles::spec_has_child_VASP_role_addr(child_addr);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // General purpose methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    native fun create_signer(addr: address): signer;
+
+    public fun publish_crsn(account: &signer, size: u64)
+    acquires DiemAccount {
+        let account_state = borrow_global<DiemAccount>(signer::address_of(account));
+        // Don't set this to start at account_state.sequence_number + 1, since
+        // after this the epilogue will record the sequence nonce
+        // `account_state.sequence_number` which will shift the window.
+        // If we set the window to start at `account_state.sequence_number +
+        // 1`, this transaction would be rejected in the epilogue as the
+        // sequence nonce would be outside of the window.
+        CRSN::publish(account, account_state.sequence_number, size)
+    }
+
+    /// Helper to return the u64 value of the `balance` for `account`
+    fun balance_for<Token>(balance: &Balance<Token>): u64 {
+        Diem::value<Token>(&balance.coin)
+    }
+
+    /// Return the current balance of the account at `addr`.
+    public fun balance<Token>(addr: address): u64 acquires Balance {
+        assert!(exists<Balance<Token>>(addr), errors::not_published(EPAYER_DOESNT_HOLD_CURRENCY));
+        balance_for(borrow_global<Balance<Token>>(addr))
+    }
+    spec balance {
+        aborts_if !exists<Balance<Token>>(addr) with errors::NOT_PUBLISHED;
+    }
+
+    /// Add a balance of `Token` type to the sending account
+    public(friend) fun add_currency<Token>(account: &signer) {
+        let addr = signer::address_of(account);
+        // aborts if `Token` is not a currency type in the system
+        Diem::assert_is_currency<Token>();
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        // Check that an account with this role is allowed to hold funds
+        assert!(
+            Roles::can_hold_balance(account),
+            errors::invalid_argument(EROLE_CANT_STORE_BALANCE)
+        );
+        // aborts if this account already has a balance in `Token`
+        assert!(
+            !exists<Balance<Token>>(addr),
+            errors::already_published(EADD_EXISTING_CURRENCY)
+        );
+
+        move_to(account, Balance<Token>{ coin: Diem::zero<Token>() })
+    }
+    spec add_currency {
+        /// An account must exist at the address
+        let addr = signer::address_of(account);
+        aborts_if !exists_at(addr) with errors::NOT_PUBLISHED;
+        include AddCurrencyAbortsIf<Token>;
+        include AddCurrencyEnsures<Token>;
+    }
+    spec schema AddCurrencyAbortsIf<Token> {
+        account: signer;
+        /// `Currency` must be valid
+        include Diem::AbortsIfNoCurrency<Token>;
+        /// `account` cannot have an existing balance in `Currency`
+        aborts_if exists<Balance<Token>>(signer::address_of(account)) with errors::ALREADY_PUBLISHED;
+        /// `account` must be allowed to hold balances.
+        include AbortsIfAccountCantHoldBalance;
+    }
+
+    spec schema AddCurrencyEnsures<Token> {
+        addr: address;
+        /// This publishes a `Balance<Currency>` to the caller's account
+        ensures exists<Balance<Token>>(addr);
+        ensures global<Balance<Token>>(addr)
+            == Balance<Token>{ coin: Diem<Token> { value: 0 } };
+    }
+
+    // #[test_only] TODO: uncomment once unit tests are fully migrated
+    public fun add_currency_for_test<Token>(account: &signer) {
+        add_currency<Token>(account)
+    }
+    spec add_currency_for_test {
+        pragma verify = false;
+    }
+
+    /// # Access Control
+    spec schema AbortsIfAccountCantHoldBalance {
+        account: signer;
+        /// This function must abort if the predicate `can_hold_balance` for `account` returns false
+        /// [[D1]][ROLE][[D2]][ROLE][[D3]][ROLE][[D4]][ROLE][[D5]][ROLE][[D6]][ROLE][[D7]][ROLE].
+        aborts_if !Roles::can_hold_balance(account) with errors::INVALID_ARGUMENT;
+    }
+
+    /// Return whether the account at `addr` accepts `Token` type coins
+    public fun accepts_currency<Token>(addr: address): bool {
+        exists<Balance<Token>>(addr)
+    }
+
+    /// Helper to return the sequence number field for given `account`
+    fun sequence_number_for_account(account: &DiemAccount): u64 {
+        account.sequence_number
+    }
+
+    /// Return the current sequence number at `addr`
+    public fun sequence_number(addr: address): u64 acquires DiemAccount {
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        sequence_number_for_account(borrow_global<DiemAccount>(addr))
+    }
+
+    /// Return the authentication key for this account
+    public fun authentication_key(addr: address): vector<u8> acquires DiemAccount {
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        *&borrow_global<DiemAccount>(addr).authentication_key
+    }
+
+    /// Return true if the account at `addr` has delegated its key rotation capability
+    public fun delegated_key_rotation_capability(addr: address): bool
+    acquires DiemAccount {
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        option::is_none(&borrow_global<DiemAccount>(addr).key_rotation_capability)
+    }
+
+    /// Return true if the account at `addr` has delegated its withdraw capability
+    public fun delegated_withdraw_capability(addr: address): bool
+    acquires DiemAccount {
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        option::is_none(&borrow_global<DiemAccount>(addr).withdraw_capability)
+    }
+
+    /// Return a reference to the address associated with the given withdraw capability
+    public fun withdraw_capability_address(cap: &WithdrawCapability): &address {
+        &cap.account_address
+    }
+
+    /// Return a reference to the address associated with the given key rotation capability
+    public fun key_rotation_capability_address(cap: &KeyRotationCapability): &address {
+        &cap.account_address
+    }
+
+    /// Checks if an account exists at `check_addr`
+    public fun exists_at(check_addr: address): bool {
+        exists<DiemAccount>(check_addr)
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Prologues and Epilogues of user signed transactions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// The prologue for module transaction
+    fun module_prologue<Token>(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        txn_expiration_time: u64,
+        chain_id: u8,
+    ) acquires DiemAccount, Balance {
+        assert!(
+            DiemTransactionPublishingOption::is_module_allowed(&sender),
+            errors::invalid_state(PROLOGUE_EMODULE_NOT_ALLOWED),
+        );
+
+        prologue_common<Token>(
+            &sender,
+            txn_sequence_number,
+            txn_public_key,
+            txn_gas_price,
+            txn_max_gas_units,
+            txn_expiration_time,
+            chain_id,
+        )
+    }
+    spec module_prologue {
+        let transaction_sender = signer::address_of(sender);
+        let max_transaction_fee = txn_gas_price * txn_max_gas_units;
+        include ModulePrologueAbortsIf<Token> {
+            max_transaction_fee,
+            txn_expiration_time_seconds: txn_expiration_time,
+        };
+        ensures prologue_guarantees(sender);
+    }
+    spec schema ModulePrologueAbortsIf<Token> {
+        sender: signer;
+        txn_sequence_number: u64;
+        txn_public_key: vector<u8>;
+        chain_id: u8;
+        max_transaction_fee: u128;
+        txn_expiration_time_seconds: u64;
+        let transaction_sender = signer::address_of(sender);
+        include PrologueCommonAbortsIf<Token> {
+            transaction_sender,
+            txn_sequence_number,
+            txn_public_key,
+            chain_id,
+            max_transaction_fee,
+            txn_expiration_time_seconds,
+        };
+        /// Aborts only in genesis. Does not need to be handled.
+        include DiemTransactionPublishingOption::AbortsIfNoTransactionPublishingOption;
+        /// Covered: L75 (Match 9)
+        aborts_if !DiemTransactionPublishingOption::spec_is_module_allowed(sender) with errors::INVALID_STATE;
+    }
+
+    /// The prologue for script transaction
+    fun script_prologue<Token>(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        txn_expiration_time: u64,
+        chain_id: u8,
+        script_hash: vector<u8>,
+    ) acquires DiemAccount, Balance {
+        assert!(
+            DiemTransactionPublishingOption::is_script_allowed(&sender, &script_hash),
+            errors::invalid_state(PROLOGUE_ESCRIPT_NOT_ALLOWED),
+        );
+
+        prologue_common<Token>(
+            &sender,
+            txn_sequence_number,
+            txn_public_key,
+            txn_gas_price,
+            txn_max_gas_units,
+            txn_expiration_time,
+            chain_id,
+        )
+    }
+    spec script_prologue {
+        let transaction_sender = signer::address_of(sender);
+        let max_transaction_fee = txn_gas_price * txn_max_gas_units;
+        include ScriptPrologueAbortsIf<Token>{
+            max_transaction_fee,
+            txn_expiration_time_seconds: txn_expiration_time,
+        };
+        ensures prologue_guarantees(sender);
+    }
+    spec schema ScriptPrologueAbortsIf<Token> {
+        sender: signer;
+        txn_sequence_number: u64;
+        txn_public_key: vector<u8>;
+        chain_id: u8;
+        max_transaction_fee: u128;
+        txn_expiration_time_seconds: u64;
+        script_hash: vector<u8>;
+        let transaction_sender = signer::address_of(sender);
+        include PrologueCommonAbortsIf<Token> {transaction_sender};
+        /// Aborts only in Genesis. Does not need to be handled.
+        include DiemTransactionPublishingOption::AbortsIfNoTransactionPublishingOption;
+        /// Covered: L74 (Match 8)
+        aborts_if !DiemTransactionPublishingOption::spec_is_script_allowed(sender, script_hash) with errors::INVALID_STATE;
+    }
+
+    /// The prologue for WriteSet transaction
+    fun writeset_prologue(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        txn_expiration_time: u64,
+        chain_id: u8,
+    ) acquires DiemAccount, Balance {
+        assert!(
+            signer::address_of(&sender) == @DiemRoot,
+            errors::invalid_argument(PROLOGUE_EINVALID_WRITESET_SENDER)
+        );
+        assert!(Roles::has_diem_root_role(&sender), errors::invalid_argument(PROLOGUE_EINVALID_WRITESET_SENDER));
+
+        // Currency code don't matter here as it won't be charged anyway. Gas constants are ommitted.
+        prologue_common<XUS>(
+            &sender,
+            txn_sequence_number,
+            txn_public_key,
+            0,
+            0,
+            txn_expiration_time,
+            chain_id,
+        )
+    }
+
+    spec writeset_prologue {
+        include WritesetPrologueAbortsIf {txn_expiration_time_seconds: txn_expiration_time};
+        ensures prologue_guarantees(sender);
+        ensures Roles::has_diem_root_role(sender);
+    }
+
+    spec schema WritesetPrologueAbortsIf {
+        sender: signer;
+        txn_sequence_number: u64;
+        txn_public_key: vector<u8>;
+        txn_expiration_time_seconds: u64;
+        chain_id: u8;
+        let transaction_sender = signer::address_of(sender);
+        /// Covered: L146 (Match 0)
+        aborts_if transaction_sender != @DiemRoot with errors::INVALID_ARGUMENT;
+        /// Must abort if the signer does not have the DiemRoot role [[H9]][PERMISSION].
+        /// Covered: L146 (Match 0)
+        aborts_if !Roles::spec_has_diem_root_role_addr(transaction_sender) with errors::INVALID_ARGUMENT;
+        include PrologueCommonAbortsIf<XUS>{
+            transaction_sender,
+            max_transaction_fee: 0,
+        };
+    }
+
+    fun check_secondary_signers(
+        secondary_signer_addresses: vector<address>,
+        secondary_signer_public_key_hashes: vector<vector<u8>>,
+    ) acquires DiemAccount {
+        let num_secondary_signers = vector::length(&secondary_signer_addresses);
+
+        // Number of public key hashes must match the number of secondary signers.
+        assert!(
+            vector::length(&secondary_signer_public_key_hashes) == num_secondary_signers,
+            errors::invalid_argument(PROLOGUE_ESECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH),
+        );
+
+        // Check validity of the secondary signers' addresses and public keys
+        let i = 0;
+        while ({
+            spec {
+                invariant forall j in 0..i: exists_at(secondary_signer_addresses[j]);
+                invariant forall j in 0..i: secondary_signer_public_key_hashes[j]
+                    == global<DiemAccount>(secondary_signer_addresses[j]).authentication_key;
+            };
+            (i < num_secondary_signers)
+        })
+        {
+            // Check that all secondary signers have accounts.
+            let secondary_address = *vector::borrow(&secondary_signer_addresses, i);
+            assert!(exists_at(secondary_address), errors::invalid_argument(PROLOGUE_EACCOUNT_DNE));
+
+            // Check that for each secondary signer, the provided public key hash is equal to the
+            // authentication key stored on-chain.
+            let signer_account = borrow_global<DiemAccount>(secondary_address);
+            let signer_public_key_hash = *vector::borrow(&secondary_signer_public_key_hashes, i);
+            assert!(
+                signer_public_key_hash == *&signer_account.authentication_key,
+                errors::invalid_argument(PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY),
+            );
+            i = i + 1;
+        };
+    }
+    spec check_secondary_signers {
+        pragma opaque;
+        // NOTE: this is to force the prover to honor the "opaque" pragma in the ignore opaque setting
+        ensures [concrete] true;
+
+        include CheckSecondarySignersAbortsIf;
+        let num_secondary_signers = len(secondary_signer_addresses);
+        ensures forall j in 0..num_secondary_signers: exists_at(secondary_signer_addresses[j]);
+        ensures forall j in 0..num_secondary_signers: secondary_signer_public_key_hashes[j]
+            == global<DiemAccount>(secondary_signer_addresses[j]).authentication_key;
+    }
+    spec schema CheckSecondarySignersAbortsIf {
+        secondary_signer_addresses: vector<address>;
+        secondary_signer_public_key_hashes: vector<vector<u8>>;
+        let num_secondary_signers = len(secondary_signer_addresses);
+        aborts_if len(secondary_signer_public_key_hashes) != num_secondary_signers
+            with errors::INVALID_ARGUMENT;
+        aborts_if exists i in 0..num_secondary_signers: !exists_at(secondary_signer_addresses[i])
+            with errors::INVALID_ARGUMENT;
+        aborts_if exists i in 0..num_secondary_signers:
+            secondary_signer_public_key_hashes[i] != global<DiemAccount>(secondary_signer_addresses[i]).authentication_key
+            with errors::INVALID_ARGUMENT;
+    }
+
+    /// The prologue for multi-agent user transactions
+    fun multi_agent_script_prologue<Token>(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_sender_public_key: vector<u8>,
+        secondary_signer_addresses: vector<address>,
+        secondary_signer_public_key_hashes: vector<vector<u8>>,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        txn_expiration_time: u64,
+        chain_id: u8,
+    ) acquires DiemAccount, Balance {
+        check_secondary_signers(
+            secondary_signer_addresses,
+            secondary_signer_public_key_hashes
+        );
+        prologue_common<Token>(
+            &sender,
+            txn_sequence_number,
+            txn_sender_public_key,
+            txn_gas_price,
+            txn_max_gas_units,
+            txn_expiration_time,
+            chain_id,
+        )
+    }
+    spec multi_agent_script_prologue {
+        let transaction_sender = signer::address_of(sender);
+        let max_transaction_fee = txn_gas_price * txn_max_gas_units;
+        include MultiAgentScriptPrologueAbortsIf<Token>{
+            max_transaction_fee,
+            txn_expiration_time_seconds: txn_expiration_time,
+        };
+        ensures prologue_guarantees(sender);
+    }
+
+    spec schema MultiAgentScriptPrologueAbortsIf<Token> {
+        sender: signer;
+        txn_sequence_number: u64;
+        txn_sender_public_key: vector<u8>;
+        secondary_signer_addresses: vector<address>;
+        secondary_signer_public_key_hashes: vector<vector<u8>>;
+        chain_id: u8;
+        max_transaction_fee: u128;
+        txn_expiration_time_seconds: u64;
+        include CheckSecondarySignersAbortsIf;
+        let transaction_sender = signer::address_of(sender);
+        include PrologueCommonAbortsIf<Token> {transaction_sender, txn_public_key: txn_sender_public_key};
+    }
+
+    /// The common prologue is invoked at the beginning of every transaction
+    /// The main properties that it verifies:
+    /// - The account's auth key matches the transaction's public key
+    /// - That the account has enough balance to pay for all of the gas
+    /// - That the sequence number matches the transaction's sequence key
+    fun prologue_common<Token>(
+        sender: &signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        txn_expiration_time_seconds: u64,
+        chain_id: u8,
+    ) acquires DiemAccount, Balance {
+        let transaction_sender = signer::address_of(sender);
+
+        // [PCA1]: Check that the chain ID stored on-chain matches the chain ID specified by the transaction
+        assert!(ChainId::get() == chain_id, errors::invalid_argument(PROLOGUE_EBAD_CHAIN_ID));
+
+        // [PCA2]: Verify that the transaction sender's account exists
+        assert!(exists_at(transaction_sender), errors::invalid_argument(PROLOGUE_EACCOUNT_DNE));
+
+        // [PCA3]: We check whether this account is frozen, if it is no transaction can be sent from it.
+        assert!(
+            !AccountFreezing::account_is_frozen(transaction_sender),
+            errors::invalid_state(PROLOGUE_EACCOUNT_FROZEN)
+        );
+
+        // Load the transaction sender's account
+        let sender_account = borrow_global<DiemAccount>(transaction_sender);
+
+        // [PCA4]: Check that the hash of the transaction's public key matches the account's auth key
+        assert!(
+            hash::sha3_256(txn_public_key) == *&sender_account.authentication_key,
+            errors::invalid_argument(PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY),
+        );
+
+        // [PCA5]: Check that the max transaction fee does not overflow a u64 value.
+        assert!(
+            (txn_gas_price as u128) * (txn_max_gas_units as u128) <= MAX_U64,
+            errors::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT),
+        );
+
+        let max_transaction_fee = txn_gas_price * txn_max_gas_units;
+
+        // Don't grab the balance if the transaction fee is zero
+        if (max_transaction_fee > 0) {
+            // [PCA6]: Check that the gas fee can be paid in this currency
+            assert!(
+                TransactionFee::is_coin_initialized<Token>(),
+                errors::invalid_argument(PROLOGUE_EBAD_TRANSACTION_FEE_CURRENCY)
+            );
+            // [PCA7]: Check that the account has a balance in this currency
+            assert!(
+                exists<Balance<Token>>(transaction_sender),
+                errors::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
+            );
+            let balance_amount = balance<Token>(transaction_sender);
+            // [PCA8]: Check that the account can cover the maximum transaction fee
+            assert!(
+                balance_amount >= max_transaction_fee,
+                errors::invalid_argument(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
+            );
+        };
+
+        // [PCA9]: Check that the transaction hasn't expired
+        assert!(
+            DiemTimestamp::now_seconds() < txn_expiration_time_seconds,
+            errors::invalid_argument(PROLOGUE_ETRANSACTION_EXPIRED)
+        );
+
+        // [PCA10]: Check that the transaction's sequence number will not overflow.
+        assert!(
+            (txn_sequence_number as u128) < MAX_U64,
+            errors::limit_exceeded(PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG)
+        );
+
+        if (CRSN::has_crsn(transaction_sender)) {
+            // [PCA13]: If using a sequence nonce check that it's accepted
+            assert!(
+                CRSN::check(sender, txn_sequence_number),
+                errors::invalid_argument(PROLOGUE_ESEQ_NONCE_INVALID)
+            );
+        } else {
+            // [PCA11]: Check that the transaction sequence number is not too old (in the past)
+            assert!(
+                txn_sequence_number >= sender_account.sequence_number,
+                errors::invalid_argument(PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD)
+            );
+
+            // [PCA12]: Check that the transaction's sequence number matches the
+            // current sequence number. Otherwise sequence number is too new by [PCA11].
+            assert!(
+                txn_sequence_number == sender_account.sequence_number,
+                errors::invalid_argument(PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW)
+            );
+
+            // WARNING: No checks should be added here as the sequence number too new check should be the last check run
+            // by the prologue.
+        }
+    }
+    spec prologue_common {
+        let transaction_sender = signer::address_of(sender);
+        let max_transaction_fee = txn_gas_price * txn_max_gas_units;
+        include PrologueCommonAbortsIf<Token> {
+            transaction_sender,
+            max_transaction_fee,
+        };
+    }
+    spec schema PrologueCommonAbortsIf<Token> {
+        transaction_sender: address;
+        txn_sequence_number: u64;
+        txn_public_key: vector<u8>;
+        chain_id: u8;
+        max_transaction_fee: u128;
+        txn_expiration_time_seconds: u64;
+        /// Only happens if this is called in Genesis. Doesn't need to be handled.
+        include DiemTimestamp::AbortsIfNotOperating;
+        /// [PCA1] Covered: L73 (Match 7)
+        aborts_if chain_id != ChainId::spec_get_chain_id() with errors::INVALID_ARGUMENT;
+        /// [PCA2] Covered: L65 (Match 4)
+        aborts_if !exists_at(transaction_sender) with errors::INVALID_ARGUMENT;
+        /// [PCA3] Covered: L57 (Match 0)
+        aborts_if AccountFreezing::spec_account_is_frozen(transaction_sender) with errors::INVALID_STATE;
+        /// [PCA4] Covered: L59 (Match 1)
+        aborts_if hash::sha3_256(txn_public_key) != global<DiemAccount>(transaction_sender).authentication_key with errors::INVALID_ARGUMENT;
+        /// [PCA5] Covered: L69 (Match 5)
+        aborts_if max_transaction_fee > MAX_U64 with errors::INVALID_ARGUMENT;
+        /// [PCA6] Covered: L69 (Match 5)
+        aborts_if max_transaction_fee > 0 && !TransactionFee::is_coin_initialized<Token>() with errors::INVALID_ARGUMENT;
+        /// [PCA7] Covered: L69 (Match 5)
+        aborts_if max_transaction_fee > 0 && !exists<Balance<Token>>(transaction_sender) with errors::INVALID_ARGUMENT;
+        /// [PCA8] Covered: L69 (Match 5)
+        aborts_if max_transaction_fee > 0 && balance<Token>(transaction_sender) < max_transaction_fee with errors::INVALID_ARGUMENT;
+        /// [PCA9] Covered: L72 (Match 6)
+        aborts_if DiemTimestamp::spec_now_seconds() >= txn_expiration_time_seconds with errors::INVALID_ARGUMENT;
+        /// [PCA10] Covered: L81 (match 11)
+        aborts_if txn_sequence_number >= MAX_U64 with errors::LIMIT_EXCEEDED;
+        /// [PCA11] Covered: L61 (Match 2)
+        aborts_if !CRSN::has_crsn(transaction_sender) && txn_sequence_number < global<DiemAccount>(transaction_sender).sequence_number with errors::INVALID_ARGUMENT;
+        /// [PCA12] Covered: L63 (match 3)
+        aborts_if !CRSN::has_crsn(transaction_sender) && txn_sequence_number > global<DiemAccount>(transaction_sender).sequence_number with errors::INVALID_ARGUMENT;
+        /// [PCA13] Covered: L93 (match 14)
+        aborts_if CRSN::has_crsn(transaction_sender) && !CRSN::spec_check(transaction_sender, txn_sequence_number) with errors::INVALID_ARGUMENT;
+    }
+
+    /// Collects gas and bumps the sequence number for executing a transaction.
+    /// The epilogue is invoked at the end of the transaction.
+    /// If the exection of the epilogue fails, it is re-invoked with different arguments, and
+    /// based on the conditions checked in the prologue, should never fail.
+    fun epilogue<Token>(
+        account: signer,
+        txn_sequence_number: u64,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        gas_units_remaining: u64
+    ) acquires DiemAccount, Balance {
+        epilogue_common<Token>(
+            &account,
+            txn_sequence_number,
+            txn_gas_price,
+            txn_max_gas_units,
+            gas_units_remaining,
+        )
+    }
+    spec epilogue {
+        pragma verify=false; // TODO: time out
+        include EpilogueCommonAbortsIf<Token>;
+        include EpilogueCommonEnsures<Token>;
+    }
+
+    fun epilogue_common<Token>(
+        account: &signer,
+        txn_sequence_number: u64,
+        txn_gas_price: u64,
+        txn_max_gas_units: u64,
+        gas_units_remaining: u64
+    ) acquires DiemAccount, Balance {
+        let sender = signer::address_of(account);
+
+        // [EA1; Invariant]: Make sure that the transaction's `max_gas_units` is greater
+        // than the number of gas units remaining after execution.
+        assert!(txn_max_gas_units >= gas_units_remaining, errors::invalid_argument(EGAS));
+        let gas_used = txn_max_gas_units - gas_units_remaining;
+
+        // [EA2; Invariant]: Make sure that the transaction fee would not overflow maximum
+        // number representable in a u64. Already checked in [PCA5].
+        assert!(
+            (txn_gas_price as u128) * (gas_used as u128) <= MAX_U64,
+            errors::limit_exceeded(EGAS)
+        );
+        let transaction_fee_amount = txn_gas_price * gas_used;
+
+        // [EA3; Invariant]: Make sure that account exists, and load the
+        // transaction sender's account. Already checked in [PCA2].
+        assert!(exists_at(sender), errors::not_published(EACCOUNT));
+        let sender_account = borrow_global_mut<DiemAccount>(sender);
+
+        // [EA4; Condition]: Make sure account's sequence number is within the
+        // representable range of u64. Already checked in [PCA10].
+        assert!(
+            sender_account.sequence_number < (MAX_U64 as u64),
+            errors::limit_exceeded(PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG)
+        );
+
+        if (CRSN::has_crsn(sender)) {
+            // Make sure the `sender_account`'s CRSN is still valid and record it.
+            assert!(
+                CRSN::record(account, txn_sequence_number),
+                errors::invalid_argument(PROLOGUE_ESEQ_NONCE_INVALID),
+            );
+        } else {
+            // [EA4; Invariant]: Make sure passed-in `txn_sequence_number` matches
+            // the `sender_account`'s `sequence_number`. Already checked in [PCA12].
+            assert!(
+                sender_account.sequence_number == txn_sequence_number,
+                errors::invalid_argument(PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW)
+            );
+        };
+
+        // The transaction sequence number is passed in to prevent any
+        // possibility of the account's sequence number increasing by more than
+        // one for any transaction.
+        sender_account.sequence_number = sender_account.sequence_number + 1;
+
+        if (transaction_fee_amount > 0) {
+            // [Invariant Use]: Balance for `Token` verified to exist for non-zero transaction fee amounts by [PCA7].
+            let sender_balance = borrow_global_mut<Balance<Token>>(sender);
+            let coin = &mut sender_balance.coin;
+
+            // [EA4; Condition]: Abort if this withdrawal would make the `sender_account`'s balance go negative
+            assert!(
+                transaction_fee_amount <= Diem::value(coin),
+                errors::limit_exceeded(PROLOGUE_ECANT_PAY_GAS_DEPOSIT)
+            );
+
+            // NB: `withdraw_from_balance` is not used as limits do not apply to this transaction fee
+            TransactionFee::pay_fee(Diem::withdraw(coin, transaction_fee_amount))
+        }
+    }
+    spec epilogue_common {
+        pragma verify=false; // TODO: time out
+        include EpilogueCommonAbortsIf<Token>;
+        include EpilogueCommonEnsures<Token>;
+    }
+    spec schema EpilogueCommonAbortsIf<Token> {
+        account: signer;
+        txn_sequence_number: u64;
+        txn_gas_price: u64;
+        txn_max_gas_units: u64;
+        gas_units_remaining: u64;
+        let sender = signer::address_of(account);
+        let sender_account = global<DiemAccount>(sender);
+        let gas_used = txn_max_gas_units - gas_units_remaining;
+        let transaction_fee_amount = txn_gas_price * gas_used;
+        let coin = global<Balance<Token>>(sender).coin;
+        /// [EA1; Invariant]
+        aborts_if txn_max_gas_units < gas_units_remaining with errors::INVALID_ARGUMENT;
+        /// [EA2; Invariant]
+        aborts_if txn_gas_price * gas_used > MAX_U64 with errors::LIMIT_EXCEEDED;
+        /// [EA3; Invariant]
+        aborts_if !exists_at(sender) with errors::NOT_PUBLISHED;
+        /// [EA4; Condition]
+        aborts_if sender_account.sequence_number >= MAX_U64 with errors::LIMIT_EXCEEDED;
+        /// [EA4; Invariant]
+        aborts_if !CRSN::has_crsn(sender) && (sender_account.sequence_number != txn_sequence_number) with errors::INVALID_ARGUMENT;
+        /// [PCA7]
+        aborts_if (transaction_fee_amount > 0) && !exists<Balance<Token>>(sender);
+        /// [EA4; Condition]
+        aborts_if (transaction_fee_amount > 0) && transaction_fee_amount > Diem::value(coin) with errors::LIMIT_EXCEEDED;
+        include (transaction_fee_amount > 0) ==> TransactionFee::PayFeeAbortsIf<Token>{coin: Diem<Token>{value: transaction_fee_amount}};
+    }
+    spec schema EpilogueCommonEnsures<Token> {
+        account: signer;
+        txn_sequence_number: u64;
+        txn_gas_price: u64;
+        txn_max_gas_units: u64;
+        gas_units_remaining: u64;
+        let sender = signer::address_of(account);
+        let sender_account = global<DiemAccount>(sender);
+        let gas_used = txn_max_gas_units - gas_units_remaining;
+        let transaction_fee_amount = txn_gas_price * gas_used;
+        let coin = global<Balance<Token>>(sender).coin;
+        ensures global<DiemAccount>(sender).sequence_number == old(global<DiemAccount>(sender).sequence_number) + 1;
+        include (transaction_fee_amount > 0) ==> TransactionFee::PayFeeEnsures<Token>{coin: Diem<Token>{value: transaction_fee_amount}};
+    }
+
+    /// Epilogue for WriteSet trasnaction
+    fun writeset_epilogue(
+        dr_account: signer,
+        txn_sequence_number: u64,
+        should_trigger_reconfiguration: bool,
+    ) acquires DiemWriteSetManager, DiemAccount, Balance {
+        let dr_account = &dr_account;
+        let writeset_events_ref = borrow_global_mut<DiemWriteSetManager>(@DiemRoot);
+        event::emit_event<AdminTransactionEvent>(
+            &mut writeset_events_ref.upgrade_events,
+            AdminTransactionEvent { committed_timestamp_secs: DiemTimestamp::now_seconds() },
+        );
+
+        // Double check that the sender is the DiemRoot account at the `@DiemRoot`
+        assert!(
+            signer::address_of(dr_account) == @DiemRoot,
+            errors::invalid_argument(PROLOGUE_EINVALID_WRITESET_SENDER)
+        );
+        assert!(
+            Roles::has_diem_root_role(dr_account),
+            errors::invalid_argument(PROLOGUE_EINVALID_WRITESET_SENDER)
+        );
+
+        // Currency code don't matter here as it won't be charged anyway.
+        epilogue_common<XUS>(dr_account, txn_sequence_number, 0, 0, 0);
+        if (should_trigger_reconfiguration) DiemConfig::reconfigure(dr_account)
+    }
+    spec writeset_epilogue {
+        include WritesetEpilogueAbortsIf;
+        include EpilogueCommonEnsures<XUS>{account: dr_account, txn_gas_price: 0, txn_max_gas_units: 0, gas_units_remaining: 0};
+        include WritesetEpilogueEmits;
+    }
+    spec schema WritesetEpilogueAbortsIf {
+        dr_account: signer;
+        txn_sequence_number: u64;
+        should_trigger_reconfiguration: bool;
+        aborts_if !exists<DiemWriteSetManager>(@DiemRoot);
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if signer::address_of(dr_account) != @DiemRoot with errors::INVALID_ARGUMENT;
+        aborts_if !Roles::has_diem_root_role(dr_account) with errors::INVALID_ARGUMENT;
+        include EpilogueCommonAbortsIf<XUS>{account: dr_account, txn_gas_price: 0, txn_max_gas_units: 0, gas_units_remaining: 0};
+        include should_trigger_reconfiguration ==> Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include should_trigger_reconfiguration ==> DiemConfig::ReconfigureAbortsIf;
+    }
+    spec schema WritesetEpilogueEmits {
+        should_trigger_reconfiguration: bool;
+        let handle = global<DiemWriteSetManager>(@DiemRoot).upgrade_events;
+        let msg = AdminTransactionEvent {
+            committed_timestamp_secs: DiemTimestamp::spec_now_seconds()
+        };
+        emits msg to handle;
+        include should_trigger_reconfiguration ==> DiemConfig::ReconfigureEmits;
+    }
+
+    /// Create a Validator account
+    public fun create_validator_account(
+        dr_account: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        Roles::assert_diem_root(dr_account);
+        let new_account = create_signer(new_account_address);
+        // The dr_account account is verified to have the diem root role in `Roles::new_validator_role`
+        Roles::new_validator_role(dr_account, &new_account);
+        ValidatorConfig::publish(&new_account, dr_account, human_name);
+        make_account(&new_account, auth_key_prefix)
+    }
+    spec create_validator_account {
+        pragma disable_invariants_in_body;
+        include CreateValidatorAccountAbortsIf;
+        include CreateValidatorAccountEnsures;
+        include MakeAccountEmits;
+    }
+    spec schema CreateValidatorAccountAbortsIf {
+        dr_account: signer;
+        new_account_address: address;
+        // from `Roles::new_validator_role`
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include MakeAccountAbortsIf{addr: new_account_address};
+        // from `ValidatorConfig::publish`
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if ValidatorConfig::exists_config(new_account_address) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema CreateValidatorAccountEnsures {
+        new_account_address: address;
+        // Note: `Roles::GrantRole` has both ensure's and aborts_if's.
+        include Roles::GrantRole{addr: new_account_address, role_id: Roles::VALIDATOR_ROLE_ID};
+        ensures exists_at(new_account_address);
+        ensures ValidatorConfig::exists_config(new_account_address);
+    }
+
+    /// Create a Validator Operator account
+    public fun create_validator_operator_account(
+        dr_account: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) acquires AccountOperationsCapability {
+        Roles::assert_diem_root(dr_account);
+        let new_account = create_signer(new_account_address);
+        // The dr_account is verified to have the diem root role in `Roles::new_validator_operator_role`
+        Roles::new_validator_operator_role(dr_account, &new_account);
+        ValidatorOperatorConfig::publish(&new_account, dr_account, human_name);
+        make_account(&new_account, auth_key_prefix)
+    }
+    spec create_validator_operator_account {
+        pragma disable_invariants_in_body;
+        include CreateValidatorOperatorAccountAbortsIf;
+        include CreateValidatorOperatorAccountEnsures;
+    }
+    spec schema CreateValidatorOperatorAccountAbortsIf {
+        dr_account: signer;
+        new_account_address: address;
+        // from `Roles::new_validator_operator_role`
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include MakeAccountAbortsIf{addr: new_account_address};
+        // from `ValidatorConfig::publish`
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if ValidatorOperatorConfig::has_validator_operator_config(new_account_address) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema CreateValidatorOperatorAccountEnsures {
+        new_account_address: address;
+        include Roles::GrantRole{addr: new_account_address, role_id: Roles::VALIDATOR_OPERATOR_ROLE_ID};
+        ensures exists_at(new_account_address);
+        ensures ValidatorOperatorConfig::has_validator_operator_config(new_account_address);
+    }
+
+    // ****************** Module Specifications *******************
+    spec module {} // switch documentation context back to module level
+
+    /// # Access Control
+
+    /// ## Key Rotation Capability
+    spec module {
+        /// the permission "RotateAuthenticationKey(addr)" is granted to the account at addr [[H18]][PERMISSION].
+        /// When an account is created, its KeyRotationCapability is granted to the account.
+        apply EnsuresHasKeyRotationCap{account: new_account} to make_account;
+
+        /// Only `make_account` creates KeyRotationCap [[H18]][PERMISSION][[I18]][PERMISSION]. `create_*_account` only calls
+        /// `make_account`, and does not pack KeyRotationCap by itself.
+        /// `restore_key_rotation_capability` restores KeyRotationCap, and does not create new one.
+        apply PreserveKeyRotationCapAbsence to * except make_account, create_*_account,
+              restore_key_rotation_capability, initialize;
+
+        /// Every account holds either no key rotation capability (because KeyRotationCapability has been delegated)
+        /// or the key rotation capability for addr itself [[H18]][PERMISSION].
+        invariant forall addr: address where exists_at(addr):
+            delegated_key_rotation_capability(addr) || spec_holds_own_key_rotation_cap(addr);
+    }
+
+    spec schema EnsuresHasKeyRotationCap {
+        account: signer;
+        let addr = signer::address_of(account);
+        ensures spec_holds_own_key_rotation_cap(addr);
+    }
+    spec schema PreserveKeyRotationCapAbsence {
+        /// The absence of KeyRotationCap is preserved.
+        ensures forall addr: address:
+            old(!exists<DiemAccount>(addr) || !spec_has_key_rotation_cap(addr)) ==>
+                (!exists<DiemAccount>(addr) || !spec_has_key_rotation_cap(addr));
+    }
+
+    /// ## Withdraw Capability
+    spec module {
+        /// the permission "WithdrawCapability(addr)" is granted to the account at addr [[H19]][PERMISSION].
+        /// When an account is created, its WithdrawCapability is granted to the account.
+        apply EnsuresWithdrawCap{account: new_account} to make_account;
+
+        /// Only `make_account` creates WithdrawCap [[H19]][PERMISSION][[I19]][PERMISSION]. `create_*_account` only calls
+        /// `make_account`, and does not pack KeyRotationCap by itself.
+        /// `restore_withdraw_capability` restores WithdrawCap, and does not create new one.
+        apply PreserveWithdrawCapAbsence to * except make_account, create_*_account,
+                restore_withdraw_capability, initialize;
+
+        /// Every account holds either no withdraw capability (because withdraw cap has been delegated)
+        /// or the withdraw capability for addr itself [[H19]][PERMISSION].
+        invariant forall addr: address where exists_at(addr):
+            spec_holds_delegated_withdraw_capability(addr) || spec_holds_own_withdraw_cap(addr);
+    }
+
+    spec schema EnsuresWithdrawCap {
+        account: signer;
+        let addr = signer::address_of(account);
+        ensures spec_holds_own_withdraw_cap(addr);
+    }
+    spec schema PreserveWithdrawCapAbsence {
+        /// The absence of WithdrawCap is preserved.
+        ensures forall addr: address:
+            old(!exists<DiemAccount>(addr) || option::is_none(global<DiemAccount>(addr).withdraw_capability)) ==>
+                (!exists<DiemAccount>(addr) || option::is_none(global<DiemAccount>(addr).withdraw_capability));
+    }
+
+    /// ## Authentication Key
+
+    spec module {
+        /// only `Self::rotate_authentication_key` can rotate authentication_key [[H18]][PERMISSION].
+        apply AuthenticationKeyRemainsSame to *, *<T> except rotate_authentication_key;
+    }
+
+    spec schema AuthenticationKeyRemainsSame {
+        ensures forall addr: address where old(exists_at(addr)):
+            global<DiemAccount>(addr).authentication_key == old(global<DiemAccount>(addr).authentication_key);
+    }
+
+    /// ## Balance
+
+    spec module {
+        /// only `Self::withdraw_from` and its helper and clients can withdraw [[H19]][PERMISSION].
+        apply BalanceNotDecrease<Token> to *<Token>
+            except withdraw_from, withdraw_from_balance, staple_xdx, unstaple_xdx,
+                preburn, pay_from, pay_by_signers, epilogue_common, epilogue, failure_epilogue, success_epilogue;
+    }
+
+    spec schema BalanceNotDecrease<Token> {
+        ensures forall addr: address where old(exists<Balance<Token>>(addr)):
+            global<Balance<Token>>(addr).coin.value >= old(global<Balance<Token>>(addr).coin.value);
+    }
+
+    /// # Persistence of Resources
+
+    spec module {
+        /// Accounts are never deleted.
+        invariant update forall addr: address where old(exists_at(addr)): exists_at(addr);
+
+        /// After genesis, the `AccountOperationsCapability` exists.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> exists<AccountOperationsCapability>(@DiemRoot);
+
+        /// After genesis, the `DiemWriteSetManager` exists.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> exists<DiemWriteSetManager>(@DiemRoot);
+
+        /// resource struct `Balance<CoinType>` is persistent
+        invariant<CoinType> update forall addr: address
+            where old(exists<Balance<CoinType>>(addr)):
+                exists<Balance<CoinType>>(addr);
+
+        /// resource struct `AccountOperationsCapability` is persistent
+        invariant update old(exists<AccountOperationsCapability>(@DiemRoot))
+                ==> exists<AccountOperationsCapability>(@DiemRoot);
+
+        /// resource struct `AccountOperationsCapability` is persistent
+        invariant update
+            old(exists<DiemWriteSetManager>(@DiemRoot)) ==> exists<DiemWriteSetManager>(@DiemRoot);
+    }
+
+    /// # Other invariants
+    spec module {
+
+        /// An address has a published account iff it has a published RoleId
+        invariant [suspendable] forall addr: address:  exists_at(addr) <==> exists<Roles::RoleId>(addr);
+
+        // Every address with a published account has a publish event handle generator
+        // >TODO: When commented in, odd things happen.
+        // However, this particular invariant does not need to be disabled, and the function
+        // needs to be public because it is a general-purpose function in stdlib.
+        // Also, the invariant is not specified in Events, which also seems relevant.
+        // invariant forall addr: address where exists_at(addr): exists<Event::EventHandleGenerator>(addr);
+
+        /// There is a published AccountOperationsCapability iff there is an account and it's at Diem root address
+        invariant [suspendable] forall addr: address:
+            exists<AccountOperationsCapability>(addr) <==> (addr == @DiemRoot && exists_at(addr));
+
+        /// An account has a WriteSetManager iff if it is Diem root
+        invariant [suspendable] forall addr: address:
+           exists<DiemWriteSetManager>(addr) <==> (addr == @DiemRoot && exists_at(addr));
+
+        /// There is a VASPDomainManager at an address iff the address is a diem treasury compliance account
+        invariant [suspendable] forall addr: address:
+            exists<VASPDomain::VASPDomainManager>(addr) <==> Roles::spec_has_treasury_compliance_role_addr(addr);
+
+        /// There is a VASPDomains at an address iff the address is a Diem treasury compliance account
+        invariant [suspendable] forall addr: address:
+            exists<VASPDomain::VASPDomains>(addr) <==> Roles::spec_has_parent_VASP_role_addr(addr);
+
+        /// Account has a balance only iff it is parent or child VASP or a designated dealer
+        /// > Note: It would be better to make this generic over all existing and future coins, but that
+        /// would require existential quantification over types, and I'm not sure if that works with monomorphization.
+        // > TODO: This fails because type parameter add_currency_for_account<token> can
+        // have token type that is not XDX or XUS !!
+        //  invariant [suspendable] forall addr: address:
+        // (exists<Balance<XUS>>(addr) || exists<Balance<XDX>>(addr)) <==> Roles::spec_can_hold_balance_addr(addr);
+        invariant forall addr: address:
+            (exists<Balance<XUS>>(addr) || exists<Balance<XDX>>(addr)) ==> Roles::spec_can_hold_balance_addr(addr);
+
+        ///  There is a `DesignatedDealer::Dealer` published at `addr` iff the `addr` has a
+        /// `Roles::DesignatedDealer` role.
+        invariant [suspendable] forall addr: address: exists<DesignatedDealer::Dealer>(addr)
+            <==> Roles::spec_has_designated_dealer_role_addr(addr);
+
+        /// There is a DualAttestation credential iff account has designated dealer or parent VASP role
+        invariant [suspendable] forall addr: address:
+            exists<DualAttestation::Credential>(addr)
+            <==> (Roles::spec_has_designated_dealer_role_addr(addr)
+                  || Roles::spec_has_parent_VASP_role_addr(addr));
+
+        /// An address has an account iff there is a published FreezingBit struct
+        invariant [suspendable] forall addr: address:
+            exists_at(addr) <==> exists<AccountFreezing::FreezingBit>(addr);
+
+        // This invariant is redundant with the previous invariant, but weaker.
+        // But it holds throughout make_account, and is useful to prove that the
+        // "move_to" that publishes the account will never abort.
+        // TODO: This is too clever.  Should modify code to an assert or requires at
+        // beginning of make_account that account does not already exist.
+        invariant [suspendable] forall addr: address:
+            exists_at(addr) ==> exists<AccountFreezing::FreezingBit>(addr);
+
+        /// Balances can only be published at addresses where an account exists
+        /// >TODO: I think this is redundant with previous invariants. exists_at <==> Role, and
+        /// Balance <==> can_hold_balance
+        invariant<CoinType> [suspendable]  forall addr: address where exists<Balance<CoinType>>(addr):
+            exists_at(addr);
+
+        /// Account has SlidingNonce only if it's Diem Root or Treasury Compliance
+        invariant [suspendable] forall addr: address: exists<SlidingNonce::SlidingNonce>(addr)
+            <==> (Roles::spec_has_diem_root_role_addr(addr) || Roles::spec_has_treasury_compliance_role_addr(addr));
+
+        /// Address has a ValidatorConfig iff it is a Validator address
+        invariant [suspendable] forall addr: address: ValidatorConfig::exists_config(addr)
+            <==> Roles::spec_has_validator_role_addr(addr);
+
+        /// Address has a ValidatorOperatorConfig iff it is a ValidatorOperator address
+        invariant [suspendable] forall addr: address: ValidatorOperatorConfig::has_validator_operator_config(addr)
+            <==> Roles::spec_has_validator_operator_role_addr(addr);
+
+        /// Address has a parent VASP credential iff it has a parent VASP role
+        invariant [suspendable] forall addr: address: VASP::is_parent(addr)
+            <==> Roles::spec_has_parent_VASP_role_addr(addr);
+
+        /// Address has a child VASP credential iff it has a child VASP role
+        invariant [suspendable] forall addr: address: VASP::is_child(addr)
+            <==> Roles::spec_has_child_VASP_role_addr(addr);
+    }
+
+    /// # Helper Functions and Schemas
+
+    /// ## Capabilities
+
+    spec module {
+        /// Returns field `key_rotation_capability` of the DiemAccount under `addr`.
+        fun spec_get_key_rotation_cap_field(addr: address): Option<KeyRotationCapability> {
+            global<DiemAccount>(addr).key_rotation_capability
+        }
+
+        /// Returns the KeyRotationCapability of the field `key_rotation_capability`.
+        fun spec_get_key_rotation_cap(addr: address): KeyRotationCapability {
+            option::borrow(spec_get_key_rotation_cap_field(addr))
+        }
+
+        // Returns if the account holds KeyRotationCapability.
+        fun spec_has_key_rotation_cap(addr: address): bool {
+            option::is_some(spec_get_key_rotation_cap_field(addr))
+        }
+
+        /// Returns true if the DiemAccount at `addr` holds
+        /// `KeyRotationCapability` for itself.
+        fun spec_holds_own_key_rotation_cap(addr: address): bool {
+            spec_has_key_rotation_cap(addr)
+            && addr == spec_get_key_rotation_cap(addr).account_address
+        }
+
+        /// Returns true if `AccountOperationsCapability` is published.
+        fun spec_has_account_operations_cap(): bool {
+            exists<AccountOperationsCapability>(@DiemRoot)
+        }
+
+        /// Returns field `withdraw_capability` of DiemAccount under `addr`.
+        fun spec_get_withdraw_cap_field(addr: address): Option<WithdrawCapability> {
+            global<DiemAccount>(addr).withdraw_capability
+        }
+
+        /// Returns the WithdrawCapability of the field `withdraw_capability`.
+        fun spec_get_withdraw_cap(addr: address): WithdrawCapability {
+            option::borrow(spec_get_withdraw_cap_field(addr))
+        }
+
+        /// Returns true if the DiemAccount at `addr` holds a `WithdrawCapability`.
+        fun spec_has_withdraw_cap(addr: address): bool {
+            option::is_some(spec_get_withdraw_cap_field(addr))
+        }
+
+        /// Returns true if the DiemAccount at `addr` holds `WithdrawCapability` for itself.
+        fun spec_holds_own_withdraw_cap(addr: address): bool {
+            spec_has_withdraw_cap(addr)
+            && addr == spec_get_withdraw_cap(addr).account_address
+        }
+
+        /// Returns true of the account holds a delegated withdraw capability.
+        fun spec_holds_delegated_withdraw_capability(addr: address): bool {
+            exists_at(addr) && option::is_none(global<DiemAccount>(addr).withdraw_capability)
+        }
+
+    }
+
+    /// ## Prologue
+
+    spec fun prologue_guarantees(sender: signer) : bool {
+        let addr = signer::address_of(sender);
+        DiemTimestamp::is_operating() && exists_at(addr) && !AccountFreezing::account_is_frozen(addr)
+    }
+
+    /// Used in transaction script to specify properties checked by the prologue.
+    spec schema TransactionChecks {
+        sender: signer;
+        requires prologue_guarantees(sender);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemBlock.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemBlock.move
new file mode 100644
index 000000000..409b0a172
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemBlock.move
@@ -0,0 +1,131 @@
+/// This module defines a struct storing the metadata of the block and new block events.
+module DiemFramework::DiemBlock {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::DiemSystem;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::event;
+
+    struct BlockMetadata has key {
+        /// Height of the current block
+        height: u64,
+        /// Handle where events with the time of new blocks are emitted
+        new_block_events: event::EventHandle<Self::NewBlockEvent>,
+    }
+
+    struct NewBlockEvent has drop, store {
+        round: u64,
+        proposer: address,
+        previous_block_votes: vector<address>,
+
+        /// On-chain time during  he block at the given height
+        time_microseconds: u64,
+    }
+
+    /// The `BlockMetadata` resource is in an invalid state
+    const EBLOCK_METADATA: u64 = 0;
+    /// An invalid signer was provided. Expected the signer to be the VM or a Validator.
+    const EVM_OR_VALIDATOR: u64 = 1;
+
+    /// This can only be invoked by the Association address, and only a single time.
+    /// Currently, it is invoked in the genesis transaction
+    public fun initialize_block_metadata(account: &signer) {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint, only callable by the Association address
+        CoreAddresses::assert_diem_root(account);
+
+        assert!(!is_initialized(), errors::already_published(EBLOCK_METADATA));
+        move_to<BlockMetadata>(
+            account,
+            BlockMetadata {
+                height: 0,
+                new_block_events: event::new_event_handle<Self::NewBlockEvent>(account),
+            }
+        );
+    }
+    spec initialize_block_metadata {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot;
+        aborts_if is_initialized() with errors::ALREADY_PUBLISHED;
+        ensures is_initialized();
+        ensures get_current_block_height() == 0;
+    }
+
+    /// Helper function to determine whether this module has been initialized.
+    fun is_initialized(): bool {
+        exists<BlockMetadata>(@DiemRoot)
+    }
+
+    /// Set the metadata for the current block.
+    /// The runtime always runs this before executing the transactions in a block.
+    fun block_prologue(
+        vm: signer,
+        round: u64,
+        timestamp: u64,
+        previous_block_votes: vector<address>,
+        proposer: address
+    ) acquires BlockMetadata {
+        DiemTimestamp::assert_operating();
+        // Operational constraint: can only be invoked by the VM.
+        CoreAddresses::assert_vm(&vm);
+
+        // Authorization
+        assert!(
+            proposer == @VMReserved || DiemSystem::is_validator(proposer),
+            errors::requires_address(EVM_OR_VALIDATOR)
+        );
+
+        let block_metadata_ref = borrow_global_mut<BlockMetadata>(@DiemRoot);
+        DiemTimestamp::update_global_time(&vm, proposer, timestamp);
+        block_metadata_ref.height = block_metadata_ref.height + 1;
+        event::emit_event<NewBlockEvent>(
+            &mut block_metadata_ref.new_block_events,
+            NewBlockEvent {
+                round,
+                proposer,
+                previous_block_votes,
+                time_microseconds: timestamp,
+            }
+        );
+    }
+    spec block_prologue {
+        include DiemTimestamp::AbortsIfNotOperating;
+        include CoreAddresses::AbortsIfNotVM{account: vm};
+        aborts_if proposer != @VMReserved && !DiemSystem::spec_is_validator(proposer)
+            with errors::REQUIRES_ADDRESS;
+        ensures DiemTimestamp::spec_now_microseconds() == timestamp;
+        ensures get_current_block_height() == old(get_current_block_height()) + 1;
+
+        aborts_if get_current_block_height() + 1 > MAX_U64 with EXECUTION_FAILURE;
+        include BlockPrologueEmits;
+    }
+    spec schema BlockPrologueEmits {
+        round: u64;
+        timestamp: u64;
+        previous_block_votes: vector<address>;
+        proposer: address;
+        let handle = global<BlockMetadata>(@DiemRoot).new_block_events;
+        let msg = NewBlockEvent {
+            round,
+            proposer,
+            previous_block_votes,
+            time_microseconds: timestamp,
+        };
+        emits msg to handle;
+    }
+
+    /// Get the current block height
+    public fun get_current_block_height(): u64 acquires BlockMetadata {
+        assert!(is_initialized(), errors::not_published(EBLOCK_METADATA));
+        borrow_global<BlockMetadata>(@DiemRoot).height
+    }
+
+    spec module { } // Switch documentation context to module level.
+
+    /// # Initialization
+    /// This implies that `BlockMetadata` is published after initialization and stays published
+    /// ever after
+    spec module {
+        invariant [suspendable] DiemTimestamp::is_operating() ==> is_initialized();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConfig.move
new file mode 100644
index 000000000..d47c3fa85
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConfig.move
@@ -0,0 +1,472 @@
+/// Publishes configuration information for validators, and issues reconfiguration events
+/// to synchronize configuration changes for the validators.
+module DiemFramework::DiemConfig {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::event;
+    use std::signer;
+    friend DiemFramework::DiemVersion;
+    friend DiemFramework::RegisteredCurrencies;
+    friend DiemFramework::DiemTransactionPublishingOption;
+    friend DiemFramework::DiemVMConfig;
+    friend DiemFramework::DiemSystem;
+    friend DiemFramework::DiemConsensusConfig;
+    friend DiemFramework::ParallelExecutionConfig;
+
+    /// A generic singleton resource that holds a value of a specific type.
+    struct DiemConfig<Config: copy + drop + store> has key, store {
+        /// Holds specific info for instance of `Config` type.
+        payload: Config
+    }
+
+    /// Event that signals DiemBFT algorithm to start a new epoch,
+    /// with new configuration information. This is also called a
+    /// "reconfiguration event"
+    struct NewEpochEvent has drop, store {
+        epoch: u64,
+    }
+
+    /// Holds information about state of reconfiguration
+    struct Configuration has key {
+        /// Epoch number
+        epoch: u64,
+        /// Time of last reconfiguration. Only changes on reconfiguration events.
+        last_reconfiguration_time: u64,
+        /// Event handle for reconfiguration events
+        events: event::EventHandle<NewEpochEvent>,
+    }
+
+    /// Accounts with this privilege can modify DiemConfig<TypeName> under Diem root address.
+    struct ModifyConfigCapability<phantom TypeName> has key, store {}
+
+    /// Reconfiguration disabled if this resource occurs under LibraRoot.
+    struct DisableReconfiguration has key {}
+
+    /// The `Configuration` resource is in an invalid state
+    const ECONFIGURATION: u64 = 0;
+    /// A `DiemConfig` resource is in an invalid state
+    const EDIEM_CONFIG: u64 = 1;
+    /// A `ModifyConfigCapability` is in a different state than was expected
+    const EMODIFY_CAPABILITY: u64 = 2;
+    /// An invalid block time was encountered.
+    const EINVALID_BLOCK_TIME: u64 = 3;
+    /// The largest possible u64 value
+    const MAX_U64: u64 = 18446744073709551615;
+
+    /// Publishes `Configuration` resource. Can only be invoked by Diem root, and only a single time in Genesis.
+    public fun initialize(
+        dr_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        CoreAddresses::assert_diem_root(dr_account);
+        assert!(!exists<Configuration>(@DiemRoot), errors::already_published(ECONFIGURATION));
+        move_to<Configuration>(
+            dr_account,
+            Configuration {
+                epoch: 0,
+                last_reconfiguration_time: 0,
+                events: event::new_event_handle<NewEpochEvent>(dr_account),
+            }
+        );
+    }
+    spec initialize {
+        pragma opaque;
+        include InitializeAbortsIf;
+        include InitializeEnsures;
+        modifies global<Configuration>(@DiemRoot);
+        modifies global<event::EventHandleGenerator>(signer::address_of(dr_account));
+    }
+    spec schema InitializeAbortsIf {
+        dr_account: signer;
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        aborts_if spec_has_config() with errors::ALREADY_PUBLISHED;
+    }
+    spec schema InitializeEnsures {
+        ensures spec_has_config();
+        let post post_config = global<Configuration>(@DiemRoot);
+        ensures post_config.epoch == 0;
+        ensures post_config.last_reconfiguration_time == 0;
+    }
+
+
+    /// Returns a copy of `Config` value stored under `addr`.
+    public fun get<Config: copy + drop + store>(): Config
+    acquires DiemConfig {
+        let addr = @DiemRoot;
+        assert!(exists<DiemConfig<Config>>(addr), errors::not_published(EDIEM_CONFIG));
+        *&borrow_global<DiemConfig<Config>>(addr).payload
+    }
+    spec get {
+        pragma opaque;
+        include AbortsIfNotPublished<Config>;
+        ensures result == get<Config>();
+    }
+    spec schema AbortsIfNotPublished<Config> {
+        aborts_if !exists<DiemConfig<Config>>(@DiemRoot) with errors::NOT_PUBLISHED;
+    }
+
+    /// Set a config item to a new value with the default capability stored under config address and trigger a
+    /// reconfiguration. This function requires that the signer have a `ModifyConfigCapability<Config>`
+    /// resource published under it.
+    public(friend) fun set<Config: copy + drop + store>(account: &signer, payload: Config)
+    acquires DiemConfig, Configuration {
+        let signer_address = signer::address_of(account);
+        // Next should always be true if properly initialized.
+        assert!(exists<ModifyConfigCapability<Config>>(signer_address), errors::requires_capability(EMODIFY_CAPABILITY));
+
+        let addr = @DiemRoot;
+        assert!(exists<DiemConfig<Config>>(addr), errors::not_published(EDIEM_CONFIG));
+        let config = borrow_global_mut<DiemConfig<Config>>(addr);
+        config.payload = payload;
+
+        reconfigure_();
+    }
+    spec set {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        requires DiemTimestamp::is_operating() ==> spec_has_config();
+        modifies global<Configuration>(@DiemRoot);
+        modifies global<DiemConfig<Config>>(@DiemRoot);
+        include SetAbortsIf<Config>;
+        include SetEnsures<Config>;
+    }
+    spec schema SetAbortsIf<Config> {
+        account: signer;
+        include AbortsIfNotModifiable<Config>;
+        include AbortsIfNotPublished<Config>;
+        include ReconfigureAbortsIf;
+    }
+    spec schema AbortsIfNotModifiable<Config> {
+        account: signer;
+        aborts_if !exists<ModifyConfigCapability<Config>>(signer::address_of(account))
+            with errors::REQUIRES_CAPABILITY;
+    }
+    spec schema SetEnsures<Config> {
+        payload: Config;
+        ensures spec_is_published<Config>();
+        ensures get<Config>() == payload;
+        ensures old(spec_has_config()) == spec_has_config();
+    }
+
+    /// Set a config item to a new value and trigger a reconfiguration. This function
+    /// requires a reference to a `ModifyConfigCapability`, which is returned when the
+    /// config is published using `publish_new_config_and_get_capability`.
+    /// It is called by `DiemSystem::update_config_and_reconfigure`, which allows
+    /// validator operators to change the validator set.  All other config changes require
+    /// a Diem root signer.
+    public(friend) fun set_with_capability_and_reconfigure<Config: copy + drop + store>(
+        _cap: &ModifyConfigCapability<Config>,
+        payload: Config
+    ) acquires DiemConfig, Configuration {
+        let addr = @DiemRoot;
+        assert!(exists<DiemConfig<Config>>(addr), errors::not_published(EDIEM_CONFIG));
+        let config = borrow_global_mut<DiemConfig<Config>>(addr);
+        config.payload = payload;
+        reconfigure_();
+    }
+    spec set_with_capability_and_reconfigure {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        requires DiemTimestamp::is_operating() ==> spec_has_config();
+        modifies global<Configuration>(@DiemRoot);
+        include AbortsIfNotPublished<Config>;
+        include ReconfigureAbortsIf;
+        modifies global<DiemConfig<Config>>(@DiemRoot);
+        include SetEnsures<Config>;
+        include ReconfigureEmits;
+    }
+
+    /// Private function to temporarily halt reconfiguration.
+    /// This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+    fun disable_reconfiguration(dr_account: &signer) {
+        assert!(
+            signer::address_of(dr_account) == @DiemRoot,
+            errors::requires_address(EDIEM_CONFIG)
+        );
+        Roles::assert_diem_root(dr_account);
+        assert!(reconfiguration_enabled(), errors::invalid_state(ECONFIGURATION));
+        move_to(dr_account, DisableReconfiguration {} )
+    }
+
+    /// Private function to resume reconfiguration.
+    /// This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+    fun enable_reconfiguration(dr_account: &signer) acquires DisableReconfiguration {
+        assert!(
+            signer::address_of(dr_account) == @DiemRoot,
+            errors::requires_address(EDIEM_CONFIG)
+        );
+        Roles::assert_diem_root(dr_account);
+
+        assert!(!reconfiguration_enabled(), errors::invalid_state(ECONFIGURATION));
+        DisableReconfiguration {} = move_from<DisableReconfiguration>(signer::address_of(dr_account));
+    }
+
+    fun reconfiguration_enabled(): bool {
+        !exists<DisableReconfiguration>(@DiemRoot)
+    }
+
+    /// Publishes a new config.
+    /// The caller will use the returned ModifyConfigCapability to specify the access control
+    /// policy for who can modify the config.
+    /// Does not trigger a reconfiguration.
+    public(friend) fun publish_new_config_and_get_capability<Config: copy + drop + store>(
+        dr_account: &signer,
+        payload: Config,
+    ): ModifyConfigCapability<Config> {
+        Roles::assert_diem_root(dr_account);
+        assert!(
+            !exists<DiemConfig<Config>>(signer::address_of(dr_account)),
+            errors::already_published(EDIEM_CONFIG)
+        );
+        move_to(dr_account, DiemConfig { payload });
+        ModifyConfigCapability<Config> {}
+    }
+    spec publish_new_config_and_get_capability {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        modifies global<DiemConfig<Config>>(@DiemRoot);
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include AbortsIfPublished<Config>;
+        include SetEnsures<Config>;
+    }
+    spec schema AbortsIfPublished<Config> {
+        aborts_if exists<DiemConfig<Config>>(@DiemRoot) with errors::ALREADY_PUBLISHED;
+    }
+
+    /// Publish a new config item. Only Diem root can modify such config.
+    /// Publishes the capability to modify this config under the Diem root account.
+    /// Does not trigger a reconfiguration.
+    public(friend) fun publish_new_config<Config: copy + drop + store>(
+        dr_account: &signer,
+        payload: Config
+    ) {
+        let capability = publish_new_config_and_get_capability<Config>(dr_account, payload);
+        assert!(
+            !exists<ModifyConfigCapability<Config>>(signer::address_of(dr_account)),
+            errors::already_published(EMODIFY_CAPABILITY)
+        );
+        move_to(dr_account, capability);
+    }
+    spec publish_new_config {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        modifies global<DiemConfig<Config>>(@DiemRoot);
+        modifies global<ModifyConfigCapability<Config>>(@DiemRoot);
+        include PublishNewConfigAbortsIf<Config>;
+        include PublishNewConfigEnsures<Config>;
+    }
+    spec schema PublishNewConfigAbortsIf<Config> {
+        dr_account: signer;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        aborts_if spec_is_published<Config>();
+        aborts_if exists<ModifyConfigCapability<Config>>(signer::address_of(dr_account));
+    }
+    spec schema PublishNewConfigEnsures<Config> {
+        dr_account: signer;
+        payload: Config;
+        include SetEnsures<Config>;
+        ensures exists<ModifyConfigCapability<Config>>(signer::address_of(dr_account));
+    }
+
+    /// Signal validators to start using new configuration. Must be called by Diem root.
+    public fun reconfigure(
+        dr_account: &signer,
+    ) acquires Configuration {
+        Roles::assert_diem_root(dr_account);
+        reconfigure_();
+    }
+    spec reconfigure {
+        pragma opaque;
+        modifies global<Configuration>(@DiemRoot);
+        ensures old(spec_has_config()) == spec_has_config();
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include ReconfigureAbortsIf;
+        include ReconfigureEmits;
+    }
+
+    /// Private function to do reconfiguration.  Updates reconfiguration status resource
+    /// `Configuration` and emits a `NewEpochEvent`
+    fun reconfigure_() acquires Configuration {
+        // Do not do anything if genesis has not finished.
+        if (DiemTimestamp::is_genesis() || DiemTimestamp::now_microseconds() == 0 || !reconfiguration_enabled()) {
+            return ()
+        };
+
+        let config_ref = borrow_global_mut<Configuration>(@DiemRoot);
+        let current_time = DiemTimestamp::now_microseconds();
+
+        // Do not do anything if a reconfiguration event is already emitted within this transaction.
+        //
+        // This is OK because:
+        // - The time changes in every non-empty block
+        // - A block automatically ends after a transaction that emits a reconfiguration event, which is guaranteed by
+        //   DiemVM spec that all transactions comming after a reconfiguration transaction will be returned as Retry
+        //   status.
+        // - Each transaction must emit at most one reconfiguration event
+        //
+        // Thus, this check ensures that a transaction that does multiple "reconfiguration required" actions emits only
+        // one reconfiguration event.
+        //
+        if (current_time == config_ref.last_reconfiguration_time) {
+            return
+        };
+
+        assert!(current_time > config_ref.last_reconfiguration_time, errors::invalid_state(EINVALID_BLOCK_TIME));
+        config_ref.last_reconfiguration_time = current_time;
+        config_ref.epoch = config_ref.epoch + 1;
+
+        event::emit_event<NewEpochEvent>(
+            &mut config_ref.events,
+            NewEpochEvent {
+                epoch: config_ref.epoch,
+            },
+        );
+    }
+    spec fun spec_reconfigure_omitted(): bool {
+       DiemTimestamp::is_genesis() || DiemTimestamp::spec_now_microseconds() == 0 || !reconfiguration_enabled()
+    }
+    spec reconfigure_ {
+        pragma opaque;
+        modifies global<Configuration>(@DiemRoot);
+        requires DiemTimestamp::is_operating() ==> spec_has_config();
+        ensures old(spec_has_config()) == spec_has_config();
+        let config = global<Configuration>(@DiemRoot);
+        let post post_config = global<Configuration>(@DiemRoot);
+        let now = DiemTimestamp::spec_now_microseconds();
+        let post post_now = DiemTimestamp::spec_now_microseconds();
+
+        include !spec_reconfigure_omitted() || (config.last_reconfiguration_time == now)
+            ==> InternalReconfigureAbortsIf && ReconfigureAbortsIf;
+
+        ensures spec_reconfigure_omitted() || (config.last_reconfiguration_time == now)
+            ==> post_config == config;
+
+        ensures !(spec_reconfigure_omitted() || (config.last_reconfiguration_time == now))
+            ==> post_config ==
+                update_field(
+                update_field(config,
+                    epoch, config.epoch + 1),
+                    last_reconfiguration_time, post_now);
+        include ReconfigureEmits;
+    }
+    /// The following schema describes aborts conditions which we do not want to be propagated to the verification
+    /// of callers, and which are therefore marked as `concrete` to be only verified against the implementation.
+    /// These conditions are unlikely to happen in reality, and excluding them avoids formal noise.
+    spec schema InternalReconfigureAbortsIf {
+        let config = global<Configuration>(@DiemRoot);
+        let current_time = DiemTimestamp::spec_now_microseconds();
+        aborts_if [concrete] current_time < config.last_reconfiguration_time with errors::INVALID_STATE;
+        aborts_if [concrete] config.epoch == MAX_U64
+            && current_time != config.last_reconfiguration_time with EXECUTION_FAILURE;
+    }
+    /// This schema is to be used by callers of `reconfigure`
+    spec schema ReconfigureAbortsIf {
+        let config = global<Configuration>(@DiemRoot);
+        let current_time = DiemTimestamp::spec_now_microseconds();
+        aborts_if DiemTimestamp::is_operating()
+            && reconfiguration_enabled()
+            && DiemTimestamp::spec_now_microseconds() > 0
+            && config.epoch < MAX_U64
+            && current_time < config.last_reconfiguration_time
+                with errors::INVALID_STATE;
+    }
+    spec schema ReconfigureEmits {
+        let config = global<Configuration>(@DiemRoot);
+        let post post_config = global<Configuration>(@DiemRoot);
+        let post now = DiemTimestamp::spec_now_microseconds();
+        let post msg = NewEpochEvent {
+            epoch: post_config.epoch,
+        };
+        let handle = config.events;
+        emits msg to handle if (!spec_reconfigure_omitted() && now != config.last_reconfiguration_time);
+    }
+
+    /// Emit a `NewEpochEvent` event. This function will be invoked by genesis directly to generate the very first
+    /// reconfiguration event.
+    fun emit_genesis_reconfiguration_event() acquires Configuration {
+        assert!(exists<Configuration>(@DiemRoot), errors::not_published(ECONFIGURATION));
+        let config_ref = borrow_global_mut<Configuration>(@DiemRoot);
+        assert!(config_ref.epoch == 0 && config_ref.last_reconfiguration_time == 0, errors::invalid_state(ECONFIGURATION));
+        config_ref.epoch = 1;
+
+        event::emit_event<NewEpochEvent>(
+            &mut config_ref.events,
+            NewEpochEvent {
+                epoch: config_ref.epoch,
+            },
+        );
+    }
+    spec emit_genesis_reconfiguration_event {
+        let post config = global<Configuration>(@DiemRoot);
+        let post handle = config.events;
+        let post msg = NewEpochEvent {
+                epoch: config.epoch,
+        };
+        ensures config.epoch == 1;
+        emits msg to handle;
+    }
+
+    // =================================================================
+    // Test-only functions
+
+    #[test_only]
+    public fun set_for_testing<Config: copy + drop + store>(account: &signer, payload: Config)
+    acquires DiemConfig, Configuration {
+        set(account, payload)
+    }
+
+    #[test_only]
+    public fun publish_new_config_for_testing<Config: copy + drop + store>(
+        dr_account: &signer,
+        payload: Config
+    ) {
+        publish_new_config(dr_account, payload);
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Initialization
+    spec module {
+        /// After genesis, the `Configuration` is published.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> spec_has_config();
+    }
+
+    /// # Invariants
+    spec module {
+        /// Configurations are only stored at the diem root address.
+        invariant<ConfigType>
+            forall config_address: address where exists<DiemConfig<ConfigType>>(config_address):
+                config_address == @DiemRoot;
+
+        /// Published configurations are persistent.
+        invariant<ConfigType> update
+            old(spec_is_published<ConfigType>()) ==> spec_is_published<ConfigType>();
+
+        /// If `ModifyConfigCapability<Config>` is published, it is persistent.
+        invariant<ConfigType> update
+            old(exists<ModifyConfigCapability<ConfigType>>(@DiemRoot)) ==>
+                exists<ModifyConfigCapability<ConfigType>>(@DiemRoot);
+    }
+
+    /// # Helper Functions
+    spec module {
+        fun spec_has_config(): bool {
+            exists<Configuration>(@DiemRoot)
+        }
+
+        fun spec_is_published<Config>(): bool {
+            exists<DiemConfig<Config>>(@DiemRoot)
+        }
+
+        fun spec_get_config<Config>(): Config {
+            global<DiemConfig<Config>>(@DiemRoot).payload
+        }
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConsensusConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConsensusConfig.move
new file mode 100644
index 000000000..4c7e8220f
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemConsensusConfig.move
@@ -0,0 +1,72 @@
+/// Maintains the consensus config for the Diem blockchain. The config is stored in a
+/// DiemConfig, and may be updated by Diem root.
+module DiemFramework::DiemConsensusConfig {
+    use DiemFramework::DiemConfig::{Self, DiemConfig};
+    use DiemFramework::Roles;
+    use std::vector;
+
+    struct DiemConsensusConfig has copy, drop, store {
+        config: vector<u8>,
+    }
+
+    /// Publishes the DiemConsensusConfig config.
+    public fun initialize(dr_account: &signer) {
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::publish_new_config(dr_account, DiemConsensusConfig { config: vector::empty() });
+    }
+    spec initialize {
+        /// Must abort if the signer does not have the DiemRoot role [[H12]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemConfig::PublishNewConfigAbortsIf<DiemConsensusConfig>;
+        include DiemConfig::PublishNewConfigEnsures<DiemConsensusConfig>{
+            payload: DiemConsensusConfig { config: vector::empty() }
+        };
+    }
+
+    /// Allows Diem root to update the config.
+    public fun set(dr_account: &signer, config: vector<u8>) {
+        Roles::assert_diem_root(dr_account);
+
+        DiemConfig::set(
+            dr_account,
+            DiemConsensusConfig { config }
+        );
+    }
+    spec set {
+        /// Must abort if the signer does not have the DiemRoot role [[H12]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemConfig::SetAbortsIf<DiemConsensusConfig>{account: dr_account};
+        include DiemConfig::SetEnsures<DiemConsensusConfig>{payload: DiemConsensusConfig { config }};
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Access Control
+
+    /// The permission "UpdateDiemConsensusConfig" is granted to DiemRoot [[H12]][PERMISSION].
+    spec module {
+        invariant [suspendable] forall addr: address
+            where exists<DiemConfig<DiemConsensusConfig>>(addr): addr == @DiemRoot;
+
+        invariant update [suspendable] old(DiemConfig::spec_is_published<DiemConsensusConfig>())
+            && DiemConfig::spec_is_published<DiemConsensusConfig>()
+            && old(DiemConfig::get<DiemConsensusConfig>()) != DiemConfig::get<DiemConsensusConfig>()
+                ==> Roles::spec_signed_by_diem_root_role();
+    }
+
+    // TODO: The following is the old style spec, which can removed later.
+    /// Only "set" can modify the DiemConsensusConfig config [[H12]][PERMISSION]
+    spec schema DiemConsensusConfigRemainsSame {
+        ensures old(DiemConfig::spec_is_published<DiemConsensusConfig>()) ==>
+            global<DiemConfig<DiemConsensusConfig>>(@DiemRoot) ==
+                old(global<DiemConfig<DiemConsensusConfig>>(@DiemRoot));
+    }
+    spec module {
+        apply DiemConsensusConfigRemainsSame to * except set;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemId.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemId.move
new file mode 100644
index 000000000..fdc3f772e
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemId.move
@@ -0,0 +1,303 @@
+/// Module managing Diem ID.
+module DiemFramework::DiemId {
+    use std::event::{Self, EventHandle};
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::signer;
+    use std::vector;
+
+    /// This resource holds an entity's domain names needed to send and receive payments using diem IDs.
+    struct DiemIdDomains has key {
+        /// The list of domain names owned by this parent vasp account
+        domains: vector<DiemIdDomain>,
+    }
+    spec DiemIdDomains {
+        /// All `DiemIdDomain`s stored in the `DiemIdDomains` resource are no more than 63 characters long.
+        invariant forall i in 0..len(domains): len(domains[i].domain) <= DOMAIN_LENGTH;
+        /// The list of `DiemIdDomain`s are a set
+        invariant forall i in 0..len(domains):
+            forall j in i + 1..len(domains): domains[i] != domains[j];
+    }
+
+    /// Struct to store the limit on-chain
+    struct DiemIdDomain has drop, store, copy {
+        domain: vector<u8>, // UTF-8 encoded and 63 characters
+    }
+    spec DiemIdDomain {
+        /// All `DiemIdDomain`s must be no more than 63 characters long.
+        invariant len(domain) <= DOMAIN_LENGTH;
+    }
+
+    struct DiemIdDomainManager has key {
+        /// Event handle for `domains` added or removed events. Emitted every time a domain is added
+        /// or removed to `domains`
+        diem_id_domain_events: EventHandle<DiemIdDomainEvent>,
+    }
+
+    struct DiemIdDomainEvent has drop, store {
+        /// Whether a domain was added or removed
+        removed: bool,
+        /// Diem ID Domain string of the account
+        domain: DiemIdDomain,
+        /// On-chain account address
+        address: address,
+    }
+
+    const DOMAIN_LENGTH: u64 = 63;
+
+    // Error codes
+    /// DiemIdDomains resource is not or already published.
+    const EDIEM_ID_DOMAIN: u64 = 0;
+    /// DiemIdDomainManager resource is not or already published.
+    const EDIEM_ID_DOMAIN_MANAGER: u64 = 1;
+    /// DiemID domain was not found
+    const EDOMAIN_NOT_FOUND: u64 = 2;
+    /// DiemID domain already exists
+    const EDOMAIN_ALREADY_EXISTS: u64 = 3;
+    /// DiemIdDomains resource was not published for a VASP account
+    const EDIEM_ID_DOMAINS_NOT_PUBLISHED: u64 = 4;
+    /// Invalid domain for DiemIdDomain
+    const EINVALID_DIEM_ID_DOMAIN: u64 = 5;
+
+    fun create_diem_id_domain(domain: vector<u8>): DiemIdDomain {
+        assert!(vector::length(&domain) <= DOMAIN_LENGTH, errors::invalid_argument(EINVALID_DIEM_ID_DOMAIN));
+        DiemIdDomain{ domain }
+    }
+    spec create_diem_id_domain {
+        include CreateDiemIdDomainAbortsIf;
+        ensures result == DiemIdDomain { domain };
+    }
+    spec schema CreateDiemIdDomainAbortsIf {
+        domain: vector<u8>;
+        aborts_if vector::length(domain) > DOMAIN_LENGTH with errors::INVALID_ARGUMENT;
+    }
+
+    /// Publish a `DiemIdDomains` resource under `created` with an empty `domains`.
+    /// Before sending or receiving any payments using Diem IDs, the Treasury Compliance account must send
+    /// a transaction that invokes `add_domain_id` to set the `domains` field with a valid domain
+    public fun publish_diem_id_domains(
+        vasp_account: &signer,
+    ) {
+        Roles::assert_parent_vasp_role(vasp_account);
+        assert!(
+            !exists<DiemIdDomains>(signer::address_of(vasp_account)),
+            errors::already_published(EDIEM_ID_DOMAIN)
+        );
+        move_to(vasp_account, DiemIdDomains {
+            domains: vector::empty(),
+        })
+    }
+    spec publish_diem_id_domains {
+        let vasp_addr = signer::address_of(vasp_account);
+        include Roles::AbortsIfNotParentVasp{account: vasp_account};
+        include PublishDiemIdDomainsAbortsIf;
+        include PublishDiemIdDomainsEnsures;
+    }
+    spec schema PublishDiemIdDomainsAbortsIf {
+        vasp_addr: address;
+        aborts_if has_diem_id_domains(vasp_addr) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema PublishDiemIdDomainsEnsures {
+        vasp_addr: address;
+        ensures exists<DiemIdDomains>(vasp_addr);
+        ensures vector::is_empty(global<DiemIdDomains>(vasp_addr).domains);
+    }
+
+    public fun has_diem_id_domains(addr: address): bool {
+        exists<DiemIdDomains>(addr)
+    }
+    spec has_diem_id_domains {
+        aborts_if false;
+        ensures result == exists<DiemIdDomains>(addr);
+    }
+
+    /// Publish a `DiemIdDomainManager` resource under `tc_account` with an empty `diem_id_domain_events`.
+    /// When Treasury Compliance account sends a transaction that invokes either `add_diem_id_domain` or
+    /// `remove_diem_id_domain`, a `DiemIdDomainEvent` is emitted and added to `diem_id_domain_events`.
+    public fun publish_diem_id_domain_manager(
+        tc_account : &signer,
+    ) {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(
+            !exists<DiemIdDomainManager>(signer::address_of(tc_account)),
+            errors::already_published(EDIEM_ID_DOMAIN_MANAGER)
+        );
+        move_to(
+            tc_account,
+            DiemIdDomainManager {
+                diem_id_domain_events: event::new_event_handle<DiemIdDomainEvent>(tc_account),
+            }
+        );
+    }
+    spec publish_diem_id_domain_manager {
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if tc_domain_manager_exists() with errors::ALREADY_PUBLISHED;
+        ensures exists<DiemIdDomainManager>(signer::address_of(tc_account));
+        modifies global<DiemIdDomainManager>(signer::address_of(tc_account));
+    }
+
+    /// Add a DiemIdDomain to a parent VASP's DiemIdDomains resource.
+    /// When updating DiemIdDomains, a simple duplicate domain check is done.
+    /// However, since domains are case insensitive, it is possible by error that two same domains in
+    /// different lowercase and uppercase format gets added.
+    public fun add_diem_id_domain(
+        tc_account: &signer,
+        address: address,
+        domain: vector<u8>,
+    ) acquires DiemIdDomainManager, DiemIdDomains {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(tc_domain_manager_exists(), errors::not_published(EDIEM_ID_DOMAIN_MANAGER));
+        assert!(
+            exists<DiemIdDomains>(address),
+            errors::not_published(EDIEM_ID_DOMAINS_NOT_PUBLISHED)
+        );
+
+        let account_domains = borrow_global_mut<DiemIdDomains>(address);
+        let diem_id_domain = create_diem_id_domain(domain);
+
+        assert!(
+            !vector::contains(&account_domains.domains, &diem_id_domain),
+            errors::invalid_argument(EDOMAIN_ALREADY_EXISTS)
+        );
+
+        vector::push_back(&mut account_domains.domains, copy diem_id_domain);
+
+        event::emit_event(
+            &mut borrow_global_mut<DiemIdDomainManager>(@TreasuryCompliance).diem_id_domain_events,
+            DiemIdDomainEvent {
+                removed: false,
+                domain: diem_id_domain,
+                address,
+            },
+        );
+    }
+    spec add_diem_id_domain {
+        include AddDiemIdDomainAbortsIf;
+        include AddDiemIdDomainEnsures;
+        include AddDiemIdDomainEmits;
+    }
+    spec schema AddDiemIdDomainAbortsIf {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let domains = global<DiemIdDomains>(address).domains;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include CreateDiemIdDomainAbortsIf;
+        aborts_if !exists<DiemIdDomains>(address) with errors::NOT_PUBLISHED;
+        aborts_if !tc_domain_manager_exists() with errors::NOT_PUBLISHED;
+        aborts_if contains(domains, DiemIdDomain { domain }) with errors::INVALID_ARGUMENT;
+    }
+    spec schema AddDiemIdDomainEnsures {
+        address: address;
+        domain: vector<u8>;
+        let post domains = global<DiemIdDomains>(address).domains;
+        ensures contains(domains, DiemIdDomain { domain });
+    }
+    spec schema AddDiemIdDomainEmits {
+        address: address;
+        domain: vector<u8>;
+        let handle = global<DiemIdDomainManager>(@TreasuryCompliance).diem_id_domain_events;
+        let msg = DiemIdDomainEvent {
+            removed: false,
+            domain: DiemIdDomain { domain },
+            address,
+        };
+        emits msg to handle;
+    }
+
+    /// Remove a DiemIdDomain from a parent VASP's DiemIdDomains resource.
+    public fun remove_diem_id_domain(
+        tc_account: &signer,
+        address: address,
+        domain: vector<u8>,
+    ) acquires DiemIdDomainManager, DiemIdDomains {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(tc_domain_manager_exists(), errors::not_published(EDIEM_ID_DOMAIN_MANAGER));
+        assert!(
+            exists<DiemIdDomains>(address),
+            errors::not_published(EDIEM_ID_DOMAINS_NOT_PUBLISHED)
+        );
+
+        let account_domains = borrow_global_mut<DiemIdDomains>(address);
+        let diem_id_domain = create_diem_id_domain(domain);
+
+        let (has, index) = vector::index_of(&account_domains.domains, &diem_id_domain);
+        if (has) {
+            vector::remove(&mut account_domains.domains, index);
+        } else {
+            abort errors::invalid_argument(EDOMAIN_NOT_FOUND)
+        };
+
+        event::emit_event(
+            &mut borrow_global_mut<DiemIdDomainManager>(@TreasuryCompliance).diem_id_domain_events,
+            DiemIdDomainEvent {
+                removed: true,
+                domain: diem_id_domain,
+                address: address,
+            },
+        );
+    }
+    spec remove_diem_id_domain {
+        include RemoveDiemIdDomainAbortsIf;
+        include RemoveDiemIdDomainEnsures;
+        include RemoveDiemIdDomainEmits;
+    }
+    spec schema RemoveDiemIdDomainAbortsIf {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let domains = global<DiemIdDomains>(address).domains;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include CreateDiemIdDomainAbortsIf;
+        aborts_if !exists<DiemIdDomains>(address) with errors::NOT_PUBLISHED;
+        aborts_if !tc_domain_manager_exists() with errors::NOT_PUBLISHED;
+        aborts_if !contains(domains, DiemIdDomain { domain }) with errors::INVALID_ARGUMENT;
+    }
+    spec schema RemoveDiemIdDomainEnsures {
+        address: address;
+        domain: vector<u8>;
+        let post domains = global<DiemIdDomains>(address).domains;
+        ensures !contains(domains, DiemIdDomain { domain });
+    }
+    spec schema RemoveDiemIdDomainEmits {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let handle = global<DiemIdDomainManager>(@TreasuryCompliance).diem_id_domain_events;
+        let msg = DiemIdDomainEvent {
+            removed: true,
+            domain: DiemIdDomain { domain },
+            address,
+        };
+        emits msg to handle;
+    }
+
+    public fun has_diem_id_domain(addr: address, domain: vector<u8>): bool acquires DiemIdDomains {
+        assert!(
+            exists<DiemIdDomains>(addr),
+            errors::not_published(EDIEM_ID_DOMAINS_NOT_PUBLISHED)
+        );
+        let account_domains = borrow_global<DiemIdDomains>(addr);
+        let diem_id_domain = create_diem_id_domain(domain);
+        vector::contains(&account_domains.domains, &diem_id_domain)
+    }
+    spec has_diem_id_domain {
+        include HasDiemIdDomainAbortsIf;
+        let id_domain = DiemIdDomain { domain };
+        ensures result == contains(global<DiemIdDomains>(addr).domains, id_domain);
+    }
+    spec schema HasDiemIdDomainAbortsIf {
+        addr: address;
+        domain: vector<u8>;
+        include CreateDiemIdDomainAbortsIf;
+        aborts_if !exists<DiemIdDomains>(addr) with errors::NOT_PUBLISHED;
+    }
+
+    public fun tc_domain_manager_exists(): bool {
+        exists<DiemIdDomainManager>(@TreasuryCompliance)
+    }
+    spec tc_domain_manager_exists {
+        aborts_if false;
+        ensures result == exists<DiemIdDomainManager>(@TreasuryCompliance);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemSystem.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemSystem.move
new file mode 100644
index 000000000..4a16fccce
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemSystem.move
@@ -0,0 +1,685 @@
+/// Maintains information about the set of validators used during consensus.
+/// Provides functions to add, remove, and update validators in the
+/// validator set.
+///
+/// > Note: When trying to understand this code, it's important to know that "config"
+/// and "configuration" are used for several distinct concepts.
+module DiemFramework::DiemSystem {
+    use DiemFramework::DiemConfig::{Self, DiemConfig, ModifyConfigCapability};
+    use DiemFramework::ValidatorConfig;
+    use DiemFramework::Roles;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+
+    /// Information about a Validator Owner.
+    struct ValidatorInfo has copy, drop, store {
+        /// The address (account) of the Validator Owner
+        addr: address,
+        /// The voting power of the Validator Owner (currently always 1).
+        consensus_voting_power: u64,
+        /// Configuration information about the Validator, such as the
+        /// Validator Operator, human name, and info such as consensus key
+        /// and network addresses.
+        config: ValidatorConfig::Config,
+        /// The time of last reconfiguration invoked by this validator
+        /// in microseconds
+        last_config_update_time: u64,
+    }
+
+    /// Enables a scheme that restricts the DiemSystem config
+    /// in DiemConfig from being modified by any other module.  Only
+    /// code in this module can get a reference to the ModifyConfigCapability<DiemSystem>,
+    /// which is required by `DiemConfig::set_with_capability_and_reconfigure` to
+    /// modify the DiemSystem config. This is only needed by `update_config_and_reconfigure`.
+    /// Only Diem root can add or remove a validator from the validator set, so the
+    /// capability is not needed for access control in those functions.
+    struct CapabilityHolder has key {
+        /// Holds a capability returned by `DiemConfig::publish_new_config_and_get_capability`
+        /// which is called in `initialize_validator_set`.
+        cap: ModifyConfigCapability<DiemSystem>,
+    }
+
+    /// The DiemSystem struct stores the validator set and crypto scheme in
+    /// DiemConfig. The DiemSystem struct is stored by DiemConfig, which publishes a
+    /// DiemConfig<DiemSystem> resource.
+    struct DiemSystem has copy, drop, store {
+        /// The current consensus crypto scheme.
+        scheme: u8,
+        /// The current validator set.
+        validators: vector<ValidatorInfo>,
+    }
+    spec DiemSystem {
+        /// Members of `validators` vector (the validator set) have unique addresses.
+        invariant
+            forall i in 0..len(validators), j in 0..len(validators):
+                validators[i].addr == validators[j].addr ==> i == j;
+    }
+
+    /// The `CapabilityHolder` resource was not in the required state
+    const ECAPABILITY_HOLDER: u64 = 0;
+    /// Tried to add a validator with an invalid state to the validator set
+    const EINVALID_PROSPECTIVE_VALIDATOR: u64 = 1;
+    /// Tried to add a validator to the validator set that was already in it
+    const EALREADY_A_VALIDATOR: u64 = 2;
+    /// An operation was attempted on an address not in the vaidator set
+    const ENOT_AN_ACTIVE_VALIDATOR: u64 = 3;
+    /// The validator operator is not the operator for the specified validator
+    const EINVALID_TRANSACTION_SENDER: u64 = 4;
+    /// An out of bounds index for the validator set was encountered
+    const EVALIDATOR_INDEX: u64 = 5;
+    /// Rate limited when trying to update config
+    const ECONFIG_UPDATE_RATE_LIMITED: u64 = 6;
+    /// Validator set already at maximum allowed size
+    const EMAX_VALIDATORS: u64 = 7;
+    /// Validator config update time overflows
+    const ECONFIG_UPDATE_TIME_OVERFLOWS: u64 = 8;
+
+    /// Number of microseconds in 5 minutes
+    const FIVE_MINUTES: u64 = 300000000;
+
+    /// The maximum number of allowed validators in the validator set
+    const MAX_VALIDATORS: u64 = 256;
+
+    /// The largest possible u64 value
+    const MAX_U64: u64 = 18446744073709551615;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Setup methods
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    /// Publishes the DiemConfig for the DiemSystem struct, which contains the current
+    /// validator set. Also publishes the `CapabilityHolder` with the
+    /// ModifyConfigCapability<DiemSystem> returned by the publish function, which allows
+    /// code in this module to change DiemSystem config (including the validator set).
+    /// Must be invoked by the Diem root a single time in Genesis.
+    public fun initialize_validator_set(
+        dr_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+
+        let cap = DiemConfig::publish_new_config_and_get_capability<DiemSystem>(
+            dr_account,
+            DiemSystem {
+                scheme: 0,
+                validators: vector::empty(),
+            },
+        );
+        assert!(
+            !exists<CapabilityHolder>(@DiemRoot),
+            errors::already_published(ECAPABILITY_HOLDER)
+        );
+        move_to(dr_account, CapabilityHolder { cap })
+    }
+    spec initialize_validator_set {
+        modifies global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot);
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        let dr_addr = signer::address_of(dr_account);
+        // TODO: The next two aborts_if's are not independent. Perhaps they can be
+        // simplified.
+        aborts_if DiemConfig::spec_is_published<DiemSystem>() with errors::ALREADY_PUBLISHED;
+        aborts_if exists<CapabilityHolder>(dr_addr) with errors::ALREADY_PUBLISHED;
+        ensures exists<CapabilityHolder>(dr_addr);
+        ensures DiemConfig::spec_is_published<DiemSystem>();
+        ensures len(spec_get_validators()) == 0;
+        ensures DiemConfig::get<DiemSystem>().scheme == 0;
+    }
+
+    /// Copies a DiemSystem struct into the DiemConfig<DiemSystem> resource
+    /// Called by the add, remove, and update functions.
+    fun set_diem_system_config(value: DiemSystem) acquires CapabilityHolder {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<CapabilityHolder>(@DiemRoot),
+            errors::not_published(ECAPABILITY_HOLDER)
+        );
+        // Updates the DiemConfig<DiemSystem> and emits a reconfigure event.
+        DiemConfig::set_with_capability_and_reconfigure<DiemSystem>(
+            &borrow_global<CapabilityHolder>(@DiemRoot).cap,
+            value
+        )
+    }
+    spec set_diem_system_config {
+        pragma opaque;
+        pragma delegate_invariants_to_caller;
+        requires DiemTimestamp::is_operating() ==> (
+            DiemConfig::spec_has_config() &&
+            DiemConfig::spec_is_published<DiemSystem>() &&
+            exists<CapabilityHolder>(@DiemRoot)
+        );
+        modifies global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot);
+        modifies global<DiemConfig::Configuration>(@DiemRoot);
+        include DiemTimestamp::AbortsIfNotOperating;
+        include DiemConfig::ReconfigureAbortsIf;
+        /// `payload` is the only field of DiemConfig, so next completely specifies it.
+        ensures global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot).payload == value;
+        include DiemConfig::SetEnsures<DiemSystem>{payload: value};
+        include DiemConfig::ReconfigureEmits;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods operating the Validator Set config callable by the diem root account
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Adds a new validator to the validator set.
+    public fun add_validator(
+        dr_account: &signer,
+        validator_addr: address
+    ) acquires CapabilityHolder {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+
+        // A prospective validator must have a validator config resource
+        assert!(
+            ValidatorConfig::is_valid(validator_addr),
+            errors::invalid_argument(EINVALID_PROSPECTIVE_VALIDATOR)
+        );
+
+        // Bound the validator set size
+        assert!(
+            validator_set_size() < MAX_VALIDATORS,
+            errors::limit_exceeded(EMAX_VALIDATORS)
+        );
+
+        let diem_system_config = get_diem_system_config();
+
+        // Ensure that this address is not already a validator
+        assert!(
+            !is_validator_(validator_addr, &diem_system_config.validators),
+            errors::invalid_argument(EALREADY_A_VALIDATOR)
+        );
+
+        // it is guaranteed that the config is non-empty
+        let config = ValidatorConfig::get_config(validator_addr);
+        vector::push_back(&mut diem_system_config.validators, ValidatorInfo {
+            addr: validator_addr,
+            config, // copy the config over to ValidatorSet
+            consensus_voting_power: 1,
+            last_config_update_time: DiemTimestamp::now_microseconds(),
+        });
+
+        set_diem_system_config(diem_system_config);
+    }
+    spec add_validator {
+        modifies global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot);
+        include AddValidatorAbortsIf;
+        include AddValidatorEnsures;
+        include DiemConfig::ReconfigureEmits;
+    }
+    spec schema AddValidatorAbortsIf {
+        dr_account: signer;
+        validator_addr: address;
+        aborts_if validator_set_size() >= MAX_VALIDATORS with errors::LIMIT_EXCEEDED;
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemConfig::ReconfigureAbortsIf;
+        aborts_if !ValidatorConfig::is_valid(validator_addr) with errors::INVALID_ARGUMENT;
+        aborts_if spec_is_validator(validator_addr) with errors::INVALID_ARGUMENT;
+    }
+    spec schema AddValidatorEnsures {
+        validator_addr: address;
+        /// DIP-6 property: validator has validator role. The code does not check this explicitly,
+        /// but it is implied by the `assert ValidatorConfig::is_valid`, since there
+        /// is an invariant (in ValidatorConfig) that a an address with a published ValidatorConfig has
+        /// a ValidatorRole
+        ensures Roles::spec_has_validator_role_addr(validator_addr);
+        ensures ValidatorConfig::is_valid(validator_addr);
+        ensures spec_is_validator(validator_addr);
+        let vs = spec_get_validators();
+        let post post_vs = spec_get_validators();
+        ensures vector::eq_push_back(post_vs,
+                                     vs,
+                                     ValidatorInfo {
+                                         addr: validator_addr,
+                                         config: ValidatorConfig::spec_get_config(validator_addr),
+                                         consensus_voting_power: 1,
+                                         last_config_update_time: DiemTimestamp::spec_now_microseconds(),
+                                      }
+                                   );
+    }
+
+
+    /// Removes a validator, aborts unless called by diem root account
+    public fun remove_validator(
+        dr_account: &signer,
+        validator_addr: address
+    ) acquires CapabilityHolder {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        let diem_system_config = get_diem_system_config();
+        // Ensure that this address is an active validator
+        let to_remove_index_vec = get_validator_index_(&diem_system_config.validators, validator_addr);
+        assert!(option::is_some(&to_remove_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        let to_remove_index = *option::borrow(&to_remove_index_vec);
+        // Remove corresponding ValidatorInfo from the validator set
+        _  = vector::swap_remove(&mut diem_system_config.validators, to_remove_index);
+
+        set_diem_system_config(diem_system_config);
+    }
+    spec remove_validator {
+        modifies global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot);
+        include RemoveValidatorAbortsIf;
+        include RemoveValidatorEnsures;
+        include DiemConfig::ReconfigureEmits;
+    }
+    spec schema RemoveValidatorAbortsIf {
+        dr_account: signer;
+        validator_addr: address;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemTimestamp::AbortsIfNotOperating;
+        include DiemConfig::ReconfigureAbortsIf;
+        aborts_if !spec_is_validator(validator_addr) with errors::INVALID_ARGUMENT;
+    }
+    spec schema RemoveValidatorEnsures {
+        validator_addr: address;
+        let vs = spec_get_validators();
+        let post post_vs = spec_get_validators();
+        ensures forall vi in post_vs where vi.addr != validator_addr: exists ovi in vs: vi == ovi;
+        /// Removed validator is no longer a validator.  Depends on no other entries for same address
+        /// in validator_set
+        ensures !spec_is_validator(validator_addr);
+    }
+
+    /// Copy the information from ValidatorConfig into the validator set.
+    /// This function makes no changes to the size or the members of the set.
+    /// If the config in the ValidatorSet changes, it stores the new DiemSystem
+    /// and emits a reconfigurationevent.
+    public fun update_config_and_reconfigure(
+        validator_operator_account: &signer,
+        validator_addr: address,
+    ) acquires CapabilityHolder {
+        DiemTimestamp::assert_operating();
+        Roles::assert_validator_operator(validator_operator_account);
+        assert!(
+            ValidatorConfig::get_operator(validator_addr) == signer::address_of(validator_operator_account),
+            errors::invalid_argument(EINVALID_TRANSACTION_SENDER)
+        );
+        let diem_system_config = get_diem_system_config();
+        let to_update_index_vec = get_validator_index_(&diem_system_config.validators, validator_addr);
+        assert!(option::is_some(&to_update_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        let to_update_index = *option::borrow(&to_update_index_vec);
+        let is_validator_info_updated = update_ith_validator_info_(&mut diem_system_config.validators, to_update_index);
+        if (is_validator_info_updated) {
+            let validator_info = vector::borrow_mut(&mut diem_system_config.validators, to_update_index);
+            assert!(
+                validator_info.last_config_update_time <= MAX_U64 - FIVE_MINUTES,
+                errors::limit_exceeded(ECONFIG_UPDATE_TIME_OVERFLOWS)
+            );
+            assert!(
+                DiemTimestamp::now_microseconds() > validator_info.last_config_update_time + FIVE_MINUTES,
+                errors::limit_exceeded(ECONFIG_UPDATE_RATE_LIMITED)
+            );
+            validator_info.last_config_update_time = DiemTimestamp::now_microseconds();
+            set_diem_system_config(diem_system_config);
+        }
+    }
+    spec update_config_and_reconfigure {
+        pragma opaque;
+        modifies global<DiemConfig::Configuration>(@DiemRoot);
+        modifies global<DiemConfig::DiemConfig<DiemSystem>>(@DiemRoot);
+        include ValidatorConfig::AbortsIfGetOperator{addr: validator_addr};
+        include UpdateConfigAndReconfigureAbortsIf;
+        include UpdateConfigAndReconfigureEnsures;
+        // The property below is not in `UpdateConfigAndReconfigureEnsures` because that is reused
+        // with a different condition in the transaction script `set_validator_config_and_reconfigure`.
+        // The validator set is not updated if: (1) `validator_addr` is not in the validator set, or
+        // (2) the validator info would not change. The code only does a reconfiguration if the
+        // validator set would change.  `ReconfigureAbortsIf` complains if the block time does not
+        // advance, but block time only advances if there is a reconfiguration.
+        let is_validator_info_updated =
+            ValidatorConfig::is_valid(validator_addr) &&
+            (exists v_info in spec_get_validators():
+                v_info.addr == validator_addr
+                && v_info.config != ValidatorConfig::spec_get_config(validator_addr));
+        include is_validator_info_updated ==> DiemConfig::ReconfigureAbortsIf;
+        let validator_index =
+            spec_index_of_validator(spec_get_validators(), validator_addr);
+        let last_config_time = spec_get_validators()[validator_index].last_config_update_time;
+        aborts_if is_validator_info_updated && last_config_time > MAX_U64 - FIVE_MINUTES
+            with errors::LIMIT_EXCEEDED;
+        aborts_if is_validator_info_updated && DiemTimestamp::spec_now_microseconds() <= last_config_time + FIVE_MINUTES
+                with errors::LIMIT_EXCEEDED;
+        include UpdateConfigAndReconfigureEmits;
+    }
+    spec schema UpdateConfigAndReconfigureAbortsIf {
+        validator_addr: address;
+        validator_operator_account: signer;
+        let validator_operator_addr = signer::address_of(validator_operator_account);
+        include DiemTimestamp::AbortsIfNotOperating;
+        /// Must abort if the signer does not have the ValidatorOperator role [[H15]][PERMISSION].
+        include Roles::AbortsIfNotValidatorOperator{account: validator_operator_account};
+        include ValidatorConfig::AbortsIfNoValidatorConfig{addr: validator_addr};
+        aborts_if ValidatorConfig::get_operator(validator_addr) != validator_operator_addr
+            with errors::INVALID_ARGUMENT;
+        aborts_if !spec_is_validator(validator_addr) with errors::INVALID_ARGUMENT;
+    }
+    /// Does not change the length of the validator set, only changes ValidatorInfo
+    /// for validator_addr, and doesn't change any addresses.
+    spec schema UpdateConfigAndReconfigureEnsures {
+        validator_addr: address;
+        let vs = spec_get_validators();
+        let post post_vs = spec_get_validators();
+        ensures len(post_vs) == len(vs);
+        /// No addresses change in the validator set
+        ensures forall i in 0..len(vs): post_vs[i].addr == vs[i].addr;
+        /// If the `ValidatorInfo` address is not the one we're changing, the info does not change.
+        ensures forall i in 0..len(vs) where vs[i].addr != validator_addr:
+                         post_vs[i] == vs[i];
+        /// It updates the correct entry in the correct way
+        ensures forall i in 0..len(vs): post_vs[i].config == vs[i].config ||
+                    (vs[i].addr == validator_addr &&
+                     post_vs[i].config == ValidatorConfig::get_config(validator_addr));
+        /// DIP-6 property
+        ensures Roles::spec_has_validator_role_addr(validator_addr);
+    }
+    spec schema UpdateConfigAndReconfigureEmits {
+        validator_addr: address;
+        let is_validator_info_updated =
+            ValidatorConfig::is_valid(validator_addr) &&
+            (exists v_info in spec_get_validators():
+                v_info.addr == validator_addr
+                && v_info.config != ValidatorConfig::spec_get_config(validator_addr));
+        include is_validator_info_updated ==> DiemConfig::ReconfigureEmits;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs: getters
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Get the DiemSystem configuration from DiemConfig
+    public fun get_diem_system_config(): DiemSystem {
+        DiemConfig::get<DiemSystem>()
+    }
+    spec get_diem_system_config {
+        pragma opaque;
+        include DiemConfig::AbortsIfNotPublished<DiemSystem>;
+        ensures result == DiemConfig::get<DiemSystem>();
+    }
+
+    /// Return true if `addr` is in the current validator set
+    public fun is_validator(addr: address): bool {
+        is_validator_(addr, &get_diem_system_config().validators)
+    }
+    spec is_validator {
+        pragma opaque;
+        // TODO: Publication of DiemConfig<DiemSystem> in initialization
+        // and persistence of configs implies that the next abort cannot
+        // actually happen.
+        include DiemConfig::AbortsIfNotPublished<DiemSystem>;
+        ensures result == spec_is_validator(addr);
+    }
+    spec fun spec_is_validator(addr: address): bool {
+        exists v in spec_get_validators(): v.addr == addr
+    }
+
+    /// Returns validator config. Aborts if `addr` is not in the validator set.
+    public fun get_validator_config(addr: address): ValidatorConfig::Config {
+        let diem_system_config = get_diem_system_config();
+        let validator_index_vec = get_validator_index_(&diem_system_config.validators, addr);
+        assert!(option::is_some(&validator_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        *&(vector::borrow(&diem_system_config.validators, *option::borrow(&validator_index_vec))).config
+    }
+    spec get_validator_config {
+        pragma opaque;
+        include DiemConfig::AbortsIfNotPublished<DiemSystem>;
+        aborts_if !spec_is_validator(addr) with errors::INVALID_ARGUMENT;
+        ensures
+            exists info in DiemConfig::get<DiemSystem>().validators where info.addr == addr:
+                result == info.config;
+    }
+
+    /// Return the size of the current validator set
+    public fun validator_set_size(): u64 {
+        vector::length(&get_diem_system_config().validators)
+    }
+    spec validator_set_size {
+        pragma opaque;
+        include DiemConfig::AbortsIfNotPublished<DiemSystem>;
+        ensures result == len(spec_get_validators());
+    }
+
+    /// Get the `i`'th validator address in the validator set.
+    public fun get_ith_validator_address(i: u64): address {
+        assert!(i < validator_set_size(), errors::invalid_argument(EVALIDATOR_INDEX));
+        vector::borrow(&get_diem_system_config().validators, i).addr
+    }
+    spec get_ith_validator_address {
+        pragma opaque;
+        include DiemConfig::AbortsIfNotPublished<DiemSystem>;
+        aborts_if i >= len(spec_get_validators()) with errors::INVALID_ARGUMENT;
+        ensures result == spec_get_validators()[i].addr;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Private functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Get the index of the validator by address in the `validators` vector
+    /// It has a loop, so there are spec blocks in the code to assert loop invariants.
+    fun get_validator_index_(validators: &vector<ValidatorInfo>, addr: address): Option<u64> {
+        let size = vector::length(validators);
+        let i = 0;
+        while ({
+            spec {
+                invariant i <= size;
+                invariant forall j in 0..i: validators[j].addr != addr;
+            };
+            (i < size)
+        })
+        {
+            let validator_info_ref = vector::borrow(validators, i);
+            if (validator_info_ref.addr == addr) {
+                spec {
+                    assert validators[i].addr == addr;
+                };
+                return option::some(i)
+            };
+            i = i + 1;
+        };
+        spec {
+            assert i == size;
+            assert forall j in 0..size: validators[j].addr != addr;
+        };
+        return option::none()
+    }
+    spec get_validator_index_ {
+        pragma opaque;
+        aborts_if false;
+        let size = len(validators);
+        /// If `addr` is not in validator set, returns none.
+        ensures (forall i in 0..size: validators[i].addr != addr) ==> option::is_none(result);
+        /// If `addr` is in validator set, return the least index of an entry with that address.
+        /// The data invariant associated with the DiemSystem.validators that implies
+        /// that there is exactly one such address.
+        ensures
+            (exists i in 0..size: validators[i].addr == addr) ==>
+                option::is_some(result)
+                && {
+                        let at = option::borrow(result);
+                        at == spec_index_of_validator(validators, addr)
+                    };
+    }
+
+    /// Updates *i*th validator info, if nothing changed, return false.
+    /// This function never aborts.
+    fun update_ith_validator_info_(validators: &mut vector<ValidatorInfo>, i: u64): bool {
+        let size = vector::length(validators);
+        // This provably cannot happen, but left it here for safety.
+        if (i >= size) {
+            return false
+        };
+        let validator_info = vector::borrow_mut(validators, i);
+        // "is_valid" below should always hold based on a global invariant later
+        // in the file (which proves if we comment out some other specifications),
+        // but it is left here for safety.
+        if (!ValidatorConfig::is_valid(validator_info.addr)) {
+            return false
+        };
+        let new_validator_config = ValidatorConfig::get_config(validator_info.addr);
+        // check if information is the same
+        let config_ref = &mut validator_info.config;
+        if (config_ref == &new_validator_config) {
+            return false
+        };
+        *config_ref = new_validator_config;
+        true
+    }
+    spec update_ith_validator_info_ {
+        pragma opaque;
+        aborts_if false;
+        let new_validator_config = ValidatorConfig::spec_get_config(validators[i].addr);
+        /// Prover is able to prove this because get_validator_index_ ensures it
+        /// in calling context.
+        requires 0 <= i && i < len(validators);
+        /// Somewhat simplified from the code because of properties guaranteed
+        /// by the calling context.
+        ensures
+            result ==
+                (ValidatorConfig::is_valid(validators[i].addr) &&
+                 new_validator_config != old(validators[i].config));
+        /// It only updates validators at index `i`, and updates the
+        /// `config` field to `new_validator_config`.
+        ensures
+            result ==>
+                validators == update(
+                    old(validators),
+                    i,
+                    update_field(old(validators[i]), config, new_validator_config)
+                );
+        /// Does not change validators if result is false
+        ensures !result ==> validators == old(validators);
+        /// Updates the ith validator entry (and nothing else), as appropriate.
+        ensures validators == update(old(validators), i, validators[i]);
+        /// Needed these assertions to make "consensus voting power is always 1" invariant
+        /// prove (not sure why).
+        requires forall i1 in 0..len(spec_get_validators()):
+           spec_get_validators()[i1].consensus_voting_power == 1;
+        ensures forall i1 in 0..len(spec_get_validators()):
+           spec_get_validators()[i1].consensus_voting_power == 1;
+    }
+
+    /// Private function checks for membership of `addr` in validator set.
+    fun is_validator_(addr: address, validators_vec_ref: &vector<ValidatorInfo>): bool {
+        option::is_some(&get_validator_index_(validators_vec_ref, addr))
+    }
+    spec is_validator_ {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (exists v in validators_vec_ref: v.addr == addr);
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Initialization
+    spec module {
+        /// After genesis, the `DiemSystem` configuration is published, as well as the capability
+        /// which grants the right to modify it to certain functions in this module.
+        invariant [suspendable] DiemTimestamp::is_operating() ==>
+            DiemConfig::spec_is_published<DiemSystem>() &&
+            exists<CapabilityHolder>(@DiemRoot);
+    }
+
+    /// # Access Control
+
+    /// Access control requirements for validator set are a bit more complicated than
+    /// many parts of the framework because of `update_config_and_reconfigure`.
+    /// That function updates the validator info (e.g., the network address) for a
+    /// particular Validator Owner, but only if the signer is the Operator for that owner.
+    /// Therefore, we must ensure that the information for other validators in the
+    /// validator set are not changed, which is specified locally for
+    /// `update_config_and_reconfigure`.
+
+    spec module {
+        invariant forall addr: address
+            where exists<DiemConfig<DiemSystem>>(addr): addr == @DiemRoot;
+
+        invariant update [suspendable] (
+                old(DiemConfig::spec_is_published<DiemSystem>()) &&
+                DiemConfig::spec_is_published<DiemSystem>() &&
+                old(len(DiemConfig::get<DiemSystem>().validators)) != len(DiemConfig::get<DiemSystem>().validators)
+            ) ==> Roles::spec_signed_by_diem_root_role();
+
+        invariant update [suspendable] (
+                old(DiemConfig::spec_is_published<DiemSystem>()) &&
+                DiemConfig::spec_is_published<DiemSystem>() &&
+                old(len(DiemConfig::get<DiemSystem>().validators)) == len(DiemConfig::get<DiemSystem>().validators)
+            ) ==> (
+                forall addr: address: (
+                    exists i in 0..len(DiemConfig::get<DiemSystem>().validators)
+                        where old(DiemConfig::get<DiemSystem>().validators[i].addr == addr):
+                        old(DiemConfig::get<DiemSystem>().validators[i].config) != DiemConfig::get<DiemSystem>().validators[i].config
+                ) ==> (exists a: address: signer::is_txn_signer_addr(a) && ValidatorConfig::get_operator(addr) == a)
+            );
+    }
+
+    // TODO: The following is the old style spec, which can removed later.
+    spec module {
+        /// The permission "{Add, Remove} Validator" is granted to DiemRoot [[H14]][PERMISSION].
+        apply Roles::AbortsIfNotDiemRoot{account: dr_account} to add_validator, remove_validator;
+        /// The permission "UpdateValidatorConfig(addr)" is granted to ValidatorOperator [[H15]][PERMISSION]
+        apply Roles::AbortsIfNotValidatorOperator{account: validator_operator_account} to update_config_and_reconfigure;
+    }
+    spec schema ValidatorSetConfigRemainsSame {
+        ensures spec_get_validators() == old(spec_get_validators());
+    }
+    spec module {
+        /// Only {add, remove} validator [[H14]][PERMISSION] and update_config_and_reconfigure
+        /// [[H15]][PERMISSION] may change the set of validators in the configuration.
+        /// `set_diem_system_config` is a private function which is only called by other
+        /// functions in the "except" list. `initialize_validator_set` is only called in
+        /// Genesis.
+        apply ValidatorSetConfigRemainsSame to *, *<T>
+           except add_validator, remove_validator, update_config_and_reconfigure,
+               initialize_validator_set, set_diem_system_config;
+    }
+
+    /// # Helper Functions
+
+    /// Fetches the currently published validator set from the published DiemConfig<DiemSystem>
+    /// resource.
+    spec fun spec_get_validators(): vector<ValidatorInfo> {
+        DiemConfig::get<DiemSystem>().validators
+    }
+
+    spec fun spec_index_of_validator(validators: vector<ValidatorInfo>, addr: address): u64 {
+        choose min i in range(validators) where validators[i].addr == addr
+    }
+
+    spec module {
+
+       /// Every validator has a published ValidatorConfig whose config option is "some"
+       /// (meaning of ValidatorConfig::is_valid).
+       /// > Unfortunately, this times out for unknown reasons (it doesn't seem to be hard),
+       /// so it is deactivated.
+       /// The Prover can prove it if the uniqueness invariant for the DiemSystem resource
+       /// is commented out, along with aborts for update_config_and_reconfigure and everything
+       /// else that breaks (e.g., there is an ensures in remove_validator that has to be
+       /// commented out)
+       invariant [deactivated, global] forall i1 in 0..len(spec_get_validators()):
+           ValidatorConfig::is_valid(spec_get_validators()[i1].addr);
+
+       /// Every validator in the validator set has a validator role.
+       /// > Note: Verification of DiemSystem seems to be very sensitive, and will
+       /// often time out after small changes.  Disabling this property
+       /// (with [deactivate, global]) is sometimes a quick temporary fix.
+       invariant [suspendable] forall i1 in 0..len(spec_get_validators()):
+           Roles::spec_has_validator_role_addr(spec_get_validators()[i1].addr);
+
+       /// `Consensus_voting_power` is always 1. In future implementations, this
+       /// field may have different values in which case this property will have to
+       /// change. It's here currently because and accidental or illicit change
+       /// to the voting power of a validator could defeat the Byzantine fault tolerance
+       /// of DiemBFT.
+       invariant [suspendable] forall i1 in 0..len(spec_get_validators()):
+           spec_get_validators()[i1].consensus_voting_power == 1;
+
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTimestamp.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTimestamp.move
new file mode 100644
index 000000000..780bc43dd
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTimestamp.move
@@ -0,0 +1,196 @@
+/// This module keeps a global wall clock that stores the current Unix time in microseconds.
+/// It interacts with the other modules in the following ways:
+///
+/// * Genesis: to initialize the timestamp
+/// * VASP: to keep track of when credentials expire
+/// * DiemSystem, DiemAccount, DiemConfig: to check if the current state is in the genesis state
+/// * DiemBlock: to reach consensus on the global wall clock time
+/// * AccountLimits: to limit the time of account limits
+///
+/// This module moreover enables code to assert that it is running in genesis (`Self::assert_genesis`) or after
+/// genesis (`Self::assert_operating`). These are essentially distinct states of the system. Specifically,
+/// if `Self::assert_operating` succeeds, assumptions about invariants over the global state can be made
+/// which reflect that the system has been successfully initialized.
+module DiemFramework::DiemTimestamp {
+    use DiemFramework::CoreAddresses;
+    use std::errors;
+    friend DiemFramework::Genesis;
+
+    /// A singleton resource holding the current Unix time in microseconds
+    struct CurrentTimeMicroseconds has key {
+        microseconds: u64,
+    }
+
+    /// Conversion factor between seconds and microseconds
+    const MICRO_CONVERSION_FACTOR: u64 = 1000000;
+
+    /// The blockchain is not in the genesis state anymore
+    const ENOT_GENESIS: u64 = 0;
+    /// The blockchain is not in an operating state yet
+    const ENOT_OPERATING: u64 = 1;
+    /// An invalid timestamp was provided
+    const ETIMESTAMP: u64 = 2;
+
+    /// Marks that time has started and genesis has finished. This can only be called from genesis and with the root
+    /// account.
+    public(friend) fun set_time_has_started(dr_account: &signer) {
+        assert_genesis();
+        CoreAddresses::assert_diem_root(dr_account);
+        let timer = CurrentTimeMicroseconds { microseconds: 0 };
+        move_to(dr_account, timer);
+    }
+    spec set_time_has_started {
+        /// This function can't be verified on its own and has to be verified in the context of Genesis execution.
+        ///
+        /// After time has started, all invariants guarded by `DiemTimestamp::is_operating` will become activated
+        /// and need to hold.
+        pragma delegate_invariants_to_caller;
+        include AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        ensures is_operating();
+        ensures spec_now_microseconds() == 0;
+    }
+
+    // TODO: this is for both df-cli and the unit-test for df
+    // - df-cli, as a few test cases in df-cli uses a customized genesis module and that module needs  to invoke
+    //   `set_time_has_started` in order to complete the genesis process. Until we find a way to solve this issue, this
+    //   temporary function will stay here.
+    // - this is also needed for diem-framework unit test `DiemTimestampTests`. And once the above issue for df-cli is
+    //   resolved, we can mark this function #[test_only]
+    public fun set_time_has_started_for_testing(dr_account: &signer) {
+        set_time_has_started(dr_account);
+    }
+    spec set_time_has_started_for_testing {
+        pragma verify = false;
+    }
+
+    /// Updates the wall clock time by consensus. Requires VM privilege and will be invoked during block prologue.
+    public fun update_global_time(
+        account: &signer,
+        proposer: address,
+        timestamp: u64
+    ) acquires CurrentTimeMicroseconds {
+        assert_operating();
+        // Can only be invoked by DiemVM signer.
+        CoreAddresses::assert_vm(account);
+
+        let global_timer = borrow_global_mut<CurrentTimeMicroseconds>(@DiemRoot);
+        let now = global_timer.microseconds;
+        if (proposer == @VMReserved) {
+            // NIL block with null address as proposer. Timestamp must be equal.
+            assert!(now == timestamp, errors::invalid_argument(ETIMESTAMP));
+        } else {
+            // Normal block. Time must advance
+            assert!(now < timestamp, errors::invalid_argument(ETIMESTAMP));
+        };
+        global_timer.microseconds = timestamp;
+    }
+    spec update_global_time {
+        pragma opaque;
+        modifies global<CurrentTimeMicroseconds>(@DiemRoot);
+
+        let now = spec_now_microseconds();
+        let post post_now = spec_now_microseconds();
+
+        /// Conditions unique for abstract and concrete version of this function.
+        include AbortsIfNotOperating;
+        include CoreAddresses::AbortsIfNotVM;
+        ensures post_now == timestamp;
+
+        /// Conditions we only check for the implementation, but do not pass to the caller.
+        aborts_if [concrete]
+            (if (proposer == @VMReserved) {
+                now != timestamp
+             } else  {
+                now >= timestamp
+             }
+            )
+            with errors::INVALID_ARGUMENT;
+    }
+
+    /// Gets the current time in microseconds.
+    public fun now_microseconds(): u64 acquires CurrentTimeMicroseconds {
+        assert_operating();
+        borrow_global<CurrentTimeMicroseconds>(@DiemRoot).microseconds
+    }
+    spec now_microseconds {
+        pragma opaque;
+        include AbortsIfNotOperating;
+        ensures result == spec_now_microseconds();
+    }
+    spec fun spec_now_microseconds(): u64 {
+        global<CurrentTimeMicroseconds>(@DiemRoot).microseconds
+    }
+
+    /// Gets the current time in seconds.
+    public fun now_seconds(): u64 acquires CurrentTimeMicroseconds {
+        now_microseconds() / MICRO_CONVERSION_FACTOR
+    }
+    spec now_seconds {
+        pragma opaque;
+        include AbortsIfNotOperating;
+        ensures result == spec_now_seconds();
+    }
+    spec fun spec_now_seconds(): u64 {
+        spec_now_microseconds() / MICRO_CONVERSION_FACTOR
+    }
+
+    /// Helper function to determine if Diem is in genesis state.
+    public fun is_genesis(): bool {
+        !exists<CurrentTimeMicroseconds>(@DiemRoot)
+    }
+
+    /// Helper function to assert genesis state.
+    public fun assert_genesis() {
+        assert!(is_genesis(), errors::invalid_state(ENOT_GENESIS));
+    }
+    spec assert_genesis {
+        pragma opaque = true;
+        include AbortsIfNotGenesis;
+    }
+
+    /// Helper schema to specify that a function aborts if not in genesis.
+    spec schema AbortsIfNotGenesis {
+        aborts_if !is_genesis() with errors::INVALID_STATE;
+    }
+
+    /// Helper function to determine if Diem is operating. This is the same as `!is_genesis()` and is provided
+    /// for convenience. Testing `is_operating()` is more frequent than `is_genesis()`.
+    public fun is_operating(): bool {
+        exists<CurrentTimeMicroseconds>(@DiemRoot)
+    }
+
+    /// Helper function to assert operating (!genesis) state.
+    public fun assert_operating() {
+        assert!(is_operating(), errors::invalid_state(ENOT_OPERATING));
+    }
+    spec assert_operating {
+        pragma opaque = true;
+        include AbortsIfNotOperating;
+    }
+
+    /// Helper schema to specify that a function aborts if not operating.
+    spec schema AbortsIfNotOperating {
+        aborts_if !is_operating() with errors::INVALID_STATE;
+    }
+
+    // ====================
+    // Module Specification
+    spec module {} // switch documentation context to module level
+
+    spec module {
+        /// After genesis, `CurrentTimeMicroseconds` is published forever
+        invariant is_operating() ==> exists<CurrentTimeMicroseconds>(@DiemRoot);
+
+        /// After genesis, time progresses monotonically.
+        invariant update
+            old(is_operating()) ==> old(spec_now_microseconds()) <= spec_now_microseconds();
+    }
+
+    spec module {
+        /// All functions which do not have an `aborts_if` specification in this module are implicitly declared
+        /// to never abort.
+        pragma aborts_if_is_strict;
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTransactionPublishingOption.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTransactionPublishingOption.move
new file mode 100644
index 000000000..04ca1d134
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemTransactionPublishingOption.move
@@ -0,0 +1,195 @@
+/// This module defines a struct storing the publishing policies for the VM.
+module DiemFramework::DiemTransactionPublishingOption {
+    use DiemFramework::DiemConfig::{Self, DiemConfig};
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::signer;
+    use std::vector;
+
+    const SCRIPT_HASH_LENGTH: u64 = 32;
+
+    /// The script hash has an invalid length
+    const EINVALID_SCRIPT_HASH: u64 = 0;
+    /// The script hash already exists in the allowlist
+    const EALLOWLIST_ALREADY_CONTAINS_SCRIPT: u64 = 1;
+    /// Attempting to publish/unpublish a HaltAllTransactions resource that does not exist.
+    const EHALT_ALL_TRANSACTIONS: u64 = 2;
+
+    /// Defines and holds the publishing policies for the VM. There are three possible configurations:
+    /// 1. No module publishing, only allow-listed scripts are allowed.
+    /// 2. No module publishing, custom scripts are allowed.
+    /// 3. Both module publishing and custom scripts are allowed.
+    /// We represent these as the following resource.
+    struct DiemTransactionPublishingOption has copy, drop, store {
+        /// Only script hashes in the following list can be executed by the network. If the vector is empty, no
+        /// limitation would be enforced.
+        script_allow_list: vector<vector<u8>>,
+        /// Anyone can publish new module if this flag is set to true.
+        module_publishing_allowed: bool,
+    }
+
+    /// If published, halts transactions from all accounts except DiemRoot
+    struct HaltAllTransactions has key {}
+
+    public fun initialize(
+        dr_account: &signer,
+        script_allow_list: vector<vector<u8>>,
+        module_publishing_allowed: bool,
+    ) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+
+        DiemConfig::publish_new_config(
+            dr_account,
+            DiemTransactionPublishingOption {
+                script_allow_list, module_publishing_allowed
+            }
+        );
+    }
+    spec initialize {
+        /// Must abort if the signer does not have the DiemRoot role [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include DiemConfig::PublishNewConfigAbortsIf<DiemTransactionPublishingOption>;
+        include DiemConfig::PublishNewConfigEnsures<DiemTransactionPublishingOption> {
+            payload: DiemTransactionPublishingOption {
+                script_allow_list, module_publishing_allowed
+            }};
+    }
+
+    /// Check if sender can execute script with `hash`
+    public fun is_script_allowed(account: &signer, hash: &vector<u8>): bool {
+        // DiemRoot can send any script
+        if (Roles::has_diem_root_role(account)) return true;
+
+        // No one except DiemRoot can send scripts when transactions are halted
+        if (transactions_halted()) return false;
+
+        // The adapter passes an empty hash for script functions. All script functions are allowed
+        if (vector::is_empty(hash)) return true;
+
+        let publish_option = DiemConfig::get<DiemTransactionPublishingOption>();
+        // allowlist empty = open publishing, anyone can send txes
+        vector::is_empty(&publish_option.script_allow_list)
+            // fixed allowlist. check inclusion
+            || vector::contains(&publish_option.script_allow_list, hash)
+    }
+    spec is_script_allowed {
+        include
+            !Roles::has_diem_root_role(account) && !transactions_halted() && !vector::is_empty(hash)
+            ==> DiemConfig::AbortsIfNotPublished<DiemTransactionPublishingOption>{};
+    }
+    spec schema AbortsIfNoTransactionPublishingOption {
+        include DiemTimestamp::is_genesis() ==> DiemConfig::AbortsIfNotPublished<DiemTransactionPublishingOption>{};
+    }
+
+    /// Check if a sender can publish a module
+    public fun is_module_allowed(account: &signer): bool {
+        let publish_option = DiemConfig::get<DiemTransactionPublishingOption>();
+
+        publish_option.module_publishing_allowed || Roles::has_diem_root_role(account)
+    }
+    spec is_module_allowed{
+        include DiemConfig::AbortsIfNotPublished<DiemTransactionPublishingOption>{};
+    }
+
+    /// Allow the execution of arbitrary script or not.
+    public fun set_open_script(dr_account: &signer) {
+        Roles::assert_diem_root(dr_account);
+        let publish_option = DiemConfig::get<DiemTransactionPublishingOption>();
+
+        publish_option.script_allow_list = vector::empty();
+        DiemConfig::set<DiemTransactionPublishingOption>(dr_account, publish_option);
+    }
+    spec set_open_script {
+        /// Must abort if the signer does not have the DiemRoot role [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemConfig::AbortsIfNotPublished<DiemTransactionPublishingOption>;
+        include DiemConfig::SetAbortsIf<DiemTransactionPublishingOption>{account: dr_account};
+    }
+
+    /// Allow module publishing from arbitrary sender or not.
+    public fun set_open_module(dr_account: &signer, open_module: bool) {
+        Roles::assert_diem_root(dr_account);
+
+        let publish_option = DiemConfig::get<DiemTransactionPublishingOption>();
+
+        publish_option.module_publishing_allowed = open_module;
+        DiemConfig::set<DiemTransactionPublishingOption>(dr_account, publish_option);
+    }
+    spec set_open_module {
+        /// Must abort if the signer does not have the DiemRoot role [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemConfig::AbortsIfNotPublished<DiemTransactionPublishingOption>;
+        include DiemConfig::SetAbortsIf<DiemTransactionPublishingOption>{account: dr_account};
+    }
+
+    /// If called, transactions cannot be sent from any account except DiemRoot
+    public fun halt_all_transactions(dr_account: &signer) {
+        Roles::assert_diem_root(dr_account);
+        assert!(
+            !exists<HaltAllTransactions>(signer::address_of(dr_account)),
+            errors::already_published(EHALT_ALL_TRANSACTIONS),
+        );
+        move_to(dr_account, HaltAllTransactions {});
+    }
+
+    /// If called, transactions can be sent from any account once again
+    public fun resume_transactions(dr_account: &signer) acquires HaltAllTransactions {
+        Roles::assert_diem_root(dr_account);
+        let dr_address = signer::address_of(dr_account);
+        assert!(
+            exists<HaltAllTransactions>(dr_address),
+            errors::already_published(EHALT_ALL_TRANSACTIONS),
+        );
+
+        let HaltAllTransactions {} = move_from<HaltAllTransactions>(dr_address);
+    }
+
+    /// Return true if all non-administrative transactions are currently halted
+    fun transactions_halted(): bool {
+        exists<HaltAllTransactions>(@DiemRoot)
+    }
+
+    spec module { } // Switch documentation context to module level.
+
+    /// # Initialization
+    spec module {
+        invariant [suspendable] DiemTimestamp::is_operating() ==>
+            DiemConfig::spec_is_published<DiemTransactionPublishingOption>();
+    }
+
+    /// # Access Control
+
+    /// Only `set_open_script`, and `set_open_module` can modify the
+    /// DiemTransactionPublishingOption config [[H11]][PERMISSION]
+    spec schema DiemVersionRemainsSame {
+        ensures old(DiemConfig::spec_is_published<DiemTransactionPublishingOption>()) ==>
+            global<DiemConfig<DiemTransactionPublishingOption>>(@DiemRoot) ==
+                old(global<DiemConfig<DiemTransactionPublishingOption>>(@DiemRoot));
+    }
+    spec module {
+        apply DiemVersionRemainsSame to * except set_open_script, set_open_module;
+    }
+
+    /// # Helper Functions
+    spec module {
+        fun spec_is_script_allowed(account: signer, hash: vector<u8>): bool {
+            let publish_option = DiemConfig::spec_get_config<DiemTransactionPublishingOption>();
+            Roles::has_diem_root_role(account) || (!transactions_halted() && (
+                vector::is_empty(hash) ||
+                    (vector::is_empty(publish_option.script_allow_list)
+                        || contains(publish_option.script_allow_list, hash))
+            ))
+        }
+
+        fun spec_is_module_allowed(account: signer): bool {
+            let publish_option = DiemConfig::spec_get_config<DiemTransactionPublishingOption>();
+            publish_option.module_publishing_allowed || Roles::has_diem_root_role(account)
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVMConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVMConfig.move
new file mode 100644
index 000000000..e022fd08d
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVMConfig.move
@@ -0,0 +1,242 @@
+/// This module defines structs and methods to initialize VM configurations,
+/// including different costs of running the VM.
+module DiemFramework::DiemVMConfig {
+    use DiemFramework::DiemConfig::{Self, DiemConfig};
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+
+    /// The provided gas constants were inconsistent.
+    const EGAS_CONSTANT_INCONSISTENCY: u64 = 0;
+
+    /// The struct to hold config data needed to operate the DiemVM.
+    struct DiemVMConfig has copy, drop, store {
+        /// Cost of running the VM.
+        gas_schedule: GasSchedule,
+    }
+
+    /// The gas schedule keeps two separate schedules for the gas:
+    /// * The instruction_schedule: This holds the gas for each bytecode instruction.
+    /// * The native_schedule: This holds the gas for used (per-byte operated over) for each native
+    ///   function.
+    /// A couple notes:
+    /// 1. In the case that an instruction is deleted from the bytecode, that part of the cost schedule
+    ///    still needs to remain the same; once a slot in the table is taken by an instruction, that is its
+    ///    slot for the rest of time (since that instruction could already exist in a module on-chain).
+    /// 2. The initialization of the module will publish the instruction table to the diem root account
+    ///    address, and will preload the vector with the gas schedule for instructions. The VM will then
+    ///    load this into memory at the startup of each block.
+    struct GasSchedule has copy, drop, store {
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        gas_constants: GasConstants,
+    }
+
+    struct GasConstants has copy, drop, store {
+        /// The cost per-byte read from global storage.
+        global_memory_per_byte_cost: u64,
+
+        /// The cost per-byte written to storage.
+        global_memory_per_byte_write_cost: u64,
+
+        /// The flat minimum amount of gas required for any transaction.
+        /// Charged at the start of execution.
+        min_transaction_gas_units: u64,
+
+        /// Any transaction over this size will be charged an additional amount per byte.
+        large_transaction_cutoff: u64,
+
+        /// The units of gas to be charged per byte over the `large_transaction_cutoff` in addition to
+        /// `min_transaction_gas_units` for transactions whose size exceeds `large_transaction_cutoff`.
+        intrinsic_gas_per_byte: u64,
+
+        /// ~5 microseconds should equal one unit of computational gas. We bound the maximum
+        /// computational time of any given transaction at roughly 20 seconds. We want this number and
+        /// `MAX_PRICE_PER_GAS_UNIT` to always satisfy the inequality that
+        /// MAXIMUM_NUMBER_OF_GAS_UNITS * MAX_PRICE_PER_GAS_UNIT < min(u64::MAX, GasUnits<GasCarrier>::MAX)
+        /// NB: The bound is set quite high since custom scripts aren't allowed except from predefined
+        /// and vetted senders.
+        maximum_number_of_gas_units: u64,
+
+        /// The minimum gas price that a transaction can be submitted with.
+        min_price_per_gas_unit: u64,
+
+        /// The maximum gas unit price that a transaction can be submitted with.
+        max_price_per_gas_unit: u64,
+
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    }
+
+    /// Initialize the table under the diem root account
+    public fun initialize(
+        dr_account: &signer,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+    ) {
+        DiemTimestamp::assert_genesis();
+
+        // The permission "UpdateVMConfig" is granted to DiemRoot [[H11]][PERMISSION].
+        Roles::assert_diem_root(dr_account);
+
+        let gas_constants = GasConstants {
+            global_memory_per_byte_cost: 4,
+            global_memory_per_byte_write_cost: 9,
+            min_transaction_gas_units: 600,
+            large_transaction_cutoff: 600,
+            intrinsic_gas_per_byte: 8,
+            maximum_number_of_gas_units: 4000000,
+            min_price_per_gas_unit: 0,
+            max_price_per_gas_unit: 10000,
+            max_transaction_size_in_bytes: 4096,
+            gas_unit_scaling_factor: 1000,
+            default_account_size: 800,
+        };
+
+        DiemConfig::publish_new_config(
+            dr_account,
+            DiemVMConfig {
+                gas_schedule: GasSchedule {
+                    instruction_schedule,
+                    native_schedule,
+                    gas_constants,
+                }
+            },
+        );
+    }
+    spec initialize {
+        let gas_constants = GasConstants {
+            global_memory_per_byte_cost: 4,
+            global_memory_per_byte_write_cost: 9,
+            min_transaction_gas_units: 600,
+            large_transaction_cutoff: 600,
+            intrinsic_gas_per_byte: 8,
+            maximum_number_of_gas_units: 4000000,
+            min_price_per_gas_unit: 0,
+            max_price_per_gas_unit: 10000,
+            max_transaction_size_in_bytes: 4096,
+            gas_unit_scaling_factor: 1000,
+            default_account_size: 800,
+        };
+
+        /// Must abort if the signer does not have the DiemRoot role [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include DiemConfig::PublishNewConfigAbortsIf<DiemVMConfig>;
+        include DiemConfig::PublishNewConfigEnsures<DiemVMConfig> {
+            payload: DiemVMConfig {
+                gas_schedule: GasSchedule {
+                    instruction_schedule,
+                    native_schedule,
+                    gas_constants,
+                }
+            }};
+    }
+
+    public fun set_gas_constants(
+        dr_account: &signer,
+        global_memory_per_byte_cost: u64,
+        global_memory_per_byte_write_cost: u64,
+        min_transaction_gas_units: u64,
+        large_transaction_cutoff: u64,
+        intrinsic_gas_per_byte: u64,
+        maximum_number_of_gas_units: u64,
+        min_price_per_gas_unit: u64,
+        max_price_per_gas_unit: u64,
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    ) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        assert!(
+            min_price_per_gas_unit <= max_price_per_gas_unit,
+            errors::invalid_argument(EGAS_CONSTANT_INCONSISTENCY)
+        );
+        assert!(
+            min_transaction_gas_units <= maximum_number_of_gas_units,
+            errors::invalid_argument(EGAS_CONSTANT_INCONSISTENCY)
+        );
+
+        let config = DiemConfig::get<DiemVMConfig>();
+        let gas_constants = &mut config.gas_schedule.gas_constants;
+
+        gas_constants.global_memory_per_byte_cost       = global_memory_per_byte_cost;
+        gas_constants.global_memory_per_byte_write_cost = global_memory_per_byte_write_cost;
+        gas_constants.min_transaction_gas_units         = min_transaction_gas_units;
+        gas_constants.large_transaction_cutoff          = large_transaction_cutoff;
+        gas_constants.intrinsic_gas_per_byte            = intrinsic_gas_per_byte;
+        gas_constants.maximum_number_of_gas_units       = maximum_number_of_gas_units;
+        gas_constants.min_price_per_gas_unit            = min_price_per_gas_unit;
+        gas_constants.max_price_per_gas_unit            = max_price_per_gas_unit;
+        gas_constants.max_transaction_size_in_bytes     = max_transaction_size_in_bytes;
+        gas_constants.gas_unit_scaling_factor           = gas_unit_scaling_factor;
+        gas_constants.default_account_size              = default_account_size;
+
+        DiemConfig::set(dr_account, config);
+    }
+    spec set_gas_constants {
+        include DiemTimestamp::AbortsIfNotOperating;
+        /// No one can update DiemVMConfig except for the Diem Root account [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemConfig::SetAbortsIf<DiemVMConfig>{account: dr_account };
+        aborts_if min_price_per_gas_unit > max_price_per_gas_unit with errors::INVALID_ARGUMENT;
+        aborts_if min_transaction_gas_units > maximum_number_of_gas_units with errors::INVALID_ARGUMENT;
+        let config = DiemConfig::spec_get_config<DiemVMConfig>();
+        ensures DiemConfig::spec_is_published<DiemVMConfig>();
+        ensures DiemConfig::get<DiemVMConfig>() == DiemVMConfig {
+            gas_schedule: GasSchedule {
+                instruction_schedule: config.gas_schedule.instruction_schedule,
+                native_schedule: config.gas_schedule.native_schedule,
+                gas_constants: GasConstants {
+                        global_memory_per_byte_cost,
+                        global_memory_per_byte_write_cost,
+                        min_transaction_gas_units,
+                        large_transaction_cutoff,
+                        intrinsic_gas_per_byte,
+                        maximum_number_of_gas_units,
+                        min_price_per_gas_unit,
+                        max_price_per_gas_unit,
+                        max_transaction_size_in_bytes,
+                        gas_unit_scaling_factor,
+                        default_account_size,
+                    },
+                }
+            };
+        ensures old(DiemConfig::spec_has_config()) == DiemConfig::spec_has_config();
+    }
+
+    spec module { } // Switch documentation context to module level.
+
+    /// # Initialization
+
+    spec module {
+        invariant [suspendable] DiemTimestamp::is_operating() ==> DiemConfig::spec_is_published<DiemVMConfig>();
+    }
+
+    /// # Access Control
+
+    /// The permission "UpdateVMConfig" is granted to DiemRoot [[H11]][PERMISSION].
+    spec module {
+        invariant [suspendable] forall addr: address
+            where exists<DiemConfig<DiemVMConfig>>(addr): addr == @DiemRoot;
+
+        invariant update [suspendable] old(DiemConfig::spec_is_published<DiemVMConfig>())
+            && DiemConfig::spec_is_published<DiemVMConfig>()
+            && old(DiemConfig::get<DiemVMConfig>()) != DiemConfig::get<DiemVMConfig>()
+                ==> Roles::spec_signed_by_diem_root_role();
+    }
+
+    // TODO: The following is the old style spec, which can removed later.
+    /// No one can update DiemVMConfig except for the Diem Root account [[H11]][PERMISSION].
+    spec schema DiemVMConfigRemainsSame {
+        ensures old(DiemConfig::spec_is_published<DiemVMConfig>()) ==>
+            global<DiemConfig<DiemVMConfig>>(@DiemRoot) ==
+                old(global<DiemConfig<DiemVMConfig>>(@DiemRoot));
+    }
+    spec module {
+        apply DiemVMConfigRemainsSame to * except set_gas_constants;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVersion.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVersion.move
new file mode 100644
index 000000000..ce3d9942c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DiemVersion.move
@@ -0,0 +1,106 @@
+/// Maintains the version number for the Diem blockchain. The version is stored in a
+/// DiemConfig, and may be updated by Diem root.
+module DiemFramework::DiemVersion {
+    use DiemFramework::DiemConfig::{Self, DiemConfig};
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+
+    struct DiemVersion has copy, drop, store {
+        major: u64,
+    }
+
+    /// Tried to set an invalid major version for the VM. Major versions must be strictly increasing
+    const EINVALID_MAJOR_VERSION_NUMBER: u64 = 0;
+
+    /// Publishes the DiemVersion config. Must be called during Genesis.
+    public fun initialize(dr_account: &signer, initial_version: u64) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::publish_new_config<DiemVersion>(
+            dr_account,
+            DiemVersion { major: initial_version },
+        );
+    }
+    spec initialize {
+        /// Must abort if the signer does not have the DiemRoot role [[H10]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include DiemConfig::PublishNewConfigAbortsIf<DiemVersion>;
+        include DiemConfig::PublishNewConfigEnsures<DiemVersion>{payload: DiemVersion { major: initial_version }};
+    }
+
+    /// Allows Diem root to update the major version to a larger version.
+    public fun set(dr_account: &signer, major: u64) {
+        DiemTimestamp::assert_operating();
+
+        Roles::assert_diem_root(dr_account);
+
+        let old_config = DiemConfig::get<DiemVersion>();
+
+        assert!(
+            old_config.major < major,
+            errors::invalid_argument(EINVALID_MAJOR_VERSION_NUMBER)
+        );
+
+        DiemConfig::set<DiemVersion>(
+            dr_account,
+            DiemVersion { major }
+        );
+    }
+    spec set {
+        /// Must abort if the signer does not have the DiemRoot role [[H10]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if DiemConfig::get<DiemVersion>().major >= major with errors::INVALID_ARGUMENT;
+        include DiemConfig::SetAbortsIf<DiemVersion>{account: dr_account};
+        include DiemConfig::SetEnsures<DiemVersion>{payload: DiemVersion { major }};
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Initialization
+    spec module {
+        /// After genesis, version is published.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> DiemConfig::spec_is_published<DiemVersion>();
+    }
+
+    /// # Access Control
+
+    /// The permission "UpdateDiemProtocolVersion" is granted to DiemRoot [[H10]][PERMISSION].
+    spec module {
+        invariant [suspendable] forall addr: address
+            where exists<DiemConfig<DiemVersion>>(addr): addr == @DiemRoot;
+
+        invariant update [suspendable] old(DiemConfig::spec_is_published<DiemVersion>())
+            && DiemConfig::spec_is_published<DiemVersion>()
+            && old(DiemConfig::get<DiemVersion>().major) != DiemConfig::get<DiemVersion>().major
+                ==> Roles::spec_signed_by_diem_root_role();
+    }
+
+    // TODO: The following is the old style spec, which can removed later.
+    /// Only "set" can modify the DiemVersion config [[H10]][PERMISSION]
+    spec schema DiemVersionRemainsSame {
+        ensures old(DiemConfig::spec_is_published<DiemVersion>()) ==>
+            global<DiemConfig<DiemVersion>>(@DiemRoot) ==
+                old(global<DiemConfig<DiemVersion>>(@DiemRoot));
+    }
+    /// The permission "UpdateDiemProtocolVersion" is granted to DiemRoot [[H10]][PERMISSION].
+    spec module {
+        apply DiemVersionRemainsSame to * except set;
+    }
+
+    /// # Other Invariants
+    spec module {
+        /// Version number never decreases
+        invariant update [suspendable]
+            DiemTimestamp::is_operating() ==>
+                (old(DiemConfig::get<DiemVersion>().major) <= DiemConfig::get<DiemVersion>().major);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DualAttestation.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DualAttestation.move
new file mode 100644
index 000000000..f440d6bae
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/DualAttestation.move
@@ -0,0 +1,584 @@
+/// Module managing dual attestation.
+module DiemFramework::DualAttestation {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::XDX::XDX;
+    use DiemFramework::Diem;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use DiemFramework::Signature;
+    use DiemFramework::VASP;
+    use std::bcs;
+    use std::errors;
+    use std::event::{Self, EventHandle};
+    use std::signer;
+    use std::vector;
+    friend DiemFramework::DiemAccount;
+
+    /// This resource holds an entity's globally unique name and all of the metadata it needs to
+    /// participate in off-chain protocols.
+    struct Credential has key {
+        /// The human readable name of this entity. Immutable.
+        human_name: vector<u8>,
+        /// The base_url holds the URL to be used for off-chain communication. This contains the
+        /// entire URL. Mutable.
+        base_url: vector<u8>,
+        /// 32 byte Ed25519 public key whose counterpart must be used to sign
+        /// (1) the payment metadata for on-chain transactions that require dual attestation (e.g.,
+        ///     transactions subject to the travel rule)
+        /// (2) information exchanged in the off-chain protocols (e.g., KYC info in the travel rule
+        ///     protocol)
+        /// Note that this is different than `authentication_key` used in DiemAccount, which is
+        /// a hash of a public key + signature scheme identifier, not a public key. Mutable.
+        compliance_public_key: vector<u8>,
+        /// Expiration date in microseconds from unix epoch. For V1, it is always set to
+        /// U64_MAX. Mutable, but only by DiemRoot.
+        expiration_date: u64,
+        /// Event handle for `compliance_public_key` rotation events. Emitted
+        /// every time this `compliance_public_key` is rotated.
+        compliance_key_rotation_events: EventHandle<ComplianceKeyRotationEvent>,
+        /// Event handle for `base_url` rotation events. Emitted every time this `base_url` is rotated.
+        base_url_rotation_events: EventHandle<BaseUrlRotationEvent>,
+    }
+
+    /// Struct to store the limit on-chain
+    struct Limit has key {
+        micro_xdx_limit: u64,
+    }
+
+    /// The message sent whenever the compliance public key for a `DualAttestation` resource is rotated.
+    struct ComplianceKeyRotationEvent has drop, store {
+        /// The new `compliance_public_key` that is being used for dual attestation checking.
+        new_compliance_public_key: vector<u8>,
+        /// The time at which the `compliance_public_key` was rotated
+        time_rotated_seconds: u64,
+    }
+
+    /// The message sent whenever the base url for a `DualAttestation` resource is rotated.
+    struct BaseUrlRotationEvent has drop, store {
+        /// The new `base_url` that is being used for dual attestation checking
+        new_base_url: vector<u8>,
+        /// The time at which the `base_url` was rotated
+        time_rotated_seconds: u64,
+    }
+
+    const MAX_U64: u128 = 18446744073709551615;
+
+    // Error codes
+    /// A credential is not or already published.
+    const ECREDENTIAL: u64 = 0;
+    /// A limit is not or already published.
+    const ELIMIT: u64 = 1;
+    /// Cannot parse this as an ed25519 public key
+    const EINVALID_PUBLIC_KEY: u64 = 2;
+    /// Cannot parse this as an ed25519 signature (e.g., != 64 bytes)
+    const EMALFORMED_METADATA_SIGNATURE: u64 = 3;
+    /// Signature does not match message and public key
+    const EINVALID_METADATA_SIGNATURE: u64 = 4;
+    /// The recipient of a dual attestation payment needs to set a compliance public key
+    const EPAYEE_COMPLIANCE_KEY_NOT_SET: u64 = 5;
+    /// The recipient of a dual attestation payment needs to set a base URL
+    const EPAYEE_BASE_URL_NOT_SET: u64 = 6;
+
+    /// Value of the dual attestation limit at genesis
+    const INITIAL_DUAL_ATTESTATION_LIMIT: u64 = 1000;
+    /// Suffix of every signed dual attestation message
+    const DOMAIN_SEPARATOR: vector<u8> = b"@@$$DIEM_ATTEST$$@@";
+    /// A year in microseconds
+    const ONE_YEAR: u64 = 31540000000000;
+    const U64_MAX: u64 = 18446744073709551615;
+
+    /// Publish a `Credential` resource with name `human_name` under `created` with an empty
+    /// `base_url` and `compliance_public_key`. Before receiving any dual attestation payments,
+    /// the `created` account must send a transaction that invokes `rotate_base_url` and
+    /// `rotate_compliance_public_key` to set these fields to a valid URL/public key.
+    public(friend) fun publish_credential(
+        created: &signer,
+        creator: &signer,
+        human_name: vector<u8>,
+    ) {
+        Roles::assert_parent_vasp_or_designated_dealer(created);
+        Roles::assert_treasury_compliance(creator);
+        assert!(
+            !exists<Credential>(signer::address_of(created)),
+            errors::already_published(ECREDENTIAL)
+        );
+        move_to(created, Credential {
+            human_name,
+            base_url: vector::empty(),
+            compliance_public_key: vector::empty(),
+            // For testnet and V1, so it should never expire. So set to u64::MAX
+            expiration_date: U64_MAX,
+            compliance_key_rotation_events: event::new_event_handle<ComplianceKeyRotationEvent>(created),
+            base_url_rotation_events: event::new_event_handle<BaseUrlRotationEvent>(created),
+        })
+    }
+    spec publish_credential {
+        /// The permission "RotateDualAttestationInfo" is granted to ParentVASP and DesignatedDealer [[H17]][PERMISSION].
+        include Roles::AbortsIfNotParentVaspOrDesignatedDealer{account: created};
+        include Roles::AbortsIfNotTreasuryCompliance{account: creator};
+        aborts_if spec_has_credential(signer::address_of(created)) with errors::ALREADY_PUBLISHED;
+    }
+    spec fun spec_has_credential(addr: address): bool {
+        exists<Credential>(addr)
+    }
+
+    /// Rotate the base URL for `account` to `new_url`
+    public fun rotate_base_url(account: &signer, new_url: vector<u8>) acquires Credential {
+        let addr = signer::address_of(account);
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        let credential = borrow_global_mut<Credential>(addr);
+        credential.base_url = copy new_url;
+        event::emit_event(&mut credential.base_url_rotation_events, BaseUrlRotationEvent {
+            new_base_url: new_url,
+            time_rotated_seconds: DiemTimestamp::now_seconds(),
+        });
+    }
+    spec rotate_base_url {
+        include RotateBaseUrlAbortsIf;
+        include RotateBaseUrlEnsures;
+        include RotateBaseUrlEmits;
+    }
+    spec schema RotateBaseUrlAbortsIf {
+        account: signer;
+        let sender = signer::address_of(account);
+
+        /// Must abort if the account does not have the resource Credential [[H17]][PERMISSION].
+        include AbortsIfNoCredential{addr: sender};
+
+        include DiemTimestamp::AbortsIfNotOperating;
+    }
+    spec schema AbortsIfNoCredential {
+        addr: address;
+        aborts_if !spec_has_credential(addr) with errors::NOT_PUBLISHED;
+    }
+    spec schema RotateBaseUrlEnsures {
+        account: signer;
+        new_url: vector<u8>;
+        let sender = signer::address_of(account);
+
+        ensures global<Credential>(sender).base_url == new_url;
+        /// The sender can only rotate its own base url [[H17]][PERMISSION].
+        ensures forall addr1:address where addr1 != sender:
+            global<Credential>(addr1).base_url == old(global<Credential>(addr1).base_url);
+    }
+    spec schema RotateBaseUrlEmits {
+        account: signer;
+        new_url: vector<u8>;
+        let sender = signer::address_of(account);
+        let handle = global<Credential>(sender).base_url_rotation_events;
+        let msg = BaseUrlRotationEvent {
+            new_base_url: new_url,
+            time_rotated_seconds: DiemTimestamp::spec_now_seconds(),
+        };
+        emits msg to handle;
+    }
+
+    /// Rotate the compliance public key for `account` to `new_key`.
+    public fun rotate_compliance_public_key(
+        account: &signer,
+        new_key: vector<u8>,
+    ) acquires Credential {
+        let addr = signer::address_of(account);
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        assert!(Signature::ed25519_validate_pubkey(copy new_key), errors::invalid_argument(EINVALID_PUBLIC_KEY));
+        let credential = borrow_global_mut<Credential>(addr);
+        credential.compliance_public_key = copy new_key;
+        event::emit_event(&mut credential.compliance_key_rotation_events, ComplianceKeyRotationEvent {
+            new_compliance_public_key: new_key,
+            time_rotated_seconds: DiemTimestamp::now_seconds(),
+        });
+
+    }
+    spec rotate_compliance_public_key {
+        include RotateCompliancePublicKeyAbortsIf;
+        include RotateCompliancePublicKeyEnsures;
+        include RotateCompliancePublicKeyEmits;
+    }
+    spec schema RotateCompliancePublicKeyAbortsIf {
+        account: signer;
+        new_key: vector<u8>;
+
+        let sender = signer::address_of(account);
+        /// Must abort if the account does not have the resource Credential [[H17]][PERMISSION].
+        include AbortsIfNoCredential{addr: sender};
+
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if !Signature::ed25519_validate_pubkey(new_key) with errors::INVALID_ARGUMENT;
+    }
+    spec schema RotateCompliancePublicKeyEnsures {
+        account: signer;
+        new_key: vector<u8>;
+
+        let sender = signer::address_of(account);
+        ensures global<Credential>(sender).compliance_public_key == new_key;
+        /// The sender only rotates its own compliance_public_key [[H17]][PERMISSION].
+        ensures forall addr1: address where addr1 != sender:
+            global<Credential>(addr1).compliance_public_key == old(global<Credential>(addr1).compliance_public_key);
+    }
+    spec schema RotateCompliancePublicKeyEmits {
+        account: signer;
+        new_key: vector<u8>;
+        let sender = signer::address_of(account);
+        let handle = global<Credential>(sender).compliance_key_rotation_events;
+        let msg = ComplianceKeyRotationEvent {
+            new_compliance_public_key: new_key,
+            time_rotated_seconds: DiemTimestamp::spec_now_seconds(),
+        };
+        emits msg to handle;
+    }
+
+    /// Return the human-readable name for the VASP account.
+    /// Aborts if `addr` does not have a `Credential` resource.
+    public fun human_name(addr: address): vector<u8> acquires Credential {
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        *&borrow_global<Credential>(addr).human_name
+    }
+    spec human_name {
+        pragma opaque;
+        include AbortsIfNoCredential;
+        ensures result == global<Credential>(addr).human_name;
+    }
+
+    /// Return the base URL for `addr`.
+    /// Aborts if `addr` does not have a `Credential` resource.
+    public fun base_url(addr: address): vector<u8> acquires Credential {
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        *&borrow_global<Credential>(addr).base_url
+    }
+    spec base_url {
+        pragma opaque;
+        include AbortsIfNoCredential;
+        ensures result == global<Credential>(addr).base_url;
+    }
+    /// Spec version of `Self::base_url`.
+    spec fun spec_base_url(addr: address): vector<u8> {
+        global<Credential>(addr).base_url
+    }
+
+    /// Return the compliance public key for `addr`.
+    /// Aborts if `addr` does not have a `Credential` resource.
+    public fun compliance_public_key(addr: address): vector<u8> acquires Credential {
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        *&borrow_global<Credential>(addr).compliance_public_key
+    }
+    spec compliance_public_key {
+        pragma opaque;
+        include AbortsIfNoCredential;
+        ensures result == spec_compliance_public_key(addr);
+    }
+    /// Spec version of `Self::compliance_public_key`.
+    spec fun spec_compliance_public_key(addr: address): vector<u8> {
+        global<Credential>(addr).compliance_public_key
+    }
+
+    /// Return the expiration date `addr`
+    /// Aborts if `addr` does not have a `Credential` resource.
+    public fun expiration_date(addr: address): u64  acquires Credential {
+        assert!(exists<Credential>(addr), errors::not_published(ECREDENTIAL));
+        *&borrow_global<Credential>(addr).expiration_date
+    }
+    spec expiration_date {
+        pragma opaque;
+        include AbortsIfNoCredential;
+        ensures result == global<Credential>(addr).expiration_date;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Dual attestation requirements and checking
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Return the address where the credentials for `addr` are stored
+    fun credential_address(addr: address): address {
+        if (VASP::is_child(addr)) VASP::parent_address(addr) else addr
+    }
+    spec credential_address {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_credential_address(addr);
+    }
+    spec fun spec_credential_address(addr: address): address {
+        if (VASP::is_child(addr)) {
+            VASP::spec_parent_address(addr)
+        } else {
+            addr
+        }
+    }
+
+    /// Helper which returns true if dual attestion is required for a deposit.
+    fun dual_attestation_required<Token>(
+        payer: address, payee: address, deposit_value: u64
+    ): bool acquires Limit {
+        // travel rule applies for payments over a limit
+        let travel_rule_limit_microdiem = get_cur_microdiem_limit();
+        let approx_xdx_microdiem_value = Diem::approx_xdx_for_value<Token>(deposit_value);
+        let above_limit = approx_xdx_microdiem_value >= travel_rule_limit_microdiem;
+        if (!above_limit) {
+            return false
+        };
+        // self-deposits never require dual attestation
+        if (payer == payee) {
+            return false
+        };
+        // dual attestation is required if the amount is above the limit AND between distinct
+        // VASPs
+        VASP::is_vasp(payer) && VASP::is_vasp(payee) &&
+            VASP::parent_address(payer) != VASP::parent_address(payee)
+    }
+    spec dual_attestation_required {
+        pragma opaque;
+        include DualAttestationRequiredAbortsIf<Token>;
+        ensures result == spec_dual_attestation_required<Token>(payer, payee, deposit_value);
+    }
+    spec schema DualAttestationRequiredAbortsIf<Token> {
+        deposit_value: num;
+        include Diem::ApproxXdmForValueAbortsIf<Token>{from_value: deposit_value};
+        aborts_if !spec_is_published() with errors::NOT_PUBLISHED;
+    }
+    spec fun spec_is_inter_vasp(payer: address, payee: address): bool {
+        VASP::is_vasp(payer) && VASP::is_vasp(payee)
+            && VASP::spec_parent_address(payer) != VASP::spec_parent_address(payee)
+    }
+    /// Helper functions which simulates `Self::dual_attestation_required`.
+    spec fun spec_dual_attestation_required<Token>(
+        payer: address, payee: address, deposit_value: u64
+    ): bool {
+        Diem::spec_approx_xdx_for_value<Token>(deposit_value)
+                    >= spec_get_cur_microdiem_limit() &&
+        payer != payee &&
+        spec_is_inter_vasp(payer, payee)
+    }
+
+    /// Helper to construct a message for dual attestation.
+    /// Message is `metadata` | `payer` | `amount` | `DOMAIN_SEPARATOR`.
+    fun dual_attestation_message(
+        payer: address, metadata: vector<u8>, deposit_value: u64
+    ): vector<u8> {
+        let message = metadata;
+        vector::append(&mut message, bcs::to_bytes(&payer));
+        vector::append(&mut message, bcs::to_bytes(&deposit_value));
+        vector::append(&mut message, DOMAIN_SEPARATOR);
+        message
+    }
+    spec dual_attestation_message {
+        /// Abstract from construction of message for the prover. Concatenation of results from `BCS::to_bytes`
+        /// are difficult to reason about, so we avoid doing it. This is possible because the actual value of this
+        /// message is not important for the verification problem, as long as the prover considers both
+        /// messages which fail verification and which do not.
+        pragma opaque;
+        aborts_if false;
+        ensures [abstract] result == spec_dual_attestation_message(payer, metadata, deposit_value);
+    }
+    /// Uninterpreted function for `Self::dual_attestation_message`. The actual value does not matter for
+    /// the verification of callers.
+    spec fun spec_dual_attestation_message(payer: address, metadata: vector<u8>, deposit_value: u64): vector<u8>;
+
+    /// Helper function to check validity of a signature when dual attestion is required.
+    fun assert_signature_is_valid(
+        payer: address,
+        payee: address,
+        metadata_signature: vector<u8>,
+        metadata: vector<u8>,
+        deposit_value: u64
+    ) acquires Credential {
+        // sanity check of signature validity
+        assert!(
+            vector::length(&metadata_signature) == 64,
+            errors::invalid_argument(EMALFORMED_METADATA_SIGNATURE)
+        );
+        // sanity check of payee compliance key validity
+        let payee_compliance_key = compliance_public_key(credential_address(payee));
+        assert!(
+            !vector::is_empty(&payee_compliance_key),
+            errors::invalid_state(EPAYEE_COMPLIANCE_KEY_NOT_SET)
+        );
+        // sanity check of payee base URL validity
+        let payee_base_url = base_url(credential_address(payee));
+        assert!(
+            !vector::is_empty(&payee_base_url),
+            errors::invalid_state(EPAYEE_BASE_URL_NOT_SET)
+        );
+        // cryptographic check of signature validity
+        let message = dual_attestation_message(payer, metadata, deposit_value);
+        assert!(
+            Signature::ed25519_verify(metadata_signature, payee_compliance_key, message),
+            errors::invalid_argument(EINVALID_METADATA_SIGNATURE),
+        );
+    }
+    spec assert_signature_is_valid {
+        pragma opaque = true;
+        include AssertSignatureValidAbortsIf;
+    }
+    spec schema AssertSignatureValidAbortsIf {
+        payer: address;
+        payee: address;
+        metadata_signature: vector<u8>;
+        metadata: vector<u8>;
+        deposit_value: u64;
+        include AbortsIfNoCredential{addr: spec_credential_address(payee)};
+        aborts_if vector::is_empty(spec_compliance_public_key(spec_credential_address(payee))) with errors::INVALID_STATE;
+        aborts_if vector::is_empty(spec_base_url(spec_credential_address(payee))) with errors::INVALID_STATE;
+        aborts_if !spec_signature_is_valid(payer, payee, metadata_signature, metadata, deposit_value)
+            with errors::INVALID_ARGUMENT;
+    }
+
+    /// Returns true if signature is valid.
+    spec fun spec_signature_is_valid(
+        payer: address,
+        payee: address,
+        metadata_signature: vector<u8>,
+        metadata: vector<u8>,
+        deposit_value: u64
+    ): bool {
+        let payee_compliance_key = spec_compliance_public_key(spec_credential_address(payee));
+        len(metadata_signature) == 64 &&
+            !vector::is_empty(payee_compliance_key) &&
+            Signature::ed25519_verify(
+                metadata_signature,
+                payee_compliance_key,
+                spec_dual_attestation_message(payer, metadata, deposit_value)
+            )
+    }
+
+    /// Public API for checking whether a payment of `value` coins of type `Currency`
+    /// from `payer` to `payee` has a valid dual attestation. This returns without aborting if
+    /// (1) dual attestation is not required for this payment, or
+    /// (2) dual attestation is required, and `metadata_signature` can be verified on the message
+    ///     `metadata` | `payer` | `value` | `DOMAIN_SEPARATOR` using the `compliance_public_key`
+    ///     published in `payee`'s `Credential` resource
+    /// It aborts with an appropriate error code if dual attestation is required, but one or more of
+    /// the conditions in (2) is not met.
+    public fun assert_payment_ok<Currency>(
+        payer: address,
+        payee: address,
+        value: u64,
+        metadata: vector<u8>,
+        metadata_signature: vector<u8>
+    ) acquires Credential, Limit {
+        if (!vector::is_empty(&metadata_signature) || // allow opt-in dual attestation
+            dual_attestation_required<Currency>(payer, payee, value)
+        ) {
+          assert_signature_is_valid(payer, payee, metadata_signature, metadata, value)
+        }
+    }
+    spec assert_payment_ok {
+        pragma opaque;
+        include AssertPaymentOkAbortsIf<Currency>;
+    }
+    spec schema AssertPaymentOkAbortsIf<Currency> {
+        payer: address;
+        payee: address;
+        value: u64;
+        metadata: vector<u8>;
+        metadata_signature: vector<u8>;
+        include len(metadata_signature) == 0 ==> DualAttestationRequiredAbortsIf<Currency>{deposit_value: value};
+        include (len(metadata_signature) != 0 || spec_dual_attestation_required<Currency>(payer, payee, value))
+            ==> AssertSignatureValidAbortsIf{deposit_value: value};
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Creating and updating dual attestation limit
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Travel rule limit set during genesis
+    public fun initialize(dr_account: &signer) {
+        DiemTimestamp::assert_genesis();
+        CoreAddresses::assert_diem_root(dr_account); // operational constraint.
+        assert!(!exists<Limit>(@DiemRoot), errors::already_published(ELIMIT));
+        let initial_limit = (INITIAL_DUAL_ATTESTATION_LIMIT as u128) * (Diem::scaling_factor<XDX>() as u128);
+        assert!(initial_limit <= MAX_U64, errors::limit_exceeded(ELIMIT));
+        move_to(
+            dr_account,
+            Limit {
+                micro_xdx_limit: (initial_limit as u64)
+            }
+        )
+    }
+    spec initialize {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        aborts_if exists<Limit>(@DiemRoot) with errors::ALREADY_PUBLISHED;
+        let initial_limit = INITIAL_DUAL_ATTESTATION_LIMIT * Diem::spec_scaling_factor<XDX>();
+        aborts_if initial_limit > MAX_U64 with errors::LIMIT_EXCEEDED;
+        include Diem::AbortsIfNoCurrency<XDX>; // for scaling_factor.
+        ensures global<Limit>(@DiemRoot).micro_xdx_limit == initial_limit;
+    }
+
+    /// Return the current dual attestation limit in microdiem
+    public fun get_cur_microdiem_limit(): u64 acquires Limit {
+        assert!(exists<Limit>(@DiemRoot), errors::not_published(ELIMIT));
+        borrow_global<Limit>(@DiemRoot).micro_xdx_limit
+    }
+    spec get_cur_microdiem_limit {
+        pragma opaque;
+        aborts_if !spec_is_published() with errors::NOT_PUBLISHED;
+        ensures result == spec_get_cur_microdiem_limit();
+    }
+
+    /// Set the dual attestation limit to `micro_diem_limit`.
+    /// Aborts if `tc_account` does not have the TreasuryCompliance role
+    public fun set_microdiem_limit(tc_account: &signer, micro_xdx_limit: u64) acquires Limit {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(exists<Limit>(@DiemRoot), errors::not_published(ELIMIT));
+        borrow_global_mut<Limit>(@DiemRoot).micro_xdx_limit = micro_xdx_limit;
+    }
+    spec set_microdiem_limit {
+        /// Must abort if the signer does not have the TreasuryCompliance role [[H6]][PERMISSION].
+        /// The permission UpdateDualAttestationLimit is granted to TreasuryCompliance.
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+
+        aborts_if !spec_is_published() with errors::NOT_PUBLISHED;
+        ensures global<Limit>(@DiemRoot).micro_xdx_limit == micro_xdx_limit;
+    }
+
+    // **************************** SPECIFICATION ********************************
+    spec module {} // switch documentation context back to module level
+
+    /// # Initialization
+
+    /// The Limit resource should be published after genesis
+    spec module {
+        invariant [suspendable] DiemTimestamp::is_operating() ==> spec_is_published();
+    }
+
+    /// # Helper Functions
+    spec module {
+        /// Helper function to determine whether the Limit is published.
+        fun spec_is_published(): bool {
+            exists<Limit>(@DiemRoot)
+        }
+
+        /// Mirrors `Self::get_cur_microdiem_limit`.
+        fun spec_get_cur_microdiem_limit(): u64 {
+            global<Limit>(@DiemRoot).micro_xdx_limit
+        }
+    }
+
+    /// # Access Control
+    spec module {
+        /// Only TreasuryCompliance can change the limit [[H6]][PERMISSION].
+        invariant update forall a: address where old(exists<Limit>(@DiemRoot)):
+            spec_get_cur_microdiem_limit() != old(spec_get_cur_microdiem_limit())
+		     ==> Roles::spec_signed_by_treasury_compliance_role();
+
+        /// The permission "RotateDualAttestationInfo(addr)" is only granted to ParentVASP or DD [[H17]][PERMISSION].
+        /// "Credential" resources are only published under ParentVASP or DD accounts.
+        invariant forall addr1: address:
+            spec_has_credential(addr1) ==>
+                (Roles::spec_has_parent_VASP_role_addr(addr1) ||
+                Roles::spec_has_designated_dealer_role_addr(addr1));
+
+        /// Only the one who owns Credential can rotate the dual attenstation info [[H17]][PERMISSION].
+        invariant update forall a: address where old(spec_has_credential(a)):
+            global<Credential>(a).compliance_public_key != old(global<Credential>(a).compliance_public_key)
+		     ==> signer::is_txn_signer_addr(a);
+
+        invariant update forall a: address where old(spec_has_credential(a)):
+            global<Credential>(a).base_url != old(global<Credential>(a).base_url)
+		     ==> signer::is_txn_signer_addr(a);
+
+        /// The permission "RotateDualAttestationInfo(addr)" is not transferred [[J17]][PERMISSION].
+        /// resource struct `Credential` is persistent.
+        invariant<CoinType> update forall a: address:
+            old(spec_has_credential(a)) ==> spec_has_credential(a);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Genesis.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Genesis.move
new file mode 100644
index 000000000..d046a23e5
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Genesis.move
@@ -0,0 +1,251 @@
+/// The `Genesis` module defines the Move initialization entry point of the Diem framework
+/// when executing from a fresh state.
+///
+/// > TODO: Currently there are a few additional functions called from Rust during genesis.
+/// > Document which these are and in which order they are called.
+module DiemFramework::Genesis {
+    use DiemFramework::AccountFreezing;
+    use DiemFramework::ChainId;
+    use DiemFramework::XUS;
+    use DiemFramework::DualAttestation;
+    use DiemFramework::XDX;
+    use DiemFramework::Diem;
+    use DiemFramework::DiemAccount;
+    use DiemFramework::DiemBlock;
+    use DiemFramework::DiemConfig;
+    use DiemFramework::DiemConsensusConfig;
+    use DiemFramework::DiemSystem;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::DiemTransactionPublishingOption;
+    use DiemFramework::DiemVersion;
+    use DiemFramework::TransactionFee;
+    use DiemFramework::DiemVMConfig;
+    use DiemFramework::ParallelExecutionConfig;
+    use DiemFramework::ValidatorConfig;
+    use DiemFramework::ValidatorOperatorConfig;
+    use std::signer;
+    use std::vector;
+
+    /// Initializes the Diem framework.
+    fun initialize(
+        dr_account: signer,
+        tc_account: signer,
+        dr_auth_key: vector<u8>,
+        tc_auth_key: vector<u8>,
+        initial_script_allow_list: vector<vector<u8>>,
+        is_open_module: bool,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        chain_id: u8,
+        initial_diem_version: u64,
+        consensus_config: vector<u8>,
+    ) {
+        initialize_internal(
+            &dr_account,
+            &tc_account,
+            dr_auth_key,
+            tc_auth_key,
+            initial_script_allow_list,
+            is_open_module,
+            instruction_schedule,
+            native_schedule,
+            chain_id,
+            initial_diem_version,
+            consensus_config,
+        )
+    }
+
+    /// Initializes the Diem Framework. Internal so it can be used by both genesis code, and for testing purposes
+    fun initialize_internal(
+        dr_account: &signer,
+        tc_account: &signer,
+        dr_auth_key: vector<u8>,
+        tc_auth_key: vector<u8>,
+        initial_script_allow_list: vector<vector<u8>>,
+        is_open_module: bool,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        chain_id: u8,
+        initial_diem_version: u64,
+        consensus_config: vector<u8>,
+    ) {
+        DiemAccount::initialize(dr_account, x"00000000000000000000000000000000");
+
+        ChainId::initialize(dr_account, chain_id);
+
+        // On-chain config setup
+        DiemConfig::initialize(dr_account);
+
+        // Consensus config setup
+        DiemConsensusConfig::initialize(dr_account);
+
+        // Parallel execution config setup
+        ParallelExecutionConfig::initialize_parallel_execution(dr_account);
+
+        // Currency setup
+        Diem::initialize(dr_account);
+
+        // Currency setup
+        XUS::initialize(dr_account, tc_account);
+
+        XDX::initialize(dr_account, tc_account);
+
+        AccountFreezing::initialize(dr_account);
+        TransactionFee::initialize(tc_account);
+
+        DiemSystem::initialize_validator_set(dr_account);
+        DiemVersion::initialize(dr_account, initial_diem_version);
+        DualAttestation::initialize(dr_account);
+        DiemBlock::initialize_block_metadata(dr_account);
+
+        // Rotate auth keys for DiemRoot and TreasuryCompliance accounts to the given
+        // values
+        let dr_rotate_key_cap = DiemAccount::extract_key_rotation_capability(dr_account);
+        DiemAccount::rotate_authentication_key(&dr_rotate_key_cap, dr_auth_key);
+        DiemAccount::restore_key_rotation_capability(dr_rotate_key_cap);
+
+        let tc_rotate_key_cap = DiemAccount::extract_key_rotation_capability(tc_account);
+        DiemAccount::rotate_authentication_key(&tc_rotate_key_cap, tc_auth_key);
+        DiemAccount::restore_key_rotation_capability(tc_rotate_key_cap);
+
+        DiemTransactionPublishingOption::initialize(
+            dr_account,
+            initial_script_allow_list,
+            is_open_module,
+        );
+
+        DiemVMConfig::initialize(
+            dr_account,
+            instruction_schedule,
+            native_schedule,
+        );
+
+        DiemConsensusConfig::set(dr_account, consensus_config);
+
+        // After we have called this function, all invariants which are guarded by
+        // `DiemTimestamp::is_operating() ==> ...` will become active and a verification condition.
+        // See also discussion at function specification.
+        DiemTimestamp::set_time_has_started(dr_account);
+    }
+
+    /// Sets up the initial validator set for the Diem network.
+    /// The validator "owner" accounts, their UTF-8 names, and their authentication
+    /// keys are encoded in the `owners`, `owner_names`, and `owner_auth_key` vectors.
+    /// Each validator signs consensus messages with the private key corresponding to the Ed25519
+    /// public key in `consensus_pubkeys`.
+    /// Each validator owner has its operation delegated to an "operator" (which may be
+    /// the owner). The operators, their names, and their authentication keys are encoded
+    /// in the `operators`, `operator_names`, and `operator_auth_keys` vectors.
+    /// Finally, each validator must specify the network address
+    /// (see diem/types/src/network_address/mod.rs) for itself and its full nodes.
+    fun create_initialize_owners_operators(
+        dr_account: signer,
+        owners: vector<signer>,
+        owner_names: vector<vector<u8>>,
+        owner_auth_keys: vector<vector<u8>>,
+        consensus_pubkeys: vector<vector<u8>>,
+        operators: vector<signer>,
+        operator_names: vector<vector<u8>>,
+        operator_auth_keys: vector<vector<u8>>,
+        validator_network_addresses: vector<vector<u8>>,
+        full_node_network_addresses: vector<vector<u8>>,
+    ) {
+        let num_owners = vector::length(&owners);
+        let num_owner_names = vector::length(&owner_names);
+        assert!(num_owners == num_owner_names, 0);
+        let num_owner_keys = vector::length(&owner_auth_keys);
+        assert!(num_owner_names == num_owner_keys, 0);
+        let num_operators = vector::length(&operators);
+        assert!(num_owner_keys == num_operators, 0);
+        let num_operator_names = vector::length(&operator_names);
+        assert!(num_operators == num_operator_names, 0);
+        let num_operator_keys = vector::length(&operator_auth_keys);
+        assert!(num_operator_names == num_operator_keys, 0);
+        let num_validator_network_addresses = vector::length(&validator_network_addresses);
+        assert!(num_operator_keys == num_validator_network_addresses, 0);
+        let num_full_node_network_addresses = vector::length(&full_node_network_addresses);
+        assert!(num_validator_network_addresses == num_full_node_network_addresses, 0);
+
+        let i = 0;
+        let dummy_auth_key_prefix = x"00000000000000000000000000000000";
+        while (i < num_owners) {
+            let owner = vector::borrow(&owners, i);
+            let owner_address = signer::address_of(owner);
+            let owner_name = *vector::borrow(&owner_names, i);
+            // create each validator account and rotate its auth key to the correct value
+            DiemAccount::create_validator_account(
+                &dr_account, owner_address, copy dummy_auth_key_prefix, owner_name
+            );
+
+            let owner_auth_key = *vector::borrow(&owner_auth_keys, i);
+            let rotation_cap = DiemAccount::extract_key_rotation_capability(owner);
+            DiemAccount::rotate_authentication_key(&rotation_cap, owner_auth_key);
+            DiemAccount::restore_key_rotation_capability(rotation_cap);
+
+            let operator = vector::borrow(&operators, i);
+            let operator_address = signer::address_of(operator);
+            let operator_name = *vector::borrow(&operator_names, i);
+            // create the operator account + rotate its auth key if it does not already exist
+            if (!DiemAccount::exists_at(operator_address)) {
+                DiemAccount::create_validator_operator_account(
+                    &dr_account, operator_address, copy dummy_auth_key_prefix, copy operator_name
+                );
+                let operator_auth_key = *vector::borrow(&operator_auth_keys, i);
+                let rotation_cap = DiemAccount::extract_key_rotation_capability(operator);
+                DiemAccount::rotate_authentication_key(&rotation_cap, operator_auth_key);
+                DiemAccount::restore_key_rotation_capability(rotation_cap);
+            };
+            // assign the operator to its validator
+            assert!(ValidatorOperatorConfig::get_human_name(operator_address) == operator_name, 0);
+            ValidatorConfig::set_operator(owner, operator_address);
+
+            // use the operator account set up the validator config
+            let validator_network_address = *vector::borrow(&validator_network_addresses, i);
+            let full_node_network_address = *vector::borrow(&full_node_network_addresses, i);
+            let consensus_pubkey = *vector::borrow(&consensus_pubkeys, i);
+            ValidatorConfig::set_config(
+                operator,
+                owner_address,
+                consensus_pubkey,
+                validator_network_address,
+                full_node_network_address
+            );
+
+            // finally, add this validator to the validator set
+            DiemSystem::add_validator(&dr_account, owner_address);
+
+            i = i + 1;
+        }
+    }
+
+    /// For verification of genesis, the goal is to prove that all the invariants which
+    /// become active after the end of this function hold. This cannot be achieved with
+    /// modular verification as we do in regular continuous testing. Rather, this module must
+    /// be verified **together** with the module(s) which provides the invariant.
+    ///
+    /// > TODO: currently verifying this module together with modules providing invariants
+    /// > (see above) times out. This can likely be solved by making more of the initialize
+    /// > functions called by this function opaque, and prove the according invariants locally to
+    /// > each module.
+    spec initialize {
+        /// Assume that this is called in genesis state (no timestamp).
+        requires DiemTimestamp::is_genesis();
+    }
+
+    #[test_only]
+    public fun setup(dr_account: &signer, tc_account: &signer) {
+        initialize_internal(
+            dr_account,
+            tc_account,
+            x"0000000000000000000000000000000000000000000000000000000000000000",
+            x"0000000000000000000000000000000000000000000000000000000000000000",
+            vector::empty(), // not needed for unit tests
+            false, // not needed for unit tests
+            x"", // instruction_schedule not needed for unit tests
+            x"", // native schedule not needed for unit tests
+            4u8, // TESTING chain ID
+            0,
+            vector::empty(),
+        )
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/NetworkIdentity.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/NetworkIdentity.move
new file mode 100644
index 000000000..74720bf71
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/NetworkIdentity.move
@@ -0,0 +1,356 @@
+/// Module managing Diemnet NetworkIdentity
+module DiemFramework::NetworkIdentity {
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::event::{Self, EventHandle};
+    use std::signer;
+    use std::vector;
+
+    /// Holder for all `NetworkIdentity` in an account
+    struct NetworkIdentity has key {
+        identities: vector<vector<u8>>,
+    }
+    spec NetworkIdentity {
+        include UniqueMembers<vector<u8>> {members: identities};
+    }
+
+    struct NetworkIdentityEventHandle has key {
+        /// Event handle for `identities` rotation events
+        identity_change_events: EventHandle<NetworkIdentityChangeNotification>
+    }
+
+    /// Message sent when there are updates to the `NetworkIdentity`.
+    struct NetworkIdentityChangeNotification has drop, store {
+        /// The address of the account that changed identities
+        account: address,
+        /// The new identities
+        identities: vector<vector<u8>>,
+        /// The time at which the `identities` was rotated
+        time_rotated_seconds: u64,
+    }
+
+    const MAX_ADDR_IDENTITIES: u64 = 100;
+
+    // Error Codes
+
+    /// Network ID doesn't exist when trying to get it
+    const ENETWORK_ID_DOESNT_EXIST: u64 = 0;
+    /// Limit exceeded on number of identities for an address
+    const ENETWORK_ID_LIMIT_EXCEEDED: u64 = 1;
+    /// No identities provided for changes
+    const ENETWORK_ID_NO_INPUT: u64 = 2;
+    /// Network identity event handle invalid
+    const ENETWORK_ID_EVENT_HANDLE_INVALID: u64 = 3;
+
+    public fun initialize_network_identity_event_handle(tc_account: &signer) {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(
+            !exists<NetworkIdentityEventHandle>(signer::address_of(tc_account)),
+            errors::already_published(ENETWORK_ID_EVENT_HANDLE_INVALID)
+        );
+        let event_handle = NetworkIdentityEventHandle {
+            identity_change_events: event::new_event_handle<NetworkIdentityChangeNotification>(tc_account),
+        };
+        move_to(
+            tc_account,
+            event_handle,
+        );
+    }
+
+    fun tc_network_identity_event_handle_exists(): bool {
+        exists<NetworkIdentityEventHandle>(@TreasuryCompliance)
+    }
+
+    /// Initialize `NetworkIdentity` with an empty list
+    fun initialize_network_identity(account: &signer) {
+        let identities = vector::empty<vector<u8>>();
+        move_to(account, NetworkIdentity { identities });
+    }
+    spec initialize_network_identity {
+        let account_addr = signer::address_of(account);
+        modifies global<NetworkIdentity>(account_addr);
+    }
+
+    /// Return the underlying `NetworkIdentity` bytes
+    public fun get(account_addr: address): vector<vector<u8>> acquires NetworkIdentity {
+        assert!(
+            exists<NetworkIdentity>(account_addr),
+            errors::not_published(ENETWORK_ID_DOESNT_EXIST)
+        );
+        *&borrow_global<NetworkIdentity>(account_addr).identities
+    }
+    spec get {
+        aborts_if !exists<NetworkIdentity>(account_addr) with errors::NOT_PUBLISHED;
+        ensures result == global<NetworkIdentity>(account_addr).identities;
+    }
+
+    /// Update and create if not exist `NetworkIdentity`
+    public fun add_identities(account: &signer, to_add: vector<vector<u8>>) acquires NetworkIdentity, NetworkIdentityEventHandle {
+        assert!(tc_network_identity_event_handle_exists(), errors::not_published(ENETWORK_ID_EVENT_HANDLE_INVALID));
+        let num_to_add = vector::length(&to_add);
+        assert!(num_to_add > 0, errors::invalid_argument(ENETWORK_ID_NO_INPUT));
+
+        if (!exists<NetworkIdentity>(signer::address_of(account))) {
+            initialize_network_identity(account);
+        };
+        let account_addr = signer::address_of(account);
+        let identity = borrow_global_mut<NetworkIdentity>(account_addr);
+        let identities = &mut identity.identities;
+
+        assert!(
+            vector::length(identities) + num_to_add <= MAX_ADDR_IDENTITIES,
+            errors::limit_exceeded(ENETWORK_ID_LIMIT_EXCEEDED)
+        );
+
+        let has_change = add_members_internal(identities, &to_add);
+        if (has_change) {
+            event::emit_event(
+                &mut borrow_global_mut<NetworkIdentityEventHandle>(@TreasuryCompliance).identity_change_events,
+                NetworkIdentityChangeNotification {
+                    account: account_addr,
+                    identities: *&identity.identities,
+                    time_rotated_seconds: DiemTimestamp::now_seconds(),
+                }
+            );
+        }
+    }
+    spec add_identities {
+        pragma verify=false; // TODO: due to timeout
+        let account_addr = signer::address_of(account);
+        let prior_identities = if (exists<NetworkIdentity>(account_addr)) {
+            global<NetworkIdentity>(account_addr).identities
+        } else {
+            vec()
+        };
+        let has_change = (exists e in to_add: !contains(prior_identities, e));
+
+        let post handle = global<NetworkIdentityEventHandle>(@TreasuryCompliance).identity_change_events;
+        let post msg = NetworkIdentityChangeNotification {
+            account: account_addr,
+            identities: global<NetworkIdentity>(account_addr).identities,
+            time_rotated_seconds: DiemTimestamp::spec_now_seconds(),
+        };
+
+        aborts_if !tc_network_identity_event_handle_exists() with errors::NOT_PUBLISHED;
+        aborts_if len(to_add) == 0 with errors::INVALID_ARGUMENT;
+        aborts_if len(prior_identities) + len(to_add) > MAX_U64;
+        aborts_if len(prior_identities) + len(to_add) > MAX_ADDR_IDENTITIES with errors::LIMIT_EXCEEDED;
+        include has_change ==> DiemTimestamp::AbortsIfNotOperating;
+        include AddMembersInternalEnsures<vector<u8>> {
+            old_members: prior_identities,
+            new_members: global<NetworkIdentity>(account_addr).identities,
+        };
+        modifies global<NetworkIdentity>(account_addr);
+        emits msg to handle if has_change;
+    }
+
+    /// Remove `NetworkIdentity`, skipping if it doesn't exist
+    public fun remove_identities(account: &signer, to_remove: vector<vector<u8>>) acquires NetworkIdentity, NetworkIdentityEventHandle {
+        assert!(tc_network_identity_event_handle_exists(), errors::not_published(ENETWORK_ID_EVENT_HANDLE_INVALID));
+        let num_to_remove = vector::length(&to_remove);
+        assert!(num_to_remove > 0, errors::invalid_argument(ENETWORK_ID_NO_INPUT));
+        assert!(
+            num_to_remove <= MAX_ADDR_IDENTITIES,
+            errors::limit_exceeded(ENETWORK_ID_LIMIT_EXCEEDED)
+        );
+
+        let account_addr = signer::address_of(account);
+        assert!(
+            exists<NetworkIdentity>(account_addr),
+            errors::not_published(ENETWORK_ID_DOESNT_EXIST)
+        );
+
+        let identity = borrow_global_mut<NetworkIdentity>(account_addr);
+        let identities = &mut identity.identities;
+
+        let has_change = remove_members_internal(identities, &to_remove);
+        if (has_change) {
+            event::emit_event(
+                &mut borrow_global_mut<NetworkIdentityEventHandle>(@TreasuryCompliance).identity_change_events,
+                NetworkIdentityChangeNotification {
+                    account: account_addr,
+                    identities: *&identity.identities,
+                    time_rotated_seconds: DiemTimestamp::now_seconds(),
+                }
+            );
+        };
+    }
+    spec remove_identities {
+        let account_addr = signer::address_of(account);
+        let prior_identities = global<NetworkIdentity>(account_addr).identities;
+        let has_change = (exists e in to_remove: contains(prior_identities, e));
+
+        let post handle = global<NetworkIdentityEventHandle>(@TreasuryCompliance).identity_change_events;
+        let post msg = NetworkIdentityChangeNotification {
+            account: account_addr,
+            identities: global<NetworkIdentity>(account_addr).identities,
+            time_rotated_seconds: DiemTimestamp::spec_now_seconds(),
+        };
+
+        aborts_if !tc_network_identity_event_handle_exists() with errors::NOT_PUBLISHED;
+        aborts_if len(to_remove) == 0 with errors::INVALID_ARGUMENT;
+        aborts_if len(to_remove) > MAX_ADDR_IDENTITIES with errors::LIMIT_EXCEEDED;
+        aborts_if !exists<NetworkIdentity>(account_addr) with errors::NOT_PUBLISHED;
+        include has_change ==> DiemTimestamp::AbortsIfNotOperating;
+        include RemoveMembersInternalEnsures<vector<u8>> {
+            old_members: prior_identities,
+            new_members: global<NetworkIdentity>(account_addr).identities,
+        };
+        modifies global<NetworkIdentity>(account_addr);
+        emits msg to handle if has_change;
+    }
+
+    // =================================================================
+    // Set operation simulation
+
+    /// Add all elements that appear in `to_add` into `members`.
+    ///
+    /// The `members` argument is essentially a set simulated by a vector, hence
+    /// the uniqueness of its elements are guaranteed, before and after the bulk
+    /// insertion. The `to_add` argument, on the other hand, does not guarantee
+    /// to be a set and hence can have duplicated elements.
+    fun add_members_internal<T: copy>(
+        members: &mut vector<T>,
+        to_add: &vector<T>,
+    ): bool {
+        let num_to_add = vector::length(to_add);
+        let num_existing = vector::length(members);
+
+        let i = 0;
+        while ({
+            spec {
+                invariant i <= num_to_add;
+                // the set can never reduce in size
+                invariant len(members) >= len(old(members));
+                // the current set maintains the uniqueness of the elements
+                invariant forall j in 0..len(members), k in 0..len(members): members[j] == members[k] ==> j == k;
+                // the left-split of the current set is exactly the same as the original set
+                invariant forall j in 0..len(old(members)): members[j] == old(members)[j];
+                // all elements in the the right-split of the current set is from the `to_add` vector
+                invariant forall j in len(old(members))..len(members): contains(to_add[0..i], members[j]);
+                // the current set includes everything in `to_add` we have seen so far
+                invariant forall j in 0..i: contains(members, to_add[j]);
+                // having no new members means that all elements in the `to_add` vector we have seen so far are already
+                // in the existing set, and vice versa.
+                invariant len(members) == len(old(members)) <==> (forall j in 0..i: contains(old(members), to_add[j]));
+            };
+            (i < num_to_add)
+        }) {
+            let entry = vector::borrow(to_add, i);
+            if (!vector::contains(members, entry)) {
+                vector::push_back(members, *entry);
+            };
+            i = i + 1;
+        };
+
+        vector::length(members) > num_existing
+    }
+    spec add_members_internal {
+        pragma opaque;
+        pragma verify=false; // TODO: disabled due to the failure when using Z3 4.8.13.
+        // TODO(mengxu): this is to force the prover to honor the "opaque" pragma in the ignore opaque setting
+        ensures [concrete] true;
+
+        aborts_if false;
+        include AddMembersInternalEnsures<T> {
+            old_members: old(members),
+            new_members: members,
+        };
+        // ensures that the `members` argument is and remains a set
+        include UniqueMembers<T>;
+        // returns whether a new element is added to the set
+        ensures result == (exists e in to_add: !contains(old(members), e));
+    }
+    spec schema AddMembersInternalEnsures<T: copy> {
+        old_members: vector<T>;
+        new_members: vector<T>;
+        to_add: vector<T>;
+        // everything in the `to_add` vector must be in the updated set
+        ensures forall e in to_add: contains(new_members, e);
+        // everything in the old set must remain in the updated set
+        ensures forall e in old_members: contains(new_members, e);
+        // everything in the updated set must come from either the old set or the `to_add` vector
+        ensures forall e in new_members: (contains(old_members, e) || contains(to_add, e));
+    }
+
+    /// Remove all elements that appear in `to_remove` from `members`.
+    ///
+    /// The `members` argument is essentially a set simulated by a vector, hence
+    /// the uniqueness of its elements are guaranteed, before and after the bulk
+    /// removal. The `to_remove` argument, on the other hand, does not guarantee
+    /// to be a set and hence can have duplicated elements.
+    fun remove_members_internal<T: drop>(
+        members: &mut vector<T>,
+        to_remove: &vector<T>,
+    ): bool {
+        let num_existing = vector::length(members);
+        let num_to_remove = vector::length(to_remove);
+
+        let i = 0;
+        while ({
+            spec {
+                invariant i <= num_to_remove;
+                // the set can never grow in size
+                invariant len(members) <= len(old(members));
+                // the current set maintains the uniqueness of the elements
+                invariant forall j in 0..len(members), k in 0..len(members): members[j] == members[k] ==> j == k;
+                // all elements in the the current set come from the original set
+                invariant forall j in 0..len(members): contains(old(members), members[j]);
+                // the current set never contains anything from the `to_remove` vector
+                invariant forall j in 0..i: !contains(members, to_remove[j]);
+                // the current set should never remove an element from the original set which is not in `to_remove`
+                invariant forall j in 0..len(old(members)): (contains(to_remove[0..i], old(members)[j]) || contains(members, old(members)[j]));
+                // having the same member means that all elements in the `to_remove` vector we have seen so far are not
+                // in the existing set, and vice versa.
+                invariant len(members) == len(old(members)) <==> (forall j in 0..i: !contains(old(members), to_remove[j]));
+            };
+            (i < num_to_remove)
+        }) {
+            let entry = vector::borrow(to_remove, i);
+            let (exist, index) = vector::index_of(members, entry);
+            if (exist) {
+                vector::swap_remove(members, index);
+            };
+            i = i + 1;
+        };
+
+        vector::length(members) < num_existing
+    }
+    spec remove_members_internal {
+        // TODO: due to the complexity of the loop invariants and the extensive use of quantifiers in the spec, this
+        // function takes significantly longer to verify (expect 200+ seconds). We will need to investigate ways to
+        // reduce the verification time for this function in the future. Until then, disable the verification for now.
+        pragma verify = false;
+
+        pragma opaque;
+        // TODO(mengxu): this is to force the prover to honor the "opaque" pragma in the ignore opaque setting
+        ensures [concrete] true;
+
+        aborts_if false;
+        include RemoveMembersInternalEnsures<T> {
+            old_members: old(members),
+            new_members: members,
+        };
+        // ensures that the `members` argument is and remains a set
+        include UniqueMembers<T>;
+        // returns whether an element is removed from the set
+        ensures result == (exists e in to_remove: contains(old(members), e));
+    }
+    spec schema RemoveMembersInternalEnsures<T: drop> {
+        old_members: vector<T>;
+        new_members: vector<T>;
+        to_remove: vector<T>;
+        // everything in the `to_remove` vector must not be in the updated set
+        ensures forall e in to_remove: !contains(new_members, e);
+        // all members in the updated set must be in the original set
+        ensures forall e in new_members: contains(old_members, e);
+        // an element from the original set that is not in the `to_remove` must be in the updated set
+        ensures forall e in old_members: (contains(to_remove, e) || contains(new_members, e));
+    }
+
+    spec schema UniqueMembers<T> {
+        members: vector<T>;
+        invariant forall i in 0..len(members), j in 0..len(members): members[i] == members[j] ==> i == j;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ParallelExecutionConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ParallelExecutionConfig.move
new file mode 100644
index 000000000..85453253d
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ParallelExecutionConfig.move
@@ -0,0 +1,115 @@
+/// This module defines structs and methods to initialize VM configurations,
+/// including different costs of running the VM.
+module DiemFramework::ParallelExecutionConfig {
+    use DiemFramework::DiemConfig::{Self, DiemConfig};
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::option::{Self, Option};
+
+    /// The struct to hold the read/write set analysis result for the whole Diem Framework.
+    struct ParallelExecutionConfig has copy, drop, store {
+        /// Serialized analysis result for the Diem Framework.
+        /// If this payload is not None, DiemVM will use this config to execute transactions in parallel.
+        read_write_analysis_result: Option<vector<u8>>
+    }
+
+    /// Enable parallel execution functionality of DiemVM by setting the read_write_set analysis result.
+    public fun initialize_parallel_execution(
+        dr_account: &signer,
+    ) {
+        // The permission "UpdateVMConfig" is granted to DiemRoot [[H11]][PERMISSION].
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::publish_new_config(
+            dr_account,
+            ParallelExecutionConfig {
+                read_write_analysis_result: option::none(),
+            },
+        );
+    }
+
+    public fun enable_parallel_execution_with_config(
+       dr_account: &signer,
+       read_write_inference_result: vector<u8>,
+    ) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::set(dr_account, ParallelExecutionConfig {
+            read_write_analysis_result: option::some(read_write_inference_result),
+        });
+    }
+
+    public fun disable_parallel_execution(
+       dr_account: &signer,
+    ) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::set(dr_account, ParallelExecutionConfig {
+            read_write_analysis_result: option::none(),
+        });
+    }
+
+    spec initialize_parallel_execution {
+        /// Must abort if the signer does not have the DiemRoot role [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+
+        include DiemConfig::PublishNewConfigAbortsIf<ParallelExecutionConfig>;
+        include DiemConfig::PublishNewConfigEnsures<ParallelExecutionConfig> {
+            payload: ParallelExecutionConfig {
+                read_write_analysis_result: option::none(),
+            }};
+    }
+
+    spec enable_parallel_execution_with_config {
+        include DiemTimestamp::AbortsIfNotOperating;
+        /// No one can update DiemVMConfig except for the Diem Root account [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemConfig::SetAbortsIf<ParallelExecutionConfig>{account: dr_account };
+        ensures DiemConfig::spec_is_published<ParallelExecutionConfig>();
+
+        // TODO: How to replace this assertion since we can't invoke Option::some here?
+        //        ensures DiemConfig::get<ParallelExecutionConfig>() == ParallelExecutionConfig {
+        //            read_write_analysis_result: result,
+        //        };
+
+        ensures old(DiemConfig::spec_has_config()) == DiemConfig::spec_has_config();
+    }
+
+    spec disable_parallel_execution {
+        include DiemTimestamp::AbortsIfNotOperating;
+        /// No one can update DiemVMConfig except for the Diem Root account [[H11]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemConfig::SetAbortsIf<ParallelExecutionConfig>{account: dr_account };
+        ensures DiemConfig::spec_is_published<ParallelExecutionConfig>();
+        ensures DiemConfig::get<ParallelExecutionConfig>() == ParallelExecutionConfig {
+            read_write_analysis_result: option::none(),
+        };
+        ensures old(DiemConfig::spec_has_config()) == DiemConfig::spec_has_config();
+    }
+
+
+    spec module { } // Switch documentation context to module level.
+
+    /// # Access Control
+
+    /// The permission "UpdateParallelExecutionConfig" is granted to DiemRoot [[H11]][PERMISSION].
+    spec module {
+        invariant [suspendable] forall addr: address
+            where exists<DiemConfig<ParallelExecutionConfig>>(addr): addr == @DiemRoot;
+
+        invariant update [suspendable] old(DiemConfig::spec_is_published<ParallelExecutionConfig>())
+            && DiemConfig::spec_is_published<ParallelExecutionConfig>()
+            && old(DiemConfig::get<ParallelExecutionConfig>()) != DiemConfig::get<ParallelExecutionConfig>()
+                ==> Roles::spec_signed_by_diem_root_role();
+    }
+
+    // TODO: The following is the old style spec, which can removed later.
+    /// No one can update DiemVMConfig except for the Diem Root account [[H11]][PERMISSION].
+    spec schema DiemVMConfigRemainsSame {
+        ensures old(DiemConfig::spec_is_published<ParallelExecutionConfig>()) ==>
+            global<DiemConfig<ParallelExecutionConfig>>(@DiemRoot) ==
+                old(global<DiemConfig<ParallelExecutionConfig>>(@DiemRoot));
+    }
+    spec module {
+        apply DiemVMConfigRemainsSame to * except enable_parallel_execution_with_config, disable_parallel_execution;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/PaymentScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/PaymentScripts.move
new file mode 100644
index 000000000..77208a935
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/PaymentScripts.move
@@ -0,0 +1,187 @@
+/// This module holds all payment related script entrypoints in the Diem Framework.
+/// Any account that can hold a balance can use the transaction scripts within this module.
+module DiemFramework::PaymentScripts {
+    use DiemFramework::DiemAccount;
+    use DiemFramework::DualAttestation;
+    use std::signer;
+
+    /// # Summary
+    /// Transfers a given number of coins in a specified currency from one account to another.
+    /// Transfers over a specified amount defined on-chain that are between two different VASPs, or
+    /// other accounts that have opted-in will be subject to on-chain checks to ensure the receiver has
+    /// agreed to receive the coins.  This transaction can be sent by any account that can hold a
+    /// balance, and to any account that can hold a balance. Both accounts must hold balances in the
+    /// currency being transacted.
+    ///
+    /// # Technical Description
+    ///
+    /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated
+    /// `metadata` and an (optional) `metadata_signature` on the message of the form
+    /// `metadata` | `Signer::address_of(payer)` | `amount` | `DualAttestation::DOMAIN_SEPARATOR`, that
+    /// has been signed by the `payee`'s private key associated with the `compliance_public_key` held in
+    /// the `payee`'s `DualAttestation::Credential`. Both the `Signer::address_of(payer)` and `amount` fields
+    /// in the `metadata_signature` must be BCS-encoded bytes, and `|` denotes concatenation.
+    /// The `metadata` and `metadata_signature` parameters are only required if `amount` >=
+    /// `DualAttestation::get_cur_microdiem_limit` XDX and `payer` and `payee` are distinct VASPs.
+    /// However, a transaction sender can opt in to dual attestation even when it is not required
+    /// (e.g., a DesignatedDealer -> VASP payment) by providing a non-empty `metadata_signature`.
+    /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`.
+    ///
+    /// # Events
+    /// Successful execution of this script emits two events:
+    /// * A `DiemAccount::SentPaymentEvent` on `payer`'s `DiemAccount::DiemAccount` `sent_events` handle; and
+    /// * A `DiemAccount::ReceivedPaymentEvent` on `payee`'s `DiemAccount::DiemAccount` `received_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                 | Type         | Description                                                                                                                  |
+    /// | ------               | ------       | -------------                                                                                                                |
+    /// | `Currency`           | Type         | The Move type for the `Currency` being sent in this transaction. `Currency` must be an already-registered currency on-chain. |
+    /// | `payer`              | `signer`     | The signer of the sending account that coins are being transferred from.                                                     |
+    /// | `payee`              | `address`    | The address of the account the coins are being transferred to.                                                               |
+    /// | `metadata`           | `vector<u8>` | Optional metadata about this payment.                                                                                        |
+    /// | `metadata_signature` | `vector<u8>` | Optional signature over `metadata` and payment information. See                                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                     | Description                                                                                                                         |
+    /// | ----------------           | --------------                                   | -------------                                                                                                                       |
+    /// | `Errors::NOT_PUBLISHED`    | `DiemAccount::EPAYER_DOESNT_HOLD_CURRENCY`       | `payer` doesn't hold a balance in `Currency`.                                                                                       |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EINSUFFICIENT_BALANCE`             | `amount` is greater than `payer`'s balance in `Currency`.                                                                           |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::ECOIN_DEPOSIT_IS_ZERO`             | `amount` is zero.                                                                                                                   |
+    /// | `Errors::NOT_PUBLISHED`    | `DiemAccount::EPAYEE_DOES_NOT_EXIST`             | No account exists at the `payee` address.                                                                                           |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EPAYEE_CANT_ACCEPT_CURRENCY_TYPE`  | An account exists at `payee`, but it does not accept payments in `Currency`.                                                        |
+    /// | `Errors::INVALID_STATE`    | `AccountFreezing::EACCOUNT_FROZEN`               | The `payee` account is frozen.                                                                                                      |
+    /// | `Errors::INVALID_ARGUMENT` | `DualAttestation::EMALFORMED_METADATA_SIGNATURE` | `metadata_signature` is not 64 bytes.                                                                                               |
+    /// | `Errors::INVALID_ARGUMENT` | `DualAttestation::EINVALID_METADATA_SIGNATURE`   | `metadata_signature` does not verify on the against the `payee'`s `DualAttestation::Credential` `compliance_public_key` public key. |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EWITHDRAWAL_EXCEEDS_LIMITS`        | `payer` has exceeded its daily withdrawal limits for the backing coins of XDX.                                                      |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EDEPOSIT_EXCEEDS_LIMITS`           | `payee` has exceeded its daily deposit limits for XDX.                                                                              |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_child_vasp_account`
+    /// * `AccountCreationScripts::create_parent_vasp_account`
+    /// * `AccountAdministrationScripts::add_currency_to_account`
+    /// * `PaymentScripts::peer_to_peer_by_signers`
+    public entry fun peer_to_peer_with_metadata<Currency>(
+        payer: signer,
+        payee: address,
+        amount: u64,
+        metadata: vector<u8>,
+        metadata_signature: vector<u8>
+    ) {
+        let payer_withdrawal_cap = DiemAccount::extract_withdraw_capability(&payer);
+        DiemAccount::pay_from<Currency>(
+            &payer_withdrawal_cap, payee, amount, metadata, metadata_signature
+        );
+        DiemAccount::restore_withdraw_capability(payer_withdrawal_cap);
+    }
+
+    /// # Summary
+    /// Transfers a given number of coins in a specified currency from one account to another by multi-agent transaction.
+    /// Transfers over a specified amount defined on-chain that are between two different VASPs, or
+    /// other accounts that have opted-in will be subject to on-chain checks to ensure the receiver has
+    /// agreed to receive the coins.  This transaction can be sent by any account that can hold a
+    /// balance, and to any account that can hold a balance. Both accounts must hold balances in the
+    /// currency being transacted.
+    ///
+    /// # Technical Description
+    ///
+    /// Transfers `amount` coins of type `Currency` from `payer` to `payee` with (optional) associated
+    /// `metadata`.
+    /// Dual attestation is not applied to this script as payee is also a signer of the transaction.
+    /// Standardized `metadata` BCS format can be found in `diem_types::transaction::metadata::Metadata`.
+    ///
+    /// # Events
+    /// Successful execution of this script emits two events:
+    /// * A `DiemAccount::SentPaymentEvent` on `payer`'s `DiemAccount::DiemAccount` `sent_events` handle; and
+    /// * A `DiemAccount::ReceivedPaymentEvent` on `payee`'s `DiemAccount::DiemAccount` `received_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                 | Type         | Description                                                                                                                  |
+    /// | ------               | ------       | -------------                                                                                                                |
+    /// | `Currency`           | Type         | The Move type for the `Currency` being sent in this transaction. `Currency` must be an already-registered currency on-chain. |
+    /// | `payer`              | `signer`     | The signer of the sending account that coins are being transferred from.                                                     |
+    /// | `payee`              | `signer`     | The signer of the receiving account that the coins are being transferred to.                                                 |
+    /// | `metadata`           | `vector<u8>` | Optional metadata about this payment.                                                                                        |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                     | Description                                                                                                                         |
+    /// | ----------------           | --------------                                   | -------------                                                                                                                       |
+    /// | `Errors::NOT_PUBLISHED`    | `DiemAccount::EPAYER_DOESNT_HOLD_CURRENCY`       | `payer` doesn't hold a balance in `Currency`.                                                                                       |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EINSUFFICIENT_BALANCE`             | `amount` is greater than `payer`'s balance in `Currency`.                                                                           |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::ECOIN_DEPOSIT_IS_ZERO`             | `amount` is zero.                                                                                                                   |
+    /// | `Errors::NOT_PUBLISHED`    | `DiemAccount::EPAYEE_DOES_NOT_EXIST`             | No account exists at the `payee` address.                                                                                           |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemAccount::EPAYEE_CANT_ACCEPT_CURRENCY_TYPE`  | An account exists at `payee`, but it does not accept payments in `Currency`.                                                        |
+    /// | `Errors::INVALID_STATE`    | `AccountFreezing::EACCOUNT_FROZEN`               | The `payee` account is frozen.                                                                                                      |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EWITHDRAWAL_EXCEEDS_LIMITS`        | `payer` has exceeded its daily withdrawal limits for the backing coins of XDX.                                                      |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemAccount::EDEPOSIT_EXCEEDS_LIMITS`           | `payee` has exceeded its daily deposit limits for XDX.                                                                              |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_child_vasp_account`
+    /// * `AccountCreationScripts::create_parent_vasp_account`
+    /// * `AccountAdministrationScripts::add_currency_to_account`
+    /// * `PaymentScripts::peer_to_peer_with_metadata`
+    public entry fun peer_to_peer_by_signers<Currency>(
+        payer: signer,
+        payee: signer,
+        amount: u64,
+        metadata: vector<u8>,
+    ) {
+        let payer_withdrawal_cap = DiemAccount::extract_withdraw_capability(&payer);
+        DiemAccount::pay_by_signers<Currency>(
+            &payer_withdrawal_cap, &payee, amount, metadata
+        );
+        DiemAccount::restore_withdraw_capability(payer_withdrawal_cap);
+    }
+
+    spec peer_to_peer_with_metadata {
+        include PeerToPeer<Currency>{payer_signer: payer};
+        include DualAttestation::AssertPaymentOkAbortsIf<Currency>{
+            payer: signer::address_of(payer),
+            value: amount
+        };
+    }
+
+    spec peer_to_peer_by_signers {
+        include PeerToPeer<Currency>{payer_signer: payer, payee: signer::address_of(payee)};
+    }
+
+    spec schema PeerToPeer<Currency> {
+        use std::errors;
+
+        payer_signer: signer;
+        payee: address;
+        amount: u64;
+        metadata: vector<u8>;
+
+        include DiemAccount::TransactionChecks{sender: payer_signer}; // properties checked by the prologue.
+        let payer_addr = signer::address_of(payer_signer);
+        let cap = DiemAccount::spec_get_withdraw_cap(payer_addr);
+        include DiemAccount::ExtractWithdrawCapAbortsIf{sender_addr: payer_addr};
+        include DiemAccount::PayFromAbortsIf<Currency>{cap: cap};
+
+        /// The balances of payer and payee change by the correct amount.
+        ensures payer_addr != payee
+            ==> DiemAccount::balance<Currency>(payer_addr)
+            == old(DiemAccount::balance<Currency>(payer_addr)) - amount;
+        ensures payer_addr != payee
+            ==> DiemAccount::balance<Currency>(payee)
+            == old(DiemAccount::balance<Currency>(payee)) + amount;
+        ensures payer_addr == payee
+            ==> DiemAccount::balance<Currency>(payee)
+            == old(DiemAccount::balance<Currency>(payee));
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_STATE,
+            errors::INVALID_ARGUMENT,
+            errors::LIMIT_EXCEEDED;
+
+        include DiemAccount::PayFromEmits<Currency>{cap: cap};
+
+        /// **Access Control:**
+        /// Both the payer and the payee must hold the balances of the Currency. Only Designated Dealers,
+        /// Parent VASPs, and Child VASPs can hold balances [[D1]][ROLE][[D2]][ROLE][[D3]][ROLE][[D4]][ROLE][[D5]][ROLE][[D6]][ROLE][[D7]][ROLE].
+        aborts_if !exists<DiemAccount::Balance<Currency>>(payer_addr) with errors::NOT_PUBLISHED;
+        aborts_if !exists<DiemAccount::Balance<Currency>>(payee) with errors::INVALID_ARGUMENT;
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/README b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/README
new file mode 100644
index 000000000..14cfd09fd
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/README
@@ -0,0 +1 @@
+This folder will contain DPN-specific Move modules.
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RecoveryAddress.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RecoveryAddress.move
new file mode 100644
index 000000000..67c47d818
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RecoveryAddress.move
@@ -0,0 +1,268 @@
+/// This module defines an account recovery mechanism that can be used by VASPs.
+module DiemFramework::RecoveryAddress {
+    use DiemFramework::DiemAccount::{Self, KeyRotationCapability};
+    use DiemFramework::VASP;
+    use std::errors;
+    use std::signer;
+    use std::vector;
+
+    /// A resource that holds the `KeyRotationCapability`s for several accounts belonging to the
+    /// same VASP. A VASP account that delegates its `KeyRotationCapability` to
+    /// but also allows the account that stores the `RecoveryAddress` resource to rotate its
+    /// authentication key.
+    /// This is useful as an account recovery mechanism: VASP accounts can all delegate their
+    /// rotation capabilities to a single `RecoveryAddress` resource stored under address A.
+    /// The authentication key for A can be "buried in the mountain" and dug up only if the need to
+    /// recover one of accounts in `rotation_caps` arises.
+    struct RecoveryAddress has key {
+        rotation_caps: vector<KeyRotationCapability>
+    }
+
+    /// Only VASPs can create a recovery address
+    const ENOT_A_VASP: u64 = 0;
+    /// A cycle would have been created would be created
+    const EKEY_ROTATION_DEPENDENCY_CYCLE: u64 = 1;
+    /// The signer doesn't have the appropriate privileges to rotate the account's key
+    const ECANNOT_ROTATE_KEY: u64 = 2;
+    /// Only accounts belonging to the same VASP can delegate their key rotation capability
+    const EINVALID_KEY_ROTATION_DELEGATION: u64 = 3;
+    /// The account address couldn't be found in the account recovery resource
+    const EACCOUNT_NOT_RECOVERABLE: u64 = 4;
+    /// A `RecoveryAddress` resource was in an unexpected state
+    const ERECOVERY_ADDRESS: u64 = 5;
+    /// The maximum allowed number of keys have been registered with this recovery address.
+    const EMAX_KEYS_REGISTERED: u64 = 6;
+
+    /// The maximum number of keys that can be registered with a single recovery address.
+    const MAX_REGISTERED_KEYS: u64 = 256;
+
+    /// Extract the `KeyRotationCapability` for `recovery_account` and publish it in a
+    /// `RecoveryAddress` resource under  `recovery_account`.
+    /// Aborts if `recovery_account` has delegated its `KeyRotationCapability`, already has a
+    /// `RecoveryAddress` resource, or is not a VASP.
+    public fun publish(recovery_account: &signer, rotation_cap: KeyRotationCapability) {
+        let addr = signer::address_of(recovery_account);
+        // Only VASPs can create a recovery address
+        assert!(VASP::is_vasp(addr), errors::invalid_argument(ENOT_A_VASP));
+        // put the rotation capability for the recovery account itself in `rotation_caps`. This
+        // ensures two things:
+        // (1) It's not possible to get into a "recovery cycle" where A is the recovery account for
+        //     B and B is the recovery account for A
+        // (2) rotation_caps is always nonempty
+        assert!(
+            *DiemAccount::key_rotation_capability_address(&rotation_cap) == addr,
+             errors::invalid_argument(EKEY_ROTATION_DEPENDENCY_CYCLE)
+        );
+        assert!(!exists<RecoveryAddress>(addr), errors::already_published(ERECOVERY_ADDRESS));
+        move_to(
+            recovery_account,
+            RecoveryAddress { rotation_caps: vector::singleton(rotation_cap) }
+        )
+    }
+    spec publish {
+        include PublishAbortsIf;
+        include PublishEnsures;
+    }
+    spec schema PublishAbortsIf {
+        recovery_account: signer;
+        rotation_cap: KeyRotationCapability;
+        let addr = signer::address_of(recovery_account);
+        aborts_if !VASP::is_vasp(addr) with errors::INVALID_ARGUMENT;
+        aborts_if spec_is_recovery_address(addr) with errors::ALREADY_PUBLISHED;
+        aborts_if DiemAccount::key_rotation_capability_address(rotation_cap) != addr
+            with errors::INVALID_ARGUMENT;
+    }
+    spec schema PublishEnsures {
+        recovery_account: signer;
+        rotation_cap: KeyRotationCapability;
+        let addr = signer::address_of(recovery_account);
+        ensures spec_is_recovery_address(addr);
+        ensures len(spec_get_rotation_caps(addr)) == 1;
+        ensures spec_get_rotation_caps(addr)[0] == rotation_cap;
+    }
+
+    /// Rotate the authentication key of `to_recover` to `new_key`. Can be invoked by either
+    /// `recovery_address` or `to_recover`.
+    /// Aborts if `recovery_address` does not have the `KeyRotationCapability` for `to_recover`.
+    public fun rotate_authentication_key(
+        account: &signer,
+        recovery_address: address,
+        to_recover: address,
+        new_key: vector<u8>
+    ) acquires RecoveryAddress {
+        // Check that `recovery_address` has a `RecoveryAddress` resource
+        assert!(exists<RecoveryAddress>(recovery_address), errors::not_published(ERECOVERY_ADDRESS));
+        let sender = signer::address_of(account);
+        assert!(
+            // The original owner of a key rotation capability can rotate its own key
+            sender == to_recover ||
+            // The owner of the `RecoveryAddress` resource can rotate any key
+            sender == recovery_address,
+            errors::invalid_argument(ECANNOT_ROTATE_KEY)
+        );
+
+        let caps = &borrow_global<RecoveryAddress>(recovery_address).rotation_caps;
+        let i = 0;
+        let len = vector::length(caps);
+        while ({
+            spec {
+                invariant i <= len;
+                invariant forall j in 0..i: caps[j].account_address != to_recover;
+            };
+            (i < len)
+        })
+        {
+            let cap = vector::borrow(caps, i);
+            if (DiemAccount::key_rotation_capability_address(cap) == &to_recover) {
+                DiemAccount::rotate_authentication_key(cap, new_key);
+                return
+            };
+            i = i + 1
+        };
+        spec {
+            assert i == len;
+            assert forall j in 0..len: caps[j].account_address != to_recover;
+        };
+        // Couldn't find `to_recover` in the account recovery resource; abort
+        abort errors::invalid_argument(EACCOUNT_NOT_RECOVERABLE)
+    }
+    spec rotate_authentication_key {
+        include RotateAuthenticationKeyAbortsIf;
+        include RotateAuthenticationKeyEnsures;
+    }
+    spec schema RotateAuthenticationKeyAbortsIf {
+        account: signer;
+        recovery_address: address;
+        to_recover: address;
+        new_key: vector<u8>;
+        aborts_if !spec_is_recovery_address(recovery_address) with errors::NOT_PUBLISHED;
+        aborts_if !DiemAccount::exists_at(to_recover) with errors::NOT_PUBLISHED;
+        aborts_if len(new_key) != 32 with errors::INVALID_ARGUMENT;
+        aborts_if !spec_holds_key_rotation_cap_for(recovery_address, to_recover) with errors::INVALID_ARGUMENT;
+        aborts_if !(signer::address_of(account) == recovery_address
+                    || signer::address_of(account) == to_recover) with errors::INVALID_ARGUMENT;
+    }
+    spec schema RotateAuthenticationKeyEnsures {
+        to_recover: address;
+        new_key: vector<u8>;
+        ensures DiemAccount::authentication_key(to_recover) == new_key;
+    }
+
+    /// Add `to_recover` to the `RecoveryAddress` resource under `recovery_address`.
+    /// Aborts if `to_recover.address` and `recovery_address` belong to different VASPs, or if
+    /// `recovery_address` does not have a `RecoveryAddress` resource.
+    public fun add_rotation_capability(to_recover: KeyRotationCapability, recovery_address: address)
+    acquires RecoveryAddress {
+        // Check that `recovery_address` has a `RecoveryAddress` resource
+        assert!(exists<RecoveryAddress>(recovery_address), errors::not_published(ERECOVERY_ADDRESS));
+        // Only accept the rotation capability if both accounts belong to the same VASP
+        let to_recover_address = *DiemAccount::key_rotation_capability_address(&to_recover);
+        assert!(
+            VASP::is_same_vasp(recovery_address, to_recover_address),
+            errors::invalid_argument(EINVALID_KEY_ROTATION_DELEGATION)
+        );
+
+        let recovery_caps = &mut borrow_global_mut<RecoveryAddress>(recovery_address).rotation_caps;
+        assert!(
+            vector::length(recovery_caps) < MAX_REGISTERED_KEYS,
+            errors::limit_exceeded(EMAX_KEYS_REGISTERED)
+        );
+
+        vector::push_back(recovery_caps, to_recover);
+    }
+    spec add_rotation_capability {
+        include AddRotationCapabilityAbortsIf;
+        include AddRotationCapabilityEnsures;
+    }
+    spec schema AddRotationCapabilityAbortsIf {
+        to_recover: KeyRotationCapability;
+        recovery_address: address;
+        aborts_if !spec_is_recovery_address(recovery_address) with errors::NOT_PUBLISHED;
+        aborts_if len(global<RecoveryAddress>(recovery_address).rotation_caps) >= MAX_REGISTERED_KEYS with errors::LIMIT_EXCEEDED;
+        let to_recover_address = DiemAccount::key_rotation_capability_address(to_recover);
+        aborts_if !VASP::spec_is_same_vasp(recovery_address, to_recover_address) with errors::INVALID_ARGUMENT;
+    }
+    spec schema AddRotationCapabilityEnsures {
+        to_recover: KeyRotationCapability;
+        recovery_address: address;
+        let post num_rotation_caps = len(spec_get_rotation_caps(recovery_address));
+        ensures spec_get_rotation_caps(recovery_address)[num_rotation_caps - 1] == to_recover;
+    }
+
+    // ****************** SPECIFICATIONS *******************
+    spec module {} // switch documentation context back to module level
+
+
+    /// # Initialization
+
+    spec module {
+        /// A RecoveryAddress has its own `KeyRotationCapability`.
+        invariant forall addr: address
+            where spec_is_recovery_address(addr): (
+                len(spec_get_rotation_caps(addr)) > 0 &&
+                spec_get_rotation_caps(addr)[0].account_address == addr
+            );
+    }
+
+    /// # Persistence of Resource
+
+    spec module {
+        invariant update
+           forall addr: address:
+               old(spec_is_recovery_address(addr)) ==> spec_is_recovery_address(addr);
+    }
+
+    /// # Persistence of KeyRotationCapability
+
+    spec module {
+        /// `RecoveryAddress` persists
+        invariant update forall addr: address where old(exists<RecoveryAddress>(addr)):
+            exists<RecoveryAddress>(addr);
+
+        /// If `recovery_addr` holds the `KeyRotationCapability` of `to_recovery_addr`
+        /// in the previous state, then it continues to hold the capability after the update.
+        invariant update
+            forall recovery_addr: address, to_recovery_addr: address
+            where old(spec_is_recovery_address(recovery_addr)):
+                old(spec_holds_key_rotation_cap_for(recovery_addr, to_recovery_addr))
+                ==> spec_holds_key_rotation_cap_for(recovery_addr, to_recovery_addr);
+    }
+
+
+    /// # Consistency Between Resources and Roles
+
+    spec module {
+        /// Only VASPs can hold `RecoverAddress` resources.
+        invariant forall addr: address
+            where spec_is_recovery_address(addr): VASP::is_vasp(addr);
+    }
+
+    /// # Helper Functions
+
+    spec module {
+        /// Returns true if `addr` is a recovery address.
+        fun spec_is_recovery_address(addr: address): bool
+        {
+            exists<RecoveryAddress>(addr)
+        }
+
+        /// Returns all the `KeyRotationCapability`s held at `recovery_address`.
+        fun spec_get_rotation_caps(recovery_address: address):
+            vector<DiemAccount::KeyRotationCapability>
+        {
+            global<RecoveryAddress>(recovery_address).rotation_caps
+        }
+
+        /// Returns true if `recovery_address` holds the
+        /// `KeyRotationCapability` for `addr`.
+        fun spec_holds_key_rotation_cap_for(
+            recovery_address: address,
+            addr: address): bool
+        {
+            exists i: u64
+                where 0 <= i && i < len(spec_get_rotation_caps(recovery_address)):
+                    spec_get_rotation_caps(recovery_address)[i].account_address == addr
+        }
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RegisteredCurrencies.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RegisteredCurrencies.move
new file mode 100644
index 000000000..db2685786
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/RegisteredCurrencies.move
@@ -0,0 +1,102 @@
+/// Module for registering currencies in Diem. Basically, this means adding a
+/// string (vector<u8>) for the currency name to vector of names in DiemConfig.
+module DiemFramework::RegisteredCurrencies {
+    use DiemFramework::DiemConfig;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::vector;
+
+    /// A DiemConfig config holding all of the currency codes for registered
+    /// currencies. The inner vector<u8>'s are string representations of
+    /// currency names.
+    struct RegisteredCurrencies has copy, drop, store {
+        currency_codes: vector<vector<u8>>,
+    }
+
+    /// Attempted to add a currency code that is already in use
+    const ECURRENCY_CODE_ALREADY_TAKEN: u64 = 0;
+
+    /// Initializes this module. Can only be called from genesis, with
+    /// a Diem root signer.
+    public fun initialize(dr_account: &signer) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_diem_root(dr_account);
+        DiemConfig::publish_new_config(
+            dr_account,
+            RegisteredCurrencies { currency_codes: vector::empty() }
+        );
+    }
+    spec initialize {
+        include InitializeAbortsIf;
+        include InitializeEnsures;
+    }
+
+    spec schema InitializeAbortsIf {
+        dr_account: signer;
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include DiemConfig::PublishNewConfigAbortsIf<RegisteredCurrencies>;
+    }
+    spec schema InitializeEnsures {
+        include DiemConfig::PublishNewConfigEnsures<RegisteredCurrencies>{
+            payload: RegisteredCurrencies { currency_codes: vector::empty() }
+        };
+        ensures len(get_currency_codes()) == 0;
+    }
+
+    /// Adds a new currency code. The currency code must not yet exist.
+    public fun add_currency_code(
+        dr_account: &signer,
+        currency_code: vector<u8>,
+    ) {
+        let config = DiemConfig::get<RegisteredCurrencies>();
+        assert!(
+            !vector::contains(&config.currency_codes, &currency_code),
+            errors::invalid_argument(ECURRENCY_CODE_ALREADY_TAKEN)
+        );
+        vector::push_back(&mut config.currency_codes, currency_code);
+        DiemConfig::set(dr_account, config);
+    }
+    spec add_currency_code {
+        include AddCurrencyCodeAbortsIf;
+        include AddCurrencyCodeEnsures;
+    }
+    spec schema AddCurrencyCodeAbortsIf {
+        dr_account: &signer;
+        currency_code: vector<u8>;
+        include DiemConfig::SetAbortsIf<RegisteredCurrencies>{ account: dr_account };
+        /// The same currency code can be only added once.
+        aborts_if contains(
+            DiemConfig::get<RegisteredCurrencies>().currency_codes,
+            currency_code
+        ) with errors::INVALID_ARGUMENT;
+    }
+    spec schema AddCurrencyCodeEnsures {
+        currency_code: vector<u8>;
+        // The resulting currency_codes is the one before this function is called, with the new one added to the end.
+        ensures vector::eq_push_back(get_currency_codes(), old(get_currency_codes()), currency_code);
+        include DiemConfig::SetEnsures<RegisteredCurrencies> {payload: DiemConfig::get<RegisteredCurrencies>()};
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // switch documentation context back to module level
+
+    /// # Initialization
+
+    spec module {
+        /// Global invariant that currency config is always available after genesis.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> DiemConfig::spec_is_published<RegisteredCurrencies>();
+    }
+
+    /// # Helper Functions
+
+    spec module {
+        /// Helper to get the currency code vector.
+        fun get_currency_codes(): vector<vector<u8>> {
+            DiemConfig::get<RegisteredCurrencies>().currency_codes
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Roles.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Roles.move
new file mode 100644
index 000000000..97fc003e9
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Roles.move
@@ -0,0 +1,610 @@
+/// This module defines role-based access control for the Diem framework.
+///
+/// Roles are associated with accounts and govern what operations are permitted by those accounts. A role
+/// is typically asserted on function entry using a statement like `Self::assert_diem_root(account)`. This
+/// module provides multiple assertion functions like this one, as well as the functions to setup roles.
+///
+/// For a conceptual discussion of roles, see the [DIP-2 document][ACCESS_CONTROL].
+module DiemFramework::Roles {
+    use DiemFramework::CoreAddresses;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::signer;
+    friend DiemFramework::DiemAccount;
+
+    #[test_only]
+    friend DiemFramework::RolesTests;
+    #[test_only]
+    friend DiemFramework::ValidatorOperatorConfigTests;
+    #[test_only]
+    friend DiemFramework::ValidatorConfigTests;
+    #[test_only]
+    friend DiemFramework::AccountLimitsTests;
+
+    /// A `RoleId` resource was in an unexpected state
+    const EROLE_ID: u64 = 0;
+    /// The signer didn't have the required Diem Root role
+    const EDIEM_ROOT: u64 = 1;
+    /// The signer didn't have the required Treasury & Compliance role
+    const ETREASURY_COMPLIANCE: u64 = 2;
+    /// The signer didn't have the required Parent VASP role
+    const EPARENT_VASP: u64 = 3;
+    /// The signer didn't have the required ParentVASP or ChildVASP role
+    const EPARENT_VASP_OR_CHILD_VASP: u64 = 4;
+    /// The signer didn't have the required Parent VASP or Designated Dealer role
+    const EPARENT_VASP_OR_DESIGNATED_DEALER: u64 = 5;
+    /// The signer didn't have the required Designated Dealer role
+    const EDESIGNATED_DEALER: u64 = 6;
+    /// The signer didn't have the required Validator role
+    const EVALIDATOR: u64 = 7;
+    /// The signer didn't have the required Validator Operator role
+    const EVALIDATOR_OPERATOR: u64 = 8;
+    /// The signer didn't have the required Child VASP role
+    const ECHILD_VASP: u64 = 9;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Role ID constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    const DIEM_ROOT_ROLE_ID: u64 = 0;
+    const TREASURY_COMPLIANCE_ROLE_ID: u64 = 1;
+    const DESIGNATED_DEALER_ROLE_ID: u64 = 2;
+    const VALIDATOR_ROLE_ID: u64 = 3;
+    const VALIDATOR_OPERATOR_ROLE_ID: u64 = 4;
+    const PARENT_VASP_ROLE_ID: u64 = 5;
+    const CHILD_VASP_ROLE_ID: u64 = 6;
+
+    /// The roleId contains the role id for the account. This is only moved
+    /// to an account as a top-level resource, and is otherwise immovable.
+    struct RoleId has key {
+        role_id: u64,
+    }
+
+    // =============
+    // Role Granting
+
+    /// Publishes diem root role. Granted only in genesis.
+    public(friend) fun grant_diem_root_role(
+        dr_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        // Checks actual Diem root because Diem root role is not set
+        // until next line of code.
+        CoreAddresses::assert_diem_root(dr_account);
+        // Grant the role to the diem root account
+        grant_role(dr_account, DIEM_ROOT_ROLE_ID);
+    }
+    spec grant_diem_root_role {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotDiemRoot{account: dr_account};
+        include GrantRole{addr: signer::address_of(dr_account), role_id: DIEM_ROOT_ROLE_ID};
+    }
+
+    /// Publishes treasury compliance role. Granted only in genesis.
+    public(friend) fun grant_treasury_compliance_role(
+        treasury_compliance_account: &signer,
+        dr_account: &signer,
+    ) acquires RoleId {
+        DiemTimestamp::assert_genesis();
+        CoreAddresses::assert_treasury_compliance(treasury_compliance_account);
+        assert_diem_root(dr_account);
+        // Grant the TC role to the treasury_compliance_account
+        grant_role(treasury_compliance_account, TREASURY_COMPLIANCE_ROLE_ID);
+    }
+    spec grant_treasury_compliance_role {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include CoreAddresses::AbortsIfNotTreasuryCompliance{account: treasury_compliance_account};
+        include AbortsIfNotDiemRoot{account: dr_account};
+        include GrantRole{addr: signer::address_of(treasury_compliance_account), role_id: TREASURY_COMPLIANCE_ROLE_ID};
+    }
+
+    /// Publishes a DesignatedDealer `RoleId` under `new_account`.
+    /// The `creating_account` must be treasury compliance.
+    public(friend) fun new_designated_dealer_role(
+        creating_account: &signer,
+        new_account: &signer,
+    ) acquires RoleId {
+        assert_treasury_compliance(creating_account);
+        grant_role(new_account, DESIGNATED_DEALER_ROLE_ID);
+    }
+    spec new_designated_dealer_role {
+        include AbortsIfNotTreasuryCompliance{account: creating_account};
+        include GrantRole{addr: signer::address_of(new_account), role_id: DESIGNATED_DEALER_ROLE_ID};
+    }
+
+    /// Publish a Validator `RoleId` under `new_account`.
+    /// The `creating_account` must be diem root.
+    public(friend) fun new_validator_role(
+        creating_account: &signer,
+        new_account: &signer
+    ) acquires RoleId {
+        assert_diem_root(creating_account);
+        grant_role(new_account, VALIDATOR_ROLE_ID);
+    }
+    spec new_validator_role {
+        include AbortsIfNotDiemRoot{account: creating_account};
+        include GrantRole{addr: signer::address_of(new_account), role_id: VALIDATOR_ROLE_ID};
+    }
+
+    /// Publish a ValidatorOperator `RoleId` under `new_account`.
+    /// The `creating_account` must be DiemRoot
+    public(friend) fun new_validator_operator_role(
+        creating_account: &signer,
+        new_account: &signer,
+    ) acquires RoleId {
+        assert_diem_root(creating_account);
+        grant_role(new_account, VALIDATOR_OPERATOR_ROLE_ID);
+    }
+    spec new_validator_operator_role {
+        include AbortsIfNotDiemRoot{account: creating_account};
+        include GrantRole{addr: signer::address_of(new_account), role_id: VALIDATOR_OPERATOR_ROLE_ID};
+    }
+
+    /// Publish a ParentVASP `RoleId` under `new_account`.
+    /// The `creating_account` must be TreasuryCompliance
+    public(friend) fun new_parent_vasp_role(
+        creating_account: &signer,
+        new_account: &signer,
+    ) acquires RoleId {
+        assert_treasury_compliance(creating_account);
+        grant_role(new_account, PARENT_VASP_ROLE_ID);
+    }
+    spec new_parent_vasp_role {
+        include AbortsIfNotTreasuryCompliance{account: creating_account};
+        include GrantRole{addr: signer::address_of(new_account), role_id: PARENT_VASP_ROLE_ID};
+    }
+
+    /// Publish a ChildVASP `RoleId` under `new_account`.
+    /// The `creating_account` must be a ParentVASP
+    public(friend) fun new_child_vasp_role(
+        creating_account: &signer,
+        new_account: &signer,
+    ) acquires RoleId {
+        assert_parent_vasp_role(creating_account);
+        grant_role(new_account, CHILD_VASP_ROLE_ID);
+    }
+    spec new_child_vasp_role {
+        include AbortsIfNotParentVasp{account: creating_account};
+        include GrantRole{addr: signer::address_of(new_account), role_id: CHILD_VASP_ROLE_ID};
+    }
+
+    /// Helper function to grant a role.
+    fun grant_role(account: &signer, role_id: u64) {
+        assert!(!exists<RoleId>(signer::address_of(account)), errors::already_published(EROLE_ID));
+        move_to(account, RoleId { role_id });
+    }
+    spec grant_role {
+        pragma opaque;
+        include GrantRole{addr: signer::address_of(account)};
+        let addr = signer::address_of(account);
+        // Requires to satisfy global invariants.
+        requires role_id == DIEM_ROOT_ROLE_ID ==> addr == @DiemRoot;
+        requires role_id == TREASURY_COMPLIANCE_ROLE_ID ==> addr == @TreasuryCompliance;
+    }
+    spec schema GrantRole {
+        addr: address;
+        role_id: num;
+        aborts_if exists<RoleId>(addr) with errors::ALREADY_PUBLISHED;
+        ensures exists<RoleId>(addr);
+        ensures global<RoleId>(addr).role_id == role_id;
+        modifies global<RoleId>(addr);
+    }
+
+    // =============
+    // Role Checking
+
+    fun has_role(account: &signer, role_id: u64): bool acquires RoleId {
+       let addr = signer::address_of(account);
+       exists<RoleId>(addr)
+           && borrow_global<RoleId>(addr).role_id == role_id
+    }
+
+    public fun has_diem_root_role(account: &signer): bool acquires RoleId {
+        has_role(account, DIEM_ROOT_ROLE_ID)
+    }
+
+    public fun has_treasury_compliance_role(account: &signer): bool acquires RoleId {
+        has_role(account, TREASURY_COMPLIANCE_ROLE_ID)
+    }
+
+    public fun has_designated_dealer_role(account: &signer): bool acquires RoleId {
+        has_role(account, DESIGNATED_DEALER_ROLE_ID)
+    }
+
+    public fun has_validator_role(account: &signer): bool acquires RoleId {
+        has_role(account, VALIDATOR_ROLE_ID)
+    }
+
+    public fun has_validator_operator_role(account: &signer): bool acquires RoleId {
+        has_role(account, VALIDATOR_OPERATOR_ROLE_ID)
+    }
+
+    public fun has_parent_VASP_role(account: &signer): bool acquires RoleId {
+        has_role(account, PARENT_VASP_ROLE_ID)
+    }
+
+    public fun has_child_VASP_role(account: &signer): bool acquires RoleId {
+        has_role(account, CHILD_VASP_ROLE_ID)
+    }
+
+    public fun get_role_id(a: address): u64 acquires RoleId {
+        assert!(exists<RoleId>(a), errors::not_published(EROLE_ID));
+        borrow_global<RoleId>(a).role_id
+    }
+
+    /// Return true if `addr` is allowed to receive and send `Diem<T>` for any T
+    public fun can_hold_balance(account: &signer): bool acquires RoleId {
+        // VASP accounts and designated_dealers can hold balances.
+        // Administrative accounts (`Validator`, `ValidatorOperator`, `TreasuryCompliance`, and
+        // `DiemRoot`) cannot.
+        has_parent_VASP_role(account) ||
+        has_child_VASP_role(account) ||
+        has_designated_dealer_role(account)
+    }
+
+    // ===============
+    // Role Assertions
+
+    /// Assert that the account is diem root.
+    public fun assert_diem_root(account: &signer) acquires RoleId {
+        CoreAddresses::assert_diem_root(account);
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        assert!(borrow_global<RoleId>(addr).role_id == DIEM_ROOT_ROLE_ID, errors::requires_role(EDIEM_ROOT));
+    }
+    spec assert_diem_root {
+        pragma opaque;
+        include CoreAddresses::AbortsIfNotDiemRoot;
+        include AbortsIfNotDiemRoot;
+    }
+
+    /// Assert that the account is treasury compliance.
+    public fun assert_treasury_compliance(account: &signer) acquires RoleId {
+        CoreAddresses::assert_treasury_compliance(account);
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(addr).role_id == TREASURY_COMPLIANCE_ROLE_ID,
+            errors::requires_role(ETREASURY_COMPLIANCE)
+        )
+    }
+    spec assert_treasury_compliance {
+        pragma opaque;
+        include AbortsIfNotTreasuryCompliance;
+    }
+
+    /// Assert that the account has the parent vasp role.
+    public fun assert_parent_vasp_role(account: &signer) acquires RoleId {
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(addr).role_id == PARENT_VASP_ROLE_ID,
+            errors::requires_role(EPARENT_VASP)
+        )
+    }
+    spec assert_parent_vasp_role {
+        pragma opaque;
+        include AbortsIfNotParentVasp;
+    }
+
+    /// Assert that the account has the child vasp role.
+    public fun assert_child_vasp_role(account: &signer) acquires RoleId {
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(addr).role_id == CHILD_VASP_ROLE_ID,
+            errors::requires_role(ECHILD_VASP)
+        )
+    }
+    spec assert_child_vasp_role {
+        pragma opaque;
+        include AbortsIfNotChildVasp{account: signer::address_of(account)};
+    }
+
+
+    /// Assert that the account has the designated dealer role.
+    public fun assert_designated_dealer(account: &signer) acquires RoleId {
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(addr).role_id == DESIGNATED_DEALER_ROLE_ID,
+            errors::requires_role(EDESIGNATED_DEALER)
+        )
+    }
+    spec assert_designated_dealer {
+        pragma opaque;
+        include AbortsIfNotDesignatedDealer;
+    }
+
+    /// Assert that the account has the validator role.
+    public fun assert_validator(validator_account: &signer) acquires RoleId {
+        let validator_addr = signer::address_of(validator_account);
+        assert!(exists<RoleId>(validator_addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(validator_addr).role_id == VALIDATOR_ROLE_ID,
+            errors::requires_role(EVALIDATOR)
+        )
+    }
+    spec assert_validator {
+        pragma opaque;
+        include AbortsIfNotValidator{account: validator_account};
+    }
+
+    /// Assert that the account has the validator operator role.
+    public fun assert_validator_operator(validator_operator_account: &signer) acquires RoleId {
+        let validator_operator_addr = signer::address_of(validator_operator_account);
+        assert!(exists<RoleId>(validator_operator_addr), errors::not_published(EROLE_ID));
+        assert!(
+            borrow_global<RoleId>(validator_operator_addr).role_id == VALIDATOR_OPERATOR_ROLE_ID,
+            errors::requires_role(EVALIDATOR_OPERATOR)
+        )
+    }
+    spec assert_validator_operator {
+        pragma opaque;
+        include AbortsIfNotValidatorOperator{account: validator_operator_account};
+    }
+
+    /// Assert that the account has either the parent vasp or designated dealer role.
+    public fun assert_parent_vasp_or_designated_dealer(account: &signer) acquires RoleId {
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        let role_id = borrow_global<RoleId>(addr).role_id;
+        assert!(
+            role_id == PARENT_VASP_ROLE_ID || role_id == DESIGNATED_DEALER_ROLE_ID,
+            errors::requires_role(EPARENT_VASP_OR_DESIGNATED_DEALER)
+        );
+    }
+    spec assert_parent_vasp_or_designated_dealer {
+        pragma opaque;
+        include AbortsIfNotParentVaspOrDesignatedDealer;
+    }
+
+    public fun assert_parent_vasp_or_child_vasp(account: &signer) acquires RoleId {
+        let addr = signer::address_of(account);
+        assert!(exists<RoleId>(addr), errors::not_published(EROLE_ID));
+        let role_id = borrow_global<RoleId>(addr).role_id;
+        assert!(
+            role_id == PARENT_VASP_ROLE_ID || role_id == CHILD_VASP_ROLE_ID,
+            errors::requires_role(EPARENT_VASP_OR_CHILD_VASP)
+        );
+    }
+    spec assert_parent_vasp_or_child_vasp {
+        pragma opaque;
+        include AbortsIfNotParentVaspOrChildVasp;
+    }
+
+
+    //**************** Module Specification ****************
+    spec module {} // switch to module documentation context
+
+    /// # Persistence of Roles
+
+    /// Once an account at an address is granted a role it will remain an account role for all time.
+    spec module {
+        invariant update
+            forall addr: address where old(exists<RoleId>(addr)):
+                exists<RoleId>(addr) && old(global<RoleId>(addr).role_id) == global<RoleId>(addr).role_id;
+    }
+
+    /// # Access Control
+
+    /// In this section, the conditions from the [requirements for access control][ACCESS_CONTROL] are systematically
+    /// applied to the functions in this module. While some of those conditions have already been
+    /// included in individual function specifications, listing them here again gives additional
+    /// assurance that that all requirements are covered.
+
+    spec module {
+        /// The DiemRoot role is only granted in genesis [[A1]][ROLE]. A new `RoleId` with `DIEM_ROOT_ROLE_ID` is only
+        /// published through `grant_diem_root_role` which aborts if it is not invoked in genesis.
+        apply ThisRoleIsNotNewlyPublished{this: DIEM_ROOT_ROLE_ID} to * except grant_diem_root_role, grant_role;
+        apply DiemTimestamp::AbortsIfNotGenesis to grant_diem_root_role;
+
+        /// TreasuryCompliance role is only granted in genesis [[A2]][ROLE]. A new `RoleId` with `TREASURY_COMPLIANCE_ROLE_ID` is only
+        /// published through `grant_treasury_compliance_role` which aborts if it is not invoked in genesis.
+        apply ThisRoleIsNotNewlyPublished{this: TREASURY_COMPLIANCE_ROLE_ID} to *
+            except grant_treasury_compliance_role, grant_role;
+        apply DiemTimestamp::AbortsIfNotGenesis to grant_treasury_compliance_role;
+
+        /// Validator roles are only granted by DiemRoot [[A3]][ROLE]. A new `RoleId` with `VALIDATOR_ROLE_ID` is only
+        /// published through `new_validator_role` which aborts if `creating_account` does not have the DiemRoot role.
+        apply ThisRoleIsNotNewlyPublished{this: VALIDATOR_ROLE_ID} to * except new_validator_role, grant_role;
+        apply AbortsIfNotDiemRoot{account: creating_account} to new_validator_role;
+
+        /// ValidatorOperator roles are only granted by DiemRoot [[A4]][ROLE]. A new `RoleId` with `VALIDATOR_OPERATOR_ROLE_ID` is only
+        /// published through `new_validator_operator_role` which aborts if `creating_account` does not have the DiemRoot role.
+        apply ThisRoleIsNotNewlyPublished{this: VALIDATOR_OPERATOR_ROLE_ID} to *
+            except new_validator_operator_role, grant_role;
+        apply AbortsIfNotDiemRoot{account: creating_account} to new_validator_operator_role;
+
+        /// DesignatedDealer roles are only granted by TreasuryCompliance [[A5]][ROLE]. A new `RoleId` with `DESIGNATED_DEALER_ROLE_ID()`
+        /// is only published through `new_designated_dealer_role` which aborts if `creating_account` does not have the
+        /// TreasuryCompliance role.
+        apply ThisRoleIsNotNewlyPublished{this: DESIGNATED_DEALER_ROLE_ID} to *
+            except new_designated_dealer_role, grant_role;
+        apply AbortsIfNotTreasuryCompliance{account: creating_account} to new_designated_dealer_role;
+
+        /// ParentVASP roles are only granted by TreasuryCompliance [[A6]][ROLE]. A new `RoleId` with `PARENT_VASP_ROLE_ID()` is only
+        /// published through `new_parent_vasp_role` which aborts if `creating_account` does not have the TreasuryCompliance role.
+        apply ThisRoleIsNotNewlyPublished{this: PARENT_VASP_ROLE_ID} to * except new_parent_vasp_role, grant_role;
+        apply AbortsIfNotTreasuryCompliance{account: creating_account} to new_parent_vasp_role;
+
+        /// ChildVASP roles are only granted by ParentVASP [[A7]][ROLE]. A new `RoleId` with `CHILD_VASP_ROLE_ID` is only
+        /// published through `new_child_vasp_role` which aborts if `creating_account` does not have the ParentVASP role.
+        apply ThisRoleIsNotNewlyPublished{this: CHILD_VASP_ROLE_ID} to * except new_child_vasp_role, grant_role;
+        apply AbortsIfNotParentVasp{account: creating_account} to new_child_vasp_role;
+
+        /// The DiemRoot role is globally unique [[B1]][ROLE], and is published at DIEM_ROOT_ADDRESS [[C1]][ROLE].
+        /// In other words, a `RoleId` with `DIEM_ROOT_ROLE_ID` uniquely exists at `DIEM_ROOT_ADDRESS`.
+        invariant forall addr: address where spec_has_diem_root_role_addr(addr): addr == @DiemRoot;
+        invariant [suspendable]
+            DiemTimestamp::is_operating() ==> spec_has_diem_root_role_addr(@DiemRoot);
+
+        /// The TreasuryCompliance role is globally unique [[B2]][ROLE], and is published at TREASURY_COMPLIANCE_ADDRESS [[C2]][ROLE].
+        /// In other words, a `RoleId` with `TREASURY_COMPLIANCE_ROLE_ID` uniquely exists at `TREASURY_COMPLIANCE_ADDRESS`.
+        invariant forall addr: address where spec_has_treasury_compliance_role_addr(addr):
+          addr == @TreasuryCompliance;
+        invariant [suspendable]
+            DiemTimestamp::is_operating() ==> spec_has_treasury_compliance_role_addr(@TreasuryCompliance);
+
+        // TODO: These specs really just repeat what's in spec_can_hold_balance_addr. It's nice to
+        // be able to link to DIP-2, but can we do that with less verbose specs?
+        /// DiemRoot cannot have balances [[D1]][ROLE].
+        invariant forall addr: address
+            where spec_has_diem_root_role_addr(addr): !spec_can_hold_balance_addr(addr);
+
+        /// TreasuryCompliance cannot have balances [[D2]][ROLE].
+        invariant forall addr: address
+            where spec_has_treasury_compliance_role_addr(addr): !spec_can_hold_balance_addr(addr);
+
+        /// Validator cannot have balances [[D3]][ROLE].
+        invariant forall addr: address
+            where spec_has_validator_role_addr(addr): !spec_can_hold_balance_addr(addr);
+
+        /// ValidatorOperator cannot have balances [[D4]][ROLE].
+        invariant forall addr: address
+            where spec_has_validator_operator_role_addr(addr): !spec_can_hold_balance_addr(addr);
+
+        /// DesignatedDealer have balances [[D5]][ROLE].
+        invariant forall addr: address
+            where spec_has_designated_dealer_role_addr(addr): spec_can_hold_balance_addr(addr);
+
+        /// ParentVASP have balances [[D6]][ROLE].
+        invariant forall addr: address
+            where spec_has_parent_VASP_role_addr(addr): spec_can_hold_balance_addr(addr);
+
+        /// ChildVASP have balances [[D7]][ROLE].
+        invariant forall addr: address
+            where spec_has_child_VASP_role_addr(addr): spec_can_hold_balance_addr(addr);
+    }
+
+    /// # Helper Functions and Schemas
+
+    spec module {
+        fun spec_get_role_id(addr: address): u64 {
+            global<RoleId>(addr).role_id
+        }
+
+        fun spec_has_role_id_addr(addr: address, role_id: u64): bool {
+            exists<RoleId>(addr) && global<RoleId>(addr).role_id == role_id
+        }
+
+        fun spec_has_diem_root_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, DIEM_ROOT_ROLE_ID)
+        }
+
+        fun spec_has_treasury_compliance_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, TREASURY_COMPLIANCE_ROLE_ID)
+        }
+
+        fun spec_has_designated_dealer_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, DESIGNATED_DEALER_ROLE_ID)
+        }
+
+        fun spec_has_validator_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, VALIDATOR_ROLE_ID)
+        }
+
+        fun spec_has_validator_operator_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, VALIDATOR_OPERATOR_ROLE_ID)
+        }
+
+        fun spec_has_parent_VASP_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, PARENT_VASP_ROLE_ID)
+        }
+
+        fun spec_has_child_VASP_role_addr(addr: address): bool {
+            spec_has_role_id_addr(addr, CHILD_VASP_ROLE_ID)
+        }
+
+        fun spec_can_hold_balance_addr(addr: address): bool {
+            spec_has_parent_VASP_role_addr(addr) ||
+                spec_has_child_VASP_role_addr(addr) ||
+                spec_has_designated_dealer_role_addr(addr)
+        }
+
+        fun spec_signed_by_treasury_compliance_role(): bool {
+            exists a: address: signer::is_txn_signer_addr(a) && spec_has_treasury_compliance_role_addr(a)
+        }
+
+        fun spec_signed_by_diem_root_role(): bool {
+            exists a: address: signer::is_txn_signer_addr(a) && spec_has_diem_root_role_addr(a)
+        }
+    }
+
+    spec schema ThisRoleIsNotNewlyPublished {
+        this: u64;
+        ensures forall addr: address where exists<RoleId>(addr) && global<RoleId>(addr).role_id == this:
+            old(exists<RoleId>(addr)) && old(global<RoleId>(addr).role_id) == this;
+    }
+
+    spec schema AbortsIfNotDiemRoot {
+        account: signer;
+        include CoreAddresses::AbortsIfNotDiemRoot;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != DIEM_ROOT_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotTreasuryCompliance {
+        account: signer;
+        include CoreAddresses::AbortsIfNotTreasuryCompliance;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != TREASURY_COMPLIANCE_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotParentVasp {
+        account: signer;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != PARENT_VASP_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotChildVasp {
+        account: address;
+        aborts_if !exists<RoleId>(account) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(account).role_id != CHILD_VASP_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotDesignatedDealer {
+        account: signer;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != DESIGNATED_DEALER_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotParentVaspOrDesignatedDealer {
+        account: signer;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        let role_id = global<RoleId>(addr).role_id;
+        aborts_if role_id != PARENT_VASP_ROLE_ID && role_id != DESIGNATED_DEALER_ROLE_ID
+            with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotParentVaspOrChildVasp {
+        account: signer;
+        let addr = signer::address_of(account);
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        let role_id = global<RoleId>(addr).role_id;
+        aborts_if role_id != PARENT_VASP_ROLE_ID && role_id != CHILD_VASP_ROLE_ID
+            with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotValidator {
+        account: signer;
+        let addr = signer::address_of(account);
+        //validator_addr: address;
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != VALIDATOR_ROLE_ID with errors::REQUIRES_ROLE;
+    }
+
+    spec schema AbortsIfNotValidatorOperator {
+        account: signer;
+        let addr = signer::address_of(account);
+        //validator_operator_addr: address;
+        aborts_if !exists<RoleId>(addr) with errors::NOT_PUBLISHED;
+        aborts_if global<RoleId>(addr).role_id != VALIDATOR_OPERATOR_ROLE_ID
+            with errors::REQUIRES_ROLE;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SharedEd25519PublicKey.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SharedEd25519PublicKey.move
new file mode 100644
index 000000000..9127ccd11
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SharedEd25519PublicKey.move
@@ -0,0 +1,149 @@
+/// Each address that holds a `SharedEd25519PublicKey` resource can rotate the public key stored in
+/// this resource, but the account's authentication key will be updated in lockstep. This ensures
+/// that the two keys always stay in sync.
+module DiemFramework::SharedEd25519PublicKey {
+    use DiemFramework::Authenticator;
+    use DiemFramework::DiemAccount;
+    use DiemFramework::Signature;
+    use std::errors;
+    use std::signer;
+
+    /// A resource that forces the account associated with `rotation_cap` to use a ed25519
+    /// authentication key derived from `key`
+    struct SharedEd25519PublicKey has key {
+        /// 32 byte ed25519 public key
+        key: vector<u8>,
+        /// rotation capability for an account whose authentication key is always derived from `key`
+        rotation_cap: DiemAccount::KeyRotationCapability,
+    }
+
+    /// The shared ed25519 public key is not valid ed25519 public key
+    const EMALFORMED_PUBLIC_KEY: u64 = 0;
+    /// A shared ed25519 public key resource was not in the required state
+    const ESHARED_KEY: u64 = 1;
+
+    /// (1) Rotate the authentication key of the sender to `key`
+    /// (2) Publish a resource containing a 32-byte ed25519 public key and the rotation capability
+    ///     of the sender under the `account`'s address.
+    /// Aborts if the sender already has a `SharedEd25519PublicKey` resource.
+    /// Aborts if the length of `new_public_key` is not 32.
+    public fun publish(account: &signer, key: vector<u8>) {
+        let t = SharedEd25519PublicKey {
+            key: x"",
+            rotation_cap: DiemAccount::extract_key_rotation_capability(account)
+        };
+        rotate_key_(&mut t, key);
+        assert!(!exists_at(signer::address_of(account)), errors::already_published(ESHARED_KEY));
+        move_to(account, t);
+    }
+    spec publish {
+        include PublishAbortsIf;
+        include PublishEnsures;
+    }
+    spec schema PublishAbortsIf {
+        account: signer;
+        key: vector<u8>;
+        let addr = signer::address_of(account);
+        include DiemAccount::ExtractKeyRotationCapabilityAbortsIf;
+        include RotateKey_AbortsIf {
+                shared_key: SharedEd25519PublicKey {
+                    key: x"",
+                    rotation_cap: DiemAccount::spec_get_key_rotation_cap(addr)
+                },
+                new_public_key: key
+        };
+        aborts_if exists_at(addr) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema PublishEnsures {
+        account: signer;
+        key: vector<u8>;
+        let addr = signer::address_of(account);
+
+        ensures exists_at(addr);
+        include RotateKey_Ensures { shared_key: global<SharedEd25519PublicKey>(addr), new_public_key: key};
+    }
+
+    fun rotate_key_(shared_key: &mut SharedEd25519PublicKey, new_public_key: vector<u8>) {
+        // Cryptographic check of public key validity
+        assert!(
+            Signature::ed25519_validate_pubkey(copy new_public_key),
+            errors::invalid_argument(EMALFORMED_PUBLIC_KEY)
+        );
+        DiemAccount::rotate_authentication_key(
+            &shared_key.rotation_cap,
+            Authenticator::ed25519_authentication_key(copy new_public_key)
+        );
+        shared_key.key = new_public_key;
+    }
+    spec rotate_key_ {
+        include RotateKey_AbortsIf;
+        include RotateKey_Ensures;
+    }
+    spec schema RotateKey_AbortsIf {
+        shared_key: SharedEd25519PublicKey;
+        new_public_key: vector<u8>;
+        aborts_if !Signature::ed25519_validate_pubkey(new_public_key) with errors::INVALID_ARGUMENT;
+        include DiemAccount::RotateAuthenticationKeyAbortsIf {
+            cap: shared_key.rotation_cap,
+            new_authentication_key: Authenticator::spec_ed25519_authentication_key(new_public_key)
+        };
+    }
+    spec schema RotateKey_Ensures {
+        shared_key: SharedEd25519PublicKey;
+        new_public_key: vector<u8>;
+        ensures shared_key.key == new_public_key;
+    }
+
+    /// (1) rotate the public key stored `account`'s `SharedEd25519PublicKey` resource to
+    /// `new_public_key`
+    /// (2) rotate the authentication key using the capability stored in the `account`'s
+    /// `SharedEd25519PublicKey` to a new value derived from `new_public_key`
+    /// Aborts if the sender does not have a `SharedEd25519PublicKey` resource.
+    /// Aborts if the length of `new_public_key` is not 32.
+    public fun rotate_key(account: &signer, new_public_key: vector<u8>) acquires SharedEd25519PublicKey {
+        let addr = signer::address_of(account);
+        assert!(exists_at(addr), errors::not_published(ESHARED_KEY));
+        rotate_key_(borrow_global_mut<SharedEd25519PublicKey>(addr), new_public_key);
+    }
+    spec rotate_key {
+        include RotateKeyAbortsIf;
+        include RotateKeyEnsures;
+    }
+    spec schema RotateKeyAbortsIf {
+        account: signer;
+        new_public_key: vector<u8>;
+        let addr = signer::address_of(account);
+        aborts_if !exists_at(addr) with errors::NOT_PUBLISHED;
+        include RotateKey_AbortsIf {shared_key: global<SharedEd25519PublicKey>(addr)};
+    }
+    spec schema RotateKeyEnsures {
+        account: signer;
+        new_public_key: vector<u8>;
+        let addr = signer::address_of(account);
+        include RotateKey_Ensures {shared_key: global<SharedEd25519PublicKey>(addr)};
+    }
+
+    /// Return the public key stored under `addr`.
+    /// Aborts if `addr` does not hold a `SharedEd25519PublicKey` resource.
+    public fun key(addr: address): vector<u8> acquires SharedEd25519PublicKey {
+        assert!(exists_at(addr), errors::not_published(ESHARED_KEY));
+        *&borrow_global<SharedEd25519PublicKey>(addr).key
+    }
+
+    /// Returns true if `addr` holds a `SharedEd25519PublicKey` resource.
+    public fun exists_at(addr: address): bool {
+        exists<SharedEd25519PublicKey>(addr)
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Persistence
+    spec module {
+        invariant update forall addr: address where old(exists<SharedEd25519PublicKey>(addr)):
+            exists<SharedEd25519PublicKey>(addr);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Signature.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Signature.move
new file mode 100644
index 000000000..df6996b40
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/Signature.move
@@ -0,0 +1,24 @@
+/// Contains functions for [ed25519](https://en.wikipedia.org/wiki/EdDSA) digital signatures.
+module DiemFramework::Signature {
+
+    /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key.
+    /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass
+    /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type
+    /// for more details.
+    /// Does not abort.
+    native public fun ed25519_validate_pubkey(public_key: vector<u8>): bool;
+
+    /// Return true if the Ed25519 `signature` on `message` verifies against the Ed25519 public key
+    /// `public_key`.
+    /// Returns `false` if:
+    /// - `signature` is not 64 bytes
+    /// - `public_key` is not 32 bytes
+    /// - `public_key` does not pass points-on-curve or small subgroup checks,
+    /// - `signature` and `public_key` are valid, but the signature on `message` does not verify.
+    /// Does not abort.
+    native public fun ed25519_verify(
+        signature: vector<u8>,
+        public_key: vector<u8>,
+        message: vector<u8>
+    ): bool;
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SlidingNonce.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SlidingNonce.move
new file mode 100644
index 000000000..274602ae0
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SlidingNonce.move
@@ -0,0 +1,296 @@
+/// Allows transactions to be executed out-of-order while ensuring that they are executed at most once.
+/// Nonces are assigned to transactions off-chain by clients submitting the transactions.
+/// It maintains a sliding window bitvector of 128 flags.  A flag of 0 indicates that the transaction
+/// with that nonce has not yet been executed.
+/// When nonce X is recorded, all transactions with nonces lower then X-128 will abort.
+module DiemFramework::SlidingNonce {
+    use std::signer;
+    use std::errors;
+    friend DiemFramework::DiemAccount;
+
+    struct SlidingNonce has key {
+        /// Minimum nonce in sliding window. All transactions with smaller
+        /// nonces will be automatically rejected, since the window cannot
+        /// tell whether they have been executed or not.
+        min_nonce: u64,
+        /// Bit-vector of window of nonce values
+        nonce_mask: u128,
+    }
+
+    /// The `SlidingNonce` resource is in an invalid state
+    const ESLIDING_NONCE: u64 = 0;
+    /// The nonce aborted because it's too old (nonce smaller than `min_nonce`)
+    const ENONCE_TOO_OLD: u64 = 1;
+    /// The nonce is too large - this protects against nonce exhaustion
+    const ENONCE_TOO_NEW: u64 = 2;
+    /// The nonce was already recorded previously
+    const ENONCE_ALREADY_RECORDED: u64 = 3;
+    /// The sliding nonce resource was already published
+    const ENONCE_ALREADY_PUBLISHED: u64 = 4;
+
+    /// Size of SlidingNonce::nonce_mask in bits.
+    const NONCE_MASK_SIZE: u64 = 128;
+
+    /// Calls `try_record_nonce` and aborts transaction if returned code is non-0
+    public fun record_nonce_or_abort(account: &signer, seq_nonce: u64) acquires SlidingNonce {
+        let code = try_record_nonce(account, seq_nonce);
+        assert!(code == 0, errors::invalid_argument(code));
+    }
+
+    spec record_nonce_or_abort {
+        include RecordNonceAbortsIf;
+    }
+
+    spec schema RecordNonceAbortsIf {
+        account: signer;
+        seq_nonce: u64;
+        aborts_if !exists<SlidingNonce>(signer::address_of(account)) with errors::NOT_PUBLISHED;
+        aborts_if spec_try_record_nonce(account, seq_nonce) != 0 with errors::INVALID_ARGUMENT;
+    }
+
+    /// # Explanation of the Algorithm
+    ///
+    /// We have an "infinite" bitvector. The `min_nonce` tells us the starting
+    /// index of the window. The window size is the size of the bitmask we can
+    /// represent in a 128-bit wide bitmap. The `seq_nonce` that is sent represents
+    /// setting a bit at index `seq_nonce` in this infinite bitvector. Because of
+    /// this, if the same `seq_nonce` is passed in multiple times, that bit will be
+    /// set, and we can signal an error. In order to represent
+    /// the `seq_nonce` the window we are looking at must be shifted so that
+    /// `seq_nonce` lies within that 128-bit window and, since the `min_nonce`
+    /// represents the left-hand-side of this window, it must be increased to be no
+    /// less than `seq_nonce - 128`.
+    ///
+    /// The process of shifting window will invalidate other transactions that
+    /// have a `seq_nonce` number that are to the "left" of this window (i.e., less
+    /// than `min_nonce`) since it cannot be represented in the current window, and the
+    /// window can only move forward and never backwards.
+    ///
+    /// In order to prevent shifting this window over too much at any one time, a
+    /// `jump_limit` is imposed. If a `seq_nonce` is provided that would cause the
+    /// `min_nonce` to need to be increased by more than the `jump_limit` this will
+    /// cause a failure.
+    ///
+    /// # Some Examples
+    ///
+    /// Let's say we start out with a clean `SlidingNonce` published under `account`,
+    /// this will look like this:
+    /// ```
+    /// 000000000000000000...00000000000000000000000000000...
+    /// ^             ...                ^
+    /// |_____________...________________|
+    /// min_nonce = 0             min_nonce + NONCE_MASK_SIZE = 0 + 64 = 64
+    /// ```
+    ///
+    /// # Example 1:
+    ///
+    /// Let's see what happens when we call`SlidingNonce::try_record_nonce(account, 8)`:
+    ///
+    /// 1. Determine the bit position w.r.t. the current window:
+    ///     ```
+    ///     bit_pos = 8 - min_nonce ~~~ 8 - 0 = 8
+    ///     ```
+    /// 2. See if the bit position that was calculated is not within the current window:
+    ///     ```
+    ///     bit_pos >= NONCE_MASK_SIZE ~~~ 8 >= 128 = FALSE
+    ///     ```
+    /// 3. `bit_pos` is in window, so set the 8'th bit in the window:
+    /// ```
+    /// 000000010000000000...00000000000000000000000000000...
+    /// ^             ...                ^
+    /// |_____________...________________|
+    /// min_nonce = 0             min_nonce + NONCE_MASK_SIZE = 0 + 64 = 64
+    /// ```
+    ///
+    /// # Example 2:
+    ///
+    /// Let's see what happens when we call `SlidingNonce::try_record_nonce(account, 129)`:
+    ///
+    /// 1. Figure out the bit position w.r.t. the current window:
+    ///     ```
+    ///     bit_pos = 129 - min_nonce ~~~ 129 - 0 = 129
+    ///     ```
+    /// 2. See if bit position calculated is not within the current window starting at `min_nonce`:
+    ///     ```
+    ///     bit_pos >= NONCE_MASK_SIZE ~~~ 129 >= 128 = TRUE
+    ///     ```
+    /// 3. `bit_pos` is outside of the current window. So we need to shift the window over. Now calculate the amount that
+    ///    the window needs to be shifted over (i.e., the amount that `min_nonce` needs to be increased by) so that
+    ///    `seq_nonce` lies within the `NONCE_MASK_SIZE` window starting at `min_nonce`.
+    /// 3a. Calculate the amount that the window needs to be shifted for `bit_pos` to lie within it:
+    ///     ```
+    ///     shift = bit_pos - NONCE_MASK_SIZE + 1 ~~~ 129 - 128 + 1 = 2
+    ///     ```
+    /// 3b. See if there is no overlap between the new window that we need to shift to and the old window:
+    ///     ```
+    ///     shift >= NONCE_MASK_SIZE ~~~ 2 >= 128 = FALSE
+    ///     ```
+    /// 3c. Since there is an overlap between the new window that we need to shift to and the previous
+    ///     window, shift the window over, but keep the current set bits in the overlapping part of the window:
+    ///     ```
+    ///     nonce_mask = nonce_mask >> shift; min_nonce += shift;
+    ///     ```
+    /// 4. Now that the window has been shifted over so that the `seq_nonce` index lies within the new window we
+    ///    recompute the `bit_pos` w.r.t. to it (recall `min_nonce` was updated):
+    ///     ```
+    ///     bit_pos = seq - min_nonce ~~~ 129 - 2 = 127
+    ///     ```
+    /// 5. We set the bit_pos position bit within the new window:
+    /// ```
+    /// 00000001000000000000000...000000000000000000000000000000000000000000010...
+    ///        ^               ...                                           ^^
+    ///        |               ...                                           ||
+    ///        |               ...                                 new_set_bit|
+    ///        |_______________...____________________________________________|
+    ///      min_nonce = 2                            min_nonce + NONCE_MASK_SIZE = 2 + 128 = 130
+    ///  ```
+    ///
+    /// # Example 3:
+    ///
+    /// Let's see what happens when we call `SlidingNonce::try_record_nonce(account, 400)`:
+    ///
+    /// 1. Figure out the bit position w.r.t. the current window:
+    ///     ```
+    ///     bit_pos = 400 - min_nonce ~~~ 400 - 2 = 398
+    ///     ```
+    /// 2. See if bit position calculated is not within the current window:
+    ///     ```
+    ///     bit_pos >= NONCE_MASK_SIZE ~~~ 398 >= 128 = TRUE
+    ///     ```
+    /// 3. `bit_pos` is out of the window. Now calculate the amount that
+    ///    the window needs to be shifted over (i.e., that `min_nonce` needs to be incremented) so
+    ///    `seq_nonce` lies within the `NONCE_MASK_SIZE` window starting at min_nonce.
+    /// 3a. Calculate the amount that the window needs to be shifted for `bit_pos` to lie within it:
+    ///     ```
+    ///     shift = bit_pos - NONCE_MASK_SIZE + 1 ~~~ 398 - 128 + 1 = 271
+    ///     ```
+    /// 3b. See if there is no overlap between the new window that we need to shift to and the old window:
+    ///     ```
+    ///     shift >= NONCE_MASK_SIZE ~~~ 271 >= 128 = TRUE
+    ///     ```
+    /// 3c. Since there is no overlap between the new window that we need to shift to and the previous
+    ///     window we zero out the bitmap, and update the `min_nonce` to start at the out-of-range `seq_nonce`:
+    ///     ```
+    ///     nonce_mask = 0; min_nonce = seq_nonce + 1 - NONCE_MASK_SIZE = 273;
+    ///     ```
+    /// 4. Now that the window has been shifted over so that the `seq_nonce` index lies within the window we
+    ///    recompute the bit_pos:
+    ///     ```
+    ///     bit_pos = seq_nonce - min_nonce ~~~ 400 - 273 = 127
+    ///     ```
+    /// 5. We set the bit_pos position bit within the new window:
+    /// ```
+    /// ...00000001000000000000000...000000000000000000000000000000000000000000010...
+    ///           ^               ...                                           ^^
+    ///           |               ...                                           ||
+    ///           |               ...                                 new_set_bit|
+    ///           |_______________...____________________________________________|
+    ///         min_nonce = 273                          min_nonce + NONCE_MASK_SIZE = 273 + 128 = 401
+    /// ```
+    /// Tries to record this nonce in the account.
+    /// Returns 0 if a nonce was recorded and non-0 otherwise
+    public fun try_record_nonce(account: &signer, seq_nonce: u64): u64 acquires SlidingNonce {
+        if (seq_nonce == 0) {
+            return 0
+        };
+        assert!(exists<SlidingNonce>(signer::address_of(account)), errors::not_published(ESLIDING_NONCE));
+        let t = borrow_global_mut<SlidingNonce>(signer::address_of(account));
+        // The `seq_nonce` is outside the current window to the "left" and is
+        // no longer valid since we can't shift the window back.
+        if (t.min_nonce > seq_nonce) {
+            return ENONCE_TOO_OLD
+        };
+        // Don't allow giant leaps in nonce to protect against nonce exhaustion
+        // If we try to move a window by more than this amount, we will fail.
+        let jump_limit = 10000;
+        if (t.min_nonce + jump_limit <= seq_nonce) {
+            return ENONCE_TOO_NEW
+        };
+        // Calculate The bit position in the window that will be set in our window
+        let bit_pos = seq_nonce - t.min_nonce;
+
+        // See if the bit position that we want to set lies outside the current
+        // window that we have under the current `min_nonce`.
+        if (bit_pos >= NONCE_MASK_SIZE) {
+            // Determine how much we need to shift the current window over (to
+            // the "right") so that `bit_pos` lies within the new window.
+            let shift = (bit_pos - NONCE_MASK_SIZE + 1);
+
+            // If we are shifting the window over by more than one window's width
+            // reset the bits in the window, and update the
+            // new start of the `min_nonce` so that `seq_nonce` is the
+            // right-most bit in the new window.
+            if(shift >= NONCE_MASK_SIZE) {
+                t.nonce_mask = 0;
+                t.min_nonce = seq_nonce + 1 - NONCE_MASK_SIZE;
+            } else {
+                // We are shifting the window over by less than a windows width,
+                // so we need to keep the current set bits in the window
+                t.nonce_mask = t.nonce_mask >> (shift as u8);
+                t.min_nonce = t.min_nonce + shift;
+            }
+        };
+        // The window has been (possibly) shifted over so that `seq_nonce` lies
+        // within the window. Recompute the bit positition that needs to be set
+        // within the (possibly) new window.
+        let bit_pos = seq_nonce - t.min_nonce;
+        let set = 1u128 << (bit_pos as u8);
+        // The bit was already set, so return an error.
+        if (t.nonce_mask & set != 0) {
+            return ENONCE_ALREADY_RECORDED
+        };
+        t.nonce_mask = t.nonce_mask | set;
+        0
+    }
+
+    spec try_record_nonce {
+        /// It is currently assumed that this function raises no arithmetic overflow/underflow.
+        /// >Note: Verification is turned off. For verifying callers, this is effectively abstracted into a function
+        /// that returns arbitrary results because `spec_try_record_nonce` is uninterpreted.
+        pragma opaque, verify = false;
+        aborts_if !exists<SlidingNonce>(signer::address_of(account)) with errors::NOT_PUBLISHED;
+        modifies global<SlidingNonce>(signer::address_of(account));
+        ensures result == spec_try_record_nonce(account, seq_nonce);
+        ensures exists<SlidingNonce>(signer::address_of(account));
+    }
+
+    /// Specification version of `Self::try_record_nonce`.
+    spec fun spec_try_record_nonce(account: signer, seq_nonce: u64): u64;
+
+    /// Publishes nonce resource for `account`
+    /// This is required before other functions in this module can be called for `account`
+    public(friend) fun publish(account: &signer) {
+        assert!(!exists<SlidingNonce>(signer::address_of(account)), errors::already_published(ENONCE_ALREADY_PUBLISHED));
+        move_to(account, SlidingNonce {  min_nonce: 0, nonce_mask: 0 });
+    }
+    spec publish {
+        pragma opaque;
+        modifies global<SlidingNonce>(signer::address_of(account));
+        aborts_if exists<SlidingNonce>(signer::address_of(account)) with errors::ALREADY_PUBLISHED;
+        ensures exists<SlidingNonce>(signer::address_of(account));
+        ensures global<SlidingNonce>(signer::address_of(account)).min_nonce == 0;
+        ensures global<SlidingNonce>(signer::address_of(account)).nonce_mask == 0;
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    spec module {
+        use DiemFramework::DiemTimestamp;
+
+        /// Sliding nonces are initialized at Diem root and treasury compliance addresses
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> exists<SlidingNonce>(@DiemRoot);
+
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> exists<SlidingNonce>(@TreasuryCompliance);
+
+        // In the current code, only Diem root and Treasury compliance have sliding nonces.
+        // That is a difficult cross-module invariant to prove (it depends on Genesis and
+        // DiemAccount). Additional modules could be added that call the publish functions
+        // in this module to publish sliding nonces on other accounts.  Anyway, this property
+        // is probably not very important.
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SystemAdministrationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SystemAdministrationScripts.move
new file mode 100644
index 000000000..f185964a2
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/SystemAdministrationScripts.move
@@ -0,0 +1,163 @@
+/// This module contains Diem Framework script functions to administer the
+/// network outside of validators and validator operators.
+module DiemFramework::SystemAdministrationScripts {
+    use DiemFramework::DiemConsensusConfig;
+    use DiemFramework::DiemVersion;
+    use DiemFramework::DiemVMConfig;
+    use DiemFramework::SlidingNonce;
+
+    ///  # Summary
+    /// Updates the Diem major version that is stored on-chain and is used by the VM.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the `DiemVersion` on-chain config and emits a `DiemConfig::NewEpochEvent` to trigger
+    /// a reconfiguration of the system. The `major` version that is passed in must be strictly greater
+    /// than the current major version held on-chain. The VM reads this information and can use it to
+    /// preserve backwards compatibility with previous major versions of the VM.
+    ///
+    /// # Parameters
+    /// | Name            | Type     | Description                                                                |
+    /// | ------          | ------   | -------------                                                              |
+    /// | `account`       | `signer` | Signer of the sending account. Must be the Diem Root account.              |
+    /// | `sliding_nonce` | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    /// | `major`         | `u64`    | The `major` version of the VM to be used from this transaction on.         |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`       | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemVersion::EINVALID_MAJOR_VERSION_NUMBER`  | `major` is less-than or equal to the current major version stored on-chain.                |
+
+    public entry fun update_diem_version(account: signer, sliding_nonce: u64, major: u64) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        DiemVersion::set(&account, major)
+    }
+
+    /// # Summary
+    /// Updates the gas constants stored on chain and used by the VM for gas
+    /// metering. This transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the on-chain config holding the `DiemVMConfig` and emits a
+    /// `DiemConfig::NewEpochEvent` to trigger a reconfiguration of the system.
+    ///
+    /// # Parameters
+    /// | Name                                | Type     | Description                                                                                            |
+    /// | ------                              | ------   | -------------                                                                                          |
+    /// | `account`                           | `signer` | Signer of the sending account. Must be the Diem Root account.                                          |
+    /// | `sliding_nonce`                     | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                             |
+    /// | `global_memory_per_byte_cost`       | `u64`    | The new cost to read global memory per-byte to be used for gas metering.                               |
+    /// | `global_memory_per_byte_write_cost` | `u64`    | The new cost to write global memory per-byte to be used for gas metering.                              |
+    /// | `min_transaction_gas_units`         | `u64`    | The new flat minimum amount of gas required for any transaction.                                       |
+    /// | `large_transaction_cutoff`          | `u64`    | The new size over which an additional charge will be assessed for each additional byte.                |
+    /// | `intrinsic_gas_per_byte`            | `u64`    | The new number of units of gas that to be charged per-byte over the new `large_transaction_cutoff`.    |
+    /// | `maximum_number_of_gas_units`       | `u64`    | The new maximum number of gas units that can be set in a transaction.                                  |
+    /// | `min_price_per_gas_unit`            | `u64`    | The new minimum gas price that can be set for a transaction.                                           |
+    /// | `max_price_per_gas_unit`            | `u64`    | The new maximum gas price that can be set for a transaction.                                           |
+    /// | `max_transaction_size_in_bytes`     | `u64`    | The new maximum size of a transaction that can be processed.                                           |
+    /// | `gas_unit_scaling_factor`           | `u64`    | The new scaling factor to use when scaling between external and internal gas units.                    |
+    /// | `default_account_size`              | `u64`    | The new default account size to use when assessing final costs for reads and writes to global storage. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                | Description                                                                                |
+    /// | ----------------           | --------------                              | -------------                                                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemVMConfig::EGAS_CONSTANT_INCONSISTENCY` | The provided gas constants are inconsistent.                                               |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`              | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`              | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`              | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`     | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                 | `account` is not the Diem Root account.                                                    |
+    public entry fun set_gas_constants(
+        dr_account: signer,
+        sliding_nonce: u64,
+        global_memory_per_byte_cost: u64,
+        global_memory_per_byte_write_cost: u64,
+        min_transaction_gas_units: u64,
+        large_transaction_cutoff: u64,
+        intrinsic_gas_per_byte: u64,
+        maximum_number_of_gas_units: u64,
+        min_price_per_gas_unit: u64,
+        max_price_per_gas_unit: u64,
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        DiemVMConfig::set_gas_constants(
+                &dr_account,
+                global_memory_per_byte_cost,
+                global_memory_per_byte_write_cost,
+                min_transaction_gas_units,
+                large_transaction_cutoff,
+                intrinsic_gas_per_byte,
+                maximum_number_of_gas_units,
+                min_price_per_gas_unit,
+                max_price_per_gas_unit,
+                max_transaction_size_in_bytes,
+                gas_unit_scaling_factor,
+                default_account_size,
+        )
+    }
+
+    ///  # Summary
+    /// Initializes the Diem consensus config that is stored on-chain.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Initializes the `DiemConsensusConfig` on-chain config to empty and allows future updates from DiemRoot via
+    /// `update_diem_consensus_config`. This doesn't emit a `DiemConfig::NewEpochEvent`.
+    ///
+    /// # Parameters
+    /// | Name            | Type      | Description                                                                |
+    /// | ------          | ------    | -------------                                                              |
+    /// | `account`       | `signer` | Signer of the sending account. Must be the Diem Root account.               |
+    /// | `sliding_nonce` | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`       | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+
+    public entry fun initialize_diem_consensus_config(account: signer, sliding_nonce: u64) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        DiemConsensusConfig::initialize(&account);
+    }
+
+    ///  # Summary
+    /// Updates the Diem consensus config that is stored on-chain and is used by the Consensus.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the `DiemConsensusConfig` on-chain config and emits a `DiemConfig::NewEpochEvent` to trigger
+    /// a reconfiguration of the system.
+    ///
+    /// # Parameters
+    /// | Name            | Type          | Description                                                                |
+    /// | ------          | ------        | -------------                                                              |
+    /// | `account`       | `signer`      | Signer of the sending account. Must be the Diem Root account.              |
+    /// | `sliding_nonce` | `u64`         | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    /// | `config`        | `vector<u8>`  | The serialized bytes of consensus config.                                  |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`       | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+
+    public entry fun update_diem_consensus_config(account: signer, sliding_nonce: u64, config: vector<u8>) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        DiemConsensusConfig::set(&account, config)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TransactionFee.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TransactionFee.move
new file mode 100644
index 000000000..9b6b94a5a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TransactionFee.move
@@ -0,0 +1,175 @@
+/// Functions to initialize, accumulated, and burn transaction fees.
+module DiemFramework::TransactionFee {
+    use DiemFramework::XUS::XUS;
+    use DiemFramework::XDX;
+    use DiemFramework::Diem::{Self, Diem, Preburn};
+    use DiemFramework::Roles;
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use std::signer;
+
+    /// The `TransactionFee` resource holds a preburn resource for each
+    /// fiat `CoinType` that can be collected as a transaction fee.
+    struct TransactionFee<phantom CoinType> has key {
+        balance: Diem<CoinType>,
+        preburn: Preburn<CoinType>,
+    }
+
+    /// A `TransactionFee` resource is not in the required state
+    const ETRANSACTION_FEE: u64 = 0;
+
+    /// Called in genesis. Sets up the needed resources to collect transaction fees from the
+    /// `TransactionFee` resource with the TreasuryCompliance account.
+    public fun initialize(
+        tc_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_treasury_compliance(tc_account);
+        // accept fees in all the currencies
+        add_txn_fee_currency<XUS>(tc_account);
+    }
+    spec initialize {
+        include DiemTimestamp::AbortsIfNotGenesis;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include AddTxnFeeCurrencyAbortsIf<XUS>;
+        ensures is_initialized();
+        ensures spec_transaction_fee<XUS>().balance.value == 0;
+    }
+    spec schema AddTxnFeeCurrencyAbortsIf<CoinType> {
+        include Diem::AbortsIfNoCurrency<CoinType>;
+        aborts_if exists<TransactionFee<CoinType>>(@TreasuryCompliance)
+            with errors::ALREADY_PUBLISHED;
+    }
+
+    public fun is_coin_initialized<CoinType>(): bool {
+        exists<TransactionFee<CoinType>>(@TreasuryCompliance)
+    }
+
+    fun is_initialized(): bool {
+        is_coin_initialized<XUS>()
+    }
+
+    /// Sets up the needed transaction fee state for a given `CoinType` currency by
+    /// (1) configuring `tc_account` to accept `CoinType`
+    /// (2) publishing a wrapper of the `Preburn<CoinType>` resource under `tc_account`
+    public fun add_txn_fee_currency<CoinType>(tc_account: &signer) {
+        Roles::assert_treasury_compliance(tc_account);
+        Diem::assert_is_currency<CoinType>();
+        assert!(
+            !is_coin_initialized<CoinType>(),
+            errors::already_published(ETRANSACTION_FEE)
+        );
+        move_to(
+            tc_account,
+            TransactionFee<CoinType> {
+                balance: Diem::zero(),
+                preburn: Diem::create_preburn(tc_account)
+            }
+        )
+    }
+
+    /// Deposit `coin` into the transaction fees bucket
+    public fun pay_fee<CoinType>(coin: Diem<CoinType>) acquires TransactionFee {
+        DiemTimestamp::assert_operating();
+        assert!(is_coin_initialized<CoinType>(), errors::not_published(ETRANSACTION_FEE));
+        let fees = borrow_global_mut<TransactionFee<CoinType>>(@TreasuryCompliance);
+        Diem::deposit(&mut fees.balance, coin)
+    }
+
+    spec pay_fee {
+        include PayFeeAbortsIf<CoinType>;
+        include PayFeeEnsures<CoinType>;
+    }
+    spec schema PayFeeAbortsIf<CoinType> {
+        coin: Diem<CoinType>;
+        let fees = spec_transaction_fee<CoinType>().balance;
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if !is_coin_initialized<CoinType>() with errors::NOT_PUBLISHED;
+        include Diem::DepositAbortsIf<CoinType>{coin: fees, check: coin};
+    }
+    spec schema PayFeeEnsures<CoinType> {
+        coin: Diem<CoinType>;
+        let fees = spec_transaction_fee<CoinType>().balance;
+        let post post_fees = spec_transaction_fee<CoinType>().balance;
+        ensures post_fees.value == fees.value + coin.value;
+    }
+
+    /// Preburns the transaction fees collected in the `CoinType` currency.
+    /// If the `CoinType` is XDX, it unpacks the coin and preburns the
+    /// underlying fiat.
+    public fun burn_fees<CoinType>(
+        tc_account: &signer,
+    ) acquires TransactionFee {
+        DiemTimestamp::assert_operating();
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(is_coin_initialized<CoinType>(), errors::not_published(ETRANSACTION_FEE));
+        if (XDX::is_xdx<CoinType>()) {
+            // TODO: Once the composition of XDX is determined fill this in to
+            // unpack and burn the backing coins of the XDX coin.
+            abort errors::invalid_state(ETRANSACTION_FEE)
+        } else {
+            // extract fees
+            let fees = borrow_global_mut<TransactionFee<CoinType>>(@TreasuryCompliance);
+            let coin = Diem::withdraw_all(&mut fees.balance);
+            let burn_cap = Diem::remove_burn_capability<CoinType>(tc_account);
+            // burn
+            Diem::burn_now(
+                coin,
+                &mut fees.preburn,
+                @TreasuryCompliance,
+                &burn_cap
+            );
+            Diem::publish_burn_capability(tc_account, burn_cap);
+        }
+    }
+    spec burn_fees {
+        pragma disable_invariants_in_body;
+        /// Must abort if the account does not have the TreasuryCompliance role [[H3]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+
+        include DiemTimestamp::AbortsIfNotOperating;
+        aborts_if !is_coin_initialized<CoinType>() with errors::NOT_PUBLISHED;
+        include if (XDX::spec_is_xdx<CoinType>()) BurnFeesXDX else BurnFeesNotXDX<CoinType>;
+
+        /// The correct amount of fees is burnt and subtracted from market cap.
+        ensures Diem::spec_market_cap<CoinType>()
+            == old(Diem::spec_market_cap<CoinType>()) - old(spec_transaction_fee<CoinType>().balance.value);
+        /// All the fees is burnt so the balance becomes 0.
+        ensures spec_transaction_fee<CoinType>().balance.value == 0;
+    }
+    /// STUB: To be filled in at a later date once the makeup of the XDX has been determined.
+    ///
+    /// # Specification of the case where burn type is XDX.
+    spec schema BurnFeesXDX {
+        tc_account: signer;
+        aborts_if true with errors::INVALID_STATE;
+    }
+    /// # Specification of the case where burn type is not XDX.
+    spec schema BurnFeesNotXDX<CoinType> {
+        tc_account: signer;
+        /// Must abort if the account does not have BurnCapability [[H3]][PERMISSION].
+        include Diem::AbortsIfNoBurnCapability<CoinType>{account: tc_account};
+
+        let fees = spec_transaction_fee<CoinType>();
+        include Diem::BurnNowAbortsIf<CoinType>{coin: fees.balance, preburn: fees.preburn};
+
+        /// tc_account retrieves BurnCapability [[H3]][PERMISSION].
+        /// BurnCapability is not transferrable [[J3]][PERMISSION].
+        ensures exists<Diem::BurnCapability<CoinType>>(signer::address_of(tc_account));
+    }
+
+    spec module {} // Switch documentation context to module level.
+
+    /// # Initialization
+
+    spec module {
+        /// If time has started ticking, then `TransactionFee` resources have been initialized.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> is_initialized();
+    }
+
+    /// # Helper Function
+
+    spec fun spec_transaction_fee<CoinType>(): TransactionFee<CoinType> {
+        borrow_global<TransactionFee<CoinType>>(@TreasuryCompliance)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TreasuryComplianceScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TreasuryComplianceScripts.move
new file mode 100644
index 000000000..ac7d02b76
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/TreasuryComplianceScripts.move
@@ -0,0 +1,727 @@
+/// This module holds scripts relating to treasury and compliance-related
+/// activities in the Diem Framework.
+///
+/// Only accounts with a role of `Roles::TREASURY_COMPLIANCE` and
+/// `Roles::DESIGNATED_DEALER` can (successfully) use the scripts in this
+/// module. The exact role required for a transaction is determined on a
+/// per-transaction basis.
+module DiemFramework::TreasuryComplianceScripts {
+    use DiemFramework::DiemAccount;
+    use DiemFramework::Diem;
+    use DiemFramework::SlidingNonce;
+    use DiemFramework::TransactionFee;
+    use DiemFramework::AccountFreezing;
+    use DiemFramework::DualAttestation;
+    use DiemFramework::VASPDomain;
+    use std::fixed_point32;
+
+    /// # Summary
+    /// Cancels and returns the coins held in the preburn area under
+    /// `preburn_address`, which are equal to the `amount` specified in the transaction. Finds the first preburn
+    /// resource with the matching amount and returns the funds to the `preburn_address`'s balance.
+    /// Can only be successfully sent by an account with Treasury Compliance role.
+    ///
+    /// # Technical Description
+    /// Cancels and returns all coins held in the `Diem::Preburn<Token>` resource under the `preburn_address` and
+    /// return the funds to the `preburn_address` account's `DiemAccount::Balance<Token>`.
+    /// The transaction must be sent by an `account` with a `Diem::BurnCapability<Token>`
+    /// resource published under it. The account at `preburn_address` must have a
+    /// `Diem::Preburn<Token>` resource published under it, and its value must be nonzero. The transaction removes
+    /// the entire balance held in the `Diem::Preburn<Token>` resource, and returns it back to the account's
+    /// `DiemAccount::Balance<Token>` under `preburn_address`. Due to this, the account at
+    /// `preburn_address` must already have a balance in the `Token` currency published
+    /// before this script is called otherwise the transaction will fail.
+    ///
+    /// # Events
+    /// The successful execution of this transaction will emit:
+    /// * A `Diem::CancelBurnEvent` on the event handle held in the `Diem::CurrencyInfo<Token>`
+    /// resource's `burn_events` published under `0xA550C18`.
+    /// * A `DiemAccount::ReceivedPaymentEvent` on the `preburn_address`'s
+    /// `DiemAccount::DiemAccount` `received_events` event handle with both the `payer` and `payee`
+    /// being `preburn_address`.
+    ///
+    /// # Parameters
+    /// | Name              | Type      | Description                                                                                                                          |
+    /// | ------            | ------    | -------------                                                                                                                        |
+    /// | `Token`           | Type      | The Move type for the `Token` currenty that burning is being cancelled for. `Token` must be an already-registered currency on-chain. |
+    /// | `account`         | `signer`  | The signer of the sending account of this transaction, must have a burn capability for `Token` published under it.                   |
+    /// | `preburn_address` | `address` | The address where the coins to-be-burned are currently held.                                                                         |
+    /// | `amount`          | `u64`     | The amount to be cancelled.                                                                                                          |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category                | Error Reason                                     | Description                                                                                                                         |
+    /// | ----------------              | --------------                                   | -------------                                                                                                                       |
+    /// | `Errors::REQUIRES_CAPABILITY` | `Diem::EBURN_CAPABILITY`                         | The sending `account` does not have a `Diem::BurnCapability<Token>` published under it.                                             |
+    /// | `Errors::INVALID_STATE`       | `Diem::EPREBURN_NOT_FOUND`                       | The `Diem::PreburnQueue<Token>` resource under `preburn_address` does not contain a preburn request with a value matching `amount`. |
+    /// | `Errors::NOT_PUBLISHED`       | `Diem::EPREBURN_QUEUE`                           | The account at `preburn_address` does not have a `Diem::PreburnQueue<Token>` resource published under it.                           |
+    /// | `Errors::NOT_PUBLISHED`       | `Diem::ECURRENCY_INFO`                           | The specified `Token` is not a registered currency on-chain.                                                                        |
+    /// | `Errors::INVALID_ARGUMENT`    | `DiemAccount::EPAYEE_CANT_ACCEPT_CURRENCY_TYPE`  | The account at `preburn_address` doesn't have a balance resource for `Token`.                                                       |
+    /// | `Errors::LIMIT_EXCEEDED`      | `DiemAccount::EDEPOSIT_EXCEEDS_LIMITS`           | The depositing of the funds held in the prebun area would exceed the `account`'s account limits.                                    |
+    /// | `Errors::INVALID_STATE`       | `DualAttestation::EPAYEE_COMPLIANCE_KEY_NOT_SET` | The `account` does not have a compliance key set on it but dual attestion checking was performed.                                   |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::burn_txn_fees`
+    /// * `TreasuryComplianceScripts::burn_with_amount`
+    /// * `TreasuryComplianceScripts::preburn`
+
+    public entry fun cancel_burn_with_amount<Token>(account: signer, preburn_address: address, amount: u64) {
+        DiemAccount::cancel_burn<Token>(&account, preburn_address, amount)
+    }
+
+    spec cancel_burn_with_amount {
+        use std::errors;
+        use DiemFramework::Diem;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include DiemAccount::CancelBurnAbortsIf<Token>;
+        include Diem::CancelBurnWithCapEnsures<Token>;
+        include DiemAccount::DepositEnsures<Token>{payee: preburn_address};
+
+        let total_preburn_value = global<Diem::CurrencyInfo<Token>>(
+            @CurrencyInfo
+        ).preburn_value;
+        let post post_total_preburn_value = global<Diem::CurrencyInfo<Token>>(
+            @CurrencyInfo
+        ).preburn_value;
+
+        let balance_at_addr = DiemAccount::balance<Token>(preburn_address);
+        let post post_balance_at_addr = DiemAccount::balance<Token>(preburn_address);
+
+        /// The total value of preburn for `Token` should decrease by the preburned amount.
+        ensures post_total_preburn_value == total_preburn_value - amount;
+
+        /// The balance of `Token` at `preburn_address` should increase by the preburned amount.
+        ensures post_balance_at_addr == balance_at_addr + amount;
+
+        include Diem::CancelBurnWithCapEmits<Token>;
+        include DiemAccount::DepositEmits<Token>{
+            payer: preburn_address,
+            payee: preburn_address,
+            amount: amount,
+            metadata: x""
+        };
+
+        aborts_with [check]
+            errors::REQUIRES_CAPABILITY,
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT,
+            errors::LIMIT_EXCEEDED,
+            errors::INVALID_STATE;
+
+        /// **Access Control:**
+        /// Only the account with the burn capability can cancel burning [[H3]][PERMISSION].
+        include Diem::AbortsIfNoBurnCapability<Token>{account: account};
+    }
+
+    /// # Summary
+    /// Burns the coins held in a preburn resource in the preburn queue at the
+    /// specified preburn address, which are equal to the `amount` specified in the
+    /// transaction. Finds the first relevant outstanding preburn request with
+    /// matching amount and removes the contained coins from the system. The sending
+    /// account must be the Treasury Compliance account.
+    /// The account that holds the preburn queue resource will normally be a Designated
+    /// Dealer, but there are no enforced requirements that it be one.
+    ///
+    /// # Technical Description
+    /// This transaction permanently destroys all the coins of `Token` type
+    /// stored in the `Diem::Preburn<Token>` resource published under the
+    /// `preburn_address` account address.
+    ///
+    /// This transaction will only succeed if the sending `account` has a
+    /// `Diem::BurnCapability<Token>`, and a `Diem::Preburn<Token>` resource
+    /// exists under `preburn_address`, with a non-zero `to_burn` field. After the successful execution
+    /// of this transaction the `total_value` field in the
+    /// `Diem::CurrencyInfo<Token>` resource published under `0xA550C18` will be
+    /// decremented by the value of the `to_burn` field of the preburn resource
+    /// under `preburn_address` immediately before this transaction, and the
+    /// `to_burn` field of the preburn resource will have a zero value.
+    ///
+    /// # Events
+    /// The successful execution of this transaction will emit a `Diem::BurnEvent` on the event handle
+    /// held in the `Diem::CurrencyInfo<Token>` resource's `burn_events` published under
+    /// `0xA550C18`.
+    ///
+    /// # Parameters
+    /// | Name              | Type      | Description                                                                                                        |
+    /// | ------            | ------    | -------------                                                                                                      |
+    /// | `Token`           | Type      | The Move type for the `Token` currency being burned. `Token` must be an already-registered currency on-chain.      |
+    /// | `tc_account`      | `signer`  | The signer of the sending account of this transaction, must have a burn capability for `Token` published under it. |
+    /// | `sliding_nonce`   | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                         |
+    /// | `preburn_address` | `address` | The address where the coins to-be-burned are currently held.                                                       |
+    /// | `amount`          | `u64`     | The amount to be burned.                                                                                           |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category                | Error Reason                            | Description                                                                                                                         |
+    /// | ----------------              | --------------                          | -------------                                                                                                                       |
+    /// | `Errors::NOT_PUBLISHED`       | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `account`.                                                                         |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not.                                          |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                                                                       |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                                                                   |
+    /// | `Errors::REQUIRES_CAPABILITY` | `Diem::EBURN_CAPABILITY`                | The sending `account` does not have a `Diem::BurnCapability<Token>` published under it.                                             |
+    /// | `Errors::INVALID_STATE`       | `Diem::EPREBURN_NOT_FOUND`              | The `Diem::PreburnQueue<Token>` resource under `preburn_address` does not contain a preburn request with a value matching `amount`. |
+    /// | `Errors::NOT_PUBLISHED`       | `Diem::EPREBURN_QUEUE`                  | The account at `preburn_address` does not have a `Diem::PreburnQueue<Token>` resource published under it.                           |
+    /// | `Errors::NOT_PUBLISHED`       | `Diem::ECURRENCY_INFO`                  | The specified `Token` is not a registered currency on-chain.                                                                        |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::burn_txn_fees`
+    /// * `TreasuryComplianceScripts::cancel_burn_with_amount`
+    /// * `TreasuryComplianceScripts::preburn`
+
+    public entry fun burn_with_amount<Token>(account: signer, sliding_nonce: u64, preburn_address: address, amount: u64) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        Diem::burn<Token>(&account, preburn_address, amount)
+    }
+    spec burn_with_amount {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{ seq_nonce: sliding_nonce };
+        include Diem::BurnAbortsIf<Token>;
+        include Diem::BurnEnsures<Token>;
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::REQUIRES_CAPABILITY,
+            errors::NOT_PUBLISHED,
+            errors::INVALID_STATE,
+            errors::LIMIT_EXCEEDED;
+
+        include Diem::BurnWithResourceCapEmits<Token>{preburn: Diem::spec_make_preburn(amount)};
+
+        /// **Access Control:**
+        /// Only the account with the burn capability can burn coins [[H3]][PERMISSION].
+        include Diem::AbortsIfNoBurnCapability<Token>{account: account};
+    }
+
+    /// # Summary
+    /// Moves a specified number of coins in a given currency from the account's
+    /// balance to its preburn area after which the coins may be burned. This
+    /// transaction may be sent by any account that holds a balance and preburn area
+    /// in the specified currency.
+    ///
+    /// # Technical Description
+    /// Moves the specified `amount` of coins in `Token` currency from the sending `account`'s
+    /// `DiemAccount::Balance<Token>` to the `Diem::Preburn<Token>` published under the same
+    /// `account`. `account` must have both of these resources published under it at the start of this
+    /// transaction in order for it to execute successfully.
+    ///
+    /// # Events
+    /// Successful execution of this script emits two events:
+    /// * `DiemAccount::SentPaymentEvent ` on `account`'s `DiemAccount::DiemAccount` `sent_events`
+    /// handle with the `payee` and `payer` fields being `account`'s address; and
+    /// * A `Diem::PreburnEvent` with `Token`'s currency code on the
+    /// `Diem::CurrencyInfo<Token`'s `preburn_events` handle for `Token` and with
+    /// `preburn_address` set to `account`'s address.
+    ///
+    /// # Parameters
+    /// | Name      | Type     | Description                                                                                                                      |
+    /// | ------    | ------   | -------------                                                                                                                    |
+    /// | `Token`   | Type     | The Move type for the `Token` currency being moved to the preburn area. `Token` must be an already-registered currency on-chain. |
+    /// | `account` | `signer` | The signer of the sending account.                                                                                               |
+    /// | `amount`  | `u64`    | The amount in `Token` to be moved to the preburn area.                                                                           |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category           | Error Reason                                             | Description                                                                             |
+    /// | ----------------         | --------------                                           | -------------                                                                           |
+    /// | `Errors::NOT_PUBLISHED`  | `Diem::ECURRENCY_INFO`                                  | The `Token` is not a registered currency on-chain.                                      |
+    /// | `Errors::INVALID_STATE`  | `DiemAccount::EWITHDRAWAL_CAPABILITY_ALREADY_EXTRACTED` | The withdrawal capability for `account` has already been extracted.                     |
+    /// | `Errors::LIMIT_EXCEEDED` | `DiemAccount::EINSUFFICIENT_BALANCE`                    | `amount` is greater than `payer`'s balance in `Token`.                                  |
+    /// | `Errors::NOT_PUBLISHED`  | `DiemAccount::EPAYER_DOESNT_HOLD_CURRENCY`              | `account` doesn't hold a balance in `Token`.                                            |
+    /// | `Errors::NOT_PUBLISHED`  | `Diem::EPREBURN`                                        | `account` doesn't have a `Diem::Preburn<Token>` resource published under it.           |
+    /// | `Errors::INVALID_STATE`  | `Diem::EPREBURN_OCCUPIED`                               | The `value` field in the `Diem::Preburn<Token>` resource under the sender is non-zero. |
+    /// | `Errors::NOT_PUBLISHED`  | `Roles::EROLE_ID`                                        | The `account` did not have a role assigned to it.                                       |
+    /// | `Errors::REQUIRES_ROLE`  | `Roles::EDESIGNATED_DEALER`                              | The `account` did not have the role of DesignatedDealer.                                |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::cancel_burn_with_amount`
+    /// * `TreasuryComplianceScripts::burn_with_amount`
+    /// * `TreasuryComplianceScripts::burn_txn_fees`
+
+    public entry fun preburn<Token>(account: signer, amount: u64) {
+        let withdraw_cap = DiemAccount::extract_withdraw_capability(&account);
+        DiemAccount::preburn<Token>(&account, &withdraw_cap, amount);
+        DiemAccount::restore_withdraw_capability(withdraw_cap);
+    }
+
+    spec preburn {
+        use std::errors;
+        use std::signer;
+        use DiemFramework::Diem;
+
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        let account_addr = signer::address_of(account);
+        let cap = DiemAccount::spec_get_withdraw_cap(account_addr);
+        include DiemAccount::ExtractWithdrawCapAbortsIf{sender_addr: account_addr};
+        include DiemAccount::PreburnAbortsIf<Token>{dd: account, cap: cap};
+        include DiemAccount::PreburnEnsures<Token>{dd: account, payer: account_addr};
+
+        include DiemAccount::PreburnEmits<Token>{dd: account, cap: cap};
+
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::INVALID_STATE,
+            errors::REQUIRES_ROLE,
+            errors::LIMIT_EXCEEDED;
+
+        /// **Access Control:**
+        /// Only the account with a Preburn resource or PreburnQueue resource can preburn [[H4]][PERMISSION].
+        aborts_if !(exists<Diem::Preburn<Token>>(account_addr) || exists<Diem::PreburnQueue<Token>>(account_addr));
+    }
+
+    /// # Summary
+    /// Burns the transaction fees collected in the `CoinType` currency so that the
+    /// Diem association may reclaim the backing coins off-chain. May only be sent
+    /// by the Treasury Compliance account.
+    ///
+    /// # Technical Description
+    /// Burns the transaction fees collected in `CoinType` so that the
+    /// association may reclaim the backing coins. Once this transaction has executed
+    /// successfully all transaction fees that will have been collected in
+    /// `CoinType` since the last time this script was called with that specific
+    /// currency. Both `balance` and `preburn` fields in the
+    /// `TransactionFee::TransactionFee<CoinType>` resource published under the `0xB1E55ED`
+    /// account address will have a value of 0 after the successful execution of this script.
+    ///
+    /// # Events
+    /// The successful execution of this transaction will emit a `Diem::BurnEvent` on the event handle
+    /// held in the `Diem::CurrencyInfo<CoinType>` resource's `burn_events` published under
+    /// `0xA550C18`.
+    ///
+    /// # Parameters
+    /// | Name         | Type     | Description                                                                                                                                         |
+    /// | ------       | ------   | -------------                                                                                                                                       |
+    /// | `CoinType`   | Type     | The Move type for the `CoinType` being added to the sending account of the transaction. `CoinType` must be an already-registered currency on-chain. |
+    /// | `tc_account` | `signer` | The signer of the sending account of this transaction. Must be the Treasury Compliance account.                                                     |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                          | Description                                                 |
+    /// | ----------------           | --------------                        | -------------                                               |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE` | The sending account is not the Treasury Compliance account. |
+    /// | `Errors::NOT_PUBLISHED`    | `TransactionFee::ETRANSACTION_FEE`    | `CoinType` is not an accepted transaction fee currency.     |
+    /// | `Errors::INVALID_ARGUMENT` | `Diem::ECOIN`                        | The collected fees in `CoinType` are zero.                  |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::burn_with_amount`
+    /// * `TreasuryComplianceScripts::cancel_burn_with_amount`
+
+    public entry fun burn_txn_fees<CoinType>(tc_account: signer) {
+        TransactionFee::burn_fees<CoinType>(&tc_account);
+    }
+
+    /// # Summary
+    /// Mints a specified number of coins in a currency to a Designated Dealer. The sending account
+    /// must be the Treasury Compliance account, and coins can only be minted to a Designated Dealer
+    /// account.
+    ///
+    /// # Technical Description
+    /// Mints `mint_amount` of coins in the `CoinType` currency to Designated Dealer account at
+    /// `designated_dealer_address`. The `tier_index` parameter specifies which tier should be used to
+    /// check verify the off-chain approval policy, and is based in part on the on-chain tier values
+    /// for the specific Designated Dealer, and the number of `CoinType` coins that have been minted to
+    /// the dealer over the past 24 hours. Every Designated Dealer has 4 tiers for each currency that
+    /// they support. The sending `tc_account` must be the Treasury Compliance account, and the
+    /// receiver an authorized Designated Dealer account.
+    ///
+    /// # Events
+    /// Successful execution of the transaction will emit two events:
+    /// * A `Diem::MintEvent` with the amount and currency code minted is emitted on the
+    /// `mint_event_handle` in the stored `Diem::CurrencyInfo<CoinType>` resource stored under
+    /// `0xA550C18`; and
+    /// * A `DesignatedDealer::ReceivedMintEvent` with the amount, currency code, and Designated
+    /// Dealer's address is emitted on the `mint_event_handle` in the stored `DesignatedDealer::Dealer`
+    /// resource published under the `designated_dealer_address`.
+    ///
+    /// # Parameters
+    /// | Name                        | Type      | Description                                                                                                |
+    /// | ------                      | ------    | -------------                                                                                              |
+    /// | `CoinType`                  | Type      | The Move type for the `CoinType` being minted. `CoinType` must be an already-registered currency on-chain. |
+    /// | `tc_account`                | `signer`  | The signer of the sending account of this transaction. Must be the Treasury Compliance account.            |
+    /// | `sliding_nonce`             | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                 |
+    /// | `designated_dealer_address` | `address` | The address of the Designated Dealer account being minted to.                                              |
+    /// | `mint_amount`               | `u64`     | The number of coins to be minted.                                                                          |
+    /// | `tier_index`                | `u64`     | [Deprecated] The mint tier index to use for the Designated Dealer account. Will be ignored                 |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category                | Error Reason                                 | Description                                                                                                                  |
+    /// | ----------------              | --------------                               | -------------                                                                                                                |
+    /// | `Errors::NOT_PUBLISHED`       | `SlidingNonce::ESLIDING_NONCE`               | A `SlidingNonce` resource is not published under `tc_account`.                                                               |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_TOO_OLD`               | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not.                                   |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_TOO_NEW`               | The `sliding_nonce` is too far in the future.                                                                                |
+    /// | `Errors::INVALID_ARGUMENT`    | `SlidingNonce::ENONCE_ALREADY_RECORDED`      | The `sliding_nonce` has been previously recorded.                                                                            |
+    /// | `Errors::REQUIRES_ADDRESS`    | `CoreAddresses::ETREASURY_COMPLIANCE`        | `tc_account` is not the Treasury Compliance account.                                                                         |
+    /// | `Errors::REQUIRES_ROLE`       | `Roles::ETREASURY_COMPLIANCE`                | `tc_account` is not the Treasury Compliance account.                                                                         |
+    /// | `Errors::INVALID_ARGUMENT`    | `DesignatedDealer::EINVALID_MINT_AMOUNT`     | `mint_amount` is zero.                                                                                                       |
+    /// | `Errors::NOT_PUBLISHED`       | `DesignatedDealer::EDEALER`                  | `DesignatedDealer::Dealer` or `DesignatedDealer::TierInfo<CoinType>` resource does not exist at `designated_dealer_address`. |
+    /// | `Errors::REQUIRES_CAPABILITY` | `Diem::EMINT_CAPABILITY`                    | `tc_account` does not have a `Diem::MintCapability<CoinType>` resource published under it.                                  |
+    /// | `Errors::INVALID_STATE`       | `Diem::EMINTING_NOT_ALLOWED`                | Minting is not currently allowed for `CoinType` coins.                                                                       |
+    /// | `Errors::LIMIT_EXCEEDED`      | `DiemAccount::EDEPOSIT_EXCEEDS_LIMITS`      | The depositing of the funds would exceed the `account`'s account limits.                                                     |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_designated_dealer`
+    /// * `PaymentScripts::peer_to_peer_with_metadata`
+    /// * `AccountAdministrationScripts::rotate_dual_attestation_info`
+
+    public entry fun tiered_mint<CoinType>(
+        tc_account: signer,
+        sliding_nonce: u64,
+        designated_dealer_address: address,
+        mint_amount: u64,
+        tier_index: u64
+    ) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        DiemAccount::tiered_mint<CoinType>(
+            &tc_account, designated_dealer_address, mint_amount, tier_index
+        );
+    }
+
+    spec tiered_mint {
+        use std::errors;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: tc_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{account: tc_account, seq_nonce: sliding_nonce};
+        include DiemAccount::TieredMintAbortsIf<CoinType>;
+        include DiemAccount::TieredMintEnsures<CoinType>;
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::REQUIRES_ADDRESS,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_CAPABILITY,
+            errors::INVALID_STATE,
+            errors::LIMIT_EXCEEDED,
+            errors::REQUIRES_ROLE;
+
+        include DiemAccount::TieredMintEmits<CoinType>;
+
+        /// **Access Control:**
+        /// Only the Treasury Compliance account can mint [[H1]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+
+    /// # Summary
+    /// Freezes the account at `address`. The sending account of this transaction
+    /// must be the Treasury Compliance account. The account being frozen cannot be
+    /// the Diem Root or Treasury Compliance account. After the successful
+    /// execution of this transaction no transactions may be sent from the frozen
+    /// account, and the frozen account may not send or receive coins.
+    ///
+    /// # Technical Description
+    /// Sets the `AccountFreezing::FreezingBit` to `true` and emits a
+    /// `AccountFreezing::FreezeAccountEvent`. The transaction sender must be the
+    /// Treasury Compliance account, but the account at `to_freeze_account` must
+    /// not be either `0xA550C18` (the Diem Root address), or `0xB1E55ED` (the
+    /// Treasury Compliance address). Note that this is a per-account property
+    /// e.g., freezing a Parent VASP will not effect the status any of its child
+    /// accounts and vice versa.
+    ///
+    ///
+    /// # Events
+    /// Successful execution of this transaction will emit a `AccountFreezing::FreezeAccountEvent` on
+    /// the `freeze_event_handle` held in the `AccountFreezing::FreezeEventsHolder` resource published
+    /// under `0xA550C18` with the `frozen_address` being the `to_freeze_account`.
+    ///
+    /// # Parameters
+    /// | Name                | Type      | Description                                                                                     |
+    /// | ------              | ------    | -------------                                                                                   |
+    /// | `tc_account`        | `signer`  | The signer of the sending account of this transaction. Must be the Treasury Compliance account. |
+    /// | `sliding_nonce`     | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                      |
+    /// | `to_freeze_account` | `address` | The account address to be frozen.                                                               |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                 | Description                                                                                |
+    /// | ----------------           | --------------                               | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`               | A `SlidingNonce` resource is not published under `tc_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`               | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`               | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`      | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`        | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::ETREASURY_COMPLIANCE`                | The sending account is not the Treasury Compliance account.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `AccountFreezing::ECANNOT_FREEZE_TC`         | `to_freeze_account` was the Treasury Compliance account (`0xB1E55ED`).                     |
+    /// | `Errors::INVALID_ARGUMENT` | `AccountFreezing::ECANNOT_FREEZE_DIEM_ROOT` | `to_freeze_account` was the Diem Root account (`0xA550C18`).                              |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::unfreeze_account`
+
+    public entry fun freeze_account(tc_account: signer, sliding_nonce: u64, to_freeze_account: address) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        AccountFreezing::freeze_account(&tc_account, to_freeze_account);
+    }
+
+    /// # Summary
+    /// Unfreezes the account at `address`. The sending account of this transaction must be the
+    /// Treasury Compliance account. After the successful execution of this transaction transactions
+    /// may be sent from the previously frozen account, and coins may be sent and received.
+    ///
+    /// # Technical Description
+    /// Sets the `AccountFreezing::FreezingBit` to `false` and emits a
+    /// `AccountFreezing::UnFreezeAccountEvent`. The transaction sender must be the Treasury Compliance
+    /// account. Note that this is a per-account property so unfreezing a Parent VASP will not effect
+    /// the status any of its child accounts and vice versa.
+    ///
+    /// # Events
+    /// Successful execution of this script will emit a `AccountFreezing::UnFreezeAccountEvent` with
+    /// the `unfrozen_address` set the `to_unfreeze_account`'s address.
+    ///
+    /// # Parameters
+    /// | Name                  | Type      | Description                                                                                     |
+    /// | ------                | ------    | -------------                                                                                   |
+    /// | `tc_account`          | `signer`  | The signer of the sending account of this transaction. Must be the Treasury Compliance account. |
+    /// | `sliding_nonce`       | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                      |
+    /// | `to_unfreeze_account` | `address` | The account address to be frozen.                                                               |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                            | Description                                                                                |
+    /// | ----------------           | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `account`.                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`   | The sending account is not the Treasury Compliance account.                                |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::freeze_account`
+
+    public entry fun unfreeze_account(account: signer, sliding_nonce: u64, to_unfreeze_account: address) {
+        SlidingNonce::record_nonce_or_abort(&account, sliding_nonce);
+        AccountFreezing::unfreeze_account(&account, to_unfreeze_account);
+    }
+
+    /// # Summary
+    /// Update the dual attestation limit on-chain. Defined in terms of micro-XDX.  The transaction can
+    /// only be sent by the Treasury Compliance account.  After this transaction all inter-VASP
+    /// payments over this limit must be checked for dual attestation.
+    ///
+    /// # Technical Description
+    /// Updates the `micro_xdx_limit` field of the `DualAttestation::Limit` resource published under
+    /// `0xA550C18`. The amount is set in micro-XDX.
+    ///
+    /// # Parameters
+    /// | Name                  | Type     | Description                                                                                     |
+    /// | ------                | ------   | -------------                                                                                   |
+    /// | `tc_account`          | `signer` | The signer of the sending account of this transaction. Must be the Treasury Compliance account. |
+    /// | `sliding_nonce`       | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                      |
+    /// | `new_micro_xdx_limit` | `u64`    | The new dual attestation limit to be used on-chain.                                             |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                            | Description                                                                                |
+    /// | ----------------           | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `tc_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`   | `tc_account` is not the Treasury Compliance account.                                       |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::update_exchange_rate`
+    /// * `TreasuryComplianceScripts::update_minting_ability`
+
+    public entry fun update_dual_attestation_limit(
+            tc_account: signer,
+            sliding_nonce: u64,
+            new_micro_xdx_limit: u64
+        ) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        DualAttestation::set_microdiem_limit(&tc_account, new_micro_xdx_limit);
+    }
+
+    /// # Summary
+    /// Update the rough on-chain exchange rate between a specified currency and XDX (as a conversion
+    /// to micro-XDX). The transaction can only be sent by the Treasury Compliance account. After this
+    /// transaction the updated exchange rate will be used for normalization of gas prices, and for
+    /// dual attestation checking.
+    ///
+    /// # Technical Description
+    /// Updates the on-chain exchange rate from the given `Currency` to micro-XDX.  The exchange rate
+    /// is given by `new_exchange_rate_numerator/new_exchange_rate_denominator`.
+    ///
+    /// # Parameters
+    /// | Name                            | Type     | Description                                                                                                                        |
+    /// | ------                          | ------   | -------------                                                                                                                      |
+    /// | `Currency`                      | Type     | The Move type for the `Currency` whose exchange rate is being updated. `Currency` must be an already-registered currency on-chain. |
+    /// | `tc_account`                    | `signer` | The signer of the sending account of this transaction. Must be the Treasury Compliance account.                                    |
+    /// | `sliding_nonce`                 | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for the transaction.                                                          |
+    /// | `new_exchange_rate_numerator`   | `u64`    | The numerator for the new to micro-XDX exchange rate for `Currency`.                                                               |
+    /// | `new_exchange_rate_denominator` | `u64`    | The denominator for the new to micro-XDX exchange rate for `Currency`.                                                             |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                            | Description                                                                                |
+    /// | ----------------           | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `tc_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`   | `tc_account` is not the Treasury Compliance account.                                       |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::ETREASURY_COMPLIANCE`           | `tc_account` is not the Treasury Compliance account.                                       |
+    /// | `Errors::INVALID_ARGUMENT` | `FixedPoint32::EDENOMINATOR`            | `new_exchange_rate_denominator` is zero.                                                   |
+    /// | `Errors::INVALID_ARGUMENT` | `FixedPoint32::ERATIO_OUT_OF_RANGE`     | The quotient is unrepresentable as a `FixedPoint32`.                                       |
+    /// | `Errors::LIMIT_EXCEEDED`   | `FixedPoint32::ERATIO_OUT_OF_RANGE`     | The quotient is unrepresentable as a `FixedPoint32`.                                       |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::update_dual_attestation_limit`
+    /// * `TreasuryComplianceScripts::update_minting_ability`
+
+    public entry fun update_exchange_rate<Currency>(
+            tc_account: signer,
+            sliding_nonce: u64,
+            new_exchange_rate_numerator: u64,
+            new_exchange_rate_denominator: u64,
+    ) {
+        SlidingNonce::record_nonce_or_abort(&tc_account, sliding_nonce);
+        let rate = fixed_point32::create_from_rational(
+                new_exchange_rate_numerator,
+                new_exchange_rate_denominator,
+        );
+        Diem::update_xdx_exchange_rate<Currency>(&tc_account, rate);
+    }
+    spec update_exchange_rate {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+        use DiemFramework::Roles;
+
+        include DiemAccount::TransactionChecks{sender: tc_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{ account: tc_account, seq_nonce: sliding_nonce };
+        include fixed_point32::CreateFromRationalAbortsIf{
+               numerator: new_exchange_rate_numerator,
+               denominator: new_exchange_rate_denominator
+        };
+        let rate = fixed_point32::spec_create_from_rational(
+                new_exchange_rate_numerator,
+                new_exchange_rate_denominator
+        );
+        include Diem::UpdateXDXExchangeRateAbortsIf<Currency>;
+        include Diem::UpdateXDXExchangeRateEnsures<Currency>{xdx_exchange_rate: rate};
+        include Diem::UpdateXDXExchangeRateEmits<Currency>{xdx_exchange_rate: rate};
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::REQUIRES_ADDRESS,
+            errors::LIMIT_EXCEEDED,
+            errors::REQUIRES_ROLE,
+            errors::NOT_PUBLISHED;
+
+        /// **Access Control:**
+        /// Only the Treasury Compliance account can update the exchange rate [[H5]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+
+    /// # Summary
+    /// Script to allow or disallow minting of new coins in a specified currency.  This transaction can
+    /// only be sent by the Treasury Compliance account.  Turning minting off for a currency will have
+    /// no effect on coins already in circulation, and coins may still be removed from the system.
+    ///
+    /// # Technical Description
+    /// This transaction sets the `can_mint` field of the `Diem::CurrencyInfo<Currency>` resource
+    /// published under `0xA550C18` to the value of `allow_minting`. Minting of coins if allowed if
+    /// this field is set to `true` and minting of new coins in `Currency` is disallowed otherwise.
+    /// This transaction needs to be sent by the Treasury Compliance account.
+    ///
+    /// # Parameters
+    /// | Name            | Type     | Description                                                                                                                          |
+    /// | ------          | ------   | -------------                                                                                                                        |
+    /// | `Currency`      | Type     | The Move type for the `Currency` whose minting ability is being updated. `Currency` must be an already-registered currency on-chain. |
+    /// | `account`       | `signer` | Signer of the sending account. Must be the Diem Root account.                                                                        |
+    /// | `allow_minting` | `bool`   | Whether to allow minting of new coins in `Currency`.                                                                                 |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                          | Description                                          |
+    /// | ----------------           | --------------                        | -------------                                        |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE` | `tc_account` is not the Treasury Compliance account. |
+    /// | `Errors::NOT_PUBLISHED`    | `Diem::ECURRENCY_INFO`               | `Currency` is not a registered currency on-chain.    |
+    ///
+    /// # Related Scripts
+    /// * `TreasuryComplianceScripts::update_dual_attestation_limit`
+    /// * `TreasuryComplianceScripts::update_exchange_rate`
+
+    public entry fun update_minting_ability<Currency>(
+        tc_account: signer,
+        allow_minting: bool
+    ) {
+        Diem::update_minting_ability<Currency>(&tc_account, allow_minting);
+    }
+
+    /// # Summary
+    /// Add a VASP domain to parent VASP account. The transaction can only be sent by
+    /// the Treasury Compliance account.
+    ///
+    /// # Technical Description
+    /// Adds a `VASPDomain::VASPDomain` to the `domains` field of the `VASPDomain::VASPDomains` resource published under
+    /// the account at `address`.
+    ///
+    /// # Parameters
+    /// | Name         | Type         | Description                                                                                     |
+    /// | ------       | ------       | -------------                                                                                   |
+    /// | `tc_account` | `signer`     | The signer of the sending account of this transaction. Must be the Treasury Compliance account. |
+    /// | `address`    | `address`    | The `address` of the parent VASP account that will have have `domain` added to its domains.     |
+    /// | `domain`     | `vector<u8>` | The domain to be added.                                                                         |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                             | Description                                                                                                                            |
+    /// | ----------------           | --------------                           | -------------                                                                                                                          |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::ETREASURY_COMPLIANCE`            | The sending account is not the Treasury Compliance account.                                                                            |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`    | `tc_account` is not the Treasury Compliance account.                                                                                   |
+    /// | `Errors::NOT_PUBLISHED`    | `VASPDomain::EVASP_DOMAIN_MANAGER`        | The `VASPDomain::VASPDomainManager` resource is not yet published under the Treasury Compliance account.                                 |
+    /// | `Errors::NOT_PUBLISHED`    | `VASPDomain::EVASP_DOMAINS_NOT_PUBLISHED` | `address` does not have a `VASPDomain::VASPDomains` resource published under it.                                                         |
+    /// | `Errors::INVALID_ARGUMENT` | `VASPDomain::EDOMAIN_ALREADY_EXISTS`         | The `domain` already exists in the list of `VASPDomain::VASPDomain`s  in the `VASPDomain::VASPDomains` resource published under `address`. |
+    /// | `Errors::INVALID_ARGUMENT` | `VASPDomain::EINVALID_VASP_DOMAIN`        | The `domain` is greater in length than `VASPDomain::DOMAIN_LENGTH`.                                                                        |
+    public entry fun add_vasp_domain (
+        tc_account: signer,
+        address: address,
+        domain: vector<u8>,
+    ) {
+        VASPDomain::add_vasp_domain(&tc_account, address, domain);
+    }
+    spec add_vasp_domain {
+        use std::errors;
+        include DiemAccount::TransactionChecks{sender: tc_account}; // properties checked by the prologue.
+        include VASPDomain::AddVASPDomainAbortsIf;
+        include VASPDomain::AddVASPDomainEnsures;
+        include VASPDomain::AddVASPDomainEmits;
+        aborts_with [check]
+            errors::REQUIRES_ROLE,
+            errors::REQUIRES_ADDRESS,
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Remove a VASP domain from parent VASP account. The transaction can only be sent by
+    /// the Treasury Compliance account.
+    ///
+    /// # Technical Description
+    /// Removes a `VASPDomain::VASPDomain` from the `domains` field of the `VASPDomain::VASPDomains` resource published under
+    /// account with `address`.
+    ///
+    /// # Parameters
+    /// | Name         | Type         | Description                                                                                     |
+    /// | ------       | ------       | -------------                                                                                   |
+    /// | `tc_account` | `signer`     | The signer of the sending account of this transaction. Must be the Treasury Compliance account. |
+    /// | `address`    | `address`    | The `address` of parent VASP account that will update its domains.                              |
+    /// | `domain`     | `vector<u8>` | The domain name.                                                                                |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                             | Description                                                                                                                            |
+    /// | ----------------           | --------------                           | -------------                                                                                                                          |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::ETREASURY_COMPLIANCE`            | The sending account is not the Treasury Compliance account.                                                                            |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::ETREASURY_COMPLIANCE`    | `tc_account` is not the Treasury Compliance account.                                                                                   |
+    /// | `Errors::NOT_PUBLISHED`    | `VASPDomain::EVASP_DOMAIN_MANAGER`        | The `VASPDomain::VASPDomainManager` resource is not yet published under the Treasury Compliance account.                                 |
+    /// | `Errors::NOT_PUBLISHED`    | `VASPDomain::EVASP_DOMAINS_NOT_PUBLISHED` | `address` does not have a `VASPDomain::VASPDomains` resource published under it.                                                         |
+    /// | `Errors::INVALID_ARGUMENT` | `VASPDomain::EINVALID_VASP_DOMAIN`        | The `domain` is greater in length than `VASPDomain::DOMAIN_LENGTH`.                                                                        |
+    /// | `Errors::INVALID_ARGUMENT` | `VASPDomain::EVASP_DOMAIN_NOT_FOUND`              | The `domain` does not exist in the list of `VASPDomain::VASPDomain`s  in the `VASPDomain::VASPDomains` resource published under `address`. |
+    public entry fun remove_vasp_domain (
+        tc_account: signer,
+        address: address,
+        domain: vector<u8>,
+    ) {
+        VASPDomain::remove_vasp_domain(&tc_account, address, domain);
+    }
+    spec remove_vasp_domain {
+        use std::errors;
+        aborts_with [check]
+            errors::REQUIRES_ROLE,
+            errors::REQUIRES_ADDRESS,
+            errors::NOT_PUBLISHED,
+            errors::INVALID_ARGUMENT;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASP.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASP.move
new file mode 100644
index 000000000..4972ca627
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASP.move
@@ -0,0 +1,269 @@
+/// A VASP is one type of balance-holding account on the blockchain. VASPs from a two-layer
+/// hierarchy.  The main account, called a "parent VASP" and a collection of "child VASP"s.
+/// This module provides functions to manage VASP accounts.
+module DiemFramework::VASP {
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use DiemFramework::AccountLimits;
+    use std::errors;
+    use std::signer;
+    friend DiemFramework::DiemAccount;
+
+    /// Each VASP has a unique root account that holds a `ParentVASP` resource. This resource holds
+    /// the VASP's globally unique name and all of the metadata that other VASPs need to perform
+    /// off-chain protocols with this one.
+    struct ParentVASP has key {
+        /// Number of child accounts this parent has created.
+        num_children: u64
+    }
+
+    /// A resource that represents a child account of the parent VASP account at `parent_vasp_addr`
+    struct ChildVASP has key { parent_vasp_addr: address }
+
+    /// The `ParentVASP` or `ChildVASP` resources are not in the required state
+    const EPARENT_OR_CHILD_VASP: u64 = 0;
+    /// The creation of a new Child VASP account would exceed the number of children permitted for a VASP
+    const ETOO_MANY_CHILDREN: u64 = 1;
+    /// The account must be a Parent or Child VASP account
+    const ENOT_A_VASP: u64 = 2;
+    /// The creating account must be a Parent VASP account
+    const ENOT_A_PARENT_VASP: u64 = 3;
+
+
+    /// Maximum number of child accounts that can be created by a single ParentVASP
+    const MAX_CHILD_ACCOUNTS: u64 = 65536; // 2^16
+
+    ///////////////////////////////////////////////////////////////////////////
+    // To-be parent-vasp called functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Create a new `ParentVASP` resource under `vasp`
+    /// Aborts if `dr_account` is not the diem root account,
+    /// or if there is already a VASP (child or parent) at this account.
+    public(friend) fun publish_parent_vasp_credential(vasp: &signer, tc_account: &signer) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_treasury_compliance(tc_account);
+        Roles::assert_parent_vasp_role(vasp);
+        let vasp_addr = signer::address_of(vasp);
+        assert!(!is_vasp(vasp_addr), errors::already_published(EPARENT_OR_CHILD_VASP));
+        move_to(vasp, ParentVASP { num_children: 0 });
+    }
+
+    spec publish_parent_vasp_credential {
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include Roles::AbortsIfNotParentVasp{account: vasp};
+        let vasp_addr = signer::address_of(vasp);
+        aborts_if is_vasp(vasp_addr) with errors::ALREADY_PUBLISHED;
+        include PublishParentVASPEnsures{vasp_addr: vasp_addr};
+    }
+
+    spec schema PublishParentVASPEnsures {
+        vasp_addr: address;
+        ensures is_parent(vasp_addr);
+        ensures spec_num_children(vasp_addr) == 0;
+    }
+
+    /// Create a child VASP resource for the `parent`
+    /// Aborts if `parent` is not a ParentVASP
+    public(friend) fun publish_child_vasp_credential(
+        parent: &signer,
+        child: &signer,
+    ) acquires ParentVASP {
+        Roles::assert_parent_vasp_role(parent);
+        Roles::assert_child_vasp_role(child);
+        let child_vasp_addr = signer::address_of(child);
+        assert!(!is_vasp(child_vasp_addr), errors::already_published(EPARENT_OR_CHILD_VASP));
+        let parent_vasp_addr = signer::address_of(parent);
+        assert!(is_parent(parent_vasp_addr), errors::invalid_argument(ENOT_A_PARENT_VASP));
+        let num_children = &mut borrow_global_mut<ParentVASP>(parent_vasp_addr).num_children;
+        // Abort if creating this child account would put the parent VASP over the limit
+        assert!(*num_children < MAX_CHILD_ACCOUNTS, errors::limit_exceeded(ETOO_MANY_CHILDREN));
+        *num_children = *num_children + 1;
+        move_to(child, ChildVASP { parent_vasp_addr });
+    }
+    spec publish_child_vasp_credential {
+        let child_addr = signer::address_of(child);
+        include PublishChildVASPAbortsIf{child_addr};
+        // NB: This aborts condition is separated out so that `PublishChildVASPAbortsIf` can be used in
+        //     `DiemAccount::create_child_vasp_account` since this doesn't hold of the new account in the pre-state.
+        include Roles::AbortsIfNotChildVasp{account: child_addr};
+        include PublishChildVASPEnsures{parent_addr: signer::address_of(parent), child_addr: child_addr};
+    }
+
+    spec schema PublishChildVASPAbortsIf {
+        parent: signer;
+        child_addr: address;
+        let parent_addr = signer::address_of(parent);
+        include Roles::AbortsIfNotParentVasp{account: parent};
+        aborts_if is_vasp(child_addr) with errors::ALREADY_PUBLISHED;
+        aborts_if !is_parent(parent_addr) with errors::INVALID_ARGUMENT;
+        aborts_if spec_num_children(parent_addr) + 1 > MAX_CHILD_ACCOUNTS with errors::LIMIT_EXCEEDED;
+    }
+
+    spec schema PublishChildVASPEnsures {
+        parent_addr: address;
+        child_addr: address;
+        ensures spec_num_children(parent_addr) == old(spec_num_children(parent_addr)) + 1;
+        ensures is_child(child_addr);
+        ensures spec_parent_address(child_addr) == parent_addr;
+    }
+
+    /// Return `true` if `addr` is a parent or child VASP whose parent VASP account contains an
+    /// `AccountLimits<CoinType>` resource.
+    /// Aborts if `addr` is not a VASP
+    public fun has_account_limits<CoinType>(addr: address): bool acquires ChildVASP {
+        AccountLimits::has_window_published<CoinType>(parent_address(addr))
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Return `addr` if `addr` is a `ParentVASP` or its parent's address if it is a `ChildVASP`
+    /// Aborts otherwise
+    public fun parent_address(addr: address): address acquires ChildVASP {
+        if (is_parent(addr)) {
+            addr
+        } else if (is_child(addr)) {
+            borrow_global<ChildVASP>(addr).parent_vasp_addr
+        } else { // wrong account type, abort
+            abort(errors::invalid_argument(ENOT_A_VASP))
+        }
+    }
+    spec parent_address {
+        pragma opaque;
+        aborts_if !is_parent(addr) && !is_child(addr) with errors::INVALID_ARGUMENT;
+        ensures result == spec_parent_address(addr);
+    }
+    spec module {
+        /// Spec version of `Self::parent_address`.
+        fun spec_parent_address(addr: address): address {
+            if (is_parent(addr)) {
+                addr
+            } else {
+                global<ChildVASP>(addr).parent_vasp_addr
+            }
+        }
+        fun spec_has_account_limits<Token>(addr: address): bool {
+            AccountLimits::has_window_published<Token>(spec_parent_address(addr))
+        }
+    }
+
+    /// Returns true if `addr` is a parent VASP.
+    public fun is_parent(addr: address): bool {
+        exists<ParentVASP>(addr)
+    }
+    spec is_parent {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == is_parent(addr);
+    }
+
+    /// Returns true if `addr` is a child VASP.
+    public fun is_child(addr: address): bool {
+        exists<ChildVASP>(addr)
+    }
+    spec is_child {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == is_child(addr);
+    }
+
+    /// Returns true if `addr` is a VASP.
+    public fun is_vasp(addr: address): bool {
+        is_parent(addr) || is_child(addr)
+    }
+    spec is_vasp {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == is_vasp(addr);
+    }
+    spec schema AbortsIfNotVASP {
+        addr: address;
+        aborts_if !is_vasp(addr);
+    }
+
+    /// Returns true if both addresses are VASPs and they have the same parent address.
+    public fun is_same_vasp(addr1: address, addr2: address): bool acquires ChildVASP {
+        is_vasp(addr1) && is_vasp(addr2) && parent_address(addr1) == parent_address(addr2)
+    }
+    spec is_same_vasp {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == spec_is_same_vasp(addr1, addr2);
+    }
+    /// Spec version of `Self::is_same_vasp`.
+    spec fun spec_is_same_vasp(addr1: address, addr2: address): bool {
+        is_vasp(addr1) && is_vasp(addr2) && spec_parent_address(addr1) == spec_parent_address(addr2)
+    }
+
+
+    /// If `addr` is the address of a `ParentVASP`, return the number of children.
+    /// If it is the address of a ChildVASP, return the number of children of the parent.
+    /// The total number of accounts for this VASP is num_children() + 1
+    /// Aborts if `addr` is not a ParentVASP or ChildVASP account
+    public fun num_children(addr: address): u64  acquires ChildVASP, ParentVASP {
+        // If parent VASP succeeds, the parent is guaranteed to exist.
+        *&borrow_global<ParentVASP>(parent_address(addr)).num_children
+    }
+    spec num_children {
+        aborts_if !is_vasp(addr) with errors::INVALID_ARGUMENT;
+    }
+    /// Spec version of `Self::num_children`.
+    spec fun spec_num_children(parent: address): u64 {
+        global<ParentVASP>(parent).num_children
+    }
+
+    // **************** SPECIFICATIONS ****************
+    spec module {} // switch documentation context back to module level
+
+    /// # Persistence of parent and child VASPs
+    spec module {
+        invariant update forall addr: address where old(is_parent(addr)):
+            is_parent(addr);
+
+        invariant update forall addr: address where old(is_child(addr)):
+            is_child(addr);
+    }
+
+    /// # Existence of Parents
+    spec module {
+        invariant
+            forall child_addr: address where is_child(child_addr):
+                is_parent(global<ChildVASP>(child_addr).parent_vasp_addr);
+    }
+
+    /// # Creation of Child VASPs
+
+    spec module {
+        /// Only a parent VASP calling `Self::publish_child_vasp_credential` can create
+        /// child VASPs.
+        apply ChildVASPsDontChange to *<T>, * except publish_child_vasp_credential;
+
+        /// The number of children of a parent VASP can only changed by adding
+        /// a child through `Self::publish_child_vast_credential`.
+        apply NumChildrenRemainsSame to * except publish_child_vasp_credential;
+    }
+
+    spec schema ChildVASPsDontChange {
+        /// A ChildVASP resource is at an address if and only if it was there in the
+        /// previous state.
+        ensures forall a: address : exists<ChildVASP>(a) == old(exists<ChildVASP>(a));
+    }
+
+    spec schema NumChildrenRemainsSame {
+        ensures forall parent: address
+            where old(is_parent(parent)):
+                spec_num_children(parent) == old(spec_num_children(parent));
+    }
+
+    /// # Immutability of Parent Address
+
+    spec module {
+        /// The parent address stored at ChildVASP resource never changes.
+        invariant update
+            forall a: address where old(is_child(a)): spec_parent_address(a) == old(spec_parent_address(a));
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASPDomain.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASPDomain.move
new file mode 100644
index 000000000..57d4218aa
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/VASPDomain.move
@@ -0,0 +1,305 @@
+/// Module managing VASP domains.
+module DiemFramework::VASPDomain {
+    use DiemFramework::Roles;
+    use std::errors;
+    use std::event::{Self, EventHandle};
+    use std::signer;
+    use std::vector;
+    friend DiemFramework::DiemAccount;
+    friend DiemFramework::AccountAdministrationScripts;
+
+    /// This resource holds an entity's domain names.
+    struct VASPDomains has key {
+        /// The list of domain names owned by this parent vasp account
+        domains: vector<VASPDomain>,
+    }
+    spec VASPDomains {
+        /// All `VASPDomain`s stored in the `VASPDomains` resource are no more than 63 characters long.
+        invariant forall i in 0..len(domains): len(domains[i].domain) <= DOMAIN_LENGTH;
+        /// The list of `VASPDomain`s are a set
+        invariant forall i in 0..len(domains):
+        forall j in i + 1..len(domains): domains[i] != domains[j];
+    }
+
+    /// Struct to store the limit on-chain
+    struct VASPDomain has drop, store, copy {
+        domain: vector<u8>, // UTF-8 encoded and 63 characters
+    }
+    spec VASPDomain {
+    /// All `VASPDomain`s must be no more than 63 characters long.
+    invariant len(domain) <= DOMAIN_LENGTH;
+    }
+
+    struct VASPDomainManager has key {
+        /// Event handle for `domains` added or removed events. Emitted every time a domain is added
+        /// or removed to `domains`
+        vasp_domain_events: EventHandle<VASPDomainEvent>,
+    }
+
+    struct VASPDomainEvent has drop, store {
+        /// Whether a domain was added or removed
+        removed: bool,
+        /// VASP Domain string of the account
+        domain: VASPDomain,
+        /// On-chain account address
+        address: address,
+    }
+
+    const DOMAIN_LENGTH: u64 = 63;
+
+    // Error codes
+    /// VASPDomains resource is not or already published.
+    const EVASP_DOMAINS: u64 = 0;
+    /// VASPDomainManager resource is not or already published.
+    const EVASP_DOMAIN_MANAGER: u64 = 1;
+    /// VASP domain was not found
+    const EVASP_DOMAIN_NOT_FOUND: u64 = 2;
+    /// VASP domain already exists
+    const EVASP_DOMAIN_ALREADY_EXISTS: u64 = 3;
+    /// VASPDomains resource was not published for a VASP account
+    const EVASP_DOMAINS_NOT_PUBLISHED: u64 = 4;
+    /// Invalid domain for VASPDomain
+    const EINVALID_VASP_DOMAIN: u64 = 5;
+
+    fun create_vasp_domain(domain: vector<u8>): VASPDomain {
+        assert!(vector::length(&domain) <= DOMAIN_LENGTH, errors::invalid_argument(EINVALID_VASP_DOMAIN));
+        VASPDomain{ domain }
+    }
+    spec create_vasp_domain {
+        include CreateVASPDomainAbortsIf;
+        ensures result == VASPDomain { domain };
+    }
+    spec schema CreateVASPDomainAbortsIf {
+        domain: vector<u8>;
+        aborts_if vector::length(domain) > DOMAIN_LENGTH with errors::INVALID_ARGUMENT;
+    }
+
+    /// Publish a `VASPDomains` resource under `created` with an empty `domains`.
+    /// Before VASP Domains, the Treasury Compliance account must send
+    /// a transaction that invokes `add_vasp_domain` to set the `domains` field with a valid domain
+    public(friend) fun publish_vasp_domains(
+        vasp_account: &signer,
+    ) {
+        Roles::assert_parent_vasp_role(vasp_account);
+        assert!(
+            !exists<VASPDomains>(signer::address_of(vasp_account)),
+            errors::already_published(EVASP_DOMAINS)
+        );
+        move_to(vasp_account, VASPDomains {
+            domains: vector::empty(),
+        })
+    }
+    spec publish_vasp_domains {
+        let vasp_addr = signer::address_of(vasp_account);
+        include Roles::AbortsIfNotParentVasp{account: vasp_account};
+        include PublishVASPDomainsAbortsIf;
+        include PublishVASPDomainsEnsures;
+    }
+    spec schema PublishVASPDomainsAbortsIf {
+        vasp_addr: address;
+        aborts_if has_vasp_domains(vasp_addr) with errors::ALREADY_PUBLISHED;
+    }
+    spec schema PublishVASPDomainsEnsures {
+        vasp_addr: address;
+        ensures exists<VASPDomains>(vasp_addr);
+        ensures vector::is_empty(global<VASPDomains>(vasp_addr).domains);
+    }
+
+    public fun has_vasp_domains(addr: address): bool {
+        exists<VASPDomains>(addr)
+    }
+    spec has_vasp_domains {
+        aborts_if false;
+        ensures result == exists<VASPDomains>(addr);
+    }
+
+    /// Publish a `VASPDomainManager` resource under `tc_account` with an empty `vasp_domain_events`.
+    /// When Treasury Compliance account sends a transaction that invokes either `add_vasp_domain` or
+    /// `remove_vasp_domain`, a `VASPDomainEvent` is emitted and added to `vasp_domain_events`.
+    public(friend) fun publish_vasp_domain_manager(
+        tc_account : &signer,
+    ) {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(
+            !exists<VASPDomainManager>(signer::address_of(tc_account)),
+            errors::already_published(EVASP_DOMAIN_MANAGER)
+        );
+        move_to(
+            tc_account,
+            VASPDomainManager {
+                vasp_domain_events: event::new_event_handle<VASPDomainEvent>(tc_account),
+            }
+        );
+    }
+    spec publish_vasp_domain_manager {
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        aborts_if tc_domain_manager_exists() with errors::ALREADY_PUBLISHED;
+        ensures exists<VASPDomainManager>(signer::address_of(tc_account));
+        modifies global<VASPDomainManager>(signer::address_of(tc_account));
+    }
+
+    /// Add a VASPDomain to a parent VASP's VASPDomains resource.
+    /// When updating VASPDomains, a simple duplicate domain check is done.
+    /// However, since domains are case insensitive, it is possible by error that two same domains in
+    /// different lowercase and uppercase format gets added.
+    public fun add_vasp_domain(
+        tc_account: &signer,
+        address: address,
+        domain: vector<u8>,
+    ) acquires VASPDomainManager, VASPDomains {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(tc_domain_manager_exists(), errors::not_published(EVASP_DOMAIN_MANAGER));
+        assert!(
+            exists<VASPDomains>(address),
+            errors::not_published(EVASP_DOMAINS_NOT_PUBLISHED)
+        );
+
+        let account_domains = borrow_global_mut<VASPDomains>(address);
+        let vasp_domain = create_vasp_domain(domain);
+
+        assert!(
+            !vector::contains(&account_domains.domains, &vasp_domain),
+            errors::invalid_argument(EVASP_DOMAIN_ALREADY_EXISTS)
+        );
+
+        vector::push_back(&mut account_domains.domains, copy vasp_domain);
+
+        event::emit_event(
+            &mut borrow_global_mut<VASPDomainManager>(@TreasuryCompliance).vasp_domain_events,
+            VASPDomainEvent {
+                removed: false,
+                domain: vasp_domain,
+                address,
+            },
+        );
+    }
+    spec add_vasp_domain {
+        include AddVASPDomainAbortsIf;
+        include AddVASPDomainEnsures;
+        include AddVASPDomainEmits;
+    }
+    spec schema AddVASPDomainAbortsIf {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let domains = global<VASPDomains>(address).domains;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include CreateVASPDomainAbortsIf;
+        aborts_if !exists<VASPDomains>(address) with errors::NOT_PUBLISHED;
+        aborts_if !tc_domain_manager_exists() with errors::NOT_PUBLISHED;
+        aborts_if contains(domains, VASPDomain { domain }) with errors::INVALID_ARGUMENT;
+    }
+    spec schema AddVASPDomainEnsures {
+        address: address;
+        domain: vector<u8>;
+        let post domains = global<VASPDomains>(address).domains;
+        ensures contains(domains, VASPDomain { domain });
+    }
+    spec schema AddVASPDomainEmits {
+        address: address;
+        domain: vector<u8>;
+        let handle = global<VASPDomainManager>(@TreasuryCompliance).vasp_domain_events;
+        let msg = VASPDomainEvent {
+            removed: false,
+            domain: VASPDomain { domain },
+            address,
+        };
+        emits msg to handle;
+    }
+
+    /// Remove a VASPDomain from a parent VASP's VASPDomains resource.
+    public fun remove_vasp_domain(
+        tc_account: &signer,
+        address: address,
+        domain: vector<u8>,
+    ) acquires VASPDomainManager, VASPDomains {
+        Roles::assert_treasury_compliance(tc_account);
+        assert!(tc_domain_manager_exists(), errors::not_published(EVASP_DOMAIN_MANAGER));
+        assert!(
+            exists<VASPDomains>(address),
+            errors::not_published(EVASP_DOMAINS_NOT_PUBLISHED)
+        );
+
+        let account_domains = borrow_global_mut<VASPDomains>(address);
+        let vasp_domain = create_vasp_domain(domain);
+
+        let (has, index) = vector::index_of(&account_domains.domains, &vasp_domain);
+        if (has) {
+            vector::remove(&mut account_domains.domains, index);
+        } else {
+            abort errors::invalid_argument(EVASP_DOMAIN_NOT_FOUND)
+        };
+
+        event::emit_event(
+            &mut borrow_global_mut<VASPDomainManager>(@TreasuryCompliance).vasp_domain_events,
+            VASPDomainEvent {
+                removed: true,
+                domain: vasp_domain,
+                address: address,
+            },
+        );
+    }
+    spec remove_vasp_domain {
+        include RemoveVASPDomainAbortsIf;
+        include RemoveVASPDomainEnsures;
+        include RemoveVASPDomainEmits;
+    }
+    spec schema RemoveVASPDomainAbortsIf {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let domains = global<VASPDomains>(address).domains;
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+        include CreateVASPDomainAbortsIf;
+        aborts_if !exists<VASPDomains>(address) with errors::NOT_PUBLISHED;
+        aborts_if !tc_domain_manager_exists() with errors::NOT_PUBLISHED;
+        aborts_if !contains(domains, VASPDomain { domain }) with errors::INVALID_ARGUMENT;
+    }
+    spec schema RemoveVASPDomainEnsures {
+        address: address;
+        domain: vector<u8>;
+        let post domains = global<VASPDomains>(address).domains;
+        ensures !contains(domains, VASPDomain { domain });
+    }
+    spec schema RemoveVASPDomainEmits {
+        tc_account: signer;
+        address: address;
+        domain: vector<u8>;
+        let handle = global<VASPDomainManager>(@TreasuryCompliance).vasp_domain_events;
+        let msg = VASPDomainEvent {
+            removed: true,
+            domain: VASPDomain { domain },
+            address,
+        };
+        emits msg to handle;
+    }
+
+    public fun has_vasp_domain(addr: address, domain: vector<u8>): bool acquires VASPDomains {
+        assert!(
+            exists<VASPDomains>(addr),
+            errors::not_published(EVASP_DOMAINS_NOT_PUBLISHED)
+        );
+        let account_domains = borrow_global<VASPDomains>(addr);
+        let vasp_domain = create_vasp_domain(domain);
+        vector::contains(&account_domains.domains, &vasp_domain)
+    }
+    spec has_vasp_domain {
+        include HasVASPDomainAbortsIf;
+        let id_domain = VASPDomain { domain };
+        ensures result == contains(global<VASPDomains>(addr).domains, id_domain);
+    }
+    spec schema HasVASPDomainAbortsIf {
+        addr: address;
+        domain: vector<u8>;
+        include CreateVASPDomainAbortsIf;
+        aborts_if !exists<VASPDomains>(addr) with errors::NOT_PUBLISHED;
+    }
+
+    public fun tc_domain_manager_exists(): bool {
+        exists<VASPDomainManager>(@TreasuryCompliance)
+    }
+    spec tc_domain_manager_exists {
+        aborts_if false;
+        ensures result == exists<VASPDomainManager>(@TreasuryCompliance);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorAdministrationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorAdministrationScripts.move
new file mode 100644
index 000000000..c54275247
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorAdministrationScripts.move
@@ -0,0 +1,553 @@
+address 0x1 {
+module ValidatorAdministrationScripts {
+    use DiemFramework::DiemSystem;
+    use DiemFramework::SlidingNonce;
+    use DiemFramework::ValidatorConfig;
+    use DiemFramework::ValidatorOperatorConfig;
+
+    /// # Summary
+    /// Adds a validator account to the validator set, and triggers a
+    /// reconfiguration of the system to admit the account to the validator set for the system. This
+    /// transaction can only be successfully called by the Diem Root account.
+    ///
+    /// # Technical Description
+    /// This script adds the account at `validator_address` to the validator set.
+    /// This transaction emits a `DiemConfig::NewEpochEvent` event and triggers a
+    /// reconfiguration. Once the reconfiguration triggered by this script's
+    /// execution has been performed, the account at the `validator_address` is
+    /// considered to be a validator in the network.
+    ///
+    /// This transaction script will fail if the `validator_address` address is already in the validator set
+    /// or does not have a `ValidatorConfig::ValidatorConfig` resource already published under it.
+    ///
+    /// # Parameters
+    /// | Name                | Type         | Description                                                                                                                        |
+    /// | ------              | ------       | -------------                                                                                                                      |
+    /// | `dr_account`        | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.                                               |
+    /// | `sliding_nonce`     | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                                         |
+    /// | `validator_name`    | `vector<u8>` | ASCII-encoded human name for the validator. Must match the human name in the `ValidatorConfig::ValidatorConfig` for the validator. |
+    /// | `validator_address` | `address`    | The validator account address to be added to the validator set.                                                                    |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                 | Description                                                                                                                               |
+    /// | ----------------           | --------------                               | -------------                                                                                                                             |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`               | A `SlidingNonce` resource is not published under `dr_account`.                                                                            |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`               | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not.                                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`               | The `sliding_nonce` is too far in the future.                                                                                             |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`      | The `sliding_nonce` has been previously recorded.                                                                                         |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                  | The sending account is not the Diem Root account.                                                                                         |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::EDIEM_ROOT`                          | The sending account is not the Diem Root account.                                                                                         |
+    /// | 0                          | 0                                            | The provided `validator_name` does not match the already-recorded human name for the validator.                                           |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemSystem::EINVALID_PROSPECTIVE_VALIDATOR` | The validator to be added does not have a `ValidatorConfig::ValidatorConfig` resource published under it, or its `config` field is empty. |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemSystem::EALREADY_A_VALIDATOR`           | The `validator_address` account is already a registered validator.                                                                        |
+    /// | `Errors::INVALID_STATE`    | `DiemConfig::EINVALID_BLOCK_TIME`            | An invalid time value was encountered in reconfiguration. Unlikely to occur.                                                              |
+    /// | `Errors::LIMIT_EXCEEDED`   | `DiemSystem::EMAX_VALIDATORS`                | The validator set is already at its maximum size. The validator could not be added.                                                       |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun add_validator_and_reconfigure(
+        dr_account: signer,
+        sliding_nonce: u64,
+        validator_name: vector<u8>,
+        validator_address: address
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        assert!(ValidatorConfig::get_human_name(validator_address) == validator_name, 0);
+        DiemSystem::add_validator(&dr_account, validator_address);
+    }
+
+
+    spec add_validator_and_reconfigure {
+        use DiemFramework::DiemAccount;
+        use std::errors;
+        use DiemFramework::Roles;
+        use DiemFramework::DiemConfig;
+
+        include DiemAccount::TransactionChecks{sender: dr_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{seq_nonce: sliding_nonce, account: dr_account};
+        // next is due to abort in get_human_name
+        include ValidatorConfig::AbortsIfNoValidatorConfig{addr: validator_address};
+        // TODO: use an error code from Errors.move instead of 0.
+        aborts_if ValidatorConfig::get_human_name(validator_address) != validator_name with 0;
+        include DiemSystem::AddValidatorAbortsIf{validator_addr: validator_address};
+        include DiemSystem::AddValidatorEnsures{validator_addr: validator_address};
+
+        /// Reports INVALID_STATE because of is_operating() and !exists<DiemSystem::CapabilityHolder>.
+        /// is_operating() is always true during transactions, and CapabilityHolder is published
+        /// during initialization (Genesis).
+        /// Reports REQUIRES_ROLE if dr_account is not Diem root, but that can't happen
+        /// in practice because it aborts with NOT_PUBLISHED or REQUIRES_ADDRESS, first.
+        aborts_with [check]
+            0, // Odd error code in assert on second statement in add_validator_and_reconfigure
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ADDRESS,
+            errors::INVALID_STATE,
+            errors::LIMIT_EXCEEDED,
+            errors::REQUIRES_ROLE;
+
+        include DiemConfig::ReconfigureEmits;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can add Validators [[H14]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+    }
+
+    /// # Summary
+    /// Updates a validator's configuration. This does not reconfigure the system and will not update
+    /// the configuration in the validator set that is seen by other validators in the network. Can
+    /// only be successfully sent by a Validator Operator account that is already registered with a
+    /// validator.
+    ///
+    /// # Technical Description
+    /// This updates the fields with corresponding names held in the `ValidatorConfig::ValidatorConfig`
+    /// config resource held under `validator_account`. It does not emit a `DiemConfig::NewEpochEvent`
+    /// so the copy of this config held in the validator set will not be updated, and the changes are
+    /// only "locally" under the `validator_account` account address.
+    ///
+    /// # Parameters
+    /// | Name                          | Type         | Description                                                                                                        |
+    /// | ------                        | ------       | -------------                                                                                                      |
+    /// | `validator_operator_account`  | `signer`     | Signer of the sending account. Must be the registered validator operator for the validator at `validator_address`. |
+    /// | `validator_account`           | `address`    | The address of the validator's `ValidatorConfig::ValidatorConfig` resource being updated.                          |
+    /// | `consensus_pubkey`            | `vector<u8>` | New Ed25519 public key to be used in the updated `ValidatorConfig::ValidatorConfig`.                               |
+    /// | `validator_network_addresses` | `vector<u8>` | New set of `validator_network_addresses` to be used in the updated `ValidatorConfig::ValidatorConfig`.             |
+    /// | `fullnode_network_addresses`  | `vector<u8>` | New set of `fullnode_network_addresses` to be used in the updated `ValidatorConfig::ValidatorConfig`.              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                   | Description                                                                                           |
+    /// | ----------------           | --------------                                 | -------------                                                                                         |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorConfig::EVALIDATOR_CONFIG`           | `validator_address` does not have a `ValidatorConfig::ValidatorConfig` resource published under it.   |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::EINVALID_TRANSACTION_SENDER` | `validator_operator_account` is not the registered operator for the validator at `validator_address`. |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::EINVALID_CONSENSUS_KEY`      | `consensus_pubkey` is not a valid ed25519 public key.                                                 |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun register_validator_config(
+        validator_operator_account: signer,
+        // TODO Rename to validator_addr, since it is an address.
+        validator_account: address,
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    ) {
+        ValidatorConfig::set_config(
+            &validator_operator_account,
+            validator_account,
+            consensus_pubkey,
+            validator_network_addresses,
+            fullnode_network_addresses
+        );
+     }
+
+    /// Access control rule is that only the validator operator for a validator may set
+    /// call this, but there is an aborts_if in SetConfigAbortsIf that tests that directly.
+    spec register_validator_config {
+        use std::errors;
+        use DiemFramework::DiemAccount;
+        use std::signer;
+
+        include DiemAccount::TransactionChecks{sender: validator_operator_account}; // properties checked by the prologue.
+        include ValidatorConfig::SetConfigAbortsIf {validator_addr: validator_account};
+        ensures ValidatorConfig::is_valid(validator_account);
+
+        aborts_with [check]
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED;
+
+        /// **Access Control:**
+        /// Only the Validator Operator account which has been registered with the validator can
+        /// update the validator's configuration [[H15]][PERMISSION].
+        aborts_if signer::address_of(validator_operator_account) !=
+                    ValidatorConfig::get_operator(validator_account)
+                        with errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// This script removes a validator account from the validator set, and triggers a reconfiguration
+    /// of the system to remove the validator from the system. This transaction can only be
+    /// successfully called by the Diem Root account.
+    ///
+    /// # Technical Description
+    /// This script removes the account at `validator_address` from the validator set. This transaction
+    /// emits a `DiemConfig::NewEpochEvent` event. Once the reconfiguration triggered by this event
+    /// has been performed, the account at `validator_address` is no longer considered to be a
+    /// validator in the network. This transaction will fail if the validator at `validator_address`
+    /// is not in the validator set.
+    ///
+    /// # Parameters
+    /// | Name                | Type         | Description                                                                                                                        |
+    /// | ------              | ------       | -------------                                                                                                                      |
+    /// | `dr_account`        | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.                                               |
+    /// | `sliding_nonce`     | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                                                         |
+    /// | `validator_name`    | `vector<u8>` | ASCII-encoded human name for the validator. Must match the human name in the `ValidatorConfig::ValidatorConfig` for the validator. |
+    /// | `validator_address` | `address`    | The validator account address to be removed from the validator set.                                                                |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                            | Description                                                                                     |
+    /// | ----------------           | --------------                          | -------------                                                                                   |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `dr_account`.                                  |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not.      |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                                   |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                               |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`          | The sending account is not the Diem Root account or Treasury Compliance account                |
+    /// | 0                          | 0                                       | The provided `validator_name` does not match the already-recorded human name for the validator. |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemSystem::ENOT_AN_ACTIVE_VALIDATOR` | The validator to be removed is not in the validator set.                                        |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`            | The sending account is not the Diem Root account.                                              |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::EDIEM_ROOT`                    | The sending account is not the Diem Root account.                                              |
+    /// | `Errors::INVALID_STATE`    | `DiemConfig::EINVALID_BLOCK_TIME`      | An invalid time value was encountered in reconfiguration. Unlikely to occur.                    |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun remove_validator_and_reconfigure(
+        dr_account: signer,
+        sliding_nonce: u64,
+        validator_name: vector<u8>,
+        validator_address: address
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        // TODO: Use an error code from Errors.move
+        assert!(ValidatorConfig::get_human_name(validator_address) == validator_name, 0);
+        DiemSystem::remove_validator(&dr_account, validator_address);
+    }
+
+    spec remove_validator_and_reconfigure {
+        use DiemFramework::DiemAccount;
+        use std::errors;
+        use DiemFramework::Roles;
+        use DiemFramework::DiemConfig;
+
+        include DiemAccount::TransactionChecks{sender: dr_account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{seq_nonce: sliding_nonce, account: dr_account};
+        // next is due to abort in get_human_name
+        include ValidatorConfig::AbortsIfNoValidatorConfig{addr: validator_address};
+        // TODO: use an error code from Errors.move instead of 0.
+        aborts_if ValidatorConfig::get_human_name(validator_address) != validator_name with 0;
+        include DiemSystem::RemoveValidatorAbortsIf{validator_addr: validator_address};
+        include DiemSystem::RemoveValidatorEnsures{validator_addr: validator_address};
+
+        /// Reports INVALID_STATE because of is_operating() and !exists<DiemSystem::CapabilityHolder>.
+        /// is_operating() is always true during transactions, and CapabilityHolder is published
+        /// during initialization (Genesis).
+        /// Reports REQUIRES_ROLE if dr_account is not Diem root, but that can't happen
+        /// in practice because it aborts with NOT_PUBLISHED or REQUIRES_ADDRESS, first.
+        aborts_with [check]
+            0, // Odd error code in assert on second statement in add_validator_and_reconfigure
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ADDRESS,
+            errors::INVALID_STATE,
+            errors::REQUIRES_ROLE;
+
+        include DiemConfig::ReconfigureEmits;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can remove Validators [[H14]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+    }
+
+    /// # Summary
+    /// Updates a validator's configuration, and triggers a reconfiguration of the system to update the
+    /// validator set with this new validator configuration.  Can only be successfully sent by a
+    /// Validator Operator account that is already registered with a validator.
+    ///
+    /// # Technical Description
+    /// This updates the fields with corresponding names held in the `ValidatorConfig::ValidatorConfig`
+    /// config resource held under `validator_account`. It then emits a `DiemConfig::NewEpochEvent` to
+    /// trigger a reconfiguration of the system.  This reconfiguration will update the validator set
+    /// on-chain with the updated `ValidatorConfig::ValidatorConfig`.
+    ///
+    /// # Parameters
+    /// | Name                          | Type         | Description                                                                                                        |
+    /// | ------                        | ------       | -------------                                                                                                      |
+    /// | `validator_operator_account`  | `signer`     | Signer of the sending account. Must be the registered validator operator for the validator at `validator_address`. |
+    /// | `validator_account`           | `address`    | The address of the validator's `ValidatorConfig::ValidatorConfig` resource being updated.                          |
+    /// | `consensus_pubkey`            | `vector<u8>` | New Ed25519 public key to be used in the updated `ValidatorConfig::ValidatorConfig`.                               |
+    /// | `validator_network_addresses` | `vector<u8>` | New set of `validator_network_addresses` to be used in the updated `ValidatorConfig::ValidatorConfig`.             |
+    /// | `fullnode_network_addresses`  | `vector<u8>` | New set of `fullnode_network_addresses` to be used in the updated `ValidatorConfig::ValidatorConfig`.              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                   | Description                                                                                           |
+    /// | ----------------           | --------------                                 | -------------                                                                                         |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorConfig::EVALIDATOR_CONFIG`           | `validator_address` does not have a `ValidatorConfig::ValidatorConfig` resource published under it.   |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::EVALIDATOR_OPERATOR`                   | `validator_operator_account` does not have a Validator Operator role.                                 |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::EINVALID_TRANSACTION_SENDER` | `validator_operator_account` is not the registered operator for the validator at `validator_address`. |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::EINVALID_CONSENSUS_KEY`      | `consensus_pubkey` is not a valid ed25519 public key.                                                 |
+    /// | `Errors::INVALID_STATE`    | `DiemConfig::EINVALID_BLOCK_TIME`             | An invalid time value was encountered in reconfiguration. Unlikely to occur.                          |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+
+    public entry fun set_validator_config_and_reconfigure(
+        validator_operator_account: signer,
+        validator_account: address,
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    ) {
+        ValidatorConfig::set_config(
+            &validator_operator_account,
+            validator_account,
+            consensus_pubkey,
+            validator_network_addresses,
+            fullnode_network_addresses
+        );
+        DiemSystem::update_config_and_reconfigure(&validator_operator_account, validator_account);
+     }
+
+    spec set_validator_config_and_reconfigure {
+        use DiemFramework::DiemAccount;
+        use DiemFramework::DiemConfig;
+        use DiemFramework::DiemSystem;
+        use DiemFramework::DiemTimestamp;
+        use std::errors;
+        use std::signer;
+
+         // properties checked by the prologue.
+       include DiemAccount::TransactionChecks{sender: validator_operator_account};
+        // UpdateConfigAndReconfigureEnsures includes properties such as not changing info
+        // for validators in the validator_set other than that for validator_account, etc.
+        // These properties are important for access control. See notes in DiemSystem.
+        include DiemSystem::UpdateConfigAndReconfigureEnsures{validator_addr: validator_account};
+        ensures ValidatorConfig::is_valid(validator_account);
+        // The published ValidatorConfig has the correct data, according to the arguments to
+        // set_validator_config_and_reconfigure
+        ensures ValidatorConfig::spec_get_config(validator_account)
+            == ValidatorConfig::Config {
+                        consensus_pubkey,
+                        validator_network_addresses,
+                        fullnode_network_addresses,
+        };
+
+        include ValidatorConfig::SetConfigAbortsIf{validator_addr: validator_account};
+        include DiemSystem::UpdateConfigAndReconfigureAbortsIf{validator_addr: validator_account};
+
+        // Reconfiguration only happens if validator info changes for a validator in the validator set.
+        // v_info.config is the old config (if it exists) and the Config with args from set_config is
+        // the new config
+        let is_validator_info_updated =
+            (exists v_info in DiemSystem::spec_get_validators():
+                v_info.addr == validator_account
+                && v_info.config != ValidatorConfig::Config {
+                        consensus_pubkey,
+                        validator_network_addresses,
+                        fullnode_network_addresses,
+                   });
+        include is_validator_info_updated ==> DiemConfig::ReconfigureAbortsIf;
+        let validator_index = DiemSystem::spec_index_of_validator(DiemSystem::spec_get_validators(), validator_account);
+        let last_config_time = DiemSystem::spec_get_validators()[validator_index].last_config_update_time;
+        aborts_if is_validator_info_updated && last_config_time > DiemSystem::MAX_U64 - DiemSystem::FIVE_MINUTES
+            with errors::LIMIT_EXCEEDED;
+        aborts_if is_validator_info_updated && DiemTimestamp::spec_now_microseconds() <= last_config_time + DiemSystem::FIVE_MINUTES
+            with errors::LIMIT_EXCEEDED;
+
+        /// This reports a possible INVALID_STATE abort, which comes from an assert in DiemConfig::reconfigure_
+        /// that config.last_reconfiguration_time is not in the future. This is a system error that a user
+        /// for which there is no useful recovery except to resubmit the transaction.
+        aborts_with [check]
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ROLE,
+            errors::INVALID_ARGUMENT,
+            errors::INVALID_STATE;
+
+        include is_validator_info_updated ==> DiemConfig::ReconfigureEmits;
+
+        /// **Access Control:**
+        /// Only the Validator Operator account which has been registered with the validator can
+        /// update the validator's configuration [[H15]][PERMISSION].
+        aborts_if signer::address_of(validator_operator_account) !=
+                    ValidatorConfig::get_operator(validator_account)
+                        with errors::INVALID_ARGUMENT;
+    }
+
+    /// # Summary
+    /// Sets the validator operator for a validator in the validator's configuration resource "locally"
+    /// and does not reconfigure the system. Changes from this transaction will not picked up by the
+    /// system until a reconfiguration of the system is triggered. May only be sent by an account with
+    /// Validator role.
+    ///
+    /// # Technical Description
+    /// Sets the account at `operator_account` address and with the specified `human_name` as an
+    /// operator for the sending validator account. The account at `operator_account` address must have
+    /// a Validator Operator role and have a `ValidatorOperatorConfig::ValidatorOperatorConfig`
+    /// resource published under it. The sending `account` must be a Validator and have a
+    /// `ValidatorConfig::ValidatorConfig` resource published under it. This script does not emit a
+    /// `DiemConfig::NewEpochEvent` and no reconfiguration of the system is initiated by this script.
+    ///
+    /// # Parameters
+    /// | Name               | Type         | Description                                                                                  |
+    /// | ------             | ------       | -------------                                                                                |
+    /// | `account`          | `signer`     | The signer of the sending account of the transaction.                                        |
+    /// | `operator_name`    | `vector<u8>` | Validator operator's human name.                                                             |
+    /// | `operator_account` | `address`    | Address of the validator operator account to be added as the `account` validator's operator. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                          | Description                                                                                                                                                  |
+    /// | ----------------           | --------------                                        | -------------                                                                                                                                                |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorOperatorConfig::EVALIDATOR_OPERATOR_CONFIG` | The `ValidatorOperatorConfig::ValidatorOperatorConfig` resource is not published under `operator_account`.                                                   |
+    /// | 0                          | 0                                                     | The `human_name` field of the `ValidatorOperatorConfig::ValidatorOperatorConfig` resource under `operator_account` does not match the provided `human_name`. |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::EVALIDATOR`                                   | `account` does not have a Validator account role.                                                                                                            |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::ENOT_A_VALIDATOR_OPERATOR`          | The account at `operator_account` does not have a `ValidatorOperatorConfig::ValidatorOperatorConfig` resource.                                               |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorConfig::EVALIDATOR_CONFIG`                  | A `ValidatorConfig::ValidatorConfig` is not published under `account`.                                                                                       |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun set_validator_operator(
+        account: signer,
+        operator_name: vector<u8>,
+        operator_account: address
+    ) {
+        assert!(ValidatorOperatorConfig::get_human_name(operator_account) == operator_name, 0);
+        ValidatorConfig::set_operator(&account, operator_account);
+    }
+
+    spec set_validator_operator {
+        use DiemFramework::DiemAccount;
+        use std::signer;
+        use std::errors;
+        use DiemFramework::Roles;
+
+        let account_addr = signer::address_of(account);
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        // next is due to abort in get_human_name
+        include ValidatorConfig::AbortsIfNoValidatorConfig{addr: account_addr};
+        // TODO: use an error code from Errors.move instead of 0.
+        aborts_if ValidatorOperatorConfig::get_human_name(operator_account) != operator_name with 0;
+        include ValidatorConfig::SetOperatorAbortsIf{validator_account: account, operator_addr: operator_account};
+        include ValidatorConfig::SetOperatorEnsures{validator_account: account, operator_addr: operator_account};
+
+        /// Reports INVALID_STATE because of !exists<DiemSystem::CapabilityHolder>, but that can't happen
+        /// because CapabilityHolder is published during initialization (Genesis).
+        aborts_with [check]
+            0, // Odd error code in assert on second statement in add_validator_and_reconfigure
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        /// **Access Control:**
+        /// Only a Validator account can set its Validator Operator [[H16]][PERMISSION].
+        include Roles::AbortsIfNotValidator;
+    }
+
+    /// # Summary
+    /// Sets the validator operator for a validator in the validator's configuration resource "locally"
+    /// and does not reconfigure the system. Changes from this transaction will not picked up by the
+    /// system until a reconfiguration of the system is triggered. May only be sent by the Diem Root
+    /// account as a write set transaction.
+    ///
+    /// # Technical Description
+    /// Sets the account at `operator_account` address and with the specified `human_name` as an
+    /// operator for the validator `account`. The account at `operator_account` address must have a
+    /// Validator Operator role and have a `ValidatorOperatorConfig::ValidatorOperatorConfig` resource
+    /// published under it. The account represented by the `account` signer must be a Validator and
+    /// have a `ValidatorConfig::ValidatorConfig` resource published under it. No reconfiguration of
+    /// the system is initiated by this script.
+    ///
+    /// # Parameters
+    /// | Name               | Type         | Description                                                                                   |
+    /// | ------             | ------       | -------------                                                                                 |
+    /// | `dr_account`       | `signer`     | Signer of the sending account of the write set transaction. May only be the Diem Root signer. |
+    /// | `account`          | `signer`     | Signer of account specified in the `execute_as` field of the write set transaction.           |
+    /// | `sliding_nonce`    | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction for Diem Root.      |
+    /// | `operator_name`    | `vector<u8>` | Validator operator's human name.                                                              |
+    /// | `operator_account` | `address`    | Address of the validator operator account to be added as the `account` validator's operator.  |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                          | Description                                                                                                                                                  |
+    /// | ----------------           | --------------                                        | -------------                                                                                                                                                |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                        | A `SlidingNonce` resource is not published under `dr_account`.                                                                                               |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_OLD`                        | The `sliding_nonce` in `dr_account` is too old and it's impossible to determine if it's duplicated or not.                                                   |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_TOO_NEW`                        | The `sliding_nonce` in `dr_account` is too far in the future.                                                                                                |
+    /// | `Errors::INVALID_ARGUMENT` | `SlidingNonce::ENONCE_ALREADY_RECORDED`               | The `sliding_nonce` in` dr_account` has been previously recorded.                                                                                            |
+    /// | `Errors::NOT_PUBLISHED`    | `SlidingNonce::ESLIDING_NONCE`                        | The sending account is not the Diem Root account or Treasury Compliance account                                                                             |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorOperatorConfig::EVALIDATOR_OPERATOR_CONFIG` | The `ValidatorOperatorConfig::ValidatorOperatorConfig` resource is not published under `operator_account`.                                                   |
+    /// | 0                          | 0                                                     | The `human_name` field of the `ValidatorOperatorConfig::ValidatorOperatorConfig` resource under `operator_account` does not match the provided `human_name`. |
+    /// | `Errors::REQUIRES_ROLE`    | `Roles::EVALIDATOR`                                   | `account` does not have a Validator account role.                                                                                                            |
+    /// | `Errors::INVALID_ARGUMENT` | `ValidatorConfig::ENOT_A_VALIDATOR_OPERATOR`          | The account at `operator_account` does not have a `ValidatorOperatorConfig::ValidatorOperatorConfig` resource.                                               |
+    /// | `Errors::NOT_PUBLISHED`    | `ValidatorConfig::EVALIDATOR_CONFIG`                  | A `ValidatorConfig::ValidatorConfig` is not published under `account`.                                                                                       |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun set_validator_operator_with_nonce_admin(
+        dr_account: signer,
+        account: signer,
+        sliding_nonce: u64,
+        operator_name: vector<u8>,
+        operator_account: address
+    ) {
+        SlidingNonce::record_nonce_or_abort(&dr_account, sliding_nonce);
+        assert!(ValidatorOperatorConfig::get_human_name(operator_account) == operator_name, 0);
+        ValidatorConfig::set_operator(&account, operator_account);
+    }
+
+    spec set_validator_operator_with_nonce_admin {
+        use DiemFramework::DiemAccount;
+        use std::signer;
+        use std::errors;
+        use DiemFramework::Roles;
+
+        let account_addr = signer::address_of(account);
+        include DiemAccount::TransactionChecks{sender: account}; // properties checked by the prologue.
+        include SlidingNonce::RecordNonceAbortsIf{seq_nonce: sliding_nonce, account: dr_account};
+        // next is due to abort in get_human_name
+        include ValidatorConfig::AbortsIfNoValidatorConfig{addr: account_addr};
+        // TODO: use an error code from Errors.move instead of 0.
+        aborts_if ValidatorOperatorConfig::get_human_name(operator_account) != operator_name with 0;
+        include ValidatorConfig::SetOperatorAbortsIf{validator_account: account, operator_addr: operator_account};
+        include ValidatorConfig::SetOperatorEnsures{validator_account: account, operator_addr: operator_account};
+
+        aborts_with [check]
+            0, // Odd error code in assert on second statement in add_validator_and_reconfigure
+            errors::INVALID_ARGUMENT,
+            errors::NOT_PUBLISHED,
+            errors::REQUIRES_ROLE;
+
+        /// **Access Control:**
+        /// Only the Diem Root account can process the admin scripts [[H9]][PERMISSION].
+        requires Roles::has_diem_root_role(dr_account); /// This is ensured by DiemAccount::writeset_prologue.
+        /// Only a Validator account can set its Validator Operator [[H16]][PERMISSION].
+        include Roles::AbortsIfNotValidator;
+    }
+}
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorConfig.move
new file mode 100644
index 000000000..d57640276
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorConfig.move
@@ -0,0 +1,362 @@
+/// The ValidatorConfig resource holds information about a validator. Information
+/// is published and updated by Diem root in a `Self::ValidatorConfig` in preparation for
+/// later inclusion (by functions in DiemConfig) in a `DiemConfig::DiemConfig<DiemSystem>`
+/// struct (the `Self::ValidatorConfig` in a `DiemConfig::ValidatorInfo` which is a member
+/// of the `DiemSystem::DiemSystem.validators` vector).
+module DiemFramework::ValidatorConfig {
+    use DiemFramework::DiemTimestamp;
+    use std::errors;
+    use DiemFramework::Signature;
+    use DiemFramework::Roles;
+    use DiemFramework::ValidatorOperatorConfig;
+    use std::option::{Self, Option};
+    use std::signer;
+    friend DiemFramework::DiemAccount;
+
+    #[test_only]
+    friend DiemFramework::ValidatorConfigTests;
+
+    struct Config has copy, drop, store {
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    }
+
+    struct ValidatorConfig has key {
+        /// set and rotated by the operator_account
+        config: Option<Config>,
+        operator_account: Option<address>,
+        /// The human readable name of this entity. Immutable.
+        human_name: vector<u8>,
+    }
+
+    // TODO(valerini): add events here
+
+    /// The `ValidatorConfig` resource was not in the required state
+    const EVALIDATOR_CONFIG: u64 = 0;
+    /// The sender is not the operator for the specified validator
+    const EINVALID_TRANSACTION_SENDER: u64 = 1;
+    /// The provided consensus public key is malformed
+    const EINVALID_CONSENSUS_KEY: u64 = 2;
+    /// Tried to set an account without the correct operator role as a Validator Operator
+    const ENOT_A_VALIDATOR_OPERATOR: u64 = 3;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Validator setup methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Publishes a mostly empty ValidatorConfig struct. Eventually, it
+    /// will have critical info such as keys, network addresses for validators,
+    /// and the address of the validator operator.
+    public(friend) fun publish(
+        validator_account: &signer,
+        dr_account: &signer,
+        human_name: vector<u8>,
+    ) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        Roles::assert_validator(validator_account);
+        assert!(
+            !exists<ValidatorConfig>(signer::address_of(validator_account)),
+            errors::already_published(EVALIDATOR_CONFIG)
+        );
+        move_to(validator_account, ValidatorConfig {
+            config: option::none(),
+            operator_account: option::none(),
+            human_name,
+        });
+    }
+
+    spec publish {
+        include PublishAbortsIf;
+        ensures exists_config(signer::address_of(validator_account));
+    }
+
+    spec schema PublishAbortsIf {
+        validator_account: signer;
+        dr_account: signer;
+        let validator_addr = signer::address_of(validator_account);
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include Roles::AbortsIfNotValidator{account: validator_account};
+        aborts_if exists_config(validator_addr)
+            with errors::ALREADY_PUBLISHED;
+    }
+
+    /// Returns true if a ValidatorConfig resource exists under addr.
+    fun exists_config(addr: address): bool {
+        exists<ValidatorConfig>(addr)
+    }
+
+    /// Describes abort if ValidatorConfig does not exist.
+    spec schema AbortsIfNoValidatorConfig {
+        addr: address;
+        aborts_if !exists_config(addr) with errors::NOT_PUBLISHED;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Rotation methods callable by ValidatorConfig owner
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Sets a new operator account, preserving the old config.
+    /// Note: Access control.  No one but the owner of the account may change .operator_account
+    public fun set_operator(validator_account: &signer, operator_addr: address) acquires ValidatorConfig {
+        Roles::assert_validator(validator_account);
+        // Check for validator role is not necessary since the role is checked when the config
+        // resource is published.
+        assert!(
+            ValidatorOperatorConfig::has_validator_operator_config(operator_addr),
+            errors::invalid_argument(ENOT_A_VALIDATOR_OPERATOR)
+        );
+        let sender = signer::address_of(validator_account);
+        assert!(exists_config(sender), errors::not_published(EVALIDATOR_CONFIG));
+        (borrow_global_mut<ValidatorConfig>(sender)).operator_account = option::some(operator_addr);
+    }
+    spec set_operator {
+        /// Must abort if the signer does not have the Validator role [[H16]][PERMISSION].
+        include Roles::AbortsIfNotValidator{account: validator_account};
+        include SetOperatorAbortsIf;
+        include SetOperatorEnsures;
+    }
+
+    spec schema SetOperatorAbortsIf {
+        /// Must abort if the signer does not have the Validator role [B24].
+        validator_account: signer;
+        operator_addr: address;
+        let validator_addr = signer::address_of(validator_account);
+        include Roles::AbortsIfNotValidator{account: validator_account};
+        aborts_if !ValidatorOperatorConfig::has_validator_operator_config(operator_addr)
+            with errors::INVALID_ARGUMENT;
+        include AbortsIfNoValidatorConfig{addr: validator_addr};
+        aborts_if !ValidatorOperatorConfig::has_validator_operator_config(operator_addr) with errors::NOT_PUBLISHED;
+    }
+
+    spec schema SetOperatorEnsures {
+        validator_account: signer;
+        operator_addr: address;
+        let validator_addr = signer::address_of(validator_account);
+        ensures spec_has_operator(validator_addr);
+        ensures get_operator(validator_addr) == operator_addr;
+        /// The signer can only change its own operator account [[H16]][PERMISSION].
+        ensures forall addr: address where addr != validator_addr:
+            global<ValidatorConfig>(addr).operator_account == old(global<ValidatorConfig>(addr).operator_account);
+    }
+
+    /// Removes an operator account, setting a corresponding field to Option::none.
+    /// The old config is preserved.
+    public fun remove_operator(validator_account: &signer) acquires ValidatorConfig {
+        Roles::assert_validator(validator_account);
+        let sender = signer::address_of(validator_account);
+        // Config field remains set
+        assert!(exists_config(sender), errors::not_published(EVALIDATOR_CONFIG));
+        (borrow_global_mut<ValidatorConfig>(sender)).operator_account = option::none();
+    }
+
+    spec remove_operator {
+        /// Must abort if the signer does not have the Validator role [[H16]][PERMISSION].
+        let sender = signer::address_of(validator_account);
+        include Roles::AbortsIfNotValidator{account: validator_account};
+        include AbortsIfNoValidatorConfig{addr: sender};
+        ensures !spec_has_operator(signer::address_of(validator_account));
+
+        /// The signer can only change its own operator account [[H16]][PERMISSION].
+        ensures forall addr: address where addr != sender:
+            global<ValidatorConfig>(addr).operator_account == old(global<ValidatorConfig>(addr).operator_account);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Rotation methods callable by ValidatorConfig.operator_account
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Rotate the config in the validator_account.
+    /// Once the config is set, it can not go back to `Option::none` - this is crucial for validity
+    /// of the DiemSystem's code.
+    public fun set_config(
+        validator_operator_account: &signer,
+        validator_addr: address,
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    ) acquires ValidatorConfig {
+        assert!(
+            signer::address_of(validator_operator_account) == get_operator(validator_addr),
+            errors::invalid_argument(EINVALID_TRANSACTION_SENDER)
+        );
+        assert!(
+            Signature::ed25519_validate_pubkey(copy consensus_pubkey),
+            errors::invalid_argument(EINVALID_CONSENSUS_KEY)
+        );
+        // TODO(valerini): verify the proof of posession for consensus_pubkey
+        assert!(exists_config(validator_addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global_mut<ValidatorConfig>(validator_addr);
+        t_ref.config = option::some(Config {
+            consensus_pubkey,
+            validator_network_addresses,
+            fullnode_network_addresses,
+        });
+    }
+    spec set_config {
+        pragma opaque;
+        modifies global<ValidatorConfig>(validator_addr);
+        include SetConfigAbortsIf;
+        ensures is_valid(validator_addr);
+        ensures global<ValidatorConfig>(validator_addr)
+                == update_field(old(global<ValidatorConfig>(validator_addr)),
+                                config,
+                                option::spec_some(Config {
+                                                 consensus_pubkey,
+                                                 validator_network_addresses,
+                                                 fullnode_network_addresses,
+                                             }));
+    }
+    spec schema SetConfigAbortsIf {
+        validator_operator_account: signer;
+        validator_addr: address;
+        consensus_pubkey: vector<u8>;
+        aborts_if signer::address_of(validator_operator_account) != get_operator(validator_addr)
+            with errors::INVALID_ARGUMENT;
+        include AbortsIfGetOperator{addr: validator_addr};
+        aborts_if !Signature::ed25519_validate_pubkey(consensus_pubkey) with errors::INVALID_ARGUMENT;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs: getters
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Returns true if all of the following is true:
+    /// 1) there is a ValidatorConfig resource under the address, and
+    /// 2) the config is set, and
+    /// we do not require the operator_account to be set to make sure
+    /// that if the validator account becomes valid, it stays valid, e.g.
+    /// all validators in the Validator Set are valid
+    public fun is_valid(addr: address): bool acquires ValidatorConfig {
+        exists<ValidatorConfig>(addr) && option::is_some(&borrow_global<ValidatorConfig>(addr).config)
+    }
+
+    spec is_valid {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_valid(addr);
+    }
+
+    /// Get Config
+    /// Aborts if there is no ValidatorConfig resource or if its config is empty
+    public fun get_config(addr: address): Config acquires ValidatorConfig {
+        assert!(exists_config(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let config = &borrow_global<ValidatorConfig>(addr).config;
+        assert!(option::is_some(config), errors::invalid_argument(EVALIDATOR_CONFIG));
+        *option::borrow(config)
+    }
+
+    spec get_config {
+        pragma opaque;
+        include AbortsIfNoValidatorConfig;
+        aborts_if option::is_none(global<ValidatorConfig>(addr).config) with errors::INVALID_ARGUMENT;
+        ensures result == spec_get_config(addr);
+    }
+
+    /// Returns the config published under addr.
+    spec fun spec_get_config(addr: address): Config {
+        option::borrow(global<ValidatorConfig>(addr).config)
+    }
+
+    /// Get validator's account human name
+    /// Aborts if there is no ValidatorConfig resource
+    public fun get_human_name(addr: address): vector<u8> acquires ValidatorConfig {
+        assert!(exists<ValidatorConfig>(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global<ValidatorConfig>(addr);
+        *&t_ref.human_name
+    }
+
+    spec get_human_name {
+        pragma opaque;
+        include AbortsIfNoValidatorConfig;
+        ensures result == get_human_name(addr);
+    }
+
+    /// Get operator's account
+    /// Aborts if there is no ValidatorConfig resource or
+    /// if the operator_account is unset
+    public fun get_operator(addr: address): address acquires ValidatorConfig {
+        assert!(exists<ValidatorConfig>(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global<ValidatorConfig>(addr);
+        assert!(option::is_some(&t_ref.operator_account), errors::invalid_argument(EVALIDATOR_CONFIG));
+        *option::borrow(&t_ref.operator_account)
+    }
+
+    spec get_operator {
+        pragma opaque;
+        include AbortsIfGetOperator;
+        ensures result == get_operator(addr);
+    }
+
+    spec schema AbortsIfGetOperator {
+        addr: address;
+        include AbortsIfNoValidatorConfig;
+        aborts_if !spec_has_operator(addr) with errors::INVALID_ARGUMENT;
+    }
+
+    /// Get consensus_pubkey from Config
+    /// Never aborts
+    public fun get_consensus_pubkey(config_ref: &Config): &vector<u8> {
+        &config_ref.consensus_pubkey
+    }
+
+    /// Get validator's network address from Config
+    /// Never aborts
+    public fun get_validator_network_addresses(config_ref: &Config): &vector<u8> {
+        &config_ref.validator_network_addresses
+    }
+
+    spec module {} // Switch documentation context to module level.
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+
+    /// # Access Control
+
+    /// The permission "{Set,Remove}ValidatorOperator(addr)" is granted to Validator [[H16]][PERMISSION]
+    spec module {
+        invariant update forall a: address where old(exists<ValidatorConfig>(a)) && exists<ValidatorConfig>(a):
+            old(global<ValidatorConfig>(a).operator_account) != global<ValidatorConfig>(a).operator_account
+                ==> signer::is_txn_signer_addr(a) && Roles::spec_has_validator_role_addr(a);
+    }
+
+    /// # Validity of Validators
+
+    /// See comment on `ValidatorConfig::set_config` -- DiemSystem depends on this.
+    spec module {
+        /// A validator stays valid once it becomes valid.
+        invariant update
+            forall validator: address where old(is_valid(validator)): is_valid(validator);
+    }
+
+    /// # Consistency Between Resources and Roles
+
+    spec module {
+
+        /// Every address that has a ValidatorConfig also has a validator role.
+        invariant forall addr: address where exists_config(addr):
+            Roles::spec_has_validator_role_addr(addr);
+
+        /// DIP-6 Property: If address has a ValidatorConfig, it has a validator role.  This invariant is useful
+        /// in DiemSystem so we don't have to check whether every validator address has a validator role.
+        invariant forall addr: address where exists_config(addr):
+            Roles::spec_has_validator_role_addr(addr);
+
+        /// DIP-6 Property: Every address that is_valid (meaning it has a ValidatorConfig with
+        /// a config option that is "some") has a validator role. This is a trivial consequence
+        /// of the previous invariant, but it is not inductive and can't be proved without the
+        /// previous one as a helper.
+        invariant forall addr: address where is_valid(addr):
+            Roles::spec_has_validator_role_addr(addr);
+    }
+
+    /// # Helper Function
+
+    /// Returns true if addr has an operator account.
+    spec fun spec_has_operator(addr: address): bool {
+        option::is_some(global<ValidatorConfig>(addr).operator_account)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorOperatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorOperatorConfig.move
new file mode 100644
index 000000000..b843a9790
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/ValidatorOperatorConfig.move
@@ -0,0 +1,92 @@
+/// Stores the string name of a ValidatorOperator account.
+module DiemFramework::ValidatorOperatorConfig {
+    use std::errors;
+    use std::signer;
+    use DiemFramework::Roles;
+    use DiemFramework::DiemTimestamp;
+    friend DiemFramework::DiemAccount;
+
+    #[test_only]
+    friend DiemFramework::ValidatorOperatorConfigTests;
+
+    #[test_only]
+    friend DiemFramework::ValidatorConfigTests;
+
+    struct ValidatorOperatorConfig has key {
+        /// The human readable name of this entity. Immutable.
+        human_name: vector<u8>,
+    }
+
+    /// The `ValidatorOperatorConfig` was not in the required state
+    const EVALIDATOR_OPERATOR_CONFIG: u64 = 0;
+
+    public(friend) fun publish(
+        validator_operator_account: &signer,
+        dr_account: &signer,
+        human_name: vector<u8>,
+    ) {
+        DiemTimestamp::assert_operating();
+        Roles::assert_diem_root(dr_account);
+        Roles::assert_validator_operator(validator_operator_account);
+        assert!(
+            !has_validator_operator_config(signer::address_of(validator_operator_account)),
+            errors::already_published(EVALIDATOR_OPERATOR_CONFIG)
+        );
+
+        move_to(validator_operator_account, ValidatorOperatorConfig {
+            human_name,
+        });
+    }
+    spec publish {
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include Roles::AbortsIfNotValidatorOperator{account: validator_operator_account};
+        include PublishAbortsIf;
+        ensures has_validator_operator_config(signer::address_of(validator_operator_account));
+    }
+
+    spec schema PublishAbortsIf {
+        validator_operator_account: signer;
+        dr_account: signer;
+        let validator_operator_addr = signer::address_of(validator_operator_account);
+        include DiemTimestamp::AbortsIfNotOperating;
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        include Roles::AbortsIfNotValidatorOperator{account: validator_operator_account};
+        aborts_if has_validator_operator_config(validator_operator_addr)
+            with errors::ALREADY_PUBLISHED;
+    }
+
+    /// Get validator's account human name
+    /// Aborts if there is no ValidatorOperatorConfig resource
+    public fun get_human_name(validator_operator_addr: address): vector<u8> acquires ValidatorOperatorConfig {
+        assert!(has_validator_operator_config(validator_operator_addr), errors::not_published(EVALIDATOR_OPERATOR_CONFIG));
+        *&borrow_global<ValidatorOperatorConfig>(validator_operator_addr).human_name
+    }
+    spec get_human_name {
+        pragma opaque;
+        aborts_if !has_validator_operator_config(validator_operator_addr) with errors::NOT_PUBLISHED;
+        ensures result == get_human_name(validator_operator_addr);
+    }
+    public fun has_validator_operator_config(validator_operator_addr: address): bool {
+        exists<ValidatorOperatorConfig>(validator_operator_addr)
+    }
+    spec has_validator_operator_config {
+        ensures result == has_validator_operator_config(validator_operator_addr);
+    }
+
+    spec module {} // switch documentation context back to module level
+
+    /// # Consistency Between Resources and Roles
+
+    /// If an address has a ValidatorOperatorConfig resource, it has a validator operator role.
+    spec module {
+        invariant forall addr: address where has_validator_operator_config(addr):
+            Roles::spec_has_validator_operator_role_addr(addr);
+    }
+
+    /// # Persistence
+    spec module {
+        invariant update forall addr: address where old(exists<ValidatorOperatorConfig>(addr)):
+            exists<ValidatorOperatorConfig>(addr);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XDX.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XDX.move
new file mode 100644
index 000000000..5b73edcf7
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XDX.move
@@ -0,0 +1,177 @@
+/// NB: This module is a stub of the `XDX` at the moment.
+///
+/// Once the component makeup of the XDX has been chosen the
+/// `Reserve` will be updated to hold the backing coins in the correct ratios.
+
+module DiemFramework::XDX {
+    use DiemFramework::AccountLimits;
+    use DiemFramework::CoreAddresses;
+    use std::errors;
+    use std::fixed_point32;
+    use DiemFramework::Diem;
+    use DiemFramework::DiemTimestamp;
+
+    /// The type tag representing the `XDX` currency on-chain.
+    struct XDX { }
+
+    /// Note: Currently only holds the mint, burn, and preburn capabilities for
+    /// XDX. Once the makeup of the XDX has been determined this resource will
+    /// be updated to hold the backing XDX reserve compnents on-chain.
+    ///
+    /// The on-chain reserve for the `XDX` holds both the capability for minting `XDX`
+    /// coins, and also each reserve component that holds the backing for these coins on-chain.
+    /// Currently this holds no coins since XDX is not able to be minted/created.
+    struct Reserve has key {
+        /// The mint capability allowing minting of `XDX` coins.
+        mint_cap: Diem::MintCapability<XDX>,
+        /// The burn capability for `XDX` coins. This is used for the unpacking
+        /// of `XDX` coins into the underlying backing currencies.
+        burn_cap: Diem::BurnCapability<XDX>,
+        /// The preburn for `XDX`. This is an administrative field since we
+        /// need to alway preburn before we burn.
+        preburn_cap: Diem::Preburn<XDX>,
+        // TODO: Once the reserve has been determined this resource will
+        // contain a ReserveComponent<Currency> for every currency that makes
+        // up the reserve.
+    }
+
+    /// The `Reserve` resource is in an invalid state
+    const ERESERVE: u64 = 0;
+
+    /// Initializes the `XDX` module. This sets up the initial `XDX` ratios and
+    /// reserve components, and creates the mint, preburn, and burn
+    /// capabilities for `XDX` coins. The `XDX` currency must not already be
+    /// registered in order for this to succeed. The sender must both be the
+    /// correct address (`@CurrencyInfo`) and have the
+    /// correct permissions (`&Capability<RegisterNewCurrency>`). Both of these
+    /// restrictions are enforced in the `Diem::register_currency` function, but also enforced here.
+    public fun initialize(
+        dr_account: &signer,
+        tc_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint
+        CoreAddresses::assert_currency_info(dr_account);
+        // Reserve must not exist.
+        assert!(!exists<Reserve>(@DiemRoot), errors::already_published(ERESERVE));
+        let (mint_cap, burn_cap) = Diem::register_currency<XDX>(
+            dr_account,
+            fixed_point32::create_from_rational(1, 1), // exchange rate to XDX
+            true,    // is_synthetic
+            1000000, // scaling_factor = 10^6
+            1000,    // fractional_part = 10^3
+            b"XDX"
+        );
+        // XDX cannot be minted.
+        Diem::update_minting_ability<XDX>(tc_account, false);
+        AccountLimits::publish_unrestricted_limits<XDX>(dr_account);
+        let preburn_cap = Diem::create_preburn<XDX>(tc_account);
+        move_to(dr_account, Reserve { mint_cap, burn_cap, preburn_cap });
+    }
+    spec initialize {
+       use DiemFramework::Roles;
+        include CoreAddresses::AbortsIfNotCurrencyInfo{account: dr_account};
+        aborts_if exists<Reserve>(@DiemRoot) with errors::ALREADY_PUBLISHED;
+        include Diem::RegisterCurrencyAbortsIf<XDX>{
+            currency_code: b"XDX",
+            scaling_factor: 1000000
+        };
+        include AccountLimits::PublishUnrestrictedLimitsAbortsIf<XDX>{publish_account: dr_account};
+
+        include Diem::RegisterCurrencyEnsures<XDX>{
+            to_xdx_exchange_rate: fixed_point32::spec_create_from_rational(1, 1),
+            is_synthetic: true,
+            fractional_part: 1000
+        };
+
+        include Diem::UpdateMintingAbilityEnsures<XDX>{can_mint: false};
+        include AccountLimits::PublishUnrestrictedLimitsEnsures<XDX>{publish_account: dr_account};
+        ensures exists<Reserve>(@DiemRoot);
+
+        /// Registering XDX can only be done in genesis.
+        include DiemTimestamp::AbortsIfNotGenesis;
+        /// Only the DiemRoot account can register a new currency [[H8]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        /// Only the TreasuryCompliance role can update the `can_mint` field of CurrencyInfo [[H2]][PERMISSION].
+        /// Moreover, only the TreasuryCompliance role can create Preburn.
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+
+    /// Returns true if `CoinType` is `XDX::XDX`
+    public fun is_xdx<CoinType>(): bool {
+        Diem::is_currency<CoinType>() &&
+            Diem::currency_code<CoinType>() == Diem::currency_code<XDX>()
+    }
+    spec is_xdx {
+        pragma opaque;
+        include Diem::spec_is_currency<CoinType>() ==> Diem::AbortsIfNoCurrency<XDX>;
+        ensures result == spec_is_xdx<CoinType>();
+    }
+    spec fun spec_is_xdx<CoinType>(): bool {
+        Diem::spec_is_currency<CoinType>() && Diem::spec_is_currency<XDX>() &&
+            (Diem::spec_currency_code<CoinType>() == Diem::spec_currency_code<XDX>())
+    }
+
+    /// Return the account address where the globally unique XDX::Reserve resource is stored
+    public fun reserve_address(): address {
+        @CurrencyInfo
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // switch documentation context back to module level
+
+    /// # Persistence of Resources
+
+    spec module {
+        /// After genesis, the Reserve resource exists.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> reserve_exists();
+
+        /// After genesis, XDX is registered.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> Diem::is_currency<XDX>();
+
+        /// After genesis, the exchange rate to XDX is always equal to 1.0.
+        invariant [suspendable] DiemTimestamp::is_operating()
+             ==> Diem::spec_xdx_exchange_rate<XDX>() == fixed_point32::spec_create_from_rational(1, 1);
+
+        /// After genesis, XDX is always a synthetic currency.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::is_synthetic_currency<XDX>();
+
+        /// After genesis, the scaling factor for XDX is always equal to 1,000,000.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_info<XDX>().scaling_factor == 1000000;
+
+        /// After genesis, the fractional part for XDX is always equal to 1,000.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_info<XDX>().fractional_part == 1000;
+
+        /// After genesis, the currency code for XDX is always "XDX".
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_code<XDX>() == b"XDX";
+    }
+
+    /// # Helper Functions
+    spec module {
+        /// Checks whether the Reserve resource exists.
+        fun reserve_exists(): bool {
+           exists<Reserve>(reserve_address())
+        }
+
+        /// After genesis, `LimitsDefinition<XDX>` is published at Diem root. It's published by
+        /// AccountLimits::publish_unrestricted_limits, but we can't prove the condition there because
+        /// it does not hold for all types (but does hold for XDX).
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> exists<AccountLimits::LimitsDefinition<XDX>>(@DiemRoot);
+
+        /// `LimitsDefinition<XDX>` is not published at any other address
+        invariant [suspendable] forall addr: address where exists<AccountLimits::LimitsDefinition<XDX>>(addr):
+            addr == @DiemRoot;
+
+        /// `Reserve` is persistent
+        invariant update old(reserve_exists())
+            ==> reserve_exists();
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XUS.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XUS.move
new file mode 100644
index 000000000..16976c9ac
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/sources/XUS.move
@@ -0,0 +1,187 @@
+/// This module defines the coin type XUS and its initialization function.
+module DiemFramework::XUS {
+    use DiemFramework::AccountLimits;
+    use DiemFramework::Diem;
+    use DiemFramework::DiemTimestamp;
+    use DiemFramework::Roles;
+    use std::fixed_point32;
+
+    /// The type tag representing the `XUS` currency on-chain.
+    struct XUS { }
+
+    /// Registers the `XUS` cointype. This can only be called from genesis.
+    public fun initialize(
+        dr_account: &signer,
+        tc_account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        Roles::assert_treasury_compliance(tc_account);
+        Roles::assert_diem_root(dr_account);
+        Diem::register_SCS_currency<XUS>(
+            dr_account,
+            tc_account,
+            fixed_point32::create_from_rational(1, 1), // exchange rate to XDX
+            1000000, // scaling_factor = 10^6
+            100,     // fractional_part = 10^2
+            b"XUS"
+        );
+        AccountLimits::publish_unrestricted_limits<XUS>(dr_account);
+    }
+    spec initialize {
+        use DiemFramework::Roles;
+        include Diem::RegisterSCSCurrencyAbortsIf<XUS>{
+            currency_code: b"XUS",
+            scaling_factor: 1000000,
+        };
+        include AccountLimits::PublishUnrestrictedLimitsAbortsIf<XUS>{publish_account: dr_account};
+        include Diem::RegisterSCSCurrencyEnsures<XUS>{
+            to_xdx_exchange_rate: fixed_point32::spec_create_from_rational(1, 1),
+            fractional_part: 100
+        };
+        include AccountLimits::PublishUnrestrictedLimitsEnsures<XUS>{publish_account: dr_account};
+        /// Registering XUS can only be done in genesis.
+        include DiemTimestamp::AbortsIfNotGenesis;
+        /// Only the DiemRoot account can register a new currency [[H8]][PERMISSION].
+        include Roles::AbortsIfNotDiemRoot{account: dr_account};
+        /// Only a TreasuryCompliance account can have the MintCapability [[H1]][PERMISSION].
+        /// Moreover, only a TreasuryCompliance account can have the BurnCapability [[H3]][PERMISSION].
+        include Roles::AbortsIfNotTreasuryCompliance{account: tc_account};
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Persistence of Resources
+    spec module {
+        /// After genesis, XUS is registered.
+        invariant [suspendable] DiemTimestamp::is_operating() ==> Diem::is_currency<XUS>();
+
+        /// After genesis, `LimitsDefinition<XUS>` is published at Diem root. It's published by
+        /// AccountLimits::publish_unrestricted_limits, but we can't prove the condition there because
+        /// it does not hold for all types (but does hold for XUS).
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> exists<AccountLimits::LimitsDefinition<XUS>>(@DiemRoot);
+
+        /// `LimitsDefinition<XUS>` is not published at any other address
+        invariant [suspendable] forall addr: address where exists<AccountLimits::LimitsDefinition<XUS>>(addr):
+            addr == @DiemRoot;
+
+        /// After genesis, XUS is always a non-synthetic currency.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> !Diem::is_synthetic_currency<XUS>();
+
+        /// After genesis, the scaling factor for XUS is always equal to 1,000,000.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_info<XUS>().scaling_factor == 1000000;
+
+        /// After genesis, the fractional part for XUS is always equal to 100.
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_info<XUS>().fractional_part == 100;
+
+        /// After genesis, the currency code for XUS is always "XUS".
+        invariant [suspendable] DiemTimestamp::is_operating()
+            ==> Diem::spec_currency_code<XUS>() == b"XUS";
+    }
+
+    /// # Access Control
+
+    /// ## Minting
+
+    spec module {
+        /// Only TreasuryCompliance can have MintCapability<XUS> [[H1]][PERMISSION].
+        /// If an account has MintCapability<XUS>, it is a TreasuryCompliance account.
+        invariant
+            forall a: address:
+                Diem::spec_has_mint_capability<XUS>(a) ==>
+                    Roles::spec_has_treasury_compliance_role_addr(a);
+
+        /// Only the owner of MintCapability<XUS> can mint XUS [[H1]][PERMISSION].
+        /// If the `total_value` for XUS is increased, the transaction should be
+        /// signed by the owner of MintCapability<XUS>.
+        invariant update [suspendable] (
+                old(Diem::spec_is_currency<XUS>()) &&
+                Diem::spec_is_currency<XUS>() &&
+                old(Diem::spec_currency_info<XUS>().total_value) < Diem::spec_currency_info<XUS>().total_value
+            ) ==> Diem::spec_signed_by_mint_capability_owner<XUS>();
+
+        /// The permission to mint XUS is unique [[I1]][PERMISSION].
+        /// At most one address has a MintCapability<XUS>.
+        invariant
+            forall a1: address, a2: address:
+                (Diem::spec_has_mint_capability<XUS>(a1) && Diem::spec_has_mint_capability<XUS>(a2)) ==> a1 == a2;
+
+        /// MintCapability<XUS> is not transferrable [[J1]][PERMISSION].
+        /// MintCapability<XUS> is not copiable, and once it's published, it's not removed.
+        invariant update
+            forall a: address
+                where old(exists<Diem::MintCapability<XUS>>(a)):
+                    exists<Diem::MintCapability<XUS>>(a);
+    }
+
+    /// ## Burning
+
+    spec module {
+        /// Only TreasuryCompliance can have BurnCapability [[H3]][PERMISSION].
+        /// If an account has BurnCapability<XUS>, it is a TreasuryCompliance account.
+        invariant
+            forall a: address:
+                Diem::spec_has_burn_capability<XUS>(a) ==>
+                    Roles::spec_has_treasury_compliance_role_addr(a);
+
+        /// Only the owner of BurnCapability<XUS> can burn XUS [[H3]][PERMISSION].
+        /// If the `total_value` or `preburn_value` for XUS is decreased, the
+        /// transaction should be signed by the owner of BurnCapability<XUS>.
+        invariant update [suspendable] (
+                old(Diem::spec_is_currency<XUS>()) &&
+                Diem::spec_is_currency<XUS>() &&
+                old(Diem::spec_currency_info<XUS>().total_value) > Diem::spec_currency_info<XUS>().total_value
+            ) ==> Diem::spec_signed_by_burn_capability_owner<XUS>();
+        invariant update [suspendable] (
+                old(Diem::spec_is_currency<XUS>()) &&
+                Diem::spec_is_currency<XUS>() &&
+                old(Diem::spec_currency_info<XUS>().preburn_value) > Diem::spec_currency_info<XUS>().preburn_value
+            ) ==> Diem::spec_signed_by_burn_capability_owner<XUS>();
+
+        /// The permission to burn XUS is unique [[I3]][PERMISSION].
+        /// At most one address has a BurnCapability<XUS>.
+        invariant
+            forall a1: address, a2: address:
+                (Diem::spec_has_burn_capability<XUS>(a1) && Diem::spec_has_burn_capability<XUS>(a2)) ==> a1 == a2;
+
+        /// BurnCapability<XUS> is not transferrable [[J3]][PERMISSION].
+        /// BurnCapability<XUS> is not copiable, and once it's published, it's not removed.
+        invariant update [suspendable]
+            forall a: address
+                where old(exists<Diem::BurnCapability<XUS>>(a)):
+                    exists<Diem::BurnCapability<XUS>>(a);
+    }
+
+    /// ## Preburning
+
+    spec module {
+        /// Only DesignatedDealer can has the "preburn" permission [[H4]][PERMISSION].
+        /// If an account has PreburnQueue<XUS> or Preburn<XUS>, it is a DesignatedDealer account.
+        invariant
+            forall a: address:
+                (Diem::spec_has_preburn_queue<XUS>(a) || Diem::spec_has_preburn<XUS>(a)) ==>
+                    Roles::spec_has_designated_dealer_role_addr(a);
+
+        /// Only the owner of PreburnQueue<XUS> can preburn XUS [[H4]][PERMISSION].
+        /// If the `preburn_value` for XUS is increased, the transaction should be
+        /// signed by the owner of PreburnQueue<XUS> or Preburn<XUS>.
+        invariant update [suspendable] (
+                old(Diem::spec_is_currency<XUS>()) &&
+                Diem::spec_is_currency<XUS>() &&
+                old(Diem::spec_currency_info<XUS>().preburn_value) < Diem::spec_currency_info<XUS>().preburn_value
+            ) ==> (Diem::spec_signed_by_preburn_queue_owner<XUS>() || Diem::spec_signed_by_preburn_owner<XUS>());
+
+        /// PreburnQueue<XUS> is not transferrable [[J4]][PERMISSION].
+        /// PreburnQueue<XUS> is not copiable, and once it's published, it's not removed.
+        invariant update [suspendable]
+            forall a: address
+                where old(exists<Diem::PreburnQueue<XUS>>(a)):
+                    exists<Diem::PreburnQueue<XUS>>(a);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move
new file mode 100644
index 000000000..d7076726e
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move
@@ -0,0 +1,122 @@
+#[test_only]
+module DiemFramework::AccountFreezingTests {
+    use DiemFramework::AccountFreezing as AF;
+    use DiemFramework::Genesis;
+    use std::signer;
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun account_freezing_double_init(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::initialize(&dr);
+    }
+
+    #[test]
+    fun non_existent_account_not_frozen() {
+        assert!(!AF::account_is_frozen(@0x2), 0);
+        AF::assert_not_frozen(@0x2);
+    }
+
+    #[test(a = @0x2)]
+    fun create_new(a: signer) {
+        let a_addr = signer::address_of(&a);
+        AF::create_for_test(&a);
+        AF::assert_not_frozen(a_addr);
+    }
+
+    #[test(a = @0x2)]
+    #[expected_failure(abort_code = 518, location = AF)]
+    fun create_new_already_has_freezing_bit(a: signer) {
+        AF::create_for_test(&a);
+        AF::create_for_test(&a);
+    }
+
+    #[test(a = @0x2)]
+    fun create_new_not_frozen(a: signer) {
+        let a_addr = signer::address_of(&a);
+        AF::create_for_test(&a);
+        AF::assert_not_frozen(a_addr);
+    }
+
+    #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun freeze_account_not_tc(a: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::create_for_test(&a);
+        AF::freeze_account(&a, @0x2);
+    }
+
+    #[test(tc = @TreasuryCompliance, a = @0x2)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
+    fun freeze_account_not_operating(tc: signer, a: signer) {
+        AF::create_for_test(&a);
+        AF::freeze_account(&tc, @0x2);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 775, location = AF)]
+    fun cannot_freeze_diem_root(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::freeze_account(&tc, @DiemRoot);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1031, location = AF)]
+    fun cannot_freeze_treasury_compliance(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::freeze_account(&tc, @TreasuryCompliance);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 517, location = AF)]
+    fun freeze_no_freezing_bit(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::freeze_account(&tc, @0x2);
+    }
+
+    #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun account_frozen_after_freeze(a: signer, tc: signer, dr: signer) {
+        let a_addr = signer::address_of(&a);
+        Genesis::setup(&dr, &tc);
+        AF::create_for_test(&a);
+        AF::assert_not_frozen(a_addr);
+        AF::freeze_account(&tc, @0x2);
+        assert!(AF::account_is_frozen(a_addr), 0);
+    }
+
+    #[test(tc = @TreasuryCompliance, a = @0x2)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
+    fun unfreeze_account_not_operating(tc: signer, a: signer) {
+        AF::create_for_test(&a);
+        AF::unfreeze_account(&tc, @0x2);
+    }
+
+    #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun unfreeze_account_not_tc(a: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::create_for_test(&a);
+        AF::unfreeze_account(&a, @0x2);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 517, location = AF)]
+    fun unfreeze_no_freezing_bit(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        AF::unfreeze_account(&tc, @0x2);
+    }
+
+    #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun account_unfrozen_after_unfreeze(a: signer, tc: signer, dr: signer) {
+        let a_addr = signer::address_of(&a);
+        Genesis::setup(&dr, &tc);
+
+        AF::create_for_test(&a);
+        AF::assert_not_frozen(a_addr);
+        AF::freeze_account(&tc, @0x2);
+
+        assert!(AF::account_is_frozen(a_addr), 0);
+        AF::unfreeze_account(&tc, @0x2);
+        AF::assert_not_frozen(a_addr);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move
new file mode 100644
index 000000000..7201eeb88
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move
@@ -0,0 +1,183 @@
+#[test_only]
+module DiemFramework::AccountLimitsTests {
+    use std::signer;
+    use DiemFramework::Genesis;
+    use DiemFramework::AccountLimits;
+    use DiemFramework::XUS::XUS;
+    use DiemFramework::Roles;
+
+    struct Hold<T> has key { x: T }
+    public fun hold<T: store>(account: &signer, x: T) {
+        move_to(account, Hold<T>{ x })
+    }
+
+    fun setup(dr: &signer, tc: &signer, vasp: &signer) {
+        Genesis::setup(dr, tc);
+
+        Roles::new_parent_vasp_role(tc, vasp);
+
+        AccountLimits::publish_unrestricted_limits_for_testing<XUS>(vasp);
+        AccountLimits::publish_window<XUS>(dr, vasp, signer::address_of(vasp));
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_mutation_capability_after_genesis(dr: signer, tc: signer, vasp: signer) {
+        Genesis::setup(&dr, &tc);
+
+        hold(&vasp, AccountLimits::grant_mutation_capability(&vasp));
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun publish_window(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 262, location = AccountLimits)]
+    fun publish_window_twice(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+
+        AccountLimits::publish_window<XUS>(&dr, &vasp, signer::address_of(&vasp));
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun publish_window_non_diem_root(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::publish_window<XUS>(&vasp, &vasp, signer::address_of(&vasp));
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 5, location = AccountLimits)]
+    fun publish_window_non_existent_limit_address(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::publish_window<XUS>(&dr, &vasp, @0x42 /* non-exsistent */);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 6, location = AccountLimits)]
+    fun publish_unrestricted_limits_for_testing_twice(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::publish_unrestricted_limits_for_testing<XUS>(&vasp);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun update_limits_definition_1(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::update_limits_definition<XUS>(
+            &tc,
+            signer::address_of(&vasp),
+            100, /* new_max_inflow */
+            200, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        )
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun update_limits_definition_2(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::update_limits_definition<XUS>(
+            &tc,
+            signer::address_of(&vasp),
+            0, /* new_max_inflow */
+            0, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        )
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun update_limits_definition_twice(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::update_limits_definition<XUS>(
+            &tc,
+            signer::address_of(&vasp),
+            100, /* new_max_inflow */
+            200, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        );
+        AccountLimits::update_limits_definition<XUS>(
+            &tc,
+            signer::address_of(&vasp),
+            0, /* new_max_inflow */
+            0, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        )
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun update_limits_definition_non_tc(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::update_limits_definition<XUS>(
+            &dr,
+            signer::address_of(&vasp),
+            100, /* new_max_inflow */
+            200, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        )
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 5, location = AccountLimits)]
+    fun update_limits_definition_non_exsistent(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        AccountLimits::update_limits_definition<XUS>(
+            &tc,
+            @0x42, // non-exsistent
+            100, /* new_max_inflow */
+            200, /* new_max_outflow */
+            150, /* new_max_holding_balance */
+            10000, /* new_time_period */
+        )
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun update_window_info(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        let vasp_addr = signer::address_of(&vasp);
+        AccountLimits::update_window_info<XUS>(
+            &tc,
+            vasp_addr,
+            120,
+            vasp_addr,
+        );
+        AccountLimits::update_window_info<XUS>(
+            &tc,
+            vasp_addr,
+            0,
+            vasp_addr,
+        );
+        AccountLimits::update_window_info<XUS>(
+            &tc,
+            vasp_addr,
+            120,
+            vasp_addr,
+        );
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun update_window_info_non_tc(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        let vasp_addr = signer::address_of(&vasp);
+        AccountLimits::update_window_info<XUS>(
+            &dr,
+            vasp_addr,
+            120,
+            vasp_addr,
+        );
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
+    fun has_limits_published(dr: signer, tc: signer, vasp: signer) {
+        setup(&dr, &tc, &vasp);
+        assert!(AccountLimits::has_limits_published<XUS>(signer::address_of(&vasp)), 1);
+        assert!(!AccountLimits::has_limits_published<XUS>(@0x42 /* non-exsistent */), 3);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move
new file mode 100644
index 000000000..c7633e385
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move
@@ -0,0 +1,118 @@
+#[test_only]
+module DiemFramework::AuthenticatorTests {
+    use DiemFramework::Authenticator;
+    use std::vector;
+
+    #[test]
+    fun create_valid_multisig_policies_and_compute_auth_keys() {
+        let pubkey1 = x"c48b687a1dd8265101b33df6ae0b6825234e3f28df9ecb38fb286cf76dae919d";
+        let pubkey2 = x"4b2a60883383be0ba24ed79aa5a6c9379728099a7b0c57edcec193a14ea5fce2";
+        let pubkey3 = x"323285d3d4b0f19482730c5f481d9f745c2927d73c231bad47859d9b2f7376f1";
+
+        let keys = vector::empty<vector<u8>>();
+        vector::push_back(&mut keys, pubkey1);
+        let t = Authenticator::create_multi_ed25519(copy keys, 1);
+        let auth_key = Authenticator::multi_ed25519_authentication_key(&t);
+
+        vector::push_back(&mut keys, pubkey2);
+        t = Authenticator::create_multi_ed25519(copy keys, 1);
+        assert!(Authenticator::multi_ed25519_authentication_key(&t) != copy auth_key, 3006);
+        t = Authenticator::create_multi_ed25519(copy keys, 2);
+        assert!(Authenticator::multi_ed25519_authentication_key(&t) != copy auth_key, 3007);
+
+        vector::push_back(&mut keys, copy pubkey3);
+        t = Authenticator::create_multi_ed25519(copy keys, 1);
+        assert!(Authenticator::multi_ed25519_authentication_key(&t) != copy auth_key, 3008);
+        t = Authenticator::create_multi_ed25519(copy keys, 2);
+        assert!(Authenticator::multi_ed25519_authentication_key(&t) != copy auth_key, 3009);
+        // check that auth key matches expect result
+        assert!(
+            Authenticator::multi_ed25519_authentication_key(&t)
+            ==
+            x"1761bca45f83ecdefe202650ca5ba9518b9c2cc032667a95b275dc3f43173ae0",
+        3011
+        );
+
+        // duplicate keys are ok
+        vector::push_back(&mut keys, pubkey3);
+        t = Authenticator::create_multi_ed25519(copy keys, 3);
+        assert!(Authenticator::multi_ed25519_authentication_key(&t) != copy auth_key, 3012);
+
+        assert!(Authenticator::threshold(&t) == 3, 3013);
+        assert!(Authenticator::public_keys(&t) == &keys, 3014);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 7, location = Authenticator)]
+    fun empty_policy_should_be_rejected() {
+        let keys = vector::empty<vector<u8>>();
+        Authenticator::create_multi_ed25519(keys, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 263, location = Authenticator)]
+    fun bad_threshold_should_be_rejected_threshold_1_for_empty_keys() {
+        let keys = vector::empty<vector<u8>>();
+        Authenticator::create_multi_ed25519(keys, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 519, location = Authenticator)]
+    fun bad_threshold_should_be_rejected_threshold_3_for_34_keys() {
+        let pubkey = x"";
+
+        let keys = vector::empty<vector<u8>>();
+        let index = 0;
+        while (index < 34) {
+            vector::push_back(&mut keys, copy pubkey);
+            index = index + 1;
+        };
+        let _auth_key =
+        Authenticator::create_multi_ed25519(keys, 3);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 263, location = Authenticator)]
+    fun bad_threshold_should_be_rejected_threshold_2_for_1_key() {
+        let keys = vector::empty<vector<u8>>();
+        vector::push_back(
+            &mut keys,
+            x"2000000000000000000000000000000000000000000000000000000000000000"
+        );
+        Authenticator::create_multi_ed25519(keys, 2);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 7, location = Authenticator)]
+    fun bad_threshold_should_be_rejected_threshold_0_for_1_address() {
+        let keys = vector::empty<vector<u8>>();
+        vector::push_back(
+            &mut keys,
+            x"2000000000000000000000000000000000000000000000000000000000000000"
+        );
+        Authenticator::create_multi_ed25519(keys, 0);
+    }
+
+    #[test]
+    fun one_of_one_multi_ed25519_should_have_different_auth_key_than_ed25519_with_same_public_key() {
+        let pubkey = x"c48b687a1dd8265101b33df6ae0b6825234e3f28df9ecb38fb286cf76dae919d";
+        let keys = vector::empty<vector<u8>>();
+        vector::push_back(
+            &mut keys,
+            copy pubkey
+        );
+
+        let t = Authenticator::create_multi_ed25519(keys, 1);
+        assert!(
+            Authenticator::multi_ed25519_authentication_key(&t) !=
+                Authenticator::ed25519_authentication_key(copy pubkey),
+            3011
+        );
+        assert!(
+            x"ba10abb6d85ea3897baa1cae457fc724a916d258bd47ab852f200c5851a6d057"
+            ==
+            Authenticator::ed25519_authentication_key(pubkey),
+            3012
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move
new file mode 100644
index 000000000..62a37f7a8
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move
@@ -0,0 +1,242 @@
+#[test_only]
+module DiemFramework::CRSNTests {
+    use DiemFramework::CRSN;
+    use DiemFramework::Genesis;
+    use std::signer;
+    use std::bit_vector;
+
+    #[test_only]
+    public fun setup(dr: &signer, tc: &signer, _: &signer) {
+        Genesis::setup(dr, tc);
+        CRSN::allow_crsns(dr)
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1281, location = CRSN)]
+    public fun cant_publish_until_init(a: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        CRSN::test_publish(&a, 0, 10);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1537, location = CRSN)]
+    public fun double_init(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::allow_crsns(&dr);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun publish_exists_after_small_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+
+        CRSN::test_publish(&a, 0, 10);
+        assert!(CRSN::has_crsn(addr), 0);
+        assert!(CRSN::min_nonce(addr)  == 0, 1);
+        assert!(bit_vector::length(&CRSN::slots(addr)) == 10, 2);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun publish_exists_after_medium_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+
+        CRSN::test_publish(&a, 20, 128);
+        assert!(CRSN::has_crsn(addr), 0);
+        assert!(CRSN::min_nonce(addr) == 20, 1);
+        assert!(bit_vector::length(&CRSN::slots(addr)) == 128, 2);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun publish_exists_after_large_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+
+        CRSN::test_publish(&a, 505, CRSN::max_crsn_size());
+        assert!(CRSN::has_crsn(addr), 0);
+        assert!(CRSN::min_nonce(addr) == 505, 1);
+        assert!(bit_vector::length(&CRSN::slots(addr)) == CRSN::max_crsn_size(), 2);
+    }
+
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 257, location = CRSN)]
+    public fun double_publish(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 0, 10);
+        CRSN::test_publish(&a, 0, 10);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 519, location = CRSN)]
+    public fun publish_zero_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 10, 0);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun publish_at_max_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 10, CRSN::max_crsn_size());
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 775, location = CRSN)]
+    public fun publish_above_max_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 10, CRSN::max_crsn_size() + 1);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun test_has_crsn(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        assert!(!CRSN::has_crsn(addr), 0);
+        CRSN::test_publish(&a, 0, 10);
+        assert!(CRSN::has_crsn(addr), 1);
+    }
+
+    #[test(a=@0xCAFE)]
+    #[expected_failure(abort_code = 1, location = CRSN)]
+    public fun record_no_crsn(a: signer) {
+        CRSN::test_record(&a, 0);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun record_too_high_low_accept(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 100, 10);
+        assert!(!CRSN::test_record(&a, 110), 0);
+        assert!(!CRSN::test_record(&a, 111), 1);
+        // We allow recording in the past
+        assert!(CRSN::test_record(&a, 99), 2);
+        // But the check will fail since that happens in the prologue
+        assert!(!CRSN::test_check(&a, 99), 2);
+        assert!(CRSN::test_record(&a, 100), 3);
+        assert!(CRSN::test_record(&a, 109), 4);
+        assert!(!CRSN::test_record(&a, 109), 5);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun prevent_replay(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 100, 10);
+        assert!(CRSN::test_record(&a, 101), 0);
+        assert!(!CRSN::test_record(&a, 101), 1);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun prevent_replay_with_shift(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 100, 10);
+        assert!(CRSN::test_record(&a, 100), 0);
+        assert!(!CRSN::test_check(&a, 100), 1);
+        assert!(CRSN::test_record(&a, 100), 1);
+        assert!(CRSN::min_nonce(signer::address_of(&a)) == 101, 2);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun multiple_shifts_of_window(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        CRSN::test_publish(&a, 100, 10);
+        assert!(CRSN::test_record(&a, 101), 0);
+        assert!(CRSN::test_record(&a, 102), 0);
+        assert!(CRSN::test_record(&a, 103), 0);
+
+        assert!(CRSN::test_record(&a, 106), 0);
+        assert!(CRSN::test_record(&a, 107), 0);
+        assert!(CRSN::test_record(&a, 108), 0);
+
+        // The window should not have shifted
+        assert!(CRSN::min_nonce(addr) == 100, 1);
+        assert!(CRSN::test_record(&a, 100), 0);
+        // The window should now shift until it gets stuck on 104
+        assert!(CRSN::min_nonce(addr) == 104, 1);
+        assert!(CRSN::test_record(&a, 104), 0);
+        assert!(CRSN::min_nonce(addr) == 105, 1);
+        assert!(CRSN::test_record(&a, 105), 0);
+        assert!(CRSN::min_nonce(addr) == 109, 1);
+
+        // Now make sure that the window has shifted and opened-up higher slots
+        assert!(CRSN::test_record(&a, 110), 0);
+        assert!(CRSN::test_record(&a, 111), 0);
+        assert!(CRSN::test_record(&a, 112), 0);
+        assert!(CRSN::test_record(&a, 113), 0);
+        assert!(CRSN::test_record(&a, 114), 0);
+        assert!(CRSN::test_record(&a, 115), 0);
+        assert!(CRSN::min_nonce(addr) == 109, 1);
+        assert!(CRSN::test_record(&a, 109), 0);
+        assert!(CRSN::min_nonce(addr) == 116, 1);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1031, location = CRSN)]
+    public fun force_expire_zero(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        CRSN::test_publish(&a, 100, 10);
+        CRSN::test_force_expire(&a, 0);
+    }
+
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun force_expire_single(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        CRSN::test_publish(&a, 100, 10);
+        CRSN::test_force_expire(&a, 1);
+        assert!(CRSN::min_nonce(addr) == 101, 1);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun force_expire_shift_over_set_bits(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        CRSN::test_publish(&a, 0, 100);
+        assert!(CRSN::test_record(&a, 1), 0);
+        assert!(CRSN::test_record(&a, 2), 0);
+        assert!(CRSN::test_record(&a, 3), 0);
+        CRSN::test_force_expire(&a, 1);
+        assert!(CRSN::min_nonce(addr) == 4, 1);
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun force_expire_past_set_bits(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        CRSN::test_publish(&a, 0, 100);
+        assert!(CRSN::test_record(&a, 1), 0);
+        assert!(CRSN::test_record(&a, 2), 0);
+        assert!(CRSN::test_record(&a, 3), 0);
+        CRSN::test_force_expire(&a, 15);
+        assert!(CRSN::min_nonce(addr) == 15, 1);
+        let i = 0;
+        let len = 100;
+        let slots = CRSN::slots(addr);
+
+        while (i < len) {
+            assert!(!bit_vector::is_index_set(&slots, i), 2);
+            i = i + 1;
+        }
+    }
+
+    #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    public fun force_expire_past_window_size(a: signer, tc: signer, dr: signer) {
+        setup(&dr, &tc, &a);
+        let addr = signer::address_of(&a);
+        CRSN::test_publish(&a, 0, 100);
+        assert!(CRSN::test_record(&a, 1), 0);
+        assert!(CRSN::test_record(&a, 2), 0);
+        assert!(CRSN::test_record(&a, 3), 0);
+        CRSN::test_force_expire(&a, 10000);
+        assert!(CRSN::min_nonce(addr) == 10000, 1);
+        let i = 0;
+        let len = 100;
+        let slots = CRSN::slots(addr);
+
+        while (i < len) {
+            assert!(!bit_vector::is_index_set(&slots, i), 2);
+            i = i + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CoreAddressesTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CoreAddressesTests.move
new file mode 100644
index 000000000..2d0d02468
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CoreAddressesTests.move
@@ -0,0 +1,24 @@
+#[test_only]
+module DiemFramework::CoreAddressesTests {
+    use DiemFramework::CoreAddresses;
+
+    #[test(dr = @DiemRoot)]
+    fun test_assert_diem_root(dr: signer) {
+        CoreAddresses::assert_diem_root(&dr);
+    }
+
+    #[test(tc = @TreasuryCompliance)]
+    fun test_assert_treasury_compliance(tc: signer) {
+        CoreAddresses::assert_treasury_compliance(&tc);
+    }
+
+    #[test(vm = @VMReserved)]
+    fun test_assert_vm(vm: signer) {
+        CoreAddresses::assert_vm(&vm);
+    }
+
+    #[test(ci = @CurrencyInfo)]
+    fun test_assert_currency_info(ci: signer) {
+        CoreAddresses::assert_currency_info(&ci);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CurrenciesTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CurrenciesTests.move
new file mode 100644
index 000000000..dc820648b
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/CurrenciesTests.move
@@ -0,0 +1,31 @@
+#[test_only]
+module DiemFramework::CurrenciesTests {
+    use DiemFramework::DualAttestation;
+    use DiemFramework::DiemAccount;
+    use DiemFramework::XUS::XUS;
+    use DiemFramework::XDX::XDX;
+    use DiemFramework::Genesis;
+
+    // Check that the add_all_currencies flag does the expected thing
+    #[test(account = @TreasuryCompliance, dr = @DiemRoot)]
+    fun currencies(account: signer, dr: signer) {
+        Genesis::setup(&dr, &account);
+        let account = &account;
+        let dummy_auth_key_prefix = x"00000000000000000000000000000001";
+        DiemAccount::create_designated_dealer<XUS>(
+            account, @0x2, copy dummy_auth_key_prefix, b"name", false
+        );
+        DiemAccount::create_designated_dealer<XUS>(
+            account, @0x3, dummy_auth_key_prefix, b"other_name", true
+        );
+
+        assert!(DiemAccount::accepts_currency<XUS>(@0x2), 0);
+        assert!(!DiemAccount::accepts_currency<XDX>(@0x2), 2);
+        assert!(DualAttestation::human_name(@0x2) == b"name", 77);
+        assert!(DualAttestation::base_url(@0x2) == b"", 78);
+        assert!(DualAttestation::compliance_public_key(@0x2) == b"", 79);
+
+        assert!(DiemAccount::accepts_currency<XUS>(@0x3), 3);
+        assert!(DiemAccount::accepts_currency<XDX>(@0x3), 5);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move
new file mode 100644
index 000000000..2f5e1bf91
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move
@@ -0,0 +1,13 @@
+#[test_only]
+module DiemFramework::DiemBlockTests {
+    use DiemFramework::Genesis;
+    use DiemFramework::DiemBlock;
+
+    // TODO: the error code doesn't seem correct, juding by the name of the test.
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot, account = @0x100)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun invalid_initialization_address(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemBlock::initialize_block_metadata(&account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move
new file mode 100644
index 000000000..b64839093
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move
@@ -0,0 +1,39 @@
+#[test_only]
+module DiemFramework::OnChainConfigTests {
+    use DiemFramework::DiemConfig;
+    use DiemFramework::Genesis;
+
+    #[test(account = @0x1)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun init_before_genesis(account: signer) {
+        DiemConfig::initialize(&account);
+    }
+
+    #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun invalid_address_init(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemConfig::initialize(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 261, location = DiemConfig)]
+    fun invalid_get(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemConfig::get<u64>();
+    }
+
+    #[test(account = @0x1, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 516, location = DiemConfig)]
+    fun invalid_set(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemConfig::set_for_testing(&account, 0);
+    }
+
+    #[test(account = @0x1, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun invalid_publish(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemConfig::publish_new_config_for_testing(&account, 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move
new file mode 100644
index 000000000..59b3f3719
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move
@@ -0,0 +1,48 @@
+#[test_only]
+module DiemFramework::DiemTests {
+    use DiemFramework::XUS::XUS;
+    use DiemFramework::Genesis;
+    use DiemFramework::Diem;
+    use std::signer;
+
+    struct R<T> has key { x: T }
+    struct FakeCoin has store { value: u64 }
+
+    fun fetch<T: store>(account: &signer): T acquires R {
+        let R { x } = move_from<R<T>>(signer::address_of(account));
+        x
+    }
+
+    fun store<T: store>(account: &signer, x: T) {
+        move_to(account, R { x });
+    }
+
+    fun transmute<T1: store, T2: store>(account: &signer, x: T1): T2 acquires R {
+        // There was once a bug that R<U> and R<T> shared the same storage key for U != T,
+        // making it possible to perform a transmuatation.
+        store(account, x);
+        fetch(account)
+    }
+
+    fun become_rich(account: &signer) acquires R {
+        let fake = FakeCoin { value: 400000 };
+        let real = transmute(account, fake);
+        Diem::destroy_zero<XUS>(real);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot, account = @0x100)]
+    #[expected_failure]
+    fun cannot_print_counterfeit_money(tc: signer, dr: signer, account: signer) acquires R {
+        Genesis::setup(&dr, &tc);
+
+        become_rich(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun cannot_initialize_after_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+
+        Diem::initialize(&dr);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move
new file mode 100644
index 000000000..189e8f35f
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move
@@ -0,0 +1,137 @@
+#[test_only]
+module DiemFramework::DiemTimestampTests {
+    use DiemFramework::Genesis;
+    use DiemFramework::DiemTimestamp;
+    use std::vector;
+    use std::unit_test;
+
+    fun get_signer(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun set_time_has_started_non_dr_pre_genesis() {
+        let s = get_signer();
+        DiemTimestamp::set_time_has_started_for_testing(&s);
+    }
+
+    #[test(dr = @DiemRoot)]
+    fun set_time_has_started_dr_pre_genesis(dr: signer) {
+        DiemTimestamp::set_time_has_started_for_testing(&dr);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
+    fun set_time_has_started_dr_post_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemTimestamp::set_time_has_started_for_testing(&dr);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
+    fun set_time_has_started_non_dr_post_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        DiemTimestamp::set_time_has_started_for_testing(&s);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
+    fun update_global_time_pre_genesis() {
+        let s = get_signer();
+        DiemTimestamp::update_global_time(&s, @0x0, 0);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 514, location = DiemFramework::CoreAddresses)]
+    fun update_global_time_post_genesis_non_vm(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemTimestamp::update_global_time(&dr, @0x1, 0);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
+    fun update_global_time_post_genesis_vm_nil_proposer_equal_timestamp(dr: signer, tc: signer, vm: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_microseconds() == 0, 0);
+        DiemTimestamp::update_global_time(&vm, @VMReserved, 0);
+        assert!(DiemTimestamp::now_microseconds() == 0, 1);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
+    #[expected_failure(abort_code = 519, location = DiemTimestamp)]
+    fun update_global_time_post_genesis_vm_nil_proposer_increasing_timestamp(dr: signer, tc: signer, vm: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_microseconds() == 0, 0);
+        DiemTimestamp::update_global_time(&vm, @VMReserved, 1);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
+    #[expected_failure(abort_code = 519, location = DiemTimestamp)]
+    fun update_global_time_post_genesis_vm_not_nil_proposer_equal_timestamp(dr: signer, tc: signer, vm: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_microseconds() == 0, 0);
+        DiemTimestamp::update_global_time(&vm, @0x1, 0);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
+    fun update_global_time_post_genesis_vm_not_nil_proposer_increasing_timestamp(dr: signer, tc: signer, vm: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_microseconds() == 0, 0);
+        DiemTimestamp::update_global_time(&vm, @0x1, 1);
+        assert!(DiemTimestamp::now_microseconds() == 1, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
+    fun now_microseconds_pre_genesis() {
+        DiemTimestamp::now_microseconds();
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    fun now_microseconds_post_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_microseconds() == 0, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
+    fun now_seconds_pre_genesis() {
+        DiemTimestamp::now_seconds();
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    fun now_seconds_post_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        assert!(DiemTimestamp::now_seconds() == 0, 0);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    fun is_genesis(dr: signer, tc: signer) {
+        assert!(DiemTimestamp::is_genesis(), 0);
+        DiemTimestamp::assert_genesis();
+        Genesis::setup(&dr, &tc);
+        assert!(!DiemTimestamp::is_genesis(), 1);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
+    fun assert_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemTimestamp::assert_genesis();
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    fun is_operating(dr: signer, tc: signer) {
+        assert!(!DiemTimestamp::is_operating(), 0);
+        Genesis::setup(&dr, &tc);
+        DiemTimestamp::assert_operating();
+        assert!(DiemTimestamp::is_operating(), 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
+    fun assert_operating() {
+        DiemTimestamp::assert_operating();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move
new file mode 100644
index 000000000..41bdfa048
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move
@@ -0,0 +1,44 @@
+#[test_only]
+module DiemFramework::DiemVersionTests {
+    use DiemFramework::DiemVersion;
+    use DiemFramework::Genesis;
+
+    #[test(account = @0x1)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun init_before_genesis(account: signer) {
+        DiemVersion::initialize(&account, 0);
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
+    fun set_before_genesis(account: signer) {
+        DiemVersion::set(&account, 0);
+    }
+
+    #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun invalid_address_init(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemVersion::initialize(&account, 0);
+    }
+
+    #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun invalid_setting_address(account: signer, tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemVersion::set(&account, 0);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 7, location = DiemVersion)]
+    fun non_increasing_version(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemVersion::set(&dr, 0);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun increasing_version(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemVersion::set(&dr, 1);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move
new file mode 100644
index 000000000..35ad26c30
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move
@@ -0,0 +1,26 @@
+#[test_only]
+module DiemFramework::RegisteredCurrencyTests {
+    use DiemFramework::RegisteredCurrencies;
+    use DiemFramework::Genesis;
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, alice = @0x2)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun cannot_call_initialize_as_non_diem_root(dr: signer, tc: signer, alice: signer) {
+        Genesis::setup(&dr, &tc);
+        RegisteredCurrencies::initialize(&alice);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun cannot_call_initialize_outside_genesis(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        RegisteredCurrencies::initialize(&dr);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 7, location = RegisteredCurrencies)]
+    fun cannot_add_currency_whose_currency_code_has_already_been_taken(dr: signer, tc: signer) {
+        Genesis::setup(&dr, &tc);
+        RegisteredCurrencies::add_currency_code(&dr, b"XDX");
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move
new file mode 100644
index 000000000..41c020468
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move
@@ -0,0 +1,383 @@
+#[test_only]
+module DiemFramework::RolesTests{
+    use DiemFramework::Roles;
+    use DiemFramework::Genesis;
+    use std::unit_test;
+    use std::vector;
+    use std::signer;
+
+    fun get_account(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun grant_diem_root_wrong_addr_pre_genesis() {
+        let account = get_account();
+        Roles::grant_diem_root_role(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance)]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun tc_dne_pre_genesis(tc: signer) {
+        Roles::assert_treasury_compliance(&tc);
+    }
+
+    #[test(dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun dr_dne_pre_genesis(dr: signer) {
+        Roles::assert_diem_root(&dr);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun genesis_root_roles_exist(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_diem_root(&dr);
+        assert!(Roles::has_diem_root_role(&dr), 0);
+
+        Roles::assert_treasury_compliance(&tc);
+        assert!(Roles::has_treasury_compliance_role(&tc), 0);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun tc_is_not_dr(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_diem_root(&tc);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun dr_is_not_tc(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_treasury_compliance(&dr);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_diem_root_wrong_addr_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::grant_diem_root_role(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_diem_root_correct_addr_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::grant_diem_root_role(&dr);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun grant_treasury_compliance_wrong_addr_pre_genesis() {
+        let account = get_account();
+        Roles::grant_treasury_compliance_role(&account, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_treasury_compliance_wrong_addr_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::grant_treasury_compliance_role(&dr, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_treasury_compliance_wrong_granting_addr_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::grant_treasury_compliance_role(&tc, &tc);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun grant_treasury_compliance_correct_addrs(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::grant_treasury_compliance_role(&dr, &tc);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun designated_dealer_role_dne() {
+        let account = get_account();
+        Roles::assert_designated_dealer(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1539, location = Roles)]
+    fun designated_dealer_assert_wrong_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_designated_dealer(&tc);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun grant_dd_role_non_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_designated_dealer_role(&account, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun grant_dd_role_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        assert!(!Roles::has_designated_dealer_role(&account), 0);
+        Roles::new_designated_dealer_role(&tc, &account);
+        assert!(Roles::has_designated_dealer_role(&account), 1);
+        Roles::assert_designated_dealer(&account);
+        Roles::assert_parent_vasp_or_designated_dealer(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = Roles)]
+    fun double_grant_dd_role_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_designated_dealer_role(&tc, &account);
+        Roles::new_designated_dealer_role(&tc, &account);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun validator_role_dne() {
+        let account = get_account();
+        Roles::assert_validator(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1795, location = Roles)]
+    fun validator_assert_wrong_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_validator(&tc);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun grant_validator_role_non_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_validator_role(&account, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun grant_validator_role_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        assert!(!Roles::has_validator_role(&account), 0);
+        Roles::new_validator_role(&dr, &account);
+        assert!(Roles::has_validator_role(&account), 1);
+        Roles::assert_validator(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = Roles)]
+    fun double_grant_validator_role_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_validator_role(&dr, &account);
+        Roles::new_validator_role(&dr, &account);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun validator_operator_role_dne() {
+        let account = get_account();
+        Roles::assert_validator_operator(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2051, location = Roles)]
+    fun validator_operator_assert_wrong_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::assert_validator_operator(&tc);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun grant_validator_operator_role_non_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_validator_operator_role(&account, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun grant_validator_operator_role_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        assert!(!Roles::has_validator_operator_role(&account), 0);
+        Roles::new_validator_operator_role(&dr, &account);
+        assert!(Roles::has_validator_operator_role(&account), 1);
+        Roles::assert_validator_operator(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = Roles)]
+    fun double_grant_validator_operator_role_dr_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_validator_operator_role(&dr, &account);
+        Roles::new_validator_operator_role(&dr, &account);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun parent_vasp_role_dne() {
+        let account = get_account();
+        Roles::assert_parent_vasp_role(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun grant_parent_vasp_role_non_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_parent_vasp_role(&account, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun grant_parent_vasp_role_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        assert!(!Roles::has_parent_VASP_role(&account), 0);
+        Roles::new_parent_vasp_role(&tc, &account);
+        assert!(Roles::has_parent_VASP_role(&account), 1);
+        Roles::assert_parent_vasp_role(&account);
+        Roles::assert_parent_vasp_or_designated_dealer(&account);
+        Roles::assert_parent_vasp_or_child_vasp(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = Roles)]
+    fun double_grant_parent_vasp_role_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_parent_vasp_role(&tc, &account);
+        Roles::new_parent_vasp_role(&tc, &account);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun child_vasp_role_dne() {
+        let account = get_account();
+        Roles::assert_child_vasp_role(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2307, location = Roles)]
+    fun child_vasp_assert_wrong_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_designated_dealer_role(&tc, &account);
+        Roles::assert_child_vasp_role(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 771, location = Roles)]
+    fun grant_child_vasp_role_non_parent_vasp_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let account = get_account();
+        Roles::new_child_vasp_role(&tc, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun grant_child_vasp_role_parent_vasp_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let (account, pvasp) = {
+            let accounts = unit_test::create_signers_for_testing(2);
+            (vector::pop_back(&mut accounts), vector::pop_back(&mut accounts))
+        };
+        assert!(!Roles::has_child_VASP_role(&account), 0);
+        Roles::new_parent_vasp_role(&tc, &pvasp);
+        Roles::new_child_vasp_role(&pvasp, &account);
+        assert!(Roles::has_child_VASP_role(&account), 1);
+        Roles::assert_child_vasp_role(&account);
+        Roles::assert_parent_vasp_or_child_vasp(&account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = Roles)]
+    fun double_grant_child_vasp_role_tc_granter(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let (account, pvasp) = {
+            let accounts = unit_test::create_signers_for_testing(2);
+            (vector::pop_back(&mut accounts), vector::pop_back(&mut accounts))
+        };
+        Roles::new_parent_vasp_role(&tc, &pvasp);
+        Roles::new_child_vasp_role(&pvasp, &account);
+        Roles::new_child_vasp_role(&pvasp, &account);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun who_can_hold_balance(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let (dd_account, child_account, pvasp) = {
+            let accounts = unit_test::create_signers_for_testing(3);
+            (
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts)
+            )
+        };
+
+        Roles::new_parent_vasp_role(&tc, &pvasp);
+        Roles::new_child_vasp_role(&pvasp, &child_account);
+        Roles::new_designated_dealer_role(&tc, &dd_account);
+
+        assert!(Roles::can_hold_balance(&dd_account), 0);
+        assert!(Roles::can_hold_balance(&child_account), 1);
+        assert!(Roles::can_hold_balance(&pvasp), 2);
+    }
+
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun role_ids(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let (validator_account, validator_operator_account, dd_account, child_account, pvasp) = {
+            let accounts = unit_test::create_signers_for_testing(5);
+            (
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts),
+                vector::pop_back(&mut accounts),
+            )
+        };
+
+        Roles::new_parent_vasp_role(&tc, &pvasp);
+        Roles::new_child_vasp_role(&pvasp, &child_account);
+        Roles::new_designated_dealer_role(&tc, &dd_account);
+        Roles::new_validator_role(&dr, &validator_account);
+        Roles::new_validator_operator_role(&dr, &validator_operator_account);
+
+        assert!(Roles::get_role_id(signer::address_of(&dr)) == 0, 0);
+        assert!(Roles::get_role_id(signer::address_of(&tc)) == 1, 1);
+        assert!(Roles::get_role_id(signer::address_of(&dd_account)) == 2, 2);
+        assert!(Roles::get_role_id(signer::address_of(&validator_account)) == 3, 3);
+        assert!(Roles::get_role_id(signer::address_of(&validator_operator_account)) == 4, 4);
+        assert!(Roles::get_role_id(signer::address_of(&pvasp)) == 5, 5);
+        assert!(Roles::get_role_id(signer::address_of(&child_account)) == 6, 6);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun get_role_id_no_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        Roles::get_role_id(@0x1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun assert_parent_or_designated_dealer_role_dne() {
+        let account = get_account();
+        Roles::assert_parent_vasp_or_designated_dealer(&account);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = Roles)]
+    fun assert_parent_or_child_role_dne() {
+        let account = get_account();
+        Roles::assert_parent_vasp_or_child_vasp(&account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move
new file mode 100644
index 000000000..310aa1dd8
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move
@@ -0,0 +1,110 @@
+#[test_only]
+module DiemFramework::SharedEd25519PublicKeyTests {
+    use DiemFramework::DiemAccount;
+    use DiemFramework::Genesis;
+    use DiemFramework::SharedEd25519PublicKey;
+    use DiemFramework::XUS::XUS;
+
+    use std::signer;
+
+    fun setup(dr: &signer, tc: &signer, account: &signer) {
+        let addr = signer::address_of(account);
+
+        Genesis::setup(dr, tc);
+        DiemAccount::create_parent_vasp_account<XUS>(tc, addr, x"0d3e1bd412376e933a0e794d65b41f97", b"", false);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    fun publish_and_rotate_shared_key(dr: signer, tc: signer, account: signer) {
+        let dr = &dr;
+        let tc = &tc;
+        let account = &account;
+
+        let addr = signer::address_of(account);
+
+        setup(dr, tc, account);
+
+        let old_auth_key = DiemAccount::authentication_key(addr);
+        // from RFC 8032
+        let pubkey1 = x"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        SharedEd25519PublicKey::publish(account, copy pubkey1);
+        let new_auth_key = DiemAccount::authentication_key(addr);
+
+        // check that publishing worked
+        assert!(SharedEd25519PublicKey::exists_at(addr), 3000);
+        assert!(SharedEd25519PublicKey::key(addr) == pubkey1, 3001);
+
+        // publishing should extract the sender's key rotation capability
+        assert!(DiemAccount::delegated_key_rotation_capability(addr), 3002);
+        // make sure the sender's auth key has changed
+        assert!(copy new_auth_key != old_auth_key, 3003);
+
+        // now rotate to another pubkey and redo the key-related checks
+        // from RFC 8032
+        let pubkey2 = x"d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a";
+        SharedEd25519PublicKey::rotate_key(account, copy pubkey2);
+        assert!(SharedEd25519PublicKey::key(addr) == pubkey2, 3004);
+        // make sure the auth key changed again
+        assert!(new_auth_key != DiemAccount::authentication_key(addr), 3005);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 261, location = SharedEd25519PublicKey)]
+    fun get_key_for_non_shared_account_should_fail(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        SharedEd25519PublicKey::key(signer::address_of(&account));
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
+    fun publish_key_with_bad_length_1(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        let invalid_pubkey = x"0000";
+        SharedEd25519PublicKey::publish(&account, invalid_pubkey);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
+    fun publish_key_with_bad_length_2(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        let invalid_pubkey = x"10003d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        SharedEd25519PublicKey::publish(&account, invalid_pubkey);
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
+    fun rotate_to_key_with_bad_length(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        // from RFC 8032
+        let valid_pubkey =  x"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        SharedEd25519PublicKey::publish(&account, valid_pubkey);
+        // now rotate to an invalid key
+        let invalid_pubkey = x"010000";
+        SharedEd25519PublicKey::rotate_key(&account, invalid_pubkey)
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
+    fun rotate_to_key_with_good_length_but_bad_contents(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        let valid_pubkey =  x"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        SharedEd25519PublicKey::publish(&account, valid_pubkey);
+        // now rotate to an invalid key
+        let invalid_pubkey = x"0000000000000000000000000000000000000000000000000000000000000000";
+        SharedEd25519PublicKey::rotate_key(&account, invalid_pubkey)
+    }
+
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
+    #[expected_failure(abort_code = 261, location = SharedEd25519PublicKey)]
+    fun rotate_key_on_non_shared_account(dr: signer, tc: signer, account: signer) {
+        setup(&dr, &tc, &account);
+
+        let invalid_pubkey = x"";
+        SharedEd25519PublicKey::rotate_key(&account, invalid_pubkey);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SignatureTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SignatureTests.move
new file mode 100644
index 000000000..d7650a298
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/SignatureTests.move
@@ -0,0 +1,43 @@
+#[test_only]
+module DiemFramework::SignatureTests{
+    use DiemFramework::Signature;
+
+    // Test fot public key validation
+    #[test]
+    fun signature() {
+        // from RFC 8032
+        let valid_pubkey = x"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        let short_pubkey = x"0100";
+        // concatenation of the two above
+        let long_pubkey = x"01003d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+        let invalid_pubkey = x"0000000000000000000000000000000000000000000000000000000000000000";
+
+        let short_signature = x"0100";
+        let long_signature = x"0062d6be393b8ec77fb2c12ff44ca8b5bd8bba83b805171bc99f0af3bdc619b20b8bd529452fe62dac022c80752af2af02fb610c20f01fb67a4d72789db2b8b703";
+        let valid_signature = x"62d6be393b8ec77fb2c12ff44ca8b5bd8bba83b805171bc99f0af3bdc619b20b8bd529452fe62dac022c80752af2af02fb610c20f01fb67a4d72789db2b8b703";
+
+        let message = x"0000000000000000000000000000000000000000000000000000000000000000";
+        let pubkey = x"7013b6ed7dde3cfb1251db1b04ae9cd7853470284085693590a75def645a926d";
+
+        assert!(Signature::ed25519_validate_pubkey(copy valid_pubkey), 9003);
+        assert!(!Signature::ed25519_validate_pubkey(copy short_pubkey), 9004);
+        assert!(!Signature::ed25519_validate_pubkey(copy long_pubkey), 9005);
+        assert!(!Signature::ed25519_validate_pubkey(copy invalid_pubkey), 9006);
+
+
+        // now check that Signature::ed25519_verify works with well- and ill-formed data and never aborts
+        // valid signature, invalid pubkey (too short, too long, bad small subgroup)
+        assert!(!Signature::ed25519_verify(copy valid_signature, copy short_pubkey, x""), 9004);
+        assert!(!Signature::ed25519_verify(copy valid_signature, copy long_pubkey, x""), 9005);
+        assert!(!Signature::ed25519_verify(copy valid_signature, copy invalid_pubkey, x""), 9006);
+        // invalid signature, valid pubkey
+        assert!(!Signature::ed25519_verify(copy short_signature, copy valid_pubkey, x""), 9007);
+        assert!(!Signature::ed25519_verify(copy long_signature, copy valid_pubkey, x""), 9008);
+
+        // valid (lengthwise) signature, valid pubkey, but signature doesn't match message
+        assert!(!Signature::ed25519_verify(copy valid_signature, copy valid_pubkey, x""), 9009);
+
+        // all three valid
+        assert!(Signature::ed25519_verify(valid_signature, pubkey, message), 9010);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move
new file mode 100644
index 000000000..deb26c34c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move
@@ -0,0 +1,18 @@
+#[test_only]
+module DiemFramework::TransactionFeeTests {
+    use DiemFramework::TransactionFee;
+    use DiemFramework::Genesis;
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun cannot_initialize_after_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        TransactionFee::initialize(&tc);
+    }
+
+    #[test(account = @0x100)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
+    fun cannot_initialize_as_non_tc(account: signer) {
+        TransactionFee::initialize(&account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move
new file mode 100644
index 000000000..b46e9d281
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move
@@ -0,0 +1,218 @@
+#[test_only]
+module DiemFramework::ValidatorConfigTests {
+    use DiemFramework::ValidatorConfig as VC;
+    use DiemFramework::ValidatorOperatorConfig as VOC;
+    use DiemFramework::Roles;
+    use DiemFramework::Genesis;
+    use std::unit_test;
+    use std::vector;
+    use std::signer;
+
+    const VALID_PUBKEY: vector<u8> = x"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c";
+
+    fun signer_at(index: u64): signer {
+        let signers = unit_test::create_signers_for_testing(index + 1);
+        vector::pop_back(&mut signers)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
+    fun publish_pre_genesis() {
+        let s = signer_at(0);
+        VC::publish(&s, &s, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun publish_post_genesis_non_dr(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        VC::publish(&s, &tc, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
+    fun publish_post_genesis_non_validator(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        VC::publish(&s, &dr, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun publish_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        Roles::new_validator_role(&dr, &s);
+        VC::publish(&s, &dr, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = VC)]
+    fun publish_post_genesis_double_publish(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        Roles::new_validator_role(&dr, &s);
+        VC::publish(&s, &dr, x"");
+        VC::publish(&s, &dr, x"");
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
+    fun set_operator_not_validator() {
+        let s = signer_at(0);
+        VC::set_operator(&s, @0x1);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 775, location = VC)]
+    fun set_operator_not_operator(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        Roles::new_validator_role(&dr, &s);
+        VC::set_operator(&s, @0x1);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
+    fun set_operator_no_validator_config_has_role(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        Roles::new_validator_role(&dr, &validator);
+        VOC::publish(&operator, &dr, x"");
+        VC::set_operator(&validator, signer::address_of(&operator));
+    }
+
+    #[test_only]
+    fun set_operator(dr: &signer, validator: &signer, operator: &signer) {
+        let operator_addr = signer::address_of(operator);
+        Roles::new_validator_role(dr, validator);
+        Roles::new_validator_operator_role(dr, operator);
+        VC::publish(validator, dr, x"FF");
+        VOC::publish(operator, dr, x"FFFF");
+        VC::set_operator(validator, operator_addr);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun set_operator_correct(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let operator_addr = signer::address_of(&operator);
+        let validator_addr = signer::address_of(&validator);
+        set_operator(&dr, &validator, &operator);
+        assert!(VC::get_operator(validator_addr) == operator_addr, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
+    fun remove_operator_not_validator() {
+        let s = signer_at(0);
+        VC::remove_operator(&s);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = VC)]
+    fun remove_operator_no_config(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = signer_at(0);
+        Roles::new_validator_role(&dr, &s);
+        VC::remove_operator(&s);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 7, location = VC)]
+    fun remove_operator_correct(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let operator_addr = signer::address_of(&operator);
+        let validator_addr = signer::address_of(&validator);
+        set_operator(&dr, &validator, &operator);
+        assert!(VC::get_operator(validator_addr) == operator_addr, 0);
+        VC::remove_operator(&validator);
+        VC::get_operator(validator_addr);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 263, location = VC)]
+    fun set_config_operator_neq_operator(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let other_operator = signer_at(2);
+        let validator_addr = signer::address_of(&validator);
+        set_operator(&dr, &validator, &operator);
+        VC::set_config(&other_operator, validator_addr, x"", x"", x"")
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 519, location = VC)]
+    fun set_config_invalid_consensus_pubkey(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let validator_addr = signer::address_of(&validator);
+        set_operator(&dr, &validator, &operator);
+        VC::set_config(&operator, validator_addr, x"", x"", x"")
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun set_config_correct(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let validator_addr = signer::address_of(&validator);
+        let operator_addr = signer::address_of(&operator);
+        set_operator(&dr, &validator, &operator);
+        VC::set_config(&operator, validator_addr, VALID_PUBKEY, x"AA", x"BB");
+        assert!(VC::is_valid(validator_addr), 0);
+        assert!(VC::get_human_name(validator_addr) == x"FF", 1);
+        assert!(VC::get_operator(validator_addr) == operator_addr, 2);
+        let config = VC::get_config(validator_addr);
+        assert!(*VC::get_consensus_pubkey(&config) == VALID_PUBKEY, 3);
+        assert!(*VC::get_validator_network_addresses(&config) == x"AA", 4);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = VC)]
+    fun get_config_not_validator() {
+        VC::get_config(@0x1);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 7, location = VC)]
+    fun get_config_not_set(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let operator = signer_at(1);
+        let validator_addr = signer::address_of(&validator);
+        set_operator(&dr, &validator, &operator);
+        VC::get_config(validator_addr);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = VC)]
+    fun get_human_name_not_validator() {
+        VC::get_human_name(@0x1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = VC)]
+    fun get_operator_not_validator() {
+        VC::get_operator(@0x1);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 7, location = VC)]
+    fun get_operator_not_set(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let validator = signer_at(0);
+        let validator_addr = signer::address_of(&validator);
+
+        Roles::new_validator_role(&dr, &validator);
+        VC::publish(&validator, &dr, x"FF");
+
+        VC::get_operator(validator_addr);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move
new file mode 100644
index 000000000..9ce2c05a9
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move
@@ -0,0 +1,70 @@
+#[test_only]
+module DiemFramework::ValidatorOperatorConfigTests {
+    use DiemFramework::ValidatorOperatorConfig as VOC;
+    use DiemFramework::Roles;
+    use DiemFramework::Genesis;
+    use std::unit_test;
+    use std::vector;
+    use std::signer;
+
+    fun get_signer(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
+    fun publish_pre_genesis() {
+        let s = get_signer();
+        VOC::publish(&s, &s, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
+    fun publish_post_genesis_non_dr(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        VOC::publish(&s, &tc, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
+    fun publish_post_genesis_non_validator_operator(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        VOC::publish(&s, &dr, x"");
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun publish_post_genesis(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        Roles::new_validator_operator_role(&dr, &s);
+        VOC::publish(&s, &dr, x"");
+        assert!(VOC::has_validator_operator_config(signer::address_of(&s)), 0);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    #[expected_failure(abort_code = 6, location = VOC)]
+    fun publish_post_genesis_double_publish(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        Roles::new_validator_operator_role(&dr, &s);
+        VOC::publish(&s, &dr, x"");
+        VOC::publish(&s, &dr, x"");
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 5, location = VOC)]
+    fun get_human_name_not_validator_operator() {
+        VOC::get_human_name(@0x1);
+    }
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
+    fun get_human_name(tc: signer, dr: signer) {
+        Genesis::setup(&dr, &tc);
+        let s = get_signer();
+        Roles::new_validator_operator_role(&dr, &s);
+        VOC::publish(&s, &dr, b"test");
+        assert!(VOC::get_human_name(signer::address_of(&s)) == b"test", 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/WalletModuleTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/WalletModuleTests.move
new file mode 100644
index 000000000..f34355155
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/WalletModuleTests.move
@@ -0,0 +1,211 @@
+#[test_only]
+module DiemFramework::ApprovalGroup {
+    use DiemFramework::Signature;
+
+    struct ApprovalGroup has store {
+        // we do not have collection support in Move now, so illustrate
+        // using 2 out-of 3
+
+        // for simplicity just use the plain public key here. We could
+        // also use the hash here as how auth key works
+        pk1: vector<u8>,
+        pk2: vector<u8>,
+        pk3: vector<u8>,
+
+        // the threshold policy
+        threshold: u64,
+
+        // Recipient address allowlist policy ...
+    }
+
+    // create a new approval group
+    public fun create(
+        pk1: vector<u8>,
+        pk2: vector<u8>,
+        pk3: vector<u8>,
+    ): ApprovalGroup {
+        ApprovalGroup {pk1, pk2, pk3, threshold: 2}
+    }
+
+    // helper function to evaluate the threshold policy
+    fun verify_sig(
+        group: &ApprovalGroup,
+        pk: vector<u8>,
+        sig: vector<u8>,
+        hash: vector<u8>,
+    ): bool {
+        (
+            copy pk == *&group.pk1 ||
+            copy pk == *&group.pk2 ||
+            copy pk == *&group.pk3
+        ) && Signature::ed25519_verify(sig, pk, hash)
+    }
+
+    // evaluate whether the approval group can exercise its authority
+    // right now only the threshold policy is checked
+    public fun has_authority(
+        group: &ApprovalGroup,
+        pk1: vector<u8>,
+        sig1: vector<u8>,
+        pk2: vector<u8>,
+        sig2: vector<u8>,
+        hash: vector<u8>,
+    ): bool {
+        assert!(copy pk1 != copy pk2, 1000);
+        let result1 = verify_sig(group, pk1, sig1, copy hash);
+        let result2 = verify_sig(group, pk2, sig2, hash);
+        result1 && result2
+    }
+}
+
+#[test_only]
+module DiemFramework::ColdWallet {
+    use DiemFramework::XUS::XUS;
+    use std::hash;
+    use std::bcs;
+    use DiemFramework::Diem;
+    use std::vector;
+    use std::signer;
+    use DiemFramework::ApprovalGroup;
+
+    struct ColdWallet has key {
+        balance: Diem::Diem<XUS>,
+        sequence_num: u64,
+        genesis_group: ApprovalGroup::ApprovalGroup,
+    }
+
+    // This struct is unused, only intended to define the format of a transaction
+    // the serialization of the transaction is the concatnation of all the fields
+    struct Transaction {
+        // The address that is going to be paid
+        payee: address,
+        // The amount of Diem<XUS> sent
+        amount: u64
+    }
+
+    // create a new ColdWallet with a default genesis group
+    public fun create(
+        account: &signer,
+        genesis_group: ApprovalGroup::ApprovalGroup,
+    ) {
+        let zero_balance = Diem::zero();
+        let wallet = ColdWallet {
+            balance: zero_balance,
+            sequence_num: 0,
+            genesis_group,
+        };
+        move_to<ColdWallet>(account, wallet);
+    }
+
+    public fun publish(account: &signer, self: ColdWallet) {
+        move_to<ColdWallet>(account, self);
+    }
+
+    // deposit money into a payee's cold wallet
+    public fun deposit(
+        payee: address,
+        to_deposit: Diem::Diem<XUS>,
+    ) acquires ColdWallet {
+        // Load the payee's account
+        let payee_wallet_ref = borrow_global_mut<ColdWallet>(payee);
+        // Deposit the `to_deposit` coin
+        Diem::deposit(&mut payee_wallet_ref.balance, to_deposit);
+    }
+
+    // helper to get the expected serialization of a transaction
+    // serialization format: 'prefix' || payee_address || amount || sequence_number
+    fun get_transaction_bytes(
+        payer: address,
+        payee: address,
+        amount: u64,
+        wallet: &mut ColdWallet,
+    ): vector<u8> {
+        // TODO: consider moving into resource
+        // TODO: Move doesn't support string now. As a workaround,
+        // TODO: the prefix is the hex encoding of "coldwallet.transaction"
+        let constant = x"636F6C6477616C6C65742E7472616E73616374696F6E";
+        let payer_bytes = bcs::to_bytes(&payer);
+
+        let transaction_bytes = copy payer_bytes;
+        vector::append(&mut transaction_bytes, constant);
+
+        let payee_bytes = bcs::to_bytes(&payee);
+        let amount_bytes = bcs::to_bytes(&amount);
+        let seq_bytes = bcs::to_bytes(&wallet.sequence_num);
+
+        vector::append(&mut transaction_bytes, payee_bytes);
+        vector::append(&mut transaction_bytes, amount_bytes);
+        vector::append(&mut transaction_bytes, seq_bytes);
+
+        transaction_bytes
+    }
+
+    // withdraw money from this wallet, and send to a payee account
+    // Note that this implementation moves the fund into the payee's
+    // Diem account, without assuming there's a cold wallet module
+    // under that account
+    public fun withdraw_from_payer(
+        payer_: &signer,
+        payee: address,
+        amount: u64,
+        pk1: vector<u8>,
+        sig1: vector<u8>,
+        pk2: vector<u8>,
+        sig2: vector<u8>
+    ) acquires ColdWallet {
+        let payer = signer::address_of(payer_);
+        let payer_ref = borrow_global_mut<ColdWallet>(payer);
+        let account_balance = Diem::value(&payer_ref.balance);
+        assert!(amount <= account_balance, 1001);
+
+        // obtain the expected serialization of the transaction struct
+        let transaction_bytes = get_transaction_bytes(
+            payer,
+            payee,
+            amount,
+            payer_ref,
+        );
+
+
+        let hash = hash::sha3_256(transaction_bytes);
+        let has_authority = ApprovalGroup::has_authority(
+            &payer_ref.genesis_group,
+            pk1,
+            sig1,
+            pk2,
+            sig2,
+            hash,
+        );
+        // check to see if genesis group has authority to approve
+        if (has_authority) {
+            // bump the sequence number
+            payer_ref.sequence_num = payer_ref.sequence_num + 1;
+
+            let withdraw_amount = Diem::withdraw(&mut payer_ref.balance, amount);
+            // DiemAccount no longer has this API
+            //DiemAccount::deposit(payer_, payee, withdraw_amount);
+            Diem::destroy_zero(withdraw_amount);
+        };
+    }
+}
+
+#[test_only]
+module DiemFramework::WalletModuleTests {
+    use DiemFramework::Genesis;
+    use DiemFramework::DiemAccount;
+    use DiemFramework::XUS::XUS;
+    use std::signer;
+
+    use DiemFramework::ApprovalGroup;
+    use DiemFramework::ColdWallet;
+
+    // private-key: 2f2bbeb071948c4ca586b0fa0f3663520fc3053056e79955059520d626117cdb
+    #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0xc2422587142d78bdf5a8068b8f9a2859)]
+    fun wallet_module_test(dr: signer, tc: signer, account: signer) {
+        Genesis::setup(&dr, &tc);
+        DiemAccount::create_parent_vasp_account<XUS>(&tc, signer::address_of(&account), x"355b32f571f894cfd431ab40dc950037", b"", false);
+
+        let genesis_group = ApprovalGroup::create(x"1234", x"5678", x"abc123");
+        ColdWallet::create(&account, genesis_group);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move
new file mode 100644
index 000000000..e69b265aa
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move
@@ -0,0 +1,12 @@
+#[test_only]
+module DiemFramework::XUSTests {
+    use DiemFramework::XUS;
+    use DiemFramework::Genesis;
+
+    #[test(tc = @TreasuryCompliance, dr = @DiemRoot, account = @0x100)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
+    fun cannot_recreate_market_cap(tc: signer, dr: signer, account: signer) {
+        Genesis::setup(&dr, &tc);
+        XUS::initialize(&account, &account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/Move.toml b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/Move.toml
new file mode 100644
index 000000000..ce44f401a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "DiemCoreFramework"
+version = "1.5.0"
+
+[addresses]
+std = "0x1"
+VMReserved = "0x0"
+CoreFramework = "0x1"
+CoreResources = "0xA550C18"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/README.md b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/README.md
new file mode 100644
index 000000000..071c27058
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/README.md
@@ -0,0 +1,42 @@
+This folder contains a Move package consisting of core Move modules defining functionalities needed by
+any Diem-based blockchains. To start your own Diem-based blockchain, you can create a Move package that
+depends on this core package and write your own wrapper modules for the account module as well as the
+on-chain configuration modules. [`experimental` folder](../experimental) provides an example of such
+Move package.
+
+Next we briefly describe how to write the wrapper modules and how Move's powerful type system can provide flexibility
+as well as safety for your chain.
+
+You will need to write wrapper modules for the following core modules:
+- Account
+- CoreGenesis
+- DiemConsensusConfig
+- DiemSystem
+- DiemVersion
+- DiemVMConfig
+- ParallelExecutionConfig
+- ValidatorConfig
+- ValidatorOperatorConfig
+
+
+Every module in this list contains the following resources and functions:
+- A chain marker resource with a `phantom T` type parameter
+- An initialization function that has to be called during chain-specific genesis and publishes a chain marker resource under
+  `@CoreResources` address as well as any relevant configuration resources
+- At least one setter function that requires a `Cap<T>` as parameter and modifies the configuration resource(s).
+  And at the beginning of the function we check the existence of the chain marker resource.
+
+#### Why is the chain marker resource needed?
+
+We want to provide the safety guarantee that only the authorized wrapper module can define access
+control policies for the resources. Therefore, we need to make sure that only the wrapper module can call the public
+setter functions. However, we are designing for wrapper modules that don't even exist right now, so we have to somehow
+"register" the wrapper module at the chain-specific genesis. The solution to this question is the chain marker resource.
+This resource has a phantom type parameter that should be instantiated with a type owned by the wrapper module such as
+`ExperimentalVersion` resource. Each setter function requires a capability parameter instantiated with this type. Since
+the acquisition of this capability requires a value of this witness type and this type is owned by the wrapper module,
+we know for sure that only the wrapper module can decide who or which module is allowed to modify the configurations.
+
+#### How to write wrapper modules?
+
+Read `DiemVersion.move` and then `ExperimentalVersion.move` to get the idea.
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Account.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Account.move
new file mode 100644
index 000000000..6a1f9b726
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Account.move
@@ -0,0 +1,233 @@
+module CoreFramework::Account {
+    use std::bcs;
+    use std::errors;
+    use std::signer;
+    use std::hash;
+    use std::vector;
+    use CoreFramework::ChainId;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::SystemAddresses;
+
+    /// Resource representing an account.
+    struct Account has key, store {
+        authentication_key: vector<u8>,
+        sequence_number: u64,
+        self_address: address,
+    }
+
+    /// A marker resource that registers the type `T` as the system marker for BasicAccount at genesis.
+    struct Marker<phantom T> has key { }
+
+    /// This holds information that will be picked up by the VM to call the
+    /// correct chain-specific prologue and epilogue functions
+    struct ChainSpecificAccountInfo has key {
+        module_addr: address,
+        module_name: vector<u8>,
+        script_prologue_name: vector<u8>,
+        module_prologue_name: vector<u8>,
+        writeset_prologue_name: vector<u8>,
+        multi_agent_prologue_name: vector<u8>,
+        user_epilogue_name: vector<u8>,
+        writeset_epilogue_name: vector<u8>,
+        currency_code_required: bool,
+    }
+
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// Account already existed
+    const EACCOUNT: u64 = 0;
+    /// Sequence number exceeded the maximum value for a u64
+    const ESEQUENCE_NUMBER_TOO_BIG: u64 = 1;
+    /// The address provided didn't match the `CoreFramework` address.
+    const ENOT_CORE_FRAMEWORK: u64 = 2;
+    /// The marker type provided is not the registered type for `Account`.
+    const ENOT_MARKER_TYPE: u64 = 3;
+    /// The provided authentication had an invalid length
+    const EMALFORMED_AUTHENTICATION_KEY: u64 = 4;
+
+    const PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY: u64 = 1001;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD: u64 = 1002;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW: u64 = 1003;
+    const PROLOGUE_EACCOUNT_DNE: u64 = 1004;
+    const PROLOGUE_EBAD_CHAIN_ID: u64 = 1005;
+    const PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG: u64 = 1006;
+
+    native fun create_signer(addr: address): signer;
+
+    public fun initialize<T>(account: &signer,
+        module_addr: address,
+        module_name: vector<u8>,
+        script_prologue_name: vector<u8>,
+        module_prologue_name: vector<u8>,
+        writeset_prologue_name: vector<u8>,
+        multi_agent_prologue_name: vector<u8>,
+        user_epilogue_name: vector<u8>,
+        writeset_epilogue_name: vector<u8>,
+        currency_code_required: bool,
+    ) {
+        assert!(signer::address_of(account) == @CoreResources, errors::requires_address(ENOT_CORE_FRAMEWORK));
+        move_to(account, Marker<T> {});
+        move_to(account, ChainSpecificAccountInfo {
+            module_addr,
+            module_name,
+            script_prologue_name,
+            module_prologue_name,
+            writeset_prologue_name,
+            multi_agent_prologue_name,
+            user_epilogue_name,
+            writeset_epilogue_name,
+            currency_code_required,
+        });
+    }
+
+    fun assert_is_marker<T>() {
+        assert!(exists<Marker<T>>(@CoreResources), errors::invalid_argument(ENOT_MARKER_TYPE))
+    }
+
+    /// Construct an authentication key, aborting if the prefix is not valid.
+    fun create_authentication_key(account: &signer, auth_key_prefix: vector<u8>): vector<u8> {
+        let authentication_key = auth_key_prefix;
+        vector::append(
+            &mut authentication_key, bcs::to_bytes(signer::borrow_address(account))
+        );
+        /*
+        assert!(
+            vector::length(&authentication_key) == 32,
+            errors::invalid_argument(EMALFORMED_AUTHENTICATION_KEY)
+        );
+        */
+        authentication_key
+    }
+    // spec create_authentication_key {
+    //     /// The specification of this function is abstracted to avoid the complexity of
+    //     /// vector concatenation of serialization results. The actual value of the key
+    //     /// is assumed to be irrelevant for callers. Instead the uninterpreted function
+    //     /// `spec_abstract_create_authentication_key` is used to represent the key value.
+    //     /// The aborts behavior is, however, preserved: the caller must provide a
+    //     /// key prefix of a specific length.
+    //     pragma opaque;
+    //     include [abstract] CreateAuthenticationKeyAbortsIf;
+    //     ensures [abstract]
+    //         result == spec_abstract_create_authentication_key(auth_key_prefix) &&
+    //         len(result) == 32;
+    // }
+    // spec schema CreateAuthenticationKeyAbortsIf {
+    //     auth_key_prefix: vector<u8>;
+    //     aborts_if 16 + len(auth_key_prefix) != 32 with Errors::INVALID_ARGUMENT;
+    // }
+    // spec fun spec_abstract_create_authentication_key(auth_key_prefix: vector<u8>): vector<u8>;
+
+    /// Publishes a new `Account` resource under `new_address`.
+    /// A signer representing `new_address` is returned. This way, the caller of this function
+    /// can publish additional resources under `new_address`.
+    /// The `_witness` guarantees that owner the registered caller of this function can call it.
+    /// authentication key returned is `auth_key_prefix` | `fresh_address`.
+    public fun create_account<T>(
+        new_address: address,
+        authentication_key_prefix: vector<u8>,
+        _witness: &T,
+    ): (signer, vector<u8>) {
+        assert_is_marker<T>();
+        // there cannot be an Account resource under new_addr already.
+        assert!(!exists<Account>(new_address), errors::already_published(EACCOUNT));
+
+        let new_account = create_signer(new_address);
+        let authentication_key = create_authentication_key(&new_account, authentication_key_prefix);
+        move_to(
+            &new_account,
+            Account {
+                authentication_key: copy authentication_key,
+                sequence_number: 0,
+                self_address: new_address,
+            }
+        );
+
+        (new_account, authentication_key)
+    }
+
+    public fun exists_at(addr: address): bool {
+        exists<Account>(addr)
+    }
+
+    public fun get_sequence_number(addr: address) : u64 acquires Account {
+        borrow_global<Account>(addr).sequence_number
+    }
+
+    public fun get_authentication_key(addr: address) : vector<u8> acquires Account {
+        *&borrow_global<Account>(addr).authentication_key
+    }
+
+    public fun rotate_authentication_key(
+        account: &signer,
+        new_auth_key: vector<u8>,
+    ) acquires Account {
+        let addr = signer::address_of(account);
+        assert!(exists_at(addr), errors::not_published(EACCOUNT));
+        assert!(
+            vector::length(&new_auth_key) == 32,
+            errors::invalid_argument(EMALFORMED_AUTHENTICATION_KEY)
+        );
+        let account_resource = borrow_global_mut<Account>(addr);
+        account_resource.authentication_key = new_auth_key;
+    }
+
+    public fun prologue(
+        account: &signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        chain_id: u8,
+    ) acquires Account {
+        let transaction_sender = signer::address_of(account);
+        assert!(ChainId::get() == chain_id, errors::invalid_argument(PROLOGUE_EBAD_CHAIN_ID));
+        assert!(exists<Account>(transaction_sender), errors::invalid_argument(PROLOGUE_EACCOUNT_DNE));
+        let sender_account = borrow_global<Account>(transaction_sender);
+        assert!(
+            hash::sha3_256(txn_public_key) == *&sender_account.authentication_key,
+            errors::invalid_argument(PROLOGUE_EINVALID_ACCOUNT_AUTH_KEY),
+        );
+        assert!(
+            (txn_sequence_number as u128) < MAX_U64,
+            errors::limit_exceeded(PROLOGUE_ESEQUENCE_NUMBER_TOO_BIG)
+        );
+
+        assert!(
+            txn_sequence_number >= sender_account.sequence_number,
+            errors::invalid_argument(PROLOGUE_ESEQUENCE_NUMBER_TOO_OLD)
+        );
+
+        // [PCA12]: Check that the transaction's sequence number matches the
+        // current sequence number. Otherwise sequence number is too new by [PCA11].
+        assert!(
+            txn_sequence_number == sender_account.sequence_number,
+            errors::invalid_argument(PROLOGUE_ESEQUENCE_NUMBER_TOO_NEW)
+        );
+    }
+
+    /// Epilogue function is run after a transaction is successfully executed.
+    /// Called by the Adaptor
+    public fun epilogue<T>(account: &signer, _witness: &T) acquires Account {
+        assert_is_marker<T>();
+        let addr = signer::address_of(account);
+        let old_sequence_number = get_sequence_number(addr);
+
+        assert!(
+            (old_sequence_number as u128) < MAX_U64,
+            errors::limit_exceeded(ESEQUENCE_NUMBER_TOO_BIG)
+        );
+
+        // Increment sequence number
+        let account_resource = borrow_global_mut<Account>(addr);
+        account_resource.sequence_number = old_sequence_number + 1;
+    }
+
+    /// Epilogue function called after a successful writeset transaction, which can only be sent by @CoreResources.
+    public fun writeset_epilogue<T>(
+        account: &signer,
+        should_trigger_reconfiguration: bool,
+        witness: &T
+    ) acquires Account {
+        SystemAddresses::assert_core_resource(account);
+        epilogue(account, witness);
+        if (should_trigger_reconfiguration) DiemConfig::reconfigure();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/ChainId.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/ChainId.move
new file mode 100644
index 000000000..549aef2a1
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/ChainId.move
@@ -0,0 +1,30 @@
+/// The chain id distinguishes between different chains (e.g., testnet and the main Diem network).
+/// One important role is to prevent transactions intended for one chain from being executed on another.
+/// This code provides a container for storing a chain id and functions to initialize and get it.
+module CoreFramework::ChainId {
+    use CoreFramework::SystemAddresses;
+    use CoreFramework::DiemTimestamp;
+    use std::errors;
+    use std::signer;
+
+    struct ChainId has key {
+        id: u8
+    }
+
+    /// The `ChainId` resource was not in the required state
+    const ECHAIN_ID: u64 = 0;
+
+    /// Publish the chain ID `id` of this Diem instance under the SystemAddresses address
+    public fun initialize(account: &signer, id: u8) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+        assert!(!exists<ChainId>(signer::address_of(account)), errors::already_published(ECHAIN_ID));
+        move_to(account, ChainId { id })
+    }
+
+    /// Return the chain ID of this Diem instance
+    public fun get(): u8 acquires ChainId {
+        DiemTimestamp::assert_operating();
+        borrow_global<ChainId>(@CoreResources).id
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/CoreGenesis.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/CoreGenesis.move
new file mode 100644
index 000000000..6fbda2a37
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/CoreGenesis.move
@@ -0,0 +1,14 @@
+module CoreFramework::CoreGenesis {
+    use CoreFramework::ChainId;
+    use CoreFramework::DiemBlock;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+
+    /// This can only be called once successfully, since after the first call time will have started.
+    public fun init(core_resource_account: &signer, chain_id: u8) {
+        ChainId::initialize(core_resource_account, chain_id);
+        DiemConfig::initialize(core_resource_account);
+        DiemBlock::initialize_block_metadata(core_resource_account);
+        DiemTimestamp::set_time_has_started(core_resource_account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemBlock.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemBlock.move
new file mode 100644
index 000000000..1284832fe
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemBlock.move
@@ -0,0 +1,90 @@
+/// This module defines a struct storing the metadata of the block and new block events.
+module CoreFramework::DiemBlock {
+    use std::errors;
+    use std::event;
+    use CoreFramework::DiemSystem;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    struct BlockMetadata has key {
+        /// Height of the current block
+        height: u64,
+        /// Handle where events with the time of new blocks are emitted
+        new_block_events: event::EventHandle<Self::NewBlockEvent>,
+    }
+
+    struct NewBlockEvent has drop, store {
+        round: u64,
+        proposer: address,
+        previous_block_votes: vector<address>,
+
+        /// On-chain time during  he block at the given height
+        time_microseconds: u64,
+    }
+
+    /// The `BlockMetadata` resource is in an invalid state
+    const EBLOCK_METADATA: u64 = 0;
+    /// An invalid signer was provided. Expected the signer to be the VM or a Validator.
+    const EVM_OR_VALIDATOR: u64 = 1;
+
+    /// This can only be invoked by the Association address, and only a single time.
+    /// Currently, it is invoked in the genesis transaction
+    public fun initialize_block_metadata(account: &signer) {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint, only callable by the Association address
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(!is_initialized(), errors::already_published(EBLOCK_METADATA));
+        move_to<BlockMetadata>(
+            account,
+            BlockMetadata {
+                height: 0,
+                new_block_events: event::new_event_handle<Self::NewBlockEvent>(account),
+            }
+        );
+    }
+
+    /// Helper function to determine whether this module has been initialized.
+    fun is_initialized(): bool {
+        exists<BlockMetadata>(@CoreResources)
+    }
+
+    /// Set the metadata for the current block.
+    /// The runtime always runs this before executing the transactions in a block.
+    fun block_prologue(
+        vm: signer,
+        round: u64,
+        timestamp: u64,
+        previous_block_votes: vector<address>,
+        proposer: address
+    ) acquires BlockMetadata {
+        DiemTimestamp::assert_operating();
+        // Operational constraint: can only be invoked by the VM.
+        SystemAddresses::assert_vm(&vm);
+
+        // Authorization
+        assert!(
+            proposer == @VMReserved || DiemSystem::is_validator(proposer),
+            errors::requires_address(EVM_OR_VALIDATOR)
+        );
+
+        let block_metadata_ref = borrow_global_mut<BlockMetadata>(@CoreResources);
+        DiemTimestamp::update_global_time(&vm, proposer, timestamp);
+        block_metadata_ref.height = block_metadata_ref.height + 1;
+        event::emit_event<NewBlockEvent>(
+            &mut block_metadata_ref.new_block_events,
+            NewBlockEvent {
+                round,
+                proposer,
+                previous_block_votes,
+                time_microseconds: timestamp,
+            }
+        );
+    }
+
+    /// Get the current block height
+    public fun get_current_block_height(): u64 acquires BlockMetadata {
+        assert!(is_initialized(), errors::not_published(EBLOCK_METADATA));
+        borrow_global<BlockMetadata>(@CoreResources).height
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemConfig.move
new file mode 100644
index 000000000..6a8ef973a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemConfig.move
@@ -0,0 +1,145 @@
+/// Publishes configuration information for validators, and issues reconfiguration events
+/// to synchronize configuration changes for the validators.
+module CoreFramework::DiemConfig {
+    use std::errors;
+    use std::event;
+    use std::signer;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    friend CoreFramework::Account;
+    friend CoreFramework::DiemConsensusConfig;
+    friend CoreFramework::DiemSystem;
+    friend CoreFramework::DiemVersion;
+    friend CoreFramework::DiemVMConfig;
+    friend CoreFramework::ParallelExecutionConfig;
+
+    /// Event that signals DiemBFT algorithm to start a new epoch,
+    /// with new configuration information. This is also called a
+    /// "reconfiguration event"
+    struct NewEpochEvent has drop, store {
+        epoch: u64,
+    }
+
+    /// Holds information about state of reconfiguration
+    struct Configuration has key {
+        /// Epoch number
+        epoch: u64,
+        /// Time of last reconfiguration. Only changes on reconfiguration events.
+        last_reconfiguration_time: u64,
+        /// Event handle for reconfiguration events
+        events: event::EventHandle<NewEpochEvent>,
+    }
+
+    /// Reconfiguration disabled if this resource occurs under LibraRoot.
+    struct DisableReconfiguration has key {}
+
+    /// The `Configuration` resource is in an invalid state
+    const ECONFIGURATION: u64 = 0;
+    /// A `DiemConfig` resource is in an invalid state
+    const EDIEM_CONFIG: u64 = 1;
+    /// A `ModifyConfigCapability` is in a different state than was expected
+    const EMODIFY_CAPABILITY: u64 = 2;
+    /// An invalid block time was encountered.
+    const EINVALID_BLOCK_TIME: u64 = 3;
+    /// The largest possible u64 value
+    const MAX_U64: u64 = 18446744073709551615;
+
+    /// Publishes `Configuration` resource. Can only be invoked by Diem root, and only a single time in Genesis.
+    public fun initialize(
+        account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+        assert!(!exists<Configuration>(@CoreResources), errors::already_published(ECONFIGURATION));
+        move_to<Configuration>(
+            account,
+            Configuration {
+                epoch: 0,
+                last_reconfiguration_time: 0,
+                events: event::new_event_handle<NewEpochEvent>(account),
+            }
+        );
+    }
+
+    /// Private function to temporarily halt reconfiguration.
+    /// This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+    fun disable_reconfiguration(account: &signer) {
+        SystemAddresses::assert_core_resource(account);
+        assert!(reconfiguration_enabled(), errors::invalid_state(ECONFIGURATION));
+        move_to(account, DisableReconfiguration {} )
+    }
+
+    /// Private function to resume reconfiguration.
+    /// This function should only be used for offline WriteSet generation purpose and should never be invoked on chain.
+    fun enable_reconfiguration(account: &signer) acquires DisableReconfiguration {
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(!reconfiguration_enabled(), errors::invalid_state(ECONFIGURATION));
+        DisableReconfiguration {} = move_from<DisableReconfiguration>(signer::address_of(account));
+    }
+
+    fun reconfiguration_enabled(): bool {
+        !exists<DisableReconfiguration>(@CoreResources)
+    }
+
+    /// Signal validators to start using new configuration. Must be called from friend config modules.
+    public(friend) fun reconfigure() acquires Configuration {
+        reconfigure_();
+    }
+
+    /// Private function to do reconfiguration.  Updates reconfiguration status resource
+    /// `Configuration` and emits a `NewEpochEvent`
+    fun reconfigure_() acquires Configuration {
+        // Do not do anything if genesis has not finished.
+        if (DiemTimestamp::is_genesis() || DiemTimestamp::now_microseconds() == 0 || !reconfiguration_enabled()) {
+            return ()
+        };
+
+        let config_ref = borrow_global_mut<Configuration>(@CoreResources);
+        let current_time = DiemTimestamp::now_microseconds();
+
+        // Do not do anything if a reconfiguration event is already emitted within this transaction.
+        //
+        // This is OK because:
+        // - The time changes in every non-empty block
+        // - A block automatically ends after a transaction that emits a reconfiguration event, which is guaranteed by
+        //   DiemVM spec that all transactions comming after a reconfiguration transaction will be returned as Retry
+        //   status.
+        // - Each transaction must emit at most one reconfiguration event
+        //
+        // Thus, this check ensures that a transaction that does multiple "reconfiguration required" actions emits only
+        // one reconfiguration event.
+        //
+        if (current_time == config_ref.last_reconfiguration_time) {
+            return
+        };
+
+        assert!(current_time > config_ref.last_reconfiguration_time, errors::invalid_state(EINVALID_BLOCK_TIME));
+        config_ref.last_reconfiguration_time = current_time;
+        config_ref.epoch = config_ref.epoch + 1;
+
+        event::emit_event<NewEpochEvent>(
+            &mut config_ref.events,
+            NewEpochEvent {
+                epoch: config_ref.epoch,
+            },
+        );
+    }
+
+    /// Emit a `NewEpochEvent` event. This function will be invoked by genesis directly to generate the very first
+    /// reconfiguration event.
+    fun emit_genesis_reconfiguration_event() acquires Configuration {
+        assert!(exists<Configuration>(@CoreResources), errors::not_published(ECONFIGURATION));
+        let config_ref = borrow_global_mut<Configuration>(@CoreResources);
+        assert!(config_ref.epoch == 0 && config_ref.last_reconfiguration_time == 0, errors::invalid_state(ECONFIGURATION));
+        config_ref.epoch = 1;
+
+        event::emit_event<NewEpochEvent>(
+            &mut config_ref.events,
+            NewEpochEvent {
+                epoch: config_ref.epoch,
+            },
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemTimestamp.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemTimestamp.move
new file mode 100644
index 000000000..d24ce999e
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/DiemTimestamp.move
@@ -0,0 +1,195 @@
+/// This module keeps a global wall clock that stores the current Unix time in microseconds.
+/// It interacts with the other modules in the following ways:
+///
+/// * Genesis: to initialize the timestamp
+/// * VASP: to keep track of when credentials expire
+/// * DiemSystem, DiemAccount, DiemConfig: to check if the current state is in the genesis state
+/// * DiemBlock: to reach consensus on the global wall clock time
+/// * AccountLimits: to limit the time of account limits
+///
+/// This module moreover enables code to assert that it is running in genesis (`Self::assert_genesis`) or after
+/// genesis (`Self::assert_operating`). These are essentially distinct states of the system. Specifically,
+/// if `Self::assert_operating` succeeds, assumptions about invariants over the global state can be made
+/// which reflect that the system has been successfully initialized.
+module CoreFramework::DiemTimestamp {
+    use CoreFramework::SystemAddresses;
+    use std::signer;
+    use std::errors;
+
+    friend CoreFramework::CoreGenesis;
+
+    /// A singleton resource holding the current Unix time in microseconds
+    struct CurrentTimeMicroseconds has key {
+        microseconds: u64,
+    }
+
+    /// Conversion factor between seconds and microseconds
+    const MICRO_CONVERSION_FACTOR: u64 = 1000000;
+
+    /// The blockchain is not in the genesis state anymore
+    const ENOT_GENESIS: u64 = 0;
+    /// The blockchain is not in an operating state yet
+    const ENOT_OPERATING: u64 = 1;
+    /// An invalid timestamp was provided
+    const ETIMESTAMP: u64 = 2;
+
+    /// Marks that time has started and genesis has finished. This can only be called from genesis and with the root
+    /// account.
+    public(friend) fun set_time_has_started(dr_account: &signer) {
+        assert_genesis();
+        SystemAddresses::assert_core_resource(dr_account);
+        let timer = CurrentTimeMicroseconds { microseconds: 0 };
+        move_to(dr_account, timer);
+    }
+     spec set_time_has_started {
+        /// This function can't be verified on its own and has to be verified in the context of Genesis execution.
+        ///
+        /// After time has started, all invariants guarded by `DiemTimestamp::is_operating` will become activated
+        /// and need to hold.
+        pragma delegate_invariants_to_caller;
+        include AbortsIfNotGenesis;
+        include SystemAddresses::AbortsIfNotCoreResource{addr: signer::address_of(dr_account)};
+        ensures is_operating();
+    }
+
+    // TODO: this is for both df-cli and the unit-test for df
+    // - df-cli, as a few test cases in df-cli uses a customized genesis module and that module needs  to invoke
+    //   `set_time_has_started` in order to complete the genesis process. Until we find a way to solve this issue, this
+    //   temporary function will stay here.
+    // - this is also needed for diem-framework unit test `DiemTimestampTests`. And once the above issue for df-cli is
+    //   resolved, we can mark this function #[test_only]
+    public fun set_time_has_started_for_testing(dr_account: &signer) {
+        set_time_has_started(dr_account);
+    }
+    spec set_time_has_started_for_testing {
+        pragma verify = false;
+    }
+
+    /// Updates the wall clock time by consensus. Requires VM privilege and will be invoked during block prologue.
+    public fun update_global_time(
+        account: &signer,
+        proposer: address,
+        timestamp: u64
+    ) acquires CurrentTimeMicroseconds {
+        assert_operating();
+        // Can only be invoked by DiemVM signer.
+        SystemAddresses::assert_vm(account);
+
+        let global_timer = borrow_global_mut<CurrentTimeMicroseconds>(@CoreResources);
+        let now = global_timer.microseconds;
+        if (proposer == @VMReserved) {
+            // NIL block with null address as proposer. Timestamp must be equal.
+            assert!(now == timestamp, errors::invalid_argument(ETIMESTAMP));
+        } else {
+            // Normal block. Time must advance
+            assert!(now < timestamp, errors::invalid_argument(ETIMESTAMP));
+        };
+        global_timer.microseconds = timestamp;
+    }
+    spec update_global_time {
+        pragma opaque;
+        modifies global<CurrentTimeMicroseconds>(@CoreResources);
+
+        let now = spec_now_microseconds();
+        let post post_now = spec_now_microseconds();
+
+        /// Conditions unique for abstract and concrete version of this function.
+        include AbortsIfNotOperating;
+        include SystemAddresses::AbortsIfNotVM;
+        ensures post_now == timestamp;
+
+        /// Conditions we only check for the implementation, but do not pass to the caller.
+        aborts_if [concrete]
+            (if (proposer == @VMReserved) {
+                now != timestamp
+             } else  {
+                now >= timestamp
+             }
+            )
+            with errors::INVALID_ARGUMENT;
+    }
+
+    /// Gets the current time in microseconds.
+    public fun now_microseconds(): u64 acquires CurrentTimeMicroseconds {
+        assert_operating();
+        borrow_global<CurrentTimeMicroseconds>(@CoreResources).microseconds
+    }
+    spec now_microseconds {
+        pragma opaque;
+        include AbortsIfNotOperating;
+        ensures result == spec_now_microseconds();
+    }
+    spec fun spec_now_microseconds(): u64 {
+        global<CurrentTimeMicroseconds>(@CoreResources).microseconds
+    }
+
+    /// Gets the current time in seconds.
+    public fun now_seconds(): u64 acquires CurrentTimeMicroseconds {
+        now_microseconds() / MICRO_CONVERSION_FACTOR
+    }
+    spec now_seconds {
+        pragma opaque;
+        include AbortsIfNotOperating;
+        ensures result == spec_now_seconds();
+    }
+    spec fun spec_now_seconds(): u64 {
+        spec_now_microseconds() / MICRO_CONVERSION_FACTOR
+    }
+
+    /// Helper function to determine if Diem is in genesis state.
+    public fun is_genesis(): bool {
+        !exists<CurrentTimeMicroseconds>(@CoreResources)
+    }
+
+    /// Helper function to assert genesis state.
+    public fun assert_genesis() {
+        assert!(is_genesis(), errors::invalid_state(ENOT_GENESIS));
+    }
+    spec assert_genesis {
+        pragma opaque = true;
+        include AbortsIfNotGenesis;
+    }
+
+    /// Helper function to determine if Diem is operating. This is the same as `!is_genesis()` and is provided
+    /// for convenience. Testing `is_operating()` is more frequent than `is_genesis()`.
+    public fun is_operating(): bool {
+        exists<CurrentTimeMicroseconds>(@CoreResources)
+    }
+    /// Helper schema to specify that a function aborts if not in genesis.
+    spec schema AbortsIfNotGenesis {
+        aborts_if !is_genesis() with errors::INVALID_STATE;
+    }
+
+    /// Helper function to assert operating (!genesis) state.
+    public fun assert_operating() {
+        assert!(is_operating(), errors::invalid_state(ENOT_OPERATING));
+    }
+    spec assert_operating {
+        pragma opaque = true;
+        include AbortsIfNotOperating;
+    }
+
+    /// Helper schema to specify that a function aborts if not operating.
+    spec schema AbortsIfNotOperating {
+        aborts_if !is_operating() with errors::INVALID_STATE;
+    }
+
+    // ====================
+    // Module Specification
+    spec module {} // switch documentation context to module level
+
+    spec module {
+        /// After genesis, `CurrentTimeMicroseconds` is published forever
+        invariant is_operating() ==> exists<CurrentTimeMicroseconds>(@CoreResources);
+
+        /// After genesis, time progresses monotonically.
+        invariant update
+            old(is_operating()) ==> old(spec_now_microseconds()) <= spec_now_microseconds();
+    }
+
+    spec module {
+        /// All functions which do not have an `aborts_if` specification in this module are implicitly declared
+        /// to never abort.
+        pragma aborts_if_is_strict;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Signature.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Signature.move
new file mode 100644
index 000000000..e265918c3
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/Signature.move
@@ -0,0 +1,24 @@
+/// Contains functions for [ed25519](https://en.wikipedia.org/wiki/EdDSA) digital signatures.
+module CoreFramework::Signature {
+
+    /// Return `true` if the bytes in `public_key` can be parsed as a valid Ed25519 public key.
+    /// Returns `false` if `public_key` is not 32 bytes OR is 32 bytes, but does not pass
+    /// points-on-curve or small subgroup checks. See the Rust `diem_crypto::Ed25519PublicKey` type
+    /// for more details.
+    /// Does not abort.
+    native public fun ed25519_validate_pubkey(public_key: vector<u8>): bool;
+
+    /// Return true if the Ed25519 `signature` on `message` verifies against the Ed25519 public key
+    /// `public_key`.
+    /// Returns `false` if:
+    /// - `signature` is not 64 bytes
+    /// - `public_key` is not 32 bytes
+    /// - `public_key` does not pass points-on-curve or small subgroup checks,
+    /// - `signature` and `public_key` are valid, but the signature on `message` does not verify.
+    /// Does not abort.
+    native public fun ed25519_verify(
+        signature: vector<u8>,
+        public_key: vector<u8>,
+        message: vector<u8>
+    ): bool;
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/SystemAddresses.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/SystemAddresses.move
new file mode 100644
index 000000000..f7b3b23c1
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/SystemAddresses.move
@@ -0,0 +1,50 @@
+module CoreFramework::SystemAddresses {
+    use std::errors;
+    use std::signer;
+
+    /// The address/account did not correspond to the core resource address
+    const ENOT_CORE_RESOURCE_ADDRESS: u64 = 0;
+    /// The operation can only be performed by the VM
+    const EVM: u64 = 1;
+
+    public fun assert_core_resource(account: &signer) {
+        assert_core_resource_address(signer::address_of(account))
+    }
+    spec assert_core_resource {
+        pragma opaque;
+        include AbortsIfNotCoreResource {addr: signer::address_of(account) };
+    }
+
+    public fun assert_core_resource_address(addr: address) {
+        assert!(is_core_resource_address(addr), errors::requires_address(ENOT_CORE_RESOURCE_ADDRESS))
+    }
+    spec assert_core_resource_address {
+        pragma opaque;
+        include AbortsIfNotCoreResource;
+    }
+
+    /// Specifies that a function aborts if the account does not have the Diem root address.
+    spec schema AbortsIfNotCoreResource {
+        addr: address;
+        aborts_if addr != @CoreResources with errors::REQUIRES_ADDRESS;
+    }
+
+    public fun is_core_resource_address(addr: address): bool {
+        addr == @CoreResources
+    }
+
+    /// Assert that the signer has the VM reserved address.
+    public fun assert_vm(account: &signer) {
+        assert!(signer::address_of(account) == @VMReserved, errors::requires_address(EVM))
+    }
+    spec assert_vm {
+        pragma opaque;
+        include AbortsIfNotVM;
+    }
+
+    /// Specifies that a function aborts if the account does not have the VM reserved address.
+    spec schema AbortsIfNotVM {
+        account: signer;
+        aborts_if signer::address_of(account) != @VMReserved with errors::REQUIRES_ADDRESS;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemConsensusConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemConsensusConfig.move
new file mode 100644
index 000000000..df8838e13
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemConsensusConfig.move
@@ -0,0 +1,47 @@
+/// Maintains the consensus config for the Diem blockchain. The config is stored in a
+/// DiemConfig, and may be updated by Diem root.
+module CoreFramework::DiemConsensusConfig {
+    use std::capability::Cap;
+    use std::errors;
+    use std::vector;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    /// Error with chain marker
+    const ECHAIN_MARKER: u64 = 0;
+    /// Error with config
+    const ECONFIG: u64 = 1;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct ConsensusConfigChainMarker<phantom T> has key {}
+
+    struct DiemConsensusConfig has key {
+        config: vector<u8>,
+    }
+
+    /// Publishes the DiemConsensusConfig config.
+    public fun initialize<T>(account: &signer) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+        assert!(
+            !exists<ConsensusConfigChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !exists<DiemConsensusConfig>(@CoreResources),
+            errors::already_published(ECONFIG)
+        );
+        move_to(account, ConsensusConfigChainMarker<T>{});
+        move_to(account, DiemConsensusConfig { config: vector::empty() });
+    }
+
+    /// Update the config.
+    public fun set<T>(config: vector<u8>, _cap: &Cap<T>) acquires DiemConsensusConfig {
+        assert!(exists<ConsensusConfigChainMarker<T>>(@CoreResources), errors::not_published(ECHAIN_MARKER));
+        let config_ref = &mut borrow_global_mut<DiemConsensusConfig>(@CoreResources).config;
+        *config_ref = config;
+        DiemConfig::reconfigure();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemSystem.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemSystem.move
new file mode 100644
index 000000000..ca944a3e3
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemSystem.move
@@ -0,0 +1,297 @@
+/// Maintains information about the set of validators used during consensus.
+/// Provides functions to add, remove, and update validators in the
+/// validator set.
+///
+/// > Note: When trying to understand this code, it's important to know that "config"
+/// and "configuration" are used for several distinct concepts.
+module CoreFramework::DiemSystem {
+    use std::capability::Cap;
+    use std::errors;
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+    use CoreFramework::ValidatorConfig;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct ValidatorSetChainMarker<phantom T> has key {}
+
+    /// Information about a Validator Owner.
+    struct ValidatorInfo has copy, drop, store {
+        /// The address (account) of the Validator Owner
+        addr: address,
+        /// The voting power of the Validator Owner (currently always 1).
+        consensus_voting_power: u64,
+        /// Configuration information about the Validator, such as the
+        /// Validator Operator, human name, and info such as consensus key
+        /// and network addresses.
+        config: ValidatorConfig::Config,
+        /// The time of last reconfiguration invoked by this validator
+        /// in microseconds
+        last_config_update_time: u64,
+    }
+
+    /// The DiemSystem struct stores the validator set and crypto scheme in
+    /// DiemConfig. The DiemSystem struct is stored by DiemConfig, which publishes a
+    /// DiemConfig<DiemSystem> resource.
+    struct DiemSystem has key, copy, drop {
+        /// The current consensus crypto scheme.
+        scheme: u8,
+        /// The current validator set.
+        validators: vector<ValidatorInfo>,
+    }
+
+    /// The `DiemSystem` resource was not in the required state
+    const ECONFIG: u64 = 0;
+    /// Tried to add a validator with an invalid state to the validator set
+    const EINVALID_PROSPECTIVE_VALIDATOR: u64 = 1;
+    /// Tried to add a validator to the validator set that was already in it
+    const EALREADY_A_VALIDATOR: u64 = 2;
+    /// An operation was attempted on an address not in the vaidator set
+    const ENOT_AN_ACTIVE_VALIDATOR: u64 = 3;
+    /// The validator operator is not the operator for the specified validator
+    const EINVALID_TRANSACTION_SENDER: u64 = 4;
+    /// An out of bounds index for the validator set was encountered
+    const EVALIDATOR_INDEX: u64 = 5;
+    /// Rate limited when trying to update config
+    const ECONFIG_UPDATE_RATE_LIMITED: u64 = 6;
+    /// Validator set already at maximum allowed size
+    const EMAX_VALIDATORS: u64 = 7;
+    /// Validator config update time overflows
+    const ECONFIG_UPDATE_TIME_OVERFLOWS: u64 = 8;
+    /// The `ValidatorSetChainMarker` resource was not in the required state
+    const ECHAIN_MARKER: u64 = 9;
+
+    /// Number of microseconds in 5 minutes
+    const FIVE_MINUTES: u64 = 300000000;
+
+    /// The maximum number of allowed validators in the validator set
+    const MAX_VALIDATORS: u64 = 256;
+
+    /// The largest possible u64 value
+    const MAX_U64: u64 = 18446744073709551615;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Setup methods
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    /// Publishes the DiemSystem struct, which contains the current validator set.
+    /// Must be invoked by @CoreResources a single time in Genesis.
+    public fun initialize_validator_set<T>(
+        account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(!exists<ValidatorSetChainMarker<T>>(@CoreResources), errors::already_published(ECHAIN_MARKER));
+        assert!(!exists<DiemSystem>(@CoreResources), errors::already_published(ECONFIG));
+        move_to(account, ValidatorSetChainMarker<T>{});
+        move_to(
+            account,
+            DiemSystem {
+                scheme: 0,
+                validators: vector::empty(),
+            },
+        );
+    }
+
+    /// Copies a DiemSystem struct into the DiemSystem resource
+    /// Called by the add, remove, and update functions.
+    fun set_diem_system_config(value: DiemSystem) acquires DiemSystem {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<DiemSystem>(@CoreResources),
+            errors::not_published(ECONFIG)
+        );
+        // Updates the DiemSystem and emits a reconfigure event.
+        let config_ref = borrow_global_mut<DiemSystem>(@CoreResources);
+        *config_ref = value;
+        DiemConfig::reconfigure();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods operating the Validator Set config callable by the diem root account
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Adds a new validator to the validator set.
+    public fun add_validator<T>(
+        validator_addr: address,
+        _cap: Cap<T>
+    ) acquires DiemSystem {
+        DiemTimestamp::assert_operating();
+        assert_chain_marker_is_published<T>();
+
+        // A prospective validator must have a validator config resource
+        assert!(
+            ValidatorConfig::is_valid(validator_addr),
+            errors::invalid_argument(EINVALID_PROSPECTIVE_VALIDATOR)
+        );
+
+        // Bound the validator set size
+        assert!(
+            validator_set_size() < MAX_VALIDATORS,
+            errors::limit_exceeded(EMAX_VALIDATORS)
+        );
+
+        let diem_system_config = get_diem_system_config();
+
+        // Ensure that this address is not already a validator
+        assert!(
+            !is_validator_(validator_addr, &diem_system_config.validators),
+            errors::invalid_argument(EALREADY_A_VALIDATOR)
+        );
+
+        // it is guaranteed that the config is non-empty
+        let config = ValidatorConfig::get_config(validator_addr);
+        vector::push_back(&mut diem_system_config.validators, ValidatorInfo {
+            addr: validator_addr,
+            config, // copy the config over to ValidatorSet
+            consensus_voting_power: 1,
+            last_config_update_time: DiemTimestamp::now_microseconds(),
+        });
+
+        set_diem_system_config(diem_system_config);
+    }
+
+    /// Removes a validator, aborts unless called by diem root account
+    public fun remove_validator<T>(
+        validator_addr: address,
+        _cap: Cap<T>
+    ) acquires DiemSystem {
+        DiemTimestamp::assert_operating();
+        assert_chain_marker_is_published<T>();
+
+        let diem_system_config = get_diem_system_config();
+        // Ensure that this address is an active validator
+        let to_remove_index_vec = get_validator_index_(&diem_system_config.validators, validator_addr);
+        assert!(option::is_some(&to_remove_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        let to_remove_index = *option::borrow(&to_remove_index_vec);
+        // Remove corresponding ValidatorInfo from the validator set
+        _  = vector::swap_remove(&mut diem_system_config.validators, to_remove_index);
+
+        set_diem_system_config(diem_system_config);
+    }
+
+    /// Copy the information from ValidatorConfig into the validator set.
+    /// This function makes no changes to the size or the members of the set.
+    /// If the config in the ValidatorSet changes, it stores the new DiemSystem
+    /// and emits a reconfigurationevent.
+    public fun update_config_and_reconfigure(
+        validator_operator_account: &signer,
+        validator_addr: address,
+    ) acquires DiemSystem {
+        DiemTimestamp::assert_operating();
+        assert!(
+            ValidatorConfig::get_operator(validator_addr) == signer::address_of(validator_operator_account),
+            errors::invalid_argument(EINVALID_TRANSACTION_SENDER)
+        );
+        let diem_system_config = get_diem_system_config();
+        let to_update_index_vec = get_validator_index_(&diem_system_config.validators, validator_addr);
+        assert!(option::is_some(&to_update_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        let to_update_index = *option::borrow(&to_update_index_vec);
+        let is_validator_info_updated = update_ith_validator_info_(&mut diem_system_config.validators, to_update_index);
+        if (is_validator_info_updated) {
+            let validator_info = vector::borrow_mut(&mut diem_system_config.validators, to_update_index);
+            assert!(
+                validator_info.last_config_update_time <= MAX_U64 - FIVE_MINUTES,
+                errors::limit_exceeded(ECONFIG_UPDATE_TIME_OVERFLOWS)
+            );
+            assert!(
+                DiemTimestamp::now_microseconds() > validator_info.last_config_update_time + FIVE_MINUTES,
+                errors::limit_exceeded(ECONFIG_UPDATE_RATE_LIMITED)
+            );
+            validator_info.last_config_update_time = DiemTimestamp::now_microseconds();
+            set_diem_system_config(diem_system_config);
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs: getters
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Get the DiemSystem configuration from DiemConfig
+    public fun get_diem_system_config(): DiemSystem acquires DiemSystem {
+        *borrow_global<DiemSystem>(@CoreResources)
+    }
+
+    /// Return true if `addr` is in the current validator set
+    public fun is_validator(addr: address): bool acquires DiemSystem {
+        is_validator_(addr, &get_diem_system_config().validators)
+    }
+
+    /// Returns validator config. Aborts if `addr` is not in the validator set.
+    public fun get_validator_config(addr: address): ValidatorConfig::Config acquires DiemSystem {
+        let diem_system_config = get_diem_system_config();
+        let validator_index_vec = get_validator_index_(&diem_system_config.validators, addr);
+        assert!(option::is_some(&validator_index_vec), errors::invalid_argument(ENOT_AN_ACTIVE_VALIDATOR));
+        *&(vector::borrow(&diem_system_config.validators, *option::borrow(&validator_index_vec))).config
+    }
+
+    /// Return the size of the current validator set
+    public fun validator_set_size(): u64 acquires DiemSystem {
+        vector::length(&get_diem_system_config().validators)
+    }
+
+    /// Get the `i`'th validator address in the validator set.
+    public fun get_ith_validator_address(i: u64): address acquires DiemSystem{
+        assert!(i < validator_set_size(), errors::invalid_argument(EVALIDATOR_INDEX));
+        vector::borrow(&get_diem_system_config().validators, i).addr
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Private functions
+    ///////////////////////////////////////////////////////////////////////////
+
+    fun assert_chain_marker_is_published<T>() {
+        assert!(exists<ValidatorSetChainMarker<T>>(@CoreResources), errors::not_published(ECHAIN_MARKER));
+    }
+
+
+    /// Get the index of the validator by address in the `validators` vector
+    /// It has a loop, so there are spec blocks in the code to assert loop invariants.
+    fun get_validator_index_(validators: &vector<ValidatorInfo>, addr: address): Option<u64> {
+        let size = vector::length(validators);
+        let i = 0;
+        while (i < size) {
+            let validator_info_ref = vector::borrow(validators, i);
+            if (validator_info_ref.addr == addr) {
+                return option::some(i)
+            };
+            i = i + 1;
+        };
+        return option::none()
+    }
+
+    /// Updates *i*th validator info, if nothing changed, return false.
+    /// This function never aborts.
+    fun update_ith_validator_info_(validators: &mut vector<ValidatorInfo>, i: u64): bool {
+        let size = vector::length(validators);
+        // This provably cannot happen, but left it here for safety.
+        if (i >= size) {
+            return false
+        };
+        let validator_info = vector::borrow_mut(validators, i);
+        // "is_valid" below should always hold based on a global invariant later
+        // in the file (which proves if we comment out some other specifications),
+        // but it is left here for safety.
+        if (!ValidatorConfig::is_valid(validator_info.addr)) {
+            return false
+        };
+        let new_validator_config = ValidatorConfig::get_config(validator_info.addr);
+        // check if information is the same
+        let config_ref = &mut validator_info.config;
+        if (config_ref == &new_validator_config) {
+            return false
+        };
+        *config_ref = new_validator_config;
+        true
+    }
+
+    /// Private function checks for membership of `addr` in validator set.
+    fun is_validator_(addr: address, validators_vec_ref: &vector<ValidatorInfo>): bool {
+        option::is_some(&get_validator_index_(validators_vec_ref, addr))
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVMConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVMConfig.move
new file mode 100644
index 000000000..9f68efc1f
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVMConfig.move
@@ -0,0 +1,173 @@
+/// This module defines structs and methods to initialize VM configurations,
+/// including different costs of running the VM.
+module CoreFramework::DiemVMConfig {
+    use std::capability::Cap;
+    use std::errors;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    /// Error with chain marker
+    const ECHAIN_MARKER: u64 = 0;
+    /// Error with config
+    const ECONFIG: u64 = 1;
+    /// The provided gas constants were inconsistent.
+    const EGAS_CONSTANT_INCONSISTENCY: u64 = 2;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct VMConfigChainMarker<phantom T> has key {}
+
+    /// The struct to hold config data needed to operate the DiemVM.
+    struct DiemVMConfig has key {
+        /// Cost of running the VM.
+        gas_schedule: GasSchedule,
+    }
+
+    /// The gas schedule keeps two separate schedules for the gas:
+    /// * The instruction_schedule: This holds the gas for each bytecode instruction.
+    /// * The native_schedule: This holds the gas for used (per-byte operated over) for each native
+    ///   function.
+    /// A couple notes:
+    /// 1. In the case that an instruction is deleted from the bytecode, that part of the cost schedule
+    ///    still needs to remain the same; once a slot in the table is taken by an instruction, that is its
+    ///    slot for the rest of time (since that instruction could already exist in a module on-chain).
+    /// 2. The initialization of the module will publish the instruction table to the diem root account
+    ///    address, and will preload the vector with the gas schedule for instructions. The VM will then
+    ///    load this into memory at the startup of each block.
+    struct GasSchedule has copy, drop, store {
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        gas_constants: GasConstants,
+    }
+
+    struct GasConstants has copy, drop, store {
+        /// The cost per-byte read from global storage.
+        global_memory_per_byte_cost: u64,
+
+        /// The cost per-byte written to storage.
+        global_memory_per_byte_write_cost: u64,
+
+        /// The flat minimum amount of gas required for any transaction.
+        /// Charged at the start of execution.
+        min_transaction_gas_units: u64,
+
+        /// Any transaction over this size will be charged an additional amount per byte.
+        large_transaction_cutoff: u64,
+
+        /// The units of gas to be charged per byte over the `large_transaction_cutoff` in addition to
+        /// `min_transaction_gas_units` for transactions whose size exceeds `large_transaction_cutoff`.
+        intrinsic_gas_per_byte: u64,
+
+        /// ~5 microseconds should equal one unit of computational gas. We bound the maximum
+        /// computational time of any given transaction at roughly 20 seconds. We want this number and
+        /// `MAX_PRICE_PER_GAS_UNIT` to always satisfy the inequality that
+        /// MAXIMUM_NUMBER_OF_GAS_UNITS * MAX_PRICE_PER_GAS_UNIT < min(u64::MAX, GasUnits<GasCarrier>::MAX)
+        /// NB: The bound is set quite high since custom scripts aren't allowed except from predefined
+        /// and vetted senders.
+        maximum_number_of_gas_units: u64,
+
+        /// The minimum gas price that a transaction can be submitted with.
+        min_price_per_gas_unit: u64,
+
+        /// The maximum gas unit price that a transaction can be submitted with.
+        max_price_per_gas_unit: u64,
+
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    }
+
+    /// Initialize the table under the diem root account
+    public fun initialize<T>(
+        account: &signer,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+    ) {
+        DiemTimestamp::assert_genesis();
+
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(
+            !exists<VMConfigChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !exists<DiemVMConfig>(@CoreResources),
+            errors::already_published(ECONFIG)
+        );
+
+        move_to(account, VMConfigChainMarker<T>{});
+
+        let gas_constants = GasConstants {
+            global_memory_per_byte_cost: 4,
+            global_memory_per_byte_write_cost: 9,
+            min_transaction_gas_units: 600,
+            large_transaction_cutoff: 600,
+            intrinsic_gas_per_byte: 8,
+            maximum_number_of_gas_units: 4000000,
+            min_price_per_gas_unit: 0,
+            max_price_per_gas_unit: 10000,
+            max_transaction_size_in_bytes: 4096,
+            gas_unit_scaling_factor: 1000,
+            default_account_size: 800,
+        };
+
+        move_to(
+            account,
+            DiemVMConfig {
+                gas_schedule: GasSchedule {
+                    instruction_schedule,
+                    native_schedule,
+                    gas_constants,
+                }
+            },
+        );
+    }
+
+    public fun set_gas_constants<T>(
+        global_memory_per_byte_cost: u64,
+        global_memory_per_byte_write_cost: u64,
+        min_transaction_gas_units: u64,
+        large_transaction_cutoff: u64,
+        intrinsic_gas_per_byte: u64,
+        maximum_number_of_gas_units: u64,
+        min_price_per_gas_unit: u64,
+        max_price_per_gas_unit: u64,
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+        _cap: &Cap<T>
+    ) acquires DiemVMConfig {
+        DiemTimestamp::assert_operating();
+
+        assert!(exists<VMConfigChainMarker<T>>(@CoreResources), errors::not_published(ECHAIN_MARKER));
+
+        assert!(
+            min_price_per_gas_unit <= max_price_per_gas_unit,
+            errors::invalid_argument(EGAS_CONSTANT_INCONSISTENCY)
+        );
+        assert!(
+            min_transaction_gas_units <= maximum_number_of_gas_units,
+            errors::invalid_argument(EGAS_CONSTANT_INCONSISTENCY)
+        );
+
+        assert!(exists<DiemVMConfig>(@CoreResources), errors::not_published(ECONFIG));
+
+        let gas_constants = &mut borrow_global_mut<DiemVMConfig>(@CoreResources).gas_schedule.gas_constants;
+
+        gas_constants.global_memory_per_byte_cost       = global_memory_per_byte_cost;
+        gas_constants.global_memory_per_byte_write_cost = global_memory_per_byte_write_cost;
+        gas_constants.min_transaction_gas_units         = min_transaction_gas_units;
+        gas_constants.large_transaction_cutoff          = large_transaction_cutoff;
+        gas_constants.intrinsic_gas_per_byte            = intrinsic_gas_per_byte;
+        gas_constants.maximum_number_of_gas_units       = maximum_number_of_gas_units;
+        gas_constants.min_price_per_gas_unit            = min_price_per_gas_unit;
+        gas_constants.max_price_per_gas_unit            = max_price_per_gas_unit;
+        gas_constants.max_transaction_size_in_bytes     = max_transaction_size_in_bytes;
+        gas_constants.gas_unit_scaling_factor           = gas_unit_scaling_factor;
+        gas_constants.default_account_size              = default_account_size;
+
+        DiemConfig::reconfigure();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVersion.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVersion.move
new file mode 100644
index 000000000..1429d806f
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/DiemVersion.move
@@ -0,0 +1,65 @@
+/// Maintains the version number for the blockchain.
+module CoreFramework::DiemVersion {
+    use std::capability::Cap;
+    use std::errors;
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    /// Marker to be stored under 0x1 during genesis
+    struct VersionChainMarker<phantom T> has key {}
+
+    struct DiemVersion has key, copy, drop, store {
+        major: u64,
+    }
+
+    /// Error with chain marker
+    const ECHAIN_MARKER: u64 = 0;
+    /// Error with config
+    const ECONFIG: u64 = 1;
+    /// Tried to set an invalid major version for the VM. Major versions must be strictly increasing
+    const EINVALID_MAJOR_VERSION_NUMBER: u64 = 2;
+
+    /// Publishes the Version config.
+    public fun initialize<T>(account: &signer, initial_version: u64) {
+        DiemTimestamp::assert_genesis();
+
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(
+            !exists<VersionChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !exists<DiemVersion>(@CoreResources),
+            errors::already_published(ECONFIG)
+        );
+
+        move_to(
+            account,
+            VersionChainMarker<T> {},
+        );
+        move_to(
+            account,
+            DiemVersion { major: initial_version },
+        );
+    }
+
+    /// Updates the major version to a larger version.
+    public fun set<T>(major: u64, _cap: &Cap<T>) acquires DiemVersion {
+        assert!(exists<VersionChainMarker<T>>(@CoreResources), errors::not_published(ECHAIN_MARKER));
+        assert!(exists<DiemVersion>(@CoreResources), errors::not_published(ECONFIG));
+        let old_major = *&borrow_global<DiemVersion>(@CoreResources).major;
+
+        assert!(
+            old_major < major,
+            errors::invalid_argument(EINVALID_MAJOR_VERSION_NUMBER)
+        );
+
+        let config = borrow_global_mut<DiemVersion>(@CoreResources);
+        config.major = major;
+
+        DiemConfig::reconfigure();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ParallelExecutionConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ParallelExecutionConfig.move
new file mode 100644
index 000000000..a7dac4846
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ParallelExecutionConfig.move
@@ -0,0 +1,79 @@
+/// This module defines structs and methods to initialize VM configurations,
+/// including different costs of running the VM.
+module CoreFramework::ParallelExecutionConfig {
+    use std::capability::Cap;
+    use std::errors;
+    use std::option::{Self, Option};
+    use CoreFramework::DiemConfig;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    /// Error with chain marker
+    const ECHAIN_MARKER: u64 = 0;
+    /// Error with config
+    const ECONFIG: u64 = 1;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct ParallelExecutionConfigChainMarker<phantom T> has key {}
+
+    /// The struct to hold the read/write set analysis result for the whole Diem Framework.
+    struct ParallelExecutionConfig has key {
+        /// Serialized analysis result for the Diem Framework.
+        /// If this payload is not None, DiemVM will use this config to execute transactions in parallel.
+        read_write_analysis_result: Option<vector<u8>>
+    }
+
+    /// Enable parallel execution functionality of DiemVM by setting the read_write_set analysis result.
+    public fun initialize_parallel_execution<T>(
+        account: &signer,
+    ) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(
+            !exists<ParallelExecutionConfigChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !exists<ParallelExecutionConfig>(@CoreResources),
+            errors::already_published(ECONFIG)
+        );
+
+        move_to(account, ParallelExecutionConfigChainMarker<T>{});
+
+        move_to(
+            account,
+            ParallelExecutionConfig {
+                read_write_analysis_result: option::none(),
+            },
+        );
+    }
+
+    public fun enable_parallel_execution_with_config<T>(
+        read_write_inference_result: vector<u8>,
+        _cap: &Cap<T>
+    ) acquires ParallelExecutionConfig {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<ParallelExecutionConfigChainMarker<T>>(@CoreResources),
+            errors::not_published(ECHAIN_MARKER)
+        );
+        let result_ref = &mut borrow_global_mut<ParallelExecutionConfig>(@CoreResources).read_write_analysis_result;
+        *result_ref = option::some(read_write_inference_result);
+        DiemConfig::reconfigure();
+    }
+
+    public fun disable_parallel_execution<T>(
+        _cap: &Cap<T>
+    ) acquires ParallelExecutionConfig {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<ParallelExecutionConfigChainMarker<T>>(@CoreResources),
+            errors::not_published(ECHAIN_MARKER)
+        );
+        let result_ref = &mut borrow_global_mut<ParallelExecutionConfig>(@CoreResources).read_write_analysis_result;
+        *result_ref = option::none();
+        DiemConfig::reconfigure();
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorConfig.move
new file mode 100644
index 000000000..e19ade0e0
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorConfig.move
@@ -0,0 +1,200 @@
+/// The ValidatorConfig resource holds information about a validator. Information
+/// is published and updated by Diem root in a `Self::ValidatorConfig` in preparation for
+/// later inclusion (by functions in DiemConfig) in a `DiemConfig::DiemConfig<DiemSystem>`
+/// struct (the `Self::ValidatorConfig` in a `DiemConfig::ValidatorInfo` which is a member
+/// of the `DiemSystem::DiemSystem.validators` vector).
+module CoreFramework::ValidatorConfig {
+    use std::capability::Cap;
+    use std::errors;
+    use std::option::{Self, Option};
+    use std::signer;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::ValidatorOperatorConfig;
+    use CoreFramework::Signature;
+    use CoreFramework::SystemAddresses;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct ValidatorConfigChainMarker<phantom T> has key {}
+
+    struct Config has copy, drop, store {
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    }
+
+    struct ValidatorConfig has key {
+        /// set and rotated by the operator_account
+        config: Option<Config>,
+        operator_account: Option<address>,
+        /// The human readable name of this entity. Immutable.
+        human_name: vector<u8>,
+    }
+
+    // TODO(valerini): add events here
+
+    /// The `ValidatorConfig` resource was not in the required state
+    const EVALIDATOR_CONFIG: u64 = 0;
+    /// The sender is not the operator for the specified validator
+    const EINVALID_TRANSACTION_SENDER: u64 = 1;
+    /// The provided consensus public key is malformed
+    const EINVALID_CONSENSUS_KEY: u64 = 2;
+    /// Tried to set an account without the correct operator role as a Validator Operator
+    const ENOT_A_VALIDATOR_OPERATOR: u64 = 3;
+    /// The `ValidatorSetChainMarker` resource was not in the required state
+    const ECHAIN_MARKER: u64 = 9;
+
+    public fun initialize<T>(account: &signer) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(
+            !exists<ValidatorConfigChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+        move_to(account, ValidatorConfigChainMarker<T>{});
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Validator setup methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Publishes a mostly empty ValidatorConfig struct. Eventually, it
+    /// will have critical info such as keys, network addresses for validators,
+    /// and the address of the validator operator.
+    public fun publish<T>(
+        validator_account: &signer,
+        human_name: vector<u8>,
+        _cap: Cap<T>
+    ) {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<ValidatorConfigChainMarker<T>>(@CoreResources),
+            errors::not_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !exists<ValidatorConfig>(signer::address_of(validator_account)),
+            errors::already_published(EVALIDATOR_CONFIG)
+        );
+        move_to(validator_account, ValidatorConfig {
+            config: option::none(),
+            operator_account: option::none(),
+            human_name,
+        });
+    }
+
+    /// Returns true if a ValidatorConfig resource exists under addr.
+    fun exists_config(addr: address): bool {
+        exists<ValidatorConfig>(addr)
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Rotation methods callable by ValidatorConfig owner
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Sets a new operator account, preserving the old config.
+    /// Note: Access control.  No one but the owner of the account may change .operator_account
+    public fun set_operator(validator_account: &signer, operator_addr: address) acquires ValidatorConfig {
+        assert!(
+            ValidatorOperatorConfig::has_validator_operator_config(operator_addr),
+            errors::invalid_argument(ENOT_A_VALIDATOR_OPERATOR)
+        );
+        let sender = signer::address_of(validator_account);
+        assert!(exists_config(sender), errors::not_published(EVALIDATOR_CONFIG));
+        (borrow_global_mut<ValidatorConfig>(sender)).operator_account = option::some(operator_addr);
+    }
+
+    /// Removes an operator account, setting a corresponding field to Option::none.
+    /// The old config is preserved.
+    public fun remove_operator(validator_account: &signer) acquires ValidatorConfig {
+        let sender = signer::address_of(validator_account);
+        // Config field remains set
+        assert!(exists_config(sender), errors::not_published(EVALIDATOR_CONFIG));
+        (borrow_global_mut<ValidatorConfig>(sender)).operator_account = option::none();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Rotation methods callable by ValidatorConfig.operator_account
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Rotate the config in the validator_account.
+    /// Once the config is set, it can not go back to `Option::none` - this is crucial for validity
+    /// of the DiemSystem's code.
+    public fun set_config(
+        validator_operator_account: &signer,
+        validator_addr: address,
+        consensus_pubkey: vector<u8>,
+        validator_network_addresses: vector<u8>,
+        fullnode_network_addresses: vector<u8>,
+    ) acquires ValidatorConfig {
+        assert!(
+            signer::address_of(validator_operator_account) == get_operator(validator_addr),
+            errors::invalid_argument(EINVALID_TRANSACTION_SENDER)
+        );
+        assert!(
+            Signature::ed25519_validate_pubkey(copy consensus_pubkey),
+            errors::invalid_argument(EINVALID_CONSENSUS_KEY)
+        );
+        // TODO(valerini): verify the proof of posession for consensus_pubkey
+        assert!(exists_config(validator_addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global_mut<ValidatorConfig>(validator_addr);
+        t_ref.config = option::some(Config {
+            consensus_pubkey,
+            validator_network_addresses,
+            fullnode_network_addresses,
+        });
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Publicly callable APIs: getters
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Returns true if all of the following is true:
+    /// 1) there is a ValidatorConfig resource under the address, and
+    /// 2) the config is set, and
+    /// we do not require the operator_account to be set to make sure
+    /// that if the validator account becomes valid, it stays valid, e.g.
+    /// all validators in the Validator Set are valid
+    public fun is_valid(addr: address): bool acquires ValidatorConfig {
+        exists<ValidatorConfig>(addr) && option::is_some(&borrow_global<ValidatorConfig>(addr).config)
+    }
+
+    /// Get Config
+    /// Aborts if there is no ValidatorConfig resource or if its config is empty
+    public fun get_config(addr: address): Config acquires ValidatorConfig {
+        assert!(exists_config(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let config = &borrow_global<ValidatorConfig>(addr).config;
+        assert!(option::is_some(config), errors::invalid_argument(EVALIDATOR_CONFIG));
+        *option::borrow(config)
+    }
+
+    /// Get validator's account human name
+    /// Aborts if there is no ValidatorConfig resource
+    public fun get_human_name(addr: address): vector<u8> acquires ValidatorConfig {
+        assert!(exists<ValidatorConfig>(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global<ValidatorConfig>(addr);
+        *&t_ref.human_name
+    }
+
+    /// Get operator's account
+    /// Aborts if there is no ValidatorConfig resource or
+    /// if the operator_account is unset
+    public fun get_operator(addr: address): address acquires ValidatorConfig {
+        assert!(exists<ValidatorConfig>(addr), errors::not_published(EVALIDATOR_CONFIG));
+        let t_ref = borrow_global<ValidatorConfig>(addr);
+        assert!(option::is_some(&t_ref.operator_account), errors::invalid_argument(EVALIDATOR_CONFIG));
+        *option::borrow(&t_ref.operator_account)
+    }
+
+    /// Get consensus_pubkey from Config
+    /// Never aborts
+    public fun get_consensus_pubkey(config_ref: &Config): &vector<u8> {
+        &config_ref.consensus_pubkey
+    }
+
+    /// Get validator's network address from Config
+    /// Never aborts
+    public fun get_validator_network_addresses(config_ref: &Config): &vector<u8> {
+        &config_ref.validator_network_addresses
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorOperatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorOperatorConfig.move
new file mode 100644
index 000000000..e73f71579
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/core/sources/configs/ValidatorOperatorConfig.move
@@ -0,0 +1,64 @@
+/// Stores the string name of a ValidatorOperator account.
+module CoreFramework::ValidatorOperatorConfig {
+    use std::capability::Cap;
+    use std::errors;
+    use std::signer;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    /// Marker to be stored under @CoreResources during genesis
+    struct ValidatorOperatorConfigChainMarker<phantom T> has key {}
+
+    struct ValidatorOperatorConfig has key {
+        /// The human readable name of this entity. Immutable.
+        human_name: vector<u8>,
+    }
+
+    /// The `ValidatorOperatorConfig` was not in the required state
+    const EVALIDATOR_OPERATOR_CONFIG: u64 = 0;
+    /// The `ValidatorOperatorConfigChainMarker` resource was not in the required state
+    const ECHAIN_MARKER: u64 = 9;
+
+    public fun initialize<T>(account: &signer) {
+        DiemTimestamp::assert_genesis();
+        SystemAddresses::assert_core_resource(account);
+
+        assert!(
+            !exists<ValidatorOperatorConfigChainMarker<T>>(@CoreResources),
+            errors::already_published(ECHAIN_MARKER)
+        );
+        move_to(account, ValidatorOperatorConfigChainMarker<T>{});
+    }
+
+    public fun publish<T>(
+        validator_operator_account: &signer,
+        human_name: vector<u8>,
+        _cap: Cap<T>
+    ) {
+        DiemTimestamp::assert_operating();
+        assert!(
+            exists<ValidatorOperatorConfigChainMarker<T>>(@CoreResources),
+            errors::not_published(ECHAIN_MARKER)
+        );
+
+        assert!(
+            !has_validator_operator_config(signer::address_of(validator_operator_account)),
+            errors::already_published(EVALIDATOR_OPERATOR_CONFIG)
+        );
+
+        move_to(validator_operator_account, ValidatorOperatorConfig {
+            human_name,
+        });
+    }
+
+    /// Get validator's account human name
+    /// Aborts if there is no ValidatorOperatorConfig resource
+    public fun get_human_name(validator_operator_addr: address): vector<u8> acquires ValidatorOperatorConfig {
+        assert!(has_validator_operator_config(validator_operator_addr), errors::not_published(EVALIDATOR_OPERATOR_CONFIG));
+        *&borrow_global<ValidatorOperatorConfig>(validator_operator_addr).human_name
+    }
+
+    public fun has_validator_operator_config(validator_operator_addr: address): bool {
+        exists<ValidatorOperatorConfig>(validator_operator_addr)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/Move.toml b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/Move.toml
new file mode 100644
index 000000000..0341695ec
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/Move.toml
@@ -0,0 +1,18 @@
+[package]
+name = "DiemExperimental"
+version = "1.5.0"
+
+[addresses]
+std = "0x1"
+DiemFramework = "0x1"
+BARS = "0x06505CCD81E562B524D8F656ABD92A15"
+ExperimentalFramework = "0x1"
+DiemRoot = "0xA550C18"
+TreasuryCompliance = "0xB1E55ED"
+CurrencyInfo = "0xA550C18"
+VMReserved = "0x0"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
+
+DiemCoreFramework = { local = "../core" }
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/AccountCreationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/AccountCreationScripts.move
new file mode 100644
index 000000000..cbb10dc1d
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/AccountCreationScripts.move
@@ -0,0 +1,139 @@
+module ExperimentalFramework::AccountCreationScripts {
+    use ExperimentalFramework::ExperimentalAccount;
+
+    /// # Summary
+    /// Creates a Validator Operator account. This transaction can only be sent by the Diem
+    /// Root account.
+    ///
+    /// # Technical Description
+    /// Creates an account with a Validator Operator role at `new_account_address`, with authentication key
+    /// `auth_key_prefix` | `new_account_address`. It publishes a
+    /// `ValidatorOperatorConfig::ValidatorOperatorConfig` resource with the specified `human_name`.
+    /// This script does not assign the validator operator to any validator accounts but only creates the account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `ExperimentalAccount::CreateAccountEvent` with the `created` field being `new_account_address`,
+    /// and the `rold_id` field being `Roles::VALIDATOR_OPERATOR_ROLE_ID`. This is emitted on the
+    /// `ExperimentalAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                  | Type         | Description                                                                              |
+    /// | ------                | ------       | -------------                                                                            |
+    /// | `dr_account`          | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.     |
+    /// | `sliding_nonce`       | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.               |
+    /// | `new_account_address` | `address`    | Address of the to-be-created Validator account.                                          |
+    /// | `auth_key_prefix`     | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account. |
+    /// | `human_name`          | `vector<u8>` | ASCII-encoded human name for the validator.                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `dr_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::EDIEM_ROOT`            | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EDIEM_ROOT`                    | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `new_account_address` address is already taken.                                        |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun create_validator_operator_account(
+        dr_account: signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>
+    ) {
+        ExperimentalAccount::create_validator_operator_account(
+            &dr_account,
+            new_account_address,
+            auth_key_prefix,
+            human_name,
+        );
+    }
+
+    /// # Summary
+    /// Creates a Validator account. This transaction can only be sent by the Diem
+    /// Root account.
+    ///
+    /// # Technical Description
+    /// Creates an account with a Validator role at `new_account_address`, with authentication key
+    /// `auth_key_prefix` | `new_account_address`. It publishes a
+    /// `ValidatorConfig::ValidatorConfig` resource with empty `config`, and
+    /// `operator_account` fields. The `human_name` field of the
+    /// `ValidatorConfig::ValidatorConfig` is set to the passed in `human_name`.
+    /// This script does not add the validator to the validator set or the system,
+    /// but only creates the account.
+    ///
+    /// # Events
+    /// Successful execution will emit:
+    /// * A `ExperimentalAccount::CreateAccountEvent` with the `created` field being `new_account_address`,
+    /// and the `rold_id` field being `Roles::VALIDATOR_ROLE_ID`. This is emitted on the
+    /// `ExperimentalAccount::AccountOperationsCapability` `creation_events` handle.
+    ///
+    /// # Parameters
+    /// | Name                  | Type         | Description                                                                              |
+    /// | ------                | ------       | -------------                                                                            |
+    /// | `dr_account`          | `signer`     | The signer of the sending account of this transaction. Must be the Diem Root signer.     |
+    /// | `sliding_nonce`       | `u64`        | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.               |
+    /// | `new_account_address` | `address`    | Address of the to-be-created Validator account.                                          |
+    /// | `auth_key_prefix`     | `vector<u8>` | The authentication key prefix that will be used initially for the newly created account. |
+    /// | `human_name`          | `vector<u8>` | ASCII-encoded human name for the validator.                                              |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category              | Error Reason                            | Description                                                                                |
+    /// | ----------------            | --------------                          | -------------                                                                              |
+    /// | `Errors::NOT_PUBLISHED`     | `SlidingNonce::ESLIDING_NONCE`          | A `SlidingNonce` resource is not published under `dr_account`.                             |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_OLD`          | The `sliding_nonce` is too old and it's impossible to determine if it's duplicated or not. |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_TOO_NEW`          | The `sliding_nonce` is too far in the future.                                              |
+    /// | `Errors::INVALID_ARGUMENT`  | `SlidingNonce::ENONCE_ALREADY_RECORDED` | The `sliding_nonce` has been previously recorded.                                          |
+    /// | `Errors::REQUIRES_ADDRESS`  | `CoreAddresses::EDIEM_ROOT`            | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::REQUIRES_ROLE`     | `Roles::EDIEM_ROOT`                    | The sending account is not the Diem Root account.                                         |
+    /// | `Errors::ALREADY_PUBLISHED` | `Roles::EROLE_ID`                       | The `new_account_address` address is already taken.                                        |
+    ///
+    /// # Related Scripts
+    /// * `AccountCreationScripts::create_validator_operator_account`
+    /// * `ValidatorAdministrationScripts::add_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::register_validator_config`
+    /// * `ValidatorAdministrationScripts::remove_validator_and_reconfigure`
+    /// * `ValidatorAdministrationScripts::set_validator_operator`
+    /// * `ValidatorAdministrationScripts::set_validator_operator_with_nonce_admin`
+    /// * `ValidatorAdministrationScripts::set_validator_config_and_reconfigure`
+
+    public entry fun create_validator_account(
+        dr_account: signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) {
+        ExperimentalAccount::create_validator_account(
+            &dr_account,
+            new_account_address,
+            auth_key_prefix,
+            human_name,
+        );
+      }
+
+    ////////////////////////////////////////////////////////////////
+    // Basic account creation script.
+    // No roles attached, no conditions checked.
+    ////////////////////////////////////////////////////////////////
+    public entry fun create_account(
+        _account: signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+    ) {
+        ExperimentalAccount::create_account(
+            new_account_address,
+            auth_key_prefix,
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/BARS.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/BARS.move
new file mode 100644
index 000000000..b6459c7b7
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/BARS.move
@@ -0,0 +1,107 @@
+module 0x1::BARSToken {
+    use std::option;
+    #[test_only]
+    use std::signer;
+    use 0x1::NFT;
+    use 0x1::NFTGallery;
+    #[test_only]
+    use std::guid;
+
+    // Error codes
+    /// Function can only be called by the module owner
+    const ENOT_BARS_OWNER: u64  = 0;
+
+    struct BARSToken has copy, store, drop {
+        artist_name: vector<u8>
+    }
+
+    /// Call this function to set up relevant resources in order to
+    /// mint and receive tokens.
+    /// Note that this also gives BARS account a capability to mint BARS NFTs on behalf of the user.
+    /// (the NFTs of other types cannot be created by BARS account).
+    public entry fun register_bars_user(user: signer) {
+        register_user_internal(&user);
+    }
+
+    /// Need this internal function for testing, since the script fun version
+    /// consumes a signer
+    fun register_user_internal(user: &signer) {
+        // publish TokenBalance<BARSToken> resource
+        NFTGallery::publish_gallery<BARSToken>(user);
+
+        // publish TokenDataCollection<BARSToken> resource
+        NFT::publish_token_data_collection<BARSToken>(user);
+
+        // The user gives BARS account capability to generate BARS NFTs on their behalf.
+        NFT::allow_creation_delegation<BARSToken>(user);
+    }
+
+    /// BARS account mints `amount` copies of BARS tokens to the artist's account.
+    public entry fun mint_bars(
+        bars_account: signer,
+        artist: address,
+        artist_name: vector<u8>,
+        content_uri: vector<u8>,
+        amount: u64
+    ) {
+        mint_internal(&bars_account, artist, artist_name, content_uri, amount);
+    }
+
+    /// Need this internal function for testing, since the script fun version
+    /// consumes a signer
+    fun mint_internal(
+        bars_account: &signer,
+        artist: address,
+        artist_name: vector<u8>,
+        content_uri: vector<u8>,
+        amount: u64
+    ) {
+        let token = NFT::create_for<BARSToken>(
+            artist,
+            create_bars_token(bars_account, artist_name),
+            content_uri,
+            amount,
+            option::none(),
+        );
+        NFTGallery::add_to_gallery(artist, token);
+    }
+
+    fun create_bars_token(address: &signer, artist_name: vector<u8>): BARSToken {
+        assert!(std::signer::address_of(address) == @BARS, ENOT_BARS_OWNER);
+        BARSToken { artist_name }
+    }
+
+    #[test_only]
+    const EMINT_FAILED: u64 = 0;
+    #[test_only]
+    const ETRANSFER_FAILED: u64 = 1;
+    #[test_only]
+    const ArtistAddr: address = @0x42;
+
+    #[test(admin=@DiemRoot, bars_account=@BARS, artist=@0x42, collector=@0x43)]
+    public entry fun test_bars(admin: signer, bars_account: signer, artist: signer, collector: signer) {
+        NFT::nft_initialize(admin);
+
+        register_user_internal(&artist);
+        register_user_internal(&collector);
+
+        let token_id = guid::create_id(ArtistAddr, 0);
+        mint_internal(&bars_account, signer::address_of(&artist), b"kanye", b"yeezy.com", 7);
+
+        assert!(NFTGallery::has_token<BARSToken>(ArtistAddr, &token_id), EMINT_FAILED);
+        assert!(NFTGallery::get_token_balance<BARSToken>(ArtistAddr, &token_id) == 7, EMINT_FAILED);
+        assert!(NFTGallery::get_token_supply<BARSToken>(ArtistAddr, &token_id) == 7, EMINT_FAILED);
+
+
+        // Transfer 6 units of the token from creator to user
+        NFTGallery::transfer_token_between_galleries<BARSToken>(
+            artist, // from
+            signer::address_of(&collector), // to
+            6, // amount
+            ArtistAddr, // token.id.addr
+            0, // token.id.creation_num
+        );
+        assert!(NFTGallery::get_token_balance<BARSToken>(ArtistAddr, &token_id) == 1, ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_balance<BARSToken>(@0x43, &token_id) == 6, ETRANSFER_FAILED);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/ExperimentalAccount.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/ExperimentalAccount.move
new file mode 100644
index 000000000..8b426e93c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/ExperimentalAccount.move
@@ -0,0 +1,246 @@
+/// The `ExperimentalAccount` module manages experimental accounts.
+/// It also defines the prolog and epilog that run before and after every
+/// transaction in addition to the core prologue and epilogue.
+
+module ExperimentalFramework::ExperimentalAccount {
+    use std::event;
+    use std::errors;
+    use CoreFramework::Account;
+    use CoreFramework::DiemTimestamp;
+    use CoreFramework::SystemAddresses;
+
+    use ExperimentalFramework::ExperimentalValidatorConfig;
+    use ExperimentalFramework::ExperimentalValidatorOperatorConfig;
+
+    /// A resource that holds the event handle for all the past WriteSet transactions that have been committed on chain.
+    struct DiemWriteSetManager has key {
+        upgrade_events: event::EventHandle<AdminTransactionEvent>,
+    }
+
+    /// Message for committed WriteSet transaction.
+    struct AdminTransactionEvent has drop, store {
+        // The block time when this WriteSet is committed.
+        committed_timestamp_secs: u64,
+    }
+
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// The `ExperimentalAccount` is not in the required state
+    const EACCOUNT: u64 = 0;
+    /// Tried to deposit a coin whose value was zero
+    const ECOIN_DEPOSIT_IS_ZERO: u64 = 2;
+    /// Tried to deposit funds that would have surpassed the account's limits
+    const EDEPOSIT_EXCEEDS_LIMITS: u64 = 3;
+    /// Tried to create a balance for an account whose role does not allow holding balances
+    const EROLE_CANT_STORE_BALANCE: u64 = 4;
+    /// The account does not hold a large enough balance in the specified currency
+    const EINSUFFICIENT_BALANCE: u64 = 5;
+    /// The withdrawal of funds would have exceeded the the account's limits
+    const EWITHDRAWAL_EXCEEDS_LIMITS: u64 = 6;
+    /// The `WithdrawCapability` for this account has already been extracted
+    const EWITHDRAW_CAPABILITY_ALREADY_EXTRACTED: u64 = 7;
+    /// The provided authentication had an invalid length
+    const EMALFORMED_AUTHENTICATION_KEY: u64 = 8;
+    /// The `KeyRotationCapability` for this account has already been extracted
+    const EKEY_ROTATION_CAPABILITY_ALREADY_EXTRACTED: u64 = 9;
+    /// An account cannot be created at the reserved VM address of 0x0
+    const ECANNOT_CREATE_AT_VM_RESERVED: u64 = 10;
+    /// The `WithdrawCapability` for this account is not extracted
+    const EWITHDRAW_CAPABILITY_NOT_EXTRACTED: u64 = 11;
+    /// Tried to add a balance in a currency that this account already has
+    const EADD_EXISTING_CURRENCY: u64 = 15;
+    /// Attempted to send funds to an account that does not exist
+    const EPAYEE_DOES_NOT_EXIST: u64 = 17;
+    /// Attempted to send funds in a currency that the receiving account does not hold.
+    /// e.g., `Diem<XDX>` to an account that exists, but does not have a `Balance<XDX>` resource
+    const EPAYEE_CANT_ACCEPT_CURRENCY_TYPE: u64 = 18;
+    /// Tried to withdraw funds in a currency that the account does hold
+    const EPAYER_DOESNT_HOLD_CURRENCY: u64 = 19;
+    /// An invalid amount of gas units was provided for execution of the transaction
+    const EGAS: u64 = 20;
+    /// The `AccountOperationsCapability` was not in the required state
+    const EACCOUNT_OPERATIONS_CAPABILITY: u64 = 22;
+    /// The `DiemWriteSetManager` was not in the required state
+    const EWRITESET_MANAGER: u64 = 23;
+    /// An account cannot be created at the reserved core code address of 0x1
+    const ECANNOT_CREATE_AT_CORE_CODE: u64 = 24;
+
+    struct ExperimentalAccountMarker has drop {}
+
+    fun create_core_account(account_address: address, auth_key_prefix: vector<u8>): (signer, vector<u8>) {
+        assert!(
+            account_address != @VMReserved,
+            errors::invalid_argument(ECANNOT_CREATE_AT_VM_RESERVED)
+        );
+        assert!(
+            account_address != @CoreFramework,
+            errors::invalid_argument(ECANNOT_CREATE_AT_CORE_CODE)
+        );
+        Account::create_account(account_address, auth_key_prefix, &ExperimentalAccountMarker{})
+    }
+
+    /// Initialize this module. This is only callable from genesis.
+    public fun initialize(
+        dr_account: &signer,
+        dummy_auth_key_prefix: vector<u8>,
+    ) {
+        DiemTimestamp::assert_genesis();
+        // Operational constraint, not a privilege constraint.
+        SystemAddresses::assert_core_resource(dr_account);
+        Account::initialize<ExperimentalAccountMarker>(
+            dr_account,
+            @DiemFramework,
+            b"ExperimentalAccount",
+            b"script_prologue",
+            b"module_prologue",
+            b"writeset_prologue",
+            b"script_prologue",
+            b"epilogue",
+            b"writeset_epilogue",
+            false,
+        );
+
+        // TODO: For legacy reasons. Remove
+        create_diem_root_account(
+            copy dummy_auth_key_prefix,
+        );
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// Basic account creation method: no roles attached, no conditions checked.
+    ///////////////////////////////////////////////////////////////////////////
+
+    public fun create_account(
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+    ) {
+        create_core_account(new_account_address, auth_key_prefix);
+        // No role attached
+    }
+
+    public fun exists_at(addr: address): bool {
+        Account::exists_at(addr)
+    }
+
+    /// Creates the diem root account (during genesis). Publishes the Diem root role,
+    /// Publishes a SlidingNonce resource, sets up event generator, publishes
+    /// AccountOperationsCapability, WriteSetManager, and finally makes the account.
+    fun create_diem_root_account(
+        auth_key_prefix: vector<u8>,
+    ) {
+        DiemTimestamp::assert_genesis();
+        let (dr_account, _) = create_core_account(@CoreResources, auth_key_prefix);
+        SystemAddresses::assert_core_resource(&dr_account);
+        assert!(
+            !exists<DiemWriteSetManager>(@CoreResources),
+            errors::already_published(EWRITESET_MANAGER)
+        );
+        move_to(
+            &dr_account,
+            DiemWriteSetManager {
+                upgrade_events: event::new_event_handle<AdminTransactionEvent>(&dr_account),
+            }
+        );
+    }
+
+    /// Create a Validator account
+    public fun create_validator_account(
+        dr_account: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) {
+        let (new_account, _) = create_core_account(new_account_address, auth_key_prefix);
+        ExperimentalValidatorConfig::publish(dr_account, &new_account, human_name);
+    }
+
+    /// Create a Validator Operator account
+    public fun create_validator_operator_account(
+        dr_account: &signer,
+        new_account_address: address,
+        auth_key_prefix: vector<u8>,
+        human_name: vector<u8>,
+    ) {
+        let (new_account, _) = create_core_account(new_account_address, auth_key_prefix);
+        ExperimentalValidatorOperatorConfig::publish(dr_account, &new_account, human_name);
+    }
+
+    /// Rotate the authentication key for the account under cap.account_address
+    public fun rotate_authentication_key(
+        account: &signer,
+        new_authentication_key: vector<u8>,
+    ) {
+        Account::rotate_authentication_key(account, new_authentication_key)
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Prologues and epilogues
+    ///////////////////////////////////////////////////////////////////////////
+    fun module_prologue(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        _txn_gas_price: u64,
+        _txn_max_gas_units: u64,
+        _txn_expiration_time: u64,
+        chain_id: u8,
+    ) {
+        Account::prologue(&sender, txn_sequence_number, txn_public_key, chain_id)
+    }
+
+    fun script_prologue(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        _txn_gas_price: u64,
+        _txn_max_gas_units: u64,
+        _txn_expiration_time: u64,
+        chain_id: u8,
+        _script_hash: vector<u8>,
+    ) {
+        Account::prologue(&sender, txn_sequence_number, txn_public_key, chain_id)
+    }
+
+    fun writeset_prologue(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_public_key: vector<u8>,
+        _txn_expiration_time: u64,
+        chain_id: u8,
+    ) {
+        Account::prologue(&sender, txn_sequence_number, txn_public_key, chain_id)
+    }
+
+    // Might be able to combine this
+    fun multi_agent_script_prologue(
+        sender: signer,
+        txn_sequence_number: u64,
+        txn_sender_public_key: vector<u8>,
+        _secondary_signer_addresses: vector<address>,
+        _secondary_signer_public_key_hashes: vector<vector<u8>>,
+        _txn_gas_price: u64,
+        _txn_max_gas_units: u64,
+        _txn_expiration_time: u64,
+        chain_id: u8,
+    ) {
+        Account::prologue(&sender, txn_sequence_number, txn_sender_public_key, chain_id)
+    }
+
+    fun epilogue(
+        account: signer,
+        _txn_sequence_number: u64,
+        _txn_gas_price: u64,
+        _txn_max_gas_units: u64,
+        _gas_units_remaining: u64
+    ) {
+        Account::epilogue(&account, &ExperimentalAccountMarker{});
+    }
+
+    fun writeset_epilogue(
+        dr_account: signer,
+        _txn_sequence_number: u64,
+        should_trigger_reconfiguration: bool,
+    ) {
+        Account::writeset_epilogue(&dr_account, should_trigger_reconfiguration, &ExperimentalAccountMarker{});
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Genesis.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Genesis.move
new file mode 100644
index 000000000..f4ed409cc
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Genesis.move
@@ -0,0 +1,190 @@
+module ExperimentalFramework::Genesis {
+    use std::signer;
+    use std::event;
+    use std::vector;
+    use CoreFramework::CoreGenesis;
+    use ExperimentalFramework::ExperimentalAccount;
+
+    // Config imports
+    use CoreFramework::ValidatorConfig;
+    use CoreFramework::ValidatorOperatorConfig;
+    use ExperimentalFramework::ExperimentalConsensusConfig;
+    use ExperimentalFramework::ExperimentalParallelExecutionConfig;
+    use ExperimentalFramework::ExperimentalValidatorConfig;
+    use ExperimentalFramework::ExperimentalValidatorOperatorConfig;
+    use ExperimentalFramework::ExperimentalValidatorSet;
+    use ExperimentalFramework::ExperimentalVersion;
+    use ExperimentalFramework::ExperimentalVMConfig;
+
+    // This function needs the same signature as the DPN genesis
+    fun initialize(
+        dr_account: signer,
+        _tc_account: signer,
+        dr_auth_key: vector<u8>,
+        _tc_auth_key: vector<u8>,
+        _initial_script_allow_list: vector<vector<u8>>,
+        _is_open_module: bool,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        chain_id: u8,
+        initial_diem_version: u64,
+        consensus_config: vector<u8>,
+    ) {
+        initialize_internal(
+            &dr_account,
+            dr_auth_key,
+            instruction_schedule,
+            native_schedule,
+            chain_id,
+            initial_diem_version,
+            consensus_config,
+        )
+    }
+
+    fun initialize_internal(
+        dr_account: &signer,
+        dr_auth_key: vector<u8>,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+        chain_id: u8,
+        initial_diem_version: u64,
+        consensus_config: vector<u8>,
+    ) {
+        ExperimentalAccount::initialize(dr_account, x"00000000000000000000000000000000");
+
+        // Pad the event counter for the Diem Root account to match DPN. This
+        // _MUST_ match the new epoch event counter otherwise all manner of
+        // things start to break.
+        event::destroy_handle(event::new_event_handle<u64>(dr_account));
+        event::destroy_handle(event::new_event_handle<u64>(dr_account));
+        event::destroy_handle(event::new_event_handle<u64>(dr_account));
+
+        // Consensus config setup
+        ExperimentalConsensusConfig::initialize(dr_account);
+        // Parallel execution config setup
+        ExperimentalParallelExecutionConfig::initialize_parallel_execution(dr_account);
+        ExperimentalValidatorSet::initialize_validator_set(dr_account);
+        ExperimentalVersion::initialize(dr_account, initial_diem_version);
+
+        // Rotate auth keys for DiemRoot account to the given
+        // values
+        ExperimentalAccount::rotate_authentication_key(dr_account, dr_auth_key);
+        ExperimentalVMConfig::initialize(
+            dr_account,
+            instruction_schedule,
+            native_schedule,
+        );
+
+        ExperimentalConsensusConfig::set(dr_account, consensus_config);
+
+        ExperimentalValidatorConfig::initialize(dr_account);
+        ExperimentalValidatorOperatorConfig::initialize(dr_account);
+
+        // this needs to be called at the very end
+        CoreGenesis::init(dr_account, chain_id);
+    }
+
+    /// Sets up the initial validator set for the Diem network.
+    /// The validator "owner" accounts, their UTF-8 names, and their authentication
+    /// keys are encoded in the `owners`, `owner_names`, and `owner_auth_key` vectors.
+    /// Each validator signs consensus messages with the private key corresponding to the Ed25519
+    /// public key in `consensus_pubkeys`.
+    /// Each validator owner has its operation delegated to an "operator" (which may be
+    /// the owner). The operators, their names, and their authentication keys are encoded
+    /// in the `operators`, `operator_names`, and `operator_auth_keys` vectors.
+    /// Finally, each validator must specify the network address
+    /// (see diem/types/src/network_address/mod.rs) for itself and its full nodes.
+    fun create_initialize_owners_operators(
+        dr_account: signer,
+        owners: vector<signer>,
+        owner_names: vector<vector<u8>>,
+        owner_auth_keys: vector<vector<u8>>,
+        consensus_pubkeys: vector<vector<u8>>,
+        operators: vector<signer>,
+        operator_names: vector<vector<u8>>,
+        operator_auth_keys: vector<vector<u8>>,
+        validator_network_addresses: vector<vector<u8>>,
+        full_node_network_addresses: vector<vector<u8>>,
+    ) {
+        let num_owners = vector::length(&owners);
+        let num_owner_names = vector::length(&owner_names);
+        assert!(num_owners == num_owner_names, 0);
+        let num_owner_keys = vector::length(&owner_auth_keys);
+        assert!(num_owner_names == num_owner_keys, 0);
+        let num_operators = vector::length(&operators);
+        assert!(num_owner_keys == num_operators, 0);
+        let num_operator_names = vector::length(&operator_names);
+        assert!(num_operators == num_operator_names, 0);
+        let num_operator_keys = vector::length(&operator_auth_keys);
+        assert!(num_operator_names == num_operator_keys, 0);
+        let num_validator_network_addresses = vector::length(&validator_network_addresses);
+        assert!(num_operator_keys == num_validator_network_addresses, 0);
+        let num_full_node_network_addresses = vector::length(&full_node_network_addresses);
+        assert!(num_validator_network_addresses == num_full_node_network_addresses, 0);
+
+        let i = 0;
+        let dummy_auth_key_prefix = x"00000000000000000000000000000000";
+        while (i < num_owners) {
+            let owner = vector::borrow(&owners, i);
+            let owner_address = signer::address_of(owner);
+            let owner_name = *vector::borrow(&owner_names, i);
+            // create each validator account and rotate its auth key to the correct value
+            ExperimentalAccount::create_validator_account(
+                &dr_account, owner_address, copy dummy_auth_key_prefix, owner_name
+            );
+
+            let owner_auth_key = *vector::borrow(&owner_auth_keys, i);
+            ExperimentalAccount::rotate_authentication_key(owner, owner_auth_key);
+
+            let operator = vector::borrow(&operators, i);
+            let operator_address = signer::address_of(operator);
+            let operator_name = *vector::borrow(&operator_names, i);
+            // create the operator account + rotate its auth key if it does not already exist
+            if (!ExperimentalAccount::exists_at(operator_address)) {
+                ExperimentalAccount::create_validator_operator_account(
+                    &dr_account, operator_address, copy dummy_auth_key_prefix, copy operator_name
+                );
+                let operator_auth_key = *vector::borrow(&operator_auth_keys, i);
+                ExperimentalAccount::rotate_authentication_key(operator, operator_auth_key);
+            };
+            // assign the operator to its validator
+            assert!(ValidatorOperatorConfig::get_human_name(operator_address) == operator_name, 0);
+            ValidatorConfig::set_operator(owner, operator_address);
+
+            // use the operator account set up the validator config
+            let validator_network_address = *vector::borrow(&validator_network_addresses, i);
+            let full_node_network_address = *vector::borrow(&full_node_network_addresses, i);
+            let consensus_pubkey = *vector::borrow(&consensus_pubkeys, i);
+            ValidatorConfig::set_config(
+                operator,
+                owner_address,
+                consensus_pubkey,
+                validator_network_address,
+                full_node_network_address
+            );
+
+            // finally, add this validator to the validator set
+            ExperimentalValidatorSet::add_validator(&dr_account, owner_address);
+
+            i = i + 1;
+        }
+    }
+
+    #[test_only]
+    public fun setup(dr_account: &signer) {
+        initialize_internal(
+            dr_account,
+            x"0000000000000000000000000000000000000000000000000000000000000000",
+            x"", // instruction_schedule not needed for unit tests
+            x"", // native schedule not needed for unit tests
+            4u8, // TESTING chain ID
+            0,
+            x""
+        )
+    }
+
+    #[test(account = @CoreResources)]
+    fun test_setup(account: signer) {
+        setup(&account);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiToken.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiToken.move
new file mode 100644
index 000000000..494f2105c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiToken.move
@@ -0,0 +1,269 @@
+module ExperimentalFramework::MultiToken {
+    use std::errors;
+    use std::event;
+    use std::guid;
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+
+    /// Struct representing data of a specific token with token_id,
+    /// stored under the creator's address inside TokenInfoCollection.
+    /// For each token_id, there is only one MultiTokenData.
+    struct TokenData<TokenType: store> has key, store {
+        metadata: Option<TokenType>,
+        /// Identifier for the token.
+        token_id: guid::GUID,
+        /// Pointer to where the content and metadata is stored.
+        content_uri: vector<u8>,
+        supply: u64,
+    }
+
+    /// A hot potato wrapper for the token's metadata. Since this wrapper has no `key` or `store`
+    /// ability, it can't be stored in global storage. This wrapper can be safely passed outside
+    /// of this module because we know it will have to come back to this module, where
+    /// it will be unpacked.
+    struct TokenDataWrapper<TokenType: store> {
+        origin: address,
+        index: u64,
+        metadata: TokenType,
+    }
+
+    /// Struct representing a semi-fungible or non-fungible token (depending on the supply).
+    /// There can be multiple tokens with the same id (unless supply is 1). Each token's
+    /// corresponding token metadata is stored inside a MultiTokenData inside TokenDataCollection
+    /// under the creator's address.
+    struct Token<phantom TokenType: store> has key, store {
+        id: guid::ID,
+        balance: u64,
+    }
+
+    struct MintEvent has copy, drop, store {
+        id: guid::ID,
+        creator: address,
+        content_uri: vector<u8>,
+        amount: u64,
+    }
+
+    struct Admin has key {
+        mint_events: event::EventHandle<MintEvent>,
+    }
+
+    struct TokenDataCollection<TokenType: store> has key {
+        tokens: vector<TokenData<TokenType>>,
+    }
+
+    spec fun get_tokens<TokenType>(addr: address): vector<TokenData<TokenType>>{
+        global<TokenDataCollection<TokenType>>(addr).tokens
+    }
+
+    spec fun is_in_tokens<TokenType>(tokens: vector<TokenData<TokenType>>, token_id: guid::ID): bool {
+        exists token in tokens: token.token_id.id == token_id
+    }
+
+    spec fun find_token_index_by_id<TokenType>(tokens: vector<TokenData<TokenType>>, id: guid::ID): u64 {
+        choose min i in range(tokens) where tokens[i].token_id.id == id
+    }
+
+    const ADMIN: address = @0xa550c18;
+    const MAX_U64: u64 = 18446744073709551615u64;
+    // Error codes
+    /// Function can only be called by the admin address
+    const ENOT_ADMIN: u64  = 0;
+    const EWRONG_TOKEN_ID: u64 = 1;
+    const ETOKEN_BALANCE_OVERFLOWS: u64 = 2;
+    const EAMOUNT_EXCEEDS_TOKEN_BALANCE: u64 = 3;
+    const ETOKEN_EXTRACTED: u64 = 4;
+    const EINDEX_EXCEEDS_LENGTH: u64 = 5;
+    const ETOKEN_PRESENT: u64 = 6;
+
+    /// Returns the id of given token
+    public fun id<TokenType: store>(token: &Token<TokenType>): guid::ID {
+        *&token.id
+    }
+
+    /// Returns the balance of given token
+    public fun balance<TokenType: store>(token: &Token<TokenType>): u64 {
+        token.balance
+    }
+
+    public fun metadata<TokenType: store>(wrapper: &TokenDataWrapper<TokenType>): &TokenType {
+        &wrapper.metadata
+    }
+
+    /// Returns the supply of tokens with `id` on the chain.
+    public fun supply<TokenType: store>(id: &guid::ID): u64 acquires TokenDataCollection {
+        let owner_addr = guid::id_creator_address(id);
+        let tokens = &mut borrow_global_mut<TokenDataCollection<TokenType>>(owner_addr).tokens;
+        let index_opt = index_of_token<TokenType>(tokens, id);
+        assert!(option::is_some(&index_opt), errors::invalid_argument(EWRONG_TOKEN_ID));
+        let index = option::extract(&mut index_opt);
+        vector::borrow(tokens, index).supply
+    }
+
+    spec supply {
+        let addr = guid::id_creator_address(id);
+        let token_collection = get_tokens<TokenType>(addr);
+        let min_token_idx = find_token_index_by_id(token_collection,id);
+        aborts_if !exists<TokenDataCollection<TokenType>>(addr);
+        aborts_if !is_in_tokens(token_collection, id);
+        ensures result == token_collection[min_token_idx].supply;
+    }
+
+    /// Extract the MultiToken data of the given token into a hot potato wrapper.
+    public fun extract_token<TokenType: store>(nft: &Token<TokenType>): TokenDataWrapper<TokenType> acquires TokenDataCollection {
+        let owner_addr = guid::id_creator_address(&nft.id);
+        let tokens = &mut borrow_global_mut<TokenDataCollection<TokenType>>(owner_addr).tokens;
+        let index_opt = index_of_token<TokenType>(tokens, &nft.id);
+        assert!(option::is_some(&index_opt), errors::invalid_argument(EWRONG_TOKEN_ID));
+        let index = option::extract(&mut index_opt);
+        let item_opt = &mut vector::borrow_mut(tokens, index).metadata;
+        assert!(option::is_some(item_opt), errors::invalid_state(ETOKEN_EXTRACTED));
+        TokenDataWrapper { origin: owner_addr, index, metadata: option::extract(item_opt) }
+    }
+
+    spec extract_token {
+        let addr = guid::id_creator_address(nft.id);
+        let token_collection = get_tokens<TokenType>(addr);
+        let id = nft.id;
+        let min_token_idx = find_token_index_by_id(token_collection, id);
+        aborts_if !exists<TokenDataCollection<TokenType>>(addr);
+        aborts_if token_collection[min_token_idx].metadata == option::spec_none();
+        aborts_if !is_in_tokens(token_collection, id);
+        ensures result == TokenDataWrapper { origin: addr, index: min_token_idx,
+        metadata: option::borrow(token_collection[min_token_idx].metadata)};
+        ensures get_tokens<TokenType>(addr)[min_token_idx].metadata == option::spec_none();
+    }
+
+    /// Restore the token in the wrapper back into global storage under original address.
+    public fun restore_token<TokenType: store>(wrapper: TokenDataWrapper<TokenType>) acquires TokenDataCollection {
+        let TokenDataWrapper { origin, index, metadata } = wrapper;
+        let tokens = &mut borrow_global_mut<TokenDataCollection<TokenType>>(origin).tokens;
+        assert!(vector::length(tokens) > index, EINDEX_EXCEEDS_LENGTH);
+        let item_opt = &mut vector::borrow_mut(tokens, index).metadata;
+        assert!(option::is_none(item_opt), ETOKEN_PRESENT);
+        option::fill(item_opt, metadata);
+    }
+
+    spec restore_token {
+        let addr = wrapper.origin;
+        let token_collection = get_tokens<TokenType>(addr);
+        let item_opt = token_collection[wrapper.index].metadata;
+        aborts_if !exists<TokenDataCollection<TokenType>>(addr);
+        aborts_if len(token_collection) <= wrapper.index;
+        aborts_if item_opt != option::spec_none();
+        ensures get_tokens<TokenType>(addr)[wrapper.index].metadata == option::spec_some(wrapper.metadata);
+    }
+
+    /// Finds the index of token with the given id in the gallery.
+    fun index_of_token<TokenType: store>(gallery: &vector<TokenData<TokenType>>, id: &guid::ID): Option<u64> {
+        let i = 0;
+        let len = vector::length(gallery);
+        while ({spec {
+            invariant i >= 0;
+            invariant i <= len(gallery);
+            invariant forall k in 0..i: gallery[k].token_id.id != id;
+        };(i < len)}) {
+            if (guid::eq_id(&vector::borrow(gallery, i).token_id, id)) {
+                return option::some(i)
+            };
+            i = i + 1;
+        };
+        option::none()
+    }
+
+    spec index_of_token{
+        let min_token_idx = find_token_index_by_id(gallery, id);
+        let post res_id = option::borrow(result);
+        ensures is_in_tokens(gallery, id) <==> (option::is_some(result) && res_id == min_token_idx);
+        ensures result ==  option::spec_none() <==> !is_in_tokens(gallery, id);
+    }
+
+    /// Join two multi tokens and return a multi token with the combined value of the two.
+    public fun join<TokenType: store>(token: &mut Token<TokenType>, other: Token<TokenType>) {
+        let Token { id, balance } = other;
+        assert!(*&token.id == id, EWRONG_TOKEN_ID);
+        assert!(MAX_U64 - token.balance >= balance, ETOKEN_BALANCE_OVERFLOWS);
+        token.balance = token.balance + balance
+    }
+
+    spec join{
+        aborts_if token.id != other.id with EWRONG_TOKEN_ID;
+        aborts_if MAX_U64 - token.balance < other.balance with ETOKEN_BALANCE_OVERFLOWS;
+        ensures token.balance == old(token).balance + other.balance;
+    }
+
+    /// Split the token into two tokens, one with balance `amount` and the other one with balance
+    public fun split<TokenType: store>(token: Token<TokenType>, amount: u64): (Token<TokenType>, Token<TokenType>) {
+        assert!(token.balance >= amount, EAMOUNT_EXCEEDS_TOKEN_BALANCE);
+        token.balance = token.balance - amount;
+        let id = *&token.id;
+        (token,
+        Token {
+            id,
+            balance: amount
+        } )
+    }
+
+    spec split {
+        aborts_if token.balance < amount with EAMOUNT_EXCEEDS_TOKEN_BALANCE;
+        ensures result_1.balance == token.balance - amount;
+        ensures result_2.balance == amount;
+        ensures result_1.id == result_2.id;
+    }
+
+    /// Initialize this module, to be called in genesis.
+    public fun initialize_multi_token(account: signer) {
+        assert!(signer::address_of(&account) == ADMIN, ENOT_ADMIN);
+        move_to(&account, Admin {
+            mint_events: event::new_event_handle<MintEvent>(&account),
+        })
+    }
+
+    spec initialize_multi_token{
+        let addr = signer::address_of(account);
+        aborts_if addr != ADMIN;
+        aborts_if exists<Admin>(addr);
+        ensures exists<Admin>(addr);
+    }
+
+    /// Create a` TokenData<TokenType>` that wraps `metadata` and with balance of `amount`
+    public fun create<TokenType: store>(
+        account: &signer, metadata: TokenType, content_uri: vector<u8>, amount: u64
+    ): Token<TokenType> acquires Admin, TokenDataCollection {
+        let guid = guid::create(account);
+        event::emit_event(
+            &mut borrow_global_mut<Admin>(ADMIN).mint_events,
+            MintEvent {
+                id: guid::id(&guid),
+                creator: signer::address_of(account),
+                content_uri: copy content_uri,
+                amount,
+            }
+        );
+        let id = guid::id(&guid);
+        if (!exists<TokenDataCollection<TokenType>>(signer::address_of(account))) {
+            move_to(account, TokenDataCollection { tokens: vector::empty<TokenData<TokenType>>() });
+        };
+        let token_data_collection = &mut borrow_global_mut<TokenDataCollection<TokenType>>(signer::address_of(account)).tokens;
+        vector::push_back(
+            token_data_collection,
+            TokenData { metadata: option::some(metadata), token_id: guid, content_uri, supply: amount }
+        );
+        Token { id, balance: amount }
+    }
+
+    spec create {
+        let addr = signer::address_of(account);
+        let post post_tokens = get_tokens<TokenType>(addr);
+
+        aborts_if !exists<Admin>(ADMIN);
+        aborts_if exists<guid::Generator>(addr) && global<guid::Generator>(addr).counter + 1 > MAX_U64;
+
+        ensures result.balance == amount;
+        ensures guid::id_creator_address(result.id) == addr;
+        ensures exists<TokenDataCollection<TokenType>>(addr);
+        ensures post_tokens[len(post_tokens) - 1] ==
+                TokenData<TokenType> {metadata: option::spec_some(metadata), token_id: guid::GUID {id: result.id}, content_uri, supply:amount};
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiTokenBalance.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiTokenBalance.move
new file mode 100644
index 000000000..f87809d8a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/MultiTokenBalance.move
@@ -0,0 +1,239 @@
+module ExperimentalFramework::MultiTokenBalance {
+    use std::errors;
+    use std::guid;
+    use ExperimentalFramework::MultiToken::{Self, Token};
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+
+    /// Balance holding tokens of `TokenType` as well as information of approved operators.
+    struct TokenBalance<phantom TokenType: store> has key {
+        /// Gallery full of multi tokens owned by this balance
+        gallery: vector<Token<TokenType>>
+    }
+
+    spec TokenBalance {
+        invariant forall i1 in range(gallery), i2 in range(gallery) where gallery[i1].id == gallery[i2].id:
+        i1 == i2;
+    }
+
+    spec fun get_token_balance_gallery<TokenType>(addr: address): vector<Token<TokenType>>{
+        global<TokenBalance<TokenType>>(addr).gallery
+    }
+
+    spec fun is_in_gallery<TokenType>(gallery: vector<Token<TokenType>>, token_id: guid::ID): bool {
+        exists i in range(gallery): gallery[i].id == token_id
+    }
+
+    spec fun find_token_index_by_id<TokenType>(gallery: vector<Token<TokenType>>, id: guid::ID): u64 {
+        choose i in range(gallery) where gallery[i].id == id
+    }
+
+    const MAX_U64: u128 = 18446744073709551615u128;
+    // Error codes
+    const EID_NOT_FOUND: u64 = 0;
+    const EBALANCE_NOT_PUBLISHED: u64 = 1;
+    const EBALANCE_ALREADY_PUBLISHED: u64 = 2;
+    const EINVALID_AMOUNT_OF_TRANSFER: u64 = 3;
+    const EALREADY_IS_OPERATOR: u64 = 4;
+    const ENOT_OPERATOR: u64 = 5;
+    const EINVALID_APPROVAL_TARGET: u64 = 6;
+
+
+
+    /// Add a token to the owner's gallery. If there is already a token of the same id in the
+    /// gallery, we combine it with the new one and make a token of greater value.
+    public fun add_to_gallery<TokenType: store>(owner: address, token: Token<TokenType>)
+    acquires TokenBalance {
+        assert!(exists<TokenBalance<TokenType>>(owner), EBALANCE_NOT_PUBLISHED);
+        let id = MultiToken::id<TokenType>(&token);
+        if (has_token<TokenType>(owner, &id)) {
+            // If `owner` already has a token with the same id, remove it from the gallery
+            // and join it with the new token.
+            let original_token = remove_from_gallery<TokenType>(owner, &id);
+            MultiToken::join<TokenType>(&mut token, original_token);
+        };
+        let gallery = &mut borrow_global_mut<TokenBalance<TokenType>>(owner).gallery;
+        vector::push_back(gallery, token);
+    }
+
+
+
+    spec add_to_gallery {
+        let gallery = get_token_balance_gallery<TokenType>(owner);
+        let token_bal = token.balance;
+        let min_token_idx = find_token_index_by_id(gallery, token.id);
+        let balance = gallery[min_token_idx].balance;
+        let post post_gallery = get_token_balance_gallery<TokenType>(owner);
+
+        aborts_if !exists<TokenBalance<TokenType>>(owner);
+        aborts_if is_in_gallery(gallery, token.id) && MAX_U64 - token.balance < balance;
+
+        ensures is_in_gallery(gallery, token.id) ==> len(gallery) == len(post_gallery);
+        ensures !is_in_gallery(gallery, token.id) ==> len(gallery) + 1 == len(post_gallery);
+
+        ensures is_in_gallery(gallery, token.id) ==> post_gallery[len(gallery) - 1].balance ==
+            token_bal + gallery[min_token_idx].balance;
+        ensures post_gallery[len(post_gallery) - 1].id == token.id;
+    }
+
+    /// Remove a token of certain id from the owner's gallery and return it.
+    fun remove_from_gallery<TokenType: store>(owner: address, id: &guid::ID): Token<TokenType>
+    acquires TokenBalance {
+        assert!(exists<TokenBalance<TokenType>>(owner), EBALANCE_NOT_PUBLISHED);
+        let gallery = &mut borrow_global_mut<TokenBalance<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, id);
+        assert!(option::is_some(&index_opt), errors::limit_exceeded(EID_NOT_FOUND));
+        vector::remove(gallery, option::extract(&mut index_opt))
+    }
+
+    spec remove_from_gallery {
+        let gallery = get_token_balance_gallery<TokenType>(owner);
+        aborts_if !exists<TokenBalance<TokenType>>(owner);
+        aborts_if !is_in_gallery(gallery, id);
+        ensures !is_in_gallery(get_token_balance_gallery<TokenType>(owner), id);
+    }
+
+    /// Finds the index of token with the given id in the gallery.
+    fun index_of_token<TokenType: store>(gallery: &vector<Token<TokenType>>, id: &guid::ID): Option<u64> {
+        let i = 0;
+        let len = vector::length(gallery);
+        while ({spec {
+            invariant i >= 0;
+            invariant i <= len(gallery);
+            invariant forall k in 0..i: gallery[k].id != id;
+        };(i < len)}) {
+            if (MultiToken::id<TokenType>(vector::borrow(gallery, i)) == *id) {
+                return option::some(i)
+            };
+            i = i + 1;
+        };
+        option::none()
+    }
+
+    spec index_of_token{
+        let min_token_idx = choose min i in range(gallery) where gallery[i].id == id;
+        let post res_id = option::borrow(result);
+        ensures is_in_gallery(gallery, id) <==> (option::is_some(result) && res_id == min_token_idx);
+        ensures result ==  option::spec_none() <==> !is_in_gallery(gallery, id);
+    }
+
+    /// Returns whether the owner has a token with given id.
+    public fun has_token<TokenType: store>(owner: address, token_id: &guid::ID): bool acquires TokenBalance {
+        option::is_some(&index_of_token(&borrow_global<TokenBalance<TokenType>>(owner).gallery, token_id))
+    }
+
+    spec has_token {
+        let gallery = global<TokenBalance<TokenType>>(owner).gallery;
+        ensures result <==> is_in_gallery(gallery, token_id);
+    }
+
+    public fun get_token_balance<TokenType: store>(owner: address, token_id: &guid::ID
+    ): u64 acquires TokenBalance {
+        let gallery = &borrow_global<TokenBalance<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+
+        if (option::is_none(&index_opt)) {
+            0
+        } else {
+            let index = option::extract(&mut index_opt);
+            MultiToken::balance(vector::borrow(gallery, index))
+        }
+    }
+
+    spec get_token_balance {
+        let gallery = get_token_balance_gallery<TokenType>(owner);
+        let min_token_idx = find_token_index_by_id(gallery, token_id);
+        ensures !is_in_gallery(gallery, token_id) ==> result == 0;
+        ensures is_in_gallery(gallery, token_id) ==> result == gallery[min_token_idx].balance;
+    }
+
+    /// Transfer `amount` of token with id `GUID::id(creator, creation_num)` from `owner`'s
+    /// balance to `to`'s balance. This operation has to be done by either the owner or an
+    /// approved operator of the owner.
+    public entry fun transfer_multi_token_between_galleries<TokenType: store>(
+        account: signer,
+        to: address,
+        amount: u64,
+        creator: address,
+        creation_num: u64
+    ) acquires TokenBalance {
+        let owner = signer::address_of(&account);
+
+        assert!(amount > 0, EINVALID_AMOUNT_OF_TRANSFER);
+
+        // Remove NFT from `owner`'s gallery
+        let id = guid::create_id(creator, creation_num);
+        let token = remove_from_gallery<TokenType>(owner, &id);
+
+        assert!(amount <= MultiToken::balance(&token), EINVALID_AMOUNT_OF_TRANSFER);
+
+        if (amount == MultiToken::balance(&token)) {
+            // Owner does not have any token left, so add token to `to`'s gallery.
+            add_to_gallery<TokenType>(to, token);
+        } else {
+            // Split owner's token into two
+            let (owner_token, to_token) = MultiToken::split<TokenType>(token, amount);
+
+            // Add tokens to owner's gallery.
+            add_to_gallery<TokenType>(owner, owner_token);
+
+            // Add tokens to `to`'s gallery
+            add_to_gallery<TokenType>(to, to_token);
+        };
+
+        // TODO: add event emission
+    }
+
+    spec transfer_multi_token_between_galleries {
+        let owner = signer::address_of(account);
+        let gallery_owner = get_token_balance_gallery<TokenType>(owner);
+        let gallery_to = get_token_balance_gallery<TokenType>(to);
+        let post post_gallery_owner = get_token_balance_gallery<TokenType>(owner);
+        let post post_gallery_to = get_token_balance_gallery<TokenType>(to);
+
+        let id = guid::create_id(creator, creation_num);
+
+        let min_token_idx = find_token_index_by_id(gallery_owner, id);
+        let min_token_idx_to = find_token_index_by_id(gallery_to, id);
+
+        aborts_if amount <= 0;
+        aborts_if !exists<TokenBalance<TokenType>>(owner);
+        aborts_if !exists<TokenBalance<TokenType>>(to);
+        aborts_if !is_in_gallery(gallery_owner, id);
+        aborts_if amount > gallery_owner[min_token_idx].balance;
+        aborts_if owner != to && is_in_gallery(gallery_to, id) && MAX_U64 - amount < gallery_to[min_token_idx_to].balance;
+
+        ensures (gallery_owner[min_token_idx].balance == amount && to != owner) ==>
+                !is_in_gallery(post_gallery_owner, id);
+
+        ensures gallery_owner[min_token_idx].balance > amount ==>
+                post_gallery_owner[len(post_gallery_owner) - 1].id == id;
+        ensures post_gallery_to[len(post_gallery_to) - 1].id == id;
+
+        ensures (gallery_owner[min_token_idx].balance > amount && to != owner) ==>
+                post_gallery_owner[len(post_gallery_owner) - 1].balance ==
+                  gallery_owner[min_token_idx].balance - amount;
+
+        ensures (to != owner && !is_in_gallery(gallery_to, id) )==>
+                post_gallery_to[len(post_gallery_to) - 1].balance == amount;
+        ensures (to != owner && is_in_gallery(gallery_to, id) )==>
+                post_gallery_to[len(post_gallery_to) - 1].balance ==
+                   gallery_to[min_token_idx_to].balance + amount;
+
+        ensures to == owner ==> post_gallery_owner[len(post_gallery_owner) - 1].balance ==
+                                gallery_owner[min_token_idx].balance;
+
+    }
+
+    public fun publish_balance<TokenType: store>(account: &signer) {
+        assert!(!exists<TokenBalance<TokenType>>(signer::address_of(account)), EBALANCE_ALREADY_PUBLISHED);
+        move_to(account, TokenBalance<TokenType> { gallery: vector::empty() });
+    }
+
+    spec publish_balance {
+        let addr = signer::address_of(account);
+        aborts_if exists<TokenBalance<TokenType>>(addr);
+        ensures exists<TokenBalance<TokenType>>(addr);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFT.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFT.move
new file mode 100644
index 000000000..deae29c70
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFT.move
@@ -0,0 +1,300 @@
+address 0x1 {
+    module NFT {
+        use std::event;
+        use std::guid;
+        use std::option::{Self, Option};
+        use std::signer;
+        use std::vector;
+
+        /// Struct representing a semi-fungible or non-fungible token (depending on the supply).
+        /// There can be multiple tokens with the same id (unless supply is 1). Each token's
+        /// corresponding token metadata is stored inside a TokenData inside TokenDataCollection
+        /// under the creator's address.
+        /// The TokenData might be inlined together with the token in case the token is unique, i.e., its balance is 1
+        /// (we might choose to extend inlining for the non-unique NFTs in future).
+        /// The TokenData can also be separated out to a separate creator's collection in order to normalize the
+        /// data layout: we'd want to keep a single instance of the token data in case its balance is large.
+        struct Token<TokenType: copy + store + drop> has key, store {
+            id: guid::ID,
+            balance: u64,
+            token_data: Option<TokenData<TokenType>>,
+        }
+
+        /// Struct representing data of a specific token with token_id,
+        /// stored under the creator's address inside TokenDataCollection.
+        /// For each token_id, there is only one TokenData.
+        struct TokenData<TokenType: copy + store + drop> has key, store {
+            metadata: TokenType,
+            /// Identifier for the token.
+            token_id: guid::GUID,
+            /// Pointer to where the content and metadata is stored.
+            content_uri: vector<u8>,
+            supply: u64,
+            /// Parent NFT id
+            parent_id: Option<guid::ID>
+        }
+
+        /// The data of the NFT tokens is either kept inline (in case their balance is 1), or is detached and kept
+        /// in the token data collection by the original creator.
+        struct TokenDataCollection<TokenType: copy + store + drop> has key {
+            tokens: vector<TokenData<TokenType>>,
+        }
+
+        struct MintEvent has copy, drop, store {
+            id: guid::ID,
+            creator: address,
+            content_uri: vector<u8>,
+            amount: u64,
+        }
+
+        struct TransferEvent has copy, drop, store {
+            id: guid::ID,
+            from: address,
+            to: address,
+            amount: u64,
+        }
+
+        struct Admin has key {
+            mint_events: event::EventHandle<MintEvent>,
+            transfer_events: event::EventHandle<TransferEvent>,
+        }
+
+        /// Indicates that a user allows creation delegation for a given TokenType
+        struct CreationDelegation<phantom TokenType: copy + store + drop> has key, store {
+            guid_capability: guid::CreateCapability,
+        }
+
+        const ADMIN: address = @0xa550c18;
+        const MAX_U64: u64 = 18446744073709551615u64;
+        // Error codes
+        /// Function can only be called by the admin address
+        const ENOT_ADMIN: u64  = 0;
+        const EWRONG_TOKEN_ID: u64 = 1;
+        const ETOKEN_BALANCE_OVERFLOWS: u64 = 2;
+        const EAMOUNT_EXCEEDS_TOKEN_BALANCE: u64 = 3;
+        const ETOKEN_EXTRACTED: u64 = 4;
+        const EINDEX_EXCEEDS_LENGTH: u64 = 5;
+        const ETOKEN_PRESENT: u64 = 6;
+        const EPARENT_NOT_SAME_ACCOUNT: u64 = 7;
+        const ETOKEN_DATA_COLLECTION_ALREADY_PUBLISHED: u64 = 8;
+        /// Creation delegation for a given token type is not allowed.
+        const ECREATION_DELEGATION_NOT_ALLOWED: u64 = 9;
+        /// Trying to merge or split tokens with inlined data.
+        const EINLINE_DATA_OP: u64 = 10;
+
+        /// Initialize this module
+        public entry fun nft_initialize(account: signer) {
+            assert!(signer::address_of(&account) == ADMIN, ENOT_ADMIN);
+            move_to(&account, Admin {
+                mint_events: event::new_event_handle<MintEvent>(&account),
+                transfer_events: event::new_event_handle<TransferEvent>(&account),
+            })
+        }
+
+        /// Returns the id of given token
+        public fun id<TokenType: copy + store + drop>(token: &Token<TokenType>): guid::ID {
+            *&token.id
+        }
+
+        /// Returns the balance of given token
+        public fun get_balance<TokenType: copy + store + drop>(token: &Token<TokenType>): u64 {
+            token.balance
+        }
+
+        /// Returns the overall supply for the given token
+        public fun get_supply<TokenType: copy + store + drop>(token: &Token<TokenType>): u64 acquires TokenDataCollection{
+            if (option::is_some(&token.token_data)) {
+                option::borrow(&token.token_data).supply
+            } else {
+                let creator_addr = guid::id_creator_address(&token.id);
+                let creator_tokens_data = &borrow_global<TokenDataCollection<TokenType>>(creator_addr).tokens;
+                let token_data_idx = *option::borrow(&index_of_token<TokenType>(creator_tokens_data, &token.id));
+                vector::borrow(creator_tokens_data, token_data_idx).supply
+            }
+        }
+
+        /// Returns a copy of the token content uri
+        public fun get_content_uri<TokenType: copy + store + drop>(token: &Token<TokenType>): vector<u8> acquires TokenDataCollection {
+            if (option::is_some(&token.token_data)) {
+                *&option::borrow(&token.token_data).content_uri
+            } else {
+                let creator_addr = guid::id_creator_address(&token.id);
+                let creator_tokens_data = &borrow_global<TokenDataCollection<TokenType>>(creator_addr).tokens;
+                let token_data_idx = *option::borrow(&index_of_token<TokenType>(creator_tokens_data, &token.id));
+                *&vector::borrow(creator_tokens_data, token_data_idx).content_uri
+            }
+        }
+
+        /// Returns a copy of the token metadata
+        public fun get_metadata<TokenType: copy + store + drop>(token: &Token<TokenType>): TokenType acquires TokenDataCollection {
+            if (option::is_some(&token.token_data)) {
+                *&option::borrow(&token.token_data).metadata
+            } else {
+                let creator_addr = guid::id_creator_address(&token.id);
+                let creator_tokens_data = &borrow_global<TokenDataCollection<TokenType>>(creator_addr).tokens;
+                let token_data_idx = *option::borrow(&index_of_token<TokenType>(creator_tokens_data, &token.id));
+                *&vector::borrow(creator_tokens_data, token_data_idx).metadata
+            }
+        }
+
+        /// Returns a copy of the token metadata
+        public fun get_parent_id<TokenType: copy + store + drop>(token: &Token<TokenType>): Option<guid::ID> acquires TokenDataCollection {
+            if (option::is_some(&token.token_data)) {
+                *&option::borrow(&token.token_data).parent_id
+            } else {
+                let creator_addr = guid::id_creator_address(&token.id);
+                let creator_tokens_data = &borrow_global<TokenDataCollection<TokenType>>(creator_addr).tokens;
+                let token_data_idx = *option::borrow(&index_of_token<TokenType>(creator_tokens_data, &token.id));
+                *&vector::borrow(creator_tokens_data, token_data_idx).parent_id
+            }
+        }
+
+        /// Returns true if the token is keeping the token data inlined.
+        public fun is_data_inlined<TokenType: copy + store + drop>(token: &Token<TokenType>): bool {
+            option::is_some(&token.token_data)
+        }
+
+        /// Finds the index of token with the given id in the gallery.
+        fun index_of_token<TokenType: copy + store + drop>(gallery: &vector<TokenData<TokenType>>, id: &guid::ID): Option<u64> {
+            let i = 0;
+            let len = vector::length(gallery);
+            while (i < len) {
+                if (guid::eq_id(&vector::borrow(gallery, i).token_id, id)) {
+                    return option::some(i)
+                };
+                i = i + 1;
+            };
+            option::none()
+        }
+
+        /// Adds the balance of `TokenID` to the balance of the given `Token`.
+        public fun join<TokenType: copy + store + drop>(token: &mut Token<TokenType>, other: Token<TokenType>) {
+            let Token { id, balance, token_data } = other;
+            // Inlining is allowed for single-token NFTs only.
+            option::destroy_none(token_data); // aborts in case token data is not None
+            assert!(option::is_none(&token.token_data), EINLINE_DATA_OP);
+            assert!(*&token.id == id, EWRONG_TOKEN_ID);
+            assert!(MAX_U64 - token.balance >= balance, ETOKEN_BALANCE_OVERFLOWS);
+            token.balance = token.balance + balance;
+        }
+
+        /// Split out a new token with the given amount from the original token.
+        /// Aborts in case amount is greater or equal than the given token balance.
+        public fun split_out<TokenType: copy + store + drop>(token: &mut Token<TokenType>, amount: u64): Token<TokenType> {
+            assert!(token.balance >= amount, EAMOUNT_EXCEEDS_TOKEN_BALANCE);
+            assert!(option::is_none(&token.token_data), EINLINE_DATA_OP);
+
+            token.balance = token.balance - amount;
+            Token {
+                id: *&token.id,
+                balance: amount,
+                token_data: option::none(),
+            }
+        }
+
+        /// Create an NFT on behalf of the given user, in case a user explicitly approved this delegation for the given
+        /// NFT type.
+        /// Only the entity, which can create an object of `TokenType`, will be able to call this function.
+        public fun create_for<TokenType: copy + store + drop>(
+            creator: address, metadata: TokenType, content_uri: vector<u8>, amount: u64, parent_id: Option<guid::ID>
+        ): Token<TokenType> acquires CreationDelegation, Admin, TokenDataCollection {
+            assert! (exists<CreationDelegation<TokenType>>(creator), ECREATION_DELEGATION_NOT_ALLOWED);
+            let guid_creation_cap = &borrow_global<CreationDelegation<TokenType>>(creator).guid_capability;
+            let guid = guid::create_with_capability(creator, guid_creation_cap);
+            create_impl<TokenType>(
+                creator,
+                guid,
+                metadata,
+                content_uri,
+                amount,
+                parent_id
+            )
+        }
+
+        /// Create a` TokenData<TokenType>` that wraps `metadata` and with balance of `amount`
+        public fun create<TokenType: copy + store + drop>(
+            account: &signer, metadata: TokenType, content_uri: vector<u8>, amount: u64, parent_id: Option<guid::ID>
+        ): Token<TokenType> acquires Admin, TokenDataCollection {
+            let guid = guid::create(account);
+            if (!exists<TokenDataCollection<TokenType>>(signer::address_of(account))) {
+                move_to(account, TokenDataCollection { tokens: vector::empty<TokenData<TokenType>>() });
+            };
+            create_impl<TokenType>(
+                signer::address_of(account),
+                guid,
+                metadata,
+                content_uri,
+                amount,
+                parent_id
+            )
+        }
+
+        fun create_impl<TokenType: copy + store + drop>(
+            addr: address,
+            guid: guid::GUID,
+            metadata: TokenType,
+            content_uri: vector<u8>,
+            amount: u64,
+            parent_id: Option<guid::ID>
+        ): Token<TokenType> acquires Admin, TokenDataCollection {
+            event::emit_event(
+                &mut borrow_global_mut<Admin>(ADMIN).mint_events,
+                MintEvent {
+                    id: guid::id(&guid),
+                    creator: addr,
+                    content_uri: copy content_uri,
+                    amount,
+                }
+            );
+            let id = guid::id(&guid);
+            let token_data = TokenData { metadata, token_id: guid, content_uri, supply: amount, parent_id };
+            if (amount == 1) {
+                // inline token data
+                Token { id, balance: amount, token_data: option::some(token_data) }
+            } else {
+                // keep token data in the collection of the creator
+                let token_data_collection = &mut borrow_global_mut<TokenDataCollection<TokenType>>(addr).tokens;
+                vector::push_back(token_data_collection, token_data);
+                Token { id, balance: amount, token_data: option::none() }
+            }
+        }
+
+        public fun publish_token_data_collection<TokenType: copy + store + drop>(account: &signer) {
+            assert!(
+                !exists<TokenDataCollection<TokenType>>(signer::address_of(account)),
+                ETOKEN_DATA_COLLECTION_ALREADY_PUBLISHED
+            );
+            move_to(account, TokenDataCollection<TokenType> { tokens: vector::empty() });
+        }
+
+        /// Allow creation delegation for a given TokenType (the entity, which can generate a metadata of a given TokenType
+        /// is going to be allowed to create an NFT on behalf of the user).
+        /// This is useful in case a user is using a 3rd party app, which can create NFTs on their behalf.
+        public fun allow_creation_delegation<TokenType: copy + store + drop>(account: &signer) {
+            if (!exists<CreationDelegation<TokenType>>(signer::address_of(account))) {
+                move_to(account, CreationDelegation<TokenType> { guid_capability: guid::gen_create_capability(account) });
+                // In order to support creation delegation, prepare the token data collection ahead of time.
+                if (!exists<TokenDataCollection<TokenType>>(signer::address_of(account))) {
+                    move_to(account, TokenDataCollection { tokens: vector::empty<TokenData<TokenType>>() });
+                };
+            };
+        }
+
+        public fun emit_transfer_event(
+            guid: &guid::ID,
+            account: &signer,
+            to: address,
+            amount: u64,
+        ) acquires Admin {
+            event::emit_event(
+                &mut borrow_global_mut<Admin>(ADMIN).transfer_events,
+                TransferEvent {
+                    id: *guid,
+                    from: signer::address_of(account),
+                    to: to,
+                    amount: amount,
+                }
+            );
+        }
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFTGallery.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFTGallery.move
new file mode 100644
index 000000000..04fad2330
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/NFTGallery.move
@@ -0,0 +1,159 @@
+module 0x1::NFTGallery {
+    use std::guid;
+    use 0x1::NFT::{Self, Token};
+    use std::option::{Self, Option};
+    use std::signer;
+    use std::vector;
+
+    /// Gallery holding tokens of `TokenType` as well as information of approved operators.
+    struct NFTGallery<TokenType: copy + store + drop> has key {
+        gallery: vector<Token<TokenType>>
+    }
+
+    // Error codes
+    const EID_NOT_FOUND: u64 = 0;
+    const EGALLERY_NOT_PUBLISHED: u64 = 1;
+    const EGALLERY_ALREADY_PUBLISHED: u64 = 2;
+    const EINVALID_AMOUNT_OF_TRANSFER: u64 = 3;
+
+    /// Add a token to the owner's gallery.
+    /// The specifics of the addition depend on the token data inlining.
+    /// In case the token data is inlined, the addition is trivial (join / split operations are not allowed).
+    /// Otherwise, the addition might include joining of the two tokens.
+    public fun add_to_gallery<TokenType: copy + store + drop>(owner: address, token: Token<TokenType>)
+    acquires NFTGallery {
+        assert!(exists<NFTGallery<TokenType>>(owner), EGALLERY_NOT_PUBLISHED);
+        let gallery = &mut borrow_global_mut<NFTGallery<TokenType>>(owner).gallery;
+        if (!NFT::is_data_inlined<TokenType>(&token)) {
+            let index_opt = index_of_token<TokenType>(gallery, &NFT::id<TokenType>(&token));
+            if (option::is_some(&index_opt)) {
+                let prev_token_idx = option::extract(&mut index_opt);
+                // The gallery already has the given token: update its balance
+                NFT::join<TokenType>(vector::borrow_mut(gallery, prev_token_idx), token);
+                return
+            }
+        };
+        vector::push_back(gallery, token)
+    }
+
+    /// Returns whether the owner has a token with given id.
+    public fun has_token<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID): bool acquires NFTGallery {
+        option::is_some(&index_of_token(&borrow_global<NFTGallery<TokenType>>(owner).gallery, token_id))
+    }
+
+    public fun get_token_balance<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID
+    ): u64 acquires NFTGallery {
+        let gallery = &borrow_global<NFTGallery<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+        if (option::is_none(&index_opt)) {
+            0
+        } else {
+            let token = vector::borrow(gallery, option::extract(&mut index_opt));
+            NFT::get_balance(token)
+        }
+    }
+
+    /// Returns the overall supply for the given token (across this and potentially other galleries),
+    // aborts if token with the given ID is not found.
+    public fun get_token_supply<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID): u64 acquires NFTGallery {
+        let gallery = &borrow_global<NFTGallery<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+        assert!(option::is_some(&index_opt), EID_NOT_FOUND);
+        let token = vector::borrow(gallery, option::extract(&mut index_opt));
+        NFT::get_supply(token)
+    }
+
+    /// Returns a copy of the token content uri
+    public fun get_token_content_uri<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID): vector<u8> acquires NFTGallery {
+        let gallery = &borrow_global<NFTGallery<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+        assert!(option::is_some(&index_opt), EID_NOT_FOUND);
+        let token = vector::borrow(gallery, option::extract(&mut index_opt));
+        NFT::get_content_uri(token)
+    }
+
+    /// Returns a copy of the token metadata
+    public fun get_token_metadata<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID): TokenType acquires NFTGallery {
+        let gallery = &borrow_global<NFTGallery<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+        assert!(option::is_some(&index_opt), EID_NOT_FOUND);
+        let token = vector::borrow(gallery, option::extract(&mut index_opt));
+        NFT::get_metadata(token)
+    }
+
+    /// Returns a copy of the token parent id
+    public fun get_token_parent_id<TokenType: copy + store + drop>(owner: address, token_id: &guid::ID): Option<guid::ID> acquires NFTGallery {
+        let gallery = &borrow_global<NFTGallery<TokenType>>(owner).gallery;
+        let index_opt = index_of_token<TokenType>(gallery, token_id);
+        assert!(option::is_some(&index_opt), EID_NOT_FOUND);
+        let token = vector::borrow(gallery, option::extract(&mut index_opt));
+        NFT::get_parent_id(token)
+    }
+
+    /// Transfer `amount` of token with id `GUID::id(creator, creation_num)` from `owner`'s
+    /// balance to `to`'s balance. This operation has to be done by either the owner or an
+    /// approved operator of the owner.
+    public entry fun transfer_token_between_galleries<TokenType: copy + store + drop>(
+        account: signer,
+        to: address,
+        amount: u64,
+        creator: address,
+        creation_num: u64
+    ) acquires NFTGallery {
+        transfer_token_between_galleries_impl<TokenType>(&account, to, amount, creator, creation_num)
+    }
+
+    /// The implementation, which doesn't consume signer, and thus can be used for testing.
+    public fun transfer_token_between_galleries_impl<TokenType: copy + store + drop>(
+        account: &signer,
+        to: address,
+        amount: u64,
+        creator: address,
+        creation_num: u64
+    ) acquires NFTGallery {
+        let owner = signer::address_of(account);
+        assert!(amount > 0, EINVALID_AMOUNT_OF_TRANSFER);
+        let gallery = &mut borrow_global_mut<NFTGallery<TokenType>>(owner).gallery;
+        let id = guid::create_id(creator, creation_num);
+
+        let index_opt = index_of_token<TokenType>(gallery, &id);
+        assert!(option::is_some(&index_opt), EID_NOT_FOUND);
+        let from_token_idx = option::extract(&mut index_opt);
+
+        if (NFT::is_data_inlined(vector::borrow(gallery, from_token_idx)) ||
+                NFT::get_balance(vector::borrow(gallery, from_token_idx)) == amount) {
+            // Move the token from one gallery to another
+            let token = vector::remove(gallery, from_token_idx);
+            add_to_gallery<TokenType>(to, token)
+        } else {
+            // Split the original token and add the splitted part to another gallery
+            let split_out_token = NFT::split_out(vector::borrow_mut(gallery, from_token_idx), amount);
+            add_to_gallery<TokenType>(to, split_out_token)
+        };
+        // Emit transfer event
+        NFT::emit_transfer_event(
+            &id,
+            account,
+            to,
+            amount,
+        )
+    }
+
+    public fun publish_gallery<TokenType: copy + store + drop>(account: &signer) {
+        assert!(!exists<NFTGallery<TokenType>>(signer::address_of(account)), EGALLERY_ALREADY_PUBLISHED);
+        move_to(account, NFTGallery<TokenType> { gallery: vector::empty() });
+    }
+
+    /// Finds the index of token with the given id in the gallery.
+    fun index_of_token<TokenType: copy + store + drop>(gallery: &vector<Token<TokenType>>, id: &guid::ID): Option<u64> {
+        let i = 0;
+        let len = vector::length(gallery);
+        while (i < len) {
+            if (NFT::id<TokenType>(vector::borrow(gallery, i)) == *id) {
+                return option::some(i)
+            };
+            i = i + 1;
+        };
+        option::none()
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/SystemAdministrationScripts.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/SystemAdministrationScripts.move
new file mode 100644
index 000000000..492eff074
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/SystemAdministrationScripts.move
@@ -0,0 +1,142 @@
+/// This module contains Diem Framework script functions to administer the
+/// network outside of validators and validator operators.
+module ExperimentalFramework::SystemAdministrationScripts {
+    use ExperimentalFramework::ExperimentalConsensusConfig;
+    use ExperimentalFramework::ExperimentalVersion;
+    use ExperimentalFramework::ExperimentalVMConfig;
+
+    ///  # Summary
+    /// Updates the Diem major version that is stored on-chain and is used by the VM.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the `DiemVersion` on-chain config and emits a `DiemConfig::NewEpochEvent` to trigger
+    /// a reconfiguration of the system. The `major` version that is passed in must be strictly greater
+    /// than the current major version held on-chain. The VM reads this information and can use it to
+    /// preserve backwards compatibility with previous major versions of the VM.
+    ///
+    /// # Parameters
+    /// | Name            | Type     | Description                                                                |
+    /// | ------          | ------   | -------------                                                              |
+    /// | `account`       | `signer` | Signer of the sending account. Must be the Diem Root account.              |
+    /// | `_sliding_nonce` | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    /// | `major`         | `u64`    | The `major` version of the VM to be used from this transaction on.         |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemVersion::EINVALID_MAJOR_VERSION_NUMBER`  | `major` is less-than or equal to the current major version stored on-chain.                |
+
+    public entry fun update_diem_version(account: signer, _sliding_nonce: u64, major: u64) {
+        ExperimentalVersion::set(&account, major)
+    }
+
+    /// # Summary
+    /// Updates the gas constants stored on chain and used by the VM for gas
+    /// metering. This transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the on-chain config holding the `DiemVMConfig` and emits a
+    /// `DiemConfig::NewEpochEvent` to trigger a reconfiguration of the system.
+    ///
+    /// # Parameters
+    /// | Name                                | Type     | Description                                                                                            |
+    /// | ------                              | ------   | -------------                                                                                          |
+    /// | `account`                           | `signer` | Signer of the sending account. Must be the Diem Root account.                                          |
+    /// | `_sliding_nonce`                     | `u64`    | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction.                             |
+    /// | `global_memory_per_byte_cost`       | `u64`    | The new cost to read global memory per-byte to be used for gas metering.                               |
+    /// | `global_memory_per_byte_write_cost` | `u64`    | The new cost to write global memory per-byte to be used for gas metering.                              |
+    /// | `min_transaction_gas_units`         | `u64`    | The new flat minimum amount of gas required for any transaction.                                       |
+    /// | `large_transaction_cutoff`          | `u64`    | The new size over which an additional charge will be assessed for each additional byte.                |
+    /// | `intrinsic_gas_per_byte`            | `u64`    | The new number of units of gas that to be charged per-byte over the new `large_transaction_cutoff`.    |
+    /// | `maximum_number_of_gas_units`       | `u64`    | The new maximum number of gas units that can be set in a transaction.                                  |
+    /// | `min_price_per_gas_unit`            | `u64`    | The new minimum gas price that can be set for a transaction.                                           |
+    /// | `max_price_per_gas_unit`            | `u64`    | The new maximum gas price that can be set for a transaction.                                           |
+    /// | `max_transaction_size_in_bytes`     | `u64`    | The new maximum size of a transaction that can be processed.                                           |
+    /// | `gas_unit_scaling_factor`           | `u64`    | The new scaling factor to use when scaling between external and internal gas units.                    |
+    /// | `default_account_size`              | `u64`    | The new default account size to use when assessing final costs for reads and writes to global storage. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                | Description                                                                                |
+    /// | ----------------           | --------------                              | -------------                                                                              |
+    /// | `Errors::INVALID_ARGUMENT` | `DiemVMConfig::EGAS_CONSTANT_INCONSISTENCY` | The provided gas constants are inconsistent.                                               |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                 | `account` is not the Diem Root account.                                                    |
+    public entry fun set_gas_constants(
+        dr_account: signer,
+        _sliding_nonce: u64,
+        global_memory_per_byte_cost: u64,
+        global_memory_per_byte_write_cost: u64,
+        min_transaction_gas_units: u64,
+        large_transaction_cutoff: u64,
+        intrinsic_gas_per_byte: u64,
+        maximum_number_of_gas_units: u64,
+        min_price_per_gas_unit: u64,
+        max_price_per_gas_unit: u64,
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    ) {
+        ExperimentalVMConfig::set_gas_constants(
+            &dr_account,
+            global_memory_per_byte_cost,
+            global_memory_per_byte_write_cost,
+            min_transaction_gas_units,
+            large_transaction_cutoff,
+            intrinsic_gas_per_byte,
+            maximum_number_of_gas_units,
+            min_price_per_gas_unit,
+            max_price_per_gas_unit,
+            max_transaction_size_in_bytes,
+            gas_unit_scaling_factor,
+            default_account_size,
+        )
+    }
+
+    ///  # Summary
+    /// Initializes the Diem consensus config that is stored on-chain.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Initializes the `DiemConsensusConfig` on-chain config to empty and allows future updates from DiemRoot via
+    /// `update_diem_consensus_config`. This doesn't emit a `DiemConfig::NewEpochEvent`.
+    ///
+    /// # Parameters
+    /// | Name            | Type      | Description                                                                |
+    /// | ------          | ------    | -------------                                                              |
+    /// | `account`       | `signer` | Signer of the sending account. Must be the Diem Root account.               |
+    /// | `_sliding_nonce` | `u64`     | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+
+    public entry fun initialize_diem_consensus_config(account: signer, _sliding_nonce: u64) {
+        ExperimentalConsensusConfig::initialize(&account);
+    }
+
+    ///  # Summary
+    /// Updates the Diem consensus config that is stored on-chain and is used by the Consensus.  This
+    /// transaction can only be sent from the Diem Root account.
+    ///
+    /// # Technical Description
+    /// Updates the `DiemConsensusConfig` on-chain config and emits a `DiemConfig::NewEpochEvent` to trigger
+    /// a reconfiguration of the system.
+    ///
+    /// # Parameters
+    /// | Name            | Type          | Description                                                                |
+    /// | ------          | ------        | -------------                                                              |
+    /// | `account`       | `signer`      | Signer of the sending account. Must be the Diem Root account.              |
+    /// | `_sliding_nonce` | `u64`         | The `sliding_nonce` (see: `SlidingNonce`) to be used for this transaction. |
+    /// | `config`        | `vector<u8>`  | The serialized bytes of consensus config.                                  |
+    ///
+    /// # Common Abort Conditions
+    /// | Error Category             | Error Reason                                  | Description                                                                                |
+    /// | ----------------           | --------------                                | -------------                                                                              |
+    /// | `Errors::REQUIRES_ADDRESS` | `CoreAddresses::EDIEM_ROOT`                   | `account` is not the Diem Root account.                                                    |
+
+    public entry fun update_diem_consensus_config(account: signer, _sliding_nonce: u64, config: vector<u8>) {
+        ExperimentalConsensusConfig::set(&account, config)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move
new file mode 100644
index 000000000..b3f55c9e0
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move
@@ -0,0 +1,654 @@
+/// The Vote module is used to allow voting on proposals on the chain.
+/// It is typically not going to be used directly, but is intended to be
+/// used as a library for modules which want to perform operations which
+/// require m-of-n approvals from accounts on chain.
+/// A typical workflow would look like the following
+/// * Module M creates a ballot with a given `Proposal` and an approval policy using `create_ballot`
+/// * It receives the BallotID corresponding to the ballot
+/// * It submits votes using the `vote` function from the voters
+/// * If a vote causes a ballot to be approved, `vote` returns `true` and Module M can proceed with the operation requested by the `Proposal`
+module ExperimentalFramework::Vote {
+
+    use std::bcs;
+    use std::errors;
+    use std::event;
+    use std::signer;
+    use std::vector;
+    use CoreFramework::DiemTimestamp;
+    #[test_only]
+    friend ExperimentalFramework::VoteTests;
+
+    /// An unique identifier for a ballot. A counter is stored
+    /// under each proposers address which is incremented
+    /// every time a new ballot is created. The proposers
+    /// address is also part of the ballot id.
+    struct BallotID has store, copy, drop {
+        counter: u64,
+        proposer: address,
+    }
+
+    /// WeightedVoter represents a voter with a weight
+    /// The voter is represented by the bcs serialization of address
+    struct WeightedVoter has store, copy, drop {
+        weight: u64,
+        voter: vector<u8>,
+    }
+
+    /// Ballot is a struct which contains a Proposal on which
+    /// votes are gathered. A ballot is started by a proposer
+    /// and it carries the proposal, the approval policy,
+    /// expiration timestamp
+    struct Ballot<Proposal: store + drop> has store, copy, drop {
+        /// Details for the proposal being voted on.
+        proposal: Proposal,
+        /// A human readable type for the proposal - ex: "create_validator_owner",
+        /// "freeze_account", "create_vasp", etc.
+        /// This lives outside the `proposal: Proposal` to make it easy for
+        /// indexers to index the ballots which have been proposed and
+        /// categorize them into "types"
+        proposal_type: vector<u8>,
+        /// The num_votes_required for this proposal to be approved
+        num_votes_required: u64,
+        /// A vector of addresses which are allowed to vote on this ballot.
+        allowed_voters: vector<WeightedVoter>,
+        /// Votes received so far
+        votes_received: vector<WeightedVoter>,
+        /// Total number of weighted votes received
+        total_weighted_votes_received: u64,
+        // A globally unique ballot id that is created for every proposal
+        ballot_id: BallotID,
+        // Votes rejected after this time
+        expiration_timestamp_secs: u64,
+    }
+
+    /// Ballots stores a list of ballots under a proposers address.
+    /// It is type parametrized by the Proposal. Some of these may
+    /// be expired and can be cleaned up using the `gc_ballots` function
+    /// It also contains the handles for all the events associated
+    /// with the ballots created by a proposer
+    struct Ballots<Proposal: store + drop> has key {
+        ballots: vector<Ballot<Proposal>>,
+        create_ballot_handle: event::EventHandle<CreateBallotEvent<Proposal>>,
+        remove_ballot_handle: event::EventHandle<RemoveBallotEvent>,
+        voted_handle: event::EventHandle<VotedEvent>,
+        ballot_approved_handle: event::EventHandle<BallotApprovedEvent>,
+    }
+
+    /// A counter which is stored under the proposers address and gets incremented
+    /// everytime they create a new ballot. This is used for creating unique
+    /// global identifiers for Ballots
+    struct BallotCounter has key {
+        counter: u64,
+    }
+
+    /// CreateBallotEvent is emitted when a ballot is
+    /// created by a proposer
+    struct CreateBallotEvent<Proposal: store + drop> has drop, store {
+        ballot_id: BallotID,
+        ballot: Ballot<Proposal>,
+    }
+
+    /// RemoveBallotEvent is emitted when a ballot has
+    /// been removed. This can either happen because:
+    /// * ballot was approved
+    /// * ballot was manually removed by the proposer
+    /// * ballot was expired and garbage collected
+    struct RemoveBallotEvent has drop, store {
+        ballot_id: BallotID,
+    }
+
+    /// VotedEvent is emitted when a valid vote has
+    /// been accepted by the ballot
+    struct VotedEvent has drop, store {
+        ballot_id: BallotID,
+        voter: address,
+        vote_weight: u64,
+    }
+
+    /// BallotApprovedEvent is emitted when a ballot has
+    /// been approved by the voters
+    struct BallotApprovedEvent has drop, store {
+        ballot_id: BallotID,
+    }
+
+    /// The maximum number of ballots allowed per proposal type
+    /// per address.
+    const MAX_BALLOTS_PER_PROPOSAL_TYPE_PER_ADDRESS: u64 = 256;
+
+    /// The provided timestamp(s) were invalid
+    const EINVALID_TIMESTAMP: u64 = 1;
+    /// The address already contains has the maximum of ballots allowed
+    /// MAX_BALLOTS_PER_PROPOSAL_TYPE_PER_ADDRESS
+    const ETOO_MANY_BALLOTS: u64 = 2;
+    /// Ballot with the provided id was not found
+    const EBALLOT_NOT_FOUND: u64 = 3;
+    /// Proposal details in the vote do not match the proposal details
+    /// in the ballot
+    const EBALLOT_PROPOSAL_MISMATCH: u64 = 4;
+    /// Voter not allowed to vote in the ballot
+    const EINVALID_VOTER: u64 = 5;
+    /// current timestamp > ballot expiration time
+    const EBALLOT_EXPIRED: u64 = 7;
+    /// Voter has already voted in this ballot
+    const EALREADY_VOTED: u64 = 8;
+    /// Num_votes must be greater than 0, so that election is not won when started
+    const EINVALID_NUM_VOTES: u64 = 9;
+
+    /// A constructor for BallotID
+    public fun new_ballot_id(
+        counter: u64,
+        proposer: address,
+    ): BallotID {
+        BallotID {
+            counter,
+            proposer,
+        }
+    }
+
+    /// A constructor for WeightedVoter
+    public fun new_weighted_voter(
+        weight: u64,
+        voter: vector<u8>,
+    ): WeightedVoter {
+        WeightedVoter {
+            weight,
+            voter,
+        }
+    }
+
+    /// Create a ballot under the signer's address and return the `BallotID`
+    public fun create_ballot<Proposal: store + copy + drop>(
+        ballot_account: &signer,
+        proposal: Proposal,
+        proposal_type: vector<u8>,
+        num_votes_required: u64,
+        allowed_voters: vector<WeightedVoter>,
+        expiration_timestamp_secs: u64
+    ): BallotID acquires Ballots, BallotCounter {
+        let ballot_address = signer::address_of(ballot_account);
+
+        assert!(DiemTimestamp::now_seconds() < expiration_timestamp_secs, errors::invalid_argument(EINVALID_TIMESTAMP));
+        assert!(num_votes_required > 0, errors::invalid_argument(EINVALID_NUM_VOTES));
+
+        if (!exists<BallotCounter>(ballot_address)) {
+            move_to(ballot_account, BallotCounter {
+                counter: 0,
+            });
+        };
+        if (!exists<Ballots<Proposal>>(ballot_address)) {
+            move_to(ballot_account, Ballots<Proposal> {
+                ballots: vector::empty(),
+                create_ballot_handle: event::new_event_handle<CreateBallotEvent<Proposal>>(ballot_account),
+                remove_ballot_handle: event::new_event_handle<RemoveBallotEvent>(ballot_account),
+                voted_handle: event::new_event_handle<VotedEvent>(ballot_account),
+                ballot_approved_handle: event::new_event_handle<BallotApprovedEvent>(ballot_account),
+            });
+        };
+
+        let ballot_data = borrow_global_mut<Ballots<Proposal>>(ballot_address);
+
+        // Remove any expired ballots
+        gc_internal<Proposal>(ballot_data);
+        let ballots = &mut ballot_data.ballots;
+
+        assert!(vector::length(ballots) < MAX_BALLOTS_PER_PROPOSAL_TYPE_PER_ADDRESS, errors::limit_exceeded(ETOO_MANY_BALLOTS));
+        let ballot_id = new_ballot_id(incr_counter(ballot_account), ballot_address);
+        let ballot = Ballot<Proposal> {
+            proposal,
+            proposal_type,
+            num_votes_required,
+            allowed_voters,
+            votes_received: vector::empty(),
+            total_weighted_votes_received: 0,
+            ballot_id: *&ballot_id,
+            expiration_timestamp_secs,
+        };
+        vector::push_back(ballots, *&ballot);
+        event::emit_event<CreateBallotEvent<Proposal>>(
+            &mut ballot_data.create_ballot_handle,
+            CreateBallotEvent {
+                ballot_id: *&ballot_id,
+                ballot,
+            },
+        );
+        ballot_id
+    }
+
+    // Checks if a voter is present in the vector<WeightedVoter>
+    fun check_voter_present(
+        weighted_voters: &vector<WeightedVoter>,
+        voter: &vector<u8>,
+    ): bool {
+        let i = 0;
+        let len = vector::length(weighted_voters);
+        while (i < len) {
+            if (&vector::borrow(weighted_voters, i).voter == voter) return true;
+            i = i + 1;
+        };
+        false
+    }
+
+    /// Submit a vote from the `voter_account` to `ballot_id`
+    /// This also contains the `proposal_type` and `proposal` so that
+    /// the voter signs over these when sending their vote.
+    /// If this vote causes the ballot to be approved, then the ballot
+    /// is removed from the proposers address.
+    /// This returns a bool indicating whether this vote moved the ballot
+    /// to an approved status. true represents that the ballot got approved
+    /// after this vote and false represents that the ballot has not been
+    /// approved after this vote
+    public fun vote<Proposal: store + drop>(
+        voter_account: &signer,
+        ballot_id: BallotID,
+        proposal_type: vector<u8>,
+        proposal: Proposal,
+    ): bool acquires Ballots {
+        let ballot_data = borrow_global_mut<Ballots<Proposal>>(ballot_id.proposer);
+
+        // Remove any expired ballots
+        gc_internal<Proposal>(ballot_data);
+
+        let ballots = &mut ballot_data.ballots;
+        let i = 0;
+        let len = vector::length(ballots);
+        while (i < len) {
+            if (&vector::borrow(ballots, i).ballot_id == &ballot_id) break;
+            i = i + 1;
+        };
+        assert!(i < len, errors::invalid_state(EBALLOT_NOT_FOUND));
+        let ballot_index = i;
+        let ballot = vector::borrow_mut(ballots, ballot_index);
+
+        assert!(&ballot.proposal == &proposal, errors::invalid_argument(EBALLOT_PROPOSAL_MISMATCH));
+        assert!(&ballot.proposal_type == &proposal_type, errors::invalid_argument(EBALLOT_PROPOSAL_MISMATCH));
+
+        let voter_address = signer::address_of(voter_account);
+        let voter_address_bcs = bcs::to_bytes(&voter_address);
+        let allowed_voters = &ballot.allowed_voters;
+
+        assert!(check_voter_present(allowed_voters, &voter_address_bcs), errors::invalid_state(EINVALID_VOTER));
+        assert!(DiemTimestamp::now_seconds() <= ballot.expiration_timestamp_secs, errors::invalid_state(EBALLOT_EXPIRED));
+
+        assert!(!check_voter_present(&ballot.votes_received, &voter_address_bcs), errors::invalid_state(EALREADY_VOTED));
+
+        let i = 0;
+        let len = vector::length(allowed_voters);
+        while (i < len) {
+            let weighted_voter = vector::borrow(allowed_voters, i);
+            if (&weighted_voter.voter == &voter_address_bcs) {
+                vector::push_back(&mut ballot.votes_received, *weighted_voter);
+                ballot.total_weighted_votes_received = ballot.total_weighted_votes_received + weighted_voter.weight;
+                event::emit_event<VotedEvent>(
+                    &mut ballot_data.voted_handle,
+                    VotedEvent {
+                        ballot_id: *&ballot_id,
+                        voter: voter_address,
+                        vote_weight: weighted_voter.weight,
+                    },
+                );
+                break
+            };
+            i = i + 1;
+        };
+        let ballot_approved = ballot.total_weighted_votes_received >= ballot.num_votes_required;
+        // If the ballot gets approved, remove the ballot immediately
+        if (ballot_approved) {
+            vector::swap_remove(ballots, ballot_index);
+            event::emit_event<BallotApprovedEvent>(
+                &mut ballot_data.ballot_approved_handle,
+                BallotApprovedEvent {
+                    ballot_id,
+                },
+            );
+        };
+        ballot_approved
+    }
+
+    /// gc_ballots deletes all the expired ballots of the type `Proposal`
+    /// under the provided address `addr`. The signer can be anybody
+    /// and does not need to have the same address as `addr`
+    public entry fun gc_ballots<Proposal: store + drop>(
+        _signer: signer,
+        addr: address,
+    ) acquires Ballots {
+        gc_internal<Proposal>(borrow_global_mut<Ballots<Proposal>>(addr));
+    }
+
+    public(friend) fun gc_test_helper<Proposal: store + drop>(
+        addr: address,
+    ): vector<BallotID>  acquires Ballots {
+        gc_internal<Proposal>(borrow_global_mut<Ballots<Proposal>>(addr))
+    }
+
+    fun gc_internal<Proposal: store + drop>(
+        ballot_data: &mut Ballots<Proposal>,
+    ): vector<BallotID> {
+        let ballots = &mut ballot_data.ballots;
+        let remove_handle = &mut ballot_data.remove_ballot_handle;
+        let i = 0;
+        let removed_ballots = vector::empty();
+        while ({
+            spec {
+                invariant unique_ballots(ballots);
+                invariant no_expired_ballots(ballots, DiemTimestamp::spec_now_seconds(), i);
+                invariant vector_subset(ballots, old(ballot_data).ballots);
+                invariant i <= len(ballots);
+                invariant 0 <= i;
+            };
+            i < vector::length(ballots)
+        }) {
+            let ballot = vector::borrow(ballots, i);
+            if (ballot.expiration_timestamp_secs < DiemTimestamp::now_seconds()) {
+                let ballot_id = *(&ballot.ballot_id);
+                vector::swap_remove(ballots, i);
+                vector::push_back(&mut removed_ballots, *&ballot_id);
+                event::emit_event<RemoveBallotEvent>(
+                    remove_handle,
+                    RemoveBallotEvent {
+                        ballot_id
+                    },
+                );
+            } else {
+                i = i + 1;
+            };
+        };
+        removed_ballots
+    }
+
+    public(friend) fun remove_ballot_internal<Proposal: store + drop>(
+        account: signer,
+        ballot_id: BallotID,
+    ) acquires Ballots {
+        let addr = signer::address_of(&account);
+        let ballot_data = borrow_global_mut<Ballots<Proposal>>(addr);
+        let ballots = &mut ballot_data.ballots;
+        let remove_handle = &mut ballot_data.remove_ballot_handle;
+        let i = 0;
+        let len = vector::length(ballots);
+        while ({
+            spec { invariant ballot_id_does_not_exist<Proposal>(ballot_id, ballots, i); };
+            i < len
+        }) {
+            if (&vector::borrow(ballots, i).ballot_id == &ballot_id) {
+                vector::swap_remove(ballots, i);
+                event::emit_event<RemoveBallotEvent>(
+                    remove_handle,
+                    RemoveBallotEvent {
+                        ballot_id
+                    },
+                );
+                return ()
+            };
+            i = i + 1;
+        };
+    }
+
+    /// remove_ballot removes the ballot with the provided
+    /// `ballot_id` from the address of the provided `account`
+    /// If a ballot with `ballot_id` is not found, then it
+    /// does nothing
+    public fun remove_ballot<Proposal: store + drop>(
+        account: signer,
+        ballot_id: BallotID,
+    ) acquires Ballots {
+        remove_ballot_internal<Proposal>(account, ballot_id)
+    }
+
+    /// incr_counter increments the counter stored under the signer's
+    /// account
+    fun incr_counter(account: &signer): u64 acquires BallotCounter {
+        let addr = signer::address_of(account);
+        let counter = &mut borrow_global_mut<BallotCounter>(addr).counter;
+        let count = *counter;
+        *counter = *counter + 1;
+        count
+    }
+
+    ///****************************************************************
+    /// Specs
+    ///****************************************************************
+
+    /// I (DD) was experimenting with some new ideas about top-down specification.
+    /// This is a partial specification, but it does have some interesting properties
+    /// and is good for testing the Prover.
+
+    /// A "Ballot" keeps track of an election for a "Proposal" type at a particular address.
+
+    /// To conduct an election at a particular address, there must be a BallotCounter
+    /// published at that address.  This keeps track of a counter that is used to generate
+    /// unique BallotIDs.
+
+    spec module {
+        /// Once the BallotCounter is published, it remains published forever
+        invariant update forall ballot_addr: address where old(exists<BallotCounter>(ballot_addr)):
+            exists<BallotCounter>(ballot_addr);
+
+         /// Once a proposal is initialized, it stays initialized forever.
+         invariant<Proposal> update forall ballot_addr: address
+             where old(exists<Ballots<Proposal>>(ballot_addr)):
+                 exists<Ballots<Proposal>>(ballot_addr);
+    }
+
+    /// Predicate to test if a `Ballots` resource for `Proposal` is published at `ballot_addr`,
+    /// there is a `BallotCounter` published at `ballot_addr`.
+    spec fun ballot_counter_initialized_first<Proposal>(ballot_addr: address): bool {
+        exists<Ballots<Proposal>>(ballot_addr) ==> exists<BallotCounter>(ballot_addr)
+    }
+
+    spec module {
+        // / Whenever there is a Ballots<Proposal> at ballot_address, there is
+        // / a BallotCounter there.
+        // TODO: Because of prover bug, this is temporarily ANDed with another invariant.
+        // invariant<Proposal> forall ballot_addr: address:
+        //     ballot_counter_initialized_first<Proposal>(ballot_addr);
+    }
+
+    // UTILITY FUNCTIONS
+
+    /// Get the ballots vector from published Ballots<Proposal>
+    /// CAUTION: Returns an arbitrary value if no Ballots<Proposal> is publised at ballot_address.
+    spec fun get_ballots<Proposal>(ballot_address: address): vector<Ballot<Proposal>> {
+       global<Ballots<Proposal>>(ballot_address).ballots
+    }
+
+    /// Get the ballot matching ballot_id out of the ballots vector, if it is there.
+    /// CAUTION: Returns a arbitrary value if it's not there.
+    spec fun get_ballot<Proposal>(ballot_address: address, ballot_id: BallotID): Ballot<Proposal> {
+         let ballots = global<Ballots<Proposal>>(ballot_address).ballots;
+         get_ballots<Proposal>(ballot_address)[choose min i in 0..len(ballots) where ballots[i].ballot_id == ballot_id]
+     }
+
+    /// Tests whether ballot_id is represented in the ballots vector. Returns false if there is no
+    /// ballots vector.
+    spec fun ballot_exists<Proposal>(ballot_address: address, ballot_id: BallotID): bool {
+        if (exists<Ballots<Proposal>>(ballot_address)) {
+            let ballots = global<Ballots<Proposal>>(ballot_address).ballots;
+            exists i in 0..len(ballots): ballots[i].ballot_id == ballot_id
+        }
+        else
+            false
+    }
+
+    /// Assuming ballot exists, check if it's expired. Returns an arbitrary result if the
+    /// ballot does not exist.
+    /// NOTE: Maybe this should be "<=" not "<"
+    spec fun is_expired_if_exists<Proposal>(ballot_address: address, ballot_id: BallotID): bool {
+        get_ballot<Proposal>(ballot_address, ballot_id).expiration_timestamp_secs
+            <= DiemTimestamp::spec_now_seconds()
+    }
+
+    // FUNCTIONS REPRESENTING STATES
+
+    /// There is a state machine for every `BallotID<Proposal>`.  Two of the states don't
+    /// need to appear in formal specifications, but they are here for completeness.
+    /// State: unborn -- The `BallotID` has a count that is greater than the count in BallotCounter.
+    ///   So the `BallotID` has not yet been generated, and may be generated in the future.
+    ///   It is not in use, so we won't see values in this state.
+    ///   A `BallotID` in the unborn state may transition to the active state if `create_ballot`
+    ///     generates that `BallotID`.
+    /// State: dead -- The `BallotID` was generated and then was either and accepted (when
+    ///   a call to `vote` causes the vote total to exceed the threshold),
+    ///   or expired and garbage collected.  So, it is no longer in use and we won't see these
+    ///   values.  Note that garbage collection occurs in several functions.
+    /// State active -- The `BallotID` is in a `Ballots<Proposal>.ballots` vector for some Proposal and
+    ///    address.  It is not expired and may eventually be accepted.
+    ///    Active BallotIDs are created and returned by `create_ballot`.
+    ///    An active `BallotID` may transition to the expired state if it is not accepted and the current
+    ///    time exceeds its expiration time, or it may transition to the dead state if it expires and is
+    ///    garbage-collected in the same transaction or if it is accepted.
+    /// State expired -- The `BallotID` is in a `Ballots<Proposal>.ballots` vector for some Proposal and
+    ///    address but is expired.  It will be removed from the ballots vector and change to the dead state
+    ///    if and when it is garbage-collected.
+
+    /// A BallotID is in the expired state if it is in the ballots vector and the
+    /// current time is >= the expiration time.
+    spec fun is_expired<Proposal>(ballot_address: address, ballot_id: BallotID): bool {
+        ballot_exists<Proposal>(ballot_address, ballot_id)
+        && is_expired_if_exists<Proposal>(ballot_address, ballot_id)
+    }
+
+    /// A BallotID is active state if it is in the ballots vector and not expired.
+    spec fun is_active<Proposal>(ballot_address: address, ballot_id: BallotID): bool {
+       ballot_exists<Proposal>(ballot_address, ballot_id)
+       && !is_expired_if_exists<Proposal>(ballot_address, ballot_id)
+    }
+
+    spec create_ballot {
+        /// create_ballot sets up a `Ballots<Proposal>` resource at the `ballot_account`
+        /// address if one does not already exist.
+        ensures exists<Ballots<Proposal>>(signer::address_of(ballot_account));
+
+        /// returns a new active `BallotID`.
+        ensures is_active<Proposal>(signer::address_of(ballot_account), result);
+    }
+
+    /// Returns "true" iff there are no ballots in v at indices less than i whose
+    /// expiration time is less than or equal to the current time.
+    spec fun no_expired_ballots<Proposal>(ballots: vector<Ballot<Proposal>>, now_seconds: u64, i: u64): bool {
+        forall j in 0..i: ballots[j].expiration_timestamp_secs >= now_seconds
+    }
+
+    // This is equivalent to mapping each ballot in v to its ballot_id.
+    // TODO: A map operation in the spec language would be much clearer.
+    spec fun extract_ballot_ids<Proposal>(v: vector<Ballot<Proposal>>): vector<BallotID> {
+        choose result: vector<BallotID> where len(result) == len(v)
+        && (forall i in 0..len(v): result[i] == v[i].ballot_id)
+    }
+
+    /// Common post-conditions for `gc_internal` and `gc_ballots` (which just calls `gc_internal`)
+    spec schema GcEnsures<Proposal> {
+        ballot_data: Ballots<Proposal>;
+        let pre_ballots = ballot_data.ballots;
+        let post post_ballots = ballot_data.ballots;
+
+        /// Ballots afterwards is a subset of ballots before.
+        ensures vector_subset(post_ballots, pre_ballots);
+        /// All expired ballots are removed
+        ensures no_expired_ballots<Proposal>(post_ballots, DiemTimestamp::spec_now_seconds(), len(post_ballots));
+    }
+
+    spec gc_internal {
+        pragma opaque;
+        include GcEnsures<Proposal>;
+        // Note: There is no specification of returned vector of removed ballot ids, because
+        // return value seems not to be used.
+    }
+
+    spec gc_ballots {
+        include GcEnsures<Proposal>{ballot_data: global<Ballots<Proposal>>(addr)};
+    }
+
+    // Lower-level invariants
+
+    // helper functions
+
+    spec fun ballot_ids_have_correct_ballot_address<Proposal>(proposer_address: address): bool {
+       let ballots = get_ballots<Proposal>(proposer_address);
+       forall i in 0..len(ballots): ballots[i].ballot_id.proposer == proposer_address
+    }
+
+    /// Every ballot for Proposal at proposer_address has a ballot counter field that is less
+    /// than the current value of the BallotCounter.counter published at proposer_address.
+    /// This property is necessary to show that the ballot IDs are not repeated in the
+    /// Ballots.ballots vector
+    spec fun existing_ballots_have_small_counters<Proposal>(proposer_address: address): bool {
+        // Just return true if there is no Ballots<Proposal> published at proposer_address
+        // get_ballots may be undefined here, but we only use it when we know the Ballots
+        // is published (in the next property.
+        let ballots = get_ballots<Proposal>(proposer_address);
+        exists<Ballots<Proposal>>(proposer_address)
+        ==> (forall i in 0..len(ballots):
+                ballots[i].ballot_id.counter < global<BallotCounter>(proposer_address).counter)
+    }
+
+     /// Every ballot in Ballots<Proposal>.ballots is active or expired.
+     /// I.e., none have sum >= required.
+     /// TODO: This should be part of is_active/expired, and should follow from an invariant
+     /// that every BallotID is in one of the legal states.
+     spec fun no_winning_ballots_in_vector<Proposal>(proposer_address: address): bool {
+         let ballots = get_ballots<Proposal>(proposer_address);
+         forall i in 0..len(ballots):
+             ballots[i].total_weighted_votes_received < ballots[i].num_votes_required
+     }
+
+    spec module {
+        /// ballots in vector all have the proposer address in their ballot IDs.
+        invariant<Proposal> [suspendable] forall proposer_address: address:
+            ballot_ids_have_correct_ballot_address<Proposal>(proposer_address);
+
+        // / counter values in ballots are all less than the value of the BallotCounter
+        // / See note on spec fun existing_ballots_have_small_counters
+        // TODO: Temporarily commented out because of a prover bug. It is included in
+        // the next property
+        // invariant<Proposal> forall addr: address: existing_ballots_have_small_counters<Proposal>(addr);
+
+        // AND of these two invariants works, but they don't if individual due to a bug.
+        invariant<Proposal>
+            (forall addr: address: existing_ballots_have_small_counters<Proposal>(addr))
+            && (forall ballot_addr: address: ballot_counter_initialized_first<Proposal>(ballot_addr));
+
+        /// Every ballot in the vector has total_weighted_votes_received < num_votes_required
+        /// So the ballot will eventually be removed either by accumulating enough votes or by expiring
+        /// and being garbage-collected
+        invariant<Proposal> forall addr: address: no_winning_ballots_in_vector<Proposal>(addr);
+    }
+
+    /// There are no duplicate Ballot IDs in the Ballots<Proposer>.ballots vector
+    spec fun unique_ballots<Proposal>(ballots: vector<Ballot<Proposal>>): bool {
+        forall i in 0..len(ballots), j in 0..len(ballots):
+            ballots[i].ballot_id == ballots[j].ballot_id ==> i == j
+    }
+
+    /// All `BallotID`s of `Ballot`s in a `Ballots.ballots` vector are unique.
+    spec Ballots {
+        invariant unique_ballots(ballots);
+    }
+
+    /// Asserts that ballot ID is not in ballots vector.  Used in loop invariant
+    /// and post-condition of remove_ballot_internal
+    spec fun ballot_id_does_not_exist<Proposal>(ballot_id: BallotID, ballots: vector<Ballot<Proposal>>, i: u64): bool {
+        forall j in 0..i: ballots[j].ballot_id != ballot_id
+    }
+
+    spec remove_ballot_internal {
+        let post ballots = get_ballots<Proposal>(signer::address_of(account));
+        ensures
+            ballot_id_does_not_exist<Proposal>(ballot_id, ballots, len(ballots));
+    }
+
+    spec remove_ballot {
+       let post ballots = get_ballots<Proposal>(signer::address_of(account));
+       ensures
+           ballot_id_does_not_exist<Proposal>(ballot_id, ballots, len(ballots));
+    }
+
+    spec gc_test_helper {
+        // Just a test function, we don't need to spec it.
+        pragma verify = false;
+    }
+
+    // helper functions
+    spec fun vector_subset<Elt>(v1: vector<Elt>, v2: vector<Elt>): bool {
+        forall e in v1: exists i in 0..len(v2): v2[i] == e
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalConsensusConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalConsensusConfig.move
new file mode 100644
index 000000000..01e5afb05
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalConsensusConfig.move
@@ -0,0 +1,17 @@
+module ExperimentalFramework::ExperimentalConsensusConfig {
+    use std::capability;
+    use CoreFramework::DiemConsensusConfig;
+
+    struct ExperimentalConsensusConfig has drop {}
+
+    public fun initialize(account: &signer) {
+        DiemConsensusConfig::initialize<ExperimentalConsensusConfig>(account);
+        capability::create<ExperimentalConsensusConfig>(account, &ExperimentalConsensusConfig {});
+    }
+
+    public fun set(account: &signer, config: vector<u8>) {
+        DiemConsensusConfig::set(
+            config, &capability::acquire(account, &ExperimentalConsensusConfig {})
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalParallelExecutionConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalParallelExecutionConfig.move
new file mode 100644
index 000000000..12214efc8
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalParallelExecutionConfig.move
@@ -0,0 +1,32 @@
+module ExperimentalFramework::ExperimentalParallelExecutionConfig {
+    use std::capability;
+    use CoreFramework::ParallelExecutionConfig;
+
+    struct ExperimentalParallelExecutionConfig has drop {}
+
+    public fun initialize_parallel_execution(
+        account: &signer,
+    ) {
+        ParallelExecutionConfig::initialize_parallel_execution<ExperimentalParallelExecutionConfig>(account);
+        capability::create<ExperimentalParallelExecutionConfig>(
+            account,
+            &ExperimentalParallelExecutionConfig {}
+        );
+    }
+
+    public fun enable_parallel_execution_with_config(
+        account: &signer,
+        read_write_inference_result: vector<u8>,
+    ) {
+        ParallelExecutionConfig::enable_parallel_execution_with_config(
+            read_write_inference_result,
+            &capability::acquire(account, &ExperimentalParallelExecutionConfig {}),
+        );
+    }
+
+    public fun disable_parallel_execution(account: &signer) {
+        ParallelExecutionConfig::disable_parallel_execution(
+            &capability::acquire(account, &ExperimentalParallelExecutionConfig {}),
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVMConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVMConfig.move
new file mode 100644
index 000000000..be7895119
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVMConfig.move
@@ -0,0 +1,46 @@
+module ExperimentalFramework::ExperimentalVMConfig {
+    use std::capability;
+    use CoreFramework::DiemVMConfig;
+
+    struct ExperimentalVMConfig has drop {}
+
+    /// Publishes the VM config.
+    public fun initialize(
+        account: &signer,
+        instruction_schedule: vector<u8>,
+        native_schedule: vector<u8>,
+    ) {
+        DiemVMConfig::initialize<ExperimentalVMConfig>(account, instruction_schedule, native_schedule);
+        capability::create<ExperimentalVMConfig>(account, &ExperimentalVMConfig {});
+    }
+
+    public fun set_gas_constants(
+        account: &signer,
+        global_memory_per_byte_cost: u64,
+        global_memory_per_byte_write_cost: u64,
+        min_transaction_gas_units: u64,
+        large_transaction_cutoff: u64,
+        intrinsic_gas_per_byte: u64,
+        maximum_number_of_gas_units: u64,
+        min_price_per_gas_unit: u64,
+        max_price_per_gas_unit: u64,
+        max_transaction_size_in_bytes: u64,
+        gas_unit_scaling_factor: u64,
+        default_account_size: u64,
+    ) {
+        DiemVMConfig::set_gas_constants<ExperimentalVMConfig>(
+            global_memory_per_byte_cost,
+            global_memory_per_byte_write_cost,
+            min_transaction_gas_units,
+            large_transaction_cutoff,
+            intrinsic_gas_per_byte,
+            maximum_number_of_gas_units,
+            min_price_per_gas_unit,
+            max_price_per_gas_unit,
+            max_transaction_size_in_bytes,
+            gas_unit_scaling_factor,
+            default_account_size,
+            &capability::acquire(account, &ExperimentalVMConfig {}),
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorConfig.move
new file mode 100644
index 000000000..e3a4d2a19
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorConfig.move
@@ -0,0 +1,25 @@
+module ExperimentalFramework::ExperimentalValidatorConfig {
+    use std::capability;
+    use CoreFramework::ValidatorConfig;
+
+    friend ExperimentalFramework::ExperimentalAccount;
+
+    struct ExperimentalValidatorConfig has drop {}
+
+    public fun initialize(account: &signer) {
+        ValidatorConfig::initialize<ExperimentalValidatorConfig>(account);
+        capability::create(account, &ExperimentalValidatorConfig{});
+    }
+
+    public(friend) fun publish(
+        root_account: &signer,
+        validator_account: &signer,
+        human_name: vector<u8>,
+    ) {
+        ValidatorConfig::publish(
+            validator_account,
+            human_name,
+            capability::acquire(root_account, &ExperimentalValidatorConfig{})
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move
new file mode 100644
index 000000000..4769ea613
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorOperatorConfig.move
@@ -0,0 +1,25 @@
+module ExperimentalFramework::ExperimentalValidatorOperatorConfig {
+    use std::capability;
+    use CoreFramework::ValidatorOperatorConfig;
+
+    friend ExperimentalFramework::ExperimentalAccount;
+
+    struct ExperimentalValidatorOperatorConfig has drop {}
+
+    public fun initialize(account: &signer) {
+        ValidatorOperatorConfig::initialize<ExperimentalValidatorOperatorConfig>(account);
+        capability::create(account, &ExperimentalValidatorOperatorConfig{});
+    }
+
+    public(friend) fun publish(
+        root_account: &signer,
+        validator_operator_account: &signer,
+        human_name: vector<u8>,
+    ) {
+        ValidatorOperatorConfig::publish(
+            validator_operator_account,
+            human_name,
+            capability::acquire(root_account, &ExperimentalValidatorOperatorConfig{})
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorSet.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorSet.move
new file mode 100644
index 000000000..bdf451b77
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalValidatorSet.move
@@ -0,0 +1,33 @@
+module ExperimentalFramework::ExperimentalValidatorSet {
+    use std::capability;
+    use CoreFramework::DiemSystem;
+
+    struct ExperimentalValidatorSet has drop {}
+
+    public fun initialize_validator_set(
+        account: &signer,
+    ) {
+        DiemSystem::initialize_validator_set<ExperimentalValidatorSet>(account);
+        capability::create(account, &ExperimentalValidatorSet {});
+    }
+
+    public fun add_validator(
+        account: &signer,
+        validator_addr: address,
+    ) {
+        DiemSystem::add_validator(
+            validator_addr,
+            capability::acquire(account, &ExperimentalValidatorSet {})
+        );
+    }
+
+    public fun remove_validator(
+        account: &signer,
+        validator_addr: address,
+    ) {
+        DiemSystem::remove_validator(
+            validator_addr,
+            capability::acquire(account, &ExperimentalValidatorSet {})
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVersion.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVersion.move
new file mode 100644
index 000000000..fecbb611c
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/ExperimentalVersion.move
@@ -0,0 +1,21 @@
+/// Maintains the version number for the blockchain.
+module ExperimentalFramework::ExperimentalVersion {
+    use std::capability;
+    use CoreFramework::DiemVersion;
+
+    struct ExperimentalVersion has drop {}
+
+    /// Publishes the Version config.
+    public fun initialize(account: &signer, initial_version: u64) {
+        DiemVersion::initialize<ExperimentalVersion>(account, initial_version);
+        capability::create<ExperimentalVersion>(account, &ExperimentalVersion {});
+    }
+
+    /// Updates the major version to a larger version.
+    public fun set(account: &signer, major: u64) {
+        DiemVersion::set<ExperimentalVersion>(
+            major,
+            &capability::acquire(account, &ExperimentalVersion {}),
+        );
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/README.md b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/README.md
new file mode 100644
index 000000000..5dce27912
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/sources/configs/README.md
@@ -0,0 +1 @@
+See [README for core](../../../core/README.md).
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/MultiTokenTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/MultiTokenTests.move
new file mode 100644
index 000000000..e95b1e865
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/MultiTokenTests.move
@@ -0,0 +1,103 @@
+#[test_only]
+module ExperimentalFramework::MultiTokenTests {
+    use std::guid;
+    use ExperimentalFramework::MultiToken;
+    use ExperimentalFramework::MultiTokenBalance;
+
+    /// A test token type to instantiate generic Tokens with.
+    struct Game has store {
+        name: vector<u8>,
+        edition: u64,
+    }
+
+    const EMINT_FAILED: u64 = 0;
+    const ETRANSFER_FAILED: u64 = 1;
+
+    #[test(admin=@0xa550c18, creator=@0x42, user=@0x43)]
+    public entry fun test_all(admin: signer, creator: signer, user: signer) {
+        /*
+        ===============================================================
+            Initialization + preparation
+        ===============================================================
+        */
+
+        let creator_addr = @0x42;
+        let user_addr = @0x43;
+
+        MultiToken::initialize_multi_token(admin);
+        MultiTokenBalance::publish_balance<Game>(&creator);
+        MultiTokenBalance::publish_balance<Game>(&user);
+
+        let token1_id = guid::create_id(creator_addr, 0);
+        let token2_id = guid::create_id(creator_addr, 1);
+
+        /*
+        ===============================================================
+            Test minting
+        ===============================================================
+        */
+
+        let token1 = MultiToken::create<Game>(
+            &creator,
+            Game { name: b"Mario", edition: 2008 },
+            b"nintendo.com",
+            10
+        );
+        // Add all 10 tokens to creator's own account
+        MultiTokenBalance::add_to_gallery<Game>(creator_addr, token1);
+
+        // Assert creator has the right number of tokens and supply is 10.
+        assert!(MultiTokenBalance::has_token<Game>(creator_addr, &token1_id), EMINT_FAILED);
+        assert!(MultiTokenBalance::get_token_balance<Game>(creator_addr, &token1_id) == 10, EMINT_FAILED);
+        assert!(MultiToken::supply<Game>(&token1_id) == 10, EMINT_FAILED);
+
+        let token2 = MultiToken::create<Game>(
+            &creator,
+            Game { name: b"ChromeDino", edition: 2015 },
+            b"google.com",
+            233
+        );
+        MultiTokenBalance::add_to_gallery<Game>(creator_addr, token2);
+        assert!(MultiTokenBalance::has_token<Game>(creator_addr, &token2_id), EMINT_FAILED);
+        assert!(MultiTokenBalance::get_token_balance<Game>(creator_addr, &token2_id) == 233, EMINT_FAILED);
+
+
+
+        /*
+        ===============================================================
+            Test transferring tokens without splitting of tokens
+        ===============================================================
+        */
+
+        // Transfer 6 units of token1 from creator to user
+        MultiTokenBalance::transfer_multi_token_between_galleries<Game>(
+            creator, // from
+            user_addr, // to
+            6, // amount
+            creator_addr, // token.id.addr
+            0, // token.id.creation_num
+        );
+
+        assert!(MultiTokenBalance::has_token<Game>(creator_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(MultiTokenBalance::get_token_balance<Game>(creator_addr, &token1_id) == 4, ETRANSFER_FAILED);
+        assert!(MultiTokenBalance::has_token<Game>(user_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(MultiTokenBalance::get_token_balance<Game>(user_addr, &token1_id) == 6, ETRANSFER_FAILED);
+        assert!(MultiToken::supply<Game>(&token1_id) == 10, ETRANSFER_FAILED); // supply should not change
+
+
+        /*
+        ===============================================================
+            Test transferring tokens with splitting of tokens
+        ===============================================================
+        */
+
+        // Transfer all 6 units of token1 from user to creator
+        MultiTokenBalance::transfer_multi_token_between_galleries<Game>(
+            user, creator_addr, 6, creator_addr, 0,
+        );
+        assert!(!MultiTokenBalance::has_token<Game>(user_addr, &token1_id), ETRANSFER_FAILED); // user doesn't have token1 anymore
+        assert!(MultiTokenBalance::get_token_balance<Game>(user_addr, &token1_id) == 0, ETRANSFER_FAILED);
+        assert!(MultiTokenBalance::has_token<Game>(creator_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(MultiTokenBalance::get_token_balance<Game>(creator_addr, &token1_id) == 10, ETRANSFER_FAILED);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/NFTTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/NFTTests.move
new file mode 100644
index 000000000..12052f430
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/NFTTests.move
@@ -0,0 +1,205 @@
+#[test_only]
+module 0x1::NFTTests {
+    use std::guid;
+    use 0x1::NFT;
+    use 0x1::NFTGallery;
+    use std::option;
+
+    /// A test token type to instantiate generic Tokens with.
+    struct Game has copy, store, drop {
+        name: vector<u8>,
+        edition: u64,
+    }
+
+    struct Collection has copy, store, drop {
+        name: vector<u8>,
+    }
+
+    struct Pokemon has copy, store, drop {
+        name: vector<u8>,
+        type: vector<u8>,
+    }
+
+    const EMINT_FAILED: u64 = 0;
+    const ETRANSFER_FAILED: u64 = 1;
+    const ECOLLECTION_FAILED: u64 = 2;
+
+    #[test(admin=@0xa550c18, creator=@0x42, user=@0x43)]
+    public entry fun test_all(admin: signer, creator: signer, user: signer) {
+        /*
+        ===============================================================
+            Initialization + preparation
+        ===============================================================
+        */
+
+        let creator_addr = @0x42;
+        let user_addr = @0x43;
+
+        NFT::nft_initialize(admin);
+        NFTGallery::publish_gallery<Game>(&creator);
+        NFTGallery::publish_gallery<Collection>(&creator);
+        NFTGallery::publish_gallery<Pokemon>(&creator);
+        NFTGallery::publish_gallery<Game>(&user);
+
+        let token1_id = guid::create_id(creator_addr, 0);
+        let token2_id = guid::create_id(creator_addr, 1);
+
+        /*
+        ===============================================================
+            Test minting
+        ===============================================================
+        */
+
+        let token1 = NFT::create<Game>(
+            &creator,
+            Game { name: b"Mario", edition: 2008 },
+            b"nintendo.com",
+            10,
+            option::none(),
+        );
+        assert!(NFT::get_balance(&token1) == 10, EMINT_FAILED);
+        assert!(NFT::get_supply(&token1) == 10, EMINT_FAILED);
+        assert!(NFT::get_content_uri(&token1) == b"nintendo.com", EMINT_FAILED);
+        assert!(NFT::get_metadata(&token1) == Game { name: b"Mario", edition: 2008, }, EMINT_FAILED);
+        assert!(NFT::get_parent_id(&token1) == option::none(), EMINT_FAILED);
+
+
+        // Add all 10 tokens to creator's own account
+        NFTGallery::add_to_gallery<Game>(creator_addr, token1);
+
+        // assert! creator has the right number of tokens and supply is 10.
+        assert!(NFTGallery::has_token<Game>(creator_addr, &token1_id), EMINT_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(creator_addr, &token1_id) == 10, EMINT_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(creator_addr, &token1_id) == 10, EMINT_FAILED);
+
+        let token2 = NFT::create<Game>(
+            &creator,
+            Game { name: b"ChromeDino", edition: 2015 },
+            b"google.com",
+            233,
+            option::none(),
+        );
+        NFTGallery::add_to_gallery<Game>(creator_addr, token2);
+        assert!(NFTGallery::has_token<Game>(creator_addr, &token2_id), EMINT_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(creator_addr, &token2_id) == 233, EMINT_FAILED);
+
+
+
+        /*
+        ===============================================================
+            Test collections
+        ===============================================================
+        */
+
+        // Create collection first
+        let collection = NFT::create<Collection>(
+            &creator,
+            Collection { name: b"Pokemon" },
+            b"nintendo.com",
+            1,
+            option::none(),
+        );
+
+        let pikachu = NFT::create<Pokemon>(
+            &creator,
+            Pokemon { name: b"Pikachu", type: b"electric", },
+            b"nintendo.com",
+            10,
+            option::some(NFT::id(&collection)),
+        );
+        let charmander = NFT::create<Pokemon>(
+            &creator,
+            Pokemon { name: b"Charmander", type: b"fire", },
+            b"nintendo.com",
+            10,
+            option::some(NFT::id(&collection)),
+        );
+
+        let pikachu_id = NFT::id(&pikachu);
+        NFTGallery::add_to_gallery<Pokemon>(creator_addr, pikachu);
+        assert!(NFTGallery::get_token_balance<Pokemon>(creator_addr, &pikachu_id) == 10, ECOLLECTION_FAILED);
+        assert!(NFTGallery::get_token_supply<Pokemon>(creator_addr, &pikachu_id) == 10, ECOLLECTION_FAILED);
+        assert!(NFTGallery::get_token_content_uri<Pokemon>(creator_addr, &pikachu_id) == b"nintendo.com", ECOLLECTION_FAILED);
+        assert!(NFTGallery::get_token_metadata<Pokemon>(creator_addr, &pikachu_id) == Pokemon { name: b"Pikachu", type: b"electric", }, ECOLLECTION_FAILED);
+        assert!(NFTGallery::get_token_parent_id<Pokemon>(creator_addr, &pikachu_id) == option::some(NFT::id(&collection)), ECOLLECTION_FAILED);
+
+        NFTGallery::add_to_gallery<Pokemon>(creator_addr, charmander);
+        NFTGallery::add_to_gallery<Collection>(creator_addr, collection);
+
+        /*
+        ===============================================================
+            Test transferring tokens without splitting of tokens
+        ===============================================================
+        */
+
+        // Transfer 6 units of token1 from creator to user
+        NFTGallery::transfer_token_between_galleries_impl<Game>(
+            &creator, // from
+            user_addr, // to
+            6, // amount
+            creator_addr, // token.id.addr
+            0, // token.id.creation_num
+        );
+
+        assert!(NFTGallery::has_token<Game>(creator_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(creator_addr, &token1_id) == 4, ETRANSFER_FAILED);
+        assert!(NFTGallery::has_token<Game>(user_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(user_addr, &token1_id) == 6, ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_supply<Game>(user_addr, &token1_id) == 10, ETRANSFER_FAILED); // supply should not change
+
+
+        /*
+        ===============================================================
+            Test transferring tokens with splitting of tokens
+        ===============================================================
+        */
+
+        // Transfer all 6 units of token1 from user to creator
+        NFTGallery::transfer_token_between_galleries_impl<Game>(
+            &user, creator_addr, 6, creator_addr, 0,
+        );
+        assert!(!NFTGallery::has_token<Game>(user_addr, &token1_id), ETRANSFER_FAILED); // user doesn't have token1 anymore
+        assert!(NFTGallery::get_token_balance<Game>(user_addr, &token1_id) == 0, ETRANSFER_FAILED);
+        assert!(NFTGallery::has_token<Game>(creator_addr, &token1_id), ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(creator_addr, &token1_id) == 10, ETRANSFER_FAILED);
+
+        /*
+        ===============================================================
+            Test tokens with inline data
+        ===============================================================
+        */
+        let nft = NFT::create<Game>(
+            &creator,
+            Game { name: b"Mario", edition: 2008 },
+            b"nintendo.com",
+            1,
+            option::none(),
+        );
+        assert!(NFT::is_data_inlined(&nft), EMINT_FAILED);
+        assert!(NFT::get_balance(&nft) == 1, EMINT_FAILED);
+        assert!(NFT::get_supply(&nft) == 1, EMINT_FAILED);
+        assert!(NFT::get_content_uri(&nft) == b"nintendo.com", EMINT_FAILED);
+        assert!(NFT::get_metadata(&nft) == Game { name: b"Mario", edition: 2008, }, EMINT_FAILED);
+        assert!(NFT::get_parent_id(&nft) == option::none(), EMINT_FAILED);
+
+        let nft_id = NFT::id(&nft);
+        let nft_creator_addr = guid::id_creator_address(&nft_id);
+        let nft_creation_num = guid::id_creation_num(&nft_id);
+        NFTGallery::add_to_gallery<Game>(creator_addr, nft);
+        assert!(NFTGallery::has_token<Game>(creator_addr, &nft_id), EMINT_FAILED);
+
+
+        NFTGallery::transfer_token_between_galleries_impl<Game>(
+            &creator, // from
+            user_addr, // to
+            1, // amount
+            nft_creator_addr, // token.id.addr
+            nft_creation_num, // token.id.creation_num
+        );
+        assert!(!NFTGallery::has_token<Game>(creator_addr, &nft_id), ETRANSFER_FAILED);
+        assert!(NFTGallery::has_token<Game>(user_addr, &nft_id), ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_balance<Game>(user_addr, &nft_id) == 1, ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_supply<Game>(user_addr, &nft_id) == 1, ETRANSFER_FAILED);
+        assert!(NFTGallery::get_token_metadata<Game>(user_addr, &nft_id) == Game { name: b"Mario", edition: 2008, }, ETRANSFER_FAILED);
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move
new file mode 100644
index 000000000..af62356ea
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move
@@ -0,0 +1,302 @@
+#[test_only]
+module ExperimentalFramework::VoteTests {
+
+    use std::bcs;
+    use std::signer;
+    use std::unit_test;
+    use std::vector;
+    use CoreFramework::DiemTimestamp;
+    use ExperimentalFramework::Genesis;
+    use ExperimentalFramework::Vote;
+
+    struct TestProposal has store, copy, drop {
+        test_data: u8,
+    }
+
+    fun get_proposer(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    fun get_three_voters(): (signer, address, signer, address, signer, address) {
+        let signers = &mut unit_test::create_signers_for_testing(3);
+        let voter1 = vector::pop_back(signers);
+        let voter2 = vector::pop_back(signers);
+        let voter3 = vector::pop_back(signers);
+        let voter1_address = signer::address_of(&voter1);
+        let voter2_address = signer::address_of(&voter2);
+        let voter3_address = signer::address_of(&voter3);
+        (voter1, voter1_address, voter2, voter2_address, voter3, voter3_address)
+    }
+
+    fun vote_test_helper(
+        dr: &signer,
+        expiration_timestamp_secs: u64,
+    ) : (signer, signer, signer, Vote::BallotID, TestProposal) {
+        let (voter1, voter1_address, voter2, voter2_address, voter3, voter3_address) = get_three_voters();
+        let approvers = vector::empty();
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(1, bcs::to_bytes(&voter1_address)));
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(1, bcs::to_bytes(&voter2_address)));
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(1, bcs::to_bytes(&voter3_address)));
+
+        let (proposer, _addr, _addr_bcs) = ballot_setup(dr);
+        let proposal = TestProposal {
+            test_data: 1,
+        };
+        let ballot_id = Vote::create_ballot(
+            &proposer, // ballot_account
+            *(&proposal), // proposal
+            b"test_proposal", // proposal_type
+            2, // num_votes_required
+            approvers, // allowed_voters
+            expiration_timestamp_secs, // expiration_timestamp_secs
+        );
+        (voter1, voter2, voter3, ballot_id, proposal)
+    }
+
+    fun ballot_setup(dr: &signer): (signer, address, vector<u8>) {
+        Genesis::setup(dr);
+        let proposer = get_proposer();
+        let addr = signer::address_of(&proposer);
+        let addr_bcs = bcs::to_bytes(&addr);
+        (proposer, addr, addr_bcs)
+    }
+
+    #[test(dr = @CoreResources)]
+    fun create_ballot_success(dr: signer) {
+        let (proposer, addr, addr_bcs) = ballot_setup(&dr);
+        let ballot_id = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))),
+            10,
+        );
+        assert!(&ballot_id == &Vote::new_ballot_id(0, addr), 0);
+
+        let ballot_id = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))),
+            10,
+        );
+        assert!(&ballot_id == &Vote::new_ballot_id(1, addr), 0);
+
+        let ballot_id = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, addr_bcs)),
+            10,
+        );
+        assert!(&ballot_id == &Vote::new_ballot_id(2, addr), 0);
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 263, location = Vote)]
+    fun create_ballot_expired_timestamp(dr: signer) {
+        let (proposer, _, addr_bcs) = ballot_setup(&dr);
+        Vote::create_ballot(
+            &proposer, // ballot_account
+            TestProposal { // proposal
+                test_data: 1,
+            },
+            b"test_proposal", // proposal_type
+            1, // num_votes_required
+            vector::singleton(Vote::new_weighted_voter(1, addr_bcs)), // allowed_voters
+            0, // expiration_timestamp_secs
+        );
+    }
+
+    #[test(vm = @VMReserved, dr = @CoreResources)]
+    fun gc_internal(vm: signer, dr: signer) {
+        let (proposer, addr, addr_bcs) = ballot_setup(&dr);
+        let _ballot_id1 = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))),
+            1,
+        );
+
+        let _ballot_id2 = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))),
+            2,
+        );
+
+        let _ballot_id3 = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))),
+            3,
+        );
+
+        let _ballot_id4 = Vote::create_ballot(
+            &proposer,
+            TestProposal {
+                test_data: 1,
+            },
+            b"test_proposal",
+            1,
+            vector::singleton(Vote::new_weighted_voter(1, addr_bcs)),
+            4,
+        );
+
+        DiemTimestamp::update_global_time(&vm, @0xCAFE, 3000000);
+        let remove_ballots = Vote::gc_test_helper<TestProposal>(addr);
+        assert!(vector::length(&remove_ballots) == 2, 0);
+        assert!(&vector::pop_back(&mut remove_ballots) == &Vote::new_ballot_id(1, addr), 0);
+        assert!(&vector::pop_back(&mut remove_ballots) == &Vote::new_ballot_id(0, addr), 0);
+    }
+
+    // TODO: test disabled due to timeout
+    /*
+        #[test(dr = @CoreResources)]
+        #[expected_failure(abort_code = 520, location = Vote)]
+        fun create_ballots_too_many(dr: signer) {
+            let (proposer, _, addr_bcs) = ballot_setup(&dr);
+            let i = 0;
+            // limit is 256
+            while (i <= 257) {
+                Vote::create_ballot(
+                    &proposer, // ballot_account
+                    TestProposal { // proposal
+                        test_data: 1,
+                    },
+                    b"test_proposal", // proposal_type
+                    1, // num_votes_required
+                    Vector::singleton(Vote::new_weighted_voter(1, *(&addr_bcs))), // allowed_voters
+                    10, // expiration_timestamp_secs
+                );
+                i = i + 1;
+            }
+        }
+    */
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 769, location = Vote)]
+    fun remove_ballot(dr: signer) {
+        let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
+        Vote::remove_ballot_internal<TestProposal>(get_proposer(), *(&ballot_id));
+        // Vote fails because there is no ballot
+        Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal));
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 769, location = Vote)]
+    fun vote_simple(dr: signer) {
+        let (voter1, voter2, voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
+        // First vote does not approve the ballot
+        assert!(!Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal)), 0);
+        // Second vote approves the ballot
+        assert!(Vote::vote(&voter2, *(&ballot_id), b"test_proposal", *(&proposal)), 0);
+        // Third vote aborts
+        Vote::vote(&voter3, *(&ballot_id), b"test_proposal", *(&proposal));
+    }
+
+    #[test(dr = @CoreResources)]
+    fun vote_weighted(dr: signer) {
+        let (voter1, voter1_address, voter2, voter2_address, _voter3, voter3_address) = get_three_voters();
+        let approvers = vector::empty();
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(3, bcs::to_bytes(&voter1_address)));
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(4, bcs::to_bytes(&voter2_address)));
+        vector::push_back(&mut approvers, Vote::new_weighted_voter(2, bcs::to_bytes(&voter3_address)));
+
+        let (proposer, _addr, _addr_bcs) = ballot_setup(&dr);
+        let proposal = TestProposal {
+            test_data: 1,
+        };
+        let ballot_id = Vote::create_ballot(
+            &proposer, // ballot_account
+            *(&proposal), // proposal
+            b"test_proposal", // proposal_type
+            7, // num_votes_required
+            approvers, // allowed_voters
+            10, // expiration_timestamp_secs
+        );
+
+
+        // First vote does not approve the ballot
+        assert!(!Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal)), 0);
+        // Second vote approves the ballot
+        assert!(Vote::vote(&voter2, *(&ballot_id), b"test_proposal", *(&proposal)), 0);
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 263, location = Vote)]
+    fun vote_expired_ts(dr: signer) {
+        let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 0);
+        // Ballot has expired
+        Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal));
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 2049, location = Vote)]
+    fun vote_repeat(dr: signer) {
+        let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
+        // First vote does not approve the ballot
+        assert!(!Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal)), 0);
+        // Cannot vote again
+        Vote::vote(&voter1, *(&ballot_id), b"test_proposal", *(&proposal));
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 1031, location = Vote)]
+    fun vote_invalid_proposal_type(dr: signer) {
+        let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
+        // Invalid proposal type
+        Vote::vote(&voter1, *(&ballot_id), b"invalid", *(&proposal));
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 1031, location = Vote)]
+    fun vote_invalid_proposal(dr: signer) {
+        let (voter1, _voter2, _voter3, ballot_id, _proposal) = vote_test_helper(&dr, 10);
+        let invalid_proposal = TestProposal {
+            test_data: 100,
+        };
+        // Invalid proposal
+        Vote::vote(&voter1, *(&ballot_id), b"test_proposal", invalid_proposal);
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 769, location = Vote)]
+    fun vote_invalid_ballotid(dr: signer) {
+        let proposer = get_proposer();
+        let (voter1, _voter2, _voter3, _ballot_id, proposal) = vote_test_helper(&dr, 10);
+        let invalid_ballotid = Vote::new_ballot_id(100, signer::address_of(&proposer));
+        // Invalid ballotid
+        Vote::vote(&voter1, invalid_ballotid, b"test_proposal", proposal);
+    }
+
+    #[test(dr = @CoreResources)]
+    #[expected_failure(abort_code = 1281, location = Vote)]
+    fun vote_invalid_voter(dr: signer) {
+        let (_voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
+        let invalid_voter = vector::pop_back(&mut unit_test::create_signers_for_testing(4));
+        Vote::vote(&invalid_voter, ballot_id, b"test_proposal", proposal);
+    }
+
+}
diff --git a/vendors/move/crates/documentation/examples/diem-framework/prove_all.sh b/vendors/move/crates/documentation/examples/diem-framework/prove_all.sh
new file mode 100644
index 000000000..d5ed1a864
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/prove_all.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- prove
diff --git a/vendors/move/crates/documentation/examples/diem-framework/test_all.sh b/vendors/move/crates/documentation/examples/diem-framework/test_all.sh
new file mode 100644
index 000000000..d82ab2ce3
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/diem-framework/test_all.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- test
diff --git a/vendors/move/crates/documentation/examples/experimental/basic-coin/Move.toml b/vendors/move/crates/documentation/examples/experimental/basic-coin/Move.toml
new file mode 100644
index 000000000..48547e2dc
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/basic-coin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+BasicCoin = "0xBC"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/examples/experimental/basic-coin/sources/BasicCoin.move b/vendors/move/crates/documentation/examples/experimental/basic-coin/sources/BasicCoin.move
new file mode 100644
index 000000000..07afeca9a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/basic-coin/sources/BasicCoin.move
@@ -0,0 +1,150 @@
+/// This module defines a minimal and generic Coin and Balance.
+module BasicCoin::BasicCoin {
+    use std::error;
+    use std::signer;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+    const EALREADY_INITIALIZED: u64 = 3;
+    const EEQUAL_ADDR: u64 = 4;
+
+    struct Coin<phantom CoinType> has store {
+        value: u64
+    }
+
+    struct Balance<phantom CoinType> has key {
+        coin: Coin<CoinType>
+    }
+
+    public fun publish_balance<CoinType>(account: &signer) {
+        let empty_coin = Coin<CoinType> { value: 0 };
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), error::already_exists(EALREADY_HAS_BALANCE));
+        move_to(account, Balance<CoinType> { coin:  empty_coin });
+    }
+
+    spec publish_balance {
+        include Schema_publish<CoinType> {addr: signer::address_of(account), amount: 0};
+    }
+
+    spec schema Schema_publish<CoinType> {
+        addr: address;
+        amount: u64;
+
+        aborts_if exists<Balance<CoinType>>(addr);
+
+        ensures exists<Balance<CoinType>>(addr);
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+
+        ensures balance_post == amount;
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the minting policy.
+    public fun mint<CoinType: drop>(mint_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Deposit `amount` of tokens to mint_addr's balance
+        deposit(mint_addr, Coin<CoinType> { value: amount });
+    }
+
+    spec mint {
+        include DepositSchema<CoinType> {addr: mint_addr, amount};
+    }
+
+    /// Burn `amount` tokens from `burn_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the burning policy.
+    public fun burn<CoinType: drop>(burn_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Withdraw `amount` of tokens from mint_addr's balance
+        let Coin { value: _ } = withdraw<CoinType>(burn_addr, amount);
+    }
+
+    spec burn {
+        // TBD
+    }
+
+
+    public fun balance_of<CoinType>(owner: address): u64 acquires Balance {
+        borrow_global<Balance<CoinType>>(owner).coin.value
+    }
+
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the transferring policy.
+    public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance {
+        let from_addr = signer::address_of(from);
+        assert!(from_addr != to, EEQUAL_ADDR);
+        let check = withdraw<CoinType>(from_addr, amount);
+        deposit<CoinType>(to, check);
+    }
+
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr_from);
+        aborts_if !exists<Balance<CoinType>>(to);
+        aborts_if balance_from < amount;
+        aborts_if balance_to + amount > MAX_U64;
+        aborts_if addr_from == to;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+
+    fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+        let balance = balance_of<CoinType>(addr);
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin<CoinType> { value: amount }
+    }
+
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures result == Coin<CoinType> { value: amount };
+        ensures balance_post == balance - amount;
+    }
+
+    fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance{
+        let balance = balance_of<CoinType>(addr);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+
+    spec schema DepositSchema<CoinType> {
+        addr: address;
+        amount: u64;
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + amount > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + amount;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/coin-swap/Move.toml b/vendors/move/crates/documentation/examples/experimental/coin-swap/Move.toml
new file mode 100644
index 000000000..fc9dbf64b
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/coin-swap/Move.toml
@@ -0,0 +1,14 @@
+[package]
+name = "CoinSwap"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+CoinSwap = "0xC5"
+BasicCoin = "0xBC"
+GoldCoin = "0x9C"
+SilverCoin = "0x5C"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
+BasicCoin = { local = "../basic-coin"}
diff --git a/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/CoinSwap.move b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/CoinSwap.move
new file mode 100644
index 000000000..e97b7112a
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/CoinSwap.move
@@ -0,0 +1,109 @@
+module CoinSwap::CoinSwap {
+    use std::signer;
+    use std::error;
+    use BasicCoin::BasicCoin;
+    use CoinSwap::PoolToken;
+
+    const ECOINSWAP_ADDRESS: u64 = 0;
+    const EPOOL: u64 = 0;
+
+    struct LiquidityPool<phantom CoinType1, phantom CoinType2> has key {
+        coin1: u64,
+        coin2: u64,
+        share: u64,
+    }
+
+    public fun create_pool<CoinType1: drop, CoinType2: drop>(
+        coinswap: &signer,
+        requester: &signer,
+        coin1: u64,
+        coin2: u64,
+        share: u64,
+        witness1: CoinType1,
+        witness2: CoinType2
+    ) {
+        // Create a pool at @CoinSwap.
+        // TODO: If the balance is already published, this step should be skipped rather than abort.
+        // TODO: Alternatively, `struct LiquidityPool` could be refactored to actually hold the coin (e.g., coin1: CoinType1).
+        BasicCoin::publish_balance<CoinType1>(coinswap);
+        BasicCoin::publish_balance<CoinType2>(coinswap);
+        assert!(signer::address_of(coinswap) == @CoinSwap, error::invalid_argument(ECOINSWAP_ADDRESS));
+        assert!(!exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), error::already_exists(EPOOL));
+        move_to(coinswap, LiquidityPool<CoinType1, CoinType2>{coin1, coin2, share});
+
+        // Transfer the initial liquidity of CoinType1 and CoinType2 to the pool under @CoinSwap.
+        BasicCoin::transfer<CoinType1>(requester, signer::address_of(coinswap), coin1, witness1);
+        BasicCoin::transfer<CoinType2>(requester, signer::address_of(coinswap), coin2, witness2);
+
+        // Mint PoolToken and deposit it in the account of requester.
+        PoolToken::setup_and_mint<CoinType1, CoinType2>(requester, share);
+    }
+
+    fun get_input_price(input_amount: u64, input_reserve: u64, output_reserve: u64): u64 {
+        let input_amount_with_fee = input_amount * 997;
+        let numerator = input_amount_with_fee * output_reserve;
+        let denominator = (input_reserve * 1000) + input_amount_with_fee;
+        numerator / denominator
+    }
+
+    public fun coin1_to_coin2_swap_input<CoinType1: drop, CoinType2: drop>(
+        coinswap: &signer,
+        requester: &signer,
+        coin1: u64,
+        witness1: CoinType1,
+        witness2: CoinType2
+    ) acquires LiquidityPool {
+        assert!(signer::address_of(coinswap) == @CoinSwap, error::invalid_argument(ECOINSWAP_ADDRESS));
+        assert!(exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), error::not_found(EPOOL));
+        let pool = borrow_global_mut<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap));
+        let coin2 = get_input_price(coin1, pool.coin1, pool.coin2);
+        pool.coin1 = pool.coin1 + coin1;
+        pool.coin2 = pool.coin2 - coin2;
+
+        BasicCoin::transfer<CoinType1>(requester, signer::address_of(coinswap), coin1, witness1);
+        BasicCoin::transfer<CoinType2>(coinswap, signer::address_of(requester), coin2, witness2);
+    }
+
+    public fun add_liquidity<CoinType1: drop, CoinType2: drop>(
+        account: &signer,
+        coin1: u64,
+        coin2: u64,
+        witness1: CoinType1,
+        witness2: CoinType2,
+    ) acquires LiquidityPool {
+        let pool = borrow_global_mut<LiquidityPool<CoinType1, CoinType2>>(@CoinSwap);
+
+        let coin1_added = coin1;
+        let share_minted = (coin1_added * pool.share) / pool.coin1;
+        let coin2_added = (share_minted * pool.coin2) / pool.share;
+
+        pool.coin1 = pool.coin1 + coin1_added;
+        pool.coin2 = pool.coin2 + coin2_added;
+        pool.share = pool.share + share_minted;
+
+        BasicCoin::transfer<CoinType1>(account, @CoinSwap, coin1, witness1);
+        BasicCoin::transfer<CoinType2>(account, @CoinSwap, coin2, witness2);
+        PoolToken::mint<CoinType1, CoinType2>(signer::address_of(account), share_minted)
+    }
+
+    public fun remove_liquidity<CoinType1: drop, CoinType2: drop>(
+        coinswap: &signer,
+        requester: &signer,
+        share: u64,
+        witness1: CoinType1,
+        witness2: CoinType2,
+    ) acquires LiquidityPool {
+        let pool = borrow_global_mut<LiquidityPool<CoinType1, CoinType2>>(@CoinSwap);
+
+        let coin1_removed = (pool.coin1 * share) / pool.share;
+        let coin2_removed = (pool.coin2 * share) / pool.share;
+
+        pool.coin1 = pool.coin1 - coin1_removed;
+        pool.coin2 = pool.coin2 - coin2_removed;
+        pool.share = pool.share - share;
+
+        BasicCoin::transfer<CoinType1>(coinswap, signer::address_of(requester), coin1_removed, witness1);
+        BasicCoin::transfer<CoinType2>(coinswap, signer::address_of(requester), coin2_removed, witness2);
+        PoolToken::burn<CoinType1, CoinType2>(signer::address_of(requester), share)
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/GoldCoin.move b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/GoldCoin.move
new file mode 100644
index 000000000..75d1a8dd2
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/GoldCoin.move
@@ -0,0 +1,15 @@
+module GoldCoin::GoldCoin {
+    use std::signer;
+    use BasicCoin::BasicCoin;
+
+    struct GoldCoin has drop {}
+
+    public fun setup_and_mint(account: &signer, amount: u64) {
+        BasicCoin::publish_balance<GoldCoin>(account);
+        BasicCoin::mint<GoldCoin>(signer::address_of(account), amount, GoldCoin{});
+    }
+
+    public fun transfer(from: &signer, to: address, amount: u64) {
+        BasicCoin::transfer<GoldCoin>(from, to, amount, GoldCoin {});
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/PoolToken.move b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/PoolToken.move
new file mode 100644
index 000000000..827b0b699
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/PoolToken.move
@@ -0,0 +1,25 @@
+module CoinSwap::PoolToken {
+    use std::signer;
+    use BasicCoin::BasicCoin;
+
+    struct PoolToken<phantom CoinType1, phantom CoinType2> has drop {}
+
+    public fun setup_and_mint<CoinType1, CoinType2>(account: &signer, amount: u64) {
+        BasicCoin::publish_balance<PoolToken<CoinType1, CoinType2>>(account);
+        BasicCoin::mint<PoolToken<CoinType1, CoinType2>>(signer::address_of(account), amount, PoolToken {});
+    }
+
+    public fun transfer<CoinType1, CoinType2>(from: &signer, to: address, amount: u64) {
+        BasicCoin::transfer<PoolToken<CoinType1, CoinType2>>(from, to, amount, PoolToken<CoinType1, CoinType2> {});
+    }
+
+    public fun mint<CoinType1, CoinType2>(mint_addr: address, amount: u64) {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        BasicCoin::mint(mint_addr, amount, PoolToken<CoinType1, CoinType2> {});
+    }
+
+    public fun burn<CoinType1, CoinType2>(burn_addr: address, amount: u64) {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        BasicCoin::burn(burn_addr, amount, PoolToken<CoinType1, CoinType2> {});
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/SilverCoin.move b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/SilverCoin.move
new file mode 100644
index 000000000..d0b276cba
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/coin-swap/sources/SilverCoin.move
@@ -0,0 +1,15 @@
+module SilverCoin::SilverCoin {
+    use std::signer;
+    use BasicCoin::BasicCoin;
+
+    struct SilverCoin has drop {}
+
+    public fun setup_and_mint(account: &signer, amount: u64) {
+        BasicCoin::publish_balance<SilverCoin>(account);
+        BasicCoin::mint<SilverCoin>(signer::address_of(account), amount, SilverCoin {});
+    }
+
+    public fun transfer(from: &signer, to: address, amount: u64) {
+        BasicCoin::transfer<SilverCoin>(from, to, amount, SilverCoin {});
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/math-puzzle/Move.toml b/vendors/move/crates/documentation/examples/experimental/math-puzzle/Move.toml
new file mode 100644
index 000000000..981ea2118
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/math-puzzle/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "math-puzzle"
+version = "0.0.0"
diff --git a/vendors/move/crates/documentation/examples/experimental/math-puzzle/README.md b/vendors/move/crates/documentation/examples/experimental/math-puzzle/README.md
new file mode 100644
index 000000000..a27261429
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/math-puzzle/README.md
@@ -0,0 +1,63 @@
+# Math Puzzle
+
+This package contains an example that solves a math puzzle using Move Prover.
+
+## Puzzle description
+
+```
+Find a,b,...,h such that:
+
+1 <= a,b,...,h <= 9
+
+    a b c
+  +   d e
+  -------
+    f g h
+
+a is the double of c
+b is less than h
+c is equal to e
+d is equal to f
+e is less than or equal to 3
+f is odd
+g is even
+h is greater than or equal to 5
+```
+
+## Solving the puzzle using Move Prover
+
+In `sources/puzzlie.move`, the function `Puzzle::puzzle` is constructed to take 8 numbers (i.e., `a`, `b`, ..., `h`) and abort if the input does not satisfy any rule of the puzzle. In addition, the spec block for the function is added to assert that the function always aborts, in other words, there is no input that satisfies all the rule. The Move Prover will disprove the function specification giving a counter-example which satisfies all of the puzzle rules. It will become the solution of the puzzle.
+
+Use the following command to run Move Prover:
+```
+move prove
+```
+
+The following is the expected output of Move Prover:
+```
+    error: function does not abort under this condition
+    |- /Users/jkpark/puzzle.move:53:9
+    |
+ 36 |         aborts_if true;
+    |         ^^^^^^^^^^^^^^^
+    |
+    =     at /Users/jkpark/puzzle.move:28: puzzle
+    =         a = 6
+    =         b = 5
+    =         c = 3
+    =         d = 7
+    =         e = 3
+    =         f = 7
+    =         g = 2
+    =         h = 6
+    ...
+```
+
+## Solution
+
+```
+    a b c        6 5 3
+  +   d e      +   7 3
+  -------      -------
+    f g h        7 2 6
+```
diff --git a/vendors/move/crates/documentation/examples/experimental/math-puzzle/sources/puzzle.move b/vendors/move/crates/documentation/examples/experimental/math-puzzle/sources/puzzle.move
new file mode 100644
index 000000000..f2088dbd9
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/math-puzzle/sources/puzzle.move
@@ -0,0 +1,33 @@
+module 0x42::Puzzle {
+    fun assert0(b: bool) {
+        assert!(b, 0);
+    }
+
+    fun puzzle(a: u64, b: u64, c: u64, d: u64, e: u64, f: u64, g: u64, h: u64) {
+        assert0(1 <= a && a <= 9);         // 1 <= a <= 9
+        assert0(1 <= b && b <= 9);         // 1 <= b <= 9
+        assert0(1 <= c && c <= 9);         // 1 <= c <= 9
+        assert0(1 <= d && d <= 9);         // 1 <= d <= 9
+        assert0(1 <= e && e <= 9);         // 1 <= e <= 9
+        assert0(1 <= f && f <= 9);         // 1 <= f <= 9
+        assert0(1 <= g && g <= 9);         // 1 <= g <= 9
+        assert0(1 <= h && h <= 9);         // 1 <= h <= 9
+
+        assert0(a == c*2);                 // a is the double of c
+        assert0(b < h);                    // b is less than h
+        assert0(c == e);                   // c is equal to e
+        assert0(d == f);                   // d is equal to f
+        assert0(e <= 3);                   // e is less than or equal to 3
+        assert0(f % 2 == 1);               // f is odd
+        assert0(g % 2 == 0);               // g is even
+        assert0(h >= 5);                   // h is greater than or equal to 5
+
+        assert0((c+e)%10 == h);            //      a b c
+        let carry = (c+e)/10;              //    +   d e
+        assert0((b+d+carry)%10 == g);      //    -------
+        assert0(a+(b+d+carry)/10 == f);    //      f g h
+    }
+    spec puzzle {
+        aborts_if true;                    // specifies that this fun always aborts.
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/rounding-error/Move.toml b/vendors/move/crates/documentation/examples/experimental/rounding-error/Move.toml
new file mode 100644
index 000000000..1cb26f047
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/rounding-error/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "RoundingError"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Reserve.move b/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Reserve.move
new file mode 100644
index 000000000..aaffd36ca
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Reserve.move
@@ -0,0 +1,89 @@
+module NamedAddr::Reserve {
+    use std::fixed_point32::{Self, FixedPoint32};
+
+    const ADMIN: address = @NamedAddr;
+
+    struct ReserveComponent has store {
+        backing_value: u64,
+        backing_ratio: FixedPoint32,
+    }
+
+    struct Coin1Info has key {
+        total_value: u64,
+        reserve_coin2: ReserveComponent,
+    }
+
+    public fun mint_coin1(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+    spec mint_coin1 {
+        let coin1info = global<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::spec_multiply_u64(amount_to_mint, coin1info.reserve_coin2.backing_ratio) + 1;
+        aborts_if amount_to_mint == 0;
+        aborts_if backing_coin2 != coin2_amount_to_reserve;
+        aborts_if global<Coin1Info>(ADMIN).total_value + amount_to_mint > MAX_U64;
+        aborts_if coin1info.reserve_coin2.backing_value + backing_coin2 > MAX_U64;
+        aborts_if !exists<Coin1Info>(ADMIN);
+
+        ensures global<Coin1Info>(ADMIN).total_value == old(global<Coin1Info>(ADMIN).total_value) + amount_to_mint;
+        ensures global<Coin1Info>(ADMIN).reserve_coin2.backing_value == old(global<Coin1Info>(ADMIN).reserve_coin2.backing_value) + backing_coin2;
+        ensures backing_coin2 == coin2_amount_to_reserve;
+    }
+
+    public fun mint_coin1_incorrect(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+
+    public fun burn_coin1(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    public fun burn_coin1_incorrect(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    fun mint_and_burn(amount_to_mint: u64, backing_coin2: u64): u64 acquires Coin1Info{
+        let coin1 = mint_coin1(amount_to_mint, backing_coin2);
+        let coin2 = burn_coin1(coin1);
+        spec {
+            assert coin2 <= backing_coin2;
+        };
+        coin2
+    }
+
+    spec module {
+        invariant exists<Coin1Info>(ADMIN) ==>
+            global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio == fixed_point32::spec_create_from_rational(1, 2);
+
+        invariant
+            exists<Coin1Info>(ADMIN) ==>
+            fixed_point32::spec_multiply_u64(global<Coin1Info>(ADMIN).total_value, global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio)
+                <= global<Coin1Info>(ADMIN).reserve_coin2.backing_value;
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Uniswap.move b/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Uniswap.move
new file mode 100644
index 000000000..1f24eb5ee
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/rounding-error/sources/Uniswap.move
@@ -0,0 +1,130 @@
+module NamedAddr::Uniswap {
+
+    const PoolAddr: address = @NamedAddr;
+
+    struct Pool has key {
+        coin1: u64,
+        coin2: u64,
+        total_share: u64
+    }
+
+    fun getInputPrice(input_amount: u64, input_reserve: u64, output_reserve: u64): u64 {
+        let input_amount_with_fee = input_amount * 997;
+        let numerator = input_amount_with_fee * output_reserve;
+        let denominator = (input_reserve * 1000) + input_amount_with_fee;
+        numerator / denominator
+    }
+    public fun coin1_to_coin2_swap_code(coin1_in: u64): u64 acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        let coin2_out = getInputPrice(coin1_in, pool.coin1, pool.coin2);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_code {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
+    }
+
+    // https://hackmd.io/@HaydenAdams/HJ9jLsfTz?type=view#ETH-%E2%87%84-ERC20-Trades
+    public fun coin1_to_coin2_swap_whitepaper(coin1_in: u64): u64 acquires Pool {
+        assert! (coin1_in > 0, 1);
+        let fee = coin1_in * 3 / 1000; // 0.3%
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+            assume pool.coin1 == 1337;
+            assume pool.coin2 == 252;
+        };
+        let inv = pool.coin1 * pool.coin2; // `inv` may need to be u128
+        let new_pool_coin1 = pool.coin1 + coin1_in;
+        let new_pool_coin2 = inv / (new_pool_coin1 - fee); // No div-by-zero because (new_pool_coin1 - fee) cannot be 0.
+        let coin2_out = pool.coin2 - new_pool_coin2;
+        pool.coin1 = new_pool_coin1;
+        pool.coin2 = new_pool_coin2;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_whitepaper {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 < new_pool.coin1;
+        ensures old_pool.coin2 >= new_pool.coin2;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    public fun add_liquidity(coin1_in: u64, coin2_in: u64): u64 // returns liquidity share
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+
+        let coin1_added = coin1_in;
+        let share_minted = (coin1_added * pool.total_share) / pool.coin1;
+        let coin2_added = (share_minted * pool.coin2) / pool.total_share;
+        // let coin2_added = (coin1_added  * pool.coin2 ) / pool.coin1; // alternatively ...
+
+        assert!(coin2_in == coin2_added, 1);
+
+        pool.coin1 = pool.coin1 + coin1_added;
+        pool.coin2 = pool.coin2 + coin2_added;
+        pool.total_share = pool.total_share + share_minted;
+
+        share_minted
+    }
+    spec add_liquidity {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 <= new_pool.coin1;
+        ensures old_pool.coin2 <= new_pool.coin2;
+        ensures old_pool.total_share <= new_pool.total_share;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    public fun remove_liquidity(share: u64): (u64, u64) // returns (coin1, coin2)
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+
+        let coin1_removed = (pool.coin1 * share) / pool.total_share;
+        let coin2_removed = (pool.coin2 * share) / pool.total_share;
+
+        pool.coin1 = pool.coin1 - coin1_removed;
+        pool.coin2 = pool.coin2 - coin2_removed;
+        pool.total_share = pool.total_share - share;
+
+        (coin1_removed, coin2_removed)
+    }
+    spec remove_liquidity {
+        pragma verify=false;
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 <= new_pool.coin1;
+        ensures old_pool.coin2 <= new_pool.coin2;
+        ensures old_pool.total_share <= new_pool.total_share;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    // #[test] // TODO: cannot specify the test-only functions
+    fun no_free_money_theorem(coin1_in: u64, coin2_in: u64): (u64, u64) acquires Pool {
+        let share = add_liquidity(coin1_in, coin2_in);
+        remove_liquidity(share)
+    }
+    spec no_free_money_theorem {
+        pragma verify=false;
+        ensures result_1 <= coin1_in;
+        ensures result_2 <= coin2_in;
+    }
+
+
+    public fun coin1_to_coin2_swap_code_simple(coin1_in: u64): u64 acquires Pool {
+        assert! (coin1_in > 0, 1);
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+        };
+        let coin2_out = (997 * coin1_in * pool.coin2) / (1000 * pool.coin1 + 997 * coin1_in);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+}
diff --git a/vendors/move/crates/documentation/examples/experimental/verify-sort/Move.toml b/vendors/move/crates/documentation/examples/experimental/verify-sort/Move.toml
new file mode 100644
index 000000000..1c74136db
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/verify-sort/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Loop"
+version = "0.0.0"
+
+[addresses]
+Loop = "0x42"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/examples/experimental/verify-sort/sources/loop.move b/vendors/move/crates/documentation/examples/experimental/verify-sort/sources/loop.move
new file mode 100644
index 000000000..b673830c9
--- /dev/null
+++ b/vendors/move/crates/documentation/examples/experimental/verify-sort/sources/loop.move
@@ -0,0 +1,66 @@
+// exclude_for: cvc5
+module 0x42::VerifySort {
+
+    use std::vector;
+    // iperm is a ghost variable for verification
+    public fun verify_sort(v: &mut vector<u64>, iperm: &mut vector<u64>) {
+        let vlen = vector::length(v);
+        spec {
+            assume vlen == 42;
+            assume len(iperm) == vlen && (forall k in 0..vlen : iperm[k] == k);
+        };
+        if (vlen <= 1) return ();
+
+        let i = 0;
+        let j = 1;
+        while
+        ({
+            spec {
+                // loop invariant that proves order of output vector
+                invariant i >= 0 && i < vlen;
+                invariant j >= 1 && j <= vlen;
+                invariant j == vlen ==> i == vlen - 1;
+                invariant j >= i + 1;
+                invariant len(v) == vlen;
+                invariant forall k in 0..i, l in 0..i : k < l ==> v[k] <= v[l];
+                invariant forall k in 0..i, l in i..vlen : v[k] <= v[l];
+                invariant forall k in (i + 1)..j : v[i] <= v[k];
+
+                // loop invariant that proves output vector is a permutation of input vector
+                invariant len(iperm) == vlen &&
+                          (forall k in 0..vlen : old(v)[iperm[k]] == v[k]) &&
+                          (forall k in 0..vlen : iperm[k] >= 0 && iperm[k] < vlen) &&
+                          (forall k in 0..vlen, l in 0..vlen : k != l ==> iperm[k] != iperm[l]);
+            };
+            (i < vlen - 1)
+        })
+        {
+            if (*vector::borrow(v, i) > *vector::borrow(v, j)) {
+                vector::swap(v, i, j);
+                vector::swap(iperm, i, j);
+            };
+
+            if (j < vlen - 1 ) {
+                j = j + 1;
+            } else {
+                i = i + 1;
+                j = i + 1;
+            };
+        };
+        spec {
+            assert len(v) == vlen;
+            assert i == vlen - 1;
+            assert j == vlen;
+            assert v[0] <= v[1];
+            assert v[vlen - 2] <= v[vlen - 1];
+        };
+    }
+    spec verify_sort {
+        aborts_if false;
+        ensures forall i in 0..len(v)-1: v[i] <= v[i+1];
+        ensures exists perm : vector<u64> : len(perm) == len(v) &&
+                (forall k in 0..len(v) : old(v)[perm[k]] == v[k]) &&
+                (forall k in 0..len(v) : perm[k] >= 0 && perm[k] < len(v)) &&
+                (forall k in 0..len(v), l in 0..len(v) : k != l ==> perm[k] != perm[l]);
+    }
+}
diff --git a/vendors/move/crates/documentation/spec/vm.md b/vendors/move/crates/documentation/spec/vm.md
new file mode 100644
index 000000000..fea24adb6
--- /dev/null
+++ b/vendors/move/crates/documentation/spec/vm.md
@@ -0,0 +1,649 @@
+# Move VM Specification
+
+Instantiation of a Move VM just initializes an instance of a `Loader`, that
+is, a small set of empty tables (few instances of `HashMap` and `Vec` behind
+`Mutex`). Initialization of a VM is reasonably inexpensive. The `Loader` is
+effectively the code cache. The code cache has the lifetime of the VM. Code
+is loaded at runtime when functions and scripts are executed. Once loaded,
+modules and scripts are reused in their loaded form and ready to be executed
+immediately. Loading code is expensive and the VM performs eager
+loading. When execution starts, no more loading takes place, all code through
+any possible control flow is ready to be executed and cached at load time.
+Maybe, more importantly, the eager model guarantees that no runtime errors can
+come from linking at runtime, and that a given invocation will not fail
+loading/linking because of different code paths. The consistency of the
+invocation is guaranteed before execution starts. Obviously runtime errors are
+still possible and "expected".
+
+This model fits typical blockchain requirements well:
+
+* Validation uses only few functions published at genesis. Once loaded, code is
+always fetched from the cache and immediately available.
+
+* Execution is in the context of a given data view, a stable and immutable
+view. As such code is stable too, and it is important to optimize the process
+of loading. Also, transactions are reasonably homogeneous and reuse of code
+leads to significant improvements in performance and stability.
+
+The VM has an internal implementation for a data cache that relieves the client from an
+important responsibility (data cache consistency). That abstraction is behind
+a `Session` which is the only way to talk to the runtime.
+
+The objective of a `Session` is to create and manage the data cache for a set
+of invocations into the VM. It is also intended to return side effects in a
+format that is suitable to the adapter.
+A `Session` forwards calls to the `Runtime` which is where the logic and
+implementation of the VM lives and starts.
+
+### Code Cache
+
+When loading a Module for the first time, the VM queries the data store for
+the Module. That binary is deserialized, verified, loaded and cached by the
+loader. Once loaded, a Module is never requested again for the lifetime of
+that VM instance. Code is an immutable resource in the system.
+
+The process of loading can be summarized through the following steps:
+
+1. a binary—Module in a serialized form, `Vec<u8>`—is fetched from the data store.
+This may require a network access
+2. the binary is deserialized and verified
+3. dependencies of the module are loaded (repeat 1.–4. for each dependency)
+4. the module is linked to its dependencies (transformed in a representation
+suitable for runtime) and cached by the loader.
+
+So a reference to a loaded module does not perform any fetching from the
+network, or verification, or transformations into runtime structures
+(e.g. linking).
+
+In a typical client, consistency of the code cache can be broken by a system transaction
+that performs a hard upgrade, requiring the adapter to stop processing
+transactions until a restart takes place. Other clients may have different
+"code models" (e.g. some form of versioning).
+
+Overall, a client holding an instance of a Move VM has to be aware of the
+behavior of the code cache and provide data views (`DataStore`) that are
+compatible with the loaded code. Moreover, a client is responsible to release
+and instantiate a new VM when specific conditions may alter the consistency of
+the code cache.
+
+### Publishing
+
+Clients may publish modules in the system by calling:
+
+```rust
+pub fn publish_module(
+    &mut self,
+    module: Vec<u8>,
+    sender: AccountAddress,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The `module` is in a [serialized form](#Binary-Format) and the VM performs the
+following steps:
+
+* Deserialize the module: If the module does not deserialize, an error is
+returned with a proper `StatusCode`.
+
+* Check that the module address and the `sender` address are the same: This
+check verifies that the publisher is the account that will eventually [hold
+the module](#References-to-Data-and-Code). If the two addresses do not match, an
+error with `StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER` is returned.
+
+* Check that the module is not already published: Code is immutable in
+Move. An attempt to overwrite an existing module results in an error with
+`StatusCode::DUPLICATE_MODULE_NAME`.
+
+* Verify loading: The VM performs [verification](#Verification) of the
+module to prove correctness. However, neither the module nor any of its
+dependencies are actually saved in the cache. The VM ensures that the module
+will be loadable when a reference will be found. If a module would fail to
+load an error with proper `StatusCode` is returned.
+
+* Publish: The VM writes the serialized bytes of the module
+with the [proper key](#References-to-Data-and-Code) to the storage.
+After this step any reference to the
+module is valid.
+
+## Script Execution
+
+The VM allows the execution of [scripts](#Binary-Format). A script is a
+Move function declared in a `script` block that performs
+calls into a Framework published on-chain to accomplish a
+logical transaction. A script is not saved in storage and
+it cannot be invoked by other scripts or modules.
+
+```rust
+pub fn execute_script(
+    &mut self,
+    script: Vec<u8>,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The `script` is specified in a [serialized form](#Binary-Format).
+If the script is generic, the `ty_args` vector contains the `TypeTag`
+values for the type arguments. The `signer` account addresses for the
+script are specified in the `senders` vector. Any additional arguments
+are provided in the `args` vector, where each argument is a BCS-serialized
+vector of bytes. The VM
+performs the following steps:
+
+* Load the Script and the main function:
+
+    - The `sha3_256` hash value of the `script` binary is computed.
+    - The hash is used to access the script cache to see if the script was
+      loaded. The hash is used for script identity.
+    - If not in the cache the script is [loaded](#Loading). If loading fails,
+      execution stops and an error with a proper `StatusCode` is returned.
+    - The script main function is [checked against the
+      type argument instantiation](#Verification) and if there are
+      errors, execution stops and the error returned.
+
+* Build the argument list: The first arguments are `Signer` values created by
+the VM for the account addresses in the `senders` vector. Any other arguments
+from the `args` vector are then checked against a whitelisted set of permitted
+types and added to the arguments for the script.
+The VM returns an error with `StatusCode::TYPE_MISMATCH` if
+any of the types is not permitted.
+
+* Execute the script: The VM invokes the interpreter to [execute the
+script](#Interpreter). Any error during execution is returned, and the
+transaction aborted. The VM returns whether execution succeeded or
+failed.
+
+## Script Function Execution
+
+Script functions (in version 2 and later of the Move VM) are similar to scripts
+except that the Move bytecode comes from a Move function with `script` visibility
+in an on-chain module. The script function is specified by the module and function
+name:
+
+```rust
+pub fn execute_script_function(
+    &mut self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+Execution of script functions is similar to scripts. Instead of using the Move bytecodes
+from a script, the script function is loaded from the on-chain module, and the Move VM
+checks that it has `script` visibility. The rest of the script function execution is
+the same as for scripts. If the function does not exist, execution fails with a
+`FUNCTION_RESOLUTION_FAILURE` status code. If the function does not have `script` visibility,
+it will fail with the `EXECUTE_SCRIPT_FUNCTION_CALLED_ON_NON_SCRIPT_VISIBLE` status code.
+
+## Function Execution
+
+The VM allows the execution of [any function in a module](#Binary-Format)
+through a `ModuleId` and a function name. Function names are unique within a
+module (no overloading), so the signature of the function is not
+required. Argument checking is done by the [interpreter](#Interpreter).
+
+The adapter uses this entry point to run specific system functions as
+described in [validation](#Validation) and [execution](#Execution). This is a
+very powerful entry point into the system given there are no visibility
+checks. Clients would likely use this entry point internally (e.g., for
+constructing a genesis state), or wrap and expose it with restrictions.
+
+```rust
+pub fn execute_function(
+    &mut self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The VM performs the following steps:
+
+* Load the function:
+
+    - The specified `module` is first [loaded](#Loading).
+      An error in loading halts execution and returns the error with a proper
+      `StatusCode`.
+    - The VM looks up the function in the module. Failure to resolve the
+      function returns an error with a proper `StatusCode`.
+    - Every type in the `ty_args` vector is [loaded](#Loading). An error
+      in loading halts execution and returns the error with a proper `StatusCode`.
+      Type arguments are checked against type parameters and an error returned
+      if there is a mismatch (i.e., argument inconsistent with generic declaration).
+
+* Build the argument list: Arguments are checked against a whitelisted set
+of permitted types (_specify which types_). The VM returns an error with
+`StatusCode::TYPE_MISMATCH` if any of the types is not permitted.
+
+* Execute the function: The VM invokes the interpreter to [execute the
+function](#Interpreter). Any error during execution aborts the interpreter
+and returns the error. The VM returns whether execution succeeded or
+failed.
+
+## Binary Format
+
+Modules and Scripts can only enter the VM in binary form, and Modules are
+saved on chain in binary form. A Module is logically a collection of
+functions and data structures. A Script is just an entry point, a single
+function with arguments and no return value.
+
+Modules can be thought as library or shared code, whereas Scripts can only
+come in input with the Transaction.
+
+Binaries are composed of headers and a set of tables. Some of
+those tables are common to both Modules and Scripts, others specific to one or
+the other. There is also data specific only to Modules or Scripts.
+
+The binary format makes a heavy use of
+[ULEB128](https://en.wikipedia.org/wiki/LEB128) to compress integers. Most of
+the data in a binary is in the form of indices, and as such compression offers
+an important saving. Integers, when used with no compression are in
+[little-endian](https://en.wikipedia.org/wiki/Endianness) form.
+
+Vectors are serialized with the size first, in ULEB128 form, followed by the
+elements contiguously.
+
+### Binary Header
+
+Every binary starts with a header that has the following format:
+
+* `Magic`: 4 bytes 0xA1, 0x1C, 0xEB, 0x0B (aka "A11CEB0B" or "AliceBob")
+* `Version`: 4 byte little-endian unsigned integer
+* `Table count`: number of tables in ULEB128 form. The current maximum number
+of tables is contained in 1 byte, so this is effectively the count of tables in
+one byte. Not all tables need to be present. Each kind of table can only be
+present once; table repetitions are not allowed. Tables can be serialized in any
+order.
+
+### Table Headers
+
+Following the binary header are the table headers. There are as many tables as
+defined in "table count". Each table header
+has the following format:
+
+* `Table Kind`: 1 byte for the [kind of table](#Tables) that is serialized at
+the location defined by the next 2 entries
+* `Table Offset`: ULEB128 offset from the end of the table headers where the
+table content starts
+* `Table Length`: ULEB128 byte count of the table content
+
+Tables must be contiguous to each other, starting from the end of the table
+headers. There must not be any gap between the content of the tables. Table
+content must not overlap.
+
+### Tables
+
+A `Table Kind` is 1 byte, and it is one of:
+
+* `0x1`: `MODULE_HANDLES` - for both Modules and Scripts
+* `0x2`: `STRUCT_HANDLES` - for both Modules and Scripts
+* `0x3`: `FUNCTION_HANDLES` - for both Modules and Scriptss
+* `0x4`: `FUNCTION_INSTANTIATIONS` - for both Modules and Scripts
+* `0x5`: `SIGNATURES` - for both Modules and Scripts
+* `0x6`: `CONSTANT_POOL` - for both Modules and Scripts
+* `0x7`: `IDENTIFIERS` - for both Modules and Scripts
+* `0x8`: `ADDRESS_IDENTIFIERS` - for both Modules and Scripts
+* `0xA`: `STRUCT_DEFINITIONS` - only for Modules
+* `0xB`: `STRUCT_DEF_INSTANTIATIONS` - only for Modules
+* `0xC`: `FUNCTION_DEFINITIONS` - only for Modules
+* `0xD`: `FIELD_HANDLES` - only for Modules
+* `0xE`: `FIELD_INSTANTIATIONS` - only for Modules
+* `0xF`: `FRIEND_DECLS` - only for Modules, version 2 and later
+
+The formats of the tables are:
+
+* `MODULE_HANDLES`: A `Module Handle` is a pair of indices that identify
+the location of a module:
+
+    * `address`: ULEB128 index into the `ADDRESS_IDENTIFIERS` table of
+    the account under which the module is published
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the module
+
+* `STRUCT_HANDLES`: A `Struct Handle` contains all the information to
+uniquely identify a user type:
+
+    * `module`: ULEB128 index in the `MODULE_HANDLES` table of the module
+    where the struct is defined
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the struct
+    * `nominal resource`: U8 bool defining whether the
+    struct is a resource (true/1) or not (false/0)
+    * `type parameters`: vector of [type parameter kinds](#Kinds) if the
+    struct is generic, an empty vector otherwise:
+        * `length`: ULEB128 length of the vector, effectively the number of type
+        parameters for the generic struct
+        * `kinds`: array of `length` U8 kind values; not present if length is 0
+
+* `FUNCTION_HANDLES`: A `Function Handle` contains all the information to uniquely
+identify a function:
+
+    * `module`: ULEB128 index in the `MODULE_HANDLES` table of the module where
+    the function is defined
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the function
+    * `parameters`: ULEB128 index into the `SIGNATURES` table for the argument types
+    of the function
+    * `return`: ULEB128 index into the `SIGNATURES` table for the return types of the function
+    * `type parameters`: vector of [type parameter kinds](#Kinds) if the function
+    is generic, an empty vector otherwise:
+        * `length`: ULEB128 length of the vector, effectively the number of type
+        parameters for the generic function
+        * `kinds`: array of `length` U8 kind values; not present if length is 0
+
+* `FUNCTION_INSTANTIATIONS`: A `Function Instantiation` describes the
+instantation of a generic function. Function Instantiation can be full or
+partial. E.g., given a generic function `f<K, V>()` a full instantiation would
+be `f<U8, Bool>()` whereas a partial instantiation would be `f<U8, Z>()` where
+`Z` is a type parameter in a given context (typically another function
+`g<Z>()`).
+
+    * `function handle`: ULEB128 index into the `FUNCTION_HANDLES` table of the
+    generic function for this instantiation (e.g., `f<K, W>()`)
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the
+    instantiation of the function
+
+* `SIGNATURES`: The set of signatures in this binary. A signature is a
+vector of [Signature Tokens](#SignatureTokens), so every signature will carry
+the length (in ULEB128 form) followed by the Signature Tokens.
+
+* `CONSTANT_POOL`: The set of constants in the binary. A constant is a
+copyable primitive value or a vector of vectors of primitives. Constants
+cannot be user types. Constants are serialized according to the rule defined
+in [Move Values](#Move-Values) and stored in the table in serialized form. A
+constant in the constant pool has the following entries:
+
+    * `type`: the [Signature Token](#SignatureTokens) (type) of the value that follows
+    * `length`: the length of the serialized value in bytes
+    * `value`: the serialized value
+
+* `IDENTIFIERS`: The set of identifiers in this binary. Identifiers are
+vectors of chars. Their format is the length of the vector in ULEB128 form
+followed by the chars. An identifier can only have characters in the ASCII set
+and specifically: must start with a letter or '\_', followed by a letter, '\_'
+or digit
+
+* `ADDRESS_IDENTIFIERS`: The set of addresses used in ModuleHandles.
+Addresses are fixed size so they are stored contiguously in this table.
+
+* `STRUCT_DEFINITIONS`: The structs or user types defined in the binary. A
+struct definition contains the following fields:
+
+    * `struct_handle`: ULEB128 index in the `STRUCT_HANDLES` table for the
+    handle of this definition
+    * `field_information`: Field Information provides information about the
+    fields of the struct or whether the struct is native
+
+        * `tag`: 1 byte, either `0x1` if the struct is native, or `0x2` if the struct
+        contains fields, in which case it is followed by:
+        * `field count`: ULEB128 number of fields for this struct
+        * `fields`: a field count of
+
+            * `name`: ULEB128 index in the `IDENTIFIERS` table containing the
+            name of the field
+            * `field type`: [SignatureToken](#SignatureTokens) - the type of
+            the field
+
+* `STRUCT_DEF_INSTANTIATIONS`: the set of instantiation for any given
+generic struct. It contains the following fields:
+
+    * `struct handle`: ULEB128 index into the `STRUCT_HANDLES` table of the
+    generic struct for this instantiation (e.g., `struct X<T>`)
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the
+    instantiation of the struct. The instantiation can be either partial or complete
+    (e.g., `X<U64>` or `X<Z>` when inside another generic function or generic struct
+    with type parameter `Z`)
+
+* `FUNCTION_DEFINITIONS`: the set of functions defined in this binary. A
+function definition contains the following fields:
+
+    * `function_handle`: ULEB128 index in the `FUNCTION_HANDLES` table for
+    the handle of this definition
+    * `visibility`: 1 byte for the function visibility (only used in version 2 and later)
+
+        * `0x0` if the function is private to the Module
+        * `0x1` if the function is public and thus visible outside this module
+        * `0x2` for a `script` function
+        * `0x3` if the function is private but also visible to `friend` modules
+
+    * `flags`: 1 byte:
+
+        * `0x0` if the function is private to the Module (version 1 only)
+        * `0x1` if the function is public and thus visible outside this module (version 1 only)
+        * `0x2` if the function is native, not implemented in Move
+
+    * `acquires_global_resources`: resources accessed by this function
+
+        * `length`: ULEB128 length of the vector, number of resources
+        acquired by this function
+        * `resources`: array of `length` ULEB128 indices into the `STRUCT_DEFS` table,
+        for the resources acquired by this function
+
+    * `code_unit`: if the function is not native, the code unit follows:
+
+        * `locals`: ULEB128 index into the `SIGNATURES` table for the types
+        of the locals of the function
+        * `code`: vector of [Bytecodes](#Bytecodes), the body of this function
+
+            * `length`: the count of bytecodes the follows
+            * `bytecodes`: Bytecodes, they are variable size
+
+* `FIELD_HANDLES`: the set of fields accessed in code. A field handle is
+composed by the following fields:
+
+    * `owner`: ULEB128 index into the `STRUCT_DEFS` table of the type that owns the field
+    * `index`: ULEB128 position of the field in the vector of fields of the `owner`
+
+* `FIELD_INSTANTIATIONS`: the set of generic fields accessed in code. A
+field instantiation is a pair of indices:
+
+    * `field_handle`: ULEB128 index into the `FIELD_HANDLES` table for the generic field
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the instantiation of
+    the type that owns the field
+
+* `FRIEND_DECLS`: the set of declared friend modules with the following for each one:
+
+    * `address`: ULEB128 index into the `ADDRESS_IDENTIFIERS` table of
+    the account under which the module is published
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the module
+
+### Kinds
+
+A `Type Parameter Kind` is 1 byte, and it is one of:
+
+* `0x1`: `ALL` - the type parameter can be substituted by either a resource, or a copyable type
+* `0x2`: `COPYABLE` - the type parameter must be substituted by a copyable type
+* `0x3`: `RESOURCE` - the type parameter must be substituted by a resource type
+
+### SignatureTokens
+
+A `SignatureToken` is 1 byte, and it is one of:
+
+* `0x1`: `BOOL` - a boolean
+* `0x2`: `U8` - a U8 (byte)
+* `0x3`: `U64` - a 64-bit unsigned integer
+* `0x4`: `U128` - a 128-bit unsigned integer
+* `0x5`: `ADDRESS` - an `AccountAddress` in the chain, may be a 16, 20, or 32 byte value
+* `0x6`: `REFERENCE` - a reference; must be followed by another SignatureToken
+representing the type referenced
+* `0x7`: `MUTABLE_REFERENCE` - a mutable reference; must be followed by another
+SignatureToken representing the type referenced
+* `0x8`: `STRUCT` - a structure; must be followed by the index into the
+`STRUCT_HANDLES` table describing the type. That index is in ULEB128 form
+* `0x9`: `TYPE_PARAMETER` - a type parameter of a generic struct or a generic
+function; must be followed by the index into the type parameters vector of its container.
+The index is in ULEB128 form
+* `0xA`: `VECTOR` - a vector - must be followed by another SignatureToken
+representing the type of the vector
+* `0xB`: `STRUCT_INST` - a struct instantiation; must be followed by an index
+into the `STRUCT_HANDLES` table for the generic type of the instantiation, and a
+vector describing the substitution types, that is, a vector of SignatureTokens
+* `0xC`: `SIGNER` - a signer type, which is a special type for the VM
+representing the "entity" that signed the transaction. Signer is a resource type
+* `0xD`: `U16` - a 16-bit unsigned integer
+* `0xE`: `U32` - a 32-bit unsigned integer
+* `0xF`: `U256` - a 256-bit unsigned integer
+
+Signature tokens examples:
+
+* `u8, u128` -> `0x2 0x2 0x4` - size(`0x2`), U8(`0x2`), u128(`0x4`)
+* `u8, u128, A` where A is a struct -> `0x3 0x2 0x4 0x8 0x10` - size(`0x3`),
+U8(`0x2`), u128(`0x4`), Struct::A
+(`0x8 0x10` assuming the struct is in the `STRUCT_HANDLES` table at position `0x10`)
+* `vector<address>, &A` where A is a struct -> `0x2 0xA 0x5 0x8 0x10` - size(`0x2`),
+vector<address>(`0xA 0x5`), &Struct::A
+(`0x6 0x8 0x10` assuming the struct is in the `STRUCT_HANDLES` table at position `0x10`)
+* `vector<A>, &A<B>` where A and B are a struct ->
+`0x2 0xA 0x8 0x10 0x6 0xB 0x10 0x1 0x8 0x11` -
+size(`0x2`), vector\<A\>(`0xA 0x8 0x10`),
+&Struct::A\<Struct::B\> (`0x6` &, `0xB 0x10` A<\_>, `0x1 0x8 0x11` B type
+instantiation; assuming the struct are in the `STRUCT_HANDLES` table at position
+`0x10` and `0x11` respectively)
+
+### Bytecodes
+
+Bytecodes are variable size instructions for the Move VM. Bytecodes are
+composed by opcodes (1 byte) followed by a possible payload which depends on
+the specific opcode and specified in "()" below:
+
+* `0x01`: `POP`
+* `0x02`: `RET`
+* `0x03`: `BR_TRUE(offset)` - offset is in ULEB128 form, and it is the target
+offset in the code stream from the beginning of the code stream
+* `0x04`: `BR_FALSE(offset)` - offset is in ULEB128 form, and it is the
+target offset in the code stream from the beginning of the code stream
+* `0x05`: `BRANCH(offset)` - offset is in ULEB128 form, and it is the target
+offset in the code stream from the beginning of the code stream
+* `0x06`: `LD_U64(value)` - value is a U64 in little-endian form
+* `0x07`: `LD_CONST(index)` - index is in ULEB128 form, and it is an index
+in the `CONSTANT_POOL` table
+* `0x08`: `LD_TRUE`
+* `0x09`: `LD_FALSE`
+* `0x0A`: `COPY_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0B`: `MOVE_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0C`: `ST_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0D`: `MUT_BORROW_LOC(index)` - index is in ULEB128 form, and it is an
+index referring to either an argument or a local of the function. From a
+bytecode perspective arguments and locals lengths are added and the index must
+be in that range. If index is less than the length of arguments it refers to one
+of the arguments otherwise it refers to one of the locals
+* `0x0E`: `IMM_BORROW_LOC(index)` - index is in ULEB128 form, and it is an
+index referring to either an argument or a local of the function. From a
+bytecode perspective arguments and locals lengths are added and the index must
+be in that range. If index is less than the length of arguments it refers to one
+of the arguments otherwise it refers to one of the locals
+* `0x0F`: `MUT_BORROW_FIELD(index)` - index is in ULEB128 form, and it is an
+index in the `FIELD_HANDLES` table
+* `0x10`: `IMM_BORROW_FIELD(index)` - index is in ULEB128 form, and it is an
+index in the `FIELD_HANDLES` table
+* `0x11`: `CALL(index)` - index is in ULEB128 form, and it is an index in the
+`FUNCTION_HANDLES` table
+* `0x12`: `PACK(index)` - index is in ULEB128 form, and it is an index in the
+`STRUCT_DEFINITIONS` table
+* `0x13`: `UNPACK(index)` - index is in ULEB128 form, and it is an index in
+the `STRUCT_DEFINITIONS` table
+* `0x14`: `READ_REF`
+* `0x15`: `WRITE_REF`
+* `0x16`: `ADD`
+* `0x17`: `SUB`
+* `0x18`: `MUL`
+* `0x19`: `MOD`
+* `0x1A`: `DIV`
+* `0x1B`: `BIT_OR`
+* `0x1C`: `BIT_AND`
+* `0x1D`: `XOR`
+* `0x1E`: `OR`
+* `0x1F`: `AND`
+* `0x20`: `NOT`
+* `0x21`: `EQ`
+* `0x22`: `NEQ`
+* `0x23`: `LT`
+* `0x24`: `GT`
+* `0x25`: `LE`
+* `0x26`: `GE`
+* `0x27`: `ABORT`
+* `0x28`: `NOP`
+* `0x29`: `EXISTS(index)` - index is in ULEB128 form, and it is an index in
+the `STRUCT_DEFINITIONS` table
+* `0x2A`: `MUT_BORROW_GLOBAL(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEFINITIONS` table
+* `0x2B`: `IMM_BORROW_GLOBAL(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEFINITIONS` table
+* `0x2C`: `MOVE_FROM(index)` - index is in ULEB128 form, and it is an index
+in the `STRUCT_DEFINITIONS` table
+* `0x2D`: `MOVE_TO(index)` - index is in ULEB128 form, and it is an index
+in the `STRUCT_DEFINITIONS` table
+* `0x2E`: `FREEZE_REF`
+* `0x2F`: `SHL`
+* `0x30`: `SHR`
+* `0x31`: `LD_U8(value)` - value is a U8
+* `0x32`: `LD_U128(value)` - value is a U128 in little-endian form
+* `0x33`: `CAST_U8`
+* `0x34`: `CAST_U64`
+* `0x35`: `CAST_U128`
+* `0x36`: `MUT_BORROW_FIELD_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `FIELD_INSTANTIATIONS` table
+* `0x37`: `IMM_BORROW_FIELD_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `FIELD_INSTANTIATIONS` table
+* `0x38`: `CALL_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `FUNCTION_INSTANTIATIONS` table
+* `0x39`: `PACK_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3A`: `UNPACK_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3B`: `EXISTS_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3C`: `MUT_BORROW_GLOBAL_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3D`: `IMM_BORROW_GLOBAL_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3E`: `MOVE_FROM_GENERIC(index)` - index is in ULEB128 form, and it
+is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3F`: `MOVE_TO_GENERIC(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEF_INSTANTIATIONS` table
+
+### Module Specific Data
+
+A binary for a Module contains an index in ULEB128 form as its last
+entry. That is after all tables. That index points to the ModuleHandle table
+and it is the self module. It is where the module is stored, and a
+specification of which one of the Modules in the `MODULE_HANDLES` tables is the
+self one.
+
+### Script Specific Data
+
+A Script does not have a `FUNCTION_DEFINITIONS` table, and the entry point is
+explicitly described in the following entries, at the end of a Script
+Binary, in the order below:
+
+* `type parameters`: if the script entry point is generic, the number and
+kind of the type parameters is in this vector.
+
+    * `length`: ULEB128 length of the vector, effectively the number of
+    type parameters for the generic entry point. 0 if the script is not generic
+    * `kinds`: array of `length` U8 [kind](#Kinds) values, not present
+    if length is 0
+
+* `parameters`: ULEB128 index into the `SIGNATURES` table for the argument
+types of the entry point
+
+* `code`: vector of [Bytecodes](#Bytecodes), the body of this function
+    * `length`: the count of bytecodes
+    * `bytecodes`: Bytecodes contiguously serialized, they are variable size
diff --git a/vendors/move/crates/documentation/tutorial/README.md b/vendors/move/crates/documentation/tutorial/README.md
new file mode 100644
index 000000000..d15fce32b
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/README.md
@@ -0,0 +1,759 @@
+# Move Tutorial
+
+Welcome to the Move Tutorial! In this tutorial, we are going to go through some steps of developing Move code
+including design, implementation, unit testing and formal verification of Move modules.
+
+There are nine steps in total:
+
+- [Step 0: Installation](#Step0)
+- [Step 1: Writing my first Move module](#Step1)
+- [Step 2: Adding unit tests to my first Move module](#Step2)
+- [Step 3: Designing my `BasicCoin` module](#Step3)
+- [Step 4: Implementing my `BasicCoin` module](#Step4)
+- [Step 5: Adding and using unit tests with the `BasicCoin` module](#Step5)
+- [Step 6: Making my `BasicCoin` module generic](#Step6)
+- [Step 7: Use the Move prover](#Step7)
+- [Step 8: Writing formal specifications for the `BasicCoin` module](#Step8)
+
+Each step is designed to be self-contained in the corresponding `step_x` folder. For example, if you would
+like to skip the contents in step 1 through 4, feel free to jump to step 5 since all the code we have written
+before step 5 will be in `step_5` folder. At the end of some steps, we also include
+additional material on more advanced topics.
+
+Now let's get started!
+
+## Step 0: Installation<span id="Step0"><span>
+
+If you haven't already, open your terminal and clone [the Move repository](https://github.com/move-language/move):
+
+```bash
+git clone https://github.com/move-language/move.git
+```
+
+Go to the `move` directory and run the `dev_setup.sh` script:
+
+```bash
+cd move
+./scripts/dev_setup.sh -ypt
+```
+
+Follow the script's prompts in order to install all of Move's dependencies.
+
+The script adds environment variable definitions to your `~/.profile` file.
+Include them by running this command:
+
+```bash
+source ~/.profile
+````
+
+Next, install Move's command-line tool by running this commands:
+
+```bash
+cargo install --path language/tools/move-cli
+```
+
+You can check that it is working by running the following command:
+
+```bash
+move --help
+```
+
+You should see something like this along with a list and description of a
+number of commands:
+
+```
+move-cli 0.1.0
+Diem Association <opensource@diem.com>
+MoveCLI is the CLI that will be executed by the `move-cli` command The `cmd` argument is added here
+rather than in `Move` to make it easier for other crates to extend `move-cli`
+
+USAGE:
+    move [OPTIONS] <SUBCOMMAND>
+
+OPTIONS:
+        --abi                          Generate ABIs for packages
+...
+```
+
+If you want to find what commands are available and what they do, running
+a command or subcommand with the `--help` flag will print documentation.
+
+Before running the next steps, `cd` to the tutorial directory:
+```bash
+cd <path_to_move>/language/documentation/tutorial
+```
+
+
+<details>
+<summary>Visual Studio Code Move support</summary>
+There is official Move support for Visual Studio Code. You need to install
+the move analyzer first:
+
+```bash
+cargo install --path language/move-analyzer
+```
+
+Now you can install the VS extension by opening VS Code, searching for the "move-analyzer" in
+the Extension Pane, and installing it. More detailed instructions can be found
+in the extension's [README](https://github.com/move-language/move/tree/main/language/move-analyzer/editors/code).
+</details>
+
+
+## Step 1: Writing my first Move module<span id="Step1"><span>
+
+Change directory into the [`step_1/BasicCoin`](./step_1/BasicCoin) directory.
+You should see a directory called `sources` -- this is the place where all
+the Move code for this package lives. You should also see a
+`Move.toml` file as well. This file specifies dependencies and other information about
+the package; if you're familiar with Rust and Cargo, the `Move.toml` file
+is similar to the `Cargo.toml` file, and the `sources` directory similar to
+the `src` directory.
+
+Let's take a look at some Move code! Open up
+[`sources/FirstModule.move`](./step_1/BasicCoin/sources/FirstModule.move) in
+your editor of choice. The first thing you'll see is this:
+
+```
+// sources/FirstModule.move
+module 0xCAFE::BasicCoin {
+    ...
+}
+```
+
+This is defining a Move
+[module](https://move-language.github.io/move/modules-and-scripts.html). Modules are the
+building blocks of Move code, and are defined with a specific address -- the
+address that the module can be published under. In this case, the `BasicCoin`
+module can only be published under `0xCAFE`.
+
+Let's now take a look at the next part of this file where we define a
+[struct](https://move-language.github.io/move/structs-and-resources.html)
+to represent a `Coin` with a given `value`:
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+    ...
+}
+```
+
+Looking at the rest of the file, we see a function definition that creates a `Coin` struct and stores it under an account:
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+}
+```
+
+Let's take a look at this function and what it's saying:
+* It takes a [`signer`](https://move-language.github.io/move/signer.html) -- an
+  unforgeable token that represents control over a particular address, and
+  a `value` to mint.
+* It creates a `Coin` with the given value and stores it under the
+  `account` using the `move_to` operator.
+
+Let's make sure it builds! This can be done with the `build` command from within the package folder ([`step_1/BasicCoin`](./step_1/BasicCoin/)):
+
+```bash
+move build
+```
+
+<details>
+<summary>Advanced concepts and references</summary>
+
+* You can create an empty Move package by calling:
+    ```bash
+    move new <pkg_name>
+    ```
+* Move code can also live a number of other places.  More information on the
+  Move package system can be found in the [Move
+  book](https://move-language.github.io/move/packages.html)
+* More information on the `Move.toml` file can be found in the [package section of the Move book](https://move-language.github.io/move/packages.html#movetoml).
+* Move also supports the idea of [named
+  addresses](https://move-language.github.io/move/address.html#named-addresses), Named
+  addresses are a way to parametrize Move source code so that you can compile
+  the module using different values for `NamedAddr` to get different bytecode
+  that you can deploy, depending on what address(es) you control. They are used quite frequently, and can be defined in the `Move.toml` file in the `[addresses]` section, e.g.,
+    ```
+    [addresses]
+    SomeNamedAddress = "0xC0FFEE"
+    ```
+* [Structures](https://move-language.github.io/move/structs-and-resources.html) in Move
+  can be given different
+  [abilities](https://move-language.github.io/move/abilities.html) that describe what
+  can be done with that type. There are four different abilities:
+    - `copy`: Allows values of types with this ability to be copied.
+    - `drop`: Allows values of types with this ability to be popped/dropped.
+    - `store`: Allows values of types with this ability to exist inside a struct in global storage.
+    - `key`: Allows the type to serve as a key for global storage operations.
+
+    So in the `BasicCoin` module we are saying that the `Coin` struct can be used as a key
+    in global storage and, because it has no other abilities, it cannot be
+    copied, dropped, or stored as a non-key value in storage. So you can't copy
+    coins, and you also can't lose coins by accident!
+* [Functions](https://move-language.github.io/move/functions.html) are default
+    private, and can also be `public`,
+    [`public(friend)`](https://move-language.github.io/move/friends.html), or
+    `public(script)`. The last of these states that this function can be
+    called from a transaction script. `public(script)` functions can also be
+    called by other `public(script)` functions.
+* `move_to` is one of the [five different global storage
+  operators](https://move-language.github.io/move/global-storage-operators.html).
+</details>
+
+## Step 2: Adding unit tests to my first Move module<span id="Step2"><span>
+
+Now that we've taken a look at our first Move module, we'll take a look at a
+test to make sure minting works the way we expect it to by changing directory
+to [`step_2/BasicCoin`](./step_2/BasicCoin).  Unit tests in Move are similar to
+unit tests in Rust if you're familiar with them -- tests are annotated with
+`#[test]` and written like normal Move functions.
+
+You can run the tests with the `move test` command:
+
+```bash
+move test
+```
+
+Let's now take a look at the contents of the [`FirstModule.move`
+file](./step_2/BasicCoin/sources/FirstModule.move). The first new thing you'll
+see is this test:
+
+```
+module 0xCAFE::BasicCoin {
+    ...
+    // Declare a unit test. It takes a signer called `account` with an
+    // address value of `0xC0FFEE`.
+    #[test(account = @0xC0FFEE)]
+    fun test_mint_10(account: signer) acquires Coin {
+        let addr = 0x1::signer::address_of(&account);
+        mint(account, 10);
+        // Make sure there is a `Coin` resource under `addr` with a value of `10`.
+        // We can access this resource and its value since we are in the
+        // same module that defined the `Coin` resource.
+        assert!(borrow_global<Coin>(addr).value == 10, 0);
+    }
+}
+```
+
+This is declaring a unit test called `test_mint_10` that mints a `Coin` struct
+under the `account` with a `value` of `10`. It is then checking that the minted
+coin in storage has the value that is expected with the `assert!` call. If the
+assertion fails the unit test will fail.
+
+<details>
+<summary>Advanced concepts and exercises</summary>
+
+* There are a number of test-related annotations that are worth exploring, they
+  can be found
+  [here](https://github.com/move-language/move/blob/main/language/changes/4-unit-testing.md#testing-annotations-their-meaning-and-usage).
+  You'll see some of these used in Step 5.
+* Before running unit tests, you'll always need to add a dependency on the Move
+  standard library. This can be done by adding an entry to the `[dependencies]`
+  section of the `Move.toml`, e.g.,
+
+  ```toml
+  [dependencies]
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
+  ```
+
+  Note that you may need to alter the path to point to the `move-stdlib` directory under
+  `<path_to_move>/language`. You can also specify git dependencies. You can read more on Move
+  package dependencies [here](https://move-language.github.io/move/packages.html#movetoml).
+
+
+#### Exercises
+* Change the assertion to `11` so that the test fails. Find a flag that you can
+  pass to the `move test` command that will show you the global state when
+  the test fails. It should look something like this:
+  ```
+  ┌── test_mint_10 ──────
+  │ error[E11001]: test failure
+  │    ┌─ ./sources/FirstModule.move:24:9
+  │    │
+  │ 18 │     fun test_mint_10(account: signer) acquires Coin {
+  │    │         ------------ In this function in 0xcafe::BasicCoin
+  │    ·
+  │ 24 │         assert!(borrow_global<Coin>(addr).value == 11, 0);
+  │    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 0 here
+  │
+  │
+  │ ────── Storage state at point of failure ──────
+  │ 0xc0ffee:
+  │       => key 0xcafe::BasicCoin::Coin {
+  │           value: 10
+  │       }
+  └──────────────────
+  ```
+* Find a flag that allows you to gather test coverage information, and
+  then play around with using the `move coverage` command to look at
+  coverage statistics and source coverage.
+
+</details>
+
+## Step 3: Designing my `BasicCoin` module<span id="Step3"><span>
+
+In this section, we are going to design a module implementing a basic coin and balance interface, where coins can
+be minted and transferred between balances held under different addresses.
+
+The signatures of the public Move function are the following:
+
+```
+/// Publish an empty balance resource under `account`'s address. This function must be called before
+/// minting or transferring to the account.
+public fun publish_balance(account: &signer) { ... }
+
+/// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance { ... }
+
+/// Returns the balance of `owner`.
+public fun balance_of(owner: address): u64 acquires Balance { ... }
+
+/// Transfers `amount` of tokens from `from` to `to`.
+public fun transfer(from: &signer, to: address, amount: u64) acquires Balance { ... }
+```
+
+Next we look at the data structs we need for this module.
+
+A Move module doesn't have its own storage. Instead, Move "global storage" (what we call our
+blockchain state) is indexed by addresses. Under each address there are Move modules (code) and Move resources (values).
+
+The global storage looks roughly like this in Rust syntax:
+
+```rust
+struct GlobalStorage {
+    resources: Map<address, Map<ResourceType, ResourceValue>>
+    modules: Map<address, Map<ModuleName, ModuleBytecode>>
+}
+```
+
+The Move resource storage under each address is a map from types to values. (An observant reader might observe that
+this means each address can only have one value of each type.) This conveniently provides us a native mapping indexed
+by addresses. In our `BasicCoin` module, we define the following `Balance` resource representing the number of coins
+each address holds:
+
+```
+/// Struct representing the balance of each address.
+struct Balance has key {
+    coin: Coin // same Coin from Step 1
+}
+```
+
+Roughly the Move blockchain state should look like this:
+
+![](diagrams/move_state.png)
+
+#### Advanced topics:
+<details>
+<summary><code>public(script)</code> functions</summary>
+
+Only functions with `public(script)` visibility can be invoked directly in transactions. So if you would like to call the `transfer`
+method directly from a transaction, you'll want to change its signature to:
+```
+public(script) fun transfer(from: signer, to: address, amount: u64) acquires Balance { ... }
+```
+Read more on Move function visibilities [here](https://move-language.github.io/move/functions.html#visibility).
+</details>
+<details>
+<summary>Comparison with Ethereum/Solidity</summary>
+
+In most Ethereum [ERC-20]((https://ethereum.org/en/developers/docs/standards/tokens/erc-20/)) contracts, the balance of each address is stored in a _state variable_ of type
+<code>mapping(address => uint256)</code>. This state variable is stored in the storage of a particular smart contract.
+
+The Ethereum blockchain state might look like this:
+
+![](diagrams/solidity_state.png)
+</details>
+
+## Step 4: Implementing my `BasicCoin` module<span id="Step4"><span>
+
+We have created a Move package for you in folder `step_4` called `BasicCoin`. The `sources` folder contains source code for
+all your Move modules in the package, including `BasicCoin.move`. In this section, we will take a closer look at the
+implementation of the methods inside [`BasicCoin.move`](./step_4/sources/BasicCoin.move).
+
+### Compiling our code
+
+Let's first try building the code using Move package by running the following command
+in [`step_4/BasicCoin`](./step_4/BasicCoin) folder:
+```bash
+move build
+```
+
+### Implementation of methods
+Now let's take a closer look at the implementation of the methods inside [`BasicCoin.move`](./step_4/BasicCoin/sources/BasicCoin.move).
+
+<details>
+<summary>Method <code>publish_balance</code></summary>
+
+This method publishes a `Balance` resource to a given address. Since this resource is needed to receive coins through
+minting or transferring, `publish_balance` method must be called by a user before they can receive money, including the
+module owner.
+
+This method uses a `move_to` operation to publish the resource:
+
+```
+let empty_coin = Coin { value: 0 };
+move_to(account, Balance { coin:  empty_coin });
+```
+</details>
+<details>
+<summary>Method <code>mint</code></summary>
+
+`mint` method mints coins to a given account. Here we require that `mint` must be approved
+by the module owner. We enforce this using the assert statement:
+```
+assert!(signer::address_of(&module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
+```
+Assert statements in Move can be used in this way: `assert!(<predicate>, <abort_code>);`. This means that if the `<predicate>`
+is false, then abort the transaction with `<abort_code>`. Here `MODULE_OWNER` and `ENOT_MODULE_OWNER` are both constants
+defined at the beginning of the module. The standard library's [`error` module] also defines common error categories we can use.
+It is important to note that Move is transactional in its execution -- so
+if an [abort](https://move-language.github.io/move/abort-and-assert.html) is raised no unwinding of state
+needs to be performed, as no changes from that transaction will be persisted to the blockchain.
+
+[`error` module]: https://github.com/move-language/move/blob/main/language/move-stdlib/docs/error.md
+
+We then deposit a coin with value `amount` to the balance of `mint_addr`.
+```
+deposit(mint_addr, Coin { value: amount });
+```
+</details>
+
+<details>
+<summary>Method <code>balance_of</code></summary>
+
+We use `borrow_global`, one of the global storage operators, to read from the global storage.
+```
+borrow_global<Balance>(owner).coin.value
+                 |       |       \    /
+        resource type  address  field names
+```
+</details>
+
+<details>
+<summary>Method <code>transfer</code></summary>
+
+This function withdraws tokens from `from`'s balance and deposits the tokens into `to`s balance. We take a closer look
+at `withdraw` helper function:
+```
+fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+    let balance = balance_of(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin { value: amount }
+}
+```
+At the beginning of the method, we assert that the withdrawing account has enough balance. We then use `borrow_global_mut`
+to get a mutable reference to the global storage, and `&mut` is used to create a [mutable reference](https://move-language.github.io/move/references.html) to a field of a
+struct. We then modify the balance through this mutable reference and return a new coin with the withdrawn amount.
+</details>
+
+### Exercises
+There are two `TODO`s in our module, left as exercises for the reader:
+- Finish implementing the `publish_balance` method.
+- Implement the `deposit` method.
+
+The solution to this exercise can be found in [`step_4_sol`](./step_4_sol) folder.
+
+**Bonus exercise**
+- What would happen if we deposit too many tokens to a balance?
+
+## Step 5: Adding and using unit tests with the `BasicCoin` module<span id="Step5"><span>
+
+In this step we're going to take a look at all the different unit tests
+we've written to cover the code we wrote in step 4. We're also going to
+take a look at some tools we can use to help us write tests.
+
+To get started, run the `package test` command in the [`step_5/BasicCoin`](./step_5/BasicCoin) folder
+
+```bash
+move test
+```
+
+You should see something like this:
+
+```
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING BasicCoin
+Running Move unit tests
+[ PASS    ] 0xcafe::BasicCoin::can_withdraw_amount
+[ PASS    ] 0xcafe::BasicCoin::init_check_balance
+[ PASS    ] 0xcafe::BasicCoin::init_non_owner
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_already_exists
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_has_zero
+[ PASS    ] 0xcafe::BasicCoin::withdraw_dne
+[ PASS    ] 0xcafe::BasicCoin::withdraw_too_much
+Test result: OK. Total tests: 7; passed: 7; failed: 0
+```
+
+Taking a look at the tests in the
+[`BasicCoin` module](./step_5/BasicCoin/sources/BasicCoin.move) we've tried
+to keep each unit test to testing one particular behavior.
+
+<details>
+<summary>Exercise</summary>
+
+After taking a look at the tests, try and write a unit test called
+`balance_of_dne` in the `BasicCoin` module that tests the case where a
+`Balance` resource doesn't exist under the address that `balance_of` is being
+called on. It should only be a couple lines!
+
+The solution to this exercise can be found in [`step_5_sol`](./step_5_sol)
+
+</details>
+
+## Step 6: Making my `BasicCoin` module generic<span id="Step6"><span>
+
+In Move, we can use generics to define functions and structs over different input data types. Generics are a great
+building block for library code. In this section, we are going to make our simple `BasicCoin` module generic so that it can
+serve as a library module that can be used by other user modules.
+
+First, we add type parameters to our data structs:
+```
+struct Coin<phantom CoinType> has store {
+    value: u64
+}
+
+struct Balance<phantom CoinType> has key {
+    coin: Coin<CoinType>
+}
+```
+
+We also add type parameters to our methods in the same manner. For example, `withdraw` becomes the following:
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+    let balance = balance_of<CoinType>(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin<CoinType> { value: amount }
+}
+```
+Take a look at [`step_6/BasicCoin/sources/BasicCoin.move`](./step_6/BasicCoin/sources/BasicCoin.move) to see the full implementation.
+
+At this point, readers who are familiar with Ethereum might notice that this module serves a similar purpose as
+the [ERC20 token standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/), which provides an
+interface for implementing fungible tokens in smart contracts. One key advantage of using generics is the ability
+to reuse code since the generic library module already provides a standard implementation and the instantiating module
+can provide customizations by wrapping the standard implementation.
+
+We provide a little module called [`MyOddCoin`](./step_6/BasicCoin/sources/MyOddCoin.move) that instantiates
+the `Coin` type and customizes its transfer policy: only odd number of coins can be transferred. We also include two
+[tests](./step_6/BasicCoin/sources/MyOddCoin.move) to test this behavior. You can use the commands you learned in step 2 and step 5 to run the tests.
+
+#### Advanced topics:
+<details>
+<summary><code>phantom</code> type parameters</summary>
+
+In definitions of both `Coin` and `Balance`, we declare the type parameter `CoinType`
+to be phantom because `CoinType` is not used in the struct definition or is only used as a phantom type
+parameter.
+
+Read more about phantom type parameters <a href="https://move-language.github.io/move/generics.html#phantom-type-parameters">here</a>.
+</details>
+
+## Advanced steps
+
+Before moving on to the next steps, let's make sure you have all the prover dependencies installed.
+
+Try running `boogie /version `. If an error message shows up saying "command not found: boogie", you will have to run the
+setup script and source your profile:
+```bash
+# run the following in move repo root directory
+./scripts/dev_setup.sh -yp
+source ~/.profile
+```
+## Step 7:  Use the Move prover<span id="Step7"><span>
+
+Smart contracts deployed on the blockchain may manipulate high-value assets. As a technique that uses strict
+mathematical methods to describe behavior and reason correctness of computer systems, formal verification
+has been used in blockchains to prevent bugs in smart contracts. [
+The Move prover](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)
+is an evolving formal verification tool for smart contracts written in the Move language. The user can specify
+functional properties of smart contracts
+using the [Move Specification Language (MSL)](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md)
+and then use the prover to automatically check them statically.
+To illustrate how the prover is used, we have added the following code snippet to
+the [BasicCoin.move](./step_7/BasicCoin/sources/BasicCoin.move):
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+    }
+```
+
+Informally speaking, the block `spec balance_of {...}` contains the property specification of the method `balance_of`.
+
+Let's first run the prover using the following command inside [`BasicCoin` directory](./step_7/BasicCoin/):
+```bash
+move prove
+```
+
+which outputs the following error information:
+
+```
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ ./sources/BasicCoin.move:38:5
+   │
+35 │           borrow_global<Balance<CoinType>>(owner).coin.value
+   │           ------------- abort happened here with execution failure
+   ·
+38 │ ╭     spec balance_of {
+39 │ │         pragma aborts_if_is_strict;
+40 │ │     }
+   │ ╰─────^
+   │
+   =     at ./sources/BasicCoin.move:34: balance_of
+   =         owner = 0x29
+   =     at ./sources/BasicCoin.move:35: balance_of
+   =         ABORTED
+
+Error: exiting with verification errors
+```
+
+The prover basically tells us that we need to explicitly specify the condition under which the function `balance_of` will abort, which is caused by calling the function `borrow_global` when `owner` does not own the resource `Balance<CoinType>`. To remove this error information, we add an `aborts_if` condition as follows:
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+```
+After adding this condition, try running the `prove` command again to confirm that there are no verification errors:
+```bash
+move prove
+```
+Apart from the abort condition, we also want to define the functional properties. In Step 8, we will give more detailed introduction to the prover by specifying properties for the methods defined the `BasicCoin` module.
+
+
+## Step 8: Write formal specifications for the `BasicCoin` module<span id="Step8"><span>
+
+<details>
+
+<summary> Method withdraw </summary>
+
+The signature of the method `withdraw` is given below:
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance
+```
+
+The method withdraws tokens with value `amount` from the address `addr` and returns a created Coin of value `amount`.  The method `withdraw` aborts when 1) `addr` does not have the resource `Balance<CoinType>` or 2) the number of tokens in `addr` is smaller than `amount`. We can define conditions like this:
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+    }
+```
+
+As we can see here, a spec block can contain let bindings which introduce names for expressions. `global<T>(address): T` is a built-in function that returns the resource value at `addr`. `balance` is the number of tokens owned by `addr`. `exists<T>(address): bool` is a built-in function that returns true if the resource T exists at address. Two `aborts_if` clauses correspond to the two conditions mentioned above. In general, if a function has more than one `aborts_if` condition, those conditions are or-ed with each other. By default, if a user wants to specify aborts conditions, all possible conditions need to be listed. Otherwise, the prover will generate a verification error. However, if `pragma aborts_if_is_partial` is defined in the spec block, the combined aborts condition (the or-ed individual conditions) only *imply* that the function aborts. The reader can refer to the
+[MSL](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) document for more information.
+
+The next step is to define functional properties, which are described in the two `ensures` clauses below. First, by using the `let post` binding, `balance_post` represents the balance of `addr` after the execution, which should be equal to `balance - amount`. Then, the return value (denoted as `result`) should be a coin with value `amount`.
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance - amount;
+        ensures result == Coin<CoinType> { value: amount };
+    }
+```
+</details>
+
+<details>
+<summary> Method deposit </summary>
+
+
+
+The signature of the method `deposit` is given below:
+
+```
+fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance
+```
+
+The method deposits the `check` into `addr`. The specification is defined below:
+
+```
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+```
+
+`balance` represents the number of tokens in `addr` before execution and `check_value` represents the number of tokens to be deposited. The method would abort if 1) `addr` does not have the resource `Balance<CoinType>` or 2) the sum of `balance` and `check_value` is greater than the maxium value of the type `u64`. The functional property checks that the balance is correctly updated after the execution.
+
+</details>
+
+<details>
+
+<summary> Method transfer </summary>
+
+
+The signature of the method `transfer` is given below:
+
+```
+public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance
+```
+
+The method transfers the `amount` of coin from the account of `from` to the address `to`. The specification is given below:
+
+```
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+```
+
+`addr_from` is the address of `from`. Then the balances of `addr_from` and `to` before and after the execution are obtained.
+The `ensures` clauses specify that the `amount` number of tokens is deducted from `addr_from` and added to `to`. However, the prover will generate the error information as below:
+
+```
+error: post-condition does not hold
+   ┌─ ./sources/BasicCoin.move:57:9
+   │
+62 │         ensures balance_from_post == balance_from - amount;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   ...
+```
+
+The property is not held when `addr_from` is equal to `to`. As a result, we could add an assertion `assert!(from_addr != to)` in the method to make sure that `addr_from` is not equal to `to`.
+
+</details>
+
+
+<details>
+
+<summary> Exercises </summary>
+
+- Implement the `aborts_if` conditions for the `transfer` method.
+- Implement the specification for the `mint` and `publish_balance` method.
+
+The solution to this exercise can be found in [`step_8_sol`](./step_8_sol).
diff --git a/vendors/move/crates/documentation/tutorial/diagrams/move_state.png b/vendors/move/crates/documentation/tutorial/diagrams/move_state.png
new file mode 100644
index 000000000..bf8831b3f
Binary files /dev/null and b/vendors/move/crates/documentation/tutorial/diagrams/move_state.png differ
diff --git a/vendors/move/crates/documentation/tutorial/diagrams/solidity_state.png b/vendors/move/crates/documentation/tutorial/diagrams/solidity_state.png
new file mode 100644
index 000000000..af5dd076d
Binary files /dev/null and b/vendors/move/crates/documentation/tutorial/diagrams/solidity_state.png differ
diff --git a/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/Move.toml
new file mode 100644
index 000000000..d5fc1dc06
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
diff --git a/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move b/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move
new file mode 100644
index 000000000..117401844
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move
@@ -0,0 +1,9 @@
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/Move.toml
new file mode 100644
index 000000000..c4f70936a
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move b/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move
new file mode 100644
index 000000000..d2996f1a1
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move
@@ -0,0 +1,26 @@
+module 0xCAFE::BasicCoin {
+     // Only included in compilation for testing. Similar to #[cfg(testing)]
+    // in Rust. Imports the `Signer` module from the MoveStdlib package.
+    #[test_only]
+    use std::signer;
+
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+
+    // Declare a unit test. It takes a signer called `account` with an
+    // address value of `0xC0FFEE`.
+    #[test(account = @0xC0FFEE)]
+    fun test_mint_10(account: signer) acquires Coin {
+        let addr = signer::address_of(&account);
+        mint(account, 10);
+        // Make sure there is a `Coin` resource under `addr` with a value of `10`.
+        // We can access this resource and its value since we are in the
+        // same module that defined the `Coin` resource.
+        assert!(borrow_global<Coin>(addr).value == 10, 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/sources/FirstModule.move b/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/sources/FirstModule.move
new file mode 100644
index 000000000..2401167db
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_2_sol/BasicCoin/sources/FirstModule.move
@@ -0,0 +1,26 @@
+module 0xCAFE::BasicCoin {
+     // Only included in compilation for testing. Similar to #[cfg(testing)]
+    // in Rust.
+    #[test_only]
+    use std::signer;
+
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+
+    // Declare a unit test. It takes a signer called `account` with an
+    // address value of `0xC0FFEE`.
+    #[test(account = @0xC0FFEE)]
+    fun test_mint_10(account: signer) acquires Coin {
+        let addr = signer::address_of(&account);
+        mint(account, 10);
+        // Make sure there is a `Coin` resource under `addr` with a value of `10`.
+        // We can access this resource and its value since we are in the
+        // same module that defined the `Coin` resource.
+        assert!(borrow_global<Coin>(addr).value == 10, 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_2_sol/solution_commands b/vendors/move/crates/documentation/tutorial/step_2_sol/solution_commands
new file mode 100644
index 000000000..54ab34115
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_2_sol/solution_commands
@@ -0,0 +1,11 @@
+# Exercise 1
+move test -g
+
+# Exercise 2
+move test --coverage
+
+Followed by:
+
+move coverage summary
+move coverage summary --summarize-functions
+move coverage source --module BasicCoin
diff --git a/vendors/move/crates/documentation/tutorial/step_3/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_3/BasicCoin.move
new file mode 100644
index 000000000..67d70a60e
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_3/BasicCoin.move
@@ -0,0 +1,22 @@
+module NamedAddr::BasicCoin {
+    struct Coin has store {
+        value: u64
+    }
+
+    struct Balance has key {
+        coin: Coin
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance(account: &signer) { .. }
+
+    /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+    public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance { .. }
+
+    /// Returns the balance of `owner`.
+    public fun balance_of(owner: address): u64 acquires Balance { .. }
+
+    /// Transfers `amount` of tokens from `from` to `to`.
+    public fun transfer(from: &signer, to: address, amount: u64) acquires Balance { .. }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..ad469bcf1
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,69 @@
+/// This module defines a minimal Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Address of the owner of this module
+    const MODULE_OWNER: address = @NamedAddr;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin has store {
+        value: u64
+    }
+
+    /// Struct representing the balance of each address.
+    struct Balance has key {
+        coin: Coin
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance(account: &signer) {
+        // TODO: add an assert to check that `account` doesn't already have a `Balance` resource.
+        let empty_coin = Coin { value: 0 };
+        move_to(account, Balance { coin: empty_coin });
+    }
+
+    /// Initialize this module.
+    public fun mint(module_owner: &signer, mint_addr: address, amount: u64) {
+        // Only the owner of the module can initialize this module
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
+
+        // Deposit `amount` of tokens to `mint_addr`'s balance
+        deposit(mint_addr, Coin { value: amount });
+    }
+
+    /// Returns the balance of `owner`.
+    public fun balance_of(owner: address): u64 acquires Balance {
+        borrow_global<Balance>(owner).coin.value
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`.
+    public fun transfer(from: &signer, to: address, amount: u64) acquires Balance {
+        let check = withdraw(signer::address_of(from), amount);
+        deposit(to, check);
+    }
+
+    /// Withdraw `amount` number of tokens from the balance under `addr`.
+    fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+        let balance = balance_of(addr);
+        // balance must be greater than the withdraw amount
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin { value: amount }
+    }
+
+    /// Deposit `amount` number of tokens to the balance under `addr`.
+    fun deposit(_addr: address, check: Coin) {
+        // TODO: follow the implementation of `withdraw` and implement me!
+        let Coin { value: _amount } = check; // unpacks the check
+
+        // Get a mutable reference of addr's balance's coin value
+
+        // Increment the value by `amount`
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..3b41ce593
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,67 @@
+/// This module defines a minimal Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Address of the owner of this module
+    const MODULE_OWNER: address = @NamedAddr;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin has store {
+        value: u64
+    }
+
+    /// Struct representing the balance of each address.
+    struct Balance has key {
+        coin: Coin
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance(account: &signer) {
+        let empty_coin = Coin { value: 0 };
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance { coin: empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+    public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
+        // Only the owner of the module can initialize this module
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
+
+        // Deposit `amount` of tokens to `mint_addr`'s balance
+        deposit(mint_addr, Coin { value: amount });
+    }
+
+    /// Returns the balance of `owner`.
+    public fun balance_of(owner: address): u64 acquires Balance {
+        borrow_global<Balance>(owner).coin.value
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`.
+    public fun transfer(from: &signer, to: address, amount: u64) acquires Balance {
+        let check = withdraw(signer::address_of(from), amount);
+        deposit(to, check);
+    }
+
+    /// Withdraw `amount` number of tokens from the balance under `addr`.
+    fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+        let balance = balance_of(addr);
+        // balance must be greater than the withdraw amount
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin { value: amount }
+    }
+
+    /// Deposit `amount` number of tokens to the balance under `addr`.
+    fun deposit(addr: address, check: Coin) acquires Balance {
+        let balance = balance_of(addr);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..f90155717
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,126 @@
+/// This module defines a minimal Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Address of the owner of this module
+    const MODULE_OWNER: address = @NamedAddr;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin has store {
+        value: u64
+    }
+
+    /// Struct representing the balance of each address.
+    struct Balance has key {
+        coin: Coin
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance(account: &signer) {
+        let empty_coin = Coin { value: 0 };
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance { coin: empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+    public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
+        // Only the owner of the module can initialize this module
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
+
+        // Deposit `amount` of tokens to `mint_addr`'s balance
+        deposit(mint_addr, Coin { value: amount });
+    }
+
+    /// Returns the balance of `owner`.
+    public fun balance_of(owner: address): u64 acquires Balance {
+        borrow_global<Balance>(owner).coin.value
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`.
+    public fun transfer(from: &signer, to: address, amount: u64) acquires Balance {
+        let check = withdraw(signer::address_of(from), amount);
+        deposit(to, check);
+    }
+
+    /// Withdraw `amount` number of tokens from the balance under `addr`.
+    fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+        let balance = balance_of(addr);
+        // balance must be greater than the withdraw amount
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin { value: amount }
+    }
+
+    /// Deposit `amount` number of tokens to the balance under `addr`.
+    fun deposit(addr: address, check: Coin) acquires Balance{
+        let balance = balance_of(addr);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+
+    #[test(account = @0x1)] // Creates a signer for the `account` argument with address `@0x1`
+    #[expected_failure] // This test should abort
+    fun mint_non_owner(account: signer) acquires Balance {
+        // Make sure the address we've chosen doesn't match the module
+        // owner address
+        publish_balance(&account);
+        assert!(signer::address_of(&account) != MODULE_OWNER, 0);
+        mint(&account, @0x1, 10);
+    }
+
+    #[test(account = @NamedAddr)] // Creates a signer for the `account` argument with the value of the named address `NamedAddr`
+    fun mint_check_balance(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        mint(&account, @NamedAddr, 42);
+        assert!(balance_of(addr) == 42, 0);
+    }
+
+    #[test(account = @0x1)]
+    fun publish_balance_has_zero(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        assert!(balance_of(addr) == 0, 0);
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure(abort_code = 2)] // Can specify an abort code
+    fun publish_balance_already_exists(account: signer) {
+        publish_balance(&account);
+        publish_balance(&account);
+    }
+
+    // EXERCISE: Write `balance_of_dne` test here!
+
+    #[test]
+    #[expected_failure]
+    fun withdraw_dne() acquires Balance {
+        // Need to unpack the coin since `Coin` is a resource
+        Coin { value: _ } = withdraw(@0x1, 0);
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure] // This test should fail
+    fun withdraw_too_much(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        Coin { value: _ } = withdraw(addr, 1);
+    }
+
+    #[test(account = @NamedAddr)]
+    fun can_withdraw_amount(account: signer) acquires Balance {
+        publish_balance(&account);
+        let amount = 1000;
+        let addr = signer::address_of(&account);
+        mint(&account, addr, amount);
+        let Coin { value } = withdraw(addr, amount);
+        assert!(value == amount, 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..a6e31ba55
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,130 @@
+/// This module defines a minimal Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Address of the owner of this module
+    const MODULE_OWNER: address = @NamedAddr;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin has store {
+        value: u64
+    }
+
+    /// Struct representing the balance of each address.
+    struct Balance has key {
+        coin: Coin
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance(account: &signer) {
+        let empty_coin = Coin { value: 0 };
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance { coin:  empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+    public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
+        // Only the owner of the module can initialize this module
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
+
+        // Deposit `amount` of tokens to `mint_addr`'s balance
+        deposit(mint_addr, Coin { value: amount });
+    }
+
+    /// Returns the balance of `owner`.
+    public fun balance_of(owner: address): u64 acquires Balance {
+        borrow_global<Balance>(owner).coin.value
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`.
+    public fun transfer(from: &signer, to: address, amount: u64) acquires Balance {
+        let check = withdraw(signer::address_of(from), amount);
+        deposit(to, check);
+    }
+
+    /// Withdraw `amount` number of tokens from the balance under `addr`.
+    fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+        let balance = balance_of(addr);
+        // balance must be greater than the withdraw amount
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin { value: amount }
+    }
+
+    /// Deposit `amount` number of tokens to the balance under `addr`.
+    fun deposit(addr: address, check: Coin) acquires Balance{
+        let balance = balance_of(addr);
+        let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure] // This test should abort
+    fun mint_non_owner(account: signer) acquires Balance {
+        // Make sure the address we've chosen doesn't match the module
+        // owner address
+        publish_balance(&account);
+        assert!(signer::address_of(&account) != MODULE_OWNER, 0);
+        mint(&account, @0x1, 10);
+    }
+
+    #[test(account = @NamedAddr)]
+    fun mint_check_balance(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        mint(&account, @NamedAddr, 42);
+        assert!(balance_of(addr) == 42, 0);
+    }
+
+    #[test(account = @0x1)]
+    fun publish_balance_has_zero(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        assert!(balance_of(addr) == 0, 0);
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure(abort_code = 2)] // Can specify an abort code
+    fun publish_balance_already_exists(account: signer) {
+        publish_balance(&account);
+        publish_balance(&account);
+    }
+
+    #[test]
+    #[expected_failure]
+    fun balance_of_dne() acquires Balance {
+        balance_of(@0x1);
+    }
+
+    #[test]
+    #[expected_failure]
+    fun withdraw_dne() acquires Balance {
+        // Need to unpack the coin since `Coin` is a resource
+        Coin { value: _ } = withdraw(@0x1, 0);
+    }
+
+    #[test(account = @0x1)]
+    #[expected_failure] // This test should fail
+    fun withdraw_too_much(account: signer) acquires Balance {
+        let addr = signer::address_of(&account);
+        publish_balance(&account);
+        Coin { value: _ } = withdraw(addr, 1);
+    }
+
+    #[test(account = @NamedAddr)]
+    fun can_withdraw_amount(account: signer) acquires Balance {
+        publish_balance(&account);
+        let amount = 1000;
+        let addr = signer::address_of(&account);
+        mint(&account, addr, amount);
+        let Coin { value } = withdraw(addr, amount);
+        assert!(value == amount, 0);
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..d7354c6ec
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,58 @@
+/// This module defines a minimal and generic Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin<phantom CoinType> has store {
+        value: u64
+    }
+
+    struct Balance<phantom CoinType> has key {
+        coin: Coin<CoinType>
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance<CoinType>(account: &signer) {
+        let empty_coin = Coin<CoinType> { value: 0 };
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance<CoinType> { coin:  empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the minting policy.
+    public fun mint<CoinType: drop>(mint_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        deposit(mint_addr, Coin<CoinType> { value: amount });
+    }
+
+    public fun balance_of<CoinType>(owner: address): u64 acquires Balance {
+        borrow_global<Balance<CoinType>>(owner).coin.value
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the transferring policy.
+    public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance {
+        let check = withdraw<CoinType>(signer::address_of(from), amount);
+        deposit<CoinType>(to, check);
+    }
+
+    fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+        let balance = balance_of<CoinType>(addr);
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin<CoinType> { value: amount }
+    }
+
+    fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance{
+        let balance = balance_of<CoinType>(addr);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move
new file mode 100644
index 000000000..1ca302bda
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move
@@ -0,0 +1,46 @@
+/// Module implementing an odd coin, where only odd number of coins can be
+/// transferred each time.
+module NamedAddr::MyOddCoin {
+    use std::signer;
+    use NamedAddr::BasicCoin;
+
+    struct MyOddCoin has drop {}
+
+    const ENOT_ODD: u64 = 0;
+
+    public fun setup_and_mint(account: &signer, amount: u64) {
+        BasicCoin::publish_balance<MyOddCoin>(account);
+        BasicCoin::mint<MyOddCoin>(signer::address_of(account), amount, MyOddCoin {});
+    }
+
+    public fun transfer(from: &signer, to: address, amount: u64) {
+        // amount must be odd.
+        assert!(amount % 2 == 1, ENOT_ODD);
+        BasicCoin::transfer<MyOddCoin>(from, to, amount, MyOddCoin {});
+    }
+
+    /*
+        Unit tests
+    */
+    #[test(from = @0x42, to = @0x10)]
+    fun test_odd_success(from: signer, to: signer) {
+        setup_and_mint(&from, 42);
+        setup_and_mint(&to, 10);
+
+        // transfer an odd number of coins so this should succeed.
+        transfer(&from, @0x10, 7);
+
+        assert!(BasicCoin::balance_of<MyOddCoin>(@0x42) == 35, 0);
+        assert!(BasicCoin::balance_of<MyOddCoin>(@0x10) == 17, 0);
+    }
+
+    #[test(from = @0x42, to = @0x10)]
+    #[expected_failure]
+    fun test_not_odd_failure(from: signer, to: signer) {
+        setup_and_mint(&from, 42);
+        setup_and_mint(&to, 10);
+
+        // transfer an even number of coins so this should fail.
+        transfer(&from, @0x10, 8);
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..3a5ec81e3
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,62 @@
+/// This module defines a minimal and generic Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+
+    struct Coin<phantom CoinType> has store {
+        value: u64
+    }
+
+    struct Balance<phantom CoinType> has key {
+        coin: Coin<CoinType>
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance<CoinType>(account: &signer) {
+        let empty_coin = Coin<CoinType> { value: 0 };
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance<CoinType> { coin: empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the minting policy.
+    public fun mint<CoinType: drop>(mint_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        deposit(mint_addr, Coin<CoinType> { value: amount });
+    }
+
+    public fun balance_of<CoinType>(owner: address): u64 acquires Balance {
+        borrow_global<Balance<CoinType>>(owner).coin.value
+    }
+
+    spec balance_of {
+        pragma aborts_if_is_strict;
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can  decide the transferring policy.
+    public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance {
+        let check = withdraw<CoinType>(signer::address_of(from), amount);
+        deposit<CoinType>(to, check);
+    }
+
+    fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+        let balance = balance_of<CoinType>(addr);
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin<CoinType> { value: amount }
+    }
+
+    fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance{
+        let balance = balance_of<CoinType>(addr);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/Move.toml
new file mode 100644
index 000000000..6052ad692
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..d936ca43f
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,100 @@
+/// This module defines a minimal and generic Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+    const EEQUAL_ADDR: u64 = 4;
+
+    struct Coin<phantom CoinType> has store {
+        value: u64
+    }
+
+    struct Balance<phantom CoinType> has key {
+        coin: Coin<CoinType>
+    }
+
+    /// Publish an empty balance resource under `account`'s address. This function must be called before
+    /// minting or transferring to the account.
+    public fun publish_balance<CoinType>(account: &signer) {
+        let empty_coin = Coin<CoinType> { value: 0 };
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance<CoinType> { coin: empty_coin });
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the minting policy.
+    public fun mint<CoinType: drop>(mint_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        deposit(mint_addr, Coin<CoinType> { value: amount });
+    }
+
+    public fun balance_of<CoinType>(owner: address): u64 acquires Balance {
+        borrow_global<Balance<CoinType>>(owner).coin.value
+    }
+
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the transferring policy.
+    public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance {
+        let from_addr = signer::address_of(from);
+        assert!(from_addr != to, EEQUAL_ADDR);
+        let check = withdraw<CoinType>(from_addr, amount);
+        deposit<CoinType>(to, check);
+    }
+
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+
+    fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+        let balance = balance_of<CoinType>(addr);
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin<CoinType> { value: amount }
+    }
+
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures result == Coin<CoinType> { value: amount };
+        ensures balance_post == balance - amount;
+    }
+
+    fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance{
+        let balance = balance_of<CoinType>(addr);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+}
diff --git a/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/Move.toml b/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/Move.toml
new file mode 100644
index 000000000..0b9d0240c
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "BasicCoin"
+version = "0.0.0"
+
+[addresses]
+NamedAddr = "0xDEADBEEF"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move b/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move
new file mode 100644
index 000000000..921ffa36c
--- /dev/null
+++ b/vendors/move/crates/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move
@@ -0,0 +1,137 @@
+/// This module defines a minimal and generic Coin and Balance.
+module NamedAddr::BasicCoin {
+    use std::signer;
+
+    /// Error codes
+    const ENOT_MODULE_OWNER: u64 = 0;
+    const EINSUFFICIENT_BALANCE: u64 = 1;
+    const EALREADY_HAS_BALANCE: u64 = 2;
+    const EALREADY_INITIALIZED: u64 = 3;
+    const EEQUAL_ADDR: u64 = 4;
+
+    struct Coin<phantom CoinType> has store {
+        value: u64
+    }
+
+    struct Balance<phantom CoinType> has key {
+        coin: Coin<CoinType>
+    }
+
+    public fun publish_balance<CoinType>(account: &signer) {
+        let empty_coin = Coin<CoinType> { value: 0 };
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
+        move_to(account, Balance<CoinType> { coin: empty_coin });
+    }
+
+    spec publish_balance {
+        include Schema_publish<CoinType> {addr: signer::address_of(account), amount: 0};
+    }
+
+    spec schema Schema_publish<CoinType> {
+        addr: address;
+        amount: u64;
+
+        aborts_if exists<Balance<CoinType>>(addr);
+
+        ensures exists<Balance<CoinType>>(addr);
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+
+        ensures balance_post == amount;
+    }
+
+    /// Mint `amount` tokens to `mint_addr`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the minting policy.
+    public fun mint<CoinType: drop>(mint_addr: address, amount: u64, _witness: CoinType) acquires Balance {
+        // Deposit `total_value` amount of tokens to mint_addr's balance
+        deposit(mint_addr, Coin<CoinType> { value: amount });
+    }
+
+    spec mint {
+        include DepositSchema<CoinType> {addr: mint_addr, amount};
+    }
+
+    public fun balance_of<CoinType>(owner: address): u64 acquires Balance {
+        borrow_global<Balance<CoinType>>(owner).coin.value
+    }
+
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+
+    /// Transfers `amount` of tokens from `from` to `to`. This method requires a witness with `CoinType` so that the
+    /// module that owns `CoinType` can decide the transferring policy.
+    public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance {
+        let from_addr = signer::address_of(from);
+        assert!(from_addr != to, EEQUAL_ADDR);
+        let check = withdraw<CoinType>(from_addr, amount);
+        deposit<CoinType>(to, check);
+    }
+
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr_from);
+        aborts_if !exists<Balance<CoinType>>(to);
+        aborts_if balance_from < amount;
+        aborts_if balance_to + amount > MAX_U64;
+        aborts_if addr_from == to;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+
+    fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+        let balance = balance_of<CoinType>(addr);
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        *balance_ref = balance - amount;
+        Coin<CoinType> { value: amount }
+    }
+
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures result == Coin<CoinType> { value: amount };
+        ensures balance_post == balance - amount;
+    }
+
+    fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance{
+        let balance = balance_of<CoinType>(addr);
+        let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+        let Coin { value } = check;
+        *balance_ref = balance + value;
+    }
+
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+
+    spec schema DepositSchema<CoinType> {
+        addr: address;
+        amount: u64;
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + amount > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + amount;
+    }
+}
diff --git a/vendors/move/crates/enum-compat-util/Cargo.toml b/vendors/move/crates/enum-compat-util/Cargo.toml
new file mode 100644
index 000000000..ba897d410
--- /dev/null
+++ b/vendors/move/crates/enum-compat-util/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "enum-compat-util"
+version = "0.1.0"
+authors = ["Mysten Labs <build@mystenlabs.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+serde_yaml.workspace = true
diff --git a/vendors/move/crates/enum-compat-util/src/lib.rs b/vendors/move/crates/enum-compat-util/src/lib.rs
new file mode 100644
index 000000000..f90be77a4
--- /dev/null
+++ b/vendors/move/crates/enum-compat-util/src/lib.rs
@@ -0,0 +1,48 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::io::Write;
+use std::path::PathBuf;
+
+pub trait EnumOrderMap {
+    fn order_to_variant_map() -> std::collections::BTreeMap<u64, String>;
+}
+
+pub fn check_enum_compat_order<T: EnumOrderMap>(snapshot_file: PathBuf) {
+    let new_map = T::order_to_variant_map();
+
+    if let Err(err) = std::fs::read_to_string(snapshot_file.clone()) {
+        if err.kind() == std::io::ErrorKind::NotFound {
+            // Create the file if not exists
+            std::fs::create_dir_all(snapshot_file.parent().unwrap()).unwrap();
+            let mut file = std::fs::File::create(snapshot_file).unwrap();
+            let content: String = serde_yaml::to_string(&new_map).unwrap();
+
+            write!(file, "{}", content).unwrap();
+            return;
+        }
+        panic!("Error reading file: {:?}: err {:?}", snapshot_file, err);
+    }
+
+    let existing_map: std::collections::BTreeMap<u64, String> =
+        serde_yaml::from_str(&std::fs::read_to_string(snapshot_file.clone()).unwrap()).unwrap();
+
+    // Check that the new map includes the existing map in order
+    for (pos, val) in existing_map {
+        match new_map.get(&pos) {
+            None => {
+                panic!("Enum variant {} has been removed. Not allowed: enum must be backward compatible.", val);
+            }
+            Some(new_val) if new_val == &val => continue,
+            Some(new_val) => {
+                panic!("Enum variant {val} has been swapped with {new_val} at position {pos}. Not allowed: enum must be backward compatible.");
+            }
+        }
+    }
+
+    // Update the file
+    let mut file = std::fs::File::create(snapshot_file).unwrap();
+    let content: String = serde_yaml::to_string(&new_map).unwrap();
+
+    write!(file, "{}", content).unwrap();
+}
diff --git a/vendors/move/crates/evm/README.md b/vendors/move/crates/evm/README.md
new file mode 100644
index 000000000..883e3bd88
--- /dev/null
+++ b/vendors/move/crates/evm/README.md
@@ -0,0 +1,15 @@
+# Move-on-EVM
+
+> NOTE: this tree contains an experimental version of Move which runs on the EVM. The programming model is
+> different from regular Move. The examples in this directory do not work with the usual Move
+> tools and blockchains.
+
+"Move-on-EVM" is a programming model in Move for EVM. In the current model, *each Move EVM contract has its own isolated address space*. This reflects the setup of the EVM most naturally, where storage between contracts cannot be shared apart from via accessor contract functions. Move EVM contracts use attributes to indicate the usage of structs for storage and events, and for functions to be callable from other contracts. It is expected that there is some codegen of Move from these attributes. For example, functions marked as `callable` have a generated API for cross-contract EVM call and delegate invocations. The module [Evm.move](./stdlib/sources/Evm.move) contains the API of a Move contract to the EVM. It encapsulates access to the transaction context and other EVM builtins
+
+This directory contains the following sub-directories:
+- [move-to-yul](./move-to-yul) is a cross compiler that compiles Move contracts to the intermediate language Yul.
+- [stdlib](./stdlib) is the standard library for Move-on-EVM.
+- [examples](./examples) contains multiple Move-on-EVM examples including ERC20, ERC721 and ERC1155.
+- [hardhat-examples](./hardhat-examples) is a Hardhat project to demonstrate Move-on-EVM.
+- [hardhat-move](./hardhat-move) is a Hardhat plugin to support the Move language.
+- [exec-utils](./exec-utils) contains EVM execution utils.
diff --git a/vendors/move/crates/evm/examples/Move.toml b/vendors/move/crates/evm/examples/Move.toml
new file mode 100644
index 000000000..2c513660c
--- /dev/null
+++ b/vendors/move/crates/evm/examples/Move.toml
@@ -0,0 +1,12 @@
+[package]
+name = "EvmExamples"
+version = "1.5.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+MoveStdlib = { local = "../../move-stdlib" }
+MoveNursery = { local = "../../move-stdlib/nursery" }
+EvmStdlib = { local = "../stdlib" }
diff --git a/vendors/move/crates/evm/examples/README.md b/vendors/move/crates/evm/examples/README.md
new file mode 100644
index 000000000..1098286db
--- /dev/null
+++ b/vendors/move/crates/evm/examples/README.md
@@ -0,0 +1,14 @@
+# Move-on-EVM Examples
+
+This directory contains (a growing set of) examples of "Move-on-EVM", a programming model in Move for EVM.
+
+- [Token.move](./sources/Token.move) contains an implementation of ERC20 which is intended to be compliant and callable
+  from other EVM code (Move or otherwise).
+- [Faucet.move](./sources/Faucet.move) contains the faucet example from the Ethereum book.
+- [ERC20.move](./sources/ERC20.move) contains another implementation of the ERC20 standard which uses a single `struct` to represent the contract state.
+- [ERC165.move](./sources/ERC165.move) contains a sample implementation of the ERC165 standard.
+- [ERC721.move](./sources/ERC721.move) contains an implementation of ERC721 which is the standard for non-fungible tokens.
+- [ERC1155.move](./sources/ERC1155.move) contains an implementation of ERC1155 which is the standard for multi-tokens.
+- [TestUniswap.move](./sources/TestUniswap.move) and [TestUniswapLiquidity.move](./sources/TestUniswapLiquidity.move) are the sample client modules of `Uniswap`.
+
+This directory is a Move package. To build the source files, use `move build`. Moreover, use `move test` to run the unit tests located in the `tests` directory.
diff --git a/vendors/move/crates/evm/examples/sources/ERC1155.move b/vendors/move/crates/evm/examples/sources/ERC1155.move
new file mode 100644
index 000000000..9395a888f
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/ERC1155.move
@@ -0,0 +1,270 @@
+#[evm_contract]
+/// An implementation of the ERC-1155 Multi Token Standard.
+module Evm::ERC1155 {
+    use Evm::Evm::{sender, self, sign, emit, isContract};
+    use Evm::IERC1155Receiver;
+    use Evm::IERC165;
+    use Evm::IERC1155;
+    use Evm::Table::{Self, Table};
+    use Evm::Result;
+    use Evm::U256::{Self, U256};
+    use std::ascii::{String};
+    use std::errors;
+    use std::vector;
+
+    #[event]
+    struct TransferSingle {
+        operator: address,
+        from: address,
+        to: address,
+        id: U256,
+        value: U256,
+    }
+
+    #[event]
+    struct TransferBatch {
+        operator: address,
+        from: address,
+        to: address,
+        ids: vector<U256>,
+        values: vector<U256>,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        owner: address,
+        operator: address,
+        approved: bool,
+    }
+
+    #[event]
+    struct URI {
+        value: String,
+        id: U256,
+    }
+
+    #[storage]
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        balances: Table<U256, Table<address, U256>>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+        uri: String,
+        owner: address, // Implements the "ownable" pattern.
+    }
+
+    #[create]
+    /// Constructor of this contract.
+    public fun create(uri: String) {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                balances: Table::empty<U256, Table<address, U256>>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+                uri,
+                owner: sender(),
+            }
+        );
+    }
+
+    #[callable, view]
+    /// Returns the name of the token
+    public fun uri(): String acquires State {
+        borrow_global<State>(self()).uri
+    }
+
+    #[callable, view]
+    /// Get the balance of an account's token.
+    public fun balanceOf(account: address, id: U256): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, id, account)
+    }
+
+    #[callable, view]
+    /// Get the balance of multiple account/token pairs.
+    public fun balanceOfBatch(accounts: vector<address>, ids: vector<U256>): vector<U256> acquires State {
+        assert!(vector::length(&accounts) == vector::length(&ids), errors::invalid_argument(0));
+        let len = vector::length(&accounts);
+        let i = 0;
+        let balances = vector::empty<U256>();
+        while(i < len) {
+            vector::push_back(
+                &mut balances,
+                balanceOf(
+                    *vector::borrow(&accounts, i),
+                    *vector::borrow(&ids, i)
+                )
+            );
+            i = i + 1;
+        };
+        balances
+    }
+
+    #[callable, view]
+    /// Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        let s = borrow_global_mut<State>(self());
+        let operatorApproval = mut_operatorApprovals(s, sender(), operator);
+        *operatorApproval = approved;
+        emit(ApprovalForAll{owner: sender(), operator, approved});
+    }
+
+    #[callable, view]
+    /// Queries the approval status of an operator for a given owner.
+    public fun isApprovalForAll(account: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApprovals(s, account, operator)
+    }
+
+    #[callable]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeTransferFrom(from: address, to: address, id: U256, amount: U256, _data: vector<u8>) acquires State {
+        assert!(from == sender() || isApprovalForAll(from, sender()), errors::invalid_argument(0));
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_from = mut_balanceOf(s, copy id, from);
+        assert!(U256::le(copy amount, *mut_balance_from), errors::invalid_argument(0));
+        *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        // TODO: Unit testing does not support events yet.
+        //let operator = sender();
+        //emit(TransferSingle{operator, from, to, id: copy id, value: copy amount});
+        // TODO: Unit testing does not support the following function.
+        //doSafeTransferAcceptanceCheck(operator, from, to, id, amount, data);
+    }
+
+    #[callable]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeBatchTransferFrom(from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) acquires State {
+        assert!(from == sender() || isApprovalForAll(from, sender()), errors::invalid_argument(0));
+        assert!(vector::length(&amounts) == vector::length(&ids), errors::invalid_argument(0));
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let operator = sender();
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_from = mut_balanceOf(s, copy id, from);
+            assert!(U256::le(copy amount, *mut_balance_from), errors::invalid_argument(0));
+            *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+
+        emit(TransferBatch{operator, from, to, ids: copy ids, values: copy amounts});
+
+        doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, amounts, data);
+    }
+
+    #[callable]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        &interfaceId == &IERC1155::interfaceId() || &interfaceId == &IERC165::interfaceId()
+    }
+
+    #[callable]
+    public fun owner(): address acquires State {
+        borrow_global_mut<State>(self()).owner
+    }
+
+    #[callable]
+    // Query if this contract implements a certain interface.
+    public fun mint(to: address, id: U256, amount: U256, _data: vector<u8>) acquires State {
+        assert!(sender() == owner(), errors::invalid_argument(0)); // Only owner can mint.
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        // TODO: Unit testing does not support events yet.
+        //emit(TransferSingle{operator: sender(), from: @0x0, to, id: copy id, value: copy amount});
+    }
+
+    #[callable]
+    // Query if this contract implements a certain interface.
+    public fun mintBatch(to: address, ids: vector<U256>, amounts: vector<U256>, _data: vector<u8>) acquires State {
+        assert!(sender() == owner(), errors::invalid_argument(0)); // Only owner can mint.
+        assert!(vector::length(&amounts) == vector::length(&ids), errors::invalid_argument(0));
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+        // TODO: Unit testing does not support events yet.
+        //emit(TransferBatch{operator: sender(), from: @0x0, to, ids: copy ids, values: copy amounts});
+    }
+
+    /// Helper function to return a mut ref to the operatorApproval
+    fun mut_operatorApprovals(s: &mut State, account: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &account)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &account,
+                Table::empty<address, bool>()
+            )
+        };
+        let operatorApproval_account = Table::borrow_mut(
+            &mut s.operatorApprovals,
+            &account
+        );
+        Table::borrow_mut_with_default(operatorApproval_account, &operator, false)
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, id: U256, account: address): &mut U256 {
+        if(!Table::contains(&s.balances, &id)) {
+            Table::insert(
+                &mut s.balances,
+                &id,
+                Table::empty<address, U256>()
+            )
+        };
+        let balances_id = Table::borrow_mut(&mut s.balances, &id);
+        Table::borrow_mut_with_default(balances_id, &account, U256::zero())
+    }
+
+    /// Helper function for the safe transfer acceptance check.
+    fun doSafeTransferAcceptanceCheck(operator: address, from: address, to: address, id: U256, amount: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver::call_onERC1155Received(to, operator, from, id, amount, data);
+            if (Result::is_ok(&result)) {
+                let retval = Result::unwrap(result);
+                let expected = IERC1155Receiver::selector_onERC1155Received();
+                assert!(retval == expected, errors::custom(0));
+            }
+            else {
+                let _error = Result::unwrap_err(result);
+                abort(errors::custom(1)) // TODO: abort with the `_error` value.
+            }
+        }
+    }
+
+    /// Helper function for the safe batch transfer acceptance check.
+    fun doSafeBatchTransferAcceptanceCheck(operator: address, from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver::call_onERC1155BatchReceived(to, operator, from, ids, amounts, data);
+            if (Result::is_ok(&result)) {
+                let retval = Result::unwrap(result);
+                let expected = IERC1155Receiver::selector_onERC1155BatchReceived();
+                assert!(retval == expected, errors::custom(0));
+            }
+            else {
+                let _error = Result::unwrap_err(result);
+                abort(errors::custom(1)) // TODO: abort with the `_error` value.
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/ERC165.move b/vendors/move/crates/evm/examples/sources/ERC165.move
new file mode 100644
index 000000000..274650423
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/ERC165.move
@@ -0,0 +1,14 @@
+#[evm_contract]
+/// An implementation of the ERC-165.
+module Evm::ERC165 {
+    use Evm::IERC165;
+    use std::errors;
+    use std::vector;
+
+    // Query if a contract implements an interface.
+    // The length of `interfaceId` is required to be 4.
+    public fun supportInterface(interfaceId: vector<u8>): bool {
+        assert!(vector::length(&interfaceId) == 4, errors::invalid_argument(0));
+        (interfaceId == IERC165::selector_supportInterface())
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/ERC20.move b/vendors/move/crates/evm/examples/sources/ERC20.move
new file mode 100644
index 000000000..58321e9b2
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/ERC20.move
@@ -0,0 +1,160 @@
+#[evm_contract]
+/// An implementation of the ERC-20 Token Standard.
+module Evm::ERC20 {
+    use Evm::Evm::{sender, self, sign, emit};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+    use std::ascii::{String};
+    use std::errors;
+
+    #[event]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event]
+    struct Approval {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+    #[storage]
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        balances: Table<address, U256>,
+        allowances: Table<address, Table<address, U256>>,
+        total_supply: U256,
+        name: String,
+        symbol: String,
+    }
+
+    #[create]
+    /// Constructor of this contract.
+    public fun create(name: String, symbol: String, initial_supply: U256) acquires State {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                total_supply: U256::zero(),
+                balances: Table::empty<address, U256>(),
+                allowances: Table::empty<address, Table<address, U256>>(),
+                name,
+                symbol,
+            }
+        );
+        // Minting the initial supply
+        mint(sender(), initial_supply);
+    }
+
+    #[callable, view]
+    /// Returns the name of the token
+    public fun name(): String acquires State {
+        borrow_global<State>(self()).name
+    }
+
+    #[callable, view]
+    /// Returns the symbol of the token, usually a shorter version of the name.
+    public fun symbol(): String acquires State {
+        borrow_global<State>(self()).symbol
+    }
+
+    #[callable, view]
+    /// Returns the number of decimals used to get its user representation.
+    public fun decimals(): u8 {
+        18
+    }
+
+    #[callable, view]
+    /// Returns the total supply of the token.
+    public fun totalSupply(): U256 acquires State {
+        borrow_global<State>(self()).total_supply
+    }
+
+    #[callable, view]
+    /// Returns the balance of an account.
+    public fun balanceOf(owner: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(to: address, amount: U256): bool acquires State {
+        assert!(sender() != to, errors::invalid_argument(0));
+        do_transfer(sender(), to, amount);
+        true
+    }
+
+    #[callable]
+    /// Transfers the amount on behalf of the `from` account to the given account.
+    /// This evaluates and adjusts the allowance.
+    public fun transferFrom(from: address, to: address, amount: U256): bool acquires State {
+        assert!(sender() != to, errors::invalid_argument(0));
+        let s = borrow_global_mut<State>(self());
+        let allowance_for_sender = mut_allowance(s, from, sender());
+        assert!(U256::le(copy amount, *allowance_for_sender), errors::limit_exceeded(0));
+        *allowance_for_sender = U256::sub(*allowance_for_sender, copy amount);
+        do_transfer(from, to, amount);
+        true
+    }
+
+    #[callable]
+    /// Approves that the spender can spent the given amount on behalf of the calling account.
+    public fun approve(spender: address, amount: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        if(!Table::contains(&s.allowances, &sender())) {
+            Table::insert(&mut s.allowances, &sender(), Table::empty<address, U256>())
+        };
+        let a = Table::borrow_mut(&mut s.allowances, &sender());
+        Table::insert(a, &spender, copy amount);
+        emit(Approval{owner: sender(), spender, value: amount});
+        true
+    }
+
+    #[callable, view]
+    /// Returns the allowance an account owner has approved for the given spender.
+    public fun allowance(owner: address, spender: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_allowance(s, owner, spender)
+    }
+
+    /// Helper function to perform a transfer of funds.
+    fun do_transfer(from: address, to: address, amount: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        let from_bal = mut_balanceOf(s, from);
+        assert!(U256::le(copy amount, *from_bal), errors::limit_exceeded(0));
+        *from_bal = U256::sub(*from_bal, copy amount);
+        let to_bal = mut_balanceOf(s, to);
+        *to_bal = U256::add(*to_bal, copy amount);
+        // TODO: Unit testing does not support events yet.
+        //emit(Transfer{from, to, value: amount});
+    }
+
+    /// Helper function to return a mut ref to the allowance of a spender.
+    fun mut_allowance(s: &mut State, owner: address, spender: address): &mut U256 {
+        if(!Table::contains(&s.allowances, &owner)) {
+            Table::insert(&mut s.allowances, &owner, Table::empty<address, U256>())
+        };
+        let allowance_owner = Table::borrow_mut(&mut s.allowances, &owner);
+        Table::borrow_mut_with_default(allowance_owner, &spender, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+
+    /// Create `amount` tokens and assigns them to `account`, increasing
+    /// the total supply.
+    fun mint(account: address, amount: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.total_supply = U256::add(s.total_supply, amount);
+        let mut_bal_account = mut_balanceOf(s, account);
+        *mut_bal_account = U256::add(*mut_bal_account, amount);
+        // TODO: Unit testing does not support events yet.
+        //emit(Transfer{from: @0x0, to: account, value: amount});
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/ERC721.move b/vendors/move/crates/evm/examples/sources/ERC721.move
new file mode 100644
index 000000000..1d1fdf3b8
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/ERC721.move
@@ -0,0 +1,246 @@
+#[evm_contract]
+/// An implementation of the ERC-721 Non-Fungible Token Standard.
+module Evm::ERC721 {
+    use Evm::Evm::{sender, self, sign, emit, isContract, tokenURI_with_baseURI};
+    use Evm::Result;
+    use Evm::IERC721Receiver;
+    use Evm::IERC721Metadata;
+    use Evm::IERC721;
+    use Evm::IERC165;
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+    use std::ascii::{Self, String};
+    use std::errors;
+    use std::vector;
+
+    #[event]
+    struct Transfer {
+        from: address,
+        to: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct Approval {
+        owner: address,
+        approved: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        owner: address,
+        operator: address,
+        approved: bool,
+    }
+
+    #[storage]
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        name: String,
+        symbol: String,
+        owners: Table<U256, address>,
+        balances: Table<address, U256>,
+        tokenApprovals: Table<U256, address>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+    }
+
+    #[create]
+    /// Constructor of this contract.
+    public fun create(name: String, symbol: String) {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                name,
+                symbol,
+                owners: Table::empty<U256, address>(),
+                balances: Table::empty<address, U256>(),
+                tokenApprovals: Table::empty<U256, address>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+            }
+        );
+    }
+
+    #[callable]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        &interfaceId == &IERC721::interfaceId() ||
+            &interfaceId == &IERC721Metadata::interfaceId() ||
+            &interfaceId == &IERC165::interfaceId()
+    }
+
+    #[callable]
+    /// Get the name.
+    public fun name(): String acquires State {
+        let s = borrow_global<State>(self());
+        s.name
+    }
+
+    #[callable]
+    /// Get the symbol.
+    public fun symbol(): String acquires State {
+        let s = borrow_global<State>(self());
+        s.symbol
+    }
+
+    #[callable]
+    /// Get the name.
+    public fun tokenURI(tokenId: U256): String {
+        let baseURI = b""; // TODO: Implement this.
+        ascii::string(tokenURI_with_baseURI(baseURI, tokenId))
+    }
+
+    #[callable]
+    /// Count all NFTs assigned to an owner.
+    public fun balanceOf(owner: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable]
+    /// Find the owner of an NFT.
+    public fun ownerOf(tokenId: U256): address acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_ownerOf(s, tokenId)
+    }
+
+    #[callable(name=safeTransferFrom)] // Overloading `safeTransferFrom`
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom_with_data(from: address, to: address, tokenId: U256, data: vector<u8>) acquires State {
+        transferFrom(from, to, copy tokenId);
+        doSafeTransferAcceptanceCheck(from, to, tokenId, data);
+
+    }
+
+    #[callable]
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom(from: address, to: address, tokenId: U256) acquires State {
+        safeTransferFrom_with_data(from, to, tokenId, b"");
+    }
+
+    #[callable]
+    /// Transfer ownership of an NFT. THE CALLER IS RESPONSIBLE
+    ///  TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///  THEY MAY BE PERMANENTLY LOST
+    public fun transferFrom(from: address, to: address, tokenId: U256) acquires State {
+        assert!(isApprovedOrOwner(sender(), copy tokenId), errors::invalid_argument(0));
+        assert!(ownerOf(copy tokenId) == from, errors::invalid_argument(0));
+        assert!(to != @0x0, errors::invalid_argument(0));
+
+        // Clear approvals from the previous owner
+        approve(@0x0, copy tokenId);
+
+        let s = borrow_global_mut<State>(self());
+
+        let mut_balance_from = mut_balanceOf(s, from);
+        *mut_balance_from = U256::sub(*mut_balance_from, U256::one());
+
+        let mut_balance_to = mut_balanceOf(s, to);
+        *mut_balance_to = U256::add(*mut_balance_to, U256::one());
+
+        let mut_owner_token = mut_ownerOf(s, copy tokenId);
+        *mut_owner_token = to;
+
+        emit(Transfer{from, to, tokenId});
+    }
+
+    #[callable]
+    /// Change or reaffirm the approved address for an NFT.
+    public fun approve(approved: address, tokenId: U256) acquires State {
+        let owner = ownerOf(copy tokenId);
+        assert!(owner != @0x0, errors::invalid_argument(0));
+        assert!(approved != owner, errors::invalid_argument(0));
+        assert!(sender() == owner || isApprovedForAll(owner, sender()), errors::invalid_argument(0));
+
+        let s = borrow_global_mut<State>(self());
+        *mut_tokenApproval(s, copy tokenId) = approved;
+        emit(Approval{ owner, approved, tokenId})
+    }
+
+    #[callable]
+    /// Enable or disable approval for a third party ("operator") to manage
+    ///  all of the sender's assets.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, sender(), operator) = approved;
+    }
+
+    #[callable]
+    /// Get the approved address for a single NFT.
+    public fun getApproved(tokenId: U256): address acquires State {
+        let s = borrow_global_mut<State>(self());
+        assert!(tokenExists(s, copy tokenId), errors::invalid_argument(0));
+        *mut_tokenApproval(s, tokenId)
+    }
+
+    #[callable]
+    /// Query if an address is an authorized operator for another address.
+    public fun isApprovedForAll(owner: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, owner, operator)
+    }
+
+    /// Helper function to return true iff `spender` is the owner or an approved one for `tokenId`.
+    fun isApprovedOrOwner(spender: address, tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        assert!(tokenExists(s, copy tokenId), errors::invalid_argument(0));
+        let owner = ownerOf(copy tokenId);
+        return (spender == owner || getApproved(tokenId) == spender || isApprovedForAll(owner, spender))
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_ownerOf(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.owners, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_tokenApproval(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.tokenApprovals, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the operator approval.
+    fun mut_operatorApproval(s: &mut State, owner: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &owner)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &owner,
+                Table::empty<address, bool>()
+            )
+        };
+        let approvals = Table::borrow_mut(&mut s.operatorApprovals, &owner);
+        Table::borrow_mut_with_default(approvals, &operator, false)
+    }
+
+    /// Helper function to return true iff the token exists.
+    fun tokenExists(s: &mut State, tokenId: U256): bool {
+        let mut_ownerOf_tokenId = mut_ownerOf(s, tokenId);
+        *mut_ownerOf_tokenId != @0x0
+    }
+
+    /// Helper function for the acceptance check.
+    fun doSafeTransferAcceptanceCheck(from: address, to: address, tokenId: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC721Receiver::try_call_onERC721Received(to, sender(), from, tokenId, data);
+            if (Result::is_ok(&result)) {
+                let retval = Result::unwrap(result);
+                let expected = IERC721Receiver::selector_onERC721Received();
+                assert!(retval == expected, errors::custom(0));
+            }
+            else {
+                let error_reason = Result::unwrap_err(result);
+                if(vector::length(&error_reason) == 0) {
+                    abort(errors::custom(1)) // ERC721: transfer to non ERC721Receiver implementer
+                }
+                else {
+                    abort(errors::custom(2)) // TODO: abort with the `_error` value.
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/Faucet.move b/vendors/move/crates/evm/examples/sources/Faucet.move
new file mode 100644
index 000000000..fc4b2c0eb
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/Faucet.move
@@ -0,0 +1,58 @@
+#[evm_contract]
+/// Faucet example in the Ethereum book.
+module 0x42::Faucet {
+    use Evm::Evm::{sender, value, self, sign, balance, transfer, emit};
+    use Evm::U256::{Self, U256};
+    use std::errors;
+
+    #[storage]
+    struct State has key {
+        owner: address,
+    }
+
+    #[event]
+    struct WithdrawalEvent {
+        to: address,
+        amount: U256
+    }
+
+    #[event]
+    struct DepositEvent {
+        from: address,
+        amount: U256
+    }
+
+    #[create]
+    public fun create() {
+        move_to<State>(&sign(self()), State{owner: sender()})
+    }
+
+    #[delete]
+    public fun delete() acquires State {
+        let state = borrow_global<State>(self());
+        assert!(sender() == state.owner, errors::requires_address(0));
+    }
+
+    #[receive, payable]
+    public fun receive() {
+        emit(DepositEvent{from: sender(), amount: value()})
+    }
+
+    #[callable]
+    public fun withdraw(amount: U256) acquires State {
+        let state = borrow_global<State>(self());
+
+        // Don't allow to withdraw from self.
+        assert!(state.owner != self(), errors::invalid_argument(0));
+
+        // Limit withdrawal amount
+        assert!(U256::le(copy amount, U256::u256_from_u128(100)), errors::invalid_argument(0));
+
+        // Funds must be available.
+        assert!(U256::le(copy amount, balance(self())), errors::limit_exceeded(0));
+
+        // Transfer funds
+        transfer(sender(), copy amount);
+        emit(WithdrawalEvent{to: sender(), amount})
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC1155.move b/vendors/move/crates/evm/examples/sources/IERC1155.move
new file mode 100644
index 000000000..320bfc27b
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC1155.move
@@ -0,0 +1,13 @@
+#[interface]
+/// The interface for ERC-1155.
+/// This module defines the API for the interface of ERC-1155 and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC1155 {
+
+    #[interface_id]
+    /// Return the interface identifier.
+    // TODO: complete this function.
+   public native fun interfaceId(): vector<u8>;
+
+    // TODO: complete this module.
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC1155Receiver.move b/vendors/move/crates/evm/examples/sources/IERC1155Receiver.move
new file mode 100644
index 000000000..05bf35590
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC1155Receiver.move
@@ -0,0 +1,36 @@
+#[interface]
+/// The interface for ERC-721 Token Receiver.
+/// This module defines the API for the interface of ERC-721 Token Receiver and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC1155Receiver {
+    use Evm::Evm::{keccak256, bytes4, bytes_xor};
+    use Evm::Result::{Result};
+    use Evm::U256::{U256};
+
+    #[external]
+    public native fun call_onERC1155Received(contract: address, operator: address, from: address, id: U256, amount: U256, bytes: vector<u8>): Result<vector<u8>, vector<u8>>;
+
+    #[external]
+    public native fun call_onERC1155BatchReceived(contract: address, operator: address, from: address, ids: vector<U256>, amounts: vector<U256>, bytes: vector<u8>): Result<vector<u8>, vector<u8>>;
+
+    #[selector]
+    /// Return the selector of the function `onERC1155Received`
+    public fun selector_onERC1155Received(): vector<u8> {
+        bytes4(keccak256(b"onERC1155Received(address,address,uint256,uint256,bytes)"))
+    }
+
+    #[selector]
+    /// Return the selector of the function `onERC1155Received`
+    public fun selector_onERC1155BatchReceived(): vector<u8> {
+        bytes4(keccak256(b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))
+    }
+
+    #[interface_id]
+    /// Return the interface identifier of this interface.
+    public fun interfaceId(): vector<u8> {
+        bytes_xor(
+            selector_onERC1155Received(),
+            selector_onERC1155BatchReceived()
+        )
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC165.move b/vendors/move/crates/evm/examples/sources/IERC165.move
new file mode 100644
index 000000000..c1390602e
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC165.move
@@ -0,0 +1,28 @@
+#[interface]
+/// The interface for the ERC-165.
+/// This module defines the API for the interface of ERC-165 and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC165 {
+    use Evm::Evm::{keccak256, bytes4};
+    use Evm::Result::{Result};
+
+    #[external]
+    public native fun call_supportInterface(contract: address, interfaceId: vector<u8>): Result<bool, vector<u8>>;
+
+    #[selector]
+    public fun selector_supportInterface(): vector<u8> {
+        bytes4(keccak256(b"supportInterface(bytes4)"))
+    }
+
+    #[interface_id]
+    /// Return the interface identifier. This function corresponds to
+    /// `type(I).interfaceId` in Solidity where `I` is an interface.
+    // The following is a excerpt from the Solidity documentation:
+    //   A bytes4 value containing the EIP-165 interface identifier of
+    //   the given interface I. This identifier is defined as the XOR
+    //   of all function selectors defined within the interface itself
+    //   - excluding all inherited functions.
+    public fun interfaceId(): vector<u8> {
+        selector_supportInterface()
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC20.move b/vendors/move/crates/evm/examples/sources/IERC20.move
new file mode 100644
index 000000000..77bb95bd1
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC20.move
@@ -0,0 +1,23 @@
+#[interface]
+/// The interface for ERC-20.
+/// This module defines the API for the interface of ERC-20 and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC20 {
+    use Evm::U256::{U256};
+
+    #[external(sig=b"transferFrom(address,address,uint) returns (bool)")]
+    public native fun call_transferFrom(contract: address, from: address, to: address, amount: U256): bool;
+
+    #[external(sig=b"approve(address,uint) returns (bool)")]
+    public native fun call_approve(contract: address, spender: address, amount: U256): bool;
+
+    #[external(sig=b"balanceOf(address) returns (uint)")]
+    public native fun call_balanceOf(contract: address, account: address): U256;
+
+    #[interface_id]
+    /// Return the interface identifier.
+    // TODO: complete this function.
+   public native fun interfaceId(): vector<u8>;
+
+    // TODO: complete this module.
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC721.move b/vendors/move/crates/evm/examples/sources/IERC721.move
new file mode 100644
index 000000000..c150a02fc
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC721.move
@@ -0,0 +1,22 @@
+#[interface]
+/// The interface for ERC-721.
+/// This module defines the API for the interface of ERC-721 and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC721 {
+    use Evm::Evm::{Unit};
+    use Evm::Result::{Result};
+    use Evm::U256::{U256};
+
+    #[external]
+    public native fun call_safeTransferFrom(contract: address, from: address, to: address, tokenId: U256): Result<Unit, vector<u8>>;
+
+    #[external(name=safeTransferFrom)]
+    public native fun call_safeTransferFrom_with_data(contract: address, from: address, to: address, tokenId: U256, data: vector<u8>): Result<Unit, vector<u8>>;
+
+    #[interface_id]
+    /// Return the interface identifier.
+    // TODO: complete this function.
+   public native fun interfaceId(): vector<u8>;
+
+    // TODO: complete this module.
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC721Metadata.move b/vendors/move/crates/evm/examples/sources/IERC721Metadata.move
new file mode 100644
index 000000000..311eaf081
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC721Metadata.move
@@ -0,0 +1,46 @@
+#[interface]
+/// The interface for ERC-721 Metadata.
+/// This module defines the API for the interface of ERC-721 Metadata and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC721Metadata {
+    use Evm::Evm::{bytes_xor, bytes4, keccak256};
+    use Evm::Result::{Result};
+    use std::ascii::{String};
+    use Evm::U256::{U256};
+
+    #[external]
+    public native fun call_name(contract: address): Result<String, vector<u8>>;
+
+    #[external]
+    public native fun call_symbol(contract: address): Result<String, vector<u8>>;
+
+    #[external]
+    public native fun call_tokenURI(contract: address, tokenId: U256): Result<String, vector<u8>>;
+
+    #[selector]
+    public fun selector_name(): vector<u8> {
+        bytes4(keccak256(b"name()"))
+    }
+
+    #[selector]
+    public fun selector_symbol(): vector<u8> {
+        bytes4(keccak256(b"symbol()"))
+    }
+
+    #[selector]
+    public fun selector_tokenURI(): vector<u8> {
+        bytes4(keccak256(b"tokenURI(uint256)"))
+    }
+
+    #[interface_id]
+    /// Return the interface identifier.
+    public fun interfaceId(): vector<u8> {
+        bytes_xor(
+            bytes_xor(
+                selector_name(),
+                selector_symbol()
+            ),
+            selector_tokenURI()
+        )
+   }
+}
diff --git a/vendors/move/crates/evm/examples/sources/IERC721Receiver.move b/vendors/move/crates/evm/examples/sources/IERC721Receiver.move
new file mode 100644
index 000000000..aaea8c477
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IERC721Receiver.move
@@ -0,0 +1,27 @@
+#[interface]
+/// The interface for ERC-721 Token Receiver.
+/// This module defines the API for the interface of ERC-721 Token Receiver and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IERC721Receiver {
+    use Evm::Evm::{keccak256, bytes4};
+    use Evm::Result::{Result};
+    use Evm::U256::{U256};
+
+    #[external]
+    public native fun call_onERC721Received(contract: address, operator: address, from: address, tokenId: U256, bytes: vector<u8>): vector<u8>;
+
+    #[external]
+    public native fun try_call_onERC721Received(contract: address, operator: address, from: address, tokenId: U256, bytes: vector<u8>): Result<vector<u8>, vector<u8>>;
+
+    #[selector]
+    /// Return the selector of the function `onERC721Received`
+    public fun selector_onERC721Received(): vector<u8> {
+        bytes4(keccak256(b"onERC721Received(address,address,uint256,bytes)"))
+    }
+
+    #[interface_id]
+    /// Return the interface identifier for this interface.
+    public fun interfaceId(): vector<u8> {
+        selector_onERC721Received()
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/IUniswapV2Factory.move b/vendors/move/crates/evm/examples/sources/IUniswapV2Factory.move
new file mode 100644
index 000000000..28ceb1ebc
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IUniswapV2Factory.move
@@ -0,0 +1,16 @@
+#[interface]
+/// The interface for UniswapV2Factory.
+/// This module defines the API for the interface of UniswapV2Factory and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IUniswapV2Factory {
+
+    #[external(sig=b"getPair(address,address) returns (address)")]
+    public native fun call_getPair(contract: address, tokenA: address, tokenB: address): address;
+
+    #[interface_id]
+    /// Return the interface identifier.
+    // TODO: complete this function.
+   public native fun interfaceId(): vector<u8>;
+
+    // TODO: complete this module.
+}
diff --git a/vendors/move/crates/evm/examples/sources/IUniswapV2Router.move b/vendors/move/crates/evm/examples/sources/IUniswapV2Router.move
new file mode 100644
index 000000000..a2180d571
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/IUniswapV2Router.move
@@ -0,0 +1,23 @@
+#[interface]
+/// The interface for UniswapV2Router.
+/// This module defines the API for the interface of UniswapV2Router and
+/// the utility functions such as selectors and `interfaceId`.
+module Evm::IUniswapV2Router {
+    use Evm::U256::{U256};
+
+    #[external(sig=b"swapExactTokensForTokens(uint,uint,address[],address,uint) returns (uint[])")]
+    public native fun call_swapExactTokensForTokens(contract: address, amountIn: U256, amountOutMin: U256, path: vector<address>, to: address, deadline: U256): vector<U256>;
+
+    #[external(sig=b"addLiquidity(address,address,uint,uint,uint,uint,address) returns (uint,uint,uint)")]
+    public native fun call_addLiquidity(contract: address, tokenA: address, tokenB: address, amountADesired: U256, amountBDesired: U256, amountAMin: U256, amountBMin: U256, to: address, deadline: U256): (U256, U256, U256);
+
+    #[external(sig=b"removeLiquidity(address,address,uint,uint,uint,address,uint) returns (uint,uint)")]
+    public native fun call_removeLiquidity(contract: address, tokenA: address, tokenB: address, liquidity: U256, amountAMin: U256, amountBMin: U256, to: address, deadline: U256): (U256, U256);
+
+    #[interface_id]
+    /// Return the interface identifier.
+    // TODO: complete this function.
+   public native fun interfaceId(): vector<u8>;
+
+    // TODO: complete this module.
+}
diff --git a/vendors/move/crates/evm/examples/sources/TestUniswap.move b/vendors/move/crates/evm/examples/sources/TestUniswap.move
new file mode 100644
index 000000000..b35ae4ea4
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/TestUniswap.move
@@ -0,0 +1,48 @@
+// This module is to test the interaction with the existing dapp called UniswapV2.
+module Evm::TestUniswap {
+    use Evm::IERC20;
+    use Evm::IUniswapV2Router;
+    use Evm::U256::{Self, U256, u256_from_words};
+    use Evm::Evm::{sender, self, block_timestamp};
+    use std::vector;
+
+    // Swap tokenIn for tokenOut.
+    public fun swap(
+        tokenIn: address,
+        tokenOut: address,
+        amountIn: U256,
+        amountOutMin: U256,
+        to: address
+    ) {
+        // TODO: Replace these local constants with module-level constants once Move supports 20-bytes addresses and literals.
+        let const_UNISWAP_V2_ROUTER = U256::to_address(u256_from_words(0x7a250d56, 0x30B4cF539739dF2C5dAcb4c659F2488D));
+        let const_WETH = U256::to_address(u256_from_words(0xC02aaA39, 0xb223FE8D0A0e5C4F27eAD9083C756Cc2));
+
+        IERC20::call_transferFrom(tokenIn, sender(), self(), copy amountIn);
+        IERC20::call_approve(tokenIn, const_UNISWAP_V2_ROUTER, copy amountIn);
+
+        let path = vector::empty<address>();
+
+        if(tokenIn == const_WETH || tokenOut == const_WETH) {
+            // Directly swapping tokenIn for tokenOut.
+            vector::push_back(&mut path, tokenIn);
+            vector::push_back(&mut path, tokenOut);
+        }
+        else {
+            // Swapping tokenIn for WETH, and then WETH for tokenOut.
+            // Bridging is needed because UniswapV2 cannot directly swap two ERC20 token types.
+            vector::push_back(&mut path, tokenIn);
+            vector::push_back(&mut path, const_WETH);
+            vector::push_back(&mut path, tokenOut);
+        };
+
+        IUniswapV2Router::call_swapExactTokensForTokens(
+            const_UNISWAP_V2_ROUTER,
+            amountIn,
+            amountOutMin,
+            path,
+            to,
+            block_timestamp()
+        );
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/TestUniswapLiquidity.move b/vendors/move/crates/evm/examples/sources/TestUniswapLiquidity.move
new file mode 100644
index 000000000..35c189755
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/TestUniswapLiquidity.move
@@ -0,0 +1,61 @@
+// This module is to test the interaction with the existing dapp called UniswapV2.
+module Evm::TestUniswapLiquidity {
+    use Evm::IERC20;
+    use Evm::IUniswapV2Router;
+    use Evm::IUniswapV2Factory;
+    use Evm::U256::{Self, U256, u256_from_words};
+    use Evm::Evm::{sender, self, block_timestamp};
+
+    public fun addLiquidity(
+        tokenA: address,
+        tokenB: address,
+        amountA: U256,
+        amountB: U256,
+    ) {
+        // TODO: Replace these local constants with module-level constants once Move supports 20-bytes addresses and literals.
+        let const_ROUTER = U256::to_address(u256_from_words(0x7a250d56, 0x30B4cF539739dF2C5dAcb4c659F2488D));
+
+        IERC20::call_transferFrom(tokenA, sender(), self(), copy amountA);
+        IERC20::call_transferFrom(tokenB, sender(), self(), copy amountB);
+
+        IERC20::call_approve(tokenA, const_ROUTER, copy amountA);
+        IERC20::call_approve(tokenB, const_ROUTER, copy amountB);
+
+        let (_amountA, _amountB, _liquidity) = IUniswapV2Router::call_addLiquidity(
+            const_ROUTER,
+            tokenA,
+            tokenB,
+            amountA,
+            amountB,
+            U256::one(),
+            U256::one(),
+            self(),
+            block_timestamp()
+        );
+    }
+
+    public fun removeLiquidity(
+        tokenA: address,
+        tokenB: address,
+    ) {
+        // TODO: Replace these local constants with module-level constants once Move supports 20-bytes addresses and literals.
+        let const_FACTORY = U256::to_address(u256_from_words(0x5C69bEe7, 0x01ef814a2B6a3EDD4B1652CB9cc5aA6f));
+        let const_ROUTER = U256::to_address(u256_from_words(0x7a250d56, 0x30B4cF539739dF2C5dAcb4c659F2488D));
+
+        let pair = IUniswapV2Factory::call_getPair(const_FACTORY, tokenA, tokenB);
+
+        let liquidity = IERC20::call_balanceOf(pair, self());
+        IERC20::call_approve(pair, const_ROUTER, copy liquidity);
+
+        let (_amountA, _amountB) = IUniswapV2Router::call_removeLiquidity(
+            const_ROUTER,
+            tokenA,
+            tokenB,
+            liquidity,
+            U256::one(),
+            U256::one(),
+            self(),
+            block_timestamp()
+        );
+    }
+}
diff --git a/vendors/move/crates/evm/examples/sources/Token.move b/vendors/move/crates/evm/examples/sources/Token.move
new file mode 100644
index 000000000..3805e1b95
--- /dev/null
+++ b/vendors/move/crates/evm/examples/sources/Token.move
@@ -0,0 +1,145 @@
+#[evm_contract]
+/// An implementation of ERC20.
+module Evm::ERC20Token {
+    use Evm::Evm::{sender, self, sign};
+    use std::errors;
+    use std::vector;
+
+    #[storage]
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        decimals: u8,
+        total_supply: u128,
+    }
+
+    #[storage]
+    /// Represents the state of an account managed by this contract, located at
+    /// `borrow_global<Account>(address)`. Notice that the storage of this resource
+    /// is private to this contract, as each EVM contract manages its own Move address space.
+    struct Account has key {
+        /// The balance value.
+        value: u128,
+        /// The allowances this account has granted to other specified accounts.
+        allowances: vector<Allowance>
+    }
+
+    /// How much a spender is allowed to use.
+    struct Allowance has store {
+        spender: address,
+        amount: u128,
+    }
+
+    #[create]
+    /// Constructor of this contract.
+    public fun create(initial_amount: u128, decimals: u8) {
+        // Initial state of contract
+        move_to<State>(&sign(self()), State{decimals, total_supply: initial_amount});
+
+        // Initialize senders balance with initial amount
+        move_to<Account>(&sign(sender()), Account{value: initial_amount, allowances: vector::empty()});
+    }
+
+    #[callable, view]
+    /// Returns the total supply of the token.
+    public fun total_supply(): u128 acquires State {
+        borrow_global<State>(self()).total_supply
+    }
+
+    #[callable, view]
+    /// Returns the balance of an account.
+    public fun balance_of(owner: address): u128 acquires Account {
+        borrow_global<Account>(owner).value
+    }
+
+    #[callable, view]
+    /// Returns the allowance an account owner has approved for the given spender.
+    public fun allowance(owner: address, spender: address): u128 acquires Account {
+        let allowances = &borrow_global<Account>(owner).allowances;
+        let i = index_of_allowance(allowances, spender);
+        if (i < vector::length(allowances)) {
+            vector::borrow(allowances, i).amount
+        } else {
+            0
+        }
+    }
+
+    #[callable]
+    /// Approves that the spender can spent the given amount on behalf of the calling account.
+    public fun approve(spender: address, amount: u128) acquires Account {
+        create_account_if_not_present(sender());
+        let allowances = &mut borrow_global_mut<Account>(sender()).allowances;
+        mut_allowance(allowances, spender).amount = amount
+    }
+
+    #[callable]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(to: address, amount: u128) acquires Account {
+        assert!(sender() != to, errors::invalid_argument(0));
+        do_transfer(sender(), to, amount)
+    }
+
+
+    #[callable]
+    /// Transfers the amount on behalf of the `from` account to the given account.
+    /// This evaluates and adjusts the allowance.
+    public fun transfer_from(from: address, to: address, amount: u128) acquires Account {
+        let allowances = &mut borrow_global_mut<Account>(from).allowances;
+        let allowance = mut_allowance(allowances, sender());
+        assert!(allowance.amount >= amount, errors::limit_exceeded(0));
+        allowance.amount = allowance.amount - amount;
+        do_transfer(from, to, amount)
+    }
+
+    /// Helper function to perform a transfer of funds.
+    fun do_transfer(from: address, to: address, amount: u128) acquires Account {
+        create_account_if_not_present(from);
+        create_account_if_not_present(to);
+        let from_acc = borrow_global_mut<Account>(from);
+        assert!(from_acc.value >= amount, errors::limit_exceeded(0));
+        from_acc.value = from_acc.value - amount;
+        let to_acc = borrow_global_mut<Account>(to);
+        to_acc.value = to_acc.value + amount;
+    }
+
+    /// Helper function to find the index of an existing allowance. Returns length of the passed
+    /// vector if not present.
+    fun index_of_allowance(allowances: &vector<Allowance>, spender: address): u64 {
+        let i = 0;
+        let l = vector::length(allowances);
+        while (i < l) {
+            if (vector::borrow(allowances, i).spender == spender) {
+                return i
+            };
+            i = i + 1;
+       };
+       return l
+    }
+
+    /// Helper function to return a mut ref to the allowance of a spender.
+    fun mut_allowance(allowances: &mut vector<Allowance>, spender: address): &mut Allowance {
+        let i = index_of_allowance(allowances, spender);
+        if (i == vector::length(allowances)) {
+            vector::push_back(allowances, Allowance{spender, amount: 0})
+        };
+        vector::borrow_mut(allowances, i)
+    }
+
+    /// Helper function to create an account with a zero balance and no allowances.
+    fun create_account_if_not_present(owner: address) {
+        if (!exists<Account>(owner)) {
+            move_to<Account>(&sign(owner), Account{value: 0, allowances: vector::empty()})
+        }
+    }
+
+    // ==============================================================================================================
+    // The following APIs will be automatically generated from the #[callable] function attributes. They
+    // constitute the EVM level contract API.
+
+    public native fun call_total_supply(contract: address): u128;
+    public native fun call_allowance(contract: address, owner: address, spender: address): u128;
+    public native fun call_approve(contract: address, spender: address, amount: u128);
+    public native fun call_transfer(contract: address, to: address, amount: u128);
+    public native fun call_transfer_from(contract: address, from: address, to: address, amount: u128);
+
+    // ... and the same as delegate_XXXX APIs?
+}
diff --git a/vendors/move/crates/evm/examples/tests/ERC1155Tests.move b/vendors/move/crates/evm/examples/tests/ERC1155Tests.move
new file mode 100644
index 000000000..267b3cc42
--- /dev/null
+++ b/vendors/move/crates/evm/examples/tests/ERC1155Tests.move
@@ -0,0 +1,81 @@
+module Evm::ERC1155Tests {
+    use Evm::Evm::sender;
+    use Evm::U256::{zero, one, u256_from_u128};
+    use std::vector;
+    use Evm::ERC1155;
+    use std::ascii::{string};
+
+    const Alice: address = @0x8877;
+    const Bob: address = @0x8888;
+
+    #[test]
+    fun test_create() {
+        ERC1155::create(string(vector::empty<u8>()));
+    }
+
+    #[test]
+    fun test_balance_of() {
+        ERC1155::create(string(vector::empty<u8>()));
+        let id1 = one();
+        let id2 = u256_from_u128(22);
+        assert!(ERC1155::balanceOf(sender(), id1) == zero(), 100);
+        assert!(ERC1155::balanceOf(sender(), id2) == zero(), 101);
+        assert!(ERC1155::balanceOf(Alice, id1) == zero(), 102);
+        assert!(ERC1155::balanceOf(Alice, id2) == zero(), 103);
+        assert!(ERC1155::balanceOf(Bob, id1) == zero(), 104);
+        assert!(ERC1155::balanceOf(Bob, id2) == zero(), 105);
+    }
+
+    #[test]
+    fun test_mint() {
+        ERC1155::create(string(vector::empty<u8>()));
+
+        let id1 = one();
+        let id2 = u256_from_u128(22);
+        let dummy_data = vector::empty<u8>();
+
+        ERC1155::mint(Alice, id1, u256_from_u128(100), copy dummy_data);
+        ERC1155::mint(Bob, id2, u256_from_u128(1000), copy dummy_data);
+
+        assert!(ERC1155::balanceOf(sender(), id1) == zero(), 106);
+        assert!(ERC1155::balanceOf(sender(), id2) == zero(), 107);
+        assert!(ERC1155::balanceOf(Alice, id1) == u256_from_u128(100), 108);
+        assert!(ERC1155::balanceOf(Alice, id2) == zero(), 109);
+        assert!(ERC1155::balanceOf(Bob, id1) == zero(), 110);
+        assert!(ERC1155::balanceOf(Bob, id2) == u256_from_u128(1000), 111);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 124)]
+    fun test_transfer() {
+        ERC1155::create(string(vector::empty<u8>()));
+
+        let id1 = one();
+        let id2 = u256_from_u128(22);
+        let dummy_data = vector::empty<u8>();
+
+        ERC1155::mint(sender(), id1, u256_from_u128(100), copy dummy_data);
+        ERC1155::mint(sender(), id2, u256_from_u128(1000), copy dummy_data);
+
+        assert!(ERC1155::balanceOf(sender(), id1) == u256_from_u128(100), 112);
+        assert!(ERC1155::balanceOf(sender(), id2) == u256_from_u128(1000), 113);
+        assert!(ERC1155::balanceOf(Alice, id1) == zero(), 114);
+        assert!(ERC1155::balanceOf(Alice, id2) == zero(), 115);
+        assert!(ERC1155::balanceOf(Bob, id1) == zero(), 116);
+        assert!(ERC1155::balanceOf(Bob, id2) == zero(), 117);
+
+        ERC1155::safeTransferFrom(sender(), Alice, id1, u256_from_u128(20), copy dummy_data);
+        ERC1155::safeTransferFrom(sender(), Bob, id1, u256_from_u128(50), copy dummy_data);
+        ERC1155::safeTransferFrom(sender(), Alice, id2, u256_from_u128(300), copy dummy_data);
+        ERC1155::safeTransferFrom(sender(), Bob, id2, u256_from_u128(200), copy dummy_data);
+
+        assert!(ERC1155::balanceOf(sender(), id1) == u256_from_u128(30), 118);
+        assert!(ERC1155::balanceOf(sender(), id2) == u256_from_u128(500), 119);
+        assert!(ERC1155::balanceOf(Alice, id1) == u256_from_u128(20), 120);
+        assert!(ERC1155::balanceOf(Alice, id2) == u256_from_u128(300), 121);
+        assert!(ERC1155::balanceOf(Bob, id1) == u256_from_u128(50), 122);
+        assert!(ERC1155::balanceOf(Bob, id2) == u256_from_u128(200), 123);
+
+        assert!(ERC1155::balanceOf(sender(), id1) == u256_from_u128(100), 124); // expected to fail.
+    }
+}
diff --git a/vendors/move/crates/evm/examples/tests/ERC20Tests.move b/vendors/move/crates/evm/examples/tests/ERC20Tests.move
new file mode 100644
index 000000000..1dccf4c03
--- /dev/null
+++ b/vendors/move/crates/evm/examples/tests/ERC20Tests.move
@@ -0,0 +1,37 @@
+module Evm::ERC20Tests {
+    use Evm::Evm::sender;
+    use Evm::U256::{zero, one, u256_from_u128};
+    use std::vector;
+    use Evm::ERC20;
+    use std::ascii::{string};
+
+    const Alice: address = @0x8877;
+    const Bob: address = @0x8888;
+
+    #[test]
+    fun test_create() {
+        ERC20::create(string(vector::empty<u8>()), string(vector::empty<u8>()), one());
+        assert!(ERC20::balanceOf(sender()) == one(), 100);
+        assert!(ERC20::balanceOf(Alice) == zero(), 101);
+        assert!(ERC20::balanceOf(Bob) == zero(), 102);
+    }
+
+    #[test]
+    fun test_balance_of() {
+        ERC20::create(string(vector::empty<u8>()), string(vector::empty<u8>()), one());
+        assert!(ERC20::balanceOf(sender()) == one(), 103);
+        assert!(ERC20::balanceOf(Alice) == zero(), 104);
+        assert!(ERC20::balanceOf(Bob) == zero(), 105);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 109)]
+    fun test_transfer() {
+        ERC20::create(string(vector::empty<u8>()), string(vector::empty<u8>()), u256_from_u128(7));
+        ERC20::transfer(Alice, one());
+        assert!(ERC20::balanceOf(sender()) == u256_from_u128(6), 106);
+        assert!(ERC20::balanceOf(Alice) == one(), 107);
+        assert!(ERC20::balanceOf(Bob) == zero(), 108);
+        assert!(ERC20::balanceOf(sender()) == u256_from_u128(7), 109); // expected to fail
+    }
+}
diff --git a/vendors/move/crates/evm/exec-utils/Cargo.toml b/vendors/move/crates/evm/exec-utils/Cargo.toml
new file mode 100644
index 000000000..d5786f5d5
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "evm-exec-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+edition = "2021"
+license = "Apache-2.0"
+publish = false
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.52"
+evm = { version = "0.33.1", features = [ "tracing"] }
+evm-runtime = { version = "0.33.0", features = [ "tracing"] }
+hex = "0.4.3"
+primitive-types = "0.10.1"
+# external dependencies
+sha3 = "0.9.1"
+tempfile = "3.2.0"
+
+# move dependencies
+move-command-line-common = { path = "../../move-command-line-common" }
diff --git a/vendors/move/crates/evm/exec-utils/contracts/a_plus_b.sol b/vendors/move/crates/evm/exec-utils/contracts/a_plus_b.sol
new file mode 100644
index 000000000..6a69dd2bd
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/contracts/a_plus_b.sol
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.10;
+
+contract APlusB {
+    function plus(uint a, uint b) public pure returns(uint) {
+        return a + b;
+    }
+}
diff --git a/vendors/move/crates/evm/exec-utils/contracts/hello_world.sol b/vendors/move/crates/evm/exec-utils/contracts/hello_world.sol
new file mode 100644
index 000000000..c1ad630c3
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/contracts/hello_world.sol
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.10;
+
+contract HelloWorld {
+    string public greet = "Hello World!";
+}
diff --git a/vendors/move/crates/evm/exec-utils/contracts/stateful.sol b/vendors/move/crates/evm/exec-utils/contracts/stateful.sol
new file mode 100644
index 000000000..d2cabea34
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/contracts/stateful.sol
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.10;
+
+contract TwoFunctions {
+    uint counter = 0x0;
+
+    function inc() public {
+        counter = counter + 1;
+    }
+
+    function get() public view returns(uint) {
+        return counter;
+    }
+}
diff --git a/vendors/move/crates/evm/exec-utils/contracts/two_functions.sol b/vendors/move/crates/evm/exec-utils/contracts/two_functions.sol
new file mode 100644
index 000000000..0fd905ad0
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/contracts/two_functions.sol
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.10;
+
+contract TwoFunctions {
+    function panic() pure public {
+        assert(false);
+    }
+
+    function do_nothing() public {}
+}
diff --git a/vendors/move/crates/evm/exec-utils/src/compile.rs b/vendors/move/crates/evm/exec-utils/src/compile.rs
new file mode 100644
index 000000000..beb658eae
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/src/compile.rs
@@ -0,0 +1,129 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, bail, format_err, Result};
+use std::{
+    collections::BTreeMap,
+    ffi::OsStr,
+    fs::{self},
+    io::Write,
+    path::{Path, PathBuf},
+    process::{Command, Stdio},
+};
+
+// Unfortunately, solc can run the Yul compiler only to stdout, not supporting the -o option.
+// It uses some markers in stdout which we match on to find the relevant parts. This is fragile
+// and may need to be fixed if solc starts changing its output.
+const OPTIMIZED_YUL_MARKER: &str = "\nPretty printed source:";
+const HEX_OUTPUT_MARKER: &str = "\nBinary representation:";
+
+fn solc_path() -> Result<PathBuf> {
+    let solc_exe = move_command_line_common::env::read_env_var("SOLC_EXE");
+
+    if solc_exe.is_empty() {
+        bail!(
+            "failed to resolve path to solc (Solidity compiler).
+            Is the environment variable SOLC_EXE set?
+            Did you run `./scripts/dev_setup.sh -d`?"
+        )
+    }
+
+    Ok(PathBuf::from(&solc_exe))
+}
+
+fn solc_impl(
+    source_paths: impl IntoIterator<Item = impl AsRef<OsStr>>,
+    output_dir: &Path,
+) -> Result<BTreeMap<String, Vec<u8>>> {
+    Command::new(solc_path()?)
+        .args(source_paths)
+        .arg("--bin")
+        .arg("-o")
+        .arg(output_dir)
+        .output()
+        .map_err(|err| format_err!("failed to call solc (solidity compiler): {:?}", err))?;
+
+    let mut compiled_contracts = BTreeMap::new();
+
+    for entry in fs::read_dir(output_dir)? {
+        let entry = entry?;
+
+        if entry.file_type()?.is_file() {
+            let path = entry.path();
+            if let Some(ext) = path.extension() {
+                if ext == "bin" {
+                    let data = fs::read(&path)?;
+                    let data = hex::decode(data)?;
+
+                    compiled_contracts.insert(
+                        path.file_stem()
+                            .ok_or_else(|| format_err!("failed to extract file name"))?
+                            .to_string_lossy()
+                            .to_string(),
+                        data,
+                    );
+                }
+            }
+        }
+    }
+
+    Ok(compiled_contracts)
+}
+
+/// Compile the solidity sources using solc.
+/// Return a mapping with keys being contract names and values being compiled bytecode.
+///
+/// The environment variable SOLC_EXE must point to solc.
+pub fn solc(
+    source_paths: impl IntoIterator<Item = impl AsRef<OsStr>>,
+) -> Result<BTreeMap<String, Vec<u8>>> {
+    let temp = tempfile::tempdir()?;
+
+    solc_impl(source_paths, temp.path())
+}
+
+/// Compile the Yul source, given as a string, and return the binary representation of the
+/// compiled bytecode. If `return_optimized_yul` is true, also return the textual representation
+/// of optimized Yul.
+pub fn solc_yul(source: &str, return_optimized_yul: bool) -> Result<(Vec<u8>, Option<String>)> {
+    let mut prog = Command::new(solc_path()?);
+    prog.arg("--optimize").arg("--strict-assembly").arg("--bin");
+    if return_optimized_yul {
+        prog.arg("--ir-optimized");
+    }
+    let mut child = prog
+        .arg("-")
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()?;
+    let pipe = child
+        .stdin
+        .as_mut()
+        .ok_or_else(|| anyhow!("cannot create pipe"))?;
+    pipe.write_all(source.as_bytes())?;
+    let out = child.wait_with_output()?;
+    if !out.status.success() {
+        return Err(anyhow!(String::from_utf8_lossy(&out.stderr).to_string()));
+    }
+    let out_str = String::from_utf8_lossy(&out.stdout).to_string();
+    let start_of_yul = out_str.find(OPTIMIZED_YUL_MARKER);
+    let start_of_hex = out_str.find(HEX_OUTPUT_MARKER);
+    if return_optimized_yul && start_of_yul.is_none() || start_of_hex.is_none() {
+        return Err(anyhow!(
+            "Internal error: unexpected output of solc during Yul compilation"
+        ));
+    }
+    let yul = if return_optimized_yul {
+        Some(
+            out_str[(start_of_yul.unwrap() + OPTIMIZED_YUL_MARKER.len())..start_of_hex.unwrap()]
+                .trim()
+                .to_string(),
+        )
+    } else {
+        None
+    };
+    let bin = hex::decode(out_str[(start_of_hex.unwrap() + HEX_OUTPUT_MARKER.len())..].trim())?;
+    Ok((bin, yul))
+}
diff --git a/vendors/move/crates/evm/exec-utils/src/exec.rs b/vendors/move/crates/evm/exec-utils/src/exec.rs
new file mode 100644
index 000000000..3dfc6222f
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/src/exec.rs
@@ -0,0 +1,248 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use evm::{
+    backend::{Apply, ApplyBackend, Basic, MemoryAccount, MemoryBackend, MemoryVicinity},
+    executor::stack::{MemoryStackState, StackExecutor, StackSubstateMetadata},
+    Config, Context, CreateScheme, ExitReason, Runtime,
+};
+use primitive_types::{H160, U256};
+use sha3::{Digest, Keccak256};
+use std::{collections::BTreeMap, error::Error, fmt, rc::Rc};
+
+// TODO: implement these features:
+//   - Proper handling of gas
+
+/// Stateful EVM executor backed by an in-memory storage.
+pub struct Executor<'v> {
+    storage_backend: MemoryBackend<'v>,
+}
+
+/// Return the 4-byte method selector derived from the signature, which is encoded as a string (e.g. `"foo(uint256,uint256)"`).
+//
+// TODO: Rust type to represent the signature.
+pub fn derive_method_selector(sig: &str) -> [u8; 4] {
+    let mut keccak = Keccak256::new();
+    keccak.update(sig.as_bytes());
+    let digest = keccak.finalize();
+    [digest[0], digest[1], digest[2], digest[3]]
+}
+
+#[derive(Debug)]
+pub enum MintError {
+    BalanceOverflow,
+}
+
+impl fmt::Display for MintError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
+pub struct ExecuteResult {
+    pub exit_reason: ExitReason,
+    pub return_value: Vec<u8>,
+    pub used_gas: u64,
+}
+
+impl fmt::Display for ExecuteResult {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{:?} (used_gas={}): {:?}",
+            self.exit_reason, self.used_gas, self.return_value
+        )
+    }
+}
+
+impl Error for MintError {}
+
+impl<'v> Executor<'v> {
+    /// Return a reference to the in-memory storage backend.
+    pub fn storage(&self) -> &MemoryBackend<'v> {
+        &self.storage_backend
+    }
+
+    /// Return a reference to the in-memory representation of the account at the specified adress if one exists.
+    fn account_info(&self, address: H160) -> Option<&MemoryAccount> {
+        self.storage_backend.state().get(&address)
+    }
+
+    /// Return the balance of the account at the specified address if one exists.
+    pub fn account_balance(&self, address: H160) -> Option<U256> {
+        self.account_info(address).map(|account| account.balance)
+    }
+
+    /// Add balance to the specified account.
+    /// Intended to used for testing.
+    ///
+    /// Note: this will create a new account at the given address if one does not exist.
+    pub fn mint(&mut self, address: H160, eth_amount: U256) -> Result<(), MintError> {
+        let (balance, nonce) = match self.account_info(address) {
+            Some(account) => {
+                let balance = account
+                    .balance
+                    .checked_add(eth_amount)
+                    .ok_or(MintError::BalanceOverflow)?;
+                let nonce = account.nonce; // REVIEW: should the nonce be incremented?
+
+                (balance, nonce)
+            },
+            None => (eth_amount, U256::from(0)),
+        };
+
+        self.storage_backend.apply(
+            [Apply::Modify {
+                address,
+                basic: Basic { balance, nonce },
+                code: None,
+                storage: [],
+                reset_storage: false,
+            }],
+            [],
+            false,
+        );
+
+        Ok(())
+    }
+
+    /// Create a new `Executor` with an empty in-memory storage backend.
+    //
+    // TODO: review the lifetime of vicinity.
+    pub fn new(vicinity: &'v MemoryVicinity) -> Self {
+        Self {
+            storage_backend: MemoryBackend::new(vicinity, BTreeMap::new()),
+        }
+    }
+
+    // Perform a transaction and commit the changes to the storage backend.
+    fn transact<F, R>(&mut self, op: F) -> R
+    where
+        F: for<'c> FnOnce(
+            &mut StackExecutor<'c, 'static, MemoryStackState<'c, 'c, MemoryBackend<'v>>, ()>,
+        ) -> R,
+    {
+        let config = Config::london();
+        let metadata = StackSubstateMetadata::new(u64::MAX, &config);
+        let state = MemoryStackState::new(metadata, &self.storage_backend);
+        let mut exec = StackExecutor::new_with_precompiles(state, &config, &());
+
+        let res = op(&mut exec);
+
+        let state = exec.into_state();
+        let (changes, logs) = state.deconstruct();
+        self.storage_backend.apply(changes, logs, false);
+
+        res
+    }
+
+    /// Create a contract and return the contract address if successful.
+    pub fn create_contract(
+        &mut self,
+        caller_address: H160,
+        contract_code: Vec<u8>,
+    ) -> Result<H160, ExitReason> {
+        self.transact(|exec| {
+            let contract_address = exec.create_address(CreateScheme::Legacy {
+                caller: caller_address,
+            });
+
+            let exit_reason = exec.transact_create(
+                caller_address,
+                U256::zero(), // TODO: allow the caller to specify this.
+                contract_code,
+                u64::MAX,
+                vec![],
+            );
+
+            match &exit_reason {
+                ExitReason::Succeed(_) => Ok(contract_address),
+                _ => Err(exit_reason),
+            }
+        })
+    }
+
+    /// Transfer some ETH from one account to another.
+    pub fn transfer_eth(
+        &mut self,
+        sender_address: H160,
+        receipient_address: H160,
+        eth_amount: U256,
+    ) -> Result<(), ExitReason> {
+        self.transact(|exec| {
+            let (exit_reason, _buffer) = exec.transact_call(
+                sender_address,
+                receipient_address,
+                eth_amount,
+                vec![],
+                u64::MAX,
+                vec![],
+            );
+
+            match &exit_reason {
+                ExitReason::Succeed(_) => Ok(()),
+                _ => Err(exit_reason),
+            }
+        })
+    }
+
+    /// Call a contract method with the given signature.
+    /// The signature is represented by a string consisting of the name of the method and
+    /// a list of parameter types (e.g. `foo(uint256,uint256)`).
+    pub fn call_function(
+        &mut self,
+        caller_address: H160,
+        contract_address: H160,
+        eth_amount: U256,
+        method_sig: &str,
+        method_args: &[u8],
+    ) -> (ExitReason, Vec<u8>) {
+        self.transact(|exec| {
+            let mut data = vec![];
+            data.extend(derive_method_selector(method_sig));
+            data.extend(method_args);
+
+            let (exit_reason, buffer) = exec.transact_call(
+                caller_address,
+                contract_address,
+                eth_amount,
+                data,
+                u64::MAX,
+                vec![],
+            );
+
+            (exit_reason, buffer)
+        })
+    }
+
+    /// Execute custom EVM opecodes.
+    /// You are still required to specify a caller address and a contract address, even though a contract may not exist
+    /// at the specified address.
+    pub fn execute_custom_code(
+        &mut self,
+        caller_address: H160,
+        contract_address: H160,
+        code: Vec<u8>,
+        data: Vec<u8>,
+    ) -> ExecuteResult {
+        self.transact(|exec| {
+            let context = Context {
+                address: contract_address,
+                caller: caller_address,
+                apparent_value: U256::zero(), // TODO: figure out what this is.
+            };
+            let mut runtime = Runtime::new(Rc::new(code), Rc::new(data), context, exec.config());
+
+            // REVIEW: are we handling gas metering correctly?
+            let exit_reason = exec.execute(&mut runtime);
+            let return_value = runtime.machine().return_value();
+            let used_gas = exec.used_gas();
+            ExecuteResult {
+                exit_reason,
+                return_value,
+                used_gas,
+            }
+        })
+    }
+}
diff --git a/vendors/move/crates/evm/exec-utils/src/lib.rs b/vendors/move/crates/evm/exec-utils/src/lib.rs
new file mode 100644
index 000000000..794141275
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod compile;
+pub mod exec;
+#[cfg(test)]
+pub mod tests;
+pub mod tracing;
diff --git a/vendors/move/crates/evm/exec-utils/src/tests.rs b/vendors/move/crates/evm/exec-utils/src/tests.rs
new file mode 100644
index 000000000..fb93aacc3
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/src/tests.rs
@@ -0,0 +1,201 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{compile::solc, exec::Executor};
+use anyhow::Result;
+use evm::{backend::MemoryVicinity, ExitReason, Opcode};
+use primitive_types::{H160, U256};
+use std::path::{Path, PathBuf};
+
+fn contract_path(file_name: &str) -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("contracts")
+        .join(file_name)
+}
+
+fn test_vincinity() -> MemoryVicinity {
+    MemoryVicinity {
+        gas_price: 0.into(),
+        origin: H160::zero(),
+        chain_id: 0.into(),
+        block_hashes: vec![],
+        block_number: 0.into(),
+        block_coinbase: H160::zero(),
+        block_timestamp: 0.into(),
+        block_difficulty: 0.into(),
+        block_gas_limit: U256::MAX,
+        block_base_fee_per_gas: 0.into(),
+    }
+}
+
+#[test]
+fn test_hello_world() -> Result<()> {
+    let (_contract_name, contract_code) = solc([contract_path("hello_world.sol")])?
+        .into_iter()
+        .next()
+        .unwrap();
+
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let res = exec.create_contract(H160::zero(), contract_code);
+    assert!(res.is_ok());
+
+    Ok(())
+}
+
+#[test]
+fn test_two_functions() -> Result<()> {
+    let (_contract_name, contract_code) = solc([contract_path("two_functions.sol")])?
+        .into_iter()
+        .next()
+        .unwrap();
+
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    let (exit_reason, _buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), "do_nothing()", &[
+        ]);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let (exit_reason, _buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), "panic()", &[]);
+    assert!(matches!(exit_reason, ExitReason::Revert(_)));
+
+    Ok(())
+}
+
+#[test]
+fn test_a_plus_b() -> Result<()> {
+    let (_contract_name, contract_code) = solc([contract_path("a_plus_b.sol")])?
+        .into_iter()
+        .next()
+        .unwrap();
+
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    let mut args = [0u8; 64];
+    args[0] = 1;
+    args[32] = 2;
+
+    let (exit_reason, buffer) = exec.call_function(
+        H160::zero(),
+        contract_address,
+        0.into(),
+        "plus(uint256,uint256)",
+        &args,
+    );
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() >= 32);
+    let mut expected = [0u8; 32];
+    expected[0] = 0x3;
+    assert_eq!(&buffer[..32], &expected);
+
+    Ok(())
+}
+
+#[test]
+fn test_stateful() -> Result<()> {
+    let (_contract_name, contract_code) = solc([contract_path("stateful.sol")])?
+        .into_iter()
+        .next()
+        .unwrap();
+
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    for _ in 0..7 {
+        let (exit_reason, _buffer) =
+            exec.call_function(H160::zero(), contract_address, 0.into(), "inc()", &[]);
+        assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), "get()", &[]);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() >= 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 0x7;
+    assert_eq!(&buffer[..32], &expected);
+
+    Ok(())
+}
+
+#[test]
+fn test_custom_code_add_two_numbers() -> Result<()> {
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let mut code = vec![];
+
+    // push 1
+    // push 2
+    // add
+    // push 0
+    // mstore
+    // push 32
+    // push 0
+    // return
+
+    code.extend([Opcode::PUSH1.0, 0x1, Opcode::PUSH1.0, 0x2, Opcode::ADD.0]);
+
+    code.push(Opcode::PUSH32.0);
+    code.extend([0; 32]);
+    code.push(Opcode::MSTORE.0);
+
+    let mut length = [0; 32];
+    length[31] = 32;
+    code.push(Opcode::PUSH32.0);
+    code.extend(length);
+    code.push(Opcode::PUSH32.0);
+    code.extend([0; 32]);
+    code.push(Opcode::RETURN.0);
+
+    let ret = exec.execute_custom_code(H160::zero(), H160::zero(), code, vec![]);
+
+    let mut expected = [0; 32];
+    expected[31] = 0x3;
+    assert_eq!(&ret.return_value, &expected);
+
+    Ok(())
+}
+
+#[test]
+fn test_transfer_eth() -> Result<()> {
+    let vicinity = test_vincinity();
+    let mut exec = Executor::new(&vicinity);
+
+    let alice_addr = H160::from([0x1; 20]);
+    let bob_addr = H160::from([0x2; 20]);
+
+    exec.mint(alice_addr, U256::from(5000))?;
+    exec.mint(bob_addr, U256::from(5000))?;
+
+    assert_eq!(exec.account_balance(alice_addr).unwrap(), U256::from(5000));
+    assert_eq!(exec.account_balance(bob_addr).unwrap(), U256::from(5000));
+
+    exec.transfer_eth(alice_addr, bob_addr, U256::from(1000))
+        .expect("failed to transfer eth");
+
+    assert_eq!(exec.account_balance(alice_addr).unwrap(), U256::from(4000));
+    assert_eq!(exec.account_balance(bob_addr).unwrap(), U256::from(6000));
+
+    Ok(())
+}
diff --git a/vendors/move/crates/evm/exec-utils/src/tracing.rs b/vendors/move/crates/evm/exec-utils/src/tracing.rs
new file mode 100644
index 000000000..70ed22e42
--- /dev/null
+++ b/vendors/move/crates/evm/exec-utils/src/tracing.rs
@@ -0,0 +1,288 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use evm::Opcode;
+use evm_runtime::tracing::{
+    using as runtime_using, Event as RuntimeEvent, EventListener as RuntimeEventListener,
+};
+
+/// Enables tracing of the EVN runtime during the execution of `f`.
+pub fn trace_runtime<R, F>(f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    let mut listener = RuntimeListener();
+    runtime_using(&mut listener, f)
+}
+
+struct RuntimeListener();
+
+impl RuntimeEventListener for RuntimeListener {
+    fn event(&mut self, event: RuntimeEvent) {
+        use RuntimeEvent::*;
+        match event {
+            Step { opcode, stack, .. } => {
+                println!("{}", opc_name(opcode));
+                println!("  stack:");
+                for i in (0..stack.len()).rev() {
+                    println!("    {}", stack.data()[i])
+                }
+            },
+            StepResult {
+                result,
+                return_value,
+                ..
+            } => {
+                println!("==> {:?} (ret={:?})", result, return_value)
+            },
+            SLoad { index, value, .. } => {
+                println!("==> storage {} -> {}", index, value)
+            },
+            SStore { index, value, .. } => {
+                println!("==> storage {} <- {}", index, value)
+            },
+        }
+    }
+}
+
+/// Returns the name of an opcode.
+///
+/// Implementation remark: this should be in the evm-runtime crate, but did not find it.
+/// We generated this by regular expression replacement of the definition in `evm_core::opcode`.
+fn opc_name(code: Opcode) -> String {
+    match code {
+        // `STOP`
+        Opcode::STOP => "STOP".to_string(),
+        // `ADD`
+        Opcode::ADD => "ADD".to_string(),
+        // `MUL`
+        Opcode::MUL => "MUL".to_string(),
+        // `SUB`
+        Opcode::SUB => "SUB".to_string(),
+        // `DIV`
+        Opcode::DIV => "DIV".to_string(),
+        // `SDIV`
+        Opcode::SDIV => "SDIV".to_string(),
+        // `MOD`
+        Opcode::MOD => "MOD".to_string(),
+        // `SMOD`
+        Opcode::SMOD => "SMOD".to_string(),
+        // `ADDMOD`
+        Opcode::ADDMOD => "ADDMOD".to_string(),
+        // `MULMOD`
+        Opcode::MULMOD => "MULMOD".to_string(),
+        // `EXP`
+        Opcode::EXP => "EXP".to_string(),
+        // `SIGNEXTEND`
+        Opcode::SIGNEXTEND => "SIGNEXTEND".to_string(),
+
+        // `LT`
+        Opcode::LT => "LT".to_string(),
+        // `GT`
+        Opcode::GT => "GT".to_string(),
+        // `SLT`
+        Opcode::SLT => "SLT".to_string(),
+        // `SGT`
+        Opcode::SGT => "SGT".to_string(),
+        // `EQ`
+        Opcode::EQ => "EQ".to_string(),
+        // `ISZERO`
+        Opcode::ISZERO => "ISZERO".to_string(),
+        // `AND`
+        Opcode::AND => "AND".to_string(),
+        // `OR`
+        Opcode::OR => "OR".to_string(),
+        // `XOR`
+        Opcode::XOR => "XOR".to_string(),
+        // `NOT`
+        Opcode::NOT => "NOT".to_string(),
+        // `BYTE`
+        Opcode::BYTE => "BYTE".to_string(),
+
+        // `CALLDATALOAD`
+        Opcode::CALLDATALOAD => "CALLDATALOAD".to_string(),
+        // `CALLDATASIZE`
+        Opcode::CALLDATASIZE => "CALLDATASIZE".to_string(),
+        // `CALLDATACOPY`
+        Opcode::CALLDATACOPY => "CALLDATACOPY".to_string(),
+        // `CODESIZE`
+        Opcode::CODESIZE => "CODESIZE".to_string(),
+        // `CODECOPY`
+        Opcode::CODECOPY => "CODECOPY".to_string(),
+
+        // `SHL`
+        Opcode::SHL => "SHL".to_string(),
+        // `SHR`
+        Opcode::SHR => "SHR".to_string(),
+        // `SAR`
+        Opcode::SAR => "SAR".to_string(),
+
+        // `POP`
+        Opcode::POP => "POP".to_string(),
+        // `MLOAD`
+        Opcode::MLOAD => "MLOAD".to_string(),
+        // `MSTORE`
+        Opcode::MSTORE => "MSTORE".to_string(),
+        // `MSTORE8`
+        Opcode::MSTORE8 => "MSTORE8".to_string(),
+        // `JUMP`
+        Opcode::JUMP => "JUMP".to_string(),
+        // `JUMPI`
+        Opcode::JUMPI => "JUMPI".to_string(),
+        // `PC`
+        Opcode::PC => "PC".to_string(),
+        // `MSIZE`
+        Opcode::MSIZE => "MSIZE".to_string(),
+        // `JUMPDEST`
+        Opcode::JUMPDEST => "JUMPDEST".to_string(),
+
+        // `PUSHn`
+        Opcode::PUSH1 => "PUSH1".to_string(),
+        Opcode::PUSH2 => "PUSH2".to_string(),
+        Opcode::PUSH3 => "PUSH3".to_string(),
+        Opcode::PUSH4 => "PUSH4".to_string(),
+        Opcode::PUSH5 => "PUSH5".to_string(),
+        Opcode::PUSH6 => "PUSH6".to_string(),
+        Opcode::PUSH7 => "PUSH7".to_string(),
+        Opcode::PUSH8 => "PUSH8".to_string(),
+        Opcode::PUSH9 => "PUSH9".to_string(),
+        Opcode::PUSH10 => "PUSH10".to_string(),
+        Opcode::PUSH11 => "PUSH11".to_string(),
+        Opcode::PUSH12 => "PUSH12".to_string(),
+        Opcode::PUSH13 => "PUSH13".to_string(),
+        Opcode::PUSH14 => "PUSH14".to_string(),
+        Opcode::PUSH15 => "PUSH15".to_string(),
+        Opcode::PUSH16 => "PUSH16".to_string(),
+        Opcode::PUSH17 => "PUSH17".to_string(),
+        Opcode::PUSH18 => "PUSH18".to_string(),
+        Opcode::PUSH19 => "PUSH19".to_string(),
+        Opcode::PUSH20 => "PUSH20".to_string(),
+        Opcode::PUSH21 => "PUSH21".to_string(),
+        Opcode::PUSH22 => "PUSH22".to_string(),
+        Opcode::PUSH23 => "PUSH23".to_string(),
+        Opcode::PUSH24 => "PUSH24".to_string(),
+        Opcode::PUSH25 => "PUSH25".to_string(),
+        Opcode::PUSH26 => "PUSH26".to_string(),
+        Opcode::PUSH27 => "PUSH27".to_string(),
+        Opcode::PUSH28 => "PUSH28".to_string(),
+        Opcode::PUSH29 => "PUSH29".to_string(),
+        Opcode::PUSH30 => "PUSH30".to_string(),
+        Opcode::PUSH31 => "PUSH31".to_string(),
+        Opcode::PUSH32 => "PUSH32".to_string(),
+
+        // `DUPn`
+        Opcode::DUP1 => "DUP1".to_string(),
+        Opcode::DUP2 => "DUP2".to_string(),
+        Opcode::DUP3 => "DUP3".to_string(),
+        Opcode::DUP4 => "DUP4".to_string(),
+        Opcode::DUP5 => "DUP5".to_string(),
+        Opcode::DUP6 => "DUP6".to_string(),
+        Opcode::DUP7 => "DUP7".to_string(),
+        Opcode::DUP8 => "DUP8".to_string(),
+        Opcode::DUP9 => "DUP9".to_string(),
+        Opcode::DUP10 => "DUP10".to_string(),
+        Opcode::DUP11 => "DUP11".to_string(),
+        Opcode::DUP12 => "DUP12".to_string(),
+        Opcode::DUP13 => "DUP13".to_string(),
+        Opcode::DUP14 => "DUP14".to_string(),
+        Opcode::DUP15 => "DUP15".to_string(),
+        Opcode::DUP16 => "DUP16".to_string(),
+
+        // `SWAPn`
+        Opcode::SWAP1 => "SWAP1".to_string(),
+        Opcode::SWAP2 => "SWAP2".to_string(),
+        Opcode::SWAP3 => "SWAP3".to_string(),
+        Opcode::SWAP4 => "SWAP4".to_string(),
+        Opcode::SWAP5 => "SWAP5".to_string(),
+        Opcode::SWAP6 => "SWAP6".to_string(),
+        Opcode::SWAP7 => "SWAP7".to_string(),
+        Opcode::SWAP8 => "SWAP8".to_string(),
+        Opcode::SWAP9 => "SWAP9".to_string(),
+        Opcode::SWAP10 => "SWAP10".to_string(),
+        Opcode::SWAP11 => "SWAP11".to_string(),
+        Opcode::SWAP12 => "SWAP12".to_string(),
+        Opcode::SWAP13 => "SWAP13".to_string(),
+        Opcode::SWAP14 => "SWAP14".to_string(),
+        Opcode::SWAP15 => "SWAP15".to_string(),
+        Opcode::SWAP16 => "SWAP16".to_string(),
+
+        // `RETURN`
+        Opcode::RETURN => "RETURN".to_string(),
+        // `REVERT`
+        Opcode::REVERT => "REVERT".to_string(),
+
+        // `INVALID`
+        Opcode::INVALID => "INVALID".to_string(),
+
+        // `SHA3`
+        Opcode::SHA3 => "SHA3".to_string(),
+        // `ADDRESS`
+        Opcode::ADDRESS => "ADDRESS".to_string(),
+        // `BALANCE`
+        Opcode::BALANCE => "BALANCE".to_string(),
+        // `SELFBALANCE`
+        Opcode::SELFBALANCE => "SELFBALANCE".to_string(),
+        // `BASEFEE`
+        Opcode::BASEFEE => "BASEFEE".to_string(),
+        // `ORIGIN`
+        Opcode::ORIGIN => "ORIGIN".to_string(),
+        // `CALLER`
+        Opcode::CALLER => "CALLER".to_string(),
+        // `CALLVALUE`
+        Opcode::CALLVALUE => "CALLVALUE".to_string(),
+        // `GASPRICE`
+        Opcode::GASPRICE => "GASPRICE".to_string(),
+        // `EXTCODESIZE`
+        Opcode::EXTCODESIZE => "EXTCODESIZE".to_string(),
+        // `EXTCODECOPY`
+        Opcode::EXTCODECOPY => "EXTCODECOPY".to_string(),
+        // `EXTCODEHASH`
+        Opcode::EXTCODEHASH => "EXTCODEHASH".to_string(),
+        // `RETURNDATASIZE`
+        Opcode::RETURNDATASIZE => "RETURNDATASIZE".to_string(),
+        // `RETURNDATACOPY`
+        Opcode::RETURNDATACOPY => "RETURNDATACOPY".to_string(),
+        // `BLOCKHASH`
+        Opcode::BLOCKHASH => "BLOCKHASH".to_string(),
+        // `COINBASE`
+        Opcode::COINBASE => "COINBASE".to_string(),
+        // `TIMESTAMP`
+        Opcode::TIMESTAMP => "TIMESTAMP".to_string(),
+        // `NUMBER`
+        Opcode::NUMBER => "NUMBER".to_string(),
+        // `DIFFICULTY`
+        Opcode::DIFFICULTY => "DIFFICULTY".to_string(),
+        // `GASLIMIT`
+        Opcode::GASLIMIT => "GASLIMIT".to_string(),
+        // `SLOAD`
+        Opcode::SLOAD => "SLOAD".to_string(),
+        // `SSTORE`
+        Opcode::SSTORE => "SSTORE".to_string(),
+        // `GAS`
+        Opcode::GAS => "GAS".to_string(),
+        // `LOGn`
+        Opcode::LOG0 => "LOG0".to_string(),
+        Opcode::LOG1 => "LOG1".to_string(),
+        Opcode::LOG2 => "LOG2".to_string(),
+        Opcode::LOG3 => "LOG3".to_string(),
+        Opcode::LOG4 => "LOG4".to_string(),
+        // `CREATE`
+        Opcode::CREATE => "CREATE".to_string(),
+        // `CREATE2`
+        Opcode::CREATE2 => "CREATE2".to_string(),
+        // `CALL`
+        Opcode::CALL => "CALL".to_string(),
+        // `CALLCODE`
+        Opcode::CALLCODE => "CALLCODE".to_string(),
+        // `DELEGATECALL`
+        Opcode::DELEGATECALL => "DELEGATECALL".to_string(),
+        // `STATICCALL`
+        Opcode::STATICCALL => "STATICCALL".to_string(),
+        // `SUICIDE`
+        Opcode::SUICIDE => "SUICIDE".to_string(),
+        // `CHAINID`
+        Opcode::CHAINID => "CHAINID".to_string(),
+        _ => format!("opc #{:x}", code.as_usize()),
+    }
+}
diff --git a/vendors/move/crates/evm/extract-ethereum-abi/Cargo.toml b/vendors/move/crates/evm/extract-ethereum-abi/Cargo.toml
new file mode 100644
index 000000000..43dd6c784
--- /dev/null
+++ b/vendors/move/crates/evm/extract-ethereum-abi/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "extract-ethereum-abi"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Extract Etherem ABI"
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+move-core-types = { path = "../../move-core-types" }
+# move dependencies
+move-ethereum-abi = { path = "../move-ethereum-abi" }
+move-to-yul = { path = "../move-to-yul" }
+
+# external dependencies
+anyhow = "1.0.38"
+atty = "0.2.14"
+clap = { version = "3", features = ["derive", "env"] }
+codespan = "0.11.1"
+codespan-reporting = "0.11.1"
+ethabi = "17.0.0"
+once_cell = "1.7.2"
+regex = "1.4.3"
+serde = { version = "1.0.124", features = ["derive"] }
+serde_json = "1.0.64"
diff --git a/vendors/move/crates/evm/extract-ethereum-abi/src/main.rs b/vendors/move/crates/evm/extract-ethereum-abi/src/main.rs
new file mode 100644
index 000000000..c0dba283c
--- /dev/null
+++ b/vendors/move/crates/evm/extract-ethereum-abi/src/main.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use move_to_yul::{options::Options, parse_metadata_to_move_sig, run_to_abi_metadata};
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        let mut c = e.source();
+        while let Some(s) = c {
+            eprintln!("caused by: {}", s);
+            c = s.source();
+        }
+        std::process::exit(1)
+    }
+}
+
+fn run() -> anyhow::Result<()> {
+    let options = Options::parse();
+    let color = if atty::is(atty::Stream::Stderr) && atty::is(atty::Stream::Stdout) {
+        ColorChoice::Auto
+    } else {
+        ColorChoice::Never
+    };
+    let mut error_writer = StandardStream::stderr(color);
+    let metadata_vec = run_to_abi_metadata(&mut error_writer, options).unwrap();
+    for metadata in metadata_vec {
+        let move_sig_opt = parse_metadata_to_move_sig(&metadata);
+        if let Some(move_sig) = move_sig_opt {
+            println!("{}", serde_json::to_string_pretty(&move_sig).unwrap());
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/.gitignore b/vendors/move/crates/evm/hardhat-examples/.gitignore
new file mode 100644
index 000000000..36077f288
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/.gitignore
@@ -0,0 +1,9 @@
+node_modules
+.env
+coverage
+coverage.json
+typechain
+
+#Hardhat files
+cache
+artifacts
diff --git a/vendors/move/crates/evm/hardhat-examples/README.md b/vendors/move/crates/evm/hardhat-examples/README.md
new file mode 100644
index 000000000..99cb758c2
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/README.md
@@ -0,0 +1,21 @@
+# Hardhat Project for Move-on-EVM.
+
+This directory contains a Hardhat project for Move-on-EVM. The `contracts` directory contains Move contracts (e.g., `FortyTwo.move`) and the equivalent Solidity contracts (e.g., `FortyTwo.sol`). This directory contains the Move implementations for ERC20, ERC721 and ERC1155. The `test` directory contains test files (e.g., `FortyTwo.test.js`) to test both Move contracts and Solidity contracts. The `script` directory contains the script files to deploy the Move contracts on a network.
+
+To use this project, the hardhat environment (https://hardhat.org/tutorial/setting-up-the-environment.html) must to be set up first. Moreover, [`hardhat-move`](../hardhat-move/README.md) needs to be installed.
+
+To compile the contracts, use the following Hardhat command:
+```
+$ npx hardhat compile
+```
+
+To test, use the following command:
+```
+$ npx hardhat test
+```
+At the end of the tests, a gas report will be generated.
+
+You can deploy the Move contracts a network once after you properly key values in `hardhat.config.js`. To deploy ERC721 on the rinkeby Ethereum testnet (for example), use the following command:
+```
+$ npx hardhat run scripts/deploy_ERC721.js --network rinkeby
+```
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/Move.toml
new file mode 100644
index 000000000..3dd2c9a05
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ABIStruct"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/sources/ABIStruct.move b/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/sources/ABIStruct.move
new file mode 100644
index 000000000..f33cbe459
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ABIStruct/sources/ABIStruct.move
@@ -0,0 +1,77 @@
+#[evm_contract]
+module Evm::ABIStruct {
+    use std::vector;
+    use std::ascii::{Self, String};
+    use Evm::Evm::{emit};
+
+
+    #[external(sig=b"safeTransferFrom(S) returns (S2)")]
+    public native fun safe_transfer_form(contract: address, s: S): S2;
+
+
+    #[abi_struct(sig=b"S(uint64, bool, S2)")]
+    struct S has drop, copy {
+        a: u64,
+        b: bool,
+        c: S2
+    }
+
+    #[abi_struct(sig=b"S2(uint64)")]
+    struct S2 has drop, copy {
+        x: u64
+    }
+
+    #[event(sig=b"Event_u64(uint64)")]
+    struct Event_u64 {
+        s: u64
+    }
+
+    #[event(sig=b"Event_String(String)")]
+    struct Event_String {
+        s: String
+    }
+
+    #[callable(sig=b"test(S) returns (uint64)")]
+    fun test_2_S(s: S): u64 {
+        emit(Event_u64{s: s.a});
+        s.a
+    }
+
+    #[callable(sig=b"safe_transfer_form(address)")]
+    fun test_external_safe_transfer_from(addr: address) {
+        let s = pack_S(100, true);
+        let s2 = safe_transfer_form(addr, s);
+        emit(Event_u64{s: s2.x});
+    }
+
+    fun pack_S2(x: u64): S2 {
+        S2{x}
+    }
+
+    fun pack_S(a: u64, b: bool): S {
+        let s2 = pack_S2(a);
+        S{a, b, c: s2}
+    }
+
+    #[event(sig=b"Event_S(S)")]
+    struct Event_S {
+        s: S
+    }
+
+    #[event(sig=b"Event_S2(S2)")]
+    struct Event_S2 {
+        s: S2
+    }
+
+    #[callable]
+    fun do_transfer(){
+        let s = pack_S(42, true);
+        emit(Event_S{s});
+    }
+
+    #[callable(sig=b"test_string(String)")]
+    fun test_String_struct(s: String) {
+        emit(Event_String{s});
+    }
+
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/Move.toml
new file mode 100644
index 000000000..e0c21d6f0
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "AsyncEvent"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+Async = "0x1"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
+MoveAsyncLib = { local = "../../../../extensions/async/move-async-lib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move b/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move
new file mode 100644
index 000000000..01fd6c13b
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move
@@ -0,0 +1,102 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+module 0x3::AccountStateMachine {
+
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    const MAX: u64 = 43;
+    const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(MAX - this.value >= v, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds
+        // Remove this assert to test event
+        // assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller_: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller_, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (virtual_time() - p.initiated_at >= MAX_TRANSFER_AGE) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Callee.sol b/vendors/move/crates/evm/hardhat-examples/contracts/Callee.sol
new file mode 100644
index 000000000..998c54f82
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Callee.sol
@@ -0,0 +1,22 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+contract Callee {
+
+function success_uint() public pure returns (uint) {
+    return 42;
+}
+
+function panic() public pure returns (uint) {
+    //assert(false);
+    uint i = 0;
+    uint j = 1;
+    return j/i;
+}
+
+function ret_revert() public pure returns (uint) {
+    revert("revert");
+    return 1;
+}
+
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Caller/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Caller/Move.toml
new file mode 100644
index 000000000..00a74aab9
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Caller/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Caller"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Caller/sources/Caller.move b/vendors/move/crates/evm/hardhat-examples/contracts/Caller/sources/Caller.move
new file mode 100644
index 000000000..aa31f25cc
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Caller/sources/Caller.move
@@ -0,0 +1,50 @@
+#[evm_contract]
+module Evm::Caller {
+    use Evm::U256::{Self, U256};
+    use Evm::ExternalResult::{Self, ExternalResult};
+
+    #[external(sig=b"success_uint() returns (uint)")]
+    public native fun success(contract: address): ExternalResult<U256>;
+
+    #[external(sig=b"panic() returns (uint)")]
+    public native fun panic(contract: address): ExternalResult<U256>;
+
+    #[external(sig=b"ret_revert() returns (uint)")]
+    public native fun ret_revert(contract: address): ExternalResult<U256>;
+
+    #[callable(sig=b"call_success(address) returns (uint)"), pure]
+    public fun call_success(addr: address): U256 {
+        let v = success(addr);
+        if (ExternalResult::is_ok(&v)) {
+            return ExternalResult::unwrap<U256>(v)
+        };
+        return U256::zero()
+    }
+
+    #[callable(sig=b"call_revert(address) returns (string)"), pure]
+    public fun call_revert(addr: address): vector<u8> {
+        let v = ret_revert(addr);
+        if (ExternalResult::is_ok(&v)) {
+            return b"success"
+        } else if (ExternalResult::is_err_reason(&v)) {
+            return ExternalResult::unwrap_err_reason(v)
+        } else if (ExternalResult::is_panic(&v)) {
+            return b"panic"
+        };
+        return b"data"
+    }
+
+    #[callable(sig=b"call_panic(address) returns (uint)"), pure]
+    public fun call_panic(addr: address): U256 {
+        let v = panic(addr);
+        if (ExternalResult::is_ok(&v)) {
+            return U256::zero();
+        } else if (ExternalResult::is_err_reason(&v)) {
+            return U256::one();
+        } else if (ExternalResult::is_panic(&v)) {
+            return ExternalResult::unwrap_panic(v)
+        };
+        return  U256::max()
+    }
+
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/Move.toml
new file mode 100644
index 000000000..e0d87065e
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ERC1155Mock"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/sources/ERC1155Mock.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/sources/ERC1155Mock.move
new file mode 100644
index 000000000..6fde3ba22
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock/sources/ERC1155Mock.move
@@ -0,0 +1,389 @@
+#[evm_contract]
+/// An implementation of the ERC-1155 Multi Token Standard.
+module Evm::ERC1155Mock {
+    use Evm::Evm::{sender, self, sign, emit, isContract, abort_with, require};
+    use Evm::Table::{Self, Table};
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::U256::{Self, U256};
+    use std::vector;
+
+    // ---------------------
+    // For test only
+    // ---------------------
+
+    #[callable(sig=b"setURI(string)")]
+    public fun setURI(newuri: vector<u8>) acquires State {
+        borrow_global_mut<State>(self()).uri = newuri;
+    }
+
+    #[callable(sig=b"mint(address,uint256,uint256,bytes)")]
+    public fun mint(to: address, id: U256, amount: U256, data: vector<u8>) acquires State {
+        mint_(to, id, amount, data);
+    }
+
+    #[callable(sig=b"mintBatch(address,uint256[],uint256[],bytes)")]
+    public fun mintBatch(to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) acquires State {
+        mintBatch_(to, ids, amounts, data);
+    }
+
+    #[callable(sig=b"burn(address,uint256,uint256)")]
+    public fun burn(owner: address, id: U256, amount: U256) acquires State {
+        burn_(owner, id, amount);
+    }
+
+    #[callable(sig=b"burnBatch(address,uint256[],uint256[])")]
+    public fun burnBatch(owner: address, ids: vector<U256>, amounts: vector<U256>) acquires State {
+        burnBatch_(owner, ids, amounts);
+    }
+
+
+    // ---------------------
+    // Evm::IERC1155Receiver
+    // ---------------------
+
+    #[external(sig=b"onERC1155Received(address,address,uint256,uint256,bytes) returns (bytes4)")]
+    public native fun IERC1155Receiver_try_call_onERC1155Received(contract: address, operator: address, from: address, id: U256, amount: U256, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    #[external(sig=b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes) returns (bytes4)")]
+    public native fun IERC1155Receiver_try_call_onERC1155BatchReceived(contract: address, operator: address, from: address, ids: vector<U256>, amounts: vector<U256>, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    /// Return the selector of the function `onERC1155Received`
+    public fun IERC1155Receiver_selector_onERC1155Received(): vector<u8> {
+        //bytes4(keccak256(b"onERC1155Received(address,address,uint256,uint256,bytes)"))
+        x"f23a6e61"
+    }
+
+    /// Return the selector of the function `onERC1155Received`
+    public fun IERC1155Receiver_selector_onERC1155BatchReceived(): vector<u8> {
+        //bytes4(keccak256(b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))
+        x"bc197c81"
+    }
+
+    /// Return the interface identifier of this interface.
+    public fun IERC1155Receiver_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        // bytes_xor(
+        //     IERC1155Receiver_selector_onERC1155Received(),
+        //     IERC1155Receiver_selector_onERC1155BatchReceived()
+        // )
+        //x"4e2312e0"
+        x"4e2312e1" // TODO: wrong value
+    }
+
+    // ---------------------
+    // Evm::IERC165
+    // ---------------------
+    public fun IERC165_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"01ffc9a7"
+    }
+
+    // ---------------------
+    // Evm::IERC1155
+    // ---------------------
+    public fun IERC1155_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"d9b67a26"
+    }
+
+    #[event]
+    struct TransferSingle {
+        operator: address,
+        from: address,
+        to: address,
+        id: U256,
+        value: U256,
+    }
+
+    #[event]
+    struct TransferBatch {
+        operator: address,
+        from: address,
+        to: address,
+        ids: vector<U256>,
+        values: vector<U256>,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        account: address,
+        operator: address,
+        approved: bool,
+    }
+
+    #[event]
+    struct URI {
+        value: vector<u8>,
+        id: U256,
+    }
+
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        balances: Table<U256, Table<address, U256>>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+        uri: vector<u8>,
+        owner: address, // Implements the "ownable" pattern.
+    }
+
+    #[create(sig=b"constructor(string)")]
+    /// Constructor of this contract.
+    public fun create(uri: vector<u8>) {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                balances: Table::empty<U256, Table<address, U256>>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+                uri,
+                owner: sender(),
+            }
+        );
+    }
+
+    #[callable(sig=b"uri(uint256) returns (string)"), view]
+    /// Returns the name of the token
+    public fun uri(_id: U256): vector<u8> acquires State {
+        *&borrow_global<State>(self()).uri
+    }
+
+    #[callable(sig=b"balanceOf(address,uint256) returns (uint256)"), view]
+    /// Get the balance of an account's token.
+    public fun balanceOf(account: address, id: U256): U256 acquires State {
+        require(account != @0x0, b"ERC1155: balance query for the zero address");
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, id, account)
+    }
+
+    #[callable(sig=b"balanceOfBatch(address[],uint256[]) returns (uint256[])"), view]
+    /// Get the balance of multiple account/token pairs.
+    public fun balanceOfBatch(accounts: vector<address>, ids: vector<U256>): vector<U256> acquires State {
+        require(vector::length(&accounts) == vector::length(&ids), b"ERC1155: accounts and ids length mismatch");
+        let len = vector::length(&accounts);
+        let i = 0;
+        let balances = vector::empty<U256>();
+        while(i < len) {
+            vector::push_back(
+                &mut balances,
+                balanceOf(
+                    *vector::borrow(&accounts, i),
+                    *vector::borrow(&ids, i)
+                )
+            );
+            i = i + 1;
+        };
+        balances
+    }
+
+    #[callable(sig=b"setApprovalForAll(address,bool)")]
+    /// Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        let owner = sender();
+        require(owner != operator, b"ERC1155: setting approval status for self");
+        let s = borrow_global_mut<State>(self());
+        let operatorApproval = mut_operatorApprovals(s, owner, operator);
+        *operatorApproval = approved;
+        emit(ApprovalForAll{account: owner, operator, approved});
+    }
+
+    #[callable(sig=b"isApprovedForAll(address,address) returns (bool)"), view]
+    /// Queries the approval status of an operator for a given owner.
+    public fun isApprovedForAll(account: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApprovals(s, account, operator)
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256,uint256,bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeTransferFrom(from: address, to: address, id: U256, amount: U256, data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: transfer to the zero address");
+        require(from == sender() || isApprovedForAll(from, sender()), b"ERC1155: caller is not owner nor approved");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_from = mut_balanceOf(s, copy id, from);
+        require(U256::le(copy amount, *mut_balance_from), b"ERC1155: insufficient balance for transfer");
+        *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        let operator = sender();
+
+        emit(TransferSingle{operator, from, to, id: copy id, value: copy amount});
+
+        doSafeTransferAcceptanceCheck(operator, from, to, id, amount, data);
+    }
+
+    #[callable(sig=b"safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeBatchTransferFrom(from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: transfer to the zero address");
+        require(from == sender() || isApprovedForAll(from, sender()), b"ERC1155: transfer caller is not owner nor approved");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let operator = sender();
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_from = mut_balanceOf(s, copy id, from);
+            require(U256::le(copy amount, *mut_balance_from), b"ERC1155: insufficient balance for transfer");
+            *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+
+        emit(TransferBatch{operator, from, to, ids: copy ids, values: copy amounts});
+
+        doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, amounts, data);
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)"), view]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        interfaceId == IERC165_interfaceId() || interfaceId == IERC1155_interfaceId()
+    }
+
+    #[callable(sig=b"owner() returns (address)"), view]
+    public fun owner(): address acquires State {
+        borrow_global_mut<State>(self()).owner
+    }
+
+    // Internal function for minting.
+    fun mint_(to: address, id: U256, amount: U256, _data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: mint to the zero address");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        emit(TransferSingle{operator: sender(), from: @0x0, to, id: copy id, value: copy amount});
+    }
+
+    /// Internal function for mintBatch
+    fun mintBatch_(to: address, ids: vector<U256>, amounts: vector<U256>, _data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: mint to the zero address");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+        emit(TransferBatch{operator: sender(), from: @0x0, to, ids: copy ids, values: copy amounts});
+    }
+
+    public fun burn_(owner: address, id: U256, amount: U256) acquires State {
+        require(owner != @0x0, b"ERC1155: burn from the zero address");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_owner = mut_balanceOf(s, id, owner);
+        require(U256::ge(*mut_balance_owner, amount), b"ERC1155: burn amount exceeds balance");
+        *mut_balance_owner = U256::sub(*mut_balance_owner, amount);
+        emit(TransferSingle{operator: sender(), from: owner, to: @0x0, id, value: amount});
+    }
+
+    public fun burnBatch_(owner: address, ids: vector<U256>, amounts: vector<U256>) acquires State {
+        require(owner != @0x0, b"ERC1155: burn from the zero address");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+        let s = borrow_global_mut<State>(self());
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_owner = mut_balanceOf(s, id, owner);
+            require(U256::ge(*mut_balance_owner, amount), b"ERC1155: burn amount exceeds balance");
+            *mut_balance_owner = U256::sub(*mut_balance_owner, amount);
+
+            i = i + 1;
+        };
+        emit(TransferBatch{operator: sender(), from: owner, to: @0x0, ids, values: amounts});
+    }
+
+
+    /// Helper function to return a mut ref to the operatorApproval
+    fun mut_operatorApprovals(s: &mut State, account: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &account)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &account,
+                Table::empty<address, bool>()
+            )
+        };
+        let operatorApproval_account = Table::borrow_mut(
+            &mut s.operatorApprovals,
+            &account
+        );
+        Table::borrow_mut_with_default(operatorApproval_account, &operator, false)
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, id: U256, account: address): &mut U256 {
+        if(!Table::contains(&s.balances, &id)) {
+            Table::insert(
+                &mut s.balances,
+                &id,
+                Table::empty<address, U256>()
+            )
+        };
+        let balances_id = Table::borrow_mut(&mut s.balances, &id);
+        Table::borrow_mut_with_default(balances_id, &account, U256::zero())
+    }
+
+    /// Helper function for the safe transfer acceptance check.
+    fun doSafeTransferAcceptanceCheck(operator: address, from: address, to: address, id: U256, amount: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver_try_call_onERC1155Received(to, operator, from, id, amount, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC1155: transfer to non ERC1155Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC1155Receiver_selector_onERC1155Received();
+                require(retval == expected, b"ERC1155: ERC1155Receiver rejected tokens");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+
+    /// Helper function for the safe batch transfer acceptance check.
+    fun doSafeBatchTransferAcceptanceCheck(operator: address, from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver_try_call_onERC1155BatchReceived(to, operator, from, ids, amounts, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC1155: transfer to non ERC1155Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC1155Receiver_selector_onERC1155BatchReceived();
+                require(retval == expected, b"ERC1155: ERC1155Receiver rejected tokens");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock_Sol.sol
new file mode 100644
index 000000000..300a460e0
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Mock_Sol.sol
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";
+
+/**
+ * @title ERC1155Mock
+ * This mock just publicizes internal functions for testing purposes
+ */
+contract ERC1155Mock_Sol is ERC1155 {
+    constructor(string memory uri) ERC1155(uri) {}
+
+    function setURI(string memory newuri) public {
+        _setURI(newuri);
+    }
+
+    function mint(
+        address to,
+        uint256 id,
+        uint256 value,
+        bytes memory data
+    ) public {
+        _mint(to, id, value, data);
+    }
+
+    function mintBatch(
+        address to,
+        uint256[] memory ids,
+        uint256[] memory values,
+        bytes memory data
+    ) public {
+        _mintBatch(to, ids, values, data);
+    }
+
+    function burn(
+        address owner,
+        uint256 id,
+        uint256 value
+    ) public {
+        _burn(owner, id, value);
+    }
+
+    function burnBatch(
+        address owner,
+        uint256[] memory ids,
+        uint256[] memory values
+    ) public {
+        _burnBatch(owner, ids, values);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155ReceiverMock.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155ReceiverMock.sol
new file mode 100644
index 000000000..18e68e58f
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155ReceiverMock.sol
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+
+import "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
+import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+
+contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
+    bytes4 private _recRetval;
+    bool private _recReverts;
+    bytes4 private _batRetval;
+    bool private _batReverts;
+
+    event Received(address operator, address from, uint256 id, uint256 value, bytes data, uint256 gas);
+    event BatchReceived(address operator, address from, uint256[] ids, uint256[] values, bytes data, uint256 gas);
+
+    constructor(
+        bytes4 recRetval,
+        bool recReverts,
+        bytes4 batRetval,
+        bool batReverts
+    ) {
+        _recRetval = recRetval;
+        _recReverts = recReverts;
+        _batRetval = batRetval;
+        _batReverts = batReverts;
+    }
+
+    function onERC1155Received(
+        address operator,
+        address from,
+        uint256 id,
+        uint256 value,
+        bytes calldata data
+    ) external override returns (bytes4) {
+        require(!_recReverts, "ERC1155ReceiverMock: reverting on receive");
+        emit Received(operator, from, id, value, data, gasleft());
+        return _recRetval;
+    }
+
+    function onERC1155BatchReceived(
+        address operator,
+        address from,
+        uint256[] calldata ids,
+        uint256[] calldata values,
+        bytes calldata data
+    ) external override returns (bytes4) {
+        require(!_batReverts, "ERC1155ReceiverMock: reverting on batch receive");
+        emit BatchReceived(operator, from, ids, values, data, gasleft());
+        return _batRetval;
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/Move.toml
new file mode 100644
index 000000000..ee54facc6
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ERC1155Tradable"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/sources/ERC1155Tradable.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/sources/ERC1155Tradable.move
new file mode 100644
index 000000000..3988cc418
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC1155Tradable/sources/ERC1155Tradable.move
@@ -0,0 +1,466 @@
+#[evm_contract]
+/// An implementation of the ERC1155Tradable (https://github.com/ProjectOpenSea/opensea-erc1155/blob/master/contracts/ERC1155Tradable.sol).
+module Evm::ERC1155Tradable {
+    use Evm::Evm::{sender, self, sign, emit, isContract, abort_with, require, tokenURI_with_baseURI};
+    use Evm::Table::{Self, Table};
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::U256::{Self, U256};
+    use std::vector;
+
+    // ---------------------
+    // For test only
+    // ---------------------
+
+    #[callable(sig=b"mint(address,uint256,uint256,bytes)")]
+    public fun mint(to: address, id: U256, amount: U256, data: vector<u8>) acquires State {
+        mint_(to, id, amount, data);
+    }
+
+    #[callable(sig=b"mintBatch(address,uint256[],uint256[],bytes)")]
+    public fun mintBatch(to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) acquires State {
+        mintBatch_(to, ids, amounts, data);
+    }
+
+    #[callable(sig=b"burn(address,uint256,uint256)")]
+    public fun burn(owner: address, id: U256, amount: U256) acquires State {
+        burn_(owner, id, amount);
+    }
+
+    #[callable(sig=b"burnBatch(address,uint256[],uint256[])")]
+    public fun burnBatch(owner: address, ids: vector<U256>, amounts: vector<U256>) acquires State {
+        burnBatch_(owner, ids, amounts);
+    }
+
+
+    // ---------------------
+    // Evm::IERC1155Receiver
+    // ---------------------
+
+    #[external(sig=b"onERC1155Received(address,address,uint256,uint256,bytes) returns (bytes4)")]
+    public native fun IERC1155Receiver_try_call_onERC1155Received(contract: address, operator: address, from: address, id: U256, amount: U256, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    #[external(sig=b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes) returns (bytes4)")]
+    public native fun IERC1155Receiver_try_call_onERC1155BatchReceived(contract: address, operator: address, from: address, ids: vector<U256>, amounts: vector<U256>, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    /// Return the selector of the function `onERC1155Received`
+    public fun IERC1155Receiver_selector_onERC1155Received(): vector<u8> {
+        //bytes4(keccak256(b"onERC1155Received(address,address,uint256,uint256,bytes)"))
+        x"f23a6e61"
+    }
+
+    /// Return the selector of the function `onERC1155Received`
+    public fun IERC1155Receiver_selector_onERC1155BatchReceived(): vector<u8> {
+        //bytes4(keccak256(b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))
+        x"bc197c81"
+    }
+
+    /// Return the interface identifier of this interface.
+    public fun IERC1155Receiver_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        // bytes_xor(
+        //     IERC1155Receiver_selector_onERC1155Received(),
+        //     IERC1155Receiver_selector_onERC1155BatchReceived()
+        // )
+        //x"4e2312e0"
+        x"4e2312e1" // TODO: wrong value
+    }
+
+    // ---------------------
+    // Evm::IERC165
+    // ---------------------
+    public fun IERC165_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"01ffc9a7"
+    }
+
+    // ---------------------
+    // Evm::IERC1155
+    // ---------------------
+    public fun IERC1155_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"d9b67a26"
+    }
+
+    #[event]
+    struct TransferSingle {
+        operator: address,
+        from: address,
+        to: address,
+        id: U256,
+        value: U256,
+    }
+
+    #[event]
+    struct TransferBatch {
+        operator: address,
+        from: address,
+        to: address,
+        ids: vector<U256>,
+        values: vector<U256>,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        account: address,
+        operator: address,
+        approved: bool,
+    }
+
+    #[event(sig=b"URI(string,uint256)")]
+    struct URI {
+        value: vector<u8>,
+        id: U256,
+    }
+
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        name: vector<u8>,
+        symbol: vector<u8>,
+        balances: Table<U256, Table<address, U256>>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+        //uri: vector<u8>,
+        owner: address, // Implements the "ownable" pattern.
+        baseURI: vector<u8>,
+        creators: Table<U256, address>,
+        tokenSupply: Table<U256, U256>,
+        currentTokenID: U256,
+//        proxyRegistryAddress: address;
+    }
+
+    #[create(sig=b"constructor(string,string,string)")]
+    /// Constructor of this contract.
+    public fun constructor(name: vector<u8>, symbol: vector<u8>, baseURI: vector<u8>) acquires State {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                name,
+                symbol,
+                balances: Table::empty<U256, Table<address, U256>>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+                //uri,
+                owner: sender(),
+                baseURI,
+                creators: Table::empty<U256, address>(),
+                tokenSupply: Table::empty<U256, U256>(),
+                currentTokenID: U256::zero(),
+            }
+        );
+        // for deployment test only
+        // mint(sender(), U256::u256_from_u128(1), U256::u256_from_u128(10), b"");
+        // mint(sender(), U256::u256_from_u128(2), U256::u256_from_u128(100), b"");
+        // mint(sender(), U256::u256_from_u128(3), U256::u256_from_u128(1000), b"");
+        create(sender(), U256::u256_from_u128(10), b"", b"");
+        create(sender(), U256::u256_from_u128(100), b"", b"");
+        create(sender(), U256::u256_from_u128(1000), b"", b"");
+    }
+
+    #[callable(sig=b"uri(uint256) returns (string)"), view]
+    /// Returns the name of the token
+    public fun uri(id: U256): vector<u8> acquires State {
+        require(exists_(id), b"ERC1155Tradable#uri: NONEXISTENT_TOKEN");
+        tokenURI_with_baseURI(baseURI(), id)
+    }
+
+    fun exists_(tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_creatorOf(s, tokenId) != @0x0
+    }
+
+    #[callable(sig=b"baseURI() returns (string)"), view]
+    public fun baseURI(): vector<u8> acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.baseURI
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    public fun name(): vector<u8> acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.name
+    }
+
+    #[callable(sig=b"symbol() returns (string)"), view]
+    public fun symbol(): vector<u8> acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.symbol
+    }
+
+
+    #[callable(sig=b"setBaseMetadataURI(string)")]
+    public fun setBaseMetadataURI(newBaseURI: vector<u8>) acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.baseURI = newBaseURI;
+    }
+
+    #[callable(sig=b"totalSupply(uint256) returns (uint256)"), view]
+    public fun totalSupply(tokenId: U256): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_tokenSupplyOf(s, tokenId)
+    }
+
+    #[callable(sig=b"create(address,uint256,string,bytes) returns (uint256)"), view]
+    public fun create(initialOwner: address, initialSupply: U256, uri: vector<u8>, data: vector<u8>): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.currentTokenID = U256::add(s.currentTokenID, U256::one());
+        let id = s.currentTokenID;
+        *mut_creatorOf(s, id) = sender();
+        if (vector::length(&uri) > 0) {
+            emit(URI{value: uri, id})
+        };
+        *mut_tokenSupplyOf(s, id) = initialSupply;
+        mint(initialOwner, id, initialSupply, data);
+        id
+    }
+
+    #[callable(sig=b"balanceOf(address,uint256) returns (uint256)"), view]
+    /// Get the balance of an account's token.
+    public fun balanceOf(account: address, id: U256): U256 acquires State {
+        require(account != @0x0, b"ERC1155: balance query for the zero address");
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, id, account)
+    }
+
+    #[callable(sig=b"balanceOfBatch(address[],uint256[]) returns (uint256[])"), view]
+    /// Get the balance of multiple account/token pairs.
+    public fun balanceOfBatch(accounts: vector<address>, ids: vector<U256>): vector<U256> acquires State {
+        require(vector::length(&accounts) == vector::length(&ids), b"ERC1155: accounts and ids length mismatch");
+        let len = vector::length(&accounts);
+        let i = 0;
+        let balances = vector::empty<U256>();
+        while(i < len) {
+            vector::push_back(
+                &mut balances,
+                balanceOf(
+                    *vector::borrow(&accounts, i),
+                    *vector::borrow(&ids, i)
+                )
+            );
+            i = i + 1;
+        };
+        balances
+    }
+
+    #[callable(sig=b"setApprovalForAll(address,bool)")]
+    /// Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        let owner = sender();
+        require(owner != operator, b"ERC1155: setting approval status for self");
+        let s = borrow_global_mut<State>(self());
+        let operatorApproval = mut_operatorApprovals(s, owner, operator);
+        *operatorApproval = approved;
+        emit(ApprovalForAll{account: owner, operator, approved});
+    }
+
+    #[callable(sig=b"isApprovedForAll(address,address) returns (bool)"), view]
+    /// Queries the approval status of an operator for a given owner.
+    public fun isApprovedForAll(account: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApprovals(s, account, operator)
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256,uint256,bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeTransferFrom(from: address, to: address, id: U256, amount: U256, data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: transfer to the zero address");
+        require(from == sender() || isApprovedForAll(from, sender()), b"ERC1155: caller is not owner nor approved");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_from = mut_balanceOf(s, copy id, from);
+        require(U256::le(copy amount, *mut_balance_from), b"ERC1155: insufficient balance for transfer");
+        *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        let operator = sender();
+
+        emit(TransferSingle{operator, from, to, id: copy id, value: copy amount});
+
+        doSafeTransferAcceptanceCheck(operator, from, to, id, amount, data);
+    }
+
+    #[callable(sig=b"safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeBatchTransferFrom(from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: transfer to the zero address");
+        require(from == sender() || isApprovedForAll(from, sender()), b"ERC1155: transfer caller is not owner nor approved");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let operator = sender();
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_from = mut_balanceOf(s, copy id, from);
+            require(U256::le(copy amount, *mut_balance_from), b"ERC1155: insufficient balance for transfer");
+            *mut_balance_from = U256::sub(*mut_balance_from, copy amount);
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+
+        emit(TransferBatch{operator, from, to, ids: copy ids, values: copy amounts});
+
+        doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, amounts, data);
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)"), view]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        interfaceId == IERC165_interfaceId() || interfaceId == IERC1155_interfaceId()
+    }
+
+    #[callable(sig=b"owner() returns (address)"), view]
+    public fun owner(): address acquires State {
+        borrow_global_mut<State>(self()).owner
+    }
+
+    // Internal function for minting.
+    fun mint_(to: address, id: U256, amount: U256, _data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: mint to the zero address");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_to = mut_balanceOf(s, copy id, to);
+        *mut_balance_to = U256::add(*mut_balance_to, copy amount);
+        emit(TransferSingle{operator: sender(), from: @0x0, to, id: copy id, value: copy amount});
+    }
+
+    /// Internal function for mintBatch
+    fun mintBatch_(to: address, ids: vector<U256>, amounts: vector<U256>, _data: vector<u8>) acquires State {
+        require(to != @0x0, b"ERC1155: mint to the zero address");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+
+        let s = borrow_global_mut<State>(self());
+
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_to = mut_balanceOf(s, id, to);
+            *mut_balance_to = U256::add(*mut_balance_to, amount);
+
+            i = i + 1;
+        };
+        emit(TransferBatch{operator: sender(), from: @0x0, to, ids: copy ids, values: copy amounts});
+    }
+
+    public fun burn_(owner: address, id: U256, amount: U256) acquires State {
+        require(owner != @0x0, b"ERC1155: burn from the zero address");
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_owner = mut_balanceOf(s, id, owner);
+        require(U256::ge(*mut_balance_owner, amount), b"ERC1155: burn amount exceeds balance");
+        *mut_balance_owner = U256::sub(*mut_balance_owner, amount);
+        emit(TransferSingle{operator: sender(), from: owner, to: @0x0, id, value: amount});
+    }
+
+    public fun burnBatch_(owner: address, ids: vector<U256>, amounts: vector<U256>) acquires State {
+        require(owner != @0x0, b"ERC1155: burn from the zero address");
+        require(vector::length(&amounts) == vector::length(&ids), b"ERC1155: ids and amounts length mismatch");
+        let len = vector::length(&amounts);
+        let i = 0;
+        let s = borrow_global_mut<State>(self());
+        while(i < len) {
+            let id = *vector::borrow(&ids, i);
+            let amount = *vector::borrow(&amounts, i);
+
+            let mut_balance_owner = mut_balanceOf(s, id, owner);
+            require(U256::ge(*mut_balance_owner, amount), b"ERC1155: burn amount exceeds balance");
+            *mut_balance_owner = U256::sub(*mut_balance_owner, amount);
+
+            i = i + 1;
+        };
+        emit(TransferBatch{operator: sender(), from: owner, to: @0x0, ids, values: amounts});
+    }
+
+
+    /// Helper function to return a mut ref to the operatorApproval
+    fun mut_operatorApprovals(s: &mut State, account: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &account)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &account,
+                Table::empty<address, bool>()
+            )
+        };
+        let operatorApproval_account = Table::borrow_mut(
+            &mut s.operatorApprovals,
+            &account
+        );
+        Table::borrow_mut_with_default(operatorApproval_account, &operator, false)
+    }
+
+    /// Helper function to return a mut ref to the creator.
+    fun mut_creatorOf(s: &mut State, id: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.creators, &id, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the tokenSupply.
+    fun mut_tokenSupplyOf(s: &mut State, id: U256): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.tokenSupply, &id, U256::zero())
+    }
+
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, id: U256, account: address): &mut U256 {
+        if(!Table::contains(&s.balances, &id)) {
+            Table::insert(
+                &mut s.balances,
+                &id,
+                Table::empty<address, U256>()
+            )
+        };
+        let balances_id = Table::borrow_mut(&mut s.balances, &id);
+        Table::borrow_mut_with_default(balances_id, &account, U256::zero())
+    }
+
+    /// Helper function for the safe transfer acceptance check.
+    fun doSafeTransferAcceptanceCheck(operator: address, from: address, to: address, id: U256, amount: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver_try_call_onERC1155Received(to, operator, from, id, amount, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC1155: transfer to non ERC1155Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC1155Receiver_selector_onERC1155Received();
+                require(retval == expected, b"ERC1155: ERC1155Receiver rejected tokens");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+
+    /// Helper function for the safe batch transfer acceptance check.
+    fun doSafeBatchTransferAcceptanceCheck(operator: address, from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver_try_call_onERC1155BatchReceived(to, operator, from, ids, amounts, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC1155: transfer to non ERC1155Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC1155Receiver_selector_onERC1155BatchReceived();
+                require(retval == expected, b"ERC1155: ERC1155Receiver rejected tokens");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/Move.toml
new file mode 100644
index 000000000..2140b03a2
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "ERC20DecimalsMock"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/sources/ERC20DecimalsMock.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/sources/ERC20DecimalsMock.move
new file mode 100644
index 000000000..b6f357136
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock/sources/ERC20DecimalsMock.move
@@ -0,0 +1,203 @@
+#[evm_contract]
+/// An implementation of the ERC-20 Token Standard.
+module Evm::ERC20DecimalsMock {
+    use Evm::Evm::{sender, self, sign, emit, require};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+
+    #[event(sig=b"Transfer(address indexed,address indexed,uint256)")]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Approval(address indexed,address indexed,uint256)")]
+    struct Approval {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        balances: Table<address, U256>,
+        allowances: Table<address, Table<address, U256>>,
+        total_supply: U256,
+        name: vector<u8>,
+        symbol: vector<u8>,
+        decimals: u8,
+    }
+
+    #[create(sig=b"constructor(string,string,uint8)")]
+    /// Constructor of this contract.
+    public fun create(name: vector<u8>, symbol: vector<u8>, decimals: u8) {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                total_supply: U256::zero(),
+                balances: Table::empty<address, U256>(),
+                allowances: Table::empty<address, Table<address, U256>>(),
+                name,
+                symbol,
+                decimals,
+            }
+        );
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    /// Returns the name of the token
+    public fun name(): vector<u8> acquires State {
+        *&borrow_global<State>(self()).name
+    }
+
+    #[callable(sig=b"symbol() returns (string)"), view]
+    /// Returns the symbol of the token, usually a shorter version of the name.
+    public fun symbol(): vector<u8> acquires State {
+        *&borrow_global<State>(self()).symbol
+    }
+
+    #[callable(sig=b"decimals() returns (uint8)"), view]
+    /// Returns the number of decimals used to get its user representation.
+    public fun decimals(): u8 acquires State {
+        *&borrow_global<State>(self()).decimals
+    }
+
+    #[callable(sig=b"totalSupply() returns (uint256)"), view]
+    /// Returns the total supply of the token.
+    public fun totalSupply(): U256 acquires State {
+        *&borrow_global<State>(self()).total_supply
+    }
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    /// Returns the balance of an account.
+    public fun balanceOf(owner: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable(sig=b"transfer(address,uint256) returns (bool)")]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(to: address, amount: U256): bool acquires State {
+        transfer_(sender(), to, amount);
+        true
+    }
+
+    #[callable(sig=b"transferFrom(address,address,uint256) returns (bool)")]
+    /// Transfers the amount on behalf of the `from` account to the given account.
+    /// This evaluates and adjusts the allowance.
+    public fun transferFrom(from: address, to: address, amount: U256): bool acquires State {
+        spendAllowance_(from, sender(), amount);
+        transfer_(from, to, amount);
+        true
+    }
+
+    #[callable(sig=b"approve(address,uint256) returns (bool)")]
+    /// Approves that the spender can spent the given amount on behalf of the calling account.
+    public fun approve(spender: address, amount: U256): bool acquires State {
+        approve_(sender(), spender, amount);
+        true
+    }
+
+    #[callable(sig=b"allowance(address,address) returns (uint256)"), view]
+    /// Returns the allowance an account owner has approved for the given spender.
+    public fun allowance(owner: address, spender: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_allowance(s, owner, spender)
+    }
+
+    #[callable(sig=b"increaseAllowance(address,uint256) returns (bool)")]
+    /// Atomically increases the allowance granted to `spender` by the caller.
+    public fun increaseAllowance(spender: address, addedValue: U256): bool acquires State {
+        let owner = sender();
+        approve_(owner, spender, U256::add(allowance(owner, spender), addedValue));
+        true
+    }
+
+    #[callable(sig=b"decreaseAllowance(address,uint256) returns (bool)")]
+    /// Atomically decreases the allowance granted to `spender` by the caller.
+    public fun decreaseAllowance(spender: address, subtractedValue: U256): bool acquires State {
+        let owner = sender();
+        let currentAllowance = allowance(owner, spender);
+        require(U256::ge(currentAllowance, subtractedValue), b"ERC20: decreased allowance below zero");
+        approve_(owner, spender, U256::sub(currentAllowance, subtractedValue));
+        true
+    }
+
+    /// Helper function to update `owner` s allowance for `spender` based on spent `amount`.
+    fun spendAllowance_(owner: address, spender: address, amount: U256) acquires State {
+        let currentAllowance = allowance(owner, spender);
+        if (currentAllowance != U256::max()) {
+            require(U256::ge(currentAllowance, amount), b"ERC20: insufficient allowance");
+            approve_(owner, spender, U256::sub(currentAllowance, amount));
+        }
+    }
+
+    /// Helper function to perform an approval
+    fun approve_(owner: address, spender: address, amount: U256) acquires State {
+        require(owner != @0x0, b"ERC20: approve from the zero address");
+        require(spender != @0x0, b"ERC20: approve to the zero address");
+        let s = borrow_global_mut<State>(self());
+        if(!Table::contains(&s.allowances, &owner)) {
+            Table::insert(&mut s.allowances, &owner, Table::empty<address, U256>())
+        };
+        let a = Table::borrow_mut(&mut s.allowances, &owner);
+        if(!Table::contains(a, &spender)) {
+            Table::insert(a, &spender, amount);
+        }
+        else {
+            *Table::borrow_mut(a, &spender) = amount;
+        };
+        emit(Approval{owner, spender, value: amount});
+    }
+
+    /// Helper function to perform a transfer of funds.
+    fun transfer_(from: address, to: address, amount: U256) acquires State {
+        require(from != @0x0, b"ERC20: transfer from the zero address");
+        require(to != @0x0, b"ERC20: transfer to the zero address");
+        let s = borrow_global_mut<State>(self());
+        let from_bal = mut_balanceOf(s, from);
+        require(U256::le(copy amount, *from_bal), b"ERC20: transfer amount exceeds balance");
+        *from_bal = U256::sub(*from_bal, copy amount);
+        let to_bal = mut_balanceOf(s, to);
+        *to_bal = U256::add(*to_bal, copy amount);
+        emit(Transfer{from, to, value: amount});
+    }
+
+    /// Helper function to return a mut ref to the allowance of a spender.
+    fun mut_allowance(s: &mut State, owner: address, spender: address): &mut U256 {
+        if(!Table::contains(&s.allowances, &owner)) {
+            Table::insert(&mut s.allowances, &owner, Table::empty<address, U256>())
+        };
+        let allowance_owner = Table::borrow_mut(&mut s.allowances, &owner);
+        Table::borrow_mut_with_default(allowance_owner, &spender, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+
+    /// Create `amount` tokens and assigns them to `account`, increasing
+    /// the total supply.
+    fun mint_(account: address, amount: U256) acquires State {
+        require(account != @0x0, b"ERC20: mint to the zero address");
+        let s = borrow_global_mut<State>(self());
+        s.total_supply = U256::add(s.total_supply, amount);
+        let mut_bal_account = mut_balanceOf(s, account);
+        *mut_bal_account = U256::add(*mut_bal_account, amount);
+        emit(Transfer{from: @0x0, to: account, value: amount});
+    }
+
+    /// Destroys `amount` tokens from `account`, reducing the total supply.
+    fun burn_(account: address, amount: U256) acquires State {
+        require(account != @0x0, b"ERC20: burn from the zero address");
+        let s = borrow_global_mut<State>(self());
+        let mut_bal_account = mut_balanceOf(s, account);
+        require(U256::ge(*mut_bal_account, amount), b"ERC20: burn amount exceeds balance");
+        *mut_bal_account = U256::sub(*mut_bal_account, amount);
+        s.total_supply = U256::sub(s.total_supply, amount);
+        emit(Transfer{from: account, to: @0x0, value: amount});
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock_Sol.sol
new file mode 100644
index 000000000..c98c40508
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20DecimalsMock_Sol.sol
@@ -0,0 +1,29 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// mock class using ERC20
+contract ERC20DecimalsMock_Sol is ERC20 {
+    uint8 private immutable _decimals;
+
+    constructor(
+        string memory name,
+        string memory symbol,
+        uint8 decimals_
+    ) payable ERC20(name, symbol) {
+        _decimals = decimals_;
+    }
+
+    function decimals() public view virtual override returns (uint8) {
+        return _decimals;
+    }
+
+    function mint(address account, uint256 amount) public {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) public {
+        _burn(account, amount);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/Move.toml
new file mode 100644
index 000000000..c52b49046
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "ERC20Mock"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/sources/ERC20Mock.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/sources/ERC20Mock.move
new file mode 100644
index 000000000..1fdeb475c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock/sources/ERC20Mock.move
@@ -0,0 +1,223 @@
+#[evm_contract]
+/// An implementation of the ERC-20 Token Standard.
+module Evm::ERC20Mock {
+    use Evm::Evm::{sender, emit, require};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+
+    #[event(sig=b"Transfer(address indexed,address indexed,uint256)")]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Approval(address indexed,address indexed,uint256)")]
+    struct Approval {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+    #[storage]
+    /// Represents the state of this contract.
+    struct State has key {
+        balances: Table<address, U256>,
+        allowances: Table<address, Table<address, U256>>,
+        total_supply: U256,
+        name: vector<u8>,
+        symbol: vector<u8>,
+    }
+
+    // ----------------------------------------
+    // For test only
+    // ----------------------------------------
+    #[callable(sig=b"mint(address,uint256)")]
+    public fun mint(state: &mut State, account: address, amount: U256) {
+        mint_(state, account, amount)
+    }
+
+    #[callable(sig=b"burn(address,uint256)")]
+    public fun burn(state: &mut State, account: address, amount: U256) {
+        burn_(state, account, amount)
+    }
+
+    #[callable(sig=b"transferInternal(address,address,uint256)")]
+    public fun transferInternal(state: &mut State, from: address, to: address, value: U256) {
+        transfer_(state, from, to, value)
+    }
+
+    #[callable(sig=b"approveInternal(address,address,uint256)")]
+    public fun approveInternal(state: &mut State, owner: address, spender: address, value: U256) {
+        approve_(state, owner, spender, value)
+    }
+    // ----------------------------------------
+    // End of "For test only"
+    // ----------------------------------------
+
+    #[create(sig=b"constructor(string,string,address,uint256)")]
+    /// Constructor of this contract.
+    public fun create(name: vector<u8>, symbol: vector<u8>, initial_account: address, initial_balance: U256): State {
+        // Initial state of contract
+        let state = State {
+            total_supply: U256::zero(),
+            balances: Table::empty<address, U256>(),
+            allowances: Table::empty<address, Table<address, U256>>(),
+            name,
+            symbol,
+        };
+        // Minting the initial supply
+        mint_(&mut state, initial_account, initial_balance);
+        state
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    /// Returns the name of the token
+    public fun name(state: &State): vector<u8> {
+        state.name
+    }
+
+    #[callable(sig=b"symbol() returns (string)"), view]
+    /// Returns the symbol of the token, usually a shorter version of the name.
+    public fun symbol(state: &State): vector<u8> {
+        state.symbol
+    }
+
+    #[callable(sig=b"decimals() returns (uint8)"), view]
+    /// Returns the number of decimals used to get its user representation.
+    public fun decimals(): u8 {
+        18
+    }
+
+    #[callable(sig=b"totalSupply() returns (uint256)"), view]
+    /// Returns the total supply of the token.
+    public fun totalSupply(state: &State): U256 {
+        state.total_supply
+    }
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    /// Returns the balance of an account.
+    public fun balanceOf(state: &mut State, owner: address): U256 {
+        *mut_balanceOf(state, owner)
+    }
+
+    #[callable(sig=b"transfer(address,uint256) returns (bool)")]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(state: &mut State, to: address, amount: U256): bool {
+        transfer_(state, sender(), to, amount);
+        true
+    }
+
+    #[callable(sig=b"transferFrom(address,address,uint256) returns (bool)")]
+    /// Transfers the amount on behalf of the `from` account to the given account.
+    /// This evaluates and adjusts the allowance.
+    public fun transferFrom(state: &mut State, from: address, to: address, amount: U256): bool {
+        spendAllowance_(state, from, sender(), amount);
+        transfer_(state, from, to, amount);
+        true
+    }
+
+    #[callable(sig=b"approve(address,uint256) returns (bool)")]
+    /// Approves that the spender can spent the given amount on behalf of the calling account.
+    public fun approve(state: &mut State, spender: address, amount: U256): bool {
+        approve_(state, sender(), spender, amount);
+        true
+    }
+
+    #[callable(sig=b"allowance(address,address) returns (uint256)"), view]
+    /// Returns the allowance an account owner has approved for the given spender.
+    public fun allowance(state: &mut State, owner: address, spender: address): U256 {
+        *mut_allowance(state, owner, spender)
+    }
+
+    #[callable(sig=b"increaseAllowance(address,uint256) returns (bool)")]
+    /// Atomically increases the allowance granted to `spender` by the caller.
+    public fun increaseAllowance(state: &mut State, spender: address, addedValue: U256): bool {
+        let owner = sender();
+        let increased = U256::add(allowance(state, owner, spender), addedValue);
+        approve_(state, owner, spender, increased);
+        true
+    }
+
+    #[callable(sig=b"decreaseAllowance(address,uint256) returns (bool)")]
+    /// Atomically decreases the allowance granted to `spender` by the caller.
+    public fun decreaseAllowance(state: &mut State, spender: address, subtractedValue: U256): bool {
+        let owner = sender();
+        let currentAllowance = allowance(state, owner, spender);
+        require(U256::ge(currentAllowance, subtractedValue), b"ERC20: decreased allowance below zero");
+        approve_(state, owner, spender, U256::sub(currentAllowance, subtractedValue));
+        true
+    }
+
+    /// Helper function to update `owner` s allowance for `spender` based on spent `amount`.
+    fun spendAllowance_(state: &mut State, owner: address, spender: address, amount: U256) {
+        let currentAllowance = allowance(state, owner, spender);
+        if (currentAllowance != U256::max()) {
+            require(U256::ge(currentAllowance, amount), b"ERC20: insufficient allowance");
+            approve_(state, owner, spender, U256::sub(currentAllowance, amount));
+        }
+    }
+
+    /// Helper function to perform an approval
+    fun approve_(state: &mut State, owner: address, spender: address, amount: U256) {
+        require(owner != @0x0, b"ERC20: approve from the zero address");
+        require(spender != @0x0, b"ERC20: approve to the zero address");
+        if(!Table::contains(&state.allowances, &owner)) {
+            Table::insert(&mut state.allowances, &owner, Table::empty<address, U256>())
+        };
+        let a = Table::borrow_mut(&mut state.allowances, &owner);
+        if(!Table::contains(a, &spender)) {
+            Table::insert(a, &spender, amount);
+        }
+        else {
+            *Table::borrow_mut(a, &spender) = amount;
+        };
+        emit(Approval{owner, spender, value: amount});
+    }
+
+    /// Helper function to perform a transfer of funds.
+    fun transfer_(state: &mut State, from: address, to: address, amount: U256) {
+        require(from != @0x0, b"ERC20: transfer from the zero address");
+        require(to != @0x0, b"ERC20: transfer to the zero address");
+        let from_bal = mut_balanceOf(state, from);
+        require(U256::le(amount, *from_bal), b"ERC20: transfer amount exceeds balance");
+        *from_bal = U256::sub(*from_bal, amount);
+        let to_bal = mut_balanceOf(state, to);
+        *to_bal = U256::add(*to_bal, copy amount);
+        emit(Transfer{from, to, value: amount});
+    }
+
+    /// Helper function to return a mut ref to the allowance of a spender.
+    fun mut_allowance(state: &mut State, owner: address, spender: address): &mut U256 {
+        if(!Table::contains(&state.allowances, &owner)) {
+            Table::insert(&mut state.allowances, &owner, Table::empty<address, U256>())
+        };
+        let allowance_owner = Table::borrow_mut(&mut state.allowances, &owner);
+        Table::borrow_mut_with_default(allowance_owner, &spender, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(state: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut state.balances, &owner, U256::zero())
+    }
+
+    /// Create `amount` tokens and assigns them to `account`, increasing
+    /// the total supply.
+    fun mint_(state: &mut State, account: address, amount: U256) {
+        require(account != @0x0, b"ERC20: mint to the zero address");
+        state.total_supply = U256::add(state.total_supply, amount);
+        let mut_bal_account = mut_balanceOf(state, account);
+        *mut_bal_account = U256::add(*mut_bal_account, amount);
+        emit(Transfer{from: @0x0, to: account, value: amount});
+    }
+
+    /// Destroys `amount` tokens from `account`, reducing the total supply.
+    fun burn_(state: &mut State, account: address, amount: U256) {
+        require(account != @0x0, b"ERC20: burn from the zero address");
+        let mut_bal_account = mut_balanceOf(state, account);
+        require(U256::ge(*mut_bal_account, amount), b"ERC20: burn amount exceeds balance");
+        *mut_bal_account = U256::sub(*mut_bal_account, amount);
+        state.total_supply = U256::sub(state.total_supply, amount);
+        emit(Transfer{from: account, to: @0x0, value: amount});
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock_Sol.sol
new file mode 100644
index 000000000..56f7c7d15
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC20Mock_Sol.sol
@@ -0,0 +1,40 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// mock class using ERC20
+contract ERC20Mock_Sol is ERC20 {
+    constructor(
+        string memory name,
+        string memory symbol,
+        address initialAccount,
+        uint256 initialBalance
+    ) payable ERC20(name, symbol) {
+        _mint(initialAccount, initialBalance);
+    }
+
+    function mint(address account, uint256 amount) public {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) public {
+        _burn(account, amount);
+    }
+
+    function transferInternal(
+        address from,
+        address to,
+        uint256 value
+    ) public {
+        _transfer(from, to, value);
+    }
+
+    function approveInternal(
+        address owner,
+        address spender,
+        uint256 value
+    ) public {
+        _approve(owner, spender, value);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/Move.toml
new file mode 100644
index 000000000..58d6786a1
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ERC721Mock"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/sources/ERC721Mock.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/sources/ERC721Mock.move
new file mode 100644
index 000000000..4b92e421b
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock/sources/ERC721Mock.move
@@ -0,0 +1,366 @@
+#[evm_contract]
+/// An implementation of the ERC-721 Non-Fungible Token Standard.
+module Evm::ERC721 {
+    use Evm::Evm::{sender, self, sign, emit, isContract, tokenURI_with_baseURI, require, abort_with};
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+    use std::vector;
+
+    // ---------------------
+    // Evm::IERC165
+    // ---------------------
+    public fun IERC165_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"01ffc9a7"
+    }
+
+    // ---------------------
+    // Evm::IERC721
+    // ---------------------
+    public fun IERC721_interfaceId(): vector<u8> {
+        x"80ac58cd"
+    }
+
+    // ---------------------
+    // Evm::IERC721Metadata
+    // ---------------------
+    public fun IERC721Metadata_interfaceId(): vector<u8> {
+        x"5b5e139f"
+    }
+
+    // ---------------------
+    // Evm::IERC721Receiver
+    // ---------------------
+    public fun IERC721Receiver_selector_onERC721Received(): vector<u8> {
+        x"150b7a02"
+    }
+
+    // ---------------------
+    // For test only
+    // ---------------------
+
+    #[callable]
+    public fun mint(to: address, tokenId: U256) acquires State {
+        mint_(to, tokenId);
+    }
+
+    #[callable(sig=b"safeMint(address,uint256)")]
+    fun safeMint(to: address, tokenId: U256) acquires State {
+        safeMint_(to, tokenId, b"");
+    }
+
+    #[callable(sig=b"safeMint(address,uint256,bytes)")]
+    fun safeMint_with_data(to: address, tokenId: U256, data: vector<u8>) acquires State {
+        safeMint_(to, tokenId, data);
+    }
+
+    fun mint_(to: address, tokenId: U256) acquires State  {
+        require(to != @0x0, b"ERC721: mint to the zero address");
+        require(!exists_(tokenId), b"ERC721: token already minted");
+
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_to = mut_balanceOf(s, to);
+        *mut_balance_to = U256::add(*mut_balance_to, U256::one());
+
+        let mut_ownerOf_to = mut_ownerOf(s, tokenId);
+        *mut_ownerOf_to = to;
+
+        emit(Transfer{from: @0x0, to, tokenId});
+    }
+
+    fun safeMint_(to: address, tokenId: U256, data: vector<u8>) acquires State {
+        mint_(to, tokenId);
+        doSafeTransferAcceptanceCheck(@0x0, to, tokenId, data);
+    }
+
+    #[callable]
+    public fun burn(tokenId: U256) acquires State {
+        burn_(tokenId);
+    }
+
+    fun burn_(tokenId: U256) acquires State {
+        let owner = ownerOf(tokenId);
+        approve(@0x0, tokenId);
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_owner = mut_balanceOf(s, owner);
+        *mut_balance_owner = U256::sub(*mut_balance_owner, U256::one());
+        let _ = Table::remove(&mut s.owners, &tokenId);
+        emit(Transfer{from: owner, to: @0x0, tokenId});
+    }
+
+    fun exists_(tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        tokenExists(s, tokenId)
+    }
+
+    // Disabled this for a fair gas comparison with `ERC721Mock_Sol.sol`
+    // which does not support `setBaseURI`.
+    // #[callable(sig=b"setBaseURI(string)")]
+    // public fun setBaseURI(newBaseURI: vector<u8>) acquires State {
+    //     let s = borrow_global_mut<State>(self());
+    //     s.baseURI = newBaseURI;
+    // }
+
+    #[callable(sig=b"baseURI() returns (string)"), view]
+    public fun baseURI(): vector<u8> acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.baseURI
+    }
+
+    #[event]
+    struct Transfer {
+        from: address,
+        to: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct Approval {
+        owner: address,
+        approved: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        owner: address,
+        operator: address,
+        approved: bool,
+    }
+
+    /// Represents the state of this contract.
+    /// This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        name: vector<u8>,
+        symbol: vector<u8>,
+        owners: Table<U256, address>,
+        balances: Table<address, U256>,
+        tokenApprovals: Table<U256, address>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+        baseURI: vector<u8>,
+    }
+
+    #[create(sig=b"constructor(string,string)")]
+    /// Constructor of this contract.
+    public fun create(name: vector<u8>, symbol: vector<u8>) {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                name,
+                symbol,
+                owners: Table::empty<U256, address>(),
+                balances: Table::empty<address, U256>(),
+                tokenApprovals: Table::empty<U256, address>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+                baseURI: b"",
+            }
+        );
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)"), pure]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        interfaceId == IERC165_interfaceId() ||
+        interfaceId == IERC721_interfaceId() ||
+        interfaceId == IERC721Metadata_interfaceId()
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    /// Get the name.
+    public fun name(): vector<u8> acquires State {
+        let s = borrow_global<State>(self());
+        *&s.name
+    }
+
+    #[callable(sig=b"symbol() returns (string)"), view]
+    /// Get the symbol.
+    public fun symbol(): vector<u8> acquires State {
+        let s = borrow_global<State>(self());
+        *&s.symbol
+    }
+
+    #[callable(sig=b"tokenURI(uint256) returns (string)"), view]
+    /// Get the name.
+    public fun tokenURI(tokenId: U256): vector<u8> acquires State {
+        require(exists_(tokenId), b"ERC721Metadata: URI query for nonexistent token");
+        tokenURI_with_baseURI(baseURI(), tokenId)
+    }
+
+    /// Count all NFTs assigned to an owner.
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    public fun balanceOf(owner: address): U256 acquires State {
+        require(owner != @0x0, b"ERC721: balance query for the zero address");
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable(sib=b"ownerOf(uint256) returns (address)"), view]
+    /// Find the owner of an NFT.
+    public fun ownerOf(tokenId: U256): address acquires State {
+        require(exists_(tokenId), b"ERC721: owner query for nonexistent token");
+        let s = borrow_global_mut<State>(self());
+        *mut_ownerOf(s, tokenId)
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256,bytes)")] // Overloading `safeTransferFrom`
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom_with_data(from: address, to: address, tokenId: U256, data: vector<u8>) acquires State {
+        transferFrom(from, to, tokenId);
+        doSafeTransferAcceptanceCheck(from, to, tokenId, data);
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256)")]
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom(from: address, to: address, tokenId: U256) acquires State {
+        safeTransferFrom_with_data(from, to, tokenId, b"");
+    }
+
+    #[callable]
+    /// Transfer ownership of an NFT. THE CALLER IS RESPONSIBLE
+    ///  TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///  THEY MAY BE PERMANENTLY LOST
+    public fun transferFrom(from: address, to: address, tokenId: U256) acquires State {
+        require(isApprovedOrOwner(sender(), tokenId), b"ERC721: transfer caller is not owner nor approved");
+
+        require(ownerOf(tokenId) == from, b"ERC721: transfer from incorrect owner");
+        require(to != @0x0, b"ERC721: transfer to the zero address");
+
+        // Clear approvals from the previous owner
+        approve_(@0x0, tokenId);
+
+        let s = borrow_global_mut<State>(self());
+
+        let mut_balance_from = mut_balanceOf(s, from);
+        *mut_balance_from = U256::sub(*mut_balance_from, U256::one());
+
+        let mut_balance_to = mut_balanceOf(s, to);
+        *mut_balance_to = U256::add(*mut_balance_to, U256::one());
+
+        let mut_owner_token = mut_ownerOf(s, tokenId);
+        *mut_owner_token = to;
+
+        emit(Transfer{from, to, tokenId});
+    }
+
+    #[callable]
+    /// Change or reaffirm the approved address for an NFT.
+    public fun approve(approved: address, tokenId: U256) acquires State {
+        let owner = ownerOf(tokenId);
+        require(approved != owner, b"ERC721: approval to current owner");
+        require((sender() == owner) || isApprovedForAll(owner, sender()), b"ERC721: approve caller is not owner nor approved for all");
+        approve_(approved, tokenId);
+    }
+
+    fun approve_(approved: address, tokenId: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_tokenApproval(s, tokenId) = approved;
+        emit(Approval{owner: ownerOf(tokenId), approved, tokenId})
+    }
+
+    #[callable]
+    /// Enable or disable approval for a third party ("operator") to manage
+    ///  all of the sender's assets.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        setApprovalForAll_(sender(), operator, approved);
+    }
+
+    fun setApprovalForAll_(owner: address, operator: address, approved: bool) acquires State {
+        require(owner != operator, b"ERC721: approve to caller");
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, owner, operator) = approved;
+        emit(ApprovalForAll{owner, operator, approved})
+    }
+
+    #[callable, view]
+    /// Get the approved address for a single NFT.
+    public fun getApproved(tokenId: U256): address acquires State {
+        let s = borrow_global_mut<State>(self());
+        require(tokenExists(s, tokenId), b"ERC721: approved query for nonexistent token");
+        *mut_tokenApproval(s, tokenId)
+    }
+
+    #[callable, view]
+    /// Query if an address is an authorized operator for another address.
+    public fun isApprovedForAll(owner: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, owner, operator)
+    }
+
+    /// Helper function to return true iff `spender` is the owner or an approved one for `tokenId`.
+    fun isApprovedOrOwner(spender: address, tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        require(tokenExists(s, tokenId), b"ERC721: operator query for nonexistent token");
+        let owner = ownerOf(tokenId);
+        return (spender == owner || getApproved(tokenId) == spender || isApprovedForAll(owner, spender))
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_ownerOf(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.owners, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_tokenApproval(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.tokenApprovals, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the operator approval.
+    fun mut_operatorApproval(s: &mut State, owner: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &owner)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &owner,
+                Table::empty<address, bool>()
+            )
+        };
+        let approvals = Table::borrow_mut(&mut s.operatorApprovals, &owner);
+        Table::borrow_mut_with_default(approvals, &operator, false)
+    }
+
+    /// Helper function to return true iff the token exists.
+    fun tokenExists(s: &mut State, tokenId: U256): bool {
+        let mut_ownerOf_tokenId = mut_ownerOf(s, tokenId);
+        *mut_ownerOf_tokenId != @0x0
+    }
+
+    /// Helper function for the acceptance check.
+    fun doSafeTransferAcceptanceCheck(from: address, to: address, tokenId: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC721Receiver_try_call_onERC721Received(to, sender(), from, tokenId, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC721: transfer to non ERC721Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC721Receiver_selector_onERC721Received();
+                require(retval == expected, b"ERC721: transfer to non ERC721Receiver implementer");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+
+    #[external(sig=b"onERC721Received(address,address,uint256,bytes) returns (bytes4)")]
+    public native fun IERC721Receiver_try_call_onERC721Received(
+        contract: address,
+        operator: address,
+        from: address,
+        tokenId: U256,
+        bytes: vector<u8>
+    ): ExternalResult<vector<u8>>;
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock_Sol.sol
new file mode 100644
index 000000000..e4c7f03cb
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Mock_Sol.sol
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+
+/**
+ * @title ERC721Mock
+ * This mock just provides a public safeMint, mint, and burn functions for testing purposes
+ */
+contract ERC721Mock_Sol is ERC721 {
+    constructor(string memory name, string memory symbol) ERC721(name, symbol) {}
+
+    function baseURI() public view returns (string memory) {
+        return _baseURI();
+    }
+
+    function exists(uint256 tokenId) public view returns (bool) {
+        return _exists(tokenId);
+    }
+
+    function mint(address to, uint256 tokenId) public {
+        _mint(to, tokenId);
+    }
+
+    function safeMint(address to, uint256 tokenId) public {
+        _safeMint(to, tokenId);
+    }
+
+    function safeMint(
+        address to,
+        uint256 tokenId,
+        bytes memory _data
+    ) public {
+        _safeMint(to, tokenId, _data);
+    }
+
+    function burn(uint256 tokenId) public {
+        _burn(tokenId);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721ReceiverMock.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721ReceiverMock.sol
new file mode 100644
index 000000000..e1885b045
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721ReceiverMock.sol
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import "hardhat/console.sol";
+
+
+contract ERC721ReceiverMock is IERC721Receiver {
+    enum Error {
+        None,
+        RevertWithMessage,
+        RevertWithoutMessage,
+        Panic
+    }
+
+    bytes4 private immutable _retval;
+    Error private immutable _error;
+
+    event Received(address operator, address from, uint256 tokenId, bytes data, uint256 gas);
+
+    constructor(bytes4 retval, Error error) {
+        _retval = retval;
+        _error = error;
+    }
+
+    function onERC721Received(
+        address operator,
+        address from,
+        uint256 tokenId,
+        bytes memory data
+    ) public override returns (bytes4) {
+        if (_error == Error.RevertWithMessage) {
+            // console.log('RevertWithMessage');
+            revert("ERC721ReceiverMock: reverting");
+        } else if (_error == Error.RevertWithoutMessage) {
+            // console.log('RevertWithoutMessage');
+            revert();
+        } else if (_error == Error.Panic) {
+            // console.log('Panic');
+            uint256 a = uint256(0) / uint256(0);
+            a;
+        }
+        emit Received(operator, from, tokenId, data, gasleft());
+        //console.log('Ok');
+        return _retval;
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/Move.toml
new file mode 100644
index 000000000..0c8b6d3be
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ERC721Tradable"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/sources/ERC721Tradable.move b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/sources/ERC721Tradable.move
new file mode 100644
index 000000000..8f942552c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable/sources/ERC721Tradable.move
@@ -0,0 +1,368 @@
+#[evm_contract]
+/// An implementation of the ERC-721 Non-Fungible Token Standard.
+module Evm::ERC721Tradable {
+    use Evm::Evm::{sender, self, sign, emit, isContract, tokenURI_with_baseURI, require, abort_with};
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+
+    // ---------------------
+    // Evm::IERC165
+    // ---------------------
+    public fun IERC165_interfaceId(): vector<u8> {
+        // TODO: Eager evaulate this at the compile time for optimization.
+        //bytes4(keccak256(b"supportsInterface(bytes4)"))
+        x"01ffc9a7"
+    }
+
+    // ---------------------
+    // Evm::IERC721
+    // ---------------------
+    public fun IERC721_interfaceId(): vector<u8> {
+        x"80ac58cd"
+    }
+
+    // ---------------------
+    // Evm::IERC721Metadata
+    // ---------------------
+    public fun IERC721Metadata_interfaceId(): vector<u8> {
+        x"5b5e139f"
+    }
+
+    // ---------------------
+    // Evm::IERC721Receiver
+    // ---------------------
+    public fun IERC721Receiver_selector_onERC721Received(): vector<u8> {
+        x"150b7a02"
+    }
+
+    // ---------------------
+    // For test only
+    // ---------------------
+
+    #[callable]
+    public fun mint(to: address, tokenId: U256) acquires State {
+        mint_(to, tokenId);
+    }
+
+    #[callable(sig=b"safeMint(address,uint256)")]
+    fun safeMint(to: address, tokenId: U256) acquires State {
+        safeMint_(to, tokenId, b"");
+    }
+
+    #[callable(sig=b"safeMint(address,uint256,bytes)")]
+    fun safeMint_with_data(to: address, tokenId: U256, data: vector<u8>) acquires State {
+        safeMint_(to, tokenId, data);
+    }
+
+    #[callable]
+    public fun mintTo(to: address) acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.currentTokenID = U256::add(s.currentTokenID, U256::one());
+        mint_(to, s.currentTokenID);
+    }
+
+    fun mint_(to: address, tokenId: U256) acquires State  {
+        require(to != @0x0, b"ERC721: mint to the zero address");
+        require(!exists_(tokenId), b"ERC721: token already minted");
+
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_to = mut_balanceOf(s, to);
+        *mut_balance_to = U256::add(*mut_balance_to, U256::one());
+
+        let mut_ownerOf_to = mut_ownerOf(s, tokenId);
+        *mut_ownerOf_to = to;
+
+        emit(Transfer{from: @0x0, to, tokenId});
+    }
+
+    fun safeMint_(to: address, tokenId: U256, data: vector<u8>) acquires State {
+        mint_(to, tokenId);
+        doSafeTransferAcceptanceCheck(@0x0, to, tokenId, data);
+    }
+
+    #[callable]
+    public fun burn(tokenId: U256) acquires State {
+        burn_(tokenId);
+    }
+
+    fun burn_(tokenId: U256) acquires State {
+        let owner = ownerOf(tokenId);
+        approve(@0x0, tokenId);
+        let s = borrow_global_mut<State>(self());
+        let mut_balance_owner = mut_balanceOf(s, owner);
+        *mut_balance_owner = U256::sub(*mut_balance_owner, U256::one());
+        let _ = Table::remove(&mut s.owners, &tokenId);
+        emit(Transfer{from: owner, to: @0x0, tokenId});
+    }
+
+    fun exists_(tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        tokenExists(s, tokenId)
+    }
+
+    #[callable(sig=b"setBaseURI(string)")]
+    public fun setBaseURI(newBaseURI: vector<u8>) acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.baseURI = newBaseURI;
+    }
+
+    #[callable(sig=b"baseURI() returns (string)"), view]
+    public fun baseURI(): vector<u8> acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.baseURI
+    }
+
+    #[event]
+    struct Transfer {
+        from: address,
+        to: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct Approval {
+        owner: address,
+        approved: address,
+        tokenId: U256,
+    }
+
+    #[event]
+    struct ApprovalForAll {
+        owner: address,
+        operator: address,
+        approved: bool,
+    }
+
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        name: vector<u8>,
+        symbol: vector<u8>,
+        owners: Table<U256, address>,
+        balances: Table<address, U256>,
+        tokenApprovals: Table<U256, address>,
+        operatorApprovals: Table<address, Table<address, bool>>,
+        baseURI: vector<u8>,
+        currentTokenID: U256,
+        proxyRegistryAddress: address,
+    }
+
+    #[create(sig=b"constructor(string,string,address,string)")]
+    /// Constructor of this contract.
+    public fun create(name: vector<u8>, symbol: vector<u8>, proxyRegistryAddress: address, baseURI: vector<u8>) acquires State {
+        // Initial state of contract
+        move_to<State>(
+            &sign(self()),
+            State {
+                name,
+                symbol,
+                owners: Table::empty<U256, address>(),
+                balances: Table::empty<address, U256>(),
+                tokenApprovals: Table::empty<U256, address>(),
+                operatorApprovals: Table::empty<address, Table<address, bool>>(),
+                baseURI,
+                currentTokenID: U256::zero(),
+                proxyRegistryAddress
+            }
+        );
+        mintTo(sender()); // Minting with tokenId = 1.
+        mintTo(sender()); // Minting with tokenId = 2.
+        mintTo(sender()); // Minting with tokenId = 3.
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)"), pure]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(interfaceId: vector<u8>): bool {
+        interfaceId == IERC165_interfaceId() ||
+        interfaceId == IERC721_interfaceId() ||
+        interfaceId == IERC721Metadata_interfaceId()
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    /// Get the name.
+    public fun name(): vector<u8> acquires State {
+        let s = borrow_global<State>(self());
+        *&s.name
+    }
+
+    #[callable(sig=b"symbol() returns (string)"), view]
+    /// Get the symbol.
+    public fun symbol(): vector<u8> acquires State {
+        let s = borrow_global<State>(self());
+        *&s.symbol
+    }
+
+    #[callable(sig=b"tokenURI(uint256) returns (string)"), view]
+    public fun tokenURI(tokenId: U256): vector<u8> acquires State {
+        require(exists_(tokenId), b"ERC721Metadata: URI query for nonexistent token");
+        tokenURI_with_baseURI(baseURI(), tokenId)
+    }
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    /// Count all NFTs assigned to an owner.
+    public fun balanceOf(owner: address): U256 acquires State {
+        require(owner != @0x0, b"ERC721: balance query for the zero address");
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable(sib=b"ownerOf(uint256) returns (address)"), view]
+    /// Find the owner of an NFT.
+    public fun ownerOf(tokenId: U256): address acquires State {
+        require(exists_(tokenId), b"ERC721: owner query for nonexistent token");
+        let s = borrow_global_mut<State>(self());
+        *mut_ownerOf(s, tokenId)
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256,bytes)")] // Overloading `safeTransferFrom`
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom_with_data(from: address, to: address, tokenId: U256, data: vector<u8>) acquires State {
+        transferFrom(from, to, tokenId);
+        doSafeTransferAcceptanceCheck(from, to, tokenId, data);
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256)")]
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom(from: address, to: address, tokenId: U256) acquires State {
+        safeTransferFrom_with_data(from, to, tokenId, b"");
+    }
+
+    #[callable]
+    /// Transfer ownership of an NFT. THE CALLER IS RESPONSIBLE
+    ///  TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///  THEY MAY BE PERMANENTLY LOST
+    public fun transferFrom(from: address, to: address, tokenId: U256) acquires State {
+        require(isApprovedOrOwner(sender(), tokenId), b"ERC721: transfer caller is not owner nor approved");
+
+        require(ownerOf(tokenId) == from, b"ERC721: transfer from incorrect owner");
+        require(to != @0x0, b"ERC721: transfer to the zero address");
+
+        // Clear approvals from the previous owner
+        approve_(@0x0, tokenId);
+
+        let s = borrow_global_mut<State>(self());
+
+        let mut_balance_from = mut_balanceOf(s, from);
+        *mut_balance_from = U256::sub(*mut_balance_from, U256::one());
+
+        let mut_balance_to = mut_balanceOf(s, to);
+        *mut_balance_to = U256::add(*mut_balance_to, U256::one());
+
+        let mut_owner_token = mut_ownerOf(s, tokenId);
+        *mut_owner_token = to;
+
+        emit(Transfer{from, to, tokenId});
+    }
+
+    #[callable]
+    /// Change or reaffirm the approved address for an NFT.
+    public fun approve(approved: address, tokenId: U256) acquires State {
+        let owner = ownerOf(tokenId);
+        require(approved != owner, b"ERC721: approval to current owner");
+        require((sender() == owner) || isApprovedForAll(owner, sender()), b"ERC721: approve caller is not owner nor approved for all");
+        approve_(approved, tokenId);
+    }
+
+    fun approve_(approved: address, tokenId: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_tokenApproval(s, tokenId) = approved;
+        emit(Approval{owner: ownerOf(tokenId), approved, tokenId})
+    }
+
+    #[callable]
+    /// Enable or disable approval for a third party ("operator") to manage
+    ///  all of the sender's assets.
+    public fun setApprovalForAll(operator: address, approved: bool) acquires State {
+        setApprovalForAll_(sender(), operator, approved);
+    }
+
+    fun setApprovalForAll_(owner: address, operator: address, approved: bool) acquires State {
+        require(owner != operator, b"ERC721: approve to caller");
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, owner, operator) = approved;
+        emit(ApprovalForAll{owner, operator, approved})
+    }
+
+    #[callable, view]
+    /// Get the approved address for a single NFT.
+    public fun getApproved(tokenId: U256): address acquires State {
+        let s = borrow_global_mut<State>(self());
+        require(tokenExists(s, tokenId), b"ERC721: approved query for nonexistent token");
+        *mut_tokenApproval(s, tokenId)
+    }
+
+    #[callable, view]
+    /// Query if an address is an authorized operator for another address.
+    public fun isApprovedForAll(owner: address, operator: address): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_operatorApproval(s, owner, operator)
+    }
+
+    /// Helper function to return true iff `spender` is the owner or an approved one for `tokenId`.
+    fun isApprovedOrOwner(spender: address, tokenId: U256): bool acquires State {
+        let s = borrow_global_mut<State>(self());
+        require(tokenExists(s, tokenId), b"ERC721: operator query for nonexistent token");
+        let owner = ownerOf(tokenId);
+        return (spender == owner || getApproved(tokenId) == spender || isApprovedForAll(owner, spender))
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_ownerOf(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.owners, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_tokenApproval(s: &mut State, tokenId: U256): &mut address {
+        Table::borrow_mut_with_default(&mut s.tokenApprovals, &tokenId, @0x0)
+    }
+
+    /// Helper function to return a mut ref to the operator approval.
+    fun mut_operatorApproval(s: &mut State, owner: address, operator: address): &mut bool {
+        if(!Table::contains(&s.operatorApprovals, &owner)) {
+            Table::insert(
+                &mut s.operatorApprovals,
+                &owner,
+                Table::empty<address, bool>()
+            )
+        };
+        let approvals = Table::borrow_mut(&mut s.operatorApprovals, &owner);
+        Table::borrow_mut_with_default(approvals, &operator, false)
+    }
+
+    /// Helper function to return true iff the token exists.
+    fun tokenExists(s: &mut State, tokenId: U256): bool {
+        let mut_ownerOf_tokenId = mut_ownerOf(s, tokenId);
+        *mut_ownerOf_tokenId != @0x0
+    }
+
+    /// Helper function for the acceptance check.
+    fun doSafeTransferAcceptanceCheck(from: address, to: address, tokenId: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC721Receiver_try_call_onERC721Received(to, sender(), from, tokenId, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                // abort_with(b"err_reason");
+                let reason = ExternalResult::unwrap_err_reason(result);
+                abort_with(reason);
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"ERC721: transfer to non ERC721Receiver implementer");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                // abort_with(b"ok");
+                let retval = ExternalResult::unwrap(result);
+                let expected = IERC721Receiver_selector_onERC721Received();
+                require(retval == expected, b"ERC721: transfer to non ERC721Receiver implementer");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+
+    #[external(sig=b"onERC721Received(address,address,uint256,bytes) returns (bytes4)")]
+    public native fun IERC721Receiver_try_call_onERC721Received(contract: address, operator: address, from: address, tokenId: U256, bytes: vector<u8>): ExternalResult<vector<u8>>;
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable_Sol.sol
new file mode 100644
index 000000000..f522b0673
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ERC721Tradable_Sol.sol
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+
+/**
+ * @title ERC721Mock
+ * This mock just provides a public safeMint, mint, and burn functions for testing purposes
+ */
+contract ERC721Tradable_Sol is ERC721 {
+    string private baseURI_;
+    constructor(string memory name, string memory symbol, string memory newBaseURI) ERC721(name, symbol) {
+        baseURI_ = newBaseURI;
+
+        _mint(msg.sender, 1);
+        _mint(msg.sender, 2);
+        _mint(msg.sender, 3);
+    }
+
+    function _baseURI() internal override view returns (string memory) {
+        return baseURI_;
+    }
+
+    function baseURI() public view returns (string memory) {
+        return _baseURI();
+    }
+
+    function exists(uint256 tokenId) public view returns (bool) {
+        return _exists(tokenId);
+    }
+
+    function mint(address to, uint256 tokenId) public {
+        _mint(to, tokenId);
+    }
+
+    function safeMint(address to, uint256 tokenId) public {
+        _safeMint(to, tokenId);
+    }
+
+    function safeMint(
+        address to,
+        uint256 tokenId,
+        bytes memory _data
+    ) public {
+        _safeMint(to, tokenId, _data);
+    }
+
+    function burn(uint256 tokenId) public {
+        _burn(tokenId);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Event.sol b/vendors/move/crates/evm/hardhat-examples/contracts/Event.sol
new file mode 100644
index 000000000..837b6108c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Event.sol
@@ -0,0 +1,52 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+contract Event_Sol {
+    event SimpleEvent(uint64 x);
+    event U256Event(uint256 x);
+    event AddressEvent(address x);
+    event MyEvent(uint64 x, string message);
+    event Transfer(address indexed from, address indexed to, uint256 value);
+
+    function emitNothing(uint64 x) public {
+    }
+
+    function emitSimpleEvent(uint64 x) public {
+        emit SimpleEvent(x);
+    }
+
+    function emitSimpleEventTwice(uint64 x) public {
+        emit SimpleEvent(x);
+        emit SimpleEvent(x+x);
+    }
+
+    function emitMyEvent(uint64 x) public {
+        emit MyEvent(x, "hello_event");
+    }
+
+    function emitMyEventTwice(uint64 x) public {
+        emit MyEvent(x, "hello_event_#1");
+        emit MyEvent(x+x, "hello_event_#2");
+    }
+
+    function emitMyEventWith(uint64 x, string memory message) public {
+        emit MyEvent(x, message);
+    }
+
+    function emitMyEventWithTwice(uint64 x, string memory message) public {
+        emit MyEvent(x, message);
+        emit MyEvent(x+x, message);
+    }
+
+    function emitTransfer(address from, address to, uint256 value) public {
+        emit Transfer(from, to, value);
+    }
+
+    function emitU256Event(uint256 x) public {
+        emit U256Event(x);
+    }
+
+    function emitAddressEvent(address a) public {
+        emit AddressEvent(a);
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Event/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Event/Move.toml
new file mode 100644
index 000000000..c342d3ae7
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Event/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Event"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Event/sources/Event.move b/vendors/move/crates/evm/hardhat-examples/contracts/Event/sources/Event.move
new file mode 100644
index 000000000..3f7bfc9dc
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Event/sources/Event.move
@@ -0,0 +1,85 @@
+#[evm_contract]
+module 0x1::FortyTwo {
+    use Evm::Evm::{emit};
+    use Evm::U256::U256;
+
+    #[event]
+    struct SimpleEvent {
+        x: u64,
+    }
+
+    #[callable(sig=b"emitNothing(uint64)")]
+    public fun emitNothing(_x: u64) {
+    }
+
+    #[callable(sig=b"emitSimpleEvent(uint64)")]
+    public fun emitSimpleEvent(x: u64) {
+        emit(SimpleEvent{x});
+    }
+
+    #[callable(sig=b"emitSimpleEventTwice(uint64)")]
+    public fun emitSimpleEventTwice(x: u64) {
+        emit(SimpleEvent{x});
+        emit(SimpleEvent{x: x+x});
+    }
+
+    #[event(sig=b"MyEvent(uint64,string)")]
+    struct MyEvent {
+        x: u64,
+        message: vector<u8>,
+    }
+
+    #[callable(sig=b"emitMyEvent(uint64)")]
+    public fun emitMyEvent(x: u64) {
+        emit(MyEvent{x, message: b"hello_event"});
+    }
+
+    #[callable(sig=b"emitMyEventTwice(uint64)")]
+    public fun emitMyEventTwice(x: u64) {
+        emit(MyEvent{x, message: b"hello_event_#1"});
+        emit(MyEvent{x: x+x, message: b"hello_event_#2"});
+    }
+
+    #[callable(sig=b"emitMyEventWith(uint64,string)")]
+    public fun emitMyEventWith(x: u64, message: vector<u8>) {
+        emit(MyEvent{x, message});
+    }
+
+    #[callable(sig=b"emitMyEventWithTwice(uint64,string)")]
+    public fun emitMyEventWithTwice(x: u64, message: vector<u8>) {
+        emit(MyEvent{x, message});
+        emit(MyEvent{x: x+x, message});
+    }
+
+    #[event(sig=b"Transfer(address indexed,address indexed,uint256)")]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[callable(sig=b"emitTransfer(address,address,uint256)")]
+    public fun emitTransfer(from: address, to: address, value: U256) {
+        emit(Transfer{from, to, value});
+    }
+
+    #[event(sig=b"U256Event(uint256)")]
+    struct U256Event {
+        x: U256,
+    }
+
+    #[callable(sig=b"emitU256Event(uint256)")]
+    public fun emitU256Event(x: U256) {
+        emit(U256Event{x});
+    }
+
+    #[event(sig=b"AddressEvent(address)")]
+    struct AddressEvent {
+        a: address,
+    }
+
+    #[callable(sig=b"emitAddressEvent(address)")]
+    public fun emitAddressEvent(a: address) {
+        emit(AddressEvent{a});
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/Move.toml
new file mode 100644
index 000000000..53f95e038
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "ExternalCall"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/sources/ExternalCall.move b/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/sources/ExternalCall.move
new file mode 100644
index 000000000..cb433ca94
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/ExternalCall/sources/ExternalCall.move
@@ -0,0 +1,118 @@
+#[evm_contract]
+module Evm::ExternalCall {
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::Evm::Unit;
+    use Evm::Evm::{abort_with, isContract, require, sender};
+    use Evm::U256::{U256};
+    use std::vector;
+
+    #[external(sig=b"forty_two() returns (uint64)")]
+    public native fun external_call_forty_two(contract: address): u64;
+
+    #[external(sig=b"forty_two() returns (uint64)")]
+    public native fun try_external_call_forty_two(contract: address): ExternalResult<u64>;
+
+    #[external(sig=b"revertWithMessage()")]
+    public native fun external_call_revertWithMessage(contract: address);
+
+    #[external(sig=b"revertWithMessage()")]
+    public native fun try_external_call_revertWithMessage(contract: address): ExternalResult<Unit>;
+
+    #[callable(sig=b"call_forty_two(address) returns (uint64)"), view]
+    public fun call_forty_two(contract: address): u64 {
+        external_call_forty_two(contract)
+    }
+
+    #[callable(sig=b"call_revertWithMessage(address)"), pure]
+    public fun call_revertWithMessage(contract: address) {
+        external_call_revertWithMessage(contract);
+    }
+
+    #[callable(sig=b"try_call_forty_two(address) returns (uint64)"), view]
+    public fun try_call_forty_two(contract: address): u64 {
+        let v = try_external_call_forty_two(contract);
+        if (ExternalResult::is_ok(&v)) {
+            return ExternalResult::unwrap(v)
+        } else if (ExternalResult::is_err_reason(&v)) {
+            abort_with(ExternalResult::unwrap_err_reason(v));
+            return 0
+        } else {
+            abort_with(b"not implemented");
+            return 1
+        }
+    }
+
+    #[callable(sig=b"try_call_revertWithMessage(address)"), pure]
+    public fun try_call_revertWithMessage(contract: address) {
+        // TODO: try-call-catch. See `ExternalCall.sol`.
+        let v = try_external_call_revertWithMessage(contract);
+        if (ExternalResult::is_ok(&v)) {
+        } else if (ExternalResult::is_err_reason(&v)) {
+            abort_with(b"error reason");
+        } else if (ExternalResult::is_err_data(&v)) {
+            abort_with(b"error data");
+        } else if (ExternalResult::is_panic(&v)) {
+            abort_with(b"panic");
+        } else {
+            abort_with(b"other");
+        }
+    }
+
+    #[callable]
+    public fun test_for_move_to_yul(from: address, to: address, tokenId: U256, data: vector<u8>) {
+        let _ = IERC721Receiver_try_call_onERC721Received(to, sender(), from, tokenId, data);
+    }
+
+    #[callable(sig=b"doSafeTransferAcceptanceCheck(address,address,uint256,bytes)")]
+    public fun doSafeTransferAcceptanceCheck(from: address, to: address, tokenId: U256, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC721Receiver_try_call_onERC721Received(to, sender(), from, tokenId, data);
+
+             if (ExternalResult::is_ok(&result)) {
+                 abort_with(b"ok");
+             } else if (ExternalResult::is_err_reason(&result)) {
+                 let reason = ExternalResult::unwrap_err_reason(result);
+                 abort_with(reason);
+                 //abort_with(b"err_reason");
+             } else if (ExternalResult::is_err_data(&result)) {
+                 abort_with(b"err_data");
+             } else if (ExternalResult::is_panic(&result)) {
+                 abort_with(b"panic");
+             } else {
+                 abort_with(b"other");
+             }
+        }
+    }
+
+    #[external(sig=b"onERC721Received(address,address,uint256,bytes) returns (bytes4)")]
+    public native fun IERC721Receiver_try_call_onERC721Received(contract: address, operator: address, from: address, tokenId: U256, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    public fun IERC721Receiver_selector_onERC721Received(): vector<u8> {
+        x"150b7a02"
+    }
+
+    #[callable(sig=b"doSafeBatchTransferAcceptanceCheck(address,address,address,uint256[],uint256[],bytes)")]
+    public fun doSafeBatchTransferAcceptanceCheck(operator: address, from: address, to: address, ids: vector<U256>, amounts: vector<U256>, data: vector<u8>) {
+        if (isContract(to)) {
+            let result = IERC1155Receiver_try_call_onERC1155BatchReceived(to, operator, from, ids, amounts, data);
+            if (ExternalResult::is_err_reason(&result)) {
+                abort_with(b"err_reason");
+            } else if (ExternalResult::is_err_data(&result)) {
+                abort_with(b"err_data");
+            } else if (ExternalResult::is_panic(&result)) {
+                abort_with(b"panic");
+            } else if (ExternalResult::is_ok(&result)) {
+                abort_with(b"ok");
+            } else {
+                abort_with(b"other");
+            }
+        }
+    }
+
+    #[external(sig=b"onERC1155BatchReceived(address,address,uint256[],uint256[],bytes) returns (bytes4)")]
+    public native fun IERC1155Receiver_try_call_onERC1155BatchReceived(contract: address, operator: address, from: address, ids: vector<U256>, amounts: vector<U256>, bytes: vector<u8>): ExternalResult<vector<u8>>;
+
+    public fun IERC1155Receiver_selector_onERC1155BatchReceived(): vector<u8> {
+        x"bc197c81"
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo.sol b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo.sol
new file mode 100644
index 000000000..fe82d5804
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo.sol
@@ -0,0 +1,20 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+contract FortyTwo_Sol {
+    function forty_two() public pure returns (uint64) {
+        return 42;
+    }
+
+    function forty_two_as_u256() public pure returns (uint256) {
+        return 42;
+    }
+
+    function forty_two_as_string() public pure returns (string memory) {
+        return "forty two";
+    }
+
+    function forty_two_plus_alpha(uint64 alpha) public pure returns (uint64) {
+        return 42 + alpha;
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/Move.toml
new file mode 100644
index 000000000..6ceee8f8c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "FortyTwo"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/sources/FortyTwo.move b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/sources/FortyTwo.move
new file mode 100644
index 000000000..8bf7e639b
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/FortyTwo/sources/FortyTwo.move
@@ -0,0 +1,25 @@
+#[evm_contract]
+module 0x1::FortyTwo {
+    use Evm::U256::{u256_from_u128, U256};
+
+    #[callable, pure]
+    public fun forty_two(): u64 {
+        42
+    }
+
+    #[callable, pure]
+    public fun forty_two_as_u256(): U256 {
+        u256_from_u128(42)
+    }
+
+    // TODO: move-to-yul does not support literal string.
+    #[callable(sig=b"forty_two_as_string() returns (string)"), pure]
+    public fun forty_two_as_string(): vector<u8> {
+        b"forty two"
+    }
+
+    #[callable, pure]
+    public fun forty_two_plus_alpha(alpha: u64): u64 {
+        42 + alpha
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Greeter.sol b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter.sol
new file mode 100644
index 000000000..30d7d7f08
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter.sol
@@ -0,0 +1,22 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+import "hardhat/console.sol";
+
+contract Greeter_Sol {
+    string private greeting;
+
+    constructor(string memory _greeting) {
+        console.log("Deploying a Greeter with greeting:", _greeting);
+        greeting = _greeting;
+    }
+
+    function greet() public view returns (string memory) {
+        return greeting;
+    }
+
+    function setGreeting(string memory _greeting) public {
+        console.log("Changing greeting from '%s' to '%s'", greeting, _greeting);
+        greeting = _greeting;
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/Move.toml
new file mode 100644
index 000000000..08403d0cb
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Greeter"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/sources/Greeter.move b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/sources/Greeter.move
new file mode 100644
index 000000000..99c5a11f3
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Greeter/sources/Greeter.move
@@ -0,0 +1,29 @@
+#[evm_contract]
+module Evm::Greeter {
+    use Evm::Evm::{self};
+    use Evm::Evm::sign;
+
+    struct State has key {
+        greeting: vector<u8>,
+    }
+
+    #[create(sig=b"constructor(string)")]
+    public fun create(greeting: vector<u8>) {
+         move_to<State>(
+             &sign(self()),
+             State {
+                 greeting,
+             }
+         );
+    }
+
+    #[callable(sig=b"greet() returns (string)"), view]
+    public fun greet(): vector<u8> acquires State {
+        borrow_global<State>(self()).greeting
+    }
+
+    #[callable(sig=b"setGreeting(string)")]
+    public fun setGreeting(greeting: vector<u8>) acquires State {
+        borrow_global_mut<State>(self()).greeting = greeting;
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Native.sol b/vendors/move/crates/evm/hardhat-examples/contracts/Native.sol
new file mode 100644
index 000000000..4c8365bc5
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Native.sol
@@ -0,0 +1,20 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/utils/Address.sol";
+
+contract Native_Sol {
+    using Address for address;
+
+    function getContractAddr() public view returns (address) {
+        return address(this);
+    }
+
+    function getSenderAddr() public view returns (address) {
+        return msg.sender;
+    }
+
+    function getIsContract(address addr) public view returns (bool) {
+        return addr.isContract();
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Native/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Native/Move.toml
new file mode 100644
index 000000000..b75025cf4
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Native/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Native"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Native/sources/Native.move b/vendors/move/crates/evm/hardhat-examples/contracts/Native/sources/Native.move
new file mode 100644
index 000000000..c2117dd3c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Native/sources/Native.move
@@ -0,0 +1,19 @@
+#[evm_contract]
+module 0x1::Native {
+    use Evm::Evm::{self, sender, isContract};
+
+    #[callable, view]
+    public fun getContractAddr(): address {
+        self()
+    }
+
+    #[callable, view]
+    public fun getSenderAddr(): address {
+        sender()
+    }
+
+    #[callable, view]
+    public fun getIsContract(a: address): bool {
+        isContract(a)
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Revert.sol b/vendors/move/crates/evm/hardhat-examples/contracts/Revert.sol
new file mode 100644
index 000000000..11e5f8ea4
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Revert.sol
@@ -0,0 +1,15 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+contract Revert_Sol {
+    function revertIf0(uint64 x) public pure returns (uint64) {
+        if (x == 0) {
+            revert();
+        }
+        return x;
+    }
+
+    function revertWithMessage() public pure returns (uint64) {
+        revert('error message');
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Revert/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Revert/Move.toml
new file mode 100644
index 000000000..b71d5e0ba
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Revert/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Revert"
+version = "0.0.0"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Revert/sources/Revert.move b/vendors/move/crates/evm/hardhat-examples/contracts/Revert/sources/Revert.move
new file mode 100644
index 000000000..d58015b4a
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Revert/sources/Revert.move
@@ -0,0 +1,17 @@
+#[evm_contract]
+module 0x1::Revert {
+    use Evm::U256::{u256_from_u128, U256};
+    use Evm::Evm::abort_with;
+
+    #[callable, pure]
+    public fun revertIf0(x: u64) {
+        if (x == 0) {
+            abort(0);
+        }
+    }
+
+    #[callable, pure]
+    public fun revertWithMessage() {
+        abort_with(b"error message");
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/StructABI_Sol.sol b/vendors/move/crates/evm/hardhat-examples/contracts/StructABI_Sol.sol
new file mode 100644
index 000000000..1391ee769
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/StructABI_Sol.sol
@@ -0,0 +1,32 @@
+//SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.0;
+
+contract StructABI_Sol {
+
+    address private c;
+
+    struct S {
+        uint64 a;
+        bool b;
+        S2 c;
+    }
+
+    struct S2 {
+        uint64 x;
+    }
+
+    constructor(address _c) {
+        c = _c;
+    }
+
+    function call_s() public returns (bool) {
+        S memory s = S(42, true, S2(41));
+        (bool b, ) = c.call(abi.encodeWithSignature("test((uint64,bool,(uint64)))", s));
+        return b;
+    }
+
+    function safeTransferFrom(S memory s) public returns (S2 memory) {
+        return s.c;
+    }
+
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Token/Move.toml b/vendors/move/crates/evm/hardhat-examples/contracts/Token/Move.toml
new file mode 100644
index 000000000..8d4fd4654
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Token/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Token"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
+EvmStdlib = { local = "../../../stdlib" }
diff --git a/vendors/move/crates/evm/hardhat-examples/contracts/Token/sources/Token.move b/vendors/move/crates/evm/hardhat-examples/contracts/Token/sources/Token.move
new file mode 100644
index 000000000..2b772e34c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/contracts/Token/sources/Token.move
@@ -0,0 +1,75 @@
+#[evm_contract]
+module Evm::Token {
+    use Evm::Evm::{self, sender, sign};
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{Self, U256};
+    use std::errors;
+
+    /// Represents the state of this contract. This is located at `borrow_global<State>(self())`.
+    struct State has key {
+        total_supply: U256,
+        balances: Table<address, U256>,
+        name: vector<u8>,
+    }
+
+    #[create(sig=b"constructor(string)")]
+    public fun create(name: vector<u8>) acquires State {
+        move_to<State>(
+            &sign(self()),
+            State {
+                total_supply: U256::zero(),
+                balances: Table::empty<address, U256>(),
+                name
+            }
+        );
+        mint(sender(), U256::u256_from_u128(42));
+    }
+
+    #[callable(sig=b"name() returns (string)"), view]
+    /// Returns the name of the token
+    public fun name(): vector<u8> acquires State {
+        *&borrow_global<State>(self()).name
+    }
+
+    #[callable(sig=b"totalSupply() returns (uint256)"), view]
+    public fun totalSupply(): U256 acquires State {
+        *&borrow_global<State>(self()).total_supply
+    }
+
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    public fun balanceOf(owner: address): U256 acquires State {
+        let s = borrow_global_mut<State>(self());
+        *mut_balanceOf(s, owner)
+    }
+
+    #[callable(sig=b"mint(address, uint256)")]
+    public fun mint(account: address, amount: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        s.total_supply = U256::add(s.total_supply, amount);
+        let mut_bal_account = mut_balanceOf(s, account);
+        *mut_bal_account = U256::add(*mut_bal_account, amount);
+    }
+
+    #[callable(sig=b"transfer(address, uint256) returns (bool)")]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(to: address, amount: U256): bool acquires State {
+        assert!(sender() != to, errors::invalid_argument(0));
+        do_transfer(sender(), to, amount);
+        true
+    }
+
+    fun do_transfer(from: address, to: address, amount: U256) acquires State {
+        let s = borrow_global_mut<State>(self());
+        let from_bal = mut_balanceOf(s, from);
+        assert!(U256::le(copy amount, *from_bal), errors::limit_exceeded(0));
+        *from_bal = U256::sub(*from_bal, copy amount);
+        let to_bal = mut_balanceOf(s, to);
+        *to_bal = U256::add(*to_bal, copy amount);
+    }
+
+    /// Helper function to return a mut ref to the balance of a owner.
+    fun mut_balanceOf(s: &mut State, owner: address): &mut U256 {
+        Table::borrow_mut_with_default(&mut s.balances, &owner, U256::zero())
+    }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/hardhat.config.js b/vendors/move/crates/evm/hardhat-examples/hardhat.config.js
new file mode 100644
index 000000000..f1a8bd579
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/hardhat.config.js
@@ -0,0 +1,52 @@
+require("@nomiclabs/hardhat-waffle");
+require("@nomiclabs/hardhat-truffle5");
+require("hardhat-gas-reporter");
+require("hardhat-move");
+
+// This is a sample Hardhat task. To learn how to create your own go to
+// https://hardhat.org/guides/create-task.html
+task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
+  const accounts = await hre.ethers.getSigners();
+
+  for (const account of accounts) {
+    console.log(account.address);
+  }
+});
+
+
+// Go to https://www.alchemyapi.io, sign up, create
+// a new App in its dashboard, and replace "KEY" with its key
+const ALCHEMY_API_KEY_FOR_ROPSTEN = "KEY1";
+const ALCHEMY_API_KEY_FOR_RINKEBY = "KEY2";
+
+// Replace this private key with your Ropsten account private key
+// To export your private key from Metamask, open Metamask and
+// go to Account Details > Export Private Key
+// Be aware of NEVER putting real Ether into testing accounts
+const PRIVATE_KEY = "0000000000000000000000000000000000000000000000000000000000000000";
+
+
+// You need to export an object to set up your config
+// Go to https://hardhat.org/config/ to learn more
+
+/**
+ * @type import('hardhat/config').HardhatUserConfig
+ */
+module.exports = {
+  solidity: "0.8.4",
+  gasReporter: {
+    enabled: true
+  },
+  networks: {
+    ropsten: {
+      url: `https://eth-ropsten.alchemyapi.io/v2/${ALCHEMY_API_KEY_FOR_ROPSTEN}`,
+      accounts: [`${PRIVATE_KEY}`]
+    },
+    rinkeby: {
+      url: `https://eth-rinkeby.alchemyapi.io/v2/${ALCHEMY_API_KEY_FOR_RINKEBY}`,
+      accounts: [`${PRIVATE_KEY}`],
+      // gas: 4250274,
+      // gasPrice: 2500000016
+    }
+  }
+};
diff --git a/vendors/move/crates/evm/hardhat-examples/package-lock.json b/vendors/move/crates/evm/hardhat-examples/package-lock.json
new file mode 100644
index 000000000..c10b7f6cd
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/package-lock.json
@@ -0,0 +1,24228 @@
+{
+  "name": "hardhat-examples",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "hardhat-examples",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@openzeppelin/contracts": "^4.5.0"
+      },
+      "devDependencies": {
+        "@nomiclabs/hardhat-ethers": "^2.0.5",
+        "@nomiclabs/hardhat-truffle5": "^2.0.5",
+        "@nomiclabs/hardhat-waffle": "^2.0.3",
+        "@nomiclabs/hardhat-web3": "^2.0.0",
+        "@openzeppelin/test-helpers": "^0.5.15",
+        "chai": "^4.3.6",
+        "ethereum-waffle": "^3.4.4",
+        "ethers": "^5.6.2",
+        "hardhat": "^2.13.0",
+        "hardhat-gas-reporter": "^1.0.8",
+        "hardhat-move": "file:../hardhat-move",
+        "web3": "^1.7.1"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.17.8",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
+      "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@ensdomains/address-encoder": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@ensdomains/address-encoder/-/address-encoder-0.1.9.tgz",
+      "integrity": "sha512-E2d2gP4uxJQnDu2Kfg1tHNspefzbLT8Tyjrm5sEuim32UkU2sm5xL4VXtgc2X33fmPEw9+jUMpGs4veMbf+PYg==",
+      "dev": true,
+      "dependencies": {
+        "bech32": "^1.1.3",
+        "blakejs": "^1.1.0",
+        "bn.js": "^4.11.8",
+        "bs58": "^4.0.1",
+        "crypto-addr-codec": "^0.1.7",
+        "nano-base32": "^1.0.1",
+        "ripemd160": "^2.0.2"
+      }
+    },
+    "node_modules/@ensdomains/ens": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@ensdomains/ens/-/ens-0.4.5.tgz",
+      "integrity": "sha512-JSvpj1iNMFjK6K+uVl4unqMoa9rf5jopb8cya5UGBWz23Nw8hSNT7efgUx4BTlAPAgpNlEioUfeTyQ6J9ZvTVw==",
+      "deprecated": "Please use @ensdomains/ens-contracts",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.2",
+        "eth-ens-namehash": "^2.0.8",
+        "solc": "^0.4.20",
+        "testrpc": "0.0.1",
+        "web3-utils": "^1.0.0-beta.31"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/@ensdomains/ens/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/require-from-string": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
+      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/solc": {
+      "version": "0.4.26",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.26.tgz",
+      "integrity": "sha512-o+c6FpkiHd+HPjmjEVpQgH7fqZ14tJpXhho+/bQXlXbliLIS/xjXb42Vxh+qQY1WCSTMQ0+a5vR9vi0MfhU6mA==",
+      "dev": true,
+      "dependencies": {
+        "fs-extra": "^0.30.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^1.1.0",
+        "semver": "^5.3.0",
+        "yargs": "^4.7.1"
+      },
+      "bin": {
+        "solcjs": "solcjs"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
+    "node_modules/@ensdomains/ens/node_modules/yargs": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
+      "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "lodash.assign": "^4.0.3",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.1",
+        "which-module": "^1.0.0",
+        "window-size": "^0.2.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^2.4.1"
+      }
+    },
+    "node_modules/@ensdomains/ens/node_modules/yargs-parser": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
+      "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "lodash.assign": "^4.0.6"
+      }
+    },
+    "node_modules/@ensdomains/ensjs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@ensdomains/ensjs/-/ensjs-2.1.0.tgz",
+      "integrity": "sha512-GRbGPT8Z/OJMDuxs75U/jUNEC0tbL0aj7/L/QQznGYKm/tiasp+ndLOaoULy9kKJFC0TBByqfFliEHDgoLhyog==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "@ensdomains/address-encoder": "^0.1.7",
+        "@ensdomains/ens": "0.4.5",
+        "@ensdomains/resolver": "0.2.4",
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "^2.0.8",
+        "ethers": "^5.0.13",
+        "js-sha3": "^0.8.0"
+      }
+    },
+    "node_modules/@ensdomains/resolver": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@ensdomains/resolver/-/resolver-0.2.4.tgz",
+      "integrity": "sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==",
+      "deprecated": "Please use @ensdomains/ens-contracts",
+      "dev": true
+    },
+    "node_modules/@ethereum-waffle/chai": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@ethereum-waffle/chai/-/chai-3.4.4.tgz",
+      "integrity": "sha512-/K8czydBtXXkcM9X6q29EqEkc5dN3oYenyH2a9hF7rGAApAJUpH8QBtojxOY/xQ2up5W332jqgxwp0yPiYug1g==",
+      "dev": true,
+      "dependencies": {
+        "@ethereum-waffle/provider": "^3.4.4",
+        "ethers": "^5.5.2"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/@ethereum-waffle/compiler": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@ethereum-waffle/compiler/-/compiler-3.4.4.tgz",
+      "integrity": "sha512-RUK3axJ8IkD5xpWjWoJgyHclOeEzDLQFga6gKpeGxiS/zBu+HB0W2FvsrrLalTFIaPw/CGYACRBSIxqiCqwqTQ==",
+      "dev": true,
+      "dependencies": {
+        "@resolver-engine/imports": "^0.3.3",
+        "@resolver-engine/imports-fs": "^0.3.3",
+        "@typechain/ethers-v5": "^2.0.0",
+        "@types/mkdirp": "^0.5.2",
+        "@types/node-fetch": "^2.5.5",
+        "ethers": "^5.0.1",
+        "mkdirp": "^0.5.1",
+        "node-fetch": "^2.6.1",
+        "solc": "^0.6.3",
+        "ts-generator": "^0.1.1",
+        "typechain": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/@ethereum-waffle/ens": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@ethereum-waffle/ens/-/ens-3.4.4.tgz",
+      "integrity": "sha512-0m4NdwWxliy3heBYva1Wr4WbJKLnwXizmy5FfSSr5PMbjI7SIGCdCB59U7/ZzY773/hY3bLnzLwvG5mggVjJWg==",
+      "dev": true,
+      "dependencies": {
+        "@ensdomains/ens": "^0.4.4",
+        "@ensdomains/resolver": "^0.2.4",
+        "ethers": "^5.5.2"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/@ethereum-waffle/mock-contract": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@ethereum-waffle/mock-contract/-/mock-contract-3.4.4.tgz",
+      "integrity": "sha512-Mp0iB2YNWYGUV+VMl5tjPsaXKbKo8MDH9wSJ702l9EBjdxFf/vBvnMBAC1Fub1lLtmD0JHtp1pq+mWzg/xlLnA==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "^5.5.0",
+        "ethers": "^5.5.2"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/@ethereum-waffle/provider": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@ethereum-waffle/provider/-/provider-3.4.4.tgz",
+      "integrity": "sha512-GK8oKJAM8+PKy2nK08yDgl4A80mFuI8zBkE0C9GqTRYQqvuxIyXoLmJ5NZU9lIwyWVv5/KsoA11BgAv2jXE82g==",
+      "dev": true,
+      "dependencies": {
+        "@ethereum-waffle/ens": "^3.4.4",
+        "ethers": "^5.5.2",
+        "ganache-core": "^2.13.2",
+        "patch-package": "^6.2.2",
+        "postinstall-postinstall": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/@ethereumjs/common": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.3.tgz",
+      "integrity": "sha512-mQwPucDL7FDYIg9XQ8DL31CnIYZwGhU5hyOO5E+BMmT71G0+RHvIT5rIkLBirJEKxV6+Rcf9aEIY0kXInxUWpQ==",
+      "dev": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "node_modules/@ethereumjs/tx": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.1.tgz",
+      "integrity": "sha512-xzDrTiu4sqZXUcaBxJ4n4W5FrppwxLxZB4ZDGVLtxSQR4lVuOnFR6RcUHdg1mpUhAPVrmnzLJpxaeXnPxIyhWA==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.6.3",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "node_modules/@ethersproject/abi": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.6.0.tgz",
+      "integrity": "sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-provider": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz",
+      "integrity": "sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/networks": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/web": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-signer": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz",
+      "integrity": "sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/address": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.6.0.tgz",
+      "integrity": "sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/base64": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.6.0.tgz",
+      "integrity": "sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/basex": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.6.0.tgz",
+      "integrity": "sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/bignumber": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.6.0.tgz",
+      "integrity": "sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "bn.js": "^4.11.9"
+      }
+    },
+    "node_modules/@ethersproject/bytes": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.6.1.tgz",
+      "integrity": "sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/constants": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.6.0.tgz",
+      "integrity": "sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/contracts": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.6.0.tgz",
+      "integrity": "sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abi": "^5.6.0",
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/hash": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.6.0.tgz",
+      "integrity": "sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/hdnode": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.6.0.tgz",
+      "integrity": "sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/basex": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/pbkdf2": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/sha2": "^5.6.0",
+        "@ethersproject/signing-key": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/wordlists": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/json-wallets": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz",
+      "integrity": "sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/hdnode": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/pbkdf2": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/random": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "aes-js": "3.0.0",
+        "scrypt-js": "3.0.1"
+      }
+    },
+    "node_modules/@ethersproject/keccak256": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.6.0.tgz",
+      "integrity": "sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "js-sha3": "0.8.0"
+      }
+    },
+    "node_modules/@ethersproject/logger": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.6.0.tgz",
+      "integrity": "sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ]
+    },
+    "node_modules/@ethersproject/networks": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.6.1.tgz",
+      "integrity": "sha512-b2rrupf3kCTcc3jr9xOWBuHylSFtbpJf79Ga7QR98ienU2UqGimPGEsYMgbI29KHJfA5Us89XwGVmxrlxmSrMg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/pbkdf2": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz",
+      "integrity": "sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/sha2": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/properties": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.6.0.tgz",
+      "integrity": "sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/providers": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.2.tgz",
+      "integrity": "sha512-6/EaFW/hNWz+224FXwl8+HdMRzVHt8DpPmu5MZaIQqx/K/ELnC9eY236SMV7mleCM3NnEArFwcAAxH5kUUgaRg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/basex": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/networks": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/random": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0",
+        "@ethersproject/sha2": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/web": "^5.6.0",
+        "bech32": "1.1.4",
+        "ws": "7.4.6"
+      }
+    },
+    "node_modules/@ethersproject/random": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.0.tgz",
+      "integrity": "sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/rlp": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.6.0.tgz",
+      "integrity": "sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/sha2": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.6.0.tgz",
+      "integrity": "sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "hash.js": "1.1.7"
+      }
+    },
+    "node_modules/@ethersproject/signing-key": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.6.0.tgz",
+      "integrity": "sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.7"
+      }
+    },
+    "node_modules/@ethersproject/solidity": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.6.0.tgz",
+      "integrity": "sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/sha2": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/strings": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.6.0.tgz",
+      "integrity": "sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/transactions": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.6.0.tgz",
+      "integrity": "sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0",
+        "@ethersproject/signing-key": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/units": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.6.0.tgz",
+      "integrity": "sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/wallet": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.6.0.tgz",
+      "integrity": "sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/hdnode": "^5.6.0",
+        "@ethersproject/json-wallets": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/random": "^5.6.0",
+        "@ethersproject/signing-key": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/wordlists": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/web": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.6.0.tgz",
+      "integrity": "sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/base64": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/wordlists": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.6.0.tgz",
+      "integrity": "sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@metamask/eth-sig-util/-/eth-sig-util-4.0.0.tgz",
+      "integrity": "sha512-LczOjjxY4A7XYloxzyxJIHONELmUxVZncpOLoClpEcTiebiVdM46KRPYXGuULro9oNNR2xdVx3yoKiQjdfWmoA==",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^6.2.1",
+        "ethjs-util": "^0.1.6",
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.0.0.tgz",
+      "integrity": "sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==",
+      "dev": true
+    },
+    "node_modules/@noble/secp256k1": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.5.5.tgz",
+      "integrity": "sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@nomicfoundation/ethereumjs-block": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-4.2.2.tgz",
+      "integrity": "sha512-atjpt4gc6ZGZUPHBAQaUJsm1l/VCo7FmyQ780tMGO8QStjLdhz09dXynmhwVTy5YbRr0FOh/uX3QaEM0yIB2Zg==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-trie": "5.0.5",
+        "@nomicfoundation/ethereumjs-tx": "4.1.2",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-blockchain": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-6.2.2.tgz",
+      "integrity": "sha512-6AIB2MoTEPZJLl6IRKcbd8mUmaBAQ/NMe3O7OsAOIiDjMNPPH5KaUQiLfbVlegT4wKIg/GOsFH7XlH2KDVoJNg==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "4.2.2",
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-ethash": "2.0.5",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-trie": "5.0.5",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "abstract-level": "^1.0.3",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "level": "^8.0.0",
+        "lru-cache": "^5.1.1",
+        "memory-level": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-blockchain/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-blockchain/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@nomicfoundation/ethereumjs-common": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-3.1.2.tgz",
+      "integrity": "sha512-JAEBpIua62dyObHM9KI2b4wHZcRQYYge9gxiygTWa3lNCr2zo+K0TbypDpgiNij5MCGNWP1eboNfNfx1a3vkvA==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "crc-32": "^1.2.0"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-ethash": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-2.0.5.tgz",
+      "integrity": "sha512-xlLdcICGgAYyYmnI3r1t0R5fKGBJNDQSOQxXNjVO99JmxJIdXR5MgPo5CSJO1RpyzKOgzi3uIFn8agv564dZEQ==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "4.2.2",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "abstract-level": "^1.0.3",
+        "bigint-crypto-utils": "^3.0.23",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-evm": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-1.3.2.tgz",
+      "integrity": "sha512-I00d4MwXuobyoqdPe/12dxUQxTYzX8OckSaWsMcWAfQhgVDvBx6ffPyP/w1aL0NW7MjyerySPcSVfDJAMHjilw==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-evm/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-evm/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@nomicfoundation/ethereumjs-rlp": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-4.0.3.tgz",
+      "integrity": "sha512-DZMzB/lqPK78T6MluyXqtlRmOMcsZbTTbbEyAjo0ncaff2mqu/k8a79PBcyvpgAhWD/R59Fjq/x3ro5Lof0AtA==",
+      "dev": true,
+      "bin": {
+        "rlp": "bin/rlp"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-statemanager": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-1.0.5.tgz",
+      "integrity": "sha512-CAhzpzTR5toh/qOJIZUUOnWekUXuRqkkzaGAQrVcF457VhtCmr+ddZjjK50KNZ524c1XP8cISguEVNqJ6ij1sA==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-trie": "5.0.5",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-statemanager/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-statemanager/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@nomicfoundation/ethereumjs-trie": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-5.0.5.tgz",
+      "integrity": "sha512-+8sNZrXkzvA1NH5F4kz5RSYl1I6iaRz7mAZRsyxOm0IVY4UaP43Ofvfp/TwOalFunurQrYB5pRO40+8FBcxFMA==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "ethereum-cryptography": "0.1.3",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-tx": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-4.1.2.tgz",
+      "integrity": "sha512-emJBJZpmTdUa09cqxQqHaysbBI9Od353ZazeH7WgPb35miMgNY6mb7/3vBA98N5lUW/rgkiItjX0KZfIzihSoQ==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-util": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-8.0.6.tgz",
+      "integrity": "sha512-jOQfF44laa7xRfbfLXojdlcpkvxeHrE2Xu7tSeITsWFgoII163MzjOwFEzSNozHYieFysyoEMhCdP+NY5ikstw==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-vm": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-6.4.2.tgz",
+      "integrity": "sha512-PRTyxZMP6kx+OdAzBhuH1LD2Yw+hrSpaytftvaK//thDy2OI07S0nrTdbrdk7b8ZVPAc9H9oTwFBl3/wJ3w15g==",
+      "dev": true,
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "4.2.2",
+        "@nomicfoundation/ethereumjs-blockchain": "6.2.2",
+        "@nomicfoundation/ethereumjs-common": "3.1.2",
+        "@nomicfoundation/ethereumjs-evm": "1.3.2",
+        "@nomicfoundation/ethereumjs-rlp": "4.0.3",
+        "@nomicfoundation/ethereumjs-statemanager": "1.0.5",
+        "@nomicfoundation/ethereumjs-trie": "5.0.5",
+        "@nomicfoundation/ethereumjs-tx": "4.1.2",
+        "@nomicfoundation/ethereumjs-util": "8.0.6",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-vm/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-vm/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.1.1.tgz",
+      "integrity": "sha512-1LMtXj1puAxyFusBgUIy5pZk3073cNXYnXUpuNKFghHbIit/xZgbk0AokpUADbNm3gyD6bFWl3LRFh3dhVdREg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      },
+      "optionalDependencies": {
+        "@nomicfoundation/solidity-analyzer-darwin-arm64": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-darwin-x64": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-freebsd-x64": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-musl": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-linux-x64-gnu": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-linux-x64-musl": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": "0.1.1",
+        "@nomicfoundation/solidity-analyzer-win32-x64-msvc": "0.1.1"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-darwin-arm64": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.1.tgz",
+      "integrity": "sha512-KcTodaQw8ivDZyF+D76FokN/HdpgGpfjc/gFCImdLUyqB6eSWVaZPazMbeAjmfhx3R0zm/NYVzxwAokFKgrc0w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-darwin-x64": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.1.1.tgz",
+      "integrity": "sha512-XhQG4BaJE6cIbjAVtzGOGbK3sn1BO9W29uhk9J8y8fZF1DYz0Doj8QDMfpMu+A6TjPDs61lbsmeYodIDnfveSA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-freebsd-x64": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-freebsd-x64/-/solidity-analyzer-freebsd-x64-0.1.1.tgz",
+      "integrity": "sha512-GHF1VKRdHW3G8CndkwdaeLkVBi5A9u2jwtlS7SLhBc8b5U/GcoL39Q+1CSO3hYqePNP+eV5YI7Zgm0ea6kMHoA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-gnu": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.1.1.tgz",
+      "integrity": "sha512-g4Cv2fO37ZsUENQ2vwPnZc2zRenHyAxHcyBjKcjaSmmkKrFr64yvzeNO8S3GBFCo90rfochLs99wFVGT/0owpg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-musl": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.1.1.tgz",
+      "integrity": "sha512-WJ3CE5Oek25OGE3WwzK7oaopY8xMw9Lhb0mlYuJl/maZVo+WtP36XoQTb7bW/i8aAdHW5Z+BqrHMux23pvxG3w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-gnu": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.1.1.tgz",
+      "integrity": "sha512-5WN7leSr5fkUBBjE4f3wKENUy9HQStu7HmWqbtknfXkkil+eNWiBV275IOlpXku7v3uLsXTOKpnnGHJYI2qsdA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-musl": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.1.1.tgz",
+      "integrity": "sha512-KdYMkJOq0SYPQMmErv/63CwGwMm5XHenEna9X9aB8mQmhDBrYrlAOSsIPgFCUSL0hjxE3xHP65/EPXR/InD2+w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-arm64-msvc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-arm64-msvc/-/solidity-analyzer-win32-arm64-msvc-0.1.1.tgz",
+      "integrity": "sha512-VFZASBfl4qiBYwW5xeY20exWhmv6ww9sWu/krWSesv3q5hA0o1JuzmPHR4LPN6SUZj5vcqci0O6JOL8BPw+APg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-ia32-msvc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-ia32-msvc/-/solidity-analyzer-win32-ia32-msvc-0.1.1.tgz",
+      "integrity": "sha512-JnFkYuyCSA70j6Si6cS1A9Gh1aHTEb8kOTBApp/c7NRTFGNMH8eaInKlyuuiIbvYFhlXW4LicqyYuWNNq9hkpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-x64-msvc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.1.1.tgz",
+      "integrity": "sha512-HrVJr6+WjIXGnw3Q9u6KQcbZCtk0caVWhCdFADySvRyUxJ8PnzlaP+MhwNE8oyT8OZ6ejHBRrrgjSqDCFXGirw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomiclabs/hardhat-ethers": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.0.5.tgz",
+      "integrity": "sha512-A2gZAGB6kUvLx+kzM92HKuUF33F1FSe90L0TmkXkT2Hh0OKRpvWZURUSU2nghD2yC4DzfEZ3DftfeHGvZ2JTUw==",
+      "dev": true,
+      "peerDependencies": {
+        "ethers": "^5.0.0",
+        "hardhat": "^2.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/hardhat-truffle5": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-truffle5/-/hardhat-truffle5-2.0.5.tgz",
+      "integrity": "sha512-taTWfieMP3Rvj+y90DgdNpviUJ4zxgjpW0V8D++uPkg5R7HXVWBTf43a1PYw+cBhcqN29P9gB1zSS1HC+uz1Mw==",
+      "dev": true,
+      "dependencies": {
+        "@nomiclabs/truffle-contract": "^4.2.23",
+        "@types/chai": "^4.2.0",
+        "chai": "^4.2.0",
+        "ethereumjs-util": "^7.1.3",
+        "fs-extra": "^7.0.1"
+      },
+      "peerDependencies": {
+        "@nomiclabs/hardhat-web3": "^2.0.0",
+        "hardhat": "^2.6.4",
+        "web3": "^1.0.0-beta.36"
+      }
+    },
+    "node_modules/@nomiclabs/hardhat-waffle": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-waffle/-/hardhat-waffle-2.0.3.tgz",
+      "integrity": "sha512-049PHSnI1CZq6+XTbrMbMv5NaL7cednTfPenx02k3cEh8wBMLa6ys++dBETJa6JjfwgA9nBhhHQ173LJv6k2Pg==",
+      "dev": true,
+      "dependencies": {
+        "@types/sinon-chai": "^3.2.3",
+        "@types/web3": "1.0.19"
+      },
+      "peerDependencies": {
+        "@nomiclabs/hardhat-ethers": "^2.0.0",
+        "ethereum-waffle": "^3.2.0",
+        "ethers": "^5.0.0",
+        "hardhat": "^2.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/hardhat-web3": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-web3/-/hardhat-web3-2.0.0.tgz",
+      "integrity": "sha512-zt4xN+D+fKl3wW2YlTX3k9APR3XZgPkxJYf36AcliJn3oujnKEVRZaHu0PhgLjO+gR+F/kiYayo9fgd2L8970Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/bignumber.js": "^5.0.0"
+      },
+      "peerDependencies": {
+        "hardhat": "^2.0.0",
+        "web3": "^1.0.0-beta.36"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract": {
+      "version": "4.2.23",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/truffle-contract/-/truffle-contract-4.2.23.tgz",
+      "integrity": "sha512-Khj/Ts9r0LqEpGYhISbc+8WTOd6qJ4aFnDR+Ew+neqcjGnhwrIvuihNwPFWU6hDepW3Xod6Y+rTo90N8sLRDjw==",
+      "dev": true,
+      "dependencies": {
+        "@truffle/blockchain-utils": "^0.0.25",
+        "@truffle/contract-schema": "^3.2.5",
+        "@truffle/debug-utils": "^4.2.9",
+        "@truffle/error": "^0.0.11",
+        "@truffle/interface-adapter": "^0.4.16",
+        "bignumber.js": "^7.2.1",
+        "ethereum-ens": "^0.8.0",
+        "ethers": "^4.0.0-beta.1",
+        "source-map-support": "^0.5.19"
+      },
+      "peerDependencies": {
+        "web3": "^1.2.1",
+        "web3-core-helpers": "^1.2.1",
+        "web3-core-promievent": "^1.2.1",
+        "web3-eth-abi": "^1.2.1",
+        "web3-utils": "^1.2.1"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@ethersproject/abi": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
+      "integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.4",
+        "@ethersproject/bignumber": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.4",
+        "@ethersproject/constants": "^5.0.4",
+        "@ethersproject/hash": "^5.0.4",
+        "@ethersproject/keccak256": "^5.0.3",
+        "@ethersproject/logger": "^5.0.5",
+        "@ethersproject/properties": "^5.0.3",
+        "@ethersproject/strings": "^5.0.4"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/blockchain-utils": {
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.0.25.tgz",
+      "integrity": "sha512-XA5m0BfAWtysy5ChHyiAf1fXbJxJXphKk+eZ9Rb9Twi6fn3Jg4gnHNwYXJacYFEydqT5vr2s4Ou812JHlautpw==",
+      "dev": true,
+      "dependencies": {
+        "source-map-support": "^0.5.19"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/codec": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.7.1.tgz",
+      "integrity": "sha512-mNd6KnW6J0UB1zafGBXDlTEbCMvWpmPAJmzv7aF/nAIaN/F8UePSCiQ1OTQP39Rprj6GFiCCaWVnBAwum6UGSg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "bn.js": "^4.11.8",
+        "borc": "^2.1.2",
+        "debug": "^4.1.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.partition": "^4.6.0",
+        "lodash.sum": "^4.0.2",
+        "semver": "^6.3.0",
+        "source-map-support": "^0.5.19",
+        "utf8": "^3.0.0",
+        "web3-utils": "1.2.9"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/debug-utils": {
+      "version": "4.2.14",
+      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-4.2.14.tgz",
+      "integrity": "sha512-g5UTX2DPTzrjRjBJkviGI2IrQRTTSvqjmNWCNZNXP+vgQKNxL9maLZhQ6oA3BuuByVW/kusgYeXt8+W1zynC8g==",
+      "dev": true,
+      "dependencies": {
+        "@truffle/codec": "^0.7.1",
+        "@trufflesuite/chromafi": "^2.2.1",
+        "chalk": "^2.4.2",
+        "debug": "^4.1.0",
+        "highlight.js": "^9.15.8",
+        "highlightjs-solidity": "^1.0.18"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/error": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.0.11.tgz",
+      "integrity": "sha512-ju6TucjlJkfYMmdraYY/IBJaFb+Sa+huhYtOoyOJ+G29KcgytUVnDzKGwC7Kgk6IsxQMm62Mc1E0GZzFbGGipw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/interface-adapter": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.4.24.tgz",
+      "integrity": "sha512-2Zho4dJbm/XGwNleY7FdxcjXiAR3SzdGklgrAW4N/YVmltaJv6bT56ACIbPNN6AdzkTSTO65OlsB/63sfSa/VA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.3",
+        "ethers": "^4.0.32",
+        "web3": "1.3.6"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@truffle/interface-adapter/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@trufflesuite/chromafi": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@trufflesuite/chromafi/-/chromafi-2.2.2.tgz",
+      "integrity": "sha512-mItQwVBsb8qP/vaYHQ1kDt2vJLhjoEXJptT6y6fJGvFophMFhOI/NsTVUa0nJL1nyMeFiS6hSYuNVdpQZzB1gA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-mark": "^1.0.0",
+        "ansi-regex": "^3.0.0",
+        "array-uniq": "^1.0.3",
+        "camelcase": "^4.1.0",
+        "chalk": "^2.3.2",
+        "cheerio": "^1.0.0-rc.2",
+        "detect-indent": "^5.0.0",
+        "he": "^1.1.1",
+        "highlight.js": "^10.4.1",
+        "lodash.merge": "^4.6.2",
+        "min-indent": "^1.0.0",
+        "strip-ansi": "^4.0.0",
+        "strip-indent": "^2.0.0",
+        "super-split": "^1.1.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@trufflesuite/chromafi/node_modules/highlight.js": {
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/eth-lib": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz",
+      "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/ethers": {
+      "version": "4.0.49",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.49.tgz",
+      "integrity": "sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==",
+      "dev": true,
+      "dependencies": {
+        "aes-js": "3.0.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.3",
+        "js-sha3": "0.5.7",
+        "scrypt-js": "2.0.4",
+        "setimmediate": "1.0.4",
+        "uuid": "2.0.1",
+        "xmlhttprequest": "1.8.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/highlight.js": {
+      "version": "9.18.5",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
+      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
+      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/highlightjs-solidity": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-1.2.2.tgz",
+      "integrity": "sha512-+cZ+1+nAO5Pi6c70TKuMcPmwqLECxiYhnQc1MxdXckK94zyWFMNZADzu98ECNlf5xCRdNh+XKp+eklmRU+Dniw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/scrypt-js": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz",
+      "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/setimmediate": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+      "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/uuid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+      "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.3.6.tgz",
+      "integrity": "sha512-jEpPhnL6GDteifdVh7ulzlPrtVQeA30V9vnki9liYlUvLV82ZM7BNOQJiuzlDePuE+jZETZSP/0G/JlUVt6pOA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-bzz": "1.3.6",
+        "web3-core": "1.3.6",
+        "web3-eth": "1.3.6",
+        "web3-eth-personal": "1.3.6",
+        "web3-net": "1.3.6",
+        "web3-shh": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-bzz": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.3.6.tgz",
+      "integrity": "sha512-ibHdx1wkseujFejrtY7ZyC0QxQ4ATXjzcNUpaLrvM6AEae8prUiyT/OloG9FWDgFD2CPLwzKwfSQezYQlANNlw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "got": "9.6.0",
+        "swarm-js": "^0.1.40",
+        "underscore": "1.12.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-bzz/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.3.6.tgz",
+      "integrity": "sha512-gkLDM4T1Sc0T+HZIwxrNrwPg0IfWI0oABSglP2X5ZbBAYVUeEATA0o92LWV8BeF+okvKXLK1Fek/p6axwM/h3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "@types/node": "^12.12.6",
+        "bignumber.js": "^9.0.0",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-core-requestmanager": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-helpers": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz",
+      "integrity": "sha512-nhtjA2ZbkppjlxTSwG0Ttu6FcPkVu1rCN5IFAOVpF/L0SEt+jy+O5l90+cjDq0jAYvlBwUwnbh2mR9hwDEJCNA==",
+      "dev": true,
+      "dependencies": {
+        "underscore": "1.12.1",
+        "web3-eth-iban": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-helpers/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-helpers/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-helpers/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-method": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.3.6.tgz",
+      "integrity": "sha512-RyegqVGxn0cyYW5yzAwkPlsSEynkdPiegd7RxgB4ak1eKk2Cv1q2x4C7D2sZjeeCEF+q6fOkVmo2OZNqS2iQxg==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/transactions": "^5.0.0-beta.135",
+        "underscore": "1.12.1",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-promievent": "1.3.6",
+        "web3-core-subscriptions": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-method/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-method/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-method/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-promievent": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.3.6.tgz",
+      "integrity": "sha512-Z+QzfyYDTXD5wJmZO5wwnRO8bAAHEItT1XNSPVb4J1CToV/I/SbF7CuF8Uzh2jns0Cm1109o666H7StFFvzVKw==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-requestmanager": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.3.6.tgz",
+      "integrity": "sha512-2rIaeuqeo7QN1Eex7aXP0ZqeteJEPWXYFS/M3r3LXMiV8R4STQBKE+//dnHJXoo2ctzEB5cgd+7NaJM8S3gPyA==",
+      "dev": true,
+      "dependencies": {
+        "underscore": "1.12.1",
+        "util": "^0.12.0",
+        "web3-core-helpers": "1.3.6",
+        "web3-providers-http": "1.3.6",
+        "web3-providers-ipc": "1.3.6",
+        "web3-providers-ws": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-requestmanager/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-subscriptions": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.3.6.tgz",
+      "integrity": "sha512-wi9Z9X5X75OKvxAg42GGIf81ttbNR2TxzkAsp1g+nnp5K8mBwgZvXrIsDuj7Z7gx72Y45mWJADCWjk/2vqNu8g==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "underscore": "1.12.1",
+        "web3-core-helpers": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core-subscriptions/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-core/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.3.6.tgz",
+      "integrity": "sha512-9+rnywRRpyX3C4hfsAQXPQh6vHh9XzQkgLxo3gyeXfbhbShUoq2gFVuy42vsRs//6JlsKdyZS7Z3hHPHz2wreA==",
+      "dev": true,
+      "dependencies": {
+        "underscore": "1.12.1",
+        "web3-core": "1.3.6",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-core-subscriptions": "1.3.6",
+        "web3-eth-abi": "1.3.6",
+        "web3-eth-accounts": "1.3.6",
+        "web3-eth-contract": "1.3.6",
+        "web3-eth-ens": "1.3.6",
+        "web3-eth-iban": "1.3.6",
+        "web3-eth-personal": "1.3.6",
+        "web3-net": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-abi": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.3.6.tgz",
+      "integrity": "sha512-Or5cRnZu6WzgScpmbkvC6bfNxR26hqiKK4i8sMPFeTUABQcb/FU3pBj7huBLYbp9dH+P5W79D2MqwbWwjj9DoQ==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.7",
+        "underscore": "1.12.1",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-abi/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-abi/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-abi/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.3.6.tgz",
+      "integrity": "sha512-Ilr0hG6ONbCdSlVKffasCmNwftD5HsNpwyQASevocIQwHdTlvlwO0tb3oGYuajbKOaDzNTwXfz25bttAEoFCGA==",
+      "dev": true,
+      "dependencies": {
+        "crypto-browserify": "3.12.0",
+        "eth-lib": "0.2.8",
+        "ethereumjs-common": "^1.3.2",
+        "ethereumjs-tx": "^2.1.1",
+        "scrypt-js": "^3.0.1",
+        "underscore": "1.12.1",
+        "uuid": "3.3.2",
+        "web3-core": "1.3.6",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts/node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts/node_modules/uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-accounts/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-contract": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.3.6.tgz",
+      "integrity": "sha512-8gDaRrLF2HCg+YEZN1ov0zN35vmtPnGf3h1DxmJQK5Wm2lRMLomz9rsWsuvig3UJMHqZAQKD7tOl3ocJocQsmA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "underscore": "1.12.1",
+        "web3-core": "1.3.6",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-core-promievent": "1.3.6",
+        "web3-core-subscriptions": "1.3.6",
+        "web3-eth-abi": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-contract/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-contract/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-contract/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-ens": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.3.6.tgz",
+      "integrity": "sha512-n27HNj7lpSkRxTgSx+Zo7cmKAgyg2ElFilaFlUu/X2CNH23lXfcPm2bWssivH9z0ndhg0OyR4AYFZqPaqDHkJA==",
+      "dev": true,
+      "dependencies": {
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "2.0.8",
+        "underscore": "1.12.1",
+        "web3-core": "1.3.6",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-promievent": "1.3.6",
+        "web3-eth-abi": "1.3.6",
+        "web3-eth-contract": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-ens/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-ens/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-ens/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-iban": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.3.6.tgz",
+      "integrity": "sha512-nfMQaaLA/zsg5W4Oy/EJQbs8rSs1vBAX6b/35xzjYoutXlpHMQadujDx2RerTKhSHqFXSJeQAfE+2f6mdhYkRQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-iban/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-iban/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-iban/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-personal": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.3.6.tgz",
+      "integrity": "sha512-pOHU0+/h1RFRYoh1ehYBehRbcKWP4OSzd4F7mDljhHngv6W8ewMHrAN8O1ol9uysN2MuCdRE19qkRg5eNgvzFQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.3.6",
+        "web3-core-helpers": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-net": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-personal/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-personal/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth-personal/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-eth/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-net": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.3.6.tgz",
+      "integrity": "sha512-KhzU3wMQY/YYjyMiQzbaLPt2kut88Ncx2iqjy3nw28vRux3gVX0WOCk9EL/KVJBiAA/fK7VklTXvgy9dZnnipw==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-utils": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-net/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-net/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-net/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-providers-http": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.3.6.tgz",
+      "integrity": "sha512-OQkT32O1A06dISIdazpGLveZcOXhEo5cEX6QyiSQkiPk/cjzDrXMw4SKZOGQbbS1+0Vjizm1Hrp7O8Vp2D1M5Q==",
+      "dev": true,
+      "dependencies": {
+        "web3-core-helpers": "1.3.6",
+        "xhr2-cookies": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-providers-ipc": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.3.6.tgz",
+      "integrity": "sha512-+TVsSd2sSVvVgHG4s6FXwwYPPT91boKKcRuEFXqEfAbUC5t52XOgmyc2LNiD9LzPhed65FbV4LqICpeYGUvSwA==",
+      "dev": true,
+      "dependencies": {
+        "oboe": "2.1.5",
+        "underscore": "1.12.1",
+        "web3-core-helpers": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-providers-ipc/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-providers-ws": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.3.6.tgz",
+      "integrity": "sha512-bk7MnJf5or0Re2zKyhR3L3CjGululLCHXx4vlbc/drnaTARUVvi559OI5uLytc/1k5HKUUyENAxLvetz2G1dnQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "underscore": "1.12.1",
+        "web3-core-helpers": "1.3.6",
+        "websocket": "^1.0.32"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-providers-ws/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-shh": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.3.6.tgz",
+      "integrity": "sha512-9zRo415O0iBslxBnmu9OzYjNErzLnzOsy+IOvSpIreLYbbAw0XkDWxv3SfcpKnTIWIACBR4AYMIxmmyi5iB3jw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-core": "1.3.6",
+        "web3-core-method": "1.3.6",
+        "web3-core-subscriptions": "1.3.6",
+        "web3-net": "1.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-utils": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.9.tgz",
+      "integrity": "sha512-9hcpuis3n/LxFzEVjwnVgvJzTirS2S9/MiNAa7l4WOEoywY+BSNwnRX4MuHnjkh9NY25B6QOjuNG6FNnSjTw1w==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "4.11.8",
+        "eth-lib": "0.2.7",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.9.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3-utils/node_modules/bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "dev": true
+    },
+    "node_modules/@nomiclabs/truffle-contract/node_modules/web3/node_modules/web3-utils": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz",
+      "integrity": "sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.12.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contract-loader/-/contract-loader-0.6.3.tgz",
+      "integrity": "sha512-cOFIjBjwbGgZhDZsitNgJl0Ye1rd5yu/Yx5LMgeq3u0ZYzldm4uObzHDFq4gjDdoypvyORjjJa3BlFA7eAnVIg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "fs-extra": "^8.1.0"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@openzeppelin/contract-loader/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@openzeppelin/contracts": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.5.0.tgz",
+      "integrity": "sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA=="
+    },
+    "node_modules/@openzeppelin/test-helpers": {
+      "version": "0.5.15",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/test-helpers/-/test-helpers-0.5.15.tgz",
+      "integrity": "sha512-10fS0kyOjc/UObo9iEWPNbC6MCeiQ7z97LDOJBj68g+AAs5pIGEI2h3V6G9TYTIq8VxOdwMQbfjKrx7Y3YZJtA==",
+      "dev": true,
+      "dependencies": {
+        "@openzeppelin/contract-loader": "^0.6.2",
+        "@truffle/contract": "^4.0.35",
+        "ansi-colors": "^3.2.3",
+        "chai": "^4.2.0",
+        "chai-bn": "^0.2.1",
+        "ethjs-abi": "^0.2.1",
+        "lodash.flatten": "^4.4.0",
+        "semver": "^5.6.0",
+        "web3": "^1.2.5",
+        "web3-utils": "^1.2.5"
+      }
+    },
+    "node_modules/@openzeppelin/test-helpers/node_modules/ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@openzeppelin/test-helpers/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@resolver-engine/core": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@resolver-engine/core/-/core-0.3.3.tgz",
+      "integrity": "sha512-eB8nEbKDJJBi5p5SrvrvILn4a0h42bKtbCTri3ZxCGt6UvoQyp7HnGOfki944bUjBSHKK3RvgfViHn+kqdXtnQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.1.0",
+        "is-url": "^1.2.4",
+        "request": "^2.85.0"
+      }
+    },
+    "node_modules/@resolver-engine/fs": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@resolver-engine/fs/-/fs-0.3.3.tgz",
+      "integrity": "sha512-wQ9RhPUcny02Wm0IuJwYMyAG8fXVeKdmhm8xizNByD4ryZlx6PP6kRen+t/haF43cMfmaV7T3Cx6ChOdHEhFUQ==",
+      "dev": true,
+      "dependencies": {
+        "@resolver-engine/core": "^0.3.3",
+        "debug": "^3.1.0"
+      }
+    },
+    "node_modules/@resolver-engine/imports": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@resolver-engine/imports/-/imports-0.3.3.tgz",
+      "integrity": "sha512-anHpS4wN4sRMwsAbMXhMfOD/y4a4Oo0Cw/5+rue7hSwGWsDOQaAU1ClK1OxjUC35/peazxEl8JaSRRS+Xb8t3Q==",
+      "dev": true,
+      "dependencies": {
+        "@resolver-engine/core": "^0.3.3",
+        "debug": "^3.1.0",
+        "hosted-git-info": "^2.6.0",
+        "path-browserify": "^1.0.0",
+        "url": "^0.11.0"
+      }
+    },
+    "node_modules/@resolver-engine/imports-fs": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@resolver-engine/imports-fs/-/imports-fs-0.3.3.tgz",
+      "integrity": "sha512-7Pjg/ZAZtxpeyCFlZR5zqYkz+Wdo84ugB5LApwriT8XFeQoLwGUj4tZFFvvCuxaNCcqZzCYbonJgmGObYBzyCA==",
+      "dev": true,
+      "dependencies": {
+        "@resolver-engine/fs": "^0.3.3",
+        "@resolver-engine/imports": "^0.3.3",
+        "debug": "^3.1.0"
+      }
+    },
+    "node_modules/@scure/base": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.0.0.tgz",
+      "integrity": "sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@scure/bip32": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.0.1.tgz",
+      "integrity": "sha512-AU88KKTpQ+YpTLoicZ/qhFhRRIo96/tlb+8YmDDHR9yiKVjSsFZiefJO4wjS2PMTkz5/oIcw84uAq/8pleQURA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.0.0",
+        "@noble/secp256k1": "~1.5.2",
+        "@scure/base": "~1.0.0"
+      }
+    },
+    "node_modules/@scure/bip39": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.0.0.tgz",
+      "integrity": "sha512-HrtcikLbd58PWOkl02k9V6nXWQyoa7A0+Ek9VF7z17DDk9XZAFUcIdqfh0jJXLypmizc5/8P6OxoUeKliiWv4w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.0.0",
+        "@scure/base": "~1.0.0"
+      }
+    },
+    "node_modules/@sentry/core": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
+      "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/hub": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz",
+      "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/minimal": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
+      "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/node": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz",
+      "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/core": "5.30.0",
+        "@sentry/hub": "5.30.0",
+        "@sentry/tracing": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "cookie": "^0.4.1",
+        "https-proxy-agent": "^5.0.0",
+        "lru_map": "^0.3.3",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/tracing": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz",
+      "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/types": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
+      "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/utils": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
+      "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@solidity-parser/parser": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.1.tgz",
+      "integrity": "sha512-eLjj2L6AuQjBB6s/ibwCAc0DwrR5Ge+ys+wgWo+bviU7fV2nTMQhU63CGaDKXg9iTmMxwhkyoggdIR7ZGRfMgw==",
+      "dev": true,
+      "dependencies": {
+        "antlr4ts": "^0.5.0-alpha.4"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@truffle/abi-utils": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@truffle/abi-utils/-/abi-utils-0.2.10.tgz",
+      "integrity": "sha512-zG3PSXwq4mrXOOBKzgmOqNlVe2ZBUNAFv0xHAq5DwWew8PSQ/+a0ixPbWXXc3xYbApJMlIXRM716fB5MiZ22FA==",
+      "dev": true,
+      "dependencies": {
+        "change-case": "3.0.2",
+        "faker": "^5.3.1",
+        "fast-check": "^2.12.1"
+      }
+    },
+    "node_modules/@truffle/blockchain-utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.1.1.tgz",
+      "integrity": "sha512-o7nBlaMuasuADCCL2WzhvOXA5GT5ewd/F35cY6ZU69U5OUASR3ZP4CZetVCc5MZePPa/3CL9pzJ4Rhtg1ChwVA==",
+      "dev": true
+    },
+    "node_modules/@truffle/codec": {
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.12.4.tgz",
+      "integrity": "sha512-8XCKMAP22fEVa8xGFA9lqBr5kWhyYW/41ekP0yFEXQhCSPEcZamc6I9h2KQGBrChdxGsKd82Y4138rHGKiQtjQ==",
+      "dev": true,
+      "dependencies": {
+        "@truffle/abi-utils": "^0.2.10",
+        "@truffle/compile-common": "^0.7.29",
+        "big.js": "^6.0.3",
+        "bn.js": "^5.1.3",
+        "cbor": "^5.1.0",
+        "debug": "^4.3.1",
+        "lodash": "^4.17.21",
+        "semver": "^7.3.4",
+        "utf8": "^3.0.0",
+        "web3-utils": "1.5.3"
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/@truffle/codec/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/eth-lib/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@truffle/codec/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@truffle/codec/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/codec/node_modules/web3-utils/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@truffle/codec/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@truffle/compile-common": {
+      "version": "0.7.29",
+      "resolved": "https://registry.npmjs.org/@truffle/compile-common/-/compile-common-0.7.29.tgz",
+      "integrity": "sha512-Z5h0jQh/GXsjnTBt02boV2QiQ1QlGlWlupZWsIcLHpBxQaw/TXTa7EvicPLWf7JQ3my56iaY3N5rkrQLAlFf1Q==",
+      "dev": true,
+      "dependencies": {
+        "@truffle/error": "^0.1.0",
+        "colors": "1.4.0"
+      }
+    },
+    "node_modules/@truffle/contract": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.5.2.tgz",
+      "integrity": "sha512-2QWs2uC5HQZxTvto2XkHyK6uzLAEH5Zyza5itMPW3Lc6IdbsjWTVaA/YCS+YJSFI3vplkR8NkJjXWG9//jxn8g==",
+      "dev": true,
+      "dependencies": {
+        "@ensdomains/ensjs": "^2.0.1",
+        "@truffle/blockchain-utils": "^0.1.1",
+        "@truffle/contract-schema": "^3.4.6",
+        "@truffle/debug-utils": "^6.0.14",
+        "@truffle/error": "^0.1.0",
+        "@truffle/interface-adapter": "^0.5.12",
+        "bignumber.js": "^7.2.1",
+        "debug": "^4.3.1",
+        "ethers": "^4.0.32",
+        "web3": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-utils": "1.5.3"
+      }
+    },
+    "node_modules/@truffle/contract-schema": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.4.6.tgz",
+      "integrity": "sha512-YzVAoPxEnM7pz7vLrQvtgtnpIwERrZcbYRjRTEJP8Y7rxudYDYaZ8PwjHD3j0SQxE6Y0WquDi3PtbfgZB9BwYQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.0",
+        "debug": "^4.3.1"
+      }
+    },
+    "node_modules/@truffle/contract-schema/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@truffle/contract-schema/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/ethers": {
+      "version": "4.0.49",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.49.tgz",
+      "integrity": "sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==",
+      "dev": true,
+      "dependencies": {
+        "aes-js": "3.0.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.3",
+        "js-sha3": "0.5.7",
+        "scrypt-js": "2.0.4",
+        "setimmediate": "1.0.4",
+        "uuid": "2.0.1",
+        "xmlhttprequest": "1.8.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/scrypt-js": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz",
+      "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/setimmediate": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+      "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/uuid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+      "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/web3": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.5.3.tgz",
+      "integrity": "sha512-eyBg/1K44flfv0hPjXfKvNwcUfIVDI4NX48qHQe6wd7C8nPSdbWqo9vLy6ksZIt9NLa90HjI8HsGYgnMSUxn6w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-bzz": "1.5.3",
+        "web3-core": "1.5.3",
+        "web3-eth": "1.5.3",
+        "web3-eth-personal": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-shh": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-bzz": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.5.3.tgz",
+      "integrity": "sha512-SlIkAqG0eS6cBS9Q2eBOTI1XFzqh83RqGJWnyrNZMDxUwsTVHL+zNnaPShVPvrWQA1Ub5b0bx1Kc5+qJVxsTJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "got": "9.6.0",
+        "swarm-js": "^0.1.40"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-core": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.5.3.tgz",
+      "integrity": "sha512-ACTbu8COCu+0eUNmd9pG7Q9EVsNkAg2w3Y7SqhDr+zjTgbSHZV01jXKlapm9z+G3AN/BziV3zGwudClJ4u4xXQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "@types/node": "^12.12.6",
+        "bignumber.js": "^9.0.0",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-requestmanager": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-core-method": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.5.3.tgz",
+      "integrity": "sha512-8wJrwQ2qD9ibWieF9oHXwrJsUGrv3XAtEkNeyvyNMpktNTIjxJ2jaFGQUuLiyUrMubD18XXgLk4JS6PJU4Loeg==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.4.0",
+        "@ethersproject/transactions": "^5.0.0-beta.135",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-core-requestmanager": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.5.3.tgz",
+      "integrity": "sha512-9k/Bze2rs8ONix5IZR+hYdMNQv+ark2Ek2kVcrFgWO+LdLgZui/rn8FikPunjE+ub7x7pJaKCgVRbYFXjo3ZWg==",
+      "dev": true,
+      "dependencies": {
+        "util": "^0.12.0",
+        "web3-core-helpers": "1.5.3",
+        "web3-providers-http": "1.5.3",
+        "web3-providers-ipc": "1.5.3",
+        "web3-providers-ws": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-core-subscriptions": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.5.3.tgz",
+      "integrity": "sha512-L2m9vG1iRN6thvmv/HQwO2YLhOQlmZU8dpLG6GSo9FBN14Uch868Swk0dYVr3rFSYjZ/GETevSXU+O+vhCummA==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-core/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.5.3.tgz",
+      "integrity": "sha512-saFurA1L23Bd7MEf7cBli6/jRdMhD4X/NaMiO2mdMMCXlPujoudlIJf+VWpRWJpsbDFdu7XJ2WHkmBYT5R3p1Q==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-eth-accounts": "1.5.3",
+        "web3-eth-contract": "1.5.3",
+        "web3-eth-ens": "1.5.3",
+        "web3-eth-iban": "1.5.3",
+        "web3-eth-personal": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-accounts": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.5.3.tgz",
+      "integrity": "sha512-pdGhXgeBaEJENMvRT6W9cmji3Zz/46ugFSvmnLLw79qi5EH7XJhKISNVb41eWCrs4am5GhI67GLx5d2s2a72iw==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.3.0",
+        "@ethereumjs/tx": "^3.2.1",
+        "crypto-browserify": "3.12.0",
+        "eth-lib": "0.2.8",
+        "ethereumjs-util": "^7.0.10",
+        "scrypt-js": "^3.0.1",
+        "uuid": "3.3.2",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-accounts/node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-accounts/node_modules/uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-contract": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.5.3.tgz",
+      "integrity": "sha512-Gdlt1L6cdHe83k7SdV6xhqCytVtOZkjD0kY/15x441AuuJ4JLubCHuqu69k2Dr3tWifHYVys/vG8QE/W16syGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-ens": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.5.3.tgz",
+      "integrity": "sha512-QmGFFtTGElg0E+3xfCIFhiUF+1imFi9eg/cdsRMUZU4F1+MZCC/ee+IAelYLfNTGsEslCqfAusliKOT9DdGGnw==",
+      "dev": true,
+      "dependencies": {
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "2.0.8",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-eth-contract": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-eth-personal": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.5.3.tgz",
+      "integrity": "sha512-JzibJafR7ak/Icas8uvos3BmUNrZw1vShuNR5Cxjo+vteOC8XMqz1Vr7RH65B4bmlfb3bm9xLxetUHO894+Sew==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-net": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.5.3.tgz",
+      "integrity": "sha512-0W/xHIPvgVXPSdLu0iZYnpcrgNnhzHMC888uMlGP5+qMCt8VuflUZHy7tYXae9Mzsg1kxaJAS5lHVNyeNw4CoQ==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-providers-http": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.5.3.tgz",
+      "integrity": "sha512-5DpUyWGHtDAr2RYmBu34Fu+4gJuBAuNx2POeiJIooUtJ+Mu6pIx4XkONWH6V+Ez87tZAVAsFOkJRTYuzMr3rPw==",
+      "dev": true,
+      "dependencies": {
+        "web3-core-helpers": "1.5.3",
+        "xhr2-cookies": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-providers-ipc": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.5.3.tgz",
+      "integrity": "sha512-JmeAptugVpmXI39LGxUSAymx0NOFdgpuI1hGQfIhbEAcd4sv7fhfd5D+ZU4oLHbRI8IFr4qfGU0uhR8BXhDzlg==",
+      "dev": true,
+      "dependencies": {
+        "oboe": "2.1.5",
+        "web3-core-helpers": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-providers-ws": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.5.3.tgz",
+      "integrity": "sha512-6DhTw4Q7nm5CFYEUHOJM0gAb3xFx+9gWpVveg3YxJ/ybR1BUvEWo3bLgIJJtX56cYX0WyY6DS35a7f0LOI1kVg==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.5.3",
+        "websocket": "^1.0.32"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-shh": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.5.3.tgz",
+      "integrity": "sha512-COfEXfsqoV/BkcsNLRxQqnWc1Teb8/9GxdGag5GtPC5gQC/vsN+7hYVJUwNxY9LtJPKYTij2DHHnx6UkITng+Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-net": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/contract/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/debug-utils": {
+      "version": "6.0.14",
+      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.14.tgz",
+      "integrity": "sha512-LhtoKI86QzLFbb0dOQojNR1jl8Le0GL/fkhkaK/thdxMtkt5F7BVoO0f0CbnC9+vfp7qbgEcRct1suw38sVVGQ==",
+      "dev": true,
+      "dependencies": {
+        "@truffle/codec": "^0.12.4",
+        "@trufflesuite/chromafi": "^3.0.0",
+        "bn.js": "^5.1.3",
+        "chalk": "^2.4.2",
+        "debug": "^4.3.1",
+        "highlightjs-solidity": "^2.0.5"
+      }
+    },
+    "node_modules/@truffle/debug-utils/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/@truffle/debug-utils/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@truffle/debug-utils/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@truffle/error": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.1.0.tgz",
+      "integrity": "sha512-RbUfp5VreNhsa2Q4YbBjz18rOQI909pG32bghl1hulO7IpvcqTS+C3Ge5cNbiWQ1WGzy1wIeKLW0tmQtHFB7qg==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter": {
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.5.12.tgz",
+      "integrity": "sha512-Qrc5VARnvSILYqZNsAM0xsUHqGqphLXVdIvDnhUA1Xj1xyNz8iboTr8bXorMd+Uspw+PXmsW44BJ/Wioo/jL2A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.3",
+        "ethers": "^4.0.32",
+        "web3": "1.5.3"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/eth-lib/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/ethers": {
+      "version": "4.0.49",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.49.tgz",
+      "integrity": "sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==",
+      "dev": true,
+      "dependencies": {
+        "aes-js": "3.0.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.3",
+        "js-sha3": "0.5.7",
+        "scrypt-js": "2.0.4",
+        "setimmediate": "1.0.4",
+        "uuid": "2.0.1",
+        "xmlhttprequest": "1.8.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/ethers/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/scrypt-js": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz",
+      "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/setimmediate": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+      "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/uuid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+      "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.5.3.tgz",
+      "integrity": "sha512-eyBg/1K44flfv0hPjXfKvNwcUfIVDI4NX48qHQe6wd7C8nPSdbWqo9vLy6ksZIt9NLa90HjI8HsGYgnMSUxn6w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-bzz": "1.5.3",
+        "web3-core": "1.5.3",
+        "web3-eth": "1.5.3",
+        "web3-eth-personal": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-shh": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-bzz": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.5.3.tgz",
+      "integrity": "sha512-SlIkAqG0eS6cBS9Q2eBOTI1XFzqh83RqGJWnyrNZMDxUwsTVHL+zNnaPShVPvrWQA1Ub5b0bx1Kc5+qJVxsTJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "got": "9.6.0",
+        "swarm-js": "^0.1.40"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-core": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.5.3.tgz",
+      "integrity": "sha512-ACTbu8COCu+0eUNmd9pG7Q9EVsNkAg2w3Y7SqhDr+zjTgbSHZV01jXKlapm9z+G3AN/BziV3zGwudClJ4u4xXQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "@types/node": "^12.12.6",
+        "bignumber.js": "^9.0.0",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-requestmanager": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-core-method": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.5.3.tgz",
+      "integrity": "sha512-8wJrwQ2qD9ibWieF9oHXwrJsUGrv3XAtEkNeyvyNMpktNTIjxJ2jaFGQUuLiyUrMubD18XXgLk4JS6PJU4Loeg==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.4.0",
+        "@ethersproject/transactions": "^5.0.0-beta.135",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-core-requestmanager": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.5.3.tgz",
+      "integrity": "sha512-9k/Bze2rs8ONix5IZR+hYdMNQv+ark2Ek2kVcrFgWO+LdLgZui/rn8FikPunjE+ub7x7pJaKCgVRbYFXjo3ZWg==",
+      "dev": true,
+      "dependencies": {
+        "util": "^0.12.0",
+        "web3-core-helpers": "1.5.3",
+        "web3-providers-http": "1.5.3",
+        "web3-providers-ipc": "1.5.3",
+        "web3-providers-ws": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-core-subscriptions": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.5.3.tgz",
+      "integrity": "sha512-L2m9vG1iRN6thvmv/HQwO2YLhOQlmZU8dpLG6GSo9FBN14Uch868Swk0dYVr3rFSYjZ/GETevSXU+O+vhCummA==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.5.3.tgz",
+      "integrity": "sha512-saFurA1L23Bd7MEf7cBli6/jRdMhD4X/NaMiO2mdMMCXlPujoudlIJf+VWpRWJpsbDFdu7XJ2WHkmBYT5R3p1Q==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-eth-accounts": "1.5.3",
+        "web3-eth-contract": "1.5.3",
+        "web3-eth-ens": "1.5.3",
+        "web3-eth-iban": "1.5.3",
+        "web3-eth-personal": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-accounts": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.5.3.tgz",
+      "integrity": "sha512-pdGhXgeBaEJENMvRT6W9cmji3Zz/46ugFSvmnLLw79qi5EH7XJhKISNVb41eWCrs4am5GhI67GLx5d2s2a72iw==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.3.0",
+        "@ethereumjs/tx": "^3.2.1",
+        "crypto-browserify": "3.12.0",
+        "eth-lib": "0.2.8",
+        "ethereumjs-util": "^7.0.10",
+        "scrypt-js": "^3.0.1",
+        "uuid": "3.3.2",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-accounts/node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-accounts/node_modules/uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-contract": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.5.3.tgz",
+      "integrity": "sha512-Gdlt1L6cdHe83k7SdV6xhqCytVtOZkjD0kY/15x441AuuJ4JLubCHuqu69k2Dr3tWifHYVys/vG8QE/W16syGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-ens": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.5.3.tgz",
+      "integrity": "sha512-QmGFFtTGElg0E+3xfCIFhiUF+1imFi9eg/cdsRMUZU4F1+MZCC/ee+IAelYLfNTGsEslCqfAusliKOT9DdGGnw==",
+      "dev": true,
+      "dependencies": {
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "2.0.8",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-promievent": "1.5.3",
+        "web3-eth-abi": "1.5.3",
+        "web3-eth-contract": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-eth-personal": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.5.3.tgz",
+      "integrity": "sha512-JzibJafR7ak/Icas8uvos3BmUNrZw1vShuNR5Cxjo+vteOC8XMqz1Vr7RH65B4bmlfb3bm9xLxetUHO894+Sew==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.5.3",
+        "web3-core-helpers": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-net": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-net": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.5.3.tgz",
+      "integrity": "sha512-0W/xHIPvgVXPSdLu0iZYnpcrgNnhzHMC888uMlGP5+qMCt8VuflUZHy7tYXae9Mzsg1kxaJAS5lHVNyeNw4CoQ==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-providers-http": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.5.3.tgz",
+      "integrity": "sha512-5DpUyWGHtDAr2RYmBu34Fu+4gJuBAuNx2POeiJIooUtJ+Mu6pIx4XkONWH6V+Ez87tZAVAsFOkJRTYuzMr3rPw==",
+      "dev": true,
+      "dependencies": {
+        "web3-core-helpers": "1.5.3",
+        "xhr2-cookies": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-providers-ipc": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.5.3.tgz",
+      "integrity": "sha512-JmeAptugVpmXI39LGxUSAymx0NOFdgpuI1hGQfIhbEAcd4sv7fhfd5D+ZU4oLHbRI8IFr4qfGU0uhR8BXhDzlg==",
+      "dev": true,
+      "dependencies": {
+        "oboe": "2.1.5",
+        "web3-core-helpers": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-providers-ws": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.5.3.tgz",
+      "integrity": "sha512-6DhTw4Q7nm5CFYEUHOJM0gAb3xFx+9gWpVveg3YxJ/ybR1BUvEWo3bLgIJJtX56cYX0WyY6DS35a7f0LOI1kVg==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.5.3",
+        "websocket": "^1.0.32"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-shh": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.5.3.tgz",
+      "integrity": "sha512-COfEXfsqoV/BkcsNLRxQqnWc1Teb8/9GxdGag5GtPC5gQC/vsN+7hYVJUwNxY9LtJPKYTij2DHHnx6UkITng+Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-core": "1.5.3",
+        "web3-core-method": "1.5.3",
+        "web3-core-subscriptions": "1.5.3",
+        "web3-net": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@truffle/interface-adapter/node_modules/web3-utils/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@trufflesuite/chromafi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@trufflesuite/chromafi/-/chromafi-3.0.0.tgz",
+      "integrity": "sha512-oqWcOqn8nT1bwlPPfidfzS55vqcIDdpfzo3HbU9EnUmcSTX+I8z0UyUFI3tZQjByVJulbzxHxUGS3ZJPwK/GPQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^4.1.0",
+        "chalk": "^2.3.2",
+        "cheerio": "^1.0.0-rc.2",
+        "detect-indent": "^5.0.0",
+        "highlight.js": "^10.4.1",
+        "lodash.merge": "^4.6.2",
+        "strip-ansi": "^4.0.0",
+        "strip-indent": "^2.0.0"
+      }
+    },
+    "node_modules/@trufflesuite/chromafi/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@trufflesuite/chromafi/node_modules/camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@trufflesuite/chromafi/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@typechain/ethers-v5": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-2.0.0.tgz",
+      "integrity": "sha512-0xdCkyGOzdqh4h5JSf+zoWx85IusEjDcPIwNEHP8mrWSnCae4rvrqB+/gtpdNfX7zjlFlZiMeePn2r63EI3Lrw==",
+      "dev": true,
+      "dependencies": {
+        "ethers": "^5.0.2"
+      },
+      "peerDependencies": {
+        "ethers": "^5.0.0",
+        "typechain": "^3.0.0"
+      }
+    },
+    "node_modules/@types/async-eventemitter": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@types/async-eventemitter/-/async-eventemitter-0.2.1.tgz",
+      "integrity": "sha512-M2P4Ng26QbAeITiH7w1d7OxtldgfAe0wobpyJzVK/XOb0cUGKU2R4pfAhqcJBXAe2ife5ZOhSv4wk7p+ffURtg==",
+      "dev": true
+    },
+    "node_modules/@types/bignumber.js": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/bignumber.js/-/bignumber.js-5.0.0.tgz",
+      "integrity": "sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA==",
+      "deprecated": "This is a stub types definition for bignumber.js (https://github.com/MikeMcl/bignumber.js/). bignumber.js provides its own type definitions, so you don't need @types/bignumber.js installed!",
+      "dev": true,
+      "dependencies": {
+        "bignumber.js": "*"
+      }
+    },
+    "node_modules/@types/bn.js": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
+      "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/chai": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.0.tgz",
+      "integrity": "sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==",
+      "dev": true
+    },
+    "node_modules/@types/concat-stream": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz",
+      "integrity": "sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/form-data": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz",
+      "integrity": "sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==",
+      "dev": true
+    },
+    "node_modules/@types/mkdirp": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz",
+      "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "17.0.23",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
+      "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==",
+      "dev": true
+    },
+    "node_modules/@types/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      }
+    },
+    "node_modules/@types/pbkdf2": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
+      "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
+      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
+      "dev": true
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "node_modules/@types/resolve": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
+      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sinon": {
+      "version": "10.0.11",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.11.tgz",
+      "integrity": "sha512-dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g==",
+      "dev": true,
+      "dependencies": {
+        "@types/sinonjs__fake-timers": "*"
+      }
+    },
+    "node_modules/@types/sinon-chai": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.8.tgz",
+      "integrity": "sha512-d4ImIQbT/rKMG8+AXpmcan5T2/PNeSjrYhvkwet6z0p8kzYtfgA32xzOBlbU0yqJfq+/0Ml805iFoODO0LP5/g==",
+      "dev": true,
+      "dependencies": {
+        "@types/chai": "*",
+        "@types/sinon": "*"
+      }
+    },
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz",
+      "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==",
+      "dev": true
+    },
+    "node_modules/@types/underscore": {
+      "version": "1.11.4",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.4.tgz",
+      "integrity": "sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==",
+      "dev": true
+    },
+    "node_modules/@types/web3": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.19.tgz",
+      "integrity": "sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "*",
+        "@types/underscore": "*"
+      }
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/abstract-level": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz",
+      "integrity": "sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "catering": "^2.1.0",
+        "is-buffer": "^2.0.5",
+        "level-supports": "^4.0.0",
+        "level-transcoder": "^1.0.1",
+        "module-error": "^1.0.1",
+        "queue-microtask": "^1.2.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/abstract-level/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/adm-zip": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz",
+      "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.0"
+      }
+    },
+    "node_modules/aes-js": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz",
+      "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=",
+      "dev": true
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agent-base/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/agent-base/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-mark": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/ansi-mark/-/ansi-mark-1.0.4.tgz",
+      "integrity": "sha1-HNS6jVfxXxCdaq9uycqXhsik7mw=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0",
+        "array-uniq": "^1.0.3",
+        "chalk": "^2.3.2",
+        "strip-ansi": "^4.0.0",
+        "super-split": "^1.1.0"
+      }
+    },
+    "node_modules/ansi-mark/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-mark/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/antlr4ts": {
+      "version": "0.5.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
+      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
+      "dev": true
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/async": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/async-eventemitter": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz",
+      "integrity": "sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.4.0"
+      }
+    },
+    "node_modules/async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base-x": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+      "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/bcrypt-pbkdf/node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "node_modules/bech32": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==",
+      "dev": true
+    },
+    "node_modules/big-integer": {
+      "version": "1.6.36",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz",
+      "integrity": "sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.1.1.tgz",
+      "integrity": "sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bigjs"
+      }
+    },
+    "node_modules/bigint-crypto-utils": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/bigint-crypto-utils/-/bigint-crypto-utils-3.1.8.tgz",
+      "integrity": "sha512-+VMV9Laq8pXLBKKKK49nOoq9bfR3j7NNQAtbA617a4nw9bVLo8rsqkKMBgM2AJWlNX9fEIyYaYX+d0laqYV4tw==",
+      "dev": true,
+      "dependencies": {
+        "bigint-mod-arith": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
+    "node_modules/bigint-mod-arith": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bigint-mod-arith/-/bigint-mod-arith-3.1.2.tgz",
+      "integrity": "sha512-nx8J8bBeiRR+NlsROFH9jHswW5HO8mgfOSqW0AmjicMMvaONDa8AO+5ViKDUUNytBPWiwfvZP4/Bj4Y3lUfvgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
+    "node_modules/bignumber.js": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
+      "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/blakejs": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
+      "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==",
+      "dev": true
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.8.1",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.9.7",
+        "raw-body": "2.4.3",
+        "type-is": "~1.6.18"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/body-parser/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/body-parser/node_modules/raw-body": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
+      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "1.8.1",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/borc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/borc/-/borc-2.1.2.tgz",
+      "integrity": "sha512-Sy9eoUi4OiKzq7VovMn246iTo17kzuyHJKomCfpWMlI6RpfN1gk95w7d7gH264nApVLg0HZfcpz62/g4VH1Y4w==",
+      "dev": true,
+      "dependencies": {
+        "bignumber.js": "^9.0.0",
+        "buffer": "^5.5.0",
+        "commander": "^2.15.0",
+        "ieee754": "^1.1.13",
+        "iso-url": "~0.4.7",
+        "json-text-sequence": "~0.1.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/borc/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/borc/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-level": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browser-level/-/browser-level-1.0.1.tgz",
+      "integrity": "sha512-XECYKJ+Dbzw0lbydyQuJzwNXtOpbMSq737qxJN11sIRTErOMShvDpbzTlgju7orJKvx4epULolZAuJGLzCmWRQ==",
+      "dev": true,
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.1",
+        "module-error": "^1.0.2",
+        "run-parallel-limit": "^1.1.0"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-aes/node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "node_modules/bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dev": true,
+      "dependencies": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-to-arraybuffer": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz",
+      "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=",
+      "dev": true
+    },
+    "node_modules/bufferutil": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.6.tgz",
+      "integrity": "sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
+      }
+    },
+    "node_modules/busboy": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
+      "dev": true,
+      "dependencies": {
+        "streamsearch": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "node_modules/catering": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz",
+      "integrity": "sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cbor": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
+      "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==",
+      "dev": true,
+      "dependencies": {
+        "bignumber.js": "^9.0.1",
+        "nofilter": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/cbor/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chai-bn": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/chai-bn/-/chai-bn-0.2.2.tgz",
+      "integrity": "sha512-MzjelH0p8vWn65QKmEq/DLBG1Hle4WeyqT79ANhXZhn/UxRWO0OogkAxi5oGGtfzwU9bZR8mvbvYdoqNVWQwFg==",
+      "dev": true,
+      "peerDependencies": {
+        "bn.js": "^4.11.0",
+        "chai": "^4.0.0"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/change-case": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz",
+      "integrity": "sha512-Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^3.0.0",
+        "constant-case": "^2.0.0",
+        "dot-case": "^2.1.0",
+        "header-case": "^1.0.0",
+        "is-lower-case": "^1.1.0",
+        "is-upper-case": "^1.1.0",
+        "lower-case": "^1.1.1",
+        "lower-case-first": "^1.0.0",
+        "no-case": "^2.3.2",
+        "param-case": "^2.1.0",
+        "pascal-case": "^2.0.0",
+        "path-case": "^2.1.0",
+        "sentence-case": "^2.1.0",
+        "snake-case": "^2.1.0",
+        "swap-case": "^1.1.0",
+        "title-case": "^2.1.0",
+        "upper-case": "^1.1.1",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.10",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+      "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+      "dev": true,
+      "dependencies": {
+        "cheerio-select": "^1.5.0",
+        "dom-serializer": "^1.3.2",
+        "domhandler": "^4.2.0",
+        "htmlparser2": "^6.1.0",
+        "parse5": "^6.0.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+      }
+    },
+    "node_modules/cheerio-select": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz",
+      "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.3.0",
+        "css-what": "^6.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cheerio/node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "dev": true
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "node_modules/cids": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/cids/-/cids-0.7.5.tgz",
+      "integrity": "sha512-zT7mPeghoWAu+ppn8+BS1tQ5qGmbMfB4AregnQjA/qHY3GC1m1ptI9GkWNlgeu38r7CuRdXB47uY2XgAYt6QVA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "class-is": "^1.1.0",
+        "multibase": "~0.6.0",
+        "multicodec": "^1.0.0",
+        "multihashes": "~0.4.15"
+      },
+      "engines": {
+        "node": ">=4.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/cids/node_modules/multicodec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
+      "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.6.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/class-is": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz",
+      "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw==",
+      "dev": true
+    },
+    "node_modules/classic-level": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/classic-level/-/classic-level-1.2.0.tgz",
+      "integrity": "sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.0",
+        "module-error": "^1.0.1",
+        "napi-macros": "~2.0.0",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-table3": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
+      "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.0",
+        "string-width": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "colors": "^1.1.2"
+      }
+    },
+    "node_modules/cli-table3/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-table3/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-table3/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-table3/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
+      "dev": true
+    },
+    "node_modules/command-line-args": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz",
+      "integrity": "sha512-aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^2.0.0",
+        "find-replace": "^1.0.3",
+        "typical": "^2.6.1"
+      },
+      "bin": {
+        "command-line-args": "bin/cli.js"
+      }
+    },
+    "node_modules/commander": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/constant-case": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
+      "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
+      "dev": true,
+      "dependencies": {
+        "snake-case": "^2.1.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-hash": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz",
+      "integrity": "sha512-FvIQKy0S1JaWV10sMsA7TRx8bpU+pqPkhbsfvOJAdjRXvYxEckAwQWGwtRjiaJfh+E0DvcWUGqcdjwMGFjsSdw==",
+      "dev": true,
+      "dependencies": {
+        "cids": "^0.7.1",
+        "multicodec": "^0.5.5",
+        "multihashes": "^0.4.15"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "node_modules/cookiejar": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
+      "dev": true
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz",
+      "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==",
+      "dev": true,
+      "dependencies": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.3.1"
+      },
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/crypto-addr-codec": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/crypto-addr-codec/-/crypto-addr-codec-0.1.7.tgz",
+      "integrity": "sha512-X4hzfBzNhy4mAc3UpiXEC/L0jo5E8wAa9unsnA8nNXYzXjCcGk83hfC5avJWCSGT8V91xMnAS9AKMHmjw5+XCg==",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "big-integer": "1.6.36",
+        "blakejs": "^1.1.0",
+        "bs58": "^4.0.1",
+        "ripemd160-min": "0.0.6",
+        "safe-buffer": "^5.2.0",
+        "sha3": "^2.1.1"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.0.1.tgz",
+      "integrity": "sha512-z93ZGFLNc6yaoXAmVhqoSIb+BduplteCt1fepvwhBUQK6MNE4g6fgjpuZKJKp0esUe+vXWlIkwZZjNWoOKw0ZA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delimit-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/delimit-stream/-/delimit-stream-0.1.0.tgz",
+      "integrity": "sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs=",
+      "dev": true
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "node_modules/detect-indent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
+      "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "node_modules/domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz",
+      "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.59",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.59.tgz",
+      "integrity": "sha512-cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eth-ens-namehash": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz",
+      "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=",
+      "dev": true,
+      "dependencies": {
+        "idna-uts46-hx": "^2.3.1",
+        "js-sha3": "^0.5.7"
+      }
+    },
+    "node_modules/eth-ens-namehash/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter": {
+      "version": "0.2.25",
+      "resolved": "https://registry.npmjs.org/eth-gas-reporter/-/eth-gas-reporter-0.2.25.tgz",
+      "integrity": "sha512-1fRgyE4xUB8SoqLgN3eDfpDfwEfRxh2Sz1b7wzFbyQA+9TekMmvSjjoRu9SKcSVyK+vLkLIsVbJDsTWjw195OQ==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "^5.0.0-beta.146",
+        "@solidity-parser/parser": "^0.14.0",
+        "cli-table3": "^0.5.0",
+        "colors": "1.4.0",
+        "ethereum-cryptography": "^1.0.3",
+        "ethers": "^4.0.40",
+        "fs-readdir-recursive": "^1.1.0",
+        "lodash": "^4.17.14",
+        "markdown-table": "^1.1.3",
+        "mocha": "^7.1.1",
+        "req-cwd": "^2.0.0",
+        "request": "^2.88.0",
+        "request-promise-native": "^1.0.5",
+        "sha1": "^1.1.1",
+        "sync-request": "^6.0.0"
+      },
+      "peerDependencies": {
+        "@codechecks/client": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@codechecks/client": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/chokidar": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.2.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.1"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/ethereum-cryptography": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.0.3.tgz",
+      "integrity": "sha512-NQLTW0x0CosoVb/n79x/TRHtfvS3hgNUPTUSCu0vM+9k6IIhHFFrAOJReneexjZsoZxMjJHnJn4lrE8EbnSyqQ==",
+      "dev": true,
+      "dependencies": {
+        "@noble/hashes": "1.0.0",
+        "@noble/secp256k1": "1.5.5",
+        "@scure/bip32": "1.0.1",
+        "@scure/bip39": "1.0.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/ethers": {
+      "version": "4.0.49",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.49.tgz",
+      "integrity": "sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg==",
+      "dev": true,
+      "dependencies": {
+        "aes-js": "3.0.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.3",
+        "js-sha3": "0.5.7",
+        "scrypt-js": "2.0.4",
+        "setimmediate": "1.0.4",
+        "uuid": "2.0.1",
+        "xmlhttprequest": "1.8.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/flat": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
+      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "~2.0.3"
+      },
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/mocha": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
+      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.3.0",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "3.0.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.5",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.6",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/readdirp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/scrypt-js": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz",
+      "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/setimmediate": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+      "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/supports-color": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/uuid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+      "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/eth-gas-reporter/node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/eth-gas-reporter/node_modules/yargs-unparser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "dev": true,
+      "dependencies": {
+        "flat": "^4.1.0",
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eth-lib": {
+      "version": "0.1.29",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.29.tgz",
+      "integrity": "sha512-bfttrr3/7gG4E02HoWTDUcDDslN003OlOoBxk9virpAZQ1ja/jDgwkWB8QfJF7ojuEowrqy+lzp9VcJG7/k5bQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "nano-json-stream-parser": "^0.1.2",
+        "servify": "^0.1.12",
+        "ws": "^3.0.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/eth-lib/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/eth-lib/node_modules/ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "dev": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "node_modules/ethereum-bloom-filters": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.10.tgz",
+      "integrity": "sha512-rxJ5OFN3RwjQxDcFP2Z5+Q9ho4eIdEmSc2ht0fCu8Se9nbXjZ7/031uXoUYJ87KHCOdVeiUuwSnoS7hmYAGVHA==",
+      "dev": true,
+      "dependencies": {
+        "js-sha3": "^0.8.0"
+      }
+    },
+    "node_modules/ethereum-cryptography": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+      "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/pbkdf2": "^3.0.0",
+        "@types/secp256k1": "^4.0.1",
+        "blakejs": "^1.1.0",
+        "browserify-aes": "^1.2.0",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash.js": "^1.1.7",
+        "keccak": "^3.0.0",
+        "pbkdf2": "^3.0.17",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.1.2",
+        "scrypt-js": "^3.0.0",
+        "secp256k1": "^4.0.1",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "node_modules/ethereum-ens": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/ethereum-ens/-/ethereum-ens-0.8.0.tgz",
+      "integrity": "sha512-a8cBTF4AWw1Q1Y37V1LSCS9pRY4Mh3f8vCg5cbXCCEJ3eno1hbI/+Ccv9SZLISYpqQhaglP3Bxb/34lS4Qf7Bg==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.4.7",
+        "eth-ens-namehash": "^2.0.0",
+        "js-sha3": "^0.5.7",
+        "pako": "^1.0.4",
+        "underscore": "^1.8.3",
+        "web3": "^1.0.0-beta.34"
+      }
+    },
+    "node_modules/ethereum-ens/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true
+    },
+    "node_modules/ethereum-waffle": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-3.4.4.tgz",
+      "integrity": "sha512-PA9+jCjw4WC3Oc5ocSMBj5sXvueWQeAbvCA+hUlb6oFgwwKyq5ka3bWQ7QZcjzIX+TdFkxP4IbFmoY2D8Dkj9Q==",
+      "dev": true,
+      "dependencies": {
+        "@ethereum-waffle/chai": "^3.4.4",
+        "@ethereum-waffle/compiler": "^3.4.4",
+        "@ethereum-waffle/mock-contract": "^3.4.4",
+        "@ethereum-waffle/provider": "^3.4.4",
+        "ethers": "^5.0.1"
+      },
+      "bin": {
+        "waffle": "bin/waffle"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ethereumjs-common": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz",
+      "integrity": "sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/common. Please update.",
+      "dev": true
+    },
+    "node_modules/ethereumjs-tx": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
+      "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ethereumjs-tx/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ethereumjs-tx/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ethereumjs-util": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.4.tgz",
+      "integrity": "sha512-p6KmuPCX4mZIqsQzXfmSx9Y0l2hqf+VkAiwSisW3UKUFdk8ZkAt+AYaor83z2nSi6CU2zSsXMlD80hAbNEGM0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^5.1.0",
+        "bn.js": "^5.1.2",
+        "create-hash": "^1.1.2",
+        "ethereum-cryptography": "^0.1.3",
+        "rlp": "^2.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/ethereumjs-util/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/ethers": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.6.2.tgz",
+      "integrity": "sha512-EzGCbns24/Yluu7+ToWnMca3SXJ1Jk1BvWB7CCmVNxyOeM4LLvw2OLuIHhlkhQk1dtOcj9UMsdkxUh8RiG1dxQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abi": "5.6.0",
+        "@ethersproject/abstract-provider": "5.6.0",
+        "@ethersproject/abstract-signer": "5.6.0",
+        "@ethersproject/address": "5.6.0",
+        "@ethersproject/base64": "5.6.0",
+        "@ethersproject/basex": "5.6.0",
+        "@ethersproject/bignumber": "5.6.0",
+        "@ethersproject/bytes": "5.6.1",
+        "@ethersproject/constants": "5.6.0",
+        "@ethersproject/contracts": "5.6.0",
+        "@ethersproject/hash": "5.6.0",
+        "@ethersproject/hdnode": "5.6.0",
+        "@ethersproject/json-wallets": "5.6.0",
+        "@ethersproject/keccak256": "5.6.0",
+        "@ethersproject/logger": "5.6.0",
+        "@ethersproject/networks": "5.6.1",
+        "@ethersproject/pbkdf2": "5.6.0",
+        "@ethersproject/properties": "5.6.0",
+        "@ethersproject/providers": "5.6.2",
+        "@ethersproject/random": "5.6.0",
+        "@ethersproject/rlp": "5.6.0",
+        "@ethersproject/sha2": "5.6.0",
+        "@ethersproject/signing-key": "5.6.0",
+        "@ethersproject/solidity": "5.6.0",
+        "@ethersproject/strings": "5.6.0",
+        "@ethersproject/transactions": "5.6.0",
+        "@ethersproject/units": "5.6.0",
+        "@ethersproject/wallet": "5.6.0",
+        "@ethersproject/web": "5.6.0",
+        "@ethersproject/wordlists": "5.6.0"
+      }
+    },
+    "node_modules/ethjs-abi": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz",
+      "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "js-sha3": "0.5.5",
+        "number-to-bn": "1.7.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ethjs-abi/node_modules/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true
+    },
+    "node_modules/ethjs-abi/node_modules/js-sha3": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
+      "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=",
+      "dev": true
+    },
+    "node_modules/ethjs-unit": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz",
+      "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "number-to-bn": "1.7.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ethjs-unit/node_modules/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true
+    },
+    "node_modules/ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "dev": true
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
+      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.2",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.2",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.9.7",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.17.2",
+        "serve-static": "1.14.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/express/node_modules/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.5.0"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
+      "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/faker": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "dev": true
+    },
+    "node_modules/fast-check": {
+      "version": "2.23.2",
+      "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.23.2.tgz",
+      "integrity": "sha512-ECYuSlp6NLpvOj8eScKsqoz1ihtCpSDuEC2ofdGvgsEu1obHYEGqreJ/iPzkJFy73yoU0kCFea7PHUQDNM0VNg==",
+      "dev": true,
+      "dependencies": {
+        "pure-rand": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/fast-check"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/finalhandler/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/find-replace": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz",
+      "integrity": "sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A=",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^1.0.4",
+        "test-value": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/find-replace/node_modules/array-back": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
+      "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^4.0.2"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fp-ts": {
+      "version": "1.19.3",
+      "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-1.19.3.tgz",
+      "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==",
+      "dev": true
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
+    "node_modules/ganache-core": {
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/ganache-core/-/ganache-core-2.13.2.tgz",
+      "integrity": "sha512-tIF5cR+ANQz0+3pHWxHjIwHqFXcVo0Mb+kcsNhglNFALcYo49aQpnS9dqHartqPfMFjiHh/qFoD3mYK0d/qGgw==",
+      "bundleDependencies": [
+        "keccak"
+      ],
+      "deprecated": "ganache-core is now ganache; visit https://trfl.io/g7 for details",
+      "dev": true,
+      "hasShrinkwrap": true,
+      "dependencies": {
+        "abstract-leveldown": "3.0.0",
+        "async": "2.6.2",
+        "bip39": "2.5.0",
+        "cachedown": "1.0.0",
+        "clone": "2.1.2",
+        "debug": "3.2.6",
+        "encoding-down": "5.0.4",
+        "eth-sig-util": "3.0.0",
+        "ethereumjs-abi": "0.6.8",
+        "ethereumjs-account": "3.0.0",
+        "ethereumjs-block": "2.2.2",
+        "ethereumjs-common": "1.5.0",
+        "ethereumjs-tx": "2.1.2",
+        "ethereumjs-util": "6.2.1",
+        "ethereumjs-vm": "4.2.0",
+        "heap": "0.2.6",
+        "keccak": "3.0.1",
+        "level-sublevel": "6.6.4",
+        "levelup": "3.1.1",
+        "lodash": "4.17.20",
+        "lru-cache": "5.1.1",
+        "merkle-patricia-tree": "3.0.0",
+        "patch-package": "6.2.2",
+        "seedrandom": "3.0.1",
+        "source-map-support": "0.5.12",
+        "tmp": "0.1.0",
+        "web3-provider-engine": "14.2.1",
+        "websocket": "1.0.32"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      },
+      "optionalDependencies": {
+        "ethereumjs-wallet": "0.6.5",
+        "web3": "1.2.11"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/abi": {
+      "version": "5.0.0-beta.153",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz",
+      "integrity": "sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/address": ">=5.0.0-beta.128",
+        "@ethersproject/bignumber": ">=5.0.0-beta.130",
+        "@ethersproject/bytes": ">=5.0.0-beta.129",
+        "@ethersproject/constants": ">=5.0.0-beta.128",
+        "@ethersproject/hash": ">=5.0.0-beta.128",
+        "@ethersproject/keccak256": ">=5.0.0-beta.127",
+        "@ethersproject/logger": ">=5.0.0-beta.129",
+        "@ethersproject/properties": ">=5.0.0-beta.131",
+        "@ethersproject/strings": ">=5.0.0-beta.130"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/abstract-provider": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.0.8.tgz",
+      "integrity": "sha512-fqJXkewcGdi8LogKMgRyzc/Ls2js07yor7+g9KfPs09uPOcQLg7cc34JN+lk34HH9gg2HU0DIA5797ZR8znkfw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.0.13",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/networks": "^5.0.7",
+        "@ethersproject/properties": "^5.0.7",
+        "@ethersproject/transactions": "^5.0.9",
+        "@ethersproject/web": "^5.0.12"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/abstract-signer": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.10.tgz",
+      "integrity": "sha512-irx7kH7FDAeW7QChDPW19WsxqeB1d3XLyOLSXm0bfPqL1SS07LXWltBJUBUxqC03ORpAOcM3JQj57DU8JnVY2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.0.8",
+        "@ethersproject/bignumber": "^5.0.13",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/properties": "^5.0.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/address": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.0.9.tgz",
+      "integrity": "sha512-gKkmbZDMyGbVjr8nA5P0md1GgESqSGH7ILIrDidPdNXBl4adqbuA3OAuZx/O2oGpL6PtJ9BDa0kHheZ1ToHU3w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.0.13",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/keccak256": "^5.0.7",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/rlp": "^5.0.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/base64": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.7.tgz",
+      "integrity": "sha512-S5oh5DVfCo06xwJXT8fQC68mvJfgScTl2AXvbYMsHNfIBTDb084Wx4iA9MNlEReOv6HulkS+gyrUM/j3514rSw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/bignumber": {
+      "version": "5.0.13",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.13.tgz",
+      "integrity": "sha512-b89bX5li6aK492yuPP5mPgRVgIxxBP7ksaBtKX5QQBsrZTpNOjf/MR4CjcUrAw8g+RQuD6kap9lPjFgY4U1/5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8",
+        "bn.js": "^4.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/bytes": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.0.9.tgz",
+      "integrity": "sha512-k+17ZViDtAugC0s7HM6rdsTWEdIYII4RPCDkPEuxKc6i40Bs+m6tjRAtCECX06wKZnrEoR9pjOJRXHJ/VLoOcA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/logger": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/constants": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.0.8.tgz",
+      "integrity": "sha512-sCc73pFBsl59eDfoQR5OCEZCRv5b0iywadunti6MQIr5lt3XpwxK1Iuzd8XSFO02N9jUifvuZRrt0cY0+NBgTg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.0.13"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/hash": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.0.10.tgz",
+      "integrity": "sha512-Tf0bvs6YFhw28LuHnhlDWyr0xfcDxSXdwM4TcskeBbmXVSKLv3bJQEEEBFUcRX0fJuslR3gCVySEaSh7vuMx5w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.0.10",
+        "@ethersproject/address": "^5.0.9",
+        "@ethersproject/bignumber": "^5.0.13",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/keccak256": "^5.0.7",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/properties": "^5.0.7",
+        "@ethersproject/strings": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/keccak256": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.0.7.tgz",
+      "integrity": "sha512-zpUBmofWvx9PGfc7IICobgFQSgNmTOGTGLUxSYqZzY/T+b4y/2o5eqf/GGmD7qnTGzKQ42YlLNo+LeDP2qe55g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9",
+        "js-sha3": "0.5.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/logger": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.8.tgz",
+      "integrity": "sha512-SkJCTaVTnaZ3/ieLF5pVftxGEFX56pTH+f2Slrpv7cU0TNpUZNib84QQdukd++sWUp/S7j5t5NW+WegbXd4U/A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/networks": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.0.7.tgz",
+      "integrity": "sha512-dI14QATndIcUgcCBL1c5vUr/YsI5cCHLN81rF7PU+yS7Xgp2/Rzbr9+YqpC6NBXHFUASjh6GpKqsVMpufAL0BQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/logger": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/properties": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.7.tgz",
+      "integrity": "sha512-812H1Rus2vjw0zbasfDI1GLNPDsoyX1pYqiCgaR1BuyKxUTbwcH1B+214l6VGe1v+F6iEVb7WjIwMjKhb4EUsg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/logger": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/rlp": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.0.7.tgz",
+      "integrity": "sha512-ulUTVEuV7PT4jJTPpfhRHK57tkLEDEY9XSYJtrSNHOqdwMvH0z7BM2AKIMq4LVDlnu4YZASdKrkFGEIO712V9w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/signing-key": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.8.tgz",
+      "integrity": "sha512-YKxQM45eDa6WAD+s3QZPdm1uW1MutzVuyoepdRRVmMJ8qkk7iOiIhUkZwqKLNxKzEJijt/82ycuOREc9WBNAKg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/properties": "^5.0.7",
+        "elliptic": "6.5.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/strings": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.0.8.tgz",
+      "integrity": "sha512-5IsdXf8tMY8QuHl8vTLnk9ehXDDm6x9FB9S9Og5IA1GYhLe5ZewydXSjlJlsqU2t9HRbfv97OJZV/pX8DVA/Hw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/constants": "^5.0.8",
+        "@ethersproject/logger": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/transactions": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.9.tgz",
+      "integrity": "sha512-0Fu1yhdFBkrbMjenEr+39tmDxuHmaw0pe9Jb18XuKoItj7Z3p7+UzdHLr2S/okvHDHYPbZE5gtANDdQ3ZL1nBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.9",
+        "@ethersproject/bignumber": "^5.0.13",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/constants": "^5.0.8",
+        "@ethersproject/keccak256": "^5.0.7",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/properties": "^5.0.7",
+        "@ethersproject/rlp": "^5.0.7",
+        "@ethersproject/signing-key": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@ethersproject/web": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.12.tgz",
+      "integrity": "sha512-gVxS5iW0bgidZ76kr7LsTxj4uzN5XpCLzvZrLp8TP+4YgxHfCeetFyQkRPgBEAJdNrexdSBayvyJvzGvOq0O8g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/base64": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.9",
+        "@ethersproject/logger": "^5.0.8",
+        "@ethersproject/properties": "^5.0.7",
+        "@ethersproject/strings": "^5.0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "defer-to-connect": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@types/node": {
+      "version": "14.14.20",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
+      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/@types/pbkdf2": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
+      "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@types/secp256k1": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.1.tgz",
+      "integrity": "sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/abstract-leveldown": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
+      "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/aes-js": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz",
+      "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.11"
+      }
+    },
+    "node_modules/ganache-core/node_modules/async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-code-frame/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-core/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-core/node_modules/json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-core/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-core/node_modules/slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "dependencies": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-generator/node_modules/jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "dependencies": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-preset-env": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+        "babel-plugin-transform-es2015-classes": "^6.23.0",
+        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+        "babel-plugin-transform-es2015-for-of": "^6.23.0",
+        "babel-plugin-transform-es2015-function-name": "^6.22.0",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+        "babel-plugin-transform-es2015-object-super": "^6.22.0",
+        "babel-plugin-transform-es2015-parameters": "^6.23.0",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+        "babel-plugin-transform-regenerator": "^6.22.0",
+        "browserslist": "^3.2.6",
+        "invariant": "^2.2.2",
+        "semver": "^5.3.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-preset-env/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "dependencies": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-register/node_modules/source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.5.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-traverse/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-traverse/node_modules/globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-traverse/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babel-types/node_modules/to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babelify": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
+      "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
+      "dev": true,
+      "dependencies": {
+        "babel-core": "^6.0.14",
+        "object-assign": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/backoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
+      "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
+      "dev": true,
+      "dependencies": {
+        "precond": "0.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/base-x": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz",
+      "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ganache-core/node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bcrypt-pbkdf/node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/bignumber.js": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
+      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bip39": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.5.0.tgz",
+      "integrity": "sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.0",
+        "pbkdf2": "^3.0.9",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "unorm": "^1.3.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/blakejs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
+      "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/bn.js": {
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/body-parser/node_modules/qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserify-rsa/node_modules/bn.js": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserify-sign/node_modules/bn.js": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/browserslist": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000844",
+        "electron-to-chromium": "^1.3.47"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dev": true,
+      "dependencies": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/ganache-core/node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/buffer-to-arraybuffer": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz",
+      "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/bufferutil": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.3.tgz",
+      "integrity": "sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bytewise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz",
+      "integrity": "sha1-HRPL/3F65xWAlKqIGzXQgbOHJT4=",
+      "dev": true,
+      "dependencies": {
+        "bytewise-core": "^1.2.2",
+        "typewise": "^1.0.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/bytewise-core": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz",
+      "integrity": "sha1-P7QQx+kVWOsasiqCg0V3qmvWHUI=",
+      "dev": true,
+      "dependencies": {
+        "typewise-core": "^1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cacheable-request/node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cachedown": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cachedown/-/cachedown-1.0.0.tgz",
+      "integrity": "sha1-1D8DbkUQaWsxJG19sx6/D3rDLRU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "^2.4.1",
+        "lru-cache": "^3.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cachedown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cachedown/node_modules/lru-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+      "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
+      "dev": true,
+      "dependencies": {
+        "pseudomap": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/caniuse-lite": {
+      "version": "1.0.30001174",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001174.tgz",
+      "integrity": "sha512-tqClL/4ThQq6cfFXH3oJL4rifFBeM6gTkphjao5kgwMaW9yn0tKgQLAEfKzDwj6HQWCB/aWo8kTFlSvIN8geEA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/checkpoint-store": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/checkpoint-store/-/checkpoint-store-1.1.0.tgz",
+      "integrity": "sha1-BOTLUWuRQziTWB5tRgGnjpVS6gY=",
+      "dev": true,
+      "dependencies": {
+        "functional-red-black-tree": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/cids": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/cids/-/cids-0.7.5.tgz",
+      "integrity": "sha512-zT7mPeghoWAu+ppn8+BS1tQ5qGmbMfB4AregnQjA/qHY3GC1m1ptI9GkWNlgeu38r7CuRdXB47uY2XgAYt6QVA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "class-is": "^1.1.0",
+        "multibase": "~0.6.0",
+        "multicodec": "^1.0.0",
+        "multihashes": "~0.4.15"
+      },
+      "engines": {
+        "node": ">=4.0.0",
+        "npm": ">=3.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cids/node_modules/multicodec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
+      "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.6.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-is": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz",
+      "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/class-utils/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/content-hash": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz",
+      "integrity": "sha512-FvIQKy0S1JaWV10sMsA7TRx8bpU+pqPkhbsfvOJAdjRXvYxEckAwQWGwtRjiaJfh+E0DvcWUGqcdjwMGFjsSdw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "cids": "^0.7.1",
+        "multicodec": "^0.5.5",
+        "multihashes": "^0.4.15"
+      }
+    },
+    "node_modules/ganache-core/node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/convert-source-map/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/ganache-core/node_modules/core-js-pure": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.2.tgz",
+      "integrity": "sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw==",
+      "deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/cross-fetch": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.3.tgz",
+      "integrity": "sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.1.2",
+        "whatwg-fetch": "2.0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "dependencies": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/deferred-leveldown": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz",
+      "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~5.0.0",
+        "inherits": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/deferred-leveldown/node_modules/abstract-leveldown": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz",
+      "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/dotignore": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz",
+      "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^3.0.4"
+      },
+      "bin": {
+        "ignored": "bin/ignored"
+      }
+    },
+    "node_modules/ganache-core/node_modules/duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/electron-to-chromium": {
+      "version": "1.3.636",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.636.tgz",
+      "integrity": "sha512-Adcvng33sd3gTjNIDNXGD1G4H6qCImIy2euUJAQHtLNplEKU5WEz5KRJxupRNIIT8sD5oFZLTKBWAf12Bsz24A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/elliptic": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/encoding-down": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz",
+      "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "^5.0.0",
+        "inherits": "^2.0.3",
+        "level-codec": "^9.0.0",
+        "level-errors": "^2.0.0",
+        "xtend": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/encoding-down/node_modules/abstract-leveldown": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz",
+      "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/es-abstract": {
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-block-tracker": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.1.tgz",
+      "integrity": "sha512-WUVxWLuhMmsfenfZvFO5sbl1qFY2IqUlw/FPVmjjdElpqLsZtSG+wPe9Dz7W/sB6e80HgFKknOmKk2eNlznHug==",
+      "dev": true,
+      "dependencies": {
+        "eth-query": "^2.1.0",
+        "ethereumjs-tx": "^1.3.3",
+        "ethereumjs-util": "^5.1.3",
+        "ethjs-util": "^0.1.3",
+        "json-rpc-engine": "^3.6.0",
+        "pify": "^2.3.0",
+        "tape": "^4.6.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-block-tracker/node_modules/ethereumjs-tx": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz",
+      "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereum-common": "^0.0.18",
+        "ethereumjs-util": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-block-tracker/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-block-tracker/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-ens-namehash": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz",
+      "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "idna-uts46-hx": "^2.3.1",
+        "js-sha3": "^0.5.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-infura": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz",
+      "integrity": "sha512-W7zR4DZvyTn23Bxc0EWsq4XGDdD63+XPUCEhV2zQvQGavDVC4ZpFDK4k99qN7bd7/fjj37+rxmuBOBeIqCA5Mw==",
+      "dev": true,
+      "dependencies": {
+        "cross-fetch": "^2.1.1",
+        "eth-json-rpc-middleware": "^1.5.0",
+        "json-rpc-engine": "^3.4.0",
+        "json-rpc-error": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-1.6.0.tgz",
+      "integrity": "sha512-tDVCTlrUvdqHKqivYMjtFZsdD7TtpNLBCfKAcOpaVs7orBMS/A8HWro6dIzNtTZIR05FAbJ3bioFOnZpuCew9Q==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.5.0",
+        "eth-query": "^2.1.2",
+        "eth-tx-summary": "^3.1.2",
+        "ethereumjs-block": "^1.6.0",
+        "ethereumjs-tx": "^1.3.3",
+        "ethereumjs-util": "^5.1.2",
+        "ethereumjs-vm": "^2.1.0",
+        "fetch-ponyfill": "^4.0.0",
+        "json-rpc-engine": "^3.6.0",
+        "json-rpc-error": "^2.0.0",
+        "json-stable-stringify": "^1.0.1",
+        "promise-to-callback": "^1.0.0",
+        "tape": "^4.6.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/abstract-leveldown": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
+      "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/deferred-leveldown": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
+      "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-account": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz",
+      "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-util": "^5.0.0",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-block": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz",
+      "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereum-common": "0.2.0",
+        "ethereumjs-tx": "^1.2.2",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-block/node_modules/ethereum-common": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz",
+      "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-tx": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz",
+      "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereum-common": "^0.0.18",
+        "ethereumjs-util": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-vm": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz",
+      "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/vm. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "async-eventemitter": "^0.2.2",
+        "ethereumjs-account": "^2.0.3",
+        "ethereumjs-block": "~2.2.0",
+        "ethereumjs-common": "^1.1.0",
+        "ethereumjs-util": "^6.0.0",
+        "fake-merkle-patricia-tree": "^1.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "merkle-patricia-tree": "^2.3.2",
+        "rustbn.js": "~0.2.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-vm/node_modules/ethereumjs-block": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz",
+      "integrity": "sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-tx": "^2.1.1",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-vm/node_modules/ethereumjs-block/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-vm/node_modules/ethereumjs-tx": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
+      "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ethereumjs-vm/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-errors": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
+      "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-iterator-stream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz",
+      "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "level-errors": "^1.0.3",
+        "readable-stream": "^1.0.33",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-iterator-stream/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-ws": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz",
+      "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.15",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-ws/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/level-ws/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/levelup": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
+      "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~1.2.1",
+        "level-codec": "~7.0.0",
+        "level-errors": "~1.0.3",
+        "level-iterator-stream": "~1.3.0",
+        "prr": "~1.0.1",
+        "semver": "~5.4.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/memdown": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
+      "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.7.1",
+        "functional-red-black-tree": "^1.0.1",
+        "immediate": "^3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/merkle-patricia-tree": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz",
+      "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==",
+      "dev": true,
+      "dependencies": {
+        "async": "^1.4.2",
+        "ethereumjs-util": "^5.0.0",
+        "level-ws": "0.0.0",
+        "levelup": "^1.2.1",
+        "memdown": "^1.0.0",
+        "readable-stream": "^2.0.0",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/merkle-patricia-tree/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-json-rpc-middleware/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-lib": {
+      "version": "0.1.29",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.29.tgz",
+      "integrity": "sha512-bfttrr3/7gG4E02HoWTDUcDDslN003OlOoBxk9virpAZQ1ja/jDgwkWB8QfJF7ojuEowrqy+lzp9VcJG7/k5bQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "nano-json-stream-parser": "^0.1.2",
+        "servify": "^0.1.12",
+        "ws": "^3.0.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-query": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/eth-query/-/eth-query-2.1.2.tgz",
+      "integrity": "sha1-1nQdkAAQa1FRDHLbktY2VFam2l4=",
+      "dev": true,
+      "dependencies": {
+        "json-rpc-random-id": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-sig-util": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-3.0.0.tgz",
+      "integrity": "sha512-4eFkMOhpGbTxBQ3AMzVf0haUX2uTur7DpWiHzWyTURa28BVJJtOkcb9Ok5TV0YvEPG61DODPW7ZUATbJTslioQ==",
+      "deprecated": "Deprecated in favor of '@metamask/eth-sig-util'",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "elliptic": "^6.4.0",
+        "ethereumjs-abi": "0.6.5",
+        "ethereumjs-util": "^5.1.1",
+        "tweetnacl": "^1.0.0",
+        "tweetnacl-util": "^0.15.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-sig-util/node_modules/ethereumjs-abi": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz",
+      "integrity": "sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.10.0",
+        "ethereumjs-util": "^4.3.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-sig-util/node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.1.tgz",
+      "integrity": "sha512-WrckOZ7uBnei4+AKimpuF1B3Fv25OmoRgmYCpGsP7u8PFxXAmAgiJSYT2kRWnt6fVIlKaQlZvuwXp7PIrmn3/w==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.8.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "rlp": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-sig-util/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/eth-tx-summary/-/eth-tx-summary-3.2.4.tgz",
+      "integrity": "sha512-NtlDnaVZah146Rm8HMRUNMgIwG/ED4jiqk0TME9zFheMl1jOp6jL1m0NKGjJwehXQ6ZKCPr16MTr+qspKpEXNg==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "clone": "^2.0.0",
+        "concat-stream": "^1.5.1",
+        "end-of-stream": "^1.1.0",
+        "eth-query": "^2.0.2",
+        "ethereumjs-block": "^1.4.1",
+        "ethereumjs-tx": "^1.1.1",
+        "ethereumjs-util": "^5.0.1",
+        "ethereumjs-vm": "^2.6.0",
+        "through2": "^2.0.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/abstract-leveldown": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
+      "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/deferred-leveldown": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
+      "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-account": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz",
+      "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-util": "^5.0.0",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-block": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz",
+      "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereum-common": "0.2.0",
+        "ethereumjs-tx": "^1.2.2",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-block/node_modules/ethereum-common": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz",
+      "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-tx": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz",
+      "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereum-common": "^0.0.18",
+        "ethereumjs-util": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-vm": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz",
+      "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/vm. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "async-eventemitter": "^0.2.2",
+        "ethereumjs-account": "^2.0.3",
+        "ethereumjs-block": "~2.2.0",
+        "ethereumjs-common": "^1.1.0",
+        "ethereumjs-util": "^6.0.0",
+        "fake-merkle-patricia-tree": "^1.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "merkle-patricia-tree": "^2.3.2",
+        "rustbn.js": "~0.2.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-vm/node_modules/ethereumjs-block": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz",
+      "integrity": "sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-tx": "^2.1.1",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-vm/node_modules/ethereumjs-block/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-vm/node_modules/ethereumjs-tx": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
+      "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ethereumjs-vm/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-errors": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
+      "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-iterator-stream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz",
+      "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "level-errors": "^1.0.3",
+        "readable-stream": "^1.0.33",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-iterator-stream/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-ws": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz",
+      "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.15",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-ws/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/level-ws/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/levelup": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
+      "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~1.2.1",
+        "level-codec": "~7.0.0",
+        "level-errors": "~1.0.3",
+        "level-iterator-stream": "~1.3.0",
+        "prr": "~1.0.1",
+        "semver": "~5.4.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/memdown": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
+      "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.7.1",
+        "functional-red-black-tree": "^1.0.1",
+        "immediate": "^3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/merkle-patricia-tree": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz",
+      "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==",
+      "dev": true,
+      "dependencies": {
+        "async": "^1.4.2",
+        "ethereumjs-util": "^5.0.0",
+        "level-ws": "0.0.0",
+        "levelup": "^1.2.1",
+        "memdown": "^1.0.0",
+        "readable-stream": "^2.0.0",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/merkle-patricia-tree/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eth-tx-summary/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethashjs": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ethashjs/-/ethashjs-0.0.8.tgz",
+      "integrity": "sha512-/MSbf/r2/Ld8o0l15AymjOTlPqpN8Cr4ByUEA9GtR4x0yAh3TdtDzEg29zMjXCNPI7u6E5fOQdj/Cf9Tc7oVNw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/ethash. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "buffer-xor": "^2.0.1",
+        "ethereumjs-util": "^7.0.2",
+        "miller-rabin": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethashjs/node_modules/bn.js": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethashjs/node_modules/buffer-xor": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
+      "integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethashjs/node_modules/ethereumjs-util": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.7.tgz",
+      "integrity": "sha512-vU5rtZBlZsgkTw3o6PDKyB8li2EgLavnAbsKcfsH2YhHH1Le+PP8vEiMnAnvgc1B6uMoaM5GDCrVztBw0Q5K9g==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^5.1.2",
+        "create-hash": "^1.1.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereum-bloom-filters": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz",
+      "integrity": "sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "js-sha3": "^0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereum-bloom-filters/node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ethereum-common": {
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
+      "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereum-cryptography": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+      "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/pbkdf2": "^3.0.0",
+        "@types/secp256k1": "^4.0.1",
+        "blakejs": "^1.1.0",
+        "browserify-aes": "^1.2.0",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash.js": "^1.1.7",
+        "keccak": "^3.0.0",
+        "pbkdf2": "^3.0.17",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.1.2",
+        "scrypt-js": "^3.0.0",
+        "secp256k1": "^4.0.1",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-account": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-3.0.0.tgz",
+      "integrity": "sha512-WP6BdscjiiPkQfF9PVfMcwx/rDvfZTjFKY0Uwc09zSQr9JfIVH87dYIJu0gNhBhpmovV4yq295fdllS925fnBA==",
+      "deprecated": "Please use Util.Account class found on package ethereumjs-util@^7.0.6 https://github.com/ethereumjs/ethereumjs-util/releases/tag/v7.0.6",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-util": "^6.0.0",
+        "rlp": "^2.2.1",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz",
+      "integrity": "sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-tx": "^2.1.1",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/abstract-leveldown": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
+      "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/deferred-leveldown": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
+      "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-errors": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
+      "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-iterator-stream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz",
+      "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "level-errors": "^1.0.3",
+        "readable-stream": "^1.0.33",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-iterator-stream/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-ws": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz",
+      "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.15",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-ws/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/level-ws/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/levelup": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
+      "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~1.2.1",
+        "level-codec": "~7.0.0",
+        "level-errors": "~1.0.3",
+        "level-iterator-stream": "~1.3.0",
+        "prr": "~1.0.1",
+        "semver": "~5.4.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/memdown": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
+      "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.7.1",
+        "functional-red-black-tree": "^1.0.1",
+        "immediate": "^3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/merkle-patricia-tree": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz",
+      "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==",
+      "dev": true,
+      "dependencies": {
+        "async": "^1.4.2",
+        "ethereumjs-util": "^5.0.0",
+        "level-ws": "0.0.0",
+        "levelup": "^1.2.1",
+        "memdown": "^1.0.0",
+        "readable-stream": "^2.0.0",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/merkle-patricia-tree/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-block/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-blockchain": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/ethereumjs-blockchain/-/ethereumjs-blockchain-4.0.4.tgz",
+      "integrity": "sha512-zCxaRMUOzzjvX78DTGiKjA+4h2/sF0OYL1QuPux0DHpyq8XiNoF5GYHtb++GUxVlMsMfZV7AVyzbtgcRdIcEPQ==",
+      "deprecated": "New package name format for new versions: @ethereumjs/blockchain. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.6.1",
+        "ethashjs": "~0.0.7",
+        "ethereumjs-block": "~2.2.2",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.1.0",
+        "flow-stoplight": "^1.0.0",
+        "level-mem": "^3.0.1",
+        "lru-cache": "^5.1.1",
+        "rlp": "^2.2.2",
+        "semaphore": "^1.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-common": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.0.tgz",
+      "integrity": "sha512-SZOjgK1356hIY7MRj3/ma5qtfr/4B5BL+G4rP/XSMYr2z1H5el4RX5GReYCKmQmYI/nSBmRnwrZ17IfHuG0viQ==",
+      "deprecated": "New package name format for new versions: @ethereumjs/common. Please update.",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-tx": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
+      "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz",
+      "integrity": "sha512-X6qqZbsY33p5FTuZqCnQ4+lo957iUJMM6Mpa6bL4UW0dxM6WmDSHuI4j/zOp1E2TDKImBGCJA9QPfc08PaNubA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/vm. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "async-eventemitter": "^0.2.2",
+        "core-js-pure": "^3.0.1",
+        "ethereumjs-account": "^3.0.0",
+        "ethereumjs-block": "^2.2.2",
+        "ethereumjs-blockchain": "^4.0.3",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-tx": "^2.1.2",
+        "ethereumjs-util": "^6.2.0",
+        "fake-merkle-patricia-tree": "^1.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "merkle-patricia-tree": "^2.3.2",
+        "rustbn.js": "~0.2.0",
+        "safe-buffer": "^5.1.1",
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/abstract-leveldown": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
+      "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/deferred-leveldown": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
+      "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-errors": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
+      "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-iterator-stream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz",
+      "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "level-errors": "^1.0.3",
+        "readable-stream": "^1.0.33",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-iterator-stream/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-ws": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz",
+      "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.15",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-ws/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/level-ws/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/levelup": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
+      "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~1.2.1",
+        "level-codec": "~7.0.0",
+        "level-errors": "~1.0.3",
+        "level-iterator-stream": "~1.3.0",
+        "prr": "~1.0.1",
+        "semver": "~5.4.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/memdown": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
+      "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.7.1",
+        "functional-red-black-tree": "^1.0.1",
+        "immediate": "^3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/merkle-patricia-tree": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz",
+      "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==",
+      "dev": true,
+      "dependencies": {
+        "async": "^1.4.2",
+        "ethereumjs-util": "^5.0.0",
+        "level-ws": "0.0.0",
+        "levelup": "^1.2.1",
+        "memdown": "^1.0.0",
+        "readable-stream": "^2.0.0",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/merkle-patricia-tree/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/merkle-patricia-tree/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-vm/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ethereumjs-wallet": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.5.tgz",
+      "integrity": "sha512-MDwjwB9VQVnpp/Dc1XzA6J1a3wgHQ4hSvA1uWNatdpOrtCbPVuQSKSyRnjLvS0a+KKMw2pvQ9Ybqpb3+eW8oNA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "aes-js": "^3.1.1",
+        "bs58check": "^2.1.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethereumjs-util": "^6.0.0",
+        "randombytes": "^2.0.6",
+        "safe-buffer": "^5.1.2",
+        "scryptsy": "^1.2.1",
+        "utf8": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethjs-unit": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz",
+      "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "number-to-bn": "1.7.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ethjs-unit/node_modules/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/eventemitter3": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/events": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/express/node_modules/qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/express/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ext/node_modules/type": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/ganache-core/node_modules/fake-merkle-patricia-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fake-merkle-patricia-tree/-/fake-merkle-patricia-tree-1.0.1.tgz",
+      "integrity": "sha1-S4w6z7Ugr635hgsfFM2M40As3dM=",
+      "dev": true,
+      "dependencies": {
+        "checkpoint-store": "^1.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/fetch-ponyfill": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz",
+      "integrity": "sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "~1.7.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fetch-ponyfill/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fetch-ponyfill/node_modules/node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "dev": true,
+      "dependencies": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz",
+      "integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==",
+      "dev": true,
+      "dependencies": {
+        "fs-extra": "^4.0.3",
+        "micromatch": "^3.1.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/find-yarn-workspace-root/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/flow-stoplight": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/flow-stoplight/-/flow-stoplight-1.0.0.tgz",
+      "integrity": "sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/ganache-core/node_modules/forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/get-intrinsic": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
+      "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ganache-core/node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "dependencies": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/got/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "has-symbol-support-x": "^1.4.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-values/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/heap": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz",
+      "integrity": "sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/http-errors/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/http-https": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
+      "integrity": "sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/ganache-core/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/idna-uts46-hx": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz",
+      "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "punycode": "2.1.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/idna-uts46-hx/node_modules/punycode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+      "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ganache-core/node_modules/immediate": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
+      "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-arguments": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-fn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fn/-/is-fn-1.0.0.tgz",
+      "integrity": "sha1-lUPV3nvPWwiiLsiiC65uKG1RDYw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/is-hex-prefixed": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
+      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true,
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/js-sha3": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+      "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/json-rpc-engine": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz",
+      "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "babel-preset-env": "^1.7.0",
+        "babelify": "^7.3.0",
+        "json-rpc-error": "^2.0.0",
+        "promise-to-callback": "^1.0.0",
+        "safe-event-emitter": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/json-rpc-error": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/json-rpc-error/-/json-rpc-error-2.0.0.tgz",
+      "integrity": "sha1-p6+cICg4tekFxyUOVH8a/3cligI=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/json-rpc-random-id": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz",
+      "integrity": "sha1-uknZat7RRE27jaPSA3SKy7zeyMg=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "dependencies": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/keccak": {
+      "version": "3.0.1",
+      "dev": true,
+      "hasInstallScript": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/klaw-sync": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-codec": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
+      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
+      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-iterator-stream": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz",
+      "integrity": "sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.5",
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-mem": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-3.0.1.tgz",
+      "integrity": "sha512-LbtfK9+3Ug1UmvvhR2DqLqXiPW1OJ5jEh0a3m9ZgAipiwpSxGj/qaVVy54RG5vAQN1nCuXqjvprCuKSCxcJHBg==",
+      "dev": true,
+      "dependencies": {
+        "level-packager": "~4.0.0",
+        "memdown": "~3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-mem/node_modules/abstract-leveldown": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz",
+      "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-mem/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/level-mem/node_modules/memdown": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-3.0.0.tgz",
+      "integrity": "sha512-tbV02LfZMWLcHcq4tw++NuqMO+FZX8tNJEiD2aNRm48ZZusVg5N8NART+dmBkepJVye986oixErf7jfXboMGMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~5.0.0",
+        "functional-red-black-tree": "~1.0.1",
+        "immediate": "~3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-mem/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/level-packager": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-4.0.1.tgz",
+      "integrity": "sha512-svCRKfYLn9/4CoFfi+d8krOtrp6RoX8+xm0Na5cgXMqSyRru0AnDYdLl+YI8u1FyS6gGZ94ILLZDE5dh2but3Q==",
+      "dev": true,
+      "dependencies": {
+        "encoding-down": "~5.0.0",
+        "levelup": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-post": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz",
+      "integrity": "sha512-PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew==",
+      "dev": true,
+      "dependencies": {
+        "ltgt": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-sublevel": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.4.tgz",
+      "integrity": "sha512-pcCrTUOiO48+Kp6F1+UAzF/OtWqLcQVTVF39HLdZ3RO8XBoXt+XVPKZO1vVr1aUoxHZA9OtD2e1v7G+3S5KFDA==",
+      "dev": true,
+      "dependencies": {
+        "bytewise": "~1.1.0",
+        "level-codec": "^9.0.0",
+        "level-errors": "^2.0.0",
+        "level-iterator-stream": "^2.0.3",
+        "ltgt": "~2.1.1",
+        "pull-defer": "^0.2.2",
+        "pull-level": "^2.0.3",
+        "pull-stream": "^3.6.8",
+        "typewiselite": "~1.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/level-ws": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-1.0.0.tgz",
+      "integrity": "sha512-RXEfCmkd6WWFlArh3X8ONvQPm8jNpfA0s/36M4QzLqrLEIt1iJE9WBHLZ5vZJK6haMjJPJGJCQWfjMNnRcq/9Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.8",
+        "xtend": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/levelup": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz",
+      "integrity": "sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~4.0.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~3.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/levelup/node_modules/level-iterator-stream": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz",
+      "integrity": "sha512-nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/looper": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz",
+      "integrity": "sha1-Zs0Md0rz1P7axTeU90LbVtqPCew=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ltgt": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz",
+      "integrity": "sha1-EIUaBtmWS5cReEQcI8nlJpjuzjQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/merkle-patricia-tree": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-3.0.0.tgz",
+      "integrity": "sha512-soRaMuNf/ILmw3KWbybaCjhx86EYeBbD8ph0edQCTed0JN/rxDt1EBN52Ajre3VyGo+91f8+/rfPIRQnnGMqmQ==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.6.1",
+        "ethereumjs-util": "^5.2.0",
+        "level-mem": "^3.0.1",
+        "level-ws": "^1.0.0",
+        "readable-stream": "^3.0.6",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/merkle-patricia-tree/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/merkle-patricia-tree/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mime-db": {
+      "version": "1.45.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mime-types": {
+      "version": "2.1.28",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.45.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
+      "dependencies": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/minizlib/node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mkdirp-promise": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz",
+      "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=",
+      "deprecated": "This package is broken and no longer maintained. 'mkdirp' itself supports promises now, please switch to that.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "mkdirp": "*"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/mock-fs": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.13.0.tgz",
+      "integrity": "sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/multibase": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.6.1.tgz",
+      "integrity": "sha512-pFfAwyTjbbQgNc3G7D48JkJxWtoJoBMaR4xQUOuB8RnCgRqaYmWNFeJTTvrJ2w51bjLq2zTby6Rqj9TQ9elSUw==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/multicodec": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.7.tgz",
+      "integrity": "sha512-PscoRxm3f+88fAtELwUnZxGDkduE2HD9Q6GHUOywQLjOGT/HAdhjLDYNZ1e7VR0s0TP0EwZ16LNUTFpoBGivOA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/multihashes": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+      "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/multihashes/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/nano-json-stream-parser": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz",
+      "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/node-addon-api": {
+      "version": "2.0.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/ganache-core/node_modules/node-fetch": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
+      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/node-gyp-build": {
+      "version": "4.2.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/normalize-url": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/number-to-bn": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz",
+      "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/number-to-bn/node_modules/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-inspect": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-is": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz",
+      "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz",
+      "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/oboe": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.4.tgz",
+      "integrity": "sha1-IMiM2wwVNxuwQRklfU/dNLCqSfY=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "http-https": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/p-timeout": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/p-timeout/node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/parse-headers": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz",
+      "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz",
+      "integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==",
+      "dev": true,
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^1.2.1",
+        "fs-extra": "^7.0.1",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.0",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "npm": ">5"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/patch-package/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/ganache-core/node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/pbkdf2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/ganache-core/node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/precond": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
+      "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/promise-to-callback": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz",
+      "integrity": "sha1-XSp0kBC/tn2WNZj805YHRqaP7vc=",
+      "dev": true,
+      "dependencies": {
+        "is-fn": "^1.0.0",
+        "set-immediate-shim": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/pull-cat": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz",
+      "integrity": "sha1-tkLdElXaN2pwa220+pYvX9t0wxs=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/pull-defer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/pull-defer/-/pull-defer-0.2.3.tgz",
+      "integrity": "sha512-/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/pull-level": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz",
+      "integrity": "sha512-fW6pljDeUThpq5KXwKbRG3X7Ogk3vc75d5OQU/TvXXui65ykm+Bn+fiktg+MOx2jJ85cd+sheufPL+rw9QSVZg==",
+      "dev": true,
+      "dependencies": {
+        "level-post": "^1.0.7",
+        "pull-cat": "^1.1.9",
+        "pull-live": "^1.0.1",
+        "pull-pushable": "^2.0.0",
+        "pull-stream": "^3.4.0",
+        "pull-window": "^2.1.4",
+        "stream-to-pull-stream": "^1.7.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/pull-live": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz",
+      "integrity": "sha1-pOzuAeMwFV6RJLu89HYfIbOPUfU=",
+      "dev": true,
+      "dependencies": {
+        "pull-cat": "^1.1.9",
+        "pull-stream": "^3.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/pull-pushable": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz",
+      "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/pull-stream": {
+      "version": "3.6.14",
+      "resolved": "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz",
+      "integrity": "sha512-KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/pull-window": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz",
+      "integrity": "sha1-/DuG/uvRkgx64pdpHiP3BfiFUvA=",
+      "dev": true,
+      "dependencies": {
+        "looper": "^2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regexp.prototype.flags/node_modules/es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/ganache-core/node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/ganache-core/node_modules/repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "dependencies": {
+        "is-finite": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/resumer": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+      "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+      "dev": true,
+      "dependencies": {
+        "through": "~2.3.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/ganache-core/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/rlp": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.6.tgz",
+      "integrity": "sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.1"
+      },
+      "bin": {
+        "rlp": "bin/rlp"
+      }
+    },
+    "node_modules/ganache-core/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ganache-core/node_modules/safe-event-emitter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz",
+      "integrity": "sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg==",
+      "deprecated": "Renamed to @metamask/safe-event-emitter",
+      "dev": true,
+      "dependencies": {
+        "events": "^3.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/ganache-core/node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/scryptsy": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-1.2.1.tgz",
+      "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pbkdf2": "^3.0.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/secp256k1": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz",
+      "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "elliptic": "^6.5.2",
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/seedrandom": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.1.tgz",
+      "integrity": "sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/semaphore": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz",
+      "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/send/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/servify": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz",
+      "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "body-parser": "^1.16.0",
+        "cors": "^2.8.1",
+        "express": "^4.14.0",
+        "request": "^2.79.0",
+        "xhr": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/ganache-core/node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/simple-get": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz",
+      "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^3.3.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon-util/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/source-map-support": {
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/sshpk/node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/static-extend/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/stream-to-pull-stream": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz",
+      "integrity": "sha512-6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg==",
+      "dev": true,
+      "dependencies": {
+        "looper": "^3.0.0",
+        "pull-stream": "^3.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/stream-to-pull-stream/node_modules/looper": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz",
+      "integrity": "sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/string.prototype.trim": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz",
+      "integrity": "sha512-16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/string.prototype.trimend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/string.prototype.trimstart": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/strip-hex-prefix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
+      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js": {
+      "version": "0.1.40",
+      "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.40.tgz",
+      "integrity": "sha512-yqiOCEoA4/IShXkY3WKwP5PvZhmoOOD8clsKA7EEcRILMkTEYHCQ21HDCAcVpmIxZq4LyZvWeRJ6quIyHk1caA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "buffer": "^5.0.5",
+        "eth-lib": "^0.1.26",
+        "fs-extra": "^4.0.2",
+        "got": "^7.1.0",
+        "mime-types": "^2.1.16",
+        "mkdirp-promise": "^5.0.1",
+        "mock-fs": "^4.1.0",
+        "setimmediate": "^1.0.5",
+        "tar": "^4.0.2",
+        "xhr-request": "^1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^3.2.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-plain-obj": "^1.1.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "p-cancelable": "^0.3.0",
+        "p-timeout": "^1.1.1",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "url-parse-lax": "^1.0.0",
+        "url-to-options": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/swarm-js/node_modules/url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "prepend-http": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tape": {
+      "version": "4.13.3",
+      "resolved": "https://registry.npmjs.org/tape/-/tape-4.13.3.tgz",
+      "integrity": "sha512-0/Y20PwRIUkQcTCSi4AASs+OANZZwqPKaipGCEwp10dQMipVvSZwUUCi01Y/OklIGyHKFhIcjock+DKnBfLAFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-equal": "~1.1.1",
+        "defined": "~1.0.0",
+        "dotignore": "~0.1.2",
+        "for-each": "~0.3.3",
+        "function-bind": "~1.1.1",
+        "glob": "~7.1.6",
+        "has": "~1.0.3",
+        "inherits": "~2.0.4",
+        "is-regex": "~1.0.5",
+        "minimist": "~1.2.5",
+        "object-inspect": "~1.7.0",
+        "resolve": "~1.17.0",
+        "resumer": "~0.0.0",
+        "string.prototype.trim": "~1.2.1",
+        "through": "~2.3.8"
+      },
+      "bin": {
+        "tape": "bin/tape"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tape/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tape/node_modules/is-regex": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tape/node_modules/object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tape/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tar/node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tar/node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tmp": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
+      "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/to-object-path/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ganache-core/node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ganache-core/node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/typewise": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz",
+      "integrity": "sha1-EGeTZUCvl5N8xdz5kiSG6fooRlE=",
+      "dev": true,
+      "dependencies": {
+        "typewise-core": "^1.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/typewise-core": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz",
+      "integrity": "sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/typewiselite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz",
+      "integrity": "sha1-yIgvobsQksBgBal/NO9chQjjZk4=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "prepend-http": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/url-set-query": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz",
+      "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/utf-8-validate": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz",
+      "integrity": "sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
+      "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/util.promisify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz",
+      "integrity": "sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "for-each": "^0.3.3",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ganache-core/node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/ganache-core/node_modules/varint": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz",
+      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/ganache-core/node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.11.tgz",
+      "integrity": "sha512-mjQ8HeU41G6hgOYm1pmeH0mRAeNKJGnJEUzDMoerkpw7QUQT4exVREgF1MYPvL/z6vAshOXei25LE/t/Bxl8yQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "web3-bzz": "1.2.11",
+        "web3-core": "1.2.11",
+        "web3-eth": "1.2.11",
+        "web3-eth-personal": "1.2.11",
+        "web3-net": "1.2.11",
+        "web3-shh": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-bzz": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.11.tgz",
+      "integrity": "sha512-XGpWUEElGypBjeFyUhTkiPXFbDVD6Nr/S5jznE3t8cWUA0FxRf1n3n/NuIZeb0H9RkN2Ctd/jNma/k8XGa3YKg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "got": "9.6.0",
+        "swarm-js": "^0.1.40",
+        "underscore": "1.9.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-bzz/node_modules/@types/node": {
+      "version": "12.19.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz",
+      "integrity": "sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/web3-core": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.11.tgz",
+      "integrity": "sha512-CN7MEYOY5ryo5iVleIWRE3a3cZqVaLlIbIzDPsvQRUfzYnvzZQRZBm9Mq+ttDi2STOOzc1MKylspz/o3yq/LjQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "@types/node": "^12.12.6",
+        "bignumber.js": "^9.0.0",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-core-requestmanager": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core-helpers": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.11.tgz",
+      "integrity": "sha512-PEPoAoZd5ME7UfbnCZBdzIerpe74GEvlwT4AjOmHeCVZoIFk7EqvOZDejJHt+feJA6kMVTdd0xzRNN295UhC1A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "underscore": "1.9.1",
+        "web3-eth-iban": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core-method": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.11.tgz",
+      "integrity": "sha512-ff0q76Cde94HAxLDZ6DbdmKniYCQVtvuaYh+rtOUMB6kssa5FX0q3vPmixi7NPooFnbKmmZCM6NvXg4IreTPIw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/transactions": "^5.0.0-beta.135",
+        "underscore": "1.9.1",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-promievent": "1.2.11",
+        "web3-core-subscriptions": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core-promievent": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.11.tgz",
+      "integrity": "sha512-il4McoDa/Ox9Agh4kyfQ8Ak/9ABYpnF8poBLL33R/EnxLsJOGQG2nZhkJa3I067hocrPSjEdlPt/0bHXsln4qA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core-requestmanager": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.11.tgz",
+      "integrity": "sha512-oFhBtLfOiIbmfl6T6gYjjj9igOvtyxJ+fjS+byRxiwFJyJ5BQOz4/9/17gWR1Cq74paTlI7vDGxYfuvfE/mKvA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "underscore": "1.9.1",
+        "web3-core-helpers": "1.2.11",
+        "web3-providers-http": "1.2.11",
+        "web3-providers-ipc": "1.2.11",
+        "web3-providers-ws": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core-subscriptions": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.11.tgz",
+      "integrity": "sha512-qEF/OVqkCvQ7MPs1JylIZCZkin0aKK9lDxpAtQ1F8niEDGFqn7DT8E/vzbIa0GsOjL2fZjDhWJsaW+BSoAW1gg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "underscore": "1.9.1",
+        "web3-core-helpers": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-core/node_modules/@types/node": {
+      "version": "12.19.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz",
+      "integrity": "sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/web3-eth": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.11.tgz",
+      "integrity": "sha512-REvxW1wJ58AgHPcXPJOL49d1K/dPmuw4LjPLBPStOVkQjzDTVmJEIsiLwn2YeuNDd4pfakBwT8L3bz1G1/wVsQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "underscore": "1.9.1",
+        "web3-core": "1.2.11",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-core-subscriptions": "1.2.11",
+        "web3-eth-abi": "1.2.11",
+        "web3-eth-accounts": "1.2.11",
+        "web3-eth-contract": "1.2.11",
+        "web3-eth-ens": "1.2.11",
+        "web3-eth-iban": "1.2.11",
+        "web3-eth-personal": "1.2.11",
+        "web3-net": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-abi": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.11.tgz",
+      "integrity": "sha512-PkRYc0+MjuLSgg03QVWqWlQivJqRwKItKtEpRUaxUAeLE7i/uU39gmzm2keHGcQXo3POXAbOnMqkDvOep89Crg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.0-beta.153",
+        "underscore": "1.9.1",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-accounts": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.11.tgz",
+      "integrity": "sha512-6FwPqEpCfKIh3nSSGeo3uBm2iFSnFJDfwL3oS9pyegRBXNsGRVpgiW63yhNzL0796StsvjHWwQnQHsZNxWAkGw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "crypto-browserify": "3.12.0",
+        "eth-lib": "0.2.8",
+        "ethereumjs-common": "^1.3.2",
+        "ethereumjs-tx": "^2.1.1",
+        "scrypt-js": "^3.0.1",
+        "underscore": "1.9.1",
+        "uuid": "3.3.2",
+        "web3-core": "1.2.11",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-accounts/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-accounts/node_modules/uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-contract": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.11.tgz",
+      "integrity": "sha512-MzYuI/Rq2o6gn7vCGcnQgco63isPNK5lMAan2E51AJLknjSLnOxwNY3gM8BcKoy4Z+v5Dv00a03Xuk78JowFow==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "underscore": "1.9.1",
+        "web3-core": "1.2.11",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-core-promievent": "1.2.11",
+        "web3-core-subscriptions": "1.2.11",
+        "web3-eth-abi": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-ens": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.11.tgz",
+      "integrity": "sha512-dbW7dXP6HqT1EAPvnniZVnmw6TmQEKF6/1KgAxbo8iBBYrVTMDGFQUUnZ+C4VETGrwwaqtX4L9d/FrQhZ6SUiA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "2.0.8",
+        "underscore": "1.9.1",
+        "web3-core": "1.2.11",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-promievent": "1.2.11",
+        "web3-eth-abi": "1.2.11",
+        "web3-eth-contract": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-iban": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.11.tgz",
+      "integrity": "sha512-ozuVlZ5jwFC2hJY4+fH9pIcuH1xP0HEFhtWsR69u9uDIANHLPQQtWYmdj7xQ3p2YT4bQLq/axKhZi7EZVetmxQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-personal": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.11.tgz",
+      "integrity": "sha512-42IzUtKq9iHZ8K9VN0vAI50iSU9tOA1V7XU2BhF/tb7We2iKBVdkley2fg26TxlOcKNEHm7o6HRtiiFsVK4Ifw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.2.11",
+        "web3-core-helpers": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-net": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-eth-personal/node_modules/@types/node": {
+      "version": "12.19.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz",
+      "integrity": "sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/web3-net": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.11.tgz",
+      "integrity": "sha512-sjrSDj0pTfZouR5BSTItCuZ5K/oZPVdVciPQ6981PPPIwJJkCMeVjD7I4zO3qDPCnBjBSbWvVnLdwqUBPtHxyg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "web3-core": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-utils": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.2.1.tgz",
+      "integrity": "sha512-iSv31h2qXkr9vrL6UZDm4leZMc32SjWJFGOp/D92JXfcEboCqraZyuExDkpxKw8ziTufXieNM7LSXNHzszYdJw==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.5.0",
+        "backoff": "^2.5.0",
+        "clone": "^2.0.0",
+        "cross-fetch": "^2.1.0",
+        "eth-block-tracker": "^3.0.0",
+        "eth-json-rpc-infura": "^3.1.0",
+        "eth-sig-util": "^1.4.2",
+        "ethereumjs-block": "^1.2.2",
+        "ethereumjs-tx": "^1.2.0",
+        "ethereumjs-util": "^5.1.5",
+        "ethereumjs-vm": "^2.3.4",
+        "json-rpc-error": "^2.0.0",
+        "json-stable-stringify": "^1.0.1",
+        "promise-to-callback": "^1.0.0",
+        "readable-stream": "^2.2.9",
+        "request": "^2.85.0",
+        "semaphore": "^1.0.3",
+        "ws": "^5.1.1",
+        "xhr": "^2.2.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/abstract-leveldown": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz",
+      "integrity": "sha512-2++wDf/DYqkPR3o5tbfdhF96EfMApo1GpPfzOsR/ZYXdkSmELlvOOEAl9iKkRsktMPHdGjO4rtkBpf2I7TiTeA==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/deferred-leveldown": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
+      "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.6.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/eth-sig-util": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
+      "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
+      "deprecated": "Deprecated in favor of '@metamask/eth-sig-util'",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+        "ethereumjs-util": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "git+ssh://git@github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0",
+      "integrity": "sha512-qs8G5KwnIO/thOQjv1RvR/4oiTsy6IaCsN+ory5dbiqFXz8sd239aWJH0wmsVNPimL5X1KzQheUpi6xAo6FU4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-account": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.5.tgz",
+      "integrity": "sha512-bgDojnXGjhMwo6eXQC0bY6UK2liSFUSMwwylOmQvZbSl/D7NXQ3+vrGO46ZeOgjGfxXmgIeVNDIiHw7fNZM4VA==",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-util": "^5.0.0",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-block": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz",
+      "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereum-common": "0.2.0",
+        "ethereumjs-tx": "^1.2.2",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-block/node_modules/ethereum-common": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz",
+      "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-tx": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz",
+      "integrity": "sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereum-common": "^0.0.18",
+        "ethereumjs-util": "^5.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-vm": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz",
+      "integrity": "sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/vm. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.1.2",
+        "async-eventemitter": "^0.2.2",
+        "ethereumjs-account": "^2.0.3",
+        "ethereumjs-block": "~2.2.0",
+        "ethereumjs-common": "^1.1.0",
+        "ethereumjs-util": "^6.0.0",
+        "fake-merkle-patricia-tree": "^1.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "merkle-patricia-tree": "^2.3.2",
+        "rustbn.js": "~0.2.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-vm/node_modules/ethereumjs-block": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz",
+      "integrity": "sha512-2p49ifhek3h2zeg/+da6XpdFR3GlqY3BIEiqxGF8j9aSRIgkb7M1Ky+yULBKJOu8PAZxfhsYA+HxUk2aCQp3vg==",
+      "deprecated": "New package name format for new versions: @ethereumjs/block. Please update.",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.0.1",
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-tx": "^2.1.1",
+        "ethereumjs-util": "^5.0.0",
+        "merkle-patricia-tree": "^2.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-vm/node_modules/ethereumjs-block/node_modules/ethereumjs-util": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz",
+      "integrity": "sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "^0.1.3",
+        "rlp": "^2.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-vm/node_modules/ethereumjs-tx": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
+      "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
+      "deprecated": "New package name format for new versions: @ethereumjs/tx. Please update.",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-common": "^1.5.0",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ethereumjs-vm/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-errors": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.0.5.tgz",
+      "integrity": "sha512-/cLUpQduF6bNrWuAC4pwtUKA5t669pCsCi2XbmojG2tFeOr9j6ShtdDCtFFQO1DRt+EVZhx9gPzP9G2bUaG4ig==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-iterator-stream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz",
+      "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "level-errors": "^1.0.3",
+        "readable-stream": "^1.0.33",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-iterator-stream/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-ws": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-0.0.0.tgz",
+      "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.15",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-ws/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/level-ws/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/levelup": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
+      "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~1.2.1",
+        "level-codec": "~7.0.0",
+        "level-errors": "~1.0.3",
+        "level-iterator-stream": "~1.3.0",
+        "prr": "~1.0.1",
+        "semver": "~5.4.1",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/memdown": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-1.4.1.tgz",
+      "integrity": "sha1-tOThkhdGZP+65BNhqlAPMRnv4hU=",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~2.7.1",
+        "functional-red-black-tree": "^1.0.1",
+        "immediate": "^3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz",
+      "integrity": "sha512-+OVvxH2rHVEhWLdbudP6p0+dNMXu8JA1CbhP19T8paTYAcX7oJ4OVjT+ZUVpv7mITxXHqDMej+GdqXBmXkw09w==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/merkle-patricia-tree": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz",
+      "integrity": "sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g==",
+      "dev": true,
+      "dependencies": {
+        "async": "^1.4.2",
+        "ethereumjs-util": "^5.0.0",
+        "level-ws": "0.0.0",
+        "levelup": "^1.2.1",
+        "memdown": "^1.0.0",
+        "readable-stream": "^2.0.0",
+        "rlp": "^2.0.0",
+        "semaphore": ">=1.0.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/merkle-patricia-tree/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/web3-provider-engine/node_modules/ws": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "dev": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-providers-http": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.11.tgz",
+      "integrity": "sha512-psh4hYGb1+ijWywfwpB2cvvOIMISlR44F/rJtYkRmQ5jMvG4FOCPlQJPiHQZo+2cc3HbktvvSJzIhkWQJdmvrA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "web3-core-helpers": "1.2.11",
+        "xhr2-cookies": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-providers-ipc": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.11.tgz",
+      "integrity": "sha512-yhc7Y/k8hBV/KlELxynWjJDzmgDEDjIjBzXK+e0rHBsYEhdCNdIH5Psa456c+l0qTEU2YzycF8VAjYpWfPnBpQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "oboe": "2.1.4",
+        "underscore": "1.9.1",
+        "web3-core-helpers": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-providers-ws": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.11.tgz",
+      "integrity": "sha512-ZxnjIY1Er8Ty+cE4migzr43zA/+72AF1myzsLaU5eVgdsfV7Jqx7Dix1hbevNZDKFlSoEyq/3j/jYalh3So1Zg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "underscore": "1.9.1",
+        "web3-core-helpers": "1.2.11",
+        "websocket": "^1.0.31"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-shh": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.11.tgz",
+      "integrity": "sha512-B3OrO3oG1L+bv3E1sTwCx66injW1A8hhwpknDUbV+sw3fehFazA06z9SGXUefuFI1kVs4q2vRi0n4oCcI4dZDg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "web3-core": "1.2.11",
+        "web3-core-method": "1.2.11",
+        "web3-core-subscriptions": "1.2.11",
+        "web3-net": "1.2.11"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-utils": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.11.tgz",
+      "integrity": "sha512-3Tq09izhD+ThqHEaWYX4VOT7dNPdZiO+c/1QMA0s5X2lDFKK/xHJb7cyTRRVzN2LvlHbR7baS1tmQhSua51TcQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "underscore": "1.9.1",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/web3-utils/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/ganache-core/node_modules/websocket": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz",
+      "integrity": "sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q==",
+      "dev": true,
+      "dependencies": {
+        "bufferutil": "^4.0.1",
+        "debug": "^2.2.0",
+        "es5-ext": "^0.10.50",
+        "typedarray-to-buffer": "^3.1.5",
+        "utf-8-validate": "^5.0.2",
+        "yaeti": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/websocket/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/websocket/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/whatwg-fetch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
+      "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/ganache-core/node_modules/ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/ws/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/ganache-core/node_modules/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
+      "dev": true,
+      "dependencies": {
+        "global": "~4.4.0",
+        "is-function": "^1.0.1",
+        "parse-headers": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/xhr-request": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz",
+      "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "buffer-to-arraybuffer": "^0.0.5",
+        "object-assign": "^4.1.1",
+        "query-string": "^5.0.1",
+        "simple-get": "^2.7.0",
+        "timed-out": "^4.0.1",
+        "url-set-query": "^1.0.0",
+        "xhr": "^2.0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/xhr-request-promise": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz",
+      "integrity": "sha512-YUBytBsuwgitWtdRzXDDkWAXzhdGB8bYm0sSzMPZT7Z2MBjMSTHFsyCT1yCRATY+XC69DUrQraRAEgcoCRaIPg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "xhr-request": "^1.1.0"
+      }
+    },
+    "node_modules/ganache-core/node_modules/xhr2-cookies": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz",
+      "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "cookiejar": "^2.1.1"
+      }
+    },
+    "node_modules/ganache-core/node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/ganache-core/node_modules/yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.32"
+      }
+    },
+    "node_modules/ganache-core/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-port": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "dependencies": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "node_modules/got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "dev": true
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/hardhat": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.13.0.tgz",
+      "integrity": "sha512-ZlzBOLML1QGlm6JWyVAG8lVTEAoOaVm1in/RU2zoGAnYEoD1Rp4T+ZMvrLNhHaaeS9hfjJ1gJUBfiDr4cx+htQ==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "^5.1.2",
+        "@metamask/eth-sig-util": "^4.0.0",
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-evm": "^1.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@nomicfoundation/ethereumjs-vm": "^6.0.0",
+        "@nomicfoundation/solidity-analyzer": "^0.1.0",
+        "@sentry/node": "^5.18.1",
+        "@types/bn.js": "^5.1.0",
+        "@types/lru-cache": "^5.1.0",
+        "abort-controller": "^3.0.0",
+        "adm-zip": "^0.4.16",
+        "aggregate-error": "^3.0.0",
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.4.0",
+        "ci-info": "^2.0.0",
+        "debug": "^4.1.1",
+        "enquirer": "^2.3.0",
+        "env-paths": "^2.2.0",
+        "ethereum-cryptography": "^1.0.3",
+        "ethereumjs-abi": "^0.6.8",
+        "find-up": "^2.1.0",
+        "fp-ts": "1.19.3",
+        "fs-extra": "^7.0.1",
+        "glob": "7.2.0",
+        "immutable": "^4.0.0-rc.12",
+        "io-ts": "1.10.4",
+        "keccak": "^3.0.2",
+        "lodash": "^4.17.11",
+        "mnemonist": "^0.38.0",
+        "mocha": "^10.0.0",
+        "p-map": "^4.0.0",
+        "qs": "^6.7.0",
+        "raw-body": "^2.4.1",
+        "resolve": "1.17.0",
+        "semver": "^6.3.0",
+        "solc": "0.7.3",
+        "source-map-support": "^0.5.13",
+        "stacktrace-parser": "^0.1.10",
+        "tsort": "0.0.1",
+        "undici": "^5.14.0",
+        "uuid": "^8.3.2",
+        "ws": "^7.4.6"
+      },
+      "bin": {
+        "hardhat": "internal/cli/bootstrap.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": "*",
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/hardhat-gas-reporter": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/hardhat-gas-reporter/-/hardhat-gas-reporter-1.0.8.tgz",
+      "integrity": "sha512-1G5thPnnhcwLHsFnl759f2tgElvuwdkzxlI65fC9PwxYMEe9cmjkVAAWTf3/3y8uP6ZSPiUiOW8PgZnykmZe0g==",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "1.0.3",
+        "eth-gas-reporter": "^0.2.24",
+        "sha1": "^1.1.1"
+      },
+      "peerDependencies": {
+        "hardhat": "^2.0.2"
+      }
+    },
+    "node_modules/hardhat-move": {
+      "version": "0.0.1",
+      "resolved": "file:../hardhat-move",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mocha": "^9.1.0",
+        "neverthrow": "^4.3.1",
+        "typescript": "^4.6.3"
+      },
+      "peerDependencies": {
+        "hardhat": "^2.0.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/@noble/hashes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.2.0.tgz",
+      "integrity": "sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/hardhat/node_modules/@noble/secp256k1": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
+      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/hardhat/node_modules/@scure/base": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/hardhat/node_modules/@scure/bip32": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.5.tgz",
+      "integrity": "sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.2.0",
+        "@noble/secp256k1": "~1.7.0",
+        "@scure/base": "~1.1.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/@scure/bip39": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.1.tgz",
+      "integrity": "sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.2.0",
+        "@scure/base": "~1.1.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/hardhat/node_modules/ethereum-cryptography": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz",
+      "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==",
+      "dev": true,
+      "dependencies": {
+        "@noble/hashes": "1.2.0",
+        "@noble/secp256k1": "1.7.1",
+        "@scure/bip32": "1.1.5",
+        "@scure/bip39": "1.1.1"
+      }
+    },
+    "node_modules/hardhat/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/hardhat/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/hardhat/node_modules/solc": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.3.tgz",
+      "integrity": "sha512-GAsWNAjGzIDg7VxzP6mPjdurby3IkGCjQcM8GFYZT6RyaoUZKmMU6Y7YwG+tFGhv7dwZ8rmR4iwFDrrD99JwqA==",
+      "dev": true,
+      "dependencies": {
+        "command-exists": "^1.2.8",
+        "commander": "3.0.2",
+        "follow-redirects": "^1.12.1",
+        "fs-extra": "^0.30.0",
+        "js-sha3": "0.8.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
+        "semver": "^5.5.0",
+        "tmp": "0.0.33"
+      },
+      "bin": {
+        "solcjs": "solcjs"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/solc/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/hardhat/node_modules/solc/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbol-support-x": "^1.4.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/header-case": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz",
+      "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.3"
+      }
+    },
+    "node_modules/highlight.js": {
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/highlightjs-solidity": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.5.tgz",
+      "integrity": "sha512-ReXxQSGQkODMUgHcWzVSnfDCDrL2HshOYgw3OlIYmfHeRzUPkfJTUIp95pK4CmbiNG2eMTOmNLpfCz9Zq7Cwmg==",
+      "dev": true
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/http-basic": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz",
+      "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==",
+      "dev": true,
+      "dependencies": {
+        "caseless": "^0.12.0",
+        "concat-stream": "^1.6.2",
+        "http-response-object": "^3.0.1",
+        "parse-cache-control": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-https": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
+      "integrity": "sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=",
+      "dev": true
+    },
+    "node_modules/http-response-object": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz",
+      "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^10.0.3"
+      }
+    },
+    "node_modules/http-response-object/node_modules/@types/node": {
+      "version": "10.17.60",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+      "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+      "dev": true
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/idna-uts46-hx": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz",
+      "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "2.1.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+      "dev": true
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/io-ts": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-1.10.4.tgz",
+      "integrity": "sha512-b23PteSnYXSONJ6JQXRAlvJhuw8KOtkqa87W4wDtvMrud/DTJd5X+NpOOI+O/zZwVq6v0VLAaJ+1EDViKEuN9g==",
+      "dev": true,
+      "dependencies": {
+        "fp-ts": "^1.0.0"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-hex-prefixed": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
+      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/is-lower-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
+      "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
+      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-upper-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
+      "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=",
+      "dev": true,
+      "dependencies": {
+        "upper-case": "^1.1.0"
+      }
+    },
+    "node_modules/is-url": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+      "dev": true
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/iso-url": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/iso-url/-/iso-url-0.4.7.tgz",
+      "integrity": "sha512-27fFRDnPAMnHGLq36bWTpKET+eiXct3ENlCcdcMdk+mjXrb2kw3mhBUg1B7ewAC0kVzlOPhADzQgz1SE6Tglog==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "node_modules/isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "dependencies": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "node_modules/json-text-sequence": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-0.1.1.tgz",
+      "integrity": "sha1-py8hfcSvxGKf/1/rME3BvVGi89I=",
+      "dev": true,
+      "dependencies": {
+        "delimit-stream": "0.1.0"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/keccak": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz",
+      "integrity": "sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/klaw-sync": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/level": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
+      "integrity": "sha512-ypf0jjAk2BWI33yzEaaotpq7fkOPALKAgDBxggO6Q9HGX2MRXn0wbP1Jn/tJv1gtL867+YOjOB49WaUF3UoJNQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-level": "^1.0.1",
+        "classic-level": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/level"
+      }
+    },
+    "node_modules/level-supports": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz",
+      "integrity": "sha512-PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/level-transcoder": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz",
+      "integrity": "sha512-t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "module-error": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/level-transcoder/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=",
+      "dev": true
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.partition": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.partition/-/lodash.partition-4.6.0.tgz",
+      "integrity": "sha1-o45GtzRp4EILDaEhLmbUFL42S6Q=",
+      "dev": true
+    },
+    "node_modules/lodash.sum": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.sum/-/lodash.sum-4.0.2.tgz",
+      "integrity": "sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s=",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "node_modules/lower-case-first": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
+      "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.2"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lru_map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
+      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/markdown-table": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
+      "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
+      "dev": true
+    },
+    "node_modules/mcl-wasm": {
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/mcl-wasm/-/mcl-wasm-0.7.9.tgz",
+      "integrity": "sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memory-level": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/memory-level/-/memory-level-1.0.0.tgz",
+      "integrity": "sha512-UXzwewuWeHBz5krr7EvehKcmLFNoXxGcvuYhC41tRnkrTbJohtS7kVn9akmgirtRygg+f7Yjsfi8Uu5SGSQ4Og==",
+      "dev": true,
+      "dependencies": {
+        "abstract-level": "^1.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "module-error": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
+      "dependencies": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mkdirp-promise": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz",
+      "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=",
+      "deprecated": "This package is broken and no longer maintained. 'mkdirp' itself supports promises now, please switch to that.",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "*"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mnemonist": {
+      "version": "0.38.5",
+      "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz",
+      "integrity": "sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==",
+      "dev": true,
+      "dependencies": {
+        "obliterator": "^2.0.0"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/mock-fs": {
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz",
+      "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==",
+      "dev": true
+    },
+    "node_modules/module-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz",
+      "integrity": "sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/multibase": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.6.1.tgz",
+      "integrity": "sha512-pFfAwyTjbbQgNc3G7D48JkJxWtoJoBMaR4xQUOuB8RnCgRqaYmWNFeJTTvrJ2w51bjLq2zTby6Rqj9TQ9elSUw==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/multicodec": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.7.tgz",
+      "integrity": "sha512-PscoRxm3f+88fAtELwUnZxGDkduE2HD9Q6GHUOywQLjOGT/HAdhjLDYNZ1e7VR0s0TP0EwZ16LNUTFpoBGivOA==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "dependencies": {
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/multihashes": {
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz",
+      "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "multibase": "^0.7.0",
+        "varint": "^5.0.0"
+      }
+    },
+    "node_modules/multihashes/node_modules/multibase": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
+      "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
+      "deprecated": "This module has been superseded by the multiformats module",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.5.0"
+      }
+    },
+    "node_modules/nano-base32": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nano-base32/-/nano-base32-1.0.1.tgz",
+      "integrity": "sha1-ulSMh578+5DaHE2eCX20pGySVe8=",
+      "dev": true
+    },
+    "node_modules/nano-json-stream-parser": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz",
+      "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=",
+      "dev": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/napi-macros": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
+      "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neverthrow": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-4.4.2.tgz",
+      "integrity": "sha512-QVY0ylzBF71pUdLshRrqtweMgqKnE3R37/T82Z5bhO/z8P9z96PC/5pEl2FmiZSy0p+3lsjKerh6jmTWM5fv2g==",
+      "dev": true
+    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+      "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
+      "dev": true
+    },
+    "node_modules/node-environment-flags": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
+    "node_modules/node-environment-flags/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz",
+      "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==",
+      "dev": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/nofilter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz",
+      "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/number-to-bn": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz",
+      "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "4.11.6",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/number-to-bn/node_modules/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true
+    },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
+      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obliterator": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.2.tgz",
+      "integrity": "sha512-g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg==",
+      "dev": true
+    },
+    "node_modules/oboe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.5.tgz",
+      "integrity": "sha1-VVQoTFQ6ImbXo48X4HOCH73jk80=",
+      "dev": true,
+      "dependencies": {
+        "http-https": "^1.0.0"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+      "dev": true,
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-cache-control": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
+      "integrity": "sha1-juqz5U+laSD+Fro493+iGqzC104=",
+      "dev": true
+    },
+    "node_modules/parse-headers": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz",
+      "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
+      "dev": true
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz",
+      "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^3.0.0",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "node_modules/patch-package": {
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz",
+      "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==",
+      "dev": true,
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^7.0.1",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.0",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "npm": ">5"
+      }
+    },
+    "node_modules/patch-package/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true
+    },
+    "node_modules/path-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz",
+      "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postinstall-postinstall": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz",
+      "integrity": "sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz",
+      "integrity": "sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/printj": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
+      "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==",
+      "dev": true,
+      "bin": {
+        "printj": "bin/printj.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/promise": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
+      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "dev": true,
+      "dependencies": {
+        "asap": "~2.0.6"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+      "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-5.0.1.tgz",
+      "integrity": "sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/fast-check"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "dependencies": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "node_modules/req-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/req-cwd/-/req-cwd-2.0.0.tgz",
+      "integrity": "sha1-1AgrTURZgDZkD7c93qAe1T20nrw=",
+      "dev": true,
+      "dependencies": {
+        "req-from": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/req-from": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/req-from/-/req-from-2.0.0.tgz",
+      "integrity": "sha1-10GI5H+TeW9Kpx327jWuaJ8+DnA=",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/ripemd160-min": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
+      "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rlp": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz",
+      "integrity": "sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.2.0"
+      },
+      "bin": {
+        "rlp": "bin/rlp"
+      }
+    },
+    "node_modules/rlp/node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/run-parallel-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz",
+      "integrity": "sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rustbn.js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
+      "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==",
+      "dev": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "elliptic": "^6.5.4",
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
+      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "1.8.1",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/send/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/sentence-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
+      "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case-first": "^1.1.2"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
+      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/servify": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz",
+      "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==",
+      "dev": true,
+      "dependencies": {
+        "body-parser": "^1.16.0",
+        "cors": "^2.8.1",
+        "express": "^4.14.0",
+        "request": "^2.79.0",
+        "xhr": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/sha1": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz",
+      "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=",
+      "dev": true,
+      "dependencies": {
+        "charenc": ">= 0.0.1",
+        "crypt": ">= 0.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/sha3": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/sha3/-/sha3-2.1.4.tgz",
+      "integrity": "sha512-S8cNxbyb0UGUM2VhRD4Poe5N58gJnJsLJ5vC7FYWGUmGhcsj4++WaIOBFVDxlG0W3To6xBuiRh+i0Qp2oNCOtg==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "6.0.3"
+      }
+    },
+    "node_modules/sha3/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/simple-get": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.2.tgz",
+      "integrity": "sha512-Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw==",
+      "dev": true,
+      "dependencies": {
+        "decompress-response": "^3.3.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/snake-case": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
+      "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "node_modules/solc": {
+      "version": "0.6.12",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.6.12.tgz",
+      "integrity": "sha512-Lm0Ql2G9Qc7yPP2Ba+WNmzw2jwsrd3u4PobHYlSOxaut3TtUbj9+5ZrT6f4DUpNPEoBaFUOEg9Op9C0mk7ge9g==",
+      "dev": true,
+      "dependencies": {
+        "command-exists": "^1.2.8",
+        "commander": "3.0.2",
+        "fs-extra": "^0.30.0",
+        "js-sha3": "0.8.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
+        "semver": "^5.5.0",
+        "tmp": "0.0.33"
+      },
+      "bin": {
+        "solcjs": "solcjs"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/solc/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/solc/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/solc/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/sshpk": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "dev": true,
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sshpk/node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "node_modules/stacktrace-parser": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.7.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stacktrace-parser/node_modules/type-fest": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
+      "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/streamsearch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-hex-prefix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
+      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/super-split": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/super-split/-/super-split-1.1.0.tgz",
+      "integrity": "sha512-I4bA5mgcb6Fw5UJ+EkpzqXfiuvVGS/7MuND+oBxNFmxu3ugLNrdIatzBLfhFRMVMLxgSsRy+TjIktgkF9RFSNQ==",
+      "dev": true
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/swap-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
+      "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^1.1.1",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/swarm-js": {
+      "version": "0.1.40",
+      "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.40.tgz",
+      "integrity": "sha512-yqiOCEoA4/IShXkY3WKwP5PvZhmoOOD8clsKA7EEcRILMkTEYHCQ21HDCAcVpmIxZq4LyZvWeRJ6quIyHk1caA==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "buffer": "^5.0.5",
+        "eth-lib": "^0.1.26",
+        "fs-extra": "^4.0.2",
+        "got": "^7.1.0",
+        "mime-types": "^2.1.16",
+        "mkdirp-promise": "^5.0.1",
+        "mock-fs": "^4.1.0",
+        "setimmediate": "^1.0.5",
+        "tar": "^4.0.2",
+        "xhr-request": "^1.0.1"
+      }
+    },
+    "node_modules/swarm-js/node_modules/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/swarm-js/node_modules/get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/swarm-js/node_modules/got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "dependencies": {
+        "decompress-response": "^3.2.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-plain-obj": "^1.1.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "p-cancelable": "^0.3.0",
+        "p-timeout": "^1.1.1",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "url-parse-lax": "^1.0.0",
+        "url-to-options": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/swarm-js/node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/swarm-js/node_modules/p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/swarm-js/node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/swarm-js/node_modules/url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "dependencies": {
+        "prepend-http": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sync-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz",
+      "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==",
+      "dev": true,
+      "dependencies": {
+        "http-response-object": "^3.0.1",
+        "sync-rpc": "^1.2.1",
+        "then-request": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/sync-rpc": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz",
+      "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==",
+      "dev": true,
+      "dependencies": {
+        "get-port": "^3.1.0"
+      }
+    },
+    "node_modules/tar": {
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/test-value": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz",
+      "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^1.0.3",
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/test-value/node_modules/array-back": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
+      "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/testrpc": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/testrpc/-/testrpc-0.0.1.tgz",
+      "integrity": "sha512-afH1hO+SQ/VPlmaLUFj2636QMeDvPCeQMc/9RBMW0IfjNe9gFD9Ra3ShqYkB7py0do1ZcCna/9acHyzTJ+GcNA==",
+      "deprecated": "testrpc has been renamed to ganache-cli, please use this package from now on.",
+      "dev": true
+    },
+    "node_modules/then-request": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz",
+      "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==",
+      "dev": true,
+      "dependencies": {
+        "@types/concat-stream": "^1.6.0",
+        "@types/form-data": "0.0.33",
+        "@types/node": "^8.0.0",
+        "@types/qs": "^6.2.31",
+        "caseless": "~0.12.0",
+        "concat-stream": "^1.6.0",
+        "form-data": "^2.2.0",
+        "http-basic": "^8.1.1",
+        "http-response-object": "^3.0.1",
+        "promise": "^8.0.0",
+        "qs": "^6.4.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/then-request/node_modules/@types/node": {
+      "version": "8.10.66",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz",
+      "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==",
+      "dev": true
+    },
+    "node_modules/then-request/node_modules/form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/title-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
+      "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.0.3"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "dev": true
+    },
+    "node_modules/ts-essentials": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz",
+      "integrity": "sha512-q3N1xS4vZpRouhYHDPwO0bDW3EZ6SK9CrrDHxi/D6BPReSjpVgWIOpLS2o0gSBZm+7q/wyKp6RVM1AeeW7uyfQ==",
+      "dev": true
+    },
+    "node_modules/ts-generator": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ts-generator/-/ts-generator-0.1.1.tgz",
+      "integrity": "sha512-N+ahhZxTLYu1HNTQetwWcx3so8hcYbkKBHTr4b4/YgObFTIKkOSSsaa+nal12w8mfrJAyzJfETXawbNjSfP2gQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/mkdirp": "^0.5.2",
+        "@types/prettier": "^2.1.1",
+        "@types/resolve": "^0.0.8",
+        "chalk": "^2.4.1",
+        "glob": "^7.1.2",
+        "mkdirp": "^0.5.1",
+        "prettier": "^2.1.2",
+        "resolve": "^1.8.1",
+        "ts-essentials": "^1.0.0"
+      },
+      "bin": {
+        "ts-generator": "dist/cli/run.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tsort": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz",
+      "integrity": "sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=",
+      "dev": true
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true
+    },
+    "node_modules/tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typechain": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/typechain/-/typechain-3.0.0.tgz",
+      "integrity": "sha512-ft4KVmiN3zH4JUFu2WJBrwfHeDf772Tt2d8bssDTo/YcckKW2D+OwFrHXRC6hJvO3mHjFQTihoMV6fJOi0Hngg==",
+      "dev": true,
+      "dependencies": {
+        "command-line-args": "^4.0.7",
+        "debug": "^4.1.1",
+        "fs-extra": "^7.0.0",
+        "js-sha3": "^0.8.0",
+        "lodash": "^4.17.15",
+        "ts-essentials": "^6.0.3",
+        "ts-generator": "^0.1.1"
+      },
+      "bin": {
+        "typechain": "dist/cli/cli.js"
+      }
+    },
+    "node_modules/typechain/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/typechain/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/typechain/node_modules/ts-essentials": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-6.0.7.tgz",
+      "integrity": "sha512-2E4HIIj4tQJlIHuATRHayv0EfMGK3ris/GRk1E3CFnsZzeNV+hUmelbaTZHLtXaZppM5oLhHRtO04gINC4Jusw==",
+      "dev": true,
+      "peerDependencies": {
+        "typescript": ">=3.7.0"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/typical": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
+      "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=",
+      "dev": true
+    },
+    "node_modules/ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+      "dev": true
+    },
+    "node_modules/undici": {
+      "version": "5.21.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz",
+      "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==",
+      "dev": true,
+      "dependencies": {
+        "busboy": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=12.18"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "node_modules/upper-case-first": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
+      "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=",
+      "dev": true,
+      "dependencies": {
+        "upper-case": "^1.1.1"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "dependencies": {
+        "prepend-http": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/url-set-query": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz",
+      "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=",
+      "dev": true
+    },
+    "node_modules/url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/utf-8-validate": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz",
+      "integrity": "sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
+      }
+    },
+    "node_modules/utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
+      "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
+      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "safe-buffer": "^5.1.2",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/varint": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz",
+      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==",
+      "dev": true
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/web3": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3/-/web3-1.7.1.tgz",
+      "integrity": "sha512-RKVdyZ5FuVEykj62C1o2tc0teJciSOh61jpVB9yb344dBHO3ZV4XPPP24s/PPqIMXmVFN00g2GD9M/v1SoHO/A==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-bzz": "1.7.1",
+        "web3-core": "1.7.1",
+        "web3-eth": "1.7.1",
+        "web3-eth-personal": "1.7.1",
+        "web3-net": "1.7.1",
+        "web3-shh": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-bzz": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.7.1.tgz",
+      "integrity": "sha512-sVeUSINx4a4pfdnT+3ahdRdpDPvZDf4ZT/eBF5XtqGWq1mhGTl8XaQAk15zafKVm6Onq28vN8abgB/l+TrG8kA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "got": "9.6.0",
+        "swarm-js": "^0.1.40"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-bzz/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/web3-core": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.7.1.tgz",
+      "integrity": "sha512-HOyDPj+4cNyeNPwgSeUkhtS0F+Pxc2obcm4oRYPW5ku6jnTO34pjaij0us+zoY3QEusR8FfAKVK1kFPZnS7Dzw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "@types/node": "^12.12.6",
+        "bignumber.js": "^9.0.0",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-core-requestmanager": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-helpers": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.5.3.tgz",
+      "integrity": "sha512-Ip1IjB3S8vN7Kf1PPjK41U5gskmMk6IJQlxIVuS8/1U7n/o0jC8krqtpRwiMfAgYyw3TXwBFtxSRTvJtnLyXZw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.5.3",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-helpers/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/web3-core-helpers/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-method": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.7.1.tgz",
+      "integrity": "sha512-383wu5FMcEphBFl5jCjk502JnEg3ugHj7MQrsX7DY76pg5N5/dEzxeEMIJFCN6kr5Iq32NINOG3VuJIyjxpsEg==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/transactions": "^5.0.0-beta.135",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-promievent": "1.7.1",
+        "web3-core-subscriptions": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-method/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-method/node_modules/web3-core-promievent": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.7.1.tgz",
+      "integrity": "sha512-Vd+CVnpPejrnevIdxhCkzMEywqgVbhHk/AmXXceYpmwA6sX41c5a65TqXv1i3FWRJAz/dW7oKz9NAzRIBAO/kA==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-method/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-promievent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.5.3.tgz",
+      "integrity": "sha512-CFfgqvk3Vk6PIAxtLLuX+pOMozxkKCY+/GdGr7weMh033mDXEPvwyVjoSRO1PqIKj668/hMGQsVoIgbyxkJ9Mg==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-requestmanager": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.7.1.tgz",
+      "integrity": "sha512-/EHVTiMShpZKiq0Jka0Vgguxi3vxq1DAHKxg42miqHdUsz4/cDWay2wGALDR2x3ofDB9kqp7pb66HsvQImQeag==",
+      "dev": true,
+      "dependencies": {
+        "util": "^0.12.0",
+        "web3-core-helpers": "1.7.1",
+        "web3-providers-http": "1.7.1",
+        "web3-providers-ipc": "1.7.1",
+        "web3-providers-ws": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-requestmanager/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-requestmanager/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-subscriptions": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.7.1.tgz",
+      "integrity": "sha512-NZBsvSe4J+Wt16xCf4KEtBbxA9TOwSVr8KWfUQ0tC2KMdDYdzNswl0Q9P58xaVuNlJ3/BH+uDFZJJ5E61BSA1Q==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-subscriptions/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core-subscriptions/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/web3-core/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/web3-core/node_modules/bignumber.js": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz",
+      "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/web3-core/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-core/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.7.1.tgz",
+      "integrity": "sha512-Uz3gO4CjTJ+hMyJZAd2eiv2Ur1uurpN7sTMATWKXYR/SgG+SZgncnk/9d8t23hyu4lyi2GiVL1AqVqptpRElxg==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.7.1",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-core-subscriptions": "1.7.1",
+        "web3-eth-abi": "1.7.1",
+        "web3-eth-accounts": "1.7.1",
+        "web3-eth-contract": "1.7.1",
+        "web3-eth-ens": "1.7.1",
+        "web3-eth-iban": "1.7.1",
+        "web3-eth-personal": "1.7.1",
+        "web3-net": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-abi": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.5.3.tgz",
+      "integrity": "sha512-i/qhuFsoNrnV130CSRYX/z4SlCfSQ4mHntti5yTmmQpt70xZKYZ57BsU0R29ueSQ9/P+aQrL2t2rqkQkAloUxg==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.7",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-abi/node_modules/@ethersproject/abi": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
+      "integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.4",
+        "@ethersproject/bignumber": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.4",
+        "@ethersproject/constants": "^5.0.4",
+        "@ethersproject/hash": "^5.0.4",
+        "@ethersproject/keccak256": "^5.0.3",
+        "@ethersproject/logger": "^5.0.5",
+        "@ethersproject/properties": "^5.0.3",
+        "@ethersproject/strings": "^5.0.4"
+      }
+    },
+    "node_modules/web3-eth-abi/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/web3-eth-abi/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-accounts": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.7.1.tgz",
+      "integrity": "sha512-3xGQ2bkTQc7LFoqGWxp5cQDrKndlX05s7m0rAFVoyZZODMqrdSGjMPMqmWqHzJRUswNEMc+oelqSnGBubqhguQ==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.5.0",
+        "@ethereumjs/tx": "^3.3.2",
+        "crypto-browserify": "3.12.0",
+        "eth-lib": "0.2.8",
+        "ethereumjs-util": "^7.0.10",
+        "scrypt-js": "^3.0.1",
+        "uuid": "3.3.2",
+        "web3-core": "1.7.1",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-accounts/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/web3-eth-accounts/node_modules/uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/web3-eth-accounts/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-accounts/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-contract": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.7.1.tgz",
+      "integrity": "sha512-HpnbkPYkVK3lOyos2SaUjCleKfbF0SP3yjw7l551rAAi5sIz/vwlEzdPWd0IHL7ouxXbO0tDn7jzWBRcD3sTbA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.5",
+        "web3-core": "1.7.1",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-core-promievent": "1.7.1",
+        "web3-core-subscriptions": "1.7.1",
+        "web3-eth-abi": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/@ethersproject/abi": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
+      "integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.4",
+        "@ethersproject/bignumber": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.4",
+        "@ethersproject/constants": "^5.0.4",
+        "@ethersproject/hash": "^5.0.4",
+        "@ethersproject/keccak256": "^5.0.3",
+        "@ethersproject/logger": "^5.0.5",
+        "@ethersproject/properties": "^5.0.3",
+        "@ethersproject/strings": "^5.0.4"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/web3-core-promievent": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.7.1.tgz",
+      "integrity": "sha512-Vd+CVnpPejrnevIdxhCkzMEywqgVbhHk/AmXXceYpmwA6sX41c5a65TqXv1i3FWRJAz/dW7oKz9NAzRIBAO/kA==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/web3-eth-abi": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.7.1.tgz",
+      "integrity": "sha512-8BVBOoFX1oheXk+t+uERBibDaVZ5dxdcefpbFTWcBs7cdm0tP8CD1ZTCLi5Xo+1bolVHNH2dMSf/nEAssq5pUA==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.7",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-contract/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-ens": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.7.1.tgz",
+      "integrity": "sha512-DVCF76i9wM93DrPQwLrYiCw/UzxFuofBsuxTVugrnbm0SzucajLLNftp3ITK0c4/lV3x9oo5ER/wD6RRMHQnvw==",
+      "dev": true,
+      "dependencies": {
+        "content-hash": "^2.5.2",
+        "eth-ens-namehash": "2.0.8",
+        "web3-core": "1.7.1",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-promievent": "1.7.1",
+        "web3-eth-abi": "1.7.1",
+        "web3-eth-contract": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-ens/node_modules/@ethersproject/abi": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
+      "integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.4",
+        "@ethersproject/bignumber": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.4",
+        "@ethersproject/constants": "^5.0.4",
+        "@ethersproject/hash": "^5.0.4",
+        "@ethersproject/keccak256": "^5.0.3",
+        "@ethersproject/logger": "^5.0.5",
+        "@ethersproject/properties": "^5.0.3",
+        "@ethersproject/strings": "^5.0.4"
+      }
+    },
+    "node_modules/web3-eth-ens/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-ens/node_modules/web3-core-promievent": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.7.1.tgz",
+      "integrity": "sha512-Vd+CVnpPejrnevIdxhCkzMEywqgVbhHk/AmXXceYpmwA6sX41c5a65TqXv1i3FWRJAz/dW7oKz9NAzRIBAO/kA==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-ens/node_modules/web3-eth-abi": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.7.1.tgz",
+      "integrity": "sha512-8BVBOoFX1oheXk+t+uERBibDaVZ5dxdcefpbFTWcBs7cdm0tP8CD1ZTCLi5Xo+1bolVHNH2dMSf/nEAssq5pUA==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.7",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-ens/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-iban": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.5.3.tgz",
+      "integrity": "sha512-vMzmGqolYZvRHwP9P4Nf6G8uYM5aTLlQu2a34vz78p0KlDC+eV1th3+90Qeaupa28EG7OO0IT1F0BejiIauOPw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.5.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-iban/node_modules/eth-lib": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+      "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.6",
+        "elliptic": "^6.4.0",
+        "xhr-request-promise": "^0.1.2"
+      }
+    },
+    "node_modules/web3-eth-iban/node_modules/web3-utils": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
+      "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "eth-lib": "0.2.8",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-personal": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.7.1.tgz",
+      "integrity": "sha512-02H6nFBNfNmFjMGZL6xcDi0r7tUhxrUP91FTFdoLyR94eIJDadPp4rpXfG7MVES873i1PReh4ep5pSCHbc3+Pg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^12.12.6",
+        "web3-core": "1.7.1",
+        "web3-core-helpers": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-net": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-personal/node_modules/@types/node": {
+      "version": "12.20.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz",
+      "integrity": "sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==",
+      "dev": true
+    },
+    "node_modules/web3-eth-personal/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth-personal/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth/node_modules/@ethersproject/abi": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
+      "integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/address": "^5.0.4",
+        "@ethersproject/bignumber": "^5.0.7",
+        "@ethersproject/bytes": "^5.0.4",
+        "@ethersproject/constants": "^5.0.4",
+        "@ethersproject/hash": "^5.0.4",
+        "@ethersproject/keccak256": "^5.0.3",
+        "@ethersproject/logger": "^5.0.5",
+        "@ethersproject/properties": "^5.0.3",
+        "@ethersproject/strings": "^5.0.4"
+      }
+    },
+    "node_modules/web3-eth/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth/node_modules/web3-eth-abi": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.7.1.tgz",
+      "integrity": "sha512-8BVBOoFX1oheXk+t+uERBibDaVZ5dxdcefpbFTWcBs7cdm0tP8CD1ZTCLi5Xo+1bolVHNH2dMSf/nEAssq5pUA==",
+      "dev": true,
+      "dependencies": {
+        "@ethersproject/abi": "5.0.7",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-eth/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-net": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.7.1.tgz",
+      "integrity": "sha512-8yPNp2gvjInWnU7DCoj4pIPNhxzUjrxKlODsyyXF8j0q3Z2VZuQp+c63gL++r2Prg4fS8t141/HcJw4aMu5sVA==",
+      "dev": true,
+      "dependencies": {
+        "web3-core": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-http": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.7.1.tgz",
+      "integrity": "sha512-dmiO6G4dgAa3yv+2VD5TduKNckgfR97VI9YKXVleWdcpBoKXe2jofhdvtafd42fpIoaKiYsErxQNcOC5gI/7Vg==",
+      "dev": true,
+      "dependencies": {
+        "web3-core-helpers": "1.7.1",
+        "xhr2-cookies": "1.1.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-http/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-http/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ipc": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.7.1.tgz",
+      "integrity": "sha512-uNgLIFynwnd5M9ZC0lBvRQU5iLtU75hgaPpc7ZYYR+kjSk2jr2BkEAQhFVJ8dlqisrVmmqoAPXOEU0flYZZgNQ==",
+      "dev": true,
+      "dependencies": {
+        "oboe": "2.1.5",
+        "web3-core-helpers": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ipc/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ipc/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ws": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.7.1.tgz",
+      "integrity": "sha512-Uj0n5hdrh0ESkMnTQBsEUS2u6Unqdc7Pe4Zl+iZFb7Yn9cIGsPJBl7/YOP4137EtD5ueXAv+MKwzcelpVhFiFg==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "4.0.4",
+        "web3-core-helpers": "1.7.1",
+        "websocket": "^1.0.32"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ws/node_modules/web3-core-helpers": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.7.1.tgz",
+      "integrity": "sha512-xn7Sx+s4CyukOJdlW8bBBDnUCWndr+OCJAlUe/dN2wXiyaGRiCWRhuQZrFjbxLeBt1fYFH7uWyYHhYU6muOHgw==",
+      "dev": true,
+      "dependencies": {
+        "web3-eth-iban": "1.7.1",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-providers-ws/node_modules/web3-eth-iban": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.7.1.tgz",
+      "integrity": "sha512-XG4I3QXuKB/udRwZdNEhdYdGKjkhfb/uH477oFVMLBqNimU/Cw8yXUI5qwFKvBHM+hMQWfzPDuSDEDKC2uuiMg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "web3-utils": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-shh": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.7.1.tgz",
+      "integrity": "sha512-NO+jpEjo8kYX6c7GiaAm57Sx93PLYkWYUCWlZmUOW7URdUcux8VVluvTWklGPvdM9H1WfDrol91DjuSW+ykyqg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "web3-core": "1.7.1",
+        "web3-core-method": "1.7.1",
+        "web3-core-subscriptions": "1.7.1",
+        "web3-net": "1.7.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/web3-utils": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz",
+      "integrity": "sha512-fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "ethereum-bloom-filters": "^1.0.6",
+        "ethereumjs-util": "^7.1.0",
+        "ethjs-unit": "0.1.6",
+        "number-to-bn": "1.7.0",
+        "randombytes": "^2.1.0",
+        "utf8": "3.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "dev": true
+    },
+    "node_modules/websocket": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz",
+      "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==",
+      "dev": true,
+      "dependencies": {
+        "bufferutil": "^4.0.1",
+        "debug": "^2.2.0",
+        "es5-ext": "^0.10.50",
+        "typedarray-to-buffer": "^3.1.5",
+        "utf-8-validate": "^5.0.2",
+        "yaeti": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/websocket/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/websocket/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
+      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.5",
+        "foreach": "^2.0.5",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/window-size": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
+      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=",
+      "dev": true,
+      "bin": {
+        "window-size": "cli.js"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/ws": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
+      "dev": true,
+      "dependencies": {
+        "global": "~4.4.0",
+        "is-function": "^1.0.1",
+        "parse-headers": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/xhr-request": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz",
+      "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-to-arraybuffer": "^0.0.5",
+        "object-assign": "^4.1.1",
+        "query-string": "^5.0.1",
+        "simple-get": "^2.7.0",
+        "timed-out": "^4.0.1",
+        "url-set-query": "^1.0.0",
+        "xhr": "^2.0.4"
+      }
+    },
+    "node_modules/xhr-request-promise": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz",
+      "integrity": "sha512-YUBytBsuwgitWtdRzXDDkWAXzhdGB8bYm0sSzMPZT7Z2MBjMSTHFsyCT1yCRATY+XC69DUrQraRAEgcoCRaIPg==",
+      "dev": true,
+      "dependencies": {
+        "xhr-request": "^1.1.0"
+      }
+    },
+    "node_modules/xhr2-cookies": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz",
+      "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=",
+      "dev": true,
+      "dependencies": {
+        "cookiejar": "^2.1.1"
+      }
+    },
+    "node_modules/xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.32"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/package.json b/vendors/move/crates/evm/hardhat-examples/package.json
new file mode 100644
index 000000000..c3a4462e4
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "hardhat-examples",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@nomiclabs/hardhat-ethers": "^2.0.5",
+    "@nomiclabs/hardhat-truffle5": "^2.0.5",
+    "@nomiclabs/hardhat-waffle": "^2.0.3",
+    "@nomiclabs/hardhat-web3": "^2.0.0",
+    "@openzeppelin/test-helpers": "^0.5.15",
+    "chai": "^4.3.6",
+    "ethereum-waffle": "^3.4.4",
+    "ethers": "^5.6.2",
+    "hardhat": "^2.13.0",
+    "hardhat-gas-reporter": "^1.0.8",
+    "hardhat-move": "file:../hardhat-move",
+    "web3": "^1.7.1"
+  },
+  "dependencies": {
+    "@openzeppelin/contracts": "^4.5.0"
+  }
+}
diff --git a/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC1155.js b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC1155.js
new file mode 100644
index 000000000..987a3c53c
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC1155.js
@@ -0,0 +1,23 @@
+async function main() {
+  const [deployer] = await ethers.getSigners();
+
+  console.log("Deploying contracts with the account:", deployer.address);
+
+  const weiAmount = (await deployer.getBalance()).toString();
+
+  console.log("Account balance:", (await ethers.utils.formatEther(weiAmount)));
+
+  const NFT = await ethers.getContractFactory("ERC1155Tradable"); // A Move contract
+  const nft = await NFT.deploy(
+    "Move-on-EVM NFT", // name
+    "MFT", // symbol
+    "https://bafybeigjlugkiakvejhgfupjdl66e77wlbjznksraj7w2g3djtjdeuhl74.ipfs.nftstorage.link/"); // baseURI
+  console.log("Semi-NFT address:", nft.address);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC20.js b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC20.js
new file mode 100644
index 000000000..4bafa8ea6
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC20.js
@@ -0,0 +1,21 @@
+async function main() {
+  const [deployer] = await ethers.getSigners();
+
+  console.log("Deploying contracts with the account:", deployer.address);
+
+  const weiAmount = (await deployer.getBalance()).toString();
+
+  console.log("Account balance:", (await ethers.utils.formatEther(weiAmount)));
+
+  const Token = await ethers.getContractFactory("ERC20Mock"); // A Move contract
+  const token = await Token.deploy("MoveOnEvm", "MOE", deployer.address, BigInt(42000 * 10**18));
+
+  console.log("Token address:", token.address);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC721.js b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC721.js
new file mode 100644
index 000000000..2ee98f343
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/scripts/deploy_ERC721.js
@@ -0,0 +1,26 @@
+async function main() {
+  const [deployer] = await ethers.getSigners();
+
+  console.log("Deploying contracts with the account:", deployer.address);
+
+  const weiAmount = (await deployer.getBalance()).toString();
+
+  console.log("Account balance:", (await ethers.utils.formatEther(weiAmount)));
+
+  const NFT = await ethers.getContractFactory("ERC721Tradable"); // A Move contract
+  const nft = await NFT.deploy(
+    "Move-on-EVM on a sunny spring day", // name
+    "MFT", // symbol
+    ethers.constants.AddressZero, // proxyRegistryAddress
+    "https://bafybeifwn437bhus4gjmvvsbnwjiv5of7beujekcaavlkdbwnfw7tewi6u.ipfs.nftstorage.link/" // baseURI
+  );
+
+  console.log("NFT address:", nft.address);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/scripts/sample-script.js b/vendors/move/crates/evm/hardhat-examples/scripts/sample-script.js
new file mode 100644
index 000000000..90cd8197e
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/scripts/sample-script.js
@@ -0,0 +1,32 @@
+// We require the Hardhat Runtime Environment explicitly here. This is optional
+// but useful for running the script in a standalone fashion through `node <script>`.
+//
+// When running the script with `npx hardhat run <script>` you'll find the Hardhat
+// Runtime Environment's members available in the global scope.
+const hre = require("hardhat");
+
+async function main() {
+  // Hardhat always runs the compile task when running scripts with its command
+  // line interface.
+  //
+  // If this script is run directly using `node` you may want to call compile
+  // manually to make sure everything is compiled
+  // await hre.run('compile');
+
+  // We get the contract to deploy
+  const Greeter = await hre.ethers.getContractFactory("Greeter");
+  const greeter = await Greeter.deploy("Hello, Hardhat!");
+
+  await greeter.deployed();
+
+  console.log("Greeter deployed to:", greeter.address);
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main()
+  .then(() => process.exit(0))
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
diff --git a/vendors/move/crates/evm/hardhat-examples/setup.sh b/vendors/move/crates/evm/hardhat-examples/setup.sh
new file mode 100644
index 000000000..3df2a25c8
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# Hardhat packages, along with their dependencies, are not checked into the Move repo.
+# Use this script to get them downloaded and configured.
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd $SCRIPT_DIR
+
+npm install --save-dev hardhat
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ABIStruct.test.js b/vendors/move/crates/evm/hardhat-examples/test/ABIStruct.test.js
new file mode 100644
index 000000000..89c015894
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ABIStruct.test.js
@@ -0,0 +1,40 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (move_contract, sol_contract) {
+  return function () {
+    it("CallMove", async function () {
+      this.ABIStruct = await ethers.getContractFactory(move_contract);
+      this.StructABI_Sol = await ethers.getContractFactory(sol_contract);
+      this.abi_struct = await this.ABIStruct.deploy();
+      this.struct_abi_sol = await this.StructABI_Sol.deploy(this.abi_struct.address);
+      const tx = this.struct_abi_sol.call_s();
+      await expect(await tx).to.emit(this.abi_struct, 'Event_u64').withArgs(42);
+    });
+
+    it("CallSol", async function () {
+      this.ABIStruct = await ethers.getContractFactory(move_contract);
+      this.StructABI_Sol = await ethers.getContractFactory(sol_contract);
+      this.abi_struct = await this.ABIStruct.deploy();
+      this.struct_abi_sol = await this.StructABI_Sol.deploy(this.abi_struct.address);
+      const tx = this.abi_struct.safe_transfer_form(this.struct_abi_sol.address);
+      await expect(await tx).to.emit(this.abi_struct, 'Event_u64').withArgs(100);
+    });
+
+    it("StructEvent", async function () {
+      const ABIStruct = artifacts.require('ABIStruct');
+      this.abi_struct = await ABIStruct.new();
+      expectEvent(await this.abi_struct.do_transfer(), 'Event_S', [["42", true, ["42"]]]);
+    });
+
+    it("StringEvent", async function () {
+      const ABIStruct = artifacts.require('ABIStruct');
+      this.abi_struct = await ABIStruct.new();
+      expectEvent(await this.abi_struct.test_string([[97, 98, 99]]), 'Event_String', [["0x616263"]]);
+    });
+
+  }
+};
+
+describe("Caller (the Move contract)", make_test("ABIStruct", "StructABI_Sol"));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/AsyncEvent.test.js b/vendors/move/crates/evm/hardhat-examples/test/AsyncEvent.test.js
new file mode 100644
index 000000000..3ee3c3a0d
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/AsyncEvent.test.js
@@ -0,0 +1,22 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (contract_name) {
+  return function () {
+    before(async function () {
+      this.Event = await ethers.getContractFactory(contract_name);
+      this.event = await this.Event.deploy();
+      await this.event.deployed();
+    });
+    it("AsyncEvent_xfer_deposit", async function () {
+      const tx = this.event.xfer(this.event.address,42);
+      await expect(tx).to.emit(this.event, 'Xfer_deposit').withArgs(this.event.address, 0x8EEEA8A2, 42, this.event.address, 0);
+    });
+    it("AsyncEvent_xfer_finish", async function () {
+      const tx = this.event.xfer_deposit(42,this.event.address,1);
+      await expect(tx).to.emit(this.event, 'Xfer_finish').withArgs(this.event.address, 0x9D2FDA8, 1);
+    });
+  }
+};
+
+describe("Async Event (the Async Move contract)", make_test('AsyncEvent'));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Caller.test.js b/vendors/move/crates/evm/hardhat-examples/test/Caller.test.js
new file mode 100644
index 000000000..47f81def7
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Caller.test.js
@@ -0,0 +1,22 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (caller_contract, callee_contract) {
+  return function () {
+    it("Call", async function () {
+      this.Caller = await ethers.getContractFactory(caller_contract);
+      this.Callee = await ethers.getContractFactory(callee_contract);
+      this.caller = await this.Caller.deploy();
+      this.callee = await this.Callee.deploy();
+      const tx = this.caller.call_success(this.callee.address);
+      await expect(await tx).to.be.equal(42);
+      const tx_2 = this.caller.call_revert(this.callee.address);
+      await expect(await tx_2).to.be.equal("revert");
+      const tx_3 = this.caller.call_panic(this.callee.address);
+      await expect(await tx_3).to.be.equal(0x12);
+    });
+  }
+};
+
+describe("Caller (the Move contract)", make_test("Caller", "Callee"));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC1155.behavior.js b/vendors/move/crates/evm/hardhat-examples/test/ERC1155.behavior.js
new file mode 100644
index 000000000..7f9d595d4
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC1155.behavior.js
@@ -0,0 +1,776 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { ZERO_ADDRESS } = constants;
+
+const { expect } = require('chai');
+
+const { shouldSupportInterfaces } = require('./SupportsInterface.behavior');
+
+const ERC1155ReceiverMock = artifacts.require('ERC1155ReceiverMock');
+
+function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder, multiTokenHolder, recipient, proxy]) {
+  const firstTokenId = new BN(1);
+  const secondTokenId = new BN(2);
+  const unknownTokenId = new BN(3);
+
+  const firstAmount = new BN(1000);
+  const secondAmount = new BN(2000);
+
+  const RECEIVER_SINGLE_MAGIC_VALUE = '0xf23a6e61';
+  const RECEIVER_BATCH_MAGIC_VALUE = '0xbc197c81';
+
+  describe('like an ERC1155', function () {
+    describe('balanceOf', function () {
+      it('reverts when queried about the zero address', async function () {
+        await expectRevert(
+          this.token.balanceOf(ZERO_ADDRESS, firstTokenId),
+//          'ERC1155: address zero is not a valid owner',
+          "VM Exception while processing transaction: reverted with reason string 'ERC1155: balance query for the zero address'",
+        );
+      });
+
+      context('when accounts don\'t own tokens', function () {
+        it('returns zero for given addresses', async function () {
+          expect(await this.token.balanceOf(
+            firstTokenHolder,
+            firstTokenId,
+          )).to.be.bignumber.equal('0');
+
+          expect(await this.token.balanceOf(
+            secondTokenHolder,
+            secondTokenId,
+          )).to.be.bignumber.equal('0');
+
+          expect(await this.token.balanceOf(
+            firstTokenHolder,
+            unknownTokenId,
+          )).to.be.bignumber.equal('0');
+        });
+      });
+
+      context('when accounts own some tokens', function () {
+        beforeEach(async function () {
+          await this.token.mint(firstTokenHolder, firstTokenId, firstAmount, '0x', {
+            from: minter,
+          });
+          await this.token.mint(
+            secondTokenHolder,
+            secondTokenId,
+            secondAmount,
+            '0x',
+            {
+              from: minter,
+            },
+          );
+        });
+
+        it('returns the amount of tokens owned by the given addresses', async function () {
+          expect(await this.token.balanceOf(
+            firstTokenHolder,
+            firstTokenId,
+          )).to.be.bignumber.equal(firstAmount);
+
+          expect(await this.token.balanceOf(
+            secondTokenHolder,
+            secondTokenId,
+          )).to.be.bignumber.equal(secondAmount);
+
+          expect(await this.token.balanceOf(
+            firstTokenHolder,
+            unknownTokenId,
+          )).to.be.bignumber.equal('0');
+        });
+      });
+    });
+
+    describe('balanceOfBatch', function () {
+      it('reverts when input arrays don\'t match up', async function () {
+        await expectRevert(
+          this.token.balanceOfBatch(
+            [firstTokenHolder, secondTokenHolder, firstTokenHolder, secondTokenHolder],
+            [firstTokenId, secondTokenId, unknownTokenId],
+          ),
+          'ERC1155: accounts and ids length mismatch',
+        );
+
+        await expectRevert(
+          this.token.balanceOfBatch(
+            [firstTokenHolder, secondTokenHolder],
+            [firstTokenId, secondTokenId, unknownTokenId],
+          ),
+          'ERC1155: accounts and ids length mismatch',
+        );
+      });
+
+      it('reverts when one of the addresses is the zero address', async function () {
+        await expectRevert(
+          this.token.balanceOfBatch(
+            [firstTokenHolder, secondTokenHolder, ZERO_ADDRESS],
+            [firstTokenId, secondTokenId, unknownTokenId],
+          ),
+//          'ERC1155: address zero is not a valid owner',
+          "VM Exception while processing transaction: reverted with reason string 'ERC1155: balance query for the zero address'",
+        );
+      });
+
+      context('when accounts don\'t own tokens', function () {
+        it('returns zeros for each account', async function () {
+          const result = await this.token.balanceOfBatch(
+            [firstTokenHolder, secondTokenHolder, firstTokenHolder],
+            [firstTokenId, secondTokenId, unknownTokenId],
+          );
+          expect(result).to.be.an('array');
+          expect(result[0]).to.be.a.bignumber.equal('0');
+          expect(result[1]).to.be.a.bignumber.equal('0');
+          expect(result[2]).to.be.a.bignumber.equal('0');
+        });
+      });
+
+      context('when accounts own some tokens', function () {
+        beforeEach(async function () {
+          await this.token.mint(firstTokenHolder, firstTokenId, firstAmount, '0x', {
+            from: minter,
+          });
+          await this.token.mint(
+            secondTokenHolder,
+            secondTokenId,
+            secondAmount,
+            '0x',
+            {
+              from: minter,
+            },
+          );
+        });
+
+        it('returns amounts owned by each account in order passed', async function () {
+          const result = await this.token.balanceOfBatch(
+            [secondTokenHolder, firstTokenHolder, firstTokenHolder],
+            [secondTokenId, firstTokenId, unknownTokenId],
+          );
+          expect(result).to.be.an('array');
+          expect(result[0]).to.be.a.bignumber.equal(secondAmount);
+          expect(result[1]).to.be.a.bignumber.equal(firstAmount);
+          expect(result[2]).to.be.a.bignumber.equal('0');
+        });
+
+        it('returns multiple times the balance of the same address when asked', async function () {
+          const result = await this.token.balanceOfBatch(
+            [firstTokenHolder, secondTokenHolder, firstTokenHolder],
+            [firstTokenId, secondTokenId, firstTokenId],
+          );
+          expect(result).to.be.an('array');
+          expect(result[0]).to.be.a.bignumber.equal(result[2]);
+          expect(result[0]).to.be.a.bignumber.equal(firstAmount);
+          expect(result[1]).to.be.a.bignumber.equal(secondAmount);
+          expect(result[2]).to.be.a.bignumber.equal(firstAmount);
+        });
+      });
+    });
+
+    describe('setApprovalForAll', function () {
+      let logs;
+      beforeEach(async function () {
+        ({ logs } = await this.token.setApprovalForAll(proxy, true, { from: multiTokenHolder }));
+      });
+
+      it('sets approval status which can be queried via isApprovedForAll', async function () {
+        expect(await this.token.isApprovedForAll(multiTokenHolder, proxy)).to.be.equal(true);
+      });
+
+      it('emits an ApprovalForAll log', function () {
+        expectEvent.inLogs(logs, 'ApprovalForAll', { account: multiTokenHolder, operator: proxy, approved: true });
+      });
+
+      it('can unset approval for an operator', async function () {
+        await this.token.setApprovalForAll(proxy, false, { from: multiTokenHolder });
+        expect(await this.token.isApprovedForAll(multiTokenHolder, proxy)).to.be.equal(false);
+      });
+
+      it('reverts if attempting to approve self as an operator', async function () {
+        await expectRevert(
+          this.token.setApprovalForAll(multiTokenHolder, true, { from: multiTokenHolder }),
+          'ERC1155: setting approval status for self',
+        );
+      });
+    });
+
+    describe('safeTransferFrom', function () {
+      beforeEach(async function () {
+        await this.token.mint(multiTokenHolder, firstTokenId, firstAmount, '0x', {
+          from: minter,
+        });
+        await this.token.mint(
+          multiTokenHolder,
+          secondTokenId,
+          secondAmount,
+          '0x',
+          {
+            from: minter,
+          },
+        );
+      });
+
+      it('reverts when transferring more than balance', async function () {
+        await expectRevert(
+          this.token.safeTransferFrom(
+            multiTokenHolder,
+            recipient,
+            firstTokenId,
+            firstAmount.addn(1),
+            '0x',
+            { from: multiTokenHolder },
+          ),
+          'ERC1155: insufficient balance for transfer',
+        );
+      });
+
+      it('reverts when transferring to zero address', async function () {
+        await expectRevert(
+          this.token.safeTransferFrom(
+            multiTokenHolder,
+            ZERO_ADDRESS,
+            firstTokenId,
+            firstAmount,
+            '0x',
+            { from: multiTokenHolder },
+          ),
+          'ERC1155: transfer to the zero address',
+        );
+      });
+
+      function transferWasSuccessful ({ operator, from, id, value }) {
+        it('debits transferred balance from sender', async function () {
+          const newBalance = await this.token.balanceOf(from, id);
+          expect(newBalance).to.be.a.bignumber.equal('0');
+        });
+
+        it('credits transferred balance to receiver', async function () {
+          const newBalance = await this.token.balanceOf(this.toWhom, id);
+          expect(newBalance).to.be.a.bignumber.equal(value);
+        });
+
+        it('emits a TransferSingle log', function () {
+          expectEvent.inLogs(this.transferLogs, 'TransferSingle', {
+            operator,
+            from,
+            to: this.toWhom,
+            id,
+            value,
+          });
+        });
+      }
+
+      context('when called by the multiTokenHolder', async function () {
+        beforeEach(async function () {
+          this.toWhom = recipient;
+          ({ logs: this.transferLogs } =
+            await this.token.safeTransferFrom(multiTokenHolder, recipient, firstTokenId, firstAmount, '0x', {
+              from: multiTokenHolder,
+            }));
+        });
+
+        transferWasSuccessful.call(this, {
+          operator: multiTokenHolder,
+          from: multiTokenHolder,
+          id: firstTokenId,
+          value: firstAmount,
+        });
+
+        it('preserves existing balances which are not transferred by multiTokenHolder', async function () {
+          const balance1 = await this.token.balanceOf(multiTokenHolder, secondTokenId);
+          expect(balance1).to.be.a.bignumber.equal(secondAmount);
+
+          const balance2 = await this.token.balanceOf(recipient, secondTokenId);
+          expect(balance2).to.be.a.bignumber.equal('0');
+        });
+      });
+
+      context('when called by an operator on behalf of the multiTokenHolder', function () {
+        context('when operator is not approved by multiTokenHolder', function () {
+          beforeEach(async function () {
+            await this.token.setApprovalForAll(proxy, false, { from: multiTokenHolder });
+          });
+
+          it('reverts', async function () {
+            await expectRevert(
+              this.token.safeTransferFrom(multiTokenHolder, recipient, firstTokenId, firstAmount, '0x', {
+                from: proxy,
+              }),
+              'ERC1155: caller is not owner nor approved',
+            );
+          });
+        });
+
+        context('when operator is approved by multiTokenHolder', function () {
+          beforeEach(async function () {
+            this.toWhom = recipient;
+            await this.token.setApprovalForAll(proxy, true, { from: multiTokenHolder });
+            ({ logs: this.transferLogs } =
+              await this.token.safeTransferFrom(multiTokenHolder, recipient, firstTokenId, firstAmount, '0x', {
+                from: proxy,
+              }));
+          });
+
+          transferWasSuccessful.call(this, {
+            operator: proxy,
+            from: multiTokenHolder,
+            id: firstTokenId,
+            value: firstAmount,
+          });
+
+          it('preserves operator\'s balances not involved in the transfer', async function () {
+            const balance1 = await this.token.balanceOf(proxy, firstTokenId);
+            expect(balance1).to.be.a.bignumber.equal('0');
+
+            const balance2 = await this.token.balanceOf(proxy, secondTokenId);
+            expect(balance2).to.be.a.bignumber.equal('0');
+          });
+        });
+      });
+
+      context('when sending to a valid receiver', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, false,
+            RECEIVER_BATCH_MAGIC_VALUE, false,
+          );
+        });
+
+        context('without data', function () {
+          beforeEach(async function () {
+            this.toWhom = this.receiver.address;
+            this.transferReceipt = await this.token.safeTransferFrom(
+              multiTokenHolder,
+              this.receiver.address,
+              firstTokenId,
+              firstAmount,
+              '0x',
+              { from: multiTokenHolder },
+            );
+            ({ logs: this.transferLogs } = this.transferReceipt);
+          });
+
+          transferWasSuccessful.call(this, {
+            operator: multiTokenHolder,
+            from: multiTokenHolder,
+            id: firstTokenId,
+            value: firstAmount,
+          });
+
+          it('calls onERC1155Received', async function () {
+            await expectEvent.inTransaction(this.transferReceipt.tx, ERC1155ReceiverMock, 'Received', {
+              operator: multiTokenHolder,
+              from: multiTokenHolder,
+              id: firstTokenId,
+              value: firstAmount,
+              data: null,
+            });
+          });
+        });
+
+        context('with data', function () {
+          const data = '0xf00dd00d';
+          beforeEach(async function () {
+            this.toWhom = this.receiver.address;
+            this.transferReceipt = await this.token.safeTransferFrom(
+              multiTokenHolder,
+              this.receiver.address,
+              firstTokenId,
+              firstAmount,
+              data,
+              { from: multiTokenHolder },
+            );
+            ({ logs: this.transferLogs } = this.transferReceipt);
+          });
+
+          transferWasSuccessful.call(this, {
+            operator: multiTokenHolder,
+            from: multiTokenHolder,
+            id: firstTokenId,
+            value: firstAmount,
+          });
+
+          it('calls onERC1155Received', async function () {
+            await expectEvent.inTransaction(this.transferReceipt.tx, ERC1155ReceiverMock, 'Received', {
+              operator: multiTokenHolder,
+              from: multiTokenHolder,
+              id: firstTokenId,
+              value: firstAmount,
+              data,
+            });
+          });
+        });
+      });
+
+      context('to a receiver contract returning unexpected value', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            '0x00c0ffee', false,
+            RECEIVER_BATCH_MAGIC_VALUE, false,
+          );
+        });
+
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.safeTransferFrom(multiTokenHolder, this.receiver.address, firstTokenId, firstAmount, '0x', {
+              from: multiTokenHolder,
+            }),
+            'ERC1155: ERC1155Receiver rejected tokens',
+          );
+        });
+      });
+
+      context('to a receiver contract that reverts', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, true,
+            RECEIVER_BATCH_MAGIC_VALUE, false,
+          );
+        });
+
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.safeTransferFrom(multiTokenHolder, this.receiver.address, firstTokenId, firstAmount, '0x', {
+              from: multiTokenHolder,
+            }),
+            'ERC1155ReceiverMock: reverting on receive',
+          );
+        });
+      });
+
+      context('to a contract that does not implement the required function', function () {
+        it('reverts', async function () {
+          const invalidReceiver = this.token;
+          await expectRevert.unspecified(
+            this.token.safeTransferFrom(multiTokenHolder, invalidReceiver.address, firstTokenId, firstAmount, '0x', {
+              from: multiTokenHolder,
+            }),
+          );
+        });
+      });
+    });
+
+    describe('safeBatchTransferFrom', function () {
+      beforeEach(async function () {
+        await this.token.mint(multiTokenHolder, firstTokenId, firstAmount, '0x', {
+          from: minter,
+        });
+        await this.token.mint(
+          multiTokenHolder,
+          secondTokenId,
+          secondAmount,
+          '0x',
+          {
+            from: minter,
+          },
+        );
+      });
+
+      it('reverts when transferring amount more than any of balances', async function () {
+        await expectRevert(
+          this.token.safeBatchTransferFrom(
+            multiTokenHolder, recipient,
+            [firstTokenId, secondTokenId],
+            [firstAmount, secondAmount.addn(1)],
+            '0x', { from: multiTokenHolder },
+          ),
+          'ERC1155: insufficient balance for transfer',
+        );
+      });
+
+      it('reverts when ids array length doesn\'t match amounts array length', async function () {
+        await expectRevert(
+          this.token.safeBatchTransferFrom(
+            multiTokenHolder, recipient,
+            [firstTokenId],
+            [firstAmount, secondAmount],
+            '0x', { from: multiTokenHolder },
+          ),
+          'ERC1155: ids and amounts length mismatch',
+        );
+
+        await expectRevert(
+          this.token.safeBatchTransferFrom(
+            multiTokenHolder, recipient,
+            [firstTokenId, secondTokenId],
+            [firstAmount],
+            '0x', { from: multiTokenHolder },
+          ),
+          'ERC1155: ids and amounts length mismatch',
+        );
+      });
+
+      it('reverts when transferring to zero address', async function () {
+        await expectRevert(
+          this.token.safeBatchTransferFrom(
+            multiTokenHolder, ZERO_ADDRESS,
+            [firstTokenId, secondTokenId],
+            [firstAmount, secondAmount],
+            '0x', { from: multiTokenHolder },
+          ),
+          'ERC1155: transfer to the zero address',
+        );
+      });
+
+      function batchTransferWasSuccessful ({ operator, from, ids, values }) {
+        it('debits transferred balances from sender', async function () {
+          const newBalances = await this.token.balanceOfBatch(new Array(ids.length).fill(from), ids);
+          for (const newBalance of newBalances) {
+            expect(newBalance).to.be.a.bignumber.equal('0');
+          }
+        });
+
+        it('credits transferred balances to receiver', async function () {
+          const newBalances = await this.token.balanceOfBatch(new Array(ids.length).fill(this.toWhom), ids);
+          for (let i = 0; i < newBalances.length; i++) {
+            expect(newBalances[i]).to.be.a.bignumber.equal(values[i]);
+          }
+        });
+
+        it('emits a TransferBatch log', function () {
+          expectEvent.inLogs(this.transferLogs, 'TransferBatch', {
+            operator,
+            from,
+            to: this.toWhom,
+            // ids,
+            // values,
+          });
+        });
+      }
+
+      context('when called by the multiTokenHolder', async function () {
+        beforeEach(async function () {
+          this.toWhom = recipient;
+          ({ logs: this.transferLogs } =
+            await this.token.safeBatchTransferFrom(
+              multiTokenHolder, recipient,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              '0x', { from: multiTokenHolder },
+            ));
+        });
+
+        batchTransferWasSuccessful.call(this, {
+          operator: multiTokenHolder,
+          from: multiTokenHolder,
+          ids: [firstTokenId, secondTokenId],
+          values: [firstAmount, secondAmount],
+        });
+      });
+
+      context('when called by an operator on behalf of the multiTokenHolder', function () {
+        context('when operator is not approved by multiTokenHolder', function () {
+          beforeEach(async function () {
+            await this.token.setApprovalForAll(proxy, false, { from: multiTokenHolder });
+          });
+
+          it('reverts', async function () {
+            await expectRevert(
+              this.token.safeBatchTransferFrom(
+                multiTokenHolder, recipient,
+                [firstTokenId, secondTokenId],
+                [firstAmount, secondAmount],
+                '0x', { from: proxy },
+              ),
+              'ERC1155: transfer caller is not owner nor approved',
+            );
+          });
+        });
+
+        context('when operator is approved by multiTokenHolder', function () {
+          beforeEach(async function () {
+            this.toWhom = recipient;
+            await this.token.setApprovalForAll(proxy, true, { from: multiTokenHolder });
+            ({ logs: this.transferLogs } =
+              await this.token.safeBatchTransferFrom(
+                multiTokenHolder, recipient,
+                [firstTokenId, secondTokenId],
+                [firstAmount, secondAmount],
+                '0x', { from: proxy },
+              ));
+          });
+
+          batchTransferWasSuccessful.call(this, {
+            operator: proxy,
+            from: multiTokenHolder,
+            ids: [firstTokenId, secondTokenId],
+            values: [firstAmount, secondAmount],
+          });
+
+          it('preserves operator\'s balances not involved in the transfer', async function () {
+            const balance1 = await this.token.balanceOf(proxy, firstTokenId);
+            expect(balance1).to.be.a.bignumber.equal('0');
+            const balance2 = await this.token.balanceOf(proxy, secondTokenId);
+            expect(balance2).to.be.a.bignumber.equal('0');
+          });
+        });
+      });
+
+      context('when sending to a valid receiver', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, false,
+            RECEIVER_BATCH_MAGIC_VALUE, false,
+          );
+        });
+
+        context('without data', function () {
+          beforeEach(async function () {
+            this.toWhom = this.receiver.address;
+            this.transferReceipt = await this.token.safeBatchTransferFrom(
+              multiTokenHolder, this.receiver.address,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              '0x', { from: multiTokenHolder },
+            );
+            ({ logs: this.transferLogs } = this.transferReceipt);
+          });
+
+          batchTransferWasSuccessful.call(this, {
+            operator: multiTokenHolder,
+            from: multiTokenHolder,
+            ids: [firstTokenId, secondTokenId],
+            values: [firstAmount, secondAmount],
+          });
+
+          it('calls onERC1155BatchReceived', async function () {
+            await expectEvent.inTransaction(this.transferReceipt.tx, ERC1155ReceiverMock, 'BatchReceived', {
+              operator: multiTokenHolder,
+              from: multiTokenHolder,
+              // ids: [firstTokenId, secondTokenId],
+              // values: [firstAmount, secondAmount],
+              data: null,
+            });
+          });
+        });
+
+        context('with data', function () {
+          const data = '0xf00dd00d';
+          beforeEach(async function () {
+            this.toWhom = this.receiver.address;
+            this.transferReceipt = await this.token.safeBatchTransferFrom(
+              multiTokenHolder, this.receiver.address,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              data, { from: multiTokenHolder },
+            );
+            ({ logs: this.transferLogs } = this.transferReceipt);
+          });
+
+          batchTransferWasSuccessful.call(this, {
+            operator: multiTokenHolder,
+            from: multiTokenHolder,
+            ids: [firstTokenId, secondTokenId],
+            values: [firstAmount, secondAmount],
+          });
+
+          it('calls onERC1155Received', async function () {
+            await expectEvent.inTransaction(this.transferReceipt.tx, ERC1155ReceiverMock, 'BatchReceived', {
+              operator: multiTokenHolder,
+              from: multiTokenHolder,
+              // ids: [firstTokenId, secondTokenId],
+              // values: [firstAmount, secondAmount],
+              data,
+            });
+          });
+        });
+      });
+
+      context('to a receiver contract returning unexpected value', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, false,
+            RECEIVER_SINGLE_MAGIC_VALUE, false,
+          );
+        });
+
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.safeBatchTransferFrom(
+              multiTokenHolder, this.receiver.address,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              '0x', { from: multiTokenHolder },
+            ),
+            'ERC1155: ERC1155Receiver rejected tokens',
+          );
+        });
+      });
+
+      context('to a receiver contract that reverts', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, false,
+            RECEIVER_BATCH_MAGIC_VALUE, true,
+          );
+        });
+
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.safeBatchTransferFrom(
+              multiTokenHolder, this.receiver.address,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              '0x', { from: multiTokenHolder },
+            ),
+            'ERC1155ReceiverMock: reverting on batch receive',
+          );
+        });
+      });
+
+      context('to a receiver contract that reverts only on single transfers', function () {
+        beforeEach(async function () {
+          this.receiver = await ERC1155ReceiverMock.new(
+            RECEIVER_SINGLE_MAGIC_VALUE, true,
+            RECEIVER_BATCH_MAGIC_VALUE, false,
+          );
+
+          this.toWhom = this.receiver.address;
+          this.transferReceipt = await this.token.safeBatchTransferFrom(
+            multiTokenHolder, this.receiver.address,
+            [firstTokenId, secondTokenId],
+            [firstAmount, secondAmount],
+            '0x', { from: multiTokenHolder },
+          );
+          ({ logs: this.transferLogs } = this.transferReceipt);
+        });
+
+        batchTransferWasSuccessful.call(this, {
+          operator: multiTokenHolder,
+          from: multiTokenHolder,
+          ids: [firstTokenId, secondTokenId],
+          values: [firstAmount, secondAmount],
+        });
+
+        it('calls onERC1155BatchReceived', async function () {
+          await expectEvent.inTransaction(this.transferReceipt.tx, ERC1155ReceiverMock, 'BatchReceived', {
+            operator: multiTokenHolder,
+            from: multiTokenHolder,
+            // ids: [firstTokenId, secondTokenId],
+            // values: [firstAmount, secondAmount],
+            data: null,
+          });
+        });
+      });
+
+      context('to a contract that does not implement the required function', function () {
+        it('reverts', async function () {
+          const invalidReceiver = this.token;
+          await expectRevert.unspecified(
+            this.token.safeBatchTransferFrom(
+              multiTokenHolder, invalidReceiver.address,
+              [firstTokenId, secondTokenId],
+              [firstAmount, secondAmount],
+              '0x', { from: multiTokenHolder },
+            ),
+          );
+        });
+      });
+    });
+
+    shouldSupportInterfaces(['ERC165', 'ERC1155']);
+  });
+}
+
+module.exports = {
+  shouldBehaveLikeERC1155,
+};
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC1155.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC1155.test.js
new file mode 100644
index 000000000..dffe054b6
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC1155.test.js
@@ -0,0 +1,264 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { ZERO_ADDRESS } = constants;
+
+const { expect } = require('chai');
+
+const { shouldBehaveLikeERC1155 } = require('./ERC1155.behavior');
+const ERC1155Mock = artifacts.require('ERC1155Mock');
+
+contract('ERC1155', function (accounts) {
+  const [operator, tokenHolder, tokenBatchHolder, ...otherAccounts] = accounts;
+
+  const initialURI = 'https://token-cdn-domain/{id}.json';
+
+  beforeEach(async function () {
+    this.token = await ERC1155Mock.new(initialURI);
+  });
+
+  shouldBehaveLikeERC1155(otherAccounts);
+
+  describe('internal functions', function () {
+    const tokenId = new BN(1990);
+    const mintAmount = new BN(9001);
+    const burnAmount = new BN(3000);
+
+    const tokenBatchIds = [new BN(2000), new BN(2010), new BN(2020)];
+    const mintAmounts = [new BN(5000), new BN(10000), new BN(42195)];
+    const burnAmounts = [new BN(5000), new BN(9001), new BN(195)];
+
+    const data = '0x12345678';
+
+    describe('_mint', function () {
+      it('reverts with a zero destination address', async function () {
+        await expectRevert(
+          this.token.mint(ZERO_ADDRESS, tokenId, mintAmount, data),
+          'ERC1155: mint to the zero address',
+        );
+      });
+
+      context('with minted tokens', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.mint(tokenHolder, tokenId, mintAmount, data, { from: operator }));
+        });
+
+        it('emits a TransferSingle event', function () {
+          expectEvent.inLogs(this.logs, 'TransferSingle', {
+            operator,
+            from: ZERO_ADDRESS,
+            to: tokenHolder,
+            id: tokenId,
+            value: mintAmount,
+          });
+        });
+
+        it('credits the minted amount of tokens', async function () {
+          expect(await this.token.balanceOf(tokenHolder, tokenId)).to.be.bignumber.equal(mintAmount);
+        });
+      });
+    });
+
+    describe('_mintBatch', function () {
+      it('reverts with a zero destination address', async function () {
+        await expectRevert(
+          this.token.mintBatch(ZERO_ADDRESS, tokenBatchIds, mintAmounts, data),
+          'ERC1155: mint to the zero address',
+        );
+      });
+
+      it('reverts if length of inputs do not match', async function () {
+        await expectRevert(
+          this.token.mintBatch(tokenBatchHolder, tokenBatchIds, mintAmounts.slice(1), data),
+          'ERC1155: ids and amounts length mismatch',
+        );
+
+        await expectRevert(
+          this.token.mintBatch(tokenBatchHolder, tokenBatchIds.slice(1), mintAmounts, data),
+          'ERC1155: ids and amounts length mismatch',
+        );
+      });
+
+      context('with minted batch of tokens', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.mintBatch(
+            tokenBatchHolder,
+            tokenBatchIds,
+            mintAmounts,
+            data,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferBatch event', function () {
+          expectEvent.inLogs(this.logs, 'TransferBatch', {
+            operator,
+            from: ZERO_ADDRESS,
+            to: tokenBatchHolder,
+          });
+        });
+
+        it('credits the minted batch of tokens', async function () {
+          const holderBatchBalances = await this.token.balanceOfBatch(
+            new Array(tokenBatchIds.length).fill(tokenBatchHolder),
+            tokenBatchIds,
+          );
+
+          for (let i = 0; i < holderBatchBalances.length; i++) {
+            expect(holderBatchBalances[i]).to.be.bignumber.equal(mintAmounts[i]);
+          }
+        });
+      });
+    });
+
+    describe('_burn', function () {
+      it('reverts when burning the zero account\'s tokens', async function () {
+        await expectRevert(
+          this.token.burn(ZERO_ADDRESS, tokenId, mintAmount),
+          'ERC1155: burn from the zero address',
+        );
+      });
+
+      it('reverts when burning a non-existent token id', async function () {
+        await expectRevert(
+          this.token.burn(tokenHolder, tokenId, mintAmount),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      it('reverts when burning more than available tokens', async function () {
+        await this.token.mint(
+          tokenHolder,
+          tokenId,
+          mintAmount,
+          data,
+          { from: operator },
+        );
+
+        await expectRevert(
+          this.token.burn(tokenHolder, tokenId, mintAmount.addn(1)),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      context('with minted-then-burnt tokens', function () {
+        beforeEach(async function () {
+          await this.token.mint(tokenHolder, tokenId, mintAmount, data);
+          ({ logs: this.logs } = await this.token.burn(
+            tokenHolder,
+            tokenId,
+            burnAmount,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferSingle event', function () {
+          expectEvent.inLogs(this.logs, 'TransferSingle', {
+            operator,
+            from: tokenHolder,
+            to: ZERO_ADDRESS,
+            id: tokenId,
+            value: burnAmount,
+          });
+        });
+
+        it('accounts for both minting and burning', async function () {
+          expect(await this.token.balanceOf(
+            tokenHolder,
+            tokenId,
+          )).to.be.bignumber.equal(mintAmount.sub(burnAmount));
+        });
+      });
+    });
+
+    describe('_burnBatch', function () {
+      it('reverts when burning the zero account\'s tokens', async function () {
+        await expectRevert(
+          this.token.burnBatch(ZERO_ADDRESS, tokenBatchIds, burnAmounts),
+          'ERC1155: burn from the zero address',
+        );
+      });
+
+      it('reverts if length of inputs do not match', async function () {
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts.slice(1)),
+          'ERC1155: ids and amounts length mismatch',
+        );
+
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds.slice(1), burnAmounts),
+          'ERC1155: ids and amounts length mismatch',
+        );
+      });
+
+      it('reverts when burning a non-existent token id', async function () {
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      context('with minted-then-burnt tokens', function () {
+        beforeEach(async function () {
+          await this.token.mintBatch(tokenBatchHolder, tokenBatchIds, mintAmounts, data);
+          ({ logs: this.logs } = await this.token.burnBatch(
+            tokenBatchHolder,
+            tokenBatchIds,
+            burnAmounts,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferBatch event', function () {
+          expectEvent.inLogs(this.logs, 'TransferBatch', {
+            operator,
+            from: tokenBatchHolder,
+            to: ZERO_ADDRESS,
+            // ids: tokenBatchIds,
+            // values: burnAmounts,
+          });
+        });
+
+        it('accounts for both minting and burning', async function () {
+          const holderBatchBalances = await this.token.balanceOfBatch(
+            new Array(tokenBatchIds.length).fill(tokenBatchHolder),
+            tokenBatchIds,
+          );
+
+          for (let i = 0; i < holderBatchBalances.length; i++) {
+            expect(holderBatchBalances[i]).to.be.bignumber.equal(mintAmounts[i].sub(burnAmounts[i]));
+          }
+        });
+      });
+    });
+  });
+
+  describe('ERC1155MetadataURI', function () {
+    const firstTokenID = new BN('42');
+    const secondTokenID = new BN('1337');
+
+    it('emits no URI event in constructor', async function () {
+      await expectEvent.notEmitted.inConstruction(this.token, 'URI');
+    });
+
+    it('sets the initial URI for all token types', async function () {
+      expect(await this.token.uri(firstTokenID)).to.be.equal(initialURI);
+      expect(await this.token.uri(secondTokenID)).to.be.equal(initialURI);
+    });
+
+    describe('_setURI', function () {
+      const newURI = 'https://token-cdn-domain/{locale}/{id}.json';
+
+      it('emits no URI event', async function () {
+        const receipt = await this.token.setURI(newURI);
+
+        expectEvent.notEmitted(receipt, 'URI');
+      });
+
+      it('sets the new URI for all token types', async function () {
+        await this.token.setURI(newURI);
+
+        expect(await this.token.uri(firstTokenID)).to.be.equal(newURI);
+        expect(await this.token.uri(secondTokenID)).to.be.equal(newURI);
+      });
+    });
+  });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC1155_Sol.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC1155_Sol.test.js
new file mode 100644
index 000000000..8e675cfb0
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC1155_Sol.test.js
@@ -0,0 +1,264 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { ZERO_ADDRESS } = constants;
+
+const { expect } = require('chai');
+
+const { shouldBehaveLikeERC1155 } = require('./ERC1155.behavior');
+const ERC1155Mock = artifacts.require('ERC1155Mock_Sol');
+
+contract('ERC1155', function (accounts) {
+  const [operator, tokenHolder, tokenBatchHolder, ...otherAccounts] = accounts;
+
+  const initialURI = 'https://token-cdn-domain/{id}.json';
+
+  beforeEach(async function () {
+    this.token = await ERC1155Mock.new(initialURI);
+  });
+
+  shouldBehaveLikeERC1155(otherAccounts);
+
+  describe('internal functions', function () {
+    const tokenId = new BN(1990);
+    const mintAmount = new BN(9001);
+    const burnAmount = new BN(3000);
+
+    const tokenBatchIds = [new BN(2000), new BN(2010), new BN(2020)];
+    const mintAmounts = [new BN(5000), new BN(10000), new BN(42195)];
+    const burnAmounts = [new BN(5000), new BN(9001), new BN(195)];
+
+    const data = '0x12345678';
+
+    describe('_mint', function () {
+      it('reverts with a zero destination address', async function () {
+        await expectRevert(
+          this.token.mint(ZERO_ADDRESS, tokenId, mintAmount, data),
+          'ERC1155: mint to the zero address',
+        );
+      });
+
+      context('with minted tokens', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.mint(tokenHolder, tokenId, mintAmount, data, { from: operator }));
+        });
+
+        it('emits a TransferSingle event', function () {
+          expectEvent.inLogs(this.logs, 'TransferSingle', {
+            operator,
+            from: ZERO_ADDRESS,
+            to: tokenHolder,
+            id: tokenId,
+            value: mintAmount,
+          });
+        });
+
+        it('credits the minted amount of tokens', async function () {
+          expect(await this.token.balanceOf(tokenHolder, tokenId)).to.be.bignumber.equal(mintAmount);
+        });
+      });
+    });
+
+    describe('_mintBatch', function () {
+      it('reverts with a zero destination address', async function () {
+        await expectRevert(
+          this.token.mintBatch(ZERO_ADDRESS, tokenBatchIds, mintAmounts, data),
+          'ERC1155: mint to the zero address',
+        );
+      });
+
+      it('reverts if length of inputs do not match', async function () {
+        await expectRevert(
+          this.token.mintBatch(tokenBatchHolder, tokenBatchIds, mintAmounts.slice(1), data),
+          'ERC1155: ids and amounts length mismatch',
+        );
+
+        await expectRevert(
+          this.token.mintBatch(tokenBatchHolder, tokenBatchIds.slice(1), mintAmounts, data),
+          'ERC1155: ids and amounts length mismatch',
+        );
+      });
+
+      context('with minted batch of tokens', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.mintBatch(
+            tokenBatchHolder,
+            tokenBatchIds,
+            mintAmounts,
+            data,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferBatch event', function () {
+          expectEvent.inLogs(this.logs, 'TransferBatch', {
+            operator,
+            from: ZERO_ADDRESS,
+            to: tokenBatchHolder,
+          });
+        });
+
+        it('credits the minted batch of tokens', async function () {
+          const holderBatchBalances = await this.token.balanceOfBatch(
+            new Array(tokenBatchIds.length).fill(tokenBatchHolder),
+            tokenBatchIds,
+          );
+
+          for (let i = 0; i < holderBatchBalances.length; i++) {
+            expect(holderBatchBalances[i]).to.be.bignumber.equal(mintAmounts[i]);
+          }
+        });
+      });
+    });
+
+    describe('_burn', function () {
+      it('reverts when burning the zero account\'s tokens', async function () {
+        await expectRevert(
+          this.token.burn(ZERO_ADDRESS, tokenId, mintAmount),
+          'ERC1155: burn from the zero address',
+        );
+      });
+
+      it('reverts when burning a non-existent token id', async function () {
+        await expectRevert(
+          this.token.burn(tokenHolder, tokenId, mintAmount),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      it('reverts when burning more than available tokens', async function () {
+        await this.token.mint(
+          tokenHolder,
+          tokenId,
+          mintAmount,
+          data,
+          { from: operator },
+        );
+
+        await expectRevert(
+          this.token.burn(tokenHolder, tokenId, mintAmount.addn(1)),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      context('with minted-then-burnt tokens', function () {
+        beforeEach(async function () {
+          await this.token.mint(tokenHolder, tokenId, mintAmount, data);
+          ({ logs: this.logs } = await this.token.burn(
+            tokenHolder,
+            tokenId,
+            burnAmount,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferSingle event', function () {
+          expectEvent.inLogs(this.logs, 'TransferSingle', {
+            operator,
+            from: tokenHolder,
+            to: ZERO_ADDRESS,
+            id: tokenId,
+            value: burnAmount,
+          });
+        });
+
+        it('accounts for both minting and burning', async function () {
+          expect(await this.token.balanceOf(
+            tokenHolder,
+            tokenId,
+          )).to.be.bignumber.equal(mintAmount.sub(burnAmount));
+        });
+      });
+    });
+
+    describe('_burnBatch', function () {
+      it('reverts when burning the zero account\'s tokens', async function () {
+        await expectRevert(
+          this.token.burnBatch(ZERO_ADDRESS, tokenBatchIds, burnAmounts),
+          'ERC1155: burn from the zero address',
+        );
+      });
+
+      it('reverts if length of inputs do not match', async function () {
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts.slice(1)),
+          'ERC1155: ids and amounts length mismatch',
+        );
+
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds.slice(1), burnAmounts),
+          'ERC1155: ids and amounts length mismatch',
+        );
+      });
+
+      it('reverts when burning a non-existent token id', async function () {
+        await expectRevert(
+          this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts),
+          'ERC1155: burn amount exceeds balance',
+        );
+      });
+
+      context('with minted-then-burnt tokens', function () {
+        beforeEach(async function () {
+          await this.token.mintBatch(tokenBatchHolder, tokenBatchIds, mintAmounts, data);
+          ({ logs: this.logs } = await this.token.burnBatch(
+            tokenBatchHolder,
+            tokenBatchIds,
+            burnAmounts,
+            { from: operator },
+          ));
+        });
+
+        it('emits a TransferBatch event', function () {
+          expectEvent.inLogs(this.logs, 'TransferBatch', {
+            operator,
+            from: tokenBatchHolder,
+            to: ZERO_ADDRESS,
+            // ids: tokenBatchIds,
+            // values: burnAmounts,
+          });
+        });
+
+        it('accounts for both minting and burning', async function () {
+          const holderBatchBalances = await this.token.balanceOfBatch(
+            new Array(tokenBatchIds.length).fill(tokenBatchHolder),
+            tokenBatchIds,
+          );
+
+          for (let i = 0; i < holderBatchBalances.length; i++) {
+            expect(holderBatchBalances[i]).to.be.bignumber.equal(mintAmounts[i].sub(burnAmounts[i]));
+          }
+        });
+      });
+    });
+  });
+
+  describe('ERC1155MetadataURI', function () {
+    const firstTokenID = new BN('42');
+    const secondTokenID = new BN('1337');
+
+    it('emits no URI event in constructor', async function () {
+      await expectEvent.notEmitted.inConstruction(this.token, 'URI');
+    });
+
+    it('sets the initial URI for all token types', async function () {
+      expect(await this.token.uri(firstTokenID)).to.be.equal(initialURI);
+      expect(await this.token.uri(secondTokenID)).to.be.equal(initialURI);
+    });
+
+    describe('_setURI', function () {
+      const newURI = 'https://token-cdn-domain/{locale}/{id}.json';
+
+      it('emits no URI event', async function () {
+        const receipt = await this.token.setURI(newURI);
+
+        expectEvent.notEmitted(receipt, 'URI');
+      });
+
+      it('sets the new URI for all token types', async function () {
+        await this.token.setURI(newURI);
+
+        expect(await this.token.uri(firstTokenID)).to.be.equal(newURI);
+        expect(await this.token.uri(secondTokenID)).to.be.equal(newURI);
+      });
+    });
+  });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC20.behavior.js b/vendors/move/crates/evm/hardhat-examples/test/ERC20.behavior.js
new file mode 100644
index 000000000..8bc54762a
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC20.behavior.js
@@ -0,0 +1,333 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS, MAX_UINT256 } = constants;
+
+function shouldBehaveLikeERC20 (errorPrefix, initialSupply, initialHolder, recipient, anotherAccount) {
+  describe('total supply', function () {
+    it('returns the total amount of tokens', async function () {
+      expect(await this.token.totalSupply()).to.be.bignumber.equal(initialSupply);
+    });
+  });
+
+  describe('balanceOf', function () {
+    describe('when the requested account has no tokens', function () {
+      it('returns zero', async function () {
+        expect(await this.token.balanceOf(anotherAccount)).to.be.bignumber.equal('0');
+      });
+    });
+
+    describe('when the requested account has some tokens', function () {
+      it('returns the total amount of tokens', async function () {
+        expect(await this.token.balanceOf(initialHolder)).to.be.bignumber.equal(initialSupply);
+      });
+    });
+  });
+
+  describe('transfer', function () {
+    shouldBehaveLikeERC20Transfer(errorPrefix, initialHolder, recipient, initialSupply,
+      function (from, to, value) {
+        return this.token.transfer(to, value, { from });
+      },
+    );
+  });
+
+  describe('transfer from', function () {
+    const spender = recipient;
+
+    describe('when the token owner is not the zero address', function () {
+      const tokenOwner = initialHolder;
+
+      describe('when the recipient is not the zero address', function () {
+        const to = anotherAccount;
+
+        describe('when the spender has enough allowance', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, initialSupply, { from: initialHolder });
+          });
+
+          describe('when the token owner has enough balance', function () {
+            const amount = initialSupply;
+
+            it('transfers the requested amount', async function () {
+              await this.token.transferFrom(tokenOwner, to, amount, { from: spender });
+
+              expect(await this.token.balanceOf(tokenOwner)).to.be.bignumber.equal('0');
+
+              expect(await this.token.balanceOf(to)).to.be.bignumber.equal(amount);
+            });
+
+            it('decreases the spender allowance', async function () {
+              await this.token.transferFrom(tokenOwner, to, amount, { from: spender });
+
+              expect(await this.token.allowance(tokenOwner, spender)).to.be.bignumber.equal('0');
+            });
+
+            it('emits a transfer event', async function () {
+              expectEvent(
+                await this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+                'Transfer',
+                { from: tokenOwner, to: to, value: amount },
+              );
+            });
+
+            it('emits an approval event', async function () {
+              expectEvent(
+                await this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+                'Approval',
+                { owner: tokenOwner, spender: spender, value: await this.token.allowance(tokenOwner, spender) },
+              );
+            });
+          });
+
+          describe('when the token owner does not have enough balance', function () {
+            const amount = initialSupply;
+
+            beforeEach('reducing balance', async function () {
+              await this.token.transfer(to, 1, { from: tokenOwner });
+            });
+
+            it('reverts', async function () {
+              await expectRevert(
+                this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+                `${errorPrefix}: transfer amount exceeds balance`,
+              );
+            });
+          });
+        });
+
+        describe('when the spender does not have enough allowance', function () {
+          const allowance = initialSupply.subn(1);
+
+          beforeEach(async function () {
+            await this.token.approve(spender, allowance, { from: tokenOwner });
+          });
+
+          describe('when the token owner has enough balance', function () {
+            const amount = initialSupply;
+
+            it('reverts', async function () {
+              await expectRevert(
+                this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+                `${errorPrefix}: insufficient allowance`,
+              );
+            });
+          });
+
+          describe('when the token owner does not have enough balance', function () {
+            const amount = allowance;
+
+            beforeEach('reducing balance', async function () {
+              await this.token.transfer(to, 2, { from: tokenOwner });
+            });
+
+            it('reverts', async function () {
+              await expectRevert(
+                this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+                `${errorPrefix}: transfer amount exceeds balance`,
+              );
+            });
+          });
+        });
+
+        describe('when the spender has unlimited allowance', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, MAX_UINT256, { from: initialHolder });
+          });
+
+          it('does not decrease the spender allowance', async function () {
+            await this.token.transferFrom(tokenOwner, to, 1, { from: spender });
+
+            expect(await this.token.allowance(tokenOwner, spender)).to.be.bignumber.equal(MAX_UINT256);
+          });
+
+          it('does not emit an approval event', async function () {
+            expectEvent.notEmitted(
+              await this.token.transferFrom(tokenOwner, to, 1, { from: spender }),
+              'Approval',
+            );
+          });
+        });
+      });
+
+      describe('when the recipient is the zero address', function () {
+        const amount = initialSupply;
+        const to = ZERO_ADDRESS;
+
+        beforeEach(async function () {
+          await this.token.approve(spender, amount, { from: tokenOwner });
+        });
+
+        it('reverts', async function () {
+          await expectRevert(this.token.transferFrom(
+            tokenOwner, to, amount, { from: spender }), `${errorPrefix}: transfer to the zero address`,
+          );
+        });
+      });
+    });
+
+    describe('when the token owner is the zero address', function () {
+      const amount = 0;
+      const tokenOwner = ZERO_ADDRESS;
+      const to = recipient;
+
+      it('reverts', async function () {
+        await expectRevert(
+          this.token.transferFrom(tokenOwner, to, amount, { from: spender }),
+          'from the zero address',
+        );
+      });
+    });
+  });
+
+  describe('approve', function () {
+    shouldBehaveLikeERC20Approve(errorPrefix, initialHolder, recipient, initialSupply,
+      function (owner, spender, amount) {
+        return this.token.approve(spender, amount, { from: owner });
+      },
+    );
+  });
+}
+
+function shouldBehaveLikeERC20Transfer (errorPrefix, from, to, balance, transfer) {
+  describe('when the recipient is not the zero address', function () {
+    describe('when the sender does not have enough balance', function () {
+      const amount = balance.addn(1);
+
+      it('reverts', async function () {
+        await expectRevert(transfer.call(this, from, to, amount),
+          `${errorPrefix}: transfer amount exceeds balance`,
+        );
+      });
+    });
+
+    describe('when the sender transfers all balance', function () {
+      const amount = balance;
+
+      it('transfers the requested amount', async function () {
+        await transfer.call(this, from, to, amount);
+
+        expect(await this.token.balanceOf(from)).to.be.bignumber.equal('0');
+
+        expect(await this.token.balanceOf(to)).to.be.bignumber.equal(amount);
+      });
+
+      it('emits a transfer event', async function () {
+        expectEvent(
+          await transfer.call(this, from, to, amount),
+          'Transfer',
+          { from, to, value: amount },
+        );
+      });
+    });
+
+    describe('when the sender transfers zero tokens', function () {
+      const amount = new BN('0');
+
+      it('transfers the requested amount', async function () {
+        await transfer.call(this, from, to, amount);
+
+        expect(await this.token.balanceOf(from)).to.be.bignumber.equal(balance);
+
+        expect(await this.token.balanceOf(to)).to.be.bignumber.equal('0');
+      });
+
+      it('emits a transfer event', async function () {
+        expectEvent(
+          await transfer.call(this, from, to, amount),
+          'Transfer',
+          { from, to, value: amount },
+        );
+      });
+    });
+  });
+
+  describe('when the recipient is the zero address', function () {
+    it('reverts', async function () {
+      await expectRevert(transfer.call(this, from, ZERO_ADDRESS, balance),
+        `${errorPrefix}: transfer to the zero address`,
+      );
+    });
+  });
+}
+
+function shouldBehaveLikeERC20Approve (errorPrefix, owner, spender, supply, approve) {
+  describe('when the spender is not the zero address', function () {
+    describe('when the sender has enough balance', function () {
+      const amount = supply;
+
+      it('emits an approval event', async function () {
+        expectEvent(
+          await approve.call(this, owner, spender, amount),
+          'Approval',
+          { owner: owner, spender: spender, value: amount },
+        );
+      });
+
+      describe('when there was no approved amount before', function () {
+        it('approves the requested amount', async function () {
+          await approve.call(this, owner, spender, amount);
+
+          expect(await this.token.allowance(owner, spender)).to.be.bignumber.equal(amount);
+        });
+      });
+
+      describe('when the spender had an approved amount', function () {
+        beforeEach(async function () {
+          await approve.call(this, owner, spender, new BN(1));
+        });
+
+        it('approves the requested amount and replaces the previous one', async function () {
+          await approve.call(this, owner, spender, amount);
+
+          expect(await this.token.allowance(owner, spender)).to.be.bignumber.equal(amount);
+        });
+      });
+    });
+
+    describe('when the sender does not have enough balance', function () {
+      const amount = supply.addn(1);
+
+      it('emits an approval event', async function () {
+        expectEvent(
+          await approve.call(this, owner, spender, amount),
+          'Approval',
+          { owner: owner, spender: spender, value: amount },
+        );
+      });
+
+      describe('when there was no approved amount before', function () {
+        it('approves the requested amount', async function () {
+          await approve.call(this, owner, spender, amount);
+
+          expect(await this.token.allowance(owner, spender)).to.be.bignumber.equal(amount);
+        });
+      });
+
+      describe('when the spender had an approved amount', function () {
+        beforeEach(async function () {
+          await approve.call(this, owner, spender, new BN(1));
+        });
+
+        it('approves the requested amount and replaces the previous one', async function () {
+          await approve.call(this, owner, spender, amount);
+
+          expect(await this.token.allowance(owner, spender)).to.be.bignumber.equal(amount);
+        });
+      });
+    });
+  });
+
+  describe('when the spender is the zero address', function () {
+    it('reverts', async function () {
+      await expectRevert(approve.call(this, owner, ZERO_ADDRESS, supply),
+        `${errorPrefix}: approve to the zero address`,
+      );
+    });
+  });
+}
+
+module.exports = {
+  shouldBehaveLikeERC20,
+  shouldBehaveLikeERC20Transfer,
+  shouldBehaveLikeERC20Approve,
+};
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC20.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC20.test.js
new file mode 100644
index 000000000..992edf93b
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC20.test.js
@@ -0,0 +1,309 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS } = constants;
+
+const {
+  shouldBehaveLikeERC20,
+  shouldBehaveLikeERC20Transfer,
+  shouldBehaveLikeERC20Approve,
+} = require('./ERC20.behavior');
+
+const ERC20Mock = artifacts.require('ERC20Mock');
+const ERC20DecimalsMock = artifacts.require('ERC20DecimalsMock');
+
+contract('ERC20', function (accounts) {
+  const [ initialHolder, recipient, anotherAccount ] = accounts;
+
+  const name = 'My Token';
+  const symbol = 'MTKN';
+
+  const initialSupply = new BN(100);
+
+  beforeEach(async function () {
+    this.token = await ERC20Mock.new(name, symbol, initialHolder, initialSupply);
+  });
+
+  it('has a name', async function () {
+    expect(await this.token.name()).to.equal(name);
+  });
+
+  it('has a symbol', async function () {
+    expect(await this.token.symbol()).to.equal(symbol);
+  });
+
+  it('has 18 decimals', async function () {
+    expect(await this.token.decimals()).to.be.bignumber.equal('18');
+  });
+
+  describe('set decimals', function () {
+    const decimals = new BN(6);
+
+    it('can set decimals during construction', async function () {
+      const token = await ERC20DecimalsMock.new(name, symbol, decimals);
+      expect(await token.decimals()).to.be.bignumber.equal(decimals);
+    });
+  });
+
+  shouldBehaveLikeERC20('ERC20', initialSupply, initialHolder, recipient, anotherAccount);
+
+  describe('decrease allowance', function () {
+    describe('when the spender is not the zero address', function () {
+      const spender = recipient;
+
+      function shouldDecreaseApproval (amount) {
+        describe('when there was no approved amount before', function () {
+          it('reverts', async function () {
+            await expectRevert(this.token.decreaseAllowance(
+              spender, amount, { from: initialHolder }), 'ERC20: decreased allowance below zero',
+            );
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          const approvedAmount = amount;
+
+          beforeEach(async function () {
+            await this.token.approve(spender, approvedAmount, { from: initialHolder });
+          });
+
+          it('emits an approval event', async function () {
+            expectEvent(
+              await this.token.decreaseAllowance(spender, approvedAmount, { from: initialHolder }),
+              'Approval',
+              { owner: initialHolder, spender: spender, value: new BN(0) },
+            );
+          });
+
+          it('decreases the spender allowance subtracting the requested amount', async function () {
+            await this.token.decreaseAllowance(spender, approvedAmount.subn(1), { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal('1');
+          });
+
+          it('sets the allowance to zero when all allowance is removed', async function () {
+            await this.token.decreaseAllowance(spender, approvedAmount, { from: initialHolder });
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal('0');
+          });
+
+          it('reverts when more than the full allowance is removed', async function () {
+            await expectRevert(
+              this.token.decreaseAllowance(spender, approvedAmount.addn(1), { from: initialHolder }),
+              'ERC20: decreased allowance below zero',
+            );
+          });
+        });
+      }
+
+      describe('when the sender has enough balance', function () {
+        const amount = initialSupply;
+
+        shouldDecreaseApproval(amount);
+      });
+
+      describe('when the sender does not have enough balance', function () {
+        const amount = initialSupply.addn(1);
+
+        shouldDecreaseApproval(amount);
+      });
+    });
+
+    describe('when the spender is the zero address', function () {
+      const amount = initialSupply;
+      const spender = ZERO_ADDRESS;
+
+      it('reverts', async function () {
+        await expectRevert(this.token.decreaseAllowance(
+          spender, amount, { from: initialHolder }), 'ERC20: decreased allowance below zero',
+        );
+      });
+    });
+  });
+
+  describe('increase allowance', function () {
+    const amount = initialSupply;
+
+    describe('when the spender is not the zero address', function () {
+      const spender = recipient;
+
+      describe('when the sender has enough balance', function () {
+        it('emits an approval event', async function () {
+          expectEvent(
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder }),
+            'Approval',
+            { owner: initialHolder, spender: spender, value: amount },
+          );
+        });
+
+        describe('when there was no approved amount before', function () {
+          it('approves the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount);
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, new BN(1), { from: initialHolder });
+          });
+
+          it('increases the spender allowance adding the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount.addn(1));
+          });
+        });
+      });
+
+      describe('when the sender does not have enough balance', function () {
+        const amount = initialSupply.addn(1);
+
+        it('emits an approval event', async function () {
+          expectEvent(
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder }),
+            'Approval',
+            { owner: initialHolder, spender: spender, value: amount },
+          );
+        });
+
+        describe('when there was no approved amount before', function () {
+          it('approves the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount);
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, new BN(1), { from: initialHolder });
+          });
+
+          it('increases the spender allowance adding the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount.addn(1));
+          });
+        });
+      });
+    });
+
+    describe('when the spender is the zero address', function () {
+      const spender = ZERO_ADDRESS;
+
+      it('reverts', async function () {
+        await expectRevert(
+          this.token.increaseAllowance(spender, amount, { from: initialHolder }), 'ERC20: approve to the zero address',
+        );
+      });
+    });
+  });
+
+  describe('_mint', function () {
+    const amount = new BN(50);
+    it('rejects a null account', async function () {
+      await expectRevert(
+        this.token.mint(ZERO_ADDRESS, amount), 'ERC20: mint to the zero address',
+      );
+    });
+
+    describe('for a non zero account', function () {
+      beforeEach('minting', async function () {
+        this.receipt = await this.token.mint(recipient, amount);
+      });
+
+      it('increments totalSupply', async function () {
+        const expectedSupply = initialSupply.add(amount);
+        expect(await this.token.totalSupply()).to.be.bignumber.equal(expectedSupply);
+      });
+
+      it('increments recipient balance', async function () {
+        expect(await this.token.balanceOf(recipient)).to.be.bignumber.equal(amount);
+      });
+
+      it('emits Transfer event', async function () {
+        const event = expectEvent(
+          this.receipt,
+          'Transfer',
+          { from: ZERO_ADDRESS, to: recipient },
+        );
+
+        expect(event.args.value).to.be.bignumber.equal(amount);
+      });
+    });
+  });
+
+  describe('_burn', function () {
+    it('rejects a null account', async function () {
+      await expectRevert(this.token.burn(ZERO_ADDRESS, new BN(1)),
+        'ERC20: burn from the zero address');
+    });
+
+    describe('for a non zero account', function () {
+      it('rejects burning more than balance', async function () {
+        await expectRevert(this.token.burn(
+          initialHolder, initialSupply.addn(1)), 'ERC20: burn amount exceeds balance',
+        );
+      });
+
+      const describeBurn = function (description, amount) {
+        describe(description, function () {
+          beforeEach('burning', async function () {
+            this.receipt = await this.token.burn(initialHolder, amount);
+          });
+
+          it('decrements totalSupply', async function () {
+            const expectedSupply = initialSupply.sub(amount);
+            expect(await this.token.totalSupply()).to.be.bignumber.equal(expectedSupply);
+          });
+
+          it('decrements initialHolder balance', async function () {
+            const expectedBalance = initialSupply.sub(amount);
+            expect(await this.token.balanceOf(initialHolder)).to.be.bignumber.equal(expectedBalance);
+          });
+
+          it('emits Transfer event', async function () {
+            const event = expectEvent(
+              this.receipt,
+              'Transfer',
+              { from: initialHolder, to: ZERO_ADDRESS },
+            );
+
+            expect(event.args.value).to.be.bignumber.equal(amount);
+          });
+        });
+      };
+
+      describeBurn('for entire balance', initialSupply);
+      describeBurn('for less amount than balance', initialSupply.subn(1));
+    });
+  });
+
+  describe('_transfer', function () {
+    shouldBehaveLikeERC20Transfer('ERC20', initialHolder, recipient, initialSupply, function (from, to, amount) {
+      return this.token.transferInternal(from, to, amount);
+    });
+
+    describe('when the sender is the zero address', function () {
+      it('reverts', async function () {
+        await expectRevert(this.token.transferInternal(ZERO_ADDRESS, recipient, initialSupply),
+          'ERC20: transfer from the zero address',
+        );
+      });
+    });
+  });
+
+  describe('_approve', function () {
+    shouldBehaveLikeERC20Approve('ERC20', initialHolder, recipient, initialSupply, function (owner, spender, amount) {
+      return this.token.approveInternal(owner, spender, amount);
+    });
+
+    describe('when the owner is the zero address', function () {
+      it('reverts', async function () {
+        await expectRevert(this.token.approveInternal(ZERO_ADDRESS, recipient, initialSupply),
+          'ERC20: approve from the zero address',
+        );
+      });
+    });
+  });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC20_Sol.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC20_Sol.test.js
new file mode 100644
index 000000000..2da6d63c8
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC20_Sol.test.js
@@ -0,0 +1,309 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS } = constants;
+
+const {
+  shouldBehaveLikeERC20,
+  shouldBehaveLikeERC20Transfer,
+  shouldBehaveLikeERC20Approve,
+} = require('./ERC20.behavior');
+
+const ERC20Mock = artifacts.require('ERC20Mock_Sol');
+const ERC20DecimalsMock = artifacts.require('ERC20DecimalsMock_Sol');
+
+contract('ERC20', function (accounts) {
+  const [ initialHolder, recipient, anotherAccount ] = accounts;
+
+  const name = 'My Token';
+  const symbol = 'MTKN';
+
+  const initialSupply = new BN(100);
+
+  beforeEach(async function () {
+    this.token = await ERC20Mock.new(name, symbol, initialHolder, initialSupply);
+  });
+
+  it('has a name', async function () {
+    expect(await this.token.name()).to.equal(name);
+  });
+
+  it('has a symbol', async function () {
+    expect(await this.token.symbol()).to.equal(symbol);
+  });
+
+  it('has 18 decimals', async function () {
+    expect(await this.token.decimals()).to.be.bignumber.equal('18');
+  });
+
+  describe('set decimals', function () {
+    const decimals = new BN(6);
+
+    it('can set decimals during construction', async function () {
+      const token = await ERC20DecimalsMock.new(name, symbol, decimals);
+      expect(await token.decimals()).to.be.bignumber.equal(decimals);
+    });
+  });
+
+  shouldBehaveLikeERC20('ERC20', initialSupply, initialHolder, recipient, anotherAccount);
+
+  describe('decrease allowance', function () {
+    describe('when the spender is not the zero address', function () {
+      const spender = recipient;
+
+      function shouldDecreaseApproval (amount) {
+        describe('when there was no approved amount before', function () {
+          it('reverts', async function () {
+            await expectRevert(this.token.decreaseAllowance(
+              spender, amount, { from: initialHolder }), 'ERC20: decreased allowance below zero',
+            );
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          const approvedAmount = amount;
+
+          beforeEach(async function () {
+            await this.token.approve(spender, approvedAmount, { from: initialHolder });
+          });
+
+          it('emits an approval event', async function () {
+            expectEvent(
+              await this.token.decreaseAllowance(spender, approvedAmount, { from: initialHolder }),
+              'Approval',
+              { owner: initialHolder, spender: spender, value: new BN(0) },
+            );
+          });
+
+          it('decreases the spender allowance subtracting the requested amount', async function () {
+            await this.token.decreaseAllowance(spender, approvedAmount.subn(1), { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal('1');
+          });
+
+          it('sets the allowance to zero when all allowance is removed', async function () {
+            await this.token.decreaseAllowance(spender, approvedAmount, { from: initialHolder });
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal('0');
+          });
+
+          it('reverts when more than the full allowance is removed', async function () {
+            await expectRevert(
+              this.token.decreaseAllowance(spender, approvedAmount.addn(1), { from: initialHolder }),
+              'ERC20: decreased allowance below zero',
+            );
+          });
+        });
+      }
+
+      describe('when the sender has enough balance', function () {
+        const amount = initialSupply;
+
+        shouldDecreaseApproval(amount);
+      });
+
+      describe('when the sender does not have enough balance', function () {
+        const amount = initialSupply.addn(1);
+
+        shouldDecreaseApproval(amount);
+      });
+    });
+
+    describe('when the spender is the zero address', function () {
+      const amount = initialSupply;
+      const spender = ZERO_ADDRESS;
+
+      it('reverts', async function () {
+        await expectRevert(this.token.decreaseAllowance(
+          spender, amount, { from: initialHolder }), 'ERC20: decreased allowance below zero',
+        );
+      });
+    });
+  });
+
+  describe('increase allowance', function () {
+    const amount = initialSupply;
+
+    describe('when the spender is not the zero address', function () {
+      const spender = recipient;
+
+      describe('when the sender has enough balance', function () {
+        it('emits an approval event', async function () {
+          expectEvent(
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder }),
+            'Approval',
+            { owner: initialHolder, spender: spender, value: amount },
+          );
+        });
+
+        describe('when there was no approved amount before', function () {
+          it('approves the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount);
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, new BN(1), { from: initialHolder });
+          });
+
+          it('increases the spender allowance adding the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount.addn(1));
+          });
+        });
+      });
+
+      describe('when the sender does not have enough balance', function () {
+        const amount = initialSupply.addn(1);
+
+        it('emits an approval event', async function () {
+          expectEvent(
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder }),
+            'Approval',
+            { owner: initialHolder, spender: spender, value: amount },
+          );
+        });
+
+        describe('when there was no approved amount before', function () {
+          it('approves the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount);
+          });
+        });
+
+        describe('when the spender had an approved amount', function () {
+          beforeEach(async function () {
+            await this.token.approve(spender, new BN(1), { from: initialHolder });
+          });
+
+          it('increases the spender allowance adding the requested amount', async function () {
+            await this.token.increaseAllowance(spender, amount, { from: initialHolder });
+
+            expect(await this.token.allowance(initialHolder, spender)).to.be.bignumber.equal(amount.addn(1));
+          });
+        });
+      });
+    });
+
+    describe('when the spender is the zero address', function () {
+      const spender = ZERO_ADDRESS;
+
+      it('reverts', async function () {
+        await expectRevert(
+          this.token.increaseAllowance(spender, amount, { from: initialHolder }), 'ERC20: approve to the zero address',
+        );
+      });
+    });
+  });
+
+  describe('_mint', function () {
+    const amount = new BN(50);
+    it('rejects a null account', async function () {
+      await expectRevert(
+        this.token.mint(ZERO_ADDRESS, amount), 'ERC20: mint to the zero address',
+      );
+    });
+
+    describe('for a non zero account', function () {
+      beforeEach('minting', async function () {
+        this.receipt = await this.token.mint(recipient, amount);
+      });
+
+      it('increments totalSupply', async function () {
+        const expectedSupply = initialSupply.add(amount);
+        expect(await this.token.totalSupply()).to.be.bignumber.equal(expectedSupply);
+      });
+
+      it('increments recipient balance', async function () {
+        expect(await this.token.balanceOf(recipient)).to.be.bignumber.equal(amount);
+      });
+
+      it('emits Transfer event', async function () {
+        const event = expectEvent(
+          this.receipt,
+          'Transfer',
+          { from: ZERO_ADDRESS, to: recipient },
+        );
+
+        expect(event.args.value).to.be.bignumber.equal(amount);
+      });
+    });
+  });
+
+  describe('_burn', function () {
+    it('rejects a null account', async function () {
+      await expectRevert(this.token.burn(ZERO_ADDRESS, new BN(1)),
+        'ERC20: burn from the zero address');
+    });
+
+    describe('for a non zero account', function () {
+      it('rejects burning more than balance', async function () {
+        await expectRevert(this.token.burn(
+          initialHolder, initialSupply.addn(1)), 'ERC20: burn amount exceeds balance',
+        );
+      });
+
+      const describeBurn = function (description, amount) {
+        describe(description, function () {
+          beforeEach('burning', async function () {
+            this.receipt = await this.token.burn(initialHolder, amount);
+          });
+
+          it('decrements totalSupply', async function () {
+            const expectedSupply = initialSupply.sub(amount);
+            expect(await this.token.totalSupply()).to.be.bignumber.equal(expectedSupply);
+          });
+
+          it('decrements initialHolder balance', async function () {
+            const expectedBalance = initialSupply.sub(amount);
+            expect(await this.token.balanceOf(initialHolder)).to.be.bignumber.equal(expectedBalance);
+          });
+
+          it('emits Transfer event', async function () {
+            const event = expectEvent(
+              this.receipt,
+              'Transfer',
+              { from: initialHolder, to: ZERO_ADDRESS },
+            );
+
+            expect(event.args.value).to.be.bignumber.equal(amount);
+          });
+        });
+      };
+
+      describeBurn('for entire balance', initialSupply);
+      describeBurn('for less amount than balance', initialSupply.subn(1));
+    });
+  });
+
+  describe('_transfer', function () {
+    shouldBehaveLikeERC20Transfer('ERC20', initialHolder, recipient, initialSupply, function (from, to, amount) {
+      return this.token.transferInternal(from, to, amount);
+    });
+
+    describe('when the sender is the zero address', function () {
+      it('reverts', async function () {
+        await expectRevert(this.token.transferInternal(ZERO_ADDRESS, recipient, initialSupply),
+          'ERC20: transfer from the zero address',
+        );
+      });
+    });
+  });
+
+  describe('_approve', function () {
+    shouldBehaveLikeERC20Approve('ERC20', initialHolder, recipient, initialSupply, function (owner, spender, amount) {
+      return this.token.approveInternal(owner, spender, amount);
+    });
+
+    describe('when the owner is the zero address', function () {
+      it('reverts', async function () {
+        await expectRevert(this.token.approveInternal(ZERO_ADDRESS, recipient, initialSupply),
+          'ERC20: approve from the zero address',
+        );
+      });
+    });
+  });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC721.behavior.js b/vendors/move/crates/evm/hardhat-examples/test/ERC721.behavior.js
new file mode 100644
index 000000000..1e9ddbfcc
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC721.behavior.js
@@ -0,0 +1,947 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS } = constants;
+
+const { shouldSupportInterfaces } = require('./SupportsInterface.behavior');
+
+const ERC721ReceiverMock = artifacts.require('ERC721ReceiverMock');
+
+const Error = [ 'None', 'RevertWithMessage', 'RevertWithoutMessage', 'Panic' ]
+  .reduce((acc, entry, idx) => Object.assign({ [entry]: idx }, acc), {});
+
+const firstTokenId = new BN('5042');
+const secondTokenId = new BN('79217');
+const nonExistentTokenId = new BN('13');
+const fourthTokenId = new BN(4);
+const baseURI = 'https://api.example.com/v1/';
+
+const RECEIVER_MAGIC_VALUE = '0x150b7a02';
+
+function shouldBehaveLikeERC721 (errorPrefix, owner, newOwner, approved, anotherApproved, operator, other) {
+  shouldSupportInterfaces([
+    'ERC165',
+    'ERC721',
+  ]);
+
+  context('with minted tokens', function () {
+    beforeEach(async function () {
+      await this.token.mint(owner, firstTokenId);
+      await this.token.mint(owner, secondTokenId);
+      this.toWhom = other; // default to other for toWhom in context-dependent tests
+    });
+
+    describe('balanceOf', function () {
+      context('when the given address owns some tokens', function () {
+        it('returns the amount of tokens owned by the given address', async function () {
+          expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('2');
+        });
+      });
+
+      context('when the given address does not own any tokens', function () {
+        it('returns 0', async function () {
+          expect(await this.token.balanceOf(other)).to.be.bignumber.equal('0');
+        });
+      });
+
+      context('when querying the zero address', function () {
+        it('throws', async function () {
+          await expectRevert(
+//            this.token.balanceOf(ZERO_ADDRESS), 'ERC721: address zero is not a valid owner',
+            this.token.balanceOf(ZERO_ADDRESS), "VM Exception while processing transaction: reverted with reason string 'ERC721: balance query for the zero address'",
+            );
+        });
+      });
+    });
+
+    describe('ownerOf', function () {
+      context('when the given token ID was tracked by this token', function () {
+        const tokenId = firstTokenId;
+
+        it('returns the owner of the given token ID', async function () {
+          expect(await this.token.ownerOf(tokenId)).to.be.equal(owner);
+        });
+      });
+
+      context('when the given token ID was not tracked by this token', function () {
+        const tokenId = nonExistentTokenId;
+
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.ownerOf(tokenId), 'ERC721: owner query for nonexistent token',
+          );
+        });
+      });
+    });
+
+
+    describe('transfers', function () {
+      const tokenId = firstTokenId;
+      const data = '0x42';
+
+      let logs = null;
+
+      beforeEach(async function () {
+        await this.token.approve(approved, tokenId, { from: owner });
+        await this.token.setApprovalForAll(operator, true, { from: owner });
+      });
+
+      const transferWasSuccessful = function ({ owner, tokenId, approved }) {
+        it('transfers the ownership of the given token ID to the given address', async function () {
+          expect(await this.token.ownerOf(tokenId)).to.be.equal(this.toWhom);
+        });
+
+        it('emits a Transfer event', async function () {
+          expectEvent.inLogs(logs, 'Transfer', { from: owner, to: this.toWhom, tokenId: tokenId });
+        });
+
+        it('clears the approval for the token ID', async function () {
+          expect(await this.token.getApproved(tokenId)).to.be.equal(ZERO_ADDRESS);
+        });
+
+        it('emits an Approval event', async function () {
+          expectEvent.inLogs(logs, 'Approval', { owner, approved: ZERO_ADDRESS, tokenId: tokenId });
+        });
+
+        it('adjusts owners balances', async function () {
+          expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('1');
+        });
+
+        it('adjusts owners tokens by index', async function () {
+          if (!this.token.tokenOfOwnerByIndex) return;
+
+          expect(await this.token.tokenOfOwnerByIndex(this.toWhom, 0)).to.be.bignumber.equal(tokenId);
+
+          expect(await this.token.tokenOfOwnerByIndex(owner, 0)).to.be.bignumber.not.equal(tokenId);
+        });
+      };
+
+      const shouldTransferTokensByUsers = function (transferFunction) {
+        context('when called by the owner', function () {
+          beforeEach(async function () {
+            ({ logs } = await transferFunction.call(this, owner, this.toWhom, tokenId, { from: owner }));
+          });
+          transferWasSuccessful({ owner, tokenId, approved });
+        });
+
+        context('when called by the approved individual', function () {
+          beforeEach(async function () {
+            ({ logs } = await transferFunction.call(this, owner, this.toWhom, tokenId, { from: approved }));
+          });
+          transferWasSuccessful({ owner, tokenId, approved });
+        });
+
+        context('when called by the operator', function () {
+          beforeEach(async function () {
+            ({ logs } = await transferFunction.call(this, owner, this.toWhom, tokenId, { from: operator }));
+          });
+          transferWasSuccessful({ owner, tokenId, approved });
+        });
+
+        context('when called by the owner without an approved user', function () {
+          beforeEach(async function () {
+            await this.token.approve(ZERO_ADDRESS, tokenId, { from: owner });
+            ({ logs } = await transferFunction.call(this, owner, this.toWhom, tokenId, { from: operator }));
+          });
+          transferWasSuccessful({ owner, tokenId, approved: null });
+        });
+
+        context('when sent to the owner', function () {
+          beforeEach(async function () {
+            ({ logs } = await transferFunction.call(this, owner, owner, tokenId, { from: owner }));
+          });
+
+          it('keeps ownership of the token', async function () {
+            expect(await this.token.ownerOf(tokenId)).to.be.equal(owner);
+          });
+
+          it('clears the approval for the token ID', async function () {
+            expect(await this.token.getApproved(tokenId)).to.be.equal(ZERO_ADDRESS);
+          });
+
+          it('emits only a transfer event', async function () {
+            expectEvent.inLogs(logs, 'Transfer', {
+              from: owner,
+              to: owner,
+              tokenId: tokenId,
+            });
+          });
+
+          it('keeps the owner balance', async function () {
+            expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('2');
+          });
+
+          it('keeps same tokens by index', async function () {
+            if (!this.token.tokenOfOwnerByIndex) return;
+            const tokensListed = await Promise.all(
+              [0, 1].map(i => this.token.tokenOfOwnerByIndex(owner, i)),
+            );
+            expect(tokensListed.map(t => t.toNumber())).to.have.members(
+              [firstTokenId.toNumber(), secondTokenId.toNumber()],
+            );
+          });
+        });
+
+        context('when the address of the previous owner is incorrect', function () {
+          it('reverts', async function () {
+            await expectRevert(
+              transferFunction.call(this, other, other, tokenId, { from: owner }),
+              'ERC721: transfer from incorrect owner',
+            );
+          });
+        });
+
+        context('when the sender is not authorized for the token id', function () {
+          it('reverts', async function () {
+            await expectRevert(
+              transferFunction.call(this, owner, other, tokenId, { from: other }),
+              'ERC721: transfer caller is not owner nor approved',
+            );
+          });
+        });
+
+        context('when the given token ID does not exist', function () {
+          it('reverts', async function () {
+            await expectRevert(
+              transferFunction.call(this, owner, other, nonExistentTokenId, { from: owner }),
+              'ERC721: operator query for nonexistent token',
+            );
+          });
+        });
+
+        context('when the address to transfer the token to is the zero address', function () {
+          it('reverts', async function () {
+            await expectRevert(
+              transferFunction.call(this, owner, ZERO_ADDRESS, tokenId, { from: owner }),
+              'ERC721: transfer to the zero address',
+            );
+          });
+        });
+      };
+
+      describe('via transferFrom', function () {
+        shouldTransferTokensByUsers(function (from, to, tokenId, opts) {
+          return this.token.transferFrom(from, to, tokenId, opts);
+        });
+      });
+
+      describe('via safeTransferFrom', function () {
+        const safeTransferFromWithData = function (from, to, tokenId, opts) {
+          return this.token.methods['safeTransferFrom(address,address,uint256,bytes)'](from, to, tokenId, data, opts);
+        };
+
+        const safeTransferFromWithoutData = function (from, to, tokenId, opts) {
+          return this.token.methods['safeTransferFrom(address,address,uint256)'](from, to, tokenId, opts);
+        };
+
+        const shouldTransferSafely = function (transferFun, data) {
+          describe('to a user account', function () {
+            shouldTransferTokensByUsers(transferFun);
+          });
+
+          describe('to a valid receiver contract', function () {
+            beforeEach(async function () {
+              this.receiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.None);
+              this.toWhom = this.receiver.address;
+            });
+
+            shouldTransferTokensByUsers(transferFun);
+
+            it('calls onERC721Received', async function () {
+              const receipt = await transferFun.call(this, owner, this.receiver.address, tokenId, { from: owner });
+
+              await expectEvent.inTransaction(receipt.tx, ERC721ReceiverMock, 'Received', {
+                operator: owner,
+                from: owner,
+                tokenId: tokenId,
+                data: data,
+              });
+            });
+
+            it('calls onERC721Received from approved', async function () {
+              const receipt = await transferFun.call(this, owner, this.receiver.address, tokenId, { from: approved });
+
+              await expectEvent.inTransaction(receipt.tx, ERC721ReceiverMock, 'Received', {
+                operator: approved,
+                from: owner,
+                tokenId: tokenId,
+                data: data,
+              });
+            });
+
+            describe('with an invalid token id', function () {
+              it('reverts', async function () {
+                await expectRevert(
+                  transferFun.call(
+                    this,
+                    owner,
+                    this.receiver.address,
+                    nonExistentTokenId,
+                    { from: owner },
+                  ),
+                  'ERC721: operator query for nonexistent token',
+                );
+              });
+            });
+          });
+        };
+
+        describe('with data', function () {
+          shouldTransferSafely(safeTransferFromWithData, data);
+        });
+
+        describe('without data', function () {
+          shouldTransferSafely(safeTransferFromWithoutData, null);
+        });
+
+        describe('to a receiver contract returning unexpected value', function () {
+          it('reverts', async function () {
+            const invalidReceiver = await ERC721ReceiverMock.new('0x42', Error.None);
+            await expectRevert(
+              this.token.safeTransferFrom(owner, invalidReceiver.address, tokenId, { from: owner }),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+
+        describe('to a receiver contract that reverts with message', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.RevertWithMessage);
+            await expectRevert(
+              this.token.safeTransferFrom(owner, revertingReceiver.address, tokenId, { from: owner }),
+              'ERC721ReceiverMock: reverting',
+            );
+          });
+        });
+
+        describe('to a receiver contract that reverts without message', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.RevertWithoutMessage);
+            await expectRevert(
+              this.token.safeTransferFrom(owner, revertingReceiver.address, tokenId, { from: owner }),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+
+        describe('to a receiver contract that panics', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.Panic);
+            await expectRevert.unspecified(
+              this.token.safeTransferFrom(owner, revertingReceiver.address, tokenId, { from: owner }),
+            );
+          });
+        });
+
+        describe('to a contract that does not implement the required function', function () {
+          it('reverts', async function () {
+            const nonReceiver = this.token;
+            await expectRevert(
+              this.token.safeTransferFrom(owner, nonReceiver.address, tokenId, { from: owner }),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+      });
+    });
+
+    describe('safe mint', function () {
+      const tokenId = fourthTokenId;
+      const data = '0x42';
+
+      describe('via safeMint', function () { // regular minting is tested in ERC721Mintable.test.js and others
+        it('calls onERC721Received — with data', async function () {
+          this.receiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.None);
+          const receipt = await this.token.safeMint(this.receiver.address, tokenId, data);
+
+          await expectEvent.inTransaction(receipt.tx, ERC721ReceiverMock, 'Received', {
+            from: ZERO_ADDRESS,
+            tokenId: tokenId,
+            data: data,
+          });
+        });
+
+        it('calls onERC721Received — without data', async function () {
+          this.receiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.None);
+          const receipt = await this.token.safeMint(this.receiver.address, tokenId);
+
+          await expectEvent.inTransaction(receipt.tx, ERC721ReceiverMock, 'Received', {
+            from: ZERO_ADDRESS,
+            tokenId: tokenId,
+          });
+        });
+
+        context('to a receiver contract returning unexpected value', function () {
+          it('reverts', async function () {
+            const invalidReceiver = await ERC721ReceiverMock.new('0x42', Error.None);
+            await expectRevert(
+              this.token.safeMint(invalidReceiver.address, tokenId),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+
+        context('to a receiver contract that reverts with message', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.RevertWithMessage);
+            await expectRevert(
+              this.token.safeMint(revertingReceiver.address, tokenId),
+              'ERC721ReceiverMock: reverting',
+            );
+          });
+        });
+
+        context('to a receiver contract that reverts without message', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.RevertWithoutMessage);
+            await expectRevert(
+              this.token.safeMint(revertingReceiver.address, tokenId),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+
+        context('to a receiver contract that panics', function () {
+          it('reverts', async function () {
+            const revertingReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, Error.Panic);
+            await expectRevert.unspecified(
+              this.token.safeMint(revertingReceiver.address, tokenId),
+            );
+          });
+        });
+
+        context('to a contract that does not implement the required function', function () {
+          it('reverts', async function () {
+            const nonReceiver = this.token;
+            await expectRevert(
+              this.token.safeMint(nonReceiver.address, tokenId),
+              'ERC721: transfer to non ERC721Receiver implementer',
+            );
+          });
+        });
+      });
+    });
+
+    describe('approve', function () {
+      const tokenId = firstTokenId;
+
+      let logs = null;
+
+      const itClearsApproval = function () {
+        it('clears approval for the token', async function () {
+          expect(await this.token.getApproved(tokenId)).to.be.equal(ZERO_ADDRESS);
+        });
+      };
+
+      const itApproves = function (address) {
+        it('sets the approval for the target address', async function () {
+          expect(await this.token.getApproved(tokenId)).to.be.equal(address);
+        });
+      };
+
+      const itEmitsApprovalEvent = function (address) {
+        it('emits an approval event', async function () {
+          expectEvent.inLogs(logs, 'Approval', {
+            owner: owner,
+            approved: address,
+            tokenId: tokenId,
+          });
+        });
+      };
+
+      context('when clearing approval', function () {
+        context('when there was no prior approval', function () {
+          beforeEach(async function () {
+            ({ logs } = await this.token.approve(ZERO_ADDRESS, tokenId, { from: owner }));
+          });
+
+          itClearsApproval();
+          itEmitsApprovalEvent(ZERO_ADDRESS);
+        });
+
+        context('when there was a prior approval', function () {
+          beforeEach(async function () {
+            await this.token.approve(approved, tokenId, { from: owner });
+            ({ logs } = await this.token.approve(ZERO_ADDRESS, tokenId, { from: owner }));
+          });
+
+          itClearsApproval();
+          itEmitsApprovalEvent(ZERO_ADDRESS);
+        });
+      });
+
+      context('when approving a non-zero address', function () {
+        context('when there was no prior approval', function () {
+          beforeEach(async function () {
+            ({ logs } = await this.token.approve(approved, tokenId, { from: owner }));
+          });
+
+          itApproves(approved);
+          itEmitsApprovalEvent(approved);
+        });
+
+        context('when there was a prior approval to the same address', function () {
+          beforeEach(async function () {
+            await this.token.approve(approved, tokenId, { from: owner });
+            ({ logs } = await this.token.approve(approved, tokenId, { from: owner }));
+          });
+
+          itApproves(approved);
+          itEmitsApprovalEvent(approved);
+        });
+
+        context('when there was a prior approval to a different address', function () {
+          beforeEach(async function () {
+            await this.token.approve(anotherApproved, tokenId, { from: owner });
+            ({ logs } = await this.token.approve(anotherApproved, tokenId, { from: owner }));
+          });
+
+          itApproves(anotherApproved);
+          itEmitsApprovalEvent(anotherApproved);
+        });
+      });
+
+      context('when the address that receives the approval is the owner', function () {
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.approve(owner, tokenId, { from: owner }), 'ERC721: approval to current owner',
+          );
+        });
+      });
+
+      context('when the sender does not own the given token ID', function () {
+        it('reverts', async function () {
+          await expectRevert(this.token.approve(approved, tokenId, { from: other }),
+            'ERC721: approve caller is not owner nor approved');
+        });
+      });
+
+      context('when the sender is approved for the given token ID', function () {
+        it('reverts', async function () {
+          await this.token.approve(approved, tokenId, { from: owner });
+          await expectRevert(this.token.approve(anotherApproved, tokenId, { from: approved }),
+            'ERC721: approve caller is not owner nor approved for all');
+        });
+      });
+
+      context('when the sender is an operator', function () {
+        beforeEach(async function () {
+          await this.token.setApprovalForAll(operator, true, { from: owner });
+          ({ logs } = await this.token.approve(approved, tokenId, { from: operator }));
+        });
+
+        itApproves(approved);
+        itEmitsApprovalEvent(approved);
+      });
+
+      context('when the given token ID does not exist', function () {
+        it('reverts', async function () {
+          await expectRevert(this.token.approve(approved, nonExistentTokenId, { from: operator }),
+            'ERC721: owner query for nonexistent token');
+        });
+      });
+    });
+
+    describe('setApprovalForAll', function () {
+      context('when the operator willing to approve is not the owner', function () {
+        context('when there is no operator approval set by the sender', function () {
+          it('approves the operator', async function () {
+            await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expect(await this.token.isApprovedForAll(owner, operator)).to.equal(true);
+          });
+
+          it('emits an approval event', async function () {
+            const { logs } = await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expectEvent.inLogs(logs, 'ApprovalForAll', {
+              owner: owner,
+              operator: operator,
+              approved: true,
+            });
+          });
+        });
+
+        context('when the operator was set as not approved', function () {
+          beforeEach(async function () {
+            await this.token.setApprovalForAll(operator, false, { from: owner });
+          });
+
+          it('approves the operator', async function () {
+            await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expect(await this.token.isApprovedForAll(owner, operator)).to.equal(true);
+          });
+
+          it('emits an approval event', async function () {
+            const { logs } = await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expectEvent.inLogs(logs, 'ApprovalForAll', {
+              owner: owner,
+              operator: operator,
+              approved: true,
+            });
+          });
+
+          it('can unset the operator approval', async function () {
+            await this.token.setApprovalForAll(operator, false, { from: owner });
+
+            expect(await this.token.isApprovedForAll(owner, operator)).to.equal(false);
+          });
+        });
+
+        context('when the operator was already approved', function () {
+          beforeEach(async function () {
+            await this.token.setApprovalForAll(operator, true, { from: owner });
+          });
+
+          it('keeps the approval to the given address', async function () {
+            await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expect(await this.token.isApprovedForAll(owner, operator)).to.equal(true);
+          });
+
+          it('emits an approval event', async function () {
+            const { logs } = await this.token.setApprovalForAll(operator, true, { from: owner });
+
+            expectEvent.inLogs(logs, 'ApprovalForAll', {
+              owner: owner,
+              operator: operator,
+              approved: true,
+            });
+          });
+        });
+      });
+
+      context('when the operator is the owner', function () {
+        it('reverts', async function () {
+          await expectRevert(this.token.setApprovalForAll(owner, true, { from: owner }),
+            'ERC721: approve to caller');
+        });
+      });
+    });
+
+    describe('getApproved', async function () {
+      context('when token is not minted', async function () {
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.getApproved(nonExistentTokenId),
+            'ERC721: approved query for nonexistent token',
+          );
+        });
+      });
+
+      context('when token has been minted ', async function () {
+        it('should return the zero address', async function () {
+          expect(await this.token.getApproved(firstTokenId)).to.be.equal(
+            ZERO_ADDRESS,
+          );
+        });
+
+        context('when account has been approved', async function () {
+          beforeEach(async function () {
+            await this.token.approve(approved, firstTokenId, { from: owner });
+          });
+
+          it('returns approved account', async function () {
+            expect(await this.token.getApproved(firstTokenId)).to.be.equal(approved);
+          });
+        });
+      });
+    });
+  });
+
+  describe('_mint(address, uint256)', function () {
+    it('reverts with a null destination address', async function () {
+      await expectRevert(
+        this.token.mint(ZERO_ADDRESS, firstTokenId), 'ERC721: mint to the zero address',
+      );
+    });
+
+    context('with minted token', async function () {
+      beforeEach(async function () {
+        ({ logs: this.logs } = await this.token.mint(owner, firstTokenId));
+      });
+
+      it('emits a Transfer event', function () {
+        expectEvent.inLogs(this.logs, 'Transfer', { from: ZERO_ADDRESS, to: owner, tokenId: firstTokenId });
+      });
+
+      it('creates the token', async function () {
+        expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('1');
+        expect(await this.token.ownerOf(firstTokenId)).to.equal(owner);
+      });
+
+      it('reverts when adding a token id that already exists', async function () {
+        await expectRevert(this.token.mint(owner, firstTokenId), 'ERC721: token already minted');
+      });
+    });
+  });
+
+  describe('_burn', function () {
+    it('reverts when burning a non-existent token id', async function () {
+      await expectRevert(
+        this.token.burn(nonExistentTokenId), 'ERC721: owner query for nonexistent token',
+      );
+    });
+
+    context('with minted tokens', function () {
+      beforeEach(async function () {
+        await this.token.mint(owner, firstTokenId);
+        await this.token.mint(owner, secondTokenId);
+      });
+
+      context('with burnt token', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.burn(firstTokenId));
+        });
+
+        it('emits a Transfer event', function () {
+          expectEvent.inLogs(this.logs, 'Transfer', { from: owner, to: ZERO_ADDRESS, tokenId: firstTokenId });
+        });
+
+        it('emits an Approval event', function () {
+          expectEvent.inLogs(this.logs, 'Approval', { owner, approved: ZERO_ADDRESS, tokenId: firstTokenId });
+        });
+
+        it('deletes the token', async function () {
+          expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('1');
+          await expectRevert(
+            this.token.ownerOf(firstTokenId), 'ERC721: owner query for nonexistent token',
+          );
+        });
+
+        it('reverts when burning a token id that has been deleted', async function () {
+          await expectRevert(
+            this.token.burn(firstTokenId), 'ERC721: owner query for nonexistent token',
+          );
+        });
+      });
+    });
+  });
+}
+
+function shouldBehaveLikeERC721Enumerable (errorPrefix, owner, newOwner, approved, anotherApproved, operator, other) {
+  shouldSupportInterfaces([
+    'ERC721Enumerable',
+  ]);
+
+  context('with minted tokens', function () {
+    beforeEach(async function () {
+      await this.token.mint(owner, firstTokenId);
+      await this.token.mint(owner, secondTokenId);
+      this.toWhom = other; // default to other for toWhom in context-dependent tests
+    });
+
+    describe('totalSupply', function () {
+      it('returns total token supply', async function () {
+        expect(await this.token.totalSupply()).to.be.bignumber.equal('2');
+      });
+    });
+
+    describe('tokenOfOwnerByIndex', function () {
+      describe('when the given index is lower than the amount of tokens owned by the given address', function () {
+        it('returns the token ID placed at the given index', async function () {
+          expect(await this.token.tokenOfOwnerByIndex(owner, 0)).to.be.bignumber.equal(firstTokenId);
+        });
+      });
+
+      describe('when the index is greater than or equal to the total tokens owned by the given address', function () {
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.tokenOfOwnerByIndex(owner, 2), 'ERC721Enumerable: owner index out of bounds',
+          );
+        });
+      });
+
+      describe('when the given address does not own any token', function () {
+        it('reverts', async function () {
+          await expectRevert(
+            this.token.tokenOfOwnerByIndex(other, 0), 'ERC721Enumerable: owner index out of bounds',
+          );
+        });
+      });
+
+      describe('after transferring all tokens to another user', function () {
+        beforeEach(async function () {
+          await this.token.transferFrom(owner, other, firstTokenId, { from: owner });
+          await this.token.transferFrom(owner, other, secondTokenId, { from: owner });
+        });
+
+        it('returns correct token IDs for target', async function () {
+          expect(await this.token.balanceOf(other)).to.be.bignumber.equal('2');
+          const tokensListed = await Promise.all(
+            [0, 1].map(i => this.token.tokenOfOwnerByIndex(other, i)),
+          );
+          expect(tokensListed.map(t => t.toNumber())).to.have.members([firstTokenId.toNumber(),
+            secondTokenId.toNumber()]);
+        });
+
+        it('returns empty collection for original owner', async function () {
+          expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('0');
+          await expectRevert(
+            this.token.tokenOfOwnerByIndex(owner, 0), 'ERC721Enumerable: owner index out of bounds',
+          );
+        });
+      });
+    });
+
+    describe('tokenByIndex', function () {
+      it('returns all tokens', async function () {
+        const tokensListed = await Promise.all(
+          [0, 1].map(i => this.token.tokenByIndex(i)),
+        );
+        expect(tokensListed.map(t => t.toNumber())).to.have.members([firstTokenId.toNumber(),
+          secondTokenId.toNumber()]);
+      });
+
+      it('reverts if index is greater than supply', async function () {
+        await expectRevert(
+          this.token.tokenByIndex(2), 'ERC721Enumerable: global index out of bounds',
+        );
+      });
+
+      [firstTokenId, secondTokenId].forEach(function (tokenId) {
+        it(`returns all tokens after burning token ${tokenId} and minting new tokens`, async function () {
+          const newTokenId = new BN(300);
+          const anotherNewTokenId = new BN(400);
+
+          await this.token.burn(tokenId);
+          await this.token.mint(newOwner, newTokenId);
+          await this.token.mint(newOwner, anotherNewTokenId);
+
+          expect(await this.token.totalSupply()).to.be.bignumber.equal('3');
+
+          const tokensListed = await Promise.all(
+            [0, 1, 2].map(i => this.token.tokenByIndex(i)),
+          );
+          const expectedTokens = [firstTokenId, secondTokenId, newTokenId, anotherNewTokenId].filter(
+            x => (x !== tokenId),
+          );
+          expect(tokensListed.map(t => t.toNumber())).to.have.members(expectedTokens.map(t => t.toNumber()));
+        });
+      });
+    });
+  });
+
+  describe('_mint(address, uint256)', function () {
+    it('reverts with a null destination address', async function () {
+      await expectRevert(
+        this.token.mint(ZERO_ADDRESS, firstTokenId), 'ERC721: mint to the zero address',
+      );
+    });
+
+    context('with minted token', async function () {
+      beforeEach(async function () {
+        ({ logs: this.logs } = await this.token.mint(owner, firstTokenId));
+      });
+
+      it('adjusts owner tokens by index', async function () {
+        expect(await this.token.tokenOfOwnerByIndex(owner, 0)).to.be.bignumber.equal(firstTokenId);
+      });
+
+      it('adjusts all tokens list', async function () {
+        expect(await this.token.tokenByIndex(0)).to.be.bignumber.equal(firstTokenId);
+      });
+    });
+  });
+
+  describe('_burn', function () {
+    it('reverts when burning a non-existent token id', async function () {
+      await expectRevert(
+        this.token.burn(firstTokenId), 'ERC721: owner query for nonexistent token',
+      );
+    });
+
+    context('with minted tokens', function () {
+      beforeEach(async function () {
+        await this.token.mint(owner, firstTokenId);
+        await this.token.mint(owner, secondTokenId);
+      });
+
+      context('with burnt token', function () {
+        beforeEach(async function () {
+          ({ logs: this.logs } = await this.token.burn(firstTokenId));
+        });
+
+        it('removes that token from the token list of the owner', async function () {
+          expect(await this.token.tokenOfOwnerByIndex(owner, 0)).to.be.bignumber.equal(secondTokenId);
+        });
+
+        it('adjusts all tokens list', async function () {
+          expect(await this.token.tokenByIndex(0)).to.be.bignumber.equal(secondTokenId);
+        });
+
+        it('burns all tokens', async function () {
+          await this.token.burn(secondTokenId, { from: owner });
+          expect(await this.token.totalSupply()).to.be.bignumber.equal('0');
+          await expectRevert(
+            this.token.tokenByIndex(0), 'ERC721Enumerable: global index out of bounds',
+          );
+        });
+      });
+    });
+  });
+}
+
+function shouldBehaveLikeERC721Metadata (errorPrefix, name, symbol, owner) {
+  shouldSupportInterfaces([
+    'ERC721Metadata',
+  ]);
+
+  describe('metadata', function () {
+    it('has a name', async function () {
+      expect(await this.token.name()).to.be.equal(name);
+    });
+
+    it('has a symbol', async function () {
+      expect(await this.token.symbol()).to.be.equal(symbol);
+    });
+
+    describe('token URI', function () {
+      beforeEach(async function () {
+        await this.token.mint(owner, firstTokenId);
+      });
+
+      it('return empty string by default', async function () {
+        expect(await this.token.tokenURI(firstTokenId)).to.be.equal('');
+      });
+
+      it('reverts when queried for non existent token id', async function () {
+        await expectRevert(
+          this.token.tokenURI(nonExistentTokenId), 'ERC721Metadata: URI query for nonexistent token',
+        );
+      });
+
+      describe('base URI', function () {
+        beforeEach(function () {
+          if (this.token.setBaseURI === undefined) {
+            this.skip();
+          }
+        });
+
+        it('base URI can be set', async function () {
+          await this.token.setBaseURI(baseURI);
+          expect(await this.token.baseURI()).to.equal(baseURI);
+        });
+
+        it('base URI is added as a prefix to the token URI', async function () {
+          await this.token.setBaseURI(baseURI);
+          expect(await this.token.tokenURI(firstTokenId)).to.be.equal(baseURI + firstTokenId.toString());
+        });
+
+        it('token URI can be changed by changing the base URI', async function () {
+          await this.token.setBaseURI(baseURI);
+          const newBaseURI = 'https://api.example.com/v2/';
+          await this.token.setBaseURI(newBaseURI);
+          expect(await this.token.tokenURI(firstTokenId)).to.be.equal(newBaseURI + firstTokenId.toString());
+        });
+      });
+    });
+  });
+}
+
+module.exports = {
+  shouldBehaveLikeERC721,
+  shouldBehaveLikeERC721Enumerable,
+  shouldBehaveLikeERC721Metadata,
+};
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC721.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC721.test.js
new file mode 100644
index 000000000..316a02b98
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC721.test.js
@@ -0,0 +1,18 @@
+const {
+  shouldBehaveLikeERC721,
+  shouldBehaveLikeERC721Metadata,
+} = require('./ERC721.behavior');
+
+const ERC721Mock = artifacts.require('ERC721Mock'); // A Move contract
+
+contract('ERC721', function (accounts) {
+  const name = 'Non Fungible Token';
+  const symbol = 'NFT';
+
+  beforeEach(async function () {
+    this.token = await ERC721Mock.new(name, symbol);
+  });
+
+  shouldBehaveLikeERC721('ERC721', ...accounts);
+  shouldBehaveLikeERC721Metadata('ERC721', name, symbol, ...accounts);
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ERC721_Sol.test.js b/vendors/move/crates/evm/hardhat-examples/test/ERC721_Sol.test.js
new file mode 100644
index 000000000..1c561c4ba
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ERC721_Sol.test.js
@@ -0,0 +1,18 @@
+const {
+  shouldBehaveLikeERC721,
+  shouldBehaveLikeERC721Metadata,
+} = require('./ERC721.behavior');
+
+const ERC721Mock = artifacts.require('ERC721Mock_Sol');
+
+contract('ERC721', function (accounts) {
+  const name = 'Non Fungible Token';
+  const symbol = 'NFT';
+
+  beforeEach(async function () {
+    this.token = await ERC721Mock.new(name, symbol);
+  });
+
+  shouldBehaveLikeERC721('ERC721', ...accounts);
+  shouldBehaveLikeERC721Metadata('ERC721', name, symbol, ...accounts);
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Event.test.js b/vendors/move/crates/evm/hardhat-examples/test/Event.test.js
new file mode 100644
index 000000000..330a69b4a
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Event.test.js
@@ -0,0 +1,56 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (contract_name) {
+  return function () {
+    before(async function () {
+      this.Event = await ethers.getContractFactory(contract_name);
+      this.event = await this.Event.deploy();
+      await this.event.deployed();
+    });
+    it("emitSimpleEvent(42) should emit an event", async function () {
+      const tx = this.event.emitSimpleEvent(42);
+      await expect(tx).to.emit(this.event, 'SimpleEvent').withArgs(42);
+    });
+    it("emitSimpleEventTwice(42) should emit two events", async function () {
+      const tx = this.event.emitSimpleEventTwice(42);
+      await expect(tx).to.emit(this.event, 'SimpleEvent').withArgs(42);
+      await expect(tx).to.emit(this.event, 'SimpleEvent').withArgs(84);
+    });
+    it("emitMyEvent(42) should emit an event", async function () {
+      const tx = this.event.emitMyEvent(42);
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(42, 'hello_event');
+    });
+    it("emitMyEventTwice(42) should emit two events", async function () {
+      const tx = this.event.emitMyEventTwice(42);
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(42, 'hello_event_#1');
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(84, 'hello_event_#2');
+    });
+    it("emitMyEventWith(42, 'hello_event') should emit an event", async function () {
+      const tx = this.event.emitMyEventWith(42, "hello_event");
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(42, 'hello_event');
+    });
+    it("emitMyEventWithTwice(42, 'hello_event') should emit two events", async function () {
+      const tx = this.event.emitMyEventWithTwice(42, "hello_event");
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(42, 'hello_event');
+      await expect(tx).to.emit(this.event, 'MyEvent').withArgs(84, 'hello_event');
+    });
+    it("emitU256Event should emit a U256Event event", async function () {
+      const tx = this.event.emitU256Event(0);
+      await expect(tx).to.emit(this.event, 'U256Event').withArgs(0);
+    });
+    it("emitAddressEvent should emit a AddressEvent", async function () {
+      const [owner] = await ethers.getSigners();
+      const tx = this.event.emitAddressEvent(owner.address);
+      await expect(tx).to.emit(this.event, 'AddressEvent').withArgs(owner.address);
+    });
+    it("emitTransfer should emit a Transfer event", async function () {
+      const [owner] = await ethers.getSigners();
+      const tx = this.event.emitTransfer(owner.address, owner.address, 0);
+      await expect(tx).to.emit(this.event, 'Transfer').withArgs(owner.address, owner.address, 0);
+    });
+  }
+};
+
+describe("Event (the Move contract)", make_test('Event'));
+describe("Event_Sol (the Solidity contract)", make_test('Event_Sol'));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Event.truffle.test.js b/vendors/move/crates/evm/hardhat-examples/test/Event.truffle.test.js
new file mode 100644
index 000000000..3179ab94b
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Event.truffle.test.js
@@ -0,0 +1,38 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS } = constants;
+
+const Event = artifacts.require('Event');
+
+contract('Truffle-style testing for Event (the Move contract)', function (accounts) {
+    beforeEach(async function () {
+        this.event = await Event.new();
+    });
+    it('emits an SimpleEvent', async function () {
+        expectEvent(
+            await this.event.emitSimpleEvent(42),
+            'SimpleEvent',
+            [new BN(42)],
+        );
+    });
+    it('emits an MyEvent', async function () {
+        expectEvent(
+            await this.event.emitMyEvent(7),
+            'MyEvent',
+            [new BN(7)],
+        );
+    });
+    it('emits an Transfer event', async function () {
+        expectEvent(
+            await this.event.emitTransfer(ZERO_ADDRESS, ZERO_ADDRESS, 7),
+            'Transfer',
+            [ZERO_ADDRESS, ZERO_ADDRESS, new BN(7)],
+        );
+    });
+    // Enable this to show the events emitted.
+    // it('display the events emitted', async function () {
+    //     await this.event.emitTransfer(ZERO_ADDRESS, ZERO_ADDRESS, new BN(7));
+    //     let events = await this.event.getPastEvents();
+    //     console.log(events);
+    // });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/ExternalCall.test.js b/vendors/move/crates/evm/hardhat-examples/test/ExternalCall.test.js
new file mode 100644
index 000000000..5bb49d625
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/ExternalCall.test.js
@@ -0,0 +1,144 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { ZERO_ADDRESS } = constants;
+
+const { expect } = require('chai');
+
+const ExternalCall = artifacts.require('ExternalCall');
+const FortyTwo = artifacts.require('FortyTwo');
+const Revert = artifacts.require('Revert');
+const ERC721Receiver = artifacts.require('ERC721ReceiverMock');
+const ERC1155Receiver = artifacts.require('ERC1155ReceiverMock');
+
+const Error = [ 'None', 'RevertWithMessage', 'RevertWithoutMessage', 'Panic' ]
+  .reduce((acc, entry, idx) => Object.assign({ [entry]: idx }, acc), {});
+const RECEIVER_MAGIC_VALUE = '0x150b7a02';
+const RECEIVER_SINGLE_MAGIC_VALUE = '0xf23a6e61';
+const RECEIVER_BATCH_MAGIC_VALUE = '0xbc197c81';
+
+contract('ExternalCall', function (accounts) {
+    const [operator, tokenHolder, tokenBatchHolder, ...otherAccounts] = accounts;
+
+    beforeEach(async function () {
+        this.externalCall = await ExternalCall.new();
+        this.fortyTwo = await FortyTwo.new();
+        this.revert = await Revert.new();
+    });
+
+    describe('call_forty_two', function () {
+        it('returns 42', async function () {
+            expect(await this.externalCall.call_forty_two(this.fortyTwo.address)).to.be.bignumber.equal('42');
+        });
+    });
+
+    describe('call_revertWithMessage', function () {
+        it('reverts with error message', async function () {
+            await expectRevert(
+                this.externalCall.call_revertWithMessage(this.revert.address),
+                'error message',
+            );
+        });
+    });
+
+    describe('try_call_forty_two', function () {
+        it('returns 42', async function () {
+            expect(await this.externalCall.try_call_forty_two(this.fortyTwo.address)).to.be.bignumber.equal('42');
+        });
+
+        it('revert with not implemented', async function () {
+             await expectRevert(
+                 this.externalCall.try_call_forty_two(this.revert.address),
+                 'not implemented',
+             );
+        });
+    });
+
+    describe('try_call_revertWithMessage', function () {
+        it('callee reverts with error message', async function () {
+            await expectRevert(
+                this.externalCall.try_call_revertWithMessage(this.revert.address),
+                'error reason',
+            );
+        });
+
+        it('callee did not implement the function', async function () {
+            await expectRevert(
+                this.externalCall.try_call_revertWithMessage(this.fortyTwo.address),
+                'error data',
+            );
+        });
+    });
+
+    describe('ERC721Receiver', function () {
+        it('receiver without any error', async function () {
+            const tokenId = 5042;
+            const data = '0x42';
+            const receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, Error.None);
+            await expectRevert(
+                this.externalCall.doSafeTransferAcceptanceCheck(this.externalCall.address, receiver.address, tokenId, data),
+                'ok',
+            );
+        });
+        it('receiver reverting with error message', async function () {
+            const tokenId = 5042;
+            const data = '0x42';
+            const receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, Error.RevertWithMessage);
+            await expectRevert(
+                this.externalCall.doSafeTransferAcceptanceCheck(this.externalCall.address, receiver.address, tokenId, data),
+                'ERC721ReceiverMock: reverting',
+            );
+        });
+        it('receiver reverting without error message', async function () {
+            const tokenId = 5042;
+            const data = '0x42';
+            const receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, Error.RevertWithoutMessage);
+            await expectRevert(
+                this.externalCall.doSafeTransferAcceptanceCheck(this.externalCall.address, receiver.address, tokenId, data),
+                'err_data',
+            );
+        });
+        it('receiver panicking', async function () {
+            const tokenId = 5042;
+            const data = '0x42';
+            const receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, Error.Panic);
+            await expectRevert(
+                this.externalCall.doSafeTransferAcceptanceCheck(this.externalCall.address, receiver.address, tokenId, data),
+                'panic',
+            );
+        });
+    });
+
+    describe('ERC1155Receiver', function () {
+        it('receiver without any error', async function () {
+            const ids = [1,2,3];
+            const amounts = [10, 100, 1000];
+            const data = '0x42';
+            const receiver = await ERC1155Receiver.new(RECEIVER_SINGLE_MAGIC_VALUE, false, RECEIVER_BATCH_MAGIC_VALUE, false);
+            await expectRevert(
+                this.externalCall.doSafeBatchTransferAcceptanceCheck(this.externalCall.address, this.externalCall.address, receiver.address, ids, amounts, data),
+                'ok',
+            );
+        });
+        // TODO: Error with "Transaction ran out of gas"
+        it('receiver reverting with error message', async function () {
+             const ids = [1,2,3];
+             const amounts = [10, 100, 1000];
+             const data = '0x42';
+             const receiver = await ERC1155Receiver.new(RECEIVER_SINGLE_MAGIC_VALUE, false, RECEIVER_BATCH_MAGIC_VALUE, true);
+             await expectRevert(
+                 this.externalCall.doSafeBatchTransferAcceptanceCheck(this.externalCall.address, this.externalCall.address, receiver.address, ids, amounts, data),
+                 'err_reason',
+             );
+         });
+        // TODO: Error with "Transaction ran out of gas"
+        it('receiver reverting without error message', async function () {
+             const ids = [1,2,3];
+             const amounts = [10, 100, 1000];
+             const data = '0x42';
+             const receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, Error.Panic);
+             await expectRevert(
+                 this.externalCall.doSafeBatchTransferAcceptanceCheck(this.externalCall.address, this.externalCall.address, receiver.address, ids, amounts, data),
+                 'err_data',
+             );
+         });
+    });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/FortyTwo.test.js b/vendors/move/crates/evm/hardhat-examples/test/FortyTwo.test.js
new file mode 100644
index 000000000..043f363e7
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/FortyTwo.test.js
@@ -0,0 +1,26 @@
+const { expect } = require("chai");
+
+const make_test = function (contract_name) {
+  return function () {
+    before(async function () {
+      this.FortyTwo = await ethers.getContractFactory(contract_name);
+      this.fortyTwo = await this.FortyTwo.deploy();
+      await this.fortyTwo.deployed();
+    });
+    it("forty_two() should return 42", async function () {
+      expect(await this.fortyTwo.forty_two()).to.be.equal(42);
+    });
+    it("forty_two_as_u256() should return 42", async function () {
+      expect(await this.fortyTwo.forty_two_as_u256()).to.be.equal(42);
+    });
+    it("forty_two_as_string() should return \"forty two\"", async function () {
+      expect(await this.fortyTwo.forty_two_as_string()).to.be.equal("forty two");
+    });
+    it("forty_two_plus_alpha(7) should return 49", async function () {
+      expect(await this.fortyTwo.forty_two_plus_alpha(7)).to.be.equal(42 + 7);
+    });
+  }
+};
+
+describe("FortyTwo (the Move contract)", make_test('FortyTwo'));
+describe("FortyTwo_Sol (the Solidity contract)", make_test('FortyTwo_Sol'));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Greeter.test.js b/vendors/move/crates/evm/hardhat-examples/test/Greeter.test.js
new file mode 100644
index 000000000..d48e7de76
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Greeter.test.js
@@ -0,0 +1,21 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+
+const make_test = function (contract_name) {
+  return function () {
+    it("Should return the new greeting once it's changed", async function () {
+      const Greeter = await ethers.getContractFactory(contract_name);
+      const greeter = await Greeter.deploy("Hello, world!");
+      await greeter.deployed();
+      expect(await greeter.greet()).to.equal("Hello, world!");
+      const setGreetingTx = await greeter.setGreeting("Hola, mundo!");
+      // wait until the transaction is mined
+      await setGreetingTx.wait();
+      expect(await greeter.greet()).to.equal("Hola, mundo!");
+    });
+  }
+};
+
+describe("Greeter (the Move contract)", make_test("Greeter"));
+describe("Greeter_Sol (the Solidity Contract)", make_test("Greeter_Sol"));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Native.test.js b/vendors/move/crates/evm/hardhat-examples/test/Native.test.js
new file mode 100644
index 000000000..373ed95d8
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Native.test.js
@@ -0,0 +1,31 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function(contract_name) {
+  return function () {
+    before(async function () {
+      this.Native = await ethers.getContractFactory(contract_name);
+      this.native = await this.Native.deploy();
+      await this.native.deployed();
+    });
+    it("getContractAddr() should return the contract address", async function () {
+      const tx = this.native.getContractAddr();
+      expect(await tx).to.equal(this.native.address);
+    });
+    it("getSenderAddr() should return the sender address", async function () {
+      const tx = this.native.getSenderAddr();
+      expect(await tx).to.equal(this.native.signer.address);
+    });
+    it("getIsContract(this.native.address) should return true", async function () {
+      const tx = this.native.getIsContract(this.native.address);
+      expect(await tx).to.equal(true);
+    });
+    it("getIsContract(this.native.signer.address) should return false", async function () {
+      const tx = this.native.getIsContract(this.native.signer.address);
+      expect(await tx).to.equal(false);
+    });
+  }
+};
+
+describe("Native (the Move contract)", make_test("Native"));
+describe("Native_Sol (the Solidity contract)", make_test("Native_Sol"));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Revert.test.js b/vendors/move/crates/evm/hardhat-examples/test/Revert.test.js
new file mode 100644
index 000000000..dcbda2859
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Revert.test.js
@@ -0,0 +1,24 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (contract_name) {
+  return function () {
+    before(async function () {
+      this.Revert = await ethers.getContractFactory(contract_name);
+      this.revert = await this.Revert.deploy();
+      await this.revert.deployed();
+    });
+    it("revertIf0(0) should revert", async function () {
+      const tx = this.revert.revertIf0(0);
+      await expect(tx).to.be.reverted;
+    });
+    // TODO: Support reverting with an error message
+    // it("revertWithMessage() should revert with a message", async function () {
+    //   const tx = this.revert.revertWithMessage();
+    //   await expect(tx).to.be.revertedWith('error message');
+    // });
+  }
+};
+
+describe("Revert (the Move contract)", make_test("Revert"));
+describe("Revert_Sol (the Solidity contract)", make_test("Revert_Sol"));
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Revert.truffle.test.js b/vendors/move/crates/evm/hardhat-examples/test/Revert.truffle.test.js
new file mode 100644
index 000000000..b5d0a40ad
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Revert.truffle.test.js
@@ -0,0 +1,17 @@
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+const { expect } = require('chai');
+const { ZERO_ADDRESS } = constants;
+
+const Revert = artifacts.require('Revert');
+
+contract('Truffle-style testing for Revert (the Move contract)', function (accounts) {
+    beforeEach(async function () {
+        this.revert = await Revert.new();
+    });
+    it('revertIf0(0) should revert', async function () {
+        await expectRevert.unspecified(this.revert.revertIf0(0));
+    });
+    it('revertWithMessage() should revert with a message', async function () {
+        await expectRevert(this.revert.revertWithMessage(), "error message");
+    });
+});
diff --git a/vendors/move/crates/evm/hardhat-examples/test/SupportsInterface.behavior.js b/vendors/move/crates/evm/hardhat-examples/test/SupportsInterface.behavior.js
new file mode 100644
index 000000000..cac6a81d1
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/SupportsInterface.behavior.js
@@ -0,0 +1,148 @@
+const { makeInterfaceId } = require('@openzeppelin/test-helpers');
+
+const { expect } = require('chai');
+
+const INTERFACES = {
+  ERC165: [
+    'supportsInterface(bytes4)',
+  ],
+  ERC721: [
+    'balanceOf(address)',
+    'ownerOf(uint256)',
+    'approve(address,uint256)',
+    'getApproved(uint256)',
+    'setApprovalForAll(address,bool)',
+    'isApprovedForAll(address,address)',
+    'transferFrom(address,address,uint256)',
+    'safeTransferFrom(address,address,uint256)',
+    'safeTransferFrom(address,address,uint256,bytes)',
+  ],
+  ERC721Enumerable: [
+    'totalSupply()',
+    'tokenOfOwnerByIndex(address,uint256)',
+    'tokenByIndex(uint256)',
+  ],
+  ERC721Metadata: [
+    'name()',
+    'symbol()',
+    'tokenURI(uint256)',
+  ],
+  ERC1155: [
+    'balanceOf(address,uint256)',
+    'balanceOfBatch(address[],uint256[])',
+    'setApprovalForAll(address,bool)',
+    'isApprovedForAll(address,address)',
+    'safeTransferFrom(address,address,uint256,uint256,bytes)',
+    'safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)',
+  ],
+  ERC1155Receiver: [
+    'onERC1155Received(address,address,uint256,uint256,bytes)',
+    'onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)',
+  ],
+  AccessControl: [
+    'hasRole(bytes32,address)',
+    'getRoleAdmin(bytes32)',
+    'grantRole(bytes32,address)',
+    'revokeRole(bytes32,address)',
+    'renounceRole(bytes32,address)',
+  ],
+  AccessControlEnumerable: [
+    'getRoleMember(bytes32,uint256)',
+    'getRoleMemberCount(bytes32)',
+  ],
+  Governor: [
+    'name()',
+    'version()',
+    'COUNTING_MODE()',
+    'hashProposal(address[],uint256[],bytes[],bytes32)',
+    'state(uint256)',
+    'proposalSnapshot(uint256)',
+    'proposalDeadline(uint256)',
+    'votingDelay()',
+    'votingPeriod()',
+    'quorum(uint256)',
+    'getVotes(address,uint256)',
+    'hasVoted(uint256,address)',
+    'propose(address[],uint256[],bytes[],string)',
+    'execute(address[],uint256[],bytes[],bytes32)',
+    'castVote(uint256,uint8)',
+    'castVoteWithReason(uint256,uint8,string)',
+    'castVoteBySig(uint256,uint8,uint8,bytes32,bytes32)',
+  ],
+  GovernorWithParams: [
+    'name()',
+    'version()',
+    'COUNTING_MODE()',
+    'hashProposal(address[],uint256[],bytes[],bytes32)',
+    'state(uint256)',
+    'proposalSnapshot(uint256)',
+    'proposalDeadline(uint256)',
+    'votingDelay()',
+    'votingPeriod()',
+    'quorum(uint256)',
+    'getVotes(address,uint256)',
+    'getVotesWithParams(address,uint256,bytes)',
+    'hasVoted(uint256,address)',
+    'propose(address[],uint256[],bytes[],string)',
+    'execute(address[],uint256[],bytes[],bytes32)',
+    'castVote(uint256,uint8)',
+    'castVoteWithReason(uint256,uint8,string)',
+    'castVoteWithReasonAndParams(uint256,uint8,string,bytes)',
+    'castVoteBySig(uint256,uint8,uint8,bytes32,bytes32)',
+    'castVoteWithReasonAndParamsBySig(uint256,uint8,string,bytes,uint8,bytes32,bytes32)',
+  ],
+  GovernorTimelock: [
+    'timelock()',
+    'proposalEta(uint256)',
+    'queue(address[],uint256[],bytes[],bytes32)',
+  ],
+  ERC2981: [
+    'royaltyInfo(uint256,uint256)',
+  ],
+};
+
+const INTERFACE_IDS = {};
+const FN_SIGNATURES = {};
+for (const k of Object.getOwnPropertyNames(INTERFACES)) {
+  INTERFACE_IDS[k] = makeInterfaceId.ERC165(INTERFACES[k]);
+  for (const fnName of INTERFACES[k]) {
+    // the interface id of a single function is equivalent to its function signature
+    FN_SIGNATURES[fnName] = makeInterfaceId.ERC165([fnName]);
+  }
+}
+
+function shouldSupportInterfaces (interfaces = []) {
+  describe('ERC165', function () {
+    beforeEach(function () {
+      this.contractUnderTest = this.mock || this.token || this.holder || this.accessControl;
+    });
+
+    it('supportsInterface uses less than 30k gas', async function () {
+      for (const k of interfaces) {
+        const interfaceId = INTERFACE_IDS[k];
+        expect(await this.contractUnderTest.supportsInterface.estimateGas(interfaceId)).to.be.lte(30000);
+        //expect(await this.contractUnderTest.supportsInterface.estimateGas(interfaceId)).to.be.lte(1);
+      }
+    });
+
+    it('all interfaces are reported as supported', async function () {
+      for (const k of interfaces) {
+        const interfaceId = INTERFACE_IDS[k];
+        expect(await this.contractUnderTest.supportsInterface(interfaceId)).to.equal(true);
+      }
+    });
+
+    it('all interface functions are in ABI', async function () {
+      for (const k of interfaces) {
+        for (const fnName of INTERFACES[k]) {
+          const fnSig = FN_SIGNATURES[fnName];
+          expect(this.contractUnderTest.abi.filter(fn => fn.signature === fnSig).length).to.equal(1);
+        }
+      }
+    });
+  });
+}
+
+module.exports = {
+  shouldSupportInterfaces,
+};
diff --git a/vendors/move/crates/evm/hardhat-examples/test/Token.test.js b/vendors/move/crates/evm/hardhat-examples/test/Token.test.js
new file mode 100644
index 000000000..200e5efd3
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-examples/test/Token.test.js
@@ -0,0 +1,50 @@
+const { expect } = require("chai");
+
+describe("Token (the Move contract)", function () {
+    before(async function () {
+        this.Token = await ethers.getContractFactory("Token");
+        this.token = await this.Token.deploy("user");
+        await this.token.deployed();
+    });
+
+    it("test total supply", async function () {
+        const accounts = await ethers.getSigners();
+        deployer = accounts[0];
+
+        expect(await this.token.balanceOf(deployer.address)).to.be.equal(42);
+        expect(await this.token.totalSupply()).to.be.equal(42);
+    });
+
+    it("test mint", async function () {
+        const accounts = await ethers.getSigners();
+        alice = accounts[1];
+
+        const mintTx = await this.token.mint(alice.address, 127);
+        // wait until the transaction is mined
+        await mintTx.wait();
+        expect(await this.token.balanceOf(alice.address)).to.be.equal(127);
+        expect(await this.token.totalSupply()).to.be.equal(169);
+    });
+
+    it("test transfer", async function () {
+        const accounts = await ethers.getSigners();
+        deployer = accounts[0];
+        bob = accounts[2];
+
+        // Transfer 17 tokens from the deployer to alice
+        const transferTx = await this.token.transfer(bob.address, 17);
+        // wait until the transaction is mined
+        await transferTx.wait();
+
+        expect(await this.token.balanceOf(bob.address)).to.be.equal(17);
+        expect(await this.token.balanceOf(deployer.address)).to.be.equal(25);
+        // total supply should not change
+        expect(await this.token.totalSupply()).to.be.equal(169);
+    });
+
+    it("test name", async function () {
+        const accounts = await ethers.getSigners();
+        deployer = accounts[0];
+        expect(await this.token.name()).to.be.equal("user");
+    });
+});
diff --git a/vendors/move/crates/evm/hardhat-move/.gitignore b/vendors/move/crates/evm/hardhat-move/.gitignore
new file mode 100644
index 000000000..f06235c46
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/vendors/move/crates/evm/hardhat-move/README.md b/vendors/move/crates/evm/hardhat-move/README.md
new file mode 100644
index 000000000..212a5ab9e
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/README.md
@@ -0,0 +1,42 @@
+# hardhat-move
+
+## What
+This is an hardhat plugin that adds support for the Move language.
+This plugin extends the `compile` task with a sub task to compile contracts written in Move and generate the require artifacts for testing and deployment.
+
+## Setting up the Plugin
+Right now this plugin is still experimental and requires some manual steps to set up.
+
+Step 1: compile and install the `move` executable
+```
+cd language/tools/move-cli
+cargo install --path .
+```
+
+Step 2: set up the dev environment for `hardhat-move`
+```
+cd language/evm/hardhat-move
+npm install
+```
+
+Step 3: since `hardhat-move` is written in typescript, it needs to be compiled
+```
+cd language/evm/hardhat-move
+npm run build
+```
+
+With these steps done, you should be able to use this plugin in `hardhat-examples`, provided that you have already set that up. For now, if you wish to use `hardhat-move` in another hardhat project, you would have to add it as a dependency to `package.json` located in the root of your project, rerun `npm install`, and add `require("hardhat-move");` to the top of your `hardhat.config.js`, similar to what `hardhat-examples` had done.
+
+## Writing Contracts in Move
+Move contracts should adhere to the following directory layout
+```
+<hardhat project root>
+    - contracts
+        - MyMovePackage1
+            - sources
+            - Move.toml
+        - MyMovePackage2
+            - sources
+            - Move.toml
+```
+Currently, exactly one contract is generated from each Move package, with the **contract name equal to the package name**. It should noted that this is more of a tentative design and we may add a finer way for the user to specify the package/module-to-contract mapping, potentially allowing custom contract names and defining multiple contracts in the same package.
diff --git a/vendors/move/crates/evm/hardhat-move/package-lock.json b/vendors/move/crates/evm/hardhat-move/package-lock.json
new file mode 100644
index 000000000..8d92363d1
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/package-lock.json
@@ -0,0 +1,7991 @@
+{
+  "name": "hardhat-move",
+  "version": "0.0.1",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "hardhat-move",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mocha": "^9.1.0",
+        "neverthrow": "^4.3.1",
+        "typescript": "^4.6.3"
+      },
+      "devDependencies": {
+        "hardhat": "^2.9.3",
+        "mocha": "^7.1.2"
+      },
+      "peerDependencies": {
+        "hardhat": "^2.0.0"
+      }
+    },
+    "node_modules/@ethereumjs/block": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/block/-/block-3.6.2.tgz",
+      "integrity": "sha512-mOqYWwMlAZpYUEOEqt7EfMFuVL2eyLqWWIzcf4odn6QgXY8jBI2NhVuJncrMCKeMZrsJAe7/auaRRB6YcdH+Qw==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/tx": "^3.5.1",
+        "ethereumjs-util": "^7.1.4",
+        "merkle-patricia-tree": "^4.2.4"
+      }
+    },
+    "node_modules/@ethereumjs/blockchain": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.5.2.tgz",
+      "integrity": "sha512-Jz26iJmmsQtngerW6r5BDFaew/f2mObLrRZo3rskLOx1lmtMZ8+TX/vJexmivrnWgmAsTdNWhlKUYY4thPhPig==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/block": "^3.6.2",
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/ethash": "^1.1.0",
+        "debug": "^4.3.3",
+        "ethereumjs-util": "^7.1.4",
+        "level-mem": "^5.0.1",
+        "lru-cache": "^5.1.1",
+        "semaphore-async-await": "^1.5.1"
+      }
+    },
+    "node_modules/@ethereumjs/common": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.3.tgz",
+      "integrity": "sha512-mQwPucDL7FDYIg9XQ8DL31CnIYZwGhU5hyOO5E+BMmT71G0+RHvIT5rIkLBirJEKxV6+Rcf9aEIY0kXInxUWpQ==",
+      "dev": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "node_modules/@ethereumjs/ethash": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/ethash/-/ethash-1.1.0.tgz",
+      "integrity": "sha512-/U7UOKW6BzpA+Vt+kISAoeDie1vAvY4Zy2KF5JJb+So7+1yKmJeJEHOGSnQIj330e9Zyl3L5Nae6VZyh2TJnAA==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/block": "^3.5.0",
+        "@types/levelup": "^4.3.0",
+        "buffer-xor": "^2.0.1",
+        "ethereumjs-util": "^7.1.1",
+        "miller-rabin": "^4.0.0"
+      }
+    },
+    "node_modules/@ethereumjs/ethash/node_modules/buffer-xor": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
+      "integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/@ethereumjs/tx": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.1.tgz",
+      "integrity": "sha512-xzDrTiu4sqZXUcaBxJ4n4W5FrppwxLxZB4ZDGVLtxSQR4lVuOnFR6RcUHdg1mpUhAPVrmnzLJpxaeXnPxIyhWA==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/common": "^2.6.3",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "node_modules/@ethereumjs/vm": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/vm/-/vm-5.8.0.tgz",
+      "integrity": "sha512-mn2G2SX79QY4ckVvZUfxlNUpzwT2AEIkvgJI8aHoQaNYEHhH8rmdVDIaVVgz6//PjK52BZsK23afz+WvSR0Qqw==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/block": "^3.6.2",
+        "@ethereumjs/blockchain": "^5.5.2",
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/tx": "^3.5.1",
+        "async-eventemitter": "^0.2.4",
+        "core-js-pure": "^3.0.1",
+        "debug": "^4.3.3",
+        "ethereumjs-util": "^7.1.4",
+        "functional-red-black-tree": "^1.0.1",
+        "mcl-wasm": "^0.7.1",
+        "merkle-patricia-tree": "^4.2.4",
+        "rustbn.js": "~0.2.0"
+      }
+    },
+    "node_modules/@ethersproject/abi": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.6.0.tgz",
+      "integrity": "sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-provider": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz",
+      "integrity": "sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/networks": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/web": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/abstract-signer": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz",
+      "integrity": "sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/address": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.6.0.tgz",
+      "integrity": "sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/base64": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.6.0.tgz",
+      "integrity": "sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/bignumber": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.6.0.tgz",
+      "integrity": "sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "bn.js": "^4.11.9"
+      }
+    },
+    "node_modules/@ethersproject/bignumber/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@ethersproject/bytes": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.6.1.tgz",
+      "integrity": "sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/constants": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.6.0.tgz",
+      "integrity": "sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bignumber": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/hash": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.6.0.tgz",
+      "integrity": "sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/keccak256": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.6.0.tgz",
+      "integrity": "sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "js-sha3": "0.8.0"
+      }
+    },
+    "node_modules/@ethersproject/logger": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.6.0.tgz",
+      "integrity": "sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ]
+    },
+    "node_modules/@ethersproject/networks": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.6.1.tgz",
+      "integrity": "sha512-b2rrupf3kCTcc3jr9xOWBuHylSFtbpJf79Ga7QR98ienU2UqGimPGEsYMgbI29KHJfA5Us89XwGVmxrlxmSrMg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/properties": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.6.0.tgz",
+      "integrity": "sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/rlp": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.6.0.tgz",
+      "integrity": "sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/signing-key": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.6.0.tgz",
+      "integrity": "sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.7"
+      }
+    },
+    "node_modules/@ethersproject/signing-key/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@ethersproject/strings": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.6.0.tgz",
+      "integrity": "sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/transactions": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.6.0.tgz",
+      "integrity": "sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0",
+        "@ethersproject/signing-key": "^5.6.0"
+      }
+    },
+    "node_modules/@ethersproject/web": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.6.0.tgz",
+      "integrity": "sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "dependencies": {
+        "@ethersproject/base64": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@metamask/eth-sig-util/-/eth-sig-util-4.0.0.tgz",
+      "integrity": "sha512-LczOjjxY4A7XYloxzyxJIHONELmUxVZncpOLoClpEcTiebiVdM46KRPYXGuULro9oNNR2xdVx3yoKiQjdfWmoA==",
+      "dev": true,
+      "dependencies": {
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^6.2.1",
+        "ethjs-util": "^0.1.6",
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/@sentry/core": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
+      "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/hub": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz",
+      "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/minimal": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
+      "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/node": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz",
+      "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/core": "5.30.0",
+        "@sentry/hub": "5.30.0",
+        "@sentry/tracing": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "cookie": "^0.4.1",
+        "https-proxy-agent": "^5.0.0",
+        "lru_map": "^0.3.3",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/tracing": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz",
+      "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/types": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
+      "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/utils": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
+      "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
+      "dev": true,
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@solidity-parser/parser": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.1.tgz",
+      "integrity": "sha512-eLjj2L6AuQjBB6s/ibwCAc0DwrR5Ge+ys+wgWo+bviU7fV2nTMQhU63CGaDKXg9iTmMxwhkyoggdIR7ZGRfMgw==",
+      "dev": true,
+      "dependencies": {
+        "antlr4ts": "^0.5.0-alpha.4"
+      }
+    },
+    "node_modules/@types/abstract-leveldown": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz",
+      "integrity": "sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ==",
+      "dev": true
+    },
+    "node_modules/@types/bn.js": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
+      "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/level-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
+      "integrity": "sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ==",
+      "dev": true
+    },
+    "node_modules/@types/levelup": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@types/levelup/-/levelup-4.3.3.tgz",
+      "integrity": "sha512-K+OTIjJcZHVlZQN1HmU64VtrC0jC3dXWQozuEIR9zVvltIk90zaGPM2AgT+fIkChpzHhFE3YnvFLCbLtzAmexA==",
+      "dev": true,
+      "dependencies": {
+        "@types/abstract-leveldown": "*",
+        "@types/level-errors": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
+      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="
+    },
+    "node_modules/@types/node": {
+      "version": "17.0.23",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
+      "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==",
+      "dev": true
+    },
+    "node_modules/@types/pbkdf2": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
+      "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/abstract-leveldown": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz",
+      "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "immediate": "^3.2.3",
+        "level-concat-iterator": "~2.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/adm-zip": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz",
+      "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/antlr4ts": {
+      "version": "0.5.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
+      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
+      "dev": true
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/async-eventemitter": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz",
+      "integrity": "sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.4.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base-x": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+      "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/blakejs": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
+      "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+      "dev": true,
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "node_modules/bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dev": true,
+      "dependencies": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true,
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deferred-leveldown": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
+      "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~6.2.1",
+        "inherits": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deferred-leveldown/node_modules/abstract-leveldown": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+      "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "immediate": "^3.2.3",
+        "level-concat-iterator": "~2.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/encoding-down": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz",
+      "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "^6.2.1",
+        "inherits": "^2.0.3",
+        "level-codec": "^9.0.0",
+        "level-errors": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-abstract/node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ethereum-cryptography": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+      "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/pbkdf2": "^3.0.0",
+        "@types/secp256k1": "^4.0.1",
+        "blakejs": "^1.1.0",
+        "browserify-aes": "^1.2.0",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash.js": "^1.1.7",
+        "keccak": "^3.0.0",
+        "pbkdf2": "^3.0.17",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.1.2",
+        "scrypt-js": "^3.0.0",
+        "secp256k1": "^4.0.1",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
+    "node_modules/ethereumjs-util": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.4.tgz",
+      "integrity": "sha512-p6KmuPCX4mZIqsQzXfmSx9Y0l2hqf+VkAiwSisW3UKUFdk8ZkAt+AYaor83z2nSi6CU2zSsXMlD80hAbNEGM0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/bn.js": "^5.1.0",
+        "bn.js": "^5.1.2",
+        "create-hash": "^1.1.2",
+        "ethereum-cryptography": "^0.1.3",
+        "rlp": "^2.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fp-ts": {
+      "version": "1.19.3",
+      "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-1.19.3.tgz",
+      "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==",
+      "dev": true
+    },
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/hardhat": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.9.3.tgz",
+      "integrity": "sha512-7Vw99RbYbMZ15UzegOR/nqIYIqddZXvLwJGaX5sX4G5bydILnbjmDU6g3jMKJSiArEixS3vHAEaOs5CW1JQ3hg==",
+      "dev": true,
+      "dependencies": {
+        "@ethereumjs/block": "^3.6.0",
+        "@ethereumjs/blockchain": "^5.5.0",
+        "@ethereumjs/common": "^2.6.0",
+        "@ethereumjs/tx": "^3.4.0",
+        "@ethereumjs/vm": "^5.6.0",
+        "@ethersproject/abi": "^5.1.2",
+        "@metamask/eth-sig-util": "^4.0.0",
+        "@sentry/node": "^5.18.1",
+        "@solidity-parser/parser": "^0.14.1",
+        "@types/bn.js": "^5.1.0",
+        "@types/lru-cache": "^5.1.0",
+        "abort-controller": "^3.0.0",
+        "adm-zip": "^0.4.16",
+        "aggregate-error": "^3.0.0",
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.4.0",
+        "ci-info": "^2.0.0",
+        "debug": "^4.1.1",
+        "enquirer": "^2.3.0",
+        "env-paths": "^2.2.0",
+        "ethereum-cryptography": "^0.1.2",
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^7.1.3",
+        "find-up": "^2.1.0",
+        "fp-ts": "1.19.3",
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.3",
+        "immutable": "^4.0.0-rc.12",
+        "io-ts": "1.10.4",
+        "lodash": "^4.17.11",
+        "merkle-patricia-tree": "^4.2.2",
+        "mnemonist": "^0.38.0",
+        "mocha": "^9.2.0",
+        "p-map": "^4.0.0",
+        "qs": "^6.7.0",
+        "raw-body": "^2.4.1",
+        "resolve": "1.17.0",
+        "semver": "^6.3.0",
+        "slash": "^3.0.0",
+        "solc": "0.7.3",
+        "source-map-support": "^0.5.13",
+        "stacktrace-parser": "^0.1.10",
+        "true-case-path": "^2.2.1",
+        "tsort": "0.0.1",
+        "undici": "^4.14.1",
+        "uuid": "^8.3.2",
+        "ws": "^7.4.6"
+      },
+      "bin": {
+        "hardhat": "internal/cli/cli.js"
+      },
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hardhat/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hardhat/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hardhat/node_modules/minimatch": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
+      "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hardhat/node_modules/mocha": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
+      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+      "dev": true,
+      "dependencies": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.3",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "4.2.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.1",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "which": "2.0.2",
+        "workerpool": "6.2.0",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/hardhat/node_modules/mocha/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/hardhat/node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/hardhat/node_modules/mocha/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hardhat/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/hardhat/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hardhat/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hardhat/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hardhat/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/immediate": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==",
+      "dev": true
+    },
+    "node_modules/immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+      "dev": true
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/io-ts": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-1.10.4.tgz",
+      "integrity": "sha512-b23PteSnYXSONJ6JQXRAlvJhuw8KOtkqa87W4wDtvMrud/DTJd5X+NpOOI+O/zZwVq6v0VLAaJ+1EDViKEuN9g==",
+      "dev": true,
+      "dependencies": {
+        "fp-ts": "^1.0.0"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-hex-prefixed": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
+      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/keccak": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz",
+      "integrity": "sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/level-codec": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
+      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-concat-iterator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
+      "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
+      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
+      "dev": true,
+      "dependencies": {
+        "errno": "~0.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-iterator-stream": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
+      "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0",
+        "xtend": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-mem": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-5.0.1.tgz",
+      "integrity": "sha512-qd+qUJHXsGSFoHTziptAKXoLX87QjR7v2KMbqncDXPxQuCdsQlzmyX+gwrEHhlzn08vkf8TyipYyMmiC6Gobzg==",
+      "dev": true,
+      "dependencies": {
+        "level-packager": "^5.0.3",
+        "memdown": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-packager": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
+      "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==",
+      "dev": true,
+      "dependencies": {
+        "encoding-down": "^6.3.0",
+        "levelup": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-supports": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
+      "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/level-ws": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-2.0.0.tgz",
+      "integrity": "sha512-1iv7VXx0G9ec1isqQZ7y5LmoZo/ewAsyDHNA8EFDW5hqH2Kqovm33nSFkSdnLLAK+I5FlT+lo5Cw9itGe+CpQA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.0",
+        "xtend": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levelup": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
+      "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
+      "dev": true,
+      "dependencies": {
+        "deferred-leveldown": "~5.3.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~4.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru_map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
+      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "node_modules/mcl-wasm": {
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/mcl-wasm/-/mcl-wasm-0.7.9.tgz",
+      "integrity": "sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/memdown": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-5.1.0.tgz",
+      "integrity": "sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==",
+      "dev": true,
+      "dependencies": {
+        "abstract-leveldown": "~6.2.1",
+        "functional-red-black-tree": "~1.0.1",
+        "immediate": "~3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/memdown/node_modules/abstract-leveldown": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+      "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "immediate": "^3.2.3",
+        "level-concat-iterator": "~2.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/memdown/node_modules/immediate": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
+      "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=",
+      "dev": true
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/merkle-patricia-tree": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.4.tgz",
+      "integrity": "sha512-eHbf/BG6eGNsqqfbLED9rIqbsF4+sykEaBn6OLNs71tjclbMcMOk1tEPmJKcNcNCLkvbpY/lwyOlizWsqPNo8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/levelup": "^4.3.0",
+        "ethereumjs-util": "^7.1.4",
+        "level-mem": "^5.0.1",
+        "level-ws": "^2.0.0",
+        "readable-stream": "^3.6.0",
+        "semaphore-async-await": "^1.5.1"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mnemonist": {
+      "version": "0.38.5",
+      "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz",
+      "integrity": "sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==",
+      "dev": true,
+      "dependencies": {
+        "obliterator": "^2.0.0"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
+      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.3.0",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "3.0.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.5",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.6",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/mocha/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/chokidar": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.2.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.1"
+      }
+    },
+    "node_modules/mocha/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/mocha/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mocha/node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mocha/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/flat": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
+      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "~2.0.3"
+      },
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/mocha/node_modules/fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mocha/node_modules/js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/readdirp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mocha/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/mocha/node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs-unparser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "dev": true,
+      "dependencies": {
+        "flat": "^4.1.0",
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/neverthrow": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-4.3.1.tgz",
+      "integrity": "sha512-+vxjSaiDWjAj6kR6KKW0YDuV6O4UCNWGAO8m8ITjFKPWcTmU1GVnL+J5TAUTKpPnUAHCKDxXpOHVaERid223Ww=="
+    },
+    "node_modules/node-addon-api": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+      "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
+      "dev": true
+    },
+    "node_modules/node-environment-flags": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
+    "node_modules/node-environment-flags/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz",
+      "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==",
+      "dev": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
+      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obliterator": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.2.tgz",
+      "integrity": "sha512-g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg==",
+      "dev": true
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "node_modules/qs": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/rlp": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz",
+      "integrity": "sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.2.0"
+      },
+      "bin": {
+        "rlp": "bin/rlp"
+      }
+    },
+    "node_modules/rustbn.js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
+      "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==",
+      "dev": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "node_modules/secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "elliptic": "^6.5.4",
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/semaphore-async-await": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
+      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo=",
+      "dev": true,
+      "engines": {
+        "node": ">=4.1"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/solc": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.3.tgz",
+      "integrity": "sha512-GAsWNAjGzIDg7VxzP6mPjdurby3IkGCjQcM8GFYZT6RyaoUZKmMU6Y7YwG+tFGhv7dwZ8rmR4iwFDrrD99JwqA==",
+      "dev": true,
+      "dependencies": {
+        "command-exists": "^1.2.8",
+        "commander": "3.0.2",
+        "follow-redirects": "^1.12.1",
+        "fs-extra": "^0.30.0",
+        "js-sha3": "0.8.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
+        "semver": "^5.5.0",
+        "tmp": "0.0.33"
+      },
+      "bin": {
+        "solcjs": "solcjs"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/solc/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/solc/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/solc/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/stacktrace-parser": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.7.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stacktrace-parser/node_modules/type-fest": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
+      "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-hex-prefix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
+      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
+      "dev": true,
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/true-case-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz",
+      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==",
+      "dev": true
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tsort": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz",
+      "integrity": "sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=",
+      "dev": true
+    },
+    "node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true
+    },
+    "node_modules/tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undici": {
+      "version": "4.16.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
+      "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.18"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/ws": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
+  "dependencies": {
+    "@ethereumjs/block": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/block/-/block-3.6.2.tgz",
+      "integrity": "sha512-mOqYWwMlAZpYUEOEqt7EfMFuVL2eyLqWWIzcf4odn6QgXY8jBI2NhVuJncrMCKeMZrsJAe7/auaRRB6YcdH+Qw==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/tx": "^3.5.1",
+        "ethereumjs-util": "^7.1.4",
+        "merkle-patricia-tree": "^4.2.4"
+      }
+    },
+    "@ethereumjs/blockchain": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.5.2.tgz",
+      "integrity": "sha512-Jz26iJmmsQtngerW6r5BDFaew/f2mObLrRZo3rskLOx1lmtMZ8+TX/vJexmivrnWgmAsTdNWhlKUYY4thPhPig==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/block": "^3.6.2",
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/ethash": "^1.1.0",
+        "debug": "^4.3.3",
+        "ethereumjs-util": "^7.1.4",
+        "level-mem": "^5.0.1",
+        "lru-cache": "^5.1.1",
+        "semaphore-async-await": "^1.5.1"
+      }
+    },
+    "@ethereumjs/common": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.3.tgz",
+      "integrity": "sha512-mQwPucDL7FDYIg9XQ8DL31CnIYZwGhU5hyOO5E+BMmT71G0+RHvIT5rIkLBirJEKxV6+Rcf9aEIY0kXInxUWpQ==",
+      "dev": true,
+      "requires": {
+        "crc-32": "^1.2.0",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "@ethereumjs/ethash": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/ethash/-/ethash-1.1.0.tgz",
+      "integrity": "sha512-/U7UOKW6BzpA+Vt+kISAoeDie1vAvY4Zy2KF5JJb+So7+1yKmJeJEHOGSnQIj330e9Zyl3L5Nae6VZyh2TJnAA==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/block": "^3.5.0",
+        "@types/levelup": "^4.3.0",
+        "buffer-xor": "^2.0.1",
+        "ethereumjs-util": "^7.1.1",
+        "miller-rabin": "^4.0.0"
+      },
+      "dependencies": {
+        "buffer-xor": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
+          "integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.1"
+          }
+        }
+      }
+    },
+    "@ethereumjs/tx": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.1.tgz",
+      "integrity": "sha512-xzDrTiu4sqZXUcaBxJ4n4W5FrppwxLxZB4ZDGVLtxSQR4lVuOnFR6RcUHdg1mpUhAPVrmnzLJpxaeXnPxIyhWA==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/common": "^2.6.3",
+        "ethereumjs-util": "^7.1.4"
+      }
+    },
+    "@ethereumjs/vm": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/vm/-/vm-5.8.0.tgz",
+      "integrity": "sha512-mn2G2SX79QY4ckVvZUfxlNUpzwT2AEIkvgJI8aHoQaNYEHhH8rmdVDIaVVgz6//PjK52BZsK23afz+WvSR0Qqw==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/block": "^3.6.2",
+        "@ethereumjs/blockchain": "^5.5.2",
+        "@ethereumjs/common": "^2.6.3",
+        "@ethereumjs/tx": "^3.5.1",
+        "async-eventemitter": "^0.2.4",
+        "core-js-pure": "^3.0.1",
+        "debug": "^4.3.3",
+        "ethereumjs-util": "^7.1.4",
+        "functional-red-black-tree": "^1.0.1",
+        "mcl-wasm": "^0.7.1",
+        "merkle-patricia-tree": "^4.2.4",
+        "rustbn.js": "~0.2.0"
+      }
+    },
+    "@ethersproject/abi": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.6.0.tgz",
+      "integrity": "sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "@ethersproject/abstract-provider": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz",
+      "integrity": "sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/networks": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/transactions": "^5.6.0",
+        "@ethersproject/web": "^5.6.0"
+      }
+    },
+    "@ethersproject/abstract-signer": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz",
+      "integrity": "sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/abstract-provider": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0"
+      }
+    },
+    "@ethersproject/address": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.6.0.tgz",
+      "integrity": "sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0"
+      }
+    },
+    "@ethersproject/base64": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.6.0.tgz",
+      "integrity": "sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0"
+      }
+    },
+    "@ethersproject/bignumber": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.6.0.tgz",
+      "integrity": "sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "bn.js": "^4.11.9"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "@ethersproject/bytes": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.6.1.tgz",
+      "integrity": "sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "@ethersproject/constants": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.6.0.tgz",
+      "integrity": "sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bignumber": "^5.6.0"
+      }
+    },
+    "@ethersproject/hash": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.6.0.tgz",
+      "integrity": "sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/abstract-signer": "^5.6.0",
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "@ethersproject/keccak256": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.6.0.tgz",
+      "integrity": "sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0",
+        "js-sha3": "0.8.0"
+      }
+    },
+    "@ethersproject/logger": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.6.0.tgz",
+      "integrity": "sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==",
+      "dev": true
+    },
+    "@ethersproject/networks": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.6.1.tgz",
+      "integrity": "sha512-b2rrupf3kCTcc3jr9xOWBuHylSFtbpJf79Ga7QR98ienU2UqGimPGEsYMgbI29KHJfA5Us89XwGVmxrlxmSrMg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "@ethersproject/properties": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.6.0.tgz",
+      "integrity": "sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "@ethersproject/rlp": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.6.0.tgz",
+      "integrity": "sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "@ethersproject/signing-key": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.6.0.tgz",
+      "integrity": "sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "bn.js": "^4.11.9",
+        "elliptic": "6.5.4",
+        "hash.js": "1.1.7"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "@ethersproject/strings": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.6.0.tgz",
+      "integrity": "sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0"
+      }
+    },
+    "@ethersproject/transactions": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.6.0.tgz",
+      "integrity": "sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/address": "^5.6.0",
+        "@ethersproject/bignumber": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/constants": "^5.6.0",
+        "@ethersproject/keccak256": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/rlp": "^5.6.0",
+        "@ethersproject/signing-key": "^5.6.0"
+      }
+    },
+    "@ethersproject/web": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.6.0.tgz",
+      "integrity": "sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==",
+      "dev": true,
+      "requires": {
+        "@ethersproject/base64": "^5.6.0",
+        "@ethersproject/bytes": "^5.6.0",
+        "@ethersproject/logger": "^5.6.0",
+        "@ethersproject/properties": "^5.6.0",
+        "@ethersproject/strings": "^5.6.0"
+      }
+    },
+    "@metamask/eth-sig-util": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@metamask/eth-sig-util/-/eth-sig-util-4.0.0.tgz",
+      "integrity": "sha512-LczOjjxY4A7XYloxzyxJIHONELmUxVZncpOLoClpEcTiebiVdM46KRPYXGuULro9oNNR2xdVx3yoKiQjdfWmoA==",
+      "dev": true,
+      "requires": {
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^6.2.1",
+        "ethjs-util": "^0.1.6",
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
+      },
+      "dependencies": {
+        "@types/bn.js": {
+          "version": "4.11.6",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+          "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "ethereumjs-util": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+          "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+          "dev": true,
+          "requires": {
+            "@types/bn.js": "^4.11.3",
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "elliptic": "^6.5.2",
+            "ethereum-cryptography": "^0.1.3",
+            "ethjs-util": "0.1.6",
+            "rlp": "^2.2.3"
+          }
+        }
+      }
+    },
+    "@sentry/core": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
+      "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==",
+      "dev": true,
+      "requires": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/hub": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz",
+      "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==",
+      "dev": true,
+      "requires": {
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/minimal": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
+      "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==",
+      "dev": true,
+      "requires": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/node": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz",
+      "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==",
+      "dev": true,
+      "requires": {
+        "@sentry/core": "5.30.0",
+        "@sentry/hub": "5.30.0",
+        "@sentry/tracing": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "cookie": "^0.4.1",
+        "https-proxy-agent": "^5.0.0",
+        "lru_map": "^0.3.3",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/tracing": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz",
+      "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==",
+      "dev": true,
+      "requires": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/types": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
+      "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==",
+      "dev": true
+    },
+    "@sentry/utils": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
+      "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
+      "dev": true,
+      "requires": {
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@solidity-parser/parser": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.1.tgz",
+      "integrity": "sha512-eLjj2L6AuQjBB6s/ibwCAc0DwrR5Ge+ys+wgWo+bviU7fV2nTMQhU63CGaDKXg9iTmMxwhkyoggdIR7ZGRfMgw==",
+      "dev": true,
+      "requires": {
+        "antlr4ts": "^0.5.0-alpha.4"
+      }
+    },
+    "@types/abstract-leveldown": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz",
+      "integrity": "sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ==",
+      "dev": true
+    },
+    "@types/bn.js": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
+      "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/level-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
+      "integrity": "sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ==",
+      "dev": true
+    },
+    "@types/levelup": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@types/levelup/-/levelup-4.3.3.tgz",
+      "integrity": "sha512-K+OTIjJcZHVlZQN1HmU64VtrC0jC3dXWQozuEIR9zVvltIk90zaGPM2AgT+fIkChpzHhFE3YnvFLCbLtzAmexA==",
+      "dev": true,
+      "requires": {
+        "@types/abstract-leveldown": "*",
+        "@types/level-errors": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
+      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="
+    },
+    "@types/node": {
+      "version": "17.0.23",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
+      "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==",
+      "dev": true
+    },
+    "@types/pbkdf2": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
+      "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
+    "abstract-leveldown": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz",
+      "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "immediate": "^3.2.3",
+        "level-concat-iterator": "~2.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "adm-zip": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz",
+      "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "antlr4ts": {
+      "version": "0.5.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
+      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "async-eventemitter": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz",
+      "integrity": "sha512-pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==",
+      "dev": true,
+      "requires": {
+        "async": "^2.4.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "base-x": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+      "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
+    },
+    "blakejs": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
+      "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+      "dev": true,
+      "requires": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dev": true,
+      "requires": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
+      "dev": true
+    },
+    "commander": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true
+    },
+    "core-js-pure": {
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+      "dev": true
+    },
+    "crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true
+    },
+    "deferred-leveldown": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
+      "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
+      "dev": true,
+      "requires": {
+        "abstract-leveldown": "~6.2.1",
+        "inherits": "^2.0.3"
+      },
+      "dependencies": {
+        "abstract-leveldown": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+          "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+          "dev": true,
+          "requires": {
+            "buffer": "^5.5.0",
+            "immediate": "^3.2.3",
+            "level-concat-iterator": "~2.0.0",
+            "level-supports": "~1.0.0",
+            "xtend": "~4.0.0"
+          }
+        }
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true
+    },
+    "diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "encoding-down": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz",
+      "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==",
+      "dev": true,
+      "requires": {
+        "abstract-leveldown": "^6.2.1",
+        "inherits": "^2.0.3",
+        "level-codec": "^9.0.0",
+        "level-errors": "^2.0.0"
+      }
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "dependencies": {
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "ethereum-cryptography": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+      "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
+      "dev": true,
+      "requires": {
+        "@types/pbkdf2": "^3.0.0",
+        "@types/secp256k1": "^4.0.1",
+        "blakejs": "^1.1.0",
+        "browserify-aes": "^1.2.0",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "hash.js": "^1.1.7",
+        "keccak": "^3.0.0",
+        "pbkdf2": "^3.0.17",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.1.2",
+        "scrypt-js": "^3.0.0",
+        "secp256k1": "^4.0.1",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      },
+      "dependencies": {
+        "@types/bn.js": {
+          "version": "4.11.6",
+          "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+          "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "ethereumjs-util": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+          "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+          "dev": true,
+          "requires": {
+            "@types/bn.js": "^4.11.3",
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "elliptic": "^6.5.2",
+            "ethereum-cryptography": "^0.1.3",
+            "ethjs-util": "0.1.6",
+            "rlp": "^2.2.3"
+          }
+        }
+      }
+    },
+    "ethereumjs-util": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.4.tgz",
+      "integrity": "sha512-p6KmuPCX4mZIqsQzXfmSx9Y0l2hqf+VkAiwSisW3UKUFdk8ZkAt+AYaor83z2nSi6CU2zSsXMlD80hAbNEGM0A==",
+      "dev": true,
+      "requires": {
+        "@types/bn.js": "^5.1.0",
+        "bn.js": "^5.1.2",
+        "create-hash": "^1.1.2",
+        "ethereum-cryptography": "^0.1.3",
+        "rlp": "^2.2.4"
+      }
+    },
+    "ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "requires": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      }
+    },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
+    },
+    "follow-redirects": {
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "dev": true
+    },
+    "fp-ts": {
+      "version": "1.19.3",
+      "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-1.19.3.tgz",
+      "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==",
+      "dev": true
+    },
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "hardhat": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.9.3.tgz",
+      "integrity": "sha512-7Vw99RbYbMZ15UzegOR/nqIYIqddZXvLwJGaX5sX4G5bydILnbjmDU6g3jMKJSiArEixS3vHAEaOs5CW1JQ3hg==",
+      "dev": true,
+      "requires": {
+        "@ethereumjs/block": "^3.6.0",
+        "@ethereumjs/blockchain": "^5.5.0",
+        "@ethereumjs/common": "^2.6.0",
+        "@ethereumjs/tx": "^3.4.0",
+        "@ethereumjs/vm": "^5.6.0",
+        "@ethersproject/abi": "^5.1.2",
+        "@metamask/eth-sig-util": "^4.0.0",
+        "@sentry/node": "^5.18.1",
+        "@solidity-parser/parser": "^0.14.1",
+        "@types/bn.js": "^5.1.0",
+        "@types/lru-cache": "^5.1.0",
+        "abort-controller": "^3.0.0",
+        "adm-zip": "^0.4.16",
+        "aggregate-error": "^3.0.0",
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.4.0",
+        "ci-info": "^2.0.0",
+        "debug": "^4.1.1",
+        "enquirer": "^2.3.0",
+        "env-paths": "^2.2.0",
+        "ethereum-cryptography": "^0.1.2",
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^7.1.3",
+        "find-up": "^2.1.0",
+        "fp-ts": "1.19.3",
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.3",
+        "immutable": "^4.0.0-rc.12",
+        "io-ts": "1.10.4",
+        "lodash": "^4.17.11",
+        "merkle-patricia-tree": "^4.2.2",
+        "mnemonist": "^0.38.0",
+        "mocha": "^9.2.0",
+        "p-map": "^4.0.0",
+        "qs": "^6.7.0",
+        "raw-body": "^2.4.1",
+        "resolve": "1.17.0",
+        "semver": "^6.3.0",
+        "slash": "^3.0.0",
+        "solc": "0.7.3",
+        "source-map-support": "^0.5.13",
+        "stacktrace-parser": "^0.1.10",
+        "true-case-path": "^2.2.1",
+        "tsort": "0.0.1",
+        "undici": "^4.14.1",
+        "uuid": "^8.3.2",
+        "ws": "^7.4.6"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
+          "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "mocha": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
+          "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+          "dev": true,
+          "requires": {
+            "@ungap/promise-all-settled": "1.1.2",
+            "ansi-colors": "4.1.1",
+            "browser-stdout": "1.3.1",
+            "chokidar": "3.5.3",
+            "debug": "4.3.3",
+            "diff": "5.0.0",
+            "escape-string-regexp": "4.0.0",
+            "find-up": "5.0.0",
+            "glob": "7.2.0",
+            "growl": "1.10.5",
+            "he": "1.2.0",
+            "js-yaml": "4.1.0",
+            "log-symbols": "4.1.0",
+            "minimatch": "4.2.1",
+            "ms": "2.1.3",
+            "nanoid": "3.3.1",
+            "serialize-javascript": "6.0.0",
+            "strip-json-comments": "3.1.1",
+            "supports-color": "8.1.1",
+            "which": "2.0.2",
+            "workerpool": "6.2.0",
+            "yargs": "16.2.0",
+            "yargs-parser": "20.2.4",
+            "yargs-unparser": "2.0.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "4.3.3",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+              "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+              "dev": true,
+              "requires": {
+                "ms": "2.1.2"
+              },
+              "dependencies": {
+                "ms": {
+                  "version": "2.1.2",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                  "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+                  "dev": true
+                }
+              }
+            },
+            "find-up": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+              "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "immediate": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==",
+      "dev": true
+    },
+    "immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "io-ts": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-1.10.4.tgz",
+      "integrity": "sha512-b23PteSnYXSONJ6JQXRAlvJhuw8KOtkqa87W4wDtvMrud/DTJd5X+NpOOI+O/zZwVq6v0VLAaJ+1EDViKEuN9g==",
+      "dev": true,
+      "requires": {
+        "fp-ts": "^1.0.0"
+      }
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-hex-prefixed": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
+      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "keccak": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz",
+      "integrity": "sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==",
+      "dev": true,
+      "requires": {
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0",
+        "readable-stream": "^3.6.0"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "level-codec": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
+      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.6.0"
+      }
+    },
+    "level-concat-iterator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
+      "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
+      "dev": true
+    },
+    "level-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
+      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.1"
+      }
+    },
+    "level-iterator-stream": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
+      "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "level-mem": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-5.0.1.tgz",
+      "integrity": "sha512-qd+qUJHXsGSFoHTziptAKXoLX87QjR7v2KMbqncDXPxQuCdsQlzmyX+gwrEHhlzn08vkf8TyipYyMmiC6Gobzg==",
+      "dev": true,
+      "requires": {
+        "level-packager": "^5.0.3",
+        "memdown": "^5.0.0"
+      }
+    },
+    "level-packager": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
+      "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==",
+      "dev": true,
+      "requires": {
+        "encoding-down": "^6.3.0",
+        "levelup": "^4.3.2"
+      }
+    },
+    "level-supports": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
+      "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+      "dev": true,
+      "requires": {
+        "xtend": "^4.0.2"
+      }
+    },
+    "level-ws": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-2.0.0.tgz",
+      "integrity": "sha512-1iv7VXx0G9ec1isqQZ7y5LmoZo/ewAsyDHNA8EFDW5hqH2Kqovm33nSFkSdnLLAK+I5FlT+lo5Cw9itGe+CpQA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "levelup": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
+      "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
+      "dev": true,
+      "requires": {
+        "deferred-leveldown": "~5.3.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~4.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "lru_map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
+      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=",
+      "dev": true
+    },
+    "mcl-wasm": {
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/mcl-wasm/-/mcl-wasm-0.7.9.tgz",
+      "integrity": "sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ==",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "memdown": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/memdown/-/memdown-5.1.0.tgz",
+      "integrity": "sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==",
+      "dev": true,
+      "requires": {
+        "abstract-leveldown": "~6.2.1",
+        "functional-red-black-tree": "~1.0.1",
+        "immediate": "~3.2.3",
+        "inherits": "~2.0.1",
+        "ltgt": "~2.2.0",
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "abstract-leveldown": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+          "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+          "dev": true,
+          "requires": {
+            "buffer": "^5.5.0",
+            "immediate": "^3.2.3",
+            "level-concat-iterator": "~2.0.0",
+            "level-supports": "~1.0.0",
+            "xtend": "~4.0.0"
+          }
+        },
+        "immediate": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
+          "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=",
+          "dev": true
+        }
+      }
+    },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true
+    },
+    "merkle-patricia-tree": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.4.tgz",
+      "integrity": "sha512-eHbf/BG6eGNsqqfbLED9rIqbsF4+sykEaBn6OLNs71tjclbMcMOk1tEPmJKcNcNCLkvbpY/lwyOlizWsqPNo8w==",
+      "dev": true,
+      "requires": {
+        "@types/levelup": "^4.3.0",
+        "ethereumjs-util": "^7.1.4",
+        "level-mem": "^5.0.1",
+        "level-ws": "^2.0.0",
+        "readable-stream": "^3.6.0",
+        "semaphore-async-await": "^1.5.1"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mnemonist": {
+      "version": "0.38.5",
+      "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz",
+      "integrity": "sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==",
+      "dev": true,
+      "requires": {
+        "obliterator": "^2.0.0"
+      }
+    },
+    "mocha": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
+      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.3.0",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "3.0.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.5",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.6",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+          "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "argparse": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "dev": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "chokidar": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+          "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.2.0"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+          "dev": true
+        },
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "flat": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
+          "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "~2.0.3"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "dev": true,
+          "optional": true
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "log-symbols": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+          "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.0.4"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        },
+        "yargs-unparser": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+          "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+          "dev": true,
+          "requires": {
+            "flat": "^4.1.0",
+            "lodash": "^4.17.15",
+            "yargs": "^13.3.0"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nanoid": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "dev": true
+    },
+    "neverthrow": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/neverthrow/-/neverthrow-4.3.1.tgz",
+      "integrity": "sha512-+vxjSaiDWjAj6kR6KKW0YDuV6O4UCNWGAO8m8ITjFKPWcTmU1GVnL+J5TAUTKpPnUAHCKDxXpOHVaERid223Ww=="
+    },
+    "node-addon-api": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+      "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
+      "dev": true
+    },
+    "node-environment-flags": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "node-gyp-build": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz",
+      "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==",
+      "dev": true
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
+      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
+    "obliterator": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.2.tgz",
+      "integrity": "sha512-g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "rlp": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz",
+      "integrity": "sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.2.0"
+      }
+    },
+    "rustbn.js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
+      "integrity": "sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "scrypt-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+      "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
+      "dev": true
+    },
+    "secp256k1": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz",
+      "integrity": "sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==",
+      "dev": true,
+      "requires": {
+        "elliptic": "^6.5.4",
+        "node-addon-api": "^2.0.0",
+        "node-gyp-build": "^4.2.0"
+      }
+    },
+    "semaphore-async-await": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
+      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo=",
+      "dev": true
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "solc": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.3.tgz",
+      "integrity": "sha512-GAsWNAjGzIDg7VxzP6mPjdurby3IkGCjQcM8GFYZT6RyaoUZKmMU6Y7YwG+tFGhv7dwZ8rmR4iwFDrrD99JwqA==",
+      "dev": true,
+      "requires": {
+        "command-exists": "^1.2.8",
+        "commander": "3.0.2",
+        "follow-redirects": "^1.12.1",
+        "fs-extra": "^0.30.0",
+        "js-sha3": "0.8.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
+        "semver": "^5.5.0",
+        "tmp": "0.0.33"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "stacktrace-parser": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.7.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
+          "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
+          "dev": true
+        }
+      }
+    },
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-hex-prefix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
+      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
+      "dev": true,
+      "requires": {
+        "is-hex-prefixed": "1.0.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true
+    },
+    "true-case-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz",
+      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "tsort": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz",
+      "integrity": "sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=",
+      "dev": true
+    },
+    "tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true
+    },
+    "tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true
+    },
+    "typescript": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "undici": {
+      "version": "4.16.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
+      "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==",
+      "dev": true
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "workerpool": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "ws": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "dev": true,
+      "requires": {}
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "requires": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true
+    },
+    "yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      }
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    }
+  }
+}
diff --git a/vendors/move/crates/evm/hardhat-move/package.json b/vendors/move/crates/evm/hardhat-move/package.json
new file mode 100644
index 000000000..08709bdce
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "hardhat-move",
+  "version": "0.0.1",
+  "description": "",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "hardhat": "^2.9.3",
+    "mocha": "^7.1.2"
+  },
+  "scripts": {
+    "lint:fix": "prettier --write 'src/**/*.{js,ts}' 'test/**/*.{js,ts}' && tslint --fix --config tslint.json --project tsconfig.json",
+    "lint": "tslint --config tslint.json --project tsconfig.json",
+    "test": "mocha --exit --recursive 'test/**/*.test.ts'",
+    "build": "tsc",
+    "watch": "tsc -w",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@types/mocha": "^9.1.0",
+    "typescript": "^4.6.3",
+    "neverthrow": "^4.3.1"
+  },
+  "peerDependencies": {
+    "hardhat": "^2.0.0"
+  }
+}
diff --git a/vendors/move/crates/evm/hardhat-move/src/index.ts b/vendors/move/crates/evm/hardhat-move/src/index.ts
new file mode 100644
index 000000000..1784b0301
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/src/index.ts
@@ -0,0 +1,392 @@
+import { subtask, types } from "hardhat/config";
+import type { Artifact } from "hardhat/types/artifacts";
+import { Artifacts as ArtifactsImpl } from "hardhat/internal/artifacts";
+import { TASK_COMPILE_GET_COMPILATION_TASKS } from "hardhat/builtin-tasks/task-names";
+import { Result, ok, err } from "neverthrow";
+import * as Fs from "fs";
+import * as Path from "path";
+import * as ChildProcess from "child_process";
+
+/***************************************************************************************
+ *
+ * Wrappers for Result-based Error Handling
+ *
+ *   Functions in the js standard lib uses execeptions for error handling, of which the
+ *   the correctness is hard to reason about. Here are a few wrappers that transform
+ *   them into Result-based APIs for easy error handling and chaining.
+ *
+ **************************************************************************************/
+class ChainedError extends Error {
+    causes: Error[];
+
+    constructor(message: string, cause?: Error | Error[]) {
+        super(message);
+
+        if (cause === undefined) {
+            this.causes = [];
+        }
+        else if (Array.isArray(cause)) {
+            this.causes = cause;
+        }
+        else {
+            this.causes = [cause];
+        }
+    }
+}
+
+async function resultifyAsync<T>(f: () => Promise<T>): Promise<Result<T, Error>> {
+    try {
+        return ok(await f());
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            return err(e);
+        }
+        else {
+            throw new Error(`${e} is not an instance of Error -- this should not happen`);
+        }
+    }
+}
+
+function resultify<T>(f: () => T): Result<T, Error> {
+    try {
+        return ok(f());
+    }
+    catch (e) {
+        if (e instanceof Error) {
+            return err(e);
+        }
+        else {
+            throw new Error(`${e} is not an instance of Error -- this should not happen`);
+        }
+    }
+}
+
+
+async function readTextFile(path: Fs.PathLike): Promise<Result<string, Error>> {
+    return resultifyAsync(() => {
+        return Fs.promises.readFile(path, { encoding: "utf-8" });
+    });
+}
+
+
+async function writeTextFile(path: Fs.PathLike, data: string): Promise<Result<void, Error>> {
+    return resultifyAsync(() => {
+        return Fs.promises.writeFile(path, data);
+    });
+}
+
+async function readDir(path: Fs.PathLike): Promise<Result<Fs.Dirent[], Error>> {
+    return resultifyAsync(() => {
+        return Fs.promises.readdir(path, { withFileTypes: true });
+    });
+}
+
+async function createDirIfNotExists(path: Fs.PathLike): Promise<Result<string | undefined, Error>> {
+    return resultifyAsync(() => {
+        return Fs.promises.mkdir(path, { recursive: true });
+    });
+}
+
+async function executeChildProcess(cmd: string): Promise<[ChildProcess.ExecException | null, string, string]> {
+    return new Promise((resolve, _reject) => {
+        // TODO: preserve coloring
+        let proc = ChildProcess.exec(cmd, (err, stdout, stderr) => {
+            resolve([err, stdout, stderr]);
+        });
+
+        proc.stdin!.end();
+    });
+}
+
+/***************************************************************************************
+ *
+ * Utilities to List Move packages in the Contracts Directory
+ *
+ *
+ **************************************************************************************/
+async function isMovePackage(path: Fs.PathLike): Promise<boolean> {
+    // TODO: Result-based error handling
+    let stats: Fs.Stats = await Fs.promises.stat(path);
+
+    if (stats.isDirectory()) {
+        let manifestPath = Path.join(path.toString(), "Move.toml");
+        let manifestStats: Fs.Stats = await Fs.promises.stat(manifestPath);
+
+        return manifestStats.isFile();
+    }
+
+    return false;
+}
+
+async function listMovePackages(contractsPath: Fs.PathLike): Promise<Array<String>> {
+    // TODO: Result-based error handling
+    let dirs: String[] = await Fs.promises.readdir(contractsPath);
+
+    let promises: Promise<String | null>[] = dirs.map((name, idx_, _arr) => {
+        let path = Path.join(contractsPath.toString(), name.toString());
+        return isMovePackage(path).then(isMove => isMove ? path : null)
+    });
+
+    return (await Promise.all(promises)).filter((path): path is String => path !== null)
+}
+
+/***************************************************************************************
+ *
+ * Build
+ *
+ *   Functions to build Move packages using the `move` executable.
+ *
+ **************************************************************************************/
+async function locateMoveExecutablePath(): Promise<Result<string, Error>> {
+    let [e, stdout, _stderr] = await executeChildProcess("which move");
+
+    if (e !== null) {
+        return err(e);
+    }
+
+    console.assert(stdout !== "");
+    let lines: string[] = stdout.split(/\r?\n/);
+    return ok(lines[0]);
+}
+
+
+class MoveBuildError {
+    exec_err: ChildProcess.ExecException;
+    // TODO: right now, `move build` outputs its build errors to stdout instead of stderr.
+    // This may not be ideal and we may want to fix it and then revisit the error definition here.
+    stdout: string;
+    stderr: string;
+
+    constructor(exec_err: ChildProcess.ExecException, stdout: string, stderr: string) {
+        this.exec_err = exec_err;
+        this.stdout = stdout;
+        this.stderr = stderr;
+    }
+}
+
+async function movePackageBuild(movePath: string, packagePath: string): Promise<Result<void, MoveBuildError>> {
+    let cmd = `${movePath} build --path ${packagePath} --arch ethereum`;
+
+    let [e, stdout, stderr] = await executeChildProcess(cmd);
+
+    if (e !== null) {
+        return err(new MoveBuildError(e, stdout, stderr));
+    }
+
+    return ok(undefined);
+}
+
+/***************************************************************************************
+ *
+ * Artifact Generation
+ *
+ *   Functions to generate hardhat artifacts from the outputs of the Move compiler
+ *   toolchain.
+ *
+ **************************************************************************************/
+async function loadAbi(packagePath: string, contractName: string): Promise<Result<any, ChainedError>> {
+    let abiPath = Path.join(packagePath, "build", "evm", `${contractName}.abi.json`);
+
+    let readFileRes = await readTextFile(abiPath);
+    if (readFileRes.isErr()) {
+        return err(new ChainedError(`Failed to load ABI from ${abiPath}`, readFileRes.error));
+    }
+    let content = readFileRes.value;
+
+    let jsonParseRes = resultify(() => JSON.parse(content));
+    if (jsonParseRes.isErr()) {
+        return err(new ChainedError(`Failed to decode ABI -- invalid JSON: ${content}`, jsonParseRes.error));
+    }
+    return ok(jsonParseRes.value);
+}
+
+async function loadBytecode(packagePath: string, contrantName: string): Promise<Result<string, ChainedError>> {
+    let bytecodePath = Path.join(packagePath, "build", "evm", `${contrantName}.bin`);
+
+    let readFileRes = await readTextFile(bytecodePath);
+    if (readFileRes.isErr()) {
+        return err(new ChainedError(`Failed to load bytecode from ${bytecodePath}`, readFileRes.error));
+    }
+
+    return ok(readFileRes.value);
+}
+
+async function listCompiledContracts(packagePath: string): Promise<Result<string[], ChainedError>> {
+    let path = Path.join(packagePath, "build", "evm");
+
+    let readDirRes = await readDir(path);
+    if (readDirRes.isErr()) {
+        return err(new ChainedError(`Failed to list compiled contracts in ${path}`, readDirRes.error));
+    }
+    let entries = readDirRes.value;
+
+    let info = [];
+    for (let entry of entries) {
+        if (entry.isFile()) {
+            // REVIEW: can this throw?
+            let parsed = Path.parse(entry.name);
+
+            if (parsed.ext == ".bin") {
+                info.push(parsed.name);
+            }
+        }
+    }
+    return ok(info);
+}
+
+async function generateArtifact(hardhatRootPath: string, packagePath: string, contractName: string): Promise<Result<Artifact, ChainedError>> {
+    let [loadbytecodeRes, loadAbiRes] = await Promise.all([loadBytecode(packagePath, contractName), loadAbi(packagePath, contractName)]);
+
+    if (loadbytecodeRes.isErr()) {
+        return err(loadbytecodeRes.error);
+    }
+
+    if (loadAbiRes.isErr()) {
+        return err(loadAbiRes.error);
+    }
+
+    let bytecode = loadbytecodeRes.value;
+    if (!bytecode.startsWith("0x")) {
+        bytecode = "0x" + bytecode;
+    }
+    let abi = loadAbiRes.value;
+
+    let sourcePath = Path.relative(hardhatRootPath, packagePath);
+
+    let artifact: Artifact = {
+        "_format": "hh-move-artifact-1",
+        "contractName": contractName,
+        "sourceName": sourcePath,
+        "abi": abi,
+        "bytecode": bytecode,
+        "deployedBytecode": bytecode,
+        "linkReferences": {},
+        "deployedLinkReferences": {}
+    };
+
+    return ok(artifact);
+}
+
+async function generateArtifactsForPackage(hardhatRootPath: string, packagePath: string): Promise<Result<Artifact[], ChainedError>> {
+    let listRes = await listCompiledContracts(packagePath);
+    if (listRes.isErr()) {
+        return err(new ChainedError(`Failed to list compiled contracts in ${packagePath}`, listRes.error));
+    }
+    let contractNames = listRes.value;
+
+    let genResults = await Promise.all(contractNames.map(contractName => generateArtifact(hardhatRootPath, packagePath, contractName)));
+
+    let errors = [];
+    let artifacts = [];
+    for (let res of genResults) {
+        if (res.isErr()) {
+            errors.push(res.error);
+        }
+        else {
+            artifacts.push(res.value);
+        }
+    }
+
+    if (errors.length > 0) {
+        return err(new ChainedError(`Failed to generate artifacts for ${packagePath}`, errors));
+    }
+
+    return ok(artifacts);
+}
+
+async function buildPackageAndGenerateArtifacts(movePath: string, hardhatRootPath: string, packagePath: string): Promise<Result<Artifact[], MoveBuildError | ChainedError>> {
+    let buildRes = await movePackageBuild(movePath, packagePath);
+    if (buildRes.isErr()) {
+        let e = buildRes.error;
+        console.log(`\nFailed to build ${packagePath}\n${e.stdout}${e.stderr}`);
+        return err(e);
+    }
+
+    let genArtifactsRes = await generateArtifactsForPackage(hardhatRootPath, packagePath);
+    if (genArtifactsRes.isErr()) {
+        let e = genArtifactsRes.error;
+        console.log(`Failed to build ${packagePath}\n${e}`);
+        return err(genArtifactsRes.error);
+    }
+
+    console.log(`Successfully built ${packagePath}`);
+
+    return ok(genArtifactsRes.value);
+}
+
+/***************************************************************************************
+ *
+ * Move Compile Subtask (Entrypoint)
+ *
+ *   This adds a new subtask "compile:move" which is added to the queue when one runs
+ *   `npx hardhat compile`. This task will build all the move contracts using the `move`
+ *   executable and generate the artifacts hardhat requires for testing and deployment.
+ *
+ **************************************************************************************/
+const TASK_COMPILE_MOVE: string = "compile:move";
+
+subtask(
+    TASK_COMPILE_GET_COMPILATION_TASKS,
+    async (_, __, runSuper): Promise<string[]> => {
+        const otherTasks = await runSuper();
+        return [...otherTasks, TASK_COMPILE_MOVE];
+    }
+);
+
+subtask(TASK_COMPILE_MOVE)
+    .addParam("quiet", undefined, undefined, types.boolean)
+    .setAction(async ({ quiet }: { quiet: boolean }, { artifacts, config, run }) => {
+        let packagePaths: String[] = await listMovePackages(Path.join(config.paths.root, "contracts"));
+
+        if (packagePaths.length == 0) {
+            console.log("No Move contracts to compile");
+            return;
+        }
+
+        let plural = packagePaths.length == 1 ? "" : "s";
+        console.log("Building %d Move package%s...", packagePaths.length, plural);
+
+        let locateRes = await locateMoveExecutablePath();
+        if (locateRes.isErr()) {
+            console.log("Failed to locate the `move` executable.");
+            console.log(locateRes.error);
+            return;
+        }
+        let movePath = locateRes.value;
+
+        let buildResults = await Promise.all(packagePaths.map(path => buildPackageAndGenerateArtifacts(movePath, config.paths.root, path.toString())));
+
+        let failedToBuildAll = false;
+        console.assert(packagePaths.length == buildResults.length);
+        for (let idx in packagePaths) {
+
+            let packagePathRel = Path.relative(config.paths.root, packagePaths[idx].toString());
+
+            let res = buildResults[idx];
+
+            if (res.isOk()) {
+                let contractNames = [];
+
+                for (let artifact of res.value) {
+                    contractNames.push(artifact.contractName);
+                    // TODO: error handling
+                    await artifacts.saveArtifactAndDebugFile(artifact);
+                }
+
+                // TODO: write this in a better way
+                const artifactsImpl = artifacts as ArtifactsImpl;
+                artifactsImpl.addValidArtifacts([{ sourceName: packagePathRel, artifacts: contractNames }]);
+            }
+            else {
+                failedToBuildAll = true;
+            }
+        }
+
+        if (failedToBuildAll) {
+            // TODO: terminate gracefully
+            throw new Error("Failed to build one or more Move packages");
+        }
+    })
+
+module.exports = {};
diff --git a/vendors/move/crates/evm/hardhat-move/tsconfig.json b/vendors/move/crates/evm/hardhat-move/tsconfig.json
new file mode 100644
index 000000000..461d4f64f
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "target": "ES2017",
+        "module": "commonjs",
+        "declaration": true,
+        "declarationMap": true,
+        "sourceMap": true,
+        "outDir": "./dist",
+        "strict": true,
+        "rootDirs": [
+            "./src",
+            "./test"
+        ],
+        "esModuleInterop": true
+    },
+    "exclude": [
+        "dist",
+        "node_modules"
+    ],
+    "include": [
+        "./test",
+        "./src"
+    ]
+}
diff --git a/vendors/move/crates/evm/hardhat-move/tslint.json b/vendors/move/crates/evm/hardhat-move/tslint.json
new file mode 100644
index 000000000..ab2929e98
--- /dev/null
+++ b/vendors/move/crates/evm/hardhat-move/tslint.json
@@ -0,0 +1,33 @@
+{
+    "extends": [
+        "tslint:latest",
+        "tslint-plugin-prettier",
+        "tslint-config-prettier"
+    ],
+    "rules": {
+        "prettier": true,
+        "object-literal-sort-keys": false,
+        "no-submodule-imports": false,
+        "interface-name": false,
+        "max-classes-per-file": false,
+        "no-empty": false,
+        "no-console": false,
+        "only-arrow-functions": false,
+        "variable-name": [
+            true,
+            "check-format",
+            "allow-leading-underscore",
+            "allow-pascal-case"
+        ],
+        "ordered-imports": [
+            true,
+            {
+                "grouped-imports": true,
+                "import-sources-order": "case-insensitive"
+            }
+        ],
+        "no-floating-promises": true,
+        "prefer-conditional-expression": false,
+        "no-implicit-dependencies": true
+    }
+}
diff --git a/vendors/move/crates/evm/move-ethereum-abi/Cargo.toml b/vendors/move/crates/evm/move-ethereum-abi/Cargo.toml
new file mode 100644
index 000000000..7b71f7ef0
--- /dev/null
+++ b/vendors/move/crates/evm/move-ethereum-abi/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "move-ethereum-abi"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move Ethereum ABI"
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# external dependencies
+anyhow = "1.0.38"
+ethabi = "17.0.0"
+once_cell = "1.7.2"
+regex = "1.4.3"
+serde = { version = "1.0.124", features = ["derive"] }
+serde_json = "1.0.64"
+
+[lib]
+doctest = false
diff --git a/vendors/move/crates/evm/move-ethereum-abi/src/abi_move_type.rs b/vendors/move/crates/evm/move-ethereum-abi/src/abi_move_type.rs
new file mode 100644
index 000000000..9ac1817cc
--- /dev/null
+++ b/vendors/move/crates/evm/move-ethereum-abi/src/abi_move_type.rs
@@ -0,0 +1,275 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::abi_signature_type::ABIJsonSignature;
+use ethabi::Contract;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+/// Key for metadata
+pub const ABI_ETHER_MOVE_KEY: &str = "abi_ethereum_move";
+
+#[derive(Serialize, Deserialize)]
+pub struct ABIMoveSignature {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub constructor: Option<ABIJsonSignature>,
+    // Move type -> Ethereum event abi
+    pub event_map: BTreeMap<String, ABIJsonSignature>,
+    // Move function -> Ethereum pub function abi
+    pub func_map: BTreeMap<String, ABIJsonSignature>,
+    // Indicate whether a receive function is defined in the contract
+    pub receive: bool,
+    // Indicate whether a fallback function is defined in the contract
+    pub fallback: bool,
+}
+
+impl ABIMoveSignature {
+    fn _convert_to_contract(&self) -> Result<Contract, ethabi::Error> {
+        let contract_str = self._generate_abi_string();
+        Contract::load(contract_str.as_bytes())
+    }
+
+    fn _generate_abi_string(&self) -> String {
+        let mut res = vec![];
+        if let Some(cons) = &self.constructor {
+            res.push(serde_json::to_string_pretty(&cons).unwrap());
+        }
+        for (_, ev_sig) in self.event_map.iter() {
+            res.push(serde_json::to_string_pretty(&ev_sig).unwrap());
+        }
+        for (_, fn_sig) in self.func_map.iter() {
+            res.push(serde_json::to_string_pretty(&fn_sig).unwrap());
+        }
+        if self.receive {
+            res.push("{ \"type\": \"receive\" }\n".to_string());
+        }
+        if self.fallback {
+            res.push("{ \"type\": \"fallback\" }\n".to_string());
+        }
+        format!(
+            "[\n{}\n]",
+            res.iter()
+                .map(|t| t.to_string())
+                .collect::<Vec<_>>()
+                .join(",\n")
+        )
+    }
+}
+
+#[cfg(test)]
+#[allow(deprecated)]
+mod tests {
+    use super::*;
+    use ethabi::{
+        Constructor, Contract, Event, EventParam, Function, Param, ParamType, StateMutability,
+    };
+    use std::iter::FromIterator;
+
+    #[test]
+    fn test_fallback_receive_only() {
+        let json = r#"{
+            "event_map": {},
+            "func_map": {},
+            "receive": true,
+            "fallback": true
+          }"#;
+        let deserialized_json_sig: ABIMoveSignature = serde_json::from_str(json).unwrap();
+        let contract = deserialized_json_sig._convert_to_contract().unwrap();
+        assert_eq!(contract, Contract {
+            constructor: None,
+            functions: BTreeMap::new(),
+            events: BTreeMap::new(),
+            errors: BTreeMap::new(),
+            receive: true,
+            fallback: true,
+        });
+    }
+
+    #[test]
+    fn test_constructor() {
+        let json = r#"{
+            "constructor": {
+              "name": "init",
+              "type": "constructor",
+              "inputs": [
+                {
+                  "type": "uint64",
+                  "name": "value"
+                },
+                {
+                  "type": "uint64",
+                  "name": "value2"
+                }
+              ],
+              "outputs": [],
+              "stateMutability": "nonpayable"
+            },
+            "event_map": {},
+            "func_map": {},
+            "receive": false,
+            "fallback": false
+          }"#;
+        let mut const_inputs = vec![];
+        let param_uint64 = ParamType::Uint(64);
+        let name_1 = "value";
+        let name_2 = "value2";
+        let para1 = Param {
+            name: name_1.to_string(),
+            kind: param_uint64.clone(),
+            internal_type: None,
+        };
+        let para2 = Param {
+            name: name_2.to_string(),
+            kind: param_uint64,
+            internal_type: None,
+        };
+        const_inputs.push(para1);
+        const_inputs.push(para2);
+        let constructor = Constructor {
+            inputs: const_inputs,
+        };
+        let deserialized_json_sig: ABIMoveSignature = serde_json::from_str(json).unwrap();
+        let contract = deserialized_json_sig._convert_to_contract().unwrap();
+        assert_eq!(contract, Contract {
+            constructor: Some(constructor),
+            functions: BTreeMap::new(),
+            events: BTreeMap::new(),
+            errors: BTreeMap::new(),
+            receive: false,
+            fallback: false,
+        });
+    }
+
+    #[test]
+    fn test_events() {
+        let json = r#"{
+            "event_map": {
+                "ev1": {
+					"type": "event",
+					"name": "ev1",
+					"inputs": [
+						{
+							"name":"a",
+							"type":"bytes",
+                            "indexed": true
+						}
+					],
+					"anonymous": false
+				},
+				"ev2": {
+					"type": "event",
+					"name": "ev2",
+					"inputs": [
+						{
+							"name":"b",
+							"type":"address[]"
+						}
+					],
+					"anonymous": false
+				}
+            },
+            "func_map": {},
+            "receive": true,
+            "fallback": false
+          }"#;
+        let deserialized_json_sig: ABIMoveSignature = serde_json::from_str(json).unwrap();
+        let contract = deserialized_json_sig._convert_to_contract().unwrap();
+        assert_eq!(contract, Contract {
+            constructor: None,
+            functions: BTreeMap::new(),
+            events: BTreeMap::from_iter(vec![
+                ("ev1".to_string(), vec![Event {
+                    name: "ev1".to_string(),
+                    inputs: vec![EventParam {
+                        name: "a".to_string(),
+                        kind: ParamType::Bytes,
+                        indexed: true,
+                    }],
+                    anonymous: false,
+                }]),
+                ("ev2".to_string(), vec![Event {
+                    name: "ev2".to_string(),
+                    inputs: vec![EventParam {
+                        name: "b".to_string(),
+                        kind: ParamType::Array(Box::new(ParamType::Address)),
+                        indexed: false
+                    }],
+                    anonymous: false,
+                }]),
+            ]),
+            errors: BTreeMap::new(),
+            receive: true,
+            fallback: false,
+        });
+    }
+
+    #[test]
+    fn test_functions() {
+        let json = r#"{
+            "event_map": {},
+            "func_map": {
+                "fn1": {
+                "type": "function",
+                "name": "fn1",
+                "inputs": [
+                    {
+                        "name":"arg1",
+                        "type":"address[5]"
+                    }
+                ],
+                "outputs": [
+                    {
+                        "name": "ret1",
+                        "type":"address"
+                    }
+                ],
+                "stateMutability": "nonpayable"
+                },
+                "fn2": {
+                    "type": "function",
+                    "name": "fn2",
+                    "inputs": [],
+                    "outputs": [],
+                    "stateMutability": "pure"
+                }
+            },
+            "receive": true,
+            "fallback": false
+          }"#;
+
+        let deserialized_json_sig: ABIMoveSignature = serde_json::from_str(json).unwrap();
+        let contract = deserialized_json_sig._convert_to_contract().unwrap();
+        assert_eq!(contract, Contract {
+            constructor: None,
+            functions: BTreeMap::from_iter(vec![
+                ("fn1".to_string(), vec![Function {
+                    name: "fn1".to_string(),
+                    inputs: vec![Param {
+                        name: "arg1".to_string(),
+                        kind: ParamType::FixedArray(Box::new(ParamType::Address), 5),
+                        internal_type: None,
+                    }],
+                    outputs: vec![Param {
+                        name: "ret1".to_string(),
+                        kind: ParamType::Address,
+                        internal_type: None,
+                    }],
+                    constant: None,
+                    state_mutability: Default::default(),
+                }]),
+                ("fn2".to_string(), vec![Function {
+                    name: "fn2".to_string(),
+                    inputs: vec![],
+                    outputs: vec![],
+                    constant: None,
+                    state_mutability: StateMutability::Pure,
+                }]),
+            ]),
+            events: BTreeMap::new(),
+            errors: BTreeMap::new(),
+            receive: true,
+            fallback: false,
+        });
+    }
+}
diff --git a/vendors/move/crates/evm/move-ethereum-abi/src/abi_signature_type.rs b/vendors/move/crates/evm/move-ethereum-abi/src/abi_signature_type.rs
new file mode 100644
index 000000000..93d53103d
--- /dev/null
+++ b/vendors/move/crates/evm/move-ethereum-abi/src/abi_signature_type.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This file defines JSON-ABI types.
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct ABIJsonArg {
+    #[serde(rename = "type")]
+    pub ty: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub indexed: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub components: Option<Vec<ABIJsonArg>>,
+    pub name: String,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct ABIJsonSignature {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub ty: String,
+    pub inputs: Vec<ABIJsonArg>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub outputs: Option<Vec<ABIJsonArg>>,
+    #[serde(rename = "stateMutability", skip_serializing_if = "Option::is_none")]
+    pub state_mutability: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub anonymous: Option<bool>,
+}
diff --git a/vendors/move/crates/evm/move-ethereum-abi/src/lib.rs b/vendors/move/crates/evm/move-ethereum-abi/src/lib.rs
new file mode 100644
index 000000000..8b72323a7
--- /dev/null
+++ b/vendors/move/crates/evm/move-ethereum-abi/src/lib.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod abi_move_type;
+pub mod abi_signature_type;
diff --git a/vendors/move/crates/evm/move-to-yul/Cargo.toml b/vendors/move/crates/evm/move-to-yul/Cargo.toml
new file mode 100644
index 000000000..83ccd966a
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/Cargo.toml
@@ -0,0 +1,61 @@
+[package]
+name = "move-to-yul"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move Solidity Generator"
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+move-binary-format = { path = "../../move-binary-format" }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-ethereum-abi = { path = "../move-ethereum-abi" }
+move-ir-types = { path = "../../move-ir/types" }
+move-model = { path = "../../move-model" }
+# move dependencies
+move-prover-boogie-backend = { path = "../../boogie-backend" }
+move-stackless-bytecode = { path = "../../move-stackless-bytecode" }
+
+# external dependencies
+anyhow = "1.0.38"
+atty = "0.2.14"
+clap = { version = "3", features = ["derive", "env"] }
+codespan = "0.11.1"
+codespan-reporting = "0.11.1"
+ethnum = "1.0.4"
+evm = "0.33.1"
+hex = "0.4.3"
+itertools = "0.10.0"
+log = { version = "0.4.14", features = ["serde"] }
+maplit = "1.0.2"
+num = "0.4.0"
+once_cell = "1.7.2"
+pretty = "0.10.0"
+primitive-types = "0.10.1"
+rand = "0.8.3"
+regex = "1.4.3"
+serde = { version = "1.0.124", features = ["derive"] }
+serde_json = "1.0.64"
+sha3 = "0.9.1"
+simplelog = "0.9.0"
+toml = "0.5.8"
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+evm = "0.33.1"
+evm-exec-utils = { path = "../exec-utils" }
+move-prover-test-utils = { path = "../../move-prover-test-utils" }
+move-stdlib = { path = "../../move-stdlib" }
+primitive-types = "0.10.1"
+tempfile = "3.2.0"
+walkdir = "2.3.1"
+
+[lib]
+doctest = false
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/evm/move-to-yul/src/abi_move_metadata.rs b/vendors/move/crates/evm/move-to-yul/src/abi_move_metadata.rs
new file mode 100644
index 000000000..154cf56eb
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/abi_move_metadata.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abi_signature::{from_event_sig, from_solidity_sig},
+    context::Context,
+};
+use itertools::Itertools;
+use move_core_types::metadata::Metadata;
+use move_ethereum_abi::abi_move_type::{ABIMoveSignature, ABI_ETHER_MOVE_KEY};
+use std::{collections::BTreeMap, str};
+
+/// Generate Metadata for move signature
+
+pub(crate) fn generate_abi_move_metadata(ctx: &Context, receive: bool, fallback: bool) -> Metadata {
+    let mut event_map = BTreeMap::new();
+    let event_sigs_keys = ctx
+        .event_signature_map
+        .borrow()
+        .keys()
+        .cloned()
+        .collect_vec();
+    for key in &event_sigs_keys {
+        let st_env = ctx.env.get_struct(key.to_qualified_id());
+        event_map.insert(
+            st_env.get_identifier().unwrap().to_string(),
+            from_event_sig(ctx.event_signature_map.borrow().get(key).unwrap()),
+        );
+    }
+
+    // Callable functions
+    let mut func_map = BTreeMap::new();
+    for (key, (solidity_sig, attr)) in ctx.callable_function_map.borrow().iter() {
+        let fun = ctx.env.get_function(key.to_qualified_id());
+        let abi_sig = from_solidity_sig(solidity_sig, Some(*attr), "function");
+        func_map.insert(fun.get_identifier().to_string(), abi_sig);
+    }
+
+    let mut constructor = None;
+    let constructor_triple_opt = ctx.constructor_triple.borrow().clone();
+    if let Some((_, solidity_sig, attr)) = constructor_triple_opt {
+        let abi_sig = from_solidity_sig(&solidity_sig, Some(attr), "constructor");
+        constructor = Some(abi_sig);
+    }
+
+    let abi_move = ABIMoveSignature {
+        constructor,
+        event_map,
+        func_map,
+        receive,
+        fallback,
+    };
+
+    let value_blob = serde_json::to_string_pretty(&abi_move)
+        .unwrap()
+        .as_bytes()
+        .to_vec();
+    Metadata {
+        key: ABI_ETHER_MOVE_KEY.as_bytes().to_vec(),
+        value: value_blob,
+    }
+}
+
+/// Parse Metata into ABIMoveSignature
+pub fn parse_metadata_to_move_sig(metadata: &Metadata) -> Option<ABIMoveSignature> {
+    let key = &metadata.key;
+    let value = &metadata.value;
+    let key_str = str::from_utf8(key).unwrap();
+    if key_str == ABI_ETHER_MOVE_KEY {
+        return Some(serde_json::from_str(str::from_utf8(value).unwrap()).unwrap());
+    }
+    None
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/abi_native_functions.rs b/vendors/move/crates/evm/move-to-yul/src/abi_native_functions.rs
new file mode 100644
index 000000000..ee93af82d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/abi_native_functions.rs
@@ -0,0 +1,373 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    context::Context,
+    functions::FunctionGenerator,
+    native_functions::NativeFunctions,
+    solidity_ty::{SignatureDataLocation, SoliditySignature, SolidityType},
+    yul_functions::{substitute_placeholders, YulFunction},
+};
+use itertools::Itertools;
+use move_model::{
+    emit, emitln,
+    model::{FunId, FunctionEnv, Parameter, QualifiedInstId},
+};
+use move_stackless_bytecode::function_target_pipeline::FunctionVariant;
+
+impl NativeFunctions {
+    /// Generate decode functions
+    pub(crate) fn define_decode_fun(
+        &self,
+        gen: &mut FunctionGenerator,
+        ctx: &Context,
+        fun_id: &QualifiedInstId<FunId>,
+        solidity_sig_str_opt: Option<String>,
+    ) {
+        let fun = ctx.env.get_function(fun_id.to_qualified_id());
+        let mut sig = SoliditySignature::create_default_sig_for_decode_fun(ctx, &fun);
+        if let Some(solidity_sig_str) = solidity_sig_str_opt {
+            let parsed_sig_opt = SoliditySignature::parse_into_solidity_signature(
+                ctx,
+                &solidity_sig_str,
+                &fun,
+                &None,
+            );
+            if let Ok(parsed_sig) = parsed_sig_opt {
+                sig = parsed_sig;
+            } else if let Err(msg) = parsed_sig_opt {
+                ctx.env.error(&fun.get_loc(), &format!("{}", msg));
+                return;
+            }
+        }
+        // Check compatibility
+        if !sig.check_sig_compatibility_for_decode_fun(ctx, &fun) {
+            return;
+        }
+        // Emit function header
+        let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+        let param = (0..target.get_parameter_count())
+            .map(|idx| ctx.make_local_name(target, idx))
+            .collect_vec();
+        assert!(param.len() == 1); // the decode function only has one argument
+        let results = if target.get_return_count() == 0 {
+            "".to_string()
+        } else {
+            (0..target.get_return_count())
+                .map(|i| ctx.make_result_name(target, i))
+                .join(", ")
+        };
+        let ret_results = if results.is_empty() {
+            "".to_string()
+        } else {
+            format!(" -> {} ", results)
+        };
+        emit!(
+            ctx.writer,
+            "function {}({}){} ",
+            ctx.make_function_name(fun_id),
+            param[0],
+            ret_results
+        );
+        // Generate the function body
+        ctx.emit_block(|| {
+            let mut local_name_idx = target.get_parameter_count(); // local variable
+            let pos_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(ctx.writer, "let {} := add({}, 32)", pos_var, param[0]);
+            let size_fun = gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::MemoryLoadU64,
+                std::iter::once(param[0].clone()),
+            );
+            let size_var = ctx.make_local_name(target, local_name_idx);
+            emitln!(ctx.writer, "let {} := {}", size_var, size_fun);
+            local_name_idx += 1;
+            let offset_var = ctx.make_local_name(target, local_name_idx);
+            emitln!(
+                ctx.writer,
+                "let {} := add({}, {})",
+                offset_var,
+                pos_var,
+                size_var
+            );
+
+            let fun_ret_types = fun.get_return_types();
+            let abi_decode_from_memory =
+                gen.parent
+                    .generate_abi_tuple_decoding_ret(ctx, &sig, fun_ret_types.clone(), true);
+
+            emitln!(
+                ctx.writer,
+                "if gt({}, 0xffffffffffffffff) {{ {} }}",
+                pos_var,
+                gen.parent
+                    .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+            );
+            emitln!(
+                ctx.writer,
+                "if gt({}, 0xffffffffffffffff) {{ {} }}",
+                offset_var,
+                gen.parent
+                    .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+            );
+
+            if !fun_ret_types.is_empty() {
+                emit!(ctx.writer, "{} := ", results);
+            }
+            emitln!(
+                ctx.writer,
+                "{}({}, {})",
+                abi_decode_from_memory,
+                pos_var,
+                offset_var
+            );
+        });
+    }
+
+    /// Generate encode functions
+    pub(crate) fn define_encode_fun(
+        &self,
+        gen: &mut FunctionGenerator,
+        ctx: &Context,
+        fun_id: &QualifiedInstId<FunId>,
+        solidity_sig_str_opt: Option<String>,
+        packed_flag: bool,
+    ) {
+        let fun = ctx.env.get_function(fun_id.to_qualified_id());
+        let mut sig = SoliditySignature::create_default_sig_for_encode_fun(ctx, &fun);
+        if let Some(solidity_sig_str) = solidity_sig_str_opt {
+            let parsed_sig_opt = SoliditySignature::parse_into_solidity_signature(
+                ctx,
+                &solidity_sig_str,
+                &fun,
+                &None,
+            );
+            if let Ok(parsed_sig) = parsed_sig_opt {
+                sig = parsed_sig;
+            } else if let Err(msg) = parsed_sig_opt {
+                ctx.env.error(&fun.get_loc(), &format!("{}", msg));
+                return;
+            }
+        }
+        // Check compatibility
+        if !sig.check_sig_compatibility_for_encode_fun(ctx, &fun) {
+            return;
+        }
+        // Emit function header
+        let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+        let params = (0..target.get_parameter_count())
+            .map(|idx| ctx.make_local_name(target, idx))
+            .join(",");
+        let results = (0..target.get_return_count())
+            .map(|i| ctx.make_result_name(target, i))
+            .collect_vec();
+        assert!(results.len() == 1); // the encode function only has one return value
+        let ret_results = format!(" -> {} ", results[0]);
+        emit!(
+            ctx.writer,
+            "function {}({}){} ",
+            ctx.make_function_name(fun_id),
+            params,
+            ret_results
+        );
+        // Generate the function body
+        ctx.emit_block(|| {
+            emitln!(
+                ctx.writer,
+                "{} := mload({})",
+                results[0],
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+            );
+            let mut local_name_idx = target.get_parameter_count();
+            let encode_start_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(
+                ctx.writer,
+                "let {} := add({}, 32)",
+                encode_start_var,
+                results[0]
+            );
+            emitln!(
+                ctx.writer,
+                "if gt({}, 0xffffffffffffffff) {{ {} }}",
+                encode_start_var,
+                gen.parent
+                    .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+            );
+
+            let encode_end_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+
+            let fun_para_types = fun.get_parameter_types();
+            let abi_encode =
+                gen.parent
+                    .generate_abi_tuple_encoding_para(ctx, &sig, fun_para_types, packed_flag);
+            emit!(ctx.writer, "let {} := ", encode_end_var);
+            let args = if params.is_empty() {
+                "".to_string()
+            } else {
+                format!(",{}", params)
+            };
+            emitln!(ctx.writer, "{}({}{})", abi_encode, encode_start_var, args);
+            emitln!(
+                ctx.writer,
+                "if gt({}, 0xffffffffffffffff) {{ {} }}",
+                encode_end_var,
+                gen.parent
+                    .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+            );
+            let encode_size_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(
+                ctx.writer,
+                "let {} := sub({}, {})",
+                encode_size_var,
+                encode_end_var,
+                encode_start_var
+            );
+            // store the current length of vector
+            gen.parent.call_builtin(
+                ctx,
+                YulFunction::MemoryStoreU64,
+                vec![results[0].clone(), encode_size_var.clone()].into_iter(),
+            );
+
+            // store the capacity of vector
+            let encode_capacity_var = ctx.make_local_name(target, local_name_idx);
+            let capacity_call = gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::ClosestGreaterPowerOfTwo,
+                std::iter::once(encode_size_var),
+            );
+            emitln!(
+                ctx.writer,
+                "let {} := {}",
+                encode_capacity_var,
+                capacity_call
+            );
+            gen.parent.call_builtin(
+                ctx,
+                YulFunction::MemoryStoreU64,
+                vec![format!("add({}, 8)", results[0]), encode_capacity_var].into_iter(),
+            );
+            emitln!(
+                ctx.writer,
+                "mstore({}, {})",
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                encode_end_var
+            );
+        });
+    }
+}
+
+impl SoliditySignature {
+    pub(crate) fn create_default_sig_for_decode_fun(ctx: &Context, fun: &FunctionEnv<'_>) -> Self {
+        let fun_name = fun.symbol_pool().string(fun.get_name()).to_string();
+        let mut para_type_lst = vec![];
+        for Parameter(para_name, move_ty) in fun.get_parameters() {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, true);
+            para_type_lst.push((
+                solidity_ty,
+                fun.symbol_pool().string(para_name).to_string(),
+                SignatureDataLocation::Memory,
+            ));
+        }
+        let mut ret_type_lst = vec![];
+
+        for move_ty in fun.get_return_types() {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false);
+            ret_type_lst.push((solidity_ty, SignatureDataLocation::Memory));
+        }
+
+        SoliditySignature {
+            sig_name: fun_name,
+            para_types: para_type_lst,
+            ret_types: ret_type_lst,
+        }
+    }
+
+    pub(crate) fn create_default_sig_for_encode_fun(ctx: &Context, fun: &FunctionEnv<'_>) -> Self {
+        let fun_name = fun.symbol_pool().string(fun.get_name()).to_string();
+        let mut para_type_lst = vec![];
+        for Parameter(para_name, move_ty) in fun.get_parameters() {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false);
+            para_type_lst.push((
+                solidity_ty,
+                fun.symbol_pool().string(para_name).to_string(),
+                SignatureDataLocation::Memory,
+            ));
+        }
+        let mut ret_type_lst = vec![];
+
+        for move_ty in fun.get_return_types() {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, true);
+            ret_type_lst.push((solidity_ty, SignatureDataLocation::Memory));
+        }
+
+        SoliditySignature {
+            sig_name: fun_name,
+            para_types: para_type_lst,
+            ret_types: ret_type_lst,
+        }
+    }
+
+    /// Check whether the user defined solidity signature is compatible with the Move signature
+    pub(crate) fn check_sig_compatibility_for_decode_fun(
+        &self,
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+    ) -> bool {
+        if !self.check_sig_compatibility(ctx, fun, &None) {
+            ctx.env.error(
+                &fun.get_loc(),
+                "solidity signature is not compatible with the move signature",
+            );
+            return false;
+        }
+        let sig_para_vec = self
+            .para_types
+            .iter()
+            .map(|(ty, _, _)| ty)
+            .collect::<Vec<_>>();
+        if sig_para_vec.len() == 1 {
+            if let SolidityType::Bytes = sig_para_vec[0] {
+                // the only argument must be of type bytes (vector<u8>)
+                return true;
+            }
+        }
+        ctx.env.error(
+            &fun.get_loc(),
+            "decode function must only has one argument of type bytes",
+        );
+        false
+    }
+
+    /// Check whether the user defined solidity signature is compatible with the Move signature
+    pub(crate) fn check_sig_compatibility_for_encode_fun(
+        &self,
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+    ) -> bool {
+        if !self.check_sig_compatibility(ctx, fun, &None) {
+            ctx.env.error(
+                &fun.get_loc(),
+                "solidity signature is not compatible with the move signature",
+            );
+            return false;
+        }
+        let sig_ret_vec = self.ret_types.iter().map(|(ty, _)| ty).collect::<Vec<_>>();
+        if sig_ret_vec.len() == 1 {
+            if let SolidityType::Bytes = sig_ret_vec[0] {
+                // the only return value must be of type bytes (vector<u8>)
+                return true;
+            }
+        }
+        ctx.env.error(
+            &fun.get_loc(),
+            "encode function must only has one return value of type bytes",
+        );
+        false
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/abi_signature.rs b/vendors/move/crates/evm/move-to-yul/src/abi_signature.rs
new file mode 100644
index 000000000..dd544c59d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/abi_signature.rs
@@ -0,0 +1,132 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This file defines functions for generating JSON-ABI.
+
+use crate::{
+    attributes::FunctionAttribute,
+    events::EventSignature,
+    solidity_ty::{SoliditySignature, SolidityType},
+};
+use move_ethereum_abi::abi_signature_type::{ABIJsonArg, ABIJsonSignature};
+
+pub(crate) fn from_ty(ty: &SolidityType, name: String) -> ABIJsonArg {
+    use SolidityType::*;
+    let mut abi_ty_str = ty.to_string();
+    let mut components = None;
+    if let Struct(_, ty_tuples) = ty {
+        let mut comps = vec![];
+        abi_ty_str = "tuple".to_string();
+        for (_, _, _, para_name, comp_ty) in ty_tuples {
+            let t = from_ty(comp_ty, para_name.clone());
+            comps.push(t);
+        }
+        components = Some(comps);
+    } else if matches!(ty, DynamicArray(_)) || matches!(ty, StaticArray(_, _)) {
+        let mut array_vec = vec![];
+        let base_ty = find_inner_ty_from_array(ty, &mut array_vec);
+        if let Struct(_, ty_tuples) = base_ty {
+            let mut comps = vec![];
+            abi_ty_str = "tuple".to_string();
+            for dimension in array_vec.into_iter().rev() {
+                let dim = if dimension > 0 {
+                    dimension.to_string()
+                } else {
+                    "".to_string()
+                };
+                abi_ty_str = format!("{}[{}]", abi_ty_str, dim);
+            }
+            for (_, _, _, para_name, comp_ty) in ty_tuples {
+                let t = from_ty(&comp_ty, para_name.clone());
+                comps.push(t);
+            }
+            components = Some(comps);
+        }
+    }
+    ABIJsonArg {
+        ty: abi_ty_str,
+        indexed: None,
+        components,
+        name,
+    }
+}
+
+pub(crate) fn from_event_ty(ty: &SolidityType, indexed: bool, name: String) -> ABIJsonArg {
+    let abi = from_ty(ty, name);
+    ABIJsonArg {
+        ty: abi.ty,
+        indexed: Some(indexed),
+        components: abi.components,
+        name: abi.name,
+    }
+}
+
+fn find_inner_ty_from_array(ty: &SolidityType, para: &mut Vec<usize>) -> SolidityType {
+    use SolidityType::*;
+    let mut ret_ty = ty.clone();
+    if let DynamicArray(inner_ty) = ty {
+        ret_ty = *inner_ty.clone();
+        para.push(0);
+    } else if let StaticArray(inner_ty, m) = ty {
+        ret_ty = *inner_ty.clone();
+        para.push(*m);
+    }
+    if ret_ty.is_array() {
+        find_inner_ty_from_array(&ret_ty, para)
+    } else {
+        ret_ty
+    }
+}
+
+pub(crate) fn from_solidity_sig(
+    sig: &SoliditySignature,
+    attr: Option<FunctionAttribute>,
+    fun_typ: &str,
+) -> ABIJsonSignature {
+    let name = sig.sig_name.clone();
+    let mut inputs = vec![];
+    let mut outputs = vec![];
+    for (ty, para_name, _) in &sig.para_types {
+        inputs.push(from_ty(ty, para_name.clone()));
+    }
+    for (ty, _) in &sig.ret_types {
+        outputs.push(from_ty(ty, "".to_string()));
+    }
+    let state_mutability = (if let Some(FunctionAttribute::View) = attr {
+        "view"
+    } else if let Some(FunctionAttribute::Pure) = attr {
+        "pure"
+    } else if let Some(FunctionAttribute::Payable) = attr {
+        "payable"
+    } else {
+        "nonpayable"
+    })
+    .to_string();
+    let anonymous = None;
+    ABIJsonSignature {
+        name,
+        ty: fun_typ.to_string(),
+        inputs,
+        outputs: Some(outputs),
+        state_mutability: Some(state_mutability),
+        anonymous,
+    }
+}
+
+pub(crate) fn from_event_sig(sig: &EventSignature) -> ABIJsonSignature {
+    let name = sig.event_name.clone();
+    let ty = "event".to_string();
+    let mut inputs = vec![];
+    for (_, ty, _, indexed_flag, ev_name) in &sig.para_types {
+        inputs.push(from_event_ty(ty, *indexed_flag, ev_name.clone()));
+    }
+    ABIJsonSignature {
+        name,
+        ty,
+        inputs,
+        outputs: None,
+        state_mutability: None,
+        anonymous: Some(false),
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/attributes.rs b/vendors/move/crates/evm/move-to-yul/src/attributes.rs
new file mode 100644
index 000000000..6bbd3d8b6
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/attributes.rs
@@ -0,0 +1,308 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// ! Module defining attributes used by the generator.
+
+use move_model::{
+    ast::{Attribute, AttributeValue, Value},
+    model::{FunctionEnv, GlobalEnv, ModuleEnv, StructEnv},
+};
+
+const CONTRACT_ATTR: &str = "evm_contract";
+const STORAGE_ATTR: &str = "storage";
+const CREATE_ATTR: &str = "create";
+const CALLABLE_ATTR: &str = "callable";
+const EVM_ARITH_ATTR: &str = "evm_arith";
+const PAYABLE_ATTR: &str = "payable";
+const RECEIVE_ATTR: &str = "receive";
+const RECEIVE_FALLBACK_ATTR: &str = "fallback";
+const EVM_TEST_ATTR: &str = "evm_test";
+const TEST_ATTR: &str = "test";
+const EXTERNAL_ATTR: &str = "external";
+const SIGNATURE: &str = "sig";
+const EVENT_ATTR: &str = "event";
+const VIEW_ATTR: &str = "view";
+const PURE_ATTR: &str = "pure";
+const DECODE_ATTR: &str = "decode";
+const ENCODE_ATTR: &str = "encode";
+const ENCODE_PACKED_ATTR: &str = "encode_packed";
+const ABI_STRUCT_ATTR: &str = "abi_struct";
+
+// For async move contracts
+const ACTOR_ATTR: &str = "actor";
+const STATE_ATTR: &str = "state";
+const INIT_ATTR: &str = "init";
+const MESSAGE_ATTR: &str = "message";
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub(crate) enum FunctionAttribute {
+    Payable,
+    NonPayable,
+    View,
+    Pure,
+}
+
+/// Extract the value from an attribute
+fn extract_attr_value_str(
+    env: &GlobalEnv,
+    attrs: &[Attribute],
+    attr_name: &str,
+    value_name: &str,
+) -> Option<String> {
+    for attr in attrs {
+        if let Attribute::Apply(_, s, args) = attr {
+            if env.symbol_pool().string(*s).as_str() == attr_name {
+                for inner_attr in args {
+                    if let Attribute::Assign(_, symbol, value) = inner_attr {
+                        if env.symbol_pool().string(*symbol).as_str() == value_name {
+                            if let AttributeValue::Value(_, Value::ByteArray(vec_str)) = value {
+                                return Some(
+                                    vec_str.iter().map(|c| *c as char).collect::<String>(),
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Extract the solidity signature from the callable attribute
+pub fn extract_callable_or_create_signature(
+    fun: &FunctionEnv<'_>,
+    callable_flag: bool,
+) -> Option<String> {
+    let attr = if callable_flag {
+        CALLABLE_ATTR
+    } else {
+        CREATE_ATTR
+    };
+    extract_attr_value_str(fun.module_env.env, fun.get_attributes(), attr, SIGNATURE)
+}
+
+/// Extract the solidity signature from the callable attribute
+pub fn extract_external_signature(fun: &FunctionEnv<'_>) -> Option<String> {
+    extract_attr_value_str(
+        fun.module_env.env,
+        fun.get_attributes(),
+        EXTERNAL_ATTR,
+        SIGNATURE,
+    )
+}
+
+/// Extract the event signature from the event attribute
+pub fn extract_event_signature(st: &StructEnv<'_>) -> Option<String> {
+    extract_attr_value_str(
+        st.module_env.env,
+        st.get_attributes(),
+        EVENT_ATTR,
+        SIGNATURE,
+    )
+}
+
+/// Extract the solidity signature from the decode attribute
+pub fn extract_decode_signature(fun: &FunctionEnv<'_>) -> Option<String> {
+    extract_attr_value_str(
+        fun.module_env.env,
+        fun.get_attributes(),
+        DECODE_ATTR,
+        SIGNATURE,
+    )
+}
+
+/// Extract the solidity signature from the encode attribute
+pub fn extract_encode_signature(fun: &FunctionEnv<'_>, packed_flag: bool) -> Option<String> {
+    let attr = if packed_flag {
+        ENCODE_PACKED_ATTR
+    } else {
+        ENCODE_ATTR
+    };
+    extract_attr_value_str(fun.module_env.env, fun.get_attributes(), attr, SIGNATURE)
+}
+
+/// Extract the contract name.
+pub fn extract_contract_name(module: &ModuleEnv<'_>) -> Option<String> {
+    extract_attr_value_str(module.env, module.get_attributes(), CONTRACT_ATTR, "name")
+}
+
+/// Extract the event signature from the event attribute
+pub fn extract_abi_struct_signature(st: &StructEnv<'_>) -> Option<String> {
+    extract_attr_value_str(
+        st.module_env.env,
+        st.get_attributes(),
+        ABI_STRUCT_ATTR,
+        SIGNATURE,
+    )
+}
+
+/// Check whether an attribute is present in an attribute list.
+pub fn has_attr(env: &GlobalEnv, attrs: &[Attribute], name: &str, simple_flag: bool) -> bool {
+    let is_empty = |args: &Vec<Attribute>| {
+        if simple_flag {
+            args.is_empty()
+        } else {
+            true
+        }
+    };
+    attrs.iter().any(|a| matches!(a, Attribute::Apply(_, s, args) if is_empty(args) && env.symbol_pool().string(*s).as_str() == name))
+}
+
+/// Check whether the module has a `#[evm_contract]` attribute.
+pub fn is_evm_contract_module(module: &ModuleEnv) -> bool {
+    has_attr(module.env, module.get_attributes(), CONTRACT_ATTR, false)
+        || has_attr(module.env, module.get_attributes(), ACTOR_ATTR, false)
+}
+
+/// Check whether the module has a `#[evm_arith]` attribute.
+pub fn is_evm_arith_module(module: &ModuleEnv) -> bool {
+    has_attr(module.env, module.get_attributes(), EVM_ARITH_ATTR, true)
+}
+
+/// Check whether the struct has a `#[storage]` attribute.
+pub fn is_storage_struct(str: &StructEnv) -> bool {
+    has_attr(
+        str.module_env.env,
+        str.get_attributes(),
+        STORAGE_ATTR,
+        false,
+    ) || has_attr(str.module_env.env, str.get_attributes(), STATE_ATTR, false)
+}
+
+/// Check whether the struct has a `#[event]` attribute.
+pub fn is_event_struct(str: &StructEnv) -> bool {
+    has_attr(str.module_env.env, str.get_attributes(), EVENT_ATTR, false)
+}
+
+/// Check whether the function has a `#[callable]` attribute.
+pub fn is_callable_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        CALLABLE_ATTR,
+        false,
+    ) || has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        MESSAGE_ATTR,
+        false,
+    )
+}
+
+/// Check whether the function has a `#[create]` or `#[init]` attribute.
+pub fn is_create_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), CREATE_ATTR, false)
+        || has_attr(fun.module_env.env, fun.get_attributes(), INIT_ATTR, false)
+}
+
+/// Check whether the function has a `#[payable]` attribute.
+pub fn is_payable_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), PAYABLE_ATTR, true)
+}
+
+/// Check whether the function has a `#[receive]` attribute.
+pub fn is_receive_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), RECEIVE_ATTR, true)
+}
+
+/// Check whether the function has a `#[fallback]]` attribute.
+pub fn is_fallback_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        RECEIVE_FALLBACK_ATTR,
+        true,
+    )
+}
+
+/// Check whether the function has a `#[evm_test] attribute.
+pub fn is_evm_test_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        EVM_TEST_ATTR,
+        true,
+    )
+}
+
+/// Check whether the function has a `#[test]` attribute.
+pub fn is_test_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), TEST_ATTR, false)
+}
+
+/// Check whether the function has a `#[external]` attribute.
+pub fn is_external_fun(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        EXTERNAL_ATTR,
+        false,
+    )
+}
+
+pub(crate) fn construct_fun_attribute(fun: &FunctionEnv<'_>) -> Option<FunctionAttribute> {
+    let mut res = None;
+
+    for attr in fun.get_attributes() {
+        match attr {
+            Attribute::Apply(_, name, args) if args.is_empty() => {
+                match fun.module_env.env.symbol_pool().string(*name).as_str() {
+                    VIEW_ATTR => {
+                        if res.is_some() {
+                            return None;
+                        }
+                        res = Some(FunctionAttribute::View);
+                    },
+                    PURE_ATTR => {
+                        if res.is_some() {
+                            return None;
+                        }
+                        res = Some(FunctionAttribute::Pure);
+                    },
+                    PAYABLE_ATTR => {
+                        if res.is_some() {
+                            return None;
+                        }
+                        res = Some(FunctionAttribute::Payable);
+                    },
+                    _ => (),
+                }
+            },
+            _ => (),
+        }
+    }
+
+    Some(res.unwrap_or(FunctionAttribute::NonPayable))
+}
+
+/// Check whether the function has a `#[decode]` attribute.
+pub fn is_decode(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), DECODE_ATTR, false)
+}
+
+/// Check whether the function has a `#[encode]` attribute.
+pub fn is_encode(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(fun.module_env.env, fun.get_attributes(), ENCODE_ATTR, false)
+}
+
+/// Check whether the function has a `#[encode_packed]` attribute.
+pub fn is_encode_packed(fun: &FunctionEnv<'_>) -> bool {
+    has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        ENCODE_PACKED_ATTR,
+        false,
+    )
+}
+
+/// Check whether the function has a `#[abi_struct]` attribute.
+pub fn is_abi_struct(st: &StructEnv<'_>) -> bool {
+    has_attr(
+        st.module_env.env,
+        st.get_attributes(),
+        ABI_STRUCT_ATTR,
+        false,
+    )
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/context.rs b/vendors/move/crates/evm/move-to-yul/src/context.rs
new file mode 100644
index 000000000..377604370
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/context.rs
@@ -0,0 +1,894 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    attributes,
+    attributes::{
+        extract_contract_name, is_callable_fun, is_create_fun, is_event_struct,
+        is_evm_contract_module, is_fallback_fun, is_receive_fun, is_storage_struct,
+    },
+    events::EventSignature,
+    evm_transformation::EvmTransformationProcessor,
+    native_functions::NativeFunctions,
+    solidity_ty::{SoliditySignature, SolidityType},
+    yul_functions,
+    yul_functions::YulFunction,
+    Options,
+};
+use anyhow::anyhow;
+use codespan::FileId;
+use itertools::Itertools;
+use move_model::{
+    ast::{ModuleName, TempIndex},
+    code_writer::CodeWriter,
+    emitln,
+    model::{
+        FunId, FunctionEnv, GlobalEnv, ModuleEnv, ModuleId, QualifiedId, QualifiedInstId,
+        StructEnv, StructId,
+    },
+    ty::{PrimitiveType, Type},
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget,
+    function_target_pipeline::{FunctionTargetPipeline, FunctionTargetsHolder, FunctionVariant},
+    livevar_analysis::LiveVarAnalysisProcessor,
+    reaching_def_analysis::ReachingDefProcessor,
+};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet},
+    path::PathBuf,
+};
+
+/// Address at which the EVM modules are stored.
+const EVM_MODULE_ADDRESS: &str = "0x2";
+
+/// Address at which the EVM modules are stored.
+const STD_MODULE_ADDRESS: &str = "0x1";
+
+/// Immutable context passed through the compilation.
+pub(crate) struct Context<'a> {
+    /// The program options.
+    pub options: &'a Options,
+    /// The global environment, containing the Move model.
+    pub env: &'a GlobalEnv,
+    /// The function target data containing the stackless bytecode.
+    pub targets: FunctionTargetsHolder,
+    /// A code writer where we emit Yul code to.
+    pub writer: CodeWriter,
+    /// Cached memory layout info.
+    pub struct_layout: RefCell<BTreeMap<QualifiedInstId<StructId>, StructLayout>>,
+    /// Native function info.
+    pub native_funs: NativeFunctions,
+    /// Mapping of file_id to file number and path.
+    pub(crate) file_id_map: BTreeMap<FileId, (usize, String)>,
+    /// Mapping of event structs to corresponding event signatures
+    pub(crate) event_signature_map: RefCell<BTreeMap<QualifiedInstId<StructId>, EventSignature>>,
+    /// Vector of abi structs
+    pub(crate) abi_structs: RefCell<Vec<QualifiedInstId<StructId>>>,
+    /// Mapping of abi structs to corresponding solidity types
+    pub(crate) abi_struct_signature_map: RefCell<BTreeMap<QualifiedInstId<StructId>, SolidityType>>,
+    /// Mapping of abi structs names to abi structs
+    pub(crate) abi_struct_name_map: RefCell<BTreeMap<String, QualifiedInstId<StructId>>>,
+    /// Solidity signature for callable functions
+    pub(crate) callable_function_map: RefCell<
+        BTreeMap<QualifiedInstId<FunId>, (SoliditySignature, attributes::FunctionAttribute)>,
+    >,
+    /// Solidity signature for the constructor function
+    pub(crate) constructor_triple: RefCell<
+        Option<(
+            QualifiedInstId<FunId>,
+            SoliditySignature,
+            attributes::FunctionAttribute,
+        )>,
+    >,
+    /// A code writer where we emit JSON-ABI.
+    pub abi_writer: CodeWriter,
+}
+
+/// Information about the layout of a struct in linear memory.
+#[derive(Default, Clone)]
+pub(crate) struct StructLayout {
+    /// The size, in bytes, of this struct.
+    pub size: usize,
+    /// Offsets in linear memory and type for each field, indexed by logical offsets, i.e.
+    /// position in the struct definition.
+    pub offsets: BTreeMap<usize, (usize, Type)>,
+    /// Field order (in terms of logical offset), optimized for best memory representation.
+    pub field_order: Vec<usize>,
+    /// The number of leading fields which are pointers to linked data. Those fields always
+    /// appear first in the field_order.
+    pub pointer_count: usize,
+}
+
+/// Describes a contract as identified via attribute analysis of the model.
+pub(crate) struct Contract {
+    /// The name of the contract.
+    pub name: String,
+    /// The module defining the contract.
+    pub module: ModuleId,
+    /// Optional struct representing storage root.
+    pub storage: Option<StructId>,
+    /// Optional constructor function.
+    pub constructor: Option<FunId>,
+    /// Optional receive function.
+    pub receive: Option<FunId>,
+    /// Optional fallback function.
+    pub fallback: Option<FunId>,
+    /// Functions which are callable, receive, or fallback entry.
+    pub callables: Vec<FunId>,
+}
+
+impl<'a> Context<'a> {
+    // --------------------------------------------------------------------------------------------
+    // Creation
+
+    /// Create a new context.
+    pub fn new(options: &'a Options, env: &'a GlobalEnv, for_test: bool) -> Self {
+        let writer = CodeWriter::new(env.unknown_loc());
+        let abi_writer = CodeWriter::new(env.unknown_loc());
+
+        writer.set_emit_hook(yul_functions::substitute_placeholders);
+        let targets = Self::create_bytecode(options, env, for_test);
+        let file_id_map: BTreeMap<FileId, (usize, String)> = targets
+            .get_funs()
+            .map(|f| env.get_function(f).get_loc().file_id())
+            .collect::<BTreeSet<_>>()
+            .into_iter()
+            .map(|id| (id, Self::get_relative_path(env, id)))
+            // Sort this by file path to ensure deterministic output
+            .sorted_by(|(_, p1), (_, p2)| p2.cmp(p1))
+            // Assign position and collect
+            .enumerate()
+            .map(|(pos, (id, path))| (id, (pos + 1, path)))
+            .collect();
+        let mut ctx = Self {
+            options,
+            env,
+            targets,
+            file_id_map,
+            writer,
+            struct_layout: Default::default(),
+            native_funs: NativeFunctions::default(),
+            event_signature_map: Default::default(),
+            abi_structs: Default::default(),
+            abi_struct_signature_map: Default::default(),
+            abi_struct_name_map: Default::default(),
+            callable_function_map: Default::default(),
+            constructor_triple: Default::default(),
+            abi_writer,
+        };
+        ctx.native_funs = NativeFunctions::create(&ctx);
+        ctx.build_abi_struct_vec();
+        ctx.build_abi_struct_name_map();
+        ctx.build_abi_struct_signature_map();
+        ctx.build_event_signature_map();
+        ctx
+    }
+
+    /// Helper to get relative path of a file id.
+    fn get_relative_path(env: &GlobalEnv, file_id: FileId) -> String {
+        let file_path = env.get_file(file_id).to_string_lossy().to_string();
+        let current_dir = std::env::current_dir()
+            .unwrap_or_else(|_| PathBuf::from("."))
+            .to_string_lossy()
+            .to_string()
+            + &std::path::MAIN_SEPARATOR.to_string();
+        if file_path.starts_with(&current_dir) {
+            file_path[current_dir.len()..].to_string()
+        } else {
+            file_path
+        }
+    }
+
+    /// Helper to create the stackless bytecode.
+    fn create_bytecode(
+        options: &Options,
+        env: &GlobalEnv,
+        for_test: bool,
+    ) -> FunctionTargetsHolder {
+        // Populate the targets holder with all needed functions.
+        let mut targets = FunctionTargetsHolder::default();
+        let is_used_fun = |fun: &FunctionEnv| {
+            if for_test {
+                attributes::is_evm_test_fun(fun) || attributes::is_test_fun(fun)
+            } else {
+                attributes::is_callable_fun(fun)
+                    || attributes::is_create_fun(fun)
+                    || attributes::is_receive_fun(fun)
+                    || attributes::is_fallback_fun(fun)
+            }
+        };
+        let external_name =
+            ModuleName::from_str(EVM_MODULE_ADDRESS, env.symbol_pool().make("ExternalResult"));
+        for module in env.get_modules() {
+            if *module.get_name() == external_name {
+                for fun in module.get_functions() {
+                    Self::add_fun(&mut targets, &fun)
+                }
+            }
+            if !module.is_target() {
+                continue;
+            }
+            for fun in module.get_functions() {
+                if is_used_fun(&fun) {
+                    Self::add_fun(&mut targets, &fun)
+                }
+            }
+        }
+        // Run a minimal transformation pipeline. For now, we do some evm pre-processing,
+        // and reaching-def and live-var to clean up some churn created by the conversion from
+        // stack to stackless bytecode.
+        let mut pipeline = FunctionTargetPipeline::default();
+        pipeline.add_processor(EvmTransformationProcessor::new());
+        pipeline.add_processor(ReachingDefProcessor::new());
+        pipeline.add_processor(LiveVarAnalysisProcessor::new());
+        if options.dump_bytecode {
+            pipeline.run_with_dump(env, &mut targets, &options.output, false)
+        } else {
+            pipeline.run(env, &mut targets);
+        }
+
+        targets
+    }
+
+    /// Adds function and all its called functions to the targets.
+    fn add_fun(targets: &mut FunctionTargetsHolder, fun: &FunctionEnv<'_>) {
+        targets.add_target(fun);
+        for qid in fun.get_called_functions() {
+            let called_fun = fun.module_env.env.get_function(qid);
+            if !targets.has_target(&called_fun, &FunctionVariant::Baseline) {
+                Self::add_fun(targets, &called_fun)
+            }
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Contract Analysis
+
+    /// Derive the EVM contracts defined in this context. This contains contracts
+    /// defined both in target (i.e. currently compiled) and dependency modules.
+    ///
+    /// This function will produce errors in the global env if attributes are misused,
+    /// and should only be called once because of this.
+    pub fn derive_contracts(&self) -> Vec<Contract> {
+        self.env
+            .get_modules()
+            .into_iter()
+            .filter_map(|ref m| {
+                if is_evm_contract_module(m) {
+                    Some(self.extract_contract(m))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    /// Extract information about a contract from a module.
+    fn extract_contract(&self, module: &ModuleEnv) -> Contract {
+        // Identity name.
+        let name = if let Some(name) = extract_contract_name(module) {
+            name
+        } else {
+            self.make_contract_name(module)
+        };
+        // Identify storage struct
+        let storage_cands = module
+            .get_structs()
+            .filter(is_storage_struct)
+            .take(2)
+            .collect::<Vec<_>>();
+        let storage = match storage_cands.len() {
+            0 => None,
+            1 => Some(storage_cands[0].get_id()),
+            _ => {
+                self.env.error(
+                    &storage_cands[1].get_loc(),
+                    "only one #[storage] struct allowed per contract module",
+                );
+                None
+            },
+        };
+        // Identify special functions.
+        let constructor = self.identify_function(module, is_create_fun, "#[create]/#[init]");
+        let receive = self.identify_function(module, is_receive_fun, "#[receive]");
+        let fallback = self.identify_function(module, is_fallback_fun, "#[fallback]");
+
+        // Identify callable functions.
+        let callables = module
+            .get_functions()
+            .filter(is_callable_fun)
+            .map(|s| s.get_id())
+            .collect();
+
+        // Check conditions.
+        if storage.is_some() && constructor.is_none() {
+            self.env.error(
+                &module.get_loc(),
+                "contract declares #[storage] struct but misses #[create] function",
+            )
+        }
+
+        Contract {
+            name,
+            module: module.get_id(),
+            storage,
+            constructor,
+            receive,
+            fallback,
+            callables,
+        }
+    }
+
+    fn identify_function(
+        &self,
+        module: &ModuleEnv,
+        pred: impl Fn(&FunctionEnv) -> bool,
+        attr_str: &str,
+    ) -> Option<FunId> {
+        let cands = module
+            .get_functions()
+            .filter(pred)
+            .take(2)
+            .collect::<Vec<_>>();
+        match cands.len() {
+            0 => None,
+            1 => Some(cands[0].get_id()),
+            _ => {
+                self.env.error(
+                    &cands[1].get_loc(),
+                    &format!("only one {} function allowed per contract module", attr_str),
+                );
+                None
+            },
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Queries
+
+    /// Return iterator for all structs in the environment which stem from a target module
+    /// and which satisfy predicate.
+    fn get_target_structs(&self, p: impl Fn(&StructEnv) -> bool) -> Vec<StructEnv<'a>> {
+        self.env
+            .get_modules()
+            .flat_map(|m| m.into_structs().filter(|f| p(f)))
+            .collect()
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Signature Event Map
+
+    /// Build the callable signature map
+    pub fn build_callable_signature_map(
+        &self,
+        sig: &SoliditySignature,
+        attr: attributes::FunctionAttribute,
+        fun: &FunctionEnv,
+    ) {
+        let mut callable_signature_map_ref = self.callable_function_map.borrow_mut();
+        let fun_id = fun.get_qualified_id().instantiate(vec![]);
+        if callable_signature_map_ref.get(&fun_id).is_none() {
+            callable_signature_map_ref.insert(fun_id, (sig.clone(), attr));
+        }
+    }
+
+    /// Build the constructor
+    pub fn build_constructor(
+        &self,
+        sig: &SoliditySignature,
+        attr: attributes::FunctionAttribute,
+        fun: &FunctionEnv,
+    ) {
+        let fun_id = fun.get_qualified_id().instantiate(vec![]);
+        self.constructor_triple
+            .replace(Some((fun_id, sig.clone(), attr)));
+    }
+
+    /// Build the event signature map
+    pub fn build_event_signature_map(&self) {
+        let event_structs_vec = self.get_target_structs(is_event_struct);
+        let mut event_signature_map_ref = self.event_signature_map.borrow_mut();
+        for st_env in event_structs_vec {
+            if !self.check_no_generics_struct(&st_env) {
+                break;
+            }
+            let mut sig = EventSignature::create_default_event_signature(self, &st_env);
+            let ev_sig_str_opt = attributes::extract_event_signature(&st_env);
+            if let Some(ev_sig_str) = ev_sig_str_opt {
+                let parsed_sig_opt =
+                    EventSignature::parse_into_event_signature(self, &ev_sig_str, &st_env);
+                if let Ok(parsed_sig) = parsed_sig_opt {
+                    sig = parsed_sig;
+                } else if let Err(msg) = parsed_sig_opt {
+                    self.env.error(&st_env.get_loc(), &format!("{}", msg));
+                }
+            }
+            let st_id = &st_env.get_qualified_id().instantiate(vec![]);
+            if event_signature_map_ref.get(st_id).is_none() {
+                event_signature_map_ref.insert(st_id.clone(), sig.clone());
+            }
+        }
+    }
+
+    /// Build the vec of abi_structs
+    pub fn build_abi_struct_vec(&self) {
+        let abi_structs_vec = self.get_target_structs(attributes::is_abi_struct);
+        let mut abi_structs_ref = self.abi_structs.borrow_mut();
+        for st_env in abi_structs_vec {
+            abi_structs_ref.push(st_env.get_qualified_id().instantiate(vec![]));
+        }
+
+        // Add structs in the stdlib that can be serialized
+        let p = |st_env: &StructEnv| {
+            let name = st_env.get_full_name_with_address(); // only consider String for now
+            name == format!("{}::ascii::String", STD_MODULE_ADDRESS)
+        };
+        let built_in_structs = self.get_target_structs(p);
+        for st_env in built_in_structs {
+            abi_structs_ref.push(st_env.get_qualified_id().instantiate(vec![]));
+        }
+    }
+
+    /// Build the map from name to abi structs
+    pub fn build_abi_struct_name_map(&self) {
+        let mut abi_struct_name_map_ref = self.abi_struct_name_map.borrow_mut();
+        let abi_struct_ref = self.abi_structs.borrow();
+        for st_id in abi_struct_ref.iter() {
+            let st_env = self.env.get_struct(st_id.to_qualified_id());
+            let abi_sig_str_opt = attributes::extract_abi_struct_signature(&st_env);
+            let struct_name = if let Some(abi_sig_str) = abi_sig_str_opt {
+                let name_right_idx_opt = abi_sig_str.find('(');
+                if let Some(name_right_idx) = name_right_idx_opt {
+                    abi_sig_str[..name_right_idx].to_string()
+                } else {
+                    panic!("unexpected token");
+                }
+            } else {
+                let mut full_name = st_env.get_full_name_with_address();
+                if let Some(i) = full_name.rfind(':') {
+                    full_name = full_name[i + 1..].to_string();
+                }
+                full_name
+            };
+            if abi_struct_name_map_ref.get(&struct_name).is_none() {
+                abi_struct_name_map_ref.insert(struct_name.clone(), st_id.clone());
+            } else {
+                self.env.error(&st_env.get_loc(), "duplicated struct names");
+            }
+        }
+    }
+
+    /// Build the signature map for abi struct
+    pub fn build_abi_struct_signature_map(&self) {
+        let abi_struct_ref = self.abi_structs.borrow();
+        for st_id in abi_struct_ref.iter() {
+            let st_env = self.env.get_struct(st_id.to_qualified_id());
+            if let Err(msg) = self.build_abi_struct(&st_env) {
+                self.env.error(&st_env.get_loc(), &format!("{}", msg));
+            }
+        }
+    }
+
+    /// Construct the struct type
+    pub fn build_abi_struct(&self, st_env: &StructEnv<'_>) -> anyhow::Result<SolidityType> {
+        assert!(self.is_structs_abi(st_env));
+        assert!(self.check_no_generics_struct(st_env));
+        let mut struct_type = SolidityType::generate_default_struct_type(self, st_env);
+        let abi_sig_str_opt = attributes::extract_abi_struct_signature(st_env);
+        if let Some(abi_sig_str) = abi_sig_str_opt {
+            struct_type = SolidityType::parse_struct_type(self, &abi_sig_str, st_env)?;
+        }
+        let st_id = &st_env.get_qualified_id().instantiate(vec![]);
+        let mut abi_struct_signature_map_ref = self.abi_struct_signature_map.borrow_mut();
+        if abi_struct_signature_map_ref.get(st_id).is_none() {
+            abi_struct_signature_map_ref.insert(st_id.clone(), struct_type.clone());
+        }
+        drop(abi_struct_signature_map_ref);
+        Ok(struct_type)
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Checks
+
+    /// Check whether abi structs exist in the signature map; if not, create and add it to the map
+    pub fn check_or_create_struct_abi(&self, name: &str) -> anyhow::Result<SolidityType> {
+        let abi_struct_name_map_ref = self.abi_struct_name_map.borrow();
+        let st_id_opt = abi_struct_name_map_ref.get(name);
+        if let Some(st_id) = st_id_opt {
+            let abi_struct_signature_map_ref = self.abi_struct_signature_map.borrow();
+            let struct_ty_opt = abi_struct_signature_map_ref.get(st_id);
+            if let Some(struct_ty) = struct_ty_opt {
+                return Ok(struct_ty.clone());
+            } else {
+                let struct_env = self.env.get_struct(st_id.to_qualified_id());
+                drop(abi_struct_signature_map_ref);
+                return self.build_abi_struct(&struct_env);
+            }
+        }
+        Err(anyhow!("cannot create struct abi:{}", name))
+    }
+
+    /// Check whether given Move struct has no generics; report error otherwise.
+    pub fn check_no_generics_struct(&self, st: &StructEnv<'_>) -> bool {
+        if !st.get_type_parameters().is_empty() {
+            self.env
+                .error(&st.get_loc(), "#[event] structs cannot be generic");
+            return false;
+        }
+        true
+    }
+
+    /// Check whether given Move function has no generics; report error otherwise.
+    pub fn check_no_generics(&self, fun: &FunctionEnv<'_>) {
+        if fun.get_type_parameter_count() > 0 {
+            self.env.error(
+                &fun.get_loc(),
+                "#[callable] or #[create] functions cannot be generic",
+            )
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Name Generation
+
+    /// Make the name of a contract.
+    pub fn make_contract_name(&self, module: &ModuleEnv) -> String {
+        let mod_name = module.get_name();
+        let mod_sym = module.symbol_pool().string(mod_name.name());
+        format!("A{}_{}", mod_name.addr().to_str_radix(16), mod_sym)
+    }
+
+    /// Make the name of function.
+    pub fn make_function_name(&self, fun_id: &QualifiedInstId<FunId>) -> String {
+        let fun = self.env.get_function(fun_id.to_qualified_id());
+        let fun_sym = fun.symbol_pool().string(fun.get_name());
+        format!(
+            "{}_{}{}",
+            self.make_contract_name(&fun.module_env),
+            fun_sym,
+            self.mangle_types(&fun_id.inst)
+        )
+    }
+
+    /// Mangle a type for being part of name.
+    ///
+    /// Note that the mangled type representation is also used to create a hash for types
+    /// in `Generator::type_hash` which is used to index storage. Therefore the representation here
+    /// cannot be changed without creating versioning problems for existing storage of contracts.
+    pub fn mangle_type(&self, ty: &Type) -> String {
+        use move_model::ty::{PrimitiveType::*, Type::*};
+        match ty {
+            Primitive(p) => match p {
+                U8 => "u8".to_string(),
+                // U16 => "u16".to_string(),
+                // U32 => "u32".to_string(),
+                U64 => "u64".to_string(),
+                U128 => "u128".to_string(),
+                // U256 => "u256".to_string(),
+                Num => "num".to_string(),
+                Address => "address".to_string(),
+                Signer => "signer".to_string(),
+                Bool => "bool".to_string(),
+                Range => "range".to_string(),
+                _ => format!("<<unsupported {:?}>>", ty),
+            },
+            Vector(et) => format!("vec{}", self.mangle_types(&[et.as_ref().to_owned()])),
+            Struct(mid, sid, inst) => {
+                self.mangle_struct(&mid.qualified(*sid).instantiate(inst.clone()))
+            },
+            TypeParameter(..) | Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..)
+            | Error | Var(..) | Reference(..) => format!("<<unsupported {:?}>>", ty),
+        }
+    }
+
+    /// Mangle a struct.
+    pub(crate) fn mangle_struct(&self, struct_id: &QualifiedInstId<StructId>) -> String {
+        let struct_env = &self.env.get_struct(struct_id.to_qualified_id());
+        let module_name = self.make_contract_name(&struct_env.module_env);
+        format!(
+            "{}_{}{}",
+            module_name,
+            struct_env.get_name().display(struct_env.symbol_pool()),
+            self.mangle_types(&struct_id.inst)
+        )
+    }
+
+    /// Mangle a slice of types.
+    pub fn mangle_types(&self, tys: &[Type]) -> String {
+        if tys.is_empty() {
+            "".to_owned()
+        } else {
+            format!("${}$", tys.iter().map(|ty| self.mangle_type(ty)).join("_"))
+        }
+    }
+
+    /// Make name for a local.
+    pub fn make_local_name(&self, target: &FunctionTarget, idx: TempIndex) -> String {
+        target
+            .get_local_name(idx)
+            .display(target.symbol_pool())
+            .to_string()
+            .replace('#', "_")
+    }
+
+    /// Make name for a result.
+    pub fn make_result_name(&self, target: &FunctionTarget, idx: usize) -> String {
+        if target.get_return_count() == 1 {
+            "$result".to_string()
+        } else {
+            format!("$result{}", idx)
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Code Generation
+
+    /// Emits a Yul block.
+    pub fn emit_block(&self, blk: impl FnOnce()) {
+        emitln!(self.writer, "{");
+        self.writer.indent();
+        blk();
+        self.writer.unindent();
+        emitln!(self.writer, "}");
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Types
+
+    /// Check whether it is an abi struct or a builtin String type
+    pub fn is_structs_abi(&self, st: &StructEnv<'_>) -> bool {
+        attributes::is_abi_struct(st) || self.is_string(st.get_qualified_id())
+    }
+
+    /// Returns whether the struct identified by module_id and struct_id is the native U256 struct.
+    pub fn is_u256(&self, struct_id: QualifiedId<StructId>) -> bool {
+        let struct_env = self.env.get_struct(struct_id);
+        struct_env.get_full_name_with_address() == format!("{}::U256::U256", EVM_MODULE_ADDRESS)
+    }
+
+    pub fn is_u256_ty(&self, ty: &Type) -> bool {
+        match ty {
+            Type::Struct(m, s, _) => {
+                let struct_id = m.qualified(*s);
+                self.is_u256(struct_id)
+            },
+            _ => false,
+        }
+    }
+
+    pub fn is_unit_ty(&self, ty: &Type) -> bool {
+        match ty {
+            Type::Struct(m, s, _) => {
+                let struct_id = m.qualified(*s);
+                let struct_env = self.env.get_struct(struct_id);
+                struct_env.get_full_name_with_address()
+                    == format!("{}::Evm::Unit", EVM_MODULE_ADDRESS)
+            },
+            _ => false,
+        }
+    }
+
+    pub fn is_unit_opt_ty(&self, ty: Option<Type>) -> bool {
+        if let Some(Type::Struct(m, s, _)) = ty {
+            let struct_id = m.qualified(s);
+            let struct_env = self.env.get_struct(struct_id);
+            return struct_env.get_full_name_with_address()
+                == format!("{}::Evm::Unit", EVM_MODULE_ADDRESS);
+        }
+        false
+    }
+
+    pub fn extract_external_result(&self, ty: &Type) -> (bool, Option<Type>) {
+        if let Type::Struct(m, s, insts) = ty {
+            let struct_id = m.qualified(*s);
+            let struct_env = self.env.get_struct(struct_id);
+            if struct_env.get_full_name_with_address()
+                == format!("{}::ExternalResult::ExternalResult", EVM_MODULE_ADDRESS)
+            {
+                assert!(insts.len() == 1);
+                return (true, Some(insts[0].clone()));
+            }
+        };
+        (false, None)
+    }
+
+    /// Returns whether the struct identified by module_id and struct_id is the native Table struct.
+    pub fn is_table(&self, struct_id: QualifiedId<StructId>) -> bool {
+        let struct_env = self.env.get_struct(struct_id);
+        struct_env.get_full_name_with_address() == format!("{}::Table::Table", EVM_MODULE_ADDRESS)
+    }
+
+    /// Returns whether the struct identified by module_id and struct_id is the native String struct.
+    pub fn is_string(&self, struct_id: QualifiedId<StructId>) -> bool {
+        let struct_env = self.env.get_struct(struct_id);
+        format!(
+            "{}",
+            struct_env.get_name().display(struct_env.symbol_pool())
+        ) == "String"
+    }
+
+    /// Get the field types of a struct as a vector.
+    pub fn get_field_types(&self, id: QualifiedId<StructId>) -> Vec<Type> {
+        self.env
+            .get_struct(id)
+            .get_fields()
+            .map(|f| f.get_type())
+            .collect()
+    }
+
+    /// Get the layout of the instantiated struct in linear memory. The result will be cached
+    /// for future calls.
+    pub fn get_struct_layout(&self, st: &QualifiedInstId<StructId>) -> StructLayout {
+        let mut layouts_ref = self.struct_layout.borrow_mut();
+        if layouts_ref.get(st).is_none() {
+            // Compute the fields such that the larger appear first, and pointer fields
+            // precede non-pointer fields.
+            let s_or_v = |ty: &Type| ty.is_vector() || self.type_is_struct(ty);
+            let struct_env = self.env.get_struct(st.to_qualified_id());
+            let ordered_fields = struct_env
+                .get_fields()
+                .map(|field| {
+                    let field_type = field.get_type().instantiate(&st.inst);
+                    let field_size = self.type_size(&field_type);
+                    (field.get_offset(), field_size, field_type)
+                })
+                .sorted_by(|(_, s1, ty1), (_, s2, ty2)| {
+                    if s1 > s2 {
+                        std::cmp::Ordering::Less
+                    } else if s2 > s1 {
+                        std::cmp::Ordering::Greater
+                    } else if s_or_v(ty1) && !s_or_v(ty2) {
+                        std::cmp::Ordering::Less
+                    } else if s_or_v(ty2) && !s_or_v(ty1) {
+                        std::cmp::Ordering::Greater
+                    } else {
+                        std::cmp::Ordering::Equal
+                    }
+                });
+            let mut result = StructLayout::default();
+            for (logical_offs, field_size, ty) in ordered_fields {
+                result.field_order.push(logical_offs);
+                if s_or_v(&ty) {
+                    result.pointer_count += 1
+                }
+                result.offsets.insert(logical_offs, (result.size, ty));
+                result.size += field_size
+            }
+            layouts_ref.insert(st.clone(), result);
+        }
+        layouts_ref.get(st).unwrap().clone()
+    }
+
+    /// Calculate the size, in bytes, for the memory layout of this type.
+    pub fn type_size(&self, ty: &Type) -> usize {
+        use PrimitiveType::*;
+        use Type::*;
+        match ty {
+            Primitive(p) => match p {
+                Bool | U8 => 1,
+                U64 => 8,
+                U128 => 16,
+                // TODO: optimize for 20 bytes? Then we need primitives like LoadU160 etc.
+                Address | Signer => 32,
+                Num | Range | EventStore | U16 | U32 | U256 => {
+                    panic!("unexpected field type")
+                },
+            },
+            Struct(..) | Vector(..) => 32,
+            Tuple(_)
+            | TypeParameter(_)
+            | Reference(_, _)
+            | Fun(_, _)
+            | TypeDomain(_)
+            | ResourceDomain(_, _, _)
+            | Error
+            | Var(_) => {
+                panic!("unexpected field type")
+            },
+        }
+    }
+
+    /// Returns the Load function for a given type.
+    pub fn load_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::LoadU8,
+            8 => YulFunction::LoadU64,
+            16 => YulFunction::LoadU128,
+            32 => YulFunction::LoadU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns the Store function for a given type.
+    pub fn store_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::StoreU8,
+            8 => YulFunction::StoreU64,
+            16 => YulFunction::StoreU128,
+            32 => YulFunction::StoreU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns the MemoryLoad function for a given type.
+    pub fn memory_load_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::MemoryLoadU8,
+            8 => YulFunction::MemoryLoadU64,
+            16 => YulFunction::MemoryLoadU128,
+            32 => YulFunction::MemoryLoadU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns the MemoryStore function for a given type.
+    pub fn memory_store_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::MemoryStoreU8,
+            8 => YulFunction::MemoryStoreU64,
+            16 => YulFunction::MemoryStoreU128,
+            32 => YulFunction::MemoryStoreU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns the StorageLoad function for a given type.
+    #[allow(dead_code)]
+    pub fn storage_load_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::StorageLoadU8,
+            8 => YulFunction::StorageLoadU64,
+            16 => YulFunction::StorageLoadU128,
+            32 => YulFunction::StorageLoadU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns the StorageStore function for a given type.
+    #[allow(dead_code)]
+    pub fn storage_store_builtin_fun(&self, ty: &Type) -> YulFunction {
+        match self.type_size(ty.skip_reference()) {
+            1 => YulFunction::StorageStoreU8,
+            8 => YulFunction::StorageStoreU64,
+            16 => YulFunction::StorageStoreU128,
+            32 => YulFunction::StorageStoreU256,
+            _ => panic!("unexpected type size"),
+        }
+    }
+
+    /// Returns true of the type allocates memory.
+    pub fn type_allocates_memory(&self, ty: &Type) -> bool {
+        use Type::*;
+        match ty {
+            Struct(m, s, _) => !self.is_u256(m.qualified(*s)) && !self.is_table(m.qualified(*s)),
+            Vector(_) => true,
+            _ => false,
+        }
+    }
+
+    /// Returns true if the type is a proper struct.
+    pub fn type_is_struct(&self, ty: &Type) -> bool {
+        use Type::*;
+        match ty {
+            Struct(m, s, _) => !self.is_u256(m.qualified(*s)) && !self.is_table(m.qualified(*s)),
+            _ => false,
+        }
+    }
+
+    /// Returns true if there is a storage struct given and the type is a reference to it.
+    pub fn is_storage_ref(
+        &self,
+        storage_type: &Option<QualifiedInstId<StructId>>,
+        ty: &Type,
+    ) -> bool {
+        if let Some(st) = &storage_type {
+            matches!(ty,
+                Type::Reference(_, et) if et.as_ref() == &st.to_type())
+        } else {
+            false
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/dispatcher_generator.rs b/vendors/move/crates/evm/move-to-yul/src/dispatcher_generator.rs
new file mode 100644
index 000000000..ec6d0a32d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/dispatcher_generator.rs
@@ -0,0 +1,1759 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    attributes,
+    context::Context,
+    solidity_ty::{
+        abi_head_sizes_sum, abi_head_sizes_vec, mangle_solidity_types, SignatureDataLocation,
+        SoliditySignature, SolidityType,
+    },
+    vectors::VECTOR_METADATA_SIZE,
+    yul_functions::{substitute_placeholders, YulFunction},
+    Generator,
+};
+use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
+use move_model::{
+    ast::TempIndex,
+    emit, emitln,
+    model::{FunId, FunctionEnv, QualifiedId, QualifiedInstId, StructId},
+    ty::{PrimitiveType, Type},
+};
+use regex::Regex;
+use sha3::{Digest, Keccak256};
+use std::collections::BTreeMap;
+
+// Revert reasons
+pub const REVERT_ERR_NON_PAYABLE_FUN: usize = 99;
+pub const UNKNOWN_SIGNATURE_AND_NO_FALLBACK_DEFINED: usize = 98;
+pub const NO_RECEIVE_OR_FALLBACK_FUN: usize = 97;
+pub const ABI_DECODING_DATA_TOO_SHORT: usize = 96;
+pub const ABI_DECODING_PARAM_VALIDATION: usize = 95;
+pub const ABI_DECODING_INVALID_CALLDATA_ARRAY_OFFSET: usize = 94;
+pub const ABI_DECODING_INVALID_BYTE_ARRAY_OFFSET: usize = 93;
+pub const STATIC_ARRAY_SIZE_NOT_MATCH: usize = 92;
+pub const TARGET_CONTRACT_DOES_NOT_CONTAIN_CODE: usize = 91;
+pub const ABI_DECODING_STRUCT_DATA_TOO_SHORT: usize = 90;
+
+#[derive(Debug, Clone)]
+pub(crate) struct EncodingOptions {
+    pub padded: bool,
+    pub in_place: bool,
+}
+
+impl EncodingOptions {
+    pub(crate) fn to_suffix(&self) -> String {
+        let mut result = "".to_string();
+        if !self.padded {
+            result = format!("{}_not_padded", result);
+        }
+        if self.in_place {
+            result = format!("{}_inplace", result);
+        }
+        result
+    }
+}
+
+impl Generator {
+    /// Generate dispatcher routine
+    pub(crate) fn generate_dispatcher_routine(
+        &mut self,
+        ctx: &Context,
+        callables: &[FunctionEnv<'_>],
+        receiver: &Option<FunctionEnv<'_>>,
+        fallback: &Option<FunctionEnv<'_>>,
+    ) {
+        emitln!(ctx.writer, "if iszero(lt(calldatasize(), 4))");
+        let mut selectors = BTreeMap::new();
+        let para_vec = vec!["calldataload(0)".to_string(), "224".to_string()];
+        let shr224 = self.call_builtin_str(ctx, YulFunction::Shr, para_vec.iter().cloned());
+        ctx.emit_block(|| {
+            emitln!(ctx.writer, "let selector := {}", shr224);
+            emitln!(ctx.writer, "switch selector");
+            for fun in callables {
+                if !self.is_suitable_for_dispatch(ctx, fun) {
+                    ctx.env.diag(
+                        Severity::Warning,
+                        &fun.get_loc(),
+                        "cannot dispatch this function because of unsupported parameter types",
+                    );
+                    continue;
+                }
+                let sig = self.get_solidity_signature(ctx, fun, true);
+                if let Some(fun_attr_opt) = attributes::construct_fun_attribute(fun) {
+                    self.solidity_sigs.push((sig.clone(), fun_attr_opt));
+                } else {
+                    ctx.env.error(
+                        &fun.get_loc(),
+                        "callable functions can only have one attribute among payable, pure and view",
+                    );
+                }
+                self.generate_dispatch_item(ctx, fun, &sig, &mut selectors);
+            }
+            emitln!(ctx.writer, "default {}");
+        });
+        let receive_exists = self.optional_receive(ctx, receiver);
+        self.generate_fallback(ctx, receive_exists, fallback);
+    }
+
+    /// Returns the Solidity signature of the given function.
+    pub(crate) fn get_solidity_signature(
+        &self,
+        ctx: &Context,
+        fun: &FunctionEnv,
+        callable_flag: bool,
+    ) -> SoliditySignature {
+        let extracted_sig_opt =
+            attributes::extract_callable_or_create_signature(fun, callable_flag);
+        let mut sig =
+            SoliditySignature::create_default_solidity_signature(ctx, fun, &self.storage_type);
+        if let Some(extracted_sig) = extracted_sig_opt {
+            let parsed_sig_opt = SoliditySignature::parse_into_solidity_signature(
+                ctx,
+                &extracted_sig,
+                fun,
+                &self.storage_type,
+            );
+            if let Ok(parsed_sig) = parsed_sig_opt {
+                if !parsed_sig.check_sig_compatibility(ctx, fun, &self.storage_type) {
+                    ctx.env.error(
+                        &fun.get_loc(),
+                        "solidity signature is not compatible with the move signature",
+                    );
+                } else {
+                    sig = parsed_sig;
+                }
+            } else if let Err(msg) = parsed_sig_opt {
+                ctx.env.error(&fun.get_loc(), &format!("{}", msg));
+            }
+        }
+        sig
+    }
+
+    fn generate_dispatch_item(
+        &mut self,
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+        solidity_sig: &SoliditySignature,
+        selectors: &mut BTreeMap<String, QualifiedId<FunId>>,
+    ) {
+        let fun_id = &fun.get_qualified_id().instantiate(vec![]);
+        let function_name = ctx.make_function_name(fun_id);
+        let fun_sig = format!("{}", solidity_sig);
+        self.need_move_function(fun_id);
+        let function_selector =
+            format!("0x{:x}", Keccak256::digest(fun_sig.as_bytes()))[..10].to_string();
+        // Check selector collision
+        if let Some(other_fun) = selectors.insert(function_selector.clone(), fun.get_qualified_id())
+        {
+            ctx.env.error(
+                &fun.get_loc(),
+                &format!(
+                    "hash collision for function selector with `{}`",
+                    ctx.env.get_function(other_fun).get_full_name_str()
+                ),
+            );
+        }
+        emitln!(ctx.writer, "case {}", function_selector);
+        ctx.emit_block(|| {
+            emitln!(ctx.writer, "// {}", fun_sig);
+            // TODO: check delegate call
+            if !attributes::is_payable_fun(fun) {
+                self.generate_call_value_check(ctx, REVERT_ERR_NON_PAYABLE_FUN);
+            }
+            // Decoding
+            let mut logical_param_types = fun.get_parameter_types();
+            let storage_type = if !logical_param_types.is_empty()
+                && ctx.is_storage_ref(&self.storage_type, &logical_param_types[0])
+            {
+                // Skip the storage reference parameter.
+                logical_param_types.remove(0);
+                Some(self.storage_type.clone().unwrap())
+            } else {
+                None
+            };
+            let param_count = solidity_sig.para_types.len();
+            let mut params = "".to_string();
+            if param_count > 0 {
+                let decoding_fun_name = self.generate_abi_tuple_decoding_para(
+                    ctx,
+                    solidity_sig,
+                    logical_param_types,
+                    false,
+                );
+                params = (0..param_count).map(|i| format!("param_{}", i)).join(", ");
+                let let_params = format!("let {} := ", params);
+                emitln!(
+                    ctx.writer,
+                    "{}{}(4, calldatasize())",
+                    let_params,
+                    decoding_fun_name
+                );
+            }
+            let ret_count = solidity_sig.ret_types.len();
+            let mut rets = "".to_string();
+            let mut let_rets = "".to_string();
+            if ret_count > 0 {
+                rets = (0..ret_count).map(|i| format!("ret_{}", i)).join(", ");
+                let_rets = format!("let {} := ", rets);
+            }
+            // Add optional storage ref parameter
+            params = self.add_storage_ref_param(ctx, &storage_type, params);
+            // Call the function
+            emitln!(ctx.writer, "{}{}({})", let_rets, function_name, params);
+            // Encoding the return values
+            let encoding_fun_name =
+                self.generate_abi_tuple_encoding_ret(ctx, solidity_sig, fun.get_return_types());
+            if ret_count > 0 {
+                rets = format!(", {}", rets);
+            }
+            // Prepare the return values
+            self.generate_allocate_unbounded(ctx);
+            emitln!(
+                ctx.writer,
+                "let memEnd := {}(memPos{})",
+                encoding_fun_name,
+                rets
+            );
+            emitln!(ctx.writer, "return(memPos, sub(memEnd, memPos))");
+        });
+    }
+
+    /// Adds the optional storage ref parameter to a parameter list.
+    fn add_storage_ref_param(
+        &mut self,
+        ctx: &Context,
+        storage_type: &Option<QualifiedInstId<StructId>>,
+        params: String,
+    ) -> String {
+        if let Some(storage) = storage_type {
+            // The first parameter is a reference to the storage struct.
+            let storage_ref = self.borrow_global_instrs(ctx, storage, "address()".to_string());
+            if params.is_empty() {
+                storage_ref
+            } else {
+                vec![storage_ref, params].into_iter().join(", ")
+            }
+        } else {
+            params
+        }
+    }
+
+    /// Determine whether the function is suitable as a dispatcher item.
+    pub(crate) fn is_suitable_for_dispatch(&self, ctx: &Context, fun: &FunctionEnv) -> bool {
+        let mut types = fun.get_parameter_types();
+        if !types.is_empty() && ctx.is_storage_ref(&self.storage_type, &types[0]) {
+            // Skip storage ref parameter
+            types.remove(0);
+        }
+        if !attributes::is_create_fun(fun) || self.storage_type.is_none() {
+            // If this is not a creator which returns a storage value, add return types.
+            types.extend(fun.get_return_types().into_iter())
+        }
+        types.into_iter().all(|ty| !ty.is_reference())
+    }
+
+    /// Generate optional receive function.
+    fn optional_receive(&mut self, ctx: &Context, receive: &Option<FunctionEnv<'_>>) -> bool {
+        if let Some(receive) = receive {
+            ctx.check_no_generics(receive);
+            if !attributes::is_payable_fun(receive) {
+                ctx.env
+                    .error(&receive.get_loc(), "receive function must be payable")
+            }
+            let mut param_count = receive.get_parameter_count();
+            let storage_type = if param_count > 0
+                && ctx.is_storage_ref(&self.storage_type, &receive.get_local_type(0))
+            {
+                param_count -= 1;
+                Some(self.storage_type.clone().unwrap())
+            } else {
+                None
+            };
+            if param_count > 0 {
+                ctx.env.error(
+                    &receive.get_loc(),
+                    "receive function must not have parameters in addition to optional storage reference",
+                )
+            }
+            let fun_id = &receive
+                .module_env
+                .get_id()
+                .qualified(receive.get_id())
+                .instantiate(vec![]);
+            ctx.emit_block(|| {
+                let params = self.add_storage_ref_param(ctx, &storage_type, "".to_string());
+                emitln!(
+                    ctx.writer,
+                    "if iszero(calldatasize()) {{ {}({}) stop() }}",
+                    ctx.make_function_name(fun_id),
+                    params
+                );
+            });
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Generate fallback function.
+    fn generate_fallback(
+        &mut self,
+        ctx: &Context,
+        receive_ether: bool,
+        fallback: &Option<FunctionEnv<'_>>,
+    ) {
+        if let Some(fallback) = fallback {
+            ctx.check_no_generics(fallback);
+            if !attributes::is_payable_fun(fallback) {
+                self.generate_call_value_check(ctx, REVERT_ERR_NON_PAYABLE_FUN);
+            }
+            let fun_id = &fallback
+                .module_env
+                .get_id()
+                .qualified(fallback.get_id())
+                .instantiate(vec![]);
+            let fun_name = ctx.make_function_name(fun_id);
+            let mut param_count = fallback.get_parameter_count();
+            let storage_type = if param_count > 0
+                && ctx.is_storage_ref(&self.storage_type, &fallback.get_local_type(0))
+            {
+                param_count -= 1;
+                Some(self.storage_type.clone().unwrap())
+            } else {
+                None
+            };
+            ctx.emit_block(|| {
+                let mut params = self.add_storage_ref_param(ctx, &storage_type, "".to_string());
+                if param_count == 0 {
+                    emitln!(ctx.writer, "{}({}) stop()", fun_name, params);
+                } else if param_count != 1 || fallback.get_return_count() != 1 {
+                    ctx.env.error(
+                        &fallback.get_loc(),
+                        "fallback function must have at most 1 parameter and 1 return value",
+                    );
+                } else {
+                    if !params.is_empty() {
+                        params = format!("{}, ", params);
+                    }
+                    emitln!(
+                        ctx.writer,
+                        "let retval := {}({}0, calldatasize()) stop()",
+                        fun_name,
+                        params
+                    );
+                    emitln!(ctx.writer, "return(add(retval, 0x20), mload(retval))");
+                }
+            })
+        } else {
+            let mut err_msg = NO_RECEIVE_OR_FALLBACK_FUN;
+            if receive_ether {
+                err_msg = UNKNOWN_SIGNATURE_AND_NO_FALLBACK_DEFINED;
+            }
+            self.call_builtin(
+                ctx,
+                YulFunction::Abort,
+                std::iter::once(err_msg.to_string()),
+            );
+        }
+    }
+
+    /// Generate the code to check value
+    fn generate_call_value_check(&mut self, ctx: &Context, err_code: TempIndex) {
+        emitln!(ctx.writer, "if callvalue()");
+        ctx.emit_block(|| {
+            self.call_builtin(
+                ctx,
+                YulFunction::Abort,
+                std::iter::once(err_code.to_string()),
+            );
+        });
+    }
+
+    /// Generate the start position of memory for returning from the external function
+    /// Note: currently, we directly return the free memory pointer, may need to use the memory model later
+    fn generate_allocate_unbounded(&mut self, ctx: &Context) {
+        emitln!(
+            ctx.writer,
+            "let memPos := mload({})",
+            substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+        );
+    }
+
+    /// Generate the cleanup function used in the validator and the encoding function.
+    fn generate_cleanup(&mut self, ty: &SolidityType) -> String {
+        let name_prefix = "cleanup";
+        let function_name = format!("{}_{}", name_prefix, ty);
+        let mask = ty.max_value();
+
+        let generate_fun = move |_gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value) -> cleaned ");
+            ctx.emit_block(|| emitln!(ctx.writer, "cleaned := and(value, {})", mask));
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    fn generate_left_align(&mut self, ty: &SolidityType) -> String {
+        use crate::solidity_ty::{SolidityPrimitiveType::*, SolidityType::*};
+        assert!(ty.is_value_type());
+        let ty = ty.clone();
+        let name_prefix = "left_align";
+        let function_name = format!("{}_{}", name_prefix, ty);
+        let generate_fun = move |_gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value) -> aligned ");
+            ctx.emit_block(|| {
+                let bits = 256
+                    - match ty {
+                        Primitive(p) => match p {
+                            Bool => 8,
+                            Int(size) | Uint(size) => size,
+                            Address(_) => 160,
+                            _ => panic!("wrong types"),
+                        },
+                        BytesStatic(_) => 256,
+                        _ => panic!("wrong types"),
+                    };
+                if bits > 0 {
+                    emitln!(ctx.writer, "aligned := shl({}, value)", bits);
+                }
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate the validator function, which is used in the decode function.
+    fn generate_validator(&mut self, ty: &SolidityType) -> String {
+        let name_prefix = "validator";
+        let function_name = format!("{}_{}", name_prefix, ty);
+        let ty = ty.clone(); // need to move into lambda
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value) ");
+            ctx.emit_block(|| {
+                let condition = format!("eq(value, {}(value))", gen.generate_cleanup(&ty));
+                let failure_call = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Abort,
+                    std::iter::once(ABI_DECODING_PARAM_VALIDATION.to_string()),
+                );
+                emitln!(
+                    ctx.writer,
+                    "if iszero({}) {{ {} }}",
+                    condition,
+                    failure_call
+                );
+            })
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate decoding functions for solidity structs.
+    fn generate_abi_decoding_struct_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        from_memory: bool,
+    ) -> String {
+        use SolidityType::*;
+        assert!(matches!(ty, Struct(_, _)), "wrong types");
+        let name_prefix = "abi_decode";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+
+        let mut param_types = vec![];
+        let mut move_tys = vec![];
+        let mut real_offsets = vec![];
+        if let Struct(_, ty_tuples) = ty {
+            param_types = ty_tuples
+                .iter()
+                .map(|(_, _, _, _, ty)| ty.clone())
+                .collect_vec();
+            move_tys = ty_tuples
+                .iter()
+                .map(|(_, _, m_ty, _, _)| m_ty.clone())
+                .collect_vec();
+            real_offsets = ty_tuples
+                .iter()
+                .map(|(_, real_offset, _, _, _)| *real_offset)
+                .collect_vec();
+        }
+
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            mangle_solidity_types(&param_types),
+            ctx.mangle_types(&[move_ty.clone()]),
+            from_memory_str
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let overall_type_head_vec = abi_head_sizes_vec(&param_types, true);
+            let overall_type_head_size = abi_head_sizes_sum(&param_types, true);
+            let ret_var = (0..overall_type_head_vec.len())
+                .map(|i| format!("value_{}", i))
+                .collect_vec();
+            emit!(ctx.writer, "(headStart, end) -> value ");
+            ctx.emit_block(|| {
+                let failure_call = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Abort,
+                    std::iter::once(ABI_DECODING_STRUCT_DATA_TOO_SHORT.to_string()),
+                );
+                let malloc = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Malloc,
+                    std::iter::once(overall_type_head_size.to_string()), // Make sure the allocated size is not over the limit
+                );
+                emitln!(
+                    ctx.writer,
+                    "if slt(sub(end, headStart), {}) {{ {} }}",
+                    overall_type_head_size,
+                    failure_call
+                );
+                emitln!(ctx.writer, "let {}", ret_var.iter().join(", "));
+                emitln!(ctx.writer, "value := {}", malloc);
+                assert!(real_offsets.len() == overall_type_head_vec.len());
+                let mut head_pos = 0;
+                for (stack_pos, (((ty, ty_size), move_ty), real_offset)) in overall_type_head_vec
+                    .iter()
+                    .zip(move_tys.iter())
+                    .zip(real_offsets.iter())
+                    .enumerate()
+                {
+                    let is_static = ty.is_static();
+                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let abi_decode_type =
+                        gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
+                    ctx.emit_block(|| {
+                        if is_static {
+                            emitln!(ctx.writer, "let offset := {}", head_pos);
+                        } else {
+                            let load = if from_memory { "mload" } else { "calldataload" };
+                            emitln!(
+                                ctx.writer,
+                                "let offset := {}(add(headStart, {}))",
+                                load,
+                                head_pos
+                            );
+                            emitln!(
+                                ctx.writer,
+                                "if gt(offset, 0xffffffffffffffff) {{ {} }}",
+                                gen.call_builtin_str(
+                                    ctx,
+                                    YulFunction::Abort,
+                                    std::iter::once(ABI_DECODING_DATA_TOO_SHORT.to_string())
+                                )
+                            );
+                        }
+                        emitln!(
+                            ctx.writer,
+                            "{} := {}(add(headStart, offset), end)",
+                            local_typ_var.iter().join(", "),
+                            abi_decode_type
+                        );
+                    });
+                    head_pos += ty_size;
+                    let memory_func = ctx.memory_store_builtin_fun(move_ty);
+                    if local_typ_var.len() == 1 {
+                        gen.call_builtin(
+                            ctx,
+                            memory_func,
+                            vec![
+                                format!("add(value, {})", real_offset),
+                                local_typ_var[0].clone(),
+                            ]
+                            .into_iter(),
+                        );
+                    }
+                }
+            })
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate decoding functions for tuple.
+    pub(crate) fn generate_abi_tuple_decoding(
+        &mut self,
+        ctx: &Context,
+        param_types: Vec<SolidityType>,
+        param_locs: Vec<SignatureDataLocation>,
+        move_tys: Vec<Type>,
+        from_memory: bool,
+    ) -> String {
+        let name_prefix = "abi_decode_tuple";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            mangle_solidity_types(&param_types),
+            ctx.mangle_types(&move_tys),
+            from_memory_str
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let overall_type_head_vec = abi_head_sizes_vec(&param_types, true);
+            let overall_type_head_size = abi_head_sizes_sum(&param_types, true);
+
+            let ret_var = (0..overall_type_head_vec.len())
+                .map(|i| format!("value_{}", i))
+                .collect_vec();
+            let ret_var_str = if ret_var.is_empty() {
+                "".to_string()
+            } else {
+                format!(" -> {}", ret_var.iter().join(", "))
+            };
+            emit!(ctx.writer, "(headStart, dataEnd){} ", ret_var_str);
+            ctx.emit_block(|| {
+                emitln!(
+                    ctx.writer,
+                    "if slt(sub(dataEnd, headStart), {}) {{ {} }}",
+                    overall_type_head_size,
+                    gen.call_builtin_str(
+                        ctx,
+                        YulFunction::Abort,
+                        std::iter::once(ABI_DECODING_DATA_TOO_SHORT.to_string())
+                    ),
+                );
+                let mut head_pos = 0;
+                for (stack_pos, (((ty, ty_size), _loc), move_ty)) in overall_type_head_vec
+                    .iter()
+                    .zip(param_locs.iter())
+                    .zip(move_tys.iter())
+                    .enumerate()
+                {
+                    let is_static = ty.is_static();
+                    // TODO: consider the case size_on_stack is not 1
+                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let abi_decode_type =
+                        gen.generate_abi_decoding_type(ctx, ty, move_ty, from_memory);
+                    ctx.emit_block(|| {
+                        if is_static {
+                            emitln!(ctx.writer, "let offset := {}", head_pos);
+                        } else {
+                            // TODO: dynamic types need to be revisited
+                            let load = if from_memory { "mload" } else { "calldataload" };
+                            emitln!(
+                                ctx.writer,
+                                "let offset := {}(add(headStart, {}))",
+                                load,
+                                head_pos
+                            );
+                            emitln!(
+                                ctx.writer,
+                                "if gt(offset, 0xffffffffffffffff) {{ {} }}",
+                                gen.call_builtin_str(
+                                    ctx,
+                                    YulFunction::Abort,
+                                    std::iter::once(ABI_DECODING_DATA_TOO_SHORT.to_string())
+                                )
+                            );
+                        }
+                        emitln!(
+                            ctx.writer,
+                            "{} := {}(add(headStart, offset), dataEnd)",
+                            local_typ_var.iter().join(", "),
+                            abi_decode_type
+                        );
+                    });
+                    head_pos += ty_size;
+                }
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    pub(crate) fn generate_abi_tuple_decoding_ret(
+        &mut self,
+        ctx: &Context,
+        sig: &SoliditySignature,
+        move_tys: Vec<Type>,
+        from_memory: bool,
+    ) -> String {
+        let param_types = sig.ret_types.iter().map(|(ty, _)| ty.clone()).collect_vec(); // need to move into lambda
+        let ret_locs = sig
+            .ret_types
+            .iter()
+            .map(|(_, loc)| loc.clone())
+            .collect_vec();
+        self.generate_abi_tuple_decoding(ctx, param_types, ret_locs, move_tys, from_memory)
+    }
+
+    pub(crate) fn generate_abi_tuple_decoding_para(
+        &mut self,
+        ctx: &Context,
+        sig: &SoliditySignature,
+        move_tys: Vec<Type>,
+        from_memory: bool,
+    ) -> String {
+        let param_types = sig
+            .para_types
+            .iter()
+            .map(|(ty, _, _)| ty.clone())
+            .collect_vec(); // need to move into lambda
+        let ret_locs = sig
+            .para_types
+            .iter()
+            .map(|(_, _, loc)| loc.clone())
+            .collect_vec();
+        self.generate_abi_tuple_decoding(ctx, param_types, ret_locs, move_tys, from_memory)
+    }
+
+    /// Generate decoding functions for ty.
+    fn generate_abi_decoding_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        from_memory: bool,
+    ) -> String {
+        use SolidityType::*;
+        // TODO: struct
+        match ty {
+            Primitive(_) => self.generate_abi_decoding_primitive_type(ty, from_memory),
+            DynamicArray(_) | StaticArray(_, _) | Bytes | BytesStatic(_) | SolidityString => {
+                self.generate_abi_decoding_array_type(ctx, ty, move_ty, from_memory)
+            },
+            Struct(_, _) => self.generate_abi_decoding_struct_type(ctx, ty, move_ty, from_memory),
+            _ => "".to_string(),
+        }
+    }
+
+    /// Generate decoding functions for primitive types.
+    fn generate_abi_decoding_primitive_type(
+        &mut self,
+        ty: &SolidityType,
+        from_memory: bool,
+    ) -> String {
+        let name_prefix = "abi_decode";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+        let function_name = format!("{}_{}{}", name_prefix, ty, from_memory_str);
+        let ty = ty.clone(); // need to move into lambda
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(offset, end) -> value ");
+            let load = if from_memory { "mload" } else { "calldataload" };
+            ctx.emit_block(|| {
+                emitln!(ctx.writer, "value := {}(offset)", load);
+                let validator = gen.generate_validator(&ty);
+                emitln!(ctx.writer, "{}(value)", validator);
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Aux function to compute the length of an array and the size to be allocated in the memory for a fixed-sized array
+    fn compute_static_array_type_length_size(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        inner_move_ty: &Type,
+    ) -> (usize, usize) {
+        use SolidityType::*;
+        match ty {
+            BytesStatic(len) | StaticArray(_, len) => (
+                *len,
+                VECTOR_METADATA_SIZE + ctx.type_size(inner_move_ty) * len,
+            ),
+            _ => panic!("wrong types"),
+        }
+    }
+
+    /// Generate decoding function for array types including static and dynamic arrays, static and dynamic bytes and string
+    fn generate_abi_decoding_array_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        from_memory: bool,
+    ) -> String {
+        let name_prefix = "abi_decode";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            ty,
+            ctx.mangle_type(move_ty),
+            from_memory_str
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+        let ty = ty.clone(); // need to move into lambda
+        let move_ty = move_ty.clone();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(offset, end) -> array ");
+            let failure_call = gen.call_builtin_str(
+                ctx,
+                YulFunction::Abort,
+                std::iter::once(ABI_DECODING_INVALID_CALLDATA_ARRAY_OFFSET.to_string()),
+            );
+            let allocated_size; // memory size to be allocated for the current array
+            let array_length; // length of the current array
+            let inner_move_ty = match move_ty {
+                Type::Vector(ref _ty) => _ty.clone(),
+                Type::Struct(mid, sid, _) => {
+                    let st_id = mid.qualified(sid);
+                    if ctx.is_string(st_id) {
+                        Box::new(Type::Primitive(PrimitiveType::U8))
+                    } else {
+                        panic!("wrong type")
+                    }
+                },
+                _ => panic!("wrong type"),
+            };
+            let mut offset = "add(offset, 0x20)";
+            if ty.is_array_static_size() {
+                // current array has fixed number of elements
+                let (len, size) =
+                    gen.compute_static_array_type_length_size(ctx, &ty, &inner_move_ty);
+                array_length = format!("{}", len);
+                allocated_size = format!("{}", size);
+                offset = "offset";
+            } else {
+                // if the size is not fixed, get the length from offset in calldata
+                let load = if from_memory { "mload" } else { "calldataload" };
+                array_length = format!("{}(offset)", load);
+                allocated_size = format!(
+                    "add(mul({}, length), {})",
+                    ctx.type_size(&inner_move_ty),
+                    VECTOR_METADATA_SIZE
+                );
+            }
+            ctx.emit_block(|| {
+                emitln!(
+                    ctx.writer,
+                    "if iszero(slt(add(offset, 0x1f), end)) {{ {} }}",
+                    failure_call
+                );
+                emitln!(ctx.writer, "let length := {}", array_length);
+                emitln!(ctx.writer, "let size := {}", allocated_size);
+                emitln!(
+                    ctx.writer,
+                    "array := {}({}, length, size, end)",
+                    gen.generate_abi_decoding_array_available_len_memory(
+                        ctx,
+                        &ty,
+                        &move_ty,
+                        from_memory
+                    ),
+                    offset
+                );
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate code to decode bytes
+    fn generate_abi_decoding_bytes_available_len_memory(
+        &mut self,
+        ty: &SolidityType,
+        from_memory: bool,
+    ) -> String {
+        let name_prefix = "abi_decode_available_length_";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+        let mut function_name = format!("{}_{}{}", name_prefix, ty, from_memory_str);
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(src, length, size, end) -> array ");
+            let failure_call = gen.call_builtin_str(
+                ctx,
+                YulFunction::Abort,
+                std::iter::once(ABI_DECODING_INVALID_BYTE_ARRAY_OFFSET.to_string()),
+            );
+            let allocation_size = gen.call_builtin_str(
+                ctx,
+                YulFunction::CheckMemorySize,
+                std::iter::once("size".to_string()),
+            );
+            // Note: the code structure is different from the Solidity compiler code due to the representation of array in the memory
+            ctx.emit_block(|| {
+                let malloc = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Malloc,
+                    std::iter::once(allocation_size.to_string()), // Make sure the allocated size is not over the limit
+                );
+                emitln!(ctx.writer, "array := {}", malloc);
+                // store the current length of vector
+                emitln!(
+                    ctx.writer,
+                    "{}",
+                    gen.call_builtin_str(
+                        ctx,
+                        YulFunction::MemoryStoreU64,
+                        vec!["array".to_string(), "length".to_string()].into_iter()
+                    )
+                );
+                // store the capacity of vector
+                let compute_capacity_str = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::ClosestGreaterPowerOfTwo,
+                    std::iter::once("length".to_string()),
+                );
+                emitln!(
+                    ctx.writer,
+                    "{}",
+                    gen.call_builtin_str(
+                        ctx,
+                        YulFunction::MemoryStoreU64,
+                        vec![
+                            // TODO: simplify implementation of MemoryStoreU64?
+                            "add(array, 8)".to_string(), // skip the length which is a u64 (8 bytes)
+                            compute_capacity_str
+                        ]
+                        .into_iter()
+                    )
+                );
+                emitln!(
+                    ctx.writer,
+                    "let dst := add(array, {})",
+                    VECTOR_METADATA_SIZE // skip the metadata
+                );
+                emitln!(
+                    ctx.writer,
+                    "if gt(add(src, sub(size, {})), end) {{ {} }}", // prevent read beyond the size of calldata
+                    VECTOR_METADATA_SIZE,
+                    failure_call
+                );
+                let copy_fun = if from_memory {
+                    YulFunction::CopyFromMemoryToMemory
+                } else {
+                    YulFunction::CopyFromCallDataToMemory
+                };
+                gen.call_builtin(
+                    ctx,
+                    copy_fun,
+                    vec!["src".to_string(), "dst".to_string(), "length".to_string()].into_iter(),
+                );
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate code to decode arrays
+    fn generate_abi_decoding_array_available_len_memory(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        from_memory: bool,
+    ) -> String {
+        use SolidityType::*;
+
+        if ty.is_bytes_type() {
+            return self.generate_abi_decoding_bytes_available_len_memory(ty, from_memory);
+        }
+
+        let name_prefix = "abi_decode_available_length_";
+        let from_memory_str = if from_memory { "_from_memory" } else { "" };
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            ty,
+            ctx.mangle_type(move_ty),
+            from_memory_str
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+        let ty = ty.clone(); // need to move into lambda
+        let move_ty = move_ty.clone();
+
+        let inner_ty = match ty {
+            DynamicArray(_ty) | StaticArray(_ty, _) => _ty,
+            _ => panic!("wrong type"),
+        };
+
+        let inner_move_ty = match move_ty {
+            Type::Vector(ref _ty) => _ty.clone(),
+            _ => panic!("wrong type"),
+        };
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(offset, length, size, end) -> array ");
+            let failure_call = gen.call_builtin_str(
+                ctx,
+                YulFunction::Abort,
+                std::iter::once(ABI_DECODING_INVALID_CALLDATA_ARRAY_OFFSET.to_string()),
+            );
+            let allocation_size = gen.call_builtin_str(
+                ctx,
+                YulFunction::CheckMemorySize,
+                std::iter::once("size".to_string()),
+            );
+            let stride = &inner_ty.abi_head_size(true); // step of traversing the array in calldata
+            let stride_dst = ctx.type_size(&inner_move_ty); // step of copying each element to memory
+                                                            // Note: the code structure is different from the Solidity compiler code due to the representation of array in the memory
+            ctx.emit_block(|| {
+                let malloc = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Malloc,
+                    std::iter::once(allocation_size.to_string()),
+                );
+                emitln!(ctx.writer, "array := {}", malloc);
+                // current length of vector
+                emitln!(
+                    ctx.writer,
+                    "{}",
+                    gen.call_builtin_str(
+                        ctx,
+                        YulFunction::MemoryStoreU64,
+                        vec!["array".to_string(), "length".to_string()].into_iter()
+                    )
+                );
+                // capacity of vector
+                let compute_capacity_str = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::ClosestGreaterPowerOfTwo,
+                    std::iter::once("length".to_string()),
+                );
+                emitln!(
+                    ctx.writer,
+                    "{}",
+                    gen.call_builtin_str(
+                        ctx,
+                        YulFunction::MemoryStoreU64,
+                        vec!["add(array, 8)".to_string(), compute_capacity_str].into_iter()
+                    )
+                );
+
+                emitln!(
+                    ctx.writer,
+                    "let dst := add(array, {})",
+                    VECTOR_METADATA_SIZE
+                );
+                emitln!(
+                    ctx.writer,
+                    "let srcEnd := add(offset, mul(length, {}))",
+                    stride
+                );
+                emitln!(ctx.writer, "if gt(srcEnd, end) {{ {} }}", failure_call);
+
+                emitln!(
+                    ctx.writer,
+                    "for {{ let src := offset }} lt(src, srcEnd) {{ src := add(src, {}) }}",
+                    stride
+                );
+                ctx.emit_block(|| {
+                    if !inner_ty.is_static() {
+                        // if the inner type is dynamic, obtain the pointer to the array
+                        let load = if from_memory { "mload" } else { "calldataload" };
+                        emitln!(ctx.writer, "let innerOffset := {}(src)", load);
+                        emitln!(
+                            ctx.writer,
+                            "if gt(innerOffset, 0xffffffffffffffff) {{ {} }}",
+                            failure_call
+                        );
+                        emitln!(ctx.writer, "let elementPos := add(offset, innerOffset)");
+                    } else {
+                        emitln!(ctx.writer, "let elementPos := src");
+                    }
+                    emitln!(
+                        ctx.writer,
+                        "let value := {}(elementPos, end)",
+                        gen.generate_abi_decoding_type(ctx, &inner_ty, &inner_move_ty, from_memory)
+                    );
+                    let memory_func = ctx.memory_store_builtin_fun(&inner_move_ty);
+                    gen.call_builtin(
+                        ctx,
+                        memory_func,
+                        vec!["dst".to_string(), "value".to_string()].into_iter(),
+                    );
+                    emitln!(ctx.writer, "dst := add(dst, {})", stride_dst);
+                });
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding functions for primitive types.
+    fn generate_abi_encoding_primitive_type(
+        &mut self,
+        ty: &SolidityType,
+        options: EncodingOptions,
+    ) -> String {
+        let name_prefix = "abi_encode";
+        let function_name = format!("{}_{}", name_prefix, ty);
+        let ty = ty.clone(); // need to move into lambda
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value, pos) ");
+            ctx.emit_block(|| {
+                let mut store_str = format!("{}(value)", gen.generate_cleanup(&ty));
+                if !options.padded {
+                    store_str = format!("{}({})", gen.generate_left_align(&ty), store_str);
+                }
+                emitln!(ctx.writer, "mstore(pos, {})", store_str);
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding functions for ty.
+    fn generate_abi_encoding_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        _loc: &SignatureDataLocation,
+        move_ty: &Type,
+        options: EncodingOptions,
+    ) -> String {
+        use SolidityType::*;
+        match ty {
+            Primitive(_) => self.generate_abi_encoding_primitive_type(ty, options),
+            DynamicArray(_) | StaticArray(_, _) | Bytes | BytesStatic(_) | SolidityString => {
+                self.generate_abi_encoding_array_type(ctx, ty, move_ty, options)
+            },
+            Struct(_, _) => self.generate_abi_encoding_struct_type(ctx, ty, move_ty, options),
+            _ => "NYI".to_string(),
+        }
+    }
+
+    /// Generate encoding functions for ty with updated position in calldata
+    fn generate_abi_encoding_type_with_updated_pos(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        _loc: &SignatureDataLocation,
+        move_ty: &Type,
+        options: EncodingOptions,
+    ) -> String {
+        use SolidityType::*;
+        let ty = ty.clone();
+        let move_ty = move_ty.clone();
+
+        let encoding_function_name = match ty {
+            Primitive(_) => self.generate_abi_encoding_primitive_type(&ty, options.clone()),
+            DynamicArray(_) | StaticArray(_, _) | Bytes | BytesStatic(_) | SolidityString => {
+                self.generate_abi_encoding_array_type(ctx, &ty, &move_ty, options.clone())
+            },
+            Struct(_, _) => {
+                self.generate_abi_encoding_struct_type(ctx, &ty, &move_ty, options.clone())
+            },
+            _ => "NYI".to_string(),
+        };
+        let function_name = format!("{}_with_updated_pos", encoding_function_name);
+
+        let data_size = ty.abi_head_size(options.padded);
+        let generate_fun = move |_: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value, pos) -> updated_pos");
+            let fun_str_call = format!("{}(value, pos)", encoding_function_name);
+            if ty.is_static() {
+                ctx.emit_block(|| {
+                    emitln!(ctx.writer, "{}", fun_str_call);
+                    emitln!(ctx.writer, "updated_pos := add(pos, {})", data_size);
+                });
+            } else {
+                ctx.emit_block(|| {
+                    emitln!(ctx.writer, "updated_pos := {}", fun_str_call);
+                });
+            }
+        };
+
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding function for static and dynamic bytes and string
+    fn generate_abi_encoding_bytes_memory(
+        &mut self,
+        ty: &SolidityType,
+        options: EncodingOptions,
+    ) -> String {
+        let ty = ty.clone();
+        assert!(ty.is_bytes_type(), "wrong type");
+        let name_prefix = "abi_encode";
+        let function_name = format!("{}_{}{}", name_prefix, ty, options.to_suffix());
+        let return_value = (if ty.is_static() { "" } else { "-> end" }).to_string();
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value, pos) {}", return_value);
+            ctx.emit_block(|| {
+                let size_fun = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::MemoryLoadU64,
+                    std::iter::once("value".to_string()),
+                );
+                let failure_size_match = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Abort,
+                    std::iter::once(STATIC_ARRAY_SIZE_NOT_MATCH.to_string()),
+                );
+                emitln!(ctx.writer, "let size := {}", size_fun);
+                if ty.is_static() {
+                    if let SolidityType::BytesStatic(set_size) = ty {
+                        emitln!(
+                            ctx.writer,
+                            "if iszero(eq(size, {})) {{ {} }}",
+                            set_size,
+                            failure_size_match
+                        );
+                    } else {
+                        panic!("wrong types");
+                    }
+                }
+                if !ty.is_array_static_size() && !options.in_place {
+                    // for dynamic, write the length first
+                    emitln!(ctx.writer, "mstore(pos, size)");
+                    emitln!(ctx.writer, "pos := add(pos, 0x20)");
+                }
+                // compute the used memory space
+                // copy the memory to pos
+                gen.call_builtin(
+                    ctx,
+                    YulFunction::CopyMemory,
+                    vec![
+                        "add(value, 0x20)".to_string(),
+                        "pos".to_string(),
+                        "size".to_string(),
+                    ]
+                    .into_iter(),
+                );
+                if !ty.is_static() {
+                    // bytes and string
+                    if options.padded {
+                        emitln!(
+                            ctx.writer,
+                            "size := {}",
+                            gen.call_builtin_str(
+                                ctx,
+                                YulFunction::RoundUp,
+                                std::iter::once("size".to_string())
+                            )
+                        );
+                    }
+                    emitln!(ctx.writer, "end := add(pos, size)");
+                }
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding function for array types including static and dynamic arrays, static and dynamic bytes and string
+    fn generate_abi_encoding_array_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        options: EncodingOptions,
+    ) -> String {
+        use SolidityType::*;
+        let sub_option = EncodingOptions {
+            padded: true,
+            in_place: options.in_place,
+        };
+        if ty.is_bytes_type() {
+            return self.generate_abi_encoding_bytes_memory(ty, options);
+        }
+        let ty = ty.clone();
+        let move_ty = move_ty.clone();
+        let name_prefix = "abi_encode";
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            ty,
+            ctx.mangle_type(&move_ty),
+            options.to_suffix()
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let ty_static = ty.is_static();
+            let (inner_ty_static, inner_ty, set_size) = match ty {
+                DynamicArray(ref _inner_ty) => (_inner_ty.is_static(), _inner_ty.clone(), 0),
+                StaticArray(ref _inner_ty, _set_size) => {
+                    (_inner_ty.is_static(), _inner_ty.clone(), _set_size)
+                },
+                _ => panic!("wrong type"),
+            };
+            let inner_move_ty = match move_ty {
+                Type::Vector(ref _ty) => _ty.clone(),
+                _ => panic!("wrong type"),
+            };
+            emit!(
+                ctx.writer,
+                "(value, pos) {} ",
+                (if ty_static { "" } else { "-> end" }).to_string()
+            );
+            ctx.emit_block(|| {
+                let size_fun = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::MemoryLoadU64,
+                    std::iter::once("value".to_string()),
+                );
+                let failure_size_match = gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Abort,
+                    std::iter::once(STATIC_ARRAY_SIZE_NOT_MATCH.to_string()),
+                );
+                // get length
+                emitln!(ctx.writer, "let length := {}", size_fun);
+                if ty.is_array_static_size() {
+                    emitln!(
+                        ctx.writer,
+                        "if iszero(eq(length, {})) {{ {} }}",
+                        set_size,
+                        failure_size_match
+                    );
+                }
+                if !ty.is_array_static_size() && !options.in_place {
+                    // for dynamic, write the length first
+                    emitln!(ctx.writer, "mstore(pos, length)");
+                    emitln!(ctx.writer, "pos := add(pos, 0x20)");
+                }
+                if !inner_ty_static && !options.in_place {
+                    // encode the pointer if the element is dynamic
+                    emitln!(ctx.writer, "let headStart := pos");
+                    emitln!(ctx.writer, "let tail := add(pos, mul(length, 0x20))");
+                    // skip pointers
+                }
+                let stride = ctx.type_size(&inner_move_ty);
+                emitln!(
+                    ctx.writer,
+                    "let start := add(value, {})",
+                    VECTOR_METADATA_SIZE
+                );
+                emitln!(
+                    ctx.writer,
+                    "let srcEnd := add(start, mul(length, {}))",
+                    stride
+                );
+                // copy the memory to offset
+                emitln!(
+                    ctx.writer,
+                    "for {{ let src := start }} lt(src, srcEnd) {{ src := add(src, {}) }}",
+                    stride
+                );
+                ctx.emit_block(|| {
+                    if !inner_ty_static && !options.in_place {
+                        emitln!(ctx.writer, "mstore(pos, sub(tail, headStart))");
+                        // store the pointer
+                    }
+                    let memory_func = ctx.memory_load_builtin_fun(&inner_move_ty);
+                    let load_fun =
+                        gen.call_builtin_str(ctx, memory_func, std::iter::once("src".to_string()));
+                    emitln!(ctx.writer, "let v := {}", load_fun); // load the value from array
+                                                                  // call encoding function
+                    if !inner_ty_static && !options.in_place {
+                        // put the data to tail
+                        emitln!(
+                            ctx.writer,
+                            "tail := {}(v, tail)",
+                            gen.generate_abi_encoding_type_with_updated_pos(
+                                ctx,
+                                &inner_ty.clone(),
+                                &SignatureDataLocation::Memory,
+                                &inner_move_ty,
+                                sub_option.clone()
+                            )
+                        );
+                        emitln!(ctx.writer, "pos := add(pos, 0x20)");
+                    } else {
+                        // put the data in place
+                        emitln!(
+                            ctx.writer,
+                            "pos := {}(v, pos)",
+                            gen.generate_abi_encoding_type_with_updated_pos(
+                                ctx,
+                                &inner_ty.clone(),
+                                &SignatureDataLocation::Memory,
+                                &inner_move_ty,
+                                sub_option.clone()
+                            )
+                        );
+                    }
+                });
+                if !inner_ty_static && !options.in_place {
+                    emitln!(ctx.writer, "pos := tail"); // new position moves to tail
+                }
+                if !ty_static {
+                    emitln!(ctx.writer, "end := pos")
+                }
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding function for solidity structs
+    fn generate_abi_encoding_struct_type(
+        &mut self,
+        ctx: &Context,
+        ty: &SolidityType,
+        move_ty: &Type,
+        options: EncodingOptions,
+    ) -> String {
+        use SolidityType::*;
+        assert!(matches!(ty, Struct(_, _)), "wrong types");
+        let name_prefix = "abi_encode";
+        let ty = ty.clone();
+
+        let mut param_types = vec![];
+        let mut move_tys = vec![];
+        let mut real_offsets = vec![];
+        if let Struct(_, ty_tuples) = ty.clone() {
+            param_types = ty_tuples
+                .iter()
+                .map(|(_, _, _, _, ty)| ty.clone())
+                .collect_vec();
+            move_tys = ty_tuples
+                .iter()
+                .map(|(_, _, m_ty, _, _)| m_ty.clone())
+                .collect_vec();
+            real_offsets = ty_tuples
+                .iter()
+                .map(|(_, real_offset, _, _, _)| *real_offset)
+                .collect_vec();
+        }
+
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            mangle_solidity_types(&param_types),
+            ctx.mangle_types(&[move_ty.clone()]),
+            options.to_suffix()
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let return_value = (if ty.is_static() { "" } else { "-> end" }).to_string();
+
+        let sub_option = EncodingOptions {
+            padded: true,
+            in_place: options.in_place,
+        };
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let overall_type_head_vec = abi_head_sizes_vec(&param_types, true);
+            let overall_type_head_size = abi_head_sizes_sum(&param_types, true);
+
+            let ret_var = (0..overall_type_head_vec.len())
+                .map(|i| format!("value_{}", i))
+                .collect_vec();
+
+            emit!(ctx.writer, "(value, pos) {} ", return_value);
+            ctx.emit_block(|| {
+                emitln!(
+                    ctx.writer,
+                    "let tail := add(pos, {})",
+                    overall_type_head_size
+                );
+
+                assert!(real_offsets.len() == overall_type_head_vec.len());
+                let mut head_pos = 0;
+                for (stack_pos, (((ty, ty_size), move_ty), real_offset)) in overall_type_head_vec
+                    .iter()
+                    .zip(move_tys.iter())
+                    .zip(real_offsets.iter())
+                    .enumerate()
+                {
+                    let is_static = ty.is_static();
+                    let local_typ_var = vec![ret_var[stack_pos].clone()];
+                    let memory_func = ctx.memory_load_builtin_fun(move_ty);
+                    if local_typ_var.len() == 1 {
+                        emitln!(
+                            ctx.writer,
+                            "let {} := {}",
+                            local_typ_var[0].clone(),
+                            gen.call_builtin_str(
+                                ctx,
+                                memory_func,
+                                std::iter::once(format!("add(value, {})", real_offset))
+                            )
+                        );
+                        if options.in_place {
+                            emitln!(
+                                ctx.writer,
+                                "pos := {}({}, pos)",
+                                gen.generate_abi_encoding_type_with_updated_pos(
+                                    ctx,
+                                    &ty.clone(),
+                                    &SignatureDataLocation::Memory,
+                                    move_ty,
+                                    sub_option.clone()
+                                ),
+                                local_typ_var[0].clone()
+                            );
+                        } else {
+                            if is_static {
+                                emitln!(
+                                    ctx.writer,
+                                    "{}({}, add(pos, {}))",
+                                    gen.generate_abi_encoding_type(
+                                        ctx,
+                                        &ty.clone(),
+                                        &SignatureDataLocation::Memory,
+                                        move_ty,
+                                        sub_option.clone()
+                                    ),
+                                    local_typ_var[0].clone(),
+                                    head_pos
+                                );
+                            } else {
+                                emitln!(
+                                    ctx.writer,
+                                    "mstore(add(pos, {}), sub(tail, pos))",
+                                    head_pos
+                                );
+                                emitln!(
+                                    ctx.writer,
+                                    "tail := {}({}, tail)",
+                                    gen.generate_abi_encoding_type(
+                                        ctx,
+                                        &ty.clone(),
+                                        &SignatureDataLocation::Memory,
+                                        move_ty,
+                                        sub_option.clone()
+                                    ),
+                                    local_typ_var[0].clone()
+                                );
+                            }
+                            head_pos += ty_size;
+                        }
+                    }
+                }
+                if !ty.is_static() && options.in_place {
+                    emitln!(ctx.writer, "end := pos");
+                } else if !ty.is_static() && !options.in_place {
+                    emitln!(ctx.writer, "end := tail");
+                }
+            })
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    pub(crate) fn generate_abi_tuple_encoding(
+        &mut self,
+        ctx: &Context,
+        param_types: Vec<SolidityType>,
+        param_locs: Vec<SignatureDataLocation>,
+        move_tys: Vec<Type>,
+    ) -> String {
+        let options = EncodingOptions {
+            padded: true,
+            in_place: false,
+        };
+        let name_prefix = "abi_encode_tuple";
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            mangle_solidity_types(&param_types),
+            ctx.mangle_types(&move_tys),
+            options.to_suffix()
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let mut value_params = (0..param_types.len())
+                .map(|i| format!("value_{}", i))
+                .join(", ");
+            if !value_params.is_empty() {
+                value_params = format!(",{}", value_params);
+            }
+            emit!(ctx.writer, "(headStart {}) -> tail ", value_params);
+            ctx.emit_block(|| {
+                let overall_type_head_vec = abi_head_sizes_vec(&param_types, options.padded);
+                let overall_type_head_size = abi_head_sizes_sum(&param_types, options.padded);
+                emitln!(
+                    ctx.writer,
+                    "tail := add(headStart, {})",
+                    overall_type_head_size
+                );
+                let mut head_pos = 0;
+                for (stack_pos, (((ty, ty_size), _loc), move_ty)) in overall_type_head_vec
+                    .iter()
+                    .zip(param_locs.iter())
+                    .zip(move_tys.iter())
+                    .enumerate()
+                {
+                    let is_static = ty.is_static();
+                    let mut local_typ_var = vec![];
+                    // TODO: consider the case size_on_stack is not 1
+                    local_typ_var.push(format!("value_{}", stack_pos));
+                    let mut values = local_typ_var.iter().join(", ");
+                    let abi_encode_type =
+                        gen.generate_abi_encoding_type(ctx, ty, _loc, move_ty, options.clone());
+                    if is_static {
+                        emitln!(
+                            ctx.writer,
+                            "{}({}, add(headStart, {}))",
+                            abi_encode_type,
+                            values,
+                            head_pos
+                        );
+                    } else {
+                        // TODO: dynamic types need to be revisited
+                        emitln!(
+                            ctx.writer,
+                            "mstore(add(headStart, {}), sub(tail, headStart))",
+                            head_pos
+                        );
+                        if !values.is_empty() {
+                            values = format!("{}, ", values);
+                        }
+                        emitln!(ctx.writer, "tail := {}({} tail)", abi_encode_type, values);
+                    }
+                    head_pos += ty_size;
+                }
+            })
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encoding functions for tuple.
+    pub(crate) fn generate_abi_tuple_encoding_ret(
+        &mut self,
+        ctx: &Context,
+        sig: &SoliditySignature,
+        move_tys: Vec<Type>,
+    ) -> String {
+        let param_types = sig.ret_types.iter().map(|(ty, _)| ty.clone()).collect_vec(); // need to move into lambda
+        let param_locs = sig
+            .ret_types
+            .iter()
+            .map(|(_, loc)| loc.clone())
+            .collect_vec();
+        self.generate_abi_tuple_encoding(ctx, param_types, param_locs, move_tys)
+    }
+
+    /// Generate encoding functions for tuple in parameters.
+    pub(crate) fn generate_abi_tuple_encoding_para(
+        &mut self,
+        ctx: &Context,
+        sig: &SoliditySignature,
+        move_tys: Vec<Type>,
+        packed_flag: bool,
+    ) -> String {
+        let param_types = sig
+            .para_types
+            .iter()
+            .map(|(ty, _, _)| ty.clone())
+            .collect_vec(); // need to move into lambda
+        let param_locs = sig
+            .para_types
+            .iter()
+            .map(|(_, _, loc)| loc.clone())
+            .collect_vec();
+        if packed_flag {
+            self.generate_abi_tuple_encoding_packed(ctx, param_types, param_locs, move_tys)
+        } else {
+            self.generate_abi_tuple_encoding(ctx, param_types, param_locs, move_tys)
+        }
+    }
+
+    /// Generate encodePacked function
+    pub(crate) fn generate_abi_tuple_encoding_packed(
+        &mut self,
+        ctx: &Context,
+        param_types: Vec<SolidityType>,
+        param_locs: Vec<SignatureDataLocation>,
+        move_tys: Vec<Type>,
+    ) -> String {
+        let options = EncodingOptions {
+            padded: false,
+            in_place: true,
+        };
+        let name_prefix = "abi_encode_tuple_packed";
+        let mut function_name = format!(
+            "{}_{}_{}{}",
+            name_prefix,
+            mangle_solidity_types(&param_types),
+            ctx.mangle_types(&move_tys),
+            options.to_suffix()
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let mut value_params = (0..param_types.len())
+                .map(|i| format!("value_{}", i))
+                .join(", ");
+            if !value_params.is_empty() {
+                value_params = format!(",{}", value_params);
+            }
+            emit!(ctx.writer, "(pos {}) -> end ", value_params);
+            ctx.emit_block(|| {
+                let overall_type_head_vec = abi_head_sizes_vec(&param_types, options.padded);
+                for (stack_pos, (((ty, ty_size), _loc), move_ty)) in overall_type_head_vec
+                    .iter()
+                    .zip(param_locs.iter())
+                    .zip(move_tys.iter())
+                    .enumerate()
+                {
+                    let is_static = ty.is_static();
+                    let mut local_typ_var = vec![];
+                    // TODO: consider the case size_on_stack is not 1
+                    local_typ_var.push(format!("value_{}", stack_pos));
+                    let mut values = local_typ_var.iter().join(", ");
+                    if !values.is_empty() {
+                        values = format!("{}, ", values);
+                    }
+                    let abi_encode_type =
+                        gen.generate_abi_encoding_type(ctx, ty, _loc, move_ty, options.clone());
+                    if !is_static {
+                        // dynamic
+                        emitln!(ctx.writer, "pos := {}({} pos)", abi_encode_type, values);
+                    } else {
+                        // static
+                        emitln!(ctx.writer, "{}({} pos)", abi_encode_type, values);
+                        emitln!(ctx.writer, "pos := add(pos, {})", ty_size);
+                    }
+                }
+                emitln!(ctx.writer, "end := pos");
+            })
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    /// Generate encodePacked function with keccak256 hashing
+    pub(crate) fn generate_packed_hashed(
+        &mut self,
+        ctx: &Context,
+        tys: Vec<SolidityType>,
+        param_locs: Vec<SignatureDataLocation>,
+        move_tys: Vec<Type>,
+    ) -> String {
+        let name_prefix = "packed_hashed_";
+        let mut function_name = format!(
+            "{}_{}_{}",
+            name_prefix,
+            mangle_solidity_types(&tys),
+            ctx.mangle_types(&move_tys)
+        );
+        let re = Regex::new(r"[()\[\],]").unwrap();
+        function_name = re.replace_all(&function_name, "_").to_string();
+
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            let mut value_params = (0..tys.len()).map(|i| format!("value_{}", i)).join(", ");
+            emit!(ctx.writer, "({}) -> hash ", value_params);
+            if !value_params.is_empty() {
+                value_params = format!(",{}", value_params);
+            }
+            let generate_encoding_packed =
+                gen.generate_abi_tuple_encoding_packed(ctx, tys, param_locs, move_tys);
+            ctx.emit_block(|| {
+                emitln!(
+                    ctx.writer,
+                    "let pos := mload({})",
+                    substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+                );
+                emitln!(
+                    ctx.writer,
+                    "let end := {}(pos {})",
+                    generate_encoding_packed,
+                    value_params
+                );
+                emitln!(
+                    ctx.writer,
+                    "mstore({}, end)",
+                    substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                );
+                emitln!(ctx.writer, "hash := keccak256(pos, sub(end, pos))");
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/events.rs b/vendors/move/crates/evm/move-to-yul/src/events.rs
new file mode 100644
index 000000000..85e3f9b83
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/events.rs
@@ -0,0 +1,498 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    context::Context,
+    functions::FunctionGenerator,
+    solidity_ty::{SignatureDataLocation, SolidityType, PARSE_ERR_MSG},
+    yul_functions::substitute_placeholders,
+};
+use anyhow::{anyhow, Context as AnyhowContext};
+use itertools::Itertools;
+use move_model::{
+    emit, emitln,
+    model::{FunId, QualifiedInstId, StructEnv, StructId},
+    ty::Type,
+};
+use move_stackless_bytecode::function_target_pipeline::FunctionVariant;
+use once_cell::sync::Lazy;
+use regex::Regex;
+use sha3::{Digest, Keccak256, Sha3_256};
+use std::{fmt, fmt::Formatter};
+
+pub(crate) const COMPATIBILITY_ERROR: &str =
+    "event signature is not compatible with the move struct";
+pub(crate) const TOPIC_COUNT_ERROR: &str = "too many indexed arguments";
+
+/// Represents an event Signature appearing in the event attribute.
+#[derive(Debug, Clone)]
+pub(crate) struct EventSignature {
+    pub event_name: String,
+    pub para_types: Vec<(usize, SolidityType, Type, bool, String)>,
+    pub indexed_count: usize,
+}
+
+// ================================================================================================
+// Pretty print for EventSignature
+
+impl fmt::Display for EventSignature {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.selector_signature())
+    }
+}
+
+impl EventSignature {
+    fn get_ordered_types(st: &StructEnv<'_>) -> std::vec::IntoIter<(usize, Type, String)> {
+        st.get_fields()
+            .map(|field| {
+                let field_type = field.get_type();
+                let field_name = st.symbol_pool().string(field.get_name()).to_string();
+                (field.get_offset(), field_type, field_name)
+            })
+            .sorted_by_key(|(offset, _, _)| *offset)
+    }
+
+    /// Create a default event signature from a move struct definition
+    pub fn create_default_event_signature(ctx: &Context, st: &StructEnv<'_>) -> Self {
+        let st_name = st.symbol_pool().string(st.get_name()).to_string();
+        let mut para_type_lst = vec![];
+
+        let ordered_types = EventSignature::get_ordered_types(st);
+        for (offset, move_ty, field_name) in ordered_types
+            .map(|(offset, ty, field_name)| (offset, ty, field_name))
+            .collect_vec()
+        {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false); // implicit mapping from a move type to a solidity type
+            para_type_lst.push((offset, solidity_ty, move_ty.clone(), false, field_name));
+            // no index by default
+        }
+        EventSignature {
+            event_name: st_name,
+            para_types: para_type_lst,
+            indexed_count: 1,
+        }
+    }
+
+    /// Generate parameter list for computing the function selector
+    fn compute_param_types(&self, param_types: &[&SolidityType]) -> String {
+        let display_type_slice = |tys: &[&SolidityType]| -> String {
+            tys.iter()
+                .map(|t| format!("{}", t))
+                .collect::<Vec<_>>()
+                .join(",")
+        };
+        display_type_slice(param_types)
+    }
+
+    fn selector_signature(&self) -> String {
+        format!(
+            "{}({})",
+            self.event_name,
+            self.compute_param_types(
+                &self
+                    .para_types
+                    .iter()
+                    .map(|(_, ty, _, _, _)| ty)
+                    .collect_vec()
+            )
+        )
+    }
+
+    /// Parse the event signature
+    #[allow(clippy::needless_collect)]
+    pub fn parse_into_event_signature(
+        ctx: &Context,
+        sig_str: &str,
+        st: &StructEnv<'_>,
+    ) -> anyhow::Result<Self> {
+        // Event signature matching
+        static SIG_REG: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"^\s*(?P<sig_name>[a-zA-Z_$][a-zA-Z_$0-9]*)\s*\((?P<args>[^)]*)\)$")
+                .unwrap()
+        });
+        if let Some(parsed) = SIG_REG.captures(sig_str.trim()) {
+            let sig_name = parsed.name("sig_name").context(PARSE_ERR_MSG)?.as_str();
+            let para_type_str = parsed.name("args").context(PARSE_ERR_MSG)?.as_str();
+            let (para_types, indexed_count) =
+                EventSignature::extract_para_type_str(ctx, para_type_str)?;
+
+            // Number of topics cannot be greater than 4
+            if indexed_count > 4 {
+                return Err(anyhow!(TOPIC_COUNT_ERROR));
+            }
+
+            // Check parameter type list
+            let ordered_types = EventSignature::get_ordered_types(st);
+            let sig_para_vec = para_types.iter().map(|(ty, _)| ty).collect::<Vec<_>>();
+            if sig_para_vec.len() != ordered_types.len() {
+                return Err(anyhow!(COMPATIBILITY_ERROR));
+            }
+            let mut offset_para_types = vec![];
+            for ((off, m_ty, field_name), (s_ty, b)) in ordered_types.zip(para_types.into_iter()) {
+                if !s_ty.check_type_compatibility(ctx, &m_ty) {
+                    return Err(anyhow!(COMPATIBILITY_ERROR));
+                }
+                offset_para_types.push((off, s_ty.clone(), m_ty.clone(), b, field_name));
+            }
+
+            let event_sig = EventSignature {
+                event_name: sig_name.to_string(),
+                para_types: offset_para_types,
+                indexed_count,
+            };
+            Ok(event_sig)
+        } else {
+            Err(anyhow!(PARSE_ERR_MSG))
+        }
+    }
+
+    /// Generate pairs of solidity type and location and the number of indexed parameters
+    fn extract_para_type_str(
+        ctx: &Context,
+        args: &str,
+    ) -> anyhow::Result<(Vec<(SolidityType, bool)>, usize)> {
+        let args_trim = args.trim();
+        let mut indexed_count = 1;
+        if args_trim.is_empty() {
+            return Ok((vec![], indexed_count));
+        }
+        let mut ret_vec = vec![];
+        let paras = args_trim.split(',').collect_vec();
+        for para in paras {
+            let para_trim = para.trim();
+            if para_trim.is_empty() {
+                return Err(anyhow!(PARSE_ERR_MSG));
+            }
+            let mut index_flag = false;
+            let mut para_type_str = para_trim;
+            if let Some(stripped_indexed) = para_trim.strip_suffix("indexed") {
+                let stripped_trimmed = stripped_indexed.trim();
+                if stripped_trimmed.ends_with(']')
+                    || stripped_trimmed.len() < stripped_indexed.len()
+                {
+                    index_flag = true;
+                    indexed_count += 1;
+                    para_type_str = stripped_trimmed;
+                } else {
+                    return Err(anyhow!(PARSE_ERR_MSG));
+                }
+            }
+            let ty = SolidityType::parse(ctx, para_type_str)?;
+            ret_vec.push((ty, index_flag));
+        }
+        Ok((ret_vec, indexed_count))
+    }
+}
+
+/// Generate event emit functions for send_<name> in async move contracts
+/// example: the function send_foo(actor: address, args) will emit an ethereum event
+/// Foo(actor, message_hash, args) where encoding follows the ethereum standard
+/// TODO: add a sequence number to the event to help perform deduplication on the listener side
+pub(crate) fn define_emit_fun_for_send(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    event_sig: &EventSignature,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    let fun = ctx.env.get_function(fun_id.to_qualified_id());
+    let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+
+    // Emit function header
+    let params = (0..target.get_parameter_count()).map(|idx| ctx.make_local_name(target, idx));
+    let params_str = params.clone().join(",");
+    let params_vec = params.collect_vec();
+
+    let mut local_name_idx = target.get_parameter_count();
+
+    emit!(
+        ctx.writer,
+        "function {}({}) ",
+        ctx.make_function_name(fun_id),
+        params_str
+    );
+
+    // Generate the function body
+    ctx.emit_block(|| {
+        let signature_types = &event_sig.para_types;
+        let topic_0_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        let event_sig_str = event_sig.to_string();
+        let topic_0_hash = format!("0x{:x}", Keccak256::digest(event_sig_str.as_bytes()));
+
+        emitln!(ctx.writer, "let {} := {}", topic_0_var, topic_0_hash);
+
+        // Compute the message hash following the logic in move_compiler::attr_derivation::async_deriver::message_hash
+        // message_hash is the first 8 bytes of Sha3_256::digest(address::module_name::foo)
+        // example: 0x00000000000000000000000000000003::AccountStateMachine::deposit
+        let message_str = format!(
+            "0x{}::{}",
+            fun.module_env.self_address(),
+            fun.get_full_name_str().replace("send_", "")
+        );
+        let hash_bytes = Sha3_256::digest(message_str.as_bytes());
+        let message_hash_str = &format!("0x{:x}", hash_bytes)[0..10];
+        let message_hash_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            message_hash_var,
+            message_hash_str
+        );
+
+        let mut indexed_paras = vec![];
+        let mut indexed_vars = vec![topic_0_var];
+        let mut unindexed_paras = vec![];
+        let mut unindexed_vars = vec![];
+
+        // For async move, there is no index for any parameters
+        // TODO: consider index receipient address and hash_messages by default
+        // TODO: consider add a sig to the attribute #[message] to specify index other parameters, e.g.
+        // #message[sig=b"xfer(address indexed, address indexed, uint128 indexed)]
+        for (i, (_, solidity_ty, move_ty, indexed_flag, _)) in signature_types.iter().enumerate() {
+            let mut var = if i == 0 {
+                params_vec.get(0).unwrap().to_string()
+            } else if i == 1 {
+                message_hash_var.clone()
+            } else {
+                params_vec.get(i - 1).unwrap().to_string()
+            };
+
+            if *indexed_flag {
+                indexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                if !solidity_ty.is_value_type() {
+                    // for non-value type
+                    let new_var = ctx.make_local_name(target, local_name_idx);
+                    local_name_idx += 1;
+                    emitln!(
+                        ctx.writer,
+                        "let {} := {}({})",
+                        new_var,
+                        gen.parent.generate_packed_hashed(
+                            ctx,
+                            vec![solidity_ty.clone()],
+                            vec![SignatureDataLocation::Memory],
+                            vec![move_ty.clone()]
+                        ),
+                        var
+                    );
+                    var = new_var;
+                }
+                indexed_vars.push(var.clone());
+            } else {
+                unindexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                unindexed_vars.push(var.clone());
+            }
+        }
+
+        ctx.emit_block(|| {
+            let pos_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            let end_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(
+                ctx.writer,
+                "let {} := mload({})",
+                pos_var,
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+            );
+            // Create dummy signature location
+            let sig_para_locs = vec![SignatureDataLocation::Memory; unindexed_paras.len()];
+            let para_types = unindexed_paras
+                .iter()
+                .map(|(_, move_ty)| move_ty.clone())
+                .collect_vec();
+            let sig_para_vec = unindexed_paras
+                .iter()
+                .map(|(solidity_ty, _)| solidity_ty.clone())
+                .collect_vec();
+            // Generate encoding function for unindexed parameters
+            let encode_unindexed = gen.parent.generate_abi_tuple_encoding(
+                ctx,
+                sig_para_vec,
+                sig_para_locs,
+                para_types,
+            );
+            let unindexed_str = if !unindexed_vars.is_empty() {
+                format!(", {}", unindexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "let {} := {}({}{})",
+                end_var,
+                encode_unindexed,
+                pos_var,
+                unindexed_str
+            );
+            // Generate the code to call log opcode
+            let indexed_str = if !indexed_vars.is_empty() {
+                format!(", {}", indexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "log{}({}, sub({}, {}){})",
+                event_sig.indexed_count,
+                pos_var,
+                end_var,
+                pos_var,
+                indexed_str
+            );
+            emitln!(
+                ctx.writer,
+                "mstore({}, {})",
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                end_var
+            );
+        });
+    });
+}
+
+/// Generate emit functions
+pub(crate) fn define_emit_fun(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    event_sig: &EventSignature,
+    st_id: &QualifiedInstId<StructId>,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    let fun = ctx.env.get_function(fun_id.to_qualified_id());
+    let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+    assert!(
+        target.get_parameter_count() == 1,
+        "parameter number must be 1"
+    );
+
+    // Emit function header
+    let param_name = ctx.make_local_name(target, 0);
+    let mut local_name_idx = 1;
+    emit!(
+        ctx.writer,
+        "function {}({}) ",
+        ctx.make_function_name(fun_id),
+        param_name
+    );
+
+    // Obtain the layout of the struct
+    let layout = ctx.get_struct_layout(st_id);
+
+    // Generate the function body
+    ctx.emit_block(|| {
+        let signature_types = &event_sig.para_types;
+        let topic_0_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        let event_sig_str = event_sig.to_string();
+        let topic_0_hash = format!("0x{:x}", Keccak256::digest(event_sig_str.as_bytes()));
+
+        emitln!(ctx.writer, "let {} := {}", topic_0_var, topic_0_hash);
+        let mut indexed_paras = vec![];
+        let mut indexed_vars = vec![topic_0_var];
+        let mut unindexed_paras = vec![];
+        let mut unindexed_vars = vec![];
+        for (offset, solidity_ty, move_ty, indexed_flag, _) in signature_types {
+            let (real_offset, _) = layout.offsets.get(offset).unwrap();
+            let mut var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            let memory_func = ctx.memory_load_builtin_fun(move_ty);
+            let load_fun = gen.parent.call_builtin_str(
+                ctx,
+                memory_func,
+                std::iter::once(format!("add({}, {})", param_name, real_offset)),
+            );
+            emitln!(ctx.writer, "let {} := {}", var, load_fun);
+            if *indexed_flag {
+                indexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                if !solidity_ty.is_value_type() {
+                    // for non-value type
+                    let new_var = ctx.make_local_name(target, local_name_idx);
+                    local_name_idx += 1;
+                    emitln!(
+                        ctx.writer,
+                        "let {} := {}({})",
+                        new_var,
+                        gen.parent.generate_packed_hashed(
+                            ctx,
+                            vec![solidity_ty.clone()],
+                            vec![SignatureDataLocation::Memory],
+                            vec![move_ty.clone()]
+                        ),
+                        var
+                    );
+                    var = new_var;
+                }
+                indexed_vars.push(var.clone());
+            } else {
+                unindexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                unindexed_vars.push(var.clone());
+            }
+        }
+
+        ctx.emit_block(|| {
+            let pos_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            let end_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(
+                ctx.writer,
+                "let {} := mload({})",
+                pos_var,
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+            );
+            // Create dummy signature location
+            let sig_para_locs = vec![SignatureDataLocation::Memory; unindexed_paras.len()];
+            let para_types = unindexed_paras
+                .iter()
+                .map(|(_, move_ty)| move_ty.clone())
+                .collect_vec();
+            let sig_para_vec = unindexed_paras
+                .iter()
+                .map(|(solidity_ty, _)| solidity_ty.clone())
+                .collect_vec();
+            // Generate encoding function for unindexed parameters
+            let encode_unindexed = gen.parent.generate_abi_tuple_encoding(
+                ctx,
+                sig_para_vec,
+                sig_para_locs,
+                para_types,
+            );
+            let unindexed_str = if !unindexed_vars.is_empty() {
+                format!(", {}", unindexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "let {} := {}({}{})",
+                end_var,
+                encode_unindexed,
+                pos_var,
+                unindexed_str
+            );
+            // Generate the code to call log opcode
+            let indexed_str = if !indexed_vars.is_empty() {
+                format!(", {}", indexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "log{}({}, sub({}, {}){})",
+                event_sig.indexed_count,
+                pos_var,
+                end_var,
+                pos_var,
+                indexed_str
+            );
+            emitln!(
+                ctx.writer,
+                "mstore({}, {})",
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                end_var
+            );
+        });
+    });
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/evm_transformation.rs b/vendors/move/crates/evm/move-to-yul/src/evm_transformation.rs
new file mode 100644
index 000000000..f9e518670
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/evm_transformation.rs
@@ -0,0 +1,123 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Performs transformations specific for compiling stackless bytecode to
+//! EVM bytecode. Right now it only contains conversions of U256 native functions.
+
+use crate::attributes;
+use ethnum::U256;
+use move_model::model::FunctionEnv;
+use move_stackless_bytecode::{
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{Bytecode, Constant, Operation},
+};
+
+const CAST_TO_U256_FUNCTION_NAME: &str = "u256_from_words";
+
+pub struct EvmTransformationProcessor {}
+
+impl EvmTransformationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(EvmTransformationProcessor {})
+    }
+}
+
+impl FunctionTargetProcessor for EvmTransformationProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() || func_env.is_intrinsic() {
+            return data;
+        }
+        for code_offset in 0..data.code.len() {
+            let bytecode = &data.code[code_offset];
+            if let Bytecode::Call(
+                attr_id,
+                dst,
+                Operation::Function(module_id, fun_id, _),
+                src,
+                abort_condition,
+            ) = bytecode
+            {
+                if attributes::is_evm_arith_module(&func_env.module_env.env.get_module(*module_id))
+                {
+                    let fun_name = &*func_env
+                        .module_env
+                        .env
+                        .get_module(*module_id)
+                        .get_function(*fun_id)
+                        .get_simple_name_string();
+                    if fun_name.eq(CAST_TO_U256_FUNCTION_NAME) {
+                        assert!(code_offset >= 2);
+                        match (
+                            get_loaded_u128(&data.code[code_offset - 2]),
+                            get_loaded_u128(&data.code[code_offset - 1]),
+                        ) {
+                            (Some(hi), Some(lo)) => {
+                                data.code[code_offset] = Bytecode::Load(
+                                    *attr_id,
+                                    dst[0],
+                                    Constant::U256(U256::from_words(hi, lo)),
+                                );
+                            },
+                            _ => {
+                                data.code[code_offset] = Bytecode::Call(
+                                    *attr_id,
+                                    dst.clone(),
+                                    Operation::CastU256,
+                                    src.clone(),
+                                    abort_condition.clone(),
+                                );
+                            },
+                        }
+                    } else if let Some(new_op) = transform_u256_op(fun_name) {
+                        data.code[code_offset] = Bytecode::Call(
+                            *attr_id,
+                            dst.clone(),
+                            new_op,
+                            src.clone(),
+                            abort_condition.clone(),
+                        );
+                    }
+                }
+            };
+        }
+        data
+    }
+
+    fn name(&self) -> String {
+        "evm_transformation".to_string()
+    }
+}
+
+fn get_loaded_u128(bc: &Bytecode) -> Option<u128> {
+    if let Bytecode::Load(_, _, Constant::U128(x)) = bc {
+        return Some(*x);
+    }
+    None
+}
+
+fn transform_u256_op(fun_name: &str) -> Option<Operation> {
+    match fun_name {
+        "add" => Some(Operation::Add),
+        "sub" => Some(Operation::Sub),
+        "mul" => Some(Operation::Mul),
+        "div" => Some(Operation::Div),
+        "mod" => Some(Operation::Mod),
+        "eq" => Some(Operation::Eq),
+        "ne" => Some(Operation::Neq),
+        "gt" => Some(Operation::Gt),
+        "lt" => Some(Operation::Lt),
+        "ge" => Some(Operation::Ge),
+        "le" => Some(Operation::Le),
+        "shl" => Some(Operation::Shl),
+        "shr" => Some(Operation::Shr),
+        _ => None,
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/experiments.rs b/vendors/move/crates/evm/move-to-yul/src/experiments.rs
new file mode 100644
index 000000000..d5fc9a176
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/experiments.rs
@@ -0,0 +1,28 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/// Container for experiments in the compiler. Those can be activated
+/// via the `--experiment=<name>` flag.
+///
+/// One can activate an experiment in a test source by using a comment as such:
+/// ```
+///   // experiment: <name>
+/// ```
+/// This can be repeated an arbitrary number of times. The test will then be run for
+/// the default configuration and for each of the named experiments separately (if it is a
+/// baseline test, a different baseline file will be generated each time).
+///
+/// Each new experiment should have a description and explicit note about its retention.
+///
+/// - Permanent: the experiment is available indefinitely
+/// - Temporary: the experiment is intended to be removed after some time. Please document
+///   the condition under which it can be removed.
+pub struct Experiment();
+
+impl Experiment {
+    /// Capture source information in baseline generation when running a test. By default,
+    /// during tests this is off.
+    /// Retention: permanent
+    pub const CAPTURE_SOURCE_INFO: &'static str = "capture-source-info";
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/external_functions.rs b/vendors/move/crates/evm/move-to-yul/src/external_functions.rs
new file mode 100644
index 000000000..b1a27ef09
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/external_functions.rs
@@ -0,0 +1,535 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    context::Context,
+    dispatcher_generator::TARGET_CONTRACT_DOES_NOT_CONTAIN_CODE,
+    functions::FunctionGenerator,
+    native_functions::NativeFunctions,
+    solidity_ty::{abi_head_sizes_sum, SignatureDataLocation, SoliditySignature, SolidityType},
+    yul_functions::{substitute_placeholders, YulFunction},
+};
+use itertools::Itertools;
+use move_model::{
+    emit, emitln,
+    model::{FunId, FunctionEnv, Parameter, QualifiedInstId},
+    ty::Type,
+};
+use move_stackless_bytecode::function_target_pipeline::FunctionVariant;
+use sha3::{Digest, Keccak256};
+
+impl NativeFunctions {
+    /// Generate external functions
+    pub(crate) fn define_external_fun(
+        &self,
+        gen: &mut FunctionGenerator,
+        ctx: &Context,
+        fun_id: &QualifiedInstId<FunId>,
+        solidity_sig_str_opt: Option<String>,
+    ) {
+        let fun = ctx.env.get_function(fun_id.to_qualified_id());
+        let (external_flag, result_ty) = self.check_external_result(ctx, &fun);
+        let mut sig = SoliditySignature::create_default_solidity_signature_for_external_fun(
+            ctx,
+            &fun,
+            result_ty.clone(),
+        );
+        if let Some(solidity_sig_str) = solidity_sig_str_opt {
+            let parsed_sig_opt = SoliditySignature::parse_into_solidity_signature(
+                ctx,
+                &solidity_sig_str,
+                &fun,
+                &None,
+            );
+            // Check compatibility
+            if let Ok(parsed_sig) = parsed_sig_opt {
+                sig = parsed_sig;
+            } else if let Err(msg) = parsed_sig_opt {
+                ctx.env.error(&fun.get_loc(), &format!("{}", msg));
+                return;
+            }
+        }
+        if !sig.check_sig_compatibility_for_external_fun(ctx, &fun, result_ty.clone()) {
+            ctx.env.error(
+                &fun.get_loc(),
+                "solidity signature is not compatible with the move signature",
+            );
+            return;
+        }
+
+        let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+
+        // Emit function header
+        let params = (0..target.get_parameter_count())
+            .map(|idx| ctx.make_local_name(target, idx))
+            .join(", ");
+        let results = if target.get_return_count() == 0 {
+            "".to_string()
+        } else {
+            (0..target.get_return_count())
+                .map(|i| ctx.make_result_name(target, i))
+                .join(", ")
+        };
+        let ret_results = if results.is_empty() {
+            "".to_string()
+        } else {
+            format!(" -> {} ", results)
+        };
+        emit!(
+            ctx.writer,
+            "function {}({}){} ",
+            ctx.make_function_name(fun_id),
+            params,
+            ret_results
+        );
+        let failure_call = gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::Abort,
+            std::iter::once(TARGET_CONTRACT_DOES_NOT_CONTAIN_CODE.to_string()),
+        );
+        let revert_forward =
+            gen.parent
+                .call_builtin_str(ctx, YulFunction::RevertForward, vec![].into_iter());
+        // Prepare variables used in the function
+        let contract_addr_var = ctx.make_local_name(target, 0); // the first parameter is the address of the target contract
+        let mut local_name_idx = target.get_parameter_count(); // local variable
+        let pos_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        let end_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        let success_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        // Generate the function body
+        ctx.emit_block(|| {
+            if target.get_return_count() == 0 || ctx.is_unit_opt_ty(result_ty.clone()) {
+                // Check extcodesize if no return data is expected
+                emitln!(
+                    ctx.writer,
+                    "if iszero(extcodesize({})) {{ {} }}",
+                    contract_addr_var,
+                    failure_call
+                );
+            }
+            emitln!(ctx.writer, "// storage for arguments and returned data");
+            emitln!(
+                ctx.writer,
+                "let {} := mload({})",
+                pos_var,
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+            );
+
+            let fun_sig = format!("{}", sig);
+            let function_selector =
+                format!("0x{:x}", Keccak256::digest(fun_sig.as_bytes()))[..10].to_string();
+            let para_vec = vec![function_selector, "224".to_string()];
+            let shl224 =
+                gen.parent
+                    .call_builtin_str(ctx, YulFunction::Shl, para_vec.iter().cloned());
+
+            emitln!(ctx.writer, "mstore({}, {})", pos_var, shl224);
+            let mut encode_params = "".to_string();
+            if target.get_parameter_count() > 1 {
+                encode_params = format!(
+                    ", {}",
+                    (1..target.get_parameter_count())
+                        .map(|idx| ctx.make_local_name(target, idx))
+                        .join(", ")
+                );
+            }
+
+            let mut para_types = fun.get_parameter_types();
+            if para_types.len() > 1 {
+                para_types = para_types[1..].to_vec();
+            } else {
+                para_types = vec![];
+            }
+            let sig_para_vec = sig
+                .para_types
+                .clone()
+                .into_iter()
+                .map(|(ty, _, _)| ty)
+                .collect::<Vec<_>>();
+            let sig_para_locs = sig
+                .para_types
+                .clone()
+                .into_iter()
+                .map(|(_, _, loc)| loc)
+                .collect_vec();
+            let encode = gen.parent.generate_abi_tuple_encoding(
+                ctx,
+                sig_para_vec,
+                sig_para_locs,
+                para_types,
+            );
+            emitln!(
+                ctx.writer,
+                "let {} := {}(add({}, 4){})",
+                end_var,
+                encode,
+                pos_var,
+                encode_params
+            );
+
+            // Make the call
+            let mut call = "call".to_string();
+            let is_delegatecall = self.is_delegate(ctx, fun_id);
+            let is_staticcall = self.is_static(ctx, fun_id);
+            if is_delegatecall {
+                call = "delegatecall".to_string();
+            } else if is_staticcall {
+                call = "staticcall".to_string();
+            }
+            let gas = "gas()".to_string(); // TODO: set gas?
+            let mut value = "".to_string();
+            if !is_delegatecall && !is_staticcall {
+                value = "0, ".to_string(); // TODO: allow sending eth along with making the external call?
+            }
+            let sig_ret_vec = sig
+                .ret_types
+                .clone()
+                .into_iter()
+                .map(|(ty, _)| ty)
+                .collect::<Vec<_>>();
+            let dynamic_return = self.check_dynamic(&sig_ret_vec);
+            let estimated_size = if dynamic_return {
+                0
+            } else {
+                abi_head_sizes_sum(&sig_ret_vec, true)
+            };
+            emitln!(
+                ctx.writer,
+                "let {} := {}({}, {}, {} {}, sub({}, {}), {}, {})",
+                success_var,
+                call,
+                gas,
+                contract_addr_var,
+                value,
+                pos_var,
+                end_var,
+                pos_var,
+                pos_var,
+                estimated_size
+            );
+            let return_size = "returndatasize()".to_string();
+            emitln!(ctx.writer, "// set freeMemoryPointer");
+            emitln!(
+                ctx.writer,
+                "mstore({}, {})",
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                end_var
+            );
+            if !external_flag {
+                emitln!(
+                    ctx.writer,
+                    "if iszero({}) {{ {} }}",
+                    success_var,
+                    revert_forward
+                );
+                emit!(ctx.writer, "if {} ", success_var);
+            } else {
+                emitln!(ctx.writer, "switch iszero({})", success_var);
+                emit!(ctx.writer, "case 0 ");
+            }
+            ctx.emit_block(|| {
+                if dynamic_return {
+                    emitln!(ctx.writer, "// copy dynamic return data out");
+                    emitln!(
+                        ctx.writer,
+                        "returndatacopy({}, 0, returndatasize())",
+                        pos_var
+                    );
+                }
+                emitln!(
+                    ctx.writer,
+                    "// decode return parameters from external try-call into retVars"
+                );
+                let fun_ret_types = if external_flag {
+                    if ctx.is_unit_opt_ty(result_ty.clone()) {
+                        vec![]
+                    } else {
+                        vec![result_ty.clone().unwrap()]
+                    }
+                } else {
+                    fun.get_return_types()
+                };
+                if !fun_ret_types.is_empty() {
+                    emit!(ctx.writer, "{} := ", results);
+                }
+                let abi_decode_from_memory =
+                    gen.parent
+                        .generate_abi_tuple_decoding_ret(ctx, &sig, fun_ret_types, true);
+                emitln!(
+                    ctx.writer,
+                    "{}({}, add({}, {}))",
+                    abi_decode_from_memory,
+                    pos_var,
+                    pos_var,
+                    return_size
+                );
+                if external_flag {
+                    let result_0 = ctx.make_result_name(target, 0);
+                    if !ctx.is_unit_opt_ty(result_ty.clone()) {
+                        self.generate_external_result_fun(
+                            gen,
+                            ctx,
+                            "ok",
+                            &result_0,
+                            result_ty.clone(),
+                        );
+                    }
+                }
+            });
+            if external_flag {
+                emit!(ctx.writer, "default ");
+                let default_failure_var = ctx.make_local_name(target, local_name_idx);
+                local_name_idx += 1;
+                let result_0 = ctx.make_result_name(target, 0);
+                ctx.emit_block(|| {
+                    emitln!(ctx.writer, "let {} := 1", default_failure_var);
+                    emitln!(
+                        ctx.writer,
+                        "switch {}",
+                        gen.parent.call_builtin_str(
+                            ctx,
+                            YulFunction::ReturnDataSelector,
+                            vec![].into_iter()
+                        )
+                    );
+                    // pack err_reason
+                    let selector_reason =
+                        format!("0x{:x}", Keccak256::digest("Error(string)".as_bytes()))[..10]
+                            .to_string();
+                    emit!(ctx.writer, "case {} ", selector_reason);
+                    ctx.emit_block(|| {
+                        emitln!(
+                            ctx.writer,
+                            "{} := {}",
+                            result_0,
+                            gen.parent.call_builtin_str(
+                                ctx,
+                                YulFunction::TryDecodeErrMsg,
+                                vec![].into_iter()
+                            )
+                        );
+                        emit!(ctx.writer, "if {} ", result_0);
+                        ctx.emit_block(|| {
+                            emitln!(ctx.writer, "{} := 0", default_failure_var);
+                            self.generate_external_result_fun(
+                                gen,
+                                ctx,
+                                "err_reason",
+                                &result_0,
+                                result_ty.clone(),
+                            );
+                        });
+                    });
+                    // pack panic
+                    let selector_panic =
+                        format!("0x{:x}", Keccak256::digest("Panic(uint256)".as_bytes()))[..10]
+                            .to_string();
+                    emit!(ctx.writer, "case {} ", selector_panic);
+                    ctx.emit_block(|| {
+                        let panic_success_var = ctx.make_local_name(target, local_name_idx);
+                        local_name_idx += 1;
+                        let panic_result = ctx.make_local_name(target, local_name_idx);
+                        local_name_idx += 1;
+                        emitln!(
+                            ctx.writer,
+                            "let {}, {} := {}",
+                            panic_success_var,
+                            panic_result,
+                            gen.parent.call_builtin_str(
+                                ctx,
+                                YulFunction::TryDecodePanicData,
+                                vec![].into_iter()
+                            )
+                        );
+                        emit!(ctx.writer, "if {} ", panic_success_var);
+                        ctx.emit_block(|| {
+                            emitln!(ctx.writer, "{} := 0", default_failure_var);
+                            emitln!(ctx.writer, "{} := {}", result_0, panic_result);
+                            self.generate_external_result_fun(
+                                gen,
+                                ctx,
+                                "panic",
+                                &result_0,
+                                result_ty.clone(),
+                            );
+                        });
+                    });
+                    // pack err_data
+                    emit!(ctx.writer, "if {} ", default_failure_var);
+                    ctx.emit_block(|| {
+                        emitln!(
+                            ctx.writer,
+                            "{} := {}",
+                            result_0,
+                            gen.parent.call_builtin_str(
+                                ctx,
+                                YulFunction::PackErrData,
+                                vec![].into_iter()
+                            )
+                        );
+                        self.generate_external_result_fun(
+                            gen,
+                            ctx,
+                            "err_data",
+                            &result_0,
+                            result_ty.clone(),
+                        );
+                    });
+                });
+            }
+        });
+    }
+
+    fn generate_external_result_fun(
+        &self,
+        gen: &mut FunctionGenerator,
+        ctx: &Context,
+        fun_name: &str,
+        target_var: &str,
+        inst_ty: Option<Type>,
+    ) {
+        let f_opt = self.find_fun(
+            ctx,
+            &self.find_module(ctx, "0x2", "ExternalResult"),
+            fun_name,
+        );
+        if let Some(f) = f_opt {
+            if let Some(move_ty) = inst_ty {
+                let fun_id = &f.instantiate(vec![move_ty]);
+                let function_name = ctx.make_function_name(fun_id);
+                gen.parent.need_move_function(fun_id);
+                emitln!(
+                    ctx.writer,
+                    "{} := {}({})",
+                    target_var,
+                    function_name,
+                    target_var
+                );
+            }
+        }
+    }
+
+    fn check_external_result(&self, ctx: &Context, fun: &FunctionEnv) -> (bool, Option<Type>) {
+        if fun.get_return_count() == 1 {
+            let ret_type = &fun.get_return_types()[0];
+            return ctx.extract_external_result(ret_type);
+        }
+        (false, None)
+    }
+
+    fn check_dynamic(&self, types: &[SolidityType]) -> bool {
+        types.iter().any(|a| !a.is_static())
+    }
+
+    /// Placeholder for checking whether to make a delegate call
+    fn is_delegate(&self, _ctx: &Context, _fun_id: &QualifiedInstId<FunId>) -> bool {
+        false
+    }
+
+    /// Placeholder for checking whether to make a static call
+    fn is_static(&self, _ctx: &Context, _fun_id: &QualifiedInstId<FunId>) -> bool {
+        false
+    }
+}
+
+impl SoliditySignature {
+    /// Create a default solidity signature from a move function signature
+    pub(crate) fn create_default_solidity_signature_for_external_fun(
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+        external_result_ty_opt: Option<Type>,
+    ) -> Self {
+        let fun_name = fun.symbol_pool().string(fun.get_name()).to_string();
+        let mut para_type_lst = vec![];
+        if fun.get_parameter_count() < 1 {
+            ctx.env.error(
+                &fun.get_loc(),
+                "external function must have at least one argument",
+            );
+        } else {
+            for Parameter(para_name, move_ty) in fun.get_parameters().into_iter().skip(1) {
+                let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false); // implicit mapping from a move type to a solidity type
+                para_type_lst.push((
+                    solidity_ty,
+                    fun.symbol_pool().string(para_name).to_string(),
+                    SignatureDataLocation::Memory, // memory is used by default
+                ));
+            }
+        }
+
+        let mut ret_type_lst = vec![];
+        if let Some(move_ty) = external_result_ty_opt {
+            if !ctx.is_unit_ty(&move_ty) {
+                let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false);
+                ret_type_lst.push((solidity_ty, SignatureDataLocation::Memory));
+            }
+        } else {
+            for move_ty in fun.get_return_types() {
+                let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false);
+                ret_type_lst.push((solidity_ty, SignatureDataLocation::Memory));
+            }
+        }
+
+        SoliditySignature {
+            sig_name: fun_name,
+            para_types: para_type_lst,
+            ret_types: ret_type_lst,
+        }
+    }
+
+    /// Check whether the user defined solidity signature is compatible with the Move signature
+    pub(crate) fn check_sig_compatibility_for_external_fun(
+        &self,
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+        ty_opt: Option<Type>,
+    ) -> bool {
+        let para_types = fun.get_parameter_types();
+        let sig_para_vec = self
+            .para_types
+            .iter()
+            .map(|(ty, _, _)| ty)
+            .collect::<Vec<_>>();
+        if para_types.len() != sig_para_vec.len() + 1 {
+            // the extra (first) parameter of the move function is the address of the target contract
+            return false;
+        }
+        if !para_types[0].is_address() {
+            return false;
+        }
+        // Check parameter type list
+        for type_pair in para_types[1..].iter().zip(sig_para_vec.iter()) {
+            let (m_ty, s_ty) = type_pair;
+            if !s_ty.check_type_compatibility(ctx, m_ty) {
+                return false;
+            }
+        }
+        // Check return type list
+        let sig_ret_vec = self.ret_types.iter().map(|(ty, _)| ty).collect::<Vec<_>>();
+        if let Some(m_ty) = ty_opt {
+            // Special case for checking Unit type
+            if sig_ret_vec.is_empty() && ctx.is_unit_ty(&m_ty) {
+                return true;
+            }
+            if sig_ret_vec.len() != 1 || !sig_ret_vec[0].check_type_compatibility(ctx, &m_ty) {
+                return false;
+            }
+        } else {
+            let ret_types = fun.get_return_types();
+            if ret_types.len() != sig_ret_vec.len() {
+                return false;
+            }
+            for type_pair in ret_types.iter().zip(sig_ret_vec.iter()) {
+                let (m_ty, s_ty) = type_pair;
+                if !s_ty.check_type_compatibility(ctx, m_ty) {
+                    return false;
+                }
+            }
+        }
+        true
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/functions.rs b/vendors/move/crates/evm/move-to-yul/src/functions.rs
new file mode 100644
index 000000000..bb017cad9
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/functions.rs
@@ -0,0 +1,1116 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{context::Context, yul_functions, yul_functions::YulFunction, Generator};
+use itertools::Itertools;
+use move_model::{
+    ast::TempIndex,
+    emit, emitln,
+    model::{FunId, ModuleId, QualifiedInstId, StructId},
+    ty::{PrimitiveType, Type},
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget,
+    function_target_pipeline::FunctionVariant,
+    stackless_bytecode::{Bytecode, Constant, Label, Operation},
+    stackless_control_flow_graph::{BlockContent, BlockId, StacklessControlFlowGraph},
+};
+use std::collections::{btree_map::Entry, BTreeMap};
+
+/// Mutable state of the function generator.
+pub(crate) struct FunctionGenerator<'a> {
+    /// The parent generator.
+    pub(crate) parent: &'a mut Generator,
+    /// A mapping from locals of the currently compiled functions from which a reference is
+    /// borrowed, to the position in a memory region where these locals have evaded to.
+    /// All borrowed_locals have a consecutive position in this mapping, starting at zero.
+    borrowed_locals: BTreeMap<TempIndex, usize>,
+}
+
+impl<'a> FunctionGenerator<'a> {
+    /// Run the function generator for the given function
+    pub fn run(parent: &'a mut Generator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+        let mut fun_gen = Self {
+            parent,
+            borrowed_locals: Default::default(),
+        };
+        fun_gen.function(ctx, fun_id);
+    }
+
+    /// Generate Yul function for Move function.
+    fn function(&mut self, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+        let fun = &ctx.env.get_function(fun_id.to_qualified_id());
+        // TODO: change back to is_native_or_intrinsic if we decide to implement
+        // intrinsic functions (such as reverse, contains, is_empty) in the Vector module as well
+        // TODO: create a compilation flag to gate "send_"
+        if fun.is_native() || fun.get_full_name_str().contains("send_") {
+            // Special treatment for native functions, which have custom generators.
+            ctx.native_funs.gen_native_function(self, ctx, fun_id);
+            return;
+        }
+
+        let target = &ctx.targets.get_target(fun, &FunctionVariant::Baseline);
+
+        // Emit function header
+        let params = (0..target.get_parameter_count())
+            .map(|idx| ctx.make_local_name(target, idx))
+            .join(", ");
+        let results = if target.get_return_count() == 0 {
+            "".to_string()
+        } else {
+            format!(
+                " -> {}",
+                (0..target.get_return_count())
+                    .map(|i| ctx.make_result_name(target, i))
+                    .join(", ")
+            )
+        };
+        emit!(
+            ctx.writer,
+            "function {}({}){} ",
+            ctx.make_function_name(fun_id),
+            params,
+            results,
+        );
+        ctx.emit_block(|| {
+            // Emit function locals
+            self.collect_borrowed_locals(ctx, target);
+            let locals = (target.get_parameter_count()..target.get_local_count())
+                // filter locals which are not evaded to memory
+                .filter(|idx| !self.borrowed_locals.contains_key(idx))
+                .map(|idx| ctx.make_local_name(target, idx))
+                .join(", ");
+            if !locals.is_empty() {
+                emitln!(ctx.writer, "let {}", locals);
+            }
+            if !self.borrowed_locals.is_empty() {
+                // These locals are evaded to memory, as references to them are borrowed.
+                // Allocate a chunk of memory for them.
+                self.parent.call_builtin_with_result(
+                    ctx,
+                    "let ",
+                    std::iter::once("$locals".to_string()),
+                    YulFunction::Malloc,
+                    std::iter::once(
+                        (self.borrowed_locals.len() * yul_functions::WORD_SIZE).to_string(),
+                    ),
+                );
+                // For all evaded locals which are parameters, we need to initialize them from
+                // the Yul parameter.
+                for idx in self.borrowed_locals.keys() {
+                    if *idx < target.get_parameter_count() {
+                        self.assign(ctx, target, *idx, ctx.make_local_name(target, *idx))
+                    }
+                }
+            }
+
+            // Compute control flow graph, entry block, and label map
+            let code = target.data.code.as_slice();
+            let cfg = StacklessControlFlowGraph::new_forward(code);
+            let entry_bb = Self::get_actual_entry_block(&cfg);
+            let label_map = Self::compute_label_map(&cfg, code);
+
+            // Emit state machine to represent control flow.
+            // TODO: Eliminate the need for this, see also
+            //    https://medium.com/leaningtech/solving-the-structured-control-flow-problem-once-and-for-all-5123117b1ee2
+            if cfg.successors(entry_bb).iter().all(|b| cfg.is_dummmy(*b)) {
+                // In this trivial case, we have only one block and can omit the state machine
+                if let BlockContent::Basic { lower, upper } = cfg.content(entry_bb) {
+                    for offs in *lower..*upper + 1 {
+                        self.bytecode(ctx, fun_id, target, &label_map, &code[offs as usize], false);
+                    }
+                } else {
+                    panic!("effective entry block is not basic")
+                }
+            } else {
+                emitln!(ctx.writer, "let $block := {}", entry_bb);
+                emit!(ctx.writer, "for {} true {} ");
+                ctx.emit_block(|| {
+                    emitln!(ctx.writer, "switch $block");
+                    for blk_id in &cfg.blocks() {
+                        if let BlockContent::Basic { lower, upper } = cfg.content(*blk_id) {
+                            // Emit code for this basic block.
+                            emit!(ctx.writer, "case {} ", blk_id);
+                            ctx.emit_block(|| {
+                                for offs in *lower..*upper + 1 {
+                                    self.bytecode(
+                                        ctx,
+                                        fun_id,
+                                        target,
+                                        &label_map,
+                                        &code[offs as usize],
+                                        true,
+                                    );
+                                }
+                            })
+                        }
+                    }
+                })
+            }
+        });
+        emitln!(ctx.writer)
+    }
+
+    /// Compute the locals in the given function which are borrowed from and which are not
+    /// already indirections to memory (like structs or vectors) Such locals need
+    /// to be evaded to memory and cannot be kept on the stack, so we can create references
+    /// to them.
+    fn collect_borrowed_locals(&mut self, ctx: &Context, target: &FunctionTarget) {
+        let mut mem_pos = 0;
+        for bc in &target.data.code {
+            if let Bytecode::Call(_, _, Operation::BorrowLoc, srcs, _) = bc {
+                let ty = target.get_local_type(srcs[0]);
+                if !ctx.type_is_struct(ty) {
+                    if let Entry::Vacant(e) = self.borrowed_locals.entry(srcs[0]) {
+                        e.insert(mem_pos);
+                        mem_pos += 1
+                    }
+                }
+            }
+        }
+    }
+
+    /// Get the actual entry block, skipping trailing dummy blocks.
+    fn get_actual_entry_block(cfg: &StacklessControlFlowGraph) -> BlockId {
+        let mut entry_bb = cfg.entry_block();
+        while cfg.is_dummmy(entry_bb) {
+            assert_eq!(cfg.successors(entry_bb).len(), 1);
+            entry_bb = *cfg.successors(entry_bb).iter().last().unwrap();
+        }
+        entry_bb
+    }
+
+    /// Compute a map from labels to block ids which those labels start.
+    fn compute_label_map(
+        cfg: &StacklessControlFlowGraph,
+        code: &[Bytecode],
+    ) -> BTreeMap<Label, BlockId> {
+        let mut map = BTreeMap::new();
+        for id in cfg.blocks() {
+            if let BlockContent::Basic { lower, .. } = cfg.content(id) {
+                if let Bytecode::Label(_, l) = &code[*lower as usize] {
+                    map.insert(*l, id);
+                }
+            }
+        }
+        map
+    }
+}
+
+// ================================================================================================
+// Bytecode
+
+impl<'a> FunctionGenerator<'a> {
+    /// Generate Yul statement for a bytecode.
+    fn bytecode(
+        &mut self,
+        ctx: &Context,
+        fun_id: &QualifiedInstId<FunId>,
+        target: &FunctionTarget,
+        label_map: &BTreeMap<Label, BlockId>,
+        bc: &Bytecode,
+        has_flow: bool,
+    ) {
+        use Bytecode::*;
+        emitln!(
+            ctx.writer,
+            "// {}",
+            bc.display(target, &BTreeMap::default())
+        );
+        let print_loc = || {
+            if ctx.options.generate_source_info() {
+                let loc = target.get_bytecode_loc(bc.get_attr_id());
+                emitln!(
+                    ctx.writer,
+                    "/// @src {}:{}:{}",
+                    ctx.file_id_map
+                        .get(&loc.file_id())
+                        .expect("file id defined")
+                        .0,
+                    loc.span().start(),
+                    loc.span().end()
+                );
+            }
+        };
+        let get_block = |l| label_map.get(l).expect("label has corresponding block");
+        // Need to make a clone below to avoid cascading borrow problems. We don't want the
+        // subsequent lambdas to access self.
+        let borrowed_locals = self.borrowed_locals.clone();
+        let local = |l: &TempIndex| {
+            if let Some(ptr) = Self::local_ptr(&borrowed_locals, *l) {
+                format!("mload({})", ptr)
+            } else {
+                ctx.make_local_name(target, *l)
+            }
+        };
+        let make_struct_id = |m: &ModuleId, s: &StructId, inst: &[Type]| {
+            m.qualified(*s)
+                .instantiate(Type::instantiate_slice(inst, &fun_id.inst))
+        };
+        let get_local_type = |idx: TempIndex| target.get_local_type(idx).instantiate(&fun_id.inst);
+        let mut builtin = |yul_fun: YulFunction, dest: &[TempIndex], srcs: &[TempIndex]| {
+            print_loc();
+            emitln!(
+                ctx.writer,
+                "{} := {}",
+                local(&dest[0]),
+                self.parent
+                    .call_builtin_str(ctx, yul_fun, srcs.iter().map(local))
+            )
+        };
+        let mut builtin_typed = |yul_fun_u8: YulFunction,
+                                 yul_fun_u64: YulFunction,
+                                 yul_fun_u128: YulFunction,
+                                 yul_fun_u256: YulFunction,
+                                 dest: &[TempIndex],
+                                 srcs: &[TempIndex]| {
+            use PrimitiveType::*;
+            use Type::*;
+            match get_local_type(srcs[0]) {
+                Primitive(U8) => builtin(yul_fun_u8, dest, srcs),
+                Primitive(U64) => builtin(yul_fun_u64, dest, srcs),
+                Primitive(U128) => builtin(yul_fun_u128, dest, srcs),
+                Struct(mid, sid, _) => {
+                    if ctx.is_u256(mid.qualified(sid)) {
+                        builtin(yul_fun_u256, dest, srcs)
+                    } else {
+                        panic!("unexpected operand type")
+                    }
+                },
+                _ => panic!("unexpected operand type"),
+            }
+        };
+        match bc {
+            Jump(_, l) => {
+                print_loc();
+                emitln!(ctx.writer, "$block := {}", get_block(l))
+            },
+            Branch(_, if_t, if_f, cond) => {
+                print_loc();
+                emitln!(
+                    ctx.writer,
+                    "switch {}\n\
+                     case 0  {{ $block := {} }}\n\
+                     default {{ $block := {} }}",
+                    local(cond),
+                    get_block(if_f),
+                    get_block(if_t),
+                )
+            },
+            Assign(_, dest, src, _) => {
+                print_loc();
+                self.assign(ctx, target, *dest, local(src))
+            },
+            Load(_, dest, cons) => {
+                print_loc();
+                self.constant(ctx, local(dest), cons)
+            },
+            Ret(_, results) => {
+                print_loc();
+                for (idx, result) in results.iter().enumerate() {
+                    emitln!(
+                        ctx.writer,
+                        "{} := {}",
+                        ctx.make_result_name(target, idx),
+                        local(result)
+                    );
+                }
+                if !self.borrowed_locals.is_empty() {
+                    // Free memory allocated for evaded locals
+                    self.parent.call_builtin(
+                        ctx,
+                        YulFunction::Free,
+                        vec![
+                            "$locals".to_string(),
+                            (self.borrowed_locals.len() * yul_functions::WORD_SIZE).to_string(),
+                        ]
+                        .into_iter(),
+                    );
+                }
+                if has_flow {
+                    emitln!(ctx.writer, "leave")
+                }
+            },
+            Abort(_, code) => {
+                print_loc();
+                self.parent
+                    .call_builtin(ctx, YulFunction::Abort, std::iter::once(local(code)))
+            },
+            Call(_, dest, op, srcs, _) => {
+                use Operation::*;
+                match op {
+                    // Move function call
+                    Function(m, f, inst) => {
+                        print_loc();
+                        let fun_id = m
+                            .qualified(*f)
+                            .instantiate(Type::instantiate_slice(inst, &fun_id.inst));
+                        let fun = &ctx.env.get_function(fun_id.to_qualified_id());
+                        if fun.get_name_string().contains("send__")
+                            || fun.get_name_string().contains("bcs::to_bytes")
+                        {
+                            return;
+                        }
+                        self.move_call(ctx, target, dest, fun_id, srcs.iter().map(local))
+                    },
+
+                    // Packing and unpacking of structs
+                    Pack(m, s, inst) => {
+                        print_loc();
+                        self.pack(
+                            ctx,
+                            target,
+                            make_struct_id(m, s, inst),
+                            dest[0],
+                            srcs.iter().map(local),
+                        )
+                    },
+                    Unpack(m, s, inst) => {
+                        print_loc();
+                        self.unpack(
+                            ctx,
+                            target,
+                            make_struct_id(m, s, inst),
+                            dest,
+                            local(&srcs[0]),
+                        )
+                    },
+                    Destroy => {
+                        print_loc();
+                        self.destroy(ctx, &get_local_type(srcs[0]), local(&srcs[0]))
+                    },
+
+                    // Resource management
+                    MoveTo(m, s, inst) => {
+                        print_loc();
+                        self.parent.move_to(
+                            ctx,
+                            make_struct_id(m, s, inst),
+                            local(&srcs[1]),
+                            local(&srcs[0]),
+                        )
+                    },
+                    MoveFrom(m, s, inst) => {
+                        print_loc();
+                        self.move_from(
+                            ctx,
+                            target,
+                            make_struct_id(m, s, inst),
+                            dest[0],
+                            local(&srcs[0]),
+                        )
+                    },
+                    Exists(m, s, inst) => {
+                        print_loc();
+                        self.exists(
+                            ctx,
+                            target,
+                            make_struct_id(m, s, inst),
+                            dest[0],
+                            local(&srcs[0]),
+                        )
+                    },
+                    BorrowGlobal(m, s, inst) => {
+                        print_loc();
+                        self.borrow_global(
+                            ctx,
+                            target,
+                            make_struct_id(m, s, inst),
+                            dest[0],
+                            local(&srcs[0]),
+                        )
+                    },
+
+                    // References
+                    BorrowLoc => {
+                        print_loc();
+                        self.borrow_loc(ctx, target, dest, srcs)
+                    },
+                    BorrowField(m, s, inst, f) => {
+                        print_loc();
+                        self.borrow_field(
+                            ctx,
+                            get_local_type(dest[0]).skip_reference(),
+                            make_struct_id(m, s, inst),
+                            *f,
+                            local(&dest[0]),
+                            local(&srcs[0]),
+                        )
+                    },
+                    ReadRef => {
+                        print_loc();
+                        self.read_ref(
+                            ctx,
+                            target,
+                            &get_local_type(dest[0]),
+                            dest[0],
+                            local(&srcs[0]),
+                        )
+                    },
+                    WriteRef => {
+                        print_loc();
+                        self.write_ref(
+                            ctx,
+                            &get_local_type(srcs[1]),
+                            local(&srcs[0]),
+                            local(&srcs[1]),
+                        )
+                    },
+                    // FreezeRef transforms a mutable reference to an immutable one so just
+                    // treat it as an assignment.
+                    FreezeRef => {
+                        print_loc();
+                        self.assign(ctx, target, dest[0], local(&srcs[0]))
+                    },
+
+                    // Arithmetics
+                    CastU8 => builtin(YulFunction::CastU8, dest, srcs),
+                    CastU64 => builtin(YulFunction::CastU64, dest, srcs),
+                    CastU128 => builtin(YulFunction::CastU128, dest, srcs),
+                    CastU256 => builtin(YulFunction::CastU256, dest, srcs),
+                    Not => builtin(YulFunction::LogicalNot, dest, srcs),
+                    Add => builtin_typed(
+                        YulFunction::AddU8,
+                        YulFunction::AddU64,
+                        YulFunction::AddU128,
+                        YulFunction::AddU256,
+                        dest,
+                        srcs,
+                    ),
+                    Sub => builtin(YulFunction::Sub, dest, srcs),
+                    Mul => builtin_typed(
+                        YulFunction::MulU8,
+                        YulFunction::MulU64,
+                        YulFunction::MulU128,
+                        YulFunction::MulU256,
+                        dest,
+                        srcs,
+                    ),
+                    Div => builtin(YulFunction::Div, dest, srcs),
+                    Mod => builtin(YulFunction::Mod, dest, srcs),
+                    BitOr => builtin(YulFunction::BitOr, dest, srcs),
+                    BitAnd => builtin(YulFunction::BitAnd, dest, srcs),
+                    Xor => builtin(YulFunction::BitXor, dest, srcs),
+                    Shl => builtin_typed(
+                        YulFunction::ShlU8,
+                        YulFunction::ShlU64,
+                        YulFunction::ShlU128,
+                        YulFunction::ShlU256,
+                        dest,
+                        srcs,
+                    ),
+                    Shr => builtin(YulFunction::Shr, dest, srcs),
+                    Lt => builtin(YulFunction::Lt, dest, srcs),
+                    Gt => builtin(YulFunction::Gt, dest, srcs),
+                    Le => builtin(YulFunction::LtEq, dest, srcs),
+                    Ge => builtin(YulFunction::GtEq, dest, srcs),
+                    Or => builtin(YulFunction::LogicalOr, dest, srcs),
+                    And => builtin(YulFunction::LogicalAnd, dest, srcs),
+                    // TODO: implement equality comparison for structs, vectors of structs and
+                    // vectors of vectors
+                    Eq => {
+                        let src_type = get_local_type(srcs[0]);
+                        print_loc();
+                        emitln!(
+                            ctx.writer,
+                            "{} := {}({}, {})",
+                            local(&dest[0]),
+                            self.parent.equality_function(ctx, src_type),
+                            local(&srcs[0]),
+                            local(&srcs[1]),
+                        );
+                    },
+                    Neq => {
+                        print_loc();
+                        let src_type = get_local_type(srcs[0]);
+                        if ctx.type_allocates_memory(&src_type) {
+                            let equality_call = format!(
+                                "{}({}, {})",
+                                self.parent.equality_function(ctx, src_type),
+                                local(&srcs[0]),
+                                local(&srcs[1])
+                            );
+                            emitln!(
+                                ctx.writer,
+                                "{} := {}",
+                                local(&dest[0]),
+                                self.parent.call_builtin_str(
+                                    ctx,
+                                    YulFunction::LogicalNot,
+                                    std::iter::once(equality_call)
+                                )
+                            );
+                        } else {
+                            builtin(YulFunction::Neq, dest, srcs)
+                        }
+                    },
+                    // Specification or other operations which can be ignored here
+                    GetField(_, _, _, _)
+                    | GetGlobal(_, _, _)
+                    | IsParent(_, _)
+                    | WriteBack(_, _)
+                    | UnpackRef
+                    | PackRef
+                    | UnpackRefDeep
+                    | PackRefDeep
+                    | TraceLocal(_)
+                    | TraceReturn(_)
+                    | TraceAbort
+                    | TraceExp(_, _)
+                    | EmitEvent
+                    | EventStoreDiverge
+                    | OpaqueCallBegin(_, _, _)
+                    | OpaqueCallEnd(_, _, _)
+                    | Uninit
+                    | Havoc(_)
+                    | Stop
+                    | TraceGlobalMem(_)
+                    | CastU16
+                    | CastU32 => {},
+                }
+            },
+
+            Label(_, _) | Nop(_) | SaveMem(_, _, _) | SaveSpecVar(_, _, _) | Prop(_, _, _) => {
+                // These opcodes are not needed, ignore them
+            },
+        }
+    }
+
+    fn assign(&self, ctx: &Context, target: &FunctionTarget, dest: TempIndex, src: String) {
+        if let Some(ptr) = Self::local_ptr(&self.borrowed_locals, dest) {
+            emitln!(ctx.writer, "mstore({}, {})", ptr, src)
+        } else {
+            emitln!(
+                ctx.writer,
+                "{} := {}",
+                ctx.make_local_name(target, dest),
+                src
+            );
+        }
+    }
+
+    /// Generate a string representing a constant.
+    fn constant(&mut self, ctx: &Context, dest: String, cons: &Constant) {
+        let val_str = match cons {
+            Constant::Bool(v) => {
+                if *v {
+                    "true".to_string()
+                } else {
+                    "false".to_string()
+                }
+            },
+            Constant::U8(v) => {
+                format!("{}", v)
+            },
+            Constant::U64(v) => {
+                format!("{}", v)
+            },
+            Constant::U128(v) => {
+                format!("{}", v)
+            },
+            Constant::U256(v) => {
+                format!("{}", v)
+            },
+            Constant::Address(a) => {
+                format!("0x{}", a.to_str_radix(16))
+            },
+            Constant::ByteArray(_) => "".to_string(),
+            Constant::AddressArray(_) => "".to_string(),
+            Constant::Vector(_) => "".to_string(),
+            Constant::U16(_) | Constant::U32(_) => panic!("unexpected field type"),
+        };
+        if !val_str.is_empty() {
+            emitln!(ctx.writer, "{} := {}", dest, val_str);
+        } else if let Constant::ByteArray(value) = cons {
+            let compute_capacity_str = self.parent.call_builtin_str(
+                ctx,
+                YulFunction::ClosestGreaterPowerOfTwo,
+                std::iter::once(value.len().to_string()),
+            );
+            let malloc_str = self.parent.call_builtin_str(
+                ctx,
+                YulFunction::Malloc,
+                std::iter::once(format!("add(32, {})", compute_capacity_str)),
+            );
+            let store_length_str = self.parent.call_builtin_str(
+                ctx,
+                YulFunction::MemoryStoreU64,
+                vec![dest.clone(), value.len().clone().to_string()].into_iter(),
+            );
+            let store_capacity_str = self.parent.call_builtin_str(
+                ctx,
+                YulFunction::MemoryStoreU64,
+                vec![format!("add({}, 8)", dest), compute_capacity_str].into_iter(),
+            );
+            emitln!(ctx.writer, "{} := {}", dest, malloc_str);
+            emitln!(ctx.writer, &store_length_str);
+            emitln!(ctx.writer, &store_capacity_str);
+            let fun_name = self.parent.copy_literal_to_memory(value.clone());
+            emitln!(ctx.writer, "{}(add({}, 32))", fun_name, dest);
+        }
+    }
+
+    /// Generate call to a Move function.
+    fn move_call(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        dest: &[TempIndex],
+        fun: QualifiedInstId<FunId>,
+        mut args: impl Iterator<Item = String>,
+    ) {
+        let fun_name = ctx.make_function_name(&fun);
+        self.parent.need_move_function(&fun);
+        let call_str = format!("{}({})", fun_name, args.join(", "));
+        match dest.len() {
+            0 => emitln!(ctx.writer, &call_str),
+            1 => self.assign(ctx, target, dest[0], call_str),
+            _ => {
+                if dest
+                    .iter()
+                    .any(|idx| self.borrowed_locals.contains_key(idx))
+                {
+                    // Multiple outputs, some of them evaded into memory. Need to introduce
+                    // temporaries to store the result
+                    ctx.emit_block(|| {
+                        let temp_names = (0..dest.len())
+                            .map(|i| {
+                                if self.borrowed_locals.contains_key(&dest[i]) {
+                                    format!("$d{}", i)
+                                } else {
+                                    ctx.make_local_name(target, dest[i])
+                                }
+                            })
+                            .collect_vec();
+                        emitln!(
+                            ctx.writer,
+                            "let {} := {}",
+                            temp_names.iter().join(", "),
+                            call_str
+                        );
+                        for (i, temp_name) in temp_names.into_iter().enumerate() {
+                            if self.borrowed_locals.contains_key(&dest[i]) {
+                                self.assign(ctx, target, dest[i], temp_name)
+                            }
+                        }
+                    })
+                } else {
+                    let dest_str = dest
+                        .iter()
+                        .map(|idx| ctx.make_local_name(target, *idx))
+                        .join(", ");
+                    emitln!(ctx.writer, "{} := {}", dest_str, call_str)
+                }
+            },
+        }
+    }
+}
+
+// ================================================================================================
+// Memory
+
+impl<'a> FunctionGenerator<'a> {
+    /// If this is a local which is borrowed and evaded to memory, return pointer to its memory.
+    fn local_ptr(borrowed_locals: &BTreeMap<TempIndex, usize>, idx: TempIndex) -> Option<String> {
+        borrowed_locals.get(&idx).map(|pos| {
+            if *pos == 0 {
+                "$locals".to_string()
+            } else {
+                format!("add($locals, {})", pos * yul_functions::WORD_SIZE)
+            }
+        })
+    }
+
+    /// Borrow a local.
+    fn borrow_loc(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        dest: &[TempIndex],
+        srcs: &[TempIndex],
+    ) {
+        let ty = target.get_local_type(srcs[0]);
+        let mem_offs = if ctx.type_is_struct(ty) {
+            // The values lives in memory and srcs[0] is an offset into this memory.
+            ctx.make_local_name(target, srcs[0])
+        } else {
+            // A primitive which has been evaded to memory,
+            // Need to adjust the offset for the local by (32 - size) to account for big endian.
+            // We need to point to the actual highest byte of the value.
+            let offs = (*self
+                .borrowed_locals
+                .get(&srcs[0])
+                .expect("local evaded to memory")
+                * yul_functions::WORD_SIZE)
+                + 32
+                - ctx.type_size(ty);
+            if offs == 0 {
+                "$locals".to_string()
+            } else {
+                format!("add($locals, {})", offs)
+            }
+        };
+        let ref_value = self.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec!["false".to_string(), mem_offs].into_iter(),
+        );
+        emitln!(
+            ctx.writer,
+            "{} := {}",
+            ctx.make_local_name(target, dest[0]),
+            ref_value
+        );
+    }
+
+    /// Read the value of reference.
+    fn read_ref(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        ty: &Type,
+        dest_idx: TempIndex,
+        src: String,
+    ) {
+        let load_str = self.parent.call_builtin_str(
+            ctx,
+            ctx.load_builtin_fun(ty.skip_reference()),
+            std::iter::once(src.clone()),
+        );
+        self.assign(ctx, target, dest_idx, load_str);
+        let is_storage_call =
+            self.parent
+                .call_builtin_str(ctx, YulFunction::IsStoragePtr, std::iter::once(src));
+        let hash = self.parent.type_hash(ctx, ty);
+        let stroage_ptr_name = format!("$storage_ptr_{}", hash);
+        if ty.is_vector() || (ty.is_struct() && !ctx.is_u256_ty(ty)) {
+            emit!(ctx.writer, "if {}", is_storage_call);
+            ctx.emit_block(|| {
+                emitln!(ctx.writer, "let {}", stroage_ptr_name);
+                let dest = if let Some(ptr) = Self::local_ptr(&self.borrowed_locals, dest_idx) {
+                    format!("mload({})", ptr)
+                } else {
+                    ctx.make_local_name(target, dest_idx)
+                };
+                self.parent.move_data_from_linked_storage(
+                    ctx,
+                    ty,
+                    dest,
+                    stroage_ptr_name.clone(),
+                    false,
+                );
+                self.assign(ctx, target, dest_idx, stroage_ptr_name);
+            })
+        }
+    }
+
+    /// Write the value of reference.
+    fn write_ref(&mut self, ctx: &Context, ty: &Type, dest: String, src: String) {
+        let yul_fun = ctx.store_builtin_fun(ty.skip_reference());
+        let is_storage_call = self.parent.call_builtin_str(
+            ctx,
+            YulFunction::IsStoragePtr,
+            std::iter::once(dest.clone()),
+        );
+        let hash = self.parent.type_hash(ctx, ty);
+        let stroage_ptr_name = format!("$storage_ptr_{}", hash);
+        if ty.is_vector() || (ty.is_struct() && !ctx.is_u256_ty(ty)) {
+            emit!(ctx.writer, "if {}", is_storage_call);
+            ctx.emit_block(|| {
+                self.parent.create_and_move_data_to_linked_storage(
+                    ctx,
+                    ty,
+                    src.clone(),
+                    stroage_ptr_name.clone(),
+                    false,
+                );
+                emitln!(ctx.writer, "{} := {}", src, stroage_ptr_name);
+            });
+        }
+        self.parent
+            .call_builtin(ctx, yul_fun, vec![dest, src].into_iter())
+    }
+
+    /// Pack a structure.
+    fn pack(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        struct_id: QualifiedInstId<StructId>,
+        dest: TempIndex,
+        srcs: impl Iterator<Item = String>,
+    ) {
+        let layout = ctx.get_struct_layout(&struct_id);
+
+        ctx.emit_block(|| {
+            // Allocate memory
+            let mem = "$mem".to_string();
+            emitln!(
+                ctx.writer,
+                "let $mem := {}",
+                self.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::Malloc,
+                    std::iter::once(layout.size.to_string()),
+                )
+            );
+
+            // Initialize fields
+            let struct_env = &ctx.env.get_struct(struct_id.to_qualified_id());
+            for (logical_offs, field_exp) in srcs.enumerate() {
+                let yul_fun = ctx.memory_store_builtin_fun(
+                    &struct_env
+                        .get_field_by_offset(logical_offs)
+                        .get_type()
+                        .instantiate(&struct_id.inst),
+                );
+                let (byte_offset, _) = *layout.offsets.get(&logical_offs).unwrap();
+                let field_ptr = format!("add({}, {})", mem, byte_offset);
+                self.parent
+                    .call_builtin(ctx, yul_fun, vec![field_ptr, field_exp].into_iter());
+            }
+            self.assign(ctx, target, dest, mem);
+        })
+    }
+
+    /// Unpack a structure.
+    fn unpack(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        struct_id: QualifiedInstId<StructId>,
+        dest: &[TempIndex],
+        src: String,
+    ) {
+        let layout = ctx.get_struct_layout(&struct_id);
+
+        // Copy fields
+        let struct_env = &ctx.env.get_struct(struct_id.to_qualified_id());
+        for (logical_offs, dest_idx) in dest.iter().enumerate() {
+            let yul_fun = ctx.memory_load_builtin_fun(
+                &struct_env
+                    .get_field_by_offset(logical_offs)
+                    .get_type()
+                    .instantiate(&struct_id.inst),
+            );
+            let (byte_offset, _) = *layout.offsets.get(&logical_offs).unwrap();
+            let field_ptr = format!("add({}, {})", src, byte_offset);
+            let call_str = self
+                .parent
+                .call_builtin_str(ctx, yul_fun, std::iter::once(field_ptr));
+            self.assign(ctx, target, *dest_idx, call_str);
+        }
+
+        // Free memory
+        self.parent.call_builtin(
+            ctx,
+            YulFunction::Free,
+            vec![src, layout.size.to_string()].into_iter(),
+        )
+    }
+
+    /// Destroy (free) a value of type.
+    /// TODO: the Destroy instruction is currently not reflecting lifetime of values correctly,
+    ///   but is only inserted for the original pop bytecode. We should run lifetime analysis
+    ///   and insert Destroy where needed. However, this does not matter much yet, as
+    ///   YulFunction::Free is a nop in the current runtime which uses arena style allocation.
+    fn destroy(&mut self, ctx: &Context, ty: &Type, src: String) {
+        use Type::*;
+        match ty {
+            Struct(m, s, inst) => {
+                // Destroy all fields
+                let struct_id = m.qualified(*s).instantiate(inst.clone());
+                let layout = ctx.get_struct_layout(&struct_id);
+                let struct_env = &ctx.env.get_struct(struct_id.to_qualified_id());
+                for field in struct_env.get_fields() {
+                    let field_type = field.get_type().instantiate(inst);
+                    if !ctx.type_allocates_memory(&field_type) {
+                        continue;
+                    }
+                    ctx.emit_block(|| {
+                        let (byte_offset, _) = layout.offsets.get(&field.get_offset()).unwrap();
+                        let field_ptr = self.parent.call_builtin_str(
+                            ctx,
+                            YulFunction::LoadU256,
+                            std::iter::once(format!("add({}, {})", src, byte_offset)),
+                        );
+                        let field_ptr_name =
+                            format!("$field_ptr_{}", self.parent.type_hash(ctx, &field_type));
+                        emitln!(ctx.writer, "let {} := {}", field_ptr_name, field_ptr);
+                        self.destroy(ctx, &field_type, field_ptr_name);
+                    })
+                }
+
+                // Free the memory allocated by this struct.
+                self.parent.call_builtin(
+                    ctx,
+                    YulFunction::Free,
+                    vec![src, layout.size.to_string()].into_iter(),
+                )
+            },
+            Vector(ty) => {
+                if ctx.type_allocates_memory(ty.as_ref()) {
+                    // TODO: implement vectors
+                }
+            },
+            _ => {},
+        }
+    }
+
+    /// Borrow a field, creating a reference to it.
+    fn borrow_field(
+        &mut self,
+        ctx: &Context,
+        _ty: &Type,
+        struct_id: QualifiedInstId<StructId>,
+        field_offs: usize,
+        dest: String,
+        src: String,
+    ) {
+        let layout = ctx.get_struct_layout(&struct_id);
+        let (byte_offs, ty) = layout
+            .offsets
+            .get(&field_offs)
+            .expect("field offset defined");
+        let add_offset = if *byte_offs == 0 {
+            src
+        } else {
+            self.parent.call_builtin_str(
+                ctx,
+                YulFunction::IndexPtr,
+                vec![src, byte_offs.to_string()].into_iter(),
+            )
+        };
+        if ctx.type_is_struct(ty) {
+            // If this is an indirection to a struct or vector, load its value and make a ptr of it.
+            ctx.emit_block(|| {
+                let field_ptr = if *byte_offs == 0 {
+                    add_offset
+                } else {
+                    emitln!(ctx.writer, "let $field_ptr := {}", add_offset);
+                    "$field_ptr".to_string()
+                };
+                let is_storage_call = self.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::IsStoragePtr,
+                    std::iter::once(field_ptr.clone()),
+                );
+                let load_call = self.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::LoadU256,
+                    std::iter::once(field_ptr),
+                );
+                emitln!(
+                    ctx.writer,
+                    "{} := {}",
+                    dest,
+                    self.parent.call_builtin_str(
+                        ctx,
+                        YulFunction::MakePtr,
+                        vec![is_storage_call, load_call].into_iter()
+                    )
+                )
+            })
+        } else {
+            emitln!(ctx.writer, "{} := {}", dest, add_offset)
+        }
+    }
+
+    /// Test whether resource exists.
+    fn exists(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        struct_id: QualifiedInstId<StructId>,
+        dst: TempIndex,
+        addr: String,
+    ) {
+        let exists_check = self.parent.exists_check(ctx, struct_id, addr);
+        self.assign(ctx, target, dst, exists_check);
+    }
+
+    /// Move resource from storage to local.
+    fn move_from(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        struct_id: QualifiedInstId<StructId>,
+        dst: TempIndex,
+        addr: String,
+    ) {
+        ctx.emit_block(|| {
+            // Obtain the storage base offset for this resource.
+            emitln!(
+                ctx.writer,
+                "let $base_offset := {}",
+                self.parent.type_storage_base(
+                    ctx,
+                    &struct_id.to_type(),
+                    "${RESOURCE_STORAGE_CATEGORY}",
+                    addr,
+                )
+            );
+            let base_offset = "$base_offset";
+
+            // At the base offset we store a boolean indicating whether the resource exists. Check this
+            // and if it is not set, abort. Otherwise clear this bit.
+            let exists_call = self.parent.call_builtin_str(
+                ctx,
+                YulFunction::AlignedStorageLoad,
+                std::iter::once(base_offset.to_string()),
+            );
+            let abort_call =
+                self.parent
+                    .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty());
+            emitln!(
+                ctx.writer,
+                "if iszero({}) {{\n  {}\n}}",
+                exists_call,
+                abort_call
+            );
+            self.parent.call_builtin(
+                ctx,
+                YulFunction::AlignedStorageStore,
+                vec![base_offset.to_string(), "false".to_string()].into_iter(),
+            );
+
+            // Move the struct out of storage into memory
+            ctx.emit_block(|| {
+                // The actual resource data starts at base_offset + 32. Set the src address
+                // to this.
+                emitln!(
+                    ctx.writer,
+                    "let $src := add({}, ${{RESOURCE_EXISTS_FLAG_SIZE}})",
+                    base_offset
+                );
+
+                // Perform the move and assign the result.
+                emitln!(ctx.writer, "let $dst");
+                self.parent.move_struct_to_memory(
+                    ctx,
+                    &struct_id,
+                    "$src".to_string(),
+                    "$dst".to_string(),
+                    true,
+                );
+                self.assign(ctx, target, dst, "$dst".to_string())
+            })
+        })
+    }
+
+    /// Borrow a resource.
+    fn borrow_global(
+        &mut self,
+        ctx: &Context,
+        target: &FunctionTarget,
+        struct_id: QualifiedInstId<StructId>,
+        dst: TempIndex,
+        addr: String,
+    ) {
+        ctx.emit_block(|| {
+            let res = self.parent.borrow_global_instrs(ctx, &struct_id, addr);
+            self.assign(ctx, target, dst, res);
+        });
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/generator.rs b/vendors/move/crates/evm/move-to-yul/src/generator.rs
new file mode 100644
index 000000000..276d30e75
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/generator.rs
@@ -0,0 +1,817 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abi_move_metadata::generate_abi_move_metadata,
+    abi_signature::{from_event_sig, from_solidity_sig},
+    attributes,
+    context::{Context, Contract},
+    functions::FunctionGenerator,
+    solidity_ty::SoliditySignature,
+    yul_functions::YulFunction,
+    Options,
+};
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use itertools::Itertools;
+use move_core_types::{
+    identifier::IdentStr, language_storage::ModuleId, metadata::Metadata, value::MoveValue,
+};
+use move_model::{
+    emit, emitln,
+    model::{
+        FunId, FunctionEnv, GlobalEnv, Loc, ModuleEnv, QualifiedId, QualifiedInstId, StructId,
+    },
+    ty::Type,
+};
+use sha3::{Digest, Keccak256};
+use std::collections::{BTreeMap, BTreeSet};
+
+/// Mutable state of the generator.
+#[derive(Default)]
+pub struct Generator {
+    // Location of the currently compiled contract, for general error messages.
+    pub(crate) contract_loc: Loc,
+    // If the currently compiled contract has a storage type, its contained here.
+    pub(crate) storage_type: Option<QualifiedInstId<StructId>>,
+    /// Move functions, including type instantiation, needed in the currently generated code block.
+    needed_move_functions: Vec<QualifiedInstId<FunId>>,
+    /// Move functions for which code has been emitted.
+    done_move_functions: BTreeSet<QualifiedInstId<FunId>>,
+    /// Yule functions needed in the currently generated code block.
+    needed_yul_functions: BTreeSet<YulFunction>,
+    /// Auxiliary functions needed in the current block.
+    needed_auxiliary_functions: Vec<(String, Box<AuxilaryFunctionGenerator>)>,
+    /// Auxiliary functions for which code has been emitted.
+    done_auxiliary_functions: BTreeSet<String>,
+    /// Mapping of type signature hash to type, to identify collisions.
+    pub(crate) type_sig_map: BTreeMap<u32, Type>,
+    /// Solidity signature for callable functions for generating JSON-ABI
+    pub(crate) solidity_sigs: Vec<(SoliditySignature, attributes::FunctionAttribute)>,
+    /// Solidity signature for the optional constructor for generating JSON-ABI
+    pub(crate) constructor_sig: Option<SoliditySignature>,
+}
+
+type AuxilaryFunctionGenerator = dyn FnOnce(&mut Generator, &Context);
+
+// ================================================================================================
+// Entry point
+
+impl Generator {
+    /// Run the generator and produce a lisy of triples of contract name, Yul contract object, and ABI.
+    pub fn run(options: &Options, env: &GlobalEnv) -> Vec<(String, String, String)> {
+        let mut res = vec![];
+        let ctx = &Context::new(options, env, false);
+        for contract in ctx.derive_contracts() {
+            let module = &ctx.env.get_module(contract.module);
+            if !module.is_target() {
+                // Ignore contract from module not target of compilation
+                continue;
+            }
+            let mut gen = Generator::default();
+            gen.contract_object(ctx, &contract);
+            res.push((
+                contract.name,
+                ctx.writer.extract_result(),
+                ctx.abi_writer.extract_result(),
+            ))
+        }
+        res
+    }
+
+    // Run the generator for evm unit tests and produce a mapping from function id to Yul test object.
+    pub fn run_for_evm_tests(
+        options: &Options,
+        env: &GlobalEnv,
+    ) -> BTreeMap<QualifiedId<FunId>, String> {
+        let mut res = BTreeMap::new();
+        let ctx = Context::new(options, env, /*for_test*/ true);
+
+        // Go over all evm_test functions which are in modules which are target of compilation,
+        // and generate a test object for them.
+        for module in env.get_modules() {
+            if !module.is_target() {
+                continue;
+            }
+            for fun in module.get_functions() {
+                if attributes::is_evm_test_fun(&fun) {
+                    let mut gen = Generator::default();
+                    gen.test_object(&ctx, &fun, &[]);
+                    res.insert(fun.get_qualified_id(), ctx.writer.extract_result());
+                }
+            }
+        }
+
+        res
+    }
+
+    /// Run the generator for a specific unit test and generate a Yul test object for it.
+    /// Return diagnostics if errors are raised.
+    pub fn run_for_unit_test(
+        options: &Options,
+        env: &GlobalEnv,
+        module_id: &ModuleId,
+        fun_name: &IdentStr,
+        args: &[MoveValue],
+    ) -> Result<String, String> {
+        let fun = env
+            .find_function_by_language_storage_id_name(module_id, fun_name)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Failed to find test function {}::{}. This should not have happened.",
+                    module_id, fun_name
+                )
+            });
+
+        let ctx = Context::new(options, env, /*for_test*/ true);
+        let mut gen = Generator::default();
+        gen.test_object(&ctx, &fun, args);
+        if ctx.env.has_errors() {
+            let mut buffer = Buffer::no_color();
+            ctx.env.report_diag(&mut buffer, Severity::Error);
+            Err(String::from_utf8_lossy(buffer.as_slice()).to_string())
+        } else {
+            Ok(ctx.writer.extract_result())
+        }
+    }
+
+    /// Generate metadata
+    pub(crate) fn generate_abi_metadata(options: &Options, env: &GlobalEnv) -> Vec<Metadata> {
+        let ctx = &Context::new(options, env, false);
+        let mut meta_vec = vec![];
+        for contract in ctx.derive_contracts() {
+            let module = &ctx.env.get_module(contract.module);
+            if !module.is_target() {
+                // Ignore contract from module not target of compilation
+                continue;
+            }
+            let mut gen = Generator::default();
+            gen.compute_ethereum_signatures(ctx, &contract);
+            let metadata = generate_abi_move_metadata(
+                ctx,
+                contract.receive.is_some(),
+                contract.fallback.is_some(),
+            );
+            meta_vec.push(metadata);
+        }
+        meta_vec
+    }
+}
+
+// ================================================================================================
+// Object generation
+
+impl Generator {
+    /// Generate contract object for given contract functions.
+    fn contract_object(&mut self, ctx: &Context, contract: &Contract) {
+        self.header(ctx);
+        // Initialize contract specific state
+        let module = &ctx.env.get_module(contract.module);
+        self.contract_loc = module.get_loc();
+        self.storage_type = contract
+            .storage
+            .map(|struct_id| contract.module.qualified_inst(struct_id, vec![]));
+        // Start generating Yul object.
+        emit!(ctx.writer, "object \"{}\" ", contract.name);
+        ctx.emit_block(|| {
+            // Generate the deployment code block
+            self.begin_code_block(ctx);
+            self.optional_create(ctx, module, contract);
+            let contract_deployed_name = format!("{}_deployed", contract.name);
+            emitln!(
+                ctx.writer,
+                "codecopy(0, dataoffset(\"{}\"), datasize(\"{}\"))",
+                contract_deployed_name,
+                contract_deployed_name
+            );
+            emitln!(
+                ctx.writer,
+                "return(0, datasize(\"{}\"))",
+                contract_deployed_name,
+            );
+            self.end_code_block(ctx);
+
+            // Generate the runtime object
+            emit!(ctx.writer, "object \"{}\" ", contract_deployed_name);
+            ctx.emit_block(|| {
+                self.begin_code_block(ctx);
+                emitln!(
+                    ctx.writer,
+                    "mstore(${MEM_SIZE_LOC}, memoryguard(${USED_MEM}))"
+                );
+                let callables = contract
+                    .callables
+                    .iter()
+                    .map(|f| module.get_function(*f))
+                    .collect_vec();
+                let receiver = contract.receive.map(|f| module.get_function(f));
+                let fallback = contract.fallback.map(|f| module.get_function(f));
+                self.callable_functions(ctx, &callables, receiver, fallback);
+                self.end_code_block(ctx);
+            })
+        });
+        // Generate JSON-ABI
+        self.generate_abi_string(ctx);
+    }
+
+    /// Compute ethereum signatures and returns whether
+    pub(crate) fn compute_ethereum_signatures(&mut self, ctx: &Context, contract: &Contract) {
+        let module = &ctx.env.get_module(contract.module);
+        let constructor_opt = contract.constructor.map(|f| module.get_function(f));
+        if let Some(constructor) = constructor_opt {
+            let solidity_sig_constructor = self.get_solidity_signature(ctx, &constructor, false);
+            if let Some(fun_attr_opt) = attributes::construct_fun_attribute(&constructor) {
+                ctx.build_constructor(&solidity_sig_constructor, fun_attr_opt, &constructor);
+            }
+        }
+
+        let callables = contract
+            .callables
+            .iter()
+            .map(|f| module.get_function(*f))
+            .collect_vec();
+
+        for fun in callables {
+            if !self.is_suitable_for_dispatch(ctx, &fun) {
+                ctx.env.diag(
+                    Severity::Warning,
+                    &fun.get_loc(),
+                    "cannot dispatch this function because of unsupported parameter types",
+                );
+                continue;
+            }
+            let sig = self.get_solidity_signature(ctx, &fun, true);
+            if let Some(fun_attr_opt) = attributes::construct_fun_attribute(&fun) {
+                ctx.build_callable_signature_map(&sig, fun_attr_opt, &fun);
+            } else {
+                ctx.env.error(
+                    &fun.get_loc(),
+                    "callable functions can only have one attribute among payable, pure and view",
+                );
+            }
+        }
+    }
+
+    /// Generate JSON-ABI
+    fn generate_abi_string(&self, ctx: &Context) {
+        let mut res = vec![];
+        let event_sigs = ctx
+            .event_signature_map
+            .borrow()
+            .values()
+            .cloned()
+            .collect_vec();
+        for sig in &event_sigs {
+            res.push(serde_json::to_string_pretty(&from_event_sig(sig)).unwrap());
+        }
+        for (sig, attr) in &self.solidity_sigs {
+            res.push(
+                serde_json::to_string_pretty(&from_solidity_sig(sig, Some(*attr), "function"))
+                    .unwrap(),
+            );
+        }
+        if let Some(constructor) = &self.constructor_sig {
+            res.push(
+                serde_json::to_string_pretty(&from_solidity_sig(constructor, None, "constructor"))
+                    .unwrap(),
+            );
+        }
+        emitln!(ctx.abi_writer, "[");
+        emitln!(
+            ctx.abi_writer,
+            "{}",
+            res.iter()
+                .map(|t| t.to_string())
+                .collect::<Vec<_>>()
+                .join(",\n")
+        );
+        emitln!(ctx.abi_writer, "]");
+    }
+
+    /// Generate test object for given function.
+    ///
+    /// A test object contains no nested objects and is intended to execute at transaction time,
+    /// without actually deploying any contract code.
+    fn test_object(&mut self, ctx: &Context, test: &FunctionEnv, args: &[MoveValue]) {
+        self.header(ctx);
+        ctx.check_no_generics(test);
+        if test.get_return_count() > 0 {
+            ctx.env
+                .error(&test.get_loc(), "test functions cannot have return values");
+            return;
+        }
+        if test.get_parameter_count() != args.len() {
+            ctx.env.error(
+                &test.get_loc(),
+                &format!(
+                    "test function has {} parameters but {} were provided",
+                    test.get_parameter_count(),
+                    args.len()
+                ),
+            );
+            return;
+        }
+        for ty in test.get_parameter_types() {
+            if !ty.is_signer_or_address() {
+                ctx.env.error(
+                    &test.get_loc(),
+                    "only signer or address parameters are allowed currently",
+                );
+                return;
+            }
+        }
+
+        let fun_id = test.get_qualified_id().instantiate(vec![]);
+        let test_contract_name = format!("test_{}", ctx.make_function_name(&fun_id));
+        emit!(ctx.writer, "object \"{}\" ", test_contract_name);
+        ctx.emit_block(|| {
+            self.begin_code_block(ctx);
+            emitln!(
+                ctx.writer,
+                "mstore(${MEM_SIZE_LOC}, memoryguard(${USED_MEM}))"
+            );
+            self.need_move_function(&fun_id);
+
+            for (idx, arg) in args.iter().enumerate() {
+                emit!(ctx.writer, "let $arg{} := ", idx);
+                match arg {
+                    MoveValue::Address(addr) => {
+                        emitln!(ctx.writer, "{}", addr.to_hex_literal());
+                    },
+                    _ => unreachable!(
+                        "only address literals are allowed as test arguments currently"
+                    ),
+                }
+            }
+
+            let fun_name = ctx.make_function_name(&fun_id);
+            emit!(ctx.writer, "{}(", fun_name);
+            for idx in 0..args.len() {
+                if idx > 0 {
+                    emit!(ctx.writer, ", ");
+                }
+                emit!(ctx.writer, "$arg{}", idx);
+            }
+            emitln!(ctx.writer, ")");
+
+            emitln!(ctx.writer, "return (0, 0)");
+            self.end_code_block(ctx);
+        });
+    }
+
+    /// Generate header for output Yul.
+    fn header(&mut self, ctx: &Context) {
+        emitln!(
+            ctx.writer,
+            "\
+/* =======================================
+ * Generated by Move-To-Yul compiler v{}
+ * ======================================= */",
+            ctx.options.version(),
+        );
+        emitln!(ctx.writer);
+        if ctx.options.generate_source_info() {
+            let mut use_src_emitted = false;
+            for (file_no, file_path) in ctx
+                .file_id_map
+                .values()
+                .sorted_by(|(n1, _), (n2, _)| n1.cmp(n2))
+            {
+                let use_str = format!("{}:\"{}\"", file_no, file_path);
+                if !use_src_emitted {
+                    emitln!(ctx.writer, "/// @use-src {}", use_str);
+                    use_src_emitted = true;
+                } else {
+                    emitln!(ctx.writer, "///        , {}", use_str)
+                }
+            }
+            emitln!(ctx.writer);
+        }
+        emitln!(ctx.writer);
+    }
+
+    /// Generate optional creator (contract constructor).
+    fn optional_create(&mut self, ctx: &Context, module: &ModuleEnv, contract: &Contract) {
+        if let Some(creator_id) = contract.constructor {
+            let creator = module.get_function(creator_id);
+            ctx.check_no_generics(&creator);
+            if let Some(storage) = &self.storage_type {
+                // The creator function must return a value of the storage type.
+                let storage_ty = storage.to_type();
+                if creator.get_return_count() != 1 || creator.get_return_type(0) != storage_ty {
+                    ctx.env.error(
+                        &creator.get_loc(),
+                        &format!("creator function for contract with #[storage] must return value of type `{}`", storage_ty.display(&ctx.env.get_type_display_ctx()))
+                    )
+                }
+            } else if creator.get_return_count() > 0 {
+                ctx.env.error(
+                    &creator.get_loc(),
+                    "return values not allowed for creator functions without specified #[storage]",
+                )
+            }
+
+            if !self.is_suitable_for_dispatch(ctx, &creator) {
+                ctx.env.error(
+                    &creator.get_loc(),
+                    "creator function has unsupported parameter types",
+                );
+            }
+
+            emitln!(
+                ctx.writer,
+                "mstore(${MEM_SIZE_LOC}, memoryguard(${USED_MEM}))"
+            );
+
+            // Translate call to the constructor function
+            let fun_id = creator.get_qualified_id().instantiate(vec![]);
+            let function_name = ctx.make_function_name(&fun_id);
+            let solidity_sig = self.get_solidity_signature(ctx, &creator, false);
+            self.constructor_sig = Some(solidity_sig.clone());
+            let param_count = solidity_sig.para_types.len();
+            let mut params = "".to_string();
+            if param_count > 0 {
+                let program_size_str = "program_size".to_string();
+                let arg_size_str = "arg_size".to_string();
+                let memory_data_offset_str = "memory_data_offset".to_string();
+                emitln!(
+                    ctx.writer,
+                    "let {} := datasize(\"{}\")",
+                    program_size_str,
+                    contract.name
+                );
+                emitln!(
+                    ctx.writer,
+                    "let {} := sub(codesize(), {})",
+                    arg_size_str,
+                    program_size_str
+                );
+                let malloc_call = self.call_builtin_str(
+                    ctx,
+                    YulFunction::Malloc,
+                    std::iter::once(arg_size_str.clone()),
+                );
+                emitln!(
+                    ctx.writer,
+                    "let {} := {}",
+                    memory_data_offset_str,
+                    malloc_call
+                );
+                emitln!(
+                    ctx.writer,
+                    "codecopy({}, {}, {})",
+                    memory_data_offset_str,
+                    program_size_str,
+                    arg_size_str
+                );
+                let decoding_fun_name = self.generate_abi_tuple_decoding_para(
+                    ctx,
+                    &solidity_sig,
+                    creator.get_parameter_types(),
+                    true,
+                );
+                params = (0..param_count).map(|i| format!("param_{}", i)).join(", ");
+                let let_params = format!("let {} := ", params);
+                emitln!(
+                    ctx.writer,
+                    "{}{}({}, add({}, {}))",
+                    let_params,
+                    decoding_fun_name,
+                    memory_data_offset_str,
+                    memory_data_offset_str,
+                    arg_size_str
+                );
+            }
+
+            // Call the function
+            if let Some(storage_id) = contract.storage {
+                // The creator function returns a value which we need to store as
+                // a resource.
+                emitln!(
+                    ctx.writer,
+                    "let $new_value := {}({})",
+                    function_name,
+                    params
+                );
+                let storage = module.get_id().qualified_inst(storage_id, vec![]);
+                self.move_to_addr(
+                    ctx,
+                    storage,
+                    "address()".to_string(),
+                    "$new_value".to_string(),
+                );
+            } else {
+                // Otherwise the creator function is responsible to store initialized data itself.
+                emitln!(ctx.writer, "{}({})", function_name, params);
+            }
+
+            self.need_move_function(&fun_id);
+        }
+    }
+
+    /// Generate Yul definitions for all callable functions.
+    fn callable_functions(
+        &mut self,
+        ctx: &Context,
+        callables: &[FunctionEnv<'_>],
+        receiver: Option<FunctionEnv<'_>>,
+        fallback: Option<FunctionEnv<'_>>,
+    ) {
+        self.generate_dispatcher_routine(ctx, callables, &receiver, &fallback);
+        for fun in callables {
+            ctx.check_no_generics(fun);
+            self.function(ctx, &fun.get_qualified_id().instantiate(vec![]))
+        }
+        if let Some(fun) = &receiver {
+            ctx.check_no_generics(fun);
+            self.function(ctx, &fun.get_qualified_id().instantiate(vec![]))
+        }
+        if let Some(fun) = &fallback {
+            ctx.check_no_generics(fun);
+            self.function(ctx, &fun.get_qualified_id().instantiate(vec![]))
+        }
+    }
+
+    /// Generate code for a function. This delegates to the function generator.
+    fn function(&mut self, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+        self.done_move_functions.insert(fun_id.clone());
+        FunctionGenerator::run(self, ctx, fun_id)
+    }
+
+    /// Begin a new code block.
+    fn begin_code_block(&mut self, ctx: &Context) {
+        assert!(self.needed_move_functions.is_empty());
+        assert!(self.needed_yul_functions.is_empty());
+        emitln!(ctx.writer, "code {");
+        ctx.writer.indent();
+    }
+
+    /// End a code block, generating all functions needed by top-level callable functions.
+    fn end_code_block(&mut self, ctx: &Context) {
+        // Before the end of the code block, we need to emit definitions of all
+        // functions reached by callable entry points. While we traversing this list,
+        // more functions might be added due to transitive calls.
+        while let Some(fun_id) = self.needed_move_functions.pop() {
+            if !self.done_move_functions.contains(&fun_id) {
+                self.function(ctx, &fun_id)
+            }
+        }
+
+        // We also need to emit code for all needed auxiliary functions.
+        while let Some((function_name, generator)) = self.needed_auxiliary_functions.pop() {
+            if !self.done_auxiliary_functions.contains(&function_name) {
+                emit!(ctx.writer, "function {}", function_name);
+                self.done_auxiliary_functions.insert(function_name);
+                generator(self, ctx)
+            }
+        }
+
+        // We finally emit code for all Yul functions which have been needed by the Move
+        // or auxiliary functions.
+        for fun in &self.needed_yul_functions {
+            emitln!(ctx.writer, &fun.yule_def());
+        }
+        // Empty the set of functions for next block.
+        self.done_move_functions.clear();
+        self.needed_yul_functions.clear();
+        self.done_auxiliary_functions.clear();
+        ctx.writer.unindent();
+        emitln!(ctx.writer, "}")
+    }
+}
+
+// ================================================================================================
+// Helpers shared with other modules
+
+impl Generator {
+    /// Generate call to a builtin function.
+    pub(crate) fn call_builtin(
+        &mut self,
+        ctx: &Context,
+        fun: YulFunction,
+        args: impl Iterator<Item = String>,
+    ) {
+        emitln!(ctx.writer, "{}", self.call_builtin_str(ctx, fun, args))
+    }
+
+    /// Generate call to a builtin function which delivers results.
+    pub(crate) fn call_builtin_with_result(
+        &mut self,
+        ctx: &Context,
+        prefix: &str,
+        mut results: impl Iterator<Item = String>,
+        fun: YulFunction,
+        args: impl Iterator<Item = String>,
+    ) {
+        emitln!(
+            ctx.writer,
+            "{}{} := {}",
+            prefix,
+            results.join(", "),
+            self.call_builtin_str(ctx, fun, args)
+        )
+    }
+
+    /// Create the string representing call to builtin function.
+    pub(crate) fn call_builtin_str(
+        &mut self,
+        _ctx: &Context,
+        fun: YulFunction,
+        mut args: impl Iterator<Item = String>,
+    ) -> String {
+        self.need_yul_function(fun);
+        for dep in fun.yule_deps() {
+            self.needed_yul_functions.insert(dep);
+        }
+        format!("{}({})", fun.yule_name(), args.join(", "))
+    }
+
+    /// Indicate that a Yul function is needed.
+    pub(crate) fn need_yul_function(&mut self, yul_fun: YulFunction) {
+        if !self.needed_yul_functions.contains(&yul_fun) {
+            self.needed_yul_functions.insert(yul_fun);
+            for dep in yul_fun.yule_deps() {
+                self.need_yul_function(dep);
+            }
+        }
+    }
+
+    /// Indicate that an auxiliary function of name is needed. Return the name.
+    pub(crate) fn need_auxiliary_function(
+        &mut self,
+        function_name: String,
+        generator: Box<AuxilaryFunctionGenerator>,
+    ) -> String {
+        if !self.done_auxiliary_functions.contains(&function_name) {
+            self.needed_auxiliary_functions
+                .push((function_name.clone(), generator));
+        }
+        function_name
+    }
+
+    /// Indicate that a move function is needed.
+    pub(crate) fn need_move_function(&mut self, fun_id: &QualifiedInstId<FunId>) {
+        if !self.done_move_functions.contains(fun_id) {
+            self.needed_move_functions.push(fun_id.clone())
+        }
+    }
+
+    pub(crate) fn equality_function(&mut self, ctx: &Context, ty: Type) -> String {
+        let function_name = format!("$Eq_{}", ctx.mangle_types(&[ty.clone()]));
+        if ctx.type_allocates_memory(&ty) {
+            let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+                emitln!(ctx.writer, "(x, y) -> res");
+                ctx.emit_block(|| {
+                    if ty.is_vector() {
+                        crate::vectors::equality_fun(gen, ctx, &ty)
+                    } else if ctx.type_is_struct(&ty) {
+                        struct_equality_fun(gen, ctx, &ty)
+                    }
+                });
+            };
+            self.need_auxiliary_function(function_name, Box::new(generate_fun))
+        } else {
+            self.need_yul_function(YulFunction::Eq);
+            YulFunction::Eq.yule_name()
+        }
+    }
+
+    /// Copy literal string to memory
+    pub(crate) fn copy_literal_to_memory(&mut self, value: Vec<u8>) -> String {
+        let name_prefix = "copy_literal_string_to_memory";
+        let function_name = format!("{}_{}", name_prefix, self.vector_u8_hash(&value));
+        let value = value.clone();
+        let generate_fun = move |gen: &mut Generator, ctx: &Context| {
+            emit!(ctx.writer, "(value) ");
+            ctx.emit_block(|| {
+                for c in value {
+                    let store_u8_str = gen.call_builtin_str(
+                        ctx,
+                        YulFunction::MemoryStoreU8,
+                        vec!["value".to_string(), c.to_string()].into_iter(),
+                    );
+                    emitln!(ctx.writer, "{}", store_u8_str);
+                    emitln!(ctx.writer, "value := add(value, 1)");
+                }
+            });
+        };
+        self.need_auxiliary_function(function_name, Box::new(generate_fun))
+    }
+
+    fn vector_u8_hash(&mut self, vec: &[u8]) -> u32 {
+        let mut keccak = Keccak256::new();
+        keccak.update(vec);
+        let digest = keccak.finalize();
+        u32::from_le_bytes([digest[0], digest[1], digest[2], digest[3]])
+    }
+
+    pub(crate) fn type_storage_base(
+        &mut self,
+        ctx: &Context,
+        ty: &Type,
+        category: &str,
+        instance: String,
+    ) -> String {
+        let hash = self.type_hash(ctx, ty);
+        self.call_builtin_str(
+            ctx,
+            YulFunction::MakeTypeStorageBase,
+            vec![category.to_string(), format!("0x{:x}", hash), instance].into_iter(),
+        )
+    }
+
+    /// Derive a 4 byte hash for a type. If this hash creates a collision in the current
+    /// contract, create an error.
+    pub(crate) fn type_hash(&mut self, ctx: &Context, ty: &Type) -> u32 {
+        let sig = ctx.mangle_type(ty);
+        let mut keccak = Keccak256::new();
+        keccak.update(sig.as_bytes());
+        let digest = keccak.finalize();
+        let hash = u32::from_le_bytes([digest[0], digest[1], digest[2], digest[3]]);
+        if let Some(old_ty) = self.type_sig_map.insert(hash, ty.clone()) {
+            if old_ty != *ty {
+                let ty_ctx = &ctx.env.get_type_display_ctx();
+                ctx.env.error(
+                    &self.contract_loc,
+                    &format!(
+                        "collision of type hash for types `{}` and `{}`\n\
+                         (resolution via attribute not yet implemented)",
+                        ty.display(ty_ctx),
+                        old_ty.display(ty_ctx)
+                    ),
+                )
+            }
+        }
+        hash
+    }
+}
+
+fn struct_equality_fun(gen: &mut Generator, ctx: &Context, ty: &Type) {
+    let struct_id = ty.get_struct_id(ctx.env).expect("struct");
+    let layout = ctx.get_struct_layout(&struct_id);
+
+    // Check pointer equality of fields first.
+    for field_offs in layout.field_order.iter().take(layout.pointer_count) {
+        let (byte_offs, field_ty) = layout.offsets.get(field_offs).unwrap();
+
+        emitln!(
+            ctx.writer,
+            "let f_x_{} := mload({})",
+            field_offs,
+            format!("add(x, {})", byte_offs)
+        );
+
+        emitln!(
+            ctx.writer,
+            "let f_y_{} := mload({})",
+            field_offs,
+            format!("add(y, {})", byte_offs)
+        );
+        let field_equality_call = format!(
+            "{}(f_x_{}, f_y_{})",
+            gen.equality_function(ctx, field_ty.clone()),
+            field_offs,
+            field_offs
+        );
+        emitln!(
+            ctx.writer,
+            "if {} {{\n  res:= false\n  leave\n}}",
+            gen.call_builtin_str(
+                ctx,
+                YulFunction::LogicalNot,
+                std::iter::once(field_equality_call)
+            )
+        );
+    }
+
+    // The remaining fields are all primitive. We directly check the memory content.
+    if layout.pointer_count < layout.field_order.len() {
+        let mut byte_offs = layout
+            .offsets
+            .get(&layout.field_order[layout.pointer_count])
+            .unwrap()
+            .0;
+        assert_eq!(
+            byte_offs % 32,
+            0,
+            "first non-pointer field on word boundary"
+        );
+        while byte_offs < layout.size {
+            emitln!(
+                ctx.writer,
+                "if {} {{\n  res:= false\n  leave\n}}",
+                gen.call_builtin_str(
+                    ctx,
+                    YulFunction::Neq,
+                    vec![
+                        format!("mload(add(x, {}))", byte_offs),
+                        format!("mload(add(y, {}))", byte_offs)
+                    ]
+                    .into_iter()
+                )
+            );
+            byte_offs += 32
+        }
+    }
+    emitln!(ctx.writer, "res := true");
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/lib.rs b/vendors/move/crates/evm/move-to-yul/src/lib.rs
new file mode 100644
index 000000000..346043fef
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/lib.rs
@@ -0,0 +1,148 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+mod abi_move_metadata;
+pub use abi_move_metadata::parse_metadata_to_move_sig;
+mod abi_native_functions;
+mod abi_signature;
+mod attributes;
+mod context;
+mod dispatcher_generator;
+mod events;
+mod evm_transformation;
+mod experiments;
+mod external_functions;
+mod functions;
+pub mod generator;
+mod native_functions;
+pub mod options;
+mod solidity_ty;
+mod storage;
+mod tables;
+mod vectors;
+mod yul_functions;
+
+use crate::{generator::Generator, options::Options};
+use anyhow::anyhow;
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{ColorChoice, StandardStream, WriteColor},
+};
+use move_compiler::{shared::PackagePaths, Flags};
+use move_core_types::metadata::Metadata;
+use move_model::{
+    model::GlobalEnv, options::ModelBuilderOptions, parse_addresses_from_options,
+    run_model_builder_with_options_and_compilation_flags,
+};
+use std::fs;
+
+/// Run move-to-yul compiler and print errors to stderr.
+pub fn run_to_yul_errors_to_stderr(options: Options) -> anyhow::Result<()> {
+    let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+    run_to_yul(&mut error_writer, options)
+}
+
+/// Run move-to-yul compiler and print errors to given writer.
+pub fn run_to_yul<W: WriteColor>(error_writer: &mut W, mut options: Options) -> anyhow::Result<()> {
+    // Run the model builder.
+    let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
+    let env = run_model_builder_with_options_and_compilation_flags(
+        vec![PackagePaths {
+            name: None,
+            paths: options.sources.clone(),
+            named_address_map: addrs.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: options.dependencies.clone(),
+            named_address_map: addrs,
+        }],
+        ModelBuilderOptions::default(),
+        Flags::empty().set_flavor("async"),
+    )?;
+    // If the model contains any errors, report them now and exit.
+    check_errors(
+        &env,
+        &options,
+        error_writer,
+        "exiting with Move build errors",
+    )?;
+    let mut contracts = Generator::run(&options, &env);
+    if contracts.len() > 1 {
+        env.diag(
+            Severity::Warning,
+            &env.unknown_loc(),
+            "current restriction: \
+        only one contract per compiler run (additional contracts ignored)",
+        );
+    }
+    check_errors(
+        &env,
+        &options,
+        error_writer,
+        "exiting with Yul generation errors",
+    )?;
+    if let Some((_, content, abi_content)) = contracts.pop() {
+        if let Some(i) = options.output.rfind('.') {
+            options.abi_output = format!("{}.abi.json", &options.output[..i]);
+        }
+        fs::write(options.output, content)?;
+        fs::write(options.abi_output, abi_content)?;
+    }
+    Ok(())
+}
+
+/// Generate metadata for move-ethereum-abi
+pub fn run_to_abi_metadata<W: WriteColor>(
+    error_writer: &mut W,
+    options: Options,
+) -> anyhow::Result<Vec<Metadata>> {
+    // Run the model builder.
+    let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
+    let env = run_model_builder_with_options_and_compilation_flags(
+        vec![PackagePaths {
+            name: None,
+            paths: options.sources.clone(),
+            named_address_map: addrs.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: options.dependencies.clone(),
+            named_address_map: addrs,
+        }],
+        ModelBuilderOptions::default(),
+        Flags::empty().set_flavor("async"),
+    )?;
+    // If the model contains any errors, report them now and exit.
+    check_errors(
+        &env,
+        &options,
+        error_writer,
+        "exiting with Move build errors",
+    )?;
+    let metadata_vec = Generator::generate_abi_metadata(&options, &env);
+    check_errors(
+        &env,
+        &options,
+        error_writer,
+        "exiting with Yul generation errors",
+    )?;
+    Ok(metadata_vec)
+}
+
+pub fn check_errors<W: WriteColor>(
+    env: &GlobalEnv,
+    options: &Options,
+    error_writer: &mut W,
+    msg: &'static str,
+) -> anyhow::Result<()> {
+    env.report_diag(error_writer, options.report_severity());
+    if env.has_errors() {
+        Err(anyhow!(msg))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/main.rs b/vendors/move/crates/evm/move-to-yul/src/main.rs
new file mode 100644
index 000000000..e7010ac2a
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/main.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use move_to_yul::{options::Options, run_to_yul};
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        let mut c = e.source();
+        while let Some(s) = c {
+            eprintln!("caused by: {}", s);
+            c = s.source();
+        }
+        std::process::exit(1)
+    }
+}
+
+fn run() -> anyhow::Result<()> {
+    let options = Options::parse();
+    let color = if atty::is(atty::Stream::Stderr) && atty::is(atty::Stream::Stdout) {
+        ColorChoice::Auto
+    } else {
+        ColorChoice::Never
+    };
+    let mut error_writer = StandardStream::stderr(color);
+    run_to_yul(&mut error_writer, options)
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/native_functions.rs b/vendors/move/crates/evm/move-to-yul/src/native_functions.rs
new file mode 100644
index 000000000..453897c7d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/native_functions.rs
@@ -0,0 +1,479 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    attributes, context::Context, events, functions::FunctionGenerator, yul_functions::YulFunction,
+};
+use move_model::{
+    ast::ModuleName,
+    emit, emitln,
+    model::{FunId, FunctionEnv, ModuleEnv, QualifiedId, QualifiedInstId},
+    ty::Type,
+};
+use std::collections::BTreeMap;
+
+/// A holder for native function generators.
+#[derive(Default)]
+pub(crate) struct NativeFunctions {
+    generators: BTreeMap<QualifiedId<FunId>, Box<NativeFunctionGenerator>>,
+}
+
+type NativeFunctionGenerator = dyn Fn(&mut FunctionGenerator, &Context, &QualifiedInstId<FunId>);
+
+impl NativeFunctions {
+    /// Create a NativeFunctions holder and register all function definitions.
+    pub(crate) fn create(ctx: &Context) -> Self {
+        let mut funs = NativeFunctions::default();
+        funs.define_evm_functions(ctx);
+        funs.define_move_functions(ctx);
+        funs.define_vector_functions(ctx);
+        funs.define_table_functions(ctx);
+        funs
+    }
+
+    /// Check whether fun is an emit event function
+    fn is_emit_fun(&self, fun: &FunctionEnv<'_>) -> bool {
+        fun.get_full_name_str() == "Evm::emit"
+    }
+
+    /// Generate code for a native function.
+    pub(crate) fn gen_native_function(
+        &self,
+        gen: &mut FunctionGenerator,
+        ctx: &Context,
+        fun_id: &QualifiedInstId<FunId>,
+    ) {
+        if let Some(ngen) = self.generators.get(&fun_id.to_qualified_id()) {
+            // generate the function header
+            let fun_name = ctx.make_function_name(fun_id);
+            emit!(ctx.writer, "function {}", fun_name);
+            ngen(gen, ctx, fun_id)
+        } else {
+            let fun = &ctx.env.get_function(fun_id.to_qualified_id());
+            if attributes::is_external_fun(fun) {
+                self.define_external_fun(
+                    gen,
+                    ctx,
+                    fun_id,
+                    attributes::extract_external_signature(fun),
+                )
+            } else if self.is_emit_fun(fun) {
+                let elem_type = fun_id.inst.get(0).unwrap(); // obtain the event type
+                if let Type::Struct(mid, sid, inst) = elem_type {
+                    let st_id = QualifiedInstId {
+                        module_id: *mid,
+                        id: *sid,
+                        inst: inst.to_owned(),
+                    };
+                    let ev_signature_map = ctx.event_signature_map.borrow();
+                    let sig_opt = ev_signature_map.get(&st_id);
+                    if let Some(sig) = sig_opt {
+                        events::define_emit_fun(gen, ctx, sig, &st_id, fun_id);
+                    } else {
+                        ctx.env.error(
+                            &gen.parent.contract_loc,
+                            &format!(
+                                "native function {} can only emit event structs but `{}` is not an #[event]",
+                                ctx.env
+                                    .get_function(fun_id.to_qualified_id())
+                                    .get_full_name_str(),
+                                ctx.env.display(&st_id)
+                            ),
+                        )
+                    }
+                }
+            } else if fun.get_full_name_str().contains("send_")
+                && attributes::has_attr(
+                    fun.module_env.env,
+                    fun.module_env.get_attributes(),
+                    "actor",
+                    false,
+                )
+            {
+                let fun_name = fun.get_full_name_str();
+                let mut st_name = String::from(&fun_name[fun_name.find("send_").unwrap() + 5..]);
+                st_name.replace_range(0..1, &st_name[0..1].to_uppercase());
+                let ev_signature_map = ctx.event_signature_map.borrow();
+                for (st_id, sig) in ev_signature_map.iter() {
+                    let st_env = ctx.env.get_struct(st_id.to_qualified_id());
+                    if st_name == st_env.get_name().display(st_env.symbol_pool()).to_string() {
+                        events::define_emit_fun_for_send(gen, ctx, sig, fun_id);
+                        break;
+                    }
+                }
+            } else if attributes::is_decode(fun) {
+                self.define_decode_fun(gen, ctx, fun_id, attributes::extract_decode_signature(fun));
+            } else if attributes::is_encode(fun) {
+                self.define_encode_fun(
+                    gen,
+                    ctx,
+                    fun_id,
+                    attributes::extract_encode_signature(fun, false),
+                    false,
+                )
+            } else if attributes::is_encode_packed(fun) {
+                self.define_encode_fun(
+                    gen,
+                    ctx,
+                    fun_id,
+                    attributes::extract_encode_signature(fun, true),
+                    true,
+                )
+            } else {
+                ctx.env.error(
+                    &gen.parent.contract_loc,
+                    &format!(
+                        "native function {} not implemented (w/ signature `{:?}`)",
+                        ctx.env
+                            .get_function(fun_id.to_qualified_id())
+                            .get_full_name_str(),
+                        fun_id.inst,
+                    ),
+                )
+            }
+        }
+    }
+
+    /// Defines a native function generator.
+    pub(crate) fn define<F>(
+        &mut self,
+        ctx: &Context,
+        module: &Option<ModuleEnv>,
+        name: &str,
+        gen: F,
+    ) where
+        F: Fn(&mut FunctionGenerator, &Context, &QualifiedInstId<FunId>) + 'static,
+    {
+        if let Some(fun_id) = self.find_fun(ctx, module, name) {
+            self.generators.insert(fun_id, Box::new(gen));
+        }
+    }
+
+    /// Helper to find a module by name. The module may not exists as it is not used in the
+    /// current compiler's run.
+    pub(crate) fn find_module<'a>(
+        &self,
+        ctx: &Context<'a>,
+        addr: &str,
+        name: &str,
+    ) -> Option<ModuleEnv<'a>> {
+        let name = ModuleName::from_str(addr, ctx.env.symbol_pool().make(name));
+        ctx.env.find_module(&name)
+    }
+
+    /// Helper to find a function by name.
+    pub(crate) fn find_fun(
+        &self,
+        ctx: &Context,
+        module: &Option<ModuleEnv>,
+        name: &str,
+    ) -> Option<QualifiedId<FunId>> {
+        module.as_ref().and_then(|m| {
+            m.find_function(ctx.env.symbol_pool().make(name))
+                .map(|f| f.get_qualified_id())
+        })
+    }
+}
+
+// ========================================================================================
+// Functions in the Evm module.
+
+impl NativeFunctions {
+    fn define_evm_functions(&mut self, ctx: &Context) {
+        // TODO: may want to have symbolic representation of addr (which is 'Eth')
+        let evm = &self.find_module(ctx, "0x2", "Evm");
+        let async_actor_lib = &self.find_module(ctx, "0x1", "Actor");
+
+        self.define(ctx, evm, "sign", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+(addr) -> signer {
+  signer := addr
+}"
+            );
+        });
+
+        self.define(ctx, evm, "self", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> addr {
+  addr := address()
+}"
+            );
+        });
+
+        self.define(ctx, async_actor_lib, "self", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> addr {
+  addr := address()
+}"
+            );
+        });
+
+        self.define(
+            ctx,
+            async_actor_lib,
+            "virtual_time",
+            |_, ctx: &Context, _| {
+                emitln!(
+                    ctx.writer,
+                    "\
+() -> virtual_time {
+    virtual_time := timestamp()
+}"
+                );
+            },
+        );
+
+        self.define(ctx, evm, "abort_with", |gen, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+(message) {{
+  let head := $Malloc(32)
+  // store the function selector for Error(string)
+  mstore(head, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
+  let pos := add(head, 4)
+  mstore(pos, 32)
+  pos := add(pos, 32)
+  let size := {}
+  mstore(pos, size)
+  pos := add(pos, 32)
+  {}
+  size := {}
+  let end := add(pos, size)
+  revert(head, sub(end, head))
+}}",
+                gen.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::MemoryLoadU64,
+                    std::iter::once("message".to_string())
+                ),
+                gen.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::CopyMemory,
+                    vec![
+                        "add(message, 32)".to_string(),
+                        "pos".to_string(),
+                        "size".to_string()
+                    ]
+                    .into_iter()
+                ),
+                gen.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::RoundUp,
+                    std::iter::once("size".to_string())
+                )
+            );
+        });
+
+        self.define(ctx, evm, "blockhash", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+(block_number) -> hash {
+  hash := blockhash(block_number)
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_basefee", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := basefee()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_chainid", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := chainid()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_coinbase", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := coinbase()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_difficulty", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := difficulty()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_gaslimit", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := gaslimit()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_number", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := number()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "block_timestamp", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := timestamp()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "gasleft", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := gas()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "msg_data", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := calldataload(0)
+}"
+            );
+        });
+
+        self.define(ctx, evm, "msg_sender", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := caller()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "msg_sig", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := timestamp()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "msg_value", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := callvalue()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "tx_gasprice", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := gasprice()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "tx_origin", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> result {
+  result := origin()
+}"
+            );
+        });
+
+        self.define(ctx, evm, "extcodesize", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+                (addr) -> result {
+                  result := extcodesize(addr)
+                }"
+            );
+        });
+
+        self.define(ctx, evm, "to_string", |gen, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+                (x) -> result {{
+                  result := {}
+                }}",
+                gen.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::NumToString,
+                    std::iter::once("x".to_string())
+                ),
+            );
+        });
+
+        self.define(ctx, evm, "concat", |gen, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+                (s1, s2) -> result {{
+                  result := {}
+                }}",
+                gen.parent.call_builtin_str(
+                    ctx,
+                    YulFunction::ExtendVector,
+                    vec!["s1".to_string(), "s2".to_string(), 1.to_string()].into_iter()
+                ),
+            );
+        });
+    }
+
+    fn define_move_functions(&mut self, ctx: &Context) {
+        let signer = &self.find_module(ctx, "0x1", "signer");
+
+        self.define(ctx, signer, "borrow_address", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+(signer_ref) -> addr_ref {
+  addr_ref := signer_ref
+}"
+            );
+        });
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/options.rs b/vendors/move/crates/evm/move-to-yul/src/options.rs
new file mode 100644
index 000000000..f1b282f53
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/options.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::experiments::Experiment;
+use clap::Parser;
+use codespan_reporting::diagnostic::Severity;
+
+/// Options for a run of the compiler.
+#[derive(Parser, Debug)]
+#[clap(author, version, about)]
+pub struct Options {
+    /// Directories where to lookup dependencies.
+    #[clap(
+        short,
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub dependencies: Vec<String>,
+    /// Named address mapping.
+    #[clap(
+        short,
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub named_address_mapping: Vec<String>,
+    /// Output file name.
+    #[clap(short)]
+    #[clap(long, default_value = "output.yul")]
+    pub output: String,
+    /// Solc executable
+    #[clap(long, env = "SOLC_EXE", default_value = "solc")]
+    pub solc_exe: String,
+    /// Whether to dump bytecode to a file.
+    #[clap(long = "dump-bytecode")]
+    pub dump_bytecode: bool,
+    /// Whether we generate code for tests.
+    #[clap(long)]
+    pub testing: bool,
+    /// Active experiments.
+    #[clap(short)]
+    #[clap(
+        long = "experiment",
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub experiments: Vec<String>,
+    /// Sources to compile (positional arg)
+    pub sources: Vec<String>,
+    #[clap(long = "abi-output", default_value = "output.abi.json")]
+    pub abi_output: String,
+}
+
+impl Default for Options {
+    fn default() -> Self {
+        Parser::parse_from(std::iter::empty::<String>())
+    }
+}
+
+impl Options {
+    /// Returns the least severity of diagnosis which shall be reported.
+    pub fn report_severity(&self) -> Severity {
+        Severity::Warning
+    }
+
+    /// Returns the version of the tool.
+    pub fn version(&self) -> &str {
+        "0.0"
+    }
+
+    /// Returns true if an experiment is on.
+    pub fn experiment_on(&self, name: &str) -> bool {
+        self.experiments.iter().any(|s| s == name)
+    }
+
+    /// Returns true if source info should be generated during tests.
+    pub fn generate_source_info(&self) -> bool {
+        !self.testing || self.experiment_on(Experiment::CAPTURE_SOURCE_INFO)
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/solidity_ty.rs b/vendors/move/crates/evm/move-to-yul/src/solidity_ty.rs
new file mode 100644
index 000000000..0b95e28ce
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/solidity_ty.rs
@@ -0,0 +1,927 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Representation of solidity types and related functions.
+//! TODO: struct and function type
+
+use crate::{attributes, context::Context};
+use anyhow::{anyhow, Context as AnyhowContext};
+use itertools::Itertools;
+use move_model::{
+    model::{FunctionEnv, Parameter, QualifiedInstId, StructEnv, StructId},
+    ty::{PrimitiveType, Type},
+};
+use once_cell::sync::Lazy;
+use regex::Regex;
+use std::{fmt, fmt::Formatter};
+
+pub(crate) const PARSE_ERR_MSG: &str = "error happens when parsing the signature";
+pub(crate) const PARSE_ERR_MSG_SIMPLE_TYPE: &str = "error happens when parsing a simple type";
+pub(crate) const PARSE_ERR_MSG_ARRAY_TYPE: &str = "error happens when parsing an array type";
+pub(crate) const PARSE_ERR_MSG_RETURN: &str =
+    "error happens when parsing the return types in the signature";
+pub(crate) const PARSE_ERR_MSG_ZERO_SIZE: &str = "array with zero length specified";
+pub(crate) const PARSE_ERR_STRUCT_ABI: &str =
+    "error happens when parsing the abi signature for struct";
+
+/// Represents a Solidity Signature appearing in the callable attribute.
+#[derive(Debug, Clone)]
+pub(crate) struct SoliditySignature {
+    pub sig_name: String,
+    pub para_types: Vec<(SolidityType, String, SignatureDataLocation)>,
+    pub ret_types: Vec<(SolidityType, SignatureDataLocation)>,
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub(crate) enum SignatureDataLocation {
+    // CallData, calldata is not supported yet
+    Memory,
+}
+
+/// Represents a primitive value type.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub(crate) enum SolidityPrimitiveType {
+    Bool,
+    Uint(usize),
+    Int(usize),
+    Fixed(usize, usize),
+    Ufixed(usize, usize),
+    Address(bool),
+}
+
+/// Represents a Solidity type
+/// TODO: struct
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub(crate) enum SolidityType {
+    Primitive(SolidityPrimitiveType),
+    Tuple(Vec<SolidityType>),
+    DynamicArray(Box<SolidityType>),
+    StaticArray(Box<SolidityType>, usize),
+    SolidityString,
+    Bytes,
+    BytesStatic(usize),
+    Struct(String, Vec<(usize, usize, Type, String, SolidityType)>),
+}
+
+// ================================================================================================
+// Pretty print for SignatureDataLocation
+
+impl fmt::Display for SignatureDataLocation {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use SignatureDataLocation::*;
+        match self {
+            // CallData => f.write_str("calldata"),
+            Memory => f.write_str("memory"),
+        }
+    }
+}
+
+// ================================================================================================
+// Pretty print for SolidityPrimitiveType
+
+impl fmt::Display for SolidityPrimitiveType {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use SolidityPrimitiveType::*;
+        match self {
+            Bool => f.write_str("bool"),
+            Uint(n) => write!(f, "uint{}", n),
+            Int(n) => write!(f, "int{}", n),
+            Fixed(m, n) => write!(f, "fixed{}x{}", m, n),
+            Ufixed(m, n) => write!(f, "ufixed{}x{}", m, n),
+            Address(_) => f.write_str("address"),
+        }
+    }
+}
+
+impl SolidityPrimitiveType {
+    /// Check type compatibility for primitive types
+    /// TODO: int and fixed are not supported yet
+    pub fn check_primitive_type_compatibility(&self, ctx: &Context, move_ty: &Type) -> bool {
+        use SolidityPrimitiveType::*;
+        match self {
+            Bool => move_ty.is_bool(),
+            Uint(i) => self.check_uint_compatibility(ctx, *i, move_ty),
+            Int(i) => self.check_uint_compatibility(ctx, *i, move_ty), // current we assume int<N> in Solidity is specified in Move as a u<M> value.
+            Fixed(_, _) => false,
+            Ufixed(_, _) => false,
+            Address(_) => move_ty.is_signer_or_address(),
+        }
+    }
+
+    /// Check whether move_ty is big enough to represent a uint number
+    fn check_uint_compatibility(&self, ctx: &Context, size: usize, move_ty: &Type) -> bool {
+        match move_ty {
+            Type::Primitive(p) => match p {
+                PrimitiveType::U8 => size == 8,
+                PrimitiveType::U64 => size <= 64,
+                PrimitiveType::U128 => size <= 128,
+                _ => false,
+            },
+            Type::Struct(mid, sid, _) => ctx.is_u256(mid.qualified(*sid)),
+            _ => false,
+        }
+    }
+}
+
+// ================================================================================================
+// Pretty print for SolidityType
+
+impl fmt::Display for SolidityType {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use SolidityType::*;
+        match self {
+            Primitive(ty) => write!(f, "{}", ty),
+            Tuple(tys) => {
+                let s = tys
+                    .iter()
+                    .map(|ref t| format!("{}", t))
+                    .collect::<Vec<String>>()
+                    .join(",");
+                write!(f, "({})", s)
+            },
+            DynamicArray(ty) => write!(f, "{}[]", ty),
+            StaticArray(ty, n) => write!(f, "{}[{}]", ty, n),
+            SolidityString => f.write_str("string"),
+            Bytes => f.write_str("bytes"),
+            BytesStatic(n) => write!(f, "bytes{}", n),
+            Struct(_, tys) => {
+                let s = tys
+                    .iter()
+                    .map(|(_, _, _, _, t)| format!("{}", t))
+                    .collect::<Vec<String>>()
+                    .join(",");
+                write!(f, "({})", s)
+            },
+        }
+    }
+}
+
+// ================================================================================================
+// Parse solidity signatures and check type compatibility
+
+impl SolidityType {
+    /// Check whether ty is a static type in the sense of serialization
+    pub fn is_static(&self) -> bool {
+        use SolidityType::*;
+        let conjunction = |tys: &[SolidityType]| {
+            tys.iter()
+                .map(|t| t.is_static())
+                .collect::<Vec<_>>()
+                .into_iter()
+                .all(|t| t)
+        };
+        match self {
+            Primitive(_) | BytesStatic(_) => true,
+            Tuple(tys) => conjunction(tys),
+            StaticArray(ty, _) => ty.is_static(),
+            Struct(_, tys) => {
+                conjunction(&tys.iter().map(|(_, _, _, _, t)| t.clone()).collect_vec())
+            },
+            _ => false,
+        }
+    }
+
+    /// Check whether it is a static array
+    pub fn is_array_static_size(&self) -> bool {
+        use SolidityType::*;
+        match self {
+            StaticArray(_, _) | BytesStatic(_) => true,
+            SolidityString | DynamicArray(_) | Bytes => false,
+            _ => panic!("wrong type"),
+        }
+    }
+
+    /// Check whether it is an array
+    pub fn is_array(&self) -> bool {
+        use SolidityType::*;
+        matches!(self, StaticArray(_, _) | DynamicArray(_))
+    }
+
+    /// Check whether a type is a value type
+    pub(crate) fn is_value_type(&self) -> bool {
+        use SolidityType::*;
+        matches!(self, Primitive(_) | BytesStatic(_))
+    }
+
+    /// Returns the max value (bit mask) for a given type.
+    pub(crate) fn max_value(&self) -> String {
+        let size = self.abi_head_size(false);
+        assert!(size <= 32, "unexpected type size {} for `{}`", size, self);
+        let multipler = size * 8;
+        format!("${{MAX_U{}}}", multipler)
+    }
+
+    /// Generate struct type using default type information
+    pub(crate) fn generate_default_struct_type(ctx: &Context, st: &StructEnv<'_>) -> Self {
+        let mut name = st.get_full_name_with_address();
+        if let Some(i) = name.rfind(':') {
+            name = name[i + 1..].to_string();
+        }
+        let st_id = &st.get_qualified_id().instantiate(vec![]);
+        // Obtain the layout of the struct
+        let layout = ctx.get_struct_layout(st_id);
+
+        let tys = st
+            .get_fields()
+            .map(|field| {
+                let field_type = field.get_type();
+                let field_name = st.symbol_pool().string(field.get_name()).to_string();
+                (field.get_offset(), field_type, field_name)
+            })
+            .sorted_by_key(|(offset, _, _)| *offset);
+        let solidity_tys = tys
+            .clone()
+            .map(|(_, t, _)| {
+                let bytes_flag = ctx.is_string(st_id.to_qualified_id()); // vec<u8> in String is translated into bytes
+                Self::translate_from_move(ctx, &t, bytes_flag)
+            })
+            .collect::<Vec<_>>();
+        let mut struct_tys_tuple = vec![];
+        for ((offset, field_type, field_name), ty) in tys.zip(solidity_tys.iter()) {
+            let (real_offset, _) = layout.offsets.get(&offset).unwrap();
+            struct_tys_tuple.push((
+                offset,
+                *real_offset,
+                field_type.clone(),
+                field_name.clone(),
+                ty.clone(),
+            ));
+        }
+        SolidityType::Struct(name, struct_tys_tuple)
+    }
+
+    /// Parse type list in the signature and generate types
+    fn extract_struct_type_lst(ctx: &Context, args: &str) -> anyhow::Result<Vec<SolidityType>> {
+        let args_trim = args.trim();
+        if args_trim.is_empty() {
+            return Ok(vec![]);
+        }
+        let mut ret_vec = vec![];
+        let paras = args_trim.split(',').collect_vec();
+
+        for para in paras.iter() {
+            let para_trim = para.trim();
+            if para_trim.is_empty() {
+                return Err(anyhow!(PARSE_ERR_MSG));
+            }
+            let para_type_str = para_trim;
+            let ty = SolidityType::parse(ctx, para_type_str)?;
+            ret_vec.push(ty);
+        }
+        Ok(ret_vec)
+    }
+
+    /// Parse the type signature and generate struct type
+    pub(crate) fn parse_struct_type(
+        ctx: &Context,
+        sig_str: &str,
+        st: &StructEnv<'_>,
+    ) -> anyhow::Result<Self> {
+        let tys = st
+            .get_fields()
+            .map(|field| {
+                let field_type = field.get_type();
+                let field_name = st.symbol_pool().string(field.get_name()).to_string();
+                (field.get_offset(), field_type, field_name)
+            })
+            .sorted_by_key(|(offset, _, _)| *offset);
+
+        static SIG_REG: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"^\s*(?P<sig_name>[a-zA-Z_$][a-zA-Z_$0-9]*)\s*\((?P<args>[^)]*)\)").unwrap()
+        });
+
+        if let Some(parsed) = SIG_REG.captures(sig_str.trim()) {
+            let sig_name = parsed.name("sig_name").context(PARSE_ERR_MSG)?.as_str();
+            let para_type_str = parsed.name("args").context(PARSE_ERR_MSG)?.as_str();
+            let solidity_tys = SolidityType::extract_struct_type_lst(ctx, para_type_str)?;
+
+            let st_id = &st.get_qualified_id().instantiate(vec![]);
+            // Obtain the layout of the struct
+            let layout = ctx.get_struct_layout(st_id);
+
+            let mut struct_tys_tuple = vec![];
+            for ((offset, field_type, field_name), ty) in tys.zip(solidity_tys.iter()) {
+                let (real_offset, _) = layout.offsets.get(&offset).unwrap();
+                struct_tys_tuple.push((
+                    offset,
+                    *real_offset,
+                    field_type.clone(),
+                    field_name.clone(),
+                    ty.clone(),
+                ));
+            }
+            return Ok(SolidityType::Struct(sig_name.to_string(), struct_tys_tuple));
+        }
+        Err(anyhow!(PARSE_ERR_STRUCT_ABI))
+    }
+
+    /// Parse a move type into a solidity type
+    pub(crate) fn translate_from_move(ctx: &Context, ty: &Type, bytes_flag: bool) -> Self {
+        use PrimitiveType::*;
+        use Type::*;
+        let generate_tuple = |tys: &Vec<Type>| {
+            let s_type = tys
+                .iter()
+                .map(|t| Self::translate_from_move(ctx, t, bytes_flag))
+                .collect::<Vec<_>>();
+            SolidityType::Tuple(s_type)
+        };
+        match ty {
+            Primitive(p) => match p {
+                Bool => SolidityType::Primitive(SolidityPrimitiveType::Bool),
+                U8 => SolidityType::Primitive(SolidityPrimitiveType::Uint(8)),
+                U64 => SolidityType::Primitive(SolidityPrimitiveType::Uint(64)),
+                U128 => SolidityType::Primitive(SolidityPrimitiveType::Uint(128)),
+                Address => SolidityType::Primitive(SolidityPrimitiveType::Address(false)),
+                Signer => SolidityType::Primitive(SolidityPrimitiveType::Address(false)),
+                Num | Range | EventStore | U16 | U32 | U256 => {
+                    panic!("unexpected field type")
+                },
+            },
+            Vector(ety) => {
+                if bytes_flag {
+                    if let Primitive(U8) = **ety {
+                        // translate vector<u8> to Bytes
+                        return SolidityType::Bytes;
+                    }
+                }
+                SolidityType::DynamicArray(Box::new(Self::translate_from_move(
+                    ctx, ety, bytes_flag,
+                )))
+            },
+            Tuple(tys) => generate_tuple(tys),
+            Struct(mid, sid, _) => {
+                if ctx.is_u256(mid.qualified(*sid)) {
+                    SolidityType::Primitive(SolidityPrimitiveType::Uint(256))
+                } else {
+                    let struct_id = mid.qualified(*sid);
+                    let struct_env = ctx.env.get_struct(struct_id);
+                    if ctx.is_structs_abi(&struct_env) {
+                        // Generate struct type if it is an abi_struct
+                        Self::generate_default_struct_type(ctx, &struct_env)
+                    } else {
+                        let tys = ctx.get_field_types(mid.qualified(*sid));
+                        generate_tuple(&tys) // translate into tuple type
+                    }
+                }
+            },
+            TypeParameter(_)
+            | Reference(_, _)
+            | Fun(_, _)
+            | TypeDomain(_)
+            | ResourceDomain(_, _, _)
+            | Error
+            | Var(_) => {
+                panic!("unexpected field type")
+            },
+        }
+    }
+
+    /// Parse a solidity type
+    pub(crate) fn parse(ctx: &Context, ty_str: &str) -> anyhow::Result<Self> {
+        let trimmed_ty_str = ty_str.trim();
+        if trimmed_ty_str.contains('[') {
+            // array type
+            SolidityType::parse_array(ctx, trimmed_ty_str)
+        } else if check_simple_type_prefix(trimmed_ty_str) {
+            // primitive and byte types
+            SolidityType::parse_simple_type(trimmed_ty_str)
+        } else {
+            // Solidity identifier matching
+            static RE_GENERAL_TYPE: Lazy<Regex> =
+                Lazy::new(|| Regex::new(r"^[a-zA-Z_$][a-zA-Z_$0-9]*$").unwrap());
+            if !RE_GENERAL_TYPE.is_match(trimmed_ty_str) {
+                println!("trim:{}", trimmed_ty_str);
+                let error_msg = "illegal type name";
+                return Err(anyhow!(error_msg));
+            }
+            ctx.check_or_create_struct_abi(trimmed_ty_str)
+        }
+    }
+
+    /// Parse value, bytes and string types
+    fn parse_simple_type(ty_str: &str) -> anyhow::Result<Self> {
+        if ty_str == "bool" {
+            return Ok(SolidityType::Primitive(SolidityPrimitiveType::Bool));
+        }
+        if ty_str.starts_with("uint") {
+            let prefix_len = "uint".len();
+            if ty_str.len() > prefix_len {
+                let num = ty_str[prefix_len..]
+                    .parse::<usize>()
+                    .context(PARSE_ERR_MSG)?;
+                if check_type_int_range(num) {
+                    return Ok(SolidityType::Primitive(SolidityPrimitiveType::Uint(num)));
+                }
+            } else {
+                return Ok(SolidityType::Primitive(SolidityPrimitiveType::Uint(256)));
+            }
+        }
+        if ty_str.starts_with("int") {
+            let prefix_len = "int".len();
+            if ty_str.len() > prefix_len {
+                let num = ty_str[prefix_len..]
+                    .parse::<usize>()
+                    .context(PARSE_ERR_MSG)?;
+                if check_type_int_range(num) {
+                    return Ok(SolidityType::Primitive(SolidityPrimitiveType::Int(num)));
+                }
+            } else {
+                return Ok(SolidityType::Primitive(SolidityPrimitiveType::Int(256)));
+            }
+        }
+        if ty_str.starts_with("address") {
+            let prefix_len = "address".len();
+            if ty_str.len() > prefix_len {
+                let address_type_array = ty_str.split_whitespace().collect_vec();
+                if address_type_array.len() == 2 && address_type_array[1] == "payable" {
+                    return Ok(SolidityType::Primitive(SolidityPrimitiveType::Address(
+                        true,
+                    )));
+                }
+            } else if ty_str == "address" {
+                return Ok(SolidityType::Primitive(SolidityPrimitiveType::Address(
+                    false,
+                )));
+            }
+        }
+        if ty_str.starts_with("fixed") {
+            let prefix_len = "fixed".len();
+            if ty_str.len() > prefix_len {
+                let num_str = &ty_str[prefix_len..];
+                let x_pos = num_str.rfind('x').context(PARSE_ERR_MSG)?;
+                let num_m = num_str[0..x_pos].parse::<usize>().context(PARSE_ERR_MSG)?;
+                let num_n = num_str[x_pos + 1..]
+                    .parse::<usize>()
+                    .context(PARSE_ERR_MSG)?;
+                if check_type_int_range(num_m) && check_fixed_n_range(num_n) {
+                    return Ok(SolidityType::Primitive(SolidityPrimitiveType::Fixed(
+                        num_m, num_n,
+                    )));
+                }
+            } else {
+                return Ok(SolidityType::Primitive(SolidityPrimitiveType::Fixed(
+                    128, 18,
+                )));
+            }
+        }
+        if ty_str.starts_with("ufixed") {
+            let prefix_len = "ufixed".len();
+            if ty_str.len() > prefix_len {
+                let num_str = &ty_str[prefix_len..];
+                let x_pos = num_str.rfind('x').context(PARSE_ERR_MSG)?;
+                let num_m = num_str[0..x_pos].parse::<usize>().context(PARSE_ERR_MSG)?;
+                let num_n = num_str[x_pos + 1..]
+                    .parse::<usize>()
+                    .context(PARSE_ERR_MSG)?;
+                if check_type_int_range(num_m) && check_fixed_n_range(num_n) {
+                    return Ok(SolidityType::Primitive(SolidityPrimitiveType::Ufixed(
+                        num_m, num_n,
+                    )));
+                }
+            } else {
+                return Ok(SolidityType::Primitive(SolidityPrimitiveType::Ufixed(
+                    128, 18,
+                )));
+            }
+        }
+        if ty_str.starts_with("bytes") {
+            let prefix_len = "bytes".len();
+            if ty_str.len() > prefix_len {
+                let num = ty_str[prefix_len..]
+                    .parse::<usize>()
+                    .context(PARSE_ERR_MSG)?;
+                if check_static_bytes_range(num) {
+                    return Ok(SolidityType::BytesStatic(num));
+                }
+            } else {
+                return Ok(SolidityType::Bytes);
+            }
+        }
+        if ty_str == "string" {
+            return Ok(SolidityType::SolidityString);
+        }
+        Err(anyhow!(PARSE_ERR_MSG_SIMPLE_TYPE))
+    }
+
+    /// Parse array types
+    fn parse_array(ctx: &Context, ty_str: &str) -> anyhow::Result<Self> {
+        let last_pos = ty_str.rfind('[').context(PARSE_ERR_MSG)?;
+        let out_type = SolidityType::parse(ctx, &ty_str[..last_pos])?;
+        let last_indice_str = &ty_str[last_pos..].trim();
+        if last_indice_str.len() >= 2
+            && last_indice_str.starts_with('[')
+            && last_indice_str.ends_with(']')
+        {
+            let length_opt = last_indice_str[1..last_indice_str.len() - 1].trim();
+            if !length_opt.is_empty() {
+                let size = length_opt.parse::<usize>().context(PARSE_ERR_MSG)?;
+                if size == 0 {
+                    return Err(anyhow!(PARSE_ERR_MSG_ZERO_SIZE));
+                }
+                return Ok(SolidityType::StaticArray(Box::new(out_type), size));
+            } else {
+                return Ok(SolidityType::DynamicArray(Box::new(out_type)));
+            }
+        }
+        Err(anyhow!(PARSE_ERR_MSG_ARRAY_TYPE))
+    }
+
+    /// Compute the data size of ty on the stack
+    pub fn abi_head_size(&self, padded: bool) -> usize {
+        use crate::solidity_ty::{SolidityPrimitiveType::*, SolidityType::*};
+        if self.is_static() {
+            match self {
+                Primitive(p) => match p {
+                    Bool => {
+                        if padded {
+                            32
+                        } else {
+                            1
+                        }
+                    },
+                    Int(size) | Uint(size) | Fixed(size, _) | Ufixed(size, _) => {
+                        if padded {
+                            32
+                        } else {
+                            size / 8
+                        }
+                    },
+                    Address(_) => {
+                        if padded {
+                            32
+                        } else {
+                            20
+                        }
+                    },
+                },
+                StaticArray(ty, size) => {
+                    let mut size = ty.abi_head_size(true) * size;
+                    if padded {
+                        size = ((size + 31) / 32) * 32;
+                    }
+                    size
+                },
+                BytesStatic(size) => {
+                    if padded {
+                        32
+                    } else {
+                        size * 8
+                    }
+                },
+                Tuple(tys) => abi_head_sizes_sum(tys, padded),
+                Struct(_, ty_tuples) => {
+                    let tys = ty_tuples
+                        .iter()
+                        .map(|(_, _, _, _, ty)| ty.clone())
+                        .collect_vec();
+                    abi_head_sizes_sum(&tys, padded)
+                },
+                _ => panic!("wrong types"),
+            }
+        } else {
+            // Dynamic types
+            32
+        }
+    }
+
+    /// Check whether a solidity type is compatible with its corresponding move type
+    /// TODO: int<M> and fixed are not supported yets
+    pub(crate) fn check_type_compatibility(&self, ctx: &Context, move_ty: &Type) -> bool {
+        match self {
+            SolidityType::Primitive(p) => p.check_primitive_type_compatibility(ctx, move_ty),
+            SolidityType::DynamicArray(array_type) | SolidityType::StaticArray(array_type, _) => {
+                if let Type::Vector(ety) = move_ty {
+                    array_type.check_type_compatibility(ctx, ety)
+                } else {
+                    false
+                }
+            },
+            SolidityType::SolidityString => {
+                // For simplifying type checking, string is only compatible with vector<u8>
+                // ASCII::String is compatible with the tuple (bytes)
+                /*
+                if let Type::Struct(mid, sid, _) = move_ty {
+                    ctx.is_string(mid.qualified(*sid))
+                } else
+                */
+                if let Type::Vector(ety) = move_ty {
+                    matches!(**ety, Type::Primitive(PrimitiveType::U8))
+                } else {
+                    false
+                }
+            },
+            SolidityType::Bytes | SolidityType::BytesStatic(_) => {
+                if let Type::Vector(ety) = move_ty {
+                    matches!(**ety, Type::Primitive(PrimitiveType::U8))
+                } else {
+                    false
+                }
+            },
+            SolidityType::Struct(struct_name, ty_tuples) => {
+                if let Type::Struct(mid, sid, _) = move_ty {
+                    let abi_struct_name_map_ref = ctx.abi_struct_name_map.borrow();
+                    if let Some(st_id) = abi_struct_name_map_ref.get(struct_name) {
+                        if *st_id == mid.qualified(*sid).instantiate(vec![]) {
+                            let solidity_tys =
+                                ty_tuples.iter().map(|(_, _, _, _, ty)| ty).collect_vec();
+                            let field_tys = ctx.get_field_types(st_id.to_qualified_id());
+                            if solidity_tys.len() == field_tys.len() {
+                                for (s_ty, m_ty) in solidity_tys.iter().zip(field_tys.iter()) {
+                                    if !s_ty.check_type_compatibility(ctx, m_ty) {
+                                        return false;
+                                    }
+                                }
+                                return true;
+                            }
+                        }
+                    }
+                }
+                false
+            },
+            SolidityType::Tuple(_) => panic!("unexpected solidity type"),
+        }
+    }
+
+    pub fn is_bytes_type(&self) -> bool {
+        use SolidityType::*;
+        matches!(self, Bytes | BytesStatic(_) | SolidityString)
+    }
+}
+
+// ================================================================================================
+// Pretty print for SoliditySignature
+
+impl fmt::Display for SoliditySignature {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.selector_signature())
+    }
+}
+
+impl SoliditySignature {
+    /// Create a default solidity signature from a move function signature
+    pub(crate) fn create_default_solidity_signature(
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+        storage_type: &Option<QualifiedInstId<StructId>>,
+    ) -> Self {
+        let fun_name = fun.symbol_pool().string(fun.get_name()).to_string();
+        let mut para_type_lst = vec![];
+        for (pos, Parameter(para_name, move_ty)) in fun.get_parameters().into_iter().enumerate() {
+            if pos == 0 && ctx.is_storage_ref(storage_type, &move_ty) {
+                // Skip the first parameter if it is a reference to contract storage.
+                continue;
+            }
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false); // implicit mapping from a move type to a solidity type
+            para_type_lst.push((
+                solidity_ty,
+                fun.symbol_pool().string(para_name).to_string(),
+                SignatureDataLocation::Memory, // memory is used by default
+            ));
+        }
+        let mut ret_type_lst = vec![];
+        for move_ty in fun.get_return_types() {
+            let solidity_ty = SolidityType::translate_from_move(ctx, &move_ty, false);
+            ret_type_lst.push((solidity_ty, SignatureDataLocation::Memory));
+        }
+
+        SoliditySignature {
+            sig_name: fun_name,
+            para_types: para_type_lst,
+            ret_types: ret_type_lst,
+        }
+    }
+
+    /// Generate parameter list for computing the function selector
+    fn compute_param_types(&self, param_types: &[&SolidityType]) -> String {
+        let display_type_slice = |tys: &[&SolidityType]| -> String {
+            tys.iter()
+                .map(|t| format!("{}", t))
+                .collect::<Vec<_>>()
+                .join(",")
+        };
+        display_type_slice(param_types)
+    }
+
+    fn selector_signature(&self) -> String {
+        format!(
+            "{}({})",
+            self.sig_name,
+            self.compute_param_types(&self.para_types.iter().map(|(ty, _, _)| ty).collect_vec())
+        )
+    }
+
+    /// Parse the solidity signature
+    pub fn parse_into_solidity_signature(
+        ctx: &Context,
+        sig_str: &str,
+        fun: &FunctionEnv<'_>,
+        storage_type: &Option<QualifiedInstId<StructId>>,
+    ) -> anyhow::Result<Self> {
+        // Solidity signature matching
+        static SIG_REG: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(
+                r"^\s*(?P<sig_name>[a-zA-Z_$][a-zA-Z_$0-9]*)\s*\((?P<args>[^)]*)\)(?P<ret_ty>.*)?",
+            )
+            .unwrap()
+        });
+        if let Some(parsed) = SIG_REG.captures(sig_str.trim()) {
+            let sig_name = parsed.name("sig_name").context(PARSE_ERR_MSG)?.as_str();
+            let para_type_str = parsed.name("args").context(PARSE_ERR_MSG)?.as_str();
+            let ret_ty_str_opt = parsed.name("ret_ty");
+            let mut ret_ty = "";
+            if let Some(ret_ty_str) = ret_ty_str_opt {
+                let ret_ty_str_trim = ret_ty_str.as_str().trim();
+                if !ret_ty_str_trim.is_empty() {
+                    let mut parse_error = false;
+                    if let Some(stripped_returns) = ret_ty_str_trim.strip_prefix("returns") {
+                        let stripped_returns_trim = stripped_returns.trim();
+                        if stripped_returns_trim.starts_with('(')
+                            && stripped_returns_trim.ends_with(')')
+                        {
+                            ret_ty = &stripped_returns_trim[1..stripped_returns_trim.len() - 1];
+                        } else {
+                            parse_error = true;
+                        }
+                    } else {
+                        parse_error = true;
+                    }
+                    if parse_error {
+                        return Err(anyhow!(PARSE_ERR_MSG_RETURN));
+                    }
+                }
+            }
+            let mut para_names = fun
+                .get_parameters()
+                .iter()
+                .map(|Parameter(para_name, _)| fun.symbol_pool().string(*para_name).to_string())
+                .collect_vec();
+            // Handle external functions where the first parameter is contract
+            if attributes::is_external_fun(fun) {
+                if para_names.is_empty() {
+                    return Err(anyhow!(PARSE_ERR_MSG));
+                }
+                para_names.remove(0);
+            }
+            // Skip storage reference parameter.
+            if !para_names.is_empty() && ctx.is_storage_ref(storage_type, &fun.get_local_type(0)) {
+                para_names.remove(0);
+            }
+            let ret_names = vec!["".to_string(); fun.get_return_count()];
+            let solidity_sig = SoliditySignature {
+                sig_name: sig_name.to_string(),
+                para_types: SoliditySignature::extract_para_type_str(
+                    ctx,
+                    para_type_str,
+                    para_names,
+                )?,
+                ret_types: SoliditySignature::extract_para_type_str(ctx, ret_ty, ret_names)?
+                    .into_iter()
+                    .map(|(ty, _, loc)| (ty, loc))
+                    .collect_vec(),
+            };
+            Ok(solidity_sig)
+        } else {
+            Err(anyhow!(PARSE_ERR_MSG))
+        }
+    }
+
+    /// Generate pairs of solidity type and location
+    fn extract_para_type_str(
+        ctx: &Context,
+        args: &str,
+        args_name: Vec<String>,
+    ) -> anyhow::Result<Vec<(SolidityType, String, SignatureDataLocation)>> {
+        let args_trim = args.trim();
+        if args_trim.is_empty() {
+            return Ok(vec![]);
+        }
+        let mut ret_vec = vec![];
+        let paras = args_trim.split(',').collect_vec();
+        if paras.len() != args_name.len() {
+            return Err(anyhow!(PARSE_ERR_MSG));
+        }
+        for (para, para_name) in paras.iter().zip(args_name.iter()) {
+            let para_trim = para.trim();
+            if para_trim.is_empty() {
+                return Err(anyhow!(PARSE_ERR_MSG));
+            }
+            let mut data_location = SignatureDataLocation::Memory;
+            let mut para_type_str = para_trim;
+            let mut loc_flag = false;
+            if let Some(stripped_memory) = para_trim.strip_suffix("memory") {
+                let stripped_trimmed = stripped_memory.trim();
+                if stripped_trimmed.ends_with(']') || stripped_trimmed.len() < stripped_memory.len()
+                {
+                    data_location = SignatureDataLocation::Memory;
+                    para_type_str = stripped_trimmed;
+                    loc_flag = true;
+                } else {
+                    return Err(anyhow!(PARSE_ERR_MSG));
+                }
+            } else if let Some(_stripped_calldata) = para_trim.strip_suffix("calldata") {
+                return Err(anyhow!("calldata is not supported yet"));
+            }
+            let ty = SolidityType::parse(ctx, para_type_str)?;
+            if loc_flag && ty.is_value_type() {
+                return Err(anyhow!(
+                    "data location can only be specified for array or struct types"
+                ));
+            }
+            ret_vec.push((ty, para_name.clone(), data_location));
+        }
+        Ok(ret_vec)
+    }
+
+    /// Check whether the user defined solidity signature is compatible with the Move signature
+    pub fn check_sig_compatibility(
+        &self,
+        ctx: &Context,
+        fun: &FunctionEnv<'_>,
+        storage_type: &Option<QualifiedInstId<StructId>>,
+    ) -> bool {
+        let mut para_types = fun.get_parameter_types();
+        if !para_types.is_empty() && ctx.is_storage_ref(storage_type, &para_types[0]) {
+            // Skip storage reference parameter.
+            para_types.remove(0);
+        }
+        let sig_para_vec = self
+            .para_types
+            .iter()
+            .map(|(ty, _, _)| ty)
+            .collect::<Vec<_>>();
+        if para_types.len() != sig_para_vec.len() {
+            return false;
+        }
+        // Check parameter type list
+        for type_pair in para_types.iter().zip(sig_para_vec.iter()) {
+            let (m_ty, s_ty) = type_pair;
+            if !s_ty.check_type_compatibility(ctx, m_ty) {
+                return false;
+            }
+        }
+        // Check return type list, but only if fun is not a creator.
+        if !attributes::is_create_fun(fun) {
+            let sig_ret_vec = self.ret_types.iter().map(|(ty, _)| ty).collect::<Vec<_>>();
+            let ret_types = fun.get_return_types();
+            if ret_types.len() != sig_ret_vec.len() {
+                return false;
+            }
+            for type_pair in ret_types.iter().zip(sig_ret_vec.iter()) {
+                let (m_ty, s_ty) = type_pair;
+                if !s_ty.check_type_compatibility(ctx, m_ty) {
+                    return false;
+                }
+            }
+        }
+        true
+    }
+}
+
+fn check_simple_type_prefix(ty_str: &str) -> bool {
+    /// Prefixes of value, bytes and string related types
+    const SIMPLE_TYPE_PREFIX: &[&str] = &[
+        "uint", "int", "ufixed", "fixed", "bool", "address", "bytes", "string",
+    ];
+    for prefix in SIMPLE_TYPE_PREFIX {
+        if ty_str.starts_with(prefix) {
+            return true;
+        }
+    }
+    false
+}
+
+fn check_type_int_range(num: usize) -> bool {
+    (8..=256).contains(&num) && num % 8 == 0
+}
+
+fn check_fixed_n_range(num: usize) -> bool {
+    num <= 80
+}
+
+fn check_static_bytes_range(num: usize) -> bool {
+    (1..=32).contains(&num)
+}
+
+/// Mangle a slice of solidity types.
+pub(crate) fn mangle_solidity_types(tys: &[SolidityType]) -> String {
+    if tys.is_empty() {
+        "".to_owned()
+    } else {
+        format!("${}$", tys.iter().join("_"))
+    }
+}
+
+/// Compute the sum of data size of tys
+pub(crate) fn abi_head_sizes_sum(tys: &[SolidityType], padded: bool) -> usize {
+    let size_vec = abi_head_sizes_vec(tys, padded);
+    size_vec.iter().map(|(_, size)| size).sum()
+}
+
+/// Compute the data size of all types in tys
+pub(crate) fn abi_head_sizes_vec(tys: &[SolidityType], padded: bool) -> Vec<(SolidityType, usize)> {
+    tys.iter()
+        .map(|ty_| (ty_.clone(), ty_.abi_head_size(padded)))
+        .collect_vec()
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/storage.rs b/vendors/move/crates/evm/move-to-yul/src/storage.rs
new file mode 100644
index 000000000..0643afc2c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/storage.rs
@@ -0,0 +1,415 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{context::Context, yul_functions::YulFunction, Generator};
+use move_model::{
+    emitln,
+    model::{QualifiedInstId, StructId},
+    ty::Type,
+};
+
+impl Generator {
+    /// Move resource from memory to storage.
+    pub(crate) fn move_to(
+        &mut self,
+        ctx: &Context,
+        struct_id: QualifiedInstId<StructId>,
+        signer_ref: String,
+        value: String,
+    ) {
+        let addr = self.call_builtin_str(ctx, YulFunction::LoadU256, std::iter::once(signer_ref));
+        self.move_to_addr(ctx, struct_id, addr, value)
+    }
+
+    /// Move resource from memory to storage, with direct address.
+    pub(crate) fn move_to_addr(
+        &mut self,
+        ctx: &Context,
+        struct_id: QualifiedInstId<StructId>,
+        addr: String,
+        value: String,
+    ) {
+        ctx.emit_block(|| {
+            emitln!(
+                ctx.writer,
+                "let $base_offset := {}",
+                self.type_storage_base(
+                    ctx,
+                    &struct_id.to_type(),
+                    "${RESOURCE_STORAGE_CATEGORY}",
+                    addr,
+                )
+            );
+            let base_offset = "$base_offset";
+
+            // At the base offset we store a boolean indicating whether the resource exists. Check this
+            // and if it is set, abort. Otherwise set this bit.
+            let exists_call = self.call_builtin_str(
+                ctx,
+                YulFunction::AlignedStorageLoad,
+                std::iter::once(base_offset.to_string()),
+            );
+            let abort_call =
+                self.call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty());
+            emitln!(ctx.writer, "if {} {{\n  {}\n}}", exists_call, abort_call);
+            self.call_builtin(
+                ctx,
+                YulFunction::AlignedStorageStore,
+                vec![base_offset.to_string(), "true".to_string()].into_iter(),
+            );
+
+            // Move the struct to storage.
+            ctx.emit_block(|| {
+                // The actual resource data starts at base_offset + 32. Set the destination address
+                // to this.
+                emitln!(
+                    ctx.writer,
+                    "let $dst := add({}, ${{RESOURCE_EXISTS_FLAG_SIZE}})",
+                    base_offset
+                );
+                emitln!(ctx.writer, "let $src := {}", value);
+                // Perform the move.
+                self.move_struct_to_storage(
+                    ctx,
+                    &struct_id,
+                    "$src".to_string(),
+                    "$dst".to_string(),
+                    true,
+                );
+            });
+        })
+    }
+
+    /// Moves a struct from memory to storage. This recursively moves linked data like
+    /// nested structs and vectors.
+    pub(crate) fn move_struct_to_storage(
+        &mut self,
+        ctx: &Context,
+        struct_id: &QualifiedInstId<StructId>,
+        src: String,
+        dst: String,
+        clean_flag: bool,
+    ) {
+        let layout = ctx.get_struct_layout(struct_id);
+
+        // By invariant we know that the leading fields are pointer fields. Copy them first.
+        for field_offs in layout.field_order.iter().take(layout.pointer_count) {
+            let (byte_offs, ty) = layout.offsets.get(field_offs).unwrap();
+            assert_eq!(byte_offs % 32, 0, "pointer fields are on word boundary");
+            ctx.emit_block(|| {
+                let linked_src_name = format!("$linked_src_{}", self.type_hash(ctx, ty));
+                let linked_dst_name = format!("$linked_dst_{}", self.type_hash(ctx, ty));
+
+                // Load the pointer to the linked memory.
+                emitln!(
+                    ctx.writer,
+                    "let {} := mload({})",
+                    linked_src_name,
+                    format!("add({}, {})", src, byte_offs)
+                );
+                self.create_and_move_data_to_linked_storage(
+                    ctx,
+                    ty,
+                    linked_src_name,
+                    linked_dst_name.clone(),
+                    clean_flag,
+                );
+                // Store the result at the destination
+                self.call_builtin(
+                    ctx,
+                    YulFunction::AlignedStorageStore,
+                    vec![format!("add({}, {})", dst, byte_offs), linked_dst_name].into_iter(),
+                )
+            });
+        }
+
+        // The remaining fields are all primitive. We also know that memory is padded to word size,
+        // so we can just copy directly word by word, which has the lowest gas cost.
+        if layout.pointer_count < layout.field_order.len() {
+            let mut byte_offs = layout
+                .offsets
+                .get(&layout.field_order[layout.pointer_count])
+                .unwrap()
+                .0;
+            assert_eq!(
+                byte_offs % 32,
+                0,
+                "first non-pointer field on word boundary"
+            );
+            while byte_offs < layout.size {
+                self.call_builtin(
+                    ctx,
+                    YulFunction::AlignedStorageStore,
+                    vec![
+                        format!("add({}, {})", dst, byte_offs),
+                        format!("mload(add({}, {}))", src, byte_offs),
+                    ]
+                    .into_iter(),
+                );
+                byte_offs += 32
+            }
+        }
+
+        // Free the memory allocated by this struct.
+        if clean_flag {
+            self.call_builtin(
+                ctx,
+                YulFunction::Free,
+                vec![src, layout.size.to_string()].into_iter(),
+            )
+        }
+    }
+
+    /// Move a struct from storage to memory, zeroing all associated storage. This recursively
+    /// moves linked data like nested structs and vectors.
+    pub(crate) fn move_struct_to_memory(
+        &mut self,
+        ctx: &Context,
+        struct_id: &QualifiedInstId<StructId>,
+        src: String,
+        dst: String,
+        clean_flag: bool, // whether to clean the storage
+    ) {
+        // Allocate struct.
+        let layout = ctx.get_struct_layout(struct_id);
+        emitln!(
+            ctx.writer,
+            "{} := {}",
+            dst,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::Malloc,
+                std::iter::once(layout.size.to_string()),
+            )
+        );
+
+        // Copy fields. By invariant we know that the leading fields are pointer fields.
+        for field_offs in layout.field_order.iter().take(layout.pointer_count) {
+            let (byte_offs, ty) = layout.offsets.get(field_offs).unwrap();
+            assert_eq!(byte_offs % 32, 0, "pointer fields are on word boundary");
+            let field_src_ptr = format!("add({}, {})", src, byte_offs);
+            let field_dst_ptr = format!("add({}, {})", dst, byte_offs);
+            ctx.emit_block(|| {
+                let hash = self.type_hash(ctx, ty);
+                let linked_src_name = format!("$linked_src_{}", hash);
+                let linked_dst_name = format!("$linked_dst_{}", hash);
+
+                // Load the pointer to the linked storage.
+                let load_call = self.call_builtin_str(
+                    ctx,
+                    YulFunction::AlignedStorageLoad,
+                    std::iter::once(field_src_ptr.clone()),
+                );
+
+                emitln!(ctx.writer, "let {} := {}", linked_src_name, load_call);
+
+                // Declare where to store the result and recursively move
+                emitln!(ctx.writer, "let {}", linked_dst_name);
+                self.move_data_from_linked_storage(
+                    ctx,
+                    ty,
+                    linked_src_name,
+                    linked_dst_name.clone(),
+                    clean_flag,
+                );
+                // Store the result at the destination.
+                emitln!(ctx.writer, "mstore({}, {})", field_dst_ptr, linked_dst_name);
+                // Clear the storage to get a refund
+                if clean_flag {
+                    self.call_builtin(
+                        ctx,
+                        YulFunction::AlignedStorageStore,
+                        vec![field_src_ptr, 0.to_string()].into_iter(),
+                    );
+                }
+            });
+        }
+
+        // The remaining fields are all primitive. We also know that memory is padded to word size,
+        // so we can just copy directly word by word, which has the lowest gas cost.
+        if layout.pointer_count < layout.field_order.len() {
+            let mut byte_offs = layout
+                .offsets
+                .get(&layout.field_order[layout.pointer_count])
+                .unwrap()
+                .0;
+            assert_eq!(
+                byte_offs % 32,
+                0,
+                "first non-pointer field on word boundary"
+            );
+            while byte_offs < layout.size {
+                let field_src_ptr = format!("add({}, {})", src, byte_offs);
+                let field_dst_ptr = format!("add({}, {})", dst, byte_offs);
+                let load_call = self.call_builtin_str(
+                    ctx,
+                    YulFunction::AlignedStorageLoad,
+                    std::iter::once(field_src_ptr.clone()),
+                );
+                emitln!(ctx.writer, "mstore({}, {})", field_dst_ptr, load_call);
+                if clean_flag {
+                    self.call_builtin(
+                        ctx,
+                        YulFunction::AlignedStorageStore,
+                        vec![field_src_ptr, 0.to_string()].into_iter(),
+                    );
+                }
+                byte_offs += 32
+            }
+        }
+    }
+
+    // Recursively move struct or vector data to corresponding linked storage.
+    // This function calls `move_struct_to_storage` and `move_vector_to_storage`, and
+    // is called by these two functions too.
+    pub(crate) fn create_and_move_data_to_linked_storage(
+        &mut self,
+        ctx: &Context,
+        ty: &Type,
+        linked_src_name: String,
+        linked_dst_name: String,
+        clean_flag: bool,
+    ) {
+        let hash = self.type_hash(ctx, ty);
+        // Allocate a new storage pointer.
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            linked_dst_name,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::NewLinkedStorageBase,
+                std::iter::once(format!("0x{:x}", hash))
+            )
+        );
+
+        // Recursively move.
+        if ty.is_vector() {
+            self.move_vector_to_storage(ctx, ty, linked_src_name, linked_dst_name, clean_flag);
+        } else if ctx.type_is_struct(ty) {
+            let field_struct_id = ty.get_struct_id(ctx.env).expect("struct");
+            self.move_struct_to_storage(
+                ctx,
+                &field_struct_id,
+                linked_src_name,
+                linked_dst_name,
+                clean_flag,
+            );
+        } else {
+            // Primitive type so directly store the src at the location
+            self.call_builtin(
+                ctx,
+                ctx.storage_store_builtin_fun(ty),
+                vec![linked_dst_name, linked_src_name].into_iter(),
+            );
+        }
+    }
+
+    // Recursively move struct or vector data from linked storage to memory.
+    // This function calls `move_struct_to_memory` and `move_vector_to_memory`, and
+    // is called by these two functions too.
+    pub(crate) fn move_data_from_linked_storage(
+        &mut self,
+        ctx: &Context,
+        ty: &Type,
+        linked_src_name: String,
+        linked_dst_name: String,
+        clean_flag: bool,
+    ) {
+        if ty.is_vector() {
+            self.move_vector_to_memory(ctx, ty, linked_src_name, linked_dst_name, clean_flag);
+        } else if ctx.type_is_struct(ty) {
+            let field_struct_id = ty.get_struct_id(ctx.env).expect("struct");
+            self.move_struct_to_memory(
+                ctx,
+                &field_struct_id,
+                linked_src_name,
+                linked_dst_name,
+                clean_flag,
+            );
+        } else {
+            // Primitive type
+            emitln!(
+                ctx.writer,
+                "{} := {}",
+                linked_dst_name,
+                self.call_builtin_str(
+                    ctx,
+                    ctx.storage_load_builtin_fun(ty),
+                    std::iter::once(linked_src_name)
+                )
+            );
+        }
+    }
+
+    /// Generate instructions for a borrow_global and return a String which denotes an
+    /// expression valid in the current block. Calls to this function should usually
+    /// scoped into a `ctx.emit_block`.
+    pub(crate) fn borrow_global_instrs(
+        &mut self,
+        ctx: &Context,
+        struct_id: &QualifiedInstId<StructId>,
+        addr: String,
+    ) -> String {
+        // Obtain the storage base offset for this resource.
+        emitln!(
+            ctx.writer,
+            "let $base_offset := {}",
+            self.type_storage_base(
+                ctx,
+                &struct_id.to_type(),
+                "${RESOURCE_STORAGE_CATEGORY}",
+                addr,
+            )
+        );
+        let base_offset = "$base_offset";
+
+        // At the base offset check the flag whether the resource exists.
+        let exists_call = self.call_builtin_str(
+            ctx,
+            YulFunction::AlignedStorageLoad,
+            std::iter::once(base_offset.to_string()),
+        );
+        let abort_call = self.call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty());
+        emitln!(
+            ctx.writer,
+            "if iszero({}) {{\n  {}\n}}",
+            exists_call,
+            abort_call
+        );
+
+        // Skip the existence flag and create a pointer.
+
+        self.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![
+                "true".to_string(),
+                format!("add({}, ${{RESOURCE_EXISTS_FLAG_SIZE}})", base_offset),
+            ]
+            .into_iter(),
+        )
+    }
+
+    /// Returns an expression for checking whether a resource exists.
+    pub(crate) fn exists_check(
+        &mut self,
+        ctx: &Context,
+        struct_id: QualifiedInstId<StructId>,
+        addr: String,
+    ) -> String {
+        // Obtain the storage base offset for this resource.
+        let base_offset = self.type_storage_base(
+            ctx,
+            &struct_id.to_type(),
+            "${RESOURCE_STORAGE_CATEGORY}",
+            addr,
+        );
+        // Load the exists flag and store it into destination.
+        self.call_builtin_str(
+            ctx,
+            YulFunction::AlignedStorageLoad,
+            std::iter::once(base_offset),
+        )
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/tables.rs b/vendors/move/crates/evm/move-to-yul/src/tables.rs
new file mode 100644
index 000000000..725070935
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/tables.rs
@@ -0,0 +1,414 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This file defines functionalities regarding tables.
+
+use crate::{
+    context::Context, functions::FunctionGenerator, native_functions::NativeFunctions,
+    yul_functions::YulFunction,
+};
+use move_model::{
+    emitln,
+    model::{FunId, QualifiedInstId},
+    ty::TypeDisplayContext,
+};
+
+impl NativeFunctions {
+    /// Define table functions for a specific instantiation.
+    pub(crate) fn define_table_functions(&mut self, ctx: &Context) {
+        let table = &self.find_module(ctx, "0x2", "Table");
+
+        self.define(ctx, table, "empty", define_empty_fun);
+        self.define(ctx, table, "contains", define_contains_fun);
+        self.define(ctx, table, "insert", define_insert_fun);
+        self.define(ctx, table, "borrow", define_borrow_fun);
+        self.define(ctx, table, "borrow_mut", define_borrow_fun);
+        self.define(ctx, table, "remove", define_remove_fun);
+    }
+}
+
+fn define_empty_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    let key_type = fun_id.inst.get(0).expect("key type");
+
+    // TODO: right now the key to storage is simply hash (table_handle, key), which works when key
+    // is a primitive type. However, this doesn't work when key is a struct or a vector, represented
+    // by a pointer to its data. We need to implement a hash algorithm for structs and vectors before
+    // allowing using structs and vectors as table keys.
+    if ctx.type_allocates_memory(key_type) {
+        let ty_ctx = &TypeDisplayContext::WithEnv {
+            env: ctx.env,
+            type_param_names: None,
+        };
+        ctx.env.error(
+            &gen.parent.contract_loc,
+            &format!(
+                "Type `{}` is not supported currently as table key. Only primitive types are supported.",
+                key_type.display(ty_ctx),
+            ),
+        )
+    }
+
+    emitln!(ctx.writer, "() -> table {");
+    ctx.writer.indent();
+    emitln!(
+        ctx.writer,
+        "table := {}",
+        gen.parent
+            .call_builtin_str(ctx, YulFunction::NewTableHandle, std::iter::empty(),)
+    );
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_contains_fun(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    let key_type = fun_id.inst.get(0).expect("key type");
+
+    emitln!(ctx.writer, "(table_ref, key_ref) -> res {");
+    ctx.writer.indent();
+
+    // get key from key_ref
+    if ctx.type_is_struct(key_type) {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    } else {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                ctx.load_builtin_fun(key_type),
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    }
+
+    // get the table handle from table_ref
+    emitln!(
+        ctx.writer,
+        "let table_handle := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("table_ref".to_string()),
+        )
+    );
+
+    // create a new storage key with keccak(table handle + key)
+    emitln!(
+        ctx.writer,
+        "let storage_key := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StorageKey,
+            vec!["table_handle".to_string(), "key".to_string()].into_iter(),
+        )
+    );
+
+    emitln!(ctx.writer, "let word := sload(storage_key)");
+
+    emitln!(
+        ctx.writer,
+        "res := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LogicalNot,
+            std::iter::once("iszero(word)".to_string())
+        )
+    );
+    // emitln!(ctx.writer, "res := word");
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_insert_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    let key_type = fun_id.inst.get(0).expect("key type");
+    let value_type = fun_id.inst.get(1).expect("value type");
+
+    emitln!(ctx.writer, "(table_ref, key_ref, value) {");
+    ctx.writer.indent();
+
+    // get key from key_ref
+    if ctx.type_is_struct(key_type) {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    } else {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                ctx.load_builtin_fun(key_type),
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    }
+
+    // get the table handle from table_ref
+    emitln!(
+        ctx.writer,
+        "let table_handle := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("table_ref".to_string()),
+        )
+    );
+
+    // create a new storage key with keccak(table handle + key)
+    emitln!(
+        ctx.writer,
+        "let storage_key := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StorageKey,
+            vec!["table_handle".to_string(), "key".to_string()].into_iter(),
+        )
+    );
+
+    emitln!(ctx.writer, "let word := sload(storage_key)");
+
+    // abort if the spot is taken
+    emitln!(
+        ctx.writer,
+        "if {} {{\n  {}\n}}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LogicalNot,
+            std::iter::once("iszero(word)".to_string())
+        ),
+        gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    let hash = gen.parent.type_hash(ctx, value_type);
+    let linked_dst_name = format!("$linked_dst_{}", hash);
+
+    gen.parent.create_and_move_data_to_linked_storage(
+        ctx,
+        value_type,
+        "value".to_string(),
+        linked_dst_name.clone(),
+        true,
+    );
+
+    if value_type.is_vector() {
+        // create another layer of ptr
+        emitln!(
+            ctx.writer,
+            "let vector_ref_dst := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::NewLinkedStorageBase,
+                std::iter::once(format!("0x{:x}", hash))
+            )
+        );
+        gen.parent.call_builtin(
+            ctx,
+            YulFunction::AlignedStorageStore,
+            vec!["vector_ref_dst".to_string(), linked_dst_name].into_iter(),
+        );
+        emitln!(ctx.writer, "sstore(storage_key, vector_ref_dst)");
+    } else {
+        emitln!(ctx.writer, "sstore(storage_key, {})", linked_dst_name);
+    }
+
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_borrow_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    let key_type = fun_id.inst.get(0).expect("key type");
+
+    emitln!(ctx.writer, "(table_ref, key_ref) -> value_ref {");
+    ctx.writer.indent();
+
+    // get key from key_ref
+    if ctx.type_is_struct(key_type) {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    } else {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                ctx.load_builtin_fun(key_type),
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    }
+
+    // get the table handle from table_ref
+    emitln!(
+        ctx.writer,
+        "let table_handle := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("table_ref".to_string()),
+        )
+    );
+
+    // create a new storage key with keccak(table handle + key)
+    emitln!(
+        ctx.writer,
+        "let storage_key := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StorageKey,
+            vec!["table_handle".to_string(), "key".to_string()].into_iter(),
+        )
+    );
+
+    emitln!(ctx.writer, "let value_offs := sload(storage_key)");
+
+    // abort if entry does not exist
+    emitln!(
+        ctx.writer,
+        "if iszero(value_offs) {{\n  {}\n}}",
+        gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    emitln!(
+        ctx.writer,
+        "value_ref := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![true.to_string(), "value_offs".to_string()].into_iter()
+        )
+    );
+
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_remove_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    let key_type = fun_id.inst.get(0).expect("key type");
+    let value_type = fun_id.inst.get(1).expect("value type");
+
+    emitln!(ctx.writer, "(table_ref, key_ref) -> value {");
+    ctx.writer.indent();
+
+    // get key from key_ref
+    if ctx.type_is_struct(key_type) {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    } else {
+        emitln!(
+            ctx.writer,
+            "let key := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                ctx.load_builtin_fun(key_type),
+                std::iter::once("key_ref".to_string()),
+            )
+        );
+    }
+
+    // get the table handle from table_ref
+    emitln!(
+        ctx.writer,
+        "let table_handle := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("table_ref".to_string()),
+        )
+    );
+
+    // create a new storage key with keccak(table handle + key)
+    emitln!(
+        ctx.writer,
+        "let storage_key := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StorageKey,
+            vec!["table_handle".to_string(), "key".to_string()].into_iter(),
+        )
+    );
+
+    emitln!(ctx.writer, "let linked_src := sload(storage_key)");
+
+    // abort if the entry does not exist
+    emitln!(
+        ctx.writer,
+        "if iszero(linked_src) {{\n  {}\n}}",
+        gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    if value_type.is_vector() {
+        emitln!(
+            ctx.writer,
+            "let vector_linked_src := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::StorageLoadU256,
+                std::iter::once("linked_src".to_string())
+            )
+        );
+
+        // get refund for vector linked src
+        gen.parent.call_builtin(
+            ctx,
+            YulFunction::AlignedStorageStore,
+            vec!["linked_src".to_string(), "0".to_string()].into_iter(),
+        );
+
+        emitln!(ctx.writer, "linked_src := vector_linked_src");
+    }
+
+    gen.parent.move_data_from_linked_storage(
+        ctx,
+        value_type,
+        "linked_src".to_string(),
+        "value".to_string(),
+        true,
+    );
+
+    gen.parent.call_builtin(
+        ctx,
+        YulFunction::AlignedStorageStore,
+        vec!["linked_src".to_string(), "0".to_string()].into_iter(),
+    );
+
+    emitln!(ctx.writer, "sstore(storage_key, 0)");
+
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/vectors.rs b/vendors/move/crates/evm/move-to-yul/src/vectors.rs
new file mode 100644
index 000000000..551330d5b
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/vectors.rs
@@ -0,0 +1,1148 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This file defines vector functionalities.
+
+use crate::{
+    context::Context, functions::FunctionGenerator, native_functions::NativeFunctions,
+    yul_functions::YulFunction, Generator,
+};
+use move_model::{
+    emitln,
+    model::{FunId, QualifiedInstId},
+    ty::Type,
+};
+
+/// The size (in bytes) of the vector metadata, which is stored in front of the actual vector data.
+pub const VECTOR_METADATA_SIZE: usize = 32;
+/// The number of slots allocated initially for an empty vector.
+pub const VECTOR_INITIAL_CAPACITY: usize = 2;
+
+impl Generator {
+    pub(crate) fn move_vector_to_storage(
+        &mut self,
+        ctx: &Context,
+        vector_type: &Type,
+        src: String,
+        dst: String,
+        clean_flag: bool,
+    ) {
+        let elem_type = get_elem_type(vector_type).expect("not vector type");
+        let elem_type_size = ctx.type_size(&elem_type);
+
+        // Add hash to variable names to avoid naming collisions.
+        let hash = self.type_hash(ctx, vector_type);
+        let size_name = format!("$size_{}", hash);
+        let offs_name = format!("$offs_{}", hash);
+        let data_size_name = format!("$data_size_{}", hash);
+        let data_src_name = format!("$data_src_{}", hash);
+        let data_dst_name = format!("$data_dst_{}", hash);
+
+        // Load size of the vectors
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            size_name,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::MemoryLoadU64,
+                std::iter::once(src.clone())
+            )
+        );
+
+        // Calculate the size of all the data
+        emitln!(
+            ctx.writer,
+            "let {} := mul({}, {})",
+            data_size_name,
+            size_name,
+            elem_type_size
+        );
+
+        // Move vector metadata to the storage location
+        self.call_builtin(
+            ctx,
+            YulFunction::AlignedStorageStore,
+            vec![dst.clone(), format!("mload({})", src)].into_iter(),
+        );
+
+        // Calculate the start of actual vector data at memory and storage location
+        emitln!(
+            ctx.writer,
+            "let {} := add({}, {})",
+            data_src_name,
+            src,
+            VECTOR_METADATA_SIZE
+        );
+        emitln!(
+            ctx.writer,
+            "let {} := add({}, {})",
+            data_dst_name,
+            dst,
+            VECTOR_METADATA_SIZE
+        );
+
+        // Loops through the vector and move elements
+        emitln!(
+            ctx.writer,
+            "for {{ let {} := 0 }} lt({}, {}) {{ {} := add({}, 32)}} {{",
+            offs_name,
+            offs_name,
+            data_size_name,
+            offs_name,
+            offs_name,
+        );
+        ctx.writer.indent();
+        if ctx.type_allocates_memory(&elem_type) {
+            ctx.emit_block(|| {
+                let linked_src_name = format!("$linked_src_{}", self.type_hash(ctx, &elem_type));
+                let linked_dst_name = format!("$linked_dst_{}", self.type_hash(ctx, &elem_type));
+
+                // Load the pointer to the linked memory.
+                emitln!(
+                    ctx.writer,
+                    "let {} := mload(add({}, {}))",
+                    linked_src_name,
+                    offs_name,
+                    data_src_name.clone(),
+                );
+                self.create_and_move_data_to_linked_storage(
+                    ctx,
+                    &elem_type,
+                    linked_src_name,
+                    linked_dst_name.clone(),
+                    clean_flag,
+                );
+                // Store the result at the destination
+                self.call_builtin(
+                    ctx,
+                    YulFunction::AlignedStorageStore,
+                    vec![
+                        format!("add({}, {})", data_dst_name, offs_name),
+                        linked_dst_name,
+                    ]
+                    .into_iter(),
+                )
+            });
+        } else {
+            self.call_builtin(
+                ctx,
+                YulFunction::AlignedStorageStore,
+                vec![
+                    format!("add({}, {})", data_dst_name, offs_name),
+                    format!("mload(add({}, {}))", data_src_name, offs_name),
+                ]
+                .into_iter(),
+            );
+        }
+
+        // Free ptr
+        if clean_flag {
+            self.call_builtin(
+                ctx,
+                YulFunction::Free,
+                vec![
+                    src,
+                    format!("add({}, {})", data_size_name, VECTOR_METADATA_SIZE),
+                ]
+                .into_iter(),
+            );
+        }
+
+        ctx.writer.unindent();
+        emitln!(ctx.writer, "}");
+    }
+
+    pub(crate) fn move_vector_to_memory(
+        &mut self,
+        ctx: &Context,
+        vector_type: &Type,
+        src: String,
+        dst: String,
+        clean_flag: bool, // whether to clean the storage
+    ) {
+        let elem_type = get_elem_type(vector_type).expect("not vector type");
+        let elem_type_size = ctx.type_size(&elem_type);
+
+        // Add hash to variable names to avoid naming collisions.
+        let hash = self.type_hash(ctx, vector_type);
+        let size_name = format!("$size_{}", hash);
+        let capacity_name = format!("$capacity_{}", hash);
+        let data_size_name = format!("$data_size_{}", hash);
+        let data_src_name = format!("$data_src_{}", hash);
+        let data_dst_name = format!("$data_dst_{}", hash);
+        let offs_name = format!("$offs_{}", hash);
+
+        // Load size of the vector
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            size_name,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::StorageLoadU64,
+                std::iter::once(src.clone())
+            )
+        );
+
+        // Calculate the closest power of two that's greater than the size we loaded on the
+        // last line. We will allocate space for this number of elements in the memory.
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            capacity_name,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::ClosestGreaterPowerOfTwo,
+                std::iter::once(size_name.clone())
+            )
+        );
+
+        emitln!(
+            ctx.writer,
+            "{} := {}",
+            dst,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::Malloc,
+                std::iter::once(format!(
+                    "add({}, mul({}, {}))",
+                    VECTOR_METADATA_SIZE, capacity_name, elem_type_size
+                ))
+            )
+        );
+
+        // Calculate size of the vector data
+        emitln!(
+            ctx.writer,
+            "let {} := mul({}, {})",
+            data_size_name,
+            size_name,
+            elem_type_size
+        );
+
+        // Move metadata to memory
+        emitln!(
+            ctx.writer,
+            "mstore({}, {})",
+            dst,
+            self.call_builtin_str(
+                ctx,
+                YulFunction::AlignedStorageLoad,
+                std::iter::once(src.clone()),
+            )
+        );
+
+        // Store new capacity in memory
+        self.call_builtin(
+            ctx,
+            YulFunction::MemoryStoreU64,
+            vec![format!("add({}, 8)", dst), capacity_name].into_iter(),
+        );
+
+        // Calculate locations to load data from and move data to
+        emitln!(
+            ctx.writer,
+            "let {} := add({}, {})",
+            data_src_name,
+            src,
+            VECTOR_METADATA_SIZE
+        );
+        emitln!(
+            ctx.writer,
+            "let {} := add({}, {})",
+            data_dst_name,
+            dst,
+            VECTOR_METADATA_SIZE
+        );
+
+        // Loop through the vector and move elements to memory
+        emitln!(
+            ctx.writer,
+            "for {{ let {} := 0 }} lt({}, {}) {{ {} := add({}, 32)}} {{",
+            offs_name,
+            offs_name,
+            data_size_name,
+            offs_name,
+            offs_name,
+        );
+
+        ctx.writer.indent();
+        if ctx.type_allocates_memory(&elem_type) {
+            ctx.emit_block(|| {
+                let src_ptr = format!("add({}, {})", data_src_name, offs_name);
+                let dst_ptr = format!("add({}, {})", data_dst_name, offs_name);
+                let hash = self.type_hash(ctx, &elem_type);
+                let linked_src_name = format!("$linked_src_{}", hash);
+                let linked_dst_name = format!("$linked_dst_{}", hash);
+
+                // Load the pointer to the linked storage.
+                let load_call = self.call_builtin_str(
+                    ctx,
+                    YulFunction::AlignedStorageLoad,
+                    std::iter::once(src_ptr.clone()),
+                );
+
+                emitln!(ctx.writer, "let {} := {}", linked_src_name, load_call);
+                // Declare where to store the result and recursively move
+                emitln!(ctx.writer, "let {}", linked_dst_name);
+                self.move_data_from_linked_storage(
+                    ctx,
+                    &elem_type,
+                    linked_src_name,
+                    linked_dst_name.clone(),
+                    clean_flag,
+                );
+                // Store the result at the destination.
+                emitln!(ctx.writer, "mstore({}, {})", dst_ptr, linked_dst_name);
+                // Clear the storage to get a refund
+                if clean_flag {
+                    self.call_builtin(
+                        ctx,
+                        YulFunction::AlignedStorageStore,
+                        vec![src_ptr, 0.to_string()].into_iter(),
+                    );
+                }
+            });
+        } else {
+            let load_call = self.call_builtin_str(
+                ctx,
+                YulFunction::AlignedStorageLoad,
+                std::iter::once(format!("add({}, {})", data_src_name, offs_name)),
+            );
+            emitln!(
+                ctx.writer,
+                "mstore(add({}, {}), {})",
+                data_dst_name,
+                offs_name,
+                load_call
+            );
+            // fill storage with 0s
+            if clean_flag {
+                self.call_builtin(
+                    ctx,
+                    YulFunction::AlignedStorageStore,
+                    vec![
+                        format!("add({}, {})", data_src_name, offs_name),
+                        0.to_string(),
+                    ]
+                    .into_iter(),
+                );
+            }
+        }
+        ctx.writer.unindent();
+        emitln!(ctx.writer, "}");
+    }
+}
+
+impl NativeFunctions {
+    /// Define vector functions for a specific instantiation.
+    pub(crate) fn define_vector_functions(&mut self, ctx: &Context) {
+        let vector = &self.find_module(ctx, "0x1", "vector");
+
+        self.define(ctx, vector, "empty", crate::vectors::define_empty_fun);
+        self.define(ctx, vector, "length", crate::vectors::define_length_fun);
+        self.define(
+            ctx,
+            vector,
+            "push_back",
+            crate::vectors::define_push_back_fun,
+        );
+        self.define(ctx, vector, "pop_back", crate::vectors::define_pop_back_fun);
+        self.define(ctx, vector, "borrow", crate::vectors::define_borrow_fun);
+        self.define(ctx, vector, "borrow_mut", crate::vectors::define_borrow_fun);
+        self.define(ctx, vector, "swap", crate::vectors::define_swap_fun);
+        self.define(
+            ctx,
+            vector,
+            "destroy_empty",
+            crate::vectors::define_destroy_empty_fun,
+        );
+    }
+}
+
+fn define_empty_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    assert_eq!(
+        fun_id.inst.len(),
+        1,
+        "vector instantiated with non-one type parameter"
+    );
+    emitln!(ctx.writer, "() -> vector {");
+    ctx.writer.indent();
+    let type_size = ctx.type_size(fun_id.inst.get(0).unwrap());
+    emitln!(
+        ctx.writer,
+        "vector := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::Malloc,
+            std::iter::once(
+                (VECTOR_METADATA_SIZE + type_size * VECTOR_INITIAL_CAPACITY).to_string()
+            ),
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "{}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MemoryStoreU64,
+            vec![
+                "add(vector, 8)".to_string(),
+                VECTOR_INITIAL_CAPACITY.to_string()
+            ]
+            .into_iter()
+        )
+    );
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_length_fun(gen: &mut FunctionGenerator, ctx: &Context, _fun_id: &QualifiedInstId<FunId>) {
+    emitln!(ctx.writer, "(v_ref) -> len {");
+    ctx.writer.indent();
+    emitln!(
+        ctx.writer,
+        "let v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("v_ref".to_string())
+        )
+    );
+    let is_storage_call = gen.parent.call_builtin_str(
+        ctx,
+        YulFunction::IsStoragePtr,
+        std::iter::once("v_ref".to_string()),
+    );
+    emitln!(
+        ctx.writer,
+        "let v_ptr := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![is_storage_call, "v_offs".to_string()].into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "len := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("v_ptr".to_string())
+        )
+    );
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_borrow_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    assert_eq!(
+        fun_id.inst.len(),
+        1,
+        "vector instantiated with non-one type parameter"
+    );
+    let elem_type = fun_id.inst.get(0).unwrap();
+    let elem_type_size = ctx.type_size(elem_type);
+
+    emitln!(ctx.writer, "(v_ref, i) -> e_ptr {");
+    ctx.writer.indent();
+
+    emitln!(
+        ctx.writer,
+        "let v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("v_ref".to_string())
+        )
+    );
+    let is_storage_call = gen.parent.call_builtin_str(
+        ctx,
+        YulFunction::IsStoragePtr,
+        std::iter::once("v_ref".to_string()),
+    );
+    emitln!(
+        ctx.writer,
+        "let v_ptr := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![is_storage_call.clone(), "v_offs".to_string()].into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "let size := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("v_ptr".to_string())
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        "if {} {{ {} }}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::GtEq,
+            vec!["i".to_string(), "size".to_string()].into_iter()
+        ),
+        &gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    // calculate byte offset at which the new element should be stored
+    emitln!(
+        ctx.writer,
+        "e_ptr := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IndexPtr,
+            vec![
+                "v_ptr".to_string(),
+                format!("add({}, mul(i, {}))", VECTOR_METADATA_SIZE, elem_type_size)
+            ]
+            .into_iter()
+        )
+    );
+    if ctx.type_is_struct(elem_type) {
+        emitln!(
+            ctx.writer,
+            "let e := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::LoadU256,
+                std::iter::once("e_ptr".to_string())
+            )
+        );
+        emitln!(
+            ctx.writer,
+            "e_ptr := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::MakePtr,
+                vec![is_storage_call, "e".to_string()].into_iter()
+            )
+        );
+    }
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_pop_back_fun(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    assert_eq!(
+        fun_id.inst.len(),
+        1,
+        "vector instantiated with non-one type parameter"
+    );
+    let elem_type = fun_id.inst.get(0).unwrap();
+    let elem_type_size = ctx.type_size(elem_type);
+
+    emitln!(ctx.writer, "(v_ref) -> e {");
+    ctx.writer.indent();
+
+    emitln!(
+        ctx.writer,
+        "let v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("v_ref".to_string())
+        )
+    );
+    let is_storage_call = gen.parent.call_builtin_str(
+        ctx,
+        YulFunction::IsStoragePtr,
+        std::iter::once("v_ref".to_string()),
+    );
+    emitln!(
+        ctx.writer,
+        "let v_ptr := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![is_storage_call, "v_offs".to_string()].into_iter()
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        "let size := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("v_ptr".to_string())
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        "if iszero(size) {{ {} }}",
+        gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    emitln!(
+        ctx.writer,
+        "let e_ptr := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IndexPtr,
+            vec![
+                "v_ptr".to_string(),
+                format!(
+                    "add({}, mul(sub(size, 1), {}))",
+                    VECTOR_METADATA_SIZE, elem_type_size
+                )
+            ]
+            .into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "e := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            ctx.load_builtin_fun(elem_type),
+            std::iter::once("e_ptr".to_string())
+        )
+    );
+    // Move element from storage to memory if vector is in global storage and element is a struct or vector
+    if ctx.type_allocates_memory(elem_type) {
+        emitln!(
+            ctx.writer,
+            "if {} {{",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::IsStoragePtr,
+                std::iter::once("e_ptr".to_string())
+            ),
+        );
+
+        ctx.writer.indent();
+        emitln!(
+            ctx.writer,
+            "let e_offs := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("e_ptr".to_string())
+            ),
+        );
+
+        emitln!(
+            ctx.writer,
+            "let linked_src := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::AlignedStorageLoad,
+                std::iter::once("e_offs".to_string()),
+            )
+        );
+
+        gen.parent.move_data_from_linked_storage(
+            ctx,
+            elem_type,
+            "linked_src".to_string(),
+            "e".to_string(),
+            true,
+        );
+
+        gen.parent.call_builtin(
+            ctx,
+            YulFunction::AlignedStorageStore,
+            vec!["e_offs".to_string(), 0.to_string()].into_iter(),
+        );
+
+        ctx.writer.unindent();
+        emitln!(ctx.writer, "}");
+    }
+
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StoreU64,
+            vec!["v_ptr".to_string(), "sub(size, 1)".to_string()].into_iter()
+        )
+    );
+
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_push_back_fun(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    assert_eq!(
+        fun_id.inst.len(),
+        1,
+        "vector instantiated with non-one type parameter"
+    );
+    let elem_type = fun_id.inst.get(0).unwrap();
+    let elem_type_size = ctx.type_size(elem_type);
+
+    emitln!(ctx.writer, "(v_ref, e) {");
+    ctx.writer.indent();
+    emitln!(
+        ctx.writer,
+        "let v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("v_ref".to_string())
+        )
+    );
+    let is_storage_call = gen.parent.call_builtin_str(
+        ctx,
+        YulFunction::IsStoragePtr,
+        std::iter::once("v_ref".to_string()),
+    );
+    emitln!(
+        ctx.writer,
+        "let v_ptr := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![is_storage_call, "v_offs".to_string()].into_iter()
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        "let size := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("v_ptr".to_string())
+        )
+    );
+
+    // calculate byte offset at which the new element should be stored
+    emitln!(
+        ctx.writer,
+        "let e_ptr := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IndexPtr,
+            vec![
+                "v_ptr".to_string(),
+                format!(
+                    "add({}, mul(size, {}))",
+                    VECTOR_METADATA_SIZE, elem_type_size
+                )
+            ]
+            .into_iter()
+        )
+    );
+
+    // store the new element there
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            ctx.store_builtin_fun(elem_type),
+            vec!["e_ptr".to_string(), "e".to_string()].into_iter()
+        )
+    );
+
+    // Move element to storage if vector is in global storage and element is a struct or vector
+    if ctx.type_allocates_memory(elem_type) {
+        emitln!(
+            ctx.writer,
+            "if {} {{",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::IsStoragePtr,
+                std::iter::once("e_ptr".to_string())
+            ),
+        );
+
+        ctx.writer.indent();
+        emitln!(
+            ctx.writer,
+            "let e_offs := {}",
+            gen.parent.call_builtin_str(
+                ctx,
+                YulFunction::OffsetPtr,
+                std::iter::once("e_ptr".to_string())
+            ),
+        );
+
+        let linked_dst_name = format!("$linked_dst_{}", gen.parent.type_hash(ctx, elem_type));
+
+        gen.parent.create_and_move_data_to_linked_storage(
+            ctx,
+            elem_type,
+            "e".to_string(),
+            linked_dst_name.clone(),
+            true,
+        );
+        // Store the result at the destination
+        gen.parent.call_builtin(
+            ctx,
+            YulFunction::AlignedStorageStore,
+            vec!["e_offs".to_string(), linked_dst_name].into_iter(),
+        );
+
+        ctx.writer.unindent();
+        emitln!(ctx.writer, "}");
+    }
+
+    // increment size
+    emitln!(ctx.writer, "size := add(size, 1)");
+
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StoreU64,
+            vec!["v_ptr".to_string(), "size".to_string()].into_iter()
+        )
+    );
+
+    // load capacity
+    emitln!(
+        ctx.writer,
+        "let capacity := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("$IndexPtr(v_ptr, 8)".to_string())
+        )
+    );
+
+    // if in memory and size == capacity, resize
+    emitln!(
+        ctx.writer,
+        "if and(iszero({}), eq(size, capacity)) {{",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IsStoragePtr,
+            std::iter::once("v_ptr".to_string())
+        ),
+    );
+
+    ctx.writer.indent();
+
+    emitln!(
+        ctx.writer,
+        "let new_v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::ResizeVector,
+            vec![
+                "v_offs".to_string(),
+                "capacity".to_string(),
+                elem_type_size.to_string()
+            ]
+            .into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::StoreU256,
+            vec!["v_ref".to_string(), "new_v_offs".to_string()].into_iter()
+        )
+    );
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_swap_fun(gen: &mut FunctionGenerator, ctx: &Context, fun_id: &QualifiedInstId<FunId>) {
+    let elem_type = fun_id.inst.get(0).unwrap();
+    let elem_type_size = ctx.type_size(elem_type);
+    emitln!(ctx.writer, "(v_ref, i, j) {");
+    ctx.writer.indent();
+    emitln!(
+        ctx.writer,
+        "let v_offs := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU256,
+            std::iter::once("v_ref".to_string())
+        )
+    );
+    let is_storage_call = gen.parent.call_builtin_str(
+        ctx,
+        YulFunction::IsStoragePtr,
+        std::iter::once("v_ref".to_string()),
+    );
+    emitln!(
+        ctx.writer,
+        "let v_ptr := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MakePtr,
+            vec![is_storage_call, "v_offs".to_string()].into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "let size := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LoadU64,
+            std::iter::once("v_ptr".to_string())
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        "if or({}, {}) {{ {} }}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::GtEq,
+            vec!["i".to_string(), "size".to_string()].into_iter()
+        ),
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::GtEq,
+            vec!["j".to_string(), "size".to_string()].into_iter()
+        ),
+        &gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    emitln!(
+        ctx.writer,
+        "let i_ptr := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IndexPtr,
+            vec![
+                "v_ptr".to_string(),
+                format!("add({}, mul(i, {}))", VECTOR_METADATA_SIZE, elem_type_size)
+            ]
+            .into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "let j_ptr := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::IndexPtr,
+            vec![
+                "v_ptr".to_string(),
+                format!("add({}, mul(j, {}))", VECTOR_METADATA_SIZE, elem_type_size)
+            ]
+            .into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "let i_val := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            ctx.load_builtin_fun(elem_type),
+            std::iter::once("i_ptr".to_string())
+        )
+    );
+    emitln!(
+        ctx.writer,
+        "let j_val := {}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            ctx.load_builtin_fun(elem_type),
+            std::iter::once("j_ptr".to_string())
+        )
+    );
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            ctx.store_builtin_fun(elem_type),
+            vec!["i_ptr".to_string(), "j_val".to_string()].into_iter()
+        )
+    );
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            ctx.store_builtin_fun(elem_type),
+            vec!["j_ptr".to_string(), "i_val".to_string()].into_iter()
+        )
+    );
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+fn define_destroy_empty_fun(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    assert_eq!(
+        fun_id.inst.len(),
+        1,
+        "vector instantiated with non-one type parameter"
+    );
+    emitln!(ctx.writer, "(v) {");
+    ctx.writer.indent();
+    let type_size = ctx.type_size(fun_id.inst.get(0).unwrap());
+    emitln!(
+        ctx.writer,
+        "let size := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MemoryLoadU64,
+            std::iter::once("v".to_string())
+        )
+    );
+
+    // check that the vector is indeed empty
+
+    emitln!(
+        ctx.writer,
+        "if {} {{ {} }}",
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::LogicalNot,
+            std::iter::once("iszero(size)".to_string())
+        ),
+        &gen.parent
+            .call_builtin_str(ctx, YulFunction::AbortBuiltin, std::iter::empty())
+    );
+
+    emitln!(
+        ctx.writer,
+        "let capacity := {}",
+        gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::MemoryLoadU64,
+            std::iter::once("add(v, 8)".to_string())
+        )
+    );
+
+    emitln!(
+        ctx.writer,
+        &gen.parent.call_builtin_str(
+            ctx,
+            YulFunction::Free,
+            vec![
+                "v".to_string(),
+                format!(
+                    "add({}, mul(capacity, {}))",
+                    VECTOR_METADATA_SIZE, type_size
+                )
+            ]
+            .into_iter()
+        )
+    );
+
+    ctx.writer.unindent();
+    emitln!(ctx.writer, "}");
+}
+
+/// Generate equality method for the vector type.
+pub(crate) fn equality_fun(gen: &mut Generator, ctx: &Context, ty: &Type) {
+    let elem_type = get_elem_type(ty).unwrap();
+    if ctx.type_allocates_memory(&elem_type) {
+        emitln!(
+            ctx.writer,
+            "let len_x := {}",
+            gen.call_builtin_str(
+                ctx,
+                YulFunction::MemoryLoadU64,
+                std::iter::once("x".to_string())
+            )
+        );
+        emitln!(
+            ctx.writer,
+            "let len_y := {}",
+            gen.call_builtin_str(
+                ctx,
+                YulFunction::MemoryLoadU64,
+                std::iter::once("y".to_string())
+            )
+        );
+        emitln!(
+            ctx.writer,
+            "if {} {{\n  res:= false\n  leave\n}}",
+            gen.call_builtin_str(
+                ctx,
+                YulFunction::Neq,
+                vec!["len_x".to_string(), "len_y".to_string()].into_iter()
+            )
+        );
+        emitln!(
+            ctx.writer,
+            "for { let i := 0 } lt(i, len_x) { i := add(i, 1) }"
+        );
+        let elem_size = ctx.type_size(&elem_type);
+        ctx.emit_block(|| {
+            emitln!(
+                ctx.writer,
+                "let e_x := {}",
+                gen.call_builtin_str(
+                    ctx,
+                    ctx.memory_load_builtin_fun(&elem_type),
+                    std::iter::once(format!(
+                        "add({}, add(x, mul(i, {})))",
+                        VECTOR_METADATA_SIZE, elem_size
+                    ))
+                )
+            );
+            emitln!(
+                ctx.writer,
+                "let e_y := {}",
+                gen.call_builtin_str(
+                    ctx,
+                    ctx.memory_load_builtin_fun(&elem_type),
+                    std::iter::once(format!(
+                        "add({}, add(y, mul(i, {})))",
+                        VECTOR_METADATA_SIZE, elem_size
+                    ))
+                )
+            );
+            let elem_equality_call = format!("{}(e_x, e_y)", gen.equality_function(ctx, elem_type));
+            emitln!(
+                ctx.writer,
+                "if {} {{\n  res:= false\n  leave\n}}",
+                gen.call_builtin_str(
+                    ctx,
+                    YulFunction::LogicalNot,
+                    std::iter::once(elem_equality_call)
+                )
+            );
+        });
+        emitln!(ctx.writer, "res := true");
+    } else {
+        emitln!(
+            ctx.writer,
+            "res := {}",
+            gen.call_builtin_str(
+                ctx,
+                YulFunction::EqVector,
+                vec![
+                    "x".to_string(),
+                    "y".to_string(),
+                    ctx.type_size(&elem_type).to_string()
+                ]
+                .into_iter()
+            )
+        );
+    }
+}
+
+pub(crate) fn get_elem_type(vector_type: &Type) -> Option<Type> {
+    match vector_type {
+        Type::Vector(ty) => Some(*ty.clone()),
+        _ => None,
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/src/yul_functions.rs b/vendors/move/crates/evm/move-to-yul/src/yul_functions.rs
new file mode 100644
index 000000000..5592448a2
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/src/yul_functions.rs
@@ -0,0 +1,887 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use maplit::btreemap;
+use once_cell::sync::Lazy;
+use regex::Regex;
+use std::collections::BTreeMap;
+
+/// The word size (in bytes) of the EVM.
+pub const WORD_SIZE: usize = 32;
+
+/// A lazy constant which defines placeholders which can be referenced as `${NAME}`
+/// in emitted code. All emitted strings have those placeholders substituted.
+static PLACEHOLDERS: Lazy<BTreeMap<&'static str, &'static str>> = Lazy::new(|| {
+    btreemap! {
+        // ---------------------------------
+        // Numerical constants
+        "MAX_U8" => "0xff",
+        "MAX_U16" => "0xffff",
+        "MAX_U24" => "0xffffff",
+        "MAX_U32" => "0xffffffff",
+        "MAX_U40" => "0xffffffffff",
+        "MAX_U48" => "0xffffffffffff",
+        "MAX_U56" => "0xffffffffffffff",
+        "MAX_U64" => "0xffffffffffffffff",
+        "MAX_U72" => "0xffffffffffffffffff",
+        "MAX_U80" => "0xffffffffffffffffffff",
+        "MAX_U88" => "0xffffffffffffffffffffff",
+        "MAX_U96" => "0xffffffffffffffffffffffff",
+        "MAX_U104" => "0xffffffffffffffffffffffffff",
+        "MAX_U112" => "0xffffffffffffffffffffffffffff",
+        "MAX_U120" => "0xffffffffffffffffffffffffffffff",
+        "MAX_U128" => "0xffffffffffffffffffffffffffffffff",
+        "MAX_U136" => "0xffffffffffffffffffffffffffffffffff",
+        "MAX_U144" => "0xffffffffffffffffffffffffffffffffffff",
+        "MAX_U152" => "0xffffffffffffffffffffffffffffffffffffff",
+        "MAX_U160" => "0xffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U168" => "0xffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U176" => "0xffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U184" => "0xffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U192" => "0xffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U200" => "0xffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U208" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U216" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U224" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U232" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U240" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U248" => "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "MAX_U256" =>
+        "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+
+        // ---------------------------------
+        // Memory
+        // The size of the memory used by the compilation scheme. This must be the
+        // sum of the sizes required by the locations defined below.
+        "USED_MEM" => "160",
+
+        // Location where the current size of the used memory is stored. New memory will
+        // be allocated from there.
+        "MEM_SIZE_LOC" => "0",
+
+        // Locations in memory we use for scratch computations
+        "SCRATCH1_LOC" => "32",
+        "SCRATCH2_LOC" => "64",
+
+        // Storage groups. Those are used to augment words by creating a keccak256 value from
+        // word and group to create a unique storage key. This basically allows -- by the
+        // magic if keccak -- to multiplex the 256 bit address space into multiple ones, and
+        // to implement tables with 256 bit keys. The LINEAR_STORAGE_GROUP is reserved
+        // for Move memory. Other groups are created as tables are dynamically allocated.
+        // STORAGE_GROUP_COUNTER_LOC contains the largest storage group allocated so far.
+        // A storage group identifier is 4 bytes long.
+        "LINEAR_STORAGE_GROUP" => "0",
+        "ADMIN_STORAGE_GROUP" => "1",
+        "WORD_AND_STORAGE_GROUP_LENGTH" => "36",
+
+        // Number of storage groups already allocated. Right now there are two: linear storage
+        // group and admin storage group.
+        "NUM_STATIC_STORAGE_GROUP" => "2",
+
+        // Counters in the ADMIN_STORAGE_GROUP for persistent storage of group and linked storage
+        // counters.
+        "STORAGE_GROUP_COUNTER_LOC" => "0",
+        "LINKED_STORAGE_COUNTER_LOC" => "1",
+
+        // Categories to distinguish different types of pointers into the LINEAR_STORAGE_GROUP.
+        // See discussion of YulFunction::MakeTypeStorageBase.
+        "RESOURCE_STORAGE_CATEGORY" => "0",
+        "LINKED_STORAGE_CATEGORY" => "1",
+
+        // Size (in bytes) of the resource exists flag which proceeds any data in storage for
+        // a resource.
+        "RESOURCE_EXISTS_FLAG_SIZE" => "32",
+
+        // Size (in bytes) of the vector metadata.
+        "VECTOR_METADATA_SIZE" => "32",
+    }
+});
+
+/// Substitutes placeholders in the given string.
+pub fn substitute_placeholders(s: &str) -> Option<String> {
+    static REX: Lazy<Regex> = Lazy::new(|| Regex::new(r"(?m)(\$\{(?P<var>[A-Z0-9_]+)\})").unwrap());
+    let mut at = 0;
+    let mut changes = false;
+    let mut res = "".to_string();
+    while let Some(cap) = (*REX).captures(&s[at..]) {
+        let m = cap.get(0).unwrap();
+        let v = cap.name("var").unwrap();
+        res.push_str(&s[at..at + m.start()]);
+        if let Some(repl) = PLACEHOLDERS.get(v.as_str()) {
+            changes = true;
+            res.push_str(repl)
+        } else {
+            res.push_str(m.as_str())
+        }
+        at += m.end();
+    }
+    if changes {
+        res.push_str(&s[at..]);
+        Some(res)
+    } else {
+        None
+    }
+}
+
+/// A macro which allows to define Yul functions together with their definitions.
+/// This generates an enum `YulFunction` and functions `yule_name`, `yul_def`,
+/// and `yul_deps` for values of this type.
+macro_rules! functions {
+    ($($name:ident: $def:literal $(dep $dep:ident)*),* $(, )?) => {
+        #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Debug, Hash)]
+        #[allow(dead_code)]
+        pub enum YulFunction {
+            $($name,)*
+        }
+        impl YulFunction {
+            #[allow(dead_code)]
+            pub fn yule_name(self) -> String {
+                match self {
+                $(
+                    YulFunction::$name => make_yule_name(stringify!($name)),
+                )*
+                }
+            }
+            #[allow(dead_code)]
+            pub fn yule_def(self) -> String {
+                match self {
+                $(
+                    YulFunction::$name => make_yule_def(stringify!($name), $def),
+                )*
+                }
+            }
+            #[allow(dead_code)]
+            pub fn yule_deps(self) -> Vec<YulFunction> {
+                match self {
+                $(
+                    YulFunction::$name => vec![$(YulFunction::$dep,)*],
+                )*
+                }
+
+            }
+        }
+    }
+}
+
+/// Helper to create name of Yul function.
+fn make_yule_name(name: &str) -> String {
+    format!("${}", name)
+}
+
+/// Helper to create definition of a Yule function.
+fn make_yule_def(name: &str, body: &str) -> String {
+    format!("function ${}{}", name, body)
+}
+
+// The Yul functions supporting the compilation scheme.
+functions! {
+// -------------------------------------------------------------------------------------------
+// Abort
+Abort: "(code) {
+    mstore(0, code)
+    revert(24, 8) // TODO: store code as a string?
+}",
+AbortBuiltin: "() {
+    $Abort(sub(0, 1))
+}" dep Abort,
+NotImplemented: "() {
+    $AbortBuiltin()
+}" dep AbortBuiltin,
+RevertForward: "() {
+  let pos := mload(${MEM_SIZE_LOC})
+  returndatacopy(pos, 0, returndatasize())
+  revert(pos, returndatasize())
+}",
+
+// -------------------------------------------------------------------------------------------
+// Memory
+
+// TODO: many of the memory operations which take a `size` parameter can be specialized
+//   for the given size (8, 64, 128, or 256 bytes). The Yul optimizer does some of this,
+//   but it is not transparent how far this goes. We should better generate those
+//   functions algorithmically and specialize them ourselves. Doing the specialization
+//   manual is too error prone.
+
+// Allocates memory of size.
+// TODO: add some memory recovery (e.g. over free lists), and benchmark against the current
+//   arena style.
+Malloc: "(size) -> offs {
+    offs := mload(${MEM_SIZE_LOC})
+    // pad to word size
+    mstore(${MEM_SIZE_LOC}, add(offs, shl(5, shr(5, add(size, 31)))))
+}",
+
+MallocAt: "(offs, size) {
+  let new_free_ptr := add(offs, $RoundUp(size))
+  // protect against overflow
+  if or(gt(new_free_ptr, 0xffffffffffffffff), lt(new_free_ptr, offs)) { $AbortBuiltin() }
+  mstore(${MEM_SIZE_LOC}, new_free_ptr)
+}" dep RoundUp dep AbortBuiltin,
+
+// Frees memory of size
+Free: "(offs, size) {
+}",
+
+// Makes a pointer, using the lowest bit to indicate whether it is for storage or memory.
+MakePtr: "(is_storage, offs) -> ptr {
+  ptr := or(is_storage, shl(1, offs))
+}",
+
+// Returns true if this is a storage  pointer.
+IsStoragePtr: "(ptr) -> b {
+  b := and(ptr, 0x1)
+}",
+
+// Returns the offset of this pointer.
+OffsetPtr: "(ptr) -> offs {
+  offs := shr(1, ptr)
+}",
+
+// Constructs a bit mask for a value of size bytes. E.g. if size == 1, returns 0xff.
+// Note that we expect the Yul optimizer to specialize this for constant parameters.
+MaskForSize: "(size) -> mask {
+  mask := sub(shl(shl(3, size), 1), 1)
+}",
+
+// Extracts size bytes from word, starting at byte index start. The most significant byte
+// is at index 0 (big endian).
+ExtractBytes: "(word, start, size) -> bytes {
+   switch size
+   case 1 {
+      // use the faster byte primitive
+      bytes := byte(start, word)
+   }
+   default {
+      // As we have big endian, we need to right shift the value from
+      // where the highest byte starts in the word (32 - start), minus
+      // the size.
+      let shift_bits := shl(3, sub(sub(32, start), size))
+      bytes := and(shr(shift_bits, word), $MaskForSize(size))
+   }
+}" dep MaskForSize,
+
+// Inject size bytes into word, starting a byte index start.
+InjectBytes: "(word, start, size, bytes) -> new_word {
+   let shift_bits := shl(3, sub(sub(32, start), size))
+   // Blend out the bits which we inject
+   let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+   word := and(word, neg_mask)
+   // Overlay the bits we inject
+   new_word := or(word, shl(shift_bits, bytes))
+}" dep MaskForSize,
+
+// For a byte offset, compute word offset and byte offset within this word.
+ToWordOffs: "(offs) -> word_offs, byte_offset {
+  word_offs := shr(5, offs)
+  byte_offset := and(offs, 0x1F)
+}",
+
+// For a byte offset within a word (< 32), compute the number of bytes which
+// overflow the word for a value of size.
+OverflowBytes: "(byte_offset, size) -> overflow_bytes {
+  let available_bytes := sub(32, byte_offset)
+  switch gt(size, available_bytes)
+  case 0 {
+    overflow_bytes := 0
+  }
+  default {
+    overflow_bytes := sub(size, available_bytes)
+  }
+}",
+
+// Loads bytes from memory offset.
+MemoryLoadBytes: "(offs, size) -> val {
+  // Lower bit where the value in the higher bytes ends
+  let bit_end := shl(3, sub(32, size))
+  val := shr(bit_end, mload(offs))
+}" dep MaskForSize,
+
+// Stores bytes to memory offset.
+MemoryStoreBytes: "(offs, size, val) {
+  let bit_end := shl(3, sub(32, size))
+  let mask := shl(bit_end, $MaskForSize(size))
+  mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+}" dep MaskForSize,
+
+// Loads bytes from storage offset.
+StorageLoadBytes: "(offs, size) -> val {
+  let word_offs, byte_offs := $ToWordOffs(offs)
+  let key := $StorageKey(${LINEAR_STORAGE_GROUP}, word_offs)
+  val := $ExtractBytes(sload(key), byte_offs, size)
+  let overflow_bytes := $OverflowBytes(byte_offs, size)
+  if $LogicalNot(iszero(overflow_bytes)) {
+    key := $StorageKey(${LINEAR_STORAGE_GROUP}, add(word_offs, 1))
+    let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+    val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+  }
+}" dep ToWordOffs dep StorageKey dep ExtractBytes dep OverflowBytes dep LogicalNot,
+
+// Store bytes to storage offset.
+StorageStoreBytes: "(offs, size, bytes) {
+  let word_offs, byte_offs := $ToWordOffs(offs)
+  let key := $StorageKey(${LINEAR_STORAGE_GROUP}, word_offs)
+  let overflow_bytes := $OverflowBytes(byte_offs, size)
+  switch overflow_bytes
+  case 0 {
+    sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+  }
+  default {
+    // Shift the higher bytes to the right
+    let used_bytes := sub(size, overflow_bytes)
+    let higher_bytes := shr(used_bytes, bytes)
+    let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+    sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+    key := $StorageKey(${LINEAR_STORAGE_GROUP}, add(word_offs, 1))
+    sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+  }
+}" dep ToWordOffs dep StorageKey dep InjectBytes dep OverflowBytes,
+
+// Make a unique key into storage, where word can have full 32 byte size, and type
+// indicates the kind of the key given as a byte. This uses keccak256 to fold
+// value and type into a unique storage key.
+StorageKey: "(group, word) -> key {
+  mstore(${SCRATCH1_LOC}, word)
+  mstore(${SCRATCH2_LOC}, shl(224, group))
+  key := keccak256(${SCRATCH1_LOC}, ${WORD_AND_STORAGE_GROUP_LENGTH})
+}",
+
+// Make a base storage offset for a given type. The result has 255 bits width and can be passed into
+// $MakePtr(true, result) to create a pointer. This pointer can be used to linearly address
+// exclusive memory, owned by the pointer, with an address space of 60 bits.
+//
+//  254                                                    0
+//  cccccc..cccccctttttt..tttttiiiii..iiiiiioooooo..oooooooo
+//   category       type_hash     id           offset
+//      3              32         160           60
+//
+// The category indicates what kind of type storage this is, and determines how id
+// is interpreted. RESOURCE_STORAGE_CATEGORY indicates that id is a resource
+// address. LINKED_STORAGE_CATEGORY indicates that id is a handle for data linked
+// to from some other storage (for instance, a vector aggregated by a resource).
+// The type_hash identifies the type of the stored value. The id is any 20 byte
+// number which identifies an instance of this type (e.g. an address if this is a resource).
+MakeTypeStorageBase: "(category, type_hash, id) -> offs {
+  offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+}",
+
+// Make a new base storage offset for linked storage. This creates a new handle
+// and then calls MakeTypeStorageBase.
+NewLinkedStorageBase: "(type_hash) -> offs {
+  let key := $StorageKey(${ADMIN_STORAGE_GROUP}, ${LINKED_STORAGE_COUNTER_LOC})
+  let handle := sload(key)
+  sstore(key, add(handle, 1))
+  offs := $MakeTypeStorageBase(${LINKED_STORAGE_CATEGORY}, type_hash, handle)
+}" dep MakeTypeStorageBase,
+
+// Indexes pointer by offset.
+IndexPtr: "(ptr, offs) -> new_ptr {
+  new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+}" dep MakePtr dep IsStoragePtr dep OffsetPtr,
+
+NewTableHandle: "() -> handle {
+  let key := $StorageKey(${ADMIN_STORAGE_GROUP}, ${STORAGE_GROUP_COUNTER_LOC})
+  handle := sload(key)
+  if iszero(handle) {
+     // no tables have been allocated in this contract, need to initialize the counter
+     // to the number of storage groups already statically allocated
+     handle := ${NUM_STATIC_STORAGE_GROUP}
+  }
+  sstore(key, add(handle, 1))
+}
+" dep StorageKey,
+// ------------
+
+// Loads u8 from pointer.
+LoadU8: "(ptr) -> val {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    val := $MemoryLoadU8(offs)
+  }
+  default {
+    val := $StorageLoadU8(offs)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryLoadU8 dep StorageLoadU8,
+
+// Loads u8 from memory offset.
+MemoryLoadU8: "(offs) -> val {
+  val := $MemoryLoadBytes(offs, 1)
+}" dep MemoryLoadBytes,
+
+// Loads u8 from storage offset.
+StorageLoadU8: "(offs) -> val {
+  val := $StorageLoadBytes(offs, 1)
+}" dep StorageLoadBytes,
+
+// Stores u8 to pointer.
+StoreU8: "(ptr, val) {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    $MemoryStoreU8(offs, val)
+  }
+  default {
+    $StorageStoreU8(offs, val)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryStoreU8 dep StorageStoreU8,
+
+// Stores u8 to memory offset.
+MemoryStoreU8: "(offs, val) {
+  // Shortcut via special instruction
+  mstore8(offs, val)
+}",
+
+// Stores u8 to storage offset.
+StorageStoreU8: "(offs, val) {
+  $StorageStoreBytes(offs, 1, val)
+}" dep StorageStoreBytes,
+
+// ------------
+
+// Loads u64 from pointer.
+LoadU64: "(ptr) -> val {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    val := $MemoryLoadU64(offs)
+  }
+  default {
+    val := $StorageLoadU64(offs)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryLoadU64 dep StorageLoadU64,
+
+// Loads u64 from memory offset.
+MemoryLoadU64: "(offs) -> val {
+  val := $MemoryLoadBytes(offs, 8)
+}" dep MemoryLoadBytes,
+
+// Loads u64 from storage offset.
+StorageLoadU64: "(offs) -> val {
+  val := $StorageLoadBytes(offs, 8)
+}" dep StorageLoadBytes,
+
+// Stores u64 to pointer.
+StoreU64: "(ptr, val) {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    $MemoryStoreU64(offs, val)
+  }
+  default {
+    $StorageStoreU64(offs, val)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryStoreU64 dep StorageStoreU64,
+
+// Stores u64 to memory offset.
+MemoryStoreU64: "(offs, val) {
+  $MemoryStoreBytes(offs, 8, val)
+}" dep MemoryStoreBytes,
+
+// Stores u64 to storage offset.
+StorageStoreU64: "(offs, val) {
+  $StorageStoreBytes(offs, 8, val)
+}" dep StorageStoreBytes,
+
+// ------------
+
+// Loads u128 from pointer.
+LoadU128: "(ptr) -> val {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    val := $MemoryLoadU128(offs)
+  }
+  default {
+    val := $StorageLoadU128(offs)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryLoadU128 dep StorageLoadU128,
+
+// Loads u128 from memory offset.
+MemoryLoadU128: "(offs) -> val {
+  val := $MemoryLoadBytes(offs, 16)
+}" dep MemoryLoadBytes,
+
+// Loads u128 from storage offset.
+StorageLoadU128: "(offs) -> val {
+  val := $StorageLoadBytes(offs, 16)
+}" dep StorageLoadBytes,
+
+// Stores u128 to pointer.
+StoreU128: "(ptr, val) {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    $MemoryStoreU128(offs, val)
+  }
+  default {
+    $StorageStoreU128(offs, val)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryStoreU128 dep StorageStoreU128,
+
+// Stores u128 to memory offset.
+MemoryStoreU128: "(offs, val) {
+  $MemoryStoreBytes(offs, 16, val)
+}" dep MemoryStoreBytes,
+
+// Stores u128 to storage offset.
+StorageStoreU128: "(offs, val) {
+  $StorageStoreBytes(offs, 16, val)
+}" dep StorageStoreBytes,
+
+// ------------
+
+// Loads u256 from pointer.
+LoadU256: "(ptr) -> val {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    val := $MemoryLoadU256(offs)
+  }
+  default {
+    val := $StorageLoadU256(offs)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryLoadU256 dep StorageLoadU256,
+
+// Loads u256 from memory offset.
+MemoryLoadU256: "(offs) -> val {
+  val := $MemoryLoadBytes(offs, 32)
+}" dep MemoryLoadBytes,
+
+// Loads u256 from storage offset.
+StorageLoadU256: "(offs) -> val {
+  val := $StorageLoadBytes(offs, 32)
+}" dep StorageLoadBytes,
+
+// Stores u256 to pointer.
+StoreU256: "(ptr, val) {
+  let offs := $OffsetPtr(ptr)
+  switch $IsStoragePtr(ptr)
+  case 0 {
+    $MemoryStoreU256(offs, val)
+  }
+  default {
+    $StorageStoreU256(offs, val)
+  }
+}" dep OffsetPtr dep IsStoragePtr dep MemoryStoreU256 dep StorageStoreU256,
+
+// Stores u256 to memory offset.
+MemoryStoreU256: "(offs, val) {
+  $MemoryStoreBytes(offs, 32, val)
+}" dep MemoryStoreBytes,
+
+// Stores u256 to storage offset.
+StorageStoreU256: "(offs, val) {
+  $StorageStoreBytes(offs, 32, val)
+}" dep StorageStoreBytes,
+
+// ------------
+
+// Loads u256 from a word-aligned storage offset
+AlignedStorageLoad: "(offs) -> val {
+  let word_offs := shr(5, offs)
+  val := sload($StorageKey(${LINEAR_STORAGE_GROUP}, word_offs))
+}" dep StorageKey,
+
+// Stores u256 to a word-aligned storage offset
+AlignedStorageStore: "(offs, val) {
+  let word_offs := shr(5, offs)
+  sstore($StorageKey(${LINEAR_STORAGE_GROUP}, word_offs), val)
+}" dep StorageKey,
+
+// TODO: this function needs more testing
+// Copies size bytes from memory to memory.
+CopyMemory: "(src, dst, size) {
+  let num_words, overflow_bytes := $ToWordOffs(size)
+  let i := 0
+  for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+    mstore(add(dst, i), mload(add(src, i)))
+  }
+  if overflow_bytes {
+    let mask := $MaskForSize(sub(32, overflow_bytes))
+    let overflow_offs := mul(num_words, 32)
+    let dst_word := and(mload(add(dst, overflow_offs)), mask)
+    let src_word := and(mload(add(src, overflow_offs)), not(mask))
+    mstore(add(dst, overflow_offs), or(dst_word, src_word))
+  }
+}" dep ToWordOffs,
+
+CheckMemorySize: "(len) -> checked_len {
+    if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+    checked_len := len
+}" dep AbortBuiltin,
+
+CopyFromCallDataToMemory: "(src, dst, length) {
+    calldatacopy(dst, src, length)
+    mstore(add(dst, length), 0)
+}",
+
+CopyFromMemoryToMemory: "(src, dst, length) {
+  let i := 0
+  for { } lt(i, length) { i := add(i, 32) }
+  {
+    mstore(add(dst, i), mload(add(src, i)))
+  }
+  if gt(i, length)
+  {
+    // clear end
+    mstore(add(dst, length), 0)
+  }
+}",
+
+ResizeVector: "(v_offs, capacity, type_size) -> new_v_offs {
+    let new_capacity := mul(capacity, 2)
+    let data_size := add(${VECTOR_METADATA_SIZE}, mul(capacity, type_size))
+    let new_data_size := add(${VECTOR_METADATA_SIZE}, mul(new_capacity, type_size))
+    new_v_offs := $Malloc(new_data_size)
+    $CopyMemory(v_offs, new_v_offs, data_size)
+    // update capacity at new location
+    $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+    $Free(v_offs, data_size)
+}" dep Malloc dep CopyMemory dep MemoryStoreU64 dep Free,
+
+// -------------------------------------------------------------------------------------------
+// Arithmetic, Logic, and Relations
+AddU64: "(x, y) -> r {
+    if lt(sub(${MAX_U64}, x), y) { $AbortBuiltin() }
+    r := add(x, y)
+}" dep AbortBuiltin,
+MulU64: "(x, y) -> r {
+    if gt(y, div(${MAX_U64}, x)) { $AbortBuiltin() }
+    r := mul(x, y)
+}" dep AbortBuiltin,
+AddU8: "(x, y) -> r {
+    if lt(sub(${MAX_U8}, x), y) { $AbortBuiltin() }
+    r := add(x, y)
+}" dep AbortBuiltin,
+MulU8: "(x, y) -> r {
+    if gt(y, div(${MAX_U8}, x)) { $AbortBuiltin() }
+    r := mul(x, y)
+}" dep AbortBuiltin,
+AddU128: "(x, y) -> r {
+    if lt(sub(${MAX_U128}, x), y) { $AbortBuiltin() }
+    r := add(x, y)
+}" dep AbortBuiltin,
+MulU128: "(x, y) -> r {
+    if gt(y, div(${MAX_U128}, x)) { $AbortBuiltin() }
+    r := mul(x, y)
+}" dep AbortBuiltin,
+AddU256: "(x, y) -> r {
+    if lt(sub(${MAX_U256}, x), y) { $AbortBuiltin() }
+    r := add(x, y)
+}" dep AbortBuiltin,
+MulU256: "(x, y) -> r {
+    if gt(y, div(${MAX_U256}, x)) { $AbortBuiltin() }
+    r := mul(x, y)
+}" dep AbortBuiltin,
+Sub: "(x, y) -> r {
+    if lt(x, y) { $AbortBuiltin() }
+    r := sub(x, y)
+}" dep AbortBuiltin,
+Div: "(x, y) -> r {
+    if eq(y, 0) { $AbortBuiltin() }
+    r := div(x, y)
+}" dep AbortBuiltin,
+Mod: "(x, y) -> r {
+    if eq(y, 0) { $AbortBuiltin() }
+    r := mod(x, y)
+}" dep AbortBuiltin,
+Shr: "(x, y) -> r {
+    r := shr(y, x)
+}",
+Shl: "(x, y) -> r {
+  r := shl(y, x)
+}",
+ShlU8: "(x, y) -> r {
+    r := and(shl(y, x), ${MAX_U8})
+}",
+ShlU64: "(x, y) -> r {
+    r := and(shl(y, x), ${MAX_U64})
+}",
+ShlU128: "(x, y) -> r {
+    r := and(shl(y, x), ${MAX_U128})
+}",
+ShlU256: "(x, y) -> r {
+    r := and(shl(y, x), ${MAX_U256})
+}",
+Gt: "(x, y) -> r {
+    r := gt(x, y)
+}",
+Lt: "(x, y) -> r {
+    r := lt(x, y)
+}",
+GtEq: "(x, y) -> r {
+    r := or(gt(x, y), eq(x, y))
+}",
+LtEq: "(x, y) -> r {
+    r := or(lt(x, y), eq(x, y))
+}",
+Eq: "(x, y) -> r {
+    r := eq(x, y)
+}",
+EqVector: "(x, y, elem_size) -> r {
+    let len_x := $MemoryLoadU64(x)
+    let len_y := $MemoryLoadU64(y)
+    if $Neq(len_x, len_y) {
+        r := false
+        leave
+    }
+    let data_size_bytes := mul(elem_size, len_x)
+    let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+    let i := 0
+    for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+        if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+            r := false
+            leave
+        }
+    }
+    let mask := $MaskForSize(sub(32, overflow_bytes))
+    let overflow_offs := mul(num_words, 32)
+    let x_overflow := mload(add(x, add(overflow_offs, 32)))
+    let y_overflow := mload(add(y, add(overflow_offs, 32)))
+    r := eq(or(mask, x_overflow), or(mask, y_overflow))
+}" dep Neq dep MemoryLoadU64 dep ToWordOffs dep MaskForSize,
+Neq: "(x, y) -> r {
+    r := $LogicalNot(eq(x, y))
+}" dep LogicalNot,
+LogicalAnd: "(x, y) -> r {
+    r := and(x, y)
+}",
+LogicalOr: "(x, y) -> r {
+    r := or(x, y)
+}",
+LogicalNot: "(x) -> r {
+    r := iszero(x)
+}",
+BitAnd: "(x, y) -> r {
+    r := and(x, y)
+}",
+BitOr: "(x, y) -> r {
+    r := or(x, y)
+}",
+BitXor: "(x, y) -> r {
+    r := xor(x, y)
+}",
+BitNot: "(x) -> r {
+    r := not(x)
+}",
+CastU8: "(x) -> r {
+    if gt(x, ${MAX_U8}) { $AbortBuiltin() }
+    r := x
+}" dep AbortBuiltin,
+CastU64: "(x) -> r {
+    if gt(x, ${MAX_U64}) { $AbortBuiltin() }
+    r := x
+}" dep AbortBuiltin,
+CastU128: "(x) -> r {
+    if gt(x, ${MAX_U128}) { $AbortBuiltin() }
+    r := x
+}" dep AbortBuiltin,
+CastU256: "(hi, lo) -> r {
+    if gt(hi, ${MAX_U128}) { $AbortBuiltin() }
+    if gt(lo, ${MAX_U128}) { $AbortBuiltin() }
+    r := add(shl(128, hi), lo)
+}" dep AbortBuiltin,
+ClosestGreaterPowerOfTwo: "(x) -> r {
+    r := or(r, shr(1, x))
+    r := or(r, shr(2, r))
+    r := or(r, shr(4, r))
+    r := or(r, shr(8, r))
+    r := or(r, shr(16, r))
+    r := or(r, shr(32, r))
+    r := add(x, 1)
+}",
+RoundUp: "(value) -> result {
+    result := and(add(value, 31), not(31))
+}",
+ReturnDataSelector: "() -> sig {
+  if gt(returndatasize(), 3) {
+    let pos := $Malloc(4)
+    returndatacopy(pos, 0, 4)
+    sig := shr(224, mload(pos))
+  }
+}" dep Malloc,
+TryDecodePanicData: "() -> success, data {
+  if gt(returndatasize(), 0x23) {
+    let pos := $Malloc(0x20)
+    returndatacopy(pos, 4, 0x20)
+    success := 1
+    data := mload(pos)
+  }
+}" dep Malloc,
+PackErrData: "() -> data {
+  data := $Malloc(add(returndatasize(), 0x20))
+  $MemoryStoreU64(data, returndatasize())
+  $MemoryStoreU64(add(data, 8), returndatasize())
+  returndatacopy(add(data, 0x20), 0, returndatasize())
+}
+" dep Malloc dep MemoryStoreU64,
+TryDecodeErrMsg: "() -> data {
+  if lt(returndatasize(), 0x44) { leave }
+  data := $Malloc(0x20)
+  returndatacopy(data, 4, 0x20)
+  let offset := mload(data)
+  if or(
+      gt(offset, 0xffffffffffffffff),
+      gt(add(offset, 0x24), returndatasize())
+      ) {
+      leave
+  }
+  data := $Malloc(0x20)
+  returndatacopy(data, add(4, offset), 0x20)
+  let length := mload(data)
+  if or(
+    gt(length, 0xffffffffffffffff),
+    gt(add(add(offset, 0x24), length), returndatasize())
+  ) {
+    leave
+  }
+  data := $Malloc(add(length, 0x20))
+  $MemoryStoreU64(data, length)
+  $MemoryStoreU64(add(data, 8), length)
+  returndatacopy(add(data, 0x20), add(offset, 0x24), length)
+}" dep Malloc dep MemoryStoreU64,
+NumToString: "(x) -> s {
+  if iszero(x) {
+    s := $Malloc(add(${VECTOR_METADATA_SIZE}, 2))
+    $MemoryStoreU64(s, 1)
+    $MemoryStoreU64(add(s, 8), 2)
+    $MemoryStoreU8(add(s, ${VECTOR_METADATA_SIZE}), 48) // string \"0\"
+    leave
+  }
+  let temp := x
+  let num_digits := 0
+  for { } temp { num_digits := add(num_digits, 1) } {
+    temp := div(temp, 10)
+  }
+  let digits_space := $ClosestGreaterPowerOfTwo(num_digits)
+  s := $Malloc(add(${VECTOR_METADATA_SIZE}, digits_space))
+  $MemoryStoreU64(s, num_digits)
+  $MemoryStoreU64(add(s, 8), digits_space)
+  let digit
+  for { } x { } {
+    digit := add(48, mod(x, 10))
+    num_digits := sub(num_digits, 1)
+    $MemoryStoreU8(add(add(s, ${VECTOR_METADATA_SIZE}), num_digits), digit)
+    x := div(x, 10)
+  }
+}" dep Malloc dep MemoryStoreU64 dep MemoryStoreU8 dep ClosestGreaterPowerOfTwo,
+ExtendVector: "(v1, v2, elem_size) -> new_v1 {
+  let v1_len := $MemoryLoadU64(v1)
+  let v2_len := $MemoryLoadU64(v2)
+  let new_len := add(v1_len, v2_len)
+  let v1_cap := $MemoryLoadU64(add(v1, 8))
+  new_v1 := v1
+  if iszero(gt(v1_cap, new_len)){
+    let new_cap := $ClosestGreaterPowerOfTwo(new_len)
+    new_v1 := $Malloc(add(mul(new_cap, elem_size), ${VECTOR_METADATA_SIZE}))
+    $CopyMemory(v1, new_v1, add(mul(v1_len, elem_size), ${VECTOR_METADATA_SIZE}))
+    $MemoryStoreU64(add(new_v1, 8), new_cap)
+    $Free(v1, add(mul(v1_len, elem_size), ${VECTOR_METADATA_SIZE}))
+  }
+  let src := add(v2, ${VECTOR_METADATA_SIZE})
+  let dst := add(add(new_v1, ${VECTOR_METADATA_SIZE}), mul(elem_size, v1_len))
+  $CopyMemory(src, dst, mul(v2_len, elem_size))
+  $MemoryStoreU64(new_v1, new_len)
+}" dep Malloc dep MemoryLoadU64 dep MemoryStoreU64 dep ClosestGreaterPowerOfTwo dep CopyMemory dep Free,
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.exp b/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.exp
new file mode 100644
index 000000000..da5946206
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.exp
@@ -0,0 +1,1138 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A3_AccountStateMachine" {
+    code {
+        mstore(0, memoryguard(160))
+        let $new_value := A3_AccountStateMachine_init()
+        {
+            let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+            if $AlignedStorageLoad($base_offset) {
+              $AbortBuiltin()
+            }
+            $AlignedStorageStore($base_offset, true)
+            {
+                let $dst := add($base_offset, 32)
+                let $src := $new_value
+                {
+                    let $linked_src_37500119 := mload(add($src, 0))
+                    let $linked_dst_37500119 := $NewLinkedStorageBase(0x23c34d7)
+                    let $size_37500119 := $MemoryLoadU64($linked_src_37500119)
+                    let $data_size_37500119 := mul($size_37500119, 32)
+                    $AlignedStorageStore($linked_dst_37500119, mload($linked_src_37500119))
+                    let $data_src_37500119 := add($linked_src_37500119, 32)
+                    let $data_dst_37500119 := add($linked_dst_37500119, 32)
+                    for { let $offs_37500119 := 0 } lt($offs_37500119, $data_size_37500119) { $offs_37500119 := add($offs_37500119, 32)} {
+                        {
+                            let $linked_src_1341933877 := mload(add($offs_37500119, $data_src_37500119))
+                            let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                            $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add($linked_src_1341933877, 0)))
+                            $Free($linked_src_1341933877, 32)
+                            $AlignedStorageStore(add($data_dst_37500119, $offs_37500119), $linked_dst_1341933877)
+                        }
+                        $Free($linked_src_37500119, add($data_size_37500119, 32))
+                    }
+                    $AlignedStorageStore(add($dst, 0), $linked_dst_37500119)
+                }
+                $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                $Free($src, 48)
+            }
+        }
+        codecopy(0, dataoffset("A3_AccountStateMachine_deployed"), datasize("A3_AccountStateMachine_deployed"))
+        return(0, datasize("A3_AccountStateMachine_deployed"))
+        function A3_AccountStateMachine_init() -> $result {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := vector::empty<AccountStateMachine::PendingTransfer>()
+            $t2 := A1_vector_empty$A3_AccountStateMachine_PendingTransfer$()
+            // $t3 := pack AccountStateMachine::Account($t0, $t1, $t2)
+            {
+                let $mem := $Malloc(48)
+                $MemoryStoreU64(add($mem, 32), $t0)
+                $MemoryStoreU64(add($mem, 40), $t1)
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
+            }
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_empty$A3_AccountStateMachine_PendingTransfer$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+    }
+    object "A3_AccountStateMachine_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x3cecd719
+                {
+                    // cleanup()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_cleanup($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x13765838
+                {
+                    // deposit(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_deposit($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x750f0acc
+                {
+                    // withdraw(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_withdraw($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2bcc3f98
+                {
+                    // xfer(address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint64$_$address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer($MakePtr(true, add($base_offset, 32)), param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x02852d52
+                {
+                    // xfer_deposit(uint64,address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_deposit($MakePtr(true, add($base_offset, 32)), param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8c38542c
+                {
+                    // xfer_finish(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_finish($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A3_AccountStateMachine_cleanup(this) {
+                let tmp_$1, i, p, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := freeze_ref($t5)
+                        $t7 := $t5
+                        // $t8 := vector::length<AccountStateMachine::PendingTransfer>($t7)
+                        $t8 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t7)
+                        // $t9 := <($t2, $t8)
+                        $t9 := $Lt(i, $t8)
+                        // if ($t9) goto L1 else goto L0
+                        switch $t9
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t2 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // destroy($t5)
+                        // return ()
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := freeze_ref($t5)
+                        $t10 := $t5
+                        // $t11 := vector::borrow<AccountStateMachine::PendingTransfer>($t10, $t2)
+                        $t11 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t10, i)
+                        // $t12 := Actor::virtual_time()
+                        $t12 := A1_Actor_virtual_time()
+                        // $t13 := borrow_field<AccountStateMachine::PendingTransfer>.initiated_at($t11)
+                        $t13 := $t11
+                        // $t14 := read_ref($t13)
+                        $t14 := $LoadU128($t13)
+                        // $t15 := -($t12, $t14)
+                        $t15 := $Sub($t12, $t14)
+                        // $t16 := 100000000
+                        $t16 := 100000000
+                        // $t17 := >=($t15, $t16)
+                        $t17 := $GtEq($t15, $t16)
+                        // if ($t17) goto L4 else goto L3
+                        switch $t17
+                        case 0  { $block := 8 }
+                        default { $block := 7 }
+                    }
+                    case 7 {
+                        // label L4
+                        // $t18 := vector::remove<AccountStateMachine::PendingTransfer>($t5, $t2)
+                        $t18 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // destroy($t18)
+                        $Free($t18, 32)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 8 {
+                        // label L3
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t2 := +($t2, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 9 {
+                        // label L5
+                        // goto L6
+                        $block := 2
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_deposit(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t2 := 43
+                        $t2 := 43
+                        // $t3 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t3 := $IndexPtr(this, 32)
+                        // $t4 := read_ref($t3)
+                        $t4 := $LoadU64($t3)
+                        // $t5 := -($t2, $t4)
+                        $t5 := $Sub($t2, $t4)
+                        // $t6 := >=($t5, $t1)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t8 := $IndexPtr(this, 32)
+                        // $t9 := read_ref($t8)
+                        $t9 := $LoadU64($t8)
+                        // $t10 := +($t9, $t1)
+                        $t10 := $AddU64($t9, v)
+                        // $t11 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t11 := $IndexPtr(this, 32)
+                        // write_ref($t11, $t10)
+                        $StoreU64($t11, $t10)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_withdraw(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t5 := 2
+                        $t5 := 2
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t2 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t2 := $IndexPtr(this, 32)
+                        // $t3 := read_ref($t2)
+                        $t3 := $LoadU64($t2)
+                        // $t4 := >=($t3, $t1)
+                        $t4 := $GtEq($t3, v)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t6 := $IndexPtr(this, 32)
+                        // $t7 := read_ref($t6)
+                        $t7 := $LoadU64($t6)
+                        // $t8 := -($t7, $t1)
+                        $t8 := $Sub($t7, v)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t9 := $IndexPtr(this, 32)
+                        // write_ref($t9, $t8)
+                        $StoreU64($t9, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer(this, dest, v) {
+                let xfer_id, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t4 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t4 := $IndexPtr(this, 32)
+                        // $t5 := read_ref($t4)
+                        $t5 := $LoadU64($t4)
+                        // $t6 := >=($t5, $t2)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := AccountStateMachine::new_xfer_id($t0)
+                        $t8 := A3_AccountStateMachine_new_xfer_id(this)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t9 := this
+                        // $t10 := Actor::virtual_time()
+                        $t10 := A1_Actor_virtual_time()
+                        // $t11 := pack AccountStateMachine::PendingTransfer($t8, $t2, $t10)
+                        {
+                            let $mem := $Malloc(32)
+                            $MemoryStoreU64(add($mem, 16), $t8)
+                            $MemoryStoreU64(add($mem, 24), v)
+                            $MemoryStoreU128(add($mem, 0), $t10)
+                            $t11 := $mem
+                        }
+                        // vector::push_back<AccountStateMachine::PendingTransfer>($t9, $t11)
+                        A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$($t9, $t11)
+                        // $t12 := Actor::self()
+                        $t12 := A1_Actor_self()
+                        // AccountStateMachine::send_xfer_deposit($t1, $t2, $t12, $t8)
+                        A3_AccountStateMachine_send_xfer_deposit(dest, v, $t12, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer_deposit(this, v, caller_, xfer_id) {
+                // AccountStateMachine::deposit($t0, $t1)
+                A3_AccountStateMachine_deposit(this, v)
+                // AccountStateMachine::send_xfer_finish($t2, $t3)
+                A3_AccountStateMachine_send_xfer_finish(caller_, xfer_id)
+                // return ()
+            }
+
+            function A3_AccountStateMachine_xfer_finish(this, xfer_id) {
+                let tmp_$2, amount, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                // $t5 := freeze_ref($t0)
+                $t5 := this
+                // $t6 := AccountStateMachine::find_xfer($t5, $t1)
+                $t6 := A3_AccountStateMachine_find_xfer($t5, xfer_id)
+                // $t7 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t7 := this
+                // $t8 := vector::borrow<AccountStateMachine::PendingTransfer>($t7, $t6)
+                $t8 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t7, $t6)
+                // $t9 := borrow_field<AccountStateMachine::PendingTransfer>.amount($t8)
+                $t9 := $IndexPtr($t8, 24)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t11 := this
+                // $t12 := vector::remove<AccountStateMachine::PendingTransfer>($t11, $t6)
+                $t12 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t11, $t6)
+                // destroy($t12)
+                $Free($t12, 32)
+                // AccountStateMachine::withdraw($t0, $t10)
+                A3_AccountStateMachine_withdraw(this, $t10)
+                // return ()
+            }
+
+            function A1_vector_remove$A3_AccountStateMachine_PendingTransfer$(v, i) -> $result {
+                let tmp_$2, tmp_$3, len, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // destroy($t0)
+                        // $t8 := 131072
+                        $t8 := 131072
+                        // abort($t8)
+                        $Abort($t8)
+                    }
+                    case 3 {
+                        // label L0
+                        // $t9 := 1
+                        $t9 := 1
+                        // $t10 := -($t6, $t9)
+                        $t10 := $Sub($t6, $t9)
+                        // goto L5
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t5 := freeze_ref($t0)
+                        $t5 := v
+                        // $t6 := vector::length<#0>($t5)
+                        $t6 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t7 := >=($t1, $t6)
+                        $t7 := $GtEq(i, $t6)
+                        // if ($t7) goto L1 else goto L0
+                        switch $t7
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L5
+                        // $t11 := <($t1, $t10)
+                        $t11 := $Lt(i, $t10)
+                        // if ($t11) goto L3 else goto L2
+                        switch $t11
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L3
+                        // goto L4
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L2
+                        // $t15 := vector::pop_back<#0>($t0)
+                        $t15 := A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v)
+                        // return $t15
+                        $result := $t15
+                        leave
+                    }
+                    case 8 {
+                        // label L4
+                        // $t12 := copy($t1)
+                        $t12 := i
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t14 := +($t1, $t13)
+                        $t14 := $AddU64(i, $t13)
+                        // $t1 := $t14
+                        i := $t14
+                        // vector::swap<#0>($t0, $t12, $t14)
+                        A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v, $t12, $t14)
+                        // goto L5
+                        $block := 5
+                    }
+                }
+            }
+
+            function A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v_ref, i, j) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+                let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 32)))
+                let i_val := $LoadU256(i_ptr)
+                let j_val := $LoadU256(j_ptr)
+                $StoreU256(i_ptr, j_val)
+                $StoreU256(j_ptr, i_val)
+            }
+            function A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let linked_src := $AlignedStorageLoad(e_offs)
+                    e := $Malloc(32)
+                    mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                    $AlignedStorageStore(e_offs, 0)
+                }
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function A1_vector_length$A3_AccountStateMachine_PendingTransfer$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let e := $LoadU256(e_ptr)
+                e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+            }
+            function A3_AccountStateMachine_find_xfer(this, xfer_id) -> $result {
+                let tmp_$2, i, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t7 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t8 := <($t3, $t7)
+                        $t8 := $Lt(i, $t7)
+                        // if ($t8) goto L1 else goto L0
+                        switch $t8
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t3 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // $t12 := false
+                        $t12 := false
+                        // $t2 := $t12
+                        tmp_$2 := $t12
+                        // goto L3
+                        $block := 7
+                    }
+                    case 6 {
+                        // label L2
+                        // $t9 := vector::borrow<AccountStateMachine::PendingTransfer>($t5, $t3)
+                        $t9 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // $t10 := borrow_field<AccountStateMachine::PendingTransfer>.xfer_id($t9)
+                        $t10 := $IndexPtr($t9, 16)
+                        // $t11 := read_ref($t10)
+                        $t11 := $LoadU64($t10)
+                        // $t2 := !=($t11, $t1)
+                        tmp_$2 := $Neq($t11, xfer_id)
+                        // goto L3
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L3
+                        // if ($t2) goto L5 else goto L4
+                        switch tmp_$2
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L5
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t3 := +($t3, $t13)
+                        i := $AddU64(i, $t13)
+                        // goto L6
+                        $block := 2
+                    }
+                    case 9 {
+                        // label L4
+                        // $t14 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t14 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t15 := <($t3, $t14)
+                        $t15 := $Lt(i, $t14)
+                        // if ($t15) goto L8 else goto L7
+                        switch $t15
+                        case 0  { $block := 11 }
+                        default { $block := 10 }
+                    }
+                    case 10 {
+                        // label L8
+                        // goto L9
+                        $block := 12
+                    }
+                    case 11 {
+                        // label L7
+                        // $t16 := 3
+                        $t16 := 3
+                        // abort($t16)
+                        $Abort($t16)
+                    }
+                    case 12 {
+                        // label L9
+                        // return $t3
+                        $result := i
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_send_xfer_finish(actor,xfer_id) {
+                let $t2 := 0x6a51b363524e1e502dbe8698bec5f165b6cf490a68c4ee9063f2c2f0653ff0dd
+                let $t3 := 0x09d2fda8
+                {
+                    let $t4 := mload(0)
+                    let $t5 := abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$($t4, actor,$t3,xfer_id)
+                    log1($t4, sub($t5, $t4), $t2)
+                    mstore(0, $t5)
+                }
+            }
+            function A3_AccountStateMachine_send_xfer_deposit(actor,v,caller_,xfer_id) {
+                let $t4 := 0x5163aa8ed9d57dbb55d2433f534c881e8fec62da43488c756dbd1ac604ce9c1b
+                let $t5 := 0x8eeea8a2
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$($t6, actor,$t5,v,caller_,xfer_id)
+                    log1($t6, sub($t7, $t6), $t4)
+                    mstore(0, $t7)
+                }
+            }
+            function A1_Actor_self() -> addr {
+              addr := address()
+            }
+            function A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                    $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add(e, 0)))
+                    $Free(e, 32)
+                    $AlignedStorageStore(e_offs, $linked_dst_1341933877)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_Actor_virtual_time() -> virtual_time {
+                virtual_time := timestamp()
+            }
+            function A3_AccountStateMachine_new_xfer_id(this) -> $result {
+                let counter, xfer_id, $t3, $t4, $t5, $t6, $t7
+                // $t3 := borrow_field<AccountStateMachine::Account>.xfer_id_counter($t0)
+                $t3 := $IndexPtr(this, 40)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU64($t3)
+                // $t5 := read_ref($t3)
+                $t5 := $LoadU64($t3)
+                // $t6 := 1
+                $t6 := 1
+                // $t7 := +($t5, $t6)
+                $t7 := $AddU64($t5, $t6)
+                // write_ref($t3, $t7)
+                $StoreU64($t3, $t7)
+                // return $t4
+                $result := $t4
+            }
+
+            function abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$(headStart ,value_0, value_1, value_2, value_3, value_4) -> tail {
+                tail := add(headStart, 160)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+                abi_encode_address(value_3, add(headStart, 96))
+                abi_encode_uint64(value_4, add(headStart, 128))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$address_uint64$_$address_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU128(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU128(offs)
+              }
+              default {
+                val := $StorageLoadU128(offs)
+              }
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StorageLoadU128(offs) -> val {
+              val := $StorageLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.move b/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.move
new file mode 100644
index 000000000..8eeae6733
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/AccountStateMachine.move
@@ -0,0 +1,101 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+module 0x3::AccountStateMachine {
+
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    const MAX: u64 = 43;
+    const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(MAX - this.value >= v, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller_: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller_, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (virtual_time() - p.initiated_at >= MAX_TRANSFER_AGE) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Arithm.exp b/vendors/move/crates/evm/move-to-yul/tests/Arithm.exp
new file mode 100644
index 000000000..ed4e735fe
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Arithm.exp
@@ -0,0 +1,1591 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x27a15f43
+                {
+                    // add_two_number(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_add_two_number(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x30df35a9
+                {
+                    // arithmetic_ops(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_arithmetic_ops(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xae7d00ae
+                {
+                    // bool_ops(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_bool_ops(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool_bool$_$bool_bool$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf1a0a85c
+                {
+                    // div(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_div(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64$_$u64_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c275efc
+                {
+                    // multiple_ops(uint64,uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint64_uint64$_$u64_u64_u64$(4, calldatasize())
+                    let ret_0 := A2_M_multiple_ops(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdc75bec7
+                {
+                    // underflow()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_underflow()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_add_two_number(x, y) -> $result0, $result1 {
+                let res, $t3, $t4
+                // $t3 := +($t0, $t1)
+                $t3 := $AddU64(x, y)
+                // $t4 := 3
+                $t4 := 3
+                // return ($t4, $t3)
+                $result0 := $t4
+                $result1 := $t3
+            }
+
+            function A2_M_arithmetic_ops(a) -> $result0, $result1 {
+                let c, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t5 := 42
+                        $t5 := 42
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 3 {
+                        // label L0
+                        // return ($t2, $t0)
+                        $result0 := $t2
+                        $result1 := a
+                        leave
+                    }
+                    case 4 {
+                        // $t2 := 2
+                        $t2 := 2
+                        // $t3 := 2
+                        $t3 := 2
+                        // $t4 := !=($t2, $t3)
+                        $t4 := $Neq($t2, $t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_bool_ops(a, b) -> $result0, $result1 {
+                let tmp_$2, tmp_$3, c, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t2 := >=($t0, $t1)
+                        tmp_$2 := $GtEq(a, b)
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t7 := false
+                        $t7 := false
+                        // $t2 := $t7
+                        tmp_$2 := $t7
+                        // goto L2
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t6 := >($t0, $t1)
+                        $t6 := $Gt(a, b)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := <($t0, $t1)
+                        $t8 := $Lt(a, b)
+                        // if ($t8) goto L4 else goto L3
+                        switch $t8
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // $t9 := true
+                        $t9 := true
+                        // $t3 := $t9
+                        tmp_$3 := $t9
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t3 := <=($t0, $t1)
+                        tmp_$3 := $LtEq(a, b)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 8 {
+                        // label L5
+                        // $t10 := !=($t2, $t3)
+                        $t10 := $Neq(tmp_$2, tmp_$3)
+                        // $t11 := !($t10)
+                        $t11 := $LogicalNot($t10)
+                        // if ($t11) goto L7 else goto L6
+                        switch $t11
+                        case 0  { $block := 10 }
+                        default { $block := 9 }
+                    }
+                    case 9 {
+                        // label L7
+                        // $t12 := 42
+                        $t12 := 42
+                        // abort($t12)
+                        $Abort($t12)
+                    }
+                    case 10 {
+                        // label L6
+                        // return ($t2, $t3)
+                        $result0 := tmp_$2
+                        $result1 := tmp_$3
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_div(x, y) -> $result0, $result1 {
+                let $t2, $t3
+                // $t2 := /($t0, $t1)
+                $t2 := $Div(x, y)
+                // $t3 := %($t0, $t1)
+                $t3 := $Mod(x, y)
+                // return ($t2, $t3)
+                $result0 := $t2
+                $result1 := $t3
+            }
+
+            function A2_M_multiple_ops(x, y, z) -> $result {
+                let $t3, $t4
+                // $t3 := *($t1, $t2)
+                $t3 := $MulU64(y, z)
+                // $t4 := +($t0, $t3)
+                $t4 := $AddU64(x, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_M_underflow() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 0
+                $t0 := 0
+                // $t1 := 1
+                $t1 := 1
+                // $t2 := -($t0, $t1)
+                $t2 := $Sub($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_uint64_uint64$_$u64_u64_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint64_uint64$_$u64_u64$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+            }
+            function abi_decode_tuple_$uint64_uint64$_$u64_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$bool_bool$_$bool_bool$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_bool(value_0, add(headStart, 0))
+                abi_encode_bool(value_1, add(headStart, 32))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $MulU64(x, y) -> r {
+                if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+                r := mul(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Div(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := div(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LtEq(x, y) -> r {
+                r := or(lt(x, y), eq(x, y))
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_add_two_number
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number()
+        return (0, 0)
+        function A2_M_test_add_two_number() {
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 7
+                    $t8 := 7
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number: Succeed(Stopped) (used_gas=677): []
+
+// test of M::test_add_two_number_overflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number_overflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number_overflow()
+        return (0, 0)
+        function A2_M_test_add_two_number_overflow() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 18446744073709551615
+            $t0 := 18446744073709551615
+            // $t1 := 1
+            $t1 := 1
+            // ($t2, $t3) := M::add_two_number($t0, $t1)
+            $t2, $t3 := A2_M_add_two_number($t0, $t1)
+            // destroy($t3)
+            // destroy($t2)
+            // return ()
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number_overflow: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_add_two_number_wrong_assert
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_add_two_number_wrong_assert" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_add_two_number_wrong_assert()
+        return (0, 0)
+        function A2_M_test_add_two_number_wrong_assert() {
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 6
+                    $t8 := 6
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_add_two_number(x, y) -> $result0, $result1 {
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_add_two_number_wrong_assert: Revert(Reverted) (used_gas=545): [0, 0, 0, 0, 0, 0, 0, 101]
+
+// test of M::test_arithmetic_ops_aborts
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_arithmetic_ops_aborts" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_arithmetic_ops_aborts()
+        return (0, 0)
+        function A2_M_test_arithmetic_ops_aborts() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 3
+                    $t1 := 3
+                    // ($t2, $t3) := M::arithmetic_ops($t1)
+                    $t2, $t3 := A2_M_arithmetic_ops($t1)
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t5 := ==($t2, $t4)
+                    $t5 := $Eq($t2, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 3
+                    $t7 := 3
+                    // $t8 := ==($t3, $t7)
+                    $t8 := $Eq($t3, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_arithmetic_ops(a) -> $result0, $result1 {
+            let c, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t5 := 42
+                    $t5 := 42
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 3 {
+                    // label L0
+                    // return ($t2, $t0)
+                    $result0 := $t2
+                    $result1 := a
+                    leave
+                }
+                case 4 {
+                    // $t2 := 2
+                    $t2 := 2
+                    // $t3 := 2
+                    $t3 := 2
+                    // $t4 := !=($t2, $t3)
+                    $t4 := $Neq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_arithmetic_ops_aborts: Revert(Reverted) (used_gas=420): [0, 0, 0, 0, 0, 0, 0, 100]
+
+// test of M::test_bool_ops
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_bool_ops" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_bool_ops()
+        return (0, 0)
+        function A2_M_test_bool_ops() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 3
+                    $t1 := 3
+                    // $t2 := 2
+                    $t2 := 2
+                    // ($t3, $t4) := M::bool_ops($t1, $t2)
+                    $t3, $t4 := A2_M_bool_ops($t1, $t2)
+                    // $t5 := true
+                    $t5 := true
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := false
+                    $t8 := false
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_bool_ops(a, b) -> $result0, $result1 {
+            let tmp_$2, tmp_$3, c, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t2 := >=($t0, $t1)
+                    tmp_$2 := $GtEq(a, b)
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := false
+                    $t7 := false
+                    // $t2 := $t7
+                    tmp_$2 := $t7
+                    // goto L2
+                    $block := 5
+                }
+                case 4 {
+                    // $t6 := >($t0, $t1)
+                    $t6 := $Gt(a, b)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := <($t0, $t1)
+                    $t8 := $Lt(a, b)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // $t9 := true
+                    $t9 := true
+                    // $t3 := $t9
+                    tmp_$3 := $t9
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t3 := <=($t0, $t1)
+                    tmp_$3 := $LtEq(a, b)
+                    // goto L5
+                    $block := 8
+                }
+                case 8 {
+                    // label L5
+                    // $t10 := !=($t2, $t3)
+                    $t10 := $Neq(tmp_$2, tmp_$3)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L7 else goto L6
+                    switch $t11
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // $t12 := 42
+                    $t12 := 42
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 10 {
+                    // label L6
+                    // return ($t2, $t3)
+                    $result0 := tmp_$2
+                    $result1 := tmp_$3
+                    leave
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Gt(x, y) -> r {
+            r := gt(x, y)
+        }
+        function $Lt(x, y) -> r {
+            r := lt(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_bool_ops: Succeed(Stopped) (used_gas=1491): []
+
+// test of M::test_bool_ops_aborts
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_bool_ops_aborts" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_bool_ops_aborts()
+        return (0, 0)
+        function A2_M_test_bool_ops_aborts() {
+            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t2 := true
+                    $t2 := true
+                    // $t3 := false
+                    $t3 := false
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // $t5 := !($t4)
+                    $t5 := $LogicalNot($t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := !=($t2, $t3)
+                    $t7 := $Neq($t2, $t3)
+                    // if ($t7) goto L4 else goto L3
+                    switch $t7
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t8 := 101
+                    $t8 := 101
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 8 {
+                    // label L5
+                    // $t9 := !($t2)
+                    $t9 := $LogicalNot($t2)
+                    // $t10 := !($t3)
+                    $t10 := $LogicalNot($t3)
+                    // $t11 := !=($t9, $t10)
+                    $t11 := $Neq($t9, $t10)
+                    // if ($t11) goto L7 else goto L6
+                    switch $t11
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 11 {
+                    // label L8
+                    // $t13 := !($t3)
+                    $t13 := $LogicalNot($t3)
+                    // if ($t13) goto L10 else goto L9
+                    switch $t13
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t14 := 103
+                    $t14 := 103
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 14 {
+                    // label L11
+                    // $t15 := !($t2)
+                    $t15 := $LogicalNot($t2)
+                    // if ($t15) goto L13 else goto L12
+                    switch $t15
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t16 := 104
+                    $t16 := 104
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_bool_ops_aborts: Revert(Reverted) (used_gas=2075): [0, 0, 0, 0, 0, 0, 0, 104]
+
+// test of M::test_div
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div()
+        return (0, 0)
+        function A2_M_test_div() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 3
+                    $t8 := 3
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_div: Succeed(Stopped) (used_gas=661): []
+
+// test of M::test_div_by_zero
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div_by_zero" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div_by_zero()
+        return (0, 0)
+        function A2_M_test_div_by_zero() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 7
+            $t0 := 7
+            // $t1 := 0
+            $t1 := 0
+            // ($t2, $t3) := M::div($t0, $t1)
+            $t2, $t3 := A2_M_div($t0, $t1)
+            // destroy($t3)
+            // destroy($t2)
+            // return ()
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+    }
+}
+===> Test result of M::test_div_by_zero: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_div_wrong_assert
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_div_wrong_assert" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_div_wrong_assert()
+        return (0, 0)
+        function A2_M_test_div_wrong_assert() {
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 2
+                    $t8 := 2
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_div(x, y) -> $result0, $result1 {
+            let $t2, $t3
+            // $t2 := /($t0, $t1)
+            $t2 := $Div(x, y)
+            // $t3 := %($t0, $t1)
+            $t3 := $Mod(x, y)
+            // return ($t2, $t3)
+            $result0 := $t2
+            $result1 := $t3
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Mod(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := mod(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_div_wrong_assert: Revert(Reverted) (used_gas=529): [0, 0, 0, 0, 0, 0, 0, 101]
+
+// test of M::test_multiple_ops
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_multiple_ops" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_multiple_ops()
+        return (0, 0)
+        function A2_M_test_multiple_ops() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := 3
+                    $t0 := 3
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 13
+                    $t4 := 13
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_multiple_ops(x, y, z) -> $result {
+            let $t3, $t4
+            // $t3 := *($t1, $t2)
+            $t3 := $MulU64(y, z)
+            // $t4 := +($t0, $t3)
+            $t4 := $AddU64(x, $t3)
+            // return $t4
+            $result := $t4
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $MulU64(x, y) -> r {
+            if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+            r := mul(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_multiple_ops: Succeed(Stopped) (used_gas=265): []
+
+// test of M::test_multiple_overflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_multiple_overflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_multiple_overflow()
+        return (0, 0)
+        function A2_M_test_multiple_overflow() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := 0
+                    $t0 := 0
+                    // $t1 := 18446744073709551615
+                    $t1 := 18446744073709551615
+                    // $t2 := 2
+                    $t2 := 2
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 0
+                    $t4 := 0
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_multiple_ops(x, y, z) -> $result {
+            let $t3, $t4
+            // $t3 := *($t1, $t2)
+            $t3 := $MulU64(y, z)
+            // $t4 := +($t0, $t3)
+            $t4 := $AddU64(x, $t3)
+            // return $t4
+            $result := $t4
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $MulU64(x, y) -> r {
+            if gt(y, div(0xffffffffffffffff, x)) { $AbortBuiltin() }
+            r := mul(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_multiple_overflow: Revert(Reverted) (used_gas=125): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of M::test_underflow
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_underflow" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_underflow()
+        return (0, 0)
+        function A2_M_test_underflow() {
+            let $t0
+            // $t0 := M::underflow()
+            $t0 := A2_M_underflow()
+            // destroy($t0)
+            // return ()
+        }
+
+        function A2_M_underflow() -> $result {
+            let $t0, $t1, $t2
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 1
+            $t1 := 1
+            // $t2 := -($t0, $t1)
+            $t2 := $Sub($t0, $t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Sub(x, y) -> r {
+            if lt(x, y) { $AbortBuiltin() }
+            r := sub(x, y)
+        }
+    }
+}
+===> Test result of M::test_underflow: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Arithm.move b/vendors/move/crates/evm/move-to-yul/tests/Arithm.move
new file mode 100644
index 000000000..558d1a5da
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Arithm.move
@@ -0,0 +1,127 @@
+// Tests basic arithmetic. We only test for u64. Existing move unit tests (once ready for Move on EVM) should cover
+// all other basic types.
+#[evm_contract]
+module 0x2::M {
+
+    // ==============================
+
+    #[callable]
+    fun add_two_number(x: u64, y: u64): (u64, u64) {
+        let res: u64 = x + y;
+        let z: u64 = 3;
+        (z, res)
+    }
+    #[evm_test]
+    fun test_add_two_number() {
+        let (z, res) = add_two_number(2, 5);
+        assert!(z == 3, 100);
+        assert!(res == 7, 101);
+    }
+    #[evm_test]
+    fun test_add_two_number_wrong_assert() {
+        let (z, res) = add_two_number(2, 5);
+        assert!(z == 3, 100);
+        assert!(res == 6, 101);
+    }
+    #[evm_test]
+    fun test_add_two_number_overflow() {
+        let (_z, _res) = add_two_number(18446744073709551615, 1);
+    }
+
+    // ==============================
+
+    #[callable]
+    fun div(x: u64, y: u64): (u64, u64) {
+        (x / y, x % y)
+    }
+    #[evm_test]
+    fun test_div() {
+        let (r1, r2) = div(7, 4);
+        assert!(r1 == 1, 100);
+        assert!(r2 == 3, 101);
+    }
+    #[evm_test]
+    fun test_div_wrong_assert() {
+        let (r1, r2) = div(7, 4);
+        assert!(r1 == 1, 100);
+        assert!(r2 == 2, 101);
+    }
+    #[evm_test]
+    fun test_div_by_zero() {
+        let (_r1, _r2) = div(7, 0);
+    }
+
+
+    // ==============================
+
+    #[callable]
+    fun multiple_ops(x: u64, y: u64, z: u64): u64 {
+        x + y * z
+    }
+    #[evm_test]
+    fun test_multiple_ops() {
+        let r = multiple_ops(3, 2, 5);
+        assert!(r == 3 + 2 * 5, 100);
+    }
+    #[evm_test]
+    fun test_multiple_overflow() {
+        let r = multiple_ops(0, 18446744073709551615, 2);
+        assert!(r == 0, 100);
+    }
+
+    // ==============================
+
+    #[callable]
+    fun bool_ops(a: u64, b: u64): (bool, bool) {
+        let c: bool;
+        let d: bool;
+        c = a > b && a >= b;
+        d = a < b || a <= b;
+        if (!(c != d)) abort 42;
+        (c, d)
+    }
+    #[evm_test]
+    fun test_bool_ops() {
+        let (r1, r2) = bool_ops(3, 2);
+        assert!(r1 == true, 100);
+        assert!(r2 == false, 101);
+    }
+
+    #[evm_test]
+    fun test_bool_ops_aborts() {
+        let (r1, r2) = (true, false);
+        assert!(!(r1 == r2), 100);
+        assert!(r1 != r2, 101);
+        assert!(!r1 != !r2, 102);
+        assert!(!r2, 103);
+        assert!(!r1, 104); // should abort here
+    }
+
+    // ==============================
+
+    #[callable]
+    fun arithmetic_ops(a: u64): (u64, u64) {
+        let c: u64;
+        c = (6 + 4 - 1) * 2 / 3 % 4;
+        if (c != 2) abort 42;
+        (c, a)
+    }
+    #[evm_test]
+    fun test_arithmetic_ops_aborts() {
+        let (r1, r2) = arithmetic_ops(3);
+        assert!(r1 == 1, 100); // should abort here
+        assert!(r2 == 3, 101);
+    }
+
+    // ==============================
+
+    #[callable]
+    fun underflow(): u64 {
+        let x = 0;
+        x - 1
+    }
+    #[evm_test]
+    fun test_underflow() {
+        let _r = underflow();
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.exp b/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.exp
new file mode 100644
index 000000000..b51e33ba8
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.exp
@@ -0,0 +1,343 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ConstructorTest" {
+    code {
+        mstore(0, memoryguard(160))
+        let program_size := datasize("A2_ConstructorTest")
+        let arg_size := sub(codesize(), program_size)
+        let memory_data_offset := $Malloc(arg_size)
+        codecopy(memory_data_offset, program_size, arg_size)
+        let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$_from_memory(memory_data_offset, add(memory_data_offset, arg_size))
+        A2_ConstructorTest_init(param_0, param_1)
+        codecopy(0, dataoffset("A2_ConstructorTest_deployed"), datasize("A2_ConstructorTest_deployed"))
+        return(0, datasize("A2_ConstructorTest_deployed"))
+        function A2_ConstructorTest_init(value, value2) {
+            let $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            // $t3 := 0x42
+            $t3 := 0x42
+            // $t2 := Evm::sign($t3)
+            mstore($locals, A2_Evm_sign($t3))
+            // $t4 := borrow_local($t2)
+            $t4 := $MakePtr(false, $locals)
+            // $t5 := pack ConstructorTest::Balance($t0, $t1)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU64(add($mem, 0), value)
+                $MemoryStoreU64(add($mem, 8), value2)
+                $t5 := $mem
+            }
+            // move_to<ConstructorTest::Balance>($t5, $t4)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x91d9463a, $LoadU256($t4))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t5
+                    $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                    $Free($src, 16)
+                }
+            }
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function abi_decode_tuple_$uint64_uint64$_$u64_u64$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint64_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint64_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint64_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint64(value)
+        }
+        function validator_uint64(value) {
+            if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+        }
+        function cleanup_uint64(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+    object "A2_ConstructorTest_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xf8a8fd6d
+                {
+                    // test()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_ConstructorTest_test()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ConstructorTest_test() -> $result {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 0x42
+                $t0 := 0x42
+                // $t1 := borrow_global<ConstructorTest::Balance>($t0)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x91d9463a, $t0)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t1 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t2 := borrow_field<ConstructorTest::Balance>.value($t1)
+                $t2 := $t1
+                // $t3 := read_ref($t2)
+                $t3 := $LoadU64($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.move b/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.move
new file mode 100644
index 000000000..092bd73db
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/ConstructorTest.move
@@ -0,0 +1,19 @@
+#[evm_contract]
+module 0x2::ConstructorTest {
+    use Evm::Evm::sign;
+
+    struct Balance has key, drop {
+        value: u64,
+        value2: u64
+    }
+
+    #[create]
+    fun init(value: u64, value2: u64) {
+        move_to(&sign(@0x42), Balance { value, value2});
+    }
+
+    #[callable]
+    fun test(): u64 acquires Balance {
+        borrow_global<Balance>(@0x42).value
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.exp b/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.exp
new file mode 100644
index 000000000..f2832b853
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.exp
@@ -0,0 +1,334 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x70e8dbcb
+                {
+                    // f(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_f(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb3e8e519
+                {
+                    // g(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_g(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf5f96a87
+                {
+                    // h1(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_h1(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x410dac7e
+                {
+                    // h2(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    A2_M_h2(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f(x) {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // label L6
+                        // $t1 := 0
+                        $t1 := 0
+                        // $t2 := >($t0, $t1)
+                        $t2 := $Gt(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t3 := 2
+                        $t3 := 2
+                        // $t4 := %($t0, $t3)
+                        $t4 := $Mod(x, $t3)
+                        // $t5 := 0
+                        $t5 := 0
+                        // $t6 := ==($t4, $t5)
+                        $t6 := $Eq($t4, $t5)
+                        // if ($t6) goto L4 else goto L3
+                        switch $t6
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // $t7 := 1
+                        $t7 := 1
+                        // $t0 := +($t0, $t7)
+                        x := $AddU64(x, $t7)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t8 := 2
+                        $t8 := 2
+                        // $t0 := -($t0, $t8)
+                        x := $Sub(x, $t8)
+                        // goto L5
+                        $block := 8
+                    }
+                    case 8 {
+                        // label L5
+                        // goto L6
+                        $block := 4
+                    }
+                }
+            }
+
+            function A2_M_g(x) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t4 := 0
+                        $t4 := 0
+                        // $t5 := ==($t0, $t4)
+                        $t5 := $Eq(x, $t4)
+                        // if ($t5) goto L5 else goto L4
+                        switch $t5
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 4 {
+                        // label L3
+                        // $t1 := 1
+                        $t1 := 1
+                        // $t2 := >=($t0, $t1)
+                        $t2 := $GtEq(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t0 := -($t0, $t3)
+                        x := $Sub(x, $t3)
+                        // goto L3
+                        $block := 4
+                    }
+                    case 6 {
+                        // label L5
+                        // goto L6
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L4
+                        // goto L3
+                        $block := 4
+                    }
+                    case 8 {
+                        // label L6
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_h1(x) -> $result {
+                let tmp_$1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := 1
+                        $t4 := 1
+                        // $t1 := $t4
+                        tmp_$1 := $t4
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 2
+                        $t5 := 2
+                        // $t1 := $t5
+                        tmp_$1 := $t5
+                        // goto L2
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t2 := 0
+                        $t2 := 0
+                        // $t3 := >($t0, $t2)
+                        $t3 := $Gt(x, $t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // return $t1
+                        $result := tmp_$1
+                        leave
+                    }
+                }
+            }
+
+            function A2_M_h2(x) {
+                let $t1, $t2, $t3
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t3 := 1
+                        $t3 := 1
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := 0
+                        $t1 := 0
+                        // $t2 := >($t0, $t1)
+                        $t2 := $Gt(x, $t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.move b/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.move
new file mode 100644
index 000000000..9dd70fcdc
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/ControlStructures.move
@@ -0,0 +1,28 @@
+// Tests basic control structures.
+#[evm_contract]
+module 0x2::M {
+  #[callable]
+  fun h1(x: u64): u64 {
+    if (x > 0) 1 else 2
+  }
+
+  #[callable]
+  fun h2(x: u64) {
+    if (x > 0) abort(1)
+  }
+
+  #[callable]
+  fun f(x: u64) {
+    while (x > 0) {
+      if (x % 2 == 0) { x = x + 1 } else { x = x - 2 }
+    }
+  }
+
+  #[callable]
+  fun g(x: u64) {
+    loop {
+        if (x >= 1) { x = x - 1; continue };
+        if (x == 0) break;
+    }
+  }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.exp b/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.exp
new file mode 100644
index 000000000..fcee1e13c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.exp
@@ -0,0 +1,7281 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_GlobalVectors" {
+    code {
+        codecopy(0, dataoffset("A2_GlobalVectors_deployed"), datasize("A2_GlobalVectors_deployed"))
+        return(0, datasize("A2_GlobalVectors_deployed"))
+    }
+    object "A2_GlobalVectors_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of GlobalVectors::test_borrow_mut_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_borrow_mut_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_borrow_mut_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_borrow_mut_global() {
+            let e, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t27 := 102
+                    $t27 := 102
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 4 {
+                    // $t2 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 43
+                    $t6 := 43
+                    // vector::push_back<u64>($t5, $t6)
+                    A1_vector_push_back$u64$($t5, $t6)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 44
+                    $t8 := 44
+                    // vector::push_back<u64>($t7, $t8)
+                    A1_vector_push_back$u64$($t7, $t8)
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t0 := Evm::sign($t9)
+                    mstore(add($locals, 32), A2_Evm_sign($t9))
+                    // $t10 := borrow_local($t0)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := move($t2)
+                    $t11 := mload($locals)
+                    // $t12 := pack GlobalVectors::T<u64>($t11)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $t12 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t12
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t13 := 0x42
+                    $t13 := 0x42
+                    // $t14 := borrow_global<GlobalVectors::T<u64>>($t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t14 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t15 := borrow_field<GlobalVectors::T<u64>>.v($t14)
+                    $t15 := $t14
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow_mut<u64>($t15, $t16)
+                    $t17 := A1_vector_borrow_mut$u64$($t15, $t16)
+                    // $t18 := 12
+                    $t18 := 12
+                    // write_ref($t17, $t18)
+                    $StoreU64($t17, $t18)
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := 0
+                    $t22 := 0
+                    // $t23 := vector::borrow<u64>($t21, $t22)
+                    $t23 := A1_vector_borrow$u64$($t21, $t22)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU64($t23)
+                    // $t25 := 12
+                    $t25 := 12
+                    // $t26 := ==($t24, $t25)
+                    $t26 := $Eq($t24, $t25)
+                    // if ($t26) goto L1 else goto L0
+                    switch $t26
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow_mut$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_borrow_mut_global: Succeed(Stopped) (used_gas=117389): []
+
+// test of GlobalVectors::test_move_from
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t19 := 101
+                    $t19 := 101
+                    // abort($t19)
+                    $Abort($t19)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t3 := borrow_local($t1)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t1)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 11
+                    $t6 := 11
+                    // vector::push_back<u64>($t5, $t6)
+                    A1_vector_push_back$u64$($t5, $t6)
+                    // $t7 := borrow_local($t1)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 12
+                    $t8 := 12
+                    // vector::push_back<u64>($t7, $t8)
+                    A1_vector_push_back$u64$($t7, $t8)
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t0 := Evm::sign($t9)
+                    mstore(add($locals, 32), A2_Evm_sign($t9))
+                    // $t10 := borrow_local($t0)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := move($t1)
+                    $t11 := mload($locals)
+                    // $t12 := pack GlobalVectors::T<u64>($t11)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $t12 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t12
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t13 := 0x42
+                    $t13 := 0x42
+                    // $t14 := move_from<GlobalVectors::T<u64>>($t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_814019441 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_814019441
+                                let $size_814019441 := $StorageLoadU64($linked_src_814019441)
+                                let $capacity_814019441 := $ClosestGreaterPowerOfTwo($size_814019441)
+                                $linked_dst_814019441 := $Malloc(add(32, mul($capacity_814019441, 8)))
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                mstore($linked_dst_814019441, $AlignedStorageLoad($linked_src_814019441))
+                                $MemoryStoreU64(add($linked_dst_814019441, 8), $capacity_814019441)
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    mstore(add($data_dst_814019441, $offs_814019441), $AlignedStorageLoad(add($data_src_814019441, $offs_814019441)))
+                                    $AlignedStorageStore(add($data_src_814019441, $offs_814019441), 0)
+                                }
+                                mstore(add($dst, 0), $linked_dst_814019441)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            $t14 := $dst
+                        }
+                    }
+                    // $t2 := unpack GlobalVectors::T<u64>($t14)
+                    mstore(add($locals, 64), $MemoryLoadU256(add($t14, 0)))
+                    $Free($t14, 32)
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 64))
+                    // $t16 := vector::length<u64>($t15)
+                    $t16 := A1_vector_length$u64$($t15)
+                    // $t17 := 3
+                    $t17 := 3
+                    // $t18 := ==($t16, $t17)
+                    $t18 := $Eq($t16, $t17)
+                    // if ($t18) goto L1 else goto L0
+                    switch $t18
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t20 := borrow_local($t2)
+                    $t20 := $MakePtr(false, add($locals, 64))
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t26 := 102
+                    $t26 := 102
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 8 {
+                    // label L5
+                    // $t27 := borrow_local($t2)
+                    $t27 := $MakePtr(false, add($locals, 64))
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := vector::borrow<u64>($t27, $t28)
+                    $t29 := A1_vector_borrow$u64$($t27, $t28)
+                    // $t30 := read_ref($t29)
+                    $t30 := $LoadU64($t29)
+                    // $t31 := 11
+                    $t31 := 11
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L7 else goto L6
+                    switch $t32
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t33 := 103
+                    $t33 := 103
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 11 {
+                    // label L8
+                    // $t34 := borrow_local($t2)
+                    $t34 := $MakePtr(false, add($locals, 64))
+                    // $t35 := 2
+                    $t35 := 2
+                    // $t36 := vector::borrow<u64>($t34, $t35)
+                    $t36 := A1_vector_borrow$u64$($t34, $t35)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU64($t36)
+                    // $t38 := 12
+                    $t38 := 12
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L10 else goto L9
+                    switch $t39
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t40 := 104
+                    $t40 := 104
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 14 {
+                    // label L11
+                    // $t41 := borrow_local($t2)
+                    $t41 := $MakePtr(false, add($locals, 64))
+                    // $t42 := 13
+                    $t42 := 13
+                    // vector::push_back<u64>($t41, $t42)
+                    A1_vector_push_back$u64$($t41, $t42)
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := 14
+                    $t44 := 14
+                    // vector::push_back<u64>($t43, $t44)
+                    A1_vector_push_back$u64$($t43, $t44)
+                    // $t45 := borrow_local($t2)
+                    $t45 := $MakePtr(false, add($locals, 64))
+                    // $t46 := 3
+                    $t46 := 3
+                    // $t47 := vector::borrow<u64>($t45, $t46)
+                    $t47 := A1_vector_borrow$u64$($t45, $t46)
+                    // $t48 := read_ref($t47)
+                    $t48 := $LoadU64($t47)
+                    // $t49 := 13
+                    $t49 := 13
+                    // $t50 := ==($t48, $t49)
+                    $t50 := $Eq($t48, $t49)
+                    // if ($t50) goto L13 else goto L12
+                    switch $t50
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t51 := 105
+                    $t51 := 105
+                    // abort($t51)
+                    $Abort($t51)
+                }
+                case 17 {
+                    // label L14
+                    // $t52 := borrow_local($t2)
+                    $t52 := $MakePtr(false, add($locals, 64))
+                    // $t53 := 4
+                    $t53 := 4
+                    // $t54 := vector::borrow<u64>($t52, $t53)
+                    $t54 := A1_vector_borrow$u64$($t52, $t53)
+                    // $t55 := read_ref($t54)
+                    $t55 := $LoadU64($t54)
+                    // $t56 := 14
+                    $t56 := 14
+                    // $t57 := ==($t55, $t56)
+                    $t57 := $Eq($t55, $t56)
+                    // if ($t57) goto L16 else goto L15
+                    switch $t57
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t58 := 106
+                    $t58 := 106
+                    // abort($t58)
+                    $Abort($t58)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from: Succeed(Stopped) (used_gas=98498): []
+
+// test of GlobalVectors::test_move_from_vector_of_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from_vector_of_struct()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from_vector_of_struct() {
+            let local_t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t25 := 101
+                    $t25 := 101
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 4 {
+                    // $t2 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // $t5 := 40
+                    $t5 := 40
+                    // $t6 := pack GlobalVectors::S($t4, $t5)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t4)
+                        $MemoryStoreU64(add($mem, 16), $t5)
+                        $t6 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t3, $t6)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t3, $t6)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 11
+                    $t8 := 11
+                    // $t9 := 41
+                    $t9 := 41
+                    // $t10 := pack GlobalVectors::S($t8, $t9)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU64(add($mem, 16), $t9)
+                        $t10 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t7, $t10)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t7, $t10)
+                    // $t11 := borrow_local($t2)
+                    $t11 := $MakePtr(false, $locals)
+                    // $t12 := 12
+                    $t12 := 12
+                    // $t13 := 42
+                    $t13 := 42
+                    // $t14 := pack GlobalVectors::S($t12, $t13)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t12)
+                        $MemoryStoreU64(add($mem, 16), $t13)
+                        $t14 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t11, $t14)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t11, $t14)
+                    // $t15 := 0x42
+                    $t15 := 0x42
+                    // $t0 := Evm::sign($t15)
+                    mstore(add($locals, 32), A2_Evm_sign($t15))
+                    // $t16 := borrow_local($t0)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := move($t2)
+                    $t17 := mload($locals)
+                    // $t18 := pack GlobalVectors::T<GlobalVectors::S>($t17)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t17)
+                        $t18 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t18, $t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t16))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t18
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t1 := move_from<GlobalVectors::T<GlobalVectors::S>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_634259357 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_634259357
+                                let $size_634259357 := $StorageLoadU64($linked_src_634259357)
+                                let $capacity_634259357 := $ClosestGreaterPowerOfTwo($size_634259357)
+                                $linked_dst_634259357 := $Malloc(add(32, mul($capacity_634259357, 32)))
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                mstore($linked_dst_634259357, $AlignedStorageLoad($linked_src_634259357))
+                                $MemoryStoreU64(add($linked_dst_634259357, 8), $capacity_634259357)
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := $AlignedStorageLoad(add($data_src_634259357, $offs_634259357))
+                                        let $linked_dst_3681206257
+                                        $linked_dst_3681206257 := $Malloc(24)
+                                        mstore(add($linked_dst_3681206257, 0), $AlignedStorageLoad(add($linked_src_3681206257, 0)))
+                                        $AlignedStorageStore(add($linked_src_3681206257, 0), 0)
+                                        mstore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                        $AlignedStorageStore(add($data_src_634259357, $offs_634259357), 0)
+                                    }
+                                }
+                                mstore(add($dst, 0), $linked_dst_634259357)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            local_t := $dst
+                        }
+                    }
+                    // $t20 := borrow_local($t1)
+                    $t20 := $MakePtr(false, local_t)
+                    // $t21 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := vector::length<GlobalVectors::S>($t21)
+                    $t22 := A1_vector_length$A2_GlobalVectors_S$($t21)
+                    // $t23 := 3
+                    $t23 := 3
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L1 else goto L0
+                    switch $t24
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t26 := borrow_local($t1)
+                    $t26 := $MakePtr(false, local_t)
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 102
+                    $t34 := 102
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := borrow_local($t1)
+                    $t35 := $MakePtr(false, local_t)
+                    // $t36 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t35)
+                    $t36 := $t35
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := vector::borrow<GlobalVectors::S>($t36, $t37)
+                    $t38 := A1_vector_borrow$A2_GlobalVectors_S$($t36, $t37)
+                    // $t39 := borrow_field<GlobalVectors::S>.x($t38)
+                    $t39 := $t38
+                    // $t40 := read_ref($t39)
+                    $t40 := $LoadU128($t39)
+                    // $t41 := 11
+                    $t41 := 11
+                    // $t42 := ==($t40, $t41)
+                    $t42 := $Eq($t40, $t41)
+                    // if ($t42) goto L7 else goto L6
+                    switch $t42
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t43 := 103
+                    $t43 := 103
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 11 {
+                    // label L8
+                    // $t44 := borrow_local($t1)
+                    $t44 := $MakePtr(false, local_t)
+                    // $t45 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t44)
+                    $t45 := $t44
+                    // $t46 := 2
+                    $t46 := 2
+                    // $t47 := vector::borrow<GlobalVectors::S>($t45, $t46)
+                    $t47 := A1_vector_borrow$A2_GlobalVectors_S$($t45, $t46)
+                    // $t48 := borrow_field<GlobalVectors::S>.x($t47)
+                    $t48 := $t47
+                    // $t49 := read_ref($t48)
+                    $t49 := $LoadU128($t48)
+                    // $t50 := 12
+                    $t50 := 12
+                    // $t51 := ==($t49, $t50)
+                    $t51 := $Eq($t49, $t50)
+                    // if ($t51) goto L10 else goto L9
+                    switch $t51
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t52 := 104
+                    $t52 := 104
+                    // abort($t52)
+                    $Abort($t52)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from_vector_of_struct: Succeed(Stopped) (used_gas=187040): []
+
+// test of GlobalVectors::test_move_from_vector_of_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_from_vector_of_vector()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_from_vector_of_vector() {
+            let local_t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t22 := 101
+                    $t22 := 101
+                    // abort($t22)
+                    $Abort($t22)
+                }
+                case 4 {
+                    // $t2 := vector::empty<vector<u64>>()
+                    mstore($locals, A1_vector_empty$vec$u64$$())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // $t5 := vector::singleton<u64>($t4)
+                    $t5 := A1_vector_singleton$u64$($t4)
+                    // vector::push_back<vector<u64>>($t3, $t5)
+                    A1_vector_push_back$vec$u64$$($t3, $t5)
+                    // $t6 := borrow_local($t2)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := vector::singleton<u64>($t7)
+                    $t8 := A1_vector_singleton$u64$($t7)
+                    // vector::push_back<vector<u64>>($t6, $t8)
+                    A1_vector_push_back$vec$u64$$($t6, $t8)
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 12
+                    $t10 := 12
+                    // $t11 := vector::singleton<u64>($t10)
+                    $t11 := A1_vector_singleton$u64$($t10)
+                    // vector::push_back<vector<u64>>($t9, $t11)
+                    A1_vector_push_back$vec$u64$$($t9, $t11)
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t0 := Evm::sign($t12)
+                    mstore(add($locals, 32), A2_Evm_sign($t12))
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, add($locals, 32))
+                    // $t14 := move($t2)
+                    $t14 := mload($locals)
+                    // $t15 := pack GlobalVectors::T<vector<u64>>($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // move_to<GlobalVectors::T<vector<u64>>>($t15, $t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $LoadU256($t13))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t15
+                            {
+                                let $linked_src_3066871491 := mload(add($src, 0))
+                                let $linked_dst_3066871491 := $NewLinkedStorageBase(0xb6ccbec3)
+                                let $size_3066871491 := $MemoryLoadU64($linked_src_3066871491)
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                $AlignedStorageStore($linked_dst_3066871491, mload($linked_src_3066871491))
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := mload(add($offs_3066871491, $data_src_3066871491))
+                                        let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                        let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                            $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                        }
+                                        $AlignedStorageStore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                    }
+                                    $Free($linked_src_3066871491, add($data_size_3066871491, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_3066871491)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t16 := 0x42
+                    $t16 := 0x42
+                    // $t1 := move_from<GlobalVectors::T<vector<u64>>>($t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t16)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            {
+                                let $linked_src_3066871491 := $AlignedStorageLoad(add($src, 0))
+                                let $linked_dst_3066871491
+                                let $size_3066871491 := $StorageLoadU64($linked_src_3066871491)
+                                let $capacity_3066871491 := $ClosestGreaterPowerOfTwo($size_3066871491)
+                                $linked_dst_3066871491 := $Malloc(add(32, mul($capacity_3066871491, 32)))
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                mstore($linked_dst_3066871491, $AlignedStorageLoad($linked_src_3066871491))
+                                $MemoryStoreU64(add($linked_dst_3066871491, 8), $capacity_3066871491)
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := $AlignedStorageLoad(add($data_src_3066871491, $offs_3066871491))
+                                        let $linked_dst_814019441
+                                        let $size_814019441 := $StorageLoadU64($linked_src_814019441)
+                                        let $capacity_814019441 := $ClosestGreaterPowerOfTwo($size_814019441)
+                                        $linked_dst_814019441 := $Malloc(add(32, mul($capacity_814019441, 8)))
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        mstore($linked_dst_814019441, $AlignedStorageLoad($linked_src_814019441))
+                                        $MemoryStoreU64(add($linked_dst_814019441, 8), $capacity_814019441)
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            mstore(add($data_dst_814019441, $offs_814019441), $AlignedStorageLoad(add($data_src_814019441, $offs_814019441)))
+                                            $AlignedStorageStore(add($data_src_814019441, $offs_814019441), 0)
+                                        }
+                                        mstore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                        $AlignedStorageStore(add($data_src_3066871491, $offs_3066871491), 0)
+                                    }
+                                }
+                                mstore(add($dst, 0), $linked_dst_3066871491)
+                                $AlignedStorageStore(add($src, 0), 0)
+                            }
+                            local_t := $dst
+                        }
+                    }
+                    // $t17 := borrow_local($t1)
+                    $t17 := $MakePtr(false, local_t)
+                    // $t18 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t17)
+                    $t18 := $t17
+                    // $t19 := vector::length<vector<u64>>($t18)
+                    $t19 := A1_vector_length$vec$u64$$($t18)
+                    // $t20 := 3
+                    $t20 := 3
+                    // $t21 := ==($t19, $t20)
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L1 else goto L0
+                    switch $t21
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t23 := borrow_local($t1)
+                    $t23 := $MakePtr(false, local_t)
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := borrow_local($t1)
+                    $t33 := $MakePtr(false, local_t)
+                    // $t34 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t33)
+                    $t34 := $t33
+                    // $t35 := 1
+                    $t35 := 1
+                    // $t36 := vector::borrow<vector<u64>>($t34, $t35)
+                    $t36 := A1_vector_borrow$vec$u64$$($t34, $t35)
+                    // $t37 := 0
+                    $t37 := 0
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 11
+                    $t40 := 11
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L7 else goto L6
+                    switch $t41
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t42 := 102
+                    $t42 := 102
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 11 {
+                    // label L8
+                    // $t43 := borrow_local($t1)
+                    $t43 := $MakePtr(false, local_t)
+                    // $t44 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t43)
+                    $t44 := $t43
+                    // $t45 := 2
+                    $t45 := 2
+                    // $t46 := vector::borrow<vector<u64>>($t44, $t45)
+                    $t46 := A1_vector_borrow$vec$u64$$($t44, $t45)
+                    // $t47 := 0
+                    $t47 := 0
+                    // $t48 := vector::borrow<u64>($t46, $t47)
+                    $t48 := A1_vector_borrow$u64$($t46, $t47)
+                    // $t49 := read_ref($t48)
+                    $t49 := $LoadU64($t48)
+                    // $t50 := 12
+                    $t50 := 12
+                    // $t51 := ==($t49, $t50)
+                    $t51 := $Eq($t49, $t50)
+                    // if ($t51) goto L10 else goto L9
+                    switch $t51
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t52 := 102
+                    $t52 := 102
+                    // abort($t52)
+                    $Abort($t52)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_from_vector_of_vector: Succeed(Stopped) (used_gas=244640): []
+
+// test of GlobalVectors::test_move_to
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := vector::length<u64>($t14)
+                    $t15 := A1_vector_length$u64$($t14)
+                    // $t16 := 3
+                    $t16 := 3
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := 0
+                    $t22 := 0
+                    // $t23 := vector::borrow<u64>($t21, $t22)
+                    $t23 := A1_vector_borrow$u64$($t21, $t22)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU64($t23)
+                    // $t25 := 10
+                    $t25 := 10
+                    // $t26 := ==($t24, $t25)
+                    $t26 := $Eq($t24, $t25)
+                    // if ($t26) goto L4 else goto L3
+                    switch $t26
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t27 := 102
+                    $t27 := 102
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 8 {
+                    // label L5
+                    // $t28 := 0x42
+                    $t28 := 0x42
+                    // $t29 := borrow_global<GlobalVectors::T<u64>>($t28)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t28)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t29 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t30 := borrow_field<GlobalVectors::T<u64>>.v($t29)
+                    $t30 := $t29
+                    // $t31 := 1
+                    $t31 := 1
+                    // $t32 := vector::borrow<u64>($t30, $t31)
+                    $t32 := A1_vector_borrow$u64$($t30, $t31)
+                    // $t33 := read_ref($t32)
+                    $t33 := $LoadU64($t32)
+                    // $t34 := 11
+                    $t34 := 11
+                    // $t35 := ==($t33, $t34)
+                    $t35 := $Eq($t33, $t34)
+                    // if ($t35) goto L7 else goto L6
+                    switch $t35
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t36 := 103
+                    $t36 := 103
+                    // abort($t36)
+                    $Abort($t36)
+                }
+                case 11 {
+                    // label L8
+                    // $t37 := 0x42
+                    $t37 := 0x42
+                    // $t38 := borrow_global<GlobalVectors::T<u64>>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<GlobalVectors::T<u64>>.v($t38)
+                    $t39 := $t38
+                    // $t40 := 2
+                    $t40 := 2
+                    // $t41 := vector::borrow<u64>($t39, $t40)
+                    $t41 := A1_vector_borrow$u64$($t39, $t40)
+                    // $t42 := read_ref($t41)
+                    $t42 := $LoadU64($t41)
+                    // $t43 := 12
+                    $t43 := 12
+                    // $t44 := ==($t42, $t43)
+                    $t44 := $Eq($t42, $t43)
+                    // if ($t44) goto L10 else goto L9
+                    switch $t44
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t45 := 104
+                    $t45 := 104
+                    // abort($t45)
+                    $Abort($t45)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to: Succeed(Stopped) (used_gas=121112): []
+
+// test of GlobalVectors::test_move_to_vector_of_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to_vector_of_struct()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to_vector_of_struct() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 4 {
+                    // $t1 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := 40
+                    $t4 := 40
+                    // $t5 := pack GlobalVectors::S($t3, $t4)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t3)
+                        $MemoryStoreU64(add($mem, 16), $t4)
+                        $t5 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t2, $t5)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t2, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := 41
+                    $t8 := 41
+                    // $t9 := pack GlobalVectors::S($t7, $t8)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t7)
+                        $MemoryStoreU64(add($mem, 16), $t8)
+                        $t9 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t6, $t9)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t6, $t9)
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 12
+                    $t11 := 12
+                    // $t12 := 42
+                    $t12 := 42
+                    // $t13 := pack GlobalVectors::S($t11, $t12)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t11)
+                        $MemoryStoreU64(add($mem, 16), $t12)
+                        $t13 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t10, $t13)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t10, $t13)
+                    // $t14 := 0x42
+                    $t14 := 0x42
+                    // $t0 := Evm::sign($t14)
+                    mstore(add($locals, 32), A2_Evm_sign($t14))
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := move($t1)
+                    $t16 := mload($locals)
+                    // $t17 := pack GlobalVectors::T<GlobalVectors::S>($t16)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t16)
+                        $t17 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t17, $t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t15))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t17
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t19 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t18)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t19 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t20 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t19)
+                    $t20 := $t19
+                    // $t21 := vector::length<GlobalVectors::S>($t20)
+                    $t21 := A1_vector_length$A2_GlobalVectors_S$($t20)
+                    // $t22 := 3
+                    $t22 := 3
+                    // $t23 := ==($t21, $t22)
+                    $t23 := $Eq($t21, $t22)
+                    // if ($t23) goto L1 else goto L0
+                    switch $t23
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t25 := 0x42
+                    $t25 := 0x42
+                    // $t26 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t25)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t25)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t26 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 102
+                    $t34 := 102
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := 0x42
+                    $t35 := 0x42
+                    // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t35)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t36 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t37 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t36)
+                    $t37 := $t36
+                    // $t38 := 1
+                    $t38 := 1
+                    // $t39 := vector::borrow<GlobalVectors::S>($t37, $t38)
+                    $t39 := A1_vector_borrow$A2_GlobalVectors_S$($t37, $t38)
+                    // $t40 := borrow_field<GlobalVectors::S>.x($t39)
+                    $t40 := $t39
+                    // $t41 := read_ref($t40)
+                    $t41 := $LoadU128($t40)
+                    // $t42 := 11
+                    $t42 := 11
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L7 else goto L6
+                    switch $t43
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t44 := 103
+                    $t44 := 103
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 11 {
+                    // label L8
+                    // $t45 := 0x42
+                    $t45 := 0x42
+                    // $t46 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t45)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t45)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t46 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t47 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t46)
+                    $t47 := $t46
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<GlobalVectors::S>($t47, $t48)
+                    $t49 := A1_vector_borrow$A2_GlobalVectors_S$($t47, $t48)
+                    // $t50 := borrow_field<GlobalVectors::S>.x($t49)
+                    $t50 := $t49
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU128($t50)
+                    // $t52 := 12
+                    $t52 := 12
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L10 else goto L9
+                    switch $t53
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := 104
+                    $t54 := 104
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to_vector_of_struct: Succeed(Stopped) (used_gas=234677): []
+
+// test of GlobalVectors::test_move_to_vector_of_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_move_to_vector_of_vector()
+        return (0, 0)
+        function A2_GlobalVectors_test_move_to_vector_of_vector() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t21 := 101
+                    $t21 := 101
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 4 {
+                    // $t1 := vector::empty<vector<u64>>()
+                    mstore($locals, A1_vector_empty$vec$u64$$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := vector::singleton<u64>($t3)
+                    $t4 := A1_vector_singleton$u64$($t3)
+                    // vector::push_back<vector<u64>>($t2, $t4)
+                    A1_vector_push_back$vec$u64$$($t2, $t4)
+                    // $t5 := borrow_local($t1)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 11
+                    $t6 := 11
+                    // $t7 := vector::singleton<u64>($t6)
+                    $t7 := A1_vector_singleton$u64$($t6)
+                    // vector::push_back<vector<u64>>($t5, $t7)
+                    A1_vector_push_back$vec$u64$$($t5, $t7)
+                    // $t8 := borrow_local($t1)
+                    $t8 := $MakePtr(false, $locals)
+                    // $t9 := 12
+                    $t9 := 12
+                    // $t10 := vector::singleton<u64>($t9)
+                    $t10 := A1_vector_singleton$u64$($t9)
+                    // vector::push_back<vector<u64>>($t8, $t10)
+                    A1_vector_push_back$vec$u64$$($t8, $t10)
+                    // $t11 := 0x42
+                    $t11 := 0x42
+                    // $t0 := Evm::sign($t11)
+                    mstore(add($locals, 32), A2_Evm_sign($t11))
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := move($t1)
+                    $t13 := mload($locals)
+                    // $t14 := pack GlobalVectors::T<vector<u64>>($t13)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t13)
+                        $t14 := $mem
+                    }
+                    // move_to<GlobalVectors::T<vector<u64>>>($t14, $t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $LoadU256($t12))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t14
+                            {
+                                let $linked_src_3066871491 := mload(add($src, 0))
+                                let $linked_dst_3066871491 := $NewLinkedStorageBase(0xb6ccbec3)
+                                let $size_3066871491 := $MemoryLoadU64($linked_src_3066871491)
+                                let $data_size_3066871491 := mul($size_3066871491, 32)
+                                $AlignedStorageStore($linked_dst_3066871491, mload($linked_src_3066871491))
+                                let $data_src_3066871491 := add($linked_src_3066871491, 32)
+                                let $data_dst_3066871491 := add($linked_dst_3066871491, 32)
+                                for { let $offs_3066871491 := 0 } lt($offs_3066871491, $data_size_3066871491) { $offs_3066871491 := add($offs_3066871491, 32)} {
+                                    {
+                                        let $linked_src_814019441 := mload(add($offs_3066871491, $data_src_3066871491))
+                                        let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                        let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                        let $data_size_814019441 := mul($size_814019441, 8)
+                                        $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                        let $data_src_814019441 := add($linked_src_814019441, 32)
+                                        let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                            $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                        }
+                                        $AlignedStorageStore(add($data_dst_3066871491, $offs_3066871491), $linked_dst_814019441)
+                                    }
+                                    $Free($linked_src_3066871491, add($data_size_3066871491, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_3066871491)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t15 := 0x42
+                    $t15 := 0x42
+                    // $t16 := borrow_global<GlobalVectors::T<vector<u64>>>($t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t16)
+                    $t17 := $t16
+                    // $t18 := vector::length<vector<u64>>($t17)
+                    $t18 := A1_vector_length$vec$u64$$($t17)
+                    // $t19 := 3
+                    $t19 := 3
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L1 else goto L0
+                    switch $t20
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t22 := 0x42
+                    $t22 := 0x42
+                    // $t23 := borrow_global<GlobalVectors::T<vector<u64>>>($t22)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t22)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t23 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<vector<u64>>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := 1
+                    $t36 := 1
+                    // $t37 := vector::borrow<vector<u64>>($t35, $t36)
+                    $t37 := A1_vector_borrow$vec$u64$$($t35, $t36)
+                    // $t38 := 0
+                    $t38 := 0
+                    // $t39 := vector::borrow<u64>($t37, $t38)
+                    $t39 := A1_vector_borrow$u64$($t37, $t38)
+                    // $t40 := read_ref($t39)
+                    $t40 := $LoadU64($t39)
+                    // $t41 := 11
+                    $t41 := 11
+                    // $t42 := ==($t40, $t41)
+                    $t42 := $Eq($t40, $t41)
+                    // if ($t42) goto L7 else goto L6
+                    switch $t42
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t43 := 102
+                    $t43 := 102
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 11 {
+                    // label L8
+                    // $t44 := 0x42
+                    $t44 := 0x42
+                    // $t45 := borrow_global<GlobalVectors::T<vector<u64>>>($t44)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t44)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t45 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t46 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t45)
+                    $t46 := $t45
+                    // $t47 := 2
+                    $t47 := 2
+                    // $t48 := vector::borrow<vector<u64>>($t46, $t47)
+                    $t48 := A1_vector_borrow$vec$u64$$($t46, $t47)
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t50 := vector::borrow<u64>($t48, $t49)
+                    $t50 := A1_vector_borrow$u64$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU64($t50)
+                    // $t52 := 12
+                    $t52 := 12
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L10 else goto L9
+                    switch $t53
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := 102
+                    $t54 := 102
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_move_to_vector_of_vector: Succeed(Stopped) (used_gas=305279): []
+
+// test of GlobalVectors::test_pop_back_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_pop_back_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_pop_back_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_pop_back_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := vector::pop_back<u64>($t14)
+                    $t15 := A1_vector_pop_back$u64$($t14)
+                    // $t16 := 12
+                    $t16 := 12
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := vector::length<u64>($t21)
+                    $t22 := A1_vector_length$u64$($t21)
+                    // $t23 := 2
+                    $t23 := 2
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L4 else goto L3
+                    switch $t24
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t25 := 102
+                    $t25 := 102
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 8 {
+                    // label L5
+                    // $t26 := 0x42
+                    $t26 := 0x42
+                    // $t27 := borrow_global<GlobalVectors::T<u64>>($t26)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t26)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t27 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t28 := borrow_field<GlobalVectors::T<u64>>.v($t27)
+                    $t28 := $t27
+                    // $t29 := vector::pop_back<u64>($t28)
+                    $t29 := A1_vector_pop_back$u64$($t28)
+                    // $t30 := 11
+                    $t30 := 11
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L7 else goto L6
+                    switch $t31
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t32 := 103
+                    $t32 := 103
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 11 {
+                    // label L8
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<u64>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L10 else goto L9
+                    switch $t38
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t39 := 104
+                    $t39 := 104
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_pop_back_global: Succeed(Stopped) (used_gas=121755): []
+
+// test of GlobalVectors::test_pop_back_struct_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_pop_back_struct_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_pop_back_struct_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_pop_back_struct_global() {
+            let tmp_$1, tmp_$2, e, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // $t29 := borrow_local($t3)
+                    $t29 := $MakePtr(false, e)
+                    // $t30 := borrow_field<GlobalVectors::S>.y($t29)
+                    $t30 := $IndexPtr($t29, 16)
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU64($t30)
+                    // $t32 := 42
+                    $t32 := 42
+                    // $t1 := ==($t31, $t32)
+                    tmp_$1 := $Eq($t31, $t32)
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t33 := false
+                    $t33 := false
+                    // $t1 := $t33
+                    tmp_$1 := $t33
+                    // goto L2
+                    $block := 5
+                }
+                case 4 {
+                    // $t4 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t5 := borrow_local($t4)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 10
+                    $t6 := 10
+                    // $t7 := 40
+                    $t7 := 40
+                    // $t8 := pack GlobalVectors::S($t6, $t7)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t6)
+                        $MemoryStoreU64(add($mem, 16), $t7)
+                        $t8 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t5, $t8)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t5, $t8)
+                    // $t9 := borrow_local($t4)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 11
+                    $t10 := 11
+                    // $t11 := 41
+                    $t11 := 41
+                    // $t12 := pack GlobalVectors::S($t10, $t11)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t10)
+                        $MemoryStoreU64(add($mem, 16), $t11)
+                        $t12 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t9, $t12)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t9, $t12)
+                    // $t13 := borrow_local($t4)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 12
+                    $t14 := 12
+                    // $t15 := 42
+                    $t15 := 42
+                    // $t16 := pack GlobalVectors::S($t14, $t15)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t14)
+                        $MemoryStoreU64(add($mem, 16), $t15)
+                        $t16 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t13, $t16)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t13, $t16)
+                    // $t17 := 0x42
+                    $t17 := 0x42
+                    // $t0 := Evm::sign($t17)
+                    mstore(add($locals, 32), A2_Evm_sign($t17))
+                    // $t18 := borrow_local($t0)
+                    $t18 := $MakePtr(false, add($locals, 32))
+                    // $t19 := move($t4)
+                    $t19 := mload($locals)
+                    // $t20 := pack GlobalVectors::T<GlobalVectors::S>($t19)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t19)
+                        $t20 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t20, $t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t18))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t20
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t21 := 0x42
+                    $t21 := 0x42
+                    // $t22 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t21)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t22)
+                    $t23 := $t22
+                    // $t3 := vector::pop_back<GlobalVectors::S>($t23)
+                    e := A1_vector_pop_back$A2_GlobalVectors_S$($t23)
+                    // $t24 := borrow_local($t3)
+                    $t24 := $MakePtr(false, e)
+                    // $t25 := borrow_field<GlobalVectors::S>.x($t24)
+                    $t25 := $t24
+                    // $t26 := read_ref($t25)
+                    $t26 := $LoadU128($t25)
+                    // $t27 := 12
+                    $t27 := 12
+                    // $t28 := ==($t26, $t27)
+                    $t28 := $Eq($t26, $t27)
+                    // if ($t28) goto L1 else goto L0
+                    switch $t28
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // if ($t1) goto L4 else goto L3
+                    switch tmp_$1
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t34 := 101
+                    $t34 := 101
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 8 {
+                    // label L5
+                    // $t35 := 0x42
+                    $t35 := 0x42
+                    // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t35)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t36 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t37 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t36)
+                    $t37 := $t36
+                    // $t38 := vector::length<GlobalVectors::S>($t37)
+                    $t38 := A1_vector_length$A2_GlobalVectors_S$($t37)
+                    // $t39 := 2
+                    $t39 := 2
+                    // $t40 := ==($t38, $t39)
+                    $t40 := $Eq($t38, $t39)
+                    // if ($t40) goto L7 else goto L6
+                    switch $t40
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t41 := 102
+                    $t41 := 102
+                    // abort($t41)
+                    $Abort($t41)
+                }
+                case 11 {
+                    // label L8
+                    // $t42 := 0x42
+                    $t42 := 0x42
+                    // $t43 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t42)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t42)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t43 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t44 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t43)
+                    $t44 := $t43
+                    // $t3 := vector::pop_back<GlobalVectors::S>($t44)
+                    e := A1_vector_pop_back$A2_GlobalVectors_S$($t44)
+                    // $t45 := borrow_local($t3)
+                    $t45 := $MakePtr(false, e)
+                    // $t46 := borrow_field<GlobalVectors::S>.x($t45)
+                    $t46 := $t45
+                    // $t47 := read_ref($t46)
+                    $t47 := $LoadU128($t46)
+                    // $t48 := 11
+                    $t48 := 11
+                    // $t49 := ==($t47, $t48)
+                    $t49 := $Eq($t47, $t48)
+                    // if ($t49) goto L10 else goto L9
+                    switch $t49
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // $t50 := borrow_local($t3)
+                    $t50 := $MakePtr(false, e)
+                    // $t51 := borrow_field<GlobalVectors::S>.y($t50)
+                    $t51 := $IndexPtr($t50, 16)
+                    // $t52 := read_ref($t51)
+                    $t52 := $LoadU64($t51)
+                    // $t53 := 41
+                    $t53 := 41
+                    // $t2 := ==($t52, $t53)
+                    tmp_$2 := $Eq($t52, $t53)
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t54 := false
+                    $t54 := false
+                    // $t2 := $t54
+                    tmp_$2 := $t54
+                    // goto L11
+                    $block := 14
+                }
+                case 14 {
+                    // label L11
+                    // if ($t2) goto L13 else goto L12
+                    switch tmp_$2
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t55 := 103
+                    $t55 := 103
+                    // abort($t55)
+                    $Abort($t55)
+                }
+                case 17 {
+                    // label L14
+                    // $t56 := 0x42
+                    $t56 := 0x42
+                    // $t57 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t56)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t56)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t57 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t58 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t57)
+                    $t58 := $t57
+                    // $t59 := vector::length<GlobalVectors::S>($t58)
+                    $t59 := A1_vector_length$A2_GlobalVectors_S$($t58)
+                    // $t60 := 1
+                    $t60 := 1
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L16 else goto L15
+                    switch $t61
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t62 := 104
+                    $t62 := 104
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$A2_GlobalVectors_S$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                e := $Malloc(24)
+                mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                $AlignedStorageStore(add(linked_src, 0), 0)
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_pop_back_struct_global: Succeed(Stopped) (used_gas=190461): []
+
+// test of GlobalVectors::test_push_back_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_push_back_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_push_back_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_push_back_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t26 := 101
+                    $t26 := 101
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := copy($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := 13
+                    $t15 := 13
+                    // vector::push_back<u64>($t14, $t15)
+                    A1_vector_push_back$u64$($t14, $t15)
+                    // $t16 := 0x42
+                    $t16 := 0x42
+                    // $t17 := borrow_global<GlobalVectors::T<u64>>($t16)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t16)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t17 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t18 := borrow_field<GlobalVectors::T<u64>>.v($t17)
+                    $t18 := $t17
+                    // $t19 := 14
+                    $t19 := 14
+                    // vector::push_back<u64>($t18, $t19)
+                    A1_vector_push_back$u64$($t18, $t19)
+                    // $t20 := 0x42
+                    $t20 := 0x42
+                    // $t21 := borrow_global<GlobalVectors::T<u64>>($t20)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t20)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t21 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t22 := borrow_field<GlobalVectors::T<u64>>.v($t21)
+                    $t22 := $t21
+                    // $t23 := vector::length<u64>($t22)
+                    $t23 := A1_vector_length$u64$($t22)
+                    // $t24 := 5
+                    $t24 := 5
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L1 else goto L0
+                    switch $t25
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t27 := 0x42
+                    $t27 := 0x42
+                    // $t28 := borrow_global<GlobalVectors::T<u64>>($t27)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t27)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t28 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t29 := borrow_field<GlobalVectors::T<u64>>.v($t28)
+                    $t29 := $t28
+                    // $t30 := 0
+                    $t30 := 0
+                    // $t31 := vector::borrow<u64>($t29, $t30)
+                    $t31 := A1_vector_borrow$u64$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU64($t31)
+                    // $t33 := 10
+                    $t33 := 10
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L4 else goto L3
+                    switch $t34
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t35 := 102
+                    $t35 := 102
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 8 {
+                    // label L5
+                    // $t36 := 0x42
+                    $t36 := 0x42
+                    // $t37 := borrow_global<GlobalVectors::T<u64>>($t36)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t36)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t37 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t38 := borrow_field<GlobalVectors::T<u64>>.v($t37)
+                    $t38 := $t37
+                    // $t39 := 1
+                    $t39 := 1
+                    // $t40 := vector::borrow<u64>($t38, $t39)
+                    $t40 := A1_vector_borrow$u64$($t38, $t39)
+                    // $t41 := read_ref($t40)
+                    $t41 := $LoadU64($t40)
+                    // $t42 := 11
+                    $t42 := 11
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L7 else goto L6
+                    switch $t43
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t44 := 103
+                    $t44 := 103
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 11 {
+                    // label L8
+                    // $t45 := 0x42
+                    $t45 := 0x42
+                    // $t46 := borrow_global<GlobalVectors::T<u64>>($t45)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t45)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t46 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t47 := borrow_field<GlobalVectors::T<u64>>.v($t46)
+                    $t47 := $t46
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<u64>($t47, $t48)
+                    $t49 := A1_vector_borrow$u64$($t47, $t48)
+                    // $t50 := read_ref($t49)
+                    $t50 := $LoadU64($t49)
+                    // $t51 := 12
+                    $t51 := 12
+                    // $t52 := ==($t50, $t51)
+                    $t52 := $Eq($t50, $t51)
+                    // if ($t52) goto L10 else goto L9
+                    switch $t52
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t53 := 104
+                    $t53 := 104
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 14 {
+                    // label L11
+                    // $t54 := 0x42
+                    $t54 := 0x42
+                    // $t55 := borrow_global<GlobalVectors::T<u64>>($t54)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t54)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t55 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t56 := borrow_field<GlobalVectors::T<u64>>.v($t55)
+                    $t56 := $t55
+                    // $t57 := 3
+                    $t57 := 3
+                    // $t58 := vector::borrow<u64>($t56, $t57)
+                    $t58 := A1_vector_borrow$u64$($t56, $t57)
+                    // $t59 := read_ref($t58)
+                    $t59 := $LoadU64($t58)
+                    // $t60 := 13
+                    $t60 := 13
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L13 else goto L12
+                    switch $t61
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t62 := 105
+                    $t62 := 105
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 17 {
+                    // label L14
+                    // $t63 := 0x42
+                    $t63 := 0x42
+                    // $t64 := borrow_global<GlobalVectors::T<u64>>($t63)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t63)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t64 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t65 := borrow_field<GlobalVectors::T<u64>>.v($t64)
+                    $t65 := $t64
+                    // $t66 := 4
+                    $t66 := 4
+                    // $t67 := vector::borrow<u64>($t65, $t66)
+                    $t67 := A1_vector_borrow$u64$($t65, $t66)
+                    // $t68 := read_ref($t67)
+                    $t68 := $LoadU64($t67)
+                    // $t69 := 14
+                    $t69 := 14
+                    // $t70 := ==($t68, $t69)
+                    $t70 := $Eq($t68, $t69)
+                    // if ($t70) goto L16 else goto L15
+                    switch $t70
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t71 := 106
+                    $t71 := 106
+                    // abort($t71)
+                    $Abort($t71)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_push_back_global: Succeed(Stopped) (used_gas=152738): []
+
+// test of GlobalVectors::test_push_back_struct_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_push_back_struct_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_push_back_struct_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_push_back_struct_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t36 := 101
+                    $t36 := 101
+                    // abort($t36)
+                    $Abort($t36)
+                }
+                case 4 {
+                    // $t1 := vector::empty<GlobalVectors::S>()
+                    mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // $t4 := 40
+                    $t4 := 40
+                    // $t5 := pack GlobalVectors::S($t3, $t4)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t3)
+                        $MemoryStoreU64(add($mem, 16), $t4)
+                        $t5 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t2, $t5)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t2, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // $t8 := 41
+                    $t8 := 41
+                    // $t9 := pack GlobalVectors::S($t7, $t8)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t7)
+                        $MemoryStoreU64(add($mem, 16), $t8)
+                        $t9 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t6, $t9)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t6, $t9)
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 12
+                    $t11 := 12
+                    // $t12 := 42
+                    $t12 := 42
+                    // $t13 := pack GlobalVectors::S($t11, $t12)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t11)
+                        $MemoryStoreU64(add($mem, 16), $t12)
+                        $t13 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t10, $t13)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t10, $t13)
+                    // $t14 := 0x42
+                    $t14 := 0x42
+                    // $t0 := Evm::sign($t14)
+                    mstore(add($locals, 32), A2_Evm_sign($t14))
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := move($t1)
+                    $t16 := mload($locals)
+                    // $t17 := pack GlobalVectors::T<GlobalVectors::S>($t16)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t16)
+                        $t17 := $mem
+                    }
+                    // move_to<GlobalVectors::T<GlobalVectors::S>>($t17, $t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $LoadU256($t15))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t17
+                            {
+                                let $linked_src_634259357 := mload(add($src, 0))
+                                let $linked_dst_634259357 := $NewLinkedStorageBase(0x25ce079d)
+                                let $size_634259357 := $MemoryLoadU64($linked_src_634259357)
+                                let $data_size_634259357 := mul($size_634259357, 32)
+                                $AlignedStorageStore($linked_dst_634259357, mload($linked_src_634259357))
+                                let $data_src_634259357 := add($linked_src_634259357, 32)
+                                let $data_dst_634259357 := add($linked_dst_634259357, 32)
+                                for { let $offs_634259357 := 0 } lt($offs_634259357, $data_size_634259357) { $offs_634259357 := add($offs_634259357, 32)} {
+                                    {
+                                        let $linked_src_3681206257 := mload(add($offs_634259357, $data_src_634259357))
+                                        let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                                        $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add($linked_src_3681206257, 0)))
+                                        $Free($linked_src_3681206257, 24)
+                                        $AlignedStorageStore(add($data_dst_634259357, $offs_634259357), $linked_dst_3681206257)
+                                    }
+                                    $Free($linked_src_634259357, add($data_size_634259357, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_634259357)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t19 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t18)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t18)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t19 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t20 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t19)
+                    $t20 := $t19
+                    // $t21 := 13
+                    $t21 := 13
+                    // $t22 := 43
+                    $t22 := 43
+                    // $t23 := pack GlobalVectors::S($t21, $t22)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t21)
+                        $MemoryStoreU64(add($mem, 16), $t22)
+                        $t23 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t20, $t23)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t20, $t23)
+                    // $t24 := 0x42
+                    $t24 := 0x42
+                    // $t25 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t24)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t24)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t25 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t26 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t25)
+                    $t26 := $t25
+                    // $t27 := 14
+                    $t27 := 14
+                    // $t28 := 44
+                    $t28 := 44
+                    // $t29 := pack GlobalVectors::S($t27, $t28)
+                    {
+                        let $mem := $Malloc(24)
+                        $MemoryStoreU128(add($mem, 0), $t27)
+                        $MemoryStoreU64(add($mem, 16), $t28)
+                        $t29 := $mem
+                    }
+                    // vector::push_back<GlobalVectors::S>($t26, $t29)
+                    A1_vector_push_back$A2_GlobalVectors_S$($t26, $t29)
+                    // $t30 := 0x42
+                    $t30 := 0x42
+                    // $t31 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t30)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t30)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t31 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t32 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t31)
+                    $t32 := $t31
+                    // $t33 := vector::length<GlobalVectors::S>($t32)
+                    $t33 := A1_vector_length$A2_GlobalVectors_S$($t32)
+                    // $t34 := 5
+                    $t34 := 5
+                    // $t35 := ==($t33, $t34)
+                    $t35 := $Eq($t33, $t34)
+                    // if ($t35) goto L1 else goto L0
+                    switch $t35
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t37 := 0x42
+                    $t37 := 0x42
+                    // $t38 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t38)
+                    $t39 := $t38
+                    // $t40 := 0
+                    $t40 := 0
+                    // $t41 := vector::borrow<GlobalVectors::S>($t39, $t40)
+                    $t41 := A1_vector_borrow$A2_GlobalVectors_S$($t39, $t40)
+                    // $t42 := borrow_field<GlobalVectors::S>.x($t41)
+                    $t42 := $t41
+                    // $t43 := read_ref($t42)
+                    $t43 := $LoadU128($t42)
+                    // $t44 := 10
+                    $t44 := 10
+                    // $t45 := ==($t43, $t44)
+                    $t45 := $Eq($t43, $t44)
+                    // if ($t45) goto L4 else goto L3
+                    switch $t45
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t46 := 102
+                    $t46 := 102
+                    // abort($t46)
+                    $Abort($t46)
+                }
+                case 8 {
+                    // label L5
+                    // $t47 := 0x42
+                    $t47 := 0x42
+                    // $t48 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t47)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t47)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t48 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t49 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t48)
+                    $t49 := $t48
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<GlobalVectors::S>($t49, $t50)
+                    $t51 := A1_vector_borrow$A2_GlobalVectors_S$($t49, $t50)
+                    // $t52 := borrow_field<GlobalVectors::S>.x($t51)
+                    $t52 := $t51
+                    // $t53 := read_ref($t52)
+                    $t53 := $LoadU128($t52)
+                    // $t54 := 11
+                    $t54 := 11
+                    // $t55 := ==($t53, $t54)
+                    $t55 := $Eq($t53, $t54)
+                    // if ($t55) goto L7 else goto L6
+                    switch $t55
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t56 := 103
+                    $t56 := 103
+                    // abort($t56)
+                    $Abort($t56)
+                }
+                case 11 {
+                    // label L8
+                    // $t57 := 0x42
+                    $t57 := 0x42
+                    // $t58 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t57)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t57)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t58 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t59 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t58)
+                    $t59 := $t58
+                    // $t60 := 2
+                    $t60 := 2
+                    // $t61 := vector::borrow<GlobalVectors::S>($t59, $t60)
+                    $t61 := A1_vector_borrow$A2_GlobalVectors_S$($t59, $t60)
+                    // $t62 := borrow_field<GlobalVectors::S>.x($t61)
+                    $t62 := $t61
+                    // $t63 := read_ref($t62)
+                    $t63 := $LoadU128($t62)
+                    // $t64 := 12
+                    $t64 := 12
+                    // $t65 := ==($t63, $t64)
+                    $t65 := $Eq($t63, $t64)
+                    // if ($t65) goto L10 else goto L9
+                    switch $t65
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t66 := 104
+                    $t66 := 104
+                    // abort($t66)
+                    $Abort($t66)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_GlobalVectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_GlobalVectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$A2_GlobalVectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_3681206257 := $NewLinkedStorageBase(0xdb6abff1)
+                $AlignedStorageStore(add($linked_dst_3681206257, 0), mload(add(e, 0)))
+                $Free(e, 24)
+                $AlignedStorageStore(e_offs, $linked_dst_3681206257)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_empty$A2_GlobalVectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_push_back_struct_global: Succeed(Stopped) (used_gas=329341): []
+
+// test of GlobalVectors::test_read_ref_copy
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_read_ref_copy" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_read_ref_copy()
+        return (0, 0)
+        function A2_GlobalVectors_test_read_ref_copy() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t16 := 101
+                    $t16 := 101
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t1)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 65
+                    $t4 := 65
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := 0x42
+                    $t5 := 0x42
+                    // $t0 := Evm::sign($t5)
+                    mstore(add($locals, 32), A2_Evm_sign($t5))
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, add($locals, 32))
+                    // $t7 := move($t1)
+                    $t7 := mload($locals)
+                    // $t8 := pack GlobalVectors::T<u8>($t7)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t7)
+                        $t8 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u8>>($t8, $t6)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x10b7746c, $LoadU256($t6))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t8
+                            {
+                                let $linked_src_2300595445 := mload(add($src, 0))
+                                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                                let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                                let $data_size_2300595445 := mul($size_2300595445, 1)
+                                $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                                let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                    $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t10 := borrow_global<GlobalVectors::T<u8>>($t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x10b7746c, $t9)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t10 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t11 := borrow_field<GlobalVectors::T<u8>>.v($t10)
+                    $t11 := $t10
+                    // $t2 := read_ref($t11)
+                    mstore(add($locals, 64), $LoadU256($t11))
+                    if $IsStoragePtr($t11){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 64)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 64))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 64)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 64), $storage_ptr_2300595445)
+                    }
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 64))
+                    // $t13 := vector::length<u8>($t12)
+                    $t13 := A1_vector_length$u8$($t12)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t15 := ==($t13, $t14)
+                    $t15 := $Eq($t13, $t14)
+                    // if ($t15) goto L1 else goto L0
+                    switch $t15
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, add($locals, 64))
+                    // $t18 := 0
+                    $t18 := 0
+                    // $t19 := vector::borrow<u8>($t17, $t18)
+                    $t19 := A1_vector_borrow$u8$($t17, $t18)
+                    // $t20 := read_ref($t19)
+                    $t20 := $LoadU8($t19)
+                    // $t21 := 65
+                    $t21 := 65
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L4 else goto L3
+                    switch $t22
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t23 := 102
+                    $t23 := 102
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_read_ref_copy: Succeed(Stopped) (used_gas=114827): []
+
+// test of GlobalVectors::test_swap_global
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_GlobalVectors_test_swap_global" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_GlobalVectors_test_swap_global()
+        return (0, 0)
+        function A2_GlobalVectors_test_swap_global() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t23 := 101
+                    $t23 := 101
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 42
+                    $t3 := 42
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 43
+                    $t5 := 43
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 44
+                    $t7 := 44
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
+                    }
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t11
+                            {
+                                let $linked_src_814019441 := mload(add($src, 0))
+                                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                                let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                                let $data_size_814019441 := mul($size_814019441, 8)
+                                $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                                let $data_src_814019441 := add($linked_src_814019441, 32)
+                                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                                    $Free($linked_src_814019441, add($data_size_814019441, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_814019441)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t13 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := 0
+                    $t15 := 0
+                    // $t16 := 2
+                    $t16 := 2
+                    // vector::swap<u64>($t14, $t15, $t16)
+                    A1_vector_swap$u64$($t14, $t15, $t16)
+                    // $t17 := 0x42
+                    $t17 := 0x42
+                    // $t18 := borrow_global<GlobalVectors::T<u64>>($t17)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t17)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t18 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t19 := borrow_field<GlobalVectors::T<u64>>.v($t18)
+                    $t19 := $t18
+                    // $t20 := vector::length<u64>($t19)
+                    $t20 := A1_vector_length$u64$($t19)
+                    // $t21 := 3
+                    $t21 := 3
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L1 else goto L0
+                    switch $t22
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t24 := 0x42
+                    $t24 := 0x42
+                    // $t25 := borrow_global<GlobalVectors::T<u64>>($t24)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t24)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t25 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t26 := borrow_field<GlobalVectors::T<u64>>.v($t25)
+                    $t26 := $t25
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 44
+                    $t30 := 44
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<u64>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := 1
+                    $t36 := 1
+                    // $t37 := vector::borrow<u64>($t35, $t36)
+                    $t37 := A1_vector_borrow$u64$($t35, $t36)
+                    // $t38 := read_ref($t37)
+                    $t38 := $LoadU64($t37)
+                    // $t39 := 43
+                    $t39 := 43
+                    // $t40 := ==($t38, $t39)
+                    $t40 := $Eq($t38, $t39)
+                    // if ($t40) goto L7 else goto L6
+                    switch $t40
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t41 := 103
+                    $t41 := 103
+                    // abort($t41)
+                    $Abort($t41)
+                }
+                case 11 {
+                    // label L8
+                    // $t42 := 0x42
+                    $t42 := 0x42
+                    // $t43 := borrow_global<GlobalVectors::T<u64>>($t42)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t42)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t43 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t44 := borrow_field<GlobalVectors::T<u64>>.v($t43)
+                    $t44 := $t43
+                    // $t45 := 2
+                    $t45 := 2
+                    // $t46 := vector::borrow<u64>($t44, $t45)
+                    $t46 := A1_vector_borrow$u64$($t44, $t45)
+                    // $t47 := read_ref($t46)
+                    $t47 := $LoadU64($t46)
+                    // $t48 := 42
+                    $t48 := 42
+                    // $t49 := ==($t47, $t48)
+                    $t49 := $Eq($t47, $t48)
+                    // if ($t49) goto L10 else goto L9
+                    switch $t49
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t50 := 104
+                    $t50 := 104
+                    // abort($t50)
+                    $Abort($t50)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of GlobalVectors::test_swap_global: Succeed(Stopped) (used_gas=124086): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.move b/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.move
new file mode 100644
index 000000000..83eb04016
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/GlobalVectors.move
@@ -0,0 +1,204 @@
+#[evm_contract]
+module 0x2::GlobalVectors {
+    use std::vector;
+    use Evm::Evm::sign;
+
+    struct S has copy, drop, store { x: u128, y: u64 }
+    struct R has copy, drop { s: S, v: vector<u64> }
+    struct T<Elem: drop> has drop, key { v: vector<Elem> }
+
+    #[evm_test]
+    fun test_move_to() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+        move_to(&sign(@0x42), T { v });
+        assert!(vector::length(&borrow_global<T<u64>>(@0x42).v) == 3, 101);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 0) == 10, 102);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 1) == 11, 103);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 2) == 12, 104);
+    }
+
+    #[evm_test]
+    fun test_move_to_vector_of_struct() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, S { x: 10, y: 40});
+        vector::push_back(&mut v, S { x: 11, y: 41});
+        vector::push_back(&mut v, S { x: 12, y: 42});
+        move_to(&sign(@0x42), T { v });
+        assert!(vector::length(&borrow_global<T<S>>(@0x42).v) == 3, 101);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 0).x == 10, 102);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 1).x == 11, 103);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 2).x == 12, 104);
+    }
+
+    #[evm_test]
+    fun test_move_to_vector_of_vector() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, vector::singleton(10));
+        vector::push_back(&mut v, vector::singleton(11));
+        vector::push_back(&mut v, vector::singleton(12));
+        move_to(&sign(@0x42), T { v });
+        assert!(vector::length(&borrow_global<T<vector<u64>>>(@0x42).v) == 3, 101);
+        assert!(*vector::borrow(vector::borrow(&borrow_global<T<vector<u64>>>(@0x42).v, 0), 0) == 10, 102);
+        assert!(*vector::borrow(vector::borrow(&borrow_global<T<vector<u64>>>(@0x42).v, 1), 0) == 11, 102);
+        assert!(*vector::borrow(vector::borrow(&borrow_global<T<vector<u64>>>(@0x42).v, 2), 0) == 12, 102);
+    }
+
+    #[evm_test]
+    fun test_push_back_global() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+
+        move_to(&sign(@0x42), T { v: copy v });
+
+        vector::push_back(&mut borrow_global_mut<T<u64>>(@0x42).v, 13);
+        vector::push_back(&mut borrow_global_mut<T<u64>>(@0x42).v, 14);
+        assert!(vector::length(&borrow_global<T<u64>>(@0x42).v) == 5, 101);
+
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 0) == 10, 102);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 1) == 11, 103);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 2) == 12, 104);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 3) == 13, 105);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 4) == 14, 106);
+    }
+
+    #[evm_test]
+    fun test_push_back_struct_global() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, S { x: 10, y: 40});
+        vector::push_back(&mut v, S { x: 11, y: 41});
+        vector::push_back(&mut v, S { x: 12, y: 42});
+        move_to(&sign(@0x42), T { v });
+        vector::push_back(&mut borrow_global_mut<T<S>>(@0x42).v, S { x: 13, y: 43});
+        vector::push_back(&mut borrow_global_mut<T<S>>(@0x42).v, S { x: 14, y: 44});
+        assert!(vector::length(&borrow_global<T<S>>(@0x42).v) == 5, 101);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 0).x == 10, 102);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 1).x == 11, 103);
+        assert!(*&vector::borrow(&borrow_global<T<S>>(@0x42).v, 2).x == 12, 104);
+    }
+
+    #[evm_test]
+    fun test_move_from() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+
+        move_to(&sign(@0x42), T { v });
+        let local_t = move_from<T<u64>>(@0x42);
+        let T { v } = local_t;
+        assert!(vector::length(&v) == 3, 101);
+        assert!(*vector::borrow(&v, 0) == 10, 102);
+        assert!(*vector::borrow(&v, 1) == 11, 103);
+        assert!(*vector::borrow(&v, 2) == 12, 104);
+        vector::push_back(&mut v, 13);
+        vector::push_back(&mut v, 14);
+        assert!(*vector::borrow(&v, 3) == 13, 105);
+        assert!(*vector::borrow(&v, 4) == 14, 106);
+    }
+
+    #[evm_test]
+    fun test_move_from_vector_of_struct() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, S { x: 10, y: 40});
+        vector::push_back(&mut v, S { x: 11, y: 41});
+        vector::push_back(&mut v, S { x: 12, y: 42});
+        move_to(&sign(@0x42), T { v });
+        let local_t = move_from<T<S>>(@0x42);
+        assert!(vector::length(&local_t.v) == 3, 101);
+        assert!(*&vector::borrow(&local_t.v, 0).x == 10, 102);
+        assert!(*&vector::borrow(&local_t.v, 1).x == 11, 103);
+        assert!(*&vector::borrow(&local_t.v, 2).x == 12, 104);
+    }
+
+    #[evm_test]
+    fun test_move_from_vector_of_vector() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, vector::singleton(10));
+        vector::push_back(&mut v, vector::singleton(11));
+        vector::push_back(&mut v, vector::singleton(12));
+        move_to(&sign(@0x42), T { v });
+        let local_t = move_from<T<vector<u64>>>(@0x42);
+        assert!(vector::length(&local_t.v) == 3, 101);
+        assert!(*vector::borrow(vector::borrow(&local_t.v, 0), 0) == 10, 102);
+        assert!(*vector::borrow(vector::borrow(&local_t.v, 1), 0) == 11, 102);
+        assert!(*vector::borrow(vector::borrow(&local_t.v, 2), 0) == 12, 102);
+    }
+
+
+    #[evm_test]
+    fun test_pop_back_global() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+
+        move_to(&sign(@0x42), T { v });
+        let e = vector::pop_back(&mut borrow_global_mut<T<u64>>(@0x42).v);
+        assert!(e == 12, 101);
+        assert!(vector::length(&borrow_global<T<u64>>(@0x42).v) == 2, 102);
+        e = vector::pop_back(&mut borrow_global_mut<T<u64>>(@0x42).v);
+        assert!(e == 11, 103);
+        assert!(vector::length(&borrow_global<T<u64>>(@0x42).v) == 1, 104);
+    }
+
+    #[evm_test]
+    fun test_pop_back_struct_global() acquires  T {
+        let v = vector::empty();
+        vector::push_back(&mut v, S { x: 10, y: 40});
+        vector::push_back(&mut v, S { x: 11, y: 41});
+        vector::push_back(&mut v, S { x: 12, y: 42});
+        move_to(&sign(@0x42), T { v });
+        let e = vector::pop_back(&mut borrow_global_mut<T<S>>(@0x42).v);
+        assert!(e.x == 12 && e.y == 42, 101);
+        assert!(vector::length(&borrow_global<T<S>>(@0x42).v) == 2, 102);
+        e = vector::pop_back(&mut borrow_global_mut<T<S>>(@0x42).v);
+        assert!(e.x == 11 && e.y == 41, 103);
+        assert!(vector::length(&borrow_global<T<S>>(@0x42).v) == 1, 104);
+    }
+
+    #[evm_test]
+    fun test_swap_global() acquires T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 42);
+        vector::push_back(&mut v, 43);
+        vector::push_back(&mut v, 44);
+
+        move_to(&sign(@0x42), T { v });
+        vector::swap(&mut borrow_global_mut<T<u64>>(@0x42).v, 0, 2);
+
+        assert!(vector::length(&borrow_global<T<u64>>(@0x42).v) == 3, 101);
+
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 0) == 44, 102);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 1) == 43, 103);
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 2) == 42, 104);
+    }
+
+    #[evm_test]
+    fun test_borrow_mut_global() acquires T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 42);
+        vector::push_back(&mut v, 43);
+        vector::push_back(&mut v, 44);
+
+        move_to(&sign(@0x42), T { v });
+
+        let e = vector::borrow_mut(&mut borrow_global_mut<T<u64>>(@0x42).v, 0);
+        *e = 12;
+        assert!(*vector::borrow(&borrow_global<T<u64>>(@0x42).v, 0) == 12, 102);
+    }
+
+    #[evm_test]
+    fun test_read_ref_copy() acquires T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 65u8);
+        move_to(&sign(@0x42), T { v });
+        let v1 = *&borrow_global<T<u8>>(@0x42).v;
+        assert!(vector::length(&v1) == 1, 101);
+        assert!(*vector::borrow(&v1, 0) == 65u8, 102);
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Locals.exp b/vendors/move/crates/evm/move-to-yul/tests/Locals.exp
new file mode 100644
index 000000000..62b4cb4f5
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Locals.exp
@@ -0,0 +1,893 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xc11ae395
+                {
+                    // evaded(uint64,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint64_uint64$_$u64_u64$(4, calldatasize())
+                    let ret_0, ret_1, ret_2, ret_3 := A2_M_evaded(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint64_uint64_uint64$_$u64_u64_u64_u64$(memPos, ret_0, ret_1, ret_2, ret_3)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
+                let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
+                let $locals := $Malloc(64)
+                mstore($locals, a)
+                // $t5 := copy($t0)
+                $t5 := mload($locals)
+                // $t3 := $t5
+                mstore(add($locals, 32), $t5)
+                // $t6 := copy($t3)
+                $t6 := mload(add($locals, 32))
+                // $t7 := +($t6, $t1)
+                $t7 := $AddU64($t6, b)
+                // $t8 := borrow_local($t0)
+                $t8 := $MakePtr(false, add($locals, 24))
+                // $t9 := borrow_local($t3)
+                $t9 := $MakePtr(false, add($locals, 56))
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := +($t10, $t11)
+                $t12 := $AddU64($t10, $t11)
+                // write_ref($t8, $t12)
+                $StoreU64($t8, $t12)
+                // $t13 := move($t0)
+                $t13 := mload($locals)
+                // $t14 := move($t3)
+                $t14 := mload(add($locals, 32))
+                // return ($t13, $t1, $t14, $t7)
+                $result0 := $t13
+                $result1 := b
+                $result2 := $t14
+                $result3 := $t7
+                $Free($locals, 64)
+            }
+
+            function abi_encode_tuple_$uint64_uint64_uint64_uint64$_$u64_u64_u64_u64$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+                abi_encode_uint64(value_3, add(headStart, 96))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_uint64$_$u64_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_call_by_ref
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_call_by_ref" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_call_by_ref()
+        return (0, 0)
+        function A2_M_test_call_by_ref() {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 101
+                    $t6 := 101
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 1
+                    $t1 := 1
+                    // $t0 := $t1
+                    mstore($locals, $t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, add($locals, 24))
+                    // M::call_by_ref($t2)
+                    A2_M_call_by_ref($t2)
+                    // $t3 := move($t0)
+                    $t3 := mload($locals)
+                    // $t4 := 2
+                    $t4 := 2
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_call_by_ref(a) {
+            let $t1
+            // $t1 := 2
+            $t1 := 2
+            // write_ref($t0, $t1)
+            $StoreU64(a, $t1)
+            // return ()
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+    }
+}
+===> Test result of M::test_call_by_ref: Succeed(Stopped) (used_gas=488): []
+
+// test of M::test_evaded
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_evaded" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_evaded()
+        return (0, 0)
+        function A2_M_test_evaded() {
+            let b, c, d, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    $t11 := 100
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := 2
+                    $t4 := 2
+                    // ($t5, $t6, $t7, $t8) := M::evaded($t3, $t4)
+                    $t5, $t6, $t7, $t8 := A2_M_evaded($t3, $t4)
+                    // $t9 := 2
+                    $t9 := 2
+                    // $t10 := ==($t5, $t9)
+                    $t10 := $Eq($t5, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := 2
+                    $t12 := 2
+                    // $t13 := ==($t6, $t12)
+                    $t13 := $Eq($t6, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 1
+                    $t15 := 1
+                    // $t16 := ==($t7, $t15)
+                    $t16 := $Eq($t7, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := 3
+                    $t18 := 3
+                    // $t19 := ==($t8, $t18)
+                    $t19 := $Eq($t8, $t18)
+                    // if ($t19) goto L10 else goto L9
+                    switch $t19
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
+            let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
+            let $locals := $Malloc(64)
+            mstore($locals, a)
+            // $t5 := copy($t0)
+            $t5 := mload($locals)
+            // $t3 := $t5
+            mstore(add($locals, 32), $t5)
+            // $t6 := copy($t3)
+            $t6 := mload(add($locals, 32))
+            // $t7 := +($t6, $t1)
+            $t7 := $AddU64($t6, b)
+            // $t8 := borrow_local($t0)
+            $t8 := $MakePtr(false, add($locals, 24))
+            // $t9 := borrow_local($t3)
+            $t9 := $MakePtr(false, add($locals, 56))
+            // $t10 := read_ref($t9)
+            $t10 := $LoadU64($t9)
+            // $t11 := 1
+            $t11 := 1
+            // $t12 := +($t10, $t11)
+            $t12 := $AddU64($t10, $t11)
+            // write_ref($t8, $t12)
+            $StoreU64($t8, $t12)
+            // $t13 := move($t0)
+            $t13 := mload($locals)
+            // $t14 := move($t3)
+            $t14 := mload(add($locals, 32))
+            // return ($t13, $t1, $t14, $t7)
+            $result0 := $t13
+            $result1 := b
+            $result2 := $t14
+            $result3 := $t7
+            $Free($locals, 64)
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_evaded: Succeed(Stopped) (used_gas=2140): []
+
+// test of M::test_freeze_ref
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_freeze_ref" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_freeze_ref()
+        return (0, 0)
+        function A2_M_test_freeze_ref() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 1
+                    $t1 := 1
+                    // $t0 := $t1
+                    mstore($locals, $t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, add($locals, 24))
+                    // $t3 := freeze_ref($t2)
+                    $t3 := $t2
+                    // $t4 := M::call_by_immut_ref($t3)
+                    $t4 := A2_M_call_by_immut_ref($t3)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_call_by_immut_ref(a) -> $result {
+            let $t1
+            // $t1 := read_ref($t0)
+            $t1 := $LoadU64(a)
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_freeze_ref: Succeed(Stopped) (used_gas=438): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Locals.move b/vendors/move/crates/evm/move-to-yul/tests/Locals.move
new file mode 100644
index 000000000..177cf2f5e
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Locals.move
@@ -0,0 +1,44 @@
+#[evm_contract]
+module 0x2::M {
+    #[callable]
+    fun evaded(a: u64, b: u64): (u64, u64, u64, u64) {
+        let c = a;
+        let d = c + b;
+        let ar = &mut a;
+        let cr = &c;
+        *ar = *cr + 1;
+        (a, b, c, d)
+    }
+
+    #[evm_test]
+    fun test_evaded() {
+        let (a, b, c, d) = evaded(1, 2);
+        assert!(a == 2, 100);
+        assert!(b == 2, 101);
+        assert!(c == 1, 102);
+        assert!(d == 3, 103);
+    }
+
+    fun call_by_ref(a: &mut u64) {
+        *a = 2;
+    }
+
+    #[evm_test]
+    fun test_call_by_ref() {
+        let a = 1;
+        //assert!(a == 1, 100);
+        call_by_ref(&mut a);
+        assert!(a == 2, 101);
+    }
+
+    fun call_by_immut_ref(a: &u64) : u64 {
+        *a
+    }
+
+    #[evm_test]
+    fun test_freeze_ref() {
+        let a = 1;
+        a = call_by_immut_ref(&mut a);
+        assert!(a == 1, 101);
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.exp b/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.exp
new file mode 100644
index 000000000..e8d057eb6
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.exp
@@ -0,0 +1,119 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x70e8dbcb
+                {
+                    // f(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_f(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f(x) -> $result {
+                let y, $t2, $t3, $t4, $t5, $t6
+                // ($t2, $t3) := M::g($t0)
+                $t2, $t3 := A2_M_g(x)
+                // destroy($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := M::h($t5)
+                $t6 := A2_M_h($t5)
+                // return $t6
+                $result := $t6
+            }
+
+            function A2_M_h(x) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := M::k<u64>($t0)
+                $t1 := A2_M_k$u64$(x)
+                // $t2 := 1
+                $t2 := 1
+                // $t3 := +($t1, $t2)
+                $t3 := $AddU64($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A2_M_k$u64$(x) -> $result {
+                // return $t0
+                $result := x
+            }
+
+            function A2_M_g(x) -> $result0, $result1 {
+                // return ($t0, $t0)
+                $result0 := x
+                $result1 := x
+            }
+
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.move b/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.move
new file mode 100644
index 000000000..54046961e
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/MoveCalls.move
@@ -0,0 +1,17 @@
+// Tests Move functions calling other Move functions, including generic ones which are then specialized.
+#[evm_contract]
+module 0x2::M {
+  #[callable]
+  fun f(x: u64): u64 {
+    let (_, y) = g(x);
+    h(y - 1)
+  }
+
+  fun h(x: u64): u64 {
+    k(x) + 1
+  }
+
+  fun k<T>(x: T): T { x }
+
+  fun g(x: u64): (u64, u64) { (x, x) }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.exp b/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.exp
new file mode 100644
index 000000000..30c64eeee
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.exp
@@ -0,0 +1,1289 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_NativeFunctions" {
+    code {
+        codecopy(0, dataoffset("A2_NativeFunctions_deployed"), datasize("A2_NativeFunctions_deployed"))
+        return(0, datasize("A2_NativeFunctions_deployed"))
+    }
+    object "A2_NativeFunctions_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x90b6bab2
+                {
+                    // call_native_functions()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_NativeFunctions_call_native_functions()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_NativeFunctions_call_native_functions() {
+                let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                // $t0 := U256::one()
+                $t0 := A2_U256_one()
+                // $t1 := Evm::blockhash($t0)
+                $t1 := A2_Evm_blockhash($t0)
+                // destroy($t1)
+                // $t2 := Evm::block_basefee()
+                $t2 := A2_Evm_block_basefee()
+                // destroy($t2)
+                $Free($t2, 0)
+                // $t3 := Evm::block_chainid()
+                $t3 := A2_Evm_block_chainid()
+                // destroy($t3)
+                $Free($t3, 0)
+                // $t4 := Evm::block_coinbase()
+                $t4 := A2_Evm_block_coinbase()
+                // destroy($t4)
+                // $t5 := Evm::block_difficulty()
+                $t5 := A2_Evm_block_difficulty()
+                // destroy($t5)
+                $Free($t5, 0)
+                // $t6 := Evm::block_gaslimit()
+                $t6 := A2_Evm_block_gaslimit()
+                // destroy($t6)
+                $Free($t6, 0)
+                // $t7 := Evm::block_number()
+                $t7 := A2_Evm_block_number()
+                // destroy($t7)
+                $Free($t7, 0)
+                // $t8 := Evm::block_timestamp()
+                $t8 := A2_Evm_block_timestamp()
+                // destroy($t8)
+                $Free($t8, 0)
+                // $t9 := Evm::gasleft()
+                $t9 := A2_Evm_gasleft()
+                // destroy($t9)
+                $Free($t9, 0)
+                // $t10 := Evm::msg_data()
+                $t10 := A2_Evm_msg_data()
+                // destroy($t10)
+                // $t11 := Evm::msg_sender()
+                $t11 := A2_Evm_msg_sender()
+                // destroy($t11)
+                // $t12 := Evm::msg_sig()
+                $t12 := A2_Evm_msg_sig()
+                // destroy($t12)
+                // $t13 := Evm::msg_value()
+                $t13 := A2_Evm_msg_value()
+                // destroy($t13)
+                $Free($t13, 0)
+                // $t14 := Evm::tx_gasprice()
+                $t14 := A2_Evm_tx_gasprice()
+                // destroy($t14)
+                $Free($t14, 0)
+                // $t15 := Evm::tx_origin()
+                $t15 := A2_Evm_tx_origin()
+                // destroy($t15)
+                // return ()
+            }
+
+            function A2_Evm_tx_origin() -> result {
+              result := origin()
+            }
+            function A2_Evm_tx_gasprice() -> result {
+              result := gasprice()
+            }
+            function A2_Evm_msg_value() -> result {
+              result := callvalue()
+            }
+            function A2_Evm_msg_sig() -> result {
+              result := timestamp()
+            }
+            function A2_Evm_msg_sender() -> result {
+              result := caller()
+            }
+            function A2_Evm_msg_data() -> result {
+              result := calldataload(0)
+            }
+            function A2_Evm_gasleft() -> result {
+              result := gas()
+            }
+            function A2_Evm_block_timestamp() -> result {
+              result := timestamp()
+            }
+            function A2_Evm_block_number() -> result {
+              result := number()
+            }
+            function A2_Evm_block_gaslimit() -> result {
+              result := gaslimit()
+            }
+            function A2_Evm_block_difficulty() -> result {
+              result := difficulty()
+            }
+            function A2_Evm_block_coinbase() -> result {
+              result := coinbase()
+            }
+            function A2_Evm_block_chainid() -> result {
+              result := chainid()
+            }
+            function A2_Evm_block_basefee() -> result {
+              result := basefee()
+            }
+            function A2_Evm_blockhash(block_number) -> hash {
+              hash := blockhash(block_number)
+            }
+            function A2_U256_one() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Free(offs, size) {
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of NativeFunctions::test_abort
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_abort" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_abort()
+        return (0, 0)
+        function A2_NativeFunctions_test_abort() {
+            let $t0
+            // $t0 := [101, 114, 114, 111, 114, 32, 109, 101, 115, 115, 97, 103, 101]
+            $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t0, 13)
+            $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_1627894131(add($t0, 32))
+            // Evm::abort_with($t0)
+            A2_Evm_abort_with($t0)
+            // return ()
+        }
+
+        function A2_Evm_abort_with(message) {
+          let head := $Malloc(32)
+          // store the function selector for Error(string)
+          mstore(head, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
+          let pos := add(head, 4)
+          mstore(pos, 32)
+          pos := add(pos, 32)
+          let size := $MemoryLoadU64(message)
+          mstore(pos, size)
+          pos := add(pos, 32)
+          $CopyMemory(add(message, 32), pos, size)
+          size := $RoundUp(size)
+          let end := add(pos, size)
+          revert(head, sub(end, head))
+        }
+        function copy_literal_string_to_memory_1627894131(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 111)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 32)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 109)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of NativeFunctions::test_abort: Revert(Reverted) (used_gas=696): [8, 195, 121, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 101, 114, 114, 111, 114, 32, 109, 101, 115, 115, 97, 103, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+
+// test of NativeFunctions::test_concat
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_concat" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_concat()
+        return (0, 0)
+        function A2_NativeFunctions_test_concat() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 100
+                    $t5 := 100
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := []
+                    $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t0, 0)
+                    $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t0, 32))
+                    // $t1 := []
+                    $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t1, 0)
+                    $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t1, 32))
+                    // $t2 := Evm::concat($t0, $t1)
+                    $t2 := A2_Evm_concat($t0, $t1)
+                    // $t3 := []
+                    $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t3, 0)
+                    $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t3, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$u8$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := [49]
+                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t6, 1)
+                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t6, 32))
+                    // $t7 := [50]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_4015750317(add($t7, 32))
+                    // $t8 := Evm::concat($t6, $t7)
+                    $t8 := A2_Evm_concat($t6, $t7)
+                    // $t9 := [49, 50]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t9, 2)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_141265791(add($t9, 32))
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq_$vec$u8$$($t8, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // $t12 := []
+                    $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t12, 0)
+                    $MemoryStoreU64(add($t12, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t12, 32))
+                    // $t13 := [97, 98, 99]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t13, 3)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t13, 32))
+                    // $t14 := Evm::concat($t12, $t13)
+                    $t14 := A2_Evm_concat($t12, $t13)
+                    // $t15 := [97, 98, 99]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t15, 32))
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq_$vec$u8$$($t14, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := [97]
+                    $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t18, 1)
+                    $MemoryStoreU64(add($t18, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_371573306(add($t18, 32))
+                    // $t19 := [98, 99]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t19, 2)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_3119208230(add($t19, 32))
+                    // $t20 := Evm::concat($t18, $t19)
+                    $t20 := A2_Evm_concat($t18, $t19)
+                    // $t21 := [100, 101]
+                    $t21 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t21, 2)
+                    $MemoryStoreU64(add($t21, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_1933910203(add($t21, 32))
+                    // $t22 := Evm::concat($t20, $t21)
+                    $t22 := A2_Evm_concat($t20, $t21)
+                    // $t23 := [97, 98, 99, 100, 101]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t23, 5)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_3871831907(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // if ($t24) goto L10 else goto L9
+                    switch $t24
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 14 {
+                    // label L11
+                    // $t26 := [116, 101, 115, 116]
+                    $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t26, 4)
+                    $MemoryStoreU64(add($t26, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t26, 32))
+                    // $t27 := []
+                    $t27 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t27, 0)
+                    $MemoryStoreU64(add($t27, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t27, 32))
+                    // $t28 := Evm::concat($t26, $t27)
+                    $t28 := A2_Evm_concat($t26, $t27)
+                    // $t29 := [116, 101, 115, 116]
+                    $t29 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t29, 4)
+                    $MemoryStoreU64(add($t29, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t29, 32))
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq_$vec$u8$$($t28, $t29)
+                    // if ($t30) goto L13 else goto L12
+                    switch $t30
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t31 := 104
+                    $t31 := 104
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_concat(s1, s2) -> result {
+                          result := $ExtendVector(s1, s2, 1)
+                        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_1610556060(value) {
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_21418693(value) {
+        }
+        function copy_literal_string_to_memory_3871831907(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_1933910203(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_3119208230(value) {
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_371573306(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_141265791(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4015750317(value) {
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $ExtendVector(v1, v2, elem_size) -> new_v1 {
+          let v1_len := $MemoryLoadU64(v1)
+          let v2_len := $MemoryLoadU64(v2)
+          let new_len := add(v1_len, v2_len)
+          let v1_cap := $MemoryLoadU64(add(v1, 8))
+          new_v1 := v1
+          if iszero(gt(v1_cap, new_len)){
+            let new_cap := $ClosestGreaterPowerOfTwo(new_len)
+            new_v1 := $Malloc(add(mul(new_cap, elem_size), 32))
+            $CopyMemory(v1, new_v1, add(mul(v1_len, elem_size), 32))
+            $MemoryStoreU64(add(new_v1, 8), new_cap)
+            $Free(v1, add(mul(v1_len, elem_size), 32))
+          }
+          let src := add(v2, 32)
+          let dst := add(add(new_v1, 32), mul(elem_size, v1_len))
+          $CopyMemory(src, dst, mul(v2_len, elem_size))
+          $MemoryStoreU64(new_v1, new_len)
+        }
+    }
+}
+===> Test result of NativeFunctions::test_concat: Succeed(Stopped) (used_gas=10872): []
+
+// test of NativeFunctions::test_signer_address_of
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_signer_address_of" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_signer_address_of()
+        return (0, 0)
+        function A2_NativeFunctions_test_signer_address_of() {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 101
+                    $t6 := 101
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x42
+                    $t1 := 0x42
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := signer::address_of($t2)
+                    $t3 := A1_signer_address_of($t2)
+                    // $t4 := 0x42
+                    $t4 := 0x42
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_signer_address_of(s) -> $result {
+            let $t1, $t2
+            // $t1 := signer::borrow_address($t0)
+            $t1 := A1_signer_borrow_address(s)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU256($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_signer_borrow_address(signer_ref) -> addr_ref {
+          addr_ref := signer_ref
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of NativeFunctions::test_signer_address_of: Succeed(Stopped) (used_gas=431): []
+
+// test of NativeFunctions::test_to_string
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_NativeFunctions_test_to_string" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_NativeFunctions_test_to_string()
+        return (0, 0)
+        function A2_NativeFunctions_test_to_string() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 101
+                    $t4 := 101
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t0 := U256::zero()
+                    $t0 := A2_U256_zero()
+                    // $t1 := Evm::to_string($t0)
+                    $t1 := A2_Evm_to_string($t0)
+                    // $t2 := [48]
+                    $t2 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t2, 1)
+                    $MemoryStoreU64(add($t2, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2991736836(add($t2, 32))
+                    // $t3 := ==($t1, $t2)
+                    $t3 := $Eq_$vec$u8$$($t1, $t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := U256::one()
+                    $t5 := A2_U256_one()
+                    // $t6 := Evm::to_string($t5)
+                    $t6 := A2_Evm_to_string($t5)
+                    // $t7 := [49]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t7, 32))
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq_$vec$u8$$($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 102
+                    $t9 := 102
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := U256::u256_from_u128($t10)
+                    $t11 := A2_U256_u256_from_u128($t10)
+                    // $t12 := Evm::to_string($t11)
+                    $t12 := A2_Evm_to_string($t11)
+                    // $t13 := [52, 50]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t13, 2)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_402108876(add($t13, 32))
+                    // $t14 := ==($t12, $t13)
+                    $t14 := $Eq_$vec$u8$$($t12, $t13)
+                    // if ($t14) goto L7 else goto L6
+                    switch $t14
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t15 := 103
+                    $t15 := 103
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 11 {
+                    // label L8
+                    // $t16 := 7008
+                    $t16 := 7008
+                    // $t17 := U256::u256_from_u128($t16)
+                    $t17 := A2_U256_u256_from_u128($t16)
+                    // $t18 := Evm::to_string($t17)
+                    $t18 := A2_Evm_to_string($t17)
+                    // $t19 := [55, 48, 48, 56]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t19, 4)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_2919365730(add($t19, 32))
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq_$vec$u8$$($t18, $t19)
+                    // if ($t20) goto L10 else goto L9
+                    switch $t20
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t21 := 104
+                    $t21 := 104
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 14 {
+                    // label L11
+                    // $t22 := 340282366920938463463374607431768211458
+                    $t22 := 340282366920938463463374607431768211458
+                    // $t23 := Evm::to_string($t22)
+                    $t23 := A2_Evm_to_string($t22)
+                    // $t24 := [51, 52, 48, 50, 56, 50, 51, 54, 54, 57, 50, 48, 57, 51, 56, 52, 54, 51, 52, 54, 51, 51, 55, 52, 54, 48, 55, 52, 51, 49, 55, 54, 56, 50, 49, 49, 52, 53, 56]
+                    $t24 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(39)))
+                    $MemoryStoreU64($t24, 39)
+                    $MemoryStoreU64(add($t24, 8), $ClosestGreaterPowerOfTwo(39))
+                    copy_literal_string_to_memory_767927084(add($t24, 32))
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq_$vec$u8$$($t23, $t24)
+                    // if ($t25) goto L13 else goto L12
+                    switch $t25
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t26 := 105
+                    $t26 := 105
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_to_string(x) -> result {
+                          result := $NumToString(x)
+                        }
+        function A2_U256_u256_from_u128(lo) -> $result {
+            let $t1, $t2
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := (u256)($t1, $t0)
+            $t2 := $CastU256($t1, lo)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_U256_one() -> $result {
+            let $t0
+            // $t0 := 1
+            $t0 := 1
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_U256_zero() -> $result {
+            let $t0
+            // $t0 := 0
+            $t0 := 0
+            // return $t0
+            $result := $t0
+        }
+
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_767927084(value) {
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 57)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 57)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 51)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 54)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 53)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2919365730(value) {
+            $MemoryStoreU8(value, 55)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 56)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_402108876(value) {
+            $MemoryStoreU8(value, 52)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2991736836(value) {
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU256(hi, lo) -> r {
+            if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := add(shl(128, hi), lo)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $NumToString(x) -> s {
+          if iszero(x) {
+            s := $Malloc(add(32, 2))
+            $MemoryStoreU64(s, 1)
+            $MemoryStoreU64(add(s, 8), 2)
+            $MemoryStoreU8(add(s, 32), 48) // string "0"
+            leave
+          }
+          let temp := x
+          let num_digits := 0
+          for { } temp { num_digits := add(num_digits, 1) } {
+            temp := div(temp, 10)
+          }
+          let digits_space := $ClosestGreaterPowerOfTwo(num_digits)
+          s := $Malloc(add(32, digits_space))
+          $MemoryStoreU64(s, num_digits)
+          $MemoryStoreU64(add(s, 8), digits_space)
+          let digit
+          for { } x { } {
+            digit := add(48, mod(x, 10))
+            num_digits := sub(num_digits, 1)
+            $MemoryStoreU8(add(add(s, 32), num_digits), digit)
+            x := div(x, 10)
+          }
+        }
+    }
+}
+===> Test result of NativeFunctions::test_to_string: Succeed(Stopped) (used_gas=13241): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.move b/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.move
new file mode 100644
index 000000000..baada4c8a
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/NativeFunctions.move
@@ -0,0 +1,57 @@
+// Tests native functions.
+// dep: ../stdlib/sources/Evm.move
+// dep: ../stdlib/sources/U256.move
+#[evm_contract]
+module 0x2::NativeFunctions {
+    use Evm::Evm::{Self, abort_with, to_string, concat};
+    use Evm::U256::{zero, one, u256_from_u128, u256_from_words};
+    use std::signer;
+
+    #[callable]
+    fun call_native_functions() {
+        let _ = Evm::blockhash(one());
+        let _ = Evm::block_basefee();
+        let _ = Evm::block_chainid();
+        let _ = Evm::block_coinbase();
+        let _ = Evm::block_difficulty();
+        let _ = Evm::block_gaslimit();
+        let _ = Evm::block_number();
+        let _ = Evm::block_timestamp();
+        let _ = Evm::gasleft();
+        let _ = Evm::msg_data();
+        let _ = Evm::msg_sender();
+        let _ = Evm::msg_sig();
+        let _ = Evm::msg_value();
+        let _ = Evm::tx_gasprice();
+        let _ = Evm::tx_origin();
+    }
+
+    #[evm_test]
+    fun test_signer_address_of() {
+        let s = Evm::sign(@0x42);
+        assert!(signer::address_of(&s) == @0x42, 101);
+    }
+
+    #[evm_test]
+    fun test_abort() {
+        abort_with(b"error message");
+    }
+
+    #[evm_test]
+    fun test_to_string() {
+        assert!(to_string(zero()) == b"0", 101);
+        assert!(to_string(one()) == b"1", 102);
+        assert!(to_string(u256_from_u128(42)) == b"42", 103);
+        assert!(to_string(u256_from_u128(7008)) == b"7008", 104);
+        assert!(to_string(u256_from_words(1, 2)) == b"340282366920938463463374607431768211458", 105);
+    }
+
+    #[evm_test]
+    fun test_concat() {
+        assert!(concat(b"", b"") == b"", 100);
+        assert!(concat(b"1", b"2") == b"12", 101);
+        assert!(concat(b"", b"abc") == b"abc", 102);
+        assert!(concat(concat(b"a", b"bc"), b"de") == b"abcde", 103);
+        assert!(concat(b"test", b"") == b"test", 104);
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.exp b/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.exp
new file mode 100644
index 000000000..d1169e914
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.exp
@@ -0,0 +1,8 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: #[callable] or #[create] functions cannot be generic
+  ┌─ tests/NoGenericCallable.move:5:5
+  │
+5 │     fun f<T>(x: u64): u64 { x }
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.move b/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.move
new file mode 100644
index 000000000..9cea65086
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/NoGenericCallable.move
@@ -0,0 +1,6 @@
+// Tests error on generic callable.
+#[evm_contract]
+module 0x2::M {
+    #[callable]
+    fun f<T>(x: u64): u64 { x }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Resources.exp b/vendors/move/crates/evm/move-to-yul/tests/Resources.exp
new file mode 100644
index 000000000..e75268ee3
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Resources.exp
@@ -0,0 +1,1643 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_increment_a
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_increment_a" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_increment_a()
+        return (0, 0)
+        function A2_M_test_increment_a() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    $t11 := 100
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 510
+                    $t3 := 510
+                    // M::publish($t2, $t3)
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // M::increment_a($t4)
+                    A2_M_increment_a($t4)
+                    // $t5 := 0x3
+                    $t5 := 0x3
+                    // $t6 := borrow_global<M::S>($t5)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t5)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t6 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t7 := borrow_field<M::S>.a($t6)
+                    $t7 := $IndexPtr($t6, 32)
+                    // $t8 := read_ref($t7)
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 511
+                    $t9 := 511
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_increment_a(addr) {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_global<M::S>($t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, addr)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $t2 := $MakePtr(true, add($base_offset, 32))
+            }
+            // $t3 := borrow_field<M::S>.a($t2)
+            $t3 := $IndexPtr($t2, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := 1
+            $t5 := 1
+            // $t6 := +($t4, $t5)
+            $t6 := $AddU64($t4, $t5)
+            // $t7 := borrow_field<M::S>.a($t2)
+            $t7 := $IndexPtr($t2, 32)
+            // write_ref($t7, $t6)
+            $StoreU64($t7, $t6)
+            // return ()
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
+
+// test of M::test_publish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_publish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish()
+        return (0, 0)
+        function A2_M_test_publish() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::S>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU64($t9)
+                    // $t11 := 22
+                    $t11 := 22
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := 0x3
+                    $t14 := 0x3
+                    // $t15 := borrow_global<M::S>($t14)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t14)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t15 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t16 := borrow_field<M::S>.b($t15)
+                    $t16 := $IndexPtr($t15, 40)
+                    // $t17 := read_ref($t16)
+                    $t17 := $LoadU8($t16)
+                    // $t18 := 11
+                    $t18 := 11
+                    // $t19 := ==($t17, $t18)
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 102
+                    $t20 := 102
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // $t21 := 0x3
+                    $t21 := 0x3
+                    // $t22 := borrow_global<M::S>($t21)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<M::S>.c($t22)
+                    {
+                        $t23 := $MakePtr($IsStoragePtr($t22), $LoadU256($t22))
+                    }
+                    // $t24 := borrow_field<M::S2>.x($t23)
+                    $t24 := $t23
+                    // $t25 := read_ref($t24)
+                    $t25 := $LoadU128($t24)
+                    // $t26 := 44
+                    $t26 := 44
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L10 else goto L9
+                    switch $t27
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t28 := 103
+                    $t28 := 103
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
+
+// test of M::test_publish_t
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_publish_t" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish_t()
+        return (0, 0)
+        function A2_M_test_publish_t() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    {
+                        $t9 := $MakePtr($IsStoragePtr($t8), $LoadU256($t8))
+                    }
+                    // $t10 := borrow_field<M::S>.a($t9)
+                    $t10 := $IndexPtr($t9, 32)
+                    // $t11 := read_ref($t10)
+                    $t11 := $LoadU64($t10)
+                    // $t12 := 22
+                    $t12 := 22
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 0x3
+                    $t15 := 0x3
+                    // $t16 := borrow_global<M::T>($t15)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<M::T>.s($t16)
+                    {
+                        $t17 := $MakePtr($IsStoragePtr($t16), $LoadU256($t16))
+                    }
+                    // $t18 := borrow_field<M::S>.b($t17)
+                    $t18 := $IndexPtr($t17, 40)
+                    // $t19 := read_ref($t18)
+                    $t19 := $LoadU8($t18)
+                    // $t20 := 11
+                    $t20 := 11
+                    // $t21 := ==($t19, $t20)
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L7 else goto L6
+                    switch $t21
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t22 := 102
+                    $t22 := 102
+                    // abort($t22)
+                    $Abort($t22)
+                }
+                case 11 {
+                    // label L8
+                    // $t23 := 0x3
+                    $t23 := 0x3
+                    // $t24 := borrow_global<M::T>($t23)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t23)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t24 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t25 := borrow_field<M::T>.s($t24)
+                    {
+                        $t25 := $MakePtr($IsStoragePtr($t24), $LoadU256($t24))
+                    }
+                    // $t26 := borrow_field<M::S>.c($t25)
+                    {
+                        $t26 := $MakePtr($IsStoragePtr($t25), $LoadU256($t25))
+                    }
+                    // $t27 := borrow_field<M::S2>.x($t26)
+                    $t27 := $t26
+                    // $t28 := read_ref($t27)
+                    $t28 := $LoadU128($t27)
+                    // $t29 := 44
+                    $t29 := 44
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq($t28, $t29)
+                    // if ($t30) goto L10 else goto L9
+                    switch $t30
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t31 := 103
+                    $t31 := 103
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish_t(sg, a) {
+            let t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // $t10 := pack M::T($t9)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t9)
+                $t10 := $mem
+            }
+            // move_to<M::T>($t10, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t10
+                    {
+                        let $linked_src_1770153451 := mload(add($src, 0))
+                        let $linked_dst_1770153451 := $NewLinkedStorageBase(0x698265eb)
+                        {
+                            let $linked_src_1602512591 := mload(add($linked_src_1770153451, 0))
+                            let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                            $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                            $Free($linked_src_1602512591, 16)
+                            $AlignedStorageStore(add($linked_dst_1770153451, 0), $linked_dst_1602512591)
+                        }
+                        $AlignedStorageStore(add($linked_dst_1770153451, 32), mload(add($linked_src_1770153451, 32)))
+                        $Free($linked_src_1770153451, 41)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1770153451)
+                    }
+                    $Free($src, 32)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
+
+// test of M::test_unpublish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_unpublish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpublish()
+        return (0, 0)
+        function A2_M_test_unpublish() {
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
+                    $t5 := 33
+                    // M::publish($t4, $t5)
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := 16
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := 66
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpublish(a) -> $result {
+            let $t1
+            // $t1 := move_from<M::S>($t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, a)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, false)
+                {
+                    let $src := add($base_offset, 32)
+                    let $dst
+                    $dst := $Malloc(41)
+                    {
+                        let $linked_src_1602512591 := $AlignedStorageLoad(add($src, 0))
+                        let $linked_dst_1602512591
+                        $linked_dst_1602512591 := $Malloc(16)
+                        mstore(add($linked_dst_1602512591, 0), $AlignedStorageLoad(add($linked_src_1602512591, 0)))
+                        $AlignedStorageStore(add($linked_src_1602512591, 0), 0)
+                        mstore(add($dst, 0), $linked_dst_1602512591)
+                        $AlignedStorageStore(add($src, 0), 0)
+                    }
+                    mstore(add($dst, 32), $AlignedStorageLoad(add($src, 32)))
+                    $AlignedStorageStore(add($src, 32), 0)
+                    $t1 := $dst
+                }
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Resources.exp.capture-source-info b/vendors/move/crates/evm/move-to-yul/tests/Resources.exp.capture-source-info
new file mode 100644
index 000000000..c04def6d7
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Resources.exp.capture-source-info
@@ -0,0 +1,1838 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_increment_a
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_increment_a" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_increment_a()
+        return (0, 0)
+        function A2_M_test_increment_a() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:1284:1327
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 100
+                    /// @src 1:1323:1326
+                    $t11 := 100
+                    // abort($t11)
+                    /// @src 1:1284:1327
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:1240:1242
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:1235:1243
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:1234:1243
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 510
+                    /// @src 1:1245:1248
+                    $t3 := 510
+                    // M::publish($t2, $t3)
+                    /// @src 1:1226:1249
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:1271:1273
+                    $t4 := 0x3
+                    // M::increment_a($t4)
+                    /// @src 1:1259:1274
+                    A2_M_increment_a($t4)
+                    // $t5 := 0x3
+                    /// @src 1:1309:1311
+                    $t5 := 0x3
+                    // $t6 := borrow_global<M::S>($t5)
+                    /// @src 1:1292:1305
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t5)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t6 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t7 := borrow_field<M::S>.a($t6)
+                    /// @src 1:1292:1314
+                    $t7 := $IndexPtr($t6, 32)
+                    // $t8 := read_ref($t7)
+                    /// @src 1:1292:1314
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 511
+                    /// @src 1:1318:1321
+                    $t9 := 511
+                    // $t10 := ==($t8, $t9)
+                    /// @src 1:1315:1317
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    /// @src 1:1284:1327
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    /// @src 1:1327:1328
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_increment_a(addr) {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_global<M::S>($t0)
+            /// @src 1:1106:1123
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, addr)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $t2 := $MakePtr(true, add($base_offset, 32))
+            }
+            // $t3 := borrow_field<M::S>.a($t2)
+            /// @src 1:1148:1151
+            $t3 := $IndexPtr($t2, 32)
+            // $t4 := read_ref($t3)
+            /// @src 1:1148:1151
+            $t4 := $LoadU64($t3)
+            // $t5 := 1
+            /// @src 1:1154:1155
+            $t5 := 1
+            // $t6 := +($t4, $t5)
+            /// @src 1:1152:1153
+            $t6 := $AddU64($t4, $t5)
+            // $t7 := borrow_field<M::S>.a($t2)
+            /// @src 1:1142:1145
+            $t7 := $IndexPtr($t2, 32)
+            // write_ref($t7, $t6)
+            /// @src 1:1142:1155
+            $StoreU64($t7, $t6)
+            // return ()
+            /// @src 1:1142:1155
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
+
+// test of M::test_publish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_publish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish()
+        return (0, 0)
+        function A2_M_test_publish() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:548:575
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    /// @src 1:571:574
+                    $t6 := 100
+                    // abort($t6)
+                    /// @src 1:548:575
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:531:533
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:526:534
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:525:534
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:536:538
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    /// @src 1:517:539
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:566:568
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    /// @src 1:556:562
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:548:575
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    /// @src 1:609:611
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::S>($t7)
+                    /// @src 1:592:605
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    /// @src 1:592:614
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    /// @src 1:592:614
+                    $t10 := $LoadU64($t9)
+                    // $t11 := 22
+                    /// @src 1:618:620
+                    $t11 := 22
+                    // $t12 := ==($t10, $t11)
+                    /// @src 1:615:617
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    /// @src 1:584:626
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:584:626
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    /// @src 1:622:625
+                    $t13 := 101
+                    // abort($t13)
+                    /// @src 1:584:626
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := 0x3
+                    /// @src 1:660:662
+                    $t14 := 0x3
+                    // $t15 := borrow_global<M::S>($t14)
+                    /// @src 1:643:656
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t14)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t15 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t16 := borrow_field<M::S>.b($t15)
+                    /// @src 1:643:665
+                    $t16 := $IndexPtr($t15, 40)
+                    // $t17 := read_ref($t16)
+                    /// @src 1:643:665
+                    $t17 := $LoadU8($t16)
+                    // $t18 := 11
+                    /// @src 1:669:671
+                    $t18 := 11
+                    // $t19 := ==($t17, $t18)
+                    /// @src 1:666:668
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    /// @src 1:635:677
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:635:677
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 102
+                    /// @src 1:673:676
+                    $t20 := 102
+                    // abort($t20)
+                    /// @src 1:635:677
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // $t21 := 0x3
+                    /// @src 1:711:713
+                    $t21 := 0x3
+                    // $t22 := borrow_global<M::S>($t21)
+                    /// @src 1:694:707
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $t21)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t22 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t23 := borrow_field<M::S>.c($t22)
+                    /// @src 1:694:716
+                    {
+                        $t23 := $MakePtr($IsStoragePtr($t22), $LoadU256($t22))
+                    }
+                    // $t24 := borrow_field<M::S2>.x($t23)
+                    /// @src 1:694:718
+                    $t24 := $t23
+                    // $t25 := read_ref($t24)
+                    /// @src 1:694:718
+                    $t25 := $LoadU128($t24)
+                    // $t26 := 44
+                    /// @src 1:722:724
+                    $t26 := 44
+                    // $t27 := ==($t25, $t26)
+                    /// @src 1:719:721
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L10 else goto L9
+                    /// @src 1:686:730
+                    switch $t27
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:686:730
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t28 := 103
+                    /// @src 1:726:729
+                    $t28 := 103
+                    // abort($t28)
+                    /// @src 1:686:730
+                    $Abort($t28)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    /// @src 1:730:731
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
+
+// test of M::test_publish_t
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_publish_t" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_publish_t()
+        return (0, 0)
+        function A2_M_test_publish_t() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:1584:1611
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    /// @src 1:1607:1610
+                    $t6 := 100
+                    // abort($t6)
+                    /// @src 1:1584:1611
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:1566:1568
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:1561:1569
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:1560:1569
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:1571:1573
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    /// @src 1:1550:1574
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:1602:1604
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    /// @src 1:1592:1598
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:1584:1611
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := 0x3
+                    /// @src 1:1646:1648
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    /// @src 1:1629:1642
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    /// @src 1:1629:1651
+                    {
+                        $t9 := $MakePtr($IsStoragePtr($t8), $LoadU256($t8))
+                    }
+                    // $t10 := borrow_field<M::S>.a($t9)
+                    /// @src 1:1629:1653
+                    $t10 := $IndexPtr($t9, 32)
+                    // $t11 := read_ref($t10)
+                    /// @src 1:1629:1653
+                    $t11 := $LoadU64($t10)
+                    // $t12 := 22
+                    /// @src 1:1657:1659
+                    $t12 := 22
+                    // $t13 := ==($t11, $t12)
+                    /// @src 1:1654:1656
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    /// @src 1:1621:1665
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:1621:1665
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    /// @src 1:1661:1664
+                    $t14 := 101
+                    // abort($t14)
+                    /// @src 1:1621:1665
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := 0x3
+                    /// @src 1:1700:1702
+                    $t15 := 0x3
+                    // $t16 := borrow_global<M::T>($t15)
+                    /// @src 1:1683:1696
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t15)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t16 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t17 := borrow_field<M::T>.s($t16)
+                    /// @src 1:1683:1705
+                    {
+                        $t17 := $MakePtr($IsStoragePtr($t16), $LoadU256($t16))
+                    }
+                    // $t18 := borrow_field<M::S>.b($t17)
+                    /// @src 1:1683:1707
+                    $t18 := $IndexPtr($t17, 40)
+                    // $t19 := read_ref($t18)
+                    /// @src 1:1683:1707
+                    $t19 := $LoadU8($t18)
+                    // $t20 := 11
+                    /// @src 1:1711:1713
+                    $t20 := 11
+                    // $t21 := ==($t19, $t20)
+                    /// @src 1:1708:1710
+                    $t21 := $Eq($t19, $t20)
+                    // if ($t21) goto L7 else goto L6
+                    /// @src 1:1675:1719
+                    switch $t21
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1675:1719
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t22 := 102
+                    /// @src 1:1715:1718
+                    $t22 := 102
+                    // abort($t22)
+                    /// @src 1:1675:1719
+                    $Abort($t22)
+                }
+                case 11 {
+                    // label L8
+                    // $t23 := 0x3
+                    /// @src 1:1754:1756
+                    $t23 := 0x3
+                    // $t24 := borrow_global<M::T>($t23)
+                    /// @src 1:1737:1750
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t23)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t24 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t25 := borrow_field<M::T>.s($t24)
+                    /// @src 1:1737:1759
+                    {
+                        $t25 := $MakePtr($IsStoragePtr($t24), $LoadU256($t24))
+                    }
+                    // $t26 := borrow_field<M::S>.c($t25)
+                    /// @src 1:1737:1761
+                    {
+                        $t26 := $MakePtr($IsStoragePtr($t25), $LoadU256($t25))
+                    }
+                    // $t27 := borrow_field<M::S2>.x($t26)
+                    /// @src 1:1737:1763
+                    $t27 := $t26
+                    // $t28 := read_ref($t27)
+                    /// @src 1:1737:1763
+                    $t28 := $LoadU128($t27)
+                    // $t29 := 44
+                    /// @src 1:1767:1769
+                    $t29 := 44
+                    // $t30 := ==($t28, $t29)
+                    /// @src 1:1764:1766
+                    $t30 := $Eq($t28, $t29)
+                    // if ($t30) goto L10 else goto L9
+                    /// @src 1:1729:1775
+                    switch $t30
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:1729:1775
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t31 := 103
+                    /// @src 1:1771:1774
+                    $t31 := 103
+                    // abort($t31)
+                    /// @src 1:1729:1775
+                    $Abort($t31)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    /// @src 1:1775:1776
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_publish_t(sg, a) {
+            let t, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            // $t3 := 2
+            /// @src 1:1414:1415
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:1412:1413
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:1408:1423
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:1438:1439
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:1434:1451
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:1428:1452
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:1400:1453
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // $t10 := pack M::T($t9)
+            /// @src 1:1393:1454
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t9)
+                $t10 := $mem
+            }
+            // move_to<M::T>($t10, $t0)
+            /// @src 1:1464:1471
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t10
+                    {
+                        let $linked_src_1770153451 := mload(add($src, 0))
+                        let $linked_dst_1770153451 := $NewLinkedStorageBase(0x698265eb)
+                        {
+                            let $linked_src_1602512591 := mload(add($linked_src_1770153451, 0))
+                            let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                            $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                            $Free($linked_src_1602512591, 16)
+                            $AlignedStorageStore(add($linked_dst_1770153451, 0), $linked_dst_1602512591)
+                        }
+                        $AlignedStorageStore(add($linked_dst_1770153451, 32), mload(add($linked_src_1770153451, 32)))
+                        $Free($linked_src_1770153451, 41)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1770153451)
+                    }
+                    $Free($src, 32)
+                }
+            }
+            // return ()
+            /// @src 1:1464:1481
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
+
+// test of M::test_unpublish
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+/// @use-src 1:"tests/Resources.move"
+///        , 2:"../stdlib/sources/Evm.move"
+
+
+object "test_A2_M_test_unpublish" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpublish()
+        return (0, 0)
+        function A2_M_test_unpublish() {
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    /// @src 1:953:974
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    /// @src 1:970:973
+                    $t14 := 101
+                    // abort($t14)
+                    /// @src 1:953:974
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    /// @src 1:890:892
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    /// @src 1:885:893
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    /// @src 1:884:893
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
+                    /// @src 1:895:897
+                    $t5 := 33
+                    // M::publish($t4, $t5)
+                    /// @src 1:876:898
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
+                    /// @src 1:941:943
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
+                    /// @src 1:931:944
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
+                    /// @src 1:911:928
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
+                    /// @src 1:922:927
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
+                    /// @src 1:966:968
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
+                    /// @src 1:963:965
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    /// @src 1:953:974
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := 16
+                    /// @src 1:996:998
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    /// @src 1:993:995
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    /// @src 1:983:1004
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:983:1004
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    /// @src 1:1000:1003
+                    $t17 := 102
+                    // abort($t17)
+                    /// @src 1:983:1004
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := 66
+                    /// @src 1:1026:1028
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
+                    /// @src 1:1023:1025
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    /// @src 1:1013:1034
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1013:1034
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
+                    /// @src 1:1030:1033
+                    $t20 := 103
+                    // abort($t20)
+                    /// @src 1:1013:1034
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    /// @src 1:1034:1035
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpublish(a) -> $result {
+            let $t1
+            // $t1 := move_from<M::S>($t0)
+            /// @src 1:793:802
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, a)
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, false)
+                {
+                    let $src := add($base_offset, 32)
+                    let $dst
+                    $dst := $Malloc(41)
+                    {
+                        let $linked_src_1602512591 := $AlignedStorageLoad(add($src, 0))
+                        let $linked_dst_1602512591
+                        $linked_dst_1602512591 := $Malloc(16)
+                        mstore(add($linked_dst_1602512591, 0), $AlignedStorageLoad(add($linked_src_1602512591, 0)))
+                        $AlignedStorageStore(add($linked_src_1602512591, 0), 0)
+                        mstore(add($dst, 0), $linked_dst_1602512591)
+                        $AlignedStorageStore(add($src, 0), 0)
+                    }
+                    mstore(add($dst, 32), $AlignedStorageLoad(add($src, 32)))
+                    $AlignedStorageStore(add($src, 32), 0)
+                    $t1 := $dst
+                }
+            }
+            // return $t1
+            /// @src 1:793:808
+            $result := $t1
+        }
+
+        function A2_M_publish(sg, a) {
+            let s, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            // $t3 := 2
+            /// @src 1:385:386
+            $t3 := 2
+            // $t4 := /($t1, $t3)
+            /// @src 1:383:384
+            $t4 := $Div(a, $t3)
+            // $t5 := (u8)($t4)
+            /// @src 1:379:394
+            $t5 := $CastU8($t4)
+            // $t6 := +($t1, $t1)
+            /// @src 1:409:410
+            $t6 := $AddU64(a, a)
+            // $t7 := (u128)($t6)
+            /// @src 1:405:422
+            $t7 := $CastU128($t6)
+            // $t8 := pack M::S2($t7)
+            /// @src 1:399:423
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // $t9 := pack M::S($t1, $t5, $t8)
+            /// @src 1:371:424
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), $t5)
+                $MemoryStoreU256(add($mem, 0), $t8)
+                $t9 := $mem
+            }
+            // move_to<M::S>($t9, $t0)
+            /// @src 1:434:441
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0x698265eb, $LoadU256(sg))
+                if $AlignedStorageLoad($base_offset) {
+                  $AbortBuiltin()
+                }
+                $AlignedStorageStore($base_offset, true)
+                {
+                    let $dst := add($base_offset, 32)
+                    let $src := $t9
+                    {
+                        let $linked_src_1602512591 := mload(add($src, 0))
+                        let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), mload(add($linked_src_1602512591, 0)))
+                        $Free($linked_src_1602512591, 16)
+                        $AlignedStorageStore(add($dst, 0), $linked_dst_1602512591)
+                    }
+                    $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                    $Free($src, 41)
+                }
+            }
+            // return ()
+            /// @src 1:434:451
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Div(x, y) -> r {
+            if eq(y, 0) { $AbortBuiltin() }
+            r := div(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU8(x) -> r {
+            if gt(x, 0xff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Resources.move b/vendors/move/crates/evm/move-to-yul/tests/Resources.move
new file mode 100644
index 000000000..8174d81e4
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Resources.move
@@ -0,0 +1,72 @@
+// Use this test to check source info generation:
+//
+// experiment: capture-source-info
+//
+#[evm_contract]
+module 0x2::M {
+    use Evm::Evm::sign;
+
+    struct T has key {
+        s: S
+    }
+
+    struct S has key, store {
+      a: u64,
+      b: u8,
+      c: S2
+    }
+
+    struct S2 has store {
+        x: u128
+    }
+
+    fun publish(sg: &signer, a: u64) {
+        let s = S{a, b: ((a / 2) as u8), c: S2{x: ((a + a) as u128)}};
+        move_to<S>(sg, s)
+    }
+    #[evm_test]
+    fun test_publish() acquires S {
+       publish(&sign(@3), 22);
+       assert!(exists<S>(@3), 100);
+       assert!(borrow_global<S>(@3).a == 22, 101);
+       assert!(borrow_global<S>(@3).b == 11, 102);
+       assert!(borrow_global<S>(@3).c.x == 44, 103);
+    }
+
+    fun unpublish(a: address): S acquires S {
+        move_from<S>(a)
+    }
+    #[evm_test]
+    fun test_unpublish() acquires S {
+       publish(&sign(@3), 33);
+       let S{a, b, c: S2{x}} = unpublish(@3);
+       assert!(a == 33, 101);
+       assert!(b == 16, 102);
+       assert!(x == 66, 103);
+    }
+
+    fun increment_a(addr: address) acquires S{
+        let r = borrow_global_mut<S>(addr);
+        r.a = r.a + 1
+    }
+    #[evm_test]
+    fun test_increment_a() acquires S {
+        publish(&sign(@3), 510);
+        increment_a(@3);
+        assert!(borrow_global<S>(@3).a == 511, 100);
+    }
+
+    fun publish_t(sg: &signer, a: u64) {
+        let t = T { s: S{a, b: ((a / 2) as u8), c: S2{x: ((a + a) as u128)}}};
+        move_to<T>(sg, t)
+    }
+    #[evm_test]
+    fun test_publish_t() acquires T {
+        publish_t(&sign(@3), 22);
+        assert!(exists<T>(@3), 100);
+        assert!(borrow_global<T>(@3).s.a == 22, 101);
+        assert!(borrow_global<T>(@3).s.b == 11, 102);
+        assert!(borrow_global<T>(@3).s.c.x == 44, 103);
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Structs.exp b/vendors/move/crates/evm/move-to-yul/tests/Structs.exp
new file mode 100644
index 000000000..f30ce71b2
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Structs.exp
@@ -0,0 +1,2355 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_drop
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_drop" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_drop()
+        return (0, 0)
+        function A2_M_test_drop() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 33
+            $t0 := 33
+            // $t1 := false
+            $t1 := false
+            // $t2 := M::pack_S($t0, $t1)
+            $t2 := A2_M_pack_S($t0, $t1)
+            // $t3 := pack M::S3($t2)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
+            }
+            // destroy($t3)
+            {
+                let $field_ptr_1770153451 := $LoadU256(add($t3, 0))
+                {
+                    let $field_ptr_1602512591 := $LoadU256(add($field_ptr_1770153451, 0))
+                    $Free($field_ptr_1602512591, 16)
+                }
+                $Free($field_ptr_1770153451, 41)
+            }
+            $Free($t3, 32)
+            // return ()
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_drop: Succeed(Returned) (used_gas=343): []
+
+// test of M::test_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_equality()
+        return (0, 0)
+        function A2_M_test_equality() {
+            let s1, s2, s3, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 4 {
+                    // $t3 := 23
+                    $t3 := 23
+                    // $t4 := false
+                    $t4 := false
+                    // $t5 := M::pack_S($t3, $t4)
+                    $t5 := A2_M_pack_S($t3, $t4)
+                    // $t6 := 23
+                    $t6 := 23
+                    // $t7 := false
+                    $t7 := false
+                    // $t8 := M::pack_S($t6, $t7)
+                    $t8 := A2_M_pack_S($t6, $t7)
+                    // $t9 := 24
+                    $t9 := 24
+                    // $t10 := false
+                    $t10 := false
+                    // $t11 := M::pack_S($t9, $t10)
+                    $t11 := A2_M_pack_S($t9, $t10)
+                    // $t12 := ==($t5, $t8)
+                    $t12 := $Eq_$A2_M_S$($t5, $t8)
+                    // if ($t12) goto L1 else goto L0
+                    switch $t12
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t14 := !=($t5, $t11)
+                    $t14 := $LogicalNot($Eq_$A2_M_S$($t5, $t11))
+                    // if ($t14) goto L4 else goto L3
+                    switch $t14
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t15 := 102
+                    $t15 := 102
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 8 {
+                    // label L5
+                    // $t16 := !=($t8, $t11)
+                    $t16 := $LogicalNot($Eq_$A2_M_S$($t8, $t11))
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 103
+                    $t17 := 103
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Eq_$A2_M_S$(x, y) -> res
+        {
+            let f_x_2 := mload(add(x, 0))
+            let f_y_2 := mload(add(y, 0))
+            if $LogicalNot($Eq_$A2_M_S2$(f_x_2, f_y_2)) {
+              res:= false
+              leave
+            }
+            if $Neq(mload(add(x, 32)), mload(add(y, 32))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Eq_$A2_M_S2$(x, y) -> res
+        {
+            if $Neq(mload(add(x, 0)), mload(add(y, 0))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_equality: Succeed(Stopped) (used_gas=2137): []
+
+// test of M::test_pack_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S()
+        return (0, 0)
+        function A2_M_test_pack_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 100
+                    $t8 := 100
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := borrow_field<M::S>.a($t3)
+                    $t4 := $IndexPtr($t3, 32)
+                    // $t5 := read_ref($t4)
+                    $t5 := $LoadU64($t4)
+                    // $t6 := 42
+                    $t6 := 42
+                    // $t7 := ==($t5, $t6)
+                    $t7 := $Eq($t5, $t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, s)
+                    // $t10 := borrow_field<M::S>.b($t9)
+                    $t10 := $IndexPtr($t9, 40)
+                    // $t11 := read_ref($t10)
+                    $t11 := $LoadU8($t10)
+                    // $t12 := true
+                    $t12 := true
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, s)
+                    // $t16 := borrow_field<M::S>.c($t15)
+                    {
+                        $t16 := $MakePtr($IsStoragePtr($t15), $LoadU256($t15))
+                    }
+                    // $t17 := borrow_field<M::S2>.x($t16)
+                    $t17 := $t16
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU128($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 102
+                    $t21 := 102
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_pack_S: Succeed(Stopped) (used_gas=1775): []
+
+// test of M::test_pack_S2
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S2" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S2()
+        return (0, 0)
+        function A2_M_test_pack_S2() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t0 := M::pack_S2($t1)
+                    s := A2_M_pack_S2($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, s)
+                    // $t3 := borrow_field<M::S2>.x($t2)
+                    $t3 := $t2
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU128($t3)
+                    // $t5 := 42
+                    $t5 := 42
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_pack_S2: Succeed(Stopped) (used_gas=471): []
+
+// test of M::test_pack_S2_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_pack_S2_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_pack_S2_fail()
+        return (0, 0)
+        function A2_M_test_pack_S2_fail() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t0 := M::pack_S2($t1)
+                    s := A2_M_pack_S2($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, s)
+                    // $t3 := borrow_field<M::S2>.x($t2)
+                    $t3 := $t2
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU128($t3)
+                    // $t5 := 41
+                    $t5 := 41
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_pack_S2_fail: Revert(Reverted) (used_gas=396): [0, 0, 0, 0, 0, 0, 0, 100]
+
+// test of M::test_read_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_read_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_read_S()
+        return (0, 0)
+        function A2_M_test_read_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := M::read_S($t3)
+                    $t4 := A2_M_read_S($t3)
+                    // $t5 := 84
+                    $t5 := 84
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_read_S(s) -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t1 := borrow_field<M::S>.a($t0)
+            $t1 := $IndexPtr(s, 32)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU64($t1)
+            // $t3 := borrow_field<M::S>.c($t0)
+            {
+                $t3 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t4 := borrow_field<M::S2>.x($t3)
+            $t4 := $t3
+            // $t5 := read_ref($t4)
+            $t5 := $LoadU128($t4)
+            // $t6 := (u64)($t5)
+            $t6 := $CastU64($t5)
+            // $t7 := +($t2, $t6)
+            $t7 := $AddU64($t2, $t6)
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_read_S: Succeed(Stopped) (used_gas=925): []
+
+// test of M::test_read_and_write_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_read_and_write_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_read_and_write_S()
+        return (0, 0)
+        function A2_M_test_read_and_write_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
+                }
+                case 4 {
+                    // $t0 := M::read_and_write_S()
+                    s := A2_M_read_and_write_S()
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, s)
+                    // $t2 := borrow_field<M::S>.a($t1)
+                    $t2 := $IndexPtr($t1, 32)
+                    // $t3 := read_ref($t2)
+                    $t3 := $LoadU64($t2)
+                    // $t4 := 2
+                    $t4 := 2
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, s)
+                    // $t8 := borrow_field<M::S>.c($t7)
+                    {
+                        $t8 := $MakePtr($IsStoragePtr($t7), $LoadU256($t7))
+                    }
+                    // $t9 := borrow_field<M::S2>.x($t8)
+                    $t9 := $t8
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU128($t9)
+                    // $t11 := 2
+                    $t11 := 2
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 101
+                    $t13 := 101
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_read_and_write_S() -> $result {
+            let s, x, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := 1
+            $t2 := 1
+            // $t3 := false
+            $t3 := false
+            // $t0 := M::pack_S($t2, $t3)
+            s := A2_M_pack_S($t2, $t3)
+            // $t4 := borrow_local($t0)
+            $t4 := $MakePtr(false, s)
+            // $t5 := M::read_S($t4)
+            $t5 := A2_M_read_S($t4)
+            // $t6 := borrow_local($t0)
+            $t6 := $MakePtr(false, s)
+            // M::write_S($t6, $t5)
+            A2_M_write_S($t6, $t5)
+            // $t7 := move($t0)
+            $t7 := s
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_write_S(s, v) {
+            let $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_field<M::S>.a($t0)
+            $t2 := $IndexPtr(s, 32)
+            // write_ref($t2, $t1)
+            $StoreU64($t2, v)
+            // $t3 := borrow_field<M::S>.a($t0)
+            $t3 := $IndexPtr(s, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := (u128)($t4)
+            $t5 := $CastU128($t4)
+            // $t6 := borrow_field<M::S>.c($t0)
+            {
+                $t6 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t7 := borrow_field<M::S2>.x($t6)
+            $t7 := $t6
+            // write_ref($t7, $t5)
+            $StoreU128($t7, $t5)
+            // return ()
+        }
+
+        function A2_M_read_S(s) -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            // $t1 := borrow_field<M::S>.a($t0)
+            $t1 := $IndexPtr(s, 32)
+            // $t2 := read_ref($t1)
+            $t2 := $LoadU64($t1)
+            // $t3 := borrow_field<M::S>.c($t0)
+            {
+                $t3 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t4 := borrow_field<M::S2>.x($t3)
+            $t4 := $t3
+            // $t5 := read_ref($t4)
+            $t5 := $LoadU128($t4)
+            // $t6 := (u64)($t5)
+            $t6 := $CastU64($t5)
+            // $t7 := +($t2, $t6)
+            $t7 := $AddU64($t2, $t6)
+            // return $t7
+            $result := $t7
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_read_and_write_S: Succeed(Stopped) (used_gas=2055): []
+
+// test of M::test_unpack
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_unpack" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_unpack()
+        return (0, 0)
+        function A2_M_test_unpack() {
+            let s1, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 4 {
+                    // $t1 := 33
+                    $t1 := 33
+                    // $t2 := false
+                    $t2 := false
+                    // $t3 := M::pack_S($t1, $t2)
+                    $t3 := A2_M_pack_S($t1, $t2)
+                    // $t0 := M::unpack($t3)
+                    s1 := A2_M_unpack($t3)
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, s1)
+                    // $t5 := borrow_field<M::S2>.x($t4)
+                    $t5 := $t4
+                    // $t6 := read_ref($t5)
+                    $t6 := $LoadU128($t5)
+                    // $t7 := 33
+                    $t7 := 33
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_unpack(s) -> $result {
+            let c, $t2, $t3, $t4
+            // ($t2, $t3, $t4) := unpack M::S($t0)
+            $t2 := $MemoryLoadU64(add(s, 32))
+            $t3 := $MemoryLoadU8(add(s, 40))
+            $t4 := $MemoryLoadU256(add(s, 0))
+            $Free(s, 41)
+            // destroy($t3)
+            // destroy($t2)
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_unpack: Succeed(Stopped) (used_gas=591): []
+
+// test of M::test_write_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_write_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_write_S()
+        return (0, 0)
+        function A2_M_test_write_S() {
+            let s, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t10 := 100
+                    $t10 := 100
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := true
+                    $t2 := true
+                    // $t0 := M::pack_S($t1, $t2)
+                    s := A2_M_pack_S($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, s)
+                    // $t4 := 43
+                    $t4 := 43
+                    // M::write_S($t3, $t4)
+                    A2_M_write_S($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, s)
+                    // $t6 := borrow_field<M::S>.a($t5)
+                    $t6 := $IndexPtr($t5, 32)
+                    // $t7 := read_ref($t6)
+                    $t7 := $LoadU64($t6)
+                    // $t8 := 43
+                    $t8 := 43
+                    // $t9 := ==($t7, $t8)
+                    $t9 := $Eq($t7, $t8)
+                    // if ($t9) goto L1 else goto L0
+                    switch $t9
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, s)
+                    // $t12 := borrow_field<M::S>.c($t11)
+                    {
+                        $t12 := $MakePtr($IsStoragePtr($t11), $LoadU256($t11))
+                    }
+                    // $t13 := borrow_field<M::S2>.x($t12)
+                    $t13 := $t12
+                    // $t14 := read_ref($t13)
+                    $t14 := $LoadU128($t13)
+                    // $t15 := 43
+                    $t15 := 43
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq($t14, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 101
+                    $t17 := 101
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_write_S(s, v) {
+            let $t2, $t3, $t4, $t5, $t6, $t7
+            // $t2 := borrow_field<M::S>.a($t0)
+            $t2 := $IndexPtr(s, 32)
+            // write_ref($t2, $t1)
+            $StoreU64($t2, v)
+            // $t3 := borrow_field<M::S>.a($t0)
+            $t3 := $IndexPtr(s, 32)
+            // $t4 := read_ref($t3)
+            $t4 := $LoadU64($t3)
+            // $t5 := (u128)($t4)
+            $t5 := $CastU128($t4)
+            // $t6 := borrow_field<M::S>.c($t0)
+            {
+                $t6 := $MakePtr($IsStoragePtr(s), $LoadU256(s))
+            }
+            // $t7 := borrow_field<M::S2>.x($t6)
+            $t7 := $t6
+            // write_ref($t7, $t5)
+            $StoreU128($t7, $t5)
+            // return ()
+        }
+
+        function A2_M_pack_S(a, b) -> $result {
+            let $t2, $t3, $t4
+            // $t2 := (u128)($t0)
+            $t2 := $CastU128(a)
+            // $t3 := M::pack_S2($t2)
+            $t3 := A2_M_pack_S2($t2)
+            // $t4 := pack M::S($t0, $t1, $t3)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+        }
+
+        function A2_M_pack_S2(x) -> $result {
+            let $t1
+            // $t1 := pack M::S2($t0)
+            {
+                let $mem := $Malloc(16)
+                $MemoryStoreU128(add($mem, 0), x)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+    }
+}
+===> Test result of M::test_write_S: Succeed(Stopped) (used_gas=1637): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Structs.move b/vendors/move/crates/evm/move-to-yul/tests/Structs.move
new file mode 100644
index 000000000..b6b56fe98
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Structs.move
@@ -0,0 +1,114 @@
+#[evm_contract]
+module 0x2::M {
+    struct S has copy, drop {
+      a: u64,
+      b: bool,
+      c: S2
+    }
+
+    struct S2 has copy, drop {
+        x: u128
+    }
+
+    struct S3 has drop {
+        s: S,
+    }
+
+    // =============================================
+
+    fun pack_S2(x: u128): S2 {
+        S2{x}
+    }
+    #[evm_test]
+    fun test_pack_S2() {
+        let s = pack_S2(42);
+        assert!(s.x == 42, 100)
+    }
+    #[evm_test]
+    fun test_pack_S2_fail() {
+        let s = pack_S2(42);
+        assert!(s.x == 41, 100)
+    }
+
+    // =============================================
+
+    fun pack_S(a: u64, b: bool): S {
+        S{a, b, c: pack_S2((a as u128))}
+    }
+    #[evm_test]
+    fun test_pack_S() {
+        let s = pack_S(42, true);
+        assert!(s.a == 42, 100);
+        assert!(s.b == true, 101);
+        assert!(s.c.x == 42, 102);
+    }
+
+    // =============================================
+
+    fun read_S(s: &S): u64 {
+        s.a + (s.c.x as u64)
+    }
+    #[evm_test]
+    fun test_read_S() {
+        let s = pack_S(42, true);
+        assert!(read_S(&s) == 84, 100);
+    }
+
+    // =============================================
+
+    fun write_S(s: &mut S, v: u64) {
+        s.a = v;
+        s.c.x = (s.a as u128);
+    }
+    #[evm_test]
+    fun test_write_S() {
+        let s = pack_S(42, true);
+        write_S(&mut s, 43);
+        assert!(s.a == 43, 100);
+        assert!(s.c.x == 43, 101);
+    }
+
+    // =============================================
+
+    fun read_and_write_S(): S {
+        let s = pack_S(1, false);
+        let x = read_S(&s);
+        write_S(&mut s, x);
+        s
+    }
+    #[evm_test]
+    fun test_read_and_write_S() {
+        let s = read_and_write_S();
+        assert!(s.a == 2, 100);
+        assert!(s.c.x == 2, 101);
+    }
+
+
+    // =============================================
+
+    fun unpack(s: S): S2 {
+        let S{a: _a, b: _b, c} = s;
+        c
+    }
+    #[evm_test]
+    fun test_unpack() {
+        let s = pack_S(33, false);
+        let s1 = unpack(s);
+        assert!(s1.x == 33, 101);
+    }
+
+    #[evm_test]
+    fun test_drop() {
+        let _s3 = S3 { s: pack_S(33, false) };
+    }
+
+    #[evm_test]
+    fun test_equality() {
+        let s1 = pack_S(23, false);
+        let s2 = pack_S(23, false);
+        let s3 = pack_S(24, false);
+        assert!(copy s1 == copy s2, 101);
+        assert!(s1 != copy s3, 102);
+        assert!(s2 != s3, 103);
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Tables.exp b/vendors/move/crates/evm/move-to-yul/tests/Tables.exp
new file mode 100644
index 000000000..b2a95d326
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Tables.exp
@@ -0,0 +1,4227 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_Tables" {
+    code {
+        codecopy(0, dataoffset("A2_Tables_deployed"), datasize("A2_Tables_deployed"))
+        return(0, datasize("A2_Tables_deployed"))
+    }
+    object "A2_Tables_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of Tables::test_borrow_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_borrow_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_borrow_fail()
+        return (0, 0)
+        function A2_Tables_test_borrow_fail() {
+            let tmp_$1, tmp_$3, entry_ref, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(128)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t12 := 100
+                    $t12 := 100
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 4 {
+                    // $t6 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t7 := borrow_local($t6)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t0 := $t8
+                    mstore(add($locals, 32), $t8)
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 56))
+                    // $t10 := Table::contains<u64, u128>($t7, $t9)
+                    $t10 := A2_Table_contains$u64_u128$($t7, $t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L1 else goto L0
+                    switch $t11
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t13 := borrow_local($t6)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 42
+                    $t14 := 42
+                    // $t2 := $t14
+                    mstore(add($locals, 64), $t14)
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 88))
+                    // $t16 := Table::borrow_mut<u64, u128>($t13, $t15)
+                    $t16 := A2_Table_borrow_mut$u64_u128$($t13, $t15)
+                    // $t17 := 1
+                    $t17 := 1
+                    // write_ref($t16, $t17)
+                    $StoreU128($t16, $t17)
+                    // $t18 := 0x42
+                    $t18 := 0x42
+                    // $t4 := Evm::sign($t18)
+                    mstore(add($locals, 96), A2_Evm_sign($t18))
+                    // $t19 := borrow_local($t4)
+                    $t19 := $MakePtr(false, add($locals, 96))
+                    // $t20 := move($t6)
+                    $t20 := mload($locals)
+                    // $t21 := pack Tables::S<u64, u128>($t20)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t20)
+                        $t21 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t21, $t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t19))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t21
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 128)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow_mut$u64_u128$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_borrow_fail: Revert(Reverted) (used_gas=25408): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_insert_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_insert_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_insert_fail()
+        return (0, 0)
+        function A2_Tables_test_insert_fail() {
+            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32
+            let $locals := $Malloc(192)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t15 := 100
+                    $t15 := 100
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 4 {
+                    // $t9 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t10 := borrow_local($t9)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // $t0 := $t11
+                    mstore(add($locals, 32), $t11)
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, add($locals, 56))
+                    // $t13 := Table::contains<u64, u128>($t10, $t12)
+                    $t13 := A2_Table_contains$u64_u128$($t10, $t12)
+                    // $t14 := !($t13)
+                    $t14 := $LogicalNot($t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t16 := borrow_local($t9)
+                    $t16 := $MakePtr(false, $locals)
+                    // $t17 := 42
+                    $t17 := 42
+                    // $t2 := $t17
+                    mstore(add($locals, 64), $t17)
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, add($locals, 88))
+                    // $t19 := 1012
+                    $t19 := 1012
+                    // Table::insert<u64, u128>($t16, $t18, $t19)
+                    A2_Table_insert$u64_u128$($t16, $t18, $t19)
+                    // $t20 := borrow_local($t9)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 42
+                    $t21 := 42
+                    // $t4 := $t21
+                    mstore(add($locals, 96), $t21)
+                    // $t22 := borrow_local($t4)
+                    $t22 := $MakePtr(false, add($locals, 120))
+                    // $t23 := Table::contains<u64, u128>($t20, $t22)
+                    $t23 := A2_Table_contains$u64_u128$($t20, $t22)
+                    // if ($t23) goto L4 else goto L3
+                    switch $t23
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 8 {
+                    // label L5
+                    // $t25 := borrow_local($t9)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := 42
+                    $t26 := 42
+                    // $t6 := $t26
+                    mstore(add($locals, 128), $t26)
+                    // $t27 := borrow_local($t6)
+                    $t27 := $MakePtr(false, add($locals, 152))
+                    // $t28 := 1013
+                    $t28 := 1013
+                    // Table::insert<u64, u128>($t25, $t27, $t28)
+                    A2_Table_insert$u64_u128$($t25, $t27, $t28)
+                    // $t29 := 0x42
+                    $t29 := 0x42
+                    // $t8 := Evm::sign($t29)
+                    mstore(add($locals, 160), A2_Evm_sign($t29))
+                    // $t30 := borrow_local($t8)
+                    $t30 := $MakePtr(false, add($locals, 160))
+                    // $t31 := move($t9)
+                    $t31 := mload($locals)
+                    // $t32 := pack Tables::S<u64, u128>($t31)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t31)
+                        $t32 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t32, $t30)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t30))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t32
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 192)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_insert$u64_u128$(table_ref, key_ref, value) {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_107084805 := $NewLinkedStorageBase(0x661fc05)
+            $StorageStoreU128($linked_dst_107084805, value)
+            sstore(storage_key, $linked_dst_107084805)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_insert_fail: Revert(Reverted) (used_gas=91120): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_primitive
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_primitive" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_primitive()
+        return (0, 0)
+        function A2_Tables_test_primitive() {
+            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$17, tmp_$19, tmp_$22, tmp_$24, tmp_$26, tmp_$28, t_ref, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129
+            let $locals := $Malloc(576)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t38 := 100
+                    $t38 := 100
+                    // abort($t38)
+                    $Abort($t38)
+                }
+                case 4 {
+                    // $t31 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t33 := borrow_local($t31)
+                    $t33 := $MakePtr(false, $locals)
+                    // $t34 := 42
+                    $t34 := 42
+                    // $t0 := $t34
+                    mstore(add($locals, 32), $t34)
+                    // $t35 := borrow_local($t0)
+                    $t35 := $MakePtr(false, add($locals, 56))
+                    // $t36 := Table::contains<u64, u128>($t33, $t35)
+                    $t36 := A2_Table_contains$u64_u128$($t33, $t35)
+                    // $t37 := !($t36)
+                    $t37 := $LogicalNot($t36)
+                    // if ($t37) goto L1 else goto L0
+                    switch $t37
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t39 := borrow_local($t31)
+                    $t39 := $MakePtr(false, $locals)
+                    // $t40 := 42
+                    $t40 := 42
+                    // $t21 := $t40
+                    mstore(add($locals, 64), $t40)
+                    // $t41 := borrow_local($t21)
+                    $t41 := $MakePtr(false, add($locals, 88))
+                    // $t42 := 1012
+                    $t42 := 1012
+                    // Table::insert<u64, u128>($t39, $t41, $t42)
+                    A2_Table_insert$u64_u128$($t39, $t41, $t42)
+                    // $t43 := borrow_local($t31)
+                    $t43 := $MakePtr(false, $locals)
+                    // $t44 := 42
+                    $t44 := 42
+                    // $t25 := $t44
+                    mstore(add($locals, 96), $t44)
+                    // $t45 := borrow_local($t25)
+                    $t45 := $MakePtr(false, add($locals, 120))
+                    // $t46 := Table::contains<u64, u128>($t43, $t45)
+                    $t46 := A2_Table_contains$u64_u128$($t43, $t45)
+                    // if ($t46) goto L4 else goto L3
+                    switch $t46
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t47 := 101
+                    $t47 := 101
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 8 {
+                    // label L5
+                    // $t48 := borrow_local($t31)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t27 := $t49
+                    mstore(add($locals, 128), $t49)
+                    // $t50 := borrow_local($t27)
+                    $t50 := $MakePtr(false, add($locals, 152))
+                    // $t51 := Table::contains<u64, u128>($t48, $t50)
+                    $t51 := A2_Table_contains$u64_u128$($t48, $t50)
+                    // $t52 := !($t51)
+                    $t52 := $LogicalNot($t51)
+                    // if ($t52) goto L7 else goto L6
+                    switch $t52
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t53 := 102
+                    $t53 := 102
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 11 {
+                    // label L8
+                    // $t54 := borrow_local($t31)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 42
+                    $t55 := 42
+                    // $t29 := $t55
+                    mstore(add($locals, 160), $t55)
+                    // $t56 := borrow_local($t29)
+                    $t56 := $MakePtr(false, add($locals, 184))
+                    // $t57 := Table::borrow<u64, u128>($t54, $t56)
+                    $t57 := A2_Table_borrow$u64_u128$($t54, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU128($t57)
+                    // $t59 := 1012
+                    $t59 := 1012
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L10 else goto L9
+                    switch $t60
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t61 := 103
+                    $t61 := 103
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 14 {
+                    // label L11
+                    // $t62 := borrow_local($t31)
+                    $t62 := $MakePtr(false, $locals)
+                    // $t63 := 43
+                    $t63 := 43
+                    // $t2 := $t63
+                    mstore(add($locals, 192), $t63)
+                    // $t64 := borrow_local($t2)
+                    $t64 := $MakePtr(false, add($locals, 216))
+                    // $t65 := 1013
+                    $t65 := 1013
+                    // Table::insert<u64, u128>($t62, $t64, $t65)
+                    A2_Table_insert$u64_u128$($t62, $t64, $t65)
+                    // $t66 := borrow_local($t31)
+                    $t66 := $MakePtr(false, $locals)
+                    // $t67 := 42
+                    $t67 := 42
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 248))
+                    // $t69 := Table::contains<u64, u128>($t66, $t68)
+                    $t69 := A2_Table_contains$u64_u128$($t66, $t68)
+                    // if ($t69) goto L13 else goto L12
+                    switch $t69
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t70 := 104
+                    $t70 := 104
+                    // abort($t70)
+                    $Abort($t70)
+                }
+                case 17 {
+                    // label L14
+                    // $t71 := borrow_local($t31)
+                    $t71 := $MakePtr(false, $locals)
+                    // $t72 := 0
+                    $t72 := 0
+                    // $t6 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t6)
+                    $t73 := $MakePtr(false, add($locals, 280))
+                    // $t74 := Table::contains<u64, u128>($t71, $t73)
+                    $t74 := A2_Table_contains$u64_u128$($t71, $t73)
+                    // $t75 := !($t74)
+                    $t75 := $LogicalNot($t74)
+                    // if ($t75) goto L16 else goto L15
+                    switch $t75
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
+                }
+                case 20 {
+                    // label L17
+                    // $t77 := borrow_local($t31)
+                    $t77 := $MakePtr(false, $locals)
+                    // $t78 := 43
+                    $t78 := 43
+                    // $t8 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t8)
+                    $t79 := $MakePtr(false, add($locals, 312))
+                    // $t80 := Table::contains<u64, u128>($t77, $t79)
+                    $t80 := A2_Table_contains$u64_u128$($t77, $t79)
+                    // if ($t80) goto L19 else goto L18
+                    switch $t80
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t81 := 106
+                    $t81 := 106
+                    // abort($t81)
+                    $Abort($t81)
+                }
+                case 23 {
+                    // label L20
+                    // $t82 := borrow_local($t31)
+                    $t82 := $MakePtr(false, $locals)
+                    // $t83 := 43
+                    $t83 := 43
+                    // $t10 := $t83
+                    mstore(add($locals, 320), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 344))
+                    // $t85 := Table::borrow<u64, u128>($t82, $t84)
+                    $t85 := A2_Table_borrow$u64_u128$($t82, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU128($t85)
+                    // $t87 := 1013
+                    $t87 := 1013
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 107
+                    $t89 := 107
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // $t90 := borrow_local($t31)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 42
+                    $t91 := 42
+                    // $t13 := $t91
+                    mstore(add($locals, 352), $t91)
+                    // $t92 := borrow_local($t13)
+                    $t92 := $MakePtr(false, add($locals, 376))
+                    // $t93 := Table::remove<u64, u128>($t90, $t92)
+                    $t93 := A2_Table_remove$u64_u128$($t90, $t92)
+                    // $t94 := 1012
+                    $t94 := 1012
+                    // $t95 := ==($t93, $t94)
+                    $t95 := $Eq($t93, $t94)
+                    // if ($t95) goto L25 else goto L24
+                    switch $t95
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t96 := 108
+                    $t96 := 108
+                    // abort($t96)
+                    $Abort($t96)
+                }
+                case 29 {
+                    // label L26
+                    // $t97 := 0x42
+                    $t97 := 0x42
+                    // $t15 := Evm::sign($t97)
+                    mstore(add($locals, 384), A2_Evm_sign($t97))
+                    // $t98 := borrow_local($t15)
+                    $t98 := $MakePtr(false, add($locals, 384))
+                    // $t99 := move($t31)
+                    $t99 := mload($locals)
+                    // $t100 := pack Tables::S<u64, u128>($t99)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t99)
+                        $t100 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t100, $t98)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t98))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t100
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t101 := 0x42
+                    $t101 := 0x42
+                    // $t102 := borrow_global<Tables::S<u64, u128>>($t101)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t101)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t102 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t103 := borrow_field<Tables::S<u64, u128>>.t($t102)
+                    $t103 := $t102
+                    // $t104 := 42
+                    $t104 := 42
+                    // $t16 := $t104
+                    mstore(add($locals, 416), $t104)
+                    // $t105 := borrow_local($t16)
+                    $t105 := $MakePtr(false, add($locals, 440))
+                    // $t106 := Table::contains<u64, u128>($t103, $t105)
+                    $t106 := A2_Table_contains$u64_u128$($t103, $t105)
+                    // $t107 := !($t106)
+                    $t107 := $LogicalNot($t106)
+                    // if ($t107) goto L28 else goto L27
+                    switch $t107
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // destroy($t103)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
+                }
+                case 32 {
+                    // label L29
+                    // $t109 := 43
+                    $t109 := 43
+                    // $t18 := $t109
+                    mstore(add($locals, 448), $t109)
+                    // $t110 := borrow_local($t18)
+                    $t110 := $MakePtr(false, add($locals, 472))
+                    // $t111 := Table::borrow<u64, u128>($t103, $t110)
+                    $t111 := A2_Table_borrow$u64_u128$($t103, $t110)
+                    // $t112 := read_ref($t111)
+                    $t112 := $LoadU128($t111)
+                    // $t113 := 1013
+                    $t113 := 1013
+                    // $t114 := ==($t112, $t113)
+                    $t114 := $Eq($t112, $t113)
+                    // if ($t114) goto L31 else goto L30
+                    switch $t114
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
+                }
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
+                    // $t115 := 110
+                    $t115 := 110
+                    // abort($t115)
+                    $Abort($t115)
+                }
+                case 35 {
+                    // label L32
+                    // $t116 := 0x42
+                    $t116 := 0x42
+                    // $t117 := move_from<Tables::S<u64, u128>>($t116)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t116)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, false)
+                        {
+                            let $src := add($base_offset, 32)
+                            let $dst
+                            $dst := $Malloc(32)
+                            mstore(add($dst, 0), $AlignedStorageLoad(add($src, 0)))
+                            $AlignedStorageStore(add($src, 0), 0)
+                            $t117 := $dst
+                        }
+                    }
+                    // $t30 := unpack Tables::S<u64, u128>($t117)
+                    mstore(add($locals, 480), $MemoryLoadU256(add($t117, 0)))
+                    $Free($t117, 32)
+                    // $t118 := borrow_local($t30)
+                    $t118 := $MakePtr(false, add($locals, 480))
+                    // $t119 := 43
+                    $t119 := 43
+                    // $t20 := $t119
+                    mstore(add($locals, 512), $t119)
+                    // $t120 := borrow_local($t20)
+                    $t120 := $MakePtr(false, add($locals, 536))
+                    // $t121 := Table::borrow<u64, u128>($t118, $t120)
+                    $t121 := A2_Table_borrow$u64_u128$($t118, $t120)
+                    // $t122 := read_ref($t121)
+                    $t122 := $LoadU128($t121)
+                    // $t123 := 1013
+                    $t123 := 1013
+                    // $t124 := ==($t122, $t123)
+                    $t124 := $Eq($t122, $t123)
+                    // if ($t124) goto L34 else goto L33
+                    switch $t124
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
+                }
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
+                }
+                case 37 {
+                    // label L33
+                    // $t125 := 111
+                    $t125 := 111
+                    // abort($t125)
+                    $Abort($t125)
+                }
+                case 38 {
+                    // label L35
+                    // $t126 := 0x43
+                    $t126 := 0x43
+                    // $t23 := Evm::sign($t126)
+                    mstore(add($locals, 544), A2_Evm_sign($t126))
+                    // $t127 := borrow_local($t23)
+                    $t127 := $MakePtr(false, add($locals, 544))
+                    // $t128 := move($t30)
+                    $t128 := mload(add($locals, 480))
+                    // $t129 := pack Tables::S<u64, u128>($t128)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t128)
+                        $t129 := $mem
+                    }
+                    // move_to<Tables::S<u64, u128>>($t129, $t127)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t127))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t129
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 576)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow$u64_u128$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_remove$u64_u128$(table_ref, key_ref) -> value {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $StorageLoadU128(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_insert$u64_u128$(table_ref, key_ref, value) {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_107084805 := $NewLinkedStorageBase(0x661fc05)
+            $StorageStoreU128($linked_dst_107084805, value)
+            sstore(storage_key, $linked_dst_107084805)
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_primitive: Succeed(Stopped) (used_gas=196448): []
+
+// test of Tables::test_remove_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_remove_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_remove_fail()
+        return (0, 0)
+        function A2_Tables_test_remove_fail() {
+            let tmp_$1, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t3 := Table::empty<u64, Tables::Balance>()
+                    mstore($locals, A2_Table_empty$u64_A2_Tables_Balance$())
+                    // $t4 := borrow_local($t3)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // $t0 := $t5
+                    mstore(add($locals, 32), $t5)
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, add($locals, 56))
+                    // $t7 := Table::remove<u64, Tables::Balance>($t4, $t6)
+                    $t7 := A2_Table_remove$u64_A2_Tables_Balance$($t4, $t6)
+                    // $t8 := unpack Tables::Balance($t7)
+                    $t8 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 32)
+                    // $t9 := U256::zero()
+                    $t9 := A2_U256_zero()
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t2 := Evm::sign($t12)
+                    mstore(add($locals, 64), A2_Evm_sign($t12))
+                    // $t13 := borrow_local($t2)
+                    $t13 := $MakePtr(false, add($locals, 64))
+                    // $t14 := move($t3)
+                    $t14 := mload($locals)
+                    // $t15 := pack Tables::S<u64, Tables::Balance>($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // move_to<Tables::S<u64, Tables::Balance>>($t15, $t13)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x6f98bffd, $LoadU256($t13))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t15
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_U256_zero() -> $result {
+            let $t0
+            // $t0 := 0
+            $t0 := 0
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_Table_remove$u64_A2_Tables_Balance$(table_ref, key_ref) -> value {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $Malloc(32)
+            mstore(add(value, 0), $AlignedStorageLoad(add(linked_src, 0)))
+            $AlignedStorageStore(add(linked_src, 0), 0)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_empty$u64_A2_Tables_Balance$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_remove_fail: Revert(Reverted) (used_gas=24811): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Tables::test_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_struct()
+        return (0, 0)
+        function A2_Tables_test_struct() {
+            let tmp_$2, tmp_$3, tmp_$5, tmp_$6, tmp_$8, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$16, tmp_$17, tmp_$19, tmp_$21, tmp_$24, entry_mut_ref, global_t, val_1, val_2, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103
+            let $locals := $Malloc(384)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t40 := 101
+                    $t40 := 101
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 4 {
+                    // $t27 := Table::empty<address, Tables::Balance>()
+                    mstore($locals, A2_Table_empty$address_A2_Tables_Balance$())
+                    // $t30 := 3743106036130323098097120681749450326028
+                    $t30 := 3743106036130323098097120681749450326028
+                    // $t31 := 15312706511442230855851857334429569515566
+                    $t31 := 15312706511442230855851857334429569515566
+                    // $t32 := borrow_local($t27)
+                    $t32 := $MakePtr(false, $locals)
+                    // $t33 := 0xab
+                    $t33 := 0xab
+                    // $t0 := $t33
+                    mstore(add($locals, 32), $t33)
+                    // $t34 := borrow_local($t0)
+                    $t34 := $MakePtr(false, add($locals, 32))
+                    // $t35 := pack Tables::Balance($t30)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t30)
+                        $t35 := $mem
+                    }
+                    // Table::insert<address, Tables::Balance>($t32, $t34, $t35)
+                    A2_Table_insert$address_A2_Tables_Balance$($t32, $t34, $t35)
+                    // $t36 := borrow_local($t27)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := 0xab
+                    $t37 := 0xab
+                    // $t18 := $t37
+                    mstore(add($locals, 64), $t37)
+                    // $t38 := borrow_local($t18)
+                    $t38 := $MakePtr(false, add($locals, 64))
+                    // $t39 := Table::contains<address, Tables::Balance>($t36, $t38)
+                    $t39 := A2_Table_contains$address_A2_Tables_Balance$($t36, $t38)
+                    // if ($t39) goto L1 else goto L0
+                    switch $t39
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t41 := borrow_local($t27)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 0xab
+                    $t42 := 0xab
+                    // $t20 := $t42
+                    mstore(add($locals, 96), $t42)
+                    // $t43 := borrow_local($t20)
+                    $t43 := $MakePtr(false, add($locals, 96))
+                    // $t44 := Table::borrow<address, Tables::Balance>($t41, $t43)
+                    $t44 := A2_Table_borrow$address_A2_Tables_Balance$($t41, $t43)
+                    // $t45 := borrow_field<Tables::Balance>.value($t44)
+                    $t45 := $t44
+                    // $t46 := read_ref($t45)
+                    $t46 := $LoadU256($t45)
+                    // $t47 := ==($t46, $t30)
+                    $t47 := $Eq($t46, $t30)
+                    // if ($t47) goto L4 else goto L3
+                    switch $t47
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t48 := 102
+                    $t48 := 102
+                    // abort($t48)
+                    $Abort($t48)
+                }
+                case 8 {
+                    // label L5
+                    // $t49 := 0x42
+                    $t49 := 0x42
+                    // $t22 := Evm::sign($t49)
+                    mstore(add($locals, 128), A2_Evm_sign($t49))
+                    // $t50 := borrow_local($t22)
+                    $t50 := $MakePtr(false, add($locals, 128))
+                    // $t51 := move($t27)
+                    $t51 := mload($locals)
+                    // $t52 := pack Tables::S<address, Tables::Balance>($t51)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t51)
+                        $t52 := $mem
+                    }
+                    // move_to<Tables::S<address, Tables::Balance>>($t52, $t50)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $LoadU256($t50))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t52
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t53 := 0x42
+                    $t53 := 0x42
+                    // $t54 := borrow_global<Tables::S<address, Tables::Balance>>($t53)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $t53)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t54 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t55 := borrow_field<Tables::S<address, Tables::Balance>>.t($t54)
+                    $t55 := $t54
+                    // $t56 := 0xcd
+                    $t56 := 0xcd
+                    // $t23 := $t56
+                    mstore(add($locals, 160), $t56)
+                    // $t57 := borrow_local($t23)
+                    $t57 := $MakePtr(false, add($locals, 160))
+                    // $t58 := pack Tables::Balance($t31)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t31)
+                        $t58 := $mem
+                    }
+                    // Table::insert<address, Tables::Balance>($t55, $t57, $t58)
+                    A2_Table_insert$address_A2_Tables_Balance$($t55, $t57, $t58)
+                    // $t59 := 0xab
+                    $t59 := 0xab
+                    // $t1 := $t59
+                    mstore(add($locals, 192), $t59)
+                    // $t60 := borrow_local($t1)
+                    $t60 := $MakePtr(false, add($locals, 192))
+                    // $t61 := freeze_ref($t55)
+                    $t61 := $t55
+                    // $t62 := Table::borrow<address, Tables::Balance>($t61, $t60)
+                    $t62 := A2_Table_borrow$address_A2_Tables_Balance$($t61, $t60)
+                    // $t63 := borrow_field<Tables::Balance>.value($t62)
+                    $t63 := $t62
+                    // $t64 := read_ref($t63)
+                    $t64 := $LoadU256($t63)
+                    // $t65 := ==($t64, $t30)
+                    $t65 := $Eq($t64, $t30)
+                    // if ($t65) goto L7 else goto L6
+                    switch $t65
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // destroy($t55)
+                    // $t66 := 103
+                    $t66 := 103
+                    // abort($t66)
+                    $Abort($t66)
+                }
+                case 11 {
+                    // label L8
+                    // $t67 := 0xcd
+                    $t67 := 0xcd
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 224))
+                    // $t69 := freeze_ref($t55)
+                    $t69 := $t55
+                    // $t70 := Table::borrow<address, Tables::Balance>($t69, $t68)
+                    $t70 := A2_Table_borrow$address_A2_Tables_Balance$($t69, $t68)
+                    // $t71 := borrow_field<Tables::Balance>.value($t70)
+                    $t71 := $t70
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU256($t71)
+                    // $t73 := ==($t72, $t31)
+                    $t73 := $Eq($t72, $t31)
+                    // if ($t73) goto L10 else goto L9
+                    switch $t73
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // destroy($t55)
+                    // $t74 := 104
+                    $t74 := 104
+                    // abort($t74)
+                    $Abort($t74)
+                }
+                case 14 {
+                    // label L11
+                    // $t75 := 0xcd
+                    $t75 := 0xcd
+                    // $t7 := $t75
+                    mstore(add($locals, 256), $t75)
+                    // $t76 := borrow_local($t7)
+                    $t76 := $MakePtr(false, add($locals, 256))
+                    // $t77 := Table::borrow_mut<address, Tables::Balance>($t55, $t76)
+                    $t77 := A2_Table_borrow_mut$address_A2_Tables_Balance$($t55, $t76)
+                    // $t78 := borrow_field<Tables::Balance>.value($t77)
+                    $t78 := $t77
+                    // $t79 := read_ref($t78)
+                    $t79 := $LoadU256($t78)
+                    // $t80 := U256::one()
+                    $t80 := A2_U256_one()
+                    // $t81 := -($t79, $t80)
+                    $t81 := $Sub($t79, $t80)
+                    // $t82 := borrow_field<Tables::Balance>.value($t77)
+                    $t82 := $t77
+                    // write_ref($t82, $t81)
+                    $StoreU256($t82, $t81)
+                    // $t83 := 0xcd
+                    $t83 := 0xcd
+                    // $t10 := $t83
+                    mstore(add($locals, 288), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 288))
+                    // $t85 := freeze_ref($t55)
+                    $t85 := $t55
+                    // $t86 := Table::borrow<address, Tables::Balance>($t85, $t84)
+                    $t86 := A2_Table_borrow$address_A2_Tables_Balance$($t85, $t84)
+                    // $t87 := borrow_field<Tables::Balance>.value($t86)
+                    $t87 := $t86
+                    // $t88 := read_ref($t87)
+                    $t88 := $LoadU256($t87)
+                    // $t89 := 15312706511442230855851857334429569515565
+                    $t89 := 15312706511442230855851857334429569515565
+                    // $t90 := ==($t88, $t89)
+                    $t90 := $Eq($t88, $t89)
+                    // if ($t90) goto L13 else goto L12
+                    switch $t90
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // destroy($t55)
+                    // $t91 := 105
+                    $t91 := 105
+                    // abort($t91)
+                    $Abort($t91)
+                }
+                case 17 {
+                    // label L14
+                    // $t92 := 0xab
+                    $t92 := 0xab
+                    // $t13 := $t92
+                    mstore(add($locals, 320), $t92)
+                    // $t93 := borrow_local($t13)
+                    $t93 := $MakePtr(false, add($locals, 320))
+                    // $t94 := Table::remove<address, Tables::Balance>($t55, $t93)
+                    $t94 := A2_Table_remove$address_A2_Tables_Balance$($t55, $t93)
+                    // $t95 := unpack Tables::Balance($t94)
+                    $t95 := $MemoryLoadU256(add($t94, 0))
+                    $Free($t94, 32)
+                    // $t96 := ==($t95, $t30)
+                    $t96 := $Eq($t95, $t30)
+                    // if ($t96) goto L16 else goto L15
+                    switch $t96
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // destroy($t55)
+                    // $t97 := 106
+                    $t97 := 106
+                    // abort($t97)
+                    $Abort($t97)
+                }
+                case 20 {
+                    // label L17
+                    // $t98 := 0xab
+                    $t98 := 0xab
+                    // $t15 := $t98
+                    mstore(add($locals, 352), $t98)
+                    // $t99 := borrow_local($t15)
+                    $t99 := $MakePtr(false, add($locals, 352))
+                    // $t100 := freeze_ref($t55)
+                    $t100 := $t55
+                    // $t101 := Table::contains<address, Tables::Balance>($t100, $t99)
+                    $t101 := A2_Table_contains$address_A2_Tables_Balance$($t100, $t99)
+                    // $t102 := !($t101)
+                    $t102 := $LogicalNot($t101)
+                    // if ($t102) goto L19 else goto L18
+                    switch $t102
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t103 := 107
+                    $t103 := 107
+                    // abort($t103)
+                    $Abort($t103)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 384)
+                    leave
+                }
+            }
+        }
+
+        function A2_Table_contains$address_A2_Tables_Balance$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_remove$address_A2_Tables_Balance$(table_ref, key_ref) -> value {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $Malloc(32)
+            mstore(add(value, 0), $AlignedStorageLoad(add(linked_src, 0)))
+            $AlignedStorageStore(add(linked_src, 0), 0)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow$address_A2_Tables_Balance$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_U256_one() -> $result {
+            let $t0
+            // $t0 := 1
+            $t0 := 1
+            // return $t0
+            $result := $t0
+        }
+
+        function A2_Table_borrow_mut$address_A2_Tables_Balance$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_insert$address_A2_Tables_Balance$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2739064938 := $NewLinkedStorageBase(0xa342d06a)
+            $AlignedStorageStore(add($linked_dst_2739064938, 0), mload(add(value, 0)))
+            $Free(value, 32)
+            sstore(storage_key, $linked_dst_2739064938)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_empty$address_A2_Tables_Balance$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Sub(x, y) -> r {
+            if lt(x, y) { $AbortBuiltin() }
+            r := sub(x, y)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_struct: Succeed(Stopped) (used_gas=153416): []
+
+// test of Tables::test_table_of_tables
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_table_of_tables" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_table_of_tables()
+        return (0, 0)
+        function A2_Tables_test_table_of_tables() {
+            let tmp_$2, tmp_$3, tmp_$6, tmp_$7, tmp_$10, tmp_$11, tmp_$12, tmp_$15, tmp_$16, tmp_$19, tmp_$20, tmp_$24, tmp_$25, tmp_$28, tmp_$29, tmp_$32, tmp_$33, tmp_$34, tmp_$37, tmp_$38, tmp_$41, tmp_$43, val_1, val_2, val_3, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129, $t130, $t131, $t132, $t133, $t134, $t135, $t136, $t137, $t138, $t139, $t140, $t141, $t142, $t143, $t144, $t145, $t146, $t147, $t148, $t149, $t150, $t151
+            let $locals := $Malloc(832)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t75 := 101
+                    $t75 := 101
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 4 {
+                    // $t45 := Table::empty<address, Table::Table<address, U256::U256>>()
+                    mstore(add($locals, 128), A2_Table_empty$address_A2_Table_Table$address_A2_U256_U256$$())
+                    // $t51 := 3743106036130323098097120681749450326028
+                    $t51 := 3743106036130323098097120681749450326028
+                    // $t52 := 15312706511442230855851857334429569515566
+                    $t52 := 15312706511442230855851857334429569515566
+                    // $t53 := 26542024619833200150143219379677920493647
+                    $t53 := 26542024619833200150143219379677920493647
+                    // $t46 := Table::empty<address, U256::U256>()
+                    mstore($locals, A2_Table_empty$address_A2_U256_U256$())
+                    // $t54 := borrow_local($t46)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 0xab
+                    $t55 := 0xab
+                    // $t0 := $t55
+                    mstore(add($locals, 32), $t55)
+                    // $t56 := borrow_local($t0)
+                    $t56 := $MakePtr(false, add($locals, 32))
+                    // Table::insert<address, U256::U256>($t54, $t56, $t51)
+                    A2_Table_insert$address_A2_U256_U256$($t54, $t56, $t51)
+                    // $t47 := Table::empty<address, U256::U256>()
+                    mstore(add($locals, 64), A2_Table_empty$address_A2_U256_U256$())
+                    // $t57 := borrow_local($t47)
+                    $t57 := $MakePtr(false, add($locals, 64))
+                    // $t58 := 0xcd
+                    $t58 := 0xcd
+                    // $t22 := $t58
+                    mstore(add($locals, 96), $t58)
+                    // $t59 := borrow_local($t22)
+                    $t59 := $MakePtr(false, add($locals, 96))
+                    // Table::insert<address, U256::U256>($t57, $t59, $t52)
+                    A2_Table_insert$address_A2_U256_U256$($t57, $t59, $t52)
+                    // $t60 := borrow_local($t45)
+                    $t60 := $MakePtr(false, add($locals, 128))
+                    // $t61 := 0x12
+                    $t61 := 0x12
+                    // $t40 := $t61
+                    mstore(add($locals, 160), $t61)
+                    // $t62 := borrow_local($t40)
+                    $t62 := $MakePtr(false, add($locals, 160))
+                    // $t63 := move($t46)
+                    $t63 := mload($locals)
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t60, $t62, $t63)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t60, $t62, $t63)
+                    // $t64 := borrow_local($t45)
+                    $t64 := $MakePtr(false, add($locals, 128))
+                    // $t65 := 0x34
+                    $t65 := 0x34
+                    // $t42 := $t65
+                    mstore(add($locals, 192), $t65)
+                    // $t66 := borrow_local($t42)
+                    $t66 := $MakePtr(false, add($locals, 192))
+                    // $t67 := move($t47)
+                    $t67 := mload(add($locals, 64))
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t64, $t66, $t67)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t64, $t66, $t67)
+                    // $t68 := borrow_local($t45)
+                    $t68 := $MakePtr(false, add($locals, 128))
+                    // $t69 := 0x12
+                    $t69 := 0x12
+                    // $t1 := $t69
+                    mstore(add($locals, 224), $t69)
+                    // $t70 := borrow_local($t1)
+                    $t70 := $MakePtr(false, add($locals, 224))
+                    // $t71 := Table::borrow<address, Table::Table<address, U256::U256>>($t68, $t70)
+                    $t71 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t68, $t70)
+                    // $t72 := 0xab
+                    $t72 := 0xab
+                    // $t44 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t44)
+                    $t73 := $MakePtr(false, add($locals, 256))
+                    // $t74 := Table::contains<address, U256::U256>($t71, $t73)
+                    $t74 := A2_Table_contains$address_A2_U256_U256$($t71, $t73)
+                    // if ($t74) goto L1 else goto L0
+                    switch $t74
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t76 := borrow_local($t45)
+                    $t76 := $MakePtr(false, add($locals, 128))
+                    // $t77 := 0x34
+                    $t77 := 0x34
+                    // $t5 := $t77
+                    mstore(add($locals, 288), $t77)
+                    // $t78 := borrow_local($t5)
+                    $t78 := $MakePtr(false, add($locals, 288))
+                    // $t79 := Table::borrow<address, Table::Table<address, U256::U256>>($t76, $t78)
+                    $t79 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t76, $t78)
+                    // $t80 := 0xcd
+                    $t80 := 0xcd
+                    // $t4 := $t80
+                    mstore(add($locals, 320), $t80)
+                    // $t81 := borrow_local($t4)
+                    $t81 := $MakePtr(false, add($locals, 320))
+                    // $t82 := Table::contains<address, U256::U256>($t79, $t81)
+                    $t82 := A2_Table_contains$address_A2_U256_U256$($t79, $t81)
+                    // if ($t82) goto L4 else goto L3
+                    switch $t82
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t83 := 102
+                    $t83 := 102
+                    // abort($t83)
+                    $Abort($t83)
+                }
+                case 8 {
+                    // label L5
+                    // $t84 := borrow_local($t45)
+                    $t84 := $MakePtr(false, add($locals, 128))
+                    // $t85 := 0x12
+                    $t85 := 0x12
+                    // $t9 := $t85
+                    mstore(add($locals, 352), $t85)
+                    // $t86 := borrow_local($t9)
+                    $t86 := $MakePtr(false, add($locals, 352))
+                    // $t87 := Table::borrow<address, Table::Table<address, U256::U256>>($t84, $t86)
+                    $t87 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t84, $t86)
+                    // $t88 := 0xab
+                    $t88 := 0xab
+                    // $t8 := $t88
+                    mstore(add($locals, 384), $t88)
+                    // $t89 := borrow_local($t8)
+                    $t89 := $MakePtr(false, add($locals, 384))
+                    // $t90 := Table::borrow<address, U256::U256>($t87, $t89)
+                    $t90 := A2_Table_borrow$address_A2_U256_U256$($t87, $t89)
+                    // $t91 := read_ref($t90)
+                    $t91 := $LoadU256($t90)
+                    // $t92 := ==($t91, $t51)
+                    $t92 := $Eq($t91, $t51)
+                    // if ($t92) goto L7 else goto L6
+                    switch $t92
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t93 := 103
+                    $t93 := 103
+                    // abort($t93)
+                    $Abort($t93)
+                }
+                case 11 {
+                    // label L8
+                    // $t94 := borrow_local($t45)
+                    $t94 := $MakePtr(false, add($locals, 128))
+                    // $t95 := 0x34
+                    $t95 := 0x34
+                    // $t14 := $t95
+                    mstore(add($locals, 416), $t95)
+                    // $t96 := borrow_local($t14)
+                    $t96 := $MakePtr(false, add($locals, 416))
+                    // $t97 := Table::borrow<address, Table::Table<address, U256::U256>>($t94, $t96)
+                    $t97 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t94, $t96)
+                    // $t98 := 0xcd
+                    $t98 := 0xcd
+                    // $t13 := $t98
+                    mstore(add($locals, 448), $t98)
+                    // $t99 := borrow_local($t13)
+                    $t99 := $MakePtr(false, add($locals, 448))
+                    // $t100 := Table::borrow<address, U256::U256>($t97, $t99)
+                    $t100 := A2_Table_borrow$address_A2_U256_U256$($t97, $t99)
+                    // $t101 := read_ref($t100)
+                    $t101 := $LoadU256($t100)
+                    // $t102 := ==($t101, $t52)
+                    $t102 := $Eq($t101, $t52)
+                    // if ($t102) goto L10 else goto L9
+                    switch $t102
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t103 := 104
+                    $t103 := 104
+                    // abort($t103)
+                    $Abort($t103)
+                }
+                case 14 {
+                    // label L11
+                    // $t104 := borrow_local($t45)
+                    $t104 := $MakePtr(false, add($locals, 128))
+                    // $t105 := 0x12
+                    $t105 := 0x12
+                    // $t18 := $t105
+                    mstore(add($locals, 480), $t105)
+                    // $t106 := borrow_local($t18)
+                    $t106 := $MakePtr(false, add($locals, 480))
+                    // $t107 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t104, $t106)
+                    $t107 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t104, $t106)
+                    // $t108 := 0xef
+                    $t108 := 0xef
+                    // $t17 := $t108
+                    mstore(add($locals, 512), $t108)
+                    // $t109 := borrow_local($t17)
+                    $t109 := $MakePtr(false, add($locals, 512))
+                    // Table::insert<address, U256::U256>($t107, $t109, $t53)
+                    A2_Table_insert$address_A2_U256_U256$($t107, $t109, $t53)
+                    // $t110 := borrow_local($t45)
+                    $t110 := $MakePtr(false, add($locals, 128))
+                    // $t111 := 0x12
+                    $t111 := 0x12
+                    // $t23 := $t111
+                    mstore(add($locals, 544), $t111)
+                    // $t112 := borrow_local($t23)
+                    $t112 := $MakePtr(false, add($locals, 544))
+                    // $t113 := Table::borrow<address, Table::Table<address, U256::U256>>($t110, $t112)
+                    $t113 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t110, $t112)
+                    // $t114 := 0xef
+                    $t114 := 0xef
+                    // $t21 := $t114
+                    mstore(add($locals, 576), $t114)
+                    // $t115 := borrow_local($t21)
+                    $t115 := $MakePtr(false, add($locals, 576))
+                    // $t116 := Table::borrow<address, U256::U256>($t113, $t115)
+                    $t116 := A2_Table_borrow$address_A2_U256_U256$($t113, $t115)
+                    // $t117 := read_ref($t116)
+                    $t117 := $LoadU256($t116)
+                    // $t118 := ==($t117, $t53)
+                    $t118 := $Eq($t117, $t53)
+                    // if ($t118) goto L13 else goto L12
+                    switch $t118
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t119 := 105
+                    $t119 := 105
+                    // abort($t119)
+                    $Abort($t119)
+                }
+                case 17 {
+                    // label L14
+                    // $t120 := borrow_local($t45)
+                    $t120 := $MakePtr(false, add($locals, 128))
+                    // $t121 := 0x12
+                    $t121 := 0x12
+                    // $t27 := $t121
+                    mstore(add($locals, 608), $t121)
+                    // $t122 := borrow_local($t27)
+                    $t122 := $MakePtr(false, add($locals, 608))
+                    // $t123 := Table::borrow<address, Table::Table<address, U256::U256>>($t120, $t122)
+                    $t123 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t120, $t122)
+                    // $t124 := 0xab
+                    $t124 := 0xab
+                    // $t26 := $t124
+                    mstore(add($locals, 640), $t124)
+                    // $t125 := borrow_local($t26)
+                    $t125 := $MakePtr(false, add($locals, 640))
+                    // $t126 := Table::borrow<address, U256::U256>($t123, $t125)
+                    $t126 := A2_Table_borrow$address_A2_U256_U256$($t123, $t125)
+                    // $t127 := read_ref($t126)
+                    $t127 := $LoadU256($t126)
+                    // $t128 := ==($t127, $t51)
+                    $t128 := $Eq($t127, $t51)
+                    // if ($t128) goto L16 else goto L15
+                    switch $t128
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t129 := 106
+                    $t129 := 106
+                    // abort($t129)
+                    $Abort($t129)
+                }
+                case 20 {
+                    // label L17
+                    // $t130 := borrow_local($t45)
+                    $t130 := $MakePtr(false, add($locals, 128))
+                    // $t131 := 0x34
+                    $t131 := 0x34
+                    // $t31 := $t131
+                    mstore(add($locals, 672), $t131)
+                    // $t132 := borrow_local($t31)
+                    $t132 := $MakePtr(false, add($locals, 672))
+                    // $t133 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t130, $t132)
+                    $t133 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t130, $t132)
+                    // $t134 := 0xcd
+                    $t134 := 0xcd
+                    // $t30 := $t134
+                    mstore(add($locals, 704), $t134)
+                    // $t135 := borrow_local($t30)
+                    $t135 := $MakePtr(false, add($locals, 704))
+                    // $t136 := Table::remove<address, U256::U256>($t133, $t135)
+                    $t136 := A2_Table_remove$address_A2_U256_U256$($t133, $t135)
+                    // $t137 := ==($t136, $t52)
+                    $t137 := $Eq($t136, $t52)
+                    // if ($t137) goto L19 else goto L18
+                    switch $t137
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t138 := 107
+                    $t138 := 107
+                    // abort($t138)
+                    $Abort($t138)
+                }
+                case 23 {
+                    // label L20
+                    // $t139 := borrow_local($t45)
+                    $t139 := $MakePtr(false, add($locals, 128))
+                    // $t140 := 0x34
+                    $t140 := 0x34
+                    // $t36 := $t140
+                    mstore(add($locals, 736), $t140)
+                    // $t141 := borrow_local($t36)
+                    $t141 := $MakePtr(false, add($locals, 736))
+                    // $t142 := Table::borrow<address, Table::Table<address, U256::U256>>($t139, $t141)
+                    $t142 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t139, $t141)
+                    // $t143 := 0xcd
+                    $t143 := 0xcd
+                    // $t35 := $t143
+                    mstore(add($locals, 768), $t143)
+                    // $t144 := borrow_local($t35)
+                    $t144 := $MakePtr(false, add($locals, 768))
+                    // $t145 := Table::contains<address, U256::U256>($t142, $t144)
+                    $t145 := A2_Table_contains$address_A2_U256_U256$($t142, $t144)
+                    // $t146 := !($t145)
+                    $t146 := $LogicalNot($t145)
+                    // if ($t146) goto L22 else goto L21
+                    switch $t146
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t147 := 108
+                    $t147 := 108
+                    // abort($t147)
+                    $Abort($t147)
+                }
+                case 26 {
+                    // label L23
+                    // $t148 := 0x42
+                    $t148 := 0x42
+                    // $t39 := Evm::sign($t148)
+                    mstore(add($locals, 800), A2_Evm_sign($t148))
+                    // $t149 := borrow_local($t39)
+                    $t149 := $MakePtr(false, add($locals, 800))
+                    // $t150 := move($t45)
+                    $t150 := mload(add($locals, 128))
+                    // $t151 := pack Tables::S<address, Table::Table<address, U256::U256>>($t150)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t150)
+                        $t151 := $mem
+                    }
+                    // move_to<Tables::S<address, Table::Table<address, U256::U256>>>($t151, $t149)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xc5110c9a, $LoadU256($t149))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t151
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 832)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_contains$address_A2_U256_U256$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_remove$address_A2_U256_U256$(table_ref, key_ref) -> value {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            value := $StorageLoadU256(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_borrow$address_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_insert$address_A2_U256_U256$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2934085429 := $NewLinkedStorageBase(0xaee29735)
+            $StorageStoreU256($linked_dst_2934085429, value)
+            sstore(storage_key, $linked_dst_2934085429)
+        }
+        function A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_3228464714 := $NewLinkedStorageBase(0xc06e764a)
+            $StorageStoreU256($linked_dst_3228464714, value)
+            sstore(storage_key, $linked_dst_3228464714)
+        }
+        function A2_Table_empty$address_A2_U256_U256$() -> table {
+            table := $NewTableHandle()
+        }
+        function A2_Table_empty$address_A2_Table_Table$address_A2_U256_U256$$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_table_of_tables: Succeed(Stopped) (used_gas=292670): []
+
+// test of Tables::test_u256
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_u256" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_u256()
+        return (0, 0)
+        function A2_Tables_test_u256() {
+            let entry_mut_ref, val_1, val_2, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := Table::empty<U256::U256, U256::U256>()
+                    mstore($locals, A2_Table_empty$A2_U256_U256_A2_U256_U256$())
+                    // $t6 := 26542024619833200150143219379677920493647
+                    $t6 := 26542024619833200150143219379677920493647
+                    // $t2 := $t6
+                    mstore(add($locals, 32), $t6)
+                    // $t7 := 3743106036130323098097120681749450326028
+                    $t7 := 3743106036130323098097120681749450326028
+                    // $t8 := 15312706511442230855851857334429569515566
+                    $t8 := 15312706511442230855851857334429569515566
+                    // $t9 := borrow_local($t3)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // Table::insert<U256::U256, U256::U256>($t9, $t10, $t7)
+                    A2_Table_insert$A2_U256_U256_A2_U256_U256$($t9, $t10, $t7)
+                    // $t11 := borrow_local($t3)
+                    $t11 := $MakePtr(false, $locals)
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := Table::contains<U256::U256, U256::U256>($t11, $t12)
+                    $t13 := A2_Table_contains$A2_U256_U256_A2_U256_U256$($t11, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := borrow_local($t3)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := borrow_local($t2)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := Table::borrow<U256::U256, U256::U256>($t15, $t16)
+                    $t17 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU256($t17)
+                    // $t19 := 3743106036130323098097120681749450326028
+                    $t19 := 3743106036130323098097120681749450326028
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 102
+                    $t21 := 102
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t3)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := borrow_local($t2)
+                    $t23 := $MakePtr(false, add($locals, 32))
+                    // $t24 := Table::borrow_mut<U256::U256, U256::U256>($t22, $t23)
+                    $t24 := A2_Table_borrow_mut$A2_U256_U256_A2_U256_U256$($t22, $t23)
+                    // write_ref($t24, $t8)
+                    $StoreU256($t24, $t8)
+                    // $t25 := borrow_local($t3)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := borrow_local($t2)
+                    $t26 := $MakePtr(false, add($locals, 32))
+                    // $t27 := Table::borrow<U256::U256, U256::U256>($t25, $t26)
+                    $t27 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t25, $t26)
+                    // $t28 := read_ref($t27)
+                    $t28 := $LoadU256($t27)
+                    // $t29 := ==($t28, $t8)
+                    $t29 := $Eq($t28, $t8)
+                    // if ($t29) goto L7 else goto L6
+                    switch $t29
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t30 := 103
+                    $t30 := 103
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 11 {
+                    // label L8
+                    // $t31 := 0x42
+                    $t31 := 0x42
+                    // $t0 := Evm::sign($t31)
+                    mstore(add($locals, 64), A2_Evm_sign($t31))
+                    // $t32 := borrow_local($t0)
+                    $t32 := $MakePtr(false, add($locals, 64))
+                    // $t33 := move($t3)
+                    $t33 := mload($locals)
+                    // $t34 := pack Tables::S<U256::U256, U256::U256>($t33)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t33)
+                        $t34 := $mem
+                    }
+                    // move_to<Tables::S<U256::U256, U256::U256>>($t34, $t32)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa20c17a3, $LoadU256($t32))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t34
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_borrow$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_borrow_mut$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Table_contains$A2_U256_U256_A2_U256_U256$(table_ref, key_ref) -> res {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_insert$A2_U256_U256_A2_U256_U256$(table_ref, key_ref, value) {
+            let key := $LoadU256(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_2934085429 := $NewLinkedStorageBase(0xaee29735)
+            $StorageStoreU256($linked_dst_2934085429, value)
+            sstore(storage_key, $linked_dst_2934085429)
+        }
+        function A2_Table_empty$A2_U256_U256_A2_U256_U256$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Tables::test_u256: Succeed(Stopped) (used_gas=137855): []
+
+// test of Tables::test_vector
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Tables_test_vector" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Tables_test_vector()
+        return (0, 0)
+        function A2_Tables_test_vector() {
+            let tmp_$1, tmp_$4, tmp_$6, tmp_$8, tmp_$10, tmp_$11, tmp_$13, tmp_$15, tmp_$17, tmp_$19, s, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114
+            let $locals := $Malloc(416)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t33 := 101
+                    $t33 := 101
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 4 {
+                    // $t22 := Table::empty<u8, vector<address>>()
+                    mstore($locals, A2_Table_empty$u8_vec$address$$())
+                    // $t24 := borrow_local($t22)
+                    $t24 := $MakePtr(false, $locals)
+                    // $t25 := 42
+                    $t25 := 42
+                    // $t0 := $t25
+                    mstore(add($locals, 32), $t25)
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, add($locals, 63))
+                    // $t27 := 0x1012
+                    $t27 := 0x1012
+                    // $t28 := vector::singleton<address>($t27)
+                    $t28 := A1_vector_singleton$address$($t27)
+                    // Table::insert<u8, vector<address>>($t24, $t26, $t28)
+                    A2_Table_insert$u8_vec$address$$($t24, $t26, $t28)
+                    // $t29 := borrow_local($t22)
+                    $t29 := $MakePtr(false, $locals)
+                    // $t30 := 42
+                    $t30 := 42
+                    // $t14 := $t30
+                    mstore(add($locals, 64), $t30)
+                    // $t31 := borrow_local($t14)
+                    $t31 := $MakePtr(false, add($locals, 95))
+                    // $t32 := Table::contains<u8, vector<address>>($t29, $t31)
+                    $t32 := A2_Table_contains$u8_vec$address$$($t29, $t31)
+                    // if ($t32) goto L1 else goto L0
+                    switch $t32
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t34 := borrow_local($t22)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := 0
+                    $t35 := 0
+                    // $t16 := $t35
+                    mstore(add($locals, 96), $t35)
+                    // $t36 := borrow_local($t16)
+                    $t36 := $MakePtr(false, add($locals, 127))
+                    // $t37 := Table::contains<u8, vector<address>>($t34, $t36)
+                    $t37 := A2_Table_contains$u8_vec$address$$($t34, $t36)
+                    // $t38 := !($t37)
+                    $t38 := $LogicalNot($t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t39 := 102
+                    $t39 := 102
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 8 {
+                    // label L5
+                    // $t40 := borrow_local($t22)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := 42
+                    $t41 := 42
+                    // $t18 := $t41
+                    mstore(add($locals, 128), $t41)
+                    // $t42 := borrow_local($t18)
+                    $t42 := $MakePtr(false, add($locals, 159))
+                    // $t43 := Table::borrow<u8, vector<address>>($t40, $t42)
+                    $t43 := A2_Table_borrow$u8_vec$address$$($t40, $t42)
+                    // $t44 := vector::length<address>($t43)
+                    $t44 := A1_vector_length$address$($t43)
+                    // $t45 := 1
+                    $t45 := 1
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L7 else goto L6
+                    switch $t46
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t47 := 103
+                    $t47 := 103
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 11 {
+                    // label L8
+                    // $t48 := borrow_local($t22)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 42
+                    $t49 := 42
+                    // $t20 := $t49
+                    mstore(add($locals, 160), $t49)
+                    // $t50 := borrow_local($t20)
+                    $t50 := $MakePtr(false, add($locals, 191))
+                    // $t51 := Table::borrow<u8, vector<address>>($t48, $t50)
+                    $t51 := A2_Table_borrow$u8_vec$address$$($t48, $t50)
+                    // $t52 := 0
+                    $t52 := 0
+                    // $t53 := vector::borrow<address>($t51, $t52)
+                    $t53 := A1_vector_borrow$address$($t51, $t52)
+                    // $t54 := read_ref($t53)
+                    $t54 := $LoadU256($t53)
+                    // $t55 := 0x1012
+                    $t55 := 0x1012
+                    // $t56 := ==($t54, $t55)
+                    $t56 := $Eq($t54, $t55)
+                    // if ($t56) goto L10 else goto L9
+                    switch $t56
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t57 := 104
+                    $t57 := 104
+                    // abort($t57)
+                    $Abort($t57)
+                }
+                case 14 {
+                    // label L11
+                    // $t58 := 0x42
+                    $t58 := 0x42
+                    // $t2 := Evm::sign($t58)
+                    mstore(add($locals, 192), A2_Evm_sign($t58))
+                    // $t59 := borrow_local($t2)
+                    $t59 := $MakePtr(false, add($locals, 192))
+                    // $t60 := move($t22)
+                    $t60 := mload($locals)
+                    // $t61 := pack Tables::S<u8, vector<address>>($t60)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t60)
+                        $t61 := $mem
+                    }
+                    // move_to<Tables::S<u8, vector<address>>>($t61, $t59)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $LoadU256($t59))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t61
+                            $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t62 := 0x42
+                    $t62 := 0x42
+                    // $t63 := borrow_global<Tables::S<u8, vector<address>>>($t62)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $t62)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t63 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t64 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t64 := $t63
+                    // $t65 := 42
+                    $t65 := 42
+                    // $t3 := $t65
+                    mstore(add($locals, 224), $t65)
+                    // $t66 := borrow_local($t3)
+                    $t66 := $MakePtr(false, add($locals, 255))
+                    // $t67 := Table::borrow_mut<u8, vector<address>>($t64, $t66)
+                    $t67 := A2_Table_borrow_mut$u8_vec$address$$($t64, $t66)
+                    // $t68 := 0x1013
+                    $t68 := 0x1013
+                    // vector::push_back<address>($t67, $t68)
+                    A1_vector_push_back$address$($t67, $t68)
+                    // $t69 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t69 := $t63
+                    // $t70 := 42
+                    $t70 := 42
+                    // $t5 := $t70
+                    mstore(add($locals, 256), $t70)
+                    // $t71 := borrow_local($t5)
+                    $t71 := $MakePtr(false, add($locals, 287))
+                    // $t72 := Table::borrow<u8, vector<address>>($t69, $t71)
+                    $t72 := A2_Table_borrow$u8_vec$address$$($t69, $t71)
+                    // $t73 := vector::length<address>($t72)
+                    $t73 := A1_vector_length$address$($t72)
+                    // $t74 := 2
+                    $t74 := 2
+                    // $t75 := ==($t73, $t74)
+                    $t75 := $Eq($t73, $t74)
+                    // if ($t75) goto L13 else goto L12
+                    switch $t75
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // destroy($t63)
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
+                }
+                case 17 {
+                    // label L14
+                    // $t77 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t77 := $t63
+                    // $t78 := 42
+                    $t78 := 42
+                    // $t7 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t7)
+                    $t79 := $MakePtr(false, add($locals, 319))
+                    // $t80 := Table::borrow<u8, vector<address>>($t77, $t79)
+                    $t80 := A2_Table_borrow$u8_vec$address$$($t77, $t79)
+                    // $t81 := 1
+                    $t81 := 1
+                    // $t82 := vector::borrow<address>($t80, $t81)
+                    $t82 := A1_vector_borrow$address$($t80, $t81)
+                    // $t83 := read_ref($t82)
+                    $t83 := $LoadU256($t82)
+                    // $t84 := 0x1013
+                    $t84 := 0x1013
+                    // $t85 := ==($t83, $t84)
+                    $t85 := $Eq($t83, $t84)
+                    // if ($t85) goto L16 else goto L15
+                    switch $t85
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // destroy($t63)
+                    // $t86 := 106
+                    $t86 := 106
+                    // abort($t86)
+                    $Abort($t86)
+                }
+                case 20 {
+                    // label L17
+                    // $t87 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t87 := $t63
+                    // $t88 := 42
+                    $t88 := 42
+                    // $t9 := $t88
+                    mstore(add($locals, 320), $t88)
+                    // $t89 := borrow_local($t9)
+                    $t89 := $MakePtr(false, add($locals, 351))
+                    // $t23 := Table::remove<u8, vector<address>>($t87, $t89)
+                    mstore(add($locals, 352), A2_Table_remove$u8_vec$address$$($t87, $t89))
+                    // $t90 := borrow_local($t23)
+                    $t90 := $MakePtr(false, add($locals, 352))
+                    // $t91 := vector::length<address>($t90)
+                    $t91 := A1_vector_length$address$($t90)
+                    // $t92 := 2
+                    $t92 := 2
+                    // $t93 := ==($t91, $t92)
+                    $t93 := $Eq($t91, $t92)
+                    // if ($t93) goto L19 else goto L18
+                    switch $t93
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // destroy($t63)
+                    // $t94 := 107
+                    $t94 := 107
+                    // abort($t94)
+                    $Abort($t94)
+                }
+                case 23 {
+                    // label L20
+                    // $t95 := borrow_local($t23)
+                    $t95 := $MakePtr(false, add($locals, 352))
+                    // $t96 := 0
+                    $t96 := 0
+                    // $t97 := vector::borrow<address>($t95, $t96)
+                    $t97 := A1_vector_borrow$address$($t95, $t96)
+                    // $t98 := read_ref($t97)
+                    $t98 := $LoadU256($t97)
+                    // $t99 := 0x1012
+                    $t99 := 0x1012
+                    // $t100 := ==($t98, $t99)
+                    $t100 := $Eq($t98, $t99)
+                    // if ($t100) goto L22 else goto L21
+                    switch $t100
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // destroy($t63)
+                    // $t101 := 108
+                    $t101 := 108
+                    // abort($t101)
+                    $Abort($t101)
+                }
+                case 26 {
+                    // label L23
+                    // $t102 := borrow_local($t23)
+                    $t102 := $MakePtr(false, add($locals, 352))
+                    // $t103 := 1
+                    $t103 := 1
+                    // $t104 := vector::borrow<address>($t102, $t103)
+                    $t104 := A1_vector_borrow$address$($t102, $t103)
+                    // $t105 := read_ref($t104)
+                    $t105 := $LoadU256($t104)
+                    // $t106 := 0x1013
+                    $t106 := 0x1013
+                    // $t107 := ==($t105, $t106)
+                    $t107 := $Eq($t105, $t106)
+                    // if ($t107) goto L25 else goto L24
+                    switch $t107
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // destroy($t63)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
+                }
+                case 29 {
+                    // label L26
+                    // $t109 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t109 := $t63
+                    // $t110 := 42
+                    $t110 := 42
+                    // $t12 := $t110
+                    mstore(add($locals, 384), $t110)
+                    // $t111 := borrow_local($t12)
+                    $t111 := $MakePtr(false, add($locals, 415))
+                    // $t112 := Table::contains<u8, vector<address>>($t109, $t111)
+                    $t112 := A2_Table_contains$u8_vec$address$$($t109, $t111)
+                    // $t113 := !($t112)
+                    $t113 := $LogicalNot($t112)
+                    // if ($t113) goto L28 else goto L27
+                    switch $t113
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // $t114 := 110
+                    $t114 := 110
+                    // abort($t114)
+                    $Abort($t114)
+                }
+                case 32 {
+                    // label L29
+                    // return ()
+                    $Free($locals, 416)
+                    leave
+                }
+            }
+        }
+
+        function A2_Table_contains$u8_vec$address$$(table_ref, key_ref) -> res {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A1_vector_borrow$address$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$address$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Table_remove$u8_vec$address$$(table_ref, key_ref) -> value {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let linked_src := sload(storage_key)
+            if iszero(linked_src) {
+              $AbortBuiltin()
+            }
+            let vector_linked_src := $StorageLoadU256(linked_src)
+            $AlignedStorageStore(linked_src, 0)
+            linked_src := vector_linked_src
+            let $size_1833323706 := $StorageLoadU64(linked_src)
+            let $capacity_1833323706 := $ClosestGreaterPowerOfTwo($size_1833323706)
+            value := $Malloc(add(32, mul($capacity_1833323706, 32)))
+            let $data_size_1833323706 := mul($size_1833323706, 32)
+            mstore(value, $AlignedStorageLoad(linked_src))
+            $MemoryStoreU64(add(value, 8), $capacity_1833323706)
+            let $data_src_1833323706 := add(linked_src, 32)
+            let $data_dst_1833323706 := add(value, 32)
+            for { let $offs_1833323706 := 0 } lt($offs_1833323706, $data_size_1833323706) { $offs_1833323706 := add($offs_1833323706, 32)} {
+                mstore(add($data_dst_1833323706, $offs_1833323706), $AlignedStorageLoad(add($data_src_1833323706, $offs_1833323706)))
+                $AlignedStorageStore(add($data_src_1833323706, $offs_1833323706), 0)
+            }
+            $AlignedStorageStore(linked_src, 0)
+            sstore(storage_key, 0)
+        }
+        function A2_Table_borrow$u8_vec$address$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A1_vector_push_back$address$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Table_borrow_mut$u8_vec$address$$(table_ref, key_ref) -> value_ref {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let value_offs := sload(storage_key)
+            if iszero(value_offs) {
+              $AbortBuiltin()
+            }
+            value_ref := $MakePtr(true, value_offs)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function A2_Table_insert$u8_vec$address$$(table_ref, key_ref, value) {
+            let key := $LoadU8(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            if $LogicalNot(iszero(word)) {
+              $AbortBuiltin()
+            }
+            let $linked_dst_1833323706 := $NewLinkedStorageBase(0x6d464cba)
+            let $size_1833323706 := $MemoryLoadU64(value)
+            let $data_size_1833323706 := mul($size_1833323706, 32)
+            $AlignedStorageStore($linked_dst_1833323706, mload(value))
+            let $data_src_1833323706 := add(value, 32)
+            let $data_dst_1833323706 := add($linked_dst_1833323706, 32)
+            for { let $offs_1833323706 := 0 } lt($offs_1833323706, $data_size_1833323706) { $offs_1833323706 := add($offs_1833323706, 32)} {
+                $AlignedStorageStore(add($data_dst_1833323706, $offs_1833323706), mload(add($data_src_1833323706, $offs_1833323706)))
+                $Free(value, add($data_size_1833323706, 32))
+            }
+            let vector_ref_dst := $NewLinkedStorageBase(0x6d464cba)
+            $AlignedStorageStore(vector_ref_dst, $linked_dst_1833323706)
+            sstore(storage_key, vector_ref_dst)
+        }
+        function A1_vector_singleton$address$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$address$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$address$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A2_Table_empty$u8_vec$address$$() -> table {
+            table := $NewTableHandle()
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $NewTableHandle() -> handle {
+          let key := $StorageKey(1, 0)
+          handle := sload(key)
+          if iszero(handle) {
+             // no tables have been allocated in this contract, need to initialize the counter
+             // to the number of storage groups already statically allocated
+             handle := 2
+          }
+          sstore(key, add(handle, 1))
+        }
+
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Tables::test_vector: Succeed(Stopped) (used_gas=181444): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Tables.move b/vendors/move/crates/evm/move-to-yul/tests/Tables.move
new file mode 100644
index 000000000..3fa67a706
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Tables.move
@@ -0,0 +1,185 @@
+#[evm_contract]
+module 0x2::Tables {
+    use Evm::Evm::sign;
+    use Evm::Table::{Self, Table};
+    use Evm::U256::{u256_from_words, U256, sub, zero, one};
+    use std::vector;
+
+    struct S<phantom K, phantom V> has key {
+        t: Table<K, V>
+    }
+
+    struct Balance has store {
+        value: U256
+    }
+
+    #[evm_test]
+    fun test_primitive() acquires S {
+        let t = Table::empty<u64, u128>();
+        assert!(!Table::contains(&t, &42), 100);
+
+        Table::insert(&mut t, &42, 1012);
+        assert!(Table::contains(&t, &42), 101);
+        assert!(!Table::contains(&t, &0), 102);
+        assert!(*Table::borrow(&t, &42) == 1012, 103);
+
+        Table::insert(&mut t, &43, 1013);
+        assert!(Table::contains(&t, &42), 104);
+        assert!(!Table::contains(&t, &0), 105);
+        assert!(Table::contains(&t, &43), 106);
+        assert!(*Table::borrow(&t, &43) == 1013, 107);
+
+        let v = Table::remove(&mut t, &42);
+        assert!(v == 1012, 108);
+
+        move_to(&sign(@0x42), S { t });
+
+        let t_ref = &borrow_global<S<u64, u128>>(@0x42).t;
+        assert!(!Table::contains(t_ref, &42), 109);
+        let v = *Table::borrow(t_ref, &43);
+        assert!(v == 1013, 110);
+
+        let S { t: local_t } = move_from<S<u64, u128>>(@0x42);
+        assert!(*Table::borrow(&local_t, &43) == 1013, 111);
+
+        move_to(&sign(@0x43), S { t: local_t });
+    }
+
+    #[evm_test]
+    fun test_vector() acquires S {
+        let t = Table::empty<u8, vector<address>>();
+
+        Table::insert(&mut t, &42, vector::singleton<address>(@0x1012));
+        assert!(Table::contains(&t, &42), 101);
+        assert!(!Table::contains(&t, &0), 102);
+        assert!(vector::length(Table::borrow(&t, &42)) == 1, 103);
+        assert!(*vector::borrow(Table::borrow(&t, &42), 0) == @0x1012, 104);
+
+        move_to(&sign(@0x42), S { t });
+
+        let s = borrow_global_mut<S<u8, vector<address>>>(@0x42);
+        let v_mut_ref = Table::borrow_mut(&mut s.t, &42);
+        vector::push_back(v_mut_ref, @0x1013);
+        assert!(vector::length(Table::borrow(&s.t, &42)) == 2, 105);
+        assert!(*vector::borrow(Table::borrow(&s.t, &42), 1) == @0x1013, 106);
+
+        let v = Table::remove(&mut s.t, &42);
+        assert!(vector::length(&v) == 2, 107);
+        assert!(*vector::borrow(&v, 0) == @0x1012, 108);
+        assert!(*vector::borrow(&v, 1) == @0x1013, 109);
+        assert!(!Table::contains(&s.t, &42), 110);
+    }
+
+    #[evm_test]
+    fun test_u256() {
+        let t = Table::empty<U256, U256>();
+        let key = u256_from_words(78, 79);
+        let val_1 = u256_from_words(11, 12);
+        let val_2 = u256_from_words(45, 46);
+
+        Table::insert(&mut t, &key, val_1);
+        assert!(Table::contains(&t, &key), 101);
+        assert!(*Table::borrow(&t, &key) == u256_from_words(11, 12), 102);
+
+        let entry_mut_ref = Table::borrow_mut(&mut t, &key);
+        *entry_mut_ref = val_2;
+        assert!(*Table::borrow(&t, &key) == val_2, 103);
+
+        move_to(&sign(@0x42), S { t });
+    }
+
+    #[evm_test]
+    fun test_struct() acquires S {
+        let t = Table::empty<address, Balance>();
+        let val_1 = u256_from_words(11, 12);
+        let val_2 = u256_from_words(45, 46);
+
+        Table::insert(&mut t, &@0xAB, Balance{ value: val_1 });
+        assert!(Table::contains(&t, &@0xAB), 101);
+        assert!(Table::borrow(&t, &@0xAB).value == val_1, 102);
+
+        move_to(&sign(@0x42), S { t });
+
+        let global_t = &mut borrow_global_mut<S<address, Balance>>(@0x42).t;
+
+        Table::insert(global_t, &@0xCD, Balance{ value: val_2 });
+        assert!(Table::borrow(global_t, &@0xAB).value == val_1, 103);
+        assert!(Table::borrow(global_t, &@0xCD).value == val_2, 104);
+
+
+        let entry_mut_ref = Table::borrow_mut(global_t , &@0xCD);
+        entry_mut_ref.value = sub(entry_mut_ref.value, one());
+        assert!(Table::borrow(global_t, &@0xCD).value == u256_from_words(45, 45), 105);
+
+        let Balance { value } = Table::remove(global_t, &@0xAB);
+        assert!(value == val_1, 106);
+        assert!(!Table::contains(global_t, &@0xAB), 107);
+    }
+
+    #[evm_test]
+    fun test_table_of_tables() {
+        let t = Table::empty<address, Table<address, U256>>();
+        let val_1 = u256_from_words(11, 12);
+        let val_2 = u256_from_words(45, 46);
+        let val_3 = u256_from_words(78, 79);
+
+        // Create two small tables
+        let t1 = Table::empty<address, U256>();
+        Table::insert(&mut t1, &@0xAB, val_1);
+
+        let t2 = Table::empty<address, U256>();
+        Table::insert(&mut t2, &@0xCD, val_2);
+
+        // Insert two small tables into the big table
+        Table::insert(&mut t, &@0x12, t1);
+        Table::insert(&mut t, &@0x34, t2);
+
+
+        assert!(Table::contains(Table::borrow(&t, &@0x12), &@0xAB), 101);
+        assert!(Table::contains(Table::borrow(&t, &@0x34), &@0xCD), 102);
+        assert!(*Table::borrow(Table::borrow(&t, &@0x12), &@0xAB) == val_1, 103);
+        assert!(*Table::borrow(Table::borrow(&t, &@0x34), &@0xCD) == val_2, 104);
+
+        Table::insert(Table::borrow_mut(&mut t, &@0x12), &@0xEF, val_3);
+        assert!(*Table::borrow(Table::borrow(&t, &@0x12), &@0xEF) == val_3, 105);
+        assert!(*Table::borrow(Table::borrow(&t, &@0x12), &@0xAB) == val_1, 106);
+
+        let val = Table::remove(Table::borrow_mut(&mut t, &@0x34), &@0xCD);
+        assert!(val == val_2, 107);
+        assert!(!Table::contains(Table::borrow(&t, &@0x34), &@0xCD), 108);
+
+        move_to(&sign(@0x42), S { t });
+    }
+
+    #[evm_test]
+    fun test_insert_fail() {
+        let t = Table::empty<u64, u128>();
+        assert!(!Table::contains(&t, &42), 100);
+
+        Table::insert(&mut t, &42, 1012);
+        assert!(Table::contains(&t, &42), 101);
+        Table::insert(&mut t, &42, 1013); // should fail here since key 42 already exists
+
+        move_to(&sign(@0x42), S { t });
+    }
+
+    #[evm_test]
+    fun test_borrow_fail() {
+        let t = Table::empty<u64, u128>();
+        assert!(!Table::contains(&t, &42), 100);
+
+        let entry_ref = Table::borrow_mut(&mut t, &42); // should fail here since key 42 doesn't exist
+        *entry_ref = 1;
+
+        move_to(&sign(@0x42), S { t });
+    }
+
+    #[evm_test]
+    fun test_remove_fail() {
+        let t = Table::empty<u64, Balance>();
+        let Balance { value } = Table::remove(&mut t, &42); // should fail here since key 42 doesn't exist
+        assert!(value == zero(), 101);
+        move_to(&sign(@0x42), S { t });
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABINative.exp b/vendors/move/crates/evm/move-to-yul/tests/TestABINative.exp
new file mode 100644
index 000000000..262139247
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABINative.exp
@@ -0,0 +1,2733 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_decode_two_bytes1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_decode_two_bytes1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_decode_two_bytes1()
+        return (0, 0)
+        function A2_M_test_decode_two_bytes1() {
+            let i, i_1, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47
+            let $locals := $Malloc(96)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t8 := 31
+                    $t8 := 31
+                    // $t9 := <=($t0, $t8)
+                    $t9 := $LtEq(i, $t8)
+                    // if ($t9) goto L1 else goto L0
+                    switch $t9
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 42
+                    $t6 := 42
+                    // vector::push_back<u8>($t5, $t6)
+                    A1_vector_push_back$u8$($t5, $t6)
+                    // $t7 := 1
+                    $t7 := 1
+                    // $t0 := $t7
+                    i := $t7
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t13 := borrow_local($t2)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 43
+                    $t14 := 43
+                    // vector::push_back<u8>($t13, $t14)
+                    A1_vector_push_back$u8$($t13, $t14)
+                    // $t15 := 1
+                    $t15 := 1
+                    // $t1 := $t15
+                    i_1 := $t15
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t0 := +($t0, $t12)
+                    i := $AddU64(i, $t12)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t16 := 31
+                    $t16 := 31
+                    // $t17 := <=($t1, $t16)
+                    $t17 := $LtEq(i_1, $t16)
+                    // if ($t17) goto L5 else goto L4
+                    switch $t17
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t21 := move($t2)
+                    $t21 := mload($locals)
+                    // ($t22, $t23) := M::decode_two_bytes1($t21)
+                    $t22, $t23 := A2_M_decode_two_bytes1($t21)
+                    // $t4 := $t23
+                    mstore(add($locals, 64), $t23)
+                    // $t3 := $t22
+                    mstore(add($locals, 32), $t22)
+                    // $t24 := borrow_local($t3)
+                    $t24 := $MakePtr(false, add($locals, 32))
+                    // $t25 := vector::length<u8>($t24)
+                    $t25 := A1_vector_length$u8$($t24)
+                    // $t26 := 1
+                    $t26 := 1
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L9 else goto L8
+                    switch $t27
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 0
+                    $t19 := 0
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := 1
+                    $t20 := 1
+                    // $t1 := +($t1, $t20)
+                    i_1 := $AddU64(i_1, $t20)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t28 := 101
+                    $t28 := 101
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 13 {
+                    // label L10
+                    // $t29 := borrow_local($t4)
+                    $t29 := $MakePtr(false, add($locals, 64))
+                    // $t30 := vector::length<u8>($t29)
+                    $t30 := A1_vector_length$u8$($t29)
+                    // $t31 := 1
+                    $t31 := 1
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L12 else goto L11
+                    switch $t32
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t33 := 102
+                    $t33 := 102
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 16 {
+                    // label L13
+                    // $t34 := borrow_local($t3)
+                    $t34 := $MakePtr(false, add($locals, 32))
+                    // $t35 := 0
+                    $t35 := 0
+                    // $t36 := vector::borrow<u8>($t34, $t35)
+                    $t36 := A1_vector_borrow$u8$($t34, $t35)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU8($t36)
+                    // $t38 := 42
+                    $t38 := 42
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L15 else goto L14
+                    switch $t39
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
+                }
+                case 18 {
+                    // label L14
+                    // $t40 := 103
+                    $t40 := 103
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 19 {
+                    // label L16
+                    // $t41 := borrow_local($t4)
+                    $t41 := $MakePtr(false, add($locals, 64))
+                    // $t42 := 0
+                    $t42 := 0
+                    // $t43 := vector::borrow<u8>($t41, $t42)
+                    $t43 := A1_vector_borrow$u8$($t41, $t42)
+                    // $t44 := read_ref($t43)
+                    $t44 := $LoadU8($t43)
+                    // $t45 := 43
+                    $t45 := 43
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L18 else goto L17
+                    switch $t46
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
+                }
+                case 20 {
+                    // label L18
+                    // goto L19
+                    $block := 22
+                }
+                case 21 {
+                    // label L17
+                    // $t47 := 104
+                    $t47 := 104
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 22 {
+                    // label L19
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_bytes1_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := 1
+            let size := 33
+            array := abi_decode_available_length__bytes1_from_memory(offset, length, size, end)
+        }
+        function abi_decode_available_length__bytes1_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_decode_two_bytes1: Succeed(Stopped) (used_gas=79598): []
+
+// test of M::test_decode_two_u8
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_decode_two_u8" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_decode_two_u8()
+        return (0, 0)
+        function A2_M_test_decode_two_u8() {
+            let i, i_1, v2, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t5 := 31
+                    $t5 := 31
+                    // $t6 := <=($t0, $t5)
+                    $t6 := $LtEq(i, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t0 := $t4
+                    i := $t4
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t1 := $t12
+                    i_1 := $t12
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 0
+                    $t8 := 0
+                    // vector::push_back<u8>($t7, $t8)
+                    A1_vector_push_back$u8$($t7, $t8)
+                    // $t9 := 1
+                    $t9 := 1
+                    // $t0 := +($t0, $t9)
+                    i := $AddU64(i, $t9)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t13 := 31
+                    $t13 := 31
+                    // $t14 := <=($t1, $t13)
+                    $t14 := $LtEq(i_1, $t13)
+                    // if ($t14) goto L5 else goto L4
+                    switch $t14
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 43
+                    $t19 := 43
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := move($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_u8($t20)
+                    $t21, $t22 := A2_M_decode_two_u8($t20)
+                    // $t23 := 42
+                    $t23 := 42
+                    // $t24 := ==($t21, $t23)
+                    $t24 := $Eq($t21, $t23)
+                    // if ($t24) goto L9 else goto L8
+                    switch $t24
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := 0
+                    $t16 := 0
+                    // vector::push_back<u8>($t15, $t16)
+                    A1_vector_push_back$u8$($t15, $t16)
+                    // $t17 := 1
+                    $t17 := 1
+                    // $t1 := +($t1, $t17)
+                    i_1 := $AddU64(i_1, $t17)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t25 := 101
+                    $t25 := 101
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 13 {
+                    // label L10
+                    // $t26 := 43
+                    $t26 := 43
+                    // $t27 := ==($t22, $t26)
+                    $t27 := $Eq($t22, $t26)
+                    // if ($t27) goto L12 else goto L11
+                    switch $t27
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t28 := 102
+                    $t28 := 102
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 16 {
+                    // label L13
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint8_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint8(value)
+        }
+        function validator_uint8(value) {
+            if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+        }
+        function cleanup_uint8(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::test_decode_two_u8: Succeed(Stopped) (used_gas=77393): []
+
+// test of M::test_encode_packed_string
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_encode_packed_string" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_encode_packed_string()
+        return (0, 0)
+        function A2_M_test_encode_packed_string() {
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 100
+                    $t5 := 100
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := []
+                    $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t0, 0)
+                    $MemoryStoreU64(add($t0, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t0, 32))
+                    // $t1 := []
+                    $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t1, 0)
+                    $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t1, 32))
+                    // $t2 := M::encode_packed_string($t0, $t1)
+                    $t2 := A2_M_encode_packed_string($t0, $t1)
+                    // $t3 := []
+                    $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t3, 0)
+                    $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t3, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$u8$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := [49]
+                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t6, 1)
+                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t6, 32))
+                    // $t7 := [50]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_4015750317(add($t7, 32))
+                    // $t8 := M::encode_packed_string($t6, $t7)
+                    $t8 := A2_M_encode_packed_string($t6, $t7)
+                    // $t9 := [49, 50]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t9, 2)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_141265791(add($t9, 32))
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq_$vec$u8$$($t8, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // $t12 := []
+                    $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t12, 0)
+                    $MemoryStoreU64(add($t12, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t12, 32))
+                    // $t13 := [97, 98, 99]
+                    $t13 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t13, 3)
+                    $MemoryStoreU64(add($t13, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t13, 32))
+                    // $t14 := M::encode_packed_string($t12, $t13)
+                    $t14 := A2_M_encode_packed_string($t12, $t13)
+                    // $t15 := [97, 98, 99]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t15, 32))
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq_$vec$u8$$($t14, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := [97]
+                    $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t18, 1)
+                    $MemoryStoreU64(add($t18, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_371573306(add($t18, 32))
+                    // $t19 := [98, 99]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t19, 2)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_3119208230(add($t19, 32))
+                    // $t20 := M::encode_packed_string($t18, $t19)
+                    $t20 := A2_M_encode_packed_string($t18, $t19)
+                    // $t21 := [100, 101]
+                    $t21 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t21, 2)
+                    $MemoryStoreU64(add($t21, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_1933910203(add($t21, 32))
+                    // $t22 := M::encode_packed_string($t20, $t21)
+                    $t22 := A2_M_encode_packed_string($t20, $t21)
+                    // $t23 := [97, 98, 99, 100, 101]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t23, 5)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_3871831907(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // if ($t24) goto L10 else goto L9
+                    switch $t24
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 14 {
+                    // label L11
+                    // $t26 := [116, 101, 115, 116]
+                    $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t26, 4)
+                    $MemoryStoreU64(add($t26, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t26, 32))
+                    // $t27 := []
+                    $t27 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                    $MemoryStoreU64($t27, 0)
+                    $MemoryStoreU64(add($t27, 8), $ClosestGreaterPowerOfTwo(0))
+                    copy_literal_string_to_memory_21418693(add($t27, 32))
+                    // $t28 := M::encode_packed_string($t26, $t27)
+                    $t28 := A2_M_encode_packed_string($t26, $t27)
+                    // $t29 := [116, 101, 115, 116]
+                    $t29 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t29, 4)
+                    $MemoryStoreU64(add($t29, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_1610556060(add($t29, 32))
+                    // $t30 := ==($t28, $t29)
+                    $t30 := $Eq_$vec$u8$$($t28, $t29)
+                    // if ($t30) goto L13 else goto L12
+                    switch $t30
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t31 := 104
+                    $t31 := 104
+                    // abort($t31)
+                    $Abort($t31)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_M_encode_packed_string(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_packed_$string_string$_$vec$u8$_vec$u8$$_not_padded_inplace($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function abi_encode_tuple_packed_$string_string$_$vec$u8$_vec$u8$$_not_padded_inplace(pos ,value_0, value_1) -> end {
+            pos := abi_encode_string_not_padded_inplace(value_0,  pos)
+            pos := abi_encode_string_not_padded_inplace(value_1,  pos)
+            end := pos
+        }
+        function abi_encode_string_not_padded_inplace(value, pos) -> end{
+            let size := $MemoryLoadU64(value)
+            $CopyMemory(add(value, 0x20), pos, size)
+            end := add(pos, size)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_1610556060(value) {
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 116)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_21418693(value) {
+        }
+        function copy_literal_string_to_memory_3871831907(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_1933910203(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_3119208230(value) {
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_371573306(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_141265791(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4015750317(value) {
+            $MemoryStoreU8(value, 50)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2868747976(value) {
+            $MemoryStoreU8(value, 49)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_encode_packed_string: Succeed(Stopped) (used_gas=10647): []
+
+// test of M::test_encode_packed_uint16
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_encode_packed_uint16" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_encode_packed_uint16()
+        return (0, 0)
+        function A2_M_test_encode_packed_uint16() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t1 := 41
+                    $t1 := 41
+                    // $t2 := 42
+                    $t2 := 42
+                    // $t0 := M::encode_packed($t1, $t2)
+                    mstore($locals, A2_M_encode_packed($t1, $t2))
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 4
+                    $t5 := 4
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_M_encode_packed(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_packed_$uint16_uint16$_$u64_u64$_not_padded_inplace($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function abi_encode_tuple_packed_$uint16_uint16$_$u64_u64$_not_padded_inplace(pos ,value_0, value_1) -> end {
+            abi_encode_uint16(value_0,  pos)
+            pos := add(pos, 2)
+            abi_encode_uint16(value_1,  pos)
+            pos := add(pos, 2)
+            end := pos
+        }
+        function abi_encode_uint16(value, pos) {
+            mstore(pos, left_align_uint16(cleanup_uint16(value)))
+        }
+        function left_align_uint16(value) -> aligned {
+            aligned := shl(240, value)
+        }
+        function cleanup_uint16(value) -> cleaned {
+            cleaned := and(value, 0xffff)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_encode_packed_uint16: Succeed(Stopped) (used_gas=776): []
+
+// test of M::test_marshalling_two_bytes1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_marshalling_two_bytes1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_marshalling_two_bytes1()
+        return (0, 0)
+        function A2_M_test_marshalling_two_bytes1() {
+            let i, i_1, v_, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t7 := 31
+                    $t7 := 31
+                    // $t8 := <=($t0, $t7)
+                    $t8 := $LtEq(i, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t4 := borrow_local($t2)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // vector::push_back<u8>($t4, $t5)
+                    A1_vector_push_back$u8$($t4, $t5)
+                    // $t6 := 1
+                    $t6 := 1
+                    // $t0 := $t6
+                    i := $t6
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 43
+                    $t13 := 43
+                    // vector::push_back<u8>($t12, $t13)
+                    A1_vector_push_back$u8$($t12, $t13)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t1 := $t14
+                    i_1 := $t14
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t15 := 31
+                    $t15 := 31
+                    // $t16 := <=($t1, $t15)
+                    $t16 := $LtEq(i_1, $t15)
+                    // if ($t16) goto L5 else goto L4
+                    switch $t16
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t20 := copy($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_bytes1($t20)
+                    $t21, $t22 := A2_M_decode_two_bytes1($t20)
+                    // $t23 := M::encode_two_bytes1($t21, $t22)
+                    $t23 := A2_M_encode_two_bytes1($t21, $t22)
+                    // $t24 := move($t2)
+                    $t24 := mload($locals)
+                    // $t25 := ==($t24, $t23)
+                    $t25 := $Eq_$vec$u8$$($t24, $t23)
+                    // if ($t25) goto L9 else goto L8
+                    switch $t25
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t26 := 101
+                    $t26 := 101
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 13 {
+                    // label L10
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_encode_two_bytes1(input_1,input_2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$($t2,input_1,input_2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_bytes1_vec$u8$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_bytes1_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := 1
+            let size := 33
+            array := abi_decode_available_length__bytes1_from_memory(offset, length, size, end)
+        }
+        function abi_decode_available_length__bytes1_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function abi_encode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+            tail := add(headStart, 64)
+            abi_encode_bytes1(value_0, add(headStart, 0))
+            abi_encode_bytes1(value_1, add(headStart, 32))
+        }
+        function abi_encode_bytes1(value, pos) {
+            let size := $MemoryLoadU64(value)
+            if iszero(eq(size, 1)) { $Abort(92) }
+            $CopyMemory(add(value, 0x20), pos, size)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_marshalling_two_bytes1: Succeed(Stopped) (used_gas=78906): []
+
+// test of M::test_marshalling_two_u8
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_marshalling_two_u8" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_marshalling_two_u8()
+        return (0, 0)
+        function A2_M_test_marshalling_two_u8() {
+            let i, i_1, v1, v2, v_, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34
+            let $locals := $Malloc(32)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L3
+                    // $t7 := 31
+                    $t7 := 31
+                    // $t8 := <=($t0, $t7)
+                    $t8 := $LtEq(i, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t2 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t6 := 1
+                    $t6 := 1
+                    // $t0 := $t6
+                    i := $t6
+                    // goto L3
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 42
+                    $t13 := 42
+                    // vector::push_back<u8>($t12, $t13)
+                    A1_vector_push_back$u8$($t12, $t13)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t1 := $t14
+                    i_1 := $t14
+                    // goto L7
+                    $block := 7
+                }
+                case 6 {
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
+                    // label L7
+                    // $t15 := 31
+                    $t15 := 31
+                    // $t16 := <=($t1, $t15)
+                    $t16 := $LtEq(i_1, $t15)
+                    // if ($t16) goto L5 else goto L4
+                    switch $t16
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
+                }
+                case 8 {
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
+                    // $t20 := borrow_local($t2)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 43
+                    $t21 := 43
+                    // vector::push_back<u8>($t20, $t21)
+                    A1_vector_push_back$u8$($t20, $t21)
+                    // $t22 := copy($t2)
+                    $t22 := mload($locals)
+                    // ($t23, $t24) := M::decode_two_u8($t22)
+                    $t23, $t24 := A2_M_decode_two_u8($t22)
+                    // $t25 := 42
+                    $t25 := 42
+                    // $t26 := ==($t23, $t25)
+                    $t26 := $Eq($t23, $t25)
+                    // if ($t26) goto L9 else goto L8
+                    switch $t26
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
+                }
+                case 10 {
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t27 := 101
+                    $t27 := 101
+                    // abort($t27)
+                    $Abort($t27)
+                }
+                case 13 {
+                    // label L10
+                    // $t28 := 43
+                    $t28 := 43
+                    // $t29 := ==($t24, $t28)
+                    $t29 := $Eq($t24, $t28)
+                    // if ($t29) goto L12 else goto L11
+                    switch $t29
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
+                }
+                case 14 {
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t30 := 102
+                    $t30 := 102
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 16 {
+                    // label L13
+                    // $t31 := M::encode_two_u8($t23, $t24)
+                    $t31 := A2_M_encode_two_u8($t23, $t24)
+                    // $t32 := move($t2)
+                    $t32 := mload($locals)
+                    // $t33 := ==($t32, $t31)
+                    $t33 := $Eq_$vec$u8$$($t32, $t31)
+                    // if ($t33) goto L15 else goto L14
+                    switch $t33
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
+                }
+                case 18 {
+                    // label L14
+                    // $t34 := 103
+                    $t34 := 103
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 19 {
+                    // label L16
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A2_M_encode_two_u8(v1,v2) -> $result  {
+            $result := mload(0)
+            let $t2 := add($result, 32)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := abi_encode_tuple_$uint8_uint8$_$u8_u8$($t2,v1,v2)
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t4 := sub($t3, $t2)
+            $MemoryStoreU64($result, $t4)
+            let $t5 := $ClosestGreaterPowerOfTwo($t4)
+            $MemoryStoreU64(add($result, 8), $t5)
+            mstore(0, $t3)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+            if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+            {
+                let offset := 0
+                value_0 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+            {
+                let offset := 32
+                value_1 := abi_decode_uint8_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_uint8_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint8(value)
+        }
+        function validator_uint8(value) {
+            if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+        }
+        function cleanup_uint8(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function abi_encode_tuple_$uint8_uint8$_$u8_u8$(headStart ,value_0, value_1) -> tail {
+            tail := add(headStart, 64)
+            abi_encode_uint8(value_0, add(headStart, 0))
+            abi_encode_uint8(value_1, add(headStart, 32))
+        }
+        function abi_encode_uint8(value, pos) {
+            mstore(pos, cleanup_uint8(value))
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_marshalling_two_u8: Succeed(Stopped) (used_gas=78803): []
+
+
+
+!! Move-To-Yul Diagnostics:
+ warning: unused alias
+  ┌─ tests/TestABINative.move:3:20
+  │
+3 │      use Evm::Evm::concat;
+  │                    ^^^^^^ Unused 'use' of alias 'concat'. Consider removing it
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABINative.move b/vendors/move/crates/evm/move-to-yul/tests/TestABINative.move
new file mode 100644
index 000000000..94de2d369
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABINative.move
@@ -0,0 +1,126 @@
+#[evm_contract]
+module 0x2::M {
+     use Evm::Evm::concat;
+    use std::vector;
+
+    #[decode]
+    public native fun decode_two_u8(input: vector<u8>): (u8, u8);
+
+    #[encode]
+    public native fun encode_two_u8(v1: u8, v2: u8): vector<u8>;
+
+    #[decode(sig=b"decode_two_bytes1(bytes) returns (bytes1, bytes1)")]
+    public native fun decode_two_bytes1(input: vector<u8>) :(vector<u8>, vector<u8>);
+
+    #[encode(sig=b"encode_two_bytes1(bytes1, bytes1) returns (bytes)")]
+    public native fun encode_two_bytes1(input_1: vector<u8>, input_2: vector<u8>) : vector<u8>;
+
+    #[encode_packed(sig=b"encode_packed(uint16, uint16) returns (bytes)")]
+    public native fun encode_packed(input_1: u64, input_2: u64) : vector<u8>;
+
+    #[encode_packed(sig=b"encode_packed_string(string, string) returns (bytes)")]
+    public native fun encode_packed_string(input_1: vector<u8>, input_2: vector<u8>) : vector<u8>;
+
+    #[evm_test]
+    fun test_encode_packed_uint16() {
+        let v1 = 41u64;
+        let v2 = 42u64;
+        let v = encode_packed(v1, v2);
+        assert!(vector::length(&v) == 4, 101);
+    }
+
+    #[evm_test]
+    fun test_encode_packed_string() {
+        assert!(encode_packed_string(b"", b"") == b"", 100);
+        assert!(encode_packed_string(b"1", b"2") == b"12", 101);
+        assert!(encode_packed_string(b"", b"abc") == b"abc", 102);
+        assert!(encode_packed_string(encode_packed_string(b"a", b"bc"), b"de") == b"abcde", 103);
+        assert!(encode_packed_string(b"test", b"") == b"test", 104);
+    }
+
+    #[evm_test]
+    fun test_decode_two_bytes1() {
+        let v = vector::empty<u8>();
+        vector::push_back(&mut v, 42u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 43u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        let (v1, v2) = decode_two_bytes1(v);
+        assert!(vector::length(&v1) == 1, 101);
+        assert!(vector::length(&v2) == 1, 102);
+        assert!(*vector::borrow(&v1, 0) == 42, 103);
+        assert!(*vector::borrow(&v2, 0) == 43, 104);
+    }
+
+    #[evm_test]
+    fun test_marshalling_two_bytes1() {
+        let v = vector::empty<u8>();
+        vector::push_back(&mut v, 42u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 43u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        let (v1, v2) = decode_two_bytes1(v);
+        let v_ = encode_two_bytes1(v1, v2);
+        assert!(v == v_, 101);
+    }
+
+    #[evm_test]
+    fun test_decode_two_u8() {
+        let v = vector::empty<u8>();
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 42u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 43u8);
+        let (v1, v2) = decode_two_u8(v);
+        assert!(v1 == 42, 101);
+        assert!(v2 == 43, 102);
+    }
+
+    #[evm_test]
+    fun test_marshalling_two_u8() {
+        let v = vector::empty<u8>();
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 42u8);
+        let i = 1;
+        while (i <= 31) {
+            vector::push_back(&mut v, 0);
+            i = i + 1
+        };
+        vector::push_back(&mut v, 43u8);
+        let (v1, v2) = decode_two_u8(v);
+        assert!(v1 == 42, 101);
+        assert!(v2 == 43, 102);
+        let v_ = encode_two_u8(v1, v2);
+        assert!(v == v_, 103)
+
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.exp b/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.exp
new file mode 100644
index 000000000..a8421281d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.exp
@@ -0,0 +1,71 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Move-To-Yul Diagnostics:
+ error: decode function must only has one argument of type bytes
+  ┌─ tests/TestABINativeError.move:8:5
+  │
+8 │     public native fun decode_wrong_input_type(input: vector<u64>): (u8, u8);
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: decode function must only has one argument of type bytes
+   ┌─ tests/TestABINativeError.move:11:5
+   │
+11 │     public native fun decode_wrong_input_type_sig(input: vector<u64>): (u8, u8);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:14:5
+   │
+14 │     public native fun encode_wrong_input_type(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:20:5
+   │
+20 │     public native fun encode_wrong_input_type_packed(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:23:5
+   │
+23 │     public native fun encode_wrong_input_type_packed_sig(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: encode function must only has one return value of type bytes
+   ┌─ tests/TestABINativeError.move:17:5
+   │
+17 │     public native fun encode_wrong_input_type_sig(input: vector<u64>): vector<u64>;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.move b/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.move
new file mode 100644
index 000000000..e7fd59648
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABINativeError.move
@@ -0,0 +1,68 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+
+    // Test type checking on arguments and return values
+
+    #[decode]
+    public native fun decode_wrong_input_type(input: vector<u64>): (u8, u8);
+
+    #[decode(sig=b"decode(uint64[]) returns (uint8, uint8)")]
+    public native fun decode_wrong_input_type_sig(input: vector<u64>): (u8, u8);
+
+    #[encode]
+    public native fun encode_wrong_input_type(input: vector<u64>): vector<u64>;
+
+    #[encode(sig=b"encode(uint64[]) returns (uint64[])")]
+    public native fun encode_wrong_input_type_sig(input: vector<u64>): vector<u64>;
+
+    #[encode_packed]
+    public native fun encode_wrong_input_type_packed(input: vector<u64>): vector<u64>;
+
+    #[encode_packed(sig=b"encode_packed(uint64[]) returns (uint64[])")]
+    public native fun encode_wrong_input_type_packed_sig(input: vector<u64>): vector<u64>;
+
+
+    #[evm_test]
+    fun test_decode_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        decode_wrong_input_type(v);
+    }
+
+    #[evm_test]
+    fun test_decode_sig_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        decode_wrong_input_type_sig(v);
+    }
+
+    #[evm_test]
+    fun test_encode_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        encode_wrong_input_type(v);
+    }
+
+    #[evm_test]
+    fun test_encode_sig_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        encode_wrong_input_type_sig(v);
+    }
+
+    #[evm_test]
+    fun test_encode_packed_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        encode_wrong_input_type_packed(v);
+    }
+
+    #[evm_test]
+    fun test_encode_packed_sig_error() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        encode_wrong_input_type_packed_sig(v);
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.exp b/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.exp
new file mode 100644
index 000000000..af572c956
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.exp
@@ -0,0 +1,2974 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xcf61f38d
+                {
+                    // do_transfer()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_do_transfer()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5bd0cf08
+                {
+                    // test_2((uint64,bool,(uint128[])[]))
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(4, calldatasize())
+                    let ret_0 := A2_M_test_2_S(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x99472457
+                {
+                    // test_s_struct((bytes))
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_bytes_$_$A1_ascii_String$(4, calldatasize())
+                    let ret_0 := A2_M_test_String_struct(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_bytes_$_$A1_ascii_String$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c3d6ddc
+                {
+                    // test_array((uint64,bool,(uint128[])[])[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$_uint64_bool__uint128_________2_$_$vec$vec$A2_M_S$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128________$_$vec$A2_M_S$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf8a8fd6d
+                {
+                    // test()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_pack_S()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa6853da5
+                {
+                    // test_safe_transfer_from()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_safe_transfer_from()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$_uint128___$_$A2_M_S2$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_do_transfer() {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 42
+                $t0 := 42
+                // $t1 := true
+                $t1 := true
+                // $t2 := M::pack_S($t0, $t1)
+                $t2 := A2_M_pack_S($t0, $t1)
+                // $t3 := pack M::Event_S($t2)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t2)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_S>($t3)
+                A2_Evm_emit$A2_M_Event_S$($t3)
+                // return ()
+            }
+
+            function A2_M_test_2_S(s) -> $result {
+                // return $t0
+                $result := s
+            }
+
+            function A2_M_test_String_struct(s) -> $result {
+                // return $t0
+                $result := s
+            }
+
+            function A2_M_test_array(v) -> $result {
+                let $t1, $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := vector::borrow<vector<M::S>>($t1, $t2)
+                $t3 := A1_vector_borrow$vec$A2_M_S$$($t1, $t2)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU256($t3)
+                if $IsStoragePtr($t3){
+                    let $storage_ptr_3616935342
+                    let $size_3616935342 := $StorageLoadU64($t4)
+                    let $capacity_3616935342 := $ClosestGreaterPowerOfTwo($size_3616935342)
+                    $storage_ptr_3616935342 := $Malloc(add(32, mul($capacity_3616935342, 32)))
+                    let $data_size_3616935342 := mul($size_3616935342, 32)
+                    mstore($storage_ptr_3616935342, $AlignedStorageLoad($t4))
+                    $MemoryStoreU64(add($storage_ptr_3616935342, 8), $capacity_3616935342)
+                    let $data_src_3616935342 := add($t4, 32)
+                    let $data_dst_3616935342 := add($storage_ptr_3616935342, 32)
+                    for { let $offs_3616935342 := 0 } lt($offs_3616935342, $data_size_3616935342) { $offs_3616935342 := add($offs_3616935342, 32)} {
+                        {
+                            let $linked_src_1770153451 := $AlignedStorageLoad(add($data_src_3616935342, $offs_3616935342))
+                            let $linked_dst_1770153451
+                            $linked_dst_1770153451 := $Malloc(41)
+                            {
+                                let $linked_src_894856441 := $AlignedStorageLoad(add($linked_src_1770153451, 0))
+                                let $linked_dst_894856441
+                                let $size_894856441 := $StorageLoadU64($linked_src_894856441)
+                                let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                                $linked_dst_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                                let $data_size_894856441 := mul($size_894856441, 32)
+                                mstore($linked_dst_894856441, $AlignedStorageLoad($linked_src_894856441))
+                                $MemoryStoreU64(add($linked_dst_894856441, 8), $capacity_894856441)
+                                let $data_src_894856441 := add($linked_src_894856441, 32)
+                                let $data_dst_894856441 := add($linked_dst_894856441, 32)
+                                for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                                    {
+                                        let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                        let $linked_dst_1602512591
+                                        $linked_dst_1602512591 := $Malloc(32)
+                                        {
+                                            let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                            let $linked_dst_2315022182
+                                            let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                            let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                            $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                            let $data_size_2315022182 := mul($size_2315022182, 16)
+                                            mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                            $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                            let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                            let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                            for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                                mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                            }
+                                            mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                        }
+                                        mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                                    }
+                                }
+                                mstore(add($linked_dst_1770153451, 0), $linked_dst_894856441)
+                            }
+                            mstore(add($linked_dst_1770153451, 32), $AlignedStorageLoad(add($linked_src_1770153451, 32)))
+                            mstore(add($data_dst_3616935342, $offs_3616935342), $linked_dst_1770153451)
+                        }
+                    }
+                    $t4 := $storage_ptr_3616935342
+                }
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_pack_S() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 42
+                $t0 := 42
+                // $t1 := true
+                $t1 := true
+                // $t2 := M::pack_S($t0, $t1)
+                $t2 := A2_M_pack_S($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_test_safe_transfer_from() -> $result {
+                let s, $t1, $t2, $t3, $t4, $t5
+                // $t1 := 42
+                $t1 := 42
+                // $t2 := true
+                $t2 := true
+                // $t3 := M::pack_S($t1, $t2)
+                $t3 := A2_M_pack_S($t1, $t2)
+                // $t4 := 0x3
+                $t4 := 0x3
+                // $t5 := M::safe_transfer_form($t4, $t3)
+                $t5 := A2_M_safe_transfer_form($t4, $t3)
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_M_safe_transfer_form(contract, s) -> $result  {
+                // storage for arguments and returned data
+                let $t2 := mload(0)
+                mstore($t2, $Shl(0xd9f27567, 224))
+                let $t3 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(add($t2, 4), s)
+                let $t4 := call(gas(), contract, 0,  $t2, sub($t3, $t2), $t2, 0)
+                // set freeMemoryPointer
+                mstore(0, $t3)
+                if iszero($t4) { $RevertForward() }
+                if $t4 {
+                    // copy dynamic return data out
+                    returndatacopy($t2, 0, returndatasize())
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$_uint128___$_$A2_M_S2$_from_memory($t2, add($t2, returndatasize()))
+                }
+            }
+            function A2_M_pack_S(a, b) -> $result {
+                let s2, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                // $t3 := vector::empty<M::S2>()
+                mstore($locals, A1_vector_empty$A2_M_S2$())
+                // $t4 := (u128)($t0)
+                $t4 := $CastU128(a)
+                // $t5 := M::pack_S2($t4)
+                $t5 := A2_M_pack_S2($t4)
+                // $t6 := borrow_local($t3)
+                $t6 := $MakePtr(false, $locals)
+                // vector::push_back<M::S2>($t6, $t5)
+                A1_vector_push_back$A2_M_S2$($t6, $t5)
+                // $t7 := move($t3)
+                $t7 := mload($locals)
+                // $t8 := pack M::S($t0, $t1, $t7)
+                {
+                    let $mem := $Malloc(41)
+                    $MemoryStoreU64(add($mem, 32), a)
+                    $MemoryStoreU8(add($mem, 40), b)
+                    $MemoryStoreU256(add($mem, 0), $t7)
+                    $t8 := $mem
+                }
+                // return $t8
+                $result := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$A2_M_S2$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                    {
+                        let $linked_src_2315022182 := mload(add(e, 0))
+                        let $linked_dst_2315022182 := $NewLinkedStorageBase(0x89fc6f66)
+                        let $size_2315022182 := $MemoryLoadU64($linked_src_2315022182)
+                        let $data_size_2315022182 := mul($size_2315022182, 16)
+                        $AlignedStorageStore($linked_dst_2315022182, mload($linked_src_2315022182))
+                        let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                        let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                        for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                            $AlignedStorageStore(add($data_dst_2315022182, $offs_2315022182), mload(add($data_src_2315022182, $offs_2315022182)))
+                            $Free($linked_src_2315022182, add($data_size_2315022182, 32))
+                        }
+                        $AlignedStorageStore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                    }
+                    $Free(e, 32)
+                    $AlignedStorageStore(e_offs, $linked_dst_1602512591)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_M_pack_S2(x) -> $result {
+                let $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<u128>()
+                mstore($locals, A1_vector_empty$u128$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<u128>($t2, $t0)
+                A1_vector_push_back$u128$($t2, x)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // $t4 := pack M::S2($t3)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t3)
+                    $t4 := $mem
+                }
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$u128$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 16)))
+                $StoreU128(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 16)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u128$() -> vector {
+                vector := $Malloc(64)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_empty$A2_M_S2$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_borrow$vec$A2_M_S$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A2_Evm_emit$A2_M_Event_S$(e) {
+                let $t1 := 0x63832c328fffa84736f81dee39bf126d59b4a7c5c1bb370244d025be5b10230b
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                {
+                    let $t3 := mload(0)
+                    let $t4 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$($t3, $t2)
+                    log1($t3, sub($t4, $t3), $t1)
+                    mstore(0, $t4)
+                }
+            }
+            function abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value_0,  tail)
+            }
+            function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos) -> end {
+                let tail := add(pos, 96)
+                let value_0 := $MemoryLoadU64(add(value, 32))
+                abi_encode_uint64(value_0, add(pos, 0))
+                let value_1 := $MemoryLoadU8(add(value, 40))
+                abi_encode_bool(value_1, add(pos, 32))
+                let value_2 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 64), sub(tail, pos))
+                tail := abi_encode__uint128______vec$A2_M_S2$(value_2, tail)
+                end := tail
+            }
+            function abi_encode__uint128______vec$A2_M_S2$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_$uint128__$_$A2_M_S2$(value, pos)
+            }
+            function abi_encode_$uint128__$_$A2_M_S2$(value, pos) -> end {
+                let tail := add(pos, 32)
+                let value_0 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 0), sub(tail, pos))
+                tail := abi_encode_uint128___vec$u128$(value_0, tail)
+                end := tail
+            }
+            function abi_encode_uint128___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint128_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint128(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$_uint128___$_$A2_M_S2$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$uint128__$_$A2_M_S2$_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_$uint128__$_$A2_M_S2$_from_memory(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128___vec$u128$_from_memory(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_uint128___vec$u128$_from_memory(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := mload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$_from_memory(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$_from_memory(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128_from_memory(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$_uint128___$_$A2_M_S2$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$uint128__$_$A2_M_S2$(value_0,  tail)
+            }
+            function abi_encode_tuple_$_uint64_bool__uint128________$_$vec$A2_M_S$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode__uint64_bool__uint128_________vec$A2_M_S$(value_0,  tail)
+            }
+            function abi_encode__uint64_bool__uint128_________vec$A2_M_S$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos)
+            }
+            function abi_decode_tuple_$_uint64_bool__uint128_________2_$_$vec$vec$A2_M_S$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode__uint64_bool__uint128_________2__vec$vec$A2_M_S$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode__uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length___uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, length, size, end)
+            }
+            function abi_decode_available_length___uint64_bool__uint128_________2__vec$vec$A2_M_S$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode__uint64_bool__uint128_________vec$A2_M_S$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode__uint64_bool__uint128_________vec$A2_M_S$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length___uint64_bool__uint128_________vec$A2_M_S$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length___uint64_bool__uint128_________vec$A2_M_S$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(headStart, end) -> value {
+                if slt(sub(end, headStart), 96) { $Abort(90) }
+                let value_0, value_1, value_2
+                value := $Malloc(96)
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), end)
+                }
+                $MemoryStoreU64(add(value, 32), value_0)
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), end)
+                }
+                $MemoryStoreU8(add(value, 40), value_1)
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode__uint128______vec$A2_M_S2$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_2)
+            }
+            function abi_decode__uint128______vec$A2_M_S2$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length___uint128______vec$A2_M_S2$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length___uint128______vec$A2_M_S2$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_$uint128__$_$A2_M_S2$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_$uint128__$_$A2_M_S2$(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128___vec$u128$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$_bytes_$_$A1_ascii_String$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_$bytes$_$A1_ascii_String$(value_0,  tail)
+            }
+            function abi_encode_$bytes$_$A1_ascii_String$(value, pos) -> end {
+                let tail := add(pos, 32)
+                let value_0 := $MemoryLoadU256(add(value, 0))
+                mstore(add(pos, 0), sub(tail, pos))
+                tail := abi_encode_bytes(value_0, tail)
+                end := tail
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$_bytes_$_$A1_ascii_String$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$bytes$_$A1_ascii_String$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_$bytes$_$A1_ascii_String$(headStart, end) -> value {
+                if slt(sub(end, headStart), 32) { $Abort(90) }
+                let value_0
+                value := $Malloc(32)
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), end)
+                }
+                $MemoryStoreU256(add(value, 0), value_0)
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $RevertForward() {
+              let pos := mload(0)
+              returndatacopy(pos, 0, returndatasize())
+              revert(pos, returndatasize())
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StoreU128(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU128(offs, val)
+              }
+              default {
+                $StorageStoreU128(offs, val)
+              }
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $StorageStoreU128(offs, val) {
+              $StorageStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Shl(x, y) -> r {
+              r := shl(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU128(x) -> r {
+                if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := x
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::test_abi_S
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_abi_S" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_abi_S()
+        return (0, 0)
+        function A2_M_test_abi_S() {
+            let _s, s, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t15 := 100
+                    $t15 := 100
+                    // abort($t15)
+                    $Abort($t15)
+                }
+                case 4 {
+                    // $t4 := 42
+                    $t4 := 42
+                    // $t5 := true
+                    $t5 := true
+                    // $t2 := M::pack_S($t4, $t5)
+                    s := A2_M_pack_S($t4, $t5)
+                    // $t6 := copy($t2)
+                    $t6 := s
+                    // $t7 := M::encode_S($t6)
+                    $t7 := A2_M_encode_S($t6)
+                    // $t0 := M::decode_S($t7)
+                    _s := A2_M_decode_S($t7)
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, s)
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU64($t9)
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, _s)
+                    // $t12 := borrow_field<M::S>.a($t11)
+                    $t12 := $IndexPtr($t11, 32)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := ==($t10, $t13)
+                    $t14 := $Eq($t10, $t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t16 := borrow_local($t0)
+                    $t16 := $MakePtr(false, _s)
+                    // $t17 := borrow_field<M::S>.a($t16)
+                    $t17 := $IndexPtr($t16, 32)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU64($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 101
+                    $t21 := 101
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t2)
+                    $t22 := $MakePtr(false, s)
+                    // $t23 := borrow_field<M::S>.b($t22)
+                    $t23 := $IndexPtr($t22, 40)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU8($t23)
+                    // $t25 := borrow_local($t0)
+                    $t25 := $MakePtr(false, _s)
+                    // $t26 := borrow_field<M::S>.b($t25)
+                    $t26 := $IndexPtr($t25, 40)
+                    // $t27 := read_ref($t26)
+                    $t27 := $LoadU8($t26)
+                    // $t28 := ==($t24, $t27)
+                    $t28 := $Eq($t24, $t27)
+                    // if ($t28) goto L7 else goto L6
+                    switch $t28
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t29 := 102
+                    $t29 := 102
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 11 {
+                    // label L8
+                    // $t30 := borrow_local($t0)
+                    $t30 := $MakePtr(false, _s)
+                    // $t31 := borrow_field<M::S>.b($t30)
+                    $t31 := $IndexPtr($t30, 40)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := true
+                    $t33 := true
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 103
+                    $t35 := 103
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := borrow_local($t2)
+                    $t36 := $MakePtr(false, s)
+                    // $t37 := borrow_field<M::S>.c($t36)
+                    $t37 := $t36
+                    // $t3 := read_ref($t37)
+                    mstore($locals, $LoadU256($t37))
+                    if $IsStoragePtr($t37){
+                        let $storage_ptr_894856441
+                        let $size_894856441 := $StorageLoadU64(mload($locals))
+                        let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                        $storage_ptr_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                        let $data_size_894856441 := mul($size_894856441, 32)
+                        mstore($storage_ptr_894856441, $AlignedStorageLoad(mload($locals)))
+                        $MemoryStoreU64(add($storage_ptr_894856441, 8), $capacity_894856441)
+                        let $data_src_894856441 := add(mload($locals), 32)
+                        let $data_dst_894856441 := add($storage_ptr_894856441, 32)
+                        for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                            {
+                                let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                let $linked_dst_1602512591
+                                $linked_dst_1602512591 := $Malloc(32)
+                                {
+                                    let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                    let $linked_dst_2315022182
+                                    let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                    let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                    $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                                    mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                    $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                        mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                    }
+                                    mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                }
+                                mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                            }
+                        }
+                        mstore($locals, $storage_ptr_894856441)
+                    }
+                    // $t38 := borrow_local($t0)
+                    $t38 := $MakePtr(false, _s)
+                    // $t39 := borrow_field<M::S>.c($t38)
+                    $t39 := $t38
+                    // $t1 := read_ref($t39)
+                    mstore(add($locals, 32), $LoadU256($t39))
+                    if $IsStoragePtr($t39){
+                        let $storage_ptr_894856441
+                        let $size_894856441 := $StorageLoadU64(mload(add($locals, 32)))
+                        let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
+                        $storage_ptr_894856441 := $Malloc(add(32, mul($capacity_894856441, 32)))
+                        let $data_size_894856441 := mul($size_894856441, 32)
+                        mstore($storage_ptr_894856441, $AlignedStorageLoad(mload(add($locals, 32))))
+                        $MemoryStoreU64(add($storage_ptr_894856441, 8), $capacity_894856441)
+                        let $data_src_894856441 := add(mload(add($locals, 32)), 32)
+                        let $data_dst_894856441 := add($storage_ptr_894856441, 32)
+                        for { let $offs_894856441 := 0 } lt($offs_894856441, $data_size_894856441) { $offs_894856441 := add($offs_894856441, 32)} {
+                            {
+                                let $linked_src_1602512591 := $AlignedStorageLoad(add($data_src_894856441, $offs_894856441))
+                                let $linked_dst_1602512591
+                                $linked_dst_1602512591 := $Malloc(32)
+                                {
+                                    let $linked_src_2315022182 := $AlignedStorageLoad(add($linked_src_1602512591, 0))
+                                    let $linked_dst_2315022182
+                                    let $size_2315022182 := $StorageLoadU64($linked_src_2315022182)
+                                    let $capacity_2315022182 := $ClosestGreaterPowerOfTwo($size_2315022182)
+                                    $linked_dst_2315022182 := $Malloc(add(32, mul($capacity_2315022182, 16)))
+                                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                                    mstore($linked_dst_2315022182, $AlignedStorageLoad($linked_src_2315022182))
+                                    $MemoryStoreU64(add($linked_dst_2315022182, 8), $capacity_2315022182)
+                                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                                        mstore(add($data_dst_2315022182, $offs_2315022182), $AlignedStorageLoad(add($data_src_2315022182, $offs_2315022182)))
+                                    }
+                                    mstore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                                }
+                                mstore(add($data_dst_894856441, $offs_894856441), $linked_dst_1602512591)
+                            }
+                        }
+                        mstore(add($locals, 32), $storage_ptr_894856441)
+                    }
+                    // $t40 := borrow_local($t3)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := vector::length<M::S2>($t40)
+                    $t41 := A1_vector_length$A2_M_S2$($t40)
+                    // $t42 := 1
+                    $t42 := 1
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L13 else goto L12
+                    switch $t43
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t44 := 104
+                    $t44 := 104
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 17 {
+                    // label L14
+                    // $t45 := borrow_local($t1)
+                    $t45 := $MakePtr(false, add($locals, 32))
+                    // $t46 := vector::length<M::S2>($t45)
+                    $t46 := A1_vector_length$A2_M_S2$($t45)
+                    // $t47 := 1
+                    $t47 := 1
+                    // $t48 := ==($t46, $t47)
+                    $t48 := $Eq($t46, $t47)
+                    // if ($t48) goto L16 else goto L15
+                    switch $t48
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t49 := 105
+                    $t49 := 105
+                    // abort($t49)
+                    $Abort($t49)
+                }
+                case 20 {
+                    // label L17
+                    // $t50 := borrow_local($t1)
+                    $t50 := $MakePtr(false, add($locals, 32))
+                    // $t51 := 0
+                    $t51 := 0
+                    // $t52 := vector::borrow<M::S2>($t50, $t51)
+                    $t52 := A1_vector_borrow$A2_M_S2$($t50, $t51)
+                    // $t53 := borrow_field<M::S2>.x($t52)
+                    $t53 := $t52
+                    // $t54 := 0
+                    $t54 := 0
+                    // $t55 := vector::borrow<u128>($t53, $t54)
+                    $t55 := A1_vector_borrow$u128$($t53, $t54)
+                    // $t56 := read_ref($t55)
+                    $t56 := $LoadU128($t55)
+                    // $t57 := 42
+                    $t57 := 42
+                    // $t58 := ==($t56, $t57)
+                    $t58 := $Eq($t56, $t57)
+                    // if ($t58) goto L19 else goto L18
+                    switch $t58
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t59 := 106
+                    $t59 := 106
+                    // abort($t59)
+                    $Abort($t59)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u128$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 16)))
+        }
+        function A1_vector_borrow$A2_M_S2$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_M_S2$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_M_decode_S(input) -> $result  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result := abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$_from_memory($t1, $t3)
+        }
+        function A2_M_encode_S(s) -> $result  {
+            $result := mload(0)
+            let $t1 := add($result, 32)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t2 := abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$($t1,s)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := sub($t2, $t1)
+            $MemoryStoreU64($result, $t3)
+            let $t4 := $ClosestGreaterPowerOfTwo($t3)
+            $MemoryStoreU64(add($result, 8), $t4)
+            mstore(0, $t2)
+        }
+        function A2_M_pack_S(a, b) -> $result {
+            let s2, $t4, $t5, $t6, $t7, $t8
+            let $locals := $Malloc(32)
+            // $t3 := vector::empty<M::S2>()
+            mstore($locals, A1_vector_empty$A2_M_S2$())
+            // $t4 := (u128)($t0)
+            $t4 := $CastU128(a)
+            // $t5 := M::pack_S2($t4)
+            $t5 := A2_M_pack_S2($t4)
+            // $t6 := borrow_local($t3)
+            $t6 := $MakePtr(false, $locals)
+            // vector::push_back<M::S2>($t6, $t5)
+            A1_vector_push_back$A2_M_S2$($t6, $t5)
+            // $t7 := move($t3)
+            $t7 := mload($locals)
+            // $t8 := pack M::S($t0, $t1, $t7)
+            {
+                let $mem := $Malloc(41)
+                $MemoryStoreU64(add($mem, 32), a)
+                $MemoryStoreU8(add($mem, 40), b)
+                $MemoryStoreU256(add($mem, 0), $t7)
+                $t8 := $mem
+            }
+            // return $t8
+            $result := $t8
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_M_S2$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_1602512591 := $NewLinkedStorageBase(0x5f8466cf)
+                {
+                    let $linked_src_2315022182 := mload(add(e, 0))
+                    let $linked_dst_2315022182 := $NewLinkedStorageBase(0x89fc6f66)
+                    let $size_2315022182 := $MemoryLoadU64($linked_src_2315022182)
+                    let $data_size_2315022182 := mul($size_2315022182, 16)
+                    $AlignedStorageStore($linked_dst_2315022182, mload($linked_src_2315022182))
+                    let $data_src_2315022182 := add($linked_src_2315022182, 32)
+                    let $data_dst_2315022182 := add($linked_dst_2315022182, 32)
+                    for { let $offs_2315022182 := 0 } lt($offs_2315022182, $data_size_2315022182) { $offs_2315022182 := add($offs_2315022182, 32)} {
+                        $AlignedStorageStore(add($data_dst_2315022182, $offs_2315022182), mload(add($data_src_2315022182, $offs_2315022182)))
+                        $Free($linked_src_2315022182, add($data_size_2315022182, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_1602512591, 0), $linked_dst_2315022182)
+                }
+                $Free(e, 32)
+                $AlignedStorageStore(e_offs, $linked_dst_1602512591)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_M_pack_S2(x) -> $result {
+            let $t2, $t3, $t4
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<u128>()
+            mstore($locals, A1_vector_empty$u128$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<u128>($t2, $t0)
+            A1_vector_push_back$u128$($t2, x)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // $t4 := pack M::S2($t3)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t3)
+                $t4 := $mem
+            }
+            // return $t4
+            $result := $t4
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u128$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 16)))
+            $StoreU128(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 16)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u128$() -> vector {
+            vector := $Malloc(64)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$A2_M_S2$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_encode_tuple_$_uint64_bool__uint128______$_$A2_M_S$(headStart ,value_0) -> tail {
+            tail := add(headStart, 32)
+            mstore(add(headStart, 0), sub(tail, headStart))
+            tail := abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value_0,  tail)
+        }
+        function abi_encode_$uint64_bool__uint128_____$_$A2_M_S$(value, pos) -> end {
+            let tail := add(pos, 96)
+            let value_0 := $MemoryLoadU64(add(value, 32))
+            abi_encode_uint64(value_0, add(pos, 0))
+            let value_1 := $MemoryLoadU8(add(value, 40))
+            abi_encode_bool(value_1, add(pos, 32))
+            let value_2 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 64), sub(tail, pos))
+            tail := abi_encode__uint128______vec$A2_M_S2$(value_2, tail)
+            end := tail
+        }
+        function abi_encode__uint128______vec$A2_M_S2$(value, pos) -> end {
+            let length := $MemoryLoadU64(value)
+            mstore(pos, length)
+            pos := add(pos, 0x20)
+            let headStart := pos
+            let tail := add(pos, mul(length, 0x20))
+            let start := add(value, 32)
+            let srcEnd := add(start, mul(length, 32))
+            for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                mstore(pos, sub(tail, headStart))
+                let v := $MemoryLoadU256(src)
+                tail := abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(v, tail)
+                pos := add(pos, 0x20)
+            }
+            pos := tail
+            end := pos
+        }
+        function abi_encode_$uint128__$_$A2_M_S2$_with_updated_pos(value, pos) -> updated_pos{
+            updated_pos := abi_encode_$uint128__$_$A2_M_S2$(value, pos)
+        }
+        function abi_encode_$uint128__$_$A2_M_S2$(value, pos) -> end {
+            let tail := add(pos, 32)
+            let value_0 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 0), sub(tail, pos))
+            tail := abi_encode_uint128___vec$u128$(value_0, tail)
+            end := tail
+        }
+        function abi_encode_uint128___vec$u128$(value, pos) -> end {
+            let length := $MemoryLoadU64(value)
+            mstore(pos, length)
+            pos := add(pos, 0x20)
+            let start := add(value, 32)
+            let srcEnd := add(start, mul(length, 16))
+            for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+            {
+                let v := $MemoryLoadU128(src)
+                pos := abi_encode_uint128_with_updated_pos(v, pos)
+            }
+            end := pos
+        }
+        function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+            abi_encode_uint128(value, pos)
+            updated_pos := add(pos, 32)
+        }
+        function abi_encode_uint128(value, pos) {
+            mstore(pos, cleanup_uint128(value))
+        }
+        function cleanup_uint128(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+        }
+        function abi_encode_bool(value, pos) {
+            mstore(pos, cleanup_bool(value))
+        }
+        function cleanup_bool(value) -> cleaned {
+            cleaned := and(value, 0xff)
+        }
+        function abi_encode_uint64(value, pos) {
+            mstore(pos, cleanup_uint64(value))
+        }
+        function cleanup_uint64(value) -> cleaned {
+            cleaned := and(value, 0xffffffffffffffff)
+        }
+        function abi_decode_tuple_$_uint64_bool__uint128______$_$A2_M_S$_from_memory(headStart, dataEnd) -> value_0 {
+            if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_$uint64_bool__uint128_____$_$A2_M_S$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_$uint64_bool__uint128_____$_$A2_M_S$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 96) { $Abort(90) }
+            let value_0, value_1, value_2
+            value := $Malloc(96)
+            {
+                let offset := 0
+                value_0 := abi_decode_uint64_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU64(add(value, 32), value_0)
+            {
+                let offset := 32
+                value_1 := abi_decode_bool_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU8(add(value, 40), value_1)
+            {
+                let offset := mload(add(headStart, 64))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_2 := abi_decode__uint128______vec$A2_M_S2$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_2)
+        }
+        function abi_decode__uint128______vec$A2_M_S2$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(32, length), 32)
+            array := abi_decode_available_length___uint128______vec$A2_M_S2$_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length___uint128______vec$A2_M_S2$_from_memory(offset, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            let srcEnd := add(offset, mul(length, 32))
+            if gt(srcEnd, end) { $Abort(94) }
+            for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                let innerOffset := mload(src)
+                if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                let elementPos := add(offset, innerOffset)
+                let value := abi_decode_$uint128__$_$A2_M_S2$_from_memory(elementPos, end)
+                $MemoryStoreU256(dst, value)
+                dst := add(dst, 32)
+            }
+        }
+        function abi_decode_$uint128__$_$A2_M_S2$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 32) { $Abort(90) }
+            let value_0
+            value := $Malloc(32)
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_uint128___vec$u128$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_0)
+        }
+        function abi_decode_uint128___vec$u128$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(16, length), 32)
+            array := abi_decode_available_length__uint128___vec$u128$_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length__uint128___vec$u128$_from_memory(offset, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            let srcEnd := add(offset, mul(length, 32))
+            if gt(srcEnd, end) { $Abort(94) }
+            for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+            {
+                let elementPos := src
+                let value := abi_decode_uint128_from_memory(elementPos, end)
+                $MemoryStoreU128(dst, value)
+                dst := add(dst, 16)
+            }
+        }
+        function abi_decode_uint128_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint128(value)
+        }
+        function validator_uint128(value) {
+            if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+        }
+        function abi_decode_bool_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_bool(value)
+        }
+        function validator_bool(value) {
+            if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+        }
+        function abi_decode_uint64_from_memory(offset, end) -> value {
+            value := mload(offset)
+            validator_uint64(value)
+        }
+        function validator_uint64(value) {
+            if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU128(x) -> r {
+            if gt(x, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::test_abi_S: Succeed(Stopped) (used_gas=10789): []
+
+// test of M::test_abi_String
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_abi_String" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_abi_String()
+        return (0, 0)
+        function A2_M_test_abi_String() {
+            let _str, end, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35
+            let $locals := $Malloc(64)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L6
+                    // $t7 := <($t3, $t6)
+                    $t7 := $Lt(i, $t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t3 := $t5
+                    i := $t5
+                    // $t6 := 128
+                    $t6 := 128
+                    // $t4 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // goto L6
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // $t12 := move($t4)
+                    $t12 := mload($locals)
+                    // $t13 := ascii::string($t12)
+                    $t13 := A1_ascii_string($t12)
+                    // $t14 := M::encode_String($t13)
+                    $t14 := A2_M_encode_String($t13)
+                    // $t0 := M::decode_String($t14)
+                    _str := A2_M_decode_String($t14)
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, _str)
+                    // $t16 := ascii::as_bytes($t15)
+                    $t16 := A1_ascii_as_bytes($t15)
+                    // $t17 := vector::length<u8>($t16)
+                    $t17 := A1_vector_length$u8$($t16)
+                    // $t18 := 128
+                    $t18 := 128
+                    // $t19 := ==($t17, $t18)
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L8 else goto L7
+                    switch $t19
+                    case 0  { $block := 11 }
+                    default { $block := 10 }
+                }
+                case 6 {
+                    // label L2
+                    // $t8 := ascii::is_valid_char($t3)
+                    $t8 := A1_ascii_is_valid_char(i)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
+                }
+                case 7 {
+                    // label L4
+                    // goto L5
+                    $block := 9
+                }
+                case 8 {
+                    // label L3
+                    // $t9 := 0
+                    $t9 := 0
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 9 {
+                    // label L5
+                    // $t10 := borrow_local($t4)
+                    $t10 := $MakePtr(false, $locals)
+                    // vector::push_back<u8>($t10, $t3)
+                    A1_vector_push_back$u8$($t10, i)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t3 := +($t3, $t11)
+                    i := $AddU8(i, $t11)
+                    // goto L6
+                    $block := 2
+                }
+                case 10 {
+                    // label L8
+                    // goto L9
+                    $block := 12
+                }
+                case 11 {
+                    // label L7
+                    // $t20 := 100
+                    $t20 := 100
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 12 {
+                    // label L9
+                    // $t21 := move($t0)
+                    $t21 := _str
+                    // $t1 := ascii::into_bytes($t21)
+                    mstore(add($locals, 32), A1_ascii_into_bytes($t21))
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := vector::length<u8>($t22)
+                    $t23 := A1_vector_length$u8$($t22)
+                    // $t24 := 128
+                    $t24 := 128
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L11 else goto L10
+                    switch $t25
+                    case 0  { $block := 14 }
+                    default { $block := 13 }
+                }
+                case 13 {
+                    // label L11
+                    // goto L12
+                    $block := 15
+                }
+                case 14 {
+                    // label L10
+                    // $t26 := 99
+                    $t26 := 99
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 15 {
+                    // label L12
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t3 := $t27
+                    i := $t27
+                    // goto L19
+                    $block := 16
+                }
+                case 16 {
+                    // label L19
+                    // $t28 := <($t3, $t6)
+                    $t28 := $Lt(i, $t6)
+                    // if ($t28) goto L14 else goto L13
+                    switch $t28
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L14
+                    // goto L15
+                    $block := 19
+                }
+                case 18 {
+                    // label L13
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+                case 19 {
+                    // label L15
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := (u64)($t3)
+                    $t30 := $CastU64(i)
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := ==($t32, $t3)
+                    $t33 := $Eq($t32, i)
+                    // if ($t33) goto L17 else goto L16
+                    switch $t33
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
+                }
+                case 20 {
+                    // label L17
+                    // goto L18
+                    $block := 22
+                }
+                case 21 {
+                    // label L16
+                    // $t34 := (u64)($t3)
+                    $t34 := $CastU64(i)
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 22 {
+                    // label L18
+                    // $t35 := 1
+                    $t35 := 1
+                    // $t3 := +($t3, $t35)
+                    i := $AddU8(i, $t35)
+                    // goto L19
+                    $block := 16
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_ascii_into_bytes(string) -> $result {
+            let $t1
+            // $t1 := unpack ascii::String($t0)
+            $t1 := $MemoryLoadU256(add(string, 0))
+            $Free(string, 32)
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_ascii_is_valid_char(b) -> $result {
+            let $t1, $t2
+            // $t1 := 127
+            $t1 := 127
+            // $t2 := <=($t0, $t1)
+            $t2 := $LtEq(b, $t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_ascii_as_bytes(string) -> $result {
+            let $t1
+            // $t1 := borrow_field<ascii::String>.bytes($t0)
+            $t1 := string
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_M_decode_String(input) -> $result  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result := abi_decode_tuple_$_bytes_$_$A1_ascii_String$_from_memory($t1, $t3)
+        }
+        function A2_M_encode_String(s) -> $result  {
+            $result := mload(0)
+            let $t1 := add($result, 32)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t2 := abi_encode_tuple_$_bytes_$_$A1_ascii_String$($t1,s)
+            if gt($t2, 0xffffffffffffffff) { $AbortBuiltin() }
+            let $t3 := sub($t2, $t1)
+            $MemoryStoreU64($result, $t3)
+            let $t4 := $ClosestGreaterPowerOfTwo($t3)
+            $MemoryStoreU64(add($result, 8), $t4)
+            mstore(0, $t2)
+        }
+        function A1_ascii_string(bytes) -> $result {
+            let x, $t2, $t3, $t4, $t5, $t6
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 65536
+                    $t4 := 65536
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t1 := ascii::try_string($t0)
+                    x := A1_ascii_try_string(bytes)
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, x)
+                    // $t3 := option::is_some<ascii::String>($t2)
+                    $t3 := A1_option_is_some$A1_ascii_String$($t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := move($t1)
+                    $t5 := x
+                    // $t6 := option::destroy_some<ascii::String>($t5)
+                    $t6 := A1_option_destroy_some$A1_ascii_String$($t5)
+                    // return $t6
+                    $result := $t6
+                    leave
+                }
+            }
+        }
+
+        function A1_option_destroy_some$A1_ascii_String$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A1_ascii_String$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$A1_ascii_String$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$A1_ascii_String$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A1_ascii_String$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$A1_ascii_String$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                e := $Malloc(32)
+                {
+                    let $linked_src_2300595445 := $AlignedStorageLoad(add(linked_src, 0))
+                    let $linked_dst_2300595445
+                    let $size_2300595445 := $StorageLoadU64($linked_src_2300595445)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $linked_dst_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($linked_dst_2300595445, $AlignedStorageLoad($linked_src_2300595445))
+                    $MemoryStoreU64(add($linked_dst_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                    }
+                    mstore(add(e, 0), $linked_dst_2300595445)
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$A1_ascii_String$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A1_ascii_String$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$A1_ascii_String$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A1_ascii_String$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A1_ascii_String$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_ascii_try_string(bytes) -> $result {
+            let i, len, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+            let $locals := $Malloc(32)
+            mstore($locals, bytes)
+            let $block := 3
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L5
+                    // assert Le($t1, $t4)
+                    // assert forall j: Range(0, $t1): ascii::$is_valid_char(Index($t0, j))
+                    // $t6 := <($t1, $t4)
+                    $t6 := $Lt(i, $t4)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 5 }
+                    default { $block := 4 }
+                }
+                case 3 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t1 := $t5
+                    i := $t5
+                    // goto L5
+                    $block := 2
+                }
+                case 4 {
+                    // label L1
+                    // goto L2
+                    $block := 6
+                }
+                case 5 {
+                    // label L0
+                    // assert Eq<u64>($t1, $t4)
+                    // assert forall j: Range(0, $t4): ascii::$is_valid_char(Index($t0, j))
+                    // $t14 := move($t0)
+                    $t14 := mload($locals)
+                    // $t15 := pack ascii::String($t14)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
+                    }
+                    // $t16 := option::some<ascii::String>($t15)
+                    $t16 := A1_option_some$A1_ascii_String$($t15)
+                    // return $t16
+                    $result := $t16
+                    $Free($locals, 32)
+                    leave
+                }
+                case 6 {
+                    // label L2
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::borrow<u8>($t7, $t1)
+                    $t8 := A1_vector_borrow$u8$($t7, i)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU8($t8)
+                    // $t10 := ascii::is_valid_char($t9)
+                    $t10 := A1_ascii_is_valid_char($t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
+                }
+                case 7 {
+                    // label L4
+                    // $t12 := option::none<ascii::String>()
+                    $t12 := A1_option_none$A1_ascii_String$()
+                    // return $t12
+                    $result := $t12
+                    $Free($locals, 32)
+                    leave
+                }
+                case 8 {
+                    // label L3
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t1 := +($t1, $t13)
+                    i := $AddU64(i, $t13)
+                    // goto L5
+                    $block := 2
+                }
+            }
+        }
+
+        function A1_option_none$A1_ascii_String$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A1_ascii_String$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A1_ascii_String$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$A1_ascii_String$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$A1_ascii_String$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$A1_ascii_String$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$A1_ascii_String$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$A1_ascii_String$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A1_ascii_String$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_57814254 := $NewLinkedStorageBase(0x3722cee)
+                {
+                    let $linked_src_2300595445 := mload(add(e, 0))
+                    let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                    let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_57814254, 0), $linked_dst_2300595445)
+                }
+                $Free(e, 32)
+                $AlignedStorageStore(e_offs, $linked_dst_57814254)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function abi_encode_tuple_$_bytes_$_$A1_ascii_String$(headStart ,value_0) -> tail {
+            tail := add(headStart, 32)
+            mstore(add(headStart, 0), sub(tail, headStart))
+            tail := abi_encode_$bytes$_$A1_ascii_String$(value_0,  tail)
+        }
+        function abi_encode_$bytes$_$A1_ascii_String$(value, pos) -> end {
+            let tail := add(pos, 32)
+            let value_0 := $MemoryLoadU256(add(value, 0))
+            mstore(add(pos, 0), sub(tail, pos))
+            tail := abi_encode_bytes(value_0, tail)
+            end := tail
+        }
+        function abi_encode_bytes(value, pos) -> end{
+            let size := $MemoryLoadU64(value)
+            mstore(pos, size)
+            pos := add(pos, 0x20)
+            $CopyMemory(add(value, 0x20), pos, size)
+            size := $RoundUp(size)
+            end := add(pos, size)
+        }
+        function abi_decode_tuple_$_bytes_$_$A1_ascii_String$_from_memory(headStart, dataEnd) -> value_0 {
+            if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_$bytes$_$A1_ascii_String$_from_memory(add(headStart, offset), dataEnd)
+            }
+        }
+        function abi_decode_$bytes$_$A1_ascii_String$_from_memory(headStart, end) -> value {
+            if slt(sub(end, headStart), 32) { $Abort(90) }
+            let value_0
+            value := $Malloc(32)
+            {
+                let offset := mload(add(headStart, 0))
+                if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                value_0 := abi_decode_bytes_vec$u8$_from_memory(add(headStart, offset), end)
+            }
+            $MemoryStoreU256(add(value, 0), value_0)
+        }
+        function abi_decode_bytes_vec$u8$_from_memory(offset, end) -> array {
+            if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+            let length := mload(offset)
+            let size := add(mul(1, length), 32)
+            array := abi_decode_available_length__bytes_from_memory(add(offset, 0x20), length, size, end)
+        }
+        function abi_decode_available_length__bytes_from_memory(src, length, size, end) -> array {
+            array := $Malloc($CheckMemorySize(size))
+            $MemoryStoreU64(array, length)
+            $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+            let dst := add(array, 32)
+            if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+            $CopyFromMemoryToMemory(src, dst, length)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $CheckMemorySize(len) -> checked_len {
+            if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+            checked_len := len
+        }
+        function $CopyFromMemoryToMemory(src, dst, length) {
+          let i := 0
+          for { } lt(i, length) { i := add(i, 32) }
+          {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if gt(i, length)
+          {
+            // clear end
+            mstore(add(dst, length), 0)
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $AddU64(x, y) -> r {
+            if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $AddU8(x, y) -> r {
+            if lt(sub(0xff, x), y) { $AbortBuiltin() }
+            r := add(x, y)
+        }
+        function $Lt(x, y) -> r {
+            r := lt(x, y)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LtEq(x, y) -> r {
+            r := or(lt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU64(x) -> r {
+            if gt(x, 0xffffffffffffffff) { $AbortBuiltin() }
+            r := x
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of M::test_abi_String: Succeed(Stopped) (used_gas=646767): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.move b/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.move
new file mode 100644
index 000000000..615f1771e
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestABIStructs.move
@@ -0,0 +1,134 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+    use std::ascii::{Self, String};
+    use Evm::Evm::{emit};
+
+    #[decode(sig=b"decode_S(bytes) returns (S)")]
+    public native fun decode_S(input: vector<u8>) :S;
+
+    #[encode(sig=b"encode_S(S) returns (bytes)")]
+    public native fun encode_S(s: S) : vector<u8>;
+
+    #[decode(sig=b"decode_String(bytes) returns (String)")]
+    public native fun decode_String(input: vector<u8>) :String;
+
+    #[encode(sig=b"encode_String(String) returns (bytes)")]
+    public native fun encode_String(s: String) : vector<u8>;
+
+    #[external(sig=b"safeTransferFrom(S) returns (S2)")]
+    public native fun safe_transfer_form(contract: address, s: S): S2;
+
+    #[abi_struct(sig=b"S(uint64, bool, S2[])")]
+    struct S has drop, copy {
+        a: u64,
+        b: bool,
+        c: vector<S2>
+    }
+
+    #[abi_struct(sig=b"S2(uint128[])")]
+    struct S2 has drop, copy {
+        x: vector<u128>
+    }
+
+    #[event(sig=b"Event_S(S)")]
+    struct Event_S {
+        s: S
+    }
+
+    #[callable]
+    fun do_transfer(){
+        let s = pack_S(42, true);
+        emit(Event_S{s});
+    }
+
+    fun pack_S2(x: u128): S2 {
+        let v = vector::empty<u128>();
+        vector::push_back(&mut v, x);
+        S2{x:v}
+    }
+
+    fun pack_S(a: u64, b: bool): S {
+        let v = vector::empty<S2>();
+        let s2 = pack_S2((a as u128));
+        vector::push_back(&mut v, s2);
+        S{a, b, c: v}
+    }
+
+    #[evm_test]
+    fun test_abi_S() {
+        let s = pack_S(42, true);
+        let v = encode_S(s);
+        let _s = decode_S(v);
+        assert!(s.a == _s.a, 100);
+        assert!(_s.a == 42, 101);
+        assert!(s.b == _s.b, 102);
+        assert!(_s.b == true, 103);
+        let s2 = s.c;
+        let _s2 = _s.c;
+        assert!(vector::length(&s2) == 1, 104);
+        assert!(vector::length(&_s2) == 1, 105);
+        let _s2x = vector::borrow(&_s2, 0);
+        assert!(*vector::borrow(&_s2x.x, 0) == 42, 106);
+    }
+
+    #[evm_test]
+    fun test_abi_String() {
+        let i = 0;
+        let end = 128;
+        let vec = vector::empty();
+
+        while (i < end) {
+            assert!(ascii::is_valid_char(i), 0);
+            vector::push_back(&mut vec, i);
+            i = i + 1;
+        };
+
+        let str = ascii::string(vec);
+        let v = encode_String(str);
+        let _str = decode_String(v);
+
+        assert!(vector::length(ascii::as_bytes(&_str)) == 128, 100);
+        // This call to all_characters_printable will lead to solc compiler error:
+        // Error: Cannot use builtin function name "byte" as identifier name.
+        // let byte, i, len...
+        // assert!(!ASCII::all_characters_printable(&_str), 1);
+        let bytes = ascii::into_bytes(_str);
+        assert!(vector::length(&bytes) == 128, 99);
+
+        i = 0;
+        while (i < end) {
+            assert!(*vector::borrow(&bytes, (i as u64)) == i, (i as u64));
+            i = i + 1;
+        };
+
+    }
+
+    #[callable(sig=b"test() returns (S)")]
+    fun test_pack_S(): S {
+        pack_S(42, true)
+    }
+
+    #[callable(sig=b"test_2(S) returns (S)")]
+    fun test_2_S(s: S): S {
+        s
+    }
+
+    #[callable(sig=b"test_array(S[][2]) returns (S[])")]
+    fun test_array(v: vector<vector<S>>): vector<S> {
+        *vector::borrow(&v, 0)
+    }
+
+    #[callable(sig=b"test_s_struct(String) returns (String)")]
+    fun test_String_struct(s: String) : String {
+        s
+    }
+
+    #[callable]
+    fun test_safe_transfer_from(): S2 {
+        let contract_addr = @3;
+        let s = pack_S(42, true);
+        safe_transfer_form(contract_addr, s)
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.exp b/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.exp
new file mode 100644
index 000000000..0efdfd006
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.exp
@@ -0,0 +1,3230 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::extract_err_data
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_err_data" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_err_data()
+        return (0, 0)
+        function A2_M_extract_err_data() {
+            let v2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 102
+                    $t8 := 102
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := move($t0)
+                    $t5 := mload($locals)
+                    // $t1 := M::pack_err_data<u64>($t5)
+                    v2 := A2_M_pack_err_data$u64$($t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, v2)
+                    // $t7 := ExternalResult::is_err_data<u64>($t6)
+                    $t7 := A2_ExternalResult_is_err_data$u64$($t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_data<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_data$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 103
+                    $t14 := 103
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 104
+                    $t21 := 104
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_unwrap_err_data$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t5)
+            $t8 := A1_option_destroy_some$vec$u8$$($t5)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$vec$u8$$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$vec$u8$$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$vec$u8$$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$vec$u8$$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                let $size_2300595445 := $StorageLoadU64(linked_src)
+                let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                e := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                mstore(e, $AlignedStorageLoad(linked_src))
+                $MemoryStoreU64(add(e, 8), $capacity_2300595445)
+                let $data_src_2300595445 := add(linked_src, 32)
+                let $data_dst_2300595445 := add(e, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_err_data$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_data($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 32)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_data$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_data<#0>($t0)
+            $t1 := A2_ExternalResult_err_data$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_data$u64$(error) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::none<#0>()
+            $t1 := A1_option_none$u64$()
+            // $t2 := option::some<vector<u8>>($t0)
+            $t2 := A1_option_some$vec$u8$$(error)
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::extract_err_data: Succeed(Stopped) (used_gas=6994): []
+
+// test of M::extract_err_reason
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_err_reason" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_err_reason()
+        return (0, 0)
+        function A2_M_extract_err_reason() {
+            let v2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t8 := 105
+                    $t8 := 105
+                    // abort($t8)
+                    $Abort($t8)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 42
+                    $t4 := 42
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := move($t0)
+                    $t5 := mload($locals)
+                    // $t1 := M::pack_err_reason<u64>($t5)
+                    v2 := A2_M_pack_err_reason$u64$($t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, v2)
+                    // $t7 := ExternalResult::is_err_reason<u64>($t6)
+                    $t7 := A2_ExternalResult_is_err_reason$u64$($t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_reason<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_reason$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t14 := 106
+                    $t14 := 106
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 8 {
+                    // label L5
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 107
+                    $t21 := 107
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_unwrap_err_reason$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t6)
+            $t8 := A1_option_destroy_some$vec$u8$$($t6)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$vec$u8$$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$vec$u8$$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$vec$u8$$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$vec$u8$$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                let $size_2300595445 := $StorageLoadU64(linked_src)
+                let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                e := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                mstore(e, $AlignedStorageLoad(linked_src))
+                $MemoryStoreU64(add(e, 8), $capacity_2300595445)
+                let $data_src_2300595445 := add(linked_src, 32)
+                let $data_dst_2300595445 := add(e, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_err_reason$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 64)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_reason$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_reason<#0>($t0)
+            $t1 := A2_ExternalResult_err_reason$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_reason$u64$(error) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::some<vector<u8>>($t0)
+            $t6 := A1_option_some$vec$u8$$(error)
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::none<U256::U256>()
+            $t8 := A1_option_none$A2_U256_U256$()
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::extract_err_reason: Succeed(Stopped) (used_gas=6988): []
+
+// test of M::extract_panic_code
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_panic_code" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_panic_code()
+        return (0, 0)
+        function A2_M_extract_panic_code() {
+            let v2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 108
+                    $t5 := 108
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := U256::u256_from_u128($t1)
+                    $t2 := A2_U256_u256_from_u128($t1)
+                    // $t0 := M::pack_panic_code<u64>($t2)
+                    v2 := A2_M_pack_panic_code$u64$($t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, v2)
+                    // $t4 := ExternalResult::is_panic<u64>($t3)
+                    $t4 := A2_ExternalResult_is_panic$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := v2
+                    // $t7 := ExternalResult::unwrap_panic<u64>($t6)
+                    $t7 := A2_ExternalResult_unwrap_panic$u64$($t6)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := U256::u256_from_u128($t8)
+                    $t9 := A2_U256_u256_from_u128($t8)
+                    // $t10 := ==($t7, $t9)
+                    $t10 := $Eq($t7, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 109
+                    $t11 := 109
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_U256_u256_from_u128(lo) -> $result {
+            let $t1, $t2
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := (u256)($t1, $t0)
+            $t2 := $CastU256($t1, lo)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_ExternalResult_unwrap_panic$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // $t8 := option::destroy_some<U256::U256>($t7)
+            $t8 := A1_option_destroy_some$A2_U256_U256$($t7)
+            // return $t8
+            $result := $t8
+        }
+
+        function A1_option_destroy_some$A2_U256_U256$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$A2_U256_U256$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$A2_U256_U256$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$A2_U256_U256$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$A2_U256_U256$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$u64$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_option_is_none$u64$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_panic$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 96)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<U256::U256>($t1)
+            $t2 := A1_option_is_some$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_panic_code$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::panic<#0>($t0)
+            $t1 := A2_ExternalResult_panic$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_panic$u64$(panic_code) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::none<vector<u8>>()
+            $t6 := A1_option_none$vec$u8$$()
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::some<U256::U256>($t0)
+            $t8 := A1_option_some$A2_U256_U256$(panic_code)
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_some$A2_U256_U256$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$A2_U256_U256$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$A2_U256_U256$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$A2_U256_U256$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$A2_U256_U256$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $CastU256(hi, lo) -> r {
+            if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+            r := add(shl(128, hi), lo)
+        }
+    }
+}
+===> Test result of M::extract_panic_code: Succeed(Stopped) (used_gas=5168): []
+
+// test of M::extract_value
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_value" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_value()
+        return (0, 0)
+        function A2_M_extract_value() {
+            let v2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t4 := 100
+                    $t4 := 100
+                    // abort($t4)
+                    $Abort($t4)
+                }
+                case 4 {
+                    // $t1 := 100
+                    $t1 := 100
+                    // $t0 := M::pack_value<u64>($t1)
+                    v2 := A2_M_pack_value$u64$($t1)
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, v2)
+                    // $t3 := ExternalResult::is_ok<u64>($t2)
+                    $t3 := A2_ExternalResult_is_ok$u64$($t2)
+                    // if ($t3) goto L1 else goto L0
+                    switch $t3
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := move($t0)
+                    $t5 := v2
+                    // $t6 := ExternalResult::unwrap<u64>($t5)
+                    $t6 := A2_ExternalResult_unwrap$u64$($t5)
+                    // $t7 := 100
+                    $t7 := 100
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A2_ExternalResult_unwrap$u64$(result) -> $result {
+            let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+            // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t5 := $MemoryLoadU256(add(result, 0))
+            $t6 := $MemoryLoadU256(add(result, 32))
+            $t7 := $MemoryLoadU256(add(result, 64))
+            $t8 := $MemoryLoadU256(add(result, 96))
+            $Free(result, 128)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<vector<u8>>($t7)
+            A1_option_destroy_none$vec$u8$$($t7)
+            // option::destroy_none<U256::U256>($t8)
+            A1_option_destroy_none$A2_U256_U256$($t8)
+            // $t9 := option::destroy_some<#0>($t5)
+            $t9 := A1_option_destroy_some$u64$($t5)
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_destroy_some$u64$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$u64$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$u64$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_option_is_some$u64$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$A2_U256_U256$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$A2_U256_U256$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_option_destroy_none$vec$u8$$(t) {
+            let $t1, $t2, $t3, $t4, $t5
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
+                }
+                case 4 {
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_option_is_none$vec$u8$$(t) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_ok$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+            {
+                $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+            }
+            // $t2 := option::is_some<#0>($t1)
+            $t2 := A1_option_is_some$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_value$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::ok<#0>($t0)
+            $t1 := A2_ExternalResult_ok$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_ok$u64$(value) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::some<#0>($t0)
+            $t1 := A1_option_some$u64$(value)
+            // $t2 := option::none<vector<u8>>()
+            $t2 := A1_option_none$vec$u8$$()
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$u64$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$u64$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of M::extract_value: Succeed(Stopped) (used_gas=5103): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.move b/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.move
new file mode 100644
index 000000000..0a5592806
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestExternalResult.move
@@ -0,0 +1,60 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::U256::{Self, U256};
+    use std::vector;
+
+    #[evm_test]
+    fun extract_value(){
+        let v2 = pack_value(100u64);
+        assert!(ExternalResult::is_ok(&v2), 100);
+        assert!(ExternalResult::unwrap(v2) == 100, 101);
+    }
+
+    #[evm_test]
+    fun extract_err_data(){
+        let v = vector::empty<u8>();
+        vector::push_back(&mut v, 42u8);
+        let v2 = pack_err_data<u64>(v);
+        assert!(ExternalResult::is_err_data(&v2), 102);
+        let v3 = ExternalResult::unwrap_err_data(v2);
+        assert!(vector::length(&v3) == 1, 103);
+        assert!(*vector::borrow(&v3, 0) == 42, 104);
+    }
+
+    #[evm_test]
+    fun extract_err_reason() {
+        let v = vector::empty<u8>();
+        vector::push_back(&mut v, 42u8);
+        let v2 = pack_err_reason<u64>(v);
+        assert!(ExternalResult::is_err_reason(&v2), 105);
+        let v3 = ExternalResult::unwrap_err_reason(v2);
+        assert!(vector::length(&v3) == 1, 106);
+        assert!(*vector::borrow(&v3, 0) == 42, 107);
+    }
+
+    #[evm_test]
+    fun extract_panic_code() {
+        let v2 = pack_panic_code<u64>(U256::u256_from_u128(42));
+        assert!(ExternalResult::is_panic(&v2), 108);
+        let v = ExternalResult::unwrap_panic<u64>(v2);
+        assert!(v == U256::u256_from_u128(42), 109);
+    }
+
+    fun pack_value<T>(v: T): ExternalResult<T> {
+        ExternalResult::ok<T>(v)
+    }
+
+    fun pack_err_data<T>(v: vector<u8>): ExternalResult<T> {
+        ExternalResult::err_data(v)
+    }
+
+    fun pack_err_reason<T>(v: vector<u8>): ExternalResult<T> {
+        ExternalResult::err_reason(v)
+    }
+
+    fun pack_panic_code<T>(v: U256): ExternalResult<T> {
+        ExternalResult::panic(v)
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.exp b/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.exp
new file mode 100644
index 000000000..7ff6ff55a
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.exp
@@ -0,0 +1,887 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            $Abort(97)
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of M::h1
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_h1" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_h1()
+        return (0, 0)
+        function A2_M_h1() {
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75
+            let $locals := $Malloc(96)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t14 := 96
+                    $t14 := 96
+                    // abort($t14)
+                    $Abort($t14)
+                }
+                case 4 {
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := [97, 98, 99]
+                    $t5 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t5, 3)
+                    $MemoryStoreU64(add($t5, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t5, 32))
+                    // $t6 := pack M::T($t5)
+                    {
+                        let $mem := $Malloc(32)
+                        $MemoryStoreU256(add($mem, 0), $t5)
+                        $t6 := $mem
+                    }
+                    // move_to<M::T>($t6, $t4)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256($t4))
+                        if $AlignedStorageLoad($base_offset) {
+                          $AbortBuiltin()
+                        }
+                        $AlignedStorageStore($base_offset, true)
+                        {
+                            let $dst := add($base_offset, 32)
+                            let $src := $t6
+                            {
+                                let $linked_src_2300595445 := mload(add($src, 0))
+                                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                                let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                                let $data_size_2300595445 := mul($size_2300595445, 1)
+                                $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                                let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                    $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                                }
+                                $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                            }
+                            $Free($src, 32)
+                        }
+                    }
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t8 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    $t9 := $t8
+                    // $t1 := read_ref($t9)
+                    mstore(add($locals, 32), $LoadU256($t9))
+                    if $IsStoragePtr($t9){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 32)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 32))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 32)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 32), $storage_ptr_2300595445)
+                    }
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 3
+                    $t12 := 3
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t15 := borrow_local($t1)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 97
+                    $t19 := 97
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t21 := 97
+                    $t21 := 97
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 8 {
+                    // label L5
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := 1
+                    $t23 := 1
+                    // $t24 := vector::borrow<u8>($t22, $t23)
+                    $t24 := A1_vector_borrow$u8$($t22, $t23)
+                    // $t25 := read_ref($t24)
+                    $t25 := $LoadU8($t24)
+                    // $t26 := 98
+                    $t26 := 98
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L7 else goto L6
+                    switch $t27
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t28 := 98
+                    $t28 := 98
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 11 {
+                    // label L8
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := 2
+                    $t30 := 2
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := 99
+                    $t33 := 99
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 99
+                    $t35 := 99
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := [101, 102, 103, 104]
+                    $t36 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t36, 4)
+                    $MemoryStoreU64(add($t36, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_2788570470(add($t36, 32))
+                    // $t37 := 0x3
+                    $t37 := 0x3
+                    // $t38 := borrow_global<M::T>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<M::T>.s($t38)
+                    $t39 := $t38
+                    // write_ref($t39, $t36)
+                    if $IsStoragePtr($t39){
+                        let $storage_ptr_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                        let $size_2300595445 := $MemoryLoadU64($t36)
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        $AlignedStorageStore($storage_ptr_2300595445, mload($t36))
+                        let $data_src_2300595445 := add($t36, 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        $t36 := $storage_ptr_2300595445
+                    }
+                    $StoreU256($t39, $t36)
+                    // $t40 := 0x3
+                    $t40 := 0x3
+                    // $t41 := borrow_global<M::T>($t40)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t40)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t41 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t42 := borrow_field<M::T>.s($t41)
+                    $t42 := $t41
+                    // $t2 := read_ref($t42)
+                    mstore(add($locals, 64), $LoadU256($t42))
+                    if $IsStoragePtr($t42){
+                        let $storage_ptr_2300595445
+                        let $size_2300595445 := $StorageLoadU64(mload(add($locals, 64)))
+                        let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                        $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                        let $data_size_2300595445 := mul($size_2300595445, 1)
+                        mstore($storage_ptr_2300595445, $AlignedStorageLoad(mload(add($locals, 64))))
+                        $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                        let $data_src_2300595445 := add(mload(add($locals, 64)), 32)
+                        let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                        for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                            mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        }
+                        mstore(add($locals, 64), $storage_ptr_2300595445)
+                    }
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := vector::length<u8>($t43)
+                    $t44 := A1_vector_length$u8$($t43)
+                    // $t45 := 4
+                    $t45 := 4
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L13 else goto L12
+                    switch $t46
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t47 := 100
+                    $t47 := 100
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 17 {
+                    // label L14
+                    // $t48 := borrow_local($t2)
+                    $t48 := $MakePtr(false, add($locals, 64))
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t50 := vector::borrow<u8>($t48, $t49)
+                    $t50 := A1_vector_borrow$u8$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU8($t50)
+                    // $t52 := 101
+                    $t52 := 101
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L16 else goto L15
+                    switch $t53
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t54 := 101
+                    $t54 := 101
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 20 {
+                    // label L17
+                    // $t55 := borrow_local($t2)
+                    $t55 := $MakePtr(false, add($locals, 64))
+                    // $t56 := 1
+                    $t56 := 1
+                    // $t57 := vector::borrow<u8>($t55, $t56)
+                    $t57 := A1_vector_borrow$u8$($t55, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU8($t57)
+                    // $t59 := 102
+                    $t59 := 102
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L19 else goto L18
+                    switch $t60
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t61 := 102
+                    $t61 := 102
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 23 {
+                    // label L20
+                    // $t62 := borrow_local($t2)
+                    $t62 := $MakePtr(false, add($locals, 64))
+                    // $t63 := 2
+                    $t63 := 2
+                    // $t64 := vector::borrow<u8>($t62, $t63)
+                    $t64 := A1_vector_borrow$u8$($t62, $t63)
+                    // $t65 := read_ref($t64)
+                    $t65 := $LoadU8($t64)
+                    // $t66 := 103
+                    $t66 := 103
+                    // $t67 := ==($t65, $t66)
+                    $t67 := $Eq($t65, $t66)
+                    // if ($t67) goto L22 else goto L21
+                    switch $t67
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t68 := 103
+                    $t68 := 103
+                    // abort($t68)
+                    $Abort($t68)
+                }
+                case 26 {
+                    // label L23
+                    // $t69 := borrow_local($t2)
+                    $t69 := $MakePtr(false, add($locals, 64))
+                    // $t70 := 3
+                    $t70 := 3
+                    // $t71 := vector::borrow<u8>($t69, $t70)
+                    $t71 := A1_vector_borrow$u8$($t69, $t70)
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU8($t71)
+                    // $t73 := 104
+                    $t73 := 104
+                    // $t74 := ==($t72, $t73)
+                    $t74 := $Eq($t72, $t73)
+                    // if ($t74) goto L25 else goto L24
+                    switch $t74
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t75 := 104
+                    $t75 := 104
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 29 {
+                    // label L26
+                    // return ()
+                    $Free($locals, 96)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
+        function A1_vector_length$u8$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
+        function copy_literal_string_to_memory_2788570470(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 102)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of M::h1: Succeed(Stopped) (used_gas=170443): []
+
+// test of M::test_same_literals
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_test_same_literals" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_test_same_literals()
+        return (0, 0)
+        function A2_M_test_same_literals() {
+            let $t0, $t1, $t2, $t3
+            // $t0 := true
+            $t0 := true
+            // $t1 := [101, 114, 114, 111, 114, 95, 109, 101, 115, 115, 97, 103, 101]
+            $t1 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t1, 13)
+            $MemoryStoreU64(add($t1, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_3855568786(add($t1, 32))
+            // Evm::require($t0, $t1)
+            A2_Evm_require($t0, $t1)
+            // $t2 := true
+            $t2 := true
+            // $t3 := [101, 114, 114, 111, 114, 95, 109, 101, 115, 115, 97, 103, 101]
+            $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(13)))
+            $MemoryStoreU64($t3, 13)
+            $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(13))
+            copy_literal_string_to_memory_3855568786(add($t3, 32))
+            // Evm::require($t2, $t3)
+            A2_Evm_require($t2, $t3)
+            // return ()
+        }
+
+        function A2_Evm_require(cond, message) {
+            let $t2
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // Evm::abort_with($t1)
+                    A2_Evm_abort_with(message)
+                    // goto L0
+                    $block := 3
+                }
+                case 3 {
+                    // label L0
+                    // return ()
+                    leave
+                }
+                case 4 {
+                    // $t2 := !($t0)
+                    $t2 := $LogicalNot(cond)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+            }
+        }
+
+        function A2_Evm_abort_with(message) {
+          let head := $Malloc(32)
+          // store the function selector for Error(string)
+          mstore(head, 3963877391197344453575983046348115674221700746820753546331534351508065746944)
+          let pos := add(head, 4)
+          mstore(pos, 32)
+          pos := add(pos, 32)
+          let size := $MemoryLoadU64(message)
+          mstore(pos, size)
+          pos := add(pos, 32)
+          $CopyMemory(add(message, 32), pos, size)
+          size := $RoundUp(size)
+          let end := add(pos, size)
+          revert(head, sub(end, head))
+        }
+        function copy_literal_string_to_memory_3855568786(value) {
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 111)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 114)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 95)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 109)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 115)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+        function $RoundUp(value) -> result {
+            result := and(add(value, 31), not(31))
+        }
+    }
+}
+===> Test result of M::test_same_literals: Succeed(Returned) (used_gas=1078): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.move b/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.move
new file mode 100644
index 000000000..4844ce711
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/TestStringLiteral.move
@@ -0,0 +1,36 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+    use Evm::Evm::{sign, require};
+
+    struct T has key, drop {
+        s: vector<u8>
+    }
+
+    #[evm_test]
+    fun h1() acquires T {
+        let x = b"abc";
+        let t = T { s: x } ;
+        move_to<T>(&sign(@3), t);
+        let v = borrow_global<T>(@3).s;
+        assert!(vector::length(&v) == 3, 96);
+        assert!(*vector::borrow(&v, 0) == 97, 97);
+        assert!(*vector::borrow(&v, 1) == 98u8, 98);
+        assert!(*vector::borrow(&v, 2) == 99u8, 99);
+        borrow_global_mut<T>(@3).s = b"efgh";
+        let v = borrow_global<T>(@3).s;
+        assert!(vector::length(&v) == 4, 100);
+        assert!(*vector::borrow(&v, 0) == 101u8, 101);
+        assert!(*vector::borrow(&v, 1) == 102u8, 102);
+        assert!(*vector::borrow(&v, 2) == 103u8, 103);
+        assert!(*vector::borrow(&v, 3) == 104u8, 104);
+
+    }
+
+    #[evm_test]
+    public fun test_same_literals() {
+        require(true, b"error_message");
+        require(true, b"error_message");
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/U256Arith.exp b/vendors/move/crates/evm/move-to-yul/tests/U256Arith.exp
new file mode 100644
index 000000000..1a2b2270f
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/U256Arith.exp
@@ -0,0 +1,459 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_U256Arith" {
+    code {
+        codecopy(0, dataoffset("A2_U256Arith_deployed"), datasize("A2_U256Arith_deployed"))
+        return(0, datasize("A2_U256Arith_deployed"))
+    }
+    object "A2_U256Arith_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x4f2be91f
+                {
+                    // add()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_add()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf9fa48c3
+                {
+                    // div()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_div()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb5165b60
+                {
+                    // eq()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_eq()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4e507d6a
+                {
+                    // ge()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_ge()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaf0ab80a
+                {
+                    // gt()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_gt()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdcc78377
+                {
+                    // le()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_le()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22ca2a6
+                {
+                    // lt()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_lt()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2986e054
+                {
+                    // mod()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_mod()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x58931c46
+                {
+                    // mul()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_mul()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x83a93813
+                {
+                    // ne()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_ne()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xcad85866
+                {
+                    // shl()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_shl()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb87f777a
+                {
+                    // shr()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_shr()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xc54124be
+                {
+                    // sub()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_U256Arith_sub()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5c32cfdd
+                {
+                    // cast(uint128,uint128)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint128_uint128$_$u128_u128$(4, calldatasize())
+                    let ret_0 := A2_U256Arith_cast(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_U256Arith_add() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU256($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_div() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := /($t2, $t3)
+                $t4 := $Div($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_eq() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := ==($t2, $t3)
+                $t4 := $Eq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_ge() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := >=($t2, $t3)
+                $t4 := $GtEq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_gt() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := >($t2, $t3)
+                $t4 := $Gt($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_le() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := <=($t2, $t3)
+                $t4 := $LtEq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_lt() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := <($t2, $t3)
+                $t4 := $Lt($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_mod() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := %($t2, $t3)
+                $t4 := $Mod($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_mul() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := *($t2, $t3)
+                $t4 := $MulU256($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_ne() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := !=($t2, $t3)
+                $t4 := $Neq($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_shl() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := <<($t0, $t1)
+                $t2 := $ShlU256($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_U256Arith_shr() -> $result {
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := >>($t0, $t1)
+                $t2 := $Shr($t0, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_U256Arith_sub() -> $result {
+                let x, y, $t2, $t3, $t4
+                // $t2 := 2041694201525630780780247644590609268738
+                $t2 := 2041694201525630780780247644590609268738
+                // $t3 := 1701411834604692317316873037158841057281
+                $t3 := 1701411834604692317316873037158841057281
+                // $t4 := -($t2, $t3)
+                $t4 := $Sub($t2, $t3)
+                // return $t4
+                $result := $t4
+            }
+
+            function A2_U256Arith_cast(x, y) -> $result {
+                let $t2
+                // $t2 := (u256)($t0, $t1)
+                $t2 := $CastU256(x, y)
+                // return $t2
+                $result := $t2
+            }
+
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128_uint128$_$u128_u128$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU256(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $MulU256(x, y) -> r {
+                if gt(y, div(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x)) { $AbortBuiltin() }
+                r := mul(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Div(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := div(x, y)
+            }
+            function $Mod(x, y) -> r {
+                if eq(y, 0) { $AbortBuiltin() }
+                r := mod(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ShlU256(x, y) -> r {
+                r := and(shl(y, x), 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function $Gt(x, y) -> r {
+                r := gt(x, y)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LtEq(x, y) -> r {
+                r := or(lt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU256(hi, lo) -> r {
+                if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := add(shl(128, hi), lo)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/U256Arith.move b/vendors/move/crates/evm/move-to-yul/tests/U256Arith.move
new file mode 100644
index 000000000..bc6e31aa2
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/U256Arith.move
@@ -0,0 +1,100 @@
+// Tests basic arithmetics with u256s.
+// dep: ../stdlib/sources/U256.move
+#[evm_contract]
+module 0x2::U256Arith {
+    use Evm::U256::{Self, U256, u256_from_words};
+
+    #[callable]
+    fun cast(x: u128, y: u128): U256 {
+        u256_from_words(x, y)
+    }
+
+    #[callable]
+    fun add(): U256 {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::add(x, y)
+    }
+
+    #[callable]
+    fun sub(): U256 {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::sub(x, y)
+    }
+
+    #[callable]
+    fun mul(): U256 {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::mul(x, y)
+    }
+
+    #[callable]
+    fun div(): U256 {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::div(x, y)
+    }
+
+    #[callable]
+    fun mod(): U256 {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::mod(x, y)
+    }
+
+    #[callable]
+    fun gt(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::gt(x, y)
+    }
+
+    #[callable]
+    fun lt(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::lt(x, y)
+    }
+
+    #[callable]
+    fun ge(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::ge(x, y)
+    }
+
+    #[callable]
+    fun le(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::le(x, y)
+    }
+
+    #[callable]
+    fun eq(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::eq(x, y)
+    }
+
+    #[callable]
+    fun ne(): bool {
+        let x = u256_from_words(6, 2);
+        let y = u256_from_words(5, 1);
+        U256::ne(x, y)
+    }
+
+    #[callable]
+    fun shl(): U256 {
+        let x = u256_from_words(6, 2);
+        U256::shl(x, 127)
+    }
+
+    #[callable]
+    fun shr(): U256 {
+        let x = u256_from_words(6, 2);
+        U256::shr(x, 127)
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Vectors.exp b/vendors/move/crates/evm/move-to-yul/tests/Vectors.exp
new file mode 100644
index 000000000..6bca84ca7
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Vectors.exp
@@ -0,0 +1,7835 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_Vectors" {
+    code {
+        codecopy(0, dataoffset("A2_Vectors_deployed"), datasize("A2_Vectors_deployed"))
+        return(0, datasize("A2_Vectors_deployed"))
+    }
+    object "A2_Vectors_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x04ac5ead
+                {
+                    // test_one_elem_u64()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_Vectors_test_one_elem_u64()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_Vectors_test_one_elem_u64() {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 101
+                        $t5 := 101
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t0 := Vectors::one_elem_u64()
+                        mstore($locals, A2_Vectors_one_elem_u64())
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, $locals)
+                        // $t2 := vector::length<u64>($t1)
+                        $t2 := A1_vector_length$u64$($t1)
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t4 := ==($t2, $t3)
+                        $t4 := $Eq($t2, $t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := borrow_local($t0)
+                        $t6 := $MakePtr(false, $locals)
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t8 := vector::borrow<u64>($t6, $t7)
+                        $t8 := A1_vector_borrow$u64$($t6, $t7)
+                        // $t9 := read_ref($t8)
+                        $t9 := $LoadU64($t8)
+                        // $t10 := 42
+                        $t10 := 42
+                        // $t11 := ==($t9, $t10)
+                        $t11 := $Eq($t9, $t10)
+                        // if ($t11) goto L4 else goto L3
+                        switch $t11
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
+                        // goto L5
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L3
+                        // $t12 := 102
+                        $t12 := 102
+                        // abort($t12)
+                        $Abort($t12)
+                    }
+                    case 8 {
+                        // label L5
+                        // return ()
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            }
+            function A1_vector_length$u64$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_Vectors_one_elem_u64() -> $result {
+                let $t1, $t2, $t3
+                let $locals := $Malloc(32)
+                // $t0 := vector::empty<u64>()
+                mstore($locals, A1_vector_empty$u64$())
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := 42
+                $t2 := 42
+                // vector::push_back<u64>($t1, $t2)
+                A1_vector_push_back$u64$($t1, $t2)
+                // $t3 := move($t0)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$u64$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+                $StoreU64(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u64$() -> vector {
+                vector := $Malloc(48)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Unit tests
+
+// test of Vectors::test_borrow_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_borrow_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_borrow_fail()
+        return (0, 0)
+        function A2_Vectors_test_borrow_fail() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t0 := Vectors::empty_vector()
+                    mstore($locals, A2_Vectors_empty_vector())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 0
+                    $t2 := 0
+                    // $t3 := vector::borrow<u64>($t1, $t2)
+                    $t3 := A1_vector_borrow$u64$($t1, $t2)
+                    // $t4 := read_ref($t3)
+                    $t4 := $LoadU64($t3)
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A2_Vectors_empty_vector() -> $result {
+            let $t0
+            // $t0 := vector::empty<u64>()
+            $t0 := A1_vector_empty$u64$()
+            // return $t0
+            $result := $t0
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_borrow_fail: Revert(Reverted) (used_gas=470): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_borrow_mut
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_borrow_mut" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_borrow_mut()
+        return (0, 0)
+        function A2_Vectors_test_borrow_mut() {
+            let s1_ref, s2_ref, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t24 := 101
+                    $t24 := 101
+                    // abort($t24)
+                    $Abort($t24)
+                }
+                case 4 {
+                    // $t2 := Vectors::one_elem_struct()
+                    mstore($locals, A2_Vectors_one_elem_struct())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 45
+                    $t4 := 45
+                    // $t5 := false
+                    $t5 := false
+                    // $t6 := 123
+                    $t6 := 123
+                    // $t7 := pack Vectors::S($t4, $t5, $t6)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t4)
+                        $MemoryStoreU8(add($mem, 24), $t5)
+                        $MemoryStoreU64(add($mem, 16), $t6)
+                        $t7 := $mem
+                    }
+                    // vector::push_back<Vectors::S>($t3, $t7)
+                    A1_vector_push_back$A2_Vectors_S$($t3, $t7)
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, $locals)
+                    // $t9 := 0
+                    $t9 := 0
+                    // $t10 := vector::borrow_mut<Vectors::S>($t8, $t9)
+                    $t10 := A1_vector_borrow_mut$A2_Vectors_S$($t8, $t9)
+                    // $t11 := 90
+                    $t11 := 90
+                    // $t12 := borrow_field<Vectors::S>.x($t10)
+                    $t12 := $t10
+                    // write_ref($t12, $t11)
+                    $StoreU128($t12, $t11)
+                    // $t13 := false
+                    $t13 := false
+                    // $t14 := borrow_field<Vectors::S>.y($t10)
+                    $t14 := $IndexPtr($t10, 24)
+                    // write_ref($t14, $t13)
+                    $StoreU8($t14, $t13)
+                    // $t15 := 1028
+                    $t15 := 1028
+                    // $t16 := borrow_field<Vectors::S>.z($t10)
+                    $t16 := $IndexPtr($t10, 16)
+                    // write_ref($t16, $t15)
+                    $StoreU64($t16, $t15)
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // $t19 := vector::borrow<Vectors::S>($t17, $t18)
+                    $t19 := A1_vector_borrow$A2_Vectors_S$($t17, $t18)
+                    // $t20 := borrow_field<Vectors::S>.x($t19)
+                    $t20 := $t19
+                    // $t21 := read_ref($t20)
+                    $t21 := $LoadU128($t20)
+                    // $t22 := 90
+                    $t22 := 90
+                    // $t23 := ==($t21, $t22)
+                    $t23 := $Eq($t21, $t22)
+                    // if ($t23) goto L1 else goto L0
+                    switch $t23
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t25 := borrow_local($t2)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := 0
+                    $t26 := 0
+                    // $t27 := vector::borrow<Vectors::S>($t25, $t26)
+                    $t27 := A1_vector_borrow$A2_Vectors_S$($t25, $t26)
+                    // $t28 := borrow_field<Vectors::S>.y($t27)
+                    $t28 := $IndexPtr($t27, 24)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU8($t28)
+                    // $t30 := false
+                    $t30 := false
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t32 := 102
+                    $t32 := 102
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 8 {
+                    // label L5
+                    // $t33 := borrow_local($t2)
+                    $t33 := $MakePtr(false, $locals)
+                    // $t34 := 0
+                    $t34 := 0
+                    // $t35 := vector::borrow<Vectors::S>($t33, $t34)
+                    $t35 := A1_vector_borrow$A2_Vectors_S$($t33, $t34)
+                    // $t36 := borrow_field<Vectors::S>.z($t35)
+                    $t36 := $IndexPtr($t35, 16)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU64($t36)
+                    // $t38 := 1028
+                    $t38 := 1028
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L7 else goto L6
+                    switch $t39
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t40 := 103
+                    $t40 := 103
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 11 {
+                    // label L8
+                    // $t41 := borrow_local($t2)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 1
+                    $t42 := 1
+                    // $t43 := vector::borrow<Vectors::S>($t41, $t42)
+                    $t43 := A1_vector_borrow$A2_Vectors_S$($t41, $t42)
+                    // $t44 := borrow_field<Vectors::S>.x($t43)
+                    $t44 := $t43
+                    // $t45 := read_ref($t44)
+                    $t45 := $LoadU128($t44)
+                    // $t46 := 45
+                    $t46 := 45
+                    // $t47 := ==($t45, $t46)
+                    $t47 := $Eq($t45, $t46)
+                    // if ($t47) goto L10 else goto L9
+                    switch $t47
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t48 := 104
+                    $t48 := 104
+                    // abort($t48)
+                    $Abort($t48)
+                }
+                case 14 {
+                    // label L11
+                    // $t49 := borrow_local($t2)
+                    $t49 := $MakePtr(false, $locals)
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<Vectors::S>($t49, $t50)
+                    $t51 := A1_vector_borrow$A2_Vectors_S$($t49, $t50)
+                    // $t52 := borrow_field<Vectors::S>.y($t51)
+                    $t52 := $IndexPtr($t51, 24)
+                    // $t53 := read_ref($t52)
+                    $t53 := $LoadU8($t52)
+                    // $t54 := false
+                    $t54 := false
+                    // $t55 := ==($t53, $t54)
+                    $t55 := $Eq($t53, $t54)
+                    // if ($t55) goto L13 else goto L12
+                    switch $t55
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t56 := 105
+                    $t56 := 105
+                    // abort($t56)
+                    $Abort($t56)
+                }
+                case 17 {
+                    // label L14
+                    // $t57 := borrow_local($t2)
+                    $t57 := $MakePtr(false, $locals)
+                    // $t58 := 1
+                    $t58 := 1
+                    // $t59 := vector::borrow<Vectors::S>($t57, $t58)
+                    $t59 := A1_vector_borrow$A2_Vectors_S$($t57, $t58)
+                    // $t60 := borrow_field<Vectors::S>.z($t59)
+                    $t60 := $IndexPtr($t59, 16)
+                    // $t61 := read_ref($t60)
+                    $t61 := $LoadU64($t60)
+                    // $t62 := 123
+                    $t62 := 123
+                    // $t63 := ==($t61, $t62)
+                    $t63 := $Eq($t61, $t62)
+                    // if ($t63) goto L16 else goto L15
+                    switch $t63
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t64 := 106
+                    $t64 := 106
+                    // abort($t64)
+                    $Abort($t64)
+                }
+                case 20 {
+                    // label L17
+                    // $t65 := borrow_local($t2)
+                    $t65 := $MakePtr(false, $locals)
+                    // $t66 := 1
+                    $t66 := 1
+                    // $t67 := vector::borrow_mut<Vectors::S>($t65, $t66)
+                    $t67 := A1_vector_borrow_mut$A2_Vectors_S$($t65, $t66)
+                    // $t68 := 10
+                    $t68 := 10
+                    // $t69 := borrow_field<Vectors::S>.x($t67)
+                    $t69 := $t67
+                    // write_ref($t69, $t68)
+                    $StoreU128($t69, $t68)
+                    // $t70 := true
+                    $t70 := true
+                    // $t71 := borrow_field<Vectors::S>.y($t67)
+                    $t71 := $IndexPtr($t67, 24)
+                    // write_ref($t71, $t70)
+                    $StoreU8($t71, $t70)
+                    // $t72 := 456
+                    $t72 := 456
+                    // $t73 := borrow_field<Vectors::S>.z($t67)
+                    $t73 := $IndexPtr($t67, 16)
+                    // write_ref($t73, $t72)
+                    $StoreU64($t73, $t72)
+                    // $t74 := borrow_local($t2)
+                    $t74 := $MakePtr(false, $locals)
+                    // $t75 := 1
+                    $t75 := 1
+                    // $t76 := vector::borrow<Vectors::S>($t74, $t75)
+                    $t76 := A1_vector_borrow$A2_Vectors_S$($t74, $t75)
+                    // $t77 := borrow_field<Vectors::S>.x($t76)
+                    $t77 := $t76
+                    // $t78 := read_ref($t77)
+                    $t78 := $LoadU128($t77)
+                    // $t79 := 10
+                    $t79 := 10
+                    // $t80 := ==($t78, $t79)
+                    $t80 := $Eq($t78, $t79)
+                    // if ($t80) goto L19 else goto L18
+                    switch $t80
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t81 := 107
+                    $t81 := 107
+                    // abort($t81)
+                    $Abort($t81)
+                }
+                case 23 {
+                    // label L20
+                    // $t82 := borrow_local($t2)
+                    $t82 := $MakePtr(false, $locals)
+                    // $t83 := 1
+                    $t83 := 1
+                    // $t84 := vector::borrow<Vectors::S>($t82, $t83)
+                    $t84 := A1_vector_borrow$A2_Vectors_S$($t82, $t83)
+                    // $t85 := borrow_field<Vectors::S>.y($t84)
+                    $t85 := $IndexPtr($t84, 24)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU8($t85)
+                    // $t87 := true
+                    $t87 := true
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 108
+                    $t89 := 108
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // $t90 := borrow_local($t2)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 1
+                    $t91 := 1
+                    // $t92 := vector::borrow<Vectors::S>($t90, $t91)
+                    $t92 := A1_vector_borrow$A2_Vectors_S$($t90, $t91)
+                    // $t93 := borrow_field<Vectors::S>.z($t92)
+                    $t93 := $IndexPtr($t92, 16)
+                    // $t94 := read_ref($t93)
+                    $t94 := $LoadU64($t93)
+                    // $t95 := 456
+                    $t95 := 456
+                    // $t96 := ==($t94, $t95)
+                    $t96 := $Eq($t94, $t95)
+                    // if ($t96) goto L25 else goto L24
+                    switch $t96
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t97 := 109
+                    $t97 := 109
+                    // abort($t97)
+                    $Abort($t97)
+                }
+                case 29 {
+                    // label L26
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_borrow_mut$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $StoreU128(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU128(offs, val)
+          }
+          default {
+            $StorageStoreU128(offs, val)
+          }
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $StorageStoreU128(offs, val) {
+          $StorageStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_borrow_mut: Succeed(Stopped) (used_gas=14880): []
+
+// test of Vectors::test_destroy_empty
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_destroy_empty" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_destroy_empty()
+        return (0, 0)
+        function A2_Vectors_test_destroy_empty() {
+            let $t0
+            // $t0 := vector::empty<address>()
+            $t0 := A1_vector_empty$address$()
+            // vector::destroy_empty<address>($t0)
+            A1_vector_destroy_empty$address$($t0)
+            // return ()
+        }
+
+        function A1_vector_destroy_empty$address$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_destroy_empty: Succeed(Stopped) (used_gas=100): []
+
+// test of Vectors::test_destroy_non_empty_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_destroy_non_empty_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_destroy_non_empty_fail()
+        return (0, 0)
+        function A2_Vectors_test_destroy_non_empty_fail() {
+            let $t0
+            // $t0 := Vectors::one_elem_struct()
+            $t0 := A2_Vectors_one_elem_struct()
+            // vector::destroy_empty<Vectors::S>($t0)
+            A1_vector_destroy_empty$A2_Vectors_S$($t0)
+            // return ()
+        }
+
+        function A1_vector_destroy_empty$A2_Vectors_S$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_destroy_non_empty_fail: Revert(Reverted) (used_gas=894): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_empty
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_empty" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_empty()
+        return (0, 0)
+        function A2_Vectors_test_empty() {
+            let $t1, $t2, $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::empty_vector()
+                    mstore($locals, A2_Vectors_empty_vector())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 0
+                    $t3 := 0
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_empty_vector() -> $result {
+            let $t0
+            // $t0 := vector::empty<u64>()
+            $t0 := A1_vector_empty$u64$()
+            // return $t0
+            $result := $t0
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_empty: Succeed(Stopped) (used_gas=605): []
+
+// test of Vectors::test_nested_vector_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_nested_vector_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_nested_vector_equality()
+        return (0, 0)
+        function A2_Vectors_test_nested_vector_equality() {
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := vector::empty<vector<u8>>()
+                    mstore($locals, A1_vector_empty$vec$u8$$())
+                    // $t1 := vector::empty<vector<u8>>()
+                    mstore(add($locals, 32), A1_vector_empty$vec$u8$$())
+                    // $t2 := copy($t0)
+                    $t2 := mload($locals)
+                    // $t3 := copy($t1)
+                    $t3 := mload(add($locals, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$vec$u8$$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := [97, 98, 99]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t7, 3)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t7, 32))
+                    // vector::push_back<vector<u8>>($t6, $t7)
+                    A1_vector_push_back$vec$u8$$($t6, $t7)
+                    // $t8 := borrow_local($t1)
+                    $t8 := $MakePtr(false, add($locals, 32))
+                    // $t9 := [97, 98, 99]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t9, 3)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t9, 32))
+                    // vector::push_back<vector<u8>>($t8, $t9)
+                    A1_vector_push_back$vec$u8$$($t8, $t9)
+                    // $t10 := copy($t0)
+                    $t10 := mload($locals)
+                    // $t11 := copy($t1)
+                    $t11 := mload(add($locals, 32))
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq_$vec$vec$u8$$$($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 102
+                    $t13 := 102
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := borrow_local($t0)
+                    $t14 := $MakePtr(false, $locals)
+                    // $t15 := [100, 101, 102]
+                    $t15 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t15, 3)
+                    $MemoryStoreU64(add($t15, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2608619572(add($t15, 32))
+                    // vector::push_back<vector<u8>>($t14, $t15)
+                    A1_vector_push_back$vec$u8$$($t14, $t15)
+                    // $t16 := borrow_local($t1)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := [100, 101, 102]
+                    $t17 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t17, 3)
+                    $MemoryStoreU64(add($t17, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2608619572(add($t17, 32))
+                    // vector::push_back<vector<u8>>($t16, $t17)
+                    A1_vector_push_back$vec$u8$$($t16, $t17)
+                    // $t18 := copy($t0)
+                    $t18 := mload($locals)
+                    // $t19 := copy($t1)
+                    $t19 := mload(add($locals, 32))
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq_$vec$vec$u8$$$($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := [103, 104, 105]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t23, 3)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_4185735457(add($t23, 32))
+                    // vector::push_back<vector<u8>>($t22, $t23)
+                    A1_vector_push_back$vec$u8$$($t22, $t23)
+                    // $t24 := borrow_local($t1)
+                    $t24 := $MakePtr(false, add($locals, 32))
+                    // $t25 := [103, 104, 105, 106]
+                    $t25 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t25, 4)
+                    $MemoryStoreU64(add($t25, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_3979718947(add($t25, 32))
+                    // vector::push_back<vector<u8>>($t24, $t25)
+                    A1_vector_push_back$vec$u8$$($t24, $t25)
+                    // $t26 := move($t0)
+                    $t26 := mload($locals)
+                    // $t27 := move($t1)
+                    $t27 := mload(add($locals, 32))
+                    // $t28 := !=($t26, $t27)
+                    $t28 := $LogicalNot($Eq_$vec$vec$u8$$$($t26, $t27))
+                    // if ($t28) goto L10 else goto L9
+                    switch $t28
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t29 := 104
+                    $t29 := 104
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$vec$u8$$$(x, y) -> res
+        {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+              res:= false
+              leave
+            }
+            for { let i := 0 } lt(i, len_x) { i := add(i, 1) }
+            {
+                let e_x := $MemoryLoadU256(add(32, add(x, mul(i, 32))))
+                let e_y := $MemoryLoadU256(add(32, add(y, mul(i, 32))))
+                if $LogicalNot($Eq_$vec$u8$$(e_x, e_y)) {
+                  res:= false
+                  leave
+                }
+            }
+            res := true
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_3979718947(value) {
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 105)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 106)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_4185735457(value) {
+            $MemoryStoreU8(value, 103)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 104)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 105)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2608619572(value) {
+            $MemoryStoreU8(value, 100)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 101)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 102)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2053440334(value) {
+            $MemoryStoreU8(value, 97)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 98)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 99)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Vectors::test_nested_vector_equality: Succeed(Stopped) (used_gas=11041): []
+
+// test of Vectors::test_nested_vectors
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_nested_vectors" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_nested_vectors()
+        return (0, 0)
+        function A2_Vectors_test_nested_vectors() {
+            let $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89
+            let $locals := $Malloc(128)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t32 := 101
+                    $t32 := 101
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 10
+                    $t5 := 10
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 11
+                    $t7 := 11
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t2 := vector::empty<u64>()
+                    mstore(add($locals, 32), A1_vector_empty$u64$())
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, add($locals, 32))
+                    // $t9 := 12
+                    $t9 := 12
+                    // vector::push_back<u64>($t8, $t9)
+                    A1_vector_push_back$u64$($t8, $t9)
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := 13
+                    $t11 := 13
+                    // vector::push_back<u64>($t10, $t11)
+                    A1_vector_push_back$u64$($t10, $t11)
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, add($locals, 32))
+                    // $t13 := 14
+                    $t13 := 14
+                    // vector::push_back<u64>($t12, $t13)
+                    A1_vector_push_back$u64$($t12, $t13)
+                    // $t3 := vector::empty<u64>()
+                    mstore(add($locals, 64), A1_vector_empty$u64$())
+                    // $t14 := borrow_local($t3)
+                    $t14 := $MakePtr(false, add($locals, 64))
+                    // $t15 := 15
+                    $t15 := 15
+                    // vector::push_back<u64>($t14, $t15)
+                    A1_vector_push_back$u64$($t14, $t15)
+                    // $t16 := borrow_local($t3)
+                    $t16 := $MakePtr(false, add($locals, 64))
+                    // $t17 := 16
+                    $t17 := 16
+                    // vector::push_back<u64>($t16, $t17)
+                    A1_vector_push_back$u64$($t16, $t17)
+                    // $t18 := borrow_local($t3)
+                    $t18 := $MakePtr(false, add($locals, 64))
+                    // $t19 := 17
+                    $t19 := 17
+                    // vector::push_back<u64>($t18, $t19)
+                    A1_vector_push_back$u64$($t18, $t19)
+                    // $t20 := borrow_local($t3)
+                    $t20 := $MakePtr(false, add($locals, 64))
+                    // $t21 := 18
+                    $t21 := 18
+                    // vector::push_back<u64>($t20, $t21)
+                    A1_vector_push_back$u64$($t20, $t21)
+                    // $t0 := vector::empty<vector<u64>>()
+                    mstore(add($locals, 96), A1_vector_empty$vec$u64$$())
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, add($locals, 96))
+                    // $t23 := move($t1)
+                    $t23 := mload($locals)
+                    // vector::push_back<vector<u64>>($t22, $t23)
+                    A1_vector_push_back$vec$u64$$($t22, $t23)
+                    // $t24 := borrow_local($t0)
+                    $t24 := $MakePtr(false, add($locals, 96))
+                    // $t25 := move($t2)
+                    $t25 := mload(add($locals, 32))
+                    // vector::push_back<vector<u64>>($t24, $t25)
+                    A1_vector_push_back$vec$u64$$($t24, $t25)
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, add($locals, 96))
+                    // $t27 := move($t3)
+                    $t27 := mload(add($locals, 64))
+                    // vector::push_back<vector<u64>>($t26, $t27)
+                    A1_vector_push_back$vec$u64$$($t26, $t27)
+                    // $t28 := borrow_local($t0)
+                    $t28 := $MakePtr(false, add($locals, 96))
+                    // $t29 := vector::length<vector<u64>>($t28)
+                    $t29 := A1_vector_length$vec$u64$$($t28)
+                    // $t30 := 3
+                    $t30 := 3
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L1 else goto L0
+                    switch $t31
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t33 := borrow_local($t0)
+                    $t33 := $MakePtr(false, add($locals, 96))
+                    // $t34 := 0
+                    $t34 := 0
+                    // $t35 := vector::borrow<vector<u64>>($t33, $t34)
+                    $t35 := A1_vector_borrow$vec$u64$$($t33, $t34)
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 2
+                    $t37 := 2
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t39 := 102
+                    $t39 := 102
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 8 {
+                    // label L5
+                    // $t40 := borrow_local($t0)
+                    $t40 := $MakePtr(false, add($locals, 96))
+                    // $t41 := 1
+                    $t41 := 1
+                    // $t42 := vector::borrow<vector<u64>>($t40, $t41)
+                    $t42 := A1_vector_borrow$vec$u64$$($t40, $t41)
+                    // $t43 := vector::length<u64>($t42)
+                    $t43 := A1_vector_length$u64$($t42)
+                    // $t44 := 3
+                    $t44 := 3
+                    // $t45 := ==($t43, $t44)
+                    $t45 := $Eq($t43, $t44)
+                    // if ($t45) goto L7 else goto L6
+                    switch $t45
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t46 := 103
+                    $t46 := 103
+                    // abort($t46)
+                    $Abort($t46)
+                }
+                case 11 {
+                    // label L8
+                    // $t47 := borrow_local($t0)
+                    $t47 := $MakePtr(false, add($locals, 96))
+                    // $t48 := 2
+                    $t48 := 2
+                    // $t49 := vector::borrow<vector<u64>>($t47, $t48)
+                    $t49 := A1_vector_borrow$vec$u64$$($t47, $t48)
+                    // $t50 := vector::length<u64>($t49)
+                    $t50 := A1_vector_length$u64$($t49)
+                    // $t51 := 4
+                    $t51 := 4
+                    // $t52 := ==($t50, $t51)
+                    $t52 := $Eq($t50, $t51)
+                    // if ($t52) goto L10 else goto L9
+                    switch $t52
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t53 := 104
+                    $t53 := 104
+                    // abort($t53)
+                    $Abort($t53)
+                }
+                case 14 {
+                    // label L11
+                    // $t54 := borrow_local($t0)
+                    $t54 := $MakePtr(false, add($locals, 96))
+                    // $t55 := 0
+                    $t55 := 0
+                    // $t56 := vector::borrow<vector<u64>>($t54, $t55)
+                    $t56 := A1_vector_borrow$vec$u64$$($t54, $t55)
+                    // $t57 := 0
+                    $t57 := 0
+                    // $t58 := vector::borrow<u64>($t56, $t57)
+                    $t58 := A1_vector_borrow$u64$($t56, $t57)
+                    // $t59 := read_ref($t58)
+                    $t59 := $LoadU64($t58)
+                    // $t60 := 10
+                    $t60 := 10
+                    // $t61 := ==($t59, $t60)
+                    $t61 := $Eq($t59, $t60)
+                    // if ($t61) goto L13 else goto L12
+                    switch $t61
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t62 := 105
+                    $t62 := 105
+                    // abort($t62)
+                    $Abort($t62)
+                }
+                case 17 {
+                    // label L14
+                    // $t63 := borrow_local($t0)
+                    $t63 := $MakePtr(false, add($locals, 96))
+                    // $t64 := 1
+                    $t64 := 1
+                    // $t65 := vector::borrow<vector<u64>>($t63, $t64)
+                    $t65 := A1_vector_borrow$vec$u64$$($t63, $t64)
+                    // $t66 := 1
+                    $t66 := 1
+                    // $t67 := vector::borrow<u64>($t65, $t66)
+                    $t67 := A1_vector_borrow$u64$($t65, $t66)
+                    // $t68 := read_ref($t67)
+                    $t68 := $LoadU64($t67)
+                    // $t69 := 13
+                    $t69 := 13
+                    // $t70 := ==($t68, $t69)
+                    $t70 := $Eq($t68, $t69)
+                    // if ($t70) goto L16 else goto L15
+                    switch $t70
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t71 := 105
+                    $t71 := 105
+                    // abort($t71)
+                    $Abort($t71)
+                }
+                case 20 {
+                    // label L17
+                    // $t72 := borrow_local($t0)
+                    $t72 := $MakePtr(false, add($locals, 96))
+                    // $t73 := 2
+                    $t73 := 2
+                    // $t74 := vector::borrow<vector<u64>>($t72, $t73)
+                    $t74 := A1_vector_borrow$vec$u64$$($t72, $t73)
+                    // $t75 := 2
+                    $t75 := 2
+                    // $t76 := vector::borrow<u64>($t74, $t75)
+                    $t76 := A1_vector_borrow$u64$($t74, $t75)
+                    // $t77 := read_ref($t76)
+                    $t77 := $LoadU64($t76)
+                    // $t78 := 17
+                    $t78 := 17
+                    // $t79 := ==($t77, $t78)
+                    $t79 := $Eq($t77, $t78)
+                    // if ($t79) goto L19 else goto L18
+                    switch $t79
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t80 := 105
+                    $t80 := 105
+                    // abort($t80)
+                    $Abort($t80)
+                }
+                case 23 {
+                    // label L20
+                    // $t81 := borrow_local($t0)
+                    $t81 := $MakePtr(false, add($locals, 96))
+                    // $t82 := 2
+                    $t82 := 2
+                    // $t83 := vector::borrow<vector<u64>>($t81, $t82)
+                    $t83 := A1_vector_borrow$vec$u64$$($t81, $t82)
+                    // $t84 := 3
+                    $t84 := 3
+                    // $t85 := vector::borrow<u64>($t83, $t84)
+                    $t85 := A1_vector_borrow$u64$($t83, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU64($t85)
+                    // $t87 := 18
+                    $t87 := 18
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 105
+                    $t89 := 105
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // return ()
+                    $Free($locals, 128)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_length$vec$u64$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$vec$u64$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                let $size_814019441 := $MemoryLoadU64(e)
+                let $data_size_814019441 := mul($size_814019441, 8)
+                $AlignedStorageStore($linked_dst_814019441, mload(e))
+                let $data_src_814019441 := add(e, 32)
+                let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                    $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                    $Free(e, add($data_size_814019441, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_814019441)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$vec$u64$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_nested_vectors: Succeed(Stopped) (used_gas=20935): []
+
+// test of Vectors::test_one_elem_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_one_elem_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_one_elem_struct()
+        return (0, 0)
+        function A2_Vectors_test_one_elem_struct() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_struct()
+                    mstore($locals, A2_Vectors_one_elem_struct())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<Vectors::S>($t1)
+                    $t2 := A1_vector_length$A2_Vectors_S$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<Vectors::S>($t6, $t7)
+                    $t8 := A1_vector_borrow$A2_Vectors_S$($t6, $t7)
+                    // $t9 := borrow_field<Vectors::S>.x($t8)
+                    $t9 := $t8
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU128($t9)
+                    // $t11 := 42
+                    $t11 := 42
+                    // $t12 := ==($t10, $t11)
+                    $t12 := $Eq($t10, $t11)
+                    // if ($t12) goto L4 else goto L3
+                    switch $t12
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t13 := 102
+                    $t13 := 102
+                    // abort($t13)
+                    $Abort($t13)
+                }
+                case 8 {
+                    // label L5
+                    // $t14 := borrow_local($t0)
+                    $t14 := $MakePtr(false, $locals)
+                    // $t15 := 0
+                    $t15 := 0
+                    // $t16 := vector::borrow<Vectors::S>($t14, $t15)
+                    $t16 := A1_vector_borrow$A2_Vectors_S$($t14, $t15)
+                    // $t17 := borrow_field<Vectors::S>.y($t16)
+                    $t17 := $IndexPtr($t16, 24)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := true
+                    $t19 := true
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := borrow_local($t0)
+                    $t22 := $MakePtr(false, $locals)
+                    // $t23 := 0
+                    $t23 := 0
+                    // $t24 := vector::borrow<Vectors::S>($t22, $t23)
+                    $t24 := A1_vector_borrow$A2_Vectors_S$($t22, $t23)
+                    // $t25 := borrow_field<Vectors::S>.z($t24)
+                    $t25 := $IndexPtr($t24, 16)
+                    // $t26 := read_ref($t25)
+                    $t26 := $LoadU64($t25)
+                    // $t27 := 789
+                    $t27 := 789
+                    // $t28 := ==($t26, $t27)
+                    $t28 := $Eq($t26, $t27)
+                    // if ($t28) goto L10 else goto L9
+                    switch $t28
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t29 := 104
+                    $t29 := 104
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 14 {
+                    // label L11
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$A2_Vectors_S$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            let e := $LoadU256(e_ptr)
+            e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+        }
+        function A1_vector_length$A2_Vectors_S$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_struct() -> $result {
+            let $t1, $t2, $t3, $t4, $t5, $t6
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<Vectors::S>()
+            mstore($locals, A1_vector_empty$A2_Vectors_S$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // $t3 := true
+            $t3 := true
+            // $t4 := 789
+            $t4 := 789
+            // $t5 := pack Vectors::S($t2, $t3, $t4)
+            {
+                let $mem := $Malloc(25)
+                $MemoryStoreU128(add($mem, 0), $t2)
+                $MemoryStoreU8(add($mem, 24), $t3)
+                $MemoryStoreU64(add($mem, 16), $t4)
+                $t5 := $mem
+            }
+            // vector::push_back<Vectors::S>($t1, $t5)
+            A1_vector_push_back$A2_Vectors_S$($t1, $t5)
+            // $t6 := move($t0)
+            $t6 := mload($locals)
+            // return $t6
+            $result := $t6
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_Vectors_S$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add(e, 0)))
+                $Free(e, 25)
+                $AlignedStorageStore(e_offs, $linked_dst_490229512)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$A2_Vectors_S$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU8(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU8(offs)
+          }
+          default {
+            val := $StorageLoadU8(offs)
+          }
+        }
+        function $MemoryLoadU8(offs) -> val {
+          val := $MemoryLoadBytes(offs, 1)
+        }
+        function $StorageLoadU8(offs) -> val {
+          val := $StorageLoadBytes(offs, 1)
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU128(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU128(offs)
+          }
+          default {
+            val := $StorageLoadU128(offs)
+          }
+        }
+        function $MemoryLoadU128(offs) -> val {
+          val := $MemoryLoadBytes(offs, 16)
+        }
+        function $StorageLoadU128(offs) -> val {
+          val := $StorageLoadBytes(offs, 16)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_one_elem_struct: Succeed(Stopped) (used_gas=4291): []
+
+// test of Vectors::test_one_elem_u64
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_one_elem_u64" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_one_elem_u64()
+        return (0, 0)
+        function A2_Vectors_test_one_elem_u64() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<u64>($t6, $t7)
+                    $t8 := A1_vector_borrow$u64$($t6, $t7)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU64($t8)
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq($t9, $t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_one_elem_u64: Succeed(Stopped) (used_gas=2012): []
+
+// test of Vectors::test_pop_back
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_pop_back" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_pop_back()
+        return (0, 0)
+        function A2_Vectors_test_pop_back() {
+            let e, e_1, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 4 {
+                    // $t2 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t3 := borrow_local($t2)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 43
+                    $t4 := 43
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t2)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := vector::length<u64>($t5)
+                    $t6 := A1_vector_length$u64$($t5)
+                    // $t7 := 2
+                    $t7 := 2
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // $t12 := vector::borrow<u64>($t10, $t11)
+                    $t12 := A1_vector_borrow$u64$($t10, $t11)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := 42
+                    $t14 := 42
+                    // $t15 := ==($t13, $t14)
+                    $t15 := $Eq($t13, $t14)
+                    // if ($t15) goto L4 else goto L3
+                    switch $t15
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t16 := 102
+                    $t16 := 102
+                    // abort($t16)
+                    $Abort($t16)
+                }
+                case 8 {
+                    // label L5
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 1
+                    $t18 := 1
+                    // $t19 := vector::borrow<u64>($t17, $t18)
+                    $t19 := A1_vector_borrow$u64$($t17, $t18)
+                    // $t20 := read_ref($t19)
+                    $t20 := $LoadU64($t19)
+                    // $t21 := 43
+                    $t21 := 43
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L7 else goto L6
+                    switch $t22
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t23 := 103
+                    $t23 := 103
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 11 {
+                    // label L8
+                    // $t24 := borrow_local($t2)
+                    $t24 := $MakePtr(false, $locals)
+                    // $t25 := vector::pop_back<u64>($t24)
+                    $t25 := A1_vector_pop_back$u64$($t24)
+                    // $t26 := borrow_local($t2)
+                    $t26 := $MakePtr(false, $locals)
+                    // $t27 := vector::length<u64>($t26)
+                    $t27 := A1_vector_length$u64$($t26)
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := ==($t27, $t28)
+                    $t29 := $Eq($t27, $t28)
+                    // if ($t29) goto L10 else goto L9
+                    switch $t29
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t30 := 104
+                    $t30 := 104
+                    // abort($t30)
+                    $Abort($t30)
+                }
+                case 14 {
+                    // label L11
+                    // $t31 := 43
+                    $t31 := 43
+                    // $t32 := ==($t25, $t31)
+                    $t32 := $Eq($t25, $t31)
+                    // if ($t32) goto L13 else goto L12
+                    switch $t32
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t33 := 105
+                    $t33 := 105
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 17 {
+                    // label L14
+                    // $t34 := borrow_local($t2)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := vector::pop_back<u64>($t34)
+                    $t35 := A1_vector_pop_back$u64$($t34)
+                    // $t36 := borrow_local($t2)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := vector::length<u64>($t36)
+                    $t37 := A1_vector_length$u64$($t36)
+                    // $t38 := 0
+                    $t38 := 0
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L16 else goto L15
+                    switch $t39
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t40 := 106
+                    $t40 := 106
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 20 {
+                    // label L17
+                    // $t41 := 42
+                    $t41 := 42
+                    // $t42 := ==($t35, $t41)
+                    $t42 := $Eq($t35, $t41)
+                    // if ($t42) goto L19 else goto L18
+                    switch $t42
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t43 := 107
+                    $t43 := 107
+                    // abort($t43)
+                    $Abort($t43)
+                }
+                case 23 {
+                    // label L20
+                    // $t44 := move($t2)
+                    $t44 := mload($locals)
+                    // vector::destroy_empty<u64>($t44)
+                    A1_vector_destroy_empty$u64$($t44)
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_pop_back$u64$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 8)))
+            e := $LoadU64(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_pop_back: Succeed(Stopped) (used_gas=8729): []
+
+// test of Vectors::test_pop_back_empty_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_pop_back_empty_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_pop_back_empty_fail()
+        return (0, 0)
+        function A2_Vectors_test_pop_back_empty_fail() {
+            let $t1, $t2
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<address>()
+            mstore($locals, A1_vector_empty$address$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := vector::pop_back<address>($t1)
+            $t2 := A1_vector_pop_back$address$($t1)
+            // destroy($t2)
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A1_vector_pop_back$address$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            $StoreU64(v_ptr, sub(size, 1))
+        }
+        function A1_vector_empty$address$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_pop_back_empty_fail: Revert(Reverted) (used_gas=324): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_push_back
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_push_back" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_push_back()
+        return (0, 0)
+        function A2_Vectors_test_push_back() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 101
+                    $t5 := 101
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 0
+                    $t7 := 0
+                    // $t8 := vector::borrow<u64>($t6, $t7)
+                    $t8 := A1_vector_borrow$u64$($t6, $t7)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU64($t8)
+                    // $t10 := 42
+                    $t10 := 42
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq($t9, $t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t12 := 102
+                    $t12 := 102
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 8 {
+                    // label L5
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, $locals)
+                    // $t14 := 43
+                    $t14 := 43
+                    // vector::push_back<u64>($t13, $t14)
+                    A1_vector_push_back$u64$($t13, $t14)
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := vector::length<u64>($t15)
+                    $t16 := A1_vector_length$u64$($t15)
+                    // $t17 := 2
+                    $t17 := 2
+                    // $t18 := ==($t16, $t17)
+                    $t18 := $Eq($t16, $t17)
+                    // if ($t18) goto L7 else goto L6
+                    switch $t18
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t19 := 103
+                    $t19 := 103
+                    // abort($t19)
+                    $Abort($t19)
+                }
+                case 11 {
+                    // label L8
+                    // $t20 := borrow_local($t0)
+                    $t20 := $MakePtr(false, $locals)
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 42
+                    $t24 := 42
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L10 else goto L9
+                    switch $t25
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t26 := 104
+                    $t26 := 104
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 14 {
+                    // label L11
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, $locals)
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := vector::borrow<u64>($t27, $t28)
+                    $t29 := A1_vector_borrow$u64$($t27, $t28)
+                    // $t30 := read_ref($t29)
+                    $t30 := $LoadU64($t29)
+                    // $t31 := 43
+                    $t31 := 43
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L13 else goto L12
+                    switch $t32
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t33 := 105
+                    $t33 := 105
+                    // abort($t33)
+                    $Abort($t33)
+                }
+                case 17 {
+                    // label L14
+                    // $t34 := borrow_local($t0)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := 44
+                    $t35 := 44
+                    // vector::push_back<u64>($t34, $t35)
+                    A1_vector_push_back$u64$($t34, $t35)
+                    // $t36 := borrow_local($t0)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := vector::length<u64>($t36)
+                    $t37 := A1_vector_length$u64$($t36)
+                    // $t38 := 3
+                    $t38 := 3
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L16 else goto L15
+                    switch $t39
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t40 := 106
+                    $t40 := 106
+                    // abort($t40)
+                    $Abort($t40)
+                }
+                case 20 {
+                    // label L17
+                    // $t41 := borrow_local($t0)
+                    $t41 := $MakePtr(false, $locals)
+                    // $t42 := 0
+                    $t42 := 0
+                    // $t43 := vector::borrow<u64>($t41, $t42)
+                    $t43 := A1_vector_borrow$u64$($t41, $t42)
+                    // $t44 := read_ref($t43)
+                    $t44 := $LoadU64($t43)
+                    // $t45 := 42
+                    $t45 := 42
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L19 else goto L18
+                    switch $t46
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t47 := 107
+                    $t47 := 107
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 23 {
+                    // label L20
+                    // $t48 := borrow_local($t0)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 1
+                    $t49 := 1
+                    // $t50 := vector::borrow<u64>($t48, $t49)
+                    $t50 := A1_vector_borrow$u64$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU64($t50)
+                    // $t52 := 43
+                    $t52 := 43
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L22 else goto L21
+                    switch $t53
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t54 := 108
+                    $t54 := 108
+                    // abort($t54)
+                    $Abort($t54)
+                }
+                case 26 {
+                    // label L23
+                    // $t55 := borrow_local($t0)
+                    $t55 := $MakePtr(false, $locals)
+                    // $t56 := 2
+                    $t56 := 2
+                    // $t57 := vector::borrow<u64>($t55, $t56)
+                    $t57 := A1_vector_borrow$u64$($t55, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU64($t57)
+                    // $t59 := 44
+                    $t59 := 44
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L25 else goto L24
+                    switch $t60
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t61 := 109
+                    $t61 := 109
+                    // abort($t61)
+                    $Abort($t61)
+                }
+                case 29 {
+                    // label L26
+                    // $t62 := borrow_local($t0)
+                    $t62 := $MakePtr(false, $locals)
+                    // $t63 := 45
+                    $t63 := 45
+                    // vector::push_back<u64>($t62, $t63)
+                    A1_vector_push_back$u64$($t62, $t63)
+                    // $t64 := borrow_local($t0)
+                    $t64 := $MakePtr(false, $locals)
+                    // $t65 := vector::length<u64>($t64)
+                    $t65 := A1_vector_length$u64$($t64)
+                    // $t66 := 4
+                    $t66 := 4
+                    // $t67 := ==($t65, $t66)
+                    $t67 := $Eq($t65, $t66)
+                    // if ($t67) goto L28 else goto L27
+                    switch $t67
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // $t68 := 110
+                    $t68 := 110
+                    // abort($t68)
+                    $Abort($t68)
+                }
+                case 32 {
+                    // label L29
+                    // $t69 := borrow_local($t0)
+                    $t69 := $MakePtr(false, $locals)
+                    // $t70 := 0
+                    $t70 := 0
+                    // $t71 := vector::borrow<u64>($t69, $t70)
+                    $t71 := A1_vector_borrow$u64$($t69, $t70)
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU64($t71)
+                    // $t73 := 42
+                    $t73 := 42
+                    // $t74 := ==($t72, $t73)
+                    $t74 := $Eq($t72, $t73)
+                    // if ($t74) goto L31 else goto L30
+                    switch $t74
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
+                }
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
+                    // $t75 := 111
+                    $t75 := 111
+                    // abort($t75)
+                    $Abort($t75)
+                }
+                case 35 {
+                    // label L32
+                    // $t76 := borrow_local($t0)
+                    $t76 := $MakePtr(false, $locals)
+                    // $t77 := 1
+                    $t77 := 1
+                    // $t78 := vector::borrow<u64>($t76, $t77)
+                    $t78 := A1_vector_borrow$u64$($t76, $t77)
+                    // $t79 := read_ref($t78)
+                    $t79 := $LoadU64($t78)
+                    // $t80 := 43
+                    $t80 := 43
+                    // $t81 := ==($t79, $t80)
+                    $t81 := $Eq($t79, $t80)
+                    // if ($t81) goto L34 else goto L33
+                    switch $t81
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
+                }
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
+                }
+                case 37 {
+                    // label L33
+                    // $t82 := 112
+                    $t82 := 112
+                    // abort($t82)
+                    $Abort($t82)
+                }
+                case 38 {
+                    // label L35
+                    // $t83 := borrow_local($t0)
+                    $t83 := $MakePtr(false, $locals)
+                    // $t84 := 2
+                    $t84 := 2
+                    // $t85 := vector::borrow<u64>($t83, $t84)
+                    $t85 := A1_vector_borrow$u64$($t83, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU64($t85)
+                    // $t87 := 44
+                    $t87 := 44
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L37 else goto L36
+                    switch $t88
+                    case 0  { $block := 40 }
+                    default { $block := 39 }
+                }
+                case 39 {
+                    // label L37
+                    // goto L38
+                    $block := 41
+                }
+                case 40 {
+                    // label L36
+                    // $t89 := 113
+                    $t89 := 113
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 41 {
+                    // label L38
+                    // $t90 := borrow_local($t0)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 3
+                    $t91 := 3
+                    // $t92 := vector::borrow<u64>($t90, $t91)
+                    $t92 := A1_vector_borrow$u64$($t90, $t91)
+                    // $t93 := read_ref($t92)
+                    $t93 := $LoadU64($t92)
+                    // $t94 := 45
+                    $t94 := 45
+                    // $t95 := ==($t93, $t94)
+                    $t95 := $Eq($t93, $t94)
+                    // if ($t95) goto L40 else goto L39
+                    switch $t95
+                    case 0  { $block := 43 }
+                    default { $block := 42 }
+                }
+                case 42 {
+                    // label L40
+                    // goto L41
+                    $block := 44
+                }
+                case 43 {
+                    // label L39
+                    // $t96 := 114
+                    $t96 := 114
+                    // abort($t96)
+                    $Abort($t96)
+                }
+                case 44 {
+                    // label L41
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_push_back: Succeed(Stopped) (used_gas=23283): []
+
+// test of Vectors::test_swap
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_swap" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_swap()
+        return (0, 0)
+        function A2_Vectors_test_swap() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 43
+                    $t2 := 43
+                    // vector::push_back<u64>($t1, $t2)
+                    A1_vector_push_back$u64$($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 44
+                    $t4 := 44
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 0
+                    $t6 := 0
+                    // $t7 := vector::borrow<u64>($t5, $t6)
+                    $t7 := A1_vector_borrow$u64$($t5, $t6)
+                    // $t8 := read_ref($t7)
+                    $t8 := $LoadU64($t7)
+                    // $t9 := 42
+                    $t9 := 42
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t14 := vector::borrow<u64>($t12, $t13)
+                    $t14 := A1_vector_borrow$u64$($t12, $t13)
+                    // $t15 := read_ref($t14)
+                    $t15 := $LoadU64($t14)
+                    // $t16 := 43
+                    $t16 := 43
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L4 else goto L3
+                    switch $t17
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t18 := 102
+                    $t18 := 102
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 8 {
+                    // label L5
+                    // $t19 := borrow_local($t0)
+                    $t19 := $MakePtr(false, $locals)
+                    // $t20 := 2
+                    $t20 := 2
+                    // $t21 := vector::borrow<u64>($t19, $t20)
+                    $t21 := A1_vector_borrow$u64$($t19, $t20)
+                    // $t22 := read_ref($t21)
+                    $t22 := $LoadU64($t21)
+                    // $t23 := 44
+                    $t23 := 44
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L7 else goto L6
+                    switch $t24
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t25 := 103
+                    $t25 := 103
+                    // abort($t25)
+                    $Abort($t25)
+                }
+                case 11 {
+                    // label L8
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, $locals)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := 2
+                    $t28 := 2
+                    // vector::swap<u64>($t26, $t27, $t28)
+                    A1_vector_swap$u64$($t26, $t27, $t28)
+                    // $t29 := borrow_local($t0)
+                    $t29 := $MakePtr(false, $locals)
+                    // $t30 := 0
+                    $t30 := 0
+                    // $t31 := vector::borrow<u64>($t29, $t30)
+                    $t31 := A1_vector_borrow$u64$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU64($t31)
+                    // $t33 := 44
+                    $t33 := 44
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 104
+                    $t35 := 104
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := borrow_local($t0)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 43
+                    $t40 := 43
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L13 else goto L12
+                    switch $t41
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t42 := 105
+                    $t42 := 105
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 17 {
+                    // label L14
+                    // $t43 := borrow_local($t0)
+                    $t43 := $MakePtr(false, $locals)
+                    // $t44 := 2
+                    $t44 := 2
+                    // $t45 := vector::borrow<u64>($t43, $t44)
+                    $t45 := A1_vector_borrow$u64$($t43, $t44)
+                    // $t46 := read_ref($t45)
+                    $t46 := $LoadU64($t45)
+                    // $t47 := 42
+                    $t47 := 42
+                    // $t48 := ==($t46, $t47)
+                    $t48 := $Eq($t46, $t47)
+                    // if ($t48) goto L16 else goto L15
+                    switch $t48
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t49 := 106
+                    $t49 := 106
+                    // abort($t49)
+                    $Abort($t49)
+                }
+                case 20 {
+                    // label L17
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_swap: Succeed(Stopped) (used_gas=8941): []
+
+// test of Vectors::test_swap_fail
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_swap_fail" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_swap_fail()
+        return (0, 0)
+        function A2_Vectors_test_swap_fail() {
+            let $t1, $t2, $t3, $t4, $t5
+            let $locals := $Malloc(32)
+            // $t0 := Vectors::one_elem_u64()
+            mstore($locals, A2_Vectors_one_elem_u64())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 34
+            $t2 := 34
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := borrow_local($t0)
+            $t3 := $MakePtr(false, $locals)
+            // $t4 := 1
+            $t4 := 1
+            // $t5 := 2
+            $t5 := 2
+            // vector::swap<u64>($t3, $t4, $t5)
+            A1_vector_swap$u64$($t3, $t4, $t5)
+            // return ()
+            $Free($locals, 32)
+        }
+
+        function A1_vector_swap$u64$(v_ref, i, j) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+            let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 8)))
+            let i_val := $LoadU64(i_ptr)
+            let j_val := $LoadU64(j_ptr)
+            $StoreU64(i_ptr, j_val)
+            $StoreU64(j_ptr, i_val)
+        }
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_swap_fail: Revert(Reverted) (used_gas=2289): [255, 255, 255, 255, 255, 255, 255, 255]
+
+// test of Vectors::test_vector_equality
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vector_equality" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vector_equality()
+        return (0, 0)
+        function A2_Vectors_test_vector_equality() {
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t12 := 101
+                    $t12 := 101
+                    // abort($t12)
+                    $Abort($t12)
+                }
+                case 4 {
+                    // $t0 := vector::empty<u8>()
+                    mstore($locals, A1_vector_empty$u8$())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := 10
+                    $t2 := 10
+                    // vector::push_back<u8>($t1, $t2)
+                    A1_vector_push_back$u8$($t1, $t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 11
+                    $t4 := 11
+                    // vector::push_back<u8>($t3, $t4)
+                    A1_vector_push_back$u8$($t3, $t4)
+                    // $t5 := borrow_local($t0)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 12
+                    $t6 := 12
+                    // vector::push_back<u8>($t5, $t6)
+                    A1_vector_push_back$u8$($t5, $t6)
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 13
+                    $t8 := 13
+                    // vector::push_back<u8>($t7, $t8)
+                    A1_vector_push_back$u8$($t7, $t8)
+                    // $t9 := copy($t0)
+                    $t9 := mload($locals)
+                    // $t10 := [10, 11, 12, 13]
+                    $t10 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t10, 4)
+                    $MemoryStoreU64(add($t10, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_512532313(add($t10, 32))
+                    // $t11 := ==($t9, $t10)
+                    $t11 := $Eq_$vec$u8$$($t9, $t10)
+                    // if ($t11) goto L1 else goto L0
+                    switch $t11
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t13 := copy($t0)
+                    $t13 := mload($locals)
+                    // $t14 := [10, 11, 12, 13]
+                    $t14 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t14, 4)
+                    $MemoryStoreU64(add($t14, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_512532313(add($t14, 32))
+                    // $t15 := !=($t13, $t14)
+                    $t15 := $LogicalNot($Eq_$vec$u8$$($t13, $t14))
+                    // $t16 := !($t15)
+                    $t16 := $LogicalNot($t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 8 {
+                    // label L5
+                    // $t18 := copy($t0)
+                    $t18 := mload($locals)
+                    // $t19 := [10, 11, 12]
+                    $t19 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t19, 3)
+                    $MemoryStoreU64(add($t19, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2815201339(add($t19, 32))
+                    // $t20 := !=($t18, $t19)
+                    $t20 := $LogicalNot($Eq_$vec$u8$$($t18, $t19))
+                    // if ($t20) goto L7 else goto L6
+                    switch $t20
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t21 := 103
+                    $t21 := 103
+                    // abort($t21)
+                    $Abort($t21)
+                }
+                case 11 {
+                    // label L8
+                    // $t22 := copy($t0)
+                    $t22 := mload($locals)
+                    // $t23 := [10, 11, 12]
+                    $t23 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t23, 3)
+                    $MemoryStoreU64(add($t23, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2815201339(add($t23, 32))
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq_$vec$u8$$($t22, $t23)
+                    // $t25 := !($t24)
+                    $t25 := $LogicalNot($t24)
+                    // if ($t25) goto L10 else goto L9
+                    switch $t25
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t26 := 104
+                    $t26 := 104
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 14 {
+                    // label L11
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, $locals)
+                    // $t28 := 14
+                    $t28 := 14
+                    // vector::push_back<u8>($t27, $t28)
+                    A1_vector_push_back$u8$($t27, $t28)
+                    // $t29 := move($t0)
+                    $t29 := mload($locals)
+                    // $t30 := [10, 11, 12, 13, 14]
+                    $t30 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(5)))
+                    $MemoryStoreU64($t30, 5)
+                    $MemoryStoreU64(add($t30, 8), $ClosestGreaterPowerOfTwo(5))
+                    copy_literal_string_to_memory_337779769(add($t30, 32))
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq_$vec$u8$$($t29, $t30)
+                    // if ($t31) goto L13 else goto L12
+                    switch $t31
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t32 := 105
+                    $t32 := 105
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$u8$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 1)
+        }
+        function copy_literal_string_to_memory_337779769(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 13)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 14)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_2815201339(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+        }
+        function copy_literal_string_to_memory_512532313(value) {
+            $MemoryStoreU8(value, 10)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 11)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 12)
+            value := add(value, 1)
+            $MemoryStoreU8(value, 13)
+            value := add(value, 1)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $StoreU8(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU8(offs, val)
+          }
+          default {
+            $StorageStoreU8(offs, val)
+          }
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $StorageStoreU8(offs, val) {
+          $StorageStoreBytes(offs, 1, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
+        }
+    }
+}
+===> Test result of Vectors::test_vector_equality: Succeed(Stopped) (used_gas=8658): []
+
+// test of Vectors::test_vector_equality_struct
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vector_equality_struct" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vector_equality_struct()
+        return (0, 0)
+        function A2_Vectors_test_vector_equality_struct() {
+            let r1, r2, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39
+            let $locals := $Malloc(64)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
+                }
+                case 4 {
+                    // $t2 := vector::empty<Vectors::R>()
+                    mstore($locals, A1_vector_empty$A2_Vectors_R$())
+                    // $t3 := vector::empty<Vectors::R>()
+                    mstore(add($locals, 32), A1_vector_empty$A2_Vectors_R$())
+                    // $t4 := copy($t2)
+                    $t4 := mload($locals)
+                    // $t5 := copy($t3)
+                    $t5 := mload(add($locals, 32))
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq_$vec$A2_Vectors_R$$($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := true
+                    $t9 := true
+                    // $t10 := 9
+                    $t10 := 9
+                    // $t11 := pack Vectors::S($t8, $t9, $t10)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU8(add($mem, 24), $t9)
+                        $MemoryStoreU64(add($mem, 16), $t10)
+                        $t11 := $mem
+                    }
+                    // $t12 := Vectors::one_elem_u64()
+                    $t12 := A2_Vectors_one_elem_u64()
+                    // $t13 := pack Vectors::R($t11, $t12)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $MemoryStoreU256(add($mem, 32), $t12)
+                        $t13 := $mem
+                    }
+                    // $t14 := borrow_local($t2)
+                    $t14 := $MakePtr(false, $locals)
+                    // vector::push_back<Vectors::R>($t14, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t14, $t13)
+                    // $t15 := copy($t2)
+                    $t15 := mload($locals)
+                    // $t16 := copy($t3)
+                    $t16 := mload(add($locals, 32))
+                    // $t17 := !=($t15, $t16)
+                    $t17 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t15, $t16))
+                    // if ($t17) goto L4 else goto L3
+                    switch $t17
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t18 := 102
+                    $t18 := 102
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 8 {
+                    // label L5
+                    // $t19 := borrow_local($t3)
+                    $t19 := $MakePtr(false, add($locals, 32))
+                    // vector::push_back<Vectors::R>($t19, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t19, $t13)
+                    // $t20 := copy($t2)
+                    $t20 := mload($locals)
+                    // $t21 := copy($t3)
+                    $t21 := mload(add($locals, 32))
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq_$vec$A2_Vectors_R$$($t20, $t21)
+                    // if ($t22) goto L7 else goto L6
+                    switch $t22
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t23 := 103
+                    $t23 := 103
+                    // abort($t23)
+                    $Abort($t23)
+                }
+                case 11 {
+                    // label L8
+                    // $t24 := 42
+                    $t24 := 42
+                    // $t25 := false
+                    $t25 := false
+                    // $t26 := 9
+                    $t26 := 9
+                    // $t27 := pack Vectors::S($t24, $t25, $t26)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t24)
+                        $MemoryStoreU8(add($mem, 24), $t25)
+                        $MemoryStoreU64(add($mem, 16), $t26)
+                        $t27 := $mem
+                    }
+                    // $t28 := Vectors::one_elem_u64()
+                    $t28 := A2_Vectors_one_elem_u64()
+                    // $t29 := pack Vectors::R($t27, $t28)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t27)
+                        $MemoryStoreU256(add($mem, 32), $t28)
+                        $t29 := $mem
+                    }
+                    // $t30 := borrow_local($t2)
+                    $t30 := $MakePtr(false, $locals)
+                    // vector::push_back<Vectors::R>($t30, $t13)
+                    A1_vector_push_back$A2_Vectors_R$($t30, $t13)
+                    // $t31 := copy($t2)
+                    $t31 := mload($locals)
+                    // $t32 := copy($t3)
+                    $t32 := mload(add($locals, 32))
+                    // $t33 := !=($t31, $t32)
+                    $t33 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t31, $t32))
+                    // if ($t33) goto L10 else goto L9
+                    switch $t33
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t34 := 104
+                    $t34 := 104
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 14 {
+                    // label L11
+                    // $t35 := borrow_local($t3)
+                    $t35 := $MakePtr(false, add($locals, 32))
+                    // vector::push_back<Vectors::R>($t35, $t29)
+                    A1_vector_push_back$A2_Vectors_R$($t35, $t29)
+                    // $t36 := move($t2)
+                    $t36 := mload($locals)
+                    // $t37 := move($t3)
+                    $t37 := mload(add($locals, 32))
+                    // $t38 := !=($t36, $t37)
+                    $t38 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t36, $t37))
+                    // if ($t38) goto L13 else goto L12
+                    switch $t38
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t39 := 105
+                    $t39 := 105
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 17 {
+                    // label L14
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_push_back$A2_Vectors_R$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_1348728112 := $NewLinkedStorageBase(0x5063f530)
+                {
+                    let $linked_src_490229512 := mload(add(e, 0))
+                    let $linked_dst_490229512 := $NewLinkedStorageBase(0x1d384f08)
+                    $AlignedStorageStore(add($linked_dst_490229512, 0), mload(add($linked_src_490229512, 0)))
+                    $Free($linked_src_490229512, 25)
+                    $AlignedStorageStore(add($linked_dst_1348728112, 0), $linked_dst_490229512)
+                }
+                {
+                    let $linked_src_814019441 := mload(add(e, 32))
+                    let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
+                    let $size_814019441 := $MemoryLoadU64($linked_src_814019441)
+                    let $data_size_814019441 := mul($size_814019441, 8)
+                    $AlignedStorageStore($linked_dst_814019441, mload($linked_src_814019441))
+                    let $data_src_814019441 := add($linked_src_814019441, 32)
+                    let $data_dst_814019441 := add($linked_dst_814019441, 32)
+                    for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                        $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                        $Free($linked_src_814019441, add($data_size_814019441, 32))
+                    }
+                    $AlignedStorageStore(add($linked_dst_1348728112, 32), $linked_dst_814019441)
+                }
+                $Free(e, 64)
+                $AlignedStorageStore(e_offs, $linked_dst_1348728112)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_empty$A2_Vectors_R$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Eq_$vec$A2_Vectors_R$$(x, y) -> res
+        {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+              res:= false
+              leave
+            }
+            for { let i := 0 } lt(i, len_x) { i := add(i, 1) }
+            {
+                let e_x := $MemoryLoadU256(add(32, add(x, mul(i, 32))))
+                let e_y := $MemoryLoadU256(add(32, add(y, mul(i, 32))))
+                if $LogicalNot($Eq_$A2_Vectors_R$(e_x, e_y)) {
+                  res:= false
+                  leave
+                }
+            }
+            res := true
+        }
+        function $Eq_$A2_Vectors_R$(x, y) -> res
+        {
+            let f_x_0 := mload(add(x, 0))
+            let f_y_0 := mload(add(y, 0))
+            if $LogicalNot($Eq_$A2_Vectors_S$(f_x_0, f_y_0)) {
+              res:= false
+              leave
+            }
+            let f_x_1 := mload(add(x, 32))
+            let f_y_1 := mload(add(y, 32))
+            if $LogicalNot($Eq_$vec$u64$$(f_x_1, f_y_1)) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Eq_$vec$u64$$(x, y) -> res
+        {
+            res := $EqVector(x, y, 8)
+        }
+        function $Eq_$A2_Vectors_S$(x, y) -> res
+        {
+            if $Neq(mload(add(x, 0)), mload(add(y, 0))) {
+              res:= false
+              leave
+            }
+            res := true
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $EqVector(x, y, elem_size) -> r {
+            let len_x := $MemoryLoadU64(x)
+            let len_y := $MemoryLoadU64(y)
+            if $Neq(len_x, len_y) {
+                r := false
+                leave
+            }
+            let data_size_bytes := mul(elem_size, len_x)
+            let num_words, overflow_bytes := $ToWordOffs(data_size_bytes)
+            let i := 0
+            for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                if $Neq(mload(add(x, add(i, 32))), mload(add(y, add(i, 32)))) {
+                    r := false
+                    leave
+                }
+            }
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let x_overflow := mload(add(x, add(overflow_offs, 32)))
+            let y_overflow := mload(add(y, add(overflow_offs, 32)))
+            r := eq(or(mask, x_overflow), or(mask, y_overflow))
+        }
+        function $Neq(x, y) -> r {
+            r := $LogicalNot(eq(x, y))
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_vector_equality_struct: Succeed(Stopped) (used_gas=10390): []
+
+// test of Vectors::test_vectors_in_structs
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_Vectors_test_vectors_in_structs" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_Vectors_test_vectors_in_structs()
+        return (0, 0)
+        function A2_Vectors_test_vectors_in_structs() {
+            let r, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
+                }
+                case 4 {
+                    // $t1 := vector::empty<u64>()
+                    mstore($locals, A1_vector_empty$u64$())
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := true
+                    $t9 := true
+                    // $t10 := 9
+                    $t10 := 9
+                    // $t11 := pack Vectors::S($t8, $t9, $t10)
+                    {
+                        let $mem := $Malloc(25)
+                        $MemoryStoreU128(add($mem, 0), $t8)
+                        $MemoryStoreU8(add($mem, 24), $t9)
+                        $MemoryStoreU64(add($mem, 16), $t10)
+                        $t11 := $mem
+                    }
+                    // $t12 := move($t1)
+                    $t12 := mload($locals)
+                    // $t0 := pack Vectors::R($t11, $t12)
+                    {
+                        let $mem := $Malloc(64)
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $MemoryStoreU256(add($mem, 32), $t12)
+                        r := $mem
+                    }
+                    // $t13 := borrow_local($t0)
+                    $t13 := $MakePtr(false, r)
+                    // $t14 := borrow_field<Vectors::R>.v($t13)
+                    $t14 := $IndexPtr($t13, 32)
+                    // $t15 := vector::length<u64>($t14)
+                    $t15 := A1_vector_length$u64$($t14)
+                    // $t16 := 3
+                    $t16 := 3
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t19 := borrow_local($t0)
+                    $t19 := $MakePtr(false, r)
+                    // $t20 := borrow_field<Vectors::R>.v($t19)
+                    $t20 := $IndexPtr($t19, 32)
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t26 := 102
+                    $t26 := 102
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 8 {
+                    // label L5
+                    // $t27 := borrow_local($t0)
+                    $t27 := $MakePtr(false, r)
+                    // $t28 := borrow_field<Vectors::R>.v($t27)
+                    $t28 := $IndexPtr($t27, 32)
+                    // $t29 := 1
+                    $t29 := 1
+                    // $t30 := vector::borrow<u64>($t28, $t29)
+                    $t30 := A1_vector_borrow$u64$($t28, $t29)
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU64($t30)
+                    // $t32 := 11
+                    $t32 := 11
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L7 else goto L6
+                    switch $t33
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t34 := 103
+                    $t34 := 103
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 11 {
+                    // label L8
+                    // $t35 := borrow_local($t0)
+                    $t35 := $MakePtr(false, r)
+                    // $t36 := borrow_field<Vectors::R>.v($t35)
+                    $t36 := $IndexPtr($t35, 32)
+                    // $t37 := 2
+                    $t37 := 2
+                    // $t38 := vector::borrow<u64>($t36, $t37)
+                    $t38 := A1_vector_borrow$u64$($t36, $t37)
+                    // $t39 := read_ref($t38)
+                    $t39 := $LoadU64($t38)
+                    // $t40 := 12
+                    $t40 := 12
+                    // $t41 := ==($t39, $t40)
+                    $t41 := $Eq($t39, $t40)
+                    // if ($t41) goto L10 else goto L9
+                    switch $t41
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t42 := 104
+                    $t42 := 104
+                    // abort($t42)
+                    $Abort($t42)
+                }
+                case 14 {
+                    // label L11
+                    // $t43 := 41
+                    $t43 := 41
+                    // $t44 := borrow_local($t0)
+                    $t44 := $MakePtr(false, r)
+                    // $t45 := borrow_field<Vectors::R>.v($t44)
+                    $t45 := $IndexPtr($t44, 32)
+                    // $t46 := 1
+                    $t46 := 1
+                    // $t47 := vector::borrow_mut<u64>($t45, $t46)
+                    $t47 := A1_vector_borrow_mut$u64$($t45, $t46)
+                    // write_ref($t47, $t43)
+                    $StoreU64($t47, $t43)
+                    // $t48 := borrow_local($t0)
+                    $t48 := $MakePtr(false, r)
+                    // $t49 := borrow_field<Vectors::R>.v($t48)
+                    $t49 := $IndexPtr($t48, 32)
+                    // $t50 := 1
+                    $t50 := 1
+                    // $t51 := vector::borrow<u64>($t49, $t50)
+                    $t51 := A1_vector_borrow$u64$($t49, $t50)
+                    // $t52 := read_ref($t51)
+                    $t52 := $LoadU64($t51)
+                    // $t53 := 41
+                    $t53 := 41
+                    // $t54 := ==($t52, $t53)
+                    $t54 := $Eq($t52, $t53)
+                    // if ($t54) goto L13 else goto L12
+                    switch $t54
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t55 := 105
+                    $t55 := 105
+                    // abort($t55)
+                    $Abort($t55)
+                }
+                case 17 {
+                    // label L14
+                    // $t56 := Vectors::one_elem_u64()
+                    $t56 := A2_Vectors_one_elem_u64()
+                    // $t57 := borrow_local($t0)
+                    $t57 := $MakePtr(false, r)
+                    // $t58 := borrow_field<Vectors::R>.v($t57)
+                    $t58 := $IndexPtr($t57, 32)
+                    // write_ref($t58, $t56)
+                    if $IsStoragePtr($t58){
+                        let $storage_ptr_814019441 := $NewLinkedStorageBase(0x3084f371)
+                        let $size_814019441 := $MemoryLoadU64($t56)
+                        let $data_size_814019441 := mul($size_814019441, 8)
+                        $AlignedStorageStore($storage_ptr_814019441, mload($t56))
+                        let $data_src_814019441 := add($t56, 32)
+                        let $data_dst_814019441 := add($storage_ptr_814019441, 32)
+                        for { let $offs_814019441 := 0 } lt($offs_814019441, $data_size_814019441) { $offs_814019441 := add($offs_814019441, 32)} {
+                            $AlignedStorageStore(add($data_dst_814019441, $offs_814019441), mload(add($data_src_814019441, $offs_814019441)))
+                        }
+                        $t56 := $storage_ptr_814019441
+                    }
+                    $StoreU256($t58, $t56)
+                    // $t59 := borrow_local($t0)
+                    $t59 := $MakePtr(false, r)
+                    // $t60 := borrow_field<Vectors::R>.v($t59)
+                    $t60 := $IndexPtr($t59, 32)
+                    // $t61 := vector::length<u64>($t60)
+                    $t61 := A1_vector_length$u64$($t60)
+                    // $t62 := 1
+                    $t62 := 1
+                    // $t63 := ==($t61, $t62)
+                    $t63 := $Eq($t61, $t62)
+                    // if ($t63) goto L16 else goto L15
+                    switch $t63
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t64 := 106
+                    $t64 := 106
+                    // abort($t64)
+                    $Abort($t64)
+                }
+                case 20 {
+                    // label L17
+                    // $t65 := borrow_local($t0)
+                    $t65 := $MakePtr(false, r)
+                    // $t66 := borrow_field<Vectors::R>.v($t65)
+                    $t66 := $IndexPtr($t65, 32)
+                    // $t67 := 0
+                    $t67 := 0
+                    // $t68 := vector::borrow<u64>($t66, $t67)
+                    $t68 := A1_vector_borrow$u64$($t66, $t67)
+                    // $t69 := read_ref($t68)
+                    $t69 := $LoadU64($t68)
+                    // $t70 := 42
+                    $t70 := 42
+                    // $t71 := ==($t69, $t70)
+                    $t71 := $Eq($t69, $t70)
+                    // if ($t71) goto L19 else goto L18
+                    switch $t71
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t72 := 107
+                    $t72 := 107
+                    // abort($t72)
+                    $Abort($t72)
+                }
+                case 23 {
+                    // label L20
+                    // return ()
+                    $Free($locals, 32)
+                    leave
+                }
+            }
+        }
+
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_Vectors_one_elem_u64() -> $result {
+            let $t1, $t2, $t3
+            let $locals := $Malloc(32)
+            // $t0 := vector::empty<u64>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t1 := borrow_local($t0)
+            $t1 := $MakePtr(false, $locals)
+            // $t2 := 42
+            $t2 := 42
+            // vector::push_back<u64>($t1, $t2)
+            A1_vector_push_back$u64$($t1, $t2)
+            // $t3 := move($t0)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_borrow_mut$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MakePtr(is_storage, offs) -> ptr {
+          ptr := or(is_storage, shl(1, offs))
+        }
+        function $IsStoragePtr(ptr) -> b {
+          b := and(ptr, 0x1)
+        }
+        function $OffsetPtr(ptr) -> offs {
+          offs := shr(1, ptr)
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $ExtractBytes(word, start, size) -> bytes {
+           switch size
+           case 1 {
+              // use the faster byte primitive
+              bytes := byte(start, word)
+           }
+           default {
+              // As we have big endian, we need to right shift the value from
+              // where the highest byte starts in the word (32 - start), minus
+              // the size.
+              let shift_bits := shl(3, sub(sub(32, start), size))
+              bytes := and(shr(shift_bits, word), $MaskForSize(size))
+           }
+        }
+        function $InjectBytes(word, start, size, bytes) -> new_word {
+           let shift_bits := shl(3, sub(sub(32, start), size))
+           // Blend out the bits which we inject
+           let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+           word := and(word, neg_mask)
+           // Overlay the bits we inject
+           new_word := or(word, shl(shift_bits, bytes))
+        }
+        function $ToWordOffs(offs) -> word_offs, byte_offset {
+          word_offs := shr(5, offs)
+          byte_offset := and(offs, 0x1F)
+        }
+        function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+          let available_bytes := sub(32, byte_offset)
+          switch gt(size, available_bytes)
+          case 0 {
+            overflow_bytes := 0
+          }
+          default {
+            overflow_bytes := sub(size, available_bytes)
+          }
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageLoadBytes(offs, size) -> val {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          val := $ExtractBytes(sload(key), byte_offs, size)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          if $LogicalNot(iszero(overflow_bytes)) {
+            key := $StorageKey(0, add(word_offs, 1))
+            let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+            val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+          }
+        }
+        function $StorageStoreBytes(offs, size, bytes) {
+          let word_offs, byte_offs := $ToWordOffs(offs)
+          let key := $StorageKey(0, word_offs)
+          let overflow_bytes := $OverflowBytes(byte_offs, size)
+          switch overflow_bytes
+          case 0 {
+            sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+          }
+          default {
+            // Shift the higher bytes to the right
+            let used_bytes := sub(size, overflow_bytes)
+            let higher_bytes := shr(used_bytes, bytes)
+            let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+            sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+            key := $StorageKey(0, add(word_offs, 1))
+            sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+          }
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $IndexPtr(ptr, offs) -> new_ptr {
+          new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+        }
+        function $MemoryStoreU8(offs, val) {
+          // Shortcut via special instruction
+          mstore8(offs, val)
+        }
+        function $LoadU64(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU64(offs)
+          }
+          default {
+            val := $StorageLoadU64(offs)
+          }
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $StorageLoadU64(offs) -> val {
+          val := $StorageLoadBytes(offs, 8)
+        }
+        function $StoreU64(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU64(offs, val)
+          }
+          default {
+            $StorageStoreU64(offs, val)
+          }
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $StorageStoreU64(offs, val) {
+          $StorageStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU128(offs, val) {
+          $MemoryStoreBytes(offs, 16, val)
+        }
+        function $LoadU256(ptr) -> val {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            val := $MemoryLoadU256(offs)
+          }
+          default {
+            val := $StorageLoadU256(offs)
+          }
+        }
+        function $MemoryLoadU256(offs) -> val {
+          val := $MemoryLoadBytes(offs, 32)
+        }
+        function $StorageLoadU256(offs) -> val {
+          val := $StorageLoadBytes(offs, 32)
+        }
+        function $StoreU256(ptr, val) {
+          let offs := $OffsetPtr(ptr)
+          switch $IsStoragePtr(ptr)
+          case 0 {
+            $MemoryStoreU256(offs, val)
+          }
+          default {
+            $StorageStoreU256(offs, val)
+          }
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $StorageStoreU256(offs, val) {
+          $StorageStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+        function $CopyMemory(src, dst, size) {
+          let num_words, overflow_bytes := $ToWordOffs(size)
+          let i := 0
+          for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+            mstore(add(dst, i), mload(add(src, i)))
+          }
+          if overflow_bytes {
+            let mask := $MaskForSize(sub(32, overflow_bytes))
+            let overflow_offs := mul(num_words, 32)
+            let dst_word := and(mload(add(dst, overflow_offs)), mask)
+            let src_word := and(mload(add(src, overflow_offs)), not(mask))
+            mstore(add(dst, overflow_offs), or(dst_word, src_word))
+          }
+        }
+        function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+            let new_capacity := mul(capacity, 2)
+            let data_size := add(32, mul(capacity, type_size))
+            let new_data_size := add(32, mul(new_capacity, type_size))
+            new_v_offs := $Malloc(new_data_size)
+            $CopyMemory(v_offs, new_v_offs, data_size)
+            // update capacity at new location
+            $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+            $Free(v_offs, data_size)
+        }
+        function $GtEq(x, y) -> r {
+            r := or(gt(x, y), eq(x, y))
+        }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
+        }
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
+        }
+    }
+}
+===> Test result of Vectors::test_vectors_in_structs: Succeed(Stopped) (used_gas=11062): []
diff --git a/vendors/move/crates/evm/move-to-yul/tests/Vectors.move b/vendors/move/crates/evm/move-to-yul/tests/Vectors.move
new file mode 100644
index 000000000..3789188fb
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/Vectors.move
@@ -0,0 +1,273 @@
+#[evm_contract]
+module 0x2::Vectors {
+    use std::vector;
+
+    struct S has copy, drop { x: u128, y: bool, z: u64 }
+    struct R has copy, drop { s: S, v: vector<u64> }
+
+    fun empty_vector() : vector<u64> {
+        vector::empty<u64>()
+    }
+
+    #[evm_test]
+    fun test_empty() {
+        let v = empty_vector();
+        assert!(vector::length(&v) == 0, 101);
+    }
+
+    #[evm_test]
+    fun test_borrow_fail() {
+        let v = empty_vector();
+        assert!(*vector::borrow(&v, 0) == 0, 101);
+    }
+
+    fun one_elem_u64() : vector<u64>{
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 42);
+        v
+    }
+
+    #[evm_test]
+    #[callable]
+    fun test_one_elem_u64() {
+        let v = one_elem_u64();
+        assert!(vector::length(&v) == 1, 101);
+        assert!(*vector::borrow(&v, 0) == 42, 102);
+    }
+
+
+    fun one_elem_struct() : vector<S>{
+        let v = vector::empty<S>();
+        vector::push_back(&mut v, S { x: 42, y: true, z: 789 });
+        v
+    }
+
+    #[evm_test]
+    fun test_one_elem_struct() {
+        let v = one_elem_struct();
+        assert!(vector::length(&v) == 1, 101);
+        assert!(vector::borrow(&v, 0).x == 42, 102);
+        assert!(vector::borrow(&v, 0).y == true, 103);
+        assert!(vector::borrow(&v, 0).z == 789, 104);
+    }
+
+    #[evm_test]
+    fun test_push_back() {
+        let v = one_elem_u64();
+        assert!(vector::length(&v) == 1, 101);
+        assert!(*vector::borrow(&v, 0) == 42, 102);
+
+        vector::push_back(&mut v, 43);
+        assert!(vector::length(&v) == 2, 103);
+        assert!(*vector::borrow(&v, 0) == 42, 104);
+        assert!(*vector::borrow(&v, 1) == 43, 105);
+
+        vector::push_back(&mut v, 44);
+        assert!(vector::length(&v) == 3, 106);
+        assert!(*vector::borrow(&v, 0) == 42, 107);
+        assert!(*vector::borrow(&v, 1) == 43, 108);
+        assert!(*vector::borrow(&v, 2) == 44, 109);
+
+        vector::push_back(&mut v, 45);
+        assert!(vector::length(&v) == 4, 110);
+        assert!(*vector::borrow(&v, 0) == 42, 111);
+        assert!(*vector::borrow(&v, 1) == 43, 112);
+        assert!(*vector::borrow(&v, 2) == 44, 113);
+        assert!(*vector::borrow(&v, 3) == 45, 114);
+    }
+
+    #[evm_test]
+    fun test_swap() {
+        let v = one_elem_u64();
+        vector::push_back(&mut v, 43);
+        vector::push_back(&mut v, 44);
+        assert!(*vector::borrow(&v, 0) == 42, 101);
+        assert!(*vector::borrow(&v, 1) == 43, 102);
+        assert!(*vector::borrow(&v, 2) == 44, 103);
+
+        vector::swap(&mut v, 0, 2);
+        assert!(*vector::borrow(&v, 0) == 44, 104);
+        assert!(*vector::borrow(&v, 1) == 43, 105);
+        assert!(*vector::borrow(&v, 2) == 42, 106);
+    }
+
+    #[evm_test]
+    fun test_swap_fail() {
+        let v = one_elem_u64();
+        vector::push_back(&mut v, 34);
+        vector::swap(&mut v, 1, 2);
+    }
+
+    #[evm_test]
+    fun test_pop_back() {
+        let v = one_elem_u64();
+        vector::push_back(&mut v, 43);
+        assert!(vector::length(&v) == 2, 101);
+        assert!(*vector::borrow(&v, 0) == 42, 102);
+        assert!(*vector::borrow(&v, 1) == 43, 103);
+
+        let e = vector::pop_back(&mut v);
+        assert!(vector::length(&v) == 1, 104);
+        assert!(e == 43, 105);
+
+        let e = vector::pop_back(&mut v);
+        assert!(vector::length(&v) == 0, 106);
+        assert!(e == 42, 107);
+
+        vector::destroy_empty(v);
+    }
+
+    #[evm_test]
+    fun test_pop_back_empty_fail() {
+        let v = vector::empty<address>();
+        vector::pop_back(&mut v); // should abort here
+    }
+
+    #[evm_test]
+    fun test_destroy_empty() {
+        let v = vector::empty<address>();
+        vector::destroy_empty(v);
+    }
+
+    #[evm_test]
+    fun test_destroy_non_empty_fail() {
+        let v = one_elem_struct();
+        vector::destroy_empty(v); // should abort here
+    }
+
+    #[evm_test]
+    fun test_borrow_mut() {
+        let v = one_elem_struct();
+        vector::push_back(&mut v, S { x: 45, y: false, z: 123 });
+        let s1_ref = vector::borrow_mut(&mut v, 0);
+        s1_ref.x = 90;
+        s1_ref.y = false;
+        s1_ref.z = 1028;
+        // the first element is properly changed
+        assert!(vector::borrow(&v, 0).x == 90, 101);
+        assert!(vector::borrow(&v, 0).y == false, 102);
+        assert!(vector::borrow(&v, 0).z == 1028, 103);
+        // the second element is not changed
+        assert!(vector::borrow(&v, 1).x == 45, 104);
+        assert!(vector::borrow(&v, 1).y == false, 105);
+        assert!(vector::borrow(&v, 1).z == 123, 106);
+        // TODO: uncomment this after we've implemented equality for struct
+        // assert!(*vector::borrow(&v, 0) == S { x: 90, y: false, z: 1028 }, 104);
+
+        let s2_ref = vector::borrow_mut(&mut v, 1);
+        s2_ref.x = 10;
+        s2_ref.y = true;
+        s2_ref.z = 456;
+        assert!(vector::borrow(&v, 1).x == 10, 107);
+        assert!(*&vector::borrow(&v, 1).y == true, 108);
+        assert!(*&vector::borrow(&v, 1).z == 456, 109);
+    }
+
+    #[evm_test]
+    fun test_nested_vectors() {
+        // construct three vectors
+        let v0 = vector::empty<u64>();
+        vector::push_back(&mut v0, 10);
+        vector::push_back(&mut v0, 11);
+
+        let v1 = vector::empty<u64>();
+        vector::push_back(&mut v1, 12);
+        vector::push_back(&mut v1, 13);
+        vector::push_back(&mut v1, 14);
+
+        let v2 = vector::empty<u64>();
+        vector::push_back(&mut v2, 15);
+        vector::push_back(&mut v2, 16);
+        vector::push_back(&mut v2, 17);
+        vector::push_back(&mut v2, 18);
+
+        // push all three vectors into another vector
+        let v = vector::empty<vector<u64>>();
+        vector::push_back(&mut v, v0);
+        vector::push_back(&mut v, v1);
+        vector::push_back(&mut v, v2);
+
+
+        assert!(vector::length(&v) == 3, 101);
+        assert!(vector::length(vector::borrow(&v, 0)) == 2, 102);
+        assert!(vector::length(vector::borrow(&v, 1)) == 3, 103);
+        assert!(vector::length(vector::borrow(&v, 2)) == 4, 104);
+
+        assert!(*vector::borrow(vector::borrow(&v, 0), 0) == 10, 105);
+        assert!(*vector::borrow(vector::borrow(&v, 1), 1) == 13, 105);
+        assert!(*vector::borrow(vector::borrow(&v, 2), 2) == 17, 105);
+        assert!(*vector::borrow(vector::borrow(&v, 2), 3) == 18, 105);
+    }
+
+    #[evm_test]
+    fun test_vectors_in_structs() {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+
+        let r = R{ s: S{ x: 42, y: true, z: 9 }, v };
+        assert!(vector::length(&r.v) == 3, 101);
+        assert!(*vector::borrow(&r.v, 0) == 10, 102);
+        assert!(*vector::borrow(&r.v, 1) == 11, 103);
+        assert!(*vector::borrow(&r.v, 2) == 12, 104);
+
+        *vector::borrow_mut(&mut r.v, 1) = 41;
+        assert!(*vector::borrow(&r.v, 1) == 41, 105);
+
+        *&mut r.v = one_elem_u64();
+        assert!(vector::length(&r.v) == 1, 106);
+        assert!(*vector::borrow(&r.v, 0) == 42, 107);
+    }
+
+    #[evm_test]
+    fun test_vector_equality() {
+        let v = vector::empty<u8>();
+        vector::push_back(&mut v, 10);
+        vector::push_back(&mut v, 11);
+        vector::push_back(&mut v, 12);
+        vector::push_back(&mut v, 13);
+
+        assert!(v == x"0a0b0c0d", 101);
+        assert!(!(v != x"0a0b0c0d"), 102);
+        assert!(v != x"0a0b0c", 103);
+        assert!(!(v == x"0a0b0c"), 104);
+
+        vector::push_back(&mut v, 14);
+        assert!(v == x"0a0b0c0d0e", 105);
+    }
+
+    #[evm_test]
+    fun test_vector_equality_struct() {
+        let v1 = vector::empty<R>();
+        let v2 = vector::empty<R>();
+        assert!(v1 == v2, 101);
+        let r1 = R{ s: S{ x: 42, y: true, z: 9 }, v: one_elem_u64() };
+        vector::push_back(&mut v1, copy r1);
+        assert!(v1 != v2, 102);
+        vector::push_back(&mut v2, r1);
+        assert!(v1 == v2, 103);
+
+        let r2 = R{ s: S{ x: 42, y: false, z: 9 }, v: one_elem_u64() };
+        vector::push_back(&mut v1, copy r1);
+        assert!(v1 != v2, 104);
+        vector::push_back(&mut v2, r2);
+        assert!(v1 != v2, 105);
+    }
+
+    #[evm_test]
+    fun test_nested_vector_equality() {
+        let v1 = vector::empty<vector<u8>>();
+        let v2 = vector::empty<vector<u8>>();
+        assert!(v1 == v2, 101);
+        vector::push_back(&mut v1, b"abc");
+        vector::push_back(&mut v2, b"abc");
+        assert!(v1 == v2, 102);
+        vector::push_back(&mut v1, b"def");
+        vector::push_back(&mut v2, b"def");
+        assert!(v1 == v2, 103);
+        vector::push_back(&mut v1, b"ghi");
+        vector::push_back(&mut v2, b"ghij");
+        assert!(v1 != v2, 104);
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/dispatcher_testsuite.rs b/vendors/move/crates/evm/move-to-yul/tests/dispatcher_testsuite.rs
new file mode 100644
index 000000000..f452d7684
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/dispatcher_testsuite.rs
@@ -0,0 +1,1230 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use evm::{backend::MemoryVicinity, ExitReason};
+use evm_exec_utils::{compile, exec::Executor};
+use move_compiler::shared::{NumericalAddress, PackagePaths};
+use move_model::{options::ModelBuilderOptions, run_model_builder_with_options};
+use move_stdlib::move_stdlib_named_addresses;
+use move_to_yul::{generator::Generator, options::Options};
+use primitive_types::{H160, U256};
+use std::path::{Path, PathBuf};
+
+pub const DISPATCHER_TESTS_LOCATION: &str = "tests/test-dispatcher";
+
+fn path_from_crate_root(path: &str) -> String {
+    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    buf.push(path);
+    buf.to_string_lossy().to_string()
+}
+
+fn contract_path(file_name: &str) -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join(DISPATCHER_TESTS_LOCATION)
+        .join(file_name)
+}
+
+pub fn generate_testing_vincinity() -> MemoryVicinity {
+    MemoryVicinity {
+        gas_price: 0.into(),
+        origin: H160::zero(),
+        chain_id: 0.into(),
+        block_hashes: vec![],
+        block_number: 0.into(),
+        block_coinbase: H160::zero(),
+        block_timestamp: 0.into(),
+        block_difficulty: 0.into(),
+        block_gas_limit: U256::MAX,
+        block_base_fee_per_gas: 0.into(),
+    }
+}
+
+fn compile_yul_to_bytecode_bytes(filename: &str) -> Result<Vec<u8>> {
+    let deps = vec![
+        path_from_crate_root("../stdlib/sources"),
+        path_from_crate_root("../../move-stdlib/sources"),
+        path_from_crate_root("../../extensions/async/move-async-lib/sources"),
+    ];
+    let mut named_address_map = move_stdlib_named_addresses();
+    named_address_map.insert(
+        "std".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
+    named_address_map.insert(
+        "Evm".to_string(),
+        NumericalAddress::parse_str("0x2").unwrap(),
+    );
+    named_address_map.insert(
+        "Async".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
+    let env = run_model_builder_with_options(
+        vec![PackagePaths {
+            name: None,
+            paths: vec![contract_path(filename).to_string_lossy().to_string()],
+            named_address_map: named_address_map.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: deps,
+            named_address_map,
+        }],
+        ModelBuilderOptions::default(),
+    )?;
+    let options = Options::default();
+    let (_, out, _) = Generator::run(&options, &env)
+        .pop()
+        .expect("not contract in test case");
+    let (bc, _) = compile::solc_yul(&out, false)?;
+    Ok(bc)
+}
+
+/// Test DispatcherBasic
+#[test]
+fn test_dispatch_basic() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherBasic.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+    for i in 0..3 {
+        let sig = format!("return_{}()", i);
+        let (exit_reason, buffer) =
+            exec.call_function(H160::zero(), contract_address, 0.into(), &sig, &[]);
+        assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+        assert!(buffer.len() >= 32);
+        let mut expected = [0u8; 32];
+        expected[31] = i;
+        assert_eq!(&buffer[..32], &expected);
+    }
+    Ok(())
+}
+
+/// Test DispatcherBasicStorage
+#[test]
+fn test_dispatch_basic_storage() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherBasicStorage.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+    let current = "current()";
+    let increment = "increment()";
+    for i in 0..3 {
+        let (exit_reason, buffer) =
+            exec.call_function(H160::zero(), contract_address, 0.into(), current, &[]);
+        assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+        assert!(buffer.len() >= 32);
+        assert_eq!(&buffer[31], &(i as u8));
+        let (exit_reason, _) =
+            exec.call_function(H160::zero(), contract_address, 0.into(), increment, &[]);
+        assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+    }
+    Ok(())
+}
+
+/// Test DispatcherRevert
+#[test]
+fn test_dispatch_revert() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherRevert.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+    let sig = "return_1";
+    let (exit_reason, _) = exec.call_function(H160::zero(), contract_address, 0.into(), sig, &[]);
+    assert!(matches!(exit_reason, ExitReason::Revert(_)));
+    Ok(())
+}
+
+/// Test DispatcherFallback
+#[test]
+fn test_dispatch_fallback() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherFallback.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+    let sig = "return_1";
+    let (exit_reason, _) = exec.call_function(H160::zero(), contract_address, 0.into(), sig, &[]);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+    Ok(())
+}
+
+/// Test decoding array types (u8)
+#[test]
+fn test_dispatch_array_decoding_u8() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u8(uint8[2])";
+    let mut args = [0u8; 64];
+    args[31] = 42; // arr[0]
+    args[63] = 24; // arr[1]
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 32];
+    expected[31] = args[31] + args[63];
+    assert_eq!(&buffer[..32], &expected);
+
+    //////
+    let sig = "test_u8(uint8[2][2])";
+    let mut args = [0u8; 128];
+    args[31] = 1; // arr[0][0]
+    args[63] = 2; // arr[1][0]
+    args[95] = 3; // arr[0][1]
+    args[127] = 4; // arr[1][1]
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 32];
+    expected[31] = args[31] + args[63] + args[95] - args[127];
+    assert_eq!(&buffer[..32], &expected);
+
+    //////
+    let sig = "test_u8(uint8[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; //  size of arr
+    args[95] = 5; //  arr_1
+    args[127] = 6;
+    args[159] = 7; // arr_2
+    args[191] = 8;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = args[95] + args[127] + args[159] + args[191];
+    assert_eq!(&buffer[..32], &expected);
+
+    //////
+    let sig = "test_u8(uint8[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to array
+    args[63] = 64; // pointer to array 1
+    args[95] = 160; // pointer to array 2
+    args[127] = 2; // length of array 1
+    args[159] = 9;
+    args[191] = 10;
+    args[223] = 3; // length of array 2
+    args[255] = 11;
+    args[287] = 12;
+    args[319] = 13;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = args[159] + args[191] + args[255] + args[287] + args[319];
+    assert_eq!(&buffer, &expected);
+
+    Ok(())
+}
+
+/// Test decoding array types (u64)
+#[test]
+fn test_dispatch_array_decoding_u64() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u64(uint64[2])";
+    let mut args = [0u8; 64];
+    for item in args.iter_mut().take(32).skip(24) {
+        *item = 11; // arr[0]
+    }
+    for item in args.iter_mut().skip(56) {
+        *item = 22; // arr[1]
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(24) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(24) {
+        assert_eq!(*item, 33);
+    }
+
+    //////
+    let sig = "test_u64(uint64[2][2])";
+    let mut args = [0u8; 128];
+    for item in args.iter_mut().take(32).skip(24) {
+        *item = 11; // arr[0][0]
+    }
+    for item in args.iter_mut().take(64).skip(56) {
+        *item = 11; // arr[1][0]
+    }
+    for item in args.iter_mut().take(96).skip(88) {
+        *item = 11; // arr[0][1]
+    }
+    for item in args.iter_mut().skip(120) {
+        *item = 11; // arr[1][1]
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(24) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(24) {
+        assert_eq!(*item, 44);
+    }
+
+    //////
+    let sig = "test_u64(uint64[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to the array
+    args[63] = 2; // size of the dynamic array
+    for item in args.iter_mut().take(96).skip(88) {
+        *item = 11; // arr[0][0]
+    }
+    for item in args.iter_mut().take(128).skip(120) {
+        *item = 11; // arr[1][0]
+    }
+    for item in args.iter_mut().take(160).skip(152) {
+        *item = 11; // arr[0][1]
+    }
+    for item in args.iter_mut().skip(184) {
+        *item = 11; // arr[1][1]
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(24) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(24) {
+        assert_eq!(*item, 44);
+    }
+
+    //////
+    let sig = "test_u64(uint64[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to array
+    args[63] = 64; // pointer to arr_1
+    args[95] = 160; // pointer to arr_2
+    args[127] = 2; // length of arr_1
+    for item in args.iter_mut().take(160).skip(152) {
+        *item = 11; // arr_1[0][0]
+    }
+    for item in args.iter_mut().take(192).skip(184) {
+        *item = 11; // arr_1[1][0]
+    }
+    args[223] = 3; // length of arr_2
+    for item in args.iter_mut().take(256).skip(248) {
+        *item = 11; // arr_2[0][1]
+    }
+    for item in args.iter_mut().take(288).skip(280) {
+        *item = 11; // arr_2[1][1]
+    }
+    for item in args.iter_mut().skip(312) {
+        *item = 11; // arr_2[2][1]
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(24) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(24) {
+        assert_eq!(*item, 55);
+    }
+
+    Ok(())
+}
+
+/// Test decoding array types (u128)
+#[test]
+fn test_dispatch_array_decoding_u128() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u128(uint128[][])";
+    let mut args = [0u8; 416];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // length of arr
+    args[95] = 64; // pointer to arr_1
+    args[127] = 192; // pointer to arr_2
+    args[159] = 3; // length of arr_1
+    for i in 16..32 {
+        args[160 + i] = 11;
+        args[160 + 32 + i] = 22;
+        args[160 + 64 + i] = 11;
+    }
+    args[287] = 4; // length of arr_2
+    for i in 16..32 {
+        args[288 + i] = 11;
+        args[288 + 32 + i] = 22;
+        args[288 + 64 + i] = 11;
+        args[288 + 96 + i] = 11;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() >= 32);
+    for item in buffer.iter().take(16) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(16) {
+        assert_eq!(*item, 99);
+    }
+
+    Ok(())
+}
+
+/// Test decoding array types (U256)
+#[test]
+fn test_dispatch_array_decoding_u256() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u256(uint256[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // size of arr
+    for item in args.iter_mut().skip(64) {
+        *item = 11;
+    }
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(32) {
+        assert_eq!(*item, 44);
+    }
+
+    //////
+    let sig = "test_u256(uint256[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to arr
+    args[63] = 64; // pointer to arr_1
+    args[95] = 160; // pointer to arr_2
+    args[127] = 2; // length of arr_1
+    for item in args.iter_mut().take(192).skip(128) {
+        *item = 11; // arr_1
+    }
+    args[223] = 3; // length of arr_2
+    for item in args.iter_mut().skip(224) {
+        *item = 11; // arr_2
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(32) {
+        assert_eq!(*item, 55);
+    }
+
+    Ok(())
+}
+
+/// Test decoding array types
+#[test]
+fn test_dispatch_array_decoding_type_compatibility() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_uint8_u64(uint8[2])";
+    let mut args = [0u8; 64];
+    args[31] = 42;
+    args[63] = 24;
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() >= 32);
+    let mut expected = [0u8; 32];
+    expected[31] = args[31] + args[63];
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_uint16_u64(uint16[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // size of arr
+    args[94] = 1; // arr_1
+    args[95] = 5;
+    args[126] = 1;
+    args[127] = 6;
+    args[158] = 1; // arr_2
+    args[159] = 7;
+    args[190] = 1;
+    args[191] = 8;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[30] = args[94] + args[126] + args[158] + args[190];
+    expected[31] = args[95] + args[127] + args[159] + args[191];
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_uint72_u128(uint72[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to arr
+    args[63] = 64; // pointer to arr_1
+    args[95] = 160; // pointer to arr_2
+    args[127] = 2; // length of arr_1
+    for item in args.iter_mut().take(160).skip(151) {
+        *item = 11;
+    }
+    for item in args.iter_mut().take(192).skip(183) {
+        *item = 11;
+    }
+    args[223] = 3; // length of arr_2
+    for item in args.iter_mut().take(256).skip(247) {
+        *item = 11;
+    }
+    for item in args.iter_mut().take(288).skip(279) {
+        *item = 11;
+    }
+    for item in args.iter_mut().skip(311) {
+        *item = 11;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    for item in buffer.iter().take(23) {
+        assert_eq!(*item, 0);
+    }
+    for item in buffer.iter().take(32).skip(23) {
+        assert_eq!(*item, 55);
+    }
+
+    //////
+    let sig = "test_uint8_U256(uint8[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // size of arr
+    args[95] = 5; // arr_1
+    args[127] = 6;
+    args[159] = 7; // arr_2
+    args[191] = 8;
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = args[95] + args[127] + args[159] + args[191];
+    assert_eq!(&buffer, &expected);
+
+    Ok(())
+}
+
+/// Test decoding bytes
+#[test]
+fn test_dispatch_bytes_decoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherBytesDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_static_bytes_len(bytes4)";
+    let mut args = [0u8; 32];
+    args[0] = 1;
+    args[1] = 2;
+    args[2] = 3;
+    args[3] = 4;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 4; // length of bytes4
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_static_bytes_last_elem(bytes32)";
+    let mut args = [0u8; 32];
+    for i in 1..33 {
+        args[i - 1] = i as u8;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 32; // last element of bytes32
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_dynamic_bytes_len(bytes)";
+    let mut args = [0u8; 128];
+    args[31] = 32;
+    args[63] = 33;
+    for (i, item) in args.iter_mut().enumerate().take(97).skip(64) {
+        *item = i as u8;
+    }
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 33;
+    assert_eq!(&buffer[..32], &expected);
+
+    //////
+    let sig = "test_dynamic_bytes_last_elem(bytes)";
+    let mut args = [0u8; 128];
+    args[31] = 32;
+    args[63] = 33;
+    for (i, item) in args.iter_mut().enumerate().take(97).skip(64) {
+        *item = i as u8;
+    }
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 96; // last element of bytes
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_bytes5_2_dynamic_size_sum(bytes5[2][])";
+    let mut args = [0u8; 256];
+    args[31] = 32; // pointer to arr
+    args[63] = 3; // length of arr
+    for i in 0..5 {
+        // construct bytes5
+        args[64 + i] = 1;
+        args[64 + 32 + i] = 2;
+        args[64 + 64 + i] = 3;
+        args[64 + 96 + i] = 4;
+        args[64 + 128 + i] = 5;
+        args[64 + 160 + i] = 6;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 64);
+    let mut expected = [0u8; 64];
+    expected[31] = 30;
+    expected[63] = 21;
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_string(string)";
+    let mut args = [0u8; 96];
+    args[31] = 32;
+    args[63] = 5;
+    args[64] = 72;
+    args[65] = 101;
+    args[66] = 108;
+    args[67] = 108;
+    args[68] = 111;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 64);
+    let mut expected = [0u8; 64];
+    expected[31] = 5; // length
+    expected[63] = 111; // last byte of the string
+    assert_eq!(&buffer, &expected);
+
+    Ok(())
+}
+
+/// Test decoding multiple parameters
+#[test]
+fn test_dispatch_multi_paras_decoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherMultiParaDecoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u8_array_2_uint64(uint8[2],uint64)";
+    let mut args = [0u8; 96];
+    args[31] = 41; // arr[0]
+    args[63] = 42; // arr[1]
+    args[95] = 1;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 42; // arr[1]
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)";
+    let mut args = [0u8; 160];
+    args[31] = 0;
+    args[63] = 43;
+    args[95] = 44;
+    args[127] = 45;
+    args[159] = 2;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 64);
+    let mut expected = [0u8; 64];
+    expected[31] = 43; // arr[0]
+    expected[63] = 45; // arr[2]
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_u8_array_uint64_u8_array_uint64(uint8[2],uint64,uint8[2],uint64)";
+    let mut args = [0u8; 192];
+    args[31] = 41;
+    args[63] = 42;
+    args[95] = 0;
+    args[127] = 43;
+    args[159] = 44;
+    args[191] = 1;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 85; // arr[0] + arr[1]
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_string_length_sum(string,string)";
+    let mut args = [0u8; 32 + 32 + 32 + 64 + 32 + 32];
+    args[31] = 64; // pointer to str_1
+    args[63] = 160; // pointer to str_2
+    args[95] = 34; // length of str_1
+    for (i, item) in args.iter_mut().enumerate().take(130).skip(96) {
+        *item = (i - 41) as u8;
+    }
+    args[191] = 5; // length of str_2
+    for (i, item) in args.iter_mut().enumerate().take(197).skip(192) {
+        *item = (197 - i) as u8;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    expected[31] = 39; // str_1.len() + str_2.len()
+    assert_eq!(&buffer[..32], &expected);
+
+    //////
+    let sig = "test_static_array_string_static_array_string(string,uint8[2],string,uint8[2])";
+    let mut args = [0u8; 32 + 64 + 32 + 64 + 32 + 32 + 32 + 32];
+    args[31] = 192; // pointer to str_1
+    args[63] = 1; // arr_1[0]
+    args[95] = 2; // arr_1[1]
+    args[126] = 1; // pointer to str_2
+    args[127] = 0; // pointer to str_2 (256)
+    args[159] = 3; // arr_2[0]
+    args[191] = 4; // arr_2[1]
+    args[223] = 3; // length of str1
+    for item in args.iter_mut().take(227).skip(224) {
+        *item = 6;
+    }
+    args[287] = 5; // length of str2
+    for item in args.iter_mut().take(294).skip(288) {
+        *item = 7;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 64);
+    let mut expected = [0u8; 64];
+    expected[31] = 12; // sum(str_1.len + str_2.len + arr_1.len + arr_2.len)
+    expected[63] = 19; // arr_1[1] + arr_2[1] + str_1[2] + str_1[3] = 2 + 4 + 6 + 7
+    assert_eq!(&buffer[..64], &expected);
+
+    Ok(())
+}
+
+/// Test encoding array types
+#[test]
+fn test_dispatch_array_encoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherArrayEncoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u8(uint8[2])";
+    let mut args = [0u8; 64];
+    args[31] = 42;
+    args[63] = 24;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_u8(uint8[2][2])";
+    let mut args = [0u8; 128];
+    args[31] = 1;
+    args[63] = 2;
+    args[95] = 3;
+    args[127] = 4;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_u8(uint8[2][])";
+    let mut args = [0u8; 192];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // size of arr
+    args[95] = 5; // arr_1
+    args[127] = 6;
+    args[159] = 7; // arr_2
+    args[191] = 8;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////////
+    let sig = "test_u8(uint8[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to array
+    args[63] = 64; // pointer to array 1
+    args[95] = 160; // pointer to array 2
+    args[127] = 2; // first array length
+    args[159] = 9;
+    args[191] = 10;
+    args[223] = 3; // second array length
+    args[255] = 11;
+    args[287] = 12;
+    args[319] = 13;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() >= 320);
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_u64(uint64[2])";
+    let mut args = [0u8; 64];
+    for item in args.iter_mut().take(32).skip(24) {
+        *item = 11;
+    }
+    for item in args.iter_mut().skip(56) {
+        *item = 22;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_u128(uint128[][])";
+    let mut args = [0u8; 416];
+    args[31] = 32; // pointer to arr
+    args[63] = 2; // length of arr
+    args[95] = 64; // pointer to arr_1
+    args[127] = 192; // pointer to arr_2
+    args[159] = 3; // length of arr_1
+    for i in 16..32 {
+        args[160 + i] = 11;
+        args[160 + 32 + i] = 22;
+        args[160 + 64 + i] = 11;
+    }
+    args[287] = 4; // length of arr_2
+    for i in 16..32 {
+        args[288 + i] = 11;
+        args[288 + 32 + i] = 22;
+        args[288 + 64 + i] = 11;
+        args[288 + 96 + i] = 11;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_u256(uint256[][2])";
+    let mut args = [0u8; 320];
+
+    args[31] = 32; // pointer to arr
+    args[63] = 64; // pointer to arr_1
+    args[95] = 160; // pointer to arr_2
+    args[127] = 2; // length of arr_1
+    for item in args.iter_mut().take(192).skip(128) {
+        *item = 11; // arr_1
+    }
+    args[223] = 3; // length of arr_2
+    for item in args.iter_mut().skip(224) {
+        *item = 11; // arr_2
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_uint72_u128(uint72[][2])";
+    let mut args = [0u8; 320];
+    args[31] = 32; // pointer to arr
+    args[63] = 64; // pointer to arr_1
+    args[95] = 160; // pointer to arr_2
+    args[127] = 2; // length of arr_1
+    for item in args.iter_mut().take(160).skip(151) {
+        *item = 11;
+    }
+    for item in args.iter_mut().take(192).skip(183) {
+        *item = 11;
+    }
+    args[223] = 3; // length of arr_2
+    for item in args.iter_mut().take(256).skip(247) {
+        *item = 11;
+    }
+    for item in args.iter_mut().take(288).skip(279) {
+        *item = 11;
+    }
+    for item in args.iter_mut().skip(311) {
+        *item = 11;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    Ok(())
+}
+
+/// Test encoding bytes
+#[test]
+fn test_dispatch_bytes_encoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherBytesEncoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_static_bytes(bytes4,uint8)";
+    let mut args = [0u8; 64];
+    args[0] = 1;
+    args[1] = 2;
+    args[2] = 3;
+    args[3] = 4;
+    args[63] = 42;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert!(buffer.len() == 32);
+    let mut expected = [0u8; 32];
+    for (i, item) in expected.iter_mut().enumerate().take(4) {
+        *item = (i + 1) as u8;
+    }
+    expected[4] = args[63];
+
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_bytes5_2_dynamic(bytes5[2][])";
+    let mut args = [0u8; 256];
+    args[31] = 32; // pointer to arr
+    args[63] = 3; // length of arr
+    for i in 0..5 {
+        // construct three bytes5 pair
+        args[64 + i] = 1;
+        args[64 + 32 + i] = 2;
+        args[64 + 64 + i] = 3;
+        args[64 + 96 + i] = 4;
+        args[64 + 128 + i] = 5;
+        args[64 + 160 + i] = 6;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_bytes(bytes)";
+    let mut args = [0u8; 128];
+    args[31] = 32; // pointer to bytes
+    args[63] = 33; // length of bytes
+    for (i, item) in args.iter_mut().enumerate().take(97).skip(64) {
+        *item = i as u8;
+    }
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    //////
+    let sig = "test_string(string)";
+    let mut args = [0u8; 96];
+    args[31] = 32; // pointer to str
+    args[63] = 5; // length of str
+    args[64] = 72;
+    args[65] = 101;
+    args[66] = 108;
+    args[67] = 108;
+    args[68] = 111;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(&buffer, &args);
+
+    Ok(())
+}
+
+/// Test encoding multiple return values
+#[test]
+fn test_dispatch_multi_ret_encoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherMultiRetEncoding.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_u8_array_2_uint64(uint8[2],uint64)";
+    let mut args = [0u8; 96];
+    args[31] = 41; //
+    args[63] = 42;
+    args[95] = 1;
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 96];
+    expected[31] = 42; // arr[1]
+    expected[63] = 41; // arr
+    expected[95] = 42;
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)";
+    let mut args = [0u8; 160];
+    args[31] = 0;
+    args[63] = 43;
+    args[95] = 44;
+    args[127] = 45;
+    args[159] = 2;
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 160];
+    expected[31] = 43; // arr[0]
+    expected[63] = 43; // arr
+    expected[95] = 44;
+    expected[127] = 45;
+    expected[159] = 45; // arr[2]
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_two_strings(string,string)";
+    let mut args = [0u8; 32 + 32 + 32 + 64 + 32 + 32];
+    args[31] = 64; // pointer to str_1
+    args[63] = 160; // pointer to str_2
+    args[95] = 34; // length of str_1
+    for (i, item) in args.iter_mut().enumerate().take(130).skip(96) {
+        // str_1
+        *item = (i - 41) as u8;
+    }
+    args[191] = 5; // pointer to str_2
+    for (i, item) in args.iter_mut().enumerate().take(197).skip(192) {
+        // str_2
+        *item = (197 - i) as u8;
+    }
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 224];
+    expected[31] = 64; // pointer to str_2
+    expected[63] = 128; // pointer to str_1
+    expected[95] = 5; // length of str_2
+    for (i, item) in expected.iter_mut().enumerate().take(101).skip(96) {
+        // str_2
+        *item = (197 - i - 96) as u8;
+    }
+    expected[159] = 34; // length of str_1
+    for (i, item) in expected.iter_mut().enumerate().take(194).skip(160) {
+        // str_1
+        *item = (i - 64 - 41) as u8;
+    }
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_string_uint8(string)";
+    let mut args = [0u8; 96];
+    args[31] = 32; // pointer to str
+    args[63] = 5; // length of str
+    args[64] = 72;
+    args[65] = 101;
+    args[66] = 108;
+    args[67] = 108;
+    args[68] = 111;
+
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &args);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    assert_eq!(buffer[31], 64); // pointer to str
+    assert_eq!(&buffer[64..128], &args[32..]); // str
+    assert_eq!(buffer[63], 111); // last byte of str
+
+    Ok(())
+}
+
+/// Test encoding string from storage
+#[test]
+fn test_storage_string_encoding() -> Result<()> {
+    let contract_code = compile_yul_to_bytecode_bytes("DispatcherEncodingStorage.move")?;
+    let vicinity = generate_testing_vincinity();
+    let mut exec = Executor::new(&vicinity);
+    let contract_address = exec
+        .create_contract(H160::zero(), contract_code)
+        .expect("failed to create contract");
+
+    //////
+    let sig = "test_string()";
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &[]);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 96];
+    expected[31] = 32;
+    expected[63] = 1;
+    expected[64] = 65;
+    assert_eq!(&buffer, &expected);
+
+    //////
+    let sig = "test_vec_u64()";
+    let (exit_reason, buffer) =
+        exec.call_function(H160::zero(), contract_address, 0.into(), sig, &[]);
+    assert!(matches!(exit_reason, ExitReason::Succeed(_)));
+
+    let mut expected = [0u8; 224];
+    expected[31] = 64;
+    expected[63] = 128;
+    expected[95] = 1;
+    expected[96] = 65;
+    expected[159] = 2;
+    expected[191] = 64;
+    expected[223] = 65;
+
+    assert_eq!(&buffer, &expected);
+
+    Ok(())
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.exp
new file mode 100644
index 000000000..bb3a10d40
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.exp
@@ -0,0 +1,43 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.move
new file mode 100644
index 000000000..a75212378
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackOnly.move
@@ -0,0 +1,8 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[fallback]
+    fun fallback() {
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.exp
new file mode 100644
index 000000000..92a008b49
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.exp
@@ -0,0 +1,35 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.move
new file mode 100644
index 000000000..5c3cd7063
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/FallbackPayableOnly.move
@@ -0,0 +1,8 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[fallback, payable]
+    fun fallback() {
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.exp
new file mode 100644
index 000000000..c224229c6
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.exp
@@ -0,0 +1,77 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                if iszero(calldatasize()) { A2_M_receive() stop() }
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                let retval := A2_M_fallback(0, calldatasize()) stop()
+                return(add(retval, 0x20), mload(retval))
+            }
+            function A2_M_receive() {
+                // return ()
+            }
+
+            function A2_M_fallback(x) -> $result {
+                let $t1, $t2
+                // $t1 := 1
+                $t1 := 1
+                // $t2 := +($t0, $t1)
+                $t2 := $AddU64(x, $t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Errors compiling Yul
+
+Warning: Yul is still experimental. Please use the output with care.
+Warning: "switch" statement with only a default case.
+  --> <stdin>:17:17:
+   |
+17 |                 switch selector
+   |                 ^ (Relevant source part starts here and spans across multiple lines).
+
+Error: Function "A2_M_fallback" expects 1 arguments but got 2.
+  --> <stdin>:28:31:
+   |
+28 |                 let retval := A2_M_fallback(0, calldatasize()) stop()
+   |                               ^^^^^^^^^^^^^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.move
new file mode 100644
index 000000000..9474f3189
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveFallback.move
@@ -0,0 +1,13 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[receive, payable]
+    fun receive() {
+    }
+
+    #[fallback]
+    fun fallback(x: u64) : u64 {
+        x + 1
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.exp
new file mode 100644
index 000000000..c7adf1a8a
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.exp
@@ -0,0 +1,40 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                default {}
+            }
+            {
+                if iszero(calldatasize()) { A2_M_receive() stop() }
+            }
+            $Abort(98)
+            function A2_M_receive() {
+                // return ()
+            }
+
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.move
new file mode 100644
index 000000000..25c37d32f
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/ReceiveOnly.move
@@ -0,0 +1,8 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[receive, payable]
+    fun receive() {
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.exp
new file mode 100644
index 000000000..1b35753d7
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.exp
@@ -0,0 +1,10 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: fallback function must have at most 1 parameter and 1 return value
+  ┌─ tests/fallback-receive-test/expect-failure/FallbackMultipleParams.move:5:2
+  │
+5 │ ╭     fun fallback(x: u64, y: u64): u64 {
+6 │ │         x + y
+7 │ │     }
+  │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.move
new file mode 100644
index 000000000..39dc11d8c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackMultipleParams.move
@@ -0,0 +1,9 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[fallback]
+	fun fallback(x: u64, y: u64): u64 {
+		x + y
+	}
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.exp b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.exp
new file mode 100644
index 000000000..433bbee99
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.exp
@@ -0,0 +1,18 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: only one #[receive] function allowed per contract module
+   ┌─ tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move:10:2
+   │
+10 │ ╭     fun receive(x: u64): u64 {
+11 │ │         x
+12 │ │     }
+   │ ╰─────^
+
+error: only one #[fallback] function allowed per contract module
+   ┌─ tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move:10:2
+   │
+10 │ ╭     fun receive(x: u64): u64 {
+11 │ │         x
+12 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move
new file mode 100644
index 000000000..c251195df
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/fallback-receive-test/expect-failure/FallbackReciveFailure.move
@@ -0,0 +1,15 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[fallback, callable, receive]
+	fun fallback(x: u64): u64 {
+		x
+	}
+
+	#[receive, callable, fallback]
+	fun receive(x: u64): u64 {
+		x
+	}
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp
new file mode 100644
index 000000000..d53fac786
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp
@@ -0,0 +1,2302 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x52044bf1
+                {
+                    // test_u64(uint64[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf03cf98d
+                {
+                    // test_u8(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5bbb1b40
+                {
+                    // test_uint16_u64(uint16[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint16_2___$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint16_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint16$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaae0ca0b
+                {
+                    // test_uint72_u128(uint72[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint72_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint72$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xeb158528
+                {
+                    // test_uint8_U256(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint8_U256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2baf810d
+                {
+                    // test_uint8_u64(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint8_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x77689027
+                {
+                    // test_u64(uint64[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2__2_$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xecefc49c
+                {
+                    // test_u8(uint8[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c976153
+                {
+                    // test_u256(uint256[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x17041a2e
+                {
+                    // test_u64(uint64[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64___2_$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x3b09967a
+                {
+                    // test_u8(uint8[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x374cb568
+                {
+                    // test_u256(uint256[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256_2___$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x6a829009
+                {
+                    // test_u64(uint64[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2___$_$vec$vec$u64$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x43ed1d2f
+                {
+                    // test_u8(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14fda38d
+                {
+                    // test_u128(uint128[][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_array_u64(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u64>($t3, $t4)
+                $t5 := A1_vector_borrow$u64$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU64($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u64>($t7, $t8)
+                $t9 := A1_vector_borrow$u64$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU64($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_array_u8(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u8>($t3, $t4)
+                $t5 := A1_vector_borrow$u8$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU8($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u8>($t7, $t8)
+                $t9 := A1_vector_borrow$u8$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU8($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU8($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_array_uint16_u64(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u64>>($t7)
+                        $t8 := A1_vector_length$vec$u64$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u64>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u64$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u64>($t13, $t14)
+                        $t15 := A1_vector_borrow$u64$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU64($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u64>($t13, $t17)
+                        $t18 := A1_vector_borrow$u64$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU64($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU64(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU64($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint72_u128(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u128>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u128$$($t11, i)
+                        // $t13 := vector::length<u128>($t12)
+                        $t13 := A1_vector_length$u128$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u128>($t12, $t2)
+                        $t16 := A1_vector_borrow$u128$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU128($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU128(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint8_U256(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t10 := <($t1, $t8)
+                        $t10 := $Lt(i, $t8)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<U256::U256>>($t7)
+                        $t8 := A1_vector_length$vec$A2_U256_U256$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t3 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$A2_U256_U256$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t14 := vector::borrow<U256::U256>($t12, $t13)
+                        $t14 := A1_vector_borrow$A2_U256_U256$($t12, $t13)
+                        // $t15 := read_ref($t14)
+                        $t15 := $LoadU256($t14)
+                        // $t16 := 1
+                        $t16 := 1
+                        // $t17 := vector::borrow<U256::U256>($t12, $t16)
+                        $t17 := A1_vector_borrow$A2_U256_U256$($t12, $t16)
+                        // $t18 := read_ref($t17)
+                        $t18 := $LoadU256($t17)
+                        // $t19 := +($t15, $t18)
+                        $t19 := $AddU256($t15, $t18)
+                        // $t3 := +($t3, $t19)
+                        sum := $AddU256(sum, $t19)
+                        // $t20 := 1
+                        $t20 := 1
+                        // $t1 := +($t1, $t20)
+                        i := $AddU64(i, $t20)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_array_uint8_u64(v) -> $result {
+                let val_1, val_2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t0)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 0
+                $t4 := 0
+                // $t5 := vector::borrow<u64>($t3, $t4)
+                $t5 := A1_vector_borrow$u64$($t3, $t4)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU64($t5)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 1
+                $t8 := 1
+                // $t9 := vector::borrow<u64>($t7, $t8)
+                $t9 := A1_vector_borrow$u64$($t7, $t8)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := +($t6, $t10)
+                $t11 := $AddU64($t6, $t10)
+                // return $t11
+                $result := $t11
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u64(v) -> $result {
+                let vec_1, vec_1_val_1, vec_1_val_2, vec_2, vec_2_val_1, vec_2_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 0
+                $t8 := 0
+                // $t9 := vector::borrow<vector<u64>>($t7, $t8)
+                $t9 := A1_vector_borrow$vec$u64$$($t7, $t8)
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, $locals)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := vector::borrow<vector<u64>>($t10, $t11)
+                $t12 := A1_vector_borrow$vec$u64$$($t10, $t11)
+                // $t13 := 0
+                $t13 := 0
+                // $t14 := vector::borrow<u64>($t9, $t13)
+                $t14 := A1_vector_borrow$u64$($t9, $t13)
+                // $t15 := read_ref($t14)
+                $t15 := $LoadU64($t14)
+                // $t16 := 1
+                $t16 := 1
+                // $t17 := vector::borrow<u64>($t9, $t16)
+                $t17 := A1_vector_borrow$u64$($t9, $t16)
+                // $t18 := read_ref($t17)
+                $t18 := $LoadU64($t17)
+                // $t19 := 0
+                $t19 := 0
+                // $t20 := vector::borrow<u64>($t12, $t19)
+                $t20 := A1_vector_borrow$u64$($t12, $t19)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU64($t20)
+                // $t22 := 1
+                $t22 := 1
+                // $t23 := vector::borrow<u64>($t12, $t22)
+                $t23 := A1_vector_borrow$u64$($t12, $t22)
+                // $t24 := read_ref($t23)
+                $t24 := $LoadU64($t23)
+                // $t25 := +($t15, $t18)
+                $t25 := $AddU64($t15, $t18)
+                // $t26 := +($t25, $t21)
+                $t26 := $AddU64($t25, $t21)
+                // $t27 := +($t26, $t24)
+                $t27 := $AddU64($t26, $t24)
+                // return $t27
+                $result := $t27
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u8(v) -> $result {
+                let vec_1, vec_1_val_1, vec_1_val_2, vec_2, vec_2_val_1, vec_2_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t7 := borrow_local($t0)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := 0
+                $t8 := 0
+                // $t9 := vector::borrow<vector<u8>>($t7, $t8)
+                $t9 := A1_vector_borrow$vec$u8$$($t7, $t8)
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, $locals)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := vector::borrow<vector<u8>>($t10, $t11)
+                $t12 := A1_vector_borrow$vec$u8$$($t10, $t11)
+                // $t13 := 0
+                $t13 := 0
+                // $t14 := vector::borrow<u8>($t9, $t13)
+                $t14 := A1_vector_borrow$u8$($t9, $t13)
+                // $t15 := read_ref($t14)
+                $t15 := $LoadU8($t14)
+                // $t16 := 1
+                $t16 := 1
+                // $t17 := vector::borrow<u8>($t9, $t16)
+                $t17 := A1_vector_borrow$u8$($t9, $t16)
+                // $t18 := read_ref($t17)
+                $t18 := $LoadU8($t17)
+                // $t19 := 0
+                $t19 := 0
+                // $t20 := vector::borrow<u8>($t12, $t19)
+                $t20 := A1_vector_borrow$u8$($t12, $t19)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU8($t20)
+                // $t22 := 1
+                $t22 := 1
+                // $t23 := vector::borrow<u8>($t12, $t22)
+                $t23 := A1_vector_borrow$u8$($t12, $t22)
+                // $t24 := read_ref($t23)
+                $t24 := $LoadU8($t23)
+                // $t25 := +($t15, $t18)
+                $t25 := $AddU8($t15, $t18)
+                // $t26 := +($t25, $t21)
+                $t26 := $AddU8($t25, $t21)
+                // $t27 := -($t26, $t24)
+                $t27 := $Sub($t26, $t24)
+                // return $t27
+                $result := $t27
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u256(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t8 := 2
+                        $t8 := 2
+                        // $t9 := <($t1, $t8)
+                        $t9 := $Lt(i, $t8)
+                        // if ($t9) goto L1 else goto L0
+                        switch $t9
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t4 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := borrow_local($t0)
+                        $t10 := $MakePtr(false, $locals)
+                        // $t11 := vector::borrow<vector<U256::U256>>($t10, $t1)
+                        $t11 := A1_vector_borrow$vec$A2_U256_U256$$($t10, i)
+                        // $t12 := vector::length<U256::U256>($t11)
+                        $t12 := A1_vector_length$A2_U256_U256$($t11)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t2 := $t13
+                        j := $t13
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t14 := <($t2, $t12)
+                        $t14 := $Lt(j, $t12)
+                        // if ($t14) goto L4 else goto L3
+                        switch $t14
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t11)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t1 := +($t1, $t18)
+                        i := $AddU64(i, $t18)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t15 := vector::borrow<U256::U256>($t11, $t2)
+                        $t15 := A1_vector_borrow$A2_U256_U256$($t11, j)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU256($t15)
+                        // $t4 := +($t4, $t16)
+                        sum := $AddU256(sum, $t16)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t2 := +($t2, $t17)
+                        j := $AddU64(j, $t17)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u64(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u64>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u64$$($t11, i)
+                        // $t13 := vector::length<u64>($t12)
+                        $t13 := A1_vector_length$u64$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u64>($t12, $t2)
+                        $t16 := A1_vector_borrow$u64$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU64($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU64(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u8(v) -> $result {
+                let i, j, len_vec, sum, vec, vec_val, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t9 := 2
+                        $t9 := 2
+                        // $t10 := <($t1, $t9)
+                        $t10 := $Lt(i, $t9)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := 0
+                        $t7 := 0
+                        // $t1 := $t7
+                        i := $t7
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t4 := $t8
+                        sum := $t8
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u8>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u8$$($t11, i)
+                        // $t13 := vector::length<u8>($t12)
+                        $t13 := A1_vector_length$u8$($t12)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t2 := $t14
+                        j := $t14
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t15 := <($t2, $t13)
+                        $t15 := $Lt(j, $t13)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u8>($t12, $t2)
+                        $t16 := A1_vector_borrow$u8$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU8($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU8(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u256(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t10 := <($t1, $t8)
+                        $t10 := $Lt(i, $t8)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<U256::U256>>($t7)
+                        $t8 := A1_vector_length$vec$A2_U256_U256$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t3 := U256::zero()
+                        sum := A2_U256_zero()
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$A2_U256_U256$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t14 := vector::borrow<U256::U256>($t12, $t13)
+                        $t14 := A1_vector_borrow$A2_U256_U256$($t12, $t13)
+                        // $t15 := read_ref($t14)
+                        $t15 := $LoadU256($t14)
+                        // $t16 := 1
+                        $t16 := 1
+                        // $t17 := vector::borrow<U256::U256>($t12, $t16)
+                        $t17 := A1_vector_borrow$A2_U256_U256$($t12, $t16)
+                        // $t18 := read_ref($t17)
+                        $t18 := $LoadU256($t17)
+                        // $t19 := +($t15, $t18)
+                        $t19 := $AddU256($t15, $t18)
+                        // $t3 := +($t3, $t19)
+                        sum := $AddU256(sum, $t19)
+                        // $t20 := 1
+                        $t20 := 1
+                        // $t1 := +($t1, $t20)
+                        i := $AddU64(i, $t20)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u64(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u64>>($t7)
+                        $t8 := A1_vector_length$vec$u64$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u64>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u64$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u64>($t13, $t14)
+                        $t15 := A1_vector_borrow$u64$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU64($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u64>($t13, $t17)
+                        $t18 := A1_vector_borrow$u64$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU64($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU64(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU64($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u8(v) -> $result {
+                let i, len_v, sum, vec, vec_val_1, vec_val_2, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L3
+                        // $t11 := <($t1, $t8)
+                        $t11 := $Lt(i, $t8)
+                        // if ($t11) goto L1 else goto L0
+                        switch $t11
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t7 := borrow_local($t0)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::length<vector<u8>>($t7)
+                        $t8 := A1_vector_length$vec$u8$$($t7)
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t1 := $t9
+                        i := $t9
+                        // $t10 := 0
+                        $t10 := 0
+                        // $t3 := $t10
+                        sum := $t10
+                        // goto L3
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t12 := borrow_local($t0)
+                        $t12 := $MakePtr(false, $locals)
+                        // $t13 := vector::borrow<vector<u8>>($t12, $t1)
+                        $t13 := A1_vector_borrow$vec$u8$$($t12, i)
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t15 := vector::borrow<u8>($t13, $t14)
+                        $t15 := A1_vector_borrow$u8$($t13, $t14)
+                        // $t16 := read_ref($t15)
+                        $t16 := $LoadU8($t15)
+                        // $t17 := 1
+                        $t17 := 1
+                        // $t18 := vector::borrow<u8>($t13, $t17)
+                        $t18 := A1_vector_borrow$u8$($t13, $t17)
+                        // $t19 := read_ref($t18)
+                        $t19 := $LoadU8($t18)
+                        // $t20 := +($t3, $t16)
+                        $t20 := $AddU8(sum, $t16)
+                        // $t3 := +($t20, $t19)
+                        sum := $AddU8($t20, $t19)
+                        // $t21 := 1
+                        $t21 := 1
+                        // $t1 := +($t1, $t21)
+                        i := $AddU64(i, $t21)
+                        // goto L3
+                        $block := 2
+                    }
+                }
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_u128(v) -> $result {
+                let i, j, len_v, sum, vec, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t10 := <($t1, $t7)
+                        $t10 := $Lt(i, $t7)
+                        // if ($t10) goto L1 else goto L0
+                        switch $t10
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t6 := borrow_local($t0)
+                        $t6 := $MakePtr(false, $locals)
+                        // $t7 := vector::length<vector<u128>>($t6)
+                        $t7 := A1_vector_length$vec$u128$$($t6)
+                        // $t8 := 0
+                        $t8 := 0
+                        // $t1 := $t8
+                        i := $t8
+                        // $t9 := 0
+                        $t9 := 0
+                        // $t4 := $t9
+                        sum := $t9
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::borrow<vector<u128>>($t11, $t1)
+                        $t12 := A1_vector_borrow$vec$u128$$($t11, i)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t2 := $t13
+                        j := $t13
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t14 := vector::length<u128>($t12)
+                        $t14 := A1_vector_length$u128$($t12)
+                        // $t15 := <($t2, $t14)
+                        $t15 := $Lt(j, $t14)
+                        // if ($t15) goto L4 else goto L3
+                        switch $t15
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t16 := vector::borrow<u128>($t12, $t2)
+                        $t16 := A1_vector_borrow$u128$($t12, j)
+                        // $t17 := read_ref($t16)
+                        $t17 := $LoadU128($t16)
+                        // $t4 := +($t4, $t17)
+                        sum := $AddU128(sum, $t17)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t2 := +($t2, $t18)
+                        j := $AddU64(j, $t18)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A1_vector_borrow$u128$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 16)))
+            }
+            function A1_vector_length$u128$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$u128$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u128$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_borrow$vec$u8$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            }
+            function A1_vector_borrow$vec$u64$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u64$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$A2_U256_U256$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_borrow$vec$A2_U256_U256$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A2_U256_zero() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A1_vector_length$vec$A2_U256_U256$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$u64$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128_____vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128_____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint128_____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128_____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint128___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_2___$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint64_2____vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2____vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint64_2____vec$vec$u64$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint64_2____vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint64_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256_2___$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256_2____vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256_2____vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256_2____vec$vec$A2_U256_U256$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256_2____vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256_2__vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256_2__vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256_2__vec$A2_U256_U256$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256_2__vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8___2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8___2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint8___vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8___vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__uint8___vec$u8$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8___vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_tuple_$uint64___2_$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint64___2__vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64___2__vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint64___2__vec$vec$u64$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64___2__vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint64___vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint64___vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(8, length), 32)
+                array := abi_decode_available_length__uint64___vec$u64$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint64___vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___2__vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___2__vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint256___vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$uint64_2__2_$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__2__vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2__2__vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint64_2__2__vec$vec$u64$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__2__vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint8$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint8_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_encode_tuple_$uint8$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$A2_U256_U256$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__vec$A2_U256_U256$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint72$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint72(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint72(value, pos) {
+                mstore(pos, cleanup_uint72(value))
+            }
+            function cleanup_uint72(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint72___2__vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint72___2__vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint72___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint72___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint72___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint72___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint72(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint72(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint72(value)
+            }
+            function validator_uint72(value) {
+                if iszero(eq(value, cleanup_uint72(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint16$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint16(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint16(value, pos) {
+                mstore(pos, cleanup_uint16(value))
+            }
+            function cleanup_uint16(value) -> cleaned {
+                cleaned := and(value, 0xffff)
+            }
+            function abi_decode_tuple_$uint16_2___$_$vec$vec$u64$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint16_2____vec$vec$u64$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint16_2____vec$vec$u64$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint16_2____vec$vec$u64$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint16_2____vec$vec$u64$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16_2__vec$u64$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint16_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint16_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint16_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint16(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint16(value)
+            }
+            function validator_uint16(value) {
+                if iszero(eq(value, cleanup_uint16(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$uint64_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU128(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU128(offs)
+              }
+              default {
+                val := $StorageLoadU128(offs)
+              }
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StorageLoadU128(offs) -> val {
+              val := $StorageLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU128(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU256(x, y) -> r {
+                if lt(sub(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.move
new file mode 100644
index 000000000..aeaf45b21
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.move
@@ -0,0 +1,233 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+    use Evm::U256::{Self, U256};
+
+    // Semantic tests for decoding array types
+
+    // uint8[2]
+    #[callable(sig=b"test_u8(uint8[2]) returns (uint8)")]
+    fun test_array_u8(v: vector<u8>): u8{
+        let val_1 = *vector::borrow(&v, 0);
+        let val_2 = *vector::borrow(&v, 1);
+        val_1 + val_2
+    }
+
+    // uint8[2][2]
+    #[callable(sig=b"test_u8(uint8[2][2]) returns (uint8) ")]
+    fun test_one_elem_para_array_2_array_2_u8(v: vector<vector<u8>>): u8{
+        let vec_1 = vector::borrow(&v, 0);
+        let vec_2 = vector::borrow(&v, 1);
+        let vec_1_val_1 = *vector::borrow(vec_1, 0);
+        let vec_1_val_2 = *vector::borrow(vec_1, 1);
+        let vec_2_val_1 = *vector::borrow(vec_2, 0);
+        let vec_2_val_2 = *vector::borrow(vec_2, 1);
+        vec_1_val_1 + vec_1_val_2 + vec_2_val_1 - vec_2_val_2
+    }
+
+    // uint8[2][]
+    #[callable(sig=b"test_u8(uint8[2][]) returns (uint8)")]
+    fun test_one_elem_para_array_dynamic_array_2_u8(v: vector<vector<u8>>): u8 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = 0;
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let vec_val_1 = *vector::borrow(vec, 0);
+            let vec_val_2 = *vector::borrow(vec, 1);
+            sum = sum + vec_val_1 + vec_val_2;
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint8[][2]
+    #[callable(sig=b"test_u8(uint8[][2]) returns (uint8)")]
+    fun test_one_elem_para_array_2_array_dynamic_u8(v: vector<vector<u8>>): u8 {
+        let i = 0;
+        let sum = 0;
+        while (i < 2) {
+            let vec = vector::borrow(&v, i);
+            let len_vec = vector::length(vec);
+            let j = 0;
+            while (j < len_vec) {
+                let vec_val = *vector::borrow(vec, j);
+                sum = sum + vec_val;
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint64[2]
+   #[callable(sig=b"test_u64(uint64[2]) returns (uint64)")]
+    fun test_array_u64(v: vector<u64>): u64{
+        let val_1 = *vector::borrow(&v, 0);
+        let val_2 = *vector::borrow(&v, 1);
+        val_1 + val_2
+    }
+
+    // uint64[2][2]
+    #[callable(sig=b"test_u64(uint64[2][2]) returns (uint64) ")]
+    fun test_one_elem_para_array_2_array_2_u64(v: vector<vector<u64>>): u64{
+        let vec_1 = vector::borrow(&v, 0);
+        let vec_2 = vector::borrow(&v, 1);
+        let vec_1_val_1 = *vector::borrow(vec_1, 0);
+        let vec_1_val_2 = *vector::borrow(vec_1, 1);
+        let vec_2_val_1 = *vector::borrow(vec_2, 0);
+        let vec_2_val_2 = *vector::borrow(vec_2, 1);
+        vec_1_val_1 + vec_1_val_2 + vec_2_val_1 + vec_2_val_2
+    }
+
+    // uint64[2][]
+    #[callable(sig=b"test_u64(uint64[2][]) returns (uint64)")]
+    fun test_one_elem_para_array_dynamic_array_2_u64(v: vector<vector<u64>>): u64 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = 0;
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let vec_val_1 = *vector::borrow(vec, 0);
+            let vec_val_2 = *vector::borrow(vec, 1);
+            sum = sum + vec_val_1 + vec_val_2;
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint64[][2]
+    #[callable(sig=b"test_u64(uint64[][2]) returns (uint64)")]
+    fun test_one_elem_para_array_2_array_dynamic_u64(v: vector<vector<u64>>): u64 {
+        let i = 0;
+        let sum = 0;
+        while (i < 2) {
+            let vec = vector::borrow(&v, i);
+            let len_vec = vector::length(vec);
+            let j = 0;
+            while (j < len_vec) {
+                let vec_val = *vector::borrow(vec, j);
+                sum = sum + vec_val;
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint128[][]
+    #[callable(sig=b"test_u128(uint128[][]) returns (uint128)")]
+    fun test_one_elem_para_array_dynamic_array_u128(v: vector<vector<u128>>): u128 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = 0;
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let j = 0;
+            while (j < vector::length(vec)) {
+                sum = sum + *vector::borrow(vec, j);
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint256[2][]
+    #[callable(sig=b"test_u256(uint256[2][]) returns (uint256)")]
+    fun test_one_elem_para_array_dynamic_array_2_u256(v: vector<vector<U256>>): U256 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = U256::zero();
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let vec_val_1 = *vector::borrow(vec, 0);
+            let vec_val_2 = *vector::borrow(vec, 1);
+            sum = U256::add(sum, U256::add(vec_val_1, vec_val_2));
+            i = i + 1;
+        };
+        sum
+    }
+
+    // uint256[][2]
+    #[callable(sig=b"test_u256(uint[][2]) returns (uint256)")]
+    fun test_one_elem_para_array_2_array_dynamic_u256(v: vector<vector<U256>>): U256 {
+        let i = 0;
+        let sum = U256::zero();
+        while (i < 2) {
+            let vec = vector::borrow(&v, i);
+            let len_vec = vector::length(vec);
+            let j = 0;
+            while (j < len_vec) {
+                let vec_val = *vector::borrow(vec, j);
+                sum = U256::add(sum, vec_val);
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        sum
+    }
+
+    // Testing type compatibility
+
+    // vector<u64> : uint8[2]
+    #[callable(sig=b"test_uint8_u64(uint8[2]) returns (uint8)")]
+    fun test_array_uint8_u64(v: vector<u64>): u64 {
+        let val_1 = *vector::borrow(&v, 0);
+        let val_2 = *vector::borrow(&v, 1);
+        val_1 + val_2
+    }
+
+    // vector<vector<u64>> : uint16[2][]
+    #[callable(sig=b"test_uint16_u64(uint16[2][]) returns (uint16)")]
+    fun test_array_uint16_u64(v: vector<vector<u64>>): u64 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = 0;
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let vec_val_1 = *vector::borrow(vec, 0);
+            let vec_val_2 = *vector::borrow(vec, 1);
+            sum = sum + vec_val_1 + vec_val_2;
+            i = i + 1;
+        };
+        sum
+    }
+
+    // vector<vector<u128>> : uint72[][2]
+    #[callable(sig=b"test_uint72_u128(uint72[][2]) returns (uint72)")]
+    fun test_array_uint72_u128(v: vector<vector<u128>>): u128 {
+        let i = 0;
+        let sum = 0;
+        while (i < 2) {
+            let vec = vector::borrow(&v, i);
+            let len_vec = vector::length(vec);
+            let j = 0;
+            while (j < len_vec) {
+                let vec_val = *vector::borrow(vec, j);
+                sum = sum + vec_val;
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        sum
+    }
+
+    // vector<vector<U256>> : uint8[2][]
+    #[callable(sig=b"test_uint8_U256(uint8[2][]) returns (uint8)")]
+    fun test_array_uint8_U256(v: vector<vector<U256>>): U256 {
+        let len_v = vector::length(&v);
+        let i = 0;
+        let sum = U256::zero();
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let vec_val_1 = *vector::borrow(vec, 0);
+            let vec_val_2 = *vector::borrow(vec, 1);
+            sum = U256::add(sum, U256::add(vec_val_1, vec_val_2));
+            i = i + 1;
+        };
+        sum
+
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.exp
new file mode 100644
index 000000000..bd6bd702c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.exp
@@ -0,0 +1,862 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x52044bf1
+                {
+                    // test_u64(uint64[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64_2_$_$vec$u64$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u64(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_2_$_$vec$u64$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf03cf98d
+                {
+                    // test_u8(uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2_$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2_$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xaae0ca0b
+                {
+                    // test_uint72_u128(uint72[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_array_uint72_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint72___2_$_$vec$vec$u128$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xecefc49c
+                {
+                    // test_u8(uint8[2][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4c976153
+                {
+                    // test_u256(uint256[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u256(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x3b09967a
+                {
+                    // test_u8(uint8[][2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_2_array_dynamic_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8___2_$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x43ed1d2f
+                {
+                    // test_u8(uint8[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_2_u8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2___$_$vec$vec$u8$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14fda38d
+                {
+                    // test_u128(uint128[][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_one_elem_para_array_dynamic_array_u128(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128____$_$vec$vec$u128$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_array_u64(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_array_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_array_uint72_u128(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_2_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u256(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_2_array_dynamic_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_2_u8(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_one_elem_para_array_dynamic_array_u128(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function abi_encode_tuple_$uint128____$_$vec$vec$u128$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint128_____vec$vec$u128$$(value_0,  tail)
+            }
+            function abi_encode_uint128_____vec$vec$u128$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint128___vec$u128$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint128___vec$u128$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint128___vec$u128$(value, pos)
+            }
+            function abi_encode_uint128___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint128_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint128_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint128(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint128____$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint128_____vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128_____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint128_____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128_____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint128___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint128___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint128___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint128___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint128(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint8_2____vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_uint8_2____vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint8_2__vec$u8$_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint8_2__vec$u8$_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8_2__vec$u8$(value, pos)
+                updated_pos := add(pos, 64)
+            }
+            function abi_encode_uint8_2__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint8_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint8_2___$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8_2____vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2____vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint8_2____vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8_2____vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint8___2__vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_uint8___2__vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint8___vec$u8$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint8___vec$u8$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint8___vec$u8$(value, pos)
+            }
+            function abi_encode_uint8___vec$u8$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_decode_tuple_$uint8___2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint8___2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8___2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8___2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint8___vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint8___vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__uint8___vec$u8$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint8___vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_encode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___2__vec$vec$A2_U256_U256$$(value_0,  tail)
+            }
+            function abi_encode_uint256___2__vec$vec$A2_U256_U256$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint256___vec$A2_U256_U256$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint256___vec$A2_U256_U256$(value, pos)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256___2_$_$vec$vec$A2_U256_U256$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___2__vec$vec$A2_U256_U256$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___2__vec$vec$A2_U256_U256$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint256___2__vec$vec$A2_U256_U256$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint256___vec$A2_U256_U256$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint8_2__2__vec$vec$u8$$(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8_2__2__vec$vec$u8$$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint8_2__vec$u8$_with_updated_pos(v, pos)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__2_$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8_2__vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint72___2__vec$vec$u128$$(value_0,  tail)
+            }
+            function abi_encode_uint72___2__vec$vec$u128$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_uint72___vec$u128$_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_uint72___vec$u128$_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_uint72___vec$u128$(value, pos)
+            }
+            function abi_encode_uint72___vec$u128$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 16))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 16) }
+                {
+                    let v := $MemoryLoadU128(src)
+                    pos := abi_encode_uint72_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint72_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint72(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint72(value, pos) {
+                mstore(pos, cleanup_uint72(value))
+            }
+            function cleanup_uint72(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint72___2_$_$vec$vec$u128$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint72___2__vec$vec$u128$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint72___2__vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint72___2__vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_uint72___vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_uint72___vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(16, length), 32)
+                array := abi_decode_available_length__uint72___vec$u128$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint72___vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint72(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_uint72(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint72(value)
+            }
+            function validator_uint72(value) {
+                if iszero(eq(value, cleanup_uint72(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_2_$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint8_2__vec$u8$(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2_$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint64_2_$_$vec$u64$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64_2__vec$u64$(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64_2__vec$u64$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 8))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 8) }
+                {
+                    let v := $MemoryLoadU64(src)
+                    pos := abi_encode_uint64_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint64_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint64(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64_2_$_$vec$u64$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64_2__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64_2__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 48
+                array := abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint64_2__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint64(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.move
new file mode 100644
index 000000000..cade27802
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayEncoding.move
@@ -0,0 +1,55 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::U256::U256;
+
+    // Semantic tests for encoding array types
+
+    // uint8[2]
+    #[callable(sig=b"test_u8(uint8[2]) returns (uint8[2])")]
+    fun test_array_u8(v: vector<u8>): vector<u8> {
+        v
+    }
+
+    // uint8[2][2]
+    #[callable(sig=b"test_u8(uint8[2][2]) returns (uint8[2][2]) ")]
+    fun test_one_elem_para_array_2_array_2_u8(v: vector<vector<u8>>): vector<vector<u8>> {
+       v
+    }
+
+    // uint8[2][]
+    #[callable(sig=b"test_u8(uint8[2][]) returns (uint8[2][])")]
+    fun test_one_elem_para_array_dynamic_array_2_u8(v: vector<vector<u8>>): vector<vector<u8>> {
+        v
+    }
+
+    // uint8[][2]
+    #[callable(sig=b"test_u8(uint8[][2]) returns (uint8[][2])")]
+    fun test_one_elem_para_array_2_array_dynamic_u8(v: vector<vector<u8>>): vector<vector<u8>> {
+        v
+    }
+
+    // uint64[2]
+   #[callable(sig=b"test_u64(uint64[2]) returns (uint64[2])")]
+    fun test_array_u64(v: vector<u64>): vector<u64>{
+        v
+    }
+
+    // uint128[][]
+    #[callable(sig=b"test_u128(uint128[][]) returns (uint128[][])")]
+    fun test_one_elem_para_array_dynamic_array_u128(v: vector<vector<u128>>): vector<vector<u128>> {
+        v
+    }
+
+    // uint256[][2]
+    #[callable(sig=b"test_u256(uint[][2]) returns (uint[][2])")]
+    fun test_one_elem_para_array_2_array_dynamic_u256(v: vector<vector<U256>>): vector<vector<U256>> {
+        v
+    }
+
+    // uint72[][2]
+    #[callable(sig=b"test_uint72_u128(uint72[][2]) returns (uint72[][2])")]
+    fun test_array_uint72_u128(v: vector<vector<u128>>): vector<vector<u128>> {
+        v
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.exp
new file mode 100644
index 000000000..c7e081844
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.exp
@@ -0,0 +1,103 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5087af69
+                {
+                    // return_1()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_1()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x249088d0
+                {
+                    // return_2()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_2()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_return_1() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_return_2() -> $result {
+                let $t0
+                // $t0 := 2
+                $t0 := 2
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.move
new file mode 100644
index 000000000..d3aee4a91
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasic.move
@@ -0,0 +1,18 @@
+#[evm_contract]
+module 0x2::M {
+    #[callable]
+    fun return_0(): u128 {
+        0
+	}
+
+    #[callable]
+    fun return_1(): u128 {
+	    1
+    }
+
+    #[callable]
+    fun return_2(): u128 {
+	    2
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.exp
new file mode 100644
index 000000000..bc0463b51
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.exp
@@ -0,0 +1,354 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        mstore(0, memoryguard(160))
+        let $new_value := A2_M_create()
+        {
+            let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+            if $AlignedStorageLoad($base_offset) {
+              $AbortBuiltin()
+            }
+            $AlignedStorageStore($base_offset, true)
+            {
+                let $dst := add($base_offset, 32)
+                let $src := $new_value
+                $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
+                $Free($src, 8)
+            }
+        }
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+        function A2_M_create() -> $result {
+            let $t0, $t1
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := pack M::Storage($t0)
+            {
+                let $mem := $Malloc(8)
+                $MemoryStoreU64(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x9fa6a6e3
+                {
+                    // current()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    let ret_0 := A2_M_current($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xd09de08a
+                {
+                    // increment()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A2_M_increment($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                if iszero(calldatasize()) { A2_M_receive($MakePtr(true, add($base_offset, 32))) stop() }
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                let $base_offset := $MakeTypeStorageBase(0, 0xd5520090, address())
+                if iszero($AlignedStorageLoad($base_offset)) {
+                  $AbortBuiltin()
+                }
+                A2_M_fallback($MakePtr(true, add($base_offset, 32))) stop()
+            }
+            function A2_M_current(self) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_increment(self) {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // $t3 := 1
+                $t3 := 1
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU64($t2, $t3)
+                // $t5 := borrow_field<M::Storage>.counter($t0)
+                $t5 := self
+                // write_ref($t5, $t4)
+                $StoreU64($t5, $t4)
+                // return ()
+            }
+
+            function A2_M_receive(self) {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := borrow_field<M::Storage>.counter($t0)
+                $t1 := self
+                // $t2 := read_ref($t1)
+                $t2 := $LoadU64($t1)
+                // $t3 := 2
+                $t3 := 2
+                // $t4 := +($t2, $t3)
+                $t4 := $AddU64($t2, $t3)
+                // $t5 := borrow_field<M::Storage>.counter($t0)
+                $t5 := self
+                // write_ref($t5, $t4)
+                $StoreU64($t5, $t4)
+                // return ()
+            }
+
+            function A2_M_fallback(_self) {
+                // return ()
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.move
new file mode 100644
index 000000000..6e007137f
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBasicStorage.move
@@ -0,0 +1,31 @@
+#[evm_contract]
+module 0x2::M {
+    #[storage]
+    struct Storage {
+        counter: u64,
+    }
+
+    #[create]
+    public fun create(): Storage {
+        Storage{counter: 0}
+    }
+
+    #[callable]
+    fun current(self: &Storage): u64 {
+        self.counter
+	}
+
+    #[callable]
+    fun increment(self: &mut Storage) {
+	    self.counter = self.counter + 1;
+    }
+
+    #[receive, payable]
+    fun receive(self: &mut Storage) {
+        self.counter = self.counter + 2;
+    }
+
+    #[fallback]
+    fun fallback(_self: &mut Storage) {
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp
new file mode 100644
index 000000000..37d2fe322
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp
@@ -0,0 +1,705 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x75747573
+                {
+                    // test_bytes5_2_dynamic_size_sum(bytes5[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_bytes5_2_dynamic_size_sum(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xcaf983d4
+                {
+                    // test_dynamic_bytes_last_elem(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_dynamic_bytes_last_elem(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8da1d50
+                {
+                    // test_dynamic_bytes_len(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_dynamic_bytes_length(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8a04d00
+                {
+                    // test_static_bytes_last_elem(bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes32$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_last_element(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x272c5904
+                {
+                    // test_static_bytes_len(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_length(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x16e560f4
+                {
+                    // test_string(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes5_2_dynamic_size_sum(v) -> $result0, $result1 {
+                let i, j, len_v, len_vec, len_vec_bytes, sum, sum_len, v_1, vec, vec_bytes, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L7
+                        // $t16 := <($t1, $t12)
+                        $t16 := $Lt(i, $t12)
+                        // if ($t16) goto L1 else goto L0
+                        switch $t16
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t11 := borrow_local($t0)
+                        $t11 := $MakePtr(false, $locals)
+                        // $t12 := vector::length<vector<vector<u8>>>($t11)
+                        $t12 := A1_vector_length$vec$vec$u8$$$($t11)
+                        // $t13 := 0
+                        $t13 := 0
+                        // $t6 := $t13
+                        sum := $t13
+                        // $t14 := 0
+                        $t14 := 0
+                        // $t7 := $t14
+                        sum_len := $t14
+                        // $t15 := 0
+                        $t15 := 0
+                        // $t1 := $t15
+                        i := $t15
+                        // goto L7
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // return ($t7, $t6)
+                        $result0 := sum_len
+                        $result1 := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t17 := borrow_local($t0)
+                        $t17 := $MakePtr(false, $locals)
+                        // $t18 := vector::borrow<vector<vector<u8>>>($t17, $t1)
+                        $t18 := A1_vector_borrow$vec$vec$u8$$$($t17, i)
+                        // $t19 := vector::length<vector<u8>>($t18)
+                        $t19 := A1_vector_length$vec$u8$$($t18)
+                        // $t20 := 0
+                        $t20 := 0
+                        // $t2 := $t20
+                        j := $t20
+                        // goto L6
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L6
+                        // $t21 := <($t2, $t19)
+                        $t21 := $Lt(j, $t19)
+                        // if ($t21) goto L4 else goto L3
+                        switch $t21
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
+                        // label L3
+                        // destroy($t18)
+                        // $t29 := 1
+                        $t29 := 1
+                        // $t1 := +($t1, $t29)
+                        i := $AddU64(i, $t29)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
+                        // $t22 := vector::borrow<vector<u8>>($t18, $t2)
+                        $t22 := A1_vector_borrow$vec$u8$$($t18, j)
+                        // $t23 := vector::length<u8>($t22)
+                        $t23 := A1_vector_length$u8$($t22)
+                        // $t24 := 1
+                        $t24 := 1
+                        // $t25 := -($t23, $t24)
+                        $t25 := $Sub($t23, $t24)
+                        // $t26 := vector::borrow<u8>($t22, $t25)
+                        $t26 := A1_vector_borrow$u8$($t22, $t25)
+                        // $t27 := read_ref($t26)
+                        $t27 := $LoadU8($t26)
+                        // $t7 := +($t7, $t23)
+                        sum_len := $AddU64(sum_len, $t23)
+                        // $t6 := +($t6, $t27)
+                        sum := $AddU8(sum, $t27)
+                        // $t28 := 1
+                        $t28 := 1
+                        // $t2 := +($t2, $t28)
+                        j := $AddU64(j, $t28)
+                        // goto L6
+                        $block := 7
+                    }
+                }
+            }
+
+            function A2_M_test_dynamic_bytes_last_elem(v) -> $result {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := vector::borrow<u8>($t1, $t5)
+                $t6 := A1_vector_borrow$u8$($t1, $t5)
+                // $t7 := read_ref($t6)
+                $t7 := $LoadU8($t6)
+                // return $t7
+                $result := $t7
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_dynamic_bytes_length(v) -> $result {
+                let $t1, $t2
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := vector::length<u8>($t1)
+                $t2 := A1_vector_length$u8$($t1)
+                // return $t2
+                $result := $t2
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_static_bytes_last_element(v) -> $result {
+                let $t1, $t2, $t3, $t4, $t5, $t6, $t7
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := 1
+                $t4 := 1
+                // $t5 := -($t3, $t4)
+                $t5 := $Sub($t3, $t4)
+                // $t6 := vector::borrow<u8>($t1, $t5)
+                $t6 := A1_vector_borrow$u8$($t1, $t5)
+                // $t7 := read_ref($t6)
+                $t7 := $LoadU8($t6)
+                // return $t7
+                $result := $t7
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_static_bytes_length(v) -> $result {
+                let $t1, $t2
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t1 := borrow_local($t0)
+                $t1 := $MakePtr(false, $locals)
+                // $t2 := vector::length<u8>($t1)
+                $t2 := A1_vector_length$u8$($t1)
+                // return $t2
+                $result := $t2
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_string(v) -> $result0, $result1 {
+                let len_str, $t2, $t3, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := borrow_local($t0)
+                $t4 := $MakePtr(false, $locals)
+                // $t5 := 1
+                $t5 := 1
+                // $t6 := -($t3, $t5)
+                $t6 := $Sub($t3, $t5)
+                // $t7 := vector::borrow<u8>($t4, $t6)
+                $t7 := A1_vector_borrow$u8$($t4, $t6)
+                // $t8 := read_ref($t7)
+                $t8 := $LoadU8($t7)
+                // return ($t3, $t8)
+                $result0 := $t3
+                $result1 := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$u8$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$vec$vec$u8$$$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+            }
+            function A1_vector_length$vec$vec$u8$$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint64_uint8$_$u64_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint8$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$bytes32$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes5_2____vec$vec$vec$u8$$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes5_2____vec$vec$vec$u8$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_2__vec$vec$u8$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 37
+                array := abi_decode_available_length__bytes5(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.move
new file mode 100644
index 000000000..97ced80d1
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.move
@@ -0,0 +1,63 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+
+    // Semantic tests for decoding bytes
+
+    // bytes4
+    #[callable(sig=b"test_static_bytes_len(bytes4) returns (uint8)")]
+    fun test_static_bytes_length(v: vector<u8>): u64 {
+        vector::length(&v)
+    }
+
+    // bytes32
+    #[callable(sig=b"test_static_bytes_last_elem(bytes32) returns (uint8)")]
+    fun test_static_bytes_last_element(v: vector<u8>): u8 {
+        *vector::borrow(&v, vector::length(&v) - 1)
+    }
+
+    // bytes
+    #[callable(sig=b"test_dynamic_bytes_len(bytes) returns (uint8)")]
+    fun test_dynamic_bytes_length(v: vector<u8>): u64 {
+        vector::length(&v)
+    }
+
+    // bytes
+    #[callable(sig=b"test_dynamic_bytes_last_elem(bytes) returns (uint8)")]
+    fun test_dynamic_bytes_last_elem(v: vector<u8>): u8 {
+        *vector::borrow(&v, vector::length(&v) - 1)
+    }
+
+    // bytes5[2][]
+    #[callable(sig=b"test_bytes5_2_dynamic_size_sum(bytes5[2][]) returns (uint64, uint8)")]
+    fun test_bytes5_2_dynamic_size_sum(v: vector<vector<vector<u8>>>): (u64, u8) {
+        let len_v = vector::length(&v);
+        let sum = 0;
+        let sum_len = 0;
+        let i = 0;
+        while (i < len_v) {
+            let vec = vector::borrow(&v, i);
+            let len_vec = vector::length(vec);
+            let j = 0;
+            while (j < len_vec) {
+                let vec_bytes = vector::borrow(vec, j);
+                let len_vec_bytes = vector::length(vec_bytes);
+                let v = *vector::borrow(vec_bytes, len_vec_bytes - 1);
+                sum_len  = sum_len + len_vec_bytes;
+                sum = sum + v;
+                j = j + 1;
+            };
+            i = i + 1;
+        };
+        (sum_len, sum)
+    }
+
+    // string
+    #[callable(sig=b"test_string(string) returns (uint64, uint8)")]
+    fun test_string(v: vector<u8>) : (u64, u8) {
+        let len_str = vector::length(&v);
+        (len_str, *vector::borrow(&v, len_str - 1))
+    }
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.exp
new file mode 100644
index 000000000..da26c299c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.exp
@@ -0,0 +1,577 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xa90fdf20
+                {
+                    // test_bytes(bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_bytes(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x5a49914b
+                {
+                    // test_bytes5_2_dynamic(bytes5[2][])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(4, calldatasize())
+                    let ret_0 := A2_M_test_bytes5_2_dynamic(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb8dfacf2
+                {
+                    // test_static_bytes(bytes4,uint8)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes4_uint8$_$vec$u8$_u8$(4, calldatasize())
+                    let ret_0 := A2_M_test_static_bytes_length(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bytes5$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x16e560f4
+                {
+                    // test_string(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_string(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_bytes5_2_dynamic(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A2_M_test_static_bytes_length(v, c) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<u8>($t2, $t1)
+                A1_vector_push_back$u8$($t2, c)
+                // $t3 := move($t0)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_string(v) -> $result {
+                // return $t0
+                $result := v
+            }
+
+            function A1_vector_push_back$u8$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+                $StoreU8(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes5$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bytes5(value_0, add(headStart, 0))
+            }
+            function abi_encode_bytes5(value, pos) {
+                let size := $MemoryLoadU64(value)
+                if iszero(eq(size, 5)) { $Abort(92) }
+                $CopyMemory(add(value, 0x20), pos, size)
+            }
+            function abi_decode_tuple_$bytes4_uint8$_$vec$u8$_u8$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes5_2____vec$vec$vec$u8$$$(value_0,  tail)
+            }
+            function abi_encode_bytes5_2____vec$vec$vec$u8$$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes5_2__vec$vec$u8$$_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_bytes5_2__vec$vec$u8$$_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_bytes5_2__vec$vec$u8$$(value, pos)
+                updated_pos := add(pos, 64)
+            }
+            function abi_encode_bytes5_2__vec$vec$u8$$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes5_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_bytes5_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_bytes5(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_decode_tuple_$bytes5_2___$_$vec$vec$vec$u8$$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes5_2____vec$vec$vec$u8$$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes5_2____vec$vec$vec$u8$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2____vec$vec$vec$u8$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 64))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 64) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_2__vec$vec$u8$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_bytes5_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes5_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 37
+                array := abi_decode_available_length__bytes5(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes5(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$bytes$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes(value_0,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$bytes$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $StoreU8(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU8(offs, val)
+              }
+              default {
+                $StorageStoreU8(offs, val)
+              }
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $StorageStoreU8(offs, val) {
+              $StorageStoreBytes(offs, 1, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.move
new file mode 100644
index 000000000..b3e0a6875
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesEncoding.move
@@ -0,0 +1,32 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+
+    // Semantic tests for encoding bytes
+
+    // bytes4
+    #[callable(sig=b"test_static_bytes(bytes4,uint8) returns (bytes5)")]
+    fun test_static_bytes_length(v: vector<u8>, c: u8): vector<u8> {
+        vector::push_back(&mut v, c);
+        v
+    }
+
+    // bytes5[2][]
+    #[callable(sig=b"test_bytes5_2_dynamic(bytes5[2][]) returns (bytes5[2][])")]
+    fun test_bytes5_2_dynamic(v: vector<vector<vector<u8>>>): vector<vector<vector<u8>>> {
+        v
+    }
+
+    // bytes
+    #[callable(sig=b"test_bytes(bytes) returns (bytes)")]
+    fun test_bytes(v: vector<u8>): vector<u8> {
+        v
+    }
+
+    // string
+    #[callable(sig=b"test_string(string) returns (string)")]
+    fun test_string(v: vector<u8>) : vector<u8> {
+       v
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.exp
new file mode 100644
index 000000000..9112f5981
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.exp
@@ -0,0 +1,614 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xfb4da14d
+                {
+                    // test_string()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_string()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string$_$vec$u8$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1f5ac11e
+                {
+                    // test_vec_u64()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0, ret_1 := A2_M_test_vec_u64()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_uint256__$_$vec$u8$_vec$A2_U256_U256$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_string() -> $result {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $locals := $Malloc(64)
+                // $t1 := vector::empty<u8>()
+                mstore($locals, A1_vector_empty$u8$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := 65
+                $t3 := 65
+                // vector::push_back<u8>($t2, $t3)
+                A1_vector_push_back$u8$($t2, $t3)
+                // $t4 := 0x42
+                $t4 := 0x42
+                // $t0 := Evm::sign($t4)
+                mstore(add($locals, 32), A2_Evm_sign($t4))
+                // $t5 := borrow_local($t0)
+                $t5 := $MakePtr(false, add($locals, 32))
+                // $t6 := move($t1)
+                $t6 := mload($locals)
+                // $t7 := pack M::T<u8>($t6)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t6)
+                    $t7 := $mem
+                }
+                // move_to<M::T<u8>>($t7, $t5)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x2e75402e, $LoadU256($t5))
+                    if $AlignedStorageLoad($base_offset) {
+                      $AbortBuiltin()
+                    }
+                    $AlignedStorageStore($base_offset, true)
+                    {
+                        let $dst := add($base_offset, 32)
+                        let $src := $t7
+                        {
+                            let $linked_src_2300595445 := mload(add($src, 0))
+                            let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                            let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                            let $data_size_2300595445 := mul($size_2300595445, 1)
+                            $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                            let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                            let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                            for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                        }
+                        $Free($src, 32)
+                    }
+                }
+                // $t8 := 0x42
+                $t8 := 0x42
+                // $t9 := borrow_global<M::T<u8>>($t8)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x2e75402e, $t8)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t9 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t10 := borrow_field<M::T<u8>>.v($t9)
+                $t10 := $t9
+                // $t11 := read_ref($t10)
+                $t11 := $LoadU256($t10)
+                if $IsStoragePtr($t10){
+                    let $storage_ptr_2300595445
+                    let $size_2300595445 := $StorageLoadU64($t11)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($storage_ptr_2300595445, $AlignedStorageLoad($t11))
+                    $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($t11, 32)
+                    let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    }
+                    $t11 := $storage_ptr_2300595445
+                }
+                // return $t11
+                $result := $t11
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_vec_u64() -> $result0, $result1 {
+                let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+                let $locals := $Malloc(96)
+                // $t1 := vector::empty<u8>()
+                mstore($locals, A1_vector_empty$u8$())
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := 65
+                $t4 := 65
+                // vector::push_back<u8>($t3, $t4)
+                A1_vector_push_back$u8$($t3, $t4)
+                // $t2 := vector::empty<U256::U256>()
+                mstore(add($locals, 32), A1_vector_empty$A2_U256_U256$())
+                // $t5 := borrow_local($t2)
+                $t5 := $MakePtr(false, add($locals, 32))
+                // $t6 := 64
+                $t6 := 64
+                // vector::push_back<U256::U256>($t5, $t6)
+                A1_vector_push_back$A2_U256_U256$($t5, $t6)
+                // $t7 := borrow_local($t2)
+                $t7 := $MakePtr(false, add($locals, 32))
+                // $t8 := 65
+                $t8 := 65
+                // vector::push_back<U256::U256>($t7, $t8)
+                A1_vector_push_back$A2_U256_U256$($t7, $t8)
+                // $t9 := 0x42
+                $t9 := 0x42
+                // $t0 := Evm::sign($t9)
+                mstore(add($locals, 64), A2_Evm_sign($t9))
+                // $t10 := borrow_local($t0)
+                $t10 := $MakePtr(false, add($locals, 64))
+                // $t11 := move($t1)
+                $t11 := mload($locals)
+                // $t12 := move($t2)
+                $t12 := mload(add($locals, 32))
+                // $t13 := pack M::State($t11, $t12)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), $t11)
+                    $MemoryStoreU256(add($mem, 32), $t12)
+                    $t13 := $mem
+                }
+                // move_to<M::State>($t13, $t10)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $LoadU256($t10))
+                    if $AlignedStorageLoad($base_offset) {
+                      $AbortBuiltin()
+                    }
+                    $AlignedStorageStore($base_offset, true)
+                    {
+                        let $dst := add($base_offset, 32)
+                        let $src := $t13
+                        {
+                            let $linked_src_2300595445 := mload(add($src, 0))
+                            let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                            let $size_2300595445 := $MemoryLoadU64($linked_src_2300595445)
+                            let $data_size_2300595445 := mul($size_2300595445, 1)
+                            $AlignedStorageStore($linked_dst_2300595445, mload($linked_src_2300595445))
+                            let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                            let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                            for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                                $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                                $Free($linked_src_2300595445, add($data_size_2300595445, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 0), $linked_dst_2300595445)
+                        }
+                        {
+                            let $linked_src_3901948120 := mload(add($src, 32))
+                            let $linked_dst_3901948120 := $NewLinkedStorageBase(0xe89300d8)
+                            let $size_3901948120 := $MemoryLoadU64($linked_src_3901948120)
+                            let $data_size_3901948120 := mul($size_3901948120, 32)
+                            $AlignedStorageStore($linked_dst_3901948120, mload($linked_src_3901948120))
+                            let $data_src_3901948120 := add($linked_src_3901948120, 32)
+                            let $data_dst_3901948120 := add($linked_dst_3901948120, 32)
+                            for { let $offs_3901948120 := 0 } lt($offs_3901948120, $data_size_3901948120) { $offs_3901948120 := add($offs_3901948120, 32)} {
+                                $AlignedStorageStore(add($data_dst_3901948120, $offs_3901948120), mload(add($data_src_3901948120, $offs_3901948120)))
+                                $Free($linked_src_3901948120, add($data_size_3901948120, 32))
+                            }
+                            $AlignedStorageStore(add($dst, 32), $linked_dst_3901948120)
+                        }
+                        $Free($src, 64)
+                    }
+                }
+                // $t14 := 0x42
+                $t14 := 0x42
+                // $t15 := borrow_global<M::State>($t14)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $t14)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t15 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t16 := borrow_field<M::State>.s1($t15)
+                $t16 := $t15
+                // $t17 := read_ref($t16)
+                $t17 := $LoadU256($t16)
+                if $IsStoragePtr($t16){
+                    let $storage_ptr_2300595445
+                    let $size_2300595445 := $StorageLoadU64($t17)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $storage_ptr_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($storage_ptr_2300595445, $AlignedStorageLoad($t17))
+                    $MemoryStoreU64(add($storage_ptr_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($t17, 32)
+                    let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                    }
+                    $t17 := $storage_ptr_2300595445
+                }
+                // $t18 := 0x42
+                $t18 := 0x42
+                // $t19 := borrow_global<M::State>($t18)
+                {
+                    let $base_offset := $MakeTypeStorageBase(0, 0x7d9cc237, $t18)
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    $t19 := $MakePtr(true, add($base_offset, 32))
+                }
+                // $t20 := borrow_field<M::State>.s2($t19)
+                $t20 := $IndexPtr($t19, 32)
+                // $t21 := read_ref($t20)
+                $t21 := $LoadU256($t20)
+                if $IsStoragePtr($t20){
+                    let $storage_ptr_3901948120
+                    let $size_3901948120 := $StorageLoadU64($t21)
+                    let $capacity_3901948120 := $ClosestGreaterPowerOfTwo($size_3901948120)
+                    $storage_ptr_3901948120 := $Malloc(add(32, mul($capacity_3901948120, 32)))
+                    let $data_size_3901948120 := mul($size_3901948120, 32)
+                    mstore($storage_ptr_3901948120, $AlignedStorageLoad($t21))
+                    $MemoryStoreU64(add($storage_ptr_3901948120, 8), $capacity_3901948120)
+                    let $data_src_3901948120 := add($t21, 32)
+                    let $data_dst_3901948120 := add($storage_ptr_3901948120, 32)
+                    for { let $offs_3901948120 := 0 } lt($offs_3901948120, $data_size_3901948120) { $offs_3901948120 := add($offs_3901948120, 32)} {
+                        mstore(add($data_dst_3901948120, $offs_3901948120), $AlignedStorageLoad(add($data_src_3901948120, $offs_3901948120)))
+                    }
+                    $t21 := $storage_ptr_3901948120
+                }
+                // return ($t17, $t21)
+                $result0 := $t17
+                $result1 := $t21
+                $Free($locals, 96)
+            }
+
+            function A2_Evm_sign(addr) -> signer {
+              signer := addr
+            }
+            function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$A2_U256_U256$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_vector_push_back$u8$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+                $StoreU8(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_vector_empty$u8$() -> vector {
+                vector := $Malloc(34)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function abi_encode_tuple_$string_uint256__$_$vec$u8$_vec$A2_U256_U256$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_1,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $StoreU8(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU8(offs, val)
+              }
+              default {
+                $StorageStoreU8(offs, val)
+              }
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $StorageStoreU8(offs, val) {
+              $StorageStoreBytes(offs, 1, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.move
new file mode 100644
index 000000000..13a73ab69
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherEncodingStorage.move
@@ -0,0 +1,33 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+    use Evm::U256::{Self, U256};
+    use Evm::Evm::sign;
+
+    struct T<Elem: drop> has drop, key { v: vector<Elem> }
+
+    struct State has drop, key {
+        s1: vector<u8>,
+        s2: vector<U256>,
+    }
+
+    #[callable(sig=b"test_string() returns (string)")]
+    fun test_string(): vector<u8> acquires T {
+        let v = vector::empty();
+        vector::push_back(&mut v, 65u8);
+        move_to(&sign(@0x42), T { v });
+        borrow_global<T<u8>>(@0x42).v
+    }
+
+    #[callable(sig=b"test_vec_u64() returns (string, uint256[])")]
+    fun test_vec_u64(): (vector<u8>, vector<U256>) acquires State {
+        let s1 = vector::empty();
+        vector::push_back(&mut s1, 65u8);
+        let s2 = vector::empty();
+        vector::push_back(&mut s2, U256::u256_from_words(0,64));
+        vector::push_back(&mut s2, U256::u256_from_words(0,65));
+        move_to(&sign(@0x42), State { s1, s2 });
+        (borrow_global<State>(@0x42).s1, borrow_global<State>(@0x42).s2)
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.exp
new file mode 100644
index 000000000..e502cfce4
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.exp
@@ -0,0 +1,73 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            if callvalue()
+            {
+                $Abort(99)
+            }
+            {
+                A2_M_fallback() stop()
+            }
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_M_fallback() {
+                // return ()
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.move
new file mode 100644
index 000000000..488a8e458
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherFallback.move
@@ -0,0 +1,15 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[callable]
+    fun return_0(): u128 {
+        0
+    }
+
+    #[fallback]
+    fun fallback() {
+    }
+
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.exp
new file mode 100644
index 000000000..66c6c90a6
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.exp
@@ -0,0 +1,620 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x1132a93c
+                {
+                    // test_static_array_string_static_array_string(string,uint8[2],string,uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$string_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_static_array_string_static_array_string(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64_uint8$_$u64_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1b27dd62
+                {
+                    // test_string_length_sum(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_test_string_length_sum(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xfd03176e
+                {
+                    // test_u8_array_2_uint64(uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(4, calldatasize())
+                    let ret_0 := A2_M_test_u8_array_2_uint_64(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa1e082ab
+                {
+                    // test_u8_array_uint64_u8_array_uint64(uint8[2],uint64,uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$uint8_2__uint64_uint8_2__uint64$_$vec$u8$_u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0 := A2_M_test_u8_array_uint64_u8_array_uint64(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1483ff3b
+                {
+                    // test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_u8_uint_64_array_2(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8$_$u8_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_static_array_string_static_array_string(str_1, array_1, str_2, array_2) -> $result0, $result1 {
+                let len_array_1, len_array_2, len_str_1, len_str_2, len_sum, val_1, val_2, val_3, val_4, val_sum, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47
+                let $locals := $Malloc(128)
+                mstore($locals, str_1)
+                mstore(add($locals, 64), array_1)
+                mstore(add($locals, 32), str_2)
+                mstore(add($locals, 96), array_2)
+                // $t14 := borrow_local($t0)
+                $t14 := $MakePtr(false, $locals)
+                // $t15 := vector::length<u8>($t14)
+                $t15 := A1_vector_length$u8$($t14)
+                // $t16 := borrow_local($t2)
+                $t16 := $MakePtr(false, add($locals, 32))
+                // $t17 := vector::length<u8>($t16)
+                $t17 := A1_vector_length$u8$($t16)
+                // $t18 := borrow_local($t1)
+                $t18 := $MakePtr(false, add($locals, 64))
+                // $t19 := vector::length<u8>($t18)
+                $t19 := A1_vector_length$u8$($t18)
+                // $t20 := borrow_local($t3)
+                $t20 := $MakePtr(false, add($locals, 96))
+                // $t21 := vector::length<u8>($t20)
+                $t21 := A1_vector_length$u8$($t20)
+                // $t22 := +($t15, $t17)
+                $t22 := $AddU64($t15, $t17)
+                // $t23 := +($t22, $t19)
+                $t23 := $AddU64($t22, $t19)
+                // $t24 := +($t23, $t21)
+                $t24 := $AddU64($t23, $t21)
+                // $t25 := borrow_local($t0)
+                $t25 := $MakePtr(false, $locals)
+                // $t26 := 1
+                $t26 := 1
+                // $t27 := -($t15, $t26)
+                $t27 := $Sub($t15, $t26)
+                // $t28 := vector::borrow<u8>($t25, $t27)
+                $t28 := A1_vector_borrow$u8$($t25, $t27)
+                // $t29 := read_ref($t28)
+                $t29 := $LoadU8($t28)
+                // $t30 := borrow_local($t2)
+                $t30 := $MakePtr(false, add($locals, 32))
+                // $t31 := 1
+                $t31 := 1
+                // $t32 := -($t17, $t31)
+                $t32 := $Sub($t17, $t31)
+                // $t33 := vector::borrow<u8>($t30, $t32)
+                $t33 := A1_vector_borrow$u8$($t30, $t32)
+                // $t34 := read_ref($t33)
+                $t34 := $LoadU8($t33)
+                // $t35 := borrow_local($t1)
+                $t35 := $MakePtr(false, add($locals, 64))
+                // $t36 := 1
+                $t36 := 1
+                // $t37 := -($t19, $t36)
+                $t37 := $Sub($t19, $t36)
+                // $t38 := vector::borrow<u8>($t35, $t37)
+                $t38 := A1_vector_borrow$u8$($t35, $t37)
+                // $t39 := read_ref($t38)
+                $t39 := $LoadU8($t38)
+                // $t40 := borrow_local($t3)
+                $t40 := $MakePtr(false, add($locals, 96))
+                // $t41 := 1
+                $t41 := 1
+                // $t42 := -($t21, $t41)
+                $t42 := $Sub($t21, $t41)
+                // $t43 := vector::borrow<u8>($t40, $t42)
+                $t43 := A1_vector_borrow$u8$($t40, $t42)
+                // $t44 := read_ref($t43)
+                $t44 := $LoadU8($t43)
+                // $t45 := +($t29, $t34)
+                $t45 := $AddU8($t29, $t34)
+                // $t46 := +($t45, $t39)
+                $t46 := $AddU8($t45, $t39)
+                // $t47 := +($t46, $t44)
+                $t47 := $AddU8($t46, $t44)
+                // return ($t24, $t47)
+                $result0 := $t24
+                $result1 := $t47
+                $Free($locals, 128)
+            }
+
+            function A2_M_test_string_length_sum(str_1, str_2) -> $result {
+                let $t2, $t3, $t4, $t5, $t6
+                let $locals := $Malloc(64)
+                mstore($locals, str_1)
+                mstore(add($locals, 32), str_2)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := borrow_local($t1)
+                $t4 := $MakePtr(false, add($locals, 32))
+                // $t5 := vector::length<u8>($t4)
+                $t5 := A1_vector_length$u8$($t4)
+                // $t6 := +($t3, $t5)
+                $t6 := $AddU64($t3, $t5)
+                // return $t6
+                $result := $t6
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_u8_array_2_uint_64(v, idx) -> $result {
+                let $t2, $t3, $t4
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::borrow<u8>($t2, $t1)
+                $t3 := A1_vector_borrow$u8$($t2, idx)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU8($t3)
+                // return $t4
+                $result := $t4
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_array_uint64_u8_array_uint64(v_1, idx_1, v_2, idx_2) -> $result {
+                let $t4, $t5, $t6, $t7, $t8, $t9, $t10
+                let $locals := $Malloc(64)
+                mstore($locals, v_1)
+                mstore(add($locals, 32), v_2)
+                // $t4 := borrow_local($t0)
+                $t4 := $MakePtr(false, $locals)
+                // $t5 := vector::borrow<u8>($t4, $t1)
+                $t5 := A1_vector_borrow$u8$($t4, idx_1)
+                // $t6 := read_ref($t5)
+                $t6 := $LoadU8($t5)
+                // $t7 := borrow_local($t2)
+                $t7 := $MakePtr(false, add($locals, 32))
+                // $t8 := vector::borrow<u8>($t7, $t3)
+                $t8 := A1_vector_borrow$u8$($t7, idx_2)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // $t10 := +($t6, $t9)
+                $t10 := $AddU8($t6, $t9)
+                // return $t10
+                $result := $t10
+                $Free($locals, 64)
+            }
+
+            function A2_M_test_u8_uint_64_array_2(idx_1, v, idx_2) -> $result0, $result1 {
+                let $t3, $t4, $t5, $t6, $t7, $t8
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := vector::borrow<u8>($t3, $t0)
+                $t4 := A1_vector_borrow$u8$($t3, idx_1)
+                // $t5 := read_ref($t4)
+                $t5 := $LoadU8($t4)
+                // $t6 := borrow_local($t1)
+                $t6 := $MakePtr(false, $locals)
+                // $t7 := vector::borrow<u8>($t6, $t2)
+                $t7 := A1_vector_borrow$u8$($t6, idx_2)
+                // $t8 := read_ref($t7)
+                $t8 := $LoadU8($t7)
+                // return ($t5, $t8)
+                $result0 := $t5
+                $result1 := $t8
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint8_uint8$_$u8_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_3__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_uint8_3__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 35
+                array := abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$uint8_2__uint64_uint8_2__uint64$_$vec$u8$_u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_2 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 160
+                    value_3 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint64_uint8$_$u64_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint64(value_0, add(headStart, 0))
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_decode_tuple_$string_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_3 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $AddU8(x, y) -> r {
+                if lt(sub(0xff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.move
new file mode 100644
index 000000000..32531aad5
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiParaDecoding.move
@@ -0,0 +1,47 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+
+    // Semantic tests for decoding arrays with multiple parameters
+
+    // uint8[2],uint64
+    #[callable(sig=b"test_u8_array_2_uint64(uint8[2],uint64) returns (uint8)")]
+    fun test_u8_array_2_uint_64(v: vector<u8>, idx: u64): u8 {
+        *vector::borrow(&v, idx)
+    }
+
+    // uint64,uint8[3],uint64
+    #[callable(sig=b"test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64) returns (uint8,uint8)")]
+    fun test_u8_uint_64_array_2(idx_1: u64, v: vector<u8>, idx_2: u64): (u8, u8) {
+        (*vector::borrow(&v, idx_1), *vector::borrow(&v, idx_2))
+    }
+
+    // uint8[2], uint64, uint8[2], uint64
+    #[callable(sig=b"test_u8_array_uint64_u8_array_uint64(uint8[2], uint64, uint8[2], uint64) returns (uint8)")]
+    fun test_u8_array_uint64_u8_array_uint64(v_1: vector<u8>, idx_1: u64, v_2: vector<u8>, idx_2: u64): u8 {
+        *vector::borrow(&v_1, idx_1) + *vector::borrow(&v_2, idx_2)
+    }
+
+    // string,string
+    #[callable(sig=b"test_string_length_sum(string,string) returns (uint64)")]
+    fun test_string_length_sum(str_1: vector<u8>, str_2: vector<u8>): u64 {
+        vector::length(&str_1) + vector::length(&str_2)
+    }
+
+    // string, uint8[2], string, uint8[2]
+    #[callable(sig=b"test_static_array_string_static_array_string(string, uint8[2], string, uint8[2]) returns (uint64, uint8)")]
+    fun test_static_array_string_static_array_string(str_1: vector<u8>, array_1: vector<u8>, str_2: vector<u8>, array_2: vector<u8>): (u64, u8) {
+        let len_str_1 = vector::length(&str_1);
+        let len_str_2 = vector::length(&str_2);
+        let len_array_1 = vector::length(&array_1);
+        let len_array_2 = vector::length(&array_2);
+        let len_sum = len_str_1 + len_str_2 + len_array_1 + len_array_2;
+        let val_1 = *vector::borrow(&str_1, len_str_1 - 1);
+        let val_2 = *vector::borrow(&str_2, len_str_2 - 1);
+        let val_3 = *vector::borrow(&array_1, len_array_1 - 1);
+        let val_4 = *vector::borrow(&array_2, len_array_2 - 1);
+        let val_sum = val_1 + val_2 + val_3 + val_4;
+        (len_sum, val_sum)
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.exp
new file mode 100644
index 000000000..a83a9c44b
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.exp
@@ -0,0 +1,602 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x5cfc83ac
+                {
+                    // test_bytes_string(bytes,uint8[2],string,uint8[2])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$bytes_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_bytes_string(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_2__bytes$_$vec$u8$_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x60489524
+                {
+                    // test_two_strings(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string_length_sum(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_string$_$vec$u8$_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1f5db62a
+                {
+                    // test_string_uint8(string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$string$_$vec$u8$$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_string_uint8(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$string_uint8$_$vec$u8$_u8$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xfd03176e
+                {
+                    // test_u8_array_2_uint64(uint8[2],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_test_u8_array_2_uint_64(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8_2_$_$u8_vec$u8$$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x1483ff3b
+                {
+                    // test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(4, calldatasize())
+                    let ret_0, ret_1, ret_2 := A2_M_test_u8_uint_64_array_2(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8_uint8_3__uint8$_$u8_vec$u8$_u8$(memPos, ret_0, ret_1, ret_2)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_test_bytes_string(str_1, _array_1, _str_2, array_2) -> $result0, $result1 {
+                // return ($t3, $t0)
+                $result0 := array_2
+                $result1 := str_1
+            }
+
+            function A2_M_test_string_length_sum(str_1, str_2) -> $result0, $result1 {
+                // return ($t1, $t0)
+                $result0 := str_2
+                $result1 := str_1
+            }
+
+            function A2_M_test_string_uint8(v) -> $result0, $result1 {
+                let len_str, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::length<u8>($t2)
+                $t3 := A1_vector_length$u8$($t2)
+                // $t4 := copy($t0)
+                $t4 := mload($locals)
+                // $t5 := borrow_local($t0)
+                $t5 := $MakePtr(false, $locals)
+                // $t6 := 1
+                $t6 := 1
+                // $t7 := -($t3, $t6)
+                $t7 := $Sub($t3, $t6)
+                // $t8 := vector::borrow<u8>($t5, $t7)
+                $t8 := A1_vector_borrow$u8$($t5, $t7)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // return ($t4, $t9)
+                $result0 := $t4
+                $result1 := $t9
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_array_2_uint_64(v, idx) -> $result0, $result1 {
+                let $t2, $t3, $t4, $t5
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t2 := borrow_local($t0)
+                $t2 := $MakePtr(false, $locals)
+                // $t3 := vector::borrow<u8>($t2, $t1)
+                $t3 := A1_vector_borrow$u8$($t2, idx)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU8($t3)
+                // $t5 := move($t0)
+                $t5 := mload($locals)
+                // return ($t4, $t5)
+                $result0 := $t4
+                $result1 := $t5
+                $Free($locals, 32)
+            }
+
+            function A2_M_test_u8_uint_64_array_2(idx_1, v, idx_2) -> $result0, $result1, $result2 {
+                let $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                mstore($locals, v)
+                // $t3 := borrow_local($t1)
+                $t3 := $MakePtr(false, $locals)
+                // $t4 := vector::borrow<u8>($t3, $t0)
+                $t4 := A1_vector_borrow$u8$($t3, idx_1)
+                // $t5 := read_ref($t4)
+                $t5 := $LoadU8($t4)
+                // $t6 := copy($t1)
+                $t6 := mload($locals)
+                // $t7 := borrow_local($t1)
+                $t7 := $MakePtr(false, $locals)
+                // $t8 := vector::borrow<u8>($t7, $t2)
+                $t8 := A1_vector_borrow$u8$($t7, idx_2)
+                // $t9 := read_ref($t8)
+                $t9 := $LoadU8($t8)
+                // return ($t5, $t6, $t9)
+                $result0 := $t5
+                $result1 := $t6
+                $result2 := $t9
+                $Free($locals, 32)
+            }
+
+            function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+            }
+            function A1_vector_length$u8$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function abi_encode_tuple_$uint8_uint8_3__uint8$_$u8_vec$u8$_u8$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 160)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8_3__vec$u8$(value_1, add(headStart, 32))
+                abi_encode_uint8(value_2, add(headStart, 128))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_uint8_3__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint8_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint8(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_decode_tuple_$uint64_uint8_3__uint64$_$u64_vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_3__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_uint8_3__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 35
+                array := abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_3__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_encode_tuple_$uint8_uint8_2_$_$u8_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_uint8_2__vec$u8$(value_1, add(headStart, 32))
+            }
+            function abi_encode_uint8_2__vec$u8$(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 2)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 1))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 1) }
+                {
+                    let v := $MemoryLoadU8(src)
+                    pos := abi_encode_uint8_with_updated_pos(v, pos)
+                }
+            }
+            function abi_decode_tuple_$uint8_2__uint64$_$vec$u8$_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8_2__vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint8_2__vec$u8$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint8(elementPos, end)
+                    $MemoryStoreU8(dst, value)
+                    dst := add(dst, 1)
+                }
+            }
+            function abi_encode_tuple_$string_uint8$_$vec$u8$_u8$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                abi_encode_uint8(value_1, add(headStart, 32))
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$string$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_string(value_1,  tail)
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint8_2__bytes$_$vec$u8$_vec$u8$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8_2__vec$u8$(value_0, add(headStart, 0))
+                mstore(add(headStart, 64), sub(tail, headStart))
+                tail := abi_encode_bytes(value_1,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_decode_tuple_$bytes_uint8_2__string_uint8_2_$_$vec$u8$_vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 192) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_3 := abi_decode_uint8_2__vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU8(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU8(offs)
+              }
+              default {
+                val := $StorageLoadU8(offs)
+              }
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $StorageLoadU8(offs) -> val {
+              val := $StorageLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.move
new file mode 100644
index 000000000..3c5b3034c
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherMultiRetEncoding.move
@@ -0,0 +1,39 @@
+#[evm_contract]
+module 0x2::M {
+    use std::vector;
+
+    // Semantic tests for encoding arrays with multiple return values
+
+    // uint8, uint8[2]
+    #[callable(sig=b"test_u8_array_2_uint64(uint8[2],uint64) returns (uint8, uint8[2])")]
+    fun test_u8_array_2_uint_64(v: vector<u8>, idx: u64): (u8, vector<u8>) {
+        (*vector::borrow(&v, idx), v)
+    }
+
+    // uint8,uint8[3],uint8
+    #[callable(sig=b"test_uint64_u8_array_3_uint64(uint64,uint8[3],uint64) returns (uint8,uint8[3],uint8)")]
+    fun test_u8_uint_64_array_2(idx_1: u64, v: vector<u8>, idx_2: u64): (u8, vector<u8>, u8) {
+        (*vector::borrow(&v, idx_1), v, *vector::borrow(&v, idx_2))
+    }
+
+    // string, string
+    #[callable(sig=b"test_two_strings(string,string) returns (string, string)")]
+    fun test_string_length_sum(str_1: vector<u8>, str_2: vector<u8>): (vector<u8>, vector<u8>) {
+        (str_2, str_1)
+    }
+
+    // uint8[2], bytes
+    #[callable(sig=b"test_bytes_string(bytes, uint8[2], string, uint8[2]) returns (uint8[2], bytes)")]
+    fun test_bytes_string(str_1: vector<u8>, _array_1: vector<u8>, _str_2: vector<u8>, array_2: vector<u8>): (vector<u8>, vector<u8>) {
+        (array_2, str_1)
+    }
+
+    // string, uint8
+    #[callable(sig=b"test_string_uint8(string) returns (string, uint8)")]
+    fun test_string_uint8(v: vector<u8>) : (vector<u8>, u8) {
+        let len_str = vector::length(&v);
+        (v, *vector::borrow(&v, len_str - 1))
+    }
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.exp
new file mode 100644
index 000000000..49e2b2b5d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.exp
@@ -0,0 +1,63 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xe44f11ec
+                {
+                    // return_0()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_return_0()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint128$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_return_0() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function abi_encode_tuple_$uint128$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint128(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint128(value, pos) {
+                mstore(pos, cleanup_uint128(value))
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.move
new file mode 100644
index 000000000..6af8be4ec
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/DispatcherRevert.move
@@ -0,0 +1,9 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[callable]
+    fun return_0(): u128 {
+        0
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp
new file mode 100644
index 000000000..37e207b62
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp
@@ -0,0 +1,1737 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x2fe88122
+                {
+                    // call_success(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_M_call_success(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x0d5ec7b5
+                {
+                    // call_unit(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    A2_M_call_unit(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x640f7372
+                {
+                    // test_is_approved_for_all()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_is_approved_for_all()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xe88da6c6
+                {
+                    // test_multi_ret()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0, ret_1 := A2_M_test_multi_ret()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x221ea1ee
+                {
+                    // test_no_para()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_test_no_para()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb930a1da
+                {
+                    // test_safe_transfer_from(uint128,uint128)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$uint128_uint128$_$u128_u128$(4, calldatasize())
+                    A2_M_test_safe_transfer_from(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8494fb4a
+                {
+                    // test_try()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_M_test_try()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint8$_$u8$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_call_success(addr) -> $result {
+                let v, $t2, $t3, $t4, $t5, $t6
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := move($t1)
+                        $t4 := v
+                        // $t5 := ExternalResult::unwrap<U256::U256>($t4)
+                        $t5 := A2_ExternalResult_unwrap$A2_U256_U256$($t4)
+                        // return $t5
+                        $result := $t5
+                        leave
+                    }
+                    case 3 {
+                        // label L0
+                        // $t6 := U256::one()
+                        $t6 := A2_U256_one()
+                        // return $t6
+                        $result := $t6
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := M::success($t0)
+                        v := A2_M_success(addr)
+                        // $t2 := borrow_local($t1)
+                        $t2 := $MakePtr(false, v)
+                        // $t3 := ExternalResult::is_ok<U256::U256>($t2)
+                        $t3 := A2_ExternalResult_is_ok$A2_U256_U256$($t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_call_unit(addr) {
+                let v, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t4 := move($t1)
+                        $t4 := v
+                        // $t5 := ExternalResult::unwrap<Evm::Unit>($t4)
+                        $t5 := A2_ExternalResult_unwrap$A2_Evm_Unit$($t4)
+                        // destroy($t5)
+                        $Free($t5, 1)
+                        // goto L0
+                        $block := 3
+                    }
+                    case 3 {
+                        // label L0
+                        // return ()
+                        leave
+                    }
+                    case 4 {
+                        // $t1 := M::test_unit($t0)
+                        v := A2_M_test_unit(addr)
+                        // $t2 := borrow_local($t1)
+                        $t2 := $MakePtr(false, v)
+                        // $t3 := ExternalResult::is_ok<Evm::Unit>($t2)
+                        $t3 := A2_ExternalResult_is_ok$A2_Evm_Unit$($t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                }
+            }
+
+            function A2_M_test_is_approved_for_all() -> $result {
+                let $t0, $t1, $t2, $t3
+                // $t0 := 0x3
+                $t0 := 0x3
+                // $t1 := 0x4
+                $t1 := 0x4
+                // $t2 := 0x5
+                $t2 := 0x5
+                // $t3 := M::is_approved_for_all($t0, $t1, $t2)
+                $t3 := A2_M_is_approved_for_all($t0, $t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A2_M_test_multi_ret() -> $result0, $result1 {
+                let data, v, $t2, $t3, $t4, $t5, $t6
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := vector::empty<U256::U256>()
+                $t3 := A1_vector_empty$A2_U256_U256$()
+                // $t4 := 0x3
+                $t4 := 0x3
+                // ($t5, $t6) := M::multi_ret($t4, $t2, $t3)
+                $t5, $t6 := A2_M_multi_ret($t4, $t2, $t3)
+                // return ($t5, $t6)
+                $result0 := $t5
+                $result1 := $t6
+            }
+
+            function A2_M_test_no_para() {
+                let $t0
+                // $t0 := 0x3
+                $t0 := 0x3
+                // M::no_para($t0)
+                A2_M_no_para($t0)
+                // return ()
+            }
+
+            function A2_M_test_safe_transfer_from(x, y) {
+                let data, token_id, $t4, $t5, $t6, $t7, $t8
+                // $t4 := (u256)($t0, $t1)
+                $t4 := $CastU256(x, y)
+                // $t5 := vector::empty<u8>()
+                $t5 := A1_vector_empty$u8$()
+                // $t6 := 0x3
+                $t6 := 0x3
+                // $t7 := 0x4
+                $t7 := 0x4
+                // $t8 := 0x5
+                $t8 := 0x5
+                // M::safe_transfer_form($t6, $t7, $t8, $t4, $t5)
+                A2_M_safe_transfer_form($t6, $t7, $t8, $t4, $t5)
+                // return ()
+            }
+
+            function A2_M_test_try() -> $result {
+                let v, value, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // $t6 := 0
+                        $t6 := 0
+                        // return $t6
+                        $result := $t6
+                        leave
+                    }
+                    case 3 {
+                        // label L0
+                        // $t7 := borrow_local($t1)
+                        $t7 := $MakePtr(false, value)
+                        // $t8 := ExternalResult::is_err_reason<U256::U256>($t7)
+                        $t8 := A2_ExternalResult_is_err_reason$A2_U256_U256$($t7)
+                        // if ($t8) goto L3 else goto L2
+                        switch $t8
+                        case 0  { $block := 6 }
+                        default { $block := 5 }
+                    }
+                    case 4 {
+                        // $t2 := 340282366920938463463374607431768211458
+                        $t2 := 340282366920938463463374607431768211458
+                        // $t3 := 0x3
+                        $t3 := 0x3
+                        // $t1 := M::test_try_call($t3, $t2)
+                        value := A2_M_test_try_call($t3, $t2)
+                        // $t4 := borrow_local($t1)
+                        $t4 := $MakePtr(false, value)
+                        // $t5 := ExternalResult::is_ok<U256::U256>($t4)
+                        $t5 := A2_ExternalResult_is_ok$A2_U256_U256$($t4)
+                        // if ($t5) goto L1 else goto L0
+                        switch $t5
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L3
+                        // $t9 := 1
+                        $t9 := 1
+                        // return $t9
+                        $result := $t9
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := borrow_local($t1)
+                        $t10 := $MakePtr(false, value)
+                        // $t11 := ExternalResult::is_panic<U256::U256>($t10)
+                        $t11 := A2_ExternalResult_is_panic$A2_U256_U256$($t10)
+                        // if ($t11) goto L5 else goto L4
+                        switch $t11
+                        case 0  { $block := 8 }
+                        default { $block := 7 }
+                    }
+                    case 7 {
+                        // label L5
+                        // $t12 := 2
+                        $t12 := 2
+                        // return $t12
+                        $result := $t12
+                        leave
+                    }
+                    case 8 {
+                        // label L4
+                        // $t13 := 3
+                        $t13 := 3
+                        // return $t13
+                        $result := $t13
+                        leave
+                    }
+                }
+            }
+
+            function A2_ExternalResult_is_panic$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
+                {
+                    let $field_ptr := $IndexPtr(result, 96)
+                    $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+                }
+                // $t2 := option::is_some<U256::U256>($t1)
+                $t2 := A1_option_is_some$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$A2_U256_U256$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$A2_U256_U256$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_ExternalResult_is_ok$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+                {
+                    $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+                }
+                // $t2 := option::is_some<#0>($t1)
+                $t2 := A1_option_is_some$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_test_try_call(contract, v) -> $result  {
+                // storage for arguments and returned data
+                let $t2 := mload(0)
+                mstore($t2, $Shl(0x81b91ddb, 224))
+                let $t3 := abi_encode_tuple_$uint256$_$A2_U256_U256$(add($t2, 4), v)
+                let $t4 := call(gas(), contract, 0,  $t2, sub($t3, $t2), $t2, 32)
+                // set freeMemoryPointer
+                mstore(0, $t3)
+                switch iszero($t4)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory($t2, add($t2, returndatasize()))
+                    $result := A2_ExternalResult_ok$A2_U256_U256$($result)
+                }
+                default {
+                    let $t5 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t5 := 0
+                            $result := A2_ExternalResult_err_reason$A2_U256_U256$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t6, $t7 := $TryDecodePanicData()
+                        if $t6 {
+                            $t5 := 0
+                            $result := $t7
+                            $result := A2_ExternalResult_panic$A2_U256_U256$($result)
+                        }
+                    }
+                    if $t5 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_U256_U256$($result)
+                    }
+                }
+            }
+            function A2_ExternalResult_err_data$A2_U256_U256$(error) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::none<#0>()
+                $t1 := A1_option_none$A2_U256_U256$()
+                // $t2 := option::some<vector<u8>>($t0)
+                $t2 := A1_option_some$vec$u8$$(error)
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A1_option_none$A2_U256_U256$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$A2_U256_U256$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$A2_U256_U256$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_option_none$vec$u8$$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$vec$u8$$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$vec$u8$$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A1_option_some$vec$u8$$(e) -> $result {
+                let $t1, $t2
+                // $t1 := vector::singleton<#0>($t0)
+                $t1 := A1_vector_singleton$vec$u8$$(e)
+                // $t2 := pack option::Option<#0>($t1)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $t2 := $mem
+                }
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_vector_singleton$vec$u8$$(e) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<#0>()
+                mstore($locals, A1_vector_empty$vec$u8$$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<#0>($t2, $t0)
+                A1_vector_push_back$vec$u8$$($t2, e)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$vec$u8$$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                    let $size_2300595445 := $MemoryLoadU64(e)
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                    let $data_src_2300595445 := add(e, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                        $Free(e, add($data_size_2300595445, 32))
+                    }
+                    $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_ExternalResult_panic$A2_U256_U256$(panic_code) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_U256_U256$()
+                // $t6 := option::none<vector<u8>>()
+                $t6 := A1_option_none$vec$u8$$()
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::some<U256::U256>($t0)
+                $t8 := A1_option_some$A2_U256_U256$(panic_code)
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_some$A2_U256_U256$(e) -> $result {
+                let $t1, $t2
+                // $t1 := vector::singleton<#0>($t0)
+                $t1 := A1_vector_singleton$A2_U256_U256$(e)
+                // $t2 := pack option::Option<#0>($t1)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $t2 := $mem
+                }
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_vector_singleton$A2_U256_U256$(e) -> $result {
+                let $t2, $t3
+                let $locals := $Malloc(32)
+                // $t1 := vector::empty<#0>()
+                mstore($locals, A1_vector_empty$A2_U256_U256$())
+                // $t2 := borrow_local($t1)
+                $t2 := $MakePtr(false, $locals)
+                // vector::push_back<#0>($t2, $t0)
+                A1_vector_push_back$A2_U256_U256$($t2, e)
+                // $t3 := move($t1)
+                $t3 := mload($locals)
+                // return $t3
+                $result := $t3
+                $Free($locals, 32)
+            }
+
+            function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A2_ExternalResult_err_reason$A2_U256_U256$(error) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_U256_U256$()
+                // $t6 := option::some<vector<u8>>($t0)
+                $t6 := A1_option_some$vec$u8$$(error)
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::none<U256::U256>()
+                $t8 := A1_option_none$A2_U256_U256$()
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_ok$A2_U256_U256$(value) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::some<#0>($t0)
+                $t1 := A1_option_some$A2_U256_U256$(value)
+                // $t2 := option::none<vector<u8>>()
+                $t2 := A1_option_none$vec$u8$$()
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_ExternalResult_is_err_reason$A2_U256_U256$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
+                {
+                    let $field_ptr := $IndexPtr(result, 64)
+                    $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+                }
+                // $t2 := option::is_some<vector<u8>>($t1)
+                $t2 := A1_option_is_some$vec$u8$$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$vec$u8$$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$vec$u8$$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$vec$u8$$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$vec$u8$$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$vec$u8$$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_M_safe_transfer_form(contract, from, to, tokenId, data) {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t5 := mload(0)
+                mstore($t5, $Shl(0xb88d4fde, 224))
+                let $t6 := abi_encode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(add($t5, 4), from, to, tokenId, data)
+                let $t7 := call(gas(), contract, 0,  $t5, sub($t6, $t5), $t5, 0)
+                // set freeMemoryPointer
+                mstore(0, $t6)
+                if iszero($t7) { $RevertForward() }
+                if $t7 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t5, add($t5, returndatasize()))
+                }
+            }
+            function A1_vector_empty$u8$() -> vector {
+                vector := $Malloc(34)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A2_M_no_para(contract) {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0x557c379b, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 0)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                if iszero($t3) { $RevertForward() }
+                if $t3 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t1, add($t1, returndatasize()))
+                }
+            }
+            function A2_M_multi_ret(contract, v, vec) -> $result0, $result1  {
+                // storage for arguments and returned data
+                let $t3 := mload(0)
+                mstore($t3, $Shl(0x7f547216, 224))
+                let $t4 := abi_encode_tuple_$uint256_uint256__$_$A2_U256_U256_vec$A2_U256_U256$$(add($t3, 4), v, vec)
+                let $t5 := call(gas(), contract, 0,  $t3, sub($t4, $t3), $t3, 0)
+                // set freeMemoryPointer
+                mstore(0, $t4)
+                if iszero($t5) { $RevertForward() }
+                if $t5 {
+                    // copy dynamic return data out
+                    returndatacopy($t3, 0, returndatasize())
+                    // decode return parameters from external try-call into retVars
+                    $result0, $result1 := abi_decode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$_from_memory($t3, add($t3, returndatasize()))
+                }
+            }
+            function A2_M_is_approved_for_all(contract, account, operator) -> $result  {
+                // storage for arguments and returned data
+                let $t3 := mload(0)
+                mstore($t3, $Shl(0xe985e9c5, 224))
+                let $t4 := abi_encode_tuple_$address_address$_$address_address$(add($t3, 4), account, operator)
+                let $t5 := call(gas(), contract, 0,  $t3, sub($t4, $t3), $t3, 32)
+                // set freeMemoryPointer
+                mstore(0, $t4)
+                if iszero($t5) { $RevertForward() }
+                if $t5 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$bool$_$bool$_from_memory($t3, add($t3, returndatasize()))
+                }
+            }
+            function A2_ExternalResult_is_ok$A2_Evm_Unit$(result) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+                {
+                    $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+                }
+                // $t2 := option::is_some<#0>($t1)
+                $t2 := A1_option_is_some$A2_Evm_Unit$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_is_some$A2_Evm_Unit$(t) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_Evm_Unit$($t1)
+                // $t3 := !($t2)
+                $t3 := $LogicalNot($t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_is_empty$A2_Evm_Unit$(v) -> $result {
+                let $t1, $t2, $t3
+                // $t1 := vector::length<#0>($t0)
+                $t1 := A1_vector_length$A2_Evm_Unit$(v)
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := ==($t1, $t2)
+                $t3 := $Eq($t1, $t2)
+                // return $t3
+                $result := $t3
+            }
+
+            function A1_vector_length$A2_Evm_Unit$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A2_M_test_unit(contract) -> $result  {
+                if iszero(extcodesize(contract)) { $Abort(91) }
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0xb76fa7ae, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 0)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                switch iszero($t3)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    abi_decode_tuple___from_memory($t1, add($t1, returndatasize()))
+                }
+                default {
+                    let $t4 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t4 := 0
+                            $result := A2_ExternalResult_err_reason$A2_Evm_Unit$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t5, $t6 := $TryDecodePanicData()
+                        if $t5 {
+                            $t4 := 0
+                            $result := $t6
+                            $result := A2_ExternalResult_panic$A2_Evm_Unit$($result)
+                        }
+                    }
+                    if $t4 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_Evm_Unit$($result)
+                    }
+                }
+            }
+            function A2_ExternalResult_err_data$A2_Evm_Unit$(error) -> $result {
+                let $t1, $t2, $t3, $t4, $t5
+                // $t1 := option::none<#0>()
+                $t1 := A1_option_none$A2_Evm_Unit$()
+                // $t2 := option::some<vector<u8>>($t0)
+                $t2 := A1_option_some$vec$u8$$(error)
+                // $t3 := option::none<vector<u8>>()
+                $t3 := A1_option_none$vec$u8$$()
+                // $t4 := option::none<U256::U256>()
+                $t4 := A1_option_none$A2_U256_U256$()
+                // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t1)
+                    $MemoryStoreU256(add($mem, 32), $t2)
+                    $MemoryStoreU256(add($mem, 64), $t3)
+                    $MemoryStoreU256(add($mem, 96), $t4)
+                    $t5 := $mem
+                }
+                // return $t5
+                $result := $t5
+            }
+
+            function A1_option_none$A2_Evm_Unit$() -> $result {
+                let $t0, $t1
+                // $t0 := vector::empty<#0>()
+                $t0 := A1_vector_empty$A2_Evm_Unit$()
+                // $t1 := pack option::Option<#0>($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), $t0)
+                    $t1 := $mem
+                }
+                // return $t1
+                $result := $t1
+            }
+
+            function A1_vector_empty$A2_Evm_Unit$() -> vector {
+                vector := $Malloc(96)
+                $MemoryStoreU64(add(vector, 8), 2)
+            }
+            function A2_ExternalResult_panic$A2_Evm_Unit$(panic_code) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_Evm_Unit$()
+                // $t6 := option::none<vector<u8>>()
+                $t6 := A1_option_none$vec$u8$$()
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::some<U256::U256>($t0)
+                $t8 := A1_option_some$A2_U256_U256$(panic_code)
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_err_reason$A2_Evm_Unit$(error) -> $result {
+                let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+                // $t5 := option::none<#0>()
+                $t5 := A1_option_none$A2_Evm_Unit$()
+                // $t6 := option::some<vector<u8>>($t0)
+                $t6 := A1_option_some$vec$u8$$(error)
+                // $t7 := option::none<vector<u8>>()
+                $t7 := A1_option_none$vec$u8$$()
+                // $t8 := option::none<U256::U256>()
+                $t8 := A1_option_none$A2_U256_U256$()
+                // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+                {
+                    let $mem := $Malloc(128)
+                    $MemoryStoreU256(add($mem, 0), $t5)
+                    $MemoryStoreU256(add($mem, 32), $t7)
+                    $MemoryStoreU256(add($mem, 64), $t6)
+                    $MemoryStoreU256(add($mem, 96), $t8)
+                    $t9 := $mem
+                }
+                // return $t9
+                $result := $t9
+            }
+
+            function A2_ExternalResult_unwrap$A2_Evm_Unit$(result) -> $result {
+                let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+                // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+                $t5 := $MemoryLoadU256(add(result, 0))
+                $t6 := $MemoryLoadU256(add(result, 32))
+                $t7 := $MemoryLoadU256(add(result, 64))
+                $t8 := $MemoryLoadU256(add(result, 96))
+                $Free(result, 128)
+                // option::destroy_none<vector<u8>>($t6)
+                A1_option_destroy_none$vec$u8$$($t6)
+                // option::destroy_none<vector<u8>>($t7)
+                A1_option_destroy_none$vec$u8$$($t7)
+                // option::destroy_none<U256::U256>($t8)
+                A1_option_destroy_none$A2_U256_U256$($t8)
+                // $t9 := option::destroy_some<#0>($t5)
+                $t9 := A1_option_destroy_some$A2_Evm_Unit$($t5)
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_destroy_some$A2_Evm_Unit$(t) -> $result {
+                let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_Evm_Unit$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := move($t0)
+                        $t6 := t
+                        // $t2 := unpack option::Option<#0>($t6)
+                        mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                        $Free($t6, 32)
+                        // $t7 := borrow_local($t2)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::pop_back<#0>($t7)
+                        $t8 := A1_vector_pop_back$A2_Evm_Unit$($t7)
+                        // $t9 := move($t2)
+                        $t9 := mload($locals)
+                        // vector::destroy_empty<#0>($t9)
+                        A1_vector_destroy_empty$A2_Evm_Unit$($t9)
+                        // return $t8
+                        $result := $t8
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$A2_Evm_Unit$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_vector_pop_back$A2_Evm_Unit$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let linked_src := $AlignedStorageLoad(e_offs)
+                    e := $Malloc(1)
+                    mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                    $AlignedStorageStore(e_offs, 0)
+                }
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function A1_option_destroy_none$A2_U256_U256$(t) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 4 {
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$A2_U256_U256$($t5)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$A2_U256_U256$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_option_is_none$A2_U256_U256$(t) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A1_option_destroy_none$vec$u8$$(t) {
+                let $t1, $t2, $t3, $t4, $t5
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
+                    }
+                    case 4 {
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$vec$u8$$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$vec$u8$$($t5)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_destroy_empty$vec$u8$$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
+            function A1_option_is_none$vec$u8$$(t) -> $result {
+                let $t1, $t2
+                // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+                $t1 := t
+                // $t2 := vector::is_empty<#0>($t1)
+                $t2 := A1_vector_is_empty$vec$u8$$($t1)
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_M_success(contract) -> $result  {
+                // storage for arguments and returned data
+                let $t1 := mload(0)
+                mstore($t1, $Shl(0x14056b3d, 224))
+                let $t2 := abi_encode_tuple__(add($t1, 4))
+                let $t3 := call(gas(), contract, 0,  $t1, sub($t2, $t1), $t1, 32)
+                // set freeMemoryPointer
+                mstore(0, $t2)
+                switch iszero($t3)
+                case 0 {
+                    // decode return parameters from external try-call into retVars
+                    $result := abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory($t1, add($t1, returndatasize()))
+                    $result := A2_ExternalResult_ok$A2_U256_U256$($result)
+                }
+                default {
+                    let $t4 := 1
+                    switch $ReturnDataSelector()
+                    case 0x08c379a0 {
+                        $result := $TryDecodeErrMsg()
+                        if $result {
+                            $t4 := 0
+                            $result := A2_ExternalResult_err_reason$A2_U256_U256$($result)
+                        }
+                    }
+                    case 0x4e487b71 {
+                        let $t5, $t6 := $TryDecodePanicData()
+                        if $t5 {
+                            $t4 := 0
+                            $result := $t6
+                            $result := A2_ExternalResult_panic$A2_U256_U256$($result)
+                        }
+                    }
+                    if $t4 {
+                        $result := $PackErrData()
+                        $result := A2_ExternalResult_err_data$A2_U256_U256$($result)
+                    }
+                }
+            }
+            function A2_U256_one() -> $result {
+                let $t0
+                // $t0 := 1
+                $t0 := 1
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_ExternalResult_unwrap$A2_U256_U256$(result) -> $result {
+                let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
+                // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
+                $t5 := $MemoryLoadU256(add(result, 0))
+                $t6 := $MemoryLoadU256(add(result, 32))
+                $t7 := $MemoryLoadU256(add(result, 64))
+                $t8 := $MemoryLoadU256(add(result, 96))
+                $Free(result, 128)
+                // option::destroy_none<vector<u8>>($t6)
+                A1_option_destroy_none$vec$u8$$($t6)
+                // option::destroy_none<vector<u8>>($t7)
+                A1_option_destroy_none$vec$u8$$($t7)
+                // option::destroy_none<U256::U256>($t8)
+                A1_option_destroy_none$A2_U256_U256$($t8)
+                // $t9 := option::destroy_some<#0>($t5)
+                $t9 := A1_option_destroy_some$A2_U256_U256$($t5)
+                // return $t9
+                $result := $t9
+            }
+
+            function A1_option_destroy_some$A2_U256_U256$(t) -> $result {
+                let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $locals := $Malloc(32)
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := move($t0)
+                        $t6 := t
+                        // $t2 := unpack option::Option<#0>($t6)
+                        mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                        $Free($t6, 32)
+                        // $t7 := borrow_local($t2)
+                        $t7 := $MakePtr(false, $locals)
+                        // $t8 := vector::pop_back<#0>($t7)
+                        $t8 := A1_vector_pop_back$A2_U256_U256$($t7)
+                        // $t9 := move($t2)
+                        $t9 := mload($locals)
+                        // vector::destroy_empty<#0>($t9)
+                        A1_vector_destroy_empty$A2_U256_U256$($t9)
+                        // return $t8
+                        $result := $t8
+                        $Free($locals, 32)
+                        leave
+                    }
+                }
+            }
+
+            function A1_vector_pop_back$A2_U256_U256$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function abi_decode_tuple_$uint256$_$A2_U256_U256$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint256_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple___from_memory(headStart, dataEnd) {
+                if slt(sub(dataEnd, headStart), 0) { $Abort(96) }
+            }
+            function abi_decode_tuple_$bool$_$bool$_from_memory(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bool_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool_from_memory(offset, end) -> value {
+                value := mload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_tuple_$address_address$_$address_address$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$_from_memory(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := mload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_uint256___vec$A2_U256_U256$_from_memory(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256_from_memory(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$_from_memory(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := mload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$_from_memory(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$_from_memory(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256_from_memory(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint256_uint256__$_$A2_U256_U256_vec$A2_U256_U256$$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_uint256(value_0, add(headStart, 0))
+                mstore(add(headStart, 32), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_1,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_encode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+                mstore(add(headStart, 96), sub(tail, headStart))
+                tail := abi_encode_bytes(value_3,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_tuple_$uint8$_$u8$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint8(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$uint128_uint128$_$u128_u128$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint128(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint128(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint128(value)
+            }
+            function validator_uint128(value) {
+                if iszero(eq(value, cleanup_uint128(value))) { $Abort(95) }
+            }
+            function cleanup_uint128(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$uint256___uint256$_$vec$A2_U256_U256$_A2_U256_U256$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_0,  tail)
+                abi_encode_uint256(value_1, add(headStart, 32))
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $RevertForward() {
+              let pos := mload(0)
+              returndatacopy(pos, 0, returndatasize())
+              revert(pos, returndatasize())
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Shl(x, y) -> r {
+              r := shl(y, x)
+            }
+            function $Eq(x, y) -> r {
+                r := eq(x, y)
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+            function $CastU256(hi, lo) -> r {
+                if gt(hi, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                if gt(lo, 0xffffffffffffffffffffffffffffffff) { $AbortBuiltin() }
+                r := add(shl(128, hi), lo)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+            function $ReturnDataSelector() -> sig {
+              if gt(returndatasize(), 3) {
+                let pos := $Malloc(4)
+                returndatacopy(pos, 0, 4)
+                sig := shr(224, mload(pos))
+              }
+            }
+            function $TryDecodePanicData() -> success, data {
+              if gt(returndatasize(), 0x23) {
+                let pos := $Malloc(0x20)
+                returndatacopy(pos, 4, 0x20)
+                success := 1
+                data := mload(pos)
+              }
+            }
+            function $PackErrData() -> data {
+              data := $Malloc(add(returndatasize(), 0x20))
+              $MemoryStoreU64(data, returndatasize())
+              $MemoryStoreU64(add(data, 8), returndatasize())
+              returndatacopy(add(data, 0x20), 0, returndatasize())
+            }
+
+            function $TryDecodeErrMsg() -> data {
+              if lt(returndatasize(), 0x44) { leave }
+              data := $Malloc(0x20)
+              returndatacopy(data, 4, 0x20)
+              let offset := mload(data)
+              if or(
+                  gt(offset, 0xffffffffffffffff),
+                  gt(add(offset, 0x24), returndatasize())
+                  ) {
+                  leave
+              }
+              data := $Malloc(0x20)
+              returndatacopy(data, add(4, offset), 0x20)
+              let length := mload(data)
+              if or(
+                gt(length, 0xffffffffffffffff),
+                gt(add(add(offset, 0x24), length), returndatasize())
+              ) {
+                leave
+              }
+              data := $Malloc(add(length, 0x20))
+              $MemoryStoreU64(data, length)
+              $MemoryStoreU64(add(data, 8), length)
+              returndatacopy(add(data, 0x20), add(offset, 0x24), length)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.move
new file mode 100644
index 000000000..927123344
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCall.move
@@ -0,0 +1,93 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::U256::{Self, U256, u256_from_words};
+    use Evm::ExternalResult::{Self, ExternalResult};
+    use Evm::Evm::Unit;
+    use std::vector;
+
+    #[external]
+    public native fun no_para(contract: address);
+
+    #[external(sig=b"safeTransferFrom(address,address,uint256,bytes)")]
+    public native fun safe_transfer_form(contract: address, from: address, to: address, tokenId: U256, data: vector<u8>);
+
+    #[external(sig=b"isApprovedForAll(address,address)returns(bool)"), view]
+    public native fun is_approved_for_all(contract: address, account: address, operator: address): bool;
+
+    #[external, view]
+    public native fun multi_ret(contract: address, v: U256, vec: vector<U256>): (vector<U256>, U256);
+
+    #[external(sig=b"testExternalReturn(uint) returns (uint)")]
+    public native fun test_try_call(contract: address, v: U256): ExternalResult<U256>;
+
+    #[external(sig=b"success_uint() returns (uint)")]
+    public native fun success(contract: address): ExternalResult<U256>;
+
+    #[external(sig=b"test_unit()")]
+    public native fun test_unit(contract: address): ExternalResult<Unit>;
+
+    #[callable(sig=b"call_unit(address)"), pure]
+    fun call_unit(addr: address) {
+        let v = test_unit(addr);
+        if (ExternalResult::is_ok(&v)) {
+            let _u = ExternalResult::unwrap<Unit>(v);
+        }
+    }
+
+    #[callable(sig=b"call_success(address) returns (uint)"), pure]
+    fun call_success(addr: address): U256 {
+        let v = success(addr);
+        if (ExternalResult::is_ok(&v)) {
+            return ExternalResult::unwrap<U256>(v)
+        };
+        return U256::one()
+    }
+
+    #[callable]
+    fun test_try(): u8 {
+        let contract_addr = @3;
+        let v = u256_from_words(1, 2);
+        let value = test_try_call(contract_addr, v);
+        if (ExternalResult::is_ok(&value)) {
+            return 0
+        } else if (ExternalResult::is_err_reason(&value)) {
+            return 1
+        } else if (ExternalResult::is_panic(&value)) {
+            return 2
+        };
+        return 3
+    }
+
+    #[callable]
+    fun test_no_para() {
+        let contract_addr = @3;
+        no_para(contract_addr);
+    }
+
+    #[callable]
+    fun test_safe_transfer_from(x: u128, y: u128) {
+        let contract_addr = @3;
+        let from_addr = @4;
+        let to_addr = @5;
+        let token_id = u256_from_words(x, y);
+        let data = vector::empty<u8>();
+        safe_transfer_form(contract_addr, from_addr, to_addr, token_id, data)
+    }
+
+    #[callable]
+    fun test_is_approved_for_all(): bool {
+        let contract_addr = @3;
+        let account = @4;
+        let operator = @5;
+        is_approved_for_all(contract_addr, account, operator)
+    }
+
+    #[callable]
+    fun test_multi_ret(): (vector<U256>, U256) {
+        let contract_addr = @3;
+        let v = u256_from_words(0, 0);
+        let data = vector::empty<U256>();
+        multi_ret(contract_addr, v, data)
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.exp
new file mode 100644
index 000000000..82424df67
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.exp
@@ -0,0 +1,26 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/ExternalCallFailure.move:11:5
+   │
+11 │     public native fun failure_3(add: address, i:u8);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: solidity signature is not compatible with the move signature
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:8:5
+  │
+8 │     public native fun failure_2(add: u128, i:u8);
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: external function must have at least one argument
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:5:5
+  │
+5 │     public native fun failure_1();
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/ExternalCallFailure.move:5:5
+  │
+5 │     public native fun failure_1();
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.move
new file mode 100644
index 000000000..16967db6e
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/ExternalCallFailure.move
@@ -0,0 +1,30 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[external(sig=b"noPara()")]
+    public native fun failure_1();
+
+    #[external(sig=b"para1(uint)")]
+    public native fun failure_2(add: u128, i:u8);
+
+    #[external(sig=b"para2(uint)")]
+    public native fun failure_3(add: address, i:u8);
+
+
+    #[callable]
+    fun test_failure_1() {
+        failure_1();
+    }
+
+    #[callable]
+    fun test_failure_2() {
+        failure_2(1, 0);
+    }
+
+    #[callable]
+    fun test_failure_3() {
+        let addr = @3;
+        failure_3(addr, 0);
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.exp
new file mode 100644
index 000000000..e81fedd46
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.exp
@@ -0,0 +1,511 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xc938cd4b
+                {
+                    // add(int192,uint32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$int192_uint32$_$A2_U256_U256_u64$(4, calldatasize())
+                    let ret_0, ret_1 := A2_M_f1(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$int256_int24$_$A2_U256_U256_u64$(memPos, ret_0, ret_1)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x90b89a6b
+                {
+                    // fun_address(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$signer_address$(4, calldatasize())
+                    let ret_0 := A2_M_f2(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xdf19e4ed
+                {
+                    // fun_2(int120[3][][5],address[],bytes[2],bytes1,bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$int120_3____5__address___bytes_2__bytes1_bytes32$_$vec$vec$vec$u128$$$_vec$address$_vec$vec$u8$$_vec$u8$_vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_M_f3(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint64$_$u128$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x18159cfb
+                {
+                    // f(string,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_f4(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x7d19f4c8
+                {
+                    // $_fun1$(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let ret_0 := A2_M_fun_1(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$int64$_$u64$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf0619891
+                {
+                    // no_para_return()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    A2_M_no_para_return()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_f1(x, y) -> $result0, $result1 {
+                // return ($t0, $t1)
+                $result0 := x
+                $result1 := y
+            }
+
+            function A2_M_f2(_signer, addr) -> $result {
+                // return $t1
+                $result := addr
+            }
+
+            function A2_M_f3(_vec0, _vec1, _vec2, _vec3, _vec4) -> $result {
+                let $t5
+                // $t5 := 2
+                $t5 := 2
+                // return $t5
+                $result := $t5
+            }
+
+            function A2_M_f4(_s, _s1) {
+                // return ()
+            }
+
+            function A2_M_fun_1(x) -> $result {
+                // return $t0
+                $result := x
+            }
+
+            function A2_M_no_para_return() {
+                // return ()
+            }
+
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_encode_tuple_$int64$_$u64$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_int64(value_0, add(headStart, 0))
+            }
+            function abi_encode_int64(value, pos) {
+                mstore(pos, cleanup_int64(value))
+            }
+            function cleanup_int64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_decode_tuple_$string_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$uint64$_$u128$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint64(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function abi_decode_tuple_$int120_3____5__address___bytes_2__bytes1_bytes32$_$vec$vec$vec$u128$$$_vec$address$_vec$vec$u8$$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_int120_3____5__vec$vec$vec$u128$$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_address___vec$address$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_bytes_2__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_3 := abi_decode_bytes1_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 128
+                    value_4 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes1_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 1
+                let size := 33
+                array := abi_decode_available_length__bytes1(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes1(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes_2__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 96
+                array := abi_decode_available_length__bytes_2__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes_2__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_bytes_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_address___vec$address$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__address___vec$address$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__address___vec$address$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_address(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_int120_3____5__vec$vec$vec$u128$$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 5
+                let size := 192
+                array := abi_decode_available_length__int120_3____5__vec$vec$vec$u128$$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__int120_3____5__vec$vec$vec$u128$$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_int120_3____vec$vec$u128$$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_int120_3____vec$vec$u128$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__int120_3____vec$vec$u128$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__int120_3____vec$vec$u128$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 96))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 96) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_int120_3__vec$u128$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_int120_3__vec$u128$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 80
+                array := abi_decode_available_length__int120_3__vec$u128$(offset, length, size, end)
+            }
+            function abi_decode_available_length__int120_3__vec$u128$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_int120(elementPos, end)
+                    $MemoryStoreU128(dst, value)
+                    dst := add(dst, 16)
+                }
+            }
+            function abi_decode_int120(offset, end) -> value {
+                value := calldataload(offset)
+                validator_int120(value)
+            }
+            function validator_int120(value) {
+                if iszero(eq(value, cleanup_int120(value))) { $Abort(95) }
+            }
+            function cleanup_int120(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function abi_decode_tuple_$address_address$_$signer_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$int256_int24$_$A2_U256_U256_u64$(headStart ,value_0, value_1) -> tail {
+                tail := add(headStart, 64)
+                abi_encode_int256(value_0, add(headStart, 0))
+                abi_encode_int24(value_1, add(headStart, 32))
+            }
+            function abi_encode_int24(value, pos) {
+                mstore(pos, cleanup_int24(value))
+            }
+            function cleanup_int24(value) -> cleaned {
+                cleaned := and(value, 0xffffff)
+            }
+            function abi_encode_int256(value, pos) {
+                mstore(pos, cleanup_int256(value))
+            }
+            function cleanup_int256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$int192_uint32$_$A2_U256_U256_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_int192(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint32(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint32(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint32(value)
+            }
+            function validator_uint32(value) {
+                if iszero(eq(value, cleanup_uint32(value))) { $Abort(95) }
+            }
+            function cleanup_uint32(value) -> cleaned {
+                cleaned := and(value, 0xffffffff)
+            }
+            function abi_decode_int192(offset, end) -> value {
+                value := calldataload(offset)
+                validator_int192(value)
+            }
+            function validator_int192(value) {
+                if iszero(eq(value, cleanup_int192(value))) { $Abort(95) }
+            }
+            function cleanup_int192(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.move
new file mode 100644
index 000000000..6b2605134
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/ParsingSoliditySig.move
@@ -0,0 +1,43 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::U256::U256;
+
+    // This file contains tests that pass compilation.
+
+    // No parameter and no return value
+    #[callable(sig=b"no_para_return(   )")]
+    fun no_para_return() {
+
+    }
+
+    // One parameter and one return value
+    #[callable(sig=b"$_fun1$   (uint64)returns (int64)")]
+    fun fun_1(x: u64) : u64 {
+        x
+    }
+
+    // Multiple parameter and multiple return values
+    // Compatibility between integer / unsigned integer types in Move and Solidity
+    #[callable(sig=b"add( int192,uint32 ) returns (int256, int24)")]
+    fun f1(x: U256, y: u64): (U256, u64) {
+        (x, y)
+    }
+
+    // Compatibility between address/signer in Move and Solidity
+    #[callable(sig=b"fun_address (address, address ) returns (address payable)")]
+    fun f2(_signer: signer, addr: address) : address {
+        addr
+    }
+
+    // Compatibility between vector in Move and array, bytes and string in Solidity
+    #[callable(sig=b"fun_2(int120[ 3 ][][5] memory , address payable [],bytes   [2]memory, bytes1 ,bytes32 ) returns (uint64)")]
+    fun f3(_vec0: vector<vector<vector<u128>>>, _vec1: vector<address>, _vec2: vector<vector<u8>>, _vec3: vector<u8>, _vec4: vector<u8>): u128 {
+        2
+    }
+
+    // Compatibility of Solidity string
+    #[callable(sig=b"f(string, string)")]
+    fun f4(_s: vector<u8>, _s1:vector <u8> ) {
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.exp
new file mode 100644
index 000000000..1f2c07065
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.exp
@@ -0,0 +1,465 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC1155" {
+    code {
+        codecopy(0, dataoffset("A2_ERC1155_deployed"), datasize("A2_ERC1155_deployed"))
+        return(0, datasize("A2_ERC1155_deployed"))
+    }
+    object "A2_ERC1155_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x00fdd58e
+                {
+                    // balanceOf(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_balanceOf(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x4e1273f4
+                {
+                    // balanceOfBatch(address[],uint256[])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address___uint256__$_$vec$address$_vec$A2_U256_U256$$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_balanceOfBatch(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256__$_$vec$A2_U256_U256$$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xebd1d359
+                {
+                    // isApprovalForAll(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_isApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2eb2c2d6
+                {
+                    // safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$address_address_uint256___uint256___bytes$_$address_address_vec$A2_U256_U256$_vec$A2_U256_U256$_vec$u8$$(4, calldatasize())
+                    A2_ERC1155_safeBatchTransferFrom(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xf242432a
+                {
+                    // safeTransferFrom(address,address,uint256,uint256,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3, param_4 := abi_decode_tuple_$address_address_uint256_uint256_bytes$_$address_address_A2_U256_U256_A2_U256_U256_vec$u8$$(4, calldatasize())
+                    A2_ERC1155_safeTransferFrom(param_0, param_1, param_2, param_3, param_4)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22cb465
+                {
+                    // setApprovalForAll(address,bool)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_bool$_$address_bool$(4, calldatasize())
+                    A2_ERC1155_setApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x01ffc9a7
+                {
+                    // supportsInterface(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_ERC1155_supportsInterface(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC1155_balanceOf(_account, _id) -> $result {
+                let $t2
+                // $t2 := 0
+                $t2 := 0
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC1155_balanceOfBatch(_accounts, ids) -> $result {
+                // return $t1
+                $result := ids
+            }
+
+            function A2_ERC1155_isApprovalForAll(_account, _operator) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC1155_safeBatchTransferFrom(_from, _to, _ids, _amounts, _data) {
+                // return ()
+            }
+
+            function A2_ERC1155_safeTransferFrom(_from, _to, _id, _amount, _data) {
+                // return ()
+            }
+
+            function A2_ERC1155_setApprovalForAll(_operator, _approved) {
+                // return ()
+            }
+
+            function A2_ERC1155_supportsInterface(_interfaceId) -> $result {
+                let $t1
+                // $t1 := true
+                $t1 := true
+                // return $t1
+                $result := $t1
+            }
+
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$address_bool$_$address_bool$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_address_uint256_uint256_bytes$_$address_address_A2_U256_U256_A2_U256_U256_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 96
+                    value_3 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 128))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_4 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_address_uint256___uint256___bytes$_$address_address_vec$A2_U256_U256$_vec$A2_U256_U256$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3, value_4 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 64))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_2 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 128))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_4 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256___vec$A2_U256_U256$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__uint256___vec$A2_U256_U256$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__uint256___vec$A2_U256_U256$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint256(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256__$_$vec$A2_U256_U256$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_uint256___vec$A2_U256_U256$(value_0,  tail)
+            }
+            function abi_encode_uint256___vec$A2_U256_U256$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_uint256_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_uint256_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint256(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address___uint256__$_$vec$address$_vec$A2_U256_U256$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_address___vec$address$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_uint256___vec$A2_U256_U256$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address___vec$address$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__address___vec$address$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__address___vec$address$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_address(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
+
+
+!! Move-To-Yul Diagnostics:
+ warning: unused alias
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.move:4:22
+  │
+4 │     use std::ascii::{String};
+  │                      ^^^^^^ Unused 'use' of alias 'String'. Consider removing it
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.move
new file mode 100644
index 000000000..c6444b00d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC1155.move
@@ -0,0 +1,54 @@
+#[evm_contract]
+/// An implementation of the ERC-1155 Multi Token Standard.
+module 0x2::ERC1155 {
+    use std::ascii::{String};
+    use Evm::U256::{U256, u256_from_words};
+
+    /*
+    #[callable(sig=b"uri() returns (string memory) "), view]
+    /// Returns the name of the token
+    public fun uri(): String {
+        std::ascii::String(b"abc") // TODO: this leads to compilation error "type needs to be struct or vector"
+    }
+    */
+
+
+    #[callable(sig=b"balanceOf(address,uint256) returns (uint256)"), view]
+    /// Get the balance of an account's token.
+    public fun balanceOf(_account: address, _id: U256): U256 {
+        u256_from_words(0,0)
+    }
+
+    #[callable(sig=b"balanceOfBatch(address[], uint256[]) returns (uint256[] memory)"), view]
+    /// Get the balance of multiple account/token pairs.
+    public fun balanceOfBatch(_accounts: vector<address>, ids: vector<U256>): vector<U256> {
+        ids
+    }
+
+    #[callable(sig=b"setApprovalForAll(address,bool)")]
+    /// Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    public fun setApprovalForAll(_operator: address, _approved: bool) {
+    }
+
+    #[callable(sig=b"isApprovalForAll(address,address)returns(bool)"), view]
+    /// Queries the approval status of an operator for a given owner.
+    public fun isApprovalForAll(_account: address, _operator: address): bool {
+        true
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256,uint256,bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeTransferFrom(_from: address, _to: address, _id: U256, _amount: U256, _data: vector<u8>) {
+    }
+
+    #[callable(sig=b"safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)")]
+    /// Transfers `_value` amount of an `_id` from the `_from` address to the `_to` address specified (with safety call).
+    public fun safeBatchTransferFrom(_from: address, _to: address, _ids: vector<U256>, _amounts: vector<U256>, _data: vector<u8>) {
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)")]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(_interfaceId: vector<u8>): bool {
+        true
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.exp
new file mode 100644
index 000000000..5c745b492
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.exp
@@ -0,0 +1,440 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC721" {
+    code {
+        codecopy(0, dataoffset("A2_ERC721_deployed"), datasize("A2_ERC721_deployed"))
+        return(0, datasize("A2_ERC721_deployed"))
+    }
+    object "A2_ERC721_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x095ea7b3
+                {
+                    // approve(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_approve(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x70a08231
+                {
+                    // balanceOf(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_ERC721_balanceOf(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x081812fc
+                {
+                    // getApproved(uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256$_$A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC721_getApproved(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xebd1d359
+                {
+                    // isApprovalForAll(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC721_isApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x6352211e
+                {
+                    // ownerOf(uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint256$_$A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC721_ownerOf(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$address$_$address$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x42842e0e
+                {
+                    // safeTransferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_safeTransferFrom(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb88d4fde
+                {
+                    // safeTransferFrom(address,address,uint256,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(4, calldatasize())
+                    A2_ERC721_safeTransferFrom_with_data(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa22cb465
+                {
+                    // setApprovalForAll(address,bool)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_bool$_$address_bool$(4, calldatasize())
+                    A2_ERC721_setApprovalForAll(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x01ffc9a7
+                {
+                    // supportsInterface(bytes4)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes4$_$vec$u8$$(4, calldatasize())
+                    let ret_0 := A2_ERC721_supportsInterface(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x23b872dd
+                {
+                    // transferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_ERC721_transferFrom(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC721_approve(_approved, _tokenId) {
+                // return ()
+            }
+
+            function A2_ERC721_balanceOf(_owner) -> $result {
+                let $t1
+                // $t1 := 0
+                $t1 := 0
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_getApproved(_tokenId) -> $result {
+                let $t1
+                // $t1 := 0x1
+                $t1 := 0x1
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_isApprovalForAll(_account, _operator) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC721_ownerOf(_tokenId) -> $result {
+                let $t1
+                // $t1 := 0x1
+                $t1 := 0x1
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_safeTransferFrom(from, to, tokenId) {
+                let $t3
+                // $t3 := []
+                $t3 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
+                $MemoryStoreU64($t3, 0)
+                $MemoryStoreU64(add($t3, 8), $ClosestGreaterPowerOfTwo(0))
+                copy_literal_string_to_memory_21418693(add($t3, 32))
+                // ERC721::safeTransferFrom_with_data($t0, $t1, $t2, $t3)
+                A2_ERC721_safeTransferFrom_with_data(from, to, tokenId, $t3)
+                // return ()
+            }
+
+            function A2_ERC721_safeTransferFrom_with_data(_from, _to, _tokenId, _data) {
+                // return ()
+            }
+
+            function A2_ERC721_setApprovalForAll(_operator, _approved) {
+                // return ()
+            }
+
+            function A2_ERC721_supportsInterface(_interfaceId) -> $result {
+                let $t1
+                // $t1 := true
+                $t1 := true
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC721_transferFrom(_from, _to, _tokenId) {
+                // return ()
+            }
+
+            function copy_literal_string_to_memory_21418693(value) {
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$bytes4$_$vec$u8$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes4_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes4_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 4
+                let size := 36
+                array := abi_decode_available_length__bytes4(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes4(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$address_bool$_$address_bool$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bool(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bool(offset, end) -> value {
+                value := calldataload(offset)
+                validator_bool(value)
+            }
+            function validator_bool(value) {
+                if iszero(eq(value, cleanup_bool(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$address_address_uint256_bytes$_$address_address_A2_U256_U256_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function abi_decode_tuple_$uint256$_$A2_U256_U256$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.move
new file mode 100644
index 000000000..ffcd1bb89
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/ERC721.move
@@ -0,0 +1,64 @@
+#[evm_contract]
+/// An implementation of the ERC-721 Non-Fungible Token Standard.
+module 0x2::ERC721 {
+    use Evm::U256::{U256, u256_from_words};
+
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)")]
+    /// Count all NFTs assigned to an owner.
+    public fun balanceOf(_owner: address): U256 {
+        u256_from_words(0,0)
+    }
+
+    #[callable(sig=b"ownerOf(uint256) returns (address)")]
+    /// Find the owner of an NFT.
+    public fun ownerOf(_tokenId: U256): address {
+        @0x1
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256, bytes)")] // Overloading `safeTransferFrom`
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom_with_data(_from: address, _to: address, _tokenId: U256, _data: vector<u8>) {
+    }
+
+    #[callable(sig=b"safeTransferFrom(address,address,uint256)")]
+    /// Transfers the ownership of an NFT from one address to another address.
+    public fun safeTransferFrom(from: address, to: address, tokenId: U256) {
+        safeTransferFrom_with_data(from, to, tokenId, b"");
+    }
+
+    #[callable(sig=b"transferFrom(address,address,uint256)")]
+    /// Transfer ownership of an NFT. THE CALLER IS RESPONSIBLE
+    ///  TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
+    ///  THEY MAY BE PERMANENTLY LOST
+    public fun transferFrom(_from: address, _to: address, _tokenId: U256) {
+    }
+
+    #[callable(sig=b"approve(address, uint256)")]
+    /// Change or reaffirm the approved address for an NFT.
+    public fun approve(_approved: address, _tokenId: U256){
+    }
+
+    #[callable(sig=b"setApprovalForAll(address,bool)")]
+    /// Enable or disable approval for a third party ("operator") to manage all of the caller's tokens.
+    public fun setApprovalForAll(_operator: address, _approved: bool) {
+    }
+
+    #[callable(sig=b"getApproved(uint256) returns (address)")]
+    /// Get the approved address for a single NFT.
+    public fun getApproved(_tokenId: U256): address {
+        @0x1
+    }
+
+    #[callable(sig=b"isApprovalForAll(address,address)returns(bool)"), view]
+    /// Queries the approval status of an operator for a given owner.
+    public fun isApprovalForAll(_account: address, _operator: address): bool {
+        true
+    }
+
+    #[callable(sig=b"supportsInterface(bytes4) returns (bool)")]
+    // Query if this contract implements a certain interface.
+    public fun supportsInterface(_interfaceId: vector<u8>): bool {
+        true
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.exp
new file mode 100644
index 000000000..c0f7c0c52
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.exp
@@ -0,0 +1,239 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_ERC20" {
+    code {
+        codecopy(0, dataoffset("A2_ERC20_deployed"), datasize("A2_ERC20_deployed"))
+        return(0, datasize("A2_ERC20_deployed"))
+    }
+    object "A2_ERC20_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0xdd62ed3e
+                {
+                    // allowance(address,address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_address$_$address_address$(4, calldatasize())
+                    let ret_0 := A2_ERC20_allowance(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x095ea7b3
+                {
+                    // approve(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_approve(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x70a08231
+                {
+                    // balanceOf(address)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$address$_$address$(4, calldatasize())
+                    let ret_0 := A2_ERC20_balance_of(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x18160ddd
+                {
+                    // totalSupply()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let ret_0 := A2_ERC20_total_supply()
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$uint256$_$A2_U256_U256$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xa9059cbb
+                {
+                    // transfer(address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_transfer(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x23b872dd
+                {
+                    // transferFrom(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    let ret_0 := A2_ERC20_transfer_from(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple_$bool$_$bool$(memPos, ret_0)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_ERC20_allowance(_owner, _spender) -> $result {
+                let $t2
+                // $t2 := 0
+                $t2 := 0
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_approve(_spender, _amount) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_balance_of(_owner) -> $result {
+                let $t1
+                // $t1 := 0
+                $t1 := 0
+                // return $t1
+                $result := $t1
+            }
+
+            function A2_ERC20_total_supply() -> $result {
+                let $t0
+                // $t0 := 0
+                $t0 := 0
+                // return $t0
+                $result := $t0
+            }
+
+            function A2_ERC20_transfer(_to, _amount) -> $result {
+                let $t2
+                // $t2 := true
+                $t2 := true
+                // return $t2
+                $result := $t2
+            }
+
+            function A2_ERC20_transfer_from(_from, _to, _amount) -> $result {
+                let $t3
+                // $t3 := true
+                $t3 := true
+                // return $t3
+                $result := $t3
+            }
+
+            function abi_encode_tuple_$bool$_$bool$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_bool(value_0, add(headStart, 0))
+            }
+            function abi_encode_bool(value, pos) {
+                mstore(pos, cleanup_bool(value))
+            }
+            function cleanup_bool(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_decode_tuple_$address_uint256$_$address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_encode_tuple_$uint256$_$A2_U256_U256$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_uint256(value_0, add(headStart, 0))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function abi_decode_tuple_$address$_$address$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$address_address$_$address_address$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.move
new file mode 100644
index 000000000..e5ff0c454
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/evm-examples/Token.move
@@ -0,0 +1,44 @@
+#[evm_contract]
+/// An implementation of ERC20.
+module 0x2::ERC20 {
+    use Evm::U256::{U256, u256_from_words};
+
+    #[callable(sig=b"totalSupply() returns (uint256)"), view]
+    /// Returns the total supply of the token.
+    public fun total_supply(): U256 {
+        u256_from_words(0,0)
+    }
+
+    #[callable(sig=b"balanceOf(address) returns (uint256)"), view]
+    /// Returns the balance of an account.
+    public fun balance_of(_owner: address): U256 {
+        u256_from_words(0,0)
+    }
+
+    #[callable(sig=b"allowance(address, address) returns (uint256)"), view]
+    /// Returns the allowance an account owner has approved for the given spender.
+    public fun allowance(_owner: address, _spender: address): U256 {
+        u256_from_words(0,0)
+    }
+
+    #[callable(sig=b"approve(address,uint256)returns(bool)")]
+    /// Approves that the spender can spent the given amount on behalf of the calling account.
+    public fun approve(_spender: address, _amount: U256): bool {
+        true
+    }
+
+    #[callable(sig=b"transfer(address,uint256)returns (bool)")]
+    /// Transfers the amount from the sending account to the given account
+    public fun transfer(_to: address, _amount: U256): bool {
+        true
+    }
+
+    #[callable(sig=b"transferFrom(address, address, uint256) returns(bool)")]
+    /// Transfers the amount on behalf of the `from` account to the given account.
+    /// This evaluates and adjusts the allowance.
+    public fun transfer_from(_from: address, _to: address, _amount: U256): bool {
+        true
+    }
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.exp
new file mode 100644
index 000000000..f8187132b
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.exp
@@ -0,0 +1,25 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: calldata is not supported yet
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:14:5
+   │
+14 │ ╭     fun bytes_calldata(_v: vector<u8>): u128 {
+15 │ │         0
+16 │ │     }
+   │ ╰─────^
+
+error: calldata is not supported yet
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:9:5
+   │
+ 9 │ ╭     fun primitive_calldata(): u128 {
+10 │ │         0
+11 │ │     }
+   │ ╰─────^
+
+error: data location can only be specified for array or struct types
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move:5:5
+  │
+5 │ ╭     fun primitive_memory(_x:u128) {
+6 │ │     }
+  │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move
new file mode 100644
index 000000000..b1e9ec407
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalDataLocation.move
@@ -0,0 +1,18 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[callable(sig=b"f(uint64 memory)")]
+    fun primitive_memory(_x:u128) {
+    }
+
+    #[callable(sig=b"f() returns (uint64 calldata)")]
+    fun primitive_calldata(): u128 {
+        0
+    }
+
+    #[callable(sig=b"f(bytes32 calldata) returns (uint64)")]
+    fun bytes_calldata(_v: vector<u8>): u128 {
+        0
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.exp
new file mode 100644
index 000000000..6e2b0ffde
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.exp
@@ -0,0 +1,17 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move:9:5
+   │
+ 9 │ ╭     fun illegal_char() {
+10 │ │
+11 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move:5:5
+  │
+5 │ ╭     fun illegal_char_begin() {
+6 │ │     }
+  │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move
new file mode 100644
index 000000000..00645df58
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalFunctionName.move
@@ -0,0 +1,13 @@
+#[evm_contract]
+module 0x2::M {
+
+    #[callable(sig=b"1add()")]
+    fun illegal_char_begin() {
+    }
+
+    #[callable(sig=b"add) () ")]
+    fun illegal_char() {
+
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.exp
new file mode 100644
index 000000000..00787fae4
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.exp
@@ -0,0 +1,141 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:7:5
+  │
+7 │ ╭     fun extra_comma_1(_x: u64) {
+8 │ │
+9 │ │     }
+  │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:12:5
+   │
+12 │ ╭     fun extra_comma_2(_x: u64) {
+13 │ │
+14 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:17:5
+   │
+17 │ ╭     fun extra_comma_3() : u64 {
+18 │ │         1
+19 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:87:5
+   │
+87 │ ╭     fun illegal_address_1(_x: address) : u64 {
+88 │ │         0
+89 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:92:5
+   │
+92 │ ╭     fun illegal_address_2(x: address) : address {
+93 │ │         x
+94 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:77:5
+   │
+77 │ ╭     fun illegal_bytes_1(_v: vector<u8>) : u64 {
+78 │ │         0
+79 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:82:5
+   │
+82 │ ╭     fun illegal_bytes_2(_v: vector<u8>) : u64 {
+83 │ │         0
+84 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:24:5
+   │
+24 │ ╭     fun illegal_char_1() {
+25 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:28:5
+   │
+28 │ ╭     fun illegal_char_2() {
+29 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:32:5
+   │
+32 │ ╭     fun illegal_char_3() {
+33 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:58:5
+   │
+58 │ ╭     fun illegal_fixed_1(_x: u8) : u64 {
+59 │ │         0
+60 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:63:5
+   │
+63 │ ╭     fun illegal_fixed_2(_x: u8) : u64 {
+64 │ │         0
+65 │ │     }
+   │ ╰─────^
+
+error: cannot create struct abi:fix64x18
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:68:5
+   │
+68 │ ╭     fun illegal_fixed_3(_x: u128) {
+69 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:72:5
+   │
+72 │ ╭     fun illegal_fixed_4(_x: u128) {
+73 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:43:5
+   │
+43 │ ╭     fun illegal_int_1(_x: u8) : u64 {
+44 │ │         0
+45 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:48:5
+   │
+48 │ ╭     fun illegal_int_2(_x: u8) : u64 {
+49 │ │         0
+50 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing a simple type
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:53:5
+   │
+53 │ ╭     fun illegal_int_3(_x: u8) : u64 {
+54 │ │         0
+55 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the return types in the signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move:36:5
+   │
+36 │ ╭     fun no_bracket() : u64 {
+37 │ │         0
+38 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move
new file mode 100644
index 000000000..047ca37a2
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IllegalTypeList.move
@@ -0,0 +1,95 @@
+#[evm_contract]
+module 0x2::M {
+
+    // Extra commas
+
+    #[callable(sig=b"f(uint64,) ")]
+    fun extra_comma_1(_x: u64) {
+
+    }
+
+    #[callable(sig=b"f(,uint64) ")]
+    fun extra_comma_2(_x: u64) {
+
+    }
+
+    #[callable(sig=b"f() returns (uint64,) ")]
+    fun extra_comma_3() : u64 {
+        1
+    }
+
+    // Illegal chars
+
+    #[callable(sig=b"f(()) ")]
+    fun illegal_char_1() {
+    }
+
+    #[callable(sig=b"f() returns ([) ")]
+    fun illegal_char_2() {
+    }
+
+    #[callable(sig=b"f() return () ")]
+    fun illegal_char_3() {
+    }
+
+    #[callable(sig=b"f() returns uint64 ")]
+    fun no_bracket() : u64 {
+        0
+    }
+
+    // Illegal types
+
+    #[callable(sig=b"f(uint9) returns (uint64) ")]
+    fun illegal_int_1(_x: u8) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(uint264) returns (uint64) ")]
+    fun illegal_int_2(_x: u8) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(int0) returns (uint64) ")]
+    fun illegal_int_3(_x: u8) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(fixed255x15) returns (uint64) ")]
+    fun illegal_fixed_1(_x: u8) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(ufixed256x81) returns (uint64) ")]
+    fun illegal_fixed_2(_x: u8) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(fix64x18) ")]
+    fun illegal_fixed_3(_x: u128) {
+    }
+
+    #[callable(sig=b"f(ufixed64X18) ")]
+    fun illegal_fixed_4(_x: u128) {
+    }
+
+
+    #[callable(sig=b"f(bytes0) returns (uint64) ")]
+    fun illegal_bytes_1(_v: vector<u8>) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(bytes33) returns (uint64) ")]
+    fun illegal_bytes_2(_v: vector<u8>) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(address pyable) returns (uint64) ")]
+    fun illegal_address_1(_x: address) : u64 {
+        0
+    }
+
+    #[callable(sig=b"f(addresspayable) returns (addresss) ")]
+    fun illegal_address_2(x: address) : address {
+        x
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.exp b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.exp
new file mode 100644
index 000000000..245ee16a6
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.exp
@@ -0,0 +1,115 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:40:5
+   │
+40 │ ╭     fun fun_address_u160(_a: address) {
+41 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:27:5
+   │
+27 │ ╭     fun fun_u128(): u128 {
+28 │ │         0
+29 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:36:5
+   │
+36 │ ╭     fun fun_u128_address(_a: u128) {
+37 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:48:5
+   │
+48 │ ╭     fun fun_u128_fixed(_a: u128) {
+49 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:44:5
+   │
+44 │ ╭     fun fun_u128_ufixed(_a: u128) {
+45 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:23:5
+   │
+23 │ ╭     fun fun_u64(_x:u64) {
+24 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:19:5
+   │
+19 │ ╭     fun fun_u8(_x:u8) {
+20 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:32:5
+   │
+32 │ ╭     fun fun_u8_bool(_b: u8) {
+33 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:61:5
+   │
+61 │ ╭     fun fun_vec_u128_bytes(_vec0: vector<u128>): u128 {
+62 │ │         2
+63 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:54:5
+   │
+54 │ ╭     fun fun_vec_u128_str(_vec0: vector<u128>): u128 {
+55 │ │         2
+56 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:68:5
+   │
+68 │ ╭     fun fun_vec_u64(_vec0: vector<u64>): u128 {
+69 │ │         2
+70 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:82:5
+   │
+82 │ ╭     fun fun_vec_u64_int72_dynamic(_vec0: vector<u64>): u128 {
+83 │ │         2
+84 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:75:5
+   │
+75 │ ╭     fun fun_vec_u64_int72_static(_vec0: vector<u64>): u128 {
+76 │ │         2
+77 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+   ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:12:5
+   │
+12 │ ╭     fun len_ret_diff(): u128 {
+13 │ │         0
+14 │ │     }
+   │ ╰─────^
+
+error: solidity signature is not compatible with the move signature
+  ┌─ tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move:7:5
+  │
+7 │ ╭     fun len_typ_diff(x: u64): u64 {
+8 │ │         x
+9 │ │     }
+  │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move
new file mode 100644
index 000000000..87c1573c0
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-dispatcher/signature-parsing-test/baseline/parsing_failure/IncompatibileType.move
@@ -0,0 +1,87 @@
+#[evm_contract]
+module 0x2::M {
+
+    // Length difference
+
+    #[callable(sig=b"f() returns ()")]
+    fun len_typ_diff(x: u64): u64 {
+        x
+    }
+
+    #[callable(sig=b"f() returns ()")]
+    fun len_ret_diff(): u128 {
+        0
+    }
+
+    // Primitive types
+
+    #[callable(sig=b"f(int16)")]
+    fun fun_u8(_x:u8) {
+    }
+
+    #[callable(sig=b"f(uint72)")]
+    fun fun_u64(_x:u64) {
+    }
+
+    #[callable(sig=b"f() returns (int248)")]
+    fun fun_u128(): u128 {
+        0
+    }
+
+    #[callable(sig=b"f(bool)")]
+    fun fun_u8_bool(_b: u8) {
+    }
+
+    #[callable(sig=b"f(address)")]
+    fun fun_u128_address(_a: u128) {
+    }
+
+    #[callable(sig=b"f(uint160)")]
+    fun fun_address_u160(_a: address) {
+    }
+
+    #[callable(sig=b"f(ufixed)")]
+    fun fun_u128_ufixed(_a: u128) {
+    }
+
+    #[callable(sig=b"f(fixed128x18)")]
+    fun fun_u128_fixed(_a: u128) {
+    }
+
+    // string
+
+    #[callable(sig=b"f(string) returns (uint64)")]
+    fun fun_vec_u128_str(_vec0: vector<u128>): u128 {
+        2
+    }
+
+    // Dynamic bytes
+
+    #[callable(sig=b"f(bytes) returns (uint64)")]
+    fun fun_vec_u128_bytes(_vec0: vector<u128>): u128 {
+        2
+    }
+
+    // Static bytes
+
+    #[callable(sig=b"f(bytes32) returns (uint64)")]
+    fun fun_vec_u64(_vec0: vector<u64>): u128 {
+        2
+    }
+
+    // Static array
+
+    #[callable(sig=b"f(int72[5]) returns (uint64)")]
+    fun fun_vec_u64_int72_static(_vec0: vector<u64>): u128 {
+        2
+    }
+
+    // Dynamic array
+
+    #[callable(sig=b"f(int72[]) returns (uint64)")]
+    fun fun_vec_u64_int72_dynamic(_vec0: vector<u64>): u128 {
+        2
+    }
+
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.exp b/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.exp
new file mode 100644
index 000000000..ab8e44370
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.exp
@@ -0,0 +1,967 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A2_M" {
+    code {
+        codecopy(0, dataoffset("A2_M_deployed"), datasize("A2_M_deployed"))
+        return(0, datasize("A2_M_deployed"))
+    }
+    object "A2_M_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x18e09622
+                {
+                    // do_event_1(uint8,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_event_1(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x72ef91b8
+                {
+                    // ev(uint8,address,uint16,bytes)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2, param_3 := abi_decode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_2(param_0, param_1, param_2, param_3)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x9b39a853
+                {
+                    // do_event_3(uint8,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_event_3(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x66325f65
+                {
+                    // ev(bytes1,bytes2,bytes32)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$bytes1_bytes2_bytes32$_$vec$u8$_vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_4(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2dd328e6
+                {
+                    // ev(bytes,string)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes_string$_$vec$u8$_vec$u8$$(4, calldatasize())
+                    A2_M_do_event_5(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x14b66c9c
+                {
+                    // ev(bytes,string,uint16[3])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$bytes_string_uint16_3_$_$vec$u8$_vec$u8$_vec$u64$$(4, calldatasize())
+                    A2_M_do_event_6(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x19b52855
+                {
+                    // ev(bytes[])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$bytes__$_$vec$vec$u8$$$(4, calldatasize())
+                    A2_M_do_event_7(param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8632c0cf
+                {
+                    // ev(bytes[],string[3])
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$bytes___string_3_$_$vec$vec$u8$$_vec$vec$u8$$$(4, calldatasize())
+                    A2_M_do_event_8(param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0xb5cfa220
+                {
+                    // do_transfer(address,address,uint256)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(4, calldatasize())
+                    A2_M_do_transfer(param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A2_M_do_event_1(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Event_1($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(65)
+                    $MemoryStoreU8(add($mem, 64), from)
+                    $MemoryStoreU256(add($mem, 0), to)
+                    $MemoryStoreU256(add($mem, 32), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_1>($t3)
+                A2_Evm_emit$A2_M_Event_1$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_2(v1, v2, v3, v4) {
+                let $t4
+                // $t4 := pack M::Event_2($t0, $t1, $t2, $t3)
+                {
+                    let $mem := $Malloc(73)
+                    $MemoryStoreU8(add($mem, 72), v1)
+                    $MemoryStoreU256(add($mem, 32), v2)
+                    $MemoryStoreU64(add($mem, 64), v3)
+                    $MemoryStoreU256(add($mem, 0), v4)
+                    $t4 := $mem
+                }
+                // Evm::emit<M::Event_2>($t4)
+                A2_Evm_emit$A2_M_Event_2$($t4)
+                // return ()
+            }
+
+            function A2_M_do_event_3(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Event_3($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(65)
+                    $MemoryStoreU8(add($mem, 64), from)
+                    $MemoryStoreU256(add($mem, 0), to)
+                    $MemoryStoreU256(add($mem, 32), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_3>($t3)
+                A2_Evm_emit$A2_M_Event_3$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_4(v1, v2, v3) {
+                let $t3
+                // $t3 := pack M::Event_4($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), v1)
+                    $MemoryStoreU256(add($mem, 32), v2)
+                    $MemoryStoreU256(add($mem, 64), v3)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_4>($t3)
+                A2_Evm_emit$A2_M_Event_4$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_5(bys, str) {
+                let $t2
+                // $t2 := pack M::Event_5($t0, $t1)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), str)
+                    $t2 := $mem
+                }
+                // Evm::emit<M::Event_5>($t2)
+                A2_Evm_emit$A2_M_Event_5$($t2)
+                // return ()
+            }
+
+            function A2_M_do_event_6(bys, str, uint16_array) {
+                let $t3
+                // $t3 := pack M::Event_6($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), str)
+                    $MemoryStoreU256(add($mem, 64), uint16_array)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Event_6>($t3)
+                A2_Evm_emit$A2_M_Event_6$($t3)
+                // return ()
+            }
+
+            function A2_M_do_event_7(bys) {
+                let $t1
+                // $t1 := pack M::Event_7($t0)
+                {
+                    let $mem := $Malloc(32)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $t1 := $mem
+                }
+                // Evm::emit<M::Event_7>($t1)
+                A2_Evm_emit$A2_M_Event_7$($t1)
+                // return ()
+            }
+
+            function A2_M_do_event_8(bys, strs) {
+                let $t2
+                // $t2 := pack M::Event_8($t0, $t1)
+                {
+                    let $mem := $Malloc(64)
+                    $MemoryStoreU256(add($mem, 0), bys)
+                    $MemoryStoreU256(add($mem, 32), strs)
+                    $t2 := $mem
+                }
+                // Evm::emit<M::Event_8>($t2)
+                A2_Evm_emit$A2_M_Event_8$($t2)
+                // return ()
+            }
+
+            function A2_M_do_transfer(from, to, amount) {
+                let $t3
+                // $t3 := pack M::Transfer($t0, $t1, $t2)
+                {
+                    let $mem := $Malloc(96)
+                    $MemoryStoreU256(add($mem, 0), from)
+                    $MemoryStoreU256(add($mem, 32), to)
+                    $MemoryStoreU256(add($mem, 64), amount)
+                    $t3 := $mem
+                }
+                // Evm::emit<M::Transfer>($t3)
+                A2_Evm_emit$A2_M_Transfer$($t3)
+                // return ()
+            }
+
+            function A2_Evm_emit$A2_M_Transfer$(e) {
+                let $t1 := 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU256(add(e, 64))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$($t5, $t2,$t3,$t4)
+                    log1($t5, sub($t6, $t5), $t1)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_8$(e) {
+                let $t1 := 0xc93e9a8cc20289a6f17bb089da7c4f35f1c7bed2d207c99c389aa67a29856919
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := packed_hashed__$string_3_$_$vec$vec$u8$$$($t3)
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$bytes__$_$vec$vec$u8$$$($t5, $t2)
+                    log2($t5, sub($t6, $t5), $t1,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_7$(e) {
+                let $t1 := 0xbf5527d30da2fb3f39b16da435128c62ee89ac7b8284997e9e437fa88bab6ad9
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes__$_$vec$vec$u8$$$($t2)
+                {
+                    let $t4 := mload(0)
+                    let $t5 := abi_encode_tuple__($t4)
+                    log2($t4, sub($t5, $t4), $t1,$t3)
+                    mstore(0, $t5)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_6$(e) {
+                let $t1 := 0x51d171607b25f521bb07d41cd58b450228834cf4490222c5a931dd370818d29a
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes$_$vec$u8$$($t2)
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                let $t5 := $MemoryLoadU256(add(e, 64))
+                let $t6 := packed_hashed__$uint16_3_$_$vec$u64$$($t5)
+                {
+                    let $t7 := mload(0)
+                    let $t8 := abi_encode_tuple_$string$_$vec$u8$$($t7, $t4)
+                    log3($t7, sub($t8, $t7), $t1,$t3,$t6)
+                    mstore(0, $t8)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_5$(e) {
+                let $t1 := 0x2b464a26b2d3d179ea7c25de12665c6f95f5a635036da98598ae01785f5eca98
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := packed_hashed__$bytes$_$vec$u8$$($t2)
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                let $t5 := packed_hashed__$string$_$vec$u8$$($t4)
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple__($t6)
+                    log3($t6, sub($t7, $t6), $t1,$t3,$t5)
+                    mstore(0, $t7)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_4$(e) {
+                let $t1 := 0x4e3a2adb61a9a9a7807dfd78dc9a15809d318764f94b823392c0bc010a29453a
+                let $t2 := $MemoryLoadU256(add(e, 0))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU256(add(e, 64))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple__($t5)
+                    log4($t5, sub($t6, $t5), $t1,$t2,$t3,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_3$(e) {
+                let $t1 := 0x46d7aa1d21879f4f2a9e4aaf35176d0ed1665d7aa48ac5221d218547d905f238
+                let $t2 := $MemoryLoadU8(add(e, 64))
+                let $t3 := $MemoryLoadU256(add(e, 0))
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$address$_$address$($t5, $t3)
+                    log3($t5, sub($t6, $t5), $t1,$t2,$t4)
+                    mstore(0, $t6)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_2$(e) {
+                let $t1 := 0xdf4ad6039dcb9f423721e54cfde43c41a053fb271f037bdb96aef91dbe2ef532
+                let $t2 := $MemoryLoadU8(add(e, 72))
+                let $t3 := $MemoryLoadU256(add(e, 32))
+                let $t4 := $MemoryLoadU64(add(e, 64))
+                let $t5 := $MemoryLoadU256(add(e, 0))
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$($t6, $t2,$t3,$t4,$t5)
+                    log1($t6, sub($t7, $t6), $t1)
+                    mstore(0, $t7)
+                }
+            }
+            function A2_Evm_emit$A2_M_Event_1$(e) {
+                let $t1 := 0x46d7aa1d21879f4f2a9e4aaf35176d0ed1665d7aa48ac5221d218547d905f238
+                let $t2 := $MemoryLoadU8(add(e, 64))
+                let $t3 := $MemoryLoadU256(add(e, 0))
+                let $t4 := $MemoryLoadU256(add(e, 32))
+                {
+                    let $t5 := mload(0)
+                    let $t6 := abi_encode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$($t5, $t2,$t3,$t4)
+                    log1($t5, sub($t6, $t5), $t1)
+                    mstore(0, $t6)
+                }
+            }
+            function abi_encode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+            }
+            function abi_encode_uint256(value, pos) {
+                mstore(pos, cleanup_uint256(value))
+            }
+            function cleanup_uint256(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_uint8(value, pos) {
+                mstore(pos, cleanup_uint8(value))
+            }
+            function cleanup_uint8(value) -> cleaned {
+                cleaned := and(value, 0xff)
+            }
+            function abi_encode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(headStart ,value_0, value_1, value_2, value_3) -> tail {
+                tail := add(headStart, 128)
+                abi_encode_uint8(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint16(value_2, add(headStart, 64))
+                mstore(add(headStart, 96), sub(tail, headStart))
+                tail := abi_encode_bytes(value_3,  tail)
+            }
+            function abi_encode_bytes(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_uint16(value, pos) {
+                mstore(pos, cleanup_uint16(value))
+            }
+            function cleanup_uint16(value) -> cleaned {
+                cleaned := and(value, 0xffff)
+            }
+            function abi_encode_tuple_$address$_$address$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                abi_encode_address(value_0, add(headStart, 0))
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function packed_hashed__$string$_$vec$u8$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$string$_$vec$u8$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$string$_$vec$u8$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_string_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_string_not_padded_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                end := add(pos, size)
+            }
+            function packed_hashed__$bytes$_$vec$u8$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$bytes$_$vec$u8$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$bytes$_$vec$u8$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_bytes_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_bytes_not_padded_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$string$_$vec$u8$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_string(value_0,  tail)
+            }
+            function abi_encode_string(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                mstore(pos, size)
+                pos := add(pos, 0x20)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function packed_hashed__$uint16_3_$_$vec$u64$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$uint16_3_$_$vec$u64$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$uint16_3_$_$vec$u64$$_not_padded_inplace(pos ,value_0) -> end {
+                abi_encode_uint16_3__vec$u64$_not_padded_inplace(value_0,  pos)
+                pos := add(pos, 96)
+                end := pos
+            }
+            function abi_encode_uint16_3__vec$u64$_not_padded_inplace(value, pos)  {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 8))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 8) }
+                {
+                    let v := $MemoryLoadU64(src)
+                    pos := abi_encode_uint16_with_updated_pos(v, pos)
+                }
+            }
+            function abi_encode_uint16_with_updated_pos(value, pos) -> updated_pos{
+                abi_encode_uint16(value, pos)
+                updated_pos := add(pos, 32)
+            }
+            function packed_hashed__$bytes__$_$vec$vec$u8$$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$bytes__$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$bytes__$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_bytes___vec$vec$u8$$_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_bytes___vec$vec$u8$$_not_padded_inplace(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_bytes_inplace_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_bytes_inplace_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_bytes_inplace(value, pos)
+            }
+            function abi_encode_bytes_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$bytes__$_$vec$vec$u8$$$(headStart ,value_0) -> tail {
+                tail := add(headStart, 32)
+                mstore(add(headStart, 0), sub(tail, headStart))
+                tail := abi_encode_bytes___vec$vec$u8$$(value_0,  tail)
+            }
+            function abi_encode_bytes___vec$vec$u8$$(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                mstore(pos, length)
+                pos := add(pos, 0x20)
+                let headStart := pos
+                let tail := add(pos, mul(length, 0x20))
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    mstore(pos, sub(tail, headStart))
+                    let v := $MemoryLoadU256(src)
+                    tail := abi_encode_bytes_with_updated_pos(v, tail)
+                    pos := add(pos, 0x20)
+                }
+                pos := tail
+                end := pos
+            }
+            function abi_encode_bytes_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_bytes(value, pos)
+            }
+            function packed_hashed__$string_3_$_$vec$vec$u8$$$(value_0) -> hash {
+                let pos := mload(0)
+                let end := abi_encode_tuple_packed_$string_3_$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0)
+                mstore(0, end)
+                hash := keccak256(pos, sub(end, pos))
+            }
+            function abi_encode_tuple_packed_$string_3_$_$vec$vec$u8$$$_not_padded_inplace(pos ,value_0) -> end {
+                pos := abi_encode_string_3__vec$vec$u8$$_not_padded_inplace(value_0,  pos)
+                end := pos
+            }
+            function abi_encode_string_3__vec$vec$u8$$_not_padded_inplace(value, pos) -> end {
+                let length := $MemoryLoadU64(value)
+                if iszero(eq(length, 3)) { $Abort(92) }
+                let start := add(value, 32)
+                let srcEnd := add(start, mul(length, 32))
+                for { let src := start } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let v := $MemoryLoadU256(src)
+                    pos := abi_encode_string_inplace_with_updated_pos(v, pos)
+                }
+                end := pos
+            }
+            function abi_encode_string_inplace_with_updated_pos(value, pos) -> updated_pos{
+                updated_pos := abi_encode_string_inplace(value, pos)
+            }
+            function abi_encode_string_inplace(value, pos) -> end{
+                let size := $MemoryLoadU64(value)
+                $CopyMemory(add(value, 0x20), pos, size)
+                size := $RoundUp(size)
+                end := add(pos, size)
+            }
+            function abi_encode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_address(value_1, add(headStart, 32))
+                abi_encode_uint256(value_2, add(headStart, 64))
+            }
+            function abi_decode_tuple_$address_address_uint256$_$address_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint256(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint256(value)
+            }
+            function validator_uint256(value) {
+                if iszero(eq(value, cleanup_uint256(value))) { $Abort(95) }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$bytes___string_3_$_$vec$vec$u8$$_vec$vec$u8$$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes___vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_3__vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_string_3__vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 128
+                array := abi_decode_available_length__string_3__vec$vec$u8$$(offset, length, size, end)
+            }
+            function abi_decode_available_length__string_3__vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_string_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_string_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__string(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__string(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes___vec$vec$u8$$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(32, length), 32)
+                array := abi_decode_available_length__bytes___vec$vec$u8$$(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes___vec$vec$u8$$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let innerOffset := calldataload(src)
+                    if gt(innerOffset, 0xffffffffffffffff) { $Abort(94) }
+                    let elementPos := add(offset, innerOffset)
+                    let value := abi_decode_bytes_vec$u8$(elementPos, end)
+                    $MemoryStoreU256(dst, value)
+                    dst := add(dst, 32)
+                }
+            }
+            function abi_decode_bytes_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := calldataload(offset)
+                let size := add(mul(1, length), 32)
+                array := abi_decode_available_length__bytes(add(offset, 0x20), length, size, end)
+            }
+            function abi_decode_available_length__bytes(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$bytes__$_$vec$vec$u8$$$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes___vec$vec$u8$$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$bytes_string_uint16_3_$_$vec$u8$_vec$u8$_vec$u64$$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 160) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint16_3__vec$u64$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint16_3__vec$u64$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 3
+                let size := 56
+                array := abi_decode_available_length__uint16_3__vec$u64$(offset, length, size, end)
+            }
+            function abi_decode_available_length__uint16_3__vec$u64$(offset, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                let srcEnd := add(offset, mul(length, 32))
+                if gt(srcEnd, end) { $Abort(94) }
+                for { let src := offset } lt(src, srcEnd) { src := add(src, 32) }
+                {
+                    let elementPos := src
+                    let value := abi_decode_uint16(elementPos, end)
+                    $MemoryStoreU64(dst, value)
+                    dst := add(dst, 8)
+                }
+            }
+            function abi_decode_uint16(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint16(value)
+            }
+            function validator_uint16(value) {
+                if iszero(eq(value, cleanup_uint16(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$bytes_string$_$vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := calldataload(add(headStart, 0))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_0 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 32))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_1 := abi_decode_string_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_tuple_$bytes1_bytes2_bytes32$_$vec$u8$_vec$u8$_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_bytes1_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_bytes2_vec$u8$(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_bytes32_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_bytes32_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 32
+                let size := 64
+                array := abi_decode_available_length__bytes32(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes32(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes2_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 2
+                let size := 34
+                array := abi_decode_available_length__bytes2(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes2(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_bytes1_vec$u8$(offset, end) -> array {
+                if iszero(slt(add(offset, 0x1f), end)) { $Abort(94) }
+                let length := 1
+                let size := 33
+                array := abi_decode_available_length__bytes1(offset, length, size, end)
+            }
+            function abi_decode_available_length__bytes1(src, length, size, end) -> array {
+                array := $Malloc($CheckMemorySize(size))
+                $MemoryStoreU64(array, length)
+                $MemoryStoreU64(add(array, 8), $ClosestGreaterPowerOfTwo(length))
+                let dst := add(array, 32)
+                if gt(add(src, sub(size, 32)), end) { $Abort(93) }
+                $CopyFromCallDataToMemory(src, dst, length)
+            }
+            function abi_decode_tuple_$uint8_address_uint256$_$u8_address_A2_U256_U256$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint256(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint8(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint8(value)
+            }
+            function validator_uint8(value) {
+                if iszero(eq(value, cleanup_uint8(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint8_address_uint16_bytes$_$u8_address_u64_vec$u8$$(headStart, dataEnd) -> value_0, value_1, value_2, value_3 {
+                if slt(sub(dataEnd, headStart), 128) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint8(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint16(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := calldataload(add(headStart, 96))
+                    if gt(offset, 0xffffffffffffffff) { $Abort(96) }
+                    value_3 := abi_decode_bytes_vec$u8$(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $MemoryLoadU8(offs) -> val {
+              val := $MemoryLoadBytes(offs, 1)
+            }
+            function $MemoryStoreU8(offs, val) {
+              // Shortcut via special instruction
+              mstore8(offs, val)
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $CheckMemorySize(len) -> checked_len {
+                if gt(len, 0xffffffffffffffff) { $AbortBuiltin() }
+                checked_len := len
+            }
+            function $CopyFromCallDataToMemory(src, dst, length) {
+                calldatacopy(dst, src, length)
+                mstore(add(dst, length), 0)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $ClosestGreaterPowerOfTwo(x) -> r {
+                r := or(r, shr(1, x))
+                r := or(r, shr(2, r))
+                r := or(r, shr(4, r))
+                r := or(r, shr(8, r))
+                r := or(r, shr(16, r))
+                r := or(r, shr(32, r))
+                r := add(x, 1)
+            }
+            function $RoundUp(value) -> result {
+                result := and(add(value, 31), not(31))
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.move b/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.move
new file mode 100644
index 000000000..4b4516f0d
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/CallEmit.move
@@ -0,0 +1,119 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::Evm::{emit};
+    use Evm::U256::U256;
+
+    // No topics
+
+
+    #[event(sig=b"Transfer(address,address,uint256)")]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[callable]
+    fun do_transfer(from: address, to: address, amount: U256){
+        emit(Transfer{from, to, value: amount});
+    }
+
+
+    #[event(sig=b"Event(uint8,address,uint256)")]
+    struct Event_1 {
+        from: u8,
+        to: address,
+        value: U256,
+    }
+
+    #[callable]
+    fun do_event_1(from: u8, to: address, amount: U256){
+        emit(Event_1{from, to, value: amount});
+    }
+
+
+    #[event(sig=b"Event(uint8,address,uint16,bytes)")]
+    struct Event_2 {
+        v1: u8,
+        v2: address,
+        v3: u64,
+        v4: vector<u8>
+    }
+
+    #[callable(sig=b"ev(uint8,address,uint16,bytes)")]
+    fun do_event_2(v1: u8, v2: address, v3: u64, v4: vector<u8>){
+        emit(Event_2{v1, v2, v3, v4});
+    }
+
+    // Topics with value type
+
+    #[event(sig=b"Event(uint8 indexed,address,uint256 indexed)")]
+    struct Event_3 {
+        from: u8,
+        to: address,
+        value: U256,
+    }
+
+    #[callable]
+    fun do_event_3(from: u8, to: address, amount: U256){
+        emit(Event_3{from, to, value: amount});
+    }
+
+    #[event(sig=b"Event(bytes1 indexed,bytes2 indexed,bytes32 indexed)")]
+    struct Event_4 {
+        v1: vector<u8>,
+        v2: vector<u8>,
+        v3: vector<u8>,
+    }
+
+    #[callable(sig=b"ev(bytes1,bytes2,bytes32)")]
+    fun do_event_4(v1: vector<u8>, v2: vector<u8>, v3: vector<u8>){
+        emit(Event_4{v1, v2, v3});
+    }
+
+    // Topics with non-value type
+
+    #[event(sig=b"Event(bytes indexed, string indexed)")]
+    struct Event_5 {
+        bys: vector<u8>,
+        str: vector<u8>
+    }
+
+    #[callable(sig=b"ev(bytes, string)")]
+    fun do_event_5(bys: vector<u8>, str: vector<u8>){
+        emit(Event_5{bys, str});
+    }
+
+    #[event(sig=b"Event(bytes indexed, string, uint16[3] indexed)")]
+    struct Event_6 {
+        bys: vector<u8>,
+        str: vector<u8>,
+        uint16_array: vector<u64>
+    }
+
+    #[callable(sig=b"ev(bytes , string , uint16[3] )")]
+    fun do_event_6(bys: vector<u8>, str: vector<u8>, uint16_array: vector<u64>){
+        emit(Event_6{bys, str, uint16_array});
+    }
+
+    #[event(sig=b"Event(bytes[] indexed)")]
+    struct Event_7 {
+        bys: vector<vector<u8>>,
+    }
+
+    #[callable(sig=b"ev(bytes[])")]
+    fun do_event_7(bys: vector<vector<u8>>){
+        emit(Event_7{bys});
+    }
+
+    #[event(sig=b"Event(bytes[], string[3] indexed)")]
+    struct Event_8 {
+        bys: vector<vector<u8>>,
+        strs: vector<vector<u8>>
+    }
+
+    #[callable(sig=b"ev(bytes[], string[3])")]
+    fun do_event_8(bys: vector<vector<u8>>, strs: vector<vector<u8>>){
+        emit(Event_8{bys, strs});
+    }
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.exp b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.exp
new file mode 100644
index 000000000..c4d915b10
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.exp
@@ -0,0 +1,32 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:6:5
+   │
+ 6 │ ╭     struct Transfer_Err_1 {
+ 7 │ │         from: address,
+ 8 │ │         to: address,
+ 9 │ │         value: U256,
+10 │ │     }
+   │ ╰─────^
+
+error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:13:5
+   │
+13 │ ╭     struct Transfer_Err_2 {
+14 │ │         from: address,
+15 │ │         to: address,
+16 │ │         value: U256,
+17 │ │     }
+   │ ╰─────^
+
+error: event signature is not compatible with the move struct
+   ┌─ tests/test-events/compilation_failure/EventSigCompatibilityFailure.move:20:5
+   │
+20 │ ╭     struct Transfer_Err_3 {
+21 │ │         from: address,
+22 │ │         to: address,
+23 │ │         value: U256,
+24 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.move b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.move
new file mode 100644
index 000000000..2e1e749f9
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventSigCompatibilityFailure.move
@@ -0,0 +1,26 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::U256::U256;
+
+    #[event(sig=b"Transfer(address,uint256)")]
+    struct Transfer_Err_1 {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Transfer(address, address,uint256,uint256)")]
+    struct Transfer_Err_2 {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Transfer(address, address,bytes)")]
+    struct Transfer_Err_3 {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.exp b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.exp
new file mode 100644
index 000000000..fa4e65699
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.exp
@@ -0,0 +1,13 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: too many indexed arguments
+   ┌─ tests/test-events/compilation_failure/EventTooManyTopics.move:5:5
+   │
+ 5 │ ╭     struct Transfer_Err_1 {
+ 6 │ │         from: address,
+ 7 │ │         to: address,
+ 8 │ │         v1: u128,
+ 9 │ │         v2: u128
+10 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.move b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.move
new file mode 100644
index 000000000..69e6c41f3
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/EventTooManyTopics.move
@@ -0,0 +1,12 @@
+#[evm_contract]
+module 0x2::M {
+
+#[event(sig=b"Transfer(address indexed,address indexed, uint128 indexed, uint128 indexed)")]
+    struct Transfer_Err_1 {
+        from: address,
+        to: address,
+        v1: u128,
+        v2: u128
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.exp b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.exp
new file mode 100644
index 000000000..b6fd92975
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.exp
@@ -0,0 +1,32 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:13:5
+   │
+13 │ ╭     struct Approval_Err_1 {
+14 │ │         owner: address,
+15 │ │         spender: address,
+16 │ │         value: U256,
+17 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:20:5
+   │
+20 │ ╭     struct Approval_Err_2 {
+21 │ │         owner: address,
+22 │ │         spender: address,
+23 │ │         value: U256,
+24 │ │     }
+   │ ╰─────^
+
+error: error happens when parsing the signature
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailure.move:6:5
+   │
+ 6 │ ╭     struct Transfer_Err {
+ 7 │ │         from: address,
+ 8 │ │         to: address,
+ 9 │ │         value: U256,
+10 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.move b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.move
new file mode 100644
index 000000000..d4ab77a66
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailure.move
@@ -0,0 +1,26 @@
+#[evm_contract]
+module 0x2::M {
+    use Evm::U256::U256;
+
+    #[event(sig=b"Transfer(address,address,uint256) returns (uint8)")]
+    struct Transfer_Err {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Approval(addressindexed ,address,uint256)")]
+    struct Approval_Err_1 {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+    #[event(sig=b"Approval(,address,uint256)")]
+    struct Approval_Err_2 {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.exp b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.exp
new file mode 100644
index 000000000..2dabfdcd9
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.exp
@@ -0,0 +1,11 @@
+
+
+!! Move-To-Yul Diagnostics:
+ error: #[event] structs cannot be generic
+   ┌─ tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.move:21:5
+   │
+21 │ ╭     struct Bar<T1, T2>{
+22 │ │         x: T1,
+23 │ │         y: vector<T2>,
+24 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.move b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.move
new file mode 100644
index 000000000..57b766537
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/test-events/compilation_failure/ParsingEventSigFailureGeneric.move
@@ -0,0 +1,26 @@
+#[evm_contract]
+module 0x2::M {
+
+    use Evm::U256::U256;
+
+    #[event(sig=b"Transfer(address,address,uint256) returns (uint8)")]
+    struct Transfer {
+        from: address,
+        to: address,
+        value: U256,
+    }
+
+    #[event]
+    struct Approval {
+        owner: address,
+        spender: address,
+        value: U256,
+    }
+
+    #[event]
+    struct Bar<T1, T2>{
+        x: T1,
+        y: vector<T2>,
+    }
+
+}
diff --git a/vendors/move/crates/evm/move-to-yul/tests/testsuite.rs b/vendors/move/crates/evm/move-to-yul/tests/testsuite.rs
new file mode 100644
index 000000000..f782f0915
--- /dev/null
+++ b/vendors/move/crates/evm/move-to-yul/tests/testsuite.rs
@@ -0,0 +1,166 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Context;
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use evm::backend::MemoryVicinity;
+use evm_exec_utils::{compile, exec::Executor, tracing};
+use move_command_line_common::testing::EXP_EXT;
+use move_compiler::shared::{NumericalAddress, PackagePaths};
+use move_model::{
+    model::{FunId, GlobalEnv, QualifiedId},
+    options::ModelBuilderOptions,
+    run_model_builder_with_options_and_compilation_flags,
+};
+use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
+use move_stdlib::move_stdlib_named_addresses;
+use move_to_yul::{generator::Generator, options::Options};
+use primitive_types::{H160, U256};
+use std::{
+    collections::BTreeMap,
+    fmt::Write,
+    path::{Path, PathBuf},
+};
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let experiments = extract_test_directives(path, "// experiment:")?;
+
+    let mut sources = extract_test_directives(path, "// dep:")?;
+    sources.push(path.to_string_lossy().to_string());
+    let deps = vec![
+        path_from_crate_root("../stdlib/sources"),
+        path_from_crate_root("../../move-stdlib/sources"),
+        path_from_crate_root("../../extensions/async/move-async-lib/sources"),
+    ];
+    let mut named_address_map = move_stdlib_named_addresses();
+    named_address_map.insert(
+        "std".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
+    named_address_map.insert(
+        "Evm".to_string(),
+        NumericalAddress::parse_str("0x2").unwrap(),
+    );
+    named_address_map.insert(
+        "Async".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
+    let env = run_model_builder_with_options_and_compilation_flags(
+        vec![PackagePaths {
+            name: None,
+            paths: sources,
+            named_address_map: named_address_map.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: deps,
+            named_address_map,
+        }],
+        ModelBuilderOptions::default(),
+        move_compiler::Flags::empty()
+            .set_sources_shadow_deps(true)
+            .set_flavor("async"),
+    )?;
+    for exp in std::iter::once(String::new()).chain(experiments.into_iter()) {
+        let mut options = Options {
+            testing: true,
+            ..Options::default()
+        };
+        let ext = if exp.is_empty() {
+            EXP_EXT.to_string()
+        } else {
+            options.experiments.push(exp.clone());
+            format!("{}.{}", EXP_EXT, exp)
+        };
+        let mut contracts = Generator::run(&options, &env);
+        let mut out = "".to_string();
+        if !env.has_errors() {
+            out = out + &contracts.pop().expect("contract").1;
+            out = format!("{}\n\n{}", out, compile_check(&options, &out));
+
+            // Also generate any tests and run them.
+            let test_cases = Generator::run_for_evm_tests(&options, &env);
+            if !test_cases.is_empty() && !env.has_errors() {
+                out = format!("{}\n\n{}", out, run_tests(&env, &test_cases)?)
+            }
+        }
+        let mut error_writer = Buffer::no_color();
+        env.report_diag(&mut error_writer, Severity::Help);
+        let diag = String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+        if !diag.is_empty() {
+            out = format!("{}\n\n!! Move-To-Yul Diagnostics:\n {}", out, diag);
+        }
+        let baseline_path = path.with_extension(ext);
+        verify_or_update_baseline(baseline_path.as_path(), &out)?;
+    }
+    Ok(())
+}
+
+fn path_from_crate_root(path: &str) -> String {
+    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    buf.push(path);
+    buf.to_string_lossy().to_string()
+}
+
+fn compile_check(_options: &Options, source: &str) -> String {
+    match compile::solc_yul(source, false) {
+        Ok(_) => "!! Succeeded compiling Yul\n".to_string(),
+        Err(msg) => format!("!! Errors compiling Yul\n\n{}", msg),
+    }
+}
+
+fn run_tests(
+    env: &GlobalEnv,
+    test_cases: &BTreeMap<QualifiedId<FunId>, String>,
+) -> anyhow::Result<String> {
+    let mut res = String::new();
+    res.push_str("!! Unit tests\n\n");
+    for (fun, source) in test_cases {
+        writeln!(
+            &mut res,
+            "// test of {}",
+            env.get_function(*fun).get_full_name_str()
+        )
+        .unwrap();
+        res.push_str(source);
+        writeln!(
+            &mut res,
+            "===> Test result of {}: {}\n",
+            env.get_function(*fun).get_full_name_str(),
+            execute_test(env, source)?
+        )?;
+    }
+    Ok(res)
+}
+
+fn execute_test(_env: &GlobalEnv, source: &str) -> anyhow::Result<String> {
+    // Compile source
+    let (code, _) =
+        compile::solc_yul(source, false).with_context(|| format!("Yul source:\n {}", source))?;
+
+    // Create executor.
+    let vicinity = MemoryVicinity {
+        gas_price: 0.into(),
+        origin: H160::zero(),
+        chain_id: 0.into(),
+        block_hashes: vec![],
+        block_number: 0.into(),
+        block_coinbase: H160::zero(),
+        block_timestamp: 0.into(),
+        block_difficulty: 0.into(),
+        block_gas_limit: U256::MAX,
+        block_base_fee_per_gas: 0.into(),
+    };
+    let mut exec = Executor::new(&vicinity);
+    let res = if std::env::var("EVM_STEP_LISTENER").is_ok() {
+        tracing::trace_runtime(|| {
+            exec.execute_custom_code(H160::zero(), H160::zero(), code, vec![])
+        })
+    } else {
+        exec.execute_custom_code(H160::zero(), H160::zero(), code, vec![])
+    };
+    Ok(res.to_string())
+}
+
+datatest_stable::harness!(test_runner, "tests", r".*\.move$");
diff --git a/vendors/move/crates/evm/stdlib/Move.toml b/vendors/move/crates/evm/stdlib/Move.toml
new file mode 100644
index 000000000..ef18e3f98
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "EvmStdlib"
+version = "1.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+
+[dependencies]
+MoveStdlib = { local = "../../move-stdlib" }
+MoveNursery = { local = "../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/evm/stdlib/README.md b/vendors/move/crates/evm/stdlib/README.md
new file mode 100644
index 000000000..aa7d53d0c
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/README.md
@@ -0,0 +1,8 @@
+# Standard Library for Move-On-EVM
+
+This directory contains the standard library files for Move-On-EVM.
+
+- [Evm.move](./sources/Evm.move) provides access to EVM functionality, including information about the executing transaction.
+- [U256.move](./sources/U256.move) defines the 256-bit unsigned integer type.
+- [Table.move](./sources/Table.move) defines the `Table` type on Move-On-EVM, which corresponds to the map type in Solidity.
+- [ExternalResult.move](./sources/ExternalResult.move) defines the result type to wrap the return value of external function calls.
diff --git a/vendors/move/crates/evm/stdlib/sources/Evm.move b/vendors/move/crates/evm/stdlib/sources/Evm.move
new file mode 100644
index 000000000..6474d27be
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/sources/Evm.move
@@ -0,0 +1,151 @@
+/// Module which provides access to EVM functionality, including information about the executing transaction.
+////
+/// This currently only represents a basic subset of what we may want to expose.
+module Evm::Evm {
+    use std::vector;
+    use Evm::U256::{Self, U256};
+
+    /// Returns the address of the executing contract.
+    public native fun self(): address;
+
+    /// An alias for `msg_sender`.
+    public fun sender(): address {
+        msg_sender()
+    }
+
+    /// An alias for `msg_value`.
+    public fun value(): U256 {
+        msg_value()
+    }
+
+    /// Returns the balance, in Wei, of any account.
+    public native fun balance(addr: address): U256;
+
+    /// Transfers the given amount to the target account.
+    public native fun transfer(addr: address, amount: U256);
+
+    /// Emits an event. The type passed for `E` must be annotated with #[event].
+    public native fun emit<E>(e: E);
+
+    /// Creates a signer for the contract's address space.
+    public native fun sign(addr: address): signer;
+
+    /// Returns the keccak256 hash for the input `data`.
+    /// The length of the resulting vector should be 32.
+    public native fun keccak256(data: vector<u8>): vector<u8>;
+
+    /// Returns the first four bytes of `data`.
+    /// This is the equivalent to the type casting operation `bytes4` in Solidity.
+    public fun bytes4(data: vector<u8>): vector<u8> {
+        assert!(vector::length(&data) >= 4, 0);
+        let res = vector::empty<u8>();
+        vector::push_back(&mut res, *vector::borrow(&data, 0));
+        vector::push_back(&mut res, *vector::borrow(&data, 1));
+        vector::push_back(&mut res, *vector::borrow(&data, 2));
+        vector::push_back(&mut res, *vector::borrow(&data, 3));
+        res
+    }
+
+    /// Returns the result of (`v1` xor `v2`).
+    // TODO: implment this in Move.
+    public native fun bytes_xor(v1: vector<u8>, v2: vector<u8>): vector<u8>;
+
+    /// Returns true iff `addr` is a contract address.
+    // This can be implemented in Solidity as follows:
+    // ```
+    // uint32 size;
+    // assembly {
+    //   size := extcodesize(_addr)
+    // }
+    // return (size > 0);
+    // ```
+    public fun isContract(addr: address): bool {
+        U256::gt(extcodesize(addr), U256::zero())
+    }
+
+    /// Returns the size of the code at address `addr`.
+    public native fun extcodesize(addr: address): U256;
+
+    /// Define the unit (null or void) type.
+    struct Unit has drop {}
+
+    /// Get tokenURI with base URI.
+    // This is implemented in Solidity as follows:
+    //   bytes(baseURI).length > 0 ? string(abi.encodePacked(baseURI, tokenId.toString())) : "";\
+    // TODO: this probably belongs in ERC721.move?
+    public fun tokenURI_with_baseURI(baseURI: vector<u8>, tokenId: U256): vector<u8> {
+        if (vector::length(&baseURI) == 0) {
+            vector::empty()
+        } else {
+            concat(baseURI, to_string(tokenId))
+        }
+    }
+
+    /// Abort with an error message.
+    public native fun abort_with(message: vector<u8>);
+
+    /// If `cond` is false, it aborts with `message`.
+    public fun require(cond: bool, message: vector<u8>) {
+        if (!cond) { abort_with(message); }
+    }
+
+    // --------------------------------
+    // Block and Transaction Properties
+    // --------------------------------
+
+    /// Return the hash of the given block when blocknumber is one of the 256
+    /// most recent blocks; otherwise returns zero. The return value is 32 bytes.
+    public native fun blockhash(block_number: U256): vector<u8>;
+
+    /// Return the current block's base fee (EIP-3198 and EIP-1559).
+    public native fun block_basefee(): U256;
+
+    /// Return the current chain id.
+    public native fun block_chainid(): U256;
+
+    /// Return the current block miner's address.
+    public native fun block_coinbase(): address;
+
+    /// Return the current block difficulty.
+    public native fun block_difficulty(): U256;
+
+    /// Return the current block gaslimit.
+    public native fun block_gaslimit(): U256;
+
+    /// Return the current block number.
+    public native fun block_number(): U256;
+
+    /// Return the current block timestamp as seconds since unix epoch.
+    public native fun block_timestamp(): U256;
+
+    /// Return the remaining gas.
+    public native fun gasleft(): U256;
+
+    /// Return the complete calldata.
+    public native fun msg_data(): vector<u8>;
+
+    /// Return the sender of the message (current call).
+    public native fun msg_sender(): address;
+
+    /// Return the first four bytes of the calldata (i.e. function identifier).
+    public native fun msg_sig(): vector<u8>;
+
+    /// Return the number of wei sent with the message.
+    public native fun msg_value(): U256;
+
+    /// Return the gas price of the transaction.
+    public native fun tx_gasprice(): U256;
+
+    /// Return the sender of the transaction (full call chain).
+    public native fun tx_origin(): address;
+
+    // --------------------------------
+    // String Operations
+    // --------------------------------
+
+    /// Add s2 to the end of s1.
+    public native fun concat(s1: vector<u8>, s2: vector<u8>): vector<u8>;
+
+    /// Return the string representation of a U256.
+    public native fun to_string(x: U256): vector<u8>;
+}
diff --git a/vendors/move/crates/evm/stdlib/sources/ExternalResult.move b/vendors/move/crates/evm/stdlib/sources/ExternalResult.move
new file mode 100644
index 000000000..2163bf76d
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/sources/ExternalResult.move
@@ -0,0 +1,105 @@
+/// This module defines the ExternalResult type and its methods
+/// ExternalResult is used to receive the return value from an external call (https://docs.soliditylang.org/en/v0.8.13/control-structures.html?highlight=try#try-catch)
+module Evm::ExternalResult {
+    use std::option::{Self, Option};
+    use Evm::U256::U256;
+
+    /// This struct will contain either a value of type T or an error
+    /// value stores return value when the execution succeeds
+    /// err_reason stores the message as vector<u8> if the error was caused by revert("reasonString") or require(false, "reasonString")
+    /// panic_code stores the error code if the error was caused by a panic
+    /// err_data stores the error information as dynamic byte array (vector<u8>)
+    struct ExternalResult<T> has copy, drop, store {
+        value: Option<T>,
+        err_data: Option<vector<u8>>,
+        err_reason: Option<vector<u8>>,
+        panic_code: Option<U256>
+    }
+    spec ExternalResult {
+        /// `Result` cannot contain both a value and an error value.
+        invariant option::is_some(value) ==> (option::is_none(err_data) && option::is_none(err_reason) && option::is_none(panic_code));
+        invariant option::is_some(err_data) ==> (option::is_none(value) && option::is_none(err_reason) && option::is_none(panic_code));
+        invariant option::is_some(err_reason) ==> (option::is_none(value) && option::is_none(err_data) && option::is_none(panic_code));
+        invariant option::is_some(panic_code) ==> (option::is_none(value) && option::is_none(err_data) && option::is_none(err_reason));
+    }
+
+    /// Return a Result containing `value`.
+    public fun ok<T>(value: T): ExternalResult<T> {
+        ExternalResult<T>{value: option::some(value), err_data: option::none<vector<u8>>(), err_reason: option::none<vector<u8>>(),
+        panic_code: option::none<U256>()}
+    }
+
+    /// Return a Result containing `err_data`.
+    public fun err_data<T>(error: vector<u8>): ExternalResult<T> {
+        ExternalResult<T>{value: option::none<T>(), err_data: option::some(error), err_reason: option::none<vector<u8>>(),
+        panic_code: option::none<U256>()}
+    }
+
+    /// Return a Result containing `err_reason`.
+    public fun err_reason<T>(error: vector<u8>): ExternalResult<T> {
+        ExternalResult<T>{value: option::none<T>(), err_reason: option::some(error), err_data: option::none<vector<u8>>(),
+        panic_code: option::none<U256>()}
+    }
+
+    /// Return a Result containing `panic_code`.
+    public fun panic<T>(panic_code: U256): ExternalResult<T> {
+        ExternalResult<T>{value: option::none<T>(), err_reason: option::none<vector<u8>>(), err_data: option::none<vector<u8>>(),
+        panic_code: option::some(panic_code)}
+    }
+
+    /// Return true if `result` holds a value.
+    public fun is_ok<T>(result: &ExternalResult<T>): bool {
+        option::is_some(&result.value)
+    }
+
+    /// Return true if `result` holds an err_data.
+    public fun is_err_data<T>(result: &ExternalResult<T>): bool {
+        option::is_some(&result.err_data)
+    }
+
+    /// Return true if `result` holds an err_reason.
+    public fun is_err_reason<T>(result: &ExternalResult<T>): bool {
+        option::is_some(&result.err_reason)
+    }
+
+    /// Return true if `result` holds a panic_code.
+    public fun is_panic<T>(result: &ExternalResult<T>): bool {
+        option::is_some(&result.panic_code)
+    }
+
+    /// Destroy `result` and extract `value`.
+    public fun unwrap<T>(result: ExternalResult<T>): T {
+        let ExternalResult {value, err_data, err_reason, panic_code} = result;
+        option::destroy_none(err_data);
+        option::destroy_none(err_reason);
+        option::destroy_none(panic_code);
+        option::destroy_some(value)
+    }
+
+    /// Destroy `result` and extract `err_data`.
+    public fun unwrap_err_data<T>(result: ExternalResult<T>): vector<u8> {
+        let ExternalResult {value, err_data, err_reason, panic_code} = result;
+        option::destroy_none(value);
+        option::destroy_none(err_reason);
+        option::destroy_none(panic_code);
+        option::destroy_some(err_data)
+    }
+
+    /// Destroy `result` and extract `err_reason`.
+    public fun unwrap_err_reason<T>(result: ExternalResult<T>): vector<u8> {
+        let ExternalResult {value, err_data, err_reason, panic_code} = result;
+        option::destroy_none(value);
+        option::destroy_none(err_data);
+        option::destroy_none(panic_code);
+        option::destroy_some(err_reason)
+    }
+
+    /// Destroy `result` and extract `panic_code`.
+    public fun unwrap_panic<T>(result: ExternalResult<T>): U256 {
+        let ExternalResult {value, err_data, err_reason, panic_code} = result;
+        option::destroy_none(value);
+        option::destroy_none(err_reason);
+        option::destroy_none(err_data);
+        option::destroy_some(panic_code)
+    }
+}
diff --git a/vendors/move/crates/evm/stdlib/sources/Result.move b/vendors/move/crates/evm/stdlib/sources/Result.move
new file mode 100644
index 000000000..955de06e5
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/sources/Result.move
@@ -0,0 +1,49 @@
+/// This module defines the Result type and its methods.
+module Evm::Result {
+    use std::option::{Self, Option};
+
+    /// This struct will contain either a value of type T or an error value of type E.
+    struct Result<T, E> has copy, drop, store {
+        value: Option<T>,
+        error: Option<E>
+    }
+    spec Result {
+        /// `Result` cannot contain both a value and an error value.
+        invariant option::is_some(value) ==> option::is_none(error);
+        invariant option::is_some(error) ==> option::is_none(value);
+    }
+
+    /// Return a Result containing `value`.
+    public fun ok<T, E>(value: T): Result<T, E> {
+        Result<T, E>{value: option::some(value), error: option::none<E>()}
+    }
+
+    /// Return a Result containing 'error'.
+    public fun err<T, E>(error: E): Result<T, E> {
+        Result<T, E>{value: option::none<T>(), error: option::some(error)}
+    }
+
+    /// Return true if `result` holds a value.
+    public fun is_ok<T, E>(result: &Result<T, E>): bool {
+        option::is_some(&result.value)
+    }
+
+    /// Return true if `result` holds an error value.
+    public fun is_err<T, E>(result: &Result<T, E>): bool {
+        option::is_some(&result.error)
+    }
+
+    /// Destroy `result` and extract `value`.
+    public fun unwrap<T, E>(result: Result<T, E>): T {
+        let Result {value, error} = result;
+        option::destroy_none(error);
+        option::destroy_some(value)
+    }
+
+    /// Destroy `result` and extract `error`.
+    public fun unwrap_err<T, E>(result: Result<T, E>): E {
+        let Result {value, error} = result;
+        option::destroy_none(value);
+        option::destroy_some(error)
+    }
+}
diff --git a/vendors/move/crates/evm/stdlib/sources/Table.move b/vendors/move/crates/evm/stdlib/sources/Table.move
new file mode 100644
index 000000000..7d172ddbd
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/sources/Table.move
@@ -0,0 +1,35 @@
+/// This module defines Table for EVM.
+module Evm::Table {
+    native struct Table<phantom K, phantom V> has store;
+
+    /// Create an empty Table.
+    native public fun empty<K, V>(): Table<K, V>;
+
+    /// Acquire an immutable reference to the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    native public fun borrow<K, V>(table: &Table<K, V>, key: &K): &V;
+
+    /// Acquire a mutable reference to the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    native public fun borrow_mut<K, V>(table: &mut Table<K, V>, key: &K): &mut V;
+
+    /// Acquire a mutable reference to the value which `key` maps to.
+    /// Insert the pair (`key`, `default`) first if there is no entry for `key`.
+    public fun borrow_mut_with_default<K, V: drop>(table: &mut Table<K, V>, key: &K, default_value: V): &mut V {
+        if (!contains(table, key)) {
+            insert(table, key, default_value)
+        };
+        borrow_mut(table, key)
+    }
+
+    /// Remove from `table` and return the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    native public fun remove<K, V>(table: &mut Table<K, V>, key: &K): V;
+
+    /// Returns true iff `table` contains an entry for `key`.
+    native public fun contains<K, V>(table: &Table<K, V>, key: &K): bool;
+
+    /// Insert the pair (`key`, `val`) to `table`.
+    /// Aborts if there is already an entry for `key`.
+    native public fun insert<K, V>(table: &mut Table<K, V>, key: &K, val: V);
+}
diff --git a/vendors/move/crates/evm/stdlib/sources/U256.move b/vendors/move/crates/evm/stdlib/sources/U256.move
new file mode 100644
index 000000000..744eeda43
--- /dev/null
+++ b/vendors/move/crates/evm/stdlib/sources/U256.move
@@ -0,0 +1,39 @@
+#[evm_arith]
+module Evm::U256 {
+    const MAX_U128: u128 = 340282366920938463463374607431768211455;
+
+    native struct U256 has copy, drop, store;
+    native public fun u256_from_words(hi: u128, lo: u128): U256;
+    native public fun add(x: U256, y: U256): U256;
+    native public fun sub(x: U256, y: U256): U256;
+    native public fun mul(x: U256, y: U256): U256;
+    native public fun div(x: U256, y: U256): U256;
+    native public fun mod(x: U256, y: U256): U256;
+    native public fun eq(x: U256, y: U256): bool;
+    native public fun ne(x: U256, y: U256): bool;
+    native public fun gt(x: U256, y: U256): bool;
+    native public fun lt(x: U256, y: U256): bool;
+    native public fun ge(x: U256, y: U256): bool;
+    native public fun le(x: U256, y: U256): bool;
+    native public fun shl(x: U256, y: u8): U256;
+    native public fun shr(x: U256, y: u8): U256;
+
+
+    public fun u256_from_u128(lo: u128): U256 {
+        u256_from_words(0, lo)
+    }
+
+    public fun zero(): U256 {
+        u256_from_words(0, 0)
+    }
+
+    public fun one(): U256 {
+        u256_from_words(0, 1)
+    }
+
+    public fun max(): U256 {
+        u256_from_words(MAX_U128, MAX_U128)
+    }
+
+    native public fun to_address(x: U256): address;
+}
diff --git a/vendors/move/crates/extensions/README.md b/vendors/move/crates/extensions/README.md
new file mode 100644
index 000000000..4d38db47a
--- /dev/null
+++ b/vendors/move/crates/extensions/README.md
@@ -0,0 +1,5 @@
+This tree contains extensions to the Move core language and runtime. Those extensions are not enabled by
+default but can be integrated into a Move-based environment following the instructions found for each individual
+extension.
+
+Some extensions may eventually become part of the core language after some period of stabilization.
diff --git a/vendors/move/crates/extensions/async/README.md b/vendors/move/crates/extensions/async/README.md
new file mode 100644
index 000000000..7d0669266
--- /dev/null
+++ b/vendors/move/crates/extensions/async/README.md
@@ -0,0 +1,4 @@
+**EXPERIMENTAL**
+
+This is an experimental implementation of an asynchronous flavor of Move. It is work in progress and maybe subject to
+arbitrary changes.
diff --git a/vendors/move/crates/extensions/async/examples/account/Move.toml b/vendors/move/crates/extensions/async/examples/account/Move.toml
new file mode 100644
index 000000000..7350644c0
--- /dev/null
+++ b/vendors/move/crates/extensions/async/examples/account/Move.toml
@@ -0,0 +1,15 @@
+[package]
+name = "AccountExample"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Async = "0x1"
+This = "0x3"
+
+[build]
+arch = "async"
+
+[dependencies]
+MoveAsyncLib = { local = "../../move-async-lib" }
+MoveStdlib = { local = "../../../move-stdlib" }
diff --git a/vendors/move/crates/extensions/async/examples/account/README.md b/vendors/move/crates/extensions/async/examples/account/README.md
new file mode 100644
index 000000000..c9e81bfaf
--- /dev/null
+++ b/vendors/move/crates/extensions/async/examples/account/README.md
@@ -0,0 +1,17 @@
+This package contains examples for programming patterns in Async Move (code name AMV). We use a simple
+account, where accounts live on different actors. One can deposit, withdraw, and transfer
+between those accounts. The transfer is the interesting operation because it requires a roundtrip
+communication between actors: only if deposit on end is successful, should the money be withdrawn
+on the other.
+
+Note that there is a conceptual bug in this solution: since multiple transfers can be initiated simultaneously,
+but the money is not withdrawn before one finishes, the account balance could get negative (similar as the
+reentrancy problem in Solidity). We chose to ignore this for the sake of illustrating the communication patterns.
+
+Note also that the solutions assume reliable messaging (exactly-once semantics).
+
+There are three versions of this example:
+
+- With continuations.
+- With futures.
+- With plain message passing and an explicit state machine.
diff --git a/vendors/move/crates/extensions/async/examples/account/sources/AccountContinuation.move b/vendors/move/crates/extensions/async/examples/account/sources/AccountContinuation.move
new file mode 100644
index 000000000..60afaa05d
--- /dev/null
+++ b/vendors/move/crates/extensions/async/examples/account/sources/AccountContinuation.move
@@ -0,0 +1,78 @@
+// NOTE: This example is just for illustration of one possible evolution of Async Move.
+// Nothing here is implemented.
+
+#[actor]
+/// This is an instance of the Account example using continuations.
+///
+/// In this model each function gets passed an (opaque) representation of a continuation with which to continue
+/// executing once it is done. We model the creation of continuations via attribute based code generation.
+/// (See end of the module.)
+module This::AccountContinuation {
+
+    use Async::Unit::Unit;
+    use Async::Cont::{Cont, done};
+
+    const MAX: u64 = 43;
+
+    #[state]
+    struct Account {
+        value: u64
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0}
+    }
+
+    #[rpc]
+    fun deposit(this: &mut Account, v: u64, cont: Cont<Unit>) {
+        this.value = this.value + v;
+        done(cont)
+    }
+
+    #[rpc]
+    fun withdraw(this: &mut Account, v: u64, cont: Cont<Unit>) {
+        this.value = this.value - v;
+        done(cont)
+    }
+
+    #[rpc]
+    fun xfer(this: &Account, dest: address, v: u64, cont: Cont<Unit>) {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        // Deposit on the other end, and only if this succeeds, withdraw here.
+        send_deposit(dest, v, cont_xfer_withdraw(v, cont))
+    }
+
+    #[cont]
+    fun xfer_withdraw(this: &mut Account, _previous: Unit, v: u64, cont: Cont<Unit>) {
+        withdraw(this, v, cont)
+    }
+
+    // ===============================================================
+    // The following native function definitions are automatically
+    // generated by a Move attribute preprocessor, and implemented
+    // automatically by the runtime environment.
+
+    #[_generated_send]
+    public native fun send_deposit(dest: address, v: u64, cont: Cont<Unit>);
+
+    #[_generated_cont]
+    native fun cont_xfer_withdraw(v: u64, cont: Cont<Unit>): Cont<Unit>;
+}
+
+/// Continuation support -- currently not in the Async library
+module Async::Cont {
+    use Async::Unit::{Unit, unit};
+
+    /// A type which represents a continuation.
+    native struct Cont<T> has drop;
+
+    /// Continues execution with the given continuation, passing in the result from the previous step.
+    public native fun next<T>(cont: Cont<T>, result: T);
+
+    /// Shortcut for `next(cont, unit())`
+    public fun done(cont: Cont<Unit>) {
+        next(cont, unit())
+    }
+}
diff --git a/vendors/move/crates/extensions/async/examples/account/sources/AccountFuture.move b/vendors/move/crates/extensions/async/examples/account/sources/AccountFuture.move
new file mode 100644
index 000000000..77e6bd247
--- /dev/null
+++ b/vendors/move/crates/extensions/async/examples/account/sources/AccountFuture.move
@@ -0,0 +1,58 @@
+// NOTE: This example is just for illustration of one possible evolution of Async Move.
+// Nothing here is implemented.#[actor]
+
+/// This is an instance of the Account example using futures. See the README for semantics.
+///
+/// This model is similar as continuations, but uses a more intuitive way to chain execution steps, which is
+/// also the dominant one in most modern programming languages.
+module This::AccountFuture {
+
+    use Async::Unit::Unit;
+    use Async::Future::{Future, Cont, done, followed_by};
+
+    #[state]
+    struct Account {
+        value: u64,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0}
+    }
+
+    #[rpc]
+    fun deposit(this: &mut Account, v: u64): Future<Unit> {
+        this.value = this.value + v;
+        done()
+    }
+
+    #[rpc]
+    fun withdraw(this: &mut Account, v: u64): Future<Unit> {
+        this.value = this.value - v;
+        done()
+    }
+
+    #[rpc]
+    fun xfer(this: &Account, dest: address, v: u64): Future<Unit> {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        // Deposit on the other end, and only if this succeeds, withdraw here.
+        followed_by(rpc_deposit(dest, v), cont_xfer_withdraw(v))
+    }
+
+    #[cont]
+    fun xfer_withdraw(this: &mut Account, _previous: Unit, v: u64): Future<Unit> {
+        withdraw(this, v)
+    }
+
+    // ===============================================================
+    // The following native function definitions are automatically
+    // generated by a Move attribute preprocessor, and implemented
+    // automatically by the runtime environment.
+
+    #[_generated_rpc]
+    public native fun rpc_deposit(dest: address, v: u64): Future<Unit>;
+
+    #[_generated_cont]
+    native fun cont_xfer_withdraw(v: u64): Cont<Unit, Unit>;
+}
diff --git a/vendors/move/crates/extensions/async/examples/account/sources/AccountStateMachine.move b/vendors/move/crates/extensions/async/examples/account/sources/AccountStateMachine.move
new file mode 100644
index 000000000..0b8581496
--- /dev/null
+++ b/vendors/move/crates/extensions/async/examples/account/sources/AccountStateMachine.move
@@ -0,0 +1,101 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+module This::AccountStateMachine {
+
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    const MAX: u64 = 43;
+    const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(MAX - this.value >= v, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (epoch_time() - p.initiated_at >= MAX_TRANSFER_AGE) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/extensions/async/move-async-lib/Move.toml b/vendors/move/crates/extensions/async/move-async-lib/Move.toml
new file mode 100644
index 000000000..e8b57e7c7
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-lib/Move.toml
@@ -0,0 +1,14 @@
+[package]
+name = "MoveAsyncLib"
+version = "0.0.0"
+
+[addresses]
+std = "_"
+Async = "_"
+
+[dev-addresses]
+std = "0x1"
+Async = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../move-stdlib" }
diff --git a/vendors/move/crates/extensions/async/move-async-lib/sources/Actor.move b/vendors/move/crates/extensions/async/move-async-lib/sources/Actor.move
new file mode 100644
index 000000000..862248a64
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-lib/sources/Actor.move
@@ -0,0 +1,9 @@
+/// Actor support functions.
+module Async::Actor {
+    /// Returns the address of the executing actor.
+    public native fun self(): address;
+
+    /// Returns the current virtual time, in micro seconds. This time does not increase during handling
+    /// of a message. On blockchains, this might be for example the block timestamp.
+    public native fun virtual_time(): u128;
+}
diff --git a/vendors/move/crates/extensions/async/move-async-lib/sources/Future.move b/vendors/move/crates/extensions/async/move-async-lib/sources/Future.move
new file mode 100644
index 000000000..e01263d65
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-lib/sources/Future.move
@@ -0,0 +1,21 @@
+// NOTE: this module is not implemented yet
+module Async::Future {
+    use Async::Unit::{Unit, Self};
+
+    /// A type which represents a future.
+    native struct Future<phantom T>;
+
+    /// A type which represents a continuation.
+    native struct Cont<phantom T, phantom R>;
+
+    /// Yield execution to the given continuation.
+    public native fun yield<T>(result: T): Future<T>;
+
+    /// Yield a future which first executes `f`, then continues with `cont`.
+    public native fun followed_by<T, R>(f: Future<T>, c: Cont<T, R>): Future<R>;
+
+    /// Shortcut for yield(unit())
+    public fun done(): Future<Unit> {
+        yield(Unit::unit())
+    }
+}
diff --git a/vendors/move/crates/extensions/async/move-async-lib/sources/Runtime.move b/vendors/move/crates/extensions/async/move-async-lib/sources/Runtime.move
new file mode 100644
index 000000000..205a23b3d
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-lib/sources/Runtime.move
@@ -0,0 +1,19 @@
+/// Async runtime functions. Supporting the compiler.
+module Async::Runtime {
+    public native fun send__0(actor: address, message_hash: u64);
+    public native fun send__1(actor: address, message_hash: u64, arg1: vector<u8>);
+    public native fun send__2(actor: address, message_hash: u64, arg1: vector<u8>, arg2: vector<u8>);
+    public native fun send__3(actor: address, message_hash: u64, arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>);
+    public native fun send__4(actor: address, message_hash: u64,
+        arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>, arg4: vector<u8>);
+    public native fun send__5(actor: address, message_hash: u64,
+        arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>, arg4: vector<u8>, arg5: vector<u8>);
+    public native fun send__6(actor: address, message_hash: u64,
+        arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>, arg4: vector<u8>, arg5: vector<u8>, arg6: vector<u8>);
+    public native fun send__7(actor: address, message_hash: u64,
+        arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>, arg4: vector<u8>, arg5: vector<u8>, arg6: vector<u8>,
+        arg7: vector<u8>);
+    public native fun send__8(actor: address, message_hash: u64,
+        arg1: vector<u8>, arg2: vector<u8>, arg3: vector<u8>, arg4: vector<u8>, arg5: vector<u8>, arg6: vector<u8>,
+        arg7: vector<u8>, arg8: vector<u8>);
+}
diff --git a/vendors/move/crates/extensions/async/move-async-lib/sources/Unit.move b/vendors/move/crates/extensions/async/move-async-lib/sources/Unit.move
new file mode 100644
index 000000000..a4eb3bcdb
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-lib/sources/Unit.move
@@ -0,0 +1,5 @@
+/// The `Unit` type, a type which contains a singleton element.
+module Async::Unit {
+    native struct Unit has drop, copy, store;
+    public native fun unit(): Unit;
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/Cargo.toml b/vendors/move/crates/extensions/async/move-async-vm/Cargo.toml
new file mode 100644
index 000000000..da365aca5
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "move-async-vm"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Wrapper for the Move VM for the asynchronous execution flavor"
+repository = "https://github.com/diem/move"
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = "1.0.52"
+better_any = "0.1.1"
+itertools = "0.10.0"
+move-binary-format = { path = "../../../move-binary-format" }
+move-command-line-common = { path = "../../../move-command-line-common" }
+move-compiler = { path = "../../../move-compiler" }
+move-core-types = { path = "../../../move-core-types" }
+move-vm-runtime = { path = "../../../move-vm/runtime", features = ["debugging"] }
+move-vm-test-utils = { path = "../../../move-vm/test-utils" }
+move-vm-types = { path = "../../../move-vm/types" }
+sha3 = "0.9.1"
+smallvec = "1.6.1"
+walkdir = "2.3.1"
+
+bcs = { workspace = true }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+move-prover-test-utils = { path = "../../../move-prover-test-utils" }
+move-stdlib = { path = "../../../move-stdlib", features = ["testing"] }
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/extensions/async/move-async-vm/src/actor_metadata.rs b/vendors/move/crates/extensions/async/move-async-vm/src/actor_metadata.rs
new file mode 100644
index 000000000..2e20f483e
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/src/actor_metadata.rs
@@ -0,0 +1,34 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag},
+};
+use sha3::{Digest, Sha3_256};
+use std::convert::TryInto;
+
+/// Metadata for an actor.
+/// TODO: we want to attach this to file format at some point.
+#[derive(Clone, Debug)]
+pub struct ActorMetadata {
+    pub module_id: ModuleId,
+    pub state_tag: StructTag,
+    pub initializer: Identifier,
+    pub messages: Vec<Identifier>,
+}
+
+/// Compute a hash for a message.
+pub fn message_hash(module_id: &ModuleId, handler_id: &IdentStr) -> u64 {
+    let hash_str = format!(
+        "0x{}::{}::{}",
+        module_id.address(),
+        module_id.name(),
+        handler_id
+    );
+    let hash_bytes: [u8; 8] = Sha3_256::digest(hash_str.as_bytes())[0..8]
+        .try_into()
+        .unwrap();
+    u64::from_be_bytes(hash_bytes)
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/src/async_vm.rs b/vendors/move/crates/extensions/async/move-async-vm/src/async_vm.rs
new file mode 100644
index 000000000..2cd90cffe
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/src/async_vm.rs
@@ -0,0 +1,443 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    actor_metadata,
+    actor_metadata::ActorMetadata,
+    natives,
+    natives::{AsyncExtension, GasParameters as ActorGasParameters},
+};
+use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMError, VMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event, Op},
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::MoveResolver,
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    move_vm::MoveVM,
+    native_extensions::NativeContextExtensions,
+    native_functions::NativeFunction,
+    session::{SerializedReturnValues, Session},
+};
+use move_vm_test_utils::gas_schedule::{Gas, GasStatus};
+use move_vm_types::values::{Reference, Value};
+use std::{
+    collections::HashMap,
+    error::Error,
+    fmt::{Debug, Display, Formatter},
+};
+
+/// Represents an instance of an async VM.
+pub struct AsyncVM {
+    move_vm: MoveVM,
+    actor_metadata: HashMap<ModuleId, ActorMetadata>,
+    message_table: HashMap<u64, (ModuleId, Identifier)>,
+}
+
+impl AsyncVM {
+    /// Creates a new VM, registering the given natives and actors.
+    pub fn new<I, A>(
+        async_lib_addr: AccountAddress,
+        natives: I,
+        actors: A,
+        actor_gas_parameters: ActorGasParameters,
+    ) -> VMResult<Self>
+    where
+        I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        A: IntoIterator<Item = ActorMetadata>,
+    {
+        let actor_metadata: HashMap<ModuleId, ActorMetadata> = actors
+            .into_iter()
+            .map(|a| (a.module_id.clone(), a))
+            .collect();
+        let message_table: HashMap<u64, (ModuleId, Identifier)> = actor_metadata
+            .values()
+            .flat_map(|a| {
+                a.messages.iter().map(move |m| {
+                    (
+                        actor_metadata::message_hash(&a.module_id, m.as_ident_str()),
+                        (a.module_id.clone(), m.clone()),
+                    )
+                })
+            })
+            .collect();
+        Ok(AsyncVM {
+            move_vm: MoveVM::new(
+                natives.into_iter().chain(
+                    natives::actor_natives(async_lib_addr, actor_gas_parameters).into_iter(),
+                ),
+            )?,
+            actor_metadata,
+            message_table,
+        })
+    }
+
+    /// Creates a new session.
+    pub fn new_session<'r, 'l>(
+        &'l self,
+        for_actor: AccountAddress,
+        virtual_time: u128,
+        move_resolver: &'r mut dyn MoveResolver,
+    ) -> AsyncSession<'r, 'l> {
+        self.new_session_with_extensions(
+            for_actor,
+            virtual_time,
+            move_resolver,
+            NativeContextExtensions::default(),
+        )
+    }
+
+    /// Creates a new session.
+    pub fn new_session_with_extensions<'r, 'l>(
+        &'l self,
+        for_actor: AccountAddress,
+        virtual_time: u128,
+        move_resolver: &'r mut dyn MoveResolver,
+        ext: NativeContextExtensions<'r>,
+    ) -> AsyncSession<'r, 'l> {
+        let extensions = make_extensions(ext, for_actor, virtual_time, true);
+        AsyncSession {
+            vm: self,
+            vm_session: self
+                .move_vm
+                .new_session_with_extensions(move_resolver, extensions),
+        }
+    }
+
+    /// Get the underlying Move VM.
+    pub fn get_move_vm(&mut self) -> &mut MoveVM {
+        &mut self.move_vm
+    }
+
+    /// Resolve the message hash into module and handler function.
+    pub fn resolve_message_hash(&self, message_hash: u64) -> Option<&(ModuleId, Identifier)> {
+        self.message_table.get(&message_hash)
+    }
+
+    /// Get the actor metadata.
+    pub fn actor_metadata(&self, module_id: &ModuleId) -> Option<&ActorMetadata> {
+        self.actor_metadata.get(module_id)
+    }
+
+    /// Get all know actors.
+    pub fn actors(&self) -> Vec<ModuleId> {
+        self.actor_metadata.keys().cloned().collect()
+    }
+}
+
+/// Represents an Async Move execution session.
+pub struct AsyncSession<'r, 'l> {
+    vm: &'l AsyncVM,
+    vm_session: Session<'r, 'l>,
+}
+
+/// Represents a message being sent, consisting of target address, message hash, and arguments.
+pub type Message = (AccountAddress, u64, Vec<Vec<u8>>);
+
+/// A structure to represent success for the execution of an async session operation.
+pub struct AsyncSuccess<'r> {
+    pub change_set: ChangeSet,
+    pub events: Vec<Event>,
+    pub messages: Vec<Message>,
+    pub gas_used: Gas,
+    pub ext: NativeContextExtensions<'r>,
+}
+
+/// A structure to represent failure for the execution of an async session operation.
+#[derive(Debug, Clone)]
+pub struct AsyncError {
+    pub error: VMError,
+    pub gas_used: Gas,
+}
+
+/// Result type for operations of an AsyncSession.
+pub type AsyncResult<'r> = Result<AsyncSuccess<'r>, AsyncError>;
+
+impl<'r, 'l> AsyncSession<'r, 'l> {
+    /// Get the underlying Move VM session.
+    pub fn get_move_session(&mut self) -> &mut Session<'r, 'l> {
+        &mut self.vm_session
+    }
+
+    /// Creates a new actor, identified by the module_id, at the given account address.
+    /// This calls the initializer function of the actor, and returns on success
+    /// a changeset which needs to be committed to persist the new actors state.
+    pub fn new_actor(
+        mut self,
+        module_id: &ModuleId,
+        actor_addr: AccountAddress,
+        gas_status: &mut GasStatus,
+    ) -> AsyncResult<'r> {
+        let actor = self
+            .vm
+            .actor_metadata
+            .get(module_id)
+            .ok_or_else(|| async_extension_error(format!("actor `{}` unknown", module_id)))?;
+        let state_type_tag = TypeTag::Struct(Box::new(actor.state_tag.clone()));
+        let state_type = self
+            .vm_session
+            .load_type(&state_type_tag)
+            .map_err(vm_error_to_async)?;
+
+        // Check whether the actor state already exists.
+        let state = self
+            .vm_session
+            .load_resource(actor_addr, &state_type)
+            .map(|(gv, _)| gv)
+            .map_err(partial_vm_error_to_async)?;
+        if state.exists().map_err(partial_vm_error_to_async)? {
+            return Err(async_extension_error(format!(
+                "actor `{}` already exists at `{}`",
+                module_id.short_str_lossless(),
+                actor_addr.short_str_lossless()
+            )));
+        }
+
+        // Execute the initializer.
+        let gas_before = gas_status.remaining_gas();
+        let result = self
+            .vm_session
+            .execute_function_bypass_visibility(
+                &actor.module_id,
+                &actor.initializer,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                gas_status,
+            )
+            .and_then(|ret| Ok((ret, self.vm_session.finish_with_extensions()?)));
+        let gas_used = gas_before.checked_sub(gas_status.remaining_gas()).unwrap();
+
+        // Process the result, moving the return value of the initializer function into the
+        // changeset.
+        match result {
+            Ok((
+                SerializedReturnValues {
+                    mutable_reference_outputs: _,
+                    mut return_values,
+                },
+                (mut change_set, events, mut native_extensions),
+            )) => {
+                if return_values.len() != 1 {
+                    Err(async_extension_error(format!(
+                        "inconsistent initializer `{}`",
+                        actor.initializer
+                    )))
+                } else {
+                    publish_actor_state(
+                        &mut change_set,
+                        actor_addr,
+                        actor.state_tag.clone(),
+                        return_values.remove(0).0,
+                        false,
+                    )
+                    .map_err(partial_vm_error_to_async)?;
+                    let async_ext = native_extensions.remove::<AsyncExtension>();
+                    Ok(AsyncSuccess {
+                        change_set,
+                        events,
+                        messages: async_ext.sent,
+                        gas_used,
+                        ext: native_extensions,
+                    })
+                }
+            },
+            Err(error) => Err(AsyncError { error, gas_used }),
+        }
+    }
+
+    /// Handles a message at `actor` with the given `message_hash`. This will call the
+    /// according function as determined by the AsyncResolver, passing a reference to
+    /// the actors state.
+    pub fn handle_message(
+        mut self,
+        actor_addr: AccountAddress,
+        message_hash: u64,
+        mut args: Vec<Vec<u8>>,
+        gas_status: &mut GasStatus,
+    ) -> AsyncResult<'r> {
+        // Resolve actor and function which handles the message.
+        let (module_id, handler_id) =
+            self.vm.message_table.get(&message_hash).ok_or_else(|| {
+                async_extension_error(format!("unknown message hash `{}`", message_hash))
+            })?;
+        let actor = self.vm.actor_metadata.get(module_id).ok_or_else(|| {
+            async_extension_error(format!(
+                "actor `{}` unknown",
+                module_id.short_str_lossless()
+            ))
+        })?;
+
+        // Load the resource representing the actor state and add to arguments.
+        let state_type_tag = TypeTag::Struct(Box::new(actor.state_tag.clone()));
+        let state_type = self
+            .vm_session
+            .load_type(&state_type_tag)
+            .map_err(vm_error_to_async)?;
+
+        let actor_state_global = self
+            .vm_session
+            .load_resource(actor_addr, &state_type)
+            .map(|(gv, _)| gv)
+            .map_err(partial_vm_error_to_async)?;
+        let actor_state = actor_state_global
+            .borrow_global()
+            .and_then(|v| v.value_as::<Reference>())
+            .and_then(|r| r.read_ref())
+            .map_err(partial_vm_error_to_async)?;
+        args.insert(
+            0,
+            self.to_bcs(actor_state, &state_type_tag)
+                .map_err(partial_vm_error_to_async)?,
+        );
+
+        // Execute the handler.
+        let gas_before = gas_status.remaining_gas();
+        let result = self
+            .vm_session
+            .execute_function_bypass_visibility(module_id, handler_id, vec![], args, gas_status)
+            .and_then(|ret| Ok((ret, self.vm_session.finish_with_extensions()?)));
+
+        let gas_used = gas_before.checked_sub(gas_status.remaining_gas()).unwrap();
+
+        // Process the result, moving the mutated value of the handlers first parameter
+        // into the changeset.
+        match result {
+            Ok((
+                SerializedReturnValues {
+                    mut mutable_reference_outputs,
+                    return_values: _,
+                },
+                (mut change_set, events, mut native_extensions),
+            )) => {
+                if mutable_reference_outputs.len() > 1 {
+                    Err(async_extension_error(format!(
+                        "inconsistent handler `{}`",
+                        handler_id
+                    )))
+                } else {
+                    if !mutable_reference_outputs.is_empty() {
+                        publish_actor_state(
+                            &mut change_set,
+                            actor_addr,
+                            actor.state_tag.clone(),
+                            mutable_reference_outputs.remove(0).1,
+                            true,
+                        )
+                        .map_err(partial_vm_error_to_async)?;
+                    }
+                    let async_ext = native_extensions.remove::<AsyncExtension>();
+                    Ok(AsyncSuccess {
+                        change_set,
+                        events,
+                        messages: async_ext.sent,
+                        gas_used,
+                        ext: native_extensions,
+                    })
+                }
+            },
+            Err(error) => Err(AsyncError { error, gas_used }),
+        }
+    }
+
+    fn to_bcs(&self, value: Value, tag: &TypeTag) -> PartialVMResult<Vec<u8>> {
+        let type_layout = self
+            .vm_session
+            .get_type_layout(tag)
+            .map_err(|e| e.to_partial())?;
+        value
+            .simple_serialize(&type_layout)
+            .ok_or_else(|| partial_extension_error("serialization failed"))
+    }
+}
+
+fn make_extensions(
+    mut exts: NativeContextExtensions,
+    actor_addr: AccountAddress,
+    virtual_time: u128,
+    in_initializer: bool,
+) -> NativeContextExtensions {
+    exts.add(AsyncExtension {
+        current_actor: actor_addr,
+        sent: vec![],
+        in_initializer,
+        virtual_time,
+    });
+    exts
+}
+
+fn publish_actor_state(
+    change_set: &mut ChangeSet,
+    actor_addr: AccountAddress,
+    state_tag: StructTag,
+    state: Vec<u8>,
+    is_modify: bool,
+) -> PartialVMResult<()> {
+    change_set
+        .add_resource_op(
+            actor_addr,
+            state_tag,
+            if is_modify {
+                Op::Modify(state)
+            } else {
+                Op::New(state)
+            },
+        )
+        .map_err(|err| partial_extension_error(format!("cannot publish actor state: {}", err)))
+}
+
+pub(crate) fn partial_extension_error(msg: impl ToString) -> PartialVMError {
+    PartialVMError::new(StatusCode::VM_EXTENSION_ERROR).with_message(msg.to_string())
+}
+
+pub(crate) fn extension_error(msg: impl ToString) -> VMError {
+    partial_extension_error(msg).finish(Location::Undefined)
+}
+
+fn async_extension_error(msg: impl ToString) -> AsyncError {
+    AsyncError {
+        error: extension_error(msg),
+        gas_used: 0.into(),
+    }
+}
+
+fn vm_error_to_async(error: VMError) -> AsyncError {
+    AsyncError {
+        error,
+        gas_used: 0.into(),
+    }
+}
+
+fn partial_vm_error_to_async(error: PartialVMError) -> AsyncError {
+    vm_error_to_async(error.finish(Location::Undefined))
+}
+
+// ------------------------------------------------------------------------------------------
+// Displaying
+
+impl Display for AsyncError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.error)
+    }
+}
+
+impl Error for AsyncError {}
+
+impl<'r> Display for AsyncSuccess<'r> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let AsyncSuccess {
+            change_set,
+            events,
+            messages,
+            gas_used,
+            ext: _,
+        } = self;
+        write!(f, "change_set: {:?}", change_set)?;
+        write!(f, ", events: {:?}", events)?;
+        write!(f, ", messages: {:?}", messages)?;
+        write!(f, ", gas: {}", gas_used)
+    }
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/src/lib.rs b/vendors/move/crates/extensions/async/move-async-vm/src/lib.rs
new file mode 100644
index 000000000..b373424be
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/src/lib.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+pub mod actor_metadata;
+pub mod async_vm;
+pub mod natives;
diff --git a/vendors/move/crates/extensions/async/move-async-vm/src/natives.rs b/vendors/move/crates/extensions/async/move-async-vm/src/natives.rs
new file mode 100644
index 000000000..86be14fc8
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/src/natives.rs
@@ -0,0 +1,187 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::async_vm::Message;
+use better_any::{Tid, TidAble};
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    identifier::Identifier,
+};
+use move_vm_runtime::{
+    native_functions,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, Vector},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/// Environment extension for the Move VM which we pass down to native functions,
+/// to implement message sending and retrieval of actor address.
+#[derive(Tid)]
+pub struct AsyncExtension {
+    pub current_actor: AccountAddress,
+    pub sent: Vec<Message>,
+    pub virtual_time: u128,
+    pub in_initializer: bool,
+}
+
+#[derive(Clone, Debug)]
+pub struct GasParameters {
+    pub self_: SelfGasParameters,
+    pub send: SendGasParameters,
+    pub virtual_time: VirtualTimeGasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            self_: SelfGasParameters {
+                base_cost: 0.into(),
+            },
+            send: SendGasParameters {
+                base_cost: 0.into(),
+                unit_cost: 0.into(),
+            },
+            virtual_time: VirtualTimeGasParameters {
+                base_cost: 0.into(),
+            },
+        }
+    }
+}
+
+pub fn actor_natives(
+    async_addr: AccountAddress,
+    gas_params: GasParameters,
+) -> Vec<(AccountAddress, Identifier, Identifier, NativeFunction)> {
+    let natives = [
+        ("Actor", "self", make_native_self(gas_params.self_)),
+        (
+            "Actor",
+            "virtual_time",
+            make_native_virtual_time(gas_params.virtual_time),
+        ),
+        (
+            "Runtime",
+            "send__0",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__1",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__2",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__3",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__4",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__5",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__6",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__7",
+            make_native_send(gas_params.send.clone()),
+        ),
+        ("Runtime", "send__8", make_native_send(gas_params.send)),
+    ];
+    native_functions::make_table_from_iter(async_addr, natives)
+}
+
+#[derive(Clone, Debug)]
+pub struct SelfGasParameters {
+    base_cost: InternalGas,
+}
+
+fn native_self(
+    gas_params: &SelfGasParameters,
+    context: &mut NativeContext,
+    mut _ty_args: Vec<Type>,
+    mut _args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    let ext = context.extensions().get::<AsyncExtension>();
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![
+        Value::address(ext.current_actor)
+    ]))
+}
+
+fn make_native_self(gas_params: SelfGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_self(&gas_params, context, ty_args, args))
+}
+
+#[derive(Clone, Debug)]
+pub struct SendGasParameters {
+    base_cost: InternalGas,
+    unit_cost: InternalGasPerByte,
+}
+
+fn native_send(
+    gas_params: &SendGasParameters,
+    context: &mut NativeContext,
+    mut _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    let ext = context.extensions_mut().get_mut::<AsyncExtension>();
+    let mut bcs_args = vec![];
+    while args.len() > 2 {
+        bcs_args.push(pop_arg!(args, Vector).to_vec_u8()?);
+    }
+    bcs_args.reverse();
+    let message_hash = pop_arg!(args, u64);
+    let target = pop_arg!(args, AccountAddress);
+    ext.sent.push((target, message_hash, bcs_args));
+
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumBytes::new(args.len() as u64);
+
+    Ok(NativeResult::ok(cost, smallvec![]))
+}
+
+fn make_native_send(gas_params: SendGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_send(&gas_params, context, ty_args, args))
+}
+
+#[derive(Clone, Debug)]
+pub struct VirtualTimeGasParameters {
+    base_cost: InternalGas,
+}
+
+fn native_virtual_time(
+    gas_params: &VirtualTimeGasParameters,
+    context: &mut NativeContext,
+    mut _ty_args: Vec<Type>,
+    mut _args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    let ext = context.extensions().get::<AsyncExtension>();
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![
+        Value::u128(ext.virtual_time)
+    ]))
+}
+
+fn make_native_virtual_time(gas_params: VirtualTimeGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_virtual_time(&gas_params, context, ty_args, args))
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp
new file mode 100644
index 000000000..690c6a62e
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp
@@ -0,0 +1,55 @@
+publishing Actor
+publishing Runtime
+publishing bcs
+publishing vector
+publishing AccountStateMachine
+actor 0x4 created from 0x3::AccountStateMachine
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := New("[00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x5 created from 0x3::AccountStateMachine
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := New("[00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::AccountStateMachine::start (hash=0xD6E3904B884A26E2)
+  SUCCESS
+  sent 0x4 <- 0xC4FB1F887A3B60A6 argc=1
+  sent 0x5 <- 0xC4FB1F887A3B60A6 argc=1
+  sent 0x4 <- 0x477572D21970BF04 argc=2
+  sent 0x4 <- 0xFC3DE2B500D5B460 argc=0
+  sent 0x5 <- 0xFC3DE2B500D5B460 argc=0
+actor 0x5 handling 0x3::AccountStateMachine::start (hash=0xD6E3904B884A26E2)
+  SUCCESS
+actor 0x4 handling 0x3::AccountStateMachine::deposit (hash=0xC4FB1F887A3B60A6)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x5 handling 0x3::AccountStateMachine::deposit (hash=0xC4FB1F887A3B60A6)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::AccountStateMachine::xfer (hash=0x477572D21970BF04)
+  SUCCESS
+  sent 0x5 <- 0x8EEEA8A2C8DCFA6D argc=3
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::AccountStateMachine::cleanup (hash=0xFC3DE2B500D5B460)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x5 handling 0x3::AccountStateMachine::cleanup (hash=0xFC3DE2B500D5B460)
+  SUCCESS
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x5 handling 0x3::AccountStateMachine::xfer_deposit (hash=0x8EEEA8A2C8DCFA6D)
+  SUCCESS
+  sent 0x4 <- 0x9D2FDA886DFF001 argc=1
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[78, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::AccountStateMachine::xfer_finish (hash=0x9D2FDA886DFF001)
+  SUCCESS
+  sent 0x4 <- 0xDAF369BA2554ECF1 argc=0
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[50, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::AccountStateMachine::end (hash=0xDAF369BA2554ECF1)
+  SUCCESS
+  sent 0x4 <- 0x2BAA2A2D643B5C3B argc=1
+  sent 0x5 <- 0x2BAA2A2D643B5C3B argc=1
+  sent 0x5 <- 0x2BAA2A2D643B5C3B argc=1
+actor 0x4 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  SUCCESS
+actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  SUCCESS
+actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x2BAA2A2D643B5C3B)
+  FAIL  VMError with status ABORTED with sub status 2 at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000003, name: Identifier("AccountStateMachine") } and message 0x0000000000000000000000000000000000000000000000000000000000000003::AccountStateMachine::verify at offset 8 at code offset 8 in function definition 16
diff --git a/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.move b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.move
new file mode 100644
index 000000000..4d3a88db2
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/AccountStateMachine.move
@@ -0,0 +1,141 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+
+// dep: bcs
+// dep: vector
+// dep: Runtime
+// dep: Actor
+// actor: 0x3 AccountStateMachine Account init start end verify deposit withdraw xfer xfer_deposit xfer_finish cleanup
+// instance: 0x3 AccountStateMachine 0x4
+// instance: 0x3 AccountStateMachine 0x5
+module Test::AccountStateMachine {
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    // TODO: constants are not working with async vm. Need a special initialization for them?
+    // const MAX: u64 = 43;
+    // const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    /// Entry point for the test run
+    fun start(this: &Account) {
+        if (self() == @5) {
+            // Start is called for each actor, we only want one of them doing this.
+            return
+        };
+        send_deposit(@4, 100);
+        send_deposit(@5, 100);
+        send_xfer(@4, @5, 20);
+        send_cleanup(@4);
+        send_cleanup(@5);
+    }
+
+    #[message]
+    // Has to be called after the last message is send (after xfer ends)
+    fun end(this: &Account) {
+        send_verify(@4, 80);
+        send_verify(@5, 120);
+
+        // produce a failure
+        send_verify(@5, 119);
+
+    }
+
+    #[message]
+    fun verify(this: &Account, balance: u64) {
+        assert!(this.value == balance, 2)
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(this.value + v <= 1000, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount);
+        // Call end of test here.
+        send_end(@4)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (virtual_time() - p.initiated_at >= 1000000000) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.exp b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.exp
new file mode 100644
index 000000000..5ae34c8c5
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.exp
@@ -0,0 +1,32 @@
+publishing Runtime
+publishing bcs
+publishing Basic
+actor 0x4 created from 0x3::Basic
+  SUCCESS
+  commit 0x3::Basic::Basic[0x4] := New("[00, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::start (hash=0xD4CC9A1B01199BB9)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("[01, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("[02, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("[03, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("[04, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  sent 0x4 <- 0xEBAC30B69450533F argc=1
+  commit 0x3::Basic::Basic[0x4] := Modify("[05, 00, 00, 00, 00, 00, 00, 00]")
+actor 0x4 handling 0x3::Basic::count_down (hash=0xEBAC30B69450533F)
+  SUCCESS
+  commit 0x3::Basic::Basic[0x4] := Modify("[05, 00, 00, 00, 00, 00, 00, 00]")
diff --git a/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.move b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.move
new file mode 100644
index 000000000..97992f63c
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/tests/sources/Basic.move
@@ -0,0 +1,32 @@
+// dep: bcs
+// dep: Runtime
+// actor: 0x3 Basic State init start count_down
+// instance: 0x3 Basic 0x4
+#[actor]
+module Test::Basic {
+
+    #[state]
+    struct State {
+        value: u64,
+    }
+
+    #[init]
+    fun init(): State {
+        State{value: 0}
+    }
+
+    #[message]
+    fun start(s: &State) {
+        send_count_down(@4, 5);
+    }
+
+    #[message]
+    fun count_down(s: &mut State, counter: u64) {
+        if (counter == 0) {
+            assert!(s.value == 5, 1)
+        } else {
+            s.value = s.value + 1;
+            send_count_down(@4, counter - 1);
+        }
+    }
+}
diff --git a/vendors/move/crates/extensions/async/move-async-vm/tests/testsuite.rs b/vendors/move/crates/extensions/async/move-async-vm/tests/testsuite.rs
new file mode 100644
index 000000000..4c0324238
--- /dev/null
+++ b/vendors/move/crates/extensions/async/move-async-vm/tests/testsuite.rs
@@ -0,0 +1,414 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Error};
+use itertools::Itertools;
+use move_async_vm::{
+    actor_metadata,
+    actor_metadata::ActorMetadata,
+    async_vm::{AsyncResult, AsyncSession, AsyncVM, Message},
+    natives::GasParameters as ActorGasParameters,
+};
+use move_binary_format::access::ModuleAccess;
+use move_command_line_common::testing::EXP_EXT;
+use move_compiler::{
+    compiled_unit::CompiledUnit, diagnostics::report_diagnostics_to_buffer,
+    shared::NumericalAddress, Compiler, Flags,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    ident_str,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag},
+    resolver::{ModuleResolver, ResourceResolver},
+};
+use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
+use move_vm_test_utils::gas_schedule::GasStatus;
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+const TEST_ADDR: &str = "0x3";
+const SOURCE_DIRS: &[&str] = &[
+    "./tests/sources",
+    "../move-async-lib/sources",
+    "../../../move-stdlib/sources",
+];
+
+struct Harness {
+    module_cache: BTreeMap<Identifier, CompiledUnit>,
+    vm: AsyncVM,
+    actor_instances: Vec<(ModuleId, AccountAddress)>,
+    baseline: RefCell<String>,
+    resource_store: RefCell<BTreeMap<(AccountAddress, StructTag), Vec<u8>>>,
+}
+
+fn test_account() -> AccountAddress {
+    AccountAddress::from_hex_literal(TEST_ADDR).expect("valid test address")
+}
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let target_module = path
+        .with_extension("")
+        .file_name()
+        .unwrap()
+        .to_string_lossy()
+        .to_string();
+    let deps = extract_test_directives(path, "// dep:")?;
+    let actors = extract_test_directives(path, "// actor: ")?;
+    let instances = extract_test_directives(path, "// instance: ")?;
+    let harness = Harness::new(
+        std::iter::once(target_module.clone())
+            .chain(deps.into_iter())
+            .collect(),
+        actors,
+        instances,
+    )?;
+    harness.run(&target_module)?;
+    let baseline_path = path.with_extension(EXP_EXT);
+    verify_or_update_baseline(baseline_path.as_path(), harness.baseline.borrow().as_str())?;
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests/sources", r".*\.move");
+
+// ========================================================================================
+// Test execution
+
+impl Harness {
+    fn run(&self, _module: &str) -> anyhow::Result<()> {
+        let mut gas = GasStatus::new_unmetered();
+        let mut tick = 0;
+        // Publish modules.
+        let mut proxy = HarnessProxy { harness: self };
+        let mut session = self.vm.new_session(test_account(), 0, &mut proxy);
+        let mut done = BTreeSet::new();
+        for id in self.module_cache.keys() {
+            self.publish_module(&mut session, id, &mut gas, &mut done)?;
+        }
+        // Initialize actors
+        let mut mailbox: VecDeque<Message> = Default::default();
+        for (actor, addr) in self.actor_instances.clone() {
+            self.log(format!(
+                "actor 0x{} created from {}",
+                addr.short_str_lossless(),
+                actor.short_str_lossless()
+            ));
+            {
+                let mut proxy = HarnessProxy { harness: self };
+                let session = self.vm.new_session(addr, 0, &mut proxy);
+                let result = session.new_actor(&actor, addr, &mut gas);
+                self.handle_result(&mut mailbox, result);
+            };
+
+            // Put a start message for this actor into the mailbox.
+            let entry_point_id = ident_str!("start");
+            let hash = actor_metadata::message_hash(&actor, entry_point_id);
+            mailbox.push_back((addr, hash, vec![]));
+        }
+
+        // Handle messages until the mailbox is empty.
+        while let Some((actor, message_hash, args)) = mailbox.pop_front() {
+            // Baseline logging
+            if let Some((module_id, fun_id)) = self.vm.resolve_message_hash(message_hash).cloned() {
+                self.log(format!(
+                    "actor 0x{} handling {}::{} (hash=0x{:X})",
+                    actor.short_str_lossless(),
+                    module_id.short_str_lossless(),
+                    fun_id,
+                    message_hash
+                ));
+            } else {
+                self.log(format!(
+                    "actor 0x{} handling ???? (hash={})",
+                    actor.short_str_lossless(),
+                    message_hash
+                ))
+            }
+            // Handling
+            let mut proxy = HarnessProxy { harness: self };
+            let session = self.vm.new_session(actor, tick, &mut proxy);
+            tick += 1000_1000; // micros
+            let result = session.handle_message(actor, message_hash, args, &mut gas);
+            self.handle_result(&mut mailbox, result);
+        }
+        Ok(())
+    }
+
+    fn publish_module(
+        &self,
+        session: &mut AsyncSession,
+        id: &IdentStr,
+        gas: &mut GasStatus,
+        done: &mut BTreeSet<Identifier>,
+    ) -> anyhow::Result<()> {
+        if done.insert(id.to_owned()) {
+            let cu = self.module_cache.get(id).unwrap();
+            if let CompiledUnit::Module(m) = cu {
+                for dep in &m.module.module_handles {
+                    let dep_id = m.module.identifier_at(dep.name);
+                    self.publish_module(session, dep_id, gas, done)?
+                }
+            }
+            self.log(format!("publishing {}", id));
+            session
+                .get_move_session()
+                .publish_module(cu.serialize(None), test_account(), gas)?
+        }
+        Ok(())
+    }
+
+    fn handle_result(&self, mailbox: &mut VecDeque<Message>, result: AsyncResult) {
+        match result {
+            Ok(success) => {
+                self.log("  SUCCESS");
+                for m in &success.messages {
+                    self.log(format!(
+                        "  sent 0x{} <- 0x{:X} argc={}",
+                        m.0.short_str_lossless(),
+                        m.1,
+                        m.2.len()
+                    ))
+                }
+                mailbox.extend(success.messages);
+                self.commit_changeset(success.change_set)
+            },
+            Err(error) => self.log(format!("  FAIL  {:}", error)),
+        }
+    }
+
+    fn commit_changeset(&self, changeset: ChangeSet) {
+        for (addr, change) in changeset.into_inner() {
+            for (struct_tag, op) in change.into_inner().1 {
+                self.log(format!(
+                    "  commit 0x{}::{}::{}[0x{}] := {:?}",
+                    struct_tag.address.short_str_lossless(),
+                    struct_tag.module,
+                    struct_tag.module,
+                    addr.short_str_lossless(),
+                    op.as_ref().map(|b| format!("{:02X?}", b))
+                ));
+                match op {
+                    Op::New(v) => {
+                        assert!(self
+                            .resource_store
+                            .borrow_mut()
+                            .insert((addr, struct_tag), v)
+                            .is_none());
+                    },
+                    Op::Modify(v) => {
+                        self.resource_store
+                            .borrow_mut()
+                            .insert((addr, struct_tag), v)
+                            .unwrap();
+                    },
+                    Op::Delete => {
+                        self.resource_store
+                            .borrow_mut()
+                            .remove(&(addr, struct_tag))
+                            .unwrap();
+                    },
+                }
+            }
+        }
+    }
+}
+
+// ========================================================================================
+// Harness creation
+
+impl Harness {
+    fn new(
+        modules: Vec<String>,
+        actors: Vec<String>,
+        instances: Vec<String>,
+    ) -> anyhow::Result<Self> {
+        // Create address map. We are mapping all aliases to TEST_ADDR for simplicity.
+        let test_addr = NumericalAddress::parse_str(TEST_ADDR).unwrap();
+        let address_map: BTreeMap<String, NumericalAddress> = vec![
+            ("std".to_string(), test_addr),
+            ("Async".to_string(), test_addr),
+            ("Test".to_string(), test_addr),
+        ]
+        .into_iter()
+        .collect();
+        // Collect metadata and compile modules.
+        let actor_metadata = Self::collect_metadata(actors)?;
+        let actor_instances = Self::collect_instances(instances)?;
+        let module_files = Self::collect_modules(modules)?;
+        let module_cache = Self::compile(&address_map, &module_files)?;
+        let harness = Harness {
+            baseline: Default::default(),
+            module_cache,
+            resource_store: Default::default(),
+            vm: AsyncVM::new(
+                test_account(),
+                move_stdlib::natives::all_natives(
+                    test_account(),
+                    // We may want to switch to a different gas schedule in the future, but for now,
+                    // the all-zero one should be enough.
+                    move_stdlib::natives::GasParameters::zeros(),
+                ),
+                actor_metadata,
+                ActorGasParameters::zeros(),
+            )?,
+            actor_instances,
+        };
+        Ok(harness)
+    }
+
+    fn collect_metadata(actors: Vec<String>) -> anyhow::Result<Vec<ActorMetadata>> {
+        let mut actor_metadata = vec![];
+        for actor in actors {
+            // format: 0x3 Module State init message..
+            let parts = actor.split_ascii_whitespace().collect_vec();
+            if parts.len() < 4 {
+                bail!("malformed actor decl `{}`", actor)
+            }
+            let address = AccountAddress::from_hex_literal(parts[0])?;
+            let module = Identifier::from_str(parts[1])?;
+            let struct_ = Identifier::from_str(parts[2])?;
+            let initializer = Identifier::from_str(parts[3])?;
+            let state_tag = StructTag {
+                address,
+                module: module.clone(),
+                name: struct_,
+                type_params: vec![],
+            };
+            let mut messages = vec![];
+            for message in &parts[4..] {
+                messages.push(Identifier::from_str(message)?)
+            }
+            actor_metadata.push(ActorMetadata {
+                module_id: ModuleId::new(address, module),
+                state_tag,
+                initializer,
+                messages,
+            })
+        }
+        Ok(actor_metadata)
+    }
+
+    fn collect_instances(
+        instances: Vec<String>,
+    ) -> anyhow::Result<Vec<(ModuleId, AccountAddress)>> {
+        let mut result = vec![];
+        for inst in instances {
+            // format: 0x3 Module 0x23
+            // where the last address is where the instance is to create
+            let parts = inst.split_ascii_whitespace().collect_vec();
+            if parts.len() != 3 {
+                bail!("malformed instance decl `{}`", inst)
+            }
+            let address = AccountAddress::from_hex_literal(parts[0])?;
+            let module = Identifier::from_str(parts[1])?;
+            let inst_address = AccountAddress::from_hex_literal(parts[2])?;
+            result.push((ModuleId::new(address, module), inst_address))
+        }
+        Ok(result)
+    }
+
+    fn collect_modules(deps: Vec<String>) -> anyhow::Result<BTreeMap<Identifier, String>> {
+        let mut module_files = BTreeMap::new();
+        for dep in &deps {
+            let mut found = false;
+            for dir in SOURCE_DIRS {
+                let mut path = PathBuf::from(dir);
+                path.push(format!("{}.move", dep));
+                if path.exists() {
+                    module_files.insert(
+                        Identifier::from_str(dep).expect("valid identifier"),
+                        path.to_string_lossy().to_string(),
+                    );
+                    found = true;
+                    break;
+                }
+            }
+            if !found {
+                bail!("dependency {} not found", dep)
+            }
+        }
+        Ok(module_files)
+    }
+
+    fn compile(
+        address_map: &BTreeMap<String, NumericalAddress>,
+        module_files: &BTreeMap<Identifier, String>,
+    ) -> anyhow::Result<BTreeMap<Identifier, CompiledUnit>> {
+        let mut module_cache = BTreeMap::new();
+        for (id, path) in module_files {
+            let targets = vec![path.to_owned()];
+            let deps = module_files
+                .values()
+                .filter(|p| *p != path)
+                .cloned()
+                .collect();
+            let compiler = Compiler::from_files(targets, deps, address_map.clone())
+                .set_flags(Flags::empty().set_flavor("async"));
+            let (sources, inner) = compiler.build()?;
+            match inner {
+                Err(diags) => bail!(
+                    "Compilation failure {{\n{}\n}}",
+                    String::from_utf8_lossy(
+                        report_diagnostics_to_buffer(&sources, diags).as_slice()
+                    )
+                ),
+                Ok((mut units, _)) => {
+                    module_cache.insert(id.to_owned(), units.remove(0).into_compiled_unit());
+                },
+            }
+        }
+        Ok(module_cache)
+    }
+}
+
+// ========================================================================================
+// Move Resolver
+
+/// A facade for the harness which can appear as mutable, even though the harness
+/// is not. Keeping the harness immutable and using RefCell for the few mutation points
+/// simplifies things in this test.
+struct HarnessProxy<'a> {
+    harness: &'a Harness,
+}
+
+impl<'a> ModuleResolver for HarnessProxy<'a> {
+    fn get_module(&self, id: &ModuleId) -> Result<Option<Vec<u8>>, Error> {
+        Ok(self
+            .harness
+            .module_cache
+            .get(id.name())
+            .map(|c| c.serialize(None)))
+    }
+}
+
+impl<'a> ResourceResolver for HarnessProxy<'a> {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        typ: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Error> {
+        let res = self
+            .harness
+            .resource_store
+            .borrow()
+            .get(&(*address, typ.clone()))
+            .cloned();
+        Ok(res)
+    }
+}
+
+// ========================================================================================
+// Baseline writer
+
+impl Harness {
+    fn log(&self, s: impl ToString) {
+        let s = s.to_string();
+        self.baseline.borrow_mut().push_str(&(s + "\n"))
+    }
+}
diff --git a/vendors/move/crates/extensions/move-table-extension/Cargo.toml b/vendors/move/crates/extensions/move-table-extension/Cargo.toml
new file mode 100644
index 000000000..9f06c0461
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "move-table-extension"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Wrapper for the Move VM which coordinates multiple extensions"
+repository = "https://github.com/diem/move"
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = "1.0.52"
+better_any = "0.1.1"
+move-binary-format = { path = "../../move-binary-format" }
+move-core-types = { path = "../../move-core-types" }
+move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
+move-vm-types = { path = "../../move-vm/types" }
+once_cell = "1.7.2"
+sha3 = "0.9.1"
+smallvec = "1.6.1"
+
+bcs = { workspace = true }
+
+[dev-dependencies]
+#dir-diff = "0.3.2"
+#file_diff = "1.0.0"
+move-cli = { path = "../../move-cli" }
+move-package = { path = "../../move-package" }
+move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
+move-unit-test = { path = "../../move-unit-test", features = ["table-extension"] }
+tempfile = "3.2.0"
diff --git a/vendors/move/crates/extensions/move-table-extension/Move.toml b/vendors/move/crates/extensions/move-table-extension/Move.toml
new file mode 100644
index 000000000..d44e94143
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/Move.toml
@@ -0,0 +1,14 @@
+[package]
+name = "MoveTableExtension"
+version = "1.0.0"
+
+[addresses]
+extensions = "_"
+
+[dev-addresses]
+std = "0x1"
+extensions = "0x2"
+
+[dependencies]
+MoveStdlib = { local = "../../move-stdlib" }
+MoveNursery = { local = "../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/extensions/move-table-extension/README.md b/vendors/move/crates/extensions/move-table-extension/README.md
new file mode 100644
index 000000000..cda2f1bd8
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/README.md
@@ -0,0 +1,36 @@
+This crate contains an extension to the Move language with large-scale storage tables.
+
+In order to use this extension with the Move CLI and package system, you need to compile with
+`feature = ["table-extension"]`.
+
+In order to use this extension in your adapter, you do something as follows:
+
+```rust
+use move_core_types::account_address::AccountAddress;
+use move_stdlib::natives;
+use move_table_extension::NativeTableContext;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_runtime::native_functions::NativeContextExtensions;
+
+fn run() {
+    let resource_resolver = unimplemented!(); // a resource resolver the adapter provides
+    let txn_hash = unimplemented!(); // a unique hash for table creation for this transaction
+    let table_resolver = unimplemented!(); // a remote table resolver the adapter provides
+    let std_addr = unimplemented!(); // address where to deploy the std lib
+    let extension_addr = unimplemented!(); // address where to deploy the table extension
+
+    let mut extensions = NativeContextExtensions::default();
+    extensions.add(NativeTableContext::new(txn_hash, table_resolver));
+    let mut natives = move_stdlib::natives::all_natives(std_addr);
+    natives.append(&mut move_table_extension::table_natives(extension_addr));
+    let vm = MoveVM::new(natives);
+
+    let session = vm.new_session_with_extensions(resource_resolver, extensions);
+    let result = session.execute_function(..)?;
+    let (change_set, events, extensions) = session.finish_with_extensions()?;
+    let table_change_set = extensions.get::<NativeTableContext>().into_change_set();
+
+    // Do something with the table change set
+    // ...
+}
+```
diff --git a/vendors/move/crates/extensions/move-table-extension/sources/Table.move b/vendors/move/crates/extensions/move-table-extension/sources/Table.move
new file mode 100644
index 000000000..824126437
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/sources/Table.move
@@ -0,0 +1,109 @@
+/// Type of large-scale storage tables.
+module extensions::table {
+    use std::errors;
+
+    // TODO: native code should not use reasons to signal logical type of error. Instead,
+    // use Errors::ALREADY_PUBLISHED and Errors::NOT_PUBLISHED.
+    const EALREADY_EXISTS: u64 = 100;
+    // native code raises this with Errors::invalid_arguments()
+    const ENOT_FOUND: u64 = 101;
+    const ENOT_EMPTY: u64 = 102;
+
+    /// Type of tables
+    struct Table<phantom K: copy + drop, phantom V> has store {
+        handle: address,
+        length: u64,
+    }
+
+    /// Create a new Table.
+    public fun new<K: copy + drop, V: store>(): Table<K, V> {
+        Table{
+            handle: new_table_handle<K, V>(),
+            length: 0,
+        }
+    }
+
+    /// Destroy a table. The table must be empty to succeed.
+    public fun destroy_empty<K: copy + drop, V>(table: Table<K, V>) {
+        assert!(table.length == 0, errors::invalid_state(ENOT_EMPTY));
+        destroy_empty_box<K, V, Box<V>>(&table);
+        drop_unchecked_box<K, V, Box<V>>(table)
+    }
+
+    /// Add a new entry to the table. Aborts if an entry for this
+    /// key already exists. The entry itself is not stored in the
+    /// table, and cannot be discovered from it.
+    public fun add<K: copy + drop, V>(table: &mut Table<K, V>, key: K, val: V) {
+        add_box<K, V, Box<V>>(table, key, Box{val});
+        table.length = table.length + 1
+    }
+
+    /// Acquire an immutable reference to the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    public fun borrow<K: copy + drop, V>(table: &Table<K, V>, key: K): &V {
+        &borrow_box<K, V, Box<V>>(table, key).val
+    }
+
+    /// Acquire a mutable reference to the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    public fun borrow_mut<K: copy + drop, V>(table: &mut Table<K, V>, key: K): &mut V {
+        &mut borrow_box_mut<K, V, Box<V>>(table, key).val
+    }
+
+    /// Returns the length of the table, i.e. the number of entries.
+    public fun length<K: copy + drop, V>(table: &Table<K, V>): u64 {
+        table.length
+    }
+
+    /// Returns true if this table is empty.
+    public fun empty<K: copy + drop, V>(table: &Table<K, V>): bool {
+        table.length == 0
+    }
+
+    /// Acquire a mutable reference to the value which `key` maps to.
+    /// Insert the pair (`key`, `default`) first if there is no entry for `key`.
+    public fun borrow_mut_with_default<K: copy + drop, V: drop>(table: &mut Table<K, V>, key: K, default: V): &mut V {
+        if (!contains(table, copy key)) {
+            add(table, copy key, default)
+        };
+        borrow_mut(table, key)
+    }
+
+    /// Remove from `table` and return the value which `key` maps to.
+    /// Aborts if there is no entry for `key`.
+    public fun remove<K: copy + drop, V>(table: &mut Table<K, V>, key: K): V {
+        let Box{val} = remove_box<K, V, Box<V>>(table, key);
+        table.length = table.length - 1;
+        val
+    }
+
+    /// Returns true iff `table` contains an entry for `key`.
+    public fun contains<K: copy + drop, V>(table: &Table<K, V>, key: K): bool {
+        contains_box<K, V, Box<V>>(table, key)
+    }
+
+    #[test_only]
+    /// Testing only: allows to drop a table even if it is not empty.
+    public fun drop_unchecked<K: copy + drop, V>(table: Table<K, V>) {
+        drop_unchecked_box<K, V, Box<V>>(table)
+    }
+
+    // ======================================================================================================
+    // Internal API
+
+    /// Wrapper for values. Required for making values appear as resources in the implementation.
+    struct Box<V> has key, drop, store {
+        val: V
+    }
+
+    // Primitives which take as an additional type parameter `Box<V>`, so the implementation
+    // can use this to determine serialization layout.
+    native fun new_table_handle<K, V>(): address;
+    native fun add_box<K: copy + drop, V, B>(table: &mut Table<K, V>, key: K, val: Box<V>);
+    native fun borrow_box<K: copy + drop, V, B>(table: &Table<K, V>, key: K): &Box<V>;
+    native fun borrow_box_mut<K: copy + drop, V, B>(table: &mut Table<K, V>, key: K): &mut Box<V>;
+    native fun contains_box<K: copy + drop, V, B>(table: &Table<K, V>, key: K): bool;
+    native fun remove_box<K: copy + drop, V, B>(table: &mut Table<K, V>, key: K): Box<V>;
+    native fun destroy_empty_box<K: copy + drop, V, B>(table: &Table<K, V>);
+    native fun drop_unchecked_box<K: copy + drop, V, B>(table: Table<K, V>);
+}
diff --git a/vendors/move/crates/extensions/move-table-extension/sources/Table.spec.move b/vendors/move/crates/extensions/move-table-extension/sources/Table.spec.move
new file mode 100644
index 000000000..91c51e1f9
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/sources/Table.spec.move
@@ -0,0 +1,33 @@
+/// Specifications of the `Table` module.
+spec extensions::table {
+
+    // Make most of the public API intrinsic. Those functions have custom specifications in the prover.
+
+    spec Table {
+        pragma intrinsic = map,
+            map_new = new,
+            map_destroy_empty = destroy_empty,
+            map_len = length,
+            map_is_empty = empty,
+            map_has_key = contains,
+            map_add_no_override = add,
+            map_del_must_exist = remove,
+            map_borrow = borrow,
+            map_borrow_mut = borrow_mut,
+            map_borrow_mut_with_default = borrow_mut_with_default,
+            map_spec_new = spec_new,
+            map_spec_get = spec_get,
+            map_spec_set = spec_set,
+            map_spec_del = spec_remove,
+            map_spec_len = spec_len,
+            map_spec_has_key = spec_contains;
+    }
+
+    // Specification functions for tables
+    spec native fun spec_new<K, V>(): Table<K, V>;
+    spec native fun spec_len<K, V>(t: Table<K, V>): num;
+    spec native fun spec_contains<K, V>(t: Table<K, V>, k: K): bool;
+    spec native fun spec_set<K, V>(t: Table<K, V>, k: K, v: V): Table<K, V>;
+    spec native fun spec_remove<K, V>(t: Table<K, V>, k: K): Table<K, V>;
+    spec native fun spec_get<K, V>(t: Table<K, V>, k: K): V;
+}
diff --git a/vendors/move/crates/extensions/move-table-extension/src/lib.rs b/vendors/move/crates/extensions/move-table-extension/src/lib.rs
new file mode 100644
index 000000000..b913f30b2
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/src/lib.rs
@@ -0,0 +1,705 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! A crate which extends Move by tables.
+//!
+//! See [`Table.move`](../sources/Table.move) for language use.
+//! See [`README.md`](../README.md) for integration into an adapter.
+
+use better_any::{Tid, TidAble};
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::Op,
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    language_storage::TypeTag,
+    value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    native_functions,
+    native_functions::{NativeContext, NativeFunction, NativeFunctionTable},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{GlobalValue, Reference, StructRef, Value},
+};
+use sha3::{Digest, Sha3_256};
+use smallvec::smallvec;
+use std::{
+    cell::RefCell,
+    collections::{btree_map::Entry, BTreeMap, BTreeSet, VecDeque},
+    fmt::Display,
+    sync::Arc,
+};
+
+// ===========================================================================================
+// Public Data Structures and Constants
+
+/// The representation of a table handle. This is created from truncating a sha3-256 based
+/// hash over a transaction hash provided by the environment and a table creation counter
+/// local to the transaction.
+#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
+pub struct TableHandle(pub AccountAddress);
+
+impl Display for TableHandle {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "T-{:X}", self.0)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct TableInfo {
+    pub key_type: TypeTag,
+    pub value_type: TypeTag,
+}
+
+impl TableInfo {
+    pub fn new(key_type: TypeTag, value_type: TypeTag) -> Self {
+        Self {
+            key_type,
+            value_type,
+        }
+    }
+}
+
+impl Display for TableInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Table<{}, {}>", self.key_type, self.value_type)
+    }
+}
+
+/// A table change set.
+#[derive(Default)]
+pub struct TableChangeSet {
+    pub new_tables: BTreeMap<TableHandle, TableInfo>,
+    pub removed_tables: BTreeSet<TableHandle>,
+    pub changes: BTreeMap<TableHandle, TableChange>,
+}
+
+/// A change of a single table.
+pub struct TableChange {
+    pub entries: BTreeMap<Vec<u8>, Op<Vec<u8>>>,
+}
+
+/// A table resolver which needs to be provided by the environment. This allows to lookup
+/// data in remote storage, as well as retrieve cost of table operations.
+pub trait TableResolver {
+    fn resolve_table_entry(
+        &self,
+        handle: &TableHandle,
+        key: &[u8],
+    ) -> Result<Option<Vec<u8>>, anyhow::Error>;
+}
+
+/// The native table context extension. This needs to be attached to the NativeContextExtensions
+/// value which is passed into session functions, so its accessible from natives of this
+/// extension.
+#[derive(Tid)]
+pub struct NativeTableContext<'a> {
+    resolver: &'a dyn TableResolver,
+    txn_hash: [u8; 32],
+    table_data: RefCell<TableData>,
+}
+
+// See stdlib/Error.move
+const _ECATEGORY_INVALID_STATE: u8 = 0;
+const ECATEGORY_INVALID_ARGUMENT: u8 = 7;
+
+const ALREADY_EXISTS: u64 = (100 << 8) + ECATEGORY_INVALID_ARGUMENT as u64;
+const NOT_FOUND: u64 = (101 << 8) + ECATEGORY_INVALID_ARGUMENT as u64;
+// Move side raises this
+const _NOT_EMPTY: u64 = (102 << 8) + _ECATEGORY_INVALID_STATE as u64;
+
+// ===========================================================================================
+// Private Data Structures and Constants
+
+/// A structure representing mutable data of the NativeTableContext. This is in a RefCell
+/// of the overall context so we can mutate while still accessing the overall context.
+#[derive(Default)]
+struct TableData {
+    new_tables: BTreeMap<TableHandle, TableInfo>,
+    removed_tables: BTreeSet<TableHandle>,
+    tables: BTreeMap<TableHandle, Table>,
+}
+
+/// A structure representing a single table.
+struct Table {
+    handle: TableHandle,
+    key_layout: MoveTypeLayout,
+    value_layout: MoveTypeLayout,
+    content: BTreeMap<Vec<u8>, GlobalValue>,
+}
+
+/// The field index of the `handle` field in the `Table` Move struct.
+const HANDLE_FIELD_INDEX: usize = 0;
+
+// =========================================================================================
+// Implementation of Native Table Context
+
+impl<'a> NativeTableContext<'a> {
+    /// Create a new instance of a native table context. This must be passed in via an
+    /// extension into VM session functions.
+    pub fn new(txn_hash: [u8; 32], resolver: &'a dyn TableResolver) -> Self {
+        Self {
+            resolver,
+            txn_hash,
+            table_data: Default::default(),
+        }
+    }
+
+    /// Computes the change set from a NativeTableContext.
+    pub fn into_change_set(self) -> PartialVMResult<TableChangeSet> {
+        let NativeTableContext { table_data, .. } = self;
+        let TableData {
+            new_tables,
+            removed_tables,
+            tables,
+        } = table_data.into_inner();
+        let mut changes = BTreeMap::new();
+        for (handle, table) in tables {
+            let Table {
+                value_layout,
+                content,
+                ..
+            } = table;
+            let mut entries = BTreeMap::new();
+            for (key, gv) in content {
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let bytes = serialize(&value_layout, &val)?;
+                        entries.insert(key, Op::New(bytes));
+                    },
+                    Op::Modify(val) => {
+                        let bytes = serialize(&value_layout, &val)?;
+                        entries.insert(key, Op::Modify(bytes));
+                    },
+                    Op::Delete => {
+                        entries.insert(key, Op::Delete);
+                    },
+                }
+            }
+            if !entries.is_empty() {
+                changes.insert(handle, TableChange { entries });
+            }
+        }
+        Ok(TableChangeSet {
+            new_tables,
+            removed_tables,
+            changes,
+        })
+    }
+}
+
+impl TableData {
+    /// Gets or creates a new table in the TableData. This initializes information about
+    /// the table, like the type layout for keys and values.
+    fn get_or_create_table(
+        &mut self,
+        context: &NativeContext,
+        handle: TableHandle,
+        key_ty: &Type,
+        value_ty: &Type,
+    ) -> PartialVMResult<&mut Table> {
+        Ok(match self.tables.entry(handle) {
+            Entry::Vacant(e) => {
+                let key_layout = get_type_layout(context, key_ty)?;
+                let value_layout = get_type_layout(context, value_ty)?;
+                let table = Table {
+                    handle,
+                    key_layout,
+                    value_layout,
+                    content: Default::default(),
+                };
+                e.insert(table)
+            },
+            Entry::Occupied(e) => e.into_mut(),
+        })
+    }
+}
+
+impl Table {
+    fn get_or_create_global_value(
+        &mut self,
+        context: &NativeTableContext,
+        key: Vec<u8>,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        Ok(match self.content.entry(key) {
+            Entry::Vacant(entry) => {
+                let (gv, loaded) = match context
+                    .resolver
+                    .resolve_table_entry(&self.handle, entry.key())
+                    .map_err(|err| {
+                        partial_extension_error(format!("remote table resolver failure: {}", err))
+                    })? {
+                    Some(val_bytes) => {
+                        let val = deserialize(&self.value_layout, &val_bytes)?;
+                        (
+                            GlobalValue::cached(val)?,
+                            Some(NumBytes::new(val_bytes.len() as u64)),
+                        )
+                    },
+                    None => (GlobalValue::none(), None),
+                };
+                (entry.insert(gv), Some(loaded))
+            },
+            Entry::Occupied(entry) => (entry.into_mut(), None),
+        })
+    }
+}
+
+// =========================================================================================
+// Native Function Implementations
+
+/// Returns all natives for tables.
+pub fn table_natives(table_addr: AccountAddress, gas_params: GasParameters) -> NativeFunctionTable {
+    let natives: [(&str, &str, NativeFunction); 8] = [
+        (
+            "table",
+            "new_table_handle",
+            make_native_new_table_handle(gas_params.new_table_handle),
+        ),
+        (
+            "table",
+            "add_box",
+            make_native_add_box(gas_params.common.clone(), gas_params.add_box),
+        ),
+        (
+            "table",
+            "borrow_box",
+            make_native_borrow_box(gas_params.common.clone(), gas_params.borrow_box.clone()),
+        ),
+        (
+            "table",
+            "borrow_box_mut",
+            make_native_borrow_box(gas_params.common.clone(), gas_params.borrow_box),
+        ),
+        (
+            "table",
+            "remove_box",
+            make_native_remove_box(gas_params.common.clone(), gas_params.remove_box),
+        ),
+        (
+            "table",
+            "contains_box",
+            make_native_contains_box(gas_params.common, gas_params.contains_box),
+        ),
+        (
+            "table",
+            "destroy_empty_box",
+            make_native_destroy_empty_box(gas_params.destroy_empty_box),
+        ),
+        (
+            "table",
+            "drop_unchecked_box",
+            make_native_drop_unchecked_box(gas_params.drop_unchecked_box),
+        ),
+    ];
+
+    native_functions::make_table_from_iter(table_addr, natives)
+}
+
+#[derive(Debug, Clone)]
+pub struct CommonGasParameters {
+    pub load_base_legacy: InternalGas,
+    pub load_base_new: InternalGas,
+    pub load_per_byte: InternalGasPerByte,
+    pub load_failure: InternalGas,
+}
+
+impl CommonGasParameters {
+    fn calculate_load_cost(&self, loaded: Option<Option<NumBytes>>) -> InternalGas {
+        self.load_base_legacy
+            + match loaded {
+                Some(Some(num_bytes)) => self.load_base_new + self.load_per_byte * num_bytes,
+                Some(None) => self.load_base_new + self.load_failure,
+                None => 0.into(),
+            }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct NewTableHandleGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_new_table_handle(
+    gas_params: &NewTableHandleGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 2);
+    assert!(args.is_empty());
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    // Take the transaction hash provided by the environment, combine it with the # of tables
+    // produced so far, sha256 this to produce a unique handle. Given the txn hash
+    // is unique, this should create a unique and deterministic global id.
+    let mut digest = Sha3_256::new();
+    let table_len = table_data.new_tables.len() as u32; // cast usize to u32 to ensure same length
+    Digest::update(&mut digest, table_context.txn_hash);
+    Digest::update(&mut digest, table_len.to_be_bytes());
+    let bytes = digest.finalize().to_vec();
+    let handle = AccountAddress::from_bytes(&bytes[0..AccountAddress::LENGTH])
+        .map_err(|_| partial_extension_error("Unable to create table handle"))?;
+    let key_type = context.type_to_type_tag(&ty_args[0])?;
+    let value_type = context.type_to_type_tag(&ty_args[1])?;
+    assert!(table_data
+        .new_tables
+        .insert(TableHandle(handle), TableInfo::new(key_type, value_type))
+        .is_none());
+
+    Ok(NativeResult::ok(gas_params.base, smallvec![
+        Value::address(handle)
+    ]))
+}
+
+pub fn make_native_new_table_handle(gas_params: NewTableHandleGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_new_table_handle(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct AddBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
+}
+
+fn native_add_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &AddBoxGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 3);
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    let val = args.pop_back().unwrap();
+    let key = args.pop_back().unwrap();
+    let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+
+    let mut cost = gas_params.base;
+
+    let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.move_to(val) {
+        Ok(_) => Ok(NativeResult::ok(cost, smallvec![])),
+        Err(_) => Ok(NativeResult::err(cost, ALREADY_EXISTS)),
+    }
+}
+
+pub fn make_native_add_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: AddBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_add_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct BorrowBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
+}
+
+fn native_borrow_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &BorrowBoxGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 2);
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    let key = args.pop_back().unwrap();
+    let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+
+    let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
+
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.borrow_global() {
+        Ok(ref_val) => Ok(NativeResult::ok(cost, smallvec![ref_val])),
+        Err(_) => Ok(NativeResult::err(cost, NOT_FOUND)),
+    }
+}
+
+pub fn make_native_borrow_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: BorrowBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct ContainsBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
+}
+
+fn native_contains_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &ContainsBoxGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 2);
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    let key = args.pop_back().unwrap();
+    let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+
+    let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
+
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    let exists = Value::bool(gv.exists()?);
+
+    Ok(NativeResult::ok(cost, smallvec![exists]))
+}
+
+pub fn make_native_contains_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: ContainsBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_contains_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct RemoveGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
+}
+
+fn native_remove_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &RemoveGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 2);
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    let key = args.pop_back().unwrap();
+    let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+
+    let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
+
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.move_from() {
+        Ok(val) => Ok(NativeResult::ok(cost, smallvec![val])),
+        Err(_) => Ok(NativeResult::err(cost, NOT_FOUND)),
+    }
+}
+
+pub fn make_native_remove_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: RemoveGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_remove_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyBoxGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_destroy_empty_box(
+    gas_params: &DestroyEmptyBoxGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 1);
+
+    let table_context = context.extensions().get::<NativeTableContext>();
+    let mut table_data = table_context.table_data.borrow_mut();
+
+    let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+    // TODO: Can the following line be removed?
+    table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
+
+    assert!(table_data.removed_tables.insert(handle));
+
+    Ok(NativeResult::ok(gas_params.base, smallvec![]))
+}
+
+pub fn make_native_destroy_empty_box(gas_params: DestroyEmptyBoxGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty_box(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct DropUncheckedBoxGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_drop_unchecked_box(
+    gas_params: &DropUncheckedBoxGasParameters,
+    _context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 3);
+    assert_eq!(args.len(), 1);
+
+    Ok(NativeResult::ok(gas_params.base, smallvec![]))
+}
+
+pub fn make_native_drop_unchecked_box(gas_params: DropUncheckedBoxGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_drop_unchecked_box(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub common: CommonGasParameters,
+    pub new_table_handle: NewTableHandleGasParameters,
+    pub add_box: AddBoxGasParameters,
+    pub borrow_box: BorrowBoxGasParameters,
+    pub contains_box: ContainsBoxGasParameters,
+    pub remove_box: RemoveGasParameters,
+    pub destroy_empty_box: DestroyEmptyBoxGasParameters,
+    pub drop_unchecked_box: DropUncheckedBoxGasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            common: CommonGasParameters {
+                load_base_legacy: 0.into(),
+                load_base_new: 0.into(),
+                load_per_byte: 0.into(),
+                load_failure: 0.into(),
+            },
+            new_table_handle: NewTableHandleGasParameters { base: 0.into() },
+            add_box: AddBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            borrow_box: BorrowBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            contains_box: ContainsBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            remove_box: RemoveGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            destroy_empty_box: DestroyEmptyBoxGasParameters { base: 0.into() },
+            drop_unchecked_box: DropUncheckedBoxGasParameters { base: 0.into() },
+        }
+    }
+}
+
+// =========================================================================================
+// Helpers
+
+fn get_table_handle(table: &StructRef) -> PartialVMResult<TableHandle> {
+    let handle = table
+        .borrow_field(HANDLE_FIELD_INDEX)?
+        .value_as::<Reference>()?
+        .read_ref()?
+        .value_as::<AccountAddress>()?;
+    Ok(TableHandle(handle))
+}
+
+fn serialize(layout: &MoveTypeLayout, val: &Value) -> PartialVMResult<Vec<u8>> {
+    val.simple_serialize(layout)
+        .ok_or_else(|| partial_extension_error("cannot serialize table key or value"))
+}
+
+fn deserialize(layout: &MoveTypeLayout, bytes: &[u8]) -> PartialVMResult<Value> {
+    Value::simple_deserialize(bytes, layout)
+        .ok_or_else(|| partial_extension_error("cannot deserialize table key or value"))
+}
+
+fn partial_extension_error(msg: impl ToString) -> PartialVMError {
+    PartialVMError::new(StatusCode::VM_EXTENSION_ERROR).with_message(msg.to_string())
+}
+
+fn get_type_layout(context: &NativeContext, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
+    context
+        .type_to_type_layout(ty)?
+        .ok_or_else(|| partial_extension_error("cannot determine type layout"))
+}
diff --git a/vendors/move/crates/extensions/move-table-extension/tests/move_unit_tests.rs b/vendors/move/crates/extensions/move-table-extension/tests/move_unit_tests.rs
new file mode 100644
index 000000000..9bc3c7205
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/tests/move_unit_tests.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::base::test::{run_move_unit_tests, UnitTestResult};
+use move_core_types::account_address::AccountAddress;
+use move_table_extension::{table_natives, GasParameters};
+use move_unit_test::UnitTestingConfig;
+use std::path::PathBuf;
+use tempfile::tempdir;
+
+fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
+    let pkg_path = path_in_crate(path_to_pkg);
+    let mut natives = move_stdlib::natives::all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
+    );
+    natives.append(&mut table_natives(
+        AccountAddress::from_hex_literal("0x2").unwrap(),
+        GasParameters::zeros(),
+    ));
+    let res = run_move_unit_tests(
+        &pkg_path,
+        move_package::BuildConfig {
+            test_mode: true,
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            ..Default::default()
+        },
+        UnitTestingConfig::default_with_bound(Some(100_000)),
+        natives,
+        None,
+        /* compute_coverage */ false,
+        &mut std::io::stdout(),
+    )
+    .unwrap();
+    if res != UnitTestResult::Success {
+        panic!("aborting because of Move unit test failures");
+    }
+}
+
+#[test]
+fn move_unit_tests() {
+    run_tests_for_pkg(".");
+}
+
+pub fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push(relative.into());
+    path
+}
diff --git a/vendors/move/crates/extensions/move-table-extension/tests/table_tests.move b/vendors/move/crates/extensions/move-table-extension/tests/table_tests.move
new file mode 100644
index 000000000..c61fda43f
--- /dev/null
+++ b/vendors/move/crates/extensions/move-table-extension/tests/table_tests.move
@@ -0,0 +1,257 @@
+#[test_only]
+module extensions::table_tests {
+    use std::vector;
+    use extensions::table as T;
+
+    struct S<phantom K: copy + drop, phantom V> has key {
+        t: T::Table<K, V>
+    }
+
+    struct Balance has store {
+        value: u128
+    }
+
+    #[test]
+    fun simple_read_write() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 1, 2);
+        T::add(&mut t, 10, 33);
+        assert!(*T::borrow(&t, 1) == 2, 1);
+        assert!(*T::borrow(&t, 10) == 33, 1);
+        T::drop_unchecked(t)
+    }
+
+    #[test]
+    fun simple_update() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 1, 2);
+        assert!(*T::borrow(&t, 1) == 2, 1);
+        *T::borrow_mut(&mut t, 1) = 3;
+        assert!(*T::borrow(&t, 1) == 3, 1);
+        T::drop_unchecked(t)
+    }
+
+    #[test]
+    fun test_destroy() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 1, 2);
+        assert!(*T::borrow(&t, 1) == 2, 1);
+        T::remove(&mut t, 1);
+        T::destroy_empty(t)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 26113, location = extensions::table)]
+    fun test_destroy_fails() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 1, 2);
+        assert!(*T::borrow(&t, 1) == 2, 1);
+        T::destroy_empty(t) // expected to fail
+    }
+
+    #[test]
+    fun test_length() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 1, 2);
+        T::add(&mut t, 2, 2);
+        assert!(T::length(&t) == 2, 1);
+        T::remove(&mut t, 1);
+        assert!(T::length(&t) == 1, 2);
+        T::drop_unchecked(t)
+    }
+
+    #[test(s = @0x42)]
+    fun test_primitive(s: signer) acquires S {
+        let t = T::new<u64, u128>();
+        assert!(!T::contains(&t, 42), 100);
+
+        T::add(&mut t, 42, 1012);
+        assert!(T::contains(&t, 42), 101);
+        assert!(!T::contains(&t, 0), 102);
+        assert!(*T::borrow(&t, 42) == 1012, 103);
+
+        T::add(&mut t, 43, 1013);
+        assert!(T::contains(&t, 42), 104);
+        assert!(!T::contains(&t, 0), 105);
+        assert!(T::contains(&t, 43), 106);
+        assert!(*T::borrow(&t, 43) == 1013, 107);
+
+        let v = T::remove(&mut t, 42);
+        assert!(v == 1012, 108);
+
+        move_to(&s, S { t });
+
+        let t_ref = &borrow_global<S<u64, u128>>(@0x42).t;
+        let v = *T::borrow(t_ref, 43);
+        assert!(v == 1013, 110);
+
+        let S { t: local_t } = move_from<S<u64, u128>>(@0x42);
+        assert!(*T::borrow(&local_t, 43) == 1013, 111);
+
+        move_to(&s, S { t: local_t });
+    }
+
+    #[test(s = @0x42)]
+    fun test_vector(s: signer) acquires S {
+        let t = T::new<u8, vector<address>>();
+
+        T::add(&mut t, 42, vector::singleton<address>(@0x1012));
+        assert!(T::contains(&t, 42), 101);
+        assert!(!T::contains(&t, 0), 102);
+        assert!(vector::length(T::borrow(&t, 42)) == 1, 103);
+        assert!(*vector::borrow(T::borrow(&t, 42), 0) == @0x1012, 104);
+
+        move_to(&s, S { t });
+
+        let s = borrow_global_mut<S<u8, vector<address>>>(@0x42);
+        let v_mut_ref = T::borrow_mut(&mut s.t, 42);
+        vector::push_back(v_mut_ref, @0x1013);
+        assert!(vector::length(T::borrow(&s.t, 42)) == 2, 105);
+        assert!(*vector::borrow(T::borrow(&s.t, 42), 1) == @0x1013, 106);
+
+        let v = T::remove(&mut s.t, 42);
+        assert!(vector::length(&v) == 2, 107);
+        assert!(*vector::borrow(&v, 0) == @0x1012, 108);
+        assert!(*vector::borrow(&v, 1) == @0x1013, 109);
+        assert!(!T::contains(&s.t, 42), 110);
+    }
+
+    #[test(s = @0x42)]
+    fun test_struct(s: signer) acquires S {
+        let t = T::new<address, Balance>();
+        let val_1 = 11;
+        let val_2 = 45;
+
+        T::add(&mut t, @0xAB, Balance{ value: val_1 });
+        assert!(T::contains(&t, @0xAB), 101);
+        assert!(*&T::borrow(&t, @0xAB).value == val_1, 102);
+
+        move_to(&s, S { t });
+
+        let global_t = &mut borrow_global_mut<S<address, Balance>>(@0x42).t;
+
+        T::add(global_t, @0xCD, Balance{ value: val_2 });
+        assert!(*&T::borrow(global_t, @0xAB).value == val_1, 103);
+        assert!(*&T::borrow(global_t, @0xCD).value == val_2, 104);
+
+
+        let entry_mut_ref = T::borrow_mut(global_t , @0xCD);
+        *&mut entry_mut_ref.value = entry_mut_ref.value - 1;
+        assert!(*&T::borrow(global_t, @0xCD).value == val_2 - 1, 105);
+
+        let Balance { value } = T::remove(global_t, @0xAB);
+        assert!(value == val_1, 106);
+        assert!(!T::contains(global_t, @0xAB), 107);
+    }
+
+    #[test(s = @0x42)]
+    fun test_table_of_tables(s: signer) {
+        let t = T::new<address, T::Table<address, u128>>();
+        let val_1 = 11;
+        let val_2 = 45;
+        let val_3 = 78;
+
+        // Create two small tables
+        let t1 = T::new<address, u128>();
+        T::add(&mut t1, @0xAB, val_1);
+
+        let t2 = T::new<address, u128>();
+        T::add(&mut t2, @0xCD, val_2);
+
+        // Insert two small tables into the big table
+        T::add(&mut t, @0x12, t1);
+        T::add(&mut t, @0x34, t2);
+
+
+        assert!(T::contains(T::borrow(&t, @0x12), @0xAB), 101);
+        assert!(T::contains(T::borrow(&t, @0x34), @0xCD), 102);
+        assert!(*T::borrow(T::borrow(&t, @0x12), @0xAB) == val_1, 103);
+        assert!(*T::borrow(T::borrow(&t, @0x34), @0xCD) == val_2, 104);
+
+        T::add(T::borrow_mut(&mut t, @0x12), @0xEF, val_3);
+        assert!(*T::borrow(T::borrow(&t, @0x12), @0xEF) == val_3, 105);
+        assert!(*T::borrow(T::borrow(&t, @0x12), @0xAB) == val_1, 106);
+
+        let val = T::remove(T::borrow_mut(&mut t, @0x34), @0xCD);
+        assert!(val == val_2, 107);
+        assert!(!T::contains(T::borrow(&t, @0x34), @0xCD), 108);
+
+        move_to(&s, S { t });
+    }
+
+    #[test(s = @0x42)]
+    #[expected_failure(abort_code = 25607, location = extensions::table)]
+    fun test_insert_fail(s: signer) {
+        let t = T::new<u64, u128>();
+        assert!(!T::contains(&t, 42), 100);
+
+        T::add(&mut t, 42, 1012);
+        assert!(T::contains(&t, 42), 101);
+        T::add(&mut t, 42, 1013); // should fail here since key 42 already exists
+
+        move_to(&s, S { t });
+    }
+
+    #[test(s = @0x42)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
+    fun test_borrow_fail(s: signer) {
+        let t = T::new<u64, u128>();
+        assert!(!T::contains(&t, 42), 100);
+
+        let entry_ref = T::borrow_mut(&mut t, 42); // should fail here since key 42 doesn't exist
+        *entry_ref = 1;
+
+        move_to(&s, S { t });
+    }
+
+    #[test(s = @0x42)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
+    fun test_remove_fail(s: signer) {
+        let t = T::new<u64, Balance>();
+        let Balance { value } = T::remove(&mut t, 42); // should fail here since key 42 doesn't exist
+        assert!(value == 0, 101);
+        move_to(&s, S { t });
+    }
+
+    #[test]
+    fun test_add_after_remove() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 42, 42);
+        let forty_two = T::remove(&mut t, 42);
+        assert!(forty_two == 42, 101);
+
+        T::add(&mut t, 42, 0);
+        let zero = T::borrow(&mut t, 42);
+        assert!(*zero == 0, 102);
+
+        T::drop_unchecked(t)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
+    fun test_remove_removed() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 42, 42);
+        let forty_two = T::remove(&mut t, 42);
+        assert!(forty_two == 42, 101);
+
+        // remove removed value
+        let _r = T::remove(&mut t, 42);
+
+        T::drop_unchecked(t)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
+    fun test_borrow_removed() {
+        let t = T::new<u64, u64>();
+        T::add(&mut t, 42, 42);
+        let forty_two = T::remove(&mut t, 42);
+        assert!(forty_two == 42, 101);
+
+        // borrow removed value
+        let _r = T::borrow(&mut t, 42);
+
+        T::drop_unchecked(t)
+    }
+}
diff --git a/vendors/move/crates/invalid-mutations/Cargo.toml b/vendors/move/crates/invalid-mutations/Cargo.toml
new file mode 100644
index 000000000..a45f26d66
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "invalid-mutations"
+version = "0.1.0"
+edition = "2021"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem invalid mutations"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+[dependencies]
+move-core-types.workspace = true
+move-binary-format.workspace = true
+proptest.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/invalid-mutations/src/bounds.rs b/vendors/move/crates/invalid-mutations/src/bounds.rs
new file mode 100644
index 000000000..b4d31c201
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/src/bounds.rs
@@ -0,0 +1,364 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{bounds_error, PartialVMError},
+    file_format::{
+        AddressIdentifierIndex, CompiledModule, FunctionHandleIndex, IdentifierIndex,
+        ModuleHandleIndex, SignatureIndex, StructDefinitionIndex, StructHandleIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    views::{ModuleView, SignatureTokenView},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use proptest::{
+    prelude::*,
+    sample::{self, Index as PropIndex},
+};
+use std::collections::BTreeMap;
+
+mod code_unit;
+pub use code_unit::{ApplyCodeUnitBoundsContext, CodeUnitBoundsMutation};
+use move_binary_format::file_format::SignatureToken;
+
+/// Represents the number of pointers that exist out from a node of a particular kind.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum PointerKind {
+    /// Exactly one pointer out with this index kind as its destination.
+    One(IndexKind),
+    /// Zero or one pointer out with this index kind as its destination. Like the `?` operator in
+    /// regular expressions.
+    Optional(IndexKind),
+    /// Zero or more pointers out with this index kind as its destination. Like the `*` operator
+    /// in regular expressions.
+    Star(IndexKind),
+}
+
+impl PointerKind {
+    /// A list of what pointers (indexes) exist out from a particular kind of node within the
+    /// module.
+    ///
+    /// The only special case is `FunctionDefinition`, which contains a `CodeUnit` that can contain
+    /// one of several kinds of pointers out. That is not represented in this table.
+    #[inline]
+    pub fn pointers_from(src_kind: IndexKind) -> &'static [PointerKind] {
+        use IndexKind::*;
+        use PointerKind::*;
+
+        match src_kind {
+            ModuleHandle => &[One(AddressIdentifier), One(Identifier)],
+            StructHandle => &[One(ModuleHandle), One(Identifier)],
+            FunctionHandle => &[
+                One(ModuleHandle),
+                One(Identifier),
+                One(Signature),
+                One(Signature),
+            ],
+            StructDefinition => &[One(StructHandle), Star(StructHandle)],
+            FunctionDefinition => &[One(FunctionHandle), One(Signature)],
+            FriendDeclaration => &[One(AddressIdentifier), One(Identifier)],
+            Signature => &[Star(StructHandle)],
+            FieldHandle => &[One(StructDefinition)],
+            _ => &[],
+        }
+    }
+
+    #[inline]
+    pub fn to_index_kind(self) -> IndexKind {
+        match self {
+            PointerKind::One(idx) | PointerKind::Optional(idx) | PointerKind::Star(idx) => idx,
+        }
+    }
+}
+
+pub static VALID_POINTER_SRCS: &[IndexKind] = &[
+    IndexKind::ModuleHandle,
+    IndexKind::StructHandle,
+    IndexKind::FunctionHandle,
+    IndexKind::FieldHandle,
+    IndexKind::StructDefinition,
+    IndexKind::FunctionDefinition,
+    IndexKind::FriendDeclaration,
+    IndexKind::Signature,
+];
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn pointer_kind_sanity() {
+        for variant in IndexKind::variants() {
+            if VALID_POINTER_SRCS.iter().any(|x| x == variant) {
+                assert!(
+                    !PointerKind::pointers_from(*variant).is_empty(),
+                    "expected variant {:?} to be a valid pointer source",
+                    variant,
+                );
+            } else {
+                assert!(
+                    PointerKind::pointers_from(*variant).is_empty(),
+                    "expected variant {:?} to not be a valid pointer source",
+                    variant,
+                );
+            }
+        }
+    }
+}
+
+/// Represents a single mutation to a `CompiledModule` to produce an out-of-bounds situation.
+///
+/// Use `OutOfBoundsMutation::strategy()` to generate them, preferably using `Vec` to generate
+/// many at a time. Then use `ApplyOutOfBoundsContext` to apply those mutations.
+#[derive(Debug)]
+pub struct OutOfBoundsMutation {
+    src_kind: IndexKind,
+    src_idx: PropIndex,
+    dst_kind: IndexKind,
+    offset: usize,
+}
+
+impl OutOfBoundsMutation {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        (
+            Self::src_kind_strategy(),
+            any::<PropIndex>(),
+            any::<PropIndex>(),
+            0..16_usize,
+        )
+            .prop_map(|(src_kind, src_idx, dst_kind_idx, offset)| {
+                let dst_kind = Self::dst_kind(src_kind, dst_kind_idx);
+                Self {
+                    src_kind,
+                    src_idx,
+                    dst_kind,
+                    offset,
+                }
+            })
+    }
+
+    // Not all source kinds can be made to be out of bounds (e.g. inherent types can't.)
+    fn src_kind_strategy() -> impl Strategy<Value = IndexKind> {
+        sample::select(VALID_POINTER_SRCS)
+    }
+
+    fn dst_kind(src_kind: IndexKind, dst_kind_idx: PropIndex) -> IndexKind {
+        dst_kind_idx
+            .get(PointerKind::pointers_from(src_kind))
+            .to_index_kind()
+    }
+}
+
+/// This is used for source indexing, to work with pick_slice_idxs.
+impl AsRef<PropIndex> for OutOfBoundsMutation {
+    #[inline]
+    fn as_ref(&self) -> &PropIndex {
+        &self.src_idx
+    }
+}
+
+pub struct ApplyOutOfBoundsContext {
+    module: CompiledModule,
+    // This is an Option because it gets moved out in apply before apply_one is called. Rust
+    // doesn't let you call another con-consuming method after a partial move out.
+    mutations: Option<Vec<OutOfBoundsMutation>>,
+
+    // Some precomputations done for signatures.
+    sig_structs: Vec<(SignatureIndex, usize)>,
+}
+
+impl ApplyOutOfBoundsContext {
+    pub fn new(module: CompiledModule, mutations: Vec<OutOfBoundsMutation>) -> Self {
+        let sig_structs: Vec<_> = Self::sig_structs(&module).collect();
+
+        Self {
+            module,
+            mutations: Some(mutations),
+            sig_structs,
+        }
+    }
+
+    pub fn apply(mut self) -> (CompiledModule, Vec<PartialVMError>) {
+        // This is a map from (source kind, dest kind) to the actual mutations -- this is done to
+        // figure out how many mutations to do for a particular pair, which is required for
+        // pick_slice_idxs below.
+        let mut mutation_map = BTreeMap::new();
+        for mutation in self
+            .mutations
+            .take()
+            .expect("mutations should always be present")
+        {
+            mutation_map
+                .entry((mutation.src_kind, mutation.dst_kind))
+                .or_insert_with(Vec::new)
+                .push(mutation);
+        }
+
+        let mut results = vec![];
+
+        for ((src_kind, dst_kind), mutations) in mutation_map {
+            // It would be cool to use an iterator here, if someone could figure out exactly how
+            // to get the lifetimes right :)
+            results.extend(self.apply_one(src_kind, dst_kind, mutations));
+        }
+        (self.module, results)
+    }
+
+    fn apply_one(
+        &mut self,
+        src_kind: IndexKind,
+        dst_kind: IndexKind,
+        mutations: Vec<OutOfBoundsMutation>,
+    ) -> Vec<PartialVMError> {
+        let src_count = match src_kind {
+            IndexKind::Signature => self.sig_structs.len(),
+            // For the other sorts it's always possible to change an index.
+            src_kind => self.module.kind_count(src_kind),
+        };
+        // Any signature can be a destination, not just the ones that have structs in them.
+        let dst_count = self.module.kind_count(dst_kind);
+        let to_mutate = crate::helpers::pick_slice_idxs(src_count, &mutations);
+
+        mutations
+            .iter()
+            .zip(to_mutate)
+            .map(move |(mutation, src_idx)| {
+                self.set_index(
+                    src_kind,
+                    src_idx,
+                    dst_kind,
+                    dst_count,
+                    (dst_count + mutation.offset) as TableIndex,
+                )
+            })
+            .collect()
+    }
+
+    /// Sets the particular index in the table
+    ///
+    /// For example, with `src_kind` set to `ModuleHandle` and `dst_kind` set to `AddressPool`,
+    /// this will set self.module_handles[src_idx].address to new_idx.
+    ///
+    /// This is mainly used for test generation.
+    fn set_index(
+        &mut self,
+        src_kind: IndexKind,
+        src_idx: usize,
+        dst_kind: IndexKind,
+        dst_count: usize,
+        new_idx: TableIndex,
+    ) -> PartialVMError {
+        use IndexKind::*;
+
+        // These are default values, but some of the match arms below mutate them.
+        let mut src_idx = src_idx;
+        let err = bounds_error(
+            StatusCode::INDEX_OUT_OF_BOUNDS,
+            dst_kind,
+            new_idx,
+            dst_count,
+        );
+
+        // A dynamic type system would be able to express this next block of code far more
+        // concisely. A static type system would require some sort of complicated dependent type
+        // structure that Rust doesn't have. As things stand today, every possible case needs to
+        // be listed out.
+
+        match (src_kind, dst_kind) {
+            (ModuleHandle, AddressIdentifier) => {
+                self.module.module_handles[src_idx].address = AddressIdentifierIndex(new_idx)
+            }
+            (ModuleHandle, Identifier) => {
+                self.module.module_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (StructHandle, ModuleHandle) => {
+                self.module.struct_handles[src_idx].module = ModuleHandleIndex(new_idx)
+            }
+            (StructHandle, Identifier) => {
+                self.module.struct_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (FunctionHandle, ModuleHandle) => {
+                self.module.function_handles[src_idx].module = ModuleHandleIndex(new_idx)
+            }
+            (FunctionHandle, Identifier) => {
+                self.module.function_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (FunctionHandle, Signature) => {
+                self.module.function_handles[src_idx].parameters = SignatureIndex(new_idx)
+            }
+            (StructDefinition, StructHandle) => {
+                self.module.struct_defs[src_idx].struct_handle = StructHandleIndex(new_idx)
+            }
+            (FunctionDefinition, FunctionHandle) => {
+                self.module.function_defs[src_idx].function = FunctionHandleIndex(new_idx)
+            }
+            (FunctionDefinition, Signature) => {
+                self.module.function_defs[src_idx]
+                    .code
+                    .as_mut()
+                    .unwrap()
+                    .locals = SignatureIndex(new_idx)
+            }
+            (Signature, StructHandle) => {
+                let (actual_src_idx, arg_idx) = self.sig_structs[src_idx];
+                src_idx = actual_src_idx.into_index();
+                self.module.signatures[src_idx].0[arg_idx]
+                    .debug_set_sh_idx(StructHandleIndex(new_idx));
+            }
+            (FieldHandle, StructDefinition) => {
+                self.module.field_handles[src_idx].owner = StructDefinitionIndex(new_idx)
+            }
+            (FriendDeclaration, AddressIdentifier) => {
+                self.module.friend_decls[src_idx].address = AddressIdentifierIndex(new_idx)
+            }
+            (FriendDeclaration, Identifier) => {
+                self.module.friend_decls[src_idx].name = IdentifierIndex(new_idx)
+            }
+            _ => panic!("Invalid pointer kind: {:?} -> {:?}", src_kind, dst_kind),
+        }
+
+        err.at_index(src_kind, src_idx as TableIndex)
+    }
+
+    /// Returns the indexes of locals signatures that contain struct handles inside them.
+    fn sig_structs(module: &CompiledModule) -> impl Iterator<Item = (SignatureIndex, usize)> + '_ {
+        let module_view = ModuleView::new(module);
+        module_view
+            .signatures()
+            .enumerate()
+            .flat_map(|(idx, signature)| {
+                let idx = SignatureIndex(idx as u16);
+                Self::find_struct_tokens(signature.tokens(), move |arg_idx| (idx, arg_idx))
+            })
+    }
+
+    #[inline]
+    fn find_struct_tokens<'b, F, T>(
+        tokens: impl IntoIterator<Item = SignatureTokenView<'b, CompiledModule>> + 'b,
+        map_fn: F,
+    ) -> impl Iterator<Item = T> + 'b
+    where
+        F: Fn(usize) -> T + 'b,
+    {
+        tokens
+            .into_iter()
+            .enumerate()
+            .filter_map(move |(arg_idx, token)| {
+                struct_handle(token.signature_token()).map(|_| map_fn(arg_idx))
+            })
+    }
+}
+
+fn struct_handle(token: &SignatureToken) -> Option<StructHandleIndex> {
+    use SignatureToken::*;
+
+    match token {
+        Struct(sh_idx) => Some(*sh_idx),
+        StructInstantiation(sh_idx, _) => Some(*sh_idx),
+        Reference(token) | MutableReference(token) => struct_handle(token),
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer | Vector(_)
+        | TypeParameter(_) => None,
+    }
+}
diff --git a/vendors/move/crates/invalid-mutations/src/bounds/code_unit.rs b/vendors/move/crates/invalid-mutations/src/bounds/code_unit.rs
new file mode 100644
index 000000000..18085317d
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/src/bounds/code_unit.rs
@@ -0,0 +1,547 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{offset_out_of_bounds, PartialVMError},
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, ConstantPoolIndex, FieldHandleIndex,
+        FieldInstantiationIndex, FunctionDefinitionIndex, FunctionHandleIndex,
+        FunctionInstantiationIndex, LocalIndex, SignatureIndex, StructDefInstantiationIndex,
+        StructDefinitionIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use proptest::{prelude::*, sample::Index as PropIndex};
+use std::collections::BTreeMap;
+
+/// Represents a single mutation onto a code unit to make it out of bounds.
+#[derive(Debug)]
+pub struct CodeUnitBoundsMutation {
+    function_def: PropIndex,
+    bytecode: PropIndex,
+    offset: usize,
+}
+
+impl CodeUnitBoundsMutation {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        (any::<PropIndex>(), any::<PropIndex>(), 0..16_usize).prop_map(
+            |(function_def, bytecode, offset)| Self {
+                function_def,
+                bytecode,
+                offset,
+            },
+        )
+    }
+}
+
+impl AsRef<PropIndex> for CodeUnitBoundsMutation {
+    #[inline]
+    fn as_ref(&self) -> &PropIndex {
+        &self.bytecode
+    }
+}
+
+pub struct ApplyCodeUnitBoundsContext<'a> {
+    module: &'a mut CompiledModule,
+    // This is so apply_one can be called after mutations has been iterated on.
+    mutations: Option<Vec<CodeUnitBoundsMutation>>,
+}
+
+macro_rules! new_bytecode {
+    ($dst_len:expr, $fidx:expr, $bcidx:expr, $offset:expr, $kind:ident, $bytecode_ident:tt) => {{
+        let dst_len: usize = $dst_len;
+        let new_idx: usize = dst_len + $offset;
+        (
+            $bytecode_ident($kind::new(new_idx as TableIndex)),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $kind::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+
+    ($dst_len:expr, $fidx:expr, $bcidx:expr, $offset:expr, $kind:ident, $bytecode_ident:tt, $($others:expr),+) => {{
+        let dst_len: usize = $dst_len;
+        let new_idx: usize = dst_len + $offset;
+        (
+            $bytecode_ident($kind::new(new_idx as TableIndex), $($others),+),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $kind::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! struct_bytecode {
+    ($dst_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $idx_type: ident, $bytecode_ident: tt) => {{
+        let dst_len = $dst_len;
+        let new_idx = dst_len + $offset;
+        (
+            $bytecode_ident($idx_type::new(new_idx as TableIndex)),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $idx_type::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! code_bytecode {
+    ($code_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $bytecode_ident: tt) => {{
+        let code_len = $code_len;
+        let new_idx = code_len + $offset;
+        (
+            $bytecode_ident(new_idx as CodeOffset),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::CodeDefinition,
+                new_idx,
+                code_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! locals_bytecode {
+    ($locals_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $bytecode_ident: tt) => {{
+        let locals_len = $locals_len;
+        let new_idx = locals_len + $offset;
+        (
+            $bytecode_ident(new_idx as LocalIndex),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::LocalPool,
+                new_idx,
+                locals_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+impl<'a> ApplyCodeUnitBoundsContext<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<CodeUnitBoundsMutation>) -> Self {
+        Self {
+            module,
+            mutations: Some(mutations),
+        }
+    }
+
+    pub fn apply(mut self) -> Vec<PartialVMError> {
+        let function_def_len = self.module.function_defs.len();
+
+        let mut mutation_map = BTreeMap::new();
+        for mutation in self
+            .mutations
+            .take()
+            .expect("mutations should always be present")
+        {
+            let picked_idx = mutation.function_def.index(function_def_len);
+            mutation_map
+                .entry(picked_idx)
+                .or_insert_with(Vec::new)
+                .push(mutation);
+        }
+
+        let mut results = vec![];
+
+        for (idx, mutations) in mutation_map {
+            results.extend(self.apply_one(idx, mutations));
+        }
+        results
+    }
+
+    fn apply_one(
+        &mut self,
+        fidx: usize,
+        mutations: Vec<CodeUnitBoundsMutation>,
+    ) -> Vec<PartialVMError> {
+        // For this function def, find all the places where a bounds mutation can be applied.
+        let func_def = &mut self.module.function_defs[fidx];
+        let current_fdef = FunctionDefinitionIndex(fidx as TableIndex);
+        let func_handle = &self.module.function_handles[func_def.function.into_index()];
+        let code = func_def.code.as_mut().unwrap();
+        let locals_len = self.module.signatures[func_handle.parameters.into_index()].len()
+            + self.module.signatures[code.locals.into_index()].len();
+        let code = &mut code.code;
+        let code_len = code.len();
+
+        let interesting_offsets: Vec<usize> = (0..code.len())
+            .filter(|bytecode_idx| is_interesting(&code[*bytecode_idx]))
+            .collect();
+        let to_mutate = crate::helpers::pick_slice_idxs(interesting_offsets.len(), &mutations);
+
+        // These have to be computed upfront because self.module is being mutated below.
+        let constant_pool_len = self.module.constant_pool.len();
+        let function_handles_len = self.module.function_handles.len();
+        let field_handle_len = self.module.field_handles.len();
+        let struct_defs_len = self.module.struct_defs.len();
+        let struct_inst_len = self.module.struct_def_instantiations.len();
+        let function_inst_len = self.module.function_instantiations.len();
+        let field_inst_len = self.module.field_instantiations.len();
+        let signature_pool_len = self.module.signatures.len();
+
+        mutations
+            .iter()
+            .zip(to_mutate)
+            .map(|(mutation, interesting_offsets_idx)| {
+                let bytecode_idx = interesting_offsets[interesting_offsets_idx];
+                let offset = mutation.offset;
+                use Bytecode::*;
+
+                let (new_bytecode, err) = match code[bytecode_idx] {
+                    LdConst(_) => new_bytecode!(
+                        constant_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        ConstantPoolIndex,
+                        LdConst
+                    ),
+                    ImmBorrowField(_) => new_bytecode!(
+                        field_handle_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldHandleIndex,
+                        ImmBorrowField
+                    ),
+                    ImmBorrowFieldGeneric(_) => new_bytecode!(
+                        field_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldInstantiationIndex,
+                        ImmBorrowFieldGeneric
+                    ),
+                    MutBorrowField(_) => new_bytecode!(
+                        field_handle_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldHandleIndex,
+                        MutBorrowField
+                    ),
+                    MutBorrowFieldGeneric(_) => new_bytecode!(
+                        field_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldInstantiationIndex,
+                        MutBorrowFieldGeneric
+                    ),
+                    Call(_) => struct_bytecode!(
+                        function_handles_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FunctionHandleIndex,
+                        Call
+                    ),
+                    CallGeneric(_) => struct_bytecode!(
+                        function_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FunctionInstantiationIndex,
+                        CallGeneric
+                    ),
+                    Pack(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Pack
+                    ),
+                    PackGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        PackGeneric
+                    ),
+                    Unpack(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Unpack
+                    ),
+                    UnpackGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        UnpackGeneric
+                    ),
+                    Exists(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Exists
+                    ),
+                    ExistsGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        ExistsGeneric
+                    ),
+                    MutBorrowGlobal(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MutBorrowGlobal
+                    ),
+                    MutBorrowGlobalGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MutBorrowGlobalGeneric
+                    ),
+                    ImmBorrowGlobal(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        ImmBorrowGlobal
+                    ),
+                    ImmBorrowGlobalGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        ImmBorrowGlobalGeneric
+                    ),
+                    MoveFrom(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MoveFrom
+                    ),
+                    MoveFromGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MoveFromGeneric
+                    ),
+                    MoveTo(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MoveTo
+                    ),
+                    MoveToGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MoveToGeneric
+                    ),
+                    BrTrue(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, BrTrue)
+                    }
+                    BrFalse(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, BrFalse)
+                    }
+                    Branch(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, Branch)
+                    }
+                    CopyLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, CopyLoc)
+                    }
+                    MoveLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, MoveLoc)
+                    }
+                    StLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, StLoc)
+                    }
+                    MutBorrowLoc(_) => locals_bytecode!(
+                        locals_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        MutBorrowLoc
+                    ),
+                    ImmBorrowLoc(_) => locals_bytecode!(
+                        locals_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        ImmBorrowLoc
+                    ),
+                    VecPack(_, num) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPack,
+                        num
+                    ),
+                    VecLen(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecLen
+                    ),
+                    VecImmBorrow(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecImmBorrow
+                    ),
+                    VecMutBorrow(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecMutBorrow
+                    ),
+                    VecPushBack(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPushBack
+                    ),
+                    VecPopBack(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPopBack
+                    ),
+                    VecUnpack(_, num) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecUnpack,
+                        num
+                    ),
+                    VecSwap(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecSwap
+                    ),
+
+                    // List out the other options explicitly so there's a compile error if a new
+                    // bytecode gets added.
+                    FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_)
+                    | LdU128(_) | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128
+                    | CastU256 | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod
+                    | Div | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt
+                    | Gt | Le | Ge | Abort | Nop => {
+                        panic!("Bytecode has no internal index: {:?}", code[bytecode_idx])
+                    }
+                };
+
+                code[bytecode_idx] = new_bytecode;
+
+                err.at_index(IndexKind::FunctionDefinition, fidx as TableIndex)
+            })
+            .collect()
+    }
+}
+
+fn is_interesting(bytecode: &Bytecode) -> bool {
+    use Bytecode::*;
+
+    match bytecode {
+        LdConst(_)
+        | ImmBorrowField(_)
+        | ImmBorrowFieldGeneric(_)
+        | MutBorrowField(_)
+        | MutBorrowFieldGeneric(_)
+        | Call(_)
+        | CallGeneric(_)
+        | Pack(_)
+        | PackGeneric(_)
+        | Unpack(_)
+        | UnpackGeneric(_)
+        | Exists(_)
+        | ExistsGeneric(_)
+        | MutBorrowGlobal(_)
+        | MutBorrowGlobalGeneric(_)
+        | ImmBorrowGlobal(_)
+        | ImmBorrowGlobalGeneric(_)
+        | MoveFrom(_)
+        | MoveFromGeneric(_)
+        | MoveTo(_)
+        | MoveToGeneric(_)
+        | BrTrue(_)
+        | BrFalse(_)
+        | Branch(_)
+        | CopyLoc(_)
+        | MoveLoc(_)
+        | StLoc(_)
+        | MutBorrowLoc(_)
+        | ImmBorrowLoc(_)
+        | VecPack(..)
+        | VecLen(_)
+        | VecImmBorrow(_)
+        | VecMutBorrow(_)
+        | VecPushBack(_)
+        | VecPopBack(_)
+        | VecUnpack(..)
+        | VecSwap(_) => true,
+
+        // List out the other options explicitly so there's a compile error if a new
+        // bytecode gets added.
+        FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU128(_)
+        | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue
+        | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor
+        | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | Abort | Nop => false,
+    }
+}
diff --git a/vendors/move/crates/invalid-mutations/src/helpers.rs b/vendors/move/crates/invalid-mutations/src/helpers.rs
new file mode 100644
index 000000000..c122d58c8
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/src/helpers.rs
@@ -0,0 +1,46 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use proptest::sample::Index as PropIndex;
+use std::{collections::BTreeSet, ops::Index as OpsIndex};
+
+/// Given a maximum value `max` and a list of [`Index`](proptest::sample::Index) instances, picks
+/// integers in the range `[0, max)` uniformly randomly and without duplication.
+///
+/// If `indexes_len` is greater than `max`, all indexes will be returned.
+///
+/// This function implements Robert Floyd's F2 algorithm for sampling without replacement.
+pub(crate) fn pick_idxs<T, P>(max: usize, indexes: &T, indexes_len: usize) -> Vec<usize>
+where
+    T: OpsIndex<usize, Output = P> + ?Sized,
+    P: AsRef<PropIndex>,
+{
+    // See https://dl.acm.org/doi/10.1145/30401.315746 (the F2 algorithm)
+    // for a longer explanation. This is a variant that works with zero-indexing.
+    let mut selected = BTreeSet::new();
+    let to_select = indexes_len.min(max);
+    for (iter_idx, choice) in ((max - to_select)..max).enumerate() {
+        // "RandInt(1, J)" in the original algorithm means a number between 1
+        // and choice, both inclusive. `PropIndex::index` picks a number between 0 and
+        // whatever's passed in, with the latter exclusive. Pass in "+1" to ensure the same
+        // range of values is picked from. (This also ensures that if choice is 0 then `index`
+        // doesn't panic.
+        let idx = indexes[iter_idx].as_ref().index(choice + 1);
+        if !selected.insert(idx) {
+            selected.insert(choice);
+        }
+    }
+    selected.into_iter().collect()
+}
+
+/// Given a maximum value `max` and a slice of [`Index`](proptest::sample::Index) instances, picks
+/// integers in the range `[0, max)` uniformly randomly and without duplication.
+///
+/// If the number of `Index` instances is greater than `max`, all indexes will be returned.
+///
+/// This function implements Robert Floyd's F2 algorithm for sampling without replacement.
+#[inline]
+pub(crate) fn pick_slice_idxs(max: usize, indexes: &[impl AsRef<PropIndex>]) -> Vec<usize> {
+    pick_idxs(max, indexes, indexes.len())
+}
diff --git a/vendors/move/crates/invalid-mutations/src/lib.rs b/vendors/move/crates/invalid-mutations/src/lib.rs
new file mode 100644
index 000000000..d65742451
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod bounds;
+mod helpers;
+pub mod signature;
diff --git a/vendors/move/crates/invalid-mutations/src/signature.rs b/vendors/move/crates/invalid-mutations/src/signature.rs
new file mode 100644
index 000000000..6181bf66d
--- /dev/null
+++ b/vendors/move/crates/invalid-mutations/src/signature.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    CompiledModule, Signature, SignatureToken, StructFieldInformation, TypeSignature,
+};
+use proptest::sample::Index as PropIndex;
+
+pub struct SignatureRefMutation<'a> {
+    module: &'a mut CompiledModule,
+    mutations: Vec<(PropIndex, PropIndex)>,
+}
+
+impl<'a> SignatureRefMutation<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<(PropIndex, PropIndex)>) -> Self {
+        Self { module, mutations }
+    }
+
+    pub fn apply(self) -> bool {
+        if self.module.signatures.is_empty() {
+            return false;
+        }
+        let module = self.module;
+        let mut mutations = false;
+        for (s_idx, t_idx) in self.mutations {
+            let sig_idx = s_idx.index(module.signatures.len());
+            let sig = &module.signatures[sig_idx];
+            if sig.is_empty() {
+                continue;
+            }
+            let token_idx = t_idx.index(sig.len());
+            let new_sig = mutate_sig(sig, token_idx);
+            module.signatures[sig_idx] = new_sig;
+            mutations = true;
+        }
+        mutations
+    }
+}
+
+/// Context for applying a list of `FieldRefMutation` instances.
+pub struct FieldRefMutation<'a> {
+    module: &'a mut CompiledModule,
+    mutations: Vec<(PropIndex, PropIndex)>,
+}
+
+impl<'a> FieldRefMutation<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<(PropIndex, PropIndex)>) -> Self {
+        Self { module, mutations }
+    }
+
+    #[inline]
+    pub fn apply(self) -> bool {
+        if self.module.struct_defs.is_empty() {
+            return false;
+        }
+        let module = self.module;
+        let mut mutations = false;
+        for (s_idx, f_idx) in self.mutations {
+            let struct_idx = s_idx.index(module.struct_defs.len());
+            let struct_def = &mut module.struct_defs[struct_idx];
+            if let StructFieldInformation::Declared(fields) = &mut struct_def.field_information {
+                if fields.is_empty() {
+                    continue;
+                }
+                let field_idx = f_idx.index(fields.len());
+                let field_def = &mut fields[field_idx];
+                let new_ty = mutate_field(&field_def.signature.0);
+                fields[field_idx].signature = TypeSignature(new_ty);
+                mutations = true;
+            }
+        }
+        mutations
+    }
+}
+
+fn mutate_sig(sig: &Signature, token_idx: usize) -> Signature {
+    use SignatureToken::*;
+
+    Signature(
+        sig.0
+            .iter()
+            .enumerate()
+            .map(|(idx, token)| {
+                if idx == token_idx {
+                    match &token {
+                        Reference(_) | MutableReference(_) => Reference(Box::new(token.clone())),
+                        _ => Reference(Box::new(Reference(Box::new(token.clone())))),
+                    }
+                } else {
+                    token.clone()
+                }
+            })
+            .collect(),
+    )
+}
+
+fn mutate_field(token: &SignatureToken) -> SignatureToken {
+    SignatureToken::Reference(Box::new(token.clone()))
+}
diff --git a/vendors/move/crates/language-benchmarks/.gitignore b/vendors/move/crates/language-benchmarks/.gitignore
new file mode 100644
index 000000000..13a3d7626
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/.gitignore
@@ -0,0 +1,2 @@
+# Criterion puts its benchmark results under the target directory in here, not at the top (workspace) level.
+/target/
diff --git a/vendors/move/crates/language-benchmarks/Cargo.toml b/vendors/move/crates/language-benchmarks/Cargo.toml
new file mode 100644
index 000000000..661c95908
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "language-benchmarks"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move language benchmarks"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+criterion.workspace = true
+once_cell.workspace = true
+criterion-cpu-time.workspace = true
+
+move-core-types.workspace = true
+move-compiler.workspace = true
+move-vm-runtime.workspace = true
+move-vm-test-utils.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-stdlib.workspace = true
+
+[[bench]]
+name = "vm_benches"
+harness = false
diff --git a/vendors/move/crates/language-benchmarks/benches/vm_benches.rs b/vendors/move/crates/language-benchmarks/benches/vm_benches.rs
new file mode 100644
index 000000000..3482e15c0
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/benches/vm_benches.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::{criterion_group, criterion_main, measurement::Measurement, Criterion};
+use language_benchmarks::{measurement::cpu_time_measurement, move_vm::bench};
+
+//
+// MoveVM benchmarks
+//
+
+fn arith<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "arith");
+}
+
+fn call<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "call");
+}
+
+fn natives<M: Measurement + 'static>(c: &mut Criterion<M>) {
+    bench(c, "natives");
+}
+
+criterion_group!(
+    name = vm_benches;
+    config = cpu_time_measurement();
+    targets = arith,
+    call,
+    natives
+);
+
+criterion_main!(vm_benches);
diff --git a/vendors/move/crates/language-benchmarks/src/bench.move b/vendors/move/crates/language-benchmarks/src/bench.move
new file mode 100644
index 000000000..fc9b4d205
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/src/bench.move
@@ -0,0 +1,112 @@
+// `cargo bench` will call a public function in this module.
+// The Module must be called `Bench` and the set of public functions are callable from the bench (Rust code).
+// `benches/transaction.rs` contains the calling code.
+// The idea is that you build your scenario with a public entry point and a bunch of private functions as needed.
+module 0x1::Bench {
+    use std::vector;
+
+    //
+    // Global helpers
+    //
+    fun check(check: bool, code: u64) {
+        if (check) () else abort code
+    }
+
+    //
+    // `arith` benchmark
+    //
+    public fun arith() {
+        let i = 0;
+        // 10000 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 10000) {
+            1;
+            10 + 3;
+            10;
+            7 + 5;
+            let x = 1;
+            let y = x + 3;
+            check(x + y == 5, 10);
+            i = i + 1;
+        };
+    }
+
+    //
+    // `call` benchmark
+    //
+    public fun call() {
+        let i = 0;
+        // 3000 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 3000) {
+            let b = call_1(@0x0, 128);
+            call_2(b);
+            i = i + 1;
+        };
+    }
+
+    fun call_1(addr: address, val: u64): bool {
+        let b = call_1_1(&addr);
+        call_1_2(val, val);
+        b
+    }
+
+    fun call_1_1(_addr: &address): bool {
+        true
+    }
+
+    fun call_1_2(val1: u64, val2: u64): bool {
+        val1 == val2
+    }
+
+    fun call_2(b: bool) {
+        call_2_1(b);
+        check(call_2_2() == 400, 200);
+    }
+
+    fun call_2_1(b: bool) {
+        check(b == b, 100)
+    }
+
+    fun call_2_2(): u64 {
+        100 + 300
+    }
+
+    //
+    // `natives` benchmark
+    //
+    fun test_vector_ops<T>(x1: T, x2: T): (T, T) {
+        let v: vector<T> = vector::empty();
+        check(vector::length(&v) == 0, 100);
+        vector::push_back(&mut v, x1);
+        check(vector::length(&v) == 1, 101);
+        vector::push_back(&mut v, x2);
+        check(vector::length(&v) == 2, 102);
+        vector::swap(&mut v, 0, 1);
+        x1 = vector::pop_back(&mut v);
+        check(vector::length(&v) == 1, 103);
+        x2 = vector::pop_back(&mut v);
+        check(vector::length(&v) == 0, 104);
+        vector::destroy_empty(v);
+        (x1, x2)
+    }
+
+    fun test_vector() {
+        test_vector_ops<u8>(1u8, 2u8);
+        test_vector_ops<u64>(1u64, 2u64);
+        test_vector_ops<u128>(1u128, 2u128);
+        test_vector_ops<bool>(true, false);
+        test_vector_ops<address>(@0x1, @0x2);
+        test_vector_ops<vector<u8>>(vector::empty(), vector::empty());
+    }
+
+    public fun natives() {
+        let i = 0;
+        // 300 is the number of loops to make the benchmark run for a couple of minutes, which is an eternity.
+        // Adjust according to your needs, it's just a reference
+        while (i < 300) {
+            test_vector();
+            i = i + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/language-benchmarks/src/lib.rs b/vendors/move/crates/language-benchmarks/src/lib.rs
new file mode 100644
index 000000000..8f6293149
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/src/lib.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod measurement;
+pub mod move_vm;
diff --git a/vendors/move/crates/language-benchmarks/src/measurement.rs b/vendors/move/crates/language-benchmarks/src/measurement.rs
new file mode 100644
index 000000000..83b10dda9
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/src/measurement.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::Criterion;
+use criterion_cpu_time::PosixTime;
+
+pub fn cpu_time_measurement() -> Criterion<PosixTime> {
+    Criterion::default().with_measurement(PosixTime::UserAndSystemTime)
+}
+
+pub fn wall_time_measurement() -> Criterion {
+    Criterion::default()
+}
diff --git a/vendors/move/crates/language-benchmarks/src/move_vm.rs b/vendors/move/crates/language-benchmarks/src/move_vm.rs
new file mode 100644
index 000000000..46ac38721
--- /dev/null
+++ b/vendors/move/crates/language-benchmarks/src/move_vm.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use criterion::{measurement::Measurement, Criterion};
+use move_binary_format::CompiledModule;
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, CORE_CODE_ADDRESS},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::BlankStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+use once_cell::sync::Lazy;
+use std::path::PathBuf;
+
+static MOVE_BENCH_SRC_PATH: Lazy<PathBuf> = Lazy::new(|| {
+    vec![env!("CARGO_MANIFEST_DIR"), "src", "bench.move"]
+        .into_iter()
+        .collect()
+});
+
+/// Entry point for the bench, provide a function name to invoke in Module Bench in bench.move.
+pub fn bench<M: Measurement + 'static>(c: &mut Criterion<M>, fun: &str) {
+    let modules = compile_modules();
+    let move_vm = MoveVM::new(move_stdlib::natives::all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
+    ))
+    .unwrap();
+    execute(c, &move_vm, modules, fun);
+}
+
+// Compile `bench.move` and its dependencies
+fn compile_modules() -> Vec<CompiledModule> {
+    let mut src_files = move_stdlib::move_stdlib_files();
+    src_files.push(MOVE_BENCH_SRC_PATH.to_str().unwrap().to_owned());
+    let (_files, compiled_units) = Compiler::from_files(
+        src_files,
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()
+    .expect("Error compiling...");
+    compiled_units
+        .into_iter()
+        .map(|unit| match unit {
+            AnnotatedCompiledUnit::Module(annot_unit) => annot_unit.named_module.module,
+            AnnotatedCompiledUnit::Script(_) => {
+                panic!("Expected a module but received a script")
+            }
+        })
+        .collect()
+}
+
+// execute a given function in the Bench module
+fn execute<M: Measurement + 'static>(
+    c: &mut Criterion<M>,
+    move_vm: &MoveVM,
+    modules: Vec<CompiledModule>,
+    fun: &str,
+) {
+    // establish running context
+    let storage = BlankStorage::new();
+    let sender = CORE_CODE_ADDRESS;
+    let mut session = move_vm.new_session(&storage);
+
+    // TODO: we may want to use a real gas meter to make benchmarks more realistic.
+
+    for module in modules {
+        let mut mod_blob = vec![];
+        module
+            .serialize(&mut mod_blob)
+            .expect("Module serialization error");
+        session
+            .publish_module(mod_blob, sender, &mut UnmeteredGasMeter)
+            .expect("Module must load");
+    }
+
+    // module and function to call
+    let module_id = ModuleId::new(sender, Identifier::new("Bench").unwrap());
+    let fun_name = IdentStr::new(fun).unwrap_or_else(|_| panic!("Invalid identifier name {}", fun));
+
+    // benchmark
+    c.bench_function(fun, |b| {
+        b.iter(|| {
+            session
+                .execute_function_bypass_visibility(
+                    &module_id,
+                    fun_name,
+                    vec![],
+                    Vec::<Vec<u8>>::new(),
+                    &mut UnmeteredGasMeter,
+                )
+                .unwrap_or_else(|err| {
+                    panic!(
+                        "{:?}::{} failed with {:?}",
+                        &module_id,
+                        fun,
+                        err.into_vm_status()
+                    )
+                })
+        })
+    });
+}
diff --git a/vendors/move/crates/module-generation/Cargo.toml b/vendors/move/crates/module-generation/Cargo.toml
new file mode 100644
index 000000000..e6112ccbd
--- /dev/null
+++ b/vendors/move/crates/module-generation/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "module-generation"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem binary module generation"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+rand.workspace = true
+
+move-bytecode-verifier.workspace = true
+move-ir-to-bytecode.workspace = true
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-binary-format.workspace = true
+move-symbol-pool.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/module-generation/src/generator.rs b/vendors/move/crates/module-generation/src/generator.rs
new file mode 100644
index 000000000..db31974ba
--- /dev/null
+++ b/vendors/move/crates/module-generation/src/generator.rs
@@ -0,0 +1,353 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{options::ModuleGeneratorOptions, padding::Pad, utils::random_string};
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::verify_module_unmetered;
+use move_core_types::account_address::AccountAddress;
+use move_ir_to_bytecode::compiler::compile_module;
+use move_ir_types::{ast::*, location::*};
+use move_symbol_pool::Symbol;
+use rand::{rngs::StdRng, Rng};
+use std::{
+    collections::{BTreeSet, VecDeque},
+    iter::FromIterator,
+};
+
+type Set<K> = BTreeSet<K>;
+
+macro_rules! init {
+    ($len:expr, $e:expr) => {
+        (0..$len).map(|_| $e).collect()
+    };
+}
+
+pub fn generate_module(rng: &mut StdRng, options: ModuleGeneratorOptions) -> CompiledModule {
+    generate_modules(rng, 1, options).0
+}
+
+/// Generate a `number - 1` modules. Then generate a root module that imports all of these modules.
+pub fn generate_modules(
+    rng: &mut StdRng,
+    number: usize,
+    options: ModuleGeneratorOptions,
+) -> (CompiledModule, Vec<CompiledModule>) {
+    assert!(number > 0, "We cannot generate zero modules");
+
+    let table_size = options.min_table_size;
+    let (callee_names, callees): (Set<Symbol>, Vec<ModuleDefinition>) = (0..(number - 1))
+        .map(|_| {
+            let module = ModuleGenerator::create(rng, options.clone(), &Set::new());
+            let module_name = module.identifier.name.0;
+            (module_name, module)
+        })
+        .unzip();
+
+    let root_module = ModuleGenerator::create(rng, options.clone(), &callee_names);
+    let empty_deps: Vec<CompiledModule> = Vec::new();
+    let compiled_callees = callees
+        .into_iter()
+        .map(|module| {
+            let mut module = compile_module(module, &empty_deps).unwrap().0;
+            Pad::pad(table_size, &mut module, options.clone());
+            module
+        })
+        .collect();
+
+    // TODO: for friend visibility, maybe we could generate a module that friend all other modules...
+
+    let mut compiled_root = compile_module(root_module, &compiled_callees).unwrap().0;
+    Pad::pad(table_size, &mut compiled_root, options);
+    (compiled_root, compiled_callees)
+}
+
+pub fn generate_verified_modules(
+    rng: &mut StdRng,
+    number: usize,
+    options: ModuleGeneratorOptions,
+) -> (CompiledModule, Vec<CompiledModule>) {
+    let (root, callees) = generate_modules(rng, number, options);
+    for callee in &callees {
+        verify_module_unmetered(callee).unwrap()
+    }
+    verify_module_unmetered(&root).unwrap();
+    (root, callees)
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Generation of IR-level modules
+///////////////////////////////////////////////////////////////////////////
+
+pub struct ModuleGenerator<'a> {
+    options: ModuleGeneratorOptions,
+    current_module: ModuleDefinition,
+    gen: &'a mut StdRng,
+}
+
+impl<'a> ModuleGenerator<'a> {
+    fn index(&mut self, bound: usize) -> usize {
+        self.gen.gen_range(0..bound)
+    }
+
+    fn identifier(&mut self) -> String {
+        let len = self.gen.gen_range(10..self.options.max_string_size);
+        random_string(self.gen, len)
+    }
+
+    fn base_type(&mut self, ty_param_context: &[&TypeVar]) -> Type {
+        // TODO: Don't generate nested resources for now. Once we allow functions to take resources
+        // (and have type parameters of kind Resource or All) then we should revisit this here.
+        let structs: Vec<_> = self
+            .current_module
+            .structs
+            .iter()
+            .filter(|s| !s.value.abilities.contains(&Ability::Key))
+            .cloned()
+            .collect();
+
+        let mut end = 5;
+        if !ty_param_context.is_empty() {
+            end += 1;
+        };
+        if !structs.is_empty() {
+            end += 1;
+        };
+
+        match self.index(end) {
+            0 => Type::Address,
+            1 => Type::U8,
+            2 => Type::U64,
+            3 => Type::U128,
+            4 => Type::Bool,
+            5 if !structs.is_empty() => {
+                let index = self.index(structs.len());
+                let struct_def = structs[index].value.clone();
+                let ty_instants = {
+                    let num_typ_params = struct_def.type_formals.len();
+                    // NB: Relying on randomness for termination here
+                    init!(num_typ_params, self.base_type(ty_param_context))
+                };
+                let struct_ident = {
+                    let struct_name = struct_def.name;
+                    let module_name = ModuleName::module_self();
+                    QualifiedStructIdent::new(module_name, struct_name)
+                };
+                Type::Struct(struct_ident, ty_instants)
+            }
+            6 => Type::U16,
+            7 => Type::U32,
+            8 => Type::U256,
+            _ => {
+                let index = self.index(ty_param_context.len());
+                let ty_var = ty_param_context[index].value.clone();
+                Type::TypeParameter(ty_var)
+            }
+        }
+    }
+
+    fn typ(&mut self, ty_param_context: &[(TypeVar, BTreeSet<Ability>)]) -> Type {
+        let typ = self.base_type(
+            &ty_param_context
+                .iter()
+                .map(|(tv, _)| tv)
+                .collect::<Vec<_>>(),
+        );
+        // TODO: Always change the base type to a reference if it's resource type. Then we can
+        // allow functions to take resources.
+        // if typ.is_nominal_resource { .... }
+        if self.options.references_allowed && self.gen.gen_bool(0.25) {
+            let is_mutable = self.gen.gen_bool(0.25);
+            Type::Reference(is_mutable, Box::new(typ))
+        } else {
+            typ
+        }
+    }
+
+    fn fun_type_parameters(&mut self) -> Vec<(TypeVar, BTreeSet<Ability>)> {
+        // Don't generate type parameters if we're generating simple types only
+        if self.options.simple_types_only {
+            vec![]
+        } else {
+            let num_ty_params = self.index(self.options.max_ty_params);
+            let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop]);
+            init!(num_ty_params, {
+                let name = Spanned::unsafe_no_loc(TypeVar_(self.identifier().into()));
+                (name, abilities.clone())
+            })
+        }
+    }
+
+    fn struct_type_parameters(&mut self) -> Vec<StructTypeParameter> {
+        // Don't generate type parameters if we're generating simple types only
+        if self.options.simple_types_only {
+            vec![]
+        } else {
+            let is_phantom = self.index(1) != 0;
+            let num_ty_params = self.index(self.options.max_ty_params);
+            let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop]);
+            init!(num_ty_params, {
+                let name = Spanned::unsafe_no_loc(TypeVar_(self.identifier().into()));
+                (is_phantom, name, abilities.clone())
+            })
+        }
+    }
+
+    // All functions will have unit return type, and an empty body with the exception of a return.
+    // We'll scoop this out and replace it later on in the compiled module that we generate.
+    fn function_signature(&mut self) -> FunctionSignature {
+        let ty_params = self.fun_type_parameters();
+        let number_of_args = self.index(self.options.max_function_call_size);
+        let mut formals: Vec<(Var, Type)> = init!(number_of_args, {
+            let param_name = Spanned::unsafe_no_loc(Var_(self.identifier().into()));
+            let ty = self.typ(&ty_params);
+            (param_name, ty)
+        });
+
+        if self.options.args_for_ty_params {
+            let mut ty_formals = ty_params
+                .iter()
+                .map(|(ty_var_, _)| {
+                    let param_name = Spanned::unsafe_no_loc(Var_(self.identifier().into()));
+                    let ty = Type::TypeParameter(ty_var_.value.clone());
+                    (param_name, ty)
+                })
+                .collect();
+
+            formals.append(&mut ty_formals);
+        }
+
+        FunctionSignature::new(formals, vec![], ty_params)
+    }
+
+    fn struct_fields(&mut self, ty_params: &[StructTypeParameter]) -> StructDefinitionFields {
+        let num_fields = self
+            .gen
+            .gen_range(self.options.min_fields..self.options.max_fields);
+        let fields: Fields<Type> = init!(num_fields, {
+            (
+                Spanned::unsafe_no_loc(Field_(self.identifier().into())),
+                self.base_type(&ty_params.iter().map(|(_, tv, _)| tv).collect::<Vec<_>>()),
+            )
+        });
+
+        StructDefinitionFields::Move { fields }
+    }
+
+    fn function_def(&mut self) {
+        let signature = self.function_signature();
+        let num_locals = self.index(self.options.max_locals);
+        let locals = init!(num_locals, {
+            (
+                Spanned::unsafe_no_loc(Var_(self.identifier().into())),
+                self.typ(&signature.type_formals),
+            )
+        });
+        let fun = Function_ {
+            visibility: FunctionVisibility::Public,
+            is_entry: false,
+            specifications: Vec::new(),
+            signature,
+            body: FunctionBody::Move {
+                locals,
+                code: vec![Spanned::unsafe_no_loc(Block_ {
+                    label: Spanned::unsafe_no_loc(BlockLabel_(Symbol::from("b0"))),
+                    statements: VecDeque::from(vec![Spanned::unsafe_no_loc(
+                        Statement_::return_empty(),
+                    )]),
+                })],
+            },
+        };
+        let fun_name = FunctionName(self.identifier().into());
+        self.current_module
+            .functions
+            .push((fun_name, Spanned::unsafe_no_loc(fun)));
+    }
+
+    fn struct_def(&mut self, abilities: BTreeSet<Ability>) {
+        let name = StructName(self.identifier().into());
+        let type_parameters = self.struct_type_parameters();
+        let fields = self.struct_fields(&type_parameters);
+        let strct = StructDefinition_ {
+            abilities,
+            name,
+            type_formals: type_parameters,
+            fields,
+            invariants: vec![],
+        };
+        self.current_module
+            .structs
+            .push(Spanned::unsafe_no_loc(strct))
+    }
+
+    fn imports(callees: &Set<Symbol>) -> Vec<ImportDefinition> {
+        callees
+            .iter()
+            .map(|ident| {
+                let module_name = ModuleName(*ident);
+                let qualified_mod_ident = ModuleIdent::new(module_name, AccountAddress::ZERO);
+                ImportDefinition::new(qualified_mod_ident, None)
+            })
+            .collect()
+    }
+
+    fn gen(mut self) -> ModuleDefinition {
+        let num_structs = self.index(self.options.max_structs) + 1;
+        let num_functions = self.index(self.options.max_functions) + 1;
+        // TODO: the order of generation here means that functions can't take resources as arguments.
+        // We will need to generate (valid) bytecode bodies for these functions before we allow
+        // resources.
+        {
+            // We generate a function at this point as an "entry point" into the module: since we
+            // haven't generated any structs yet, this function will only take base types as its input
+            // parameters. Likewise we can't take references since there isn't any value stack.
+            let simple_types = self.options.simple_types_only;
+            self.options.simple_types_only = true;
+            self.function_def();
+            self.options.simple_types_only = simple_types;
+        }
+        // TODO generate abilities
+        let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop, Ability::Store]);
+        (0..num_structs).for_each(|_| self.struct_def(abilities.clone()));
+        // TODO/XXX: We can allow references to resources here
+        (0..num_functions).for_each(|_| self.function_def());
+        if self.options.add_resources {
+            // TODO generate abilities
+            let abilities = BTreeSet::from_iter(vec![Ability::Key, Ability::Store]);
+            (0..num_structs).for_each(|_| self.struct_def(abilities.clone()));
+        }
+        self.current_module
+    }
+
+    pub fn create(
+        gen: &'a mut StdRng,
+        options: ModuleGeneratorOptions,
+        callable_modules: &Set<Symbol>,
+    ) -> ModuleDefinition {
+        // TODO: Generation of struct and function handles to the `callable_modules`
+        let module_name = {
+            let len = gen.gen_range(10..options.max_string_size);
+            random_string(gen, len)
+        };
+        let current_module = ModuleDefinition {
+            loc: Spanned::unsafe_no_loc(0).loc,
+            identifier: ModuleIdent {
+                name: ModuleName(module_name.into()),
+                address: AccountAddress::random(),
+            },
+            friends: Vec::new(),
+            imports: Self::imports(callable_modules),
+            explicit_dependency_declarations: Vec::new(),
+            structs: Vec::new(),
+            functions: Vec::new(),
+            constants: Vec::new(),
+            synthetics: Vec::new(),
+        };
+        Self {
+            options,
+            current_module,
+            gen,
+        }
+        .gen()
+    }
+}
diff --git a/vendors/move/crates/module-generation/src/lib.rs b/vendors/move/crates/module-generation/src/lib.rs
new file mode 100644
index 000000000..e6783cf00
--- /dev/null
+++ b/vendors/move/crates/module-generation/src/lib.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod generator;
+mod options;
+mod padding;
+mod utils;
+
+pub use generator::{
+    generate_module, generate_modules, generate_verified_modules, ModuleGenerator,
+};
+pub use options::ModuleGeneratorOptions;
+pub use padding::Pad;
diff --git a/vendors/move/crates/module-generation/src/options.rs b/vendors/move/crates/module-generation/src/options.rs
new file mode 100644
index 000000000..eaedc6061
--- /dev/null
+++ b/vendors/move/crates/module-generation/src/options.rs
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Defines constants and options that are used for module generation
+
+#[derive(Clone, Debug)]
+pub struct ModuleGeneratorOptions {
+    /// The maximum number of locals that can be defined within a generated function definition.
+    pub max_locals: usize,
+    /// The maximum number of fields that will be generated for any struct.
+    pub max_fields: usize,
+    pub min_fields: usize,
+    /// The maximum number of structs that can be generated for a module
+    pub max_structs: usize,
+    /// The maximum number of functions that can be generated for a module.
+    pub max_functions: usize,
+    /// The maximum number of type parameters functions and structs.
+    pub max_ty_params: usize,
+    /// The maximum size that generated byte arrays can be.
+    pub byte_array_max_size: usize,
+    /// The maximum size that a generated string can be.
+    pub max_string_size: usize,
+    /// The maximum number of arguments to generated function definitions.
+    pub max_function_call_size: usize,
+    /// The maximum number of return types of generated function definitions.
+    pub max_ret_types_size: usize,
+    /// Whether or not generate modules should only contain simple (non-reference, or nested
+    /// struct) types.
+    pub simple_types_only: bool,
+    /// Whether references are allowed to be generated for e.g. function parameters, locals.
+    pub references_allowed: bool,
+    /// Whether the generated modules should have any resources declared.
+    pub add_resources: bool,
+    /// The minimum number of entries in any table
+    pub min_table_size: usize,
+    /// If set, all functions with type parameters will have arguments of those types as well.
+    pub args_for_ty_params: bool,
+}
+
+impl Default for ModuleGeneratorOptions {
+    fn default() -> Self {
+        Self {
+            min_fields: 1,
+            max_locals: 10,
+            max_fields: 20,
+            max_structs: 100,
+            max_functions: 100,
+            max_ty_params: 5,
+            byte_array_max_size: 64,
+            max_string_size: 32,
+            max_function_call_size: 23,
+            max_ret_types_size: 4,
+            simple_types_only: false,
+            references_allowed: true,
+            add_resources: true,
+            min_table_size: 1,
+            args_for_ty_params: false,
+        }
+    }
+}
diff --git a/vendors/move/crates/module-generation/src/padding.rs b/vendors/move/crates/module-generation/src/padding.rs
new file mode 100644
index 000000000..10d0defe9
--- /dev/null
+++ b/vendors/move/crates/module-generation/src/padding.rs
@@ -0,0 +1,75 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{options::ModuleGeneratorOptions, utils::random_string};
+use move_binary_format::file_format::{Bytecode, CompiledModule, Signature};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use rand::{rngs::StdRng, Rng, SeedableRng};
+
+///////////////////////////////////////////////////////////////////////////
+// Padding of tables in compiled modules
+///////////////////////////////////////////////////////////////////////////
+
+pub struct Pad {
+    gen: StdRng,
+    table_size: usize,
+    options: ModuleGeneratorOptions,
+}
+
+impl Pad {
+    pub fn pad(table_size: usize, module: &mut CompiledModule, options: ModuleGeneratorOptions) {
+        let seed: [u8; 32] = [1; 32];
+        let mut slf = Self {
+            gen: StdRng::from_seed(seed),
+            table_size,
+            options,
+        };
+        slf.pad_cosntant_table(module);
+        slf.pad_identifier_table(module);
+        slf.pad_address_identifier_table(module);
+        slf.pad_signatures(module);
+        slf.pad_function_bodies(module);
+    }
+
+    fn pad_cosntant_table(&mut self, module: &mut CompiledModule) {
+        // TODO actual constant generation
+        module.constant_pool = vec![]
+    }
+
+    fn pad_identifier_table(&mut self, module: &mut CompiledModule) {
+        module.identifiers = (0..(self.table_size + module.identifiers.len()))
+            .map(|_| {
+                let len = self.gen.gen_range(10..self.options.max_string_size);
+                Identifier::new(random_string(&mut self.gen, len)).unwrap()
+            })
+            .collect()
+    }
+
+    fn pad_address_identifier_table(&mut self, module: &mut CompiledModule) {
+        module.address_identifiers = (0..(self.table_size + module.address_identifiers.len()))
+            .map(|_| AccountAddress::random())
+            .collect()
+    }
+
+    fn pad_function_bodies(&mut self, module: &mut CompiledModule) {
+        for fdef in module.function_defs.iter_mut() {
+            if let Some(code) = &mut fdef.code {
+                code.code = vec![
+                    Bytecode::LdTrue,
+                    Bytecode::LdTrue,
+                    Bytecode::Pop,
+                    Bytecode::Pop,
+                    Bytecode::Ret,
+                ]
+            }
+        }
+    }
+
+    // Ensure that locals signatures always contain an empty signature
+    fn pad_signatures(&mut self, module: &mut CompiledModule) {
+        if module.signatures.iter().all(|v| !v.is_empty()) {
+            module.signatures.push(Signature(Vec::new()));
+        }
+    }
+}
diff --git a/vendors/move/crates/module-generation/src/utils.rs b/vendors/move/crates/module-generation/src/utils.rs
new file mode 100644
index 000000000..07a03ee6e
--- /dev/null
+++ b/vendors/move/crates/module-generation/src/utils.rs
@@ -0,0 +1,15 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use rand::{distributions::Alphanumeric, rngs::StdRng, Rng};
+
+pub fn random_string(rng: &mut StdRng, len: usize) -> String {
+    if len == 0 {
+        "".to_string()
+    } else {
+        let mut string = "a".to_string();
+        (1..len).for_each(|_| string.push(char::from(rng.sample(Alphanumeric))));
+        string
+    }
+}
diff --git a/vendors/move/crates/move-abigen/Cargo.toml b/vendors/move/crates/move-abigen/Cargo.toml
new file mode 100644
index 000000000..2e4776061
--- /dev/null
+++ b/vendors/move/crates/move-abigen/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "move-abigen"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# Move dependencies
+move-model.workspace = true
+move-core-types.workspace = true
+move-binary-format.workspace = true
+move-bytecode-verifier.workspace = true
+move-command-line-common.workspace = true
+
+bcs.workspace = true
+
+# external dependencies
+log.workspace = true
+anyhow = "1.0.71"
+heck.workspace = true
+serde.workspace = true
+
+[dev-dependencies]
+codespan-reporting.workspace = true
+move-prover.workspace = true
+datatest-stable.workspace = true
+tempfile.workspace = true
+move-prover-test-utils.workspace = true
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/move-abigen/README.md b/vendors/move/crates/move-abigen/README.md
new file mode 100644
index 000000000..57c784418
--- /dev/null
+++ b/vendors/move/crates/move-abigen/README.md
@@ -0,0 +1,7 @@
+
+# ABI Generator
+
+This crate provides a generator for ABI files.
+
+ABI files are needed to generate helper functions (aka "transaction
+builders") in various languages for the Move scripts.
diff --git a/vendors/move/crates/move-abigen/src/abigen.rs b/vendors/move/crates/move-abigen/src/abigen.rs
new file mode 100644
index 000000000..c2cc0e4df
--- /dev/null
+++ b/vendors/move/crates/move-abigen/src/abigen.rs
@@ -0,0 +1,325 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+
+use anyhow::bail;
+use heck::SnakeCase;
+use move_binary_format::file_format::Ability;
+use move_bytecode_verifier::script_signature;
+use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
+use move_core_types::{
+    abi::{ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI},
+    identifier::IdentStr,
+    language_storage::{StructTag, TypeTag},
+};
+use move_model::{
+    model::{FunctionEnv, GlobalEnv, ModuleEnv},
+    ty,
+};
+use serde::{Deserialize, Serialize};
+use std::{collections::BTreeMap, io::Read, path::PathBuf};
+
+/// Options passed into the ABI generator.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct AbigenOptions {
+    /// Where to find the .mv files of scripts.
+    pub compiled_script_directory: String,
+    /// Where to get the script bytes if held in memory
+    pub in_memory_bytes: Option<BTreeMap<String, Vec<u8>>>,
+    /// In which directory to store output.
+    pub output_directory: String,
+}
+
+impl Default for AbigenOptions {
+    fn default() -> Self {
+        Self {
+            compiled_script_directory: ".".to_string(),
+            in_memory_bytes: None,
+            output_directory: "abi".to_string(),
+        }
+    }
+}
+
+/// The ABI generator.
+pub struct Abigen<'env> {
+    /// Options.
+    options: &'env AbigenOptions,
+    /// Input definitions.
+    env: &'env GlobalEnv,
+    /// Map from file name to generated script ABI (if any).
+    output: BTreeMap<String, ScriptABI>,
+}
+
+impl<'env> Abigen<'env> {
+    /// Creates a new ABI generator.
+    pub fn new(env: &'env GlobalEnv, options: &'env AbigenOptions) -> Self {
+        Self {
+            options,
+            env,
+            output: Default::default(),
+        }
+    }
+
+    /// Returns the result of ABI generation, a vector of pairs of filenames
+    /// and JSON content.
+    pub fn into_result(mut self) -> Vec<(String, Vec<u8>)> {
+        std::mem::take(&mut self.output)
+            .into_iter()
+            .map(|(path, abi)| {
+                let content = bcs::to_bytes(&abi).expect("ABI serialization should not fail");
+                (path, content)
+            })
+            .collect()
+    }
+
+    /// Generates ABIs for all script modules in the environment (excluding the dependency set).
+    pub fn gen(&mut self) {
+        for module in self.env.get_modules() {
+            if module.is_target() {
+                let mut path = PathBuf::from(&self.options.output_directory);
+                // We make a directory for all of the script function ABIs in a module. But, if
+                // it's a script, we don't create a directory.
+                if !module.is_script_module() {
+                    path.push(
+                        PathBuf::from(module.get_source_path())
+                            .file_stem()
+                            .expect("file extension"),
+                    )
+                }
+
+                for abi in self
+                    .compute_abi(&module)
+                    .map_err(|err| {
+                        format!(
+                            "Error while processing file {:?}: {}",
+                            module.get_source_path(),
+                            err
+                        )
+                    })
+                    .unwrap()
+                {
+                    // If the module is a script module, then the generated ABI is a transaction
+                    // script ABI. If the module is not a script module, then all generated ABIs
+                    // are script function ABIs.
+                    let mut path = path.clone();
+                    path.push(
+                        PathBuf::from(abi.name())
+                            .with_extension("abi")
+                            .file_name()
+                            .expect("file name"),
+                    );
+                    self.output.insert(path.to_str().unwrap().to_string(), abi);
+                }
+            }
+        }
+    }
+
+    /// Compute the ABIs of all script functions in a module.
+    fn compute_abi(&self, module_env: &ModuleEnv<'env>) -> anyhow::Result<Vec<ScriptABI>> {
+        // Get all the script functions in this module
+        let script_iter: Vec<_> = if module_env.is_script_module() {
+            module_env.get_functions().collect()
+        } else {
+            module_env
+                .get_functions()
+                .filter(|func| {
+                    let module = module_env.get_verified_module();
+                    let func_name = module_env.symbol_pool().string(func.get_name());
+                    let func_ident = IdentStr::new(&func_name).unwrap();
+                    // only pick up script functions that also have a script-callable signature.
+                    // and check all arguments have a valid type tag
+                    func.is_entry()
+                        && script_signature::verify_module_function_signature_by_name(
+                            module,
+                            func_ident,
+                            script_signature::no_additional_script_signature_checks,
+                        )
+                        .is_ok()
+                        && func
+                            .get_parameters()
+                            .iter()
+                            .skip_while(|param| match &param.1 {
+                                ty::Type::Primitive(ty::PrimitiveType::Signer) => true,
+                                ty::Type::Reference(_, inner) => matches!(
+                                    &**inner,
+                                    ty::Type::Primitive(ty::PrimitiveType::Signer)
+                                ),
+                                _ => false,
+                            })
+                            .all(|param| {
+                                matches!(
+                                    Self::get_type_tag(&param.1, module_env),
+                                    Err(_) | Ok(Some(_))
+                                )
+                            })
+                        && func.get_return_count() == 0
+                })
+                .collect()
+        };
+
+        let mut abis = Vec::new();
+        for func in &script_iter {
+            abis.push(self.generate_abi_for_function(func, module_env)?);
+        }
+
+        Ok(abis)
+    }
+
+    fn generate_abi_for_function(
+        &self,
+        func: &FunctionEnv<'env>,
+        module_env: &ModuleEnv<'env>,
+    ) -> anyhow::Result<ScriptABI> {
+        let symbol_pool = module_env.symbol_pool();
+        let name = symbol_pool.string(func.get_name()).to_string();
+        let doc = func.get_doc().to_string();
+        let ty_args = func
+            .get_named_type_parameters()
+            .iter()
+            .map(|ty_param| {
+                TypeArgumentABI::new(symbol_pool.string(ty_param.0).to_string().to_snake_case())
+            })
+            .collect();
+        let args = func
+            .get_parameters()
+            .iter()
+            .filter(|param| match &param.1 {
+                ty::Type::Primitive(ty::PrimitiveType::Signer) => false,
+                ty::Type::Reference(false, inner) => {
+                    !matches!(&**inner, ty::Type::Primitive(ty::PrimitiveType::Signer))
+                }
+                ty::Type::Struct(module_id, struct_id, _) => {
+                    let struct_module_env = module_env.env.get_module(*module_id);
+                    let abilities = struct_module_env.get_struct(*struct_id).get_abilities();
+                    abilities.has_ability(Ability::Copy) && !abilities.has_ability(Ability::Key)
+                }
+                _ => true,
+            })
+            .map(|param| {
+                let tag = Self::get_type_tag(&param.1, module_env)?.unwrap();
+                Ok(ArgumentABI::new(
+                    symbol_pool.string(param.0).to_string(),
+                    tag,
+                ))
+            })
+            .collect::<anyhow::Result<_>>()?;
+
+        // This is a transaction script, so include the code, but no module ID
+        if module_env.is_script_module() {
+            let code = self.load_compiled_bytes(module_env)?.to_vec();
+            Ok(ScriptABI::TransactionScript(TransactionScriptABI::new(
+                name, doc, code, ty_args, args,
+            )))
+        } else {
+            // This is a script function, so no code. But we need to include the module ID
+            Ok(ScriptABI::ScriptFunction(ScriptFunctionABI::new(
+                name,
+                module_env.get_verified_module().self_id(),
+                doc,
+                ty_args,
+                args,
+            )))
+        }
+    }
+
+    fn load_compiled_bytes(&self, module_env: &ModuleEnv<'env>) -> anyhow::Result<Vec<u8>> {
+        match &self.options.in_memory_bytes {
+            Some(map) => {
+                let path =
+                    PathBuf::from(module_env.get_source_path().to_string_lossy().to_string())
+                        .file_stem()
+                        .expect("file stem")
+                        .to_string_lossy()
+                        .to_string();
+                Ok(map.get(&path).unwrap().clone())
+            }
+            None => {
+                let mut path = PathBuf::from(&self.options.compiled_script_directory);
+                path.push(
+                    PathBuf::from(module_env.get_source_path())
+                        .with_extension(MOVE_COMPILED_EXTENSION)
+                        .file_name()
+                        .expect("file name"),
+                );
+                let mut f = match std::fs::File::open(path.clone()) {
+                    Ok(f) => f,
+                    Err(error) => bail!("Failed to open compiled file {:?}: {}", path, error),
+                };
+                let mut bytes = Vec::new();
+                f.read_to_end(&mut bytes)?;
+                Ok(bytes)
+            }
+        }
+    }
+
+    fn get_type_tag(
+        ty0: &ty::Type,
+        module_env: &ModuleEnv<'env>,
+    ) -> anyhow::Result<Option<TypeTag>> {
+        use ty::Type::*;
+        let tag = match ty0 {
+            Primitive(prim) => {
+                use ty::PrimitiveType::*;
+                match prim {
+                    Bool => TypeTag::Bool,
+                    U8 => TypeTag::U8,
+                    U16 => TypeTag::U16,
+                    U32 => TypeTag::U32,
+                    U64 => TypeTag::U64,
+                    U128 => TypeTag::U128,
+                    U256 => TypeTag::U256,
+                    Address => TypeTag::Address,
+                    Signer => TypeTag::Signer,
+                    Num | Range | EventStore => {
+                        bail!("Type {:?} is not allowed in scripts.", ty0)
+                    }
+                }
+            }
+            Vector(ty) => {
+                let tag = match Self::get_type_tag(ty, module_env)? {
+                    Some(tag) => tag,
+                    None => return Ok(None),
+                };
+                TypeTag::Vector(Box::new(tag))
+            }
+            Struct(module_id, struct_id, vec_type) => {
+                let expect_msg = format!("type {:?} is not allowed in scription function", ty0);
+                let struct_module_env = module_env.env.get_module(*module_id);
+                let abilities = struct_module_env.get_struct(*struct_id).get_abilities();
+                if abilities.has_ability(Ability::Copy) && !abilities.has_ability(Ability::Key) {
+                    TypeTag::Struct(Box::new(StructTag {
+                        address: *struct_module_env.self_address(),
+                        module: struct_module_env.get_identifier(),
+                        name: struct_module_env
+                            .get_struct(*struct_id)
+                            .get_identifier()
+                            .unwrap_or_else(|| panic!("{}", expect_msg)),
+                        type_params: vec_type
+                            .iter()
+                            .map(|e| {
+                                Self::get_type_tag(e, module_env)
+                                    .unwrap_or_else(|_| panic!("{}", expect_msg))
+                            })
+                            .map(|e| e.unwrap_or_else(|| panic!("{}", expect_msg)))
+                            .collect(),
+                    }))
+                } else {
+                    return Ok(None);
+                }
+            }
+            Tuple(_)
+            | TypeParameter(_)
+            | Fun(_, _)
+            | TypeDomain(_)
+            | ResourceDomain(..)
+            | Error
+            | Var(_)
+            | Reference(_, _) => return Ok(None),
+        };
+        Ok(Some(tag))
+    }
+}
diff --git a/vendors/move/crates/move-abigen/src/lib.rs b/vendors/move/crates/move-abigen/src/lib.rs
new file mode 100644
index 000000000..5abe5ae7d
--- /dev/null
+++ b/vendors/move/crates/move-abigen/src/lib.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+extern crate core;
+
+mod abigen;
+
+pub use crate::abigen::*;
diff --git a/vendors/move/crates/move-abigen/tests/sources/bad_script.abi b/vendors/move/crates/move-abigen/tests/sources/bad_script.abi
new file mode 100644
index 000000000..d7be291e3
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/bad_script.abi
@@ -0,0 +1,10 @@
+Move prover abigen returns: exiting with model building errors
+error: incompatible types
+  ┌─ tests/sources/bad_script.move:3:9
+  │
+3 │         abort true  // type error, abort code must be a u64
+  │         ^^^^^^^^^^
+  │         │     │
+  │         │     Given: 'bool'
+  │         Invalid abort
+  │         Expected: 'u64'
diff --git a/vendors/move/crates/move-abigen/tests/sources/bad_script.move b/vendors/move/crates/move-abigen/tests/sources/bad_script.move
new file mode 100644
index 000000000..a65bde897
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/bad_script.move
@@ -0,0 +1,5 @@
+script {
+    fun bad_script() {
+        abort true  // type error, abort code must be a u64
+    }
+}
diff --git a/vendors/move/crates/move-abigen/tests/sources/diem.move b/vendors/move/crates/move-abigen/tests/sources/diem.move
new file mode 100644
index 000000000..c0e0fb89f
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/diem.move
@@ -0,0 +1,6 @@
+address 0x1 {
+
+/// Some test module.
+module DiemDocTest {
+}
+}
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module.move b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module.move
new file mode 100644
index 000000000..1d4548fbd
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module.move
@@ -0,0 +1,37 @@
+address 0x1 {
+module ScriptFunInModule {
+    use std::string::String;
+
+    struct NoCall has drop {}
+
+    /// This is a doc comment on this script fun
+    public entry fun this_is_a_script_fun(this_is_an_arg: u64, _another_arg: address) {
+        abort this_is_an_arg
+    }
+
+    /// This is another doc comment on a different script fun
+    public entry fun this_is_a_different_script_fun(this_is_an_arg: u64, _another_arg: address) {
+        abort this_is_an_arg
+    }
+
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_a_noncallable_script_fun(): u64 {
+        5
+    }
+
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_another_noncallable_script_fun(_blank: NoCall) { }
+
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_script_fun_with_signer_ref(account: &signer, _another_arg: u64) { }
+
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_script_fun_with_signer(account: signer, _another_arg: u64) { }
+
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_script_fun_with_string_args(account: &signer, _val: String) { }
+    public fun foo() { }
+
+    fun bar() { }
+}
+}
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_different_script_fun.abi b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_different_script_fun.abi
new file mode 100644
index 000000000..866e5cc03
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_different_script_fun.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_script_fun.abi b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_script_fun.abi
new file mode 100644
index 000000000..03b8c8148
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_a_script_fun.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer.abi b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer.abi
new file mode 100644
index 000000000..18dd10ba7
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer_ref.abi b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer_ref.abi
new file mode 100644
index 000000000..8a035016c
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_signer_ref.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi
new file mode 100644
index 000000000..696e85bb1
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/some_script.abi b/vendors/move/crates/move-abigen/tests/sources/some_script.abi
new file mode 100644
index 000000000..39305da77
Binary files /dev/null and b/vendors/move/crates/move-abigen/tests/sources/some_script.abi differ
diff --git a/vendors/move/crates/move-abigen/tests/sources/some_script.move b/vendors/move/crates/move-abigen/tests/sources/some_script.move
new file mode 100644
index 000000000..5416fa926
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/some_script.move
@@ -0,0 +1,7 @@
+script {
+#[allow(unused_type_parameter)]
+/// This script does really nothing but just aborts.
+fun some_script<Token>(_account: signer, code: u64) {
+    abort code
+}
+}
diff --git a/vendors/move/crates/move-abigen/tests/sources/some_script.mv b/vendors/move/crates/move-abigen/tests/sources/some_script.mv
new file mode 100644
index 000000000..5da849b5c
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/sources/some_script.mv
@@ -0,0 +1 @@
+ABC
diff --git a/vendors/move/crates/move-abigen/tests/testsuite.rs b/vendors/move/crates/move-abigen/tests/testsuite.rs
new file mode 100644
index 000000000..b429671d8
--- /dev/null
+++ b/vendors/move/crates/move-abigen/tests/testsuite.rs
@@ -0,0 +1,85 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{ffi::OsStr, path::Path};
+
+use codespan_reporting::term::termcolor::Buffer;
+use move_prover::{cli::Options, run_move_prover};
+use move_prover_test_utils::baseline_test::verify_or_update_baseline;
+use std::path::PathBuf;
+use tempfile::TempDir;
+
+#[allow(unused_imports)]
+use log::debug;
+use std::{
+    fs::{self, File},
+    io::Read,
+};
+
+const FLAGS: &[&str] = &["--verbose=warn", "--abigen"];
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let mut args = vec!["mvp_test".to_string()];
+    args.extend(FLAGS.iter().map(|s| (*s).to_string()));
+    args.push(path.to_string_lossy().to_string());
+
+    let mut options = Options::create_from_args(&args)?;
+    options.setup_logging_for_test();
+    options.abigen.compiled_script_directory = "tests/sources".to_string();
+    options.move_deps.push("../move-stdlib".to_string());
+    options
+        .move_named_address_values
+        .push("std=0x1".to_string());
+
+    test_abigen(path, options, "abi")?;
+
+    Ok(())
+}
+
+fn get_generated_abis(dir: &Path) -> std::io::Result<Vec<String>> {
+    let mut abi_paths = Vec::new();
+    if dir.is_dir() {
+        for entry in fs::read_dir(dir)? {
+            let entry = entry?;
+            let path = entry.path();
+            if path.is_dir() {
+                abi_paths.append(&mut get_generated_abis(&path)?);
+            } else if let Some("abi") = path.extension().and_then(OsStr::to_str) {
+                abi_paths.push(path.to_str().unwrap().to_string());
+            }
+        }
+    }
+    Ok(abi_paths)
+}
+
+fn test_abigen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Result<()> {
+    let temp_path = PathBuf::from(TempDir::new()?.path());
+    options.abigen.output_directory = temp_path.to_string_lossy().to_string();
+
+    let mut error_writer = Buffer::no_color();
+    match run_move_prover(&mut error_writer, options) {
+        Ok(()) => {
+            for abi_path in get_generated_abis(&temp_path)?.iter() {
+                let mut contents = String::new();
+                if let Ok(mut file) = File::open(abi_path) {
+                    file.read_to_string(&mut contents).unwrap();
+                }
+                let buf = PathBuf::from(abi_path);
+                let mut baseline_file_name = PathBuf::from(path);
+                baseline_file_name.pop();
+                baseline_file_name.push(buf.strip_prefix(&temp_path)?);
+                verify_or_update_baseline(&baseline_file_name, &contents)?;
+            }
+        }
+        Err(err) => {
+            let mut contents = format!("Move prover abigen returns: {}\n", err);
+            contents += &String::from_utf8_lossy(&error_writer.into_inner());
+            let baseline_path = path.with_extension(suffix);
+            verify_or_update_baseline(&baseline_path, &contents)?;
+        }
+    };
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests/sources", r".*\.move",);
diff --git a/vendors/move/crates/move-abstract-stack/Cargo.toml b/vendors/move/crates/move-abstract-stack/Cargo.toml
new file mode 100644
index 000000000..37d45f212
--- /dev/null
+++ b/vendors/move/crates/move-abstract-stack/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "move-abstract-stack"
+version = "0.0.1"
+authors = ["The Move Contributors"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
diff --git a/vendors/move/crates/move-abstract-stack/src/lib.rs b/vendors/move/crates/move-abstract-stack/src/lib.rs
new file mode 100644
index 000000000..dfc388d3a
--- /dev/null
+++ b/vendors/move/crates/move-abstract-stack/src/lib.rs
@@ -0,0 +1,169 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines an abstract stack used by various verifier passes
+
+#[cfg(test)]
+mod unit_tests;
+
+use std::cmp::Ordering;
+use std::fmt::{self, Debug};
+use std::num::NonZeroU64;
+
+#[derive(Default, Debug)]
+/// An abstract value that compresses runs of the same value to reduce space usage
+pub struct AbstractStack<T> {
+    values: Vec<(u64, T)>,
+    len: u64,
+}
+
+impl<T: Eq + Clone + Debug> AbstractStack<T> {
+    /// Creates an empty stack
+    pub fn new() -> Self {
+        Self {
+            values: vec![],
+            len: 0,
+        }
+    }
+
+    /// Returns true iff the stack is empty
+    pub fn is_empty(&self) -> bool {
+        // empty ==> len is 0
+        debug_assert!(!self.values.is_empty() || self.len == 0);
+        // !empty ==> last element len <= len
+        debug_assert!(self.values.is_empty() || self.values.last().unwrap().0 <= self.len);
+        self.values.is_empty()
+    }
+
+    /// Returns the logical length of the stack as if there was no space
+    /// compression
+    pub fn len(&self) -> u64 {
+        // len is 0 ==> empty
+        debug_assert!(self.len != 0 || self.values.is_empty());
+        // len not 0 ==> !empty and last element len <= len
+        debug_assert!(
+            self.len == 0 || (!self.values.is_empty() && self.values.last().unwrap().0 <= self.len)
+        );
+        self.len
+    }
+
+    /// Pushes a single value on the stack
+    pub fn push(&mut self, item: T) -> Result<(), AbsStackError> {
+        self.push_n(item, 1)
+    }
+
+    /// Push n copies of an item on the stack
+    pub fn push_n(&mut self, item: T, n: u64) -> Result<(), AbsStackError> {
+        if n == 0 {
+            return Ok(());
+        }
+
+        let Some(new_len) = self.len.checked_add(n) else {
+            return Err(AbsStackError::Overflow);
+        };
+        self.len = new_len;
+        match self.values.last_mut() {
+            Some((count, last_item)) if &item == last_item => {
+                debug_assert!(*count > 0);
+                *count += n
+            }
+            _ => self.values.push((n, item)),
+        }
+        Ok(())
+    }
+
+    /// Pops a single value off the stack
+    pub fn pop(&mut self) -> Result<T, AbsStackError> {
+        self.pop_eq_n(NonZeroU64::new(1).unwrap())
+    }
+
+    /// Pops n values off the stack, erroring if there are not enough items or if the n items are
+    /// not equal
+    pub fn pop_eq_n(&mut self, n: NonZeroU64) -> Result<T, AbsStackError> {
+        let n: u64 = n.get();
+        if self.is_empty() || n > self.len {
+            return Err(AbsStackError::Underflow);
+        }
+        let (count, last) = self.values.last_mut().unwrap();
+        debug_assert!(*count > 0);
+        let ret = match (*count).cmp(&n) {
+            Ordering::Less => return Err(AbsStackError::ElementNotEqual),
+            Ordering::Equal => {
+                let (_, last) = self.values.pop().unwrap();
+                last
+            }
+            Ordering::Greater => {
+                *count -= n;
+                last.clone()
+            }
+        };
+        self.len -= n;
+        Ok(ret)
+    }
+
+    /// Pop any n items off the stack. Unlike `pop_n`, items do not have to be equal
+    pub fn pop_any_n(&mut self, n: NonZeroU64) -> Result<(), AbsStackError> {
+        let n: u64 = n.get();
+        if self.is_empty() || n > self.len {
+            return Err(AbsStackError::Underflow);
+        }
+        let mut rem: u64 = n;
+        while rem > 0 {
+            let (count, _last) = self.values.last_mut().unwrap();
+            debug_assert!(*count > 0);
+            match (*count).cmp(&rem) {
+                Ordering::Less | Ordering::Equal => {
+                    rem -= *count;
+                    self.values.pop().unwrap();
+                }
+                Ordering::Greater => {
+                    *count -= rem;
+                    break;
+                }
+            }
+        }
+        self.len -= n;
+        Ok(())
+    }
+
+    #[cfg(test)]
+    pub(crate) fn assert_run_lengths<'a, Items, Item>(&self, lengths: Items)
+    where
+        Item: std::borrow::Borrow<u64>,
+        Items: IntoIterator<Item = Item>,
+        <Items as IntoIterator>::IntoIter: ExactSizeIterator,
+    {
+        let lengths_iter = lengths.into_iter();
+        assert_eq!(self.values.len(), lengths_iter.len());
+        let mut sum = 0;
+        for ((actual, _), expected) in self.values.iter().zip(lengths_iter) {
+            let expected = expected.borrow();
+            assert_eq!(actual, expected);
+            sum += *expected;
+        }
+        assert_eq!(self.len, sum);
+    }
+}
+
+#[derive(Eq, PartialEq, PartialOrd, Ord, Clone, Copy, Debug)]
+pub enum AbsStackError {
+    ElementNotEqual,
+    Underflow,
+    Overflow,
+}
+
+impl fmt::Display for AbsStackError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AbsStackError::ElementNotEqual => {
+                write!(f, "Popped element is not equal to specified item")
+            }
+            AbsStackError::Underflow => {
+                write!(f, "Popped more values than are on the stack")
+            }
+            AbsStackError::Overflow => {
+                write!(f, "Pushed too many elements on the stack")
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-abstract-stack/src/unit_tests/mod.rs b/vendors/move/crates/move-abstract-stack/src/unit_tests/mod.rs
new file mode 100644
index 000000000..f4824dd8f
--- /dev/null
+++ b/vendors/move/crates/move-abstract-stack/src/unit_tests/mod.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::*;
+
+#[test]
+fn test_empty_stack() {
+    let mut empty = AbstractStack::<usize>::new();
+    assert!(empty.is_empty());
+
+    // pop on empty stack
+    assert_eq!(empty.pop(), Err(AbsStackError::Underflow));
+    assert_eq!(empty.pop_any_n(nonzero(1)), Err(AbsStackError::Underflow));
+    assert_eq!(empty.pop_any_n(nonzero(100)), Err(AbsStackError::Underflow));
+    assert_eq!(empty.pop_eq_n(nonzero(12)), Err(AbsStackError::Underflow));
+    assert_eq!(empty.pop_eq_n(nonzero(112)), Err(AbsStackError::Underflow));
+
+    assert!(empty.is_empty());
+}
+
+#[test]
+fn test_simple_push_pop() {
+    let mut s = AbstractStack::new();
+    s.push(1).unwrap();
+    assert!(!s.is_empty());
+    assert_eq!(s.len(), 1);
+    s.assert_run_lengths([1]);
+    assert_eq!(s.pop(), Ok(1));
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+
+    s.push(1).unwrap();
+    s.push(2).unwrap();
+    s.push(3).unwrap();
+    assert!(!s.is_empty());
+    assert_eq!(s.len(), 3);
+    s.assert_run_lengths([1, 1, 1]);
+    assert_eq!(s.pop(), Ok(3));
+    assert_eq!(s.pop(), Ok(2));
+    assert_eq!(s.pop(), Ok(1));
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+
+    s.push_n(1, 1).unwrap();
+    s.push_n(2, 2).unwrap();
+    s.push_n(3, 3).unwrap();
+    assert!(!s.is_empty());
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.pop(), Ok(3));
+    assert_eq!(s.pop(), Ok(3));
+    assert_eq!(s.pop(), Ok(3));
+    assert_eq!(s.pop(), Ok(2));
+    assert_eq!(s.pop(), Ok(2));
+    assert_eq!(s.pop(), Ok(1));
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+
+    s.push_n(1, 1).unwrap();
+    s.push_n(2, 2).unwrap();
+    s.push_n(3, 3).unwrap();
+    assert!(!s.is_empty());
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.pop_eq_n(nonzero(3)), Ok(3));
+    assert_eq!(s.pop_eq_n(nonzero(2)), Ok(2));
+    assert_eq!(s.pop_eq_n(nonzero(1)), Ok(1));
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+
+    s.push(1).unwrap();
+    s.push(2).unwrap();
+    s.push(2).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    assert!(!s.is_empty());
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.len(), 6);
+    assert_eq!(s.pop_eq_n(nonzero(3)), Ok(3));
+    assert_eq!(s.pop_eq_n(nonzero(2)), Ok(2));
+    assert_eq!(s.pop_eq_n(nonzero(1)), Ok(1));
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+
+    s.push_n(1, 1).unwrap();
+    s.push_n(2, 2).unwrap();
+    s.push_n(3, 3).unwrap();
+    assert!(!s.is_empty());
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.len(), 6);
+    s.pop_any_n(nonzero(6)).unwrap();
+    assert_eq!(s.len(), 0);
+    assert!(s.is_empty());
+
+    s.push(1).unwrap();
+    s.push(2).unwrap();
+    s.push(2).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    assert!(!s.is_empty());
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.len(), 6);
+    s.pop_any_n(nonzero(4)).unwrap();
+    s.pop_any_n(nonzero(2)).unwrap();
+    assert!(s.is_empty());
+    assert_eq!(s.len(), 0);
+}
+
+#[test]
+fn test_not_eq() {
+    let mut s = AbstractStack::new();
+    s.push(1).unwrap();
+    s.push(2).unwrap();
+    s.push(2).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.pop_eq_n(nonzero(4)), Err(AbsStackError::ElementNotEqual));
+    assert_eq!(s.pop_eq_n(nonzero(5)), Err(AbsStackError::ElementNotEqual));
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+}
+
+#[test]
+fn test_not_enough_values() {
+    let mut s = AbstractStack::new();
+    s.push(1).unwrap();
+    s.push(2).unwrap();
+    s.push(2).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    s.push(3).unwrap();
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+    assert_eq!(s.pop_eq_n(nonzero(7)), Err(AbsStackError::Underflow));
+    assert_eq!(s.pop_any_n(nonzero(7)), Err(AbsStackError::Underflow));
+    assert_eq!(s.len(), 6);
+    s.assert_run_lengths([1, 2, 3]);
+}
+
+#[test]
+fn test_exhaustive() {
+    fn run_lengths(bits: &[bool]) -> Vec<u64> {
+        let mut cur = bits[0];
+        let mut runs = vec![0];
+        for bit in bits.iter().copied() {
+            if cur == bit {
+                let last = runs.last_mut().unwrap();
+                *last += 1;
+            } else {
+                cur = bit;
+                runs.push(1);
+            }
+        }
+        runs
+    }
+    fn push_pop(bits: &[bool]) {
+        let mut s = AbstractStack::new();
+        for bit in bits.iter().copied() {
+            s.push(bit).unwrap();
+        }
+        s.assert_run_lengths(run_lengths(bits));
+
+        for bit in bits.iter().copied().rev() {
+            assert_eq!(s.pop(), Ok(bit));
+        }
+        assert!(s.is_empty())
+    }
+    fn pushn_pop(bits: &[bool]) {
+        let mut s = AbstractStack::new();
+        let mut push_cur = false;
+        let mut push_count = 0;
+        for bit in bits.iter().copied() {
+            if push_cur == bit {
+                push_count += 1;
+            } else {
+                s.push_n(push_cur, push_count).unwrap();
+                push_cur = bit;
+                push_count = 1;
+            }
+        }
+        s.push_n(push_cur, push_count).unwrap();
+        assert_eq!(s.len(), bits.len() as u64);
+        s.assert_run_lengths(run_lengths(bits));
+
+        let mut n = bits.len() as u64;
+        for bit in bits.iter().copied().rev() {
+            assert_eq!(s.pop(), Ok(bit));
+            n -= 1;
+            assert_eq!(s.len(), n);
+        }
+        assert!(s.is_empty())
+    }
+    fn push_popn(bits: &[bool]) {
+        let mut s = AbstractStack::new();
+        let mut s_no_eq = AbstractStack::new();
+        for bit in bits {
+            s.push(*bit).unwrap();
+            s_no_eq.push(*bit).unwrap();
+        }
+        assert_eq!(s.len(), bits.len() as u64);
+        assert_eq!(s_no_eq.len(), bits.len() as u64);
+        let rl = run_lengths(bits);
+        s.assert_run_lengths(&rl);
+        s_no_eq.assert_run_lengths(&rl);
+
+        let mut pop_cur = false;
+        let mut pop_count = 0;
+        let mut n = bits.len() as u64;
+        for bit in bits.iter().copied().rev() {
+            if pop_cur == bit {
+                pop_count += 1
+            } else {
+                if pop_count > 0 {
+                    assert_eq!(s.pop_eq_n(nonzero(pop_count)), Ok(pop_cur));
+                    n -= pop_count;
+                    assert_eq!(s.len(), n);
+                }
+                pop_cur = bit;
+                pop_count = 1;
+            }
+        }
+        if pop_count > 0 {
+            assert_eq!(s.pop_eq_n(nonzero(pop_count)), Ok(pop_cur));
+        }
+        if !bits.is_empty() {
+            s_no_eq.pop_any_n(nonzero(bits.len() as u64)).unwrap();
+        }
+        assert!(s.is_empty());
+        assert!(s_no_eq.is_empty());
+    }
+    fn pushn_popn(bits: &[bool]) {
+        let mut s = AbstractStack::new();
+        let mut s_no_eq = AbstractStack::new();
+        let mut push_cur = false;
+        let mut push_count = 0;
+        let mut n = 0;
+        for bit in bits.iter().copied() {
+            if push_cur == bit {
+                push_count += 1;
+            } else {
+                s.push_n(push_cur, push_count).unwrap();
+                s_no_eq.push_n(push_cur, push_count).unwrap();
+                n += push_count;
+                assert_eq!(s.len(), n);
+                assert_eq!(s_no_eq.len(), n);
+                push_cur = bit;
+                push_count = 1;
+            }
+        }
+        s.push_n(push_cur, push_count).unwrap();
+        s_no_eq.push_n(push_cur, push_count).unwrap();
+        assert_eq!(s.len(), bits.len() as u64);
+        assert_eq!(s_no_eq.len(), bits.len() as u64);
+        let rl = run_lengths(bits);
+        s.assert_run_lengths(&rl);
+        s_no_eq.assert_run_lengths(&rl);
+
+        let mut pop_cur = false;
+        let mut pop_count = 0;
+        let mut n = bits.len() as u64;
+        for bit in bits.iter().copied().rev() {
+            if pop_cur == bit {
+                pop_count += 1
+            } else {
+                if pop_count > 0 {
+                    assert_eq!(s.pop_eq_n(nonzero(pop_count)), Ok(pop_cur));
+                    n -= pop_count;
+                    assert_eq!(s.len(), n);
+                }
+                pop_cur = bit;
+                pop_count = 1;
+            }
+        }
+        assert_eq!(s.pop_eq_n(nonzero(pop_count)), Ok(pop_cur));
+        s_no_eq.pop_any_n(nonzero(bits.len() as u64)).unwrap();
+        assert!(s.is_empty());
+        assert!(s_no_eq.is_empty());
+    }
+    for n in 0u8..=255 {
+        let bits: Vec<bool> = (0..=7).map(|i| (n & (1 << i)) != 0).collect();
+        push_pop(&bits);
+        pushn_pop(&bits);
+        push_popn(&bits);
+        pushn_popn(&bits);
+    }
+}
+
+fn nonzero(x: u64) -> NonZeroU64 {
+    NonZeroU64::new(x).unwrap()
+}
diff --git a/vendors/move/crates/move-analyzer/Cargo.toml b/vendors/move/crates/move-analyzer/Cargo.toml
new file mode 100644
index 000000000..2a9e3c549
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "move-analyzer"
+version = "1.0.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "A language server for Move"
+repository = "https://github.com/move-language/move"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+codespan-reporting.workspace = true
+derivative.workspace = true
+dunce.workspace = true
+im.workspace = true
+lsp-server.workspace = true
+lsp-types.workspace = true
+serde_json.workspace = true
+tempfile.workspace = true
+url.workspace = true
+clap.workspace = true
+crossbeam.workspace = true
+move-command-line-common.workspace = true
+move-compiler.workspace = true
+move-ir-types.workspace = true
+move-package.workspace = true
+move-symbol-pool.workspace = true
diff --git a/vendors/move/crates/move-analyzer/editors/code/.eslintignore b/vendors/move/crates/move-analyzer/editors/code/.eslintignore
new file mode 100644
index 000000000..e27093b7b
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/.eslintignore
@@ -0,0 +1,7 @@
+# There's no need for eslint to lint external module dependencies.
+node_modules
+# eslint lints our pre-compiled source files; it does not need to lint
+# build output.
+out
+# Do not lint TypeScript type declarations.
+*.d.ts
diff --git a/vendors/move/crates/move-analyzer/editors/code/.eslintrc.json b/vendors/move/crates/move-analyzer/editors/code/.eslintrc.json
new file mode 100644
index 000000000..a6a2d7351
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/.eslintrc.json
@@ -0,0 +1,220 @@
+{
+    // Don't bother looking for eslint configuration files in parent
+    // directories; this is the root configuration.
+    "root": true,
+
+    // Instruct eslint to use a parser that can parse TypeScript.
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        // Match the ECMAScript standard specified in our TypeScript config.
+        "ecmaVersion": "2020",
+        // Use ECMAScript modules.
+        "sourceType": "module",
+        // To type-check while linting, specify the TypeScript compiler be
+        // invoked from the same directory as this lint configuration file,
+        // using the TypeScript configuration file at the "project" path.
+        "tsconfigRootDir": ".",
+        "project": [
+            "./tsconfig.json"
+        ]
+    },
+
+    // Specify the environment in which our JavaScript will run.
+    "env": {
+        // The Node.js runtime environment provides globals such as `__dirname`.
+        "node": true
+    },
+
+    // Plug-in eslint rules from @typescript-eslint.
+    "plugins": [
+        "@typescript-eslint",
+        "eslint-plugin-tsdoc"
+    ],
+    // Use the core rules that eslint and @typescript-eslint recommend.
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking"
+    ],
+    // Enable some additional rules beyond the recommended ones.
+    // For more information, see: https://eslint.org/docs/rules/
+    "rules": {
+        // The following are in the "possible errors" category of eslint rules.
+        "no-promise-executor-return": "warn",
+        "no-template-curly-in-string": "warn",
+        "no-unreachable-loop": "warn",
+        "no-unsafe-optional-chaining": "warn",
+        "no-useless-backreference": "warn",
+        "require-atomic-updates": "warn",
+
+        // The following are in the "best practices" category of eslint rules.
+        "array-callback-return": "warn",
+        "block-scoped-var": "warn",
+        "class-methods-use-this": "warn",
+        "consistent-return": "warn",
+        "curly": "warn",
+        "default-case": "warn",
+        "default-case-last": "warn",
+        "dot-location": "warn",
+        "eqeqeq": "warn",
+        "guard-for-in": "warn",
+        "no-constructor-return": "warn",
+        "no-else-return": "warn",
+        "no-eq-null": "warn",
+        "no-eval": "warn",
+        "no-extend-native": "warn",
+        "no-extra-bind": "warn",
+        "no-extra-label": "warn",
+        "no-floating-decimal": "warn",
+        "no-implicit-coercion": "warn",
+        "no-implicit-globals": "warn",
+        "no-labels": "warn",
+        "no-lone-blocks": "warn",
+        "no-multi-spaces": "warn",
+        "no-nonoctal-decimal-escape": "warn",
+        "no-octal-escape": "warn",
+        "no-param-reassign": "warn",
+        "no-return-assign": "warn",
+        "no-script-url": "warn",
+        "no-self-compare": "warn",
+        "no-sequences": "warn",
+        "no-throw-literal": "warn",
+        "no-unmodified-loop-condition": "warn",
+        "no-useless-call": "warn",
+        "no-useless-concat": "warn",
+        "no-useless-return": "warn",
+        "prefer-promise-reject-errors": "warn",
+        "radix": "warn",
+
+        // The following are in the "stylistic issues" category of eslint rules.
+        "array-bracket-spacing": "warn",
+        "array-element-newline": [
+            "warn",
+            "consistent"
+        ],
+        "block-spacing": "warn",
+        "capitalized-comments": [
+            "warn",
+            "always",
+            {
+                "ignoreConsecutiveComments": true
+            }
+        ],
+        "comma-style": "warn",
+        "computed-property-spacing": "warn",
+        "eol-last": "warn",
+        "function-call-argument-newline": ["warn", "consistent"],
+        "function-paren-newline": ["warn", "consistent"],
+        "key-spacing": "warn",
+        "linebreak-style": "off", // We use different linebreak styles. ref https://eslint.org/docs/latest/rules/linebreak-style
+        "max-len": [
+            "warn",
+            {
+                "code": 120,
+                "ignoreUrls": true
+            }
+        ],
+        "new-cap": "warn",
+        "new-parens": "warn",
+        "no-lonely-if": "warn",
+        "no-mixed-operators": "warn",
+        "no-multi-assign": "warn",
+        "no-multiple-empty-lines": "warn",
+        "no-negated-condition": "warn",
+        "no-new-object": "warn",
+        "no-tabs": "warn",
+        "no-trailing-spaces": "warn",
+        "no-unneeded-ternary": "warn",
+        "no-whitespace-before-property": "warn",
+        "prefer-exponentiation-operator": "warn",
+        "prefer-object-spread": "warn",
+        "semi-spacing": "warn",
+        "semi-style": "warn",
+        "space-in-parens": "warn",
+        "spaced-comment": "warn",
+        "switch-colon-spacing": "warn",
+        "unicode-bom": "warn",
+
+        // The following are @typescript-eslint rules. For more information, see:
+        // * All @typescript-eslint rules: https://github.com/typescript-eslint/typescript-eslint/tree/v4.31.1/packages/eslint-plugin/docs/rules
+        // * The rules included in @typescript-eslint/recommended: https://github.com/typescript-eslint/typescript-eslint/blob/v4.31.1/packages/eslint-plugin/src/configs/recommended.ts
+        // * The rules included in @typescript-eslint/recommended-requiring-type-checking: https://github.com/typescript-eslint/typescript-eslint/blob/v4.31.1/packages/eslint-plugin/src/configs/recommended-requiring-type-checking.ts
+        "@typescript-eslint/ban-tslint-comment": "warn",
+        "@typescript-eslint/brace-style": "warn",
+        "@typescript-eslint/comma-dangle": [
+            "warn",
+            "always-multiline"
+        ],
+        "@typescript-eslint/comma-spacing": "warn",
+        "@typescript-eslint/consistent-indexed-object-style": "warn",
+        "@typescript-eslint/consistent-type-assertions": "warn",
+        "@typescript-eslint/consistent-type-definitions": "warn",
+        "@typescript-eslint/consistent-type-imports": "warn",
+        "@typescript-eslint/default-param-last": "warn",
+        "@typescript-eslint/dot-notation": "warn",
+        "@typescript-eslint/explicit-function-return-type": "warn",
+        "@typescript-eslint/func-call-spacing": "warn",
+        "@typescript-eslint/keyword-spacing": "warn",
+        "@typescript-eslint/lines-between-class-members": "warn",
+        "@typescript-eslint/member-delimiter-style": "warn",
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/no-base-to-string": "warn",
+        "@typescript-eslint/no-confusing-non-null-assertion": "warn",
+        "@typescript-eslint/no-duplicate-imports": "warn",
+        "@typescript-eslint/no-dynamic-delete": "warn",
+        "@typescript-eslint/no-extra-parens": "warn",
+        "@typescript-eslint/no-extraneous-class": "warn",
+        "@typescript-eslint/no-implicit-any-catch": "warn",
+        "@typescript-eslint/no-invalid-this": "warn",
+        "@typescript-eslint/no-invalid-void-type": "warn",
+        "@typescript-eslint/no-loop-func": "warn",
+        "@typescript-eslint/no-loss-of-precision": "warn",
+        "@typescript-eslint/no-meaningless-void-operator": "warn",
+        "@typescript-eslint/no-redeclare": "warn",
+        "@typescript-eslint/no-require-imports": "warn",
+        "@typescript-eslint/no-unnecessary-boolean-literal-compare": "warn",
+        "@typescript-eslint/no-unnecessary-condition": "warn",
+        "@typescript-eslint/no-unnecessary-qualifier": "warn",
+        "@typescript-eslint/no-unnecessary-type-arguments": "warn",
+        "@typescript-eslint/no-unnecessary-type-constraint": "warn",
+        "@typescript-eslint/no-unused-expressions": "warn",
+        "@typescript-eslint/no-use-before-define": "warn",
+        "@typescript-eslint/non-nullable-type-assertion-style": "warn",
+        "@typescript-eslint/object-curly-spacing": ["warn", "always"],
+        "@typescript-eslint/prefer-for-of": "warn",
+        "@typescript-eslint/prefer-function-type": "warn",
+        "@typescript-eslint/prefer-includes": "warn",
+        "@typescript-eslint/prefer-literal-enum-member": "warn",
+        "@typescript-eslint/prefer-nullish-coalescing": "warn",
+        "@typescript-eslint/prefer-optional-chain": "warn",
+        "@typescript-eslint/prefer-readonly": "warn",
+        "@typescript-eslint/prefer-reduce-type-parameter": "warn",
+        "@typescript-eslint/prefer-string-starts-ends-with": "warn",
+        "@typescript-eslint/promise-function-async": "warn",
+        "@typescript-eslint/quotes": ["warn", "single"],
+        "@typescript-eslint/require-array-sort-compare": "warn",
+        "@typescript-eslint/return-await": "warn",
+        "@typescript-eslint/semi": "warn",
+        "@typescript-eslint/space-before-function-paren": [
+            "warn",
+            {
+                "anonymous": "never",
+                "named": "never",
+                "asyncArrow": "always"
+            }
+        ],
+        "@typescript-eslint/strict-boolean-expressions": "warn",
+        "@typescript-eslint/switch-exhaustiveness-check": "warn",
+        "@typescript-eslint/unified-signatures": "warn",
+
+        // The following are eslint-plugin-tsdoc rules:
+        "tsdoc/syntax": "warn",
+
+        "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/type-annotation-spacing": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unsafe-assignment": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/array-type": "off"
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/.gitignore b/vendors/move/crates/move-analyzer/editors/code/.gitignore
new file mode 100644
index 000000000..8174e373d
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/.gitignore
@@ -0,0 +1,11 @@
+# NPM dependencies
+node_modules
+# TypeScript build output directory
+out
+# Tests are run within a VS Code application that is downloaded
+# into this directory
+.vscode-test
+# VS Code extension package (VSIX) archive
+*.vsix
+# Yarn cache directory
+yarn.lock
diff --git a/vendors/move/crates/move-analyzer/editors/code/CONTRIBUTING.md b/vendors/move/crates/move-analyzer/editors/code/CONTRIBUTING.md
new file mode 100644
index 000000000..d65449b1c
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/CONTRIBUTING.md
@@ -0,0 +1,95 @@
+# How to contribute to the move-analyzer Visual Studio Code extension
+
+## Installing dependencies
+
+To begin contributing to the VS Code extension for Move, you'll need to have some prerequisite technologies installed:
+
+1. Visual Studio Code itself. To install, follow the directions on [the VS Code website](https://code.visualstudio.com).
+2. Node.js and its package manager, NPM. To install, follow the directions on [the Node.js website](https://nodejs.org/en/).
+3. The Node module dependencies this extension relies upon. To install, make sure you have Node.js and NPM installed, then open your favorite terminal app. Navigate to the extension's directory and install its dependencies using `npm install`. In short: `cd language/move-analyzer/editors/code && npm install`.
+
+> If you'll be using [VS Code Remote Development](https://code.visualstudio.com/docs/remote/remote-overview) to connect to a computer over SSH, install Node.js on the computer you'll be connecting to.
+
+## Running tests on the command line using `package.json` scripts
+
+The best way to confirm that your dependency installation succeeded is by running the tests:
+
+```sh
+npm run pretest
+npm run test
+```
+
+This executes the `"pretest"` and `"test"` "scripts" from thr `package.json` in the extension's directory. This `package.json` file defines not only information about the extension, such as its name and a description, but also "scripts": aliases for commands that can be run with `npm run`.
+
+Currently, the scripts focus on compiling the project's [TypeScript](https://www.typescriptlang.org) into JavaScript (VS Code extensions run in a JavaScript environment).
+
+## Launching VS Code with the extension installed from source
+
+Running the extension's tests from the command-line is cumbersome because the test environment insists no other instance of VS Code is running while the tests run. Instead, to launch VS Code with the extension installed from source:
+
+1. Open this repository in VS Code.
+2. Open the "Run and Debug" view: open the command palette (keyboard shortcut `⇧⌘P` on macOS) and type in "View: Show Run and Debug".
+3. From the pull-down menu in the Run and Debug view, select "Launch with Extension" and click the green arrow button. This will launch a new VS Code window that has the `move-analyzer` extension installed. If you open a `.move` file, it will be highlighted according to the any changes you've made in your local checkout of this repository.
+4. Once you've launched the extension, in the original VS Code window you'll see a small box with pause, refresh, and stop buttons. Clicking these allows you to quickly refresh the extension window with your latest changes, or quit the window.
+
+To test the Move TextMate grammar, open a file with a `.move` file extension and use the command palette to run the "Developer: Inspect Editor Tokens and Scopes" command. This displays a large window that shows what token is detected below the typing cursor in the VS Code window.
+
+## Running the tests from within VS Code
+
+You can run the extensions tests from within the "Run and Debug" view:
+
+1. Open this repository in VS Code.
+2. Open the "Run and Debug" view: open the command palette (keyboard shortcut `⇧⌘P` on macOS) and type in "View: Show Run and Debug".
+3. Toward the bottom of the Run and Debug view, you should see an option to enable breakpoints on "Uncaught Exceptions." Clicking the check-box to enable breakpoints will make test failures easier to debug.
+4. From the pull-down menu in the Run and Debug view, select "VS Code Tokenizer Tests" and click the green arrow button to run the tests. Should they fail, you will see a stack trace.
+
+## Releasing new versions of the extension
+
+To add new versions of the move-analyzer Visual Studio Code extension, you will need to:
+
+1. Request to be added to the `move` publisher team.
+2. Package and upload a new extension version.
+
+### 1: Become a member of the `move` publisher team
+
+As [Visual Studio Code's documentation](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) explains, the Visual Studio Marketplace  uses [Azure DevOps](https://azure.microsoft.com/services/devops/) to authenticate users who are allowed to manage extensions. To register with Azure DevOps, you need a Microsoft account.
+
+> **NOTE:** If you work for a company that uses Microsoft Outlook to serve your corporate email, then you already have a Microsoft account associated with that email address.
+
+To be added to the group of maintainers allowed to release new versions of the move-analyzer Visual Studio Code extension:
+
+1. Open https://marketplace.visualstudio.com/vscode in your browser and click on "Sign in" on the upper-right of the page.
+2. Sign in with your Microsoft account's email address. If using a corporate email address, you'll go through an authentication flow specific to your organization (two-factor authentication, for example).
+3. Once you've signed in, contact someone who is already in the existing group of maintainers, and ask them to [please add you to this list of members](https://marketplace.visualstudio.com/manage/publishers/move). If you do not know anyone in this group personally, run `git log -- language/move-analyzer/editors/code` and send an email to one or more of the people who have committed to this directory.
+
+Once you've been added, confirm that you are able to access [the `move` publisher page](https://marketplace.visualstudio.com/manage/publishers/move). If you can see yourself listed in the "Members" tab, then you have successfully been added to the publisher team.
+
+### 2: Publish a new version
+
+To publish a new version of the extension, you'll need to:
+
+1. Create a personal access token (PAT) that allows your command line to authenticate with the Visual Studio Marketplace.
+2. Publish and merge a pull request to update the version number of the extension.
+3. Upload a new version of the extension to the Visual Studio Code Marketplace.
+
+#### 2.1: Create a personal access token
+
+Follow the instructions in [the Visual Studio Code documentation on creating a personal access token](https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token). To summarize:
+
+1. From the [`move` publisher page](https://marketplace.visualstudio.com/manage/publishers/move), click on your username in the upper-right of the page. This will load [your Azure DevOps page](https://aex.dev.azure.com/me).
+2. On that page, click on the `dev.azure.com/<name>` link below "Azure DevOps Organizations." If you have more than one organization listed there, choose the one you feel is best. This will load the `https://dev.azure.com/<name>` organization page.
+3. On that page, click on the "User Settings" icon in the upper-right, and select "Personal access tokens" from the drop-down menu. This will load the "Personal Access Tokens" page.
+4. On that page, click "New Token." Name it whatever you like but make sure to select an expiration of 30 days, select "All accessible organizations" under the "Organization" drop-down menu, and click the "Custom defined" button under "Scopes" followed by setting (only) "Marketplace" scope on the list of custom scopes to "Manage". Click "Create," and copy the token that is presented on the following page to your clipboard.
+5. Using your command line, enter the directory containing this `CONTRIBUTING.md` file, make sure you've installed the project's dependencies using `npm install`, and then run `npx vsce login move`. You will be prompted to enter the token you just copied in the previous step. Do so, and you'll have successfully authenticated on the command line.
+
+#### 2.2: Update the version number of the extension
+
+The `package.json` file in this directory specifies the extension's version number. The Visual Studio Code Marketplace will only allow an extension with a greater version number to be published.
+
+Update the version number, commit that change in Git, and submit a pull request to update the version number. Once the version number update pull request is merged, proceed to the next step.
+
+#### 2.3: Upload a new version of the extension
+
+You can publish a new version with `npm run publish`. This will lint the source code, run the extension's tests and, if they succeed, validate the extension and publish it to the Visual Studio Code Marketplace.
+
+The extension package may fail to validate, in which case it will print an error message that explains the problem. Please fix the problems, submit a pull request, and only once that pull request is merged, attempt once again to publish the extension update.
diff --git a/vendors/move/crates/move-analyzer/editors/code/README.md b/vendors/move/crates/move-analyzer/editors/code/README.md
new file mode 100644
index 000000000..a6891393e
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/README.md
@@ -0,0 +1,89 @@
+# move-analyzer
+
+Provides language support for the Move programming language.
+
+Currently, this means a basic grammar and language configuration for Move (`.move`) that enables
+syntax highlighting, commenting/uncommenting, simple context-unaware completion suggestions while
+typing, and other basic language features in Move files.
+
+For information about Move visit [the Move repository](https://github.com/move-language/move).
+
+## How to Install
+
+The move-analyzer Visual Studio Code extension works via two components: the extension itself and
+the `move-analyzer` language server.
+
+### 1. Installing the `move-analyzer` language server<span id="Step1">
+
+The `move-analyzer` language server is a Rust program that is part of the
+[Move repository](https://github.com/move-language/move). It may be installed in one of two ways:
+
+* Clone [the Move repository](https://github.com/move-language/move) yourself and build
+   `move-analyzer` from its source code, which is especially useful if you will work on core Move.
+   To do so, follow the instructions in the Move tutorial's
+   [Step 0: Installation](https://github.com/move-language/move/tree/main/language/documentation/tutorial#step-0-installation).
+* Use Rust's package manager `cargo` to install `move-analyzer` in your user's PATH. This
+   is recommended for people who do not work on core Move.
+   1. If you don't already have a Rust toolchain installed, you should install
+      [Rustup](https://rustup.rs/), which will install the latest stable Rust toolchain.
+   2. Invoke `cargo install --git https://github.com/move-language/move move-analyzer` to install the
+      `move-analyzer` language server in your Cargo binary directory. On macOS and Linux, this is
+      usually `~/.cargo/bin`. You'll want to make sure this location is in your `PATH` environment
+      variable. If you plan to use the language server with Move language flavors different from core Move,
+      you should specify an additional option to `cargo install` command as different Move flavors
+      may enforce different max length of the Move address type: `--features "address20"` option for Move
+      flavors requiring 20-byte long addresses (e.g., Sui Move) and `--features "address32"` option
+      for Move flavors requiring 32-byte long addresses (e.g., Aptos Move).
+
+To confirm that you've installed the language server program successfully, execute
+`move-analyzer --version` on the command line. You should see the output `move-analyzer 1.0.0`.
+
+### 2. Installing the move-analyzer Visual Studio Code extension
+
+1. Open a new window in any Visual Studio Code application version 1.55.2 or greater.
+2. Open the command palette (`⇧⌘P` on macOS, or use the menu item *View > Command Palette...*) and
+   type **Extensions: Install Extensions**. This will open a panel named *Extensions* in the
+   sidebar of your Visual Studio Code window.
+3. In the search bar labeled *Search Extensions in Marketplace*, type **move-analyzer**. The
+   move-analyzer extension should appear in the list below the search bar. Click **Install**.
+4. Open any file that ends in `.move`. Or to create a new file, click **Select a language**, and
+   choose the **Move** language. As you type, you should see that keywords and types appear in
+   different colors.
+
+### Troubleshooting
+
+If you see an error message *language server executable 'move-analyzer' could not be found* in the
+bottom-right of your Visual Studio Code screen when opening a Move file, it means that the
+`move-analyzer` executable could not be found in your `PATH`. You may try the following:
+
+1. Confirm that invoking `move-analyzer --version` in a command line terminal prints out
+   `move-analyzer 1.0.0`. If it doesn't, then retry the instructions in [step 1](./Step1). If it
+   does successfully print this output, try closing and re-opening the Visual Studio Code
+   application, as it may not have picked up the update to your `PATH`.
+2. If you installed the `move-analyzer` executable to a different location that is outside of your
+   `PATH`, then you may have the extension look at this location by using the the Visual Studio Code
+   settings (`⌘,` on macOS, or use the menu item *Code > Preferences > Settings*). Search for the
+   `move-analyzer.server.path` setting, and set it to the location of the `move-analyzer` language
+   server you installed.
+3. If the above steps don't work, then report
+   [a GitHub issue to the Move repository](https://github.com/move-language/move/issues) to get help.
+
+## Features
+
+Here are some of the features of the move-analyzer Visual Studio Code extension. To see them, open a
+Move source file (a file with a `.move` file extension) and:
+
+- See Move keywords and types highlighted in appropriate colors.
+- Comment and un-comment lines of code using the `⌘/` shortcut on macOS (or the menu command *Edit >
+  Toggle Line Comment*).
+- Place your cursor on a delimiter, such as `<`, `(`, or `{`, and its corresponding delimiter --
+  `>`, `)`, or `}` -- will be highlighted.
+- As you type, Move keywords will appear as completion suggestions.
+- If the opened Move source file is located within a buildable project (a `Move.toml` file can be
+  found in one of its parent directories), the following advanced features will also be available:
+  - compiler diagnostics
+  - go to definition
+  - go to type definition
+  - go to references
+  - type on hover
+  - outline view showing symbol tree for Move source files
diff --git a/vendors/move/crates/move-analyzer/editors/code/images/move.png b/vendors/move/crates/move-analyzer/editors/code/images/move.png
new file mode 100644
index 000000000..c6bfb341a
Binary files /dev/null and b/vendors/move/crates/move-analyzer/editors/code/images/move.png differ
diff --git a/vendors/move/crates/move-analyzer/editors/code/language-configuration.json b/vendors/move/crates/move-analyzer/editors/code/language-configuration.json
new file mode 100644
index 000000000..bb8418a84
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/language-configuration.json
@@ -0,0 +1,32 @@
+// A language configuration that specifies VS Code behaviors such as comment toggling
+// and matching bracket highlighting.
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit:
+// https://code.visualstudio.com/api/language-extensions/language-configuration-guide
+{
+    "autoClosingPairs": [
+        { "open": "{", "close": "}" },
+        { "open": "[", "close": "]" },
+        { "open": "(", "close": ")" },
+        { "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
+        { "open": "/*", "close": "*/", "notIn": ["string"] }
+    ],
+    "brackets": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["<", ">"],
+    ],
+    "comments": {
+        "lineComment": "//",
+        "blockComment": ["/*", "*/"]
+    },
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["<", ">"],
+        ["\"", "\""]
+    ],
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/package-lock.json b/vendors/move/crates/move-analyzer/editors/code/package-lock.json
new file mode 100644
index 000000000..b4126498a
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/package-lock.json
@@ -0,0 +1,7444 @@
+{
+	"name": "move-analyzer",
+	"version": "0.0.10",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "move-analyzer",
+			"version": "0.0.10",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"command-exists": "^1.2.9",
+				"lru-cache": "^4.1.3",
+				"vscode-languageclient": "6.1.4"
+			},
+			"devDependencies": {
+				"@types/command-exists": "^1.2.0",
+				"@types/fs-extra": "^9.0.13",
+				"@types/glob": "^7.1.4",
+				"@types/mocha": "^9.0.0",
+				"@types/node": "^14.17.22",
+				"@types/vscode": "^1.58.2",
+				"@typescript-eslint/eslint-plugin": "^4.33.0",
+				"@typescript-eslint/parser": "^4.33.0",
+				"@vscode/test-electron": "^2.0.0",
+				"copyfiles": "2.4.1",
+				"cross-env": "^7.0.3",
+				"eslint": "^7.32.0",
+				"eslint-plugin-tsdoc": "^0.2.14",
+				"fs-extra": "10.0.1",
+				"glob": "^7.1.7",
+				"mocha": "^9.1.1",
+				"typescript": "^4.4.4",
+				"typescript-formatter": "^7.2.2",
+				"vsce": "^2.5.1",
+				"vscode-test": "^1.6.1"
+			},
+			"engines": {
+				"vscode": "^1.58.2"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.15.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.14.5",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+			"integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@types/command-exists": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
+			"integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
+			"dev": true
+		},
+		"node_modules/@types/fs-extra": {
+			"version": "9.0.13",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+			"integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/glob": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+			"integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"node_modules/@types/minimatch": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+			"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+			"dev": true
+		},
+		"node_modules/@types/mocha": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+			"integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+			"dev": true
+		},
+		"node_modules/@types/node": {
+			"version": "14.17.27",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
+			"integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
+			"dev": true
+		},
+		"node_modules/@types/vscode": {
+			"version": "1.61.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
+			"integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+			"integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/experimental-utils": "4.33.0",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"debug": "^4.3.1",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.1.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^4.0.0",
+				"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/experimental-utils": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+			"integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.7",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "*"
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+			"integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"debug": "^4.3.1"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+			"integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0"
+			},
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+			"integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+			"dev": true,
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+			"integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0",
+				"debug": "^4.3.1",
+				"globby": "^11.0.3",
+				"is-glob": "^4.0.1",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+			"integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@ungap/promise-all-settled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+			"dev": true
+		},
+		"node_modules/@vscode/test-electron": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.5.tgz",
+			"integrity": "sha512-O/ioqFpV+RvKbRykX2ItYPnbcZ4Hk5V0rY4uhQjQTLhGL9WZUvS7exzuYQCCI+ilSqJpctvxq2llTfGXf9UnnA==",
+			"dev": true,
+			"dependencies": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			},
+			"engines": {
+				"node": ">=8.9.3"
+			}
+		},
+		"node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/aproba": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"dev": true
+		},
+		"node_modules/are-we-there-yet": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"dev": true,
+			"dependencies": {
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
+			}
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/azure-devops-node-api": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
+			"integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
+			"dev": true,
+			"dependencies": {
+				"tunnel": "0.0.6",
+				"typed-rest-client": "^1.8.4"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"node_modules/base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/big-integer": {
+			"version": "1.6.50",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+			"integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/binary": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+			"integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+			"dev": true,
+			"dependencies": {
+				"buffers": "~0.1.1",
+				"chainsaw": "~0.1.0"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/binary-extensions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dev": true,
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bluebird": {
+			"version": "3.4.7",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+			"integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+			"dev": true
+		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browser-stdout": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+			"dev": true
+		},
+		"node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"node_modules/buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/buffer-indexof-polyfill": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+			"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/buffers": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+			"integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.2.0"
+			}
+		},
+		"node_modules/call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/chainsaw": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+			"integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+			"dev": true,
+			"dependencies": {
+				"traverse": ">=0.3.0 <0.4"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/chalk/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/chalk/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/chalk/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/chalk/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chalk/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cheerio": {
+			"version": "1.0.0-rc.10",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+			"integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+			"dev": true,
+			"dependencies": {
+				"cheerio-select": "^1.5.0",
+				"dom-serializer": "^1.3.2",
+				"domhandler": "^4.2.0",
+				"htmlparser2": "^6.1.0",
+				"parse5": "^6.0.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.1",
+				"tslib": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+			}
+		},
+		"node_modules/cheerio-select": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
+			"integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+			"dev": true,
+			"dependencies": {
+				"css-select": "^4.1.3",
+				"css-what": "^5.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.7.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/cheerio/node_modules/tslib": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+			"dev": true
+		},
+		"node_modules/chokidar": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+			"dev": true,
+			"dependencies": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			},
+			"engines": {
+				"node": ">= 8.10.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"dev": true
+		},
+		"node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"node_modules/code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"node_modules/command-exists": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"node_modules/commandpost": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+			"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+			"dev": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"dev": true
+		},
+		"node_modules/copyfiles": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+			"integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.0.5",
+				"minimatch": "^3.0.3",
+				"mkdirp": "^1.0.4",
+				"noms": "0.0.0",
+				"through2": "^2.0.1",
+				"untildify": "^4.0.0",
+				"yargs": "^16.1.0"
+			},
+			"bin": {
+				"copyfiles": "copyfiles",
+				"copyup": "copyfiles"
+			}
+		},
+		"node_modules/copyfiles/node_modules/mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true,
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"dev": true
+		},
+		"node_modules/cross-env": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+			"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.1"
+			},
+			"bin": {
+				"cross-env": "src/bin/cross-env.js",
+				"cross-env-shell": "src/bin/cross-env-shell.js"
+			},
+			"engines": {
+				"node": ">=10.14",
+				"npm": ">=6",
+				"yarn": ">=1"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/css-select": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+			"integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^5.0.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.6.0",
+				"nth-check": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/css-what": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+			"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decamelize": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/decompress-response": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+			"dev": true,
+			"dependencies": {
+				"mimic-response": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"dev": true
+		},
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"dev": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/diff": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/dom-serializer": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+			"integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/domelementtype": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+			"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domhandler": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+			"integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/duplexer2": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+			"integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+			"dev": true,
+			"dependencies": {
+				"readable-stream": "^2.0.2"
+			}
+		},
+		"node_modules/editorconfig": {
+			"version": "0.15.3",
+			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+			"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+			"dev": true,
+			"dependencies": {
+				"commander": "^2.19.0",
+				"lru-cache": "^4.1.5",
+				"semver": "^5.6.0",
+				"sigmund": "^1.0.1"
+			},
+			"bin": {
+				"editorconfig": "bin/editorconfig"
+			}
+		},
+		"node_modules/editorconfig/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.4.0"
+			}
+		},
+		"node_modules/enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-colors": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-plugin-tsdoc": {
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
+			"integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "0.15.2"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/eslint/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/eslint/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/espree/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-glob": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"node_modules/fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"dev": true,
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"dev": true,
+			"dependencies": {
+				"pend": "~1.2.0"
+			}
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+			"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+			"dev": true
+		},
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+			"dev": true
+		},
+		"node_modules/fs-extra": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+			"integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/fstream": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"inherits": "~2.0.0",
+				"mkdirp": ">=0.5 0",
+				"rimraf": "2"
+			},
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/fstream/node_modules/rimraf": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"node_modules/functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"node_modules/gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"dev": true,
+			"dependencies": {
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
+			}
+		},
+		"node_modules/gauge/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+			"dev": true,
+			"dependencies": {
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+			"dev": true,
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+			"dev": true
+		},
+		"node_modules/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.11.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+			"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.8",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+			"dev": true
+		},
+		"node_modules/growl": {
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.x"
+			}
+		},
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"dev": true
+		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true,
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/hosted-git-info/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/hosted-git-info/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"funding": [
+				"https://github.com/fb55/htmlparser2?sponsor=1",
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			],
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"dependencies": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"node_modules/is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"dependencies": {
+				"binary-extensions": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-core-module": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+			"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/keytar": {
+			"version": "7.7.0",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
+			"hasInstallScript": true,
+			"dependencies": {
+				"node-addon-api": "^3.0.0",
+				"prebuild-install": "^6.0.0"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/linkify-it": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+			"dev": true,
+			"dependencies": {
+				"uc.micro": "^1.0.1"
+			}
+		},
+		"node_modules/listenercount": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+			"integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"node_modules/lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"node_modules/markdown-it": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+			"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"entities": "~2.0.0",
+				"linkify-it": "^2.0.0",
+				"mdurl": "^1.0.1",
+				"uc.micro": "^1.0.5"
+			},
+			"bin": {
+				"markdown-it": "bin/markdown-it.js"
+			}
+		},
+		"node_modules/markdown-it/node_modules/entities": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+			"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+			"dev": true
+		},
+		"node_modules/mdurl": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+			"dev": true
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"dev": true,
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mimic-response": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"node_modules/mkdirp": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
+		"node_modules/mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+			"dev": true
+		},
+		"node_modules/mocha": {
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
+			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+			"dev": true,
+			"dependencies": {
+				"@ungap/promise-all-settled": "1.1.2",
+				"ansi-colors": "4.1.1",
+				"browser-stdout": "1.3.1",
+				"chokidar": "3.5.2",
+				"debug": "4.3.2",
+				"diff": "5.0.0",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
+				"glob": "7.1.7",
+				"growl": "1.10.5",
+				"he": "1.2.0",
+				"js-yaml": "4.1.0",
+				"log-symbols": "4.1.0",
+				"minimatch": "3.0.4",
+				"ms": "2.1.3",
+				"nanoid": "3.1.25",
+				"serialize-javascript": "6.0.0",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "8.1.1",
+				"which": "2.0.2",
+				"workerpool": "6.1.5",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
+				"yargs-unparser": "2.0.0"
+			},
+			"bin": {
+				"_mocha": "bin/_mocha",
+				"mocha": "bin/mocha"
+			},
+			"engines": {
+				"node": ">= 12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/mochajs"
+			}
+		},
+		"node_modules/mocha/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/mocha/node_modules/glob": {
+			"version": "7.1.7",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+			"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/mocha/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/mocha/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/mocha/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true
+		},
+		"node_modules/mocha/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+			"dev": true
+		},
+		"node_modules/nanoid": {
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+			"dev": true,
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node_modules/node-abi": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^5.4.1"
+			}
+		},
+		"node_modules/node-abi/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/node-addon-api": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"dev": true
+		},
+		"node_modules/noms": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+			"integrity": "sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"readable-stream": "~1.0.31"
+			}
+		},
+		"node_modules/noms/node_modules/isarray": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+			"dev": true
+		},
+		"node_modules/noms/node_modules/readable-stream": {
+			"version": "1.0.34",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+			"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+			"dev": true,
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.1",
+				"isarray": "0.0.1",
+				"string_decoder": "~0.10.x"
+			}
+		},
+		"node_modules/noms/node_modules/string_decoder": {
+			"version": "0.10.31",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+			"dev": true
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"dev": true,
+			"dependencies": {
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
+			}
+		},
+		"node_modules/nth-check": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+			"integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-semver": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
+			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
+			"dev": true,
+			"dependencies": {
+				"semver": "^5.1.0"
+			}
+		},
+		"node_modules/parse-semver/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"dependencies": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/prebuild-install": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
+			"integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+			"dev": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp-classic": "^0.5.3",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.21.0",
+				"npmlog": "^4.0.1",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^3.0.3",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0"
+			},
+			"bin": {
+				"prebuild-install": "bin.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"dev": true
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+		},
+		"node_modules/pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/qs": {
+			"version": "6.10.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
+			"integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
+			"dev": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"dependencies": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"bin": {
+				"rc": "cli.js"
+			}
+		},
+		"node_modules/rc/node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+			"dev": true,
+			"dependencies": {
+				"mute-stream": "~0.0.4"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/readable-stream": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"dev": true,
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"dev": true,
+			"dependencies": {
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"dev": true
+		},
+		"node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+			"dev": true,
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
+		"node_modules/setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+			"dev": true
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/side-channel": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.0",
+				"get-intrinsic": "^1.0.2",
+				"object-inspect": "^1.9.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/sigmund": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+			"dev": true
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"node_modules/simple-concat": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/simple-get": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+			"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+			"dev": true,
+			"dependencies": {
+				"decompress-response": "^4.2.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/table": {
+			"version": "6.7.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+			"integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^8.0.1",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.6.3",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+			"integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dev": true,
+			"dependencies": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"node_modules/tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dev": true,
+			"dependencies": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"node_modules/through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"dev": true,
+			"dependencies": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"node_modules/tmp": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"dev": true,
+			"dependencies": {
+				"rimraf": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8.17.0"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/traverse": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+			"integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"node_modules/tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"dependencies": {
+				"tslib": "^1.8.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+			}
+		},
+		"node_modules/tunnel": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+			}
+		},
+		"node_modules/tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typed-rest-client": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
+			"integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
+			"dev": true,
+			"dependencies": {
+				"qs": "^6.9.1",
+				"tunnel": "0.0.6",
+				"underscore": "^1.12.1"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "4.4.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+			"dev": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/typescript-formatter": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+			"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+			"dev": true,
+			"dependencies": {
+				"commandpost": "^1.0.0",
+				"editorconfig": "^0.15.0"
+			},
+			"bin": {
+				"tsfmt": "bin/tsfmt"
+			},
+			"engines": {
+				"node": ">= 4.2.0"
+			},
+			"peerDependencies": {
+				"typescript": "^2.1.6 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev"
+			}
+		},
+		"node_modules/uc.micro": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+			"dev": true
+		},
+		"node_modules/underscore": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+			"dev": true
+		},
+		"node_modules/universalify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/untildify": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/unzipper": {
+			"version": "0.10.11",
+			"resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+			"integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+			"dev": true,
+			"dependencies": {
+				"big-integer": "^1.6.17",
+				"binary": "~0.3.0",
+				"bluebird": "~3.4.1",
+				"buffer-indexof-polyfill": "~1.0.0",
+				"duplexer2": "~0.1.4",
+				"fstream": "^1.0.12",
+				"graceful-fs": "^4.2.2",
+				"listenercount": "~1.0.1",
+				"readable-stream": "~2.3.6",
+				"setimmediate": "~1.0.4"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+			"dev": true
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"node_modules/v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"node_modules/vsce": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
+			"integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
+			"dev": true,
+			"dependencies": {
+				"azure-devops-node-api": "^11.0.1",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.9",
+				"commander": "^6.1.0",
+				"glob": "^7.0.6",
+				"hosted-git-info": "^4.0.2",
+				"keytar": "^7.7.0",
+				"leven": "^3.1.0",
+				"markdown-it": "^10.0.0",
+				"mime": "^1.3.4",
+				"minimatch": "^3.0.3",
+				"parse-semver": "^1.1.1",
+				"read": "^1.0.7",
+				"semver": "^5.1.0",
+				"tmp": "^0.2.1",
+				"typed-rest-client": "^1.8.4",
+				"url-join": "^4.0.1",
+				"xml2js": "^0.4.23",
+				"yauzl": "^2.3.1",
+				"yazl": "^2.2.2"
+			},
+			"bin": {
+				"vsce": "vsce"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/vsce/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vsce/node_modules/commander": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+			"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/vsce/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/vsce/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/vscode-jsonrpc": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
+			"engines": {
+				"node": ">=8.0.0 || >=10.0.0"
+			}
+		},
+		"node_modules/vscode-languageclient": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+			"integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+			"dependencies": {
+				"semver": "^6.3.0",
+				"vscode-languageserver-protocol": "3.15.3"
+			},
+			"engines": {
+				"vscode": "^1.41.0"
+			}
+		},
+		"node_modules/vscode-languageserver-protocol": {
+			"version": "3.15.3",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+			"dependencies": {
+				"vscode-jsonrpc": "^5.0.1",
+				"vscode-languageserver-types": "3.15.1"
+			}
+		},
+		"node_modules/vscode-languageserver-types": {
+			"version": "3.15.1",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+		},
+		"node_modules/vscode-test": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
+			"integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
+			"deprecated": "This package has been renamed to @vscode/test-electron, please update to the new name",
+			"dev": true,
+			"dependencies": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			},
+			"engines": {
+				"node": ">=8.9.3"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/wide-align": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^1.0.2 || 2 || 3 || 4"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/workerpool": {
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+			"dev": true
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"node_modules/xml2js": {
+			"version": "0.4.23",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+			"integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+			"dev": true,
+			"dependencies": {
+				"sax": ">=0.6.0",
+				"xmlbuilder": "~11.0.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/xmlbuilder": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+		},
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-unparser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yauzl": {
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"dev": true,
+			"dependencies": {
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			}
+		},
+		"node_modules/yazl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+			"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+			"dev": true,
+			"dependencies": {
+				"buffer-crc32": "~0.2.3"
+			}
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		}
+	},
+	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.15.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+			"dev": true
+		},
+		"@babel/highlight": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.14.5",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				}
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+			"integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+			"dev": true
+		},
+		"@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			}
+		},
+		"@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true
+		},
+		"@types/command-exists": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
+			"integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
+			"dev": true
+		},
+		"@types/fs-extra": {
+			"version": "9.0.13",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+			"integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/glob": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+			"integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+			"dev": true,
+			"requires": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"@types/minimatch": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+			"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+			"dev": true
+		},
+		"@types/mocha": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+			"integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+			"dev": true
+		},
+		"@types/node": {
+			"version": "14.17.27",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
+			"integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
+			"dev": true
+		},
+		"@types/vscode": {
+			"version": "1.61.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
+			"integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
+			"dev": true
+		},
+		"@typescript-eslint/eslint-plugin": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+			"integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/experimental-utils": "4.33.0",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"debug": "^4.3.1",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.1.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"@typescript-eslint/experimental-utils": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+			"integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
+			"dev": true,
+			"requires": {
+				"@types/json-schema": "^7.0.7",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			}
+		},
+		"@typescript-eslint/parser": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+			"integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"debug": "^4.3.1"
+			}
+		},
+		"@typescript-eslint/scope-manager": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+			"integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0"
+			}
+		},
+		"@typescript-eslint/types": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+			"integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+			"dev": true
+		},
+		"@typescript-eslint/typescript-estree": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+			"integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0",
+				"debug": "^4.3.1",
+				"globby": "^11.0.3",
+				"is-glob": "^4.0.1",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"@typescript-eslint/visitor-keys": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+			"integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"eslint-visitor-keys": "^2.0.0"
+			}
+		},
+		"@ungap/promise-all-settled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+			"dev": true
+		},
+		"@vscode/test-electron": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.5.tgz",
+			"integrity": "sha512-O/ioqFpV+RvKbRykX2ItYPnbcZ4Hk5V0rY4uhQjQTLhGL9WZUvS7exzuYQCCI+ilSqJpctvxq2llTfGXf9UnnA==",
+			"dev": true,
+			"requires": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			}
+		},
+		"acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true
+		},
+		"acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"requires": {}
+		},
+		"agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"requires": {
+				"debug": "4"
+			}
+		},
+		"ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^1.9.0"
+			}
+		},
+		"anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
+		"aproba": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"dev": true
+		},
+		"are-we-there-yet": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"dev": true,
+			"requires": {
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
+			}
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true
+		},
+		"astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true
+		},
+		"azure-devops-node-api": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
+			"integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
+			"dev": true,
+			"requires": {
+				"tunnel": "0.0.6",
+				"typed-rest-client": "^1.8.4"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"dev": true
+		},
+		"big-integer": {
+			"version": "1.6.50",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+			"integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
+			"dev": true
+		},
+		"binary": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+			"integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+			"dev": true,
+			"requires": {
+				"buffers": "~0.1.1",
+				"chainsaw": "~0.1.0"
+			}
+		},
+		"binary-extensions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"dev": true
+		},
+		"bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dev": true,
+			"requires": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"bluebird": {
+			"version": "3.4.7",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+			"integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+			"dev": true
+		},
+		"boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+			"dev": true
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"browser-stdout": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+			"dev": true
+		},
+		"buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true
+		},
+		"buffer-indexof-polyfill": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+			"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+			"dev": true
+		},
+		"buffers": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+			"integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+			"dev": true
+		},
+		"call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			}
+		},
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"camelcase": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+			"dev": true
+		},
+		"chainsaw": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+			"integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+			"dev": true,
+			"requires": {
+				"traverse": ">=0.3.0 <0.4"
+			}
+		},
+		"chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"cheerio": {
+			"version": "1.0.0-rc.10",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+			"integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+			"dev": true,
+			"requires": {
+				"cheerio-select": "^1.5.0",
+				"dom-serializer": "^1.3.2",
+				"domhandler": "^4.2.0",
+				"htmlparser2": "^6.1.0",
+				"parse5": "^6.0.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.1",
+				"tslib": "^2.2.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+					"dev": true
+				}
+			}
+		},
+		"cheerio-select": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
+			"integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+			"dev": true,
+			"requires": {
+				"css-select": "^4.1.3",
+				"css-what": "^5.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.7.0"
+			}
+		},
+		"chokidar": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+			"dev": true,
+			"requires": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"fsevents": "~2.3.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			}
+		},
+		"chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"dev": true
+		},
+		"cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+			"dev": true
+		},
+		"color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"command-exists": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"commandpost": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+			"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+			"dev": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"dev": true
+		},
+		"copyfiles": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+			"integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.0.5",
+				"minimatch": "^3.0.3",
+				"mkdirp": "^1.0.4",
+				"noms": "0.0.0",
+				"through2": "^2.0.1",
+				"untildify": "^4.0.0",
+				"yargs": "^16.1.0"
+			},
+			"dependencies": {
+				"mkdirp": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+					"dev": true
+				}
+			}
+		},
+		"core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"dev": true
+		},
+		"cross-env": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+			"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^7.0.1"
+			}
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
+		"css-select": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+			"integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+			"dev": true,
+			"requires": {
+				"boolbase": "^1.0.0",
+				"css-what": "^5.0.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.6.0",
+				"nth-check": "^2.0.0"
+			}
+		},
+		"css-what": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+			"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+			"dev": true
+		},
+		"debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"requires": {
+				"ms": "2.1.2"
+			}
+		},
+		"decamelize": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+			"dev": true
+		},
+		"decompress-response": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+			"dev": true,
+			"requires": {
+				"mimic-response": "^2.0.0"
+			}
+		},
+		"deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true
+		},
+		"deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"dev": true
+		},
+		"detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"dev": true
+		},
+		"diff": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+			"dev": true
+		},
+		"dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"requires": {
+				"path-type": "^4.0.0"
+			}
+		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2"
+			}
+		},
+		"dom-serializer": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+			"integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			}
+		},
+		"domelementtype": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+			"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+			"dev": true
+		},
+		"domhandler": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+			"integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.2.0"
+			}
+		},
+		"domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"requires": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			}
+		},
+		"duplexer2": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+			"integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+			"dev": true,
+			"requires": {
+				"readable-stream": "^2.0.2"
+			}
+		},
+		"editorconfig": {
+			"version": "0.15.3",
+			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+			"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+			"dev": true,
+			"requires": {
+				"commander": "^2.19.0",
+				"lru-cache": "^4.1.5",
+				"semver": "^5.6.0",
+				"sigmund": "^1.0.1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"requires": {
+				"once": "^1.4.0"
+			}
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"dev": true
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true
+		},
+		"eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+					"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^1.1.0"
+					},
+					"dependencies": {
+						"eslint-visitor-keys": {
+							"version": "1.3.0",
+							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+							"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+							"dev": true
+						}
+					}
+				},
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-tsdoc": {
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
+			"integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "0.15.2"
+			}
+		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^2.0.0"
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true
+		},
+		"espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true
+		},
+		"expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+			"dev": true
+		},
+		"fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"fast-glob": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			}
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"dev": true,
+			"requires": {
+				"pend": "~1.2.0"
+			}
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true
+		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"flatted": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+			"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+			"dev": true
+		},
+		"fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+			"dev": true
+		},
+		"fs-extra": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+			"integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"optional": true
+		},
+		"fstream": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"inherits": "~2.0.0",
+				"mkdirp": ">=0.5 0",
+				"rimraf": "2"
+			},
+			"dependencies": {
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "^1.0.0"
+					}
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"dev": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^2.0.0"
+					}
+				}
+			}
+		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			}
+		},
+		"github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"globals": {
+			"version": "13.11.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+			"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.20.2"
+			}
+		},
+		"globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"requires": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.8",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+			"dev": true
+		},
+		"growl": {
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+			"dev": true
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true
+		},
+		"has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"dev": true
+		},
+		"he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"requires": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"dev": true
+		},
+		"ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"requires": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "^2.0.0"
+			}
+		},
+		"is-core-module": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+			"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
+		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"dev": true
+		},
+		"is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true
+		},
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.6",
+				"universalify": "^2.0.0"
+			}
+		},
+		"keytar": {
+			"version": "7.7.0",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
+			"requires": {
+				"node-addon-api": "^3.0.0",
+				"prebuild-install": "^6.0.0"
+			}
+		},
+		"leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true
+		},
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			}
+		},
+		"linkify-it": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+			"dev": true,
+			"requires": {
+				"uc.micro": "^1.0.1"
+			}
+		},
+		"listenercount": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+			"integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+			"dev": true
+		},
+		"locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^5.0.0"
+			}
+		},
+		"lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			}
+		},
+		"lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"requires": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"markdown-it": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+			"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"entities": "~2.0.0",
+				"linkify-it": "^2.0.0",
+				"mdurl": "^1.0.1",
+				"uc.micro": "^1.0.5"
+			},
+			"dependencies": {
+				"entities": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+					"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+					"dev": true
+				}
+			}
+		},
+		"mdurl": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+			"dev": true
+		},
+		"merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true
+		},
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"requires": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"dev": true
+		},
+		"mimic-response": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"mkdirp": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
+		"mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+			"dev": true
+		},
+		"mocha": {
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
+			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+			"dev": true,
+			"requires": {
+				"@ungap/promise-all-settled": "1.1.2",
+				"ansi-colors": "4.1.1",
+				"browser-stdout": "1.3.1",
+				"chokidar": "3.5.2",
+				"debug": "4.3.2",
+				"diff": "5.0.0",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
+				"glob": "7.1.7",
+				"growl": "1.10.5",
+				"he": "1.2.0",
+				"js-yaml": "4.1.0",
+				"log-symbols": "4.1.0",
+				"minimatch": "3.0.4",
+				"ms": "2.1.3",
+				"nanoid": "3.1.25",
+				"serialize-javascript": "6.0.0",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "8.1.1",
+				"which": "2.0.2",
+				"workerpool": "6.1.5",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
+				"yargs-unparser": "2.0.0"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				},
+				"glob": {
+					"version": "7.1.7",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"js-yaml": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+					"dev": true,
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.3",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+			"dev": true
+		},
+		"nanoid": {
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+			"dev": true
+		},
+		"napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node-abi": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+			"dev": true,
+			"requires": {
+				"semver": "^5.4.1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"node-addon-api": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"dev": true
+		},
+		"noms": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+			"integrity": "sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"readable-stream": "~1.0.31"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "1.0.34",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+					"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+					"dev": true
+				}
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"dev": true,
+			"requires": {
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
+			}
+		},
+		"nth-check": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+			"dev": true,
+			"requires": {
+				"boolbase": "^1.0.0"
+			}
+		},
+		"number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+			"dev": true
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true
+		},
+		"object-inspect": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+			"integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+			"dev": true
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
+		"p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"requires": {
+				"yocto-queue": "^0.1.0"
+			}
+		},
+		"p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^3.0.2"
+			}
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
+		"parse-semver": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
+			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.1.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"requires": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true
+		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true
+		},
+		"pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+			"dev": true
+		},
+		"prebuild-install": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
+			"integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+			"dev": true,
+			"requires": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp-classic": "^0.5.3",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.21.0",
+				"npmlog": "^4.0.1",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^3.0.3",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0"
+			}
+		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
+		},
+		"process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"dev": true
+		},
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true
+		},
+		"pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+		},
+		"pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"requires": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"qs": {
+			"version": "6.10.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
+			"integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
+			"dev": true,
+			"requires": {
+				"side-channel": "^1.0.4"
+			}
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true
+		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"requires": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"dependencies": {
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"dev": true
+				}
+			}
+		},
+		"read": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+			"dev": true,
+			"requires": {
+				"mute-stream": "~0.0.4"
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"dev": true,
+			"requires": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"dev": true,
+			"requires": {
+				"picomatch": "^2.2.1"
+			}
+		},
+		"regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true
+		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true
+		},
+		"resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"requires": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			}
+		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
+		"rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.1.3"
+			}
+		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"dev": true
+		},
+		"semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+		},
+		"serialize-javascript": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+			"dev": true,
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
+		"setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+			"dev": true
+		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"side-channel": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.0",
+				"get-intrinsic": "^1.0.2",
+				"object-inspect": "^1.9.0"
+			}
+		},
+		"sigmund": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+			"dev": true
+		},
+		"signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"simple-concat": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+			"dev": true
+		},
+		"simple-get": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+			"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+			"dev": true,
+			"requires": {
+				"decompress-response": "^4.2.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
+		"slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true
+		},
+		"slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				}
+			}
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.1"
+			}
+		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
+		"supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^3.0.0"
+			}
+		},
+		"table": {
+			"version": "6.7.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+			"integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+			"dev": true,
+			"requires": {
+				"ajv": "^8.0.1",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "8.6.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+					"integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"json-schema-traverse": "^1.0.0",
+						"require-from-string": "^2.0.2",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"json-schema-traverse": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+					"dev": true
+				}
+			}
+		},
+		"tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dev": true,
+			"requires": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"dev": true,
+			"requires": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"tmp": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"dev": true,
+			"requires": {
+				"rimraf": "^3.0.0"
+			}
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
+		},
+		"traverse": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+			"integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+			"dev": true
+		},
+		"tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.8.1"
+			}
+		},
+		"tunnel": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+			"dev": true
+		},
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1"
+			}
+		},
+		"type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true
+		},
+		"typed-rest-client": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
+			"integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
+			"dev": true,
+			"requires": {
+				"qs": "^6.9.1",
+				"tunnel": "0.0.6",
+				"underscore": "^1.12.1"
+			}
+		},
+		"typescript": {
+			"version": "4.4.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+			"dev": true
+		},
+		"typescript-formatter": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+			"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+			"dev": true,
+			"requires": {
+				"commandpost": "^1.0.0",
+				"editorconfig": "^0.15.0"
+			}
+		},
+		"uc.micro": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+			"dev": true
+		},
+		"universalify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"dev": true
+		},
+		"untildify": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"dev": true
+		},
+		"unzipper": {
+			"version": "0.10.11",
+			"resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+			"integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+			"dev": true,
+			"requires": {
+				"big-integer": "^1.6.17",
+				"binary": "~0.3.0",
+				"bluebird": "~3.4.1",
+				"buffer-indexof-polyfill": "~1.0.0",
+				"duplexer2": "~0.1.4",
+				"fstream": "^1.0.12",
+				"graceful-fs": "^4.2.2",
+				"listenercount": "~1.0.1",
+				"readable-stream": "~2.3.6",
+				"setimmediate": "~1.0.4"
+			}
+		},
+		"uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+			"dev": true
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"vsce": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
+			"integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
+			"dev": true,
+			"requires": {
+				"azure-devops-node-api": "^11.0.1",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.9",
+				"commander": "^6.1.0",
+				"glob": "^7.0.6",
+				"hosted-git-info": "^4.0.2",
+				"keytar": "^7.7.0",
+				"leven": "^3.1.0",
+				"markdown-it": "^10.0.0",
+				"mime": "^1.3.4",
+				"minimatch": "^3.0.3",
+				"parse-semver": "^1.1.1",
+				"read": "^1.0.7",
+				"semver": "^5.1.0",
+				"tmp": "^0.2.1",
+				"typed-rest-client": "^1.8.4",
+				"url-join": "^4.0.1",
+				"xml2js": "^0.4.23",
+				"yauzl": "^2.3.1",
+				"yazl": "^2.2.2"
+			},
+			"dependencies": {
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"commander": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+					"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"vscode-jsonrpc": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+		},
+		"vscode-languageclient": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+			"integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+			"requires": {
+				"semver": "^6.3.0",
+				"vscode-languageserver-protocol": "3.15.3"
+			}
+		},
+		"vscode-languageserver-protocol": {
+			"version": "3.15.3",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+			"requires": {
+				"vscode-jsonrpc": "^5.0.1",
+				"vscode-languageserver-types": "3.15.1"
+			}
+		},
+		"vscode-languageserver-types": {
+			"version": "3.15.1",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+		},
+		"vscode-test": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
+			"integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
+			"dev": true,
+			"requires": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			}
+		},
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"wide-align": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+			"dev": true,
+			"requires": {
+				"string-width": "^1.0.2 || 2 || 3 || 4"
+			}
+		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
+		"workerpool": {
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+			"dev": true
+		},
+		"wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				}
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"xml2js": {
+			"version": "0.4.23",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+			"integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+			"dev": true,
+			"requires": {
+				"sax": ">=0.6.0",
+				"xmlbuilder": "~11.0.0"
+			}
+		},
+		"xmlbuilder": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"dev": true
+		},
+		"xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"dev": true
+		},
+		"y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true
+		},
+		"yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+		},
+		"yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"requires": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			}
+		},
+		"yargs-parser": {
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+			"dev": true
+		},
+		"yargs-unparser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			}
+		},
+		"yauzl": {
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"dev": true,
+			"requires": {
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			}
+		},
+		"yazl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+			"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+			"dev": true,
+			"requires": {
+				"buffer-crc32": "~0.2.3"
+			}
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true
+		}
+	}
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/package.json b/vendors/move/crates/move-analyzer/editors/code/package.json
new file mode 100644
index 000000000..9e54615e5
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/package.json
@@ -0,0 +1,137 @@
+{
+	"name": "move-analyzer",
+	"displayName": "move-analyzer",
+	"description": "A language server and basic grammar for the Move programming language.",
+	"publisher": "move",
+	"icon": "images/move.png",
+	"license": "Apache-2.0",
+	"version": "0.0.10",
+	"preview": true,
+	"homepage": "https://github.com/move-language/move",
+	"repository": {
+		"url": "https://github.com/move-language/move.git",
+		"type": "git"
+	},
+	"bugs": {
+		"url": "https://github.com/move-language/move/issues"
+	},
+	"engines": {
+		"vscode": "^1.58.2"
+	},
+	"categories": [
+		"Programming Languages"
+	],
+	"keywords": [
+		"move"
+	],
+	"main": "./out/src/main.js",
+	"activationEvents": [
+		"onLanguage:move",
+		"workspaceContains:Move.toml"
+	],
+	"contributes": {
+		"commands": [
+			{
+				"command": "move-analyzer.serverVersion",
+				"title": "Show Server Version",
+				"category": "Move Analyzer"
+			}
+		],
+		"configuration": {
+			"type": "object",
+			"title": "Move Analyzer",
+			"properties": {
+				"move-analyzer.server.path": {
+					"type": "string",
+					"default": "move-analyzer",
+					"markdownDescription": "Path and filename of the move-analyzer executable, e.g. `/usr/bin/move-analyzer`."
+				},
+				"move-analyzer.trace.server": {
+					"type": "string",
+					"scope": "window",
+					"enum": [
+						"off",
+						"messages",
+						"verbose"
+					],
+					"enumDescriptions": [
+						"Do not log any messages.",
+						"Log short summaries of each message.",
+						"Log each message and its contents."
+					],
+					"default": "off",
+					"description": "Traces the communication between the move-analyzer language server and Visual Studio Code. Note that this log can be very verbose, and so not recommended for anyone besides people working on or debugging move-analyzer itself."
+				}
+			}
+		},
+		"languages": [
+			{
+				"id": "move",
+				"aliases": [
+					"Move",
+					"move"
+				],
+				"extensions": [
+					".move"
+				],
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"menus": {
+			"commandPalette": [
+				{
+					"command": "move-analyzer.serverVersion"
+				}
+			]
+		}
+	},
+	"scripts": {
+		"compile": "tsc -p ./ && cd ../../ && cargo build",
+		"watch": "tsc -watch -p ./",
+		"lint": "eslint . --ext ts --max-warnings 0",
+		"fix": "eslint . --ext ts --fix",
+		"copy-tests-files": "copyfiles \"tests/**/*.move\" \"tests/**/*.exp\" \"tests/**/*.toml\" \"tests/**/*.code-workspace\" out",
+		"pretest": "npm run compile && npm run lint && npm run copy-tests-files",
+		"test": "node ./out/tests/runTests.js",
+		"dev": "npm run pretest && cross-env mode=dev node ./out/tests/runTests.js",
+		"vscode:prepublish": "npm run pretest",
+		"package": "npm run pretest && vsce package -o move-analyzer.vsix",
+		"publish": "npm run pretest && npm run test && vsce publish"
+	},
+	"extensionDependencies": [
+		"damirka.move-syntax"
+	],
+	"dependencies": {
+		"command-exists": "^1.2.9",
+		"vscode-languageclient": "6.1.4",
+		"lru-cache": "^4.1.3"
+	},
+	"devDependencies": {
+		"@types/command-exists": "^1.2.0",
+		"@types/fs-extra": "^9.0.13",
+		"@types/glob": "^7.1.4",
+		"@types/mocha": "^9.0.0",
+		"@types/node": "^14.17.22",
+		"@types/vscode": "^1.58.2",
+		"@typescript-eslint/eslint-plugin": "^4.33.0",
+		"@typescript-eslint/parser": "^4.33.0",
+		"@vscode/test-electron": "^2.0.0",
+		"copyfiles": "2.4.1",
+		"cross-env": "^7.0.3",
+		"eslint": "^7.32.0",
+		"eslint-plugin-tsdoc": "^0.2.14",
+		"fs-extra": "10.0.1",
+		"glob": "^7.1.7",
+		"mocha": "^9.1.1",
+		"typescript": "^4.4.4",
+		"typescript-formatter": "^7.2.2",
+		"vsce": "^2.5.1",
+		"vscode-test": "^1.6.1"
+	},
+	"__metadata": {
+		"id": "71e74fc8-23c2-47b7-8594-ed00192d96a6",
+		"publisherDisplayName": "move",
+		"publisherId": "40d7def1-c662-4965-9ead-c06109c7cc6d",
+		"isPreReleaseVersion": false
+	}
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/commands/index.ts b/vendors/move/crates/move-analyzer/editors/code/src/commands/index.ts
new file mode 100644
index 000000000..71d5f7fdf
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/commands/index.ts
@@ -0,0 +1 @@
+export * from './lsp_command';
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/commands/lsp_command.ts b/vendors/move/crates/move-analyzer/editors/code/src/commands/lsp_command.ts
new file mode 100644
index 000000000..157551759
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/commands/lsp_command.ts
@@ -0,0 +1,60 @@
+import type {
+    DocumentSymbolParams,
+    SymbolInformation,
+    DocumentSymbol,
+    CompletionParams,
+    CompletionList,
+    CompletionItem,
+} from 'vscode-languageclient';
+import { DocumentSymbolRequest, HoverRequest, CompletionRequest } from 'vscode-languageclient';
+import type { Context } from '../context';
+
+/**
+ * An LSP command textDocument/documentSymbol
+ */
+export async function textDocumentDocumentSymbol(
+    context: Readonly<Context>,
+    params: DocumentSymbolParams,
+): Promise<SymbolInformation[] | DocumentSymbol[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(DocumentSymbolRequest.type, params);
+}
+
+/**
+ * An LSP command textDocument/completion
+ */
+export async function textDocumentCompletion(
+    context: Readonly<Context>,
+    params: CompletionParams,
+): Promise<CompletionList | CompletionItem[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(CompletionRequest.type, params);
+}
+
+
+/**
+ * An LSP command textDocument/hover
+ */
+export async function textDocumentHover(
+    context: Readonly<Context>,
+    params: DocumentSymbolParams,
+)
+    : Promise<SymbolInformation[] | DocumentSymbol[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(HoverRequest.method, params);
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/configuration.ts b/vendors/move/crates/move-analyzer/editors/code/src/configuration.ts
new file mode 100644
index 000000000..595a791cf
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/configuration.ts
@@ -0,0 +1,54 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import * as os from 'os';
+import * as vscode from 'vscode';
+import * as Path from 'path';
+
+/**
+ * User-defined configuration values, such as those specified in VS Code settings.
+ *
+ * This provides a more strongly typed interface to the configuration values specified in this
+ * extension's `package.json`, under the key `"contributes.configuration.properties"`.
+ */
+export class Configuration {
+    private readonly configuration: vscode.WorkspaceConfiguration;
+
+    constructor() {
+        this.configuration = vscode.workspace.getConfiguration('move-analyzer');
+    }
+
+    /** A string representation of the configured values, for logging purposes. */
+    toString(): string {
+        return JSON.stringify(this.configuration);
+    }
+
+    /** The path to the move-analyzer executable. */
+    get serverPath(): string {
+        const defaultName = 'move-analyzer';
+        let serverPath = this.configuration.get<string>('server.path', defaultName);
+        if (serverPath.length === 0) {
+            // The default value of the `server.path` setting is 'move-analyzer'.
+            // A user may have over-written this default with an empty string value, ''.
+            // An empty string cannot be an executable name, so instead use the default.
+            return defaultName;
+        }
+
+        if (serverPath === defaultName) {
+            // If the program set by the user is through PATH,
+            // it will return directly if specified
+            return defaultName;
+        }
+
+        if (serverPath.startsWith('~/')) {
+            serverPath = os.homedir() + serverPath.slice('~'.length);
+        }
+
+        if (process.platform === 'win32' && !serverPath.endsWith('.exe')) {
+            serverPath = serverPath + '.exe';
+        }
+
+        return Path.resolve(serverPath);
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/context.ts b/vendors/move/crates/move-analyzer/editors/code/src/context.ts
new file mode 100644
index 000000000..2f894923b
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/context.ts
@@ -0,0 +1,152 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Configuration } from './configuration';
+import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
+import { log } from './log';
+import { sync as commandExistsSync } from 'command-exists';
+import { IndentAction } from 'vscode';
+
+/** Information passed along to each VS Code command defined by this extension. */
+export class Context {
+    private client: lc.LanguageClient | undefined;
+
+    private constructor(
+        private readonly extensionContext: Readonly<vscode.ExtensionContext>,
+        readonly configuration: Readonly<Configuration>,
+        client: lc.LanguageClient | undefined = undefined,
+    ) {
+        this.client = client;
+    }
+
+    static create(
+        extensionContext: Readonly<vscode.ExtensionContext>,
+        configuration: Readonly<Configuration>,
+    ): Context | Error {
+        if (!commandExistsSync(configuration.serverPath)) {
+            return new Error(
+                `language server executable '${configuration.serverPath}' could not be found, so ` +
+                'most extension features will be unavailable to you. Follow the instructions in ' +
+                'the move-analyzer Visual Studio Code extension README to install the language ' +
+                'server.',
+            );
+        }
+        return new Context(extensionContext, configuration);
+    }
+
+    /**
+     * Registers the given command with VS Code.
+     *
+     * "Registering" the function means that the VS Code machinery will execute it when the command
+     * with the given name is requested by the user. The command names themselves are specified in
+     * this extension's `package.json` file, under the key `"contributes.commands"`.
+     */
+    registerCommand(
+        name: Readonly<string>,
+        command: (context: Readonly<Context>, ...args: Array<any>) => any,
+    ): void {
+        const disposable = vscode.commands.registerCommand(
+            `move-analyzer.${name}`,
+            async (...args: Array<any>) : Promise<any> => {
+                const ret = await command(this, ...args);
+                return ret;
+            },
+        );
+
+        this.extensionContext.subscriptions.push(disposable);
+    }
+
+    /**
+     * Sets up additional language configuration that's impossible to do via a
+     * separate language-configuration.json file. See [1] for more information.
+     *
+     * This code originates from [2](vscode-rust).
+     *
+     * [1]: https://github.com/Microsoft/vscode/issues/11514#issuecomment-244707076
+     * [2]: https://github.com/rust-lang/vscode-rust/blob/660b412701fe2ea62fad180c40ee4f8a60571c61/src/extension.ts#L287:L287
+     */
+    configureLanguage(): void {
+        const disposable = vscode.languages.setLanguageConfiguration('move', {
+            onEnterRules: [
+                {
+                    // Doc single-line comment
+                    // e.g. ///|
+                    beforeText: /^\s*\/{3}.*$/,
+                    action: { indentAction: IndentAction.None, appendText: '/// ' },
+                },
+                {
+                    // Parent doc single-line comment
+                    // e.g. //!|
+                    beforeText: /^\s*\/{2}!.*$/,
+                    action: { indentAction: IndentAction.None, appendText: '//! ' },
+                },
+            ],
+        });
+        this.extensionContext.subscriptions.push(disposable);
+    }
+
+    /**
+     * Configures and starts the client that interacts with the language server.
+     *
+     * The "client" is an object that sends messages to the language server, which in Move's case is
+     * the `move-analyzer` executable. Unlike registered extension commands such as
+     * `move-analyzer.serverVersion`, which are manually executed by a VS Code user via the command
+     * palette or menu, this client sends many of its messages on its own (for example, when it
+     * starts, it sends the "initialize" request).
+     *
+     * To read more about the messages sent and responses received by this client, such as
+     * "initialize," read [the Language Server Protocol specification](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#initialize).
+     *
+     * In order to synchronously wait for the client to be completely ready,
+     * we need to mark the function as asynchronous
+     **/
+    async startClient(): Promise<void> {
+        const executable: lc.Executable = {
+            command: this.configuration.serverPath,
+        };
+        const serverOptions: lc.ServerOptions = {
+            run: executable,
+            debug: executable,
+        };
+
+        // The vscode-languageclient module reads a configuration option named
+        // "<extension-name>.trace.server" to determine whether to log messages. If a trace output
+        // channel is specified, these messages are printed there, otherwise they appear in the
+        // output channel that it automatically created by the `LanguageClient` (in this extension,
+        // that is 'Move Language Server'). For more information, see:
+        // https://code.visualstudio.com/api/language-extensions/language-server-extension-guide#logging-support-for-language-server
+        const traceOutputChannel = vscode.window.createOutputChannel(
+            'Move Analyzer Language Server Trace',
+        );
+        const clientOptions: lc.LanguageClientOptions = {
+            documentSelector: [{ scheme: 'file', language: 'move' }],
+            traceOutputChannel,
+        };
+
+        const client = new lc.LanguageClient(
+            'move-analyzer',
+            'Move Language Server',
+            serverOptions,
+            clientOptions,
+        );
+        log.info('Starting client...');
+        const disposable = client.start();
+        this.extensionContext.subscriptions.push(disposable);
+        this.client = client;
+
+        // Wait for the Move Language Server initialization to complete,
+        // especially the first symbol table parsing is completed
+        await this.client.onReady();
+    }
+
+    /**
+     * Returns the client that this extension interacts with.
+     *
+     * @returns lc.LanguageClient
+     */
+    getClient(): lc.LanguageClient | undefined {
+        return this.client;
+    }
+} // Context
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/extension.ts b/vendors/move/crates/move-analyzer/editors/code/src/extension.ts
new file mode 100644
index 000000000..e7a33415c
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/extension.ts
@@ -0,0 +1,30 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import * as assert from 'assert';
+import * as vscode from 'vscode';
+
+/** Information related to this extension itself, such as its identifier and version. */
+export class Extension {
+    /** The string used to uniquely identify this particular extension to VS Code. */
+    readonly identifier = 'move.move-analyzer';
+
+    private readonly extension: vscode.Extension<unknown>;
+
+    constructor() {
+        const extension = vscode.extensions.getExtension(this.identifier);
+        assert(extension !== undefined, `extension ${this.identifier} is not available`);
+        this.extension = extension;
+    }
+
+    /** The version string. */
+    get version(): string {
+        for (const entry of Object.entries(this.extension.packageJSON)) {
+            if (entry[0] === 'version') {
+                return entry[1] as string;
+            }
+        }
+        return 'unknown';
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/log.ts b/vendors/move/crates/move-analyzer/editors/code/src/log.ts
new file mode 100644
index 000000000..ccdbd985c
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/log.ts
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import * as vscode from 'vscode';
+
+/**
+ * A logger for the VS Code extension.
+ *
+ * Messages that are logged appear in an output channel created below that is dedicated to the
+ * extension (or "client"), in the extension user's "Output View." This logger should be used for
+ * messages related to VS Code and this extension, as opposed to messages regarding the language
+ * server, which appear in a separate output channel.
+ **/
+export const log = new class {
+    private readonly output = vscode.window.createOutputChannel('Move Analyzer Client');
+
+    /** Log an informational message (as opposed to an error or a warning). */
+    info(message: string): void {
+        this.write('INFO', message);
+    }
+
+    private write(label: string, message: string): void {
+        this.output.appendLine(`${label} [${new Date().toLocaleString()}]: ${message}`);
+    }
+}();
diff --git a/vendors/move/crates/move-analyzer/editors/code/src/main.ts b/vendors/move/crates/move-analyzer/editors/code/src/main.ts
new file mode 100644
index 000000000..64981a226
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/src/main.ts
@@ -0,0 +1,79 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Configuration } from './configuration';
+import { Context } from './context';
+import { Extension } from './extension';
+import { log } from './log';
+
+import * as childProcess from 'child_process';
+import * as vscode from 'vscode';
+import * as commands from './commands';
+
+
+/**
+ * An extension command that displays the version of the server that this extension
+ * interfaces with.
+ */
+async function serverVersion(context: Readonly<Context>): Promise<void> {
+    const version = childProcess.spawnSync(
+        context.configuration.serverPath, ['--version'], { encoding: 'utf8' },
+    );
+    if (version.stdout) {
+        await vscode.window.showInformationMessage(version.stdout);
+    } else if (version.error) {
+        await vscode.window.showErrorMessage(
+            `Could not execute move-analyzer: ${version.error.message}.`,
+        );
+    } else {
+        await vscode.window.showErrorMessage(
+            `A problem occurred when executing '${context.configuration.serverPath}'.`,
+        );
+    }
+}
+
+/**
+ * The entry point to this VS Code extension.
+ *
+ * As per [the VS Code documentation on activation
+ * events](https://code.visualstudio.com/api/references/activation-events), "an extension must
+ * export an `activate()` function from its main module and it will be invoked only once by
+ * VS Code when any of the specified activation events [are] emitted."
+ *
+ * Activation events for this extension are listed in its `package.json` file, under the key
+ * `"activationEvents"`.
+ *
+ * In order to achieve synchronous activation, mark the function as an asynchronous function,
+ * so that you can wait for the activation to complete by await
+ */
+export async function activate(extensionContext: Readonly<vscode.ExtensionContext>): Promise<void> {
+    const extension = new Extension();
+    log.info(`${extension.identifier} version ${extension.version}`);
+
+    const configuration = new Configuration();
+    log.info(`configuration: ${configuration.toString()}`);
+
+    const context = Context.create(extensionContext, configuration);
+    // An error here -- for example, if the path to the `move-analyzer` binary that the user
+    // specified in their settings is not valid -- prevents the extension from providing any
+    // more utility, so return early.
+    if (context instanceof Error) {
+        void vscode.window.showErrorMessage(
+            `Could not activate move-analyzer: ${context.message}.`,
+        );
+        return;
+    }
+
+    // Register handlers for VS Code commands that the user explicitly issues.
+    context.registerCommand('serverVersion', serverVersion);
+
+    // Configure other language features.
+    context.configureLanguage();
+
+    // All other utilities provided by this extension occur via the language server.
+    await context.startClient();
+    context.registerCommand('textDocumentDocumentSymbol', commands.textDocumentDocumentSymbol);
+    context.registerCommand('textDocumentHover', commands.textDocumentHover);
+    context.registerCommand('textDocumentCompletion', commands.textDocumentCompletion);
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/ext.test.ts b/vendors/move/crates/move-analyzer/editors/code/tests/ext.test.ts
new file mode 100644
index 000000000..c73d6c707
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/ext.test.ts
@@ -0,0 +1,13 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import * as assert from 'assert';
+import * as Mocha from 'mocha';
+import * as vscode from 'vscode';
+
+Mocha.suite('ext', () => {
+    Mocha.test('ext_exists', () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+    });
+});
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/index.ts b/vendors/move/crates/move-analyzer/editors/code/tests/index.ts
new file mode 100644
index 000000000..1660a4dc4
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/index.ts
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * This file contains what VS Code's documentation refers to as "the test runner," which
+ * programmatically executes each test file in our extension. For more information, see:
+ * https://code.visualstudio.com/api/working-with-extensions/testing-extension#the-test-runner-script
+ */
+
+import * as glob from 'glob';
+import * as Mocha from 'mocha';
+import * as path from 'path';
+/* eslint-disable */
+// deno-lint-ignore require-await
+export async function run(): Promise<void> {
+    // dev mode
+    const mode = process.env['mode'] || 'test';
+    if (mode === 'dev') {
+        return new Promise((resolve) => {
+            setTimeout(resolve, 1000 * 60 * 15); // Development mode, set a timeout of 15 minutes
+        });
+    }
+
+    /* eslint-disable */
+    const suite = new Mocha({
+        ui: 'tdd',
+        color: true,
+        // The default timeout of 2000 miliseconds can sometimes be too quick, since the extension
+        // tests need to launch VS Code first.
+        timeout: 10000,
+    });
+
+    const testsRoot = path.resolve(__dirname, '..');
+    return new Promise((resolve, reject) => {
+        // The test suite is composed of all files ending with '.test.js'.
+        glob('**/**.test.js', { cwd: testsRoot }, (err, files: ReadonlyArray<string>) => {
+            if (err) {
+                return reject(err);
+            }
+
+            // Add each file to the test suite.
+            files.forEach(f => suite.addFile(path.resolve(testsRoot, f)));
+
+            // Run the test suite. Uncaught exceptions or a non-zero number of
+            // test rejectures is considered a test suite rejecture.
+            try {
+                return suite.run(failures => {
+                    if (failures > 0) {
+                        reject(new Error(`${failures} tests failed.`));
+                    } else {
+                        resolve();
+                    }
+                });
+            } catch (err: unknown) {
+                console.error(err);
+                return reject(err);
+            }
+        });
+    });
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/Move.toml b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/Move.toml
new file mode 100644
index 000000000..47ddc6739
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Symbols"
+version = "0.0.1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
+
+[addresses]
+Symbols = "0xCAFE"
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace
new file mode 100644
index 000000000..4651fb61d
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"move-analyzer.server.path": "../../../../../../target/debug/move-analyzer"
+	}
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace
new file mode 100644
index 000000000..087aded48
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"move-analyzer.server.path": "../../../../target/debug/move-analyzer"
+	}
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move
new file mode 100644
index 000000000..b0ff2df28
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move
@@ -0,0 +1,13 @@
+module Symbols::Completions {
+  fun add(a: u64, b: u64): u64 {
+    a + b
+  }
+
+  fun subtract(a: u64, b: u64): u64 {
+    a - b
+  }
+
+  fun divide(a: u64, b: u64): u64 {
+    a / b
+  }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move
new file mode 100644
index 000000000..d1454454b
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move
@@ -0,0 +1,18 @@
+module Symbols::M1 {
+
+    const SOME_CONST: u64 = 42;
+
+    struct SomeOtherStruct has drop {
+        some_field: u64,
+    }
+
+    public fun some_other_struct(v: u64): SomeOtherStruct {
+        SomeOtherStruct { some_field: v }
+    }
+
+    #[test]
+    #[expected_failure]
+    fun this_is_a_test() {
+        1/0;
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move
new file mode 100644
index 000000000..4d00f275e
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move
@@ -0,0 +1,22 @@
+module Symbols::M2 {
+
+    /// Constant containing the answer to the universe
+    const DOCUMENTED_CONSTANT: u64 = 42;
+
+    /**
+       This is a multiline docstring
+
+       This docstring has empty lines.
+
+       It uses the ** format instead of ///
+    */
+    fun other_doc_struct(): Symbols::M3::OtherDocStruct {
+        Symbols::M3::create_other_struct(DOCUMENTED_CONSTANT)
+    }
+
+    use Symbols::M3::{Self, OtherDocStruct};
+
+    fun other_doc_struct_import(): OtherDocStruct {
+        M3::create_other_struct(7)
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move
new file mode 100644
index 000000000..1fd363e82
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move
@@ -0,0 +1,12 @@
+module Symbols::M3 {
+
+    /// Documented struct in another module
+    struct OtherDocStruct has drop {
+        some_field: u64,
+    }
+
+    /// Documented initializer in another module
+    public fun create_other_struct(v: u64): OtherDocStruct {
+        OtherDocStruct { some_field: v }
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/lsp.test.ts b/vendors/move/crates/move-analyzer/editors/code/tests/lsp.test.ts
new file mode 100644
index 000000000..c07e29730
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/lsp.test.ts
@@ -0,0 +1,218 @@
+import * as assert from 'assert';
+import * as Mocha from 'mocha';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
+import type { MarkupContent } from 'vscode-languageclient';
+import { CompletionItemKind } from 'vscode-languageclient';
+
+const isFunctionInCompletionItems = (fnName: string, items: vscode.CompletionItem[]): boolean => {
+    return (
+        items.find((item) => item.label === fnName && item.kind === CompletionItemKind.Function) !==
+        undefined
+    );
+};
+
+const isKeywordInCompletionItems = (label: string, items: vscode.CompletionItem[]): boolean => {
+    return (
+        items.find((item) => item.label === label && item.kind === CompletionItemKind.Keyword) !==
+        undefined
+    );
+};
+
+const PRIMITIVE_TYPES = ['u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'vector'];
+
+Mocha.suite('LSP', () => {
+    Mocha.test('textDocument/documentSymbol', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(path.join(workDir, 'sources/M1.move'));
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.DocumentSymbolParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+        };
+
+        const syms: Array<lc.DocumentSymbol> | undefined = await
+            vscode.commands.executeCommand(
+                'move-analyzer.textDocumentDocumentSymbol', params,
+            );
+
+        assert.ok(syms);
+        assert.deepStrictEqual(syms[0]?.kind, lc.SymbolKind.Module);
+        assert.deepStrictEqual(syms[0].name, 'M1');
+
+        assert.ok(syms[0].children);
+        assert.deepStrictEqual(syms[0]?.children[0]?.kind, lc.SymbolKind.Constant);
+        assert.deepStrictEqual(syms[0]?.children[0].name, 'SOME_CONST');
+        assert.deepStrictEqual(syms[0]?.children[1]?.kind, lc.SymbolKind.Struct);
+        assert.deepStrictEqual(syms[0]?.children[1].name, 'SomeOtherStruct');
+        assert.ok(syms[0].children[1].children);
+        assert.deepStrictEqual(syms[0]?.children[1]?.children[0]?.kind, lc.SymbolKind.Field);
+        assert.deepStrictEqual(syms[0]?.children[1]?.children[0]?.name, 'some_field');
+        assert.deepStrictEqual(syms[0]?.children[1].name, 'SomeOtherStruct');
+        assert.deepStrictEqual(syms[0]?.children[2]?.kind, lc.SymbolKind.Function);
+        assert.deepStrictEqual(syms[0]?.children[2].name, 'some_other_struct');
+        assert.deepStrictEqual(syms[0]?.children[3]?.kind, lc.SymbolKind.Function);
+        assert.deepStrictEqual(syms[0]?.children[3].name, 'this_is_a_test');
+        assert.deepStrictEqual(syms[0]?.children[3]?.detail, '["test", "expected_failure"]');
+    });
+
+    Mocha.test('textDocument/hover for definition in the same module', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/M2.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.HoverParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 12,
+                character: 8,
+            },
+        };
+
+        const hoverResult: lc.Hover | undefined =
+            await vscode.commands.executeCommand(
+                'move-analyzer.textDocumentHover',
+                params,
+            );
+
+        assert.ok(hoverResult);
+        assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
+            // eslint-disable-next-line max-len
+            'fun Symbols::M2::other_doc_struct(): Symbols::M3::OtherDocStruct\n\n\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n');
+
+    });
+
+    Mocha.test('textDocument/hover for definition in an external module', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/M2.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.HoverParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 18,
+                character: 35,
+            },
+        };
+
+        const hoverResult: lc.Hover | undefined =
+            await vscode.commands.executeCommand(
+                'move-analyzer.textDocumentHover',
+                params,
+            );
+
+
+        assert.ok(hoverResult);
+        assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
+            'Symbols::M3::OtherDocStruct\n\nDocumented struct in another module\n');
+    });
+
+    Mocha.test('textDocument/completion', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/Completions.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.CompletionParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 12,
+                character: 1,
+            },
+        };
+
+        const items = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
+            'move-analyzer.textDocumentCompletion',
+            params,
+        );
+
+        assert.ok(items);
+
+        // Items should return all functions defined in the file
+        assert.strictEqual(isFunctionInCompletionItems('add', items), true);
+        assert.strictEqual(isFunctionInCompletionItems('subtract', items), true);
+        assert.strictEqual(isFunctionInCompletionItems('divide', items), true);
+
+        // Items also include all primitive types because they are keywords
+        PRIMITIVE_TYPES.forEach((primitive) => {
+            assert.strictEqual(isKeywordInCompletionItems(primitive, items), true);
+        });
+
+        const colonParams: lc.CompletionParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            // The position of the character ":"
+            position: {
+                line: 9,
+                character: 15,
+            },
+        };
+
+        const itemsOnColon = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
+            'move-analyzer.textDocumentCompletion',
+            colonParams,
+        );
+
+        assert.ok(itemsOnColon);
+
+        const keywordsOnColon = itemsOnColon.filter(i => i.kind === CompletionItemKind.Keyword);
+        // Primitive types are the only keywords returned after inserting the colon
+        assert.strictEqual(keywordsOnColon.length, PRIMITIVE_TYPES.length);
+
+        // Final safety check
+        PRIMITIVE_TYPES.forEach((primitive) => {
+            assert.strictEqual(isKeywordInCompletionItems(primitive, keywordsOnColon), true);
+        });
+    });
+});
diff --git a/vendors/move/crates/move-analyzer/editors/code/tests/runTests.ts b/vendors/move/crates/move-analyzer/editors/code/tests/runTests.ts
new file mode 100644
index 000000000..a8cd46f28
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tests/runTests.ts
@@ -0,0 +1,80 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * This file contains what VS Code's documentation refers to as "the test script," which downloads,
+ * unzips, launches a VS Code instance with our extension installed, and executes the "test runner."
+ * For more information, see:
+ * https://code.visualstudio.com/api/working-with-extensions/testing-extension#the-test-script
+ */
+
+import * as os from 'os';
+import * as path from 'path';
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import * as fse from 'fs-extra';
+import {
+    runTests,
+    downloadAndUnzipVSCode,
+    resolveCliArgsFromVSCodeExecutablePath,
+} from '@vscode/test-electron';
+
+/**
+ * Launches a VS Code instance to run tests.
+ *
+ * This is essentially a TypeScript program that executes the "VS Code Tokenizer Tests" launch
+ * target defined in this repository's `.vscode/launch.json`.
+ */
+async function runVSCodeTest(vscodeVersion: string): Promise<void> {
+    try {
+        // The `--extensionDevelopmentPath` argument passed to VS Code. This should point to the
+        // directory that contains the extension manifest file, `package.json`.
+        const extensionDevelopmentPath = path.resolve(__dirname, '..', '..');
+
+        // The `--extensionTestsPath` argument passed to VS Code. This should point to a JavaScript
+        // program that is considered to be the "test suite" for the extension.
+        const extensionTestsPath = path.resolve(__dirname, 'index.js');
+
+        // The workspace
+        let testWorkspacePath = path.resolve(__dirname, './lsp-demo/lsp-demo.code-workspace');
+        if (process.platform === 'win32') {
+            testWorkspacePath = path.resolve(__dirname, './lsp-demo/lsp-demo-win.code-workspace');
+        }
+
+        // Install vscode and depends extension
+        const vscodeExecutablePath = await downloadAndUnzipVSCode(vscodeVersion);
+        const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
+        const newCli = cli ?? 'code';
+        cp.spawnSync(newCli, [...args, '--install-extension', 'damirka.move-syntax', '--force'], {
+            encoding: 'utf-8',
+            stdio: 'inherit',
+        });
+
+        // Because the default vscode userDataDir is too long,
+        // v1.69.2 will report an error when running test.
+        // So generate a short
+        const userDataDir = path.join(os.tmpdir(), 'vscode-test', vscodeVersion);
+        if (!fs.existsSync(userDataDir)) {
+            fse.mkdirsSync(userDataDir);
+        }
+
+        // Download VS Code, unzip it, and run the "test suite" program.
+        await runTests({
+            vscodeExecutablePath: vscodeExecutablePath,
+            extensionDevelopmentPath,
+            extensionTestsPath,
+            launchArgs: [testWorkspacePath, '--user-data-dir', userDataDir],
+        });
+    } catch (_err: unknown) {
+        console.error('Failed to run tests');
+        process.exit(1);
+    }
+}
+
+async function main(): Promise<void> {
+    await runVSCodeTest('1.64.0'); // Test with vscode v1.64.0
+    await runVSCodeTest('1.69.2'); // Test with vscode v1.69.2
+}
+
+void main();
diff --git a/vendors/move/crates/move-analyzer/editors/code/tsconfig.json b/vendors/move/crates/move-analyzer/editors/code/tsconfig.json
new file mode 100644
index 000000000..47562cb37
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/editors/code/tsconfig.json
@@ -0,0 +1,35 @@
+{
+    "compilerOptions": {
+        "module": "CommonJS",
+        "target": "es2020",
+        "outDir": "out",
+        "lib": [
+            "es2020"
+        ],
+        "sourceMap": true,
+        "rootDir": ".",
+        "newLine": "LF",
+        "strict": true,
+        "allowUnreachableCode": false,
+        "allowUnusedLabels": false,
+        "exactOptionalPropertyTypes": true,
+        "noFallthroughCasesInSwitch": true,
+        "noImplicitAny": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "noPropertyAccessFromIndexSignature": true,
+        "noUncheckedIndexedAccess": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true
+    },
+    "exclude": [
+        "node_modules",
+        ".vscode-test"
+    ],
+    "include": [
+        "src",
+        "tests",
+        "types"
+    ]
+}
diff --git a/vendors/move/crates/move-analyzer/src/bin/move-analyzer.rs b/vendors/move/crates/move-analyzer/src/bin/move-analyzer.rs
new file mode 100644
index 000000000..d99f6032f
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/bin/move-analyzer.rs
@@ -0,0 +1,270 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use clap::Parser;
+use crossbeam::channel::{bounded, select};
+use lsp_server::{Connection, Message, Notification, Request, Response};
+use lsp_types::{
+    notification::Notification as _, request::Request as _, CompletionOptions, Diagnostic,
+    HoverProviderCapability, OneOf, SaveOptions, TextDocumentSyncCapability, TextDocumentSyncKind,
+    TextDocumentSyncOptions, TypeDefinitionProviderCapability, WorkDoneProgressOptions,
+};
+use std::{
+    collections::BTreeMap,
+    path::Path,
+    sync::{Arc, Mutex},
+    thread,
+};
+
+use move_analyzer::{
+    completion::on_completion_request,
+    context::Context,
+    symbols,
+    vfs::{on_text_document_sync_notification, VirtualFileSystem},
+};
+use move_symbol_pool::Symbol;
+use url::Url;
+
+#[derive(Parser)]
+#[clap(author, version, about)]
+struct Options {}
+
+fn main() {
+    // For now, move-analyzer only responds to options built-in to clap,
+    // such as `--help` or `--version`.
+    Options::parse();
+
+    // stdio is used to communicate Language Server Protocol requests and responses.
+    // stderr is used for logging (and, when Visual Studio Code is used to communicate with this
+    // server, it captures this output in a dedicated "output channel").
+    let exe = std::env::current_exe()
+        .unwrap()
+        .to_string_lossy()
+        .to_string();
+    eprintln!(
+        "Starting language server '{}' communicating via stdio...",
+        exe
+    );
+
+    let (connection, io_threads) = Connection::stdio();
+    let symbols = Arc::new(Mutex::new(symbols::Symbolicator::empty_symbols()));
+    let mut context = Context {
+        connection,
+        files: VirtualFileSystem::default(),
+        symbols: symbols.clone(),
+    };
+
+    let (id, client_response) = context
+        .connection
+        .initialize_start()
+        .expect("could not start connection initialization");
+
+    let capabilities = serde_json::to_value(lsp_types::ServerCapabilities {
+        // The server receives notifications from the client as users open, close,
+        // and modify documents.
+        text_document_sync: Some(TextDocumentSyncCapability::Options(
+            TextDocumentSyncOptions {
+                open_close: Some(true),
+                // TODO: We request that the language server client send us the entire text of any
+                // files that are modified. We ought to use the "incremental" sync kind, which would
+                // have clients only send us what has changed and where, thereby requiring far less
+                // data be sent "over the wire." However, to do so, our language server would need
+                // to be capable of applying deltas to its view of the client's open files. See the
+                // 'move_analyzer::vfs' module for details.
+                change: Some(TextDocumentSyncKind::Full),
+                will_save: None,
+                will_save_wait_until: None,
+                save: Some(
+                    SaveOptions {
+                        include_text: Some(true),
+                    }
+                    .into(),
+                ),
+            },
+        )),
+        selection_range_provider: None,
+        hover_provider: Some(HoverProviderCapability::Simple(true)),
+        // The server provides completions as a user is typing.
+        completion_provider: Some(CompletionOptions {
+            resolve_provider: None,
+            // In Move, `foo::` and `foo.` should trigger completion suggestions for after
+            // the `:` or `.`
+            // (Trigger characters are just that: characters, such as `:`, and not sequences of
+            // characters, such as `::`. So when the language server encounters a completion
+            // request, it checks whether completions are being requested for `foo:`, and returns no
+            // completions in that case.)
+            trigger_characters: Some(vec![":".to_string(), ".".to_string()]),
+            all_commit_characters: None,
+            work_done_progress_options: WorkDoneProgressOptions {
+                work_done_progress: None,
+            },
+        }),
+        definition_provider: Some(OneOf::Left(symbols::DEFS_AND_REFS_SUPPORT)),
+        type_definition_provider: Some(TypeDefinitionProviderCapability::Simple(
+            symbols::DEFS_AND_REFS_SUPPORT,
+        )),
+        references_provider: Some(OneOf::Left(symbols::DEFS_AND_REFS_SUPPORT)),
+        document_symbol_provider: Some(OneOf::Left(true)),
+        ..Default::default()
+    })
+    .expect("could not serialize server capabilities");
+
+    let (diag_sender, diag_receiver) = bounded::<Result<BTreeMap<Symbol, Vec<Diagnostic>>>>(0);
+    let mut symbolicator_runner = symbols::SymbolicatorRunner::idle();
+    if symbols::DEFS_AND_REFS_SUPPORT {
+        let initialize_params: lsp_types::InitializeParams =
+            serde_json::from_value(client_response)
+                .expect("could not deserialize client capabilities");
+
+        symbolicator_runner = symbols::SymbolicatorRunner::new(symbols.clone(), diag_sender);
+
+        // If initialization information from the client contains a path to the directory being
+        // opened, try to initialize symbols before sending response to the client. Do not bother
+        // with diagnostics as they will be recomputed whenever the first source file is opened. The
+        // main reason for this is to enable unit tests that rely on the symbolication information
+        // to be available right after the client is initialized.
+        if let Some(uri) = initialize_params.root_uri {
+            if let Some(p) = symbols::SymbolicatorRunner::root_dir(&uri.to_file_path().unwrap()) {
+                // need to evaluate in a separate thread to allow for a larger stack size (needed on
+                // Windows)
+                thread::Builder::new()
+                    .stack_size(symbols::STACK_SIZE_BYTES)
+                    .spawn(move || {
+                        if let Ok((Some(new_symbols), _)) =
+                            symbols::Symbolicator::get_symbols(p.as_path())
+                        {
+                            let mut old_symbols = symbols.lock().unwrap();
+                            (*old_symbols).merge(new_symbols);
+                        }
+                    })
+                    .unwrap()
+                    .join()
+                    .unwrap();
+            }
+        }
+    };
+
+    context
+        .connection
+        .initialize_finish(
+            id,
+            serde_json::json!({
+                "capabilities": capabilities,
+            }),
+        )
+        .expect("could not finish connection initialization");
+
+    loop {
+        select! {
+            recv(diag_receiver) -> message => {
+                match message {
+                    Ok(result) => {
+                        match result {
+                            Ok(diags) => {
+                                for (k, v) in diags {
+                                    let url = Url::from_file_path(Path::new(&k.to_string())).unwrap();
+                                    let params = lsp_types::PublishDiagnosticsParams::new(url, v, None);
+                                    let notification = Notification::new(lsp_types::notification::PublishDiagnostics::METHOD.to_string(), params);
+                                    if let Err(err) = context
+                                        .connection
+                                        .sender
+                                        .send(lsp_server::Message::Notification(notification)) {
+                                            eprintln!("could not send diagnostics response: {:?}", err);
+                                        };
+                                }
+                            },
+                            Err(err) => {
+                                let typ = lsp_types::MessageType::Error;
+                                let message = format!("{err}");
+                                    // report missing manifest only once to avoid re-generating
+                                    // user-visible error in cases when the developer decides to
+                                    // keep editing a file that does not belong to a packages
+                                    let params = lsp_types::ShowMessageParams { typ, message };
+                                let notification = Notification::new(lsp_types::notification::ShowMessage::METHOD.to_string(), params);
+                                if let Err(err) = context
+                                    .connection
+                                    .sender
+                                    .send(lsp_server::Message::Notification(notification)) {
+                                        eprintln!("could not send compiler error response: {:?}", err);
+                                    };
+                            },
+                        }
+                    },
+                    Err(error) => eprintln!("symbolicator message error: {:?}", error),
+                }
+            },
+            recv(context.connection.receiver) -> message => {
+                match message {
+                    Ok(Message::Request(request)) => on_request(&context, &request),
+                    Ok(Message::Response(response)) => on_response(&context, &response),
+                    Ok(Message::Notification(notification)) => {
+                        match notification.method.as_str() {
+                            lsp_types::notification::Exit::METHOD => break,
+                            lsp_types::notification::Cancel::METHOD => {
+                                // TODO: Currently the server does not implement request cancellation.
+                                // It ought to, especially once it begins processing requests that may
+                                // take a long time to respond to.
+                            }
+                            _ => on_notification(&mut context, &symbolicator_runner, &notification),
+                        }
+                    }
+                    Err(error) => eprintln!("IDE message error: {:?}", error),
+                }
+            }
+        };
+    }
+
+    io_threads.join().expect("I/O threads could not finish");
+    symbolicator_runner.quit();
+    eprintln!("Shut down language server '{}'.", exe);
+}
+
+fn on_request(context: &Context, request: &Request) {
+    match request.method.as_str() {
+        lsp_types::request::Completion::METHOD => {
+            on_completion_request(context, request, &context.symbols.lock().unwrap())
+        }
+        lsp_types::request::GotoDefinition::METHOD => {
+            symbols::on_go_to_def_request(context, request, &context.symbols.lock().unwrap());
+        }
+        lsp_types::request::GotoTypeDefinition::METHOD => {
+            symbols::on_go_to_type_def_request(context, request, &context.symbols.lock().unwrap());
+        }
+        lsp_types::request::References::METHOD => {
+            symbols::on_references_request(context, request, &context.symbols.lock().unwrap());
+        }
+        lsp_types::request::HoverRequest::METHOD => {
+            symbols::on_hover_request(context, request, &context.symbols.lock().unwrap());
+        }
+        lsp_types::request::DocumentSymbolRequest::METHOD => {
+            symbols::on_document_symbol_request(context, request, &context.symbols.lock().unwrap());
+        }
+        _ => eprintln!("handle request '{}' from client", request.method),
+    }
+}
+
+fn on_response(_context: &Context, _response: &Response) {
+    eprintln!("handle response from client");
+}
+
+fn on_notification(
+    context: &mut Context,
+    symbolicator_runner: &symbols::SymbolicatorRunner,
+    notification: &Notification,
+) {
+    match notification.method.as_str() {
+        lsp_types::notification::DidOpenTextDocument::METHOD
+        | lsp_types::notification::DidChangeTextDocument::METHOD
+        | lsp_types::notification::DidSaveTextDocument::METHOD
+        | lsp_types::notification::DidCloseTextDocument::METHOD => {
+            on_text_document_sync_notification(
+                &mut context.files,
+                symbolicator_runner,
+                notification,
+            )
+        }
+        _ => eprintln!("handle notification '{}' from client", notification.method),
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/src/completion.rs b/vendors/move/crates/move-analyzer/src/completion.rs
new file mode 100644
index 000000000..3cb3fb168
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/completion.rs
@@ -0,0 +1,207 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{context::Context, symbols::Symbols};
+use lsp_server::Request;
+use lsp_types::{CompletionItem, CompletionItemKind, CompletionParams, Position};
+use move_command_line_common::files::FileHash;
+use move_compiler::{
+    editions::SyntaxEdition,
+    parser::{
+        keywords::{BUILTINS, CONTEXTUAL_KEYWORDS, KEYWORDS, PRIMITIVE_TYPES},
+        lexer::{Lexer, Tok},
+    },
+};
+use move_symbol_pool::Symbol;
+use std::{collections::HashSet, path::PathBuf};
+
+/// Constructs an `lsp_types::CompletionItem` with the given `label` and `kind`.
+fn completion_item(label: &str, kind: CompletionItemKind) -> CompletionItem {
+    CompletionItem {
+        label: label.to_owned(),
+        kind: Some(kind),
+        ..Default::default()
+    }
+}
+
+/// Return a list of completion items corresponding to each one of Move's keywords.
+///
+/// Currently, this does not filter keywords out based on whether they are valid at the completion
+/// request's cursor position, but in the future it ought to. For example, this function returns
+/// all specification language keywords, but in the future it should be modified to only do so
+/// within a spec block.
+fn keywords() -> Vec<CompletionItem> {
+    KEYWORDS
+        .iter()
+        .chain(CONTEXTUAL_KEYWORDS.iter())
+        .chain(PRIMITIVE_TYPES.iter())
+        .map(|label| {
+            let kind = if label == &"copy" || label == &"move" {
+                CompletionItemKind::Operator
+            } else {
+                CompletionItemKind::Keyword
+            };
+            completion_item(label, kind)
+        })
+        .collect()
+}
+
+/// Return a list of completion items of Move's primitive types
+fn primitive_types() -> Vec<CompletionItem> {
+    PRIMITIVE_TYPES
+        .iter()
+        .map(|label| completion_item(label, CompletionItemKind::Keyword))
+        .collect()
+}
+
+/// Return a list of completion items corresponding to each one of Move's builtin functions.
+fn builtins() -> Vec<CompletionItem> {
+    BUILTINS
+        .iter()
+        .map(|label| completion_item(label, CompletionItemKind::Function))
+        .collect()
+}
+
+/// Lexes the Move source file at the given path and returns a list of completion items
+/// corresponding to the non-keyword identifiers therein.
+///
+/// Currently, this does not perform semantic analysis to determine whether the identifiers
+/// returned are valid at the request's cursor position. However, this list of identifiers is akin
+/// to what editors like Visual Studio Code would provide as completion items if this language
+/// server did not initialize with a response indicating it's capable of providing completions. In
+/// the future, the server should be modified to return semantically valid completion items, not
+/// simple textual suggestions.
+fn identifiers(buffer: &str, symbols: &Symbols, path: &PathBuf) -> Vec<CompletionItem> {
+    // TODO thread through package configs
+    let mut lexer = Lexer::new(buffer, FileHash::new(buffer), SyntaxEdition::Legacy);
+    if lexer.advance().is_err() {
+        return vec![];
+    }
+
+    let mut ids = HashSet::new();
+    while lexer.peek() != Tok::EOF {
+        // Some tokens, such as "phantom", are contextual keywords that are only reserved in
+        // certain contexts. Since for now this language server doesn't analyze semantic context,
+        // tokens such as "phantom" are always present in keyword suggestions. To avoid displaying
+        // these keywords to the user twice in the case that the token "phantom" is present in the
+        // source program (once as a keyword, and once as an identifier), we filter out any
+        // identifier token that has the same text as a keyword.
+        if lexer.peek() == Tok::Identifier && !KEYWORDS.contains(&lexer.content()) {
+            // The completion item kind "text" indicates the item is not based on any semantic
+            // context of the request cursor's position.
+            ids.insert(lexer.content());
+        }
+        if lexer.advance().is_err() {
+            break;
+        }
+    }
+
+    let mods_opt = symbols.file_mods().get(path);
+
+    // The completion item kind "text" indicates that the item is based on simple textual matching,
+    // not any deeper semantic analysis.
+    ids.iter()
+        .map(|label| {
+            if let Some(mods) = mods_opt {
+                if mods
+                    .iter()
+                    .any(|m| m.functions().contains_key(&Symbol::from(*label)))
+                {
+                    completion_item(label, CompletionItemKind::Function)
+                } else {
+                    completion_item(label, CompletionItemKind::Text)
+                }
+            } else {
+                completion_item(label, CompletionItemKind::Text)
+            }
+        })
+        .collect()
+}
+
+/// Returns the token corresponding to the "trigger character" that precedes the user's cursor,
+/// if it is one of `.`, `:`, or `::`. Otherwise, returns `None`.
+fn get_cursor_token(buffer: &str, position: &Position) -> Option<Tok> {
+    // If the cursor is at the start of a new line, it cannot be preceded by a trigger character.
+    if position.character == 0 {
+        return None;
+    }
+
+    let line = match buffer.lines().nth(position.line as usize) {
+        Some(line) => line,
+        None => return None, // Our buffer does not contain the line, and so must be out of date.
+    };
+    match line.chars().nth(position.character as usize - 1) {
+        Some('.') => Some(Tok::Period),
+        Some(':') => {
+            if position.character > 1
+                && line.chars().nth(position.character as usize - 2) == Some(':')
+            {
+                Some(Tok::ColonColon)
+            } else {
+                Some(Tok::Colon)
+            }
+        }
+        _ => None,
+    }
+}
+
+/// Sends the given connection a response to a completion request.
+///
+/// The completions returned depend upon where the user's cursor is positioned.
+pub fn on_completion_request(context: &Context, request: &Request, symbols: &Symbols) {
+    eprintln!("handling completion request");
+    let parameters = serde_json::from_value::<CompletionParams>(request.params.clone())
+        .expect("could not deserialize completion request");
+
+    let path = parameters
+        .text_document_position
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let buffer = context.files.get(&path);
+    if buffer.is_none() {
+        eprintln!(
+            "Could not read '{:?}' when handling completion request",
+            path
+        );
+    }
+
+    // The completion items we provide depend upon where the user's cursor is positioned.
+    let cursor =
+        buffer.and_then(|buf| get_cursor_token(buf, &parameters.text_document_position.position));
+
+    let mut items = vec![];
+    match cursor {
+        Some(Tok::Colon) => {
+            items.extend_from_slice(&primitive_types());
+        }
+        Some(Tok::Period) | Some(Tok::ColonColon) => {
+            // `.` or `::` must be followed by identifiers, which are added to the completion items
+            // below.
+        }
+        _ => {
+            // If the user's cursor is positioned anywhere other than following a `.`, `:`, or `::`,
+            // offer them Move's keywords, operators, and builtins as completion items.
+            items.extend_from_slice(&keywords());
+            items.extend_from_slice(&builtins());
+        }
+    }
+
+    if let Some(buffer) = &buffer {
+        let identifiers = identifiers(buffer, symbols, &path);
+        items.extend_from_slice(&identifiers);
+    }
+
+    let result = serde_json::to_value(items).expect("could not serialize completion response");
+    eprintln!("about to send completion response");
+    let response = lsp_server::Response::new_ok(request.id.clone(), result);
+    if let Err(err) = context
+        .connection
+        .sender
+        .send(lsp_server::Message::Response(response))
+    {
+        eprintln!("could not send completion response: {:?}", err);
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/src/context.rs b/vendors/move/crates/move-analyzer/src/context.rs
new file mode 100644
index 000000000..36b3eaf0a
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/context.rs
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{symbols::Symbols, vfs::VirtualFileSystem};
+use lsp_server::Connection;
+use std::sync::{Arc, Mutex};
+
+/// The context within which the language server is running.
+pub struct Context {
+    /// The connection with the language server's client.
+    pub connection: Connection,
+    /// The files that the language server is providing information about.
+    pub files: VirtualFileSystem,
+    /// Symbolication information
+    pub symbols: Arc<Mutex<Symbols>>,
+}
diff --git a/vendors/move/crates/move-analyzer/src/diagnostics.rs b/vendors/move/crates/move-analyzer/src/diagnostics.rs
new file mode 100644
index 000000000..db3bd9646
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/diagnostics.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::utils::get_loc;
+use codespan_reporting::{diagnostic::Severity, files::SimpleFiles};
+use lsp_types::{Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, Location, Range};
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, HashMap};
+use url::Url;
+
+/// Converts diagnostics from the codespan format to the format understood by the language server.
+pub fn lsp_diagnostics(
+    diagnostics: &Vec<(
+        codespan_reporting::diagnostic::Severity,
+        &'static str,
+        (Loc, String),
+        Vec<(Loc, String)>,
+        Vec<String>,
+    )>,
+    files: &SimpleFiles<Symbol, String>,
+    file_id_mapping: &HashMap<FileHash, usize>,
+    file_name_mapping: &BTreeMap<FileHash, Symbol>,
+) -> BTreeMap<Symbol, Vec<Diagnostic>> {
+    let mut lsp_diagnostics = BTreeMap::new();
+    for (s, _, (loc, msg), labels, _) in diagnostics {
+        let fpath = file_name_mapping.get(&loc.file_hash()).unwrap();
+        if let Some(start) = get_loc(&loc.file_hash(), loc.start(), files, file_id_mapping) {
+            if let Some(end) = get_loc(&loc.file_hash(), loc.end(), files, file_id_mapping) {
+                let range = Range::new(start, end);
+                let related_info_opt = if labels.is_empty() {
+                    None
+                } else {
+                    Some(
+                        labels
+                            .iter()
+                            .filter_map(|(lloc, lmsg)| {
+                                let lstart = get_loc(
+                                    &lloc.file_hash(),
+                                    lloc.start(),
+                                    files,
+                                    file_id_mapping,
+                                )?;
+                                let lend =
+                                    get_loc(&lloc.file_hash(), lloc.end(), files, file_id_mapping)?;
+                                let lpath = file_name_mapping.get(&lloc.file_hash()).unwrap();
+                                let lpos = Location::new(
+                                    Url::from_file_path(lpath.as_str()).unwrap(),
+                                    Range::new(lstart, lend),
+                                );
+                                Some(DiagnosticRelatedInformation {
+                                    location: lpos,
+                                    message: lmsg.to_string(),
+                                })
+                            })
+                            .collect(),
+                    )
+                };
+                lsp_diagnostics
+                    .entry(*fpath)
+                    .or_insert_with(Vec::new)
+                    .push(Diagnostic::new(
+                        range,
+                        Some(severity(*s)),
+                        None,
+                        None,
+                        msg.to_string(),
+                        related_info_opt,
+                        None,
+                    ));
+            }
+        }
+    }
+    lsp_diagnostics
+}
+
+/// Produces empty diagnostics in the format understood by the language server for all files that
+/// the language server is aware of.
+pub fn lsp_empty_diagnostics(
+    file_name_mapping: &BTreeMap<FileHash, Symbol>,
+) -> BTreeMap<Symbol, Vec<Diagnostic>> {
+    let mut lsp_diagnostics = BTreeMap::new();
+    for n in file_name_mapping.values() {
+        lsp_diagnostics.insert(*n, vec![]);
+    }
+    lsp_diagnostics
+}
+
+/// Converts diagnostic severity level from the codespan format to the format understood by the
+/// language server.
+fn severity(s: Severity) -> DiagnosticSeverity {
+    match s {
+        Severity::Bug => DiagnosticSeverity::Error,
+        Severity::Error => DiagnosticSeverity::Error,
+        Severity::Warning => DiagnosticSeverity::Warning,
+        Severity::Note => DiagnosticSeverity::Information,
+        Severity::Help => DiagnosticSeverity::Hint,
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/src/lib.rs b/vendors/move/crates/move-analyzer/src/lib.rs
new file mode 100644
index 000000000..845f5d154
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/lib.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[macro_use(sp)]
+extern crate move_ir_types;
+
+pub mod completion;
+pub mod context;
+pub mod diagnostics;
+pub mod symbols;
+pub mod utils;
+pub mod vfs;
diff --git a/vendors/move/crates/move-analyzer/src/symbols.rs b/vendors/move/crates/move-analyzer/src/symbols.rs
new file mode 100644
index 000000000..d39457b50
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/symbols.rs
@@ -0,0 +1,3618 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module is responsible for building symbolication information on top of compiler's typed
+//! AST, in particular identifier definitions to be used for implementing go-to-def and
+//! go-to-references language server commands.
+//!
+//! There are two main structs that are used at different phases of the process, the Symbolicator
+//! struct is used when building symbolication information and the Symbols struct is summarizes the
+//! symbolication results and is used by the language server find definitions and references.
+//!
+//! Here is a brief description of how the symbolication information is encoded. Each identifier is
+//! in the source code of a given module is represented by its location (UseLoc struct): line
+//! number, starting and ending column, and hash of the source file where this identifier is
+//! located). A definition for each identifier (if any - e.g., built-in type definitions are
+//! excluded as there is no place in source code where they are defined) is also represented by its
+//! location in the source code (DefLoc struct): line, starting column and a hash of the source
+//! file where it's located. The symbolication process maps each identifier with its definition - a
+//! per module map is keyed on the line number where the identifier is located, and the map entry
+//! contains a list of identifier/definition pairs ordered by the column where the identifier starts.
+//!
+//! For example consider the following code fragment (0-based line numbers on the left and 0-based
+//! column numbers at the bottom):
+//!
+//! 7: const SOME_CONST: u64 = 42;
+//! 8:
+//! 9: SOME_CONST + SOME_CONST
+//!    |     |  |   | |      |
+//!    0     6  9  13 15    22
+//!
+//! Symbolication information for this code fragment would look as follows assuming that this code
+//! is stored in a file with hash FHASH (note that identifier in the definition of the constant maps
+//! to itself):
+//!
+//! [7] -> [UseLoc(7:6-13, FHASH), DefLoc(7:6, FHASH)]
+//! [9] -> [UseLoc(9:0-9 , FHASH), DefLoc((7:6, FHASH)], [UseLoc(9:13-22, FHASH), DefLoc((7:6, FHASH)]
+//!
+//! Including line number (and file hash) with the (use) identifier location may appear redundant,
+//! but it's needed to allow accumulating uses with each definition to support
+//! go-to-references. This is done in a global map from an identifier location (DefLoc) to a set of
+//! use locations (UseLoc) - we find a all references of a given identifier by first finding its
+//! definition and then using this definition as a key to the global map.
+//!
+//! Symbolication algorithm first analyzes all top-level definitions from all modules and then
+//! processes function bodies and struct definitions to match uses to definitions. For local
+//! definitions, the symbolicator builds a scope stack, entering encountered definitions and
+//! matching uses to a definition in the innermost scope.
+
+#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+
+use crate::{
+    context::Context,
+    diagnostics::{lsp_diagnostics, lsp_empty_diagnostics},
+    utils::get_loc,
+};
+use anyhow::{anyhow, Result};
+use codespan_reporting::files::SimpleFiles;
+use crossbeam::channel::Sender;
+use derivative::*;
+use im::ordmap::OrdMap;
+use lsp_server::{Request, RequestId};
+use lsp_types::{
+    request::GotoTypeDefinitionParams, Diagnostic, DocumentSymbol, DocumentSymbolParams,
+    GotoDefinitionParams, Hover, HoverContents, HoverParams, LanguageString, Location,
+    MarkedString, Position, Range, ReferenceParams, SymbolKind,
+};
+
+use std::{
+    cmp,
+    collections::{BTreeMap, BTreeSet, HashMap},
+    fmt,
+    path::{Path, PathBuf},
+    sync::{Arc, Condvar, Mutex},
+    thread,
+};
+use tempfile::tempdir;
+use url::Url;
+
+use move_command_line_common::files::FileHash;
+use move_compiler::{
+    expansion::ast::{Address, Fields, ModuleIdent, ModuleIdent_},
+    naming::ast::{StructDefinition, StructFields, TParam, Type, TypeName_, Type_},
+    parser::ast::StructName,
+    shared::Identifier,
+    typing::ast::{
+        BuiltinFunction_, Exp, ExpListItem, Function, FunctionBody_, LValue, LValueList, LValue_,
+        ModuleCall, ModuleDefinition, SequenceItem, SequenceItem_, UnannotatedExp_,
+    },
+    PASS_TYPING,
+};
+use move_ir_types::location::*;
+use move_package::compilation::build_plan::BuildPlan;
+use move_symbol_pool::Symbol;
+
+/// Enabling/disabling the language server reporting readiness to support go-to-def and
+/// go-to-references to the IDE.
+pub const DEFS_AND_REFS_SUPPORT: bool = true;
+// Building Move code requires a larger stack size on Windows (16M has been chosen somewhat
+// arbitrarily)
+pub const STACK_SIZE_BYTES: usize = 16 * 1024 * 1024;
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Copy)]
+/// Location of a definition's identifier
+struct DefLoc {
+    /// File where the definition of the identifier starts
+    fhash: FileHash,
+    /// Location where the definition of the identifier starts
+    start: Position,
+}
+
+/// Location of a use's identifier
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Copy)]
+struct UseLoc {
+    /// File where this use identifier starts
+    fhash: FileHash,
+    /// Location where this use identifier starts
+    start: Position,
+    /// Column (on the same line as start)  where this use identifier ends
+    col_end: u32,
+}
+
+/// Information about a type of an identifier. The reason we need an additional enum is that there
+/// is not direct representation of a function type in the Type enum.
+#[derive(Debug, Clone, Eq, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum IdentType {
+    RegularType(Type),
+    FunctionType(
+        ModuleIdent_, /* defining module */
+        Symbol,       /* name */
+        Vec<Type>,    /* type args */
+        Vec<Symbol>,  /* arg names */
+        Vec<Type>,    /* arg types */
+        Type,         /* ret */
+    ),
+}
+
+/// Information about both the use identifier (source file is specified wherever an instance of this
+/// struct is used) and the definition identifier
+#[derive(Debug, Clone, Eq)]
+pub struct UseDef {
+    /// Column where the (use) identifier location starts on a given line (use this field for
+    /// sorting uses on the line)
+    col_start: u32,
+    /// Column where the (use) identifier location ends on a given line
+    col_end: u32,
+    /// Type of the (use) identifier
+    use_type: IdentType,
+    /// Location of the definition
+    def_loc: DefLoc,
+    /// Location of the type definition
+    type_def_loc: Option<DefLoc>,
+    /// Doc string for the relevant identifier/function
+    doc_string: String,
+}
+
+/// Definition of a struct field
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+struct FieldDef {
+    name: Symbol,
+    start: Position,
+}
+
+/// Definition of a struct
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+struct StructDef {
+    name_start: Position,
+    field_defs: Vec<FieldDef>,
+}
+
+#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+#[derive(Derivative, Debug, Clone, PartialEq, Eq)]
+#[derivative(PartialOrd, Ord)]
+pub struct FunctionDef {
+    name: Symbol,
+    start: Position,
+    attrs: Vec<String>,
+    #[derivative(PartialOrd = "ignore")]
+    #[derivative(Ord = "ignore")]
+    ident_type: IdentType,
+}
+
+/// Module-level definitions
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct ModuleDefs {
+    /// File where this module is located
+    fhash: FileHash,
+    /// Location where this module is located
+    start: Position,
+    /// Module name
+    name: ModuleIdent_,
+    /// Struct definitions
+    structs: BTreeMap<Symbol, StructDef>,
+    /// Const definitions
+    constants: BTreeMap<Symbol, Position>,
+    /// Function definitions
+    functions: BTreeMap<Symbol, FunctionDef>,
+}
+
+/// Data used during symbolication
+pub struct Symbolicator {
+    /// Outermost definitions in a module (structs, consts, functions)
+    mod_outer_defs: BTreeMap<ModuleIdent_, ModuleDefs>,
+    /// A mapping from file names to file content (used to obtain source file locations)
+    files: SimpleFiles<Symbol, String>,
+    /// A mapping from file hashes to file IDs (used to obtain source file locations)
+    file_id_mapping: HashMap<FileHash, usize>,
+    // A mapping from file IDs to a split vector of the lines in each file (used to build docstrings)
+    file_id_to_lines: HashMap<usize, Vec<String>>,
+    /// Contains type params where relevant (e.g. when processing function definition)
+    type_params: BTreeMap<Symbol, DefLoc>,
+    /// Current processed module (always set before module processing starts)
+    current_mod: Option<ModuleIdent>,
+}
+
+/// Maps a line number to a list of use-def pairs on a given line (use-def set is sorted by
+/// col_start)
+#[derive(Debug, Clone, Eq, PartialEq)]
+struct UseDefMap(BTreeMap<u32, BTreeSet<UseDef>>);
+
+/// Maps a function name to its usage definition
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct FunctionIdentTypeMap(BTreeMap<String, IdentType>);
+
+/// Result of the symbolication process
+pub struct Symbols {
+    /// A map from def locations to all the references (uses)
+    references: BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+    /// A mapping from uses to definitions in a file
+    file_use_defs: BTreeMap<PathBuf, UseDefMap>,
+    /// A mapping from file hashes to file names
+    file_name_mapping: BTreeMap<FileHash, Symbol>,
+    /// A mapping from filePath to ModuleDefs
+    file_mods: BTreeMap<PathBuf, BTreeSet<ModuleDefs>>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+enum RunnerState {
+    Run(PathBuf),
+    Wait,
+    Quit,
+}
+
+/// Data used during symbolication running and symbolication info updating
+pub struct SymbolicatorRunner {
+    mtx_cvar: Arc<(Mutex<RunnerState>, Condvar)>,
+}
+
+impl ModuleDefs {
+    pub fn functions(&self) -> &BTreeMap<Symbol, FunctionDef> {
+        &self.functions
+    }
+}
+
+impl fmt::Display for IdentType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        match self {
+            Self::RegularType(t) => {
+                // Technically, we could use error_format function here to display the "regular"
+                // type, but the original intent of this function is subtly different that we need
+                // (i.e., to be used by compiler error messages) which, for example, results in
+                // verbosity that is not needed here.
+                //
+                // It also seems like a reasonable idea to be able to tune user experience in the
+                // IDE independently on how compiler error messages are generated.
+                write!(f, "{}", type_to_ide_string(t))
+            }
+            Self::FunctionType(mod_ident, name, type_args, arg_names, arg_types, ret) => {
+                let type_args_str = if !type_args.is_empty() {
+                    let mut s = '<'.to_string();
+                    s.push_str(&type_list_to_ide_string(type_args));
+                    s.push('>');
+                    s
+                } else {
+                    "".to_string()
+                };
+                let ret_str = match ret {
+                    sp!(_, Type_::Unit) => "".to_string(),
+                    _ => format!(": {}", type_to_ide_string(ret)),
+                };
+
+                write!(
+                    f,
+                    "fun {}::{}::{}{}({}){}",
+                    addr_to_ide_string(&mod_ident.address),
+                    mod_ident.module.value(),
+                    name,
+                    type_args_str,
+                    arg_list_to_ide_string(arg_names, arg_types),
+                    ret_str,
+                )
+            }
+        }
+    }
+}
+
+fn arg_list_to_ide_string(names: &[Symbol], types: &[Type]) -> String {
+    names
+        .iter()
+        .zip(types.iter())
+        .map(|(n, t)| format!("{}: {}", n, type_to_ide_string(t)))
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+fn type_to_ide_string(sp!(_, t): &Type) -> String {
+    match t {
+        Type_::Unit => "()".to_string(),
+        Type_::Ref(m, r) => format!("&{} {}", if *m { "mut" } else { "" }, type_to_ide_string(r)),
+        Type_::Param(tp) => {
+            format!("{}", tp.user_specified_name)
+        }
+        Type_::Apply(_, sp!(_, type_name), ss) => match type_name {
+            TypeName_::Multiple(_) => {
+                format!("({})", type_list_to_ide_string(ss))
+            }
+            TypeName_::Builtin(name) => {
+                if ss.is_empty() {
+                    format!("{}", name)
+                } else {
+                    format!("{}<{}>", name, type_list_to_ide_string(ss))
+                }
+            }
+            TypeName_::ModuleType(sp!(_, module_ident), struct_name) => {
+                let addr = addr_to_ide_string(&module_ident.address);
+                format!(
+                    "{}::{}::{}{}",
+                    addr,
+                    module_ident.module.value(),
+                    struct_name,
+                    if ss.is_empty() {
+                        "".to_string()
+                    } else {
+                        format!("<{}>", type_list_to_ide_string(ss))
+                    }
+                )
+            }
+        },
+        Type_::Anything => "_".to_string(),
+        Type_::Var(_) => "invalid type (var)".to_string(),
+        Type_::UnresolvedError => "invalid type (unresolved)".to_string(),
+    }
+}
+
+fn addr_to_ide_string(addr: &Address) -> String {
+    match addr {
+        Address::Numerical {
+            name: None,
+            value: sp!(_, bytes),
+            ..
+        } => format!("{}", bytes),
+        Address::Numerical {
+            name: Some(name), ..
+        } => format!("{}", name),
+        Address::NamedUnassigned(name) => format!("{}", name),
+    }
+}
+
+fn type_list_to_ide_string(types: &[Type]) -> String {
+    types
+        .iter()
+        .map(type_to_ide_string)
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+impl SymbolicatorRunner {
+    /// Create a new idle runner (one that does not actually symbolicate)
+    pub fn idle() -> Self {
+        let mtx_cvar = Arc::new((Mutex::new(RunnerState::Wait), Condvar::new()));
+        SymbolicatorRunner { mtx_cvar }
+    }
+
+    /// Create a new runner
+    pub fn new(
+        symbols: Arc<Mutex<Symbols>>,
+        sender: Sender<Result<BTreeMap<Symbol, Vec<Diagnostic>>>>,
+    ) -> Self {
+        let mtx_cvar = Arc::new((Mutex::new(RunnerState::Wait), Condvar::new()));
+        let thread_mtx_cvar = mtx_cvar.clone();
+        let runner = SymbolicatorRunner { mtx_cvar };
+
+        thread::Builder::new()
+            .stack_size(STACK_SIZE_BYTES)
+            .spawn(move || {
+                let (mtx, cvar) = &*thread_mtx_cvar;
+                // Locations opened in the IDE (files or directories) for which manifest file is missing
+                let mut missing_manifests = BTreeSet::new();
+                // infinite loop to wait for symbolication requests
+                eprintln!("starting symbolicator runner loop");
+                loop {
+                    let starting_path_opt = {
+                        // hold the lock only as long as it takes to get the data, rather than through
+                        // the whole symbolication process (hence a separate scope here)
+                        let mut symbolicate = mtx.lock().unwrap();
+                        match symbolicate.clone() {
+                            RunnerState::Quit => break,
+                            RunnerState::Run(root_dir) => {
+                                *symbolicate = RunnerState::Wait;
+                                Some(root_dir)
+                            }
+                            RunnerState::Wait => {
+                                // wait for next request
+                                symbolicate = cvar.wait(symbolicate).unwrap();
+                                match symbolicate.clone() {
+                                    RunnerState::Quit => break,
+                                    RunnerState::Run(root_dir) => {
+                                        *symbolicate = RunnerState::Wait;
+                                        Some(root_dir)
+                                    }
+                                    RunnerState::Wait => None,
+                                }
+                            }
+                        }
+                    };
+                    if let Some(starting_path) = starting_path_opt {
+                        let root_dir = Self::root_dir(&starting_path);
+                        if root_dir.is_none() && !missing_manifests.contains(&starting_path) {
+                            eprintln!("reporting missing manifest");
+
+                            // report missing manifest file only once to avoid cluttering IDE's UI in
+                            // cases when developer indeed intended to open a standalone file that was
+                            // not meant to compile
+                            missing_manifests.insert(starting_path);
+                            if let Err(err) = sender.send(Err(anyhow!(
+                                "Unable to find package manifest. Make sure that
+                            the source files are located in a sub-directory of a package containing
+                            a Move.toml file. "
+                            ))) {
+                                eprintln!("could not pass missing manifest error: {:?}", err);
+                            }
+                            continue;
+                        }
+                        eprintln!("symbolication started");
+                        match Symbolicator::get_symbols(root_dir.unwrap().as_path()) {
+                            Ok((symbols_opt, lsp_diagnostics)) => {
+                                eprintln!("symbolication finished");
+                                if let Some(new_symbols) = symbols_opt {
+                                    // merge the new symbols with the old ones to support a
+                                    // (potentially) new project/package that symbolication information
+                                    // was built for
+                                    //
+                                    // TODO: we may consider "unloading" symbolication information when
+                                    // files/directories are being closed but as with other performance
+                                    // optimizations (e.g. incrementalizatino of the vfs), let's wait
+                                    // until we know we actually need it
+                                    let mut old_symbols = symbols.lock().unwrap();
+                                    (*old_symbols).merge(new_symbols);
+                                }
+                                // set/reset (previous) diagnostics
+                                if let Err(err) = sender.send(Ok(lsp_diagnostics)) {
+                                    eprintln!("could not pass diagnostics: {:?}", err);
+                                }
+                            }
+                            Err(err) => {
+                                eprintln!("symbolication failed: {:?}", err);
+                                if let Err(err) = sender.send(Err(err)) {
+                                    eprintln!("could not pass compiler error: {:?}", err);
+                                }
+                            }
+                        }
+                    }
+                }
+            })
+            .unwrap();
+
+        runner
+    }
+
+    pub fn run(&self, starting_path: PathBuf) {
+        eprintln!("scheduling run for {:?}", starting_path);
+        let (mtx, cvar) = &*self.mtx_cvar;
+        let mut symbolicate = mtx.lock().unwrap();
+        *symbolicate = RunnerState::Run(starting_path);
+        cvar.notify_one();
+        eprintln!("scheduled run");
+    }
+
+    pub fn quit(&self) {
+        let (mtx, cvar) = &*self.mtx_cvar;
+        let mut symbolicate = mtx.lock().unwrap();
+        *symbolicate = RunnerState::Quit;
+        cvar.notify_one();
+    }
+
+    /// Finds manifest file in a (sub)directory of the starting path passed as argument
+    pub fn root_dir(starting_path: &Path) -> Option<PathBuf> {
+        let mut current_path_opt = Some(starting_path);
+        while current_path_opt.is_some() {
+            let current_path = current_path_opt.unwrap();
+            let manifest_path = current_path.join("Move.toml");
+            if manifest_path.is_file() {
+                return Some(current_path.to_path_buf());
+            }
+            current_path_opt = current_path.parent();
+        }
+        None
+    }
+}
+
+impl UseDef {
+    fn new(
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_fhash: FileHash,
+        use_start: Position,
+        def_fhash: FileHash,
+        def_start: Position,
+        use_name: &Symbol,
+        use_type: IdentType,
+        type_def_loc: Option<DefLoc>,
+        doc_string: String,
+    ) -> Self {
+        let def_loc = DefLoc {
+            fhash: def_fhash,
+            start: def_start,
+        };
+        let col_end = use_start.character + use_name.len() as u32;
+        let use_loc = UseLoc {
+            fhash: use_fhash,
+            start: use_start,
+            col_end,
+        };
+
+        references.entry(def_loc).or_default().insert(use_loc);
+        Self {
+            col_start: use_start.character,
+            col_end,
+            use_type,
+            def_loc,
+            type_def_loc,
+            doc_string,
+        }
+    }
+}
+
+impl Ord for UseDef {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.col_start.cmp(&other.col_start)
+    }
+}
+
+impl PartialOrd for UseDef {
+    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for UseDef {
+    fn eq(&self, other: &Self) -> bool {
+        self.col_start == other.col_start
+    }
+}
+
+impl UseDefMap {
+    fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    fn insert(&mut self, key: u32, val: UseDef) {
+        self.0.entry(key).or_default().insert(val);
+    }
+
+    fn get(&self, key: u32) -> Option<BTreeSet<UseDef>> {
+        self.0.get(&key).cloned()
+    }
+
+    fn elements(self) -> BTreeMap<u32, BTreeSet<UseDef>> {
+        self.0
+    }
+
+    fn extend(&mut self, use_defs: BTreeMap<u32, BTreeSet<UseDef>>) {
+        self.0.extend(use_defs);
+    }
+}
+
+impl FunctionIdentTypeMap {
+    fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    fn insert(&mut self, key: String, val: IdentType) {
+        self.0.entry(key).or_insert_with(|| val);
+    }
+
+    pub fn contains_key(self, key: &String) -> bool {
+        self.0.contains_key(key)
+    }
+}
+
+impl Symbols {
+    pub fn merge(&mut self, other: Self) {
+        for (k, v) in other.references {
+            self.references.entry(k).or_default().extend(v);
+        }
+        self.file_use_defs.extend(other.file_use_defs);
+        self.file_name_mapping.extend(other.file_name_mapping);
+        self.file_mods.extend(other.file_mods);
+    }
+
+    pub fn file_mods(&self) -> &BTreeMap<PathBuf, BTreeSet<ModuleDefs>> {
+        &self.file_mods
+    }
+}
+
+impl Symbolicator {
+    /// Main driver to get symbols for the whole package. Returned symbols is an option as only the
+    /// correctly computed symbols should be a replacement for the old set - if symbols are not
+    /// actually (re)computed and the diagnostics are returned, the old symbolic information should
+    /// be retained even if it's getting out-of-date.
+    pub fn get_symbols(
+        pkg_path: &Path,
+    ) -> Result<(Option<Symbols>, BTreeMap<Symbol, Vec<Diagnostic>>)> {
+        let build_config = move_package::BuildConfig {
+            test_mode: true,
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            ..Default::default()
+        };
+
+        eprintln!("symbolicating {:?}", pkg_path);
+
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolution_graph =
+            build_config.resolution_graph_for_package(pkg_path, &mut Vec::new())?;
+
+        // get source files to be able to correlate positions (in terms of byte offsets) with actual
+        // file locations (in terms of line/column numbers)
+        let source_files = &resolution_graph.file_sources();
+        let mut files = SimpleFiles::new();
+        let mut file_id_mapping = HashMap::new();
+        let mut file_id_to_lines = HashMap::new();
+        let mut file_name_mapping = BTreeMap::new();
+        for (fhash, (fname, source)) in source_files {
+            let id = files.add(*fname, source.clone());
+            file_id_mapping.insert(*fhash, id);
+            file_name_mapping.insert(*fhash, *fname);
+            let lines: Vec<String> = source.lines().map(String::from).collect();
+            file_id_to_lines.insert(id, lines);
+        }
+
+        let build_plan = BuildPlan::create(resolution_graph)?;
+        let mut typed_ast = None;
+        let mut diagnostics = None;
+        build_plan.compile_with_driver(&mut std::io::sink(), |compiler| {
+            let (files, compilation_result) = compiler.run::<PASS_TYPING>()?;
+            let (_, compiler) = match compilation_result {
+                Ok(v) => v,
+                Err(diags) => {
+                    let failure = true;
+                    diagnostics = Some((diags, failure));
+                    eprintln!("typed AST compilation failed");
+                    return Ok((files, vec![]));
+                }
+            };
+            eprintln!("compiled to typed AST");
+            let (compiler, typed_program) = compiler.into_ast();
+            typed_ast = Some(typed_program.clone());
+            eprintln!("compiling to bytecode");
+            let compilation_result = compiler.at_typing(typed_program).build();
+            let (units, diags) = match compilation_result {
+                Ok(v) => v,
+                Err(diags) => {
+                    let failure = false;
+                    diagnostics = Some((diags, failure));
+                    eprintln!("bytecode compilation failed");
+                    return Ok((files, vec![]));
+                }
+            };
+            // warning diagnostics (if any) since compilation succeeded
+            if !diags.is_empty() {
+                // assign only if non-empty, otherwise return None to reset previous diagnostics
+                let failure = false;
+                diagnostics = Some((diags, failure));
+            }
+            eprintln!("compiled to bytecode");
+            Ok((files, units))
+        })?;
+
+        let mut ide_diagnostics = lsp_empty_diagnostics(&file_name_mapping);
+        if let Some((compiler_diagnostics, failure)) = diagnostics {
+            let lsp_diagnostics = lsp_diagnostics(
+                &compiler_diagnostics.into_codespan_format(),
+                &files,
+                &file_id_mapping,
+                &file_name_mapping,
+            );
+            // start with empty diagnostics for all files and replace them with actual diagnostics
+            // only for files that have failures/warnings so that diagnostics for all other files
+            // (that no longer have failures/warnings) are reset
+            ide_diagnostics.extend(lsp_diagnostics);
+            if failure {
+                // just return diagnostics as we don't have typed AST that we can use to compute
+                // symbolication information
+                debug_assert!(typed_ast.is_none());
+                return Ok((None, ide_diagnostics));
+            }
+        }
+
+        let modules = &typed_ast.unwrap().inner.modules;
+
+        let mut mod_outer_defs = BTreeMap::new();
+        let mut mod_use_defs = BTreeMap::new();
+        let mut file_mods = BTreeMap::new();
+
+        for (pos, module_ident, module_def) in modules {
+            let (defs, symbols) = Self::get_mod_outer_defs(
+                &pos,
+                &sp(pos, *module_ident),
+                module_def,
+                &files,
+                &file_id_mapping,
+            );
+
+            let cloned_defs = defs.clone();
+            let path = file_name_mapping.get(&cloned_defs.fhash.clone()).unwrap();
+            file_mods
+                .entry(
+                    dunce::canonicalize(path.as_str())
+                        .unwrap_or_else(|_| PathBuf::from(path.as_str())),
+                )
+                .or_insert_with(BTreeSet::new)
+                .insert(cloned_defs);
+
+            mod_outer_defs.insert(*module_ident, defs);
+            mod_use_defs.insert(*module_ident, symbols);
+        }
+
+        eprintln!("get_symbols loaded file_mods length: {}", file_mods.len());
+
+        let mut symbolicator = Symbolicator {
+            mod_outer_defs,
+            files,
+            file_id_mapping,
+            file_id_to_lines,
+            type_params: BTreeMap::new(),
+            current_mod: None,
+        };
+
+        let mut references = BTreeMap::new();
+        let mut file_use_defs = BTreeMap::new();
+        let mut function_ident_type = FunctionIdentTypeMap::new();
+
+        for (pos, module_ident, module_def) in modules {
+            let mut use_defs = mod_use_defs.remove(module_ident).unwrap();
+            symbolicator.current_mod = Some(sp(pos, *module_ident));
+            symbolicator.mod_symbols(
+                module_def,
+                &mut references,
+                &mut use_defs,
+                &mut function_ident_type,
+            );
+
+            let fpath = match source_files.get(&pos.file_hash()) {
+                Some((p, _)) => p,
+                None => continue,
+            };
+
+            let fpath_buffer = dunce::canonicalize(fpath.as_str())
+                .unwrap_or_else(|_| PathBuf::from(fpath.as_str()));
+
+            file_use_defs
+                .entry(fpath_buffer)
+                .or_insert_with(UseDefMap::new)
+                .extend(use_defs.elements());
+        }
+
+        let symbols = Symbols {
+            references,
+            file_use_defs,
+            file_name_mapping,
+            file_mods,
+        };
+
+        eprintln!("get_symbols load complete");
+
+        Ok((Some(symbols), ide_diagnostics))
+    }
+
+    /// Get empty symbols
+    pub fn empty_symbols() -> Symbols {
+        Symbols {
+            file_use_defs: BTreeMap::new(),
+            references: BTreeMap::new(),
+            file_name_mapping: BTreeMap::new(),
+            file_mods: BTreeMap::new(),
+        }
+    }
+
+    /// Main AST traversal functions
+
+    /// Get symbols for outer definitions in the module (functions, structs, and consts)
+    fn get_mod_outer_defs(
+        loc: &Loc,
+        mod_ident: &ModuleIdent,
+        mod_def: &ModuleDefinition,
+        files: &SimpleFiles<Symbol, String>,
+        file_id_mapping: &HashMap<FileHash, usize>,
+    ) -> (ModuleDefs, UseDefMap) {
+        let mut structs = BTreeMap::new();
+        let mut constants = BTreeMap::new();
+        let mut functions = BTreeMap::new();
+
+        for (pos, name, def) in &mod_def.structs {
+            // process field structs first
+            let mut field_defs = vec![];
+            if let StructFields::Defined(fields) = &def.fields {
+                for (fpos, fname, (_, _)) in fields {
+                    let start = match Self::get_start_loc(&fpos, files, file_id_mapping) {
+                        Some(s) => s,
+                        None => {
+                            debug_assert!(false);
+                            continue;
+                        }
+                    };
+                    field_defs.push(FieldDef {
+                        name: *fname,
+                        start,
+                    });
+                }
+            };
+
+            // process the struct itself
+            let name_start = match Self::get_start_loc(&pos, files, file_id_mapping) {
+                Some(s) => s,
+                None => {
+                    debug_assert!(false);
+                    continue;
+                }
+            };
+
+            structs.insert(
+                *name,
+                StructDef {
+                    name_start,
+                    field_defs,
+                },
+            );
+        }
+
+        for (pos, name, _) in &mod_def.constants {
+            let name_start = match Self::get_start_loc(&pos, files, file_id_mapping) {
+                Some(s) => s,
+                None => {
+                    debug_assert!(false);
+                    continue;
+                }
+            };
+            constants.insert(*name, name_start);
+        }
+
+        for (pos, name, fun) in &mod_def.functions {
+            let name_start = match Self::get_start_loc(&pos, files, file_id_mapping) {
+                Some(s) => s,
+                None => {
+                    debug_assert!(false);
+                    continue;
+                }
+            };
+            let ident_type = IdentType::FunctionType(
+                mod_ident.value,
+                *name,
+                fun.signature
+                    .type_parameters
+                    .iter()
+                    .map(|t| sp(t.user_specified_name.loc, Type_::Param(t.clone())))
+                    .collect(),
+                fun.signature
+                    .parameters
+                    .iter()
+                    .map(|(_, n, _)| n.value.name)
+                    .collect(),
+                fun.signature
+                    .parameters
+                    .iter()
+                    .map(|(_, _, t)| t.clone())
+                    .collect(),
+                fun.signature.return_type.clone(),
+            );
+            functions.insert(
+                *name,
+                FunctionDef {
+                    name: *name,
+                    start: name_start,
+                    attrs: fun
+                        .attributes
+                        .clone()
+                        .iter()
+                        .map(|(_loc, name, _attr)| name.to_string())
+                        .collect(),
+                    ident_type,
+                },
+            );
+        }
+
+        let use_def_map = UseDefMap::new();
+
+        let name = mod_ident.value;
+        let fhash = loc.file_hash();
+        let start = match Self::get_start_loc(loc, files, file_id_mapping) {
+            Some(s) => s,
+            None => {
+                debug_assert!(false);
+                return (
+                    ModuleDefs {
+                        fhash,
+                        start: Position {
+                            line: 0,
+                            character: 0,
+                        },
+                        name,
+                        structs,
+                        constants,
+                        functions,
+                    },
+                    use_def_map,
+                );
+            }
+        };
+
+        let module_defs = ModuleDefs {
+            name,
+            start,
+            fhash,
+            structs,
+            constants,
+            functions,
+        };
+
+        (module_defs, use_def_map)
+    }
+
+    /// Get symbols for the whole module
+    fn mod_symbols(
+        &mut self,
+        mod_def: &ModuleDefinition,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        function_ident_type: &mut FunctionIdentTypeMap,
+    ) {
+        for (pos, name, fun) in &mod_def.functions {
+            // enter self-definition for function name (unwrap safe - done when inserting def)
+            let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+
+            let mod_ident = self.current_mod.unwrap();
+
+            let mod_def = self.mod_outer_defs.get(&mod_ident.value).unwrap();
+            let fun_def = mod_def.functions.get(name).unwrap();
+            let use_type = fun_def.ident_type.clone();
+
+            let fun_type_def = self.ident_type_def_loc(&use_type);
+            let use_def = UseDef::new(
+                references,
+                pos.file_hash(),
+                name_start,
+                pos.file_hash(),
+                name_start,
+                name,
+                use_type.clone(),
+                fun_type_def,
+                doc_string,
+            );
+
+            use_defs.insert(name_start.line, use_def);
+            self.fun_symbols(fun, references, use_defs);
+            function_ident_type.insert(name.to_string(), use_type);
+        }
+
+        for (pos, name, c) in &mod_def.constants {
+            // enter self-definition for const name (unwrap safe - done when inserting def)
+            let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+            let ident_type = IdentType::RegularType(c.signature.clone());
+            let ident_type_def = self.ident_type_def_loc(&ident_type);
+            use_defs.insert(
+                name_start.line,
+                UseDef::new(
+                    references,
+                    pos.file_hash(),
+                    name_start,
+                    pos.file_hash(),
+                    name_start,
+                    name,
+                    ident_type,
+                    ident_type_def,
+                    doc_string,
+                ),
+            );
+        }
+
+        for (pos, name, struct_def) in &mod_def.structs {
+            // enter self-definition for struct name (unwrap safe - done when inserting def)
+            let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+            let ident_type = IdentType::RegularType(Self::create_struct_type(
+                self.current_mod.unwrap(),
+                StructName(sp(pos, *name)),
+                pos,
+                vec![],
+            ));
+            let ident_type_def = self.ident_type_def_loc(&ident_type);
+            use_defs.insert(
+                name_start.line,
+                UseDef::new(
+                    references,
+                    pos.file_hash(),
+                    name_start,
+                    pos.file_hash(),
+                    name_start,
+                    name,
+                    ident_type,
+                    ident_type_def,
+                    doc_string,
+                ),
+            );
+
+            self.struct_symbols(struct_def, references, use_defs);
+        }
+    }
+
+    /// Get symbols for function a definition
+    fn struct_symbols(
+        &mut self,
+        struct_def: &StructDefinition,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        // create scope designated to contain type parameters (if any)
+        let mut tp_scope = BTreeMap::new();
+        for stp in &struct_def.type_parameters {
+            self.add_type_param(&stp.param, &mut tp_scope, references, use_defs);
+        }
+        self.type_params = tp_scope;
+        if let StructFields::Defined(fields) = &struct_def.fields {
+            for (fpos, fname, (_, t)) in fields {
+                self.add_type_id_use_def(t, references, use_defs);
+                // enter self-definition for field name (unwrap safe - done when inserting def)
+                let start = Self::get_start_loc(&fpos, &self.files, &self.file_id_mapping).unwrap();
+                let ident_type = IdentType::RegularType(t.clone());
+                let ident_type_def = self.ident_type_def_loc(&ident_type);
+                let doc_string = self.extract_doc_string(&start, &fpos.file_hash());
+                use_defs.insert(
+                    start.line,
+                    UseDef::new(
+                        references,
+                        fpos.file_hash(),
+                        start,
+                        fpos.file_hash(),
+                        start,
+                        fname,
+                        ident_type,
+                        ident_type_def,
+                        doc_string,
+                    ),
+                );
+            }
+        }
+    }
+
+    /// Get symbols for function a definition
+    fn fun_symbols(
+        &mut self,
+        fun: &Function,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        // create scope designated to contain type parameters (if any)
+        let mut tp_scope = BTreeMap::new();
+        for tp in &fun.signature.type_parameters {
+            self.add_type_param(tp, &mut tp_scope, references, use_defs);
+        }
+        self.type_params = tp_scope;
+
+        // scope for the main function scope (for parameters and
+        // function body)
+        let mut scope = OrdMap::new();
+
+        for (_, pname, ptype) in &fun.signature.parameters {
+            self.add_type_id_use_def(ptype, references, use_defs);
+
+            // add definition of the parameter
+            self.add_def(
+                &pname.loc,
+                &pname.value.name,
+                &mut scope,
+                references,
+                use_defs,
+                ptype.clone(),
+            );
+        }
+
+        match &fun.body.value {
+            FunctionBody_::Defined(sequence) => {
+                for seq_item in sequence {
+                    self.seq_item_symbols(&mut scope, seq_item, references, use_defs);
+                }
+            }
+            FunctionBody_::Native => (),
+        }
+
+        // process return types
+        self.add_type_id_use_def(&fun.signature.return_type, references, use_defs);
+
+        // clear type params from the scope
+        self.type_params.clear();
+    }
+
+    fn get_start_loc(
+        pos: &Loc,
+        files: &SimpleFiles<Symbol, String>,
+        file_id_mapping: &HashMap<FileHash, usize>,
+    ) -> Option<Position> {
+        get_loc(&pos.file_hash(), pos.start(), files, file_id_mapping)
+    }
+
+    /// Extracts the docstring (/// or /** ... */) for a given definition by traversing up from the line definition
+    fn extract_doc_string(&self, name_start: &Position, file_hash: &FileHash) -> String {
+        let mut doc_string = String::new();
+        let file_id = match self.file_id_mapping.get(file_hash) {
+            None => return doc_string,
+            Some(v) => v,
+        };
+
+        let file_lines = match self.file_id_to_lines.get(file_id) {
+            None => return doc_string,
+            Some(v) => v,
+        };
+
+        if name_start.line == 0 {
+            return doc_string;
+        }
+
+        let mut iter = (name_start.line - 1) as usize;
+        let mut line_before = file_lines[iter].trim();
+
+        // Detect the two different types of docstrings
+        if line_before.starts_with("///") {
+            while let Some(stripped_line) = line_before.strip_prefix("///") {
+                doc_string = format!("{}\n{}", stripped_line.trim(), doc_string);
+                if iter == 0 {
+                    break;
+                }
+                iter -= 1;
+                line_before = file_lines[iter].trim();
+            }
+        } else if line_before.ends_with("*/") {
+            let mut doc_string_found = false;
+            line_before = file_lines[iter].strip_suffix("*/").unwrap_or("").trim();
+
+            // Loop condition is a safe guard.
+            while !doc_string_found {
+                // We found the start of the multi-line comment/docstring
+                if line_before.starts_with("/*") {
+                    let is_doc = line_before.starts_with("/**") && !line_before.starts_with("/***");
+
+                    // Invalid doc_string start prefix so return empty doc string.
+                    if !is_doc {
+                        return String::new();
+                    }
+
+                    line_before = line_before.strip_prefix("/**").unwrap_or("").trim();
+                    doc_string_found = true;
+                }
+
+                doc_string = format!("{}\n{}", line_before, doc_string);
+
+                if iter == 0 {
+                    break;
+                }
+
+                iter -= 1;
+                line_before = file_lines[iter].trim();
+            }
+
+            // No doc_string found - return String::new();
+            if !doc_string_found {
+                return String::new();
+            }
+        }
+
+        doc_string
+    }
+
+    /// Get symbols for a sequence representing function body
+    fn seq_item_symbols(
+        &self,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        seq_item: &SequenceItem,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        use SequenceItem_ as I;
+        match &seq_item.value {
+            I::Seq(e) => self.exp_symbols(e, scope, references, use_defs),
+            I::Declare(lvalues) => {
+                self.lvalue_list_symbols(true, lvalues, scope, references, use_defs)
+            }
+            I::Bind(lvalues, opt_types, e) => {
+                // process RHS first to avoid accidentally binding its identifiers to LHS (which now
+                // will be put into the current scope only after RHS is processed)
+                self.exp_symbols(e, scope, references, use_defs);
+                for opt_t in opt_types {
+                    match opt_t {
+                        Some(t) => self.add_type_id_use_def(t, references, use_defs),
+                        None => (),
+                    }
+                }
+                self.lvalue_list_symbols(true, lvalues, scope, references, use_defs);
+            }
+        }
+    }
+
+    /// Get symbols for a list of lvalues
+    fn lvalue_list_symbols(
+        &self,
+        define: bool,
+        lvalues: &LValueList,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        for lval in &lvalues.value {
+            self.lvalue_symbols(define, lval, scope, references, use_defs);
+        }
+    }
+
+    /// Get symbols for a single lvalue
+    fn lvalue_symbols(
+        &self,
+        define: bool,
+        lval: &LValue,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        match &lval.value {
+            LValue_::Var { var, ty: t, .. } => {
+                if define {
+                    self.add_def(
+                        &var.loc,
+                        &var.value.name,
+                        scope,
+                        references,
+                        use_defs,
+                        *t.clone(),
+                    );
+                } else {
+                    self.add_local_use_def(
+                        &var.value.name,
+                        &var.loc,
+                        references,
+                        scope,
+                        use_defs,
+                        *t.clone(),
+                    )
+                }
+            }
+            LValue_::Unpack(ident, name, tparams, fields) => {
+                self.unpack_symbols(
+                    define, ident, name, tparams, fields, scope, references, use_defs,
+                );
+            }
+            LValue_::BorrowUnpack(_, ident, name, tparams, fields) => {
+                self.unpack_symbols(
+                    define, ident, name, tparams, fields, scope, references, use_defs,
+                );
+            }
+            LValue_::Ignore => (),
+        }
+    }
+
+    /// Get symbols for the unpack statement
+    fn unpack_symbols(
+        &self,
+        define: bool,
+        ident: &ModuleIdent,
+        name: &StructName,
+        tparams: &Vec<Type>,
+        fields: &Fields<(Type, LValue)>,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        // add use of the struct name
+        let typ = Self::create_struct_type(*ident, *name, name.loc(), tparams.clone());
+        self.add_struct_use_def(
+            ident,
+            &name.value(),
+            &name.loc(),
+            references,
+            use_defs,
+            &typ,
+        );
+        for (fpos, fname, (_, (t, lvalue))) in fields {
+            // add use of the field name
+            self.add_field_use_def(
+                &ident.value,
+                &name.value(),
+                fname,
+                &fpos,
+                references,
+                use_defs,
+                t,
+            );
+            // add definition or use of a variable used for struct field unpacking
+            self.lvalue_symbols(define, lvalue, scope, references, use_defs);
+        }
+        // add type params
+        for t in tparams {
+            self.add_type_id_use_def(t, references, use_defs);
+        }
+    }
+
+    /// Get symbols for an expression
+    fn exp_symbols(
+        &self,
+        exp: &Exp,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        use UnannotatedExp_ as E;
+        match &exp.exp.value {
+            E::Move {
+                from_user: _,
+                var: v,
+            } => self.add_local_use_def(
+                &v.value.name,
+                &v.loc,
+                references,
+                scope,
+                use_defs,
+                exp.ty.clone(),
+            ),
+            E::Copy {
+                from_user: _,
+                var: v,
+            } => self.add_local_use_def(
+                &v.value.name,
+                &v.loc,
+                references,
+                scope,
+                use_defs,
+                exp.ty.clone(),
+            ),
+            E::Use(v) => self.add_local_use_def(
+                &v.value.name,
+                &v.loc,
+                references,
+                scope,
+                use_defs,
+                exp.ty.clone(),
+            ),
+            E::Constant(mod_ident_opt, name) => self.add_const_use_def(
+                mod_ident_opt,
+                &name.value(),
+                &name.loc(),
+                references,
+                use_defs,
+                exp.ty.clone(),
+            ),
+            E::ModuleCall(mod_call) => self.mod_call_symbols(mod_call, scope, references, use_defs),
+            E::Builtin(builtin_fun, exp) => {
+                use BuiltinFunction_ as BF;
+                match &builtin_fun.value {
+                    BF::Freeze(t) => self.add_type_id_use_def(t, references, use_defs),
+                    BF::Assert(_) => (),
+                }
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::Vector(_, _, t, exp) => {
+                self.add_type_id_use_def(t, references, use_defs);
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::IfElse(cond, t, f) => {
+                self.exp_symbols(cond, scope, references, use_defs);
+                self.exp_symbols(t, scope, references, use_defs);
+                self.exp_symbols(f, scope, references, use_defs);
+            }
+            E::While(cond, body) => {
+                self.exp_symbols(cond, scope, references, use_defs);
+                self.exp_symbols(body, scope, references, use_defs);
+            }
+            E::Loop { has_break: _, body } => {
+                self.exp_symbols(body, scope, references, use_defs);
+            }
+            E::Block(sequence) => {
+                // a block is a new var scope
+                let mut new_scope = scope.clone();
+                for seq_item in sequence {
+                    self.seq_item_symbols(&mut new_scope, seq_item, references, use_defs);
+                }
+            }
+            E::Assign(lvalues, opt_types, e) => {
+                self.lvalue_list_symbols(false, lvalues, scope, references, use_defs);
+                for opt_t in opt_types {
+                    match opt_t {
+                        Some(t) => self.add_type_id_use_def(t, references, use_defs),
+                        None => (),
+                    }
+                }
+                self.exp_symbols(e, scope, references, use_defs);
+            }
+            E::Mutate(lhs, rhs) => {
+                self.exp_symbols(lhs, scope, references, use_defs);
+                self.exp_symbols(rhs, scope, references, use_defs);
+            }
+            E::Return(exp) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::Abort(exp) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::Dereference(exp) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::UnaryExp(_, exp) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::BinopExp(lhs, _, _, rhs) => {
+                self.exp_symbols(lhs, scope, references, use_defs);
+                self.exp_symbols(rhs, scope, references, use_defs);
+            }
+            E::Pack(ident, name, tparams, fields) => {
+                self.pack_symbols(ident, name, tparams, fields, scope, references, use_defs);
+            }
+            E::ExpList(list_items) => {
+                for item in list_items {
+                    let exp = match item {
+                        // TODO: are types important for symbolication here (and, more generally,
+                        // what's a splat?)
+                        ExpListItem::Single(e, _) => e,
+                        ExpListItem::Splat(_, e, _) => e,
+                    };
+                    self.exp_symbols(exp, scope, references, use_defs);
+                }
+            }
+            E::Borrow(_, exp, field) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+                // get expression type to match fname to a struct def
+                self.add_field_type_use_def(
+                    &exp.ty,
+                    &field.value(),
+                    &field.loc(),
+                    references,
+                    use_defs,
+                );
+            }
+            E::TempBorrow(_, exp) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+            }
+            E::BorrowLocal(_, var) => self.add_local_use_def(
+                &var.value.name,
+                &var.loc,
+                references,
+                scope,
+                use_defs,
+                exp.ty.clone(),
+            ),
+            E::Cast(exp, t) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+                self.add_type_id_use_def(t, references, use_defs);
+            }
+            E::Annotate(exp, t) => {
+                self.exp_symbols(exp, scope, references, use_defs);
+                self.add_type_id_use_def(t, references, use_defs);
+            }
+
+            _ => (),
+        }
+    }
+
+    /// Add a type for a struct field given its type
+    fn add_field_type_use_def(
+        &self,
+        field_type: &Type,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        let sp!(_, typ) = field_type;
+        match typ {
+            Type_::Ref(_, t) => {
+                self.add_field_type_use_def(t, use_name, use_pos, references, use_defs)
+            }
+            Type_::Apply(_, sp!(_, TypeName_::ModuleType(sp!(_, mod_ident), struct_name)), _) => {
+                self.add_field_use_def(
+                    mod_ident,
+                    &struct_name.value(),
+                    use_name,
+                    use_pos,
+                    references,
+                    use_defs,
+                    field_type,
+                );
+            }
+            _ => (),
+        }
+    }
+
+    fn mod_call_symbols(
+        &self,
+        mod_call: &ModuleCall,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        let mod_ident = mod_call.module;
+        let mod_def = self.mod_outer_defs.get(&mod_ident.value).unwrap();
+
+        let fun_def = match mod_def.functions.get(&mod_call.name.value()) {
+            Some(v) => v,
+            None => return,
+        };
+        let use_type = fun_def.ident_type.clone();
+
+        self.add_fun_use_def(
+            &mod_call.module,
+            &mod_call.name.value(),
+            &mod_call.name.loc(),
+            references,
+            use_defs,
+            use_type,
+        );
+
+        // handle type parameters
+        for t in &mod_call.type_arguments {
+            self.add_type_id_use_def(t, references, use_defs);
+        }
+
+        // handle arguments
+        self.exp_symbols(&mod_call.arguments, scope, references, use_defs);
+    }
+
+    /// Get symbols for the pack expression
+    fn pack_symbols(
+        &self,
+        ident: &ModuleIdent,
+        name: &StructName,
+        tparams: &Vec<Type>,
+        fields: &Fields<(Type, Exp)>,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        // add use of the struct name
+        let typ = Self::create_struct_type(*ident, *name, name.loc(), tparams.clone());
+        self.add_struct_use_def(
+            ident,
+            &name.value(),
+            &name.loc(),
+            references,
+            use_defs,
+            &typ,
+        );
+        for (fpos, fname, (_, (t, init_exp))) in fields {
+            // add use of the field name
+            self.add_field_use_def(
+                &ident.value,
+                &name.value(),
+                fname,
+                &fpos,
+                references,
+                use_defs,
+                t,
+            );
+            // add field initialization expression
+            self.exp_symbols(init_exp, scope, references, use_defs);
+        }
+        // add type params
+        for t in tparams {
+            self.add_type_id_use_def(t, references, use_defs);
+        }
+    }
+
+    /// Helper functions
+
+    /// Add type parameter to a scope holding type params
+    fn add_type_param(
+        &mut self,
+        tp: &TParam,
+        tp_scope: &mut BTreeMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        match Self::get_start_loc(
+            &tp.user_specified_name.loc,
+            &self.files,
+            &self.file_id_mapping,
+        ) {
+            Some(start) => {
+                let tname = tp.user_specified_name.value;
+                let fhash = tp.user_specified_name.loc.file_hash();
+                // enter self-definition for type param
+                let ident_type = IdentType::RegularType(sp(
+                    tp.user_specified_name.loc,
+                    Type_::Param(tp.clone()),
+                ));
+                let ident_type_def = self.ident_type_def_loc(&ident_type);
+
+                let doc_string = self.extract_doc_string(&start, &fhash);
+                use_defs.insert(
+                    start.line,
+                    UseDef::new(
+                        references,
+                        fhash,
+                        start,
+                        fhash,
+                        start,
+                        &tname,
+                        ident_type,
+                        ident_type_def,
+                        doc_string,
+                    ),
+                );
+                let exists = tp_scope.insert(tname, DefLoc { fhash, start });
+                debug_assert!(exists.is_none());
+            }
+            None => {
+                debug_assert!(false);
+            }
+        };
+    }
+
+    /// Add use of one of identifiers defined at the module level
+    fn add_outer_use_def(
+        &self,
+        module_ident: &ModuleIdent_,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        mut add_fn: impl FnMut(&Symbol, Position, &ModuleDefs),
+    ) {
+        let name_start = match Self::get_start_loc(use_pos, &self.files, &self.file_id_mapping) {
+            Some(v) => v,
+            None => {
+                debug_assert!(false);
+                return;
+            }
+        };
+
+        let mod_defs = match self.mod_outer_defs.get(module_ident) {
+            Some(v) => v,
+            None => {
+                debug_assert!(false);
+                return;
+            }
+        };
+        add_fn(use_name, name_start, mod_defs);
+    }
+
+    /// Add use of a const identifier
+    fn add_const_use_def(
+        &self,
+        module_ident_opt: &Option<ModuleIdent>,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        use_type: Type,
+    ) {
+        let module_ident = match module_ident_opt {
+            Some(v) => v.value,
+            None => self.current_mod.unwrap().value,
+        };
+
+        self.add_outer_use_def(
+            &module_ident,
+            use_name,
+            use_pos,
+            |use_name, name_start, mod_defs| match mod_defs.constants.get(use_name) {
+                Some(def_start) => {
+                    let ident_type = IdentType::RegularType(use_type.clone());
+                    let def_fhash = self.mod_outer_defs.get(&module_ident).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(def_start, &def_fhash);
+                    let ident_type_def = self.ident_type_def_loc(&ident_type);
+
+                    use_defs.insert(
+                        name_start.line,
+                        UseDef::new(
+                            references,
+                            use_pos.file_hash(),
+                            name_start,
+                            def_fhash,
+                            *def_start,
+                            use_name,
+                            ident_type,
+                            ident_type_def,
+                            doc_string,
+                        ),
+                    );
+                }
+                None => debug_assert!(false),
+            },
+        );
+    }
+
+    /// Add use of a function identifier
+    fn add_fun_use_def(
+        &self,
+        module_ident: &ModuleIdent,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        use_type: IdentType,
+    ) {
+        self.add_outer_use_def(
+            &module_ident.value,
+            use_name,
+            use_pos,
+            |use_name, name_start, mod_defs| match mod_defs.functions.get(use_name) {
+                Some(func_def) => {
+                    let def_fhash = self.mod_outer_defs.get(&module_ident.value).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(&func_def.start, &def_fhash);
+                    use_defs.insert(
+                        name_start.line,
+                        UseDef::new(
+                            references,
+                            use_pos.file_hash(),
+                            name_start,
+                            def_fhash,
+                            func_def.start,
+                            use_name,
+                            use_type.clone(),
+                            self.ident_type_def_loc(&use_type),
+                            doc_string,
+                        ),
+                    );
+                }
+                None => debug_assert!(false),
+            },
+        );
+    }
+
+    /// Add use of a struct identifier
+    fn add_struct_use_def(
+        &self,
+        sp!(_, module_ident): &ModuleIdent,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        use_type: &Type,
+    ) {
+        self.add_outer_use_def(
+            module_ident,
+            use_name,
+            use_pos,
+            |use_name, name_start, mod_defs| match mod_defs.structs.get(use_name) {
+                Some(def) => {
+                    let ident_type = IdentType::RegularType(use_type.clone());
+
+                    let ident_type_def = self.ident_type_def_loc(&ident_type);
+                    let def_fhash = self.mod_outer_defs.get(module_ident).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(&def.name_start, &def_fhash);
+                    use_defs.insert(
+                        name_start.line,
+                        UseDef::new(
+                            references,
+                            use_pos.file_hash(),
+                            name_start,
+                            def_fhash,
+                            def.name_start,
+                            use_name,
+                            ident_type,
+                            ident_type_def,
+                            doc_string,
+                        ),
+                    );
+                }
+                None => debug_assert!(false),
+            },
+        );
+    }
+
+    /// Add use of a struct field identifier
+    fn add_field_use_def(
+        &self,
+        module_ident: &ModuleIdent_,
+        struct_name: &Symbol,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        use_type: &Type,
+    ) {
+        self.add_outer_use_def(
+            module_ident,
+            use_name,
+            use_pos,
+            |use_name, name_start, mod_defs| match mod_defs.structs.get(struct_name) {
+                Some(def) => {
+                    for fdef in &def.field_defs {
+                        if fdef.name == *use_name {
+                            let ident_type = IdentType::RegularType(use_type.clone());
+                            let ident_type_def = self.ident_type_def_loc(&ident_type);
+
+                            let def_fhash = self.mod_outer_defs.get(module_ident).unwrap().fhash;
+                            let doc_string = self.extract_doc_string(&fdef.start, &def_fhash);
+                            use_defs.insert(
+                                name_start.line,
+                                UseDef::new(
+                                    references,
+                                    use_pos.file_hash(),
+                                    name_start,
+                                    def_fhash,
+                                    fdef.start,
+                                    use_name,
+                                    ident_type,
+                                    ident_type_def,
+                                    doc_string,
+                                ),
+                            );
+                        }
+                    }
+                }
+                None => debug_assert!(false),
+            },
+        );
+    }
+
+    /// Add use of a type identifier
+    fn add_type_id_use_def(
+        &self,
+        id_type: &Type,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+    ) {
+        let sp!(pos, typ) = id_type;
+        match typ {
+            Type_::Ref(_, t) => self.add_type_id_use_def(t, references, use_defs),
+            Type_::Param(tparam) => {
+                let sp!(use_pos, use_name) = tparam.user_specified_name;
+                match Self::get_start_loc(pos, &self.files, &self.file_id_mapping) {
+                    Some(name_start) => match self.type_params.get(&use_name) {
+                        Some(def_loc) => {
+                            let ident_type = IdentType::RegularType(id_type.clone());
+                            let ident_type_def = self.ident_type_def_loc(&ident_type);
+                            let doc_string =
+                                self.extract_doc_string(&def_loc.start, &def_loc.fhash);
+                            use_defs.insert(
+                                name_start.line,
+                                UseDef::new(
+                                    references,
+                                    use_pos.file_hash(),
+                                    name_start,
+                                    def_loc.fhash,
+                                    def_loc.start,
+                                    &use_name,
+                                    ident_type,
+                                    ident_type_def,
+                                    doc_string,
+                                ),
+                            );
+                        }
+                        None => debug_assert!(false),
+                    },
+                    None => debug_assert!(false), // a type param should not be missing
+                }
+            }
+            Type_::Apply(_, sp!(_, type_name), tparams) => {
+                if let TypeName_::ModuleType(mod_ident, struct_name) = type_name {
+                    self.add_struct_use_def(
+                        mod_ident,
+                        &struct_name.value(),
+                        &struct_name.loc(),
+                        references,
+                        use_defs,
+                        id_type,
+                    );
+                } // otherwise nothing to be done for other type names
+                for t in tparams {
+                    self.add_type_id_use_def(t, references, use_defs);
+                }
+            }
+            _ => (), // nothing to be done for the other types
+        }
+    }
+
+    /// Add a "generic" definition
+    fn add_def(
+        &self,
+        pos: &Loc,
+        name: &Symbol,
+        scope: &mut OrdMap<Symbol, DefLoc>,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        use_defs: &mut UseDefMap,
+        use_type: Type,
+    ) {
+        match Self::get_start_loc(pos, &self.files, &self.file_id_mapping) {
+            Some(name_start) => {
+                let def_loc = DefLoc {
+                    fhash: pos.file_hash(),
+                    start: name_start,
+                };
+                scope.insert(*name, def_loc);
+                // in other languages only one definition is allowed per scope but in move an (and
+                // in rust) a variable can be re-defined in the same scope replacing the previous
+                // definition
+
+                let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+
+                // enter self-definition for def name
+                let ident_type = IdentType::RegularType(use_type);
+                let ident_type_def = self.ident_type_def_loc(&ident_type);
+                use_defs.insert(
+                    name_start.line,
+                    UseDef::new(
+                        references,
+                        pos.file_hash(),
+                        name_start,
+                        pos.file_hash(),
+                        name_start,
+                        name,
+                        ident_type,
+                        ident_type_def,
+                        doc_string,
+                    ),
+                );
+            }
+            None => {
+                debug_assert!(false);
+            }
+        }
+    }
+
+    /// Add a use for and identifier whose definition is expected to be local to a function, and
+    /// pair it with an appropriate definition
+    fn add_local_use_def(
+        &self,
+        use_name: &Symbol,
+        use_pos: &Loc,
+        references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
+        scope: &OrdMap<Symbol, DefLoc>,
+        use_defs: &mut UseDefMap,
+        use_type: Type,
+    ) {
+        let name_start = match Self::get_start_loc(use_pos, &self.files, &self.file_id_mapping) {
+            Some(v) => v,
+            None => {
+                debug_assert!(false);
+                return;
+            }
+        };
+
+        if let Some(def_loc) = scope.get(use_name) {
+            let doc_string = self.extract_doc_string(&def_loc.start, &def_loc.fhash);
+            let ident_type = IdentType::RegularType(use_type);
+            let ident_type_def = self.ident_type_def_loc(&ident_type);
+            use_defs.insert(
+                name_start.line,
+                UseDef::new(
+                    references,
+                    use_pos.file_hash(),
+                    name_start,
+                    def_loc.fhash,
+                    def_loc.start,
+                    use_name,
+                    ident_type,
+                    ident_type_def,
+                    doc_string,
+                ),
+            );
+        } else {
+            debug_assert!(false);
+        }
+    }
+
+    fn create_struct_type(
+        module_ident: ModuleIdent,
+        struct_name: StructName,
+        loc: Loc,
+        types: Vec<Type>,
+    ) -> Type {
+        let type_name = sp(
+            module_ident.loc,
+            TypeName_::ModuleType(module_ident, struct_name),
+        );
+        sp(loc, Type_::Apply(None, type_name, types))
+    }
+
+    fn ident_type_def_loc(&self, ident_type: &IdentType) -> Option<DefLoc> {
+        match ident_type {
+            IdentType::RegularType(t) => self.type_def_loc(t),
+            IdentType::FunctionType(_, _, _, _, _, ret) => self.type_def_loc(ret),
+        }
+    }
+
+    fn type_def_loc(&self, sp!(_, t): &Type) -> Option<DefLoc> {
+        match t {
+            Type_::Ref(_, r) => self.type_def_loc(r),
+            Type_::Apply(_, sp!(_, TypeName_::ModuleType(sp!(_, mod_ident), struct_name)), _) => {
+                let mod_defs = match self.mod_outer_defs.get(mod_ident) {
+                    Some(v) => v,
+                    None => return None,
+                };
+                mod_defs
+                    .structs
+                    .get(&struct_name.value())
+                    .map(|struct_def| {
+                        let fhash = mod_defs.fhash;
+                        let start = struct_def.name_start;
+                        DefLoc { fhash, start }
+                    })
+            }
+            _ => None,
+        }
+    }
+}
+
+/// Handles go-to-def request of the language server
+pub fn on_go_to_def_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<GotoDefinitionParams>(request.params.clone())
+        .expect("could not deserialize go-to-def request");
+
+    let fpath = parameters
+        .text_document_position_params
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let loc = parameters.text_document_position_params.position;
+    let line = loc.line;
+    let col = loc.character;
+
+    on_use_request(
+        context,
+        symbols,
+        &fpath,
+        line,
+        col,
+        request.id.clone(),
+        |u| {
+            // TODO: Do we need beginning and end of the definition? Does not seem to make a
+            // difference from the IDE perspective as the cursor goes to the beginning anyway (at
+            // least in VSCode).
+            let range = Range {
+                start: u.def_loc.start,
+                end: u.def_loc.start,
+            };
+            let path = symbols.file_name_mapping.get(&u.def_loc.fhash).unwrap();
+            let loc = Location {
+                uri: Url::from_file_path(path.as_str()).unwrap(),
+                range,
+            };
+            Some(serde_json::to_value(loc).unwrap())
+        },
+    );
+}
+
+/// Handles go-to-type-def request of the language server
+pub fn on_go_to_type_def_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<GotoTypeDefinitionParams>(request.params.clone())
+        .expect("could not deserialize go-to-type-def request");
+
+    let fpath = parameters
+        .text_document_position_params
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let loc = parameters.text_document_position_params.position;
+    let line = loc.line;
+    let col = loc.character;
+
+    on_use_request(
+        context,
+        symbols,
+        &fpath,
+        line,
+        col,
+        request.id.clone(),
+        |u| match u.type_def_loc {
+            Some(def_loc) => {
+                let range = Range {
+                    start: def_loc.start,
+                    end: def_loc.start,
+                };
+                let path = symbols.file_name_mapping.get(&u.def_loc.fhash).unwrap();
+                let loc = Location {
+                    uri: Url::from_file_path(path.as_str()).unwrap(),
+                    range,
+                };
+                Some(serde_json::to_value(loc).unwrap())
+            }
+            None => Some(serde_json::to_value(Option::<lsp_types::Location>::None).unwrap()),
+        },
+    );
+}
+
+/// Handles go-to-references request of the language server
+pub fn on_references_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<ReferenceParams>(request.params.clone())
+        .expect("could not deserialize references request");
+
+    let fpath = parameters
+        .text_document_position
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let loc = parameters.text_document_position.position;
+    let line = loc.line;
+    let col = loc.character;
+    let include_decl = parameters.context.include_declaration;
+
+    on_use_request(
+        context,
+        symbols,
+        &fpath,
+        line,
+        col,
+        request.id.clone(),
+        |u| match symbols.references.get(&u.def_loc) {
+            Some(s) => {
+                let mut locs = vec![];
+                for ref_loc in s {
+                    if include_decl
+                        || !(u.def_loc.start == ref_loc.start && u.def_loc.fhash == ref_loc.fhash)
+                    {
+                        let end_pos = Position {
+                            line: ref_loc.start.line,
+                            character: ref_loc.col_end,
+                        };
+                        let range = Range {
+                            start: ref_loc.start,
+                            end: end_pos,
+                        };
+                        let path = symbols.file_name_mapping.get(&ref_loc.fhash).unwrap();
+                        locs.push(Location {
+                            uri: Url::from_file_path(path.as_str()).unwrap(),
+                            range,
+                        });
+                    }
+                }
+                if locs.is_empty() {
+                    Some(serde_json::to_value(Option::<lsp_types::Location>::None).unwrap())
+                } else {
+                    Some(serde_json::to_value(locs).unwrap())
+                }
+            }
+            None => Some(serde_json::to_value(Option::<lsp_types::Location>::None).unwrap()),
+        },
+    );
+}
+
+/// Handles hover request of the language server
+pub fn on_hover_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<HoverParams>(request.params.clone())
+        .expect("could not deserialize hover request");
+
+    let fpath = parameters
+        .text_document_position_params
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let loc = parameters.text_document_position_params.position;
+    let line = loc.line;
+    let col = loc.character;
+
+    on_use_request(
+        context,
+        symbols,
+        &fpath,
+        line,
+        col,
+        request.id.clone(),
+        |u| {
+            let lang_string = LanguageString {
+                language: "".to_string(),
+                value: if !u.doc_string.is_empty() {
+                    format!("{}\n\n{}", u.use_type, u.doc_string)
+                } else {
+                    format!("{}", u.use_type)
+                },
+            };
+            let contents = HoverContents::Scalar(MarkedString::LanguageString(lang_string));
+            let range = None;
+            Some(serde_json::to_value(Hover { contents, range }).unwrap())
+        },
+    );
+}
+
+/// Helper function to handle language server queries related to identifier uses
+pub fn on_use_request(
+    context: &Context,
+    symbols: &Symbols,
+    use_fpath: &PathBuf,
+    use_line: u32,
+    use_col: u32,
+    id: RequestId,
+    use_def_action: impl Fn(&UseDef) -> Option<serde_json::Value>,
+) {
+    let mut result = None;
+
+    let mut use_def_found = false;
+    if let Some(mod_symbols) = symbols.file_use_defs.get(use_fpath) {
+        if let Some(uses) = mod_symbols.get(use_line) {
+            for u in uses {
+                if use_col >= u.col_start && use_col <= u.col_end {
+                    result = use_def_action(&u);
+                    use_def_found = true;
+                }
+            }
+        }
+    }
+    if !use_def_found {
+        result = Some(serde_json::to_value(Option::<lsp_types::Location>::None).unwrap());
+    }
+
+    eprintln!("about to send use response");
+    // unwrap will succeed based on the logic above which the compiler is unable to figure out
+    // without using Option
+    let response = lsp_server::Response::new_ok(id, result.unwrap());
+    if let Err(err) = context
+        .connection
+        .sender
+        .send(lsp_server::Message::Response(response))
+    {
+        eprintln!("could not send use response: {:?}", err);
+    }
+}
+
+/// Handles document symbol request of the language server
+#[allow(deprecated)]
+pub fn on_document_symbol_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<DocumentSymbolParams>(request.params.clone())
+        .expect("could not deserialize document symbol request");
+
+    let fpath = parameters.text_document.uri.to_file_path().unwrap();
+    eprintln!("on_document_symbol_request: {:?}", fpath);
+
+    let empty_mods: BTreeSet<ModuleDefs> = BTreeSet::new();
+    let mods = symbols.file_mods.get(&fpath).unwrap_or(&empty_mods);
+
+    let mut defs: Vec<DocumentSymbol> = vec![];
+    for mod_def in mods {
+        let name = mod_def.name.module.clone().to_string();
+        let detail = Some(mod_def.name.clone().to_string());
+        let kind = SymbolKind::Module;
+        let range = Range {
+            start: mod_def.start,
+            end: mod_def.start,
+        };
+
+        let mut children = vec![];
+
+        // handle constants
+        let cloned_const_def = mod_def.constants.clone();
+        for (sym, const_def_pos) in cloned_const_def {
+            let const_range = Range {
+                start: const_def_pos,
+                end: const_def_pos,
+            };
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail: None,
+                kind: SymbolKind::Constant,
+                range: const_range,
+                selection_range: const_range,
+                children: None,
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        // handle structs
+        let cloned_struct_def = mod_def.structs.clone();
+        for (sym, struct_def) in cloned_struct_def {
+            let struct_range = Range {
+                start: struct_def.name_start,
+                end: struct_def.name_start,
+            };
+
+            let mut fields: Vec<DocumentSymbol> = vec![];
+            handle_struct_fields(struct_def, &mut fields);
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail: None,
+                kind: SymbolKind::Struct,
+                range: struct_range,
+                selection_range: struct_range,
+                children: Some(fields),
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        // handle functions
+        let cloned_func_def = mod_def.functions.clone();
+        for (sym, func_def) in cloned_func_def {
+            let func_range = Range {
+                start: func_def.start,
+                end: func_def.start,
+            };
+
+            let mut detail = None;
+            if !func_def.attrs.is_empty() {
+                detail = Some(format!("{:?}", func_def.attrs));
+            }
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail,
+                kind: SymbolKind::Function,
+                range: func_range,
+                selection_range: func_range,
+                children: None,
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        defs.push(DocumentSymbol {
+            name,
+            detail,
+            kind,
+            range,
+            selection_range: range,
+            children: Some(children),
+            tags: Some(vec![]),
+            deprecated: Some(false),
+        });
+    }
+
+    // unwrap will succeed based on the logic above which the compiler is unable to figure out
+    let response = lsp_server::Response::new_ok(request.id.clone(), defs);
+    if let Err(err) = context
+        .connection
+        .sender
+        .send(lsp_server::Message::Response(response))
+    {
+        eprintln!("could not send use response: {:?}", err);
+    }
+}
+
+/// Helper function to handle struct fields
+#[allow(deprecated)]
+fn handle_struct_fields(struct_def: StructDef, fields: &mut Vec<DocumentSymbol>) {
+    let clonded_fileds = struct_def.field_defs;
+
+    for field_def in clonded_fileds {
+        let field_range = Range {
+            start: field_def.start,
+            end: field_def.start,
+        };
+
+        fields.push(DocumentSymbol {
+            name: field_def.name.clone().to_string(),
+            detail: None,
+            kind: SymbolKind::Field,
+            range: field_range,
+            selection_range: field_range,
+            children: None,
+            tags: Some(vec![]),
+            deprecated: Some(false),
+        });
+    }
+}
+
+#[cfg(test)]
+fn assert_use_def_with_doc_string(
+    mod_symbols: &UseDefMap,
+    file_name_mapping: &BTreeMap<FileHash, Symbol>,
+    use_idx: usize,
+    use_line: u32,
+    use_col: u32,
+    def_line: u32,
+    def_col: u32,
+    def_file: &str,
+    type_str: &str,
+    type_def: Option<(u32, u32, &str)>,
+    doc_string: &str,
+) {
+    let Some(uses) = mod_symbols.get(use_line) else {
+        panic!("No use_line {use_line} in mod_symbols {mod_symbols:#?}");
+    };
+    let Some(use_def) = uses.iter().nth(use_idx) else {
+        panic!("No use_line {use_idx} in uses {uses:#?}");
+    };
+    assert_eq!(use_def.col_start, use_col);
+    assert_eq!(use_def.def_loc.start.line, def_line);
+    assert_eq!(use_def.def_loc.start.character, def_col);
+    assert!(file_name_mapping
+        .get(&use_def.def_loc.fhash)
+        .unwrap()
+        .as_str()
+        .ends_with(def_file));
+    assert_eq!(type_str, format!("{}", use_def.use_type));
+
+    assert_eq!(doc_string, use_def.doc_string);
+    match use_def.type_def_loc {
+        Some(type_def_loc) => {
+            let tdef_line = type_def.unwrap().0;
+            let tdef_col = type_def.unwrap().1;
+            let tdef_file = type_def.unwrap().2;
+            assert!(type_def_loc.start.line == tdef_line);
+            assert!(type_def_loc.start.character == tdef_col);
+            assert!(file_name_mapping
+                .get(&type_def_loc.fhash)
+                .unwrap()
+                .as_str()
+                .ends_with(tdef_file));
+        }
+        None => assert!(type_def.is_none()),
+    }
+}
+
+#[cfg(test)]
+fn assert_use_def(
+    mod_symbols: &UseDefMap,
+    file_name_mapping: &BTreeMap<FileHash, Symbol>,
+    use_idx: usize,
+    use_line: u32,
+    use_col: u32,
+    def_line: u32,
+    def_col: u32,
+    def_file: &str,
+    type_str: &str,
+    type_def: Option<(u32, u32, &str)>,
+) {
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        file_name_mapping,
+        use_idx,
+        use_line,
+        use_col,
+        def_line,
+        def_col,
+        def_file,
+        type_str,
+        type_def,
+        "",
+    )
+}
+
+#[test]
+/// Tests if symbolication + doc_string information for documented Move constructs is constructed correctly.
+fn docstring_test() {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
+    path.push("tests/symbols");
+
+    let (symbols_opt, _) = Symbolicator::get_symbols(path.as_path()).unwrap();
+    let symbols = symbols_opt.unwrap();
+
+    let mut fpath = path.clone();
+    fpath.push("sources/M6.move");
+    let cpath = dunce::canonicalize(&fpath).unwrap();
+
+    let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
+
+    // struct def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        4,
+        11,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+
+    // const def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        10,
+        10,
+        10,
+        10,
+        "M6.move",
+        "u64",
+        None,
+        "Constant containing the answer to the universe\n",
+    );
+
+    // function def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        14,
+        8,
+        14,
+        8,
+        "M6.move",
+        "fun Symbols::M6::unpack(s: Symbols::M6::DocumentedStruct): u64",
+        None,
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+    // param var (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        14,
+        15,
+        14,
+        15,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+    // struct name in param type (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        14,
+        18,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+    // struct name in unpack (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        15,
+        12,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+    // field name in unpack (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        15,
+        31,
+        6,
+        8,
+        "M6.move",
+        "u64",
+        None,
+        "A documented field\n",
+    );
+    // moved var in unpack assignment (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        15,
+        59,
+        14,
+        15,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+
+    // docstring construction for multi-line /** .. */ based strings
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        26,
+        8,
+        26,
+        8,
+        "M6.move",
+        "fun Symbols::M6::other_doc_struct(): Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n",
+    );
+
+    // docstring construction for single-line /** .. */ based strings
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        31,
+        8,
+        31,
+        8,
+        "M6.move",
+        "fun Symbols::M6::acq(uint: u64): u64",
+        None,
+        "Asterix based single-line docstring\n",
+    );
+
+    /* Test doc_string construction for struct/function imported from another module */
+
+    // other module struct name (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        26,
+        41,
+        3,
+        11,
+        "M7.move",
+        "Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented struct in another module\n",
+    );
+
+    // function name in a call (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        27,
+        21,
+        9,
+        15,
+        "M7.move",
+        "fun Symbols::M7::create_other_struct(v: u64): Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented initializer in another module\n",
+    );
+
+    // const in param (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        27,
+        41,
+        10,
+        10,
+        "M6.move",
+        "u64",
+        None,
+        "Constant containing the answer to the universe\n",
+    );
+
+    // // other documented struct name imported (other_doc_struct_import function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        38,
+        35,
+        3,
+        11,
+        "M7.move",
+        "Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented struct in another module\n",
+    );
+}
+
+#[test]
+/// Tests if symbolication information for specific Move constructs has been constructed correctly.
+fn symbols_test() {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
+    path.push("tests/symbols");
+
+    let (symbols_opt, _) = Symbolicator::get_symbols(path.as_path()).unwrap();
+    let symbols = symbols_opt.unwrap();
+
+    let mut fpath = path.clone();
+    fpath.push("sources/M1.move");
+    let cpath = dunce::canonicalize(&fpath).unwrap();
+
+    let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
+
+    // struct def name
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        2,
+        11,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // const def name
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        6,
+        10,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // function def name
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        9,
+        8,
+        9,
+        8,
+        "M1.move",
+        "fun Symbols::M1::unpack(s: Symbols::M1::SomeStruct): u64",
+        None,
+    );
+    // param var (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        9,
+        15,
+        9,
+        15,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // struct name in param type (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        9,
+        18,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // struct name in unpack (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        10,
+        12,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // field name in unpack (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        10,
+        25,
+        3,
+        8,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // bound variable in unpack (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        10,
+        37,
+        10,
+        37,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // moved var in unpack assignment (unpack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        10,
+        47,
+        9,
+        15,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // copied var in an assignment (cp function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        15,
+        18,
+        14,
+        11,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // struct name return type (pack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        20,
+        18,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // struct name in pack (pack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        20,
+        18,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // field name in pack (pack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        20,
+        31,
+        3,
+        8,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // const in pack (pack function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        20,
+        43,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // other module struct name (other_mod_struct function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        24,
+        41,
+        2,
+        11,
+        "M2.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // function name in a call (other_mod_struct function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        25,
+        21,
+        6,
+        15,
+        "M2.move",
+        "fun Symbols::M2::some_other_struct(v: u64): Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // const in param (other_mod_struct function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        25,
+        39,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // other module struct name imported (other_mod_struct_import function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        30,
+        35,
+        2,
+        11,
+        "M2.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // function name (acq function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        34,
+        8,
+        34,
+        8,
+        "M1.move",
+        "fun Symbols::M1::acq(uint: u64): u64",
+        None,
+    );
+    // const in first param (multi_arg_call function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        40,
+        22,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // const in second param (multi_arg_call function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        40,
+        34,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // function name (vec function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        43,
+        8,
+        43,
+        8,
+        "M1.move",
+        "fun Symbols::M1::vec(): vector<Symbols::M1::SomeStruct>",
+        None,
+    );
+    // vector constructor type (vec function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        45,
+        15,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // vector constructor first element struct type (vec function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        45,
+        27,
+        2,
+        11,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // vector constructor first element struct field (vec function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        45,
+        39,
+        3,
+        8,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // vector constructor second element var (vec function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        45,
+        57,
+        44,
+        12,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // borrow local (mut function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        56,
+        21,
+        55,
+        12,
+        "M1.move",
+        "&mut u64",
+        None,
+    );
+    // LHS in mutation statement (mut function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        57,
+        9,
+        56,
+        12,
+        "M1.move",
+        "&mut u64",
+        None,
+    );
+    // RHS in mutation statement (mut function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        57,
+        13,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // function name (ret function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        61,
+        8,
+        61,
+        8,
+        "M1.move",
+        "fun Symbols::M1::ret(p1: bool, p2: u64): u64",
+        None,
+    );
+    // returned value (ret function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        63,
+        19,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // function name (abort_call function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        68,
+        8,
+        68,
+        8,
+        "M1.move",
+        "fun Symbols::M1::abort_call()",
+        None,
+    );
+    // abort value (abort_call function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        69,
+        14,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // dereference (deref function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        75,
+        9,
+        74,
+        12,
+        "M1.move",
+        "& u64",
+        None,
+    );
+    // unary operator (unary function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        79,
+        9,
+        78,
+        14,
+        "M1.move",
+        "bool",
+        None,
+    );
+    // temp borrow (temp_borrow function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        83,
+        19,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // chain access first element (chain_access function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        94,
+        8,
+        93,
+        12,
+        "M1.move",
+        "& Symbols::M1::OuterStruct",
+        Some((87, 11, "M1.move")),
+    );
+    // chain second element (chain_access function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        94,
+        14,
+        88,
+        8,
+        "M1.move",
+        "Symbols::M1::OuterStruct",
+        Some((87, 11, "M1.move")),
+    );
+    // chain access third element (chain_access function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        94,
+        26,
+        3,
+        8,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // chain second element after the block (chain_access_block function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        102,
+        10,
+        88,
+        8,
+        "M1.move",
+        "Symbols::M1::OuterStruct",
+        Some((87, 11, "M1.move")),
+    );
+    // chain access first element when borrowing (chain_access_borrow function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        108,
+        17,
+        107,
+        12,
+        "M1.move",
+        "& Symbols::M1::OuterStruct",
+        Some((87, 11, "M1.move")),
+    );
+    // chain second element when borrowing (chain_access_borrow function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        108,
+        23,
+        88,
+        8,
+        "M1.move",
+        "Symbols::M1::OuterStruct",
+        Some((87, 11, "M1.move")),
+    );
+    // chain access third element when borrowing (chain_access_borrow function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        108,
+        35,
+        3,
+        8,
+        "M1.move",
+        "Symbols::M1::SomeStruct",
+        Some((2, 11, "M1.move")),
+    );
+    // variable in cast (cast function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        114,
+        9,
+        113,
+        12,
+        "M1.move",
+        "u128",
+        None,
+    );
+    // constant in an annotation (annot function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        118,
+        19,
+        6,
+        10,
+        "M1.move",
+        "u64",
+        None,
+    );
+    // struct type param def (struct_param function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        122,
+        21,
+        122,
+        21,
+        "M1.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // struct type param use (struct_param function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        123,
+        8,
+        122,
+        21,
+        "M1.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // struct type local var def (struct_var function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        127,
+        12,
+        127,
+        12,
+        "M1.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+    // struct type local var use (struct_var function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        129,
+        12,
+        127,
+        12,
+        "M1.move",
+        "Symbols::M2::SomeOtherStruct",
+        Some((2, 11, "M2.move")),
+    );
+
+    let mut fpath = path.clone();
+    fpath.push("sources/M3.move");
+    let cpath = dunce::canonicalize(&fpath).unwrap();
+
+    let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
+
+    // generic type in struct definition
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        2,
+        23,
+        2,
+        23,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in struct field definition
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        3,
+        20,
+        2,
+        23,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in generic type definition (type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        6,
+        23,
+        6,
+        23,
+        "M3.move",
+        "T",
+        None,
+    );
+    // parameter (type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        6,
+        39,
+        6,
+        39,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in param type (type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        6,
+        46,
+        6,
+        23,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in return type (type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        4,
+        6,
+        50,
+        6,
+        23,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in struct param type (struct_type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        4,
+        10,
+        52,
+        10,
+        30,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in struct return type (struct_type_param_arg function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        6,
+        10,
+        69,
+        10,
+        30,
+        "M3.move",
+        "T",
+        None,
+    );
+    // generic type in pack (pack_type_param function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        15,
+        20,
+        14,
+        24,
+        "M3.move",
+        "T",
+        None,
+    );
+    // field type in struct field definition which itself is a struct
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        23,
+        20,
+        2,
+        11,
+        "M3.move",
+        "Symbols::M3::ParamStruct<T>",
+        Some((2, 11, "M3.move")),
+    );
+    // generic type in struct field definition which itself is a struct
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        23,
+        32,
+        22,
+        30,
+        "M3.move",
+        "T",
+        None,
+    );
+
+    let mut fpath = path.clone();
+    fpath.push("sources/M4.move");
+    let cpath = dunce::canonicalize(&fpath).unwrap();
+
+    let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
+
+    // param name in RHS (if_cond function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        4,
+        18,
+        2,
+        16,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // param name in RHS (if_cond function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        6,
+        22,
+        4,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // var in if's true branch (if_cond function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        7,
+        12,
+        4,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // redefined var in if's false branch (if_cond function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        10,
+        12,
+        9,
+        16,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // var name in while loop condition (while_loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        20,
+        15,
+        18,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // var name in while loop's inner block (while_loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        23,
+        26,
+        18,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // redefined var name in while loop's inner block (while_loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        24,
+        23,
+        23,
+        20,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // var name in while loop's main block (while_loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        26,
+        12,
+        18,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // redefined var name in while loop's inner block (loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        40,
+        23,
+        39,
+        20,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // var name in loop's main block (loop function)
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        43,
+        16,
+        34,
+        12,
+        "M4.move",
+        "u64",
+        None,
+    );
+    // const in a different module in the same file
+    assert_use_def(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        55,
+        10,
+        55,
+        10,
+        "M4.move",
+        "u64",
+        None,
+    );
+}
diff --git a/vendors/move/crates/move-analyzer/src/utils.rs b/vendors/move/crates/move-analyzer/src/utils.rs
new file mode 100644
index 000000000..ed9accd69
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/utils.rs
@@ -0,0 +1,31 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use codespan_reporting::files::{Files, SimpleFiles};
+use lsp_types::Position;
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::HashMap;
+
+/// Converts a location from the byte index format to the line/character (Position) format, where
+/// line/character are 0-based.
+pub fn get_loc(
+    fhash: &FileHash,
+    pos: ByteIndex,
+    files: &SimpleFiles<Symbol, String>,
+    file_id_mapping: &HashMap<FileHash, usize>,
+) -> Option<Position> {
+    let id = match file_id_mapping.get(fhash) {
+        Some(v) => v,
+        None => return None,
+    };
+    match files.location(*id, pos as usize) {
+        Ok(v) => Some(Position {
+            // we need 0-based column location
+            line: v.line_number as u32 - 1,
+            character: v.column_number as u32 - 1,
+        }),
+        Err(_) => None,
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/src/vfs.rs b/vendors/move/crates/move-analyzer/src/vfs.rs
new file mode 100644
index 000000000..077337572
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/src/vfs.rs
@@ -0,0 +1,96 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! The language server must operate upon Move source buffers as they are being edited.
+//! As a result, it is frequently queried about buffers that have not yet (or may never be) saved
+//! to the actual file system.
+//!
+//! To manage these buffers, this module provides a "virtual file system" -- in reality, it is
+//! basically just a mapping from file identifier (this could be the file's path were it to be
+//! saved) to its textual contents.
+
+use crate::symbols;
+use lsp_server::Notification;
+use lsp_types::{
+    notification::Notification as _, DidChangeTextDocumentParams, DidCloseTextDocumentParams,
+    DidOpenTextDocumentParams, DidSaveTextDocumentParams,
+};
+use std::path::PathBuf;
+
+/// A mapping from identifiers (file names, potentially, but not necessarily) to their contents.
+#[derive(Debug, Default)]
+pub struct VirtualFileSystem {
+    files: std::collections::HashMap<PathBuf, String>,
+}
+
+impl VirtualFileSystem {
+    /// Returns a reference to the buffer corresponding to the given identifier, or `None` if it
+    /// is not present in the system.
+    pub fn get(&self, identifier: &PathBuf) -> Option<&str> {
+        self.files.get(identifier).map(|s| s.as_str())
+    }
+
+    /// Inserts or overwrites the buffer corresponding to the given identifier.
+    ///
+    /// TODO: A far more efficient "virtual file system" would update its buffers with changes sent
+    /// from the client, instead of completely replacing them each time. The rust-analyzer has a
+    /// 'vfs' module that is capable of doing just that, but it is not published on crates.io. If
+    /// we could help get it published, we could use it here.
+    pub fn update(&mut self, identifier: PathBuf, content: &str) {
+        self.files.insert(identifier, content.to_string());
+    }
+
+    /// Removes the buffer and its identifier from the system.
+    pub fn remove(&mut self, identifier: &PathBuf) {
+        self.files.remove(identifier);
+    }
+}
+
+/// Updates the given virtual file system based on the text document sync notification that was sent.
+pub fn on_text_document_sync_notification(
+    files: &mut VirtualFileSystem,
+    symbolicator_runner: &symbols::SymbolicatorRunner,
+    notification: &Notification,
+) {
+    eprintln!("text document notification");
+    match notification.method.as_str() {
+        lsp_types::notification::DidOpenTextDocument::METHOD => {
+            let parameters =
+                serde_json::from_value::<DidOpenTextDocumentParams>(notification.params.clone())
+                    .expect("could not deserialize notification");
+            files.update(
+                parameters.text_document.uri.to_file_path().unwrap(),
+                &parameters.text_document.text,
+            );
+            symbolicator_runner.run(parameters.text_document.uri.to_file_path().unwrap());
+        }
+        lsp_types::notification::DidChangeTextDocument::METHOD => {
+            let parameters =
+                serde_json::from_value::<DidChangeTextDocumentParams>(notification.params.clone())
+                    .expect("could not deserialize notification");
+            files.update(
+                parameters.text_document.uri.to_file_path().unwrap(),
+                &parameters.content_changes.last().unwrap().text,
+            );
+        }
+        lsp_types::notification::DidSaveTextDocument::METHOD => {
+            let parameters =
+                serde_json::from_value::<DidSaveTextDocumentParams>(notification.params.clone())
+                    .expect("could not deserialize notification");
+            files.update(
+                parameters.text_document.uri.to_file_path().unwrap(),
+                &parameters.text.unwrap(),
+            );
+            symbolicator_runner.run(parameters.text_document.uri.to_file_path().unwrap());
+        }
+        lsp_types::notification::DidCloseTextDocument::METHOD => {
+            let parameters =
+                serde_json::from_value::<DidCloseTextDocumentParams>(notification.params.clone())
+                    .expect("could not deserialize notification");
+            files.remove(&parameters.text_document.uri.to_file_path().unwrap());
+        }
+        _ => eprintln!("invalid notification '{}'", notification.method),
+    }
+    eprintln!("text document notification handled");
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/Move.toml b/vendors/move/crates/move-analyzer/tests/symbols/Move.toml
new file mode 100644
index 000000000..ddd0a6d35
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Symbols"
+version = "0.0.1"
+
+[dependencies]
+MoveStdlib = { local = "../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
+
+[addresses]
+Symbols = "0xCAFE"
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M1.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M1.move
new file mode 100644
index 000000000..b1cd4139a
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M1.move
@@ -0,0 +1,136 @@
+module Symbols::M1 {
+
+    struct SomeStruct has key, drop, store {
+        some_field: u64,
+    }
+
+    const SOME_CONST: u64 = 42;
+
+
+    fun unpack(s: SomeStruct): u64 {
+        let SomeStruct { some_field: value } = s;
+        value
+    }
+
+    fun cp(value: u64): u64 {
+        let ret = value;
+        ret
+    }
+
+    fun pack(): SomeStruct {
+        let ret = SomeStruct { some_field: SOME_CONST };
+        ret
+    }
+
+    fun other_mod_struct(): Symbols::M2::SomeOtherStruct {
+        Symbols::M2::some_other_struct(SOME_CONST)
+    }
+
+    use Symbols::M2::{Self, SomeOtherStruct};
+
+    fun other_mod_struct_import(): SomeOtherStruct {
+        M2::some_other_struct(7)
+    }
+
+    fun acq(uint: u64): u64 {
+        uint +
+        1
+    }
+
+    fun multi_arg_call(): u64 {
+        M2::multi_arg(SOME_CONST, SOME_CONST)
+    }
+
+    fun vec(): vector<SomeStruct> {
+        let s = SomeStruct{ some_field: 7 };
+        vector<SomeStruct>[SomeStruct{ some_field: 42 }, s]
+    }
+
+    fun unpack_no_assign(s: SomeStruct): u64 {
+        let value: u64;
+        SomeStruct { some_field: value } = s;
+        value
+    }
+
+    fun mut(): u64 {
+        let tmp = 7;
+        let r = &mut tmp;
+        *r = SOME_CONST;
+        tmp
+    }
+
+    fun ret(p1: bool, p2: u64): u64 {
+        if (p1) {
+            return SOME_CONST
+        };
+        p2
+    }
+
+    fun abort_call() {
+        abort SOME_CONST
+    }
+
+    fun deref(): u64 {
+        let tmp = 7;
+        let r = &tmp;
+        *r
+    }
+
+    fun unary(p: bool):bool {
+        !p
+    }
+
+    fun temp_borrow(): u64 {
+        let tmp = &SOME_CONST;
+        *tmp
+    }
+
+    struct OuterStruct has key, drop {
+        some_struct: SomeStruct,
+    }
+
+    fun chain_access(): u64 {
+        let inner = SomeStruct{ some_field: 42 };
+        let outer = OuterStruct{ some_struct: inner };
+        outer.some_struct.some_field
+    }
+
+    fun chain_access_block(): u64 {
+        let inner = SomeStruct{ some_field: 42 };
+        let outer = OuterStruct{ some_struct: inner };
+        {
+            outer
+        }.some_struct.some_field
+    }
+
+    fun chain_access_borrow(): u64 {
+        let inner = SomeStruct{ some_field: 42 };
+        let outer = OuterStruct{ some_struct: inner };
+        let r = &outer.some_struct.some_field;
+        *r
+    }
+
+    fun cast(): u64 {
+        let tmp: u128 = 42;
+        (tmp as u64)
+    }
+
+    fun annot(): u64 {
+        let tmp = (SOME_CONST: u64);
+        tmp
+    }
+
+    fun struct_param(p: SomeOtherStruct): SomeOtherStruct {
+        p
+    }
+
+    fun struct_var(p: bool): SomeOtherStruct {
+        let tmp = M2::some_other_struct(7);
+        if (p) {
+            tmp
+        } else {
+            M2::some_other_struct(42)
+        }
+    }
+
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M2.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M2.move
new file mode 100644
index 000000000..ad9575464
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M2.move
@@ -0,0 +1,15 @@
+module Symbols::M2 {
+
+    struct SomeOtherStruct has drop {
+        some_field: u64,
+    }
+
+    public fun some_other_struct(v: u64): SomeOtherStruct {
+        SomeOtherStruct { some_field: v }
+    }
+
+    public fun multi_arg(p1: u64, p2: u64): u64 {
+        p1 + p2
+    }
+
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M3.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M3.move
new file mode 100644
index 000000000..db2643546
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M3.move
@@ -0,0 +1,27 @@
+module Symbols::M3 {
+
+    struct ParamStruct<T> {
+        some_field: T,
+    }
+
+    fun type_param_arg<T: copy + drop>(param: T): T {
+        param
+    }
+
+    fun struct_type_param_arg<T>(param: ParamStruct<T>): ParamStruct<T> {
+        param
+    }
+
+    fun pack_type_param<T>(param: T): ParamStruct<T> {
+        ParamStruct<T> { some_field: param }
+    }
+
+    fun struct_parameterized_arg(param: ParamStruct<u64>): ParamStruct<u64> {
+        param
+    }
+
+    struct AnotherParamStruct<T: copy> {
+        some_field: ParamStruct<T>,
+    }
+
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M4.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M4.move
new file mode 100644
index 000000000..de30eea4a
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M4.move
@@ -0,0 +1,58 @@
+module Symbols::M4 {
+
+    fun if_cond(tmp: u64): u64 {
+
+        let tmp = tmp;
+
+        let ret = if (tmp == 7) {
+            tmp
+        } else {
+            let tmp = 42;
+            tmp
+        };
+
+        ret
+    }
+
+    fun while_loop(): u64 {
+
+        let tmp = 7;
+
+        while (tmp > 0) {
+            let tmp2 = 1;
+            {
+                let tmp = tmp;
+                tmp2 = tmp - tmp2;
+            };
+            tmp = tmp2;
+        };
+
+        tmp
+    }
+
+    fun loop_loop(): u64 {
+
+        let tmp = 7;
+
+        loop {
+            let tmp2 = 1;
+            {
+                let tmp = tmp;
+                tmp2 = tmp - tmp2;
+            };
+            tmp = tmp2;
+            if (tmp == 0) {
+                break
+            }
+        };
+
+        tmp
+    }
+
+}
+
+module Symbols::M5 {
+
+    const SOME_CONST: u64 = 7;
+
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M6.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M6.move
new file mode 100644
index 000000000..d87244248
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M6.move
@@ -0,0 +1,42 @@
+module Symbols::M6 {
+
+    /// This is a documented struct
+    /// With a multi-line docstring
+    struct DocumentedStruct has key, drop, store {
+        /// A documented field
+        documented_field: u64,
+    }
+
+    /// Constant containing the answer to the universe
+    const DOCUMENTED_CONSTANT: u64 = 42;
+
+
+    /// A documented function that unpacks a DocumentedStruct
+    fun unpack(s: DocumentedStruct): u64 {
+        let DocumentedStruct { documented_field: value } = s;
+        value
+    }
+
+    /**
+       This is a multiline docstring
+
+       This docstring has empty lines.
+
+       It uses the ** format instead of ///
+    */
+    fun other_doc_struct(): Symbols::M7::OtherDocStruct {
+        Symbols::M7::create_other_struct(DOCUMENTED_CONSTANT)
+    }
+
+    /** Asterix based single-line docstring */
+    fun acq(uint: u64): u64 {
+        uint +
+        1
+    }
+
+    use Symbols::M7::{Self, OtherDocStruct};
+
+    fun other_doc_struct_import(): OtherDocStruct {
+        M7::create_other_struct(7)
+    }
+}
diff --git a/vendors/move/crates/move-analyzer/tests/symbols/sources/M7.move b/vendors/move/crates/move-analyzer/tests/symbols/sources/M7.move
new file mode 100644
index 000000000..b4165da10
--- /dev/null
+++ b/vendors/move/crates/move-analyzer/tests/symbols/sources/M7.move
@@ -0,0 +1,13 @@
+module Symbols::M7 {
+
+    /// Documented struct in another module
+    struct OtherDocStruct has drop {
+        /// Documented field in another module
+        some_field: u64,
+    }
+
+    /// Documented initializer in another module
+    public fun create_other_struct(v: u64): OtherDocStruct {
+        OtherDocStruct { some_field: v }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/Cargo.toml b/vendors/move/crates/move-binary-format/Cargo.toml
new file mode 100644
index 000000000..1f1a19846
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "move-binary-format"
+version = "0.0.3"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move Binary Format"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = ["crates-io"]
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+proptest = { workspace = true, optional = true }
+proptest-derive = { workspace = true, optional = true }
+ref-cast.workspace = true
+variant_count.workspace = true
+move-core-types.workspace = true
+serde.workspace = true
+arbitrary = { workspace = true, optional = true, features = ["derive"] }
+enum-compat-util.workspace = true
+move-proc-macros.workspace = true
+
+# wasm support (requires js feature of getrandom)
+getrandom = { workspace = true, features = ["js"], optional = true }
+
+[dev-dependencies]
+proptest.workspace = true
+proptest-derive.workspace = true
+move-core-types = { workspace = true, features = ["fuzzing" ] }
+serde_json.workspace = true
+
+[features]
+default = []
+fuzzing = ["proptest", "proptest-derive", "arbitrary", "move-core-types/fuzzing"]
+wasm = ["getrandom"]
diff --git a/vendors/move/crates/move-binary-format/README.md b/vendors/move/crates/move-binary-format/README.md
new file mode 100644
index 000000000..dd9c69c75
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/README.md
@@ -0,0 +1,53 @@
+---
+id: vm
+title: Virtual Machine
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-binary-format/README.md
+---
+
+
+The MoveVM executes transactions expressed in the Move bytecode. There are
+two main crates: the core VM and the VM runtime. The VM core contains the low-level
+data type for the VM - mostly the file format and abstraction over it. A gas
+metering logical abstraction is also defined there.
+
+## Overview
+
+The MoveVM is a stack machine with a static type system. The MoveVM honors
+the specification of the Move language through a mix of file format,
+verification (for reference [bytecode verifier README](https://github.com/move-language/move/blob/main/language/move-bytecode-verifier/README.md))
+and runtime constraints. The structure of the file format allows the
+definition of modules, types (resources and unrestricted types), and
+functions. Code is expressed via bytecode instructions, which may have
+references to external functions and types.  The file format also imposes
+certain invariants of the language such as opaque types and private fields.
+From the file format definition it should be clear that modules define a
+scope/namespace for functions and types. Types are opaque given all fields
+are private, and types carry no functions or methods.
+
+## Implementation Details
+
+The MoveVM core crate provides the definition of the file format and all
+utilities related to the file format:
+* A simple Rust abstraction over the file format
+  (`diem/language/move-binary-format/src/file_format.rs`) and the bytecodes. These Rust
+  structures are widely used in the code base.
+* Serialization and deserialization of the file format. These define the
+  on-chain binary representation of the code.
+* Some pretty printing functionalities.
+* A proptest infrastructure for the file format.
+
+The `CompiledModule` and `CompiledScript` definitions in
+`diem/language/move-binary-format/src/file_format.rs` are the top-level structs for a Move
+*Module* or *Transaction Script*, respectively. These structs provide a
+simple abstraction over the file format. Additionally, a set of
+[*Views*](https://github.com/move-language/move/blob/main/language/move-binary-format/src/views.rs) are defined to easily navigate and inspect
+`CompiledModule`s and `CompiledScript`s.
+
+## Folder Structure
+
+```
+.
+├── src             # VM core files
+├── tests           # Proptests
+└── vm-runtime      # Interpreter and runtime data types (see README in that folder)
+```
diff --git a/vendors/move/crates/move-binary-format/src/access.rs b/vendors/move/crates/move-binary-format/src/access.rs
new file mode 100644
index 000000000..2bcda1e24
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/access.rs
@@ -0,0 +1,315 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Defines accessors for compiled modules.
+
+use crate::{file_format::*, internals::ModuleIndex};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+};
+
+/// Represents accessors for a compiled module.
+///
+/// This is a trait to allow working across different wrappers for `CompiledModule`.
+pub trait ModuleAccess: Sync {
+    /// Returns the `CompiledModule` that will be used for accesses.
+    fn as_module(&self) -> &CompiledModule;
+
+    fn self_handle_idx(&self) -> ModuleHandleIndex {
+        self.as_module().self_module_handle_idx
+    }
+
+    /// Returns the `ModuleHandle` for `self`.
+    fn self_handle(&self) -> &ModuleHandle {
+        let handle = self.module_handle_at(self.self_handle_idx());
+        debug_assert!(handle.address.into_index() < self.as_module().address_identifiers.len()); // invariant
+        debug_assert!(handle.name.into_index() < self.as_module().identifiers.len()); // invariant
+        handle
+    }
+
+    /// Returns the name of the module.
+    fn name(&self) -> &IdentStr {
+        self.identifier_at(self.self_handle().name)
+    }
+
+    /// Returns the address of the module.
+    fn address(&self) -> &AccountAddress {
+        self.address_identifier_at(self.self_handle().address)
+    }
+
+    fn struct_name(&self, idx: StructDefinitionIndex) -> &IdentStr {
+        let struct_def = self.struct_def_at(idx);
+        let handle = self.struct_handle_at(struct_def.struct_handle);
+        self.identifier_at(handle.name)
+    }
+
+    fn module_handle_at(&self, idx: ModuleHandleIndex) -> &ModuleHandle {
+        let handle = &self.as_module().module_handles[idx.into_index()];
+        debug_assert!(handle.address.into_index() < self.as_module().address_identifiers.len()); // invariant
+        debug_assert!(handle.name.into_index() < self.as_module().identifiers.len()); // invariant
+        handle
+    }
+
+    fn struct_handle_at(&self, idx: StructHandleIndex) -> &StructHandle {
+        let handle = &self.as_module().struct_handles[idx.into_index()];
+        debug_assert!(handle.module.into_index() < self.as_module().module_handles.len()); // invariant
+        handle
+    }
+
+    fn function_handle_at(&self, idx: FunctionHandleIndex) -> &FunctionHandle {
+        let handle = &self.as_module().function_handles[idx.into_index()];
+        debug_assert!(handle.parameters.into_index() < self.as_module().signatures.len()); // invariant
+        debug_assert!(handle.return_.into_index() < self.as_module().signatures.len()); // invariant
+        handle
+    }
+
+    fn field_handle_at(&self, idx: FieldHandleIndex) -> &FieldHandle {
+        let handle = &self.as_module().field_handles[idx.into_index()];
+        debug_assert!(handle.owner.into_index() < self.as_module().struct_defs.len()); // invariant
+        handle
+    }
+
+    fn struct_instantiation_at(&self, idx: StructDefInstantiationIndex) -> &StructDefInstantiation {
+        &self.as_module().struct_def_instantiations[idx.into_index()]
+    }
+
+    fn function_instantiation_at(&self, idx: FunctionInstantiationIndex) -> &FunctionInstantiation {
+        &self.as_module().function_instantiations[idx.into_index()]
+    }
+
+    fn field_instantiation_at(&self, idx: FieldInstantiationIndex) -> &FieldInstantiation {
+        &self.as_module().field_instantiations[idx.into_index()]
+    }
+
+    fn signature_at(&self, idx: SignatureIndex) -> &Signature {
+        &self.as_module().signatures[idx.into_index()]
+    }
+
+    fn identifier_at(&self, idx: IdentifierIndex) -> &IdentStr {
+        &self.as_module().identifiers[idx.into_index()]
+    }
+
+    fn address_identifier_at(&self, idx: AddressIdentifierIndex) -> &AccountAddress {
+        &self.as_module().address_identifiers[idx.into_index()]
+    }
+
+    fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        &self.as_module().constant_pool[idx.into_index()]
+    }
+
+    fn struct_def_at(&self, idx: StructDefinitionIndex) -> &StructDefinition {
+        &self.as_module().struct_defs[idx.into_index()]
+    }
+
+    fn function_def_at(&self, idx: FunctionDefinitionIndex) -> &FunctionDefinition {
+        let result = &self.as_module().function_defs[idx.into_index()];
+        debug_assert!(result.function.into_index() < self.function_handles().len()); // invariant
+        debug_assert!(match &result.code {
+            Some(code) => code.locals.into_index() < self.signatures().len(),
+            None => true,
+        }); // invariant
+        result
+    }
+
+    fn module_handles(&self) -> &[ModuleHandle] {
+        &self.as_module().module_handles
+    }
+
+    fn struct_handles(&self) -> &[StructHandle] {
+        &self.as_module().struct_handles
+    }
+
+    fn function_handles(&self) -> &[FunctionHandle] {
+        &self.as_module().function_handles
+    }
+
+    fn field_handles(&self) -> &[FieldHandle] {
+        &self.as_module().field_handles
+    }
+
+    fn struct_instantiations(&self) -> &[StructDefInstantiation] {
+        &self.as_module().struct_def_instantiations
+    }
+
+    fn function_instantiations(&self) -> &[FunctionInstantiation] {
+        &self.as_module().function_instantiations
+    }
+
+    fn field_instantiations(&self) -> &[FieldInstantiation] {
+        &self.as_module().field_instantiations
+    }
+
+    fn signatures(&self) -> &[Signature] {
+        &self.as_module().signatures
+    }
+
+    fn constant_pool(&self) -> &[Constant] {
+        &self.as_module().constant_pool
+    }
+
+    fn identifiers(&self) -> &[Identifier] {
+        &self.as_module().identifiers
+    }
+
+    fn address_identifiers(&self) -> &[AccountAddress] {
+        &self.as_module().address_identifiers
+    }
+
+    fn struct_defs(&self) -> &[StructDefinition] {
+        &self.as_module().struct_defs
+    }
+
+    fn function_defs(&self) -> &[FunctionDefinition] {
+        &self.as_module().function_defs
+    }
+
+    fn friend_decls(&self) -> &[ModuleHandle] {
+        &self.as_module().friend_decls
+    }
+
+    fn module_id_for_handle(&self, module_handle_idx: &ModuleHandle) -> ModuleId {
+        self.as_module().module_id_for_handle(module_handle_idx)
+    }
+
+    fn self_id(&self) -> ModuleId {
+        self.as_module().self_id()
+    }
+
+    fn version(&self) -> u32 {
+        self.as_module().version
+    }
+
+    fn immediate_dependencies(&self) -> Vec<ModuleId> {
+        let self_handle = self.self_handle();
+        self.module_handles()
+            .iter()
+            .filter(|&handle| handle != self_handle)
+            .map(|handle| self.module_id_for_handle(handle))
+            .collect()
+    }
+
+    fn immediate_friends(&self) -> Vec<ModuleId> {
+        self.friend_decls()
+            .iter()
+            .map(|handle| self.module_id_for_handle(handle))
+            .collect()
+    }
+
+    fn find_struct_def(&self, idx: StructHandleIndex) -> Option<&StructDefinition> {
+        self.struct_defs().iter().find(|d| d.struct_handle == idx)
+    }
+
+    fn find_struct_def_by_name(&self, name: &IdentStr) -> Option<&StructDefinition> {
+        self.struct_defs().iter().find(|def| {
+            let handle = self.struct_handle_at(def.struct_handle);
+            name == self.identifier_at(handle.name)
+        })
+    }
+}
+
+/// Represents accessors for a compiled script.
+///
+/// This is a trait to allow working across different wrappers for `CompiledScript`.
+pub trait ScriptAccess: Sync {
+    /// Returns the `CompiledScript` that will be used for accesses.
+    fn as_script(&self) -> &CompiledScript;
+
+    fn module_handle_at(&self, idx: ModuleHandleIndex) -> &ModuleHandle {
+        &self.as_script().module_handles[idx.into_index()]
+    }
+
+    fn struct_handle_at(&self, idx: StructHandleIndex) -> &StructHandle {
+        &self.as_script().struct_handles[idx.into_index()]
+    }
+
+    fn function_handle_at(&self, idx: FunctionHandleIndex) -> &FunctionHandle {
+        &self.as_script().function_handles[idx.into_index()]
+    }
+
+    fn signature_at(&self, idx: SignatureIndex) -> &Signature {
+        &self.as_script().signatures[idx.into_index()]
+    }
+
+    fn identifier_at(&self, idx: IdentifierIndex) -> &IdentStr {
+        &self.as_script().identifiers[idx.into_index()]
+    }
+
+    fn address_identifier_at(&self, idx: AddressIdentifierIndex) -> &AccountAddress {
+        &self.as_script().address_identifiers[idx.into_index()]
+    }
+
+    fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        &self.as_script().constant_pool[idx.into_index()]
+    }
+
+    fn function_instantiation_at(&self, idx: FunctionInstantiationIndex) -> &FunctionInstantiation {
+        &self.as_script().function_instantiations[idx.into_index()]
+    }
+
+    fn module_handles(&self) -> &[ModuleHandle] {
+        &self.as_script().module_handles
+    }
+
+    fn struct_handles(&self) -> &[StructHandle] {
+        &self.as_script().struct_handles
+    }
+
+    fn function_handles(&self) -> &[FunctionHandle] {
+        &self.as_script().function_handles
+    }
+
+    fn function_instantiations(&self) -> &[FunctionInstantiation] {
+        &self.as_script().function_instantiations
+    }
+
+    fn signatures(&self) -> &[Signature] {
+        &self.as_script().signatures
+    }
+
+    fn constant_pool(&self) -> &[Constant] {
+        &self.as_script().constant_pool
+    }
+
+    fn identifiers(&self) -> &[Identifier] {
+        &self.as_script().identifiers
+    }
+
+    fn address_identifiers(&self) -> &[AccountAddress] {
+        &self.as_script().address_identifiers
+    }
+
+    fn version(&self) -> u32 {
+        self.as_script().version
+    }
+
+    fn code(&self) -> &CodeUnit {
+        &self.as_script().code
+    }
+
+    fn immediate_dependencies(&self) -> Vec<ModuleId> {
+        self.module_handles()
+            .iter()
+            .map(|handle| {
+                ModuleId::new(
+                    *self.address_identifier_at(handle.address),
+                    self.identifier_at(handle.name).to_owned(),
+                )
+            })
+            .collect()
+    }
+}
+
+impl ModuleAccess for CompiledModule {
+    fn as_module(&self) -> &CompiledModule {
+        self
+    }
+}
+
+impl ScriptAccess for CompiledScript {
+    fn as_script(&self) -> &CompiledScript {
+        self
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/binary_views.rs b/vendors/move/crates/move-binary-format/src/binary_views.rs
new file mode 100644
index 000000000..43a002dc6
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/binary_views.rs
@@ -0,0 +1,400 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    access::{ModuleAccess, ScriptAccess},
+    control_flow_graph::VMControlFlowGraph,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        AbilitySet, AddressIdentifierIndex, CodeUnit, CompiledScript, Constant, ConstantPoolIndex,
+        FieldHandle, FieldHandleIndex, FieldInstantiation, FieldInstantiationIndex,
+        FunctionDefinition, FunctionDefinitionIndex, FunctionHandle, FunctionHandleIndex,
+        FunctionInstantiation, FunctionInstantiationIndex, IdentifierIndex, ModuleHandle,
+        ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, StructDefInstantiation,
+        StructDefInstantiationIndex, StructDefinition, StructDefinitionIndex, StructHandle,
+        StructHandleIndex,
+    },
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+    vm_status::StatusCode,
+};
+
+// A `BinaryIndexedView` provides table indexed access for both `CompiledModule` and
+// `CompiledScript`.
+// Operations that are not allowed for `CompiledScript` return an error.
+// A typical use of a `BinaryIndexedView` is while resolving indexes in bytecodes.
+#[derive(Clone, Copy, Debug)]
+pub enum BinaryIndexedView<'a> {
+    Module(&'a CompiledModule),
+    Script(&'a CompiledScript),
+}
+
+impl<'a> BinaryIndexedView<'a> {
+    pub fn module_handles(&self) -> &[ModuleHandle] {
+        match self {
+            BinaryIndexedView::Module(module) => module.module_handles(),
+            BinaryIndexedView::Script(script) => script.module_handles(),
+        }
+    }
+
+    pub fn struct_handles(&self) -> &[StructHandle] {
+        match self {
+            BinaryIndexedView::Module(module) => module.struct_handles(),
+            BinaryIndexedView::Script(script) => script.struct_handles(),
+        }
+    }
+
+    pub fn function_handles(&self) -> &[FunctionHandle] {
+        match self {
+            BinaryIndexedView::Module(module) => module.function_handles(),
+            BinaryIndexedView::Script(script) => script.function_handles(),
+        }
+    }
+
+    pub fn identifiers(&self) -> &[Identifier] {
+        match self {
+            BinaryIndexedView::Module(module) => module.identifiers(),
+            BinaryIndexedView::Script(script) => script.identifiers(),
+        }
+    }
+
+    pub fn identifier_at(&self, idx: IdentifierIndex) -> &IdentStr {
+        match self {
+            BinaryIndexedView::Module(module) => module.identifier_at(idx),
+            BinaryIndexedView::Script(script) => script.identifier_at(idx),
+        }
+    }
+
+    pub fn address_identifiers(&self) -> &[AccountAddress] {
+        match self {
+            BinaryIndexedView::Module(module) => module.address_identifiers(),
+            BinaryIndexedView::Script(script) => script.address_identifiers(),
+        }
+    }
+
+    pub fn address_identifier_at(&self, idx: AddressIdentifierIndex) -> &AccountAddress {
+        match self {
+            BinaryIndexedView::Module(module) => module.address_identifier_at(idx),
+            BinaryIndexedView::Script(script) => script.address_identifier_at(idx),
+        }
+    }
+
+    pub fn constant_pool(&self) -> &[Constant] {
+        match self {
+            BinaryIndexedView::Module(module) => module.constant_pool(),
+            BinaryIndexedView::Script(script) => script.constant_pool(),
+        }
+    }
+
+    pub fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        match self {
+            BinaryIndexedView::Module(module) => module.constant_at(idx),
+            BinaryIndexedView::Script(script) => script.constant_at(idx),
+        }
+    }
+
+    pub fn signatures(&self) -> &[Signature] {
+        match self {
+            BinaryIndexedView::Module(module) => module.signatures(),
+            BinaryIndexedView::Script(script) => script.signatures(),
+        }
+    }
+
+    pub fn signature_at(&self, idx: SignatureIndex) -> &Signature {
+        match self {
+            BinaryIndexedView::Module(module) => module.signature_at(idx),
+            BinaryIndexedView::Script(script) => script.signature_at(idx),
+        }
+    }
+
+    pub fn module_handle_at(&self, idx: ModuleHandleIndex) -> &ModuleHandle {
+        match self {
+            BinaryIndexedView::Module(module) => module.module_handle_at(idx),
+            BinaryIndexedView::Script(script) => script.module_handle_at(idx),
+        }
+    }
+
+    pub fn struct_handle_at(&self, idx: StructHandleIndex) -> &StructHandle {
+        match self {
+            BinaryIndexedView::Module(module) => module.struct_handle_at(idx),
+            BinaryIndexedView::Script(script) => script.struct_handle_at(idx),
+        }
+    }
+
+    pub fn function_handle_at(&self, idx: FunctionHandleIndex) -> &FunctionHandle {
+        match self {
+            BinaryIndexedView::Module(module) => module.function_handle_at(idx),
+            BinaryIndexedView::Script(script) => script.function_handle_at(idx),
+        }
+    }
+
+    pub fn function_instantiations(&self) -> &[FunctionInstantiation] {
+        match self {
+            BinaryIndexedView::Module(module) => module.function_instantiations(),
+            BinaryIndexedView::Script(script) => script.function_instantiations(),
+        }
+    }
+
+    pub fn function_instantiation_at(
+        &self,
+        idx: FunctionInstantiationIndex,
+    ) -> &FunctionInstantiation {
+        match self {
+            BinaryIndexedView::Module(module) => module.function_instantiation_at(idx),
+            BinaryIndexedView::Script(script) => script.function_instantiation_at(idx),
+        }
+    }
+
+    pub fn field_handles(&self) -> Option<&[FieldHandle]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.field_handles()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn field_handle_at(&self, idx: FieldHandleIndex) -> PartialVMResult<&FieldHandle> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.field_handle_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            }
+        }
+    }
+
+    pub fn friend_decls(&self) -> Option<&[ModuleHandle]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.friend_decls()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn struct_instantiations(&self) -> Option<&[StructDefInstantiation]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.struct_instantiations()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn struct_instantiation_at(
+        &self,
+        idx: StructDefInstantiationIndex,
+    ) -> PartialVMResult<&StructDefInstantiation> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.struct_instantiation_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            }
+        }
+    }
+
+    pub fn field_instantiations(&self) -> Option<&[FieldInstantiation]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.field_instantiations()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn field_instantiation_at(
+        &self,
+        idx: FieldInstantiationIndex,
+    ) -> PartialVMResult<&FieldInstantiation> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.field_instantiation_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            }
+        }
+    }
+
+    pub fn struct_defs(&self) -> Option<&[StructDefinition]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.struct_defs()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn struct_def_at(&self, idx: StructDefinitionIndex) -> PartialVMResult<&StructDefinition> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.struct_def_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            }
+        }
+    }
+
+    pub fn function_defs(&self) -> Option<&[FunctionDefinition]> {
+        match self {
+            BinaryIndexedView::Module(module) => Some(module.function_defs()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn function_def_at(
+        &self,
+        idx: FunctionDefinitionIndex,
+    ) -> PartialVMResult<&FunctionDefinition> {
+        match self {
+            BinaryIndexedView::Module(module) => Ok(module.function_def_at(idx)),
+            BinaryIndexedView::Script(_) => {
+                Err(PartialVMError::new(StatusCode::INVALID_OPERATION_IN_SCRIPT))
+            }
+        }
+    }
+
+    // Return the `AbilitySet` of a `SignatureToken` given a context.
+    // A `TypeParameter` has the abilities of its `constraints`.
+    // `StructInstantiation` abilities are predicated on the particular instantiation
+    pub fn abilities(
+        &self,
+        ty: &SignatureToken,
+        constraints: &[AbilitySet],
+    ) -> PartialVMResult<AbilitySet> {
+        use SignatureToken::*;
+
+        match ty {
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => Ok(AbilitySet::PRIMITIVES),
+
+            Reference(_) | MutableReference(_) => Ok(AbilitySet::REFERENCES),
+            Signer => Ok(AbilitySet::SIGNER),
+            TypeParameter(idx) => Ok(constraints[*idx as usize]),
+            Vector(ty) => AbilitySet::polymorphic_abilities(
+                AbilitySet::VECTOR,
+                vec![false],
+                vec![self.abilities(ty, constraints)?],
+            ),
+            Struct(idx) => {
+                let sh = self.struct_handle_at(*idx);
+                Ok(sh.abilities)
+            }
+            StructInstantiation(idx, type_args) => {
+                let sh = self.struct_handle_at(*idx);
+                let declared_abilities = sh.abilities;
+                let type_arguments = type_args
+                    .iter()
+                    .map(|arg| self.abilities(arg, constraints))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                AbilitySet::polymorphic_abilities(
+                    declared_abilities,
+                    sh.type_parameters.iter().map(|param| param.is_phantom),
+                    type_arguments,
+                )
+            }
+        }
+    }
+
+    pub fn self_handle_idx(&self) -> Option<ModuleHandleIndex> {
+        match self {
+            BinaryIndexedView::Module(m) => Some(m.self_handle_idx()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn module_id_for_handle(&self, module_handle: &ModuleHandle) -> ModuleId {
+        ModuleId::new(
+            *self.address_identifier_at(module_handle.address),
+            self.identifier_at(module_handle.name).to_owned(),
+        )
+    }
+
+    pub fn self_id(&self) -> Option<ModuleId> {
+        match self {
+            BinaryIndexedView::Module(m) => Some(m.self_id()),
+            BinaryIndexedView::Script(_) => None,
+        }
+    }
+
+    pub fn version(&self) -> u32 {
+        match self {
+            BinaryIndexedView::Module(module) => module.version(),
+            BinaryIndexedView::Script(script) => script.version(),
+        }
+    }
+}
+
+const EMPTY_SIGNATURE: &Signature = &Signature(vec![]);
+
+// A `FunctionView` holds all the information needed by the verifier for a
+// `FunctionDefinition` and its `FunctionHandle` in a single view.
+// A control flow graph is built for a function when the `FunctionView` is
+// created.
+// A `FunctionView` is created for all module functions except native functions.
+// It is also created for a script.
+pub struct FunctionView<'a> {
+    index: Option<FunctionDefinitionIndex>,
+    code: &'a CodeUnit,
+    parameters: &'a Signature,
+    return_: &'a Signature,
+    locals: &'a Signature,
+    type_parameters: &'a [AbilitySet],
+    cfg: VMControlFlowGraph,
+}
+
+impl<'a> FunctionView<'a> {
+    // Creates a `FunctionView` for a module function.
+    pub fn function(
+        module: &'a CompiledModule,
+        index: FunctionDefinitionIndex,
+        code: &'a CodeUnit,
+        function_handle: &'a FunctionHandle,
+    ) -> Self {
+        Self {
+            index: Some(index),
+            code,
+            parameters: module.signature_at(function_handle.parameters),
+            return_: module.signature_at(function_handle.return_),
+            locals: module.signature_at(code.locals),
+            type_parameters: &function_handle.type_parameters,
+            cfg: VMControlFlowGraph::new(&code.code),
+        }
+    }
+
+    // Creates a `FunctionView` for a script.
+    pub fn script(script: &'a CompiledScript) -> Self {
+        let code = &script.code;
+        let parameters = script.signature_at(script.parameters);
+        let locals = script.signature_at(code.locals);
+        let type_parameters = &script.type_parameters;
+        Self {
+            index: None,
+            code,
+            parameters,
+            return_: EMPTY_SIGNATURE,
+            locals,
+            type_parameters,
+            cfg: VMControlFlowGraph::new(&code.code),
+        }
+    }
+
+    pub fn index(&self) -> Option<FunctionDefinitionIndex> {
+        self.index
+    }
+
+    pub fn code(&self) -> &CodeUnit {
+        self.code
+    }
+
+    pub fn parameters(&self) -> &Signature {
+        self.parameters
+    }
+
+    pub fn return_(&self) -> &Signature {
+        self.return_
+    }
+
+    pub fn locals(&self) -> &Signature {
+        self.locals
+    }
+
+    pub fn type_parameters(&self) -> &[AbilitySet] {
+        self.type_parameters
+    }
+
+    pub fn cfg(&self) -> &VMControlFlowGraph {
+        &self.cfg
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/check_bounds.rs b/vendors/move/crates/move-binary-format/src/check_bounds.rs
new file mode 100644
index 000000000..c60fa080c
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/check_bounds.rs
@@ -0,0 +1,727 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    binary_views::BinaryIndexedView,
+    errors::{
+        bounds_error, offset_out_of_bounds as offset_out_of_bounds_error, verification_error,
+        PartialVMError, PartialVMResult,
+    },
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, Constant,
+        FieldHandle, FieldInstantiation, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandle, FunctionInstantiation, LocalIndex, ModuleHandle, Signature, SignatureToken,
+        StructDefInstantiation, StructDefinition, StructFieldInformation, StructHandle, TableIndex,
+    },
+    internals::ModuleIndex,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+enum BoundsCheckingContext {
+    Module,
+    ModuleFunction(FunctionDefinitionIndex),
+    Script,
+}
+pub struct BoundsChecker<'a> {
+    view: BinaryIndexedView<'a>,
+    context: BoundsCheckingContext,
+}
+
+impl<'a> BoundsChecker<'a> {
+    pub fn verify_script(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let mut bounds_check = Self {
+            view: BinaryIndexedView::Script(script),
+            context: BoundsCheckingContext::Script,
+        };
+        bounds_check.verify_impl()?;
+
+        let type_param_count = script.type_parameters.len();
+
+        check_bounds_impl(bounds_check.view.signatures(), script.parameters)?;
+        if let Some(sig) = bounds_check
+            .view
+            .signatures()
+            .get(script.parameters.into_index())
+        {
+            for ty in &sig.0 {
+                bounds_check.check_type_parameter(ty, type_param_count)?
+            }
+        }
+
+        // The bounds checker has already checked each function definition's code, but a
+        // script's code exists outside of any function definition. It gets checked here.
+        bounds_check.check_code(
+            &script.code,
+            &script.type_parameters,
+            bounds_check
+                .view
+                .signatures()
+                .get(script.parameters.into_index())
+                .unwrap(),
+            CompiledScript::MAIN_INDEX.into_index(),
+        )
+    }
+
+    pub fn verify_module(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let mut bounds_check = Self {
+            view: BinaryIndexedView::Module(module),
+            context: BoundsCheckingContext::Module,
+        };
+        if bounds_check.view.module_handles().is_empty() {
+            let status =
+                verification_error(StatusCode::NO_MODULE_HANDLES, IndexKind::ModuleHandle, 0);
+            return Err(status);
+        }
+        bounds_check.verify_impl()
+    }
+
+    fn verify_impl(&mut self) -> PartialVMResult<()> {
+        self.check_signatures()?;
+        self.check_constants()?;
+        self.check_module_handles()?;
+        self.check_self_module_handle()?;
+        self.check_struct_handles()?;
+        self.check_function_handles()?;
+        self.check_field_handles()?;
+        self.check_friend_decls()?;
+        self.check_struct_instantiations()?;
+        self.check_function_instantiations()?;
+        self.check_field_instantiations()?;
+        self.check_struct_defs()?;
+        self.check_function_defs()
+    }
+
+    fn check_signatures(&self) -> PartialVMResult<()> {
+        for signature in self.view.signatures() {
+            self.check_signature(signature)?
+        }
+        Ok(())
+    }
+
+    fn check_constants(&self) -> PartialVMResult<()> {
+        for constant in self.view.constant_pool() {
+            self.check_constant(constant)?
+        }
+        Ok(())
+    }
+
+    fn check_module_handles(&self) -> PartialVMResult<()> {
+        for script_handle in self.view.module_handles() {
+            self.check_module_handle(script_handle)?
+        }
+        Ok(())
+    }
+
+    fn check_struct_handles(&self) -> PartialVMResult<()> {
+        for struct_handle in self.view.struct_handles() {
+            self.check_struct_handle(struct_handle)?
+        }
+        Ok(())
+    }
+
+    fn check_function_handles(&self) -> PartialVMResult<()> {
+        for function_handle in self.view.function_handles() {
+            self.check_function_handle(function_handle)?
+        }
+        Ok(())
+    }
+
+    fn check_field_handles(&self) -> PartialVMResult<()> {
+        for field_handle in self.view.field_handles().into_iter().flatten() {
+            self.check_field_handle(field_handle)?
+        }
+        Ok(())
+    }
+
+    fn check_friend_decls(&self) -> PartialVMResult<()> {
+        for friend_decl in self.view.friend_decls().into_iter().flatten() {
+            self.check_module_handle(friend_decl)?
+        }
+        Ok(())
+    }
+
+    fn check_struct_instantiations(&self) -> PartialVMResult<()> {
+        for struct_instantiation in self.view.struct_instantiations().into_iter().flatten() {
+            self.check_struct_instantiation(struct_instantiation)?
+        }
+        Ok(())
+    }
+
+    fn check_function_instantiations(&self) -> PartialVMResult<()> {
+        for function_instantiation in self.view.function_instantiations() {
+            self.check_function_instantiation(function_instantiation)?
+        }
+        Ok(())
+    }
+
+    fn check_field_instantiations(&self) -> PartialVMResult<()> {
+        for field_instantiation in self.view.field_instantiations().into_iter().flatten() {
+            self.check_field_instantiation(field_instantiation)?
+        }
+        Ok(())
+    }
+
+    fn check_struct_defs(&self) -> PartialVMResult<()> {
+        for struct_def in self.view.struct_defs().into_iter().flatten() {
+            self.check_struct_def(struct_def)?
+        }
+        Ok(())
+    }
+
+    fn check_function_defs(&mut self) -> PartialVMResult<()> {
+        let view = self.view;
+        for (function_def_idx, function_def) in
+            view.function_defs().into_iter().flatten().enumerate()
+        {
+            self.check_function_def(function_def_idx, function_def)?
+        }
+        Ok(())
+    }
+
+    fn check_module_handle(&self, module_handle: &ModuleHandle) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.address_identifiers(), module_handle.address)?;
+        check_bounds_impl(self.view.identifiers(), module_handle.name)
+    }
+
+    fn check_self_module_handle(&self) -> PartialVMResult<()> {
+        match self.view.self_handle_idx() {
+            Some(idx) => check_bounds_impl(self.view.module_handles(), idx),
+            None => Ok(()),
+        }
+    }
+
+    fn check_struct_handle(&self, struct_handle: &StructHandle) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.module_handles(), struct_handle.module)?;
+        check_bounds_impl(self.view.identifiers(), struct_handle.name)
+    }
+
+    fn check_function_handle(&self, function_handle: &FunctionHandle) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.module_handles(), function_handle.module)?;
+        check_bounds_impl(self.view.identifiers(), function_handle.name)?;
+        check_bounds_impl(self.view.signatures(), function_handle.parameters)?;
+        check_bounds_impl(self.view.signatures(), function_handle.return_)?;
+        // function signature type paramters must be in bounds to the function type parameters
+        let type_param_count = function_handle.type_parameters.len();
+        if let Some(sig) = self
+            .view
+            .signatures()
+            .get(function_handle.parameters.into_index())
+        {
+            for ty in &sig.0 {
+                self.check_type_parameter(ty, type_param_count)?
+            }
+        }
+        if let Some(sig) = self
+            .view
+            .signatures()
+            .get(function_handle.return_.into_index())
+        {
+            for ty in &sig.0 {
+                self.check_type_parameter(ty, type_param_count)?
+            }
+        }
+        Ok(())
+    }
+
+    fn check_field_handle(&self, field_handle: &FieldHandle) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.struct_defs(), field_handle.owner)?;
+        // field offset must be in bounds, struct def just checked above must exist
+        if let Some(struct_def) = &self
+            .view
+            .struct_defs()
+            .and_then(|d| d.get(field_handle.owner.into_index()))
+        {
+            let fields_count = match &struct_def.field_information {
+                StructFieldInformation::Native => 0,
+                StructFieldInformation::Declared(fields) => fields.len(),
+            };
+            if field_handle.field as usize >= fields_count {
+                return Err(bounds_error(
+                    StatusCode::INDEX_OUT_OF_BOUNDS,
+                    IndexKind::MemberCount,
+                    field_handle.field,
+                    fields_count,
+                ));
+            }
+        }
+        Ok(())
+    }
+
+    fn check_struct_instantiation(
+        &self,
+        struct_instantiation: &StructDefInstantiation,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.struct_defs(), struct_instantiation.def)?;
+        check_bounds_impl(self.view.signatures(), struct_instantiation.type_parameters)
+    }
+
+    fn check_function_instantiation(
+        &self,
+        function_instantiation: &FunctionInstantiation,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.function_handles(), function_instantiation.handle)?;
+        check_bounds_impl(
+            self.view.signatures(),
+            function_instantiation.type_parameters,
+        )
+    }
+
+    fn check_field_instantiation(
+        &self,
+        field_instantiation: &FieldInstantiation,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl_opt(&self.view.field_handles(), field_instantiation.handle)?;
+        check_bounds_impl(self.view.signatures(), field_instantiation.type_parameters)
+    }
+
+    fn check_signature(&self, signature: &Signature) -> PartialVMResult<()> {
+        for ty in &signature.0 {
+            self.check_type(ty)?
+        }
+        Ok(())
+    }
+
+    fn check_constant(&self, constant: &Constant) -> PartialVMResult<()> {
+        self.check_type(&constant.type_)
+    }
+
+    fn check_struct_def(&self, struct_def: &StructDefinition) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.struct_handles(), struct_def.struct_handle)?;
+        // check signature (type) and type parameter for the field type
+        if let StructFieldInformation::Declared(fields) = &struct_def.field_information {
+            let type_param_count = self
+                .view
+                .struct_handles()
+                .get(struct_def.struct_handle.into_index())
+                .map_or(0, |sh| sh.type_parameters.len());
+            // field signatures are inlined
+            for field in fields {
+                check_bounds_impl(self.view.identifiers(), field.name)?;
+                self.check_type(&field.signature.0)?;
+                self.check_type_parameter(&field.signature.0, type_param_count)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn check_function_def(
+        &mut self,
+        function_def_idx: usize,
+        function_def: &FunctionDefinition,
+    ) -> PartialVMResult<()> {
+        self.context = BoundsCheckingContext::ModuleFunction(FunctionDefinitionIndex(
+            function_def_idx as TableIndex,
+        ));
+        check_bounds_impl(self.view.function_handles(), function_def.function)?;
+        for ty in &function_def.acquires_global_resources {
+            check_bounds_impl_opt(&self.view.struct_defs(), *ty)?;
+        }
+
+        let code_unit = match &function_def.code {
+            Some(code) => code,
+            None => return Ok(()),
+        };
+
+        if function_def.function.into_index() >= self.view.function_handles().len() {
+            return Err(verification_error(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::FunctionDefinition,
+                function_def_idx as TableIndex,
+            ));
+        }
+        let function_handle = &self.view.function_handles()[function_def.function.into_index()];
+        if function_handle.parameters.into_index() >= self.view.signatures().len() {
+            return Err(verification_error(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::FunctionDefinition,
+                function_def_idx as TableIndex,
+            ));
+        }
+        let parameters = &self.view.signatures()[function_handle.parameters.into_index()];
+
+        self.check_code(
+            code_unit,
+            &function_handle.type_parameters,
+            parameters,
+            function_def_idx,
+        )
+    }
+
+    fn check_code(
+        &self,
+        code_unit: &CodeUnit,
+        type_parameters: &[AbilitySet],
+        parameters: &Signature,
+        index: usize,
+    ) -> PartialVMResult<()> {
+        check_bounds_impl(self.view.signatures(), code_unit.locals)?;
+
+        let locals = self.get_locals(code_unit)?;
+        // Use saturating add for stability
+        let locals_count = locals.len().saturating_add(parameters.len());
+
+        if locals_count > LocalIndex::MAX as usize {
+            return Err(verification_error(
+                StatusCode::TOO_MANY_LOCALS,
+                IndexKind::FunctionDefinition,
+                index as TableIndex,
+            ));
+        }
+
+        // if there are locals check that the type parameters in local signature are in bounds.
+        let type_param_count = type_parameters.len();
+        for local in locals {
+            self.check_type_parameter(local, type_param_count)?
+        }
+
+        // check bytecodes
+        let code_len = code_unit.code.len();
+        for (bytecode_offset, bytecode) in code_unit.code.iter().enumerate() {
+            use self::Bytecode::*;
+
+            match bytecode {
+                LdConst(idx) => self.check_code_unit_bounds_impl(
+                    self.view.constant_pool(),
+                    *idx,
+                    bytecode_offset,
+                )?,
+                MutBorrowField(idx) | ImmBorrowField(idx) => self.check_code_unit_bounds_impl_opt(
+                    &self.view.field_handles(),
+                    *idx,
+                    bytecode_offset,
+                )?,
+                MutBorrowFieldGeneric(idx) | ImmBorrowFieldGeneric(idx) => {
+                    self.check_code_unit_bounds_impl_opt(
+                        &self.view.field_instantiations(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    // check type parameters in borrow are bound to the function type parameters
+                    if let Some(field_inst) = self
+                        .view
+                        .field_instantiations()
+                        .and_then(|f| f.get(idx.into_index()))
+                    {
+                        if let Some(sig) = self
+                            .view
+                            .signatures()
+                            .get(field_inst.type_parameters.into_index())
+                        {
+                            for ty in &sig.0 {
+                                self.check_type_parameter(ty, type_param_count)?
+                            }
+                        }
+                    }
+                }
+                Call(idx) => self.check_code_unit_bounds_impl(
+                    self.view.function_handles(),
+                    *idx,
+                    bytecode_offset,
+                )?,
+                CallGeneric(idx) => {
+                    self.check_code_unit_bounds_impl(
+                        self.view.function_instantiations(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    // check type parameters in call are bound to the function type parameters
+                    if let Some(func_inst) =
+                        self.view.function_instantiations().get(idx.into_index())
+                    {
+                        if let Some(sig) = self
+                            .view
+                            .signatures()
+                            .get(func_inst.type_parameters.into_index())
+                        {
+                            for ty in &sig.0 {
+                                self.check_type_parameter(ty, type_param_count)?
+                            }
+                        }
+                    }
+                }
+                Pack(idx) | Unpack(idx) | Exists(idx) | ImmBorrowGlobal(idx)
+                | MutBorrowGlobal(idx) | MoveFrom(idx) | MoveTo(idx) => self
+                    .check_code_unit_bounds_impl_opt(
+                        &self.view.struct_defs(),
+                        *idx,
+                        bytecode_offset,
+                    )?,
+                PackGeneric(idx)
+                | UnpackGeneric(idx)
+                | ExistsGeneric(idx)
+                | ImmBorrowGlobalGeneric(idx)
+                | MutBorrowGlobalGeneric(idx)
+                | MoveFromGeneric(idx)
+                | MoveToGeneric(idx) => {
+                    self.check_code_unit_bounds_impl_opt(
+                        &self.view.struct_instantiations(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    // check type parameters in type operations are bound to the function type parameters
+                    if let Some(struct_inst) = self
+                        .view
+                        .struct_instantiations()
+                        .and_then(|s| s.get(idx.into_index()))
+                    {
+                        if let Some(sig) = self
+                            .view
+                            .signatures()
+                            .get(struct_inst.type_parameters.into_index())
+                        {
+                            for ty in &sig.0 {
+                                self.check_type_parameter(ty, type_param_count)?
+                            }
+                        }
+                    }
+                }
+                // Instructions that refer to this code block.
+                BrTrue(offset) | BrFalse(offset) | Branch(offset) => {
+                    let offset = *offset as usize;
+                    if offset >= code_len {
+                        return Err(self.offset_out_of_bounds(
+                            StatusCode::INDEX_OUT_OF_BOUNDS,
+                            IndexKind::CodeDefinition,
+                            offset,
+                            code_len,
+                            bytecode_offset as CodeOffset,
+                        ));
+                    }
+                }
+                // Instructions that refer to the locals.
+                CopyLoc(idx) | MoveLoc(idx) | StLoc(idx) | MutBorrowLoc(idx)
+                | ImmBorrowLoc(idx) => {
+                    let idx = *idx as usize;
+                    if idx >= locals_count {
+                        return Err(self.offset_out_of_bounds(
+                            StatusCode::INDEX_OUT_OF_BOUNDS,
+                            IndexKind::LocalPool,
+                            idx,
+                            locals_count,
+                            bytecode_offset as CodeOffset,
+                        ));
+                    }
+                }
+
+                // Instructions that refer to a signature
+                VecPack(idx, _)
+                | VecLen(idx)
+                | VecImmBorrow(idx)
+                | VecMutBorrow(idx)
+                | VecPushBack(idx)
+                | VecPopBack(idx)
+                | VecUnpack(idx, _)
+                | VecSwap(idx) => {
+                    self.check_code_unit_bounds_impl(
+                        self.view.signatures(),
+                        *idx,
+                        bytecode_offset,
+                    )?;
+                    if let Some(sig) = self.view.signatures().get(idx.into_index()) {
+                        for ty in &sig.0 {
+                            self.check_type_parameter(ty, type_param_count)?;
+                        }
+                    }
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU256(_)
+                | LdU128(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256
+                | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr
+                | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge
+                | Abort | Nop => (),
+            }
+        }
+        Ok(())
+    }
+
+    fn check_type(&self, ty: &SignatureToken) -> PartialVMResult<()> {
+        use self::SignatureToken::*;
+
+        for ty in ty.preorder_traversal() {
+            match ty {
+                Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer | TypeParameter(_)
+                | Reference(_) | MutableReference(_) | Vector(_) => (),
+                Struct(idx) => {
+                    check_bounds_impl(self.view.struct_handles(), *idx)?;
+                    if let Some(sh) = self.view.struct_handles().get(idx.into_index()) {
+                        if !sh.type_parameters.is_empty() {
+                            return Err(PartialVMError::new(
+                                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+                            )
+                            .with_message(format!(
+                                "expected {} type parameters got 0 (Struct)",
+                                sh.type_parameters.len(),
+                            )));
+                        }
+                    }
+                }
+                StructInstantiation(idx, type_params) => {
+                    check_bounds_impl(self.view.struct_handles(), *idx)?;
+                    if let Some(sh) = self.view.struct_handles().get(idx.into_index()) {
+                        if sh.type_parameters.len() != type_params.len() {
+                            return Err(PartialVMError::new(
+                                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+                            )
+                            .with_message(format!(
+                                "expected {} type parameters got {}",
+                                sh.type_parameters.len(),
+                                type_params.len(),
+                            )));
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn check_type_parameter(
+        &self,
+        ty: &SignatureToken,
+        type_param_count: usize,
+    ) -> PartialVMResult<()> {
+        use self::SignatureToken::*;
+
+        for ty in ty.preorder_traversal() {
+            match ty {
+                SignatureToken::TypeParameter(idx) => {
+                    if *idx as usize >= type_param_count {
+                        return Err(bounds_error(
+                            StatusCode::INDEX_OUT_OF_BOUNDS,
+                            IndexKind::TypeParameter,
+                            *idx,
+                            type_param_count,
+                        ));
+                    }
+                }
+
+                Bool
+                | U8
+                | U16
+                | U32
+                | U64
+                | U128
+                | U256
+                | Address
+                | Signer
+                | Struct(_)
+                | Reference(_)
+                | MutableReference(_)
+                | Vector(_)
+                | StructInstantiation(_, _) => (),
+            }
+        }
+        Ok(())
+    }
+
+    fn check_code_unit_bounds_impl_opt<T, I>(
+        &self,
+        pool: &Option<&[T]>,
+        idx: I,
+        bytecode_offset: usize,
+    ) -> PartialVMResult<()>
+    where
+        I: ModuleIndex,
+    {
+        pool.map_or(Ok(()), |p| {
+            self.check_code_unit_bounds_impl(p, idx, bytecode_offset)
+        })
+    }
+
+    fn check_code_unit_bounds_impl<T, I>(
+        &self,
+        pool: &[T],
+        idx: I,
+        bytecode_offset: usize,
+    ) -> PartialVMResult<()>
+    where
+        I: ModuleIndex,
+    {
+        let idx = idx.into_index();
+        let len = pool.len();
+        if idx >= len {
+            Err(self.offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                I::KIND,
+                idx,
+                len,
+                bytecode_offset as CodeOffset,
+            ))
+        } else {
+            Ok(())
+        }
+    }
+
+    fn get_locals(&self, code_unit: &CodeUnit) -> PartialVMResult<&[SignatureToken]> {
+        match self.view.signatures().get(code_unit.locals.into_index()) {
+            Some(signature) => Ok(&signature.0),
+            None => Err(bounds_error(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::Signature,
+                code_unit.locals.into_index() as u16,
+                self.view.signatures().len(),
+            )),
+        }
+    }
+
+    fn offset_out_of_bounds(
+        &self,
+        status: StatusCode,
+        kind: IndexKind,
+        target_offset: usize,
+        target_pool_len: usize,
+        cur_bytecode_offset: CodeOffset,
+    ) -> PartialVMError {
+        match self.context {
+            BoundsCheckingContext::Module => {
+                let msg = format!("Indexing into bytecode {} during bounds checking but 'current_function' was not set", cur_bytecode_offset);
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(msg)
+            }
+            BoundsCheckingContext::ModuleFunction(current_function_index) => {
+                offset_out_of_bounds_error(
+                    status,
+                    kind,
+                    target_offset,
+                    target_pool_len,
+                    current_function_index,
+                    cur_bytecode_offset,
+                )
+            }
+            BoundsCheckingContext::Script => {
+                let msg = format!(
+        "Index {} out of bounds for {} at bytecode offset {} in script while indexing {}",
+        target_offset, target_pool_len, cur_bytecode_offset, kind);
+                PartialVMError::new(status).with_message(msg)
+            }
+        }
+    }
+}
+
+fn check_bounds_impl_opt<T, I>(pool: &Option<&[T]>, idx: I) -> PartialVMResult<()>
+where
+    I: ModuleIndex,
+{
+    pool.map_or(Ok(()), |p| check_bounds_impl(p, idx))
+}
+
+fn check_bounds_impl<T, I>(pool: &[T], idx: I) -> PartialVMResult<()>
+where
+    I: ModuleIndex,
+{
+    let idx = idx.into_index();
+    let len = pool.len();
+    if idx >= len {
+        Err(bounds_error(
+            StatusCode::INDEX_OUT_OF_BOUNDS,
+            I::KIND,
+            idx as TableIndex,
+            len,
+        ))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/compatibility.rs b/vendors/move/crates/move-binary-format/src/compatibility.rs
new file mode 100644
index 000000000..4266d20aa
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/compatibility.rs
@@ -0,0 +1,368 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeSet;
+
+use crate::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, StructTypeParameter, Visibility},
+    file_format_common::VERSION_5,
+    normalized::Module,
+};
+use move_core_types::vm_status::StatusCode;
+
+/// The result of a linking and layout compatibility check. Here is what the different combinations. NOTE that if `check_struct_layout` is false, type safety over a series of upgrades cannot be guaranteed.
+/// mean:
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: true, check_private_entry_linking: true }`: fully backward compatible
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: true, check_private_entry_linking: false }`: Backwards compatible, private entry function signatures can change
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: false, check_private_entry_linking: true }`: Backward compatible, exclude the friend module declare and friend functions
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: false, check_private_entry_linking: false }`: Backward compatible, exclude the friend module declarations, friend functions, and private and friend entry function
+/// `{ check_struct_and_pub_function_linking: false, check_struct_layout: true, check_friend_linking: false, check_private_entry_linking: _ }`: Dependent modules that reference functions or types in this module may not link. However, fixing, recompiling, and redeploying all dependent modules will work--no data migration needed.
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: false, check_friend_linking: true, check_private_entry_linking: _ }`: Attempting to read structs published by this module will now fail at runtime. However, dependent modules will continue to link. Requires data migration, but no changes to dependent modules.
+/// `{ check_struct_and_pub_function_linking: false, check_struct_layout: false, check_friend_linking: false, check_private_entry_linking: _ }`: Everything is broken. Need both a data migration and changes to dependent modules.
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub struct Compatibility {
+    /// if false, do not ensure the dependent modules that reference public functions or structs in this module can link
+    pub check_struct_and_pub_function_linking: bool,
+    /// if false, do not ensure the struct layout capability
+    pub check_struct_layout: bool,
+    /// if false, treat `friend` as `private` when `check_struct_and_pub_function_linking`.
+    pub check_friend_linking: bool,
+    /// if false, treat `entry` as `private` when `check_struct_and_pub_function_linking`.
+    pub check_private_entry_linking: bool,
+    /// The set of abilities that cannot be added to an already exisiting type.
+    pub disallowed_new_abilities: AbilitySet,
+    /// Don't allow generic type parameters in structs to change their abilities or constraints.
+    pub disallow_change_struct_type_params: bool,
+}
+
+impl Default for Compatibility {
+    fn default() -> Self {
+        Self {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: true,
+            check_private_entry_linking: true,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: true,
+        }
+    }
+}
+
+impl Compatibility {
+    pub fn full_check() -> Self {
+        Self::default()
+    }
+
+    pub fn no_check() -> Self {
+        Self {
+            check_struct_and_pub_function_linking: false,
+            check_struct_layout: false,
+            check_friend_linking: false,
+            check_private_entry_linking: false,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: false,
+        }
+    }
+
+    pub fn need_check_compat(&self) -> bool {
+        self != &Self::no_check()
+    }
+
+    /// Check compatibility for `new_module` relative to old module `old_module`.
+    pub fn check(&self, old_module: &Module, new_module: &Module) -> PartialVMResult<()> {
+        let mut struct_and_function_linking = true;
+        let mut struct_layout = true;
+        let mut friend_linking = true;
+        let mut entry_linking = true;
+
+        // module's name and address are unchanged
+        if old_module.address != new_module.address || old_module.name != new_module.name {
+            struct_and_function_linking = false;
+        }
+
+        // old module's structs are a subset of the new module's structs
+        for (name, old_struct) in &old_module.structs {
+            let Some(new_struct) = new_module.structs.get(name) else {
+                // Struct not present in new . Existing modules that depend on this struct will fail to link with the new version of the module.
+                // Also, struct layout cannot be guaranteed transitively, because after
+                // removing the struct, it could be re-added later with a different layout.
+                struct_and_function_linking = false;
+                struct_layout = false;
+                break;
+            };
+
+            if !struct_abilities_compatible(
+                self.disallowed_new_abilities,
+                old_struct.abilities,
+                new_struct.abilities,
+            ) || !struct_type_parameters_compatible(
+                self.disallow_change_struct_type_params,
+                &old_struct.type_parameters,
+                &new_struct.type_parameters,
+            ) {
+                struct_and_function_linking = false;
+            }
+            if new_struct.fields != old_struct.fields {
+                // Fields changed. Code in this module will fail at runtime if it tries to
+                // read a previously published struct value
+                // TODO: this is a stricter definition than required. We could in principle
+                // choose that changing the name (but not position or type) of a field is
+                // compatible. The VM does not care about the name of a field
+                // (it's purely informational), but clients presumably do.
+                struct_layout = false
+            }
+        }
+
+        // The modules are considered as compatible function-wise when all the conditions are met:
+        //
+        // - old module's public functions are a subset of the new module's public functions
+        //   (i.e. we cannot remove or change public functions)
+        // - old module's script functions are a subset of the new module's script functions
+        //   (i.e. we cannot remove or change script functions)
+        // - for any friend function that is removed or changed in the old module
+        //   - if the function visibility is upgraded to public, it is OK
+        //   - otherwise, it is considered as incompatible.
+        //
+        // NOTE: it is possible to relax the compatibility checking for a friend function, i.e.,
+        // we can remove/change a friend function if the function is not used by any module in the
+        // friend list. But for simplicity, we decided to go to the more restrictive form now and
+        // we may revisit this in the future.
+        for (name, old_func) in &old_module.functions {
+            let Some(new_func) = new_module.functions.get(name) else {
+                if old_func.visibility == Visibility::Friend {
+                    friend_linking = false;
+                } else if old_func.visibility != Visibility::Private {
+                    struct_and_function_linking = false;
+                } else if old_func.is_entry && self.check_private_entry_linking {
+                    // This must be a private entry function. So set the link breakage if we're
+                    // checking for that.
+                    entry_linking = false;
+                }
+                continue;
+            };
+
+            // Check visibility compatibility
+            match (old_func.visibility, new_func.visibility) {
+                (Visibility::Public, Visibility::Private | Visibility::Friend) => {
+                    struct_and_function_linking = false
+                }
+                (Visibility::Friend, Visibility::Private) => friend_linking = false,
+                _ => (),
+            }
+
+            // Check entry compatibility
+            if old_module.file_format_version < VERSION_5
+                && new_module.file_format_version < VERSION_5
+                && old_func.visibility != Visibility::Private
+                && old_func.is_entry != new_func.is_entry
+            {
+                entry_linking = false
+            } else if old_func.is_entry && !new_func.is_entry {
+                entry_linking = false;
+            }
+
+            // Check signature compatibility
+            if old_func.parameters != new_func.parameters
+                || old_func.return_ != new_func.return_
+                || !fun_type_parameters_compatible(
+                    &old_func.type_parameters,
+                    &new_func.type_parameters,
+                )
+            {
+                match old_func.visibility {
+                    Visibility::Friend => friend_linking = false,
+                    Visibility::Public => struct_and_function_linking = false,
+                    Visibility::Private => (),
+                }
+
+                if old_func.is_entry {
+                    entry_linking = false;
+                }
+            }
+        }
+
+        // check friend declarations compatibility
+        //
+        // - additions to the list are allowed
+        // - removals are not allowed
+        //
+        let old_friend_module_ids: BTreeSet<_> = old_module.friends.iter().cloned().collect();
+        let new_friend_module_ids: BTreeSet<_> = new_module.friends.iter().cloned().collect();
+        if !old_friend_module_ids.is_subset(&new_friend_module_ids) {
+            friend_linking = false;
+        }
+
+        if self.check_struct_and_pub_function_linking && !struct_and_function_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+        if self.check_struct_layout && !struct_layout {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+        if self.check_friend_linking && !friend_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+        if self.check_private_entry_linking && !entry_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+
+        Ok(())
+    }
+}
+
+// When upgrading, the new abilities must be a superset of the old abilities.
+// Adding an ability is fine as long as it's not in the disallowed_new_abilities,
+// but removing an ability could cause existing usages to fail.
+fn struct_abilities_compatible(
+    disallowed_new_abilities: AbilitySet,
+    old_abilities: AbilitySet,
+    new_abilities: AbilitySet,
+) -> bool {
+    old_abilities.is_subset(new_abilities)
+        && disallowed_new_abilities.into_iter().all(|ability| {
+            // If the new abilities have the ability the old ones must have it to
+            !new_abilities.has_ability(ability) || old_abilities.has_ability(ability)
+        })
+}
+
+// When upgrading, the new type parameters must be the same length, and the new type parameter
+// constraints must be compatible
+fn fun_type_parameters_compatible(
+    old_type_parameters: &[AbilitySet],
+    new_type_parameters: &[AbilitySet],
+) -> bool {
+    old_type_parameters.len() == new_type_parameters.len()
+        && old_type_parameters.iter().zip(new_type_parameters).all(
+            |(old_type_parameter_constraint, new_type_parameter_constraint)| {
+                type_parameter_constraints_compatible(
+                    false, // generic abilities can change for functions
+                    *old_type_parameter_constraint,
+                    *new_type_parameter_constraint,
+                )
+            },
+        )
+}
+
+fn struct_type_parameters_compatible(
+    disallow_changing_generic_abilities: bool,
+    old_type_parameters: &[StructTypeParameter],
+    new_type_parameters: &[StructTypeParameter],
+) -> bool {
+    old_type_parameters.len() == new_type_parameters.len()
+        && old_type_parameters.iter().zip(new_type_parameters).all(
+            |(old_type_parameter, new_type_parameter)| {
+                type_parameter_phantom_decl_compatible(
+                    disallow_changing_generic_abilities,
+                    old_type_parameter,
+                    new_type_parameter,
+                ) && type_parameter_constraints_compatible(
+                    disallow_changing_generic_abilities,
+                    old_type_parameter.constraints,
+                    new_type_parameter.constraints,
+                )
+            },
+        )
+}
+
+// When upgrading, the new constraints must be a subset of (or equal to) the old constraints.
+// Removing an ability is fine, but adding an ability could cause existing callsites to fail
+fn type_parameter_constraints_compatible(
+    disallow_changing_generic_abilities: bool,
+    old_type_constraints: AbilitySet,
+    new_type_constraints: AbilitySet,
+) -> bool {
+    if disallow_changing_generic_abilities {
+        old_type_constraints == new_type_constraints
+    } else {
+        new_type_constraints.is_subset(old_type_constraints)
+    }
+}
+
+// Adding a phantom annotation to a parameter won't break clients because that can only increase the
+// the set of abilities in struct instantiations. Put it differently, adding phantom declarations
+// relaxes the requirements for clients.
+fn type_parameter_phantom_decl_compatible(
+    disallow_changing_generic_abilities: bool,
+    old_type_parameter: &StructTypeParameter,
+    new_type_parameter: &StructTypeParameter,
+) -> bool {
+    if disallow_changing_generic_abilities {
+        // phantom/non-phantom cannot change from one version to the next.
+        old_type_parameter.is_phantom == new_type_parameter.is_phantom
+    } else {
+        // old_type_paramter.is_phantom => new_type_parameter.is_phantom
+        !old_type_parameter.is_phantom || new_type_parameter.is_phantom
+    }
+}
+
+/// A simpler, and stricter compatibility checker relating to the inclusion of the old module in
+/// the new.
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
+pub enum InclusionCheck {
+    Subset,
+    Equal,
+}
+
+impl InclusionCheck {
+    // Check that all code in `old_module` is included `new_module`. If `Exact` no new code can be
+    // in `new_module` (Note: `new_module` may have larger pools, but they are not accessed by the
+    // code).
+    pub fn check(&self, old_module: &Module, new_module: &Module) -> PartialVMResult<()> {
+        let err = Err(PartialVMError::new(
+            StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+        ));
+
+        // Module checks
+        if old_module.address != new_module.address
+            || old_module.name != new_module.name
+            || old_module.file_format_version > new_module.file_format_version
+        {
+            return err;
+        }
+
+        // If we're checking exactness we make sure there's an inclusion, and that the size of all
+        // of the tables are the exact same except for constants.
+        if (self == &Self::Equal)
+            && (old_module.structs.len() != new_module.structs.len()
+                || old_module.functions.len() != new_module.functions.len()
+                || old_module.friends.len() != new_module.friends.len())
+        {
+            return err;
+        }
+
+        // Struct checks
+        for (name, old_struct) in &old_module.structs {
+            match new_module.structs.get(name) {
+                Some(new_struct) if old_struct == new_struct => (),
+                _ => {
+                    return err;
+                }
+            };
+        }
+
+        // Function checks
+        for (name, old_func) in &old_module.functions {
+            match new_module
+                .functions
+                .get(name)
+                .or_else(|| new_module.functions.get(name))
+            {
+                Some(new_func) if old_func == new_func => (),
+                _ => {
+                    return err;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/constant.rs b/vendors/move/crates/move-binary-format/src/constant.rs
new file mode 100644
index 000000000..e1a0eb414
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/constant.rs
@@ -0,0 +1,57 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::file_format::{Constant, SignatureToken};
+
+use move_core_types::runtime_value::{MoveTypeLayout, MoveValue};
+
+fn sig_to_ty(sig: &SignatureToken) -> Option<MoveTypeLayout> {
+    match sig {
+        SignatureToken::Signer => Some(MoveTypeLayout::Signer),
+        SignatureToken::Address => Some(MoveTypeLayout::Address),
+        SignatureToken::Bool => Some(MoveTypeLayout::Bool),
+        SignatureToken::U8 => Some(MoveTypeLayout::U8),
+        SignatureToken::U16 => Some(MoveTypeLayout::U16),
+        SignatureToken::U32 => Some(MoveTypeLayout::U32),
+        SignatureToken::U64 => Some(MoveTypeLayout::U64),
+        SignatureToken::U128 => Some(MoveTypeLayout::U128),
+        SignatureToken::U256 => Some(MoveTypeLayout::U256),
+        SignatureToken::Vector(v) => Some(MoveTypeLayout::Vector(Box::new(sig_to_ty(v.as_ref())?))),
+        SignatureToken::Reference(_)
+        | SignatureToken::MutableReference(_)
+        | SignatureToken::Struct(_)
+        | SignatureToken::TypeParameter(_)
+        | SignatureToken::StructInstantiation(_, _) => None,
+    }
+}
+
+fn ty_to_sig(ty: &MoveTypeLayout) -> Option<SignatureToken> {
+    match ty {
+        MoveTypeLayout::Address => Some(SignatureToken::Address),
+        MoveTypeLayout::Signer => Some(SignatureToken::Signer),
+        MoveTypeLayout::U8 => Some(SignatureToken::U8),
+        MoveTypeLayout::U16 => Some(SignatureToken::U16),
+        MoveTypeLayout::U32 => Some(SignatureToken::U32),
+        MoveTypeLayout::U64 => Some(SignatureToken::U64),
+        MoveTypeLayout::U128 => Some(SignatureToken::U128),
+        MoveTypeLayout::U256 => Some(SignatureToken::U256),
+        MoveTypeLayout::Vector(v) => Some(SignatureToken::Vector(Box::new(ty_to_sig(v.as_ref())?))),
+        MoveTypeLayout::Struct(_) => None,
+        MoveTypeLayout::Bool => Some(SignatureToken::Bool),
+    }
+}
+
+impl Constant {
+    pub fn serialize_constant(ty: &MoveTypeLayout, v: &MoveValue) -> Option<Self> {
+        Some(Self {
+            type_: ty_to_sig(ty)?,
+            data: v.simple_serialize()?,
+        })
+    }
+
+    pub fn deserialize_constant(&self) -> Option<MoveValue> {
+        let ty = sig_to_ty(&self.type_)?;
+        MoveValue::simple_deserialize(&self.data, &ty).ok()
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/control_flow_graph.rs b/vendors/move/crates/move-binary-format/src/control_flow_graph.rs
new file mode 100644
index 000000000..63ac1e0a2
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/control_flow_graph.rs
@@ -0,0 +1,337 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the control-flow graph uses for bytecode verification.
+use crate::file_format::{Bytecode, CodeOffset};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
+
+// BTree/Hash agnostic type wrappers
+type Map<K, V> = BTreeMap<K, V>;
+type Set<V> = BTreeSet<V>;
+
+pub type BlockId = CodeOffset;
+
+/// A trait that specifies the basic requirements for a CFG
+pub trait ControlFlowGraph {
+    /// Start index of the block ID in the bytecode vector
+    fn block_start(&self, block_id: BlockId) -> CodeOffset;
+
+    /// End index of the block ID in the bytecode vector
+    fn block_end(&self, block_id: BlockId) -> CodeOffset;
+
+    /// Successors of the block ID in the bytecode vector
+    fn successors(&self, block_id: BlockId) -> &Vec<BlockId>;
+
+    /// Return the next block in traversal order
+    fn next_block(&self, block_id: BlockId) -> Option<BlockId>;
+
+    /// Iterator over the indexes of instructions in this block
+    fn instr_indexes(&self, block_id: BlockId) -> Box<dyn Iterator<Item = CodeOffset>>;
+
+    /// Return an iterator over the blocks of the CFG
+    fn blocks(&self) -> Vec<BlockId>;
+
+    /// Return the number of blocks (vertices) in the control flow graph
+    fn num_blocks(&self) -> u16;
+
+    /// Return the id of the entry block for this control-flow graph
+    /// Note: even a CFG with no instructions has an (empty) entry block.
+    fn entry_block_id(&self) -> BlockId;
+
+    /// Checks if the block ID is a loop head
+    fn is_loop_head(&self, block_id: BlockId) -> bool;
+
+    /// Checks if the the edge from cur->next is a back edge
+    /// returns false if the edge is not in the cfg
+    fn is_back_edge(&self, cur: BlockId, next: BlockId) -> bool;
+
+    /// Return the number of back edges in the cfg
+    fn num_back_edges(&self) -> usize;
+}
+
+struct BasicBlock {
+    exit: CodeOffset,
+    successors: Vec<BlockId>,
+}
+
+/// The control flow graph that we build from the bytecode.
+pub struct VMControlFlowGraph {
+    /// The basic blocks
+    blocks: Map<BlockId, BasicBlock>,
+    /// Basic block ordering for traversal
+    traversal_successors: Map<BlockId, BlockId>,
+    /// Map of loop heads with all of their back edges
+    loop_heads: Map<BlockId, /* back edges */ Set<BlockId>>,
+}
+
+impl BasicBlock {
+    pub fn display(&self, entry: BlockId) {
+        println!("+=======================+");
+        println!("| Enter:  {}            |", entry);
+        println!("+-----------------------+");
+        println!("==> Children: {:?}", self.successors);
+        println!("+-----------------------+");
+        println!("| Exit:   {}            |", self.exit);
+        println!("+=======================+");
+    }
+}
+
+const ENTRY_BLOCK_ID: BlockId = 0;
+
+impl VMControlFlowGraph {
+    pub fn new(code: &[Bytecode]) -> Self {
+        let code_len = code.len() as CodeOffset;
+        // First go through and collect block ids, i.e., offsets that begin basic blocks.
+        // Need to do this first in order to handle backwards edges.
+        let mut block_ids = Set::new();
+        block_ids.insert(ENTRY_BLOCK_ID);
+        for pc in 0..code.len() {
+            VMControlFlowGraph::record_block_ids(pc as CodeOffset, code, &mut block_ids);
+        }
+
+        // Create basic blocks
+        let mut blocks = Map::new();
+        let mut entry = 0;
+        let mut exit_to_entry = Map::new();
+        for pc in 0..code.len() {
+            let co_pc = pc as CodeOffset;
+
+            // Create a basic block
+            if Self::is_end_of_block(co_pc, code, &block_ids) {
+                let exit = co_pc;
+                exit_to_entry.insert(exit, entry);
+                let successors = Bytecode::get_successors(co_pc, code);
+                let bb = BasicBlock { exit, successors };
+                blocks.insert(entry, bb);
+                entry = co_pc + 1;
+            }
+        }
+        let blocks = blocks;
+        assert_eq!(entry, code_len);
+
+        // # Loop analysis
+        //
+        // This section identifies loops in the control-flow graph, picks a back edge and loop head
+        // (the basic block the back edge returns to), and decides the order that blocks are
+        // traversed during abstract interpretation (reverse post-order).
+        //
+        // The implementation is based on the algorithm for finding widening points in Section 4.1,
+        // "Depth-first numbering" of Bourdoncle [1993], "Efficient chaotic iteration strategies
+        // with widenings."
+        //
+        // NB. The comments below refer to a block's sub-graph -- the reflexive transitive closure
+        // of its successor edges, modulo cycles.
+
+        #[derive(Copy, Clone)]
+        enum Exploration {
+            InProgress,
+            Done,
+        }
+
+        let mut exploration: Map<BlockId, Exploration> = Map::new();
+        let mut stack = vec![ENTRY_BLOCK_ID];
+
+        // For every loop in the CFG that is reachable from the entry block, there is an entry in
+        // `loop_heads` mapping to all the back edges pointing to it, and vice versa.
+        //
+        // Entry in `loop_heads` implies loop in the CFG is justified by the comments in the loop
+        // below.  Loop in the CFG implies entry in `loop_heads` is justified by considering the
+        // point at which the first node in that loop, `F` is added to the `exploration` map:
+        //
+        // - By definition `F` is part of a loop, meaning there is a block `L` such that:
+        //
+        //     F - ... -> L -> F
+        //
+        // - `F` will not transition to `Done` until all the nodes reachable from it (including `L`)
+        //   have been visited.
+        // - Because `F` is the first node seen in the loop, all the other nodes in the loop
+        //   (including `L`) will be visited while `F` is `InProgress`.
+        // - Therefore, we will process the `L -> F` edge while `F` is `InProgress`.
+        // - Therefore, we will record a back edge to it.
+        let mut loop_heads: Map<BlockId, Set<BlockId>> = Map::new();
+
+        // Blocks appear in `post_order` after all the blocks in their (non-reflexive) sub-graph.
+        let mut post_order = Vec::with_capacity(blocks.len());
+
+        while let Some(block) = stack.pop() {
+            match exploration.entry(block) {
+                Entry::Vacant(entry) => {
+                    // Record the fact that exploration of this block and its sub-graph has started.
+                    entry.insert(Exploration::InProgress);
+
+                    // Push the block back on the stack to finish processing it, and mark it as done
+                    // once its sub-graph has been traversed.
+                    stack.push(block);
+
+                    for succ in &blocks[&block].successors {
+                        match exploration.get(succ) {
+                            // This successor has never been visited before, add it to the stack to
+                            // be explored before `block` gets marked `Done`.
+                            None => stack.push(*succ),
+
+                            // This block's sub-graph was being explored, meaning it is a (reflexive
+                            // transitive) predecessor of `block` as well as being a successor,
+                            // implying a loop has been detected -- greedily choose the successor
+                            // block as the loop head.
+                            Some(Exploration::InProgress) => {
+                                loop_heads.entry(*succ).or_default().insert(block);
+                            }
+
+                            // Cross-edge detected, this block and its entire sub-graph (modulo
+                            // cycles) has already been explored via a different path, and is
+                            // already present in `post_order`.
+                            Some(Exploration::Done) => { /* skip */ }
+                        };
+                    }
+                }
+
+                Entry::Occupied(mut entry) => match entry.get() {
+                    // Already traversed the sub-graph reachable from this block, so skip it.
+                    Exploration::Done => continue,
+
+                    // Finish up the traversal by adding this block to the post-order traversal
+                    // after its sub-graph (modulo cycles).
+                    Exploration::InProgress => {
+                        post_order.push(block);
+                        entry.insert(Exploration::Done);
+                    }
+                },
+            }
+        }
+
+        let traversal_order = {
+            // This reverse post order is akin to a topological sort (ignoring cycles) and is
+            // different from a pre-order in the presence of diamond patterns in the graph.
+            post_order.reverse();
+            post_order
+        };
+
+        // build a mapping from a block id to the next block id in the traversal order
+        let traversal_successors = traversal_order
+            .windows(2)
+            .map(|window| {
+                debug_assert!(window.len() == 2);
+                (window[0], window[1])
+            })
+            .collect();
+
+        VMControlFlowGraph {
+            blocks,
+            traversal_successors,
+            loop_heads,
+        }
+    }
+
+    pub fn display(&self) {
+        for (entry, block) in &self.blocks {
+            block.display(*entry);
+        }
+        println!("Traversal: {:#?}", self.traversal_successors);
+    }
+
+    fn is_end_of_block(pc: CodeOffset, code: &[Bytecode], block_ids: &Set<BlockId>) -> bool {
+        pc + 1 == (code.len() as CodeOffset) || block_ids.contains(&(pc + 1))
+    }
+
+    fn record_block_ids(pc: CodeOffset, code: &[Bytecode], block_ids: &mut Set<BlockId>) {
+        let bytecode = &code[pc as usize];
+
+        if let Some(offset) = bytecode.offset() {
+            block_ids.insert(*offset);
+        }
+
+        if bytecode.is_branch() && pc + 1 < (code.len() as CodeOffset) {
+            block_ids.insert(pc + 1);
+        }
+    }
+
+    /// A utility function that implements BFS-reachability from block_id with
+    /// respect to get_targets function
+    fn traverse_by(&self, block_id: BlockId) -> Vec<BlockId> {
+        let mut ret = Vec::new();
+        // We use this index to keep track of our frontier.
+        let mut index = 0;
+        // Guard against cycles
+        let mut seen = Set::new();
+
+        ret.push(block_id);
+        seen.insert(&block_id);
+
+        while index < ret.len() {
+            let block_id = ret[index];
+            index += 1;
+            let successors = self.successors(block_id);
+            for block_id in successors.iter() {
+                if !seen.contains(&block_id) {
+                    ret.push(*block_id);
+                    seen.insert(block_id);
+                }
+            }
+        }
+
+        ret
+    }
+
+    pub fn reachable_from(&self, block_id: BlockId) -> Vec<BlockId> {
+        self.traverse_by(block_id)
+    }
+}
+
+impl ControlFlowGraph for VMControlFlowGraph {
+    // Note: in the following procedures, it's safe not to check bounds because:
+    // - Every CFG (even one with no instructions) has a block at ENTRY_BLOCK_ID
+    // - The only way to acquire new BlockId's is via block_successors()
+    // - block_successors only() returns valid BlockId's
+    // Note: it is still possible to get a BlockId from one CFG and use it in another CFG where it
+    // is not valid. The design does not attempt to prevent this abuse of the API.
+
+    fn block_start(&self, block_id: BlockId) -> CodeOffset {
+        block_id
+    }
+
+    fn block_end(&self, block_id: BlockId) -> CodeOffset {
+        self.blocks[&block_id].exit
+    }
+
+    fn successors(&self, block_id: BlockId) -> &Vec<BlockId> {
+        &self.blocks[&block_id].successors
+    }
+
+    fn next_block(&self, block_id: BlockId) -> Option<CodeOffset> {
+        debug_assert!(self.blocks.contains_key(&block_id));
+        self.traversal_successors.get(&block_id).copied()
+    }
+
+    fn instr_indexes(&self, block_id: BlockId) -> Box<dyn Iterator<Item = CodeOffset>> {
+        Box::new(self.block_start(block_id)..=self.block_end(block_id))
+    }
+
+    fn blocks(&self) -> Vec<BlockId> {
+        self.blocks.keys().cloned().collect()
+    }
+
+    fn num_blocks(&self) -> u16 {
+        self.blocks.len() as u16
+    }
+
+    fn entry_block_id(&self) -> BlockId {
+        ENTRY_BLOCK_ID
+    }
+
+    fn is_loop_head(&self, block_id: BlockId) -> bool {
+        self.loop_heads.contains_key(&block_id)
+    }
+
+    fn is_back_edge(&self, cur: BlockId, next: BlockId) -> bool {
+        self.loop_heads
+            .get(&next)
+            .map_or(false, |back_edges| back_edges.contains(&cur))
+    }
+
+    fn num_back_edges(&self) -> usize {
+        self.loop_heads
+            .iter()
+            .fold(0, |acc, (_, edges)| acc + edges.len())
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/deserializer.rs b/vendors/move/crates/move-binary-format/src/deserializer.rs
new file mode 100644
index 000000000..d3202d086
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/deserializer.rs
@@ -0,0 +1,1786 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{check_bounds::BoundsChecker, errors::*, file_format::*, file_format_common::*};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, metadata::Metadata,
+    vm_status::StatusCode,
+};
+use std::{collections::HashSet, convert::TryInto, io::Read};
+
+impl CompiledScript {
+    /// Deserializes a &[u8] slice into a `CompiledScript` instance.
+    pub fn deserialize(binary: &[u8]) -> BinaryLoaderResult<Self> {
+        Self::deserialize_with_max_version(binary, VERSION_MAX)
+    }
+
+    /// Deserializes a &[u8] slice into a `CompiledScript` instance.
+    pub fn deserialize_with_max_version(
+        binary: &[u8],
+        max_binary_format_version: u32,
+    ) -> BinaryLoaderResult<Self> {
+        let script = deserialize_compiled_script(binary, max_binary_format_version)?;
+        BoundsChecker::verify_script(&script)?;
+        Ok(script)
+    }
+
+    // exposed as a public function to enable testing the deserializer
+    #[doc(hidden)]
+    pub fn deserialize_no_check_bounds(binary: &[u8]) -> BinaryLoaderResult<Self> {
+        deserialize_compiled_script(binary, VERSION_MAX)
+    }
+}
+
+impl CompiledModule {
+    /// Deserialize a &[u8] slice into a `CompiledModule` instance.
+    pub fn deserialize_with_defaults(binary: &[u8]) -> BinaryLoaderResult<Self> {
+        Self::deserialize_with_config(
+            binary,
+            VERSION_MAX,
+            /* check_no_extraneous_bytes */ false,
+        )
+    }
+
+    /// Deserialize a &[u8] slice into a `CompiledModule` instance with settings
+    /// - Can specify up to the specified version.
+    /// - Can specify if the deserializer should error on trailing bytes
+    pub fn deserialize_with_config(
+        binary: &[u8],
+        max_binary_format_version: u32,
+        check_no_extraneous_bytes: bool,
+    ) -> BinaryLoaderResult<Self> {
+        let module = deserialize_compiled_module(
+            binary,
+            max_binary_format_version,
+            check_no_extraneous_bytes,
+        )?;
+        BoundsChecker::verify_module(&module)?;
+        Ok(module)
+    }
+
+    // exposed as a public function to enable testing the deserializer
+    #[doc(hidden)]
+    pub fn deserialize_no_check_bounds(binary: &[u8]) -> BinaryLoaderResult<Self> {
+        deserialize_compiled_module(binary, VERSION_MAX, false)
+    }
+}
+
+/// Table info: table type, offset where the table content starts from, count of bytes for
+/// the table content.
+#[derive(Clone, Debug)]
+struct Table {
+    kind: TableType,
+    offset: u32,
+    count: u32,
+}
+
+impl Table {
+    fn new(kind: TableType, offset: u32, count: u32) -> Table {
+        Table {
+            kind,
+            offset,
+            count,
+        }
+    }
+}
+
+fn read_u16_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    let mut u16_bytes = [0; 2];
+    cursor
+        .read_exact(&mut u16_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U16))?;
+    Ok(u16::from_le_bytes(u16_bytes))
+}
+
+fn read_u32_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u32> {
+    let mut u32_bytes = [0; 4];
+    cursor
+        .read_exact(&mut u32_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U32))?;
+    Ok(u32::from_le_bytes(u32_bytes))
+}
+
+fn read_u64_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
+    let mut u64_bytes = [0; 8];
+    cursor
+        .read_exact(&mut u64_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U64))?;
+    Ok(u64::from_le_bytes(u64_bytes))
+}
+
+fn read_u128_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u128> {
+    let mut u128_bytes = [0; 16];
+    cursor
+        .read_exact(&mut u128_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U128))?;
+    Ok(u128::from_le_bytes(u128_bytes))
+}
+
+fn read_u256_internal(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<move_core_types::u256::U256> {
+    let mut u256_bytes = [0; 32];
+    cursor
+        .read_exact(&mut u256_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U256))?;
+    Ok(move_core_types::u256::U256::from_le_bytes(&u256_bytes))
+}
+
+//
+// Helpers to read all uleb128 encoded integers.
+//
+fn read_uleb_internal<T>(cursor: &mut VersionedCursor, max: u64) -> BinaryLoaderResult<T>
+where
+    u64: TryInto<T>,
+{
+    let x = cursor.read_uleb128_as_u64().map_err(|_| {
+        PartialVMError::new(StatusCode::MALFORMED).with_message("Bad Uleb".to_string())
+    })?;
+    if x > max {
+        return Err(PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Uleb greater than max requested".to_string()));
+    }
+
+    x.try_into().map_err(|_| {
+        // TODO: review this status code.
+        let msg = "Failed to convert u64 to target integer type. This should not happen. Is the maximum value correct?".to_string();
+        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(msg)
+    })
+}
+
+fn load_signature_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<SignatureIndex> {
+    Ok(SignatureIndex(read_uleb_internal(
+        cursor,
+        SIGNATURE_INDEX_MAX,
+    )?))
+}
+
+fn load_module_handle_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<ModuleHandleIndex> {
+    Ok(ModuleHandleIndex(read_uleb_internal(
+        cursor,
+        MODULE_HANDLE_INDEX_MAX,
+    )?))
+}
+
+fn load_identifier_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<IdentifierIndex> {
+    Ok(IdentifierIndex(read_uleb_internal(
+        cursor,
+        IDENTIFIER_INDEX_MAX,
+    )?))
+}
+
+fn load_struct_handle_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<StructHandleIndex> {
+    Ok(StructHandleIndex(read_uleb_internal(
+        cursor,
+        STRUCT_HANDLE_INDEX_MAX,
+    )?))
+}
+
+fn load_address_identifier_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<AddressIdentifierIndex> {
+    Ok(AddressIdentifierIndex(read_uleb_internal(
+        cursor,
+        ADDRESS_INDEX_MAX,
+    )?))
+}
+
+fn load_struct_def_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<StructDefinitionIndex> {
+    Ok(StructDefinitionIndex(read_uleb_internal(
+        cursor,
+        STRUCT_DEF_INDEX_MAX,
+    )?))
+}
+
+fn load_function_handle_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<FunctionHandleIndex> {
+    Ok(FunctionHandleIndex(read_uleb_internal(
+        cursor,
+        FUNCTION_HANDLE_INDEX_MAX,
+    )?))
+}
+
+fn load_field_handle_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<FieldHandleIndex> {
+    Ok(FieldHandleIndex(read_uleb_internal(
+        cursor,
+        FIELD_HANDLE_INDEX_MAX,
+    )?))
+}
+
+fn load_field_inst_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<FieldInstantiationIndex> {
+    Ok(FieldInstantiationIndex(read_uleb_internal(
+        cursor,
+        FIELD_INST_INDEX_MAX,
+    )?))
+}
+
+fn load_function_inst_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<FunctionInstantiationIndex> {
+    Ok(FunctionInstantiationIndex(read_uleb_internal(
+        cursor,
+        FUNCTION_INST_INDEX_MAX,
+    )?))
+}
+
+fn load_struct_def_inst_index(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<StructDefInstantiationIndex> {
+    Ok(StructDefInstantiationIndex(read_uleb_internal(
+        cursor,
+        STRUCT_DEF_INST_INDEX_MAX,
+    )?))
+}
+
+fn load_constant_pool_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<ConstantPoolIndex> {
+    Ok(ConstantPoolIndex(read_uleb_internal(
+        cursor,
+        CONSTANT_INDEX_MAX,
+    )?))
+}
+
+fn load_bytecode_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, BYTECODE_COUNT_MAX)
+}
+
+fn load_bytecode_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    read_uleb_internal(cursor, BYTECODE_INDEX_MAX)
+}
+
+fn load_acquires_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
+    read_uleb_internal(cursor, ACQUIRES_COUNT_MAX)
+}
+
+fn load_field_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
+    read_uleb_internal(cursor, FIELD_COUNT_MAX)
+}
+
+fn load_type_parameter_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, TYPE_PARAMETER_COUNT_MAX)
+}
+
+fn load_signature_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
+    read_uleb_internal(cursor, SIGNATURE_SIZE_MAX)
+}
+
+fn load_constant_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, CONSTANT_SIZE_MAX)
+}
+
+fn load_metadata_key_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, METADATA_KEY_SIZE_MAX)
+}
+
+fn load_metadata_value_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, METADATA_VALUE_SIZE_MAX)
+}
+
+fn load_identifier_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<usize> {
+    read_uleb_internal(cursor, IDENTIFIER_SIZE_MAX)
+}
+
+fn load_type_parameter_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    read_uleb_internal(cursor, TYPE_PARAMETER_INDEX_MAX)
+}
+
+fn load_field_offset(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    read_uleb_internal(cursor, FIELD_OFFSET_MAX)
+}
+
+fn load_table_count(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u8> {
+    read_uleb_internal(cursor, TABLE_COUNT_MAX)
+}
+
+fn load_table_offset(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u32> {
+    read_uleb_internal(cursor, TABLE_OFFSET_MAX)
+}
+
+fn load_table_size(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u32> {
+    read_uleb_internal(cursor, TABLE_SIZE_MAX)
+}
+
+fn load_local_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u8> {
+    read_uleb_internal(cursor, LOCAL_INDEX_MAX)
+}
+
+/// Module internal function that manages deserialization of transactions.
+fn deserialize_compiled_script(
+    binary: &[u8],
+    max_binary_format_version: u32,
+) -> BinaryLoaderResult<CompiledScript> {
+    let binary_len = binary.len();
+    let mut cursor = VersionedCursor::new(binary, max_binary_format_version, false)?;
+    let table_count = load_table_count(&mut cursor)?;
+    let mut tables: Vec<Table> = Vec::new();
+    read_tables(&mut cursor, table_count, &mut tables)?;
+    let content_len = check_tables(&mut tables, binary_len)?;
+
+    let mut table_contents_buffer = Vec::new();
+    let table_contents = read_table_contents(
+        &mut cursor,
+        &mut table_contents_buffer,
+        content_len as usize,
+    )?;
+
+    let mut script = CompiledScript {
+        version: cursor.version(),
+        type_parameters: load_ability_sets(
+            &mut cursor,
+            AbilitySetPosition::FunctionTypeParameters,
+        )?,
+        parameters: load_signature_index(&mut cursor)?,
+        code: load_code_unit(&mut cursor)?,
+        ..Default::default()
+    };
+
+    build_compiled_script(&mut script, &table_contents, &tables)?;
+    Ok(script)
+}
+
+/// Module internal function that manages deserialization of modules.
+fn deserialize_compiled_module(
+    binary: &[u8],
+    max_binary_format_version: u32,
+    check_no_extraneous_bytes: bool,
+) -> BinaryLoaderResult<CompiledModule> {
+    let binary_len = binary.len();
+    let mut cursor =
+        VersionedCursor::new(binary, max_binary_format_version, check_no_extraneous_bytes)?;
+    let table_count = load_table_count(&mut cursor)?;
+    let mut tables: Vec<Table> = Vec::new();
+    read_tables(&mut cursor, table_count, &mut tables)?;
+    let content_len = check_tables(&mut tables, binary_len)?;
+
+    let mut table_contents_buffer = Vec::new();
+    let table_contents = read_table_contents(
+        &mut cursor,
+        &mut table_contents_buffer,
+        content_len as usize,
+    )?;
+
+    let mut module = CompiledModule {
+        version: cursor.version(),
+        self_module_handle_idx: load_module_handle_index(&mut cursor)?,
+        ..Default::default()
+    };
+
+    build_compiled_module(&mut module, &table_contents, &tables)?;
+
+    let end_pos = cursor.position();
+    let had_remaining_bytes = end_pos < (binary.len() as u64);
+    if check_no_extraneous_bytes && had_remaining_bytes {
+        return Err(PartialVMError::new(StatusCode::TRAILING_BYTES));
+    }
+    Ok(module)
+}
+
+/// Reads all the table headers.
+///
+/// Return a Vec<Table> that contains all the table headers defined and checked.
+fn read_tables(
+    cursor: &mut VersionedCursor,
+    table_count: u8,
+    tables: &mut Vec<Table>,
+) -> BinaryLoaderResult<()> {
+    for _count in 0..table_count {
+        tables.push(read_table(cursor)?);
+    }
+    Ok(())
+}
+
+/// Reads a table from a slice at a given offset.
+/// If a table is not recognized an error is returned.
+fn read_table(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Table> {
+    let kind = match cursor.read_u8() {
+        Ok(kind) => kind,
+        Err(_) => {
+            return Err(PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Error reading table".to_string()))
+        }
+    };
+    let table_offset = load_table_offset(cursor)?;
+    let count = load_table_size(cursor)?;
+    Ok(Table::new(TableType::from_u8(kind)?, table_offset, count))
+}
+
+fn read_table_contents<'a>(
+    cursor: &mut VersionedCursor,
+    buffer: &'a mut Vec<u8>,
+    n: usize,
+) -> BinaryLoaderResult<VersionedBinary<'a>> {
+    cursor
+        .read_new_binary(buffer, n)
+        .map_err(|e| e.with_message("Error reading table contents".to_string()))
+}
+
+/// Verify correctness of tables.
+///
+/// Tables cannot have duplicates, must cover the entire blob and must be disjoint.
+fn check_tables(tables: &mut Vec<Table>, binary_len: usize) -> BinaryLoaderResult<u32> {
+    // there is no real reason to pass a mutable reference but we are sorting next line
+    tables.sort_by(|t1, t2| t1.offset.cmp(&t2.offset));
+
+    let mut current_offset: u32 = 0;
+    let mut table_types = HashSet::new();
+    for table in tables {
+        if table.offset != current_offset {
+            return Err(PartialVMError::new(StatusCode::BAD_HEADER_TABLE));
+        }
+        if table.count == 0 {
+            return Err(PartialVMError::new(StatusCode::BAD_HEADER_TABLE));
+        }
+        match current_offset.checked_add(table.count) {
+            Some(checked_offset) => current_offset = checked_offset,
+            None => return Err(PartialVMError::new(StatusCode::BAD_HEADER_TABLE)),
+        }
+        if !table_types.insert(table.kind) {
+            return Err(PartialVMError::new(StatusCode::DUPLICATE_TABLE));
+        }
+        if current_offset as usize > binary_len {
+            return Err(PartialVMError::new(StatusCode::BAD_HEADER_TABLE));
+        }
+    }
+    Ok(current_offset)
+}
+
+//
+// Trait to read common tables from CompiledScript or CompiledModule
+//
+
+trait CommonTables {
+    fn get_module_handles(&mut self) -> &mut Vec<ModuleHandle>;
+    fn get_struct_handles(&mut self) -> &mut Vec<StructHandle>;
+    fn get_function_handles(&mut self) -> &mut Vec<FunctionHandle>;
+    fn get_function_instantiations(&mut self) -> &mut Vec<FunctionInstantiation>;
+    fn get_signatures(&mut self) -> &mut SignaturePool;
+    fn get_identifiers(&mut self) -> &mut IdentifierPool;
+    fn get_address_identifiers(&mut self) -> &mut AddressIdentifierPool;
+    fn get_constant_pool(&mut self) -> &mut ConstantPool;
+    fn get_metadata(&mut self) -> &mut Vec<Metadata>;
+}
+
+impl CommonTables for CompiledScript {
+    fn get_module_handles(&mut self) -> &mut Vec<ModuleHandle> {
+        &mut self.module_handles
+    }
+
+    fn get_struct_handles(&mut self) -> &mut Vec<StructHandle> {
+        &mut self.struct_handles
+    }
+
+    fn get_function_handles(&mut self) -> &mut Vec<FunctionHandle> {
+        &mut self.function_handles
+    }
+
+    fn get_function_instantiations(&mut self) -> &mut Vec<FunctionInstantiation> {
+        &mut self.function_instantiations
+    }
+
+    fn get_signatures(&mut self) -> &mut SignaturePool {
+        &mut self.signatures
+    }
+
+    fn get_identifiers(&mut self) -> &mut IdentifierPool {
+        &mut self.identifiers
+    }
+
+    fn get_address_identifiers(&mut self) -> &mut AddressIdentifierPool {
+        &mut self.address_identifiers
+    }
+
+    fn get_constant_pool(&mut self) -> &mut ConstantPool {
+        &mut self.constant_pool
+    }
+
+    fn get_metadata(&mut self) -> &mut Vec<Metadata> {
+        &mut self.metadata
+    }
+}
+
+impl CommonTables for CompiledModule {
+    fn get_module_handles(&mut self) -> &mut Vec<ModuleHandle> {
+        &mut self.module_handles
+    }
+
+    fn get_struct_handles(&mut self) -> &mut Vec<StructHandle> {
+        &mut self.struct_handles
+    }
+
+    fn get_function_handles(&mut self) -> &mut Vec<FunctionHandle> {
+        &mut self.function_handles
+    }
+
+    fn get_function_instantiations(&mut self) -> &mut Vec<FunctionInstantiation> {
+        &mut self.function_instantiations
+    }
+
+    fn get_signatures(&mut self) -> &mut SignaturePool {
+        &mut self.signatures
+    }
+
+    fn get_identifiers(&mut self) -> &mut IdentifierPool {
+        &mut self.identifiers
+    }
+
+    fn get_address_identifiers(&mut self) -> &mut AddressIdentifierPool {
+        &mut self.address_identifiers
+    }
+
+    fn get_constant_pool(&mut self) -> &mut ConstantPool {
+        &mut self.constant_pool
+    }
+
+    fn get_metadata(&mut self) -> &mut Vec<Metadata> {
+        &mut self.metadata
+    }
+}
+
+/// Builds and returns a `CompiledScript`.
+fn build_compiled_script(
+    script: &mut CompiledScript,
+    binary: &VersionedBinary,
+    tables: &[Table],
+) -> BinaryLoaderResult<()> {
+    build_common_tables(binary, tables, script)?;
+    build_script_tables(binary, tables, script)?;
+    Ok(())
+}
+
+/// Builds and returns a `CompiledModule`.
+fn build_compiled_module(
+    module: &mut CompiledModule,
+    binary: &VersionedBinary,
+    tables: &[Table],
+) -> BinaryLoaderResult<()> {
+    build_common_tables(binary, tables, module)?;
+    build_module_tables(binary, tables, module)?;
+    Ok(())
+}
+
+/// Builds the common tables in a compiled unit.
+fn build_common_tables(
+    binary: &VersionedBinary,
+    tables: &[Table],
+    common: &mut impl CommonTables,
+) -> BinaryLoaderResult<()> {
+    for table in tables {
+        match table.kind {
+            TableType::MODULE_HANDLES => {
+                load_module_handles(binary, table, common.get_module_handles())?;
+            }
+            TableType::STRUCT_HANDLES => {
+                load_struct_handles(binary, table, common.get_struct_handles())?;
+            }
+            TableType::FUNCTION_HANDLES => {
+                load_function_handles(binary, table, common.get_function_handles())?;
+            }
+            TableType::FUNCTION_INST => {
+                load_function_instantiations(binary, table, common.get_function_instantiations())?;
+            }
+            TableType::SIGNATURES => {
+                load_signatures(binary, table, common.get_signatures())?;
+            }
+            TableType::CONSTANT_POOL => {
+                load_constant_pool(binary, table, common.get_constant_pool())?;
+            }
+            TableType::METADATA => {
+                if binary.check_no_extraneous_bytes() || binary.version() < VERSION_5 {
+                    return Err(
+                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                            "metadata declarations not applicable in bytecode version {}",
+                            binary.version()
+                        )),
+                    );
+                }
+                load_metadata(binary, table, common.get_metadata())?;
+            }
+            TableType::IDENTIFIERS => {
+                load_identifiers(binary, table, common.get_identifiers())?;
+            }
+            TableType::ADDRESS_IDENTIFIERS => {
+                load_address_identifiers(binary, table, common.get_address_identifiers())?;
+            }
+            TableType::FUNCTION_DEFS
+            | TableType::STRUCT_DEFS
+            | TableType::STRUCT_DEF_INST
+            | TableType::FIELD_HANDLE
+            | TableType::FIELD_INST => continue,
+            TableType::FRIEND_DECLS => {
+                // friend declarations do not exist before VERSION_2
+                if binary.version() < VERSION_2 {
+                    return Err(PartialVMError::new(StatusCode::MALFORMED).with_message(
+                        "Friend declarations not applicable in bytecode version 1".to_string(),
+                    ));
+                }
+                continue;
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Builds tables related to a `CompiledModule`.
+fn build_module_tables(
+    binary: &VersionedBinary,
+    tables: &[Table],
+    module: &mut CompiledModule,
+) -> BinaryLoaderResult<()> {
+    for table in tables {
+        match table.kind {
+            TableType::STRUCT_DEFS => {
+                load_struct_defs(binary, table, &mut module.struct_defs)?;
+            }
+            TableType::STRUCT_DEF_INST => {
+                load_struct_instantiations(binary, table, &mut module.struct_def_instantiations)?;
+            }
+            TableType::FUNCTION_DEFS => {
+                load_function_defs(binary, table, &mut module.function_defs)?;
+            }
+            TableType::FIELD_HANDLE => {
+                load_field_handles(binary, table, &mut module.field_handles)?;
+            }
+            TableType::FIELD_INST => {
+                load_field_instantiations(binary, table, &mut module.field_instantiations)?;
+            }
+            TableType::FRIEND_DECLS => {
+                load_module_handles(binary, table, &mut module.friend_decls)?;
+            }
+            TableType::MODULE_HANDLES
+            | TableType::STRUCT_HANDLES
+            | TableType::FUNCTION_HANDLES
+            | TableType::FUNCTION_INST
+            | TableType::IDENTIFIERS
+            | TableType::ADDRESS_IDENTIFIERS
+            | TableType::CONSTANT_POOL
+            | TableType::METADATA
+            | TableType::SIGNATURES => {
+                continue;
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Builds tables related to a `CompiledScript`.
+fn build_script_tables(
+    _binary: &VersionedBinary,
+    tables: &[Table],
+    _script: &mut CompiledScript,
+) -> BinaryLoaderResult<()> {
+    for table in tables {
+        match table.kind {
+            TableType::MODULE_HANDLES
+            | TableType::STRUCT_HANDLES
+            | TableType::FUNCTION_HANDLES
+            | TableType::FUNCTION_INST
+            | TableType::SIGNATURES
+            | TableType::IDENTIFIERS
+            | TableType::ADDRESS_IDENTIFIERS
+            | TableType::CONSTANT_POOL
+            | TableType::METADATA => {
+                continue;
+            }
+            TableType::STRUCT_DEFS
+            | TableType::STRUCT_DEF_INST
+            | TableType::FUNCTION_DEFS
+            | TableType::FIELD_INST
+            | TableType::FIELD_HANDLE
+            | TableType::FRIEND_DECLS => {
+                return Err(PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Bad table in Script".to_string()));
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Builds the `ModuleHandle` table.
+fn load_module_handles(
+    binary: &VersionedBinary,
+    table: &Table,
+    module_handles: &mut Vec<ModuleHandle>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < table.count as u64 {
+        let address = load_address_identifier_index(&mut cursor)?;
+        let name = load_identifier_index(&mut cursor)?;
+        module_handles.push(ModuleHandle { address, name });
+    }
+    Ok(())
+}
+
+/// Builds the `StructHandle` table.
+fn load_struct_handles(
+    binary: &VersionedBinary,
+    table: &Table,
+    struct_handles: &mut Vec<StructHandle>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < table.count as u64 {
+        let module = load_module_handle_index(&mut cursor)?;
+        let name = load_identifier_index(&mut cursor)?;
+        let abilities = load_ability_set(&mut cursor, AbilitySetPosition::StructHandle)?;
+        let type_parameters = load_struct_type_parameters(&mut cursor)?;
+        struct_handles.push(StructHandle {
+            module,
+            name,
+            abilities,
+            type_parameters,
+        });
+    }
+    Ok(())
+}
+
+/// Builds the `FunctionHandle` table.
+fn load_function_handles(
+    binary: &VersionedBinary,
+    table: &Table,
+    function_handles: &mut Vec<FunctionHandle>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < table.count as u64 {
+        let module = load_module_handle_index(&mut cursor)?;
+        let name = load_identifier_index(&mut cursor)?;
+        let parameters = load_signature_index(&mut cursor)?;
+        let return_ = load_signature_index(&mut cursor)?;
+        let type_parameters =
+            load_ability_sets(&mut cursor, AbilitySetPosition::FunctionTypeParameters)?;
+
+        function_handles.push(FunctionHandle {
+            module,
+            name,
+            parameters,
+            return_,
+            type_parameters,
+        });
+    }
+    Ok(())
+}
+
+/// Builds the `StructInstantiation` table.
+fn load_struct_instantiations(
+    binary: &VersionedBinary,
+    table: &Table,
+    struct_insts: &mut Vec<StructDefInstantiation>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+
+    while cursor.position() < table.count as u64 {
+        let def = load_struct_def_index(&mut cursor)?;
+        let type_parameters = load_signature_index(&mut cursor)?;
+        struct_insts.push(StructDefInstantiation {
+            def,
+            type_parameters,
+        });
+    }
+    Ok(())
+}
+
+/// Builds the `FunctionInstantiation` table.
+fn load_function_instantiations(
+    binary: &VersionedBinary,
+    table: &Table,
+    func_insts: &mut Vec<FunctionInstantiation>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < table.count as u64 {
+        let handle = load_function_handle_index(&mut cursor)?;
+        let type_parameters = load_signature_index(&mut cursor)?;
+        func_insts.push(FunctionInstantiation {
+            handle,
+            type_parameters,
+        });
+    }
+    Ok(())
+}
+
+/// Builds the `IdentifierPool`.
+fn load_identifiers(
+    binary: &VersionedBinary,
+    table: &Table,
+    identifiers: &mut IdentifierPool,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        let size = load_identifier_size(&mut cursor)?;
+        let mut buffer: Vec<u8> = vec![0u8; size];
+        if let Ok(count) = cursor.read(&mut buffer) {
+            if count != size {
+                return Err(PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Bad Identifier pool size".to_string()));
+            }
+            let s = Identifier::from_utf8(buffer).map_err(|_| {
+                PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Invalid Identifier".to_string())
+            })?;
+            identifiers.push(s);
+        }
+    }
+    Ok(())
+}
+
+/// Builds the `AddressIdentifierPool`.
+fn load_address_identifiers(
+    binary: &VersionedBinary,
+    table: &Table,
+    addresses: &mut AddressIdentifierPool,
+) -> BinaryLoaderResult<()> {
+    let mut start = table.offset as usize;
+    if table.count as usize % AccountAddress::LENGTH != 0 {
+        return Err(PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Bad Address Identifier pool size".to_string()));
+    }
+    for _i in 0..table.count as usize / AccountAddress::LENGTH {
+        let end_addr = start + AccountAddress::LENGTH;
+        let address = binary.slice(start, end_addr).try_into();
+        if address.is_err() {
+            return Err(PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Invalid Address format".to_string()));
+        }
+        start = end_addr;
+
+        addresses.push(address.unwrap());
+    }
+    Ok(())
+}
+
+/// Builds the `ConstantPool`.
+fn load_constant_pool(
+    binary: &VersionedBinary,
+    table: &Table,
+    constants: &mut ConstantPool,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        constants.push(load_constant(&mut cursor)?)
+    }
+    Ok(())
+}
+
+/// Build a single `Constant`
+fn load_constant(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Constant> {
+    let type_ = load_signature_token(cursor)?;
+    let data = load_byte_blob(cursor, load_constant_size)?;
+    Ok(Constant { type_, data })
+}
+
+/// Builds a metadata vector.
+fn load_metadata(
+    binary: &VersionedBinary,
+    table: &Table,
+    metadata: &mut Vec<Metadata>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        metadata.push(load_metadata_entry(&mut cursor)?)
+    }
+    Ok(())
+}
+
+/// Build a single metadata entry.
+fn load_metadata_entry(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Metadata> {
+    let key = load_byte_blob(cursor, load_metadata_key_size)?;
+    let value = load_byte_blob(cursor, load_metadata_value_size)?;
+    Ok(Metadata { key, value })
+}
+
+/// Helper to load a byte blob with specific size loader.
+fn load_byte_blob(
+    cursor: &mut VersionedCursor,
+    size_loader: impl Fn(&mut VersionedCursor) -> BinaryLoaderResult<usize>,
+) -> BinaryLoaderResult<Vec<u8>> {
+    let size = size_loader(cursor)?;
+    let mut data: Vec<u8> = vec![0u8; size];
+    let count = cursor.read(&mut data).map_err(|_| {
+        PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Unexpected end of table".to_string())
+    })?;
+    if count != size {
+        return Err(PartialVMError::new(StatusCode::MALFORMED)
+            .with_message("Bad byte blob size".to_string()));
+    }
+    Ok(data)
+}
+
+/// Builds the `SignaturePool`.
+fn load_signatures(
+    binary: &VersionedBinary,
+    table: &Table,
+    signatures: &mut SignaturePool,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        signatures.push(Signature(load_signature_tokens(&mut cursor)?));
+    }
+    Ok(())
+}
+
+fn load_signature_tokens(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Vec<SignatureToken>> {
+    let len = load_signature_size(cursor)?;
+    let mut tokens = vec![];
+    for _ in 0..len {
+        tokens.push(load_signature_token(cursor)?);
+    }
+    Ok(tokens)
+}
+
+#[cfg(test)]
+pub fn load_signature_token_test_entry(
+    cursor: std::io::Cursor<&[u8]>,
+) -> BinaryLoaderResult<SignatureToken> {
+    load_signature_token(&mut VersionedCursor::new_for_test(VERSION_MAX, cursor))
+}
+
+/// Deserializes a `SignatureToken`.
+fn load_signature_token(cursor: &mut VersionedCursor) -> BinaryLoaderResult<SignatureToken> {
+    // The following algorithm works by storing partially constructed types on a stack.
+    //
+    // Example:
+    //
+    //     SignatureToken: `Foo<u8, Foo<u64, bool, Bar>, address>`
+    //     Byte Stream:    Foo u8 Foo u64 bool Bar address
+    //
+    // Stack Transitions:
+    //     []
+    //     [Foo<?, ?, ?>]
+    //     [Foo<?, ?, ?>, u8]
+    //     [Foo<u8, ?, ?>]
+    //     [Foo<u8, ?, ?>, Foo<?, ?, ?>]
+    //     [Foo<u8, ?, ?>, Foo<?, ?, ?>, u64]
+    //     [Foo<u8, ?, ?>, Foo<u64, ?, ?>]
+    //     [Foo<u8, ?, ?>, Foo<u64, ?, ?>, bool]
+    //     [Foo<u8, ?, ?>, Foo<u64, bool, ?>]
+    //     [Foo<u8, ?, ?>, Foo<u64, bool, ?>, Bar]
+    //     [Foo<u8, ?, ?>, Foo<u64, bool, Bar>]
+    //     [Foo<u8, Foo<u64, bool, Bar>, ?>]
+    //     [Foo<u8, Foo<u64, bool, Bar>, ?>, address]
+    //     [Foo<u8, Foo<u64, bool, Bar>, address>]        (done)
+
+    use SerializedType as S;
+
+    enum TypeBuilder {
+        Saturated(SignatureToken),
+        Vector,
+        Reference,
+        MutableReference,
+        StructInst {
+            sh_idx: StructHandleIndex,
+            arity: usize,
+            ty_args: Vec<SignatureToken>,
+        },
+    }
+
+    impl TypeBuilder {
+        fn apply(self, tok: SignatureToken) -> Self {
+            match self {
+                T::Vector => T::Saturated(SignatureToken::Vector(Box::new(tok))),
+                T::Reference => T::Saturated(SignatureToken::Reference(Box::new(tok))),
+                T::MutableReference => {
+                    T::Saturated(SignatureToken::MutableReference(Box::new(tok)))
+                }
+                T::StructInst {
+                    sh_idx,
+                    arity,
+                    mut ty_args,
+                } => {
+                    ty_args.push(tok);
+                    if ty_args.len() >= arity {
+                        T::Saturated(SignatureToken::StructInstantiation(sh_idx, ty_args))
+                    } else {
+                        T::StructInst {
+                            sh_idx,
+                            arity,
+                            ty_args,
+                        }
+                    }
+                }
+                _ => unreachable!("invalid type constructor application"),
+            }
+        }
+
+        fn is_saturated(&self) -> bool {
+            matches!(self, T::Saturated(_))
+        }
+
+        fn unwrap_saturated(self) -> SignatureToken {
+            match self {
+                T::Saturated(tok) => tok,
+                _ => unreachable!("cannot unwrap unsaturated type constructor"),
+            }
+        }
+    }
+
+    use TypeBuilder as T;
+
+    let mut read_next = || {
+        if let Ok(byte) = cursor.read_u8() {
+            match S::from_u8(byte)? {
+                S::U16 | S::U32 | S::U256 if (cursor.version() < VERSION_6) => {
+                    return Err(
+                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                            "u16, u32, u256 integers not supported in bytecode version {}",
+                            cursor.version()
+                        )),
+                    );
+                }
+                _ => (),
+            };
+
+            Ok(match S::from_u8(byte)? {
+                S::BOOL => T::Saturated(SignatureToken::Bool),
+                S::U8 => T::Saturated(SignatureToken::U8),
+                S::U16 => T::Saturated(SignatureToken::U16),
+                S::U32 => T::Saturated(SignatureToken::U32),
+                S::U64 => T::Saturated(SignatureToken::U64),
+                S::U128 => T::Saturated(SignatureToken::U128),
+                S::U256 => T::Saturated(SignatureToken::U256),
+                S::ADDRESS => T::Saturated(SignatureToken::Address),
+                S::SIGNER => T::Saturated(SignatureToken::Signer),
+                S::VECTOR => T::Vector,
+                S::REFERENCE => T::Reference,
+                S::MUTABLE_REFERENCE => T::MutableReference,
+                S::STRUCT => {
+                    let sh_idx = load_struct_handle_index(cursor)?;
+                    T::Saturated(SignatureToken::Struct(sh_idx))
+                }
+                S::STRUCT_INST => {
+                    let sh_idx = load_struct_handle_index(cursor)?;
+                    let arity = load_type_parameter_count(cursor)?;
+                    if arity == 0 {
+                        return Err(PartialVMError::new(StatusCode::MALFORMED)
+                            .with_message("Struct inst with arity 0".to_string()));
+                    }
+                    T::StructInst {
+                        sh_idx,
+                        arity,
+                        ty_args: vec![],
+                    }
+                }
+                S::TYPE_PARAMETER => {
+                    let idx = load_type_parameter_index(cursor)?;
+                    T::Saturated(SignatureToken::TypeParameter(idx))
+                }
+            })
+        } else {
+            Err(PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Unexpected EOF".to_string()))
+        }
+    };
+
+    let mut stack = match read_next()? {
+        T::Saturated(tok) => return Ok(tok),
+        t => vec![t],
+    };
+
+    loop {
+        if stack.len() > SIGNATURE_TOKEN_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Maximum recursion depth reached".to_string()));
+        }
+        if stack.last().unwrap().is_saturated() {
+            let tok = stack.pop().unwrap().unwrap_saturated();
+            match stack.pop() {
+                Some(t) => stack.push(t.apply(tok)),
+                None => return Ok(tok),
+            }
+        } else {
+            stack.push(read_next()?)
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
+enum AbilitySetPosition {
+    FunctionTypeParameters,
+    StructTypeParameters,
+    StructHandle,
+}
+
+fn load_ability_set(
+    cursor: &mut VersionedCursor,
+    pos: AbilitySetPosition,
+) -> BinaryLoaderResult<AbilitySet> {
+    // If the module was on the old kind system:
+    // - For struct declarations
+    //   - resource kind structs become store+resource structs
+    //   - copyable kind structs become store+copy+drop structs
+    // - For function type parameter constraints
+    //   - all kind becomes store, since it might be used in global storage
+    //   - resource kind becomes store+resource
+    //   - copyable kind becomes store+copy+drop
+    // - For struct type parameter constraints
+    //   - all kind becomes empty
+    //   - resource kind becomes resource
+    //   - copyable kind becomes copy+drop
+    // In summary, we do not need store on the struct type parameter case for backwards
+    // compatibility because any old code paths or entry points will use them with store types.
+    // Any new code paths gain flexibility by being able to use the struct with possibly non-store
+    // instantiations
+    if cursor.version() < 2 {
+        let byte = match cursor.read_u8() {
+            Ok(byte) => byte,
+            Err(_) => {
+                return Err(PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Unexpected EOF".to_string()))
+            }
+        };
+        match pos {
+            AbilitySetPosition::StructHandle => {
+                Ok(match DeprecatedNominalResourceFlag::from_u8(byte)? {
+                    DeprecatedNominalResourceFlag::NOMINAL_RESOURCE => {
+                        AbilitySet::EMPTY | Ability::Store | Ability::Key
+                    }
+                    DeprecatedNominalResourceFlag::NORMAL_STRUCT => {
+                        AbilitySet::EMPTY | Ability::Store | Ability::Copy | Ability::Drop
+                    }
+                })
+            }
+            AbilitySetPosition::FunctionTypeParameters
+            | AbilitySetPosition::StructTypeParameters => {
+                let set = match DeprecatedKind::from_u8(byte)? {
+                    DeprecatedKind::ALL => AbilitySet::EMPTY,
+                    DeprecatedKind::COPYABLE => AbilitySet::EMPTY | Ability::Copy | Ability::Drop,
+                    DeprecatedKind::RESOURCE => AbilitySet::EMPTY | Ability::Key,
+                };
+                Ok(match pos {
+                    AbilitySetPosition::StructHandle => unreachable!(),
+                    AbilitySetPosition::FunctionTypeParameters => set | Ability::Store,
+                    AbilitySetPosition::StructTypeParameters => set,
+                })
+            }
+        }
+    } else {
+        // The uleb here doesn't really do anything as it is bounded currently to 0xF, but the
+        // if we get many more constraints in the future, uleb will be helpful.
+        let u = read_uleb_internal(cursor, AbilitySet::ALL.into_u8() as u64)?;
+        match AbilitySet::from_u8(u) {
+            Some(abilities) => Ok(abilities),
+            None => Err(PartialVMError::new(StatusCode::UNKNOWN_ABILITY)),
+        }
+    }
+}
+
+fn load_ability_sets(
+    cursor: &mut VersionedCursor,
+    pos: AbilitySetPosition,
+) -> BinaryLoaderResult<Vec<AbilitySet>> {
+    let len = load_type_parameter_count(cursor)?;
+    let mut kinds = vec![];
+    for _ in 0..len {
+        kinds.push(load_ability_set(cursor, pos)?);
+    }
+    Ok(kinds)
+}
+
+fn load_struct_type_parameters(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<Vec<StructTypeParameter>> {
+    let len = load_type_parameter_count(cursor)?;
+    let mut type_params = Vec::with_capacity(len);
+    for _ in 0..len {
+        type_params.push(load_struct_type_parameter(cursor)?);
+    }
+    Ok(type_params)
+}
+
+fn load_struct_type_parameter(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<StructTypeParameter> {
+    let constraints = load_ability_set(cursor, AbilitySetPosition::StructTypeParameters)?;
+    let is_phantom = if cursor.version() < VERSION_3 {
+        false
+    } else {
+        let byte: u8 = read_uleb_internal(cursor, 1)?;
+        byte != 0
+    };
+    Ok(StructTypeParameter {
+        constraints,
+        is_phantom,
+    })
+}
+
+/// Builds the `StructDefinition` table.
+fn load_struct_defs(
+    binary: &VersionedBinary,
+    table: &Table,
+    struct_defs: &mut Vec<StructDefinition>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        let struct_handle = load_struct_handle_index(&mut cursor)?;
+        let field_information_flag = match cursor.read_u8() {
+            Ok(byte) => SerializedNativeStructFlag::from_u8(byte)?,
+            Err(_) => {
+                return Err(PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Invalid field info in struct".to_string()))
+            }
+        };
+        let field_information = match field_information_flag {
+            SerializedNativeStructFlag::NATIVE => StructFieldInformation::Native,
+            SerializedNativeStructFlag::DECLARED => {
+                let fields = load_field_defs(&mut cursor)?;
+                StructFieldInformation::Declared(fields)
+            }
+        };
+        struct_defs.push(StructDefinition {
+            struct_handle,
+            field_information,
+        });
+    }
+    Ok(())
+}
+
+fn load_field_defs(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Vec<FieldDefinition>> {
+    let mut fields = Vec::new();
+    let field_count = load_field_count(cursor)?;
+    for _ in 0..field_count {
+        fields.push(load_field_def(cursor)?);
+    }
+    Ok(fields)
+}
+
+fn load_field_def(cursor: &mut VersionedCursor) -> BinaryLoaderResult<FieldDefinition> {
+    let name = load_identifier_index(cursor)?;
+    let signature = load_signature_token(cursor)?;
+    Ok(FieldDefinition {
+        name,
+        signature: TypeSignature(signature),
+    })
+}
+
+/// Builds the `FunctionDefinition` table.
+fn load_function_defs(
+    binary: &VersionedBinary,
+    table: &Table,
+    func_defs: &mut Vec<FunctionDefinition>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    while cursor.position() < u64::from(table.count) {
+        let func_def = load_function_def(&mut cursor)?;
+        func_defs.push(func_def);
+    }
+    Ok(())
+}
+
+fn load_field_handles(
+    binary: &VersionedBinary,
+    table: &Table,
+    field_handles: &mut Vec<FieldHandle>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    loop {
+        if cursor.position() == u64::from(table.count) {
+            break;
+        }
+        let struct_idx = load_struct_def_index(&mut cursor)?;
+        let offset = load_field_offset(&mut cursor)?;
+        field_handles.push(FieldHandle {
+            owner: struct_idx,
+            field: offset,
+        });
+    }
+    Ok(())
+}
+
+fn load_field_instantiations(
+    binary: &VersionedBinary,
+    table: &Table,
+    field_insts: &mut Vec<FieldInstantiation>,
+) -> BinaryLoaderResult<()> {
+    let start = table.offset as usize;
+    let end = start + table.count as usize;
+    let mut cursor = binary.new_cursor(start, end);
+    loop {
+        if cursor.position() == u64::from(table.count) {
+            break;
+        }
+        let handle = load_field_handle_index(&mut cursor)?;
+        let type_parameters = load_signature_index(&mut cursor)?;
+        field_insts.push(FieldInstantiation {
+            handle,
+            type_parameters,
+        });
+    }
+    Ok(())
+}
+
+/// Deserializes a `FunctionDefinition`.
+fn load_function_def(cursor: &mut VersionedCursor) -> BinaryLoaderResult<FunctionDefinition> {
+    let function = load_function_handle_index(cursor)?;
+
+    let mut flags = cursor.read_u8().map_err(|_| {
+        PartialVMError::new(StatusCode::MALFORMED).with_message("Unexpected EOF".to_string())
+    })?;
+
+    // NOTE: changes compared with VERSION_1
+    // - in VERSION_1: the flags is a byte compositing both the visibility info and whether
+    //                 the function is a native function
+    // - in VERSION_2 onwards: the flags only represent the visibility info and we need to
+    //                 advance the cursor to read up the next byte as flags
+    // - in VERSION_5 onwards: script visibility has been deprecated for an entry function flag
+    let (visibility, is_entry, mut extra_flags) = if cursor.version() == VERSION_1 {
+        let vis = if (flags & FunctionDefinition::DEPRECATED_PUBLIC_BIT) != 0 {
+            flags ^= FunctionDefinition::DEPRECATED_PUBLIC_BIT;
+            Visibility::Public
+        } else {
+            Visibility::Private
+        };
+        (vis, false, flags)
+    } else if cursor.version() < VERSION_5 {
+        let (vis, is_entry) = if flags == Visibility::DEPRECATED_SCRIPT {
+            (Visibility::Public, true)
+        } else {
+            let vis = flags.try_into().map_err(|_| {
+                PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Invalid visibility byte".to_string())
+            })?;
+            (vis, false)
+        };
+        let extra_flags = cursor.read_u8().map_err(|_| {
+            PartialVMError::new(StatusCode::MALFORMED).with_message("Unexpected EOF".to_string())
+        })?;
+        (vis, is_entry, extra_flags)
+    } else {
+        let vis = flags.try_into().map_err(|_| {
+            PartialVMError::new(StatusCode::MALFORMED)
+                .with_message("Invalid visibility byte".to_string())
+        })?;
+
+        let mut extra_flags = cursor.read_u8().map_err(|_| {
+            PartialVMError::new(StatusCode::MALFORMED).with_message("Unexpected EOF".to_string())
+        })?;
+        let is_entry = (extra_flags & FunctionDefinition::ENTRY) != 0;
+        if is_entry {
+            extra_flags ^= FunctionDefinition::ENTRY;
+        }
+        (vis, is_entry, extra_flags)
+    };
+
+    let acquires_global_resources = load_struct_definition_indices(cursor)?;
+    let code_unit = if (extra_flags & FunctionDefinition::NATIVE) != 0 {
+        extra_flags ^= FunctionDefinition::NATIVE;
+        None
+    } else {
+        Some(load_code_unit(cursor)?)
+    };
+
+    // check that the bits unused in the flags are not set, otherwise it might cause some trouble
+    // if later we decide to assign meaning to these bits.
+    if extra_flags != 0 {
+        return Err(PartialVMError::new(StatusCode::INVALID_FLAG_BITS));
+    }
+
+    Ok(FunctionDefinition {
+        function,
+        visibility,
+        is_entry,
+        acquires_global_resources,
+        code: code_unit,
+    })
+}
+
+/// Deserializes a `Vec<StructDefinitionIndex>`.
+fn load_struct_definition_indices(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<Vec<StructDefinitionIndex>> {
+    let len = load_acquires_count(cursor)?;
+    let mut indices = vec![];
+    for _ in 0..len {
+        indices.push(load_struct_def_index(cursor)?);
+    }
+    Ok(indices)
+}
+
+/// Deserializes a `CodeUnit`.
+fn load_code_unit(cursor: &mut VersionedCursor) -> BinaryLoaderResult<CodeUnit> {
+    let locals = load_signature_index(cursor)?;
+
+    let mut code_unit = CodeUnit {
+        locals,
+        code: vec![],
+    };
+
+    load_code(cursor, &mut code_unit.code)?;
+    Ok(code_unit)
+}
+
+/// Deserializes a code stream (`Bytecode`s).
+fn load_code(cursor: &mut VersionedCursor, code: &mut Vec<Bytecode>) -> BinaryLoaderResult<()> {
+    let bytecode_count = load_bytecode_count(cursor)?;
+
+    while code.len() < bytecode_count {
+        let byte = cursor.read_u8().map_err(|_| {
+            PartialVMError::new(StatusCode::MALFORMED).with_message("Unexpected EOF".to_string())
+        })?;
+        let opcode = Opcodes::from_u8(byte)?;
+        // version checking
+        match opcode {
+            Opcodes::VEC_PACK
+            | Opcodes::VEC_LEN
+            | Opcodes::VEC_IMM_BORROW
+            | Opcodes::VEC_MUT_BORROW
+            | Opcodes::VEC_PUSH_BACK
+            | Opcodes::VEC_POP_BACK
+            | Opcodes::VEC_UNPACK
+            | Opcodes::VEC_SWAP => {
+                if cursor.version() < VERSION_4 {
+                    return Err(
+                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                            "Vector operations not available before bytecode version {}",
+                            VERSION_4
+                        )),
+                    );
+                }
+            }
+            _ => {}
+        };
+
+        match opcode {
+            Opcodes::LD_U16
+            | Opcodes::LD_U32
+            | Opcodes::LD_U256
+            | Opcodes::CAST_U16
+            | Opcodes::CAST_U32
+            | Opcodes::CAST_U256
+                if (cursor.version() < VERSION_6) =>
+            {
+                return Err(
+                    PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                        "Loading or casting u16, u32, u256 integers not supported in bytecode version {}",
+                        cursor.version()
+                    )),
+                );
+            }
+            _ => (),
+        };
+
+        // conversion
+        let bytecode = match opcode {
+            Opcodes::POP => Bytecode::Pop,
+            Opcodes::RET => Bytecode::Ret,
+            Opcodes::BR_TRUE => Bytecode::BrTrue(load_bytecode_index(cursor)?),
+            Opcodes::BR_FALSE => Bytecode::BrFalse(load_bytecode_index(cursor)?),
+            Opcodes::BRANCH => Bytecode::Branch(load_bytecode_index(cursor)?),
+            Opcodes::LD_U8 => {
+                let value = cursor.read_u8().map_err(|_| {
+                    PartialVMError::new(StatusCode::MALFORMED)
+                        .with_message("Unexpected EOF".to_string())
+                })?;
+                Bytecode::LdU8(value)
+            }
+            Opcodes::LD_U64 => {
+                let value = read_u64_internal(cursor)?;
+                Bytecode::LdU64(value)
+            }
+            Opcodes::LD_U128 => {
+                let value = read_u128_internal(cursor)?;
+                Bytecode::LdU128(value)
+            }
+            Opcodes::CAST_U8 => Bytecode::CastU8,
+            Opcodes::CAST_U64 => Bytecode::CastU64,
+            Opcodes::CAST_U128 => Bytecode::CastU128,
+            Opcodes::LD_CONST => Bytecode::LdConst(load_constant_pool_index(cursor)?),
+            Opcodes::LD_TRUE => Bytecode::LdTrue,
+            Opcodes::LD_FALSE => Bytecode::LdFalse,
+            Opcodes::COPY_LOC => Bytecode::CopyLoc(load_local_index(cursor)?),
+            Opcodes::MOVE_LOC => Bytecode::MoveLoc(load_local_index(cursor)?),
+            Opcodes::ST_LOC => Bytecode::StLoc(load_local_index(cursor)?),
+            Opcodes::MUT_BORROW_LOC => Bytecode::MutBorrowLoc(load_local_index(cursor)?),
+            Opcodes::IMM_BORROW_LOC => Bytecode::ImmBorrowLoc(load_local_index(cursor)?),
+            Opcodes::MUT_BORROW_FIELD => Bytecode::MutBorrowField(load_field_handle_index(cursor)?),
+            Opcodes::MUT_BORROW_FIELD_GENERIC => {
+                Bytecode::MutBorrowFieldGeneric(load_field_inst_index(cursor)?)
+            }
+            Opcodes::IMM_BORROW_FIELD => Bytecode::ImmBorrowField(load_field_handle_index(cursor)?),
+            Opcodes::IMM_BORROW_FIELD_GENERIC => {
+                Bytecode::ImmBorrowFieldGeneric(load_field_inst_index(cursor)?)
+            }
+            Opcodes::CALL => Bytecode::Call(load_function_handle_index(cursor)?),
+            Opcodes::CALL_GENERIC => Bytecode::CallGeneric(load_function_inst_index(cursor)?),
+            Opcodes::PACK => Bytecode::Pack(load_struct_def_index(cursor)?),
+            Opcodes::PACK_GENERIC => Bytecode::PackGeneric(load_struct_def_inst_index(cursor)?),
+            Opcodes::UNPACK => Bytecode::Unpack(load_struct_def_index(cursor)?),
+            Opcodes::UNPACK_GENERIC => Bytecode::UnpackGeneric(load_struct_def_inst_index(cursor)?),
+            Opcodes::READ_REF => Bytecode::ReadRef,
+            Opcodes::WRITE_REF => Bytecode::WriteRef,
+            Opcodes::ADD => Bytecode::Add,
+            Opcodes::SUB => Bytecode::Sub,
+            Opcodes::MUL => Bytecode::Mul,
+            Opcodes::MOD => Bytecode::Mod,
+            Opcodes::DIV => Bytecode::Div,
+            Opcodes::BIT_OR => Bytecode::BitOr,
+            Opcodes::BIT_AND => Bytecode::BitAnd,
+            Opcodes::XOR => Bytecode::Xor,
+            Opcodes::SHL => Bytecode::Shl,
+            Opcodes::SHR => Bytecode::Shr,
+            Opcodes::OR => Bytecode::Or,
+            Opcodes::AND => Bytecode::And,
+            Opcodes::NOT => Bytecode::Not,
+            Opcodes::EQ => Bytecode::Eq,
+            Opcodes::NEQ => Bytecode::Neq,
+            Opcodes::LT => Bytecode::Lt,
+            Opcodes::GT => Bytecode::Gt,
+            Opcodes::LE => Bytecode::Le,
+            Opcodes::GE => Bytecode::Ge,
+            Opcodes::ABORT => Bytecode::Abort,
+            Opcodes::NOP => Bytecode::Nop,
+            Opcodes::EXISTS => Bytecode::Exists(load_struct_def_index(cursor)?),
+            Opcodes::EXISTS_GENERIC => Bytecode::ExistsGeneric(load_struct_def_inst_index(cursor)?),
+            Opcodes::MUT_BORROW_GLOBAL => Bytecode::MutBorrowGlobal(load_struct_def_index(cursor)?),
+            Opcodes::MUT_BORROW_GLOBAL_GENERIC => {
+                Bytecode::MutBorrowGlobalGeneric(load_struct_def_inst_index(cursor)?)
+            }
+            Opcodes::IMM_BORROW_GLOBAL => Bytecode::ImmBorrowGlobal(load_struct_def_index(cursor)?),
+            Opcodes::IMM_BORROW_GLOBAL_GENERIC => {
+                Bytecode::ImmBorrowGlobalGeneric(load_struct_def_inst_index(cursor)?)
+            }
+            Opcodes::MOVE_FROM => Bytecode::MoveFrom(load_struct_def_index(cursor)?),
+            Opcodes::MOVE_FROM_GENERIC => {
+                Bytecode::MoveFromGeneric(load_struct_def_inst_index(cursor)?)
+            }
+            Opcodes::MOVE_TO => Bytecode::MoveTo(load_struct_def_index(cursor)?),
+            Opcodes::MOVE_TO_GENERIC => {
+                Bytecode::MoveToGeneric(load_struct_def_inst_index(cursor)?)
+            }
+            Opcodes::FREEZE_REF => Bytecode::FreezeRef,
+            Opcodes::VEC_PACK => {
+                Bytecode::VecPack(load_signature_index(cursor)?, read_u64_internal(cursor)?)
+            }
+            Opcodes::VEC_LEN => Bytecode::VecLen(load_signature_index(cursor)?),
+            Opcodes::VEC_IMM_BORROW => Bytecode::VecImmBorrow(load_signature_index(cursor)?),
+            Opcodes::VEC_MUT_BORROW => Bytecode::VecMutBorrow(load_signature_index(cursor)?),
+            Opcodes::VEC_PUSH_BACK => Bytecode::VecPushBack(load_signature_index(cursor)?),
+            Opcodes::VEC_POP_BACK => Bytecode::VecPopBack(load_signature_index(cursor)?),
+            Opcodes::VEC_UNPACK => {
+                Bytecode::VecUnpack(load_signature_index(cursor)?, read_u64_internal(cursor)?)
+            }
+            Opcodes::VEC_SWAP => Bytecode::VecSwap(load_signature_index(cursor)?),
+            Opcodes::LD_U16 => {
+                let value = read_u16_internal(cursor)?;
+                Bytecode::LdU16(value)
+            }
+            Opcodes::LD_U32 => {
+                let value = read_u32_internal(cursor)?;
+                Bytecode::LdU32(value)
+            }
+            Opcodes::LD_U256 => {
+                let value = read_u256_internal(cursor)?;
+                Bytecode::LdU256(value)
+            }
+            Opcodes::CAST_U16 => Bytecode::CastU16,
+            Opcodes::CAST_U32 => Bytecode::CastU32,
+            Opcodes::CAST_U256 => Bytecode::CastU256,
+        };
+        code.push(bytecode);
+    }
+    Ok(())
+}
+
+impl TableType {
+    fn from_u8(value: u8) -> BinaryLoaderResult<TableType> {
+        match value {
+            0x1 => Ok(TableType::MODULE_HANDLES),
+            0x2 => Ok(TableType::STRUCT_HANDLES),
+            0x3 => Ok(TableType::FUNCTION_HANDLES),
+            0x4 => Ok(TableType::FUNCTION_INST),
+            0x5 => Ok(TableType::SIGNATURES),
+            0x6 => Ok(TableType::CONSTANT_POOL),
+            0x7 => Ok(TableType::IDENTIFIERS),
+            0x8 => Ok(TableType::ADDRESS_IDENTIFIERS),
+            0xA => Ok(TableType::STRUCT_DEFS),
+            0xB => Ok(TableType::STRUCT_DEF_INST),
+            0xC => Ok(TableType::FUNCTION_DEFS),
+            0xD => Ok(TableType::FIELD_HANDLE),
+            0xE => Ok(TableType::FIELD_INST),
+            0xF => Ok(TableType::FRIEND_DECLS),
+            0x10 => Ok(TableType::METADATA),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_TABLE_TYPE)),
+        }
+    }
+}
+
+impl SerializedType {
+    fn from_u8(value: u8) -> BinaryLoaderResult<SerializedType> {
+        match value {
+            0x1 => Ok(SerializedType::BOOL),
+            0x2 => Ok(SerializedType::U8),
+            0x3 => Ok(SerializedType::U64),
+            0x4 => Ok(SerializedType::U128),
+            0x5 => Ok(SerializedType::ADDRESS),
+            0x6 => Ok(SerializedType::REFERENCE),
+            0x7 => Ok(SerializedType::MUTABLE_REFERENCE),
+            0x8 => Ok(SerializedType::STRUCT),
+            0x9 => Ok(SerializedType::TYPE_PARAMETER),
+            0xA => Ok(SerializedType::VECTOR),
+            0xB => Ok(SerializedType::STRUCT_INST),
+            0xC => Ok(SerializedType::SIGNER),
+            0xD => Ok(SerializedType::U16),
+            0xE => Ok(SerializedType::U32),
+            0xF => Ok(SerializedType::U256),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_SERIALIZED_TYPE)),
+        }
+    }
+}
+
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum DeprecatedNominalResourceFlag {
+    NOMINAL_RESOURCE        = 0x1,
+    NORMAL_STRUCT           = 0x2,
+}
+
+impl DeprecatedNominalResourceFlag {
+    fn from_u8(value: u8) -> BinaryLoaderResult<DeprecatedNominalResourceFlag> {
+        match value {
+            0x1 => Ok(DeprecatedNominalResourceFlag::NOMINAL_RESOURCE),
+            0x2 => Ok(DeprecatedNominalResourceFlag::NORMAL_STRUCT),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_ABILITY)),
+        }
+    }
+}
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+enum DeprecatedKind {
+    ALL                     = 0x1,
+    COPYABLE                = 0x2,
+    RESOURCE                = 0x3,
+}
+
+impl DeprecatedKind {
+    fn from_u8(value: u8) -> BinaryLoaderResult<DeprecatedKind> {
+        match value {
+            0x1 => Ok(DeprecatedKind::ALL),
+            0x2 => Ok(DeprecatedKind::COPYABLE),
+            0x3 => Ok(DeprecatedKind::RESOURCE),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_ABILITY)),
+        }
+    }
+}
+
+impl SerializedNativeStructFlag {
+    fn from_u8(value: u8) -> BinaryLoaderResult<SerializedNativeStructFlag> {
+        match value {
+            0x1 => Ok(SerializedNativeStructFlag::NATIVE),
+            0x2 => Ok(SerializedNativeStructFlag::DECLARED),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_NATIVE_STRUCT_FLAG)),
+        }
+    }
+}
+
+impl Opcodes {
+    fn from_u8(value: u8) -> BinaryLoaderResult<Opcodes> {
+        match value {
+            0x01 => Ok(Opcodes::POP),
+            0x02 => Ok(Opcodes::RET),
+            0x03 => Ok(Opcodes::BR_TRUE),
+            0x04 => Ok(Opcodes::BR_FALSE),
+            0x05 => Ok(Opcodes::BRANCH),
+            0x06 => Ok(Opcodes::LD_U64),
+            0x07 => Ok(Opcodes::LD_CONST),
+            0x08 => Ok(Opcodes::LD_TRUE),
+            0x09 => Ok(Opcodes::LD_FALSE),
+            0x0A => Ok(Opcodes::COPY_LOC),
+            0x0B => Ok(Opcodes::MOVE_LOC),
+            0x0C => Ok(Opcodes::ST_LOC),
+            0x0D => Ok(Opcodes::MUT_BORROW_LOC),
+            0x0E => Ok(Opcodes::IMM_BORROW_LOC),
+            0x0F => Ok(Opcodes::MUT_BORROW_FIELD),
+            0x10 => Ok(Opcodes::IMM_BORROW_FIELD),
+            0x11 => Ok(Opcodes::CALL),
+            0x12 => Ok(Opcodes::PACK),
+            0x13 => Ok(Opcodes::UNPACK),
+            0x14 => Ok(Opcodes::READ_REF),
+            0x15 => Ok(Opcodes::WRITE_REF),
+            0x16 => Ok(Opcodes::ADD),
+            0x17 => Ok(Opcodes::SUB),
+            0x18 => Ok(Opcodes::MUL),
+            0x19 => Ok(Opcodes::MOD),
+            0x1A => Ok(Opcodes::DIV),
+            0x1B => Ok(Opcodes::BIT_OR),
+            0x1C => Ok(Opcodes::BIT_AND),
+            0x1D => Ok(Opcodes::XOR),
+            0x1E => Ok(Opcodes::OR),
+            0x1F => Ok(Opcodes::AND),
+            0x20 => Ok(Opcodes::NOT),
+            0x21 => Ok(Opcodes::EQ),
+            0x22 => Ok(Opcodes::NEQ),
+            0x23 => Ok(Opcodes::LT),
+            0x24 => Ok(Opcodes::GT),
+            0x25 => Ok(Opcodes::LE),
+            0x26 => Ok(Opcodes::GE),
+            0x27 => Ok(Opcodes::ABORT),
+            0x28 => Ok(Opcodes::NOP),
+            0x29 => Ok(Opcodes::EXISTS),
+            0x2A => Ok(Opcodes::MUT_BORROW_GLOBAL),
+            0x2B => Ok(Opcodes::IMM_BORROW_GLOBAL),
+            0x2C => Ok(Opcodes::MOVE_FROM),
+            0x2D => Ok(Opcodes::MOVE_TO),
+            0x2E => Ok(Opcodes::FREEZE_REF),
+            0x2F => Ok(Opcodes::SHL),
+            0x30 => Ok(Opcodes::SHR),
+            0x31 => Ok(Opcodes::LD_U8),
+            0x32 => Ok(Opcodes::LD_U128),
+            0x33 => Ok(Opcodes::CAST_U8),
+            0x34 => Ok(Opcodes::CAST_U64),
+            0x35 => Ok(Opcodes::CAST_U128),
+            0x36 => Ok(Opcodes::MUT_BORROW_FIELD_GENERIC),
+            0x37 => Ok(Opcodes::IMM_BORROW_FIELD_GENERIC),
+            0x38 => Ok(Opcodes::CALL_GENERIC),
+            0x39 => Ok(Opcodes::PACK_GENERIC),
+            0x3A => Ok(Opcodes::UNPACK_GENERIC),
+            0x3B => Ok(Opcodes::EXISTS_GENERIC),
+            0x3C => Ok(Opcodes::MUT_BORROW_GLOBAL_GENERIC),
+            0x3D => Ok(Opcodes::IMM_BORROW_GLOBAL_GENERIC),
+            0x3E => Ok(Opcodes::MOVE_FROM_GENERIC),
+            0x3F => Ok(Opcodes::MOVE_TO_GENERIC),
+            0x40 => Ok(Opcodes::VEC_PACK),
+            0x41 => Ok(Opcodes::VEC_LEN),
+            0x42 => Ok(Opcodes::VEC_IMM_BORROW),
+            0x43 => Ok(Opcodes::VEC_MUT_BORROW),
+            0x44 => Ok(Opcodes::VEC_PUSH_BACK),
+            0x45 => Ok(Opcodes::VEC_POP_BACK),
+            0x46 => Ok(Opcodes::VEC_UNPACK),
+            0x47 => Ok(Opcodes::VEC_SWAP),
+            0x48 => Ok(Opcodes::LD_U16),
+            0x49 => Ok(Opcodes::LD_U32),
+            0x4A => Ok(Opcodes::LD_U256),
+            0x4B => Ok(Opcodes::CAST_U16),
+            0x4C => Ok(Opcodes::CAST_U32),
+            0x4D => Ok(Opcodes::CAST_U256),
+            _ => Err(PartialVMError::new(StatusCode::UNKNOWN_OPCODE)),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/errors.rs b/vendors/move/crates/move-binary-format/src/errors.rs
new file mode 100644
index 000000000..5d4ad1a7f
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/errors.rs
@@ -0,0 +1,532 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    file_format::{CodeOffset, FunctionDefinitionIndex, TableIndex},
+    IndexKind,
+};
+use move_core_types::{
+    language_storage::ModuleId,
+    vm_status::{self, StatusCode, StatusType, VMStatus},
+};
+use std::fmt;
+
+pub type VMResult<T> = ::std::result::Result<T, VMError>;
+pub type BinaryLoaderResult<T> = ::std::result::Result<T, PartialVMError>;
+pub type PartialVMResult<T> = ::std::result::Result<T, PartialVMError>;
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub enum Location {
+    Undefined,
+    Script,
+    Module(ModuleId),
+}
+
+/// A representation of the execution state (e.g., stack trace) at an
+/// error point.
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub struct ExecutionState {
+    stack_trace: Vec<(Option<ModuleId>, FunctionDefinitionIndex, CodeOffset)>,
+    // we may consider adding more state if necessary
+}
+
+impl ExecutionState {
+    pub fn new(stack_trace: Vec<(Option<ModuleId>, FunctionDefinitionIndex, CodeOffset)>) -> Self {
+        Self { stack_trace }
+    }
+
+    pub fn stack_trace(&self) -> &Vec<(Option<ModuleId>, FunctionDefinitionIndex, CodeOffset)> {
+        &self.stack_trace
+    }
+}
+
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct VMError(Box<VMError_>);
+
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+struct VMError_ {
+    major_status: StatusCode,
+    sub_status: Option<u64>,
+    message: Option<String>,
+    exec_state: Option<ExecutionState>,
+    location: Location,
+    indices: Vec<(IndexKind, TableIndex)>,
+    offsets: Vec<(FunctionDefinitionIndex, CodeOffset)>,
+}
+
+impl VMError {
+    pub fn into_vm_status(self) -> VMStatus {
+        let VMError_ {
+            major_status,
+            sub_status,
+            location,
+            mut offsets,
+            ..
+        } = *self.0;
+        match (major_status, sub_status, location) {
+            (StatusCode::EXECUTED, sub_status, _) => {
+                debug_assert!(sub_status.is_none());
+                VMStatus::Executed
+            }
+            (StatusCode::ABORTED, Some(code), Location::Script) => {
+                VMStatus::MoveAbort(vm_status::AbortLocation::Script, code)
+            }
+            (StatusCode::ABORTED, Some(code), Location::Module(id)) => {
+                VMStatus::MoveAbort(vm_status::AbortLocation::Module(id), code)
+            }
+
+            (StatusCode::ABORTED, sub_status, location) => {
+                debug_assert!(
+                    false,
+                    "Expected a code and module/script location with ABORTED, but got {:?} and {}",
+                    sub_status, location
+                );
+                VMStatus::Error(StatusCode::ABORTED)
+            }
+
+            (major_status, sub_status, location)
+                if major_status.status_type() == StatusType::Execution =>
+            {
+                let abort_location = match &location {
+                    Location::Script => vm_status::AbortLocation::Script,
+                    Location::Module(id) => vm_status::AbortLocation::Module(id.clone()),
+                    Location::Undefined => {
+                        return VMStatus::Error(major_status);
+                    }
+                };
+                // Errors for OUT_OF_GAS do not always have index set: if it does not, it should already return above.
+                debug_assert!(
+                    offsets.len() == 1,
+                    "Unexpected offsets. major_status: {:?}\
+                    sub_status: {:?}\
+                    location: {:?}\
+                    offsets: {:#?}",
+                    major_status,
+                    sub_status,
+                    location,
+                    offsets
+                );
+                let (function, code_offset) = match offsets.pop() {
+                    None => {
+                        return VMStatus::Error(major_status);
+                    }
+                    Some((fdef_idx, code_offset)) => (fdef_idx.0, code_offset),
+                };
+                VMStatus::ExecutionFailure {
+                    status_code: major_status,
+                    location: abort_location,
+                    function,
+                    code_offset,
+                }
+            }
+
+            (major_status, _, _) => VMStatus::Error(major_status),
+        }
+    }
+
+    pub fn major_status(&self) -> StatusCode {
+        self.0.major_status
+    }
+
+    pub fn sub_status(&self) -> Option<u64> {
+        self.0.sub_status
+    }
+
+    pub fn message(&self) -> Option<&String> {
+        self.0.message.as_ref()
+    }
+
+    pub fn exec_state(&self) -> Option<&ExecutionState> {
+        self.0.exec_state.as_ref()
+    }
+
+    pub fn remove_exec_state(&mut self) {
+        self.0.exec_state = None;
+    }
+
+    pub fn location(&self) -> &Location {
+        &self.0.location
+    }
+
+    pub fn indices(&self) -> &Vec<(IndexKind, TableIndex)> {
+        &self.0.indices
+    }
+
+    pub fn offsets(&self) -> &Vec<(FunctionDefinitionIndex, CodeOffset)> {
+        &self.0.offsets
+    }
+
+    pub fn status_type(&self) -> StatusType {
+        self.0.major_status.status_type()
+    }
+
+    pub fn all_data(
+        self,
+    ) -> (
+        StatusCode,
+        Option<u64>,
+        Option<String>,
+        Option<ExecutionState>,
+        Location,
+        Vec<(IndexKind, TableIndex)>,
+        Vec<(FunctionDefinitionIndex, CodeOffset)>,
+    ) {
+        let VMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            location,
+            indices,
+            offsets,
+        } = *self.0;
+        (
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            location,
+            indices,
+            offsets,
+        )
+    }
+
+    pub fn to_partial(self) -> PartialVMError {
+        let VMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+            ..
+        } = *self.0;
+        PartialVMError(Box::new(PartialVMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        }))
+    }
+}
+
+impl fmt::Debug for VMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.0, f)
+    }
+}
+
+impl fmt::Debug for VMError_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Self {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            location,
+            indices,
+            offsets,
+        } = self;
+        f.debug_struct("VMError")
+            .field("major_status", major_status)
+            .field("sub_status", sub_status)
+            .field("message", message)
+            .field("exec_state", exec_state)
+            .field("location", location)
+            .field("indices", indices)
+            .field("offsets", offsets)
+            .finish()
+    }
+}
+
+impl std::error::Error for VMError {}
+
+#[derive(Clone)]
+pub struct PartialVMError(Box<PartialVMError_>);
+
+#[derive(Clone)]
+struct PartialVMError_ {
+    major_status: StatusCode,
+    sub_status: Option<u64>,
+    message: Option<String>,
+    exec_state: Option<ExecutionState>,
+    indices: Vec<(IndexKind, TableIndex)>,
+    offsets: Vec<(FunctionDefinitionIndex, CodeOffset)>,
+}
+
+impl PartialVMError {
+    pub fn all_data(
+        self,
+    ) -> (
+        StatusCode,
+        Option<u64>,
+        Option<String>,
+        Option<ExecutionState>,
+        Vec<(IndexKind, TableIndex)>,
+        Vec<(FunctionDefinitionIndex, CodeOffset)>,
+    ) {
+        let PartialVMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        } = *self.0;
+        (
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        )
+    }
+
+    pub fn finish(self, location: Location) -> VMError {
+        let PartialVMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        } = *self.0;
+        VMError(Box::new(VMError_ {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            location,
+            indices,
+            offsets,
+        }))
+    }
+
+    pub fn new(major_status: StatusCode) -> Self {
+        Self(Box::new(PartialVMError_ {
+            major_status,
+            sub_status: None,
+            message: None,
+            exec_state: None,
+            indices: vec![],
+            offsets: vec![],
+        }))
+    }
+
+    pub fn major_status(&self) -> StatusCode {
+        self.0.major_status
+    }
+
+    pub fn with_sub_status(mut self, sub_status: u64) -> Self {
+        debug_assert!(self.0.sub_status.is_none());
+        self.0.sub_status = Some(sub_status);
+        self
+    }
+
+    pub fn with_message(mut self, message: String) -> Self {
+        debug_assert!(self.0.message.is_none());
+        self.0.message = Some(message);
+        self
+    }
+
+    pub fn with_exec_state(mut self, exec_state: ExecutionState) -> Self {
+        debug_assert!(self.0.exec_state.is_none());
+        self.0.exec_state = Some(exec_state);
+        self
+    }
+
+    pub fn at_index(mut self, kind: IndexKind, index: TableIndex) -> Self {
+        self.0.indices.push((kind, index));
+        self
+    }
+
+    pub fn at_indices(mut self, additional_indices: Vec<(IndexKind, TableIndex)>) -> Self {
+        self.0.indices.extend(additional_indices);
+        self
+    }
+
+    pub fn at_code_offset(mut self, function: FunctionDefinitionIndex, offset: CodeOffset) -> Self {
+        self.0.offsets.push((function, offset));
+        self
+    }
+
+    pub fn at_code_offsets(
+        mut self,
+        additional_offsets: Vec<(FunctionDefinitionIndex, CodeOffset)>,
+    ) -> Self {
+        self.0.offsets.extend(additional_offsets);
+        self
+    }
+
+    /// Append the message `message` to the message field of the VM status, and insert a seperator
+    /// if the original message is non-empty.
+    pub fn append_message_with_separator(
+        mut self,
+        separator: char,
+        additional_message: String,
+    ) -> Self {
+        match self.0.message.as_mut() {
+            Some(msg) => {
+                if !msg.is_empty() {
+                    msg.push(separator);
+                }
+                msg.push_str(&additional_message);
+            }
+            None => self.0.message = Some(additional_message),
+        };
+        self
+    }
+}
+
+impl fmt::Display for Location {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Location::Undefined => write!(f, "UNDEFINED"),
+            Location::Script => write!(f, "Script"),
+            Location::Module(id) => write!(f, "Module {:?}", id),
+        }
+    }
+}
+
+impl fmt::Display for PartialVMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut status = format!("PartialVMError with status {:#?}", self.0.major_status);
+
+        if let Some(sub_status) = self.0.sub_status {
+            status = format!("{} with sub status {}", status, sub_status);
+        }
+
+        if let Some(msg) = &self.0.message {
+            status = format!("{} and message {}", status, msg);
+        }
+
+        for (kind, index) in &self.0.indices {
+            status = format!("{} at index {} for {}", status, index, kind);
+        }
+        for (fdef, code_offset) in &self.0.offsets {
+            status = format!(
+                "{} at code offset {} in function definition {}",
+                status, code_offset, fdef
+            );
+        }
+
+        write!(f, "{}", status)
+    }
+}
+
+impl fmt::Display for VMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut status = format!("VMError with status {:#?}", self.0.major_status);
+
+        if let Some(sub_status) = self.0.sub_status {
+            status = format!("{} with sub status {}", status, sub_status);
+        }
+
+        status = format!("{} at location {}", status, self.0.location);
+
+        if let Some(msg) = &self.0.message {
+            status = format!("{} and message {}", status, msg);
+        }
+
+        for (kind, index) in &self.0.indices {
+            status = format!("{} at index {} for {}", status, index, kind);
+        }
+        for (fdef, code_offset) in &self.0.offsets {
+            status = format!(
+                "{} at code offset {} in function definition {}",
+                status, code_offset, fdef
+            );
+        }
+
+        write!(f, "{}", status)
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////
+/// Conversion functions from internal VM statuses into external VM statuses
+////////////////////////////////////////////////////////////////////////////
+impl From<VMError> for VMStatus {
+    fn from(vm_error: VMError) -> VMStatus {
+        vm_error.into_vm_status()
+    }
+}
+
+pub fn vm_status_of_result<T>(result: VMResult<T>) -> VMStatus {
+    match result {
+        Ok(_) => VMStatus::Executed,
+        Err(err) => err.into_vm_status(),
+    }
+}
+
+pub fn offset_out_of_bounds(
+    status: StatusCode,
+    kind: IndexKind,
+    target_offset: usize,
+    target_pool_len: usize,
+    cur_function: FunctionDefinitionIndex,
+    cur_bytecode_offset: CodeOffset,
+) -> PartialVMError {
+    let msg = format!(
+        "Index {} out of bounds for {} at bytecode offset {} in function {} while indexing {}",
+        target_offset, target_pool_len, cur_bytecode_offset, cur_function, kind
+    );
+    PartialVMError::new(status)
+        .with_message(msg)
+        .at_code_offset(cur_function, cur_bytecode_offset)
+}
+
+pub fn bounds_error(
+    status: StatusCode,
+    kind: IndexKind,
+    idx: TableIndex,
+    len: usize,
+) -> PartialVMError {
+    let msg = format!(
+        "Index {} out of bounds for {} while indexing {}",
+        idx, len, kind
+    );
+    PartialVMError::new(status)
+        .at_index(kind, idx)
+        .with_message(msg)
+}
+
+pub fn verification_error(status: StatusCode, kind: IndexKind, idx: TableIndex) -> PartialVMError {
+    PartialVMError::new(status).at_index(kind, idx)
+}
+
+impl fmt::Debug for PartialVMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.0, f)
+    }
+}
+
+impl fmt::Debug for PartialVMError_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Self {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        } = self;
+        f.debug_struct("PartialVMError")
+            .field("major_status", major_status)
+            .field("sub_status", sub_status)
+            .field("message", message)
+            .field("exec_state", exec_state)
+            .field("indices", indices)
+            .field("offsets", offsets)
+            .finish()
+    }
+}
+
+impl std::error::Error for PartialVMError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        None
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/file_format.rs b/vendors/move/crates/move-binary-format/src/file_format.rs
new file mode 100644
index 000000000..bb6f771e2
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/file_format.rs
@@ -0,0 +1,2165 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Binary format for transactions and modules.
+//!
+//! This module provides a simple Rust abstraction over the binary format. That is the format of
+//! modules stored on chain or the format of the code section of a transaction.
+//!
+//! `file_format_common.rs` provides the constant values for entities in the binary format.
+//! (*The binary format is evolving so please come back here in time to check evolutions.*)
+//!
+//! Overall the binary format is structured in a number of sections:
+//! - **Header**: this must start at offset 0 in the binary. It contains a blob that starts every
+//! Diem binary, followed by the version of the VM used to compile the code, and last is the
+//! number of tables present in this binary.
+//! - **Table Specification**: it's a number of tuple of the form
+//! `(table type, starting_offset, byte_count)`. The number of entries is specified in the
+//! header (last entry in header). There can only be a single entry per table type. The
+//! `starting offset` is from the beginning of the binary. Tables must cover the entire size of
+//! the binary blob and cannot overlap.
+//! - **Table Content**: the serialized form of the specific entries in the table. Those roughly
+//! map to the structs defined in this module. Entries in each table must be unique.
+//!
+//! We have two formats: one for modules here represented by `CompiledModule`, another
+//! for transaction scripts which is `CompiledScript`. Building those tables and passing them
+//! to the serializer (`serializer.rs`) generates a binary of the form described. Vectors in
+//! those structs translate to tables and table specifications.
+
+use crate::{
+    access::ModuleAccess,
+    errors::{PartialVMError, PartialVMResult},
+    file_format_common,
+    internals::ModuleIndex,
+    IndexKind, SignatureTokenKind,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+    metadata::Metadata,
+    vm_status::StatusCode,
+};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::{collection::vec, prelude::*, strategy::BoxedStrategy};
+use ref_cast::RefCast;
+use serde::{Deserialize, Serialize};
+use std::ops::BitOr;
+use variant_count::VariantCount;
+
+/// Generic index into one of the tables in the binary format.
+pub type TableIndex = u16;
+
+macro_rules! define_index {
+    {
+        name: $name: ident,
+        kind: $kind: ident,
+        doc: $comment: literal,
+    } => {
+        #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+        #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+        #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+        #[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+        #[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+        #[doc=$comment]
+        pub struct $name(pub TableIndex);
+
+        /// Returns an instance of the given `Index`.
+        impl $name {
+            pub fn new(idx: TableIndex) -> Self {
+                Self(idx)
+            }
+        }
+
+        impl ::std::fmt::Display for $name {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+                write!(f, "{}", self.0)
+            }
+        }
+
+        impl ::std::fmt::Debug for $name {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+                write!(f, "{}({})", stringify!($name), self.0)
+            }
+        }
+
+        impl ModuleIndex for $name {
+            const KIND: IndexKind = IndexKind::$kind;
+
+            #[inline]
+            fn into_index(self) -> usize {
+                self.0 as usize
+            }
+        }
+    };
+}
+
+define_index! {
+    name: ModuleHandleIndex,
+    kind: ModuleHandle,
+    doc: "Index into the `ModuleHandle` table.",
+}
+define_index! {
+    name: StructHandleIndex,
+    kind: StructHandle,
+    doc: "Index into the `StructHandle` table.",
+}
+define_index! {
+    name: FunctionHandleIndex,
+    kind: FunctionHandle,
+    doc: "Index into the `FunctionHandle` table.",
+}
+define_index! {
+    name: FieldHandleIndex,
+    kind: FieldHandle,
+    doc: "Index into the `FieldHandle` table.",
+}
+define_index! {
+    name: StructDefInstantiationIndex,
+    kind: StructDefInstantiation,
+    doc: "Index into the `StructInstantiation` table.",
+}
+define_index! {
+    name: FunctionInstantiationIndex,
+    kind: FunctionInstantiation,
+    doc: "Index into the `FunctionInstantiation` table.",
+}
+define_index! {
+    name: FieldInstantiationIndex,
+    kind: FieldInstantiation,
+    doc: "Index into the `FieldInstantiation` table.",
+}
+define_index! {
+    name: IdentifierIndex,
+    kind: Identifier,
+    doc: "Index into the `Identifier` table.",
+}
+define_index! {
+    name: AddressIdentifierIndex,
+    kind: AddressIdentifier,
+    doc: "Index into the `AddressIdentifier` table.",
+}
+define_index! {
+    name: ConstantPoolIndex,
+    kind: ConstantPool,
+    doc: "Index into the `ConstantPool` table.",
+}
+define_index! {
+    name: SignatureIndex,
+    kind: Signature,
+    doc: "Index into the `Signature` table.",
+}
+define_index! {
+    name: StructDefinitionIndex,
+    kind: StructDefinition,
+    doc: "Index into the `StructDefinition` table.",
+}
+define_index! {
+    name: FunctionDefinitionIndex,
+    kind: FunctionDefinition,
+    doc: "Index into the `FunctionDefinition` table.",
+}
+
+/// Index of a local variable in a function.
+///
+/// Bytecodes that operate on locals carry indexes to the locals of a function.
+pub type LocalIndex = u8;
+/// Max number of fields in a `StructDefinition`.
+pub type MemberCount = u16;
+/// Index into the code stream for a jump. The offset is relative to the beginning of
+/// the instruction stream.
+pub type CodeOffset = u16;
+
+/// The pool of identifiers.
+pub type IdentifierPool = Vec<Identifier>;
+/// The pool of address identifiers (addresses used in ModuleHandles/ModuleIds).
+/// Does not include runtime values. Those are placed in the `ConstantPool`
+pub type AddressIdentifierPool = Vec<AccountAddress>;
+/// The pool of `Constant` values
+pub type ConstantPool = Vec<Constant>;
+/// The pool of `TypeSignature` instances. Those are system and user types used and
+/// their composition (e.g. &U64).
+pub type TypeSignaturePool = Vec<TypeSignature>;
+/// The pool of `Signature` instances. Every function definition must define the set of
+/// locals used and their types.
+pub type SignaturePool = Vec<Signature>;
+
+// TODO: "<SELF>" only passes the validator for identifiers because it is special cased. Whenever
+// "<SELF>" is removed, so should the special case in identifier.rs.
+pub fn self_module_name() -> &'static IdentStr {
+    IdentStr::ref_cast("<SELF>")
+}
+
+/// Index 0 into the LocalsSignaturePool, which is guaranteed to be an empty list.
+/// Used to represent function/struct instantiation with no type arguments -- effectively
+/// non-generic functions and structs.
+pub const NO_TYPE_ARGUMENTS: SignatureIndex = SignatureIndex(0);
+
+// HANDLES:
+// Handles are structs that accompany opcodes that need references: a type reference,
+// or a function reference (a field reference being available only within the module that
+// defines the field can be a definition).
+// Handles refer to both internal and external "entities" and are embedded as indexes
+// in the instruction stream.
+// Handles define resolution. Resolution is assumed to be by (name, signature)
+
+/// A `ModuleHandle` is a reference to a MOVE module. It is composed by an `address` and a `name`.
+///
+/// A `ModuleHandle` uniquely identifies a code entity in the blockchain.
+/// The `address` is a reference to the account that holds the code and the `name` is used as a
+/// key in order to load the module.
+///
+/// Modules live in the *code* namespace of an DiemAccount.
+///
+/// Modules introduce a scope made of all types defined in the module and all functions.
+/// Type definitions (fields) are private to the module. Outside the module a
+/// Type is an opaque handle.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct ModuleHandle {
+    /// Index into the `AddressIdentifierIndex`. Identifies module-holding account's address.
+    pub address: AddressIdentifierIndex,
+    /// The name of the module published in the code section for the account in `address`.
+    pub name: IdentifierIndex,
+}
+
+/// A `StructHandle` is a reference to a user defined type. It is composed by a `ModuleHandle`
+/// and the name of the type within that module.
+///
+/// A type in a module is uniquely identified by its name and as such the name is enough
+/// to perform resolution.
+///
+/// The `StructHandle` is polymorphic: it can have type parameters in its fields and carries the
+/// ability constraints for these type parameters (empty list for non-generic structs). It also
+/// carries the abilities of the struct itself so that the verifier can check
+/// ability semantics without having to load the referenced type.
+///
+/// At link time ability/constraint checking is performed and an error is reported if there is a
+/// mismatch with the definition.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct StructHandle {
+    /// The module that defines the type.
+    pub module: ModuleHandleIndex,
+    /// The name of the type.
+    pub name: IdentifierIndex,
+    /// Contains the abilities for this struct
+    /// For any instantiation of this type, the abilities of this type are predicated on
+    /// that ability being satisfied for all type parameters.
+    pub abilities: AbilitySet,
+    /// The type formals (identified by their index into the vec)
+    pub type_parameters: Vec<StructTypeParameter>,
+}
+
+impl StructHandle {
+    pub fn type_param_constraints(&self) -> impl ExactSizeIterator<Item = AbilitySet> + '_ {
+        self.type_parameters.iter().map(|param| param.constraints)
+    }
+}
+
+/// A type parameter used in the declaration of a struct.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct StructTypeParameter {
+    /// The type parameter constraints.
+    pub constraints: AbilitySet,
+    /// Whether the parameter is declared as phantom.
+    pub is_phantom: bool,
+}
+
+/// A `FunctionHandle` is a reference to a function. It is composed by a
+/// `ModuleHandle` and the name and signature of that function within the module.
+///
+/// A function within a module is uniquely identified by its name. No overloading is allowed
+/// and the verifier enforces that property. The signature of the function is used at link time to
+/// ensure the function reference is valid and it is also used by the verifier to type check
+/// function calls.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FunctionHandle {
+    /// The module that defines the function.
+    pub module: ModuleHandleIndex,
+    /// The name of the function.
+    pub name: IdentifierIndex,
+    /// The list of arguments to the function.
+    pub parameters: SignatureIndex,
+    /// The list of return types.
+    pub return_: SignatureIndex,
+    /// The type formals (identified by their index into the vec) and their constraints
+    pub type_parameters: Vec<AbilitySet>,
+}
+
+/// A field access info (owner type and offset)
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FieldHandle {
+    pub owner: StructDefinitionIndex,
+    pub field: MemberCount,
+}
+
+// DEFINITIONS:
+// Definitions are the module code. So the set of types and functions in the module.
+
+/// `StructFieldInformation` indicates whether a struct is native or has user-specified fields
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub enum StructFieldInformation {
+    Native,
+    Declared(Vec<FieldDefinition>),
+}
+
+//
+// Instantiations
+//
+// Instantiations point to a generic handle and its instantiation.
+// The instantiation can be partial.
+// So, for example, `S<T, W>`, `S<u8, bool>`, `S<T, u8>`, `S<X<T>, address>` are all
+// `StructInstantiation`s
+
+/// A complete or partial instantiation of a generic struct
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct StructDefInstantiation {
+    pub def: StructDefinitionIndex,
+    pub type_parameters: SignatureIndex,
+}
+
+/// A complete or partial instantiation of a function
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FunctionInstantiation {
+    pub handle: FunctionHandleIndex,
+    pub type_parameters: SignatureIndex,
+}
+
+/// A complete or partial instantiation of a field (or the type of it).
+///
+/// A `FieldInstantiation` points to a generic `FieldHandle` and the instantiation
+/// of the owner type.
+/// E.g. for `S<u8, bool>.f` where `f` is a field of any type, `instantiation`
+/// would be `[u8, boo]`
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FieldInstantiation {
+    pub handle: FieldHandleIndex,
+    pub type_parameters: SignatureIndex,
+}
+
+/// A `StructDefinition` is a type definition. It either indicates it is native or defines all the
+/// user-specified fields declared on the type.
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct StructDefinition {
+    /// The `StructHandle` for this `StructDefinition`. This has the name and the abilities
+    /// for the type.
+    pub struct_handle: StructHandleIndex,
+    /// Contains either
+    /// - Information indicating the struct is native and has no accessible fields
+    /// - Information indicating the number of fields and the start `FieldDefinition`s
+    pub field_information: StructFieldInformation,
+}
+
+impl StructDefinition {
+    pub fn declared_field_count(&self) -> PartialVMResult<MemberCount> {
+        match &self.field_information {
+            // TODO we might want a more informative error here
+            StructFieldInformation::Native => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message("Looking for field in native structure".to_string())),
+            StructFieldInformation::Declared(fields) => Ok(fields.len() as u16),
+        }
+    }
+
+    pub fn field(&self, offset: usize) -> Option<&FieldDefinition> {
+        match &self.field_information {
+            StructFieldInformation::Native => None,
+            StructFieldInformation::Declared(fields) => fields.get(offset),
+        }
+    }
+}
+
+/// A `FieldDefinition` is the definition of a field: its name and the field type.
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FieldDefinition {
+    /// The name of the field.
+    pub name: IdentifierIndex,
+    /// The type of the field.
+    pub signature: TypeSignature,
+}
+
+/// `Visibility` restricts the accessibility of the associated entity.
+/// - For function visibility, it restricts who may call into the associated function.
+#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[repr(u8)]
+#[derive(Default)]
+pub enum Visibility {
+    /// Accessible within its defining module only.
+    #[default]
+    Private = 0x0,
+    /// Accessible by any module or script outside of its declaring module.
+    Public = 0x1,
+    // DEPRECATED for separate entry modifier
+    // Accessible by any script or other `Script` functions from any module
+    // Script = 0x2,
+    /// Accessible by this module as well as modules declared in the friend list.
+    Friend = 0x3,
+}
+
+impl Visibility {
+    pub const DEPRECATED_SCRIPT: u8 = 0x2;
+}
+
+impl std::convert::TryFrom<u8> for Visibility {
+    type Error = ();
+
+    fn try_from(v: u8) -> Result<Self, Self::Error> {
+        match v {
+            x if x == Visibility::Private as u8 => Ok(Visibility::Private),
+            x if x == Visibility::Public as u8 => Ok(Visibility::Public),
+            x if x == Visibility::Friend as u8 => Ok(Visibility::Friend),
+            _ => Err(()),
+        }
+    }
+}
+
+/// A `FunctionDefinition` is the implementation of a function. It defines
+/// the *prototype* of the function and the function body.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FunctionDefinition {
+    /// The prototype of the function (module, name, signature).
+    pub function: FunctionHandleIndex,
+    /// The visibility of this function.
+    pub visibility: Visibility,
+    /// Marker if the function is intended as an entry function. That is
+    pub is_entry: bool,
+    /// List of locally defined types (declared in this module) with the `Key` ability
+    /// that the procedure might access, either through: BorrowGlobal, MoveFrom, or transitively
+    /// through another procedure
+    /// This list of acquires grants the borrow checker the ability to statically verify the safety
+    /// of references into global storage
+    ///
+    /// Not in the signature as it is not needed outside of the declaring module
+    ///
+    /// Note, there is no SignatureIndex with each struct definition index, so all instantiations of
+    /// that type are considered as being acquired
+    pub acquires_global_resources: Vec<StructDefinitionIndex>,
+    /// Code for this function.
+    #[cfg_attr(
+        any(test, feature = "fuzzing"),
+        proptest(strategy = "any_with::<CodeUnit>(params).prop_map(Some)")
+    )]
+    pub code: Option<CodeUnit>,
+}
+
+impl FunctionDefinition {
+    /// Returns whether the FunctionDefinition is native.
+    pub fn is_native(&self) -> bool {
+        self.code.is_none()
+    }
+
+    // Deprecated public bit, deprecated in favor a the Visibility enum
+    pub const DEPRECATED_PUBLIC_BIT: u8 = 0b01;
+
+    /// A native function implemented in Rust.
+    pub const NATIVE: u8 = 0b10;
+
+    /// An entry function, intended to be used as an entry point to execution
+    pub const ENTRY: u8 = 0b100;
+}
+
+// Signature
+// A signature can be for a type (field, local) or for a function - return type: (arguments).
+// They both go into the signature table so there is a marker that tags the signature.
+// Signature usually don't carry a size and you have to read them to get to the end.
+
+/// A type definition. `SignatureToken` allows the definition of the set of known types and their
+/// composition.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct TypeSignature(pub SignatureToken);
+
+// TODO: remove at some point or move it in the front end (language/move-ir-compiler)
+/// A `FunctionSignature` in internally used to create a unique representation of the overall
+/// signature as need. Consider deprecated...
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct FunctionSignature {
+    /// The list of return types.
+    #[cfg_attr(
+        any(test, feature = "fuzzing"),
+        proptest(strategy = "vec(any::<SignatureToken>(), 0..=params)")
+    )]
+    pub return_: Vec<SignatureToken>,
+    /// The list of arguments to the function.
+    #[cfg_attr(
+        any(test, feature = "fuzzing"),
+        proptest(strategy = "vec(any::<SignatureToken>(), 0..=params)")
+    )]
+    pub parameters: Vec<SignatureToken>,
+    /// The type formals (identified by their index into the vec) and their constraints
+    pub type_parameters: Vec<AbilitySet>,
+}
+
+/// A `Signature` is the list of locals used by a function.
+///
+/// Locals include the arguments to the function from position `0` to argument `count - 1`.
+/// The remaining elements are the type of each local.
+#[derive(Clone, Debug, Default, Eq, Hash, PartialEq, Ord, PartialOrd)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct Signature(
+    #[cfg_attr(
+        any(test, feature = "fuzzing"),
+        proptest(strategy = "vec(any::<SignatureToken>(), 0..=params)")
+    )]
+    pub Vec<SignatureToken>,
+);
+
+impl Signature {
+    /// Length of the `Signature`.
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Whether the function has no locals (both arguments or locals).
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+}
+
+/// Type parameters are encoded as indices. This index can also be used to lookup the kind of a
+/// type parameter in the `FunctionHandle` and `StructHandle`.
+pub type TypeParameterIndex = u16;
+
+/// An `Ability` classifies what operations are permitted for a given type
+#[repr(u8)]
+#[derive(Debug, Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub enum Ability {
+    /// Allows values of types with this ability to be copied, via CopyLoc or ReadRef
+    Copy = 0x1,
+    /// Allows values of types with this ability to be dropped, via Pop, WriteRef, StLoc, Eq, Neq,
+    /// or if left in a local when Ret is invoked
+    /// Technically also needed for numeric operations (Add, BitAnd, Shift, etc), but all
+    /// of the types that can be used with those operations have Drop
+    Drop = 0x2,
+    /// Allows values of types with this ability to exist inside a struct in global storage
+    Store = 0x4,
+    /// Allows the type to serve as a key for global storage operations: MoveTo, MoveFrom, etc.
+    Key = 0x8,
+}
+
+impl Ability {
+    fn from_u8(u: u8) -> Option<Self> {
+        match u {
+            0x1 => Some(Ability::Copy),
+            0x2 => Some(Ability::Drop),
+            0x4 => Some(Ability::Store),
+            0x8 => Some(Ability::Key),
+            _ => None,
+        }
+    }
+
+    /// For a struct with ability `a`, each field needs to have the ability `a.requires()`.
+    /// Consider a generic type Foo<t1, ..., tn>, for Foo<t1, ..., tn> to have ability `a`, Foo must
+    /// have been declared with `a` and each type argument ti must have the ability `a.requires()`
+    pub fn requires(self) -> Self {
+        match self {
+            Self::Copy => Ability::Copy,
+            Self::Drop => Ability::Drop,
+            Self::Store => Ability::Store,
+            Self::Key => Ability::Store,
+        }
+    }
+
+    /// An inverse of `requires`, where x is in a.required_by() iff x.requires() == a
+    pub fn required_by(self) -> AbilitySet {
+        match self {
+            Self::Copy => AbilitySet::EMPTY | Ability::Copy,
+            Self::Drop => AbilitySet::EMPTY | Ability::Drop,
+            Self::Store => AbilitySet::EMPTY | Ability::Store | Ability::Key,
+            Self::Key => AbilitySet::EMPTY,
+        }
+    }
+}
+
+/// A set of `Ability`s
+#[derive(Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct AbilitySet(u8);
+
+impl AbilitySet {
+    /// The empty ability set
+    pub const EMPTY: Self = Self(0);
+    /// Abilities for `Bool`, `U8`, `U64`, `U128`, and `Address`
+    pub const PRIMITIVES: AbilitySet =
+        Self((Ability::Copy as u8) | (Ability::Drop as u8) | (Ability::Store as u8));
+    /// Abilities for `Reference` and `MutableReference`
+    pub const REFERENCES: AbilitySet = Self((Ability::Copy as u8) | (Ability::Drop as u8));
+    /// Abilities for `Signer`
+    pub const SIGNER: AbilitySet = Self(Ability::Drop as u8);
+    /// Abilities for `Vector`, note they are predicated on the type argument
+    pub const VECTOR: AbilitySet =
+        Self((Ability::Copy as u8) | (Ability::Drop as u8) | (Ability::Store as u8));
+
+    /// Ability set containing all abilities
+    pub const ALL: Self = Self(
+        // Cannot use AbilitySet bitor because it is not const
+        (Ability::Copy as u8)
+            | (Ability::Drop as u8)
+            | (Ability::Store as u8)
+            | (Ability::Key as u8),
+    );
+
+    pub fn singleton(ability: Ability) -> Self {
+        Self(ability as u8)
+    }
+
+    pub fn has_ability(self, ability: Ability) -> bool {
+        let a = ability as u8;
+        (a & self.0) == a
+    }
+
+    pub fn has_copy(self) -> bool {
+        self.has_ability(Ability::Copy)
+    }
+
+    pub fn has_drop(self) -> bool {
+        self.has_ability(Ability::Drop)
+    }
+
+    pub fn has_store(self) -> bool {
+        self.has_ability(Ability::Store)
+    }
+
+    pub fn has_key(self) -> bool {
+        self.has_ability(Ability::Key)
+    }
+
+    pub fn remove(self, ability: Ability) -> Self {
+        Self(self.0 & (!(ability as u8)))
+    }
+
+    pub fn intersect(self, other: Self) -> Self {
+        Self(self.0 & other.0)
+    }
+
+    pub fn union(self, other: Self) -> Self {
+        Self(self.0 | other.0)
+    }
+
+    #[inline]
+    fn is_subset_bits(sub: u8, sup: u8) -> bool {
+        (sub & sup) == sub
+    }
+
+    pub fn is_subset(self, other: Self) -> bool {
+        Self::is_subset_bits(self.0, other.0)
+    }
+
+    /// For a polymorphic type, its actual abilities correspond to its declared abilities but
+    /// predicated on its non-phantom type arguments having that ability. For `Key`, instead of needing
+    /// the same ability, the type arguments need `Store`.
+    pub fn polymorphic_abilities<I1, I2>(
+        declared_abilities: Self,
+        declared_phantom_parameters: I1,
+        type_arguments: I2,
+    ) -> PartialVMResult<Self>
+    where
+        I1: IntoIterator<Item = bool>,
+        I2: IntoIterator<Item = Self>,
+        I1::IntoIter: ExactSizeIterator,
+        I2::IntoIter: ExactSizeIterator,
+    {
+        let declared_phantom_parameters = declared_phantom_parameters.into_iter();
+        let type_arguments = type_arguments.into_iter();
+
+        if declared_phantom_parameters.len() != type_arguments.len() {
+            return Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    "the length of `declared_phantom_parameters` doesn't match the length of `type_arguments`".to_string(),
+                ),
+            );
+        }
+
+        // Conceptually this is performing the following operation:
+        // For any ability 'a' in `declared_abilities`
+        // 'a' is in the result only if
+        //   for all (abi_i, is_phantom_i) in `type_arguments` s.t. !is_phantom then a.required() is a subset of abi_i
+        //
+        // So to do this efficiently, we can determine the required_by set for each ti
+        // and intersect them together along with the declared abilities
+        // This only works because for any ability y, |y.requires()| == 1
+        let abs = type_arguments
+            .zip(declared_phantom_parameters)
+            .filter(|(_, is_phantom)| !is_phantom)
+            .map(|(ty_arg_abilities, _)| {
+                ty_arg_abilities
+                    .into_iter()
+                    .map(|a| a.required_by())
+                    .fold(AbilitySet::EMPTY, AbilitySet::union)
+            })
+            .fold(declared_abilities, |acc, ty_arg_abilities| {
+                acc.intersect(ty_arg_abilities)
+            });
+        Ok(abs)
+    }
+
+    pub fn from_u8(byte: u8) -> Option<Self> {
+        // If there is a bit set in the read `byte`, that bit must be set in the
+        // `AbilitySet` containing all `Ability`s
+        // This corresponds the byte being a bit set subset of ALL
+        // The byte is a subset of ALL if the intersection of the two is the original byte
+        if Self::is_subset_bits(byte, Self::ALL.0) {
+            Some(Self(byte))
+        } else {
+            None
+        }
+    }
+
+    pub fn into_u8(self) -> u8 {
+        self.0
+    }
+}
+
+impl BitOr<Ability> for AbilitySet {
+    type Output = Self;
+    fn bitor(self, rhs: Ability) -> Self {
+        AbilitySet(self.0 | (rhs as u8))
+    }
+}
+
+impl BitOr<AbilitySet> for AbilitySet {
+    type Output = Self;
+    fn bitor(self, rhs: Self) -> Self {
+        AbilitySet(self.0 | rhs.0)
+    }
+}
+
+pub struct AbilitySetIterator {
+    set: AbilitySet,
+    idx: u8,
+}
+
+impl Iterator for AbilitySetIterator {
+    type Item = Ability;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        while self.idx <= 0x8 {
+            let next = Ability::from_u8(self.set.0 & self.idx);
+            self.idx <<= 1;
+            if next.is_some() {
+                return next;
+            }
+        }
+        None
+    }
+}
+
+impl IntoIterator for AbilitySet {
+    type Item = Ability;
+    type IntoIter = AbilitySetIterator;
+    fn into_iter(self) -> Self::IntoIter {
+        AbilitySetIterator {
+            idx: 0x1,
+            set: self,
+        }
+    }
+}
+
+impl std::fmt::Debug for AbilitySet {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        write!(f, "[")?;
+        for ability in *self {
+            write!(f, "{:?}, ", ability)?;
+        }
+        write!(f, "]")
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for AbilitySet {
+    type Strategy = BoxedStrategy<Self>;
+    type Parameters = ();
+
+    fn arbitrary_with(_params: Self::Parameters) -> Self::Strategy {
+        proptest::bits::u8::masked(AbilitySet::ALL.0)
+            .prop_map(|u| AbilitySet::from_u8(u).expect("proptest mask failed for AbilitySet"))
+            .boxed()
+    }
+}
+
+/// A `SignatureToken` is a type declaration for a location.
+///
+/// Any location in the system has a TypeSignature.
+/// A TypeSignature is also used in composed signatures.
+///
+/// A SignatureToken can express more types than the VM can handle safely, and correctness is
+/// enforced by the verifier.
+#[derive(Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub enum SignatureToken {
+    /// Boolean, `true` or `false`.
+    Bool,
+    /// Unsigned integers, 8 bits length.
+    U8,
+    /// Unsigned integers, 64 bits length.
+    U64,
+    /// Unsigned integers, 128 bits length.
+    U128,
+    /// Address, a 16 bytes immutable type.
+    Address,
+    /// Signer, a 16 bytes immutable type representing the capability to publish at an address
+    Signer,
+    /// Vector
+    Vector(Box<SignatureToken>),
+    /// User defined type
+    Struct(StructHandleIndex),
+    StructInstantiation(StructHandleIndex, Vec<SignatureToken>),
+    /// Reference to a type.
+    Reference(Box<SignatureToken>),
+    /// Mutable reference to a type.
+    MutableReference(Box<SignatureToken>),
+    /// Type parameter.
+    TypeParameter(TypeParameterIndex),
+    /// Unsigned integers, 16 bits length.
+    U16,
+    /// Unsigned integers, 32 bits length.
+    U32,
+    /// Unsigned integers, 256 bits length.
+    U256,
+}
+
+/// An iterator to help traverse the `SignatureToken` in a non-recursive fashion to avoid
+/// overflowing the stack.
+///
+/// Traversal order: root -> left -> right
+pub struct SignatureTokenPreorderTraversalIter<'a> {
+    stack: Vec<&'a SignatureToken>,
+}
+
+impl<'a> Iterator for SignatureTokenPreorderTraversalIter<'a> {
+    type Item = &'a SignatureToken;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        use SignatureToken::*;
+
+        match self.stack.pop() {
+            Some(tok) => {
+                match tok {
+                    Reference(inner_tok) | MutableReference(inner_tok) | Vector(inner_tok) => {
+                        self.stack.push(inner_tok)
+                    }
+
+                    StructInstantiation(_, inner_toks) => {
+                        self.stack.extend(inner_toks.iter().rev())
+                    }
+
+                    Signer | Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Struct(_)
+                    | TypeParameter(_) => (),
+                }
+                Some(tok)
+            }
+            None => None,
+        }
+    }
+}
+
+/// Alternative preorder traversal iterator for SignatureToken that also returns the depth at each
+/// node.
+pub struct SignatureTokenPreorderTraversalIterWithDepth<'a> {
+    stack: Vec<(&'a SignatureToken, usize)>,
+}
+
+impl<'a> Iterator for SignatureTokenPreorderTraversalIterWithDepth<'a> {
+    type Item = (&'a SignatureToken, usize);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        use SignatureToken::*;
+
+        match self.stack.pop() {
+            Some((tok, depth)) => {
+                match tok {
+                    Reference(inner_tok) | MutableReference(inner_tok) | Vector(inner_tok) => {
+                        self.stack.push((inner_tok, depth + 1))
+                    }
+
+                    StructInstantiation(_, inner_toks) => self
+                        .stack
+                        .extend(inner_toks.iter().map(|tok| (tok, depth + 1)).rev()),
+
+                    Signer | Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Struct(_)
+                    | TypeParameter(_) => (),
+                }
+                Some((tok, depth))
+            }
+            None => None,
+        }
+    }
+}
+
+/// `Arbitrary` for `SignatureToken` cannot be derived automatically as it's a recursive type.
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for SignatureToken {
+    type Strategy = BoxedStrategy<Self>;
+    type Parameters = ();
+
+    fn arbitrary_with(_params: Self::Parameters) -> Self::Strategy {
+        use SignatureToken::*;
+
+        let leaf = prop_oneof![
+            Just(Bool),
+            Just(U8),
+            Just(U16),
+            Just(U32),
+            Just(U64),
+            Just(U128),
+            Just(U256),
+            Just(Address),
+            any::<StructHandleIndex>().prop_map(Struct),
+            any::<TypeParameterIndex>().prop_map(TypeParameter),
+        ];
+        leaf.prop_recursive(
+            8,  // levels deep
+            16, // max size
+            1,  // items per collection
+            |inner| {
+                prop_oneof![
+                    inner.clone().prop_map(|token| Vector(Box::new(token))),
+                    inner.clone().prop_map(|token| Reference(Box::new(token))),
+                    inner.prop_map(|token| MutableReference(Box::new(token))),
+                ]
+            },
+        )
+        .boxed()
+    }
+}
+
+impl std::fmt::Debug for SignatureToken {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            SignatureToken::Bool => write!(f, "Bool"),
+            SignatureToken::U8 => write!(f, "U8"),
+            SignatureToken::U16 => write!(f, "U16"),
+            SignatureToken::U32 => write!(f, "U32"),
+            SignatureToken::U64 => write!(f, "U64"),
+            SignatureToken::U128 => write!(f, "U128"),
+            SignatureToken::U256 => write!(f, "U256"),
+            SignatureToken::Address => write!(f, "Address"),
+            SignatureToken::Signer => write!(f, "Signer"),
+            SignatureToken::Vector(boxed) => write!(f, "Vector({:?})", boxed),
+            SignatureToken::Struct(idx) => write!(f, "Struct({:?})", idx),
+            SignatureToken::StructInstantiation(idx, types) => {
+                write!(f, "StructInstantiation({:?}, {:?})", idx, types)
+            }
+            SignatureToken::Reference(boxed) => write!(f, "Reference({:?})", boxed),
+            SignatureToken::MutableReference(boxed) => write!(f, "MutableReference({:?})", boxed),
+            SignatureToken::TypeParameter(idx) => write!(f, "TypeParameter({:?})", idx),
+        }
+    }
+}
+
+impl SignatureToken {
+    /// Returns the "value kind" for the `SignatureToken`
+    #[inline]
+    pub fn signature_token_kind(&self) -> SignatureTokenKind {
+        // TODO: SignatureTokenKind is out-dated. fix/update/remove SignatureTokenKind and see if
+        // this function needs to be cleaned up
+        use SignatureToken::*;
+
+        match self {
+            Reference(_) => SignatureTokenKind::Reference,
+            MutableReference(_) => SignatureTokenKind::MutableReference,
+            Bool
+            | U8
+            | U16
+            | U32
+            | U64
+            | U128
+            | U256
+            | Address
+            | Signer
+            | Struct(_)
+            | StructInstantiation(_, _)
+            | Vector(_) => SignatureTokenKind::Value,
+            // TODO: This is a temporary hack to please the verifier. SignatureTokenKind will soon
+            // be completely removed. `SignatureTokenView::kind()` should be used instead.
+            TypeParameter(_) => SignatureTokenKind::Value,
+        }
+    }
+
+    // Returns `true` if the `SignatureToken` is an integer type.
+    pub fn is_integer(&self) -> bool {
+        use SignatureToken::*;
+        match self {
+            U8 | U16 | U32 | U64 | U128 | U256 => true,
+            Bool
+            | Address
+            | Signer
+            | Vector(_)
+            | Struct(_)
+            | StructInstantiation(_, _)
+            | Reference(_)
+            | MutableReference(_)
+            | TypeParameter(_) => false,
+        }
+    }
+
+    /// Returns true if the `SignatureToken` is any kind of reference (mutable and immutable).
+    pub fn is_reference(&self) -> bool {
+        use SignatureToken::*;
+
+        matches!(self, Reference(_) | MutableReference(_))
+    }
+
+    /// Returns true if the `SignatureToken` is a mutable reference.
+    pub fn is_mutable_reference(&self) -> bool {
+        use SignatureToken::*;
+
+        matches!(self, MutableReference(_))
+    }
+
+    /// Returns true if the `SignatureToken` is a signer
+    pub fn is_signer(&self) -> bool {
+        use SignatureToken::*;
+
+        matches!(self, Signer)
+    }
+
+    /// Returns true if the `SignatureToken` can represent a constant (as in representable in
+    /// the constants table).
+    pub fn is_valid_for_constant(&self) -> bool {
+        use SignatureToken::*;
+
+        match self {
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => true,
+            Vector(inner) => inner.is_valid_for_constant(),
+            Signer
+            | Struct(_)
+            | StructInstantiation(_, _)
+            | Reference(_)
+            | MutableReference(_)
+            | TypeParameter(_) => false,
+        }
+    }
+
+    /// Set the index to this one. Useful for random testing.
+    ///
+    /// Panics if this token doesn't contain a struct handle.
+    pub fn debug_set_sh_idx(&mut self, sh_idx: StructHandleIndex) {
+        match self {
+            SignatureToken::Struct(ref mut wrapped) => *wrapped = sh_idx,
+            SignatureToken::StructInstantiation(ref mut wrapped, _) => *wrapped = sh_idx,
+            SignatureToken::Reference(ref mut token)
+            | SignatureToken::MutableReference(ref mut token) => token.debug_set_sh_idx(sh_idx),
+            other => panic!(
+                "debug_set_sh_idx (to {}) called for non-struct token {:?}",
+                sh_idx, other
+            ),
+        }
+    }
+
+    pub fn preorder_traversal(&self) -> SignatureTokenPreorderTraversalIter<'_> {
+        SignatureTokenPreorderTraversalIter { stack: vec![self] }
+    }
+
+    pub fn preorder_traversal_with_depth(
+        &self,
+    ) -> SignatureTokenPreorderTraversalIterWithDepth<'_> {
+        SignatureTokenPreorderTraversalIterWithDepth {
+            stack: vec![(self, 1)],
+        }
+    }
+}
+
+/// A `Constant` is a serialized value along with its type. That type will be deserialized by the
+/// loader/evauluator
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct Constant {
+    pub type_: SignatureToken,
+    pub data: Vec<u8>,
+}
+
+/// A `CodeUnit` is the body of a function. It has the function header and the instruction stream.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct CodeUnit {
+    /// List of locals type. All locals are typed.
+    pub locals: SignatureIndex,
+    /// Code stream, function body.
+    #[cfg_attr(
+        any(test, feature = "fuzzing"),
+        proptest(strategy = "vec(any::<Bytecode>(), 0..=params)")
+    )]
+    pub code: Vec<Bytecode>,
+}
+
+/// `Bytecode` is a VM instruction of variable size. The type of the bytecode (opcode) defines
+/// the size of the bytecode.
+///
+/// Bytecodes operate on a stack machine and each bytecode has side effect on the stack and the
+/// instruction stream.
+#[derive(Clone, Hash, Eq, VariantCount, PartialEq)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub enum Bytecode {
+    /// Pop and discard the value at the top of the stack.
+    /// The value on the stack must be an copyable type.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., value -> ...```
+    Pop,
+    /// Return from function, possibly with values according to the return types in the
+    /// function signature. The returned values are pushed on the stack.
+    /// The function signature of the function being executed defines the semantic of
+    /// the Ret opcode.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., arg_val(1), ..., arg_val(n) -> ..., return_val(1), ..., return_val(n)```
+    Ret,
+    /// Branch to the instruction at position `CodeOffset` if the value at the top of the stack
+    /// is true. Code offsets are relative to the start of the instruction stream.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., bool_value -> ...```
+    BrTrue(CodeOffset),
+    /// Branch to the instruction at position `CodeOffset` if the value at the top of the stack
+    /// is false. Code offsets are relative to the start of the instruction stream.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., bool_value -> ...```
+    BrFalse(CodeOffset),
+    /// Branch unconditionally to the instruction at position `CodeOffset`. Code offsets are
+    /// relative to the start of the instruction stream.
+    ///
+    /// Stack transition: none
+    Branch(CodeOffset),
+    /// Push a U8 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u8_value```
+    LdU8(u8),
+    /// Push a U64 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u64_value```
+    LdU64(u64),
+    /// Push a U128 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u128_value```
+    LdU128(u128),
+    /// Convert the value at the top of the stack into u8.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u8_value```
+    CastU8,
+    /// Convert the value at the top of the stack into u64.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u8_value```
+    CastU64,
+    /// Convert the value at the top of the stack into u128.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u128_value```
+    CastU128,
+    /// Push a `Constant` onto the stack. The value is loaded and deserialized (according to its
+    /// type) from the the `ConstantPool` via `ConstantPoolIndex`
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., value```
+    LdConst(ConstantPoolIndex),
+    /// Push `true` onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., true```
+    LdTrue,
+    /// Push `false` onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., false```
+    LdFalse,
+    /// Push the local identified by `LocalIndex` onto the stack. The value is copied and the
+    /// local is still safe to use.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., value```
+    CopyLoc(LocalIndex),
+    /// Push the local identified by `LocalIndex` onto the stack. The local is moved and it is
+    /// invalid to use from that point on, unless a store operation writes to the local before
+    /// any read to that local.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., value```
+    MoveLoc(LocalIndex),
+    /// Pop value from the top of the stack and store it into the function locals at
+    /// position `LocalIndex`.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., value -> ...```
+    StLoc(LocalIndex),
+    /// Call a function. The stack has the arguments pushed first to last.
+    /// The arguments are consumed and pushed to the locals of the function.
+    /// Return values are pushed on the stack and available to the caller.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., arg(1), arg(2), ...,  arg(n) -> ..., return_value(1), return_value(2), ...,
+    /// return_value(k)```
+    Call(FunctionHandleIndex),
+    CallGeneric(FunctionInstantiationIndex),
+    /// Create an instance of the type specified via `StructHandleIndex` and push it on the stack.
+    /// The values of the fields of the struct, in the order they appear in the struct declaration,
+    /// must be pushed on the stack. All fields must be provided.
+    ///
+    /// A Pack instruction must fully initialize an instance.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., field(1)_value, field(2)_value, ..., field(n)_value -> ..., instance_value```
+    Pack(StructDefinitionIndex),
+    PackGeneric(StructDefInstantiationIndex),
+    /// Destroy an instance of a type and push the values bound to each field on the
+    /// stack.
+    ///
+    /// The values of the fields of the instance appear on the stack in the order defined
+    /// in the struct definition.
+    ///
+    /// This order makes Unpack<T> the inverse of Pack<T>. So `Unpack<T>; Pack<T>` is the identity
+    /// for struct T.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., instance_value -> ..., field(1)_value, field(2)_value, ..., field(n)_value```
+    Unpack(StructDefinitionIndex),
+    UnpackGeneric(StructDefInstantiationIndex),
+    /// Read a reference. The reference is on the stack, it is consumed and the value read is
+    /// pushed on the stack.
+    ///
+    /// Reading a reference performs a copy of the value referenced.
+    /// As such, ReadRef requires that the type of the value has the `Copy` ability.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference_value -> ..., value```
+    ReadRef,
+    /// Write to a reference. The reference and the value are on the stack and are consumed.
+    ///
+    ///
+    /// WriteRef requires that the type of the value has the `Drop` ability as the previous value
+    /// is lost
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., value, reference_value -> ...```
+    WriteRef,
+    /// Convert a mutable reference to an immutable reference.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference_value -> ..., reference_value```
+    FreezeRef,
+    /// Load a mutable reference to a local identified by LocalIndex.
+    ///
+    /// The local must not be a reference.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., reference```
+    MutBorrowLoc(LocalIndex),
+    /// Load an immutable reference to a local identified by LocalIndex.
+    ///
+    /// The local must not be a reference.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., reference```
+    ImmBorrowLoc(LocalIndex),
+    /// Load a mutable reference to a field identified by `FieldHandleIndex`.
+    /// The top of the stack must be a mutable reference to a type that contains the field
+    /// definition.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference -> ..., field_reference```
+    MutBorrowField(FieldHandleIndex),
+    /// Load a mutable reference to a field identified by `FieldInstantiationIndex`.
+    /// The top of the stack must be a mutable reference to a type that contains the field
+    /// definition.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference -> ..., field_reference```
+    MutBorrowFieldGeneric(FieldInstantiationIndex),
+    /// Load an immutable reference to a field identified by `FieldHandleIndex`.
+    /// The top of the stack must be a reference to a type that contains the field definition.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference -> ..., field_reference```
+    ImmBorrowField(FieldHandleIndex),
+    /// Load an immutable reference to a field identified by `FieldInstantiationIndex`.
+    /// The top of the stack must be a reference to a type that contains the field definition.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., reference -> ..., field_reference```
+    ImmBorrowFieldGeneric(FieldInstantiationIndex),
+    /// Return a mutable reference to an instance of type `StructDefinitionIndex` published at the
+    /// address passed as argument. Abort execution if such an object does not exist or if a
+    /// reference has already been handed out.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., address_value -> ..., reference_value```
+    MutBorrowGlobal(StructDefinitionIndex),
+    MutBorrowGlobalGeneric(StructDefInstantiationIndex),
+    /// Return an immutable reference to an instance of type `StructDefinitionIndex` published at
+    /// the address passed as argument. Abort execution if such an object does not exist or if a
+    /// reference has already been handed out.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., address_value -> ..., reference_value```
+    ImmBorrowGlobal(StructDefinitionIndex),
+    ImmBorrowGlobalGeneric(StructDefInstantiationIndex),
+    /// Add the 2 u64 at the top of the stack and pushes the result on the stack.
+    /// The operation aborts the transaction in case of overflow.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Add,
+    /// Subtract the 2 u64 at the top of the stack and pushes the result on the stack.
+    /// The operation aborts the transaction in case of underflow.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Sub,
+    /// Multiply the 2 u64 at the top of the stack and pushes the result on the stack.
+    /// The operation aborts the transaction in case of overflow.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Mul,
+    /// Perform a modulo operation on the 2 u64 at the top of the stack and pushes the
+    /// result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Mod,
+    /// Divide the 2 u64 at the top of the stack and pushes the result on the stack.
+    /// The operation aborts the transaction in case of "divide by 0".
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Div,
+    /// Bitwise OR the 2 u64 at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    BitOr,
+    /// Bitwise AND the 2 u64 at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    BitAnd,
+    /// Bitwise XOR the 2 u64 at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Xor,
+    /// Logical OR the 2 bool at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., bool_value(1), bool_value(2) -> ..., bool_value```
+    Or,
+    /// Logical AND the 2 bool at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., bool_value(1), bool_value(2) -> ..., bool_value```
+    And,
+    /// Logical NOT the bool at the top of the stack and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., bool_value -> ..., bool_value```
+    Not,
+    /// Compare for equality the 2 value at the top of the stack and pushes the
+    /// result on the stack.
+    /// The values on the stack must have `Drop` as they will be consumed and destroyed.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., value(1), value(2) -> ..., bool_value```
+    Eq,
+    /// Compare for inequality the 2 value at the top of the stack and pushes the
+    /// result on the stack.
+    /// The values on the stack must have `Drop` as they will be consumed and destroyed.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., value(1), value(2) -> ..., bool_value```
+    Neq,
+    /// Perform a "less than" operation of the 2 u64 at the top of the stack and pushes the
+    /// result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+    Lt,
+    /// Perform a "greater than" operation of the 2 u64 at the top of the stack and pushes the
+    /// result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+    Gt,
+    /// Perform a "less than or equal" operation of the 2 u64 at the top of the stack and pushes
+    /// the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+    Le,
+    /// Perform a "greater than or equal" than operation of the 2 u64 at the top of the stack
+    /// and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., bool_value```
+    Ge,
+    /// Abort execution with errorcode
+    ///
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., errorcode -> ...```
+    Abort,
+    /// No operation.
+    ///
+    /// Stack transition: none
+    Nop,
+    /// Returns whether or not a given address has an object of type StructDefinitionIndex
+    /// published already
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., address_value -> ..., bool_value```
+    Exists(StructDefinitionIndex),
+    ExistsGeneric(StructDefInstantiationIndex),
+    /// Move the instance of type StructDefinitionIndex, at the address at the top of the stack.
+    /// Abort execution if such an object does not exist.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., address_value -> ..., value```
+    MoveFrom(StructDefinitionIndex),
+    MoveFromGeneric(StructDefInstantiationIndex),
+    /// Move the instance at the top of the stack to the address of the `Signer` on the stack below
+    /// it
+    /// Abort execution if an object of type StructDefinitionIndex already exists in address.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., signer_value, value -> ...```
+    MoveTo(StructDefinitionIndex),
+    MoveToGeneric(StructDefInstantiationIndex),
+    /// Shift the (second top value) left (top value) bits and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Shl,
+    /// Shift the (second top value) right (top value) bits and pushes the result on the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., u64_value(1), u64_value(2) -> ..., u64_value```
+    Shr,
+    /// Create a vector by packing a statically known number of elements from the stack. Abort the
+    /// execution if there are not enough number of elements on the stack to pack from or they don't
+    /// have the same type identified by the SignatureIndex.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., e1, e2, ..., eN -> ..., vec[e1, e2, ..., eN]```
+    VecPack(SignatureIndex, u64),
+    /// Return the length of the vector,
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vector_reference -> ..., u64_value```
+    VecLen(SignatureIndex),
+    /// Acquire an immutable reference to the element at a given index of the vector. Abort the
+    /// execution if the index is out of bounds.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vector_reference, u64_value -> .., element_reference```
+    VecImmBorrow(SignatureIndex),
+    /// Acquire a mutable reference to the element at a given index of the vector. Abort the
+    /// execution if the index is out of bounds.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vector_reference, u64_value -> .., element_reference```
+    VecMutBorrow(SignatureIndex),
+    /// Add an element to the end of the vector.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vector_reference, element -> ...```
+    VecPushBack(SignatureIndex),
+    /// Pop an element from the end of vector. Aborts if the vector is empty.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vector_reference -> ..., element```
+    VecPopBack(SignatureIndex),
+    /// Destroy the vector and unpack a statically known number of elements onto the stack. Aborts
+    /// if the vector does not have a length N.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., vec[e1, e2, ..., eN] -> ..., e1, e2, ..., eN```
+    VecUnpack(SignatureIndex, u64),
+    /// Swaps the elements at two indices in the vector. Abort the execution if any of the indice
+    /// is out of bounds.
+    ///
+    /// ```..., vector_reference, u64_value(1), u64_value(2) -> ...```
+    VecSwap(SignatureIndex),
+    /// Push a U16 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u16_value```
+    LdU16(u16),
+    /// Push a U32 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u32_value```
+    LdU32(u32),
+    /// Push a U256 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u256_value```
+    LdU256(move_core_types::u256::U256),
+    /// Convert the value at the top of the stack into u16.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u16_value```
+    CastU16,
+    /// Convert the value at the top of the stack into u32.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u32_value```
+    CastU32,
+    /// Convert the value at the top of the stack into u256.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u256_value```
+    CastU256,
+}
+
+impl ::std::fmt::Debug for Bytecode {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        match self {
+            Bytecode::Pop => write!(f, "Pop"),
+            Bytecode::Ret => write!(f, "Ret"),
+            Bytecode::BrTrue(a) => write!(f, "BrTrue({})", a),
+            Bytecode::BrFalse(a) => write!(f, "BrFalse({})", a),
+            Bytecode::Branch(a) => write!(f, "Branch({})", a),
+            Bytecode::LdU8(a) => write!(f, "LdU8({})", a),
+            Bytecode::LdU16(a) => write!(f, "LdU16({})", a),
+            Bytecode::LdU32(a) => write!(f, "LdU32({})", a),
+            Bytecode::LdU64(a) => write!(f, "LdU64({})", a),
+            Bytecode::LdU128(a) => write!(f, "LdU128({})", a),
+            Bytecode::LdU256(a) => write!(f, "LdU256({})", a),
+            Bytecode::CastU8 => write!(f, "CastU8"),
+            Bytecode::CastU16 => write!(f, "CastU16"),
+            Bytecode::CastU32 => write!(f, "CastU32"),
+            Bytecode::CastU64 => write!(f, "CastU64"),
+            Bytecode::CastU128 => write!(f, "CastU128"),
+            Bytecode::CastU256 => write!(f, "CastU256"),
+            Bytecode::LdConst(a) => write!(f, "LdConst({})", a),
+            Bytecode::LdTrue => write!(f, "LdTrue"),
+            Bytecode::LdFalse => write!(f, "LdFalse"),
+            Bytecode::CopyLoc(a) => write!(f, "CopyLoc({})", a),
+            Bytecode::MoveLoc(a) => write!(f, "MoveLoc({})", a),
+            Bytecode::StLoc(a) => write!(f, "StLoc({})", a),
+            Bytecode::Call(a) => write!(f, "Call({})", a),
+            Bytecode::CallGeneric(a) => write!(f, "CallGeneric({})", a),
+            Bytecode::Pack(a) => write!(f, "Pack({})", a),
+            Bytecode::PackGeneric(a) => write!(f, "PackGeneric({})", a),
+            Bytecode::Unpack(a) => write!(f, "Unpack({})", a),
+            Bytecode::UnpackGeneric(a) => write!(f, "UnpackGeneric({})", a),
+            Bytecode::ReadRef => write!(f, "ReadRef"),
+            Bytecode::WriteRef => write!(f, "WriteRef"),
+            Bytecode::FreezeRef => write!(f, "FreezeRef"),
+            Bytecode::MutBorrowLoc(a) => write!(f, "MutBorrowLoc({})", a),
+            Bytecode::ImmBorrowLoc(a) => write!(f, "ImmBorrowLoc({})", a),
+            Bytecode::MutBorrowField(a) => write!(f, "MutBorrowField({:?})", a),
+            Bytecode::MutBorrowFieldGeneric(a) => write!(f, "MutBorrowFieldGeneric({:?})", a),
+            Bytecode::ImmBorrowField(a) => write!(f, "ImmBorrowField({:?})", a),
+            Bytecode::ImmBorrowFieldGeneric(a) => write!(f, "ImmBorrowFieldGeneric({:?})", a),
+            Bytecode::MutBorrowGlobal(a) => write!(f, "MutBorrowGlobal({:?})", a),
+            Bytecode::MutBorrowGlobalGeneric(a) => write!(f, "MutBorrowGlobalGeneric({:?})", a),
+            Bytecode::ImmBorrowGlobal(a) => write!(f, "ImmBorrowGlobal({:?})", a),
+            Bytecode::ImmBorrowGlobalGeneric(a) => write!(f, "ImmBorrowGlobalGeneric({:?})", a),
+            Bytecode::Add => write!(f, "Add"),
+            Bytecode::Sub => write!(f, "Sub"),
+            Bytecode::Mul => write!(f, "Mul"),
+            Bytecode::Mod => write!(f, "Mod"),
+            Bytecode::Div => write!(f, "Div"),
+            Bytecode::BitOr => write!(f, "BitOr"),
+            Bytecode::BitAnd => write!(f, "BitAnd"),
+            Bytecode::Xor => write!(f, "Xor"),
+            Bytecode::Shl => write!(f, "Shl"),
+            Bytecode::Shr => write!(f, "Shr"),
+            Bytecode::Or => write!(f, "Or"),
+            Bytecode::And => write!(f, "And"),
+            Bytecode::Not => write!(f, "Not"),
+            Bytecode::Eq => write!(f, "Eq"),
+            Bytecode::Neq => write!(f, "Neq"),
+            Bytecode::Lt => write!(f, "Lt"),
+            Bytecode::Gt => write!(f, "Gt"),
+            Bytecode::Le => write!(f, "Le"),
+            Bytecode::Ge => write!(f, "Ge"),
+            Bytecode::Abort => write!(f, "Abort"),
+            Bytecode::Nop => write!(f, "Nop"),
+            Bytecode::Exists(a) => write!(f, "Exists({:?})", a),
+            Bytecode::ExistsGeneric(a) => write!(f, "ExistsGeneric({:?})", a),
+            Bytecode::MoveFrom(a) => write!(f, "MoveFrom({:?})", a),
+            Bytecode::MoveFromGeneric(a) => write!(f, "MoveFromGeneric({:?})", a),
+            Bytecode::MoveTo(a) => write!(f, "MoveTo({:?})", a),
+            Bytecode::MoveToGeneric(a) => write!(f, "MoveToGeneric({:?})", a),
+            Bytecode::VecPack(a, n) => write!(f, "VecPack({}, {})", a, n),
+            Bytecode::VecLen(a) => write!(f, "VecLen({})", a),
+            Bytecode::VecImmBorrow(a) => write!(f, "VecImmBorrow({})", a),
+            Bytecode::VecMutBorrow(a) => write!(f, "VecMutBorrow({})", a),
+            Bytecode::VecPushBack(a) => write!(f, "VecPushBack({})", a),
+            Bytecode::VecPopBack(a) => write!(f, "VecPopBack({})", a),
+            Bytecode::VecUnpack(a, n) => write!(f, "VecUnpack({}, {})", a, n),
+            Bytecode::VecSwap(a) => write!(f, "VecSwap({})", a),
+        }
+    }
+}
+
+impl Bytecode {
+    /// Return true if this bytecode instruction always branches
+    pub fn is_unconditional_branch(&self) -> bool {
+        matches!(self, Bytecode::Ret | Bytecode::Abort | Bytecode::Branch(_))
+    }
+
+    /// Return true if the branching behavior of this bytecode instruction depends on a runtime
+    /// value
+    pub fn is_conditional_branch(&self) -> bool {
+        matches!(self, Bytecode::BrFalse(_) | Bytecode::BrTrue(_))
+    }
+
+    /// Returns true if this bytecode instruction is either a conditional or an unconditional branch
+    pub fn is_branch(&self) -> bool {
+        self.is_conditional_branch() || self.is_unconditional_branch()
+    }
+
+    /// Returns the offset that this bytecode instruction branches to, if any.
+    /// Note that return and abort are branch instructions, but have no offset.
+    pub fn offset(&self) -> Option<&CodeOffset> {
+        match self {
+            Bytecode::BrFalse(offset) | Bytecode::BrTrue(offset) | Bytecode::Branch(offset) => {
+                Some(offset)
+            }
+            _ => None,
+        }
+    }
+
+    /// Return the successor offsets of this bytecode instruction.
+    pub fn get_successors(pc: CodeOffset, code: &[Bytecode]) -> Vec<CodeOffset> {
+        assert!(
+            // The program counter must remain within the bounds of the code
+            pc < u16::MAX && (pc as usize) < code.len(),
+            "Program counter out of bounds"
+        );
+
+        let bytecode = &code[pc as usize];
+        let mut v = vec![];
+
+        if let Some(offset) = bytecode.offset() {
+            v.push(*offset);
+        }
+
+        let next_pc = pc + 1;
+        if next_pc >= code.len() as CodeOffset {
+            return v;
+        }
+
+        if !bytecode.is_unconditional_branch() && !v.contains(&next_pc) {
+            // avoid duplicates
+            v.push(pc + 1);
+        }
+
+        // always give successors in ascending order
+        if v.len() > 1 && v[0] > v[1] {
+            v.swap(0, 1);
+        }
+
+        v
+    }
+}
+
+/// Contains the main function to execute and its dependencies.
+///
+/// A CompiledScript does not have definition tables because it can only have a `main(args)`.
+/// A CompiledScript defines the constant pools (string, address, signatures, etc.), the handle
+/// tables (external code references) and it has a `main` definition.
+#[derive(Clone, Default, Eq, PartialEq, Debug)]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct CompiledScript {
+    /// Version number found during deserialization
+    pub version: u32,
+    /// Handles to all modules referenced.
+    pub module_handles: Vec<ModuleHandle>,
+    /// Handles to external/imported types.
+    pub struct_handles: Vec<StructHandle>,
+    /// Handles to external/imported functions.
+    pub function_handles: Vec<FunctionHandle>,
+
+    /// Function instantiations.
+    pub function_instantiations: Vec<FunctionInstantiation>,
+
+    pub signatures: SignaturePool,
+
+    /// All identifiers used in this transaction.
+    pub identifiers: IdentifierPool,
+    /// All address identifiers used in this transaction.
+    pub address_identifiers: AddressIdentifierPool,
+    /// Constant pool. The constant values used in the transaction.
+    pub constant_pool: ConstantPool,
+
+    pub metadata: Vec<Metadata>,
+
+    pub code: CodeUnit,
+    pub type_parameters: Vec<AbilitySet>,
+
+    pub parameters: SignatureIndex,
+}
+
+impl CompiledScript {
+    /// Returns the index of `main` in case a script is converted to a module.
+    pub const MAIN_INDEX: FunctionDefinitionIndex = FunctionDefinitionIndex(0);
+}
+
+/// A `CompiledModule` defines the structure of a module which is the unit of published code.
+///
+/// A `CompiledModule` contains a definition of types (with their fields) and functions.
+/// It is a unit of code that can be used by transactions or other modules.
+///
+/// A module is published as a single entry and it is retrieved as a single blob.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "wasm", derive(Serialize, Deserialize))]
+pub struct CompiledModule {
+    /// Version number found during deserialization
+    pub version: u32,
+    /// Handle to self.
+    pub self_module_handle_idx: ModuleHandleIndex,
+    /// Handles to external dependency modules and self.
+    pub module_handles: Vec<ModuleHandle>,
+    /// Handles to external and internal types.
+    pub struct_handles: Vec<StructHandle>,
+    /// Handles to external and internal functions.
+    pub function_handles: Vec<FunctionHandle>,
+    /// Handles to fields.
+    pub field_handles: Vec<FieldHandle>,
+    /// Friend declarations, represented as a collection of handles to external friend modules.
+    pub friend_decls: Vec<ModuleHandle>,
+
+    /// Struct instantiations.
+    pub struct_def_instantiations: Vec<StructDefInstantiation>,
+    /// Function instantiations.
+    pub function_instantiations: Vec<FunctionInstantiation>,
+    /// Field instantiations.
+    pub field_instantiations: Vec<FieldInstantiation>,
+
+    /// Locals signature pool. The signature for all locals of the functions defined in the module.
+    pub signatures: SignaturePool,
+
+    /// All identifiers used in this module.
+    pub identifiers: IdentifierPool,
+    /// All address identifiers used in this module.
+    pub address_identifiers: AddressIdentifierPool,
+    /// Constant pool. The constant values used in the module.
+    pub constant_pool: ConstantPool,
+
+    pub metadata: Vec<Metadata>,
+
+    /// Types defined in this module.
+    pub struct_defs: Vec<StructDefinition>,
+    /// Function defined in this module.
+    pub function_defs: Vec<FunctionDefinition>,
+}
+
+// Need a custom implementation of Arbitrary because as of proptest-derive 0.1.1, the derivation
+// doesn't work for structs with more than 10 fields.
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for CompiledScript {
+    type Strategy = BoxedStrategy<Self>;
+    /// The size of the compiled script.
+    type Parameters = usize;
+
+    fn arbitrary_with(size: Self::Parameters) -> Self::Strategy {
+        (
+            (
+                vec(any::<ModuleHandle>(), 0..=size),
+                vec(any::<StructHandle>(), 0..=size),
+                vec(any::<FunctionHandle>(), 0..=size),
+            ),
+            vec(any_with::<Signature>(size), 0..=size),
+            (
+                vec(any::<Identifier>(), 0..=size),
+                vec(any::<AccountAddress>(), 0..=size),
+            ),
+            vec(any::<AbilitySet>(), 0..=size),
+            any::<SignatureIndex>(),
+            any::<CodeUnit>(),
+        )
+            .prop_map(
+                |(
+                    (module_handles, struct_handles, function_handles),
+                    signatures,
+                    (identifiers, address_identifiers),
+                    type_parameters,
+                    parameters,
+                    code,
+                )| {
+                    // TODO actual constant generation
+                    CompiledScript {
+                        version: file_format_common::VERSION_MAX,
+                        module_handles,
+                        struct_handles,
+                        function_handles,
+                        function_instantiations: vec![],
+                        signatures,
+                        identifiers,
+                        address_identifiers,
+                        constant_pool: vec![],
+                        metadata: vec![],
+                        type_parameters,
+                        parameters,
+                        code,
+                    }
+                },
+            )
+            .boxed()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for CompiledModule {
+    type Strategy = BoxedStrategy<Self>;
+    /// The size of the compiled module.
+    type Parameters = usize;
+
+    fn arbitrary_with(size: Self::Parameters) -> Self::Strategy {
+        (
+            (
+                vec(any::<ModuleHandle>(), 0..=size),
+                vec(any::<StructHandle>(), 0..=size),
+                vec(any::<FunctionHandle>(), 0..=size),
+            ),
+            any::<ModuleHandleIndex>(),
+            vec(any::<ModuleHandle>(), 0..=size),
+            vec(any_with::<Signature>(size), 0..=size),
+            (
+                vec(any::<Identifier>(), 0..=size),
+                vec(any::<AccountAddress>(), 0..=size),
+            ),
+            (
+                vec(any::<StructDefinition>(), 0..=size),
+                vec(any_with::<FunctionDefinition>(size), 0..=size),
+            ),
+        )
+            .prop_map(
+                |(
+                    (module_handles, struct_handles, function_handles),
+                    self_module_handle_idx,
+                    friend_decls,
+                    signatures,
+                    (identifiers, address_identifiers),
+                    (struct_defs, function_defs),
+                )| {
+                    // TODO actual constant generation
+                    CompiledModule {
+                        version: file_format_common::VERSION_MAX,
+                        module_handles,
+                        struct_handles,
+                        function_handles,
+                        self_module_handle_idx,
+                        field_handles: vec![],
+                        friend_decls,
+                        struct_def_instantiations: vec![],
+                        function_instantiations: vec![],
+                        field_instantiations: vec![],
+                        signatures,
+                        identifiers,
+                        address_identifiers,
+                        constant_pool: vec![],
+                        metadata: vec![],
+                        struct_defs,
+                        function_defs,
+                    }
+                },
+            )
+            .boxed()
+    }
+}
+
+impl CompiledModule {
+    /// Returns the count of a specific `IndexKind`
+    pub fn kind_count(&self, kind: IndexKind) -> usize {
+        debug_assert!(!matches!(
+            kind,
+            IndexKind::LocalPool
+                | IndexKind::CodeDefinition
+                | IndexKind::FieldDefinition
+                | IndexKind::TypeParameter
+                | IndexKind::MemberCount
+        ));
+        match kind {
+            IndexKind::ModuleHandle => self.module_handles.len(),
+            IndexKind::StructHandle => self.struct_handles.len(),
+            IndexKind::FunctionHandle => self.function_handles.len(),
+            IndexKind::FieldHandle => self.field_handles.len(),
+            IndexKind::FriendDeclaration => self.friend_decls.len(),
+            IndexKind::StructDefInstantiation => self.struct_def_instantiations.len(),
+            IndexKind::FunctionInstantiation => self.function_instantiations.len(),
+            IndexKind::FieldInstantiation => self.field_instantiations.len(),
+            IndexKind::StructDefinition => self.struct_defs.len(),
+            IndexKind::FunctionDefinition => self.function_defs.len(),
+            IndexKind::Signature => self.signatures.len(),
+            IndexKind::Identifier => self.identifiers.len(),
+            IndexKind::AddressIdentifier => self.address_identifiers.len(),
+            IndexKind::ConstantPool => self.constant_pool.len(),
+            // XXX these two don't seem to belong here
+            other @ IndexKind::LocalPool
+            | other @ IndexKind::CodeDefinition
+            | other @ IndexKind::FieldDefinition
+            | other @ IndexKind::TypeParameter
+            | other @ IndexKind::MemberCount => unreachable!("invalid kind for count: {:?}", other),
+        }
+    }
+
+    /// Returns the code key of `module_handle`
+    pub fn module_id_for_handle(&self, module_handle: &ModuleHandle) -> ModuleId {
+        ModuleId::new(
+            *self.address_identifier_at(module_handle.address),
+            self.identifier_at(module_handle.name).to_owned(),
+        )
+    }
+
+    /// Returns the code key of `self`
+    pub fn self_id(&self) -> ModuleId {
+        self.module_id_for_handle(self.self_handle())
+    }
+}
+
+/// Return the simplest module that will pass the bounds checker
+pub fn empty_module() -> CompiledModule {
+    CompiledModule {
+        version: file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![self_module_name().to_owned()],
+        address_identifiers: vec![AccountAddress::ZERO],
+        constant_pool: vec![],
+        metadata: vec![],
+        function_defs: vec![],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![])],
+    }
+}
+
+/// Create the following module which is convenient in tests:
+/// // module <SELF> {
+/// //     struct Bar { x: u64 }
+/// //
+/// //     foo() {
+/// //     }
+/// // }
+pub fn basic_test_module() -> CompiledModule {
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(m.identifiers.len() as u16),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.identifiers
+        .push(Identifier::new("foo".to_string()).unwrap());
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Private,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    m.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(m.identifiers.len() as u16),
+        abilities: AbilitySet::EMPTY,
+        type_parameters: vec![],
+    });
+    m.identifiers
+        .push(Identifier::new("Bar".to_string()).unwrap());
+
+    m.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex(m.identifiers.len() as u16),
+            signature: TypeSignature(SignatureToken::U64),
+        }]),
+    });
+    m.identifiers
+        .push(Identifier::new("x".to_string()).unwrap());
+
+    m
+}
+
+/// Return a simple script that contains only a return in the main()
+pub fn empty_script() -> CompiledScript {
+    CompiledScript {
+        version: file_format_common::VERSION_MAX,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+
+        function_instantiations: vec![],
+
+        signatures: vec![Signature(vec![])],
+
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        },
+    }
+}
+
+pub fn basic_test_script() -> CompiledScript {
+    empty_script()
+}
diff --git a/vendors/move/crates/move-binary-format/src/file_format_common.rs b/vendors/move/crates/move-binary-format/src/file_format_common.rs
new file mode 100644
index 000000000..722ea571c
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/file_format_common.rs
@@ -0,0 +1,660 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Constants for the binary format.
+//!
+//! Definition for the constants of the binary format, used by the serializer and the deserializer.
+//! This module also offers helpers for the serialization and deserialization of certain
+//! integer indexes.
+//!
+//! We use LEB128 for integer compression. LEB128 is a representation from the DWARF3 spec,
+//! http://dwarfstd.org/Dwarf3Std.php or https://en.wikipedia.org/wiki/LEB128.
+//! It's used to compress mostly indexes into the main binary tables.
+use crate::file_format::Bytecode;
+use anyhow::{bail, Result};
+use std::{
+    io::{Cursor, Read},
+    mem::size_of,
+};
+
+/// Constant values for the binary format header.
+///
+/// The binary header is magic +  version info + table count.
+pub enum BinaryConstants {}
+impl BinaryConstants {
+    /// The blob that must start a binary.
+    pub const MOVE_MAGIC_SIZE: usize = 4;
+    pub const MOVE_MAGIC: [u8; BinaryConstants::MOVE_MAGIC_SIZE] = [0xA1, 0x1C, 0xEB, 0x0B];
+    /// The `DIEM_MAGIC` size, 4 byte for major version and 1 byte for table count.
+    pub const HEADER_SIZE: usize = BinaryConstants::MOVE_MAGIC_SIZE + 5;
+    /// A (Table Type, Start Offset, Byte Count) size, which is 1 byte for the type and
+    /// 4 bytes for the offset/count.
+    pub const TABLE_HEADER_SIZE: u8 = size_of::<u32>() as u8 * 2 + 1;
+}
+
+pub const TABLE_COUNT_MAX: u64 = 255;
+
+pub const TABLE_OFFSET_MAX: u64 = 0xffff_ffff;
+pub const TABLE_SIZE_MAX: u64 = 0xffff_ffff;
+pub const TABLE_CONTENT_SIZE_MAX: u64 = 0xffff_ffff;
+
+pub const TABLE_INDEX_MAX: u64 = 65535;
+pub const SIGNATURE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const ADDRESS_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const IDENTIFIER_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const MODULE_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const STRUCT_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const STRUCT_DEF_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const FUNCTION_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const FUNCTION_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const FIELD_HANDLE_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const FIELD_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const STRUCT_DEF_INST_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+pub const CONSTANT_INDEX_MAX: u64 = TABLE_INDEX_MAX;
+
+pub const BYTECODE_COUNT_MAX: u64 = 65535;
+pub const BYTECODE_INDEX_MAX: u64 = 65535;
+
+pub const LOCAL_INDEX_MAX: u64 = 255;
+
+pub const IDENTIFIER_SIZE_MAX: u64 = 65535;
+
+pub const CONSTANT_SIZE_MAX: u64 = 65535;
+
+pub const METADATA_KEY_SIZE_MAX: u64 = 1023;
+pub const METADATA_VALUE_SIZE_MAX: u64 = 65535;
+
+pub const SIGNATURE_SIZE_MAX: u64 = 255;
+
+pub const ACQUIRES_COUNT_MAX: u64 = 255;
+
+pub const FIELD_COUNT_MAX: u64 = 255;
+pub const FIELD_OFFSET_MAX: u64 = 255;
+
+pub const TYPE_PARAMETER_COUNT_MAX: u64 = 255;
+pub const TYPE_PARAMETER_INDEX_MAX: u64 = 65536;
+
+pub const SIGNATURE_TOKEN_DEPTH_MAX: usize = 256;
+
+/// Constants for table types in the binary.
+///
+/// The binary contains a subset of those tables. A table specification is a tuple (table type,
+/// start offset, byte count) for a given table.
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum TableType {
+    MODULE_HANDLES          = 0x1,
+    STRUCT_HANDLES          = 0x2,
+    FUNCTION_HANDLES        = 0x3,
+    FUNCTION_INST           = 0x4,
+    SIGNATURES              = 0x5,
+    CONSTANT_POOL           = 0x6,
+    IDENTIFIERS             = 0x7,
+    ADDRESS_IDENTIFIERS     = 0x8,
+    STRUCT_DEFS             = 0xA,
+    STRUCT_DEF_INST         = 0xB,
+    FUNCTION_DEFS           = 0xC,
+    FIELD_HANDLE            = 0xD,
+    FIELD_INST              = 0xE,
+    FRIEND_DECLS            = 0xF,
+    METADATA                = 0x10,
+}
+
+/// Constants for signature blob values.
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum SerializedType {
+    BOOL                    = 0x1,
+    U8                      = 0x2,
+    U64                     = 0x3,
+    U128                    = 0x4,
+    ADDRESS                 = 0x5,
+    REFERENCE               = 0x6,
+    MUTABLE_REFERENCE       = 0x7,
+    STRUCT                  = 0x8,
+    TYPE_PARAMETER          = 0x9,
+    VECTOR                  = 0xA,
+    STRUCT_INST             = 0xB,
+    SIGNER                  = 0xC,
+    U16                     = 0xD,
+    U32                     = 0xE,
+    U256                    = 0xF,
+}
+
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum SerializedNativeStructFlag {
+    NATIVE                  = 0x1,
+    DECLARED                = 0x2,
+}
+
+/// List of opcodes constants.
+#[rustfmt::skip]
+#[allow(non_camel_case_types)]
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum Opcodes {
+    POP                         = 0x01,
+    RET                         = 0x02,
+    BR_TRUE                     = 0x03,
+    BR_FALSE                    = 0x04,
+    BRANCH                      = 0x05,
+    LD_U64                      = 0x06,
+    LD_CONST                    = 0x07,
+    LD_TRUE                     = 0x08,
+    LD_FALSE                    = 0x09,
+    COPY_LOC                    = 0x0A,
+    MOVE_LOC                    = 0x0B,
+    ST_LOC                      = 0x0C,
+    MUT_BORROW_LOC              = 0x0D,
+    IMM_BORROW_LOC              = 0x0E,
+    MUT_BORROW_FIELD            = 0x0F,
+    IMM_BORROW_FIELD            = 0x10,
+    CALL                        = 0x11,
+    PACK                        = 0x12,
+    UNPACK                      = 0x13,
+    READ_REF                    = 0x14,
+    WRITE_REF                   = 0x15,
+    ADD                         = 0x16,
+    SUB                         = 0x17,
+    MUL                         = 0x18,
+    MOD                         = 0x19,
+    DIV                         = 0x1A,
+    BIT_OR                      = 0x1B,
+    BIT_AND                     = 0x1C,
+    XOR                         = 0x1D,
+    OR                          = 0x1E,
+    AND                         = 0x1F,
+    NOT                         = 0x20,
+    EQ                          = 0x21,
+    NEQ                         = 0x22,
+    LT                          = 0x23,
+    GT                          = 0x24,
+    LE                          = 0x25,
+    GE                          = 0x26,
+    ABORT                       = 0x27,
+    NOP                         = 0x28,
+    EXISTS                      = 0x29,
+    MUT_BORROW_GLOBAL           = 0x2A,
+    IMM_BORROW_GLOBAL           = 0x2B,
+    MOVE_FROM                   = 0x2C,
+    MOVE_TO                     = 0x2D,
+    FREEZE_REF                  = 0x2E,
+    SHL                         = 0x2F,
+    SHR                         = 0x30,
+    LD_U8                       = 0x31,
+    LD_U128                     = 0x32,
+    CAST_U8                     = 0x33,
+    CAST_U64                    = 0x34,
+    CAST_U128                   = 0x35,
+    MUT_BORROW_FIELD_GENERIC    = 0x36,
+    IMM_BORROW_FIELD_GENERIC    = 0x37,
+    CALL_GENERIC                = 0x38,
+    PACK_GENERIC                = 0x39,
+    UNPACK_GENERIC              = 0x3A,
+    EXISTS_GENERIC              = 0x3B,
+    MUT_BORROW_GLOBAL_GENERIC   = 0x3C,
+    IMM_BORROW_GLOBAL_GENERIC   = 0x3D,
+    MOVE_FROM_GENERIC           = 0x3E,
+    MOVE_TO_GENERIC             = 0x3F,
+    VEC_PACK                    = 0x40,
+    VEC_LEN                     = 0x41,
+    VEC_IMM_BORROW              = 0x42,
+    VEC_MUT_BORROW              = 0x43,
+    VEC_PUSH_BACK               = 0x44,
+    VEC_POP_BACK                = 0x45,
+    VEC_UNPACK                  = 0x46,
+    VEC_SWAP                    = 0x47,
+    LD_U16                      = 0x48,
+    LD_U32                      = 0x49,
+    LD_U256                     = 0x4A,
+    CAST_U16                    = 0x4B,
+    CAST_U32                    = 0x4C,
+    CAST_U256                   = 0x4D,
+}
+
+/// Upper limit on the binary size
+pub const BINARY_SIZE_LIMIT: usize = usize::max_value();
+
+/// A wrapper for the binary vector
+#[derive(Default, Debug)]
+pub(crate) struct BinaryData {
+    _binary: Vec<u8>,
+}
+
+/// The wrapper mirrors Vector operations but provides additional checks against overflow
+impl BinaryData {
+    pub fn new() -> Self {
+        BinaryData {
+            _binary: Vec::new(),
+        }
+    }
+
+    pub fn as_inner(&self) -> &[u8] {
+        &self._binary
+    }
+
+    pub fn into_inner(self) -> Vec<u8> {
+        self._binary
+    }
+
+    pub fn push(&mut self, item: u8) -> Result<()> {
+        if self.len().checked_add(1).is_some() {
+            self._binary.push(item);
+        } else {
+            bail!(
+                "binary size ({}) + 1 is greater than limit ({})",
+                self.len(),
+                BINARY_SIZE_LIMIT,
+            );
+        }
+        Ok(())
+    }
+
+    pub fn extend(&mut self, vec: &[u8]) -> Result<()> {
+        let vec_len: usize = vec.len();
+        if self.len().checked_add(vec_len).is_some() {
+            self._binary.extend(vec);
+        } else {
+            bail!(
+                "binary size ({}) + {} is greater than limit ({})",
+                self.len(),
+                vec.len(),
+                BINARY_SIZE_LIMIT,
+            );
+        }
+        Ok(())
+    }
+
+    pub fn len(&self) -> usize {
+        self._binary.len()
+    }
+
+    #[allow(dead_code)]
+    pub fn is_empty(&self) -> bool {
+        self._binary.is_empty()
+    }
+
+    #[allow(dead_code)]
+    pub fn clear(&mut self) {
+        self._binary.clear();
+    }
+}
+
+impl From<Vec<u8>> for BinaryData {
+    fn from(vec: Vec<u8>) -> Self {
+        BinaryData { _binary: vec }
+    }
+}
+
+pub(crate) fn write_u64_as_uleb128(binary: &mut BinaryData, mut val: u64) -> Result<()> {
+    loop {
+        let cur = val & 0x7f;
+        if cur != val {
+            binary.push((cur | 0x80) as u8)?;
+            val >>= 7;
+        } else {
+            binary.push(cur as u8)?;
+            break;
+        }
+    }
+    Ok(())
+}
+
+/// Write a `u16` in Little Endian format.
+#[allow(dead_code)]
+pub(crate) fn write_u16(binary: &mut BinaryData, value: u16) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
+/// Write a `u32` in Little Endian format.
+pub(crate) fn write_u32(binary: &mut BinaryData, value: u32) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
+/// Write a `u64` in Little Endian format.
+pub(crate) fn write_u64(binary: &mut BinaryData, value: u64) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
+/// Write a `u128` in Little Endian format.
+pub(crate) fn write_u128(binary: &mut BinaryData, value: u128) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
+/// Write a `u256` in Little Endian format.
+pub(crate) fn write_u256(
+    binary: &mut BinaryData,
+    value: move_core_types::u256::U256,
+) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
+pub fn read_u8(cursor: &mut Cursor<&[u8]>) -> Result<u8> {
+    let mut buf = [0; 1];
+    cursor.read_exact(&mut buf)?;
+    Ok(buf[0])
+}
+
+pub fn read_u32(cursor: &mut Cursor<&[u8]>) -> Result<u32> {
+    let mut buf = [0; 4];
+    cursor.read_exact(&mut buf)?;
+    Ok(u32::from_le_bytes(buf))
+}
+
+pub fn read_uleb128_as_u64(cursor: &mut Cursor<&[u8]>) -> Result<u64> {
+    let mut value: u64 = 0;
+    let mut shift = 0;
+    while let Ok(byte) = read_u8(cursor) {
+        let cur = (byte & 0x7f) as u64;
+        if (cur << shift) >> shift != cur {
+            bail!("invalid ULEB128 repr for usize");
+        }
+        value |= cur << shift;
+
+        if (byte & 0x80) == 0 {
+            if shift > 0 && cur == 0 {
+                bail!("invalid ULEB128 repr for usize");
+            }
+            return Ok(value);
+        }
+
+        shift += 7;
+        if shift > u64::BITS {
+            break;
+        }
+    }
+    bail!("invalid ULEB128 repr for usize");
+}
+
+//
+// Bytecode evolution
+//
+
+/// Version 1: the initial version
+pub const VERSION_1: u32 = 1;
+
+/// Version 2: changes compared with version 1
+///  + function visibility stored in separate byte before the flags byte
+///  + the flags byte now contains only the is_native information (at bit 0x2)
+///  + new visibility modifiers for "friend" and "script" functions
+///  + friend list for modules
+pub const VERSION_2: u32 = 2;
+
+/// Version 3: changes compared with version 2
+///  + phantom type parameters
+pub const VERSION_3: u32 = 3;
+
+/// Version 4: changes compared with version 3
+///  + bytecode for vector operations
+pub const VERSION_4: u32 = 4;
+
+/// Version 5: changes compared with version 4
+///  +/- script and public(script) verification is now adapter specific
+///  + metadata
+pub const VERSION_5: u32 = 5;
+
+/// Version 6: changes compared with version 5
+///  + u16, u32, u256 integers and corresponding Ld, Cast bytecodes
+pub const VERSION_6: u32 = 6;
+
+// Mark which version is the latest version
+pub const VERSION_MAX: u32 = VERSION_6;
+
+// Mark which oldest version is supported.
+// TODO(#145): finish v4 compatibility; as of now, only metadata is implemented
+pub const VERSION_MIN: u32 = VERSION_5;
+
+pub(crate) mod versioned_data {
+    use crate::{errors::*, file_format_common::*};
+    use move_core_types::vm_status::StatusCode;
+    use std::io::{Cursor, Read};
+    pub struct VersionedBinary<'a> {
+        version: u32,
+        binary: &'a [u8],
+        check_no_extraneous_bytes: bool,
+    }
+
+    pub struct VersionedCursor<'a> {
+        version: u32,
+        cursor: Cursor<&'a [u8]>,
+        check_no_extraneous_bytes: bool,
+    }
+
+    impl<'a> VersionedBinary<'a> {
+        fn new(
+            binary: &'a [u8],
+            max_version: u32,
+            check_no_extraneous_bytes: bool,
+        ) -> BinaryLoaderResult<(Self, Cursor<&'a [u8]>)> {
+            let mut cursor = Cursor::<&'a [u8]>::new(binary);
+            let mut magic = [0u8; BinaryConstants::MOVE_MAGIC_SIZE];
+            if let Ok(count) = cursor.read(&mut magic) {
+                if count != BinaryConstants::MOVE_MAGIC_SIZE || magic != BinaryConstants::MOVE_MAGIC
+                {
+                    return Err(PartialVMError::new(StatusCode::BAD_MAGIC));
+                }
+            } else {
+                return Err(PartialVMError::new(StatusCode::MALFORMED)
+                    .with_message("Bad binary header".to_string()));
+            }
+            let version = match read_u32(&mut cursor) {
+                Ok(v) => v,
+                Err(_) => {
+                    return Err(PartialVMError::new(StatusCode::MALFORMED)
+                        .with_message("Bad binary header".to_string()));
+                }
+            };
+            if version == 0 || version > u32::min(max_version, VERSION_MAX) {
+                return Err(PartialVMError::new(StatusCode::UNKNOWN_VERSION));
+            }
+            Ok((
+                Self {
+                    version,
+                    binary,
+                    check_no_extraneous_bytes,
+                },
+                cursor,
+            ))
+        }
+
+        #[allow(dead_code)]
+        pub fn version(&self) -> u32 {
+            self.version
+        }
+
+        pub fn new_cursor(&self, start: usize, end: usize) -> VersionedCursor<'a> {
+            VersionedCursor {
+                version: self.version,
+                cursor: Cursor::new(&self.binary[start..end]),
+                check_no_extraneous_bytes: self.check_no_extraneous_bytes,
+            }
+        }
+
+        pub fn slice(&self, start: usize, end: usize) -> &'a [u8] {
+            &self.binary[start..end]
+        }
+
+        pub(crate) fn check_no_extraneous_bytes(&self) -> bool {
+            self.check_no_extraneous_bytes
+        }
+    }
+
+    impl<'a> VersionedCursor<'a> {
+        /// Verifies the correctness of the "static" part of the binary's header.
+        /// If valid, returns a cursor to the binary
+        pub fn new(
+            binary: &'a [u8],
+            max_version: u32,
+            check_no_extraneous_bytes: bool,
+        ) -> BinaryLoaderResult<Self> {
+            let (binary, cursor) =
+                VersionedBinary::new(binary, max_version, check_no_extraneous_bytes)?;
+            Ok(VersionedCursor {
+                version: binary.version,
+                cursor,
+                check_no_extraneous_bytes,
+            })
+        }
+
+        #[allow(dead_code)]
+        pub fn version(&self) -> u32 {
+            self.version
+        }
+
+        pub fn position(&self) -> u64 {
+            self.cursor.position()
+        }
+
+        #[allow(dead_code)]
+        pub fn binary(&self) -> VersionedBinary<'a> {
+            VersionedBinary {
+                version: self.version,
+                binary: self.cursor.get_ref(),
+                check_no_extraneous_bytes: self.check_no_extraneous_bytes,
+            }
+        }
+
+        pub fn read_u8(&mut self) -> Result<u8> {
+            read_u8(&mut self.cursor)
+        }
+
+        #[allow(dead_code)]
+        pub fn read_u32(&mut self) -> Result<u32> {
+            read_u32(&mut self.cursor)
+        }
+
+        pub fn read_uleb128_as_u64(&mut self) -> Result<u64> {
+            read_uleb128_as_u64(&mut self.cursor)
+        }
+
+        pub fn read_new_binary<'b>(
+            &mut self,
+            buffer: &'b mut Vec<u8>,
+            n: usize,
+        ) -> BinaryLoaderResult<VersionedBinary<'b>> {
+            debug_assert!(buffer.is_empty());
+            let mut tmp_buffer = vec![0; n];
+            match self.cursor.read_exact(&mut tmp_buffer) {
+                Err(_) => Err(PartialVMError::new(StatusCode::MALFORMED)),
+                Ok(()) => {
+                    *buffer = tmp_buffer;
+                    Ok(VersionedBinary {
+                        version: self.version,
+                        binary: buffer,
+                        check_no_extraneous_bytes: self.check_no_extraneous_bytes,
+                    })
+                }
+            }
+        }
+
+        #[cfg(test)]
+        pub fn new_for_test(version: u32, cursor: Cursor<&'a [u8]>) -> Self {
+            Self {
+                version,
+                cursor,
+                check_no_extraneous_bytes: true,
+            }
+        }
+    }
+
+    impl<'a> Read for VersionedCursor<'a> {
+        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+            self.cursor.read(buf)
+        }
+    }
+}
+pub(crate) use versioned_data::{VersionedBinary, VersionedCursor};
+
+/// The encoding of the instruction is the serialized form of it, but disregarding the
+/// serialization of the instruction's argument(s).
+pub fn instruction_key(instruction: &Bytecode) -> u8 {
+    use Bytecode::*;
+    let opcode = match instruction {
+        Pop => Opcodes::POP,
+        Ret => Opcodes::RET,
+        BrTrue(_) => Opcodes::BR_TRUE,
+        BrFalse(_) => Opcodes::BR_FALSE,
+        Branch(_) => Opcodes::BRANCH,
+        LdU8(_) => Opcodes::LD_U8,
+        LdU64(_) => Opcodes::LD_U64,
+        LdU128(_) => Opcodes::LD_U128,
+        CastU8 => Opcodes::CAST_U8,
+        CastU64 => Opcodes::CAST_U64,
+        CastU128 => Opcodes::CAST_U128,
+        LdConst(_) => Opcodes::LD_CONST,
+        LdTrue => Opcodes::LD_TRUE,
+        LdFalse => Opcodes::LD_FALSE,
+        CopyLoc(_) => Opcodes::COPY_LOC,
+        MoveLoc(_) => Opcodes::MOVE_LOC,
+        StLoc(_) => Opcodes::ST_LOC,
+        Call(_) => Opcodes::CALL,
+        CallGeneric(_) => Opcodes::CALL_GENERIC,
+        Pack(_) => Opcodes::PACK,
+        PackGeneric(_) => Opcodes::PACK_GENERIC,
+        Unpack(_) => Opcodes::UNPACK,
+        UnpackGeneric(_) => Opcodes::UNPACK_GENERIC,
+        ReadRef => Opcodes::READ_REF,
+        WriteRef => Opcodes::WRITE_REF,
+        FreezeRef => Opcodes::FREEZE_REF,
+        MutBorrowLoc(_) => Opcodes::MUT_BORROW_LOC,
+        ImmBorrowLoc(_) => Opcodes::IMM_BORROW_LOC,
+        MutBorrowField(_) => Opcodes::MUT_BORROW_FIELD,
+        MutBorrowFieldGeneric(_) => Opcodes::MUT_BORROW_FIELD_GENERIC,
+        ImmBorrowField(_) => Opcodes::IMM_BORROW_FIELD,
+        ImmBorrowFieldGeneric(_) => Opcodes::IMM_BORROW_FIELD_GENERIC,
+        MutBorrowGlobal(_) => Opcodes::MUT_BORROW_GLOBAL,
+        MutBorrowGlobalGeneric(_) => Opcodes::MUT_BORROW_GLOBAL_GENERIC,
+        ImmBorrowGlobal(_) => Opcodes::IMM_BORROW_GLOBAL,
+        ImmBorrowGlobalGeneric(_) => Opcodes::IMM_BORROW_GLOBAL_GENERIC,
+        Add => Opcodes::ADD,
+        Sub => Opcodes::SUB,
+        Mul => Opcodes::MUL,
+        Mod => Opcodes::MOD,
+        Div => Opcodes::DIV,
+        BitOr => Opcodes::BIT_OR,
+        BitAnd => Opcodes::BIT_AND,
+        Xor => Opcodes::XOR,
+        Shl => Opcodes::SHL,
+        Shr => Opcodes::SHR,
+        Or => Opcodes::OR,
+        And => Opcodes::AND,
+        Not => Opcodes::NOT,
+        Eq => Opcodes::EQ,
+        Neq => Opcodes::NEQ,
+        Lt => Opcodes::LT,
+        Gt => Opcodes::GT,
+        Le => Opcodes::LE,
+        Ge => Opcodes::GE,
+        Abort => Opcodes::ABORT,
+        Nop => Opcodes::NOP,
+        Exists(_) => Opcodes::EXISTS,
+        ExistsGeneric(_) => Opcodes::EXISTS_GENERIC,
+        MoveFrom(_) => Opcodes::MOVE_FROM,
+        MoveFromGeneric(_) => Opcodes::MOVE_FROM_GENERIC,
+        MoveTo(_) => Opcodes::MOVE_TO,
+        MoveToGeneric(_) => Opcodes::MOVE_TO_GENERIC,
+        VecPack(..) => Opcodes::VEC_PACK,
+        VecLen(_) => Opcodes::VEC_LEN,
+        VecImmBorrow(_) => Opcodes::VEC_IMM_BORROW,
+        VecMutBorrow(_) => Opcodes::VEC_MUT_BORROW,
+        VecPushBack(_) => Opcodes::VEC_PUSH_BACK,
+        VecPopBack(_) => Opcodes::VEC_POP_BACK,
+        VecUnpack(..) => Opcodes::VEC_UNPACK,
+        VecSwap(_) => Opcodes::VEC_SWAP,
+        LdU16(_) => Opcodes::LD_U16,
+        LdU32(_) => Opcodes::LD_U32,
+        LdU256(_) => Opcodes::LD_U256,
+        CastU16 => Opcodes::CAST_U16,
+        CastU32 => Opcodes::CAST_U32,
+        CastU256 => Opcodes::CAST_U256,
+    };
+    opcode as u8
+}
diff --git a/vendors/move/crates/move-binary-format/src/internals.rs b/vendors/move/crates/move-binary-format/src/internals.rs
new file mode 100644
index 000000000..b9d877c6f
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/internals.rs
@@ -0,0 +1,15 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Types meant for use by other parts of this crate, and by other crates that are designed to
+//! work with the internals of these data structures.
+
+use crate::IndexKind;
+
+/// Represents a module index.
+pub trait ModuleIndex {
+    const KIND: IndexKind;
+
+    fn into_index(self) -> usize;
+}
diff --git a/vendors/move/crates/move-binary-format/src/lib.rs b/vendors/move/crates/move-binary-format/src/lib.rs
new file mode 100644
index 000000000..ebcd6b1b2
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/lib.rs
@@ -0,0 +1,194 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use std::fmt;
+
+pub mod access;
+pub mod binary_views;
+pub mod check_bounds;
+pub mod compatibility;
+#[macro_use]
+pub mod errors;
+pub mod constant;
+pub mod control_flow_graph;
+pub mod deserializer;
+pub mod file_format;
+pub mod file_format_common;
+pub mod internals;
+pub mod normalized;
+#[cfg(any(test, feature = "fuzzing"))]
+pub mod proptest_types;
+pub mod serializer;
+pub mod views;
+
+#[cfg(test)]
+mod unit_tests;
+
+pub use file_format::CompiledModule;
+
+/// Represents a kind of index -- useful for error messages.
+#[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub enum IndexKind {
+    ModuleHandle,
+    StructHandle,
+    FunctionHandle,
+    FieldHandle,
+    FriendDeclaration,
+    FunctionInstantiation,
+    FieldInstantiation,
+    StructDefinition,
+    StructDefInstantiation,
+    FunctionDefinition,
+    FieldDefinition,
+    Signature,
+    Identifier,
+    AddressIdentifier,
+    ConstantPool,
+    LocalPool,
+    CodeDefinition,
+    TypeParameter,
+    MemberCount,
+}
+
+impl IndexKind {
+    pub fn variants() -> &'static [IndexKind] {
+        use IndexKind::*;
+
+        // XXX ensure this list stays up to date!
+        &[
+            ModuleHandle,
+            StructHandle,
+            FunctionHandle,
+            FieldHandle,
+            FriendDeclaration,
+            StructDefInstantiation,
+            FunctionInstantiation,
+            FieldInstantiation,
+            StructDefinition,
+            FunctionDefinition,
+            FieldDefinition,
+            Signature,
+            Identifier,
+            ConstantPool,
+            LocalPool,
+            CodeDefinition,
+            TypeParameter,
+            MemberCount,
+        ]
+    }
+}
+
+impl fmt::Display for IndexKind {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use IndexKind::*;
+
+        let desc = match self {
+            ModuleHandle => "module handle",
+            StructHandle => "struct handle",
+            FunctionHandle => "function handle",
+            FieldHandle => "field handle",
+            FriendDeclaration => "friend declaration",
+            StructDefInstantiation => "struct instantiation",
+            FunctionInstantiation => "function instantiation",
+            FieldInstantiation => "field instantiation",
+            StructDefinition => "struct definition",
+            FunctionDefinition => "function definition",
+            FieldDefinition => "field definition",
+            Signature => "signature",
+            Identifier => "identifier",
+            AddressIdentifier => "address identifier",
+            ConstantPool => "constant pool",
+            LocalPool => "local pool",
+            CodeDefinition => "code definition pool",
+            TypeParameter => "type parameter",
+            MemberCount => "field offset",
+        };
+
+        f.write_str(desc)
+    }
+}
+
+// TODO: is this outdated?
+/// Represents the kind of a signature token.
+#[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub enum SignatureTokenKind {
+    /// Any sort of owned value that isn't an array (Integer, Bool, Struct etc).
+    Value,
+    /// A reference.
+    Reference,
+    /// A mutable reference.
+    MutableReference,
+}
+
+impl fmt::Display for SignatureTokenKind {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use SignatureTokenKind::*;
+
+        let desc = match self {
+            Value => "value",
+            Reference => "reference",
+            MutableReference => "mutable reference",
+        };
+
+        f.write_str(desc)
+    }
+}
+
+/// A macro which should be preferred in critical runtime paths for unwrapping an option
+/// if a `PartialVMError` is expected. In debug mode, this will panic. Otherwise
+/// we return an Err.
+#[macro_export]
+macro_rules! safe_unwrap {
+    ($e:expr) => {{
+        match $e {
+            Some(x) => x,
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("{}:{} (none)", file!(), line!()));
+                if cfg!(debug_assertions) {
+                    panic!("{:?}", err);
+                } else {
+                    return Err(err);
+                }
+            }
+        }
+    }};
+}
+
+/// Similar as above but for Result
+#[macro_export]
+macro_rules! safe_unwrap_err {
+    ($e:expr) => {{
+        match $e {
+            Ok(x) => x,
+            Err(e) => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("{}:{} {:#}", file!(), line!(), e));
+                if cfg!(debug_assertions) {
+                    panic!("{:?}", err);
+                } else {
+                    return Err(err);
+                }
+            }
+        }
+    }};
+}
+
+/// Similar as above, but asserts a boolean expression to be true.
+#[macro_export]
+macro_rules! safe_assert {
+    ($e:expr) => {{
+        if !$e {
+            let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("{}:{} (assert)", file!(), line!()));
+            if cfg!(debug_assertions) {
+                panic!("{:?}", err)
+            } else {
+                return Err(err);
+            }
+        }
+    }};
+}
diff --git a/vendors/move/crates/move-binary-format/src/normalized.rs b/vendors/move/crates/move-binary-format/src/normalized.rs
new file mode 100644
index 000000000..30cb1ca34
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/normalized.rs
@@ -0,0 +1,731 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    access::ModuleAccess,
+    file_format::{
+        AbilitySet, Bytecode as FBytecode, CodeOffset, CompiledModule, FieldDefinition,
+        FieldHandle, FieldHandleIndex, FieldInstantiation, FieldInstantiationIndex,
+        FunctionDefinition, FunctionHandle, FunctionHandleIndex, FunctionInstantiation, LocalIndex,
+        SignatureIndex, SignatureToken, StructDefInstantiation, StructDefInstantiationIndex,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructTypeParameter,
+        TypeParameterIndex, Visibility,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use move_proc_macros::test_variant_order;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+/// Defines normalized representations of Move types, fields, kinds, structs, functions, and
+/// modules. These representations are useful in situations that require require comparing
+/// functions, resources, and types across modules. This arises in linking, compatibility checks
+/// (e.g., "is it safe to deploy this new module without updating its dependents and/or restarting
+/// genesis?"), defining schemas for resources stored on-chain, and (possibly in the future)
+/// allowing module updates transactions.
+
+/// A normalized version of `SignatureToken`, a type expression appearing in struct or function
+/// declarations. Unlike `SignatureToken`s, `normalized::Type`s from different modules can safely be
+/// compared.
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+#[test_variant_order(src/unit_tests/staged_enum_variant_order/type.yaml)]
+pub enum Type {
+    #[serde(rename = "bool")]
+    Bool,
+    #[serde(rename = "u8")]
+    U8,
+    #[serde(rename = "u64")]
+    U64,
+    #[serde(rename = "u128")]
+    U128,
+    #[serde(rename = "address")]
+    Address,
+    #[serde(rename = "signer")]
+    Signer,
+    Struct {
+        address: AccountAddress,
+        module: Identifier,
+        name: Identifier,
+        type_arguments: Vec<Type>,
+    },
+    #[serde(rename = "vector")]
+    Vector(Box<Type>),
+    TypeParameter(TypeParameterIndex),
+    Reference(Box<Type>),
+    MutableReference(Box<Type>),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename = "u16")]
+    U16,
+    #[serde(rename = "u32")]
+    U32,
+    #[serde(rename = "u256")]
+    U256,
+}
+
+/// Normalized version of a `FieldDefinition`. The `name` is included even though it is
+/// metadata that it is ignored by the VM. The reason: names are important to clients. We would
+/// want a change from `Account { bal: u64, seq: u64 }` to `Account { seq: u64, bal: u64 }` to be
+/// marked as incompatible. Not safe to compare without an enclosing `Struct`.
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Ord, PartialOrd)]
+pub struct Field {
+    pub name: Identifier,
+    pub type_: Type,
+}
+
+/// Normalized version of a `Constant`.
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Ord, PartialOrd)]
+pub struct Constant {
+    pub type_: Type,
+    pub data: Vec<u8>,
+}
+
+/// Normalized version of a `StructDefinition`. Not safe to compare without an associated
+/// `ModuleId` or `Module`.
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Ord, PartialOrd)]
+pub struct Struct {
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub fields: Vec<Field>,
+}
+
+/// Normalized version of a `FunctionDefinition`. Not safe to compare without an associated
+/// `ModuleId` or `Module`.
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+pub struct Function {
+    pub visibility: Visibility,
+    pub is_entry: bool,
+    pub type_parameters: Vec<AbilitySet>,
+    pub parameters: Vec<Type>,
+    pub return_: Vec<Type>,
+    pub code: Vec<Bytecode>,
+}
+
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+pub struct FieldRef {
+    pub struct_name: Identifier,
+    pub field_index: u16,
+}
+
+// Functions can reference external modules. We don't track the exact type parameters and the like
+// since we know they can't change, or don't matter since:
+// * Either we allow compatible upgrades in which case the changing of the call parameters/types
+//   doesn't matter since this will align with the callee signature, and that callee must go through
+//   the compatibility checker for any upgrades.
+// * We are in an inclusion scenario. In which case either:
+//   - The callee is in the same package as this call, in which case the callee couldn't have changed; or
+//   - The callee was in a different package and therefore public, and therefore the API of that
+//   function must not have changed by compatibility rules.
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+pub struct FunctionRef {
+    pub module_id: ModuleId,
+    pub function_ident: Identifier,
+}
+
+/// Normalized representation of bytecode.
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+pub enum Bytecode {
+    Pop,
+    Ret,
+    BrTrue(CodeOffset),
+    BrFalse(CodeOffset),
+    Branch(CodeOffset),
+    LdU8(u8),
+    LdU64(u64),
+    LdU128(u128),
+    CastU8,
+    CastU64,
+    CastU128,
+    LdConst(Constant),
+    LdTrue,
+    LdFalse,
+    CopyLoc(LocalIndex),
+    MoveLoc(LocalIndex),
+    StLoc(LocalIndex),
+    Call(FunctionRef),
+    CallGeneric((FunctionRef, Vec<Type>)),
+    Pack(Identifier),
+    PackGeneric((Identifier, Vec<Type>)),
+    Unpack(Identifier),
+    UnpackGeneric((Identifier, Vec<Type>)),
+    ReadRef,
+    WriteRef,
+    FreezeRef,
+    MutBorrowLoc(LocalIndex),
+    ImmBorrowLoc(LocalIndex),
+    MutBorrowField(FieldRef),
+    MutBorrowFieldGeneric((FieldRef, Vec<Type>)),
+    ImmBorrowField(FieldRef),
+    ImmBorrowFieldGeneric((FieldRef, Vec<Type>)),
+    MutBorrowGlobal(Identifier),
+    MutBorrowGlobalGeneric((Identifier, Vec<Type>)),
+    ImmBorrowGlobal(Identifier),
+    ImmBorrowGlobalGeneric((Identifier, Vec<Type>)),
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+    BitOr,
+    BitAnd,
+    Xor,
+    Or,
+    And,
+    Not,
+    Eq,
+    Neq,
+    Lt,
+    Gt,
+    Le,
+    Ge,
+    Abort,
+    Nop,
+    Exists(Identifier),
+    ExistsGeneric((Identifier, Vec<Type>)),
+    MoveFrom(Identifier),
+    MoveFromGeneric((Identifier, Vec<Type>)),
+    MoveTo(Identifier),
+    MoveToGeneric((Identifier, Vec<Type>)),
+    Shl,
+    Shr,
+    VecPack(Type, u64),
+    VecLen(Type),
+    VecImmBorrow(Type),
+    VecMutBorrow(Type),
+    VecPushBack(Type),
+    VecPopBack(Type),
+    VecUnpack(Type, u64),
+    VecSwap(Type),
+    LdU16(u16),
+    LdU32(u32),
+    LdU256(move_core_types::u256::U256),
+    CastU16,
+    CastU32,
+    CastU256,
+}
+
+impl Constant {
+    pub fn new(m: &CompiledModule, constant: &crate::file_format::Constant) -> Self {
+        Self {
+            type_: Type::new(m, &constant.type_),
+            data: constant.data.clone(),
+        }
+    }
+}
+
+/// Normalized version of a `CompiledModule`: its address, name, struct declarations, and public
+/// function declarations.
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub struct Module {
+    pub file_format_version: u32,
+    pub address: AccountAddress,
+    pub name: Identifier,
+    pub dependencies: Vec<ModuleId>,
+    pub friends: Vec<ModuleId>,
+    pub structs: BTreeMap<Identifier, Struct>,
+    pub functions: BTreeMap<Identifier, Function>,
+    pub constants: Vec<Constant>,
+}
+
+impl Module {
+    /// Extract a normalized module from a `CompiledModule`. The module `m` should be verified.
+    /// Nothing will break here if that is not the case, but there is little point in computing a
+    /// normalized representation of a module that won't verify (since it can't be published).
+    pub fn new(m: &CompiledModule) -> Self {
+        let friends = m.immediate_friends();
+        let structs = m.struct_defs().iter().map(|d| Struct::new(m, d)).collect();
+        let dependencies = m.immediate_dependencies();
+        let constants = m
+            .constant_pool()
+            .iter()
+            .map(|constant| Constant::new(m, constant))
+            .collect();
+        let functions = m
+            .function_defs()
+            .iter()
+            .map(|func_def| Function::new(m, func_def))
+            .collect();
+        Self {
+            file_format_version: m.version(),
+            address: *m.address(),
+            name: m.name().to_owned(),
+            friends,
+            structs,
+            functions,
+            dependencies,
+            constants,
+        }
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        ModuleId::new(self.address, self.name.clone())
+    }
+}
+
+impl Type {
+    /// Create a normalized `Type` for `SignatureToken` `s` in module `m`.
+    pub fn new(m: &CompiledModule, s: &SignatureToken) -> Self {
+        use SignatureToken::*;
+        match s {
+            Struct(shi) => {
+                let s_handle = m.struct_handle_at(*shi);
+                assert!(s_handle.type_parameters.is_empty(), "A struct with N type parameters should be encoded as StructModuleInstantiation with type_arguments = [TypeParameter(1), ..., TypeParameter(N)]");
+                let m_handle = m.module_handle_at(s_handle.module);
+                Type::Struct {
+                    address: *m.address_identifier_at(m_handle.address),
+                    module: m.identifier_at(m_handle.name).to_owned(),
+                    name: m.identifier_at(s_handle.name).to_owned(),
+                    type_arguments: Vec::new(),
+                }
+            }
+            StructInstantiation(shi, type_actuals) => {
+                let s_handle = m.struct_handle_at(*shi);
+                let m_handle = m.module_handle_at(s_handle.module);
+                Type::Struct {
+                    address: *m.address_identifier_at(m_handle.address),
+                    module: m.identifier_at(m_handle.name).to_owned(),
+                    name: m.identifier_at(s_handle.name).to_owned(),
+                    type_arguments: type_actuals.iter().map(|t| Type::new(m, t)).collect(),
+                }
+            }
+            Bool => Type::Bool,
+            U8 => Type::U8,
+            U16 => Type::U16,
+            U32 => Type::U32,
+            U64 => Type::U64,
+            U128 => Type::U128,
+            U256 => Type::U256,
+            Address => Type::Address,
+            Signer => Type::Signer,
+            Vector(t) => Type::Vector(Box::new(Type::new(m, t))),
+            TypeParameter(i) => Type::TypeParameter(*i),
+            Reference(t) => Type::Reference(Box::new(Type::new(m, t))),
+            MutableReference(t) => Type::MutableReference(Box::new(Type::new(m, t))),
+        }
+    }
+
+    /// Return true if `self` is a closed type with no free type variables
+    pub fn is_closed(&self) -> bool {
+        use Type::*;
+        match self {
+            TypeParameter(_) => false,
+            Bool => true,
+            U8 => true,
+            U16 => true,
+            U32 => true,
+            U64 => true,
+            U128 => true,
+            U256 => true,
+            Address => true,
+            Signer => true,
+            Struct { type_arguments, .. } => type_arguments.iter().all(|t| t.is_closed()),
+            Vector(t) | Reference(t) | MutableReference(t) => t.is_closed(),
+        }
+    }
+
+    pub fn into_type_tag(self) -> Option<TypeTag> {
+        use Type::*;
+        Some(if self.is_closed() {
+            match self {
+                Reference(_) | MutableReference(_) => return None,
+                Bool => TypeTag::Bool,
+                U8 => TypeTag::U8,
+                U16 => TypeTag::U16,
+                U32 => TypeTag::U32,
+                U64 => TypeTag::U64,
+                U128 => TypeTag::U128,
+                U256 => TypeTag::U256,
+                Address => TypeTag::Address,
+                Signer => TypeTag::Signer,
+                Vector(t) => TypeTag::Vector(Box::new(
+                    t.into_type_tag()
+                        .expect("Invariant violation: vector type argument contains reference"),
+                )),
+                Struct {
+                    address,
+                    module,
+                    name,
+                    type_arguments,
+                } => TypeTag::Struct(Box::new(StructTag {
+                    address,
+                    module,
+                    name,
+                    type_params: type_arguments
+                        .into_iter()
+                        .map(|t| {
+                            t.into_type_tag().expect(
+                                "Invariant violation: struct type argument contains reference",
+                            )
+                        })
+                        .collect(),
+                })),
+                TypeParameter(_) => unreachable!(),
+            }
+        } else {
+            return None;
+        })
+    }
+
+    pub fn into_struct_tag(self) -> Option<StructTag> {
+        match self.into_type_tag()? {
+            TypeTag::Struct(s) => Some(*s),
+            _ => None,
+        }
+    }
+
+    pub fn subst(&self, type_args: &[Type]) -> Self {
+        use Type::*;
+        match self {
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => self.clone(),
+            Reference(ty) => Reference(Box::new(ty.subst(type_args))),
+            MutableReference(ty) => MutableReference(Box::new(ty.subst(type_args))),
+            Vector(t) => Vector(Box::new(t.subst(type_args))),
+            Struct {
+                address,
+                module,
+                name,
+                type_arguments,
+            } => Struct {
+                address: *address,
+                module: module.clone(),
+                name: name.clone(),
+                type_arguments: type_arguments
+                    .iter()
+                    .map(|t| t.subst(type_args))
+                    .collect::<Vec<_>>(),
+            },
+            TypeParameter(i) => type_args
+                .get(*i as usize)
+                .expect("Type parameter index out of bound")
+                .clone(),
+        }
+    }
+}
+
+impl Field {
+    /// Create a `Field` for `FieldDefinition` `f` in module `m`.
+    pub fn new(m: &CompiledModule, f: &FieldDefinition) -> Self {
+        Field {
+            name: m.identifier_at(f.name).to_owned(),
+            type_: Type::new(m, &f.signature.0),
+        }
+    }
+}
+
+impl Struct {
+    /// Create a `Struct` for `StructDefinition` `def` in module `m`. Panics if `def` is a
+    /// a native struct definition.
+    pub fn new(m: &CompiledModule, def: &StructDefinition) -> (Identifier, Self) {
+        let handle = m.struct_handle_at(def.struct_handle);
+        let fields = match &def.field_information {
+            StructFieldInformation::Native => {
+                // Pretend for compatibility checking no fields
+                vec![]
+            }
+            StructFieldInformation::Declared(fields) => {
+                fields.iter().map(|f| Field::new(m, f)).collect()
+            }
+        };
+        let name = m.identifier_at(handle.name).to_owned();
+        let s = Struct {
+            abilities: handle.abilities,
+            type_parameters: handle.type_parameters.clone(),
+            fields,
+        };
+        (name, s)
+    }
+
+    pub fn from_idx(m: &CompiledModule, idx: &StructDefinitionIndex) -> (Identifier, Self) {
+        Self::new(m, m.struct_def_at(*idx))
+    }
+
+    pub fn type_param_constraints(&self) -> impl ExactSizeIterator<Item = &AbilitySet> {
+        self.type_parameters.iter().map(|param| &param.constraints)
+    }
+}
+
+impl Function {
+    /// Create a `FunctionSignature` for `FunctionHandle` `f` in module `m`.
+    pub fn new(m: &CompiledModule, def: &FunctionDefinition) -> (Identifier, Self) {
+        let fhandle = m.function_handle_at(def.function);
+        let name = m.identifier_at(fhandle.name).to_owned();
+        let code: Vec<_> = def
+            .code
+            .as_ref()
+            .map(|code| {
+                code.code
+                    .iter()
+                    .map(|bytecode| Bytecode::new(m, bytecode))
+                    .collect()
+            })
+            .unwrap_or_default();
+
+        let f = Function {
+            visibility: def.visibility,
+            is_entry: def.is_entry,
+            type_parameters: fhandle.type_parameters.clone(),
+            parameters: m
+                .signature_at(fhandle.parameters)
+                .0
+                .iter()
+                .map(|s| Type::new(m, s))
+                .collect(),
+            return_: m
+                .signature_at(fhandle.return_)
+                .0
+                .iter()
+                .map(|s| Type::new(m, s))
+                .collect(),
+            code,
+        };
+        (name, f)
+    }
+
+    /// Create a `Function` for function named `func_name` in module `m`.
+    pub fn new_from_name(m: &CompiledModule, func_name: &IdentStr) -> Option<Self> {
+        for func_defs in &m.function_defs {
+            if m.identifier_at(m.function_handle_at(func_defs.function).name) == func_name {
+                return Some(Self::new(m, func_defs).1);
+            }
+        }
+        None
+    }
+}
+
+impl From<TypeTag> for Type {
+    fn from(ty: TypeTag) -> Type {
+        use Type::*;
+        match ty {
+            TypeTag::Bool => Bool,
+            TypeTag::U8 => U8,
+            TypeTag::U16 => U16,
+            TypeTag::U32 => U32,
+            TypeTag::U64 => U64,
+            TypeTag::U128 => U128,
+            TypeTag::U256 => U256,
+            TypeTag::Address => Address,
+            TypeTag::Signer => Signer,
+            TypeTag::Vector(ty) => Vector(Box::new(Type::from(*ty))),
+            TypeTag::Struct(s) => Struct {
+                address: s.address,
+                module: s.module,
+                name: s.name,
+                type_arguments: s.type_params.into_iter().map(|ty| ty.into()).collect(),
+            },
+        }
+    }
+}
+
+impl FieldRef {
+    pub fn new(m: &CompiledModule, field_handle: &FieldHandle) -> Self {
+        Self {
+            struct_name: m.struct_name(field_handle.owner).to_owned(),
+            field_index: field_handle.field,
+        }
+    }
+
+    pub fn from_idx(m: &CompiledModule, field_handle_idx: &FieldHandleIndex) -> Self {
+        Self::new(m, m.field_handle_at(*field_handle_idx))
+    }
+}
+
+impl FunctionRef {
+    pub fn new(m: &CompiledModule, function_handle: &FunctionHandle) -> Self {
+        Self {
+            module_id: m.module_id_for_handle(m.module_handle_at(function_handle.module)),
+            function_ident: m.identifier_at(function_handle.name).to_owned(),
+        }
+    }
+
+    pub fn from_idx(m: &CompiledModule, function_handle_idx: &FunctionHandleIndex) -> Self {
+        Self::new(m, m.function_handle_at(*function_handle_idx))
+    }
+}
+
+impl Bytecode {
+    pub fn new(m: &CompiledModule, bytecode: &FBytecode) -> Self {
+        use Bytecode as B;
+        use FBytecode as FB;
+        match bytecode {
+            FB::Pop => B::Pop,
+            FB::Ret => B::Ret,
+            FB::CastU8 => B::CastU8,
+            FB::CastU64 => B::CastU64,
+            FB::CastU128 => B::CastU128,
+            FB::LdTrue => B::LdTrue,
+            FB::LdFalse => B::LdFalse,
+            FB::ReadRef => B::ReadRef,
+            FB::WriteRef => B::WriteRef,
+            FB::FreezeRef => B::FreezeRef,
+            FB::Add => B::Add,
+            FB::Sub => B::Sub,
+            FB::Mul => B::Mul,
+            FB::Mod => B::Mod,
+            FB::Div => B::Div,
+            FB::BitOr => B::BitOr,
+            FB::BitAnd => B::BitAnd,
+            FB::Xor => B::Xor,
+            FB::Or => B::Or,
+            FB::And => B::And,
+            FB::Not => B::Not,
+            FB::Eq => B::Eq,
+            FB::Neq => B::Neq,
+            FB::Lt => B::Lt,
+            FB::Gt => B::Gt,
+            FB::Le => B::Le,
+            FB::Ge => B::Ge,
+            FB::Abort => B::Abort,
+            FB::Nop => B::Nop,
+            FB::Shl => B::Shl,
+            FB::Shr => B::Shr,
+            FB::CastU16 => B::CastU16,
+            FB::CastU32 => B::CastU32,
+            FB::CastU256 => B::CastU256,
+            FB::BrTrue(x) => B::BrTrue(*x),
+            FB::BrFalse(x) => B::BrFalse(*x),
+            FB::Branch(x) => B::Branch(*x),
+            FB::LdU8(x) => B::LdU8(*x),
+            FB::LdU64(x) => B::LdU64(*x),
+            FB::LdU128(x) => B::LdU128(*x),
+            FB::CopyLoc(x) => B::CopyLoc(*x),
+            FB::MoveLoc(x) => B::MoveLoc(*x),
+            FB::StLoc(x) => B::StLoc(*x),
+            FB::LdU16(x) => B::LdU16(*x),
+            FB::LdU32(x) => B::LdU32(*x),
+            FB::LdU256(x) => B::LdU256(*x),
+            FB::LdConst(const_idx) => B::LdConst(Constant::new(m, m.constant_at(*const_idx))),
+            FB::Call(fh_idx) => B::Call(FunctionRef::from_idx(m, fh_idx)),
+            FB::CallGeneric(fhi_idx) => {
+                let FunctionInstantiation {
+                    handle,
+                    type_parameters,
+                } = m.function_instantiation_at(*fhi_idx);
+                let type_params = m.signature_at(*type_parameters);
+                B::CallGeneric((
+                    FunctionRef::from_idx(m, handle),
+                    type_params.0.iter().map(|tok| Type::new(m, tok)).collect(),
+                ))
+            }
+            FB::Pack(s_idx) => B::Pack(m.struct_name(*s_idx).to_owned()),
+            FB::PackGeneric(s_idx) => B::PackGeneric(struct_instantiation(m, s_idx)),
+            FB::Unpack(s_idx) => B::Unpack(m.struct_name(*s_idx).to_owned()),
+            FB::UnpackGeneric(si_idx) => B::UnpackGeneric(struct_instantiation(m, si_idx)),
+            FB::MutBorrowLoc(x) => B::MutBorrowLoc(*x),
+            FB::ImmBorrowLoc(x) => B::ImmBorrowLoc(*x),
+            FB::MutBorrowField(fh_ixd) => B::MutBorrowField(FieldRef::from_idx(m, fh_ixd)),
+            FB::MutBorrowFieldGeneric(fhi_idx) => {
+                B::MutBorrowFieldGeneric(field_instantiation(m, fhi_idx))
+            }
+            FB::ImmBorrowField(fh_idx) => B::ImmBorrowField(FieldRef::from_idx(m, fh_idx)),
+            FB::ImmBorrowFieldGeneric(fhi_idx) => {
+                B::ImmBorrowFieldGeneric(field_instantiation(m, fhi_idx))
+            }
+            FB::MutBorrowGlobal(s_idx) => B::MutBorrowGlobal(m.struct_name(*s_idx).to_owned()),
+            FB::MutBorrowGlobalGeneric(si_idx) => {
+                B::MutBorrowGlobalGeneric(struct_instantiation(m, si_idx))
+            }
+            FB::ImmBorrowGlobal(s_idx) => B::ImmBorrowGlobal(m.struct_name(*s_idx).to_owned()),
+            FB::ImmBorrowGlobalGeneric(si_idx) => {
+                B::ImmBorrowGlobalGeneric(struct_instantiation(m, si_idx))
+            }
+            FB::Exists(s_idx) => B::Exists(m.struct_name(*s_idx).to_owned()),
+            FB::ExistsGeneric(si_idx) => B::ExistsGeneric(struct_instantiation(m, si_idx)),
+            FB::MoveFrom(s_idx) => B::MoveFrom(m.struct_name(*s_idx).to_owned()),
+            FB::MoveFromGeneric(si_idx) => B::MoveFromGeneric(struct_instantiation(m, si_idx)),
+            FB::MoveTo(s_idx) => B::MoveTo(m.struct_name(*s_idx).to_owned()),
+            FB::MoveToGeneric(si_idx) => B::MoveToGeneric(struct_instantiation(m, si_idx)),
+            FB::VecPack(sig_idx, len) => B::VecPack(signature_to_single_type(m, sig_idx), *len),
+            FB::VecLen(sig_idx) => B::VecLen(signature_to_single_type(m, sig_idx)),
+            FB::VecImmBorrow(sig_idx) => B::VecImmBorrow(signature_to_single_type(m, sig_idx)),
+            FB::VecMutBorrow(sig_idx) => B::VecMutBorrow(signature_to_single_type(m, sig_idx)),
+            FB::VecPushBack(sig_idx) => B::VecPushBack(signature_to_single_type(m, sig_idx)),
+            FB::VecPopBack(sig_idx) => B::VecPopBack(signature_to_single_type(m, sig_idx)),
+            FB::VecUnpack(sig_idx, len) => B::VecUnpack(signature_to_single_type(m, sig_idx), *len),
+            FB::VecSwap(sig_idx) => B::VecSwap(signature_to_single_type(m, sig_idx)),
+        }
+    }
+}
+
+impl std::fmt::Display for Type {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            Type::Struct {
+                address,
+                module,
+                name,
+                type_arguments,
+            } => {
+                write!(
+                    f,
+                    "0x{}::{}::{}",
+                    address.short_str_lossless(),
+                    module,
+                    name
+                )?;
+                if let Some(first_ty) = type_arguments.first() {
+                    write!(f, "<")?;
+                    write!(f, "{}", first_ty)?;
+                    for ty in type_arguments.iter().skip(1) {
+                        write!(f, ", {}", ty)?;
+                    }
+                    write!(f, ">")?;
+                }
+                Ok(())
+            }
+            Type::Vector(ty) => write!(f, "vector<{}>", ty),
+            Type::U8 => write!(f, "u8"),
+            Type::U16 => write!(f, "u16"),
+            Type::U32 => write!(f, "u32"),
+            Type::U64 => write!(f, "u64"),
+            Type::U128 => write!(f, "u128"),
+            Type::U256 => write!(f, "u256"),
+            Type::Address => write!(f, "address"),
+            Type::Signer => write!(f, "signer"),
+            Type::Bool => write!(f, "bool"),
+            Type::Reference(r) => write!(f, "&{}", r),
+            Type::MutableReference(r) => write!(f, "&mut {}", r),
+            Type::TypeParameter(i) => write!(f, "T{:?}", i),
+        }
+    }
+}
+
+fn struct_instantiation(
+    m: &CompiledModule,
+    si_idx: &StructDefInstantiationIndex,
+) -> (Identifier, Vec<Type>) {
+    let StructDefInstantiation {
+        def,
+        type_parameters,
+    } = m.struct_instantiation_at(*si_idx);
+    let (name, _) = Struct::new(m, m.struct_def_at(*def));
+    let types = m
+        .signature_at(*type_parameters)
+        .0
+        .iter()
+        .map(|tok| Type::new(m, tok))
+        .collect();
+    (name, types)
+}
+
+fn field_instantiation(m: &CompiledModule, idx: &FieldInstantiationIndex) -> (FieldRef, Vec<Type>) {
+    let FieldInstantiation {
+        handle,
+        type_parameters,
+    } = m.field_instantiation_at(*idx);
+    let field_ref = FieldRef::new(m, m.field_handle_at(*handle));
+    let types = m
+        .signature_at(*type_parameters)
+        .0
+        .iter()
+        .map(|tok| Type::new(m, tok))
+        .collect();
+    (field_ref, types)
+}
+
+fn signature_to_single_type(m: &CompiledModule, sig_idx: &SignatureIndex) -> Type {
+    Type::new(m, &m.signature_at(*sig_idx).0[0])
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types.rs b/vendors/move/crates/move-binary-format/src/proptest_types.rs
new file mode 100644
index 000000000..21c7f205f
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types.rs
@@ -0,0 +1,412 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Utilities for property-based testing.
+
+use crate::file_format::{
+    AddressIdentifierIndex, CompiledModule, FunctionDefinition, FunctionHandle, IdentifierIndex,
+    ModuleHandle, ModuleHandleIndex, StructDefinition, TableIndex,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use proptest::{
+    collection::{btree_set, vec, SizeRange},
+    prelude::*,
+    sample::Index as PropIndex,
+};
+
+mod constants;
+mod functions;
+mod metadata;
+mod signature;
+mod types;
+
+use constants::ConstantPoolGen;
+use functions::{
+    FnDefnMaterializeState, FnHandleMaterializeState, FunctionDefinitionGen, FunctionHandleGen,
+};
+
+use crate::proptest_types::{
+    metadata::MetadataGen,
+    signature::SignatureGen,
+    types::{StDefnMaterializeState, StructDefinitionGen, StructHandleGen},
+};
+use std::collections::{BTreeSet, HashMap};
+
+/// Represents how large [`CompiledModule`] tables can be.
+pub type TableSize = u16;
+
+impl CompiledModule {
+    /// Convenience wrapper around [`CompiledModuleStrategyGen`][CompiledModuleStrategyGen] that
+    /// generates valid modules with the given size.
+    pub fn valid_strategy(size: usize) -> impl Strategy<Value = Self> {
+        CompiledModuleStrategyGen::new(size as TableSize).generate()
+    }
+}
+
+/// Contains configuration to generate [`CompiledModule`] instances.
+///
+/// If you don't care about customizing these parameters, see [`CompiledModule::valid_strategy`].
+///
+/// A `CompiledModule` can be looked at as a graph, with several kinds of nodes, and a nest of
+/// pointers among those nodes. This graph has some properties:
+///
+/// 1. The graph has cycles. Generating DAGs is often simpler, but is not an option in this case.
+/// 2. The actual structure of the graph is well-defined in terms of the kinds of nodes and
+///    pointers that exist.
+///
+/// TODO: the graph also has pointers *out* of it, via address references to other modules.
+/// This doesn't need to be handled when viewing modules in isolation, but some verification passes
+/// will need to look at the entire set of modules. The work to make generating such modules
+/// possible remains to be done.
+///
+/// Intermediate types
+/// ------------------
+///
+/// The pointers are represented as indexes into vectors of other kinds of nodes. One of the
+/// bigger problems is that the number of types, functions etc isn't known upfront so it is
+/// impossible to know what range to pick from for the index types (`ModuleHandleIndex`,
+/// `StructHandleIndex`, etc). To deal with this, the code generates a bunch of intermediate
+/// structures (sometimes tuples, other times more complicated structures with their own internal
+/// constraints), with "holes" represented by [`Index`](proptest::sample::Index) instances. Once all
+/// the lengths are known, there's a final "materialize" step at the end that "fills in" these
+/// holes.
+///
+/// One alternative would have been to generate lengths up front, then create vectors of those
+/// lengths. This would have worked fine for generation but would have made shrinking take much
+/// longer, because the shrinker would be less aware of the overall structure of the problem and
+/// would have ended up redoing a lot of work. The approach taken here does end up being more
+/// verbose but should perform optimally.
+///
+/// See [`proptest` issue #130](https://github.com/AltSysrq/proptest/issues/130) for more discussion
+/// about this.
+#[derive(Clone, Debug)]
+pub struct CompiledModuleStrategyGen {
+    size: usize,
+    field_count: SizeRange,
+    struct_type_params: SizeRange,
+    parameters_count: SizeRange,
+    return_count: SizeRange,
+    func_type_params: SizeRange,
+    acquires_count: SizeRange,
+    random_sigs_count: SizeRange,
+    tokens_per_random_sig_count: SizeRange,
+    code_len: SizeRange,
+}
+
+impl CompiledModuleStrategyGen {
+    /// Create a new configuration for randomly generating [`CompiledModule`] instances.
+    pub fn new(size: TableSize) -> Self {
+        Self {
+            size: size as usize,
+            field_count: (0..5).into(),
+            struct_type_params: (0..3).into(),
+            parameters_count: (0..4).into(),
+            return_count: (0..3).into(),
+            func_type_params: (0..3).into(),
+            acquires_count: (0..2).into(),
+            random_sigs_count: (0..5).into(),
+            tokens_per_random_sig_count: (0..5).into(),
+            code_len: (0..50).into(),
+        }
+    }
+
+    /// Zero out all fields, type parameters, arguments and return types of struct and functions.
+    #[inline]
+    pub fn zeros_all(&mut self) -> &mut Self {
+        self.field_count = 0.into();
+        self.struct_type_params = 0.into();
+        self.parameters_count = 0.into();
+        self.return_count = 0.into();
+        self.func_type_params = 0.into();
+        self.acquires_count = 0.into();
+        self.random_sigs_count = 0.into();
+        self.tokens_per_random_sig_count = 0.into();
+        self
+    }
+
+    /// Create a `proptest` strategy for `CompiledModule` instances using this configuration.
+    pub fn generate(self) -> impl Strategy<Value = CompiledModule> {
+        //
+        // leaf pool generator
+        //
+        let self_idx_strat = any::<PropIndex>();
+        let address_pool_strat = btree_set(any::<AccountAddress>(), 1..=self.size);
+        let identifiers_strat = btree_set(any::<Identifier>(), 5..=self.size + 5);
+        let constant_pool_strat = ConstantPoolGen::strategy(0..=self.size, 0..=self.size);
+        let metadata_strat = MetadataGen::strategy(0..=self.size);
+
+        // The number of PropIndex instances in each tuple represents the number of pointers out
+        // from an instance of that particular kind of node.
+
+        //
+        // Module handle generator
+        //
+        let module_handles_strat = vec(any::<(PropIndex, PropIndex)>(), 1..=self.size);
+
+        //
+        // Struct generators
+        //
+        let struct_handles_strat = vec(
+            StructHandleGen::strategy(self.struct_type_params.clone()),
+            1..=self.size,
+        );
+        let struct_defs_strat = vec(
+            StructDefinitionGen::strategy(
+                self.field_count.clone(),
+                self.struct_type_params.clone(),
+            ),
+            1..=self.size,
+        );
+
+        //
+        // Random signatures generator
+        //
+        // These signatures may or may not be used in the bytecode. One way to use these signatures
+        // is the Vec* bytecode (e.g. VecEmpty), which will grab a random index from the pool.
+        //
+        let random_sigs_strat = vec(
+            SignatureGen::strategy(self.tokens_per_random_sig_count),
+            self.random_sigs_count,
+        );
+
+        //
+        // Functions generators
+        //
+
+        // FunctionHandle will add to the Signature table
+        // FunctionDefinition will also add the following pool:
+        // FieldHandle, StructInstantiation, FunctionInstantiation, FieldInstantiation
+        let function_handles_strat = vec(
+            FunctionHandleGen::strategy(
+                self.parameters_count.clone(),
+                self.return_count.clone(),
+                self.func_type_params.clone(),
+            ),
+            1..=self.size,
+        );
+        let function_defs_strat = vec(
+            FunctionDefinitionGen::strategy(
+                self.return_count.clone(),
+                self.parameters_count.clone(),
+                self.func_type_params.clone(),
+                self.acquires_count.clone(),
+                self.code_len,
+            ),
+            1..=self.size,
+        );
+
+        //
+        // Friend generator
+        //
+        let friends_strat = vec(any::<(PropIndex, PropIndex)>(), 1..=self.size);
+
+        // Note that prop_test only allows a tuple of length up to 10
+        (
+            self_idx_strat,
+            (
+                address_pool_strat,
+                identifiers_strat,
+                constant_pool_strat,
+                metadata_strat,
+            ),
+            module_handles_strat,
+            (struct_handles_strat, struct_defs_strat),
+            random_sigs_strat,
+            (function_handles_strat, function_defs_strat),
+            friends_strat,
+        )
+            .prop_map(
+                |(
+                    self_idx_gen,
+                    (address_identifier_gens, identifier_gens, constant_pool_gen, metdata_gen),
+                    module_handles_gen,
+                    (struct_handle_gens, struct_def_gens),
+                    random_sigs_gens,
+                    (function_handle_gens, function_def_gens),
+                    friend_decl_gens,
+                )| {
+                    //
+                    // leaf pools
+                    let address_identifiers: Vec<_> = address_identifier_gens.into_iter().collect();
+                    let address_identifiers_len = address_identifiers.len();
+                    let identifiers: Vec<_> = identifier_gens.into_iter().collect();
+                    let identifiers_len = identifiers.len();
+                    let constant_pool = constant_pool_gen.constant_pool();
+                    let constant_pool_len = constant_pool.len();
+                    let metadata = metdata_gen.metadata();
+
+                    //
+                    // module handles
+                    let mut module_handles_set = BTreeSet::new();
+                    let mut module_handles = vec![];
+                    for (address, name) in module_handles_gen {
+                        let mh = ModuleHandle {
+                            address: AddressIdentifierIndex(
+                                address.index(address_identifiers_len) as TableIndex
+                            ),
+                            name: IdentifierIndex(name.index(identifiers_len) as TableIndex),
+                        };
+                        if module_handles_set.insert((mh.address, mh.name)) {
+                            module_handles.push(mh);
+                        }
+                    }
+                    let module_handles_len = module_handles.len();
+
+                    //
+                    // self module handle index
+                    let self_module_handle_idx =
+                        ModuleHandleIndex(self_idx_gen.index(module_handles_len) as TableIndex);
+
+                    //
+                    // Friend Declarations
+                    let friend_decl_set: BTreeSet<_> = friend_decl_gens
+                        .into_iter()
+                        .map(|(address_gen, name_gen)| ModuleHandle {
+                            address: AddressIdentifierIndex(
+                                address_gen.index(address_identifiers_len) as TableIndex,
+                            ),
+                            name: IdentifierIndex(name_gen.index(identifiers_len) as TableIndex),
+                        })
+                        .collect();
+                    let friend_decls = friend_decl_set.into_iter().collect();
+
+                    //
+                    // struct handles
+                    let mut struct_handles = vec![];
+                    if module_handles_len > 1 {
+                        let mut struct_handles_set = BTreeSet::new();
+                        for struct_handle_gen in struct_handle_gens.into_iter() {
+                            let sh = struct_handle_gen.materialize(
+                                self_module_handle_idx,
+                                module_handles_len,
+                                identifiers_len,
+                            );
+                            if struct_handles_set.insert((sh.module, sh.name)) {
+                                struct_handles.push(sh);
+                            }
+                        }
+                    }
+
+                    //
+                    // Struct definitions.
+                    // Struct handles for the definitions are generated in this step
+                    let mut state = StDefnMaterializeState::new(
+                        self_module_handle_idx,
+                        identifiers_len,
+                        struct_handles,
+                    );
+                    let mut struct_def_to_field_count: HashMap<usize, usize> = HashMap::new();
+                    let mut struct_defs: Vec<StructDefinition> = vec![];
+                    for struct_def_gen in struct_def_gens {
+                        if let (Some(struct_def), offset) = struct_def_gen.materialize(&mut state) {
+                            struct_defs.push(struct_def);
+                            if offset > 0 {
+                                struct_def_to_field_count.insert(struct_defs.len() - 1, offset);
+                            }
+                        }
+                    }
+                    let StDefnMaterializeState { struct_handles, .. } = state;
+
+                    //
+                    // Create some random signatures.
+                    let mut signatures: Vec<_> = random_sigs_gens
+                        .into_iter()
+                        .map(|sig_gen| sig_gen.materialize(&struct_handles))
+                        .collect();
+
+                    //
+                    // Function handles.
+                    let mut function_handles: Vec<FunctionHandle> = vec![];
+                    if module_handles_len > 1 {
+                        let mut state = FnHandleMaterializeState::new(
+                            self_module_handle_idx,
+                            module_handles_len,
+                            identifiers_len,
+                            &struct_handles,
+                            signatures,
+                        );
+                        for function_handle_gen in function_handle_gens {
+                            if let Some(function_handle) =
+                                function_handle_gen.materialize(&mut state)
+                            {
+                                function_handles.push(function_handle);
+                            }
+                        }
+                        signatures = state.signatures();
+                    }
+
+                    //
+                    // Function Definitions
+                    // Here we need pretty much everything if we are going to emit instructions.
+                    // signatures and function handles
+                    let mut state = FnDefnMaterializeState::new(
+                        self_module_handle_idx,
+                        identifiers_len,
+                        constant_pool_len,
+                        &struct_handles,
+                        &struct_defs,
+                        signatures,
+                        function_handles,
+                        struct_def_to_field_count,
+                    );
+                    let mut function_defs: Vec<FunctionDefinition> = vec![];
+                    for function_def_gen in function_def_gens {
+                        if let Some(function_def) = function_def_gen.materialize(&mut state) {
+                            function_defs.push(function_def);
+                        }
+                    }
+                    let (
+                        signatures,
+                        function_handles,
+                        field_handles,
+                        struct_def_instantiations,
+                        function_instantiations,
+                        field_instantiations,
+                    ) = state.return_tables();
+
+                    // Build a compiled module
+                    CompiledModule {
+                        version: crate::file_format_common::VERSION_MAX,
+                        module_handles,
+                        self_module_handle_idx,
+                        struct_handles,
+                        function_handles,
+                        field_handles,
+                        friend_decls,
+
+                        struct_def_instantiations,
+                        function_instantiations,
+                        field_instantiations,
+
+                        struct_defs,
+                        function_defs,
+
+                        signatures,
+
+                        identifiers,
+                        address_identifiers,
+                        constant_pool,
+                        metadata,
+                    }
+                },
+            )
+    }
+}
+
+/// A utility function that produces a prop_index but also avoiding the given index. If the random
+/// index at the first choice collides with the avoidance, then try +/- 1 from the chosen value and
+/// pick the one that does not over/under-flow.
+pub(crate) fn prop_index_avoid(gen: PropIndex, avoid: usize, pool_size: usize) -> usize {
+    assert!(pool_size > 1);
+    assert!(pool_size > avoid);
+    let rand = gen.index(pool_size);
+    if rand != avoid {
+        return rand;
+    }
+    let rand_inc = rand.checked_add(1).unwrap();
+    if rand_inc != pool_size {
+        return rand_inc;
+    }
+    rand.checked_sub(1).unwrap()
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types/constants.rs b/vendors/move/crates/move-binary-format/src/proptest_types/constants.rs
new file mode 100644
index 000000000..4f8d112f2
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types/constants.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::file_format::{Constant, SignatureToken};
+use move_core_types::account_address::AccountAddress;
+use proptest::{
+    arbitrary::any,
+    collection::{btree_set, vec, SizeRange},
+    strategy::Strategy,
+};
+
+// A `ConstantPoolGen` gives you back a `Strategy` that makes a constant pool with
+// `Address` and `Vector<U8>` only.
+// TODO: make it more general and plug in a constant API
+#[derive(Clone, Debug)]
+pub struct ConstantPoolGen {
+    addresses: Vec<AccountAddress>,
+    byte_arrays: Vec<Vec<u8>>,
+}
+
+impl ConstantPoolGen {
+    // Return a `Strategy` that builds a ConstantPool with a number of `addresse`s and
+    // `vector<u8>` respectively driven by `address_count` and `byte_array_count`
+    pub fn strategy(
+        address_count: impl Into<SizeRange>,
+        byte_array_count: impl Into<SizeRange>,
+    ) -> impl Strategy<Value = Self> {
+        // get unique sets of addresses and vector<U8> (empty vector allowed)
+        (
+            btree_set(any::<AccountAddress>(), address_count),
+            btree_set(vec(any::<u8>(), 0..=20), byte_array_count),
+        )
+            .prop_map(|(addresses, byte_arrays)| Self {
+                addresses: addresses.into_iter().collect(),
+                byte_arrays: byte_arrays.into_iter().collect(),
+            })
+    }
+
+    // Return the `ConstantPool`
+    pub fn constant_pool(self) -> Vec<Constant> {
+        let mut constants = vec![];
+        for address in self.addresses {
+            constants.push(Constant {
+                type_: SignatureToken::Address,
+                data: address.to_vec(),
+            });
+        }
+        for mut byte_array in self.byte_arrays {
+            // TODO: below is a trick to make serialization easy (size being one byte)
+            // This can hopefully help soon in defining an API for constants
+            // As a restriction is a non issue as we don't have input over big numbers (>100)
+            if byte_array.len() > 127 {
+                continue;
+            }
+            byte_array.push(byte_array.len() as u8);
+            byte_array.reverse();
+            constants.push(Constant {
+                type_: SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                data: byte_array,
+            });
+        }
+        constants
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types/functions.rs b/vendors/move/crates/move-binary-format/src/proptest_types/functions.rs
new file mode 100644
index 000000000..30c9a28af
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types/functions.rs
@@ -0,0 +1,937 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, CodeUnit, ConstantPoolIndex, FieldHandle,
+        FieldHandleIndex, FieldInstantiation, FieldInstantiationIndex, FunctionDefinition,
+        FunctionHandle, FunctionHandleIndex, FunctionInstantiation, FunctionInstantiationIndex,
+        IdentifierIndex, LocalIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiation, StructDefInstantiationIndex, StructDefinition,
+        StructDefinitionIndex, StructHandle, TableIndex, Visibility,
+    },
+    internals::ModuleIndex,
+    proptest_types::{
+        prop_index_avoid,
+        signature::{AbilitySetGen, SignatureGen, SignatureTokenGen},
+        TableSize,
+    },
+};
+use move_core_types::u256::U256;
+use proptest::{
+    collection::{vec, SizeRange},
+    prelude::*,
+    sample::{select, Index as PropIndex},
+};
+use std::{
+    collections::{BTreeSet, HashMap, HashSet},
+    hash::Hash,
+};
+
+#[derive(Debug, Default)]
+struct SignatureState {
+    signatures: Vec<Signature>,
+    signature_map: HashMap<Signature, SignatureIndex>,
+}
+
+impl SignatureState {
+    fn new(signatures: Vec<Signature>) -> Self {
+        let mut state = Self::default();
+        for sig in signatures {
+            state.add_signature(sig);
+        }
+        state
+    }
+
+    fn signatures(self) -> Vec<Signature> {
+        self.signatures
+    }
+
+    fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
+        debug_assert!(self.signatures.len() < TableSize::max_value() as usize);
+        if let Some(idx) = self.signature_map.get(&sig) {
+            return *idx;
+        }
+        let idx = SignatureIndex(self.signatures.len() as u16);
+        self.signatures.push(sig.clone());
+        self.signature_map.insert(sig, idx);
+        idx
+    }
+}
+
+#[derive(Debug, Default)]
+#[allow(unused)]
+struct FieldHandleState {
+    field_handles: Vec<FieldHandle>,
+    field_map: HashMap<FieldHandle, FieldHandleIndex>,
+}
+
+impl FieldHandleState {
+    #[allow(unused)]
+    pub fn field_handles(self) -> Vec<FieldHandle> {
+        self.field_handles
+    }
+
+    #[allow(unused)]
+    fn add_field_handle(&mut self, fh: FieldHandle) -> FieldHandleIndex {
+        debug_assert!(self.field_handles.len() < TableSize::max_value() as usize);
+        if let Some(idx) = self.field_map.get(&fh) {
+            return *idx;
+        }
+        let idx = FieldHandleIndex(self.field_handles.len() as u16);
+        self.field_handles.push(fh.clone());
+        self.field_map.insert(fh, idx);
+        idx
+    }
+}
+
+#[derive(Debug)]
+#[allow(unused)]
+struct InstantiationState<T>
+where
+    T: Eq + Clone + Hash,
+{
+    instantiations: Vec<T>,
+    instantiation_map: HashMap<T, TableIndex>,
+}
+
+impl<T> InstantiationState<T>
+where
+    T: Eq + Clone + Hash,
+{
+    fn new() -> Self {
+        InstantiationState {
+            instantiations: vec![],
+            instantiation_map: HashMap::new(),
+        }
+    }
+
+    #[allow(unused)]
+    pub fn instantiations(self) -> Vec<T> {
+        self.instantiations
+    }
+
+    #[allow(unused)]
+    fn add_instantiation(&mut self, inst: T) -> TableIndex {
+        debug_assert!(self.instantiations.len() < TableSize::max_value() as usize);
+        if let Some(idx) = self.instantiation_map.get(&inst) {
+            return *idx;
+        }
+        let idx = self.instantiations.len() as TableIndex;
+        self.instantiations.push(inst.clone());
+        self.instantiation_map.insert(inst, idx);
+        idx
+    }
+}
+
+/// Represents state required to materialize final data structures for function handles.
+#[derive(Debug)]
+pub struct FnHandleMaterializeState<'a> {
+    self_module_handle_idx: ModuleHandleIndex,
+    module_handles_len: usize,
+    identifiers_len: usize,
+    struct_handles: &'a [StructHandle],
+    signatures: SignatureState,
+    function_handles: HashSet<(ModuleHandleIndex, IdentifierIndex)>,
+}
+
+impl<'a> FnHandleMaterializeState<'a> {
+    pub fn new(
+        self_module_handle_idx: ModuleHandleIndex,
+        module_handles_len: usize,
+        identifiers_len: usize,
+        struct_handles: &'a [StructHandle],
+        signatures: Vec<Signature>,
+    ) -> Self {
+        Self {
+            self_module_handle_idx,
+            module_handles_len,
+            identifiers_len,
+            struct_handles,
+            signatures: SignatureState::new(signatures),
+            function_handles: HashSet::new(),
+        }
+    }
+
+    pub fn signatures(self) -> Vec<Signature> {
+        self.signatures.signatures()
+    }
+
+    fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
+        self.signatures.add_signature(sig)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct FunctionHandleGen {
+    module: PropIndex,
+    name: PropIndex,
+    parameters: SignatureGen,
+    return_: SignatureGen,
+    type_parameters: Vec<AbilitySetGen>,
+}
+
+impl FunctionHandleGen {
+    pub fn strategy(
+        param_count: impl Into<SizeRange>,
+        return_count: impl Into<SizeRange>,
+        type_parameter_count: impl Into<SizeRange>,
+    ) -> impl Strategy<Value = Self> {
+        let return_count = return_count.into();
+        let param_count = param_count.into();
+        (
+            any::<PropIndex>(),
+            any::<PropIndex>(),
+            SignatureGen::strategy(param_count),
+            SignatureGen::strategy(return_count),
+            vec(AbilitySetGen::strategy(), type_parameter_count),
+        )
+            .prop_map(
+                |(module, name, parameters, return_, type_parameters)| Self {
+                    module,
+                    name,
+                    parameters,
+                    return_,
+                    type_parameters,
+                },
+            )
+    }
+
+    pub fn materialize(self, state: &mut FnHandleMaterializeState) -> Option<FunctionHandle> {
+        let idx = prop_index_avoid(
+            self.module,
+            state.self_module_handle_idx.into_index(),
+            state.module_handles_len,
+        );
+        let mod_idx = ModuleHandleIndex(idx as TableIndex);
+        let iden_idx = IdentifierIndex(self.name.index(state.identifiers_len) as TableIndex);
+        if state.function_handles.contains(&(mod_idx, iden_idx)) {
+            return None;
+        }
+        state.function_handles.insert((mod_idx, iden_idx));
+        let parameters = self.parameters.materialize(state.struct_handles);
+        let params_idx = state.add_signature(parameters);
+        let return_ = self.return_.materialize(state.struct_handles);
+        let return_idx = state.add_signature(return_);
+        let type_parameters = self
+            .type_parameters
+            .into_iter()
+            .map(|abilities| abilities.materialize())
+            .collect();
+        Some(FunctionHandle {
+            module: mod_idx,
+            name: iden_idx,
+            parameters: params_idx,
+            return_: return_idx,
+            type_parameters,
+        })
+    }
+}
+
+/// Represents state required to materialize final data structures for function definitions.
+#[derive(Debug)]
+pub struct FnDefnMaterializeState<'a> {
+    self_module_handle_idx: ModuleHandleIndex,
+    identifiers_len: usize,
+    constant_pool_len: usize,
+    struct_handles: &'a [StructHandle],
+    struct_defs: &'a [StructDefinition],
+    signatures: SignatureState,
+    function_handles: Vec<FunctionHandle>,
+    struct_def_to_field_count: HashMap<usize, usize>,
+    def_function_handles: HashSet<(ModuleHandleIndex, IdentifierIndex)>,
+    field_handles: FieldHandleState,
+    type_instantiations: InstantiationState<StructDefInstantiation>,
+    function_instantiations: InstantiationState<FunctionInstantiation>,
+    field_instantiations: InstantiationState<FieldInstantiation>,
+}
+
+impl<'a> FnDefnMaterializeState<'a> {
+    pub fn new(
+        self_module_handle_idx: ModuleHandleIndex,
+        identifiers_len: usize,
+        constant_pool_len: usize,
+        struct_handles: &'a [StructHandle],
+        struct_defs: &'a [StructDefinition],
+        signatures: Vec<Signature>,
+        function_handles: Vec<FunctionHandle>,
+        struct_def_to_field_count: HashMap<usize, usize>,
+    ) -> Self {
+        Self {
+            self_module_handle_idx,
+            identifiers_len,
+            constant_pool_len,
+            struct_handles,
+            struct_defs,
+            signatures: SignatureState::new(signatures),
+            function_handles,
+            struct_def_to_field_count,
+            def_function_handles: HashSet::new(),
+            field_handles: FieldHandleState::default(),
+            type_instantiations: InstantiationState::new(),
+            function_instantiations: InstantiationState::new(),
+            field_instantiations: InstantiationState::new(),
+        }
+    }
+
+    pub fn return_tables(
+        self,
+    ) -> (
+        Vec<Signature>,
+        Vec<FunctionHandle>,
+        Vec<FieldHandle>,
+        Vec<StructDefInstantiation>,
+        Vec<FunctionInstantiation>,
+        Vec<FieldInstantiation>,
+    ) {
+        (
+            self.signatures.signatures(),
+            self.function_handles,
+            self.field_handles.field_handles(),
+            self.type_instantiations.instantiations(),
+            self.function_instantiations.instantiations(),
+            self.field_instantiations.instantiations(),
+        )
+    }
+
+    fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
+        self.signatures.add_signature(sig)
+    }
+
+    fn add_function_handle(&mut self, handle: FunctionHandle) -> FunctionHandleIndex {
+        debug_assert!(self.function_handles.len() < TableSize::max_value() as usize);
+        self.function_handles.push(handle);
+        FunctionHandleIndex((self.function_handles.len() - 1) as TableIndex)
+    }
+
+    fn get_signature_from_type_params(
+        &mut self,
+        abilities: impl IntoIterator<Item = AbilitySet>,
+    ) -> Signature {
+        let mut type_params = vec![];
+        for abs in abilities {
+            assert!(!abs.has_key());
+            match (abs.has_copy(), abs.has_drop(), abs.has_store()) {
+                (false, true, false) => type_params.push(SignatureToken::Signer),
+                _ => type_params.push(SignatureToken::U64),
+            }
+        }
+        Signature(type_params)
+    }
+
+    fn add_signature_from_type_params(
+        &mut self,
+        abilities: impl IntoIterator<Item = AbilitySet>,
+    ) -> SignatureIndex {
+        let sig = self.get_signature_from_type_params(abilities);
+        self.signatures.add_signature(sig)
+    }
+
+    fn get_function_instantiation(&mut self, fh_idx: usize) -> FunctionInstantiationIndex {
+        let abilities = self.function_handles[fh_idx].type_parameters.clone();
+        let sig_idx = self.add_signature_from_type_params(abilities.iter().copied());
+        let fi = FunctionInstantiation {
+            handle: FunctionHandleIndex(fh_idx as TableIndex),
+            type_parameters: sig_idx,
+        };
+        FunctionInstantiationIndex(self.function_instantiations.add_instantiation(fi))
+    }
+
+    fn get_type_instantiation(&mut self, sd_idx: usize) -> StructDefInstantiationIndex {
+        let sd = &self.struct_defs[sd_idx];
+        let struct_handle = &self.struct_handles[sd.struct_handle.0 as usize];
+        let sig_idx = self.add_signature_from_type_params(struct_handle.type_param_constraints());
+        let si = StructDefInstantiation {
+            def: StructDefinitionIndex(sd_idx as TableIndex),
+            type_parameters: sig_idx,
+        };
+        StructDefInstantiationIndex(self.type_instantiations.add_instantiation(si))
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct FunctionDefinitionGen {
+    name: PropIndex,
+    parameters: SignatureGen,
+    return_: SignatureGen,
+    visibility: Visibility,
+    is_entry: bool,
+    acquires: Vec<PropIndex>,
+    code: CodeUnitGen,
+}
+
+impl FunctionDefinitionGen {
+    pub fn strategy(
+        return_count: impl Into<SizeRange>,
+        arg_count: impl Into<SizeRange>,
+        _type_parameter_count: impl Into<SizeRange>,
+        acquires_count: impl Into<SizeRange>,
+        code_len: impl Into<SizeRange>,
+    ) -> impl Strategy<Value = Self> {
+        let return_count = return_count.into();
+        let arg_count = arg_count.into();
+        (
+            any::<PropIndex>(),
+            SignatureGen::strategy(arg_count.clone()),
+            SignatureGen::strategy(return_count),
+            any::<Visibility>(),
+            any::<bool>(),
+            vec(any::<PropIndex>(), acquires_count.into()),
+            CodeUnitGen::strategy(arg_count, code_len),
+        )
+            .prop_map(
+                |(name, parameters, return_, visibility, is_entry, acquires, code)| Self {
+                    name,
+                    parameters,
+                    return_,
+                    visibility,
+                    is_entry,
+                    acquires,
+                    code,
+                },
+            )
+    }
+
+    pub fn materialize(self, state: &mut FnDefnMaterializeState) -> Option<FunctionDefinition> {
+        // This precondition should never fail because the table size cannot be greater
+        // than TableSize::max_value()
+        let iden_idx = IdentifierIndex(self.name.index(state.identifiers_len) as TableIndex);
+        if state
+            .def_function_handles
+            .contains(&(state.self_module_handle_idx, iden_idx))
+        {
+            return None;
+        }
+        state
+            .def_function_handles
+            .insert((state.self_module_handle_idx, iden_idx));
+
+        let parameters = self.parameters.materialize(state.struct_handles);
+        let params_idx = state.add_signature(parameters);
+        let return_ = self.return_.materialize(state.struct_handles);
+        let return_idx = state.add_signature(return_);
+        let handle = FunctionHandle {
+            module: state.self_module_handle_idx,
+            name: iden_idx,
+            parameters: params_idx,
+            return_: return_idx,
+            type_parameters: vec![],
+        };
+        let function_handle = state.add_function_handle(handle);
+        let mut acquires_set = BTreeSet::new();
+        for acquire in self.acquires {
+            acquires_set.insert(StructDefinitionIndex(
+                acquire.index(state.struct_defs.len()) as TableIndex,
+            ));
+        }
+        let acquires_global_resources = acquires_set.into_iter().collect();
+        // TODO: consider generating native functions?
+        Some(FunctionDefinition {
+            function: function_handle,
+            visibility: self.visibility,
+            is_entry: self.is_entry,
+            acquires_global_resources,
+            code: Some(self.code.materialize(state)),
+        })
+    }
+}
+
+#[derive(Clone, Debug)]
+struct CodeUnitGen {
+    locals_signature: Vec<SignatureTokenGen>,
+    code: Vec<BytecodeGen>,
+}
+
+impl CodeUnitGen {
+    fn strategy(
+        arg_count: impl Into<SizeRange>,
+        code_len: impl Into<SizeRange>,
+    ) -> impl Strategy<Value = Self> {
+        (
+            vec(SignatureTokenGen::strategy(), arg_count),
+            vec(BytecodeGen::garbage_strategy(), code_len),
+        )
+            .prop_map(|(locals_signature, code)| Self {
+                locals_signature,
+                code,
+            })
+    }
+
+    fn materialize(self, state: &mut FnDefnMaterializeState) -> CodeUnit {
+        let locals_signature = Signature(
+            self.locals_signature
+                .into_iter()
+                .map(|sig| sig.materialize(state.struct_handles))
+                .collect(),
+        );
+
+        let mut code = vec![];
+        for bytecode_gen in self.code {
+            if let Some(bytecode) = bytecode_gen.materialize(state, code.len(), &locals_signature) {
+                code.push(bytecode)
+            }
+        }
+
+        CodeUnit {
+            locals: state.add_signature(locals_signature),
+            code,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+enum BytecodeGen {
+    // "Simple" means this doesn't refer to any other indexes.
+    Simple(Bytecode),
+    // All of these refer to other indexes.
+    LdConst(PropIndex),
+
+    MutBorrowField((PropIndex, PropIndex)),
+    ImmBorrowField((PropIndex, PropIndex)),
+
+    Call(PropIndex),
+
+    Pack(PropIndex),
+    Unpack(PropIndex),
+    Exists(PropIndex),
+    MutBorrowGlobal(PropIndex),
+    ImmBorrowGlobal(PropIndex),
+    MoveFrom(PropIndex),
+    MoveTo(PropIndex),
+    BrTrue(PropIndex),
+    BrFalse(PropIndex),
+    Branch(PropIndex),
+    CopyLoc(PropIndex),
+    MoveLoc(PropIndex),
+    StLoc(PropIndex),
+    MutBorrowLoc(PropIndex),
+    ImmBorrowLoc(PropIndex),
+
+    VecPack((PropIndex, u64)),
+    VecLen(PropIndex),
+    VecImmBorrow(PropIndex),
+    VecMutBorrow(PropIndex),
+    VecPushBack(PropIndex),
+    VecPopBack(PropIndex),
+    VecUnpack((PropIndex, u64)),
+    VecSwap(PropIndex),
+}
+
+impl BytecodeGen {
+    // This just generates nonsensical bytecodes. This will be cleaned up later as the generation
+    // model is refined.
+    fn garbage_strategy() -> impl Strategy<Value = Self> {
+        use BytecodeGen::*;
+
+        prop_oneof![
+            Self::simple_bytecode_strategy().prop_map(Simple),
+            any::<PropIndex>().prop_map(LdConst),
+            (any::<PropIndex>(), any::<PropIndex>()).prop_map(ImmBorrowField),
+            (any::<PropIndex>(), any::<PropIndex>()).prop_map(MutBorrowField),
+            any::<PropIndex>().prop_map(Call),
+            any::<PropIndex>().prop_map(Pack),
+            any::<PropIndex>().prop_map(Unpack),
+            any::<PropIndex>().prop_map(Exists),
+            any::<PropIndex>().prop_map(ImmBorrowGlobal),
+            any::<PropIndex>().prop_map(MutBorrowGlobal),
+            any::<PropIndex>().prop_map(MoveFrom),
+            any::<PropIndex>().prop_map(MoveTo),
+            any::<PropIndex>().prop_map(BrTrue),
+            any::<PropIndex>().prop_map(BrFalse),
+            any::<PropIndex>().prop_map(Branch),
+            any::<PropIndex>().prop_map(CopyLoc),
+            any::<PropIndex>().prop_map(MoveLoc),
+            any::<PropIndex>().prop_map(StLoc),
+            any::<PropIndex>().prop_map(MutBorrowLoc),
+            any::<PropIndex>().prop_map(ImmBorrowLoc),
+            (any::<PropIndex>(), any::<u64>()).prop_map(VecPack),
+            any::<PropIndex>().prop_map(VecLen),
+            any::<PropIndex>().prop_map(VecImmBorrow),
+            any::<PropIndex>().prop_map(VecMutBorrow),
+            any::<PropIndex>().prop_map(VecPushBack),
+            any::<PropIndex>().prop_map(VecPopBack),
+            (any::<PropIndex>(), any::<u64>()).prop_map(VecUnpack),
+            any::<PropIndex>().prop_map(VecSwap),
+        ]
+    }
+
+    fn materialize(
+        self,
+        state: &mut FnDefnMaterializeState,
+        code_len: usize,
+        locals_signature: &Signature,
+    ) -> Option<Bytecode> {
+        let bytecode = match self {
+            BytecodeGen::Simple(bytecode) => bytecode,
+            BytecodeGen::LdConst(idx) => {
+                if state.constant_pool_len == 0 {
+                    return None;
+                }
+                Bytecode::LdConst(ConstantPoolIndex(
+                    idx.index(state.constant_pool_len) as TableIndex
+                ))
+            }
+            BytecodeGen::MutBorrowField((def, field)) => {
+                let sd_idx = def.index(state.struct_defs.len());
+                let field_count = state.struct_def_to_field_count.get(&sd_idx)?;
+                if *field_count == 0 {
+                    return None;
+                }
+                let fh_idx = state.field_handles.add_field_handle(FieldHandle {
+                    owner: StructDefinitionIndex(sd_idx as TableIndex),
+                    field: field.index(*field_count) as TableIndex,
+                });
+
+                let struct_handle =
+                    &state.struct_handles[state.struct_defs[sd_idx].struct_handle.0 as usize];
+                if struct_handle.type_parameters.is_empty() {
+                    Bytecode::MutBorrowField(fh_idx)
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let fi_idx = state
+                        .field_instantiations
+                        .add_instantiation(FieldInstantiation {
+                            handle: fh_idx,
+                            type_parameters: sig_idx,
+                        });
+                    Bytecode::MutBorrowFieldGeneric(FieldInstantiationIndex(fi_idx))
+                }
+            }
+            BytecodeGen::ImmBorrowField((def, field)) => {
+                let sd_idx = def.index(state.struct_defs.len());
+                let field_count = state.struct_def_to_field_count.get(&sd_idx)?;
+                if *field_count == 0 {
+                    return None;
+                }
+                let fh_idx = state.field_handles.add_field_handle(FieldHandle {
+                    owner: StructDefinitionIndex(sd_idx as TableIndex),
+                    field: field.index(*field_count) as TableIndex,
+                });
+
+                let struct_handle =
+                    &state.struct_handles[state.struct_defs[sd_idx].struct_handle.0 as usize];
+                if struct_handle.type_parameters.is_empty() {
+                    Bytecode::ImmBorrowField(fh_idx)
+                } else {
+                    let sig_idx = state
+                        .add_signature_from_type_params(struct_handle.type_param_constraints());
+                    let fi_idx = state
+                        .field_instantiations
+                        .add_instantiation(FieldInstantiation {
+                            handle: fh_idx,
+                            type_parameters: sig_idx,
+                        });
+                    Bytecode::ImmBorrowFieldGeneric(FieldInstantiationIndex(fi_idx))
+                }
+            }
+            BytecodeGen::Call(idx) => {
+                let func_handles_len = state.function_handles.len();
+                let fh_idx = idx.index(func_handles_len);
+
+                if state.function_handles[fh_idx].type_parameters.is_empty() {
+                    Bytecode::Call(FunctionHandleIndex(fh_idx as TableIndex))
+                } else {
+                    Bytecode::CallGeneric(state.get_function_instantiation(fh_idx))
+                }
+            }
+            BytecodeGen::Pack(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::Pack(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::PackGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::Unpack(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::Unpack(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::UnpackGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::Exists(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::Exists(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::ExistsGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::ImmBorrowGlobal(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::ImmBorrowGlobal(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::ImmBorrowGlobalGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::MutBorrowGlobal(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::MutBorrowGlobal(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::MutBorrowGlobalGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::MoveFrom(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::MoveFrom(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::MoveFromGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::MoveTo(idx) => {
+                let struct_defs_len = state.struct_defs.len();
+                let sd_idx = idx.index(struct_defs_len);
+
+                let sd = &state.struct_defs[sd_idx];
+                if state.struct_handles[sd.struct_handle.0 as usize]
+                    .type_parameters
+                    .is_empty()
+                {
+                    Bytecode::MoveTo(StructDefinitionIndex(sd_idx as TableIndex))
+                } else {
+                    Bytecode::MoveToGeneric(state.get_type_instantiation(sd_idx))
+                }
+            }
+            BytecodeGen::BrTrue(idx) => {
+                if code_len == 0 {
+                    return None;
+                }
+                Bytecode::BrTrue(idx.index(code_len) as CodeOffset)
+            }
+            BytecodeGen::BrFalse(idx) => {
+                if code_len == 0 {
+                    return None;
+                }
+                Bytecode::BrFalse(idx.index(code_len) as CodeOffset)
+            }
+            BytecodeGen::Branch(idx) => {
+                if code_len == 0 {
+                    return None;
+                }
+                Bytecode::Branch(idx.index(code_len) as CodeOffset)
+            }
+            BytecodeGen::CopyLoc(idx) => {
+                if locals_signature.is_empty() {
+                    return None;
+                }
+                Bytecode::CopyLoc(idx.index(locals_signature.len()) as LocalIndex)
+            }
+            BytecodeGen::MoveLoc(idx) => {
+                if locals_signature.is_empty() {
+                    return None;
+                }
+                Bytecode::MoveLoc(idx.index(locals_signature.len()) as LocalIndex)
+            }
+            BytecodeGen::StLoc(idx) => {
+                if locals_signature.is_empty() {
+                    return None;
+                }
+                Bytecode::StLoc(idx.index(locals_signature.len()) as LocalIndex)
+            }
+            BytecodeGen::MutBorrowLoc(idx) => {
+                if locals_signature.is_empty() {
+                    return None;
+                }
+                Bytecode::MutBorrowLoc(idx.index(locals_signature.len()) as LocalIndex)
+            }
+            BytecodeGen::ImmBorrowLoc(idx) => {
+                if locals_signature.is_empty() {
+                    return None;
+                }
+                Bytecode::ImmBorrowLoc(idx.index(locals_signature.len()) as LocalIndex)
+            }
+            BytecodeGen::VecPack((idx, num)) => {
+                if num > u16::MAX as u64 {
+                    return None;
+                }
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecPack(SignatureIndex(sig_idx as TableIndex), num)
+            }
+            BytecodeGen::VecLen(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecLen(SignatureIndex(sig_idx as TableIndex))
+            }
+            BytecodeGen::VecImmBorrow(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecImmBorrow(SignatureIndex(sig_idx as TableIndex))
+            }
+            BytecodeGen::VecMutBorrow(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecMutBorrow(SignatureIndex(sig_idx as TableIndex))
+            }
+            BytecodeGen::VecPushBack(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecPushBack(SignatureIndex(sig_idx as TableIndex))
+            }
+            BytecodeGen::VecPopBack(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecPopBack(SignatureIndex(sig_idx as TableIndex))
+            }
+            BytecodeGen::VecUnpack((idx, num)) => {
+                if num > u16::MAX as u64 {
+                    return None;
+                }
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecUnpack(SignatureIndex(sig_idx as TableIndex), num)
+            }
+            BytecodeGen::VecSwap(idx) => {
+                let sigs_len = state.signatures.signatures.len();
+                if sigs_len == 0 {
+                    return None;
+                }
+                let sig_idx = idx.index(sigs_len);
+                let sig = &state.signatures.signatures[sig_idx];
+                if !BytecodeGen::is_valid_vector_element_sig(sig) {
+                    return None;
+                }
+                Bytecode::VecSwap(SignatureIndex(sig_idx as TableIndex))
+            }
+        };
+
+        Some(bytecode)
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_token(token: &SignatureToken) -> bool {
+        use SignatureToken::*;
+        match token {
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => true,
+            Vector(element_token) => BytecodeGen::check_signature_token(element_token),
+            StructInstantiation(_, type_arguments) => type_arguments
+                .iter()
+                .all(BytecodeGen::check_signature_token),
+            Reference(_) | MutableReference(_) => false,
+        }
+    }
+
+    fn is_valid_vector_element_sig(sig: &Signature) -> bool {
+        if sig.len() != 1 {
+            return false;
+        }
+        BytecodeGen::check_signature_token(&sig.0[0])
+    }
+
+    fn simple_bytecode_strategy() -> impl Strategy<Value = Bytecode> {
+        prop_oneof![
+        // The numbers are relative weights, somewhat arbitrarily picked.
+        9 => Self::just_bytecode_strategy(),
+        1 => any::<u64>().prop_map(Bytecode::LdU64),
+        1 => any::<u8>().prop_map(Bytecode::LdU8),
+        1 => any::<u128>().prop_map(Bytecode::LdU128),
+        1 => any::<u16>().prop_map(Bytecode::LdU16),
+        1 => any::<u32>().prop_map(Bytecode::LdU32),
+        1 => any::<U256>().prop_map(Bytecode::LdU256),
+        ]
+    }
+
+    fn just_bytecode_strategy() -> impl Strategy<Value = Bytecode> {
+        use Bytecode::*;
+
+        static JUST_BYTECODES: &[Bytecode] = &[
+            FreezeRef, Pop, Ret, LdTrue, LdFalse, ReadRef, WriteRef, Add, Sub, Mul, Mod, Div,
+            BitOr, BitAnd, Xor, Or, And, Eq, Neq, Lt, Gt, Le, Ge, Abort, CastU8, CastU64, CastU128,
+            CastU16, CastU32, CastU256, Not, Nop, Shl, Shr,
+        ];
+        select(JUST_BYTECODES)
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types/metadata.rs b/vendors/move/crates/move-binary-format/src/proptest_types/metadata.rs
new file mode 100644
index 000000000..2cb0425d8
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types/metadata.rs
@@ -0,0 +1,37 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::metadata::Metadata;
+use proptest::{
+    arbitrary::any,
+    collection::{btree_set, vec, SizeRange},
+    strategy::Strategy,
+};
+
+// A metadata generation strategy.
+#[derive(Clone, Debug)]
+pub struct MetadataGen {
+    blobs: Vec<Vec<u8>>,
+}
+
+impl MetadataGen {
+    // Return a `Strategy` that builds Metadata vectors based on the given size.
+    pub fn strategy(blob_size: impl Into<SizeRange>) -> impl Strategy<Value = Self> {
+        btree_set(vec(any::<u8>(), 0..=20), blob_size).prop_map(|blobs| Self {
+            blobs: blobs.into_iter().collect(),
+        })
+    }
+
+    // Return the metadata
+    pub fn metadata(self) -> Vec<Metadata> {
+        let mut metadata = vec![];
+        for blob in self.blobs {
+            metadata.push(Metadata {
+                key: blob.clone(),
+                value: blob,
+            })
+        }
+        metadata
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types/signature.rs b/vendors/move/crates/move-binary-format/src/proptest_types/signature.rs
new file mode 100644
index 000000000..5b94c1292
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types/signature.rs
@@ -0,0 +1,212 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::file_format::{
+    Ability, AbilitySet, Signature, SignatureToken, StructHandle, StructHandleIndex, TableIndex,
+    TypeParameterIndex,
+};
+use proptest::{
+    collection::{vec, SizeRange},
+    prelude::*,
+    sample::{select, Index as PropIndex},
+};
+
+#[derive(Clone, Debug)]
+pub enum AbilitySetGen {
+    Empty,
+    Copy,
+    Drop,
+    Store,
+    CopyDrop,
+    CopyStore,
+    DropStore,
+    CopyDropStore,
+}
+
+impl AbilitySetGen {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        use AbilitySetGen as G;
+
+        static KINDS: &[AbilitySetGen] = &[
+            G::Empty,
+            G::Copy,
+            G::Drop,
+            G::Store,
+            G::CopyDrop,
+            G::CopyStore,
+            G::DropStore,
+            G::CopyDropStore,
+        ];
+
+        select(KINDS)
+    }
+
+    pub fn materialize(self) -> AbilitySet {
+        use AbilitySetGen as G;
+
+        let empty = AbilitySet::EMPTY;
+        match self {
+            G::Empty => empty,
+            G::Copy => empty | Ability::Copy,
+            G::Drop => empty | Ability::Drop,
+            G::Store => empty | Ability::Store,
+            G::CopyDrop => empty | Ability::Copy | Ability::Drop,
+            G::CopyStore => empty | Ability::Copy | Ability::Store,
+            G::DropStore => empty | Ability::Drop | Ability::Store,
+            G::CopyDropStore => empty | Ability::Copy | Ability::Drop | Ability::Store,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct SignatureGen {
+    signatures: Vec<SignatureTokenGen>,
+}
+
+impl SignatureGen {
+    pub fn strategy(sig_count: impl Into<SizeRange>) -> impl Strategy<Value = Self> {
+        vec(SignatureTokenGen::strategy(), sig_count).prop_map(|signatures| Self { signatures })
+    }
+
+    pub fn materialize(self, struct_handles: &[StructHandle]) -> Signature {
+        Signature(
+            self.signatures
+                .into_iter()
+                .map(move |token| token.materialize(struct_handles))
+                .collect(),
+        )
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum SignatureTokenGen {
+    // Atomic signature tokens.
+    Bool,
+    U8,
+    U16,
+    U32,
+    U64,
+    U128,
+    U256,
+    Address,
+    Signer,
+    TypeParameter(PropIndex),
+
+    // Composite signature tokens.
+    Struct(PropIndex),
+    Vector(Box<SignatureTokenGen>),
+    Reference(Box<SignatureTokenGen>),
+    MutableReference(Box<SignatureTokenGen>),
+}
+
+impl SignatureTokenGen {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        prop::strategy::Union::new_weighted(vec![
+            (5, Self::atom_strategy().boxed()),
+            (1, Self::reference_strategy().boxed()),
+            (1, Self::mutable_reference_strategy().boxed()),
+            (1, Self::vector_strategy().boxed()),
+        ])
+    }
+
+    /// Generates a signature token for an owned (non-reference) type.
+    pub fn owned_strategy() -> impl Strategy<Value = Self> {
+        prop::strategy::Union::new_weighted(vec![(3, Self::atom_strategy().boxed())])
+    }
+
+    pub fn atom_strategy() -> impl Strategy<Value = Self> {
+        prop_oneof![
+            9 => Self::owned_non_struct_strategy(),
+            1 => Self::struct_strategy(),
+            // 1=> Self::type_parameter_strategy(),
+        ]
+    }
+
+    /// Generates a signature token for a non-struct owned type.
+    pub fn owned_non_struct_strategy() -> impl Strategy<Value = Self> {
+        use SignatureTokenGen::*;
+
+        static OWNED_NON_STRUCTS: &[SignatureTokenGen] =
+            &[Bool, U8, U16, U32, U64, U128, U256, Address, Signer];
+
+        select(OWNED_NON_STRUCTS)
+    }
+
+    // TODO: remove allow(dead_code) once related features are implemented
+    #[allow(dead_code)]
+    pub fn type_parameter_strategy() -> impl Strategy<Value = Self> {
+        any::<PropIndex>().prop_map(SignatureTokenGen::TypeParameter)
+    }
+
+    pub fn struct_strategy() -> impl Strategy<Value = Self> {
+        any::<PropIndex>().prop_map(SignatureTokenGen::Struct)
+    }
+
+    pub fn vector_strategy() -> impl Strategy<Value = Self> {
+        Self::owned_strategy().prop_map(|atom| SignatureTokenGen::Vector(Box::new(atom)))
+    }
+
+    pub fn reference_strategy() -> impl Strategy<Value = Self> {
+        // References to references are not supported.
+        Self::owned_strategy().prop_map(|atom| SignatureTokenGen::Reference(Box::new(atom)))
+    }
+
+    pub fn mutable_reference_strategy() -> impl Strategy<Value = Self> {
+        // References to references are not supported.
+        Self::owned_strategy().prop_map(|atom| SignatureTokenGen::MutableReference(Box::new(atom)))
+    }
+
+    pub fn materialize(self, struct_handles: &[StructHandle]) -> SignatureToken {
+        use SignatureTokenGen::*;
+        match self {
+            Bool => SignatureToken::Bool,
+            U8 => SignatureToken::U8,
+            U16 => SignatureToken::U16,
+            U32 => SignatureToken::U32,
+            U64 => SignatureToken::U64,
+            U128 => SignatureToken::U128,
+            U256 => SignatureToken::U256,
+            Address => SignatureToken::Address,
+            Signer => SignatureToken::Signer,
+            Struct(idx) => {
+                let struct_handles_len = struct_handles.len();
+                if struct_handles_len == 0 {
+                    // we are asked to create a type of a struct that cannot exist
+                    // so we fake a U64 instead...
+                    SignatureToken::U64
+                } else {
+                    let struct_idx = idx.index(struct_handles_len);
+                    let sh = &struct_handles[struct_idx];
+                    if sh.type_parameters.is_empty() {
+                        SignatureToken::Struct(StructHandleIndex(struct_idx as TableIndex))
+                    } else {
+                        let mut type_params = vec![];
+                        for type_param in &sh.type_parameters {
+                            let abs = type_param.constraints;
+                            assert!(!abs.has_key());
+                            match (abs.has_copy(), abs.has_drop(), abs.has_store()) {
+                                (false, true, false) => type_params.push(SignatureToken::Signer),
+                                _ => type_params.push(SignatureToken::U64),
+                            }
+                        }
+                        SignatureToken::StructInstantiation(
+                            StructHandleIndex(struct_idx as TableIndex),
+                            type_params,
+                        )
+                    }
+                }
+            }
+            Vector(token) => SignatureToken::Vector(Box::new(token.materialize(struct_handles))),
+            Reference(token) => {
+                SignatureToken::Reference(Box::new(token.materialize(struct_handles)))
+            }
+            MutableReference(token) => {
+                SignatureToken::MutableReference(Box::new(token.materialize(struct_handles)))
+            }
+            TypeParameter(idx) => {
+                SignatureToken::TypeParameter(idx.index(struct_handles.len()) as TypeParameterIndex)
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/proptest_types/types.rs b/vendors/move/crates/move-binary-format/src/proptest_types/types.rs
new file mode 100644
index 000000000..8879daa9e
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/proptest_types/types.rs
@@ -0,0 +1,265 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    file_format::{
+        AbilitySet, FieldDefinition, IdentifierIndex, ModuleHandleIndex, SignatureToken,
+        StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
+        StructTypeParameter, TableIndex, TypeSignature,
+    },
+    internals::ModuleIndex,
+    proptest_types::{
+        prop_index_avoid,
+        signature::{AbilitySetGen, SignatureTokenGen},
+    },
+};
+use proptest::{
+    collection::{vec, SizeRange},
+    option,
+    prelude::*,
+    sample::Index as PropIndex,
+    std_facade::hash_set::HashSet,
+};
+use std::collections::BTreeSet;
+
+#[derive(Debug)]
+struct TypeSignatureIndex(u16);
+
+#[derive(Debug)]
+pub struct StDefnMaterializeState {
+    pub self_module_handle_idx: ModuleHandleIndex,
+    pub identifiers_len: usize,
+    pub struct_handles: Vec<StructHandle>,
+    pub new_handles: BTreeSet<(ModuleHandleIndex, IdentifierIndex)>,
+}
+
+impl StDefnMaterializeState {
+    pub fn new(
+        self_module_handle_idx: ModuleHandleIndex,
+        identifiers_len: usize,
+        struct_handles: Vec<StructHandle>,
+    ) -> Self {
+        Self {
+            self_module_handle_idx,
+            identifiers_len,
+            struct_handles,
+            new_handles: BTreeSet::new(),
+        }
+    }
+
+    fn add_struct_handle(&mut self, handle: StructHandle) -> Option<StructHandleIndex> {
+        if self.new_handles.insert((handle.module, handle.name)) {
+            self.struct_handles.push(handle);
+            Some(StructHandleIndex((self.struct_handles.len() - 1) as u16))
+        } else {
+            None
+        }
+    }
+
+    fn potential_abilities(&self, ty: &SignatureToken) -> AbilitySet {
+        use SignatureToken::*;
+
+        match ty {
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => AbilitySet::PRIMITIVES,
+
+            Reference(_) | MutableReference(_) => AbilitySet::REFERENCES,
+            Signer => AbilitySet::SIGNER,
+            TypeParameter(_) => AbilitySet::ALL,
+            Vector(ty) => {
+                let inner = self.potential_abilities(ty);
+                inner.intersect(AbilitySet::VECTOR)
+            }
+            Struct(idx) => {
+                let sh = &self.struct_handles[idx.0 as usize];
+                sh.abilities
+            }
+            StructInstantiation(idx, type_args) => {
+                let sh = &self.struct_handles[idx.0 as usize];
+
+                // Gather the abilities of the type actuals.
+                let type_args_abilities = type_args.iter().map(|ty| self.potential_abilities(ty));
+                type_args_abilities.fold(sh.abilities, |acc, ty_arg_abilities| {
+                    acc.intersect(ty_arg_abilities)
+                })
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct StructHandleGen {
+    module_idx: PropIndex,
+    name_idx: PropIndex,
+    abilities: AbilitySetGen,
+    type_parameters: Vec<(AbilitySetGen, bool)>,
+}
+
+impl StructHandleGen {
+    pub fn strategy(ability_count: impl Into<SizeRange>) -> impl Strategy<Value = Self> {
+        let ability_count = ability_count.into();
+        (
+            any::<PropIndex>(),
+            any::<PropIndex>(),
+            AbilitySetGen::strategy(),
+            vec((AbilitySetGen::strategy(), any::<bool>()), ability_count),
+        )
+            .prop_map(|(module_idx, name_idx, abilities, type_parameters)| Self {
+                module_idx,
+                name_idx,
+                abilities,
+                type_parameters,
+            })
+    }
+
+    pub fn materialize(
+        self,
+        self_module_handle_idx: ModuleHandleIndex,
+        module_len: usize,
+        identifiers_len: usize,
+    ) -> StructHandle {
+        let idx = prop_index_avoid(
+            self.module_idx,
+            self_module_handle_idx.into_index(),
+            module_len,
+        );
+        let type_parameters = self
+            .type_parameters
+            .into_iter()
+            .map(|(constraints, is_phantom)| StructTypeParameter {
+                constraints: constraints.materialize(),
+                is_phantom,
+            })
+            .collect();
+        StructHandle {
+            module: ModuleHandleIndex(idx as TableIndex),
+            name: IdentifierIndex(self.name_idx.index(identifiers_len) as TableIndex),
+            abilities: self.abilities.materialize(),
+            type_parameters,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct StructDefinitionGen {
+    name_idx: PropIndex,
+    abilities: AbilitySetGen,
+    type_parameters: Vec<(AbilitySetGen, bool)>,
+    #[allow(dead_code)]
+    is_public: bool,
+    field_defs: Option<Vec<FieldDefinitionGen>>,
+}
+
+impl StructDefinitionGen {
+    pub fn strategy(
+        field_count: impl Into<SizeRange>,
+        type_parameter_count: impl Into<SizeRange>,
+    ) -> impl Strategy<Value = Self> {
+        (
+            any::<PropIndex>(),
+            AbilitySetGen::strategy(),
+            vec(
+                (AbilitySetGen::strategy(), any::<bool>()),
+                type_parameter_count,
+            ),
+            any::<bool>(),
+            option::of(vec(FieldDefinitionGen::strategy(), field_count)),
+        )
+            .prop_map(
+                |(name_idx, abilities, type_parameters, is_public, field_defs)| Self {
+                    name_idx,
+                    abilities,
+                    type_parameters,
+                    is_public,
+                    field_defs,
+                },
+            )
+    }
+
+    pub fn materialize(
+        self,
+        state: &mut StDefnMaterializeState,
+    ) -> (Option<StructDefinition>, usize) {
+        let mut field_names = HashSet::new();
+        let mut fields = vec![];
+        match self.field_defs {
+            None => (),
+            Some(field_defs_gen) => {
+                for fd_gen in field_defs_gen {
+                    let field = fd_gen.materialize(state);
+                    if field_names.insert(field.name) {
+                        fields.push(field);
+                    }
+                }
+            }
+        };
+        let abilities = fields
+            .iter()
+            .fold(self.abilities.materialize(), |acc, field| {
+                acc.intersect(state.potential_abilities(&field.signature.0))
+            });
+
+        let type_parameters = self
+            .type_parameters
+            .into_iter()
+            .map(|(constraints, is_phantom)| StructTypeParameter {
+                constraints: constraints.materialize(),
+                is_phantom,
+            })
+            .collect();
+        let handle = StructHandle {
+            module: state.self_module_handle_idx,
+            name: IdentifierIndex(self.name_idx.index(state.identifiers_len) as TableIndex),
+            abilities,
+            type_parameters,
+        };
+        match state.add_struct_handle(handle) {
+            Some(struct_handle) => {
+                if fields.is_empty() {
+                    (
+                        Some(StructDefinition {
+                            struct_handle,
+                            field_information: StructFieldInformation::Native,
+                        }),
+                        0,
+                    )
+                } else {
+                    let field_count = fields.len();
+                    let field_information = StructFieldInformation::Declared(fields);
+                    (
+                        Some(StructDefinition {
+                            struct_handle,
+                            field_information,
+                        }),
+                        field_count,
+                    )
+                }
+            }
+            None => (None, 0),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+struct FieldDefinitionGen {
+    name_idx: PropIndex,
+    signature_gen: SignatureTokenGen,
+}
+
+impl FieldDefinitionGen {
+    fn strategy() -> impl Strategy<Value = Self> {
+        (any::<PropIndex>(), SignatureTokenGen::atom_strategy()).prop_map(
+            |(name_idx, signature_gen)| Self {
+                name_idx,
+                signature_gen,
+            },
+        )
+    }
+
+    fn materialize(self, state: &StDefnMaterializeState) -> FieldDefinition {
+        FieldDefinition {
+            name: IdentifierIndex(self.name_idx.index(state.identifiers_len) as TableIndex),
+            signature: TypeSignature(self.signature_gen.materialize(&state.struct_handles)),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/serializer.rs b/vendors/move/crates/move-binary-format/src/serializer.rs
new file mode 100644
index 000000000..3a63bf571
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/serializer.rs
@@ -0,0 +1,1474 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Serialization of transactions and modules.
+//!
+//! This module exposes two entry points for serialization of `CompiledScript` and
+//! `CompiledModule`. The entry points are exposed on the main structs `CompiledScript` and
+//! `CompiledModule`.
+//!
+//! **Versioning**
+//!
+//! A note about versioning. The serializer supports writing file_format versions >= v5. The
+//! entry points get the version number passed in and generate compatible formats. However,
+//! not all of the newer language constructs might be supported for older versions, leading to
+//! serialization errors.
+
+use crate::{file_format::*, file_format_common::*};
+use anyhow::{anyhow, bail, Result};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, metadata::Metadata,
+};
+
+impl CompiledScript {
+    /// Serializes a `CompiledScript` into a binary. The mutable `Vec<u8>` will contain the
+    /// binary blob on return.
+    pub fn serialize(&self, binary: &mut Vec<u8>) -> Result<()> {
+        self.serialize_for_version(None, binary)
+    }
+
+    /// Serialize into binary, at given version.
+    pub fn serialize_for_version(
+        &self,
+        bytecode_version: Option<u32>,
+        binary: &mut Vec<u8>,
+    ) -> Result<()> {
+        let version = bytecode_version.unwrap_or(VERSION_MAX);
+        validate_version(version)?;
+        let mut binary_data = BinaryData::from(binary.clone());
+        let mut ser = ScriptSerializer::new(version);
+        let mut temp = BinaryData::new();
+
+        ser.common.serialize_common_tables(&mut temp, self)?;
+        if temp.len() > TABLE_CONTENT_SIZE_MAX as usize {
+            bail!(
+                "table content size ({}) cannot exceed ({})",
+                temp.len(),
+                TABLE_CONTENT_SIZE_MAX
+            );
+        }
+        ser.common.serialize_header(&mut binary_data)?;
+        ser.common.serialize_table_indices(&mut binary_data)?;
+
+        binary_data.extend(temp.as_inner())?;
+
+        ser.serialize_main(&mut binary_data, self)?;
+
+        *binary = binary_data.into_inner();
+        Ok(())
+    }
+}
+
+fn write_as_uleb128<T1, T2>(binary: &mut BinaryData, x: T1, max: T2) -> Result<()>
+where
+    T1: Into<u64>,
+    T2: Into<u64>,
+{
+    let x: u64 = x.into();
+    let max: u64 = max.into();
+    if x > max {
+        bail!("value ({}) cannot exceed ({})", x, max)
+    }
+    write_u64_as_uleb128(binary, x)
+}
+
+fn serialize_signature_index(binary: &mut BinaryData, idx: &SignatureIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, SIGNATURE_INDEX_MAX)
+}
+
+fn serialize_module_handle_index(binary: &mut BinaryData, idx: &ModuleHandleIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, MODULE_HANDLE_INDEX_MAX)
+}
+
+fn serialize_identifier_index(binary: &mut BinaryData, idx: &IdentifierIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, IDENTIFIER_INDEX_MAX)
+}
+
+fn serialize_struct_handle_index(binary: &mut BinaryData, idx: &StructHandleIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, STRUCT_HANDLE_INDEX_MAX)
+}
+
+fn serialize_address_identifier_index(
+    binary: &mut BinaryData,
+    idx: &AddressIdentifierIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, ADDRESS_INDEX_MAX)
+}
+
+fn serialize_struct_def_index(binary: &mut BinaryData, idx: &StructDefinitionIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, STRUCT_DEF_INDEX_MAX)
+}
+
+fn serialize_function_handle_index(
+    binary: &mut BinaryData,
+    idx: &FunctionHandleIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, FUNCTION_HANDLE_INDEX_MAX)
+}
+
+fn serialize_field_handle_index(binary: &mut BinaryData, idx: &FieldHandleIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, FIELD_HANDLE_INDEX_MAX)
+}
+
+fn serialize_field_inst_index(
+    binary: &mut BinaryData,
+    idx: &FieldInstantiationIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, FIELD_INST_INDEX_MAX)
+}
+
+fn serialize_function_inst_index(
+    binary: &mut BinaryData,
+    idx: &FunctionInstantiationIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, FUNCTION_INST_INDEX_MAX)
+}
+
+fn serialize_struct_def_inst_index(
+    binary: &mut BinaryData,
+    idx: &StructDefInstantiationIndex,
+) -> Result<()> {
+    write_as_uleb128(binary, idx.0, STRUCT_DEF_INST_INDEX_MAX)
+}
+
+fn seiralize_table_offset(binary: &mut BinaryData, offset: u32) -> Result<()> {
+    write_as_uleb128(binary, offset, TABLE_OFFSET_MAX)
+}
+
+fn serialize_table_size(binary: &mut BinaryData, size: u32) -> Result<()> {
+    write_as_uleb128(binary, size, TABLE_SIZE_MAX)
+}
+
+fn serialize_constant_pool_index(binary: &mut BinaryData, idx: &ConstantPoolIndex) -> Result<()> {
+    write_as_uleb128(binary, idx.0, CONSTANT_INDEX_MAX)
+}
+
+fn serialize_bytecode_count(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, BYTECODE_COUNT_MAX)
+}
+
+fn serialize_identifier_size(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, IDENTIFIER_SIZE_MAX)
+}
+
+fn serialize_constant_size(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, CONSTANT_SIZE_MAX)
+}
+
+fn serialize_metadata_key_size(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, METADATA_KEY_SIZE_MAX)
+}
+
+fn serialize_metadata_value_size(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, METADATA_VALUE_SIZE_MAX)
+}
+
+fn serialize_field_count(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, FIELD_COUNT_MAX)
+}
+
+fn serialize_field_offset(binary: &mut BinaryData, offset: u16) -> Result<()> {
+    write_as_uleb128(binary, offset, FIELD_OFFSET_MAX)
+}
+
+fn serialize_acquires_count(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, ACQUIRES_COUNT_MAX)
+}
+
+fn serialize_signature_size(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, SIGNATURE_SIZE_MAX)
+}
+
+fn serialize_type_parameter_index(binary: &mut BinaryData, idx: u16) -> Result<()> {
+    write_as_uleb128(binary, idx, TYPE_PARAMETER_INDEX_MAX)
+}
+
+fn serialize_type_parameter_count(binary: &mut BinaryData, len: usize) -> Result<()> {
+    write_as_uleb128(binary, len as u64, TYPE_PARAMETER_COUNT_MAX)
+}
+
+fn serialize_bytecode_offset(binary: &mut BinaryData, offset: u16) -> Result<()> {
+    write_as_uleb128(binary, offset, BYTECODE_INDEX_MAX)
+}
+
+fn serialize_table_count(binary: &mut BinaryData, len: u8) -> Result<()> {
+    write_as_uleb128(binary, len, TABLE_COUNT_MAX)
+}
+
+fn serialize_local_index(binary: &mut BinaryData, idx: u8) -> Result<()> {
+    write_as_uleb128(binary, idx, LOCAL_INDEX_MAX)
+}
+
+fn validate_version(version: u32) -> Result<()> {
+    if !(VERSION_MIN..=VERSION_MAX).contains(&version) {
+        bail!(
+            "The requested bytecode version {} is not supported. Only {} to {} are.",
+            version,
+            VERSION_MIN,
+            VERSION_MAX
+        )
+    } else {
+        Ok(())
+    }
+}
+
+impl CompiledModule {
+    /// Serializes a `CompiledModule` into a binary. The mutable `Vec<u8>` will contain the
+    /// binary blob on return.
+    pub fn serialize(&self, binary: &mut Vec<u8>) -> Result<()> {
+        self.serialize_for_version(None, binary)
+    }
+
+    /// Serialize into binary, at given version.
+    pub fn serialize_for_version(
+        &self,
+        bytecode_version: Option<u32>,
+        binary: &mut Vec<u8>,
+    ) -> Result<()> {
+        let version = bytecode_version.unwrap_or(VERSION_MAX);
+        validate_version(version)?;
+        let mut binary_data = BinaryData::from(binary.clone());
+        let mut ser = ModuleSerializer::new(version);
+        let mut temp = BinaryData::new();
+        ser.serialize_tables(&mut temp, self)?;
+        if temp.len() > u32::max_value() as usize {
+            bail!(
+                "table content size ({}) cannot exceed ({})",
+                temp.len(),
+                u32::max_value()
+            );
+        }
+        ser.common.serialize_header(&mut binary_data)?;
+        ser.serialize_table_indices(&mut binary_data)?;
+
+        binary_data.extend(temp.as_inner())?;
+
+        serialize_module_handle_index(&mut binary_data, &self.self_module_handle_idx)?;
+
+        *binary = binary_data.into_inner();
+        Ok(())
+    }
+}
+
+/// Holds data to compute the header of a generic binary.
+///
+/// A binary header contains information about the tables serialized.
+/// The serializer needs to serialize the tables in order to compute the offset and size
+/// of each table.
+/// `CommonSerializer` keeps track of the tables common to `CompiledScript` and
+/// `CompiledModule`.
+#[derive(Debug)]
+struct CommonSerializer {
+    major_version: u32,
+    table_count: u8,
+    module_handles: (u32, u32),
+    struct_handles: (u32, u32),
+    function_handles: (u32, u32),
+    function_instantiations: (u32, u32),
+    signatures: (u32, u32),
+    identifiers: (u32, u32),
+    address_identifiers: (u32, u32),
+    constant_pool: (u32, u32),
+    metadata: (u32, u32),
+}
+
+/// Holds data to compute the header of a module binary.
+#[derive(Debug)]
+struct ModuleSerializer {
+    common: CommonSerializer,
+    struct_defs: (u32, u32),
+    struct_def_instantiations: (u32, u32),
+    function_defs: (u32, u32),
+    field_handles: (u32, u32),
+    field_instantiations: (u32, u32),
+    friend_decls: (u32, u32),
+}
+
+/// Holds data to compute the header of a transaction script binary.
+#[derive(Debug)]
+struct ScriptSerializer {
+    common: CommonSerializer,
+}
+
+//
+// Helpers
+//
+fn check_index_in_binary(index: usize) -> Result<u32> {
+    if index > u32::max_value() as usize {
+        bail!(
+            "Compilation unit too big ({}) cannot exceed {}",
+            index,
+            u32::max_value()
+        )
+    }
+    Ok(index as u32)
+}
+
+fn serialize_table_index(
+    binary: &mut BinaryData,
+    kind: TableType,
+    offset: u32,
+    count: u32,
+) -> Result<()> {
+    if count != 0 {
+        binary.push(kind as u8)?;
+        seiralize_table_offset(binary, offset)?;
+        serialize_table_size(binary, count)?;
+    }
+    Ok(())
+}
+
+fn serialize_magic(binary: &mut BinaryData) -> Result<()> {
+    for byte in &BinaryConstants::MOVE_MAGIC {
+        binary.push(*byte)?;
+    }
+    Ok(())
+}
+
+/// Trait to access tables for both `CompiledScript` and `CompiledModule`,
+/// used by `CommonSerializer`.
+trait CommonTables {
+    fn get_module_handles(&self) -> &[ModuleHandle];
+    fn get_struct_handles(&self) -> &[StructHandle];
+    fn get_function_handles(&self) -> &[FunctionHandle];
+    fn get_function_instantiations(&self) -> &[FunctionInstantiation];
+    fn get_identifiers(&self) -> &[Identifier];
+    fn get_address_identifiers(&self) -> &[AccountAddress];
+    fn get_constant_pool(&self) -> &[Constant];
+    fn get_signatures(&self) -> &[Signature];
+    fn get_metadata(&self) -> &[Metadata];
+}
+
+impl CommonTables for CompiledScript {
+    fn get_module_handles(&self) -> &[ModuleHandle] {
+        &self.module_handles
+    }
+
+    fn get_struct_handles(&self) -> &[StructHandle] {
+        &self.struct_handles
+    }
+
+    fn get_function_handles(&self) -> &[FunctionHandle] {
+        &self.function_handles
+    }
+
+    fn get_function_instantiations(&self) -> &[FunctionInstantiation] {
+        &self.function_instantiations
+    }
+
+    fn get_identifiers(&self) -> &[Identifier] {
+        &self.identifiers
+    }
+
+    fn get_address_identifiers(&self) -> &[AccountAddress] {
+        &self.address_identifiers
+    }
+
+    fn get_constant_pool(&self) -> &[Constant] {
+        &self.constant_pool
+    }
+
+    fn get_signatures(&self) -> &[Signature] {
+        &self.signatures
+    }
+
+    fn get_metadata(&self) -> &[Metadata] {
+        &self.metadata
+    }
+}
+
+impl CommonTables for CompiledModule {
+    fn get_module_handles(&self) -> &[ModuleHandle] {
+        &self.module_handles
+    }
+
+    fn get_struct_handles(&self) -> &[StructHandle] {
+        &self.struct_handles
+    }
+
+    fn get_function_handles(&self) -> &[FunctionHandle] {
+        &self.function_handles
+    }
+
+    fn get_function_instantiations(&self) -> &[FunctionInstantiation] {
+        &self.function_instantiations
+    }
+
+    fn get_identifiers(&self) -> &[Identifier] {
+        &self.identifiers
+    }
+
+    fn get_address_identifiers(&self) -> &[AccountAddress] {
+        &self.address_identifiers
+    }
+
+    fn get_constant_pool(&self) -> &[Constant] {
+        &self.constant_pool
+    }
+
+    fn get_signatures(&self) -> &[Signature] {
+        &self.signatures
+    }
+
+    fn get_metadata(&self) -> &[Metadata] {
+        &self.metadata
+    }
+}
+
+/// Serializes a `ModuleHandle`.
+///
+/// A `ModuleHandle` gets serialized as follows:
+/// - `ModuleHandle.address` as a ULEB128 (index into the `AddressPool`)
+/// - `ModuleHandle.name` as a ULEB128 (index into the `IdentifierPool`)
+fn serialize_module_handle(binary: &mut BinaryData, module_handle: &ModuleHandle) -> Result<()> {
+    serialize_address_identifier_index(binary, &module_handle.address)?;
+    serialize_identifier_index(binary, &module_handle.name)?;
+    Ok(())
+}
+
+/// Serializes a `StructHandle`.
+///
+/// A `StructHandle` gets serialized as follows:
+/// - `StructHandle.module` as a ULEB128 (index into the `ModuleHandle` table)
+/// - `StructHandle.name` as a ULEB128 (index into the `IdentifierPool`)
+/// - `StructHandle.is_nominal_resource` as a 1 byte boolean (0 for false, 1 for true)
+fn serialize_struct_handle(binary: &mut BinaryData, struct_handle: &StructHandle) -> Result<()> {
+    serialize_module_handle_index(binary, &struct_handle.module)?;
+    serialize_identifier_index(binary, &struct_handle.name)?;
+    serialize_ability_set(binary, struct_handle.abilities)?;
+    serialize_type_parameters(binary, &struct_handle.type_parameters)
+}
+
+fn serialize_type_parameters(
+    binary: &mut BinaryData,
+    type_parameters: &[StructTypeParameter],
+) -> Result<()> {
+    serialize_type_parameter_count(binary, type_parameters.len())?;
+    for type_param in type_parameters {
+        serialize_type_parameter(binary, type_param)?;
+    }
+    Ok(())
+}
+
+fn serialize_type_parameter(
+    binary: &mut BinaryData,
+    type_param: &StructTypeParameter,
+) -> Result<()> {
+    serialize_ability_set(binary, type_param.constraints)?;
+    write_as_uleb128(binary, type_param.is_phantom as u8, 1u64)
+}
+
+/// Serializes a `FunctionHandle`.
+///
+/// A `FunctionHandle` gets serialized as follows:
+/// - `FunctionHandle.module` as a ULEB128 (index into the `ModuleHandle` table)
+/// - `FunctionHandle.name` as a ULEB128 (index into the `IdentifierPool`)
+/// - `FunctionHandle.parameters` as a ULEB128 (index into the `SignaturePool`)
+/// - `FunctionHandle.return_` as a ULEB128 (index into the `SignaturePool`)
+/// - `FunctionHandle.type_parameters` as a `Vec<u8>`
+fn serialize_function_handle(
+    binary: &mut BinaryData,
+    function_handle: &FunctionHandle,
+) -> Result<()> {
+    serialize_module_handle_index(binary, &function_handle.module)?;
+    serialize_identifier_index(binary, &function_handle.name)?;
+    serialize_signature_index(binary, &function_handle.parameters)?;
+    serialize_signature_index(binary, &function_handle.return_)?;
+    serialize_ability_sets(binary, &function_handle.type_parameters)
+}
+
+fn serialize_function_instantiation(
+    binary: &mut BinaryData,
+    func_inst: &FunctionInstantiation,
+) -> Result<()> {
+    serialize_function_handle_index(binary, &func_inst.handle)?;
+    serialize_signature_index(binary, &func_inst.type_parameters)?;
+    Ok(())
+}
+
+/// Serializes a string (identifier or user string).
+///
+/// A `String` gets serialized as follows:
+/// - `String` size as a ULEB128
+/// - `String` bytes - *exact format to be defined, Rust utf8 right now*
+fn serialize_identifier(binary: &mut BinaryData, string: &str) -> Result<()> {
+    let bytes = string.as_bytes();
+    serialize_identifier_size(binary, bytes.len())?;
+    for byte in bytes {
+        binary.push(*byte)?;
+    }
+    Ok(())
+}
+
+/// Serializes an `AccountAddress`.
+///
+/// A `AccountAddress` gets serialized as follows:
+/// - 32 bytes in increasing index order
+fn serialize_address(binary: &mut BinaryData, address: &AccountAddress) -> Result<()> {
+    for byte in address.as_ref() {
+        binary.push(*byte)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `Constant`.
+///
+/// A `Constant` gets serialized as follows:
+/// - `type_` serialized (see `serialize_signature_token`)
+/// - `data` size as a ULEB128
+/// - `data` bytes in increasing index order
+fn serialize_constant(binary: &mut BinaryData, constant: &Constant) -> Result<()> {
+    serialize_signature_token(binary, &constant.type_)?;
+    serialize_byte_blob(binary, serialize_constant_size, &constant.data)
+}
+
+/// Serialize a metadata entry.
+fn serialize_metadata_entry(binary: &mut BinaryData, metadata: &Metadata) -> Result<()> {
+    serialize_byte_blob(binary, serialize_metadata_key_size, &metadata.key)?;
+    serialize_byte_blob(binary, serialize_metadata_value_size, &metadata.value)
+}
+
+/// Serialize a byte blob.
+fn serialize_byte_blob(
+    binary: &mut BinaryData,
+    size_serializer: impl Fn(&mut BinaryData, usize) -> Result<()>,
+    blob: &[u8],
+) -> Result<()> {
+    size_serializer(binary, blob.len())?;
+    for byte in blob {
+        binary.push(*byte)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `StructDefinition`.
+///
+/// A `StructDefinition` gets serialized as follows:
+/// - `StructDefinition.handle` as a ULEB128 (index into the `ModuleHandle` table)
+/// - `StructDefinition.field_count` as a ULEB128 (number of fields defined in the type)
+/// - `StructDefinition.fields` as a ULEB128 (index into the `FieldDefinition` table)
+fn serialize_struct_definition(
+    binary: &mut BinaryData,
+    struct_definition: &StructDefinition,
+) -> Result<()> {
+    serialize_struct_handle_index(binary, &struct_definition.struct_handle)?;
+    match &struct_definition.field_information {
+        StructFieldInformation::Native => binary.push(SerializedNativeStructFlag::NATIVE as u8),
+        StructFieldInformation::Declared(fields) => {
+            binary.push(SerializedNativeStructFlag::DECLARED as u8)?;
+            serialize_field_definitions(binary, fields)
+        }
+    }
+}
+
+fn serialize_struct_def_instantiation(
+    binary: &mut BinaryData,
+    struct_inst: &StructDefInstantiation,
+) -> Result<()> {
+    serialize_struct_def_index(binary, &struct_inst.def)?;
+    serialize_signature_index(binary, &struct_inst.type_parameters)?;
+    Ok(())
+}
+
+/// Serializes `FieldDefinition` within a struct.
+fn serialize_field_definitions(binary: &mut BinaryData, fields: &[FieldDefinition]) -> Result<()> {
+    serialize_field_count(binary, fields.len())?;
+    for field_definition in fields {
+        serialize_field_definition(binary, field_definition)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `FieldDefinition`.
+///
+/// A `FieldDefinition` gets serialized as follows:
+/// - `FieldDefinition.struct_` as a ULEB128 (index into the `StructHandle` table)
+/// - `StructDefinition.name` as a ULEB128 (index into the `IdentifierPool` table)
+/// - `StructDefinition.signature` a serialized `TypeSignatureToekn`)
+fn serialize_field_definition(
+    binary: &mut BinaryData,
+    field_definition: &FieldDefinition,
+) -> Result<()> {
+    serialize_identifier_index(binary, &field_definition.name)?;
+    serialize_signature_token(binary, &field_definition.signature.0)
+}
+
+fn serialize_field_handle(binary: &mut BinaryData, field_handle: &FieldHandle) -> Result<()> {
+    serialize_struct_def_index(binary, &field_handle.owner)?;
+    serialize_field_offset(binary, field_handle.field)?;
+    Ok(())
+}
+
+fn serialize_field_instantiation(
+    binary: &mut BinaryData,
+    field_inst: &FieldInstantiation,
+) -> Result<()> {
+    serialize_field_handle_index(binary, &field_inst.handle)?;
+    serialize_signature_index(binary, &field_inst.type_parameters)?;
+    Ok(())
+}
+
+/// Serializes a `Vec<StructDefinitionIndex>`.
+fn serialize_acquires(binary: &mut BinaryData, indices: &[StructDefinitionIndex]) -> Result<()> {
+    serialize_acquires_count(binary, indices.len())?;
+    for def_idx in indices {
+        serialize_struct_def_index(binary, def_idx)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `Signature`.
+///
+/// A `Signature` gets serialized as follows the vector of `SignatureToken`s for locals
+fn serialize_signature(binary: &mut BinaryData, signature: &Signature) -> Result<()> {
+    serialize_signature_tokens(binary, &signature.0)
+}
+
+/// Serializes a slice of `SignatureToken`s.
+fn serialize_signature_tokens(binary: &mut BinaryData, tokens: &[SignatureToken]) -> Result<()> {
+    serialize_signature_size(binary, tokens.len())?;
+    for token in tokens {
+        serialize_signature_token(binary, token)?;
+    }
+    Ok(())
+}
+
+fn serialize_signature_token_single_node_impl(
+    binary: &mut BinaryData,
+    token: &SignatureToken,
+) -> Result<()> {
+    match token {
+        SignatureToken::Bool => binary.push(SerializedType::BOOL as u8)?,
+        SignatureToken::U8 => binary.push(SerializedType::U8 as u8)?,
+        SignatureToken::U16 => binary.push(SerializedType::U16 as u8)?,
+        SignatureToken::U32 => binary.push(SerializedType::U32 as u8)?,
+        SignatureToken::U64 => binary.push(SerializedType::U64 as u8)?,
+        SignatureToken::U128 => binary.push(SerializedType::U128 as u8)?,
+        SignatureToken::U256 => binary.push(SerializedType::U256 as u8)?,
+        SignatureToken::Address => binary.push(SerializedType::ADDRESS as u8)?,
+        SignatureToken::Signer => binary.push(SerializedType::SIGNER as u8)?,
+        SignatureToken::Vector(_) => {
+            binary.push(SerializedType::VECTOR as u8)?;
+        }
+        SignatureToken::Struct(idx) => {
+            binary.push(SerializedType::STRUCT as u8)?;
+            serialize_struct_handle_index(binary, idx)?;
+        }
+        SignatureToken::StructInstantiation(idx, type_params) => {
+            binary.push(SerializedType::STRUCT_INST as u8)?;
+            serialize_struct_handle_index(binary, idx)?;
+            serialize_signature_size(binary, type_params.len())?;
+        }
+        SignatureToken::Reference(_) => {
+            binary.push(SerializedType::REFERENCE as u8)?;
+        }
+        SignatureToken::MutableReference(_) => {
+            binary.push(SerializedType::MUTABLE_REFERENCE as u8)?;
+        }
+        SignatureToken::TypeParameter(idx) => {
+            binary.push(SerializedType::TYPE_PARAMETER as u8)?;
+            serialize_type_parameter_index(binary, *idx)?;
+        }
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+pub(crate) fn serialize_signature_token_unchecked(
+    binary: &mut BinaryData,
+    token: &SignatureToken,
+) -> Result<()> {
+    for token in token.preorder_traversal() {
+        serialize_signature_token_single_node_impl(binary, token)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `SignatureToken`.
+///
+/// A `SignatureToken` gets serialized as a variable size blob depending on composition.
+/// Values for types are defined in `SerializedType`.
+pub(crate) fn serialize_signature_token(
+    binary: &mut BinaryData,
+    token: &SignatureToken,
+) -> Result<()> {
+    // Non-recursive implementation to avoid overflowing the stack.
+    for (token, depth) in token.preorder_traversal_with_depth() {
+        if depth > SIGNATURE_TOKEN_DEPTH_MAX {
+            bail!("max recursion depth reached")
+        }
+        serialize_signature_token_single_node_impl(binary, token)?;
+    }
+    Ok(())
+}
+
+fn serialize_ability_set(binary: &mut BinaryData, set: AbilitySet) -> Result<()> {
+    write_as_uleb128(binary, set.into_u8(), AbilitySet::ALL.into_u8())?;
+    Ok(())
+}
+
+fn serialize_ability_sets(binary: &mut BinaryData, sets: &[AbilitySet]) -> Result<()> {
+    serialize_type_parameter_count(binary, sets.len())?;
+    for set in sets {
+        serialize_ability_set(binary, *set)?;
+    }
+    Ok(())
+}
+
+/// Serializes a `CodeUnit`.
+///
+/// A `CodeUnit` is serialized as the code field of a `FunctionDefinition`.
+/// A `CodeUnit` gets serialized as follows:
+/// - `CodeUnit.max_stack_size` as a ULEB128
+/// - `CodeUnit.locals` as a ULEB128 (index into the `LocalSignaturePool`)
+/// - `CodeUnit.code` as variable size byte stream for the bytecode
+fn serialize_code_unit(major_version: u32, binary: &mut BinaryData, code: &CodeUnit) -> Result<()> {
+    serialize_signature_index(binary, &code.locals)?;
+    serialize_code(major_version, binary, &code.code)
+}
+
+/// Serializes a single `Bytecode` instruction.
+fn serialize_instruction_inner(
+    major_version: u32,
+    binary: &mut BinaryData,
+    opcode: &Bytecode,
+) -> Result<()> {
+    match opcode {
+        Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
+        | Bytecode::LdU256(_)
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU256
+            if (major_version < VERSION_6) =>
+        {
+            return Err(anyhow!(
+                "Loading or casting u16, u32, u256 integers not supported in bytecode version {}",
+                major_version
+            ));
+        }
+        _ => (),
+    };
+
+    let res = match opcode {
+        Bytecode::FreezeRef => binary.push(Opcodes::FREEZE_REF as u8),
+        Bytecode::Pop => binary.push(Opcodes::POP as u8),
+        Bytecode::Ret => binary.push(Opcodes::RET as u8),
+        Bytecode::BrTrue(code_offset) => {
+            binary.push(Opcodes::BR_TRUE as u8)?;
+            serialize_bytecode_offset(binary, *code_offset)
+        }
+        Bytecode::BrFalse(code_offset) => {
+            binary.push(Opcodes::BR_FALSE as u8)?;
+            serialize_bytecode_offset(binary, *code_offset)
+        }
+        Bytecode::Branch(code_offset) => {
+            binary.push(Opcodes::BRANCH as u8)?;
+            serialize_bytecode_offset(binary, *code_offset)
+        }
+        Bytecode::LdU8(value) => {
+            binary.push(Opcodes::LD_U8 as u8)?;
+            binary.push(*value)
+        }
+        Bytecode::LdU64(value) => {
+            binary.push(Opcodes::LD_U64 as u8)?;
+            write_u64(binary, *value)
+        }
+        Bytecode::LdU128(value) => {
+            binary.push(Opcodes::LD_U128 as u8)?;
+            write_u128(binary, *value)
+        }
+        Bytecode::CastU8 => binary.push(Opcodes::CAST_U8 as u8),
+        Bytecode::CastU64 => binary.push(Opcodes::CAST_U64 as u8),
+        Bytecode::CastU128 => binary.push(Opcodes::CAST_U128 as u8),
+        Bytecode::LdConst(const_idx) => {
+            binary.push(Opcodes::LD_CONST as u8)?;
+            serialize_constant_pool_index(binary, const_idx)
+        }
+        Bytecode::LdTrue => binary.push(Opcodes::LD_TRUE as u8),
+        Bytecode::LdFalse => binary.push(Opcodes::LD_FALSE as u8),
+        Bytecode::CopyLoc(local_idx) => {
+            binary.push(Opcodes::COPY_LOC as u8)?;
+            serialize_local_index(binary, *local_idx)
+        }
+        Bytecode::MoveLoc(local_idx) => {
+            binary.push(Opcodes::MOVE_LOC as u8)?;
+            serialize_local_index(binary, *local_idx)
+        }
+        Bytecode::StLoc(local_idx) => {
+            binary.push(Opcodes::ST_LOC as u8)?;
+            serialize_local_index(binary, *local_idx)
+        }
+        Bytecode::MutBorrowLoc(local_idx) => {
+            binary.push(Opcodes::MUT_BORROW_LOC as u8)?;
+            serialize_local_index(binary, *local_idx)
+        }
+        Bytecode::ImmBorrowLoc(local_idx) => {
+            binary.push(Opcodes::IMM_BORROW_LOC as u8)?;
+            serialize_local_index(binary, *local_idx)
+        }
+        Bytecode::MutBorrowField(field_idx) => {
+            binary.push(Opcodes::MUT_BORROW_FIELD as u8)?;
+            serialize_field_handle_index(binary, field_idx)
+        }
+        Bytecode::MutBorrowFieldGeneric(field_idx) => {
+            binary.push(Opcodes::MUT_BORROW_FIELD_GENERIC as u8)?;
+            serialize_field_inst_index(binary, field_idx)
+        }
+        Bytecode::ImmBorrowField(field_idx) => {
+            binary.push(Opcodes::IMM_BORROW_FIELD as u8)?;
+            serialize_field_handle_index(binary, field_idx)
+        }
+        Bytecode::ImmBorrowFieldGeneric(field_idx) => {
+            binary.push(Opcodes::IMM_BORROW_FIELD_GENERIC as u8)?;
+            serialize_field_inst_index(binary, field_idx)
+        }
+        Bytecode::Call(method_idx) => {
+            binary.push(Opcodes::CALL as u8)?;
+            serialize_function_handle_index(binary, method_idx)
+        }
+        Bytecode::Pack(class_idx) => {
+            binary.push(Opcodes::PACK as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::Unpack(class_idx) => {
+            binary.push(Opcodes::UNPACK as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::CallGeneric(method_idx) => {
+            binary.push(Opcodes::CALL_GENERIC as u8)?;
+            serialize_function_inst_index(binary, method_idx)
+        }
+        Bytecode::PackGeneric(class_idx) => {
+            binary.push(Opcodes::PACK_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::UnpackGeneric(class_idx) => {
+            binary.push(Opcodes::UNPACK_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::ReadRef => binary.push(Opcodes::READ_REF as u8),
+        Bytecode::WriteRef => binary.push(Opcodes::WRITE_REF as u8),
+        Bytecode::Add => binary.push(Opcodes::ADD as u8),
+        Bytecode::Sub => binary.push(Opcodes::SUB as u8),
+        Bytecode::Mul => binary.push(Opcodes::MUL as u8),
+        Bytecode::Mod => binary.push(Opcodes::MOD as u8),
+        Bytecode::Div => binary.push(Opcodes::DIV as u8),
+        Bytecode::BitOr => binary.push(Opcodes::BIT_OR as u8),
+        Bytecode::BitAnd => binary.push(Opcodes::BIT_AND as u8),
+        Bytecode::Xor => binary.push(Opcodes::XOR as u8),
+        Bytecode::Shl => binary.push(Opcodes::SHL as u8),
+        Bytecode::Shr => binary.push(Opcodes::SHR as u8),
+        Bytecode::Or => binary.push(Opcodes::OR as u8),
+        Bytecode::And => binary.push(Opcodes::AND as u8),
+        Bytecode::Not => binary.push(Opcodes::NOT as u8),
+        Bytecode::Eq => binary.push(Opcodes::EQ as u8),
+        Bytecode::Neq => binary.push(Opcodes::NEQ as u8),
+        Bytecode::Lt => binary.push(Opcodes::LT as u8),
+        Bytecode::Gt => binary.push(Opcodes::GT as u8),
+        Bytecode::Le => binary.push(Opcodes::LE as u8),
+        Bytecode::Ge => binary.push(Opcodes::GE as u8),
+        Bytecode::Abort => binary.push(Opcodes::ABORT as u8),
+        Bytecode::Nop => binary.push(Opcodes::NOP as u8),
+        Bytecode::Exists(class_idx) => {
+            binary.push(Opcodes::EXISTS as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::MutBorrowGlobal(class_idx) => {
+            binary.push(Opcodes::MUT_BORROW_GLOBAL as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::ImmBorrowGlobal(class_idx) => {
+            binary.push(Opcodes::IMM_BORROW_GLOBAL as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::MoveFrom(class_idx) => {
+            binary.push(Opcodes::MOVE_FROM as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::MoveTo(class_idx) => {
+            binary.push(Opcodes::MOVE_TO as u8)?;
+            serialize_struct_def_index(binary, class_idx)
+        }
+        Bytecode::ExistsGeneric(class_idx) => {
+            binary.push(Opcodes::EXISTS_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::MutBorrowGlobalGeneric(class_idx) => {
+            binary.push(Opcodes::MUT_BORROW_GLOBAL_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::ImmBorrowGlobalGeneric(class_idx) => {
+            binary.push(Opcodes::IMM_BORROW_GLOBAL_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::MoveFromGeneric(class_idx) => {
+            binary.push(Opcodes::MOVE_FROM_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::MoveToGeneric(class_idx) => {
+            binary.push(Opcodes::MOVE_TO_GENERIC as u8)?;
+            serialize_struct_def_inst_index(binary, class_idx)
+        }
+        Bytecode::VecPack(sig_idx, num) => {
+            binary.push(Opcodes::VEC_PACK as u8)?;
+            serialize_signature_index(binary, sig_idx)?;
+            write_u64(binary, *num)
+        }
+        Bytecode::VecLen(sig_idx) => {
+            binary.push(Opcodes::VEC_LEN as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::VecImmBorrow(sig_idx) => {
+            binary.push(Opcodes::VEC_IMM_BORROW as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::VecMutBorrow(sig_idx) => {
+            binary.push(Opcodes::VEC_MUT_BORROW as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::VecPushBack(sig_idx) => {
+            binary.push(Opcodes::VEC_PUSH_BACK as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::VecPopBack(sig_idx) => {
+            binary.push(Opcodes::VEC_POP_BACK as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::VecUnpack(sig_idx, num) => {
+            binary.push(Opcodes::VEC_UNPACK as u8)?;
+            serialize_signature_index(binary, sig_idx)?;
+            write_u64(binary, *num)
+        }
+        Bytecode::VecSwap(sig_idx) => {
+            binary.push(Opcodes::VEC_SWAP as u8)?;
+            serialize_signature_index(binary, sig_idx)
+        }
+        Bytecode::LdU16(value) => {
+            binary.push(Opcodes::LD_U16 as u8)?;
+            write_u16(binary, *value)
+        }
+        Bytecode::LdU32(value) => {
+            binary.push(Opcodes::LD_U32 as u8)?;
+            write_u32(binary, *value)
+        }
+        Bytecode::LdU256(value) => {
+            binary.push(Opcodes::LD_U256 as u8)?;
+            write_u256(binary, *value)
+        }
+        Bytecode::CastU16 => binary.push(Opcodes::CAST_U16 as u8),
+        Bytecode::CastU32 => binary.push(Opcodes::CAST_U32 as u8),
+        Bytecode::CastU256 => binary.push(Opcodes::CAST_U256 as u8),
+    };
+    res?;
+    Ok(())
+}
+
+/// Serializes a `Bytecode` stream. Serialization of the function body.
+fn serialize_code(major_version: u32, binary: &mut BinaryData, code: &[Bytecode]) -> Result<()> {
+    serialize_bytecode_count(binary, code.len())?;
+    for opcode in code {
+        serialize_instruction_inner(major_version, binary, opcode)?;
+    }
+    Ok(())
+}
+
+/// Compute the table size with a check for underflow
+fn checked_calculate_table_size(binary: &mut BinaryData, start: u32) -> Result<u32> {
+    let offset = check_index_in_binary(binary.len())?;
+    assert!(offset >= start, "table start must be before end");
+    Ok(offset - start)
+}
+
+impl CommonSerializer {
+    pub fn new(major_version: u32) -> CommonSerializer {
+        CommonSerializer {
+            major_version,
+            table_count: 0,
+            module_handles: (0, 0),
+            struct_handles: (0, 0),
+            function_handles: (0, 0),
+            function_instantiations: (0, 0),
+            signatures: (0, 0),
+            identifiers: (0, 0),
+            address_identifiers: (0, 0),
+            constant_pool: (0, 0),
+            metadata: (0, 0),
+        }
+    }
+
+    fn serialize_header(&mut self, binary: &mut BinaryData) -> Result<()> {
+        serialize_magic(binary)?;
+        write_u32(binary, self.major_version)?;
+        Ok(())
+    }
+
+    /// Common binary header serialization.
+    fn serialize_table_indices(&mut self, binary: &mut BinaryData) -> Result<()> {
+        serialize_table_count(binary, self.table_count)?;
+
+        serialize_table_index(
+            binary,
+            TableType::MODULE_HANDLES,
+            self.module_handles.0,
+            self.module_handles.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::STRUCT_HANDLES,
+            self.struct_handles.0,
+            self.struct_handles.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FUNCTION_HANDLES,
+            self.function_handles.0,
+            self.function_handles.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FUNCTION_INST,
+            self.function_instantiations.0,
+            self.function_instantiations.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::SIGNATURES,
+            self.signatures.0,
+            self.signatures.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::IDENTIFIERS,
+            self.identifiers.0,
+            self.identifiers.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::ADDRESS_IDENTIFIERS,
+            self.address_identifiers.0,
+            self.address_identifiers.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::CONSTANT_POOL,
+            self.constant_pool.0,
+            self.constant_pool.1,
+        )?;
+        if self.major_version >= VERSION_5 {
+            // Metadata was not introduced before v5, so do not generate it for lower versions.
+            serialize_table_index(
+                binary,
+                TableType::METADATA,
+                self.metadata.0,
+                self.metadata.1,
+            )?;
+        }
+        Ok(())
+    }
+
+    fn serialize_common_tables<T: CommonTables>(
+        &mut self,
+        binary: &mut BinaryData,
+        tables: &T,
+    ) -> Result<()> {
+        debug_assert!(self.table_count == 0);
+        self.serialize_module_handles(binary, tables.get_module_handles())?;
+        self.serialize_struct_handles(binary, tables.get_struct_handles())?;
+        self.serialize_function_handles(binary, tables.get_function_handles())?;
+        debug_assert!(self.table_count < 6);
+        self.serialize_function_instantiations(binary, tables.get_function_instantiations())?;
+        self.serialize_signatures(binary, tables.get_signatures())?;
+        self.serialize_identifiers(binary, tables.get_identifiers())?;
+        self.serialize_address_identifiers(binary, tables.get_address_identifiers())?;
+        self.serialize_constants(binary, tables.get_constant_pool())?;
+        if self.major_version >= VERSION_5 {
+            self.serialize_metadata(binary, tables.get_metadata())?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `ModuleHandle` table.
+    fn serialize_module_handles(
+        &mut self,
+        binary: &mut BinaryData,
+        module_handles: &[ModuleHandle],
+    ) -> Result<()> {
+        if !module_handles.is_empty() {
+            self.table_count += 1;
+            self.module_handles.0 = check_index_in_binary(binary.len())?;
+            for module_handle in module_handles {
+                serialize_module_handle(binary, module_handle)?;
+            }
+            self.module_handles.1 = checked_calculate_table_size(binary, self.module_handles.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `StructHandle` table.
+    fn serialize_struct_handles(
+        &mut self,
+        binary: &mut BinaryData,
+        struct_handles: &[StructHandle],
+    ) -> Result<()> {
+        if !struct_handles.is_empty() {
+            self.table_count += 1;
+            self.struct_handles.0 = check_index_in_binary(binary.len())?;
+            for struct_handle in struct_handles {
+                serialize_struct_handle(binary, struct_handle)?;
+            }
+            self.struct_handles.1 = checked_calculate_table_size(binary, self.struct_handles.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `FunctionHandle` table.
+    fn serialize_function_handles(
+        &mut self,
+        binary: &mut BinaryData,
+        function_handles: &[FunctionHandle],
+    ) -> Result<()> {
+        if !function_handles.is_empty() {
+            self.table_count += 1;
+            self.function_handles.0 = check_index_in_binary(binary.len())?;
+            for function_handle in function_handles {
+                serialize_function_handle(binary, function_handle)?;
+            }
+            self.function_handles.1 =
+                checked_calculate_table_size(binary, self.function_handles.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `FunctionInstantiation` table.
+    fn serialize_function_instantiations(
+        &mut self,
+        binary: &mut BinaryData,
+        function_instantiations: &[FunctionInstantiation],
+    ) -> Result<()> {
+        if !function_instantiations.is_empty() {
+            self.table_count += 1;
+            self.function_instantiations.0 = check_index_in_binary(binary.len())?;
+            for function_instantiation in function_instantiations {
+                serialize_function_instantiation(binary, function_instantiation)?;
+            }
+            self.function_instantiations.1 =
+                checked_calculate_table_size(binary, self.function_instantiations.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `Identifiers`.
+    fn serialize_identifiers(
+        &mut self,
+        binary: &mut BinaryData,
+        identifiers: &[Identifier],
+    ) -> Result<()> {
+        if !identifiers.is_empty() {
+            self.table_count += 1;
+            self.identifiers.0 = check_index_in_binary(binary.len())?;
+            for identifier in identifiers {
+                // User strings and identifiers use the same serialization.
+                serialize_identifier(binary, identifier.as_str())?;
+            }
+            self.identifiers.1 = checked_calculate_table_size(binary, self.identifiers.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `AddressIdentifiers`.
+    fn serialize_address_identifiers(
+        &mut self,
+        binary: &mut BinaryData,
+        addresses: &[AccountAddress],
+    ) -> Result<()> {
+        if !addresses.is_empty() {
+            self.table_count += 1;
+            self.address_identifiers.0 = check_index_in_binary(binary.len())?;
+            for address in addresses {
+                serialize_address(binary, address)?;
+            }
+            self.address_identifiers.1 =
+                checked_calculate_table_size(binary, self.address_identifiers.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `ConstantPool`.
+    fn serialize_constants(
+        &mut self,
+        binary: &mut BinaryData,
+        constants: &[Constant],
+    ) -> Result<()> {
+        if !constants.is_empty() {
+            self.table_count += 1;
+            self.constant_pool.0 = check_index_in_binary(binary.len())?;
+            for constant in constants {
+                serialize_constant(binary, constant)?;
+            }
+            self.constant_pool.1 = checked_calculate_table_size(binary, self.constant_pool.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes metadata.
+    fn serialize_metadata(&mut self, binary: &mut BinaryData, metadata: &[Metadata]) -> Result<()> {
+        if !metadata.is_empty() {
+            self.table_count += 1;
+            self.metadata.0 = check_index_in_binary(binary.len())?;
+            for entry in metadata {
+                serialize_metadata_entry(binary, entry)?;
+            }
+            self.metadata.1 = checked_calculate_table_size(binary, self.metadata.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `SignaturePool` table.
+    fn serialize_signatures(
+        &mut self,
+        binary: &mut BinaryData,
+        signatures: &[Signature],
+    ) -> Result<()> {
+        if !signatures.is_empty() {
+            self.table_count += 1;
+            self.signatures.0 = check_index_in_binary(binary.len())?;
+            for signature in signatures {
+                serialize_signature(binary, signature)?;
+            }
+            self.signatures.1 = checked_calculate_table_size(binary, self.signatures.0)?;
+        }
+        Ok(())
+    }
+
+    pub fn major_version(&self) -> u32 {
+        self.major_version
+    }
+}
+
+impl ModuleSerializer {
+    fn new(major_version: u32) -> ModuleSerializer {
+        ModuleSerializer {
+            common: CommonSerializer::new(major_version),
+            struct_defs: (0, 0),
+            struct_def_instantiations: (0, 0),
+            function_defs: (0, 0),
+            field_handles: (0, 0),
+            field_instantiations: (0, 0),
+            friend_decls: (0, 0),
+        }
+    }
+
+    fn serialize_tables(&mut self, binary: &mut BinaryData, module: &CompiledModule) -> Result<()> {
+        self.common.serialize_common_tables(binary, module)?;
+        self.serialize_struct_definitions(binary, &module.struct_defs)?;
+        self.serialize_struct_def_instantiations(binary, &module.struct_def_instantiations)?;
+        self.serialize_function_definitions(binary, &module.function_defs)?;
+        self.serialize_field_handles(binary, &module.field_handles)?;
+        self.serialize_field_instantiations(binary, &module.field_instantiations)?;
+        self.serialize_friend_declarations(binary, &module.friend_decls)
+    }
+
+    fn serialize_table_indices(&mut self, binary: &mut BinaryData) -> Result<()> {
+        self.common.serialize_table_indices(binary)?;
+        serialize_table_index(
+            binary,
+            TableType::STRUCT_DEFS,
+            self.struct_defs.0,
+            self.struct_defs.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::STRUCT_DEF_INST,
+            self.struct_def_instantiations.0,
+            self.struct_def_instantiations.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FUNCTION_DEFS,
+            self.function_defs.0,
+            self.function_defs.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FIELD_HANDLE,
+            self.field_handles.0,
+            self.field_handles.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FIELD_INST,
+            self.field_instantiations.0,
+            self.field_instantiations.1,
+        )?;
+        serialize_table_index(
+            binary,
+            TableType::FRIEND_DECLS,
+            self.friend_decls.0,
+            self.friend_decls.1,
+        )?;
+        Ok(())
+    }
+
+    /// Serializes `StructDefinition` table.
+    fn serialize_struct_definitions(
+        &mut self,
+        binary: &mut BinaryData,
+        struct_definitions: &[StructDefinition],
+    ) -> Result<()> {
+        if !struct_definitions.is_empty() {
+            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
+            self.struct_defs.0 = check_index_in_binary(binary.len())?;
+            for struct_definition in struct_definitions {
+                serialize_struct_definition(binary, struct_definition)?;
+            }
+            self.struct_defs.1 = checked_calculate_table_size(binary, self.struct_defs.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `StructInstantiation` table.
+    fn serialize_struct_def_instantiations(
+        &mut self,
+        binary: &mut BinaryData,
+        struct_def_instantiations: &[StructDefInstantiation],
+    ) -> Result<()> {
+        if !struct_def_instantiations.is_empty() {
+            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
+            self.struct_def_instantiations.0 = check_index_in_binary(binary.len())?;
+            for struct_instantiation in struct_def_instantiations {
+                serialize_struct_def_instantiation(binary, struct_instantiation)?;
+            }
+            self.struct_def_instantiations.1 =
+                checked_calculate_table_size(binary, self.struct_def_instantiations.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes `FunctionDefinition` table.
+    fn serialize_field_handles(
+        &mut self,
+        binary: &mut BinaryData,
+        field_handles: &[FieldHandle],
+    ) -> Result<()> {
+        if !field_handles.is_empty() {
+            self.common.table_count += 1;
+            self.field_handles.0 = check_index_in_binary(binary.len())?;
+            for field_handle in field_handles {
+                serialize_field_handle(binary, field_handle)?;
+            }
+            self.field_handles.1 = checked_calculate_table_size(binary, self.field_handles.0)?;
+        }
+        Ok(())
+    }
+
+    fn serialize_field_instantiations(
+        &mut self,
+        binary: &mut BinaryData,
+        field_instantiations: &[FieldInstantiation],
+    ) -> Result<()> {
+        if !field_instantiations.is_empty() {
+            self.common.table_count += 1;
+            self.field_instantiations.0 = check_index_in_binary(binary.len())?;
+            for field_instantiation in field_instantiations {
+                serialize_field_instantiation(binary, field_instantiation)?;
+            }
+            self.field_instantiations.1 =
+                checked_calculate_table_size(binary, self.field_instantiations.0)?;
+        }
+        Ok(())
+    }
+
+    fn serialize_function_definitions(
+        &mut self,
+        binary: &mut BinaryData,
+        function_definitions: &[FunctionDefinition],
+    ) -> Result<()> {
+        if !function_definitions.is_empty() {
+            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
+            self.function_defs.0 = check_index_in_binary(binary.len())?;
+            for function_definition in function_definitions {
+                self.serialize_function_definition(binary, function_definition)?;
+            }
+            self.function_defs.1 = checked_calculate_table_size(binary, self.function_defs.0)?;
+        }
+        Ok(())
+    }
+
+    /// Serializes a `FunctionDefinition`.
+    ///
+    /// A `FunctionDefinition` gets serialized as follows:
+    /// - `FunctionDefinition.function` as a ULEB128 (index into the `FunctionHandle` table)
+    /// - `FunctionDefinition.visibility` 1 byte for the visibility modifier of the function
+    /// - `FunctionDefinition.flags` 1 byte for the flags of the function
+    ///   The flags now has only one bit used:
+    ///   - bit 0x2: native indicator, indicates whether the function is a native function.
+    /// - `FunctionDefinition.code` a variable size stream for the `CodeUnit`
+    fn serialize_function_definition(
+        &mut self,
+        binary: &mut BinaryData,
+        function_definition: &FunctionDefinition,
+    ) -> Result<()> {
+        serialize_function_handle_index(binary, &function_definition.function)?;
+
+        let mut flags = 0;
+        if self.common.major_version < VERSION_5 {
+            let visibility = if function_definition.visibility == Visibility::Public
+                && function_definition.is_entry
+            {
+                Visibility::DEPRECATED_SCRIPT
+            } else {
+                function_definition.visibility as u8
+            };
+            binary.push(visibility)?;
+        } else {
+            binary.push(function_definition.visibility as u8)?;
+            if function_definition.is_entry {
+                flags |= FunctionDefinition::ENTRY;
+            }
+        }
+        if function_definition.is_native() {
+            flags |= FunctionDefinition::NATIVE
+        }
+        binary.push(flags)?;
+
+        serialize_acquires(binary, &function_definition.acquires_global_resources)?;
+        if let Some(code) = &function_definition.code {
+            serialize_code_unit(self.common.major_version(), binary, code)?;
+        }
+        Ok(())
+    }
+
+    fn serialize_friend_declarations(
+        &mut self,
+        binary: &mut BinaryData,
+        friend_declarations: &[ModuleHandle],
+    ) -> Result<()> {
+        if !friend_declarations.is_empty() {
+            self.common.table_count = self.common.table_count.wrapping_add(1); // the count will bound to a small number
+            self.friend_decls.0 = check_index_in_binary(binary.len())?;
+            for module in friend_declarations {
+                serialize_module_handle(binary, module)?;
+            }
+            self.friend_decls.1 = checked_calculate_table_size(binary, self.friend_decls.0)?;
+        }
+        Ok(())
+    }
+}
+
+impl ScriptSerializer {
+    fn new(major_version: u32) -> ScriptSerializer {
+        ScriptSerializer {
+            common: CommonSerializer::new(major_version),
+        }
+    }
+
+    /// Serializes the main function.
+    fn serialize_main(&mut self, binary: &mut BinaryData, script: &CompiledScript) -> Result<()> {
+        serialize_ability_sets(binary, &script.type_parameters)?;
+        serialize_signature_index(binary, &script.parameters)?;
+        serialize_code_unit(self.common.major_version(), binary, &script.code)?;
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/binary_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/binary_tests.rs
new file mode 100644
index 000000000..1d7f32537
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/binary_tests.rs
@@ -0,0 +1,57 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{file_format::Bytecode, file_format_common::*};
+use proptest::prelude::*;
+
+#[test]
+fn binary_len() {
+    let mut binary_data = BinaryData::new();
+    for _ in 0..100 {
+        binary_data.push(1).unwrap();
+    }
+    assert_eq!(binary_data.len(), 100);
+}
+
+#[test]
+fn test_max_number_of_bytecode() {
+    let mut nops = vec![];
+    for _ in 0..u16::MAX - 1 {
+        nops.push(Bytecode::Nop);
+    }
+    nops.push(Bytecode::Branch(0));
+
+    let result = Bytecode::get_successors(u16::MAX - 1, &nops);
+    assert_eq!(result, vec![0]);
+}
+
+proptest! {
+    #[test]
+    fn vec_to_binary(vec in any::<Vec<u8>>()) {
+        let binary_data = BinaryData::from(vec.clone());
+        let vec2 = binary_data.into_inner();
+        assert_eq!(vec.len(), vec2.len());
+    }
+}
+
+proptest! {
+    #[test]
+    fn binary_push(item in any::<u8>()) {
+        let mut binary_data = BinaryData::new();
+        binary_data.push(item).unwrap();
+        assert_eq!(binary_data.into_inner()[0], item);
+    }
+}
+
+proptest! {
+    #[test]
+    fn binary_extend(vec in any::<Vec<u8>>()) {
+        let mut binary_data = BinaryData::new();
+        binary_data.extend(&vec).unwrap();
+        assert_eq!(binary_data.len(), vec.len());
+        for (index, item) in vec.iter().enumerate() {
+            assert_eq!(*item, binary_data.as_inner()[index]);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/compatibility_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/compatibility_tests.rs
new file mode 100644
index 000000000..2f3af751f
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/compatibility_tests.rs
@@ -0,0 +1,845 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, convert::TryFrom};
+
+use crate::{
+    compatibility::{Compatibility, InclusionCheck},
+    file_format::*,
+    normalized::{self, Type},
+};
+use move_core_types::{account_address::AccountAddress, ident_str, identifier::Identifier};
+
+// A way to permute pools, and index into them still.
+pub struct Permutation {
+    permutation: Vec<u16>,
+    inverse: Vec<u16>,
+}
+
+impl Permutation {
+    pub fn new(permutation: Vec<u16>) -> Self {
+        let inverse: Vec<_> = (0..permutation.len() as u16)
+            .map(|i| permutation.iter().position(|p| *p == i).unwrap() as u16)
+            .collect();
+        Self {
+            permutation,
+            inverse,
+        }
+    }
+
+    pub fn pool<T: Clone>(&self, pool: Vec<T>) -> Vec<T> {
+        (0..pool.len() as u16)
+            .map(|i| pool[*self.permutation.get(i as usize).unwrap_or(&i) as usize].clone())
+            .collect()
+    }
+
+    pub fn permute(&self, i: u16) -> u16 {
+        // If we don't have it in the permutation default to the identity
+        *self.inverse.get(i as usize).unwrap_or(&i)
+    }
+}
+
+fn mk_module(vis: u8) -> normalized::Module {
+    mk_module_entry(vis, false)
+}
+
+fn max_version(mut module: normalized::Module) -> normalized::Module {
+    module.file_format_version = crate::file_format_common::VERSION_MAX;
+    module
+}
+
+fn mk_module_entry(vis: u8, is_entry: bool) -> normalized::Module {
+    let (visibility, is_entry) = if vis == Visibility::DEPRECATED_SCRIPT {
+        (Visibility::Public, true)
+    } else {
+        (Visibility::try_from(vis).unwrap(), is_entry)
+    };
+    let m = CompiledModule {
+        version: crate::file_format_common::VERSION_4,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("M").unwrap(),  // Module name
+            Identifier::new("fn").unwrap(), // Function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+        ],
+        function_defs: vec![
+            // public(script) fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility,
+                is_entry,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![
+                        Bytecode::LdConst(ConstantPoolIndex(0)),
+                        Bytecode::LdConst(ConstantPoolIndex(1)),
+                        Bytecode::LdConst(ConstantPoolIndex(2)),
+                        Bytecode::Ret,
+                    ],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: vec![
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![0],
+            },
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![1],
+            },
+            Constant {
+                type_: SignatureToken::Bool,
+                data: vec![1],
+            },
+        ],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    normalized::Module::new(&m)
+}
+
+fn mk_module_plus_code(vis: u8, code: Vec<Bytecode>) -> normalized::Module {
+    mk_module_plus_code_perm(vis, code, Permutation::new(vec![]))
+}
+
+fn mk_module_plus_code_perm(vis: u8, code: Vec<Bytecode>, p: Permutation) -> normalized::Module {
+    let (visibility, is_entry) = if vis == Visibility::DEPRECATED_SCRIPT {
+        (Visibility::Public, true)
+    } else {
+        (Visibility::try_from(vis).unwrap(), false)
+    };
+    let m = CompiledModule {
+        version: crate::file_format_common::VERSION_4,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(p.permute(0)),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: p.pool(vec![
+            Identifier::new("M").unwrap(),   // Module name
+            Identifier::new("fn").unwrap(),  // Function name
+            Identifier::new("fn1").unwrap(), // Function name
+        ]),
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: p.pool(vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(1)),
+                parameters: SignatureIndex(p.permute(0)),
+                return_: SignatureIndex(p.permute(0)),
+                type_parameters: vec![],
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(2)),
+                parameters: SignatureIndex(p.permute(1)),
+                return_: SignatureIndex(p.permute(0)),
+                type_parameters: vec![],
+            },
+        ]),
+        function_defs: p.pool(vec![
+            // public(script) fun fn1(u64) { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(p.permute(1)),
+                visibility,
+                is_entry,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(p.permute(0)),
+                    code,
+                }),
+            },
+            // public(script) fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(p.permute(0)),
+                visibility,
+                is_entry,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(p.permute(0)),
+                    code: vec![
+                        Bytecode::LdConst(ConstantPoolIndex(p.permute(0))),
+                        Bytecode::LdConst(ConstantPoolIndex(p.permute(1))),
+                        Bytecode::LdConst(ConstantPoolIndex(p.permute(2))),
+                        Bytecode::Ret,
+                    ],
+                }),
+            },
+        ]),
+        signatures: p.pool(vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ]),
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: p.pool(vec![
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![0],
+            },
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![1],
+            },
+            Constant {
+                type_: SignatureToken::Bool,
+                data: vec![1],
+            },
+        ]),
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    normalized::Module::new(&m)
+}
+
+fn mk_module_plus(vis: u8) -> normalized::Module {
+    mk_module_plus_code(vis, vec![Bytecode::Ret])
+}
+
+fn mk_module_plus_perm(vis: u8, permutation: Permutation) -> normalized::Module {
+    mk_module_plus_code_perm(vis, vec![Bytecode::Ret], permutation)
+}
+
+fn make_complex_module_perm(p: Permutation) -> normalized::Module {
+    let m = CompiledModule {
+        version: crate::file_format_common::VERSION_MAX,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(p.permute(0)),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: p.pool(vec![
+            Identifier::new("M").unwrap(),       // Module name
+            Identifier::new("S").unwrap(),       // Struct name
+            Identifier::new("GS").unwrap(),      // Generic struct name
+            Identifier::new("R").unwrap(),       // Resource name
+            Identifier::new("GR").unwrap(),      // Generic resource name
+            Identifier::new("f").unwrap(),       // Field name
+            Identifier::new("fn").unwrap(),      // Function name
+            Identifier::new("g_fn").unwrap(),    // Generic function name
+            Identifier::new("test_fn").unwrap(), // Test function name
+        ]),
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        struct_handles: p.pool(vec![
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(1)),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(2)),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(3)),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(4)),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+        ]),
+        struct_defs: p.pool(vec![
+            // struct S { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(p.permute(0)),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(p.permute(5)),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GS<T> { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(p.permute(1)),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(p.permute(5)),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+            // struct R has key { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(p.permute(2)),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(p.permute(5)),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GR<T> has key { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(p.permute(3)),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(p.permute(5)),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+        ]),
+        function_handles: p.pool(vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(6)),
+                parameters: SignatureIndex(p.permute(0)),
+                return_: SignatureIndex(p.permute(0)),
+                type_parameters: vec![],
+            },
+            // fun g_fn<T: key>(): u64
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(7)),
+                parameters: SignatureIndex(p.permute(0)),
+                return_: SignatureIndex(p.permute(2)),
+                type_parameters: vec![AbilitySet::EMPTY | Ability::Key],
+            },
+            // fun test_fn(Sender)
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(p.permute(8)),
+                parameters: SignatureIndex(p.permute(1)),
+                return_: SignatureIndex(p.permute(0)),
+                type_parameters: vec![],
+            },
+        ]),
+        function_defs: p.pool(vec![
+            // public fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(p.permute(0)),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(p.permute(0)),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // fun g_fn<T>() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(p.permute(1)),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(p.permute(0)),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(p.permute(2)),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(p.permute(0)),
+                    code: vec![],
+                }),
+            },
+        ]),
+        signatures: p.pool(vec![
+            Signature(vec![]),                        // void
+            Signature(vec![SignatureToken::Address]), // address
+            Signature(vec![SignatureToken::U64]),     // u64
+        ]),
+        constant_pool: p.pool(vec![
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![0],
+            },
+            Constant {
+                type_: SignatureToken::U8,
+                data: vec![1],
+            },
+            Constant {
+                type_: SignatureToken::Bool,
+                data: vec![1],
+            },
+            // an address
+            Constant {
+                type_: SignatureToken::Address,
+                data: AccountAddress::random().to_vec(),
+            },
+        ]),
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    normalized::Module::new(&m)
+}
+
+#[test]
+fn deprecated_unchanged_script_visibility() {
+    let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
+    assert!(Compatibility::full_check()
+        .check(&script_module, &script_module)
+        .is_ok(),);
+}
+
+#[test]
+fn deprecated_remove_script_visibility() {
+    let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
+    // script -> private, not allowed
+    let private_module = mk_module(Visibility::Private as u8);
+    assert!(Compatibility::full_check()
+        .check(&script_module, &private_module)
+        .is_err());
+    // script -> public, not allowed
+    let public_module = mk_module(Visibility::Public as u8);
+    assert!(Compatibility::full_check()
+        .check(&script_module, &public_module)
+        .is_err());
+    // script -> friend, not allowed
+    let friend_module = mk_module(Visibility::Friend as u8);
+    assert!(Compatibility::full_check()
+        .check(&script_module, &friend_module)
+        .is_err());
+}
+
+#[test]
+fn deprecated_add_script_visibility() {
+    let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
+    // private -> script, allowed
+    let private_module = mk_module(Visibility::Private as u8);
+    assert!(Compatibility::full_check()
+        .check(&private_module, &script_module)
+        .is_ok());
+    // public -> script, not allowed
+    let public_module = mk_module(Visibility::Public as u8);
+    assert!(Compatibility::full_check()
+        .check(&public_module, &script_module)
+        .is_err());
+    // friend -> script, not allowed
+    let friend_module = mk_module(Visibility::Friend as u8);
+    assert!(Compatibility::full_check()
+        .check(&friend_module, &script_module)
+        .is_err());
+}
+
+#[test]
+fn private_entry_to_public_entry_allowed() {
+    let private_module = max_version(mk_module_entry(Visibility::Private as u8, true));
+    let public_module = max_version(mk_module_entry(Visibility::Public as u8, true));
+    assert!(Compatibility::full_check()
+        .check(&private_module, &public_module)
+        .is_ok());
+
+    assert!(Compatibility::full_check()
+        .check(&public_module, &private_module)
+        .is_err());
+}
+
+#[test]
+fn public_loses_entry() {
+    let public_entry = max_version(mk_module_entry(Visibility::Public as u8, true));
+    let public = max_version(mk_module_entry(Visibility::Public as u8, false));
+    assert!(Compatibility::full_check()
+        .check(&public, &public_entry)
+        .is_ok());
+
+    assert!(Compatibility::full_check()
+        .check(&public_entry, &public)
+        .is_err());
+}
+
+#[test]
+fn private_entry_signature_change_allowed() {
+    // Create a private entry function
+    let module = max_version(mk_module_entry(Visibility::Private as u8, true));
+    let mut updated_module = module.clone();
+    // Update the signature of the entry fun to now take a u64 argument.
+    updated_module
+        .functions
+        .get_mut(ident_str!("fn"))
+        .unwrap()
+        .parameters = vec![Type::U64];
+
+    // allow updating signatures of private entry functions
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_ok());
+
+    // allow updating signatures of private entry functions
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&updated_module, &module)
+    .is_ok());
+
+    // disallow updating signatures of private entry functions
+    assert!(Compatibility::full_check()
+        .check(&module, &updated_module)
+        .is_err());
+}
+
+#[test]
+fn entry_fun_compat_tests() {
+    // fun
+    let private_fun = max_version(mk_module_entry(Visibility::Private as u8, false));
+    // entry fun
+    let entry_fun = max_version(mk_module_entry(Visibility::Private as u8, true));
+    // public(friend) fun
+    let friend_fun = max_version(mk_module_entry(Visibility::Friend as u8, false));
+    // public(friend) entry fun
+    let friend_entry_fun = max_version(mk_module_entry(Visibility::Friend as u8, true));
+    // public fun
+    let public_fun = max_version(mk_module_entry(Visibility::Public as u8, false));
+    // public entry fun
+    let public_entry_fun = max_version(mk_module_entry(Visibility::Public as u8, true));
+    // NO function
+    let mut no_fun = private_fun.clone();
+    no_fun.functions = BTreeMap::new();
+
+    let mut valid_combos = vec![
+        // Can transition from a private entry fun to anything
+        // see the adding of `invalid_private_entry_breakages` below to this table.
+        (&entry_fun, &friend_entry_fun),
+        // Can transition from a private fun to anything
+        (&private_fun, &entry_fun),
+        (&private_fun, &friend_fun),
+        (&private_fun, &friend_entry_fun),
+        (&private_fun, &public_fun),
+        (&private_fun, &public_entry_fun),
+        (&private_fun, &no_fun),
+        // Can transition from public fun to a public entry fun (post version 5)
+        (&public_fun, &public_entry_fun),
+        (&friend_entry_fun, &public_entry_fun),
+        (&friend_entry_fun, &friend_fun),
+        (&friend_fun, &public_entry_fun),
+        (&friend_fun, &public_fun),
+        (&friend_fun, &friend_entry_fun),
+        (&public_entry_fun, &public_fun),
+    ];
+
+    let invalid_combos = vec![
+        (&public_entry_fun, &entry_fun),
+        (&public_entry_fun, &private_fun),
+        (&public_entry_fun, &friend_entry_fun),
+        (&public_entry_fun, &friend_fun),
+        (&public_entry_fun, &no_fun),
+        (&friend_entry_fun, &no_fun),
+        (&friend_entry_fun, &private_fun),
+        (&friend_entry_fun, &entry_fun),
+    ];
+
+    let invalid_private_entry_breakages = vec![
+        (&entry_fun, &private_fun),
+        (&entry_fun, &friend_fun),
+        (&entry_fun, &public_fun),
+        (&entry_fun, &no_fun),
+    ];
+
+    valid_combos.extend_from_slice(&invalid_private_entry_breakages);
+
+    // These would all be invalid combos unless we also allow friend breakage.
+    let valid_entry_fun_changes_with_friend_api_breakage = vec![
+        (&friend_entry_fun, &no_fun),
+        (&friend_entry_fun, &private_fun),
+        (&friend_entry_fun, &entry_fun),
+        (&friend_fun, &no_fun),
+        (&friend_fun, &private_fun),
+        (&friend_fun, &entry_fun),
+    ];
+
+    // Every valid combo is valid under `check_private_entry_linking = false`
+    for (prev, new) in valid_combos.into_iter() {
+        assert!(Compatibility {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: true,
+            check_private_entry_linking: false,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: false,
+        }
+        .check(prev, new)
+        .is_ok());
+    }
+
+    // Every
+    for (prev, new) in invalid_private_entry_breakages.into_iter() {
+        assert!(Compatibility::full_check().check(prev, new).is_err());
+    }
+
+    // Every valid combo is valid under `check_private_entry_linking = false`
+    for (prev, new) in valid_entry_fun_changes_with_friend_api_breakage.into_iter() {
+        assert!(Compatibility {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: false,
+            check_private_entry_linking: false,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: false,
+        }
+        .check(prev, new)
+        .is_ok());
+
+        assert!(Compatibility {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: true,
+            check_private_entry_linking: false,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: false,
+        }
+        .check(prev, new)
+        .is_err());
+    }
+
+    for (prev, new) in invalid_combos.into_iter() {
+        assert!(Compatibility {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: true,
+            check_private_entry_linking: false,
+            disallowed_new_abilities: AbilitySet::EMPTY,
+            disallow_change_struct_type_params: false,
+        }
+        .check(prev, new)
+        .is_err());
+    }
+}
+
+#[test]
+fn public_entry_signature_change_disallowed() {
+    // Create a public entry function
+    let module = max_version(mk_module_entry(Visibility::Public as u8, true));
+    let mut updated_module = module.clone();
+    // Update the signature of the entry fun to now take a u64 argument.
+    updated_module
+        .functions
+        .get_mut(ident_str!("fn"))
+        .unwrap()
+        .parameters = vec![Type::U64];
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_err());
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&updated_module, &module)
+    .is_err());
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: true,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_err());
+}
+
+#[test]
+fn friend_entry_signature_change_allowed() {
+    let module = max_version(mk_module_entry(Visibility::Friend as u8, true));
+    let mut updated_module = module.clone();
+    // Update the signature of the entry fun to now take a u64 argument.
+    updated_module
+        .functions
+        .get_mut(ident_str!("fn"))
+        .unwrap()
+        .parameters = vec![Type::U64];
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: false,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_ok());
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: false,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_err());
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: false,
+        check_private_entry_linking: true,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_err());
+
+    assert!(Compatibility {
+        check_struct_and_pub_function_linking: true,
+        check_struct_layout: true,
+        check_friend_linking: true,
+        check_private_entry_linking: true,
+        disallowed_new_abilities: AbilitySet::EMPTY,
+        disallow_change_struct_type_params: false,
+    }
+    .check(&module, &updated_module)
+    .is_err());
+}
+
+#[test]
+fn check_exact_and_unchange_same_module() {
+    let m1 = max_version(mk_module(Visibility::Private as u8));
+    assert!(InclusionCheck::Subset.check(&m1, &m1).is_ok());
+    assert!(InclusionCheck::Equal.check(&m1, &m1).is_ok());
+
+    // m1 + an extra function
+    let m2 = max_version(mk_module_plus(Visibility::Private as u8));
+    assert!(InclusionCheck::Subset.check(&m1, &m2).is_ok());
+    assert!(InclusionCheck::Subset.check(&m2, &m1).is_err());
+    assert!(InclusionCheck::Equal.check(&m1, &m2).is_err());
+    assert!(InclusionCheck::Equal.check(&m2, &m1).is_err());
+
+    // m1 + a change in the bytecode of fn
+    let m3 = max_version(mk_module_plus_code(
+        Visibility::Private as u8,
+        vec![Bytecode::LdU8(0), Bytecode::Ret],
+    ));
+    assert!(InclusionCheck::Subset.check(&m2, &m3).is_err());
+    // fn1 is not in m1 so the changed bytecode doesn't matter.
+    assert!(InclusionCheck::Subset.check(&m1, &m3).is_ok());
+    assert!(InclusionCheck::Subset.check(&m3, &m2).is_err());
+    assert!(InclusionCheck::Subset.check(&m3, &m1).is_err());
+    assert!(InclusionCheck::Equal.check(&m1, &m3).is_err());
+    assert!(InclusionCheck::Equal.check(&m2, &m3).is_err());
+}
+
+#[test]
+fn check_exact_and_unchange_same_module_permutations() {
+    let m1 = max_version(mk_module(Visibility::Private as u8));
+    let m2 = max_version(mk_module_plus(Visibility::Private as u8));
+    let m3 = max_version(mk_module_plus_perm(
+        Visibility::Private as u8,
+        Permutation::new(vec![1, 0]),
+    ));
+    assert_ne!(m2, m3);
+    assert!(InclusionCheck::Equal.check(&m2, &m3).is_ok());
+    assert!(InclusionCheck::Equal.check(&m3, &m2).is_ok());
+    // double inclusion
+    assert!(InclusionCheck::Subset.check(&m3, &m2).is_ok());
+    assert!(InclusionCheck::Subset.check(&m2, &m3).is_ok());
+
+    assert!(InclusionCheck::Subset.check(&m1, &m3).is_ok());
+    assert!(InclusionCheck::Subset.check(&m3, &m1).is_err());
+    assert!(InclusionCheck::Equal.check(&m1, &m3).is_err());
+    assert!(InclusionCheck::Equal.check(&m3, &m1).is_err());
+}
+
+#[test]
+fn check_exact_and_unchange_same_complex_module_permutations() {
+    let perms = vec![
+        vec![0, 1, 2],
+        vec![0, 2, 1],
+        vec![1, 0, 2],
+        vec![1, 2, 0],
+        vec![2, 0, 1],
+        vec![2, 1, 0],
+    ];
+    let modules: Vec<_> = perms
+        .into_iter()
+        .map(|permutation| max_version(make_complex_module_perm(Permutation::new(permutation))))
+        .collect();
+
+    for m0 in &modules {
+        for m1 in &modules {
+            assert!(InclusionCheck::Equal.check(m0, m1).is_ok());
+            assert!(InclusionCheck::Equal.check(m1, m0).is_ok());
+            assert!(InclusionCheck::Subset.check(m0, m1).is_ok());
+            assert!(InclusionCheck::Subset.check(m1, m0).is_ok());
+        }
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/control_flow_graph_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/control_flow_graph_tests.rs
new file mode 100644
index 000000000..064aa151b
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/control_flow_graph_tests.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph},
+    file_format::Bytecode,
+};
+
+#[test]
+fn traversal_no_loops() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0 */ LdTrue,
+            /*    */ BrTrue(3),
+            /* L2 */ Branch(3),
+            /* L3 */ Ret,
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 3);
+    assert_eq!(traversal(&cfg), vec![0, 2, 3]);
+}
+
+#[test]
+fn traversal_loops() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0: Outer head     */ LdTrue,
+            /*     Outer break    */ BrTrue(6),
+            /* L2: Inner head     */ LdTrue,
+            /*     Inner break    */ BrTrue(5),
+            /* L4: Inner continue */ Branch(2),
+            /*     Outer continue */ Branch(0),
+            /* L6:                */ Ret,
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 5);
+    assert_eq!(traversal(&cfg), vec![0, 2, 4, 5, 6]);
+}
+
+#[test]
+fn traversal_non_loop_back_branch() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0 */ Branch(2),
+            /* L1 */ Ret,
+            /* L2 */ Branch(1),
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 3);
+    assert_eq!(traversal(&cfg), vec![0, 2, 1]);
+}
+
+/// Return a vector containing the `BlockId`s from `cfg` in the order suggested by successively
+/// calling `ControlFlowGraph::next_block` starting from the entry block.
+fn traversal(cfg: &dyn ControlFlowGraph) -> Vec<BlockId> {
+    let mut order = Vec::with_capacity(cfg.num_blocks() as usize);
+    let mut next = Some(cfg.entry_block_id());
+
+    while let Some(block) = next {
+        order.push(block);
+        next = cfg.next_block(block);
+    }
+
+    order
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/deserializer_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/deserializer_tests.rs
new file mode 100644
index 000000000..4a59e95c2
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/deserializer_tests.rs
@@ -0,0 +1,370 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    file_format::{basic_test_module, CompiledModule, CompiledScript},
+    file_format_common::*,
+};
+use move_core_types::{metadata::Metadata, vm_status::StatusCode};
+
+fn malformed_simple_versioned_test(version: u32) {
+    // bad uleb (more than allowed for table count)
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(150); // table count (high bit 1)
+    binary.push(150); // table count (high bit 1)
+    binary.push(1);
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad uleb").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // bad uleb (too big)
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(150); // table count (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(150); // table count again (high bit 1)
+    binary.push(0); // table count again
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad uleb").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // no tables
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(0); // table count
+    let res = CompiledModule::deserialize_with_defaults(&binary);
+    assert_eq!(
+        res.expect_err("Expected no table count").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // missing tables
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(10); // table count
+    let res = CompiledModule::deserialize_with_defaults(&binary);
+    assert_eq!(
+        res.expect_err("Expected no table header").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // missing table content
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(1); // table count
+    binary.push(1); // table type
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected no table content").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // bad table header (bad offset)
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(1); // table count
+    binary.push(1); // table type
+    binary.push(100); // bad table offset
+    binary.push(10); // table length
+    let res = CompiledModule::deserialize_with_defaults(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad table offset").major_status(),
+        StatusCode::BAD_HEADER_TABLE
+    );
+
+    // bad table header (bad offset)
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(2); // table count
+    binary.push(1); // table type
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    binary.push(2); // table type
+    binary.push(100); // bad table offset
+    binary.push(10); // table length
+    binary.resize(binary.len() + 5000, 0);
+    let res = CompiledModule::deserialize_with_defaults(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad table offset").major_status(),
+        StatusCode::BAD_HEADER_TABLE
+    );
+
+    // incomplete table
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(1); // table count
+    binary.push(1); // table type
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    binary.resize(binary.len() + 5, 0);
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad table content").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // unknown table
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(1); // table count
+    binary.push(100); // table type
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    binary.resize(binary.len() + 10, 0);
+    let res = CompiledModule::deserialize_with_defaults(&binary);
+    assert_eq!(
+        res.expect_err("Expected unknown table").major_status(),
+        StatusCode::UNKNOWN_TABLE_TYPE
+    );
+
+    // duplicate table
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(3); // table count
+    binary.push(1); // table type
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    binary.push(2); // table type
+    binary.push(10); // table offset
+    binary.push(10); // table length
+    binary.push(1); // table type
+    binary.push(20); // table offset
+    binary.push(10); // table length
+    binary.resize(binary.len() + 5000, 0);
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected table offset overflow")
+            .major_status(),
+        StatusCode::DUPLICATE_TABLE
+    );
+
+    // bad table in script
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
+    binary.push(1); // table count
+    binary.push(0xD); // table type - FieldHandle not good for script
+    binary.push(0); // table offset
+    binary.push(10); // table length
+    binary.resize(binary.len() + 5000, 0);
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected table offset overflow")
+            .major_status(),
+        StatusCode::MALFORMED
+    );
+}
+
+#[test]
+#[allow(clippy::same_item_push)]
+fn malformed_simple() {
+    // empty binary
+    let binary = vec![];
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected malformed binary").major_status(),
+        StatusCode::BAD_MAGIC
+    );
+
+    // under-sized binary
+    let binary = vec![0u8, 0u8, 0u8];
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected malformed binary").major_status(),
+        StatusCode::BAD_MAGIC
+    );
+
+    // bad magic
+    let binary = vec![0u8; 4];
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected bad magic").major_status(),
+        StatusCode::BAD_MAGIC
+    );
+
+    // only magic
+    let binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected malformed binary").major_status(),
+        StatusCode::MALFORMED
+    );
+
+    // bad version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend((VERSION_MAX.checked_add(1).unwrap()).to_le_bytes()); // version
+    binary.push(10); // table count
+    binary.push(0); // rest of binary
+    let res = CompiledScript::deserialize(&binary);
+    assert_eq!(
+        res.expect_err("Expected unknown version").major_status(),
+        StatusCode::UNKNOWN_VERSION
+    );
+
+    // versioned tests
+    for version in VERSION_1..VERSION_MAX {
+        malformed_simple_versioned_test(version);
+    }
+}
+
+#[test]
+fn max_version_lower_than_hardcoded() {
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend((VERSION_MAX).to_le_bytes()); // version
+    binary.push(10); // table count
+    binary.push(0); // rest of binary
+
+    let res =
+        CompiledScript::deserialize_with_max_version(&binary, VERSION_MAX.checked_sub(1).unwrap());
+    assert_eq!(
+        res.expect_err("Expected unknown version").major_status(),
+        StatusCode::UNKNOWN_VERSION
+    );
+}
+
+// Ensure that we can deserialize a script from disk
+static EMPTY_SCRIPT: &[u8] = include_bytes!("empty_script.mv");
+
+#[test]
+fn deserialize_file() {
+    CompiledScript::deserialize(EMPTY_SCRIPT).expect("script should deserialize properly");
+}
+
+// An invalid script that is missing a signature should not deserialize successfully.
+static INVALID_SCRIPT_NO_SIGNATURE: &[u8] = include_bytes!("invalid_script_no_signature.mv");
+
+#[test]
+fn deserialize_invalid_script_no_signature() {
+    assert_eq!(
+        CompiledScript::deserialize(INVALID_SCRIPT_NO_SIGNATURE)
+            .unwrap_err()
+            .major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn deserialize_trailing_bytes() {
+    let module = basic_test_module();
+    let bytes = {
+        let mut v = vec![];
+        module.serialize(&mut v).unwrap();
+        v
+    };
+    let test = |bytes| {
+        // ok with flag false
+        CompiledModule::deserialize_with_config(
+            bytes,
+            VERSION_MAX,
+            /*check_no_extraneous_bytes*/ false,
+        )
+        .unwrap();
+        // error with flag true
+        let status_code = CompiledModule::deserialize_with_config(
+            bytes,
+            VERSION_MAX,
+            /*check_no_extraneous_bytes*/ true,
+        )
+        .unwrap_err()
+        .major_status();
+        assert_eq!(status_code, StatusCode::TRAILING_BYTES);
+    };
+    // simple trailing byte
+    let test1 = {
+        let mut v = bytes.clone();
+        v.push(0);
+        v
+    };
+    test(&test1);
+
+    // many bytes
+    let test2 = {
+        let mut v = bytes.clone();
+        v.push(3);
+        v.push(1);
+        v.push(0);
+        v.push(10);
+        v
+    };
+    test(&test2);
+
+    // another module
+    let test3 = {
+        let mut v = bytes.clone();
+        v.extend(bytes);
+        v
+    };
+    test(&test3);
+}
+
+#[test]
+fn no_metadata() {
+    let test = |bytes| {
+        // ok with flag false
+        CompiledModule::deserialize_with_config(
+            bytes,
+            VERSION_MAX,
+            /*check_no_extraneous_bytes*/ false,
+        )
+        .unwrap();
+        // error with flag true
+        let status_code = CompiledModule::deserialize_with_config(
+            bytes,
+            VERSION_MAX,
+            /*check_no_extraneous_bytes*/ true,
+        )
+        .unwrap_err()
+        .major_status();
+        assert_eq!(status_code, StatusCode::MALFORMED);
+    };
+    // empty metadata
+    let mut module = basic_test_module();
+    module.metadata.push(Metadata {
+        key: vec![],
+        value: vec![],
+    });
+    let test2 = {
+        let mut v = vec![];
+        module.serialize(&mut v).unwrap();
+        v
+    };
+    test(&test2);
+
+    // lots of metadata
+    let metadata_bytes = {
+        let module = basic_test_module();
+        let mut v = vec![];
+        module.serialize(&mut v).unwrap();
+        v
+    };
+    let mut module = basic_test_module();
+    module.metadata.push(Metadata {
+        key: metadata_bytes.clone(),
+        value: metadata_bytes.clone(),
+    });
+    module.metadata.push(Metadata {
+        key: metadata_bytes.clone(),
+        value: metadata_bytes.clone(),
+    });
+    let test2 = {
+        let mut v = vec![];
+        module.serialize(&mut v).unwrap();
+        v
+    };
+    test(&test2);
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/empty_script.mv b/vendors/move/crates/move-binary-format/src/unit_tests/empty_script.mv
new file mode 100644
index 000000000..130e051a9
Binary files /dev/null and b/vendors/move/crates/move-binary-format/src/unit_tests/empty_script.mv differ
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/invalid_script_no_signature.mv b/vendors/move/crates/move-binary-format/src/unit_tests/invalid_script_no_signature.mv
new file mode 100644
index 000000000..cc8e747f0
Binary files /dev/null and b/vendors/move/crates/move-binary-format/src/unit_tests/invalid_script_no_signature.mv differ
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/mod.rs b/vendors/move/crates/move-binary-format/src/unit_tests/mod.rs
new file mode 100644
index 000000000..e811762a1
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/mod.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod binary_tests;
+mod compatibility_tests;
+mod control_flow_graph_tests;
+mod deserializer_tests;
+mod number_tests;
+mod signature_token_tests;
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/number_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/number_tests.rs
new file mode 100644
index 000000000..b99e94bb6
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/number_tests.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::file_format_common::*;
+use proptest::prelude::*;
+use std::io::{Cursor, Read};
+
+// verify all bytes in the vector have the high bit set except the last one
+fn check_vector(buf: &[u8]) {
+    let mut last_byte: bool = false;
+    for byte in buf {
+        assert!(!last_byte);
+        if *byte & 0x80 == 0 {
+            last_byte = true;
+        }
+        if !last_byte {
+            assert!(*byte & 0x80 > 0, "{} & 0x80", *byte);
+        }
+    }
+    assert!(last_byte);
+}
+
+fn uleb128_test_u64(value: u64, expected_bytes: usize) {
+    let mut buf = BinaryData::new();
+    write_u64_as_uleb128(&mut buf, value).expect("serialization should work");
+    assert_eq!(buf.len(), expected_bytes);
+    let buf = buf.into_inner();
+    check_vector(&buf);
+    let mut cursor = Cursor::new(&buf[..]);
+    let val = read_uleb128_as_u64(&mut cursor).expect("deserialization should work");
+    assert_eq!(value, val);
+}
+
+#[test]
+fn uleb128_test() {
+    uleb128_test_u64(0, 1);
+    let mut n: usize = 1;
+    while n * 7 < 64 {
+        let exp = (n * 7) as u32;
+        uleb128_test_u64(2u64.pow(exp) - 1, n);
+        uleb128_test_u64(2u64.pow(exp), n + 1);
+        n += 1;
+    }
+    uleb128_test_u64(u64::max_value() - 1, 10);
+    uleb128_test_u64(u64::max_value(), 10);
+}
+
+#[test]
+fn uleb128_malformed_test() {
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80, 0x80])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80, 0x80, 0x80, 0x80])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[
+        0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x2
+    ]))
+    .is_err());
+}
+
+#[test]
+fn uleb128_canonicity_test() {
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80, 0x00])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80, 0x00, 0x00])).is_err());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[0x80, 0x80, 0x80, 0x80, 0x0f])).is_ok());
+    assert!(read_uleb128_as_u64(&mut Cursor::new(&[
+        0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x1
+    ]))
+    .is_ok());
+}
+
+proptest! {
+    #[test]
+    fn uleb128_roundtrip(input in any::<u64>()) {
+        let mut serialized = BinaryData::new();
+        write_u64_as_uleb128(&mut serialized, input).expect("serialization should work");
+        let serialized = serialized.into_inner();
+        let mut cursor = Cursor::new(&serialized[..]);
+        let output = read_uleb128_as_u64(&mut cursor).expect("deserialization should work");
+        prop_assert_eq!(input, output);
+    }
+
+    #[test]
+    fn u16_roundtrip(input in any::<u16>()) {
+        let mut serialized = BinaryData::new();
+        write_u16(&mut serialized, input).expect("serialization should work");
+        let serialized = serialized.into_inner();
+        let mut cursor = Cursor::new(&serialized[..]);
+        let mut u16_bytes = [0; 2];
+        cursor.read_exact(&mut u16_bytes).expect("deserialization should work");
+        let output = u16::from_le_bytes(u16_bytes);
+        prop_assert_eq!(input, output);
+    }
+
+    #[test]
+    fn u32_roundtrip(input in any::<u32>()) {
+        let mut serialized = BinaryData::new();
+        write_u32(&mut serialized, input).expect("serialization should work");
+        let serialized = serialized.into_inner();
+        let mut cursor = Cursor::new(&serialized[..]);
+        let mut u32_bytes = [0; 4];
+        cursor.read_exact(&mut u32_bytes).expect("deserialization should work");
+        let output = u32::from_le_bytes(u32_bytes);
+        prop_assert_eq!(input, output);
+    }
+
+    #[test]
+    fn u64_roundtrip(input in any::<u64>()) {
+        let mut serialized = BinaryData::new();
+        write_u64(&mut serialized, input).expect("serialization should work");
+        let serialized = serialized.into_inner();
+        let mut cursor = Cursor::new(&serialized[..]);
+        let mut u64_bytes = [0; 8];
+        cursor.read_exact(&mut u64_bytes).expect("deserialization should work");
+        let output = u64::from_le_bytes(u64_bytes);
+        prop_assert_eq!(input, output);
+    }
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/signature_token_tests.rs b/vendors/move/crates/move-binary-format/src/unit_tests/signature_token_tests.rs
new file mode 100644
index 000000000..c2e2d8213
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/signature_token_tests.rs
@@ -0,0 +1,89 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    deserializer::load_signature_token_test_entry,
+    file_format::{SignatureToken, StructHandleIndex},
+    file_format_common::{BinaryData, SerializedType, SIGNATURE_TOKEN_DEPTH_MAX},
+    serializer::{serialize_signature_token, serialize_signature_token_unchecked},
+};
+use std::io::Cursor;
+
+#[test]
+fn serialize_and_deserialize_nested_types_max() {
+    let mut ty = SignatureToken::Struct(StructHandleIndex::new(0));
+    for _ in 1..SIGNATURE_TOKEN_DEPTH_MAX {
+        ty = SignatureToken::Vector(Box::new(ty));
+        let mut binary = BinaryData::new();
+        serialize_signature_token(&mut binary, &ty).expect("serialization should succeed");
+
+        let cursor = Cursor::new(binary.as_inner());
+        load_signature_token_test_entry(cursor).expect("deserialization should succeed");
+    }
+}
+
+#[test]
+fn serialize_nested_types_too_deep() {
+    let mut ty = SignatureToken::Struct(StructHandleIndex::new(0));
+    for _ in 1..SIGNATURE_TOKEN_DEPTH_MAX {
+        ty = SignatureToken::Vector(Box::new(ty));
+    }
+
+    for _ in 0..10 {
+        ty = SignatureToken::Vector(Box::new(ty));
+
+        let mut binary = BinaryData::new();
+        serialize_signature_token(&mut binary, &ty).expect_err("serialization should fail");
+
+        let mut binary = BinaryData::new();
+        serialize_signature_token_unchecked(&mut binary, &ty)
+            .expect("serialization (unchecked) should succeed");
+
+        let cursor = Cursor::new(binary.as_inner());
+        load_signature_token_test_entry(cursor).expect_err("deserialization should fail");
+    }
+}
+
+#[test]
+fn deserialize_struct_inst_arity_0() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x0, /* arity */
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect_err("deserialization should fail");
+}
+
+#[test]
+fn deserialize_struct_inst_arity_1() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x1, /* arity */
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect("deserialization should succeed");
+}
+
+#[test]
+fn deserialize_struct_inst_arity_2() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x2, /* arity */
+            SerializedType::BOOL as u8,
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect("deserialization should succeed");
+}
diff --git a/vendors/move/crates/move-binary-format/src/unit_tests/staged_enum_variant_order/type.yaml b/vendors/move/crates/move-binary-format/src/unit_tests/staged_enum_variant_order/type.yaml
new file mode 100644
index 000000000..d36423d52
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/unit_tests/staged_enum_variant_order/type.yaml
@@ -0,0 +1,15 @@
+---
+0: Bool
+1: U8
+2: U64
+3: U128
+4: Address
+5: Signer
+6: Struct
+7: Vector
+8: TypeParameter
+9: Reference
+10: MutableReference
+11: U16
+12: U32
+13: U256
diff --git a/vendors/move/crates/move-binary-format/src/views.rs b/vendors/move/crates/move-binary-format/src/views.rs
new file mode 100644
index 000000000..8f95e4ae4
--- /dev/null
+++ b/vendors/move/crates/move-binary-format/src/views.rs
@@ -0,0 +1,732 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! An alternate representation of the file format built on top of the existing format.
+//!
+//! Some general notes:
+//!
+//! * These views are not meant to be set in stone. Feel free to change the views exposed as the
+//!   format and our understanding evolves.
+//! * The typical use for these views would be to materialize all the lazily evaluated data
+//!   immediately -- the views are a convenience to make that simpler. They've been written as lazy
+//!   iterators to aid understanding of the file format and to make it easy to generate views.
+
+use std::iter::DoubleEndedIterator;
+
+use crate::{access::ModuleAccess, file_format::*, SignatureTokenKind};
+use std::collections::BTreeSet;
+
+use move_core_types::{identifier::IdentStr, language_storage::ModuleId};
+use std::collections::BTreeMap;
+
+/// Represents a lazily evaluated abstraction over a module.
+///
+/// `T` here is any sort of `ModuleAccess`. See the documentation in access.rs for more.
+pub struct ModuleView<'a, T> {
+    module: &'a T,
+    name_to_function_definition_view: BTreeMap<&'a IdentStr, FunctionDefinitionView<'a, T>>,
+    name_to_struct_definition_view: BTreeMap<&'a IdentStr, StructDefinitionView<'a, T>>,
+}
+
+impl<'a, T: ModuleAccess> ModuleView<'a, T> {
+    pub fn new(module: &'a T) -> Self {
+        let mut name_to_function_definition_view = BTreeMap::new();
+        for function_def in module.function_defs() {
+            let view = FunctionDefinitionView::new(module, function_def);
+            name_to_function_definition_view.insert(view.name(), view);
+        }
+        let mut name_to_struct_definition_view = BTreeMap::new();
+        for struct_def in module.struct_defs() {
+            let view = StructDefinitionView::new(module, struct_def);
+            name_to_struct_definition_view.insert(view.name(), view);
+        }
+        Self {
+            module,
+            name_to_function_definition_view,
+            name_to_struct_definition_view,
+        }
+    }
+
+    pub fn self_handle_idx(&self) -> ModuleHandleIndex {
+        self.as_inner().self_handle_idx()
+    }
+
+    pub fn module_handles(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = ModuleHandleView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .module_handles()
+            .iter()
+            .map(move |module_handle| ModuleHandleView::new(module, module_handle))
+    }
+
+    pub fn struct_handles(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = StructHandleView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .struct_handles()
+            .iter()
+            .map(move |struct_handle| StructHandleView::new(module, struct_handle))
+    }
+
+    pub fn function_handles(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = FunctionHandleView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .function_handles()
+            .iter()
+            .map(move |function_handle| FunctionHandleView::new(module, function_handle))
+    }
+
+    pub fn field_handles(&self) -> impl DoubleEndedIterator<Item = FieldHandleView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .field_handles()
+            .iter()
+            .map(move |field_handle| FieldHandleView::new(module, field_handle))
+    }
+
+    pub fn struct_instantiations(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = StructInstantiationView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .struct_instantiations()
+            .iter()
+            .map(move |struct_inst| StructInstantiationView::new(module, struct_inst))
+    }
+
+    pub fn function_instantiations(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = FunctionInstantiationView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .function_instantiations()
+            .iter()
+            .map(move |func_inst| FunctionInstantiationView::new(module, func_inst))
+    }
+
+    pub fn field_instantiations(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = FieldInstantiationView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .field_instantiations()
+            .iter()
+            .map(move |field_inst| FieldInstantiationView::new(module, field_inst))
+    }
+
+    pub fn signatures(&self) -> impl DoubleEndedIterator<Item = SignatureView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .signatures()
+            .iter()
+            .map(move |signature| SignatureView::new(module, signature))
+    }
+
+    pub fn structs(&self) -> impl DoubleEndedIterator<Item = StructDefinitionView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .struct_defs()
+            .iter()
+            .map(move |struct_def| StructDefinitionView::new(module, struct_def))
+    }
+
+    pub fn functions(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = FunctionDefinitionView<'a, T>> + Send {
+        let module = self.module;
+        module
+            .function_defs()
+            .iter()
+            .map(move |function_def| FunctionDefinitionView::new(module, function_def))
+    }
+
+    pub fn function_definition(
+        &self,
+        name: &'a IdentStr,
+    ) -> Option<&FunctionDefinitionView<'a, T>> {
+        self.name_to_function_definition_view.get(name)
+    }
+
+    pub fn struct_definition(&self, name: &'a IdentStr) -> Option<&StructDefinitionView<'a, T>> {
+        self.name_to_struct_definition_view.get(name)
+    }
+
+    pub fn function_acquired_resources(
+        &self,
+        function_handle: &FunctionHandle,
+    ) -> BTreeSet<StructDefinitionIndex> {
+        if function_handle.module != self.module.self_handle_idx() {
+            return BTreeSet::new();
+        }
+
+        // TODO these unwraps should be VMInvariantViolations
+        let function_name = self.as_inner().identifier_at(function_handle.name);
+        let function_def = self.function_definition(function_name).unwrap();
+        function_def
+            .as_inner()
+            .acquires_global_resources
+            .iter()
+            .cloned()
+            .collect()
+    }
+
+    pub fn id(&self) -> ModuleId {
+        self.module.self_id()
+    }
+}
+
+pub struct ModuleHandleView<'a, T> {
+    module: &'a T,
+    module_handle: &'a ModuleHandle,
+}
+
+impl<'a, T: ModuleAccess> ModuleHandleView<'a, T> {
+    pub fn new(module: &'a T, module_handle: &'a ModuleHandle) -> Self {
+        Self {
+            module,
+            module_handle,
+        }
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        self.module.module_id_for_handle(self.module_handle)
+    }
+}
+
+pub struct StructHandleView<'a, T> {
+    module: &'a T,
+    struct_handle: &'a StructHandle,
+}
+
+impl<'a, T: ModuleAccess> StructHandleView<'a, T> {
+    pub fn new(module: &'a T, struct_handle: &'a StructHandle) -> Self {
+        Self {
+            module,
+            struct_handle,
+        }
+    }
+
+    pub fn handle(&self) -> &StructHandle {
+        self.struct_handle
+    }
+
+    pub fn abilities(&self) -> AbilitySet {
+        self.struct_handle.abilities
+    }
+
+    pub fn type_parameters(&self) -> &Vec<StructTypeParameter> {
+        &self.struct_handle.type_parameters
+    }
+
+    pub fn module_handle(&self) -> &ModuleHandle {
+        self.module.module_handle_at(self.struct_handle.module)
+    }
+
+    pub fn name(&self) -> &'a IdentStr {
+        self.module.identifier_at(self.struct_handle.name)
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        self.module.module_id_for_handle(self.module_handle())
+    }
+
+    /// Return the StructHandleIndex of this handle in the module's struct handle table
+    pub fn handle_idx(&self) -> StructHandleIndex {
+        for (idx, handle) in self.module.struct_handles().iter().enumerate() {
+            if handle == self.handle() {
+                return StructHandleIndex::new(idx as u16);
+            }
+        }
+        unreachable!("Cannot resolve StructHandle {:?} in module {:?}. This should never happen in a well-formed `StructHandleView`. Perhaps this handle came from a different module?", self.handle(), self.module().name())
+    }
+}
+
+pub struct FunctionHandleView<'a, T> {
+    module: &'a T,
+    function_handle: &'a FunctionHandle,
+}
+
+impl<'a, T> Clone for FunctionHandleView<'a, T> {
+    fn clone(&self) -> Self {
+        Self {
+            module: self.module,
+            function_handle: self.function_handle,
+        }
+    }
+}
+
+impl<'a, T: ModuleAccess> FunctionHandleView<'a, T> {
+    pub fn new(module: &'a T, function_handle: &'a FunctionHandle) -> Self {
+        Self {
+            module,
+            function_handle,
+        }
+    }
+
+    pub fn module_handle(&self) -> &ModuleHandle {
+        self.module.module_handle_at(self.function_handle.module)
+    }
+
+    pub fn name(&self) -> &'a IdentStr {
+        self.module.identifier_at(self.function_handle.name)
+    }
+
+    pub fn parameters(&self) -> &'a Signature {
+        self.module.signature_at(self.function_handle.parameters)
+    }
+
+    pub fn return_(&self) -> &'a Signature {
+        self.module.signature_at(self.function_handle.return_)
+    }
+
+    #[inline]
+    pub fn return_tokens(&self) -> impl DoubleEndedIterator<Item = SignatureTokenView<'a, T>> + 'a {
+        let module = self.module;
+        let return_ = self.module.signature_at(self.function_handle.return_);
+        return_
+            .0
+            .iter()
+            .map(move |token| SignatureTokenView::new(module, token))
+    }
+
+    #[inline]
+    pub fn arg_tokens(&self) -> impl DoubleEndedIterator<Item = SignatureTokenView<'a, T>> + 'a {
+        let module = self.module;
+        let parameters = self.module.signature_at(self.function_handle.parameters);
+        parameters
+            .0
+            .iter()
+            .map(move |token| SignatureTokenView::new(module, token))
+    }
+
+    #[inline]
+    pub fn type_parameters(&self) -> &Vec<AbilitySet> {
+        &self.function_handle.type_parameters
+    }
+
+    pub fn return_count(&self) -> usize {
+        self.module
+            .signature_at(self.function_handle.return_)
+            .0
+            .len()
+    }
+
+    pub fn arg_count(&self) -> usize {
+        self.module
+            .signature_at(self.function_handle.parameters)
+            .0
+            .len()
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        self.module.module_id_for_handle(self.module_handle())
+    }
+}
+
+pub struct StructDefinitionView<'a, T> {
+    module: &'a T,
+    struct_def: &'a StructDefinition,
+    struct_handle_view: StructHandleView<'a, T>,
+}
+
+impl<'a, T: ModuleAccess> StructDefinitionView<'a, T> {
+    pub fn new(module: &'a T, struct_def: &'a StructDefinition) -> Self {
+        let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+        let struct_handle_view = StructHandleView::new(module, struct_handle);
+        Self {
+            module,
+            struct_def,
+            struct_handle_view,
+        }
+    }
+
+    pub fn abilities(&self) -> AbilitySet {
+        self.struct_handle_view.abilities()
+    }
+
+    pub fn is_native(&self) -> bool {
+        match &self.struct_def.field_information {
+            StructFieldInformation::Native => true,
+            StructFieldInformation::Declared { .. } => false,
+        }
+    }
+
+    pub fn type_parameters(&self) -> &Vec<StructTypeParameter> {
+        self.struct_handle_view.type_parameters()
+    }
+
+    pub fn fields(
+        &self,
+    ) -> Option<impl DoubleEndedIterator<Item = FieldDefinitionView<'a, T>> + Send> {
+        let module = self.module;
+        match &self.struct_def.field_information {
+            StructFieldInformation::Native => None,
+            StructFieldInformation::Declared(fields) => Some(
+                fields
+                    .iter()
+                    .map(move |field_def| FieldDefinitionView::new(module, field_def)),
+            ),
+        }
+    }
+
+    pub fn name(&self) -> &'a IdentStr {
+        self.struct_handle_view.name()
+    }
+}
+
+pub struct FieldDefinitionView<'a, T> {
+    module: &'a T,
+    field_def: &'a FieldDefinition,
+}
+
+impl<'a, T: ModuleAccess> FieldDefinitionView<'a, T> {
+    pub fn new(module: &'a T, field_def: &'a FieldDefinition) -> Self {
+        Self { module, field_def }
+    }
+
+    pub fn name(&self) -> &'a IdentStr {
+        self.module.identifier_at(self.field_def.name)
+    }
+
+    pub fn type_signature(&self) -> TypeSignatureView<'a, T> {
+        TypeSignatureView::new(self.module, &self.field_def.signature)
+    }
+
+    pub fn signature_token(&self) -> &'a SignatureToken {
+        &self.field_def.signature.0
+    }
+
+    pub fn signature_token_view(&self) -> SignatureTokenView<'a, T> {
+        SignatureTokenView::new(self.module, self.signature_token())
+    }
+}
+
+pub struct LocalsSignatureView<'a, T> {
+    function_def_view: FunctionDefinitionView<'a, T>,
+}
+
+impl<'a, T: ModuleAccess> LocalsSignatureView<'a, T> {
+    fn new(function_def_view: FunctionDefinitionView<'a, T>) -> Self {
+        Self { function_def_view }
+    }
+
+    fn parameters(&self) -> &'a [SignatureToken] {
+        &self.function_def_view.parameters().0
+    }
+
+    fn additional_locals(&self) -> &'a [SignatureToken] {
+        &self
+            .function_def_view
+            .module
+            .signature_at(self.function_def_view.code().unwrap().locals)
+            .0
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    pub fn len(&self) -> usize {
+        self.parameters().len() + self.additional_locals().len()
+    }
+
+    pub fn token_at(&self, index: LocalIndex) -> SignatureTokenView<'a, T> {
+        let index = index as usize;
+        let parameters = self.parameters();
+        SignatureTokenView::new(
+            self.function_def_view.module,
+            if index < parameters.len() {
+                &parameters[index]
+            } else {
+                &self.additional_locals()[index - parameters.len()]
+            },
+        )
+    }
+}
+
+pub struct FunctionDefinitionView<'a, T> {
+    module: &'a T,
+    function_def: &'a FunctionDefinition,
+    function_handle_view: FunctionHandleView<'a, T>,
+}
+
+impl<'a, T> Clone for FunctionDefinitionView<'a, T> {
+    fn clone(&self) -> Self {
+        Self {
+            module: self.module,
+            function_def: self.function_def,
+            function_handle_view: self.function_handle_view.clone(),
+        }
+    }
+}
+
+impl<'a, T: ModuleAccess> FunctionDefinitionView<'a, T> {
+    pub fn new(module: &'a T, function_def: &'a FunctionDefinition) -> Self {
+        let function_handle = module.function_handle_at(function_def.function);
+        let function_handle_view = FunctionHandleView::new(module, function_handle);
+        Self {
+            module,
+            function_def,
+            function_handle_view,
+        }
+    }
+
+    pub fn visibility(&self) -> Visibility {
+        self.function_def.visibility
+    }
+
+    pub fn is_entry(&self) -> bool {
+        self.function_def.is_entry
+    }
+
+    pub fn is_native(&self) -> bool {
+        self.function_def.is_native()
+    }
+
+    pub fn locals_signature(&self) -> Option<LocalsSignatureView<'a, T>> {
+        self.code().map(|_| LocalsSignatureView::new(self.clone()))
+    }
+
+    pub fn name(&self) -> &'a IdentStr {
+        self.function_handle_view.name()
+    }
+
+    pub fn parameters(&self) -> &'a Signature {
+        self.function_handle_view.parameters()
+    }
+
+    pub fn return_(&self) -> &'a Signature {
+        self.function_handle_view.return_()
+    }
+
+    pub fn type_parameters(&self) -> &Vec<AbilitySet> {
+        self.function_handle_view.type_parameters()
+    }
+
+    pub fn return_tokens(&self) -> impl DoubleEndedIterator<Item = SignatureTokenView<'a, T>> + 'a {
+        self.function_handle_view.return_tokens()
+    }
+
+    pub fn arg_tokens(&self) -> impl DoubleEndedIterator<Item = SignatureTokenView<'a, T>> + 'a {
+        self.function_handle_view.arg_tokens()
+    }
+
+    pub fn return_count(&self) -> usize {
+        self.function_handle_view.return_count()
+    }
+
+    pub fn arg_count(&self) -> usize {
+        self.function_handle_view.arg_count()
+    }
+
+    pub fn code(&self) -> Option<&'a CodeUnit> {
+        self.function_def.code.as_ref()
+    }
+}
+
+pub struct StructInstantiationView<'a, T> {
+    #[allow(unused)]
+    module: &'a T,
+    #[allow(unused)]
+    struct_inst: &'a StructDefInstantiation,
+}
+
+impl<'a, T: ModuleAccess> StructInstantiationView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, struct_inst: &'a StructDefInstantiation) -> Self {
+        Self {
+            module,
+            struct_inst,
+        }
+    }
+}
+
+pub struct FieldHandleView<'a, T> {
+    #[allow(unused)]
+    module: &'a T,
+    #[allow(unused)]
+    field_handle: &'a FieldHandle,
+}
+
+impl<'a, T: ModuleAccess> FieldHandleView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, field_handle: &'a FieldHandle) -> Self {
+        Self {
+            module,
+            field_handle,
+        }
+    }
+}
+
+pub struct FunctionInstantiationView<'a, T> {
+    #[allow(unused)]
+    module: &'a T,
+    #[allow(unused)]
+    func_inst: &'a FunctionInstantiation,
+}
+
+impl<'a, T: ModuleAccess> FunctionInstantiationView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, func_inst: &'a FunctionInstantiation) -> Self {
+        Self { module, func_inst }
+    }
+}
+
+pub struct FieldInstantiationView<'a, T> {
+    #[allow(unused)]
+    module: &'a T,
+    #[allow(unused)]
+    field_inst: &'a FieldInstantiation,
+}
+
+impl<'a, T: ModuleAccess> FieldInstantiationView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, field_inst: &'a FieldInstantiation) -> Self {
+        Self { module, field_inst }
+    }
+}
+
+pub struct TypeSignatureView<'a, T> {
+    module: &'a T,
+    type_signature: &'a TypeSignature,
+}
+
+impl<'a, T: ModuleAccess> TypeSignatureView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, type_signature: &'a TypeSignature) -> Self {
+        Self {
+            module,
+            type_signature,
+        }
+    }
+
+    #[inline]
+    pub fn token(&self) -> SignatureTokenView<'a, T> {
+        SignatureTokenView::new(self.module, &self.type_signature.0)
+    }
+}
+
+pub struct SignatureView<'a, T> {
+    module: &'a T,
+    signature: &'a Signature,
+}
+
+impl<'a, T: ModuleAccess> SignatureView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, signature: &'a Signature) -> Self {
+        Self { module, signature }
+    }
+
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.signature.0.len()
+    }
+
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    #[inline]
+    pub fn tokens(&self) -> impl DoubleEndedIterator<Item = SignatureTokenView<'a, T>> + 'a {
+        let module = self.module;
+        self.signature
+            .0
+            .iter()
+            .map(move |token| SignatureTokenView::new(module, token))
+    }
+
+    pub fn token_at(&self, index: LocalIndex) -> SignatureTokenView<'a, T> {
+        SignatureTokenView::new(self.module, &self.signature.0[index as usize])
+    }
+}
+
+pub struct SignatureTokenView<'a, T> {
+    module: &'a T,
+    token: &'a SignatureToken,
+}
+
+impl<'a, T: ModuleAccess> SignatureTokenView<'a, T> {
+    #[inline]
+    pub fn new(module: &'a T, token: &'a SignatureToken) -> Self {
+        Self { module, token }
+    }
+
+    #[inline]
+    pub fn signature_token(&self) -> &SignatureToken {
+        self.token
+    }
+
+    #[inline]
+    pub fn signature_token_kind(&self) -> SignatureTokenKind {
+        self.token.signature_token_kind()
+    }
+
+    #[inline]
+    pub fn is_reference(&self) -> bool {
+        self.token.is_reference()
+    }
+
+    #[inline]
+    pub fn is_mutable_reference(&self) -> bool {
+        self.token.is_mutable_reference()
+    }
+}
+
+/// This is used to expose some view internals to checks and other areas. This might be exposed
+/// to external code in the future.
+pub trait ViewInternals {
+    type ModuleType;
+    type Inner;
+
+    fn module(&self) -> Self::ModuleType;
+    fn as_inner(&self) -> Self::Inner;
+}
+
+macro_rules! impl_view_internals {
+    ($view_type:ident, $inner_type:ty, $inner_var:ident) => {
+        impl<'a, T: ModuleAccess> ViewInternals for $view_type<'a, T> {
+            type ModuleType = &'a T;
+            type Inner = &'a $inner_type;
+
+            #[inline]
+            fn module(&self) -> Self::ModuleType {
+                &self.module
+            }
+
+            #[inline]
+            fn as_inner(&self) -> Self::Inner {
+                &self.$inner_var
+            }
+        }
+    };
+}
+
+impl<'a, T: ModuleAccess> ViewInternals for ModuleView<'a, T> {
+    type ModuleType = &'a T;
+    type Inner = &'a T;
+
+    fn module(&self) -> Self::ModuleType {
+        self.module
+    }
+
+    fn as_inner(&self) -> Self::Inner {
+        self.module
+    }
+}
+
+impl_view_internals!(ModuleHandleView, ModuleHandle, module_handle);
+impl_view_internals!(StructHandleView, StructHandle, struct_handle);
+impl_view_internals!(FunctionHandleView, FunctionHandle, function_handle);
+impl_view_internals!(StructDefinitionView, StructDefinition, struct_def);
+impl_view_internals!(FunctionDefinitionView, FunctionDefinition, function_def);
+impl_view_internals!(FieldDefinitionView, FieldDefinition, field_def);
+impl_view_internals!(TypeSignatureView, TypeSignature, type_signature);
+impl_view_internals!(SignatureView, Signature, signature);
+impl_view_internals!(SignatureTokenView, SignatureToken, token);
diff --git a/vendors/move/crates/move-borrow-graph/Cargo.toml b/vendors/move/crates/move-borrow-graph/Cargo.toml
new file mode 100644
index 000000000..4cf2f3862
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "move-borrow-graph"
+version = "0.0.1"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
diff --git a/vendors/move/crates/move-borrow-graph/src/graph.rs b/vendors/move/crates/move-borrow-graph/src/graph.rs
new file mode 100644
index 000000000..1c93b5df8
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/src/graph.rs
@@ -0,0 +1,475 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    paths::{self, Path, PathSlice},
+    references::*,
+};
+use std::collections::{BTreeMap, BTreeSet};
+
+//**************************************************************************************************
+// Definitions
+//**************************************************************************************************
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct BorrowGraph<Loc: Copy, Lbl: Clone + Ord>(BTreeMap<RefID, Ref<Loc, Lbl>>);
+
+//**************************************************************************************************
+// Impls
+//**************************************************************************************************
+
+impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
+    /// creates an empty borrow graph
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    /// Returns the graph size, that is the number of nodes + number of edges
+    pub fn graph_size(&self) -> usize {
+        self.0
+            .values()
+            .map(|r| 1 + r.borrowed_by.0.values().map(|e| e.len()).sum::<usize>())
+            .sum()
+    }
+
+    /// checks if the given reference is mutable or not
+    pub fn is_mutable(&self, id: RefID) -> bool {
+        self.0.get(&id).unwrap().mutable
+    }
+
+    /// Adds a new reference to the borrow graph
+    /// Fails if the id is already in use
+    pub fn new_ref(&mut self, id: RefID, mutable: bool) {
+        assert!(
+            self.0.insert(id, Ref::new(mutable)).is_none(),
+            "ref {} exists",
+            id.0
+        )
+    }
+
+    /// Return the references borrowing the `id` reference
+    /// The borrows are collected by first label in the borrow edge
+    /// `BTreeMap<RefID, Loc>` represents all of the "full" or "epsilon" borrows (non field borrows)
+    /// `BTreeMap<Lbl, BTreeMap<RefID, Loc>>)` represents the field borrows, collected over the
+    /// first label
+    pub fn borrowed_by(
+        &self,
+        id: RefID,
+    ) -> (BTreeMap<RefID, Loc>, BTreeMap<Lbl, BTreeMap<RefID, Loc>>) {
+        let borrowed_by = &self.0.get(&id).unwrap().borrowed_by;
+        let mut full_borrows: BTreeMap<RefID, Loc> = BTreeMap::new();
+        let mut field_borrows: BTreeMap<Lbl, BTreeMap<RefID, Loc>> = BTreeMap::new();
+        for (borrower, edges) in &borrowed_by.0 {
+            let borrower = *borrower;
+            for edge in edges {
+                match edge.path.get(0) {
+                    None => full_borrows.insert(borrower, edge.loc),
+                    Some(f) => field_borrows
+                        .entry(f.clone())
+                        .or_default()
+                        .insert(borrower, edge.loc),
+                };
+            }
+        }
+        (full_borrows, field_borrows)
+    }
+
+    /// Return the edges between parent and child
+    pub fn between_edges(&self, parent: RefID, child: RefID) -> Vec<(Loc, Path<Lbl>, bool)> {
+        let edges = &self.0.get(&parent).unwrap().borrowed_by.0[&child];
+        edges
+            .iter()
+            .map(|edge| (edge.loc, edge.path.clone(), edge.strong))
+            .collect()
+    }
+
+    /// Return the outgoing edges from id
+    pub fn out_edges(&self, id: RefID) -> Vec<(Loc, Path<Lbl>, bool, RefID)> {
+        let mut returned_edges = vec![];
+        let borrowed_by = &self.0.get(&id).unwrap().borrowed_by;
+        for (borrower, edges) in &borrowed_by.0 {
+            let borrower = *borrower;
+            for edge in edges {
+                returned_edges.push((edge.loc, edge.path.clone(), edge.strong, borrower));
+            }
+        }
+        returned_edges
+    }
+
+    /// Return the incoming edges into id
+    pub fn in_edges(&self, id: RefID) -> Vec<(Loc, RefID, Path<Lbl>, bool)> {
+        let mut returned_edges = vec![];
+        let borrows_from = &self.0.get(&id).unwrap().borrows_from;
+        for src in borrows_from {
+            for edge in self.between_edges(*src, id) {
+                returned_edges.push((edge.0, *src, edge.1, edge.2));
+            }
+        }
+        returned_edges
+    }
+
+    //**********************************************************************************************
+    // Edges/Borrows
+    //**********************************************************************************************
+
+    /// Add a strong (exact) epsilon borrow from `parent_id` to `child_id`
+    pub fn add_strong_borrow(&mut self, loc: Loc, parent_id: RefID, child_id: RefID) {
+        self.factor(parent_id, loc, vec![], child_id)
+    }
+
+    /// Add a strong (exact) field borrow from `parent_id` to `child_id` at field `field`
+    pub fn add_strong_field_borrow(
+        &mut self,
+        loc: Loc,
+        parent_id: RefID,
+        field: Lbl,
+        child_id: RefID,
+    ) {
+        self.factor(parent_id, loc, vec![field], child_id)
+    }
+
+    /// Add a weak (prefix) epsilon borrow from `parent_id` to `child_id`
+    /// i.e. `child_id` might be borrowing from ANY field in `parent_id`
+    pub fn add_weak_borrow(&mut self, loc: Loc, parent_id: RefID, child_id: RefID) {
+        self.add_path(parent_id, loc, false, vec![], child_id)
+    }
+
+    /// Add a weak (prefix) field borrow from `parent_id` to `child_id` at field `field`
+    /// i.e. `child_id` might be borrowing from ANY field in `parent_id` rooted at `field`
+    pub fn add_weak_field_borrow(
+        &mut self,
+        loc: Loc,
+        parent_id: RefID,
+        field: Lbl,
+        child_id: RefID,
+    ) {
+        self.add_path(parent_id, loc, false, vec![field], child_id)
+    }
+
+    fn add_edge(&mut self, parent_id: RefID, edge: BorrowEdge<Loc, Lbl>, child_id: RefID) {
+        assert!(parent_id != child_id);
+        let parent = self.0.get_mut(&parent_id).unwrap();
+        parent
+            .borrowed_by
+            .0
+            .entry(child_id)
+            .or_insert_with(BorrowEdgeSet::new)
+            .insert(edge);
+        let child = self.0.get_mut(&child_id).unwrap();
+        child.borrows_from.insert(parent_id);
+    }
+
+    fn add_path(
+        &mut self,
+        parent_id: RefID,
+        loc: Loc,
+        strong: bool,
+        path: Path<Lbl>,
+        child_id: RefID,
+    ) {
+        let edge = BorrowEdge { strong, path, loc };
+        self.add_edge(parent_id, edge, child_id)
+    }
+
+    fn factor(&mut self, parent_id: RefID, loc: Loc, path: Path<Lbl>, intermediate_id: RefID) {
+        debug_assert!(self.check_invariant());
+        let parent = self.0.get_mut(&parent_id).unwrap();
+        let mut needs_factored = vec![];
+        for (child_id, parent_to_child_edges) in &parent.borrowed_by.0 {
+            for parent_to_child_edge in parent_to_child_edges {
+                if paths::leq(&path, &parent_to_child_edge.path) {
+                    let factored_edge = (*child_id, parent_to_child_edge.clone());
+                    needs_factored.push(factored_edge);
+                }
+            }
+        }
+
+        let mut cleanup_ids = BTreeSet::new();
+        for (child_id, parent_to_child_edge) in &needs_factored {
+            let parent_to_child_edges = parent.borrowed_by.0.get_mut(child_id).unwrap();
+            assert!(parent_to_child_edges.remove(parent_to_child_edge));
+            if parent_to_child_edges.is_empty() {
+                assert!(parent.borrowed_by.0.remove(child_id).is_some());
+                cleanup_ids.insert(child_id);
+            }
+        }
+
+        for child_id in cleanup_ids {
+            assert!(self
+                .0
+                .get_mut(child_id)
+                .unwrap()
+                .borrows_from
+                .remove(&parent_id));
+        }
+
+        for (child_id, parent_to_child_edge) in needs_factored {
+            let (_, intermediate_to_child_suffix) = paths::factor(&path, parent_to_child_edge.path);
+            self.add_path(
+                intermediate_id,
+                parent_to_child_edge.loc,
+                parent_to_child_edge.strong,
+                intermediate_to_child_suffix,
+                child_id,
+            )
+        }
+        self.add_path(
+            parent_id,
+            loc,
+            /* strong */ true,
+            path,
+            intermediate_id,
+        );
+        debug_assert!(self.check_invariant());
+    }
+
+    //**********************************************************************************************
+    // Release
+    //**********************************************************************************************
+
+    /// Remove reference `id` from the graph
+    /// Fixes any transitive borrows, so if `parent` borrowed by `id` borrowed by `child`
+    /// After the release, `parent` borrowed by `child`
+    pub fn release(&mut self, id: RefID) {
+        debug_assert!(self.check_invariant());
+        let Ref {
+            borrowed_by,
+            borrows_from,
+            ..
+        } = self.0.remove(&id).unwrap();
+        for parent_ref_id in borrows_from.into_iter() {
+            let parent = self.0.get_mut(&parent_ref_id).unwrap();
+            let parent_edges = parent.borrowed_by.0.remove(&id).unwrap();
+            for parent_edge in parent_edges {
+                for (child_ref_id, child_edges) in &borrowed_by.0 {
+                    for child_edge in child_edges {
+                        self.splice_out_intermediate(
+                            parent_ref_id,
+                            &parent_edge,
+                            *child_ref_id,
+                            child_edge,
+                        )
+                    }
+                }
+            }
+        }
+        for child_ref_id in borrowed_by.0.keys() {
+            let child = self.0.get_mut(child_ref_id).unwrap();
+            child.borrows_from.remove(&id);
+        }
+        debug_assert!(self.check_invariant());
+    }
+
+    fn splice_out_intermediate(
+        &mut self,
+        parent_id: RefID,
+        parent_to_intermediate: &BorrowEdge<Loc, Lbl>,
+        child_id: RefID,
+        intermediate_to_child: &BorrowEdge<Loc, Lbl>,
+    ) {
+        // dont add in an edge if releasing from a cycle
+        if parent_id == child_id {
+            return;
+        }
+
+        let path = if parent_to_intermediate.strong {
+            paths::append(&parent_to_intermediate.path, &intermediate_to_child.path)
+        } else {
+            parent_to_intermediate.path.clone()
+        };
+        let strong = parent_to_intermediate.strong && intermediate_to_child.strong;
+        let loc = intermediate_to_child.loc;
+        let parent_to_child = BorrowEdge { strong, path, loc };
+        self.add_edge(parent_id, parent_to_child, child_id)
+    }
+
+    //**********************************************************************************************
+    // Subsumes/weakens
+    //**********************************************************************************************
+
+    /// checks if `self` covers `other`
+    pub fn leq(&self, other: &Self) -> bool {
+        self.unmatched_edges(other).is_empty()
+    }
+
+    fn unmatched_edges(&self, other: &Self) -> BTreeMap<RefID, BorrowEdges<Loc, Lbl>> {
+        let mut unmatched_edges = BTreeMap::new();
+        for (parent_id, other_ref) in &other.0 {
+            let self_ref = &self.0[parent_id];
+            let self_borrowed_by = &self_ref.borrowed_by.0;
+            for (child_id, other_edges) in &other_ref.borrowed_by.0 {
+                for other_edge in other_edges {
+                    let found_match = self_borrowed_by
+                        .get(child_id)
+                        .map(|parent_to_child| {
+                            parent_to_child
+                                .iter()
+                                .any(|self_edge| self_edge.leq(other_edge))
+                        })
+                        .unwrap_or(false);
+                    if !found_match {
+                        assert!(parent_id != child_id);
+                        unmatched_edges
+                            .entry(*parent_id)
+                            .or_insert_with(BorrowEdges::new)
+                            .0
+                            .entry(*child_id)
+                            .or_insert_with(BorrowEdgeSet::new)
+                            .insert(other_edge.clone());
+                    }
+                }
+            }
+        }
+        unmatched_edges
+    }
+
+    //**********************************************************************************************
+    // Remap
+    //**********************************************************************************************
+
+    /// Utility for remapping the reference ids according the `id_map` provided
+    /// If it is not in the map, the id remains the same
+    pub fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
+        debug_assert!(self.check_invariant());
+        let _before = self.0.len();
+        self.0 = std::mem::take(&mut self.0)
+            .into_iter()
+            .map(|(id, mut info)| {
+                info.remap_refs(id_map);
+                (id_map.get(&id).copied().unwrap_or(id), info)
+            })
+            .collect();
+        let _after = self.0.len();
+        debug_assert!(_before == _after);
+        debug_assert!(self.check_invariant());
+    }
+
+    //**********************************************************************************************
+    // Joins
+    //**********************************************************************************************
+
+    /// Joins other into self
+    /// It adds only 'unmatched' edges from other into self, i.e. for any edge in other, if there
+    /// is an edge in self that is <= than that edge, it is not added.
+    pub fn join(&self, other: &Self) -> Self {
+        debug_assert!(self.check_invariant());
+        debug_assert!(other.check_invariant());
+        debug_assert!(self.0.keys().all(|id| other.0.contains_key(id)));
+        debug_assert!(other.0.keys().all(|id| self.0.contains_key(id)));
+
+        let mut joined = self.clone();
+        for (parent_id, unmatched_borrowed_by) in self.unmatched_edges(other) {
+            for (child_id, unmatched_edges) in unmatched_borrowed_by.0 {
+                for unmatched_edge in unmatched_edges {
+                    joined.add_edge(parent_id, unmatched_edge, child_id);
+                }
+            }
+        }
+        debug_assert!(joined.check_invariant());
+        joined
+    }
+
+    //**********************************************************************************************
+    // Consistency/Invariants
+    //**********************************************************************************************
+
+    fn check_invariant(&self) -> bool {
+        self.id_consistency() && self.edge_consistency() && self.no_self_loops()
+    }
+
+    /// Checks at all ids in edges are contained in the borrow map itself, i.e. that each id
+    /// corresponds to a reference
+    fn id_consistency(&self) -> bool {
+        let contains_id = |id| self.0.contains_key(id);
+        self.0.values().all(|r| {
+            r.borrowed_by.0.keys().all(contains_id) && r.borrows_from.iter().all(contains_id)
+        })
+    }
+
+    /// Checks that for every edge in borrowed_by there is a flipped edge in borrows_from
+    /// And vice versa
+    //// i.e. verifies the "back edges" in the borrow graph
+    fn edge_consistency(&self) -> bool {
+        let parent_to_child_consistency =
+            |cur_parent, child| self.0[child].borrows_from.contains(cur_parent);
+        let child_to_parent_consistency =
+            |cur_child, parent| self.0[parent].borrowed_by.0.contains_key(cur_child);
+        self.0.iter().all(|(id, r)| {
+            let borrowed_by_is_bounded = r
+                .borrowed_by
+                .0
+                .values()
+                .all(|edges| edges.len() <= MAX_EDGE_SET_SIZE);
+            let borrowed_by_is_consistent = r
+                .borrowed_by
+                .0
+                .keys()
+                .all(|c| parent_to_child_consistency(id, c));
+            let borrows_from_is_consistent = r
+                .borrows_from
+                .iter()
+                .all(|p| child_to_parent_consistency(id, p));
+            borrowed_by_is_bounded && borrowed_by_is_consistent && borrows_from_is_consistent
+        })
+    }
+
+    /// Checks that no reference borrows from itself
+    fn no_self_loops(&self) -> bool {
+        self.0.iter().all(|(id, r)| {
+            r.borrowed_by.0.keys().all(|to_id| id != to_id)
+                && r.borrows_from.iter().all(|from_id| id != from_id)
+        })
+    }
+
+    //**********************************************************************************************
+    // Util
+    //**********************************************************************************************
+
+    /// Checks if the current reference is in the graph
+    pub fn contains_id(&self, ref_id: RefID) -> bool {
+        self.0.contains_key(&ref_id)
+    }
+
+    /// Returns all ref ids in the map
+    pub fn all_refs(&self) -> BTreeSet<RefID> {
+        self.0.keys().cloned().collect()
+    }
+
+    /// Prints out a view of the borrow graph
+    #[allow(dead_code)]
+    pub fn display(&self)
+    where
+        Lbl: std::fmt::Display,
+    {
+        fn path_to_string<Lbl: std::fmt::Display>(p: &PathSlice<Lbl>) -> String {
+            p.iter()
+                .map(|l| l.to_string())
+                .collect::<Vec<_>>()
+                .join(".")
+        }
+
+        for (id, ref_info) in &self.0 {
+            if ref_info.borrowed_by.0.is_empty() && ref_info.borrows_from.is_empty() {
+                println!("{}", id.0);
+            }
+            for (borrower, edges) in &ref_info.borrowed_by.0 {
+                for edge in edges {
+                    let edisp = if edge.strong { "=" } else { "-" };
+                    println!(
+                        "{} {}{}{}> {}",
+                        id.0,
+                        edisp,
+                        path_to_string(&edge.path),
+                        edisp,
+                        borrower.0,
+                    );
+                }
+            }
+            for parent in &ref_info.borrows_from {
+                println!("{} <- {}", parent.0, id.0);
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-borrow-graph/src/lib.rs b/vendors/move/crates/move-borrow-graph/src/lib.rs
new file mode 100644
index 000000000..b662d9321
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/src/lib.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod graph;
+mod paths;
+pub mod references;
+mod shared;
diff --git a/vendors/move/crates/move-borrow-graph/src/paths.rs b/vendors/move/crates/move-borrow-graph/src/paths.rs
new file mode 100644
index 000000000..0f4f09d7a
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/src/paths.rs
@@ -0,0 +1,22 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub type PathSlice<Lbl> = [Lbl];
+pub type Path<Lbl> = Vec<Lbl>;
+
+pub fn leq<Lbl: Eq>(lhs: &PathSlice<Lbl>, rhs: &PathSlice<Lbl>) -> bool {
+    lhs.len() <= rhs.len() && lhs.iter().zip(rhs).all(|(l, r)| l == r)
+}
+
+pub fn factor<Lbl: Eq>(lhs: &PathSlice<Lbl>, mut rhs: Path<Lbl>) -> (Path<Lbl>, Path<Lbl>) {
+    assert!(leq(lhs, &rhs));
+    let suffix = rhs.split_off(lhs.len());
+    (rhs, suffix)
+}
+
+pub fn append<Lbl: Clone>(lhs: &PathSlice<Lbl>, rhs: &PathSlice<Lbl>) -> Path<Lbl> {
+    let mut path: Path<Lbl> = lhs.into();
+    path.append(&mut rhs.to_owned());
+    path
+}
diff --git a/vendors/move/crates/move-borrow-graph/src/references.rs b/vendors/move/crates/move-borrow-graph/src/references.rs
new file mode 100644
index 000000000..df2658872
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/src/references.rs
@@ -0,0 +1,253 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    paths::{self, Path},
+    shared::*,
+};
+use std::{
+    cmp::Ordering,
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+    fmt::Debug,
+};
+
+//**************************************************************************************************
+// Definitions
+//**************************************************************************************************
+
+/// Unique identifier for the reference
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub struct RefID(pub(crate) usize);
+
+impl RefID {
+    /// Creates a new reference id from the given number
+    pub const fn new(x: usize) -> Self {
+        RefID(x)
+    }
+
+    /// Returns the number representing this reference id.
+    pub fn number(&self) -> usize {
+        self.0
+    }
+}
+
+/// An edge in the borrow graph
+#[derive(Clone)]
+pub(crate) struct BorrowEdge<Loc: Copy, Lbl: Clone + Ord> {
+    /// true if it is an exact (strong) edge,
+    /// false if it is a prefix (weak) edge
+    pub(crate) strong: bool,
+    /// The path (either exact/prefix strong/weak) for the borrow relationship of this edge
+    pub(crate) path: Path<Lbl>,
+    /// Location information for the edge
+    pub(crate) loc: Loc,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct BorrowEdgeSet<Loc: Copy, Lbl: Clone + Ord> {
+    edges: BTreeSet<BorrowEdge<Loc, Lbl>>,
+    // true if the set has hit the `MAX_EDGE_SET_SIZE`
+    // See `MAX_EDGE_SET_SIZE` for more details
+    overflown: bool,
+}
+
+/// Represents outgoing edges in the borrow graph
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct BorrowEdges<Loc: Copy, Lbl: Clone + Ord>(
+    pub(crate) BTreeMap<RefID, BorrowEdgeSet<Loc, Lbl>>,
+);
+
+/// Represents the borrow relationships and information for a node in the borrow graph, i.e
+/// for a single reference
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct Ref<Loc: Copy, Lbl: Clone + Ord> {
+    /// Parent to child
+    /// 'self' is borrowed by _
+    pub(crate) borrowed_by: BorrowEdges<Loc, Lbl>,
+    /// Child to parent
+    /// 'self' borrows from _
+    /// Needed for efficient querying, but should be in one-to-one corespondence with borrowed by
+    /// i.e. x is borrowed by y IFF y borrows from x
+    pub(crate) borrows_from: BTreeSet<RefID>,
+    /// true if mutable, false otherwise
+    pub(crate) mutable: bool,
+}
+
+//**************************************************************************************************
+// Impls
+//**************************************************************************************************
+
+impl<Loc: Copy, Lbl: Clone + Ord> BorrowEdge<Loc, Lbl> {
+    pub(crate) fn leq(&self, other: &Self) -> bool {
+        self == other || (!self.strong && paths::leq(&self.path, &other.path))
+    }
+}
+
+// The borrow set has a maximum size.
+// Beyond that size, the borrow-set becomes lossy and is considered to borrow any possible edge
+// (or extension) from the source reference
+pub const MAX_EDGE_SET_SIZE: usize = 10;
+impl<Loc: Copy, Lbl: Clone + Ord> BorrowEdgeSet<Loc, Lbl> {
+    pub(crate) fn new() -> Self {
+        Self {
+            edges: BTreeSet::new(),
+            overflown: false,
+        }
+    }
+
+    pub(crate) fn insert(&mut self, edge: BorrowEdge<Loc, Lbl>) {
+        debug_assert!(self.edges.len() <= MAX_EDGE_SET_SIZE);
+        if self.overflown {
+            debug_assert!(!self.is_empty());
+            return;
+        }
+        if self.edges.len() + 1 > MAX_EDGE_SET_SIZE {
+            let loc = edge.loc;
+            self.edges = BTreeSet::from([BorrowEdge {
+                strong: false,
+                path: vec![],
+                loc,
+            }]);
+            self.overflown = true
+        } else {
+            self.edges.insert(edge);
+        }
+    }
+
+    pub(crate) fn remove(&mut self, edge: &BorrowEdge<Loc, Lbl>) -> bool {
+        let was_removed = self.edges.remove(edge);
+        debug_assert!(was_removed);
+        was_removed
+    }
+
+    pub(crate) fn len(&self) -> usize {
+        self.edges.len()
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.edges.is_empty()
+    }
+
+    pub(crate) fn iter(&self) -> std::collections::btree_set::Iter<BorrowEdge<Loc, Lbl>> {
+        debug_assert!(self.overflown || !self.is_empty());
+        self.edges.iter()
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> BorrowEdges<Loc, Lbl> {
+    pub(crate) fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> Ref<Loc, Lbl> {
+    pub(crate) fn new(mutable: bool) -> Self {
+        let borrowed_by = BorrowEdges::new();
+        let borrows_from = BTreeSet::new();
+        Self {
+            borrowed_by,
+            borrows_from,
+            mutable,
+        }
+    }
+}
+
+//**********************************************************************************************
+// Remap
+//**********************************************************************************************
+
+impl<Loc: Copy, Lbl: Clone + Ord> BorrowEdges<Loc, Lbl> {
+    /// Utility for remapping the reference ids according the `id_map` provided
+    /// If it is not in the map, the id remains the same
+    pub(crate) fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
+        let _before = self.0.len();
+        self.0 = std::mem::take(&mut self.0)
+            .into_iter()
+            .map(|(id, edges)| (id_map.get(&id).copied().unwrap_or(id), edges))
+            .collect();
+        let _after = self.0.len();
+        debug_assert!(_before == _after)
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> Ref<Loc, Lbl> {
+    /// Utility for remapping the reference ids according the `id_map` provided
+    /// If it is not in the map, the id remains the same
+    pub(crate) fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
+        self.borrowed_by.remap_refs(id_map);
+        remap_set(&mut self.borrows_from, id_map)
+    }
+}
+
+//**********************************************************************************************
+// Traits
+//**********************************************************************************************
+
+/// Dummy struct used to implement traits for BorrowEdge that skips over the loc field
+#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+struct BorrowEdgeNoLoc<'a, Lbl: Clone> {
+    strong: bool,
+    path: &'a Path<Lbl>,
+}
+
+impl<'a, Lbl: Clone + Ord> BorrowEdgeNoLoc<'a, Lbl> {
+    fn new<Loc: Copy>(e: &'a BorrowEdge<Loc, Lbl>) -> Self {
+        BorrowEdgeNoLoc {
+            strong: e.strong,
+            path: &e.path,
+        }
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> PartialEq for BorrowEdge<Loc, Lbl> {
+    fn eq(&self, other: &BorrowEdge<Loc, Lbl>) -> bool {
+        BorrowEdgeNoLoc::new(self) == BorrowEdgeNoLoc::new(other)
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> Eq for BorrowEdge<Loc, Lbl> {}
+
+#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+impl<Loc: Copy, Lbl: Clone + Ord> PartialOrd for BorrowEdge<Loc, Lbl> {
+    fn partial_cmp(&self, other: &BorrowEdge<Loc, Lbl>) -> Option<Ordering> {
+        BorrowEdgeNoLoc::new(self).partial_cmp(&BorrowEdgeNoLoc::new(other))
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord> Ord for BorrowEdge<Loc, Lbl> {
+    fn cmp(&self, other: &BorrowEdge<Loc, Lbl>) -> Ordering {
+        BorrowEdgeNoLoc::new(self).cmp(&BorrowEdgeNoLoc::new(other))
+    }
+}
+
+impl<Loc: Copy, Lbl: Clone + Ord + Debug> Debug for BorrowEdge<Loc, Lbl> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        BorrowEdgeNoLoc::new(self).fmt(f)
+    }
+}
+
+//**********************************************************************************************
+// Iteration
+//**********************************************************************************************
+
+impl<Loc: Copy, Lbl: Clone + Ord> IntoIterator for BorrowEdgeSet<Loc, Lbl> {
+    type Item = BorrowEdge<Loc, Lbl>;
+    type IntoIter = std::collections::btree_set::IntoIter<BorrowEdge<Loc, Lbl>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        debug_assert!(self.overflown || !self.is_empty());
+        self.edges.into_iter()
+    }
+}
+
+impl<'a, Loc: Copy, Lbl: Clone + Ord> IntoIterator for &'a BorrowEdgeSet<Loc, Lbl> {
+    type Item = &'a BorrowEdge<Loc, Lbl>;
+    type IntoIter = std::collections::btree_set::Iter<'a, BorrowEdge<Loc, Lbl>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        debug_assert!(self.overflown || !self.is_empty());
+        self.edges.iter()
+    }
+}
diff --git a/vendors/move/crates/move-borrow-graph/src/shared.rs b/vendors/move/crates/move-borrow-graph/src/shared.rs
new file mode 100644
index 000000000..b3baca041
--- /dev/null
+++ b/vendors/move/crates/move-borrow-graph/src/shared.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use std::collections::{BTreeMap, BTreeSet};
+
+pub fn remap_set<T: Copy + Ord>(set: &mut BTreeSet<T>, id_map: &BTreeMap<T, T>) {
+    let _before = set.len();
+    *set = std::mem::take(set)
+        .into_iter()
+        .map(|x| id_map.get(&x).copied().unwrap_or(x))
+        .collect();
+    let _after = set.len();
+    debug_assert!(_before == _after);
+}
diff --git a/vendors/move/crates/move-bytecode-source-map/Cargo.toml b/vendors/move/crates/move-bytecode-source-map/Cargo.toml
new file mode 100644
index 000000000..a03b74dac
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "move-bytecode-source-map"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-symbol-pool.workspace = true
+move-binary-format.workspace = true
+move-command-line-common.workspace = true
+
+bcs.workspace = true
+
+serde.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-bytecode-source-map/src/lib.rs b/vendors/move/crates/move-bytecode-source-map/src/lib.rs
new file mode 100644
index 000000000..464b9364d
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/src/lib.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod mapping;
+pub mod marking;
+pub mod source_map;
+pub mod utils;
diff --git a/vendors/move/crates/move-bytecode-source-map/src/mapping.rs b/vendors/move/crates/move-bytecode-source-map/src/mapping.rs
new file mode 100644
index 000000000..81db9cf5a
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/src/mapping.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{marking::MarkedSourceMapping, source_map::SourceMap};
+use anyhow::Result;
+use move_binary_format::binary_views::BinaryIndexedView;
+use move_ir_types::location::Loc;
+
+/// An object that associates source code with compiled bytecode and source map.
+#[derive(Debug)]
+pub struct SourceMapping<'view> {
+    // The resulting bytecode from compiling the source map
+    pub bytecode: BinaryIndexedView<'view>,
+
+    // The source map for the bytecode made w.r.t. to the `source_code`
+    pub source_map: SourceMap,
+
+    // The source code for the bytecode. This is not required for disassembly, but it is required
+    // for being able to print out corresponding source code for marked functions and structs.
+    // Unused for now, this will be used when we start printing function/struct markings
+    pub source_code: Option<(String, String)>,
+
+    // Function and struct markings. These are used to lift up annotations/messages on the bytecode
+    // into the disassembled program and/or IR source code.
+    pub marks: Option<MarkedSourceMapping>,
+}
+
+impl<'view> SourceMapping<'view> {
+    pub fn new(source_map: SourceMap, bytecode: BinaryIndexedView<'view>) -> Self {
+        Self {
+            source_map,
+            bytecode,
+            source_code: None,
+            marks: None,
+        }
+    }
+
+    pub fn new_from_view(bytecode: BinaryIndexedView<'view>, default_loc: Loc) -> Result<Self> {
+        Ok(Self::new(
+            SourceMap::dummy_from_view(&bytecode, default_loc)?,
+            bytecode,
+        ))
+    }
+
+    pub fn with_marks(&mut self, marks: MarkedSourceMapping) {
+        self.marks = Some(marks);
+    }
+
+    pub fn with_source_code(&mut self, source_code: (String, String)) {
+        self.source_code = Some(source_code);
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-source-map/src/marking.rs b/vendors/move/crates/move-bytecode-source-map/src/marking.rs
new file mode 100644
index 000000000..f280eeed1
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/src/marking.rs
@@ -0,0 +1,141 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    CodeOffset, FunctionDefinitionIndex, MemberCount, StructDefinitionIndex, TableIndex,
+};
+use std::collections::{BTreeMap, HashMap};
+
+/// A data structure used to track any markings or extra information that is desired to be exposed
+/// in the disassembled function definition. Every marking can have multiple messages associated with it.
+#[derive(Debug, Default)]
+pub struct FunctionMarking {
+    // Code offset markings
+    pub code_offsets: BTreeMap<CodeOffset, Vec<String>>,
+
+    // Type parameters markings
+    pub type_param_offsets: BTreeMap<usize, Vec<String>>,
+}
+
+/// A data structure used to track any markings or extra information that is desired to be exposed
+/// in the disassembled struct definition. Every marking can have multiple messages associated with it.
+#[derive(Debug, Default)]
+pub struct StructMarking {
+    // Field markings
+    pub fields: BTreeMap<MemberCount, Vec<String>>,
+
+    // Type parameter markings
+    pub type_param_offsets: BTreeMap<usize, Vec<String>>,
+}
+
+/// A data structure that contains markings for both functions and structs. This will be used for
+/// printing out error messages and the like.
+#[derive(Debug, Default)]
+pub struct MarkedSourceMapping {
+    // Any function markings
+    function_marks: HashMap<TableIndex, FunctionMarking>,
+
+    // Any struct marking
+    struct_marks: HashMap<TableIndex, StructMarking>,
+}
+
+impl FunctionMarking {
+    pub fn new() -> Self {
+        Self {
+            code_offsets: BTreeMap::new(),
+            type_param_offsets: BTreeMap::new(),
+        }
+    }
+
+    pub fn code_offset(&mut self, code_offset: CodeOffset, message: String) {
+        self.code_offsets
+            .entry(code_offset)
+            .or_default()
+            .push(message)
+    }
+
+    pub fn type_param(&mut self, type_param_index: usize, message: String) {
+        self.type_param_offsets
+            .entry(type_param_index)
+            .or_default()
+            .push(message)
+    }
+}
+
+impl StructMarking {
+    pub fn new() -> Self {
+        Self {
+            fields: BTreeMap::new(),
+            type_param_offsets: BTreeMap::new(),
+        }
+    }
+
+    pub fn field(&mut self, field_index: MemberCount, message: String) {
+        self.fields.entry(field_index).or_default().push(message)
+    }
+
+    pub fn type_param(&mut self, type_param_index: usize, message: String) {
+        self.type_param_offsets
+            .entry(type_param_index)
+            .or_default()
+            .push(message)
+    }
+}
+
+impl MarkedSourceMapping {
+    pub fn new() -> Self {
+        Self {
+            function_marks: HashMap::new(),
+            struct_marks: HashMap::new(),
+        }
+    }
+
+    pub fn mark_code_offset(
+        &mut self,
+        function_definition_index: FunctionDefinitionIndex,
+        code_offset: CodeOffset,
+        message: String,
+    ) {
+        self.function_marks
+            .entry(function_definition_index.0)
+            .or_default()
+            .code_offset(code_offset, message)
+    }
+
+    pub fn mark_function_type_param(
+        &mut self,
+        function_definition_index: FunctionDefinitionIndex,
+        type_param_offset: usize,
+        message: String,
+    ) {
+        self.function_marks
+            .entry(function_definition_index.0)
+            .or_default()
+            .type_param(type_param_offset, message)
+    }
+
+    pub fn mark_struct_field(
+        &mut self,
+        struct_definition_index: StructDefinitionIndex,
+        field_index: MemberCount,
+        message: String,
+    ) {
+        self.struct_marks
+            .entry(struct_definition_index.0)
+            .or_default()
+            .field(field_index, message)
+    }
+
+    pub fn mark_struct_type_param(
+        &mut self,
+        struct_definition_index: StructDefinitionIndex,
+        type_param_offset: usize,
+        message: String,
+    ) {
+        self.struct_marks
+            .entry(struct_definition_index.0)
+            .or_default()
+            .type_param(type_param_offset, message)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-source-map/src/source_map.rs b/vendors/move/crates/move-bytecode-source-map/src/source_map.rs
new file mode 100644
index 000000000..7f337936d
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/src/source_map.rs
@@ -0,0 +1,575 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{format_err, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{
+        AbilitySet, CodeOffset, CodeUnit, ConstantPoolIndex, FunctionDefinitionIndex, LocalIndex,
+        MemberCount, ModuleHandleIndex, SignatureIndex, StructDefinition, StructDefinitionIndex,
+        TableIndex,
+    },
+};
+use move_command_line_common::files::FileHash;
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use move_ir_types::{
+    ast::{ConstantName, ModuleIdent, ModuleName, NopLabel},
+    location::Loc,
+};
+use move_symbol_pool::Symbol;
+use serde::{Deserialize, Serialize};
+use std::{collections::BTreeMap, ops::Bound};
+
+//***************************************************************************
+// Source location mapping
+//***************************************************************************
+
+pub type SourceName = (String, Loc);
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct StructSourceMap {
+    /// The source declaration location of the struct
+    pub definition_location: Loc,
+
+    /// Important: type parameters need to be added in the order of their declaration
+    pub type_parameters: Vec<SourceName>,
+
+    /// Note that fields to a struct source map need to be added in the order of the fields in the
+    /// struct definition.
+    pub fields: Vec<Loc>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct FunctionSourceMap {
+    /// The source location for the definition of this entire function. Note that in certain
+    /// instances this will have no valid source location e.g. the "main" function for modules that
+    /// are treated as programs are synthesized and therefore have no valid source location.
+    pub definition_location: Loc,
+
+    /// The names of the type parameters to the function.
+    /// Note that type parameters need to be added in the order of their declaration.
+    pub type_parameters: Vec<SourceName>,
+
+    /// The names of the parameters to the function.
+    pub parameters: Vec<SourceName>,
+
+    /// The index into the vector is the local's index. The corresponding `(Identifier, Location)` tuple
+    /// is the name and location of the local.
+    pub locals: Vec<SourceName>,
+
+    /// A map to the code offset for a corresponding nop. Nop's are used as markers for some
+    /// high level language information
+    pub nops: BTreeMap<NopLabel, CodeOffset>,
+
+    /// The source location map for the function body.
+    pub code_map: BTreeMap<CodeOffset, Loc>,
+
+    /// Whether this function is a native function or not.
+    pub is_native: bool,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct SourceMap {
+    /// The source location for the definition of the module or script that this source map is for.
+    pub definition_location: Loc,
+
+    /// The name <address.module_name> of the module that this source map is for.
+    /// `None` if this source map corresponds to a script.
+    pub module_name_opt: Option<(AccountAddress, Identifier)>,
+
+    // A mapping of `StructDefinitionIndex` to source map for each struct/resource.
+    struct_map: BTreeMap<TableIndex, StructSourceMap>,
+
+    // A mapping of `FunctionDefinitionIndex` to the soure map for that function.
+    // For scripts, this map has a single element that points to a source map corresponding to the
+    // script's "main" function.
+    function_map: BTreeMap<TableIndex, FunctionSourceMap>,
+
+    // A mapping of constant name to its `ConstantPoolIndex`.
+    pub constant_map: BTreeMap<ConstantName, TableIndex>,
+}
+
+impl StructSourceMap {
+    pub fn new(definition_location: Loc) -> Self {
+        Self {
+            definition_location,
+            type_parameters: Vec::new(),
+            fields: Vec::new(),
+        }
+    }
+
+    pub fn add_type_parameter(&mut self, type_name: SourceName) {
+        self.type_parameters.push(type_name)
+    }
+
+    pub fn get_type_parameter_name(&self, type_parameter_idx: usize) -> Option<SourceName> {
+        self.type_parameters.get(type_parameter_idx).cloned()
+    }
+
+    pub fn add_field_location(&mut self, field_loc: Loc) {
+        self.fields.push(field_loc)
+    }
+
+    pub fn get_field_location(&self, field_index: MemberCount) -> Option<Loc> {
+        self.fields.get(field_index as usize).cloned()
+    }
+
+    pub fn dummy_struct_map(
+        &mut self,
+        view: &BinaryIndexedView,
+        struct_def: &StructDefinition,
+        default_loc: Loc,
+    ) -> Result<()> {
+        let struct_handle = view.struct_handle_at(struct_def.struct_handle);
+
+        // Add dummy locations for the fields
+        match struct_def.declared_field_count() {
+            Err(_) => (),
+            Ok(count) => (0..count).for_each(|_| self.fields.push(default_loc)),
+        }
+
+        for i in 0..struct_handle.type_parameters.len() {
+            let name = format!("Ty{}", i);
+            self.add_type_parameter((name, default_loc))
+        }
+        Ok(())
+    }
+}
+
+impl FunctionSourceMap {
+    pub fn new(definition_location: Loc, is_native: bool) -> Self {
+        Self {
+            definition_location,
+            type_parameters: Vec::new(),
+            parameters: Vec::new(),
+            locals: Vec::new(),
+            code_map: BTreeMap::new(),
+            is_native,
+            nops: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_type_parameter(&mut self, type_name: SourceName) {
+        self.type_parameters.push(type_name)
+    }
+
+    pub fn get_type_parameter_name(&self, type_parameter_idx: usize) -> Option<SourceName> {
+        self.type_parameters.get(type_parameter_idx).cloned()
+    }
+
+    /// A single source-level instruction may possibly map to a number of bytecode instructions. In
+    /// order to not store a location for each instruction, we instead use a BTreeMap to represent
+    /// a segment map (holding the left-hand-sides of each segment).  Thus, an instruction
+    /// sequence is always marked from its starting point. To determine what part of the source
+    /// code corresponds to a given `CodeOffset` we query to find the element that is the largest
+    /// number less than or equal to the query. This will give us the location for that bytecode
+    /// range.
+    pub fn add_code_mapping(&mut self, start_offset: CodeOffset, location: Loc) {
+        let possible_segment = self.get_code_location(start_offset);
+        match possible_segment.map(|other_location| other_location != location) {
+            Some(true) | None => {
+                self.code_map.insert(start_offset, location);
+            }
+            _ => (),
+        };
+    }
+
+    /// Record the code offset for an Nop label
+    pub fn add_nop_mapping(&mut self, label: NopLabel, offset: CodeOffset) {
+        assert!(self.nops.insert(label, offset).is_none())
+    }
+
+    // Note that it is important that locations be added in order.
+    pub fn add_local_mapping(&mut self, name: SourceName) {
+        self.locals.push(name);
+    }
+
+    pub fn add_parameter_mapping(&mut self, name: SourceName) {
+        self.parameters.push(name)
+    }
+
+    /// Recall that we are using a segment tree. We therefore lookup the location for the code
+    /// offset by performing a range query for the largest number less than or equal to the code
+    /// offset passed in.
+    pub fn get_code_location(&self, code_offset: CodeOffset) -> Option<Loc> {
+        // If the function is a native, and we are asking for the "first bytecode offset in it"
+        // return the location of the declaration of the function. Otherwise, we will return
+        // `None`.
+        if self.is_native {
+            if code_offset == 0 {
+                Some(self.definition_location)
+            } else {
+                None
+            }
+        } else {
+            self.code_map
+                .range((Bound::Unbounded, Bound::Included(&code_offset)))
+                .next_back()
+                .map(|(_, vl)| *vl)
+        }
+    }
+
+    pub fn get_parameter_or_local_name(&self, idx: u64) -> Option<SourceName> {
+        let idx = idx as usize;
+        if idx < self.parameters.len() {
+            self.parameters.get(idx).cloned()
+        } else {
+            self.locals.get(idx - self.parameters.len()).cloned()
+        }
+    }
+
+    pub fn make_local_name_to_index_map(&self) -> BTreeMap<&String, LocalIndex> {
+        self.parameters
+            .iter()
+            .chain(&self.locals)
+            .enumerate()
+            .map(|(i, (n, _))| (n, i as LocalIndex))
+            .collect()
+    }
+
+    pub fn dummy_function_map(
+        &mut self,
+        view: &BinaryIndexedView,
+        type_parameters: &[AbilitySet],
+        parameters: SignatureIndex,
+        code: Option<CodeUnit>,
+        default_loc: Loc,
+    ) -> Result<()> {
+        // Generate names for each type parameter
+        for i in 0..type_parameters.len() {
+            let name = format!("Ty{}", i);
+            self.add_type_parameter((name, default_loc))
+        }
+
+        // Generate names for each parameter
+        let params = view.signature_at(parameters);
+        for i in 0..params.0.len() {
+            let name = format!("Arg{}", i);
+            self.add_parameter_mapping((name, default_loc))
+        }
+
+        if let Some(code) = code {
+            let locals = view.signature_at(code.locals);
+            for i in 0..locals.0.len() {
+                let name = format!("loc{}", i);
+                self.add_local_mapping((name, default_loc))
+            }
+        }
+
+        // We just need to insert the code map at the 0'th index since we represent this with a
+        // segment map
+        self.add_code_mapping(0, default_loc);
+
+        Ok(())
+    }
+}
+
+impl SourceMap {
+    pub fn new(definition_location: Loc, module_name_opt: Option<ModuleIdent>) -> Self {
+        let module_name_opt = module_name_opt.map(|module_name| {
+            let ident = Identifier::new(module_name.name.0.as_str()).unwrap();
+            (module_name.address, ident)
+        });
+        Self {
+            definition_location,
+            module_name_opt,
+            struct_map: BTreeMap::new(),
+            function_map: BTreeMap::new(),
+            constant_map: BTreeMap::new(),
+        }
+    }
+
+    pub fn check(&self, file_contents: &str) -> bool {
+        let file_hash = FileHash::new(file_contents);
+        self.definition_location.file_hash() == file_hash
+    }
+
+    pub fn add_top_level_function_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        location: Loc,
+        is_native: bool,
+    ) -> Result<()> {
+        self.function_map.insert(fdef_idx.0, FunctionSourceMap::new(location, is_native)).map_or(Ok(()), |_| { Err(format_err!(
+                    "Multiple functions at same function definition index encountered when constructing source map"
+                )) })
+    }
+
+    pub fn add_function_type_parameter_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        name: SourceName,
+    ) -> Result<()> {
+        let func_entry = self.function_map.get_mut(&fdef_idx.0).ok_or_else(|| {
+            format_err!("Tried to add function type parameter mapping to undefined function index")
+        })?;
+        func_entry.add_type_parameter(name);
+        Ok(())
+    }
+
+    pub fn get_function_type_parameter_name(
+        &self,
+        fdef_idx: FunctionDefinitionIndex,
+        type_parameter_idx: usize,
+    ) -> Result<SourceName> {
+        self.function_map
+            .get(&fdef_idx.0)
+            .and_then(|function_source_map| {
+                function_source_map.get_type_parameter_name(type_parameter_idx)
+            })
+            .ok_or_else(|| format_err!("Unable to get function type parameter name"))
+    }
+
+    pub fn add_code_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        start_offset: CodeOffset,
+        location: Loc,
+    ) -> Result<()> {
+        let func_entry = self
+            .function_map
+            .get_mut(&fdef_idx.0)
+            .ok_or_else(|| format_err!("Tried to add code mapping to undefined function index"))?;
+        func_entry.add_code_mapping(start_offset, location);
+        Ok(())
+    }
+
+    pub fn add_nop_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        label: NopLabel,
+        start_offset: CodeOffset,
+    ) -> Result<()> {
+        let func_entry = self
+            .function_map
+            .get_mut(&fdef_idx.0)
+            .ok_or_else(|| format_err!("Tried to add nop mapping to undefined function index"))?;
+        func_entry.add_nop_mapping(label, start_offset);
+        Ok(())
+    }
+
+    /// Given a function definition and a code offset within that function definition, this returns
+    /// the location in the source code associated with the instruction at that offset.
+    pub fn get_code_location(
+        &self,
+        fdef_idx: FunctionDefinitionIndex,
+        offset: CodeOffset,
+    ) -> Result<Loc> {
+        self.function_map
+            .get(&fdef_idx.0)
+            .and_then(|function_source_map| function_source_map.get_code_location(offset))
+            .ok_or_else(|| format_err!("Tried to get code location from undefined function index"))
+    }
+
+    pub fn add_local_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        name: SourceName,
+    ) -> Result<()> {
+        let func_entry = self
+            .function_map
+            .get_mut(&fdef_idx.0)
+            .ok_or_else(|| format_err!("Tried to add local mapping to undefined function index"))?;
+        func_entry.add_local_mapping(name);
+        Ok(())
+    }
+
+    pub fn add_parameter_mapping(
+        &mut self,
+        fdef_idx: FunctionDefinitionIndex,
+        name: SourceName,
+    ) -> Result<()> {
+        let func_entry = self.function_map.get_mut(&fdef_idx.0).ok_or_else(|| {
+            format_err!("Tried to add parameter mapping to undefined function index")
+        })?;
+        func_entry.add_parameter_mapping(name);
+        Ok(())
+    }
+
+    pub fn get_parameter_or_local_name(
+        &self,
+        fdef_idx: FunctionDefinitionIndex,
+        index: u64,
+    ) -> Result<SourceName> {
+        self.function_map
+            .get(&fdef_idx.0)
+            .and_then(|function_source_map| function_source_map.get_parameter_or_local_name(index))
+            .ok_or_else(|| format_err!("Tried to get local name at undefined function index"))
+    }
+
+    pub fn add_top_level_struct_mapping(
+        &mut self,
+        struct_def_idx: StructDefinitionIndex,
+        location: Loc,
+    ) -> Result<()> {
+        self.struct_map.insert(struct_def_idx.0, StructSourceMap::new(location)).map_or(Ok(()), |_| { Err(format_err!(
+                "Multiple structs at same struct definition index encountered when constructing source map"
+                )) })
+    }
+
+    pub fn add_const_mapping(
+        &mut self,
+        const_idx: ConstantPoolIndex,
+        name: ConstantName,
+    ) -> Result<()> {
+        self.constant_map
+            .insert(name, const_idx.0)
+            .map_or(Ok(()), |_| {
+                Err(format_err!(
+                    "Multiple constans with same name encountered when constructing source map"
+                ))
+            })
+    }
+
+    pub fn add_struct_field_mapping(
+        &mut self,
+        struct_def_idx: StructDefinitionIndex,
+        location: Loc,
+    ) -> Result<()> {
+        let struct_entry = self
+            .struct_map
+            .get_mut(&struct_def_idx.0)
+            .ok_or_else(|| format_err!("Tried to add file mapping to undefined struct index"))?;
+        struct_entry.add_field_location(location);
+        Ok(())
+    }
+
+    pub fn get_struct_field_name(
+        &self,
+        struct_def_idx: StructDefinitionIndex,
+        field_idx: MemberCount,
+    ) -> Option<Loc> {
+        self.struct_map
+            .get(&struct_def_idx.0)
+            .and_then(|struct_source_map| struct_source_map.get_field_location(field_idx))
+    }
+
+    pub fn add_struct_type_parameter_mapping(
+        &mut self,
+        struct_def_idx: StructDefinitionIndex,
+        name: SourceName,
+    ) -> Result<()> {
+        let struct_entry = self.struct_map.get_mut(&struct_def_idx.0).ok_or_else(|| {
+            format_err!("Tried to add struct type parameter mapping to undefined struct index")
+        })?;
+        struct_entry.add_type_parameter(name);
+        Ok(())
+    }
+
+    pub fn get_struct_type_parameter_name(
+        &self,
+        struct_def_idx: StructDefinitionIndex,
+        type_parameter_idx: usize,
+    ) -> Result<SourceName> {
+        self.struct_map
+            .get(&struct_def_idx.0)
+            .and_then(|struct_source_map| {
+                struct_source_map.get_type_parameter_name(type_parameter_idx)
+            })
+            .ok_or_else(|| format_err!("Unable to get struct type parameter name"))
+    }
+
+    pub fn get_function_source_map(
+        &self,
+        fdef_idx: FunctionDefinitionIndex,
+    ) -> Result<&FunctionSourceMap> {
+        self.function_map
+            .get(&fdef_idx.0)
+            .ok_or_else(|| format_err!("Unable to get function source map"))
+    }
+
+    pub fn get_struct_source_map(
+        &self,
+        struct_def_idx: StructDefinitionIndex,
+    ) -> Result<&StructSourceMap> {
+        self.struct_map
+            .get(&struct_def_idx.0)
+            .ok_or_else(|| format_err!("Unable to get struct source map"))
+    }
+
+    /// Create a 'dummy' source map for a compiled module or script. This is useful for e.g. disassembling
+    /// with generated or real names depending upon if the source map is available or not.
+    pub fn dummy_from_view(view: &BinaryIndexedView, default_loc: Loc) -> Result<Self> {
+        let module_ident = match view {
+            BinaryIndexedView::Script(..) => None,
+            BinaryIndexedView::Module(..) => {
+                let module_handle = view.module_handle_at(ModuleHandleIndex::new(0));
+                let module_name = ModuleName(Symbol::from(
+                    view.identifier_at(module_handle.name).as_str(),
+                ));
+                let address = *view.address_identifier_at(module_handle.address);
+                Some(ModuleIdent::new(module_name, address))
+            }
+        };
+        let mut empty_source_map = Self::new(default_loc, module_ident);
+
+        match view {
+            BinaryIndexedView::Script(script) => {
+                empty_source_map.add_top_level_function_mapping(
+                    FunctionDefinitionIndex(0_u16),
+                    default_loc,
+                    false,
+                )?;
+                empty_source_map
+                    .function_map
+                    .get_mut(&(0_u16))
+                    .ok_or_else(|| {
+                        format_err!("Unable to get function map while generating dummy")
+                    })?
+                    .dummy_function_map(
+                        view,
+                        &script.type_parameters,
+                        script.parameters,
+                        Some(script.code.clone()),
+                        default_loc,
+                    )?;
+            }
+            BinaryIndexedView::Module(module) => {
+                for (function_idx, function_def) in module.function_defs.iter().enumerate() {
+                    empty_source_map.add_top_level_function_mapping(
+                        FunctionDefinitionIndex(function_idx as TableIndex),
+                        default_loc,
+                        false,
+                    )?;
+                    let function_handle = module.function_handle_at(function_def.function);
+                    empty_source_map
+                        .function_map
+                        .get_mut(&(function_idx as TableIndex))
+                        .ok_or_else(|| {
+                            format_err!("Unable to get function map while generating dummy")
+                        })?
+                        .dummy_function_map(
+                            view,
+                            &function_handle.type_parameters,
+                            function_handle.parameters,
+                            function_def.code.clone(),
+                            default_loc,
+                        )?;
+                }
+            }
+        };
+
+        for (struct_idx, struct_def) in view.struct_defs().into_iter().flatten().enumerate() {
+            empty_source_map.add_top_level_struct_mapping(
+                StructDefinitionIndex(struct_idx as TableIndex),
+                default_loc,
+            )?;
+            empty_source_map
+                .struct_map
+                .get_mut(&(struct_idx as TableIndex))
+                .ok_or_else(|| format_err!("Unable to get struct map while generating dummy"))?
+                .dummy_struct_map(view, struct_def, default_loc)?;
+        }
+
+        for const_idx in 0..view.constant_pool().len() {
+            empty_source_map.add_const_mapping(
+                ConstantPoolIndex(const_idx as TableIndex),
+                ConstantName(Symbol::from(format!("CONST{}", const_idx))),
+            )?;
+        }
+
+        Ok(empty_source_map)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-source-map/src/utils.rs b/vendors/move/crates/move-bytecode-source-map/src/utils.rs
new file mode 100644
index 000000000..f73d12034
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/src/utils.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::source_map::SourceMap;
+use anyhow::{format_err, Result};
+use move_ir_types::location::Loc;
+use std::{fs::File, io::Read, path::Path};
+
+pub type Error = (Loc, String);
+pub type Errors = Vec<Error>;
+
+pub fn source_map_from_file(file_path: &Path) -> Result<SourceMap> {
+    let mut bytes = Vec::new();
+    File::open(file_path)
+        .ok()
+        .and_then(|mut file| file.read_to_end(&mut bytes).ok())
+        .ok_or_else(|| format_err!("Error while reading in source map information"))?;
+    bcs::from_bytes::<SourceMap>(&bytes)
+        .map_err(|_| format_err!("Error deserializing into source map"))
+}
diff --git a/vendors/move/crates/move-bytecode-source-map/tests/dummies.rs b/vendors/move/crates/move-bytecode-source-map/tests/dummies.rs
new file mode 100644
index 000000000..a8f9d8301
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-source-map/tests/dummies.rs
@@ -0,0 +1,16 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{binary_views::BinaryIndexedView, file_format::empty_script};
+use move_bytecode_source_map::mapping::SourceMapping;
+use move_ir_types::location::Spanned;
+
+#[test]
+fn test_empty_script() {
+    let script = empty_script();
+    let view = BinaryIndexedView::Script(&script);
+    let location = Spanned::unsafe_no_loc(()).loc;
+    SourceMapping::new_from_view(view, location)
+        .expect("unable to build source mapping for empty script");
+}
diff --git a/vendors/move/crates/move-bytecode-utils/Cargo.toml b/vendors/move/crates/move-bytecode-utils/Cargo.toml
new file mode 100644
index 000000000..32af6dec7
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-utils/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "move-bytecode-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Libraries for working with sets of Move bytecode modules"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+move-binary-format.workspace = true
+move-core-types.workspace = true
+petgraph.workspace = true
+serde-reflection.workspace = true
diff --git a/vendors/move/crates/move-bytecode-utils/src/dependency_graph.rs b/vendors/move/crates/move-bytecode-utils/src/dependency_graph.rs
new file mode 100644
index 000000000..8c855b408
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-utils/src/dependency_graph.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{access::ModuleAccess, file_format::CompiledModule};
+use petgraph::graphmap::DiGraphMap;
+
+use anyhow::{bail, Result};
+use std::collections::BTreeMap;
+
+/// Directed graph capturing dependencies between modules
+pub struct DependencyGraph<'a> {
+    /// Set of modules guaranteed to be closed under dependencies
+    modules: Vec<&'a CompiledModule>,
+    graph: DiGraphMap<ModuleIndex, ()>,
+}
+
+#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq, PartialOrd, Ord)]
+struct ModuleIndex(usize);
+
+impl<'a> DependencyGraph<'a> {
+    /// Construct a dependency graph from a set of `modules`.
+    /// Panics if `modules` contains duplicates or is not closed under the depedency relation
+    pub fn new(module_iter: impl IntoIterator<Item = &'a CompiledModule>) -> Self {
+        let mut modules = vec![];
+        let mut reverse_modules = BTreeMap::new();
+        for (i, m) in module_iter.into_iter().enumerate() {
+            modules.push(m);
+            assert!(
+                reverse_modules
+                    .insert(m.self_id(), ModuleIndex(i))
+                    .is_none(),
+                "Duplicate module found"
+            );
+        }
+        let mut graph = DiGraphMap::new();
+        for module in &modules {
+            let module_idx: ModuleIndex = *reverse_modules.get(&module.self_id()).unwrap();
+            let deps = module.immediate_dependencies();
+            if deps.is_empty() {
+                graph.add_node(module_idx);
+            } else {
+                for dep in deps {
+                    let dep_idx = *reverse_modules
+                        .get(&dep)
+                        .unwrap_or_else(|| panic!("Missing dependency {}", dep));
+                    graph.add_edge(dep_idx, module_idx, ());
+                }
+            }
+        }
+        DependencyGraph { modules, graph }
+    }
+
+    /// Return an iterator over the modules in `self` in topological order--modules with least deps first.
+    /// Fails with an error if `self` contains circular dependencies
+    pub fn compute_topological_order(&self) -> Result<impl Iterator<Item = &CompiledModule>> {
+        match petgraph::algo::toposort(&self.graph, None) {
+            Err(_) => bail!("Circular dependency detected"),
+            Ok(ordered_idxs) => Ok(ordered_idxs.into_iter().map(move |idx| self.modules[idx.0])),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-utils/src/layout.rs b/vendors/move/crates/move-bytecode-utils/src/layout.rs
new file mode 100644
index 000000000..4962197b4
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-utils/src/layout.rs
@@ -0,0 +1,516 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::module_cache::GetModule;
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{SignatureToken, StructDefinition, StructFieldInformation, StructHandleIndex},
+    normalized::{Struct, Type},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use serde_reflection::{ContainerFormat, Format, Named, Registry};
+use std::{borrow::Borrow, collections::BTreeMap, fmt::Write};
+
+/// Name of the Move `address` type in the serde registry
+const ADDRESS: &str = "AccountAddress";
+
+/// Name of the Move `signer` type in the serde registry
+const SIGNER: &str = "Signer";
+
+/// Name of the Move `u256` type in the serde registry
+const U256_SERDE_NAME: &str = "u256";
+
+/// The maximal value depth that we allow creating a layout for.
+const MAX_VALUE_DEPTH: u64 = 128;
+
+macro_rules! check_depth {
+    ($depth:expr) => {
+        if $depth > MAX_VALUE_DEPTH {
+            anyhow::bail!("Exceeded max value recursion depth when creating struct layout")
+        }
+    };
+}
+
+/// Type for building a registry of serde-reflection friendly struct layouts for Move types.
+/// The layouts created by this type are intended to be passed to the serde-generate tool to create
+/// struct bindings for Move types in source languages that use Move-based services.
+pub struct SerdeLayoutBuilder<'a, T> {
+    registry: Registry,
+    module_resolver: &'a T,
+    config: SerdeLayoutConfig,
+}
+
+#[derive(Default)]
+pub struct SerdeLayoutConfig {
+    /// If separator is Some, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If separator is None, use the same syntax as Move source
+    pub separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    pub omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    pub ignore_phantom_types: bool,
+    /// The LayoutBuilder can operate in two modes: "deep" and "shallow".
+    /// In shallow mode, generate a single layout for the struct or type passed in by the user
+    /// (under the assumption that layouts for dependencies have been generated previously).
+    /// In deep mode, it generate layouts for all of the (transitive) dependencies of the type passed
+    /// in, as well as layouts for the Move ground types like `address` and `signer`. The result is a
+    /// self-contained registry with no unbound typenames
+    pub shallow: bool,
+}
+
+impl<'a, T: GetModule> SerdeLayoutBuilder<'a, T> {
+    /// Create a `LayoutBuilder` with an empty registry and deep layout resolution
+    pub fn new(module_resolver: &'a T) -> Self {
+        Self {
+            registry: Self::default_registry(),
+            module_resolver,
+            config: SerdeLayoutConfig::default(),
+        }
+    }
+
+    /// Create a `LayoutBuilder` with an empty registry and shallow layout resolution
+    pub fn new_with_config(module_resolver: &'a T, config: SerdeLayoutConfig) -> Self {
+        Self {
+            registry: Self::default_registry(),
+            module_resolver,
+            config,
+        }
+    }
+
+    /// Return a registry containing layouts for all the Move ground types (e.g., address)
+    pub fn default_registry() -> Registry {
+        let mut registry = BTreeMap::new();
+        // add Move ground types to registry (address, signer)
+        let address_layout = Box::new(Format::TupleArray {
+            content: Box::new(Format::U8),
+            size: AccountAddress::LENGTH,
+        });
+        registry.insert(
+            ADDRESS.to_string(),
+            ContainerFormat::NewTypeStruct(address_layout.clone()),
+        );
+        registry.insert(
+            SIGNER.to_string(),
+            ContainerFormat::NewTypeStruct(address_layout),
+        );
+
+        registry
+    }
+
+    /// Get the registry of layouts generated so far
+    pub fn registry(&self) -> &Registry {
+        &self.registry
+    }
+
+    /// Get the registry of layouts generated so far
+    pub fn into_registry(self) -> Registry {
+        self.registry
+    }
+
+    /// Add layouts for all types used in `t` to the registry
+    pub fn build_type_layout(&mut self, t: TypeTag) -> Result<Format> {
+        self.build_normalized_type_layout(&Type::from(t), &Vec::new(), 0)
+    }
+
+    /// Add layouts for all types used in `t` to the registry
+    pub fn build_struct_layout(&mut self, s: &StructTag) -> Result<Format> {
+        let serde_type_args = s
+            .type_params
+            .iter()
+            .map(|t| self.build_type_layout(t.clone()))
+            .collect::<Result<Vec<Format>>>()?;
+        self.build_struct_layout_(&s.module_id(), &s.name, &serde_type_args, 0)
+    }
+
+    fn build_normalized_type_layout(
+        &mut self,
+        t: &Type,
+        input_type_args: &[Format],
+        depth: u64,
+    ) -> Result<Format> {
+        use Type::*;
+        check_depth!(depth);
+        Ok(match t {
+            Bool => Format::Bool,
+            U8 => Format::U8,
+            U16 => Format::U16,
+            U32 => Format::U32,
+            U64 => Format::U64,
+            U128 => Format::U128,
+            U256 => Format::TypeName(U256_SERDE_NAME.to_string()),
+            Address => Format::TypeName(ADDRESS.to_string()),
+            Signer => Format::TypeName(SIGNER.to_string()),
+            Struct {
+                address,
+                module,
+                name,
+                type_arguments,
+            } => {
+                let serde_type_args = type_arguments
+                    .iter()
+                    .map(|t| self.build_normalized_type_layout(t, input_type_args, depth + 1))
+                    .collect::<Result<Vec<Format>>>()?;
+                let declaring_module = ModuleId::new(*address, module.clone());
+                self.build_struct_layout_(&declaring_module, name, &serde_type_args, depth + 1)?
+            }
+            Vector(inner_t) => {
+                if matches!(inner_t.as_ref(), U8) {
+                    // specialize vector<u8> as bytes
+                    Format::Bytes
+                } else {
+                    Format::Seq(Box::new(self.build_normalized_type_layout(
+                        inner_t,
+                        input_type_args,
+                        depth + 1,
+                    )?))
+                }
+            }
+            TypeParameter(i) => input_type_args[*i as usize].clone(),
+            Reference(_) | MutableReference(_) => unreachable!(), // structs cannot store references
+        })
+    }
+
+    fn build_struct_layout_(
+        &mut self,
+        module_id: &ModuleId,
+        name: &Identifier,
+        type_arguments: &[Format],
+        depth: u64,
+    ) -> Result<Format> {
+        check_depth!(depth);
+
+        // build a human-readable name for the struct type. this should do the same thing as
+        // StructTag::display(), but it's not easy to use that code here
+
+        let declaring_module = self
+            .module_resolver
+            .get_module_by_id(module_id)
+            .map_err(|e| anyhow::format_err!("{:?}", e))?
+            .expect("Failed to resolve module");
+        let def = declaring_module
+            .borrow()
+            .find_struct_def_by_name(name)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Could not find struct named {} in module {}",
+                    name,
+                    declaring_module.borrow().name()
+                )
+            });
+        let normalized_struct = Struct::new(declaring_module.borrow(), def).1;
+        assert_eq!(
+            normalized_struct.type_parameters.len(),
+            type_arguments.len(),
+            "Wrong number of type arguments for struct"
+        );
+
+        let generics: Vec<String> = type_arguments
+            .iter()
+            .zip(normalized_struct.type_parameters.iter())
+            .filter(|(_, type_param)| {
+                // do not include phantom type arguments in the struct key, since they do not affect the struct layout
+                !(self.config.ignore_phantom_types && type_param.is_phantom)
+            })
+            .map(|(type_arg, _)| print_format_type(type_arg, depth))
+            .collect::<Result<_>>()?;
+        let mut struct_key = String::new();
+        if !self.config.omit_addresses {
+            write!(
+                struct_key,
+                "{}{}",
+                module_id.address(),
+                self.config.separator.as_deref().unwrap_or("::")
+            )
+            .unwrap();
+        }
+        write!(
+            struct_key,
+            "{}{}{}",
+            module_id.name(),
+            self.config.separator.as_deref().unwrap_or("::"),
+            name
+        )
+        .unwrap();
+        if !generics.is_empty() {
+            write!(
+                struct_key,
+                "{}{}{}",
+                self.config.separator.as_deref().unwrap_or("<"),
+                generics.join(self.config.separator.as_deref().unwrap_or(",")),
+                self.config.separator.as_deref().unwrap_or(">")
+            )
+            .unwrap()
+        }
+        if self.config.shallow {
+            return Ok(Format::TypeName(struct_key));
+        }
+
+        if let Some(old_struct) = self.registry.get(&struct_key) {
+            if self.config.omit_addresses || self.config.separator.is_some() {
+                // check for conflicts (e.g., 0x1::M::T and 0x2::M::T that both get stripped to M::T because
+                // omit_addresses is on)
+                if old_struct.clone()
+                    != self.generate_serde_struct(normalized_struct, type_arguments, depth)?
+                {
+                    panic!(
+                        "Name conflict: multiple structs with name {}, but different addresses",
+                        struct_key
+                    )
+                }
+            }
+        } else {
+            // not found--generate and update registry
+            let serde_struct =
+                self.generate_serde_struct(normalized_struct, type_arguments, depth)?;
+            self.registry.insert(struct_key.clone(), serde_struct);
+        }
+
+        Ok(Format::TypeName(struct_key))
+    }
+
+    fn generate_serde_struct(
+        &mut self,
+        normalized_struct: Struct,
+        type_arguments: &[Format],
+        depth: u64,
+    ) -> Result<ContainerFormat> {
+        check_depth!(depth);
+        let fields = normalized_struct
+            .fields
+            .iter()
+            .map(|f| {
+                self.build_normalized_type_layout(&f.type_, type_arguments, depth)
+                    .map(|value| Named {
+                        name: f.name.to_string(),
+                        value,
+                    })
+            })
+            .collect::<Result<Vec<Named<Format>>>>()?;
+        Ok(ContainerFormat::Struct(fields))
+    }
+}
+
+fn print_format_type(t: &Format, depth: u64) -> Result<String> {
+    check_depth!(depth);
+    Ok(match t {
+        Format::TypeName(s) => s.to_string(),
+        Format::Bool => "bool".to_string(),
+        Format::U8 => "u8".to_string(),
+        Format::U16 => "u16".to_string(),
+        Format::U32 => "u32".to_string(),
+        Format::U64 => "u64".to_string(),
+        Format::U128 => "u128".to_string(),
+        Format::Bytes => "vector<u8>".to_string(),
+        Format::Seq(inner) => format!("vector<{}>", print_format_type(inner, depth + 1)?),
+        v => unimplemented!("Printing format value {:?}", v),
+    })
+}
+
+pub enum TypeLayoutBuilder {}
+pub enum StructLayoutBuilder {}
+
+impl TypeLayoutBuilder {
+    /// Construct a WithTypes `TypeLayout` with fields from `t`.
+    /// Panics if `resolver` cannot resolve a module whose types are referenced directly or
+    /// transitively by `t`
+    pub fn build_with_types(t: &TypeTag, resolver: &impl GetModule) -> Result<A::MoveTypeLayout> {
+        Self::build(t, resolver, 0)
+    }
+
+    fn build(t: &TypeTag, resolver: &impl GetModule, depth: u64) -> Result<A::MoveTypeLayout> {
+        use TypeTag::*;
+        check_depth!(depth);
+        Ok(match t {
+            Bool => A::MoveTypeLayout::Bool,
+            U8 => A::MoveTypeLayout::U8,
+            U16 => A::MoveTypeLayout::U16,
+            U32 => A::MoveTypeLayout::U32,
+            U64 => A::MoveTypeLayout::U64,
+            U128 => A::MoveTypeLayout::U128,
+            U256 => A::MoveTypeLayout::U256,
+            Address => A::MoveTypeLayout::Address,
+            Signer => bail!("Type layouts cannot contain signer"),
+            Vector(elem_t) => {
+                A::MoveTypeLayout::Vector(Box::new(Self::build(elem_t, resolver, depth + 1)?))
+            }
+            Struct(s) => {
+                A::MoveTypeLayout::Struct(StructLayoutBuilder::build(s, resolver, depth + 1)?)
+            }
+        })
+    }
+
+    fn build_from_signature_token(
+        m: &CompiledModule,
+        s: &SignatureToken,
+        type_arguments: &[A::MoveTypeLayout],
+        resolver: &impl GetModule,
+        depth: u64,
+    ) -> Result<A::MoveTypeLayout> {
+        use SignatureToken::*;
+        check_depth!(depth);
+        Ok(match s {
+            Vector(t) => A::MoveTypeLayout::Vector(Box::new(Self::build_from_signature_token(
+                m,
+                t,
+                type_arguments,
+                resolver,
+                depth + 1,
+            )?)),
+            Struct(shi) => A::MoveTypeLayout::Struct(StructLayoutBuilder::build_from_handle_idx(
+                m,
+                *shi,
+                vec![],
+                resolver,
+                depth + 1,
+            )?),
+            StructInstantiation(shi, type_actuals) => {
+                let actual_layouts = type_actuals
+                    .iter()
+                    .map(|t| {
+                        Self::build_from_signature_token(m, t, type_arguments, resolver, depth + 1)
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                A::MoveTypeLayout::Struct(StructLayoutBuilder::build_from_handle_idx(
+                    m,
+                    *shi,
+                    actual_layouts,
+                    resolver,
+                    depth + 1,
+                )?)
+            }
+            TypeParameter(i) => type_arguments[*i as usize].clone(),
+            Bool => A::MoveTypeLayout::Bool,
+            U8 => A::MoveTypeLayout::U8,
+            U16 => A::MoveTypeLayout::U16,
+            U32 => A::MoveTypeLayout::U32,
+            U64 => A::MoveTypeLayout::U64,
+            U128 => A::MoveTypeLayout::U128,
+            U256 => A::MoveTypeLayout::U256,
+            Address => A::MoveTypeLayout::Address,
+            Signer => bail!("Type layouts cannot contain signer"),
+            Reference(_) | MutableReference(_) => bail!("Type layouts cannot contain references"),
+        })
+    }
+}
+
+impl StructLayoutBuilder {
+    /// Construct an expanded `TypeLayout` from `s`.
+    /// Panics if `resolver` cannot resolved a module whose types are referenced directly or
+    /// transitively by `s`.
+    fn build(s: &StructTag, resolver: &impl GetModule, depth: u64) -> Result<A::MoveStructLayout> {
+        check_depth!(depth);
+        let type_arguments = s
+            .type_params
+            .iter()
+            .map(|t| TypeLayoutBuilder::build(t, resolver, depth))
+            .collect::<Result<Vec<A::MoveTypeLayout>>>()?;
+        Self::build_from_name(&s.module_id(), &s.name, type_arguments, resolver, depth)
+    }
+
+    fn build_from_definition(
+        m: &CompiledModule,
+        s: &StructDefinition,
+        type_arguments: Vec<A::MoveTypeLayout>,
+        resolver: &impl GetModule,
+        depth: u64,
+    ) -> Result<A::MoveStructLayout> {
+        check_depth!(depth);
+        let s_handle = m.struct_handle_at(s.struct_handle);
+        if s_handle.type_parameters.len() != type_arguments.len() {
+            bail!("Wrong number of type arguments for struct")
+        }
+        match &s.field_information {
+            StructFieldInformation::Native => {
+                bail!("Can't extract fields for native struct")
+            }
+            StructFieldInformation::Declared(fields) => {
+                let layouts = fields
+                    .iter()
+                    .map(|f| {
+                        TypeLayoutBuilder::build_from_signature_token(
+                            m,
+                            &f.signature.0,
+                            &type_arguments,
+                            resolver,
+                            depth,
+                        )
+                    })
+                    .collect::<Result<Vec<A::MoveTypeLayout>>>()?;
+
+                let mid = m.self_id();
+                let type_params: Vec<TypeTag> = type_arguments.iter().map(|t| t.into()).collect();
+                let type_ = StructTag {
+                    address: *mid.address(),
+                    module: mid.name().to_owned(),
+                    name: m.identifier_at(s_handle.name).to_owned(),
+                    type_params,
+                };
+                let fields = fields
+                    .iter()
+                    .map(|f| m.identifier_at(f.name).to_owned())
+                    .zip(layouts)
+                    .map(|(name, layout)| A::MoveFieldLayout::new(name, layout))
+                    .collect();
+                Ok(A::MoveStructLayout { type_, fields })
+            }
+        }
+    }
+
+    fn build_from_name(
+        declaring_module: &ModuleId,
+        name: &IdentStr,
+        type_arguments: Vec<A::MoveTypeLayout>,
+        resolver: &impl GetModule,
+        depth: u64,
+    ) -> Result<A::MoveStructLayout> {
+        check_depth!(depth);
+        let module = match resolver.get_module_by_id(declaring_module) {
+            Err(_) | Ok(None) => bail!("Could not find module"),
+            Ok(Some(m)) => m,
+        };
+        let def = module
+            .borrow()
+            .find_struct_def_by_name(name)
+            .ok_or_else(|| {
+                anyhow!(
+                    "Could not find struct named {} in module {}",
+                    name,
+                    declaring_module
+                )
+            })?;
+        Self::build_from_definition(module.borrow(), def, type_arguments, resolver, depth)
+    }
+
+    fn build_from_handle_idx(
+        m: &CompiledModule,
+        s: StructHandleIndex,
+        type_arguments: Vec<A::MoveTypeLayout>,
+        resolver: &impl GetModule,
+        depth: u64,
+    ) -> Result<A::MoveStructLayout> {
+        check_depth!(depth);
+        if let Some(def) = m.find_struct_def(s) {
+            // declared internally
+            Self::build_from_definition(m, def, type_arguments, resolver, depth)
+        } else {
+            let handle = m.struct_handle_at(s);
+            let name = m.identifier_at(handle.name);
+            let declaring_module = m.module_id_for_handle(m.module_handle_at(handle.module));
+            // declared externally
+            Self::build_from_name(&declaring_module, name, type_arguments, resolver, depth)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-utils/src/lib.rs b/vendors/move/crates/move-bytecode-utils/src/lib.rs
new file mode 100644
index 000000000..5ab416203
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-utils/src/lib.rs
@@ -0,0 +1,170 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod dependency_graph;
+pub mod layout;
+pub mod module_cache;
+
+use crate::dependency_graph::DependencyGraph;
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, SignatureToken, StructHandleIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::IdentStr, language_storage::ModuleId,
+};
+
+use anyhow::{anyhow, Result};
+use std::collections::BTreeMap;
+
+/// Set of Move modules indexed by module Id
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct Modules<'a>(BTreeMap<ModuleId, &'a CompiledModule>);
+
+impl<'a> Modules<'a> {
+    /// Construct a set of modules from a slice `modules`.
+    /// Panics if `modules` contains duplicates
+    pub fn new(modules: impl IntoIterator<Item = &'a CompiledModule>) -> Self {
+        let mut map = BTreeMap::new();
+        for m in modules {
+            assert!(
+                map.insert(m.self_id(), m).is_none(),
+                "Duplicate module found"
+            );
+        }
+        Modules(map)
+    }
+
+    /// Return all modules in this set
+    pub fn iter_modules(&self) -> Vec<&CompiledModule> {
+        self.0.values().copied().collect()
+    }
+
+    /// Return all modules in this set
+    pub fn iter_modules_owned(&self) -> Vec<CompiledModule> {
+        self.iter_modules().into_iter().cloned().collect()
+    }
+
+    /// Compute a dependency graph for `self`
+    pub fn compute_dependency_graph(&self) -> DependencyGraph {
+        DependencyGraph::new(self.0.values().copied())
+    }
+
+    /// Return the backing map of `self`
+    pub fn get_map(&self) -> &BTreeMap<ModuleId, &CompiledModule> {
+        &self.0
+    }
+
+    /// Return the bytecode for the module bound to `module_id`
+    pub fn get_module(&self, module_id: &ModuleId) -> Result<&CompiledModule> {
+        self.0
+            .get(module_id)
+            .copied()
+            .ok_or_else(|| anyhow!("Can't find module {:?}", module_id))
+    }
+
+    /// Return the immediate dependencies for `module_id`
+    pub fn get_immediate_dependencies(&self, module_id: &ModuleId) -> Result<Vec<&CompiledModule>> {
+        self.get_module(module_id)?
+            .immediate_dependencies()
+            .into_iter()
+            .map(|mid| self.get_module(&mid))
+            .collect::<Result<Vec<_>>>()
+    }
+
+    fn get_transitive_dependencies_(
+        &'a self,
+        all_deps: &mut Vec<&'a CompiledModule>,
+        module: &'a CompiledModule,
+    ) -> Result<()> {
+        let next_deps = module.immediate_dependencies();
+        all_deps.push(module);
+        for next in next_deps {
+            let next_module = self.get_module(&next)?;
+            self.get_transitive_dependencies_(all_deps, next_module)?;
+        }
+        Ok(())
+    }
+
+    /// Return the transitive dependencies for `module_id`
+    pub fn get_transitive_dependencies(
+        &self,
+        module_id: &ModuleId,
+    ) -> Result<Vec<&CompiledModule>> {
+        let mut all_deps = vec![];
+        for dep in self.get_immediate_dependencies(module_id)? {
+            self.get_transitive_dependencies_(&mut all_deps, dep)?;
+        }
+        Ok(all_deps)
+    }
+}
+
+pub fn resolve_struct<'a>(
+    view: &'a BinaryIndexedView,
+    sidx: StructHandleIndex,
+) -> (&'a AccountAddress, &'a IdentStr, &'a IdentStr) {
+    let shandle = view.struct_handle_at(sidx);
+    let mhandle = view.module_handle_at(shandle.module);
+    let address = view.address_identifier_at(mhandle.address);
+    let module_name = view.identifier_at(mhandle.name);
+    let struct_name = view.identifier_at(shandle.name);
+    (address, module_name, struct_name)
+}
+
+pub fn format_signature_token(view: &BinaryIndexedView, t: &SignatureToken) -> String {
+    match t {
+        SignatureToken::Bool => "bool".to_string(),
+        SignatureToken::U8 => "u8".to_string(),
+        SignatureToken::U16 => "u16".to_string(),
+        SignatureToken::U32 => "u32".to_string(),
+        SignatureToken::U64 => "u64".to_string(),
+        SignatureToken::U128 => "u128".to_string(),
+        SignatureToken::U256 => "u256".to_string(),
+        SignatureToken::Address => "address".to_string(),
+        SignatureToken::Signer => "signer".to_string(),
+        SignatureToken::Vector(inner) => {
+            format!("vector<{}>", format_signature_token(view, inner))
+        }
+        SignatureToken::Reference(inner) => format!("&{}", format_signature_token(view, inner)),
+        SignatureToken::MutableReference(inner) => {
+            format!("&mut {}", format_signature_token(view, inner))
+        }
+        SignatureToken::TypeParameter(i) => format!("T{}", i),
+
+        SignatureToken::Struct(idx) => format_signature_token_struct(view, *idx, &[]),
+        SignatureToken::StructInstantiation(idx, ty_args) => {
+            format_signature_token_struct(view, *idx, ty_args)
+        }
+    }
+}
+
+pub fn format_signature_token_struct(
+    view: &BinaryIndexedView,
+    sidx: StructHandleIndex,
+    ty_args: &[SignatureToken],
+) -> String {
+    let (address, module_name, struct_name) = resolve_struct(view, sidx);
+    let s;
+    let ty_args_string = if ty_args.is_empty() {
+        ""
+    } else {
+        s = format!(
+            "<{}>",
+            ty_args
+                .iter()
+                .map(|t| format_signature_token(view, t))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+        &s
+    };
+    format!(
+        "0x{}::{}::{}{}",
+        address.short_str_lossless(),
+        module_name,
+        struct_name,
+        ty_args_string
+    )
+}
diff --git a/vendors/move/crates/move-bytecode-utils/src/module_cache.rs b/vendors/move/crates/move-bytecode-utils/src/module_cache.rs
new file mode 100644
index 000000000..8f73ed16d
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-utils/src/module_cache.rs
@@ -0,0 +1,156 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Result};
+use move_binary_format::CompiledModule;
+use move_core_types::{language_storage::ModuleId, resolver::ModuleResolver};
+use std::{
+    borrow::Borrow,
+    cell::RefCell,
+    collections::{btree_map::Entry, BTreeMap},
+    fmt::Debug,
+    sync::{Arc, RwLock},
+};
+
+/// A persistent storage that can fetch the bytecode for a given module id
+/// TODO: do we want to implement this in a way that allows clients to cache struct layouts?
+pub trait GetModule {
+    type Error: Debug;
+    type Item: Borrow<CompiledModule>;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<Self::Item>, Self::Error>;
+}
+
+/// Simple in-memory module cache
+pub struct ModuleCache<R: ModuleResolver> {
+    cache: RefCell<BTreeMap<ModuleId, CompiledModule>>,
+    resolver: R,
+}
+
+impl<R: ModuleResolver> ModuleCache<R> {
+    pub fn new(resolver: R) -> Self {
+        ModuleCache {
+            cache: RefCell::new(BTreeMap::new()),
+            resolver,
+        }
+    }
+
+    pub fn add(&self, id: ModuleId, m: CompiledModule) {
+        self.cache.borrow_mut().insert(id, m);
+    }
+
+    #[allow(clippy::len_without_is_empty)]
+    pub fn len(&self) -> usize {
+        self.cache.borrow().len()
+    }
+}
+
+impl<R: ModuleResolver> GetModule for ModuleCache<R> {
+    type Error = anyhow::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(Some(match self.cache.borrow_mut().entry(id.clone()) {
+            Entry::Vacant(entry) => {
+                let module_bytes = self
+                    .resolver
+                    .get_module(id)
+                    .map_err(|_| anyhow!("Failed to get module {:?}", id))?
+                    .ok_or_else(|| anyhow!("Module {:?} doesn't exist", id))?;
+                let module = CompiledModule::deserialize_with_defaults(&module_bytes)
+                    .map_err(|_| anyhow!("Failure deserializing module {:?}", id))?;
+                entry.insert(module.clone());
+                module
+            }
+            Entry::Occupied(entry) => entry.get().clone(),
+        }))
+    }
+}
+
+impl<R: ModuleResolver> GetModule for &R {
+    type Error = R::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(self
+            .get_module(id)
+            .unwrap()
+            .map(|bytes| CompiledModule::deserialize_with_defaults(&bytes).unwrap()))
+    }
+}
+
+impl<R: ModuleResolver> GetModule for &mut R {
+    type Error = R::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(self
+            .get_module(id)
+            .unwrap()
+            .map(|bytes| CompiledModule::deserialize_with_defaults(&bytes).unwrap()))
+    }
+}
+
+impl<T: GetModule> GetModule for Arc<T> {
+    type Error = T::Error;
+    type Item = T::Item;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<T::Item>, Self::Error> {
+        self.as_ref().get_module_by_id(id)
+    }
+}
+
+/// Simple in-memory module cache that implements Sync
+pub struct SyncModuleCache<R: ModuleResolver> {
+    cache: RwLock<BTreeMap<ModuleId, Arc<CompiledModule>>>,
+    resolver: R,
+}
+
+impl<R: ModuleResolver> SyncModuleCache<R> {
+    pub fn new(resolver: R) -> Self {
+        SyncModuleCache {
+            cache: RwLock::new(BTreeMap::new()),
+            resolver,
+        }
+    }
+
+    pub fn add(&self, id: ModuleId, m: CompiledModule) {
+        self.cache.write().unwrap().insert(id, Arc::new(m));
+    }
+
+    #[allow(clippy::len_without_is_empty)]
+    pub fn len(&self) -> usize {
+        self.cache.read().unwrap().len()
+    }
+}
+
+impl<R: ModuleResolver> GetModule for SyncModuleCache<R> {
+    type Error = anyhow::Error;
+    type Item = Arc<CompiledModule>;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<Arc<CompiledModule>>, Self::Error> {
+        if let Some(compiled_module) = self.cache.read().unwrap().get(id) {
+            return Ok(Some(compiled_module.clone()));
+        }
+
+        if let Some(module_bytes) = self
+            .resolver
+            .get_module(id)
+            .map_err(|_| anyhow!("Failed to get module {:?}", id))?
+        {
+            let module = Arc::new(
+                CompiledModule::deserialize_with_defaults(&module_bytes)
+                    .map_err(|_| anyhow!("Failure deserializing module {:?}", id))?,
+            );
+
+            self.cache
+                .write()
+                .unwrap()
+                .insert(id.clone(), module.clone());
+            Ok(Some(module))
+        } else {
+            Ok(None)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/Cargo.toml b/vendors/move/crates/move-bytecode-verifier/Cargo.toml
new file mode 100644
index 000000000..5ad1b255f
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-bytecode-verifier"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move bytecode verifier"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+petgraph.workspace = true
+
+move-borrow-graph.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-abstract-stack.workspace = true
+
+[dev-dependencies]
+hex-literal.workspace = true
+invalid-mutations.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-bytecode-verifier/README.md b/vendors/move/crates/move-bytecode-verifier/README.md
new file mode 100644
index 000000000..f6e3fdeae
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/README.md
@@ -0,0 +1,82 @@
+---
+id: bytecode-verifier
+title: Bytecode Verifier
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-bytecode-verifier/README.md
+---
+
+
+## Overview
+
+The bytecode verifier contains a static analysis tool for rejecting invalid Move bytecode. It checks the safety of stack usage, types, resources, and references.
+
+The body of each function in a compiled module is verified separately while trusting the correctness of function signatures in the module. Checking that each function signature matches its definition is a separate responsibility. The body of a function is a sequence of bytecode instructions. This instruction sequence is checked in several phases described below.
+
+## CFG Construction
+
+A control-flow graph is constructed by decomposing the instruction sequence into a collection of basic blocks. Each basic block contains a contiguous sequence of instructions; the set of all instructions is partitioned among the blocks. Each block ends with a branch or return instruction. The decomposition into blocks guarantees that branch targets land only at the beginning of some block. The decomposition also attempts to ensure that the generated blocks are maximal. However, the soundness of the analysis does not depend on maximality.
+
+## Stack Safety
+
+The execution of a block happens in the context of a stack and an array of local variables. The parameters of the function are a prefix of the array of local variables. Arguments and return values are passed across function calls via the stack. When a function starts executing, its arguments are already loaded into its parameters. Suppose the stack height is *n* when a function starts executing; then valid bytecode must enforce the invariant that when execution lands at the beginning of a basic block, the stack height is *n*. Furthermore, at a return instruction, the stack height must be *n*+*k* where *k*, s.t. *k*>=0 is the number of return values. The first phase of the analysis checks that this invariant is maintained by analyzing each block separately, calculating the effect of each instruction in the block on the stack height, checking that the height does not go below *n*, and that is left either at *n* or *n*+*k* (depending on the final instruction of the block and the return type of the function) at the end of the block.
+
+## Type Safety
+
+The second phase of the analysis checks that each operation, primitive or defined function, is invoked with arguments of appropriate types. The operands of an operation are values located either in a local variable or on the stack. The types of local variables of a function are already provided in the bytecode. However, the types of stack values are inferred. This inference and the type checking of each operation can be done separately for each block. Since the stack height at the beginning of each block is *n* and does not go below *n* during the execution of the block, we only need to model the suffix of the stack starting at *n* for type checking the block instructions. We model this suffix using a stack of types on which types are pushed and popped as the instruction stream in a block is processed. Only the type stack and the statically-known types of local variables are needed to type check each instruction.
+
+## Resource Safety
+
+Resources represent the assets of the blockchain. As such, there are certain restrictions on these types that do not apply to normal values. Intuitively, resource values cannot be copied and must be used by the end of the transaction (this means that they are moved to global storage or destroyed). Concretely, the following restrictions apply:
+
+* `CopyLoc` and `StLoc` require that the type of local is not of resource kind.
+* `WriteRef`, `Eq`, and `Neq` require that the type of the reference is not of resource kind.
+* At the end of a function (when `Ret` is reached), no local whose type is of resource kind must be empty, i.e., the value must have been moved out of the local.
+
+As mentioned above, this last rule around `Ret` implies that the resource *must* have been either:
+
+* Moved to global storage via `MoveTo`.
+* Destroyed via `Unpack`.
+
+Both `MoveTo` and `Unpack` are internal to the module in which the resource is declared.
+
+## Reference Safety
+
+References are first-class in the bytecode language. Fresh references become available to a function in several ways:
+
+* Inputing parameters.
+* Taking the address of the value in a local variable.
+* Taking the address of the globally published value in an address.
+* Taking the address of a field from a reference to the containing struct.
+* Returning value from a function.
+
+The goal of reference safety checking is to ensure that there are no dangling references. Here are some examples of dangling references:
+
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then moved.
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then bound to a new value.
+* Reference is taken to a local variable that has not been initialized.
+* Reference to a value in a local variable is returned from a function.
+* Reference `r` is taken to a globally published value `v`; `v` is then unpublished.
+
+References can be either exclusive or shared; the latter allow read-only access. A secondary goal of reference safety checking is to ensure that in the execution context of the bytecode program, including the entire evaluation stack and all function frames, if there are two distinct storage locations containing references `r1` and `r2` such that `r2` extends `r1`, then both of the following conditions hold:
+
+* If `r1` is tagged as exclusive, then it must be inactive, i.e. it is impossible to reach a control location where `r1` is dereferenced or mutated.
+* If `r1` is shared, then `r2` is shared.
+
+The two conditions above establish the property of referential transparency, important for scalable program verification, which looks roughly as follows: consider the piece of code `v1 = *r; S; v2 = *r`, where `S` is an arbitrary computation that does not perform any write through the syntactic reference `r` (and no writes to any `r'` that extends `r`). Then `v1 == v2`.
+
+### Analysis Setup
+
+The reference safety analysis is set up as a flow analysis (or abstract interpretation). An abstract state is defined for abstractly executing the code of a basic block. A map is maintained from basic blocks to abstract states. Given an abstract state *S* at the beginning of a basic block *B*, the abstract execution of *B* results in state *S'*. This state *S'* is propagated to all successors of *B* and recorded in the map. If a state already existed for a block, the freshly propagated state is “joined” with the existing state. If the join fails an error is reported. If the join succeeds but the abstract state remains unchanged, no further propagation is done. Otherwise, the state is updated and propagated again through the block. An error may also be reported when an instruction is processed during the propagation of abstract state through a block.
+
+**Errors.** As mentioned earlier, an error is reported by the checker in one of the following situations:
+
+* An instruction cannot be proven to be safe during the propagation of the abstract state through a block.
+* Join of abstract states propagated via different incoming edges into a block fails.
+
+## How is this module organized?
+
+```text
+*
+├── invalid-mutations  # Library used by proptests
+├── src                # Core bytecode verifier files
+├── tests              # Proptests
+```
diff --git a/vendors/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs b/vendors/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs
new file mode 100644
index 000000000..4480800c7
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs
@@ -0,0 +1,52 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that all of the struct's fields satisfy the
+//! abilities required by the struct's abilities
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{AbilitySet, CompiledModule, StructFieldInformation, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    let view = BinaryIndexedView::Module(module);
+    for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+        let sh = module.struct_handle_at(struct_def.struct_handle);
+        let fields = match &struct_def.field_information {
+            StructFieldInformation::Native => continue,
+            StructFieldInformation::Declared(fields) => fields,
+        };
+        let required_abilities = sh
+            .abilities
+            .into_iter()
+            .map(|a| a.requires())
+            .fold(AbilitySet::EMPTY, |acc, required| acc | required);
+        // Assume type parameters have all abilities, as the struct's abilities will be dependent on
+        // them
+        let type_parameter_abilities = sh
+            .type_parameters
+            .iter()
+            .map(|_| AbilitySet::ALL)
+            .collect::<Vec<_>>();
+        for field in fields {
+            let field_abilities = view.abilities(&field.signature.0, &type_parameter_abilities)?;
+            if !required_abilities.is_subset(field_abilities) {
+                return Err(verification_error(
+                    StatusCode::FIELD_MISSING_TYPE_ABILITY,
+                    IndexKind::StructDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/absint.rs b/vendors/move/crates/move-bytecode-verifier/src/absint.rs
new file mode 100644
index 000000000..6cd169a4b
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/absint.rs
@@ -0,0 +1,158 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::meter::{
+    Meter, Scope, ANALYZE_FUNCTION_BASE_COST, EXECUTE_BLOCK_BASE_COST, PER_BACKEDGE_COST,
+    PER_SUCCESSOR_COST,
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::PartialVMResult,
+    file_format::{Bytecode, CodeOffset},
+};
+use std::collections::BTreeMap;
+
+/// Trait for finite-height abstract domains. Infinite height domains would require a more complex
+/// trait with widening and a partial order.
+pub trait AbstractDomain: Clone + Sized {
+    fn join(&mut self, other: &Self, meter: &mut impl Meter) -> PartialVMResult<JoinResult>;
+}
+
+#[derive(Debug)]
+pub enum JoinResult {
+    Changed,
+    Unchanged,
+}
+
+#[allow(dead_code)]
+#[derive(Clone)]
+pub struct BlockInvariant<State> {
+    /// Precondition of the block
+    pre: State,
+}
+
+/// A map from block id's to the pre/post of each block after a fixed point is reached.
+#[allow(dead_code)]
+pub type InvariantMap<State> = BTreeMap<BlockId, BlockInvariant<State>>;
+
+/// Take a pre-state + instruction and mutate it to produce a post-state
+/// Auxiliary data can be stored in self.
+pub trait TransferFunctions {
+    type State: AbstractDomain;
+    type Error;
+
+    /// Execute local@instr found at index local@index in the current basic block from pre-state
+    /// local@pre.
+    /// Should return an AnalysisError if executing the instruction is unsuccessful, and () if
+    /// the effects of successfully executing local@instr have been reflected by mutatating
+    /// local@pre.
+    /// Auxilary data from the analysis that is not part of the abstract state can be collected by
+    /// mutating local@self.
+    /// The last instruction index in the current block is local@last_index. Knowing this
+    /// information allows clients to detect the end of a basic block and special-case appropriately
+    /// (e.g., normalizing the abstract state before a join).
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        instr: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()>;
+}
+
+pub trait AbstractInterpreter: TransferFunctions {
+    /// Analyze procedure local@function_view starting from pre-state local@initial_state.
+    fn analyze_function(
+        &mut self,
+        initial_state: Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ANALYZE_FUNCTION_BASE_COST)?;
+        let mut inv_map = InvariantMap::new();
+        let entry_block_id = function_view.cfg().entry_block_id();
+        let mut next_block = Some(entry_block_id);
+        inv_map.insert(entry_block_id, BlockInvariant { pre: initial_state });
+
+        while let Some(block_id) = next_block {
+            let block_invariant = match inv_map.get_mut(&block_id) {
+                Some(invariant) => invariant,
+                None => {
+                    // This can only happen when all predecessors have errors,
+                    // so skip the block and move on to the next one
+                    next_block = function_view.cfg().next_block(block_id);
+                    continue;
+                }
+            };
+
+            let pre_state = &block_invariant.pre;
+            // Note: this will stop analysis after the first error occurs, to avoid the risk of
+            // subsequent crashes
+            let post_state = self.execute_block(block_id, pre_state, function_view, meter)?;
+
+            let mut next_block_candidate = function_view.cfg().next_block(block_id);
+            // propagate postcondition of this block to successor blocks
+            for successor_block_id in function_view.cfg().successors(block_id) {
+                meter.add(Scope::Function, PER_SUCCESSOR_COST)?;
+                match inv_map.get_mut(successor_block_id) {
+                    Some(next_block_invariant) => {
+                        let join_result = {
+                            let old_pre = &mut next_block_invariant.pre;
+                            old_pre.join(&post_state, meter)
+                        }?;
+                        match join_result {
+                            JoinResult::Unchanged => {
+                                // Pre is the same after join. Reanalyzing this block would produce
+                                // the same post
+                            }
+                            JoinResult::Changed => {
+                                // If the cur->successor is a back edge, jump back to the beginning
+                                // of the loop, instead of the normal next block
+                                if function_view
+                                    .cfg()
+                                    .is_back_edge(block_id, *successor_block_id)
+                                {
+                                    meter.add(Scope::Function, PER_BACKEDGE_COST)?;
+                                    next_block_candidate = Some(*successor_block_id);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    None => {
+                        // Haven't visited the next block yet. Use the post of the current block as
+                        // its pre
+                        inv_map.insert(
+                            *successor_block_id,
+                            BlockInvariant {
+                                pre: post_state.clone(),
+                            },
+                        );
+                    }
+                }
+            }
+            next_block = next_block_candidate;
+        }
+        Ok(())
+    }
+
+    fn execute_block(
+        &mut self,
+        block_id: BlockId,
+        pre_state: &Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Self::State> {
+        meter.add(Scope::Function, EXECUTE_BLOCK_BASE_COST)?;
+        let mut state_acc = pre_state.clone();
+        let block_end = function_view.cfg().block_end(block_id);
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &function_view.code().code[offset as usize];
+            self.execute(&mut state_acc, instr, offset, block_end, meter)?
+        }
+        Ok(state_acc)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/acquires_list_verifier.rs b/vendors/move/crates/move-bytecode-verifier/src/acquires_list_verifier.rs
new file mode 100644
index 000000000..9bad9e573
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/acquires_list_verifier.rs
@@ -0,0 +1,226 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying properties about the acquires list on function
+//! definitions. Function definitions must annotate the global resources (declared in that module)
+//! accesssed by `BorrowGlobal`, `MoveFrom`, and any transitive function calls
+//! The list of acquired resources (stored in `FunctionDefinition`'s `acquires_global_resources`
+//! field) must have:
+//! - No duplicate resources (checked by `check_duplication`)
+//! - No missing resources (any resource acquired must be present)
+//! - No additional resources (no extraneous resources not actually acquired)
+
+use std::collections::{BTreeSet, HashMap};
+
+use crate::meter::Meter;
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandle, FunctionHandleIndex, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) struct AcquiresVerifier<'a> {
+    module: &'a CompiledModule,
+    current_function: FunctionDefinitionIndex,
+    annotated_acquires: BTreeSet<StructDefinitionIndex>,
+    actual_acquires: BTreeSet<StructDefinitionIndex>,
+    handle_to_def: HashMap<FunctionHandleIndex, &'a FunctionDefinition>,
+}
+
+impl<'a> AcquiresVerifier<'a> {
+    pub(crate) fn verify(
+        module: &'a CompiledModule,
+        index: FunctionDefinitionIndex,
+        function_definition: &'a FunctionDefinition,
+        _meter: &mut impl Meter, // currently unused
+    ) -> PartialVMResult<()> {
+        let annotated_acquires: BTreeSet<_> = function_definition
+            .acquires_global_resources
+            .iter()
+            .cloned()
+            .collect();
+        let mut handle_to_def = HashMap::new();
+        for func_def in module.function_defs() {
+            handle_to_def.insert(func_def.function, func_def);
+        }
+        let mut verifier = Self {
+            module,
+            current_function: index,
+            annotated_acquires,
+            actual_acquires: BTreeSet::new(),
+            handle_to_def,
+        };
+
+        for (offset, instruction) in safe_unwrap!(function_definition.code.as_ref())
+            .code
+            .iter()
+            .enumerate()
+        {
+            verifier.verify_instruction(instruction, offset as CodeOffset)?
+        }
+
+        for annotation in verifier.annotated_acquires {
+            if !verifier.actual_acquires.contains(&annotation) {
+                return Err(PartialVMError::new(
+                    StatusCode::EXTRANEOUS_ACQUIRES_ANNOTATION,
+                ));
+            }
+
+            let struct_def = safe_unwrap!(module.struct_defs().get(annotation.0 as usize));
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            if !struct_handle.abilities.has_key() {
+                return Err(PartialVMError::new(StatusCode::INVALID_ACQUIRES_ANNOTATION));
+            }
+        }
+
+        Ok(())
+    }
+
+    fn verify_instruction(
+        &mut self,
+        instruction: &Bytecode,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::Call(idx) => self.call_acquire(*idx, offset),
+            Bytecode::CallGeneric(idx) => {
+                let fi = self.module.function_instantiation_at(*idx);
+                self.call_acquire(fi.handle, offset)
+            }
+            Bytecode::MoveFrom(idx)
+            | Bytecode::MutBorrowGlobal(idx)
+            | Bytecode::ImmBorrowGlobal(idx) => self.struct_acquire(*idx, offset),
+            Bytecode::MoveFromGeneric(idx)
+            | Bytecode::MutBorrowGlobalGeneric(idx)
+            | Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                let si = self.module.struct_instantiation_at(*idx);
+                self.struct_acquire(si.def, offset)
+            }
+
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::Abort
+            | Bytecode::Branch(_)
+            | Bytecode::Nop
+            | Bytecode::Ret
+            | Bytecode::StLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdConst(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Not
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::VecPack(..)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(..)
+            | Bytecode::VecSwap(_) => Ok(()),
+        }
+    }
+
+    fn call_acquire(
+        &mut self,
+        fh_idx: FunctionHandleIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.module.function_handle_at(fh_idx);
+        let mut function_acquired_resources =
+            self.function_acquired_resources(function_handle, fh_idx);
+        for acquired_resource in &function_acquired_resources {
+            if !self.annotated_acquires.contains(acquired_resource) {
+                return Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset));
+            }
+        }
+        self.actual_acquires
+            .append(&mut function_acquired_resources);
+        Ok(())
+    }
+
+    fn struct_acquire(
+        &mut self,
+        sd_idx: StructDefinitionIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        if self.annotated_acquires.contains(&sd_idx) {
+            self.actual_acquires.insert(sd_idx);
+            Ok(())
+        } else {
+            Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset))
+        }
+    }
+
+    fn function_acquired_resources(
+        &self,
+        function_handle: &FunctionHandle,
+        fh_idx: FunctionHandleIndex,
+    ) -> BTreeSet<StructDefinitionIndex> {
+        if function_handle.module != self.module.self_handle_idx() {
+            return BTreeSet::new();
+        }
+        match self.handle_to_def.get(&fh_idx) {
+            Some(func_def) => func_def.acquires_global_resources.iter().cloned().collect(),
+            None => BTreeSet::new(),
+        }
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/check_duplication.rs b/vendors/move/crates/move-bytecode-verifier/src/check_duplication.rs
new file mode 100644
index 000000000..0847657f7
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/check_duplication.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that each vector in a CompiledModule contains
+//! distinct values. Successful verification implies that an index in vector can be used to
+//! uniquely name the entry at that index. Additionally, the checker also verifies the
+//! following:
+//! - struct and field definitions are consistent
+//! - the handles in struct and function definitions point to the self module index
+//! - all struct and function handles pointing to the self module index have a definition
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, Constant, FunctionHandle, FunctionHandleIndex,
+        FunctionInstantiation, ModuleHandle, Signature, StructFieldInformation, StructHandle,
+        StructHandleIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use std::{collections::HashSet, hash::Hash};
+
+pub struct DuplicationChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> DuplicationChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        Self::check_identifiers(module.identifiers())?;
+        Self::check_address_identifiers(module.address_identifiers())?;
+        Self::check_constants(module.constant_pool())?;
+        Self::check_signatures(module.signatures())?;
+        Self::check_module_handles(module.module_handles())?;
+        Self::check_module_handles(module.friend_decls())?;
+        Self::check_struct_handles(module.struct_handles())?;
+        Self::check_function_handles(module.function_handles())?;
+        Self::check_function_instantiations(module.function_instantiations())?;
+
+        let checker = Self { module };
+        checker.check_field_handles()?;
+        checker.check_field_instantiations()?;
+        checker.check_function_defintions()?;
+        checker.check_struct_definitions()?;
+        checker.check_struct_instantiations()
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        Self::check_identifiers(script.identifiers())?;
+        Self::check_address_identifiers(script.address_identifiers())?;
+        Self::check_constants(script.constant_pool())?;
+        Self::check_signatures(script.signatures())?;
+        Self::check_module_handles(script.module_handles())?;
+        Self::check_struct_handles(script.struct_handles())?;
+        Self::check_function_handles(script.function_handles())?;
+        Self::check_function_instantiations(script.function_instantiations())
+    }
+
+    fn check_identifiers(identifiers: &[Identifier]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Identifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_address_identifiers(address_identifiers: &[AccountAddress]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(address_identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::AddressIdentifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_constants(constant_pool: &[Constant]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(constant_pool) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ConstantPool,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_signatures(signatures: &[Signature]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(signatures) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Signature,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_module_handles(module_handles: &[ModuleHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(module_handles) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ModuleHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // StructHandles - module and name define uniqueness
+    fn check_struct_handles(struct_handles: &[StructHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(struct_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_function_instantiations(
+        function_instantiations: &[FunctionInstantiation],
+    ) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_instantiations) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // FunctionHandles - module and name define uniqueness
+    fn check_function_handles(function_handles: &[FunctionHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    //
+    // Module only code
+    //
+
+    fn check_field_handles(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.field_handles()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_struct_instantiations(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.struct_instantiations()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_field_instantiations(&self) -> PartialVMResult<()> {
+        if let Some(idx) = Self::first_duplicate_element(self.module.field_instantiations()) {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldInstantiation,
+                idx,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_struct_definitions(&self) -> PartialVMResult<()> {
+        // StructDefinition - contained StructHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.struct_defs().iter().map(|x| x.struct_handle))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefinition,
+                idx,
+            ));
+        }
+        // Field names in structs must be unique
+        for (struct_idx, struct_def) in self.module.struct_defs().iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            if fields.is_empty() {
+                return Err(verification_error(
+                    StatusCode::ZERO_SIZED_STRUCT,
+                    IndexKind::StructDefinition,
+                    struct_idx as TableIndex,
+                ));
+            }
+            if let Some(idx) = Self::first_duplicate_element(fields.iter().map(|x| x.name)) {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ELEMENT,
+                    IndexKind::FieldDefinition,
+                    idx,
+                ));
+            }
+        }
+        // Check that each struct definition is pointing to the self module
+        if let Some(idx) = self.module.struct_defs().iter().position(|x| {
+            self.module.struct_handle_at(x.struct_handle).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::StructDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each struct handle in self module is implemented (has a declaration)
+        let implemented_struct_handles: HashSet<StructHandleIndex> = self
+            .module
+            .struct_defs()
+            .iter()
+            .map(|x| x.struct_handle)
+            .collect();
+        if let Some(idx) = (0..self.module.struct_handles().len()).position(|x| {
+            let y = StructHandleIndex::new(x as u16);
+            self.module.struct_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_struct_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::StructHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_function_defintions(&self) -> PartialVMResult<()> {
+        // FunctionDefinition - contained FunctionHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionDefinition,
+                idx,
+            ));
+        }
+        // Acquires in function declarations contain unique struct definitions
+        for (idx, function_def) in self.module.function_defs().iter().enumerate() {
+            let acquires = function_def.acquires_global_resources.iter();
+            if Self::first_duplicate_element(acquires).is_some() {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ACQUIRES_ANNOTATION,
+                    IndexKind::FunctionDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+        // Check that each function definition is pointing to the self module
+        if let Some(idx) = self.module.function_defs().iter().position(|x| {
+            self.module.function_handle_at(x.function).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::FunctionDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each function handle in self module is implemented (has a declaration)
+        let implemented_function_handles: HashSet<FunctionHandleIndex> = self
+            .module
+            .function_defs()
+            .iter()
+            .map(|x| x.function)
+            .collect();
+        if let Some(idx) = (0..self.module.function_handles().len()).position(|x| {
+            let y = FunctionHandleIndex::new(x as u16);
+            self.module.function_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_function_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::FunctionHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn first_duplicate_element<T>(iter: T) -> Option<TableIndex>
+    where
+        T: IntoIterator,
+        T::Item: Eq + Hash,
+    {
+        let mut uniq = HashSet::new();
+        for (i, x) in iter.into_iter().enumerate() {
+            if !uniq.insert(x) {
+                return Some(i as TableIndex);
+            }
+        }
+        None
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs b/vendors/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs
new file mode 100644
index 000000000..e313c424b
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs
@@ -0,0 +1,197 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements the checker for verifying correctness of function bodies.
+//! The overall verification is split between stack_usage_verifier.rs and
+//! abstract_interpreter.rs. CodeUnitVerifier simply orchestrates calls into these two files.
+use crate::{
+    acquires_list_verifier::AcquiresVerifier,
+    control_flow, locals_safety,
+    meter::{Meter, Scope},
+    reference_safety,
+    stack_usage_verifier::StackUsageVerifier,
+    type_safety,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+        IdentifierIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::HashMap;
+
+pub struct CodeUnitVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+    function_view: FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> CodeUnitVerifier<'a> {
+    pub fn verify_module(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledModule,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_module_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        verifier_config: &VerifierConfig,
+        module: &CompiledModule,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        let mut name_def_map = HashMap::new();
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            let fh = module.function_handle_at(func_def.function);
+            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
+        }
+        let mut total_back_edges = 0;
+        for (idx, function_definition) in module.function_defs().iter().enumerate() {
+            let index = FunctionDefinitionIndex(idx as TableIndex);
+            let num_back_edges = Self::verify_function(
+                verifier_config,
+                index,
+                function_definition,
+                module,
+                &name_def_map,
+                meter,
+            )
+            .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
+            total_back_edges += num_back_edges;
+        }
+        if let Some(limit) = verifier_config.max_back_edges_per_module {
+            if total_back_edges > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_script_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        verifier_config: &VerifierConfig,
+        script: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_script(verifier_config, script)?;
+        let resolver = BinaryIndexedView::Script(script);
+        let name_def_map = HashMap::new();
+
+        if let Some(limit) = verifier_config.max_basic_blocks_in_script {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS));
+            }
+        }
+
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if function_view.cfg().num_back_edges() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+
+        //verify
+        meter.enter_scope("script", Scope::Function);
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map: &name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)
+    }
+
+    fn verify_function(
+        verifier_config: &VerifierConfig,
+        index: FunctionDefinitionIndex,
+        function_definition: &FunctionDefinition,
+        module: &CompiledModule,
+        name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<usize> {
+        meter.enter_scope(
+            module
+                .identifier_at(module.function_handle_at(function_definition.function).name)
+                .as_str(),
+            Scope::Function,
+        );
+        // nothing to verify for native function
+        let code = match &function_definition.code {
+            Some(code) => code,
+            None => return Ok(0),
+        };
+
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_function(
+            verifier_config,
+            module,
+            index,
+            function_definition,
+            code,
+            meter,
+        )?;
+
+        if let Some(limit) = verifier_config.max_basic_blocks {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let num_back_edges = function_view.cfg().num_back_edges();
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if num_back_edges > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let resolver = BinaryIndexedView::Module(module);
+        // verify
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)?;
+        AcquiresVerifier::verify(module, index, function_definition, meter)?;
+
+        meter.transfer(Scope::Function, Scope::Module, 1.0)?;
+
+        Ok(num_back_edges)
+    }
+
+    fn verify_common(
+        &self,
+        verifier_config: &VerifierConfig,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        StackUsageVerifier::verify(verifier_config, &self.resolver, &self.function_view, meter)?;
+        type_safety::verify(&self.resolver, &self.function_view, meter)?;
+        locals_safety::verify(&self.resolver, &self.function_view, meter)?;
+        reference_safety::verify(
+            &self.resolver,
+            &self.function_view,
+            self.name_def_map,
+            meter,
+        )
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/constants.rs b/vendors/move/crates/move-bytecode-verifier/src/constants.rs
new file mode 100644
index 000000000..15b6afb3c
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/constants.rs
@@ -0,0 +1,64 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that
+//! - a constant's type only refers to primitive types
+//! - a constant's data serializes correctly for that type
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{CompiledModule, CompiledScript, Constant, SignatureToken, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    for (idx, constant) in module.constant_pool().iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+pub fn verify_script(module: &CompiledScript) -> VMResult<()> {
+    verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+}
+
+fn verify_script_impl(script: &CompiledScript) -> PartialVMResult<()> {
+    for (idx, constant) in script.constant_pool.iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+fn verify_constant(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    verify_constant_type(idx, &constant.type_)?;
+    verify_constant_data(idx, constant)
+}
+
+fn verify_constant_type(idx: usize, type_: &SignatureToken) -> PartialVMResult<()> {
+    if type_.is_valid_for_constant() {
+        Ok(())
+    } else {
+        Err(verification_error(
+            StatusCode::INVALID_CONSTANT_TYPE,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        ))
+    }
+}
+
+fn verify_constant_data(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    match constant.deserialize_constant() {
+        Some(_) => Ok(()),
+        None => Err(verification_error(
+            StatusCode::MALFORMED_CONSTANT_DATA,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        )),
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/control_flow.rs b/vendors/move/crates/move-bytecode-verifier/src/control_flow.rs
new file mode 100644
index 000000000..711c314d8
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/control_flow.rs
@@ -0,0 +1,182 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements control flow checks.
+//!
+//! For bytecode versions 6 and up, the following properties are ensured:
+//! - The CFG is not empty and the last block ends in an unconditional jump, so it's not possible to
+//!   fall off the end of a function.
+//! - The CFG is reducible (and optionally max loop depth is bounded), to limit the potential for
+//!   pathologically long abstract interpretation runtimes (through poor choice of loop heads and
+//!   back edges).
+//!
+//! For bytecode versions 5 and below, delegates to `control_flow_v5`.
+use crate::{
+    control_flow_v5,
+    loop_summary::{LoopPartition, LoopSummary},
+    meter::Meter,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, CodeUnit, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+    },
+    CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::BTreeSet;
+
+/// Perform control flow verification on the compiled function, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_function<'a>(
+    verifier_config: &'a VerifierConfig,
+    module: &'a CompiledModule,
+    index: FunctionDefinitionIndex,
+    function_definition: &'a FunctionDefinition,
+    code: &'a CodeUnit,
+    _meter: &mut impl Meter, // TODO: metering
+) -> PartialVMResult<FunctionView<'a>> {
+    let function_handle = module.function_handle_at(function_definition.function);
+
+    if module.version() <= 5 {
+        control_flow_v5::verify(verifier_config, Some(index), code)?;
+        Ok(FunctionView::function(module, index, code, function_handle))
+    } else {
+        verify_fallthrough(Some(index), code)?;
+        let function_view = FunctionView::function(module, index, code, function_handle);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Perform control flow verification on the compiled script, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_script<'a>(
+    verifier_config: &'a VerifierConfig,
+    script: &'a CompiledScript,
+) -> PartialVMResult<FunctionView<'a>> {
+    if script.version() <= 5 {
+        control_flow_v5::verify(verifier_config, None, &script.code)?;
+        Ok(FunctionView::script(script))
+    } else {
+        verify_fallthrough(None, &script.code)?;
+        let function_view = FunctionView::script(script);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Check to make sure that the bytecode vector is non-empty and ends with a branching instruction.
+fn verify_fallthrough(
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+    match code.code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+/// Test that `function_view`'s control-flow graph is reducible using Tarjan's algorithm [1].
+/// Optionally test loop depth bounded by `verifier_config.max_loop_depth`.
+///
+/// A CFG, `G`, with starting block `s` is reducible if and only if [2] any of the following
+/// equivalent properties hold:
+///
+///  1. G has a unique set of back-edges `u -> v` where `v` dominates `u`, that corresponds to the
+///     set of back-edges for any depth-first spanning tree of G.
+///
+///  2. Every loop in G contains a unique node `h` (the "head") which dominates all other nodes in
+///     the loop.
+///
+///  3. G has a unique maximal (in terms of number of edges) acyclic sub-graph.
+///
+///  4. G can be reduced to a CFG containing just `s` through a sequence of the following two
+///     operations:
+///      a. Delete a cyclic edge `v -> v`
+///      b. For an edge `e: u -> v` where `e` is the only incident edge to `v`, collapse `v` into `u`
+///         by deleting `e` and `v` and replacing all `v -> w` edges with `u -> w` edges.
+///
+/// Reducibility means that a control-flow graph can be decomposed into a series of nested loops
+/// (strongly connected subgraphs), which leads to more predictable abstract interpretation
+/// performance.
+///
+/// ## References
+///
+///  1. Tarjan, R.  1974.  Testing Flow Graph Reducibility.
+///  2. Hecht, M. S., Ullman J. D.  1974.  Characterizations of Reducible Flow Graphs.
+fn verify_reducibility<'a>(
+    verifier_config: &VerifierConfig,
+    function_view: &'a FunctionView<'a>,
+) -> PartialVMResult<()> {
+    let current_function = function_view.index().unwrap_or(FunctionDefinitionIndex(0));
+    let err = move |code: StatusCode, offset: CodeOffset| {
+        Err(PartialVMError::new(code).at_code_offset(current_function, offset))
+    };
+
+    let summary = LoopSummary::new(function_view.cfg());
+    let mut partition = LoopPartition::new(&summary);
+
+    // Iterate through nodes in reverse pre-order so more deeply nested loops (which would appear
+    // later in the pre-order) are processed first.
+    for head in summary.preorder().rev() {
+        // If a node has no back edges, it is not a loop head, so doesn't need to be processed.
+        let back = summary.back_edges(head);
+        if back.is_empty() {
+            continue;
+        }
+
+        // Collect the rest of the nodes in `head`'s loop, in `body`.  Start with the nodes that
+        // jump back to the head, and grow `body` by repeatedly following predecessor edges until
+        // `head` is found again.
+
+        let mut body = BTreeSet::new();
+        for node in back {
+            let node = partition.containing_loop(*node);
+
+            if node != head {
+                body.insert(node);
+            }
+        }
+
+        let mut frontier: Vec<_> = body.iter().copied().collect();
+        while let Some(node) = frontier.pop() {
+            for pred in summary.pred_edges(node) {
+                let pred = partition.containing_loop(*pred);
+
+                // `pred` can eventually jump back to `head`, so is part of its body.  If it is not
+                // a descendant of `head`, it implies that `head` does not dominate a node in its
+                // loop, therefore the CFG is not reducible, according to Property 1 (see doc
+                // comment).
+                if !summary.is_descendant(/* ancestor */ head, /* descendant */ pred) {
+                    return err(StatusCode::INVALID_LOOP_SPLIT, summary.block(pred));
+                }
+
+                let body_extended = pred != head && body.insert(pred);
+                if body_extended {
+                    frontier.push(pred);
+                }
+            }
+        }
+
+        // Collapse all the nodes in `body` into `head`, so it appears as one node when processing
+        // outer loops (this performs a sequence of Operation 4(b), followed by a 4(a)).
+        let depth = partition.collapse_loop(head, &body);
+        if let Some(max_depth) = verifier_config.max_loop_depth {
+            if depth as usize > max_depth {
+                return err(StatusCode::LOOP_MAX_DEPTH_REACHED, summary.block(head));
+            }
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/control_flow_v5.rs b/vendors/move/crates/move-bytecode-verifier/src/control_flow_v5.rs
new file mode 100644
index 000000000..b24d7aeca
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -0,0 +1,283 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker to verify control flow in bytecode version 5 and below. The
+//! following properties are ensured:
+//! - All forward jumps do not enter into the middle of a loop
+//! - All "breaks" (forward, loop-exiting jumps) go to the "end" of the loop
+//! - All "continues" (back jumps in a loop) are only to the current loop
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset, CodeUnit, FunctionDefinitionIndex},
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::{collections::HashSet, convert::TryInto};
+
+pub fn verify(
+    verifier_config: &VerifierConfig,
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+
+    // check fallthrough
+    verify_fallthrough(current_function, &code.code)?;
+
+    // check jumps
+    let context = &ControlFlowVerifier {
+        current_function,
+        code: &code.code,
+    };
+    let labels = instruction_labels(context);
+    check_jumps(verifier_config, context, labels)
+}
+
+fn verify_fallthrough(
+    current_function: FunctionDefinitionIndex,
+    code: &Vec<Bytecode>,
+) -> PartialVMResult<()> {
+    // Check to make sure that the bytecode vector ends with a branching instruction.
+    match code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Label {
+    Loop { last_continue: u16 },
+    Code,
+}
+
+struct ControlFlowVerifier<'a> {
+    current_function: FunctionDefinitionIndex,
+    code: &'a Vec<Bytecode>,
+}
+
+impl<'a> ControlFlowVerifier<'a> {
+    fn code(&self) -> impl Iterator<Item = (CodeOffset, &'a Bytecode)> {
+        self.code
+            .iter()
+            .enumerate()
+            .map(|(idx, instr)| (idx.try_into().unwrap(), instr))
+    }
+
+    fn labeled_code<'b: 'a>(
+        &self,
+        labels: &'b [Label],
+    ) -> impl Iterator<Item = (CodeOffset, &'a Bytecode, &'b Label)> {
+        self.code()
+            .zip(labels)
+            .map(|((i, instr), lbl)| (i, instr, lbl))
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
+
+fn instruction_labels(context: &ControlFlowVerifier) -> Vec<Label> {
+    let mut labels: Vec<Label> = (0..context.code.len()).map(|_| Label::Code).collect();
+    let mut loop_continue = |loop_idx: CodeOffset, last_continue: CodeOffset| {
+        labels[loop_idx as usize] = Label::Loop { last_continue }
+    };
+    for (i, instr) in context.code() {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(prev) | Bytecode::BrTrue(prev) | Bytecode::BrFalse(prev)
+                if is_back_edge(i, *prev) =>
+            {
+                loop_continue(*prev, i)
+            }
+            _ => (),
+        }
+    }
+    labels
+}
+
+// Ensures the invariant:
+//   - All forward jumps do not enter into the middle of a loop
+//   - All "breaks" go to the "end" of the loop
+//   - All back jumps are only to the current loop
+//   - Nested loops do not exceed a given depth
+fn check_jumps(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: Vec<Label>,
+) -> PartialVMResult<()> {
+    // All back jumps are only to the current loop
+    check_continues(context, &labels)?;
+    // All "breaks" go to the "end" of the loop
+    check_breaks(context, &labels)?;
+
+    let loop_depth = count_loop_depth(&labels);
+
+    // All forward jumps do not enter into the middle of a loop
+    check_no_loop_splits(context, &labels, &loop_depth)?;
+    // Nested loops do not exceed a given depth
+    check_loop_depth(verifier_config, context, &labels, &loop_depth)
+}
+
+fn check_code<
+    F: FnMut(&Vec<(CodeOffset, CodeOffset)>, CodeOffset, &Bytecode) -> PartialVMResult<()>,
+>(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    mut check: F,
+) -> PartialVMResult<()> {
+    let mut loop_stack: Vec<(CodeOffset, CodeOffset)> = vec![];
+    for (cur_instr, instr, label) in context.labeled_code(labels) {
+        // Add loop to stack
+        if let Label::Loop { last_continue } = label {
+            loop_stack.push((cur_instr, *last_continue));
+        }
+
+        check(&loop_stack, cur_instr, instr)?;
+
+        // Pop if last continue
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (_cur_loop_head, last_continue) = safe_unwrap!(loop_stack.last());
+                if cur_instr == *last_continue {
+                    loop_stack.pop();
+                }
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
+
+fn is_back_edge(cur_instr: CodeOffset, target_instr: CodeOffset) -> bool {
+    target_instr <= cur_instr
+}
+
+// All back jumps are only to the current loop
+fn check_continues(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (cur_loop_head, _last_continue) = safe_unwrap!(loop_stack.last());
+                if target != cur_loop_head {
+                    // Invalid back jump. Cannot back jump outside of the current loop
+                    Err(context.error(StatusCode::INVALID_LOOP_CONTINUE, cur_instr))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_breaks(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if !is_back_edge(cur_instr, *target) =>
+            {
+                match loop_stack.last() {
+                    Some((_cur_loop_head, last_continue))
+                        if target > last_continue && *target != last_continue + 1 =>
+                    {
+                        // Invalid loop break. Must break immediately to the instruction after
+                        // the last continue
+                        Err(context.error(StatusCode::INVALID_LOOP_BREAK, cur_instr))
+                    }
+                    _ => Ok(()),
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_no_loop_splits(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let is_break = |loop_stack: &Vec<(CodeOffset, CodeOffset)>, jump_target: CodeOffset| -> bool {
+        match loop_stack.last() {
+            None => false,
+            Some((_cur_loop_head, last_continue)) => jump_target > *last_continue,
+        }
+    };
+    check_code(context, labels, |loop_stack, i, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(j) | Bytecode::BrTrue(j) | Bytecode::BrFalse(j)
+                if *j > i && !is_break(loop_stack, *j) =>
+            {
+                let j = *j;
+                let before_depth = loop_depth[i as usize];
+                let after_depth = match &labels[j as usize] {
+                    Label::Loop { .. } => loop_depth[j as usize] - 1,
+                    Label::Code => loop_depth[j as usize],
+                };
+                if before_depth != after_depth {
+                    // Invalid forward jump. Entered the middle of a loop
+                    Err(context.error(StatusCode::INVALID_LOOP_SPLIT, i))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_loop_depth(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let max_depth = match verifier_config.max_loop_depth {
+        Some(depth) => depth,
+        None => return Ok(()),
+    };
+    check_code(context, labels, |_loop_stack, i, _instr| {
+        if loop_depth[i as usize] > max_depth {
+            return Err(context.error(StatusCode::LOOP_MAX_DEPTH_REACHED, i));
+        }
+        Ok(())
+    })
+}
+
+// Only called after continues are verified, so we can assume that loops are well nested
+fn count_loop_depth(labels: &[Label]) -> Vec<usize> {
+    let last_continues: HashSet<CodeOffset> = labels
+        .iter()
+        .filter_map(|label| match label {
+            Label::Loop { last_continue } => Some(*last_continue),
+            Label::Code => None,
+        })
+        .collect();
+    let mut count = 0;
+    let mut counts = vec![];
+    for (idx, label) in labels.iter().enumerate() {
+        if let Label::Loop { .. } = label {
+            count += 1
+        }
+        counts.push(count);
+        if last_continues.contains(&idx.try_into().unwrap()) {
+            count -= 1;
+        }
+    }
+    counts
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/cyclic_dependencies.rs b/vendors/move/crates/move-bytecode-verifier/src/cyclic_dependencies.rs
new file mode 100644
index 000000000..cee7aeb40
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/cyclic_dependencies.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::{language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::BTreeSet;
+
+pub fn verify_module<D>(module: &CompiledModule, imm_deps: D) -> VMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    verify_module_impl(module, imm_deps).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+/// This function performs a depth-first traversal in the module graph, starting at `module` and
+/// recursively exploring immediate dependencies.  During the DFS,
+/// - If `module.self_id()` is encountered (again), a dependency cycle is detected and an error is
+///   returned.
+/// - Otherwise terminates without an error.
+fn verify_module_impl<D>(module: &CompiledModule, imm_deps: D) -> PartialVMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    fn detect_cycles<D>(
+        target: &ModuleId,
+        cursor: &ModuleId,
+        visited: &mut BTreeSet<ModuleId>,
+        deps: &D,
+    ) -> PartialVMResult<bool>
+    where
+        D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+    {
+        if cursor == target {
+            return Ok(true);
+        }
+
+        if !visited.insert(cursor.clone()) {
+            for dep in deps(cursor)? {
+                if detect_cycles(target, &dep, visited, deps)? {
+                    return Ok(true);
+                }
+            }
+        }
+
+        Ok(false)
+    }
+
+    let self_id = module.self_id();
+    let mut visited = BTreeSet::new();
+    for dep in module.immediate_dependencies() {
+        if detect_cycles(&self_id, &dep, &mut visited, &imm_deps)? {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY));
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/dependencies.rs b/vendors/move/crates/move-bytecode-verifier/src/dependencies.rs
new file mode 100644
index 000000000..f24b75487
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/dependencies.rs
@@ -0,0 +1,587 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules and scripts.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, CompiledModule, CompiledScript, FunctionDefinitionIndex,
+        FunctionHandleIndex, ModuleHandleIndex, SignatureToken, StructHandleIndex,
+        StructTypeParameter, TableIndex, Visibility,
+    },
+    file_format_common::VERSION_5,
+    safe_unwrap, IndexKind,
+};
+use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::{BTreeMap, BTreeSet};
+
+struct Context<'a, 'b> {
+    resolver: BinaryIndexedView<'a>,
+    // (Module -> CompiledModule) for (at least) all immediate dependencies
+    dependency_map: BTreeMap<ModuleId, &'b CompiledModule>,
+    // (Module::StructName -> handle) for all types of all dependencies
+    struct_id_to_handle_map: BTreeMap<(ModuleId, Identifier), StructHandleIndex>,
+    // (Module::FunctionName -> handle) for all functions that can ever be called by this
+    // module/script in all dependencies
+    func_id_to_handle_map: BTreeMap<(ModuleId, Identifier), FunctionHandleIndex>,
+    // (handle -> visibility) for all function handles found in the module being checked
+    function_visibilities: BTreeMap<FunctionHandleIndex, Visibility>,
+    // all function handles found in the module being checked that are script functions in <V5
+    // None if the current module/script >= V5
+    script_functions: Option<BTreeSet<FunctionHandleIndex>>,
+}
+
+impl<'a, 'b> Context<'a, 'b> {
+    fn module(
+        module: &'a CompiledModule,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Module(module), dependencies)
+    }
+
+    fn script(
+        script: &'a CompiledScript,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Script(script), dependencies)
+    }
+
+    fn new(
+        resolver: BinaryIndexedView<'a>,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        let self_module = resolver.self_id();
+        let self_module_idx = resolver.self_handle_idx();
+        let empty_defs = &vec![];
+        let self_function_defs = match &resolver {
+            BinaryIndexedView::Module(m) => m.function_defs(),
+            BinaryIndexedView::Script(_) => empty_defs,
+        };
+        let dependency_map = dependencies
+            .into_iter()
+            .filter(|d| Some(d.self_id()) != self_module)
+            .map(|d| (d.self_id(), d))
+            .collect();
+
+        let script_functions = if resolver.version() < VERSION_5 {
+            Some(BTreeSet::new())
+        } else {
+            None
+        };
+        let mut context = Self {
+            resolver,
+            dependency_map,
+            struct_id_to_handle_map: BTreeMap::new(),
+            func_id_to_handle_map: BTreeMap::new(),
+            function_visibilities: BTreeMap::new(),
+            script_functions,
+        };
+
+        let mut dependency_visibilities = BTreeMap::new();
+        for (module_id, module) in &context.dependency_map {
+            let friend_module_ids: BTreeSet<_> = module.immediate_friends().into_iter().collect();
+
+            // Module::StructName -> def handle idx
+            for struct_def in module.struct_defs() {
+                let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+                let struct_name = module.identifier_at(struct_handle.name);
+                context.struct_id_to_handle_map.insert(
+                    (module_id.clone(), struct_name.to_owned()),
+                    struct_def.struct_handle,
+                );
+            }
+            // Module::FuncName -> def handle idx
+            for func_def in module.function_defs() {
+                let func_handle = module.function_handle_at(func_def.function);
+                let func_name = module.identifier_at(func_handle.name);
+                dependency_visibilities.insert(
+                    (module_id.clone(), func_name.to_owned()),
+                    (func_def.visibility, func_def.is_entry),
+                );
+                let may_be_called = match func_def.visibility {
+                    Visibility::Public => true,
+                    Visibility::Friend => self_module
+                        .as_ref()
+                        .map_or(false, |self_id| friend_module_ids.contains(self_id)),
+                    Visibility::Private => false,
+                };
+                if may_be_called {
+                    context
+                        .func_id_to_handle_map
+                        .insert((module_id.clone(), func_name.to_owned()), func_def.function);
+                }
+            }
+        }
+
+        for function_def in self_function_defs {
+            context
+                .function_visibilities
+                .insert(function_def.function, function_def.visibility);
+            if function_def.is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(function_def.function));
+            }
+        }
+        for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+            if Some(function_handle.module) == self_module_idx {
+                continue;
+            }
+            let dep_module_id = context
+                .resolver
+                .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+            let function_name = context.resolver.identifier_at(function_handle.name);
+            let dep_file_format_version =
+                context.dependency_map.get(&dep_module_id).unwrap().version;
+            let dep_function = (dep_module_id, function_name.to_owned());
+            let (visibility, is_entry) = match dependency_visibilities.get(&dep_function) {
+                // The visibility does not need to be set here. If the function does not
+                // link, it will be reported by verify_imported_functions
+                None => continue,
+                Some(vis_entry) => *vis_entry,
+            };
+            let fhandle_idx = FunctionHandleIndex(idx as TableIndex);
+            context
+                .function_visibilities
+                .insert(fhandle_idx, visibility);
+            if dep_file_format_version < VERSION_5 && is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(fhandle_idx));
+            }
+        }
+
+        context
+    }
+}
+
+pub fn verify_module<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_module_impl(module, dependencies)
+        .map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::module(module, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+pub fn verify_script<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_script_impl(script, dependencies).map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_script_impl<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::script(script, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+fn verify_imported_modules(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, module_handle) in context.resolver.module_handles().iter().enumerate() {
+        let module_id = context.resolver.module_id_for_handle(module_handle);
+        if Some(ModuleHandleIndex(idx as u16)) != self_module
+            && !context.dependency_map.contains_key(&module_id)
+        {
+            return Err(verification_error(
+                StatusCode::MISSING_DEPENDENCY,
+                IndexKind::ModuleHandle,
+                idx as TableIndex,
+            ));
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_structs(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, struct_handle) in context.resolver.struct_handles().iter().enumerate() {
+        if Some(struct_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(struct_handle.module));
+        // TODO: remove unwrap
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        let struct_name = context.resolver.identifier_at(struct_handle.name);
+        match context
+            .struct_id_to_handle_map
+            .get(&(owner_module_id, struct_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.struct_handle_at(*def_idx);
+                if !compatible_struct_abilities(struct_handle.abilities, def_handle.abilities)
+                    || !compatible_struct_type_parameters(
+                        &struct_handle.type_parameters,
+                        &def_handle.type_parameters,
+                    )
+                {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::StructHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::StructHandle,
+                    idx as TableIndex,
+                ))
+            }
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_functions(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+        if Some(function_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+        let function_name = context.resolver.identifier_at(function_handle.name);
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        match context
+            .func_id_to_handle_map
+            .get(&(owner_module_id.clone(), function_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.function_handle_at(*def_idx);
+                // compatible type parameter constraints
+                if !compatible_fun_type_parameters(
+                    &function_handle.type_parameters,
+                    &def_handle.type_parameters,
+                ) {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+                // same parameters
+                let handle_params = context.resolver.signature_at(function_handle.parameters);
+                let def_params = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.parameters),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_params.0,
+                    &def_params.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+
+                // same return_
+                let handle_return = context.resolver.signature_at(function_handle.return_);
+                let def_return = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.return_),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_return.0,
+                    &def_return.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::FunctionHandle,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
+
+// The local view must be a subset of (or equal to) the defined set of abilities. Conceptually, the
+// local view can be more constrained than the defined one. Removing abilities locally does nothing
+// but limit the local usage.
+// (Note this works because there are no negative constraints, i.e. you cannot constrain a type
+// parameter with the absence of an ability)
+fn compatible_struct_abilities(
+    local_struct_abilities_declaration: AbilitySet,
+    defined_struct_abilities: AbilitySet,
+) -> bool {
+    local_struct_abilities_declaration.is_subset(defined_struct_abilities)
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`]
+fn compatible_fun_type_parameters(
+    local_type_parameters_declaration: &[AbilitySet],
+    defined_type_parameters: &[AbilitySet],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(
+                    local_type_parameter_constraints_declaration,
+                    defined_type_parameter_constraints,
+                )| {
+                    compatible_type_parameter_constraints(
+                        *local_type_parameter_constraints_declaration,
+                        *defined_type_parameter_constraints,
+                    )
+                },
+            )
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`] and [`compatible_type_parameter_phantom_decl`]
+fn compatible_struct_type_parameters(
+    local_type_parameters_declaration: &[StructTypeParameter],
+    defined_type_parameters: &[StructTypeParameter],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(local_type_parameter_declaration, defined_type_parameter)| {
+                    compatible_type_parameter_phantom_decl(
+                        local_type_parameter_declaration,
+                        defined_type_parameter,
+                    ) && compatible_type_parameter_constraints(
+                        local_type_parameter_declaration.constraints,
+                        defined_type_parameter.constraints,
+                    )
+                },
+            )
+}
+
+//  The local view of a type parameter must be a superset of (or equal to) the defined
+//  constraints. Conceptually, the local view can be more constrained than the defined one as the
+//  local context is only limiting usage, and cannot take advantage of the additional constraints.
+fn compatible_type_parameter_constraints(
+    local_type_parameter_constraints_declaration: AbilitySet,
+    defined_type_parameter_constraints: AbilitySet,
+) -> bool {
+    defined_type_parameter_constraints.is_subset(local_type_parameter_constraints_declaration)
+}
+
+// Adding phantom declarations relaxes the requirements for clients, thus, the local view may
+// lack a phantom declaration present in the definition.
+fn compatible_type_parameter_phantom_decl(
+    local_type_parameter_declaration: &StructTypeParameter,
+    defined_type_parameter: &StructTypeParameter,
+) -> bool {
+    // local_type_parameter_declaration.is_phantom => defined_type_parameter.is_phantom
+    !local_type_parameter_declaration.is_phantom || defined_type_parameter.is_phantom
+}
+
+fn compare_cross_module_signatures(
+    context: &Context,
+    handle_sig: &[SignatureToken],
+    def_sig: &[SignatureToken],
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    if handle_sig.len() != def_sig.len() {
+        return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+    }
+    for (handle_type, def_type) in handle_sig.iter().zip(def_sig) {
+        compare_types(context, handle_type, def_type, def_module)?;
+    }
+    Ok(())
+}
+
+fn compare_types(
+    context: &Context,
+    handle_type: &SignatureToken,
+    def_type: &SignatureToken,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    match (handle_type, def_type) {
+        (SignatureToken::Bool, SignatureToken::Bool)
+        | (SignatureToken::U8, SignatureToken::U8)
+        | (SignatureToken::U16, SignatureToken::U16)
+        | (SignatureToken::U32, SignatureToken::U32)
+        | (SignatureToken::U64, SignatureToken::U64)
+        | (SignatureToken::U128, SignatureToken::U128)
+        | (SignatureToken::U256, SignatureToken::U256)
+        | (SignatureToken::Address, SignatureToken::Address)
+        | (SignatureToken::Signer, SignatureToken::Signer) => Ok(()),
+        (SignatureToken::Vector(ty1), SignatureToken::Vector(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::Struct(idx1), SignatureToken::Struct(idx2)) => {
+            compare_structs(context, *idx1, *idx2, def_module)
+        }
+        (
+            SignatureToken::StructInstantiation(idx1, inst1),
+            SignatureToken::StructInstantiation(idx2, inst2),
+        ) => {
+            compare_structs(context, *idx1, *idx2, def_module)?;
+            compare_cross_module_signatures(context, inst1, inst2, def_module)
+        }
+        (SignatureToken::Reference(ty1), SignatureToken::Reference(ty2))
+        | (SignatureToken::MutableReference(ty1), SignatureToken::MutableReference(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::TypeParameter(idx1), SignatureToken::TypeParameter(idx2)) => {
+            if idx1 != idx2 {
+                Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+            } else {
+                Ok(())
+            }
+        }
+        (SignatureToken::Bool, _)
+        | (SignatureToken::U8, _)
+        | (SignatureToken::U64, _)
+        | (SignatureToken::U128, _)
+        | (SignatureToken::Address, _)
+        | (SignatureToken::Signer, _)
+        | (SignatureToken::Vector(_), _)
+        | (SignatureToken::Struct(_), _)
+        | (SignatureToken::StructInstantiation(_, _), _)
+        | (SignatureToken::Reference(_), _)
+        | (SignatureToken::MutableReference(_), _)
+        | (SignatureToken::TypeParameter(_), _)
+        | (SignatureToken::U16, _)
+        | (SignatureToken::U32, _)
+        | (SignatureToken::U256, _) => Err(PartialVMError::new(StatusCode::TYPE_MISMATCH)),
+    }
+}
+
+fn compare_structs(
+    context: &Context,
+    idx1: StructHandleIndex,
+    idx2: StructHandleIndex,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    // grab ModuleId and struct name for the module being verified
+    let struct_handle = context.resolver.struct_handle_at(idx1);
+    let module_handle = context.resolver.module_handle_at(struct_handle.module);
+    let module_id = context.resolver.module_id_for_handle(module_handle);
+    let struct_name = context.resolver.identifier_at(struct_handle.name);
+
+    // grab ModuleId and struct name for the definition
+    let def_struct_handle = def_module.struct_handle_at(idx2);
+    let def_module_handle = def_module.module_handle_at(def_struct_handle.module);
+    let def_module_id = def_module.module_id_for_handle(def_module_handle);
+    let def_struct_name = def_module.identifier_at(def_struct_handle.name);
+
+    if module_id != def_module_id || struct_name != def_struct_name {
+        Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+    } else {
+        Ok(())
+    }
+}
+
+fn verify_all_script_visibility_usage(context: &Context) -> PartialVMResult<()> {
+    // script visibility deprecated after V5
+    let script_functions = match &context.script_functions {
+        None => return Ok(()),
+        Some(s) => s,
+    };
+    debug_assert!(context.resolver.version() < VERSION_5);
+    match &context.resolver {
+        BinaryIndexedView::Module(m) => {
+            for (idx, fdef) in m.function_defs().iter().enumerate() {
+                let code = match &fdef.code {
+                    None => continue,
+                    Some(code) => &code.code,
+                };
+                verify_script_visibility_usage(
+                    &context.resolver,
+                    script_functions,
+                    fdef.is_entry,
+                    FunctionDefinitionIndex(idx as TableIndex),
+                    code,
+                )?
+            }
+            Ok(())
+        }
+        BinaryIndexedView::Script(s) => verify_script_visibility_usage(
+            &context.resolver,
+            script_functions,
+            true,
+            FunctionDefinitionIndex(0),
+            &s.code().code,
+        ),
+    }
+}
+
+fn verify_script_visibility_usage(
+    resolver: &BinaryIndexedView,
+    script_functions: &BTreeSet<FunctionHandleIndex>,
+    current_is_entry: bool,
+    fdef_idx: FunctionDefinitionIndex,
+    code: &[Bytecode],
+) -> PartialVMResult<()> {
+    for (idx, instr) in code.iter().enumerate() {
+        let idx = idx as CodeOffset;
+        let fhandle_idx = match instr {
+            Bytecode::Call(fhandle_idx) => fhandle_idx,
+            Bytecode::CallGeneric(finst_idx) => {
+                &resolver.function_instantiation_at(*finst_idx).handle
+            }
+            _ => continue,
+        };
+        match (current_is_entry, script_functions.contains(fhandle_idx)) {
+            (true, true) => (),
+            (_, true) => {
+                return Err(PartialVMError::new(
+                    StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+                )
+                .at_code_offset(fdef_idx, idx)
+                .with_message(
+                    "script-visible functions can only be called from scripts or other \
+                    script-visible functions"
+                        .to_string(),
+                ));
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/friends.rs b/vendors/move/crates/move-bytecode-verifier/src/friends.rs
new file mode 100644
index 000000000..7bfd9afec
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/friends.rs
@@ -0,0 +1,48 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    // cannot make friends with the module itself
+    let self_handle = module.self_handle();
+    if module.friend_decls().contains(self_handle) {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_SELF,
+        ));
+    }
+
+    // cannot make friends with modules outside of the account address
+    //
+    // NOTE: this constraint is a policy decision rather than a technical requirement. The VM and
+    // other bytecode verifier passes do not rely on the assumption that friend modules must be
+    // declared within the same account address.
+    //
+    // However, lacking a definite use case of friending modules across account boundaries, and also
+    // to minimize the associated changes on the module publishing flow, we temporarily enforce this
+    // constraint and we may consider lifting this limitation in the future.
+    let self_address =
+        module.address_identifier_at(module.module_handle_at(module.self_handle_idx()).address);
+    let has_external_friend = module
+        .friend_decls()
+        .iter()
+        .any(|handle| module.address_identifier_at(handle.address) != self_address);
+    if has_external_friend {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS,
+        ));
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/instantiation_loops.rs b/vendors/move/crates/move-bytecode-verifier/src/instantiation_loops.rs
new file mode 100644
index 000000000..9af7dff23
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/instantiation_loops.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This implements an algorithm that detects loops during the instantiation of generics.
+//!
+//! It builds a graph from the given `CompiledModule` and converts the original problem into
+//! finding strongly connected components in the graph with certain properties. Read the
+//! documentation of the types/functions below for details of how it works.
+//!
+//! Note: We're doing generics only up to specialization, and are doing a conservative check of
+//! generic call sites to eliminate those which could lead to an infinite number of specialized
+//! instances. We do reject recursive functions that create a new type upon each call but do
+//! terminate eventually.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CompiledModule, FunctionDefinition, FunctionDefinitionIndex, FunctionHandleIndex,
+        SignatureIndex, SignatureToken, TypeParameterIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{
+    algo::tarjan_scc,
+    graph::{EdgeIndex, NodeIndex},
+    visit::EdgeRef,
+    Graph,
+};
+use std::collections::{hash_map, HashMap, HashSet};
+
+/// Data attached to each node.
+/// Each node corresponds to a type formal of a generic function in the module.
+#[derive(Eq, PartialEq, Hash, Copy, Clone)]
+struct Node(FunctionDefinitionIndex, TypeParameterIndex);
+
+/// Data attached to each edge. Indicating the type of the edge.
+enum Edge<'a> {
+    /// This type of edge from type formal T1 to T2 means the type bound to T1 is used to
+    /// instantiate T2 unmodified, thus the name `Identity`.
+    ///
+    /// Example:
+    /// ```
+    /// //    foo<T>() { bar<T>(); return; }
+    /// //
+    /// //    edge: foo_T --Id--> bar_T
+    /// ```
+    Identity,
+    /// This type of edge from type formal T1 to T2 means T2 is instantiated with a type resulted
+    /// by applying one or more type constructors to T1 (potentially with other types).
+    ///
+    /// This is interesting to us as it creates a new (and bigger) type.
+    ///
+    /// Example:
+    /// ```
+    /// //    struct Baz<T> {}
+    /// //    foo<T>() { bar<Baz<T>>(); return; }
+    /// //
+    /// //    edge: foo_T --TyConApp(Baz<T>)--> bar_T
+    /// ```
+    TyConApp(&'a SignatureToken),
+}
+
+pub struct InstantiationLoopChecker<'a> {
+    module: &'a CompiledModule,
+
+    graph: Graph<Node, Edge<'a>>,
+    node_map: HashMap<Node, NodeIndex>,
+    func_handle_def_map: HashMap<FunctionHandleIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> InstantiationLoopChecker<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        Self {
+            module,
+            graph: Graph::new(),
+            node_map: HashMap::new(),
+            func_handle_def_map: module
+                .function_defs()
+                .iter()
+                .enumerate()
+                .map(|(def_idx, def)| (def.function, FunctionDefinitionIndex::new(def_idx as u16)))
+                .collect(),
+        }
+    }
+
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let mut checker = Self::new(module);
+        checker.build_graph();
+        let mut components = checker.find_non_trivial_components();
+
+        match components.pop() {
+            None => Ok(()),
+            Some((nodes, edges)) => {
+                let msg_edges = edges
+                    .into_iter()
+                    .filter_map(
+                        |edge_idx| match checker.graph.edge_weight(edge_idx).unwrap() {
+                            Edge::TyConApp(_) => Some(checker.format_edge(edge_idx)),
+                            _ => None,
+                        },
+                    )
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg_nodes = nodes
+                    .into_iter()
+                    .map(|node_idx| checker.format_node(node_idx))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg = format!(
+                    "edges with constructors: [{}], nodes: [{}]",
+                    msg_edges, msg_nodes
+                );
+                Err(PartialVMError::new(StatusCode::LOOP_IN_INSTANTIATION_GRAPH).with_message(msg))
+            }
+        }
+    }
+
+    /// Retrieves the node corresponding to the specified type formal.
+    /// If none exists in the graph yet, create one.
+    fn get_or_add_node(&mut self, node: Node) -> NodeIndex {
+        match self.node_map.entry(node) {
+            hash_map::Entry::Occupied(entry) => *entry.get(),
+            hash_map::Entry::Vacant(entry) => {
+                let idx = self.graph.add_node(node);
+                entry.insert(idx);
+                idx
+            }
+        }
+    }
+
+    /// Helper function that extracts type parameters from a given type.
+    /// Duplicated entries are removed.
+    fn extract_type_parameters(&self, ty: &SignatureToken) -> HashSet<TypeParameterIndex> {
+        use SignatureToken::*;
+
+        let mut type_params = HashSet::new();
+
+        fn rec(type_params: &mut HashSet<TypeParameterIndex>, ty: &SignatureToken) {
+            match ty {
+                Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Signer | Struct(_) => (),
+                TypeParameter(idx) => {
+                    type_params.insert(*idx);
+                }
+                Vector(ty) => rec(type_params, ty),
+                Reference(ty) | MutableReference(ty) => rec(type_params, ty),
+                StructInstantiation(_, tys) => {
+                    for ty in tys {
+                        rec(type_params, ty);
+                    }
+                }
+            }
+        }
+
+        rec(&mut type_params, ty);
+        type_params
+    }
+
+    /// Helper function that creates an edge from one given node to the other.
+    /// If a node does not exist, create one.
+    fn add_edge(&mut self, node_from: Node, node_to: Node, edge: Edge<'a>) {
+        let node_from_idx = self.get_or_add_node(node_from);
+        let node_to_idx = self.get_or_add_node(node_to);
+        self.graph.add_edge(node_from_idx, node_to_idx, edge);
+    }
+
+    /// Helper of 'fn build_graph' that inspects a function call. If type parameters of the caller
+    /// appear in the type actuals to the callee, nodes and edges are added to the graph.
+    fn build_graph_call(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        callee_idx: FunctionDefinitionIndex,
+        type_actuals_idx: SignatureIndex,
+    ) {
+        let type_actuals = &self.module.signature_at(type_actuals_idx).0;
+
+        for (formal_idx, ty) in type_actuals.iter().enumerate() {
+            let formal_idx = formal_idx as TypeParameterIndex;
+            match ty {
+                SignatureToken::TypeParameter(actual_idx) => self.add_edge(
+                    Node(caller_idx, *actual_idx),
+                    Node(callee_idx, formal_idx),
+                    Edge::Identity,
+                ),
+                _ => {
+                    for type_param in self.extract_type_parameters(ty) {
+                        self.add_edge(
+                            Node(caller_idx, type_param),
+                            Node(callee_idx, formal_idx),
+                            Edge::TyConApp(ty),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Helper of `fn build_graph` that inspects a function definition for calls between two generic
+    /// functions defined in the current module.
+    fn build_graph_function_def(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        caller_def: &FunctionDefinition,
+    ) {
+        if let Some(code) = &caller_def.code {
+            for instr in &code.code {
+                if let Bytecode::CallGeneric(callee_inst_idx) = instr {
+                    // Get the id of the definition of the function being called.
+                    // Skip if the function is not defined in the current module, as we do not
+                    // have mutual recursions across module boundaries.
+                    let callee_si = self.module.function_instantiation_at(*callee_inst_idx);
+                    if let Some(callee_idx) = self.func_handle_def_map.get(&callee_si.handle) {
+                        let callee_idx = *callee_idx;
+                        self.build_graph_call(caller_idx, callee_idx, callee_si.type_parameters)
+                    }
+                }
+            }
+        }
+    }
+
+    /// Builds a graph G such that
+    ///   - Each type formal of a generic function is a node in G.
+    ///   - There is an edge from type formal f_T to g_T if f_T is used to instantiate g_T in a
+    ///     call.
+    ///     - Each edge is labeled either `Identity` or `TyConApp`. See `Edge` for details.
+    fn build_graph(&mut self) {
+        for (def_idx, func_def) in self
+            .module
+            .function_defs()
+            .iter()
+            .enumerate()
+            .filter(|(_, def)| !def.is_native())
+        {
+            self.build_graph_function_def(FunctionDefinitionIndex::new(def_idx as u16), func_def)
+        }
+    }
+
+    /// Computes the strongly connected components of the graph built and keep the ones that
+    /// contain at least one `TyConApp` edge. Such components indicate there exists a loop such
+    /// that an input type can get "bigger" infinitely many times along the loop, also creating
+    /// infinitely many types. This is precisely the kind of constructs we want to forbid.
+    fn find_non_trivial_components(&self) -> Vec<(Vec<NodeIndex>, Vec<EdgeIndex>)> {
+        tarjan_scc(&self.graph)
+            .into_iter()
+            .filter_map(move |nodes| {
+                let node_set: HashSet<_> = nodes.iter().cloned().collect();
+
+                let edges: Vec<_> = nodes
+                    .iter()
+                    .flat_map(|node_idx| {
+                        self.graph.edges(*node_idx).filter_map(|edge| {
+                            if node_set.contains(&edge.target()) {
+                                Some(edge.id())
+                            } else {
+                                None
+                            }
+                        })
+                    })
+                    .collect();
+
+                if edges.iter().any(
+                    |edge_idx| match self.graph.edge_weight(*edge_idx).unwrap() {
+                        Edge::Identity => false,
+                        Edge::TyConApp(_) => true,
+                    },
+                ) {
+                    Some((nodes, edges))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    fn format_node(&self, node_idx: NodeIndex) -> String {
+        let Node(def_idx, param_idx) = self.graph.node_weight(node_idx).unwrap();
+        format!("f{}#{}", def_idx, param_idx)
+    }
+
+    fn format_edge(&self, edge_idx: EdgeIndex) -> String {
+        let (node_idx_1, node_idx_2) = self.graph.edge_endpoints(edge_idx).unwrap();
+        let node_1 = self.format_node(node_idx_1);
+        let node_2 = self.format_node(node_idx_2);
+
+        match self.graph.edge_weight(edge_idx).unwrap() {
+            Edge::TyConApp(ty) => format!("{} --{:?}--> {}", node_1, ty, node_2,),
+            Edge::Identity => format!("{} ----> {}", node_1, node_2),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/instruction_consistency.rs b/vendors/move/crates/move-bytecode-verifier/src/instruction_consistency.rs
new file mode 100644
index 000000000..52cb7cd00
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/instruction_consistency.rs
@@ -0,0 +1,209 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying consistency of each bytecode
+//! instruction, in particular, for the bytecode instructions that come in both generic and
+//! non-generic flavors. It also checks constraints on instructions like VecPack/VecUnpack.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, FieldHandleIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, StructDefinitionIndex, TableIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct InstructionConsistency<'a> {
+    resolver: BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+}
+
+impl<'a> InstructionConsistency<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let resolver = BinaryIndexedView::Module(module);
+
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            match &func_def.code {
+                None => (),
+                Some(code) => {
+                    let checker = Self {
+                        resolver,
+                        current_function: Some(FunctionDefinitionIndex(idx as TableIndex)),
+                    };
+                    checker.check_instructions(code)?
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    pub fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let checker = Self {
+            resolver: BinaryIndexedView::Script(script),
+            current_function: None,
+        };
+        checker.check_instructions(&script.code)
+    }
+
+    fn check_instructions(&self, code: &CodeUnit) -> PartialVMResult<()> {
+        for (offset, instr) in code.code.iter().enumerate() {
+            use Bytecode::*;
+
+            match instr {
+                MutBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                MutBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* generic */ true)?;
+                }
+                ImmBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                ImmBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* non_ */ true)?;
+                }
+                Call(idx) => {
+                    self.check_function_op(offset, *idx, /* generic */ false)?;
+                }
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    self.check_function_op(offset, func_inst.handle, /* generic */ true)?;
+                }
+                Pack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                PackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Unpack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                UnpackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MutBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                ImmBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ImmBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Exists(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ExistsGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveFrom(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveFromGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveTo(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveToGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                VecPack(_, num) | VecUnpack(_, num) => {
+                    if *num > u16::MAX as u64 {
+                        return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                            .at_code_offset(self.current_function(), offset as CodeOffset)
+                            .with_message("VecPack/VecUnpack argument out of range".to_string()));
+                    }
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                FreezeRef | Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_)
+                | LdU32(_) | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16
+                | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | ReadRef
+                | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor | Shl | Shr
+                | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | CopyLoc(_) | MoveLoc(_)
+                | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_) | VecLen(_) | VecImmBorrow(_)
+                | VecMutBorrow(_) | VecPushBack(_) | VecPopBack(_) | VecSwap(_) | Abort | Nop => (),
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Helpers for instructions that come in a generic and non generic form.
+    // Verifies the generic form uses a generic member and the non generic form
+    // a non generic one.
+    //
+
+    fn check_field_op(
+        &self,
+        offset: usize,
+        field_handle_index: FieldHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let field_handle = self.resolver.field_handle_at(field_handle_index)?;
+        self.check_type_op(offset, field_handle.owner, generic)
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+
+    fn check_type_op(
+        &self,
+        offset: usize,
+        struct_def_index: StructDefinitionIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.resolver.struct_def_at(struct_def_index)?;
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        if struct_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+
+    fn check_function_op(
+        &self,
+        offset: usize,
+        func_handle_index: FunctionHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.resolver.function_handle_at(func_handle_index);
+        if function_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/lib.rs b/vendors/move/crates/move-bytecode-verifier/src/lib.rs
new file mode 100644
index 000000000..c232fa847
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! Verifies bytecode sanity.
+
+// Bounds checks are implemented in the `vm` crate.
+pub mod ability_field_requirements;
+pub mod absint;
+pub mod check_duplication;
+pub mod code_unit_verifier;
+pub mod constants;
+pub mod control_flow;
+pub mod control_flow_v5;
+pub mod cyclic_dependencies;
+pub mod dependencies;
+pub mod friends;
+pub mod instantiation_loops;
+pub mod instruction_consistency;
+pub mod limits;
+pub mod loop_summary;
+pub mod script_signature;
+pub mod signature;
+pub mod struct_defs;
+pub mod verifier;
+
+pub use check_duplication::DuplicationChecker;
+pub use code_unit_verifier::CodeUnitVerifier;
+pub use instruction_consistency::InstructionConsistency;
+pub use script_signature::{
+    legacy_script_signature_checks, no_additional_script_signature_checks, FnCheckScriptSignature,
+};
+pub use signature::SignatureChecker;
+pub use struct_defs::RecursiveStructDefChecker;
+pub use verifier::{
+    verify_module_unmetered, verify_module_with_config_for_test, verify_module_with_config_metered,
+    verify_module_with_config_unmetered, verify_script_unmetered,
+    verify_script_with_config_metered, verify_script_with_config_unmetered,
+};
+
+mod acquires_list_verifier;
+mod locals_safety;
+pub mod meter;
+mod reference_safety;
+mod regression_tests;
+mod stack_usage_verifier;
+mod type_safety;
diff --git a/vendors/move/crates/move-bytecode-verifier/src/limits.rs b/vendors/move/crates/move-bytecode-verifier/src/limits.rs
new file mode 100644
index 000000000..93fe8440f
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/limits.rs
@@ -0,0 +1,223 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, SignatureToken, StructFieldInformation, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{runtime_value::MoveValue, vm_status::StatusCode};
+use move_vm_config::verifier::VerifierConfig;
+
+pub struct LimitsVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> LimitsVerifier<'a> {
+    pub fn verify_module(config: &VerifierConfig, module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        config: &VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        limit_check.verify_constants(config)?;
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)?;
+        limit_check.verify_identifiers(config)?;
+        limit_check.verify_definitions(config)
+    }
+
+    pub fn verify_script(config: &VerifierConfig, module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(config, module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        config: &VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)
+    }
+
+    fn verify_struct_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(limit) = config.max_generic_instantiation_length {
+            for (idx, struct_handle) in self.resolver.struct_handles().iter().enumerate() {
+                if struct_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::StructHandle, idx as u16));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_function_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, function_handle) in self.resolver.function_handles().iter().enumerate() {
+            if let Some(limit) = config.max_generic_instantiation_length {
+                if function_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+            if let Some(limit) = config.max_function_parameters {
+                if self
+                    .resolver
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .len()
+                    > limit
+                {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+        }
+        Ok(())
+    }
+
+    fn verify_type_nodes(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for sign in self.resolver.signatures() {
+            for ty in &sign.0 {
+                self.verify_type_node(config, ty)?
+            }
+        }
+        for cons in self.resolver.constant_pool() {
+            self.verify_type_node(config, &cons.type_)?
+        }
+        if let Some(sdefs) = self.resolver.struct_defs() {
+            for sdef in sdefs {
+                if let StructFieldInformation::Declared(fdefs) = &sdef.field_information {
+                    for fdef in fdefs {
+                        self.verify_type_node(config, &fdef.signature.0)?
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_type_node(
+        &self,
+        config: &VerifierConfig,
+        ty: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        if let Some(max) = &config.max_type_nodes {
+            // Structs and Parameters can expand to an unknown number of nodes, therefore
+            // we give them a higher size weight here.
+            const STRUCT_SIZE_WEIGHT: usize = 4;
+            const PARAM_SIZE_WEIGHT: usize = 4;
+            let mut size = 0;
+            for t in ty.preorder_traversal() {
+                // Notice that the preorder traversal will iterate all type instantiations, so we
+                // why we can ignore them below.
+                match t {
+                    SignatureToken::Struct(..) | SignatureToken::StructInstantiation(..) => {
+                        size += STRUCT_SIZE_WEIGHT
+                    }
+                    SignatureToken::TypeParameter(..) => size += PARAM_SIZE_WEIGHT,
+                    _ => size += 1,
+                }
+            }
+            if size > *max {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_definitions(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(defs) = self.resolver.function_defs() {
+            if let Some(max_function_definitions) = config.max_function_definitions {
+                if defs.len() > max_function_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+        }
+        if let Some(defs) = self.resolver.struct_defs() {
+            if let Some(max_struct_definitions) = config.max_struct_definitions {
+                if defs.len() > max_struct_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+            if let Some(max_fields_in_struct) = config.max_fields_in_struct {
+                for def in defs {
+                    match &def.field_information {
+                        StructFieldInformation::Native => (),
+                        StructFieldInformation::Declared(fields) => {
+                            if fields.len() > max_fields_in_struct {
+                                return Err(PartialVMError::new(
+                                    StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_constants(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, constant) in self.resolver.constant_pool().iter().enumerate() {
+            if let SignatureToken::Vector(_) = constant.type_ {
+                if let MoveValue::Vector(cons) =
+                    constant.deserialize_constant().ok_or_else(|| {
+                        verification_error(
+                            StatusCode::MALFORMED_CONSTANT_DATA,
+                            IndexKind::ConstantPool,
+                            idx as TableIndex,
+                        )
+                    })?
+                {
+                    if let Some(lim) = config.max_constant_vector_len {
+                        if cons.len() > lim as usize {
+                            return Err(PartialVMError::new(StatusCode::TOO_MANY_VECTOR_ELEMENTS)
+                                .with_message(format!("vector size limit is {}", lim)));
+                        }
+                    }
+                } else {
+                    return Err(verification_error(
+                        StatusCode::INVALID_CONSTANT_TYPE,
+                        IndexKind::ConstantPool,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Verifies the lengths of all identifers are valid
+    fn verify_identifiers(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(max_idenfitier_len) = config.max_idenfitier_len {
+            for (idx, identifier) in self.resolver.identifiers().iter().enumerate() {
+                if identifier.len() > (max_idenfitier_len as usize) {
+                    return Err(verification_error(
+                        StatusCode::IDENTIFIER_TOO_LONG,
+                        IndexKind::Identifier,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs b/vendors/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
new file mode 100644
index 000000000..099a679ad
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
@@ -0,0 +1,164 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the local safety analysis.
+
+use crate::absint::{AbstractDomain, JoinResult};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, CodeOffset, FunctionDefinitionIndex, LocalIndex},
+};
+use move_core_types::vm_status::StatusCode;
+
+/// LocalState represents the current assignment state of a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum LocalState {
+    /// The local does not have a value
+    Unavailable,
+    /// The local was assigned a non-drop value in at least one control flow path,
+    // but was `Unavailable` in at least one other path
+    MaybeAvailable,
+    /// The local has a value
+    Available,
+}
+use crate::meter::{Meter, Scope};
+use LocalState::*;
+
+pub(crate) const STEP_BASE_COST: u128 = 15;
+pub(crate) const RET_PER_LOCAL_COST: u128 = 30;
+pub(crate) const JOIN_BASE_COST: u128 = 10;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 5;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    all_local_abilities: Vec<AbilitySet>,
+    local_states: Vec<LocalState>,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(
+        resolver: &BinaryIndexedView,
+        function_view: &FunctionView,
+    ) -> PartialVMResult<Self> {
+        let num_args = function_view.parameters().len();
+        let num_locals = num_args + function_view.locals().len();
+        let local_states = (0..num_locals)
+            .map(|i| if i < num_args { Available } else { Unavailable })
+            .collect();
+
+        let all_local_abilities = function_view
+            .parameters()
+            .0
+            .iter()
+            .chain(function_view.locals().0.iter())
+            .map(|st| resolver.abilities(st, function_view.type_parameters()))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+
+        Ok(Self {
+            current_function: function_view.index(),
+            local_states,
+            all_local_abilities,
+        })
+    }
+
+    pub fn local_abilities(&self, idx: LocalIndex) -> AbilitySet {
+        self.all_local_abilities[idx as usize]
+    }
+
+    pub fn all_local_abilities(&self) -> &Vec<AbilitySet> {
+        &self.all_local_abilities
+    }
+
+    pub fn local_state(&self, idx: LocalIndex) -> LocalState {
+        self.local_states[idx as usize]
+    }
+
+    pub fn local_states(&self) -> &Vec<LocalState> {
+        &self.local_states
+    }
+
+    pub fn set_available(&mut self, idx: LocalIndex) {
+        self.local_states[idx as usize] = Available
+    }
+
+    pub fn set_unavailable(&mut self, idx: LocalIndex) {
+        assert!(self.local_states[idx as usize] == Available);
+        self.local_states[idx as usize] = Unavailable
+    }
+
+    pub fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.all_local_abilities.len() == other.all_local_abilities.len());
+        assert!(self.local_states.len() == other.local_states.len());
+        let current_function = self.current_function;
+        let all_local_abilities = self.all_local_abilities.clone();
+        let local_states = self
+            .local_states
+            .iter()
+            .zip(&other.local_states)
+            .map(|(self_state, other_state)| {
+                use LocalState::*;
+                match (self_state, other_state) {
+                    // Unavailable on both sides, nothing to add
+                    (Unavailable, Unavailable) => Unavailable,
+
+                    (MaybeAvailable, Unavailable)
+                    | (Unavailable, MaybeAvailable)
+                    | (MaybeAvailable, MaybeAvailable)
+                    | (MaybeAvailable, Available)
+                    | (Available, MaybeAvailable)
+                    | (Unavailable, Available)
+                    | (Available, Unavailable) => MaybeAvailable,
+
+                    (Available, Available) => Available,
+                }
+            })
+            .collect();
+
+        Self {
+            current_function,
+            all_local_abilities,
+            local_states,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_LOCAL_COST,
+            state.local_states.len(),
+        )?;
+        let joined = Self::join_(self, state);
+        assert!(self.local_states.len() == joined.local_states.len());
+        let locals_unchanged = self
+            .local_states
+            .iter()
+            .zip(&joined.local_states)
+            .all(|(self_state, other_state)| self_state == other_state);
+        if locals_unchanged {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs b/vendors/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs
new file mode 100644
index 000000000..55c80d93e
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -0,0 +1,185 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying local safety of a procedure body.
+//! It is concerned with the assignment state of a local variable at the time of usage, which is
+//! a control flow sensitive check.
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    locals_safety::abstract_state::{RET_PER_LOCAL_COST, STEP_BASE_COST},
+    meter::{Meter, Scope},
+};
+use abstract_state::{AbstractState, LocalState};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset},
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) fn verify<'a>(
+    resolver: &BinaryIndexedView,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(resolver, function_view)?;
+    LocalsSafetyAnalysis().analyze_function(initial_state, function_view, meter)
+}
+
+fn execute_inner(
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    match bytecode {
+        Bytecode::StLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Available
+                if !state.local_abilities(*idx).has_drop() =>
+            {
+                return Err(state.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            _ => state.set_available(*idx),
+        },
+
+        Bytecode::MoveLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::MOVELOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => state.set_unavailable(*idx),
+        },
+
+        Bytecode::CopyLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::COPYLOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => (),
+        },
+
+        Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+            match state.local_state(*idx) {
+                LocalState::Unavailable | LocalState::MaybeAvailable => {
+                    return Err(state.error(StatusCode::BORROWLOC_UNAVAILABLE_ERROR, offset))
+                }
+                LocalState::Available => (),
+            }
+        }
+
+        Bytecode::Ret => {
+            let local_states = state.local_states();
+            meter.add_items(Scope::Function, RET_PER_LOCAL_COST, local_states.len())?;
+            let all_local_abilities = state.all_local_abilities();
+            assert!(local_states.len() == all_local_abilities.len());
+            for (local_state, local_abilities) in local_states.iter().zip(all_local_abilities) {
+                match local_state {
+                    LocalState::MaybeAvailable | LocalState::Available
+                        if !local_abilities.has_drop() =>
+                    {
+                        return Err(
+                            state.error(StatusCode::UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP, offset)
+                        )
+                    }
+                    _ => (),
+                }
+            }
+        }
+
+        Bytecode::Pop
+        | Bytecode::BrTrue(_)
+        | Bytecode::BrFalse(_)
+        | Bytecode::Abort
+        | Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::FreezeRef
+        | Bytecode::MutBorrowField(_)
+        | Bytecode::MutBorrowFieldGeneric(_)
+        | Bytecode::ImmBorrowField(_)
+        | Bytecode::ImmBorrowFieldGeneric(_)
+        | Bytecode::LdU8(_)
+        | Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
+        | Bytecode::LdU64(_)
+        | Bytecode::LdU128(_)
+        | Bytecode::LdU256(_)
+        | Bytecode::LdConst(_)
+        | Bytecode::LdTrue
+        | Bytecode::LdFalse
+        | Bytecode::Call(_)
+        | Bytecode::CallGeneric(_)
+        | Bytecode::Pack(_)
+        | Bytecode::PackGeneric(_)
+        | Bytecode::Unpack(_)
+        | Bytecode::UnpackGeneric(_)
+        | Bytecode::ReadRef
+        | Bytecode::WriteRef
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Not
+        | Bytecode::Eq
+        | Bytecode::Neq
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge
+        | Bytecode::MutBorrowGlobal(_)
+        | Bytecode::MutBorrowGlobalGeneric(_)
+        | Bytecode::ImmBorrowGlobal(_)
+        | Bytecode::ImmBorrowGlobalGeneric(_)
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_)
+        | Bytecode::MoveFrom(_)
+        | Bytecode::MoveFromGeneric(_)
+        | Bytecode::MoveTo(_)
+        | Bytecode::MoveToGeneric(_)
+        | Bytecode::VecPack(..)
+        | Bytecode::VecLen(_)
+        | Bytecode::VecImmBorrow(_)
+        | Bytecode::VecMutBorrow(_)
+        | Bytecode::VecPushBack(_)
+        | Bytecode::VecPopBack(_)
+        | Bytecode::VecUnpack(..)
+        | Bytecode::VecSwap(_) => (),
+    };
+    Ok(())
+}
+
+struct LocalsSafetyAnalysis();
+
+impl TransferFunctions for LocalsSafetyAnalysis {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        _last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(state, bytecode, index, meter)
+    }
+}
+
+impl AbstractInterpreter for LocalsSafetyAnalysis {}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/loop_summary.rs b/vendors/move/crates/move-bytecode-verifier/src/loop_summary.rs
new file mode 100644
index 000000000..0f56382b8
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/loop_summary.rs
@@ -0,0 +1,280 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
+
+/// Dense index into nodes in the same `LoopSummary`
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId(u16);
+
+/// Alias to treat vectors as `NodeId -> T` maps.
+type NodeMap<T> = Vec<T>;
+
+/// Summarise loop information from a control-flow graph by calculating its depth-first spanning
+/// tree (DFST) and then using that to:
+///
+/// - Distinguish edges in the CFG as:
+///   - tree edges (in the spanning tree)
+///   - back edges (going backward from descendant to ancestor in the spanning tree)
+///   - ... everything else.
+/// - Calculate which node is descendant of which in the DFST
+/// - Mapping nodes in the summary back to the blocks they originate from in the CFG.
+///
+/// This is used to implement Tarjan's Loop Reducibility algorithm (Tarjan 1974).
+pub struct LoopSummary {
+    /// Original block corresponding to this node, useful for recovering code offsets, e.g. for
+    /// error messages.
+    blocks: NodeMap<BlockId>,
+
+    /// Number of transitive descendants for a node, in the depth-first spanning tree.
+    descs: NodeMap<u16>,
+
+    /// The incoming edges for a node are partitioned between `back_edges` which create cycles in
+    /// the DFS tree, and `pred_edges` which are all the rest.
+    backs: NodeMap<Vec<NodeId>>,
+    preds: NodeMap<Vec<NodeId>>,
+}
+
+/// A disjoint-set data structure used when collapsing loops down to single nodes in the summary
+/// graph while remembering their loop nesting depth (how many levels of nesting are contained
+/// within them)
+pub struct LoopPartition {
+    /// The parent relationship in the disjoint-set.  The transitive closure of this type maps a
+    /// node to its representative.
+    parents: NodeMap<NodeId>,
+
+    /// The nesting depth of (collapsed) nodes in the summary graph.  Nodes that are uncollapsed
+    /// (not in any loop) have a depth of 0.  Initially, all nodes are uncollapsed.
+    depths: NodeMap<u16>,
+}
+
+impl LoopSummary {
+    pub fn new(cfg: &VMControlFlowGraph) -> Self {
+        use Exploration::*;
+        use Frontier::*;
+
+        enum Exploration {
+            InProgress(NodeId),
+            Done(NodeId),
+        }
+
+        enum Frontier {
+            Visit {
+                from_node: NodeId,
+                to_block: BlockId,
+            },
+            Finish {
+                block: BlockId,
+                node_id: NodeId,
+                parent: NodeId,
+            },
+        }
+
+        let num_blocks = cfg.num_blocks() as usize;
+
+        // Fields in LoopSummary that are filled via a depth-first traversal of `cfg`.
+        let mut blocks = vec![0; num_blocks];
+        let mut descs = vec![0; num_blocks];
+        let mut backs = vec![vec![]; num_blocks];
+        let mut preds = vec![vec![]; num_blocks];
+
+        let mut next_node = NodeId(0);
+
+        let root_block = cfg.entry_block_id();
+        let root_node = next_node.bump();
+
+        let mut exploration = BTreeMap::new();
+        blocks[usize::from(root_node)] = root_block;
+        exploration.insert(root_block, InProgress(root_node));
+
+        let mut stack: Vec<Frontier> = cfg
+            .successors(root_block)
+            .iter()
+            .map(|succ| Visit {
+                from_node: root_node,
+                to_block: *succ,
+            })
+            .collect();
+
+        while let Some(action) = stack.pop() {
+            match action {
+                Finish {
+                    block,
+                    node_id,
+                    parent,
+                } => {
+                    descs[usize::from(parent)] += 1 + descs[usize::from(node_id)];
+                    *exploration.get_mut(&block).unwrap() = Done(node_id);
+                }
+
+                Visit {
+                    from_node,
+                    to_block,
+                } => match exploration.entry(to_block) {
+                    Entry::Occupied(entry) => match entry.get() {
+                        // Cyclic back edge detected by re-visiting `to` while still processing its
+                        // children.
+                        InProgress(to_node) => backs[usize::from(*to_node)].push(from_node),
+
+                        // Cross edge detected by re-visiting `to` after it and its children have
+                        // been processed.
+                        Done(to_node) => preds[usize::from(*to_node)].push(from_node),
+                    },
+
+                    // Visiting `to` for the first time: `from` must be its parent in the depth-
+                    // -first spanning tree, and we should continue exploring its successors.
+                    Entry::Vacant(entry) => {
+                        let to_node = next_node.bump();
+                        entry.insert(InProgress(to_node));
+                        blocks[usize::from(to_node)] = to_block;
+                        preds[usize::from(to_node)].push(from_node);
+
+                        stack.push(Finish {
+                            block: to_block,
+                            node_id: to_node,
+                            parent: from_node,
+                        });
+
+                        stack.extend(cfg.successors(to_block).iter().map(|succ| Visit {
+                            from_node: to_node,
+                            to_block: *succ,
+                        }));
+                    }
+                },
+            }
+        }
+
+        LoopSummary {
+            blocks,
+            descs,
+            backs,
+            preds,
+        }
+    }
+
+    /// Decides whether `descendant` is a descendant of `ancestor` in the depth-first spanning
+    /// tree.
+    pub fn is_descendant(&self, NodeId(ancestor): NodeId, NodeId(descendant): NodeId) -> bool {
+        // All the descendants of `ancestor` in the DFST will have the IDs immediately following it,
+        // so we can check for descendants with a bounds check on `NodeId`, given `ancestor`'s
+        // transitive descendant count in `self.descs[ancestor]`.
+        ancestor <= descendant && descendant <= ancestor + self.descs[ancestor as usize]
+    }
+
+    /// Returns an iterator over `NodeId`s in this `LoopSummary` in pre-order according to its
+    /// depth-first spanning tree.
+    pub fn preorder(&self) -> impl DoubleEndedIterator<Item = NodeId> {
+        // `LoopSummary::new` assigns `NodeId`s to blocks in preorder, so just return the natural
+        // order.
+        (0..self.blocks.len()).map(|id| NodeId(id as u16))
+    }
+
+    /// Per-node accessors
+    pub fn block(&self, l: NodeId) -> BlockId {
+        self.blocks[usize::from(l)]
+    }
+
+    pub fn back_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.backs[usize::from(l)]
+    }
+
+    pub fn pred_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.preds[usize::from(l)]
+    }
+}
+
+impl LoopPartition {
+    pub fn new(summary: &LoopSummary) -> Self {
+        let num_blocks = summary.blocks.len();
+        LoopPartition {
+            parents: (0..num_blocks).map(|id| NodeId(id as u16)).collect(),
+            depths: vec![0; num_blocks],
+        }
+    }
+
+    /// Find the head of the collapsed node containing loop `id`, use path-compression to speed up
+    /// future accesses.
+    pub fn containing_loop(&mut self, id: NodeId) -> NodeId {
+        let mut child = id;
+        let mut parent = self.parent(child);
+        let mut grandparent = self.parent(parent);
+
+        if child == parent || parent == grandparent {
+            return parent;
+        }
+
+        let mut descendants = vec![];
+        loop {
+            // Invariant: child -> parent -> grandparent
+            //       and  parent != grandparent
+            //       and  forall d in descendants. parent(d) != parent(parent(d))
+            descendants.push(child);
+            (child, parent, grandparent) = (parent, grandparent, self.parent(grandparent));
+            if parent == grandparent {
+                break;
+            }
+        }
+
+        for descendant in descendants {
+            *self.parent_mut(descendant) = parent;
+        }
+
+        parent
+    }
+
+    /// Collapse `body` of a loop down to one node, represented by its `head`.  Calculate the
+    /// nesting depth of the collapsed node and return it.
+    ///
+    /// Assumes that all the nodes involved are the heads of their corresponding sets in the
+    /// partition.
+    ///
+    /// Note that this function can be called with an empty body, meaning `head` is the only
+    /// node in the loop.  Its nesting depth will still be incremented in this case.
+    pub fn collapse_loop(&mut self, head: NodeId, body: &BTreeSet<NodeId>) -> u16 {
+        debug_assert_eq!(head, self.parent(head));
+
+        let mut depth = self.depth(head);
+        for constituent in body {
+            debug_assert_eq!(*constituent, self.parent(*constituent));
+            *self.parent_mut(*constituent) = head;
+            depth = self.depth(*constituent).max(depth);
+        }
+
+        depth += 1;
+        *self.depth_mut(head) = depth;
+        depth
+    }
+
+    /// Per-node accessors
+    fn parent(&self, l: NodeId) -> NodeId {
+        self.parents[usize::from(l)]
+    }
+
+    fn parent_mut(&mut self, l: NodeId) -> &mut NodeId {
+        &mut self.parents[usize::from(l)]
+    }
+
+    fn depth(&self, l: NodeId) -> u16 {
+        self.depths[usize::from(l)]
+    }
+
+    fn depth_mut(&mut self, l: NodeId) -> &mut u16 {
+        &mut self.depths[usize::from(l)]
+    }
+}
+
+impl NodeId {
+    /// Post-increment (e.g. `self++`).
+    fn bump(&mut self) -> NodeId {
+        let ret = *self;
+        self.0 += 1;
+        ret
+    }
+}
+
+impl From<NodeId> for usize {
+    fn from(NodeId(id): NodeId) -> usize {
+        id as usize
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/meter.rs b/vendors/move/crates/move-bytecode-verifier/src/meter.rs
new file mode 100644
index 000000000..7119bd5d0
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/meter.rs
@@ -0,0 +1,168 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::ops::Mul;
+
+/// Scope of meterinng
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Scope {
+    // Metering is for transaction level
+    Transaction,
+    // Metering is for package level
+    Package,
+    // Metering is for module level
+    Module,
+    // Metering is for function level
+    Function,
+}
+
+pub const ANALYZE_FUNCTION_BASE_COST: u128 = 10;
+pub const EXECUTE_BLOCK_BASE_COST: u128 = 10;
+pub const PER_BACKEDGE_COST: u128 = 10;
+pub const PER_SUCCESSOR_COST: u128 = 10;
+
+/// Trait for a metering verification.
+pub trait Meter {
+    /// Indicates the begin of a new scope.
+    fn enter_scope(&mut self, name: &str, scope: Scope);
+
+    /// Transfer the amount of metering from once scope to the next. If the current scope has
+    /// metered N units, the target scope will be charged with N*factor.
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()>;
+
+    /// Add the number of units to the meter, returns an error if a limit is hit.
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()>;
+
+    /// Adds the number of items.
+    fn add_items(
+        &mut self,
+        scope: Scope,
+        units_per_item: u128,
+        items: usize,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        self.add(scope, units_per_item.saturating_mul(items as u128))
+    }
+
+    /// Adds the number of items with growth factor
+    fn add_items_with_growth(
+        &mut self,
+        scope: Scope,
+        mut units_per_item: u128,
+        items: usize,
+        growth_factor: f32,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        for _ in 0..items {
+            self.add(scope, units_per_item)?;
+            units_per_item = growth_factor.mul(units_per_item as f32) as u128;
+        }
+        Ok(())
+    }
+}
+
+pub struct BoundMeter {
+    mod_bounds: Bounds,
+    fun_bounds: Bounds,
+}
+
+struct Bounds {
+    name: String,
+    units: u128,
+    max: Option<u128>,
+}
+
+impl Meter for BoundMeter {
+    fn enter_scope(&mut self, name: &str, scope: Scope) {
+        let bounds = self.get_bounds_mut(scope);
+        bounds.name = name.into();
+        bounds.units = 0;
+    }
+
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()> {
+        let units = (self.get_bounds_mut(from).units as f32 * factor) as u128;
+        self.add(to, units)
+    }
+
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()> {
+        self.get_bounds_mut(scope).add(units)
+    }
+}
+
+impl Bounds {
+    fn add(&mut self, units: u128) -> PartialVMResult<()> {
+        if let Some(max) = self.max {
+            let new_units = self.units.saturating_add(units);
+            if new_units > max {
+                // TODO: change to a new status PROGRAM_TOO_COMPLEX once this is rolled out. For
+                // now we use an existing code to avoid breaking changes on potential rollback.
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "program too complex (in `{}` with `{} current + {} new > {} max`)",
+                        self.name, self.units, units, max
+                    )));
+            }
+            self.units = new_units;
+        }
+        Ok(())
+    }
+}
+
+impl BoundMeter {
+    pub fn new(config: &VerifierConfig) -> Self {
+        Self {
+            mod_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_mod_meter_units,
+            },
+            fun_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_fun_meter_units,
+            },
+        }
+    }
+
+    fn get_bounds_mut(&mut self, scope: Scope) -> &mut Bounds {
+        if scope == Scope::Module {
+            &mut self.mod_bounds
+        } else {
+            &mut self.fun_bounds
+        }
+    }
+
+    fn get_bounds(&self, scope: Scope) -> &Bounds {
+        if scope == Scope::Module {
+            &self.mod_bounds
+        } else {
+            &self.fun_bounds
+        }
+    }
+
+    pub fn get_usage(&self, scope: Scope) -> u128 {
+        self.get_bounds(scope).units
+    }
+
+    pub fn get_limit(&self, scope: Scope) -> Option<u128> {
+        self.get_bounds(scope).max
+    }
+}
+
+pub struct DummyMeter;
+impl Meter for DummyMeter {
+    fn enter_scope(&mut self, _name: &str, _scope: Scope) {}
+    fn transfer(&mut self, _from: Scope, _to: Scope, _factor: f32) -> PartialVMResult<()> {
+        Ok(())
+    }
+    fn add(&mut self, _scope: Scope, _units: u128) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/vendors/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
new file mode 100644
index 000000000..3bbbe2597
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -0,0 +1,745 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the type and memory safety analysis.
+use crate::{
+    absint::{AbstractDomain, JoinResult},
+    meter::{Meter, Scope},
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, FieldHandleIndex, FunctionDefinitionIndex, LocalIndex, Signature,
+        SignatureToken, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_borrow_graph::references::RefID;
+use move_core_types::vm_status::StatusCode;
+use std::collections::{BTreeMap, BTreeSet};
+
+type BorrowGraph = move_borrow_graph::graph::BorrowGraph<(), Label>;
+
+/// AbstractValue represents a reference or a non reference value, both on the stack and stored
+/// in a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum AbstractValue {
+    Reference(RefID),
+    NonReference,
+}
+
+impl AbstractValue {
+    /// checks if self is a reference
+    pub fn is_reference(&self) -> bool {
+        match self {
+            AbstractValue::Reference(_) => true,
+            AbstractValue::NonReference => false,
+        }
+    }
+
+    /// checks if self is a value
+    pub fn is_value(&self) -> bool {
+        !self.is_reference()
+    }
+
+    /// possibly extracts id from self
+    pub fn ref_id(&self) -> Option<RefID> {
+        match self {
+            AbstractValue::Reference(id) => Some(*id),
+            AbstractValue::NonReference => None,
+        }
+    }
+}
+
+/// Label is an element of a label on an edge in the borrow graph.
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+enum Label {
+    Local(LocalIndex),
+    Global(StructDefinitionIndex),
+    Field(FieldHandleIndex),
+}
+
+// Needed for debugging with the borrow graph
+impl std::fmt::Display for Label {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Label::Local(i) => write!(f, "local#{}", i),
+            Label::Global(i) => write!(f, "resource@{}", i),
+            Label::Field(i) => write!(f, "field#{}", i),
+        }
+    }
+}
+
+pub(crate) const STEP_BASE_COST: u128 = 10;
+pub(crate) const STEP_PER_LOCAL_COST: u128 = 20;
+pub(crate) const STEP_PER_GRAPH_ITEM_COST: u128 = 50;
+pub(crate) const JOIN_BASE_COST: u128 = 100;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 10;
+pub(crate) const JOIN_PER_GRAPH_ITEM_COST: u128 = 50;
+
+// The cost for an edge from an input reference parameter to output reference.
+pub(crate) const REF_PARAM_EDGE_COST: u128 = 100;
+pub(crate) const REF_PARAM_EDGE_COST_GROWTH: f32 = 1.5;
+
+// The cost of an acquires in a call.
+pub(crate) const CALL_PER_ACQUIRES_COST: u128 = 100;
+
+/// AbstractState is the analysis state over which abstract interpretation is performed.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    locals: Vec<AbstractValue>,
+    borrow_graph: BorrowGraph,
+    next_id: usize,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(function_view: &FunctionView) -> Self {
+        let num_locals = function_view.parameters().len() + function_view.locals().len();
+        // ids in [0, num_locals) are reserved for constructing canonical state
+        // id at num_locals is reserved for the frame root
+        let next_id = num_locals + 1;
+        let mut state = AbstractState {
+            current_function: function_view.index(),
+            locals: vec![AbstractValue::NonReference; num_locals],
+            borrow_graph: BorrowGraph::new(),
+            next_id,
+        };
+
+        for (param_idx, param_ty) in function_view.parameters().0.iter().enumerate() {
+            if param_ty.is_reference() {
+                let id = RefID::new(param_idx);
+                state
+                    .borrow_graph
+                    .new_ref(id, param_ty.is_mutable_reference());
+                state.locals[param_idx] = AbstractValue::Reference(id)
+            }
+        }
+        state.borrow_graph.new_ref(state.frame_root(), true);
+
+        assert!(state.is_canonical());
+        state
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn graph_size(&self) -> usize {
+        self.borrow_graph.graph_size()
+    }
+
+    /// returns the frame root id
+    fn frame_root(&self) -> RefID {
+        RefID::new(self.locals.len())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    //**********************************************************************************************
+    // Core API
+    //**********************************************************************************************
+
+    pub fn value_for(&mut self, s: &SignatureToken) -> AbstractValue {
+        match s {
+            SignatureToken::Reference(_) => AbstractValue::Reference(self.new_ref(false)),
+            SignatureToken::MutableReference(_) => AbstractValue::Reference(self.new_ref(true)),
+            _ => AbstractValue::NonReference,
+        }
+    }
+
+    /// adds and returns new id to borrow graph
+    fn new_ref(&mut self, mut_: bool) -> RefID {
+        let id = RefID::new(self.next_id);
+        self.borrow_graph.new_ref(id, mut_);
+        self.next_id += 1;
+        id
+    }
+
+    fn add_copy(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_strong_borrow((), parent, child)
+    }
+
+    fn add_borrow(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_weak_borrow((), parent, child)
+    }
+
+    fn add_field_borrow(&mut self, parent: RefID, field: FieldHandleIndex, child: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), parent, Label::Field(field), child)
+    }
+
+    fn add_local_borrow(&mut self, local: LocalIndex, id: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), self.frame_root(), Label::Local(local), id)
+    }
+
+    fn add_resource_borrow(&mut self, resource: StructDefinitionIndex, id: RefID) {
+        self.borrow_graph
+            .add_weak_field_borrow((), self.frame_root(), Label::Global(resource), id)
+    }
+
+    /// removes `id` from borrow graph
+    fn release(&mut self, id: RefID) {
+        self.borrow_graph.release(id);
+    }
+
+    //**********************************************************************************************
+    // Core Predicates
+    //**********************************************************************************************
+
+    /// checks if `id` is borrowed, but ignores field borrows
+    fn has_full_borrows(&self, id: RefID) -> bool {
+        let (full_borrows, _field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty()
+    }
+
+    /// Checks if `id` is borrowed
+    /// - All full/epsilon borrows are considered
+    /// - Only field borrows the specified label (or all if one isn't specified) are considered
+    fn has_consistent_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty() || {
+            match label_opt {
+                None => field_borrows.values().any(|borrows| !borrows.is_empty()),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !borrows.is_empty())
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// Checks if `id` is mutable borrowed
+    /// - All full/epsilon mutable borrows are considered
+    /// - Only field mutable borrows the specified label (or all if one isn't specified) are
+    ///   considered
+    fn has_consistent_mutable_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !self.all_immutable(&full_borrows) || {
+            match label_opt {
+                None => field_borrows
+                    .values()
+                    .any(|borrows| !self.all_immutable(borrows)),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !self.all_immutable(borrows))
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// checks if `id` is writable
+    /// - Mutable references are writable if there are no consistent borrows
+    /// - Immutable references are not writable by the typing rules
+    fn is_writable(&self, id: RefID) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_borrows(id, None)
+    }
+
+    /// checks if `id` is freezable
+    /// - Mutable references are freezable if there are no consistent mutable borrows
+    /// - Immutable references are not freezable by the typing rules
+    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::Field))
+    }
+
+    /// checks if `id` is readable
+    /// - Mutable references are readable if they are freezable
+    /// - Immutable references are always readable
+    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        let is_mutable = self.borrow_graph.is_mutable(id);
+        !is_mutable || self.is_freezable(id, at_field_opt)
+    }
+
+    /// checks if local@idx is borrowed
+    fn is_local_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if local@idx is mutably borrowed
+    fn is_local_mutably_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if global@idx is borrowed
+    fn is_global_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if global@idx is mutably borrowed
+    fn is_global_mutably_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if the stack frame of the function being analyzed can be safely destroyed.
+    /// safe destruction requires that all references in locals have already been destroyed
+    /// and all values in locals are copyable and unborrowed.
+    fn is_frame_safe_to_destroy(&self) -> bool {
+        !self.has_consistent_borrows(self.frame_root(), None)
+    }
+
+    //**********************************************************************************************
+    // Instruction Entry Points
+    //**********************************************************************************************
+
+    /// destroys local@idx
+    pub fn release_value(&mut self, value: AbstractValue) {
+        match value {
+            AbstractValue::Reference(id) => self.release(id),
+            AbstractValue::NonReference => (),
+        }
+    }
+
+    pub fn copy_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        match safe_unwrap!(self.locals.get(local as usize)) {
+            AbstractValue::Reference(id) => {
+                let id = *id;
+                let new_id = self.new_ref(self.borrow_graph.is_mutable(id));
+                self.add_copy(id, new_id);
+                Ok(AbstractValue::Reference(new_id))
+            }
+            AbstractValue::NonReference if self.is_local_mutably_borrowed(local) => {
+                Err(self.error(StatusCode::COPYLOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn move_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        let old_value = std::mem::replace(
+            safe_unwrap!(self.locals.get_mut(local as usize)),
+            AbstractValue::NonReference,
+        );
+        match old_value {
+            AbstractValue::Reference(id) => Ok(AbstractValue::Reference(id)),
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::MOVELOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn st_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+        new_value: AbstractValue,
+    ) -> PartialVMResult<()> {
+        let old_value =
+            std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value);
+        match old_value {
+            AbstractValue::Reference(id) => {
+                self.release(id);
+                Ok(())
+            }
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(()),
+        }
+    }
+
+    pub fn freeze_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_freezable(id, None) {
+            return Err(self.error(StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let frozen_id = self.new_ref(false);
+        self.add_copy(id, frozen_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(frozen_id))
+    }
+
+    pub fn comparison(
+        &mut self,
+        offset: CodeOffset,
+        v1: AbstractValue,
+        v2: AbstractValue,
+    ) -> PartialVMResult<AbstractValue> {
+        match (v1, v2) {
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2))
+                if !self.is_readable(id1, None) || !self.is_readable(id2, None) =>
+            {
+                // TODO better error code
+                return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+            }
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2)) => {
+                self.release(id1);
+                self.release(id2)
+            }
+            (v1, v2) => {
+                assert!(v1.is_value());
+                assert!(v2.is_value());
+            }
+        }
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn read_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_readable(id, None) {
+            return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn write_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<()> {
+        if !self.is_writable(id) {
+            return Err(self.error(StatusCode::WRITEREF_EXISTS_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn borrow_loc(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // nothing to check in case borrow is mutable since the frame cannot have an full borrow/
+        // epsilon outgoing edge
+        if !mut_ && self.is_local_mutably_borrowed(local) {
+            return Err(self.error(StatusCode::BORROWLOC_EXISTS_BORROW_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_local_borrow(local, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn borrow_field(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        id: RefID,
+        field: FieldHandleIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // Any field borrows will be factored out, so don't check in the mutable case
+        let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
+        // For new immutable borrow, the reference must be readable at that field
+        // This means that there could exist a mutable borrow on some other field
+        let is_imm_borrow_with_mut_borrows = || !mut_ && !self.is_readable(id, Some(field));
+
+        if is_mut_borrow_with_full_borrows() || is_imm_borrow_with_mut_borrows() {
+            // TODO improve error for mutable case
+            return Err(self.error(StatusCode::BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let field_borrow_id = self.new_ref(mut_);
+        self.add_field_borrow(id, field, field_borrow_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(field_borrow_id))
+    }
+
+    pub fn borrow_global(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if (mut_ && self.is_global_borrowed(resource)) || self.is_global_mutably_borrowed(resource)
+        {
+            return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_resource_borrow(resource, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn move_from(
+        &mut self,
+        offset: CodeOffset,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if self.is_global_borrowed(resource) {
+            Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset))
+        } else {
+            Ok(AbstractValue::NonReference)
+        }
+    }
+
+    pub fn vector_op(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<()> {
+        let id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(id) {
+            return Err(self.error(StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn vector_element_borrow(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<AbstractValue> {
+        let vec_id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(vec_id) {
+            return Err(self.error(
+                StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+                offset,
+            ));
+        }
+
+        let elem_id = self.new_ref(mut_);
+        self.add_borrow(vec_id, elem_id);
+
+        self.release(vec_id);
+        Ok(AbstractValue::Reference(elem_id))
+    }
+
+    pub fn call(
+        &mut self,
+        offset: CodeOffset,
+        arguments: Vec<AbstractValue>,
+        acquired_resources: &BTreeSet<StructDefinitionIndex>,
+        return_: &Signature,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Vec<AbstractValue>> {
+        meter.add_items(
+            Scope::Function,
+            CALL_PER_ACQUIRES_COST,
+            acquired_resources.len(),
+        )?;
+        // Check acquires
+        for acquired_resource in acquired_resources {
+            if self.is_global_borrowed(*acquired_resource) {
+                return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+            }
+        }
+
+        // Check mutable references can be transferred
+        let mut all_references_to_borrow_from = BTreeSet::new();
+        let mut mutable_references_to_borrow_from = BTreeSet::new();
+        for id in arguments.iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) {
+                if !self.is_writable(id) {
+                    return Err(
+                        self.error(StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR, offset)
+                    );
+                }
+                mutable_references_to_borrow_from.insert(id);
+            }
+            all_references_to_borrow_from.insert(id);
+        }
+
+        // Track borrow relationships of return values on inputs
+        let mut returned_refs = 0;
+        let return_values = return_
+            .0
+            .iter()
+            .map(|return_type| match return_type {
+                SignatureToken::MutableReference(_) => {
+                    let id = self.new_ref(true);
+                    for parent in &mutable_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                SignatureToken::Reference(_) => {
+                    let id = self.new_ref(false);
+                    for parent in &all_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                _ => AbstractValue::NonReference,
+            })
+            .collect();
+
+        // Meter usage of reference edges
+        meter.add_items_with_growth(
+            Scope::Function,
+            REF_PARAM_EDGE_COST,
+            all_references_to_borrow_from
+                .len()
+                .saturating_mul(returned_refs),
+            REF_PARAM_EDGE_COST_GROWTH,
+        )?;
+
+        // Release input references
+        for id in all_references_to_borrow_from {
+            self.release(id)
+        }
+        Ok(return_values)
+    }
+
+    pub fn ret(&mut self, offset: CodeOffset, values: Vec<AbstractValue>) -> PartialVMResult<()> {
+        // release all local variables
+        let mut released = BTreeSet::new();
+        for stored_value in self.locals.iter() {
+            if let AbstractValue::Reference(id) = stored_value {
+                released.insert(*id);
+            }
+        }
+        released.into_iter().for_each(|id| self.release(id));
+
+        // Check that no local or global is borrowed
+        if !self.is_frame_safe_to_destroy() {
+            return Err(self.error(
+                StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+                offset,
+            ));
+        }
+
+        // Check mutable references can be transferred
+        for id in values.into_iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) && !self.is_writable(id) {
+                return Err(self.error(StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR, offset));
+            }
+        }
+        Ok(())
+    }
+
+    //**********************************************************************************************
+    // Abstract Interpreter Entry Points
+    //**********************************************************************************************
+
+    /// returns the canonical representation of self
+    pub fn construct_canonical_state(&self) -> Self {
+        let mut id_map = BTreeMap::new();
+        id_map.insert(self.frame_root(), self.frame_root());
+        let locals = self
+            .locals
+            .iter()
+            .enumerate()
+            .map(|(local, value)| match value {
+                AbstractValue::Reference(old_id) => {
+                    let new_id = RefID::new(local);
+                    id_map.insert(*old_id, new_id);
+                    AbstractValue::Reference(new_id)
+                }
+                AbstractValue::NonReference => AbstractValue::NonReference,
+            })
+            .collect::<Vec<_>>();
+        assert!(self.locals.len() == locals.len());
+        let mut borrow_graph = self.borrow_graph.clone();
+        borrow_graph.remap_refs(&id_map);
+        let canonical_state = AbstractState {
+            locals,
+            borrow_graph,
+            current_function: self.current_function,
+            next_id: self.locals.len() + 1,
+        };
+        assert!(canonical_state.is_canonical());
+        canonical_state
+    }
+
+    fn all_immutable(&self, borrows: &BTreeMap<RefID, ()>) -> bool {
+        !borrows.keys().any(|x| self.borrow_graph.is_mutable(*x))
+    }
+
+    fn is_canonical(&self) -> bool {
+        self.locals.len() + 1 == self.next_id
+            && self.locals.iter().enumerate().all(|(local, value)| {
+                value
+                    .ref_id()
+                    .map(|id| RefID::new(local) == id)
+                    .unwrap_or(true)
+            })
+    }
+
+    pub fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.is_canonical() && other.is_canonical());
+        assert!(self.next_id == other.next_id);
+        assert!(self.locals.len() == other.locals.len());
+        let mut self_graph = self.borrow_graph.clone();
+        let mut other_graph = other.borrow_graph.clone();
+        let locals = self
+            .locals
+            .iter()
+            .zip(&other.locals)
+            .map(|(self_value, other_value)| {
+                match (self_value, other_value) {
+                    (AbstractValue::Reference(id), AbstractValue::NonReference) => {
+                        self_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    (AbstractValue::NonReference, AbstractValue::Reference(id)) => {
+                        other_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    // The local has a value on each side, add it to the state
+                    (v1, v2) => {
+                        assert!(v1 == v2);
+                        *v1
+                    }
+                }
+            })
+            .collect();
+
+        let borrow_graph = self_graph.join(&other_graph);
+        let current_function = self.current_function;
+        let next_id = self.next_id;
+
+        Self {
+            current_function,
+            locals,
+            borrow_graph,
+            next_id,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        let joined = Self::join_(self, state);
+        assert!(joined.is_canonical());
+        assert!(self.locals.len() == joined.locals.len());
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(Scope::Function, JOIN_PER_LOCAL_COST, self.locals.len())?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_GRAPH_ITEM_COST,
+            self.borrow_graph.graph_size(),
+        )?;
+        let locals_unchanged = self
+            .locals
+            .iter()
+            .zip(&joined.locals)
+            .all(|(self_value, joined_value)| self_value == joined_value);
+        // locals unchanged and borrow graph covered, return unchanged
+        // else mark as changed and update the state
+        if locals_unchanged && self.borrow_graph.leq(&joined.borrow_graph) {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs b/vendors/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs
new file mode 100644
index 000000000..3d01e0520
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -0,0 +1,458 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying reference safety of a procedure body.
+//! The checks include (but are not limited to)
+//! - verifying that there are no dangling references,
+//! - accesses to mutable references are safe
+//! - accesses to global storage references are safe
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    meter::{Meter, Scope},
+    reference_safety::abstract_state::{
+        STEP_BASE_COST, STEP_PER_GRAPH_ITEM_COST, STEP_PER_LOCAL_COST,
+    },
+};
+use abstract_state::{AbstractState, AbstractValue};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, IdentifierIndex,
+        SignatureIndex, SignatureToken, StructDefinition, StructFieldInformation,
+    },
+    safe_assert, safe_unwrap, safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+use std::{
+    collections::{BTreeSet, HashMap},
+    num::NonZeroU64,
+};
+
+struct ReferenceSafetyAnalysis<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    stack: AbstractStack<AbstractValue>,
+}
+
+impl<'a> ReferenceSafetyAnalysis<'a> {
+    fn new(
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView<'a>,
+        name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    ) -> Self {
+        Self {
+            resolver,
+            function_view,
+            name_def_map,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn push(&mut self, v: AbstractValue) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push(v));
+        Ok(())
+    }
+
+    fn push_n(&mut self, v: AbstractValue, n: u64) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push_n(v, n));
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &FunctionView,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(function_view);
+
+    let mut verifier = ReferenceSafetyAnalysis::new(resolver, function_view, name_def_map);
+    verifier.analyze_function(initial_state, function_view, meter)
+}
+
+fn call(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    let arguments = parameters
+        .0
+        .iter()
+        .map(|_| verifier.stack.pop().unwrap())
+        .rev()
+        .collect();
+
+    let acquired_resources = match verifier.name_def_map.get(&function_handle.name) {
+        Some(idx) => {
+            let func_def = verifier.resolver.function_def_at(*idx)?;
+            let fh = verifier.resolver.function_handle_at(func_def.function);
+            if function_handle == fh {
+                func_def.acquires_global_resources.iter().cloned().collect()
+            } else {
+                BTreeSet::new()
+            }
+        }
+        None => BTreeSet::new(),
+    };
+    let return_ = verifier.resolver.signature_at(function_handle.return_);
+    let values = state.call(offset, arguments, &acquired_resources, return_, meter)?;
+    for value in values {
+        verifier.push(value)?
+    }
+    Ok(())
+}
+
+fn num_fields(struct_def: &StructDefinition) -> usize {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => 0,
+        StructFieldInformation::Declared(fields) => fields.len(),
+    }
+}
+
+fn pack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    for _ in 0..num_fields(struct_def) {
+        safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value())
+    }
+    // TODO maybe call state.value_for
+    verifier.push(AbstractValue::NonReference)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+    // TODO maybe call state.value_for
+    verifier.push_n(AbstractValue::NonReference, num_fields(struct_def) as u64)?;
+    Ok(())
+}
+
+fn vec_element_type(
+    verifier: &mut ReferenceSafetyAnalysis,
+    idx: SignatureIndex,
+) -> PartialVMResult<SignatureToken> {
+    match verifier.resolver.signature_at(idx).0.get(0) {
+        Some(ty) => Ok(ty.clone()),
+        None => Err(PartialVMError::new(
+            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+        )),
+    }
+}
+
+fn execute_inner(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    meter.add_items(Scope::Function, STEP_PER_LOCAL_COST, state.local_count())?;
+    meter.add_items(
+        Scope::Function,
+        STEP_PER_GRAPH_ITEM_COST,
+        state.graph_size(),
+    )?;
+
+    match bytecode {
+        Bytecode::Pop => state.release_value(safe_unwrap_err!(verifier.stack.pop())),
+
+        Bytecode::CopyLoc(local) => {
+            let value = state.copy_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveLoc(local) => {
+            let value = state.move_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::StLoc(local) => {
+            state.st_loc(offset, *local, safe_unwrap_err!(verifier.stack.pop()))?
+        }
+
+        Bytecode::FreezeRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let frozen = state.freeze_ref(offset, id)?;
+            verifier.push(frozen)?
+        }
+        Bytecode::Eq | Bytecode::Neq => {
+            let v1 = safe_unwrap_err!(verifier.stack.pop());
+            let v2 = safe_unwrap_err!(verifier.stack.pop());
+            let value = state.comparison(offset, v1, v2)?;
+            verifier.push(value)?
+        }
+        Bytecode::ReadRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.read_ref(offset, id)?;
+            verifier.push(value)?
+        }
+        Bytecode::WriteRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            safe_assert!(val_operand.is_value());
+            state.write_ref(offset, id)?
+        }
+
+        Bytecode::MutBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, true, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, false, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, true, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, true, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, false, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, false, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFrom(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.move_from(offset, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFromGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.move_from(offset, struct_inst.def)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let function_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+
+        Bytecode::Ret => {
+            let mut return_values = vec![];
+            for _ in 0..verifier.function_view.return_().len() {
+                return_values.push(safe_unwrap_err!(verifier.stack.pop()));
+            }
+            return_values.reverse();
+
+            state.ret(offset, return_values)?
+        }
+
+        Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Not
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_) => (),
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) | Bytecode::Abort => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+        }
+        Bytecode::MoveTo(_) | Bytecode::MoveToGeneric(_) => {
+            // resource value
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // signer reference
+            state.release_value(safe_unwrap_err!(verifier.stack.pop()));
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(state.value_for(&SignatureToken::Bool))?
+        }
+        Bytecode::LdU8(_) => verifier.push(state.value_for(&SignatureToken::U8))?,
+        Bytecode::LdU16(_) => verifier.push(state.value_for(&SignatureToken::U16))?,
+        Bytecode::LdU32(_) => verifier.push(state.value_for(&SignatureToken::U32))?,
+        Bytecode::LdU64(_) => verifier.push(state.value_for(&SignatureToken::U64))?,
+        Bytecode::LdU128(_) => verifier.push(state.value_for(&SignatureToken::U128))?,
+        Bytecode::LdU256(_) => verifier.push(state.value_for(&SignatureToken::U256))?,
+        Bytecode::LdConst(idx) => {
+            let signature = &verifier.resolver.constant_at(*idx).type_;
+            verifier.push(state.value_for(signature))?
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // TODO maybe call state.value_for
+            verifier.push(AbstractValue::NonReference)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::Unpack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            unpack(verifier, struct_def)?
+        }
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            unpack(verifier, struct_def)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let result = verifier.stack.pop_eq_n(num_to_pop);
+                let abs_value = safe_unwrap_err!(result);
+                safe_assert!(abs_value.is_value());
+            }
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&SignatureToken::Vector(Box::new(element_type))))?
+        }
+
+        Bytecode::VecLen(_) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, false)?;
+            verifier.push(state.value_for(&SignatureToken::U64))?
+        }
+
+        Bytecode::VecImmBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, false)?;
+            verifier.push(elem_ref)?
+        }
+        Bytecode::VecMutBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, true)?;
+            verifier.push(elem_ref)?
+        }
+
+        Bytecode::VecPushBack(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&element_type))?
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push_n(state.value_for(&element_type), *num)?
+        }
+
+        Bytecode::VecSwap(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+    };
+    Ok(())
+}
+
+impl<'a> TransferFunctions for ReferenceSafetyAnalysis<'a> {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(self, state, bytecode, index, meter)?;
+        if index == last_index {
+            safe_assert!(self.stack.is_empty());
+            *state = state.construct_canonical_state()
+        }
+        Ok(())
+    }
+}
+
+impl<'a> AbstractInterpreter for ReferenceSafetyAnalysis<'a> {}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs
new file mode 100644
index 000000000..ac18d7a8a
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex_literal::hex;
+use move_binary_format::file_format::CompiledScript;
+
+#[test]
+fn script_with_too_many_locals() {
+    let bad_script = hex!("a11ceb0b05000000010500d1018701010101010705050601070101010101070505060107050505050505060107010505050601070101010101070505060107050a0101010101070505060107010101010107050506010705050505050506010701050505060107010101010107010101010c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c050c0c0c0c0c0c0c0c0c0c0c012d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c030602000000070b010c000a20010b000c010500");
+    let _ = CompiledScript::deserialize(&bad_script).unwrap_err();
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/regression_tests/mod.rs b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/mod.rs
new file mode 100644
index 000000000..84a8075de
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+mod bounds_check;
+#[cfg(test)]
+mod reference_analysis;
diff --git a/vendors/move/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
new file mode 100644
index 000000000..9ba65e5da
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
@@ -0,0 +1,323 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex,
+        Bytecode::{self, *},
+        CodeUnit, Constant, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature,
+        SignatureIndex,
+        SignatureToken::{self, *},
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructHandleIndex, TypeSignature, Visibility,
+        Visibility::*,
+    },
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::str::FromStr;
+
+#[test]
+fn unbalanced_stack_crash() {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: vec![
+            LdFalse,
+            BrTrue(13),
+            MoveLoc(3),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(6),
+            Pop,
+            MoveLoc(5),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(0),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            Pop,
+            Pop,
+            Pop,
+            Ret,
+        ],
+        locals: SignatureIndex::new(2),
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    match crate::verify_module_unmetered(&module) {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::GLOBAL_REFERENCE_ERROR),
+    }
+}
+
+#[test]
+fn too_many_locals() {
+    // Create a signature of 128 elements. This will be used both for locals and parameters,
+    // thus the overall size will be 256. If this is not intercepted in bounds checks,
+    // as a result the following iterator in abstract state
+    // would be empty, breaking reference analysis: `0..self.num_locals as LocalIndex`
+    // (since LocalIndex is u8).
+    let sign_128 = (0..128)
+        .map(|_| Reference(Box::new(U64)))
+        .collect::<Vec<_>>();
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![AbilitySet::ALL],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(sign_128)],
+        identifiers: vec![Identifier::new("x").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![CopyLoc(2), StLoc(33), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+
+    match res {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::TOO_MANY_LOCALS),
+    }
+}
+
+#[test]
+fn borrow_graph() {
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![
+            Reference(Box::new(U64)),
+            Reference(Box::new(U64)),
+        ])],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![MoveLoc(0), MoveLoc(1), StLoc(0), StLoc(1), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+    assert!(res.is_ok());
+}
+
+#[test]
+fn indirect_code() {
+    use Bytecode::*;
+    let v = 0;
+    let v_ref = 1;
+    let x = 2;
+    let x_ref = 3;
+    let vsig = SignatureIndex(2);
+    let next = 16;
+    let mut code = vec![
+        // x = 10; x_ref = &mut x;
+        LdU64(10),
+        StLoc(x),
+        MutBorrowLoc(x),
+        StLoc(x_ref),
+        // v = vector[100, 1000]; v_ref = &mut v
+        LdU64(100),
+        LdU64(1000),
+        VecPack(vsig, 2),
+        StLoc(v),
+        MutBorrowLoc(v),
+        StLoc(v_ref),
+        // if (*x_ref == 0) return;
+        CopyLoc(x_ref),
+        ReadRef,
+        LdU64(0),
+        Eq,
+        BrFalse(next),
+        Ret,
+    ];
+    assert_eq!(code.len(), next as usize);
+    code.extend(vec![
+        // creates dangling reference on second iteration
+        // _ = vec_pop_back(x_ref)
+        CopyLoc(v_ref),
+        VecPopBack(vsig),
+        Pop,
+        // *x_ref = 0
+        LdU64(0),
+        CopyLoc(x_ref),
+        WriteRef,
+        // x_ref = vec_mut_borrow(v_ref, 0);
+        CopyLoc(v_ref),
+        LdU64(0),
+        VecMutBorrow(vsig),
+        StLoc(x_ref),
+    ]);
+    let nops = vec![Nop; (u16::MAX as usize) - code.len() - 1];
+    code.extend(nops);
+    code.push(Branch(10));
+    assert_eq!(code.len(), (u16::MAX as usize));
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                SignatureToken::Vector(Box::new(SignatureToken::U64)),
+                SignatureToken::MutableReference(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::U64,
+                )))),
+                SignatureToken::U64,
+                SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            ]),
+            Signature(vec![SignatureToken::U64]),
+        ],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code,
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_with_config_unmetered(&VerifierConfig::unbounded(), &module)
+        .unwrap_err();
+    assert_eq!(
+        res.major_status(),
+        StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR
+    );
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/script_signature.rs b/vendors/move/crates/move-bytecode-verifier/src/script_signature.rs
new file mode 100644
index 000000000..85916339f
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/script_signature.rs
@@ -0,0 +1,181 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that a script or entry function a valid
+//! signature, which entails
+//! - (DEPRECATED) All signer arguments are occur before non-signer arguments
+//! - (DEPRECATED) All types non-signer arguments have a type that is valid for constants
+//! - (DEPRECATED) Has an empty return type
+//! - All return types are not references
+//! - Satisfies the additional checks provided as an argument via `check_signature`
+//! `check_signature` should be used by adapters to quickly and easily verify custom signature
+//! rules for entrypoints
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinitionIndex, SignatureIndex, SignatureToken,
+        TableIndex,
+    },
+    file_format_common::{VERSION_1, VERSION_5},
+    IndexKind,
+};
+use move_core_types::{identifier::IdentStr, vm_status::StatusCode};
+
+pub type FnCheckScriptSignature = fn(
+    &BinaryIndexedView,
+    /* is_entry */ bool,
+    SignatureIndex,
+    Option<SignatureIndex>,
+) -> PartialVMResult<()>;
+
+/// This function checks the extra requirements on the signature of the main function of a script.
+pub fn verify_script(
+    script: &CompiledScript,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    if script.version >= VERSION_5 {
+        return Ok(());
+    }
+
+    let resolver = &BinaryIndexedView::Script(script);
+    let parameters = script.parameters;
+    let return_ = None;
+    verify_main_signature_impl(resolver, true, parameters, return_, check_signature)
+        .map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_module(
+    module: &CompiledModule,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    // important for not breaking old modules
+    if module.version < VERSION_5 {
+        return Ok(());
+    }
+
+    for (idx, _fdef) in module
+        .function_defs()
+        .iter()
+        .enumerate()
+        .filter(|(_idx, fdef)| fdef.is_entry)
+    {
+        verify_module_function_signature(
+            module,
+            FunctionDefinitionIndex(idx as TableIndex),
+            check_signature,
+        )?
+    }
+    Ok(())
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+pub fn verify_module_function_signature_by_name(
+    module: &CompiledModule,
+    name: &IdentStr,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef_opt = module.function_defs().iter().enumerate().find(|(_, fdef)| {
+        module.identifier_at(module.function_handle_at(fdef.function).name) == name
+    });
+    let (idx, _fdef) = fdef_opt.ok_or_else(|| {
+        PartialVMError::new(StatusCode::VERIFICATION_ERROR)
+            .with_message("function not found in verify_module_script_function".to_string())
+            .finish(Location::Module(module.self_id()))
+    })?;
+    verify_module_function_signature(
+        module,
+        FunctionDefinitionIndex(idx as TableIndex),
+        check_signature,
+    )
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+fn verify_module_function_signature(
+    module: &CompiledModule,
+    idx: FunctionDefinitionIndex,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef = module.function_def_at(idx);
+
+    let resolver = &BinaryIndexedView::Module(module);
+    let fhandle = module.function_handle_at(fdef.function);
+    let parameters = fhandle.parameters;
+    let return_ = fhandle.return_;
+    verify_main_signature_impl(
+        resolver,
+        fdef.is_entry,
+        parameters,
+        Some(return_),
+        check_signature,
+    )
+    .map_err(|e| {
+        e.at_index(IndexKind::FunctionDefinition, idx.0)
+            .finish(Location::Module(module.self_id()))
+    })
+}
+
+fn verify_main_signature_impl(
+    resolver: &BinaryIndexedView,
+    is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+    check_signature: FnCheckScriptSignature,
+) -> PartialVMResult<()> {
+    let deprecated_logic = resolver.version() < VERSION_5 && is_entry;
+
+    if deprecated_logic {
+        legacy_script_signature_checks(resolver, is_entry, parameters_idx, return_idx)?;
+    }
+    check_signature(resolver, is_entry, parameters_idx, return_idx)
+}
+
+pub fn no_additional_script_signature_checks(
+    _resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    _parameters: SignatureIndex,
+    _return_type: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    Ok(())
+}
+
+pub fn legacy_script_signature_checks(
+    resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    use SignatureToken as S;
+    let empty_vec = &vec![];
+    let parameters = &resolver.signature_at(parameters_idx).0;
+    let return_types = return_idx
+        .map(|idx| &resolver.signature_at(idx).0)
+        .unwrap_or(empty_vec);
+    // Check that all `signer` arguments occur before non-`signer` arguments
+    // signer is a type that can only be populated by the Move VM. And its value is filled
+    // based on the sender of the transaction
+    let all_args_have_valid_type = if resolver.version() <= VERSION_1 {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Reference(inner) if matches!(&**inner, S::Signer)))
+            .all(|typ| typ.is_valid_for_constant())
+    } else {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Signer))
+            .all(|typ| typ.is_valid_for_constant())
+    };
+    let has_valid_return_type = return_types.is_empty();
+    if !all_args_have_valid_type || !has_valid_return_type {
+        Err(PartialVMError::new(
+            StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE,
+        ))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/signature.rs b/vendors/move/crates/move-bytecode-verifier/src/signature.rs
new file mode 100644
index 000000000..923e4cb15
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/signature.rs
@@ -0,0 +1,416 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying signature tokens used in types of function
+//! parameters, locals, and fields of structs are well-formed. References can only occur at the
+//! top-level in all tokens.  Additionally, references cannot occur at all in field types.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FunctionDefinition,
+        FunctionHandle, Signature, SignatureIndex, SignatureToken, StructDefinition,
+        StructFieldInformation, StructTypeParameter, TableIndex,
+    },
+    file_format_common::VERSION_6,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use std::collections::{HashMap, HashSet};
+
+pub struct SignatureChecker<'a> {
+    resolver: BinaryIndexedView<'a>,
+    abilities_cache: HashMap<SignatureIndex, HashSet<Vec<AbilitySet>>>,
+}
+
+impl<'a> SignatureChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let mut sig_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+            abilities_cache: HashMap::new(),
+        };
+        sig_check.verify_signature_pool(module.signatures())?;
+        sig_check.verify_function_signatures(module.function_handles())?;
+        sig_check.verify_fields(module.struct_defs())?;
+        sig_check.verify_code_units(module.function_handles(), module.function_defs())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let mut sig_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+            abilities_cache: HashMap::new(),
+        };
+        sig_check.verify_signature_pool(script.signatures())?;
+        sig_check.verify_function_signatures(script.function_handles())?;
+        sig_check.check_instantiation(script.parameters, &script.type_parameters)?;
+        sig_check.verify_code(script.code(), &script.type_parameters)
+    }
+
+    fn verify_signature_pool(&self, signatures: &[Signature]) -> PartialVMResult<()> {
+        for i in 0..signatures.len() {
+            self.check_signature(SignatureIndex::new(i as TableIndex))?
+        }
+        Ok(())
+    }
+
+    fn verify_function_signatures(
+        &mut self,
+        function_handles: &[FunctionHandle],
+    ) -> PartialVMResult<()> {
+        let err_handler = |err: PartialVMError, idx| {
+            err.at_index(IndexKind::Signature, idx as TableIndex)
+                .at_index(IndexKind::FunctionHandle, idx as TableIndex)
+        };
+
+        for (idx, fh) in function_handles.iter().enumerate() {
+            self.check_instantiation(fh.return_, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_instantiation(fh.parameters, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            if !fh.type_parameters.is_empty() {}
+        }
+        Ok(())
+    }
+
+    fn verify_fields(&self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
+        for (struct_def_idx, struct_def) in struct_defs.iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+            let err_handler = |err: PartialVMError, idx| {
+                err.at_index(IndexKind::FieldDefinition, idx as TableIndex)
+                    .at_index(IndexKind::StructDefinition, struct_def_idx as TableIndex)
+            };
+            for (field_offset, field_def) in fields.iter().enumerate() {
+                self.check_signature_token(&field_def.signature.0)
+                    .map_err(|err| err_handler(err, field_offset))?;
+                let type_param_constraints: Vec<_> =
+                    struct_handle.type_param_constraints().collect();
+                self.check_type_instantiation(&field_def.signature.0, &type_param_constraints)
+                    .map_err(|err| err_handler(err, field_offset))?;
+
+                self.check_phantom_params(
+                    &field_def.signature.0,
+                    false,
+                    &struct_handle.type_parameters,
+                )
+                .map_err(|err| err_handler(err, field_offset))?;
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_code_units(
+        &mut self,
+        function_handles: &[FunctionHandle],
+        function_defs: &[FunctionDefinition],
+    ) -> PartialVMResult<()> {
+        for (func_def_idx, func_def) in function_defs.iter().enumerate() {
+            // skip native functions
+            let code = match &func_def.code {
+                Some(code) => code,
+                None => continue,
+            };
+            let func_handle = &function_handles[func_def.function.0 as usize];
+            self.verify_code(code, &func_handle.type_parameters)
+                .map_err(|err| {
+                    err.at_index(IndexKind::Signature, code.locals.0)
+                        .at_index(IndexKind::FunctionDefinition, func_def_idx as TableIndex)
+                })?
+        }
+        Ok(())
+    }
+
+    fn verify_code(
+        &mut self,
+        code: &CodeUnit,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        self.check_instantiation(code.locals, type_parameters)?;
+
+        // Check if the type actuals in certain bytecode instructions are well defined.
+        use Bytecode::*;
+        for (offset, instr) in code.code.iter().enumerate() {
+            let result = match instr {
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    let func_handle = self.resolver.function_handle_at(func_inst.handle);
+                    let type_arguments = &self.resolver.signature_at(func_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        func_handle.type_parameters.iter().copied(),
+                        type_parameters,
+                    )
+                }
+                PackGeneric(idx)
+                | UnpackGeneric(idx)
+                | ExistsGeneric(idx)
+                | MoveFromGeneric(idx)
+                | MoveToGeneric(idx)
+                | ImmBorrowGlobalGeneric(idx)
+                | MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    let struct_def = self.resolver.struct_def_at(struct_inst.def)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(struct_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                ImmBorrowFieldGeneric(idx) | MutBorrowFieldGeneric(idx) => {
+                    let field_inst = self.resolver.field_instantiation_at(*idx)?;
+                    let field_handle = self.resolver.field_handle_at(field_inst.handle)?;
+                    let struct_def = self.resolver.struct_def_at(field_handle.owner)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(field_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                VecPack(idx, _)
+                | VecLen(idx)
+                | VecImmBorrow(idx)
+                | VecMutBorrow(idx)
+                | VecPushBack(idx)
+                | VecPopBack(idx)
+                | VecUnpack(idx, _)
+                | VecSwap(idx) => {
+                    let type_arguments = &self.resolver.signature_at(*idx).0;
+                    if type_arguments.len() != 1 {
+                        return Err(PartialVMError::new(
+                            StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+                        )
+                        .with_message(format!(
+                            "expected 1 type token for vector operations, got {}",
+                            type_arguments.len()
+                        )));
+                    }
+                    self.check_signature_tokens(type_arguments)
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
+                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
+                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
+                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
+                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
+                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
+                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => Ok(()),
+            };
+            result.map_err(|err| {
+                err.append_message_with_separator(' ', format!("at offset {} ", offset))
+            })?
+        }
+        Ok(())
+    }
+
+    /// Checks that phantom type parameters are only used in phantom position.
+    fn check_phantom_params(
+        &self,
+        ty: &SignatureToken,
+        is_phantom_pos: bool,
+        type_parameters: &[StructTypeParameter],
+    ) -> PartialVMResult<()> {
+        match ty {
+            SignatureToken::Vector(ty) => self.check_phantom_params(ty, false, type_parameters)?,
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                let sh = self.resolver.struct_handle_at(*idx);
+                for (i, ty) in type_arguments.iter().enumerate() {
+                    self.check_phantom_params(
+                        ty,
+                        sh.type_parameters[i].is_phantom,
+                        type_parameters,
+                    )?;
+                }
+            }
+            SignatureToken::TypeParameter(idx) => {
+                if type_parameters[*idx as usize].is_phantom && !is_phantom_pos {
+                    return Err(PartialVMError::new(
+                        StatusCode::INVALID_PHANTOM_TYPE_PARAM_POSITION,
+                    )
+                    .with_message(
+                        "phantom type parameter cannot be used in non-phantom position".to_string(),
+                    ));
+                }
+            }
+
+            SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => {}
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// References are only permitted at the top level.
+    fn check_signature(&self, idx: SignatureIndex) -> PartialVMResult<()> {
+        for token in &self.resolver.signature_at(idx).0 {
+            match token {
+                SignatureToken::Reference(inner) | SignatureToken::MutableReference(inner) => {
+                    self.check_signature_token(inner)?
+                }
+                _ => self.check_signature_token(token)?,
+            }
+        }
+        Ok(())
+    }
+
+    /// Checks if the given types are well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_tokens(&self, tys: &[SignatureToken]) -> PartialVMResult<()> {
+        for ty in tys {
+            self.check_signature_token(ty)?
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_token(&self, ty: &SignatureToken) -> PartialVMResult<()> {
+        use SignatureToken::*;
+        match ty {
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => Ok(()),
+            Reference(_) | MutableReference(_) => {
+                // TODO: Prop tests expect us to NOT check the inner types.
+                // Revisit this once we rework prop tests.
+                Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
+                    .with_message("reference not allowed".to_string()))
+            }
+            Vector(ty) => self.check_signature_token(ty),
+            StructInstantiation(_, type_arguments) => self.check_signature_tokens(type_arguments),
+        }
+    }
+
+    fn check_instantiation(
+        &mut self,
+        idx: SignatureIndex,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if let Some(checked_abilities) = self.abilities_cache.get(&idx) {
+            if checked_abilities.contains(type_parameters) {
+                return Ok(());
+            }
+        };
+        for ty in &self.resolver.signature_at(idx).0 {
+            self.check_type_instantiation(ty, type_parameters)?
+        }
+        let checked_abilities = self.abilities_cache.entry(idx).or_default();
+        checked_abilities.insert(type_parameters.to_vec());
+        Ok(())
+    }
+
+    fn check_type_instantiation(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if self.resolver.version() >= VERSION_6 {
+            for ty in s.preorder_traversal() {
+                self.check_type_instantiation_(ty, type_parameters)?
+            }
+            Ok(())
+        } else {
+            // preserve buggy, but harmless old behavior for backward compatibility
+            self.check_type_instantiation_(s, type_parameters)
+        }
+    }
+
+    fn check_type_instantiation_(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        match s {
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                // Check that the instantiation satisfies the `idx` struct's constraints
+                // Cannot be checked completely if we do not know the constraints of type parameters
+                // i.e. it cannot be checked unless we are inside some module member. The only case
+                // where that happens is when checking the signature pool itself
+                let sh = self.resolver.struct_handle_at(*idx);
+                self.check_generic_instance(
+                    type_arguments,
+                    sh.type_param_constraints(),
+                    type_parameters,
+                )
+            }
+            SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Vector(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => Ok(()),
+        }
+    }
+
+    // Checks if the given types are well defined and satisfy the constraints in the given context.
+    fn check_generic_instance(
+        &self,
+        type_arguments: &[SignatureToken],
+        constraints: impl ExactSizeIterator<Item = AbilitySet>,
+        global_abilities: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if type_arguments.len() != constraints.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "expected {} type argument(s), got {}",
+                        constraints.len(),
+                        type_arguments.len()
+                    ),
+                ),
+            );
+        }
+
+        for (constraint, ty) in constraints.into_iter().zip(type_arguments) {
+            let given = self.resolver.abilities(ty, global_abilities)?;
+            if !constraint.is_subset(given) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "expected type with abilities {:?} got type actual {:?} with incompatible \
+                        abilities {:?}",
+                        constraint, ty, given
+                    )));
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/stack_usage_verifier.rs b/vendors/move/crates/move-bytecode-verifier/src/stack_usage_verifier.rs
new file mode 100644
index 000000000..e4c1d5c0b
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/stack_usage_verifier.rs
@@ -0,0 +1,273 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that basic blocks in the bytecode instruction
+//! sequence of a function use the evaluation stack in a balanced manner. Every basic block,
+//! except those that end in Ret (return to caller) opcode, must leave the stack height the
+//! same as at the beginning of the block. A basic block that ends in Ret opcode must increase
+//! the stack height by the number of values returned by the function as indicated in its
+//! signature. Additionally, the stack height must not dip below that at the beginning of the
+//! block for any basic block.
+use crate::meter::Meter;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeUnit, FunctionDefinitionIndex, Signature, StructFieldInformation},
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+pub(crate) struct StackUsageVerifier<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+    code: &'a CodeUnit,
+    return_: &'a Signature,
+}
+
+impl<'a> StackUsageVerifier<'a> {
+    pub(crate) fn verify(
+        config: &VerifierConfig,
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView,
+        _meter: &mut impl Meter, // TODO: metering
+    ) -> PartialVMResult<()> {
+        let verifier = Self {
+            resolver,
+            current_function: function_view.index(),
+            code: function_view.code(),
+            return_: function_view.return_(),
+        };
+
+        for block_id in function_view.cfg().blocks() {
+            verifier.verify_block(config, block_id, function_view.cfg())?
+        }
+        Ok(())
+    }
+
+    fn verify_block(
+        &self,
+        config: &VerifierConfig,
+        block_id: BlockId,
+        cfg: &dyn ControlFlowGraph,
+    ) -> PartialVMResult<()> {
+        let code = &self.code.code;
+        let mut stack_size_increment = 0;
+        let block_start = cfg.block_start(block_id);
+        let mut overall_push = 0;
+        for i in block_start..=cfg.block_end(block_id) {
+            let (num_pops, num_pushes) = self.instruction_effect(&code[i as usize])?;
+            if let Some(new_pushes) = u64::checked_add(overall_push, num_pushes) {
+                overall_push = new_pushes
+            };
+
+            // Check that the accumulated pushes does not exceed a pre-defined max size
+            if let Some(max_push_size) = config.max_push_size {
+                if overall_push > max_push_size as u64 {
+                    return Err(PartialVMError::new(StatusCode::VALUE_STACK_PUSH_OVERFLOW)
+                        .at_code_offset(self.current_function(), block_start));
+                }
+            }
+
+            // Check that the stack height is sufficient to accommodate the number
+            // of pops this instruction does
+            if stack_size_increment < num_pops {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            }
+            if let Some(new_incr) = u64::checked_sub(stack_size_increment, num_pops) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+            if let Some(new_incr) = u64::checked_add(stack_size_increment, num_pushes) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+
+            if stack_size_increment > config.max_value_stack_size as u64 {
+                return Err(PartialVMError::new(StatusCode::VALUE_STACK_OVERFLOW)
+                    .at_code_offset(self.current_function(), block_start));
+            }
+        }
+
+        if stack_size_increment == 0 {
+            Ok(())
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                    .at_code_offset(self.current_function(), block_start),
+            )
+        }
+    }
+
+    /// The effect of an instruction is a tuple where the first element
+    /// is the number of pops it does, and the second element is the number
+    /// of pushes it does
+    fn instruction_effect(&self, instruction: &Bytecode) -> PartialVMResult<(u64, u64)> {
+        Ok(match instruction {
+            // Instructions that pop, but don't push
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::StLoc(_)
+            | Bytecode::Abort => (1, 0),
+
+            // Instructions that push, but don't pop
+            Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_) => (0, 1),
+
+            // Instructions that pop and push once
+            Bytecode::Not
+            | Bytecode::FreezeRef
+            | Bytecode::ReadRef
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::VecLen(_)
+            | Bytecode::VecPopBack(_) => (1, 1),
+
+            // Binary operations (pop twice and push once)
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge => (2, 1),
+
+            // Vector packing and unpacking
+            Bytecode::VecPack(_, num) => (*num, 1),
+            Bytecode::VecUnpack(_, num) => (1, *num),
+
+            // Vector indexing operations (pop twice and push once)
+            Bytecode::VecImmBorrow(_) | Bytecode::VecMutBorrow(_) => (2, 1),
+
+            // MoveTo, WriteRef, and VecPushBack pop twice but do not push
+            Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::WriteRef
+            | Bytecode::VecPushBack(_) => (2, 0),
+
+            // VecSwap pops three times but does not push
+            Bytecode::VecSwap(_) => (3, 0),
+
+            // Branch and Nop neither pops nor pushes
+            Bytecode::Branch(_) | Bytecode::Nop => (0, 0),
+
+            // Return performs `return_count` pops
+            Bytecode::Ret => {
+                let return_count = self.return_.len();
+                (return_count as u64, 0)
+            }
+
+            // Call performs `arg_count` pops and `return_count` pushes
+            Bytecode::Call(idx) => {
+                let function_handle = self.resolver.function_handle_at(*idx);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+            Bytecode::CallGeneric(idx) => {
+                let func_inst = self.resolver.function_instantiation_at(*idx);
+                let function_handle = self.resolver.function_handle_at(func_inst.handle);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+
+            // Pack performs `num_fields` pops and one push
+            Bytecode::Pack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+            Bytecode::PackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+
+            // Unpack performs one pop and `num_fields` pushes
+            Bytecode::Unpack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+        })
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/struct_defs.rs b/vendors/move/crates/move-bytecode-verifier/src/struct_defs.rs
new file mode 100644
index 000000000..711837245
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/struct_defs.rs
@@ -0,0 +1,147 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides a checker for verifying that struct definitions in a module are not
+//! recursive. Since the module dependency graph is acylic by construction, applying this checker to
+//! each module in isolation guarantees that there is no structural recursion globally.
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, SignatureToken, StructDefinitionIndex, StructHandleIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    views::StructDefinitionView,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{algo::toposort, graphmap::DiGraphMap};
+use std::collections::{BTreeMap, BTreeSet};
+
+pub struct RecursiveStructDefChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> RecursiveStructDefChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let checker = Self { module };
+        let graph = StructDefGraphBuilder::new(checker.module).build()?;
+
+        // toposort is iterative while petgraph::algo::is_cyclic_directed is recursive. Prefer
+        // the iterative solution here as this code may be dealing with untrusted data.
+        match toposort(&graph, None) {
+            Ok(_) => Ok(()),
+            Err(cycle) => Err(verification_error(
+                StatusCode::RECURSIVE_STRUCT_DEFINITION,
+                IndexKind::StructDefinition,
+                cycle.node_id().into_index() as TableIndex,
+            )),
+        }
+    }
+}
+
+/// Given a module, build a graph of struct definitions. This is useful when figuring out whether
+/// the struct definitions in module form a cycle.
+struct StructDefGraphBuilder<'a> {
+    module: &'a CompiledModule,
+    /// Used to follow field definitions' signatures' struct handles to their struct definitions.
+    handle_to_def: BTreeMap<StructHandleIndex, StructDefinitionIndex>,
+}
+
+impl<'a> StructDefGraphBuilder<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        let mut handle_to_def = BTreeMap::new();
+        // the mapping from struct definitions to struct handles is already checked to be 1-1 by
+        // DuplicationChecker
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let sh_idx = struct_def.struct_handle;
+            handle_to_def.insert(sh_idx, StructDefinitionIndex(idx as TableIndex));
+        }
+
+        Self {
+            module,
+            handle_to_def,
+        }
+    }
+
+    fn build(self) -> PartialVMResult<DiGraphMap<StructDefinitionIndex, ()>> {
+        let mut neighbors = BTreeMap::new();
+        for idx in 0..self.module.struct_defs().len() {
+            let sd_idx = StructDefinitionIndex::new(idx as TableIndex);
+            self.add_struct_defs(&mut neighbors, sd_idx)?
+        }
+
+        let edges = neighbors
+            .into_iter()
+            .flat_map(|(parent, children)| children.into_iter().map(move |child| (parent, child)));
+        Ok(DiGraphMap::from_edges(edges))
+    }
+
+    fn add_struct_defs(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.module.struct_def_at(idx);
+        let struct_def = StructDefinitionView::new(self.module, struct_def);
+        // The fields iterator is an option in the case of native structs. Flatten makes an empty
+        // iterator for that case
+        for field in struct_def.fields().into_iter().flatten() {
+            self.add_signature_token(neighbors, idx, field.signature_token())?
+        }
+        Ok(())
+    }
+
+    fn add_signature_token(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        cur_idx: StructDefinitionIndex,
+        token: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        use SignatureToken as T;
+        match token {
+            T::Bool
+            | T::U8
+            | T::U16
+            | T::U32
+            | T::U64
+            | T::U128
+            | T::U256
+            | T::Address
+            | T::Signer
+            | T::TypeParameter(_) => (),
+            T::Reference(_) | T::MutableReference(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Reference field when checking recursive structs".to_owned()),
+                )
+            }
+            T::Vector(inner) => self.add_signature_token(neighbors, cur_idx, inner)?,
+            T::Struct(sh_idx) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+            }
+            T::StructInstantiation(sh_idx, inners) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+                for t in inners {
+                    self.add_signature_token(neighbors, cur_idx, t)?
+                }
+            }
+        };
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/type_safety.rs b/vendors/move/crates/move-bytecode-verifier/src/type_safety.rs
new file mode 100644
index 000000000..3cbcf4ba2
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/type_safety.rs
@@ -0,0 +1,1012 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying type safety of a procedure body.
+//! It does not utilize control flow, but does check each block independently
+
+use std::num::NonZeroU64;
+
+use crate::meter::{Meter, Scope};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, FieldHandleIndex, FunctionDefinitionIndex,
+        FunctionHandle, LocalIndex, Signature, SignatureToken, SignatureToken as ST,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+    },
+    safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+
+struct Locals<'a> {
+    param_count: usize,
+    parameters: &'a Signature,
+    locals: &'a Signature,
+}
+
+const TYPE_NODE_COST: u128 = 30;
+
+impl<'a> Locals<'a> {
+    fn new(parameters: &'a Signature, locals: &'a Signature) -> Self {
+        Self {
+            param_count: parameters.len(),
+            parameters,
+            locals,
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        let idx = i as usize;
+        if idx < self.param_count {
+            &self.parameters.0[idx]
+        } else {
+            &self.locals.0[idx - self.param_count]
+        }
+    }
+}
+
+struct TypeSafetyChecker<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    locals: Locals<'a>,
+    stack: AbstractStack<SignatureToken>,
+}
+
+impl<'a> TypeSafetyChecker<'a> {
+    fn new(resolver: &'a BinaryIndexedView<'a>, function_view: &'a FunctionView<'a>) -> Self {
+        let locals = Locals::new(function_view.parameters(), function_view.locals());
+        Self {
+            resolver,
+            function_view,
+            locals,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        self.locals.local_at(i)
+    }
+
+    fn abilities(&self, t: &SignatureToken) -> PartialVMResult<AbilitySet> {
+        self.resolver
+            .abilities(t, self.function_view.type_parameters())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.function_view
+                .index()
+                .unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn push(&mut self, meter: &mut impl Meter, ty: SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push(ty));
+        Ok(())
+    }
+
+    fn push_n(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push_n(ty, n));
+        Ok(())
+    }
+
+    fn charge_ty(&mut self, meter: &mut impl Meter, ty: &SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty_(meter, ty, 1)
+    }
+
+    fn charge_ty_(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: &SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        meter.add_items(
+            Scope::Function,
+            TYPE_NODE_COST,
+            ty.preorder_traversal().count() * (n as usize),
+        )
+    }
+
+    fn charge_tys(
+        &mut self,
+        meter: &mut impl Meter,
+        tys: &[SignatureToken],
+    ) -> PartialVMResult<()> {
+        for ty in tys {
+            self.charge_ty(meter, ty)?
+        }
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let verifier = &mut TypeSafetyChecker::new(resolver, function_view);
+
+    for block_id in function_view.cfg().blocks() {
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &verifier.function_view.code().code[offset as usize];
+            verify_instr(verifier, instr, offset, meter)?
+        }
+    }
+
+    Ok(())
+}
+
+// helper for both `ImmBorrowField` and `MutBorrowField`
+fn borrow_field(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    field_handle_index: FieldHandleIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // load operand and check mutability constraints
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if mut_ && !operand.is_mutable_reference() {
+        return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    // check the reference on the stack is the expected type.
+    // Load the type that owns the field according to the instruction.
+    // For generic fields access, this step materializes that type
+    let field_handle = verifier.resolver.field_handle_at(field_handle_index)?;
+    let struct_def = verifier.resolver.struct_def_at(field_handle.owner)?;
+    let expected_type = materialize_type(struct_def.struct_handle, type_args);
+    match operand {
+        ST::Reference(inner) | ST::MutableReference(inner) if expected_type == *inner => (),
+        _ => return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)),
+    }
+
+    let field_def = match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            return Err(verifier.error(StatusCode::BORROWFIELD_BAD_FIELD_ERROR, offset));
+        }
+        StructFieldInformation::Declared(fields) => {
+            // TODO: review the whole error story here, way too much is left to chances...
+            // definition of a more proper OM for the verifier could work around the problem
+            // (maybe, maybe not..)
+            &fields[field_handle.field as usize]
+        }
+    };
+    let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(field_type)
+        } else {
+            ST::Reference(field_type)
+        },
+    )?;
+    Ok(())
+}
+
+// helper for both `ImmBorrowLoc` and `MutBorrowLoc`
+fn borrow_loc(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: LocalIndex,
+) -> PartialVMResult<()> {
+    let loc_signature = verifier.local_at(idx).clone();
+
+    if loc_signature.is_reference() {
+        return Err(verifier.error(StatusCode::BORROWLOC_REFERENCE_ERROR, offset));
+    }
+
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(loc_signature))
+        } else {
+            ST::Reference(Box::new(loc_signature))
+        },
+    )?;
+    Ok(())
+}
+
+fn borrow_global(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: StructDefinitionIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // check and consume top of stack
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let struct_def = verifier.resolver.struct_def_at(idx)?;
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(struct_type))
+        } else {
+            ST::Reference(Box::new(struct_type))
+        },
+    )?;
+    Ok(())
+}
+
+fn call(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    type_actuals: &Signature,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    for parameter in parameters.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if (type_actuals.is_empty() && &arg != parameter)
+            || (!type_actuals.is_empty() && arg != instantiate(parameter, type_actuals))
+        {
+            return Err(verifier.error(StatusCode::CALL_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+    for return_type in &verifier.resolver.signature_at(function_handle.return_).0 {
+        verifier.push(meter, instantiate(return_type, type_actuals))?
+    }
+    Ok(())
+}
+
+fn type_fields_signature(
+    verifier: &mut TypeSafetyChecker,
+    _meter: &mut impl Meter, // TODO: metering
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<Signature> {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            // TODO: this is more of "unreachable"
+            Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset))
+        }
+        StructFieldInformation::Declared(fields) => {
+            let mut field_sig = vec![];
+            for field_def in fields.iter() {
+                field_sig.push(instantiate(&field_def.signature.0, type_args));
+            }
+            Ok(Signature(field_sig))
+        }
+    }
+}
+
+fn pack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if &arg != sig {
+            return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+
+    // Pop an abstract value from the stack and check if its type is equal to the one
+    // declared.
+    let arg = safe_unwrap_err!(verifier.stack.pop());
+    if arg != struct_type {
+        return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0 {
+        verifier.push(meter, sig)?
+    }
+    Ok(())
+}
+
+fn exists(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        // TODO better error here
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    verifier.push(meter, ST::Bool)?;
+    Ok(())
+}
+
+fn move_from(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn move_to(
+    verifier: &mut TypeSafetyChecker,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVETO_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let key_struct_operand = safe_unwrap_err!(verifier.stack.pop());
+    let signer_reference_operand = safe_unwrap_err!(verifier.stack.pop());
+    if key_struct_operand != struct_type {
+        return Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset));
+    }
+    match signer_reference_operand {
+        ST::Reference(inner) => match *inner {
+            ST::Signer => Ok(()),
+            _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+        },
+        _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+    }
+}
+
+fn borrow_vector_element(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    declared_element_type: &SignatureToken,
+    offset: CodeOffset,
+    mut_ref_only: bool,
+) -> PartialVMResult<()> {
+    let operand_idx = safe_unwrap_err!(verifier.stack.pop());
+    let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+
+    // check index
+    if operand_idx != ST::U64 {
+        return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+    }
+
+    // check vector and update stack
+    let element_type = match get_vector_element_type(operand_vec, mut_ref_only) {
+        Some(ty) if &ty == declared_element_type => ty,
+        _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+    };
+    let element_ref_type = if mut_ref_only {
+        ST::MutableReference(Box::new(element_type))
+    } else {
+        ST::Reference(Box::new(element_type))
+    };
+    verifier.push(meter, element_ref_type)?;
+
+    Ok(())
+}
+
+fn verify_instr(
+    verifier: &mut TypeSafetyChecker,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    match bytecode {
+        Bytecode::Pop => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let abilities = verifier
+                .resolver
+                .abilities(&operand, verifier.function_view.type_parameters());
+            if !abilities?.has_drop() {
+                return Err(verifier.error(StatusCode::POP_WITHOUT_DROP_ABILITY, offset));
+            }
+        }
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::Bool {
+                return Err(verifier.error(StatusCode::BR_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::StLoc(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if &operand != verifier.local_at(*idx) {
+                return Err(verifier.error(StatusCode::STLOC_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Abort => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::U64 {
+                return Err(verifier.error(StatusCode::ABORT_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Ret => {
+            let return_ = &verifier.function_view.return_().0;
+            for return_type in return_.iter().rev() {
+                let operand = safe_unwrap_err!(verifier.stack.pop());
+                if &operand != return_type {
+                    return Err(verifier.error(StatusCode::RET_TYPE_MISMATCH_ERROR, offset));
+                }
+            }
+        }
+
+        Bytecode::Branch(_) | Bytecode::Nop => (),
+
+        Bytecode::FreezeRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::MutableReference(inner) => verifier.push(meter, ST::Reference(inner))?,
+                _ => return Err(verifier.error(StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::MutBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            true,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::ImmBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            false,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::LdU8(_) => {
+            verifier.push(meter, ST::U8)?;
+        }
+
+        Bytecode::LdU16(_) => {
+            verifier.push(meter, ST::U16)?;
+        }
+
+        Bytecode::LdU32(_) => {
+            verifier.push(meter, ST::U32)?;
+        }
+
+        Bytecode::LdU64(_) => {
+            verifier.push(meter, ST::U64)?;
+        }
+
+        Bytecode::LdU128(_) => {
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::LdU256(_) => {
+            verifier.push(meter, ST::U256)?;
+        }
+
+        Bytecode::LdConst(idx) => {
+            let signature = verifier.resolver.constant_at(*idx).type_.clone();
+            verifier.push(meter, signature)?;
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(meter, ST::Bool)?;
+        }
+
+        Bytecode::CopyLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            if !verifier
+                .resolver
+                .abilities(&local_signature, verifier.function_view.type_parameters())?
+                .has_copy()
+            {
+                return Err(verifier.error(StatusCode::COPYLOC_WITHOUT_COPY_ABILITY, offset));
+            }
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MoveLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MutBorrowLoc(idx) => borrow_loc(verifier, meter, offset, true, *idx)?,
+
+        Bytecode::ImmBorrowLoc(idx) => borrow_loc(verifier, meter, offset, false, *idx)?,
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, meter, offset, function_handle, &Signature(vec![]))?
+        }
+
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let func_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            let type_args = &verifier.resolver.signature_at(func_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            call(verifier, meter, offset, func_handle, type_args)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            pack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::Unpack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            unpack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::ReadRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::Reference(inner) | ST::MutableReference(inner) => {
+                    if !verifier.abilities(&inner)?.has_copy() {
+                        return Err(
+                            verifier.error(StatusCode::READREF_WITHOUT_COPY_ABILITY, offset)
+                        );
+                    }
+                    verifier.push(meter, *inner)?;
+                }
+                _ => return Err(verifier.error(StatusCode::READREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::WriteRef => {
+            let ref_operand = safe_unwrap_err!(verifier.stack.pop());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            let ref_inner_signature = match ref_operand {
+                ST::MutableReference(inner) => *inner,
+                _ => {
+                    return Err(
+                        verifier.error(StatusCode::WRITEREF_NO_MUTABLE_REFERENCE_ERROR, offset)
+                    )
+                }
+            };
+            if !verifier.abilities(&ref_inner_signature)?.has_drop() {
+                return Err(verifier.error(StatusCode::WRITEREF_WITHOUT_DROP_ABILITY, offset));
+            }
+
+            if val_operand != ref_inner_signature {
+                return Err(verifier.error(StatusCode::WRITEREF_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::CastU8 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U8)?;
+        }
+        Bytecode::CastU64 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U64)?;
+        }
+        Bytecode::CastU128 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, operand1)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Shl | Bytecode::Shr => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand2.is_integer() && operand1 == ST::U8 {
+                verifier.push(meter, operand2)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Or | Bytecode::And => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1 == ST::Bool && operand2 == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Not => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Eq | Bytecode::Neq => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if verifier.abilities(&operand1)?.has_drop() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, true, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, true, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::ImmBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, false, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, false, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::Exists(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            exists(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::ExistsGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            exists(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveFrom(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_from(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveFromGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_from(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveTo(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_to(verifier, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveToGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_to(verifier, offset, struct_def, type_args)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            let element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let is_mismatched = verifier
+                    .stack
+                    .pop_eq_n(num_to_pop)
+                    .map(|t| element_type != &t)
+                    .unwrap_or(true);
+                if is_mismatched {
+                    return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+                }
+            }
+            verifier.push(meter, ST::Vector(Box::new(element_type.clone())))?;
+        }
+
+        Bytecode::VecLen(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand, false) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, ST::U64)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecImmBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, false)?
+        }
+        Bytecode::VecMutBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, true)?
+        }
+
+        Bytecode::VecPushBack(idx) => {
+            let operand_elem = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if declared_element_type != &operand_elem {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, derived_element_type)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if operand_vec != ST::Vector(Box::new(declared_element_type.clone())) {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            verifier.push_n(meter, declared_element_type.clone(), *num)?;
+        }
+
+        Bytecode::VecSwap(idx) => {
+            let operand_idx2 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_idx1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            if operand_idx1 != ST::U64 || operand_idx2 != ST::U64 {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+        Bytecode::CastU16 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U16)?;
+        }
+        Bytecode::CastU32 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U32)?;
+        }
+        Bytecode::CastU256 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U256)?;
+        }
+    };
+    Ok(())
+}
+
+//
+// Helpers functions for types
+//
+
+fn materialize_type(struct_handle: StructHandleIndex, type_args: &Signature) -> SignatureToken {
+    if type_args.is_empty() {
+        ST::Struct(struct_handle)
+    } else {
+        ST::StructInstantiation(struct_handle, type_args.0.clone())
+    }
+}
+
+fn instantiate(token: &SignatureToken, subst: &Signature) -> SignatureToken {
+    use SignatureToken::*;
+
+    if subst.0.is_empty() {
+        return token.clone();
+    }
+
+    match token {
+        Bool => Bool,
+        U8 => U8,
+        U16 => U16,
+        U32 => U32,
+        U64 => U64,
+        U128 => U128,
+        U256 => U256,
+        Address => Address,
+        Signer => Signer,
+        Vector(ty) => Vector(Box::new(instantiate(ty, subst))),
+        Struct(idx) => Struct(*idx),
+        StructInstantiation(idx, struct_type_args) => StructInstantiation(
+            *idx,
+            struct_type_args
+                .iter()
+                .map(|ty| instantiate(ty, subst))
+                .collect(),
+        ),
+        Reference(ty) => Reference(Box::new(instantiate(ty, subst))),
+        MutableReference(ty) => MutableReference(Box::new(instantiate(ty, subst))),
+        TypeParameter(idx) => {
+            // Assume that the caller has previously parsed and verified the structure of the
+            // file and that this guarantees that type parameter indices are always in bounds.
+            debug_assert!((*idx as usize) < subst.len());
+            subst.0[*idx as usize].clone()
+        }
+    }
+}
+
+fn get_vector_element_type(
+    vector_ref_ty: SignatureToken,
+    mut_ref_only: bool,
+) -> Option<SignatureToken> {
+    use SignatureToken::*;
+    match vector_ref_ty {
+        Reference(referred_type) => {
+            if mut_ref_only {
+                None
+            } else if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        MutableReference(referred_type) => {
+            if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        _ => None,
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-verifier/src/verifier.rs b/vendors/move/crates/move-bytecode-verifier/src/verifier.rs
new file mode 100644
index 000000000..fd8b92a58
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-verifier/src/verifier.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains the public APIs supported by the bytecode verifier.
+use crate::meter::{DummyMeter, Meter};
+use crate::{
+    ability_field_requirements, check_duplication::DuplicationChecker,
+    code_unit_verifier::CodeUnitVerifier, constants, friends,
+    instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
+    limits::LimitsVerifier, script_signature,
+    script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
+    struct_defs::RecursiveStructDefChecker,
+};
+use move_binary_format::{
+    check_bounds::BoundsChecker,
+    errors::{Location, VMResult},
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::time::Instant;
+
+/// Helper for a "canonical" verification of a module.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_module_unmetered(module: &CompiledModule) -> VMResult<()> {
+    verify_module_with_config_unmetered(&VerifierConfig::default(), module)
+}
+
+pub fn verify_module_with_config_for_test(
+    name: &str,
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    const MAX_MODULE_SIZE: usize = 65355;
+    let mut bytes = vec![];
+    module.serialize(&mut bytes).unwrap();
+    let now = Instant::now();
+    let result = verify_module_with_config_metered(config, module, meter);
+    eprintln!(
+        "--> {}: verification time: {:.3}ms, result: {}, size: {}kb",
+        name,
+        (now.elapsed().as_micros() as f64) / 1000.0,
+        if let Err(e) = &result {
+            format!("{:?}", e.major_status())
+        } else {
+            "Ok".to_string()
+        },
+        bytes.len() / 1000
+    );
+    // Also check whether the module actually fits into our payload size
+    assert!(
+        bytes.len() <= MAX_MODULE_SIZE,
+        "test module exceeds size limit {} (given size {})",
+        MAX_MODULE_SIZE,
+        bytes.len()
+    );
+    result
+}
+
+pub fn verify_module_with_config_metered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_module(module).map_err(|e| {
+        // We can't point the error at the module, because if bounds-checking
+        // failed, we cannot safely index into module's handle to itself.
+        e.finish(Location::Undefined)
+    })?;
+    LimitsVerifier::verify_module(config, module)?;
+    DuplicationChecker::verify_module(module)?;
+    SignatureChecker::verify_module(module)?;
+    InstructionConsistency::verify_module(module)?;
+    constants::verify_module(module)?;
+    friends::verify_module(module)?;
+    ability_field_requirements::verify_module(module)?;
+    RecursiveStructDefChecker::verify_module(module)?;
+    InstantiationLoopChecker::verify_module(module)?;
+    CodeUnitVerifier::verify_module(config, module, meter)?;
+
+    script_signature::verify_module(module, no_additional_script_signature_checks)
+}
+
+pub fn verify_module_with_config_unmetered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+) -> VMResult<()> {
+    verify_module_with_config_metered(config, module, &mut DummyMeter)
+}
+
+/// Helper for a "canonical" verification of a script.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_script_unmetered(script: &CompiledScript) -> VMResult<()> {
+    verify_script_with_config_unmetered(&VerifierConfig::default(), script)
+}
+
+pub fn verify_script_with_config_metered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
+    LimitsVerifier::verify_script(config, script)?;
+    DuplicationChecker::verify_script(script)?;
+    SignatureChecker::verify_script(script)?;
+    InstructionConsistency::verify_script(script)?;
+    constants::verify_script(script)?;
+    CodeUnitVerifier::verify_script(config, script, meter)?;
+    script_signature::verify_script(script, no_additional_script_signature_checks)
+}
+
+pub fn verify_script_with_config_unmetered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+) -> VMResult<()> {
+    verify_script_with_config_metered(config, script, &mut DummyMeter)
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/Cargo.toml b/vendors/move/crates/move-bytecode-viewer/Cargo.toml
new file mode 100644
index 000000000..cbc6cacce
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "move-bytecode-viewer"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Explore Move bytecode and how the source code compiles to it"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+clap.workspace = true
+anyhow = "1.0.71"
+regex.workspace = true
+tui.workspace = true
+crossterm.workspace = true
+
+move-bytecode-source-map.workspace = true
+move-binary-format.workspace = true
+move-disassembler.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-bytecode-viewer/src/bytecode_viewer.rs b/vendors/move/crates/move-bytecode-viewer/src/bytecode_viewer.rs
new file mode 100644
index 000000000..4abbcabfd
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/bytecode_viewer.rs
@@ -0,0 +1,112 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::interfaces::LeftScreen;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    file_format::{CodeOffset, CompiledModule, FunctionDefinitionIndex},
+};
+use move_bytecode_source_map::{mapping::SourceMapping, source_map::SourceMap};
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use regex::Regex;
+use std::collections::HashMap;
+
+#[derive(Clone, Debug)]
+pub struct BytecodeInfo {
+    pub function_name: String,
+    pub function_index: FunctionDefinitionIndex,
+    pub code_offset: CodeOffset,
+}
+
+#[derive(Clone, Debug)]
+pub struct BytecodeViewer<'a> {
+    pub lines: Vec<String>,
+    pub view: BinaryIndexedView<'a>,
+    pub line_map: HashMap<usize, BytecodeInfo>,
+}
+
+impl<'a> BytecodeViewer<'a> {
+    pub fn new(source_map: SourceMap, module: &'a CompiledModule) -> Self {
+        let view = BinaryIndexedView::Module(module);
+        let source_mapping = SourceMapping::new(source_map, view);
+        let options = DisassemblerOptions {
+            print_code: true,
+            print_basic_blocks: true,
+            ..Default::default()
+        };
+        let disassembled_string = Disassembler::new(source_mapping, options)
+            .disassemble()
+            .unwrap();
+
+        let mut base_viewer = Self {
+            lines: disassembled_string.lines().map(|x| x.to_string()).collect(),
+            line_map: HashMap::new(),
+            view,
+        };
+        base_viewer.build_mapping();
+        base_viewer
+    }
+
+    fn build_mapping(&mut self) {
+        let regex = Regex::new(r"^(\d+):.*").unwrap();
+        let fun_regex = Regex::new(r"^public\s+([a-zA-Z_]+)\(").unwrap();
+        let mut current_fun = None;
+        let mut current_fdef_idx = None;
+        let mut line_map = HashMap::new();
+
+        let function_def_for_name: HashMap<String, u16> = self
+            .view
+            .function_defs()
+            .into_iter()
+            .flatten()
+            .enumerate()
+            .map(|(index, fdef)| {
+                (
+                    self.view
+                        .identifier_at(self.view.function_handle_at(fdef.function).name)
+                        .to_string(),
+                    index as u16,
+                )
+            })
+            .collect();
+
+        for (i, line) in self.lines.iter().enumerate() {
+            let line = line.trim();
+            if let Some(cap) = fun_regex.captures(line) {
+                let fn_name = cap.get(1).unwrap().as_str();
+                let function_definition_index = function_def_for_name[fn_name];
+                current_fun = Some(fn_name);
+                current_fdef_idx = Some(FunctionDefinitionIndex(function_definition_index));
+            }
+
+            if let Some(cap) = regex.captures(line) {
+                current_fun.map(|fname| {
+                    let d = cap.get(1).unwrap().as_str().parse::<u16>().unwrap();
+                    line_map.insert(
+                        i,
+                        BytecodeInfo {
+                            function_name: fname.to_string(),
+                            function_index: current_fdef_idx.unwrap(),
+                            code_offset: d,
+                        },
+                    )
+                });
+            }
+        }
+        self.line_map = line_map;
+    }
+}
+
+impl LeftScreen for BytecodeViewer<'_> {
+    type SourceIndex = BytecodeInfo;
+
+    fn get_source_index_for_line(&self, line: usize, _column: usize) -> Option<&Self::SourceIndex> {
+        self.line_map.get(&line)
+    }
+
+    fn backing_string(&self) -> String {
+        self.lines.join("\n").replace('\t', "    ")
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/interfaces.rs b/vendors/move/crates/move-bytecode-viewer/src/interfaces.rs
new file mode 100644
index 000000000..898b29941
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/interfaces.rs
@@ -0,0 +1,50 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+
+/// There are two interfaces--the `LeftScreen` and `RightScreen`--that need to be implemented for
+/// the bytecode viewer and these can be mix-and-matched for different implementations.
+///
+/// The `LeftScreen` is the text that is displayed in the left-hand screen, and is scrollable. The
+/// scrolling in this window will output `BytecodeInfo` objects. These objects are then consumed by
+/// the `RightScreen` `source_for_code_location` function, which outputs text containing a context
+/// (`left`, `remainder`) around the source code location identified by the passed in
+/// `BytecodeInfo`.
+
+#[derive(Clone, Debug)]
+pub struct SourceContext {
+    pub left: String,
+    pub highlight: String,
+    pub remainder: String,
+}
+
+/// The `LeftScreen` trait is used to index the code.
+pub trait LeftScreen {
+    /// This is the type used for indexing the source code in the `RightScreen` trait. e.g., for
+    /// bytecode and using the source map, this would be a tuple of `(FunctionDefinitionIndex,
+    /// CodeOffset)`.
+    type SourceIndex;
+
+    /// Given a `line` and the `column` within that line, this returns a `SourceIndex` to be used
+    /// by the `RightScreen` trait.
+    fn get_source_index_for_line(&self, line: usize, column: usize) -> Option<&Self::SourceIndex>;
+
+    /// Return the backing string to be displayed on the left screen.
+    fn backing_string(&self) -> String;
+}
+
+/// The `RightScreen` trait takes the indices output by the left screen (cursor movements that have
+/// been possibly translated in some way, e.g., to (fdef_index, code_offset) pairs) and
+/// translates these indices into a `SourceContext` view of the text held by the implementor of the
+/// `RightScreen` trait.
+pub trait RightScreen<Indexer: LeftScreen> {
+    /// Take a `SourceIndex` from the `Indexer` and turn it into a context that will be diplayed on
+    /// the right screen.
+    fn source_for_code_location(
+        &self,
+        bytecode_info: &Indexer::SourceIndex,
+    ) -> Result<SourceContext>;
+    fn backing_string(&self) -> String;
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/lib.rs b/vendors/move/crates/move-bytecode-viewer/src/lib.rs
new file mode 100644
index 000000000..6ce836b59
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/lib.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    bytecode_viewer::BytecodeViewer, source_viewer::ModuleViewer,
+    tui::tui_interface::start_tui_with_interface, viewer::Viewer,
+};
+use clap::Parser;
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_source_map::{source_map::SourceMap, utils::source_map_from_file};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+pub mod bytecode_viewer;
+pub mod interfaces;
+pub mod source_viewer;
+pub mod tui;
+pub mod viewer;
+
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+pub struct BytecodeViewerConfig {
+    /// The path to the module binary
+    #[clap(long = "module-path", short = 'b')]
+    pub module_binary_path: PathBuf,
+
+    /// The path to the source map for the module binary
+    #[clap(long = "source-map-path")]
+    pub module_sourcemap_path: PathBuf,
+
+    /// The path to the source file
+    #[clap(long = "source-path", short = 's')]
+    pub source_file_path: PathBuf,
+}
+
+pub fn start_viewer_in_memory(
+    compiled_module: CompiledModule,
+    source_map: SourceMap,
+    source_path: &Path,
+) {
+    let module_viewer = ModuleViewer::new(compiled_module.clone(), source_map.clone(), source_path);
+    let bytecode_viewer = BytecodeViewer::new(source_map, &compiled_module);
+    let interface = Viewer::new(module_viewer, bytecode_viewer);
+    start_tui_with_interface(interface).unwrap();
+}
+
+impl BytecodeViewerConfig {
+    pub fn start_viewer(&self) {
+        let bytecode_bytes =
+            fs::read(&self.module_binary_path).expect("Unable to read bytecode file");
+        let compiled_module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)
+            .expect("Module blob can't be deserialized");
+
+        let source_map = source_map_from_file(&self.module_sourcemap_path).unwrap();
+
+        let source_path = Path::new(&self.source_file_path);
+        start_viewer_in_memory(compiled_module, source_map, source_path)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/main.rs b/vendors/move/crates/move-bytecode-viewer/src/main.rs
new file mode 100644
index 000000000..33c6969d6
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/main.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_bytecode_viewer::BytecodeViewerConfig;
+
+fn main() {
+    BytecodeViewerConfig::parse().start_viewer()
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/source_viewer.rs b/vendors/move/crates/move-bytecode-viewer/src/source_viewer.rs
new file mode 100644
index 000000000..d952644d3
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/source_viewer.rs
@@ -0,0 +1,81 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use anyhow::Result;
+use move_bytecode_source_map::source_map::SourceMap;
+
+use crate::{
+    bytecode_viewer::{BytecodeInfo, BytecodeViewer},
+    interfaces::{RightScreen, SourceContext},
+};
+use move_binary_format::file_format::CompiledModule;
+use std::{cmp, fs, path::Path};
+
+const CONTEXT_SIZE: usize = 1000;
+
+#[derive(Debug, Clone)]
+pub struct ModuleViewer {
+    file_index: usize,
+    source_code: Vec<String>,
+    source_map: SourceMap,
+    #[allow(unused)]
+    module: CompiledModule,
+}
+
+impl ModuleViewer {
+    pub fn new(module: CompiledModule, source_map: SourceMap, source_location: &Path) -> Self {
+        let mut source_code = vec![];
+        let file_contents = fs::read_to_string(source_location).unwrap();
+        assert!(
+            source_map.check(&file_contents),
+            "File contents are out of sync with source map"
+        );
+        source_code.push(file_contents);
+        let file_index = source_code.len() - 1;
+
+        Self {
+            file_index,
+            source_code,
+            source_map,
+            module,
+        }
+    }
+}
+
+impl<'a> RightScreen<BytecodeViewer<'a>> for ModuleViewer {
+    fn source_for_code_location(&self, bytecode_info: &BytecodeInfo) -> Result<SourceContext> {
+        let loc = self
+            .source_map
+            .get_code_location(bytecode_info.function_index, bytecode_info.code_offset)?;
+
+        let loc_start = loc.start() as usize;
+        let loc_end = loc.end() as usize;
+        let source = &self.source_code[self.file_index];
+        let source_span_end = source.len();
+
+        // Determine the context around the span that we want to show.
+        // Show either from the start of the file, or back `CONTEXT_SIZE` number of characters.
+        let context_start = loc_start.saturating_sub(CONTEXT_SIZE);
+        // Show either to the end of the file, or `CONTEXT_SIZE` number of characters after the
+        // span end.
+        let context_end = cmp::min(loc_end.checked_add(CONTEXT_SIZE).unwrap(), source_span_end);
+
+        // Create the contexts
+        let left = &source[context_start..loc_start];
+        let highlight = source[loc_start..loc_end].to_owned();
+        let remainder = &source[loc_end..context_end];
+
+        Ok(SourceContext {
+            left: left.to_string(),
+            highlight,
+            remainder: remainder.to_string(),
+        })
+    }
+
+    fn backing_string(&self) -> String {
+        self.source_code[self.file_index].clone()
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/tui/mod.rs b/vendors/move/crates/move-bytecode-viewer/src/tui/mod.rs
new file mode 100644
index 000000000..d15b6f11d
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/tui/mod.rs
@@ -0,0 +1,146 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod text_builder;
+pub mod tui_interface;
+
+use crate::tui::tui_interface::TUIInterface;
+use std::{error::Error, io::Write};
+
+use crossterm::event::{self, Event, KeyCode as Key, KeyEvent};
+
+use tui::{
+    backend::CrosstermBackend,
+    layout::{Constraint, Direction, Layout},
+    style::Style,
+    widgets::{Block, Borders, Paragraph},
+    Frame,
+};
+
+pub struct TUI<Interface: TUIInterface> {
+    current_line_number: u16,
+    current_column: u16,
+    interface: Interface,
+}
+
+impl<Interface: TUIInterface> TUI<Interface> {
+    pub fn new(interface: Interface) -> Self {
+        Self {
+            current_line_number: 0,
+            current_column: 0,
+            interface,
+        }
+    }
+
+    pub fn redraw<W: Write>(&mut self, f: &mut Frame<CrosstermBackend<W>>) {
+        // Create a split window, each pane using 50% of the screen
+        let window = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
+            .split(f.size());
+
+        // Get the bottom offset of the window that the cursor will be displayed
+        let window_size = window[0].bottom();
+        // The window will need to be scrolled if the cursor is more than halfway down the screen.
+        let scroll = if self.current_line_number > window_size / 2 {
+            self.current_line_number
+                .checked_sub(window_size / 2)
+                .unwrap()
+        } else {
+            0
+        };
+
+        // Get the output for the current line/column of the cursore
+        let current_interface = self
+            .interface
+            .on_redraw(self.current_line_number, self.current_column);
+
+        // Left window logic
+        // Create a paragraph for our text, and scroll it if need be (by the amount computed above)
+        let input = Paragraph::new(current_interface.left_screen)
+            .style(Style::default())
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .title(Interface::LEFT_TITLE),
+            )
+            .scroll((scroll, 0));
+
+        // Set the cursor position in the left window. Numbers incremented by 1 since the screen
+        // border is at position 0 in both x and y coordinates. If we scrolled the text, we need
+        // to subtract that from the line number so that the cursor is over the correct line.
+        f.set_cursor(
+            self.current_column.checked_add(1).unwrap(),
+            self.current_line_number
+                .checked_add(1)
+                .unwrap()
+                .checked_sub(scroll)
+                .unwrap(),
+        );
+        f.render_widget(input, window[0]);
+
+        // Right window logic
+        // Render the output text. No other logic needed.
+        let output = Paragraph::new(current_interface.right_screen)
+            .style(Style::default())
+            .block(
+                Block::default()
+                    .title(Interface::RIGHT_TITLE)
+                    .borders(Borders::ALL),
+            );
+        f.render_widget(output, window[1])
+    }
+
+    /// Handles keyboard input, and updates state according to those key presses.
+    /// Down, Up => move the cursor up or down a line
+    /// Left, Right => move the cursor to the previous (resp. next) character on the current line
+    /// ESC, q => exit
+    pub fn handle_input(&mut self) -> Result<bool, Box<dyn Error>> {
+        if let Event::Key(KeyEvent { code: key, .. }) = event::read()? {
+            match key {
+                // Exit
+                Key::Esc | Key::Char('q') => {
+                    return Ok(true);
+                }
+                // Update current line number to move the cursor up a line. If the column number is
+                // past the end of the new line we're on, bound the column number so it isn't past
+                // the last character on the new line.
+                Key::Up => {
+                    self.current_line_number = self.current_line_number.saturating_sub(1);
+                    self.current_column = self
+                        .interface
+                        .bound_column(self.current_line_number, self.current_column);
+                }
+                // Update current line number to move the cursor down a line. If the column number is
+                // past the end of the new line we're on, bound the column number so it isn't past
+                // the last character on the new line.
+                Key::Down => {
+                    self.current_line_number = self
+                        .interface
+                        .bound_line(self.current_line_number.checked_add(1).unwrap());
+                    self.current_column = self
+                        .interface
+                        .bound_column(self.current_line_number, self.current_column);
+                }
+                // Move the cursor to the next character on the current line. Number is bounded by
+                // the length of the current line.
+                Key::Right => {
+                    self.current_column = self.interface.bound_column(
+                        self.current_line_number,
+                        self.current_column.checked_add(1).unwrap(),
+                    );
+                }
+                // Move the cursor to the previous character on the current line. Number is bounded by
+                // the length of the current line.
+                Key::Left => {
+                    self.current_column = self.current_column.saturating_sub(1);
+                }
+                _ => {}
+            }
+        }
+        Ok(false)
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/tui/text_builder.rs b/vendors/move/crates/move-bytecode-viewer/src/tui/text_builder.rs
new file mode 100644
index 000000000..03943066f
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/tui/text_builder.rs
@@ -0,0 +1,70 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use tui::{
+    style::Style,
+    text::{Span, Spans},
+};
+
+/// A `TextBuilder` is used to build up a paragraph, where some parts of it may need to have
+/// different styling, and where this styling may not conform to line boundaries.
+#[derive(Debug, Clone, Default)]
+pub struct TextBuilder<'a> {
+    // A vec of "lines" each line is a vector of spans.
+    // We use Vec<Span> here instead of Spans since otherwise we wouldn't be able to join lines in
+    // the `add` function.
+    chunks: Vec<Vec<Span<'a>>>,
+}
+
+impl<'a> TextBuilder<'a> {
+    /// Create a new text builder
+    pub fn new() -> Self {
+        Self { chunks: Vec::new() }
+    }
+
+    /// Add `text` with the given `style`ing to the text builder. This functions tracks newlines in
+    /// the text already recorded (in the `chunks` field), and will splice lines between the
+    /// previous text and the new `text` being added. It respects the `style` of both the old text
+    /// and the newly added text.
+    pub fn add(&mut self, text: String, style: Style) {
+        let chunk = |string: String| {
+            string
+                .split('\n')
+                .map(|x| x.to_string())
+                .map(|x| vec![Span::styled(x, style)])
+                .collect::<Vec<Vec<Span>>>()
+        };
+        let last_chunk_ends_with_nl = self
+            .chunks
+            .last()
+            .map(|last_span| {
+                last_span
+                    .last()
+                    .map(|last_span| last_span.content.ends_with('\n'))
+                    .unwrap_or(false)
+            })
+            .unwrap_or(true);
+
+        if !last_chunk_ends_with_nl {
+            let mut iter = text.splitn(2, '\n');
+            iter.next().into_iter().for_each(|line_continuation| {
+                self.chunks
+                    .last_mut()
+                    .unwrap()
+                    .push(Span::styled(line_continuation.to_string(), style));
+            });
+            iter.next().into_iter().for_each(|remainder| {
+                self.chunks.extend(chunk(remainder.to_string()));
+            });
+        } else {
+            self.chunks.extend(chunk(text))
+        }
+    }
+
+    /// Return back the final Spans, each `Spans` represents a line in the paragraph.
+    pub fn finish(self) -> Vec<Spans<'a>> {
+        self.chunks.into_iter().map(Spans::from).collect()
+    }
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/tui/tui_interface.rs b/vendors/move/crates/move-bytecode-viewer/src/tui/tui_interface.rs
new file mode 100644
index 000000000..fb50eb64a
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/tui/tui_interface.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::tui::TUI;
+use crossterm::{
+    event::EnableMouseCapture,
+    execute,
+    terminal::{enable_raw_mode, EnterAlternateScreen},
+};
+use std::{error::Error, io};
+use tui::{backend::CrosstermBackend, text::Spans, Terminal};
+
+/// The output that will be display in the TUI. The text in the `left_screen` and `right_screen`
+/// fields will be displayed on the left screen and right screen respectively.
+#[derive(Debug, Clone)]
+pub struct TUIOutput<'a> {
+    /// The text to be displayed on the left screen. Each `Spans` in the vector is a line.
+    pub left_screen: Vec<Spans<'a>>,
+    /// The text to be displayed on the right screen. Each `Spans` in the vector is a line.
+    pub right_screen: Vec<Spans<'a>>,
+}
+
+pub trait TUIInterface {
+    /// The title to be used for the left screen
+    const LEFT_TITLE: &'static str;
+
+    /// The title to be used for the right screen
+    const RIGHT_TITLE: &'static str;
+
+    /// Function called on each redraw. The `TUIOutput` contains that updated data to display on
+    /// each pane.
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput;
+
+    /// Bounds the line number so that it does not run past the text.
+    fn bound_line(&self, line_number: u16) -> u16;
+
+    /// Bounds the column number (w.r.t. the current `line_number`) so that the cursor does not
+    /// overrun the line.
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16;
+}
+
+/// A Debugging interface for the TUI. Useful for debugging things.
+#[derive(Debug, Clone)]
+pub struct DebugInterface {
+    text: Vec<String>,
+}
+
+impl DebugInterface {
+    pub fn new(text: String) -> Self {
+        let text: Vec<_> = text.split('\n').map(|x| x.to_string()).collect();
+        Self { text }
+    }
+}
+
+impl TUIInterface for DebugInterface {
+    const LEFT_TITLE: &'static str = "Left pane";
+    const RIGHT_TITLE: &'static str = "Right pane";
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput {
+        TUIOutput {
+            left_screen: self.text.iter().map(|x| Spans::from(x.clone())).collect(),
+            right_screen: vec![Spans::from(format!(
+                "line number: {}   column number: {}",
+                line_number, column_number
+            ))],
+        }
+    }
+
+    fn bound_line(&self, line_number: u16) -> u16 {
+        std::cmp::min(
+            line_number,
+            (self.text.len().checked_sub(1).unwrap()) as u16,
+        )
+    }
+
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16 {
+        std::cmp::min(column_number, self.text[line_number as usize].len() as u16)
+    }
+}
+
+/// Starts a two-pane TUI using the provided `Interface` to update the screen according to cursor
+/// movements.
+pub fn start_tui_with_interface<Interface: TUIInterface>(
+    interface: Interface,
+) -> Result<(), Box<dyn Error>> {
+    enable_raw_mode()?;
+    let mut stdout = io::stdout();
+    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    let backend = CrosstermBackend::new(stdout);
+    let mut terminal = Terminal::new(backend)?;
+    let mut tui = TUI::new(interface);
+    loop {
+        terminal.draw(|frame| tui.redraw(frame))?;
+        if tui.handle_input()? {
+            break;
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/move-bytecode-viewer/src/viewer.rs b/vendors/move/crates/move-bytecode-viewer/src/viewer.rs
new file mode 100644
index 000000000..8b7cd0367
--- /dev/null
+++ b/vendors/move/crates/move-bytecode-viewer/src/viewer.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::{
+    interfaces::{LeftScreen, RightScreen},
+    tui::{
+        text_builder::TextBuilder,
+        tui_interface::{TUIInterface, TUIOutput},
+    },
+};
+use tui::{
+    style::{Color, Style},
+    text::Spans,
+};
+
+#[derive(Debug, Clone)]
+pub struct Viewer<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>> {
+    bytecode_text: Vec<String>,
+    source_viewer: SourceViewer,
+    bytecode_viewer: BytecodeViewer,
+}
+
+impl<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>>
+    Viewer<BytecodeViewer, SourceViewer>
+{
+    pub fn new(source_viewer: SourceViewer, bytecode_viewer: BytecodeViewer) -> Self {
+        Self {
+            bytecode_text: bytecode_viewer
+                .backing_string()
+                .split('\n')
+                .map(|x| x.to_string())
+                .collect(),
+            source_viewer,
+            bytecode_viewer,
+        }
+    }
+}
+
+impl<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>> TUIInterface
+    for Viewer<BytecodeViewer, SourceViewer>
+{
+    const LEFT_TITLE: &'static str = "Bytecode";
+    const RIGHT_TITLE: &'static str = "Source Code";
+
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput {
+        // Highlight style
+        let style: Style = Style::default().bg(Color::Red);
+        let report = match self
+            .bytecode_viewer
+            .get_source_index_for_line(line_number as usize, column_number as usize)
+        {
+            None => {
+                let mut builder = TextBuilder::new();
+                builder.add(self.source_viewer.backing_string(), Style::default());
+                builder.finish()
+            }
+            Some(info) => {
+                let source_context = self.source_viewer.source_for_code_location(info).unwrap();
+
+                let mut builder = TextBuilder::new();
+                builder.add(source_context.left, Style::default());
+                builder.add(source_context.highlight, style);
+                builder.add(source_context.remainder, Style::default());
+                builder.finish()
+            }
+        };
+
+        TUIOutput {
+            left_screen: self
+                .bytecode_text
+                .iter()
+                .map(|x| Spans::from(x.clone()))
+                .collect(),
+            right_screen: report,
+        }
+    }
+
+    fn bound_line(&self, line_number: u16) -> u16 {
+        std::cmp::min(
+            line_number,
+            self.bytecode_text.len().checked_sub(1).unwrap() as u16,
+        )
+    }
+
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16 {
+        std::cmp::min(
+            column_number,
+            self.bytecode_text[line_number as usize].len() as u16,
+        )
+    }
+}
diff --git a/vendors/move/crates/move-cli/Cargo.toml b/vendors/move/crates/move-cli/Cargo.toml
new file mode 100644
index 000000000..3a20b4d25
--- /dev/null
+++ b/vendors/move/crates/move-cli/Cargo.toml
@@ -0,0 +1,67 @@
+[package]
+name = "move-cli"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "CLI frontend for the Move compiler and VM"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+colored.workspace = true
+difference.workspace = true
+serde_yaml.workspace = true
+clap.workspace = true
+tempfile.workspace = true
+walkdir.workspace = true
+codespan-reporting.workspace = true
+toml_edit.workspace = true
+
+bcs.workspace = true
+
+move-bytecode-verifier.workspace = true
+move-disassembler.workspace = true
+move-docgen.workspace = true
+move-command-line-common.workspace = true
+move-bytecode-utils.workspace = true
+move-coverage.workspace = true
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-compiler.workspace = true
+move-stdlib.workspace = true
+move-vm-types.workspace = true
+move-vm-runtime.workspace = true
+move-vm-profiler.workspace = true
+move-vm-test-utils.workspace = true
+move-read-write-set-types.workspace = true
+move-binary-format.workspace = true
+move-package.workspace = true
+move-prover.workspace = true
+move-unit-test.workspace = true
+move-errmapgen.workspace = true
+move-bytecode-viewer.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+
+[[bin]]
+name = "move"
+path = "src/main.rs"
+
+[[test]]
+name = "sandbox_testsuite"
+harness = false
+
+[[test]]
+name = "move_unit_tests_move_vm_and_stackless_vm"
+harness = false
+
+[[test]]
+name = "build_testsuite"
+harness = false
+
+[features]
+tiered-gas = [ "move-vm-test-utils/tiered-gas" ]
diff --git a/vendors/move/crates/move-cli/README.md b/vendors/move/crates/move-cli/README.md
new file mode 100644
index 000000000..7dae2bdb4
--- /dev/null
+++ b/vendors/move/crates/move-cli/README.md
@@ -0,0 +1,576 @@
+# Move CLI
+
+The Move command-line interface (Move CLI) is a tool that provides an easy way to interact with Move, to experiment
+with writing and running Move code, and to experiment with developing new tools useful
+for Move development. To reflect this, the Move CLI commands are grouped into
+three main subcommands:
+* **package commands**: are commands to create, compile, and test Move packages, as well as perform other operations related to packages. These do not rely on a Move Adapter implementation nor an implementation of storage.
+* **sandbox commands**: are commands that allow you to write Move modules and scripts, write and run scripts and tests, and view the resulting state of execution in a local sandboxed environment.
+* **experimental commands**: are experimental commands that are currently in development.
+
+Every Move CLI command, with the exception of `package create`, is expected to be run within the context of a [Move package](https://move-language.github.io/move/packages.html).
+
+## Installation
+```shell
+$ cargo install --path move/language/tools/move-cli
+```
+or
+```shell
+$ cargo install --git https://github.com/move-language/move move-cli --branch main
+```
+
+This will install the `move` binary in your Cargo binary directory. On
+macOS and Linux this is usually `~/.cargo/bin`. You'll want to make sure
+this location is in your `PATH` environment variable.
+
+Now you should be able to run the Move CLI:
+
+```shell
+$ move
+Move 0.1.0
+CLI frontend for Move compiler and VM
+
+USAGE:
+    move [FLAGS] [OPTIONS] <SUBCOMMAND>
+  ...
+```
+
+We'll go through the most common Move CLI commands and flags here, however
+you can find the complete list of commands available by calling `move
+--help`.  Additionally, the complete list of flags and options available
+for each Move CLI command can be found by passing the `--help` flag to it,
+i.e., `move <command> --help`.
+
+## Package Commands
+
+Package commands provide wrappers with sane defaults around other commands
+that are provided either by various Move tools, compiler, or prover.
+
+The `move new` command will create a new empty Move package:
+```shell
+$ move new <package_name> # Create a Move package <package_name> under the current dir
+$ move new <package_name> -p <path> # Create a Move package <package_name> under path <path>
+```
+
+From within a package's root directory, you can build the modules and/or scripts that you have written in the package with:
+```shell
+$ move build # Builds the Move package you are currently in
+$ move build -p <path> # Builds the Move package at <path>
+```
+
+The compiled artifacts will by default be stored in the `build` directory. You
+can change where the build artifacts are saved by passing the optional `--build-dir` flag:
+
+```shell
+$ move build --build-dir <path_to_save_to> # Build current Move package and save artifacts under <path_to_save_to>
+```
+
+You can verify the specifications in a Move package using the Move Prover with the `prove` command:
+
+```shell
+$ move prove # Verify the specifications in the current package
+$ move prove -p <path> # Verify the specifications in the package at <path>
+```
+
+In order to run the Move Prover [additional tools need to be
+installed](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/install.md).
+Information on the Move Prover and its configuration options can be found
+[here](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)
+and
+[here](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md).
+
+You can also run unit tests in a package using the `test` command
+
+```shell
+$ move test # Run Move unit tests in the current package
+$ move test -p <path> # Run Move unit tests in the package at <path>
+```
+## Sandbox Commands
+
+The sandbox allows you to experiment with writing and running Move code without
+validators, a blockchain, or transactions. Persistent data is stored on-disk in
+a directory structure that mimics the Move memory model
+
+### Project structure
+
+Each sandbox command is run in the context of a Move package. So let's create a
+Move package that we'll use for the code in this README and `cd` into it:
+
+```shell
+$ move new readme
+$ cd readme
+```
+
+### Compiling and running scripts
+
+Let's first start out with a simple script that prints its [`signer`](https://move-language.github.io/move/signer.html).
+Create a file named `sources/debug_script.move` and type the following into it:
+
+```rust
+// sources/debug_script.move
+script {
+use std::debug;
+fun debug_script(account: signer) {
+    debug::print(&account)
+}
+}
+```
+
+Before we can run this however, we need to import the Move standard library
+nursery in order to have access to the `Debug` module and `Std` [named
+address](https://move-language.github.io/move/address.html#named-addresses).
+You can specify dependencies locally, or using a Git URL. Here, we will specify
+it using Git, so add the following to the `Move.toml` file in the `readme`
+directory:
+
+```toml
+[addresses]
+std = "0x1" # Specify and assign 0x1 to the named address "std"
+
+[dependencies]
+MoveNursery = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib/nursery", rev = "main" }
+#                ^                    ^                              ^                                       ^
+#            Git dependency       Git clone URL       Subdir under git repo (optional)           Git revision to use
+```
+
+Now let's try running the script -- the very first time may take some time since the package command will clone the repository at the given URL, but subsequent calls should be fast:
+
+```shell
+$ move sandbox run sources/debug_script.move --signers 0xf
+[debug] (&) { 0000000000000000000000000000000f }
+```
+
+The `--signers 0xf` argument indicates which account address(es) have signed
+off on the script. Omitting `--signers` or passing multiple signers to this
+single-`signer` script will trigger a type error.
+
+### Passing arguments
+
+The CLI supports passing non-`signer` arguments to `move sandbox run` via `--args`. The following argument types are supported:
+* `bool` literals (`true`, `false`)
+* `u64` literals (e.g., `10`, `58`)
+* `address` literals (e.g., `0x12`, `0x0000000000000000000000000000000f`)
+* hexadecimal strings (e.g., `'x"0012"'` will parse as the `vector<u8>` value `[00, 12]`)
+* ASCII strings (e.g., `'b"hi"'` will parse as the `vector<u8>` value `[68, 69]`)
+
+### Publishing new modules
+
+When executing a transaction script you'll often want to call into different
+Move modules, like in the example above with the `Debug` module. New modules can
+be added to the `sources` directory in the package where the CLI is being
+invoked. You can also add dependencies on other packages to have access to the
+modules that they define (just like we did with the `Debug` module above). The
+`move sandbox run` command will compile and publish each module in the package, and
+in each of the package's transitive dependencies, before running the given script.
+
+Try saving this code in `sources/Test.move`:
+
+```rust
+// sources/Test.move
+module 0x2::Test {
+    use std::signer;
+
+    struct Resource has key { i: u64 }
+
+    public fun publish(account: &signer) {
+        move_to(account, Resource { i: 10 })
+    }
+
+    public fun write(account: &signer, i: u64) acquires Resource {
+        borrow_global_mut<Resource>(signer::address_of(account)).i = i;
+    }
+
+    public fun unpublish(account: &signer) acquires Resource {
+        let Resource { i: _ } = move_from(signer::address_of(account));
+  }
+}
+```
+
+Now, try
+
+```shell
+$ move build
+```
+
+This will cause the CLI to compile and typecheck the modules under
+`sources`, but it won't publish the module bytecode under `storage`. You can
+compile and publish the module by running the `move sandbox publish` command
+(here we pass the `-v` or verbose flag to get a better understanding of what's
+happening):
+
+```shell
+$ move sandbox publish -v
+Found 1 modules
+Publishing a new module 00000000000000000000000000000002::Test (wrote 253 bytes)
+Wrote 253 bytes of module ID's and code
+```
+
+Now, if we take a look under `storage`, we will see the published bytecode
+for our `Test` module:
+
+```shell
+$ ls storage/0x00000000000000000000000000000002/modules
+Test.mv
+```
+
+We can also inspect the compiled bytecode in storage using `move sandbox view`:
+
+```shell
+$ move sandbox view storage/0x00000000000000000000000000000002/modules/Test.mv
+module 2.Test {
+struct Resource has key {
+  i: u64
+}
+
+public publish() {
+  0: MoveLoc[0](Arg0: &signer)
+  1: LdU64(10)
+  2: Pack[0](Resource)
+  3: MoveTo[0](Resource)
+  4: Ret
+}
+public unpublish() {
+  0: MoveLoc[0](Arg0: &signer)
+  1: Call[3](address_of(&signer): address)
+  2: MoveFrom[0](Resource)
+  3: Unpack[0](Resource)
+  4: Pop
+  5: Ret
+}
+public write() {
+  0: CopyLoc[1](Arg1: u64)
+  1: MoveLoc[0](Arg0: &signer)
+  2: Call[3](address_of(&signer): address)
+  3: MutBorrowGlobal[0](Resource)
+  4: MutBorrowField[0](Resource.i: u64)
+  5: WriteRef
+  6: Ret
+}
+}
+```
+
+You can also look at the compiled bytecode before publishing to `storage` by
+running either `move disassemble --name <module_name>` or `move
+disassemble --name <module_name> --interactive` to interactively inspect the
+bytecode and how it relates to the Move source code:
+
+```shell
+$ move disassemble --name Test --interactive # You can quit by pressing "q"
+$ move disassemble --name Test
+// Move bytecode v4
+module 2.Test {
+struct Resource has key {
+        i: u64
+}
+
+public publish() {
+B0:
+        0: MoveLoc[0](account: &signer)
+        1: LdU64(10)
+        2: Pack[0](Resource)
+        3: MoveTo[0](Resource)
+        4: Ret
+}
+public unpublish() {
+B0:
+        0: MoveLoc[0](account: &signer)
+        1: Call[3](address_of(&signer): address)
+        2: MoveFrom[0](Resource)
+        3: Unpack[0](Resource)
+        4: Pop
+        5: Ret
+}
+public write() {
+B0:
+        0: CopyLoc[1](i: u64)
+        1: MoveLoc[0](account: &signer)
+        2: Call[3](address_of(&signer): address)
+        3: MutBorrowGlobal[0](Resource)
+        4: MutBorrowField[0](Resource.i: u64)
+        5: WriteRef
+        6: Ret
+}
+}
+```
+
+### Updating state
+
+Let's exercise our new `Test` module by running the following script:
+
+```rust
+// sources/test_script.move
+script {
+use 0x2::Test;
+fun test_script(account: signer) {
+    Test::publish(&account)
+}
+}
+```
+
+This script invokes the `publish` function of our `Test` module, which will
+publish a resource of type `Test::Resource` under the signer's account.
+Let's first see what this script will change without committing those
+changes first. We can do this by passing the `--dry-run` flag:
+
+```shell
+$ move sandbox run sources/test_script.move --signers 0xf -v --dry-run
+Compiling transaction script...
+Changed resource(s) under 1 address(es):
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
+    Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
+Wrote 40 bytes of resource ID's and data
+      key 0x2::Test::Resource {
+           i: 10
+      }
+Discarding changes; re-run without --dry-run if you would like to keep them.
+```
+
+Everything looks good, so we can run this again, but this time commit the
+changes by removing the `--dry-run` flag:
+
+```shell
+$ move sandbox run sources/test_script.move --signers 0xf -v
+Compiling transaction script...
+Changed resource(s) under 1 address(es):
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
+    Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
+Wrote 40 bytes of resource ID's and data
+      key 0x2::Test::Resource {
+            i: 10
+      }
+```
+
+While the verbose flag used above (`-v`) shows resource changes, it is also
+possible to view them manually.
+We can inspect the newly published resource using `move sandbox view` since
+the change has been committed:
+
+```shell
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+key 0x2::Test::Resource {
+    i: 10
+}
+```
+
+#### Cleaning state
+
+Since state persists from one call to the Move CLI to another, there will
+frequently be times where you want to start again at a clean state.  This
+can be done using the `move sandbox clean` command which will remove the
+`storage` and `build` directories:
+
+```shell
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+resource 0x2::Test::Resource {
+        i: 10
+}
+$ move sandbox clean
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+Error: `move sandbox view <file>` must point to a valid file under storage
+```
+
+### Expected Value Testing with the Move CLI
+
+As mentioned previously, Move has a unit testing framework. However, unit tests
+cannot test everything -- in particular testing for events cannot be easily
+done. To help with writing tests that need to check for events, and expect
+specific states, the Move CLI also has a built-in expected-value testing
+framework. Each test is run independently in its own sandbox so state does not
+persist from one test to another.
+
+Each test is structured as a Move package along with an additional `args.txt` file that
+specifies a sequence of Move CLI commands that should be run in that
+directory.
+Additionally, there must be an `args.exp` file that contain the expected
+output from running the sequence of Move CLI commands specified in the
+`args.txt` file for that test.
+
+For example, if we wanted to create a Move CLI test that reran all of the
+commands that we've seen so far, we could do so by adding an `args.txt`
+to the `readme` directory that we created at the start and that we've been
+adding scripts and modules to:
+
+```
+readme/
+├── args.txt
+├── Move.toml
+└── sources
+    ├── debug_script.move
+    ├── Test.move
+    └── test_script.move
+```
+
+And, where the `args.txt` file contains the following Move CLI commands:
+
+```shell
+$ cd ..
+$ cat readme/args.txt
+## Arg files can have comments!
+sandbox run sources/debug_script.move --signers 0xf
+sandbox run sources/debug_script.move --signers 0xf
+build
+sandbox publish
+sandbox view storage/0x00000000000000000000000000000002/modules/Test.mv
+sandbox run sources/test_script.move --signers 0xf -v
+sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+```
+
+We can then use the `move sandbox test` command and point it at the `readme` directory to run each of these
+Move CLI commands for us in sequence:
+
+```shell
+$ move sandbox exp-test -p readme
+...<snipped output>
+0 / 1 test(s) passed.
+Error: 1 / 1 test(s) failed.
+```
+
+However, as we see this test will fail since there is no `args.exp` file for the test
+yet. We can generate this expectation file by setting the `UPDATE_BASELINE`
+environment variable when running the test:
+
+```shell
+$ UPDATE_BASELINE=1 move sandbox exp-test -p readme
+1 / 1 test(s) passed.
+```
+
+There should now be an `args.exp` file under the `readme` directory that
+contains the expected output of running the sequence of Move CLI commands
+in the `args.txt` file:
+
+```shell
+$ cat readme/args.exp
+Command `sandbox run sources/debug_script.move --signers 0xf`:
+[debug] (&) { 0000000000000000000000000000000f }
+Command `sandbox run sources/debug_script.move --signers 0xf --mode bare`:
+...
+```
+
+#### Testing with code coverage tracking
+
+Code coverage has been an important metric in software testing. In Move CLI expected value tests, we
+address the need for code coverage information with an additional flag,
+`--track-cov`, that can be passed to the `move sandbox exp-test` command.
+
+Note: To view coverage information, the Move CLI must be installed with the `--debug` flag;
+i.e., `cargo install --debug --path move/language/tools/move-cli`.
+
+Using our running example to illustrate:
+```shell
+$ move sandbox exp-test -p readme --track-cov
+1 / 1 test(s) passed.
+Module 00000000000000000000000000000002::Test
+        fun publish
+                total: 5
+                covered: 5
+                % coverage: 100.00
+        fun unpublish
+                total: 6
+                covered: 0
+                % coverage: 0.00
+        fun write
+                total: 7
+                covered: 0
+                % coverage: 0.00
+>>> % Module coverage: 27.78
+```
+
+The output indicates that not only the test is passed, but also that 100%
+instruction coverage is observed in the `publish` funciton. This is expected
+as the whole purpose of our `test_script.move` is to run the `publish` function.
+At the same time, the other two functions, `unpublish` and `write`, are never
+executed, making the average coverage 27.78% for the whole `Test` module.
+
+Internally, Move CLI uses the tracing feature provided by the Move VM to record
+which instructions in the compiled bytecode are executed and uses this
+information to calculate code coverage. Instruction coverage in Move can
+usually serve the purpose of line coverage in common C/C++/Rust coverage
+tracking tools.
+
+Note that the coverage information is aggregated across multiple `run` commands
+in `args.txt`. To illustrate this, suppose that we have another test script,
+`test_unpublish_script.move`, under `readme/sources` with the following
+content:
+
+```rust
+script {
+use 0x2::Test;
+fun test_unpublish_script(account: signer) {
+    Test::unpublish(&account)
+}
+}
+```
+
+We further add a new command to the end of `args.txt`
+(`args.exp` needs to be updated too).
+```shell
+sandbox run sources/test_unpublish_script.move --signers 0xf -v
+```
+
+Now we can re-test the `readme` again
+```shell
+$ move sandbox exp-test -p readme --track-cov
+1 / 1 test(s) passed.
+Module 00000000000000000000000000000002::Test
+        fun publish
+                total: 5
+                covered: 5
+                % coverage: 100.00
+        fun unpublish
+                total: 6
+                covered: 6
+                % coverage: 100.00
+        fun write
+                total: 7
+                covered: 0
+                % coverage: 0.00
+>>> % Module coverage: 61.11
+```
+
+This time, note that the `unpublish` function is 100% covered too and the
+overall module coverage is boosted to 61.11%.
+
+### Detecting breaking changes
+
+The `move sandbox publish` command automatically detects when upgrading a module may lead to a breaking change.
+There are two kinds of breaking changes:
+
+* Linking compatibility (e.g., removing or changing the signature of a public function that is invoked by other modules, removing a
+struct or resource type used by other modules)
+* Layout compatibility (e.g., adding/removing a resource or struct field)
+
+The breaking changes analysis performed by `move sandbox publish` is necessarily conservative. For example, say we `move sandbox publish` the following
+module:
+
+```
+address 0x2 {
+module M {
+    struct S has key { f: u64, g: u64 }
+}
+}
+```
+
+and then wish to upgrade it to the following:
+
+```
+address 0x2 {
+module M {
+    struct S has key { f: u64 }
+}
+}
+```
+
+Running `move sandbox publish` on this new version will fail:
+
+```
+Breaking change detected--publishing aborted. Re-run with --ignore-breaking-changes to publish anyway.
+Error: Layout API for structs of module 00000000000000000000000000000002::M has changed. Need to do a data migration of published structs
+```
+
+In this case, we know we have not published any instances of `S` in global storage, so it is safe to re-run `move sandbox publish --ignore-breaking-changes` (as recommended).
+We can double-check that this was not a breaking change by running `move sandbox doctor`.
+This handy command runs exhaustive sanity checks on global storage to detect any breaking changes that occurred in the past:
+* All modules pass the bytecode verifier
+* All modules link against their dependencies
+* All resources deserialize according to their declared types
+* All events deserialize according to their declared types
diff --git a/vendors/move/crates/move-cli/src/base/build.rs b/vendors/move/crates/move-cli/src/base/build.rs
new file mode 100644
index 000000000..b149d1228
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/build.rs
@@ -0,0 +1,29 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+/// Build the package at `path`. If no path is provided defaults to current directory.
+#[derive(Parser)]
+#[clap(name = "build")]
+pub struct Build;
+
+impl Build {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        if config.fetch_deps_only {
+            let mut config = config;
+            if config.test_mode {
+                config.dev_mode = true;
+            }
+            config.download_deps_for_package(&rerooted_path, &mut std::io::stdout())?;
+            return Ok(());
+        }
+
+        config.compile_package(&rerooted_path, &mut std::io::stdout())?;
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/coverage.rs b/vendors/move/crates/move-cli/src/base/coverage.rs
new file mode 100644
index 000000000..04afb45c8
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/coverage.rs
@@ -0,0 +1,110 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
+use move_coverage::{
+    coverage_map::CoverageMap, format_csv_summary, format_human_summary,
+    source_coverage::SourceCoverageBuilder, summary::summarize_inst_cov,
+};
+use move_disassembler::disassembler::Disassembler;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+#[derive(Parser)]
+pub enum CoverageSummaryOptions {
+    /// Display a coverage summary for all modules in this package
+    #[clap(name = "summary")]
+    Summary {
+        /// Whether function coverage summaries should be displayed
+        #[clap(long = "summarize-functions")]
+        functions: bool,
+        /// Output CSV data of coverage
+        #[clap(long = "csv")]
+        output_csv: bool,
+    },
+    /// Display coverage information about the module against source code
+    #[clap(name = "source")]
+    Source {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+    /// Display coverage information about the module against disassembled bytecode
+    #[clap(name = "bytecode")]
+    Bytecode {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+}
+
+/// Inspect test coverage for this package. A previous test run with the `--coverage` flag must
+/// have previously been run.
+#[derive(Parser)]
+#[clap(name = "coverage")]
+pub struct Coverage {
+    #[clap(subcommand)]
+    pub options: CoverageSummaryOptions,
+}
+
+impl Coverage {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let path = reroot_path(path)?;
+        let coverage_map = CoverageMap::from_binary_file(path.join(".coverage_map.mvcov"))?;
+        let package = config.compile_package(&path, &mut Vec::new())?;
+        let modules: Vec<_> = package
+            .root_modules()
+            .filter_map(|unit| match &unit.unit {
+                CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module.clone()),
+                _ => None,
+            })
+            .collect();
+        match self.options {
+            CoverageSummaryOptions::Source { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let source_path = &unit.source_path;
+                let (module, source_map) = match &unit.unit {
+                    CompiledUnit::Module(NamedCompiledModule {
+                        module, source_map, ..
+                    }) => (module, source_map),
+                    _ => panic!("Should all be modules"),
+                };
+                let source_coverage = SourceCoverageBuilder::new(module, &coverage_map, source_map);
+                source_coverage
+                    .compute_source_coverage(source_path)
+                    .output_source_coverage(&mut std::io::stdout())
+                    .unwrap();
+            }
+            CoverageSummaryOptions::Summary {
+                functions,
+                output_csv,
+                ..
+            } => {
+                let coverage_map = coverage_map.to_unified_exec_map();
+                if output_csv {
+                    format_csv_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                    )
+                } else {
+                    format_human_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                        functions,
+                    )
+                }
+            }
+            CoverageSummaryOptions::Bytecode { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let mut disassembler = Disassembler::from_unit(&unit.unit);
+                disassembler.add_coverage_map(coverage_map.to_unified_exec_map());
+                println!("{}", disassembler.disassemble()?);
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/disassemble.rs b/vendors/move/crates/move-cli/src/base/disassemble.rs
new file mode 100644
index 000000000..95bf5e69d
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/disassemble.rs
@@ -0,0 +1,84 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, CompiledUnitEnum, NamedCompiledModule};
+use move_disassembler::disassembler::Disassembler;
+use move_package::{compilation::compiled_package::CompiledUnitWithSource, BuildConfig};
+use std::path::PathBuf;
+
+/// Disassemble the Move bytecode pointed to
+#[derive(Parser)]
+#[clap(name = "disassemble")]
+pub struct Disassemble {
+    /// Start a disassembled bytecode-to-source explorer
+    #[clap(long = "interactive")]
+    pub interactive: bool,
+    /// The package name. If not provided defaults to current package modules only
+    #[clap(long = "package")]
+    pub package_name: Option<String>,
+    /// The name of the module or script in the package to disassemble
+    #[clap(long = "name")]
+    pub module_or_script_name: String,
+    /// Also print the raw disassembly using Rust's Debug output, at the end.
+    #[clap(long = "Xdebug")]
+    pub debug: bool,
+}
+
+impl Disassemble {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            interactive,
+            package_name,
+            module_or_script_name,
+            debug,
+        } = self;
+        // Make sure the package is built
+        let package = config.compile_package(&rerooted_path, &mut Vec::new())?;
+        let needle_package = package_name
+            .as_deref()
+            .unwrap_or(package.compiled_package_info.package_name.as_str());
+        match package
+            .get_module_by_name(needle_package, &module_or_script_name)
+            .or_else(|_| package.get_script_by_name(needle_package, &module_or_script_name))
+            .ok()
+        {
+            None => anyhow::bail!(
+                "Unable to find module or script with name '{}' in package '{}'",
+                module_or_script_name,
+                needle_package,
+            ),
+            Some(unit) => {
+                // Once we find the compiled bytecode we're interested in, startup the bytecode
+                // viewer, run the disassembler, or display the debug output, depending on args.
+                if interactive {
+                    match unit {
+                        CompiledUnitWithSource {
+                            unit:
+                                CompiledUnit::Module(NamedCompiledModule {
+                                    module, source_map, ..
+                                }),
+                            source_path,
+                        } => move_bytecode_viewer::start_viewer_in_memory(
+                            module.clone(),
+                            source_map.clone(),
+                            source_path,
+                        ),
+                        _ => anyhow::bail!("Interactive disassembler not supported for scripts"),
+                    }
+                } else {
+                    println!("{}", Disassembler::from_unit(&unit.unit).disassemble()?);
+                    if debug {
+                        match &unit.unit {
+                            CompiledUnitEnum::Module(module) => println!("\n{:#?}", module.module),
+                            CompiledUnitEnum::Script(script) => println!("\n{:#?}", script.script),
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/docgen.rs b/vendors/move/crates/move-cli/src/base/docgen.rs
new file mode 100644
index 000000000..a458cb9c3
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/docgen.rs
@@ -0,0 +1,125 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_docgen::DocgenOptions;
+use move_package::{BuildConfig, ModelConfig};
+use std::{fs, path::PathBuf};
+
+/// Generate javadoc style documentation for Move packages
+#[derive(Parser)]
+#[clap(name = "docgen")]
+pub struct Docgen {
+    /// The level where we start sectioning. Often markdown sections are rendered with
+    /// unnecessary large section fonts, setting this value high reduces the size
+    #[clap(long = "section-level-start", value_name = "HEADER_LEVEL")]
+    pub section_level_start: Option<usize>,
+    /// Whether to exclude private functions in the generated docs
+    #[clap(long = "exclude-private-fun")]
+    pub exclude_private_fun: bool,
+    /// Whether to exclude specifications in the generated docs
+    #[clap(long = "exclude-specs")]
+    pub exclude_specs: bool,
+    /// Whether to put specifications in the same section as a declaration or put them all
+    /// into an independent section
+    #[clap(long = "independent-specs")]
+    pub independent_specs: bool,
+    /// Whether to exclude Move implementations
+    #[clap(long = "exclude-impl")]
+    pub exclude_impl: bool,
+    /// Max depth to which sections are displayed in table-of-contents
+    #[clap(long = "toc-depth", value_name = "DEPTH")]
+    pub toc_depth: Option<usize>,
+    /// Do not use collapsed sections (<details>) for impl and specs
+    #[clap(long = "no-collapsed-sections")]
+    pub no_collapsed_sections: bool,
+    /// In which directory to store output
+    #[clap(long = "output-directory", value_name = "PATH")]
+    pub output_directory: Option<String>,
+    /// A template for documentation generation. Can be multiple
+    #[clap(long = "template", short = 't', value_name = "FILE")]
+    pub template: Vec<String>,
+    /// An optional file containing reference definitions. The content of this file will
+    /// be added to each generated markdown doc
+    #[clap(long = "references-file", value_name = "FILE")]
+    pub references_file: Option<String>,
+    /// Whether to include dependency diagrams in the generated docs
+    #[clap(long = "include-dep-diagrams")]
+    pub include_dep_diagrams: bool,
+    /// Whether to include call diagrams in the generated docs
+    #[clap(long = "include-call-diagrams")]
+    pub include_call_diagrams: bool,
+    /// If this is being compiled relative to a different place where it will be stored (output directory)
+    #[clap(long = "compile-relative-to-output-dir")]
+    pub compile_relative_to_output_dir: bool,
+}
+
+impl Docgen {
+    /// Calling the Docgen
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let model = config.move_model_for_package(
+            &reroot_path(path).unwrap(),
+            ModelConfig {
+                all_files_as_targets: false,
+                target_filter: None,
+            },
+        )?;
+
+        let mut options = DocgenOptions::default();
+
+        if !self.template.is_empty() {
+            options.root_doc_templates = self.template;
+        }
+        if self.section_level_start.is_some() {
+            options.section_level_start = self.section_level_start.unwrap();
+        }
+        if self.exclude_private_fun {
+            options.include_private_fun = false;
+        }
+        if self.exclude_specs {
+            options.include_specs = false;
+        }
+        if self.independent_specs {
+            options.specs_inlined = false;
+        }
+        if self.exclude_impl {
+            options.include_impl = false;
+        }
+        if self.toc_depth.is_some() {
+            options.toc_depth = self.toc_depth.unwrap();
+        }
+        if self.no_collapsed_sections {
+            options.collapsed_sections = false;
+        }
+        if self.output_directory.is_some() {
+            options.output_directory = self.output_directory.unwrap();
+        }
+        if self.references_file.is_some() {
+            options.references_file = self.references_file;
+        }
+        if self.compile_relative_to_output_dir {
+            options.compile_relative_to_output_dir = true;
+        }
+
+        // We are using the full namespace, since we already use `Docgen` here.
+        // Docgen is the most suitable name for both: this Docgen subcommand,
+        // and the actual move_docgen::Docgen.
+        let generator = move_docgen::Docgen::new(&model, &options);
+
+        for (file, content) in generator.gen() {
+            let path = PathBuf::from(&file);
+            fs::create_dir_all(path.parent().unwrap())?;
+            fs::write(path.as_path(), content)?;
+            println!("Generated {:?}", path);
+        }
+
+        anyhow::ensure!(
+            !model.has_errors(),
+            "Errors encountered while generating documentation!"
+        );
+
+        println!("\nDocumentation generation successful!");
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/errmap.rs b/vendors/move/crates/move-cli/src/base/errmap.rs
new file mode 100644
index 000000000..82c3fe9a5
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/errmap.rs
@@ -0,0 +1,50 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::{BuildConfig, ModelConfig};
+use std::path::PathBuf;
+
+/// Generate error map for the package and its dependencies at `path` for use by the Move
+/// explanation tool.
+#[derive(Parser)]
+#[clap(name = "errmap")]
+pub struct Errmap {
+    /// The prefix that all error reasons within modules will be prefixed with, e.g., "E" if
+    /// all error reasons are "E_CANNOT_PERFORM_OPERATION", "E_CANNOT_ACCESS", etc.
+    #[clap(long)]
+    pub error_prefix: Option<String>,
+    /// The file to serialize the generated error map to.
+    #[clap(long, default_value = "error_map")]
+    pub output_file: PathBuf,
+}
+
+impl Errmap {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            error_prefix,
+            output_file,
+        } = self;
+        let mut errmap_options = move_errmapgen::ErrmapOptions::default();
+        if let Some(err_prefix) = error_prefix {
+            errmap_options.error_prefix = err_prefix;
+        }
+        errmap_options.output_file = output_file
+            .with_extension(move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION)
+            .to_string_lossy()
+            .to_string();
+        let model = config.move_model_for_package(
+            &rerooted_path,
+            ModelConfig {
+                all_files_as_targets: true,
+                target_filter: None,
+            },
+        )?;
+        let mut errmap_gen = move_errmapgen::ErrmapGen::new(&model, &errmap_options);
+        errmap_gen.gen();
+        errmap_gen.save_result();
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/info.rs b/vendors/move/crates/move-cli/src/base/info.rs
new file mode 100644
index 000000000..0811f3986
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/info.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+/// Print address information.
+#[derive(Parser)]
+#[clap(name = "info")]
+pub struct Info;
+
+impl Info {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        config
+            .resolution_graph_for_package(&rerooted_path, &mut std::io::stdout())?
+            .print_info()
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/mod.rs b/vendors/move/crates/move-cli/src/base/mod.rs
new file mode 100644
index 000000000..62db9a5b8
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/mod.rs
@@ -0,0 +1,24 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod build;
+pub mod coverage;
+pub mod disassemble;
+pub mod docgen;
+pub mod errmap;
+pub mod info;
+pub mod new;
+pub mod prove;
+pub mod test;
+
+use move_package::source_package::layout::SourcePackageLayout;
+use std::path::PathBuf;
+
+pub fn reroot_path(path: Option<PathBuf>) -> anyhow::Result<PathBuf> {
+    let path = path.unwrap_or_else(|| PathBuf::from("."));
+    // Always root ourselves to the package root, and then compile relative to that.
+    let rooted_path = SourcePackageLayout::try_find_root(&path.canonicalize()?)?;
+    std::env::set_current_dir(rooted_path).unwrap();
+
+    Ok(PathBuf::from("."))
+}
diff --git a/vendors/move/crates/move-cli/src/base/new.rs b/vendors/move/crates/move-cli/src/base/new.rs
new file mode 100644
index 000000000..838e3d629
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/new.rs
@@ -0,0 +1,86 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::*;
+use move_package::source_package::layout::SourcePackageLayout;
+use std::{
+    fmt::Display,
+    fs::create_dir_all,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+pub const MOVE_STDLIB_PACKAGE_NAME: &str = "MoveStdlib";
+pub const MOVE_STDLIB_PACKAGE_PATH: &str = "{ \
+    git = \"https://github.com/move-language/move.git\", \
+    subdir = \"language/move-stdlib\", rev = \"main\" \
+}";
+pub const MOVE_STDLIB_ADDR_NAME: &str = "std";
+pub const MOVE_STDLIB_ADDR_VALUE: &str = "0x1";
+
+/// Create a new Move package with name `name` at `path`. If `path` is not provided the package
+/// will be created in the directory `name`.
+#[derive(Parser)]
+#[clap(name = "new")]
+pub struct New {
+    /// The name of the package to be created.
+    pub name: String,
+}
+
+impl New {
+    pub fn execute_with_defaults(self, path: Option<PathBuf>) -> anyhow::Result<()> {
+        self.execute(
+            path,
+            "0.0.0",
+            [(MOVE_STDLIB_PACKAGE_NAME, MOVE_STDLIB_PACKAGE_PATH)],
+            [(MOVE_STDLIB_ADDR_NAME, MOVE_STDLIB_ADDR_VALUE)],
+            "",
+        )
+    }
+
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        version: &str,
+        deps: impl IntoIterator<Item = (impl Display, impl Display)>,
+        addrs: impl IntoIterator<Item = (impl Display, impl Display)>,
+        custom: &str, // anything else that needs to end up being in Move.toml (or empty string)
+    ) -> anyhow::Result<()> {
+        // TODO warn on build config flags
+        let Self { name } = self;
+        let p: PathBuf;
+        let path: &Path = match path {
+            Some(path) => {
+                p = path;
+                &p
+            }
+            None => Path::new(&name),
+        };
+        create_dir_all(path.join(SourcePackageLayout::Sources.path()))?;
+        let mut w = std::fs::File::create(path.join(SourcePackageLayout::Manifest.path()))?;
+        writeln!(
+            &mut w,
+            "[package]
+name = \"{name}\"
+version = \"{version}\"
+
+[dependencies]"
+        )?;
+        for (dep_name, dep_val) in deps {
+            writeln!(w, "{dep_name} = {dep_val}")?;
+        }
+
+        writeln!(
+            w,
+            "
+[addresses]"
+        )?;
+        for (addr_name, addr_val) in addrs {
+            writeln!(w, "{addr_name} = \"{addr_val}\"")?;
+        }
+        if !custom.is_empty() {
+            writeln!(w, "{}", custom)?;
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/base/prove.rs b/vendors/move/crates/move-cli/src/base/prove.rs
new file mode 100644
index 000000000..f72cf553b
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/prove.rs
@@ -0,0 +1,234 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use anyhow::bail;
+use clap::Parser;
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use colored::Colorize;
+use move_package::{BuildConfig, ModelConfig};
+use move_prover::run_move_prover_with_model;
+use std::{
+    io::Write,
+    path::{Path, PathBuf},
+    time::Instant,
+};
+use tempfile::TempDir;
+
+#[derive(Parser, Debug)]
+pub enum ProverOptions {
+    // Pass through unknown commands to the prover Clap parser
+    #[clap(
+        external_subcommand,
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    Options(Vec<String>),
+}
+
+/// Run the Move Prover on the package at `path`. If no path is provided defaults to current
+/// directory. Use `.. prove .. -- <options>` to pass on options to the prover.
+#[derive(Parser)]
+#[clap(name = "prove")]
+pub struct Prove {
+    /// The target filter used to prune the modules to verify. Modules with a name that contains
+    /// this string will be part of verification.
+    #[clap(short = 't', long = "target")]
+    pub target_filter: Option<String>,
+    /// Internal field indicating that this prover run is for a test.
+    #[clap(skip)]
+    pub for_test: bool,
+    /// Any options passed to the prover.
+    #[clap(subcommand)]
+    pub options: Option<ProverOptions>,
+}
+
+impl Prove {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            target_filter,
+            for_test,
+            options,
+        } = self;
+        let opts = match options {
+            Some(ProverOptions::Options(opts)) => opts,
+            _ => vec![],
+        };
+        let mut args = vec!["package".to_string()];
+        let prover_toml = Path::new(&rerooted_path).join("Prover.toml");
+        if prover_toml.exists() {
+            args.push(format!("--config={}", prover_toml.to_string_lossy()));
+        }
+        args.extend(opts.iter().cloned());
+        let options = move_prover::cli::Options::create_from_args(&args)?;
+        if for_test {
+            options.setup_logging_for_test();
+        } else {
+            options.setup_logging();
+        }
+
+        run_move_prover(config, &rerooted_path, &target_filter, for_test, options)
+    }
+}
+
+// =================================================================================================
+// API for Rust unit tests
+
+/// Data representing the configuration of a prover test.
+pub struct ProverTest {
+    path: String,
+    options: Vec<String>,
+    local_only: bool,
+}
+
+impl ProverTest {
+    /// Creates a new prover test for the Move package at path relative to crate root.
+    pub fn create(path: impl Into<String>) -> Self {
+        ProverTest {
+            path: path.into(),
+            options: vec![],
+            local_only: false,
+        }
+    }
+
+    /// Set specific prover options.
+    pub fn with_options(self, options: &[&str]) -> Self {
+        self.with_options_owned(options.iter().map(|s| s.to_string()).collect())
+    }
+
+    /// Set specific prover options, from vector of strings.
+    pub fn with_options_owned(self, options: Vec<String>) -> Self {
+        Self { options, ..self }
+    }
+
+    /// Restrict this test to only run locally (not in CI)
+    pub fn with_local_only(self) -> Self {
+        Self {
+            local_only: true,
+            ..self
+        }
+    }
+
+    /// Run the prover test.
+    pub fn run(mut self) {
+        if self.local_only && in_ci() {
+            return;
+        }
+        // Save current directory -- unfortunately the package system currently modifies it.
+        // This treatment also requires us to run prover tests sequentially.
+        // TODO: fix the side-effect in the package system, which makes it impossible to
+        //   parallelize package based tests.
+        let saved_cd = std::env::current_dir().expect("current directory");
+        let pkg_path = path_in_crate(std::mem::take(&mut self.path));
+        let cmd = Prove {
+            target_filter: None,
+            for_test: true,
+            options: Some(ProverOptions::Options(std::mem::take(&mut self.options))),
+        };
+        let res = cmd.execute(Some(pkg_path), move_package::BuildConfig::default());
+        std::env::set_current_dir(saved_cd).expect("restore current directory");
+        res.unwrap()
+    }
+}
+
+fn in_ci() -> bool {
+    get_env("ENV_TEST_ON_CI") == "1"
+}
+
+/// Determine path in this crate. We can't use CARGO_MANIFEST_DIR for this because
+/// we need the path of the caller. However, we can assume that cargo test
+/// runs in the root dir of the crate, so we can just directly use the relative path.
+fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    PathBuf::from(relative.into())
+}
+
+fn get_env(var: &str) -> String {
+    std::env::var(var).unwrap_or_else(|_| String::new())
+}
+
+// =================================================================================================
+// Running the prover as a package command
+
+pub fn run_move_prover(
+    mut config: BuildConfig,
+    path: &Path,
+    target_filter: &Option<String>,
+    for_test: bool,
+    mut options: move_prover::cli::Options,
+) -> anyhow::Result<()> {
+    // Always run the prover in dev mode, so addresses get default assignments
+    config.dev_mode = true;
+
+    if !options.move_sources.is_empty() {
+        bail!(
+            "move prover options must not specify sources as those are given \
+                     by the package system. Did you meant to prefix `{}` with `-t`?",
+            &options.move_sources[0]
+        );
+    }
+    if !options.move_deps.is_empty() {
+        bail!(
+            "move prover options must not specify dependencies as those are given \
+                     by the package system"
+        );
+    }
+    if !options.move_named_address_values.is_empty() {
+        bail!(
+            "move prover options must not specify named addresses as those are given \
+                     by the package system"
+        );
+    }
+
+    let mut message_writer = StandardStream::stdout(ColorChoice::Auto);
+    let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+    if for_test {
+        options.set_quiet();
+    }
+    let now = Instant::now();
+    let model = config.move_model_for_package(
+        path,
+        ModelConfig {
+            all_files_as_targets: false,
+            target_filter: target_filter.clone(),
+        },
+    )?;
+    let _temp_dir_holder = if for_test {
+        // Need to ensure a distinct output.bpl file for concurrent execution. In non-test
+        // mode, we actually want to use the static output.bpl for debugging purposes
+        let temp_dir = TempDir::new()?;
+        std::fs::create_dir_all(temp_dir.path())?;
+        options.output_path = temp_dir
+            .path()
+            .join("output.bpl")
+            .to_string_lossy()
+            .to_string();
+        Some(temp_dir)
+    } else {
+        None
+    };
+    let res = run_move_prover_with_model(&model, &mut error_writer, options, Some(now));
+    if for_test {
+        let basedir = path
+            .file_name()
+            .map(|s| s.to_string_lossy().to_string())
+            .unwrap_or_default();
+        writeln!(
+            message_writer,
+            "{} proving {} modules from package `{}` in {:.3}s",
+            if res.is_ok() {
+                "SUCCESS".bold().green()
+            } else {
+                "FAILURE".bold().red()
+            },
+            model.get_target_modules().len(),
+            basedir,
+            now.elapsed().as_secs_f64()
+        )?;
+    }
+    res
+}
diff --git a/vendors/move/crates/move-cli/src/base/test.rs b/vendors/move/crates/move-cli/src/base/test.rs
new file mode 100644
index 000000000..47b13f91a
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/base/test.rs
@@ -0,0 +1,248 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use crate::NativeFunctionRecord;
+use anyhow::Result;
+use clap::*;
+use move_command_line_common::files::{FileHash, MOVE_COVERAGE_MAP_EXTENSION};
+use move_compiler::{
+    diagnostics::{self},
+    shared::{NumberFormat, NumericalAddress},
+    unit_test::{plan_builder::construct_test_plan, TestPlan},
+    PASS_CFGIR,
+};
+use move_coverage::coverage_map::{output_map_to_file, CoverageMap};
+use move_package::{compilation::build_plan::BuildPlan, BuildConfig};
+use move_unit_test::UnitTestingConfig;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    collections::HashMap,
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    process::ExitStatus,
+};
+// if windows
+#[cfg(target_family = "windows")]
+use std::os::windows::process::ExitStatusExt;
+// if unix
+#[cfg(target_family = "unix")]
+use std::os::unix::prelude::ExitStatusExt;
+// if not windows nor unix
+#[cfg(not(any(target_family = "windows", target_family = "unix")))]
+compile_error!("Unsupported OS, currently we only support windows and unix family");
+
+/// Run Move unit tests in this package.
+#[derive(Parser)]
+#[clap(name = "test")]
+pub struct Test {
+    /// Bound the amount of gas used by any one test.
+    #[clap(name = "gas-limit", short = 'i', long = "gas-limit")]
+    pub gas_limit: Option<u64>,
+    /// An optional filter string to determine which unit tests to run. A unit test will be run only if it
+    /// contains this string in its fully qualified (<addr>::<module_name>::<fn_name>) name.
+    #[clap(name = "filter")]
+    pub filter: Option<String>,
+    /// List all tests
+    #[clap(name = "list", short = 'l', long = "list")]
+    pub list: bool,
+    /// Number of threads to use for running tests.
+    #[clap(
+        name = "num-threads",
+        default_value = "8",
+        short = 't',
+        long = "threads"
+    )]
+    pub num_threads: usize,
+    /// Report test statistics at the end of testing. CSV report generated if 'csv' passed
+    #[clap(name = "report-statistics", short = 's', long = "statistics")]
+    pub report_statistics: Option<Option<String>>,
+
+    /// Use the stackless bytecode interpreter to run the tests and cross check its results with
+    /// the execution result from Move VM.
+    #[clap(long = "stackless")]
+    pub check_stackless_vm: bool,
+    /// Verbose mode
+    #[clap(long = "verbose")]
+    pub verbose_mode: bool,
+    /// Collect coverage information for later use with the various `move coverage` subcommands. Currently supported only in debug builds.
+    #[clap(long = "coverage")]
+    pub compute_coverage: bool,
+}
+
+impl Test {
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        config: BuildConfig,
+        natives: Vec<NativeFunctionRecord>,
+        cost_table: Option<CostTable>,
+    ) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            check_stackless_vm,
+            verbose_mode,
+            compute_coverage,
+        } = self;
+        let unit_test_config = UnitTestingConfig {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            check_stackless_vm,
+            verbose: verbose_mode,
+            ..UnitTestingConfig::default_with_bound(None)
+        };
+        let result = run_move_unit_tests(
+            &rerooted_path,
+            config,
+            unit_test_config,
+            natives,
+            cost_table,
+            compute_coverage,
+            &mut std::io::stdout(),
+            &mut std::io::stdout(),
+        )?;
+
+        // Return a non-zero exit code if any test failed
+        if let UnitTestResult::Failure = result {
+            std::process::exit(1)
+        }
+        Ok(())
+    }
+}
+
+/// Encapsulates the possible returned states when running unit tests on a move package.
+#[derive(PartialEq, Eq, Debug)]
+pub enum UnitTestResult {
+    Success,
+    Failure,
+}
+
+pub fn run_move_unit_tests<CW: Write + Send, TW: Write + Send>(
+    pkg_path: &Path,
+    mut build_config: move_package::BuildConfig,
+    mut unit_test_config: UnitTestingConfig,
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: Option<CostTable>,
+    compute_coverage: bool,
+    compiler_writer: &mut CW,
+    test_writer: &mut TW,
+) -> Result<UnitTestResult> {
+    let mut test_plan = None;
+    build_config.test_mode = true;
+    build_config.dev_mode = true;
+
+    // Build the resolution graph (resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer)
+    let resolution_graph = build_config.resolution_graph_for_package(pkg_path, &mut Vec::new())?;
+
+    // Note: unit_test_config.named_address_values is always set to vec![] (the default value) before
+    // being passed in.
+    unit_test_config.named_address_values = resolution_graph
+        .extract_named_address_mapping()
+        .map(|(name, addr)| {
+            (
+                name.to_string(),
+                NumericalAddress::new(addr.into_bytes(), NumberFormat::Hex),
+            )
+        })
+        .collect();
+
+    // Get the source files for all modules. We need this in order to report source-mapped error
+    // messages.
+    let dep_file_map: HashMap<_, _> = resolution_graph
+        .package_table
+        .iter()
+        .flat_map(|(_, rpkg)| {
+            rpkg.get_sources(&resolution_graph.build_options)
+                .unwrap()
+                .iter()
+                .map(|fname| {
+                    let contents = fs::read_to_string(Path::new(fname.as_str())).unwrap();
+                    let fhash = FileHash::new(&contents);
+                    (fhash, (*fname, contents))
+                })
+                .collect::<HashMap<_, _>>()
+        })
+        .collect();
+    let root_package = resolution_graph.root_package();
+    let build_plan = BuildPlan::create(resolution_graph)?;
+    // Compile the package. We need to intercede in the compilation, process being performed by the
+    // Move package system, to first grab the compilation env, construct the test plan from it, and
+    // then save it, before resuming the rest of the compilation and returning the results and
+    // control back to the Move package system.
+    build_plan.compile_with_driver(compiler_writer, |compiler| {
+        let (files, comments_and_compiler_res) = compiler.run::<PASS_CFGIR>().unwrap();
+        let (_, compiler) =
+            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
+        let (mut compiler, cfgir) = compiler.into_ast();
+        let compilation_env = compiler.compilation_env();
+        let built_test_plan = construct_test_plan(compilation_env, Some(root_package), &cfgir);
+
+        let compilation_result = compiler.at_cfgir(cfgir).build();
+        let (units, warnings) =
+            diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
+        diagnostics::report_warnings(&files, warnings);
+        test_plan = Some((built_test_plan, files.clone(), units.clone()));
+        Ok((files, units))
+    })?;
+
+    let (test_plan, mut files, units) = test_plan.unwrap();
+    files.extend(dep_file_map);
+    let test_plan = test_plan.unwrap();
+    let no_tests = test_plan.is_empty();
+    let test_plan = TestPlan::new(test_plan, files, units);
+
+    let trace_path = pkg_path.join(".trace");
+    let coverage_map_path = pkg_path
+        .join(".coverage_map")
+        .with_extension(MOVE_COVERAGE_MAP_EXTENSION);
+    let cleanup_trace = || {
+        if compute_coverage && trace_path.exists() {
+            std::fs::remove_file(&trace_path).unwrap();
+        }
+    };
+
+    cleanup_trace();
+
+    // If we need to compute test coverage set the VM tracking environment variable since we will
+    // need this trace to construct the coverage information.
+    if compute_coverage {
+        std::env::set_var("MOVE_VM_TRACE", &trace_path);
+    }
+
+    // Run the tests. If any of the tests fail, then we don't produce a coverage report, so cleanup
+    // the trace files.
+    if !unit_test_config
+        .run_and_report_unit_tests(test_plan, Some(natives), cost_table, test_writer)
+        .unwrap()
+        .1
+    {
+        cleanup_trace();
+        return Ok(UnitTestResult::Failure);
+    }
+
+    // Compute the coverage map. This will be used by other commands after this.
+    if compute_coverage && !no_tests {
+        let coverage_map = CoverageMap::from_trace_file(trace_path);
+        output_map_to_file(coverage_map_path, &coverage_map).unwrap();
+    }
+    Ok(UnitTestResult::Success)
+}
+
+impl From<UnitTestResult> for ExitStatus {
+    fn from(result: UnitTestResult) -> Self {
+        match result {
+            UnitTestResult::Success => ExitStatus::from_raw(0),
+            UnitTestResult::Failure => ExitStatus::from_raw(1),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/lib.rs b/vendors/move/crates/move-cli/src/lib.rs
new file mode 100644
index 000000000..ccc72a353
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/lib.rs
@@ -0,0 +1,130 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use base::{
+    build::Build, coverage::Coverage, disassemble::Disassemble, docgen::Docgen, errmap::Errmap,
+    info::Info, new::New, prove::Prove, test::Test,
+};
+use move_package::BuildConfig;
+
+pub mod base;
+pub mod sandbox;
+
+/// Default directory where saved Move resources live
+pub const DEFAULT_STORAGE_DIR: &str = "storage";
+
+/// Default directory for build output
+pub const DEFAULT_BUILD_DIR: &str = ".";
+
+use anyhow::Result;
+use clap::Parser;
+use move_core_types::{
+    account_address::AccountAddress, errmap::ErrorMapping, identifier::Identifier,
+};
+use move_vm_runtime::native_functions::NativeFunction;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::path::PathBuf;
+
+type NativeFunctionRecord = (AccountAddress, Identifier, Identifier, NativeFunction);
+
+#[derive(Parser)]
+#[clap(author, version, about)]
+pub struct Move {
+    /// Path to a package which the command should be run with respect to.
+    #[clap(long = "path", short = 'p', global = true)]
+    pub package_path: Option<PathBuf>,
+
+    /// Print additional diagnostics if available.
+    #[clap(short = 'v', global = true)]
+    pub verbose: bool,
+
+    /// Package build options
+    #[clap(flatten)]
+    pub build_config: BuildConfig,
+}
+
+/// MoveCLI is the CLI that will be executed by the `move-cli` command
+/// The `cmd` argument is added here rather than in `Move` to make it
+/// easier for other crates to extend `move-cli`
+#[derive(Parser)]
+pub struct MoveCLI {
+    #[clap(flatten)]
+    pub move_args: Move,
+
+    #[clap(subcommand)]
+    pub cmd: Command,
+}
+
+#[derive(Parser)]
+pub enum Command {
+    Build(Build),
+    Coverage(Coverage),
+    Disassemble(Disassemble),
+    Docgen(Docgen),
+    Errmap(Errmap),
+    Info(Info),
+    New(New),
+    Prove(Prove),
+    Test(Test),
+    /// Execute a sandbox command.
+    #[clap(name = "sandbox")]
+    Sandbox {
+        /// Directory storing Move resources, events, and module bytecodes produced by module publishing
+        /// and script execution.
+        #[clap(long, default_value = DEFAULT_STORAGE_DIR)]
+        storage_dir: PathBuf,
+        #[clap(subcommand)]
+        cmd: sandbox::cli::SandboxCommand,
+    },
+}
+
+pub fn run_cli(
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+    move_args: Move,
+    cmd: Command,
+) -> Result<()> {
+    // TODO: right now, the gas metering story for move-cli (as a library) is a bit of a mess.
+    //         1. It's still using the old CostTable.
+    //         2. The CostTable only affects sandbox runs, but not unit tests, which use a unit cost table.
+    match cmd {
+        Command::Build(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Coverage(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Disassemble(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Docgen(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Errmap(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Info(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::New(c) => c.execute_with_defaults(move_args.package_path),
+        Command::Prove(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Test(c) => c.execute(
+            move_args.package_path,
+            move_args.build_config,
+            natives,
+            Some(cost_table.clone()),
+        ),
+        Command::Sandbox { storage_dir, cmd } => cmd.handle_command(
+            natives,
+            cost_table,
+            error_descriptions,
+            &move_args,
+            &storage_dir,
+        ),
+    }
+}
+
+pub fn move_cli(
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+) -> Result<()> {
+    let args = MoveCLI::parse();
+    run_cli(
+        natives,
+        cost_table,
+        error_descriptions,
+        args.move_args,
+        args.cmd,
+    )
+}
diff --git a/vendors/move/crates/move-cli/src/main.rs b/vendors/move/crates/move-cli/src/main.rs
new file mode 100644
index 000000000..d95ab4f03
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/main.rs
@@ -0,0 +1,23 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_core_types::{account_address::AccountAddress, errmap::ErrorMapping};
+use move_stdlib::natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters};
+
+fn main() -> Result<()> {
+    let error_descriptions: ErrorMapping = bcs::from_bytes(move_stdlib::error_descriptions())?;
+    let cost_table = &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE;
+    let addr = AccountAddress::from_hex_literal("0x1").unwrap();
+    let natives = all_natives(addr, GasParameters::zeros())
+        .into_iter()
+        .chain(nursery_natives(
+            /* silent */ false,
+            addr,
+            NurseryGasParameters::zeros(),
+        ))
+        .collect();
+
+    move_cli::move_cli(natives, cost_table, &error_descriptions)
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/cli.rs b/vendors/move/crates/move-cli/src/sandbox/cli.rs
new file mode 100644
index 000000000..f76416f24
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/cli.rs
@@ -0,0 +1,314 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::{
+        self,
+        utils::{on_disk_state_view::OnDiskStateView, PackageContext},
+    },
+    Move, NativeFunctionRecord, DEFAULT_BUILD_DIR,
+};
+use anyhow::Result;
+use clap::Parser;
+use move_core_types::{
+    errmap::ErrorMapping, language_storage::TypeTag, parser,
+    transaction_argument::TransactionArgument,
+};
+use move_package::compilation::package_layout::CompiledPackageLayout;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+#[derive(Parser)]
+pub enum SandboxCommand {
+    /// Compile the modules in this package and its dependencies and publish the resulting bytecodes in global storage.
+    #[clap(name = "publish")]
+    Publish {
+        /// By default, code that might cause breaking changes for bytecode
+        /// linking or data layout compatibility checks will not be published.
+        /// Set this flag to ignore breaking changes checks and publish anyway.
+        #[clap(long = "ignore-breaking-changes")]
+        ignore_breaking_changes: bool,
+        /// If set, publish not only the modules in this package but also
+        /// modules in all its dependencies.
+        #[clap(long = "with-deps")]
+        with_deps: bool,
+        /// If set, all modules at once as a bundle. The default is to publish
+        /// modules sequentially.
+        #[clap(long = "bundle")]
+        bundle: bool,
+        /// Manually specify the publishing order of modules.
+        #[clap(
+            long = "override-ordering",
+            num_args(1..),
+            action = clap::ArgAction::Append,
+        )]
+        override_ordering: Option<Vec<String>>,
+    },
+    /// Run a Move script that reads/writes resources stored on disk in `storage-dir`.
+    /// The script must be defined in the package.
+    #[clap(name = "run")]
+    Run {
+        /// Path to .mv file containing either script or module bytecodes. If the file is a module, the
+        /// `script_name` parameter must be set.
+        #[clap(name = "script")]
+        script_file: PathBuf,
+        /// Name of the script function inside `script_file` to call. Should only be set if `script_file`
+        /// points to a module.
+        #[clap(name = "name")]
+        script_name: Option<String>,
+        /// Possibly-empty list of signers for the current transaction (e.g., `account` in
+        /// `main(&account: signer)`). Must match the number of signers expected by `script_file`.
+        #[clap(
+            long = "signers",
+            num_args(1..),
+            action = clap::ArgAction::Append,
+        )]
+        signers: Vec<String>,
+        /// Possibly-empty list of arguments passed to the transaction (e.g., `i` in
+        /// `main(i: u64)`). Must match the arguments types expected by `script_file`.
+        /// Supported argument types are
+        /// bool literals (true, false),
+        /// u64 literals (e.g., 10, 58),
+        /// address literals (e.g., 0x12, 0x0000000000000000000000000000000f),
+        /// hexadecimal strings (e.g., x"0012" will parse as the vector<u8> value [00, 12]), and
+        /// ASCII strings (e.g., 'b"hi" will parse as the vector<u8> value [68, 69]).
+        #[clap(
+            long = "args",
+            value_parser = parser::parse_transaction_argument,
+            num_args(1..),
+            action = clap::ArgAction::Append,
+        )]
+        args: Vec<TransactionArgument>,
+        /// Possibly-empty list of type arguments passed to the transaction (e.g., `T` in
+        /// `main<T>()`). Must match the type arguments kinds expected by `script_file`.
+        #[clap(
+            long = "type-args",
+            value_parser = parser::parse_type_tag,
+            num_args(1..),
+            action = clap::ArgAction::Append,
+        )]
+        type_args: Vec<TypeTag>,
+        /// Maximum number of gas units to be consumed by execution.
+        /// When the budget is exhaused, execution will abort.
+        /// By default, no `gas-budget` is specified and gas metering is disabled.
+        #[clap(long = "gas-budget", short = 'g')]
+        gas_budget: Option<u64>,
+        /// If set, the effects of executing `script_file` (i.e., published, updated, and
+        /// deleted resources) will NOT be committed to disk.
+        #[clap(long = "dry-run", short = 'n')]
+        dry_run: bool,
+    },
+    /// Run expected value tests using the given batch file.
+    #[clap(name = "exp-test")]
+    Test {
+        /// Use an ephemeral directory to serve as the testing workspace.
+        /// By default, the directory containing the `args.txt` will be the workspace.
+        #[clap(long = "use-temp-dir")]
+        use_temp_dir: bool,
+        /// Show coverage information after tests are done.
+        /// By default, coverage will not be tracked nor shown.
+        #[clap(long = "track-cov")]
+        track_cov: bool,
+    },
+    /// View Move resources, events files, and modules stored on disk.
+    #[clap(name = "view")]
+    View {
+        /// Path to a resource, events file, or module stored on disk.
+        #[clap(name = "file")]
+        file: PathBuf,
+    },
+    /// Delete all resources, events, and modules stored on disk under `storage-dir`.
+    /// Does *not* delete anything in `src`.
+    Clean {},
+    /// Run well-formedness checks on the `storage-dir` and `install-dir` directories.
+    #[clap(name = "doctor")]
+    Doctor {},
+    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`
+    // TODO: expand this to generate script bindings, etc.?.
+    #[clap(name = "generate")]
+    Generate {
+        #[clap(subcommand)]
+        cmd: GenerateCommand,
+    },
+}
+
+#[derive(Parser)]
+pub enum GenerateCommand {
+    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`.
+    #[clap(name = "struct-layouts")]
+    StructLayouts {
+        /// Path to a module stored on disk.
+        #[clap(long)]
+        module: PathBuf,
+        /// If set, generate bindings for the specified struct and type arguments. If unset,
+        /// generate bindings for all closed struct definitions.
+        #[clap(flatten)]
+        options: StructLayoutOptions,
+    },
+}
+#[derive(Parser)]
+pub struct StructLayoutOptions {
+    /// Generate layout bindings for this struct.
+    #[clap(id = "struct", long = "struct")]
+    struct_: Option<String>,
+    /// Generate layout bindings for `struct` bound to these type arguments.
+    #[clap(
+        long = "type-args",
+        value_parser = parser::parse_type_tag,
+        requires="struct",
+        action = clap::ArgAction::Append,
+        num_args(1..),
+    )]
+    type_args: Option<Vec<TypeTag>>,
+    /// If set, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If unset, use the same syntax as Move source
+    #[clap(long = "separator")]
+    separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    #[clap(long = "omit-addresses")]
+    omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    #[clap(long = "ignore-phantom-types")]
+    ignore_phantom_types: bool,
+    /// If set, generate bindings only for the struct passed in.
+    /// When unset, generates bindings for the struct and all of its transitive dependencies.
+    #[clap(long = "shallow")]
+    shallow: bool,
+}
+
+impl SandboxCommand {
+    pub fn handle_command(
+        &self,
+        natives: Vec<NativeFunctionRecord>,
+        cost_table: &CostTable,
+        error_descriptions: &ErrorMapping,
+        move_args: &Move,
+        storage_dir: &Path,
+    ) -> Result<()> {
+        match self {
+            SandboxCommand::Publish {
+                ignore_breaking_changes,
+                with_deps,
+                bundle,
+                override_ordering,
+            } => {
+                let context =
+                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
+                let state = context.prepare_state(storage_dir)?;
+                sandbox::commands::publish(
+                    natives,
+                    cost_table,
+                    &state,
+                    context.package(),
+                    *ignore_breaking_changes,
+                    *with_deps,
+                    *bundle,
+                    override_ordering.as_ref().map(|o| o.as_slice()),
+                    move_args.verbose,
+                )
+            }
+            SandboxCommand::Run {
+                script_file,
+                script_name,
+                signers,
+                args,
+                type_args,
+                gas_budget,
+                dry_run,
+            } => {
+                let context =
+                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
+                let state = context.prepare_state(storage_dir)?;
+                sandbox::commands::run(
+                    natives,
+                    cost_table,
+                    error_descriptions,
+                    &state,
+                    context.package(),
+                    script_file,
+                    script_name,
+                    signers,
+                    args,
+                    type_args.to_vec(),
+                    *gas_budget,
+                    *dry_run,
+                    move_args.verbose,
+                )
+            }
+            SandboxCommand::Test {
+                use_temp_dir,
+                track_cov,
+            } => sandbox::commands::run_all(
+                move_args
+                    .package_path
+                    .as_deref()
+                    .unwrap_or_else(|| Path::new(".")),
+                &std::env::current_exe()?,
+                *use_temp_dir,
+                *track_cov,
+            ),
+            SandboxCommand::View { file } => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(storage_dir)?;
+                sandbox::commands::view(&state, file)
+            }
+            SandboxCommand::Clean {} => {
+                // delete storage
+                let storage_dir = Path::new(storage_dir);
+                if storage_dir.exists() {
+                    fs::remove_dir_all(storage_dir)?;
+                }
+
+                // delete build
+                let build_dir = Path::new(
+                    &move_args
+                        .build_config
+                        .install_dir
+                        .as_ref()
+                        .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR)),
+                )
+                .join(CompiledPackageLayout::Root.path());
+                if build_dir.exists() {
+                    fs::remove_dir_all(&build_dir)?;
+                }
+                Ok(())
+            }
+            SandboxCommand::Doctor {} => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(storage_dir)?;
+                sandbox::commands::doctor(&state)
+            }
+            SandboxCommand::Generate { cmd } => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(storage_dir)?;
+                handle_generate_commands(cmd, &state)
+            }
+        }
+    }
+}
+
+fn handle_generate_commands(cmd: &GenerateCommand, state: &OnDiskStateView) -> Result<()> {
+    match cmd {
+        GenerateCommand::StructLayouts { module, options } => {
+            sandbox::commands::generate::generate_struct_layouts(
+                module,
+                &options.struct_,
+                &options.type_args,
+                options.separator.clone(),
+                options.omit_addresses,
+                options.ignore_phantom_types,
+                options.shallow,
+                state,
+            )
+        }
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/doctor.rs b/vendors/move/crates/move-cli/src/sandbox/commands/doctor.rs
new file mode 100644
index 000000000..dcb86d702
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/doctor.rs
@@ -0,0 +1,55 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use move_binary_format::{access::ModuleAccess, errors::PartialVMError};
+use move_bytecode_utils::Modules;
+use move_core_types::vm_status::StatusCode;
+
+use anyhow::{bail, Result};
+
+/// Run sanity checks on storage and build dirs. This is primarily intended for testing the CLI;
+/// doctor should never fail unless `publish --ignore-breaking changes` is used or files under
+/// `storage` or `build` are modified manually. This runs the following checks:
+/// (1) all modules pass the bytecode verifier
+/// (2) all modules pass the linker
+/// (3) build/mv_interfaces is consistent with the global storage (TODO?)
+pub fn doctor(state: &OnDiskStateView) -> Result<()> {
+    // verify and link each module
+    let all_modules = state.get_all_modules()?;
+    let code_cache = Modules::new(&all_modules);
+    for module in &all_modules {
+        if move_bytecode_verifier::verify_module_unmetered(module).is_err() {
+            bail!("Failed to verify module {:?}", module.self_id())
+        }
+
+        let imm_deps = code_cache.get_immediate_dependencies(&module.self_id())?;
+        if move_bytecode_verifier::dependencies::verify_module(module, imm_deps).is_err() {
+            bail!(
+                "Failed to link module {:?} against its dependencies",
+                module.self_id()
+            )
+        }
+
+        let cyclic_check_result =
+            move_bytecode_verifier::cyclic_dependencies::verify_module(module, |module_id| {
+                code_cache
+                    .get_module(module_id)
+                    .map_err(|_| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+                    .map(|m| m.immediate_dependencies())
+            });
+        if let Err(cyclic_check_error) = cyclic_check_result {
+            assert_eq!(
+                cyclic_check_error.major_status(),
+                StatusCode::CYCLIC_MODULE_DEPENDENCY
+            );
+            bail!(
+                "Cyclic module dependencies are detected with module {} in the loop",
+                module.self_id()
+            )
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/generate.rs b/vendors/move/crates/move-cli/src/sandbox/commands/generate.rs
new file mode 100644
index 000000000..567a46ef4
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/generate.rs
@@ -0,0 +1,55 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use anyhow::{bail, Result};
+use move_bytecode_utils::layout::{SerdeLayoutBuilder, SerdeLayoutConfig};
+use move_core_types::{
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+};
+use std::path::Path;
+
+pub fn generate_struct_layouts(
+    path: &Path,
+    struct_opt: &Option<String>,
+    type_params_opt: &Option<Vec<TypeTag>>,
+    separator: Option<String>,
+    omit_addresses: bool,
+    ignore_phantom_types: bool,
+    shallow: bool,
+    state: &OnDiskStateView,
+) -> Result<()> {
+    if let Some(module_id) = state.get_module_id(path) {
+        if let Some(struct_) = struct_opt {
+            // Generate for one struct
+            let type_params = type_params_opt.as_ref().cloned().unwrap_or_default();
+            let name = Identifier::new(struct_.as_str())?;
+            let struct_tag = StructTag {
+                address: *module_id.address(),
+                module: module_id.name().to_owned(),
+                name,
+                type_params,
+            };
+            let mut layout_builder = SerdeLayoutBuilder::new_with_config(
+                &state,
+                SerdeLayoutConfig {
+                    separator,
+                    omit_addresses,
+                    ignore_phantom_types,
+                    shallow,
+                },
+            );
+            layout_builder.build_struct_layout(&struct_tag)?;
+            let layout = serde_yaml::to_string(layout_builder.registry())?;
+            state.save_struct_layouts(&layout)?;
+            println!("{}", layout);
+        } else {
+            unimplemented!("Generating layout for all structs in a module. Use the --module and --struct options")
+        }
+        Ok(())
+    } else {
+        bail!("Can't resolve module at {:?}", path)
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/mod.rs b/vendors/move/crates/move-cli/src/sandbox/commands/mod.rs
new file mode 100644
index 000000000..452822c35
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/mod.rs
@@ -0,0 +1,16 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod doctor;
+pub mod generate;
+pub mod publish;
+pub mod run;
+pub mod test;
+pub mod view;
+
+pub use doctor::*;
+pub use publish::*;
+pub use run::*;
+pub use test::*;
+pub use view::*;
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/publish.rs b/vendors/move/crates/move-cli/src/sandbox/commands/publish.rs
new file mode 100644
index 000000000..baa073837
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/publish.rs
@@ -0,0 +1,178 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::utils::{
+        explain_publish_changeset, explain_publish_error, get_gas_status, module,
+        on_disk_state_view::OnDiskStateView,
+    },
+    NativeFunctionRecord,
+};
+use anyhow::{bail, Result};
+use move_binary_format::errors::Location;
+use move_command_line_common::env::get_bytecode_version_from_env;
+use move_package::compilation::compiled_package::CompiledPackage;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::collections::BTreeMap;
+
+pub fn publish(
+    natives: impl IntoIterator<Item = NativeFunctionRecord>,
+    cost_table: &CostTable,
+    state: &OnDiskStateView,
+    package: &CompiledPackage,
+    ignore_breaking_changes: bool,
+    with_deps: bool,
+    bundle: bool,
+    override_ordering: Option<&[String]>,
+    verbose: bool,
+) -> Result<()> {
+    // collect all modules compiled
+    let compiled_modules = if with_deps {
+        package.all_modules().collect::<Vec<_>>()
+    } else {
+        package.root_modules().collect::<Vec<_>>()
+    };
+    if verbose {
+        println!("Found {} modules", compiled_modules.len());
+    }
+
+    // order the modules for publishing
+    let modules_to_publish = match override_ordering {
+        Some(ordering) => {
+            let module_map: BTreeMap<_, _> = compiled_modules
+                .into_iter()
+                .map(|unit| (unit.unit.name().to_string(), unit))
+                .collect();
+
+            let mut ordered_modules = vec![];
+            for name in ordering {
+                match module_map.get(name) {
+                    None => bail!("Invalid module name in publish ordering: {}", name),
+                    Some(unit) => {
+                        ordered_modules.push(*unit);
+                    }
+                }
+            }
+            ordered_modules
+        }
+        None => compiled_modules,
+    };
+
+    let republished = modules_to_publish
+        .iter()
+        .filter_map(|unit| {
+            let id = module(&unit.unit).ok()?.self_id();
+            if state.has_module(&id) {
+                Some(format!("{}", id))
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>();
+
+    if !republished.is_empty() {
+        eprintln!(
+            "Tried to republish the following modules: {}",
+            republished.join(", ")
+        );
+        return Ok(());
+    }
+
+    let bytecode_version = get_bytecode_version_from_env();
+
+    // use the the publish_module API from the VM if we do not allow breaking changes
+    if !ignore_breaking_changes {
+        let vm = MoveVM::new(natives).unwrap();
+        let mut gas_status = get_gas_status(cost_table, None)?;
+        let mut session = vm.new_session(state);
+        let mut has_error = false;
+
+        if bundle {
+            // publish all modules together as a bundle
+            let mut sender_opt = None;
+            let mut module_bytes_vec = vec![];
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                module_bytes_vec.push(module_bytes);
+
+                let module_address = *module(&unit.unit)?.self_id().address();
+                match &sender_opt {
+                    None => {
+                        sender_opt = Some(module_address);
+                    }
+                    Some(val) => {
+                        if val != &module_address {
+                            bail!("All modules in the bundle must share the same address");
+                        }
+                    }
+                }
+            }
+            match sender_opt {
+                None => bail!("No modules to publish"),
+                Some(sender) => {
+                    let res =
+                        session.publish_module_bundle(module_bytes_vec, sender, &mut gas_status);
+                    if let Err(err) = res {
+                        println!("Invalid multi-module publishing: {}", err);
+                        if let Location::Module(module_id) = err.location() {
+                            // find the module where error occures and explain
+                            if let Some(unit) = modules_to_publish
+                                .into_iter()
+                                .find(|&x| x.unit.name().as_str() == module_id.name().as_str())
+                            {
+                                explain_publish_error(err, state, unit)?
+                            } else {
+                                println!("Unable to locate the module in the multi-module publishing error");
+                            }
+                        }
+                        has_error = true;
+                    }
+                }
+            }
+        } else {
+            // publish modules sequentially, one module at a time
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                let id = module(&unit.unit)?.self_id();
+                let sender = *id.address();
+
+                let res = session.publish_module(module_bytes, sender, &mut gas_status);
+                if let Err(err) = res {
+                    explain_publish_error(err, state, unit)?;
+                    has_error = true;
+                    break;
+                }
+            }
+        }
+
+        if !has_error {
+            let (changeset, events) = session.finish().0.map_err(|e| e.into_vm_status())?;
+            assert!(events.is_empty());
+            if verbose {
+                explain_publish_changeset(&changeset);
+            }
+            let modules: Vec<_> = changeset
+                .into_modules()
+                .map(|(module_id, blob_opt)| {
+                    (module_id, blob_opt.ok().expect("must be non-deletion"))
+                })
+                .collect();
+            state.save_modules(&modules)?;
+        }
+    } else {
+        // NOTE: the VM enforces the most strict way of module republishing and does not allow
+        // backward incompatible changes, as as result, if this flag is set, we skip the VM process
+        // and force the CLI to override the on-disk state directly
+        let mut serialized_modules = vec![];
+        for unit in modules_to_publish {
+            let id = module(&unit.unit)?.self_id();
+            let module_bytes = unit.unit.serialize(bytecode_version);
+            serialized_modules.push((id, module_bytes));
+        }
+        state.save_modules(&serialized_modules)?;
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/run.rs b/vendors/move/crates/move-cli/src/sandbox/commands/run.rs
new file mode 100644
index 000000000..0dae0b61f
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/run.rs
@@ -0,0 +1,149 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::utils::{
+        contains_module, explain_execution_error, get_gas_status, is_bytecode_file,
+        on_disk_state_view::OnDiskStateView,
+    },
+    NativeFunctionRecord,
+};
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::file_format::CompiledModule;
+use move_command_line_common::{env::get_bytecode_version_from_env, files::try_exists};
+use move_core_types::{
+    account_address::AccountAddress,
+    errmap::ErrorMapping,
+    identifier::IdentStr,
+    language_storage::TypeTag,
+    runtime_value::MoveValue,
+    transaction_argument::{convert_txn_args, TransactionArgument},
+};
+use move_package::compilation::compiled_package::CompiledPackage;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
+#[cfg(debug_assertions)]
+use move_vm_types::gas::GasMeter;
+use std::{fs, path::Path};
+
+pub fn run(
+    natives: impl IntoIterator<Item = NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+    state: &OnDiskStateView,
+    package: &CompiledPackage,
+    script_path: &Path,
+    script_name_opt: &Option<String>,
+    signers: &[String],
+    txn_args: &[TransactionArgument],
+    vm_type_tags: Vec<TypeTag>,
+    gas_budget: Option<u64>,
+    _dry_run: bool,
+    _verbose: bool,
+) -> Result<()> {
+    if !try_exists(script_path)? {
+        bail!("Script file {:?} does not exist", script_path)
+    };
+    let bytecode_version = get_bytecode_version_from_env();
+
+    let bytecode = if is_bytecode_file(script_path) {
+        assert!(
+            state.is_module_path(script_path) || !contains_module(script_path),
+            "Attempting to run module {:?} outside of the `storage/` directory.
+move run` must be applied to a module inside `storage/`",
+            script_path
+        );
+        // script bytecode; read directly from file
+        fs::read(script_path)?
+    } else {
+        // TODO(tzakian): support calling scripts in transitive deps
+        let file_contents = std::fs::read_to_string(script_path)?;
+        let script_opt = package
+            .scripts()
+            .find(|unit| unit.unit.source_map().check(&file_contents));
+        // script source file; package is already compiled so load it up
+        match script_opt {
+            Some(unit) => unit.unit.serialize(bytecode_version),
+            None => bail!("Unable to find script in file {:?}", script_path),
+        }
+    };
+
+    let signer_addresses = signers
+        .iter()
+        .map(|s| AccountAddress::from_hex_literal(s))
+        .collect::<Result<Vec<AccountAddress>, _>>()?;
+    // TODO: parse Value's directly instead of going through the indirection of TransactionArgument?
+    let vm_args: Vec<Vec<u8>> = convert_txn_args(txn_args);
+
+    let vm = MoveVM::new(natives).unwrap();
+    let mut gas_status = get_gas_status(cost_table, gas_budget)?;
+    let mut session = vm.new_session(state);
+
+    let script_type_parameters = vec![];
+    let script_parameters = vec![];
+
+    let script_type_arguments = vm_type_tags
+        .iter()
+        .map(|tag| session.load_type(tag))
+        .collect::<Result<Vec<_>, _>>()?;
+
+    // TODO rethink move-cli arguments for executing functions
+    let vm_args = signer_addresses
+        .iter()
+        .map(|a| {
+            MoveValue::Signer(*a)
+                .simple_serialize()
+                .expect("transaction arguments must serialize")
+        })
+        .chain(vm_args)
+        .collect();
+    let res = match script_name_opt {
+        Some(script_name) => {
+            // script fun. parse module, extract script ID to pass to VM
+            let module = CompiledModule::deserialize_with_defaults(&bytecode)
+                .map_err(|e| anyhow!("Error deserializing module: {:?}", e))?;
+            #[cfg(debug_assertions)]
+            {
+                let gas_rem: u64 = gas_status.remaining_gas().into();
+                gas_status.set_profiler(GasProfiler::init(
+                    &session.vm_config().profiler_config,
+                    script_name.clone(),
+                    gas_rem,
+                ));
+            }
+
+            session.execute_entry_function(
+                &module.self_id(),
+                IdentStr::new(script_name)?,
+                script_type_arguments,
+                vm_args,
+                &mut gas_status,
+            )
+        }
+        None => session.execute_script(
+            bytecode.to_vec(),
+            script_type_arguments,
+            vm_args,
+            &mut gas_status,
+        ),
+    };
+
+    if let Err(err) = res {
+        explain_execution_error(
+            error_descriptions,
+            err,
+            state,
+            &script_type_parameters,
+            &script_parameters,
+            &vm_type_tags,
+            &signer_addresses,
+            txn_args,
+        )
+    } else {
+        let (_changeset, _events) = session.finish().0.map_err(|e| e.into_vm_status())?;
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/test.rs b/vendors/move/crates/move-cli/src/sandbox/commands/test.rs
new file mode 100644
index 000000000..be9d7ba5c
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/test.rs
@@ -0,0 +1,393 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{sandbox::utils::module, DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
+
+use move_command_line_common::{
+    env::read_bool_env_var,
+    files::{find_filenames, path_to_string},
+    testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT},
+};
+use move_compiler::command_line::COLOR_MODE_ENV_VAR;
+use move_coverage::coverage_map::{CoverageMap, ExecCoverageMapWithModules};
+use move_package::{
+    compilation::{compiled_package::OnDiskCompiledPackage, package_layout::CompiledPackageLayout},
+    resolution::resolution_graph::ResolvedGraph,
+    source_package::{layout::SourcePackageLayout, manifest_parser::parse_move_manifest_from_file},
+    BuildConfig,
+};
+use std::{
+    collections::{BTreeMap, HashMap},
+    env,
+    fmt::Write as FmtWrite,
+    fs::{self, File},
+    io::{self, BufRead, Write},
+    path::{Path, PathBuf},
+    process::Command,
+};
+use tempfile::tempdir;
+
+/// Basic datatest testing framework for the CLI. The `run_one` entrypoint expects
+/// an `args.txt` file with arguments that the `move` binary understands (one set
+/// of arguments per line). The testing framework runs the commands, compares the
+/// result to the expected output, and runs `move clean` to discard resources,
+/// modules, and event data created by running the test.
+
+/// If this env var is set, `move clean` will not be run after each test.
+/// this is useful if you want to look at the `storage` or `move_events`
+/// produced by a test. However, you'll have to manually run `move clean`
+/// before re-running the test.
+const NO_MOVE_CLEAN: &str = "NO_MOVE_CLEAN";
+
+/// The filename that contains the arguments to the Move binary.
+pub const TEST_ARGS_FILENAME: &str = "args.txt";
+
+/// Name of the environment variable we need to set in order to get tracing
+/// enabled in the move VM.
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+/// The default file name (inside the build output dir) for the runtime to
+/// dump the execution trace to. The trace will be used by the coverage tool
+/// if --track-cov is set. If --track-cov is not set, then no trace file will
+/// be produced.
+const DEFAULT_TRACE_FILE: &str = "trace";
+
+fn collect_coverage(
+    trace_file: &Path,
+    build_dir: &Path,
+) -> anyhow::Result<ExecCoverageMapWithModules> {
+    let canonical_build = build_dir.canonicalize().unwrap();
+    let package_name = parse_move_manifest_from_file(
+        &SourcePackageLayout::try_find_root(&canonical_build).unwrap(),
+    )?
+    .package
+    .name
+    .to_string();
+    let pkg = OnDiskCompiledPackage::from_path(
+        &build_dir
+            .join(package_name)
+            .join(CompiledPackageLayout::BuildInfo.path()),
+    )?
+    .into_compiled_package()?;
+    let src_modules = pkg
+        .all_modules()
+        .map(|unit| {
+            let absolute_path = path_to_string(&unit.source_path.canonicalize()?)?;
+            Ok((absolute_path, module(&unit.unit)?.clone()))
+        })
+        .collect::<anyhow::Result<HashMap<_, _>>>()?;
+
+    // build the filter
+    let mut filter = BTreeMap::new();
+    for (entry, module) in src_modules.into_iter() {
+        let module_id = module.self_id();
+        filter
+            .entry(*module_id.address())
+            .or_insert_with(BTreeMap::new)
+            .insert(module_id.name().to_owned(), (entry, module));
+    }
+
+    // collect filtered trace
+    let coverage_map = CoverageMap::from_trace_file(trace_file)
+        .to_unified_exec_map()
+        .into_coverage_map_with_modules(filter);
+
+    Ok(coverage_map)
+}
+
+fn determine_package_nest_depth(
+    resolution_graph: &ResolvedGraph,
+    pkg_dir: &Path,
+) -> anyhow::Result<usize> {
+    let mut depth = 0;
+    for (_, dep) in resolution_graph.package_table.iter() {
+        depth = std::cmp::max(
+            depth,
+            dep.package_path.strip_prefix(pkg_dir)?.components().count() + 1,
+        );
+    }
+    Ok(depth)
+}
+
+fn pad_tmp_path(tmp_dir: &Path, pad_amount: usize) -> anyhow::Result<PathBuf> {
+    let mut tmp_dir = tmp_dir.to_path_buf();
+    for i in 0..pad_amount {
+        tmp_dir.push(format!("{}", i));
+    }
+    std::fs::create_dir_all(&tmp_dir)?;
+    Ok(tmp_dir)
+}
+
+// We need to copy dependencies over (transitively) and at the same time keep the paths valid in
+// the package. To do this we compute the resolution graph for all possible dependencies (so in dev
+// mode) and then calculate the nesting under `tmp_dir` the we need to copy the root package so
+// that it, and all its dependencies reside under `tmp_dir` with the same paths as in the original
+// package manifest.
+fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
+    // Sometimes we run a test that isn't a package for metatests so if there isn't a package we
+    // don't need to nest at all. Resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer.
+    let package_resolution = match (BuildConfig {
+        dev_mode: true,
+        ..Default::default()
+    })
+    .resolution_graph_for_package(pkg_dir, &mut Vec::new())
+    {
+        Ok(pkg) => pkg,
+        Err(_) => return Ok(tmp_dir.to_path_buf()),
+    };
+    let package_nest_depth = determine_package_nest_depth(&package_resolution, pkg_dir)?;
+    let tmp_dir = pad_tmp_path(tmp_dir, package_nest_depth)?;
+    for (_, dep) in package_resolution.package_table.iter() {
+        let source_dep_path = &dep.package_path;
+        let dest_dep_path = tmp_dir.join(dep.package_path.strip_prefix(pkg_dir).unwrap());
+        if !dest_dep_path.exists() {
+            fs::create_dir_all(&dest_dep_path)?;
+        }
+        simple_copy_dir(&dest_dep_path, source_dep_path)?;
+    }
+    Ok(tmp_dir)
+}
+
+fn simple_copy_dir(dst: &Path, src: &Path) -> io::Result<()> {
+    for entry in fs::read_dir(src)? {
+        let src_entry = entry?;
+        let src_entry_path = src_entry.path();
+        let dst_entry_path = dst.join(src_entry.file_name());
+        if src_entry_path.is_dir() {
+            fs::create_dir_all(&dst_entry_path)?;
+            simple_copy_dir(&dst_entry_path, &src_entry_path)?;
+        } else {
+            fs::copy(&src_entry_path, &dst_entry_path)?;
+        }
+    }
+    Ok(())
+}
+
+/// Run the `args_path` batch file with`cli_binary`
+pub fn run_one(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<Option<ExecCoverageMapWithModules>> {
+    let args_file = io::BufReader::new(File::open(args_path)?).lines();
+    let cli_binary_path = cli_binary.canonicalize()?;
+
+    // path where we will run the binary
+    let exe_dir = args_path.parent().unwrap();
+    let temp_dir = if use_temp_dir {
+        // symlink everything in the exe_dir into the temp_dir
+        let dir = tempdir()?;
+        let padded_dir = copy_deps(dir.path(), exe_dir)?;
+        simple_copy_dir(&padded_dir, exe_dir)?;
+        Some((dir, padded_dir))
+    } else {
+        None
+    };
+    let wks_dir = temp_dir.as_ref().map_or(exe_dir, |t| &t.1);
+
+    let storage_dir = wks_dir.join(DEFAULT_STORAGE_DIR);
+    let build_output = wks_dir
+        .join(DEFAULT_BUILD_DIR)
+        .join(CompiledPackageLayout::Root.path());
+
+    // template for preparing a cli command
+    let cli_command_template = || {
+        let mut command = Command::new(cli_binary_path.clone());
+        if let Some(work_dir) = temp_dir.as_ref() {
+            command.current_dir(&work_dir.1);
+        } else {
+            command.current_dir(exe_dir);
+        }
+        command
+    };
+
+    if storage_dir.exists() || build_output.exists() {
+        // need to clean before testing
+        cli_command_template()
+            .arg("sandbox")
+            .arg("clean")
+            .output()?;
+    }
+    let mut output = "".to_string();
+
+    // always use the absolute path for the trace file as we may change dirs in the process
+    let trace_file = if track_cov {
+        Some(wks_dir.canonicalize()?.join(DEFAULT_TRACE_FILE))
+    } else {
+        None
+    };
+
+    // Disable colors in error reporting from the Move compiler
+    env::set_var(COLOR_MODE_ENV_VAR, "NONE");
+    for args_line in args_file {
+        let args_line = args_line?;
+
+        if let Some(external_cmd) = args_line.strip_prefix('>') {
+            let external_cmd = external_cmd.trim_start();
+            let mut cmd_iter = external_cmd.split_ascii_whitespace();
+
+            let external_program = cmd_iter.next().expect("empty external command");
+
+            let mut command = Command::new(external_program);
+            command.args(cmd_iter);
+            if let Some(work_dir) = temp_dir.as_ref() {
+                command.current_dir(&work_dir.1);
+            } else {
+                command.current_dir(exe_dir);
+            }
+            let cmd_output = command.output()?;
+
+            writeln!(&mut output, "External Command `{}`:", external_cmd)?;
+            output += std::str::from_utf8(&cmd_output.stdout)?;
+            output += std::str::from_utf8(&cmd_output.stderr)?;
+
+            continue;
+        }
+
+        if args_line.starts_with('#') {
+            // allow comments in args.txt
+            continue;
+        }
+        let args_iter: Vec<&str> = args_line.split_whitespace().collect();
+        if args_iter.is_empty() {
+            // allow blank lines in args.txt
+            continue;
+        }
+
+        // enable tracing in the VM by setting the env var.
+        match &trace_file {
+            None => {
+                // this check prevents cascading the coverage tracking flag.
+                // in particular, if
+                //   1. we run with move-cli test <path-to-args-A.txt> --track-cov, and
+                //   2. in this <args-A.txt>, there is another command: test <args-B.txt>
+                // then, when running <args-B.txt>, coverage will not be tracked nor printed
+                env::remove_var(MOVE_VM_TRACING_ENV_VAR_NAME);
+            }
+            Some(path) => env::set_var(MOVE_VM_TRACING_ENV_VAR_NAME, path.as_os_str()),
+        }
+
+        let cmd_output = cli_command_template().args(args_iter).output()?;
+        writeln!(&mut output, "Command `{}`:", args_line)?;
+        output += std::str::from_utf8(&cmd_output.stdout)?;
+        output += std::str::from_utf8(&cmd_output.stderr)?;
+    }
+
+    // collect coverage information
+    let cov_info = match &trace_file {
+        None => None,
+        Some(trace_path) => {
+            if trace_path.exists() {
+                Some(collect_coverage(trace_path, &build_output)?)
+            } else {
+                eprintln!(
+                    "Trace file {:?} not found: coverage is only available with at least one `run` \
+                    command in the args.txt (after a `clean`, if there is one)",
+                    trace_path
+                );
+                None
+            }
+        }
+    };
+
+    // post-test cleanup and cleanup checks
+    // check that the test command didn't create a src dir
+    let run_move_clean = !read_bool_env_var(NO_MOVE_CLEAN);
+    if run_move_clean {
+        // run the clean command to ensure that temporary state is cleaned up
+        cli_command_template()
+            .arg("sandbox")
+            .arg("clean")
+            .output()?;
+
+        // check that build and storage was deleted
+        assert!(
+            !storage_dir.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_STORAGE_DIR
+        );
+        assert!(
+            !build_output.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_BUILD_DIR
+        );
+
+        // clean the trace file as well if it exists
+        if let Some(trace_path) = &trace_file {
+            if trace_path.exists() {
+                fs::remove_file(trace_path)?;
+            }
+        }
+    }
+
+    // release the temporary workspace explicitly
+    if let Some((t, _)) = temp_dir {
+        t.close()?;
+    }
+
+    // compare output and exp_file
+    let update_baseline = read_env_update_baseline();
+    let exp_path = args_path.with_extension(EXP_EXT);
+    if update_baseline {
+        fs::write(exp_path, &output)?;
+        return Ok(cov_info);
+    }
+
+    let expected_output = fs::read_to_string(exp_path).unwrap_or_else(|_| "".to_string());
+    if expected_output != output {
+        let msg = format!(
+            "Expected output differs from actual output:\n{}",
+            format_diff(expected_output, output)
+        );
+        anyhow::bail!(add_update_baseline_fix(msg))
+    } else {
+        Ok(cov_info)
+    }
+}
+
+pub fn run_all(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<()> {
+    let mut test_total: u64 = 0;
+    let mut test_passed: u64 = 0;
+    let mut cov_info = ExecCoverageMapWithModules::empty();
+
+    // find `args.txt` and iterate over them
+    for entry in find_filenames(&[args_path], |fpath| {
+        fpath.file_name().expect("unexpected file entry path") == TEST_ARGS_FILENAME
+    })? {
+        match run_one(Path::new(&entry), cli_binary, use_temp_dir, track_cov) {
+            Ok(cov_opt) => {
+                test_passed = test_passed.checked_add(1).unwrap();
+                if let Some(cov) = cov_opt {
+                    cov_info.merge(cov);
+                }
+            }
+            Err(ex) => eprintln!("Test {} failed with error: {}", entry, ex),
+        }
+        test_total = test_total.checked_add(1).unwrap();
+    }
+    println!("{} / {} test(s) passed.", test_passed, test_total);
+
+    // if any test fails, bail
+    let test_failed = test_total.checked_sub(test_passed).unwrap();
+    if test_failed != 0 {
+        anyhow::bail!("{} / {} test(s) failed.", test_failed, test_total)
+    }
+
+    // show coverage information if requested
+    if track_cov {
+        let mut summary_writer: Box<dyn Write> = Box::new(io::stdout());
+        for (_, module_summary) in cov_info.into_module_summaries() {
+            module_summary.summarize_human(&mut summary_writer, true)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/commands/view.rs b/vendors/move/crates/move-cli/src/sandbox/commands/view.rs
new file mode 100644
index 000000000..8f029f1ee
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/commands/view.rs
@@ -0,0 +1,28 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::{
+    contains_module, is_bytecode_file, on_disk_state_view::OnDiskStateView,
+};
+
+use anyhow::{bail, Result};
+use std::path::Path;
+/// Print a module or resource stored in `file`
+pub fn view(_state: &OnDiskStateView, path: &Path) -> Result<()> {
+    if is_bytecode_file(path) {
+        let bytecode_opt = if contains_module(path) {
+            OnDiskStateView::view_module(path)?
+        } else {
+            // bytecode extension, but not a module--assume it's a script
+            OnDiskStateView::view_script(path)?
+        };
+        match bytecode_opt {
+            Some(bytecode) => println!("{}", bytecode),
+            None => println!("Bytecode not found."),
+        }
+    } else {
+        bail!("`move view <file>` must point to a valid file under storage")
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/mod.rs b/vendors/move/crates/move-cli/src/sandbox/mod.rs
new file mode 100644
index 000000000..e0034473c
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod cli;
+pub mod commands;
+pub mod utils;
diff --git a/vendors/move/crates/move-cli/src/sandbox/utils/mod.rs b/vendors/move/crates/move-cli/src/sandbox/utils/mod.rs
new file mode 100644
index 000000000..e735fdac4
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/utils/mod.rs
@@ -0,0 +1,409 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+#![allow(hidden_glob_reexports)]
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use anyhow::{bail, Result};
+
+use move_binary_format::{
+    access::ModuleAccess,
+    compatibility::Compatibility,
+    errors::VMError,
+    file_format::{AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken},
+    normalized, IndexKind,
+};
+use move_bytecode_utils::Modules;
+use move_command_line_common::files::{FileHash, MOVE_COMPILED_EXTENSION};
+use move_compiler::{
+    compiled_unit::{CompiledUnit, NamedCompiledModule},
+    diagnostics::{self, report_diagnostics, Diagnostic, Diagnostics, FileName},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    errmap::ErrorMapping,
+    language_storage::{ModuleId, TypeTag},
+    transaction_argument::TransactionArgument,
+    vm_status::{AbortLocation, StatusCode, VMStatus},
+};
+use move_ir_types::location::Loc;
+use move_package::compilation::compiled_package::CompiledUnitWithSource;
+use move_vm_test_utils::gas_schedule::Gas;
+use std::{
+    collections::{BTreeMap, HashMap},
+    fs,
+    path::Path,
+};
+
+pub mod on_disk_state_view;
+pub mod package_context;
+
+use move_bytecode_utils::module_cache::GetModule;
+use move_vm_test_utils::gas_schedule::{CostTable, GasStatus};
+pub use on_disk_state_view::*;
+pub use package_context::*;
+
+pub fn get_gas_status(cost_table: &CostTable, gas_budget: Option<u64>) -> Result<GasStatus> {
+    let gas_status = if let Some(gas_budget) = gas_budget {
+        // TODO(Gas): This should not be hardcoded.
+        let max_gas_budget = u64::MAX.checked_div(1000).unwrap();
+        if gas_budget >= max_gas_budget {
+            bail!("Gas budget set too high; maximum is {}", max_gas_budget)
+        }
+        GasStatus::new(cost_table, Gas::new(gas_budget))
+    } else {
+        // no budget specified. Disable gas metering
+        GasStatus::new_unmetered()
+    };
+    Ok(gas_status)
+}
+
+pub(crate) fn module(unit: &CompiledUnit) -> Result<&CompiledModule> {
+    match unit {
+        CompiledUnit::Module(NamedCompiledModule { module, .. }) => Ok(module),
+        _ => bail!("Found script in modules -- this shouldn't happen"),
+    }
+}
+
+pub(crate) fn explain_publish_changeset(changeset: &ChangeSet) {
+    // publish effects should contain no resources
+    assert!(changeset.resources().next().is_none());
+    // total bytes written across all accounts
+    let mut total_bytes_written = 0;
+    for (addr, name, blob_op) in changeset.modules() {
+        match blob_op {
+            Op::New(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
+                println!(
+                    "Publishing a new module {} (wrote {:?} bytes)",
+                    module_id, bytes_written
+                );
+            }
+            Op::Modify(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
+                println!(
+                    "Updating an existing module {} (wrote {:?} bytes)",
+                    module_id, bytes_written
+                );
+            }
+            Op::Delete => {
+                panic!("Deleting a module is not supported")
+            }
+        }
+    }
+    println!(
+        "Wrote {:?} bytes of module ID's and code",
+        total_bytes_written
+    )
+}
+
+pub(crate) fn explain_type_error(
+    script_params: &[SignatureToken],
+    signers: &[AccountAddress],
+    txn_args: &[TransactionArgument],
+) {
+    use SignatureToken::*;
+    let expected_num_signers = script_params
+        .iter()
+        .filter(|t| match t {
+            Reference(r) => r.is_signer(),
+            _ => false,
+        })
+        .count();
+    if expected_num_signers != signers.len() {
+        println!(
+            "Execution failed with incorrect number of signers: script expected {:?}, but found \
+             {:?}",
+            expected_num_signers,
+            signers.len()
+        );
+        return;
+    }
+
+    // TODO: printing type(s) of missing arguments could be useful
+    let expected_num_args = script_params.len() - signers.len();
+    if expected_num_args != txn_args.len() {
+        println!(
+            "Execution failed with incorrect number of arguments: script expected {:?}, but found \
+             {:?}",
+            expected_num_args,
+            txn_args.len()
+        );
+        return;
+    }
+
+    // TODO: print more helpful error message pinpointing the (argument, type)
+    // pair that didn't match
+    println!("Execution failed with type error when binding type arguments to type parameters")
+}
+
+pub(crate) fn explain_publish_error(
+    error: VMError,
+    state: &OnDiskStateView,
+    unit: &CompiledUnitWithSource,
+) -> Result<()> {
+    use StatusCode::*;
+    let mut files = HashMap::new();
+    let file_contents = std::fs::read_to_string(&unit.source_path)?;
+    let file_hash = FileHash::new(&file_contents);
+    files.insert(
+        file_hash,
+        (
+            FileName::from(unit.source_path.to_string_lossy()),
+            file_contents,
+        ),
+    );
+
+    let module = module(&unit.unit)?;
+    let module_id = module.self_id();
+    let error_clone = error.clone();
+    match error.into_vm_status() {
+        VMStatus::Error(DUPLICATE_MODULE_NAME) => {
+            println!("Module {} exists already.", module_id);
+        }
+        VMStatus::Error(BACKWARD_INCOMPATIBLE_MODULE_UPDATE) => {
+            println!("Breaking change detected--publishing aborted. Re-run with --ignore-breaking-changes to publish anyway.");
+
+            let old_module = state.get_module_by_id(&module_id)?.unwrap();
+            let old_api = normalized::Module::new(&old_module);
+            let new_api = normalized::Module::new(module);
+
+            if (Compatibility {
+                check_struct_and_pub_function_linking: false,
+                check_struct_layout: true,
+                check_friend_linking: false,
+                check_private_entry_linking: true,
+                disallowed_new_abilities: AbilitySet::EMPTY,
+                disallow_change_struct_type_params: false,
+            })
+            .check(&old_api, &new_api)
+            .is_err()
+            {
+                // TODO: we could choose to make this more precise by walking the global state and looking for published
+                // structs of this type. but probably a bad idea
+                println!("Layout API for structs of module {} has changed. Need to do a data migration of published structs", module_id)
+            } else if (Compatibility {
+                check_struct_and_pub_function_linking: true,
+                check_struct_layout: false,
+                check_friend_linking: false,
+                check_private_entry_linking: true,
+                disallowed_new_abilities: AbilitySet::EMPTY,
+                disallow_change_struct_type_params: false,
+            })
+            .check(&old_api, &new_api)
+            .is_err()
+            {
+                // TODO: this will report false positives if we *are* simultaneously redeploying all dependent modules.
+                // but this is not easy to check without walking the global state and looking for everything
+                println!("Linking API for structs/functions of module {} has changed. Need to redeploy all dependent modules.", module_id)
+            }
+        }
+        VMStatus::Error(CYCLIC_MODULE_DEPENDENCY) => {
+            println!(
+                "Publishing module {} introduces cyclic dependencies.",
+                module_id
+            );
+            // find all cycles with an iterative DFS
+            let all_modules = state.get_all_modules()?;
+            let code_cache = Modules::new(&all_modules);
+
+            let mut stack = vec![];
+            let mut state = BTreeMap::new();
+            state.insert(module_id.clone(), true);
+            for dep in module.immediate_dependencies() {
+                stack.push((code_cache.get_module(&dep)?, false));
+            }
+
+            while let Some((cur, is_exit)) = stack.pop() {
+                let cur_id = cur.self_id();
+                if is_exit {
+                    state.insert(cur_id, false);
+                } else {
+                    state.insert(cur_id, true);
+                    stack.push((cur, true));
+                    for next in cur.immediate_dependencies() {
+                        if let Some(is_discovered_but_not_finished) = state.get(&next) {
+                            if *is_discovered_but_not_finished {
+                                let cycle_path: Vec<_> = stack
+                                    .iter()
+                                    .filter(|(_, is_exit)| *is_exit)
+                                    .map(|(m, _)| m.self_id().to_string())
+                                    .collect();
+                                println!(
+                                    "Cycle detected: {} -> {} -> {}",
+                                    module_id,
+                                    cycle_path.join(" -> "),
+                                    module_id,
+                                );
+                            }
+                        } else {
+                            stack.push((code_cache.get_module(&next)?, false));
+                        }
+                    }
+                }
+            }
+            println!("Re-run with --ignore-breaking-changes to publish anyway.")
+        }
+        VMStatus::Error(MISSING_DEPENDENCY) => {
+            let err_indices = error_clone.indices();
+            let mut diags = Diagnostics::new();
+            for (ind_kind, table_ind) in err_indices {
+                if let IndexKind::FunctionHandle = ind_kind {
+                    let native_function = &(module.function_defs())[*table_ind as usize];
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    let function_source_map = unit
+                        .unit
+                        .source_map()
+                        .get_function_source_map(FunctionDefinitionIndex(*table_ind));
+                    if let Ok(map) = function_source_map {
+                        let err_string = format!(
+                            "Missing implementation for the native function {}::{}",
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str()
+                        );
+                        let diag = Diagnostic::new(
+                            diagnostics::codes::Declarations::InvalidFunction,
+                            (map.definition_location, err_string),
+                            Vec::<(Loc, String)>::new(),
+                            Vec::<String>::new(),
+                        );
+                        diags.add(diag);
+                    }
+                }
+            }
+            report_diagnostics(&files, diags)
+        }
+        VMStatus::Error(status_code) => {
+            println!("Publishing failed with unexpected error {:?}", status_code)
+        }
+        VMStatus::Executed | VMStatus::MoveAbort(..) | VMStatus::ExecutionFailure { .. } => {
+            unreachable!()
+        }
+    }
+
+    Ok(())
+}
+
+/// Explain an execution error
+pub(crate) fn explain_execution_error(
+    error_descriptions: &ErrorMapping,
+    error: VMError,
+    state: &OnDiskStateView,
+    script_type_parameters: &[AbilitySet],
+    script_parameters: &[SignatureToken],
+    vm_type_args: &[TypeTag],
+    signers: &[AccountAddress],
+    txn_args: &[TransactionArgument],
+) -> Result<()> {
+    use StatusCode::*;
+    match error.into_vm_status() {
+        VMStatus::MoveAbort(AbortLocation::Module(id), abort_code) => {
+            // try to use move-explain to explain the abort
+
+            print!(
+                "Execution aborted with code {} in module {}.",
+                abort_code, id
+            );
+
+            if let Some(error_desc) = error_descriptions.get_explanation(&id, abort_code) {
+                println!(
+                    " Abort code details:\nName: {}\nDescription:{}",
+                    error_desc.code_name, error_desc.code_description,
+                )
+            } else {
+                println!()
+            }
+        }
+        VMStatus::MoveAbort(AbortLocation::Script, abort_code) => {
+            // TODO: map to source code location
+            println!(
+                "Execution aborted with code {} in transaction script",
+                abort_code
+            )
+        }
+        VMStatus::ExecutionFailure {
+            status_code,
+            location,
+            function,
+            code_offset,
+        } => {
+            let status_explanation = match status_code {
+                RESOURCE_ALREADY_EXISTS => "a RESOURCE_ALREADY_EXISTS error (i.e., \
+                                            `move_to<T>(account)` when there is already a \
+                                            resource of type `T` under `account`)"
+                    .to_string(),
+                MISSING_DATA => "a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, \
+                                 `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there \
+                                 is no resource of type `T` at address `a`)"
+                    .to_string(),
+                ARITHMETIC_ERROR => "an arithmetic error (i.e., integer overflow/underflow, \
+                                     div/mod by zero, or invalid shift)"
+                    .to_string(),
+                VECTOR_OPERATION_ERROR => "an error originated from vector operations (i.e., \
+                                           index out of bound, pop an empty vector, or unpack a \
+                                           vector with a wrong parity)"
+                    .to_string(),
+                EXECUTION_STACK_OVERFLOW => "an execution stack overflow".to_string(),
+                CALL_STACK_OVERFLOW => "a call stack overflow".to_string(),
+                OUT_OF_GAS => "an out of gas error".to_string(),
+                _ => format!("a {} error", status_code.status_type()),
+            };
+            // TODO: map to source code location
+            let location_explanation = match location {
+                AbortLocation::Module(id) => {
+                    format!(
+                        "{}::{}",
+                        id,
+                        state.resolve_function(&id, function)?.unwrap()
+                    )
+                }
+                AbortLocation::Script => "script".to_string(),
+            };
+            println!(
+                "Execution failed because of {} in {} at code offset {}",
+                status_explanation, location_explanation, code_offset
+            )
+        }
+        VMStatus::Error(NUMBER_OF_TYPE_ARGUMENTS_MISMATCH) => println!(
+            "Execution failed with incorrect number of type arguments: script expected {:?}, but \
+             found {:?}",
+            script_type_parameters.len(),
+            vm_type_args.len()
+        ),
+        VMStatus::Error(TYPE_MISMATCH) => explain_type_error(script_parameters, signers, txn_args),
+        VMStatus::Error(LINKER_ERROR) => {
+            // TODO: is this the only reason we can see LINKER_ERROR?
+            // Can we also see it if someone manually deletes modules in storage?
+            println!(
+                "Execution failed due to unresolved type argument(s) (i.e., `--type-args \
+                 0x1::M:T` when there is no module named M at 0x1 or no type named T in module \
+                 0x1::M)"
+            );
+        }
+        VMStatus::Error(status_code) => {
+            println!("Execution failed with unexpected error {:?}", status_code)
+        }
+        VMStatus::Executed => unreachable!(),
+    }
+    Ok(())
+}
+
+/// Return `true` if `path` is a Move bytecode file based on its extension
+pub(crate) fn is_bytecode_file(path: &Path) -> bool {
+    path.extension()
+        .map_or(false, |ext| ext == MOVE_COMPILED_EXTENSION)
+}
+
+/// Return `true` if path contains a valid Move bytecode module
+pub(crate) fn contains_module(path: &Path) -> bool {
+    is_bytecode_file(path)
+        && match fs::read(path) {
+            Ok(bytes) => CompiledModule::deserialize_with_defaults(&bytes).is_ok(),
+            Err(_) => false,
+        }
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/utils/on_disk_state_view.rs b/vendors/move/crates/move-cli/src/sandbox/utils/on_disk_state_view.rs
new file mode 100644
index 000000000..8314621cb
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/utils/on_disk_state_view.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript, FunctionDefinitionIndex},
+};
+use move_bytecode_utils::module_cache::GetModule;
+use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+};
+use move_disassembler::disassembler::Disassembler;
+use move_ir_types::location::Spanned;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+/// subdirectory of `DEFAULT_STORAGE_DIR`/<addr> where modules are stored
+pub const MODULES_DIR: &str = "modules";
+
+/// file under `DEFAULT_BUILD_DIR` where a registry of generated struct layouts are stored
+pub const STRUCT_LAYOUTS_FILE: &str = "struct_layouts.yaml";
+
+#[derive(Debug)]
+pub struct OnDiskStateView {
+    build_dir: PathBuf,
+    storage_dir: PathBuf,
+}
+
+impl OnDiskStateView {
+    /// Create an `OnDiskStateView` that reads/writes resource data and modules in `storage_dir`.
+    pub fn create<P: Into<PathBuf>>(build_dir: P, storage_dir: P) -> Result<Self> {
+        let build_dir = build_dir.into();
+        if !build_dir.exists() {
+            fs::create_dir_all(&build_dir)?;
+        }
+
+        let storage_dir = storage_dir.into();
+        if !storage_dir.exists() {
+            fs::create_dir_all(&storage_dir)?;
+        }
+
+        Ok(Self {
+            build_dir,
+            // it is important to canonicalize the path here because `is_data_path()` relies on the
+            // fact that storage_dir is canonicalized.
+            storage_dir: storage_dir.canonicalize()?,
+        })
+    }
+
+    pub fn build_dir(&self) -> &PathBuf {
+        &self.build_dir
+    }
+
+    pub fn struct_layouts_file(&self) -> PathBuf {
+        self.build_dir.join(STRUCT_LAYOUTS_FILE)
+    }
+
+    fn is_data_path(&self, p: &Path, parent_dir: &str) -> bool {
+        if !p.exists() {
+            return false;
+        }
+        let p = p.canonicalize().unwrap();
+        p.starts_with(&self.storage_dir)
+            && match p.parent() {
+                Some(parent) => parent.ends_with(parent_dir),
+                None => false,
+            }
+    }
+
+    pub fn is_module_path(&self, p: &Path) -> bool {
+        self.is_data_path(p, MODULES_DIR)
+    }
+
+    fn get_addr_path(&self, addr: &AccountAddress) -> PathBuf {
+        let mut path = self.storage_dir.clone();
+        path.push(format!("0x{}", addr));
+        path
+    }
+
+    fn get_module_path(&self, module_id: &ModuleId) -> PathBuf {
+        let mut path = self.get_addr_path(module_id.address());
+        path.push(MODULES_DIR);
+        path.push(module_id.name().to_string());
+        path.with_extension(MOVE_COMPILED_EXTENSION)
+    }
+
+    /// Extract a module ID from a path
+    pub fn get_module_id(&self, p: &Path) -> Option<ModuleId> {
+        if !self.is_module_path(p) {
+            return None;
+        }
+        let name = Identifier::new(p.file_stem().unwrap().to_str().unwrap()).unwrap();
+        match p.parent().and_then(|parent| parent.parent()) {
+            Some(parent) => {
+                let addr =
+                    AccountAddress::from_hex_literal(parent.file_stem().unwrap().to_str().unwrap())
+                        .unwrap();
+                Some(ModuleId::new(addr, name))
+            }
+            None => None,
+        }
+    }
+
+    /// Read the resource bytes stored on-disk at `addr`/`tag`
+    fn get_module_bytes(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>> {
+        Self::get_bytes(&self.get_module_path(module_id))
+    }
+
+    /// Check if a module at `addr`/`module_id` exists
+    pub fn has_module(&self, module_id: &ModuleId) -> bool {
+        self.get_module_path(module_id).exists()
+    }
+
+    /// Return the name of the function at `idx` in `module_id`
+    pub fn resolve_function(&self, module_id: &ModuleId, idx: u16) -> Result<Option<Identifier>> {
+        if let Some(m) = self.get_module_by_id(module_id)? {
+            Ok(Some(
+                m.identifier_at(
+                    m.function_handle_at(m.function_def_at(FunctionDefinitionIndex(idx)).function)
+                        .name,
+                )
+                .to_owned(),
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn get_bytes(path: &Path) -> Result<Option<Vec<u8>>> {
+        Ok(if path.exists() {
+            Some(fs::read(path)?)
+        } else {
+            None
+        })
+    }
+
+    fn view_bytecode(path: &Path, is_module: bool) -> Result<Option<String>> {
+        if path.is_dir() {
+            bail!("Bad bytecode path {:?}. Needed file, found directory", path)
+        }
+
+        Ok(match Self::get_bytes(path)? {
+            Some(bytes) => {
+                let module: CompiledModule;
+                let script: CompiledScript;
+                let view = if is_module {
+                    module = CompiledModule::deserialize_with_defaults(&bytes)
+                        .map_err(|e| anyhow!("Failure deserializing module: {:?}", e))?;
+                    BinaryIndexedView::Module(&module)
+                } else {
+                    script = CompiledScript::deserialize(&bytes)
+                        .map_err(|e| anyhow!("Failure deserializing script: {:?}", e))?;
+                    BinaryIndexedView::Script(&script)
+                };
+                // TODO: find or create source map and pass it to disassembler
+                let d: Disassembler =
+                    Disassembler::from_view(view, Spanned::unsafe_no_loc(()).loc)?;
+                Some(d.disassemble()?)
+            }
+            None => None,
+        })
+    }
+
+    pub fn view_module(module_path: &Path) -> Result<Option<String>> {
+        Self::view_bytecode(module_path, true)
+    }
+
+    pub fn view_script(script_path: &Path) -> Result<Option<String>> {
+        Self::view_bytecode(script_path, false)
+    }
+
+    /// Save `module` on disk under the path `module.address()`/`module.name()`
+    pub fn save_module(&self, module_id: &ModuleId, module_bytes: &[u8]) -> Result<()> {
+        let path = self.get_module_path(module_id);
+        if !path.exists() {
+            fs::create_dir_all(path.parent().unwrap())?
+        }
+        Ok(fs::write(path, module_bytes)?)
+    }
+
+    /// Save the YAML encoding `layout` on disk under `build_dir/layouts/id`.
+    pub fn save_struct_layouts(&self, layouts: &str) -> Result<()> {
+        let layouts_file = self.struct_layouts_file();
+        if !layouts_file.exists() {
+            fs::create_dir_all(layouts_file.parent().unwrap())?
+        }
+        Ok(fs::write(layouts_file, layouts)?)
+    }
+
+    /// Save all the modules in the local cache, re-generate mv_interfaces if required.
+    pub fn save_modules<'a>(
+        &self,
+        modules: impl IntoIterator<Item = &'a (ModuleId, Vec<u8>)>,
+    ) -> Result<()> {
+        for (module_id, module_bytes) in modules {
+            self.save_module(module_id, module_bytes)?;
+        }
+        Ok(())
+    }
+
+    pub fn delete_module(&self, id: &ModuleId) -> Result<()> {
+        let path = self.get_module_path(id);
+        fs::remove_file(path)?;
+
+        // delete addr directory if this address is now empty
+        let addr_path = self.get_addr_path(id.address());
+        if addr_path.read_dir()?.next().is_none() {
+            fs::remove_dir(addr_path)?
+        }
+        Ok(())
+    }
+
+    fn iter_paths<F>(&self, f: F) -> impl Iterator<Item = PathBuf>
+    where
+        F: FnOnce(&Path) -> bool + Copy,
+    {
+        walkdir::WalkDir::new(&self.storage_dir)
+            .follow_links(true)
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .map(|e| e.path().to_path_buf())
+            .filter(move |path| f(path))
+    }
+
+    pub fn module_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
+        self.iter_paths(move |p| self.is_module_path(p))
+    }
+
+    /// Build all modules in the self.storage_dir.
+    /// Returns an Err if a module does not deserialize.
+    pub fn get_all_modules(&self) -> Result<Vec<CompiledModule>> {
+        self.module_paths()
+            .map(|path| {
+                CompiledModule::deserialize_with_defaults(&Self::get_bytes(&path)?.unwrap())
+                    .map_err(|e| anyhow!("Failed to deserialized module: {:?}", e))
+            })
+            .collect::<Result<Vec<CompiledModule>>>()
+    }
+}
+
+/// Default implementation of LinkageResolver (no re-linking).
+impl LinkageResolver for OnDiskStateView {
+    type Error = anyhow::Error;
+}
+
+impl ModuleResolver for OnDiskStateView {
+    type Error = anyhow::Error;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        self.get_module_bytes(module_id)
+    }
+}
+
+impl ResourceResolver for OnDiskStateView {
+    type Error = anyhow::Error;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _struct_tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        unimplemented!()
+    }
+}
+
+impl Default for OnDiskStateView {
+    fn default() -> Self {
+        OnDiskStateView::create(Path::new(DEFAULT_BUILD_DIR), Path::new(DEFAULT_STORAGE_DIR))
+            .expect("Failure creating OnDiskStateView")
+    }
+}
+
+// wrappers of TypeTag, StructTag, Vec<TypeTag> to allow us to implement the FromStr/ToString traits
+#[derive(Debug)]
+struct TypeID(TypeTag);
+#[derive(Debug)]
+struct StructID(StructTag);
+#[derive(Debug)]
+struct Generics(Vec<TypeTag>);
+
+impl ToString for TypeID {
+    fn to_string(&self) -> String {
+        match &self.0 {
+            TypeTag::Struct(s) => StructID(*s.clone()).to_string(),
+            TypeTag::Vector(t) => format!("vector<{}>", TypeID(*t.clone()).to_string()),
+            t => t.to_string(),
+        }
+    }
+}
+
+impl ToString for StructID {
+    fn to_string(&self) -> String {
+        let tag = &self.0;
+        // TODO: TypeTag parser insists on leading 0x for StructTag's, so we insert one here.
+        // Would be nice to expose a StructTag parser and get rid of the 0x here
+        format!(
+            "0x{}::{}::{}{}",
+            tag.address,
+            tag.module,
+            tag.name,
+            Generics(tag.type_params.clone()).to_string()
+        )
+    }
+}
+
+impl ToString for Generics {
+    fn to_string(&self) -> String {
+        if self.0.is_empty() {
+            "".to_string()
+        } else {
+            let generics: Vec<String> = self
+                .0
+                .iter()
+                .map(|t| TypeID(t.clone()).to_string())
+                .collect();
+            format!("<{}>", generics.join(","))
+        }
+    }
+}
diff --git a/vendors/move/crates/move-cli/src/sandbox/utils/package_context.rs b/vendors/move/crates/move-cli/src/sandbox/utils/package_context.rs
new file mode 100644
index 000000000..47a57efd7
--- /dev/null
+++ b/vendors/move/crates/move-cli/src/sandbox/utils/package_context.rs
@@ -0,0 +1,73 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use crate::{sandbox::utils::OnDiskStateView, DEFAULT_BUILD_DIR};
+use anyhow::Result;
+use move_command_line_common::env::get_bytecode_version_from_env;
+use move_package::{compilation::compiled_package::CompiledPackage, BuildConfig};
+use std::path::{Path, PathBuf};
+
+/// The PackageContext controls the package that the CLI is executing with respect to, and handles the
+/// creation of the `OnDiskStateView` with the package's dependencies.
+pub struct PackageContext {
+    package: CompiledPackage,
+    build_dir: PathBuf,
+}
+
+impl PackageContext {
+    pub fn new(path: &Option<PathBuf>, build_config: &BuildConfig) -> Result<Self> {
+        let path = path.as_deref().unwrap_or_else(|| Path::new("."));
+        let build_dir = build_config
+            .install_dir
+            .as_ref()
+            .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR))
+            .clone();
+        let package = build_config
+            .clone()
+            .compile_package(path, &mut Vec::new())?;
+        Ok(PackageContext { package, build_dir })
+    }
+
+    /// Prepare an OnDiskStateView that is ready to use. Library modules will be preloaded into the
+    /// storage if `load_libraries` is true.
+    ///
+    /// NOTE: this is the only way to get a state view in Move CLI, and thus, this function needs
+    /// to be run before every command that needs a state view, i.e., `publish`, `run`,
+    /// `view`, and `doctor`.
+    pub fn prepare_state(&self, storage_dir: &Path) -> Result<OnDiskStateView> {
+        let bytecode_version = get_bytecode_version_from_env();
+        let state = OnDiskStateView::create(self.build_dir.as_path(), storage_dir)?;
+
+        // preload the storage with library modules (if such modules do not exist yet)
+        let package = self.package();
+        let new_modules = package
+            .deps_compiled_units
+            .iter()
+            .map(|(_, unit)| match &unit.unit {
+                move_compiler::compiled_unit::CompiledUnitEnum::Module(m) => &m.module,
+                _ => unreachable!(),
+            })
+            .filter(|m| !state.has_module(&m.self_id()));
+
+        let mut serialized_modules = vec![];
+        for module in new_modules {
+            let self_id = module.self_id();
+            let mut module_bytes = vec![];
+            module.serialize_for_version(bytecode_version, &mut module_bytes)?;
+            serialized_modules.push((self_id, module_bytes));
+        }
+        state.save_modules(&serialized_modules)?;
+
+        Ok(state)
+    }
+
+    pub fn package(&self) -> &CompiledPackage {
+        &self.package
+    }
+}
+
+impl Default for PackageContext {
+    fn default() -> Self {
+        Self::new(&None, &BuildConfig::default()).unwrap()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/Move.toml
new file mode 100644
index 000000000..9426ebc1a
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Test"
+version = "0.0.0"
+
+[dependencies]
+SomeDep = { local = "dep" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/args.exp b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/args.exp
new file mode 100644
index 000000000..2d39bf3c4
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/args.exp
@@ -0,0 +1,24 @@
+Command `build`:
+INCLUDING DEPENDENCY SomeDep
+BUILDING Test
+Command `disassemble --package Test --name m`:
+// Move bytecode v6
+module 43.m {
+
+
+public aborts() {
+B0:
+	0: LdU64(42)
+	1: Abort
+}
+}
+Command `build -p dep`:
+BUILDING SomeDep
+warning[W09002]: unused variable
+  ┌─ ./sources/has_warning.move:2:20
+  │
+2 │     public fun foo(x: u64): u64 {
+  │                    ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/Move.toml
new file mode 100644
index 000000000..d87591b27
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "SomeDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/sources/has_warning.move b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/sources/has_warning.move
new file mode 100644
index 000000000..6eb37e05e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/dep/sources/has_warning.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+    public fun foo(x: u64): u64 {
+        1 + 1
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/sources/m.move b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/sources/m.move
new file mode 100644
index 000000000..9f388d4be
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_dep_warnings/sources/m.move
@@ -0,0 +1,5 @@
+module 0x43::m {
+public fun aborts() {
+    abort 42
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/Move.toml
new file mode 100644
index 000000000..db3f9fb55
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Test"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/args.exp b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/args.exp
new file mode 100644
index 000000000..5a76cc2f3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/args.exp
@@ -0,0 +1,43 @@
+Command `build`:
+BUILDING Test
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+Command `disassemble --package Test --name m`:
+// Move bytecode v6
+module 42.m {
+
+
+public foo(x#0#0: u64): u64 {
+B0:
+	0: LdU64(2)
+	1: Ret
+}
+}
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+Command `build --silence-warnings`:
+BUILDING Test
+Command `build --silence-warnings --warnings-are-errors`:
+BUILDING Test
+Command `build --warnings-are-errors`:
+BUILDING Test
+error[E09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/modules/m.move b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/modules/m.move
new file mode 100644
index 000000000..c892ad41e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/modules/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/sources/m.move b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/sources/m.move
new file mode 100644
index 000000000..c892ad41e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/build_with_warnings/sources/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/Move.toml
new file mode 100644
index 000000000..f91ed8ff3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Test"
+version = "0.0.0"
+
+[addresses]
+foo = "0x1"
+bar = "0x2"
+baz = "0x3"
+qux = "0x4"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/args.exp b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/args.exp
new file mode 100644
index 000000000..c79fc4e1f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/args.exp
@@ -0,0 +1,286 @@
+Command `disassemble --Xdebug --package Test --name c`:
+// Move bytecode v6
+module 2.c {
+use 0000000000000000000000000000000000000000000000000000000000000002::b;
+use 0000000000000000000000000000000000000000000000000000000000000003::d;
+use 0000000000000000000000000000000000000000000000000000000000000001::a;
+use 0000000000000000000000000000000000000000000000000000000000000004::e;
+
+
+struct B {
+	x: u64
+}
+struct A {
+	b: vector<B>
+}
+
+public g(): u64 {
+B0:
+	0: Call a::f(): u64
+	1: Call b::f(): u64
+	2: Add
+	3: Call e::b(): B
+	4: Call e::g(B): u64
+	5: Add
+	6: Ret
+}
+public f(): u64 {
+B0:
+	0: Call d::f(): u64
+	1: Call e::a(): A
+	2: Call e::f(A): u64
+	3: Add
+	4: Ret
+}
+}
+
+CompiledModule {
+    version: 6,
+    self_module_handle_idx: ModuleHandleIndex(0),
+    module_handles: [
+        ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(4),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(3),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(2),
+            name: IdentifierIndex(5),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(1),
+            name: IdentifierIndex(2),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(3),
+            name: IdentifierIndex(6),
+        },
+    ],
+    struct_handles: [
+        StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: [],
+            type_parameters: [],
+        },
+        StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            abilities: [],
+            type_parameters: [],
+        },
+        StructHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(0),
+            abilities: [Drop, ],
+            type_parameters: [],
+        },
+        StructHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(1),
+            abilities: [Drop, ],
+            type_parameters: [],
+        },
+    ],
+    function_handles: [
+        FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(8),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(1),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(2),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(3),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(3),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(2),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(3),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(4),
+            name: IdentifierIndex(8),
+            parameters: SignatureIndex(2),
+            return_: SignatureIndex(1),
+            type_parameters: [],
+        },
+    ],
+    field_handles: [],
+    friend_decls: [],
+    struct_def_instantiations: [],
+    function_instantiations: [],
+    field_instantiations: [],
+    signatures: [
+        Signature(
+            [],
+        ),
+        Signature(
+            [
+                U64,
+            ],
+        ),
+        Signature(
+            [
+                Struct(StructHandleIndex(3)),
+            ],
+        ),
+        Signature(
+            [
+                Struct(StructHandleIndex(2)),
+            ],
+        ),
+    ],
+    identifiers: [
+        Identifier(
+            "A",
+        ),
+        Identifier(
+            "B",
+        ),
+        Identifier(
+            "a",
+        ),
+        Identifier(
+            "b",
+        ),
+        Identifier(
+            "c",
+        ),
+        Identifier(
+            "d",
+        ),
+        Identifier(
+            "e",
+        ),
+        Identifier(
+            "f",
+        ),
+        Identifier(
+            "g",
+        ),
+        Identifier(
+            "x",
+        ),
+    ],
+    address_identifiers: [
+        0000000000000000000000000000000000000000000000000000000000000002,
+        0000000000000000000000000000000000000000000000000000000000000001,
+        0000000000000000000000000000000000000000000000000000000000000003,
+        0000000000000000000000000000000000000000000000000000000000000004,
+    ],
+    constant_pool: [],
+    metadata: [],
+    struct_defs: [
+        StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: Declared(
+                [
+                    FieldDefinition {
+                        name: IdentifierIndex(9),
+                        signature: TypeSignature(
+                            U64,
+                        ),
+                    },
+                ],
+            ),
+        },
+        StructDefinition {
+            struct_handle: StructHandleIndex(1),
+            field_information: Declared(
+                [
+                    FieldDefinition {
+                        name: IdentifierIndex(3),
+                        signature: TypeSignature(
+                            Vector(Struct(StructHandleIndex(0))),
+                        ),
+                    },
+                ],
+            ),
+        },
+    ],
+    function_defs: [
+        FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: [],
+            code: Some(
+                CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: [
+                        Call(4),
+                        Call(2),
+                        Add,
+                        Call(6),
+                        Call(8),
+                        Add,
+                        Ret,
+                    ],
+                },
+            ),
+        },
+        FunctionDefinition {
+            function: FunctionHandleIndex(1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: [],
+            code: Some(
+                CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: [
+                        Call(3),
+                        Call(5),
+                        Call(7),
+                        Add,
+                        Ret,
+                    ],
+                },
+            ),
+        },
+    ],
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/sources/m.move b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/sources/m.move
new file mode 100644
index 000000000..0947c7710
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_module/sources/m.move
@@ -0,0 +1,56 @@
+module foo::a {
+    public fun f(): u64 {
+        42
+    }
+}
+
+module bar::b {
+    public fun f(): u64 {
+        43
+    }
+}
+
+module bar::c {
+    #[allow(unused_field)]
+    struct B { x: u64 }
+    #[allow(unused_field)]
+    struct A { b: vector<B> }
+
+    public fun g(): u64 {
+        foo::a::f() +
+        bar::b::f() +
+        qux::e::g(qux::e::b())
+    }
+
+    public fun f(): u64 {
+        baz::d::f() +
+        qux::e::f(qux::e::a())
+    }
+}
+
+module baz::d {
+    public fun f(): u64 {
+        45
+    }
+}
+
+module qux::e {
+    struct B has drop { x: u64 }
+    struct A has drop { x: u64 }
+
+    public fun a(): A {
+        A { x: 46 }
+    }
+
+    public fun b(): B {
+        B { x: 47 }
+    }
+
+    public fun f(a: A): u64 {
+        a.x
+    }
+
+    public fun g(b: B): u64 {
+        b.x
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/Move.toml
new file mode 100644
index 000000000..f91ed8ff3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Test"
+version = "0.0.0"
+
+[addresses]
+foo = "0x1"
+bar = "0x2"
+baz = "0x3"
+qux = "0x4"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/args.exp b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/args.exp
new file mode 100644
index 000000000..832cb4a98
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/args.exp
@@ -0,0 +1,219 @@
+Command `disassemble --Xdebug --name main`:
+// Move bytecode v6
+script {
+use 0000000000000000000000000000000000000000000000000000000000000002::b;
+use 0000000000000000000000000000000000000000000000000000000000000003::c;
+use 0000000000000000000000000000000000000000000000000000000000000001::a;
+use 0000000000000000000000000000000000000000000000000000000000000004::d;
+
+
+
+
+main() {
+L0:	a#1#0: A
+L1:	b#1#0: B
+B0:
+	0: Call d::a(): A
+	1: StLoc[0](a#1#0: A)
+	2: Call d::b(): B
+	3: StLoc[1](b#1#0: B)
+	4: Call a::f(): u64
+	5: Call b::f(): u64
+	6: Add
+	7: Call c::f(): u64
+	8: Add
+	9: MoveLoc[1](b#1#0: B)
+	10: Call d::g(B): u64
+	11: Add
+	12: MoveLoc[0](a#1#0: A)
+	13: Call d::f(A): u64
+	14: Add
+	15: LdU64(220)
+	16: Eq
+	17: BrFalse(19)
+B1:
+	18: Branch(21)
+B2:
+	19: LdU64(0)
+	20: Abort
+B3:
+	21: Ret
+}
+}
+
+CompiledScript {
+    version: 6,
+    module_handles: [
+        ModuleHandle {
+            address: AddressIdentifierIndex(1),
+            name: IdentifierIndex(3),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(2),
+            name: IdentifierIndex(4),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(2),
+        },
+        ModuleHandle {
+            address: AddressIdentifierIndex(3),
+            name: IdentifierIndex(5),
+        },
+    ],
+    struct_handles: [
+        StructHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(0),
+            abilities: [Drop, ],
+            type_parameters: [],
+        },
+        StructHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(1),
+            abilities: [Drop, ],
+            type_parameters: [],
+        },
+    ],
+    function_handles: [
+        FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(6),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(4),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(1),
+            name: IdentifierIndex(6),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(4),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(2),
+            name: IdentifierIndex(6),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(4),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(2),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(3),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(3),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(6),
+            parameters: SignatureIndex(2),
+            return_: SignatureIndex(4),
+            type_parameters: [],
+        },
+        FunctionHandle {
+            module: ModuleHandleIndex(3),
+            name: IdentifierIndex(7),
+            parameters: SignatureIndex(3),
+            return_: SignatureIndex(4),
+            type_parameters: [],
+        },
+    ],
+    function_instantiations: [],
+    signatures: [
+        Signature(
+            [],
+        ),
+        Signature(
+            [
+                Struct(StructHandleIndex(0)),
+                Struct(StructHandleIndex(1)),
+            ],
+        ),
+        Signature(
+            [
+                Struct(StructHandleIndex(0)),
+            ],
+        ),
+        Signature(
+            [
+                Struct(StructHandleIndex(1)),
+            ],
+        ),
+        Signature(
+            [
+                U64,
+            ],
+        ),
+    ],
+    identifiers: [
+        Identifier(
+            "A",
+        ),
+        Identifier(
+            "B",
+        ),
+        Identifier(
+            "a",
+        ),
+        Identifier(
+            "b",
+        ),
+        Identifier(
+            "c",
+        ),
+        Identifier(
+            "d",
+        ),
+        Identifier(
+            "f",
+        ),
+        Identifier(
+            "g",
+        ),
+    ],
+    address_identifiers: [
+        0000000000000000000000000000000000000000000000000000000000000001,
+        0000000000000000000000000000000000000000000000000000000000000002,
+        0000000000000000000000000000000000000000000000000000000000000003,
+        0000000000000000000000000000000000000000000000000000000000000004,
+    ],
+    constant_pool: [],
+    metadata: [],
+    code: CodeUnit {
+        locals: SignatureIndex(1),
+        code: [
+            Call(3),
+            StLoc(0),
+            Call(4),
+            StLoc(1),
+            Call(2),
+            Call(0),
+            Add,
+            Call(1),
+            Add,
+            MoveLoc(1),
+            Call(6),
+            Add,
+            MoveLoc(0),
+            Call(5),
+            Add,
+            LdU64(220),
+            Eq,
+            BrFalse(19),
+            Branch(21),
+            LdU64(0),
+            Abort,
+            Ret,
+        ],
+    },
+    type_parameters: [],
+    parameters: SignatureIndex(0),
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/sources/m.move b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/sources/m.move
new file mode 100644
index 000000000..8d09795db
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/canonicalize_script/sources/m.move
@@ -0,0 +1,55 @@
+module foo::a {
+    public fun f(): u64 {
+        42
+    }
+}
+
+module bar::b {
+    public fun f(): u64 {
+        43
+    }
+}
+
+script {
+    fun main() {
+        let a = qux::d::a();
+        let b = qux::d::b();
+
+        assert!(
+            foo::a::f() +
+            bar::b::f() +
+            baz::c::f() +
+            qux::d::g(b) +
+            qux::d::f(a) ==
+            42 + 43 + 44 + 45 + 46,
+            0,
+        );
+    }
+}
+
+module baz::c {
+    public fun f(): u64 {
+        44
+    }
+}
+
+module qux::d {
+    struct B has drop { x: u64 }
+    struct A has drop { x: u64 }
+
+    public fun a(): A {
+        A { x: 45 }
+    }
+
+    public fun b(): B {
+        B { x: 46 }
+    }
+
+    public fun f(a: A): u64 {
+        a.x
+    }
+
+    public fun g(b: B): u64 {
+        b.x
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/Move.toml
new file mode 100644
index 000000000..61dc26870
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Foo"
+version = "0.0.0"
+
+[dependencies]
+Bar = { local = "bar" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/args.exp b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/args.exp
new file mode 100644
index 000000000..f79b290c4
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/args.exp
@@ -0,0 +1,7 @@
+Command `build -v`:
+Error: Failed to resolve dependencies for package 'Foo'
+
+Caused by:
+    0: Failed to resolve dependencies for package 'Bar'
+    1: Failed to resolve dependencies for package 'Foo'
+    2: Found cycle between packages: Bar -> Foo -> Bar
diff --git a/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml
new file mode 100644
index 000000000..0a8a031e0
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[dependencies]
+Foo = { local = ".." }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move
new file mode 100644
index 000000000..7905cb391
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move
@@ -0,0 +1,7 @@
+module 0x1::Bar {
+    use 0x1::Foo;
+
+    public bar() {
+        Foo::foo();
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move
new file mode 100644
index 000000000..c094de36a
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move
@@ -0,0 +1,7 @@
+module 0x1::Foo {
+    use 0x1::Bar;
+
+    public foo() {
+        Bar::bar();
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/Move.toml
new file mode 100644
index 000000000..7581be8bf
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+Foo = { local = "./foo" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/args.exp b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/args.exp
new file mode 100644
index 000000000..229a05518
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/args.exp
@@ -0,0 +1,4 @@
+Command `build -v`:
+INCLUDING DEPENDENCY Foo
+INCLUDING DEPENDENCY Bar
+BUILDING A
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/Move.toml
new file mode 100644
index 000000000..2b98d5753
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move
new file mode 100644
index 000000000..72259b9e4
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move
@@ -0,0 +1,5 @@
+module A::Bar {
+    public fun bar(): u64 {
+        42
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/Move.toml
new file mode 100644
index 000000000..d9b78ab21
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Foo"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dependencies]
+Bar = { local = "../bar" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move
new file mode 100644
index 000000000..2c6d10d05
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move
@@ -0,0 +1,7 @@
+module A::Foo {
+    use A::Bar;
+
+    public fun foo(): u64 {
+        Bar::bar()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/sources/A.move
new file mode 100644
index 000000000..f58e39e87
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dependency_chain/sources/A.move
@@ -0,0 +1,8 @@
+module A::A {
+    use A::Foo;
+
+    #[allow(unused_function)]
+    fun f(): u64 {
+        Foo::foo()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dev_address/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/dev_address/Move.toml
new file mode 100644
index 000000000..bf071a290
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dev_address/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dev_address/args.exp b/vendors/move/crates/move-cli/tests/build_tests/dev_address/args.exp
new file mode 100644
index 000000000..fa89fc39c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dev_address/args.exp
@@ -0,0 +1,2 @@
+Command `build -v -d`:
+BUILDING A
diff --git a/vendors/move/crates/move-cli/tests/build_tests/dev_address/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/dev_address/sources/A.move
new file mode 100644
index 000000000..72f7ec95d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/dev_address/sources/A.move
@@ -0,0 +1 @@
+module A::A {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/Move.toml
new file mode 100644
index 000000000..db3f9fb55
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Test"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/args.exp b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/args.exp
new file mode 100644
index 000000000..48cfec0ff
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/args.exp
@@ -0,0 +1,28 @@
+Command `build`:
+BUILDING Test
+Command `disassemble --package Test --name m`:
+// Move bytecode v6
+module 42.m {
+struct Zs {
+	dummy_field: bool
+}
+struct As {
+	dummy_field: bool
+}
+
+public zf(): u64 {
+B0:
+	0: LdConst[0](U64: 01000000..)
+	1: Ret
+}
+public af(): u32 {
+B0:
+	0: LdConst[1](U32: 00000000)
+	1: Ret
+}
+
+Constants [
+	0 => u64: 0100000000000000
+	1 => u32: 00000000
+]
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/sources/m.move b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/sources/m.move
new file mode 100644
index 000000000..4f255689c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/disassemble_module/sources/m.move
@@ -0,0 +1,12 @@
+module 0x42::m {
+
+struct Zs {}
+struct As {}
+
+const Zc: u64 = 1;
+const Ac: u32 = 0;
+
+public fun zf(): u64 { Zc }
+public fun af(): u32 { Ac }
+
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/args.exp b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/args.exp
new file mode 100644
index 000000000..dffc3c3b3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/args.exp
@@ -0,0 +1,2 @@
+Command `build -v`:
+BUILDING A
diff --git a/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move
new file mode 100644
index 000000000..edb25f3d7
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move
@@ -0,0 +1 @@
+module 0x1::M {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml
new file mode 100644
index 000000000..9dd2758ad
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "build_include_exclude_stdlib"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/args.exp b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
new file mode 100644
index 000000000..5620f9e5d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
@@ -0,0 +1,25 @@
+Command `build -v`:
+BUILDING build_include_exclude_stdlib
+error[E03002]: unbound module
+  ┌─ ./sources/UseSigner.move:2:7
+  │
+2 │   use std::signer;
+  │       ^^^^^^^^^^^ Invalid 'use'. Unbound module: 'std::signer'
+
+warning[W09002]: unused variable
+  ┌─ ./sources/UseSigner.move:4:16
+  │
+4 │   public fun f(account: &signer): address {
+  │                ^^^^^^^ Unused parameter 'account'. Consider removing or prefixing with an underscore: '_account'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03002]: unbound module
+  ┌─ ./sources/UseSigner.move:5:5
+  │
+5 │     signer::address_of(account)
+  │     ^^^^^^ Unbound module alias 'signer'
+
+Command `-d -v build`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING build_include_exclude_stdlib
diff --git a/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move
new file mode 100644
index 000000000..fdec0d78b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move
@@ -0,0 +1,7 @@
+module 0x1::Example {
+  use std::signer;
+
+  public fun f(account: &signer): address {
+    signer::address_of(account)
+  }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package/Move.toml
new file mode 100644
index 000000000..5c7941cbb
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package/args.exp b/vendors/move/crates/move-cli/tests/build_tests/public_package/args.exp
new file mode 100644
index 000000000..dffc3c3b3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package/args.exp
@@ -0,0 +1,2 @@
+Command `build -v`:
+BUILDING A
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/public_package/sources/A.move
new file mode 100644
index 000000000..d9c49195d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package/sources/A.move
@@ -0,0 +1,8 @@
+module A::defn {
+    public(package) fun definition(): u64 { 0 }
+}
+
+module A::usage {
+    use A::defn;
+    public fun usage(): u64 { defn::definition() }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/Move.toml
new file mode 100644
index 000000000..5e47d50be
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Defn"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x2"
+B = "0x3"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/args.exp b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/args.exp
new file mode 100644
index 000000000..34f1ee8de
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/args.exp
@@ -0,0 +1,13 @@
+Command `build -v`:
+BUILDING Defn
+error[E04001]: restricted visibility
+  ┌─ ./sources/B.move:3:31
+  │
+3 │     public fun usage(): u64 { defn::definition() }
+  │                               ^^^^^^^^^^^^^^^^^^ Invalid call to 'A::defn::definition'
+  │
+  ┌─ ./sources/A.move:2:5
+  │
+2 │     public(package) fun definition(): u64 { 0 }
+  │     --------------- A 'public(package)' function can only be called from the same address and package as module 'A::defn' in package 'Defn'. This call is from address 'B' in package 'Defn'
+
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/A.move
new file mode 100644
index 000000000..cbea22a3c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/A.move
@@ -0,0 +1,3 @@
+module A::defn {
+    public(package) fun definition(): u64 { 0 }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/B.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/B.move
new file mode 100644
index 000000000..a1ba22f6c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_addresses/sources/B.move
@@ -0,0 +1,4 @@
+module B::usage {
+    use A::defn;
+    public fun usage(): u64 { defn::definition() }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/Move.toml
new file mode 100644
index 000000000..b181e7e98
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "Usage"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x1"
+B = "0x2"
+
+[dependencies]
+Defn = { local = "./defn" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/args.exp b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/args.exp
new file mode 100644
index 000000000..98ef7811e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/args.exp
@@ -0,0 +1,14 @@
+Command `build -v`:
+INCLUDING DEPENDENCY Defn
+BUILDING Usage
+error[E04001]: restricted visibility
+  ┌─ ./sources/B.move:3:31
+  │
+3 │     public fun usage(): u64 { defn::definition() }
+  │                               ^^^^^^^^^^^^^^^^^^ Invalid call to 'A::defn::definition'
+  │
+  ┌─ ./defn/sources/A.move:2:5
+  │
+2 │     public(package) fun definition(): u64 { 0 }
+  │     --------------- A 'public(package)' function can only be called from the same address and package as module 'A::defn' in package 'Defn'. This call is from address 'B' in package 'Usage'
+
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/Move.toml
new file mode 100644
index 000000000..66d4400df
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Defn"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/sources/A.move
new file mode 100644
index 000000000..cbea22a3c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/defn/sources/A.move
@@ -0,0 +1,3 @@
+module A::defn {
+    public(package) fun definition(): u64 { 0 }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/sources/B.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/sources/B.move
new file mode 100644
index 000000000..a1ba22f6c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_both/sources/B.move
@@ -0,0 +1,4 @@
+module B::usage {
+    use A::defn;
+    public fun usage(): u64 { defn::definition() }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/Move.toml
new file mode 100644
index 000000000..69c842a84
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "Usage"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+Defn = { local = "./defn" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/args.exp b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/args.exp
new file mode 100644
index 000000000..2f0553a5d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/args.exp
@@ -0,0 +1,14 @@
+Command `build -v`:
+INCLUDING DEPENDENCY Defn
+BUILDING Usage
+error[E04001]: restricted visibility
+  ┌─ ./sources/A.move:3:31
+  │
+3 │     public fun usage(): u64 { defn::definition() }
+  │                               ^^^^^^^^^^^^^^^^^^ Invalid call to 'A::defn::definition'
+  │
+  ┌─ ./defn/sources/A.move:2:5
+  │
+2 │     public(package) fun definition(): u64 { 0 }
+  │     --------------- A 'public(package)' function can only be called from the same address and package as module 'A::defn' in package 'Defn'. This call is from address 'A' in package 'Usage'
+
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/Move.toml
new file mode 100644
index 000000000..66d4400df
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Defn"
+version = "0.0.0"
+edition = "2024.alpha"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/sources/A.move
new file mode 100644
index 000000000..cbea22a3c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/defn/sources/A.move
@@ -0,0 +1,3 @@
+module A::defn {
+    public(package) fun definition(): u64 { 0 }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/sources/A.move
new file mode 100644
index 000000000..142f690e6
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/public_package_different_packages/sources/A.move
@@ -0,0 +1,4 @@
+module A::usage {
+    use A::defn;
+    public fun usage(): u64 { defn::definition() }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move
new file mode 100644
index 000000000..f358fe72b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move
@@ -0,0 +1 @@
+module 0x1::Foo {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move
new file mode 100644
index 000000000..f358fe72b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move
@@ -0,0 +1 @@
+module 0x1::Foo {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move
new file mode 100644
index 000000000..f358fe72b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move
@@ -0,0 +1 @@
+module 0x1::Foo {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move
new file mode 100644
index 000000000..f358fe72b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move
@@ -0,0 +1 @@
+module 0x1::Foo {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move
new file mode 100644
index 000000000..f358fe72b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move
@@ -0,0 +1 @@
+module 0x1::Foo {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/args.exp b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/args.exp
new file mode 100644
index 000000000..827e259de
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/args.exp
@@ -0,0 +1,17 @@
+Command `new --path . Foo`:
+Command `build`:
+UPDATING GIT DEPENDENCY https://github.com/move-language/move.git
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Command `docgen --template template.md --exclude-impl --exclude-private-fun --exclude-specs --include-call-diagrams --include-dep-diagrams --independent-specs --no-collapsed-sections --output-directory doc --references-file template.md --section-level-start 3 --toc-depth 3`:
+Generated "doc/template.md"
+Generated "doc/Foo.md"
+
+Documentation generation successful!
+External Command `grep documentation doc/Foo.md`:
+Test documentation comment
+External Command `cat doc/template.md`:
+This is a test template
+
+
+This is a test template
diff --git a/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
new file mode 100644
index 000000000..6af365484
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
@@ -0,0 +1,5 @@
+module 0x1::Foo {
+    /// Test documentation comment
+    public fun foo() {
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/template.md b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/template.md
new file mode 100644
index 000000000..a9130f91a
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/simple_build_with_docs/template.md
@@ -0,0 +1 @@
+This is a test template
diff --git a/vendors/move/crates/move-cli/tests/build_tests/simple_new/args.exp b/vendors/move/crates/move-cli/tests/build_tests/simple_new/args.exp
new file mode 100644
index 000000000..b8f845deb
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/simple_new/args.exp
@@ -0,0 +1,22 @@
+Command `new P1`:
+External Command `cat P1/Move.toml`:
+[package]
+name = "P1"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std = "0x1"
+Command `new P2 -p other_dir`:
+External Command `cat other_dir/Move.toml`:
+[package]
+name = "P2"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_address/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/Move.toml
new file mode 100644
index 000000000..0ff9093eb
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_address/args.exp b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/args.exp
new file mode 100644
index 000000000..dde5aad95
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/args.exp
@@ -0,0 +1,12 @@
+Command `build -v`:
+Error: Unresolved addresses found. To fix this, add an entry for each unresolved address to the [addresses] section of ./Move.toml: e.g.,
+
+[addresses]
+std = "0x1"
+
+Alternatively, you can also define [dev-addresses] and call with the -d flag
+
+Caused by:
+    Unresolved addresses: [
+      Named address 'A' in package 'A'
+    ]
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_address/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/sources/A.move
new file mode 100644
index 000000000..72f7ec95d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_address/sources/A.move
@@ -0,0 +1 @@
+module A::A {}
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/Move.toml b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/Move.toml
new file mode 100644
index 000000000..59f0a6740
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+Foo = { local = "foo" }
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/args.exp b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/args.exp
new file mode 100644
index 000000000..aa534517b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/args.exp
@@ -0,0 +1,6 @@
+Command `build -v`:
+Error: Failed to resolve dependencies for package 'A'
+
+Caused by:
+    0: Parsing manifest for 'Foo'
+    1: No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/sources/A.move b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/sources/A.move
new file mode 100644
index 000000000..4fe8b3483
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_tests/unbound_dependency/sources/A.move
@@ -0,0 +1 @@
+module 0x1::A {}
diff --git a/vendors/move/crates/move-cli/tests/build_testsuite.rs b/vendors/move/crates/move-cli/tests/build_testsuite.rs
new file mode 100644
index 000000000..2da989bcc
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/build_testsuite.rs
@@ -0,0 +1,22 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/build_tests", r"args\.txt$");
diff --git a/vendors/move/crates/move-cli/tests/cli_tests.rs b/vendors/move/crates/move-cli/tests/cli_tests.rs
new file mode 100644
index 000000000..4d1bd6460
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/cli_tests.rs
@@ -0,0 +1,35 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::{env, path::PathBuf};
+
+pub const CLI_METATEST_PATH: [&str; 3] = ["tests", "metatests", "args.txt"];
+
+fn get_cli_binary_path() -> PathBuf {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    PathBuf::from(cli_exe)
+}
+
+fn get_metatest_path() -> PathBuf {
+    CLI_METATEST_PATH.iter().collect()
+}
+
+#[test]
+fn run_metatest() {
+    let path_cli_binary = get_cli_binary_path();
+    let path_metatest = get_metatest_path();
+
+    // local workspace + with coverage
+    assert!(test::run_all(&path_metatest, path_cli_binary.as_path(), false, true).is_ok());
+
+    // temp workspace + with coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, true, true).is_ok());
+
+    // local workspace + without coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, false, false).is_ok());
+
+    // temp workspace + without coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, true, false).is_ok());
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/args.exp b/vendors/move/crates/move-cli/tests/metatests/args.exp
new file mode 100644
index 000000000..f5e631547
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/args.exp
@@ -0,0 +1,36 @@
+Command `sandbox exp-test -p dummy/test_1/args.txt`:
+1 / 1 test(s) passed.
+Command `sandbox exp-test -p dummy/test_2`:
+1 / 1 test(s) passed.
+Command `sandbox exp-test -p dummy`:
+2 / 2 test(s) passed.
+Command `sandbox exp-test -p cov/plain --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Command `sandbox exp-test -p cov/two-runs-same-module --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M
+	fun test
+		total: 6
+		covered: 6
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Command `sandbox exp-test -p cov/two-runs-diff-module --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M1
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Module 0000000000000000000000000000000000000000000000000000000000000042::M2
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/plain/Move.toml b/vendors/move/crates/move-cli/tests/metatests/cov/plain/Move.toml
new file mode 100644
index 000000000..4ee420a10
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/plain/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "plain"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/plain/args.exp b/vendors/move/crates/move-cli/tests/metatests/cov/plain/args.exp
new file mode 100644
index 000000000..913e418e4
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/plain/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --dry-run`:
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/plain/scripts/test.move b/vendors/move/crates/move-cli/tests/metatests/cov/plain/scripts/test.move
new file mode 100644
index 000000000..d63dd6c53
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/plain/scripts/test.move
@@ -0,0 +1,7 @@
+script {
+    use 0x42::M;
+
+    fun test() {
+        M::test();
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/plain/sources/M.move b/vendors/move/crates/move-cli/tests/metatests/cov/plain/sources/M.move
new file mode 100644
index 000000000..48502e76c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/plain/sources/M.move
@@ -0,0 +1,3 @@
+module 0x42::M {
+    public fun test() {}
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
new file mode 100644
index 000000000..c960e3829
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "two-runs-diff-module"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
new file mode 100644
index 000000000..f06a082ec
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
+Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
new file mode 100644
index 000000000..fb8e286c8
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
@@ -0,0 +1,12 @@
+script {
+    use 0x42::M1;
+    use 0x42::M2;
+
+    fun test(x: u8) {
+        if (x == 0) {
+            M1::test();
+        } else {
+            M2::test();
+        }
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
new file mode 100644
index 000000000..e0526a316
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M1 {
+    public fun test() {}
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
new file mode 100644
index 000000000..31554319d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M2 {
+    public fun test() {}
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
new file mode 100644
index 000000000..d57bc0714
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "two-runs-same-module"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/args.exp b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
new file mode 100644
index 000000000..f06a082ec
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
+Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
new file mode 100644
index 000000000..ae8115e56
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
@@ -0,0 +1,7 @@
+script {
+    use 0x42::M;
+
+    fun test(x: u8) {
+        M::test(x);
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
new file mode 100644
index 000000000..356473bcc
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    public fun test(x: u8) {
+        if (x == 0) {
+            return ()
+        } else {
+            return ()
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/metatests/dummy/test_1/args.exp b/vendors/move/crates/move-cli/tests/metatests/dummy/test_1/args.exp
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-cli/tests/metatests/dummy/test_2/args.exp b/vendors/move/crates/move-cli/tests/metatests/dummy/test_2/args.exp
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml
new file mode 100644
index 000000000..f0915af2d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml
@@ -0,0 +1,15 @@
+[package]
+name = "Foo"
+version = "1.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+std = "0x1"
+A = "0x2"
+B = "0x3"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
+Bar = { local = "dep" }
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
new file mode 100644
index 000000000..1a336b71f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Running Move unit tests
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
new file mode 100644
index 000000000..f3f295152
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Running Move unit tests
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml
new file mode 100644
index 000000000..e06cac276
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Bar"
+version = "1.0.0"
+
+[addresses]
+B = "_"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move
new file mode 100644
index 000000000..ed6280681
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move
@@ -0,0 +1,3 @@
+module B::N {
+    public fun nop() {}
+}
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move
new file mode 100644
index 000000000..3a2a7d9ad
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move
@@ -0,0 +1,8 @@
+module A::M {
+    use B::N;
+
+    #[test]
+    fun nop() {
+        N::nop()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml
new file mode 100644
index 000000000..2578dc1d3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "StandaloneModule"
+version = "1.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+std = "0x1"
+A = "0x2"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
new file mode 100644
index 000000000..3b23eb8ca
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
new file mode 100644
index 000000000..ae0c6469e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move
new file mode 100644
index 000000000..bb34e95da
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move
@@ -0,0 +1,10 @@
+module A::M {
+    #[test]
+    fun nop() {}
+
+    #[test]
+    #[expected_failure]
+    fun explicit_abort_expect_failure() {
+        abort 42
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml
new file mode 100644
index 000000000..857ce0f1f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml
@@ -0,0 +1,12 @@
+[package]
+name = "StandaloneModule"
+version = "1.0.0"
+
+[addresses]
+A = "0x2"
+
+[dev-addresses]
+std = "0x1"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
new file mode 100644
index 000000000..3b23eb8ca
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
new file mode 100644
index 000000000..ae0c6469e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move
new file mode 100644
index 000000000..bb34e95da
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move
@@ -0,0 +1,10 @@
+module A::M {
+    #[test]
+    fun nop() {}
+
+    #[test]
+    #[expected_failure]
+    fun explicit_abort_expect_failure() {
+        abort 42
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs b/vendors/move/crates/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
new file mode 100644
index 000000000..342d3ecc4
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(
+    run_all,
+    "tests/move_unit_tests",
+    r"args(\.stackless)?\.txt$"
+);
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/.gitattributes b/vendors/move/crates/move-cli/tests/sandbox_tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
new file mode 100644
index 000000000..77a58870f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "build_modules_and_scripts"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
new file mode 100644
index 000000000..8a9cdeb80
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
@@ -0,0 +1,4 @@
+Command `-v sandbox publish`:
+Found 1 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
+Wrote 88 bytes of module ID's and code
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
new file mode 100644
index 000000000..2aad422f7
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
@@ -0,0 +1,4 @@
+script {
+    fun script1() {
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
new file mode 100644
index 000000000..705487768
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
@@ -0,0 +1,5 @@
+script {
+    fun script1() {
+        _ = 1 + 3;
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
new file mode 100644
index 000000000..323f521c5
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
@@ -0,0 +1,4 @@
+address 0x42 {
+module M {
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
new file mode 100644
index 000000000..ae3623a21
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "doctor_with_stdlib"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
new file mode 100644
index 000000000..2716d857b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox doctor`:
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
new file mode 100644
index 000000000..2a3b4679e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
@@ -0,0 +1,10 @@
+address 0x2 {
+module M {
+    use std::debug;
+
+    #[allow(unused_function)]
+    fun f() {
+        debug::print(&7);
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
new file mode 100644
index 000000000..63e2701b7
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_arithmetic_failure"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
new file mode 100644
index 000000000..f729dfdcb
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/script.move`:
+Execution failed because of an arithmetic error (i.e., integer overflow/underflow, div/mod by zero, or invalid shift) in script at code offset 2
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
new file mode 100644
index 000000000..c50366914
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
@@ -0,0 +1,5 @@
+script {
+    fun main() {
+        1 - 2; // will cause integer underflow
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
new file mode 100644
index 000000000..78e4889ad
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "explain_stdlib_abort"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
new file mode 100644
index 000000000..639dbbd0e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/bad_borrow.move`:
+Execution failed because of an error originated from vector operations (i.e., index out of bound, pop an empty vector, or unpack a vector with a wrong parity) in script at code offset 4
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
new file mode 100644
index 000000000..40beeef53
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
@@ -0,0 +1,7 @@
+script {
+    use std::vector;
+    fun bad_borrow() {
+        let v = vector::empty<bool>();
+        let _ref = vector::borrow(&v, 0);
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
new file mode 100644
index 000000000..0a336b3de
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_user_module_abort"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
new file mode 100644
index 000000000..e6721ea17
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/fail_script.move`:
+Execution aborted with code 77 in module 0000000000000000000000000000000000000000000000000000000000000002::Fail.
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
new file mode 100644
index 000000000..369f8b216
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
@@ -0,0 +1,6 @@
+script {
+    use 0x2::Fail;
+    fun fail_script() {
+        Fail::f();
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
new file mode 100644
index 000000000..955eb18c7
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
@@ -0,0 +1,7 @@
+address 0x2 {
+module Fail {
+    public fun f() {
+        abort 77
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
new file mode 100644
index 000000000..56019a3fc
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_user_tx_script_abort"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
new file mode 100644
index 000000000..3e9f0ecf8
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/abort_script.move`:
+Execution aborted with code 17 in transaction script
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
new file mode 100644
index 000000000..754f4d4e0
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
@@ -0,0 +1,5 @@
+script {
+    fun abort_script() {
+        abort 17
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/Move.toml
new file mode 100644
index 000000000..166d65b67
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "gas_metering"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/args.exp
new file mode 100644
index 000000000..b3b52aa34
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/looper.move --gas-budget 100`:
+Execution failed because of an out of gas error in script at code offset 0
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
new file mode 100644
index 000000000..b2cbcdd58
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
@@ -0,0 +1,5 @@
+script {
+    fun looper() {
+        loop {}
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
new file mode 100644
index 000000000..f8dbe44ab
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "generate_struct_layout"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
new file mode 100644
index 000000000..7c4520eea
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
@@ -0,0 +1,397 @@
+Command `sandbox publish`:
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M2.mv --struct C --type-args u64`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<u64>":
+  STRUCT:
+    - t: U64
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M2.mv --struct C --type-args address`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<AccountAddress>":
+  STRUCT:
+    - t:
+        TYPENAME: AccountAddress
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M2.mv --struct C --type-args vector<u8>`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<vector<u8>>":
+  STRUCT:
+    - t: BYTES
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct B --type-args bool`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M1::B<bool>":
+  STRUCT:
+    - a:
+        TYPENAME: AccountAddress
+    - c:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M2::C<bool>"
+    - t: BOOL
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<bool>":
+  STRUCT:
+    - t: BOOL
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M1::A<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>":
+  STRUCT:
+    - f: U64
+    - v: BYTES
+    - b:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::B<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>"
+"0000000000000000000000000000000000000000000000000000000000000001::M1::B<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>":
+  STRUCT:
+    - a:
+        TYPENAME: AccountAddress
+    - c:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M2::C<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>"
+    - t:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>"
+"0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>":
+  STRUCT:
+    - t: U64
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>":
+  STRUCT:
+    - t:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>"
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>>`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M1::A<vector<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>>":
+  STRUCT:
+    - f: U64
+    - v: BYTES
+    - b:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::B<vector<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>>"
+"0000000000000000000000000000000000000000000000000000000000000001::M1::B<vector<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>>":
+  STRUCT:
+    - a:
+        TYPENAME: AccountAddress
+    - c:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M2::C<vector<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>>"
+    - t:
+        SEQ:
+          TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>"
+"0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>":
+  STRUCT:
+    - t: U64
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<vector<0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>>>":
+  STRUCT:
+    - t:
+        SEQ:
+          TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::S<u64>"
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<0000000000000000000000000000000000000000000000000000000000000001::M2::C<u64>>":
+  STRUCT:
+    - t:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M2::C<u64>"
+    - b: BOOL
+"0000000000000000000000000000000000000000000000000000000000000001::M2::C<u64>":
+  STRUCT:
+    - t: U64
+    - b: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/M1.mv --struct G`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::M1::G":
+  STRUCT:
+    - x: U64
+    - s:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::M1::S<bool>"
+"0000000000000000000000000000000000000000000000000000000000000001::M1::S<bool>":
+  STRUCT:
+    - t: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::B":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::B":
+  STRUCT:
+    - dummy_field: BOOL
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::C":
+  STRUCT:
+    - a:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::phantoms::A"
+    - b:
+        TYPENAME: "0000000000000000000000000000000000000000000000000000000000000001::phantoms::B"
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::D<u64>":
+  STRUCT:
+    - v:
+        SEQ: U64
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types`:
+---
+"0000000000000000000000000000000000000000000000000000000000000001::phantoms::E<bool,u128>":
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+"phantoms::E<bool,u64,u128>":
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __`:
+---
+0000000000000000000000000000000000000000000000000000000000000001__phantoms__E__bool__u64__u128__:
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+
+Command `sandbox generate struct-layouts --module storage/0x0000000000000000000000000000000000000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 32
+phantoms__E__bool__u64__u128__:
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
new file mode 100644
index 000000000..7c6f5a31f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
@@ -0,0 +1,12 @@
+#[allow(unused_field)]
+module 0x1::M1 {
+    use 0x1::M2::C;
+
+    struct A<T> { f: u64, v: vector<u8>, b: B<T> }
+
+    struct B<T> { a: address, c: C<T>, t: T }
+
+    struct S<T> { t: T }
+
+    struct G { x: u64, s: S<bool> }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
new file mode 100644
index 000000000..8e8baa58f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
@@ -0,0 +1,5 @@
+module 0x1::M2 {
+
+    #[allow(unused_field)]
+    struct C<T> { t: T, b: bool }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
new file mode 100644
index 000000000..36c04fd66
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
@@ -0,0 +1,20 @@
+#[allow(unused_field)]
+module 0x1::phantoms {
+    struct A<phantom T> {}
+
+    struct B<phantom T1, phantom T2> {}
+
+    struct C<phantom T1, phantom T2, phantom T3> {
+        a: A<T1>,
+        b: B<T2, T3>
+    }
+
+    struct D<phantom T1, T2: store> {
+        v: vector<T2>
+    }
+
+    struct E<T1, phantom T2: store, T3> {
+        v1: vector<T1>,
+        v2: vector<T3>
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
new file mode 100644
index 000000000..de569ba5d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "module_publish_view"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
+Deps1 = { local = "deps1" }
+Deps2 = { local = "deps2" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/args.exp
new file mode 100644
index 000000000..8a27ec223
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/args.exp
@@ -0,0 +1,71 @@
+Command `sandbox publish -v`:
+Found 2 modules
+Publishing a new module 000000000000000000000000000000000000000000000000000000000000000a::M1 (wrote 247 bytes)
+Publishing a new module 000000000000000000000000000000000000000000000000000000000000000c::M (wrote 297 bytes)
+Wrote 544 bytes of module ID's and code
+Command `sandbox view storage/0x000000000000000000000000000000000000000000000000000000000000000a/modules/M1.mv`:
+// Move bytecode v6
+module a.M1 {
+use 0000000000000000000000000000000000000000000000000000000000000001::vector;
+
+
+struct S {
+	i: u64
+}
+
+public foo(Arg0: u64): vector<u64> {
+B0:
+	0: Call bar(): u64
+	1: StLoc[1](loc0: u64)
+	2: MoveLoc[0](Arg0: u64)
+	3: MoveLoc[1](loc0: u64)
+	4: Add
+	5: Call vector::singleton<u64>(u64): vector<u64>
+	6: Ret
+}
+public bar(): u64 {
+B0:
+	0: LdU64(7)
+	1: Ret
+}
+}
+Command `sandbox view storage/0x000000000000000000000000000000000000000000000000000000000000000c/modules/M.mv`:
+// Move bytecode v6
+module c.M {
+use 000000000000000000000000000000000000000000000000000000000000000a::A;
+use 000000000000000000000000000000000000000000000000000000000000000a::M as 1M;
+use 000000000000000000000000000000000000000000000000000000000000000b::B;
+use 000000000000000000000000000000000000000000000000000000000000000b::M as 2M;
+
+
+
+
+public f(): u64 {
+B0:
+	0: LdU64(7)
+	1: Ret
+}
+public g(): u64 {
+B0:
+	0: LdU64(12)
+	1: Ret
+}
+public call_f(): u64 {
+B0:
+	0: Call f(): u64
+	1: Call 1M::f(): u64
+	2: Add
+	3: Call 2M::f(): u64
+	4: Add
+	5: Ret
+}
+public call_g(): u64 {
+B0:
+	0: Call g(): u64
+	1: Call A::g(): u64
+	2: Add
+	3: Call B::g(): u64
+	4: Add
+	5: Ret
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
new file mode 100644
index 000000000..1ef5af725
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps1"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
new file mode 100644
index 000000000..fb8f12e6c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xa::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
new file mode 100644
index 000000000..6884c72ab
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xA::A {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
new file mode 100644
index 000000000..73b27bc13
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps2"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
new file mode 100644
index 000000000..3b0ef36d2
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xb::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
new file mode 100644
index 000000000..25170afeb
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xB::B {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
new file mode 100644
index 000000000..f5aed00e5
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
@@ -0,0 +1,15 @@
+module 0xa::M1 {
+    use std::vector;
+
+    #[allow(unused_field)]
+    struct S { i: u64 }
+
+    public fun foo(x: u64): vector<u64> {
+        let y = bar();
+        vector::singleton(x + y)
+    }
+
+    public fun bar(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
new file mode 100644
index 000000000..658fca02b
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
@@ -0,0 +1,18 @@
+module 0xc::M {
+
+    public fun f(): u64 {
+        7
+    }
+
+    public fun g(): u64 {
+        12
+    }
+
+    public fun call_f(): u64 {
+        f() + 0xa::M::f() + 0xb::M::f()
+    }
+
+    public fun call_g(): u64 {
+        g() + 0xa::A::g() + 0xb::B::g()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
new file mode 100644
index 000000000..c737ec728
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "module_publish_view"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/args.exp
new file mode 100644
index 000000000..e69881a37
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/args.exp
@@ -0,0 +1,18 @@
+Command `sandbox publish -v`:
+Found 1 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::Module (wrote 152 bytes)
+Wrote 152 bytes of module ID's and code
+Command `sandbox view storage/0x0000000000000000000000000000000000000000000000000000000000000042/modules/Module.mv`:
+// Move bytecode v6
+module 42.Module {
+struct S {
+	i: u64
+}
+
+public foo(Arg0: u64): S {
+B0:
+	0: MoveLoc[0](Arg0: u64)
+	1: Pack[0](S)
+	2: Ret
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
new file mode 100644
index 000000000..3bde7f18c
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module Module {
+    struct S { i: u64 }
+
+    public fun foo(i: u64): S {
+        S { i }
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
new file mode 100644
index 000000000..63d7cf4b9
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "multi_module_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
new file mode 100644
index 000000000..2a06a40c8
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
@@ -0,0 +1,35 @@
+Command `sandbox publish --bundle --override-ordering B -v`:
+Found 2 modules
+Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
+Command `sandbox publish --bundle --override-ordering B --override-ordering A -v`:
+Found 2 modules
+Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
+Command `sandbox publish --bundle --override-ordering A --override-ordering B -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::A (wrote 121 bytes)
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::B (wrote 129 bytes)
+Wrote 250 bytes of module ID's and code
+Command `sandbox view storage/0x0000000000000000000000000000000000000000000000000000000000000002/modules/A.mv`:
+// Move bytecode v6
+module 2.A {
+
+
+public(friend) foo() {
+B0:
+	0: Ret
+}
+}
+Command `sandbox view storage/0x0000000000000000000000000000000000000000000000000000000000000002/modules/B.mv`:
+// Move bytecode v6
+module 2.B {
+use 0000000000000000000000000000000000000000000000000000000000000002::A;
+
+
+
+
+bar() {
+B0:
+	0: Call A::foo()
+	1: Ret
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
new file mode 100644
index 000000000..c96b84ac9
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
@@ -0,0 +1,9 @@
+module 0x2::A {
+    friend 0x2::B;
+    public(friend) fun foo() {}
+}
+
+module 0x2::B {
+    #[allow(unused_function)]
+    fun bar() { 0x2::A::foo() }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/Move.toml
new file mode 100644
index 000000000..4424558f5
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "use_named_address"
+version = "0.0.0"
+
+[addresses]
+a = "0x42"
+
+[dependencies]
+Dep = { local = "dep", addr_subst = { "b" = "a" } }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/args.exp
new file mode 100644
index 000000000..60515cf6e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/args.exp
@@ -0,0 +1,16 @@
+Command `build`:
+INCLUDING DEPENDENCY Dep
+BUILDING use_named_address
+error[E04007]: incompatible types
+  ┌─ ./sources/example.move:3:9
+  │
+2 │     public fun next(): b::m::Y {
+  │                        ------- Expected: '(b=0x41)::m::Y'
+3 │         b::m::x()
+  │         ^^^^^^^^^ Invalid return expression
+  │
+  ┌─ ./dep/sources/m.move:4:21
+  │
+4 │     public fun x(): X {
+  │                     - Given: '(a=0x41)::m::X'
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/Move.toml
new file mode 100644
index 000000000..ba7bc7791
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Dep"
+version = "0.0.0"
+
+[addresses]
+a = "0x41"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/sources/m.move b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/sources/m.move
new file mode 100644
index 000000000..51a295baf
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/dep/sources/m.move
@@ -0,0 +1,7 @@
+module a::m {
+    struct X {}
+    struct Y {}
+    public fun x(): X {
+        X {}
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/sources/example.move b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/sources/example.move
new file mode 100644
index 000000000..e29478614
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/named_address_conflicts_in_error/sources/example.move
@@ -0,0 +1,5 @@
+module a::example {
+    public fun next(): b::m::Y {
+        b::m::x()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/Move.toml
new file mode 100644
index 000000000..362cba661
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "PackageBasics"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/args.exp
new file mode 100644
index 000000000..088dfb01f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/args.exp
@@ -0,0 +1,109 @@
+Command `build`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Command `test --coverage --threads 1`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModule::double_three
+[ PASS    ] 0x1::AModule::double_two
+[ PASS    ] 0x1::AModuleTests::double_one_one
+[ PASS    ] 0x1::AModuleTests::double_three
+[ PASS    ] 0x1::AModuleTests::double_zero_zero
+[ PASS    ] 0x1::AModuleTests::double_zero_zero_wrong
+Test result: OK. Total tests: 6; passed: 6; failed: 0
+Command `coverage summary --summarize-functions`:
++-------------------------+
+| Move Coverage Summary   |
++-------------------------+
+Module 0000000000000000000000000000000000000000000000000000000000000001::AModule
+	fun double_except_three
+		total: 11
+		covered: 11
+		% coverage: 100.00
+>>> % Module coverage: 100.00
++-------------------------+
+| % Move Coverage: 100.00  |
++-------------------------+
+Command `coverage source --module AModule`:
+module std::AModule {
+
+    /// x was three
+    const E_IS_THREE: u64 = 0;
+
+    public fun double_except_three(x: u64): u64 {
+        assert!(x != 3, E_IS_THREE);
+        x * x
+    }
+
+    #[test]
+    fun double_two() {
+        assert!(double_except_three(4) == 16, 0)
+    }
+
+    #[test]
+    #[expected_failure]
+    fun double_three() {
+        double_except_three(3);
+    }
+}
+Command `coverage bytecode --module AModule`:
+// Move bytecode v6
+module 1.AModule {
+
+
+public double_except_three(x#0#0: u64): u64 {
+B0:
+[6]	0: CopyLoc[0](x#0#0: u64)
+[6]	1: LdU64(3)
+[6]	2: Neq
+[6]	3: BrFalse(5)
+B1:
+[4]	4: Branch(7)
+B2:
+[2]	5: LdConst[0](U64: 00000000..)
+[2]	6: Abort
+B3:
+[4]	7: CopyLoc[0](x#0#0: u64)
+[4]	8: MoveLoc[0](x#0#0: u64)
+[4]	9: Mul
+[4]	10: Ret
+}
+
+Constants [
+	0 => u64: 0000000000000000
+]
+}
+Command `disassemble --package MoveStdlib --name signer`:
+// Move bytecode v6
+module 1.signer {
+
+
+native public borrow_address(s#0#0: &signer): &address
+public address_of(s#0#0: &signer): address {
+B0:
+	0: MoveLoc[0](s#0#0: &signer)
+	1: Call borrow_address(&signer): &address
+	2: ReadRef
+	3: Ret
+}
+}
+Command `errmap`:
+Command `info`:
+PackageBasics
+├── std:0x1
+└── MoveStdlib
+    └── std:0x1
+
+Command `test double_two`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModule::double_two
+Test result: OK. Total tests: 1; passed: 1; failed: 0
+Command `test one_one`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModuleTests::double_one_one
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/error_map.errmap b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/error_map.errmap
new file mode 100644
index 000000000..9aee442b1
Binary files /dev/null and b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/error_map.errmap differ
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
new file mode 100644
index 000000000..4c186804d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
@@ -0,0 +1,21 @@
+module std::AModule {
+
+    /// x was three
+    const E_IS_THREE: u64 = 0;
+
+    public fun double_except_three(x: u64): u64 {
+        assert!(x != 3, E_IS_THREE);
+        x * x
+    }
+
+    #[test]
+    fun double_two() {
+        assert!(double_except_three(4) == 16, 0)
+    }
+
+    #[test]
+    #[expected_failure]
+    fun double_three() {
+        double_except_three(3);
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
new file mode 100644
index 000000000..a1bebfeee
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
@@ -0,0 +1,26 @@
+#[test_only]
+module std::AModuleTests {
+    use std::AModule;
+
+    #[test]
+    fun double_zero_zero() {
+        assert!(AModule::double_except_three(0) == 0, 0)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location = std::AModule)]
+    fun double_three() {
+        AModule::double_except_three(3);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location = Self)]
+    fun double_zero_zero_wrong() {
+        assert!(AModule::double_except_three(0) == 1, 0)
+    }
+
+    #[test]
+    fun double_one_one() {
+        assert!(AModule::double_except_three(1) == 1, 0)
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
new file mode 100644
index 000000000..9ea65a2e7
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "print_stack_trace"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
new file mode 100644
index 000000000..145843946
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
@@ -0,0 +1,178 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/print_stack_trace.move --dry-run`:
+Call Stack:
+    [0] main
+
+        Code:
+            [10] LdU64(1)
+            [11] VecImmBorrow(2)
+            [12] StLoc(0)
+          > [13] CallGeneric(0)
+            [14] StLoc(2)
+            [15] ImmBorrowLoc(2)
+            [16] CallGeneric(1)
+
+        Locals:
+            [0] false
+            [1] [true, false]
+            [2] -
+
+
+    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<bool, u64>
+
+        Code:
+            [2] MutBorrowLoc(0)
+            [3] StLoc(1)
+            [4] LdU64(4)
+          > [5] Call(1)
+            [6] StLoc(2)
+            [7] MoveLoc(1)
+            [8] Pop
+
+        Locals:
+            [0] 3
+            [1] 3
+            [2] -
+
+
+    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+Operand Stack:
+    [0] 4
+    [1] 3
+    [2] 2
+
+[debug] 10
+Call Stack:
+    [0] main
+
+        Code:
+            [16] CallGeneric(1)
+            [17] MoveLoc(0)
+            [18] Pop
+          > [19] CallGeneric(2)
+            [20] Pop
+            [21] Ret
+
+        Locals:
+            [0] -
+            [1] [true, false]
+            [2] 10
+
+
+    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<u8, bool>
+
+        Code:
+            [2] MutBorrowLoc(0)
+            [3] StLoc(1)
+            [4] LdU64(4)
+          > [5] Call(1)
+            [6] StLoc(2)
+            [7] MoveLoc(1)
+            [8] Pop
+
+        Locals:
+            [0] 3
+            [1] 3
+            [2] -
+
+
+    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+Operand Stack:
+    [0] 4
+    [1] 3
+    [2] 2
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
new file mode 100644
index 000000000..0ffb92560
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
@@ -0,0 +1,17 @@
+script {
+use std::debug;
+use std::vector;
+use 0x2::N;
+
+#[allow(unused_mut_ref)]
+fun print_stack_trace() {
+    let v = vector::empty();
+    vector::push_back(&mut v, true);
+    vector::push_back(&mut v, false);
+    let r = vector::borrow(&mut v, 1);
+    let x = N::foo<bool, u64>();
+    debug::print(&x);
+    _ = r;
+    N::foo<u8,bool>();
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
new file mode 100644
index 000000000..3cc1425e2
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
@@ -0,0 +1,14 @@
+address 0x2 {
+module M {
+    use std::debug;
+
+    public fun sum(n: u64): u64 {
+        if (n < 2) {
+            debug::print_stack_trace();
+            n
+        } else {
+            n + sum(n - 1)
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
new file mode 100644
index 000000000..24f61a218
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
@@ -0,0 +1,14 @@
+address 0x2 {
+#[allow(unused_type_parameter, unused_mut_ref)]
+module N {
+    use 0x2::M;
+
+    public fun foo<T1, T2>(): u64 {
+        let x = 3;
+        let y = &mut x;
+        let z = M::sum(4);
+        _ = y;
+        z
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/Move.toml
new file mode 100644
index 000000000..f42494d53
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "print_values"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/args.exp
new file mode 100644
index 000000000..c6d94de4f
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/args.exp
@@ -0,0 +1,170 @@
+Command `sandbox publish`:
+Command `test`:
+INCLUDING DEPENDENCY MoveNursery
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING print_values
+Running Move unit tests
+[debug] 42
+[debug] [ 100, 200, 300 ]
+[debug] 0x2::M::Foo {
+  dummy_field: false
+}
+[debug] 0x2::M::Bar {
+  x: 404,
+  y: 0x2::M::Foo {
+    dummy_field: false
+  },
+  z: true
+}
+[debug] 0x2::M::Box<0x2::M::Foo> {
+  x: 0x2::M::Foo {
+    dummy_field: false
+  }
+}
+[debug] "test_print_quoted_string"
+[debug] "Can you say \"Hel\\lo\"?"
+[debug] "test_print_string"
+[debug] 0x48656c6c6f2c2073616e65204d6f766520646562756767696e6721
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_ascii_string"
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_primitive_types"
+[debug] 255
+[debug] 65535
+[debug] 4294967295
+[debug] 18446744073709551615
+[debug] 340282366920938463463374607431768211455
+[debug] 115792089237316195423570985008687907853269984665640564039457584007913129639935
+[debug] false
+[debug] true
+[debug] @0x1234c0ffee
+[debug] signer(0x0)
+[debug] "test_print_struct"
+[debug] 0x2::M::TestInner {
+  val: 100,
+  vec: [ 200, 400 ],
+  msgs: [
+    0x616263646566,
+    0x313233343536
+  ]
+}
+[debug] 0x2::M::TestInner {
+  val: 10,
+  vec: [],
+  msgs: []
+}
+[debug] "test_print_vectors"
+[debug] 0xffabcdef
+[debug] [ 16, 17, 18, 19 ]
+[debug] [ 32, 33, 34, 35 ]
+[debug] [ 64, 65, 66, 67 ]
+[debug] [ 128, 129, 130, 131 ]
+[debug] [ 256, 257, 258, 259 ]
+[debug] [ true, false ]
+[debug] [ @0x1234, @0x5678, @0xabcdef ]
+[debug] [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000), signer(0x200000000000000000000000000000000000000000000000000000000000000), signer(0x300000000000000000000000000000000000000000000000000000000000000) ]
+[debug] [
+  0x2::M::TestInner {
+    val: 4,
+    vec: [ 127, 128 ],
+    msgs: [
+      0x00ff,
+      0xabcd
+    ]
+  },
+  0x2::M::TestInner {
+    val: 8,
+    vec: [ 128, 129 ],
+    msgs: [
+      0x0000
+    ]
+  }
+]
+[debug] "test_print_vector_of_vectors"
+[debug] [
+  0xffab,
+  0xcdef
+]
+[debug] [
+  [ 16, 17 ],
+  [ 18, 19 ]
+]
+[debug] [
+  [ 32, 33 ],
+  [ 34, 35 ]
+]
+[debug] [
+  [ 64, 65 ],
+  [ 66, 67 ]
+]
+[debug] [
+  [ 128, 129 ],
+  [ 130, 131 ]
+]
+[debug] [
+  [ 256, 257 ],
+  [ 258, 259 ]
+]
+[debug] [
+  [ true, false ],
+  [ false, true ]
+]
+[debug] [
+  [ @0x1234, @0x5678 ],
+  [ @0xabcdef, @0x9999 ]
+]
+[debug] [
+  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ],
+  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ]
+]
+[debug] [
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ],
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ]
+]
+[debug] "test_print_nested_struct"
+[debug] 0x2::M::TestStruct {
+  addr: @0x1,
+  number: 255,
+  bytes: 0xc0ffee,
+  name: "He\"llo",
+  vec: [
+    0x2::M::TestInner {
+      val: 1,
+      vec: [ 130, 131 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 2,
+      vec: [ 132, 133 ],
+      msgs: []
+    }
+  ]
+}
+[debug] "test_print_generic_struct"
+[debug] 0x2::M::GenericStruct<0x2::M::Foo> {
+  val: 60
+}
+[ PASS    ] 0x2::M::test
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/sources/M.move
new file mode 100644
index 000000000..e4c8ba1f3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/print_values/sources/M.move
@@ -0,0 +1,279 @@
+address 0x2 {
+#[allow(unused_field)]
+module M {
+    #[test_only]
+    use std::ascii;
+    #[test_only]
+    use std::debug::print;
+    #[test_only]
+    use std::debug::print_string;
+    use std::string;
+    #[test_only]
+    use std::unit_test::create_signers_for_testing;
+    #[test_only]
+    use std::vector;
+
+    struct Foo has drop {}
+    struct Bar has drop { x: u128, y: Foo, z: bool }
+    struct Box<T> has drop { x: T }
+
+    struct GenericStruct<phantom T> has drop {
+        val: u64,
+    }
+
+    struct TestInner has drop {
+        val: u128,
+        vec: vector<u128>,
+        msgs: vector<vector<u8>>
+    }
+
+    struct TestStruct has drop {
+        addr: address,
+        number: u8,
+        bytes: vector<u8>,
+        name: string::String,
+        vec: vector<TestInner>,
+    }
+
+    #[test]
+    public fun test()  {
+        let x = 42;
+        print(&x);
+
+        let v = vector::empty();
+        vector::push_back(&mut v, 100);
+        vector::push_back(&mut v, 200);
+        vector::push_back(&mut v, 300);
+        print(&v);
+
+        let foo = Foo {};
+        print(&foo);
+
+        let bar = Bar { x: 404, y: Foo {}, z: true };
+        print(&bar);
+
+        let box = Box { x: Foo {} };
+        print(&box);
+
+        test_print_quoted_string();
+        test_print_string();
+        test_print_ascii_string();
+        test_print_primitive_types();
+        test_print_struct();
+        test_print_vectors();
+        test_print_vector_of_vectors();
+        test_print_nested_struct();
+        test_print_generic_struct();
+    }
+
+    #[test_only]
+    fun test_print_string() {
+        print_string(b"test_print_string");
+
+        let str_bytes = b"Hello, sane Move debugging!";
+
+        print(&str_bytes);
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_ascii_string() {
+        print_string(b"test_print_ascii_string");
+        print(&ascii::string(b"Hello, sane Move debugging!"));
+    }
+
+    #[test_only]
+    fun test_print_quoted_string() {
+        print_string(b"test_print_quoted_string");
+
+        let str_bytes = b"Can you say \"Hel\\lo\"?";
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_primitive_types() {
+        print_string(b"test_print_primitive_types");
+
+        let u8 = 255u8;
+        print(&u8);
+
+        let u16 = 65535u16;
+        print(&u16);
+
+        let u32 = 4294967295u32;
+        print(&u32);
+
+        let u64 = 18446744073709551615u64;
+        print(&u64);
+
+        let u128 = 340282366920938463463374607431768211455u128;
+        print(&u128);
+
+        let u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+        print(&u256);
+
+        let bool = false;
+        print(&bool);
+
+        let bool = true;
+        print(&bool);
+
+        let a = @0x1234c0ffee;
+        print(&a);
+
+        // print a signer
+        let senders = create_signers_for_testing(1);
+        let sender = vector::pop_back(&mut senders);
+        print(&sender);
+    }
+
+    #[allow(unused_const)]
+    const MSG_1 : vector<u8> = b"abcdef";
+    #[allow(unused_const)]
+    const MSG_2 : vector<u8> = b"123456";
+
+    #[test_only]
+    fun test_print_struct() {
+        print_string(b"test_print_struct");
+
+        let obj = TestInner {
+            val: 100,
+            vec: vector[200u128, 400u128],
+            msgs: vector[MSG_1, MSG_2],
+        };
+
+        print(&obj);
+
+        let obj = TestInner {
+            val: 10,
+            vec: vector[],
+            msgs: vector[],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_vectors() {
+        print_string(b"test_print_vectors");
+
+        let v_u8 = x"ffabcdef";
+        print(&v_u8);
+
+        let v_u16 = vector[16u16, 17u16, 18u16, 19u16];
+        print(&v_u16);
+
+        let v_u32 = vector[32u32, 33u32, 34u32, 35u32];
+        print(&v_u32);
+
+        let v_u64 = vector[64u64, 65u64, 66u64, 67u64];
+        print(&v_u64);
+
+        let v_u128 = vector[128u128, 129u128, 130u128, 131u128];
+        print(&v_u128);
+
+        let v_u256 = vector[256u256, 257u256, 258u256, 259u256];
+        print(&v_u256);
+
+        let v_bool = vector[true, false];
+        print(&v_bool);
+
+        let v_addr = vector[@0x1234, @0x5678, @0xabcdef];
+        print(&v_addr);
+
+        let v_signer = create_signers_for_testing(4);
+        print(&v_signer);
+
+        let v = vector[
+            TestInner {
+                val: 4u128,
+                vec: vector[127u128, 128u128],
+                msgs: vector[x"00ff", x"abcd"],
+            },
+            TestInner {
+                val: 8u128 ,
+                vec: vector[128u128, 129u128],
+                msgs: vector[x"0000"],
+            }
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_vector_of_vectors() {
+        print_string(b"test_print_vector_of_vectors");
+
+        let v_u8 = vector[x"ffab", x"cdef"];
+        print(&v_u8);
+
+        let v_u16 = vector[vector[16u16, 17u16], vector[18u16, 19u16]];
+        print(&v_u16);
+
+        let v_u32 = vector[vector[32u32, 33u32], vector[34u32, 35u32]];
+        print(&v_u32);
+
+        let v_u64 = vector[vector[64u64, 65u64], vector[66u64, 67u64]];
+        print(&v_u64);
+
+        let v_u128 = vector[vector[128u128, 129u128], vector[130u128, 131u128]];
+        print(&v_u128);
+
+        let v_u256 = vector[vector[256u256, 257u256], vector[258u256, 259u256]];
+        print(&v_u256);
+
+        let v_bool = vector[vector[true, false], vector[false, true]];
+        print(&v_bool);
+
+        let v_addr = vector[vector[@0x1234, @0x5678], vector[@0xabcdef, @0x9999]];
+        print(&v_addr);
+
+        let v_signer = vector[create_signers_for_testing(2), create_signers_for_testing(2)];
+        print(&v_signer);
+
+        let v = vector[
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ],
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ]
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_nested_struct() {
+        print_string(b"test_print_nested_struct");
+
+        let obj = TestStruct {
+            addr: @0x1,
+            number: 255u8,
+            bytes: x"c0ffee",
+            name: string::utf8(b"He\"llo"),
+            vec: vector[
+                TestInner { val: 1, vec: vector[130u128, 131u128], msgs: vector[] },
+                TestInner { val: 2, vec: vector[132u128, 133u128], msgs: vector[] }
+            ],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_generic_struct() {
+        print_string(b"test_print_generic_struct");
+
+        let obj = GenericStruct<Foo> {
+        val: 60u64,
+        };
+
+        print(&obj);
+    }
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
new file mode 100644
index 000000000..65548f920
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "publish_then_run"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/args.exp
new file mode 100644
index 000000000..d7b74549e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/main.move`:
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
new file mode 100644
index 000000000..9bed1bc40
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
@@ -0,0 +1,3 @@
+script {
+fun main() {}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
new file mode 100644
index 000000000..aac8c3531
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
@@ -0,0 +1,5 @@
+address 0x2 {
+module M {
+    public fun f() {}
+}
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/Move.toml
new file mode 100644
index 000000000..cfdde9f41
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "use_named_address"
+version = "0.0.0"
+
+[addresses]
+A = "0x42"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/args.exp
new file mode 100644
index 000000000..0b5689a09
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/args.exp
@@ -0,0 +1,12 @@
+Command `sandbox publish`:
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ ./sources/M_no_named.move:1:14
+  │
+1 │ module 0x42::M {
+  │              ^ Duplicate definition for module '0x42::M'
+  │
+  ┌─ ./sources/M.move:1:11
+  │
+1 │ module A::M {
+  │           - Module previously defined here, with 'A::M'
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M.move b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
new file mode 100644
index 000000000..a4c0e1174
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
@@ -0,0 +1,4 @@
+module A::M {
+    public fun useless() {
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
new file mode 100644
index 000000000..5892ff62d
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    public fun useless() {
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/N.move b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
new file mode 100644
index 000000000..be69510de
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
@@ -0,0 +1,6 @@
+
+module A::N {
+    public fun useless() {
+        A::M::useless()
+    }
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
new file mode 100644
index 000000000..25d4f10fd
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "verify_native_functions_in_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
new file mode 100644
index 000000000..97bc3e8be
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
@@ -0,0 +1,8 @@
+Command `sandbox publish --bundle --override-ordering M --override-ordering N`:
+Invalid multi-module publishing: VMError with status MISSING_DEPENDENCY at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000042, name: Identifier("M") } at index 0 for function handle
+error[E02007]: invalid 'fun' declaration
+  ┌─ ./sources/example.move:3:16
+  │
+3 │     native fun create_signer(addr: address): signer;
+  │                ^^^^^^^^^^^^^ Missing implementation for the native function M::create_signer
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
new file mode 100644
index 000000000..804767192
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    #[allow(unused_function)]
+    native fun create_signer(addr: address): signer;
+    #[allow(unused_function)]
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
new file mode 100644
index 000000000..77b10561e
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
@@ -0,0 +1,6 @@
+module 0x42::N {
+    #[allow(unused_function)]
+    native fun create_signer(addr: address): signer;
+    #[allow(unused_function)]
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
new file mode 100644
index 000000000..25d4f10fd
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "verify_native_functions_in_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
new file mode 100644
index 000000000..30ab2c9e3
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
@@ -0,0 +1,7 @@
+Command `sandbox publish`:
+error[E02007]: invalid 'fun' declaration
+  ┌─ ./sources/example.move:3:16
+  │
+3 │     native fun create_signer(addr: address): signer;
+  │                ^^^^^^^^^^^^^ Missing implementation for the native function M::create_signer
+
diff --git a/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
new file mode 100644
index 000000000..804767192
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    #[allow(unused_function)]
+    native fun create_signer(addr: address): signer;
+    #[allow(unused_function)]
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/move-cli/tests/sandbox_testsuite.rs b/vendors/move/crates/move-cli/tests/sandbox_testsuite.rs
new file mode 100644
index 000000000..d00c0e592
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/sandbox_testsuite.rs
@@ -0,0 +1,22 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/sandbox_tests", r"args\.txt$");
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/Move.toml b/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move b/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/Move.toml b/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move b/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/Move.toml b/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move b/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/Move.toml b/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move b/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/move-cli/tools.md b/vendors/move/crates/move-cli/tools.md
new file mode 100644
index 000000000..d2cbd9ec5
--- /dev/null
+++ b/vendors/move/crates/move-cli/tools.md
@@ -0,0 +1,51 @@
+---
+id: tools
+title: Move Tools
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/README.md
+---
+
+# Summary
+
+Move has a number of tools associated with it. This directory contains all,
+or almost all of them. The following crates in this directory are libraries
+that are used by the [`move-cli`](./move-cli) `package` subcommand:
+
+* `move-bytecode-viewer`
+* `move-disassembler`
+* `move-explain`
+* `move-unit-test`
+* `move-package`
+* `move-coverage`
+
+In this sense each of these crates defines the core logic for a specific
+package command, e.g., how to run and report unit tests, or collect and
+display test coverage information. However, the Move CLI is responsible for
+stitching these commands together, e.g., when running a move unit test the
+Move CLI is responsible for first making sure the package was built in
+`test` mode ( using the `move-package` library), collecting the test plan
+to feed to the `move-unit-test` library, and returning a non-zero error
+code if a test fails.
+
+Generally, if you want to see how various tools interact with each other,
+or how a normal Move user would interact with these tools, you should first
+look at the Move CLI (specifically the `package` subdirectory/command) as
+that is responsible for stitching everything together. If you are looking
+for where the logic for a specific tool is defined, this is most likely in
+the specific crate for that tool (e.g., if you want to see how TUIs are
+handled for the `move-bytecode-viewer` that's defined in the
+`move-bytecode-viewer` crate, and not the `move-cli` crate).
+
+Some of the crates mentioned above are also binaries at the moment, however
+they should all be able to be made libaries only, with the possible
+exception of the `move-coverage` crate. The primary reason for this, is
+that this tool can collect and report test coverage statistics across
+multiple packages, and multiple runs over a package. This functionality is
+important if you have a large functional test suite such as Diem's and want
+to gather coverage information across all of them.
+
+The `move-resource-viewer` is a library crate that is used by and exposed by
+the Move CLI, but not through the `package` subcommand.
+
+The `move-bytecode-utils` crates holds general
+utilities for working with Move bytecode, e.g., computing the dependency
+order for modules.
diff --git a/vendors/move/crates/move-command-line-common/Cargo.toml b/vendors/move/crates/move-command-line-common/Cargo.toml
new file mode 100644
index 000000000..9e17605de
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "move-command-line-common"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move shared command line and file tools"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+difference.workspace = true
+walkdir.workspace = true
+sha2.workspace = true
+hex.workspace = true
+num-bigint.workspace = true
+once_cell.workspace = true
+serde.workspace = true
+dirs-next.workspace = true
+
+move-core-types.workspace = true
diff --git a/vendors/move/crates/move-command-line-common/src/address.rs b/vendors/move/crates/move-command-line-common/src/address.rs
new file mode 100644
index 000000000..4f4c173f7
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/address.rs
@@ -0,0 +1,165 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::{parse_address_number, NumberFormat};
+use anyhow::anyhow;
+use move_core_types::account_address::AccountAddress;
+use num_bigint::BigUint;
+use std::{fmt, hash::Hash};
+
+// Parsed Address, either a name or a numerical address
+#[derive(Eq, PartialEq, Debug, Clone)]
+pub enum ParsedAddress {
+    Named(String),
+    Numerical(NumericalAddress),
+}
+
+/// Numerical address represents non-named address values
+/// or the assigned value of a named address
+#[derive(Clone, Copy)]
+pub struct NumericalAddress {
+    /// the number for the address
+    bytes: AccountAddress,
+    /// The format (e.g. decimal or hex) for displaying the number
+    format: NumberFormat,
+}
+
+impl ParsedAddress {
+    pub fn into_account_address(
+        self,
+        mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<AccountAddress> {
+        match self {
+            Self::Named(n) => {
+                mapping(n.as_str()).ok_or_else(|| anyhow!("Unbound named address: '{}'", n))
+            }
+            Self::Numerical(a) => Ok(a.into_inner()),
+        }
+    }
+}
+
+impl NumericalAddress {
+    // bytes used for errors when an address is not known but is needed
+    pub const DEFAULT_ERROR_ADDRESS: Self = NumericalAddress {
+        bytes: AccountAddress::ONE,
+        format: NumberFormat::Hex,
+    };
+
+    pub const fn new(bytes: [u8; AccountAddress::LENGTH], format: NumberFormat) -> Self {
+        Self {
+            bytes: AccountAddress::new(bytes),
+            format,
+        }
+    }
+
+    pub fn into_inner(self) -> AccountAddress {
+        self.bytes
+    }
+
+    pub fn into_bytes(self) -> [u8; AccountAddress::LENGTH] {
+        self.bytes.into_bytes()
+    }
+
+    pub fn parse_str(s: &str) -> Result<NumericalAddress, String> {
+        match parse_address_number(s) {
+            Some((n, format)) => Ok(NumericalAddress {
+                bytes: AccountAddress::new(n),
+                format,
+            }),
+            None =>
+            // TODO the kind of error is in an unstable nightly API
+            // But currently the only way this should fail is if the number is too long
+            {
+                Err(format!(
+                    "Invalid address literal. The numeric value is too large. \
+                    The maximum size is {} bytes",
+                    AccountAddress::LENGTH,
+                ))
+            }
+        }
+    }
+}
+
+impl AsRef<[u8]> for NumericalAddress {
+    fn as_ref(&self) -> &[u8] {
+        self.bytes.as_ref()
+    }
+}
+
+impl fmt::Display for NumericalAddress {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.format {
+            NumberFormat::Decimal => {
+                let n = BigUint::from_bytes_be(self.bytes.as_ref());
+                write!(f, "{}", n)
+            }
+            NumberFormat::Hex => write!(f, "{:#X}", self),
+        }
+    }
+}
+
+impl fmt::Debug for NumericalAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::UpperHex for NumericalAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let encoded = hex::encode_upper(self.as_ref());
+        let dropped = encoded
+            .chars()
+            .skip_while(|c| c == &'0')
+            .collect::<String>();
+        let prefix = if f.alternate() { "0x" } else { "" };
+        if dropped.is_empty() {
+            write!(f, "{}0", prefix)
+        } else {
+            write!(f, "{}{}", prefix, dropped)
+        }
+    }
+}
+
+impl PartialOrd for NumericalAddress {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+impl Ord for NumericalAddress {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        let Self {
+            bytes: self_bytes,
+            format: _,
+        } = self;
+        let Self {
+            bytes: other_bytes,
+            format: _,
+        } = other;
+        self_bytes.cmp(other_bytes)
+    }
+}
+
+impl PartialEq for NumericalAddress {
+    fn eq(&self, other: &Self) -> bool {
+        let Self {
+            bytes: self_bytes,
+            format: _,
+        } = self;
+        let Self {
+            bytes: other_bytes,
+            format: _,
+        } = other;
+        self_bytes == other_bytes
+    }
+}
+impl Eq for NumericalAddress {}
+
+impl Hash for NumericalAddress {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let Self {
+            bytes: self_bytes,
+            format: _,
+        } = self;
+        self_bytes.hash(state)
+    }
+}
diff --git a/vendors/move/crates/move-command-line-common/src/character_sets.rs b/vendors/move/crates/move-command-line-common/src/character_sets.rs
new file mode 100644
index 000000000..4700c535e
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/character_sets.rs
@@ -0,0 +1,130 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt::{self, Display};
+
+/// Determine if a character is an allowed eye-visible (printable) character.
+///
+/// The only allowed printable characters are the printable ascii characters (SPACE through ~) and
+/// tabs. All other characters are invalid and we return false.
+pub fn is_permitted_printable_char(c: char) -> bool {
+    let x = c as u32;
+    let is_above_space = x >= 0x20; // Don't allow meta characters
+    let is_below_tilde = x <= 0x7E; // Don't allow DEL meta character
+    let is_tab = x == 0x09; // Allow tabs
+    (is_above_space && is_below_tilde) || is_tab
+}
+
+/// Determine if a character is a permitted newline lf character.
+///
+/// The only permitted newline lf character is \n All others are invalid.
+pub fn is_permitted_newline_lf_char(c: char) -> bool {
+    let x = c as u32;
+    x == 0x0A // \n
+}
+
+/// Determine if a character is a permitted newline crlf character.
+///
+/// The only permitted newline character is \r\n. All others are invalid.
+pub fn is_permitted_newline_crlf_chars(c1: char, c2: char) -> bool {
+    let x1 = c1 as u32;
+    let x2 = c2 as u32;
+    let is_cr = x1 == 0x0D; // \r
+    let is_lf = x2 == 0x0A; // \n
+    is_cr && is_lf
+}
+
+// Taken from https://en.wikipedia.org/wiki/Bidirectional_text
+// TODO Double check 200F 200E 061C
+const UNICODE_TEXT_DIRECTIONALITY_CONTROL_CHARS: &[char] = &[
+    '\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}',
+    '\u{2069}',
+];
+
+/// Is some other non-whitespace unicode character
+pub fn is_permitted_non_ascii_unicode(c: char) -> bool {
+    !c.is_ascii() && !c.is_whitespace() && !UNICODE_TEXT_DIRECTIONALITY_CONTROL_CHARS.contains(&c)
+}
+
+/// Determine if a character is permitted character.
+///
+/// A permitted character is either a permitted printable character, or a permitted
+/// newline. Any other characters are disallowed from appearing in the file.
+pub fn is_permitted_char(c: char) -> bool {
+    is_permitted_printable_char(c)
+        || is_permitted_newline_lf_char(c)
+        || is_permitted_non_ascii_unicode(c)
+}
+
+/// Determine if the characters is permitted characters.
+///
+/// A permitted characters is either a permitted printable character, or a permitted
+/// newlines. Any other characters are disallowed from appearing in the file.
+pub fn is_permitted_chars(chars: &[char], idx: usize) -> bool {
+    let c1 = chars[idx];
+    if is_permitted_char(c1) {
+        return true;
+    }
+
+    if idx + 1 >= chars.len() {
+        return false;
+    }
+
+    let c2 = chars[idx + 1];
+    is_permitted_newline_crlf_chars(c1, c2)
+}
+
+/// simple wrapper for displaying characters. Escapes non-printable characters for error messages
+pub struct DisplayChar(pub char);
+
+impl Display for DisplayChar {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.0 == ' ' || self.0.is_alphanumeric() || self.0.is_ascii_punctuation() {
+            self.0.fmt(f)
+        } else {
+            self.0.escape_default().fmt(f)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_permitted_characters() {
+        let mut good_chars = (0x20..=0x7Eu8).map(|u| u as char).collect::<Vec<char>>();
+        good_chars.push('\r');
+        good_chars.push('\n');
+        good_chars.push('\t');
+
+        for idx in 0..good_chars.len() {
+            assert!(super::is_permitted_chars(&good_chars, idx));
+        }
+    }
+
+    #[test]
+    fn test_forbidden_last_lf_characters() {
+        let mut good_chars = (0x20..=0x7Eu8).map(|u| u as char).collect::<Vec<char>>();
+        good_chars.push('\r');
+
+        assert!(!super::is_permitted_chars(
+            &good_chars,
+            good_chars.len() - 1
+        ));
+    }
+
+    #[test]
+    fn test_forbidden_characters() {
+        let mut bad_chars = (0x0..0x09u8).map(|u| u as char).collect::<Vec<char>>();
+        bad_chars.extend((0x0B..=0x1Fu8).map(|u| u as char));
+        bad_chars.push(0x7Fu8 as char);
+
+        for idx in 0..bad_chars.len() {
+            assert!(
+                !super::is_permitted_chars(&bad_chars, idx),
+                "{:X?} is permitted",
+                bad_chars[idx] as u8
+            );
+        }
+    }
+}
diff --git a/vendors/move/crates/move-command-line-common/src/env.rs b/vendors/move/crates/move-command-line-common/src/env.rs
new file mode 100644
index 000000000..ac247159c
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/env.rs
@@ -0,0 +1,38 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use once_cell::sync::Lazy;
+
+/// An environment variable which can be set to cause the move compiler to generate
+/// file formats at a given version. Only version v5 and greater are supported.
+const BYTECODE_VERSION_ENV_VAR: &str = "MOVE_BYTECODE_VERSION";
+
+/// Get the bytecode version from the environment variable.
+// TODO: This should be configurable via toml and command line flags. See also #129.
+pub fn get_bytecode_version_from_env() -> Option<u32> {
+    std::env::var(BYTECODE_VERSION_ENV_VAR)
+        .ok()
+        .and_then(|s| s.parse::<u32>().ok())
+}
+
+pub fn read_env_var(v: &str) -> String {
+    std::env::var(v).unwrap_or_else(|_| String::new())
+}
+
+pub fn read_bool_env_var(v: &str) -> bool {
+    let val = read_env_var(v).to_lowercase();
+    val.parse::<bool>() == Ok(true) || val.parse::<usize>() == Ok(1)
+}
+
+pub static MOVE_HOME: Lazy<String> = Lazy::new(|| {
+    std::env::var("MOVE_HOME").unwrap_or_else(|_| {
+        format!(
+            "{}/.move",
+            dirs_next::home_dir()
+                .expect("user's home directory not found")
+                .to_str()
+                .unwrap()
+        )
+    })
+});
diff --git a/vendors/move/crates/move-command-line-common/src/files.rs b/vendors/move/crates/move-command-line-common/src/files.rs
new file mode 100644
index 000000000..605f46819
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/files.rs
@@ -0,0 +1,182 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, bail, *};
+use serde::{Deserialize, Serialize};
+use sha2::Digest;
+use std::{collections::BTreeMap, convert::TryInto, path::Path};
+
+/// Result of sha256 hash of a file's contents.
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
+pub struct FileHash(pub [u8; 32]);
+
+impl FileHash {
+    pub fn new(file_contents: &str) -> Self {
+        Self(
+            sha2::Sha256::digest(file_contents.as_bytes())
+                .try_into()
+                .expect("Length of sha256 digest must always be 32 bytes"),
+        )
+    }
+
+    pub const fn empty() -> Self {
+        Self([0; 32])
+    }
+}
+
+impl std::fmt::Display for FileHash {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        hex::encode(self.0).fmt(f)
+    }
+}
+
+impl std::fmt::Debug for FileHash {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        hex::encode(self.0).fmt(f)
+    }
+}
+
+/// Extension for Move source language files
+pub const MOVE_EXTENSION: &str = "move";
+/// Extension for Move IR files
+pub const MOVE_IR_EXTENSION: &str = "mvir";
+/// Extension for Move bytecode files
+pub const MOVE_COMPILED_EXTENSION: &str = "mv";
+/// Extension for Move source map files (mappings from source to bytecode)
+pub const SOURCE_MAP_EXTENSION: &str = "mvsm";
+/// Extension for error description map for compiled releases
+pub const MOVE_ERROR_DESC_EXTENSION: &str = "errmap";
+/// Extension for coverage maps
+pub const MOVE_COVERAGE_MAP_EXTENSION: &str = "mvcov";
+
+/// Determine if the path at `path` exists distinguishing between whether the path did not exist,
+/// or if there were other errors in determining if the path existed.
+/// TODO: Once `std::path::try_exists` stops being a nightly feature this function should be
+/// removed and we should use that function instead.
+pub fn try_exists(path: impl AsRef<Path>) -> std::io::Result<bool> {
+    use std::io::{ErrorKind, Result as R};
+    match std::fs::metadata(path) {
+        R::Ok(_) => R::Ok(true),
+        R::Err(e) if e.kind() == ErrorKind::NotFound => R::Ok(false),
+        R::Err(e) => R::Err(e),
+    }
+}
+
+/// - For each directory in `paths`, it will return all files that satisfy the predicate
+/// - Any file explicitly passed in `paths`, it will include that file in the result, regardless
+///   of the file extension
+pub fn find_filenames<Predicate: FnMut(&Path) -> bool>(
+    paths: &[impl AsRef<Path>],
+    mut is_file_desired: Predicate,
+) -> anyhow::Result<Vec<String>> {
+    let mut result = vec![];
+
+    for s in paths {
+        let path = s.as_ref();
+        if !try_exists(path)? {
+            bail!("No such file or directory '{}'", path.to_string_lossy())
+        }
+        if path.is_file() && is_file_desired(path) {
+            result.push(path_to_string(path)?);
+            continue;
+        }
+        if !path.is_dir() {
+            continue;
+        }
+        for entry in walkdir::WalkDir::new(path)
+            .follow_links(true)
+            .into_iter()
+            .filter_map(|e| e.ok())
+        {
+            let entry_path = entry.path();
+            if !entry.file_type().is_file() || !is_file_desired(entry_path) {
+                continue;
+            }
+
+            result.push(path_to_string(entry_path)?);
+        }
+    }
+    Ok(result)
+}
+
+/// - For each directory in `paths`, it will return all files with the `MOVE_EXTENSION` found
+///   recursively in that directory
+/// - If `keep_specified_files` any file explicitly passed in `paths`, will be added to the result
+///   Otherwise, they will be discarded
+pub fn find_move_filenames(
+    paths: &[impl AsRef<Path>],
+    keep_specified_files: bool,
+) -> anyhow::Result<Vec<String>> {
+    if keep_specified_files {
+        let (file_paths, other_paths): (Vec<&Path>, Vec<&Path>) =
+            paths.iter().map(|p| p.as_ref()).partition(|s| s.is_file());
+        let mut files = file_paths
+            .into_iter()
+            .map(path_to_string)
+            .collect::<anyhow::Result<Vec<String>>>()?;
+        files.extend(find_filenames(&other_paths, |path| {
+            extension_equals(path, MOVE_EXTENSION)
+        })?);
+        Ok(files)
+    } else {
+        find_filenames(paths, |path| extension_equals(path, MOVE_EXTENSION))
+    }
+}
+
+pub fn path_to_string(path: &Path) -> anyhow::Result<String> {
+    match path.to_str() {
+        Some(p) => Ok(p.to_string()),
+        None => Err(anyhow!("non-Unicode file name")),
+    }
+}
+
+pub fn extension_equals(path: &Path, target_ext: &str) -> bool {
+    match path.extension().and_then(|s| s.to_str()) {
+        Some(extension) => extension == target_ext,
+        None => false,
+    }
+}
+
+pub fn verify_and_create_named_address_mapping<T: Copy + std::fmt::Display + Eq>(
+    named_addresses: Vec<(String, T)>,
+) -> anyhow::Result<BTreeMap<String, T>> {
+    let mut mapping = BTreeMap::new();
+    let mut invalid_mappings = BTreeMap::new();
+    for (name, addr_bytes) in named_addresses {
+        match mapping.insert(name.clone(), addr_bytes) {
+            Some(other_addr) if other_addr != addr_bytes => {
+                invalid_mappings
+                    .entry(name)
+                    .or_insert_with(Vec::new)
+                    .push(other_addr);
+            }
+            None | Some(_) => (),
+        }
+    }
+
+    if !invalid_mappings.is_empty() {
+        let redefinitions = invalid_mappings
+            .into_iter()
+            .map(|(name, addr_bytes)| {
+                format!(
+                    "{} is assigned differing values {} and {}",
+                    name,
+                    addr_bytes
+                        .iter()
+                        .map(|x| format!("{}", x))
+                        .collect::<Vec<_>>()
+                        .join(","),
+                    mapping[&name]
+                )
+            })
+            .collect::<Vec<_>>();
+
+        anyhow::bail!(
+            "Redefinition of named addresses found in arguments to compiler: {}",
+            redefinitions.join(", ")
+        )
+    }
+
+    Ok(mapping)
+}
diff --git a/vendors/move/crates/move-command-line-common/src/lib.rs b/vendors/move/crates/move-command-line-common/src/lib.rs
new file mode 100644
index 000000000..5bb4087c9
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/lib.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod address;
+pub mod character_sets;
+pub mod env;
+pub mod files;
+pub mod parser;
+pub mod testing;
+pub mod types;
+pub mod values;
diff --git a/vendors/move/crates/move-command-line-common/src/parser.rs b/vendors/move/crates/move-command-line-common/src/parser.rs
new file mode 100644
index 000000000..e6856c0ff
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/parser.rs
@@ -0,0 +1,638 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    address::{NumericalAddress, ParsedAddress},
+    types::{ParsedStructType, ParsedType, TypeToken},
+    values::{ParsableValue, ParsedValue, ValueToken},
+};
+use anyhow::{anyhow, bail, Result};
+use move_core_types::{
+    account_address::AccountAddress,
+    u256::{U256FromStrError, U256},
+};
+use num_bigint::BigUint;
+use std::{fmt::Display, iter::Peekable, num::ParseIntError};
+
+const MAX_TYPE_DEPTH: u64 = 128;
+const MAX_TYPE_NODE_COUNT: u64 = 256;
+
+pub trait Token: Display + Copy + Eq {
+    fn is_whitespace(&self) -> bool;
+    fn next_token(s: &str) -> Result<Option<(Self, usize)>>;
+    fn tokenize(mut s: &str) -> Result<Vec<(Self, &str)>> {
+        let mut v = vec![];
+        while let Some((tok, n)) = Self::next_token(s)? {
+            v.push((tok, &s[..n]));
+            s = &s[n..];
+        }
+        Ok(v)
+    }
+}
+
+pub struct Parser<'a, Tok: Token, I: Iterator<Item = (Tok, &'a str)>> {
+    count: u64,
+    it: Peekable<I>,
+}
+
+impl ParsedType {
+    pub fn parse(s: &str) -> Result<ParsedType> {
+        parse(s, |parser| parser.parse_type())
+    }
+}
+
+impl ParsedStructType {
+    pub fn parse(s: &str) -> Result<ParsedStructType> {
+        let ty = parse(s, |parser| parser.parse_type())
+            .map_err(|e| anyhow!("Invalid struct type: {}. Got error: {}", s, e))?;
+        match ty {
+            ParsedType::Struct(s) => Ok(s),
+            _ => bail!("Invalid struct type: {}", s),
+        }
+    }
+}
+
+impl ParsedAddress {
+    pub fn parse(s: &str) -> Result<ParsedAddress> {
+        parse(s, |parser| parser.parse_address())
+    }
+}
+
+impl<Extra: ParsableValue> ParsedValue<Extra> {
+    pub fn parse(s: &str) -> Result<ParsedValue<Extra>> {
+        parse(s, |parser| parser.parse_value())
+    }
+}
+
+fn parse<'a, Tok: Token, R>(
+    s: &'a str,
+    f: impl FnOnce(&mut Parser<'a, Tok, std::vec::IntoIter<(Tok, &'a str)>>) -> Result<R>,
+) -> Result<R> {
+    let tokens: Vec<_> = Tok::tokenize(s)?
+        .into_iter()
+        .filter(|(tok, _)| !tok.is_whitespace())
+        .collect();
+    let mut parser = Parser::new(tokens);
+    let res = f(&mut parser)?;
+    if let Ok((_, contents)) = parser.advance_any() {
+        bail!("Expected end of token stream. Got: {}", contents)
+    }
+    Ok(res)
+}
+
+impl<'a, Tok: Token, I: Iterator<Item = (Tok, &'a str)>> Parser<'a, Tok, I> {
+    pub fn new<T: IntoIterator<Item = (Tok, &'a str), IntoIter = I>>(v: T) -> Self {
+        Self {
+            count: 0,
+            it: v.into_iter().peekable(),
+        }
+    }
+
+    pub fn advance_any(&mut self) -> Result<(Tok, &'a str)> {
+        match self.it.next() {
+            Some(tok) => Ok(tok),
+            None => bail!("unexpected end of tokens"),
+        }
+    }
+
+    pub fn advance(&mut self, expected_token: Tok) -> Result<&'a str> {
+        let (t, contents) = self.advance_any()?;
+        if t != expected_token {
+            bail!("expected token {}, got {}", expected_token, t)
+        }
+        Ok(contents)
+    }
+
+    pub fn peek(&mut self) -> Option<(Tok, &'a str)> {
+        self.it.peek().copied()
+    }
+
+    pub fn peek_tok(&mut self) -> Option<Tok> {
+        self.it.peek().map(|(tok, _)| *tok)
+    }
+
+    pub fn parse_list<R>(
+        &mut self,
+        parse_list_item: impl Fn(&mut Self) -> Result<R>,
+        delim: Tok,
+        end_token: Tok,
+        allow_trailing_delim: bool,
+    ) -> Result<Vec<R>> {
+        let is_end =
+            |tok_opt: Option<Tok>| -> bool { tok_opt.map(|tok| tok == end_token).unwrap_or(true) };
+        let mut v = vec![];
+        while !is_end(self.peek_tok()) {
+            v.push(parse_list_item(self)?);
+            if is_end(self.peek_tok()) {
+                break;
+            }
+            self.advance(delim)?;
+            if is_end(self.peek_tok()) && allow_trailing_delim {
+                break;
+            }
+        }
+        Ok(v)
+    }
+}
+
+impl<'a, I: Iterator<Item = (TypeToken, &'a str)>> Parser<'a, TypeToken, I> {
+    pub fn parse_type(&mut self) -> Result<ParsedType> {
+        self.parse_type_impl(0)
+    }
+
+    fn parse_type_impl(&mut self, depth: u64) -> Result<ParsedType> {
+        self.count += 1;
+
+        if depth > MAX_TYPE_DEPTH || self.count > MAX_TYPE_NODE_COUNT {
+            bail!("Type exceeds maximum nesting depth or node count")
+        }
+        let (tok, contents) = self.advance_any()?;
+        Ok(match (tok, contents) {
+            (TypeToken::Ident, "u8") => ParsedType::U8,
+            (TypeToken::Ident, "u16") => ParsedType::U16,
+            (TypeToken::Ident, "u32") => ParsedType::U32,
+            (TypeToken::Ident, "u64") => ParsedType::U64,
+            (TypeToken::Ident, "u128") => ParsedType::U128,
+            (TypeToken::Ident, "u256") => ParsedType::U256,
+            (TypeToken::Ident, "bool") => ParsedType::Bool,
+            (TypeToken::Ident, "address") => ParsedType::Address,
+            (TypeToken::Ident, "signer") => ParsedType::Signer,
+            (TypeToken::Ident, "vector") => {
+                self.advance(TypeToken::Lt)?;
+                let ty = self.parse_type_impl(depth + 1)?;
+                self.advance(TypeToken::Gt)?;
+                ParsedType::Vector(Box::new(ty))
+            }
+            (TypeToken::Ident, _) | (TypeToken::AddressIdent, _) => {
+                let addr_tok = match tok {
+                    TypeToken::Ident => ValueToken::Ident,
+                    TypeToken::AddressIdent => ValueToken::Number,
+                    _ => unreachable!(),
+                };
+                let address = parse_address_impl(addr_tok, contents)?;
+                self.advance(TypeToken::ColonColon)?;
+                let module_contents = self.advance(TypeToken::Ident)?;
+                self.advance(TypeToken::ColonColon)?;
+                let struct_contents = self.advance(TypeToken::Ident)?;
+                let type_args = match self.peek_tok() {
+                    Some(TypeToken::Lt) => {
+                        self.advance(TypeToken::Lt)?;
+                        let type_args = self.parse_list(
+                            |parser| parser.parse_type_impl(depth + 1),
+                            TypeToken::Comma,
+                            TypeToken::Gt,
+                            true,
+                        )?;
+                        self.advance(TypeToken::Gt)?;
+                        type_args
+                    }
+                    _ => vec![],
+                };
+                ParsedType::Struct(ParsedStructType {
+                    address,
+                    module: module_contents.to_owned(),
+                    name: struct_contents.to_owned(),
+                    type_args,
+                })
+            }
+            _ => bail!("unexpected token {}, expected type", tok),
+        })
+    }
+}
+
+impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
+    pub fn parse_value<Extra: ParsableValue>(&mut self) -> Result<ParsedValue<Extra>> {
+        if let Some(extra) = Extra::parse_value(self) {
+            return Ok(ParsedValue::Custom(extra?));
+        }
+        let (tok, contents) = self.advance_any()?;
+        Ok(match tok {
+            ValueToken::Number if !matches!(self.peek_tok(), Some(ValueToken::ColonColon)) => {
+                let (u, _) = parse_u256(contents)?;
+                ParsedValue::InferredNum(u)
+            }
+            ValueToken::NumberTyped => {
+                if let Some(s) = contents.strip_suffix("u8") {
+                    let (u, _) = parse_u8(s)?;
+                    ParsedValue::U8(u)
+                } else if let Some(s) = contents.strip_suffix("u16") {
+                    let (u, _) = parse_u16(s)?;
+                    ParsedValue::U16(u)
+                } else if let Some(s) = contents.strip_suffix("u32") {
+                    let (u, _) = parse_u32(s)?;
+                    ParsedValue::U32(u)
+                } else if let Some(s) = contents.strip_suffix("u64") {
+                    let (u, _) = parse_u64(s)?;
+                    ParsedValue::U64(u)
+                } else if let Some(s) = contents.strip_suffix("u128") {
+                    let (u, _) = parse_u128(s)?;
+                    ParsedValue::U128(u)
+                } else {
+                    let (u, _) = parse_u256(contents.strip_suffix("u256").unwrap())?;
+                    ParsedValue::U256(u)
+                }
+            }
+            ValueToken::True => ParsedValue::Bool(true),
+            ValueToken::False => ParsedValue::Bool(false),
+
+            ValueToken::ByteString => {
+                let contents = contents
+                    .strip_prefix("b\"")
+                    .unwrap()
+                    .strip_suffix('\"')
+                    .unwrap();
+                ParsedValue::Vector(
+                    contents
+                        .as_bytes()
+                        .iter()
+                        .copied()
+                        .map(ParsedValue::U8)
+                        .collect(),
+                )
+            }
+            ValueToken::HexString => {
+                let contents = contents
+                    .strip_prefix("x\"")
+                    .unwrap()
+                    .strip_suffix('\"')
+                    .unwrap()
+                    .to_ascii_lowercase();
+                ParsedValue::Vector(
+                    hex::decode(contents)
+                        .unwrap()
+                        .into_iter()
+                        .map(ParsedValue::U8)
+                        .collect(),
+                )
+            }
+            ValueToken::Utf8String => {
+                let contents = contents
+                    .strip_prefix('\"')
+                    .unwrap()
+                    .strip_suffix('\"')
+                    .unwrap();
+                ParsedValue::Vector(
+                    contents
+                        .as_bytes()
+                        .iter()
+                        .copied()
+                        .map(ParsedValue::U8)
+                        .collect(),
+                )
+            }
+
+            ValueToken::AtSign => ParsedValue::Address(self.parse_address()?),
+
+            ValueToken::Ident if contents == "vector" => {
+                self.advance(ValueToken::LBracket)?;
+                let values = self.parse_list(
+                    |parser| parser.parse_value(),
+                    ValueToken::Comma,
+                    ValueToken::RBracket,
+                    true,
+                )?;
+                self.advance(ValueToken::RBracket)?;
+                ParsedValue::Vector(values)
+            }
+
+            ValueToken::Ident if contents == "struct" => {
+                self.advance(ValueToken::LParen)?;
+                let values = self.parse_list(
+                    |parser| parser.parse_value(),
+                    ValueToken::Comma,
+                    ValueToken::RParen,
+                    true,
+                )?;
+                self.advance(ValueToken::RParen)?;
+                ParsedValue::Struct(values)
+            }
+
+            _ => bail!("unexpected token {}, expected type", tok),
+        })
+    }
+
+    pub fn parse_address(&mut self) -> Result<ParsedAddress> {
+        let (tok, contents) = self.advance_any()?;
+        parse_address_impl(tok, contents)
+    }
+}
+
+pub fn parse_address_impl(tok: ValueToken, contents: &str) -> Result<ParsedAddress> {
+    Ok(match tok {
+        ValueToken::Number => {
+            ParsedAddress::Numerical(NumericalAddress::parse_str(contents).map_err(|s| {
+                anyhow!(
+                    "Failed to parse numerical address '{}'. Got error: {}",
+                    contents,
+                    s
+                )
+            })?)
+        }
+        ValueToken::Ident => ParsedAddress::Named(contents.to_owned()),
+        _ => bail!("unexpected token {}, expected identifier or number", tok),
+    })
+}
+
+#[derive(Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+#[repr(u32)]
+/// Number format enum, the u32 value represents the base
+pub enum NumberFormat {
+    Decimal = 10,
+    Hex = 16,
+}
+
+// Determines the base of the number literal, depending on the prefix
+pub(crate) fn determine_num_text_and_base(s: &str) -> (&str, NumberFormat) {
+    match s.strip_prefix("0x") {
+        Some(s_hex) => (s_hex, NumberFormat::Hex),
+        None => (s, NumberFormat::Decimal),
+    }
+}
+
+// Parse a u8 from a decimal or hex encoding
+pub fn parse_u8(s: &str) -> Result<(u8, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u8::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u16 from a decimal or hex encoding
+pub fn parse_u16(s: &str) -> Result<(u16, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u16::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u32 from a decimal or hex encoding
+pub fn parse_u32(s: &str) -> Result<(u32, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u32::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u64 from a decimal or hex encoding
+pub fn parse_u64(s: &str) -> Result<(u64, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u64::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u128 from a decimal or hex encoding
+pub fn parse_u128(s: &str) -> Result<(u128, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u128::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u256 from a decimal or hex encoding
+pub fn parse_u256(s: &str) -> Result<(U256, NumberFormat), U256FromStrError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        U256::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse an address from a decimal or hex encoding
+pub fn parse_address_number(s: &str) -> Option<([u8; AccountAddress::LENGTH], NumberFormat)> {
+    let (txt, base) = determine_num_text_and_base(s);
+    let parsed = BigUint::parse_bytes(
+        txt.as_bytes(),
+        match base {
+            NumberFormat::Hex => 16,
+            NumberFormat::Decimal => 10,
+        },
+    )?;
+    let bytes = parsed.to_bytes_be();
+    if bytes.len() > AccountAddress::LENGTH {
+        return None;
+    }
+    let mut result = [0u8; AccountAddress::LENGTH];
+    result[(AccountAddress::LENGTH - bytes.len())..].clone_from_slice(&bytes);
+    Some((result, base))
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        address::{NumericalAddress, ParsedAddress},
+        types::{ParsedStructType, ParsedType},
+        values::ParsedValue,
+    };
+    use move_core_types::{account_address::AccountAddress, u256::U256};
+
+    #[allow(clippy::unreadable_literal)]
+    #[test]
+    fn tests_parse_value_positive() {
+        use ParsedValue as V;
+        let cases: &[(&str, V)] = &[
+            ("  0u8", V::U8(0)),
+            ("0u8", V::U8(0)),
+            ("0xF_Fu8", V::U8(255)),
+            ("0xF__FF__Eu16", V::U16(u16::MAX - 1)),
+            ("0xFFF_FF__FF_Cu32", V::U32(u32::MAX - 3)),
+            ("255u8", V::U8(255)),
+            ("255u256", V::U256(U256::from(255u64))),
+            ("0", V::InferredNum(U256::from(0u64))),
+            ("0123", V::InferredNum(U256::from(123u64))),
+            ("0xFF", V::InferredNum(U256::from(0xFFu64))),
+            ("0xF_F", V::InferredNum(U256::from(0xFFu64))),
+            ("0xFF__", V::InferredNum(U256::from(0xFFu64))),
+            (
+                "0x12_34__ABCD_FF",
+                V::InferredNum(U256::from(0x1234ABCDFFu64)),
+            ),
+            ("0u64", V::U64(0)),
+            ("0x0u64", V::U64(0)),
+            (
+                "18446744073709551615",
+                V::InferredNum(U256::from(18446744073709551615u128)),
+            ),
+            ("18446744073709551615u64", V::U64(18446744073709551615)),
+            ("0u128", V::U128(0)),
+            ("1_0u8", V::U8(1_0)),
+            ("10_u8", V::U8(10)),
+            ("1_000u64", V::U64(1_000)),
+            ("1_000", V::InferredNum(U256::from(1_000u32))),
+            ("1_0_0_0u64", V::U64(1_000)),
+            ("1_000_000u128", V::U128(1_000_000)),
+            (
+                "340282366920938463463374607431768211455u128",
+                V::U128(340282366920938463463374607431768211455),
+            ),
+            ("true", V::Bool(true)),
+            ("false", V::Bool(false)),
+            (
+                "@0x0",
+                V::Address(ParsedAddress::Numerical(NumericalAddress::new(
+                    AccountAddress::from_hex_literal("0x0")
+                        .unwrap()
+                        .into_bytes(),
+                    crate::parser::NumberFormat::Hex,
+                ))),
+            ),
+            (
+                "@0",
+                V::Address(ParsedAddress::Numerical(NumericalAddress::new(
+                    AccountAddress::from_hex_literal("0x0")
+                        .unwrap()
+                        .into_bytes(),
+                    crate::parser::NumberFormat::Hex,
+                ))),
+            ),
+            (
+                "@0x54afa3526",
+                V::Address(ParsedAddress::Numerical(NumericalAddress::new(
+                    AccountAddress::from_hex_literal("0x54afa3526")
+                        .unwrap()
+                        .into_bytes(),
+                    crate::parser::NumberFormat::Hex,
+                ))),
+            ),
+            (
+                "b\"hello\"",
+                V::Vector("hello".as_bytes().iter().copied().map(V::U8).collect()),
+            ),
+            ("x\"7fff\"", V::Vector(vec![V::U8(0x7f), V::U8(0xff)])),
+            ("x\"\"", V::Vector(vec![])),
+            ("x\"00\"", V::Vector(vec![V::U8(0x00)])),
+            (
+                "x\"deadbeef\"",
+                V::Vector(vec![V::U8(0xde), V::U8(0xad), V::U8(0xbe), V::U8(0xef)]),
+            ),
+        ];
+
+        for (s, expected) in cases {
+            assert_eq!(&ParsedValue::parse(s).unwrap(), expected)
+        }
+    }
+
+    #[test]
+    fn tests_parse_value_negative() {
+        /// Test cases for the parser that should always fail.
+        const PARSE_VALUE_NEGATIVE_TEST_CASES: &[&str] = &[
+            "-3",
+            "0u42",
+            "0u645",
+            "0u64x",
+            "0u6 4",
+            "0u",
+            "_10",
+            "_10_u8",
+            "_10__u8",
+            "10_u8__",
+            "0xFF_u8_",
+            "0xF_u8__",
+            "0x_F_u8__",
+            "_",
+            "__",
+            "__4",
+            "_u8",
+            "5_bool",
+            "256u8",
+            "4294967296u32",
+            "65536u16",
+            "18446744073709551616u64",
+            "340282366920938463463374607431768211456u128",
+            "340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456u256",
+            "0xg",
+            "0x00g0",
+            "0x",
+            "0x_",
+            "",
+            "@@",
+            "()",
+            "x\"ffff",
+            "x\"a \"",
+            "x\" \"",
+            "x\"0g\"",
+            "x\"0\"",
+            "garbage",
+            "true3",
+            "3false",
+            "3 false",
+            "",
+            "0XFF",
+            "0X0",
+        ];
+
+        for s in PARSE_VALUE_NEGATIVE_TEST_CASES {
+            assert!(
+                ParsedValue::<()>::parse(s).is_err(),
+                "Unexpectedly succeeded in parsing: {}",
+                s
+            )
+        }
+    }
+
+    #[test]
+    fn test_type_type() {
+        for s in &[
+            "u64",
+            "bool",
+            "vector<u8>",
+            "vector<vector<u64>>",
+            "address",
+            "signer",
+            "0x1::M::S",
+            "0x2::M::S_",
+            "0x3::M_::S",
+            "0x4::M_::S_",
+            "0x00000000004::M::S",
+            "0x1::M::S<u64>",
+            "0x1::M::S<0x2::P::Q>",
+            "vector<0x1::M::S>",
+            "vector<0x1::M_::S_>",
+            "vector<vector<0x1::M_::S_>>",
+            "0x1::M::S<vector<u8>>",
+        ] {
+            assert!(ParsedType::parse(s).is_ok(), "Failed to parse type {}", s);
+        }
+    }
+
+    #[test]
+    fn test_parse_valid_struct_type() {
+        let valid = vec![
+            "0x1::Foo::Foo",
+            "0x1::Foo_Type::Foo",
+            "0x1::Foo_::Foo",
+            "0x1::X_123::X32_",
+            "0x1::Foo::Foo_Type",
+            "0x1::Foo::Foo<0x1::ABC::ABC>",
+            "0x1::Foo::Foo<0x1::ABC::ABC_Type>",
+            "0x1::Foo::Foo<u8>",
+            "0x1::Foo::Foo<u16>",
+            "0x1::Foo::Foo<u32>",
+            "0x1::Foo::Foo<u64>",
+            "0x1::Foo::Foo<u128>",
+            "0x1::Foo::Foo<u256>",
+            "0x1::Foo::Foo<bool>",
+            "0x1::Foo::Foo<address>",
+            "0x1::Foo::Foo<signer>",
+            "0x1::Foo::Foo<vector<0x1::ABC::ABC>>",
+            "0x1::Foo::Foo<u8,bool>",
+            "0x1::Foo::Foo<u8,   bool>",
+            "0x1::Foo::Foo<u8  ,bool>",
+            "0x1::Foo::Foo<u8 , bool  ,    vector<u8>,address,signer>",
+            "0x1::Foo::Foo<vector<0x1::Foo::Struct<0x1::XYZ::XYZ>>>",
+            "0x1::Foo::Foo<0x1::Foo::Struct<vector<0x1::XYZ::XYZ>, 0x1::Foo::Foo<vector<0x1::Foo::Struct<0x1::XYZ::XYZ>>>>>",
+        ];
+        for s in valid {
+            assert!(
+                ParsedStructType::parse(s).is_ok(),
+                "Failed to parse struct {}",
+                s
+            );
+        }
+    }
+}
diff --git a/vendors/move/crates/move-command-line-common/src/testing.rs b/vendors/move/crates/move-command-line-common/src/testing.rs
new file mode 100644
index 000000000..db0f98c98
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/testing.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::env::read_bool_env_var;
+
+/// Extension for raw output files
+pub const OUT_EXT: &str = "out";
+/// Extension for expected output files
+pub const EXP_EXT: &str = "exp";
+
+/// If any of these env vars is set, the test harness should overwrite
+/// the existing .exp files with the output instead of checking
+/// them against the output.
+pub const UPDATE_BASELINE: &str = "UPDATE_BASELINE";
+pub const UPBL: &str = "UPBL";
+pub const UB: &str = "UB";
+
+pub const PRETTY: &str = "PRETTY";
+pub const FILTER: &str = "FILTER";
+
+pub fn read_env_update_baseline() -> bool {
+    read_bool_env_var(UPDATE_BASELINE) || read_bool_env_var(UPBL) || read_bool_env_var(UB)
+}
+
+pub fn add_update_baseline_fix(s: impl AsRef<str>) -> String {
+    format!(
+        "{}\n\
+        Run with `env {}=1` (or `env {}=1`) to save the current output as \
+        the new expected output",
+        s.as_ref(),
+        UB,
+        UPDATE_BASELINE
+    )
+}
+
+pub fn format_diff(expected: impl AsRef<str>, actual: impl AsRef<str>) -> String {
+    use difference::*;
+
+    let changeset = Changeset::new(expected.as_ref(), actual.as_ref(), "\n");
+
+    let mut ret = String::new();
+
+    for seq in changeset.diffs {
+        match &seq {
+            Difference::Same(x) => {
+                ret.push_str(x);
+                ret.push('\n');
+            }
+            Difference::Add(x) => {
+                ret.push_str("\x1B[92m");
+                ret.push_str(x);
+                ret.push_str("\x1B[0m");
+                ret.push('\n');
+            }
+            Difference::Rem(x) => {
+                ret.push_str("\x1B[91m");
+                ret.push_str(x);
+                ret.push_str("\x1B[0m");
+                ret.push('\n');
+            }
+        }
+    }
+    ret
+}
diff --git a/vendors/move/crates/move-command-line-common/src/types.rs b/vendors/move/crates/move-command-line-common/src/types.rs
new file mode 100644
index 000000000..64feac149
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/types.rs
@@ -0,0 +1,161 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt::{self, Display};
+
+use anyhow::bail;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{self, Identifier},
+    language_storage::{StructTag, TypeTag},
+};
+
+use crate::{address::ParsedAddress, parser::Token};
+
+#[derive(Eq, PartialEq, Debug, Clone, Copy)]
+pub enum TypeToken {
+    Whitespace,
+    Ident,
+    AddressIdent,
+    ColonColon,
+    Lt,
+    Gt,
+    Comma,
+}
+
+#[derive(Eq, PartialEq, Debug, Clone)]
+pub struct ParsedStructType {
+    pub address: ParsedAddress,
+    pub module: String,
+    pub name: String,
+    pub type_args: Vec<ParsedType>,
+}
+
+#[derive(Eq, PartialEq, Debug, Clone)]
+pub enum ParsedType {
+    U8,
+    U16,
+    U32,
+    U64,
+    U128,
+    U256,
+    Bool,
+    Address,
+    Signer,
+    Vector(Box<ParsedType>),
+    Struct(ParsedStructType),
+}
+
+impl Display for TypeToken {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        let s = match *self {
+            TypeToken::Whitespace => "[whitespace]",
+            TypeToken::Ident => "[identifier]",
+            TypeToken::AddressIdent => "[address]",
+            TypeToken::ColonColon => "::",
+            TypeToken::Lt => "<",
+            TypeToken::Gt => ">",
+            TypeToken::Comma => ",",
+        };
+        fmt::Display::fmt(s, formatter)
+    }
+}
+
+impl Token for TypeToken {
+    fn is_whitespace(&self) -> bool {
+        matches!(self, Self::Whitespace)
+    }
+
+    fn next_token(s: &str) -> anyhow::Result<Option<(Self, usize)>> {
+        let mut chars = s.chars().peekable();
+
+        let c = match chars.next() {
+            None => return Ok(None),
+            Some(c) => c,
+        };
+        Ok(Some(match c {
+            '<' => (Self::Lt, 1),
+            '>' => (Self::Gt, 1),
+            ',' => (Self::Comma, 1),
+            ':' => match chars.next() {
+                Some(':') => (Self::ColonColon, 2),
+                _ => bail!("unrecognized token: {}", s),
+            },
+            '0' if matches!(chars.peek(), Some('x') | Some('X')) => {
+                chars.next().unwrap();
+                match chars.next() {
+                    Some(c) if c.is_ascii_hexdigit() || c == '_' => {
+                        // 0x + c + remaining
+                        let len = 3 + chars
+                            .take_while(|q| char::is_ascii_hexdigit(q) || *q == '_')
+                            .count();
+                        (Self::AddressIdent, len)
+                    }
+                    _ => bail!("unrecognized token: {}", s),
+                }
+            }
+            c if c.is_ascii_digit() => {
+                // c + remaining
+                let len = 1 + chars.take_while(char::is_ascii_digit).count();
+                (Self::AddressIdent, len)
+            }
+            c if c.is_ascii_whitespace() => {
+                // c + remaining
+                let len = 1 + chars.take_while(char::is_ascii_whitespace).count();
+                (Self::Whitespace, len)
+            }
+            c if c.is_ascii_alphabetic() => {
+                // c + remaining
+                let len = 1 + chars
+                    .take_while(|c| identifier::is_valid_identifier_char(*c))
+                    .count();
+                (Self::Ident, len)
+            }
+            _ => bail!("unrecognized token: {}", s),
+        }))
+    }
+}
+
+impl ParsedStructType {
+    pub fn into_struct_tag(
+        self,
+        mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<StructTag> {
+        let Self {
+            address,
+            module,
+            name,
+            type_args,
+        } = self;
+        Ok(StructTag {
+            address: address.into_account_address(mapping)?,
+            module: Identifier::new(module)?,
+            name: Identifier::new(name)?,
+            type_params: type_args
+                .into_iter()
+                .map(|t| t.into_type_tag(mapping))
+                .collect::<anyhow::Result<_>>()?,
+        })
+    }
+}
+
+impl ParsedType {
+    pub fn into_type_tag(
+        self,
+        mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<TypeTag> {
+        Ok(match self {
+            ParsedType::U8 => TypeTag::U8,
+            ParsedType::U16 => TypeTag::U16,
+            ParsedType::U32 => TypeTag::U32,
+            ParsedType::U64 => TypeTag::U64,
+            ParsedType::U128 => TypeTag::U128,
+            ParsedType::U256 => TypeTag::U256,
+            ParsedType::Bool => TypeTag::Bool,
+            ParsedType::Address => TypeTag::Address,
+            ParsedType::Signer => TypeTag::Signer,
+            ParsedType::Vector(inner) => TypeTag::Vector(Box::new(inner.into_type_tag(mapping)?)),
+            ParsedType::Struct(s) => TypeTag::Struct(Box::new(s.into_struct_tag(mapping)?)),
+        })
+    }
+}
diff --git a/vendors/move/crates/move-command-line-common/src/values.rs b/vendors/move/crates/move-command-line-common/src/values.rs
new file mode 100644
index 000000000..630d0cae3
--- /dev/null
+++ b/vendors/move/crates/move-command-line-common/src/values.rs
@@ -0,0 +1,314 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    address::ParsedAddress,
+    parser::{Parser, Token},
+};
+use anyhow::bail;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{self},
+    runtime_value::{MoveStruct, MoveValue},
+};
+use std::fmt::{self, Display};
+
+#[derive(Eq, PartialEq, Debug, Clone, Copy)]
+pub enum ValueToken {
+    Number,
+    NumberTyped,
+    True,
+    False,
+    ByteString,
+    HexString,
+    Utf8String,
+    Ident,
+    AtSign,
+    LBrace,
+    RBrace,
+    LBracket,
+    RBracket,
+    LParen,
+    RParen,
+    Comma,
+    Colon,
+    ColonColon,
+    Whitespace,
+}
+
+#[derive(Eq, PartialEq, Debug, Clone)]
+pub enum ParsedValue<Extra: ParsableValue = ()> {
+    Address(ParsedAddress),
+    InferredNum(move_core_types::u256::U256),
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    U128(u128),
+    U256(move_core_types::u256::U256),
+    Bool(bool),
+    Vector(Vec<ParsedValue<Extra>>),
+    Struct(Vec<ParsedValue<Extra>>),
+    Custom(Extra),
+}
+
+pub trait ParsableValue: Sized + Send + Sync + Clone + 'static {
+    type ConcreteValue: Send;
+    fn parse_value<'a, I: Iterator<Item = (ValueToken, &'a str)>>(
+        parser: &mut Parser<'a, ValueToken, I>,
+    ) -> Option<anyhow::Result<Self>>;
+
+    fn move_value_into_concrete(v: MoveValue) -> anyhow::Result<Self::ConcreteValue>;
+    fn concrete_vector(elems: Vec<Self::ConcreteValue>) -> anyhow::Result<Self::ConcreteValue>;
+    fn concrete_struct(values: Vec<Self::ConcreteValue>) -> anyhow::Result<Self::ConcreteValue>;
+    fn into_concrete_value(
+        self,
+        mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<Self::ConcreteValue>;
+}
+
+impl ParsableValue for () {
+    type ConcreteValue = MoveValue;
+    fn parse_value<'a, I: Iterator<Item = (ValueToken, &'a str)>>(
+        _: &mut Parser<'a, ValueToken, I>,
+    ) -> Option<anyhow::Result<Self>> {
+        None
+    }
+    fn move_value_into_concrete(v: MoveValue) -> anyhow::Result<Self::ConcreteValue> {
+        Ok(v)
+    }
+
+    fn concrete_vector(elems: Vec<Self::ConcreteValue>) -> anyhow::Result<Self::ConcreteValue> {
+        Ok(MoveValue::Vector(elems))
+    }
+
+    fn concrete_struct(values: Vec<Self::ConcreteValue>) -> anyhow::Result<Self::ConcreteValue> {
+        Ok(MoveValue::Struct(MoveStruct(values)))
+    }
+    fn into_concrete_value(
+        self,
+        _mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<Self::ConcreteValue> {
+        unreachable!()
+    }
+}
+
+impl Display for ValueToken {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        let s = match self {
+            ValueToken::Number => "[num]",
+            ValueToken::NumberTyped => "[num typed]",
+            ValueToken::True => "true",
+            ValueToken::False => "false",
+            ValueToken::ByteString => "[byte string]",
+            ValueToken::Utf8String => "[utf8 string]",
+            ValueToken::HexString => "[hex string]",
+            ValueToken::Whitespace => "[whitespace]",
+            ValueToken::Ident => "[identifier]",
+            ValueToken::AtSign => "@",
+            ValueToken::LBrace => "{",
+            ValueToken::RBrace => "}",
+            ValueToken::LBracket => "[",
+            ValueToken::RBracket => "]",
+            ValueToken::LParen => "(",
+            ValueToken::RParen => ")",
+            ValueToken::Comma => ",",
+            ValueToken::Colon => ":",
+            ValueToken::ColonColon => "::",
+        };
+        fmt::Display::fmt(s, formatter)
+    }
+}
+
+impl Token for ValueToken {
+    fn is_whitespace(&self) -> bool {
+        matches!(self, Self::Whitespace)
+    }
+
+    fn next_token(s: &str) -> anyhow::Result<Option<(Self, usize)>> {
+        fn number_maybe_with_suffix(text: &str, num_text_len: usize) -> (ValueToken, usize) {
+            let rest = &text[num_text_len..];
+            if rest.starts_with("u8") {
+                (ValueToken::NumberTyped, num_text_len + 2)
+            } else if rest.starts_with("u64") || rest.starts_with("u16") || rest.starts_with("u32")
+            {
+                (ValueToken::NumberTyped, num_text_len + 3)
+            } else if rest.starts_with("u128") || rest.starts_with("u256") {
+                (ValueToken::NumberTyped, num_text_len + 4)
+            } else {
+                // No typed suffix
+                (ValueToken::Number, num_text_len)
+            }
+        }
+        if s.starts_with("true") {
+            return Ok(Some((Self::True, 4)));
+        }
+        if s.starts_with("false") {
+            return Ok(Some((Self::False, 5)));
+        }
+
+        let mut chars = s.chars().peekable();
+        let c = match chars.next() {
+            None => return Ok(None),
+            Some(c) => c,
+        };
+        Ok(Some(match c {
+            '@' => (Self::AtSign, 1),
+            '{' => (Self::LBrace, 1),
+            '}' => (Self::RBrace, 1),
+            '[' => (Self::LBracket, 1),
+            ']' => (Self::RBracket, 1),
+            '(' => (Self::LParen, 1),
+            ')' => (Self::RParen, 1),
+            ',' => (Self::Comma, 1),
+            ':' if matches!(chars.peek(), Some(':')) => (Self::ColonColon, 2),
+            ':' => (Self::Colon, 1),
+            '0' if matches!(chars.peek(), Some('x')) => {
+                chars.next().unwrap();
+                match chars.next() {
+                    Some(c) if c.is_ascii_hexdigit() => {
+                        let len = 3 + chars
+                            .take_while(|c| char::is_ascii_hexdigit(c) || *c == '_')
+                            .count();
+                        number_maybe_with_suffix(s, len)
+                    }
+                    _ => bail!("unrecognized token: {}", s),
+                }
+            }
+            'b' if matches!(chars.peek(), Some('"')) => {
+                chars.next().unwrap();
+                // b"
+                let mut len = 2;
+                loop {
+                    len += 1;
+                    match chars.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii() => (),
+                        Some(c) => bail!(
+                            "Unexpected non-ascii character '{}' in byte string: {}",
+                            c.escape_default(),
+                            s
+                        ),
+                        None => bail!("Unexpected end of string before end quote: {}", s),
+                    }
+                }
+                if s[..len].chars().any(|c| c == '\\') {
+                    bail!(
+                        "Escape characters not yet supported in byte string: {}",
+                        &s[..len]
+                    )
+                }
+                (ValueToken::ByteString, len)
+            }
+            'x' if matches!(chars.peek(), Some('"')) => {
+                chars.next().unwrap();
+                //  x"
+                let mut len = 2;
+                loop {
+                    len += 1;
+                    match chars.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii_hexdigit() => (),
+                        Some(c) => bail!(
+                            "Unexpected non-hexdigit '{}' in hex string: {}",
+                            c.escape_default(),
+                            s
+                        ),
+                        None => bail!("Unexpected end of string before end quote: {}", s),
+                    }
+                }
+                assert!(len >= 3);
+                let num_digits = len - 3;
+                if num_digits % 2 != 0 {
+                    bail!(
+                        "Expected an even number of hex digits in hex string: {}",
+                        &s[..len]
+                    )
+                }
+                (ValueToken::HexString, len)
+            }
+            '"' => {
+                // there is no need to check if a given char is valid UTF8 as it is already
+                // guaranteed; from the Rust docs
+                // (https://doc.rust-lang.org/std/primitive.char.html): "char values are USVs and
+                // str values are valid UTF-8, it is safe to store any char in a str or read any
+                // character from a str as a char"; this means that while not every char is valid
+                // UTF8, those stored in &str are
+                let end_quote_byte_offset = match s[1..].find('"') {
+                    Some(o) => o,
+                    None => bail!("Unexpected end of string before end quote: {}", s),
+                };
+                // the length of the token (which we need in bytes rather than chars as s is sliced
+                // in parser and slicing str uses byte indexes) is the same as position of the
+                // ending double quote (in the whole string) plus 1
+                let len = s[..1].len() + end_quote_byte_offset + 1;
+                if s[..len].chars().any(|c| c == '\\') {
+                    bail!(
+                        "Escape characters not yet supported in utf8 string: {}",
+                        &s[..len]
+                    )
+                }
+                (ValueToken::Utf8String, len)
+            }
+            c if c.is_ascii_digit() => {
+                // c + remaining
+                let len = 1 + chars
+                    .take_while(|c| char::is_ascii_digit(c) || *c == '_')
+                    .count();
+                number_maybe_with_suffix(s, len)
+            }
+            c if c.is_ascii_whitespace() => {
+                // c + remaining
+                let len = 1 + chars.take_while(char::is_ascii_whitespace).count();
+                (Self::Whitespace, len)
+            }
+            c if c.is_ascii_alphabetic() => {
+                // c + remaining
+                // TODO be more permissive
+                let len = 1 + chars
+                    .take_while(|c| identifier::is_valid_identifier_char(*c))
+                    .count();
+                (Self::Ident, len)
+            }
+            _ => bail!("unrecognized token: {}", s),
+        }))
+    }
+}
+
+impl<Extra: ParsableValue> ParsedValue<Extra> {
+    pub fn into_concrete_value(
+        self,
+        mapping: &impl Fn(&str) -> Option<AccountAddress>,
+    ) -> anyhow::Result<Extra::ConcreteValue> {
+        match self {
+            ParsedValue::Address(a) => Extra::move_value_into_concrete(MoveValue::Address(
+                a.into_account_address(mapping)?,
+            )),
+            ParsedValue::U8(u) => Extra::move_value_into_concrete(MoveValue::U8(u)),
+            ParsedValue::U16(u) => Extra::move_value_into_concrete(MoveValue::U16(u)),
+            ParsedValue::U32(u) => Extra::move_value_into_concrete(MoveValue::U32(u)),
+            ParsedValue::U64(u) => Extra::move_value_into_concrete(MoveValue::U64(u)),
+            ParsedValue::InferredNum(u) if u <= (u64::MAX.into()) => {
+                Extra::move_value_into_concrete(MoveValue::U64(u.try_into()?))
+            }
+            ParsedValue::U128(u) => Extra::move_value_into_concrete(MoveValue::U128(u)),
+            ParsedValue::InferredNum(u) | ParsedValue::U256(u) => {
+                Extra::move_value_into_concrete(MoveValue::U256(u))
+            }
+            ParsedValue::Bool(b) => Extra::move_value_into_concrete(MoveValue::Bool(b)),
+            ParsedValue::Vector(values) => Extra::concrete_vector(
+                values
+                    .into_iter()
+                    .map(|value| value.into_concrete_value(mapping))
+                    .collect::<anyhow::Result<_>>()?,
+            ),
+            ParsedValue::Struct(values) => Extra::concrete_struct(
+                values
+                    .into_iter()
+                    .map(|value| value.into_concrete_value(mapping))
+                    .collect::<anyhow::Result<_>>()?,
+            ),
+            ParsedValue::Custom(c) => Extra::into_concrete_value(c, mapping),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/Cargo.toml b/vendors/move/crates/move-compiler-transactional-tests/Cargo.toml
new file mode 100644
index 000000000..f1cbb968d
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "move-compiler-transactional-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-transactional-test-runner.workspace = true
+
+[[test]]
+name = "tests"
+harness = false
+
+[dependencies]
diff --git a/vendors/move/crates/move-compiler-transactional-tests/src/lib.rs b/vendors/move/crates/move-compiler-transactional-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.move
new file mode 100644
index 000000000..0fdad0820
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/by_reference.move
@@ -0,0 +1,25 @@
+//# run
+module 0x42::m {
+    const C: u64 = 0;
+    const BYTES: vector<u8> = b"hello";
+
+    fun check() {
+        assert!(C == 0, 42);
+        assert!(BYTES == b"hello", 42);
+
+        // little weird we can do this... might want to warn?
+        assert!(*&C == 0, 42);
+        assert!(*&BYTES == b"hello", 42);
+
+        let c = &mut C;
+        *c = 1;
+        let b = &mut BYTES;
+        *b = b"bye";
+        assert!(*c == 1, 42);
+        assert!(*b == b"bye", 42);
+
+        // Borrows the local copy, not the constant. No update
+        assert!(C == 0, 42);
+        assert!(BYTES == b"hello", 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.move
new file mode 100644
index 000000000..132cf19c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/const_in_const.move
@@ -0,0 +1,25 @@
+//# init --edition 2024.alpha
+
+//# publish
+
+module 0x42::t {
+
+const C_ZERO: u64 = 0;
+const C_ONE: u64 = C_ZERO + 1;
+const C_TWO: u64 = 2;
+const C_VEC: vector<u64> = vector[C_ZERO, C_ONE, C_TWO];
+const C_FIVE: u64 = 5;
+const C_V2: vector<u64> = vector[C_ZERO, C_FIVE];
+
+public fun test() {
+    assert!(C_ZERO == 0, 0);
+    assert!(C_ONE == 1, 1);
+    assert!(C_TWO == 2, 2);
+    assert!(C_VEC == vector[0, 1, 2], 3);
+    assert!(C_FIVE == 5, 5);
+    assert!(C_V2 == vector[0, 5], 6);
+}
+
+}
+
+//# run 0x42::t::test
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.exp
new file mode 100644
index 000000000..a99305943
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 0 'run'. lines 1-14:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.move
new file mode 100644
index 000000000..90441a607
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/default_int_size.move
@@ -0,0 +1,53 @@
+//# run
+module 1::m {
+    // should fail
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    // We're going above u64 max
+    fun main() {
+        let i = 1;
+        let j = 1;
+        while (j < 65) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+module 2::m {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 1;
+        let j = 1;
+        while (j < 64) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+module 3::m {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 256;
+        let j = 1;
+        while (j < (64 - 8)) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+module 4::m {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 65536;
+        let j = 1;
+        while (j < (64 - 16)) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.move
new file mode 100644
index 000000000..e7b955229
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_boolean.move
@@ -0,0 +1,34 @@
+//# run
+module 0x42::m {
+    const AND_TT: bool = true && true;
+    const AND_TF: bool = true && false;
+    const AND_FT: bool = false && true;
+    const AND_FF: bool = false && false;
+
+    const OR_TT: bool = true || true;
+    const OR_TF: bool = true || false;
+    const OR_FT: bool = false || true;
+    const OR_FF: bool = false || false;
+
+    const NEG_T: bool = !true;
+    const NEG_F: bool = !false;
+
+    const COMPLEX: bool = !((true && false) || (false || true) && true) || true;
+
+    fun main() {
+        assert!(AND_TT, 42);
+        assert!(!AND_TF, 42);
+        assert!(!AND_FT, 42);
+        assert!(!AND_FF, 42);
+
+        assert!(OR_TT, 42);
+        assert!(OR_TF, 42);
+        assert!(OR_FT, 42);
+        assert!(!OR_FF, 42);
+
+        assert!(!NEG_T, 42);
+        assert!(NEG_F, 42);
+
+        assert!(COMPLEX, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.move
new file mode 100644
index 000000000..44e5ca727
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_complex.move
@@ -0,0 +1,103 @@
+//# run
+module 0x42::m {
+    const C1: u64 = {
+        0 == 0;
+        0 == 0;
+        0 == 0;
+        false == false;
+        0x42 == 0x42;
+        x"42" == x"42";
+        b"hello" == b"hello";
+        0 == 1;
+        0 == 1;
+        0 == 1;
+        false == true;
+        0x42 == 0x43;
+        x"42" == x"0422";
+        b"hello" == b"XhelloX";
+        0 != 1;
+        0 != 1;
+        0 != 1;
+        false != true;
+        0x42 != 0x43;
+        x"42" != x"0422";
+        b"hello" != b"XhelloX";
+        0 != 0;
+        0 != 0;
+        0 != 0;
+        false != false;
+        0x42 != 0x42;
+        x"42" != x"42";
+        b"hello" != b"hello";
+        ((0 == 0) == (b"hello" != b"bye")) == false;
+        true && true;
+        true && false;
+        false && true;
+        false && false;
+        true || true;
+        true || false;
+        false || true;
+        false || false;
+        true;
+        false;
+        !((true && false) || (false || true) && true) || true;
+        1 << 7;
+        1 << 63;
+        (1: u128) << 127;
+        128 >> 7;
+        18446744073709551615 >> 63;
+        (340282366920938463463374607431768211455: u128) >> 127;
+        255 / 2;
+        18446744073709551615 / 2;
+        (340282366920938463463374607431768211455: u128) / 2;
+        255 % 2;
+        18446744073709551615 % 2;
+        (340282366920938463463374607431768211455: u128) % 2;
+        254 + 1;
+        18446744073709551614 + 1;
+        (340282366920938463463374607431768211454: u128) + 1;
+        255 - 255;
+        18446744073709551615 - 18446744073709551615;
+        (340282366920938463463374607431768211455: u128) - (340282366920938463463374607431768211455: u128);
+        ((255: u64) as u8);
+        ((18446744073709551615: u128) as u64);
+        ((1: u8) as u128);
+        255 & 255;
+        18446744073709551615 & 18446744073709551615;
+        (340282366920938463463374607431768211455: u128) & (340282366920938463463374607431768211455: u128);
+        255 | 255;
+        18446744073709551615 | 18446744073709551615;
+        (340282366920938463463374607431768211455: u128) | (340282366920938463463374607431768211455: u128);
+        255 ^ 255;
+        18446744073709551615 ^ 18446744073709551615;
+        (340282366920938463463374607431768211455: u128) ^ (340282366920938463463374607431768211455: u128);
+        ((3402823669209384: u256) as u128);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) - 34;
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) - (340282366920938463463374607431768211455340: u256);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) ^ (340282366920938463463374607431768211455340: u256);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) ^ (340282366920938463463374607431768211455: u256);
+        0
+    };
+    const C2: bool = {
+        ();
+        ();
+        (true && true) &&
+        (!false) &&
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) &&
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) &&
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) &&
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) &&
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") &&
+        (b"hello" != b"bye")
+    };
+
+    fun main() {
+        assert!(C1 == 0, 41);
+        assert!(C2, 42)
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.move
new file mode 100644
index 000000000..16a838084
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_equality.move
@@ -0,0 +1,72 @@
+//# run
+module 0x42::m {
+    const EQ_T_U8: bool = 0 == 0;
+    const EQ_T_U64: bool = 0 == 0;
+    const EQ_T_U128: bool = 0 == 0;
+    const EQ_T_BOOL: bool = false == false;
+    const EQ_T_ADDR: bool = 0x42 == 0x42;
+    const EQ_T_HEX: bool = x"42" == x"42";
+    const EQ_T_BYTES: bool = b"hello" == b"hello";
+
+    const EQ_F_U8: bool = 0 == 1;
+    const EQ_F_U64: bool = 0 == 1;
+    const EQ_F_U128: bool = 0 == 1;
+    const EQ_F_BOOL: bool = false == true;
+    const EQ_F_ADDR: bool = 0x42 == 0x43;
+    const EQ_F_HEX: bool = x"42" == x"0422";
+    const EQ_F_BYTES: bool = b"hello" == b"XhelloX";
+
+    const NEQ_T_U8: bool = 0 != 1;
+    const NEQ_T_U64: bool = 0 != 1;
+    const NEQ_T_U128: bool = 0 != 1;
+    const NEQ_T_BOOL: bool = false != true;
+    const NEQ_T_ADDR: bool = 0x42 != 0x43;
+    const NEQ_T_HEX: bool = x"42" != x"0422";
+    const NEQ_T_BYTES: bool = b"hello" != b"XhelloX";
+
+    const NEQ_F_U8: bool = 0 != 0;
+    const NEQ_F_U64: bool = 0 != 0;
+    const NEQ_F_U128: bool = 0 != 0;
+    const NEQ_F_BOOL: bool = false != false;
+    const NEQ_F_ADDR: bool = 0x42 != 0x42;
+    const NEQ_F_HEX: bool = x"42" != x"42";
+    const NEQ_F_BYTES: bool = b"hello" != b"hello";
+
+    const COMPLEX: bool = ((0 == 0) == (b"hello" != b"bye")) == false;
+
+    fun main() {
+        assert!(EQ_T_U8, 42);
+        assert!(EQ_T_U64, 42);
+        assert!(EQ_T_U128, 42);
+        assert!(EQ_T_BOOL, 42);
+        assert!(EQ_T_ADDR, 42);
+        assert!(EQ_T_HEX, 42);
+        assert!(EQ_T_BYTES, 42);
+
+        assert!(!EQ_F_U8, 42);
+        assert!(!EQ_F_U64, 42);
+        assert!(!EQ_F_U128, 42);
+        assert!(!EQ_F_BOOL, 42);
+        assert!(!EQ_F_ADDR, 42);
+        assert!(!EQ_F_HEX, 42);
+        assert!(!EQ_F_BYTES, 42);
+
+        assert!(NEQ_T_U8, 42);
+        assert!(NEQ_T_U64, 42);
+        assert!(NEQ_T_U128, 42);
+        assert!(NEQ_T_BOOL, 42);
+        assert!(NEQ_T_ADDR, 42);
+        assert!(NEQ_T_HEX, 42);
+        assert!(NEQ_T_BYTES, 42);
+
+        assert!(!NEQ_F_U8, 42);
+        assert!(!NEQ_F_U64, 42);
+        assert!(!NEQ_F_U128, 42);
+        assert!(!NEQ_F_BOOL, 42);
+        assert!(!NEQ_F_ADDR, 42);
+        assert!(!NEQ_F_HEX, 42);
+        assert!(!NEQ_F_BYTES, 42);
+
+        assert!(!COMPLEX, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.move
new file mode 100644
index 000000000..eff89cc4f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_numeric.move
@@ -0,0 +1,198 @@
+//# run
+module 0x42::m {
+    const SHL0: u8 = 1 << 7;
+    const SHL1: u64 = 1 << 63;
+    const SHL2: u128 = 1 << 127;
+    const SHL3: u16 = 1 << 15;
+    const SHL4: u32 = 1 << 31;
+    const SHL5: u256 = 1 << 255;
+
+    const SHR0: u8 = 128 >> 7;
+    const SHR1: u64 = 18446744073709551615 >> 63;
+    const SHR2: u128 = 340282366920938463463374607431768211455 >> 127;
+    const SHR3: u16 = 36863 >> 15;
+    const SHR4: u32 = 2415919103 >> 31;
+    const SHR5: u256 = 65133050195990359925758679067386948167464366374422817272194891004451135422463 >> 255;
+
+    const DIV0: u8 = 255 / 2;
+    const DIV1: u64 = 18446744073709551615 / 2;
+    const DIV2: u128 = 340282366920938463463374607431768211455 / 2;
+    const DIV3: u16 = 65535 / 2;
+    const DIV4: u32 = 4294967295 / 2;
+    const DIV5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935 / 2;
+
+    const MOD0: u8 = 255 % 2;
+    const MOD1: u64 = 18446744073709551615 % 2;
+    const MOD2: u128 = 340282366920938463463374607431768211455 % 2;
+    const MOD3: u16 = 65535 % 2;
+    const MOD4: u32 = 4294967295 % 2;
+    const MOD5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935 % 2;
+
+    const ADD0: u8 = 254 + 1;
+    const ADD1: u64 = 18446744073709551614 + 1;
+    const ADD2: u128 = 340282366920938463463374607431768211454 + 1;
+    const ADD3: u16 = 65534 + 1;
+    const ADD4: u32 = 4294967294 + 1;
+    const ADD5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639934 + 1;
+
+    const SUB0: u8 = 255 - 255;
+    const SUB1: u64 = 18446744073709551615 - 18446744073709551615;
+    const SUB2: u128 =
+        340282366920938463463374607431768211455 - 340282366920938463463374607431768211455;
+    const SUB3: u16 = 65535 - 65535;
+    const SUB4: u32 = 4294967295 - 4294967295;
+    const SUB5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 - 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+    const CAST0: u8 = ((255: u64) as u8);
+    const CAST1: u64 = ((18446744073709551615: u128) as u64);
+    const CAST2: u128 = ((1: u8) as u128);
+    const CAST3: u16 = ((65535: u64) as u16);
+    const CAST4: u32 = ((4294967295: u128) as u32);
+    const CAST5: u256 = ((1: u8) as u256);
+
+    const BAND0: u8 = 255 & 255;
+    const BAND1: u64 = 18446744073709551615 & 18446744073709551615;
+    const BAND2: u256 =
+        340282366920938463463374607431768211455 & 340282366920938463463374607431768211455;
+    const BAND3: u16 = 65535 & 65535;
+    const BAND4: u32 = 4294967295 & 4294967295;
+    const BAND5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 & 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+    const BOR0: u8 = 255 | 255;
+    const BOR1: u64 = 18446744073709551615 | 18446744073709551615;
+    const BOR2: u256 =
+        340282366920938463463374607431768211455 | 340282366920938463463374607431768211455;
+    const BOR3: u16 = 65535 | 65535;
+    const BOR4: u32 = 4294967295 | 4294967295;
+    const BOR5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 | 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+    const BXOR0: u8 = 255 ^ 255;
+    const BXOR1: u64 = 18446744073709551615 ^ 18446744073709551615;
+    const BXOR2: u256 =
+        340282366920938463463374607431768211455 ^ 340282366920938463463374607431768211455;
+    const BXOR3: u16 = 65535 ^ 65535;
+    const BXOR4: u32 = 4294967295 ^ 4294967295;
+    const BXOR5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 ^ 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+    fun main() {
+        assert!(SHL0 == 128, 42);
+        assert!(SHL1 == 9223372036854775808, 42);
+        assert!(SHL2 == 170141183460469231731687303715884105728, 42);
+        assert!(SHL0 == 0x80, 42);
+        assert!(SHL1 == 0x8000000000000000, 42);
+        assert!(SHL2 == 0x80000000000000000000000000000000, 42);
+        assert!(SHL3 == 32768, 42);
+        assert!(SHL4 == 2147483648, 42);
+        assert!(SHL5 == 57896044618658097711785492504343953926634992332820282019728792003956564819968, 42);
+        assert!(SHL3 == 0x8000, 42);
+        assert!(SHL4 == 0x80000000, 42);
+        assert!(SHL5 == 0x8000000000000000000000000000000000000000000000000000000000000000, 42);
+
+        assert!(SHR0 == 1, 42);
+        assert!(SHR1 == 1, 42);
+        assert!(SHR2 == 1, 42);
+        assert!(SHR0 == 0x1, 42);
+        assert!(SHR1 == 0x1, 42);
+        assert!(SHR2 == 0x1, 42);
+        assert!(SHR3 == 1, 42);
+        assert!(SHR4 == 1, 42);
+        assert!(SHR5 == 1, 42);
+        assert!(SHR3 == 0x1, 42);
+        assert!(SHR4 == 0x1, 42);
+        assert!(SHR5 == 0x1, 42);
+
+        assert!(DIV0 == 127, 42);
+        assert!(DIV1 == 9223372036854775807, 42);
+        assert!(DIV2 == 170141183460469231731687303715884105727, 42);
+        assert!(DIV0 == 0x7F, 42);
+        assert!(DIV1 == 0x7FFFFFFFFFFFFFFF, 42);
+        assert!(DIV2 == 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(DIV3 == 32767, 42);
+        assert!(DIV4 == 2147483647, 42);
+        assert!(DIV5 == 57896044618658097711785492504343953926634992332820282019728792003956564819967, 42);
+        assert!(DIV3 == 0x7FFF, 42);
+        assert!(DIV4 == 0x7FFFFFFF, 42);
+        assert!(DIV5 == 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+
+        assert!(MOD0 == 1, 42);
+        assert!(MOD1 == 1, 42);
+        assert!(MOD2 == 1, 42);
+        assert!(MOD0 == 0x1, 42);
+        assert!(MOD1 == 0x1, 42);
+        assert!(MOD2 == 0x1, 42);
+        assert!(MOD3 == 1, 42);
+        assert!(MOD4 == 1, 42);
+        assert!(MOD5 == 1, 42);
+        assert!(MOD3 == 0x1, 42);
+        assert!(MOD4 == 0x1, 42);
+        assert!(MOD5 == 0x1, 42);
+
+        assert!(ADD0 == 255, 42);
+        assert!(ADD1 == 18446744073709551615, 42);
+        assert!(ADD2 == 340282366920938463463374607431768211455, 42);
+        assert!(ADD0 == 0xFF, 42);
+        assert!(ADD1 == 0xFFFFFFFFFFFFFFFF, 42);
+        assert!(ADD2 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(ADD3 == 65535, 42);
+        assert!(ADD4 == 4294967295, 42);
+        assert!(ADD5 == 115792089237316195423570985008687907853269984665640564039457584007913129639935, 42);
+        assert!(ADD3 == 0xFFFF, 42);
+        assert!(ADD4 == 0xFFFFFFFF, 42);
+        assert!(ADD5 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+
+        assert!(SUB0 == 0, 42);
+        assert!(SUB1 == 0, 42);
+        assert!(SUB2 == 0, 42);
+        assert!(SUB0 == 0x0, 42);
+        assert!(SUB1 == 0x0, 42);
+        assert!(SUB2 == 0x0, 42);
+        assert!(SUB3 == 0, 42);
+        assert!(SUB4 == 0, 42);
+        assert!(SUB5 == 0, 42);
+        assert!(SUB3 == 0x0, 42);
+        assert!(SUB4 == 0x0, 42);
+        assert!(SUB5 == 0x0, 42);
+
+        assert!(CAST0 == 255, 42);
+        assert!(CAST1 == 18446744073709551615, 42);
+        assert!(CAST2 == 1, 42);
+        assert!(CAST0 == 0xFF, 42);
+        assert!(CAST1 == 0xFFFFFFFFFFFFFFFF, 42);
+        assert!(CAST2 == 0x1, 42);
+        assert!(CAST3 == 65535, 42);
+        assert!(CAST4 == 4294967295, 42);
+        assert!(CAST5 == 1, 42);
+        assert!(CAST3 == 0xFFFF, 42);
+        assert!(CAST4 == 0xFFFFFFFF, 42);
+        assert!(CAST5 == 0x1, 42);
+
+        assert!(BAND0 == 255, 42);
+        assert!(BAND1 == 18446744073709551615, 42);
+        assert!(BAND2 == 340282366920938463463374607431768211455, 42);
+        assert!(BAND0 == 0xFF, 42);
+        assert!(BAND1 == 0xFFFFFFFFFFFFFFFF, 42);
+        assert!(BAND2 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(BAND3 == 65535, 42);
+        assert!(BAND4 == 4294967295, 42);
+        assert!(BAND5 == 115792089237316195423570985008687907853269984665640564039457584007913129639935, 42);
+        assert!(BAND3 == 0xFFFF, 42);
+        assert!(BAND4 == 0xFFFFFFFF, 42);
+        assert!(BAND5 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+
+        assert!(BXOR0 == 0, 42);
+        assert!(BXOR1 == 0, 42);
+        assert!(BXOR2 == 0, 42);
+        assert!(BXOR0 == 0x0, 42);
+        assert!(BXOR1 == 0x0, 42);
+        assert!(BXOR2 == 0x0, 42);
+        assert!(BXOR3 == 0, 42);
+        assert!(BXOR4 == 0, 42);
+        assert!(BXOR5 == 0, 42);
+        assert!(BXOR3 == 0x0, 42);
+        assert!(BXOR4 == 0x0, 42);
+        assert!(BXOR5 == 0x0, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.move
new file mode 100644
index 000000000..f480a4115
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_values.move
@@ -0,0 +1,26 @@
+//# run
+module 0x42::m {
+    const U8: u8 = 0;
+    const U16: u16 = 0;
+    const U32: u32 = 0;
+    const U64: u64 = 0;
+    const U128: u128 = 0;
+    const U256: u256 = 0;
+    const BOOL: bool = false;
+    const ADDR: address = @0x42;
+    const HEX: vector<u8> = x"42";
+    const BYTES: vector<u8> = b"hello";
+
+    fun main() {
+        assert!(U8 == 0, 42);
+        assert!(U64 == 0, 42);
+        assert!(U128 == 0, 42);
+        assert!(U16 == 0, 42);
+        assert!(U32 == 0, 42);
+        assert!(U256 == 0, 42);
+        assert!(BOOL == false, 42);
+        assert!(ADDR == @0x42, 42);
+        assert!(HEX == x"42", 42);
+        assert!(BYTES == b"hello", 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.move
new file mode 100644
index 000000000..16ec39094
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector.move
@@ -0,0 +1,11 @@
+//# publish
+module 0x42::M {
+    const B0: vector<bool> = vector[];
+    const B1: vector<bool> = vector[true];
+    const B2: vector<bool> = vector[true && false];
+    const B3: vector<bool> = vector[true, true && false, true == true];
+
+    const E0: bool = vector<u8>[] == vector[];
+    const E1: bool = vector[0] == vector[1, 100];
+
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.move
new file mode 100644
index 000000000..7115a1d27
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/folding_vector_large.move
@@ -0,0 +1,165 @@
+//# publish
+module 0x42::M {
+    const V0: vector<u8> = vector[
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ];
+
+    const E0: bool = vector[
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ] == vector[
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ];
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.exp
new file mode 100644
index 000000000..9c5bad711
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.exp
@@ -0,0 +1,22 @@
+processed 8 tasks
+
+task 1 'run'. lines 33-33:
+return values: []
+
+task 2 'run'. lines 35-35:
+return values: []
+
+task 3 'run'. lines 37-37:
+return values: []
+
+task 4 'run'. lines 39-39:
+return values: []
+
+task 5 'run'. lines 41-41:
+return values: []
+
+task 6 'run'. lines 43-43:
+return values: []
+
+task 7 'run'. lines 45-45:
+return values: []
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.move b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.move
new file mode 100644
index 000000000..fe4ba56b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/constants/non_constant_empty_vec.move
@@ -0,0 +1,45 @@
+//# publish
+// These vectors should not be made constants
+// If they are made constants, the IR will error
+
+module 0x42::M {
+    struct S {}
+
+    public fun empty_struct_vec(): vector<S> {
+        vector[]
+    }
+
+    public fun empty_signer_vec(): vector<signer> {
+        vector[]
+    }
+
+    public fun empty_generic_vec<T>(): vector<T> {
+        vector[]
+    }
+
+    public fun empty_struct_vec_vec(): vector<vector<S>> {
+        vector[]
+    }
+
+    public fun empty_signer_vec_vec(): vector<vector<signer>> {
+        vector[]
+    }
+
+    public fun empty_generic_vec_vec<T>(): vector<vector<T>> {
+        vector[]
+    }
+}
+
+//# run 0x42::M::empty_struct_vec
+
+//# run 0x42::M::empty_struct_vec
+
+//# run 0x42::M::empty_signer_vec
+
+//# run 0x42::M::empty_generic_vec --type-args 0x42::M::S
+
+//# run 0x42::M::empty_struct_vec_vec
+
+//# run 0x42::M::empty_signer_vec_vec
+
+//# run 0x42::M::empty_generic_vec_vec --type-args 0x42::M::S
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.move
new file mode 100644
index 000000000..3d2b6cd2e
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/assert_in_while.move
@@ -0,0 +1,35 @@
+//# publish
+module 0x42::Test {
+    struct Tester has drop {
+        f: u64
+    }
+
+    public fun new(): Tester {
+        Tester { f: 10 }
+    }
+
+    public fun len(t: &Tester): u64 {
+        t.f
+    }
+
+    public fun modify(t: &mut Tester): u64 {
+        t.f = t.f - 1;
+        9 - t.f
+    }
+}
+
+//# run
+module 0x42::m {
+use 0x42::Test;
+fun main() {
+    let x = Test::new();
+    assert!(Test::len(&x) == 10, 70002);
+
+    let i = 0;
+    while (i < Test::len(&x)) {
+        // if inline blocks skips relabelling this will cause a bytecode verifier error
+        assert!(Test::modify(&mut x) == i, 70003);
+        i = i + 1
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.move
new file mode 100644
index 000000000..95c269189
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/branch_assigns_then_moves_then_assigns.move
@@ -0,0 +1,16 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    let y;
+    if (true) {
+        x = 1;
+        y = move x;
+        x = 5;
+        y;
+    } else {
+        x = 0;
+    };
+    assert!(copy x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.move
new file mode 100644
index 000000000..b39131993
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_accumulator.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    while (true) {
+        if (x >= 5) break;
+        x = x + 1;
+    };
+    assert!(x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.move
new file mode 100644
index 000000000..531f57184
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_simple.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    while (true) {
+        if (x >= 5) break;
+        x = x + 1;
+        continue
+    };
+    assert!(move x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.move
new file mode 100644
index 000000000..88b49cf62
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_continue_sum_of_odds.move
@@ -0,0 +1,17 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    let y = 0;
+    loop {
+        if (x < 10) {
+            x = x + 1;
+            if (x % 2 == 0) continue;
+            y = y + x
+        } else {
+            break
+        }
+    };
+    assert!(y == 25, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.move
new file mode 100644
index 000000000..c2977ee6a
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_nested.move
@@ -0,0 +1,17 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    let y = 0;
+    while (true) {
+        loop {
+            y = 5;
+            break
+        };
+        x = 3;
+        break
+    };
+    assert!(x == 3, 42);
+    assert!(y == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.move
new file mode 100644
index 000000000..fd61a02dc
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/break_simple.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    while (true) {
+        x = x + 1;
+        break
+    };
+    assert!(x == 1, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.move
new file mode 100644
index 000000000..6966fc5a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/deep_return_branch_doesnt_assign.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true) {
+        if (false) return () else return ()
+    } else {
+        x = 0;
+    };
+    assert!(x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.move
new file mode 100644
index 000000000..8b2caf9af
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_assignment.move
@@ -0,0 +1,19 @@
+//# publish
+address 0x42 {
+module ReassignCond {
+    public fun reassign_cond(a: address, b: bool): address {
+        if (b) {
+            a = @0x2;
+        };
+        a
+    }
+}
+}
+
+//# run
+module 0x42::m {
+    use 0x42::ReassignCond::reassign_cond;
+    fun main() {
+        assert!(reassign_cond(@0x1, false) == @0x1, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.move
new file mode 100644
index 000000000..8349365fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_1.move
@@ -0,0 +1,10 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        return ()
+    } else {
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.move
new file mode 100644
index 000000000..6457c770f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_10.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        loop return ()
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.move
new file mode 100644
index 000000000..70cc5e419
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_2.move
@@ -0,0 +1,7 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) return ();
+    assert!(false, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.move
new file mode 100644
index 000000000..c5bbff625
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_3.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        return ()
+    } else {
+        assert!(false, 42);
+    };
+    assert!(false, 43);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.move
new file mode 100644
index 000000000..1e45ee355
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_4.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        if (true) return () else return ()
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.move
new file mode 100644
index 000000000..1e7150aec
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_5.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        loop break
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.move
new file mode 100644
index 000000000..f949f39e9
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_6.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        loop { if (true) return () else break }
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.move
new file mode 100644
index 000000000..fdf1959e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_7.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        loop { if (true) return () else continue }
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.move
new file mode 100644
index 000000000..c27ace468
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_8.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    if (true) {
+        loop { break }
+    } else {
+        assert!(false, 42);
+        return ()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.move
new file mode 100644
index 000000000..ab1e27af5
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_branch_diverges_9.move
@@ -0,0 +1,10 @@
+//# run
+module 0x42::m {
+fun main() {
+    let b = false;
+    loop {
+        if (b) { if (b) continue }
+        else break;
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.move
new file mode 100644
index 000000000..647ecb2d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_1.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true)
+        x = 3
+    else
+        x = 5;
+    x;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.move
new file mode 100644
index 000000000..dc3baee53
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_2.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true) {
+        x = 3;
+    }
+    else
+        x = 5;
+    x;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.move
new file mode 100644
index 000000000..e83103ce7
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_3.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true)
+        x = 3
+    else {
+        x = 5
+    };
+    x;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.move
new file mode 100644
index 000000000..ce5419307
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/if_without_braces_4.move
@@ -0,0 +1,8 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    if (true) x = 3;
+    x;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.move
new file mode 100644
index 000000000..c5288de50
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/immediate_break.move
@@ -0,0 +1,6 @@
+//# run
+module 0x42::m {
+fun main() {
+    loop break;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.move
new file mode 100644
index 000000000..0bdfb9a05
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/local_assigned_many_times.move
@@ -0,0 +1,30 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 5;
+    let y = 2;
+    let x_ref;
+    let y_ref;
+
+    x_ref = &x;
+    y_ref = &y;
+    y_ref;
+    x_ref;
+
+    x_ref = &x;
+    y_ref = x_ref;
+
+    if (true) {
+        _ = y_ref;
+        x_ref = &y;
+        y_ref = &x;
+    } else {
+        _ = y_ref;
+        x_ref = &x;
+        y_ref = &y;
+    };
+
+    assert!(*x_ref == 2, 42);
+    y_ref;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.move
new file mode 100644
index 000000000..6e1b1135f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_nested_breaks.move
@@ -0,0 +1,10 @@
+//# run
+module 0x42::m {
+fun main() {
+    loop {
+        loop break;
+        break
+    };
+    if (true) () else ()
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.move
new file mode 100644
index 000000000..340f8a601
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_return.move
@@ -0,0 +1,6 @@
+//# run
+module 0x42::m {
+fun main() {
+    loop return ()
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.move
new file mode 100644
index 000000000..056547bc3
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/loop_simple.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    loop {
+        x = x + 1;
+        break
+    };
+    assert!(x == 1, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.move
new file mode 100644
index 000000000..8c2da2265
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/nested_loops.move
@@ -0,0 +1,20 @@
+//# publish
+module 0x42::M {
+    public fun foobar(cond: bool) {
+        loop {
+            loop {
+                if (cond) break
+            };
+            if (cond) break
+        }
+    }
+}
+
+//# run
+module 0x42::m {
+use 0x42::M;
+
+fun main() {
+    M::foobar(true)
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.move
new file mode 100644
index 000000000..0ef94b90d
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_doesnt_assign.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true) {
+        return ()
+    } else {
+        x = 0
+    };
+    assert!(x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.move
new file mode 100644
index 000000000..aaeb798dc
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_branch_moves.move
@@ -0,0 +1,15 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    let y = 1;
+    if (false) {
+        y = move x;
+        y;
+        return ()
+    };
+    y;
+
+    assert!(x == 0, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.move
new file mode 100644
index 000000000..9cd218a6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken.move
@@ -0,0 +1,21 @@
+//# publish
+module 0x42::Test {
+    public fun t(): u64 {
+        let x;
+        if (true) {
+            return 100
+        } else {
+            x = 0;
+        };
+        x
+    }
+}
+
+//# run
+module 0x42::m {
+use 0x42::Test;
+
+fun main() {
+    assert!(Test::t() == 100, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.move
new file mode 100644
index 000000000..17eec9fe1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x;
+    if (true) {
+        return ()
+    } else {
+        x = 0
+    };
+    assert!(x == 0, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.move
new file mode 100644
index 000000000..17bfb185b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.move
@@ -0,0 +1,16 @@
+//# publish
+module 0x42::Test {
+    public fun t(): u64 {
+        if (true) return 100;
+        0
+    }
+}
+
+//# run
+module 0x42::m {
+use 0x42::Test;
+
+fun main() {
+    assert!(Test::t() == 100, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.exp
new file mode 100644
index 000000000..54ae4f5ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-7:
+Error: Function execution failed with VMError: {
+    major_status: OUT_OF_GAS,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.move
new file mode 100644
index 000000000..9bcbc4c20
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/unused_signer_infinite_loop.move
@@ -0,0 +1,7 @@
+//# run --gas-budget 700 --signers 0x1
+module 0x42::m {
+    fun main(_s: signer) {
+        // out of gas
+        loop ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.move
new file mode 100644
index 000000000..d61cc9e40
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_false.move
@@ -0,0 +1,8 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    while (false) x = 1;
+    assert!(x == 0, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.move
new file mode 100644
index 000000000..ff23e98d5
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested.move
@@ -0,0 +1,17 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    let z = 0;
+    let y;
+    while (x < 3) {
+        x = x + 1;
+        y = 0;
+        while (y < 7) {
+            y = y + 1;
+            z = z + 1;
+        }
+    };
+    assert!(z == 21, 42)
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.move
new file mode 100644
index 000000000..9a8c3a958
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_nested_return.move
@@ -0,0 +1,10 @@
+//# run
+module 0x42::m {
+fun main() {
+    while (true) {
+        while (true) return ();
+        assert!(false, 42);
+    };
+    assert!(false, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.move
new file mode 100644
index 000000000..ef8174827
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_return.move
@@ -0,0 +1,7 @@
+//# run
+module 0x42::m {
+fun main() {
+    while (true) return ();
+    assert!(false, 42)
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.move b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.move
new file mode 100644
index 000000000..cb28320fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/control_flow/while_simple.move
@@ -0,0 +1,8 @@
+//# run
+module 0x42::m {
+fun main() {
+    let x = 0;
+    while (x < 5) x = x + 1;
+    assert!(x == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.move b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.move
new file mode 100644
index 000000000..213896bd5
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/dependency_order.move
@@ -0,0 +1,29 @@
+//# publish
+module 0x42::C {
+    struct T {}
+    public fun foo(): T {
+        T{}
+    }
+}
+
+//# publish
+// names used to try to force an ordering of depedencies
+module 0x42::B {
+    public fun foo(): 0x42::C::T {
+        0x42::C::foo()
+    }
+}
+
+//# publish
+module 0x42::A {
+    struct T {
+        t_b: 0x42::C::T,
+        t_c: 0x42::C::T,
+    }
+    public fun foo(): T {
+        T {
+            t_c: 0x42::C::foo(),
+            t_b: 0x42::B::foo()
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.exp
new file mode 100644
index 000000000..fc9c6630d
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.exp
@@ -0,0 +1,4 @@
+processed 3 tasks
+
+task 2 'run'. lines 22-22:
+return values: { false }
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.move b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.move
new file mode 100644
index 000000000..03aacc036
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package.move
@@ -0,0 +1,22 @@
+//# init --edition 2024.alpha
+
+//# publish
+address 0x42 {
+    module x {
+        public struct T has drop {}
+
+        public(package) fun new(): T {
+            T {}
+        }
+    }
+
+    module y {
+        use 0x42::x;
+
+        public fun foo(): x::T {
+            x::new()
+        }
+    }
+}
+
+//# run 0x42::y::foo
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.exp
new file mode 100644
index 000000000..9eef7bb9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 11-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Y'. Got VMError: {
+    major_status: LOOKUP_FAILED,
+    sub_status: None,
+    location: 0x42::Y,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.move b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.move
new file mode 100644
index 000000000..737866990
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/public_package_different_packages.move
@@ -0,0 +1,17 @@
+//# init --edition 2024.alpha
+
+//# publish
+module 0x42::X {
+    public struct T has drop {}
+    public(package) fun new(): T {
+        T {}
+    }
+}
+
+//# publish
+module 0x42::Y {
+    use 0x42::X;
+    public fun foo(): X::T {
+        X::new()
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.move b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.move
new file mode 100644
index 000000000..7c54abb76
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/dependencies/transitive_deps.move
@@ -0,0 +1,25 @@
+//# publish
+module 0x42::X {
+    struct T has drop {}
+    public fun new(): T {
+        T {}
+    }
+}
+
+//# publish
+module 0x42::Y {
+    use 0x42::X;
+    public fun foo(): X::T {
+        X::new()
+    }
+}
+
+
+//# run
+module 0x42::m {
+use 0x42::Y;
+
+fun main() {
+    Y::foo();
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.exp
new file mode 100644
index 000000000..4d4c7d902
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 9-15:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.move b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.move
new file mode 100644
index 000000000..4bd92d652
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/lazy_assert.move
@@ -0,0 +1,23 @@
+//# run
+module 1::m {
+    fun main() {
+        // does not abort
+        assert!(true, 1 / 0);
+    }
+}
+
+//# run
+module 2::m {
+    fun main() {
+        // does abort
+        assert!(false, 1 / 0);
+    }
+}
+
+//# run
+module 3::m {
+    fun main() {
+        // does abort, will be deprecated
+        assert(true, 1 / 0);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.move b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.move
new file mode 100644
index 000000000..2be7d17b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting.move
@@ -0,0 +1,27 @@
+//# publish
+module 0x42::X {
+    public fun error(): bool {
+        abort 42
+    }
+}
+
+//# run
+module 0x42::m {
+use 0x42::X;
+fun main() {
+    let vtrue = true;
+    let vfalse = false;
+
+    true || X::error();
+    vtrue || X::error();
+    vtrue || { let r = X::error(); r };
+    { let x = vtrue; x} || X::error();
+
+    false && X::error();
+    vfalse && X::error();
+    vfalse && { let r = X::error(); r };
+    { let x = vfalse; x} && X::error();
+    true || { abort 0 };
+    { true } || (abort 0);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.exp
new file mode 100644
index 000000000..b5abb5888
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.exp
@@ -0,0 +1,46 @@
+processed 6 tasks
+
+task 1 'run'. lines 10-16:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x42::X,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 2 'run'. lines 19-25:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x42::X,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 3 'run'. lines 27-33:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x42::X,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 35-41:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x42::X,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 5 'run'. lines 43-48:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.move b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.move
new file mode 100644
index 000000000..b916d0197
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/short_circuiting_invalid.move
@@ -0,0 +1,48 @@
+//# publish
+module 0x42::X {
+    public fun error(): bool {
+        abort 42
+    }
+}
+
+// all should abort
+
+//# run
+module 2::m {
+use 0x42::X;
+fun main() {
+    false || X::error();
+}
+}
+
+
+//# run
+module 3::m {
+use 0x42::X;
+fun main() {
+    true && X::error();
+}
+}
+
+//# run
+module 4::m {
+use 0x42::X;
+fun main() {
+    X::error() && false;
+}
+}
+
+//# run
+module 5::m {
+use 0x42::X;
+fun main() {
+    X::error() || true;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    false || { abort 0 };
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.exp
new file mode 100644
index 000000000..4b8cb7ee6
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.exp
@@ -0,0 +1,46 @@
+processed 6 tasks
+
+task 1 'run'. lines 40-47:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 49-56:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(1), 2)],
+}
+
+task 3 'run'. lines 58-65:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 2)],
+}
+
+task 4 'run'. lines 67-74:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 2)],
+}
+
+task 5 'run'. lines 76-83:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.move b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.move
new file mode 100644
index 000000000..c4aa1bb37
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/evaluation_order/struct_arguments.move
@@ -0,0 +1,83 @@
+//# publish
+module 0x42::M {
+    struct S has drop {
+        a: u64,
+        b: u64,
+    }
+
+    struct R has key, store {}
+    struct Cup has key {
+        a: u64,
+        b: R,
+    }
+
+    public fun t0() {
+        S { b: 1 / 0, a: fail(0) };
+    }
+
+    public fun t1() {
+        S { b: 18446744073709551615 + 18446744073709551615, a: fail(0) };
+    }
+
+    public fun t2() {
+        S { b: 0 - 1, a: fail(0) };
+    }
+
+    public fun t3() {
+        S { b: 1 % 0, a: fail(0) };
+    }
+
+    public fun t4() {
+        S { b: 18446744073709551615 * 18446744073709551615, a: fail(0) };
+    }
+
+    fun fail(code: u64): u64 {
+        abort code
+    }
+
+}
+
+//# run
+module 1::m {
+use 0x42::M;
+fun main() {
+  // arithmetic error
+  M::t0()
+}
+}
+
+//# run
+module 2::m {
+use 0x42::M;
+fun main() {
+  // arithmetic error
+  M::t1()
+}
+}
+
+//# run
+module 3::m {
+use 0x42::M;
+fun main() {
+  // arithmetic error
+  M::t2()
+}
+}
+
+//# run
+module 4::m {
+use 0x42::M;
+fun main() {
+  // arithmetic error
+  M::t3()
+}
+}
+
+//# run
+module 5::m {
+use 0x42::M;
+fun main() {
+  // arithmetic error
+  M::t4()
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.move b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.move
new file mode 100644
index 000000000..dac82c298
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_modify.move
@@ -0,0 +1,43 @@
+//# init --edition 2024.alpha
+
+//# publish
+
+module 0x42::t {
+
+public struct X has copy, drop { count: u64 }
+public struct Y has copy, drop { x: X }
+
+public fun bump(self: &mut X) { self.count = self.count + 1 }
+public fun count(self: &X): u64 { self.count }
+
+public fun owned(mut x: X, mut y: Y) {
+    assert!(x.count() == 0, 0);
+    assert!(y.x.count() == 0, 0);
+    x.bump();
+    y.x.bump();
+    assert!(x.count() == 1, 0);
+    assert!(y.x.count() == 1, 0);
+}
+
+public fun mut_ref(x: &mut X, y: &mut Y) {
+    assert!(x.count() == 0, 0);
+    assert!(y.x.count() == 0, 0);
+    x.bump();
+    y.x.bump();
+    assert!(x.count() == 1, 0);
+    assert!(y.x.count() == 1, 0);
+}
+
+public fun test() {
+    let x = X { count: 0 };
+    let y = Y { x };
+    owned(x, y);
+
+    let mut x = X { count: 0 };
+    let mut y = Y { x };
+    mut_ref(&mut x, &mut y);
+}
+
+}
+
+//# run 0x42::t::test
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.move b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.move
new file mode 100644
index 000000000..9d7f9e399
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_owned.move
@@ -0,0 +1,37 @@
+//# init --edition 2024.alpha
+
+//# publish
+
+module 0x42::t {
+
+public struct X has copy, drop {}
+public struct Y has copy, drop { x: X }
+
+public fun f(_self: X): bool { true }
+
+public fun owned(x: X, y: Y) {
+    assert!(x.f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun ref(x: &X, y: &Y) {
+    assert!((*x).f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun mut_ref(x: &mut X, y: &mut Y) {
+    assert!((*x).f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun test() {
+    let mut x = X{};
+    let mut y = Y { x };
+    ref(&x, &y);
+    mut_ref(&mut x, &mut y);
+    owned(x, y)
+}
+
+}
+
+//# run 0x42::t::test
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.move b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.move
new file mode 100644
index 000000000..093aead5e
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/functions/dot_call_ref.move
@@ -0,0 +1,42 @@
+//# init --edition 2024.alpha
+
+//# publish
+
+module 0x42::t {
+
+public struct X has copy, drop {}
+public struct Y has copy, drop { x: X }
+
+public fun f(_self: &X): bool { true }
+
+public fun owned(x: X, y: Y) {
+    assert!(x.f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun ref(x: &X, y: &Y) {
+    assert!(x.f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun mut_ref(x: &mut X, y: &mut Y) {
+    assert!(x.f(), 0);
+    assert!(y.x.f(), 0);
+}
+
+public fun tmp(x: &X, y: &Y) {
+    assert!((*x).f(), 0);
+    assert!((*&y.x).f(), 0);
+}
+
+public fun test() {
+    let mut x = X{};
+    let mut y = Y { x };
+    ref(&x, &y);
+    mut_ref(&mut x, &mut y);
+    owned(x, y)
+}
+
+}
+
+//# run 0x42::t::test
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.exp
new file mode 100644
index 000000000..cbb7b7ea9
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 50-56:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 58-64:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 80-86:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 88-94:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 113-119:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-127:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 131-137:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 155-161:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 163-169:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 171-177:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.move
new file mode 100644
index 000000000..34e9f5610
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u128.move
@@ -0,0 +1,177 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u128 + 0u128 == 0u128, 1000);
+    assert!(0u128 + 1u128 == 1u128, 1001);
+    assert!(1u128 + 1u128 == 2u128, 1002);
+
+    assert!(13u128 + 67u128 == 80u128, 1100);
+    assert!(100u128 + 10u128 == 110u128, 1101);
+
+    assert!(0u128 + 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211455u128, 1200);
+    assert!(1u128 + 340282366920938463463374607431768211454u128 == 340282366920938463463374607431768211455u128, 1201);
+    assert!(5u128 + 340282366920938463463374607431768211450u128 == 340282366920938463463374607431768211455u128, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u128 + 340282366920938463463374607431768211455u128;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    264235234643575437864589745863652363451u128 + 98731747836156137656137643716471364731u128;
+}
+}
+
+
+
+//# run
+module 4::m {
+fun main() {
+    assert!(0u128 - 0u128 == 0u128, 2000);
+    assert!(1u128 - 0u128 == 1u128, 2001);
+    assert!(1u128 - 1u128 == 0u128, 2002);
+
+    assert!(52u128 - 13u128 == 39u128, 2100);
+    assert!(100u128 - 10u128 == 90u128, 2101);
+
+    assert!(340282366920938463463374607431768211455u128 - 340282366920938463463374607431768211455u128 == 0u128, 2200);
+    assert!(5u128 - 1u128 - 4u128 == 0u128, 2201);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u128 - 1u128;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    54u128 - 100u128;
+}
+}
+
+//# run
+module 7::m {
+fun main() {
+    assert!(0u128 * 0u128 == 0u128, 3000);
+    assert!(1u128 * 0u128 == 0u128, 3001);
+    assert!(1u128 * 1u128 == 1u128, 3002);
+
+    assert!(6u128 * 7u128 == 42u128, 3100);
+    assert!(10u128 * 10u128 == 100u128, 3101);
+
+    assert!(170141183460469231731687303715884105727u128 * 2u128 == 340282366920938463463374607431768211454u128, 3200);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    18446744073709551616u128 * 18446744073709551616u128;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    170141183460469231731687303715884105728u128 * 2u128;
+}
+}
+
+
+
+//# run
+module 10::m {
+fun main() {
+    assert!(0u128 / 1u128 == 0u128, 4000);
+    assert!(1u128 / 1u128 == 1u128, 4001);
+    assert!(1u128 / 2u128 == 0u128, 4002);
+
+    assert!(6u128 / 3u128 == 2u128, 4100);
+    assert!(340282366920938463463374607431768211455u128 / 4315342637u128 == 78854078469537403609736727246u128, 4101);
+
+    assert!(340282366920938463463374607431768211454u128 / 340282366920938463463374607431768211455u128 == 0u128, 4200);
+    assert!(340282366920938463463374607431768211455u128 / 340282366920938463463374607431768211455u128 == 1u128, 4201);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    0u128 / 0u128;
+}
+}
+
+//# run
+module 12::m {
+fun main() {
+    // should fail
+    1u128 / 0u128;
+}
+}
+
+
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    340282366920938463463374607431768211455u128 / 0u128;
+}
+}
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u128 % 1u128 == 0u128, 5000);
+    assert!(1u128 % 1u128 == 0u128, 5001);
+    assert!(1u128 % 2u128 == 1u128, 5002);
+
+    assert!(8u128 % 3u128 == 2u128, 5100);
+    assert!(340282366920938463463374607431768211455u128 % 4315342637u128 == 2264823753u128, 5101);
+
+    assert!(340282366920938463463374607431768211454u128 % 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211454u128, 5200);
+    assert!(340282366920938463463374607431768211455u128 % 340282366920938463463374607431768211455u128 == 0u128, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u128 % 0u128;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u128 % 0u128;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    340282366920938463463374607431768211455u128 % 0u128;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.exp
new file mode 100644
index 000000000..201647057
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 87-93:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.move
new file mode 100644
index 000000000..08b3dfe6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u16.move
@@ -0,0 +1,174 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u16 + 0u16 == 0u16, 1000);
+    assert!(0u16 + 1u16 == 1u16, 1001);
+    assert!(1u16 + 1u16 == 2u16, 1002);
+
+    assert!(13u16 + 67u16 == 80u16, 1100);
+    assert!(100u16 + 10u16 == 110u16, 1101);
+
+    assert!(0u16 + 65535u16 == 65535u16, 1200);
+    assert!(1u16 + 65534u16 == 65535u16, 1201);
+    assert!(5u16 + 65530u16 == 65535u16, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u16 + 65535u16;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    65135u16 + 6555u16;
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    assert!(0u16 - 0u16 == 0u16, 2000);
+    assert!(1u16 - 0u16 == 1u16, 2001);
+    assert!(1u16 - 1u16 == 0u16, 2002);
+
+    assert!(52u16 - 13u16 == 39u16, 2100);
+    assert!(100u16 - 10u16 == 90u16, 2101);
+
+    assert!(65535u16 - 65535u16 == 0u16, 2200);
+    assert!(5u16 - 1u16 - 4u16 == 0u16, 2201);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u16 - 1u16;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    54u16 - 100u16;
+}
+}
+
+
+//# run
+module 7::m {
+fun main() {
+    assert!(0u16 * 0u16 == 0u16, 3000);
+    assert!(1u16 * 0u16 == 0u16, 3001);
+    assert!(1u16 * 1u16 == 1u16, 3002);
+
+    assert!(6u16 * 7u16 == 42u16, 3100);
+    assert!(10u16 * 10u16 == 100u16, 3101);
+
+    assert!(32767u16 * 2u16 == 65534u16, 3200);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    32767u16 * 32767u16;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    33767u16 * 2u16;
+}
+}
+
+
+
+//# run
+module 10::m {
+fun main() {
+    assert!(0u16 / 1u16 == 0u16, 4000);
+    assert!(1u16 / 1u16 == 1u16, 4001);
+    assert!(1u16 / 2u16 == 0u16, 4002);
+
+    assert!(6u16 / 3u16 == 2u16, 4100);
+    assert!(65535u16 / 13u16 == 5041u16, 4101);
+
+    assert!(65534u16 / 65535u16 == 0u16, 4200);
+    assert!(65535u16 / 65534u16 == 1u16, 4201);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    0u16 / 0u16;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+module 12::m {
+fun main() {
+    1u16 / 0u16;
+}
+}
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    65535u16 / 0u16;
+}
+}
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u16 % 1u16 == 0u16, 5000);
+    assert!(1u16 % 1u16 == 0u16, 5001);
+    assert!(1u16 % 2u16 == 1u16, 5002);
+
+    assert!(8u16 % 3u16 == 2u16, 5100);
+    assert!(65535u16 % 134u16 == 9u16, 5101);
+
+    assert!(65534u16 % 65535u16 == 65534u16, 5200);
+    assert!(65535u16 % 65535u16 == 0u16, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u16 % 0u16;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u16 % 0u16;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    65535u16 % 0u16;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.exp
new file mode 100644
index 000000000..b0d3278eb
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.exp
@@ -0,0 +1,100 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.move
new file mode 100644
index 000000000..569c9f522
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u256.move
@@ -0,0 +1,174 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u256 + 0u256 == 0u256, 1000);
+    assert!(0u256 + 1u256 == 1u256, 1001);
+    assert!(1u256 + 1u256 == 2u256, 1002);
+
+    assert!(13u256 + 67u256 == 80u256, 1100);
+    assert!(100u256 + 10u256 == 110u256, 1101);
+
+    assert!(0u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1200);
+    assert!(1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1201);
+    assert!(5u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639930u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    105792089237316195423570985008687907853269984665640564039457584007913129639935u256 + 105792089237316195423570985008687907853269984665640564039457584007913129639935;
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    assert!(0u256 - 0u256 == 0u256, 2000);
+    assert!(1u256 - 0u256 == 1u256, 2001);
+    assert!(1u256 - 1u256 == 0u256, 2002);
+
+    assert!(52u256 - 13u256 == 39u256, 2100);
+    assert!(100u256 - 10u256 == 90u256, 2101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 - 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 2200);
+    assert!(5u256 - 1u256 - 4u256 == 0u256, 2201);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u256 - 1u256;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    54u256 - 100u256;
+}
+}
+
+
+//# run
+module 7::m {
+fun main() {
+    assert!(0u256 * 0u256 == 0u256, 3000);
+    assert!(1u256 * 0u256 == 0u256, 3001);
+    assert!(1u256 * 1u256 == 1u256, 3002);
+
+    assert!(6u256 * 7u256 == 42u256, 3100);
+    assert!(10u256 * 10u256 == 100u256, 3101);
+
+    assert!(57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 3200);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    578960446186580977117853953926634992332820282019728792003956564819967u256 * 57896044618343953926634992332820282019728792003956564819967u256;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    37896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256;
+}
+}
+
+
+
+//# run
+module 10::m {
+fun main() {
+    assert!(0u256 / 1u256 == 0u256, 4000);
+    assert!(1u256 / 1u256 == 1u256, 4001);
+    assert!(1u256 / 2u256 == 0u256, 4002);
+
+    assert!(6u256 / 3u256 == 2u256, 4100);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 1234567891234512345678912345u256 == 93791593041942242554519147120179023890934338607714u256, 4101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 4200);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 1u256, 4201);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    0u256 / 0u256;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+module 12::m {
+fun main() {
+    1u256 / 0u256;
+}
+}
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 0u256;
+}
+}
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u256 % 1u256 == 0u256, 5000);
+    assert!(1u256 % 1u256 == 0u256, 5001);
+    assert!(1u256 % 2u256 == 1u256, 5002);
+
+    assert!(8u256 % 3u256 == 2u256, 5100);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 1234567891234512345678912345u256 == 440810759282713395982810605u256, 5101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 5200);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 0u256, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u256 % 0u256;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u256 % 0u256;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    4294967294u256 % 0u256;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.exp
new file mode 100644
index 000000000..06c8c0358
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.exp
@@ -0,0 +1,100 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x4::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.move
new file mode 100644
index 000000000..8bff88c4a
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u32.move
@@ -0,0 +1,174 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u32 + 0u32 == 0u32, 1000);
+    assert!(0u32 + 1u32 == 1u32, 1001);
+    assert!(1u32 + 1u32 == 2u32, 1002);
+
+    assert!(13u32 + 67u32 == 80u32, 1100);
+    assert!(100u32 + 10u32 == 110u32, 1101);
+
+    assert!(0u32 + 4294967295u32 == 4294967295u32, 1200);
+    assert!(1u32 + 4294967294u32 == 4294967295u32, 1201);
+    assert!(5u32 + 4294967290u32 == 4294967295u32, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u32 + 4294967295u32;
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    // should fail
+    4294967295u32 + 4294967295u32;
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    assert!(0u32 - 0u32 == 0u32, 2000);
+    assert!(1u32 - 0u32 == 1u32, 2001);
+    assert!(1u32 - 1u32 == 0u32, 2002);
+
+    assert!(52u32 - 13u32 == 39u32, 2100);
+    assert!(100u32 - 10u32 == 90u32, 2101);
+
+    assert!(4294967295u32 - 4294967295u32 == 0u32, 2200);
+    assert!(5u32 - 1u32 - 4u32 == 0u32, 2201);
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    0u32 - 1u32;
+}
+}
+
+//# run
+module 7::m {
+fun main() {
+    // should fail
+    54u32 - 100u32;
+}
+}
+
+
+//# run
+module 8::m {
+fun main() {
+    assert!(0u32 * 0u32 == 0u32, 3000);
+    assert!(1u32 * 0u32 == 0u32, 3001);
+    assert!(1u32 * 1u32 == 1u32, 3002);
+
+    assert!(6u32 * 7u32 == 42u32, 3100);
+    assert!(10u32 * 10u32 == 100u32, 3101);
+
+    assert!(2147483647u32 * 2u32 == 4294967294u32, 3200);
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    1147483647u32 * 2147483647u32;
+}
+}
+
+//# run
+module 10::m {
+fun main() {
+    // should fail
+    1147483647u32 * 2u32;
+}
+}
+
+
+
+//# run
+module 11::m {
+fun main() {
+    assert!(0u32 / 1u32 == 0u32, 4000);
+    assert!(1u32 / 1u32 == 1u32, 4001);
+    assert!(1u32 / 2u32 == 0u32, 4002);
+
+    assert!(6u32 / 3u32 == 2u32, 4100);
+    assert!(4294967294u32 / 13u32 == 330382099u32, 4101);
+
+    assert!(4294967294u32 / 4294967295u32 == 0u32, 4200);
+    assert!(4294967295u32 / 4294967294u32 == 1u32, 4201);
+}
+}
+
+//# run
+module 12::m {
+fun main() {
+    // should fail
+    0u32 / 0u32;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+module 13::m {
+fun main() {
+    1u32 / 0u32;
+}
+}
+
+//# run
+module 0x42::m {
+fun main() {
+    // should fail
+    4294967294u32 / 0u32;
+}
+}
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u32 % 1u32 == 0u32, 5000);
+    assert!(1u32 % 1u32 == 0u32, 5001);
+    assert!(1u32 % 2u32 == 1u32, 5002);
+
+    assert!(8u32 % 3u32 == 2u32, 5100);
+    assert!(4294967294u32 % 1234u32 == 678u32, 5101);
+
+    assert!(4294967294u32 % 4294967295u32 == 4294967294u32, 5200);
+    assert!(4294967294u32 % 4294967294u32 == 0u32, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u32 % 0u32;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u32 % 0u32;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    4294967294u32 % 0u32;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.exp
new file mode 100644
index 000000000..78f096fa7
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 50-56:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 58-64:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 81-87:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 89-95:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 114-121:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 123-128:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 130-136:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 154-160:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 162-168:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 170-176:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.move
new file mode 100644
index 000000000..765ea83ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u64.move
@@ -0,0 +1,176 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u64 + 0u64 == 0u64, 1000);
+    assert!(0u64 + 1u64 == 1u64, 1001);
+    assert!(1u64 + 1u64 == 2u64, 1002);
+
+    assert!(13u64 + 67u64 == 80u64, 1100);
+    assert!(100u64 + 10u64 == 110u64, 1101);
+
+    assert!(0u64 + 18446744073709551615u64 == 18446744073709551615u64, 1200);
+    assert!(1u64 + 18446744073709551614u64 == 18446744073709551615u64, 1201);
+    assert!(5u64 + 18446744073709551610u64 == 18446744073709551615u64, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u64 + 18446744073709551615u64;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    12000000000000000000u64 + 10000000000000000000u64;
+}
+}
+
+
+
+//# run
+module 4::m {
+fun main() {
+    assert!(0u64 - 0u64 == 0u64, 2000);
+    assert!(1u64 - 0u64 == 1u64, 2001);
+    assert!(1u64 - 1u64 == 0u64, 2002);
+
+    assert!(52u64 - 13u64 == 39u64, 2100);
+    assert!(100u64 - 10u64 == 90u64, 2101);
+
+    assert!(18446744073709551615u64 - 18446744073709551615u64 == 0u64, 2200);
+    assert!(5u64 - 1u64 - 4u64 == 0u64, 2201);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u64 - 1u64;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    54u64 - 100u64;
+}
+}
+
+
+//# run
+module 7::m {
+fun main() {
+    assert!(0u64 * 0u64 == 0u64, 3000);
+    assert!(1u64 * 0u64 == 0u64, 3001);
+    assert!(1u64 * 1u64 == 1u64, 3002);
+
+    assert!(6u64 * 7u64 == 42u64, 3100);
+    assert!(10u64 * 10u64 == 100u64, 3101);
+
+    assert!(9223372036854775807u64 * 2u64 == 18446744073709551614u64, 3200);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    4294967296u64 * 4294967296u64;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    9223372036854775808 * 2u64;
+}
+}
+
+
+
+//# run
+module 10::m {
+fun main() {
+    assert!(0u64 / 1u64 == 0u64, 4000);
+    assert!(1u64 / 1u64 == 1u64, 4001);
+    assert!(1u64 / 2u64 == 0u64, 4002);
+
+    assert!(6u64 / 3u64 == 2u64, 4100);
+    assert!(18446744073709551615u64 / 13131u64 == 1404824009878116u64, 4101);
+
+    assert!(18446744073709551614u64 / 18446744073709551615u64 == 0u64, 4200);
+    assert!(18446744073709551615u64 / 18446744073709551615u64 == 1u64, 4201);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    0u64 / 0u64;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+module 12::m {
+fun main() {
+    1u64 / 0u64;
+}
+}
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    18446744073709551615u64 / 0u64;
+}
+}
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u64 % 1u64 == 0u64, 5000);
+    assert!(1u64 % 1u64 == 0u64, 5001);
+    assert!(1u64 % 2u64 == 1u64, 5002);
+
+    assert!(8u64 % 3u64 == 2u64, 5100);
+    assert!(18446744073709551615u64 % 13131u64 == 10419u64, 5101);
+
+    assert!(18446744073709551614u64 % 18446744073709551615u64 == 18446744073709551614u64, 5200);
+    assert!(18446744073709551615u64 % 18446744073709551615u64 == 0u64, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u64 % 0u64;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u64 % 0u64;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    18446744073709551615u64 % 0u64;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.exp
new file mode 100644
index 000000000..76beb6d17
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 87-93:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 111-117:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 119-125:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 127-133:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.move
new file mode 100644
index 000000000..baa909797
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/arithmetic_operators_u8.move
@@ -0,0 +1,174 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u8 + 0u8 == 0u8, 1000);
+    assert!(0u8 + 1u8 == 1u8, 1001);
+    assert!(1u8 + 1u8 == 2u8, 1002);
+
+    assert!(13u8 + 67u8 == 80u8, 1100);
+    assert!(100u8 + 10u8 == 110u8, 1101);
+
+    assert!(0u8 + 255u8 == 255u8, 1200);
+    assert!(1u8 + 254u8 == 255u8, 1201);
+    assert!(5u8 + 250u8 == 255u8, 1202);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    1u8 + 255u8;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    215u8 + 156u8;
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    assert!(0u8 - 0u8 == 0u8, 2000);
+    assert!(1u8 - 0u8 == 1u8, 2001);
+    assert!(1u8 - 1u8 == 0u8, 2002);
+
+    assert!(52u8 - 13u8 == 39u8, 2100);
+    assert!(100u8 - 10u8 == 90u8, 2101);
+
+    assert!(255u8 - 255u8 == 0u8, 2200);
+    assert!(5u8 - 1u8 - 4u8 == 0u8, 2201);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u8 - 1u8;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    54u8 - 100u8;
+}
+}
+
+
+//# run
+module 7::m {
+fun main() {
+    assert!(0u8 * 0u8 == 0u8, 3000);
+    assert!(1u8 * 0u8 == 0u8, 3001);
+    assert!(1u8 * 1u8 == 1u8, 3002);
+
+    assert!(6u8 * 7u8 == 42u8, 3100);
+    assert!(10u8 * 10u8 == 100u8, 3101);
+
+    assert!(127u8 * 2u8 == 254u8, 3200);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    16u8 * 16u8;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    128u8 * 2u8;
+}
+}
+
+
+//# run
+module 10::m {
+fun main() {
+    assert!(0u8 / 1u8 == 0u8, 4000);
+    assert!(1u8 / 1u8 == 1u8, 4001);
+    assert!(1u8 / 2u8 == 0u8, 4002);
+
+    assert!(6u8 / 3u8 == 2u8, 4100);
+    assert!(255u8 / 7u8 == 36u8, 4101);
+
+    assert!(254u8 / 255u8 == 0u8, 4200);
+    assert!(255u8 / 255u8 == 1u8, 4201);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    0u8 / 0u8;
+}
+}
+
+//# run
+module 12::m {
+fun main() {
+    // should fail
+    1u8 / 0u8;
+}
+}
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    255u8 / 0u8;
+}
+}
+
+
+
+//# run
+module 14::m {
+fun main() {
+    assert!(0u8 % 1u8 == 0u8, 5000);
+    assert!(1u8 % 1u8 == 0u8, 5001);
+    assert!(1u8 % 2u8 == 1u8, 5002);
+
+    assert!(8u8 % 3u8 == 2u8, 5100);
+    assert!(255u8 % 7u8 == 3u8, 5101);
+
+    assert!(254u8 % 255u8 == 254u8, 5200);
+    assert!(255u8 % 255u8 == 0u8, 5201);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    0u8 % 0u8;
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    1u8 % 0u8;
+}
+}
+
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    255u8 % 0u8;
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.move
new file mode 100644
index 000000000..7382f201b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/bitwise_operators.move
@@ -0,0 +1,156 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u8 & 0u8 == 0u8, 1000);
+    assert!(0u64 & 0u64 == 0u64, 1001);
+    assert!(0u128 & 0u128 == 0u128, 1002);
+    assert!(0u8 & 42u8 == 0u8, 1003);
+    assert!(0u64 & 42u64 == 0u64, 1004);
+    assert!(0u128 & 42u128 == 0u128, 1005);
+    assert!(0u16 & 0u16 == 0u16, 1000);
+    assert!(0u32 & 0u32 == 0u32, 1001);
+    assert!(0u256 & 0u256 == 0u256, 1002);
+    assert!(0u16 & 42u16 == 0u16, 1003);
+    assert!(0u32 & 42u32 == 0u32, 1004);
+    assert!(0u256 & 42u256 == 0u256, 1005);
+
+    assert!(43u8 & 43u8 == 43u8, 1100);
+    assert!(856776467654u64 & 856776467654u64 == 856776467654u64, 1101);
+    assert!(4125423653474658754976595u128 & 4125423653474658754976595u128 == 4125423653474658754976595u128, 1102);
+    assert!(43u16 & 43u16 == 43u16, 1100);
+    assert!(856744u32 & 856744u32 == 856744u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 & 41254236534746587549765954658754976595u256 == 41254236534746587549765954658754976595u256, 1102);
+
+    assert!(255u8 & 255u8 == 255u8, 1200);
+    assert!(18446744073709551615u64 & 18446744073709551615u64 == 18446744073709551615u64, 1201);
+    assert!(
+        340282366920938463463374607431768211455u128 &
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        1202
+    );
+    assert!(65535u16 & 65535u16 == 65535u16, 1200);
+    assert!(4294967295u32 & 4294967295u32 == 4294967295u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 &
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
+
+    assert!(101u8 & 77u8 == 69u8, 1300);
+    assert!(675437u64 & 14235u64 == 1545u64, 1301);
+    assert!(534263574563786485434889u128 & 3141524387653489576893u128 == 632665710869872675337u128, 1302);
+    assert!(10186u16 & 717u16 == 712u16, 1300);
+    assert!(675437u32 & 14235u32 == 1545u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 & 3141524387653489576893u256 == 2366182237060668637861u256, 1302);
+}
+}
+
+
+//# run
+module 0x42::m {
+fun main() {
+    assert!(0u8 | 0u8 == 0u8, 2000);
+    assert!(0u64 | 0u64 == 0u64, 2001);
+    assert!(0u128 | 0u128 == 0u128, 2002);
+    assert!(42u8 | 0u8 == 42u8, 2003);
+    assert!(42u64 | 0u64 == 42u64, 2004);
+    assert!(42u128 | 0u128 == 42u128, 2005);
+    assert!(0u16 | 0u16 == 0u16, 1000);
+    assert!(0u32 | 0u32 == 0u32, 1001);
+    assert!(0u256 | 0u256 == 0u256, 1002);
+    assert!(0u16 | 42u16 == 42u16, 1003);
+    assert!(0u32 | 42u32 == 42u32, 1004);
+    assert!(0u256 | 42u256 == 42u256, 1005);
+
+
+    assert!(43u8 | 43u8 == 43u8, 2100);
+    assert!(856776467654u64 | 856776467654u64 == 856776467654u64, 2101);
+    assert!(4125423653474658754976595u128 | 4125423653474658754976595u128 == 4125423653474658754976595u128, 2102);
+    assert!(43u16 | 43u16 == 43u16, 1100);
+    assert!(856744u32 | 856744u32 == 856744u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 | 41254236534746587549765954658754976595u256 == 41254236534746587549765954658754976595u256, 1102);
+
+    assert!(255u8 | 255u8 == 255u8, 2200);
+    assert!(18446744073709551615u64 | 18446744073709551615u64 == 18446744073709551615u64, 2201);
+    assert!(
+        340282366920938463463374607431768211455u128 |
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        2202
+    );
+    assert!(65535u16 | 65535u16 == 65535u16, 1200);
+    assert!(4294967295u32 | 4294967295u32 == 4294967295u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 |
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
+
+    assert!(101u8 | 77u8 == 109u8, 2300);
+    assert!(675437u64 | 14235u64 == 688127u64, 2301);
+    assert!(534263574563786485434889u128 | 3141524387653489576893u128 == 536772433240570102336445u128, 2302);
+    assert!(10186u16 | 717u16 == 10191u16, 1300);
+    assert!(675437u32 | 14235u32 == 688127u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 | 3141524387653489576893u256 == 115792089237316195423570985008687907853269984665640564814799734600734068671u256, 1302);
+}
+}
+
+
+//# run
+module 2::m {
+fun main() {
+    assert!(0u8 ^ 0u8 == 0u8, 3000);
+    assert!(0u64 ^ 0u64 == 0u64, 3001);
+    assert!(0u128 ^ 0u128 == 0u128, 3002);
+    assert!(13u8 ^ 0u8 == 13u8, 3003);
+    assert!(13u64 ^ 0u64 == 13u64, 3004);
+    assert!(13u128 ^ 0u128 == 13u128, 3005);
+    assert!(0u16 ^ 0u16 == 0u16, 3000);
+    assert!(0u32 ^ 0u32 == 0u32, 3001);
+    assert!(0u256 ^ 0u256 == 0u256, 3002);
+    assert!(13u16 ^ 0u16 == 13u16, 3003);
+    assert!(13u32 ^ 0u32 == 13u32, 3004);
+    assert!(13u256 ^ 0u256 == 13u256, 3005);
+
+    assert!(43u8 ^ 43u8 == 0u8, 3100);
+    assert!(856776467654u64 ^ 856776467654u64 == 0u64, 3101);
+    assert!(4125423653474658754976595u128 ^ 4125423653474658754976595u128 == 0u128, 3102);
+    assert!(43u16 ^ 43u16 == 0u16, 1100);
+    assert!(856744u32 ^ 856744u32 == 0u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 ^ 41254236534746587549765954658754976595u256 == 0u256, 1102);
+
+    assert!(255u8 ^ 255u8 == 0u8, 3200);
+    assert!(18446744073709551615u64 ^ 18446744073709551615u64 == 0u64, 3201);
+    assert!(
+        340282366920938463463374607431768211455u128 ^
+        340282366920938463463374607431768211455u128 ==
+        0u128,
+        3202
+    );
+    assert!(65535u16 ^ 65535u16 == 0u16, 1200);
+    assert!(4294967295u32 ^ 4294967295u32 == 0u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ^
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        0u256,
+        1202
+    );
+
+    assert!(101u8 ^ 77u8 == 40u8, 3300);
+    assert!(675437u64 ^ 14235u64 == 686582u64, 3301);
+    assert!(534263574563786485434889u128 ^ 3141524387653489576893u128 == 536139767529700229661108u128, 3302);
+    assert!(10186u16 ^ 717u16 == 9479u16, 1300);
+    assert!(675437u32 ^ 14235u32 == 686582u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 ^ 3141524387653489576893u256 == 115792089237316195423570985008687907853269984665640562448617497540065430810u256, 1302);
+
+    assert!(13u8 ^ 1u8 == 12u8, 3400);
+    assert!(13u64 ^ 1u64 == 12u64, 3401);
+    assert!(13u128 ^ 1u128 == 12u128, 3402);
+    assert!(13u16 ^ 1u16 == 12u16, 3400);
+    assert!(13u32 ^ 1u32 == 12u32, 3401);
+    assert!(13u256 ^ 1u256 == 12u256, 3402);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.move
new file mode 100644
index 000000000..bb50aed40
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/boolean_operators.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+  assert!((true && false) == false, 99);
+  assert!((true || false) == true, 100);
+  assert!(!true == false, 101);
+  assert!(!false == true, 102);
+  assert!(!!true == true, 103);
+  assert!(!!false == false, 104);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.exp
new file mode 100644
index 000000000..b7e76c71c
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.exp
@@ -0,0 +1,253 @@
+processed 35 tasks
+
+task 6 'run'. lines 182-188:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 190-196:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 198-204:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 206-212:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xa::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 214-220:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xb::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 222-228:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xc::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'run'. lines 230-236:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xd::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 13 'run'. lines 238-244:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xe::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 14 'run'. lines 246-252:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xf::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 254-262:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 263-269:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 271-277:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 279-285:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x13::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 287-293:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 295-301:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 303-309:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 311-317:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x17::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 319-325:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x18::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 327-335:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x19::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 336-342:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1a::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 352-358:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1c::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 360-366:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1d::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 368-374:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1e::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 376-382:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1f::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 384-392:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x20::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 393-399:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x21::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 401-407:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x22::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 409-415:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x23::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.move
new file mode 100644
index 000000000..c9b40f952
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/casting_operators.move
@@ -0,0 +1,415 @@
+// Casting to u8.
+//# run
+module 1::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u8) == 0u8, 1000);
+    assert!((0u64 as u8) == 0u8, 1001);
+    assert!((0u128 as u8) == 0u8, 1002);
+    assert!((0u16 as u8) == 0u8, 1000);
+    assert!((0u32 as u8) == 0u8, 1001);
+    assert!((0u256 as u8) == 0u8, 1002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u8) == 21u8, 1100);
+    assert!((21u64 as u8) == 21u8, 1101);
+    assert!((21u128 as u8) == 21u8, 1102);
+    assert!((21u16 as u8) == 21u8, 1100);
+    assert!((21u32 as u8) == 21u8, 1101);
+    assert!((21u256 as u8) == 21u8, 1102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u8) == 255u8, 1200);
+    assert!((255u64 as u8) == 255u8, 1201);
+    assert!((255u128 as u8) == 255u8, 1202);
+    assert!((255u16 as u8) == 255u8, 1200);
+    assert!((255u32 as u8) == 255u8, 1201);
+    assert!((255u256 as u8) == 255u8, 1202);
+}
+}
+
+// Casting to u16.
+//# run
+module 2::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u16) == 0u16, 1000);
+    assert!((0u64 as u16) == 0u16, 1001);
+    assert!((0u128 as u16) == 0u16, 1002);
+    assert!((0u16 as u16) == 0u16, 1000);
+    assert!((0u32 as u16) == 0u16, 1001);
+    assert!((0u256 as u16) == 0u16, 1002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u16) == 21u16, 1100);
+    assert!((21u64 as u16) == 21u16, 1101);
+    assert!((21u128 as u16) == 21u16, 1102);
+    assert!((21u16 as u16) == 21u16, 1100);
+    assert!((21u32 as u16) == 21u16, 1101);
+    assert!((21u256 as u16) == 21u16, 1102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u16) == 255u16, 1200);
+    assert!((65535u64 as u16) == 65535u16, 1201);
+    assert!((65535u128 as u16) == 65535u16, 1202);
+    assert!((65535u16 as u16) == 65535u16, 1200);
+    assert!((65535u32 as u16) == 65535u16, 1201);
+    assert!((65535u256 as u16) == 65535u16, 1202);
+}
+}
+
+// Casting to u32.
+//# run
+module 3::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u32) == 0u32, 1000);
+    assert!((0u64 as u32) == 0u32, 1001);
+    assert!((0u128 as u32) == 0u32, 1002);
+    assert!((0u16 as u32) == 0u32, 1000);
+    assert!((0u32 as u32) == 0u32, 1001);
+    assert!((0u256 as u32) == 0u32, 1002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u32) == 21u32, 1100);
+    assert!((21u64 as u32) == 21u32, 1101);
+    assert!((21u128 as u32) == 21u32, 1102);
+    assert!((21u16 as u32) == 21u32, 1100);
+    assert!((21u32 as u32) == 21u32, 1101);
+    assert!((21u256 as u32) == 21u32, 1102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u32) == 255u32, 1200);
+    assert!((4294967295u64 as u32) == 4294967295u32, 1201);
+    assert!((4294967295u128 as u32) == 4294967295u32, 1202);
+    assert!((65535u16 as u32) == 65535u32, 1200);
+    assert!((4294967295u32 as u32) == 4294967295u32, 1201);
+    assert!((4294967295u256 as u32) == 4294967295u32, 1202);
+}
+}
+
+// Casting to u64.
+//# run
+module 4::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u64) == 0u64, 2000);
+    assert!((0u64 as u64) == 0u64, 2001);
+    assert!((0u128 as u64) == 0u64, 2002);
+    assert!((0u16 as u64) == 0u64, 2000);
+    assert!((0u32 as u64) == 0u64, 2001);
+    assert!((0u256 as u64) == 0u64, 2002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u64) == 21u64, 2100);
+    assert!((21u64 as u64) == 21u64, 2101);
+    assert!((21u128 as u64) == 21u64, 2102);
+    assert!((21u16 as u64) == 21u64, 2100);
+    assert!((21u32 as u64) == 21u64, 2101);
+    assert!((21u256 as u64) == 21u64, 2102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u64) == 255u64, 2200);
+    assert!((18446744073709551615u64 as u64) == 18446744073709551615u64, 2201);
+    assert!((18446744073709551615u128 as u64) == 18446744073709551615u64, 2202);
+    assert!((65535u16 as u64) == 65535u64, 2200);
+    assert!((4294967295u32 as u64) == 4294967295u64, 2201);
+    assert!((18446744073709551615u256 as u64) == 18446744073709551615u64, 2202);
+}
+}
+
+// Casting to u128.
+//# run
+module 5::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u128) == 0u128, 3000);
+    assert!((0u64 as u128) == 0u128, 3001);
+    assert!((0u128 as u128) == 0u128, 3002);
+    assert!((0u16 as u128) == 0u128, 3000);
+    assert!((0u32 as u128) == 0u128, 3001);
+    assert!((0u256 as u128) == 0u128, 3002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u128) == 21u128, 3100);
+    assert!((21u64 as u128) == 21u128, 3101);
+    assert!((21u128 as u128) == 21u128, 3102);
+    assert!((21u16 as u128) == 21u128, 3100);
+    assert!((21u32 as u128) == 21u128, 3101);
+    assert!((21u256 as u128) == 21u128, 3102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u128) == 255u128, 3200);
+    assert!((18446744073709551615u64 as u128) == 18446744073709551615u128, 3201);
+    assert!((340282366920938463463374607431768211455u128 as u128) == 340282366920938463463374607431768211455u128, 3202);
+    assert!((65535u16 as u128) == 65535u128, 2200);
+    assert!((4294967295u32 as u128) == 4294967295u128, 2201);
+    assert!((340282366920938463463374607431768211455u256 as u128) == 340282366920938463463374607431768211455u128, 3202);
+}
+}
+
+// Casting to u256.
+//# run
+module 6::m {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u256) == 0u256, 3000);
+    assert!((0u64 as u256) == 0u256, 3001);
+    assert!((0u128 as u256) == 0u256, 3002);
+    assert!((0u16 as u256) == 0u256, 3000);
+    assert!((0u32 as u256) == 0u256, 3001);
+    assert!((0u256 as u256) == 0u256, 3002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u256) == 21u256, 3100);
+    assert!((21u64 as u256) == 21u256, 3101);
+    assert!((21u128 as u256) == 21u256, 3102);
+    assert!((21u16 as u256) == 21u256, 3100);
+    assert!((21u32 as u256) == 21u256, 3101);
+    assert!((21u256 as u256) == 21u256, 3102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u256) == 255u256, 3200);
+    assert!((18446744073709551615u64 as u256) == 18446744073709551615u256, 3201);
+    assert!((340282366920938463463374607431768211455u128 as u256) == 340282366920938463463374607431768211455u256, 3202);
+    assert!((65535u16 as u256) == 65535u256, 2200);
+    assert!((4294967295u32 as u256) == 4294967295u256, 2201);
+    assert!((115792089237316195423570985008687907853269984665640564039457584007913129639935u256 as u256) == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 3202);
+}
+}
+
+// Casting to u8, overflowing.
+//# run
+module 7::m {
+fun main() {
+    // should fail
+    (256u64 as u8);
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    (303u64 as u8);
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    (256u128 as u8);
+}
+}
+
+//# run
+module 10::m {
+fun main() {
+    // should fail
+    (56432u128 as u8);
+}
+}
+
+//# run
+module 11::m {
+fun main() {
+    // should fail
+    (18446744073709551615u64 as u8);
+}
+}
+
+//# run
+module 12::m {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u8);
+}
+}
+
+//# run
+module 13::m {
+fun main() {
+    // should fail
+    (2561u16 as u8);
+}
+}
+
+//# run
+module 14::m {
+fun main() {
+    // should fail
+    (65532u16 as u8);
+}
+}
+
+//# run
+module 15::m {
+fun main() {
+    // should fail
+    (256123u32 as u8);
+}
+}
+
+//# run
+module 16::m {
+fun main() {
+    // should fail
+    (11579208923731619542357098500868790785326998466564056403945758400791312963993u256 as u8);
+}
+}
+
+// Casting to u16, overflowing.
+//# run
+module 17::m {
+fun main() {
+    // should fail
+    (256343532u64 as u16);
+}
+}
+
+//# run
+module 18::m {
+fun main() {
+    // should fail
+    (3564603u64 as u16);
+}
+}
+
+//# run
+module 19::m {
+fun main() {
+    // should fail
+    (256666765790535666u128 as u16);
+}
+}
+
+//# run
+module 20::m {
+fun main() {
+    // should fail
+    (256765735666u128 as u16);
+}
+}
+
+//# run
+module 21::m {
+fun main() {
+    // should fail
+    (18446744073709551615u64 as u16);
+}
+}
+
+//# run
+module 22::m {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u16);
+}
+}
+
+//# run
+module 23::m {
+fun main() {
+    // should fail
+    (429496729u32 as u16);
+}
+}
+
+//# run
+module 24::m {
+fun main() {
+    // should fail
+    (42949629u32 as u16);
+}
+}
+
+//# run
+module 25::m {
+fun main() {
+    // should fail
+    (115792089237316195423570985008687907853269984665640564039457584007913129639u256 as u16);
+}
+}
+
+// Casting to u32, overflowing.
+//# run
+module 26::m {
+fun main() {
+    // should fail
+    (4294967295644u64 as u32);
+}
+}
+
+//# run
+module 27::m {
+fun main() {
+    // should fail
+    (3564699003u64 as u32);
+}
+}
+
+//# run
+module 28::m {
+fun main() {
+    // should fail
+    (256666765790535666u128 as u32);
+}
+}
+
+//# run
+module 29::m {
+fun main() {
+    // should fail
+    (25676573566896u128 as u32);
+}
+}
+
+//# run
+module 30::m {
+fun main() {
+    // should fail
+    (18446744073709551615u64 as u32);
+}
+}
+
+//# run
+module 31::m {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u32);
+}
+}
+
+//# run
+module 32::m {
+fun main() {
+    // should fail
+    (115792089237316195423570985008687907853269984665640564039457584007913129639u256 as u32);
+}
+}
+
+// Casting to u64, overflowing.
+//# run
+module 33::m {
+fun main() {
+    // should fail
+    (18446744073709551616u128 as u64);
+}
+}
+
+//# run
+module 34::m {
+fun main() {
+    // should fail
+    (18446744073709551647u128 as u64);
+}
+}
+
+//# run
+module 35::m {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u64);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.move
new file mode 100644
index 000000000..2428fb592
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/comparison_operators.move
@@ -0,0 +1,171 @@
+//# run
+module 1::m {
+fun main() {
+    assert!(0u8 == 0u8, 1000);
+    assert!(0u64 == 0u64, 1001);
+    assert!(0u128 == 0u128, 1002);
+    assert!(0u16 == 0u16, 1003);
+    assert!(0u32 == 0u32, 1004);
+    assert!(0u256 == 0u256, 1005);
+
+    assert!(!(0u8 == 1u8), 1100);
+    assert!(!(0u64 == 1u64), 1101);
+    assert!(!(0u128 == 1u128), 1102);
+    assert!(!(0u16 == 1u16), 1103);
+    assert!(!(0u32 == 1u32), 1104);
+    assert!(!(0u256 == 1u256), 1105);
+
+
+    assert!(!(1u8 == 0u8), 1200);
+    assert!(!(1u64 == 0u64), 1201);
+    assert!(!(1u128 == 0u128), 1202);
+    assert!(!(1u16 == 0u16), 1203);
+    assert!(!(1u32 == 0u32), 1204);
+    assert!(!(1u256 == 0u256), 1205);
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    assert!(0u8 != 1u8, 2000);
+    assert!(0u64 != 1u64, 2001);
+    assert!(0u128 != 1u128, 2001);
+
+    assert!(1u8 != 0u8, 2100);
+    assert!(1u64 != 0u64, 2101);
+    assert!(1u128 != 0u128, 2101);
+
+    assert!(!(0u8 != 0u8), 2200);
+    assert!(!(0u64 != 0u64), 2201);
+    assert!(!(0u128 != 0u128), 2201);
+
+    assert!(0u16 != 1u16, 2000);
+    assert!(0u32 != 1u32, 2001);
+    assert!(0u256 != 1u256, 2001);
+
+    assert!(1u16 != 0u16, 2100);
+    assert!(1u32 != 0u32, 2101);
+    assert!(1u256 != 0u256, 2101);
+
+    assert!(!(0u16 != 0u16), 2200);
+    assert!(!(0u32 != 0u32), 2201);
+    assert!(!(0u256 != 0u256), 2201);
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    assert!(0u8 < 1u8, 3000);
+    assert!(0u64 < 1u64, 3001);
+    assert!(0u128 < 1u128, 3002);
+
+    assert!(!(1u8 < 0u8), 3100);
+    assert!(!(1u64 < 0u64), 3101);
+    assert!(!(1u128 < 0u128), 3102);
+
+    assert!(!(0u8 < 0u8), 3200);
+    assert!(!(0u64 < 0u64), 3201);
+    assert!(!(0u128 < 0u128), 3202);
+
+    assert!(0u16 < 1u16, 3000);
+    assert!(0u32 < 1u32, 3001);
+    assert!(0u256 < 1u256, 3002);
+
+    assert!(!(1u16 < 0u16), 3100);
+    assert!(!(1u32 < 0u32), 3101);
+    assert!(!(1u256 < 0u256), 3102);
+
+    assert!(!(0u16 < 0u16), 3200);
+    assert!(!(0u32 < 0u32), 3201);
+    assert!(!(0u256 < 0u256), 3202);
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    assert!(1u8 > 0u8, 4000);
+    assert!(1u64 > 0u64, 4001);
+    assert!(1u128 > 0u128, 4002);
+
+    assert!(!(0u8 > 1u8), 4100);
+    assert!(!(0u64 > 1u64), 4101);
+    assert!(!(0u128 > 1u128), 4102);
+
+    assert!(!(0u8 > 0u8), 4200);
+    assert!(!(0u64 > 0u64), 4201);
+    assert!(!(0u128 > 0u128), 4202);
+
+    assert!(1u16 > 0u16, 4000);
+    assert!(1u32 > 0u32, 4001);
+    assert!(1u256 > 0u256, 4002);
+
+    assert!(!(0u16 > 1u16), 4100);
+    assert!(!(0u32 > 1u32), 4101);
+    assert!(!(0u256 > 1u256), 4102);
+
+    assert!(!(0u16 > 0u16), 4200);
+    assert!(!(0u32 > 0u32), 4201);
+    assert!(!(0u256 > 0u256), 4202);
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    assert!(0u8 <= 1u8, 5000);
+    assert!(0u64 <= 1u64, 5001);
+    assert!(0u128 <= 1u128, 5002);
+
+    assert!(!(1u8 <= 0u8), 5100);
+    assert!(!(1u64 <= 0u64), 5101);
+    assert!(!(1u128 <= 0u128), 5102);
+
+    assert!(0u8 <= 0u8, 5200);
+    assert!(0u64 <= 0u64, 5201);
+    assert!(0u128 <= 0u128, 5202);
+
+    assert!(0u16 <= 1u16, 5000);
+    assert!(0u32 <= 1u32, 5001);
+    assert!(0u256 <= 1u256, 5002);
+
+    assert!(!(1u16 <= 0u16), 5100);
+    assert!(!(1u32 <= 0u32), 5101);
+    assert!(!(1u256 <= 0u256), 5102);
+
+    assert!(0u16 <= 0u16, 5200);
+    assert!(0u32 <= 0u32, 5201);
+    assert!(0u256 <= 0u256, 5202);
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    assert!(1u8 >= 0u8, 6000);
+    assert!(1u64 >= 0u64, 6001);
+    assert!(1u128 >= 0u128, 6002);
+
+    assert!(!(0u8 >= 1u8), 6100);
+    assert!(!(0u64 >= 1u64), 6101);
+    assert!(!(0u128 >= 1u128), 6102);
+
+    assert!(0u8 >= 0u8, 6200);
+    assert!(0u64 >= 0u64, 6201);
+    assert!(0u128 >= 0u128, 6202);
+
+    assert!(1u16 >= 0u16, 6000);
+    assert!(1u32 >= 0u32, 6001);
+    assert!(1u256 >= 0u256, 6002);
+
+    assert!(!(0u16 >= 1u16), 6100);
+    assert!(!(0u32 >= 1u32), 6101);
+    assert!(!(0u256 >= 1u256), 6102);
+
+    assert!(0u16 >= 0u16, 6200);
+    assert!(0u32 >= 0u32, 6201);
+    assert!(0u256 >= 0u256, 6202);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.move
new file mode 100644
index 000000000..5fb1ffbdf
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/precedence.move
@@ -0,0 +1,11 @@
+//# run
+module 0x42::m {
+fun main() {
+  assert!(true || true && false, 99); // "&&" has precedence over "||"
+  assert!(true != false && false != true, 100); // "&&" has precedence over comparisons
+  assert!(1 | 3 ^ 1 == 3, 101); // binary XOR has precedence over OR
+  assert!(2 ^ 3 & 1 == 3, 102); // binary AND has precedence over XOR
+  assert!(3 & 3 + 1 == 0, 103); // addition has precedence over binary AND
+  assert!(1 + 2 * 3 == 7, 104); // multiplication has precedence over addition
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.exp
new file mode 100644
index 000000000..c9fcd5e77
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.exp
@@ -0,0 +1,91 @@
+processed 16 tasks
+
+task 0 'run'. lines 1-8:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 10-16:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 18-24:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 26-32:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x4::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 34-40:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 42-48:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 50-56:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 58-64:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 66-72:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 74-83:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0xa::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.move
new file mode 100644
index 000000000..cc77e580a
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/operators/shift_operators.move
@@ -0,0 +1,208 @@
+//# run
+// Number of bits shifted >= total number of bits in the number.
+module 1::m {
+fun main() {
+    // should fail
+    0u8 << 8u8;
+}
+}
+
+//# run
+module 2::m {
+fun main() {
+    // should fail
+    0u64 << 64u8;
+}
+}
+
+//# run
+module 3::m {
+fun main() {
+    // should fail
+    0u128 << 128u8;
+}
+}
+
+//# run
+module 4::m {
+fun main() {
+    // should fail
+    0u8 >> 8u8;
+}
+}
+
+//# run
+module 5::m {
+fun main() {
+    // should fail
+    0u64 >> 64u8;
+}
+}
+
+//# run
+module 6::m {
+fun main() {
+    // should fail
+    0u128 >> 128u8;
+}
+}
+
+//# run
+module 7::m {
+fun main() {
+    // should fail
+    0u16 << 16u8;
+}
+}
+
+//# run
+module 8::m {
+fun main() {
+    // should fail
+    0u32 << 32u8;
+}
+}
+
+//# run
+module 9::m {
+fun main() {
+    // should fail
+    0u16 >> 16u8;
+}
+}
+
+//# run
+module 10::m {
+fun main() {
+    // should fail
+    0u32 >> 32u8;
+}
+}
+
+
+// Shifting 0 results in 0.
+//# run
+module 11::m {
+fun main() {
+    assert!(0u8 << 4u8 == 0u8, 1000);
+    assert!(0u64 << 1u8 == 0u64, 1001);
+    assert!(0u128 << 127u8 == 0u128, 1002);
+    assert!(0u16 << 15u8 == 0u16, 1003);
+    assert!(0u32 << 4u8 == 0u32, 1004);
+    assert!(0u256 << 255u8 == 0u256, 1005);
+
+    assert!(0u8 >> 4u8 == 0u8, 1100);
+    assert!(0u64 >> 1u8 == 0u64, 1101);
+    assert!(0u128 >> 127u8 == 0u128, 1102);
+    assert!(0u16 >> 15u8 == 0u16, 1103);
+    assert!(0u32 >> 31u8 == 0u32, 1104);
+    assert!(0u256 >> 255u8 == 0u256, 1105);
+}
+}
+
+
+// Shifting by 0 bits results in the same number.
+//# run
+module 12::m {
+fun main() {
+    assert!(100u8 << 0u8 == 100u8, 2000);
+    assert!(43u64 << 0u8 == 43u64, 2001);
+    assert!(57348765484584586725315342563424u128 << 0u8 == 57348765484584586725315342563424u128, 2002);
+    assert!(1000u16 << 0u8 == 1000u16, 2003);
+    assert!(10000u32 << 0u8 == 10000u32, 2004);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 << 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2005);
+
+    assert!(100u8 >> 0u8 == 100u8, 2100);
+    assert!(43u64 >> 0u8 == 43u64, 2101);
+    assert!(1000u16 >> 0u8 == 1000u16, 2103);
+    assert!(10000u32 >> 0u8 == 10000u32, 2104);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 >> 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2105);
+}
+}
+
+
+
+// shl/shr by 1 equivalent to mul/div by 2.
+//# run
+module 0x42::m {
+fun main() {
+    assert!(1u8 << 1u8 == 2u8, 3000);
+    assert!(7u64 << 1u8 == 14u64, 3001);
+    assert!(1000u128 << 1u8 == 2000u128, 3002);
+    assert!(3u16 << 1u8 == 6u16, 3003);
+    assert!(7u32 << 1u8 == 14u32, 3004);
+    assert!(1000u256 << 1u8 == 2000u256, 3005);
+
+    assert!(1u8 >>1u8 == 0u8, 3100);
+    assert!(7u64 >> 1u8 == 3u64, 3101);
+    assert!(1000u128 >> 1u8 == 500u128, 3102);
+    assert!(3u16 >> 1u8 == 1u16, 3103);
+    assert!(7u32 >> 1u8 == 3u32, 3104);
+    assert!(1000u256 >> 1u8 == 500u256, 3105);
+}
+}
+
+
+
+// Underflowing results in 0.
+//# run
+module 13::m {
+fun main() {
+    assert!(1234u64 >> 63u8 == 0u64, 4000);
+    assert!(3u8 >> 5u8 == 0u8, 4001);
+    assert!(43152365326753472145312542634526753u128 >> 127u8 == 0u128, 4002);
+    assert!(1234u16 >> 15u8 == 0u16, 4003);
+    assert!(123456u32 >> 31u8 == 0u32, 4004);
+    assert!(11579208923731619542357098500868790785326998466564056403945758400791312963993u256 >> 255u8 == 0u256, 4005);
+}
+}
+
+
+
+// Overflowing results are truncated.
+//# run
+module 14::m {
+fun main() {
+    assert!(7u8 << 7u8 == 128u8, 5000);
+    assert!(7u64 << 62u8 == 13835058055282163712u64, 5001);
+    assert!(2u128 << 127u8 == 0u128, 5002);
+    assert!(7u16 << 15u8 == 32768u16, 5003);
+    assert!(17u32 << 30u8 == 1073741824u32, 5004);
+    assert!(7u256 << 254u8 == 86844066927987146567678238756515930889952488499230423029593188005934847229952u256, 5005);
+}
+}
+
+
+
+// Some random tests.
+//# run
+module 15::m {
+fun main() {
+    assert!(54u8 << 3u8 == 176u8, 6000);
+    assert!(5u8 << 2u8 == 20u8, 6001);
+    assert!(124u8 << 5u8 == 128u8, 6002);
+
+    assert!(326348456u64 << 13u8 == 2673446551552u64, 6100);
+    assert!(218u64 << 30u8 == 234075717632u64, 6101);
+    assert!(345325745376476456u64 << 47u8 == 2203386117691015168u64, 6102);
+
+    assert!(95712896789423756892376u128 << 4u8 == 1531406348630780110278016u128, 6200);
+    assert!(8629035907847368941279654523567912314u128 << 77u8 == 317056859699765342273530379836650946560u128, 6201);
+    assert!(5742389768935678297185789157531u128 << 10u8 == 5880207123390134576318248097311744u128, 6202);
+    assert!(295429678238907658936718926478967892769u128 << 83u8 == 78660438169199498567214234129963941888u128, 6203);
+
+    assert!(12u16 << 4u8 == 192u16, 6300);
+    assert!(1234u16 << 12u8 == 8192u16, 6301);
+    assert!(6553u16 << 15u8 == 32768u16, 6302);
+
+    assert!(1234567u32 << 12u8 == 761819136u32, 6400);
+    assert!(1234567u32 << 17u8 == 2903375872u32, 6401);
+    assert!(12345671u32 << 27u8 == 939524096u32, 6402);
+
+    assert!(123u256 << 1u8 == 246u256, 6500);
+    assert!(123453u256 << 13u8 == 1011326976u256, 6501);
+    assert!(123453678909u256 << 76u8 == 9327896247469005265829994770202624u256, 6502);
+    assert!(1234536789093546757803u256 << 168u8 == 461895049882996264654333091841553462264195467433049741837793730775482368u256, 6503);
+    assert!(1234536789093546757803786604381691994985672142341299639418u256 << 202u8 == 33658913632735705985908889087832028406806276615240336691180752852867975479296u256, 6504);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.move
new file mode 100644
index 000000000..0aa4da182
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/byte_string.move
@@ -0,0 +1,14 @@
+//# run
+module 0x42::m {
+
+fun main() {
+    assert!(b"" == x"", 0);
+    assert!(b"Diem" == x"4469656D", 1);
+    assert!(b"\x4c\x69\x62\x72\x61" == x"4c69627261", 2);
+    assert!(
+        b"Γ ⊢ λ x. x : ∀α. α → α" ==
+        x"CE9320E28AA220CEBB20782E2078203A20E28880CEB12E20CEB120E2869220CEB1",
+        3
+    );
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.exp
new file mode 100644
index 000000000..c1f87c04a
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.exp
@@ -0,0 +1,4 @@
+processed 2 tasks
+
+task 1 'run'. lines 24-24:
+return values: 42
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.move
new file mode 100644
index 000000000..de4dfb061
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/control_exp_associativity.move
@@ -0,0 +1,24 @@
+//# publish
+module 0x42::M {
+    fun t(): u64 {
+        // 1 + (if (false) 0 else (10 + 10))
+        let x = 1 + if (false) 0 else 10 + 10;
+        assert!(x == 21, 0);
+        // true && (if (false) false else (10 == 10))
+        let x = true && if (false) false else 10 == 10;
+        assert!(x, 0);
+        // (if (false) 0 else 10 ) == 10
+        let x = if (false) 0 else { 10 } == 10;
+        assert!(x, 0);
+        // (if (true) 0 else 10) + 1
+        let x = if (true) 0 else { 10 } + 1;
+        assert!(x == 1, 0);
+        // if (true) 0 else (10 + 1)
+        let x = if (true) 0 else ({ 10 }) + 1;
+        assert!(x == 0, 0);
+        42
+    }
+
+}
+
+//# run 0x42::M::t
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.move
new file mode 100644
index 000000000..88221a128
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/expr_binary_operators.move
@@ -0,0 +1,23 @@
+//# run
+module 0x42::m {
+
+fun main() {
+    assert!(1 == 1, 101);
+    assert!(2 != 3, 102);
+    assert!((3 < 4) && !(3 < 3), 103);
+    assert!((4 > 3) && !(4 > 4), 104);
+    assert!((5 <= 6) && (5 <= 5), 105);
+    assert!((6 >= 5) && (6 >= 6), 106);
+    assert!((true || false) && (false || true), 107);
+    assert!((2 ^ 3) == 1, 108);
+    assert!((1 | 2) == 3, 109);
+    assert!((2 & 3) == 2, 110);
+    assert!((2 << 1) == 4, 111);
+    assert!((8 >> 2) == 2, 112);
+    assert!((1 + 2) == 3, 113);
+    assert!((3 - 2) == 1, 114);
+    assert!((2 * 3) == 6, 115);
+    assert!((9 / 3) == 3, 116);
+    assert!((8 % 3) == 2, 117);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.move
new file mode 100644
index 000000000..bf5060503
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_address.move
@@ -0,0 +1,8 @@
+//# run
+module 0x42::m {
+    fun main() {
+        assert!(@0 == @0x0, 42);
+        assert!(@0xF == @15, 42);
+        assert!(@0x42 == @66, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.move
new file mode 100644
index 000000000..c5efca340
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hex_and_decimal_numbers.move
@@ -0,0 +1,87 @@
+//# run
+module 0x42::m {
+    fun main() {
+        assert!(15u8 == 0xFu8, 42);
+        assert!(15u8 == 0x0Fu8, 42);
+        assert!(255u8 == 0xFFu8, 42);
+        assert!(255u8 == 0x0FFu8, 42);
+
+        assert!(15u16 == 0xFu16, 42);
+        assert!(15u16 == 0x0Fu16, 42);
+        assert!(255u16 == 0xFFu16, 42);
+        assert!(255u16 == 0x0FFu16, 42);
+        assert!(4095u16 == 0xFFFu16, 42);
+        assert!(65535u16 == 0xFFFFu16, 42);
+        assert!(65535u16 == 0x00FFFFu16, 42);
+
+
+        assert!(15u32 == 0xFu32, 42);
+        assert!(15u32 == 0x0Fu32, 42);
+        assert!(255u32 == 0xFFu32, 42);
+        assert!(255u32 == 0x0FFu32, 42);
+        assert!(4095u32 == 0xFFFu32, 42);
+        assert!(65535u32 == 0xFFFFu32, 42);
+        assert!(4294967295u32 == 0xFFFFFFFFu32, 42);
+        assert!(4294967295u32 == 0x00FFFFFFFFu32, 42);
+
+        assert!(15u64 == 0xFu64, 42);
+        assert!(15u64 == 0x0Fu64, 42);
+        assert!(255u64 == 0xFFu64, 42);
+        assert!(255u64 == 0x0FFu64, 42);
+        assert!(18446744073709551615u64 == 0xFFFFFFFFFFFFFFFFu64, 42);
+        assert!(18446744073709551615u64 == 0x0FFFFFFFFFFFFFFFFu64, 42);
+
+        assert!(15u128 == 0xFu128, 42);
+        assert!(15u128 == 0x0Fu128, 42);
+        assert!(255u128 == 0xFFu128, 42);
+        assert!(255u128 == 0x0FFu128, 42);
+        assert!(18446744073709551615u128 == 0xFFFFFFFFFFFFFFFFu128, 42);
+        assert!(18446744073709551615u128 == 0x0FFFFFFFFFFFFFFFFu128, 42);
+        assert!(
+            340282366920938463463374607431768211455u128 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+        assert!(
+            340282366920938463463374607431768211455u128 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+
+        assert!(15u128 == 0xFu128, 42);
+        assert!(15u128 == 0x0Fu128, 42);
+        assert!(255u128 == 0xFFu128, 42);
+        assert!(255u128 == 0x0FFu128, 42);
+        assert!(18446744073709551615u128 == 0xFFFFFFFFFFFFFFFFu128, 42);
+        assert!(18446744073709551615u128 == 0x0FFFFFFFFFFFFFFFFu128, 42);
+        assert!(
+            340282366920938463463374607431768211455u128 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+        assert!(
+            340282366920938463463374607431768211455u128 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+
+        assert!(15u256 == 0xFu256, 42);
+        assert!(15u256 == 0x0Fu256, 42);
+        assert!(255u256 == 0xFFu256, 42);
+        assert!(255u256 == 0x0FFu256, 42);
+        assert!(18446744073709551615u256 == 0xFFFFFFFFFFFFFFFFu256, 42);
+        assert!(18446744073709551615u256 == 0x0FFFFFFFFFFFFFFFFu256, 42);
+        assert!(
+            340282366920938463463374607431768211455u256 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.move
new file mode 100644
index 000000000..97b4e268b
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/hexstring.move
@@ -0,0 +1,13 @@
+//# run
+module 0x42::m {
+use std::vector;
+
+fun main() {
+    let v = x"01020304";
+    let sum: u64 = 0;
+    while (!vector::is_empty(&v)) {
+        sum = sum + (vector::pop_back(&mut v) as u64);
+    };
+    assert!(sum == 10, sum);
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.move
new file mode 100644
index 000000000..dfc3cea66
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/num_literal_underscore.move
@@ -0,0 +1,50 @@
+//# run
+module 0x42::m {
+    fun main() {
+        assert!(15u8 == 1_5u8, 15);
+        assert!(15_u8 == 1_5u8, 15);
+        assert!(1__5u8 == 15___u8, 15);
+        assert!(1__500u16 == 1500___u16, 150);
+        assert!(1__5u32 == 15___u32, 15);
+        assert!(1556u64 == 1_5_56u64, 1556);
+        assert!(1_556u128 == 1_5_56__u128, 1556);
+        assert!(015u8 == 1_5u8, 15);
+        assert!(15_0u8 == 1_50u8, 150);
+        assert!(00_1__5u8 == 15___u8, 15);
+        assert!(00_1__5u256 == 15___u256, 15);
+
+        assert!(15u8 == 1_5, 15);
+        assert!(15_u8 == 1_5, 15);
+        assert!(1__5u8 == 15___, 15);
+        assert!(1556u64 == 1_5_56, 1556);
+        assert!(1_556u128 == 1_5_56__, 1556);
+        assert!(015u8 == 1_5, 15);
+        assert!(15_0u8 == 1_50, 150);
+        assert!(00_1__5u8 == 15___, 15);
+        assert!(00_1__5u16 == 15___, 15);
+        assert!(00_1__5u32 == 15___, 15);
+
+        assert!(0x15u8 == 0x1_5u8, 15);
+        assert!(0x15_u8 == 0x1_5u8, 15);
+        assert!(0x1__5u8 == 0x15___u8, 15);
+        assert!(0x1__50u16 == 0x150___u16, 150);
+        assert!(0x1__5u32 == 0x15___u32, 15);
+        assert!(0x1556u64 == 0x1_5_56u64, 1556);
+        assert!(0x1_556u128 == 0x1_5_56__u128, 1556);
+        assert!(0x015u8 == 0x1_5u8, 15);
+        assert!(0x15_u8 == 0x1_5u8, 150);
+        assert!(0x00_1__5u8 == 0x15___u8, 15);
+        assert!(0x00_1__5u256 == 0x15___u256, 15);
+
+        assert!(0x15u8 == 0x1_5, 15);
+        assert!(0x15_u8 == 0x1_5, 15);
+        assert!(0x1__5u8 == 0x15___, 15);
+        assert!(0x1556u64 == 0x1_5_56, 1556);
+        assert!(0x1_556u128 == 0x1_5_56__, 1556);
+        assert!(0x015u8 == 0x1_5, 15);
+        assert!(0x15_u8 == 0x1_5, 150);
+        assert!(0x00_1__5u8 == 0x15___, 15);
+        assert!(0x00_1__5u16 == 0x15___, 15);
+        assert!(0x00_1__5u32 == 0x15___, 15);
+    }
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.move
new file mode 100644
index 000000000..8d22ea4ae
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/precedence.move
@@ -0,0 +1,12 @@
+//# run
+module 0x42::m {
+
+fun main() {
+    assert!(true || true && false, 99); // "&&" has precedence over "||"
+    assert!(true != false && false != true, 100); // "&&" has precedence over comparisons
+    assert!(1 | 3 ^ 1 == 3, 101); // binary XOR has precedence over OR
+    assert!(2 ^ 3 & 1 == 3, 102); // binary AND has precedence over XOR
+    assert!(3 & 3 + 1 == 0, 103); // addition has precedence over binary AND
+    assert!(1 + 2 * 3 == 7, 104); // multiplication has precedence over addition
+}
+}
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.exp b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.exp
new file mode 100644
index 000000000..7b8e3b69e
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.exp
@@ -0,0 +1,7 @@
+processed 3 tasks
+
+task 1 'run'. lines 18-18:
+return values: 0
+
+task 2 'run'. lines 20-20:
+return values: 0
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.move b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.move
new file mode 100644
index 000000000..0ae400d56
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/parser/return_not_binary.move
@@ -0,0 +1,20 @@
+// Test returning expressions, that if parsed differently, could be binary operators,
+// where the left argument would be the 'return'
+
+//# publish
+module 0x42::M {
+    struct S { f: u64}
+
+    fun t1(u: &u64): u64 {
+        if (true) return * u;
+        0
+    }
+
+    fun t2(s: &S): &u64 {
+        if (true) return & s.f else & s.f
+    }
+}
+
+//# run 0x42::M::t1 --args 0
+
+//# run 0x42::M::t2 --args 0
diff --git a/vendors/move/crates/move-compiler-transactional-tests/tests/tests.rs b/vendors/move/crates/move-compiler-transactional-tests/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/move-compiler-transactional-tests/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/move-compiler/.gitignore b/vendors/move/crates/move-compiler/.gitignore
new file mode 100644
index 000000000..1f57b975c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/.gitignore
@@ -0,0 +1 @@
+/output
diff --git a/vendors/move/crates/move-compiler/Cargo.toml b/vendors/move/crates/move-compiler/Cargo.toml
new file mode 100644
index 000000000..46d1d62aa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "move-compiler"
+version = "0.0.1"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "The definition of the Move source language, and its compiler"
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+anyhow = "1.0.71"
+codespan-reporting.workspace = true
+hex.workspace = true
+regex.workspace = true
+clap.workspace = true
+petgraph.workspace = true
+tempfile.workspace = true
+once_cell.workspace = true
+serde.workspace = true
+
+bcs.workspace = true
+
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-bytecode-verifier.workspace = true
+move-symbol-pool.workspace = true
+move-ir-types.workspace = true
+move-ir-to-bytecode.workspace = true
+move-borrow-graph.workspace = true
+move-bytecode-source-map.workspace = true
+move-command-line-common.workspace = true
+
+[dev-dependencies]
+move-stdlib.workspace = true
+datatest-stable.workspace = true
+
+[[test]]
+name = "move_check_testsuite"
+harness = false
diff --git a/vendors/move/crates/move-compiler/README.md b/vendors/move/crates/move-compiler/README.md
new file mode 100644
index 000000000..60e10fa85
--- /dev/null
+++ b/vendors/move/crates/move-compiler/README.md
@@ -0,0 +1,181 @@
+---
+id: move-compiler
+title: Move Source Language
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-compiler/README.md
+---
+
+# Move Source Language
+
+## Summary
+
+Move source language is an ergonomic language for writing Modules and Scripts that compile to Move bytecode.
+
+## Overview
+
+Move source language is an expression-based language that aims to simplify writing Move programs---modules and scripts---without hiding the core concepts in Move bytecode.
+
+Currently, there are command line tools for Move.
+
+* Move Check is used for checking code, but it does not generate bytecode
+* Move Build is used for checking and then compiling to bytecode
+
+In the future there should be other utilities for testing and play grounding the Move modules.
+
+There is unfortunately no documentation for the language syntax or features. See the stdlib for examples.
+
+## Design Principles
+
+### Mission
+
+Deliver a minimalistic, expressive, safe, and transparent language to produce--and link with--Move bytecode.
+
+### Primary Principles
+
+* **More Concise than Bytecode** Move is expression based, which lends itself to concise and composed programs without the need for extra locals or structure. The Move bytecode is stack based (with the addition of local variables), so a language without stack access would need to be more verbose than the bytecode. In the Move source language, expressions allow for programming directly on the stack in a controlled and safe mode, and in that way, the language gives the same level of functionality as the bytecode but in a more concise and readable environment.
+
+* **Move Bytecode Transparency** The Move source language tries to lift up concepts in the Move bytecode into a source language; it is not trying to hide them. The bytecode already has some strong opinions (much stronger than you might expect to find in a bytecode language), and the source language is trying to keep that programming model and line of thinking. The intention of this principle is to remove the need to write bytecode directly. Additionally, this means full interoperability with functions and types declared in published modules.
+
+* **Stricter than Bytecode** The source language often adds additional levels of restrictions. At an expression level, this means no arbitrary manipulation of the stack (only can do so through expressions), and no dead code or unused effects. At a module level, this could mean additional warnings for unused types or un-invocable functions. At a conceptual/program level, this will also mean adding integration for formal verification.
+
+### Secondary Principles
+
+* **Pathway of Learning** Syntax choices and error messages are intended to give a natural flow of learning. For example, some of the choices around expression syntax could be changed to be more familiar to various other languages, but they would hurt the plug-n-play feeling of the expression based syntax, which might hurt developing a deeper understanding of the Move source language.
+
+* **Aiding Common Community Patterns** As Move becomes more heavily used, common patterns for modules are likely to appear. Move might add new language features to make these patterns easier, clearer, or safer. But, they will not be added if it violates some other key design goal/principle of the language.
+
+* **Semantic Preserving Optimizations** Optimizations are an important developer tool, as they let a programmer write code in a more natural way. However, all of the optimizations performed must be semantic preserving, to prevent any catastrophic exploits or errors from occurring in optimized code. That being said, it is not the primary goal of the Move source language to produce *heavily* optimized code, but it is a nice feature to have.
+
+### Non-Principles
+
+* **Heavy Abstractions** The Move source language does not intend to hide the details of the Move bytecode, this ranges from everything of references to global storage. There might be some abstractions that make interacting with these items easier, but they should always be available in Move at their most basic (bytecode equivalent) level. This does not mean that conveniences currently given by the source language, such as easy field access or implicit freezing, are against the core set of principles, but only that conveniences should not be ambiguous or opaque in how they interact at the bytecode level. Note though, this does not preclude the addition of features to the lanugage, such as access modifiers that translate to compiler-generated dynamic checks. It is just that it is not an active goal of the language to add on heavy abstractions just for the sake of obscuring bytecode design choices.
+
+## Command-line options
+
+The two available programs are Move check and Move build.
+
+* They can be built using `cargo build -p move-compiler`
+* Or run directly with
+  * `cargo run -p move-compiler --bin move-check -- [ARGS]`
+  * `cargo run -p move-compiler --bin move-build -- [ARGS]`
+
+
+Move check is a command line tool for checking Move programs without producing bytecode
+
+```text
+move-check 0.0.1
+Check Move source code, without compiling to bytecode.
+
+USAGE:
+    move-check [OPTIONS] [--] [PATH_TO_SOURCE_FILE]...
+
+FLAGS:
+    -h, --help       Prints help information
+    -V, --version    Prints version information
+
+OPTIONS:
+    -s, --sender <ADDRESS>                           The sender address for modules and scripts
+    -d, --dependency <PATH_TO_DEPENDENCY_FILE>...    The library files needed as dependencies
+
+ARGS:
+    <PATH_TO_SOURCE_FILE>...    The source files to check
+```
+
+Move build is a command line tool for checking Move programs and producing serialized bytecode.
+Dependencies will not be compiled.
+
+```text
+move-build 0.0.1
+Compile Move source to Move bytecode.
+
+USAGE:
+    move-build [FLAGS] [OPTIONS] [--] [PATH_TO_SOURCE_FILE]...
+
+FLAGS:
+    -m, --source-map    Save bytecode source map to disk
+    -h, --help          Prints help information
+    -V, --version       Prints version information
+
+OPTIONS:
+    -s, --sender <ADDRESS>                           The sender address for modules and scripts
+    -d, --dependency <PATH_TO_DEPENDENCY_FILE>...    The library files needed as dependencies
+    -o, --out-dir <PATH_TO_OUTPUT_DIRECTORY>         The Move bytecode output directory [default: build]
+
+ARGS:
+    <PATH_TO_SOURCE_FILE>...    The source files to check and compile
+```
+
+## Folder Structure
+
+```text
+move-compiler                                     # Main crate
+├── src                                       # Source code for Move lang
+│   ├── lib.rs                                # The entry points into compilation
+|   |
+│   ├── parser                                # Parsing the source input into an AST
+│   │   ├── ast.rs                            # The target AST for Parsing
+│   │   ├── mod.rs                            # Module for Parsing step
+│   │   ├── lexer.rs                          # The lexer
+│   │   └── syntax.rs                         # The parser
+|   |
+│   ├── expansion                             # Expands module aliases. Fixes syntax that could not be fully expressed in the grammar (such as assignments and pack)
+│   │   ├── ast.rs                            # The target AST for Expansion
+│   │   ├── mod.rs                            # Module for Expansion step
+│   │   └── translate.rs                      # Parser ~> Expansion
+|   |
+│   ├── naming                                # Resolves names. This includes names in the current module, generics, locals, and builtin types/functions
+│   │   ├── ast.rs                            # The target AST for Naming
+│   │   ├── mod.rs                            # Module for Naming step
+│   │   └── translate.rs                      # Expansion ~> Naming
+|   |
+│   ├── typing                                # Type checks the program. The checking is bidirectional in that it infers types while also checking them
+│   |   ├── ast.rs                            # The target AST for Typing
+│   |   ├── mod.rs                            # Module for Typing step
+│   |   ├── translate.rs                      # Naming ~> Typing
+│   |   ├── core.rs                           # Core type system code. This includes the typing context and rules for types
+│   |   ├── expand.rs                         # After type inference, this expands all of the type variables with the inferred values
+│   |   └── globals.rs                        # After expanding type variables, this checks proper access for resources (checks acquires)
+|   |
+│   ├── hlir                                  # The High Level IR. It changes the AST into a statement based representation as opposed to expression based
+│   │   ├── ast.rs                            # The target AST for statement-ification
+│   │   ├── mod.rs                            # Module for High Level IR step
+│   │   └── translate.rs                      # Typing ~> High Level IR
+|   |
+│   ├── cfgir                                 # The Control Flow Graph IR. It removes the structured control flow and puts the blocks into a CFG. There are then control flow sensitive checks performed
+│   │   ├── ast.rs                            # The target AST for the CFG-ification
+│   │   ├── mod.rs                            # Module for CFG IR step
+│   │   ├── translate.rs                      # High Level IR ~> CFG IR
+│   │   ├── absint.rs                         # Abstract Interpretation library for control flow sensitive checks
+│   │   ├── cfg.rs                            # Defines the CFG itself (where the AST just labels the blocks)
+│   │   ├── locals                            # Checks proper local usage (no use after move, no resources left in locals)
+│   │   │   ├── mod.rs                        # The module for the check. Includes the transfer functions
+│   │   │   └── state.rs                      # The state used for abstract interpretation
+│   │   └── borrows                           # The Borrow Checker. Checks the reference safety properties
+│   │       ├── borrow_map.rs                 # The borrow graph used by the abstract state. Maintains internal relationships about what references are borrowing from where
+│   │       ├── mod.rs                        # The module for the check. Includes the transfer functions
+│   │       └── state.rs                      # The state used for abstract interpretation
+|   |
+│   ├── to_bytecode                           # Compilation to Move bytecode. Is not used by move-check
+│   │   ├── mod.rs                            # Module for the compilation to bytecode
+│   │   ├── translate.rs                      # CFG IR ~> Move bytecode
+│   │   ├── context.rs                        # The context maps between IR construct and bytecode handles/offsets
+│   │   ├── remove_fallthrough_jumps.rs       # The CFG IR blocks always end in a jump; Move bytecode blocks can fall through. This optimizes the usage of fallthroughs (removing unncessary jumps)
+│   │   └── labels_to_offsets.rs              # During bytecode generation, the CFG IR labels are used. This switches the labels to bytecode offsets
+|   |
+│   ├── shared                                # Shared Utilities
+│   │   ├── mod.rs                            # Shared utility code used by all modules (such as source location code)
+│   │   └── unique_map.rs                     # A wrapper around BTreeMap that produces errors on duplicate values
+|   |
+│   ├── errors                                # Errors produced by the various checks
+│   │   └── mod.rs                            # Module for Errors
+|   |
+│   ├── command_line                          # Utilities used by both command line binnaries
+│   |   └── mod.rs                            # Module for Command LIne
+|   |
+│   └── bin                                   # Command line binaries
+│       ├── move-check.rs                     # Defines the move-check command line tool
+│       └── move-build.rs                     # Defines the move-build command line tool
+|
+└── stdlib                                    # Move standard library
+    ├── modules                               # Core modules
+    └── transaction_scripts                   # Core transaction scripts
+```
diff --git a/vendors/move/crates/move-compiler/TODO b/vendors/move/crates/move-compiler/TODO
new file mode 100644
index 000000000..fc8a05e80
--- /dev/null
+++ b/vendors/move/crates/move-compiler/TODO
@@ -0,0 +1,41 @@
+# P0
+
+## Soundness
+
+* SCC generic check
+
+## Cohesion
+
+* Type inference nonsense (overtightened in types from parsing to typing)
+
+# P1
+
+* Function args with `_`
+
+# P2
+
+* suggest copy or *& on inferred duplicate move of affine types
+* Traits on AST/Context
+* Context in separate files
+* location stack tracking
+  if (true) R{} else R{} points to unused resource really weirdly
+* Better messages for unexpected exps in Expansion passes
+* Stop using box::leak and atomicusize, pass around compilation context
+* Address aliases
+* Using all sorts of aliases in error messages
+  * i.e. 0x00000000000000384028920984.M.S becomes Sender.M.S
+
+# P3
+
+* Dead resource/struct decls
+* Dead field decls
+* Unused type params
+* Plurals in errors
+* .. patterns in lvalues for structs
+* move out of owned struct fields
+  * supporting x.f where x: S (i.e. move x.f)
+
+# P4
+
+* improve language character set
+* improve comments
diff --git a/vendors/move/crates/move-compiler/src/bin/move-build.rs b/vendors/move/crates/move-compiler/src/bin/move-build.rs
new file mode 100644
index 000000000..6533775c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/bin/move-build.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::*;
+use move_command_line_common::files::verify_and_create_named_address_mapping;
+use move_compiler::{
+    command_line::{self as cli},
+    shared::{self, Flags, NumericalAddress},
+};
+
+#[derive(Debug, Parser)]
+#[clap(
+    name = "move-build",
+    about = "Compile Move source to Move bytecode",
+    author,
+    version
+)]
+pub struct Options {
+    /// The source files to check and compile
+    #[clap(
+        name = "PATH_TO_SOURCE_FILE",
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub source_files: Vec<String>,
+
+    /// The library files needed as dependencies
+    #[clap(
+        name = "PATH_TO_DEPENDENCY_FILE",
+        short = cli::DEPENDENCY_SHORT,
+        long = cli::DEPENDENCY,
+    )]
+    pub dependencies: Vec<String>,
+
+    /// The Move bytecode output directory
+    #[clap(
+        name = "PATH_TO_OUTPUT_DIRECTORY",
+        short = cli::OUT_DIR_SHORT,
+        long = cli::OUT_DIR,
+        default_value = cli::DEFAULT_OUTPUT_DIR,
+    )]
+    pub out_dir: String,
+
+    /// Save bytecode source map to disk
+    #[clap(
+        name = "",
+        short = cli::SOURCE_MAP_SHORT,
+        long = cli::SOURCE_MAP,
+    )]
+    pub emit_source_map: bool,
+
+    /// Named address mapping
+    #[clap(
+        name = "NAMED_ADDRESSES",
+        short = 'a',
+        long = "addresses",
+        value_parser = shared::parse_named_address,
+    )]
+    pub named_addresses: Vec<(String, NumericalAddress)>,
+
+    #[clap(flatten)]
+    pub flags: Flags,
+}
+
+pub fn main() -> anyhow::Result<()> {
+    let Options {
+        source_files,
+        dependencies,
+        out_dir,
+        emit_source_map,
+        flags,
+        named_addresses,
+    } = Options::parse();
+
+    let interface_files_dir = format!("{}/generated_interface_files", out_dir);
+    let named_addr_map = verify_and_create_named_address_mapping(named_addresses)?;
+    let bytecode_version = flags.bytecode_version();
+    let (files, compiled_units) =
+        move_compiler::Compiler::from_files(source_files, dependencies, named_addr_map)
+            .set_interface_files_dir(interface_files_dir)
+            .set_flags(flags)
+            .build_and_report()?;
+    move_compiler::output_compiled_units(
+        bytecode_version,
+        emit_source_map,
+        files,
+        compiled_units,
+        &out_dir,
+    )
+}
diff --git a/vendors/move/crates/move-compiler/src/bin/move-check.rs b/vendors/move/crates/move-compiler/src/bin/move-check.rs
new file mode 100644
index 000000000..c869e8ae9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/bin/move-check.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::*;
+use move_command_line_common::files::verify_and_create_named_address_mapping;
+use move_compiler::{
+    command_line::{self as cli},
+    shared::{self, Flags, NumericalAddress},
+};
+
+#[derive(Debug, Parser)]
+#[clap(
+    name = "move-check",
+    about = "Check Move source code, without compiling to bytecode",
+    author,
+    version
+)]
+pub struct Options {
+    /// The source files to check
+    #[clap(
+        name = "PATH_TO_SOURCE_FILE",
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub source_files: Vec<String>,
+
+    /// The library files needed as dependencies
+    #[clap(
+        name = "PATH_TO_DEPENDENCY_FILE",
+        short = cli::DEPENDENCY_SHORT,
+        long = cli::DEPENDENCY,
+    )]
+    pub dependencies: Vec<String>,
+
+    /// The output directory for saved artifacts, namely any 'move' interface files generated from
+    /// 'mv' files
+    #[clap(
+        name = "PATH_TO_OUTPUT_DIRECTORY",
+        short = cli::OUT_DIR_SHORT,
+        long = cli::OUT_DIR,
+    )]
+    pub out_dir: Option<String>,
+
+    /// Named address mapping
+    #[clap(
+        name = "NAMED_ADDRESSES",
+        short = 'a',
+        long = "addresses",
+        value_parser = shared::parse_named_address,
+    )]
+    pub named_addresses: Vec<(String, NumericalAddress)>,
+
+    #[clap(flatten)]
+    pub flags: Flags,
+}
+
+pub fn main() -> anyhow::Result<()> {
+    let Options {
+        source_files,
+        dependencies,
+        out_dir,
+        flags,
+        named_addresses,
+    } = Options::parse();
+    let named_addr_map = verify_and_create_named_address_mapping(named_addresses)?;
+    let _files = move_compiler::Compiler::from_files(source_files, dependencies, named_addr_map)
+        .set_interface_files_dir_opt(out_dir)
+        .set_flags(flags)
+        .check_and_report()?;
+    Ok(())
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/absint.rs b/vendors/move/crates/move-compiler/src/cfgir/absint.rs
new file mode 100644
index 000000000..35a8ba405
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/absint.rs
@@ -0,0 +1,165 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::cfg::CFG;
+use crate::{diagnostics::Diagnostics, hlir::ast::*};
+use std::collections::BTreeMap;
+
+/// Trait for finite-height abstract domains. Infinite height domains would require a more complex
+/// trait with widening and a partial order.
+pub trait AbstractDomain: Clone + Sized {
+    fn join(&mut self, other: &Self) -> JoinResult;
+}
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub enum JoinResult {
+    Unchanged,
+    Changed,
+}
+
+#[derive(Clone)]
+enum BlockPostcondition {
+    /// Unprocessed block
+    Unprocessed,
+    /// Analyzing block was successful
+    Success,
+    /// Analyzing block ended in an error
+    Error(Diagnostics),
+}
+
+#[derive(Clone)]
+struct BlockInvariant<State> {
+    /// Precondition of the block
+    pre: State,
+    /// Postcondition of the block---just success/error for now
+    post: BlockPostcondition,
+}
+
+/// A map from block id's to the pre/post of each block after a fixed point is reached.
+type InvariantMap<State> = BTreeMap<Label, BlockInvariant<State>>;
+
+fn collect_states_and_diagnostics<State>(
+    map: InvariantMap<State>,
+) -> (BTreeMap<Label, State>, Diagnostics) {
+    let mut diags = Diagnostics::new();
+    let final_states = map
+        .into_iter()
+        .map(|(lbl, BlockInvariant { pre, post })| {
+            if let BlockPostcondition::Error(ds) = post {
+                diags.extend(ds)
+            }
+            (lbl, pre)
+        })
+        .collect();
+    (final_states, diags)
+}
+
+/// Take a pre-state + instruction and mutate it to produce a post-state
+/// Auxiliary data can be stored in self.
+pub trait TransferFunctions {
+    type State: AbstractDomain;
+
+    /// Execute local@instr found at index local@index in the current basic block from pre-state
+    /// local@pre.
+    /// Should return an AnalysisError if executing the instruction is unsuccessful, and () if
+    /// the effects of successfully executing local@instr have been reflected by mutatating
+    /// local@pre.
+    /// Auxilary data from the analysis that is not part of the abstract state can be collected by
+    /// mutating local@self.
+    /// The last instruction index in the current block is local@last_index. Knowing this
+    /// information allows clients to detect the end of a basic block and special-case appropriately
+    /// (e.g., normalizing the abstract state before a join).
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        lbl: Label,
+        idx: usize,
+        command: &Command,
+    ) -> Diagnostics;
+}
+
+pub trait AbstractInterpreter: TransferFunctions {
+    /// Analyze procedure local@function_view starting from pre-state local@initial_state.
+    fn analyze_function(
+        &mut self,
+        cfg: &dyn CFG,
+        initial_state: Self::State,
+    ) -> (BTreeMap<Label, Self::State>, Diagnostics) {
+        let mut inv_map: InvariantMap<Self::State> = InvariantMap::new();
+        let start = cfg.start_block();
+        let mut next_block = Some(start);
+
+        while let Some(block_label) = next_block {
+            let block_invariant = inv_map
+                .entry(block_label)
+                .or_insert_with(|| BlockInvariant {
+                    pre: initial_state.clone(),
+                    post: BlockPostcondition::Unprocessed,
+                });
+
+            let (post_state, errors) = self.execute_block(cfg, &block_invariant.pre, block_label);
+            block_invariant.post = if errors.is_empty() {
+                BlockPostcondition::Success
+            } else {
+                BlockPostcondition::Error(errors)
+            };
+
+            // propagate postcondition of this block to successor blocks
+            let mut next_block_candidate = cfg.next_block(block_label);
+            for next_block_id in cfg.successors(block_label) {
+                match inv_map.get_mut(next_block_id) {
+                    Some(next_block_invariant) => {
+                        let join_result = {
+                            let old_pre = &mut next_block_invariant.pre;
+                            old_pre.join(&post_state)
+                        };
+                        match join_result {
+                            JoinResult::Unchanged => {
+                                // Pre is the same after join. Reanalyzing this block would produce
+                                // the same post
+                            }
+                            JoinResult::Changed => {
+                                // Pre has changed, the post condition is now unknown for the block
+                                next_block_invariant.post = BlockPostcondition::Unprocessed;
+                                // If the cur->successor is a back edge, jump back to the beginning
+                                // of the loop, instead of the normal next block
+                                if cfg.is_back_edge(block_label, *next_block_id) {
+                                    next_block_candidate = Some(*next_block_id);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    None => {
+                        // Haven't visited the next block yet. Use the post of the current block as
+                        // its pre
+                        inv_map.insert(
+                            *next_block_id,
+                            BlockInvariant {
+                                pre: post_state.clone(),
+                                post: BlockPostcondition::Success,
+                            },
+                        );
+                    }
+                }
+            }
+            next_block = next_block_candidate;
+        }
+        collect_states_and_diagnostics(inv_map)
+    }
+
+    fn execute_block(
+        &mut self,
+        cfg: &dyn CFG,
+        pre_state: &Self::State,
+        block_lbl: Label,
+    ) -> (Self::State, Diagnostics) {
+        let mut state = pre_state.clone();
+        let mut diags = Diagnostics::new();
+        for (idx, cmd) in cfg.commands(block_lbl) {
+            diags.extend(self.execute(&mut state, block_lbl, idx, cmd));
+        }
+        (state, diags)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/ast.rs b/vendors/move/crates/move-compiler/src/cfgir/ast.rs
new file mode 100644
index 000000000..1b71dbeb4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/ast.rs
@@ -0,0 +1,434 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::WarningFilters,
+    expansion::ast::{Attributes, Friend, ModuleIdent},
+    hlir::ast::{
+        BaseType, Command, Command_, FunctionSignature, Label, SingleType, StructDefinition, Var,
+        Visibility,
+    },
+    parser::ast::{ConstantName, FunctionName, StructName, ENTRY_MODIFIER},
+    shared::{ast_debug::*, unique_map::UniqueMap},
+};
+use move_core_types::runtime_value::MoveValue;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, VecDeque};
+
+// HLIR + Unstructured Control Flow + CFG
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    pub modules: UniqueMap<ModuleIdent, ModuleDefinition>,
+    pub scripts: BTreeMap<Symbol, Script>,
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub function_name: FunctionName,
+    pub function: Function,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub is_source_module: bool,
+    /// `dependency_order` is the topological order/rank in the dependency graph.
+    pub dependency_order: usize,
+    pub friends: UniqueMap<ModuleIdent, Friend>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub functions: UniqueMap<FunctionName, Function>,
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub struct Constant {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub signature: BaseType,
+    pub value: Option<MoveValue>,
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub enum FunctionBody_ {
+    Native,
+    Defined {
+        locals: UniqueMap<Var, SingleType>,
+        start: Label,
+        block_info: BTreeMap<Label, BlockInfo>,
+        blocks: BasicBlocks,
+    },
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub struct Function {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub body: FunctionBody,
+}
+
+//**************************************************************************************************
+// Blocks
+//**************************************************************************************************
+
+pub type BasicBlocks = BTreeMap<Label, BasicBlock>;
+
+pub type BasicBlock = VecDeque<Command>;
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum LoopEnd {
+    // If the generated loop end block was not used
+    Unused,
+    // The target of breaks inside the loop
+    Target(Label),
+}
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub struct LoopInfo {
+    pub is_loop_stmt: bool,
+    pub loop_end: LoopEnd,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum BlockInfo {
+    LoopHead(LoopInfo),
+    Other,
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl LoopEnd {
+    pub fn equals(&self, lbl: Label) -> bool {
+        match self {
+            LoopEnd::Unused => false,
+            LoopEnd::Target(t) => *t == lbl,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Label util
+//**************************************************************************************************
+
+pub fn remap_labels(
+    remapping: &BTreeMap<Label, Label>,
+    start: Label,
+    blocks: BasicBlocks,
+) -> (Label, BasicBlocks) {
+    let blocks = blocks
+        .into_iter()
+        .map(|(lbl, mut block)| {
+            remap_labels_block(remapping, &mut block);
+            (remapping[&lbl], block)
+        })
+        .collect();
+    (remapping[&start], blocks)
+}
+
+fn remap_labels_block(remapping: &BTreeMap<Label, Label>, block: &mut BasicBlock) {
+    for cmd in block {
+        remap_labels_cmd(remapping, cmd)
+    }
+}
+
+fn remap_labels_cmd(remapping: &BTreeMap<Label, Label>, sp!(_, cmd_): &mut Command) {
+    use Command_::*;
+    match cmd_ {
+        Break | Continue => panic!("ICE break/continue not translated to jumps"),
+        Mutate(_, _) | Assign(_, _) | IgnoreAndPop { .. } | Abort(_) | Return { .. } => (),
+        Jump { target, .. } => *target = remapping[target],
+        JumpIf {
+            if_true, if_false, ..
+        } => {
+            *if_true = remapping[if_true];
+            *if_false = remapping[if_false];
+        }
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Program { modules, scripts } = self;
+
+        for (m, mdef) in modules.key_cloned_iter() {
+            w.write(&format!("module {}", m));
+            w.block(|w| mdef.ast_debug(w));
+            w.new_line();
+        }
+
+        for (n, s) in scripts {
+            w.write(&format!("script {}", n));
+            w.block(|w| s.ast_debug(w));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            warning_filter,
+            package_name,
+            attributes,
+            loc: _loc,
+            constants,
+            function_name,
+            function,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        (*function_name, function).ast_debug(w);
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            dependency_order,
+            friends,
+            structs,
+            constants,
+            functions,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        if *is_source_module {
+            w.writeln("library module")
+        } else {
+            w.writeln("source module")
+        }
+        w.writeln(&format!("dependency order #{}", dependency_order));
+        for (mident, _loc) in friends.key_cloned_iter() {
+            w.write(&format!("friend {};", mident));
+            w.new_line();
+        }
+        for sdef in structs.key_cloned_iter() {
+            sdef.ast_debug(w);
+            w.new_line();
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        for fdef in functions.key_cloned_iter() {
+            fdef.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for (ConstantName, &Constant) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Constant {
+                warning_filter,
+                index,
+                attributes,
+                loc: _loc,
+                signature,
+                value,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        w.write(&format!("const#{index} {name}:"));
+        signature.ast_debug(w);
+        w.write(" = ");
+        match value {
+            None => w.write("_|_ /* unfoldable */"),
+            Some(v) => v.ast_debug(w),
+        }
+        w.write(";");
+    }
+}
+
+impl AstDebug for MoveValue {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use MoveValue as V;
+        match self {
+            V::U8(u) => w.write(&format!("{}", u)),
+            V::U16(u) => w.write(&format!("{}", u)),
+            V::U32(u) => w.write(&format!("{}", u)),
+            V::U64(u) => w.write(&format!("{}", u)),
+            V::U128(u) => w.write(&format!("{}", u)),
+            V::U256(u) => w.write(&format!("{}", u)),
+            V::Bool(b) => w.write(&format!("{}", b)),
+            V::Address(a) => w.write(&format!("{}", a)),
+            V::Vector(vs) => {
+                w.write("vector[");
+                w.comma(vs, |w, v| v.ast_debug(w));
+                w.write("]");
+            }
+            V::Struct(_) => panic!("ICE struct constants not supported"),
+            V::Signer(_) => panic!("ICE signer constants not supported"),
+        }
+    }
+}
+
+impl AstDebug for (FunctionName, &Function) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Function {
+                warning_filter,
+                index,
+                attributes,
+                visibility,
+                entry,
+                signature,
+                body,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun#{index} {name}"));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined {
+                locals,
+                start,
+                block_info,
+                blocks,
+            } => w.block(|w| {
+                w.write("locals:");
+                w.indent(4, |w| {
+                    w.list(locals, ",", |w, (_, v, st)| {
+                        w.write(&format!("{}: ", v));
+                        st.ast_debug(w);
+                        true
+                    })
+                });
+                w.new_line();
+                w.writeln("block info:");
+                w.indent(4, |w| {
+                    for (lbl, info) in block_info {
+                        w.writeln(&format!("{lbl}: "));
+                        info.ast_debug(w);
+                    }
+                });
+                w.writeln(&format!("start={}", start.0));
+                w.new_line();
+                blocks.ast_debug(w);
+            }),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for BasicBlocks {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.list(self, "", |w, lbl_block| {
+            lbl_block.ast_debug(w);
+            w.new_line();
+            true
+        })
+    }
+}
+
+impl AstDebug for (&Label, &BasicBlock) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("label {}:", (self.0).0));
+        w.indent(4, |w| w.semicolon(self.1, |w, cmd| cmd.ast_debug(w)))
+    }
+}
+
+impl AstDebug for BlockInfo {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            BlockInfo::LoopHead(i) => i.ast_debug(w),
+            BlockInfo::Other => w.write("non-loop head"),
+        }
+    }
+}
+
+impl AstDebug for LoopInfo {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            is_loop_stmt,
+            loop_end,
+        } = self;
+        w.write(&format!(
+            "{{ is_loop_stmt: {}, end: ",
+            if *is_loop_stmt { "true" } else { "false" }
+        ));
+        loop_end.ast_debug(w);
+        w.write(" }}")
+    }
+}
+
+impl AstDebug for LoopEnd {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            LoopEnd::Unused => w.write("unused end"),
+            LoopEnd::Target(lbl) => w.write(&format!("{lbl}")),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/borrows/mod.rs b/vendors/move/crates/move-compiler/src/cfgir/borrows/mod.rs
new file mode 100644
index 000000000..4ff41df9a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/borrows/mod.rs
@@ -0,0 +1,320 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod state;
+
+use super::absint::*;
+use crate::{
+    diag,
+    diagnostics::Diagnostics,
+    hlir::{
+        ast::*,
+        translate::{display_var, DisplayVar},
+    },
+    parser::ast::BinOp_,
+    shared::{unique_map::UniqueMap, CompilationEnv},
+};
+use state::{Value, *};
+use std::{cell::RefCell, collections::BTreeMap, rc::Rc};
+
+//**************************************************************************************************
+// Entry and trait bindings
+//**************************************************************************************************
+
+struct BorrowSafety {
+    local_numbers: UniqueMap<Var, usize>,
+    mutably_used: RefExpInfoMap,
+}
+
+impl BorrowSafety {
+    fn new<T>(local_types: &UniqueMap<Var, T>) -> Self {
+        let mut local_numbers = UniqueMap::new();
+        for (idx, (v, _)) in local_types.key_cloned_iter().enumerate() {
+            local_numbers.add(v, idx).unwrap();
+        }
+        Self {
+            local_numbers,
+            mutably_used: Rc::new(RefCell::new(BTreeMap::new())),
+        }
+    }
+}
+
+struct Context<'a, 'b> {
+    local_numbers: &'a UniqueMap<Var, usize>,
+    borrow_state: &'b mut BorrowState,
+    diags: Diagnostics,
+}
+
+impl<'a, 'b> Context<'a, 'b> {
+    fn new(safety: &'a BorrowSafety, borrow_state: &'b mut BorrowState) -> Self {
+        let local_numbers = &safety.local_numbers;
+        Self {
+            local_numbers,
+            borrow_state,
+            diags: Diagnostics::new(),
+        }
+    }
+
+    fn get_diags(self) -> Diagnostics {
+        self.diags
+    }
+
+    fn add_diags(&mut self, additional: Diagnostics) {
+        self.diags.extend(additional);
+    }
+}
+
+impl TransferFunctions for BorrowSafety {
+    type State = BorrowState;
+
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        lbl: Label,
+        idx: usize,
+        cmd: &Command,
+    ) -> Diagnostics {
+        pre.start_command(lbl, idx);
+        let mut context = Context::new(self, pre);
+        command(&mut context, cmd);
+        context
+            .borrow_state
+            .canonicalize_locals(context.local_numbers);
+        context.get_diags()
+    }
+}
+
+impl AbstractInterpreter for BorrowSafety {}
+
+pub fn verify(
+    compilation_env: &mut CompilationEnv,
+    context: &super::CFGContext,
+    cfg: &super::cfg::MutForwardCFG,
+) -> BTreeMap<Label, BorrowState> {
+    let super::CFGContext {
+        signature, locals, ..
+    } = context;
+    let mut safety = BorrowSafety::new(locals);
+
+    // check for existing errors
+    let has_errors = compilation_env.has_errors();
+    let mut initial_state = BorrowState::initial(locals, safety.mutably_used.clone(), has_errors);
+    initial_state.bind_arguments(&signature.parameters);
+    initial_state.canonicalize_locals(&safety.local_numbers);
+    let (final_state, ds) = safety.analyze_function(cfg, initial_state);
+    compilation_env.add_diags(ds);
+    unused_mut_borrows(compilation_env, context, safety.mutably_used);
+    final_state
+}
+
+fn unused_mut_borrows(
+    compilation_env: &mut CompilationEnv,
+    context: &super::CFGContext,
+    mutably_used: RefExpInfoMap,
+) {
+    const MSG: &str = "Mutable reference is never used mutably, \
+    consider switching to an immutable reference '&' instead";
+
+    for info in RefCell::borrow(&mutably_used).values() {
+        let RefExpInfo {
+            loc,
+            is_mut,
+            used_mutably,
+            param_name,
+        } = info;
+        if *is_mut && !*used_mutably {
+            let diag = if let Some(v) = param_name {
+                if matches!(context.visibility, Visibility::Public(_)) {
+                    // silence the warning for public function parameters
+                    continue;
+                }
+                let param_loc = v.loc();
+                let DisplayVar::Orig(v) = display_var(v.value()) else {
+                    panic!("ICE param {v:?} is a tmp")
+                };
+                let param_msg = format!(
+                    "For parameters, this can be silenced by prefixing \
+                    the name with an underscore, e.g. '_{v}'"
+                );
+                diag!(UnusedItem::MutParam, (*loc, MSG), (param_loc, param_msg))
+            } else {
+                diag!(UnusedItem::MutReference, (*loc, MSG))
+            };
+            compilation_env.add_diag(diag)
+        }
+    }
+}
+
+//**************************************************************************************************
+// Command
+//**************************************************************************************************
+
+fn command(context: &mut Context, sp!(loc, cmd_): &Command) {
+    use Command_ as C;
+    match cmd_ {
+        C::Assign(ls, e) => {
+            let values = exp(context, e);
+            lvalues(context, ls, values);
+        }
+        C::Mutate(el, er) => {
+            let value = assert_single_value(exp(context, er));
+            assert!(!value.is_ref());
+            let lvalue = assert_single_value(exp(context, el));
+            let diags = context.borrow_state.mutate(*loc, lvalue);
+            context.add_diags(diags);
+        }
+        C::JumpIf { cond: e, .. } => {
+            let value = assert_single_value(exp(context, e));
+            assert!(!value.is_ref());
+        }
+        C::IgnoreAndPop { exp: e, .. } => {
+            let values = exp(context, e);
+            context.borrow_state.release_values(values);
+        }
+
+        C::Return { exp: e, .. } => {
+            let values = exp(context, e);
+            let diags = context.borrow_state.return_(*loc, values);
+            context.add_diags(diags);
+        }
+        C::Abort(e) => {
+            let value = assert_single_value(exp(context, e));
+            assert!(!value.is_ref());
+            context.borrow_state.abort()
+        }
+        C::Jump { .. } => (),
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn lvalues(context: &mut Context, ls: &[LValue], values: Values) {
+    ls.iter()
+        .zip(values)
+        .for_each(|(l, value)| lvalue(context, l, value))
+}
+
+fn lvalue(context: &mut Context, sp!(loc, l_): &LValue, value: Value) {
+    use LValue_ as L;
+    match l_ {
+        L::Ignore => {
+            context.borrow_state.release_value(value);
+        }
+        L::Var(v, _) => {
+            let diags = context.borrow_state.assign_local(*loc, v, value);
+            context.add_diags(diags)
+        }
+        L::Unpack(_, _, fields) => {
+            assert!(!value.is_ref());
+            fields
+                .iter()
+                .for_each(|(_, l)| lvalue(context, l, Value::NonRef))
+        }
+    }
+}
+
+fn exp(context: &mut Context, parent_e: &Exp) -> Values {
+    use UnannotatedExp_ as E;
+    let eloc = &parent_e.exp.loc;
+    let svalue = || vec![Value::NonRef];
+    match &parent_e.exp.value {
+        E::Move { var, annotation } => {
+            let last_usage = matches!(annotation, MoveOpAnnotation::InferredLastUsage);
+            let (diags, value) = context.borrow_state.move_local(*eloc, var, last_usage);
+            context.add_diags(diags);
+            vec![value]
+        }
+        E::Copy { var, .. } => {
+            let (diags, value) = context.borrow_state.copy_local(*eloc, var);
+            context.add_diags(diags);
+            vec![value]
+        }
+        E::BorrowLocal(mut_, var) => {
+            let (diags, value) = context.borrow_state.borrow_local(*eloc, *mut_, var);
+            context.add_diags(diags);
+            assert!(value.is_ref());
+            vec![value]
+        }
+        E::Freeze(e) => {
+            let evalue = assert_single_value(exp(context, e));
+            let (diags, value) = context.borrow_state.freeze(*eloc, evalue);
+            context.add_diags(diags);
+            vec![value]
+        }
+        E::Dereference(e) => {
+            let evalue = assert_single_value(exp(context, e));
+            let (errors, value) = context.borrow_state.dereference(*eloc, evalue);
+            context.add_diags(errors);
+            vec![value]
+        }
+        E::Borrow(mut_, e, f, shared_borrow) => {
+            let evalue = assert_single_value(exp(context, e));
+            let (diags, value) =
+                context
+                    .borrow_state
+                    .borrow_field(*eloc, *mut_, evalue, f, *shared_borrow);
+            context.add_diags(diags);
+            vec![value]
+        }
+
+        E::Vector(_, n, _, args) => {
+            let evalues: Values = args.iter().flat_map(|arg| exp(context, arg)).collect();
+            debug_assert_eq!(*n, evalues.len());
+            evalues.into_iter().for_each(|v| assert!(!v.is_ref()));
+            svalue()
+        }
+
+        E::ModuleCall(mcall) => {
+            let evalues: Values = mcall
+                .arguments
+                .iter()
+                .flat_map(|arg| exp(context, arg))
+                .collect();
+            let ret_ty = &parent_e.ty;
+            let (diags, values) = context.borrow_state.call(*eloc, evalues, ret_ty);
+            context.add_diags(diags);
+            values
+        }
+
+        E::Unit { .. } => vec![],
+        E::Value(_) | E::Constant(_) | E::Spec(_, _) | E::UnresolvedError => svalue(),
+
+        E::Cast(e, _) | E::UnaryExp(_, e) => {
+            let v = exp(context, e);
+            assert!(!assert_single_value(v).is_ref());
+            svalue()
+        }
+        E::BinopExp(e1, sp!(_, BinOp_::Eq), e2) | E::BinopExp(e1, sp!(_, BinOp_::Neq), e2) => {
+            let v1 = assert_single_value(exp(context, e1));
+            let v2 = assert_single_value(exp(context, e2));
+            // must check separately incase of using a local with an unassigned value
+            if v1.is_ref() {
+                let (errors, _) = context.borrow_state.dereference(e1.exp.loc, v1);
+                assert!(errors.is_empty(), "ICE eq freezing failed");
+            }
+            if v2.is_ref() {
+                let (errors, _) = context.borrow_state.dereference(e1.exp.loc, v2);
+                assert!(errors.is_empty(), "ICE eq freezing failed");
+            }
+            svalue()
+        }
+        E::BinopExp(e1, _, e2) => {
+            let v1 = assert_single_value(exp(context, e1));
+            let v2 = assert_single_value(exp(context, e2));
+            assert!(!v1.is_ref());
+            assert!(!v2.is_ref());
+            svalue()
+        }
+        E::Pack(_, _, fields) => {
+            fields.iter().for_each(|(_, _, e)| {
+                let arg = exp(context, e);
+                assert!(!assert_single_value(arg).is_ref());
+            });
+            svalue()
+        }
+
+        E::Multiple(es) => es.iter().flat_map(|e| exp(context, e)).collect(),
+
+        E::Unreachable => panic!("ICE should not analyze dead code"),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/borrows/state.rs b/vendors/move/crates/move-compiler/src/cfgir/borrows/state.rs
new file mode 100644
index 000000000..549f4ee54
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/borrows/state.rs
@@ -0,0 +1,1001 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//**************************************************************************************************
+// Abstract state
+//**************************************************************************************************
+
+use crate::{
+    cfgir::absint::*,
+    diag,
+    diagnostics::{
+        codes::{DiagnosticCode, ReferenceSafety},
+        Diagnostic, Diagnostics,
+    },
+    hlir::{
+        ast::{self as H, *},
+        translate::{display_var, DisplayVar},
+    },
+    parser::ast::Field,
+    shared::{unique_map::UniqueMap, *},
+};
+use move_borrow_graph::references::RefID;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet},
+    rc::Rc,
+};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)]
+enum Label {
+    Local(Symbol),
+    Field(Symbol),
+}
+
+type BorrowGraph = move_borrow_graph::graph::BorrowGraph<Loc, Label>;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum Value {
+    NonRef,
+    Ref(RefID),
+}
+pub type Values = Vec<Value>;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub struct ExpBasedID {
+    block: Option<H::Label>,
+    command: usize,
+    count: usize,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct RefExpInfo {
+    pub loc: Loc,
+    pub is_mut: bool,
+    pub used_mutably: bool,
+    pub param_name: Option<Var>,
+}
+
+pub type RefExpInfoMap = Rc<RefCell<BTreeMap<ExpBasedID, RefExpInfo>>>;
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct BorrowState {
+    // metadata fields, needed for gathering warnings
+    mutably_used: RefExpInfoMap,
+    next_eid: ExpBasedID,
+    id_to_exp: BTreeMap<RefID, BTreeSet<ExpBasedID>>,
+
+    // fields necessary to the analysis
+    locals: UniqueMap<Var, Value>,
+    borrows: BorrowGraph,
+    next_id: usize,
+    // true if the previous pass had errors
+    prev_had_errors: bool,
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+pub fn assert_single_value(mut values: Values) -> Value {
+    assert!(values.len() == 1);
+    values.pop().unwrap()
+}
+
+impl Value {
+    pub fn is_ref(&self) -> bool {
+        match self {
+            Value::Ref(_) => true,
+            Value::NonRef => false,
+        }
+    }
+
+    pub fn as_vref(&self) -> Option<RefID> {
+        match self {
+            Value::Ref(id) => Some(*id),
+            Value::NonRef => None,
+        }
+    }
+
+    fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
+        match self {
+            Value::Ref(id) if id_map.contains_key(id) => *id = id_map[id],
+            _ => (),
+        }
+    }
+}
+
+impl BorrowState {
+    pub fn initial<T>(
+        locals: &UniqueMap<Var, T>,
+        mutably_used: RefExpInfoMap,
+        prev_had_errors: bool,
+    ) -> Self {
+        let mut new_state = BorrowState {
+            locals: locals.ref_map(|_, _| Value::NonRef),
+            borrows: BorrowGraph::new(),
+            next_id: locals.len() + 1,
+            prev_had_errors,
+            mutably_used,
+            next_eid: ExpBasedID {
+                block: None,
+                command: 0,
+                count: 0,
+            },
+            id_to_exp: BTreeMap::new(),
+        };
+        new_state.borrows.new_ref(Self::LOCAL_ROOT, true);
+        new_state
+    }
+
+    fn borrow_error<F: Fn() -> String>(
+        borrows: &BorrowGraph,
+        loc: Loc,
+        full_borrows: &BTreeMap<RefID, Loc>,
+        field_borrows: &BTreeMap<Label, BTreeMap<RefID, Loc>>,
+        code: impl DiagnosticCode,
+        msg: F,
+    ) -> Option<Diagnostic> {
+        if full_borrows.is_empty() && field_borrows.is_empty() {
+            return None;
+        }
+
+        let mut_adj = |id| {
+            if borrows.is_mutable(id) {
+                "mutably "
+            } else {
+                ""
+            }
+        };
+        let mut diag = diag!(code, (loc, msg()));
+        for (borrower, rloc) in full_borrows {
+            let adj = mut_adj(*borrower);
+            diag.add_secondary_label((
+                *rloc,
+                format!("It is still being {}borrowed by this reference", adj),
+            ))
+        }
+        for (field_lbl, borrowers) in field_borrows {
+            for (borrower, rloc) in borrowers {
+                let adj = mut_adj(*borrower);
+                let field = match field_lbl {
+                    Label::Field(f) => f,
+                    Label::Local(_) => panic!(
+                        "ICE local should not be field borrows as they only exist from \
+                         the virtual 'root' reference"
+                    ),
+                };
+                diag.add_secondary_label((
+                    *rloc,
+                    format!(
+                        "Field '{}' is still being {}borrowed by this reference",
+                        field, adj
+                    ),
+                ))
+            }
+        }
+        assert!(diag.extra_labels_len() >= 1);
+        Some(diag)
+    }
+
+    const LOCAL_ROOT: RefID = RefID::new(0);
+
+    fn field_label(field: &Field) -> Label {
+        Label::Field(field.value().to_owned())
+    }
+
+    fn local_label(local: &Var) -> Label {
+        Label::Local(local.value().to_owned())
+    }
+
+    //**********************************************************************************************
+    // Metadata API
+    //**********************************************************************************************
+
+    pub fn start_command(&mut self, block: H::Label, command: usize) {
+        self.next_eid = ExpBasedID {
+            block: Some(block),
+            command,
+            count: 0,
+        };
+    }
+
+    fn set_param_name(&mut self, id: RefID, name: Var) {
+        let exps = self.id_to_exp.get(&id).unwrap();
+        assert_eq!(exps.len(), 1);
+        let infos: &mut BTreeMap<ExpBasedID, RefExpInfo> =
+            &mut RefCell::borrow_mut(&self.mutably_used);
+        let info = infos.get_mut(exps.first().unwrap()).unwrap();
+        assert!(info.param_name.is_none());
+        info.param_name = Some(name)
+    }
+
+    fn mark_mutably_used(&mut self, id: RefID) {
+        let Some(exps) = self.id_to_exp.get(&id) else {
+            return;
+        };
+        let infos: &mut BTreeMap<ExpBasedID, RefExpInfo> =
+            &mut RefCell::borrow_mut(&self.mutably_used);
+        for e in exps {
+            let info = infos.get_mut(e).unwrap();
+            info.used_mutably = true;
+        }
+    }
+
+    fn new_exp(&mut self, loc: Loc, is_mut: bool) -> ExpBasedID {
+        let infos: &mut BTreeMap<ExpBasedID, RefExpInfo> =
+            &mut RefCell::borrow_mut(&self.mutably_used);
+        let eid = self.next_eid;
+        infos.entry(eid).or_insert_with(|| RefExpInfo {
+            loc,
+            is_mut,
+            used_mutably: false,
+            param_name: None,
+        });
+        self.next_eid.count += 1;
+        eid
+    }
+
+    //**********************************************************************************************
+    // Core API
+    //**********************************************************************************************
+
+    fn single_type_value(&mut self, loc: Loc, s: &SingleType) -> Value {
+        match &s.value {
+            SingleType_::Base(_) => Value::NonRef,
+            SingleType_::Ref(mut_, _) => Value::Ref(self.declare_new_ref(loc, *mut_)),
+        }
+    }
+
+    fn declare_new_ref(&mut self, loc: Loc, mut_: bool) -> RefID {
+        self.declare_new_ref_impl(loc, mut_, None)
+    }
+
+    fn declare_new_ref_impl(&mut self, loc: Loc, mut_: bool, copy_eid: Option<RefID>) -> RefID {
+        fn new_id(next: &mut usize) -> RefID {
+            *next += 1;
+            RefID::new(*next)
+        }
+
+        let id = new_id(&mut self.next_id);
+        self.borrows.new_ref(id, mut_);
+        let eids = if let Some(parent) = copy_eid {
+            self.id_to_exp.get(&parent).unwrap().clone()
+        } else {
+            BTreeSet::from([self.new_exp(loc, mut_)])
+        };
+        self.id_to_exp.insert(id, eids);
+        id
+    }
+
+    fn add_copy(&mut self, loc: Loc, parent: RefID, child: RefID) {
+        self.borrows.add_strong_borrow(loc, parent, child)
+    }
+
+    fn add_borrow(&mut self, loc: Loc, parent: RefID, child: RefID) {
+        self.borrows.add_weak_borrow(loc, parent, child)
+    }
+
+    fn add_field_borrow(&mut self, loc: Loc, parent: RefID, field: Field, child: RefID) {
+        self.borrows
+            .add_strong_field_borrow(loc, parent, Self::field_label(&field), child)
+    }
+
+    fn add_local_borrow(&mut self, loc: Loc, local: &Var, id: RefID) {
+        self.borrows
+            .add_strong_field_borrow(loc, Self::LOCAL_ROOT, Self::local_label(local), id)
+    }
+
+    fn writable<F: Fn() -> String>(&self, loc: Loc, msg: F, id: RefID) -> Diagnostics {
+        assert!(self.borrows.is_mutable(id), "ICE type checking failed");
+        let (full_borrows, field_borrows) = self.borrows.borrowed_by(id);
+        Self::borrow_error(
+            &self.borrows,
+            loc,
+            &full_borrows,
+            &field_borrows,
+            ReferenceSafety::Dangling,
+            msg,
+        )
+        .into()
+    }
+
+    fn freezable<F: Fn() -> String>(
+        &self,
+        loc: Loc,
+        code: impl DiagnosticCode,
+        msg: F,
+        id: RefID,
+        at_field_opt: Option<&Field>,
+    ) -> Diagnostics {
+        assert!(self.borrows.is_mutable(id), "ICE type checking failed");
+        let (full_borrows, field_borrows) = self.borrows.borrowed_by(id);
+        let mut_filter_set = |s: BTreeMap<RefID, Loc>| {
+            s.into_iter()
+                .filter(|(id, _loc)| self.borrows.is_mutable(*id))
+                .collect::<BTreeMap<_, _>>()
+        };
+        let mut_full_borrows = mut_filter_set(full_borrows);
+        let mut_field_borrows = field_borrows
+            .into_iter()
+            .filter_map(|(f, borrowers)| {
+                match (at_field_opt, &f) {
+                    // Borrow at the same field, so keep
+                    (Some(at_field), Label::Field(f_)) if *f_ == at_field.value() => (),
+                    // Borrow not at the same field, so skip
+                    (Some(_at_field), _) => return None,
+                    // Not freezing at a field, so consider any field borrows
+                    (None, _) => (),
+                }
+                let borrowers = mut_filter_set(borrowers);
+                if borrowers.is_empty() {
+                    None
+                } else {
+                    Some((f, borrowers))
+                }
+            })
+            .collect();
+        Self::borrow_error(
+            &self.borrows,
+            loc,
+            &mut_full_borrows,
+            &mut_field_borrows,
+            code,
+            msg,
+        )
+        .into()
+    }
+
+    fn readable<F: Fn() -> String>(
+        &self,
+        loc: Loc,
+        code: impl DiagnosticCode,
+        msg: F,
+        id: RefID,
+        at_field_opt: Option<&Field>,
+    ) -> Diagnostics {
+        let is_mutable = self.borrows.is_mutable(id);
+        if is_mutable {
+            self.freezable(loc, code, msg, id, at_field_opt)
+        } else {
+            // immutable reference is always readable
+            Diagnostics::new()
+        }
+    }
+
+    fn release(&mut self, ref_id: RefID) {
+        self.id_to_exp.remove(&ref_id);
+        self.borrows.release(ref_id)
+    }
+
+    fn divergent_control_flow(&mut self) {
+        *self = Self::initial(
+            &self.locals,
+            self.mutably_used.clone(),
+            self.prev_had_errors,
+        );
+    }
+
+    fn local_borrowed_by(&self, local: &Var) -> BTreeMap<RefID, Loc> {
+        let (full_borrows, mut field_borrows) = self.borrows.borrowed_by(Self::LOCAL_ROOT);
+        assert!(full_borrows.is_empty());
+        field_borrows
+            .remove(&Self::local_label(local))
+            .unwrap_or_default()
+    }
+
+    // returns empty errors if borrowed_by is empty
+    // Returns errors otherwise
+    fn check_use_borrowed_by(
+        borrows: &BorrowGraph,
+        loc: Loc,
+        local: &Var,
+        full_borrows: &BTreeMap<RefID, Loc>,
+        code: impl DiagnosticCode,
+        verb: &'static str,
+    ) -> Option<Diagnostic> {
+        Self::borrow_error(
+            borrows,
+            loc,
+            full_borrows,
+            &BTreeMap::new(),
+            code,
+            move || {
+                let local_str = match display_var(local.value()) {
+                    DisplayVar::Tmp => panic!("ICE invalid use of tmp local {}", local.value()),
+                    DisplayVar::Orig(s) => s,
+                };
+                format!("Invalid {} of variable '{}'", verb, local_str)
+            },
+        )
+    }
+
+    //**********************************************************************************************
+    // Command Entry Points
+    //**********************************************************************************************
+
+    pub fn bind_arguments(&mut self, parameter_types: &[(Var, SingleType)]) {
+        for (local, ty) in parameter_types.iter() {
+            let value = self.single_type_value(ty.loc, ty);
+            if let Value::Ref(id) = value {
+                self.set_param_name(id, *local);
+                // silence unused mutable reference error for parameters with a leading _
+                if local.starts_with_underscore() {
+                    self.mark_mutably_used(id)
+                }
+            }
+            let diags = self.assign_local(local.loc(), local, value);
+            assert!(diags.is_empty())
+        }
+    }
+
+    pub fn release_values(&mut self, values: Values) {
+        for value in values {
+            self.release_value(value)
+        }
+    }
+
+    pub fn release_value(&mut self, value: Value) {
+        if let Value::Ref(id) = value {
+            self.release(id)
+        }
+    }
+
+    pub fn assign_local(&mut self, loc: Loc, local: &Var, new_value: Value) -> Diagnostics {
+        let old_value = self.locals.remove(local).unwrap();
+        self.locals.add(*local, new_value).unwrap();
+        match old_value {
+            Value::Ref(id) => {
+                self.release(id);
+                Diagnostics::new()
+            }
+            Value::NonRef => {
+                let borrowed_by = self.local_borrowed_by(local);
+                Self::check_use_borrowed_by(
+                    &self.borrows,
+                    loc,
+                    local,
+                    &borrowed_by,
+                    ReferenceSafety::Dangling,
+                    "assignment",
+                )
+                .into()
+            }
+        }
+    }
+
+    pub fn mutate(&mut self, loc: Loc, rvalue: Value) -> Diagnostics {
+        let id = match rvalue {
+            Value::NonRef => {
+                assert!(
+                    self.prev_had_errors,
+                    "ICE borrow checking failed {:#?}",
+                    loc
+                );
+                return Diagnostics::new();
+            }
+            Value::Ref(id) => id,
+        };
+
+        self.mark_mutably_used(id);
+        let diags = self.writable(loc, || "Invalid mutation of reference.".into(), id);
+        self.release(id);
+        diags
+    }
+
+    pub fn return_(&mut self, loc: Loc, rvalues: Values) -> Diagnostics {
+        let mut released = BTreeSet::new();
+        for (_, _local, stored_value) in &self.locals {
+            if let Value::Ref(id) = stored_value {
+                released.insert(*id);
+            }
+        }
+        released.into_iter().for_each(|id| self.release(id));
+
+        // Check locals are not borrowed
+        let mut diags = Diagnostics::new();
+        for (local, stored_value) in self.locals.key_cloned_iter() {
+            if let Value::NonRef = stored_value {
+                let borrowed_by = self.local_borrowed_by(&local);
+                let local_diag = Self::borrow_error(
+                    &self.borrows,
+                    loc,
+                    &borrowed_by,
+                    &BTreeMap::new(),
+                    ReferenceSafety::InvalidReturn,
+                    || {
+                        let case = match display_var(local.value()) {
+                            DisplayVar::Orig(v) => format!("Local variable '{v}'"),
+                            DisplayVar::Tmp => "Local value".to_string(),
+                        };
+                        format!("Invalid return. {case} is still being borrowed.")
+                    },
+                );
+                diags.add_opt(local_diag)
+            }
+        }
+
+        // check any returned reference is not borrowed
+        for rvalue in rvalues {
+            match rvalue {
+                Value::Ref(id) if self.borrows.is_mutable(id) => {
+                    self.mark_mutably_used(id);
+                    let (fulls, fields) = self.borrows.borrowed_by(id);
+                    let msg = || {
+                        "Invalid return of reference. Cannot transfer a mutable reference that is \
+                         being borrowed"
+                            .into()
+                    };
+                    let ds = Self::borrow_error(
+                        &self.borrows,
+                        loc,
+                        &fulls,
+                        &fields,
+                        ReferenceSafety::InvalidTransfer,
+                        msg,
+                    );
+                    diags.add_opt(ds);
+                }
+                _ => (),
+            }
+        }
+
+        self.divergent_control_flow();
+        diags
+    }
+
+    pub fn abort(&mut self) {
+        self.divergent_control_flow()
+    }
+
+    //**********************************************************************************************
+    // Expression Entry Points
+    //**********************************************************************************************
+
+    pub fn move_local(
+        &mut self,
+        loc: Loc,
+        local: &Var,
+        last_usage_inferred: bool,
+    ) -> (Diagnostics, Value) {
+        let old_value = self.locals.remove(local).unwrap();
+        self.locals.add(*local, Value::NonRef).unwrap();
+        match old_value {
+            Value::Ref(id) => (Diagnostics::new(), Value::Ref(id)),
+            Value::NonRef if last_usage_inferred => {
+                let borrowed_by = self.local_borrowed_by(local);
+
+                let mut diag_opt = Self::borrow_error(
+                    &self.borrows,
+                    loc,
+                    &borrowed_by,
+                    &BTreeMap::new(),
+                    ReferenceSafety::AmbiguousVariableUsage,
+                    || {
+                        let vstr = match display_var(local.value()) {
+                            DisplayVar::Tmp => {
+                                panic!("ICE invalid use tmp local {}", local.value())
+                            }
+                            DisplayVar::Orig(s) => s,
+                        };
+                        format!("Ambiguous usage of variable '{}'", vstr)
+                    },
+                );
+                diag_opt.iter_mut().for_each(|diag| {
+                    let vstr = match display_var(local.value()) {
+                        DisplayVar::Tmp => {
+                            panic!("ICE invalid use tmp local {}", local.value())
+                        }
+                        DisplayVar::Orig(s) => s,
+                    };
+                    let tip = format!(
+                        "Try an explicit annotation, e.g. 'move {v}' or 'copy {v}'",
+                        v = vstr
+                    );
+                    const EXPLANATION: &str = "Ambiguous inference of 'move' or 'copy' for a \
+                                               borrowed variable's last usage: A 'move' would \
+                                               invalidate the borrowing reference, but a 'copy' \
+                                               might not be the expected implicit behavior since \
+                                               this the last direct usage of the variable.";
+                    diag.add_secondary_label((loc, tip));
+                    diag.add_note(EXPLANATION);
+                });
+                (diag_opt.into(), Value::NonRef)
+            }
+            Value::NonRef => {
+                let borrowed_by = self.local_borrowed_by(local);
+                let diag_opt = Self::check_use_borrowed_by(
+                    &self.borrows,
+                    loc,
+                    local,
+                    &borrowed_by,
+                    ReferenceSafety::Dangling,
+                    "move",
+                );
+                (diag_opt.into(), Value::NonRef)
+            }
+        }
+    }
+
+    pub fn copy_local(&mut self, loc: Loc, local: &Var) -> (Diagnostics, Value) {
+        match self.locals.get(local).unwrap() {
+            Value::Ref(id) => {
+                let id = *id;
+                let new_id = self.declare_new_ref_impl(loc, self.borrows.is_mutable(id), Some(id));
+                self.add_copy(loc, id, new_id);
+                (Diagnostics::new(), Value::Ref(new_id))
+            }
+            Value::NonRef => {
+                let borrowed_by = self.local_borrowed_by(local);
+                let borrows = &self.borrows;
+                // check that it is 'readable'
+                let mut_borrows = borrowed_by
+                    .into_iter()
+                    .filter(|(id, _loc)| borrows.is_mutable(*id))
+                    .collect();
+                let diags = Self::check_use_borrowed_by(
+                    &self.borrows,
+                    loc,
+                    local,
+                    &mut_borrows,
+                    ReferenceSafety::MutOwns,
+                    "copy",
+                );
+                (diags.into(), Value::NonRef)
+            }
+        }
+    }
+
+    pub fn borrow_local(&mut self, loc: Loc, mut_: bool, local: &Var) -> (Diagnostics, Value) {
+        assert!(
+            !self.locals.get(local).unwrap().is_ref(),
+            "ICE borrow ref {:#?}. Should have been caught in typing",
+            loc
+        );
+        let new_id = self.declare_new_ref(loc, mut_);
+        // fails if there are full/epsilon borrows on the local
+        let borrowed_by = self.local_borrowed_by(local);
+        let diags = if !mut_ {
+            let borrows = &self.borrows;
+            // check that it is 'readable'
+            let mut_borrows = borrowed_by
+                .into_iter()
+                .filter(|(id, _loc)| borrows.is_mutable(*id))
+                .collect();
+            Self::check_use_borrowed_by(
+                borrows,
+                loc,
+                local,
+                &mut_borrows,
+                ReferenceSafety::RefTrans,
+                "borrow",
+            )
+            .into()
+        } else {
+            Diagnostics::new()
+        };
+        self.add_local_borrow(loc, local, new_id);
+        (diags, Value::Ref(new_id))
+    }
+
+    pub fn freeze(&mut self, loc: Loc, rvalue: Value) -> (Diagnostics, Value) {
+        let id = match rvalue {
+            Value::NonRef => {
+                assert!(
+                    self.prev_had_errors,
+                    "ICE borrow checking failed {:#?}",
+                    loc
+                );
+                return (Diagnostics::new(), Value::NonRef);
+            }
+            Value::Ref(id) => id,
+        };
+
+        let diags = self.freezable(
+            loc,
+            ReferenceSafety::MutOwns,
+            || "Invalid freeze.".into(),
+            id,
+            None,
+        );
+        let frozen_id = self.declare_new_ref(loc, false);
+        self.add_copy(loc, id, frozen_id);
+        self.release(id);
+        (diags, Value::Ref(frozen_id))
+    }
+
+    pub fn dereference(&mut self, loc: Loc, rvalue: Value) -> (Diagnostics, Value) {
+        let id = match rvalue {
+            Value::NonRef => {
+                assert!(
+                    self.prev_had_errors,
+                    "ICE borrow checking failed {:#?}",
+                    loc
+                );
+                return (Diagnostics::new(), Value::NonRef);
+            }
+            Value::Ref(id) => id,
+        };
+
+        let diags = self.readable(
+            loc,
+            ReferenceSafety::MutOwns,
+            || "Invalid dereference.".into(),
+            id,
+            None,
+        );
+        self.release(id);
+        (diags, Value::NonRef)
+    }
+
+    pub fn borrow_field(
+        &mut self,
+        loc: Loc,
+        mut_: bool,
+        rvalue: Value,
+        field: &Field,
+        from_unpack: FromUnpack,
+    ) -> (Diagnostics, Value) {
+        let id = match rvalue {
+            Value::NonRef => {
+                assert!(
+                    self.prev_had_errors,
+                    "ICE borrow checking failed {:#?}",
+                    loc
+                );
+                return (Diagnostics::new(), Value::NonRef);
+            }
+            Value::Ref(id) => id,
+        };
+
+        let diags = if mut_ {
+            if from_unpack.is_none() {
+                self.mark_mutably_used(id);
+            }
+            let msg = || format!("Invalid mutable borrow at field '{}'.", field);
+            let (full_borrows, _field_borrows) = self.borrows.borrowed_by(id);
+            // Any field borrows will be factored out
+            Self::borrow_error(
+                &self.borrows,
+                loc,
+                &full_borrows,
+                &BTreeMap::new(),
+                ReferenceSafety::MutOwns,
+                msg,
+            )
+            .into()
+        } else {
+            let msg = || format!("Invalid immutable borrow at field '{}'.", field);
+            self.readable(loc, ReferenceSafety::RefTrans, msg, id, Some(field))
+        };
+        let copy_parent = if from_unpack.is_some() {
+            Some(id)
+        } else {
+            None
+        };
+        let field_borrow_id = self.declare_new_ref_impl(loc, mut_, copy_parent);
+        self.add_field_borrow(loc, id, *field, field_borrow_id);
+        self.release(id);
+        (diags, Value::Ref(field_borrow_id))
+    }
+
+    pub fn call(&mut self, loc: Loc, args: Values, return_ty: &Type) -> (Diagnostics, Values) {
+        let mut diags = Diagnostics::new();
+
+        // Check mutable arguments are not borrowed
+        args.iter()
+            .filter_map(|arg| arg.as_vref().filter(|id| self.borrows.is_mutable(*id)))
+            .for_each(|mut_id| {
+                let (fulls, fields) = self.borrows.borrowed_by(mut_id);
+                let msg = || {
+                    "Invalid usage of reference as function argument. Cannot transfer a mutable \
+                     reference that is being borrowed"
+                        .into()
+                };
+                let ds = Self::borrow_error(
+                    &self.borrows,
+                    loc,
+                    &fulls,
+                    &fields,
+                    ReferenceSafety::InvalidTransfer,
+                    msg,
+                );
+                diags.add_opt(ds);
+            });
+
+        let mut all_parents = BTreeSet::new();
+        let mut mut_parents = BTreeSet::new();
+        for id in args.into_iter().filter_map(|arg| arg.as_vref()) {
+            all_parents.insert(id);
+            if self.borrows.is_mutable(id) {
+                self.mark_mutably_used(id);
+                mut_parents.insert(id);
+            }
+        }
+
+        let values = match &return_ty.value {
+            Type_::Unit => vec![],
+            Type_::Single(s) => vec![self.single_type_value(loc, s)],
+            Type_::Multiple(ss) => ss.iter().map(|s| self.single_type_value(loc, s)).collect(),
+        };
+        for value in &values {
+            if let Value::Ref(id) = value {
+                // mark return values as used mutably, since the caller cannot change the signature
+                // of the called function
+                self.mark_mutably_used(*id);
+                let parents = if self.borrows.is_mutable(*id) {
+                    &mut_parents
+                } else {
+                    &all_parents
+                };
+                parents.iter().for_each(|p| self.add_borrow(loc, *p, *id));
+            }
+        }
+        all_parents.into_iter().for_each(|id| self.release(id));
+
+        (diags, values)
+    }
+
+    //**********************************************************************************************
+    // Abstract State
+    //**********************************************************************************************
+
+    pub fn canonicalize_locals(&mut self, local_numbers: &UniqueMap<Var, usize>) {
+        let mut all_refs = self.borrows.all_refs();
+        let mut id_map = BTreeMap::new();
+        for (_, local_, value) in &self.locals {
+            if let Value::Ref(id) = value {
+                assert!(all_refs.remove(id));
+                id_map.insert(*id, RefID::new(*local_numbers.get_(local_).unwrap() + 1));
+            }
+        }
+        all_refs.remove(&Self::LOCAL_ROOT);
+        assert!(all_refs.is_empty());
+
+        self.locals
+            .iter_mut()
+            .for_each(|(_, _, v)| v.remap_refs(&id_map));
+        self.id_to_exp = std::mem::take(&mut self.id_to_exp)
+            .into_iter()
+            .map(|(id, eids)| (*id_map.get(&id).unwrap(), eids))
+            .collect();
+        self.borrows.remap_refs(&id_map);
+        self.next_id = self.locals.len() + 1;
+    }
+
+    pub fn join_(mut self, mut other: Self) -> Self {
+        let mut released = BTreeSet::new();
+        let mut locals = UniqueMap::new();
+        for (local, self_value) in self.locals.key_cloned_iter() {
+            let joined_value = match (self_value, other.locals.get(&local).unwrap()) {
+                (Value::Ref(id1), Value::Ref(id2)) => {
+                    assert!(id1 == id2);
+                    Value::Ref(*id1)
+                }
+                (Value::NonRef, Value::Ref(released_id))
+                | (Value::Ref(released_id), Value::NonRef) => {
+                    released.insert(*released_id);
+                    Value::NonRef
+                }
+                (Value::NonRef, Value::NonRef) => Value::NonRef,
+            };
+            locals.add(local, joined_value).unwrap();
+        }
+        for released_id in released {
+            if self.borrows.contains_id(released_id) {
+                self.release(released_id);
+            }
+            if other.borrows.contains_id(released_id) {
+                other.release(released_id);
+            }
+        }
+
+        let borrows = self.borrows.join(&other.borrows);
+        let next_id = locals.len() + 1;
+        let prev_had_errors = self.prev_had_errors;
+        let mut id_to_exp = self.id_to_exp;
+        for (id, exps) in other.id_to_exp {
+            id_to_exp.entry(id).or_default().extend(exps);
+        }
+        assert!(next_id == self.next_id);
+        assert!(next_id == other.next_id);
+        assert!(prev_had_errors == other.prev_had_errors);
+
+        Self {
+            locals,
+            borrows,
+            next_id,
+            prev_had_errors,
+            next_eid: self.next_eid,
+            mutably_used: self.mutably_used.clone(),
+            id_to_exp,
+        }
+    }
+
+    fn leq(&self, other: &Self) -> bool {
+        let BorrowState {
+            locals: self_locals,
+            borrows: self_borrows,
+            next_id: self_next,
+            prev_had_errors: self_prev_had_errors,
+            // metadata gathered
+            mutably_used: _,
+            next_eid: _,
+            id_to_exp: self_id_to_exp,
+        } = self;
+        let BorrowState {
+            locals: other_locals,
+            borrows: other_borrows,
+            next_id: other_next,
+            prev_had_errors: other_prev_had_errors,
+            // metadata gathered
+            mutably_used: _,
+            next_eid: _,
+            id_to_exp: other_id_to_exp,
+        } = other;
+        assert!(self_next == other_next, "ICE canonicalization failed");
+        assert!(
+            self_prev_had_errors == other_prev_had_errors,
+            "ICE previous errors flag changed"
+        );
+        self_locals == other_locals
+            && self_borrows.leq(other_borrows)
+            && other_id_to_exp.iter().all(|(id, other_eids)| {
+                self_id_to_exp
+                    .get(id)
+                    .map(|self_eids| other_eids.is_subset(self_eids))
+                    .unwrap_or(false)
+            })
+    }
+}
+
+impl AbstractDomain for BorrowState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let joined = self.clone().join_(other.clone());
+        if !self.leq(&joined) {
+            *self = joined;
+            JoinResult::Changed
+        } else {
+            JoinResult::Unchanged
+        }
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl std::fmt::Display for Label {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Label::Local(s) => write!(f, "local%{}", s),
+            Label::Field(s) => write!(f, "{}", s),
+        }
+    }
+}
+
+impl std::fmt::Display for Value {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Value::NonRef => write!(f, "_"),
+            Value::Ref(id) => write!(f, "{:?}", id),
+        }
+    }
+}
+
+impl BorrowState {
+    #[allow(dead_code)]
+    pub fn display(&self) {
+        println!("NEXT ID: {}", self.next_id);
+        println!("LOCALS:");
+        for (_, var, value) in &self.locals {
+            println!("  {}: {}", var, value)
+        }
+        println!("BORROWS: ");
+        self.borrows.display();
+        println!();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/cfg.rs b/vendors/move/crates/move-compiler/src/cfgir/cfg.rs
new file mode 100644
index 000000000..a0d3ce9c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/cfg.rs
@@ -0,0 +1,836 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::{
+        ast::{BasicBlock, BasicBlocks, BlockInfo, LoopEnd, LoopInfo},
+        remove_no_ops,
+    },
+    diag,
+    diagnostics::Diagnostics,
+    hlir::ast::{Command, Command_, Exp, Label, UnannotatedExp_, UnitCase},
+    shared::ast_debug::*,
+};
+use move_ir_types::location::*;
+use std::{
+    cmp::Reverse,
+    collections::{BTreeMap, BTreeSet, BinaryHeap, VecDeque},
+    fmt::Debug,
+    ops::Deref,
+};
+
+//**************************************************************************************************
+// CFG
+//**************************************************************************************************
+
+pub trait CFG {
+    fn successors(&self, label: Label) -> &BTreeSet<Label>;
+
+    fn predecessors(&self, label: Label) -> &BTreeSet<Label>;
+    fn commands<'a>(&'a self, label: Label) -> Box<dyn Iterator<Item = (usize, &'a Command)> + 'a>;
+    fn num_blocks(&self) -> usize;
+    fn start_block(&self) -> Label;
+
+    fn next_block(&self, label: Label) -> Option<Label>;
+
+    fn is_loop_head(&self, label: Label) -> bool;
+
+    fn is_back_edge(&self, cur: Label, next: Label) -> bool;
+
+    fn debug(&self);
+}
+
+//**************************************************************************************************
+// Forward Traversal CFG
+//**************************************************************************************************
+
+#[derive(Debug)]
+pub struct ForwardCFG<Blocks: Deref<Target = BasicBlocks>> {
+    start: Label,
+    blocks: Blocks,
+    successor_map: BTreeMap<Label, BTreeSet<Label>>,
+    predecessor_map: BTreeMap<Label, BTreeSet<Label>>,
+    traversal_order: Vec<Label>,
+    traversal_successors: BTreeMap<Label, Label>,
+    loop_heads: BTreeMap<Label, BTreeSet<Label>>,
+}
+
+pub type MutForwardCFG<'a> = ForwardCFG<&'a mut BasicBlocks>;
+pub type ImmForwardCFG<'a> = ForwardCFG<&'a BasicBlocks>;
+
+impl<Blocks: Deref<Target = BasicBlocks>> ForwardCFG<Blocks> {
+    /// Recomputes successor/predecessor maps. returns dead blocks
+    fn recompute_impl(&mut self) -> Vec<Label> {
+        let blocks = &self.blocks;
+        let mut seen = BTreeSet::new();
+        let mut work_list = VecDeque::new();
+        seen.insert(self.start);
+        work_list.push_back(self.start);
+
+        // build successor map from reachable code
+        let mut successor_map = BTreeMap::new();
+        while let Some(label) = work_list.pop_front() {
+            let last_cmd = blocks.get(&label).unwrap().back().unwrap();
+            let successors = last_cmd.value.successors();
+            for successor in &successors {
+                if !seen.contains(successor) {
+                    seen.insert(*successor);
+                    work_list.push_back(*successor)
+                }
+            }
+            let old = successor_map.insert(label, successors);
+            assert!(old.is_none());
+        }
+
+        // build inverse map
+        let mut predecessor_map = successor_map
+            .keys()
+            .cloned()
+            .map(|lbl| (lbl, BTreeSet::new()))
+            .collect::<BTreeMap<_, _>>();
+        for (parent, children) in &successor_map {
+            for child in children {
+                predecessor_map.get_mut(child).unwrap().insert(*parent);
+            }
+        }
+        self.successor_map = successor_map;
+        self.predecessor_map = predecessor_map;
+
+        let (mut post_order, back_edges) = post_order_traversal(
+            self.start,
+            blocks.keys().copied(),
+            &self.successor_map,
+            /* include_dead_code */ false,
+        );
+
+        self.traversal_order = {
+            post_order.reverse();
+            post_order
+        };
+        assert_eq!(self.traversal_order[0], self.start);
+        // build a mapping from a block id to the next block id in the traversal order
+        self.traversal_successors = self
+            .traversal_order
+            .windows(2)
+            .map(|window| {
+                debug_assert!(window.len() == 2);
+                (window[0], window[1])
+            })
+            .collect();
+        self.loop_heads = BTreeMap::new();
+        for (id, loop_head) in back_edges {
+            debug_assert!(id.0 >= loop_head.0);
+            self.loop_heads.entry(loop_head).or_default().insert(id);
+        }
+
+        // determine dead blocks
+        let mut dead_block_labels = vec![];
+        for label in self.blocks.keys() {
+            if !self.successor_map.contains_key(label) {
+                assert!(!self.predecessor_map.contains_key(label));
+                assert!(!self.traversal_successors.contains_key(label));
+                dead_block_labels.push(*label);
+            }
+        }
+
+        dead_block_labels
+    }
+
+    pub fn blocks(&self) -> &BasicBlocks {
+        self.blocks.deref()
+    }
+
+    pub fn block(&self, label: Label) -> &BasicBlock {
+        self.blocks.deref().get(&label).unwrap()
+    }
+
+    pub fn display_blocks(&self) {
+        for (lbl, block) in self.blocks() {
+            println!("--BLOCK {}--", lbl);
+            for cmd in block {
+                println!("{:#?}", cmd.value);
+            }
+            println!();
+        }
+    }
+}
+
+impl<'a> MutForwardCFG<'a> {
+    // Returns
+    // - A CFG
+    // - A set of infinite loop heads
+    // - and any errors resulting from building the CFG
+    pub fn new<'info>(
+        start: Label,
+        blocks: &'a mut BasicBlocks,
+        block_info: impl IntoIterator<Item = (&'info Label, &'info BlockInfo)>,
+    ) -> (Self, BTreeSet<Label>, Diagnostics) {
+        let mut cfg = ForwardCFG {
+            start,
+            blocks,
+            successor_map: BTreeMap::new(),
+            predecessor_map: BTreeMap::new(),
+            traversal_order: vec![],
+            traversal_successors: BTreeMap::new(),
+            loop_heads: BTreeMap::new(),
+        };
+        remove_no_ops::optimize(&mut cfg);
+
+        // no dead code
+        let dead_code = cfg.recompute();
+        let mut diags = Diagnostics::new();
+        for (_lbl, block) in dead_code {
+            dead_code_error(&mut diags, &block)
+        }
+
+        let infinite_loop_starts = determine_infinite_loop_starts(&cfg, block_info);
+        (cfg, infinite_loop_starts, diags)
+    }
+
+    /// Recomputes successor/predecessor maps. returns removed dead blocks
+    pub fn recompute(&mut self) -> BasicBlocks {
+        let dead_code_labels = self.recompute_impl();
+        dead_code_labels
+            .into_iter()
+            .map(|lbl| (lbl, self.blocks.remove(&lbl).unwrap()))
+            .collect()
+    }
+
+    pub fn block_mut(&mut self, label: Label) -> &mut BasicBlock {
+        self.blocks.get_mut(&label).unwrap()
+    }
+
+    pub fn blocks_mut(&mut self) -> &mut BasicBlocks {
+        self.blocks
+    }
+}
+
+impl<'a> ImmForwardCFG<'a> {
+    /// Returns
+    /// - A CFG
+    /// - A set of infinite loop heads
+    /// This _must_ be called after `BlockMutCFG::new`, as the mutable version optimizes the code
+    /// This will be done for external usage,
+    /// since the Mut CFG is used during the building of the cfgir::ast::Program
+    pub fn new<'info>(
+        start: Label,
+        blocks: &'a BasicBlocks,
+        block_info: impl IntoIterator<Item = (&'info Label, &'info BlockInfo)>,
+    ) -> (Self, BTreeSet<Label>) {
+        let mut cfg = ForwardCFG {
+            start,
+            blocks,
+            successor_map: BTreeMap::new(),
+            predecessor_map: BTreeMap::new(),
+            traversal_order: vec![],
+            traversal_successors: BTreeMap::new(),
+            loop_heads: BTreeMap::new(),
+        };
+        cfg.recompute_impl();
+
+        let infinite_loop_starts = determine_infinite_loop_starts(&cfg, block_info);
+        (cfg, infinite_loop_starts)
+    }
+}
+
+impl<T: Deref<Target = BasicBlocks>> CFG for ForwardCFG<T> {
+    fn successors(&self, label: Label) -> &BTreeSet<Label> {
+        self.successor_map.get(&label).unwrap()
+    }
+
+    fn predecessors(&self, label: Label) -> &BTreeSet<Label> {
+        self.predecessor_map.get(&label).unwrap()
+    }
+
+    fn commands<'s>(&'s self, label: Label) -> Box<dyn Iterator<Item = (usize, &'s Command)> + 's> {
+        Box::new(self.block(label).iter().enumerate())
+    }
+
+    fn num_blocks(&self) -> usize {
+        self.blocks.len()
+    }
+
+    fn start_block(&self) -> Label {
+        self.start
+    }
+
+    fn next_block(&self, label: Label) -> Option<Label> {
+        self.traversal_successors.get(&label).copied()
+    }
+
+    fn is_loop_head(&self, label: Label) -> bool {
+        self.loop_heads.contains_key(&label)
+    }
+
+    fn is_back_edge(&self, cur: Label, next: Label) -> bool {
+        self.loop_heads
+            .get(&next)
+            .map_or(false, |back_edge_predecessors| {
+                back_edge_predecessors.contains(&cur)
+            })
+    }
+
+    fn debug(&self) {
+        self.print();
+    }
+}
+
+const DEAD_ERR_CMD: &str =
+    "Unreachable code. This statement (and any following statements) will not be executed.";
+
+const DEAD_ERR_EXP: &str = "Invalid use of a divergent expression. The code following the \
+                            evaluation of this expression will be dead and should be removed.";
+
+fn dead_code_error(diags: &mut Diagnostics, block: &BasicBlock) {
+    let first_command = block.front().unwrap();
+    match unreachable_loc(first_command) {
+        Some(loc) => diags.add(diag!(UnusedItem::DeadCode, (loc, DEAD_ERR_EXP))),
+        None if is_implicit_control_flow(block) => (),
+        None => diags.add(diag!(
+            UnusedItem::DeadCode,
+            (first_command.loc, DEAD_ERR_CMD)
+        )),
+    }
+}
+
+fn unreachable_loc(sp!(_, cmd_): &Command) -> Option<Loc> {
+    use Command_ as C;
+    match cmd_ {
+        C::Assign(_, e) => unreachable_loc_exp(e),
+        C::Mutate(el, er) => unreachable_loc_exp(el).or_else(|| unreachable_loc_exp(er)),
+        C::Return { exp: e, .. }
+        | C::Abort(e)
+        | C::IgnoreAndPop { exp: e, .. }
+        | C::JumpIf { cond: e, .. } => unreachable_loc_exp(e),
+        C::Jump { .. } => None,
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn unreachable_loc_exp(parent_e: &Exp) -> Option<Loc> {
+    use UnannotatedExp_ as E;
+    match &parent_e.exp.value {
+        E::Unreachable => Some(parent_e.exp.loc),
+        E::Unit { .. }
+        | E::Value(_)
+        | E::Constant(_)
+        | E::Spec(_, _)
+        | E::UnresolvedError
+        | E::BorrowLocal(_, _)
+        | E::Copy { .. }
+        | E::Move { .. } => None,
+        E::ModuleCall(mcall) => mcall.arguments.iter().find_map(unreachable_loc_exp),
+        E::Vector(_, _, _, args) => args.iter().find_map(unreachable_loc_exp),
+        E::Freeze(e)
+        | E::Dereference(e)
+        | E::UnaryExp(_, e)
+        | E::Borrow(_, e, _, _)
+        | E::Cast(e, _) => unreachable_loc_exp(e),
+
+        E::BinopExp(e1, _, e2) => unreachable_loc_exp(e1).or_else(|| unreachable_loc_exp(e2)),
+
+        E::Pack(_, _, fields) => fields.iter().find_map(|(_, _, e)| unreachable_loc_exp(e)),
+
+        E::Multiple(es) => es.iter().find_map(unreachable_loc_exp),
+    }
+}
+
+fn is_implicit_control_flow(block: &BasicBlock) -> bool {
+    use Command_ as C;
+    use UnannotatedExp_ as E;
+    block.len() == 1
+        && match &block.front().unwrap().value {
+            C::Jump { from_user, .. } => !*from_user,
+            C::Return { exp: e, from_user } if !*from_user => matches!(
+                &e.exp.value,
+                E::Unit {
+                    case: UnitCase::Implicit
+                }
+            ),
+            _ => false,
+        }
+}
+
+// Relying on the ordered block info (ordered in the linear ordering of the source code)
+// Determines the infinite loop starts
+// This cannot be determined in earlier passes due to dead code
+fn determine_infinite_loop_starts<'a, T: Deref<Target = BasicBlocks>>(
+    cfg: &ForwardCFG<T>,
+    block_info: impl IntoIterator<Item = (&'a Label, &'a BlockInfo)>,
+) -> BTreeSet<Label> {
+    // Filter dead code
+    let block_info = block_info
+        .into_iter()
+        .filter(|(lbl, _info)| cfg.blocks().contains_key(lbl))
+        .collect::<Vec<_>>();
+
+    // Fully populate infinite loop starts to be pruned later
+    // And for any block, determine the current loop
+    let mut infinite_loop_starts = BTreeSet::new();
+
+    let mut loop_stack: Vec<(Label, LoopEnd)> = vec![];
+    let mut current_loop_info = Vec::with_capacity(block_info.len());
+    for (lbl, info) in &block_info {
+        match loop_stack.last() {
+            Some((_, cur_loop_end)) if cur_loop_end.equals(**lbl) => {
+                loop_stack.pop();
+            }
+            _ => (),
+        }
+
+        match info {
+            BlockInfo::Other => (),
+            BlockInfo::LoopHead(LoopInfo { is_loop_stmt, .. }) if !*is_loop_stmt => (),
+            BlockInfo::LoopHead(LoopInfo { loop_end, .. }) => {
+                infinite_loop_starts.insert(**lbl);
+                loop_stack.push((**lbl, *loop_end))
+            }
+        }
+
+        current_loop_info.push(loop_stack.last().cloned());
+    }
+
+    // Given the loop info for any block, determine which loops are infinite
+    // Each 'loop' based loop starts in the set, and is removed if it's break is used, or if a
+    // return or abort is used
+    let mut prev_opt: Option<Label> = None;
+    let zipped =
+        block_info
+            .into_iter()
+            .zip(current_loop_info)
+            .filter_map(|(block_info, cur_loop_opt)| {
+                cur_loop_opt.map(|cur_loop| (block_info, cur_loop))
+            });
+    for ((lbl, _info), (cur_loop_start, cur_loop_end)) in zipped {
+        debug_assert!(prev_opt.map(|prev| prev.0 < lbl.0).unwrap_or(true));
+        maybe_unmark_infinite_loop_starts(
+            &mut infinite_loop_starts,
+            cur_loop_start,
+            cur_loop_end,
+            &cfg.blocks()[lbl],
+        );
+        prev_opt = Some(*lbl);
+    }
+
+    infinite_loop_starts
+}
+
+fn maybe_unmark_infinite_loop_starts(
+    infinite_loop_starts: &mut BTreeSet<Label>,
+    cur_loop_start: Label,
+    cur_loop_end: LoopEnd,
+    block: &BasicBlock,
+) {
+    use Command_ as C;
+    // jumps/return/abort are only found at the end of the block
+    match &block.back().unwrap().value {
+        C::Jump { target, .. } if cur_loop_end.equals(*target) => {
+            infinite_loop_starts.remove(&cur_loop_start);
+        }
+        C::JumpIf {
+            if_true, if_false, ..
+        } if cur_loop_end.equals(*if_true) || cur_loop_end.equals(*if_false) => {
+            infinite_loop_starts.remove(&cur_loop_start);
+        }
+        C::Return { .. } | C::Abort(_) => {
+            infinite_loop_starts.remove(&cur_loop_start);
+        }
+
+        C::Jump { .. }
+        | C::JumpIf { .. }
+        | C::Assign(_, _)
+        | C::Mutate(_, _)
+        | C::IgnoreAndPop { .. } => (),
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn post_order_traversal(
+    start: Label,
+    all_labels: impl IntoIterator<Item = Label>,
+    successor_map: &BTreeMap<Label, BTreeSet<Label>>,
+    include_dead_code: bool,
+) -> (
+    /* order */ Vec<Label>,
+    /* back edges */ Vec<(Label, Label)>,
+) {
+    fn is_back_edge(cur: Label, target: Label) -> bool {
+        target.0 <= cur.0
+    }
+    // Determine traversal order
+    // build a DAG subgraph (remove the loop back edges)
+    let dag: BTreeMap<Label, BTreeSet<Label>> = successor_map
+        .iter()
+        .map(|(node, successors)| {
+            let node = *node;
+            let non_loop_continue_successors = successors
+                .iter()
+                // remove the loop back edges
+                .filter(|successor| !is_back_edge(node, **successor))
+                .copied()
+                .collect();
+            (node, non_loop_continue_successors)
+        })
+        .collect();
+
+    // build the post-order traversal
+    let mut post_order = Vec::with_capacity(dag.len());
+    let mut finished = BTreeSet::new();
+    let mut stack = vec![(start, /* is_first_visit */ true)];
+    let mut remaining = all_labels
+        .into_iter()
+        .map(Reverse)
+        .collect::<BinaryHeap<_>>();
+    while let Some((cur, is_first_visit)) = stack.pop() {
+        if is_first_visit {
+            stack.push((cur, false));
+            stack.extend(
+                dag[&cur]
+                    .iter()
+                    .filter(|successor| !finished.contains(*successor))
+                    .map(|successor| (*successor, /* is_first_visit */ true)),
+            );
+        } else {
+            debug_assert!(dag[&cur]
+                .iter()
+                .all(|successor| finished.contains(successor)));
+            if finished.insert(cur) {
+                post_order.push(cur)
+            }
+        }
+        if include_dead_code {
+            // if dead code needs to be visited...
+            if stack.is_empty() {
+                // find the minimum label that has not been visited
+                let next_opt = loop {
+                    match remaining.pop() {
+                        Some(next) if finished.contains(&next.0) => continue,
+                        next_opt => break next_opt.map(|rev| rev.0),
+                    }
+                };
+                // add that min label to the stack and continue
+                if let Some(next) = next_opt {
+                    debug_assert!(!finished.contains(&next));
+                    stack.push((next, true))
+                }
+            }
+        }
+    }
+
+    // Determine loop back edges
+    let mut back_edges: Vec<(Label, Label)> = vec![];
+    for (node, successors) in successor_map {
+        let node = *node;
+        let loop_continues = successors
+            .iter()
+            .filter(|successor| is_back_edge(node, **successor))
+            .copied();
+        for successor in loop_continues {
+            back_edges.push((node, successor));
+        }
+    }
+
+    (post_order, back_edges)
+}
+
+//**************************************************************************************************
+// Reverse Traversal CFG
+//**************************************************************************************************
+
+#[derive(Debug)]
+pub struct ReverseCFG<'forward, Blocks: Deref<Target = BasicBlocks>> {
+    terminal: Label,
+    terminal_block: BasicBlock,
+    blocks: &'forward mut Blocks,
+    successor_map: &'forward mut BTreeMap<Label, BTreeSet<Label>>,
+    predecessor_map: &'forward mut BTreeMap<Label, BTreeSet<Label>>,
+    traversal_order: Vec<Label>,
+    traversal_successors: BTreeMap<Label, Label>,
+    loop_heads: BTreeMap<Label, BTreeSet<Label>>,
+}
+
+pub type MutReverseCFG<'forward, 'blocks> = ReverseCFG<'forward, &'blocks mut BasicBlocks>;
+pub type ImmReverseCFG<'forward, 'blocks> = ReverseCFG<'forward, &'blocks BasicBlocks>;
+
+impl<'forward, Blocks: Deref<Target = BasicBlocks>> ReverseCFG<'forward, Blocks> {
+    pub fn new(
+        forward_cfg: &'forward mut ForwardCFG<Blocks>,
+        infinite_loop_starts: &BTreeSet<Label>,
+    ) -> Self
+    where
+        Blocks: Debug,
+    {
+        let blocks = &mut forward_cfg.blocks;
+        let forward_successors = &mut forward_cfg.successor_map;
+        let forward_predecessor = &mut forward_cfg.predecessor_map;
+        let end_blocks = {
+            let mut end_blocks = BTreeSet::new();
+            for (lbl, successors) in forward_successors.iter() {
+                let loop_start_successors = successors
+                    .iter()
+                    .filter(|l| infinite_loop_starts.contains(l));
+                for loop_start_successor in loop_start_successors {
+                    if lbl >= loop_start_successor {
+                        end_blocks.insert(*lbl);
+                    }
+                }
+            }
+            for (lbl, block) in blocks.iter() {
+                let last_cmd = block.back().unwrap();
+                if last_cmd.value.is_exit() {
+                    end_blocks.insert(*lbl);
+                }
+            }
+            end_blocks
+        };
+
+        // setup fake terminal block that will act as the start node in reverse traversal
+        let terminal = Label(blocks.keys().map(|lbl| lbl.0).max().unwrap_or(0) + 1);
+        assert!(!blocks.contains_key(&terminal), "{:#?}", blocks);
+        for terminal_predecessor in &end_blocks {
+            forward_successors
+                .entry(*terminal_predecessor)
+                .or_default()
+                .insert(terminal);
+        }
+        forward_predecessor.insert(terminal, end_blocks);
+        // ensure map is not partial
+        forward_successors.insert(terminal, BTreeSet::new());
+
+        let (post_order, back_edges) = post_order_traversal(
+            forward_cfg.start,
+            blocks.keys().copied().chain(std::iter::once(terminal)),
+            forward_successors,
+            /* include_dead_code */ false,
+        );
+        let successor_map = forward_predecessor;
+        let predecessor_map = forward_successors;
+        let traversal_order = post_order;
+        let traversal_successors = traversal_order
+            .windows(2)
+            .map(|window| {
+                debug_assert!(window.len() == 2);
+                (window[0], window[1])
+            })
+            .collect();
+        let mut loop_heads: BTreeMap<Label, BTreeSet<Label>> = BTreeMap::new();
+        for (id, forward_loop_head) in back_edges {
+            debug_assert!(id.0 >= forward_loop_head.0);
+            loop_heads.entry(id).or_default().insert(forward_loop_head);
+        }
+        let res = Self {
+            terminal,
+            terminal_block: BasicBlock::new(),
+            blocks,
+            successor_map,
+            predecessor_map,
+            traversal_order,
+            traversal_successors,
+            loop_heads,
+        };
+        for l in res.blocks.keys() {
+            if l != &forward_cfg.start && !res.traversal_successors.contains_key(l) {
+                res.debug();
+                panic!("ICE {} not in traversal", l);
+            }
+        }
+        res
+    }
+
+    pub fn blocks(&self) -> impl Iterator<Item = (&Label, &BasicBlock)> {
+        self.blocks
+            .iter()
+            .chain(std::iter::once((&self.terminal, &self.terminal_block)))
+    }
+
+    pub fn block(&self, label: Label) -> &BasicBlock {
+        if label == self.terminal {
+            &self.terminal_block
+        } else {
+            self.blocks.get(&label).unwrap()
+        }
+    }
+}
+
+impl<'forward, 'blocks> MutReverseCFG<'forward, 'blocks> {
+    pub fn block_mut(&mut self, label: Label) -> &mut BasicBlock {
+        if label == self.terminal {
+            &mut self.terminal_block
+        } else {
+            self.blocks.get_mut(&label).unwrap()
+        }
+    }
+
+    pub fn blocks_mut(&mut self) -> impl Iterator<Item = (&Label, &mut BasicBlock)> {
+        self.blocks
+            .iter_mut()
+            .chain(std::iter::once((&self.terminal, &mut self.terminal_block)))
+    }
+}
+
+impl<'forward, Blocks: Deref<Target = BasicBlocks>> Drop for ReverseCFG<'forward, Blocks> {
+    fn drop(&mut self) {
+        assert!(self.terminal_block.is_empty());
+        let start_predecessors = self.predecessor_map.remove(&self.terminal);
+        assert!(
+            start_predecessors.is_some(),
+            "ICE missing start node from predecessors"
+        );
+        let start_successors = self.successor_map.remove(&self.terminal).unwrap();
+        for start_successor in start_successors {
+            self.predecessor_map
+                .get_mut(&start_successor)
+                .unwrap()
+                .remove(&self.terminal);
+        }
+    }
+}
+
+impl<'forward, Blocks: Deref<Target = BasicBlocks>> CFG for ReverseCFG<'forward, Blocks> {
+    fn successors(&self, label: Label) -> &BTreeSet<Label> {
+        self.successor_map.get(&label).unwrap()
+    }
+
+    fn predecessors(&self, label: Label) -> &BTreeSet<Label> {
+        self.predecessor_map.get(&label).unwrap()
+    }
+
+    fn commands<'s>(&'s self, label: Label) -> Box<dyn Iterator<Item = (usize, &'s Command)> + 's> {
+        Box::new(self.block(label).iter().enumerate().rev())
+    }
+
+    fn num_blocks(&self) -> usize {
+        // + 1 for the terminal
+        self.blocks.len() + 1
+    }
+
+    fn start_block(&self) -> Label {
+        self.traversal_order[0]
+    }
+
+    fn next_block(&self, label: Label) -> Option<Label> {
+        self.traversal_successors.get(&label).copied()
+    }
+
+    fn is_loop_head(&self, label: Label) -> bool {
+        self.loop_heads.contains_key(&label)
+    }
+
+    fn is_back_edge(&self, cur: Label, next: Label) -> bool {
+        self.loop_heads
+            .get(&next)
+            .map_or(false, |back_edge_predecessors| {
+                back_edge_predecessors.contains(&cur)
+            })
+    }
+
+    fn debug(&self) {
+        self.print();
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl<T: Deref<Target = BasicBlocks>> AstDebug for ForwardCFG<T> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ForwardCFG {
+            start,
+            blocks,
+            successor_map,
+            predecessor_map,
+            traversal_order,
+            traversal_successors: _,
+            loop_heads,
+        } = self;
+        w.writeln("--BlockCFG--");
+        ast_debug_cfg(
+            w,
+            *start,
+            blocks,
+            successor_map.iter(),
+            predecessor_map.iter(),
+            traversal_order.windows(2).map(|w| (&w[0], &w[1])),
+            loop_heads.iter(),
+        );
+    }
+}
+
+impl<'a, T: Deref<Target = BasicBlocks>> AstDebug for ReverseCFG<'a, T> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ReverseCFG {
+            terminal,
+            terminal_block: _,
+            blocks,
+            successor_map,
+            predecessor_map,
+            traversal_order,
+            traversal_successors: _,
+            loop_heads,
+        } = self;
+        w.writeln("--ReverseBlockCFG--");
+        w.writeln(&format!("terminal: {}", terminal));
+        ast_debug_cfg(
+            w,
+            traversal_order[0],
+            blocks,
+            successor_map.iter(),
+            predecessor_map.iter(),
+            traversal_order.windows(2).map(|w| (&w[0], &w[1])),
+            loop_heads.iter(),
+        );
+    }
+}
+
+fn ast_debug_cfg<'a>(
+    w: &mut AstWriter,
+    start: Label,
+    blocks: &BasicBlocks,
+    successor_map: impl Iterator<Item = (&'a Label, &'a BTreeSet<Label>)>,
+    predecessor_map: impl Iterator<Item = (&'a Label, &'a BTreeSet<Label>)>,
+    traversal: impl Iterator<Item = (&'a Label, &'a Label)>,
+    loop_heads: impl Iterator<Item = (&'a Label, &'a BTreeSet<Label>)>,
+) {
+    w.write("successor_map:");
+    w.indent(4, |w| {
+        for (lbl, nexts) in successor_map {
+            w.write(&format!("{} => [", lbl));
+            w.comma(nexts, |w, next| w.write(&format!("{}", next)));
+            w.writeln("]")
+        }
+    });
+
+    w.write("predecessor_map:");
+    w.indent(4, |w| {
+        for (lbl, nexts) in predecessor_map {
+            w.write(&format!("{} <= [", lbl));
+            w.comma(nexts, |w, next| w.write(&format!("{}", next)));
+            w.writeln("]")
+        }
+    });
+
+    w.write("traversal:");
+    w.indent(4, |w| {
+        for (cur, next) in traversal {
+            w.writeln(&format!("{} => {}", cur, next))
+        }
+    });
+
+    w.write("loop heads:");
+    w.indent(4, |w| {
+        for (loop_head, back_edge_predecessors) in loop_heads {
+            for pred in back_edge_predecessors {
+                w.writeln(&format!(
+                    "loop head: {}. back edge predecessor: {}",
+                    loop_head, pred
+                ))
+            }
+        }
+    });
+
+    w.writeln(&format!("start: {}", start));
+    w.writeln("blocks:");
+    w.indent(4, |w| blocks.ast_debug(w));
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/liveness/mod.rs b/vendors/move/crates/move-compiler/src/cfgir/liveness/mod.rs
new file mode 100644
index 000000000..7ec13f4b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/liveness/mod.rs
@@ -0,0 +1,497 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod state;
+
+use super::{
+    absint::*,
+    cfg::{MutForwardCFG, MutReverseCFG, ReverseCFG, CFG},
+    locals,
+};
+use crate::{
+    diagnostics::Diagnostics,
+    hlir::ast::{self as H, *},
+    shared::{unique_map::UniqueMap, CompilationEnv},
+};
+use move_ir_types::location::*;
+use state::*;
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+//**************************************************************************************************
+// Entry and trait bindings
+//**************************************************************************************************
+
+type PerCommandStates = BTreeMap<Label, VecDeque<LivenessState>>;
+type ForwardIntersections = BTreeMap<Label, BTreeSet<Var>>;
+type FinalInvariants = BTreeMap<Label, LivenessState>;
+
+struct Liveness {
+    states: PerCommandStates,
+}
+
+impl Liveness {
+    fn new(cfg: &MutReverseCFG) -> Self {
+        let states = cfg
+            .blocks()
+            .map(|(lbl, block)| {
+                let init = block.iter().map(|_| LivenessState::initial()).collect();
+                (*lbl, init)
+            })
+            .collect();
+        Liveness { states }
+    }
+}
+
+impl TransferFunctions for Liveness {
+    type State = LivenessState;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        label: Label,
+        idx: usize,
+        cmd: &Command,
+    ) -> Diagnostics {
+        command(state, cmd);
+        // set current [label][command_idx] data with the new liveness data
+        let cur_label_states = self.states.get_mut(&label).unwrap();
+        cur_label_states[idx] = state.clone();
+        Diagnostics::new()
+    }
+}
+
+impl AbstractInterpreter for Liveness {}
+
+//**************************************************************************************************
+// Analysis
+//**************************************************************************************************
+
+fn analyze(
+    cfg: &mut MutForwardCFG,
+    infinite_loop_starts: &BTreeSet<Label>,
+) -> (FinalInvariants, PerCommandStates) {
+    let reverse = &mut ReverseCFG::new(cfg, infinite_loop_starts);
+    let initial_state = LivenessState::initial();
+    let mut liveness = Liveness::new(reverse);
+    let (final_invariants, errors) = liveness.analyze_function(reverse, initial_state);
+    assert!(errors.is_empty());
+    (final_invariants, liveness.states)
+}
+
+fn command(state: &mut LivenessState, sp!(_, cmd_): &Command) {
+    use Command_ as C;
+    match cmd_ {
+        C::Assign(ls, e) => {
+            lvalues(state, ls);
+            exp(state, e);
+        }
+        C::Mutate(el, er) => {
+            exp(state, er);
+            exp(state, el)
+        }
+        C::Return { exp: e, .. }
+        | C::Abort(e)
+        | C::IgnoreAndPop { exp: e, .. }
+        | C::JumpIf { cond: e, .. } => exp(state, e),
+
+        C::Jump { .. } => (),
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn lvalues(state: &mut LivenessState, ls: &[LValue]) {
+    ls.iter().for_each(|l| lvalue(state, l))
+}
+
+fn lvalue(state: &mut LivenessState, sp!(_, l_): &LValue) {
+    use LValue_ as L;
+    match l_ {
+        L::Ignore => (),
+        L::Var(v, _) => {
+            state.0.remove(v);
+        }
+        L::Unpack(_, _, fields) => fields.iter().for_each(|(_, l)| lvalue(state, l)),
+    }
+}
+
+fn exp(state: &mut LivenessState, parent_e: &Exp) {
+    use UnannotatedExp_ as E;
+    match &parent_e.exp.value {
+        E::Unit { .. } | E::Value(_) | E::Constant(_) | E::UnresolvedError => (),
+
+        E::BorrowLocal(_, var) | E::Copy { var, .. } | E::Move { var, .. } => {
+            state.0.insert(*var);
+        }
+
+        E::Spec(_, used_locals) => used_locals.keys().for_each(|v| {
+            state.0.insert(*v);
+        }),
+
+        E::ModuleCall(mcall) => mcall.arguments.iter().for_each(|e| exp(state, e)),
+        E::Vector(_, _, _, args) => args.iter().for_each(|e| exp(state, e)),
+        E::Freeze(e)
+        | E::Dereference(e)
+        | E::UnaryExp(_, e)
+        | E::Borrow(_, e, _, _)
+        | E::Cast(e, _) => exp(state, e),
+
+        E::BinopExp(e1, _, e2) => {
+            exp(state, e1);
+            exp(state, e2)
+        }
+
+        E::Pack(_, _, fields) => fields.iter().for_each(|(_, _, e)| exp(state, e)),
+
+        E::Multiple(es) => es.iter().for_each(|e| exp(state, e)),
+
+        E::Unreachable => panic!("ICE should not analyze dead code"),
+    }
+}
+
+//**************************************************************************************************
+// Copy Refinement
+//**************************************************************************************************
+
+/// This pass:
+/// - Switches the last inferred `copy` to a `move`.
+///   It will error if the `copy` was specified by the user
+/// - Reports an error if an assignment/let was not used
+///   Switches it to an `Ignore` if it has the drop ability (helps with error messages for borrows)
+
+pub fn last_usage(
+    compilation_env: &mut CompilationEnv,
+    context: &super::CFGContext,
+    cfg: &mut MutForwardCFG,
+) {
+    let super::CFGContext {
+        locals,
+        infinite_loop_starts,
+        ..
+    } = context;
+    let (final_invariants, per_command_states) = analyze(cfg, infinite_loop_starts);
+    for (lbl, block) in cfg.blocks_mut() {
+        let final_invariant = final_invariants
+            .get(lbl)
+            .unwrap_or_else(|| panic!("ICE no liveness states for {}", lbl));
+        let command_states = per_command_states.get(lbl).unwrap();
+        last_usage::block(
+            compilation_env,
+            locals,
+            final_invariant,
+            command_states,
+            block,
+        )
+    }
+}
+
+mod last_usage {
+    use crate::{
+        cfgir::liveness::state::LivenessState,
+        diag,
+        hlir::{
+            ast::*,
+            translate::{display_var, DisplayVar},
+        },
+        parser::ast::Ability_,
+        shared::{unique_map::*, *},
+    };
+    use std::collections::{BTreeSet, VecDeque};
+
+    struct Context<'a, 'b> {
+        env: &'a mut CompilationEnv,
+        locals: &'a UniqueMap<Var, SingleType>,
+        next_live: &'b BTreeSet<Var>,
+        dropped_live: BTreeSet<Var>,
+    }
+
+    impl<'a, 'b> Context<'a, 'b> {
+        fn new(
+            env: &'a mut CompilationEnv,
+            locals: &'a UniqueMap<Var, SingleType>,
+            next_live: &'b BTreeSet<Var>,
+            dropped_live: BTreeSet<Var>,
+        ) -> Self {
+            Context {
+                env,
+                locals,
+                next_live,
+                dropped_live,
+            }
+        }
+
+        fn has_drop(&self, local: &Var) -> bool {
+            let ty = self.locals.get(local).unwrap();
+            ty.value.abilities(ty.loc).has_ability_(Ability_::Drop)
+        }
+    }
+
+    pub fn block(
+        compilation_env: &mut CompilationEnv,
+        locals: &UniqueMap<Var, SingleType>,
+        final_invariant: &LivenessState,
+        command_states: &VecDeque<LivenessState>,
+        block: &mut BasicBlock,
+    ) {
+        let len = block.len();
+        let last_cmd = block.get(len - 1).unwrap();
+        assert!(
+            last_cmd.value.is_terminal(),
+            "ICE malformed block. missing jump"
+        );
+        for idx in 0..len {
+            let cmd = block.get_mut(idx).unwrap();
+            let cur_data = &command_states.get(idx).unwrap().0;
+            let next_data = match command_states.get(idx + 1) {
+                Some(s) => &s.0,
+                None => &final_invariant.0,
+            };
+
+            let dropped_live = cur_data
+                .difference(next_data)
+                .cloned()
+                .collect::<BTreeSet<_>>();
+            command(
+                &mut Context::new(compilation_env, locals, next_data, dropped_live),
+                cmd,
+            )
+        }
+    }
+
+    fn command(context: &mut Context, sp!(_, cmd_): &mut Command) {
+        use Command_ as C;
+        match cmd_ {
+            C::Assign(ls, e) => {
+                lvalues(context, ls);
+                exp(context, e);
+            }
+            C::Mutate(el, er) => {
+                exp(context, el);
+                exp(context, er)
+            }
+            C::Return { exp: e, .. }
+            | C::Abort(e)
+            | C::IgnoreAndPop { exp: e, .. }
+            | C::JumpIf { cond: e, .. } => exp(context, e),
+
+            C::Jump { .. } => (),
+            C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+        }
+    }
+
+    fn lvalues(context: &mut Context, ls: &mut [LValue]) {
+        ls.iter_mut().for_each(|l| lvalue(context, l))
+    }
+
+    fn lvalue(context: &mut Context, l: &mut LValue) {
+        use LValue_ as L;
+        match &mut l.value {
+            L::Ignore => (),
+            L::Var(v, _) => {
+                context.dropped_live.insert(*v);
+                if !context.next_live.contains(v) {
+                    match display_var(v.value()) {
+                        DisplayVar::Tmp => (),
+                        DisplayVar::Orig(v_str) => {
+                            if !v.starts_with_underscore() {
+                                let msg = format!(
+                                    "Unused assignment for variable '{}'. Consider \
+                                     removing, replacing with '_', or prefixing with '_' (e.g., \
+                                     '_{}')",
+                                    v_str, v_str
+                                );
+                                context
+                                    .env
+                                    .add_diag(diag!(UnusedItem::Assignment, (l.loc, msg)));
+                            }
+                            if context.has_drop(v) {
+                                l.value = L::Ignore
+                            }
+                        }
+                    }
+                }
+            }
+            L::Unpack(_, _, fields) => fields.iter_mut().for_each(|(_, l)| lvalue(context, l)),
+        }
+    }
+
+    fn exp(context: &mut Context, parent_e: &mut Exp) {
+        use UnannotatedExp_ as E;
+        match &mut parent_e.exp.value {
+            E::Unit { .. } | E::Value(_) | E::Constant(_) | E::UnresolvedError => (),
+
+            E::BorrowLocal(_, var) | E::Move { var, .. } => {
+                // remove it from context to prevent accidental dropping in previous usages
+                context.dropped_live.remove(var);
+            }
+
+            E::Spec(_, used_locals) => {
+                // remove it from context to prevent accidental dropping in previous usages
+                used_locals.keys().for_each(|var| {
+                    context.dropped_live.remove(var);
+                })
+            }
+
+            E::Copy { var, from_user } => {
+                // Even if not switched to a move:
+                // remove it from dropped_live to prevent accidental dropping in previous usages
+                let var_is_dead = context.dropped_live.remove(var);
+                // Non-references might still be borrowed, but that error will be caught in borrow
+                // checking with a specific tip/message
+                if var_is_dead && !*from_user {
+                    parent_e.exp.value = E::Move {
+                        var: *var,
+                        annotation: MoveOpAnnotation::InferredLastUsage,
+                    }
+                }
+            }
+
+            E::ModuleCall(mcall) => mcall
+                .arguments
+                .iter_mut()
+                .rev()
+                .for_each(|arg| exp(context, arg)),
+            E::Vector(_, _, _, args) => args.iter_mut().rev().for_each(|arg| exp(context, arg)),
+            E::Freeze(e)
+            | E::Dereference(e)
+            | E::UnaryExp(_, e)
+            | E::Borrow(_, e, _, _)
+            | E::Cast(e, _) => exp(context, e),
+
+            E::BinopExp(e1, _, e2) => {
+                exp(context, e2);
+                exp(context, e1)
+            }
+
+            E::Pack(_, _, fields) => fields
+                .iter_mut()
+                .rev()
+                .for_each(|(_, _, e)| exp(context, e)),
+
+            E::Multiple(es) => es.iter_mut().rev().for_each(|e| exp(context, e)),
+
+            E::Unreachable => panic!("ICE should not analyze dead code"),
+        }
+    }
+}
+
+//**************************************************************************************************
+// Refs Refinement
+//**************************************************************************************************
+
+/// This refinement releases dead reference values by adding a move + pop. In other words, if a
+/// reference `r` is dead, it will insert `_ = move r` after the last usage
+///
+/// However, due to the previous `last_usage` analysis. Any last usage of a reference is a move.
+/// And any unused assignment to a reference holding local is switched to a `Ignore`.
+/// Thus the only way a reference could still be dead is if it was live in a loop
+/// Additionally, the borrow checker will consider any reference to be released if it was released
+/// in any predecessor.
+/// As such, the only references that need to be released by an added `_ = move r` are references
+/// at the beginning of a block given that
+/// (1) The reference is live in the predecessor and the predecessor is a loop
+/// (2)  The reference is live in ALL predecessors (otherwise the borrow checker will release them)
+///
+/// Because of this, `build_forward_intersections` intersects all of the forward post states of
+/// predecessors.
+/// Then `release_dead_refs_block` adds a release at the beginning of the block if the reference
+/// satisfies (1) and (2)
+
+pub fn release_dead_refs(
+    context: &super::CFGContext,
+    locals_pre_states: &BTreeMap<Label, locals::state::LocalStates>,
+    cfg: &mut MutForwardCFG,
+) {
+    let super::CFGContext {
+        locals,
+        infinite_loop_starts,
+        ..
+    } = context;
+    let (liveness_pre_states, _per_command_states) = analyze(cfg, infinite_loop_starts);
+    let forward_intersections = build_forward_intersections(cfg, &liveness_pre_states);
+    for (lbl, block) in cfg.blocks_mut() {
+        let locals_pre_state = locals_pre_states.get(lbl).unwrap();
+        let liveness_pre_state = liveness_pre_states.get(lbl).unwrap();
+        let forward_intersection = forward_intersections.get(lbl).unwrap();
+        release_dead_refs_block(
+            locals,
+            locals_pre_state,
+            liveness_pre_state,
+            forward_intersection,
+            block,
+        )
+    }
+}
+
+fn build_forward_intersections(
+    cfg: &MutForwardCFG,
+    final_invariants: &FinalInvariants,
+) -> ForwardIntersections {
+    cfg.blocks()
+        .keys()
+        .map(|lbl| {
+            let mut states = cfg
+                .predecessors(*lbl)
+                .iter()
+                .map(|pred| &final_invariants.get(pred).unwrap().0);
+            let intersection = states
+                .next()
+                .map(|init| states.fold(init.clone(), |acc, s| &acc & s))
+                .unwrap_or_else(BTreeSet::new);
+            (*lbl, intersection)
+        })
+        .collect()
+}
+
+fn release_dead_refs_block(
+    locals: &UniqueMap<Var, SingleType>,
+    locals_pre_state: &locals::state::LocalStates,
+    liveness_pre_state: &LivenessState,
+    forward_intersection: &BTreeSet<Var>,
+    block: &mut BasicBlock,
+) {
+    if forward_intersection.is_empty() {
+        return;
+    }
+
+    let cmd_loc = block.get(0).unwrap().loc;
+    let cur_state = {
+        let mut s = liveness_pre_state.clone();
+        for cmd in block.iter().rev() {
+            command(&mut s, cmd);
+        }
+        s
+    };
+    // Free references that were live in ALL predecessors and that have a value
+    // (could not have a value due to errors)
+    let dead_refs = forward_intersection
+        .difference(&cur_state.0)
+        .filter(|var| locals_pre_state.get_state(var).is_available())
+        .map(|var| (var, locals.get(var).unwrap()))
+        .filter(is_ref);
+    for (dead_ref, ty) in dead_refs {
+        block.push_front(pop_ref(cmd_loc, *dead_ref, ty.clone()));
+    }
+}
+
+fn is_ref((_local, sp!(_, local_ty_)): &(&Var, &SingleType)) -> bool {
+    match local_ty_ {
+        SingleType_::Ref(_, _) => true,
+        SingleType_::Base(_) => false,
+    }
+}
+
+fn pop_ref(loc: Loc, var: Var, ty: SingleType) -> Command {
+    use Command_ as C;
+    use UnannotatedExp_ as E;
+    let move_e_ = E::Move {
+        annotation: MoveOpAnnotation::InferredLastUsage,
+        var,
+    };
+    let move_e = H::exp(Type_::single(ty), sp(loc, move_e_));
+    let pop_ = C::IgnoreAndPop {
+        pop_num: 1,
+        exp: move_e,
+    };
+    sp(loc, pop_)
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/liveness/state.rs b/vendors/move/crates/move-compiler/src/cfgir/liveness/state.rs
new file mode 100644
index 000000000..7a4568bd2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/liveness/state.rs
@@ -0,0 +1,40 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//**************************************************************************************************
+// Abstract state
+//**************************************************************************************************
+
+use crate::{cfgir::absint::*, hlir::ast::Var};
+use std::{cmp::Ordering, collections::BTreeSet};
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct LivenessState(pub BTreeSet<Var>);
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl LivenessState {
+    pub fn initial() -> Self {
+        LivenessState(BTreeSet::new())
+    }
+
+    pub fn extend(&mut self, other: &Self) {
+        self.0.extend(other.0.iter().cloned());
+    }
+}
+
+impl AbstractDomain for LivenessState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let before = self.0.len();
+        self.extend(other);
+        let after = self.0.len();
+        match before.cmp(&after) {
+            Ordering::Less => JoinResult::Changed,
+            Ordering::Equal => JoinResult::Unchanged,
+            Ordering::Greater => panic!("ICE set union made a set smaller than before"),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/locals/mod.rs b/vendors/move/crates/move-compiler/src/cfgir/locals/mod.rs
new file mode 100644
index 000000000..abec9bee9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/locals/mod.rs
@@ -0,0 +1,456 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod state;
+
+use super::absint::*;
+use crate::{
+    diag,
+    diagnostics::{Diagnostic, Diagnostics},
+    expansion::ast::{AbilitySet, ModuleIdent},
+    hlir::{
+        ast::*,
+        translate::{display_var, DisplayVar},
+    },
+    naming::ast::{self as N, TParam},
+    parser::ast::{Ability_, StructName},
+    shared::{unique_map::UniqueMap, *},
+};
+use move_ir_types::location::*;
+use state::*;
+use std::collections::BTreeMap;
+
+//**************************************************************************************************
+// Entry and trait bindings
+//**************************************************************************************************
+
+struct LocalsSafety<'a> {
+    struct_declared_abilities: &'a UniqueMap<ModuleIdent, UniqueMap<StructName, AbilitySet>>,
+    local_types: &'a UniqueMap<Var, SingleType>,
+    signature: &'a FunctionSignature,
+}
+
+impl<'a> LocalsSafety<'a> {
+    fn new(
+        struct_declared_abilities: &'a UniqueMap<ModuleIdent, UniqueMap<StructName, AbilitySet>>,
+        local_types: &'a UniqueMap<Var, SingleType>,
+        signature: &'a FunctionSignature,
+    ) -> Self {
+        Self {
+            struct_declared_abilities,
+            local_types,
+            signature,
+        }
+    }
+}
+
+struct Context<'a, 'b> {
+    struct_declared_abilities: &'a UniqueMap<ModuleIdent, UniqueMap<StructName, AbilitySet>>,
+    local_types: &'a UniqueMap<Var, SingleType>,
+    local_states: &'b mut LocalStates,
+    signature: &'a FunctionSignature,
+    diags: Diagnostics,
+}
+
+impl<'a, 'b> Context<'a, 'b> {
+    fn new(locals_safety: &'a LocalsSafety, local_states: &'b mut LocalStates) -> Self {
+        let struct_declared_abilities = &locals_safety.struct_declared_abilities;
+        let local_types = &locals_safety.local_types;
+        let signature = &locals_safety.signature;
+        Self {
+            struct_declared_abilities,
+            local_types,
+            local_states,
+            signature,
+            diags: Diagnostics::new(),
+        }
+    }
+
+    fn add_diag(&mut self, d: Diagnostic) {
+        self.diags.add(d)
+    }
+
+    fn extend_diags(&mut self, diags: Diagnostics) {
+        self.diags.extend(diags)
+    }
+
+    fn get_diags(self) -> Diagnostics {
+        self.diags
+    }
+
+    fn get_state(&self, local: &Var) -> &LocalState {
+        self.local_states.get_state(local)
+    }
+
+    fn set_state(&mut self, local: Var, state: LocalState) {
+        self.local_states.set_state(local, state)
+    }
+
+    fn local_type(&self, local: &Var) -> &SingleType {
+        self.local_types.get(local).unwrap()
+    }
+}
+
+impl<'a> TransferFunctions for LocalsSafety<'a> {
+    type State = LocalStates;
+
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        _lbl: Label,
+        _idx: usize,
+        cmd: &Command,
+    ) -> Diagnostics {
+        let mut context = Context::new(self, pre);
+        command(&mut context, cmd);
+        context.get_diags()
+    }
+}
+
+impl<'a> AbstractInterpreter for LocalsSafety<'a> {}
+
+pub fn verify(
+    compilation_env: &mut CompilationEnv,
+    context: &super::CFGContext,
+    cfg: &super::cfg::MutForwardCFG,
+) -> BTreeMap<Label, LocalStates> {
+    let super::CFGContext {
+        struct_declared_abilities,
+        signature,
+        locals,
+        ..
+    } = context;
+    let initial_state = LocalStates::initial(&signature.parameters, locals);
+    let mut locals_safety = LocalsSafety::new(struct_declared_abilities, locals, signature);
+    let (final_state, ds) = locals_safety.analyze_function(cfg, initial_state);
+    compilation_env.add_diags(ds);
+    final_state
+}
+
+//**************************************************************************************************
+// Command
+//**************************************************************************************************
+
+fn command(context: &mut Context, sp!(loc, cmd_): &Command) {
+    use Command_ as C;
+    match cmd_ {
+        C::Assign(ls, e) => {
+            exp(context, e);
+            lvalues(context, ls);
+        }
+        C::Mutate(el, er) => {
+            exp(context, er);
+            exp(context, el)
+        }
+        C::Abort(e) | C::IgnoreAndPop { exp: e, .. } | C::JumpIf { cond: e, .. } => exp(context, e),
+
+        C::Return { exp: e, .. } => {
+            exp(context, e);
+            let mut diags = Diagnostics::new();
+            for (local, state) in context.local_states.iter() {
+                match state {
+                    LocalState::Unavailable(_, _) => (),
+                    LocalState::Available(available)
+                    | LocalState::MaybeUnavailable { available, .. } => {
+                        let ty = context.local_type(&local);
+                        let abilities = ty.value.abilities(ty.loc);
+                        if !abilities.has_ability_(Ability_::Drop) {
+                            let verb = match state {
+                                LocalState::Unavailable(_, _) => unreachable!(),
+                                LocalState::Available(_) => "still contains",
+                                LocalState::MaybeUnavailable { .. } => "might still contain",
+                            };
+                            let available = *available;
+                            let stmt = match display_var(local.value()) {
+                                DisplayVar::Tmp => "The value is created but not used".to_owned(),
+                                DisplayVar::Orig(l) => {
+                                    if context.signature.is_parameter(&local) {
+                                        format!("The parameter '{}' {} a value", l, verb,)
+                                    } else {
+                                        format!("The local variable '{}' {} a value", l, verb,)
+                                    }
+                                }
+                            };
+                            let msg = format!(
+                                "{}. The value does not have the '{}' ability and must be \
+                                 consumed before the function returns",
+                                stmt,
+                                Ability_::Drop,
+                            );
+                            let mut diag = diag!(
+                                MoveSafety::UnusedUndroppable,
+                                (*loc, "Invalid return"),
+                                (available, msg)
+                            );
+                            add_drop_ability_tip(context, &mut diag, ty.clone());
+                            diags.add(diag);
+                        }
+                    }
+                }
+            }
+            context.extend_diags(diags)
+        }
+        C::Jump { .. } => (),
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn lvalues(context: &mut Context, ls: &[LValue]) {
+    ls.iter().for_each(|l| lvalue(context, l))
+}
+
+fn lvalue(context: &mut Context, sp!(loc, l_): &LValue) {
+    use LValue_ as L;
+    match l_ {
+        L::Ignore => (),
+        L::Var(v, _) => {
+            let ty = context.local_type(v);
+            let abilities = ty.value.abilities(ty.loc);
+            if !abilities.has_ability_(Ability_::Drop) {
+                let old_state = context.get_state(v);
+                match old_state {
+                    LocalState::Unavailable(_, _) => (),
+                    LocalState::Available(available)
+                    | LocalState::MaybeUnavailable { available, .. } => {
+                        let verb = match old_state {
+                            LocalState::Unavailable(_, _) => unreachable!(),
+                            LocalState::Available(_) => "contains",
+                            LocalState::MaybeUnavailable { .. } => "might contain",
+                        };
+                        let available = *available;
+                        let vstr = match display_var(v.value()) {
+                            DisplayVar::Tmp => panic!("ICE invalid assign tmp local"),
+                            DisplayVar::Orig(s) => s,
+                        };
+                        let msg = format!(
+                            "The variable {} a value due to this assignment. The value does not \
+                             have the '{}' ability and must be used before you assign to this \
+                             variable again",
+                            verb,
+                            Ability_::Drop,
+                        );
+                        let mut diag = diag!(
+                            MoveSafety::UnusedUndroppable,
+                            (*loc, format!("Invalid assignment to variable '{}'", vstr)),
+                            (available, msg),
+                        );
+                        add_drop_ability_tip(context, &mut diag, ty.clone());
+                        context.add_diag(diag)
+                    }
+                }
+            }
+            context.set_state(*v, LocalState::Available(*loc))
+        }
+        L::Unpack(_, _, fields) => fields.iter().for_each(|(_, l)| lvalue(context, l)),
+    }
+}
+
+fn exp(context: &mut Context, parent_e: &Exp) {
+    use UnannotatedExp_ as E;
+    let eloc = &parent_e.exp.loc;
+    match &parent_e.exp.value {
+        E::Unit { .. } | E::Value(_) | E::Constant(_) | E::Spec(_, _) | E::UnresolvedError => (),
+
+        E::BorrowLocal(_, var) | E::Copy { var, .. } => use_local(context, eloc, var),
+
+        E::Move { var, .. } => {
+            use_local(context, eloc, var);
+            context.set_state(
+                *var,
+                LocalState::Unavailable(*eloc, UnavailableReason::Moved),
+            )
+        }
+
+        E::ModuleCall(mcall) => mcall.arguments.iter().map(|e| exp(context, e)).collect(),
+        E::Vector(_, _, _, args) => args.iter().map(|e| exp(context, e)).collect(),
+        E::Freeze(e)
+        | E::Dereference(e)
+        | E::UnaryExp(_, e)
+        | E::Borrow(_, e, _, _)
+        | E::Cast(e, _) => exp(context, e),
+
+        E::BinopExp(e1, _, e2) => {
+            exp(context, e1);
+            exp(context, e2)
+        }
+
+        E::Pack(_, _, fields) => fields.iter().for_each(|(_, _, e)| exp(context, e)),
+
+        E::Multiple(es) => es.iter().for_each(|e| exp(context, e)),
+
+        E::Unreachable => panic!("ICE should not analyze dead code"),
+    }
+}
+
+fn use_local(context: &mut Context, loc: &Loc, local: &Var) {
+    use LocalState as L;
+    let state = context.get_state(local);
+    match state {
+        L::Available(_) => (),
+        L::Unavailable(unavailable, unavailable_reason)
+        | L::MaybeUnavailable {
+            unavailable,
+            unavailable_reason,
+            ..
+        } => {
+            let unavailable = *unavailable;
+            let vstr = match display_var(local.value()) {
+                DisplayVar::Tmp => panic!("ICE invalid use tmp local {}", local.value()),
+                DisplayVar::Orig(s) => s,
+            };
+            match unavailable_reason {
+                UnavailableReason::Unassigned => {
+                    let msg = format!(
+                        "The variable '{}' {} not have a value. The variable must be assigned a \
+                         value before being used.",
+                        vstr,
+                        match state {
+                            LocalState::Available(_) => unreachable!(),
+                            LocalState::Unavailable(_, _) => "does",
+                            LocalState::MaybeUnavailable { .. } => "might",
+                        }
+                    );
+                    context.add_diag(diag!(
+                        MoveSafety::UnassignedVariable,
+                        (
+                            *loc,
+                            format!("Invalid usage of unassigned variable '{}'", vstr)
+                        ),
+                        (unavailable, msg),
+                    ));
+                }
+                UnavailableReason::Moved => {
+                    let verb = match state {
+                        LocalState::Available(_) => unreachable!(),
+                        LocalState::Unavailable(_, _) => "was",
+                        LocalState::MaybeUnavailable { .. } => "might have been",
+                    };
+                    let suggestion = format!("Suggestion: use 'copy {}' to avoid the move.", vstr);
+                    let reason = if *loc == unavailable {
+                        "In a loop, this typically means it was moved in the first iteration, and \
+                         is not available by the second iteration."
+                            .to_string()
+                    } else {
+                        format!("The value of '{}' {} previously moved here.", vstr, verb)
+                    };
+                    context.add_diag(diag!(
+                        MoveSafety::UnassignedVariable,
+                        (
+                            *loc,
+                            format!("Invalid usage of previously moved variable '{}'.", vstr)
+                        ),
+                        (unavailable, reason),
+                        (unavailable, suggestion),
+                    ));
+                }
+            };
+        }
+    }
+}
+
+//**************************************************************************************************
+// Error helper
+//**************************************************************************************************
+
+fn add_drop_ability_tip(context: &Context, diag: &mut Diagnostic, st: SingleType) {
+    use N::{TypeName_ as TN, Type_ as T};
+    let ty = single_type_to_naming_type(st);
+    let owned_abilities;
+    let (declared_loc_opt, declared_abilities, ty_args) = match &ty.value {
+        T::Param(TParam {
+            user_specified_name,
+            abilities,
+            ..
+        }) => (Some(user_specified_name.loc), abilities, vec![]),
+        T::Apply(_, sp!(_, TN::Builtin(b)), ty_args) => {
+            owned_abilities = b.value.declared_abilities(b.loc);
+            (None, &owned_abilities, ty_args.clone())
+        }
+        T::Apply(_, sp!(_, TN::ModuleType(m, s)), ty_args) => {
+            let decl_loc = *context
+                .struct_declared_abilities
+                .get(m)
+                .unwrap()
+                .get_loc(s)
+                .unwrap();
+            let declared_abilities = context
+                .struct_declared_abilities
+                .get(m)
+                .unwrap()
+                .get(s)
+                .unwrap();
+            (Some(decl_loc), declared_abilities, ty_args.clone())
+        }
+        t => panic!(
+            "ICE either the type did not have 'drop' when it should have or it was converted \
+             incorrectly {:?}",
+            t
+        ),
+    };
+    crate::typing::core::ability_not_satisfied_tips(
+        &crate::typing::core::Subst::empty(),
+        diag,
+        Ability_::Drop,
+        &ty,
+        declared_loc_opt,
+        declared_abilities,
+        ty_args.iter().map(|ty_arg| {
+            let abilities = match &ty_arg.value {
+                T::Unit => AbilitySet::collection(ty_arg.loc),
+                T::Ref(_, _) => AbilitySet::references(ty_arg.loc),
+                T::UnresolvedError | T::Anything => AbilitySet::all(ty_arg.loc),
+                T::Param(TParam { abilities, .. }) | T::Apply(Some(abilities), _, _) => {
+                    abilities.clone()
+                }
+                T::Var(_) | T::Apply(None, _, _) => panic!("ICE expansion failed"),
+            };
+            (ty_arg, abilities)
+        }),
+    )
+}
+
+fn single_type_to_naming_type(sp!(loc, st_): SingleType) -> N::Type {
+    sp(loc, single_type_to_naming_type_(st_))
+}
+
+fn single_type_to_naming_type_(st_: SingleType_) -> N::Type_ {
+    use SingleType_ as S;
+    use N::Type_ as T;
+    match st_ {
+        S::Ref(mut_, b) => T::Ref(mut_, Box::new(base_type_to_naming_type(b))),
+        S::Base(sp!(_, b_)) => base_type_to_naming_type_(b_),
+    }
+}
+
+fn base_type_to_naming_type(sp!(loc, bt_): BaseType) -> N::Type {
+    sp(loc, base_type_to_naming_type_(bt_))
+}
+
+fn base_type_to_naming_type_(bt_: BaseType_) -> N::Type_ {
+    use BaseType_ as B;
+    use N::Type_ as T;
+    match bt_ {
+        B::Unreachable => T::Anything,
+        B::UnresolvedError => T::UnresolvedError,
+        B::Param(tp) => T::Param(tp),
+        B::Apply(abilities, tn, ty_args) => T::Apply(
+            Some(abilities),
+            type_name_to_naming_type_name(tn),
+            ty_args.into_iter().map(base_type_to_naming_type).collect(),
+        ),
+    }
+}
+
+fn type_name_to_naming_type_name(sp!(loc, tn_): TypeName) -> N::TypeName {
+    sp(loc, type_name_to_naming_type_name_(tn_))
+}
+
+fn type_name_to_naming_type_name_(tn_: TypeName_) -> N::TypeName_ {
+    use TypeName_ as TN;
+    use N::TypeName_ as NTN;
+    match tn_ {
+        TN::Builtin(b) => NTN::Builtin(b),
+        TN::ModuleType(m, n) => NTN::ModuleType(m, n),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/locals/state.rs b/vendors/move/crates/move-compiler/src/cfgir/locals/state.rs
new file mode 100644
index 000000000..692a522b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/locals/state.rs
@@ -0,0 +1,130 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{cfgir::absint::*, hlir::ast::Var, shared::unique_map::UniqueMap};
+use move_ir_types::location::*;
+
+//**************************************************************************************************
+// Abstract state
+//**************************************************************************************************
+
+#[derive(Debug, Clone, Copy)]
+pub enum UnavailableReason {
+    Unassigned,
+    Moved,
+}
+
+#[derive(Clone, Debug)]
+pub enum LocalState {
+    // Local does not have a value
+    Unavailable(Loc, UnavailableReason),
+    // Local has a value
+    Available(Loc),
+    // Available in some branches but not all. If it is a resource, cannot be assigned
+    MaybeUnavailable {
+        available: Loc,
+        unavailable: Loc,
+        unavailable_reason: UnavailableReason,
+    },
+}
+
+impl LocalState {
+    pub fn is_available(&self) -> bool {
+        match self {
+            LocalState::Available(_) => true,
+            LocalState::Unavailable(_, _) | LocalState::MaybeUnavailable { .. } => false,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct LocalStates {
+    local_states: UniqueMap<Var, LocalState>,
+}
+
+impl LocalStates {
+    pub fn initial<T>(function_arguments: &[(Var, T)], local_types: &UniqueMap<Var, T>) -> Self {
+        let mut states = LocalStates {
+            local_states: UniqueMap::new(),
+        };
+        for (var, _) in local_types.key_cloned_iter() {
+            let local_state = LocalState::Unavailable(var.loc(), UnavailableReason::Unassigned);
+            states.set_state(var, local_state)
+        }
+        for (var, _) in function_arguments {
+            let local_state = LocalState::Available(var.loc());
+            states.set_state(*var, local_state)
+        }
+        states
+    }
+
+    pub fn get_state(&self, local: &Var) -> &LocalState {
+        self.local_states
+            .get(local)
+            .unwrap_or_else(|| panic!("ICE: Unable to get state for local {:#?}", local))
+    }
+
+    pub fn set_state(&mut self, local: Var, state: LocalState) {
+        self.local_states.remove(&local);
+        self.local_states.add(local, state).unwrap();
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (Var, &LocalState)> {
+        self.local_states.key_cloned_iter()
+    }
+
+    #[allow(dead_code)]
+    pub fn debug(&self) {
+        use LocalState as L;
+        for (var, state) in self.iter() {
+            print!("{}: ", var.0);
+            match state {
+                L::Unavailable(_, _) => println!("Unavailable"),
+                L::Available(_) => println!("Available"),
+                L::MaybeUnavailable { .. } => println!("MaybeUnavailable"),
+            }
+        }
+    }
+}
+
+impl AbstractDomain for LocalStates {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        use LocalState as L;
+        let mut result = JoinResult::Unchanged;
+        for (local, other_state) in other.local_states.key_cloned_iter() {
+            match (self.get_state(&local), other_state) {
+                // equal so nothing to do
+                (L::Unavailable(_, _), L::Unavailable(_, _))
+                | (L::Available(_), L::Available(_))
+                | (L::MaybeUnavailable { .. }, L::MaybeUnavailable { .. }) => (),
+                // if its partially assigned, stays partially assigned
+                (L::MaybeUnavailable { .. }, _) => (),
+
+                // if was partially assigned in other, its now partially assigned
+                (_, L::MaybeUnavailable { .. }) => {
+                    result = JoinResult::Changed;
+                    let state = other_state.clone();
+                    self.set_state(local, state)
+                }
+
+                // Available in one but not the other, so maybe unavailable
+                (L::Available(available), L::Unavailable(unavailable, reason))
+                | (L::Unavailable(unavailable, reason), L::Available(available)) => {
+                    result = JoinResult::Changed;
+                    let available = *available;
+                    let unavailable = *unavailable;
+                    let state = L::MaybeUnavailable {
+                        available,
+                        unavailable,
+                        unavailable_reason: *reason,
+                    };
+
+                    self.set_state(local, state)
+                }
+            }
+        }
+
+        result
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/mod.rs b/vendors/move/crates/move-compiler/src/cfgir/mod.rs
new file mode 100644
index 000000000..614474e49
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/mod.rs
@@ -0,0 +1,60 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod absint;
+pub mod ast;
+mod borrows;
+pub mod cfg;
+mod liveness;
+mod locals;
+mod remove_no_ops;
+pub(crate) mod translate;
+pub mod visitor;
+
+mod optimize;
+
+use crate::{
+    expansion::ast::{AbilitySet, ModuleIdent},
+    hlir::ast::{FunctionSignature, Label, SingleType, Var, Visibility},
+    parser::ast::StructName,
+    shared::{unique_map::UniqueMap, CompilationEnv, Name},
+};
+use cfg::*;
+use optimize::optimize;
+use std::collections::BTreeSet;
+
+pub struct CFGContext<'a> {
+    pub module: Option<ModuleIdent>,
+    pub member: MemberName,
+    pub struct_declared_abilities: &'a UniqueMap<ModuleIdent, UniqueMap<StructName, AbilitySet>>,
+    pub visibility: Visibility,
+    pub signature: &'a FunctionSignature,
+    pub locals: &'a UniqueMap<Var, SingleType>,
+    pub infinite_loop_starts: &'a BTreeSet<Label>,
+}
+
+pub enum MemberName {
+    Constant(Name),
+    Function(Name),
+}
+
+pub fn refine_inference_and_verify(
+    env: &mut CompilationEnv,
+    context: &CFGContext,
+    cfg: &mut MutForwardCFG,
+) {
+    liveness::last_usage(env, context, cfg);
+    let locals_states = locals::verify(env, context, cfg);
+
+    liveness::release_dead_refs(context, &locals_states, cfg);
+    borrows::verify(env, context, cfg);
+}
+
+impl MemberName {
+    pub fn name(&self) -> Name {
+        match self {
+            MemberName::Constant(n) | MemberName::Function(n) => *n,
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/optimize/constant_fold.rs b/vendors/move/crates/move-compiler/src/cfgir/optimize/constant_fold.rs
new file mode 100644
index 000000000..57a5f134c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/optimize/constant_fold.rs
@@ -0,0 +1,451 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::cfg::MutForwardCFG,
+    hlir::ast::{
+        BaseType, BaseType_, Command, Command_, Exp, FunctionSignature, SingleType, TypeName,
+        TypeName_, UnannotatedExp_, Value, Value_, Var,
+    },
+    naming::ast::{BuiltinTypeName, BuiltinTypeName_},
+    parser::ast::{BinOp, BinOp_, ConstantName, UnaryOp, UnaryOp_},
+    shared::unique_map::UniqueMap,
+};
+use move_ir_types::location::*;
+use std::convert::TryFrom;
+
+/// returns true if anything changed
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    constants: &UniqueMap<ConstantName, Value>,
+    cfg: &mut MutForwardCFG,
+) -> bool {
+    let mut changed = false;
+    for block_ref in cfg.blocks_mut().values_mut() {
+        let block = std::mem::take(block_ref);
+        *block_ref = block
+            .into_iter()
+            .filter_map(|mut cmd| match optimize_cmd(constants, &mut cmd) {
+                None => {
+                    changed = true;
+                    None
+                }
+                Some(cmd_changed) => {
+                    changed = cmd_changed || changed;
+                    Some(cmd)
+                }
+            })
+            .collect();
+    }
+    changed
+}
+
+//**************************************************************************************************
+// Scaffolding
+//**************************************************************************************************
+
+// Some(changed) to keep
+// None to remove the cmd
+fn optimize_cmd(
+    consts: &UniqueMap<ConstantName, Value>,
+    sp!(_, cmd_): &mut Command,
+) -> Option<bool> {
+    use Command_ as C;
+    Some(match cmd_ {
+        C::Assign(_ls, e) => optimize_exp(consts, e),
+        C::Mutate(el, er) => {
+            let c1 = optimize_exp(consts, er);
+            let c2 = optimize_exp(consts, el);
+            c1 || c2
+        }
+        C::Return { exp: e, .. } | C::Abort(e) | C::JumpIf { cond: e, .. } => {
+            optimize_exp(consts, e)
+        }
+        C::IgnoreAndPop { exp: e, .. } => {
+            let c = optimize_exp(consts, e);
+            if ignorable_exp(e) {
+                // value(s), so the command can be removed
+                return None;
+            } else {
+                c
+            }
+        }
+
+        C::Jump { .. } => false,
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    })
+}
+
+fn optimize_exp(consts: &UniqueMap<ConstantName, Value>, e: &mut Exp) -> bool {
+    use UnannotatedExp_ as E;
+    let optimize_exp = |e| optimize_exp(consts, e);
+    match &mut e.exp.value {
+        //************************************
+        // Pass through cases
+        //************************************
+        E::Unit { .. }
+        | E::Value(_)
+        | E::UnresolvedError
+        | E::Spec(_, _)
+        | E::BorrowLocal(_, _)
+        | E::Move { .. }
+        | E::Copy { .. }
+        | E::Unreachable => false,
+
+        e_ @ E::Constant(_) => {
+            let E::Constant(name) = e_ else {
+                unreachable!()
+            };
+            if let Some(value) = consts.get(name) {
+                *e_ = E::Value(value.clone());
+                true
+            } else {
+                false
+            }
+        }
+
+        E::ModuleCall(mcall) => mcall.arguments.iter_mut().map(optimize_exp).any(|x| x),
+
+        E::Freeze(e) | E::Dereference(e) | E::Borrow(_, e, _, _) => optimize_exp(e),
+
+        E::Pack(_, _, fields) => fields
+            .iter_mut()
+            .map(|(_, _, e)| optimize_exp(e))
+            .any(|changed| changed),
+
+        E::Multiple(es) => es.iter_mut().map(optimize_exp).any(|changed| changed),
+
+        //************************************
+        // Foldable cases
+        //************************************
+        e_ @ E::UnaryExp(_, _) => {
+            let (op, er) = match e_ {
+                E::UnaryExp(op, er) => (op, er),
+                _ => unreachable!(),
+            };
+            let changed = optimize_exp(er);
+            let v = match foldable_exp(er) {
+                Some(v) => v,
+                None => return changed,
+            };
+            *e_ = fold_unary_op(e.exp.loc, op, v);
+            true
+        }
+
+        e_ @ E::BinopExp(_, _, _) => {
+            let (e1, op, e2) = match e_ {
+                E::BinopExp(e1, op, e2) => (e1, op, e2),
+                _ => unreachable!(),
+            };
+            let changed1 = optimize_exp(e1);
+            let changed2 = optimize_exp(e2);
+            let changed = changed1 || changed2;
+            if let (Some(v1), Some(v2)) = (foldable_exp(e1), foldable_exp(e2)) {
+                if let Some(folded) = fold_binary_op(e.exp.loc, op, v1, v2) {
+                    *e_ = folded;
+                    true
+                } else {
+                    changed
+                }
+            } else {
+                changed
+            }
+        }
+
+        e_ @ E::Cast(_, _) => {
+            let (e, bt) = match e_ {
+                E::Cast(e, bt) => (e, bt),
+                _ => unreachable!(),
+            };
+            let changed = optimize_exp(e);
+            let v = match foldable_exp(e) {
+                Some(v) => v,
+                None => return changed,
+            };
+            match fold_cast(e.exp.loc, bt, v) {
+                Some(folded) => {
+                    *e_ = folded;
+                    true
+                }
+                None => changed,
+            }
+        }
+
+        e_ @ E::Vector(_, _, _, _) => {
+            let (n, ty, eargs) = match e_ {
+                E::Vector(_, n, ty, eargs) => (*n, ty, eargs),
+                _ => unreachable!(),
+            };
+            let changed = eargs.iter_mut().map(optimize_exp).any(|changed| changed);
+            if !is_valid_const_type(ty) {
+                return changed;
+            }
+            let mut vs = vec![];
+            for earg in eargs {
+                let eloc = earg.exp.loc;
+                if let Some(v) = foldable_exp(earg) {
+                    vs.push(sp(eloc, v));
+                } else {
+                    return changed;
+                }
+            }
+            debug_assert!(n == vs.len());
+            *e_ = evalue_(e.exp.loc, Value_::Vector(ty.clone(), vs));
+            true
+        }
+    }
+}
+
+fn is_valid_const_type(sp!(_, ty_): &BaseType) -> bool {
+    use BaseType_ as T;
+    match ty_ {
+        T::Apply(_, tn, ty_args) if is_valid_const_type_name(tn) => {
+            ty_args.iter().all(is_valid_const_type)
+        }
+        T::Apply(_, _, _) | T::Param(_) | T::Unreachable | T::UnresolvedError => false,
+    }
+}
+
+fn is_valid_const_type_name(sp!(_, tn_): &TypeName) -> bool {
+    use TypeName_ as T;
+    match tn_ {
+        T::Builtin(bt) => is_valid_const_builtin_type(bt),
+        T::ModuleType(_, _) => false,
+    }
+}
+
+fn is_valid_const_builtin_type(sp!(_, bt_): &BuiltinTypeName) -> bool {
+    use BuiltinTypeName_ as N;
+    match bt_ {
+        N::Address | N::U8 | N::U16 | N::U32 | N::U64 | N::U128 | N::U256 | N::Vector | N::Bool => {
+            true
+        }
+        N::Signer => false,
+    }
+}
+
+//**************************************************************************************************
+// Folding
+//**************************************************************************************************
+
+fn fold_unary_op(loc: Loc, sp!(_, op_): &UnaryOp, v: Value_) -> UnannotatedExp_ {
+    use UnaryOp_ as U;
+    use Value_ as V;
+    let folded = match (op_, v) {
+        (U::Not, V::Bool(b)) => V::Bool(!b),
+        (op_, v) => panic!("ICE unknown unary op. combo while folding: {} {:?}", op_, v),
+    };
+    evalue_(loc, folded)
+}
+
+fn fold_binary_op(
+    loc: Loc,
+    sp!(_, op_): &BinOp,
+    v1: Value_,
+    v2: Value_,
+) -> Option<UnannotatedExp_> {
+    use BinOp_ as B;
+    use Value_ as V;
+    let v = match (op_, v1, v2) {
+        //************************************
+        // Checked arith
+        //************************************
+        (B::Add, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_add(u2)?),
+        (B::Add, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_add(u2)?),
+        (B::Add, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_add(u2)?),
+        (B::Add, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_add(u2)?),
+        (B::Add, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_add(u2)?),
+        (B::Add, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_add(u2)?),
+
+        (B::Sub, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_sub(u2)?),
+        (B::Sub, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_sub(u2)?),
+        (B::Sub, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_sub(u2)?),
+        (B::Sub, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_sub(u2)?),
+        (B::Sub, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_sub(u2)?),
+        (B::Sub, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_sub(u2)?),
+
+        (B::Mul, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_mul(u2)?),
+        (B::Mul, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_mul(u2)?),
+        (B::Mul, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_mul(u2)?),
+        (B::Mul, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_mul(u2)?),
+        (B::Mul, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_mul(u2)?),
+        (B::Mul, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_mul(u2)?),
+
+        (B::Mod, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_rem(u2)?),
+        (B::Mod, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_rem(u2)?),
+        (B::Mod, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_rem(u2)?),
+        (B::Mod, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_rem(u2)?),
+        (B::Mod, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_rem(u2)?),
+        (B::Mod, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_rem(u2)?),
+
+        (B::Div, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_div(u2)?),
+        (B::Div, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_div(u2)?),
+        (B::Div, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_div(u2)?),
+        (B::Div, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_div(u2)?),
+        (B::Div, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_div(u2)?),
+        (B::Div, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_div(u2)?),
+
+        (B::Shl, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U16(u1), V::U8(u2)) => V::U16(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U32(u1), V::U8(u2)) => V::U32(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U64(u1), V::U8(u2)) => V::U64(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U128(u1), V::U8(u2)) => V::U128(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U256(u1), V::U8(u2)) => V::U256(u1.checked_shl(u2 as u32)?),
+
+        (B::Shr, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U16(u1), V::U8(u2)) => V::U16(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U32(u1), V::U8(u2)) => V::U32(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U64(u1), V::U8(u2)) => V::U64(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U128(u1), V::U8(u2)) => V::U128(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U256(u1), V::U8(u2)) => V::U256(u1.checked_shr(u2 as u32)?),
+
+        //************************************
+        // Pure arith
+        //************************************
+        (B::BitOr, V::U8(u1), V::U8(u2)) => V::U8(u1 | u2),
+        (B::BitOr, V::U16(u1), V::U16(u2)) => V::U16(u1 | u2),
+        (B::BitOr, V::U32(u1), V::U32(u2)) => V::U32(u1 | u2),
+        (B::BitOr, V::U64(u1), V::U64(u2)) => V::U64(u1 | u2),
+        (B::BitOr, V::U128(u1), V::U128(u2)) => V::U128(u1 | u2),
+        (B::BitOr, V::U256(u1), V::U256(u2)) => V::U256(u1 | u2),
+
+        (B::BitAnd, V::U8(u1), V::U8(u2)) => V::U8(u1 & u2),
+        (B::BitAnd, V::U16(u1), V::U16(u2)) => V::U16(u1 & u2),
+        (B::BitAnd, V::U32(u1), V::U32(u2)) => V::U32(u1 & u2),
+        (B::BitAnd, V::U64(u1), V::U64(u2)) => V::U64(u1 & u2),
+        (B::BitAnd, V::U128(u1), V::U128(u2)) => V::U128(u1 & u2),
+        (B::BitAnd, V::U256(u1), V::U256(u2)) => V::U256(u1 & u2),
+
+        (B::Xor, V::U8(u1), V::U8(u2)) => V::U8(u1 ^ u2),
+        (B::Xor, V::U16(u1), V::U16(u2)) => V::U16(u1 ^ u2),
+        (B::Xor, V::U32(u1), V::U32(u2)) => V::U32(u1 ^ u2),
+        (B::Xor, V::U64(u1), V::U64(u2)) => V::U64(u1 ^ u2),
+        (B::Xor, V::U128(u1), V::U128(u2)) => V::U128(u1 ^ u2),
+        (B::Xor, V::U256(u1), V::U256(u2)) => V::U256(u1 ^ u2),
+
+        //************************************
+        // Logical
+        //************************************
+        (B::And, V::Bool(b1), V::Bool(b2)) => V::Bool(b1 && b2),
+        (B::Or, V::Bool(b1), V::Bool(b2)) => V::Bool(b1 || b2),
+
+        //************************************
+        // Comparisons
+        //************************************
+        (B::Lt, V::U8(u1), V::U8(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U16(u1), V::U16(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U32(u1), V::U32(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U64(u1), V::U64(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U128(u1), V::U128(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U256(u1), V::U256(u2)) => V::Bool(u1 < u2),
+
+        (B::Gt, V::U8(u1), V::U8(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U16(u1), V::U16(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U32(u1), V::U32(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U64(u1), V::U64(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U128(u1), V::U128(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U256(u1), V::U256(u2)) => V::Bool(u1 > u2),
+
+        (B::Le, V::U8(u1), V::U8(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U16(u1), V::U16(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U32(u1), V::U32(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U64(u1), V::U64(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U128(u1), V::U128(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U256(u1), V::U256(u2)) => V::Bool(u1 <= u2),
+
+        (B::Ge, V::U8(u1), V::U8(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U16(u1), V::U16(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U32(u1), V::U32(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U64(u1), V::U64(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U128(u1), V::U128(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U256(u1), V::U256(u2)) => V::Bool(u1 >= u2),
+
+        (B::Eq, v1, v2) => V::Bool(v1 == v2),
+        (B::Neq, v1, v2) => V::Bool(v1 != v2),
+
+        (op_, v1, v2) => panic!(
+            "ICE unknown binary op. combo while folding: {:?} {} {:?}",
+            v1, op_, v2
+        ),
+    };
+    Some(evalue_(loc, v))
+}
+
+fn fold_cast(loc: Loc, sp!(_, bt_): &BuiltinTypeName, v: Value_) -> Option<UnannotatedExp_> {
+    use BuiltinTypeName_ as BT;
+    use Value_ as V;
+    let cast = match (bt_, v) {
+        (BT::U8, V::U8(u)) => V::U8(u),
+        (BT::U8, V::U16(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U32(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U64(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U128(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U256(u)) => V::U8(u8::try_from(u).ok()?),
+
+        (BT::U16, V::U8(u)) => V::U16(u as u16),
+        (BT::U16, V::U16(u)) => V::U16(u),
+        (BT::U16, V::U32(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U64(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U128(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U256(u)) => V::U16(u16::try_from(u).ok()?),
+
+        (BT::U32, V::U8(u)) => V::U32(u as u32),
+        (BT::U32, V::U16(u)) => V::U32(u as u32),
+        (BT::U32, V::U32(u)) => V::U32(u),
+        (BT::U32, V::U64(u)) => V::U32(u32::try_from(u).ok()?),
+        (BT::U32, V::U128(u)) => V::U32(u32::try_from(u).ok()?),
+        (BT::U32, V::U256(u)) => V::U32(u32::try_from(u).ok()?),
+
+        (BT::U64, V::U8(u)) => V::U64(u as u64),
+        (BT::U64, V::U16(u)) => V::U64(u as u64),
+        (BT::U64, V::U32(u)) => V::U64(u as u64),
+        (BT::U64, V::U64(u)) => V::U64(u),
+        (BT::U64, V::U128(u)) => V::U64(u64::try_from(u).ok()?),
+        (BT::U64, V::U256(u)) => V::U64(u64::try_from(u).ok()?),
+
+        (BT::U128, V::U8(u)) => V::U128(u as u128),
+        (BT::U128, V::U16(u)) => V::U128(u as u128),
+        (BT::U128, V::U32(u)) => V::U128(u as u128),
+        (BT::U128, V::U64(u)) => V::U128(u as u128),
+        (BT::U128, V::U128(u)) => V::U128(u),
+        (BT::U128, V::U256(u)) => V::U128(u128::try_from(u).ok()?),
+
+        (BT::U256, V::U8(u)) => V::U256(u.into()),
+        (BT::U256, V::U16(u)) => V::U256(u.into()),
+        (BT::U256, V::U32(u)) => V::U256(u.into()),
+        (BT::U256, V::U64(u)) => V::U256(u.into()),
+        (BT::U256, V::U128(u)) => V::U256(u.into()),
+        (BT::U256, V::U256(u)) => V::U256(u),
+        (_, v) => panic!("ICE unexpected cast while folding: {:?} as {:?}", v, bt_),
+    };
+    Some(evalue_(loc, cast))
+}
+
+const fn evalue_(loc: Loc, v: Value_) -> UnannotatedExp_ {
+    use UnannotatedExp_ as E;
+    E::Value(sp(loc, v))
+}
+
+//**************************************************************************************************
+// Foldable Value
+//**************************************************************************************************
+
+fn foldable_exp(e: &Exp) -> Option<Value_> {
+    use UnannotatedExp_ as E;
+    match &e.exp.value {
+        E::Value(sp!(_, v_)) => Some(v_.clone()),
+        _ => None,
+    }
+}
+
+fn ignorable_exp(e: &Exp) -> bool {
+    use UnannotatedExp_ as E;
+    match &e.exp.value {
+        E::Unit { .. } => true,
+        E::Value(_) => true,
+        E::Multiple(es) => es.iter().all(ignorable_exp),
+        _ => false,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/optimize/eliminate_locals.rs b/vendors/move/crates/move-compiler/src/cfgir/optimize/eliminate_locals.rs
new file mode 100644
index 000000000..ba5ac7721
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/optimize/eliminate_locals.rs
@@ -0,0 +1,441 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::{cfg::MutForwardCFG, remove_no_ops},
+    hlir::ast::{FunctionSignature, SingleType, Value, Var},
+    parser,
+    shared::unique_map::UniqueMap,
+};
+use std::collections::BTreeSet;
+
+/// returns true if anything changed
+pub fn optimize(
+    signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    _constants: &UniqueMap<parser::ast::ConstantName, Value>,
+    cfg: &mut MutForwardCFG,
+) -> bool {
+    let changed = remove_no_ops::optimize(cfg);
+    let ssa_temps = {
+        let s = count(signature, cfg);
+        if s.is_empty() {
+            return changed;
+        }
+        s
+    };
+
+    // `eliminate` always removes if `ssa_temps` is not empty
+    eliminate(cfg, ssa_temps);
+    remove_no_ops::optimize(cfg);
+    true
+}
+
+//**************************************************************************************************
+// Count assignment and usage
+//**************************************************************************************************
+
+fn count(signature: &FunctionSignature, cfg: &MutForwardCFG) -> BTreeSet<Var> {
+    let mut context = count::Context::new(signature);
+    for block in cfg.blocks().values() {
+        for cmd in block {
+            count::command(&mut context, cmd)
+        }
+    }
+    context.finish()
+}
+
+mod count {
+    use crate::{
+        hlir::ast::{FunctionSignature, *},
+        parser::ast::{BinOp, UnaryOp},
+    };
+    use std::collections::{BTreeMap, BTreeSet};
+
+    pub struct Context {
+        assigned: BTreeMap<Var, Option<usize>>,
+        used: BTreeMap<Var, Option<usize>>,
+    }
+
+    impl Context {
+        pub fn new(signature: &FunctionSignature) -> Self {
+            let mut ctx = Context {
+                assigned: BTreeMap::new(),
+                used: BTreeMap::new(),
+            };
+            for (v, _) in &signature.parameters {
+                ctx.assign(v, false);
+            }
+            ctx
+        }
+
+        fn assign(&mut self, var: &Var, substitutable: bool) {
+            if !substitutable {
+                self.assigned.insert(*var, None);
+                return;
+            }
+
+            if let Some(count) = self.assigned.entry(*var).or_insert_with(|| Some(0)) {
+                *count += 1
+            }
+        }
+
+        fn used(&mut self, var: &Var, substitutable: bool) {
+            if !substitutable {
+                self.used.insert(*var, None);
+                return;
+            }
+
+            if let Some(count) = self.used.entry(*var).or_insert_with(|| Some(0)) {
+                *count += 1
+            }
+        }
+
+        pub fn finish(self) -> BTreeSet<Var> {
+            let Context { assigned, used } = self;
+            assigned
+                .into_iter()
+                .filter(|(_v, count)| count.map(|c| c == 1).unwrap_or(false))
+                .map(|(v, _count)| v)
+                .filter(|v| {
+                    used.get(v)
+                        .unwrap_or(&None)
+                        .map(|c| c == 1)
+                        .unwrap_or(false)
+                })
+                .collect()
+        }
+    }
+
+    pub fn command(context: &mut Context, sp!(_, cmd_): &Command) {
+        use Command_ as C;
+        match cmd_ {
+            C::Assign(ls, e) => {
+                exp(context, e);
+                let substitutable_rvalues = can_subst_exp(ls.len(), e);
+                lvalues(context, ls, substitutable_rvalues);
+            }
+            C::Mutate(el, er) => {
+                exp(context, er);
+                exp(context, el)
+            }
+            C::Return { exp: e, .. }
+            | C::Abort(e)
+            | C::IgnoreAndPop { exp: e, .. }
+            | C::JumpIf { cond: e, .. } => exp(context, e),
+
+            C::Jump { .. } => (),
+            C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+        }
+    }
+
+    fn lvalues(context: &mut Context, ls: &[LValue], substitutable_rvalues: Vec<bool>) {
+        assert!(ls.len() == substitutable_rvalues.len());
+        ls.iter()
+            .zip(substitutable_rvalues)
+            .for_each(|(l, substitutable)| lvalue(context, l, substitutable))
+    }
+
+    fn lvalue(context: &mut Context, sp!(_, l_): &LValue, substitutable: bool) {
+        use LValue_ as L;
+        match l_ {
+            L::Ignore | L::Unpack(_, _, _) => (),
+            L::Var(v, _) => context.assign(v, substitutable),
+        }
+    }
+
+    fn exp(context: &mut Context, parent_e: &Exp) {
+        use UnannotatedExp_ as E;
+        match &parent_e.exp.value {
+            E::Unit { .. } | E::Value(_) | E::Constant(_) | E::UnresolvedError => (),
+            E::Spec(_, used_locals) => {
+                used_locals.keys().for_each(|var| context.used(var, false));
+            }
+
+            E::BorrowLocal(_, var) => context.used(var, false),
+
+            E::Copy { var, .. } | E::Move { var, .. } => context.used(var, true),
+
+            E::ModuleCall(mcall) => {
+                for arg in &mcall.arguments {
+                    exp(context, arg);
+                }
+            }
+            E::Vector(_, _, _, args) => {
+                for arg in args.iter() {
+                    exp(context, arg);
+                }
+            }
+
+            E::Freeze(e)
+            | E::Dereference(e)
+            | E::UnaryExp(_, e)
+            | E::Borrow(_, e, _, _)
+            | E::Cast(e, _) => exp(context, e),
+
+            E::BinopExp(e1, _, e2) => {
+                exp(context, e1);
+                exp(context, e2)
+            }
+
+            E::Pack(_, _, fields) => fields.iter().for_each(|(_, _, e)| exp(context, e)),
+
+            E::Multiple(es) => es.iter().for_each(|e| exp(context, e)),
+
+            E::Unreachable => panic!("ICE should not analyze dead code"),
+        }
+    }
+
+    fn can_subst_exp(lvalue_len: usize, exp: &Exp) -> Vec<bool> {
+        use UnannotatedExp_ as E;
+        match (lvalue_len, &exp.exp.value) {
+            (0, _) => vec![],
+            (1, _) => vec![can_subst_exp_single(exp)],
+            (_, E::Multiple(es)) => es.iter().map(can_subst_exp_single).collect(),
+            (_, _) => (0..lvalue_len).map(|_| false).collect(),
+        }
+    }
+
+    fn can_subst_exp_single(parent_e: &Exp) -> bool {
+        use UnannotatedExp_ as E;
+        match &parent_e.exp.value {
+            E::UnresolvedError
+            | E::Spec(_, _)
+            | E::BorrowLocal(_, _)
+            | E::Copy { .. }
+            | E::Freeze(_)
+            | E::Dereference(_)
+            | E::ModuleCall(_)
+            | E::Move { .. }
+            | E::Borrow(_, _, _, _) => false,
+
+            E::Unit { .. } | E::Value(_) | E::Constant(_) => true,
+
+            E::Cast(e, _) => can_subst_exp_single(e),
+            E::UnaryExp(op, e) => can_subst_exp_unary(op) && can_subst_exp_single(e),
+            E::BinopExp(e1, op, e2) => {
+                can_subst_exp_binary(op) && can_subst_exp_single(e1) && can_subst_exp_single(e2)
+            }
+            E::Multiple(es) => es.iter().all(can_subst_exp_single),
+            E::Pack(_, _, fields) => fields.iter().all(|(_, _, e)| can_subst_exp_single(e)),
+            E::Vector(_, _, _, eargs) => eargs.iter().all(can_subst_exp_single),
+
+            E::Unreachable => panic!("ICE should not analyze dead code"),
+        }
+    }
+
+    fn can_subst_exp_unary(sp!(_, op_): &UnaryOp) -> bool {
+        op_.is_pure()
+    }
+
+    fn can_subst_exp_binary(sp!(_, op_): &BinOp) -> bool {
+        op_.is_pure()
+    }
+}
+
+//**************************************************************************************************
+// Eliminate
+//**************************************************************************************************
+
+fn eliminate(cfg: &mut MutForwardCFG, ssa_temps: BTreeSet<Var>) {
+    let context = &mut eliminate::Context::new(ssa_temps);
+    loop {
+        for block in cfg.blocks_mut().values_mut() {
+            for cmd in block {
+                eliminate::command(context, cmd)
+            }
+        }
+        if context.finished() {
+            return;
+        }
+    }
+}
+
+mod eliminate {
+    use crate::hlir::ast::{self as H, *};
+    use move_ir_types::location::*;
+    use std::collections::{BTreeMap, BTreeSet};
+
+    pub struct Context {
+        eliminated: BTreeMap<Var, Exp>,
+        ssa_temps: BTreeSet<Var>,
+    }
+
+    impl Context {
+        pub fn new(ssa_temps: BTreeSet<Var>) -> Self {
+            Context {
+                ssa_temps,
+                eliminated: BTreeMap::new(),
+            }
+        }
+
+        pub fn finished(&self) -> bool {
+            self.eliminated.is_empty() && self.ssa_temps.is_empty()
+        }
+    }
+
+    pub fn command(context: &mut Context, sp!(_, cmd_): &mut Command) {
+        use Command_ as C;
+        match cmd_ {
+            C::Assign(ls, e) => {
+                exp(context, e);
+                let eliminated = lvalues(context, ls);
+                remove_eliminated(context, eliminated, e)
+            }
+            C::Mutate(el, er) => {
+                exp(context, er);
+                exp(context, el)
+            }
+            C::Return { exp: e, .. }
+            | C::Abort(e)
+            | C::IgnoreAndPop { exp: e, .. }
+            | C::JumpIf { cond: e, .. } => exp(context, e),
+
+            C::Jump { .. } => (),
+            C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+        }
+    }
+
+    enum LRes {
+        Same(LValue),
+        Elim(Var),
+    }
+
+    fn lvalues(context: &mut Context, ls: &mut Vec<LValue>) -> Vec<Option<Var>> {
+        let old = std::mem::take(ls);
+        old.into_iter()
+            .map(|l| match lvalue(context, l) {
+                LRes::Same(lvalue) => {
+                    ls.push(lvalue);
+                    None
+                }
+                LRes::Elim(v) => Some(v),
+            })
+            .collect()
+    }
+
+    fn lvalue(context: &mut Context, sp!(loc, l_): LValue) -> LRes {
+        use LValue_ as L;
+        match l_ {
+            l_ @ L::Ignore | l_ @ L::Unpack(_, _, _) => LRes::Same(sp(loc, l_)),
+            L::Var(v, t) => {
+                let contained = context.ssa_temps.remove(&v);
+                if contained {
+                    LRes::Elim(v)
+                } else {
+                    LRes::Same(sp(loc, L::Var(v, t)))
+                }
+            }
+        }
+    }
+
+    fn exp(context: &mut Context, parent_e: &mut Exp) {
+        use UnannotatedExp_ as E;
+        match &mut parent_e.exp.value {
+            E::Copy { var, .. } | E::Move { var, .. } => {
+                if let Some(replacement) = context.eliminated.remove(var) {
+                    *parent_e = replacement
+                }
+            }
+
+            E::Unit { .. }
+            | E::Value(_)
+            | E::Constant(_)
+            | E::Spec(_, _)
+            | E::UnresolvedError
+            | E::BorrowLocal(_, _) => (),
+
+            E::ModuleCall(mcall) => {
+                for arg in mcall.arguments.iter_mut() {
+                    exp(context, arg);
+                }
+            }
+            E::Vector(_, _, _, args) => {
+                for arg in args.iter_mut() {
+                    exp(context, arg);
+                }
+            }
+            E::Freeze(e)
+            | E::Dereference(e)
+            | E::UnaryExp(_, e)
+            | E::Borrow(_, e, _, _)
+            | E::Cast(e, _) => exp(context, e),
+
+            E::BinopExp(e1, _, e2) => {
+                exp(context, e1);
+                exp(context, e2)
+            }
+
+            E::Pack(_, _, fields) => fields.iter_mut().for_each(|(_, _, e)| exp(context, e)),
+
+            E::Multiple(es) => es.iter_mut().for_each(|e| exp(context, e)),
+
+            E::Unreachable => panic!("ICE should not analyze dead code"),
+        }
+    }
+
+    fn remove_eliminated(context: &mut Context, mut eliminated: Vec<Option<Var>>, e: &mut Exp) {
+        if eliminated.iter().all(|opt| opt.is_none()) {
+            return;
+        }
+
+        match eliminated.len() {
+            0 => (),
+            1 => remove_eliminated_single(context, eliminated.pop().unwrap().unwrap(), e),
+            _ => {
+                let tys = match &mut e.ty.value {
+                    Type_::Multiple(tys) => tys,
+                    _ => panic!("ICE local elimination type mismatch"),
+                };
+                let es = match &mut e.exp.value {
+                    UnannotatedExp_::Multiple(es) => es,
+                    _ => panic!("ICE local elimination type mismatch"),
+                };
+                let old_tys = std::mem::take(tys);
+                let old_es = std::mem::take(es);
+                for ((mut e, ty), elim_opt) in old_es.into_iter().zip(old_tys).zip(eliminated) {
+                    match elim_opt {
+                        None => {
+                            tys.push(ty);
+                            es.push(e)
+                        }
+                        Some(v) => {
+                            remove_eliminated_single(context, v, &mut e);
+                            match &e.ty.value {
+                                Type_::Unit => (),
+                                Type_::Single(_) => {
+                                    tys.push(ty);
+                                    es.push(e)
+                                }
+                                Type_::Multiple(_) => {
+                                    panic!("ICE local elimination replacement type mismatch")
+                                }
+                            }
+                        }
+                    }
+                }
+                if es.is_empty() {
+                    *e = unit(e.exp.loc)
+                }
+            }
+        }
+    }
+
+    fn remove_eliminated_single(context: &mut Context, v: Var, e: &mut Exp) {
+        let old = std::mem::replace(e, unit(e.exp.loc));
+        context.eliminated.insert(v, old);
+    }
+
+    fn unit(loc: Loc) -> Exp {
+        H::exp(
+            sp(loc, Type_::Unit),
+            sp(
+                loc,
+                UnannotatedExp_::Unit {
+                    case: UnitCase::Implicit,
+                },
+            ),
+        )
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/optimize/inline_blocks.rs b/vendors/move/crates/move-compiler/src/cfgir/optimize/inline_blocks.rs
new file mode 100644
index 000000000..7c10d4617
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/optimize/inline_blocks.rs
@@ -0,0 +1,142 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::{
+        ast::remap_labels,
+        cfg::{MutForwardCFG, CFG},
+    },
+    hlir::ast::{BasicBlocks, Command_, FunctionSignature, Label, SingleType, Value, Var},
+    parser::ast::ConstantName,
+    shared::unique_map::UniqueMap,
+};
+use std::collections::{BTreeMap, BTreeSet};
+
+/// returns true if anything changed
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    _constants: &UniqueMap<ConstantName, Value>,
+    cfg: &mut MutForwardCFG,
+) -> bool {
+    let changed = optimize_(cfg.start_block(), cfg.blocks_mut());
+    if changed {
+        let dead_blocks = cfg.recompute();
+        assert!(dead_blocks.is_empty())
+    }
+    changed
+}
+
+fn optimize_(start: Label, blocks: &mut BasicBlocks) -> bool {
+    let single_target_labels = find_single_target_labels(start, blocks);
+    inline_single_target_blocks(&single_target_labels, start, blocks)
+}
+
+fn find_single_target_labels(start: Label, blocks: &BasicBlocks) -> BTreeSet<Label> {
+    use Command_ as C;
+    let mut counts = BTreeMap::new();
+    // 'start' block starts as one as it is the entry point of the function. In some sense,
+    // there is an implicit "jump" to this label to begin executing the function
+    counts.insert(start, 1);
+    for block in blocks.values() {
+        match &block.back().unwrap().value {
+            C::JumpIf {
+                cond: _cond,
+                if_true,
+                if_false,
+            } => {
+                *counts.entry(*if_true).or_insert(0) += 1;
+                *counts.entry(*if_false).or_insert(0) += 1
+            }
+            C::Jump { target, .. } => *counts.entry(*target).or_insert(0) += 1,
+            _ => (),
+        }
+    }
+    counts
+        .into_iter()
+        .filter(|(_, count)| *count == 1)
+        .map(|(lbl, _)| lbl)
+        .collect()
+}
+
+#[allow(clippy::needless_collect)]
+fn inline_single_target_blocks(
+    single_jump_targets: &BTreeSet<Label>,
+    start: Label,
+    blocks: &mut BasicBlocks,
+) -> bool {
+    //cleanup of needless_collect would result in mut and non mut borrows, and compilation warning.
+    let labels_vec = blocks.keys().cloned().collect::<Vec<_>>();
+    let mut labels = labels_vec.into_iter();
+    let mut next = labels.next();
+
+    let mut working_blocks = std::mem::take(blocks);
+    let finished_blocks = blocks;
+
+    let mut remapping = BTreeMap::new();
+    while let Some(cur) = next {
+        let mut block = match working_blocks.remove(&cur) {
+            None => {
+                next = labels.next();
+                continue;
+            }
+            Some(b) => b,
+        };
+
+        match block.back().unwrap() {
+            // Do not need to worry about infinitely unwrapping loops as loop heads will always
+            // be the target of at least 2 jumps: the jump to the loop and the "continue" jump
+            // This is always true as long as we start the count for the start label at 1
+            sp!(_, Command_::Jump { target, .. }) if single_jump_targets.contains(target) => {
+                remapping.insert(cur, *target);
+                let target_block = working_blocks.remove(target).unwrap();
+                block.pop_back();
+                block.extend(target_block);
+                working_blocks.insert(cur, block);
+            }
+            _ => {
+                finished_blocks.insert(cur, block);
+                next = labels.next();
+            }
+        }
+    }
+
+    let changed = !remapping.is_empty();
+    remap_to_last_target(remapping, start, finished_blocks);
+    changed
+}
+
+/// In order to preserve loop invariants at the bytecode level, when a block is "inlined", that
+/// block needs to be relabelled as the "inlined" block
+/// Without this, blocks that were outside of loops could be inlined into the loop-body, breaking
+/// invariants needed at the bytecode level.
+/// For example:
+/// Before:
+///   A: block_a; jump B
+///   B: block_b
+///
+///   s.t. A is the only one jumping to B
+///
+/// After:
+///   B: block_a; block_b
+fn remap_to_last_target(
+    mut remapping: BTreeMap<Label, Label>,
+    start: Label,
+    blocks: &mut BasicBlocks,
+) {
+    // The start block can't be relabelled in the current CFG API.
+    // But it does not need to be since it will always be the first block, thus it will not run
+    // into issues in the bytecode verifier
+    remapping.remove(&start);
+    if remapping.is_empty() {
+        return;
+    }
+    // populate remapping for non changed blocks
+    for label in blocks.keys() {
+        remapping.entry(*label).or_insert(*label);
+    }
+    let owned_blocks = std::mem::take(blocks);
+    let (_start, remapped_blocks) = remap_labels(&remapping, start, owned_blocks);
+    *blocks = remapped_blocks;
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/optimize/mod.rs b/vendors/move/crates/move-compiler/src/cfgir/optimize/mod.rs
new file mode 100644
index 000000000..5059cbdcc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/optimize/mod.rs
@@ -0,0 +1,50 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod constant_fold;
+mod eliminate_locals;
+mod inline_blocks;
+mod simplify_jumps;
+
+use crate::{
+    cfgir::cfg::MutForwardCFG, hlir::ast::*, parser::ast::ConstantName,
+    shared::unique_map::UniqueMap,
+};
+
+pub type Optimization = fn(
+    &FunctionSignature,
+    &UniqueMap<Var, SingleType>,
+    &UniqueMap<ConstantName, Value>,
+    &mut MutForwardCFG,
+) -> bool;
+
+const OPTIMIZATIONS: &[Optimization] = &[
+    eliminate_locals::optimize,
+    constant_fold::optimize,
+    simplify_jumps::optimize,
+    inline_blocks::optimize,
+];
+
+pub fn optimize(
+    signature: &FunctionSignature,
+    locals: &UniqueMap<Var, SingleType>,
+    constants: &UniqueMap<ConstantName, Value>,
+    cfg: &mut MutForwardCFG,
+) {
+    let mut count = 0;
+    for optimization in OPTIMIZATIONS.iter().cycle() {
+        // if we have fully cycled through the list of optimizations without a change,
+        // it is safe to stop
+        if count >= OPTIMIZATIONS.len() {
+            debug_assert_eq!(count, OPTIMIZATIONS.len());
+            break;
+        }
+
+        // reset the count if something has changed
+        if optimization(signature, locals, constants, cfg) {
+            count = 0
+        } else {
+            count += 1
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/optimize/simplify_jumps.rs b/vendors/move/crates/move-compiler/src/cfgir/optimize/simplify_jumps.rs
new file mode 100644
index 000000000..5eaca445f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/optimize/simplify_jumps.rs
@@ -0,0 +1,56 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::cfg::MutForwardCFG,
+    hlir::ast::{
+        Command, Command_, Exp, FunctionSignature, SingleType, UnannotatedExp_, Value, Value_, Var,
+    },
+    parser::ast::ConstantName,
+    shared::unique_map::UniqueMap,
+};
+
+/// returns true if anything changed
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    _constants: &UniqueMap<ConstantName, Value>,
+    cfg: &mut MutForwardCFG,
+) -> bool {
+    let mut changed = false;
+    for block in cfg.blocks_mut().values_mut() {
+        for cmd in block {
+            changed = optimize_cmd(cmd) || changed;
+        }
+    }
+    if changed {
+        let _dead_blocks = cfg.recompute();
+    }
+    changed
+}
+
+fn optimize_cmd(sp!(_, cmd_): &mut Command) -> bool {
+    use Command_ as C;
+    use UnannotatedExp_ as E;
+    use Value_ as V;
+    match cmd_ {
+        C::JumpIf {
+            cond:
+                Exp {
+                    exp: sp!(_, E::Value(sp!(_, V::Bool(cond)))),
+                    ..
+                },
+            if_true,
+            if_false,
+        } => {
+            let lbl = if *cond { *if_true } else { *if_false };
+            *cmd_ = C::Jump {
+                target: lbl,
+                from_user: false,
+            };
+            true
+        }
+        _ => false,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/remove_no_ops.rs b/vendors/move/crates/move-compiler/src/cfgir/remove_no_ops.rs
new file mode 100644
index 000000000..82a9ea1ea
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/remove_no_ops.rs
@@ -0,0 +1,20 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{ast::*, cfg::MutForwardCFG};
+
+/// Returns true if anything changed
+pub fn optimize(cfg: &mut MutForwardCFG) -> bool {
+    let mut changed = false;
+    for block in cfg.blocks_mut().values_mut() {
+        let old_block = std::mem::take(block);
+        let old_len = old_block.len();
+        *block = old_block
+            .into_iter()
+            .filter(|c| !c.value.is_unit())
+            .collect::<BasicBlock>();
+        changed = changed || old_len != block.len();
+    }
+    changed
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/translate.rs b/vendors/move/crates/move-compiler/src/cfgir/translate.rs
new file mode 100644
index 000000000..d5db8f536
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/translate.rs
@@ -0,0 +1,972 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::{
+        self,
+        ast::{self as G, BasicBlock, BasicBlocks, BlockInfo},
+        cfg::{ImmForwardCFG, MutForwardCFG},
+    },
+    diag,
+    diagnostics::Diagnostics,
+    expansion::ast::{AbilitySet, ModuleIdent},
+    hlir::ast::{self as H, Label, Value, Value_, Var},
+    parser::ast::{ConstantName, FunctionName, StructName},
+    shared::{unique_map::UniqueMap, CompilationEnv},
+    FullyCompiledProgram,
+};
+use cfgir::ast::LoopInfo;
+use move_core_types::{account_address::AccountAddress as MoveAddress, runtime_value::MoveValue};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use petgraph::{
+    algo::{kosaraju_scc as petgraph_scc, toposort as petgraph_toposort},
+    graphmap::DiGraphMap,
+};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    mem,
+};
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+    struct_declared_abilities: UniqueMap<ModuleIdent, UniqueMap<StructName, AbilitySet>>,
+    start: Option<Label>,
+    loop_begin: Option<Label>,
+    loop_end: Option<Label>,
+    next_label: Option<Label>,
+    label_count: usize,
+    blocks: BasicBlocks,
+    block_ordering: BTreeMap<Label, usize>,
+    // Used for populating block_info
+    loop_bounds: BTreeMap<Label, G::LoopInfo>,
+    block_info: Vec<(Label, BlockInfo)>,
+}
+
+impl<'env> Context<'env> {
+    pub fn new(
+        env: &'env mut CompilationEnv,
+        pre_compiled_lib: Option<&FullyCompiledProgram>,
+        modules: &UniqueMap<ModuleIdent, H::ModuleDefinition>,
+    ) -> Self {
+        let all_modules = modules
+            .key_cloned_iter()
+            .chain(pre_compiled_lib.iter().flat_map(|pre_compiled| {
+                pre_compiled
+                    .hlir
+                    .modules
+                    .key_cloned_iter()
+                    .filter(|(mident, _m)| !modules.contains_key(mident))
+            }));
+        let struct_declared_abilities = UniqueMap::maybe_from_iter(
+            all_modules
+                .map(|(m, mdef)| (m, mdef.structs.ref_map(|_s, sdef| sdef.abilities.clone()))),
+        )
+        .unwrap();
+        Context {
+            env,
+            struct_declared_abilities,
+            next_label: None,
+            loop_begin: None,
+            loop_end: None,
+            start: None,
+            label_count: 0,
+            blocks: BasicBlocks::new(),
+            block_ordering: BTreeMap::new(),
+            block_info: vec![],
+            loop_bounds: BTreeMap::new(),
+        }
+    }
+
+    fn new_label(&mut self) -> Label {
+        let count = self.label_count;
+        self.label_count += 1;
+        Label(count)
+    }
+
+    fn insert_block(&mut self, lbl: Label, basic_block: BasicBlock) {
+        assert!(self.block_ordering.insert(lbl, self.blocks.len()).is_none());
+        assert!(self.blocks.insert(lbl, basic_block).is_none());
+        let block_info = match self.loop_bounds.get(&lbl) {
+            None => BlockInfo::Other,
+            Some(info) => BlockInfo::LoopHead(*info),
+        };
+        self.block_info.push((lbl, block_info));
+    }
+
+    // Returns the blocks inserted in insertion ordering
+    pub fn finish_blocks(&mut self) -> (Label, BasicBlocks, Vec<(Label, BlockInfo)>) {
+        self.next_label = None;
+        let start = self.start.take();
+        let blocks = mem::take(&mut self.blocks);
+        let block_ordering = mem::take(&mut self.block_ordering);
+        let block_info = mem::take(&mut self.block_info);
+        self.loop_bounds = BTreeMap::new();
+        self.label_count = 0;
+        self.loop_begin = None;
+        self.loop_end = None;
+
+        // Blocks will eventually be ordered and outputted to bytecode the label. But labels are
+        // initially created depth first
+        // So the labels need to be remapped based on the insertion order of the block
+        // This preserves the original layout of the code as specified by the user (since code is
+        // finshed+inserted into the map in original code order)
+        let remapping = block_ordering
+            .into_iter()
+            .map(|(lbl, ordering)| (lbl, Label(ordering)))
+            .collect();
+        let (start, blocks) = G::remap_labels(&remapping, start.unwrap(), blocks);
+        let block_info = block_info
+            .into_iter()
+            .map(|(lbl, info)| {
+                let info = match info {
+                    BlockInfo::Other => BlockInfo::Other,
+                    BlockInfo::LoopHead(G::LoopInfo {
+                        is_loop_stmt,
+                        loop_end,
+                    }) => {
+                        let loop_end = match loop_end {
+                            G::LoopEnd::Unused => G::LoopEnd::Unused,
+                            G::LoopEnd::Target(end) if remapping.contains_key(&end) => {
+                                G::LoopEnd::Target(remapping[&end])
+                            }
+                            G::LoopEnd::Target(_end) => G::LoopEnd::Unused,
+                        };
+                        BlockInfo::LoopHead(G::LoopInfo {
+                            is_loop_stmt,
+                            loop_end,
+                        })
+                    }
+                };
+                (remapping[&lbl], info)
+            })
+            .collect();
+        (start, blocks, block_info)
+    }
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: H::Program,
+) -> G::Program {
+    let H::Program {
+        modules: hmodules,
+        scripts: hscripts,
+    } = prog;
+
+    let mut context = Context::new(compilation_env, pre_compiled_lib, &hmodules);
+
+    let modules = modules(&mut context, hmodules);
+    let scripts = scripts(&mut context, hscripts);
+
+    let program = G::Program { modules, scripts };
+    visit_program(&mut context, &program);
+    program
+}
+
+fn modules(
+    context: &mut Context,
+    hmodules: UniqueMap<ModuleIdent, H::ModuleDefinition>,
+) -> UniqueMap<ModuleIdent, G::ModuleDefinition> {
+    let modules = hmodules
+        .into_iter()
+        .map(|(mname, m)| module(context, mname, m));
+    UniqueMap::maybe_from_iter(modules).unwrap()
+}
+
+fn module(
+    context: &mut Context,
+    module_ident: ModuleIdent,
+    mdef: H::ModuleDefinition,
+) -> (ModuleIdent, G::ModuleDefinition) {
+    let H::ModuleDefinition {
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        dependency_order,
+        friends,
+        structs,
+        functions: hfunctions,
+        constants: hconstants,
+    } = mdef;
+
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let constants = constants(context, Some(module_ident), hconstants);
+    let functions = hfunctions.map(|name, f| function(context, Some(module_ident), name, f));
+    context.env.pop_warning_filter_scope();
+    (
+        module_ident,
+        G::ModuleDefinition {
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            dependency_order,
+            friends,
+            structs,
+            constants,
+            functions,
+        },
+    )
+}
+
+fn scripts(
+    context: &mut Context,
+    hscripts: BTreeMap<Symbol, H::Script>,
+) -> BTreeMap<Symbol, G::Script> {
+    hscripts
+        .into_iter()
+        .map(|(n, s)| (n, script(context, s)))
+        .collect()
+}
+
+fn script(context: &mut Context, hscript: H::Script) -> G::Script {
+    let H::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        constants: hconstants,
+        function_name,
+        function: hfunction,
+    } = hscript;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let constants = constants(context, None, hconstants);
+    let function = function(context, None, function_name, hfunction);
+    context.env.pop_warning_filter_scope();
+    G::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        constants,
+        function_name,
+        function,
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn constants(
+    context: &mut Context,
+    module: Option<ModuleIdent>,
+    mut consts: UniqueMap<ConstantName, H::Constant>,
+) -> UniqueMap<ConstantName, G::Constant> {
+    // Traverse the constants and compute the dependency graph between constants: if one mentions
+    // another, an edge is added between them.
+    let mut graph = DiGraphMap::new();
+    for (name, constant) in consts.key_cloned_iter() {
+        let deps = dependent_constants(constant);
+        if deps.is_empty() {
+            graph.add_node(name);
+        } else {
+            for dep in deps {
+                graph.add_edge(dep, name, ());
+            }
+        }
+    }
+
+    // report any cycles we find
+    let sccs = petgraph_scc(&graph);
+    let mut cycle_nodes = BTreeSet::new();
+    for scc in sccs {
+        if scc.len() > 1 {
+            let names = scc
+                .iter()
+                .map(|name| name.to_string())
+                .collect::<Vec<_>>()
+                .join(", ");
+            let mut diag = diag!(
+                BytecodeGeneration::UnfoldableConstant,
+                (
+                    *consts.get_loc(&scc[0]).unwrap(),
+                    format!("Constant definitions form a circular dependency: {}", names),
+                )
+            );
+            for name in scc.iter().skip(1) {
+                diag.add_secondary_label((
+                    *consts.get_loc(name).unwrap(),
+                    "Cyclic constant defined here",
+                ));
+            }
+            context.env.add_diag(diag);
+            cycle_nodes.append(&mut scc.into_iter().collect());
+        }
+    }
+    // report any node that relies on a node in a cycle but is not iself part of that cycle
+    for cycle_node in cycle_nodes.iter() {
+        // petgraph retains edges for nodes that have been deleted, so we ensure the node is not
+        // part of a cyclle _and_ it's still in the graph
+        let neighbors: Vec<_> = graph
+            .neighbors(*cycle_node)
+            .filter(|node| !cycle_nodes.contains(node) && graph.contains_node(*node))
+            .collect();
+        for node in neighbors {
+            context.env.add_diag(diag!(
+                BytecodeGeneration::UnfoldableConstant,
+                (
+                    *consts.get_loc(&node).unwrap(),
+                    format!(
+                        "Constant uses constant {}, which has a circular dependency",
+                        cycle_node
+                    )
+                )
+            ));
+            graph.remove_node(node);
+        }
+        graph.remove_node(*cycle_node);
+    }
+
+    // Finally, iterate the remaining constants in dependency order, inlining them into each other
+    // via the constant folding optimizer as we process them.
+
+    // petgraph will include nodes in the toposort that only appear in an edge, even if that node
+    // has been removed from the graph, so we filter down to only the remaining nodes
+    let remaining_nodes: BTreeSet<_> = graph.nodes().collect();
+    let sorted: Vec<_> = petgraph_toposort(&graph, None)
+        .expect("ICE concstant cycles not removed")
+        .into_iter()
+        .filter(|node| remaining_nodes.contains(node))
+        .collect();
+
+    let mut out_map = UniqueMap::new();
+    let mut constant_values = UniqueMap::new();
+    for constant_name in sorted.into_iter() {
+        let cdef = consts.remove(&constant_name).unwrap();
+        let new_cdef = constant(context, &mut constant_values, module, constant_name, cdef);
+        out_map
+            .add(constant_name, new_cdef)
+            .expect("ICE constant name collision");
+    }
+
+    out_map
+}
+
+fn dependent_constants(constant: &H::Constant) -> BTreeSet<ConstantName> {
+    fn dep_exp(set: &mut BTreeSet<ConstantName>, exp: &H::Exp) {
+        use H::UnannotatedExp_ as E;
+        match &exp.exp.value {
+            E::UnresolvedError
+            | E::Unreachable
+            | E::Unit { .. }
+            | E::Value(_)
+            | E::Move { .. }
+            | E::Copy { .. } => (),
+            E::UnaryExp(_, rhs) => dep_exp(set, rhs),
+            E::BinopExp(lhs, _, rhs) => {
+                dep_exp(set, lhs);
+                dep_exp(set, rhs)
+            }
+            E::Cast(base, _) => dep_exp(set, base),
+            E::Vector(_, _, _, args) | E::Multiple(args) => {
+                for arg in args {
+                    dep_exp(set, arg);
+                }
+            }
+            E::Constant(c) => {
+                set.insert(*c);
+            }
+            _ => panic!("ICE typing should have rejected exp in const"),
+        }
+    }
+
+    fn dep_cmd(set: &mut BTreeSet<ConstantName>, command: &H::Command_) {
+        use H::Command_ as C;
+        match command {
+            C::IgnoreAndPop { exp, .. } => dep_exp(set, exp),
+            C::Return { exp, .. } => dep_exp(set, exp),
+            C::Abort(exp) | C::Assign(_, exp) => dep_exp(set, exp),
+            C::Mutate(lhs, rhs) => {
+                dep_exp(set, lhs);
+                dep_exp(set, rhs)
+            }
+            C::Break | C::Continue | C::Jump { .. } | C::JumpIf { .. } => (),
+        }
+    }
+
+    fn dep_stmt(set: &mut BTreeSet<ConstantName>, stmt: &H::Statement_) {
+        use H::Statement_ as S;
+        match stmt {
+            S::Command(cmd) => dep_cmd(set, &cmd.value),
+            S::IfElse {
+                cond,
+                if_block,
+                else_block,
+            } => {
+                dep_exp(set, cond);
+                dep_block(set, if_block);
+                dep_block(set, else_block)
+            }
+            S::While {
+                cond: (cond_block, cond_exp),
+                block,
+            } => {
+                dep_block(set, cond_block);
+                dep_exp(set, cond_exp);
+                dep_block(set, block)
+            }
+            S::Loop { block, .. } => dep_block(set, block),
+        }
+    }
+
+    fn dep_block(set: &mut BTreeSet<ConstantName>, block: &H::Block) {
+        for entry in block {
+            dep_stmt(set, &entry.value);
+        }
+    }
+
+    let mut output = BTreeSet::new();
+    let (_, block) = &constant.value;
+    dep_block(&mut output, block);
+    output
+}
+
+fn constant(
+    context: &mut Context,
+    constant_values: &mut UniqueMap<ConstantName, Value>,
+    module: Option<ModuleIdent>,
+    name: ConstantName,
+    c: H::Constant,
+) -> G::Constant {
+    let H::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value: (locals, block),
+    } = c;
+
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let final_value = constant_(
+        context,
+        constant_values,
+        module,
+        name,
+        loc,
+        signature.clone(),
+        locals,
+        block,
+    );
+    let value = match final_value {
+        Some(H::Exp {
+            exp: sp!(_, H::UnannotatedExp_::Value(value)),
+            ..
+        }) => {
+            constant_values
+                .add(name, value.clone())
+                .expect("ICE constant name collision");
+            Some(move_value_from_value(value))
+        }
+        _ => None,
+    };
+
+    context.env.pop_warning_filter_scope();
+    G::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value,
+    }
+}
+
+const CANNOT_FOLD: &str =
+    "Invalid expression in 'const'. This expression could not be evaluated to a value";
+
+fn constant_(
+    context: &mut Context,
+    constant_values: &UniqueMap<ConstantName, Value>,
+    module: Option<ModuleIdent>,
+    name: ConstantName,
+    full_loc: Loc,
+    signature: H::BaseType,
+    locals: UniqueMap<Var, H::SingleType>,
+    block: H::Block,
+) -> Option<H::Exp> {
+    use H::Command_ as C;
+    const ICE_MSG: &str = "ICE invalid constant should have been blocked in typing";
+
+    initial_block(context, block);
+    let (start, mut blocks, block_info) = context.finish_blocks();
+
+    let binfo = block_info.iter().map(|(lbl, info)| (lbl, info));
+    let (mut cfg, infinite_loop_starts, errors) = MutForwardCFG::new(start, &mut blocks, binfo);
+    assert!(infinite_loop_starts.is_empty(), "{}", ICE_MSG);
+    assert!(errors.is_empty(), "{}", ICE_MSG);
+
+    let num_previous_errors = context.env.count_diags();
+    let fake_signature = H::FunctionSignature {
+        type_parameters: vec![],
+        parameters: vec![],
+        return_type: H::Type_::base(signature),
+    };
+    let fake_infinite_loop_starts = BTreeSet::new();
+    let function_context = super::CFGContext {
+        module,
+        member: cfgir::MemberName::Constant(name.0),
+        struct_declared_abilities: &context.struct_declared_abilities,
+        visibility: H::Visibility::Internal,
+        signature: &fake_signature,
+        locals: &locals,
+        infinite_loop_starts: &fake_infinite_loop_starts,
+    };
+    cfgir::refine_inference_and_verify(context.env, &function_context, &mut cfg);
+    assert!(
+        num_previous_errors == context.env.count_diags(),
+        "{}",
+        ICE_MSG
+    );
+    cfgir::optimize(&fake_signature, &locals, constant_values, &mut cfg);
+
+    if blocks.len() != 1 {
+        context.env.add_diag(diag!(
+            BytecodeGeneration::UnfoldableConstant,
+            (full_loc, CANNOT_FOLD)
+        ));
+        return None;
+    }
+    let mut optimized_block = blocks.remove(&start).unwrap();
+    let return_cmd = optimized_block.pop_back().unwrap();
+    for sp!(cloc, cmd_) in &optimized_block {
+        let e = match cmd_ {
+            C::IgnoreAndPop { exp, .. } => exp,
+            _ => {
+                context.env.add_diag(diag!(
+                    BytecodeGeneration::UnfoldableConstant,
+                    (*cloc, CANNOT_FOLD)
+                ));
+                continue;
+            }
+        };
+        check_constant_value(context, e)
+    }
+
+    let result = match return_cmd.value {
+        C::Return { exp: e, .. } => e,
+        _ => unreachable!(),
+    };
+    check_constant_value(context, &result);
+    Some(result)
+}
+
+fn check_constant_value(context: &mut Context, e: &H::Exp) {
+    use H::UnannotatedExp_ as E;
+    match &e.exp.value {
+        E::Value(_) => (),
+        _ => context.env.add_diag(diag!(
+            BytecodeGeneration::UnfoldableConstant,
+            (e.exp.loc, CANNOT_FOLD)
+        )),
+    }
+}
+
+pub(crate) fn move_value_from_value(sp!(_, v_): Value) -> MoveValue {
+    move_value_from_value_(v_)
+}
+
+pub(crate) fn move_value_from_value_(v_: Value_) -> MoveValue {
+    use MoveValue as MV;
+    use Value_ as V;
+    match v_ {
+        V::Address(a) => MV::Address(MoveAddress::new(a.into_bytes())),
+        V::U8(u) => MV::U8(u),
+        V::U16(u) => MV::U16(u),
+        V::U32(u) => MV::U32(u),
+        V::U64(u) => MV::U64(u),
+        V::U128(u) => MV::U128(u),
+        V::U256(u) => MV::U256(u),
+        V::Bool(b) => MV::Bool(b),
+        V::Vector(_, vs) => MV::Vector(vs.into_iter().map(move_value_from_value).collect()),
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function(
+    context: &mut Context,
+    module: Option<ModuleIdent>,
+    name: FunctionName,
+    f: H::Function,
+) -> G::Function {
+    let H::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility,
+        entry,
+        signature,
+        body,
+    } = f;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let body = function_body(context, module, name, visibility, &signature, body);
+    context.env.pop_warning_filter_scope();
+    G::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility,
+        entry,
+        signature,
+        body,
+    }
+}
+
+fn function_body(
+    context: &mut Context,
+    module: Option<ModuleIdent>,
+    name: FunctionName,
+    visibility: H::Visibility,
+    signature: &H::FunctionSignature,
+    sp!(loc, tb_): H::FunctionBody,
+) -> G::FunctionBody {
+    use G::FunctionBody_ as GB;
+    use H::FunctionBody_ as HB;
+    assert!(context.next_label.is_none());
+    assert!(context.start.is_none());
+    assert!(context.blocks.is_empty());
+    assert!(context.block_ordering.is_empty());
+    assert!(context.block_info.is_empty());
+    assert!(context.loop_bounds.is_empty());
+    assert!(context.loop_begin.is_none());
+    assert!(context.loop_end.is_none());
+    let b_ = match tb_ {
+        HB::Native => GB::Native,
+        HB::Defined { locals, body } => {
+            initial_block(context, body);
+            let (start, mut blocks, block_info) = context.finish_blocks();
+
+            let binfo = block_info.iter().map(|(lbl, info)| (lbl, info));
+            let (mut cfg, infinite_loop_starts, diags) =
+                MutForwardCFG::new(start, &mut blocks, binfo);
+            context.env.add_diags(diags);
+
+            let function_context = super::CFGContext {
+                module,
+                member: cfgir::MemberName::Function(name.0),
+                struct_declared_abilities: &context.struct_declared_abilities,
+                visibility,
+                signature,
+                locals: &locals,
+                infinite_loop_starts: &infinite_loop_starts,
+            };
+            cfgir::refine_inference_and_verify(context.env, &function_context, &mut cfg);
+            // do not optimize if there are errors, warnings are okay
+            if !context.env.has_errors() {
+                cfgir::optimize(signature, &locals, &UniqueMap::new(), &mut cfg);
+            }
+
+            let block_info = block_info
+                .into_iter()
+                .filter(|(lbl, _info)| blocks.contains_key(lbl))
+                .collect();
+            GB::Defined {
+                locals,
+                start,
+                block_info,
+                blocks,
+            }
+        }
+    };
+    sp(loc, b_)
+}
+
+//**************************************************************************************************
+// Statements
+//**************************************************************************************************
+
+fn initial_block(context: &mut Context, blocks: H::Block) {
+    let start = context.new_label();
+    context.start = Some(start);
+    block(context, start, blocks)
+}
+
+fn block(context: &mut Context, mut cur_label: Label, blocks: H::Block) {
+    use H::Command_ as C;
+
+    assert!(!blocks.is_empty());
+    let loc = blocks.back().unwrap().loc;
+    let mut basic_block = block_(context, &mut cur_label, blocks);
+
+    // return if we ended with did not end with a command
+    if basic_block.is_empty() {
+        return;
+    }
+
+    match context.next_label {
+        Some(next) if !basic_block.back().unwrap().value.is_terminal() => {
+            basic_block.push_back(sp(
+                loc,
+                C::Jump {
+                    target: next,
+                    from_user: false,
+                },
+            ));
+        }
+        _ => (),
+    }
+    context.insert_block(cur_label, basic_block);
+}
+
+fn block_(context: &mut Context, cur_label: &mut Label, blocks: H::Block) -> BasicBlock {
+    use H::{Command_ as C, Statement_ as S};
+
+    assert!(!blocks.is_empty());
+    let mut basic_block = BasicBlock::new();
+
+    macro_rules! finish_block {
+        (next_label: $next_label:expr) => {{
+            let lbl = mem::replace(cur_label, $next_label);
+            let bb = mem::take(&mut basic_block);
+            context.insert_block(lbl, bb);
+        }};
+    }
+
+    macro_rules! loop_block {
+        (begin: $begin:expr, end: $end:expr, body: $body:expr, $block:expr) => {{
+            let begin = $begin;
+            let old_begin = mem::replace(&mut context.loop_begin, Some(begin));
+            let old_end = mem::replace(&mut context.loop_end, Some($end));
+            let old_next = mem::replace(&mut context.next_label, Some(begin));
+            block(context, $body, $block);
+            context.next_label = old_next;
+            context.loop_end = old_end;
+            context.loop_begin = old_begin;
+        }};
+    }
+
+    for sp!(loc, stmt_) in blocks {
+        match stmt_ {
+            S::Command(mut cmd) => {
+                command(context, &mut cmd);
+                let is_terminal = cmd.value.is_terminal();
+                basic_block.push_back(cmd);
+                if is_terminal {
+                    finish_block!(next_label: context.new_label());
+                }
+            }
+            S::IfElse {
+                cond,
+                if_block,
+                else_block,
+            } => {
+                let if_true = context.new_label();
+                let if_false = context.new_label();
+                let next_label = context.new_label();
+
+                // If cond
+                let jump_if = C::JumpIf {
+                    cond: *cond,
+                    if_true,
+                    if_false,
+                };
+                basic_block.push_back(sp(loc, jump_if));
+                finish_block!(next_label: next_label);
+
+                // If branches
+                let old_next = mem::replace(&mut context.next_label, Some(next_label));
+                block(context, if_true, if_block);
+                block(context, if_false, else_block);
+                context.next_label = old_next;
+            }
+            S::While {
+                cond: (hcond_block, cond),
+                block: loop_block,
+            } => {
+                let loop_cond = context.new_label();
+                let loop_body = context.new_label();
+                let loop_end = context.new_label();
+
+                context.loop_bounds.insert(
+                    loop_cond,
+                    LoopInfo {
+                        is_loop_stmt: false,
+                        loop_end: G::LoopEnd::Target(loop_end),
+                    },
+                );
+
+                // Jump to loop condition
+                basic_block.push_back(sp(
+                    loc,
+                    C::Jump {
+                        target: loop_cond,
+                        from_user: false,
+                    },
+                ));
+                finish_block!(next_label: loop_cond);
+
+                // Loop condition and case to jump into loop or end
+                if !hcond_block.is_empty() {
+                    assert!(basic_block.is_empty());
+                    basic_block = block_(context, cur_label, hcond_block);
+                }
+                let jump_if = C::JumpIf {
+                    cond: *cond,
+                    if_true: loop_body,
+                    if_false: loop_end,
+                };
+                basic_block.push_back(sp(loc, jump_if));
+                finish_block!(next_label: loop_end);
+
+                // Loop body
+                loop_block!(begin: loop_cond, end: loop_end, body: loop_body, loop_block)
+            }
+
+            S::Loop {
+                block: loop_block, ..
+            } => {
+                let loop_body = context.new_label();
+                let loop_end = context.new_label();
+                assert!(cur_label.0 < loop_body.0);
+                assert!(loop_body.0 < loop_end.0);
+
+                context.loop_bounds.insert(
+                    loop_body,
+                    LoopInfo {
+                        is_loop_stmt: true,
+                        loop_end: G::LoopEnd::Target(loop_end),
+                    },
+                );
+
+                // Jump to loop
+                basic_block.push_back(sp(
+                    loc,
+                    C::Jump {
+                        target: loop_body,
+                        from_user: false,
+                    },
+                ));
+                finish_block!(next_label: loop_end);
+
+                // Loop body
+                loop_block!(begin: loop_body, end: loop_end, body: loop_body, loop_block)
+            }
+        }
+    }
+
+    basic_block
+}
+
+fn command(context: &Context, sp!(_, hc_): &mut H::Command) {
+    use H::Command_ as C;
+    match hc_ {
+        C::Assign(_, _)
+        | C::Mutate(_, _)
+        | C::Abort(_)
+        | C::Return { .. }
+        | C::IgnoreAndPop { .. } => {}
+        C::Continue => {
+            *hc_ = C::Jump {
+                target: context.loop_begin.unwrap(),
+                from_user: true,
+            }
+        }
+        C::Break => {
+            *hc_ = C::Jump {
+                target: context.loop_end.unwrap(),
+                from_user: true,
+            }
+        }
+        C::Jump { .. } | C::JumpIf { .. } => {
+            panic!("ICE unexpected jump before translation to jumps")
+        }
+    }
+}
+
+fn visit_program(context: &mut Context, prog: &G::Program) {
+    if context.env.visitors().abs_int.is_empty() {
+        return;
+    }
+
+    for (mident, mdef) in prog.modules.key_cloned_iter() {
+        visit_module(context, prog, mident, mdef)
+    }
+
+    for script in prog.scripts.values() {
+        visit_script(context, prog, script)
+    }
+}
+
+fn visit_module(
+    context: &mut Context,
+    prog: &G::Program,
+    mident: ModuleIdent,
+    mdef: &G::ModuleDefinition,
+) {
+    context
+        .env
+        .add_warning_filter_scope(mdef.warning_filter.clone());
+    for (name, fdef) in mdef.functions.key_cloned_iter() {
+        visit_function(context, prog, Some(mident), name, fdef)
+    }
+    context.env.pop_warning_filter_scope();
+}
+
+fn visit_script(context: &mut Context, prog: &G::Program, script: &G::Script) {
+    context
+        .env
+        .add_warning_filter_scope(script.warning_filter.clone());
+    visit_function(context, prog, None, script.function_name, &script.function);
+    context.env.pop_warning_filter_scope();
+}
+
+fn visit_function(
+    context: &mut Context,
+    prog: &G::Program,
+    mident: Option<ModuleIdent>,
+    name: FunctionName,
+    fdef: &G::Function,
+) {
+    let G::Function {
+        warning_filter,
+        index: _,
+        attributes: _,
+        visibility,
+        entry: _,
+        signature,
+        body,
+    } = fdef;
+    let G::FunctionBody_::Defined {
+        locals,
+        start,
+        blocks,
+        block_info,
+    } = &body.value
+    else {
+        return;
+    };
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let (cfg, infinite_loop_starts) = ImmForwardCFG::new(*start, blocks, block_info.iter());
+    let function_context = super::CFGContext {
+        module: mident,
+        member: cfgir::MemberName::Function(name.0),
+        struct_declared_abilities: &context.struct_declared_abilities,
+        visibility: *visibility,
+        signature,
+        locals,
+        infinite_loop_starts: &infinite_loop_starts,
+    };
+    let mut ds = Diagnostics::new();
+    for visitor in &context.env.visitors().abs_int {
+        let mut v = visitor.borrow_mut();
+        ds.extend(v.verify(context.env, prog, &function_context, &cfg));
+    }
+    context.env.add_diags(ds);
+    context.env.pop_warning_filter_scope();
+}
diff --git a/vendors/move/crates/move-compiler/src/cfgir/visitor.rs b/vendors/move/crates/move-compiler/src/cfgir/visitor.rs
new file mode 100644
index 000000000..f848922fa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/cfgir/visitor.rs
@@ -0,0 +1,468 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, fmt::Debug};
+
+use crate::{
+    cfgir::{
+        self,
+        absint::{AbstractDomain, AbstractInterpreter, JoinResult, TransferFunctions},
+        cfg::ImmForwardCFG,
+        CFGContext,
+    },
+    command_line::compiler::Visitor,
+    diagnostics::{Diagnostic, Diagnostics},
+    hlir::ast::{
+        Command, Command_, Exp, LValue, LValue_, Label, ModuleCall, Type, Type_, UnannotatedExp_,
+        Var,
+    },
+    shared::CompilationEnv,
+};
+use move_ir_types::location::*;
+
+pub type AbsIntVisitorObj = Box<dyn AbstractInterpreterVisitor>;
+
+pub trait AbstractInterpreterVisitor {
+    fn verify(
+        &mut self,
+        env: &CompilationEnv,
+        program: &cfgir::ast::Program,
+        context: &CFGContext,
+        cfg: &ImmForwardCFG,
+    ) -> Diagnostics;
+
+    fn visitor(self) -> Visitor
+    where
+        Self: 'static + Sized,
+    {
+        Visitor::AbsIntVisitor(Box::new(self))
+    }
+}
+
+//**************************************************************************************************
+// simple visitor
+//**************************************************************************************************
+
+/// The reason why a local variable is unavailable (mostly useful for error messages)
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum UnavailableReason {
+    Unassigned,
+    Moved,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+/// The state of a local variable, with its abstract value if it has one.
+pub enum LocalState<V: Clone + Debug + Default> {
+    Unavailable(Loc, UnavailableReason),
+    Available(Loc, V),
+    MaybeUnavailable {
+        available: Loc,
+        unavailable: Loc,
+        unavailable_reason: UnavailableReason,
+    },
+}
+
+/// A trait for a the context when visiting a `Command` in a block. At a minimum it must hold the diagnostics
+/// and the abstract state
+pub trait SimpleExecutionContext {
+    /// Add a diagnostic
+    fn add_diag(&mut self, diag: Diagnostic);
+}
+
+/// The domain used for the simple abstract interpreter template. Accessors for the local variables
+/// must be provided, but it will manage the joining of the locals (given a way to join values).
+pub trait SimpleDomain: AbstractDomain {
+    /// The non-default abstract value
+    type Value: Clone + Debug + Default + Eq;
+
+    /// Constructs a new domain, given all locals where unassiagned locals have
+    /// `LocalState::Unavailable` and parameters have
+    /// `LocalState::Available(_, SimpleValue::Default)`
+    fn new(context: &CFGContext, locals: BTreeMap<Var, LocalState<Self::Value>>) -> Self;
+
+    /// Mutable access for the states of local variables
+    fn locals_mut(&mut self) -> &mut BTreeMap<Var, LocalState<Self::Value>>;
+
+    /// Immutable access for the states of local variables
+    fn locals(&self) -> &BTreeMap<Var, LocalState<Self::Value>>;
+
+    /// Joining values. Called during joining if a local is available in both states
+    fn join_value(v1: &Self::Value, v2: &Self::Value) -> Self::Value;
+
+    /// `join_impl` is called after joining locals in `join` if any custom joining logic is needed
+    fn join_impl(&mut self, other: &Self, result: &mut JoinResult);
+}
+
+impl<V: SimpleDomain> AbstractDomain for V {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        use LocalState as L;
+        let self_locals = self.locals();
+        let other_locals = other.locals();
+        assert!(
+            self_locals.keys().all(|v| other_locals.contains_key(v)),
+            "ICE. Incorrectly implemented abstract interpreter. \
+            Local variables should not be removed from the map"
+        );
+        assert!(
+            other_locals.keys().all(|v| self_locals.contains_key(v)),
+            "ICE. Incorrectly implemented abstract interpreter. \
+            Local variables should not be removed from the map"
+        );
+        let mut result = JoinResult::Unchanged;
+        for (local, other_state) in other_locals {
+            match (self.locals().get(local).unwrap(), other_state) {
+                // both available, join the value
+                (L::Available(loc, v1), L::Available(_, v2)) => {
+                    let loc = *loc;
+                    let joined = Self::join_value(v1, v2);
+                    if v1 != &joined {
+                        result = JoinResult::Changed
+                    }
+                    self.locals_mut().insert(*local, L::Available(loc, joined));
+                }
+                // equal so nothing to do
+                (L::Unavailable(_, _), L::Unavailable(_, _))
+                | (L::MaybeUnavailable { .. }, L::MaybeUnavailable { .. }) => (),
+                // if its partially assigned, stays partially assigned
+                (L::MaybeUnavailable { .. }, _) => (),
+
+                // if was partially assigned in other, its now partially assigned
+                (_, L::MaybeUnavailable { .. }) => {
+                    result = JoinResult::Changed;
+                    self.locals_mut().insert(*local, other_state.clone());
+                }
+
+                // Available in one but not the other, so maybe unavailable
+                (L::Available(available, _), L::Unavailable(unavailable, reason))
+                | (L::Unavailable(unavailable, reason), L::Available(available, _)) => {
+                    result = JoinResult::Changed;
+                    let available = *available;
+                    let unavailable = *unavailable;
+                    let state = L::MaybeUnavailable {
+                        available,
+                        unavailable,
+                        unavailable_reason: *reason,
+                    };
+                    self.locals_mut().insert(*local, state);
+                }
+            }
+        }
+        self.join_impl(other, &mut result);
+        result
+    }
+}
+
+/// Trait for simple abstract interpreter passes. Custom hooks can be implemented with additional
+/// logic as needed. The provided implementation will do all of the plumbing of abstract values
+/// through the expressions, commands, and locals.
+pub trait SimpleAbsIntConstructor: Sized {
+    type AI<'a>: Sized + SimpleAbsInt;
+    /// Given the initial state/domain, construct a new abstract interpreter.
+    /// Return None if it should not be run given this context
+    fn new<'a>(
+        env: &CompilationEnv,
+        program: &'a cfgir::ast::Program,
+        context: &'a CFGContext<'a>,
+        init_state: &mut <Self::AI<'a> as SimpleAbsInt>::State,
+    ) -> Option<Self::AI<'a>>;
+
+    fn verify(
+        &mut self,
+        env: &CompilationEnv,
+        program: &cfgir::ast::Program,
+        context: &CFGContext,
+        cfg: &ImmForwardCFG,
+    ) -> Diagnostics {
+        let mut locals = context
+            .locals
+            .key_cloned_iter()
+            .map(|(v, _)| {
+                let unassigned = LocalState::Unavailable(v.0.loc, UnavailableReason::Unassigned);
+                (v, unassigned)
+            })
+            .collect::<BTreeMap<_, _>>();
+        for (param, _) in &context.signature.parameters {
+            locals.insert(
+                *param,
+                LocalState::Available(
+                    param.0.loc,
+                    <<Self::AI<'_> as SimpleAbsInt>::State as SimpleDomain>::Value::default(),
+                ),
+            );
+        }
+        let mut init_state = <Self::AI<'_> as SimpleAbsInt>::State::new(context, locals);
+        let Some(mut ai) = Self::new(env, program, context, &mut init_state) else {
+            return Diagnostics::new();
+        };
+        let (final_state, ds) = ai.analyze_function(cfg, init_state);
+        ai.finish(final_state, ds)
+    }
+}
+
+pub trait SimpleAbsInt: Sized {
+    type State: SimpleDomain;
+    /// The execution context local to a command
+    type ExecutionContext: SimpleExecutionContext;
+
+    /// A hook for an additional processing after visiting all codes. The `final_states` are the
+    /// pre-states for each block (keyed by the label for the block). The `diags` are collected from
+    /// all code visited.
+    fn finish(
+        &mut self,
+        final_states: BTreeMap<Label, Self::State>,
+        diags: Diagnostics,
+    ) -> Diagnostics;
+
+    /// A hook for any pre-processing at the start of a command
+    fn start_command(&self, pre: &mut Self::State) -> Self::ExecutionContext;
+
+    /// A hook for any post-processing after a command has been visited
+    fn finish_command(
+        &self,
+        context: Self::ExecutionContext,
+        state: &mut Self::State,
+    ) -> Diagnostics;
+
+    /// custom visit for a command. It will skip `command` if `command_custom` returns true.
+    fn command_custom(
+        &self,
+        _context: &mut Self::ExecutionContext,
+        _state: &mut Self::State,
+        _cmd: &Command,
+    ) -> bool {
+        false
+    }
+    fn command(
+        &self,
+        context: &mut Self::ExecutionContext,
+        state: &mut Self::State,
+        cmd: &Command,
+    ) {
+        use Command_ as C;
+        if self.command_custom(context, state, cmd) {
+            return;
+        }
+        let sp!(_, cmd_) = cmd;
+        match cmd_ {
+            C::Assign(ls, e) => {
+                let values = self.exp(context, state, e);
+                self.lvalues(context, state, ls, values);
+            }
+            C::Mutate(el, er) => {
+                self.exp(context, state, er);
+                self.exp(context, state, el);
+            }
+            C::JumpIf { cond: e, .. }
+            | C::IgnoreAndPop { exp: e, .. }
+            | C::Return { exp: e, .. }
+            | C::Abort(e) => {
+                self.exp(context, state, e);
+            }
+            C::Jump { .. } => (),
+            C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+        }
+    }
+
+    fn lvalues(
+        &self,
+        context: &mut Self::ExecutionContext,
+        state: &mut Self::State,
+        ls: &[LValue],
+        values: Vec<<Self::State as SimpleDomain>::Value>,
+    ) {
+        // pad with defautl to account for errors
+        let padded_values = values.into_iter().chain(std::iter::repeat(
+            <Self::State as SimpleDomain>::Value::default(),
+        ));
+        for (l, value) in ls.iter().zip(padded_values) {
+            self.lvalue(context, state, l, value)
+        }
+    }
+
+    /// custom visit for an lvalue. It will skip `lvalue` if `lvalue_custom` returns true.
+    fn lvalue_custom(
+        &self,
+        _context: &mut Self::ExecutionContext,
+        _state: &mut Self::State,
+        _l: &LValue,
+        _value: &<Self::State as SimpleDomain>::Value,
+    ) -> bool {
+        false
+    }
+    fn lvalue(
+        &self,
+        context: &mut Self::ExecutionContext,
+        state: &mut Self::State,
+        l: &LValue,
+        value: <Self::State as SimpleDomain>::Value,
+    ) {
+        use LValue_ as L;
+        if self.lvalue_custom(context, state, l, &value) {
+            return;
+        }
+        let sp!(loc, l_) = l;
+        match l_ {
+            L::Ignore => (),
+            L::Var(v, _) => {
+                let locals = state.locals_mut();
+                locals.insert(*v, LocalState::Available(*loc, value));
+            }
+            L::Unpack(_, _, fields) => {
+                for (_, l) in fields {
+                    let v = <Self::State as SimpleDomain>::Value::default();
+                    self.lvalue(context, state, l, v)
+                }
+            }
+        }
+    }
+
+    /// custom visit for an exp. It will skip `exp` and `call_custom` if `exp_custom` returns Some.
+    fn exp_custom(
+        &self,
+        _context: &mut Self::ExecutionContext,
+        _state: &mut Self::State,
+        _parent_e: &Exp,
+    ) -> Option<Vec<<Self::State as SimpleDomain>::Value>> {
+        None
+    }
+    fn call_custom(
+        &self,
+        _context: &mut Self::ExecutionContext,
+        _state: &mut Self::State,
+        _loc: &Loc,
+        _return_ty: &Type,
+        _f: &ModuleCall,
+        _args: Vec<<Self::State as SimpleDomain>::Value>,
+    ) -> Option<Vec<<Self::State as SimpleDomain>::Value>> {
+        None
+    }
+    fn exp(
+        &self,
+        context: &mut Self::ExecutionContext,
+        state: &mut Self::State,
+        parent_e: &Exp,
+    ) -> Vec<<Self::State as SimpleDomain>::Value> {
+        use UnannotatedExp_ as E;
+        if let Some(vs) = self.exp_custom(context, state, parent_e) {
+            return vs;
+        }
+        let eloc = &parent_e.exp.loc;
+        match &parent_e.exp.value {
+            E::Move { var, .. } => {
+                let locals = state.locals_mut();
+                let prev = locals.insert(
+                    *var,
+                    LocalState::Unavailable(*eloc, UnavailableReason::Moved),
+                );
+                match prev {
+                    Some(LocalState::Available(_, value)) => {
+                        vec![value]
+                    }
+                    // Possible error case
+                    _ => default_values(1),
+                }
+            }
+            E::Copy { var, .. } => {
+                let locals = state.locals_mut();
+                match locals.get(var) {
+                    Some(LocalState::Available(_, value)) => vec![value.clone()],
+                    // Possible error case
+                    _ => default_values(1),
+                }
+            }
+            E::BorrowLocal(_, _) => default_values(1),
+            E::Freeze(e)
+            | E::Dereference(e)
+            | E::Borrow(_, e, _, _)
+            | E::Cast(e, _)
+            | E::UnaryExp(_, e) => {
+                self.exp(context, state, e);
+                default_values(1)
+            }
+            E::Vector(_, n, _, args) => {
+                for arg in args {
+                    self.exp(context, state, arg);
+                }
+                default_values(*n)
+            }
+            E::ModuleCall(mcall) => {
+                let evalues = mcall
+                    .arguments
+                    .iter()
+                    .flat_map(|arg| self.exp(context, state, arg))
+                    .collect();
+                if let Some(vs) =
+                    self.call_custom(context, state, eloc, &parent_e.ty, mcall, evalues)
+                {
+                    return vs;
+                }
+
+                default_values_for_ty(&parent_e.ty)
+            }
+
+            E::Unit { .. } => vec![],
+            E::Value(_) | E::Constant(_) | E::Spec(_, _) | E::UnresolvedError => default_values(1),
+
+            E::BinopExp(e1, _, e2) => {
+                self.exp(context, state, e1);
+                self.exp(context, state, e2);
+                default_values(1)
+            }
+            E::Pack(_, _, fields) => {
+                for (_, _, e) in fields {
+                    self.exp(context, state, e);
+                }
+                default_values(1)
+            }
+            E::Multiple(es) => es
+                .iter()
+                .flat_map(|e| self.exp(context, state, e))
+                .collect(),
+            E::Unreachable => panic!("ICE should not analyze dead code"),
+        }
+    }
+}
+
+/// Provides default values depending on the arity of the type
+pub fn default_values_for_ty<V: Clone + Default>(ty: &Type) -> Vec<V> {
+    match &ty.value {
+        Type_::Unit => vec![],
+        Type_::Single(_) => default_values(1),
+        Type_::Multiple(ts) => default_values(ts.len()),
+    }
+}
+
+#[inline(always)]
+/// A simple constructor for n default values
+pub fn default_values<V: Clone + Default>(c: usize) -> Vec<V> {
+    vec![V::default(); c]
+}
+
+impl<V: SimpleAbsInt> TransferFunctions for V {
+    type State = V::State;
+
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        _lbl: Label,
+        _idx: usize,
+        cmd: &Command,
+    ) -> Diagnostics {
+        let mut context = self.start_command(pre);
+        self.command(&mut context, pre, cmd);
+        self.finish_command(context, pre)
+    }
+}
+impl<V: SimpleAbsInt> AbstractInterpreter for V {}
+
+impl<V: SimpleAbsIntConstructor> AbstractInterpreterVisitor for V {
+    fn verify(
+        &mut self,
+        env: &CompilationEnv,
+        program: &cfgir::ast::Program,
+        context: &CFGContext,
+        cfg: &ImmForwardCFG,
+    ) -> Diagnostics {
+        SimpleAbsIntConstructor::verify(self, env, program, context, cfg)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/command_line/compiler.rs b/vendors/move/crates/move-compiler/src/command_line/compiler.rs
new file mode 100644
index 000000000..6390ee184
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/command_line/compiler.rs
@@ -0,0 +1,960 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::{self, visitor::AbsIntVisitorObj},
+    command_line::{DEFAULT_OUTPUT_DIR, MOVE_COMPILED_INTERFACES_DIR},
+    compiled_unit,
+    compiled_unit::AnnotatedCompiledUnit,
+    diagnostics::{
+        codes::{Severity, WarningFilter},
+        *,
+    },
+    expansion,
+    expansion::ast as E,
+    hlir, interface_generator, naming, parser,
+    parser::{comments::*, *},
+    shared::{
+        CompilationEnv, Flags, IndexedPackagePath, NamedAddressMap, NamedAddressMaps,
+        NumericalAddress, PackageConfig, PackagePaths,
+    },
+    to_bytecode,
+    typing::{self, visitor::TypingVisitorObj},
+    unit_test, verification,
+};
+use move_command_line_common::files::{
+    extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
+};
+use move_core_types::language_storage::ModuleId as CompiledModuleId;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs,
+    fs::File,
+    io::{Read, Write},
+    path::{Path, PathBuf},
+};
+use tempfile::NamedTempFile;
+
+//**************************************************************************************************
+// Definitions
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+struct KnownFiltersInfo {
+    /// An name that identifies attribute used for filtering (e.g. "allow" in
+    /// #[allow(unused_function)].
+    filter_attr_name: expansion::ast::AttributeName_,
+    /// A list of known warning filters that can be suppressed by the compiler suppression warning
+    /// system.
+    filters: Vec<WarningFilter>,
+}
+
+pub struct Compiler<'a> {
+    maps: NamedAddressMaps,
+    targets: Vec<IndexedPackagePath>,
+    deps: Vec<IndexedPackagePath>,
+    interface_files_dir_opt: Option<String>,
+    pre_compiled_lib: Option<&'a FullyCompiledProgram>,
+    compiled_module_named_address_mapping: BTreeMap<CompiledModuleId, String>,
+    flags: Flags,
+    visitors: Vec<Visitor>,
+    /// Predefined filter for compiler warnings.
+    warning_filter: Option<WarningFilters>,
+    known_warning_filters: BTreeSet<KnownFiltersInfo>,
+    package_configs: BTreeMap<Symbol, PackageConfig>,
+    default_config: Option<PackageConfig>,
+}
+
+pub struct SteppedCompiler<'a, const P: Pass> {
+    compilation_env: CompilationEnv,
+    pre_compiled_lib: Option<&'a FullyCompiledProgram>,
+    program: Option<PassResult>,
+}
+
+pub type Pass = u8;
+pub const EMPTY_COMPILER: Pass = 0;
+pub const PASS_PARSER: Pass = 1;
+pub const PASS_EXPANSION: Pass = 2;
+pub const PASS_NAMING: Pass = 3;
+pub const PASS_TYPING: Pass = 4;
+pub const PASS_HLIR: Pass = 5;
+pub const PASS_CFGIR: Pass = 6;
+pub const PASS_COMPILATION: Pass = 7;
+
+#[derive(Debug)]
+enum PassResult {
+    Parser(parser::ast::Program),
+    Expansion(expansion::ast::Program),
+    Naming(naming::ast::Program),
+    Typing(typing::ast::Program),
+    HLIR(hlir::ast::Program),
+    CFGIR(cfgir::ast::Program),
+    Compilation(Vec<AnnotatedCompiledUnit>, /* warnings */ Diagnostics),
+}
+
+#[derive(Clone)]
+pub struct FullyCompiledProgram {
+    // TODO don't store this...
+    pub files: FilesSourceText,
+    pub parser: parser::ast::Program,
+    pub expansion: expansion::ast::Program,
+    pub naming: naming::ast::Program,
+    pub typing: typing::ast::Program,
+    pub hlir: hlir::ast::Program,
+    pub cfgir: cfgir::ast::Program,
+    pub compiled: Vec<AnnotatedCompiledUnit>,
+}
+
+pub enum Visitor {
+    TypingVisitor(TypingVisitorObj),
+    AbsIntVisitor(AbsIntVisitorObj),
+}
+
+//**************************************************************************************************
+// Entry points and impls
+//**************************************************************************************************
+
+impl<'a> Compiler<'a> {
+    pub fn from_package_paths<Paths: Into<Symbol>, NamedAddress: Into<Symbol>>(
+        targets: Vec<PackagePaths<Paths, NamedAddress>>,
+        deps: Vec<PackagePaths<Paths, NamedAddress>>,
+    ) -> anyhow::Result<Self> {
+        fn indexed_scopes(
+            maps: &mut NamedAddressMaps,
+            package_configs: &mut BTreeMap<Symbol, PackageConfig>,
+            all_pkgs: Vec<PackagePaths<impl Into<Symbol>, impl Into<Symbol>>>,
+        ) -> anyhow::Result<Vec<IndexedPackagePath>> {
+            let mut idx_paths = vec![];
+            for PackagePaths {
+                name,
+                paths,
+                named_address_map,
+            } in all_pkgs
+            {
+                let name = if let Some((name, config)) = name {
+                    let prev = package_configs.insert(name, config);
+                    anyhow::ensure!(prev.is_none(), "Duplicate package entry for '{name}'");
+                    Some(name)
+                } else {
+                    None
+                };
+                let idx = maps.insert(
+                    named_address_map
+                        .into_iter()
+                        .map(|(k, v)| (k.into(), v))
+                        .collect::<NamedAddressMap>(),
+                );
+                idx_paths.extend(paths.into_iter().map(|path| IndexedPackagePath {
+                    package: name,
+                    path: path.into(),
+                    named_address_map: idx,
+                }))
+            }
+            Ok(idx_paths)
+        }
+        let mut maps = NamedAddressMaps::new();
+        let mut package_configs = BTreeMap::new();
+        let targets = indexed_scopes(&mut maps, &mut package_configs, targets)?;
+        let deps = indexed_scopes(&mut maps, &mut package_configs, deps)?;
+
+        Ok(Self {
+            maps,
+            targets,
+            deps,
+            interface_files_dir_opt: None,
+            pre_compiled_lib: None,
+            compiled_module_named_address_mapping: BTreeMap::new(),
+            flags: Flags::empty(),
+            visitors: vec![],
+            warning_filter: None,
+            known_warning_filters: BTreeSet::new(),
+            package_configs,
+            default_config: None,
+        })
+    }
+
+    pub fn from_files<Paths: Into<Symbol>, NamedAddress: Into<Symbol> + Clone>(
+        targets: Vec<Paths>,
+        deps: Vec<Paths>,
+        named_address_map: BTreeMap<NamedAddress, NumericalAddress>,
+    ) -> Self {
+        let targets = vec![PackagePaths {
+            name: None,
+            paths: targets,
+            named_address_map: named_address_map.clone(),
+        }];
+        let deps = vec![PackagePaths {
+            name: None,
+            paths: deps,
+            named_address_map,
+        }];
+        Self::from_package_paths(targets, deps).unwrap()
+    }
+
+    pub fn set_flags(mut self, flags: Flags) -> Self {
+        assert!(self.flags.is_empty());
+        self.flags = flags;
+        self
+    }
+
+    pub fn set_interface_files_dir(mut self, dir: String) -> Self {
+        assert!(self.interface_files_dir_opt.is_none());
+        self.interface_files_dir_opt = Some(dir);
+        self
+    }
+
+    pub fn set_interface_files_dir_opt(mut self, dir_opt: Option<String>) -> Self {
+        assert!(self.interface_files_dir_opt.is_none());
+        self.interface_files_dir_opt = dir_opt;
+        self
+    }
+
+    pub fn set_pre_compiled_lib(mut self, pre_compiled_lib: &'a FullyCompiledProgram) -> Self {
+        assert!(self.pre_compiled_lib.is_none());
+        self.pre_compiled_lib = Some(pre_compiled_lib);
+        self
+    }
+
+    pub fn set_pre_compiled_lib_opt(
+        mut self,
+        pre_compiled_lib: Option<&'a FullyCompiledProgram>,
+    ) -> Self {
+        assert!(self.pre_compiled_lib.is_none());
+        self.pre_compiled_lib = pre_compiled_lib;
+        self
+    }
+
+    pub fn set_compiled_module_named_address_mapping(
+        mut self,
+        compiled_module_named_address_mapping: BTreeMap<CompiledModuleId, String>,
+    ) -> Self {
+        assert!(self.compiled_module_named_address_mapping.is_empty());
+        self.compiled_module_named_address_mapping = compiled_module_named_address_mapping;
+        self
+    }
+
+    pub fn add_visitor(mut self, pass: impl Into<Visitor>) -> Self {
+        self.visitors.push(pass.into());
+        self
+    }
+
+    pub fn add_visitors(mut self, passes: impl IntoIterator<Item = Visitor>) -> Self {
+        self.visitors.extend(passes);
+        self
+    }
+
+    pub fn set_warning_filter(mut self, filter: Option<WarningFilters>) -> Self {
+        assert!(self.warning_filter.is_none());
+        self.warning_filter = filter;
+        self
+    }
+
+    pub fn add_custom_known_filters(
+        mut self,
+        filters: Vec<WarningFilter>,
+        filter_attr_name: E::AttributeName_,
+    ) -> Self {
+        self.known_warning_filters.insert(KnownFiltersInfo {
+            filter_attr_name,
+            filters,
+        });
+        self
+    }
+
+    /// Sets the PackageConfig for files without a specified package
+    pub fn set_default_config(mut self, config: PackageConfig) -> Self {
+        assert!(self.default_config.is_none());
+        self.default_config = Some(config);
+        self
+    }
+
+    pub fn run<const TARGET: Pass>(
+        self,
+    ) -> anyhow::Result<(
+        FilesSourceText,
+        Result<(CommentMap, SteppedCompiler<'a, TARGET>), Diagnostics>,
+    )> {
+        let Self {
+            maps,
+            targets,
+            mut deps,
+            interface_files_dir_opt,
+            pre_compiled_lib,
+            compiled_module_named_address_mapping,
+            flags,
+            visitors,
+            warning_filter,
+            known_warning_filters,
+            package_configs,
+            default_config,
+        } = self;
+        generate_interface_files_for_deps(
+            &mut deps,
+            interface_files_dir_opt,
+            &compiled_module_named_address_mapping,
+        )?;
+        let mut compilation_env =
+            CompilationEnv::new(flags, visitors, package_configs, default_config);
+        if let Some(filter) = warning_filter {
+            compilation_env.add_warning_filter_scope(filter);
+        }
+        for KnownFiltersInfo {
+            filter_attr_name,
+            filters,
+        } in known_warning_filters
+        {
+            compilation_env.add_custom_known_filters(filters, filter_attr_name)?;
+        }
+        let (source_text, pprog_and_comments_res) =
+            parse_program(&mut compilation_env, maps, targets, deps)?;
+        let res: Result<_, Diagnostics> = pprog_and_comments_res.and_then(|(pprog, comments)| {
+            SteppedCompiler::new_at_parser(compilation_env, pre_compiled_lib, pprog)
+                .run::<TARGET>()
+                .map(|compiler| (comments, compiler))
+        });
+        Ok((source_text, res))
+    }
+
+    pub fn check(self) -> anyhow::Result<(FilesSourceText, Result<(), Diagnostics>)> {
+        let (files, res) = self.run::<PASS_COMPILATION>()?;
+        Ok((files, res.map(|_| ())))
+    }
+
+    pub fn check_and_report(self) -> anyhow::Result<FilesSourceText> {
+        let (files, res) = self.check()?;
+        unwrap_or_report_diagnostics(&files, res);
+        Ok(files)
+    }
+
+    pub fn build(
+        self,
+    ) -> anyhow::Result<(
+        FilesSourceText,
+        Result<(Vec<AnnotatedCompiledUnit>, Diagnostics), Diagnostics>,
+    )> {
+        let (files, res) = self.run::<PASS_COMPILATION>()?;
+        Ok((
+            files,
+            res.map(|(_comments, stepped)| stepped.into_compiled_units()),
+        ))
+    }
+
+    pub fn build_and_report(self) -> anyhow::Result<(FilesSourceText, Vec<AnnotatedCompiledUnit>)> {
+        let (files, units_res) = self.build()?;
+        let (units, warnings) = unwrap_or_report_diagnostics(&files, units_res);
+        report_warnings(&files, warnings);
+        Ok((files, units))
+    }
+}
+
+impl<'a, const P: Pass> SteppedCompiler<'a, P> {
+    fn run_impl<const TARGET: Pass>(self) -> Result<SteppedCompiler<'a, TARGET>, Diagnostics> {
+        assert!(P > EMPTY_COMPILER);
+        assert!(self.program.is_some());
+        assert!(self.program.as_ref().unwrap().equivalent_pass() == P);
+        assert!(
+            P <= PASS_COMPILATION,
+            "Invalid pass for run_to. Initial pass is too large."
+        );
+        assert!(
+            P <= TARGET,
+            "Invalid pass for run_to. Target pass precedes the current pass"
+        );
+        let Self {
+            mut compilation_env,
+            pre_compiled_lib,
+            program,
+        } = self;
+        let new_prog = run(
+            &mut compilation_env,
+            pre_compiled_lib,
+            program.unwrap(),
+            TARGET,
+            |_, _| (),
+        )?;
+        assert!(new_prog.equivalent_pass() == TARGET);
+        Ok(SteppedCompiler {
+            compilation_env,
+            pre_compiled_lib,
+            program: Some(new_prog),
+        })
+    }
+
+    pub fn compilation_env(&mut self) -> &mut CompilationEnv {
+        &mut self.compilation_env
+    }
+}
+
+macro_rules! ast_stepped_compilers {
+    ($(($pass:ident, $mod:ident, $result:ident, $at_ast:ident, $new:ident)),*) => {
+        impl<'a> SteppedCompiler<'a, EMPTY_COMPILER> {
+            $(
+                pub fn $at_ast(self, ast: $mod::ast::Program) -> SteppedCompiler<'a, {$pass}> {
+                    let Self {
+                        compilation_env,
+                        pre_compiled_lib,
+                        program,
+                    } = self;
+                    assert!(program.is_none());
+                    SteppedCompiler::$new(
+                        compilation_env,
+                        pre_compiled_lib,
+                        ast
+                    )
+                }
+            )*
+        }
+
+        $(
+            impl<'a> SteppedCompiler<'a, {$pass}> {
+                fn $new(
+                    compilation_env: CompilationEnv,
+                    pre_compiled_lib: Option<&'a FullyCompiledProgram>,
+                    ast: $mod::ast::Program,
+                ) -> Self {
+                    Self {
+                        compilation_env,
+                        pre_compiled_lib,
+                        program: Some(PassResult::$result(ast)),
+                    }
+                }
+
+                pub fn run<const TARGET: Pass>(
+                    self
+                ) -> Result<SteppedCompiler<'a, TARGET>, Diagnostics> {
+                    self.run_impl()
+                }
+
+                pub fn into_ast(self) -> (SteppedCompiler<'a, EMPTY_COMPILER>, $mod::ast::Program) {
+                    let Self {
+                        compilation_env,
+                        pre_compiled_lib,
+                        program,
+                    } = self;
+                    let ast = match program {
+                        Some(PassResult::$result(ast)) => ast,
+                        _ => panic!(),
+                    };
+                    let next = SteppedCompiler {
+                        compilation_env,
+                        pre_compiled_lib,
+                        program: None,
+                    };
+                    (next, ast)
+                }
+
+                pub fn check(self) -> Result<(), Diagnostics> {
+                    self.run::<PASS_COMPILATION>()?;
+                    Ok(())
+                }
+
+                pub fn build(
+                    self
+                ) -> Result<(Vec<AnnotatedCompiledUnit>, Diagnostics), Diagnostics> {
+                    let units = self.run::<PASS_COMPILATION>()?.into_compiled_units();
+                    Ok(units)
+                }
+
+                pub fn check_and_report(self, files: &FilesSourceText)  {
+                    let errors_result = self.check();
+                    unwrap_or_report_diagnostics(&files, errors_result);
+                }
+
+                pub fn build_and_report(
+                    self,
+                    files: &FilesSourceText,
+                ) -> Vec<AnnotatedCompiledUnit> {
+                    let units_result = self.build();
+                    let (units, warnings) = unwrap_or_report_diagnostics(&files, units_result);
+                    report_warnings(&files, warnings);
+                    units
+                }
+            }
+        )*
+    };
+}
+
+ast_stepped_compilers!(
+    (PASS_PARSER, parser, Parser, at_parser, new_at_parser),
+    (
+        PASS_EXPANSION,
+        expansion,
+        Expansion,
+        at_expansion,
+        new_at_expansion
+    ),
+    (PASS_NAMING, naming, Naming, at_naming, new_at_naming),
+    (PASS_TYPING, typing, Typing, at_typing, new_at_typing),
+    (PASS_HLIR, hlir, HLIR, at_hlir, new_at_hlir),
+    (PASS_CFGIR, cfgir, CFGIR, at_cfgir, new_at_cfgir)
+);
+
+impl<'a> SteppedCompiler<'a, PASS_COMPILATION> {
+    pub fn into_compiled_units(self) -> (Vec<AnnotatedCompiledUnit>, Diagnostics) {
+        let Self {
+            compilation_env: _,
+            pre_compiled_lib: _,
+            program,
+        } = self;
+        match program {
+            Some(PassResult::Compilation(units, warnings)) => (units, warnings),
+            _ => panic!(),
+        }
+    }
+}
+
+/// Given a set of dependencies, precompile them and save the ASTs so that they can be used again
+/// to compile against without having to recompile these dependencies
+pub fn construct_pre_compiled_lib<Paths: Into<Symbol>, NamedAddress: Into<Symbol>>(
+    targets: Vec<PackagePaths<Paths, NamedAddress>>,
+    interface_files_dir_opt: Option<String>,
+    flags: Flags,
+) -> anyhow::Result<Result<FullyCompiledProgram, (FilesSourceText, Diagnostics)>> {
+    let (files, pprog_and_comments_res) =
+        Compiler::from_package_paths(targets, Vec::<PackagePaths<Paths, NamedAddress>>::new())?
+            .set_interface_files_dir_opt(interface_files_dir_opt)
+            .set_flags(flags)
+            .run::<PASS_PARSER>()?;
+
+    let (_comments, stepped) = match pprog_and_comments_res {
+        Err(errors) => return Ok(Err((files, errors))),
+        Ok(res) => res,
+    };
+
+    let (empty_compiler, ast) = stepped.into_ast();
+    let mut compilation_env = empty_compiler.compilation_env;
+    let start = PassResult::Parser(ast);
+    let mut parser = None;
+    let mut expansion = None;
+    let mut naming = None;
+    let mut typing = None;
+    let mut hlir = None;
+    let mut cfgir = None;
+    let mut compiled = None;
+
+    let save_result = |cur: &PassResult, _env: &CompilationEnv| match cur {
+        PassResult::Parser(prog) => {
+            assert!(parser.is_none());
+            parser = Some(prog.clone())
+        }
+        PassResult::Expansion(eprog) => {
+            assert!(expansion.is_none());
+            expansion = Some(eprog.clone())
+        }
+        PassResult::Naming(nprog) => {
+            assert!(naming.is_none());
+            naming = Some(nprog.clone())
+        }
+        PassResult::Typing(tprog) => {
+            assert!(typing.is_none());
+            typing = Some(tprog.clone())
+        }
+        PassResult::HLIR(hprog) => {
+            assert!(hlir.is_none());
+            hlir = Some(hprog.clone());
+        }
+        PassResult::CFGIR(cprog) => {
+            assert!(cfgir.is_none());
+            cfgir = Some(cprog.clone());
+        }
+        PassResult::Compilation(units, _final_diags) => {
+            assert!(compiled.is_none());
+            compiled = Some(units.clone())
+        }
+    };
+    match run(
+        &mut compilation_env,
+        None,
+        start,
+        PASS_COMPILATION,
+        save_result,
+    ) {
+        Err(errors) => Ok(Err((files, errors))),
+        Ok(_) => Ok(Ok(FullyCompiledProgram {
+            files,
+            parser: parser.unwrap(),
+            expansion: expansion.unwrap(),
+            naming: naming.unwrap(),
+            typing: typing.unwrap(),
+            hlir: hlir.unwrap(),
+            cfgir: cfgir.unwrap(),
+            compiled: compiled.unwrap(),
+        })),
+    }
+}
+
+//**************************************************************************************************
+// Utils
+//**************************************************************************************************
+
+macro_rules! dir_path {
+    ($($dir:expr),+) => {{
+        let mut p = PathBuf::new();
+        $(p.push($dir);)+
+        p
+    }};
+}
+
+macro_rules! file_path {
+    ($dir:expr, $name:expr, $ext:expr) => {{
+        let mut p = PathBuf::from($dir);
+        p.push($name);
+        p.set_extension($ext);
+        p
+    }};
+}
+
+/// Runs the bytecode verifier on the compiled units
+/// Fails if the bytecode verifier errors
+pub fn sanity_check_compiled_units(
+    files: FilesSourceText,
+    compiled_units: &[AnnotatedCompiledUnit],
+) {
+    let ice_errors = compiled_unit::verify_units(compiled_units);
+    if !ice_errors.is_empty() {
+        report_diagnostics(&files, ice_errors)
+    }
+}
+
+/// Given a file map and a set of compiled programs, saves the compiled programs to disk
+pub fn output_compiled_units(
+    bytecode_version: Option<u32>,
+    emit_source_maps: bool,
+    files: FilesSourceText,
+    compiled_units: Vec<AnnotatedCompiledUnit>,
+    out_dir: &str,
+) -> anyhow::Result<()> {
+    const SCRIPT_SUB_DIR: &str = "scripts";
+    const MODULE_SUB_DIR: &str = "modules";
+    fn num_digits(n: usize) -> usize {
+        format!("{}", n).len()
+    }
+    fn format_idx(idx: usize, width: usize) -> String {
+        format!("{:0width$}", idx, width = width)
+    }
+
+    macro_rules! emit_unit {
+        ($path:ident, $unit:ident) => {{
+            if emit_source_maps {
+                $path.set_extension(SOURCE_MAP_EXTENSION);
+                fs::write($path.as_path(), &$unit.serialize_source_map())?;
+            }
+
+            $path.set_extension(MOVE_COMPILED_EXTENSION);
+            fs::write($path.as_path(), &$unit.serialize(bytecode_version))?
+        }};
+    }
+
+    let ice_errors = compiled_unit::verify_units(&compiled_units);
+    let (modules, scripts): (Vec<_>, Vec<_>) = compiled_units
+        .into_iter()
+        .partition(|u| matches!(u, AnnotatedCompiledUnit::Module(_)));
+
+    // modules
+    if !modules.is_empty() {
+        std::fs::create_dir_all(dir_path!(out_dir, MODULE_SUB_DIR))?;
+    }
+    let digit_width = num_digits(modules.len());
+    for (idx, unit) in modules.into_iter().enumerate() {
+        let unit = unit.into_compiled_unit();
+        let mut path = dir_path!(
+            out_dir,
+            MODULE_SUB_DIR,
+            format!("{}_{}", format_idx(idx, digit_width), unit.name())
+        );
+        emit_unit!(path, unit);
+    }
+
+    // scripts
+    if !scripts.is_empty() {
+        std::fs::create_dir_all(dir_path!(out_dir, SCRIPT_SUB_DIR))?;
+    }
+    for unit in scripts {
+        let unit = unit.into_compiled_unit();
+        let mut path = dir_path!(out_dir, SCRIPT_SUB_DIR, unit.name().as_str());
+        emit_unit!(path, unit);
+    }
+
+    if !ice_errors.is_empty() {
+        report_diagnostics(&files, ice_errors)
+    }
+    Ok(())
+}
+
+fn generate_interface_files_for_deps(
+    deps: &mut Vec<IndexedPackagePath>,
+    interface_files_dir_opt: Option<String>,
+    module_to_named_address: &BTreeMap<CompiledModuleId, String>,
+) -> anyhow::Result<()> {
+    let interface_files_paths =
+        generate_interface_files(deps, interface_files_dir_opt, module_to_named_address, true)?;
+    deps.extend(interface_files_paths);
+    Ok(())
+}
+
+pub fn generate_interface_files(
+    mv_file_locations: &mut [IndexedPackagePath],
+    interface_files_dir_opt: Option<String>,
+    module_to_named_address: &BTreeMap<CompiledModuleId, String>,
+    separate_by_hash: bool,
+) -> anyhow::Result<Vec<IndexedPackagePath>> {
+    let mv_files = {
+        let mut v = vec![];
+        let (mv_magic_files, other_file_locations): (Vec<_>, Vec<_>) =
+            mv_file_locations.iter().cloned().partition(|s| {
+                Path::new(s.path.as_str()).is_file() && has_compiled_module_magic_number(&s.path)
+            });
+        v.extend(mv_magic_files);
+        for IndexedPackagePath {
+            package,
+            path,
+            named_address_map,
+        } in other_file_locations
+        {
+            v.extend(
+                find_filenames(&[path.as_str()], |path| {
+                    extension_equals(path, MOVE_COMPILED_EXTENSION)
+                })?
+                .into_iter()
+                .map(|path| IndexedPackagePath {
+                    package,
+                    path: path.into(),
+                    named_address_map,
+                }),
+            );
+        }
+        v
+    };
+    if mv_files.is_empty() {
+        return Ok(vec![]);
+    }
+
+    let interface_files_dir =
+        interface_files_dir_opt.unwrap_or_else(|| DEFAULT_OUTPUT_DIR.to_string());
+    let interface_sub_dir = dir_path!(interface_files_dir, MOVE_COMPILED_INTERFACES_DIR);
+    let all_addr_dir = if separate_by_hash {
+        use std::{
+            collections::hash_map::DefaultHasher,
+            hash::{Hash, Hasher},
+        };
+        const HASH_DELIM: &str = "%|%";
+
+        let mut hasher = DefaultHasher::new();
+        mv_files.len().hash(&mut hasher);
+        HASH_DELIM.hash(&mut hasher);
+        for IndexedPackagePath { path, .. } in &mv_files {
+            std::fs::read(path.as_str())?.hash(&mut hasher);
+            HASH_DELIM.hash(&mut hasher);
+        }
+
+        let mut dir = interface_sub_dir;
+        dir.push(format!("{:020}", hasher.finish()));
+        dir
+    } else {
+        interface_sub_dir
+    };
+
+    let mut result = vec![];
+    for IndexedPackagePath {
+        path,
+        package,
+        named_address_map,
+    } in mv_files
+    {
+        let (id, interface_contents) =
+            interface_generator::write_file_to_string(module_to_named_address, &path)?;
+        let addr_dir = dir_path!(all_addr_dir.clone(), format!("{}", id.address()));
+        let file_path = file_path!(addr_dir.clone(), format!("{}", id.name()), MOVE_EXTENSION);
+        result.push(IndexedPackagePath {
+            path: Symbol::from(file_path.clone().into_os_string().into_string().unwrap()),
+            package,
+            named_address_map,
+        });
+        // it's possible some files exist but not others due to multithreaded environments
+        if separate_by_hash && Path::new(&file_path).is_file() {
+            continue;
+        }
+
+        std::fs::create_dir_all(&addr_dir)?;
+
+        let mut tmp = NamedTempFile::new_in(addr_dir)?;
+        tmp.write_all(interface_contents.as_bytes())?;
+
+        // it's possible some files exist but not others due to multithreaded environments
+        // Check for the file existing and then safely move the tmp file there if
+        // it does not
+        if separate_by_hash && Path::new(&file_path).is_file() {
+            continue;
+        }
+        std::fs::rename(tmp.path(), file_path)?;
+    }
+
+    Ok(result)
+}
+
+fn has_compiled_module_magic_number(path: &str) -> bool {
+    use move_binary_format::file_format_common::BinaryConstants;
+    let mut file = match File::open(path) {
+        Err(_) => return false,
+        Ok(f) => f,
+    };
+    let mut magic = [0u8; BinaryConstants::MOVE_MAGIC_SIZE];
+    let num_bytes_read = match file.read(&mut magic) {
+        Err(_) => return false,
+        Ok(n) => n,
+    };
+    num_bytes_read == BinaryConstants::MOVE_MAGIC_SIZE && magic == BinaryConstants::MOVE_MAGIC
+}
+
+pub fn move_check_for_errors(
+    comments_and_compiler_res: Result<(CommentMap, SteppedCompiler<'_, PASS_PARSER>), Diagnostics>,
+) -> Diagnostics {
+    fn try_impl(
+        comments_and_compiler_res: Result<
+            (CommentMap, SteppedCompiler<'_, PASS_PARSER>),
+            Diagnostics,
+        >,
+    ) -> Result<(Vec<AnnotatedCompiledUnit>, Diagnostics), Diagnostics> {
+        let (_, compiler) = comments_and_compiler_res?;
+
+        let (mut compiler, cfgir) = compiler.run::<PASS_CFGIR>()?.into_ast();
+        let compilation_env = compiler.compilation_env();
+        if compilation_env.flags().is_testing() {
+            unit_test::plan_builder::construct_test_plan(compilation_env, None, &cfgir);
+        }
+
+        let (units, diags) = compiler.at_cfgir(cfgir).build()?;
+        Ok((units, diags))
+    }
+
+    let (units, inner_diags) = match try_impl(comments_and_compiler_res) {
+        Ok((units, inner_diags)) => (units, inner_diags),
+        Err(inner_diags) => return inner_diags,
+    };
+    let mut diags = compiled_unit::verify_units(&units);
+    diags.extend(inner_diags);
+    diags
+}
+
+//**************************************************************************************************
+// Translations
+//**************************************************************************************************
+
+impl PassResult {
+    pub fn equivalent_pass(&self) -> Pass {
+        match self {
+            PassResult::Parser(_) => PASS_PARSER,
+            PassResult::Expansion(_) => PASS_EXPANSION,
+            PassResult::Naming(_) => PASS_NAMING,
+            PassResult::Typing(_) => PASS_TYPING,
+            PassResult::HLIR(_) => PASS_HLIR,
+            PassResult::CFGIR(_) => PASS_CFGIR,
+            PassResult::Compilation(_, _) => PASS_COMPILATION,
+        }
+    }
+}
+
+fn run(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    cur: PassResult,
+    until: Pass,
+    mut result_check: impl FnMut(&PassResult, &CompilationEnv),
+) -> Result<PassResult, Diagnostics> {
+    assert!(
+        until <= PASS_COMPILATION,
+        "Invalid pass for run_to. Target is greater than maximum pass"
+    );
+    result_check(&cur, compilation_env);
+    if cur.equivalent_pass() >= until {
+        return Ok(cur);
+    }
+
+    match cur {
+        PassResult::Parser(prog) => {
+            let prog = parser::merge_spec_modules::program(compilation_env, prog);
+            let prog = unit_test::filter_test_members::program(compilation_env, prog);
+            let prog = verification::ast_filter::program(compilation_env, prog);
+            let eprog = expansion::translate::program(compilation_env, pre_compiled_lib, prog);
+            compilation_env.check_diags_at_or_above_severity(Severity::Bug)?;
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::Expansion(eprog),
+                until,
+                result_check,
+            )
+        }
+        PassResult::Expansion(eprog) => {
+            let nprog = naming::translate::program(compilation_env, pre_compiled_lib, eprog);
+            compilation_env.check_diags_at_or_above_severity(Severity::Bug)?;
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::Naming(nprog),
+                until,
+                result_check,
+            )
+        }
+        PassResult::Naming(nprog) => {
+            let tprog = typing::translate::program(compilation_env, pre_compiled_lib, nprog);
+            compilation_env.check_diags_at_or_above_severity(Severity::BlockingError)?;
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::Typing(tprog),
+                until,
+                result_check,
+            )
+        }
+        PassResult::Typing(tprog) => {
+            let hprog = hlir::translate::program(compilation_env, pre_compiled_lib, tprog);
+            compilation_env.check_diags_at_or_above_severity(Severity::Bug)?;
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::HLIR(hprog),
+                until,
+                result_check,
+            )
+        }
+        PassResult::HLIR(hprog) => {
+            let cprog = cfgir::translate::program(compilation_env, pre_compiled_lib, hprog);
+            compilation_env.check_diags_at_or_above_severity(Severity::NonblockingError)?;
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::CFGIR(cprog),
+                until,
+                result_check,
+            )
+        }
+        PassResult::CFGIR(cprog) => {
+            let compiled_units =
+                to_bytecode::translate::program(compilation_env, pre_compiled_lib, cprog);
+            compilation_env.check_diags_at_or_above_severity(Severity::NonblockingError)?;
+            let warnings = compilation_env.take_final_warning_diags();
+            assert!(until == PASS_COMPILATION);
+            run(
+                compilation_env,
+                pre_compiled_lib,
+                PassResult::Compilation(compiled_units, warnings),
+                PASS_COMPILATION,
+                result_check,
+            )
+        }
+        PassResult::Compilation(_, _) => unreachable!("ICE Pass::Compilation is >= all passes"),
+    }
+}
+
+//**************************************************************************************************
+// traits
+//**************************************************************************************************
+
+impl From<AbsIntVisitorObj> for Visitor {
+    fn from(f: AbsIntVisitorObj) -> Self {
+        Self::AbsIntVisitor(f)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/command_line/mod.rs b/vendors/move/crates/move-compiler/src/command_line/mod.rs
new file mode 100644
index 000000000..9f3baaaba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/command_line/mod.rs
@@ -0,0 +1,40 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod compiler;
+
+pub const DEPENDENCY: &str = "dependency";
+pub const DEPENDENCY_SHORT: char = 'd';
+
+pub const SENDER: &str = "sender";
+pub const SENDER_SHORT: char = 's';
+
+pub const OUT_DIR: &str = "out-dir";
+pub const OUT_DIR_SHORT: char = 'o';
+pub const DEFAULT_OUTPUT_DIR: &str = "build";
+
+pub const SHADOW: &str = "shadow";
+pub const SHADOW_SHORT: char = 'S';
+
+pub const SILENCE_WARNINGS: &str = "silence-warnings";
+pub const SILENCE_WARNINGS_SHORT: char = 'w';
+
+pub const SOURCE_MAP: &str = "source-map";
+pub const SOURCE_MAP_SHORT: char = 'm';
+
+pub const TEST: &str = "test";
+pub const TEST_SHORT: char = 't';
+
+pub const VERIFY: &str = "verify";
+pub const VERIFY_SHORT: char = 'v';
+
+pub const WARNINGS_ARE_ERRORS: &str = "warnings-are-errors";
+
+pub const BYTECODE_VERSION: &str = "bytecode-version";
+
+pub const COLOR_MODE_ENV_VAR: &str = "COLOR_MODE";
+
+pub const MOVE_COMPILED_INTERFACES_DIR: &str = "mv_interfaces";
+
+pub const COMPILED_NAMED_ADDRESS_MAPPING: &str = "compiled-module-address-name";
diff --git a/vendors/move/crates/move-compiler/src/compiled_unit.rs b/vendors/move/crates/move-compiler/src/compiled_unit.rs
new file mode 100644
index 000000000..880d0b9da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/compiled_unit.rs
@@ -0,0 +1,275 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag,
+    diagnostics::Diagnostics,
+    expansion::ast::{Attributes, ModuleIdent, ModuleIdent_, SpecId},
+    hlir::ast as H,
+    parser::ast::{FunctionName, ModuleName},
+    shared::{unique_map::UniqueMap, Name, NumericalAddress},
+};
+use move_binary_format::file_format as F;
+use move_bytecode_source_map::source_map::SourceMap;
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier as MoveCoreIdentifier,
+    language_storage::ModuleId,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::BTreeMap;
+
+//**************************************************************************************************
+// Compiled Unit
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct VarInfo {
+    pub type_: H::SingleType,
+    pub index: F::LocalIndex,
+}
+
+#[derive(Debug, Clone)]
+pub struct SpecInfo {
+    pub offset: F::CodeOffset,
+    // Free locals that are used but not declared in the block
+    pub used_locals: UniqueMap<H::Var, VarInfo>,
+}
+
+#[derive(Debug, Clone)]
+pub struct FunctionInfo {
+    pub spec_info: BTreeMap<SpecId, SpecInfo>,
+    pub parameters: Vec<(H::Var, VarInfo)>,
+    pub attributes: Attributes,
+}
+
+#[derive(Debug, Clone)]
+pub struct NamedCompiledModule {
+    // package name metadata from compiler arguments
+    pub package_name: Option<Symbol>,
+    pub address: NumericalAddress,
+    pub name: Symbol,
+    pub module: F::CompiledModule,
+    pub source_map: SourceMap,
+}
+
+#[derive(Debug, Clone)]
+pub struct NamedCompiledScript {
+    // package name metadata from compiler arguments
+    pub package_name: Option<Symbol>,
+    pub name: Symbol,
+    pub script: F::CompiledScript,
+    pub source_map: SourceMap,
+}
+
+#[derive(Debug, Clone)]
+pub struct AnnotatedCompiledModule {
+    pub loc: Loc,
+    pub module_name_loc: Loc,
+    pub address_name: Option<Name>,
+    pub named_module: NamedCompiledModule,
+    pub function_infos: UniqueMap<FunctionName, FunctionInfo>,
+}
+
+#[derive(Debug, Clone)]
+pub struct AnnotatedCompiledScript {
+    pub loc: Loc,
+    pub named_script: NamedCompiledScript,
+    pub function_info: FunctionInfo,
+}
+
+pub trait TargetModule {}
+pub trait TargetScript {}
+impl TargetScript for AnnotatedCompiledScript {}
+impl TargetScript for NamedCompiledScript {}
+impl TargetModule for AnnotatedCompiledModule {}
+impl TargetModule for NamedCompiledModule {}
+
+#[derive(Debug, Clone)]
+pub enum CompiledUnitEnum<TModule: TargetModule, TScript: TargetScript> {
+    Module(TModule),
+    Script(TScript),
+}
+
+pub type CompiledUnit = CompiledUnitEnum<NamedCompiledModule, NamedCompiledScript>;
+pub type AnnotatedCompiledUnit = CompiledUnitEnum<AnnotatedCompiledModule, AnnotatedCompiledScript>;
+
+impl AnnotatedCompiledModule {
+    pub fn module_ident(&self) -> ModuleIdent {
+        use crate::expansion::ast::Address;
+        let address = Address::Numerical {
+            name: self.address_name,
+            value: sp(self.loc, self.named_module.address),
+            name_conflict: false,
+        };
+        sp(
+            self.loc,
+            ModuleIdent_::new(
+                address,
+                ModuleName(sp(self.module_name_loc, self.named_module.name)),
+            ),
+        )
+    }
+
+    pub fn module_id(&self) -> (Option<Name>, ModuleId) {
+        let id = ModuleId::new(
+            AccountAddress::new(self.named_module.address.into_bytes()),
+            MoveCoreIdentifier::new(self.named_module.name.to_string()).unwrap(),
+        );
+        (self.address_name, id)
+    }
+}
+
+impl AnnotatedCompiledUnit {
+    pub fn verify(&self) -> Diagnostics {
+        match self {
+            Self::Module(AnnotatedCompiledModule {
+                loc,
+                named_module:
+                    NamedCompiledModule {
+                        module, source_map, ..
+                    },
+                ..
+            }) => verify_module(source_map, *loc, module),
+            Self::Script(AnnotatedCompiledScript {
+                loc,
+                named_script:
+                    NamedCompiledScript {
+                        script, source_map, ..
+                    },
+                ..
+            }) => verify_script(source_map, *loc, script),
+        }
+    }
+
+    pub fn into_compiled_unit(self) -> CompiledUnit {
+        match self {
+            Self::Module(AnnotatedCompiledModule {
+                named_module: module,
+                ..
+            }) => CompiledUnitEnum::Module(module),
+            Self::Script(AnnotatedCompiledScript {
+                named_script: script,
+                ..
+            }) => CompiledUnitEnum::Script(script),
+        }
+    }
+
+    pub fn package_name(&self) -> Option<Symbol> {
+        match self {
+            Self::Module(AnnotatedCompiledModule { named_module, .. }) => named_module.package_name,
+            Self::Script(AnnotatedCompiledScript { named_script, .. }) => named_script.package_name,
+        }
+    }
+
+    pub fn loc(&self) -> &Loc {
+        match self {
+            Self::Module(AnnotatedCompiledModule { loc, .. })
+            | Self::Script(AnnotatedCompiledScript { loc, .. }) => loc,
+        }
+    }
+}
+
+impl CompiledUnit {
+    pub fn name(&self) -> Symbol {
+        match self {
+            Self::Module(NamedCompiledModule { name, .. })
+            | Self::Script(NamedCompiledScript { name, .. }) => *name,
+        }
+    }
+
+    pub fn package_name(&self) -> Option<Symbol> {
+        match self {
+            Self::Module(NamedCompiledModule { package_name, .. })
+            | Self::Script(NamedCompiledScript { package_name, .. }) => *package_name,
+        }
+    }
+
+    pub fn source_map(&self) -> &SourceMap {
+        match self {
+            Self::Module(NamedCompiledModule { source_map, .. })
+            | Self::Script(NamedCompiledScript { source_map, .. }) => source_map,
+        }
+    }
+
+    pub fn serialize(&self, bytecode_version: Option<u32>) -> Vec<u8> {
+        let mut serialized = Vec::<u8>::new();
+        match self {
+            Self::Module(NamedCompiledModule { module, .. }) => module
+                .serialize_for_version(bytecode_version, &mut serialized)
+                .unwrap(),
+            Self::Script(NamedCompiledScript { script, .. }) => script
+                .serialize_for_version(bytecode_version, &mut serialized)
+                .unwrap(),
+        };
+        serialized
+    }
+
+    #[allow(dead_code)]
+    pub fn serialize_debug(self) -> Vec<u8> {
+        match self {
+            Self::Module(NamedCompiledModule { module, .. }) => format!("{:?}", module),
+            Self::Script(NamedCompiledScript { script, .. }) => format!("{:?}", script),
+        }
+        .into()
+    }
+
+    pub fn serialize_source_map(&self) -> Vec<u8> {
+        match self {
+            Self::Module(NamedCompiledModule { source_map, .. }) => {
+                bcs::to_bytes(source_map).unwrap()
+            }
+            Self::Script(NamedCompiledScript { source_map, .. }) => {
+                bcs::to_bytes(source_map).unwrap()
+            }
+        }
+    }
+}
+
+fn bytecode_verifier_mismatch_bug(
+    sm: &SourceMap,
+    loc: Loc,
+    location: move_binary_format::errors::Location,
+    e: move_binary_format::errors::VMError,
+) -> Diagnostics {
+    let loc = match e.offsets().first() {
+        Some((fdef_idx, offset)) if &location == e.location() => {
+            sm.get_code_location(*fdef_idx, *offset).unwrap_or(loc)
+        }
+        _ => loc,
+    };
+    Diagnostics::from(vec![diag!(
+        Bug::BytecodeVerification,
+        (loc, format!("ICE failed bytecode verifier: {:#?}", e)),
+    )])
+}
+
+fn verify_module(sm: &SourceMap, loc: Loc, cm: &F::CompiledModule) -> Diagnostics {
+    match move_bytecode_verifier::verifier::verify_module_unmetered(cm) {
+        Ok(_) => Diagnostics::new(),
+        Err(e) => bytecode_verifier_mismatch_bug(
+            sm,
+            loc,
+            move_binary_format::errors::Location::Module(cm.self_id()),
+            e,
+        ),
+    }
+}
+
+fn verify_script(sm: &SourceMap, loc: Loc, cs: &F::CompiledScript) -> Diagnostics {
+    match move_bytecode_verifier::verifier::verify_script_unmetered(cs) {
+        Ok(_) => Diagnostics::new(),
+        Err(e) => {
+            bytecode_verifier_mismatch_bug(sm, loc, move_binary_format::errors::Location::Script, e)
+        }
+    }
+}
+
+pub fn verify_units<'a>(units: impl IntoIterator<Item = &'a AnnotatedCompiledUnit>) -> Diagnostics {
+    let mut diags = Diagnostics::new();
+    for unit in units {
+        diags.extend(unit.verify());
+    }
+    diags
+}
diff --git a/vendors/move/crates/move-compiler/src/diagnostics/codes.rs b/vendors/move/crates/move-compiler/src/diagnostics/codes.rs
new file mode 100644
index 000000000..ebef02f4c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/diagnostics/codes.rs
@@ -0,0 +1,447 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//**************************************************************************************************
+// Main types
+//**************************************************************************************************
+
+use crate::shared::FILTER_ALL;
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, PartialOrd, Ord)]
+pub enum Severity {
+    Warning = 0,
+    NonblockingError = 1,
+    BlockingError = 2,
+    Bug = 3,
+}
+
+/// A an optional prefix to distinguish between different types of warnings (internal vs. possibly
+/// multiple externally provided ones).
+pub type ExternalPrefix = Option<&'static str>;
+/// The name for a well-known filter.
+pub type WellKnownFilterName = &'static str;
+/// The ID for a diagnostic, consisting of an optional prefix, a category, and a code.
+pub type DiagnosticsID = (ExternalPrefix, u8, u8);
+
+#[derive(PartialEq, Eq, Clone, Debug, Hash)]
+pub struct DiagnosticInfo {
+    severity: Severity,
+    category: u8,
+    code: u8,
+    external_prefix: ExternalPrefix,
+    message: &'static str,
+}
+
+pub(crate) trait DiagnosticCode: Copy {
+    const CATEGORY: Category;
+
+    fn severity(&self) -> Severity;
+
+    fn code_and_message(&self) -> (u8, &'static str);
+
+    fn into_info(self) -> DiagnosticInfo {
+        let severity = self.severity();
+        let category = Self::CATEGORY as u8;
+        let (code, message) = self.code_and_message();
+        DiagnosticInfo {
+            severity,
+            category,
+            code,
+            external_prefix: None,
+            message,
+        }
+    }
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, PartialOrd, Ord)]
+/// Represents a single annotation for a diagnostic filter
+pub enum WarningFilter {
+    /// Filters all warnings
+    All(ExternalPrefix),
+    /// Filters all warnings of a specific category. Only known filters have names.
+    Category {
+        prefix: ExternalPrefix,
+        category: u8,
+        name: Option<WellKnownFilterName>,
+    },
+    /// Filters a single warning, as defined by codes below. Only known filters have names.
+    Code {
+        prefix: ExternalPrefix,
+        category: u8,
+        code: u8,
+        name: Option<WellKnownFilterName>,
+    },
+}
+
+/// The text used in the attribute for warning suppression
+pub const WARNING_FILTER_ATTR: &str = "allow";
+
+//**************************************************************************************************
+// Categories and Codes
+//**************************************************************************************************
+
+/// A custom DiagnosticInfo.
+/// The diagnostic will get rendered as
+/// `"[{external_prefix}{severity}{category}{code}] {message}"`.
+/// Note, this will will panic if `category > 99`
+pub const fn custom(
+    external_prefix: &'static str,
+    severity: Severity,
+    category: u8,
+    code: u8,
+    message: &'static str,
+) -> DiagnosticInfo {
+    assert!(category <= 99);
+    DiagnosticInfo {
+        severity,
+        category,
+        code,
+        external_prefix: Some(external_prefix),
+        message,
+    }
+}
+
+macro_rules! codes {
+    ($($cat:ident: [
+        $($code:ident: { msg: $code_msg:literal, severity:$sev:ident $(,)? }),* $(,)?
+    ]),* $(,)?) => {
+        #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash, PartialOrd, Ord)]
+        #[repr(u8)]
+        pub enum Category {
+            $($cat,)*
+        }
+
+        impl TryFrom<u8> for Category {
+            type Error = ();
+            fn try_from(value: u8) -> Result<Self, Self::Error> {
+                match () {
+                    $(_ if value == (Category::$cat as u8) => Ok(Category::$cat),)*
+                    _ => Err(()),
+                }
+            }
+        }
+
+        $(
+            #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
+            #[repr(u8)]
+            pub enum $cat {
+                DontStartAtZeroPlaceholder,
+                $($code,)*
+            }
+
+            impl DiagnosticCode for $cat {
+                const CATEGORY: Category = {
+                    // hacky check that $cat_num <= 99
+                    let cat_is_leq_99 = (Category::$cat as u8) <= 99;
+                    ["Diagnostic Category must be a u8 <= 99"][!cat_is_leq_99 as usize];
+                    Category::$cat
+                };
+
+                fn severity(&self) -> Severity {
+                    match self {
+                        Self::DontStartAtZeroPlaceholder =>
+                            panic!("ICE do not use placeholder error code"),
+                        $(Self::$code => Severity::$sev,)*
+                    }
+                }
+
+                fn code_and_message(&self) -> (u8, &'static str) {
+                    let code = *self as u8;
+                    debug_assert!(code > 0);
+                    match self {
+                        Self::DontStartAtZeroPlaceholder =>
+                            panic!("ICE do not use placeholder error code"),
+                        $(Self::$code => (code, $code_msg),)*
+                    }
+                }
+            }
+        )*
+
+    };
+}
+
+codes!(
+    // bucket for random one off errors. unlikely to be used
+    Uncategorized: [
+        DeprecatedWillBeRemoved: { msg: "DEPRECATED. will be removed", severity: Warning },
+    ],
+    // syntax errors
+    Syntax: [
+        InvalidCharacter: { msg: "invalid character", severity: NonblockingError },
+        UnexpectedToken: { msg: "unexpected token", severity: NonblockingError },
+        InvalidModifier: { msg: "invalid modifier", severity: NonblockingError },
+        InvalidDocComment: { msg: "invalid documentation comment", severity: Warning },
+        InvalidAddress: { msg: "invalid address", severity: NonblockingError },
+        InvalidNumber: { msg: "invalid number literal", severity: NonblockingError },
+        InvalidByteString: { msg: "invalid byte string", severity: NonblockingError },
+        InvalidHexString: { msg: "invalid hex string", severity: NonblockingError },
+        InvalidLValue: { msg: "invalid assignment", severity: NonblockingError },
+        SpecContextRestricted:
+            { msg: "syntax item restricted to spec contexts", severity: BlockingError },
+        InvalidSpecBlockMember: { msg: "invalid spec block member", severity: NonblockingError },
+        InvalidRestrictedIdentifier:
+            { msg: "invalid identifier escape", severity: NonblockingError },
+    ],
+    // errors for any rules around declaration items
+    Declarations: [
+        DuplicateItem:
+            { msg: "duplicate declaration, item, or annotation", severity: NonblockingError },
+        UnnecessaryItem: { msg: "unnecessary or extraneous item", severity: NonblockingError },
+        InvalidAddress: { msg: "invalid 'address' declaration", severity: NonblockingError },
+        InvalidModule: { msg: "invalid 'module' declaration", severity: NonblockingError },
+        InvalidScript: { msg: "invalid 'script' declaration", severity: NonblockingError },
+        InvalidConstant: { msg: "invalid 'const' declaration", severity: NonblockingError },
+        InvalidFunction: { msg: "invalid 'fun' declaration", severity: NonblockingError },
+        InvalidStruct: { msg: "invalid 'struct' declaration", severity: NonblockingError },
+        InvalidSpec: { msg: "invalid 'spec' declaration", severity: NonblockingError },
+        InvalidName: { msg: "invalid name", severity: BlockingError },
+        InvalidFriendDeclaration:
+            { msg: "invalid 'friend' declaration", severity: NonblockingError },
+        InvalidAcquiresItem: { msg: "invalid 'acquires' item", severity: NonblockingError },
+        InvalidPhantomUse:
+            { msg: "invalid phantom type parameter usage", severity: NonblockingError },
+        InvalidNonPhantomUse:
+            { msg: "invalid non-phantom type parameter usage", severity: Warning },
+        InvalidAttribute: { msg: "invalid attribute", severity: NonblockingError },
+        InvalidVisibilityModifier:
+            { msg: "invalid visibility modifier", severity: NonblockingError },
+        InvalidUseFun: { msg: "invalid 'use fun' declaration", severity: NonblockingError },
+    ],
+    // errors name resolution, mostly expansion/translate and naming/translate
+    NameResolution: [
+        AddressWithoutValue: { msg: "address with no value", severity: NonblockingError },
+        UnboundModule: { msg: "unbound module", severity: BlockingError },
+        UnboundModuleMember: { msg: "unbound module member", severity: BlockingError },
+        UnboundType: { msg: "unbound type", severity: BlockingError },
+        UnboundUnscopedName: { msg: "unbound unscoped name", severity: BlockingError },
+        NamePositionMismatch: { msg: "unexpected name in this position", severity: BlockingError },
+        TooManyTypeArguments: { msg: "too many type arguments", severity: NonblockingError },
+        TooFewTypeArguments: { msg: "too few type arguments", severity: BlockingError },
+        UnboundVariable: { msg: "unbound variable", severity: BlockingError },
+        UnboundField: { msg: "unbound field", severity: BlockingError },
+        ReservedName: { msg: "invalid use of reserved name", severity: BlockingError },
+        UnboundMacro: { msg: "unbound macro", severity: BlockingError },
+        PositionalCallMismatch: { msg: "positional call mismatch", severity: NonblockingError },
+    ],
+    // errors for typing rules. mostly typing/translate
+    TypeSafety: [
+        Visibility: { msg: "restricted visibility", severity: NonblockingError },
+        ScriptContext: { msg: "requires script context", severity: NonblockingError },
+        BuiltinOperation: { msg: "built-in operation not supported", severity: BlockingError },
+        ExpectedBaseType: { msg: "expected a single non-reference type", severity: BlockingError },
+        ExpectedSingleType: { msg: "expected a single type", severity: BlockingError },
+        SubtypeError: { msg: "invalid subtype", severity: BlockingError },
+        JoinError: { msg: "incompatible types", severity: BlockingError },
+        RecursiveType: { msg: "invalid type. recursive type found", severity: BlockingError },
+        ExpectedSpecificType: { msg: "expected specific type", severity: BlockingError },
+        UninferredType: { msg: "cannot infer type", severity: BlockingError },
+        ScriptSignature: { msg: "invalid script signature", severity: NonblockingError },
+        TypeForConstant: { msg: "invalid type for constant", severity: BlockingError },
+        UnsupportedConstant:
+            { msg: "invalid statement or expression in constant", severity: BlockingError },
+        InvalidLoopControl: { msg: "invalid loop control", severity: BlockingError },
+        InvalidNativeUsage: { msg: "invalid use of native item", severity: BlockingError },
+        TooFewArguments: { msg: "too few arguments", severity: BlockingError },
+        TooManyArguments: { msg: "too many arguments", severity: NonblockingError },
+        CyclicData: { msg: "cyclic data", severity: NonblockingError },
+        CyclicInstantiation:
+            { msg: "cyclic type instantiation", severity: NonblockingError },
+        MissingAcquires: { msg: "missing acquires annotation", severity: NonblockingError },
+        InvalidNum: { msg: "invalid number after type inference", severity: NonblockingError },
+        NonInvocablePublicScript: {
+            msg: "script function cannot be invoked with this signature \
+                (NOTE: this may become an error in the future)",
+            severity: Warning
+        },
+        InvalidMethodCall: { msg: "invalid method call", severity: BlockingError },
+        InvalidImmVariableUsage:
+            { msg: "invalid usage of immutable variable", severity: NonblockingError },
+    ],
+    // errors for ability rules. mostly typing/translate
+    AbilitySafety: [
+        Constraint: { msg: "ability constraint not satisfied", severity: NonblockingError },
+        ImplicitlyCopyable: { msg: "type not implicitly copyable", severity: NonblockingError },
+    ],
+    // errors for move rules. mostly cfgir/locals
+    MoveSafety: [
+        UnusedUndroppable: { msg: "unused value without 'drop'", severity: NonblockingError },
+        UnassignedVariable: { msg: "use of unassigned variable", severity: NonblockingError },
+    ],
+    // errors for move rules. mostly cfgir/borrows
+    ReferenceSafety: [
+        RefTrans: { msg: "referential transparency violated", severity: BlockingError },
+        MutOwns: { msg: "mutable ownership violated", severity: NonblockingError },
+        Dangling: {
+            msg: "invalid operation, could create dangling a reference",
+            severity: NonblockingError,
+        },
+        InvalidReturn:
+            { msg: "invalid return of locally borrowed state", severity: NonblockingError },
+        InvalidTransfer: { msg: "invalid transfer of references", severity: NonblockingError },
+        AmbiguousVariableUsage: { msg: "ambiguous usage of variable", severity: NonblockingError },
+    ],
+    BytecodeGeneration: [
+        UnfoldableConstant: { msg: "cannot compute constant value", severity: NonblockingError },
+    ],
+    // errors for any unused code or items
+    UnusedItem: [
+        Alias: { msg: "unused alias", severity: Warning },
+        Variable: { msg: "unused variable", severity: Warning },
+        Assignment: { msg: "unused assignment", severity: Warning },
+        TrailingSemi: { msg: "unnecessary trailing semicolon", severity: Warning },
+        DeadCode: { msg: "dead or unreachable code", severity: Warning },
+        StructTypeParam: { msg: "unused struct type parameter", severity: Warning },
+        Attribute: { msg: "unused attribute", severity: Warning },
+        Function: { msg: "unused function", severity: Warning },
+        StructField: { msg: "unused struct field", severity: Warning },
+        FunTypeParam: { msg: "unused function type parameter", severity: Warning },
+        Constant: { msg: "unused constant", severity: Warning },
+        MutModifier: { msg: "unused 'mut' modifiers", severity: Warning },
+        MutReference: { msg: "unused mutable reference '&mut'", severity: Warning },
+        MutParam: { msg: "unused mutable reference '&mut' parameter", severity: Warning },
+    ],
+    Attributes: [
+        Duplicate: { msg: "invalid duplicate attribute", severity: NonblockingError },
+        InvalidName: { msg: "invalid attribute name", severity: NonblockingError },
+        InvalidValue: { msg: "invalid attribute value", severity: NonblockingError },
+        InvalidUsage: { msg: "invalid usage of known attribute", severity: NonblockingError },
+        InvalidTest: { msg: "unable to generate test", severity: NonblockingError },
+        InvalidBytecodeInst:
+            { msg: "unknown bytecode instruction function", severity: NonblockingError },
+        ValueWarning: { msg: "potential issue with attribute value", severity: Warning }
+    ],
+    Tests: [
+        TestFailed: { msg: "test failure", severity: BlockingError },
+    ],
+    Bug: [
+        BytecodeGeneration: { msg: "BYTECODE GENERATION FAILED", severity: Bug },
+        BytecodeVerification: { msg: "BYTECODE VERIFICATION FAILED", severity: Bug },
+    ],
+    Editions: [
+        FeatureTooNew: {
+            msg: "feature is not supported in specified edition",
+            severity: BlockingError,
+        },
+    ]
+);
+
+//**************************************************************************************************
+// Warning Filter
+//**************************************************************************************************
+
+impl WarningFilter {
+    pub fn to_str(self) -> Option<&'static str> {
+        match self {
+            Self::All(_) => Some(FILTER_ALL),
+            Self::Category { name, .. } | Self::Code { name, .. } => name,
+        }
+    }
+
+    pub fn code(
+        prefix: ExternalPrefix,
+        category: u8,
+        code: u8,
+        name: Option<WellKnownFilterName>,
+    ) -> Self {
+        Self::Code {
+            prefix,
+            category,
+            code,
+            name,
+        }
+    }
+
+    pub fn category(
+        prefix: ExternalPrefix,
+        category: u8,
+        name: Option<WellKnownFilterName>,
+    ) -> Self {
+        Self::Category {
+            prefix,
+            category,
+            name,
+        }
+    }
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl DiagnosticInfo {
+    pub fn render(self) -> (/* code */ String, /* message */ &'static str) {
+        let Self {
+            severity,
+            category,
+            code,
+            external_prefix,
+            message,
+        } = self;
+        let sev_prefix = match severity {
+            Severity::BlockingError | Severity::NonblockingError => "E",
+            Severity::Warning => "W",
+            Severity::Bug => "ICE",
+        };
+        debug_assert!(category <= 99);
+        let string_code = if let Some(ext) = external_prefix {
+            format!("{ext}{sev_prefix}{category:02}{code:03}")
+        } else {
+            format!("{sev_prefix}{category:02}{code:03}")
+        };
+        (string_code, message)
+    }
+
+    pub(crate) fn set_severity(mut self, severity: Severity) -> Self {
+        self.severity = severity;
+        self
+    }
+
+    pub fn severity(&self) -> Severity {
+        self.severity
+    }
+
+    pub fn category(&self) -> u8 {
+        self.category
+    }
+
+    pub fn code(&self) -> u8 {
+        self.code
+    }
+
+    pub fn id(&self) -> DiagnosticsID {
+        (self.external_prefix, self.category, self.code)
+    }
+
+    pub fn message(&self) -> &'static str {
+        self.message
+    }
+
+    pub fn is_external(&self) -> bool {
+        self.external_prefix.is_some()
+    }
+
+    pub fn external_prefix(&self) -> Option<&'static str> {
+        self.external_prefix
+    }
+}
+
+impl Severity {
+    pub const MIN: Self = Self::Warning;
+    pub const MAX: Self = Self::Bug;
+
+    pub fn into_codespan_severity(self) -> codespan_reporting::diagnostic::Severity {
+        use codespan_reporting::diagnostic::Severity as CSRSeverity;
+        match self {
+            Severity::Bug => CSRSeverity::Bug,
+            Severity::BlockingError | Severity::NonblockingError => CSRSeverity::Error,
+            Severity::Warning => CSRSeverity::Warning,
+        }
+    }
+}
+
+impl Default for Severity {
+    fn default() -> Self {
+        Self::MIN
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/diagnostics/mod.rs b/vendors/move/crates/move-compiler/src/diagnostics/mod.rs
new file mode 100644
index 000000000..e5ee0b7e1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/diagnostics/mod.rs
@@ -0,0 +1,693 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod codes;
+
+use crate::{
+    command_line::COLOR_MODE_ENV_VAR,
+    diagnostics::codes::{
+        DiagnosticCode, DiagnosticInfo, ExternalPrefix, Severity, WarningFilter,
+        WellKnownFilterName,
+    },
+    shared::{
+        ast_debug::AstDebug, FILTER_UNUSED_CONST, FILTER_UNUSED_FUNCTION, FILTER_UNUSED_MUT_PARAM,
+        FILTER_UNUSED_MUT_REF, FILTER_UNUSED_STRUCT_FIELD, FILTER_UNUSED_TYPE_PARAMETER,
+    },
+};
+use codespan_reporting::{
+    self as csr,
+    files::SimpleFiles,
+    term::{
+        emit,
+        termcolor::{Buffer, ColorChoice, StandardStream, WriteColor},
+        Config,
+    },
+};
+use move_command_line_common::{env::read_env_var, files::FileHash};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, HashMap, HashSet},
+    iter::FromIterator,
+    ops::Range,
+};
+
+use self::codes::{UnusedItem, WARNING_FILTER_ATTR};
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+pub type FileId = usize;
+pub type FileName = Symbol;
+
+pub type FilesSourceText = HashMap<FileHash, (FileName, String)>;
+type FileMapping = HashMap<FileHash, FileId>;
+
+#[derive(PartialEq, Eq, Clone, Debug, Hash)]
+#[must_use]
+pub struct Diagnostic {
+    info: DiagnosticInfo,
+    primary_label: (Loc, String),
+    secondary_labels: Vec<(Loc, String)>,
+    notes: Vec<String>,
+}
+
+#[derive(PartialEq, Eq, Hash, Clone, Debug, Default)]
+pub struct Diagnostics(Option<Diagnostics_>);
+
+#[derive(PartialEq, Eq, Hash, Clone, Debug, Default)]
+struct Diagnostics_ {
+    diagnostics: Vec<Diagnostic>,
+    // diagnostics filtered in source code
+    filtered_source_diagnostics: Vec<Diagnostic>,
+    severity_count: BTreeMap<Severity, usize>,
+}
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+/// Used to filter out diagnostics, specifically used for warning suppression
+pub struct WarningFilters {
+    filters: BTreeMap<ExternalPrefix, UnprefixedWarningFilters>,
+    for_dependency: bool, // if false, the filters are used for source code
+}
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+/// Filters split by category and code
+enum UnprefixedWarningFilters {
+    /// Remove all warnings
+    All,
+    Specified {
+        /// Remove all diags of this category with optional known name
+        categories: BTreeMap<u8, Option<WellKnownFilterName>>,
+        /// Remove specific diags with optional known filter name
+        codes: BTreeMap<(u8, u8), Option<WellKnownFilterName>>,
+    },
+    /// No filter
+    Empty,
+}
+
+//**************************************************************************************************
+// Reporting
+//**************************************************************************************************
+
+pub fn report_diagnostics(files: &FilesSourceText, diags: Diagnostics) -> ! {
+    let should_exit = true;
+    report_diagnostics_impl(files, diags, should_exit);
+    std::process::exit(1)
+}
+
+pub fn report_warnings(files: &FilesSourceText, warnings: Diagnostics) {
+    if warnings.is_empty() {
+        return;
+    }
+    debug_assert!(warnings.max_severity().unwrap() == Severity::Warning);
+    report_diagnostics_impl(files, warnings, false)
+}
+
+fn report_diagnostics_impl(files: &FilesSourceText, diags: Diagnostics, should_exit: bool) {
+    let color_choice = match read_env_var(COLOR_MODE_ENV_VAR).as_str() {
+        "NONE" => ColorChoice::Never,
+        "ANSI" => ColorChoice::AlwaysAnsi,
+        "ALWAYS" => ColorChoice::Always,
+        _ => ColorChoice::Auto,
+    };
+    let mut writer = StandardStream::stderr(color_choice);
+    output_diagnostics(&mut writer, files, diags);
+    if should_exit {
+        std::process::exit(1);
+    }
+}
+
+pub fn unwrap_or_report_diagnostics<T>(files: &FilesSourceText, res: Result<T, Diagnostics>) -> T {
+    match res {
+        Ok(t) => t,
+        Err(diags) => {
+            assert!(!diags.is_empty());
+            report_diagnostics(files, diags)
+        }
+    }
+}
+
+pub fn report_diagnostics_to_buffer(files: &FilesSourceText, diags: Diagnostics) -> Vec<u8> {
+    let mut writer = Buffer::no_color();
+    output_diagnostics(&mut writer, files, diags);
+    writer.into_inner()
+}
+
+pub fn report_diagnostics_to_color_buffer(files: &FilesSourceText, diags: Diagnostics) -> Vec<u8> {
+    let mut writer = Buffer::ansi();
+    output_diagnostics(&mut writer, files, diags);
+    writer.into_inner()
+}
+
+fn output_diagnostics<W: WriteColor>(
+    writer: &mut W,
+    sources: &FilesSourceText,
+    diags: Diagnostics,
+) {
+    let mut files = SimpleFiles::new();
+    let mut file_mapping = HashMap::new();
+    for (fhash, (fname, source)) in sources {
+        let id = files.add(*fname, source.as_str());
+        file_mapping.insert(*fhash, id);
+    }
+    render_diagnostics(writer, &files, &file_mapping, diags);
+}
+
+fn render_diagnostics(
+    writer: &mut dyn WriteColor,
+    files: &SimpleFiles<Symbol, &str>,
+    file_mapping: &FileMapping,
+    diags: Diagnostics,
+) {
+    let Diagnostics(Some(mut diags)) = diags else {
+        return;
+    };
+    diags.diagnostics.sort_by(|e1, e2| {
+        let loc1: &Loc = &e1.primary_label.0;
+        let loc2: &Loc = &e2.primary_label.0;
+        loc1.cmp(loc2)
+    });
+    let mut seen: HashSet<Diagnostic> = HashSet::new();
+    for diag in diags.diagnostics {
+        if seen.contains(&diag) {
+            continue;
+        }
+        seen.insert(diag.clone());
+        let rendered = render_diagnostic(file_mapping, diag);
+        emit(writer, &Config::default(), files, &rendered).unwrap()
+    }
+}
+
+fn convert_loc(file_mapping: &FileMapping, loc: Loc) -> (FileId, Range<usize>) {
+    let fname = loc.file_hash();
+    let id = *file_mapping.get(&fname).unwrap();
+    let range = loc.usize_range();
+    (id, range)
+}
+
+fn render_diagnostic(
+    file_mapping: &FileMapping,
+    diag: Diagnostic,
+) -> csr::diagnostic::Diagnostic<FileId> {
+    use csr::diagnostic::{Label, LabelStyle};
+    let mk_lbl = |style: LabelStyle, msg: (Loc, String)| -> Label<FileId> {
+        let (id, range) = convert_loc(file_mapping, msg.0);
+        csr::diagnostic::Label::new(style, id, range).with_message(msg.1)
+    };
+    let Diagnostic {
+        info,
+        primary_label,
+        secondary_labels,
+        notes,
+    } = diag;
+    let mut diag = csr::diagnostic::Diagnostic::new(info.severity().into_codespan_severity());
+    let (code, message) = info.render();
+    diag = diag.with_code(code);
+    diag = diag.with_message(message.to_string());
+    diag = diag.with_labels(vec![mk_lbl(LabelStyle::Primary, primary_label)]);
+    diag = diag.with_labels(
+        secondary_labels
+            .into_iter()
+            .map(|msg| mk_lbl(LabelStyle::Secondary, msg))
+            .collect(),
+    );
+    diag = diag.with_notes(notes);
+    diag
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl Diagnostics {
+    pub fn new() -> Self {
+        Self(None)
+    }
+
+    pub fn max_severity(&self) -> Option<Severity> {
+        let Self(Some(inner)) = self else { return None };
+        debug_assert!(inner.severity_count.values().all(|count| *count > 0));
+        inner
+            .severity_count
+            .iter()
+            .max_by_key(|(sev, _count)| **sev)
+            .map(|(sev, _count)| *sev)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        let Self(Some(inner)) = self else { return true };
+        inner.diagnostics.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        let Self(Some(inner)) = self else { return 0 };
+        inner.diagnostics.len()
+    }
+
+    pub fn add(&mut self, diag: Diagnostic) {
+        if self.0.is_none() {
+            self.0 = Some(Diagnostics_::default())
+        }
+        let inner = self.0.as_mut().unwrap();
+        *inner
+            .severity_count
+            .entry(diag.info.severity())
+            .or_insert(0) += 1;
+        inner.diagnostics.push(diag)
+    }
+
+    pub fn add_opt(&mut self, diag_opt: Option<Diagnostic>) {
+        if let Some(diag) = diag_opt {
+            self.add(diag)
+        }
+    }
+
+    pub fn add_source_filtered(&mut self, diag: Diagnostic) {
+        if self.0.is_none() {
+            self.0 = Some(Diagnostics_::default())
+        }
+        let inner = self.0.as_mut().unwrap();
+        inner.filtered_source_diagnostics.push(diag)
+    }
+
+    pub fn extend(&mut self, other: Self) {
+        let Self(Some(Diagnostics_ {
+            diagnostics,
+            filtered_source_diagnostics: _,
+            severity_count,
+        })) = other
+        else {
+            return;
+        };
+        if self.0.is_none() {
+            self.0 = Some(Diagnostics_::default())
+        }
+        let inner = self.0.as_mut().unwrap();
+        for (sev, count) in severity_count {
+            *inner.severity_count.entry(sev).or_insert(0) += count;
+        }
+        inner.diagnostics.extend(diagnostics)
+    }
+
+    pub fn into_vec(self) -> Vec<Diagnostic> {
+        self.0.map(|inner| inner.diagnostics).unwrap_or_default()
+    }
+
+    pub fn into_codespan_format(
+        self,
+    ) -> Vec<(
+        codespan_reporting::diagnostic::Severity,
+        &'static str,
+        (Loc, String),
+        Vec<(Loc, String)>,
+        Vec<String>,
+    )> {
+        let mut v = vec![];
+        for diag in self.into_vec() {
+            let Diagnostic {
+                info,
+                primary_label,
+                secondary_labels,
+                notes,
+            } = diag;
+            let csr_diag = (
+                info.severity().into_codespan_severity(),
+                info.message(),
+                primary_label,
+                secondary_labels,
+                notes,
+            );
+            v.push(csr_diag)
+        }
+        v
+    }
+
+    pub fn any_with_prefix(&self, prefix: &str) -> bool {
+        let Self(Some(inner)) = self else {
+            return false;
+        };
+        inner
+            .diagnostics
+            .iter()
+            .any(|d| d.info.external_prefix() == Some(prefix))
+    }
+
+    /// Returns the number of diags filtered in source (user) code (an not in the dependencies) that
+    /// have a given prefix (first value returned) and how many different categories of diags were
+    /// filtered.
+    pub fn filtered_source_diags_with_prefix(&self, prefix: &str) -> (usize, usize) {
+        let Self(Some(inner)) = self else {
+            return (0, 0);
+        };
+        let mut filtered_diags_num = 0;
+        let mut filtered_categories = HashSet::new();
+        inner.filtered_source_diagnostics.iter().for_each(|d| {
+            if d.info.external_prefix() == Some(prefix) {
+                filtered_diags_num += 1;
+                filtered_categories.insert(d.info.category());
+            }
+        });
+        (filtered_diags_num, filtered_categories.len())
+    }
+}
+
+impl Diagnostic {
+    pub fn new(
+        code: impl Into<DiagnosticInfo>,
+        (loc, label): (Loc, impl ToString),
+        secondary_labels: impl IntoIterator<Item = (Loc, impl ToString)>,
+        notes: impl IntoIterator<Item = impl ToString>,
+    ) -> Self {
+        Diagnostic {
+            info: code.into(),
+            primary_label: (loc, label.to_string()),
+            secondary_labels: secondary_labels
+                .into_iter()
+                .map(|(loc, msg)| (loc, msg.to_string()))
+                .collect(),
+            notes: notes.into_iter().map(|msg| msg.to_string()).collect(),
+        }
+    }
+
+    pub fn set_code(mut self, code: impl Into<DiagnosticInfo>) -> Self {
+        self.info = code.into();
+        self
+    }
+
+    pub(crate) fn set_severity(mut self, severity: Severity) -> Self {
+        self.info = self.info.set_severity(severity);
+        self
+    }
+
+    #[allow(unused)]
+    pub fn add_secondary_labels(
+        &mut self,
+        additional_labels: impl IntoIterator<Item = (Loc, impl ToString)>,
+    ) {
+        self.secondary_labels.extend(
+            additional_labels
+                .into_iter()
+                .map(|(loc, msg)| (loc, msg.to_string())),
+        )
+    }
+
+    pub fn add_secondary_label(&mut self, (loc, msg): (Loc, impl ToString)) {
+        self.secondary_labels.push((loc, msg.to_string()))
+    }
+
+    pub fn extra_labels_len(&self) -> usize {
+        self.secondary_labels.len() + self.notes.len()
+    }
+
+    #[allow(unused)]
+    pub fn add_notes(&mut self, additional_notes: impl IntoIterator<Item = impl ToString>) {
+        self.notes
+            .extend(additional_notes.into_iter().map(|msg| msg.to_string()))
+    }
+
+    pub fn add_note(&mut self, msg: impl ToString) {
+        self.notes.push(msg.to_string())
+    }
+
+    pub fn info(&self) -> &DiagnosticInfo {
+        &self.info
+    }
+}
+
+#[macro_export]
+macro_rules! diag {
+    ($code: expr, $primary: expr $(,)?) => {{
+        #[allow(unused)]
+        use $crate::diagnostics::codes::*;
+        $crate::diagnostics::Diagnostic::new(
+            $code,
+            $primary,
+            std::iter::empty::<(move_ir_types::location::Loc, String)>(),
+            std::iter::empty::<String>(),
+        )
+    }};
+    ($code: expr, $primary: expr, $($secondary: expr),+ $(,)?) => {{
+        #[allow(unused)]
+        use $crate::diagnostics::codes::*;
+        $crate::diagnostics::Diagnostic::new(
+            $code,
+            $primary,
+            vec![$($secondary, )*],
+            std::iter::empty::<String>(),
+        )
+    }};
+}
+
+impl WarningFilters {
+    pub fn new_for_source() -> Self {
+        Self {
+            filters: BTreeMap::new(),
+            for_dependency: false,
+        }
+    }
+
+    pub fn new_for_dependency() -> Self {
+        Self {
+            filters: BTreeMap::new(),
+            for_dependency: true,
+        }
+    }
+
+    pub fn is_filtered(&self, diag: &Diagnostic) -> bool {
+        self.is_filtered_by_info(&diag.info)
+    }
+
+    fn is_filtered_by_info(&self, info: &DiagnosticInfo) -> bool {
+        let prefix = info.external_prefix();
+        self.filters
+            .get(&prefix)
+            .is_some_and(|filters| filters.is_filtered_by_info(info))
+    }
+
+    pub fn union(&mut self, other: &Self) {
+        for (prefix, filters) in &other.filters {
+            self.filters
+                .entry(*prefix)
+                .or_insert_with(UnprefixedWarningFilters::new)
+                .union(filters);
+        }
+        // if there is a dependency code filter on the stack, it means we are filtering dependent
+        // code and this information must be preserved when stacking up additional filters (which
+        // involves union of the current filter with the new one)
+        self.for_dependency = self.for_dependency || other.for_dependency;
+    }
+
+    pub fn add(&mut self, filter: WarningFilter) {
+        let (prefix, category, code, name) = match filter {
+            WarningFilter::All(prefix) => {
+                self.filters.insert(prefix, UnprefixedWarningFilters::All);
+                return;
+            }
+            WarningFilter::Category {
+                prefix,
+                category,
+                name,
+            } => (prefix, category, None, name),
+            WarningFilter::Code {
+                prefix,
+                category,
+                code,
+                name,
+            } => (prefix, category, Some(code), name),
+        };
+        self.filters
+            .entry(prefix)
+            .or_insert(UnprefixedWarningFilters::Empty)
+            .add(category, code, name)
+    }
+
+    pub fn unused_warnings_filter_for_test() -> Self {
+        Self {
+            filters: BTreeMap::from([(
+                None,
+                UnprefixedWarningFilters::unused_warnings_filter_for_test(),
+            )]),
+            for_dependency: false,
+        }
+    }
+
+    pub fn for_dependency(&self) -> bool {
+        self.for_dependency
+    }
+}
+
+impl UnprefixedWarningFilters {
+    pub fn new() -> Self {
+        Self::Empty
+    }
+
+    fn is_filtered_by_info(&self, info: &DiagnosticInfo) -> bool {
+        match self {
+            Self::All => info.severity() == Severity::Warning,
+            Self::Specified { categories, codes } => {
+                info.severity() == Severity::Warning
+                    && (categories.contains_key(&info.category())
+                        || codes.contains_key(&(info.category(), info.code())))
+            }
+            Self::Empty => false,
+        }
+    }
+
+    pub fn union(&mut self, other: &Self) {
+        match (self, other) {
+            // if self is empty, just take the other filter
+            (s @ Self::Empty, _) => *s = other.clone(),
+            // if other is empty, or self is ALL, no change to the filter
+            (_, Self::Empty) => (),
+            (Self::All, _) => (),
+            // if other is all, self is now all
+            (s, Self::All) => *s = Self::All,
+            // category and code level union
+            (
+                Self::Specified { categories, codes },
+                Self::Specified {
+                    categories: other_categories,
+                    codes: other_codes,
+                },
+            ) => {
+                categories.extend(other_categories);
+                // remove any codes covered by the category level filter
+                codes.extend(
+                    other_codes
+                        .iter()
+                        .filter(|((category, _), _)| !categories.contains_key(category)),
+                );
+            }
+        }
+    }
+
+    /// Add a specific filter to the filter map.
+    /// If filter_code is None, then the filter applies to all codes in the filter_category.
+    fn add(
+        &mut self,
+        filter_category: u8,
+        filter_code: Option<u8>,
+        filter_name: Option<WellKnownFilterName>,
+    ) {
+        match self {
+            Self::All => (),
+            Self::Empty => {
+                *self = Self::Specified {
+                    categories: BTreeMap::new(),
+                    codes: BTreeMap::new(),
+                };
+                self.add(filter_category, filter_code, filter_name)
+            }
+            Self::Specified { categories, .. } if categories.contains_key(&filter_category) => (),
+            Self::Specified { categories, codes } => {
+                if let Some(filter_code) = filter_code {
+                    codes.insert((filter_category, filter_code), filter_name);
+                } else {
+                    categories.insert(filter_category, filter_name);
+                    codes.retain(|(category, _), _| *category != filter_category);
+                }
+            }
+        }
+    }
+
+    pub fn unused_warnings_filter_for_test() -> Self {
+        let filtered_codes = [
+            (UnusedItem::Function, FILTER_UNUSED_FUNCTION),
+            (UnusedItem::StructField, FILTER_UNUSED_STRUCT_FIELD),
+            (UnusedItem::FunTypeParam, FILTER_UNUSED_TYPE_PARAMETER),
+            (UnusedItem::Constant, FILTER_UNUSED_CONST),
+            (UnusedItem::MutReference, FILTER_UNUSED_MUT_REF),
+            (UnusedItem::MutParam, FILTER_UNUSED_MUT_PARAM),
+        ]
+        .into_iter()
+        .map(|(item, filter)| {
+            let info = item.into_info();
+            ((info.category(), info.code()), Some(filter))
+        })
+        .collect();
+        Self::Specified {
+            categories: BTreeMap::new(),
+            codes: filtered_codes,
+        }
+    }
+}
+
+//**************************************************************************************************
+// traits
+//**************************************************************************************************
+
+impl FromIterator<Diagnostic> for Diagnostics {
+    fn from_iter<I: IntoIterator<Item = Diagnostic>>(iter: I) -> Self {
+        let diagnostics = iter.into_iter().collect::<Vec<_>>();
+        Self::from(diagnostics)
+    }
+}
+
+impl From<Vec<Diagnostic>> for Diagnostics {
+    fn from(diagnostics: Vec<Diagnostic>) -> Self {
+        if diagnostics.is_empty() {
+            return Self(None);
+        }
+
+        let mut severity_count = BTreeMap::new();
+        for diag in &diagnostics {
+            *severity_count.entry(diag.info.severity()).or_insert(0) += 1;
+        }
+        Self(Some(Diagnostics_ {
+            diagnostics,
+            filtered_source_diagnostics: vec![],
+            severity_count,
+        }))
+    }
+}
+
+impl From<Option<Diagnostic>> for Diagnostics {
+    fn from(diagnostic_opt: Option<Diagnostic>) -> Self {
+        Diagnostics::from(diagnostic_opt.map_or_else(Vec::new, |diag| vec![diag]))
+    }
+}
+
+impl AstDebug for WarningFilters {
+    fn ast_debug(&self, w: &mut crate::shared::ast_debug::AstWriter) {
+        for (prefix, filters) in &self.filters {
+            let prefix_str = prefix.unwrap_or(WARNING_FILTER_ATTR);
+            match filters {
+                UnprefixedWarningFilters::All => w.write(&format!(
+                    "#[{}({})]",
+                    prefix_str,
+                    WarningFilter::All(*prefix).to_str().unwrap(),
+                )),
+                UnprefixedWarningFilters::Specified { categories, codes } => {
+                    w.write(&format!("#[{}(", prefix_str));
+                    let items = categories
+                        .iter()
+                        .map(|(cat, n)| WarningFilter::Category {
+                            prefix: *prefix,
+                            category: *cat,
+                            name: *n,
+                        })
+                        .chain(codes.iter().map(|((cat, code), n)| WarningFilter::Code {
+                            prefix: *prefix,
+                            category: *cat,
+                            code: *code,
+                            name: *n,
+                        }));
+                    w.list(items, ",", |w, filter| {
+                        w.write(filter.to_str().unwrap());
+                        false
+                    });
+                    w.write(")]")
+                }
+                UnprefixedWarningFilters::Empty => (),
+            }
+        }
+    }
+}
+
+impl<C: DiagnosticCode> From<C> for DiagnosticInfo {
+    fn from(value: C) -> Self {
+        value.into_info()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/editions/mod.rs b/vendors/move/crates/move-compiler/src/editions/mod.rs
new file mode 100644
index 000000000..8cdc7a2a7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/editions/mod.rs
@@ -0,0 +1,310 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module controls feature gating and breaking changes in new editions of the source language
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt::Display,
+    str::FromStr,
+};
+
+use crate::{diag, shared::CompilationEnv};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+
+//**************************************************************************************************
+// types
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, PartialOrd, Ord)]
+pub struct Edition {
+    pub edition: Symbol,
+    pub release: Option<Symbol>,
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, PartialOrd, Ord)]
+pub enum FeatureGate {
+    NestedUse,
+    PublicPackage,
+    PostFixAbilities,
+    StructTypeVisibility,
+    DotCall,
+    PositionalFields,
+    LetMut,
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, PartialOrd, Ord, Default)]
+pub enum Flavor {
+    #[default]
+    GlobalStorage,
+    Sui,
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, Debug, PartialOrd, Ord)]
+pub enum SyntaxEdition {
+    Legacy,
+    E2024,
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn check_feature(
+    env: &mut CompilationEnv,
+    edition: Edition,
+    feature: FeatureGate,
+    loc: Loc,
+) -> bool {
+    let supports_feature = edition.supports(feature);
+    if !supports_feature {
+        let valid_editions = valid_editions_for_feature(feature)
+            .into_iter()
+            .map(|e| e.to_string())
+            .collect::<Vec<_>>()
+            .join(", ");
+        let mut diag = diag!(
+            Editions::FeatureTooNew,
+            (
+                loc,
+                format!(
+                    "{} not supported by current edition '{edition}', \
+                    only '{valid_editions}' support this feature",
+                    feature.error_prefix(),
+                )
+            )
+        );
+        diag.add_note(
+            "You can update the edition in the 'Move.toml', \
+            or via command line flag if invoking the compiler directly.",
+        );
+        env.add_diag(diag);
+    }
+    supports_feature
+}
+
+pub fn valid_editions_for_feature(feature: FeatureGate) -> Vec<Edition> {
+    Edition::ALL
+        .iter()
+        .filter(|e| e.supports(feature))
+        .copied()
+        .collect()
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+static SUPPORTED_FEATURES: Lazy<BTreeMap<Edition, BTreeSet<FeatureGate>>> =
+    Lazy::new(|| BTreeMap::from_iter(Edition::ALL.iter().map(|e| (*e, e.features()))));
+
+const E2024_ALPHA_FEATURES: &[FeatureGate] = &[
+    FeatureGate::NestedUse,
+    FeatureGate::PublicPackage,
+    FeatureGate::PostFixAbilities,
+    FeatureGate::StructTypeVisibility,
+    FeatureGate::DotCall,
+    FeatureGate::PositionalFields,
+    FeatureGate::LetMut,
+];
+
+impl Edition {
+    pub const LEGACY: Self = Self {
+        edition: symbol!("legacy"),
+        release: None,
+    };
+    pub const E2024_ALPHA: Self = Self {
+        edition: symbol!("2024"),
+        release: Some(symbol!("alpha")),
+    };
+
+    const SEP: &str = ".";
+
+    pub const ALL: &[Self] = &[Self::LEGACY, Self::E2024_ALPHA];
+
+    pub fn supports(&self, feature: FeatureGate) -> bool {
+        SUPPORTED_FEATURES.get(self).unwrap().contains(&feature)
+    }
+
+    pub fn syntax(&self) -> SyntaxEdition {
+        match *self {
+            Self::LEGACY => SyntaxEdition::Legacy,
+            Self::E2024_ALPHA => SyntaxEdition::E2024,
+            _ => self.unknown_edition_panic(),
+        }
+    }
+    // Intended only for implementing the lazy static (supported feature map) above
+    fn prev(&self) -> Option<Self> {
+        match *self {
+            Self::LEGACY => None,
+            Self::E2024_ALPHA => Some(Self::LEGACY),
+            _ => self.unknown_edition_panic(),
+        }
+    }
+
+    // Inefficient and should be called only to implement the lazy static
+    // (supported feature map) above
+    fn features(&self) -> BTreeSet<FeatureGate> {
+        match *self {
+            Self::LEGACY => BTreeSet::new(),
+            Self::E2024_ALPHA => {
+                let mut features = self.prev().unwrap().features();
+                features.extend(E2024_ALPHA_FEATURES);
+                features
+            }
+            _ => self.unknown_edition_panic(),
+        }
+    }
+
+    fn unknown_edition_panic(&self) -> ! {
+        panic!("{}", self.unknown_edition_error())
+    }
+
+    fn unknown_edition_error(&self) -> anyhow::Error {
+        anyhow::anyhow!(
+            "Unsupported edition \"{self}\". Current supported editions include: {}",
+            Self::ALL
+                .iter()
+                .map(|e| format!("\"{}\"", e))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
+    }
+}
+
+impl Flavor {
+    pub const GLOBAL_STORAGE: &str = "global-storage";
+    pub const SUI: &str = "sui";
+    pub const ALL: &[Self] = &[Self::GlobalStorage, Self::Sui];
+}
+
+impl FeatureGate {
+    fn error_prefix(&self) -> &'static str {
+        match self {
+            FeatureGate::NestedUse => "Nested 'use' forms are",
+            FeatureGate::PublicPackage => "'public(package)' is",
+            FeatureGate::PostFixAbilities => "Postfix abilities are",
+            FeatureGate::StructTypeVisibility => "Struct visibility modifiers are",
+            FeatureGate::DotCall => "Method syntax is",
+            FeatureGate::PositionalFields => "Positional fields are",
+            FeatureGate::LetMut => "'mut' variable modifiers are",
+        }
+    }
+}
+
+//**************************************************************************************************
+// Parsing/Deserialize
+//**************************************************************************************************
+
+impl FromStr for Edition {
+    type Err = anyhow::Error;
+
+    // Required method
+    fn from_str(s: &str) -> anyhow::Result<Self> {
+        let (edition, release) = if let Some((edition, release)) = s.split_once(Edition::SEP) {
+            (edition, Some(release))
+        } else {
+            (s, None)
+        };
+        let edition = Edition {
+            edition: Symbol::from(edition),
+            release: release.map(Symbol::from),
+        };
+        if !Self::ALL.iter().any(|e| e == &edition) {
+            return Err(edition.unknown_edition_error());
+        }
+        Ok(edition)
+    }
+}
+
+impl FromStr for Flavor {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(match s {
+            Self::GLOBAL_STORAGE => Self::GlobalStorage,
+            Self::SUI => Self::Sui,
+            _ => anyhow::bail!(
+                "Unknown flavor \"{s}\". Expected one of: {}",
+                Self::ALL
+                    .iter()
+                    .map(|e| format!("\"{}\"", e))
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            ),
+        })
+    }
+}
+
+impl<'de> Deserialize<'de> for Edition {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Edition::from_str(&String::deserialize(deserializer)?)
+            .map_err(|e| serde::de::Error::custom(format!("{e}")))
+    }
+}
+
+impl<'de> Deserialize<'de> for Flavor {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Flavor::from_str(&String::deserialize(deserializer)?)
+            .map_err(|e| serde::de::Error::custom(format!("{e}")))
+    }
+}
+
+//**************************************************************************************************
+// Display/Serialize
+//**************************************************************************************************
+
+impl Display for Edition {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self.release {
+            None => write!(f, "{}", self.edition),
+            Some(release) => write!(f, "{}{}{}", self.edition, Self::SEP, release),
+        }
+    }
+}
+
+impl Display for Flavor {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Flavor::GlobalStorage => write!(f, "{}", Self::GLOBAL_STORAGE),
+            Flavor::Sui => write!(f, "{}", Self::SUI),
+        }
+    }
+}
+
+impl Serialize for Edition {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&format!("{}", self))
+    }
+}
+
+impl Serialize for Flavor {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&format!("{}", self))
+    }
+}
+
+//**************************************************************************************************
+// traits
+//**************************************************************************************************
+
+impl Default for Edition {
+    fn default() -> Self {
+        Edition::LEGACY
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/aliases.rs b/vendors/move/crates/move-compiler/src/expansion/aliases.rs
new file mode 100644
index 000000000..8e6039f75
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/aliases.rs
@@ -0,0 +1,301 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    expansion::ast::{self as E, ModuleIdent, ModuleIdent_},
+    parser::ast::{self as P, ModuleName},
+    shared::{unique_map::UniqueMap, unique_set::UniqueSet, *},
+};
+use move_ir_types::location::*;
+
+type ScopeDepth = usize;
+
+#[derive(Clone, Debug)]
+pub struct AliasSet {
+    pub modules: UniqueSet<Name>,
+    pub members: UniqueSet<Name>,
+}
+
+#[derive(Clone, Debug)]
+pub struct AliasMapBuilder {
+    modules: UniqueMap<Name, (ModuleIdent, /* is_implicit */ bool)>,
+    members: UniqueMap<Name, ((ModuleIdent, Name), /* is_implicit */ bool)>,
+}
+
+#[derive(Clone, Debug)]
+pub struct AliasMap {
+    modules: UniqueMap<Name, (Option<ScopeDepth>, ModuleIdent)>,
+    members: UniqueMap<Name, (Option<ScopeDepth>, (ModuleIdent, Name))>,
+    // essentially a mapping from ScopeDepth => AliasSet, which are the unused aliases at that depth
+    unused: Vec<AliasSet>,
+}
+
+pub struct OldAliasMap(Option<AliasMap>);
+
+pub struct ParserExplicitUseFun {
+    pub loc: Loc,
+    pub attributes: E::Attributes,
+    pub is_public: Option<Loc>,
+    pub function: Box<P::NameAccessChain>,
+    pub ty: Box<P::NameAccessChain>,
+    pub method: Name,
+}
+
+pub struct UseFunsBuilder {
+    pub explicit: Vec<ParserExplicitUseFun>,
+    pub implicit: UniqueMap<Name, E::ImplicitUseFunCandidate>,
+}
+
+impl AliasSet {
+    pub fn new() -> Self {
+        Self {
+            modules: UniqueSet::new(),
+            members: UniqueSet::new(),
+        }
+    }
+
+    #[allow(unused)]
+    pub fn is_empty(&self) -> bool {
+        let Self { modules, members } = self;
+        modules.is_empty() && members.is_empty()
+    }
+}
+
+impl AliasMapBuilder {
+    pub fn new() -> Self {
+        Self {
+            modules: UniqueMap::new(),
+            members: UniqueMap::new(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        let Self { modules, members } = self;
+        modules.is_empty() && members.is_empty()
+    }
+
+    fn remove_module_alias_(&mut self, alias: &Name) -> Result<(), Loc> {
+        let loc = self.modules.get_loc(alias).cloned();
+        match self.modules.remove(alias) {
+            None => Ok(()),
+            Some(_) => Err(loc.unwrap()),
+        }
+    }
+
+    fn remove_member_alias_(&mut self, alias: &Name) -> Result<(), Loc> {
+        let loc = self.members.get_loc(alias).cloned();
+        match self.members.remove(alias) {
+            None => Ok(()),
+            Some(_) => Err(loc.unwrap()),
+        }
+    }
+
+    /// Adds a module alias to the map.
+    /// Errors if one already bound for that alias
+    pub fn add_module_alias(&mut self, alias: Name, ident: ModuleIdent) -> Result<(), Loc> {
+        let result = self.remove_module_alias_(&alias);
+        self.modules
+            .add(alias, (ident, /* is_implicit */ false))
+            .unwrap();
+        result
+    }
+
+    /// Adds a member alias to the map.
+    /// Errors if one already bound for that alias
+    pub fn add_member_alias(
+        &mut self,
+        alias: Name,
+        ident: ModuleIdent,
+        member: Name,
+    ) -> Result<(), Loc> {
+        let result = self.remove_member_alias_(&alias);
+        self.members
+            .add(alias, ((ident, member), /* is_implicit */ false))
+            .unwrap();
+        result
+    }
+
+    /// Same as `add_module_alias` but it does not update the scope, and as such it will not be
+    /// reported as unused
+    pub fn add_implicit_module_alias(
+        &mut self,
+        alias: Name,
+        ident: ModuleIdent,
+    ) -> Result<(), Loc> {
+        let result = self.remove_module_alias_(&alias);
+        self.modules
+            .add(alias, (ident, /* is_implicit */ true))
+            .unwrap();
+        result
+    }
+
+    /// Same as `add_member_alias` but it does not update the scope, and as such it will not be
+    /// reported as unused
+    pub fn add_implicit_member_alias(
+        &mut self,
+        alias: Name,
+        ident: ModuleIdent,
+        member: Name,
+    ) -> Result<(), Loc> {
+        let result = self.remove_member_alias_(&alias);
+        self.members
+            .add(alias, ((ident, member), /* is_implicit */ true))
+            .unwrap();
+        result
+    }
+}
+
+impl AliasMap {
+    pub fn new() -> Self {
+        Self {
+            modules: UniqueMap::new(),
+            members: UniqueMap::new(),
+            unused: vec![],
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        let Self {
+            modules,
+            members,
+            unused: _,
+        } = self;
+        modules.is_empty() && members.is_empty()
+    }
+
+    fn current_depth(&self) -> usize {
+        self.unused.len()
+    }
+
+    pub fn module_alias_get(&mut self, n: &Name) -> Option<ModuleIdent> {
+        match self.modules.get_mut(n) {
+            None => None,
+            Some((depth_opt, ident)) => {
+                if let Some(depth) = depth_opt {
+                    self.unused[*depth].modules.remove(n);
+                }
+                *depth_opt = None;
+                // We are preserving the name's original location, rather than referring to where
+                // the alias was defined. The name represents JUST the module name, though, so we do
+                // not change location of the address as we don't have this information.
+                // TODO maybe we should also keep the alias reference (or its location)?
+                let sp!(
+                    _,
+                    ModuleIdent_ {
+                        address,
+                        module: ModuleName(sp!(_, module))
+                    }
+                ) = ident;
+                let address = *address;
+                let module = ModuleName(sp(n.loc, *module));
+                Some(sp(n.loc, ModuleIdent_ { address, module }))
+            }
+        }
+    }
+
+    pub fn member_alias_get(&mut self, n: &Name) -> Option<(ModuleIdent, Name)> {
+        match self.members.get_mut(n) {
+            None => None,
+            Some((depth_opt, (sp!(mem_mod_loc, mem_mod), sp!(_, mem_name)))) => {
+                if let Some(depth) = depth_opt {
+                    self.unused[*depth].members.remove(n);
+                }
+                *depth_opt = None;
+                // We are preserving the name's original location, rather than referring to where
+                // the alias was defined. The name represents JUST the member name, though, so we do
+                // not change location of the module as we don't have this information.
+                // TODO maybe we should also keep the alias reference (or its location)?
+                Some((sp(*mem_mod_loc, *mem_mod), sp(n.loc, *mem_name)))
+            }
+        }
+    }
+
+    /// Adds all of the new items in the new inner scope as shadowing the outer one.
+    /// Gives back the outer scope
+    pub fn add_and_shadow_all(&mut self, shadowing: AliasMapBuilder) -> OldAliasMap {
+        if shadowing.is_empty() {
+            return OldAliasMap(None);
+        }
+
+        let outer_scope = OldAliasMap(Some(self.clone()));
+        let AliasMapBuilder {
+            modules: new_modules,
+            members: new_members,
+        } = shadowing;
+
+        let next_depth = self.current_depth();
+        let mut current_scope = AliasSet::new();
+        for (alias, (ident, is_implicit)) in new_modules {
+            if !is_implicit {
+                current_scope.modules.add(alias).unwrap();
+            }
+            self.modules.remove(&alias);
+            self.modules.add(alias, (Some(next_depth), ident)).unwrap();
+        }
+        for (alias, (ident_member, is_implicit)) in new_members {
+            if !is_implicit {
+                current_scope.members.add(alias).unwrap();
+            }
+            self.members.remove(&alias);
+            self.members
+                .add(alias, (Some(next_depth), ident_member))
+                .unwrap();
+        }
+        self.unused.push(current_scope);
+        outer_scope
+    }
+
+    /// Similar to add_and_shadow but just removes aliases now shadowed by a type parameter
+    pub fn shadow_for_type_parameters<'a, I: IntoIterator<Item = &'a Name>>(
+        &mut self,
+        tparams: I,
+    ) -> OldAliasMap
+    where
+        I::IntoIter: ExactSizeIterator,
+    {
+        let tparams_iter = tparams.into_iter();
+        if tparams_iter.len() == 0 {
+            return OldAliasMap(None);
+        }
+
+        let outer_scope = OldAliasMap(Some(self.clone()));
+        self.unused.push(AliasSet::new());
+        for tp_name in tparams_iter {
+            self.members.remove(tp_name);
+        }
+        outer_scope
+    }
+
+    /// Resets the alias map and gives the set of aliases that were unused
+    pub fn set_to_outer_scope(&mut self, outer_scope: OldAliasMap) -> AliasSet {
+        let outer_scope = match outer_scope.0 {
+            None => return AliasSet::new(),
+            Some(outer) => outer,
+        };
+        let mut inner_scope = std::mem::replace(self, outer_scope);
+        let outer_scope = self;
+        assert!(outer_scope.current_depth() + 1 == inner_scope.current_depth());
+        let unused = inner_scope.unused.pop().unwrap();
+        outer_scope.unused = inner_scope.unused;
+        unused
+    }
+}
+
+impl OldAliasMap {
+    pub fn is_empty(&self) -> bool {
+        match &self.0 {
+            None => true,
+            Some(aliases) => aliases.is_empty(),
+        }
+    }
+}
+
+impl UseFunsBuilder {
+    pub fn new() -> Self {
+        Self {
+            explicit: vec![],
+            implicit: UniqueMap::new(),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/ast.rs b/vendors/move/crates/move-compiler/src/expansion/ast.rs
new file mode 100644
index 000000000..3e5a73f95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/ast.rs
@@ -0,0 +1,1946 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::WarningFilters,
+    parser::ast::{
+        self as P, Ability, Ability_, BinOp, ConstantName, Field, FunctionName, ModuleName,
+        Mutability, QuantKind, SpecApplyPattern, StructName, UnaryOp, Var, ENTRY_MODIFIER,
+    },
+    shared::{
+        ast_debug::*, known_attributes::KnownAttribute, unique_map::UniqueMap,
+        unique_set::UniqueSet, *,
+    },
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt,
+    hash::Hash,
+};
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    // Map of declared named addresses, and their values if specified
+    pub modules: UniqueMap<ModuleIdent, ModuleDefinition>,
+    pub scripts: BTreeMap<Symbol, Script>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ExplicitUseFun {
+    pub loc: Loc,
+    pub attributes: Attributes,
+    pub is_public: Option<Loc>,
+    pub function: ModuleAccess,
+    pub ty: ModuleAccess,
+    pub method: Name,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ImplicitUseFunKind {
+    // From a function declaration in the module
+    FunctionDeclaration,
+    // From a normal, non 'use fun' use declaration,
+    UseAlias { used: bool },
+}
+
+// These are only candidates as we have not yet checked if they have the proper signature for a
+// use fun declaration
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ImplicitUseFunCandidate {
+    pub loc: Loc,
+    pub attributes: Attributes,
+    pub is_public: Option<Loc>,
+    pub function: (ModuleIdent, Name),
+    pub kind: ImplicitUseFunKind,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct UseFuns {
+    pub explicit: Vec<ExplicitUseFun>,
+    pub implicit: UniqueMap<Name, ImplicitUseFunCandidate>,
+}
+
+//**************************************************************************************************
+// Attributes
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AttributeValue_ {
+    Value(Value),
+    Module(ModuleIdent),
+    ModuleAccess(ModuleAccess),
+}
+pub type AttributeValue = Spanned<AttributeValue_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Attribute_ {
+    Name(Name),
+    Assigned(Name, Box<AttributeValue>),
+    Parameterized(Name, Attributes),
+}
+pub type Attribute = Spanned<Attribute_>;
+
+impl Attribute_ {
+    pub fn attribute_name(&self) -> &Name {
+        match self {
+            Attribute_::Name(nm)
+            | Attribute_::Assigned(nm, _)
+            | Attribute_::Parameterized(nm, _) => nm,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum AttributeName_ {
+    Unknown(Symbol),
+    Known(KnownAttribute),
+}
+
+impl AttributeName_ {
+    pub fn name(&self) -> Symbol {
+        match self {
+            Self::Unknown(s) => *s,
+            Self::Known(a) => a.name().into(),
+        }
+    }
+}
+
+pub type AttributeName = Spanned<AttributeName_>;
+
+pub type Attributes = UniqueMap<AttributeName, Attribute>;
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments.
+    // It is used primarily for retrieving the associated `PackageConfig`,
+    // but it is also used in determining public(package) visibility.
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub use_funs: UseFuns,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub function_name: FunctionName,
+    pub function: Function,
+    pub specs: Vec<SpecBlock>,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+#[derive(Clone, Copy)]
+pub enum Address {
+    Numerical {
+        name: Option<Name>,
+        value: Spanned<NumericalAddress>,
+        // set to true when the same name is used across multiple packages
+        name_conflict: bool,
+    },
+    NamedUnassigned(Name),
+}
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct ModuleIdent_ {
+    pub address: Address,
+    pub module: ModuleName,
+}
+pub type ModuleIdent = Spanned<ModuleIdent_>;
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub is_source_module: bool,
+    pub use_funs: UseFuns,
+    pub friends: UniqueMap<ModuleIdent, Friend>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub functions: UniqueMap<FunctionName, Function>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub specs: Vec<SpecBlock>,
+}
+
+//**************************************************************************************************
+// Friend
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Friend {
+    pub attributes: Attributes,
+    pub loc: Loc,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+pub type Fields<T> = UniqueMap<Field, (usize, T)>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct StructTypeParameter {
+    pub is_phantom: bool,
+    pub name: Name,
+    pub constraints: AbilitySet,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct StructDefinition {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub fields: StructFields,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum StructFields {
+    Positional(Vec<Type>),
+    Named(Fields<Type>),
+    Native(Loc),
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum Visibility {
+    Public(Loc),
+    Friend(Loc),
+    Package(Loc),
+    Internal,
+}
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct FunctionSignature {
+    pub type_parameters: Vec<(Name, AbilitySet)>,
+    pub parameters: Vec<(Mutability, Var, Type)>,
+    pub return_type: Type,
+}
+
+#[derive(PartialEq, Clone, Debug)]
+pub enum FunctionBody_ {
+    Defined(Sequence),
+    Native,
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+pub struct SpecId(usize);
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct Function {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub body: FunctionBody,
+    pub specs: BTreeMap<SpecId, SpecBlock>,
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct Constant {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub signature: Type,
+    pub value: Exp,
+}
+
+//**************************************************************************************************
+// Specification Blocks
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct SpecBlock_ {
+    pub attributes: Attributes,
+    pub target: SpecBlockTarget,
+    pub members: Vec<SpecBlockMember>,
+}
+pub type SpecBlock = Spanned<SpecBlock_>;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum SpecBlockTarget_ {
+    Code,
+    Module,
+    Member(Name, Option<Box<FunctionSignature>>),
+    Schema(Name, Vec<(Name, AbilitySet)>),
+}
+
+pub type SpecBlockTarget = Spanned<SpecBlockTarget_>;
+
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum SpecBlockMember_ {
+    Condition {
+        kind: SpecConditionKind,
+        properties: Vec<PragmaProperty>,
+        exp: Exp,
+        additional_exps: Vec<Exp>,
+    },
+    Function {
+        uninterpreted: bool,
+        name: FunctionName,
+        signature: FunctionSignature,
+        body: FunctionBody,
+    },
+    Variable {
+        is_global: bool,
+        name: Name,
+        type_parameters: Vec<(Name, AbilitySet)>,
+        type_: Type,
+        init: Option<Exp>,
+    },
+    Update {
+        lhs: Exp,
+        rhs: Exp,
+    },
+    Let {
+        name: Name,
+        post_state: bool,
+        def: Exp,
+    },
+    Include {
+        properties: Vec<PragmaProperty>,
+        exp: Exp,
+    },
+    Apply {
+        exp: Exp,
+        patterns: Vec<SpecApplyPattern>,
+        exclusion_patterns: Vec<SpecApplyPattern>,
+    },
+    Pragma {
+        properties: Vec<PragmaProperty>,
+    },
+}
+pub type SpecBlockMember = Spanned<SpecBlockMember_>;
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub enum SpecConditionKind_ {
+    Assert,
+    Assume,
+    Decreases,
+    AbortsIf,
+    AbortsWith,
+    SucceedsIf,
+    Modifies,
+    Emits,
+    Ensures,
+    Requires,
+    Invariant(Vec<(Name, AbilitySet)>),
+    InvariantUpdate(Vec<(Name, AbilitySet)>),
+    Axiom(Vec<(Name, AbilitySet)>),
+}
+pub type SpecConditionKind = Spanned<SpecConditionKind_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PragmaProperty_ {
+    pub name: Name,
+    pub value: Option<PragmaValue>,
+}
+pub type PragmaProperty = Spanned<PragmaProperty_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PragmaValue {
+    Literal(Value),
+    Ident(ModuleAccess),
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct AbilitySet(UniqueSet<Ability>);
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
+pub enum ModuleAccess_ {
+    Name(Name),
+    ModuleAccess(ModuleIdent, Name),
+}
+pub type ModuleAccess = Spanned<ModuleAccess_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
+pub enum Type_ {
+    Unit,
+    Multiple(Vec<Type>),
+    Apply(ModuleAccess, Vec<Type>),
+    Ref(bool, Box<Type>),
+    Fun(Vec<Type>, Box<Type>),
+    UnresolvedError,
+}
+pub type Type = Spanned<Type_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FieldBindings {
+    Named(Fields<LValue>),
+    Positional(Vec<LValue>),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum LValue_ {
+    Var(Mutability, ModuleAccess, Option<Vec<Type>>),
+    Unpack(ModuleAccess, Option<Vec<Type>>, FieldBindings),
+}
+pub type LValue = Spanned<LValue_>;
+pub type LValueList_ = Vec<LValue>;
+pub type LValueList = Spanned<LValueList_>;
+
+pub type LValueWithRange_ = (LValue, Exp);
+pub type LValueWithRange = Spanned<LValueWithRange_>;
+pub type LValueWithRangeList_ = Vec<LValueWithRange>;
+pub type LValueWithRangeList = Spanned<LValueWithRangeList_>;
+
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum ExpDotted_ {
+    Exp(Box<Exp>),
+    Dot(Box<ExpDotted>, Name),
+}
+pub type ExpDotted = Spanned<ExpDotted_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Value_ {
+    // 0x<hex representation up to 64 digits with padding 0s>
+    Address(Address),
+    // <num>
+    InferredNum(move_core_types::u256::U256),
+    // <num>u8
+    U8(u8),
+    // <num>u16
+    U16(u16),
+    // <num>u32
+    U32(u32),
+    // <num>u64
+    U64(u64),
+    // <num>u128
+    U128(u128),
+    // <num>u256
+    U256(move_core_types::u256::U256),
+    // true
+    // false
+    Bool(bool),
+    Bytearray(Vec<u8>),
+}
+pub type Value = Spanned<Value_>;
+
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum Exp_ {
+    Value(Value),
+    Move(Var),
+    Copy(Var),
+
+    Name(ModuleAccess, Option<Vec<Type>>),
+    Call(
+        ModuleAccess,
+        /* is_macro */ bool,
+        Option<Vec<Type>>,
+        Spanned<Vec<Exp>>,
+    ),
+    MethodCall(Box<ExpDotted>, Name, Option<Vec<Type>>, Spanned<Vec<Exp>>),
+    Pack(ModuleAccess, Option<Vec<Type>>, Fields<Exp>),
+    Vector(Loc, Option<Vec<Type>>, Spanned<Vec<Exp>>),
+
+    IfElse(Box<Exp>, Box<Exp>, Box<Exp>),
+    While(Box<Exp>, Box<Exp>),
+    Loop(Box<Exp>),
+    Block(Sequence),
+    Lambda(LValueList, Box<Exp>), // spec only
+    Quant(
+        QuantKind,
+        LValueWithRangeList,
+        Vec<Vec<Exp>>,
+        Option<Box<Exp>>,
+        Box<Exp>,
+    ), // spec only
+
+    Assign(LValueList, Box<Exp>),
+    FieldMutate(Box<ExpDotted>, Box<Exp>),
+    Mutate(Box<Exp>, Box<Exp>),
+
+    Return(Box<Exp>),
+    Abort(Box<Exp>),
+    Break,
+    Continue,
+
+    Dereference(Box<Exp>),
+    UnaryExp(UnaryOp, Box<Exp>),
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+
+    ExpList(Vec<Exp>),
+    Unit {
+        trailing: bool,
+    },
+
+    Borrow(bool, Box<Exp>),
+    ExpDotted(Box<ExpDotted>),
+    Index(Box<Exp>, Box<Exp>), // spec only (no mutation needed right now)
+
+    Cast(Box<Exp>, Type),
+    Annotate(Box<Exp>, Type),
+
+    Spec(SpecId, BTreeSet<Name>),
+
+    UnresolvedError,
+}
+pub type Exp = Spanned<Exp_>;
+
+pub type Sequence = (UseFuns, VecDeque<SequenceItem>);
+#[derive(Debug, Clone, PartialEq)]
+pub enum SequenceItem_ {
+    Seq(Exp),
+    Declare(LValueList, Option<Type>),
+    Bind(LValueList, Exp),
+}
+pub type SequenceItem = Spanned<SequenceItem_>;
+
+//**************************************************************************************************
+// Traits
+//**************************************************************************************************
+
+impl TName for ModuleIdent {
+    type Key = ModuleIdent_;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Loc, ModuleIdent_) {
+        (self.loc, self.value)
+    }
+
+    fn add_loc(loc: Loc, value: ModuleIdent_) -> ModuleIdent {
+        sp(loc, value)
+    }
+
+    fn borrow(&self) -> (&Loc, &ModuleIdent_) {
+        (&self.loc, &self.value)
+    }
+}
+
+impl TName for AttributeName {
+    type Key = AttributeName_;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Self::Loc, Self::Key) {
+        let sp!(loc, n_) = self;
+        (loc, n_)
+    }
+
+    fn add_loc(loc: Self::Loc, name_: Self::Key) -> Self {
+        sp(loc, name_)
+    }
+
+    fn borrow(&self) -> (&Self::Loc, &Self::Key) {
+        let sp!(loc, n_) = self;
+        (loc, n_)
+    }
+}
+
+impl fmt::Debug for Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+impl PartialEq for Address {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Self::Numerical { value: l, .. }, Self::Numerical { value: r, .. }) => l == r,
+            (Self::NamedUnassigned(l), Self::NamedUnassigned(r)) => l == r,
+            _ => false,
+        }
+    }
+}
+
+impl Eq for Address {}
+
+impl PartialOrd for Address {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Address {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        use std::cmp::Ordering;
+
+        match (self, other) {
+            (Self::Numerical { .. }, Self::NamedUnassigned(_)) => Ordering::Less,
+            (Self::NamedUnassigned(_), Self::Numerical { .. }) => Ordering::Greater,
+
+            (Self::Numerical { value: l, .. }, Self::Numerical { value: r, .. }) => l.cmp(r),
+            (Self::NamedUnassigned(l), Self::NamedUnassigned(r)) => l.cmp(r),
+        }
+    }
+}
+
+impl Hash for Address {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        match self {
+            Self::Numerical {
+                value: sp!(_, bytes),
+                ..
+            } => bytes.hash(state),
+            Self::NamedUnassigned(name) => name.hash(state),
+        }
+    }
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl UseFuns {
+    pub fn new() -> Self {
+        Self {
+            explicit: vec![],
+            implicit: UniqueMap::new(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        let Self { explicit, implicit } = self;
+        explicit.is_empty() && implicit.is_empty()
+    }
+}
+
+impl Address {
+    pub const fn anonymous(loc: Loc, address: NumericalAddress) -> Self {
+        Self::Numerical {
+            name: None,
+            value: sp(loc, address),
+            name_conflict: false,
+        }
+    }
+
+    pub fn into_addr_bytes(self) -> NumericalAddress {
+        match self {
+            Self::Numerical {
+                value: sp!(_, bytes),
+                ..
+            } => bytes,
+            Self::NamedUnassigned(_) => NumericalAddress::DEFAULT_ERROR_ADDRESS,
+        }
+    }
+
+    pub fn is(&self, address: impl AsRef<str>) -> bool {
+        match self {
+            Self::Numerical { name: Some(n), .. } | Self::NamedUnassigned(n) => {
+                n.value.as_str() == address.as_ref()
+            }
+            Self::Numerical { name: None, .. } => false,
+        }
+    }
+}
+
+impl ModuleIdent_ {
+    pub fn new(address: Address, module: ModuleName) -> Self {
+        Self { address, module }
+    }
+
+    pub fn is(&self, address: impl AsRef<str>, module: impl AsRef<str>) -> bool {
+        let Self {
+            address: a,
+            module: m,
+        } = self;
+        a.is(address) && m == module.as_ref()
+    }
+}
+
+impl SpecId {
+    pub fn new(u: usize) -> Self {
+        SpecId(u)
+    }
+
+    pub fn inner(self) -> usize {
+        self.0
+    }
+}
+
+impl AbilitySet {
+    /// All abilities
+    pub const ALL: [Ability_; 4] = [
+        Ability_::Copy,
+        Ability_::Drop,
+        Ability_::Store,
+        Ability_::Key,
+    ];
+    /// Abilities for bool, u8, u16, u32, u64, u128, u256 and address
+    pub const PRIMITIVES: [Ability_; 3] = [Ability_::Copy, Ability_::Drop, Ability_::Store];
+    /// Abilities for &_ and &mut _
+    pub const REFERENCES: [Ability_; 2] = [Ability_::Copy, Ability_::Drop];
+    /// Abilities for signer
+    pub const SIGNER: [Ability_; 1] = [Ability_::Drop];
+    /// Abilities for vector<_>, note they are predicated on the type argument
+    pub const COLLECTION: [Ability_; 3] = [Ability_::Copy, Ability_::Drop, Ability_::Store];
+
+    pub fn empty() -> Self {
+        AbilitySet(UniqueSet::new())
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn add(&mut self, a: Ability) -> Result<(), Loc> {
+        self.0.add(a).map_err(|(_a, loc)| loc)
+    }
+
+    pub fn has_ability(&self, a: &Ability) -> bool {
+        self.0.contains(a)
+    }
+
+    pub fn has_ability_(&self, a: Ability_) -> bool {
+        self.0.contains_(&a)
+    }
+
+    pub fn ability_loc(&self, sp!(_, a_): &Ability) -> Option<Loc> {
+        self.0.get_loc_(a_).copied()
+    }
+
+    pub fn ability_loc_(&self, a: Ability_) -> Option<Loc> {
+        self.0.get_loc_(&a).copied()
+    }
+
+    // intersection of two sets. Keeps the loc of the first set
+    pub fn intersect(&self, other: &Self) -> Self {
+        Self(self.0.intersect(&other.0))
+    }
+
+    // union of two sets. Prefers the loc of the first set
+    pub fn union(&self, other: &Self) -> Self {
+        Self(self.0.union(&other.0))
+    }
+
+    pub fn is_subset(&self, other: &Self) -> bool {
+        self.0.is_subset(&other.0)
+    }
+
+    pub fn iter(&self) -> AbilitySetIter {
+        self.into_iter()
+    }
+
+    pub fn from_abilities(
+        iter: impl IntoIterator<Item = Ability>,
+    ) -> Result<Self, (Ability_, Loc, Loc)> {
+        Ok(Self(UniqueSet::from_elements(iter)?))
+    }
+
+    pub fn from_abilities_(
+        loc: Loc,
+        iter: impl IntoIterator<Item = Ability_>,
+    ) -> Result<Self, (Ability_, Loc, Loc)> {
+        Ok(Self(UniqueSet::from_elements_(loc, iter)?))
+    }
+
+    pub fn all(loc: Loc) -> Self {
+        Self::from_abilities_(loc, Self::ALL.to_vec()).unwrap()
+    }
+
+    pub fn primitives(loc: Loc) -> Self {
+        Self::from_abilities_(loc, Self::PRIMITIVES.to_vec()).unwrap()
+    }
+
+    pub fn references(loc: Loc) -> Self {
+        Self::from_abilities_(loc, Self::REFERENCES.to_vec()).unwrap()
+    }
+
+    pub fn signer(loc: Loc) -> Self {
+        Self::from_abilities_(loc, Self::SIGNER.to_vec()).unwrap()
+    }
+
+    pub fn collection(loc: Loc) -> Self {
+        Self::from_abilities_(loc, Self::COLLECTION.to_vec()).unwrap()
+    }
+}
+
+impl Visibility {
+    pub const FRIEND: &'static str = P::Visibility::FRIEND;
+    pub const FRIEND_IDENT: &'static str = P::Visibility::FRIEND_IDENT;
+    pub const INTERNAL: &'static str = P::Visibility::INTERNAL;
+    pub const PACKAGE: &'static str = P::Visibility::PACKAGE;
+    pub const PACKAGE_IDENT: &'static str = P::Visibility::PACKAGE_IDENT;
+    pub const PUBLIC: &'static str = P::Visibility::PUBLIC;
+
+    pub fn loc(&self) -> Option<Loc> {
+        match self {
+            Visibility::Friend(loc) | Visibility::Package(loc) | Visibility::Public(loc) => {
+                Some(*loc)
+            }
+            Visibility::Internal => None,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Iter
+//**************************************************************************************************
+
+pub struct AbilitySetIter<'a>(unique_set::Iter<'a, Ability>);
+
+impl<'a> Iterator for AbilitySetIter<'a> {
+    type Item = Ability;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next().map(|(loc, a_)| sp(loc, *a_))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<'a> IntoIterator for &'a AbilitySet {
+    type Item = Ability;
+    type IntoIter = AbilitySetIter<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        AbilitySetIter(self.0.iter())
+    }
+}
+
+pub struct AbilitySetIntoIter(unique_set::IntoIter<Ability>);
+
+impl Iterator for AbilitySetIntoIter {
+    type Item = Ability;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl IntoIterator for AbilitySet {
+    type Item = Ability;
+    type IntoIter = AbilitySetIntoIter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        AbilitySetIntoIter(self.0.into_iter())
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for Address {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        match self {
+            Self::Numerical {
+                name: None,
+                value: sp!(_, bytes),
+                ..
+            } => write!(f, "{}", bytes),
+            Self::Numerical {
+                name: Some(name),
+                value: sp!(_, bytes),
+                name_conflict: true,
+            } => write!(f, "({}={})", name, bytes),
+            Self::Numerical {
+                name: Some(name),
+                value: _,
+                name_conflict: false,
+            }
+            | Self::NamedUnassigned(name) => write!(f, "{}", name),
+        }
+    }
+}
+
+impl fmt::Display for AttributeName_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        match self {
+            AttributeName_::Unknown(sym) => write!(f, "{}", sym),
+            AttributeName_::Known(known) => write!(f, "{}", known.name()),
+        }
+    }
+}
+
+impl fmt::Display for ModuleIdent_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}::{}", self.address, &self.module)
+    }
+}
+
+impl fmt::Display for ModuleAccess_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use ModuleAccess_::*;
+        match self {
+            Name(n) => write!(f, "{}", n),
+            ModuleAccess(m, n) => write!(f, "{}::{}", m, n),
+        }
+    }
+}
+
+impl fmt::Display for Visibility {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match &self {
+                Visibility::Public(_) => Visibility::PUBLIC,
+                Visibility::Friend(_) => Visibility::FRIEND,
+                Visibility::Package(_) => Visibility::PACKAGE,
+                Visibility::Internal => Visibility::INTERNAL,
+            }
+        )
+    }
+}
+
+impl fmt::Display for Type_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use Type_::*;
+        match self {
+            UnresolvedError => write!(f, "_"),
+            Apply(n, tys) => {
+                write!(f, "{}", n)?;
+                if !tys.is_empty() {
+                    write!(f, "<")?;
+                    write!(f, "{}", format_comma(tys))?;
+                    write!(f, ">")?;
+                }
+                Ok(())
+            }
+            Ref(mut_, ty) => write!(f, "&{}{}", if *mut_ { "mut " } else { "" }, ty),
+            Fun(args, result) => write!(f, "({}):{}", format_comma(args), result),
+            Unit => write!(f, "()"),
+            Multiple(tys) => {
+                write!(f, "(")?;
+                write!(f, "{}", format_comma(tys))?;
+                write!(f, ")")
+            }
+        }
+    }
+}
+
+impl fmt::Display for SpecId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Program { modules, scripts } = self;
+        for (m, mdef) in modules.key_cloned_iter() {
+            w.write(&format!("module {}", m));
+            w.block(|w| mdef.ast_debug(w));
+            w.new_line();
+        }
+
+        for (n, s) in scripts {
+            w.write(&format!("script {}", n));
+            w.block(|w| s.ast_debug(w));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for ExplicitUseFun {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            loc: _,
+            attributes,
+            is_public,
+            function,
+            ty,
+            method,
+        } = self;
+        attributes.ast_debug(w);
+        w.new_line();
+        if is_public.is_some() {
+            w.write("public ");
+        }
+        w.write("use fun ");
+        function.ast_debug(w);
+        w.write(" as ");
+        ty.ast_debug(w);
+        w.writeln(&format!(".{method};"));
+    }
+}
+
+impl AstDebug for ImplicitUseFunCandidate {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            loc: _,
+            attributes,
+            is_public,
+            function: (m, n),
+            kind,
+        } = self;
+        attributes.ast_debug(w);
+        w.new_line();
+        if is_public.is_some() {
+            w.write("public ");
+        }
+        let kind_str = match kind {
+            ImplicitUseFunKind::UseAlias { used: true } => "#used",
+            ImplicitUseFunKind::UseAlias { used: false } => "#unused",
+            ImplicitUseFunKind::FunctionDeclaration => "#fundecl",
+        };
+        w.writeln(&format!("implcit{kind_str}#use fun {m}::{n};"));
+    }
+}
+
+impl AstDebug for UseFuns {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let UseFuns {
+            explicit: explict,
+            implicit,
+        } = self;
+        for use_fun in explict {
+            use_fun.ast_debug(w);
+        }
+        for (_, _, use_fun) in implicit {
+            use_fun.ast_debug(w);
+        }
+    }
+}
+
+impl AstDebug for AttributeValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            AttributeValue_::Value(v) => v.ast_debug(w),
+            AttributeValue_::Module(m) => w.write(&format!("{}", m)),
+            AttributeValue_::ModuleAccess(n) => n.ast_debug(w),
+        }
+    }
+}
+
+impl AstDebug for Attribute_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Attribute_::Name(n) => w.write(&format!("{}", n)),
+            Attribute_::Assigned(n, v) => {
+                w.write(&format!("{}", n));
+                w.write(" = ");
+                v.ast_debug(w);
+            }
+            Attribute_::Parameterized(n, inners) => {
+                w.write(&format!("{}", n));
+                w.write("(");
+                w.list(inners, ", ", |w, (_, _, inner)| {
+                    inner.ast_debug(w);
+                    false
+                });
+                w.write(")");
+            }
+        }
+    }
+}
+
+impl AstDebug for Attributes {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write("#[");
+        w.list(self, ", ", |w, (_, _, attr)| {
+            attr.ast_debug(w);
+            false
+        });
+        w.write("]");
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            package_name,
+            attributes,
+            loc: _loc,
+            use_funs,
+            constants,
+            function_name,
+            function,
+            specs,
+            warning_filter,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        use_funs.ast_debug(w);
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        (*function_name, function).ast_debug(w);
+        for spec in specs {
+            spec.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            package_name,
+            attributes,
+            loc: _loc,
+            is_source_module,
+            use_funs,
+            friends,
+            structs,
+            functions,
+            constants,
+            specs,
+            warning_filter,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        w.writeln(if *is_source_module {
+            "source module"
+        } else {
+            "library module"
+        });
+        use_funs.ast_debug(w);
+        for (mident, _loc) in friends.key_cloned_iter() {
+            w.write(&format!("friend {};", mident));
+            w.new_line();
+        }
+        for sdef in structs.key_cloned_iter() {
+            sdef.ast_debug(w);
+            w.new_line();
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        for fdef in functions.key_cloned_iter() {
+            fdef.ast_debug(w);
+            w.new_line();
+        }
+        for spec in specs {
+            spec.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+pub fn ability_modifiers_ast_debug(w: &mut AstWriter, abilities: &AbilitySet) {
+    if !abilities.is_empty() {
+        w.write(" has ");
+        w.list(abilities, " ", |w, ab| {
+            ab.ast_debug(w);
+            false
+        });
+    }
+}
+
+impl AstDebug for (StructName, &StructDefinition) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            StructDefinition {
+                index,
+                attributes,
+                loc: _loc,
+                abilities,
+                type_parameters,
+                fields,
+                warning_filter,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        if let StructFields::Native(_) = fields {
+            w.write("native ");
+        }
+
+        w.write(&format!("struct#{index} {name}"));
+        type_parameters.ast_debug(w);
+        ability_modifiers_ast_debug(w, abilities);
+        match fields {
+            StructFields::Named(fields) => w.block(|w| {
+                w.list(fields, ",", |w, (_, f, idx_st)| {
+                    let (idx, st) = idx_st;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    st.ast_debug(w);
+                    true
+                });
+            }),
+            StructFields::Positional(fields) => w.block(|w| {
+                w.list(fields.iter().enumerate(), ",", |w, (idx, ty)| {
+                    w.write(&format!("{idx}#pos{idx}: "));
+                    ty.ast_debug(w);
+                    true
+                });
+            }),
+            StructFields::Native(_) => (),
+        }
+    }
+}
+
+impl AstDebug for SpecBlock_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(" spec ");
+        self.target.ast_debug(w);
+        w.write("{");
+        w.semicolon(&self.members, |w, m| m.ast_debug(w));
+        w.write("}");
+    }
+}
+
+impl AstDebug for SpecBlockTarget_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SpecBlockTarget_::Code => {}
+            SpecBlockTarget_::Module => w.write("module "),
+            SpecBlockTarget_::Member(name, sign_opt) => {
+                w.write(name.value);
+                if let Some(sign) = sign_opt {
+                    sign.ast_debug(w);
+                }
+            }
+            SpecBlockTarget_::Schema(n, tys) => {
+                w.write(&format!("schema {}", n.value));
+                if !tys.is_empty() {
+                    w.write("<");
+                    w.list(tys, ", ", |w, ty| {
+                        ty.ast_debug(w);
+                        true
+                    });
+                    w.write(">");
+                }
+            }
+        }
+    }
+}
+
+impl AstDebug for SpecConditionKind_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SpecConditionKind_::*;
+        match self {
+            Assert => w.write("assert "),
+            Assume => w.write("assume "),
+            Decreases => w.write("decreases "),
+            AbortsIf => w.write("aborts_if "),
+            AbortsWith => w.write("aborts_with "),
+            SucceedsIf => w.write("succeeds_if "),
+            Modifies => w.write("modifies "),
+            Emits => w.write("emits "),
+            Ensures => w.write("ensures "),
+            Requires => w.write("requires "),
+            Invariant(ty_params) => {
+                w.write("invariant");
+                ty_params.ast_debug(w);
+                w.write(" ")
+            }
+            InvariantUpdate(ty_params) => {
+                w.write("invariant");
+                ty_params.ast_debug(w);
+                w.write(" update ")
+            }
+            Axiom(ty_params) => {
+                w.write("axiom");
+                ty_params.ast_debug(w);
+                w.write(" ")
+            }
+        }
+    }
+}
+
+impl AstDebug for SpecBlockMember_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SpecBlockMember_::Condition {
+                kind,
+                properties: _,
+                exp,
+                additional_exps,
+            } => {
+                kind.ast_debug(w);
+                exp.ast_debug(w);
+                w.list(additional_exps, ",", |w, e| {
+                    e.ast_debug(w);
+                    true
+                });
+            }
+            SpecBlockMember_::Function {
+                uninterpreted,
+                signature,
+                name,
+                body,
+            } => {
+                if *uninterpreted {
+                    w.write("uninterpreted ")
+                } else if let FunctionBody_::Native = &body.value {
+                    w.write("native ");
+                }
+                w.write(&format!("define {}", name));
+                signature.ast_debug(w);
+                match &body.value {
+                    FunctionBody_::Defined(body) => body.ast_debug(w),
+                    FunctionBody_::Native => w.writeln(";"),
+                }
+            }
+            SpecBlockMember_::Variable {
+                is_global,
+                name,
+                type_parameters,
+                type_,
+                init: _,
+            } => {
+                if *is_global {
+                    w.write("global ");
+                } else {
+                    w.write("local");
+                }
+                w.write(&format!("{}", name));
+                type_parameters.ast_debug(w);
+                w.write(": ");
+                type_.ast_debug(w);
+            }
+            SpecBlockMember_::Update { lhs, rhs } => {
+                w.write("update ");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            SpecBlockMember_::Let {
+                name,
+                post_state,
+                def,
+            } => {
+                w.write(&format!(
+                    "let {}{} = ",
+                    if *post_state { "post " } else { "" },
+                    name
+                ));
+                def.ast_debug(w);
+            }
+            SpecBlockMember_::Include { properties: _, exp } => {
+                w.write("include ");
+                exp.ast_debug(w);
+            }
+            SpecBlockMember_::Apply {
+                exp,
+                patterns,
+                exclusion_patterns,
+            } => {
+                w.write("apply ");
+                exp.ast_debug(w);
+                w.write(" to ");
+                w.list(patterns, ", ", |w, p| {
+                    p.ast_debug(w);
+                    true
+                });
+                if !exclusion_patterns.is_empty() {
+                    w.write(" exclude ");
+                    w.list(exclusion_patterns, ", ", |w, p| {
+                        p.ast_debug(w);
+                        true
+                    });
+                }
+            }
+            SpecBlockMember_::Pragma { properties } => {
+                w.write("pragma ");
+                w.list(properties, ", ", |w, p| {
+                    p.ast_debug(w);
+                    true
+                });
+            }
+        }
+    }
+}
+
+impl AstDebug for PragmaProperty_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(self.name.value);
+        if let Some(value) = &self.value {
+            w.write(" = ");
+            match value {
+                PragmaValue::Literal(l) => l.ast_debug(w),
+                PragmaValue::Ident(i) => i.ast_debug(w),
+            }
+        }
+    }
+}
+
+impl AstDebug for (FunctionName, &Function) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Function {
+                index,
+                attributes,
+                loc: _loc,
+                visibility,
+                entry,
+                signature,
+                body,
+                specs: _specs,
+                warning_filter,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun#{index} {name}"));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined(body) => body.ast_debug(w),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for Visibility {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{} ", self))
+    }
+}
+
+impl AstDebug for FunctionSignature {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let FunctionSignature {
+            type_parameters,
+            parameters,
+            return_type,
+        } = self;
+        type_parameters.ast_debug(w);
+        w.write("(");
+        w.comma(parameters, |w, (mutability, v, st)| {
+            if mutability.is_some() {
+                w.write("mut ");
+            }
+            w.write(&format!("{}: ", v));
+            st.ast_debug(w);
+        });
+        w.write("): ");
+        return_type.ast_debug(w)
+    }
+}
+
+impl AstDebug for (ConstantName, &Constant) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Constant {
+                warning_filter,
+                index,
+                attributes,
+                loc: _loc,
+                signature,
+                value,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        w.write(&format!("const#{index} {}:", name));
+        signature.ast_debug(w);
+        w.write(" = ");
+        value.ast_debug(w);
+        w.write(";");
+    }
+}
+
+impl AstDebug for Type_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Type_::Unit => w.write("()"),
+            Type_::Multiple(ss) => {
+                w.write("(");
+                ss.ast_debug(w);
+                w.write(")")
+            }
+            Type_::Apply(m, ss) => {
+                m.ast_debug(w);
+                if !ss.is_empty() {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+            }
+            Type_::Ref(mut_, s) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                s.ast_debug(w)
+            }
+            Type_::Fun(args, result) => {
+                w.write("(");
+                w.comma(args, |w, ty| ty.ast_debug(w));
+                w.write("):");
+                result.ast_debug(w);
+            }
+            Type_::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for Vec<(Name, AbilitySet)> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">")
+        }
+    }
+}
+
+impl AstDebug for Vec<StructTypeParameter> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">")
+        }
+    }
+}
+
+pub fn ability_constraints_ast_debug(w: &mut AstWriter, abilities: &AbilitySet) {
+    if !abilities.is_empty() {
+        w.write(": ");
+        w.list(abilities, "+", |w, ab| {
+            ab.ast_debug(w);
+            false
+        })
+    }
+}
+
+impl AstDebug for (Name, AbilitySet) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (n, abilities) = self;
+        w.write(n.value);
+        ability_constraints_ast_debug(w, abilities)
+    }
+}
+
+impl AstDebug for StructTypeParameter {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            is_phantom,
+            name,
+            constraints,
+        } = self;
+        if *is_phantom {
+            w.write("phantom ");
+        }
+        w.write(name.value);
+        ability_constraints_ast_debug(w, constraints)
+    }
+}
+
+impl AstDebug for Vec<Type> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, s| s.ast_debug(w))
+    }
+}
+
+impl AstDebug for ModuleAccess_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&match self {
+            ModuleAccess_::Name(n) => format!("{}", n),
+            ModuleAccess_::ModuleAccess(m, n) => format!("{}::{}", m, n),
+        })
+    }
+}
+
+impl AstDebug for Sequence {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.block(|w| {
+            let (use_funs, items) = self;
+            use_funs.ast_debug(w);
+            w.semicolon(items, |w, item| item.ast_debug(w))
+        })
+    }
+}
+
+impl AstDebug for SequenceItem_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SequenceItem_ as I;
+        match self {
+            I::Seq(e) => e.ast_debug(w),
+            I::Declare(sp!(_, bs), ty_opt) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                if let Some(ty) = ty_opt {
+                    ty.ast_debug(w)
+                }
+            }
+            I::Bind(sp!(_, bs), e) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                w.write(" = ");
+                e.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for Value_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Value_ as V;
+        match self {
+            V::Address(addr) => w.write(&format!("@{}", addr)),
+            V::InferredNum(u) => w.write(&format!("{}", u)),
+            V::U8(u) => w.write(&format!("{}u8", u)),
+            V::U16(u) => w.write(&format!("{}u16", u)),
+            V::U32(u) => w.write(&format!("{}u32", u)),
+            V::U64(u) => w.write(&format!("{}u64", u)),
+            V::U128(u) => w.write(&format!("{}u128", u)),
+            V::U256(u) => w.write(&format!("{}u256", u)),
+            V::Bool(b) => w.write(&format!("{}", b)),
+            V::Bytearray(v) => w.write(&format!("{:?}", v)),
+        }
+    }
+}
+
+impl AstDebug for Exp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Exp_ as E;
+        match self {
+            E::Unit { trailing } if !trailing => w.write("()"),
+            E::Unit {
+                trailing: _trailing,
+            } => w.write("/*()*/"),
+            E::Value(v) => v.ast_debug(w),
+            E::Move(v) => w.write(&format!("move {}", v)),
+            E::Copy(v) => w.write(&format!("copy {}", v)),
+            E::Name(ma, tys_opt) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+            }
+            E::Call(ma, is_macro, tys_opt, sp!(_, rhs)) => {
+                ma.ast_debug(w);
+                if *is_macro {
+                    w.write("!");
+                }
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::MethodCall(e, f, tys_opt, sp!(_, rhs)) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", f));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Pack(ma, tys_opt, fields) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_e)| {
+                    let (idx, e) = idx_e;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    e.ast_debug(w);
+                });
+                w.write("}");
+            }
+            E::Vector(_loc, tys_opt, sp!(_, elems)) => {
+                w.write("vector");
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("[");
+                w.comma(elems, |w, e| e.ast_debug(w));
+                w.write("]");
+            }
+            E::IfElse(b, t, f) => {
+                w.write("if (");
+                b.ast_debug(w);
+                w.write(") ");
+                t.ast_debug(w);
+                w.write(" else ");
+                f.ast_debug(w);
+            }
+            E::While(b, e) => {
+                w.write("while (");
+                b.ast_debug(w);
+                w.write(")");
+                e.ast_debug(w);
+            }
+            E::Loop(e) => {
+                w.write("loop ");
+                e.ast_debug(w);
+            }
+            E::Block(seq) => seq.ast_debug(w),
+            E::Lambda(sp!(_, bs), e) => {
+                w.write("fun ");
+                bs.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::Quant(kind, sp!(_, rs), trs, c_opt, e) => {
+                kind.ast_debug(w);
+                w.write(" ");
+                rs.ast_debug(w);
+                trs.ast_debug(w);
+                if let Some(c) = c_opt {
+                    w.write(" where ");
+                    c.ast_debug(w);
+                }
+                w.write(" : ");
+                e.ast_debug(w);
+            }
+            E::ExpList(es) => {
+                w.write("(");
+                w.comma(es, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+
+            E::Assign(sp!(_, lvalues), rhs) => {
+                lvalues.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            E::FieldMutate(ed, rhs) => {
+                ed.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            E::Mutate(lhs, rhs) => {
+                w.write("*");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+
+            E::Return(e) => {
+                w.write("return ");
+                e.ast_debug(w);
+            }
+            E::Abort(e) => {
+                w.write("abort ");
+                e.ast_debug(w);
+            }
+            E::Break => w.write("break"),
+            E::Continue => w.write("continue"),
+            E::Dereference(e) => {
+                w.write("*");
+                e.ast_debug(w)
+            }
+            E::UnaryExp(op, e) => {
+                op.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::BinopExp(l, op, r) => {
+                l.ast_debug(w);
+                w.write(" ");
+                op.ast_debug(w);
+                w.write(" ");
+                r.ast_debug(w)
+            }
+            E::Borrow(mut_, e) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+            }
+            E::ExpDotted(ed) => ed.ast_debug(w),
+            E::Cast(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" as ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Index(oper, index) => {
+                oper.ast_debug(w);
+                w.write("[");
+                index.ast_debug(w);
+                w.write("]");
+            }
+            E::Annotate(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(": ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Spec(u, unbound_names) => {
+                w.write(&format!("spec #{}", u));
+                if !unbound_names.is_empty() {
+                    w.write("uses [");
+                    w.comma(unbound_names, |w, n| w.write(&format!("{}", n)));
+                    w.write("]");
+                }
+            }
+            E::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for ExpDotted_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use ExpDotted_ as D;
+        match self {
+            D::Exp(e) => e.ast_debug(w),
+            D::Dot(e, n) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", n))
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<LValue> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, b| b.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for LValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use LValue_ as L;
+        match self {
+            L::Var(mutability, v, tys_opt) => {
+                if mutability.is_some() {
+                    w.write("mut ");
+                }
+                w.write(&format!("{}", v));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+            }
+            L::Unpack(ma, tys_opt, field_binds) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                field_binds.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<LValueWithRange> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, b| b.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for (LValue, Exp) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.0.ast_debug(w);
+        w.write(" in ");
+        self.1.ast_debug(w);
+    }
+}
+
+impl AstDebug for Vec<Vec<Exp>> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        for trigger in self {
+            w.write("{");
+            w.comma(trigger, |w, b| b.ast_debug(w));
+            w.write("}");
+        }
+    }
+}
+
+impl AstDebug for FieldBindings {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            FieldBindings::Named(fields) => {
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_b)| {
+                    let (idx, b) = idx_b;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    b.ast_debug(w);
+                });
+                w.write("}");
+            }
+            FieldBindings::Positional(vals) => {
+                w.write("(");
+                w.comma(vals.iter().enumerate(), |w, (idx, lval)| {
+                    w.write(&format!("{idx}: "));
+                    lval.ast_debug(w);
+                });
+                w.write(")");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/byte_string.rs b/vendors/move/crates/move-compiler/src/expansion/byte_string.rs
new file mode 100644
index 000000000..635b43722
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/byte_string.rs
@@ -0,0 +1,140 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{diag, diagnostics::Diagnostics, parser::syntax::make_loc};
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::*;
+
+struct Context {
+    file_hash: FileHash,
+    start_offset: usize,
+    diags: Diagnostics,
+}
+
+impl Context {
+    fn new(file_hash: FileHash, start_offset: usize) -> Self {
+        Self {
+            file_hash,
+            start_offset,
+            diags: Diagnostics::new(),
+        }
+    }
+
+    fn error(&mut self, start: usize, end: usize, err_text: String) {
+        let loc = make_loc(
+            self.file_hash,
+            self.start_offset + 2 + start, // add 2 for the beginning of the string
+            self.start_offset + 2 + end,
+        );
+        self.diags
+            .add(diag!(Syntax::InvalidByteString, (loc, err_text)))
+    }
+
+    fn has_diags(&self) -> bool {
+        !self.diags.is_empty()
+    }
+
+    fn get_diags(self) -> Diagnostics {
+        self.diags
+    }
+}
+
+pub fn decode(loc: Loc, text: &str) -> Result<Vec<u8>, Diagnostics> {
+    let file_hash = loc.file_hash();
+    let start_offset = loc.start() as usize;
+    let mut context = Context::new(file_hash, start_offset);
+    let mut buffer = vec![];
+    let chars: Vec<_> = text.chars().collect();
+    decode_(&mut context, &mut buffer, chars);
+    if !context.has_diags() {
+        Ok(buffer)
+    } else {
+        Err(context.get_diags())
+    }
+}
+
+fn decode_(context: &mut Context, buffer: &mut Vec<u8>, chars: Vec<char>) {
+    let len = chars.len();
+    let mut i = 0;
+    macro_rules! next_char {
+        () => {{
+            let c = chars[i];
+            i += 1;
+            c
+        }};
+    }
+    macro_rules! next_char_opt {
+        () => {{
+            if i < len {
+                Some(next_char!())
+            } else {
+                None
+            }
+        }};
+    }
+    while i < len {
+        let cur = i;
+        let c = next_char!();
+        if c != '\\' {
+            push(buffer, c);
+            continue;
+        }
+
+        match next_char!() {
+            'n' => push(buffer, '\n'),
+            'r' => push(buffer, '\r'),
+            't' => push(buffer, '\t'),
+            '\\' => push(buffer, '\\'),
+            '0' => push(buffer, '\0'),
+            '"' => push(buffer, '"'),
+            'x' => {
+                let d0_opt = next_char_opt!();
+                let d1_opt = next_char_opt!();
+                let hex = match (d0_opt, d1_opt) {
+                    (Some(d0), Some(d1)) => {
+                        let mut hex = String::new();
+                        hex.push(d0);
+                        hex.push(d1);
+                        hex
+                    }
+
+                    // Unexpected end of text
+                    (d0_opt @ Some(_), None) | (d0_opt @ None, None) => {
+                        let h = match d0_opt {
+                            Some(d0) => format!("{}", d0),
+                            None => "".to_string(),
+                        };
+                        let err_text = format!(
+                            "Invalid escape: '\\x{}'. Hex literals are represented by two \
+                             symbols: [\\x00-\\xFF].",
+                            h
+                        );
+                        context.error(cur, len, err_text);
+                        return;
+                    }
+
+                    // There was a second digit but no first?
+                    (None, Some(_)) => unreachable!(),
+                };
+                match hex::decode(hex) {
+                    Ok(hex_buffer) => buffer.extend(hex_buffer),
+                    Err(hex::FromHexError::InvalidHexCharacter { c, index }) => {
+                        let err_text = format!("Invalid hexadecimal character: '{}'", c);
+                        context.error(cur + 2 + index, cur + 2 + index, err_text);
+                    }
+                    Err(_) => unreachable!("ICE unexpected error parsing hex byte string value"),
+                }
+            }
+            c => {
+                context.error(cur, cur + 2, format!("Invalid escape sequence: '\\{}'", c));
+            }
+        }
+    }
+}
+
+fn push(buffer: &mut Vec<u8>, ch: char) {
+    let mut bytes = vec![0; ch.len_utf8()];
+    ch.encode_utf8(&mut bytes);
+    buffer.extend(bytes);
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/hex_string.rs b/vendors/move/crates/move-compiler/src/expansion/hex_string.rs
new file mode 100644
index 000000000..774f78614
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/hex_string.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{diag, diagnostics::Diagnostic, parser::syntax::make_loc};
+use move_ir_types::location::*;
+
+pub fn decode(loc: Loc, s: &str) -> Result<Vec<u8>, Box<Diagnostic>> {
+    match hex::decode(s) {
+        Ok(vec) => Ok(vec),
+        Err(hex::FromHexError::InvalidHexCharacter { c, index }) => {
+            let filename = loc.file_hash();
+            let start_offset = loc.start() as usize;
+            let offset = start_offset + 2 + index;
+            let loc = make_loc(filename, offset, offset);
+            Err(Box::new(diag!(
+                Syntax::InvalidHexString,
+                (loc, format!("Invalid hexadecimal character: '{}'", c)),
+            )))
+        }
+        Err(hex::FromHexError::OddLength) => Err(Box::new(diag!(
+            Syntax::InvalidHexString,
+            (
+                loc,
+                "Odd number of characters in hex string. Expected 2 hexadecimal digits for each \
+                 byte"
+                    .to_string(),
+            )
+        ))),
+        Err(_) => unreachable!("unexpected error parsing hex byte string value"),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/mod.rs b/vendors/move/crates/move-compiler/src/expansion/mod.rs
new file mode 100644
index 000000000..e98efc4c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/mod.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod aliases;
+pub mod ast;
+mod byte_string;
+mod hex_string;
+mod primitive_definers;
+pub(crate) mod translate;
diff --git a/vendors/move/crates/move-compiler/src/expansion/primitive_definers.rs b/vendors/move/crates/move-compiler/src/expansion/primitive_definers.rs
new file mode 100644
index 000000000..d5eed3097
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/primitive_definers.rs
@@ -0,0 +1,113 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeMap;
+
+use crate::{
+    diag,
+    expansion::ast::{ModuleDefinition, ModuleIdent},
+    naming::ast::BuiltinTypeName_,
+    shared::{
+        known_attributes::{DefinesPrimitive, KnownAttribute},
+        unique_map::UniqueMap,
+        CompilationEnv,
+    },
+    FullyCompiledProgram,
+};
+
+use super::ast::{AttributeName_, Attribute_};
+
+/// Gather primitive defines from module declarations, erroring on duplicates for a given base
+/// type or for unknown base types.
+pub fn modules(
+    env: &mut CompilationEnv,
+    pre_compiled_lib_opt: Option<&FullyCompiledProgram>,
+    modules: &UniqueMap<ModuleIdent, ModuleDefinition>,
+) {
+    let mut definers = BTreeMap::new();
+    for (mident, m) in modules.key_cloned_iter() {
+        check_prim_definer(
+            env,
+            /* allow shadowing */ false,
+            &mut definers,
+            mident,
+            m,
+        )
+    }
+    if let Some(pre_compiled_lib) = pre_compiled_lib_opt {
+        for (mident, m) in pre_compiled_lib.expansion.modules.key_cloned_iter() {
+            check_prim_definer(
+                env,
+                /* allow shadowing */ true,
+                &mut definers,
+                mident,
+                m,
+            )
+        }
+    }
+    env.set_primitive_type_definers(definers)
+}
+
+fn check_prim_definer(
+    env: &mut CompilationEnv,
+    allow_shadowing: bool,
+    definers: &mut BTreeMap<BuiltinTypeName_, crate::expansion::ast::ModuleIdent>,
+    mident: ModuleIdent,
+    m: &ModuleDefinition,
+) {
+    let defines_prim_attr =
+        m.attributes
+            .get_(&AttributeName_::Known(KnownAttribute::DefinesPrimitive(
+                DefinesPrimitive,
+            )));
+    let Some(sp!(attr_loc, attr_)) = defines_prim_attr else {
+        return;
+    };
+    let Attribute_::Parameterized(_, params) = attr_ else {
+        let msg = format!(
+            "Expected a primitive type parameterization, e.g. '{}(<type>)'",
+            DefinesPrimitive::DEFINES_PRIM
+        );
+        env.add_diag(diag!(Attributes::InvalidUsage, (*attr_loc, msg)));
+        return;
+    };
+    if params.len() != 1 {
+        let msg = format!(
+            "Expected a single primitive type parameterization, e.g. '{}(<type>)'",
+            DefinesPrimitive::DEFINES_PRIM
+        );
+        env.add_diag(diag!(Attributes::InvalidUsage, (*attr_loc, msg)));
+        return;
+    }
+    let (_, _, sp!(param_loc, param_)) = params.into_iter().next().unwrap();
+    let Attribute_::Name(name) = param_ else {
+        let msg = format!(
+            "Expected a primitive type parameterization, e.g. '{}(<type>)'",
+            DefinesPrimitive::DEFINES_PRIM
+        );
+        env.add_diag(diag!(Attributes::InvalidUsage, (*param_loc, msg)));
+        return;
+    };
+    let Some(prim) = BuiltinTypeName_::resolve(name.value.as_str()) else {
+        let msg = format!(
+            "Invalid parameterization of '{}'. Unknown primitive type '{}'",
+            DefinesPrimitive::DEFINES_PRIM,
+            name,
+        );
+        env.add_diag(diag!(Attributes::InvalidUsage, (name.loc, msg)));
+        return;
+    };
+
+    if let Some(prev) = definers.get(&prim) {
+        if !allow_shadowing {
+            let msg = format!("Duplicate definer annotated for primitive type '{}'", prim);
+            env.add_diag(diag!(
+                Attributes::InvalidUsage,
+                (*attr_loc, msg),
+                (prev.loc, "Previously declared here")
+            ));
+        }
+    } else {
+        definers.insert(prim, mident);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/expansion/translate.rs b/vendors/move/crates/move-compiler/src/expansion/translate.rs
new file mode 100644
index 000000000..e7db06d9a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/expansion/translate.rs
@@ -0,0 +1,3262 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag,
+    diagnostics::{codes::WarningFilter, Diagnostic, WarningFilters},
+    editions::FeatureGate,
+    expansion::{
+        aliases::{AliasMap, AliasSet},
+        ast::{self as E, Address, Fields, ModuleIdent, ModuleIdent_, SpecId},
+        byte_string, hex_string,
+    },
+    parser::ast::{
+        self as P, Ability, ConstantName, Field, FieldBindings, FunctionName, ModuleName,
+        Mutability, StructName, Var,
+    },
+    shared::{known_attributes::AttributePosition, unique_map::UniqueMap, *},
+    FullyCompiledProgram,
+};
+use move_command_line_common::parser::{parse_u16, parse_u256, parse_u32};
+use move_core_types::account_address::AccountAddress;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    iter::IntoIterator,
+};
+
+use super::aliases::{AliasMapBuilder, OldAliasMap, ParserExplicitUseFun, UseFunsBuilder};
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+type ModuleMembers = BTreeMap<Name, ModuleMemberKind>;
+
+struct Context<'env, 'map> {
+    module_members: UniqueMap<ModuleIdent, ModuleMembers>,
+    named_address_mapping: Option<&'map NamedAddressMap>,
+    address_conflicts: BTreeSet<Symbol>,
+    address: Option<Address>,
+    aliases: AliasMap,
+    is_source_definition: bool,
+    current_package: Option<Symbol>,
+    in_spec_context: bool,
+    exp_specs: BTreeMap<SpecId, E::SpecBlock>,
+    // Cached warning filters for all available prefixes. Used by non-source defs
+    // and dependency packages
+    all_filter_alls: WarningFilters,
+    env: &'env mut CompilationEnv,
+}
+
+impl<'env, 'map> Context<'env, 'map> {
+    fn new(
+        compilation_env: &'env mut CompilationEnv,
+        module_members: UniqueMap<ModuleIdent, ModuleMembers>,
+        address_conflicts: BTreeSet<Symbol>,
+    ) -> Self {
+        let mut all_filter_alls = WarningFilters::new_for_dependency();
+        for allow in compilation_env.filter_attributes() {
+            for f in compilation_env.filter_from_str(FILTER_ALL, *allow) {
+                all_filter_alls.add(f);
+            }
+        }
+        Self {
+            module_members,
+            env: compilation_env,
+            named_address_mapping: None,
+            address_conflicts,
+            address: None,
+            aliases: AliasMap::new(),
+            is_source_definition: false,
+            current_package: None,
+            in_spec_context: false,
+            exp_specs: BTreeMap::new(),
+            all_filter_alls,
+        }
+    }
+
+    fn cur_address(&self) -> &Address {
+        self.address.as_ref().unwrap()
+    }
+
+    /// Resets the alias map and reports errors for aliases that were unused
+    /// Marks implicit use funs as unused
+    pub fn set_to_outer_scope(
+        &mut self,
+        mut use_funs: Option<&mut E::UseFuns>,
+        outer_scope: OldAliasMap,
+    ) {
+        let AliasSet { modules, members } = self.aliases.set_to_outer_scope(outer_scope);
+        for alias in modules {
+            unused_alias(self, alias)
+        }
+        for alias in members {
+            let use_fun_used_opt = use_funs
+                .as_mut()
+                .and_then(|use_funs| use_funs.implicit.get_mut(&alias))
+                .and_then(|use_fun| match &mut use_fun.kind {
+                    E::ImplicitUseFunKind::FunctionDeclaration => None,
+                    E::ImplicitUseFunKind::UseAlias { used } => Some(used),
+                });
+            if let Some(used) = use_fun_used_opt {
+                // We do not report the use error if it is a function alias, since these will be
+                // reported after method calls are fully resolved
+                *used = false;
+            } else {
+                unused_alias(self, alias)
+            }
+        }
+    }
+
+    pub fn bind_exp_spec(&mut self, spec_block: P::SpecBlock) -> (SpecId, BTreeSet<Name>) {
+        let len = self.exp_specs.len();
+        let id = SpecId::new(len);
+        let espec_block = spec(self, spec_block);
+        let mut unbound_names = BTreeSet::new();
+        unbound_names_spec_block(&mut unbound_names, &espec_block);
+        self.exp_specs.insert(id, espec_block);
+
+        (id, unbound_names)
+    }
+
+    pub fn extract_exp_specs(&mut self) -> BTreeMap<SpecId, E::SpecBlock> {
+        std::mem::take(&mut self.exp_specs)
+    }
+}
+
+/// We mark named addresses as having a conflict if there is not a bidirectional mapping between
+/// the name and its value
+fn compute_address_conflicts(
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: &P::Program,
+) -> BTreeSet<Symbol> {
+    let mut name_to_addr: BTreeMap<Symbol, BTreeSet<AccountAddress>> = BTreeMap::new();
+    let mut addr_to_name: BTreeMap<AccountAddress, BTreeSet<Symbol>> = BTreeMap::new();
+    let all_addrs = prog.named_address_maps.all().iter().chain(
+        pre_compiled_lib
+            .iter()
+            .flat_map(|pre| pre.parser.named_address_maps.all()),
+    );
+    for map in all_addrs {
+        for (n, addr) in map {
+            let n = *n;
+            let addr = addr.into_inner();
+            name_to_addr.entry(n).or_default().insert(addr);
+            addr_to_name.entry(addr).or_default().insert(n);
+        }
+    }
+    let name_to_addr_conflicts = name_to_addr
+        .into_iter()
+        .filter(|(_, addrs)| addrs.len() > 1)
+        .map(|(n, _)| n);
+    let addr_to_name_conflicts = addr_to_name
+        .into_iter()
+        .filter(|(_, addrs)| addrs.len() > 1)
+        .flat_map(|(_, ns)| ns.into_iter());
+    name_to_addr_conflicts
+        .chain(addr_to_name_conflicts)
+        .collect()
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: P::Program,
+) -> E::Program {
+    let address_conflicts = compute_address_conflicts(pre_compiled_lib, &prog);
+    let module_members = {
+        let mut members = UniqueMap::new();
+        all_module_members(
+            compilation_env,
+            &address_conflicts,
+            &prog.named_address_maps,
+            &mut members,
+            true,
+            &prog.source_definitions,
+        );
+        all_module_members(
+            compilation_env,
+            &address_conflicts,
+            &prog.named_address_maps,
+            &mut members,
+            true,
+            &prog.lib_definitions,
+        );
+        if let Some(pre_compiled) = pre_compiled_lib {
+            assert!(pre_compiled.parser.lib_definitions.is_empty());
+            all_module_members(
+                compilation_env,
+                &address_conflicts,
+                &pre_compiled.parser.named_address_maps,
+                &mut members,
+                false,
+                &pre_compiled.parser.source_definitions,
+            );
+        }
+        members
+    };
+
+    let mut context = Context::new(compilation_env, module_members, address_conflicts);
+
+    let mut source_module_map = UniqueMap::new();
+    let mut lib_module_map = UniqueMap::new();
+    let mut scripts = vec![];
+    let P::Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    } = prog;
+
+    context.is_source_definition = true;
+    for P::PackageDefinition {
+        package,
+        named_address_map,
+        def,
+    } in source_definitions
+    {
+        context.current_package = package;
+        context.named_address_mapping = Some(named_address_maps.get(named_address_map));
+        definition(
+            &mut context,
+            &mut source_module_map,
+            &mut scripts,
+            package,
+            def,
+        )
+    }
+
+    context.is_source_definition = false;
+    for P::PackageDefinition {
+        package,
+        named_address_map,
+        def,
+    } in lib_definitions
+    {
+        context.current_package = package;
+        context.named_address_mapping = Some(named_address_maps.get(named_address_map));
+        definition(
+            &mut context,
+            &mut lib_module_map,
+            &mut scripts,
+            package,
+            def,
+        )
+    }
+    context.current_package = None;
+
+    for (mident, module) in lib_module_map {
+        if let Err((mident, old_loc)) = source_module_map.add(mident, module) {
+            if !context.env.flags().sources_shadow_deps() {
+                duplicate_module(&mut context, &source_module_map, mident, old_loc)
+            }
+        }
+    }
+    let module_map = source_module_map;
+
+    let scripts = {
+        let mut collected: BTreeMap<Symbol, Vec<E::Script>> = BTreeMap::new();
+        for s in scripts {
+            collected
+                .entry(s.function_name.value())
+                .or_default()
+                .push(s)
+        }
+        let mut keyed: BTreeMap<Symbol, E::Script> = BTreeMap::new();
+        for (n, mut ss) in collected {
+            match ss.len() {
+                0 => unreachable!(),
+                1 => assert!(
+                    keyed.insert(n, ss.pop().unwrap()).is_none(),
+                    "ICE duplicate script key"
+                ),
+                _ => {
+                    for (i, s) in ss.into_iter().enumerate() {
+                        let k = format!("{}_{}", n, i);
+                        assert!(
+                            keyed.insert(k.into(), s).is_none(),
+                            "ICE duplicate script key"
+                        )
+                    }
+                }
+            }
+        }
+        keyed
+    };
+
+    super::primitive_definers::modules(context.env, pre_compiled_lib, &module_map);
+    E::Program {
+        modules: module_map,
+        scripts,
+    }
+}
+
+fn definition(
+    context: &mut Context,
+    module_map: &mut UniqueMap<ModuleIdent, E::ModuleDefinition>,
+    scripts: &mut Vec<E::Script>,
+    package_name: Option<Symbol>,
+    def: P::Definition,
+) {
+    match def {
+        P::Definition::Module(mut m) => {
+            let module_paddr = std::mem::take(&mut m.address);
+            let module_addr = module_paddr
+                .map(|a| sp(a.loc, address(context, /* suggest_declaration */ true, a)));
+            module(context, module_map, package_name, module_addr, m)
+        }
+        P::Definition::Address(a) => {
+            let addr = address(context, /* suggest_declaration */ false, a.addr);
+            for mut m in a.modules {
+                let module_addr = check_module_address(context, a.loc, addr, &mut m);
+                module(context, module_map, package_name, Some(module_addr), m)
+            }
+        }
+
+        P::Definition::Script(_) if !context.is_source_definition => (),
+        P::Definition::Script(s) => script(context, scripts, package_name, s),
+    }
+}
+
+fn address_without_value_error(suggest_declaration: bool, loc: Loc, n: &Name) -> Diagnostic {
+    let mut msg = format!("address '{}' is not assigned a value", n);
+    if suggest_declaration {
+        msg = format!(
+            "{}. Try assigning it a value when calling the compiler",
+            msg,
+        )
+    }
+    diag!(NameResolution::AddressWithoutValue, (loc, msg))
+}
+
+// Access a top level address as declared, not affected by any aliasing/shadowing
+fn address(context: &mut Context, suggest_declaration: bool, ln: P::LeadingNameAccess) -> Address {
+    address_(
+        context.env,
+        &context.address_conflicts,
+        context.named_address_mapping.as_ref().unwrap(),
+        suggest_declaration,
+        ln,
+    )
+}
+
+fn address_(
+    compilation_env: &mut CompilationEnv,
+    address_conflicts: &BTreeSet<Symbol>,
+    named_address_mapping: &NamedAddressMap,
+    suggest_declaration: bool,
+    ln: P::LeadingNameAccess,
+) -> Address {
+    let name_res = check_valid_address_name_(compilation_env, &ln);
+    let sp!(loc, ln_) = ln;
+    match ln_ {
+        P::LeadingNameAccess_::AnonymousAddress(bytes) => {
+            debug_assert!(name_res.is_ok());
+            Address::anonymous(loc, bytes)
+        }
+        P::LeadingNameAccess_::Name(n) => match named_address_mapping.get(&n.value).copied() {
+            Some(addr) => Address::Numerical {
+                name: Some(n),
+                value: sp(loc, addr),
+                name_conflict: address_conflicts.contains(&n.value),
+            },
+            None => {
+                if name_res.is_ok() {
+                    compilation_env.add_diag(address_without_value_error(
+                        suggest_declaration,
+                        loc,
+                        &n,
+                    ));
+                }
+                Address::NamedUnassigned(n)
+            }
+        },
+    }
+}
+
+fn module_ident(context: &mut Context, sp!(loc, mident_): P::ModuleIdent) -> ModuleIdent {
+    let P::ModuleIdent_ {
+        address: ln,
+        module,
+    } = mident_;
+    let addr = address(context, /* suggest_declaration */ false, ln);
+    sp(loc, ModuleIdent_::new(addr, module))
+}
+
+fn check_module_address(
+    context: &mut Context,
+    loc: Loc,
+    addr: Address,
+    m: &mut P::ModuleDefinition,
+) -> Spanned<Address> {
+    let module_address = std::mem::take(&mut m.address);
+    match module_address {
+        Some(other_paddr) => {
+            let other_loc = other_paddr.loc;
+            let other_addr = address(context, /* suggest_declaration */ true, other_paddr);
+            let msg = if addr == other_addr {
+                "Redundant address specification"
+            } else {
+                "Multiple addresses specified for module"
+            };
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (other_loc, msg),
+                (loc, "Address previously specified here")
+            ));
+            sp(other_loc, other_addr)
+        }
+        None => sp(loc, addr),
+    }
+}
+
+fn duplicate_module(
+    context: &mut Context,
+    module_map: &UniqueMap<ModuleIdent, E::ModuleDefinition>,
+    mident: ModuleIdent,
+    old_loc: Loc,
+) {
+    let old_mident = module_map.get_key(&mident).unwrap();
+    let dup_msg = format!("Duplicate definition for module '{}'", mident);
+    let prev_msg = format!("Module previously defined here, with '{}'", old_mident);
+    context.env.add_diag(diag!(
+        Declarations::DuplicateItem,
+        (mident.loc, dup_msg),
+        (old_loc, prev_msg),
+    ))
+}
+
+fn module(
+    context: &mut Context,
+    module_map: &mut UniqueMap<ModuleIdent, E::ModuleDefinition>,
+    package_name: Option<Symbol>,
+    module_address: Option<Spanned<Address>>,
+    module_def: P::ModuleDefinition,
+) {
+    assert!(context.address.is_none());
+    let (mident, mod_) = module_(context, package_name, module_address, module_def);
+    if let Err((mident, old_loc)) = module_map.add(mident, mod_) {
+        duplicate_module(context, module_map, mident, old_loc)
+    }
+    context.address = None
+}
+
+fn set_sender_address(
+    context: &mut Context,
+    module_name: &ModuleName,
+    sender: Option<Spanned<Address>>,
+) {
+    context.address = Some(match sender {
+        Some(sp!(_, addr)) => addr,
+        None => {
+            let loc = module_name.loc();
+            let msg = format!(
+                "Invalid module declaration. The module does not have a specified address. Either \
+                 declare it inside of an 'address <address> {{' block or declare it with an \
+                 address 'module <address>::{}''",
+                module_name
+            );
+            context
+                .env
+                .add_diag(diag!(Declarations::InvalidModule, (loc, msg)));
+            Address::anonymous(loc, NumericalAddress::DEFAULT_ERROR_ADDRESS)
+        }
+    })
+}
+
+fn module_(
+    context: &mut Context,
+    package_name: Option<Symbol>,
+    module_address: Option<Spanned<Address>>,
+    mdef: P::ModuleDefinition,
+) -> (ModuleIdent, E::ModuleDefinition) {
+    let P::ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        is_spec_module: _,
+        name,
+        members,
+    } = mdef;
+    let attributes = flatten_attributes(context, AttributePosition::Module, attributes);
+    let mut warning_filter = module_warning_filter(context, &attributes);
+    let config = context.env.package_config(package_name);
+    warning_filter.union(&config.warning_filter);
+
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    assert!(context.address.is_none());
+    assert!(address.is_none());
+    set_sender_address(context, &name, module_address);
+    let _ = check_restricted_name_all_cases(context, NameCase::Module, &name.0);
+    if name.value().starts_with(|c| c == '_') {
+        let msg = format!(
+            "Invalid module name '{}'. Module names cannot start with '_'",
+            name,
+        );
+        context
+            .env
+            .add_diag(diag!(Declarations::InvalidName, (name.loc(), msg)));
+    }
+
+    let name_loc = name.0.loc;
+    let current_module = sp(name_loc, ModuleIdent_::new(*context.cur_address(), name));
+
+    let mut new_scope = AliasMapBuilder::new();
+    let mut use_funs_builder = UseFunsBuilder::new();
+    module_self_aliases(&mut new_scope, &current_module);
+    let members = members
+        .into_iter()
+        .filter_map(|member| {
+            aliases_from_member(
+                context,
+                &mut new_scope,
+                &mut use_funs_builder,
+                &current_module,
+                member,
+            )
+        })
+        .collect::<Vec<_>>();
+    let old_aliases = context.aliases.add_and_shadow_all(new_scope);
+    assert!(
+        old_aliases.is_empty(),
+        "ICE there should be no aliases entering a module"
+    );
+
+    let mut friends = UniqueMap::new();
+    let mut functions = UniqueMap::new();
+    let mut constants = UniqueMap::new();
+    let mut structs = UniqueMap::new();
+    let mut specs = vec![];
+    for member in members {
+        match member {
+            P::ModuleMember::Use(_) => unreachable!(),
+            P::ModuleMember::Friend(f) => friend(context, &mut friends, f),
+            P::ModuleMember::Function(mut f) => {
+                if !context.is_source_definition {
+                    f.body.value = P::FunctionBody_::Native
+                }
+                function(
+                    context,
+                    Some((current_module, &mut use_funs_builder)),
+                    &mut functions,
+                    f,
+                )
+            }
+            P::ModuleMember::Constant(c) => constant(context, &mut constants, c),
+            P::ModuleMember::Struct(s) => struct_def(context, &mut structs, s),
+            P::ModuleMember::Spec(s) => specs.push(spec(context, s)),
+        }
+    }
+    let mut use_funs = use_funs(context, use_funs_builder);
+    check_visibility_modifiers(context, &functions, &friends, package_name);
+
+    context.set_to_outer_scope(Some(&mut use_funs), old_aliases);
+
+    let def = E::ModuleDefinition {
+        package_name,
+        attributes,
+        loc,
+        use_funs,
+        is_source_module: context.is_source_definition,
+        friends,
+        structs,
+        constants,
+        functions,
+        specs,
+        warning_filter,
+    };
+    context.env.pop_warning_filter_scope();
+    (current_module, def)
+}
+
+fn check_visibility_modifiers(
+    context: &mut Context,
+    functions: &UniqueMap<FunctionName, E::Function>,
+    friends: &UniqueMap<ModuleIdent, E::Friend>,
+    package_name: Option<Symbol>,
+) {
+    let mut friend_usage = friends.iter().next().map(|(_, _, friend)| friend.loc);
+    let mut public_package_usage = None;
+    for (_, _, function) in functions {
+        match function.visibility {
+            E::Visibility::Friend(loc) if friend_usage.is_none() => {
+                friend_usage = Some(loc);
+            }
+            E::Visibility::Package(loc) => {
+                context
+                    .env
+                    .check_feature(FeatureGate::PublicPackage, package_name, loc);
+                public_package_usage = Some(loc);
+            }
+            _ => (),
+        }
+    }
+
+    // Emit any errors.
+    if public_package_usage.is_some() && friend_usage.is_some() {
+        let friend_error_msg = format!(
+            "Cannot define 'friend' modules and use '{}' visibility in the same module",
+            E::Visibility::PACKAGE
+        );
+        let package_definition_msg = format!("'{}' visibility used here", E::Visibility::PACKAGE);
+        for (_, _, friend) in friends {
+            context.env.add_diag(diag!(
+                Declarations::InvalidVisibilityModifier,
+                (friend.loc, friend_error_msg.clone()),
+                (
+                    public_package_usage.unwrap(),
+                    package_definition_msg.clone()
+                )
+            ));
+        }
+        let package_error_msg = format!(
+            "Cannot mix '{}' and '{}' visibilities in the same module",
+            E::Visibility::PACKAGE_IDENT,
+            E::Visibility::FRIEND_IDENT
+        );
+        let friend_error_msg = format!(
+            "Cannot mix '{}' and '{}' visibilities in the same module",
+            E::Visibility::FRIEND_IDENT,
+            E::Visibility::PACKAGE_IDENT
+        );
+        for (_, _, function) in functions {
+            match function.visibility {
+                E::Visibility::Friend(loc) => {
+                    context.env.add_diag(diag!(
+                        Declarations::InvalidVisibilityModifier,
+                        (loc, friend_error_msg.clone()),
+                        (
+                            public_package_usage.unwrap(),
+                            package_definition_msg.clone()
+                        )
+                    ));
+                }
+                E::Visibility::Package(loc) => {
+                    context.env.add_diag(diag!(
+                        Declarations::InvalidVisibilityModifier,
+                        (loc, package_error_msg.clone()),
+                        (
+                            friend_usage.unwrap(),
+                            &format!("'{}' visibility used here", E::Visibility::FRIEND_IDENT)
+                        )
+                    ));
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+fn script(
+    context: &mut Context,
+    scripts: &mut Vec<E::Script>,
+    package_name: Option<Symbol>,
+    pscript: P::Script,
+) {
+    scripts.push(script_(context, package_name, pscript))
+}
+
+fn script_(context: &mut Context, package_name: Option<Symbol>, pscript: P::Script) -> E::Script {
+    assert!(context.address.is_none());
+    assert!(context.is_source_definition);
+    let P::Script {
+        attributes,
+        loc,
+        uses: puses,
+        constants: pconstants,
+        function: pfunction,
+        specs: pspecs,
+    } = pscript;
+
+    let attributes = flatten_attributes(context, AttributePosition::Script, attributes);
+    let mut warning_filter = warning_filter(context, &attributes);
+    let config = context.env.package_config(package_name);
+    warning_filter.union(&config.warning_filter);
+
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let (new_scope, use_funs_builder) = uses(context, puses);
+    let old_aliases = context.aliases.add_and_shadow_all(new_scope);
+    assert!(
+        old_aliases.is_empty(),
+        "ICE there should be no aliases entering a script"
+    );
+    let mut use_funs = use_funs(context, use_funs_builder);
+
+    let mut constants = UniqueMap::new();
+    for c in pconstants {
+        // TODO remove after Self rework
+        check_valid_module_member_name(context, ModuleMemberKind::Constant, c.name.0);
+        constant(context, &mut constants, c);
+    }
+
+    // TODO remove after Self rework
+    check_valid_module_member_name(context, ModuleMemberKind::Function, pfunction.name.0);
+    let (function_name, function) = function_(context, None, 0, pfunction);
+    match &function.visibility {
+        E::Visibility::Friend(loc) | E::Visibility::Package(loc) | E::Visibility::Public(loc) => {
+            let msg = format!(
+                "Invalid '{}' visibility modifier. \
+                Script functions are not callable from other Move functions.",
+                function.visibility,
+            );
+            context
+                .env
+                .add_diag(diag!(Declarations::UnnecessaryItem, (*loc, msg)));
+        }
+        E::Visibility::Internal => (),
+    }
+    match &function.body {
+        sp!(_, E::FunctionBody_::Defined(_)) => (),
+        sp!(loc, E::FunctionBody_::Native) => {
+            context.env.add_diag(diag!(
+                Declarations::InvalidScript,
+                (
+                    *loc,
+                    "Invalid 'native' function. 'script' functions must have a defined body"
+                )
+            ));
+        }
+    }
+    let specs = specs(context, pspecs);
+    context.set_to_outer_scope(Some(&mut use_funs), old_aliases);
+    context.env.pop_warning_filter_scope();
+    E::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        use_funs,
+        constants,
+        function_name,
+        function,
+        specs,
+    }
+}
+
+fn flatten_attributes(
+    context: &mut Context,
+    attr_position: AttributePosition,
+    attributes: Vec<P::Attributes>,
+) -> E::Attributes {
+    let all_attrs = attributes
+        .into_iter()
+        .flat_map(|attrs| attrs.value)
+        .flat_map(|attr| attribute(context, attr_position, attr))
+        .collect::<Vec<_>>();
+    unique_attributes(context, attr_position, false, all_attrs)
+}
+
+fn unique_attributes(
+    context: &mut Context,
+    attr_position: AttributePosition,
+    is_nested: bool,
+    attributes: impl IntoIterator<Item = E::Attribute>,
+) -> E::Attributes {
+    let mut attr_map = UniqueMap::new();
+    for sp!(loc, attr_) in attributes {
+        let sp!(nloc, sym) = match &attr_ {
+            E::Attribute_::Name(n)
+            | E::Attribute_::Assigned(n, _)
+            | E::Attribute_::Parameterized(n, _) => *n,
+        };
+        let name_ = match known_attributes::KnownAttribute::resolve(sym) {
+            None => E::AttributeName_::Unknown(sym),
+            Some(known) => {
+                debug_assert!(known.name() == sym.as_str());
+                if is_nested {
+                    let msg = "Known attribute '{}' is not expected in a nested attribute position";
+                    context
+                        .env
+                        .add_diag(diag!(Declarations::InvalidAttribute, (nloc, msg)));
+                    continue;
+                }
+
+                let expected_positions = known.expected_positions();
+                if !expected_positions.contains(&attr_position) {
+                    let msg = format!(
+                        "Known attribute '{}' is not expected with a {}",
+                        known.name(),
+                        attr_position
+                    );
+                    let all_expected = expected_positions
+                        .iter()
+                        .map(|p| format!("{}", p))
+                        .collect::<Vec<_>>()
+                        .join(", ");
+                    let expected_msg = format!(
+                        "Expected to be used with one of the following: {}",
+                        all_expected
+                    );
+                    context.env.add_diag(diag!(
+                        Declarations::InvalidAttribute,
+                        (nloc, msg),
+                        (nloc, expected_msg)
+                    ));
+                    continue;
+                }
+                E::AttributeName_::Known(known)
+            }
+        };
+        if let Err((_, old_loc)) = attr_map.add(sp(nloc, name_), sp(loc, attr_)) {
+            let msg = format!("Duplicate attribute '{}' attached to the same item", name_);
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (loc, msg),
+                (old_loc, "Attribute previously given here"),
+            ));
+        }
+    }
+    attr_map
+}
+
+fn attribute(
+    context: &mut Context,
+    attr_position: AttributePosition,
+    sp!(loc, attribute_): P::Attribute,
+) -> Option<E::Attribute> {
+    use E::Attribute_ as EA;
+    use P::Attribute_ as PA;
+    Some(sp(
+        loc,
+        match attribute_ {
+            PA::Name(n) => EA::Name(n),
+            PA::Assigned(n, v) => EA::Assigned(n, Box::new(attribute_value(context, *v)?)),
+            PA::Parameterized(n, sp!(_, pattrs_)) => {
+                let attrs = pattrs_
+                    .into_iter()
+                    .map(|a| attribute(context, attr_position, a))
+                    .collect::<Option<Vec<_>>>()?;
+                EA::Parameterized(n, unique_attributes(context, attr_position, true, attrs))
+            }
+        },
+    ))
+}
+
+fn attribute_value(
+    context: &mut Context,
+    sp!(loc, avalue_): P::AttributeValue,
+) -> Option<E::AttributeValue> {
+    use E::AttributeValue_ as EV;
+    use P::{AttributeValue_ as PV, LeadingNameAccess_ as LN, NameAccessChain_ as PN};
+    Some(sp(
+        loc,
+        match avalue_ {
+            PV::Value(v) => EV::Value(value(context, v)?),
+            PV::ModuleAccess(sp!(ident_loc, PN::Two(sp!(aloc, LN::AnonymousAddress(a)), n))) => {
+                let addr = Address::anonymous(aloc, a);
+                let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n)));
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
+            // bit wonky, but this is the only spot currently where modules and expressions exist
+            // in the same namespace.
+            // TODO consider if we want to just force all of these checks into the well-known
+            // attribute setup
+            PV::ModuleAccess(sp!(ident_loc, PN::One(n)))
+                if context.aliases.module_alias_get(&n).is_some() =>
+            {
+                let sp!(_, mident_) = context.aliases.module_alias_get(&n).unwrap();
+                let mident = sp(ident_loc, mident_);
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
+            PV::ModuleAccess(sp!(ident_loc, PN::Two(sp!(aloc, LN::Name(n1)), n2)))
+                if context
+                    .named_address_mapping
+                    .as_ref()
+                    .map(|m| m.contains_key(&n1.value))
+                    .unwrap_or(false) =>
+            {
+                let addr = address(context, false, sp(aloc, LN::Name(n1)));
+                let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n2)));
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
+            PV::ModuleAccess(ma) => EV::ModuleAccess(name_access_chain(context, Access::Type, ma)?),
+        },
+    ))
+}
+
+/// Like warning_filter, but it will filter _all_ warnings for non-source definitions (or for any
+/// dependency packages)
+fn module_warning_filter(
+    context: &mut Context,
+    attributes: &UniqueMap<E::AttributeName, E::Attribute>,
+) -> WarningFilters {
+    let filters = warning_filter(context, attributes);
+    let is_dep = !context.is_source_definition
+        || context
+            .env
+            .package_config(context.current_package)
+            .is_dependency;
+    if is_dep {
+        // For dependencies (non source defs or package deps), we check the filters for errors
+        // but then throw them away and actually ignore _all_ warnings
+        context.all_filter_alls.clone()
+    } else {
+        filters
+    }
+}
+
+fn warning_filter(
+    context: &mut Context,
+    attributes: &UniqueMap<E::AttributeName, E::Attribute>,
+) -> WarningFilters {
+    use crate::diagnostics::codes::Category;
+    use known_attributes::DiagnosticAttribute;
+    let mut warning_filters = WarningFilters::new_for_source();
+    let filter_attribute_names = context.env.filter_attributes().clone();
+    for allow in filter_attribute_names {
+        let Some(attr) = attributes.get_(&allow) else {
+            continue;
+        };
+        let inners = match &attr.value {
+            E::Attribute_::Parameterized(_, inner) if !inner.is_empty() => inner,
+            _ => {
+                let msg = format!(
+                    "Expected list of warnings, e.g. '{}({})'",
+                    DiagnosticAttribute::ALLOW,
+                    WarningFilter::Category {
+                        prefix: None,
+                        category: Category::UnusedItem as u8,
+                        name: Some(FILTER_UNUSED)
+                    }
+                    .to_str()
+                    .unwrap(),
+                );
+                context
+                    .env
+                    .add_diag(diag!(Attributes::InvalidValue, (attr.loc, msg)));
+                continue;
+            }
+        };
+        for (inner_attr_loc, _, inner_attr) in inners {
+            let sp!(_, name_) = match inner_attr.value {
+                E::Attribute_::Name(n) => n,
+                E::Attribute_::Assigned(n, _) | E::Attribute_::Parameterized(n, _) => {
+                    let msg = format!(
+                        "Expected a stand alone warning filter identifier, e.g. '{}({})'",
+                        DiagnosticAttribute::ALLOW,
+                        n
+                    );
+                    context
+                        .env
+                        .add_diag(diag!(Attributes::InvalidValue, (inner_attr_loc, msg)));
+                    n
+                }
+            };
+            let filters = context.env.filter_from_str(name_, allow);
+            if filters.is_empty() {
+                let msg = format!("Unknown warning filter '{name_}'");
+                context
+                    .env
+                    .add_diag(diag!(Attributes::InvalidValue, (attr.loc, msg)));
+                continue;
+            };
+            for f in filters {
+                warning_filters.add(f);
+            }
+        }
+    }
+    warning_filters
+}
+
+//**************************************************************************************************
+// Aliases
+//**************************************************************************************************
+
+fn all_module_members<'a>(
+    compilation_env: &mut CompilationEnv,
+    address_conflicts: &BTreeSet<Symbol>,
+    named_addr_maps: &NamedAddressMaps,
+    members: &mut UniqueMap<ModuleIdent, ModuleMembers>,
+    always_add: bool,
+    defs: impl IntoIterator<Item = &'a P::PackageDefinition>,
+) {
+    for P::PackageDefinition {
+        named_address_map,
+        def,
+        ..
+    } in defs
+    {
+        let named_addr_map = named_addr_maps.get(*named_address_map);
+        match def {
+            P::Definition::Module(m) => {
+                let addr = match &m.address {
+                    Some(a) => {
+                        address_(
+                            compilation_env,
+                            address_conflicts,
+                            named_addr_map,
+                            /* suggest_declaration */ true,
+                            *a,
+                        )
+                    }
+                    // Error will be handled when the module is compiled
+                    None => Address::anonymous(m.loc, NumericalAddress::DEFAULT_ERROR_ADDRESS),
+                };
+                module_members(members, always_add, addr, m)
+            }
+            P::Definition::Address(addr_def) => {
+                let addr = address_(
+                    compilation_env,
+                    address_conflicts,
+                    named_addr_map,
+                    /* suggest_declaration */ false,
+                    addr_def.addr,
+                );
+                for m in &addr_def.modules {
+                    module_members(members, always_add, addr, m)
+                }
+            }
+            P::Definition::Script(_) => (),
+        }
+    }
+}
+
+fn module_members(
+    members: &mut UniqueMap<ModuleIdent, ModuleMembers>,
+    always_add: bool,
+    address: Address,
+    m: &P::ModuleDefinition,
+) {
+    let mident = sp(m.name.loc(), ModuleIdent_::new(address, m.name));
+    if !always_add && members.contains_key(&mident) {
+        return;
+    }
+    let mut cur_members = members.remove(&mident).unwrap_or_default();
+    for mem in &m.members {
+        use P::{SpecBlockMember_ as SBM, SpecBlockTarget_ as SBT, SpecBlock_ as SB};
+        match mem {
+            P::ModuleMember::Function(f) => {
+                cur_members.insert(f.name.0, ModuleMemberKind::Function);
+            }
+            P::ModuleMember::Constant(c) => {
+                cur_members.insert(c.name.0, ModuleMemberKind::Constant);
+            }
+            P::ModuleMember::Struct(s) => {
+                cur_members.insert(s.name.0, ModuleMemberKind::Struct);
+            }
+            P::ModuleMember::Spec(
+                sp!(
+                    _,
+                    SB {
+                        target,
+                        members,
+                        ..
+                    }
+                ),
+            ) => match &target.value {
+                SBT::Schema(n, _) => {
+                    cur_members.insert(*n, ModuleMemberKind::Schema);
+                }
+                SBT::Module => {
+                    for sp!(_, smember_) in members {
+                        if let SBM::Function { name, .. } = smember_ {
+                            cur_members.insert(name.0, ModuleMemberKind::Function);
+                        }
+                    }
+                }
+                _ => (),
+            },
+            P::ModuleMember::Use(_) | P::ModuleMember::Friend(_) => (),
+        };
+    }
+    members.add(mident, cur_members).unwrap();
+}
+
+fn module_self_aliases(acc: &mut AliasMapBuilder, current_module: &ModuleIdent) {
+    let self_name = sp(current_module.loc, ModuleName::SELF_NAME.into());
+    acc.add_implicit_module_alias(self_name, *current_module)
+        .unwrap()
+}
+
+fn aliases_from_member(
+    context: &mut Context,
+    acc: &mut AliasMapBuilder,
+    use_funs: &mut UseFunsBuilder,
+    current_module: &ModuleIdent,
+    member: P::ModuleMember,
+) -> Option<P::ModuleMember> {
+    use P::{SpecBlockMember_ as SBM, SpecBlockTarget_ as SBT, SpecBlock_ as SB};
+    macro_rules! check_name_and_add_implicit_alias {
+        ($kind:expr, $name:expr) => {{
+            if let Some(n) = check_valid_module_member_name(context, $kind, $name) {
+                if let Err(loc) =
+                    acc.add_implicit_member_alias(n.clone(), current_module.clone(), n.clone())
+                {
+                    duplicate_module_member(context, loc, n)
+                }
+            }
+        }};
+    }
+
+    match member {
+        P::ModuleMember::Use(u) => {
+            use_(context, acc, use_funs, u);
+            None
+        }
+        f @ P::ModuleMember::Friend(_) => {
+            // friend declarations do not produce implicit aliases
+            Some(f)
+        }
+        P::ModuleMember::Function(f) => {
+            let n = f.name.0;
+            check_name_and_add_implicit_alias!(ModuleMemberKind::Function, n);
+            Some(P::ModuleMember::Function(f))
+        }
+        P::ModuleMember::Constant(c) => {
+            let n = c.name.0;
+            check_name_and_add_implicit_alias!(ModuleMemberKind::Constant, n);
+            Some(P::ModuleMember::Constant(c))
+        }
+        P::ModuleMember::Struct(s) => {
+            let n = s.name.0;
+            check_name_and_add_implicit_alias!(ModuleMemberKind::Struct, n);
+            Some(P::ModuleMember::Struct(s))
+        }
+        P::ModuleMember::Spec(s) => {
+            let sp!(
+                _,
+                SB {
+                    target,
+                    members,
+                    ..
+                }
+            ) = &s;
+            match &target.value {
+                SBT::Schema(n, _) => {
+                    check_name_and_add_implicit_alias!(ModuleMemberKind::Schema, *n);
+                }
+                SBT::Module => {
+                    for sp!(_, smember_) in members {
+                        if let SBM::Function { name, .. } = smember_ {
+                            let n = name.0;
+                            check_name_and_add_implicit_alias!(ModuleMemberKind::Function, n);
+                        }
+                    }
+                }
+                _ => (),
+            };
+            Some(P::ModuleMember::Spec(s))
+        }
+    }
+}
+
+fn uses(context: &mut Context, uses: Vec<P::UseDecl>) -> (AliasMapBuilder, UseFunsBuilder) {
+    let mut new_scope = AliasMapBuilder::new();
+    let mut use_funs = UseFunsBuilder::new();
+    for u in uses {
+        use_(context, &mut new_scope, &mut use_funs, u);
+    }
+    (new_scope, use_funs)
+}
+
+fn use_(
+    context: &mut Context,
+    acc: &mut AliasMapBuilder,
+    use_funs: &mut UseFunsBuilder,
+    u: P::UseDecl,
+) {
+    let P::UseDecl {
+        use_: u,
+        loc,
+        attributes,
+    } = u;
+    let attributes = flatten_attributes(context, AttributePosition::Use, attributes);
+    match u {
+        P::Use::NestedModuleUses(address, use_decls) => {
+            for (module, use_) in use_decls {
+                let mident = sp(module.loc(), P::ModuleIdent_ { address, module });
+                module_use(context, acc, use_funs, mident, &attributes, use_);
+            }
+        }
+        P::Use::ModuleUse(mident, use_) => {
+            module_use(context, acc, use_funs, mident, &attributes, use_);
+        }
+        P::Use::Fun {
+            visibility,
+            function,
+            ty,
+            method,
+        } => {
+            context
+                .env
+                .check_feature(FeatureGate::DotCall, context.current_package, loc);
+            let is_public = match visibility {
+                P::Visibility::Public(vis_loc) => Some(vis_loc),
+                P::Visibility::Internal => None,
+                P::Visibility::Script(vis_loc)
+                | P::Visibility::Friend(vis_loc)
+                | P::Visibility::Package(vis_loc) => {
+                    let msg = "Invalid visibility for 'use fun' declaration";
+                    let vis_msg = format!(
+                        "Module level 'use fun' declarations can be '{}' for the module's types, \
+                    otherwise they must internal to declared scope.",
+                        P::Visibility::PUBLIC
+                    );
+                    context.env.add_diag(diag!(
+                        Declarations::InvalidUseFun,
+                        (loc, msg),
+                        (vis_loc, vis_msg)
+                    ));
+                    None
+                }
+            };
+            let explicit = ParserExplicitUseFun {
+                loc,
+                attributes,
+                is_public,
+                function,
+                ty,
+                method,
+            };
+            use_funs.explicit.push(explicit);
+        }
+    }
+}
+
+fn module_use(
+    context: &mut Context,
+    acc: &mut AliasMapBuilder,
+    use_funs: &mut UseFunsBuilder,
+    in_mident: P::ModuleIdent,
+    attributes: &E::Attributes,
+    muse: P::ModuleUse,
+) {
+    let unbound_module = |mident: &ModuleIdent| -> Diagnostic {
+        diag!(
+            NameResolution::UnboundModule,
+            (
+                mident.loc,
+                format!("Invalid 'use'. Unbound module: '{}'", mident),
+            )
+        )
+    };
+    macro_rules! add_module_alias {
+        ($ident:expr, $alias_opt:expr) => {{
+            let alias: Name = $alias_opt.unwrap_or_else(|| $ident.value.module.0.clone());
+            if let Err(()) = check_restricted_name_all_cases(context, NameCase::ModuleAlias, &alias)
+            {
+                return;
+            }
+
+            if let Err(old_loc) = acc.add_module_alias(alias.clone(), $ident) {
+                duplicate_module_alias(context, old_loc, alias)
+            }
+        }};
+    }
+    match muse {
+        P::ModuleUse::Module(alias_opt) => {
+            let mident = module_ident(context, in_mident);
+            if !context.module_members.contains_key(&mident) {
+                context.env.add_diag(unbound_module(&mident));
+                return;
+            };
+            add_module_alias!(mident, alias_opt.map(|m| m.0))
+        }
+        P::ModuleUse::Members(sub_uses) => {
+            let mident = module_ident(context, in_mident);
+            let members = match context.module_members.get(&mident) {
+                Some(members) => members,
+                None => {
+                    context.env.add_diag(unbound_module(&mident));
+                    return;
+                }
+            };
+            let mloc = *context.module_members.get_loc(&mident).unwrap();
+            let sub_uses_kinds = sub_uses
+                .into_iter()
+                .map(|(member, alia_opt)| {
+                    let kind = members.get(&member).cloned();
+                    (member, alia_opt, kind)
+                })
+                .collect::<Vec<_>>();
+
+            for (member, alias_opt, member_kind_opt) in sub_uses_kinds {
+                if member.value.as_str() == ModuleName::SELF_NAME {
+                    add_module_alias!(mident, alias_opt);
+                    continue;
+                }
+
+                // check is member
+
+                let member_kind = match member_kind_opt {
+                    None => {
+                        let msg = format!(
+                            "Invalid 'use'. Unbound member '{}' in module '{}'",
+                            member, mident
+                        );
+                        context.env.add_diag(diag!(
+                            NameResolution::UnboundModuleMember,
+                            (member.loc, msg),
+                            (mloc, format!("Module '{}' declared here", mident)),
+                        ));
+                        continue;
+                    }
+                    Some(m) => m,
+                };
+
+                let alias = alias_opt.unwrap_or(member);
+
+                let alias = match check_valid_module_member_alias(context, member_kind, alias) {
+                    None => continue,
+                    Some(alias) => alias,
+                };
+                if let Err(old_loc) = acc.add_member_alias(alias, mident, member) {
+                    duplicate_module_member(context, old_loc, alias)
+                }
+                if matches!(member_kind, ModuleMemberKind::Function) {
+                    // remove any previously declared alias to keep in sync with the member alias
+                    // map
+                    use_funs.implicit.remove(&alias);
+                    // not a function declaration
+                    let is_public = None;
+                    // assume used. We will set it to false if needed when exiting this alias scope
+                    let kind = E::ImplicitUseFunKind::UseAlias { used: true };
+                    let implicit = E::ImplicitUseFunCandidate {
+                        loc: alias.loc,
+                        attributes: attributes.clone(),
+                        is_public,
+                        function: (mident, member),
+                        kind,
+                    };
+                    use_funs.implicit.add(alias, implicit).unwrap();
+                }
+            }
+        }
+    }
+}
+
+fn use_funs(context: &mut Context, builder: UseFunsBuilder) -> E::UseFuns {
+    let UseFunsBuilder {
+        explicit: pexplicit,
+        implicit,
+    } = builder;
+    // If None, there was an error and we can skip it
+    let explicit = pexplicit
+        .into_iter()
+        .filter_map(|e| explicit_use_fun(context, e))
+        .collect();
+    E::UseFuns { explicit, implicit }
+}
+
+fn explicit_use_fun(
+    context: &mut Context,
+    pexplicit: ParserExplicitUseFun,
+) -> Option<E::ExplicitUseFun> {
+    let ParserExplicitUseFun {
+        loc,
+        attributes,
+        is_public,
+        function,
+        ty,
+        method,
+    } = pexplicit;
+    let function = name_access_chain(context, Access::ApplyPositional, *function)?;
+    let ty = name_access_chain(context, Access::Type, *ty)?;
+    Some(E::ExplicitUseFun {
+        loc,
+        attributes,
+        is_public,
+        function,
+        ty,
+        method,
+    })
+}
+
+fn duplicate_module_alias(context: &mut Context, old_loc: Loc, alias: Name) {
+    let msg = format!(
+        "Duplicate module alias '{}'. Module aliases must be unique within a given namespace",
+        alias
+    );
+    context.env.add_diag(diag!(
+        Declarations::DuplicateItem,
+        (alias.loc, msg),
+        (old_loc, "Alias previously defined here"),
+    ));
+}
+
+fn duplicate_module_member(context: &mut Context, old_loc: Loc, alias: Name) {
+    let msg = format!(
+        "Duplicate module member or alias '{}'. Top level names in a namespace must be unique",
+        alias
+    );
+    context.env.add_diag(diag!(
+        Declarations::DuplicateItem,
+        (alias.loc, msg),
+        (old_loc, "Alias previously defined here"),
+    ));
+}
+
+fn unused_alias(context: &mut Context, alias: Name) {
+    if !context.is_source_definition {
+        return;
+    }
+
+    context.env.add_diag(diag!(
+        UnusedItem::Alias,
+        (
+            alias.loc,
+            format!("Unused 'use' of alias '{}'. Consider removing it", alias)
+        ),
+    ))
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_def(
+    context: &mut Context,
+    structs: &mut UniqueMap<StructName, E::StructDefinition>,
+    pstruct: P::StructDefinition,
+) {
+    let (sname, sdef) = struct_def_(context, structs.len(), pstruct);
+    if let Err(_old_loc) = structs.add(sname, sdef) {
+        assert!(context.env.has_errors())
+    }
+}
+
+fn struct_def_(
+    context: &mut Context,
+    index: usize,
+    pstruct: P::StructDefinition,
+) -> (StructName, E::StructDefinition) {
+    let P::StructDefinition {
+        attributes,
+        loc,
+        name,
+        abilities: abilities_vec,
+        type_parameters: pty_params,
+        fields: pfields,
+    } = pstruct;
+    let attributes = flatten_attributes(context, AttributePosition::Struct, attributes);
+    let warning_filter = warning_filter(context, &attributes);
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let type_parameters = struct_type_parameters(context, pty_params);
+    let old_aliases = context
+        .aliases
+        .shadow_for_type_parameters(type_parameters.iter().map(|tp| &tp.name));
+    let abilities = ability_set(context, "modifier", abilities_vec);
+    let fields = struct_fields(context, &name, pfields);
+    let sdef = E::StructDefinition {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        abilities,
+        type_parameters,
+        fields,
+    };
+    context.set_to_outer_scope(None, old_aliases);
+    context.env.pop_warning_filter_scope();
+    (name, sdef)
+}
+
+fn struct_fields(
+    context: &mut Context,
+    sname: &StructName,
+    pfields: P::StructFields,
+) -> E::StructFields {
+    let pfields_vec = match pfields {
+        P::StructFields::Native(loc) => return E::StructFields::Native(loc),
+        P::StructFields::Positional(tys) => {
+            let field_tys = tys.into_iter().map(|fty| type_(context, fty)).collect();
+            return E::StructFields::Positional(field_tys);
+        }
+        P::StructFields::Defined(v) => v,
+    };
+    let mut field_map = UniqueMap::new();
+    for (idx, (field, pt)) in pfields_vec.into_iter().enumerate() {
+        let t = type_(context, pt);
+        if let Err((field, old_loc)) = field_map.add(field, (idx, t)) {
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (
+                    field.loc(),
+                    format!(
+                        "Duplicate definition for field '{}' in struct '{}'",
+                        field, sname
+                    ),
+                ),
+                (old_loc, "Field previously defined here"),
+            ));
+        }
+    }
+    E::StructFields::Named(field_map)
+}
+
+//**************************************************************************************************
+// Friends
+//**************************************************************************************************
+
+fn friend(
+    context: &mut Context,
+    friends: &mut UniqueMap<ModuleIdent, E::Friend>,
+    pfriend: P::FriendDecl,
+) {
+    match friend_(context, pfriend) {
+        Some((mident, friend)) => match friends.get(&mident) {
+            None => friends.add(mident, friend).unwrap(),
+            Some(old_friend) => {
+                let msg = format!(
+                    "Duplicate friend declaration '{}'. Friend declarations in a module must be \
+                     unique",
+                    mident
+                );
+                context.env.add_diag(diag!(
+                    Declarations::DuplicateItem,
+                    (friend.loc, msg),
+                    (old_friend.loc, "Friend previously declared here"),
+                ));
+            }
+        },
+        None => assert!(context.env.has_errors()),
+    };
+}
+
+fn friend_(context: &mut Context, pfriend_decl: P::FriendDecl) -> Option<(ModuleIdent, E::Friend)> {
+    assert!(context.exp_specs.is_empty());
+    let P::FriendDecl {
+        attributes: pattributes,
+        loc,
+        friend: pfriend,
+    } = pfriend_decl;
+    let mident = name_access_chain_to_module_ident(context, pfriend)?;
+    let attributes = flatten_attributes(context, AttributePosition::Friend, pattributes);
+    Some((mident, E::Friend { attributes, loc }))
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+fn constant(
+    context: &mut Context,
+    constants: &mut UniqueMap<ConstantName, E::Constant>,
+    pconstant: P::Constant,
+) {
+    let (name, constant) = constant_(context, constants.len(), pconstant);
+    if let Err(_old_loc) = constants.add(name, constant) {
+        assert!(context.env.has_errors())
+    }
+}
+
+fn constant_(
+    context: &mut Context,
+    index: usize,
+    pconstant: P::Constant,
+) -> (ConstantName, E::Constant) {
+    assert!(context.exp_specs.is_empty());
+    let P::Constant {
+        attributes: pattributes,
+        loc,
+        name,
+        signature: psignature,
+        value: pvalue,
+    } = pconstant;
+    let attributes = flatten_attributes(context, AttributePosition::Constant, pattributes);
+    let warning_filter = warning_filter(context, &attributes);
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let signature = type_(context, psignature);
+    let value = exp_(context, pvalue);
+    let _specs = context.extract_exp_specs();
+    let constant = E::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value,
+    };
+    context.env.pop_warning_filter_scope();
+    (name, constant)
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function(
+    context: &mut Context,
+    module_and_use_funs: Option<(ModuleIdent, &mut UseFunsBuilder)>,
+    functions: &mut UniqueMap<FunctionName, E::Function>,
+    pfunction: P::Function,
+) {
+    let (fname, fdef) = function_(context, module_and_use_funs, functions.len(), pfunction);
+    if let Err(_old_loc) = functions.add(fname, fdef) {
+        assert!(context.env.has_errors())
+    }
+}
+
+fn function_(
+    context: &mut Context,
+    module_and_use_funs: Option<(ModuleIdent, &mut UseFunsBuilder)>,
+    index: usize,
+    pfunction: P::Function,
+) -> (FunctionName, E::Function) {
+    let P::Function {
+        attributes: pattributes,
+        loc,
+        name,
+        visibility: pvisibility,
+        entry,
+        signature: psignature,
+        body: pbody,
+    } = pfunction;
+    assert!(context.exp_specs.is_empty());
+    let attributes = flatten_attributes(context, AttributePosition::Function, pattributes);
+    let warning_filter = warning_filter(context, &attributes);
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let visibility = visibility(pvisibility);
+    let (old_aliases, signature) = function_signature(context, psignature);
+    let body = function_body(context, pbody);
+    let specs = context.extract_exp_specs();
+    if let Some((m, use_funs_builder)) = module_and_use_funs {
+        let implicit = E::ImplicitUseFunCandidate {
+            loc: name.loc(),
+            attributes: attributes.clone(),
+            is_public: Some(visibility.loc().unwrap_or_else(|| name.loc())),
+            function: (m, name.0),
+            // disregard used/unused information tracking
+            kind: E::ImplicitUseFunKind::FunctionDeclaration,
+        };
+        // we can ignore any error, since the alias map will catch conflicting names
+        let _ = use_funs_builder.implicit.add(name.0, implicit);
+    }
+    let fdef = E::Function {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        visibility,
+        entry,
+        signature,
+        body,
+        specs,
+    };
+    context.set_to_outer_scope(None, old_aliases);
+    context.env.pop_warning_filter_scope();
+    (name, fdef)
+}
+
+fn visibility(pvisibility: P::Visibility) -> E::Visibility {
+    match pvisibility {
+        P::Visibility::Friend(loc) => E::Visibility::Friend(loc),
+        P::Visibility::Internal => E::Visibility::Internal,
+        P::Visibility::Package(loc) => E::Visibility::Package(loc),
+        P::Visibility::Public(loc) => E::Visibility::Public(loc),
+        P::Visibility::Script(loc) => E::Visibility::Public(loc),
+    }
+}
+
+fn function_signature(
+    context: &mut Context,
+    psignature: P::FunctionSignature,
+) -> (OldAliasMap, E::FunctionSignature) {
+    let P::FunctionSignature {
+        type_parameters: pty_params,
+        parameters: pparams,
+        return_type: pret_ty,
+    } = psignature;
+    let type_parameters = type_parameters(context, pty_params);
+    let old_aliases = context
+        .aliases
+        .shadow_for_type_parameters(type_parameters.iter().map(|(name, _)| name));
+    let parameters = pparams
+        .into_iter()
+        .map(|(pmut, v, t)| (mutability(context, v.loc(), pmut), v, type_(context, t)))
+        .collect::<Vec<_>>();
+    for (_, v, _) in &parameters {
+        check_valid_local_name(context, v)
+    }
+    let return_type = type_(context, pret_ty);
+    let signature = E::FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    };
+    (old_aliases, signature)
+}
+
+fn function_body(context: &mut Context, sp!(loc, pbody_): P::FunctionBody) -> E::FunctionBody {
+    use E::FunctionBody_ as EF;
+    use P::FunctionBody_ as PF;
+    let body_ = match pbody_ {
+        PF::Native => EF::Native,
+        PF::Defined(seq) => EF::Defined(sequence(context, loc, seq)),
+    };
+    sp(loc, body_)
+}
+
+//**************************************************************************************************
+// Specification Blocks
+//**************************************************************************************************
+
+fn specs(context: &mut Context, pspecs: Vec<P::SpecBlock>) -> Vec<E::SpecBlock> {
+    pspecs.into_iter().map(|s| spec(context, s)).collect()
+}
+
+fn spec(context: &mut Context, sp!(loc, pspec): P::SpecBlock) -> E::SpecBlock {
+    let P::SpecBlock_ {
+        attributes: pattributes,
+        target,
+        uses: puses,
+        members: pmembers,
+    } = pspec;
+
+    let attributes = flatten_attributes(context, AttributePosition::Spec, pattributes);
+    context.in_spec_context = true;
+    let (new_scope, use_funs_builder) = uses(context, puses);
+    // Use funs not supported in specs
+    for use_fun in use_funs_builder.explicit {
+        let msg = "'use fun' declarations are not supported in spec blocks";
+        context
+            .env
+            .add_diag(diag!(Declarations::InvalidUseFun, (use_fun.loc, msg)))
+    }
+    let old_aliases = context.aliases.add_and_shadow_all(new_scope);
+
+    let members = pmembers
+        .into_iter()
+        .map(|m| spec_member(context, m))
+        .collect();
+
+    context.set_to_outer_scope(None, old_aliases);
+    context.in_spec_context = false;
+
+    sp(
+        loc,
+        E::SpecBlock_ {
+            attributes,
+            target: spec_target(context, target),
+            members,
+        },
+    )
+}
+
+fn spec_target(context: &mut Context, sp!(loc, pt): P::SpecBlockTarget) -> E::SpecBlockTarget {
+    use E::SpecBlockTarget_ as ET;
+    use P::SpecBlockTarget_ as PT;
+    let et = match pt {
+        PT::Code => ET::Code,
+        PT::Module => ET::Module,
+        PT::Schema(name, type_params) => ET::Schema(name, type_parameters(context, type_params)),
+        PT::Member(name, signature_opt) => ET::Member(
+            name,
+            signature_opt.map(|s| {
+                let (old_aliases, signature) = function_signature(context, *s);
+                context.set_to_outer_scope(None, old_aliases);
+                Box::new(signature)
+            }),
+        ),
+    };
+    sp(loc, et)
+}
+
+fn spec_condition_kind(
+    context: &mut Context,
+    sp!(loc, kind): P::SpecConditionKind,
+) -> (E::SpecConditionKind, Option<OldAliasMap>) {
+    let (kind_, aliases_opt) = match kind {
+        P::SpecConditionKind_::Assert => (E::SpecConditionKind_::Assert, None),
+        P::SpecConditionKind_::Assume => (E::SpecConditionKind_::Assume, None),
+        P::SpecConditionKind_::Decreases => (E::SpecConditionKind_::Decreases, None),
+        P::SpecConditionKind_::AbortsIf => (E::SpecConditionKind_::AbortsIf, None),
+        P::SpecConditionKind_::AbortsWith => (E::SpecConditionKind_::AbortsWith, None),
+        P::SpecConditionKind_::SucceedsIf => (E::SpecConditionKind_::SucceedsIf, None),
+        P::SpecConditionKind_::Modifies => (E::SpecConditionKind_::Modifies, None),
+        P::SpecConditionKind_::Emits => (E::SpecConditionKind_::Emits, None),
+        P::SpecConditionKind_::Ensures => (E::SpecConditionKind_::Ensures, None),
+        P::SpecConditionKind_::Requires => (E::SpecConditionKind_::Requires, None),
+        P::SpecConditionKind_::Invariant(pty_params) => {
+            let ety_params = type_parameters(context, pty_params);
+            let old_aliases = context
+                .aliases
+                .shadow_for_type_parameters(ety_params.iter().map(|(name, _)| name));
+            (
+                E::SpecConditionKind_::Invariant(ety_params),
+                Some(old_aliases),
+            )
+        }
+        P::SpecConditionKind_::InvariantUpdate(pty_params) => {
+            let ety_params = type_parameters(context, pty_params);
+            let old_aliases = context
+                .aliases
+                .shadow_for_type_parameters(ety_params.iter().map(|(name, _)| name));
+            (
+                E::SpecConditionKind_::InvariantUpdate(ety_params),
+                Some(old_aliases),
+            )
+        }
+        P::SpecConditionKind_::Axiom(pty_params) => {
+            let ety_params = type_parameters(context, pty_params);
+            let old_aliases = context
+                .aliases
+                .shadow_for_type_parameters(ety_params.iter().map(|(name, _)| name));
+            (E::SpecConditionKind_::Axiom(ety_params), Some(old_aliases))
+        }
+    };
+    (sp(loc, kind_), aliases_opt)
+}
+
+fn spec_member(context: &mut Context, sp!(loc, pm): P::SpecBlockMember) -> E::SpecBlockMember {
+    use E::SpecBlockMember_ as EM;
+    use P::SpecBlockMember_ as PM;
+    let em = match pm {
+        PM::Condition {
+            kind: pkind,
+            properties: pproperties,
+            exp,
+            additional_exps,
+        } => {
+            let (kind, old_aliases_opt) = spec_condition_kind(context, pkind);
+            let properties = pproperties
+                .into_iter()
+                .map(|p| pragma_property(context, p))
+                .collect();
+            let exp = exp_(context, exp);
+            let additional_exps = additional_exps
+                .into_iter()
+                .map(|e| exp_(context, e))
+                .collect();
+            match old_aliases_opt {
+                None => (),
+                Some(old_aliases) => context.set_to_outer_scope(None, old_aliases),
+            }
+            EM::Condition {
+                kind,
+                properties,
+                exp,
+                additional_exps,
+            }
+        }
+        PM::Function {
+            name,
+            uninterpreted,
+            signature,
+            body,
+        } => {
+            let (old_aliases, signature) = function_signature(context, signature);
+            let body = function_body(context, body);
+            context.set_to_outer_scope(None, old_aliases);
+            EM::Function {
+                uninterpreted,
+                name,
+                signature,
+                body,
+            }
+        }
+        PM::Variable {
+            is_global,
+            name,
+            type_parameters: pty_params,
+            type_: t,
+            init,
+        } => {
+            let type_parameters = type_parameters(context, pty_params);
+            let old_aliases = context
+                .aliases
+                .shadow_for_type_parameters(type_parameters.iter().map(|(name, _)| name));
+            let t = type_(context, t);
+            let i = init.map(|e| exp_(context, e));
+            context.set_to_outer_scope(None, old_aliases);
+            EM::Variable {
+                is_global,
+                name,
+                type_parameters,
+                type_: t,
+                init: i,
+            }
+        }
+        PM::Update { lhs, rhs } => {
+            let lhs = exp_(context, lhs);
+            let rhs = exp_(context, rhs);
+            EM::Update { lhs, rhs }
+        }
+
+        PM::Let {
+            name,
+            post_state: old,
+            def: pdef,
+        } => {
+            let def = exp_(context, pdef);
+            EM::Let {
+                name,
+                post_state: old,
+                def,
+            }
+        }
+        PM::Include {
+            properties: pproperties,
+            exp: pexp,
+        } => {
+            let properties = pproperties
+                .into_iter()
+                .map(|p| pragma_property(context, p))
+                .collect();
+            EM::Include {
+                properties,
+                exp: exp_(context, pexp),
+            }
+        }
+        PM::Apply {
+            exp: pexp,
+            patterns,
+            exclusion_patterns,
+        } => EM::Apply {
+            exp: exp_(context, pexp),
+            patterns,
+            exclusion_patterns,
+        },
+        PM::Pragma {
+            properties: pproperties,
+        } => {
+            let properties = pproperties
+                .into_iter()
+                .map(|p| pragma_property(context, p))
+                .collect();
+            EM::Pragma { properties }
+        }
+    };
+    sp(loc, em)
+}
+
+fn pragma_property(context: &mut Context, sp!(loc, pp_): P::PragmaProperty) -> E::PragmaProperty {
+    let P::PragmaProperty_ {
+        name,
+        value: pv_opt,
+    } = pp_;
+    let value = pv_opt.and_then(|pv| pragma_value(context, pv));
+    sp(loc, E::PragmaProperty_ { name, value })
+}
+
+fn pragma_value(context: &mut Context, pv: P::PragmaValue) -> Option<E::PragmaValue> {
+    match pv {
+        P::PragmaValue::Literal(v) => value(context, v).map(E::PragmaValue::Literal),
+        P::PragmaValue::Ident(ma) => {
+            name_access_chain(context, Access::Term, ma).map(E::PragmaValue::Ident)
+        }
+    }
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn ability_set(context: &mut Context, case: &str, abilities_vec: Vec<Ability>) -> E::AbilitySet {
+    let mut set = E::AbilitySet::empty();
+    for ability in abilities_vec {
+        let loc = ability.loc;
+        if let Err(prev_loc) = set.add(ability) {
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (loc, format!("Duplicate '{}' ability {}", ability, case)),
+                (prev_loc, "Ability previously given here")
+            ));
+        }
+    }
+    set
+}
+
+fn type_parameters(
+    context: &mut Context,
+    pty_params: Vec<(Name, Vec<Ability>)>,
+) -> Vec<(Name, E::AbilitySet)> {
+    pty_params
+        .into_iter()
+        .map(|(name, constraints_vec)| {
+            let constraints = ability_set(context, "constraint", constraints_vec);
+            (name, constraints)
+        })
+        .collect()
+}
+
+fn struct_type_parameters(
+    context: &mut Context,
+    pty_params: Vec<P::StructTypeParameter>,
+) -> Vec<E::StructTypeParameter> {
+    pty_params
+        .into_iter()
+        .map(|param| E::StructTypeParameter {
+            is_phantom: param.is_phantom,
+            name: param.name,
+            constraints: ability_set(context, "constraint", param.constraints),
+        })
+        .collect()
+}
+
+fn type_(context: &mut Context, sp!(loc, pt_): P::Type) -> E::Type {
+    use E::Type_ as ET;
+    use P::Type_ as PT;
+    let t_ = match pt_ {
+        PT::Unit => ET::Unit,
+        PT::Multiple(ts) => ET::Multiple(types(context, ts)),
+        PT::Apply(pn, ptyargs) => {
+            let tyargs = types(context, ptyargs);
+            match name_access_chain(context, Access::Type, *pn) {
+                None => {
+                    assert!(context.env.has_errors());
+                    ET::UnresolvedError
+                }
+                Some(n) => ET::Apply(n, tyargs),
+            }
+        }
+        PT::Ref(mut_, inner) => ET::Ref(mut_, Box::new(type_(context, *inner))),
+        PT::Fun(args, result) => {
+            if context.in_spec_context {
+                let args = types(context, args);
+                let result = type_(context, *result);
+                ET::Fun(args, Box::new(result))
+            } else {
+                context.env.add_diag(diag!(
+                    Syntax::SpecContextRestricted,
+                    (loc, "`|_|_` function type only allowed in specifications")
+                ));
+                ET::UnresolvedError
+            }
+        }
+    };
+    sp(loc, t_)
+}
+
+fn types(context: &mut Context, pts: Vec<P::Type>) -> Vec<E::Type> {
+    pts.into_iter().map(|pt| type_(context, pt)).collect()
+}
+
+fn optional_types(context: &mut Context, pts_opt: Option<Vec<P::Type>>) -> Option<Vec<E::Type>> {
+    pts_opt.map(|pts| pts.into_iter().map(|pt| type_(context, pt)).collect())
+}
+
+#[derive(Clone, Copy)]
+enum Access {
+    Type,
+    ApplyNamed,
+    ApplyPositional,
+    Term,
+}
+
+fn name_access_chain(
+    context: &mut Context,
+    access: Access,
+    sp!(loc, ptn_): P::NameAccessChain,
+) -> Option<E::ModuleAccess> {
+    use E::ModuleAccess_ as EN;
+    use P::{LeadingNameAccess_ as LN, NameAccessChain_ as PN};
+
+    let tn_ = match (access, ptn_) {
+        (Access::ApplyPositional, PN::One(n))
+        | (Access::ApplyNamed, PN::One(n))
+        | (Access::Type, PN::One(n)) => match context.aliases.member_alias_get(&n) {
+            Some((mident, mem)) => EN::ModuleAccess(mident, mem),
+            None => EN::Name(n),
+        },
+        (Access::Term, PN::One(n)) if is_valid_struct_constant_or_schema_name(n.value.as_str()) => {
+            match context.aliases.member_alias_get(&n) {
+                Some((mident, mem)) => EN::ModuleAccess(mident, mem),
+                None => EN::Name(n),
+            }
+        }
+        (Access::Term, PN::One(n)) => EN::Name(n),
+        (_, PN::Two(sp!(nloc, LN::AnonymousAddress(_)), _)) => {
+            context
+                .env
+                .add_diag(unexpected_address_module_error(loc, nloc, access));
+            return None;
+        }
+
+        (_, PN::Two(sp!(_, LN::Name(n1)), n2)) => match context.aliases.module_alias_get(&n1) {
+            None => {
+                context.env.add_diag(diag!(
+                    NameResolution::UnboundModule,
+                    (n1.loc, format!("Unbound module alias '{}'", n1))
+                ));
+                return None;
+            }
+            Some(mident) => EN::ModuleAccess(mident, n2),
+        },
+        (_, PN::Three(sp!(ident_loc, (ln, n2)), n3)) => {
+            let addr = address(context, /* suggest_declaration */ false, ln);
+            let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n2)));
+            EN::ModuleAccess(mident, n3)
+        }
+    };
+    Some(sp(loc, tn_))
+}
+
+fn name_access_chain_to_module_ident(
+    context: &mut Context,
+    sp!(loc, pn_): P::NameAccessChain,
+) -> Option<E::ModuleIdent> {
+    use P::NameAccessChain_ as PN;
+    match pn_ {
+        PN::One(name) => match context.aliases.module_alias_get(&name) {
+            None => {
+                context.env.add_diag(diag!(
+                    NameResolution::UnboundModule,
+                    (name.loc, format!("Unbound module alias '{}'", name)),
+                ));
+                None
+            }
+            Some(mident) => Some(mident),
+        },
+        PN::Two(ln, n) => {
+            let pmident_ = P::ModuleIdent_ {
+                address: ln,
+                module: ModuleName(n),
+            };
+            Some(module_ident(context, sp(loc, pmident_)))
+        }
+        PN::Three(sp!(ident_loc, (ln, n)), mem) => {
+            // Process the module ident just for errors
+            let pmident_ = P::ModuleIdent_ {
+                address: ln,
+                module: ModuleName(n),
+            };
+            let _ = module_ident(context, sp(ident_loc, pmident_));
+            context.env.add_diag(diag!(
+                NameResolution::NamePositionMismatch,
+                (
+                    mem.loc,
+                    "Unexpected module member access. Expected a module identifier only",
+                )
+            ));
+            None
+        }
+    }
+}
+
+fn unexpected_address_module_error(loc: Loc, nloc: Loc, access: Access) -> Diagnostic {
+    let case = match access {
+        Access::Type | Access::ApplyNamed | Access::ApplyPositional => "type",
+        Access::Term => "expression",
+    };
+    let unexpected_msg = format!(
+        "Unexpected module identifier. A module identifier is not a valid {}",
+        case
+    );
+    diag!(
+        NameResolution::NamePositionMismatch,
+        (loc, unexpected_msg),
+        (nloc, "Expected a module name".to_owned()),
+    )
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, loc: Loc, seq: P::Sequence) -> E::Sequence {
+    let (puses, pitems, maybe_last_semicolon_loc, pfinal_item) = seq;
+
+    let (new_scope, use_funs_builder) = uses(context, puses);
+    let old_aliases = context.aliases.add_and_shadow_all(new_scope);
+    let mut use_funs = use_funs(context, use_funs_builder);
+    let mut items: VecDeque<E::SequenceItem> = pitems
+        .into_iter()
+        .map(|item| sequence_item(context, item))
+        .collect();
+    let final_e_opt = pfinal_item.map(|item| exp_(context, item));
+    let final_e = match final_e_opt {
+        None => {
+            let last_semicolon_loc = match maybe_last_semicolon_loc {
+                Some(l) => l,
+                None => loc,
+            };
+            sp(last_semicolon_loc, E::Exp_::Unit { trailing: true })
+        }
+        Some(e) => e,
+    };
+    let final_item = sp(final_e.loc, E::SequenceItem_::Seq(final_e));
+    items.push_back(final_item);
+    context.set_to_outer_scope(Some(&mut use_funs), old_aliases);
+    (use_funs, items)
+}
+
+fn sequence_item(context: &mut Context, sp!(loc, pitem_): P::SequenceItem) -> E::SequenceItem {
+    use E::SequenceItem_ as ES;
+    use P::SequenceItem_ as PS;
+    let item_ = match pitem_ {
+        PS::Seq(e) => ES::Seq(exp_(context, *e)),
+        PS::Declare(pb, pty_opt) => {
+            let b_opt = bind_list(context, pb);
+            let ty_opt = pty_opt.map(|t| type_(context, t));
+            match b_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    ES::Seq(sp(loc, E::Exp_::UnresolvedError))
+                }
+                Some(b) => ES::Declare(b, ty_opt),
+            }
+        }
+        PS::Bind(pb, pty_opt, pe) => {
+            let b_opt = bind_list(context, pb);
+            let ty_opt = pty_opt.map(|t| type_(context, t));
+            let e_ = exp_(context, *pe);
+            let e = match ty_opt {
+                None => e_,
+                Some(ty) => sp(e_.loc, E::Exp_::Annotate(Box::new(e_), ty)),
+            };
+            match b_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    ES::Seq(sp(loc, E::Exp_::UnresolvedError))
+                }
+                Some(b) => ES::Bind(b, e),
+            }
+        }
+    };
+    sp(loc, item_)
+}
+
+fn exps(context: &mut Context, pes: Vec<P::Exp>) -> Vec<E::Exp> {
+    pes.into_iter().map(|pe| exp_(context, pe)).collect()
+}
+
+fn exp(context: &mut Context, pe: P::Exp) -> Box<E::Exp> {
+    Box::new(exp_(context, pe))
+}
+
+fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
+    use E::Exp_ as EE;
+    use P::Exp_ as PE;
+    let e_ = match pe_ {
+        PE::Unit => EE::Unit { trailing: false },
+        PE::Value(pv) => match value(context, pv) {
+            Some(v) => EE::Value(v),
+            None => {
+                assert!(context.env.has_errors());
+                EE::UnresolvedError
+            }
+        },
+        PE::Move(v) => EE::Move(v),
+        PE::Copy(v) => EE::Copy(v),
+        PE::Name(_, Some(_)) if !context.in_spec_context => {
+            context.env.add_diag(diag!(
+                Syntax::SpecContextRestricted,
+                (
+                    loc,
+                    "Expected name to be followed by a brace-enclosed list of field expressions \
+                     or a parenthesized list of arguments for a function call",
+                )
+            ));
+            EE::UnresolvedError
+        }
+        PE::Name(pn, ptys_opt) => {
+            let en_opt = name_access_chain(context, Access::Term, pn);
+            let tys_opt = optional_types(context, ptys_opt);
+            match en_opt {
+                Some(en) => EE::Name(en, tys_opt),
+                None => {
+                    assert!(context.env.has_errors());
+                    EE::UnresolvedError
+                }
+            }
+        }
+        PE::Call(pn, is_macro, ptys_opt, sp!(rloc, prs)) => {
+            let tys_opt = optional_types(context, ptys_opt);
+            let ers = sp(rloc, exps(context, prs));
+            let en_opt = name_access_chain(context, Access::ApplyPositional, pn);
+            match en_opt {
+                Some(en) => EE::Call(en, is_macro, tys_opt, ers),
+                None => {
+                    assert!(context.env.has_errors());
+                    EE::UnresolvedError
+                }
+            }
+        }
+        PE::Pack(pn, ptys_opt, pfields) => {
+            let en_opt = name_access_chain(context, Access::ApplyNamed, pn);
+            let tys_opt = optional_types(context, ptys_opt);
+            let efields_vec = pfields
+                .into_iter()
+                .map(|(f, pe)| (f, exp_(context, pe)))
+                .collect();
+            let efields = named_fields(context, loc, "construction", "argument", efields_vec);
+            match en_opt {
+                Some(en) => EE::Pack(en, tys_opt, efields),
+                None => {
+                    assert!(context.env.has_errors());
+                    EE::UnresolvedError
+                }
+            }
+        }
+        PE::Vector(vec_loc, ptys_opt, sp!(args_loc, pargs_)) => {
+            let tys_opt = optional_types(context, ptys_opt);
+            let args = sp(args_loc, exps(context, pargs_));
+            EE::Vector(vec_loc, tys_opt, args)
+        }
+        PE::IfElse(pb, pt, pf_opt) => {
+            let eb = exp(context, *pb);
+            let et = exp(context, *pt);
+            let ef = match pf_opt {
+                None => Box::new(sp(loc, EE::Unit { trailing: false })),
+                Some(pf) => exp(context, *pf),
+            };
+            EE::IfElse(eb, et, ef)
+        }
+        PE::While(pb, ploop) => EE::While(exp(context, *pb), exp(context, *ploop)),
+        PE::Loop(ploop) => EE::Loop(exp(context, *ploop)),
+        PE::Block(seq) => EE::Block(sequence(context, loc, seq)),
+        PE::Lambda(pbs, pe) => {
+            if !context.in_spec_context {
+                context.env.add_diag(diag!(
+                    Syntax::SpecContextRestricted,
+                    (loc, "lambda expression only allowed in specifications"),
+                ));
+                EE::UnresolvedError
+            } else {
+                let bs_opt = bind_list(context, pbs);
+                let e = exp_(context, *pe);
+                match bs_opt {
+                    Some(bs) => EE::Lambda(bs, Box::new(e)),
+                    None => {
+                        assert!(context.env.has_errors());
+                        EE::UnresolvedError
+                    }
+                }
+            }
+        }
+        PE::Quant(k, prs, ptrs, pc, pe) => {
+            if !context.in_spec_context {
+                context.env.add_diag(diag!(
+                    Syntax::SpecContextRestricted,
+                    (loc, "quantifer expression only allowed in specifications")
+                ));
+                EE::UnresolvedError
+            } else {
+                let rs_opt = bind_with_range_list(context, prs);
+                let rtrs = ptrs
+                    .into_iter()
+                    .map(|trs| trs.into_iter().map(|tr| exp_(context, tr)).collect())
+                    .collect();
+                let rc = pc.map(|c| Box::new(exp_(context, *c)));
+                let re = exp_(context, *pe);
+                match rs_opt {
+                    Some(rs) => EE::Quant(k, rs, rtrs, rc, Box::new(re)),
+                    None => {
+                        assert!(context.env.has_errors());
+                        EE::UnresolvedError
+                    }
+                }
+            }
+        }
+        PE::ExpList(pes) => {
+            assert!(pes.len() > 1);
+            EE::ExpList(exps(context, pes))
+        }
+
+        PE::Assign(lvalue, rhs) => {
+            let l_opt = lvalues(context, *lvalue);
+            let er = exp(context, *rhs);
+            match l_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    EE::UnresolvedError
+                }
+                Some(LValue::Assigns(al)) => EE::Assign(al, er),
+                Some(LValue::Mutate(el)) => EE::Mutate(el, er),
+                Some(LValue::FieldMutate(edotted)) => EE::FieldMutate(edotted, er),
+            }
+        }
+        PE::Return(pe_opt) => {
+            let ev = match pe_opt {
+                None => Box::new(sp(loc, EE::Unit { trailing: false })),
+                Some(pe) => exp(context, *pe),
+            };
+            EE::Return(ev)
+        }
+        PE::Abort(pe) => EE::Abort(exp(context, *pe)),
+        PE::Break => EE::Break,
+        PE::Continue => EE::Continue,
+        PE::Dereference(pe) => EE::Dereference(exp(context, *pe)),
+        PE::UnaryExp(op, pe) => EE::UnaryExp(op, exp(context, *pe)),
+        PE::BinopExp(pl, op, pr) => {
+            if op.value.is_spec_only() && !context.in_spec_context {
+                let msg = format!(
+                    "`{}` operator only allowed in specifications",
+                    op.value.symbol()
+                );
+                context
+                    .env
+                    .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+                EE::UnresolvedError
+            } else {
+                EE::BinopExp(exp(context, *pl), op, exp(context, *pr))
+            }
+        }
+        PE::Borrow(mut_, pr) => EE::Borrow(mut_, exp(context, *pr)),
+        pdotted_ @ PE::Dot(_, _) => match exp_dotted(context, sp(loc, pdotted_)) {
+            Some(edotted) => EE::ExpDotted(Box::new(edotted)),
+            None => {
+                assert!(context.env.has_errors());
+                EE::UnresolvedError
+            }
+        },
+        PE::DotCall(pdotted, n, ptys_opt, sp!(rloc, prs)) => match exp_dotted(context, *pdotted) {
+            Some(edotted) => {
+                context
+                    .env
+                    .check_feature(FeatureGate::DotCall, context.current_package, loc);
+                if context.in_spec_context {
+                    let msg = "method syntax is not supported in specifications";
+                    context
+                        .env
+                        .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+                    EE::UnresolvedError
+                } else {
+                    let tys_opt = optional_types(context, ptys_opt);
+                    let ers = sp(rloc, exps(context, prs));
+                    EE::MethodCall(Box::new(edotted), n, tys_opt, ers)
+                }
+            }
+            None => {
+                assert!(context.env.has_errors());
+                EE::UnresolvedError
+            }
+        },
+        PE::Cast(e, ty) => EE::Cast(exp(context, *e), type_(context, ty)),
+        PE::Index(e, i) => {
+            if context.in_spec_context {
+                EE::Index(exp(context, *e), exp(context, *i))
+            } else {
+                let msg = "`_[_]` index operator only allowed in specifications";
+                context
+                    .env
+                    .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+                EE::UnresolvedError
+            }
+        }
+        PE::Annotate(e, ty) => EE::Annotate(exp(context, *e), type_(context, ty)),
+        PE::Spec(_) if context.in_spec_context => {
+            context.env.add_diag(diag!(
+                Syntax::SpecContextRestricted,
+                (loc, "'spec' blocks cannot be used inside of a spec context",)
+            ));
+            EE::UnresolvedError
+        }
+        PE::Spec(spec_block) => {
+            let (spec_id, unbound_names) = context.bind_exp_spec(spec_block);
+            EE::Spec(spec_id, unbound_names)
+        }
+        PE::UnresolvedError => panic!("ICE error should have been thrown"),
+    };
+    sp(loc, e_)
+}
+
+fn exp_dotted(context: &mut Context, sp!(loc, pdotted_): P::Exp) -> Option<E::ExpDotted> {
+    use E::ExpDotted_ as EE;
+    use P::Exp_ as PE;
+    let edotted_ = match pdotted_ {
+        PE::Dot(plhs, field) => {
+            let lhs = exp_dotted(context, *plhs)?;
+            EE::Dot(Box::new(lhs), field)
+        }
+        pe_ => EE::Exp(Box::new(exp_(context, sp(loc, pe_)))),
+    };
+    Some(sp(loc, edotted_))
+}
+
+fn value(context: &mut Context, sp!(loc, pvalue_): P::Value) -> Option<E::Value> {
+    use E::Value_ as EV;
+    use P::Value_ as PV;
+    let value_ = match pvalue_ {
+        PV::Address(addr) => {
+            let addr = address(context, /* suggest_declaration */ true, addr);
+            EV::Address(addr)
+        }
+        PV::Num(s) if s.ends_with("u8") => match parse_u8(&s[..s.len() - 2]) {
+            Ok((u, _format)) => EV::U8(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u8'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u16") => match parse_u16(&s[..s.len() - 3]) {
+            Ok((u, _format)) => EV::U16(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u16'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u32") => match parse_u32(&s[..s.len() - 3]) {
+            Ok((u, _format)) => EV::U32(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u32'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u64") => match parse_u64(&s[..s.len() - 3]) {
+            Ok((u, _format)) => EV::U64(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u64'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u128") => match parse_u128(&s[..s.len() - 4]) {
+            Ok((u, _format)) => EV::U128(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u128'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u256") => match parse_u256(&s[..s.len() - 4]) {
+            Ok((u, _format)) => EV::U256(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u256'"));
+                return None;
+            }
+        },
+
+        PV::Num(s) => match parse_u256(&s) {
+            Ok((u, _format)) => EV::InferredNum(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(
+                    loc,
+                    "the largest possible integer type, 'u256'",
+                ));
+                return None;
+            }
+        },
+        PV::Bool(b) => EV::Bool(b),
+        PV::HexString(s) => match hex_string::decode(loc, &s) {
+            Ok(v) => EV::Bytearray(v),
+            Err(e) => {
+                context.env.add_diag(*e);
+                return None;
+            }
+        },
+        PV::ByteString(s) => match byte_string::decode(loc, &s) {
+            Ok(v) => EV::Bytearray(v),
+            Err(e) => {
+                context.env.add_diags(e);
+                return None;
+            }
+        },
+    };
+    Some(sp(loc, value_))
+}
+
+// Create an error for an integer literal that is too big to fit in its type.
+// This assumes that the literal is the current token.
+fn num_too_big_error(loc: Loc, type_description: &'static str) -> Diagnostic {
+    diag!(
+        Syntax::InvalidNumber,
+        (
+            loc,
+            format!(
+                "Invalid number literal. The given literal is too large to fit into {}",
+                type_description
+            )
+        ),
+    )
+}
+
+//**************************************************************************************************
+// Fields
+//**************************************************************************************************
+
+fn named_fields<T>(
+    context: &mut Context,
+    loc: Loc,
+    case: &str,
+    verb: &str,
+    xs: Vec<(Field, T)>,
+) -> Fields<T> {
+    let mut fmap = UniqueMap::new();
+    for (idx, (field, x)) in xs.into_iter().enumerate() {
+        if let Err((field, old_loc)) = fmap.add(field, (idx, x)) {
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (loc, format!("Invalid {}", case)),
+                (
+                    field.loc(),
+                    format!("Duplicate {} given for field '{}'", verb, field),
+                ),
+                (old_loc, "Field previously defined here".into()),
+            ))
+        }
+    }
+    fmap
+}
+
+//**************************************************************************************************
+// LValues
+//**************************************************************************************************
+
+fn bind_list(context: &mut Context, sp!(loc, pbs_): P::BindList) -> Option<E::LValueList> {
+    let bs_: Option<Vec<E::LValue>> = pbs_.into_iter().map(|pb| bind(context, pb)).collect();
+    Some(sp(loc, bs_?))
+}
+
+fn bind_with_range_list(
+    context: &mut Context,
+    sp!(loc, prs_): P::BindWithRangeList,
+) -> Option<E::LValueWithRangeList> {
+    let rs_: Option<Vec<E::LValueWithRange>> = prs_
+        .into_iter()
+        .map(|sp!(loc, (pb, pr))| -> Option<E::LValueWithRange> {
+            let r = exp_(context, pr);
+            let b = bind(context, pb)?;
+            Some(sp(loc, (b, r)))
+        })
+        .collect();
+    Some(sp(loc, rs_?))
+}
+
+fn bind(context: &mut Context, sp!(loc, pb_): P::Bind) -> Option<E::LValue> {
+    use E::LValue_ as EL;
+    use P::Bind_ as PB;
+    let b_ = match pb_ {
+        PB::Var(pmut, v) => {
+            let emut = mutability(context, v.loc(), pmut);
+            check_valid_local_name(context, &v);
+            EL::Var(emut, sp(loc, E::ModuleAccess_::Name(v.0)), None)
+        }
+        PB::Unpack(ptn, ptys_opt, pfields) => {
+            let tn = name_access_chain(context, Access::ApplyNamed, *ptn)?;
+            let tys_opt = optional_types(context, ptys_opt);
+            let fields = match pfields {
+                FieldBindings::Named(named_bindings) => {
+                    let vfields: Option<Vec<(Field, E::LValue)>> = named_bindings
+                        .into_iter()
+                        .map(|(f, pb)| Some((f, bind(context, pb)?)))
+                        .collect();
+                    let fields =
+                        named_fields(context, loc, "deconstruction binding", "binding", vfields?);
+                    E::FieldBindings::Named(fields)
+                }
+                FieldBindings::Positional(positional_bindings) => {
+                    let fields: Option<Vec<E::LValue>> = positional_bindings
+                        .into_iter()
+                        .map(|b| bind(context, b))
+                        .collect();
+                    E::FieldBindings::Positional(fields?)
+                }
+            };
+            EL::Unpack(tn, tys_opt, fields)
+        }
+    };
+    Some(sp(loc, b_))
+}
+
+enum LValue {
+    Assigns(E::LValueList),
+    FieldMutate(Box<E::ExpDotted>),
+    Mutate(Box<E::Exp>),
+}
+
+fn lvalues(context: &mut Context, sp!(loc, e_): P::Exp) -> Option<LValue> {
+    use LValue as L;
+    use P::Exp_ as PE;
+    let al: LValue = match e_ {
+        PE::Unit => L::Assigns(sp(loc, vec![])),
+        PE::ExpList(pes) => {
+            let al_opt: Option<E::LValueList_> =
+                pes.into_iter().map(|pe| assign(context, pe)).collect();
+            L::Assigns(sp(loc, al_opt?))
+        }
+        PE::Dereference(pr) => {
+            let er = exp(context, *pr);
+            L::Mutate(er)
+        }
+        pdotted_ @ PE::Dot(_, _) => {
+            let dotted = exp_dotted(context, sp(loc, pdotted_))?;
+            L::FieldMutate(Box::new(dotted))
+        }
+        _ => L::Assigns(sp(loc, vec![assign(context, sp(loc, e_))?])),
+    };
+    Some(al)
+}
+
+fn assign(context: &mut Context, sp!(loc, e_): P::Exp) -> Option<E::LValue> {
+    use E::LValue_ as EL;
+    use P::Exp_ as PE;
+    let a_ = match e_ {
+        PE::Name(n @ sp!(_, P::NameAccessChain_::Two(_, _)), _)
+        | PE::Name(n @ sp!(_, P::NameAccessChain_::Three(_, _)), _)
+            if !context.in_spec_context =>
+        {
+            let msg = format!(
+                "Unexpected assignment of module access without fields outside of a spec \
+                 context.\nIf you are trying to unpack a struct, try adding fields, e.g. '{} {{}}'",
+                n
+            );
+            context
+                .env
+                .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+
+            // For unused alias warnings and unbound modules
+            name_access_chain(context, Access::Term, n);
+
+            return None;
+        }
+        PE::Name(n, Some(_)) if !context.in_spec_context => {
+            let msg = format!(
+                "Unexpected assignment of instantiated type without fields outside of a spec \
+                 context.\nIf you are trying to unpack a struct, try adding fields, e.g. '{} {{}}'",
+                n
+            );
+            context
+                .env
+                .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+
+            // For unused alias warnings and unbound modules
+            name_access_chain(context, Access::Term, n);
+
+            return None;
+        }
+        PE::Name(pn, ptys_opt) => {
+            let en = name_access_chain(context, Access::Term, pn)?;
+            match &en.value {
+                E::ModuleAccess_::ModuleAccess(m, n) if !context.in_spec_context => {
+                    let msg = format!(
+                        "Unexpected assignment of module access without fields outside of a spec \
+                         context.\nIf you are trying to unpack a struct, try adding fields, e.g. \
+                         '{}::{} {{}}'",
+                        m, n,
+                    );
+                    context
+                        .env
+                        .add_diag(diag!(Syntax::SpecContextRestricted, (loc, msg)));
+                    return None;
+                }
+                _ => {
+                    let tys_opt = optional_types(context, ptys_opt);
+                    EL::Var(None, en, tys_opt)
+                }
+            }
+        }
+        PE::Pack(pn, ptys_opt, pfields) => {
+            let en = name_access_chain(context, Access::ApplyNamed, pn)?;
+            let tys_opt = optional_types(context, ptys_opt);
+            let efields = assign_unpack_fields(context, loc, pfields)?;
+            EL::Unpack(en, tys_opt, E::FieldBindings::Named(efields))
+        }
+        PE::Call(pn, false, ptys_opt, sp!(_, exprs)) => {
+            context
+                .env
+                .check_feature(FeatureGate::PositionalFields, context.current_package, loc);
+            let en = name_access_chain(context, Access::ApplyNamed, pn)?;
+            let tys_opt = optional_types(context, ptys_opt);
+            let pfields: Option<_> = exprs.into_iter().map(|e| assign(context, e)).collect();
+            EL::Unpack(en, tys_opt, E::FieldBindings::Positional(pfields?))
+        }
+        _ => {
+            context.env.add_diag(diag!(
+                Syntax::InvalidLValue,
+                (
+                    loc,
+                    "Invalid assignment syntax. Expected: a local, a field write, or a \
+                     deconstructing assignment"
+                )
+            ));
+            return None;
+        }
+    };
+    Some(sp(loc, a_))
+}
+
+fn assign_unpack_fields(
+    context: &mut Context,
+    loc: Loc,
+    pfields: Vec<(Field, P::Exp)>,
+) -> Option<Fields<E::LValue>> {
+    let afields = pfields
+        .into_iter()
+        .map(|(f, e)| Some((f, assign(context, e)?)))
+        .collect::<Option<_>>()?;
+    Some(named_fields(
+        context,
+        loc,
+        "deconstructing assignment",
+        "assignment binding",
+        afields,
+    ))
+}
+
+fn mutability(context: &mut Context, loc: Loc, pmut: Mutability) -> Mutability {
+    let supports_let_mut = context
+        .env
+        .supports_feature(context.current_package, FeatureGate::LetMut);
+    match pmut {
+        Some(loc) => {
+            assert!(supports_let_mut, "ICE mut should not parse without let mut");
+            Some(loc)
+        }
+        None if supports_let_mut => None,
+        // without let mut enabled, all locals are mutable and do not need the annotation
+        None => Some(loc),
+    }
+}
+
+//**************************************************************************************************
+// Unbound names
+//**************************************************************************************************
+
+fn unbound_names_spec_block(unbound: &mut BTreeSet<Name>, sp!(_, sb_): &E::SpecBlock) {
+    sb_.members
+        .iter()
+        .for_each(|member| unbound_names_spec_block_member(unbound, member))
+}
+
+fn unbound_names_spec_block_member(unbound: &mut BTreeSet<Name>, sp!(_, m_): &E::SpecBlockMember) {
+    use E::SpecBlockMember_ as M;
+    match &m_ {
+        M::Condition {
+            exp,
+            additional_exps,
+            ..
+        } => {
+            unbound_names_exp(unbound, exp);
+            additional_exps
+                .iter()
+                .for_each(|e| unbound_names_exp(unbound, e));
+        }
+        // No unbound names
+        // And will error in the Move prover
+        M::Function { .. }
+        | M::Variable { .. }
+        | M::Update { .. }
+        | M::Let { .. }
+        | M::Include { .. }
+        | M::Apply { .. }
+        | M::Pragma { .. } => (),
+    }
+}
+
+fn unbound_names_exp(unbound: &mut BTreeSet<Name>, sp!(_, e_): &E::Exp) {
+    use E::Exp_ as EE;
+    match e_ {
+        EE::Value(_)
+        | EE::Break
+        | EE::Continue
+        | EE::UnresolvedError
+        | EE::Name(sp!(_, E::ModuleAccess_::ModuleAccess(..)), _)
+        | EE::Unit { .. } => (),
+        EE::Copy(v) | EE::Move(v) => {
+            unbound.insert(v.0);
+        }
+        EE::Name(sp!(_, E::ModuleAccess_::Name(n)), _) => {
+            unbound.insert(*n);
+        }
+        EE::Call(_, _, _, sp!(_, es_)) | EE::Vector(_, _, sp!(_, es_)) => {
+            unbound_names_exps(unbound, es_)
+        }
+        EE::MethodCall(ed, _, _, sp!(_, es_)) => {
+            unbound_names_dotted(unbound, ed);
+            unbound_names_exps(unbound, es_)
+        }
+        EE::Pack(_, _, es) => unbound_names_exps(unbound, es.iter().map(|(_, _, (_, e))| e)),
+        EE::IfElse(econd, et, ef) => {
+            unbound_names_exp(unbound, ef);
+            unbound_names_exp(unbound, et);
+            unbound_names_exp(unbound, econd)
+        }
+        EE::While(econd, eloop) => {
+            unbound_names_exp(unbound, eloop);
+            unbound_names_exp(unbound, econd)
+        }
+        EE::Loop(eloop) => unbound_names_exp(unbound, eloop),
+
+        EE::Block(seq) => unbound_names_sequence(unbound, seq),
+        EE::Lambda(ls, er) => {
+            unbound_names_exp(unbound, er);
+            // remove anything in `ls`
+            unbound_names_binds(unbound, ls);
+        }
+        EE::Quant(_, rs, trs, cr_opt, er) => {
+            unbound_names_exp(unbound, er);
+            if let Some(cr) = cr_opt {
+                unbound_names_exp(unbound, cr);
+            }
+            for tr in trs {
+                unbound_names_exps(unbound, tr);
+            }
+            // remove anything in `rs`
+            unbound_names_binds_with_range(unbound, rs);
+        }
+        EE::Assign(ls, er) => {
+            unbound_names_exp(unbound, er);
+            // remove anything in `ls`
+            unbound_names_assigns(unbound, ls);
+        }
+        EE::Return(e)
+        | EE::Abort(e)
+        | EE::Dereference(e)
+        | EE::UnaryExp(_, e)
+        | EE::Borrow(_, e)
+        | EE::Cast(e, _)
+        | EE::Annotate(e, _) => unbound_names_exp(unbound, e),
+        EE::FieldMutate(ed, er) => {
+            unbound_names_exp(unbound, er);
+            unbound_names_dotted(unbound, ed)
+        }
+        EE::Mutate(el, er) | EE::BinopExp(el, _, er) => {
+            unbound_names_exp(unbound, er);
+            unbound_names_exp(unbound, el)
+        }
+        EE::ExpList(es) => unbound_names_exps(unbound, es),
+        EE::ExpDotted(ed) => unbound_names_dotted(unbound, ed),
+        EE::Index(el, ei) => {
+            unbound_names_exp(unbound, ei);
+            unbound_names_exp(unbound, el)
+        }
+
+        EE::Spec(_, unbound_names) => unbound.extend(unbound_names.iter().cloned()),
+    }
+}
+
+fn unbound_names_exps<'a>(unbound: &mut BTreeSet<Name>, es: impl IntoIterator<Item = &'a E::Exp>) {
+    es.into_iter().for_each(|e| unbound_names_exp(unbound, e))
+}
+
+fn unbound_names_sequence(unbound: &mut BTreeSet<Name>, seq: &E::Sequence) {
+    seq.1
+        .iter()
+        .rev()
+        .for_each(|s| unbound_names_sequence_item(unbound, s))
+}
+
+fn unbound_names_sequence_item(unbound: &mut BTreeSet<Name>, sp!(_, es_): &E::SequenceItem) {
+    use E::SequenceItem_ as ES;
+    match es_ {
+        ES::Seq(e) => unbound_names_exp(unbound, e),
+        ES::Declare(ls, _) => unbound_names_binds(unbound, ls),
+        ES::Bind(ls, er) => {
+            unbound_names_exp(unbound, er);
+            // remove anything in `ls`
+            unbound_names_binds(unbound, ls);
+        }
+    }
+}
+
+fn unbound_names_binds(unbound: &mut BTreeSet<Name>, sp!(_, ls_): &E::LValueList) {
+    ls_.iter()
+        .rev()
+        .for_each(|l| unbound_names_bind(unbound, l))
+}
+
+fn unbound_names_binds_with_range(
+    unbound: &mut BTreeSet<Name>,
+    sp!(_, rs_): &E::LValueWithRangeList,
+) {
+    rs_.iter().rev().for_each(|sp!(_, (b, r))| {
+        unbound_names_bind(unbound, b);
+        unbound_names_exp(unbound, r)
+    })
+}
+
+fn unbound_names_bind(unbound: &mut BTreeSet<Name>, sp!(_, l_): &E::LValue) {
+    use E::LValue_ as EL;
+    match l_ {
+        EL::Var(_, sp!(_, E::ModuleAccess_::Name(n)), _) => {
+            unbound.remove(n);
+        }
+        EL::Var(_, sp!(_, E::ModuleAccess_::ModuleAccess(..)), _) => {
+            // Qualified vars are not considered in unbound set.
+        }
+        EL::Unpack(_, _, efields) => match efields {
+            E::FieldBindings::Named(efields) => efields
+                .iter()
+                .for_each(|(_, _, (_, l))| unbound_names_bind(unbound, l)),
+            E::FieldBindings::Positional(lvals) => {
+                lvals.iter().for_each(|l| unbound_names_bind(unbound, l))
+            }
+        },
+    }
+}
+
+fn unbound_names_assigns(unbound: &mut BTreeSet<Name>, sp!(_, ls_): &E::LValueList) {
+    ls_.iter()
+        .rev()
+        .for_each(|l| unbound_names_assign(unbound, l))
+}
+
+fn unbound_names_assign(unbound: &mut BTreeSet<Name>, sp!(_, l_): &E::LValue) {
+    use E::LValue_ as EL;
+    match l_ {
+        EL::Var(_, sp!(_, E::ModuleAccess_::Name(n)), _) => {
+            unbound.insert(*n);
+        }
+        EL::Var(_, sp!(_, E::ModuleAccess_::ModuleAccess(..)), _) => {
+            // Qualified vars are not considered in unbound set.
+        }
+        EL::Unpack(_, _, efields) => match efields {
+            E::FieldBindings::Named(efields) => efields
+                .iter()
+                .for_each(|(_, _, (_, l))| unbound_names_assign(unbound, l)),
+            E::FieldBindings::Positional(lvals) => {
+                lvals.iter().for_each(|l| unbound_names_assign(unbound, l))
+            }
+        },
+    }
+}
+
+fn unbound_names_dotted(unbound: &mut BTreeSet<Name>, sp!(_, edot_): &E::ExpDotted) {
+    use E::ExpDotted_ as ED;
+    match edot_ {
+        ED::Exp(e) => unbound_names_exp(unbound, e),
+        ED::Dot(d, _) => unbound_names_dotted(unbound, d),
+    }
+}
+
+//**************************************************************************************************
+// Valid names
+//**************************************************************************************************
+
+fn check_valid_address_name_(
+    env: &mut CompilationEnv,
+    sp!(_, ln_): &P::LeadingNameAccess,
+) -> Result<(), ()> {
+    use P::LeadingNameAccess_ as LN;
+    match ln_ {
+        LN::AnonymousAddress(_) => Ok(()),
+        LN::Name(n) => check_restricted_name_all_cases_(env, NameCase::Address, n),
+    }
+}
+
+fn check_valid_local_name(context: &mut Context, v: &Var) {
+    fn is_valid(s: Symbol) -> bool {
+        s.starts_with('_') || s.starts_with(|c: char| c.is_ascii_lowercase())
+    }
+    if !is_valid(v.value()) {
+        let msg = format!(
+            "Invalid local variable name '{}'. Local variable names must start with 'a'..'z' (or \
+             '_')",
+            v,
+        );
+        context
+            .env
+            .add_diag(diag!(Declarations::InvalidName, (v.loc(), msg)));
+    }
+    let _ = check_restricted_name_all_cases(context, NameCase::Variable, &v.0);
+}
+
+#[derive(Copy, Clone, Debug)]
+enum ModuleMemberKind {
+    Constant,
+    Function,
+    Struct,
+    Schema,
+}
+
+impl ModuleMemberKind {
+    fn case(self) -> NameCase {
+        match self {
+            ModuleMemberKind::Constant => NameCase::Constant,
+            ModuleMemberKind::Function => NameCase::Function,
+            ModuleMemberKind::Struct => NameCase::Struct,
+            ModuleMemberKind::Schema => NameCase::Schema,
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+enum NameCase {
+    Constant,
+    Function,
+    Struct,
+    Schema,
+    Module,
+    ModuleMemberAlias(ModuleMemberKind),
+    ModuleAlias,
+    Variable,
+    Address,
+}
+
+impl NameCase {
+    const fn name(&self) -> &'static str {
+        match self {
+            NameCase::Constant => "constant",
+            NameCase::Function => "function",
+            NameCase::Struct => "struct",
+            NameCase::Schema => "schema",
+            NameCase::Module => "module",
+            NameCase::ModuleMemberAlias(ModuleMemberKind::Function) => "function alias",
+            NameCase::ModuleMemberAlias(ModuleMemberKind::Constant) => "constant alias",
+            NameCase::ModuleMemberAlias(ModuleMemberKind::Struct) => "struct alias",
+            NameCase::ModuleMemberAlias(ModuleMemberKind::Schema) => "schema alias",
+            NameCase::ModuleAlias => "module alias",
+            NameCase::Variable => "variable",
+            NameCase::Address => "address",
+        }
+    }
+}
+
+fn check_valid_module_member_name(
+    context: &mut Context,
+    member: ModuleMemberKind,
+    name: Name,
+) -> Option<Name> {
+    match check_valid_module_member_name_impl(context, member, &name, member.case()) {
+        Err(()) => None,
+        Ok(()) => Some(name),
+    }
+}
+
+fn check_valid_module_member_alias(
+    context: &mut Context,
+    member: ModuleMemberKind,
+    alias: Name,
+) -> Option<Name> {
+    match check_valid_module_member_name_impl(
+        context,
+        member,
+        &alias,
+        NameCase::ModuleMemberAlias(member),
+    ) {
+        Err(()) => None,
+        Ok(()) => Some(alias),
+    }
+}
+
+fn check_valid_module_member_name_impl(
+    context: &mut Context,
+    member: ModuleMemberKind,
+    n: &Name,
+    case: NameCase,
+) -> Result<(), ()> {
+    use ModuleMemberKind as M;
+    fn upper_first_letter(s: &str) -> String {
+        let mut chars = s.chars();
+        match chars.next() {
+            None => String::new(),
+            Some(c) => c.to_uppercase().collect::<String>() + chars.as_str(),
+        }
+    }
+    match member {
+        M::Function => {
+            if n.value.starts_with(|c| c == '_') {
+                let msg = format!(
+                    "Invalid {} name '{}'. {} names cannot start with '_'",
+                    case.name(),
+                    n,
+                    upper_first_letter(case.name()),
+                );
+                context
+                    .env
+                    .add_diag(diag!(Declarations::InvalidName, (n.loc, msg)));
+                return Err(());
+            }
+        }
+        M::Constant | M::Struct | M::Schema => {
+            if !is_valid_struct_constant_or_schema_name(&n.value) {
+                let msg = format!(
+                    "Invalid {} name '{}'. {} names must start with 'A'..'Z'",
+                    case.name(),
+                    n,
+                    upper_first_letter(case.name()),
+                );
+                context
+                    .env
+                    .add_diag(diag!(Declarations::InvalidName, (n.loc, msg)));
+                return Err(());
+            }
+        }
+    }
+
+    // TODO move these names to a more central place?
+    check_restricted_names(
+        context,
+        case,
+        n,
+        crate::naming::ast::BuiltinFunction_::all_names(),
+    )?;
+    check_restricted_names(
+        context,
+        case,
+        n,
+        crate::naming::ast::BuiltinTypeName_::all_names(),
+    )?;
+
+    // Restricting Self for now in the case where we ever have impls
+    // Otherwise, we could allow it
+    check_restricted_name_all_cases(context, case, n)?;
+
+    Ok(())
+}
+
+pub fn is_valid_struct_constant_or_schema_name(s: &str) -> bool {
+    s.starts_with(|c: char| c.is_ascii_uppercase())
+}
+
+// Checks for a restricted name in any decl case
+// Self and vector are not allowed
+fn check_restricted_name_all_cases(
+    context: &mut Context,
+    case: NameCase,
+    n: &Name,
+) -> Result<(), ()> {
+    check_restricted_name_all_cases_(context.env, case, n)
+}
+
+fn check_restricted_name_all_cases_(
+    env: &mut CompilationEnv,
+    case: NameCase,
+    n: &Name,
+) -> Result<(), ()> {
+    let n_str = n.value.as_str();
+    let can_be_vector = matches!(case, NameCase::Module | NameCase::ModuleAlias);
+    if n_str == ModuleName::SELF_NAME
+        || (!can_be_vector && n_str == crate::naming::ast::BuiltinTypeName_::VECTOR)
+    {
+        env.add_diag(restricted_name_error(case, n.loc, n_str));
+        Err(())
+    } else {
+        Ok(())
+    }
+}
+
+fn check_restricted_names(
+    context: &mut Context,
+    case: NameCase,
+    sp!(loc, n_): &Name,
+    all_names: &BTreeSet<Symbol>,
+) -> Result<(), ()> {
+    if all_names.contains(n_) {
+        context.env.add_diag(restricted_name_error(case, *loc, n_));
+        Err(())
+    } else {
+        Ok(())
+    }
+}
+
+fn restricted_name_error(case: NameCase, loc: Loc, restricted: &str) -> Diagnostic {
+    let a_or_an = match case.name().chars().next().unwrap() {
+        // TODO this is not exhaustive to the indefinite article rules in English
+        // but 'case' is never user generated, so it should be okay for a while/forever...
+        'a' | 'e' | 'i' | 'o' | 'u' => "an",
+        _ => "a",
+    };
+    let msg = format!(
+        "Invalid {case} name '{restricted}'. '{restricted}' is restricted and cannot be used to \
+         name {a_or_an} {case}",
+        a_or_an = a_or_an,
+        case = case.name(),
+        restricted = restricted,
+    );
+    diag!(NameResolution::ReservedName, (loc, msg))
+}
diff --git a/vendors/move/crates/move-compiler/src/hlir/ast.rs b/vendors/move/crates/move-compiler/src/hlir/ast.rs
new file mode 100644
index 000000000..da0139e0d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/hlir/ast.rs
@@ -0,0 +1,1410 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::WarningFilters,
+    expansion::ast::{
+        ability_modifiers_ast_debug, AbilitySet, Attributes, Friend, ModuleIdent, SpecId,
+    },
+    naming::ast::{BuiltinTypeName, BuiltinTypeName_, StructTypeParameter, TParam},
+    parser::ast::{
+        self as P, BinOp, ConstantName, Field, FunctionName, StructName, UnaryOp, ENTRY_MODIFIER,
+    },
+    shared::{ast_debug::*, unique_map::UniqueMap, Name, NumericalAddress, TName},
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+// High Level IR
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    pub modules: UniqueMap<ModuleIdent, ModuleDefinition>,
+    pub scripts: BTreeMap<Symbol, Script>,
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub function_name: FunctionName,
+    pub function: Function,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub is_source_module: bool,
+    /// `dependency_order` is the topological order/rank in the dependency graph.
+    pub dependency_order: usize,
+    pub friends: UniqueMap<ModuleIdent, Friend>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub functions: UniqueMap<FunctionName, Function>,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct StructDefinition {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub fields: StructFields,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum StructFields {
+    Defined(Vec<(Field, BaseType)>),
+    Native(Loc),
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Constant {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub signature: BaseType,
+    pub value: (UniqueMap<Var, SingleType>, Block),
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+// package visibility is removed after typing is done
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum Visibility {
+    Public(Loc),
+    Friend(Loc),
+    Internal,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub struct FunctionSignature {
+    pub type_parameters: Vec<TParam>,
+    pub parameters: Vec<(Var, SingleType)>,
+    pub return_type: Type,
+}
+
+#[derive(PartialEq, Debug, Clone)]
+pub enum FunctionBody_ {
+    Native,
+    Defined {
+        locals: UniqueMap<Var, SingleType>,
+        body: Block,
+    },
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Function {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub body: FunctionBody,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy, PartialOrd, Ord)]
+pub struct Var(pub Name);
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum TypeName_ {
+    Builtin(BuiltinTypeName),
+    ModuleType(ModuleIdent, StructName),
+}
+pub type TypeName = Spanned<TypeName_>;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum BaseType_ {
+    Param(TParam),
+    Apply(AbilitySet, TypeName, Vec<BaseType>),
+    Unreachable,
+    UnresolvedError,
+}
+pub type BaseType = Spanned<BaseType_>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum SingleType_ {
+    Base(BaseType),
+    Ref(bool, BaseType),
+}
+pub type SingleType = Spanned<SingleType_>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Type_ {
+    Unit,
+    Single(SingleType),
+    Multiple(Vec<SingleType>),
+}
+pub type Type = Spanned<Type_>;
+
+//**************************************************************************************************
+// Statements
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Statement_ {
+    Command(Command),
+    IfElse {
+        cond: Box<Exp>,
+        if_block: Block,
+        else_block: Block,
+    },
+    While {
+        cond: (Block, Box<Exp>),
+        block: Block,
+    },
+    Loop {
+        block: Block,
+        has_break: bool,
+    },
+}
+pub type Statement = Spanned<Statement_>;
+
+pub type Block = VecDeque<Statement>;
+
+pub type BasicBlocks = BTreeMap<Label, BasicBlock>;
+
+pub type BasicBlock = VecDeque<Command>;
+
+#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, PartialOrd, Ord)]
+pub struct Label(pub usize);
+
+//**************************************************************************************************
+// Commands
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Command_ {
+    Assign(Vec<LValue>, Exp),
+    Mutate(Box<Exp>, Box<Exp>),
+    Abort(Exp),
+    Return {
+        from_user: bool,
+        exp: Exp,
+    },
+    Break,
+    Continue,
+    IgnoreAndPop {
+        pop_num: usize,
+        exp: Exp,
+    },
+    Jump {
+        from_user: bool,
+        target: Label,
+    },
+    JumpIf {
+        cond: Exp,
+        if_true: Label,
+        if_false: Label,
+    },
+}
+pub type Command = Spanned<Command_>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum LValue_ {
+    Ignore,
+    Var(Var, Box<SingleType>),
+    Unpack(StructName, Vec<BaseType>, Vec<(Field, LValue)>),
+}
+pub type LValue = Spanned<LValue_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum UnitCase {
+    Trailing,
+    Implicit,
+    FromUser,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct ModuleCall {
+    pub module: ModuleIdent,
+    pub name: FunctionName,
+    pub type_arguments: Vec<BaseType>,
+    pub arguments: Vec<Exp>,
+}
+
+pub type FromUnpack = Option<Loc>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum Value_ {
+    // @<address>
+    Address(NumericalAddress),
+    // <num>u8
+    U8(u8),
+    // <num>u16
+    U16(u16),
+    // <num>u32
+    U32(u32),
+    // <num>u64
+    U64(u64),
+    // <num>u128
+    U128(u128),
+    // <num>u256
+    U256(move_core_types::u256::U256),
+    // true
+    // false
+    Bool(bool),
+    // vector<type> [ <value>,* ]
+    Vector(Box<BaseType>, Vec<Value>),
+}
+pub type Value = Spanned<Value_>;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum MoveOpAnnotation {
+    // 'move' annotated by the user
+    FromUser,
+    // inferred based on liveness data
+    InferredLastUsage,
+    // inferred based on no 'copy' ability
+    InferredNoCopy,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum UnannotatedExp_ {
+    Unit {
+        case: UnitCase,
+    },
+    Value(Value),
+    Move {
+        annotation: MoveOpAnnotation,
+        var: Var,
+    },
+    Copy {
+        from_user: bool,
+        var: Var,
+    },
+    Constant(ConstantName),
+
+    ModuleCall(Box<ModuleCall>),
+    Freeze(Box<Exp>),
+    Vector(Loc, usize, Box<BaseType>, Vec<Exp>),
+
+    Dereference(Box<Exp>),
+    UnaryExp(UnaryOp, Box<Exp>),
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+
+    Pack(StructName, Vec<BaseType>, Vec<(Field, BaseType, Exp)>),
+    Multiple(Vec<Exp>),
+
+    Borrow(bool, Box<Exp>, Field, FromUnpack),
+    BorrowLocal(bool, Var),
+
+    Cast(Box<Exp>, BuiltinTypeName),
+
+    Unreachable,
+
+    Spec(SpecId, BTreeMap<Var, SingleType>),
+
+    UnresolvedError,
+}
+pub type UnannotatedExp = Spanned<UnannotatedExp_>;
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct Exp {
+    pub ty: Type,
+    pub exp: UnannotatedExp,
+}
+pub fn exp(ty: Type, exp: UnannotatedExp) -> Exp {
+    Exp { ty, exp }
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl FunctionSignature {
+    pub fn is_parameter(&self, v: &Var) -> bool {
+        self.parameters
+            .iter()
+            .any(|(parameter_name, _)| parameter_name == v)
+    }
+}
+
+impl Var {
+    pub fn loc(&self) -> Loc {
+        self.0.loc
+    }
+
+    pub fn value(&self) -> Symbol {
+        self.0.value
+    }
+
+    pub fn is_underscore(&self) -> bool {
+        self.0.value == symbol!("_")
+    }
+
+    pub fn starts_with_underscore(&self) -> bool {
+        self.0.value.starts_with('_')
+    }
+}
+
+impl Visibility {
+    pub const FRIEND: &'static str = P::Visibility::FRIEND;
+    pub const INTERNAL: &'static str = P::Visibility::INTERNAL;
+    pub const PUBLIC: &'static str = P::Visibility::PUBLIC;
+
+    pub fn loc(&self) -> Option<Loc> {
+        match self {
+            Visibility::Friend(loc) | Visibility::Public(loc) => Some(*loc),
+            Visibility::Internal => None,
+        }
+    }
+}
+
+impl Command_ {
+    pub fn is_terminal(&self) -> bool {
+        use Command_::*;
+        match self {
+            Break | Continue => panic!("ICE break/continue not translated to jumps"),
+            Assign(_, _) | Mutate(_, _) | IgnoreAndPop { .. } => false,
+            Abort(_) | Return { .. } | Jump { .. } | JumpIf { .. } => true,
+        }
+    }
+
+    pub fn is_exit(&self) -> bool {
+        use Command_::*;
+        match self {
+            Break | Continue => panic!("ICE break/continue not translated to jumps"),
+            Assign(_, _) | Mutate(_, _) | IgnoreAndPop { .. } | Jump { .. } | JumpIf { .. } => {
+                false
+            }
+            Abort(_) | Return { .. } => true,
+        }
+    }
+
+    pub fn is_unit(&self) -> bool {
+        use Command_::*;
+        match self {
+            Break | Continue => panic!("ICE break/continue not translated to jumps"),
+            Assign(ls, e) => ls.is_empty() && e.is_unit(),
+            IgnoreAndPop { exp: e, .. } => e.is_unit(),
+
+            Mutate(_, _) | Return { .. } | Abort(_) | JumpIf { .. } | Jump { .. } => false,
+        }
+    }
+
+    pub fn successors(&self) -> BTreeSet<Label> {
+        use Command_::*;
+
+        let mut successors = BTreeSet::new();
+        match self {
+            Break | Continue => panic!("ICE break/continue not translated to jumps"),
+            Mutate(_, _) | Assign(_, _) | IgnoreAndPop { .. } => {
+                panic!("ICE Should not be last command in block")
+            }
+            Abort(_) | Return { .. } => (),
+            Jump { target, .. } => {
+                successors.insert(*target);
+            }
+            JumpIf {
+                if_true, if_false, ..
+            } => {
+                successors.insert(*if_true);
+                successors.insert(*if_false);
+            }
+        }
+        successors
+    }
+}
+
+impl Exp {
+    pub fn is_unit(&self) -> bool {
+        self.exp.value.is_unit()
+    }
+}
+
+impl UnannotatedExp_ {
+    pub fn is_unit(&self) -> bool {
+        matches!(self, UnannotatedExp_::Unit { case: _case })
+    }
+}
+
+impl TypeName_ {
+    pub fn is(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> bool {
+        match self {
+            TypeName_::Builtin(_) => false,
+            TypeName_::ModuleType(mident, n) => {
+                mident.value.is(address, module) && n == name.as_ref()
+            }
+        }
+    }
+}
+
+impl BaseType_ {
+    pub fn builtin(loc: Loc, b_: BuiltinTypeName_, ty_args: Vec<BaseType>) -> BaseType {
+        use BuiltinTypeName_::*;
+
+        let kind = match b_ {
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address => AbilitySet::primitives(loc),
+            Signer => AbilitySet::signer(loc),
+            Vector => {
+                let declared_abilities = AbilitySet::collection(loc);
+                let ty_arg_abilities = {
+                    assert!(ty_args.len() == 1);
+                    ty_args[0].value.abilities(ty_args[0].loc)
+                };
+                AbilitySet::from_abilities(
+                    declared_abilities
+                        .into_iter()
+                        .filter(|ab| ty_arg_abilities.has_ability_(ab.value.requires())),
+                )
+                .unwrap()
+            }
+        };
+        let n = sp(loc, TypeName_::Builtin(sp(loc, b_)));
+        sp(loc, BaseType_::Apply(kind, n, ty_args))
+    }
+
+    pub fn abilities(&self, loc: Loc) -> AbilitySet {
+        match self {
+            BaseType_::Apply(abilities, _, _) | BaseType_::Param(TParam { abilities, .. }) => {
+                abilities.clone()
+            }
+            BaseType_::Unreachable | BaseType_::UnresolvedError => AbilitySet::all(loc),
+        }
+    }
+
+    pub fn bool(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::Bool, vec![])
+    }
+
+    pub fn address(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::Address, vec![])
+    }
+
+    pub fn u8(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U8, vec![])
+    }
+
+    pub fn u16(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U16, vec![])
+    }
+
+    pub fn u32(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U32, vec![])
+    }
+
+    pub fn u64(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U64, vec![])
+    }
+
+    pub fn u128(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U128, vec![])
+    }
+
+    pub fn u256(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U256, vec![])
+    }
+
+    pub fn is_apply(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> Option<(&AbilitySet, &TypeName, &[BaseType])> {
+        match self {
+            Self::Apply(abs, n, tys) if n.value.is(address, module, name) => Some((abs, n, tys)),
+            _ => None,
+        }
+    }
+}
+
+impl SingleType_ {
+    pub fn base(sp!(loc, b_): BaseType) -> SingleType {
+        sp(loc, SingleType_::Base(sp(loc, b_)))
+    }
+
+    pub fn bool(loc: Loc) -> SingleType {
+        Self::base(BaseType_::bool(loc))
+    }
+
+    pub fn address(loc: Loc) -> SingleType {
+        Self::base(BaseType_::address(loc))
+    }
+
+    pub fn u8(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u8(loc))
+    }
+
+    pub fn u16(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u16(loc))
+    }
+
+    pub fn u32(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u32(loc))
+    }
+
+    pub fn u64(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u64(loc))
+    }
+
+    pub fn u128(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u128(loc))
+    }
+
+    pub fn u256(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u256(loc))
+    }
+
+    pub fn abilities(&self, loc: Loc) -> AbilitySet {
+        match self {
+            SingleType_::Ref(_, _) => AbilitySet::references(loc),
+            SingleType_::Base(b) => b.value.abilities(loc),
+        }
+    }
+
+    pub fn is_apply(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> Option<(&AbilitySet, &TypeName, &[BaseType])> {
+        match self {
+            Self::Ref(_, b) | Self::Base(b) => b.value.is_apply(address, module, name),
+        }
+    }
+}
+
+impl Type_ {
+    pub fn base(b: BaseType) -> Type {
+        Self::single(SingleType_::base(b))
+    }
+
+    pub fn single(sp!(loc, s_): SingleType) -> Type {
+        sp(loc, Type_::Single(sp(loc, s_)))
+    }
+
+    pub fn bool(loc: Loc) -> Type {
+        Self::single(SingleType_::bool(loc))
+    }
+
+    pub fn address(loc: Loc) -> Type {
+        Self::single(SingleType_::address(loc))
+    }
+
+    pub fn u8(loc: Loc) -> Type {
+        Self::single(SingleType_::u8(loc))
+    }
+
+    pub fn u16(loc: Loc) -> Type {
+        Self::single(SingleType_::u16(loc))
+    }
+
+    pub fn u32(loc: Loc) -> Type {
+        Self::single(SingleType_::u32(loc))
+    }
+
+    pub fn u64(loc: Loc) -> Type {
+        Self::single(SingleType_::u64(loc))
+    }
+
+    pub fn u128(loc: Loc) -> Type {
+        Self::single(SingleType_::u128(loc))
+    }
+
+    pub fn u256(loc: Loc) -> Type {
+        Self::single(SingleType_::u256(loc))
+    }
+
+    pub fn type_at_index(&self, idx: usize) -> &SingleType {
+        match self {
+            Type_::Unit => panic!("ICE type mismatch on index lookup"),
+            Type_::Single(s) => {
+                assert!(idx == 0);
+                s
+            }
+            Type_::Multiple(ss) => {
+                assert!(idx < ss.len());
+                ss.get(idx).unwrap()
+            }
+        }
+    }
+
+    pub fn from_vec(loc: Loc, mut ss: Vec<SingleType>) -> Type {
+        let t_ = match ss.len() {
+            0 => Type_::Unit,
+            1 => Type_::Single(ss.pop().unwrap()),
+            _ => Type_::Multiple(ss),
+        };
+        sp(loc, t_)
+    }
+
+    pub fn is_apply(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> Option<(&AbilitySet, &TypeName, &[BaseType])> {
+        match self {
+            Type_::Unit => None,
+            Type_::Single(t) => t.value.is_apply(address, module, name),
+            Type_::Multiple(_) => None,
+        }
+    }
+}
+
+impl TName for Var {
+    type Key = Symbol;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Loc, Symbol) {
+        (self.0.loc, self.0.value)
+    }
+
+    fn add_loc(loc: Loc, value: Symbol) -> Var {
+        Var(sp(loc, value))
+    }
+
+    fn borrow(&self) -> (&Loc, &Symbol) {
+        (&self.0.loc, &self.0.value)
+    }
+}
+
+impl ModuleCall {
+    pub fn is(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        function: impl AsRef<str>,
+    ) -> bool {
+        let Self {
+            module: sp!(_, mident),
+            name: f,
+            ..
+        } = self;
+        mident.is(address, module) && f == function.as_ref()
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl std::fmt::Display for TypeName_ {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        use TypeName_::*;
+        match self {
+            Builtin(b) => write!(f, "{}", b),
+            ModuleType(m, n) => write!(f, "{}::{}", m, n),
+        }
+    }
+}
+
+impl std::fmt::Display for Visibility {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match &self {
+                Visibility::Public(_) => Visibility::PUBLIC,
+                Visibility::Friend(_) => Visibility::FRIEND,
+                Visibility::Internal => Visibility::INTERNAL,
+            }
+        )
+    }
+}
+
+impl std::fmt::Display for Label {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Program { modules, scripts } = self;
+
+        for (m, mdef) in modules.key_cloned_iter() {
+            w.write(&format!("module {}", m));
+            w.block(|w| mdef.ast_debug(w));
+            w.new_line();
+        }
+
+        for (n, s) in scripts {
+            w.write(&format!("script {}", n));
+            w.block(|w| s.ast_debug(w));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            warning_filter,
+            package_name,
+            attributes,
+            loc: _loc,
+            constants,
+            function_name,
+            function,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        (*function_name, function).ast_debug(w);
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            dependency_order,
+            friends,
+            structs,
+            constants,
+            functions,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        if *is_source_module {
+            w.writeln("library module")
+        } else {
+            w.writeln("source module")
+        }
+        w.writeln(&format!("dependency order #{}", dependency_order));
+        for (mident, _loc) in friends.key_cloned_iter() {
+            w.write(&format!("friend {};", mident));
+            w.new_line();
+        }
+        for sdef in structs.key_cloned_iter() {
+            sdef.ast_debug(w);
+            w.new_line();
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        for fdef in functions.key_cloned_iter() {
+            fdef.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for (StructName, &StructDefinition) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            StructDefinition {
+                warning_filter,
+                index,
+                attributes,
+                abilities,
+                type_parameters,
+                fields,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        if let StructFields::Native(_) = fields {
+            w.write("native ");
+        }
+
+        w.write(&format!("struct#{index} {name}"));
+        type_parameters.ast_debug(w);
+        ability_modifiers_ast_debug(w, abilities);
+        if let StructFields::Defined(fields) = fields {
+            w.block(|w| {
+                w.list(fields, ";", |w, (f, bt)| {
+                    w.write(&format!("{}: ", f));
+                    bt.ast_debug(w);
+                    true
+                })
+            })
+        }
+    }
+}
+
+impl AstDebug for (FunctionName, &Function) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Function {
+                warning_filter,
+                index,
+                attributes,
+                visibility,
+                entry,
+                signature,
+                body,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun#{index} {name}"));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined { locals, body } => w.block(|w| (locals, body).ast_debug(w)),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for (UniqueMap<Var, SingleType>, Block) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (locals, body) = self;
+        (locals, body).ast_debug(w)
+    }
+}
+
+impl AstDebug for (&UniqueMap<Var, SingleType>, &Block) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (locals, body) = self;
+        w.write("locals:");
+        w.indent(4, |w| {
+            w.list(*locals, ",", |w, (_, v, st)| {
+                w.write(&format!("{}: ", v));
+                st.ast_debug(w);
+                true
+            })
+        });
+        w.new_line();
+        body.ast_debug(w);
+    }
+}
+
+impl AstDebug for FunctionSignature {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let FunctionSignature {
+            type_parameters,
+            parameters,
+            return_type,
+        } = self;
+        type_parameters.ast_debug(w);
+        w.write("(");
+        w.comma(parameters, |w, (v, st)| {
+            v.ast_debug(w);
+            w.write(": ");
+            st.ast_debug(w);
+        });
+        w.write("): ");
+        return_type.ast_debug(w)
+    }
+}
+
+impl AstDebug for Visibility {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{} ", self))
+    }
+}
+
+impl AstDebug for Var {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self.0))
+    }
+}
+
+impl AstDebug for (ConstantName, &Constant) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Constant {
+                warning_filter,
+                index,
+                attributes,
+                loc: _loc,
+                signature,
+                value,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        w.write(&format!("const#{index} {name}:"));
+        signature.ast_debug(w);
+        w.write(" = ");
+        w.block(|w| value.ast_debug(w));
+        w.write(";");
+    }
+}
+
+impl AstDebug for TypeName_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            TypeName_::Builtin(bt) => bt.ast_debug(w),
+            TypeName_::ModuleType(m, s) => w.write(&format!("{}::{}", m, s)),
+        }
+    }
+}
+
+impl AstDebug for BaseType_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            BaseType_::Param(tp) => tp.ast_debug(w),
+            BaseType_::Apply(abilities, m, ss) => {
+                w.annotate_gen(
+                    |w| {
+                        m.ast_debug(w);
+                        if !ss.is_empty() {
+                            w.write("<");
+                            ss.ast_debug(w);
+                            w.write(">");
+                        }
+                    },
+                    abilities,
+                    |w, abilities| {
+                        w.list(abilities, "+", |w, ab| {
+                            ab.ast_debug(w);
+                            false
+                        })
+                    },
+                );
+            }
+            BaseType_::Unreachable => w.write("_|_"),
+            BaseType_::UnresolvedError => w.write("_"),
+        }
+    }
+}
+
+impl AstDebug for SingleType_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SingleType_::Base(b) => b.ast_debug(w),
+            SingleType_::Ref(mut_, s) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                s.ast_debug(w)
+            }
+        }
+    }
+}
+
+impl AstDebug for Type_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Type_::Unit => w.write("()"),
+            Type_::Single(s) => s.ast_debug(w),
+            Type_::Multiple(ss) => {
+                w.write("(");
+                ss.ast_debug(w);
+                w.write(")")
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<SingleType> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, s| s.ast_debug(w))
+    }
+}
+
+impl AstDebug for Vec<BaseType> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, s| s.ast_debug(w))
+    }
+}
+
+impl AstDebug for VecDeque<Statement> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.semicolon(self, |w, stmt| stmt.ast_debug(w))
+    }
+}
+
+impl AstDebug for (Block, Box<Exp>) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (block, exp) = self;
+        if block.is_empty() {
+            exp.ast_debug(w);
+        } else {
+            w.block(|w| {
+                block.ast_debug(w);
+                w.writeln(";");
+                exp.ast_debug(w);
+            })
+        }
+    }
+}
+
+impl AstDebug for Statement_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Statement_ as S;
+        match self {
+            S::Command(cmd) => cmd.ast_debug(w),
+            S::IfElse {
+                cond,
+                if_block,
+                else_block,
+            } => {
+                w.write("if (");
+                cond.ast_debug(w);
+                w.write(") ");
+                w.block(|w| if_block.ast_debug(w));
+                w.write(" else ");
+                w.block(|w| else_block.ast_debug(w));
+            }
+            S::While { cond, block } => {
+                w.write("while (");
+                cond.ast_debug(w);
+                w.write(")");
+                w.block(|w| block.ast_debug(w))
+            }
+            S::Loop { block, has_break } => {
+                w.write("loop");
+                if *has_break {
+                    w.write("#has_break");
+                }
+                w.write(" ");
+                w.block(|w| block.ast_debug(w))
+            }
+        }
+    }
+}
+
+impl AstDebug for Command_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Command_ as C;
+        match self {
+            C::Assign(lvalues, rhs) => {
+                lvalues.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            C::Mutate(lhs, rhs) => {
+                w.write("*");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            C::Abort(e) => {
+                w.write("abort ");
+                e.ast_debug(w);
+            }
+            C::Return { exp: e, from_user } if *from_user => {
+                w.write("return@");
+                e.ast_debug(w);
+            }
+            C::Return { exp: e, .. } => {
+                w.write("return ");
+                e.ast_debug(w);
+            }
+            C::Break => w.write("break"),
+            C::Continue => w.write("continue"),
+            C::IgnoreAndPop { pop_num, exp } => {
+                w.write("pop ");
+                w.comma(0..*pop_num, |w, _| w.write("_"));
+                w.write(" = ");
+                exp.ast_debug(w);
+            }
+            C::Jump { target, from_user } if *from_user => w.write(&format!("jump@{}", target.0)),
+            C::Jump { target, .. } => w.write(&format!("jump {}", target.0)),
+            C::JumpIf {
+                cond,
+                if_true,
+                if_false,
+            } => {
+                w.write("jump_if(");
+                cond.ast_debug(w);
+                w.write(&format!(") {} else {}", if_true.0, if_false.0));
+            }
+        }
+    }
+}
+
+impl AstDebug for Value_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Value_ as V;
+        match self {
+            V::Address(addr) => w.write(&format!("@{}", addr)),
+            V::U8(u) => w.write(&format!("{}u8", u)),
+            V::U16(u) => w.write(&format!("{}u16", u)),
+            V::U32(u) => w.write(&format!("{}u32", u)),
+            V::U64(u) => w.write(&format!("{}u64", u)),
+            V::U128(u) => w.write(&format!("{}u128", u)),
+            V::U256(u) => w.write(&format!("{}u256", u)),
+            V::Bool(b) => w.write(&format!("{}", b)),
+            V::Vector(ty, elems) => {
+                w.write("vector#value");
+                w.write("<");
+                ty.ast_debug(w);
+                w.write(">");
+                w.write("[");
+                w.comma(elems, |w, e| e.ast_debug(w));
+                w.write("]");
+            }
+        }
+    }
+}
+
+impl AstDebug for Exp {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Exp { ty, exp } = self;
+        w.annotate(|w| exp.ast_debug(w), ty)
+    }
+}
+
+impl AstDebug for Vec<Exp> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, e| e.ast_debug(w));
+    }
+}
+
+impl AstDebug for UnannotatedExp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use UnannotatedExp_ as E;
+        match self {
+            E::Unit {
+                case: UnitCase::FromUser,
+            } => w.write("()"),
+            E::Unit {
+                case: UnitCase::Implicit,
+            } => w.write("/*()*/"),
+            E::Unit {
+                case: UnitCase::Trailing,
+            } => w.write("/*;()*/"),
+            E::Value(v) => v.ast_debug(w),
+            E::Move { annotation, var: v } => {
+                let case = match annotation {
+                    MoveOpAnnotation::FromUser => "@",
+                    MoveOpAnnotation::InferredLastUsage => "#last ",
+                    MoveOpAnnotation::InferredNoCopy => "#no-copy ",
+                };
+                w.write(&format!("move{}", case));
+                v.ast_debug(w)
+            }
+            E::Copy {
+                from_user: false,
+                var: v,
+            } => {
+                w.write("copy ");
+                v.ast_debug(w)
+            }
+            E::Copy {
+                from_user: true,
+                var: v,
+            } => {
+                w.write("copy@");
+                v.ast_debug(w)
+            }
+            E::Constant(c) => w.write(&format!("{}", c)),
+            E::ModuleCall(mcall) => {
+                mcall.ast_debug(w);
+            }
+            E::Vector(_loc, n, ty, elems) => {
+                w.write(&format!("vector#{}", n));
+                w.write("<");
+                ty.ast_debug(w);
+                w.write(">");
+                w.write("[");
+                elems.ast_debug(w);
+                w.write("]");
+            }
+            E::Freeze(e) => {
+                w.write("freeze(");
+                e.ast_debug(w);
+                w.write(")");
+            }
+            E::Pack(s, tys, fields) => {
+                w.write(&format!("{}", s));
+                w.write("<");
+                tys.ast_debug(w);
+                w.write(">");
+                w.write("{");
+                w.comma(fields, |w, (f, bt, e)| {
+                    w.annotate(|w| w.write(&format!("{}", f)), bt);
+                    w.write(": ");
+                    e.ast_debug(w);
+                });
+                w.write("}");
+            }
+
+            E::Multiple(es) => {
+                w.write("(");
+                w.comma(es, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+
+            E::Dereference(e) => {
+                w.write("*");
+                e.ast_debug(w)
+            }
+            E::UnaryExp(op, e) => {
+                op.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::BinopExp(l, op, r) => {
+                l.ast_debug(w);
+                w.write(" ");
+                op.ast_debug(w);
+                w.write(" ");
+                r.ast_debug(w)
+            }
+            E::Borrow(mut_, e, f, from_unpack) => {
+                w.write("&");
+                if from_unpack.is_some() {
+                    w.write("#from_unpack ");
+                }
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+                w.write(&format!(".{}", f));
+            }
+            E::BorrowLocal(mut_, v) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                v.ast_debug(w);
+            }
+            E::Cast(e, bt) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" as ");
+                bt.ast_debug(w);
+                w.write(")");
+            }
+            E::Spec(u, used_locals) => {
+                w.write(&format!("spec #{}", u));
+                if !used_locals.is_empty() {
+                    w.write("uses [");
+                    w.comma(used_locals, |w, (n, st)| w.annotate(|w| n.ast_debug(w), st));
+                    w.write("]");
+                }
+            }
+            E::UnresolvedError => w.write("_|_"),
+            E::Unreachable => w.write("unreachable"),
+        }
+    }
+}
+
+impl AstDebug for ModuleCall {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleCall {
+            module,
+            name,
+            type_arguments,
+            arguments,
+        } = self;
+        w.write(&format!("{}::{}", module, name));
+        w.write("<");
+        type_arguments.ast_debug(w);
+        w.write(">");
+        w.write("(");
+        arguments.ast_debug(w);
+        w.write(")");
+    }
+}
+
+impl AstDebug for Vec<LValue> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, a| a.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for LValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use LValue_ as L;
+        match self {
+            L::Ignore => w.write("_"),
+            L::Var(v, st) => {
+                w.write("(");
+                v.ast_debug(w);
+                w.write(": ");
+                st.ast_debug(w);
+                w.write(")");
+            }
+            L::Unpack(s, tys, fields) => {
+                w.write(&format!("{}", s));
+                w.write("<");
+                tys.ast_debug(w);
+                w.write(">");
+                w.write("{");
+                w.comma(fields, |w, (f, l)| {
+                    w.write(&format!("{}: ", f));
+                    l.ast_debug(w)
+                });
+                w.write("}");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/hlir/mod.rs b/vendors/move/crates/move-compiler/src/hlir/mod.rs
new file mode 100644
index 000000000..4495e8fce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/hlir/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod ast;
+pub(crate) mod translate;
diff --git a/vendors/move/crates/move-compiler/src/hlir/translate.rs b/vendors/move/crates/move-compiler/src/hlir/translate.rs
new file mode 100644
index 000000000..6ab789ce4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/hlir/translate.rs
@@ -0,0 +1,2073 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag,
+    editions::Flavor,
+    expansion::ast::{self as E, Fields, ModuleIdent},
+    hlir::ast::{self as H, Block, MoveOpAnnotation},
+    naming::ast as N,
+    parser::ast::{Ability_, BinOp_, ConstantName, Field, FunctionName, StructName},
+    shared::{ast_debug::AstDebug, unique_map::UniqueMap, *},
+    sui_mode::ID_FIELD_NAME,
+    typing::ast as T,
+    FullyCompiledProgram,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    convert::TryInto,
+};
+
+//**************************************************************************************************
+// Vars
+//**************************************************************************************************
+
+const NEW_NAME_DELIM: &str = "#";
+
+fn translate_var(sp!(loc, v_): N::Var) -> H::Var {
+    let N::Var_ {
+        name,
+        id: depth,
+        color,
+    } = v_;
+    let s = format!(
+        "{}{}{}{}{}",
+        name, NEW_NAME_DELIM, depth, NEW_NAME_DELIM, color
+    )
+    .into();
+    H::Var(sp(loc, s))
+}
+
+const TEMP_PREFIX: &str = "%";
+static TEMP_PREFIX_SYMBOL: Lazy<Symbol> = Lazy::new(|| TEMP_PREFIX.into());
+
+fn new_temp_name(context: &mut Context) -> Symbol {
+    format!(
+        "{}{}{}",
+        *TEMP_PREFIX_SYMBOL,
+        NEW_NAME_DELIM,
+        context.counter_next()
+    )
+    .into()
+}
+
+pub fn is_temp_name(s: Symbol) -> bool {
+    s.starts_with(TEMP_PREFIX)
+}
+
+pub enum DisplayVar {
+    Orig(String),
+    Tmp,
+}
+
+pub fn display_var(s: Symbol) -> DisplayVar {
+    if is_temp_name(s) {
+        DisplayVar::Tmp
+    } else {
+        let mut orig = s.as_str().to_string();
+        if let Some(i) = orig.find(NEW_NAME_DELIM) {
+            orig.truncate(i)
+        }
+        DisplayVar::Orig(orig)
+    }
+}
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+    current_package: Option<Symbol>,
+    structs: UniqueMap<ModuleIdent, UniqueMap<StructName, UniqueMap<Field, usize>>>,
+    function_locals: UniqueMap<H::Var, H::SingleType>,
+    signature: Option<H::FunctionSignature>,
+    tmp_counter: usize,
+    /// collects all struct fields used in the current module
+    pub used_fields: BTreeMap<Symbol, BTreeSet<Symbol>>,
+}
+
+impl<'env> Context<'env> {
+    pub fn new(
+        env: &'env mut CompilationEnv,
+        pre_compiled_lib_opt: Option<&FullyCompiledProgram>,
+        prog: &T::Program_,
+    ) -> Self {
+        fn add_struct_fields(
+            structs: &mut UniqueMap<ModuleIdent, UniqueMap<StructName, UniqueMap<Field, usize>>>,
+            mident: ModuleIdent,
+            struct_defs: &UniqueMap<StructName, N::StructDefinition>,
+        ) {
+            let mut cur_structs = UniqueMap::new();
+            for (sname, sdef) in struct_defs.key_cloned_iter() {
+                let mut fields = UniqueMap::new();
+                let field_map = match &sdef.fields {
+                    N::StructFields::Native(_) => continue,
+                    N::StructFields::Defined(m) => m,
+                };
+                for (field, (idx, _)) in field_map.key_cloned_iter() {
+                    fields.add(field, *idx).unwrap();
+                }
+                cur_structs.add(sname, fields).unwrap();
+            }
+            structs.remove(&mident);
+            structs.add(mident, cur_structs).unwrap();
+        }
+
+        let mut structs = UniqueMap::new();
+        if let Some(pre_compiled_lib) = pre_compiled_lib_opt {
+            for (mident, mdef) in pre_compiled_lib.typing.inner.modules.key_cloned_iter() {
+                add_struct_fields(&mut structs, mident, &mdef.structs)
+            }
+        }
+        for (mident, mdef) in prog.modules.key_cloned_iter() {
+            add_struct_fields(&mut structs, mident, &mdef.structs)
+        }
+        Context {
+            env,
+            current_package: None,
+            structs,
+            function_locals: UniqueMap::new(),
+            signature: None,
+            tmp_counter: 0,
+            used_fields: BTreeMap::new(),
+        }
+    }
+
+    pub fn has_empty_locals(&self) -> bool {
+        self.function_locals.is_empty()
+    }
+
+    pub fn extract_function_locals(&mut self) -> UniqueMap<H::Var, H::SingleType> {
+        self.tmp_counter = 0;
+        std::mem::replace(&mut self.function_locals, UniqueMap::new())
+    }
+
+    pub fn new_temp(&mut self, loc: Loc, t: H::SingleType) -> H::Var {
+        let new_var = H::Var(sp(loc, new_temp_name(self)));
+        self.function_locals.add(new_var, t).unwrap();
+
+        new_var
+    }
+
+    pub fn bind_local(&mut self, v: N::Var, t: H::SingleType) {
+        let symbol = translate_var(v);
+        self.function_locals.add(symbol, t).unwrap();
+    }
+
+    pub fn fields(
+        &self,
+        module: &ModuleIdent,
+        struct_name: &StructName,
+    ) -> Option<&UniqueMap<Field, usize>> {
+        let fields = self
+            .structs
+            .get(module)
+            .and_then(|structs| structs.get(struct_name));
+        // if fields are none, the struct must be defined in another module,
+        // in that case, there should be errors
+        assert!(fields.is_some() || self.env.has_errors());
+        fields
+    }
+
+    fn counter_next(&mut self) -> usize {
+        self.tmp_counter += 1;
+        self.tmp_counter
+    }
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: T::Program,
+) -> H::Program {
+    let mut context = Context::new(compilation_env, pre_compiled_lib, &prog.inner);
+    let T::Program_ {
+        modules: tmodules,
+        scripts: tscripts,
+    } = prog.inner;
+    let modules = modules(&mut context, tmodules);
+    let scripts = scripts(&mut context, tscripts);
+
+    H::Program { modules, scripts }
+}
+
+fn modules(
+    context: &mut Context,
+    modules: UniqueMap<ModuleIdent, T::ModuleDefinition>,
+) -> UniqueMap<ModuleIdent, H::ModuleDefinition> {
+    let hlir_modules = modules
+        .into_iter()
+        .map(|(mname, m)| module(context, mname, m));
+    UniqueMap::maybe_from_iter(hlir_modules).unwrap()
+}
+
+fn module(
+    context: &mut Context,
+    module_ident: ModuleIdent,
+    mdef: T::ModuleDefinition,
+) -> (ModuleIdent, H::ModuleDefinition) {
+    let T::ModuleDefinition {
+        loc: _,
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        dependency_order,
+        immediate_neighbors: _,
+        used_addresses: _,
+        friends,
+        structs: tstructs,
+        functions: tfunctions,
+        constants: tconstants,
+        spec_dependencies: _,
+    } = mdef;
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let structs = tstructs.map(|name, s| struct_def(context, name, s));
+
+    let constants = tconstants.map(|name, c| constant(context, name, c));
+    let functions = tfunctions.map(|name, f| function(context, name, f));
+
+    gen_unused_warnings(context, is_source_module, &structs);
+
+    context.current_package = None;
+    context.env.pop_warning_filter_scope();
+    (
+        module_ident,
+        H::ModuleDefinition {
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            dependency_order,
+            friends,
+            structs,
+            constants,
+            functions,
+        },
+    )
+}
+
+fn scripts(
+    context: &mut Context,
+    tscripts: BTreeMap<Symbol, T::Script>,
+) -> BTreeMap<Symbol, H::Script> {
+    tscripts
+        .into_iter()
+        .map(|(n, s)| (n, script(context, s)))
+        .collect()
+}
+
+fn script(context: &mut Context, tscript: T::Script) -> H::Script {
+    let T::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        immediate_neighbors: _,
+        used_addresses: _,
+        constants: tconstants,
+        function_name,
+        function: tfunction,
+        spec_dependencies: _,
+    } = tscript;
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let constants = tconstants.map(|name, c| constant(context, name, c));
+    let function = function(context, function_name, tfunction);
+    context.current_package = None;
+    context.env.pop_warning_filter_scope();
+    H::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        constants,
+        function_name,
+        function,
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function(context: &mut Context, _name: FunctionName, f: T::Function) -> H::Function {
+    assert!(context.has_empty_locals());
+    assert!(context.tmp_counter == 0);
+    let T::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility: evisibility,
+        entry,
+        signature,
+        body,
+    } = f;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let signature = function_signature(context, signature);
+    let body = function_body(context, &signature, body);
+    context.env.pop_warning_filter_scope();
+    H::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility: visibility(evisibility),
+        entry,
+        signature,
+        body,
+    }
+}
+
+fn function_signature(context: &mut Context, sig: N::FunctionSignature) -> H::FunctionSignature {
+    let type_parameters = sig.type_parameters;
+    let parameters = sig
+        .parameters
+        .into_iter()
+        .map(|(_, v, tty)| {
+            let ty = single_type(context, tty);
+            context.bind_local(v, ty.clone());
+            (translate_var(v), ty)
+        })
+        .collect();
+    let return_type = type_(context, sig.return_type);
+    H::FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    }
+}
+
+fn function_body(
+    context: &mut Context,
+    sig: &H::FunctionSignature,
+    sp!(loc, tb_): T::FunctionBody,
+) -> H::FunctionBody {
+    use H::FunctionBody_ as HB;
+    use T::FunctionBody_ as TB;
+    let b_ = match tb_ {
+        TB::Native => {
+            context.extract_function_locals();
+            HB::Native
+        }
+        TB::Defined(seq) => {
+            let (locals, body) = function_body_defined(context, sig, loc, seq);
+            HB::Defined { locals, body }
+        }
+    };
+    sp(loc, b_)
+}
+
+fn function_body_defined(
+    context: &mut Context,
+    signature: &H::FunctionSignature,
+    loc: Loc,
+    seq: T::Sequence,
+) -> (UniqueMap<H::Var, H::SingleType>, Block) {
+    let mut body = VecDeque::new();
+    context.signature = Some(signature.clone());
+    let final_exp = block(context, &mut body, loc, Some(&signature.return_type), seq);
+    match &final_exp.exp.value {
+        H::UnannotatedExp_::Unreachable => (),
+        _ => {
+            use H::{Command_ as C, Statement_ as S};
+            let eloc = final_exp.exp.loc;
+            let ret = sp(
+                eloc,
+                C::Return {
+                    from_user: false,
+                    exp: final_exp,
+                },
+            );
+            body.push_back(sp(eloc, S::Command(ret)))
+        }
+    }
+    let locals = context.extract_function_locals();
+    check_trailing_unit(context, &mut body);
+    context.signature = None;
+    (locals, body)
+}
+
+fn visibility(evisibility: E::Visibility) -> H::Visibility {
+    match evisibility {
+        E::Visibility::Internal => H::Visibility::Internal,
+        E::Visibility::Friend(loc) => H::Visibility::Friend(loc),
+        // We added any friends we needed during typing, so we convert this over.
+        E::Visibility::Package(loc) => H::Visibility::Friend(loc),
+        E::Visibility::Public(loc) => H::Visibility::Public(loc),
+    }
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+fn constant(context: &mut Context, _name: ConstantName, cdef: T::Constant) -> H::Constant {
+    let T::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature: tsignature,
+        value: tvalue,
+    } = cdef;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let signature = base_type(context, tsignature);
+    let eloc = tvalue.exp.loc;
+    let tseq = {
+        let mut v = T::Sequence::new();
+        v.push_back(sp(eloc, T::SequenceItem_::Seq(Box::new(tvalue))));
+        v
+    };
+    let function_signature = H::FunctionSignature {
+        type_parameters: vec![],
+        parameters: vec![],
+        return_type: H::Type_::base(signature.clone()),
+    };
+    let (locals, body) = function_body_defined(context, &function_signature, eloc, tseq);
+    context.env.pop_warning_filter_scope();
+    H::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value: (locals, body),
+    }
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_def(
+    context: &mut Context,
+    _name: StructName,
+    sdef: N::StructDefinition,
+) -> H::StructDefinition {
+    let N::StructDefinition {
+        warning_filter,
+        index,
+        attributes,
+        abilities,
+        type_parameters,
+        fields,
+    } = sdef;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let fields = struct_fields(context, fields);
+    context.env.pop_warning_filter_scope();
+    H::StructDefinition {
+        warning_filter,
+        index,
+        attributes,
+        abilities,
+        type_parameters,
+        fields,
+    }
+}
+
+fn struct_fields(context: &mut Context, tfields: N::StructFields) -> H::StructFields {
+    let tfields_map = match tfields {
+        N::StructFields::Native(loc) => return H::StructFields::Native(loc),
+        N::StructFields::Defined(m) => m,
+    };
+    let mut indexed_fields = tfields_map
+        .into_iter()
+        .map(|(f, (idx, t))| (idx, (f, base_type(context, t))))
+        .collect::<Vec<_>>();
+    indexed_fields.sort_by(|(idx1, _), (idx2, _)| idx1.cmp(idx2));
+    H::StructFields::Defined(indexed_fields.into_iter().map(|(_, f_ty)| f_ty).collect())
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn type_name(_context: &Context, sp!(loc, ntn_): N::TypeName) -> H::TypeName {
+    use H::TypeName_ as HT;
+    use N::TypeName_ as NT;
+    let tn_ = match ntn_ {
+        NT::Multiple(_) => panic!(
+            "ICE type constraints failed {}:{}-{}",
+            loc.file_hash(),
+            loc.start(),
+            loc.end()
+        ),
+        NT::Builtin(bt) => HT::Builtin(bt),
+        NT::ModuleType(m, s) => HT::ModuleType(m, s),
+    };
+    sp(loc, tn_)
+}
+
+fn base_types<R: std::iter::FromIterator<H::BaseType>>(
+    context: &Context,
+    tys: impl IntoIterator<Item = N::Type>,
+) -> R {
+    tys.into_iter().map(|t| base_type(context, t)).collect()
+}
+
+fn base_type(context: &Context, sp!(loc, nb_): N::Type) -> H::BaseType {
+    use H::BaseType_ as HB;
+    use N::Type_ as NT;
+    let b_ = match nb_ {
+        NT::Var(_) => panic!(
+            "ICE tvar not expanded: {}:{}-{}",
+            loc.file_hash(),
+            loc.start(),
+            loc.end()
+        ),
+        NT::Apply(None, n, tys) => {
+            NT::Apply(None, n, tys).print_verbose();
+            panic!("ICE kind not expanded: {:#?}", loc)
+        }
+        NT::Apply(Some(k), n, nbs) => HB::Apply(k, type_name(context, n), base_types(context, nbs)),
+        NT::Param(tp) => HB::Param(tp),
+        NT::UnresolvedError => HB::UnresolvedError,
+        NT::Anything => HB::Unreachable,
+        NT::Ref(_, _) | NT::Unit => {
+            panic!(
+                "ICE type constraints failed {}:{}-{}",
+                loc.file_hash(),
+                loc.start(),
+                loc.end()
+            )
+        }
+    };
+    sp(loc, b_)
+}
+
+fn expected_types(context: &Context, loc: Loc, nss: Vec<Option<N::Type>>) -> H::Type {
+    let any = || {
+        sp(
+            loc,
+            H::SingleType_::Base(sp(loc, H::BaseType_::UnresolvedError)),
+        )
+    };
+    let ss = nss
+        .into_iter()
+        .map(|sopt| sopt.map(|s| single_type(context, s)).unwrap_or_else(any))
+        .collect::<Vec<_>>();
+    H::Type_::from_vec(loc, ss)
+}
+
+fn single_types(context: &Context, ss: Vec<N::Type>) -> Vec<H::SingleType> {
+    ss.into_iter().map(|s| single_type(context, s)).collect()
+}
+
+fn single_type(context: &Context, sp!(loc, ty_): N::Type) -> H::SingleType {
+    use H::SingleType_ as HS;
+    use N::Type_ as NT;
+    let s_ = match ty_ {
+        NT::Ref(mut_, nb) => HS::Ref(mut_, base_type(context, *nb)),
+        _ => HS::Base(base_type(context, sp(loc, ty_))),
+    };
+    sp(loc, s_)
+}
+
+fn type_(context: &Context, sp!(loc, ty_): N::Type) -> H::Type {
+    use H::Type_ as HT;
+    use N::{TypeName_ as TN, Type_ as NT};
+    let t_ = match ty_ {
+        NT::Unit => HT::Unit,
+        NT::Apply(None, n, tys) => {
+            NT::Apply(None, n, tys).print_verbose();
+            panic!("ICE kind not expanded: {:#?}", loc)
+        }
+        NT::Apply(Some(_), sp!(_, TN::Multiple(_)), ss) => HT::Multiple(single_types(context, ss)),
+        _ => HT::Single(single_type(context, sp(loc, ty_))),
+    };
+    sp(loc, t_)
+}
+
+//**************************************************************************************************
+// Statements
+//**************************************************************************************************
+
+fn block(
+    context: &mut Context,
+    result: &mut Block,
+    loc: Loc,
+    expected_type_opt: Option<&H::Type>,
+    mut seq: T::Sequence,
+) -> H::Exp {
+    use T::SequenceItem_ as S;
+    let last = match seq.pop_back() {
+        None => {
+            return H::exp(
+                sp(loc, H::Type_::Unit),
+                sp(
+                    loc,
+                    H::UnannotatedExp_::Unit {
+                        case: H::UnitCase::FromUser,
+                    },
+                ),
+            )
+        }
+        Some(sp!(_, S::Seq(last))) => last,
+        Some(_) => panic!("ICE last sequence item should be exp"),
+    };
+
+    for sp!(sloc, seq_item_) in seq {
+        match seq_item_ {
+            S::Seq(te) => statement(context, result, *te),
+            S::Declare(binds) => declare_bind_list(context, &binds),
+            S::Bind(binds, ty, e) => {
+                let expected_tys = expected_types(context, sloc, ty);
+                let res = exp(context, result, Some(&expected_tys), *e);
+                declare_bind_list(context, &binds);
+                assign_command(context, result, sloc, binds, *res);
+            }
+        }
+    }
+    exp_(context, result, expected_type_opt, *last)
+}
+
+fn statement(context: &mut Context, result: &mut Block, e: T::Exp) {
+    use H::Statement_ as S;
+    use T::UnannotatedExp_ as TE;
+
+    let ty = e.ty;
+    let sp!(eloc, e_) = e.exp;
+    let stmt_ = match e_ {
+        TE::IfElse(tb, tt, tf) => {
+            let cond = exp(context, result, None, *tb);
+
+            let mut if_block = Block::new();
+            let et = exp_(context, &mut if_block, None, *tt);
+            ignore_and_pop(&mut if_block, et);
+
+            let mut else_block = Block::new();
+            let ef = exp_(context, &mut else_block, None, *tf);
+            ignore_and_pop(&mut else_block, ef);
+
+            S::IfElse {
+                cond,
+                if_block,
+                else_block,
+            }
+        }
+        TE::While(tb, loop_body) => {
+            let mut cond_block = Block::new();
+            let cond_exp = exp(context, &mut cond_block, None, *tb);
+
+            let mut loop_block = Block::new();
+            let el = exp_(context, &mut loop_block, None, *loop_body);
+            ignore_and_pop(&mut loop_block, el);
+
+            S::While {
+                cond: (cond_block, cond_exp),
+                block: loop_block,
+            }
+        }
+        TE::Loop {
+            body: loop_body,
+            has_break,
+        } => {
+            let loop_block = statement_loop_body(context, *loop_body);
+
+            S::Loop {
+                block: loop_block,
+                has_break,
+            }
+        }
+        TE::Block(seq) => {
+            let res = block(context, result, eloc, None, seq);
+            ignore_and_pop(result, res);
+            return;
+        }
+        e_ => {
+            let te = T::exp(ty, sp(eloc, e_));
+            let e = exp_(context, result, None, te);
+            ignore_and_pop(result, e);
+            return;
+        }
+    };
+    result.push_back(sp(eloc, stmt_))
+}
+
+fn statement_loop_body(context: &mut Context, body: T::Exp) -> Block {
+    let mut loop_block = Block::new();
+    let el = exp_(context, &mut loop_block, None, body);
+    ignore_and_pop(&mut loop_block, el);
+    loop_block
+}
+
+//**************************************************************************************************
+// LValue
+//**************************************************************************************************
+
+fn declare_bind_list(context: &mut Context, sp!(_, binds): &T::LValueList) {
+    binds.iter().for_each(|b| declare_bind(context, b))
+}
+
+fn declare_bind(context: &mut Context, sp!(_, bind_): &T::LValue) {
+    use T::LValue_ as L;
+    match bind_ {
+        L::Ignore => (),
+        L::Var { var: v, ty, .. } => {
+            let st = single_type(context, *ty.clone());
+            context.bind_local(*v, st)
+        }
+        L::Unpack(_, _, _, fields) | L::BorrowUnpack(_, _, _, _, fields) => fields
+            .iter()
+            .for_each(|(_, _, (_, (_, b)))| declare_bind(context, b)),
+    }
+}
+
+fn assign_command(
+    context: &mut Context,
+    result: &mut Block,
+    loc: Loc,
+    sp!(_, assigns): T::LValueList,
+    rvalue: H::Exp,
+) {
+    use H::{Command_ as C, Statement_ as S};
+    let mut lvalues = vec![];
+    let mut after = Block::new();
+    for (idx, a) in assigns.into_iter().enumerate() {
+        let a_ty = rvalue.ty.value.type_at_index(idx);
+        let (ls, mut af) = assign(context, a, a_ty);
+
+        lvalues.push(ls);
+        after.append(&mut af);
+    }
+    result.push_back(sp(loc, S::Command(sp(loc, C::Assign(lvalues, rvalue)))));
+    result.append(&mut after);
+}
+
+fn assign(
+    context: &mut Context,
+    sp!(loc, ta_): T::LValue,
+    rvalue_ty: &H::SingleType,
+) -> (H::LValue, Block) {
+    use H::{LValue_ as L, UnannotatedExp_ as E};
+    use T::LValue_ as A;
+    let mut after = Block::new();
+    let l_ = match ta_ {
+        A::Ignore => L::Ignore,
+        A::Var { var: v, ty: st, .. } => {
+            L::Var(translate_var(v), Box::new(single_type(context, *st)))
+        }
+        A::Unpack(m, s, tbs, tfields) => {
+            // all fields of an unpacked struct type are used
+            context
+                .used_fields
+                .entry(s.value())
+                .or_default()
+                .extend(tfields.iter().map(|(_, s, _)| *s));
+
+            let bs = base_types(context, tbs);
+
+            let mut fields = vec![];
+            for (decl_idx, f, bt, tfa) in assign_fields(context, &m, &s, tfields) {
+                assert!(fields.len() == decl_idx);
+                let st = &H::SingleType_::base(bt);
+                let (fa, mut fafter) = assign(context, tfa, st);
+                after.append(&mut fafter);
+                fields.push((f, fa))
+            }
+            L::Unpack(s, bs, fields)
+        }
+        A::BorrowUnpack(mut_, m, s, _tss, tfields) => {
+            // all fields of an unpacked struct type are used
+            context
+                .used_fields
+                .entry(s.value())
+                .or_default()
+                .extend(tfields.iter().map(|(_, s, _)| *s));
+
+            let tmp = context.new_temp(loc, rvalue_ty.clone());
+            let copy_tmp = || {
+                let copy_tmp_ = E::Copy {
+                    from_user: false,
+                    var: tmp,
+                };
+                H::exp(H::Type_::single(rvalue_ty.clone()), sp(loc, copy_tmp_))
+            };
+            let from_unpack = Some(loc);
+            let fields = assign_fields(context, &m, &s, tfields)
+                .into_iter()
+                .enumerate();
+            for (idx, (decl_idx, f, bt, tfa)) in fields {
+                assert!(idx == decl_idx);
+                let floc = tfa.loc;
+                let borrow_ = E::Borrow(mut_, Box::new(copy_tmp()), f, from_unpack);
+                let borrow_ty = H::Type_::single(sp(floc, H::SingleType_::Ref(mut_, bt)));
+                let borrow = H::exp(borrow_ty, sp(floc, borrow_));
+                assign_command(context, &mut after, floc, sp(floc, vec![tfa]), borrow);
+            }
+            L::Var(tmp, Box::new(rvalue_ty.clone()))
+        }
+    };
+    (sp(loc, l_), after)
+}
+
+fn assign_fields(
+    context: &Context,
+    m: &ModuleIdent,
+    s: &StructName,
+    tfields: Fields<(N::Type, T::LValue)>,
+) -> Vec<(usize, Field, H::BaseType, T::LValue)> {
+    let decl_fields = context.fields(m, s);
+    let mut count = 0;
+    let mut decl_field = |f: &Field| -> usize {
+        match decl_fields {
+            Some(m) => *m.get(f).unwrap(),
+            None => {
+                // none can occur with errors in typing
+                let i = count;
+                count += 1;
+                i
+            }
+        }
+    };
+    let mut tfields_vec = tfields
+        .into_iter()
+        .map(|(f, (_idx, (tbt, tfa)))| (decl_field(&f), f, base_type(context, tbt), tfa))
+        .collect::<Vec<_>>();
+    tfields_vec.sort_by(|(idx1, _, _, _), (idx2, _, _, _)| idx1.cmp(idx2));
+    tfields_vec
+}
+
+//**************************************************************************************************
+// Commands
+//**************************************************************************************************
+
+fn ignore_and_pop(result: &mut Block, e: H::Exp) {
+    match &e.exp.value {
+        H::UnannotatedExp_::Unreachable => (),
+        _ => {
+            let pop_num = match &e.ty.value {
+                H::Type_::Unit => 0,
+                H::Type_::Single(_) => 1,
+                H::Type_::Multiple(tys) => tys.len(),
+            };
+            let loc = e.exp.loc;
+            let c = sp(loc, H::Command_::IgnoreAndPop { pop_num, exp: e });
+            result.push_back(sp(loc, H::Statement_::Command(c)))
+        }
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn exp(
+    context: &mut Context,
+    result: &mut Block,
+    expected_type_opt: Option<&H::Type>,
+    te: T::Exp,
+) -> Box<H::Exp> {
+    Box::new(exp_(context, result, expected_type_opt, te))
+}
+
+fn exp_(
+    context: &mut Context<'_>,
+    result: &mut Block,
+    initial_expected_type_opt: Option<&H::Type>,
+    initial_e: T::Exp,
+) -> H::Exp {
+    use std::{cell::RefCell, rc::Rc};
+
+    struct Stack<'a, 'env> {
+        frames: Vec<Box<dyn FnOnce(&mut Self)>>,
+        operands: Vec<H::Exp>,
+        context: &'a mut Context<'env>,
+    }
+
+    macro_rules! inner {
+        ($block:expr, $exp_ty_opt:expr, $e:expr) => {{
+            let e_result = $block.clone();
+            let e_exp_ty_opt = $exp_ty_opt;
+            move |s: &mut Stack| exp_loop(s, e_result, e_exp_ty_opt, $e)
+        }};
+    }
+
+    fn maybe_freeze(
+        context: &mut Context,
+        result: &mut Block,
+        expected_type_opt: Option<H::Type>,
+        e: H::Exp,
+    ) -> H::Exp {
+        match (&e.exp.value, expected_type_opt.as_ref()) {
+            (H::UnannotatedExp_::Unreachable, _) => e,
+            (_, Some(exty)) if needs_freeze(context, &e.ty, exty) != Freeze::NotNeeded => {
+                freeze(context, result, exty, e)
+            }
+            _ => e,
+        }
+    }
+
+    fn exp_loop(
+        stack: &mut Stack,
+        result: Rc<RefCell<Block>>,
+        cur_expected_type_opt: Option<H::Type>,
+        cur: Box<T::Exp>,
+    ) {
+        use H::{Statement_ as S, UnannotatedExp_ as HE};
+        use T::UnannotatedExp_ as TE;
+
+        let (tty, sp!(loc, cur_)) = (cur.ty, cur.exp);
+        let ty = type_(stack.context, tty);
+        match cur_ {
+            //***********************************************
+            // Stack-ified traversal
+            //***********************************************
+            TE::IfElse(cond, if_true, if_false) => {
+                let f_cond = inner!(result, None, cond);
+
+                let if_block = Rc::new(RefCell::new(Block::new()));
+                let f_if = inner!(if_block, Some(ty.clone()), if_true);
+
+                let else_block = Rc::new(RefCell::new(Block::new()));
+                let f_else = inner!(else_block, Some(ty.clone()), if_false);
+
+                let f_if_else = move |s: &mut Stack| {
+                    let ef = s.operands.pop().unwrap();
+                    let et = s.operands.pop().unwrap();
+                    let cond = Box::new(s.operands.pop().unwrap());
+
+                    let mut if_block = Rc::try_unwrap(if_block).unwrap().into_inner();
+                    let mut else_block = Rc::try_unwrap(else_block).unwrap().into_inner();
+                    let result = &mut *result.borrow_mut();
+
+                    let e_ = match (&et.exp.value, &ef.exp.value) {
+                        (HE::Unreachable, HE::Unreachable) => {
+                            let s_ = S::IfElse {
+                                cond,
+                                if_block,
+                                else_block,
+                            };
+                            result.push_back(sp(loc, s_));
+                            HE::Unreachable
+                        }
+                        _ => {
+                            let tmps = make_temps(s.context, loc, ty.clone());
+                            let tres = bind_exp_(&mut if_block, loc, tmps.clone(), et);
+                            let fres = bind_exp_(&mut else_block, loc, tmps, ef);
+                            let s_ = S::IfElse {
+                                cond,
+                                if_block,
+                                else_block,
+                            };
+                            result.push_back(sp(loc, s_));
+                            match (tres, fres) {
+                                (HE::Unreachable, HE::Unreachable) => unreachable!(),
+                                (HE::Unreachable, res) | (res, HE::Unreachable) | (res, _) => res,
+                            }
+                        }
+                    };
+                    let e_res = H::exp(ty, sp(loc, e_));
+                    // each branch is frozen so no need to freeze
+                    s.operands.push(e_res)
+                };
+
+                stack.frames.push(Box::new(f_if_else));
+                stack.frames.push(Box::new(f_else));
+                stack.frames.push(Box::new(f_if));
+                stack.frames.push(Box::new(f_cond));
+            }
+            TE::BinopExp(lhs, op, toperand_ty, rhs) => {
+                let operand_exp_ty_opt = match &op.value {
+                    BinOp_::And if bind_for_short_circuit(&rhs) => {
+                        let tfalse_ = sp(loc, TE::Value(sp(loc, E::Value_::Bool(false))));
+                        let tfalse = Box::new(T::exp(N::Type_::bool(loc), tfalse_));
+                        let if_else_ = sp(loc, TE::IfElse(lhs, rhs, tfalse));
+                        let if_else = Box::new(T::exp(N::Type_::bool(ty.loc), if_else_));
+                        return exp_loop(stack, result, cur_expected_type_opt, if_else);
+                    }
+                    BinOp_::Or if bind_for_short_circuit(&rhs) => {
+                        let ttrue_ = sp(loc, TE::Value(sp(loc, E::Value_::Bool(true))));
+                        let ttrue = Box::new(T::exp(N::Type_::bool(loc), ttrue_));
+                        let if_else_ = sp(loc, TE::IfElse(lhs, ttrue, rhs));
+                        let if_else = Box::new(T::exp(N::Type_::bool(ty.loc), if_else_));
+                        return exp_loop(stack, result, cur_expected_type_opt, if_else);
+                    }
+                    BinOp_::Eq | BinOp_::Neq => {
+                        let operand_ty = type_(stack.context, *toperand_ty);
+                        Some(freeze_ty(operand_ty))
+                    }
+                    _ => None,
+                };
+
+                let f_lhs = inner!(result, operand_exp_ty_opt.clone(), lhs);
+                let f_rhs = inner!(result, operand_exp_ty_opt, rhs);
+                let f_binop = move |s: &mut Stack| {
+                    let rhs = Box::new(s.operands.pop().unwrap());
+                    let lhs = Box::new(s.operands.pop().unwrap());
+
+                    let result = &mut *result.borrow_mut();
+
+                    let e_res = H::exp(ty, sp(loc, HE::BinopExp(lhs, op, rhs)));
+                    let e_res = maybe_freeze(s.context, result, cur_expected_type_opt, e_res);
+                    s.operands.push(e_res)
+                };
+                stack.frames.push(Box::new(f_binop));
+                stack.frames.push(Box::new(f_rhs));
+                stack.frames.push(Box::new(f_lhs));
+            }
+            TE::Builtin(bt, arguments)
+                if matches!(&*bt, sp!(_, T::BuiltinFunction_::Assert(false))) =>
+            {
+                let tbool = N::Type_::bool(loc);
+                let tu64 = N::Type_::u64(loc);
+                let tunit = sp(loc, N::Type_::Unit);
+                // name guaranteed to be unique, so we can skip the depth/color
+                let vcond_ = N::Var_ {
+                    name: new_temp_name(stack.context),
+                    id: 0,
+                    color: 0,
+                };
+                let vcode_ = N::Var_ {
+                    name: new_temp_name(stack.context),
+                    id: 0,
+                    color: 0,
+                };
+                let vcond = sp(loc, vcond_);
+                let vcode = sp(loc, vcode_);
+
+                let mut stmts = VecDeque::new();
+
+                let bvar = |v, st| {
+                    let var_ = T::LValue_::Var {
+                        var: v,
+                        ty: st,
+                        unused_binding: false,
+                    };
+                    sp(loc, var_)
+                };
+                let bind_list = sp(
+                    loc,
+                    vec![
+                        bvar(vcond, Box::new(tbool.clone())),
+                        bvar(vcode, Box::new(tu64.clone())),
+                    ],
+                );
+                let tys = vec![Some(tbool.clone()), Some(tu64.clone())];
+                let bind = sp(loc, T::SequenceItem_::Bind(bind_list, tys, arguments));
+                stmts.push_back(bind);
+
+                let mvar = |var, st| {
+                    let from_user = false;
+                    let mv = TE::Move { from_user, var };
+                    T::exp(st, sp(loc, mv))
+                };
+                let econd = mvar(vcond, tu64);
+                let ecode = mvar(vcode, tbool);
+                let eabort = T::exp(tunit.clone(), sp(loc, TE::Abort(Box::new(ecode))));
+                let eunit = T::exp(tunit.clone(), sp(loc, TE::Unit { trailing: false }));
+                let inlined_ = TE::IfElse(Box::new(econd), Box::new(eunit), Box::new(eabort));
+                let inlined = T::exp(tunit.clone(), sp(loc, inlined_));
+                stmts.push_back(sp(loc, T::SequenceItem_::Seq(Box::new(inlined))));
+
+                let block = T::exp(tunit, sp(loc, TE::Block(stmts)));
+                exp_loop(stack, result, cur_expected_type_opt, Box::new(block));
+            }
+            TE::Builtin(bt, arguments)
+                if matches!(&*bt, sp!(_, T::BuiltinFunction_::Assert(true))) =>
+            {
+                use T::ExpListItem as TI;
+                let tunit = sp(loc, N::Type_::Unit);
+                let [cond_item, code_item]: [TI; 2] = match arguments.exp.value {
+                    TE::ExpList(arg_list) => arg_list.try_into().unwrap(),
+                    _ => panic!("ICE type checking failed"),
+                };
+                let (econd, ecode) = match (cond_item, code_item) {
+                    (TI::Single(econd, _), TI::Single(ecode, _)) => (econd, ecode),
+                    _ => panic!("ICE type checking failed"),
+                };
+                let eabort = T::exp(tunit.clone(), sp(loc, TE::Abort(Box::new(ecode))));
+                let eunit = T::exp(tunit.clone(), sp(loc, TE::Unit { trailing: false }));
+                let if_else_ = TE::IfElse(Box::new(econd), Box::new(eunit), Box::new(eabort));
+                let if_else = T::exp(tunit, sp(loc, if_else_));
+                exp_loop(stack, result, cur_expected_type_opt, Box::new(if_else));
+            }
+            te_ => {
+                let result = &mut *result.borrow_mut();
+                let e_res = exp_impl(stack.context, result, ty, loc, te_);
+                let e_res = maybe_freeze(stack.context, result, cur_expected_type_opt, e_res);
+                stack.operands.push(e_res)
+            }
+        }
+    }
+
+    let mut stack = Stack {
+        frames: vec![],
+        operands: vec![],
+        context,
+    };
+    let rc_result = Rc::new(RefCell::new(std::mem::take(result)));
+    exp_loop(
+        &mut stack,
+        rc_result.clone(),
+        initial_expected_type_opt.cloned(),
+        Box::new(initial_e),
+    );
+    while let Some(f) = stack.frames.pop() {
+        f(&mut stack)
+    }
+    let e_res = stack.operands.pop().unwrap();
+    assert!(stack.frames.is_empty());
+    assert!(stack.operands.is_empty());
+    *result = Rc::try_unwrap(rc_result).unwrap().into_inner();
+    e_res
+}
+
+fn exp_list(
+    context: &mut Context,
+    result: &mut Block,
+    ty: Option<&H::Type>,
+    e: T::Exp,
+) -> Vec<H::Exp> {
+    use T::UnannotatedExp_ as TE;
+    if let TE::ExpList(items) = e.exp.value {
+        exp_list_items_to_vec(context, result, ty, e.exp.loc, items)
+    } else if let TE::Unit { .. } = e.exp.value {
+        vec![]
+    } else {
+        vec![*exp(context, result, ty, e)]
+    }
+}
+
+fn exp_list_items_to_vec(
+    context: &mut Context,
+    result: &mut Block,
+    ty: Option<&H::Type>,
+    loc: Loc,
+    items: Vec<T::ExpListItem>,
+) -> Vec<H::Exp> {
+    use H::{Type_ as HT, UnannotatedExp_ as HE};
+    assert!(!items.is_empty());
+    let mut tys = vec![];
+    let mut tes = vec![];
+
+    for item in items.into_iter() {
+        match item {
+            T::ExpListItem::Single(te, ts) => {
+                let t = single_type(context, *ts);
+                tys.push(t.clone());
+                tes.push((te, Some(sp(t.loc, HT::Single(t)))));
+            }
+            T::ExpListItem::Splat(_, _, _) => panic!("ICE spalt is unsupported."),
+        }
+    }
+
+    let es = exp_evaluation_order(context, result, tes);
+    assert!(
+        es.len() == tys.len(),
+        "ICE exp_evaluation_order changed arity"
+    );
+
+    // Because we previously froze subpoints of ExpLists as its own binding expression for that
+    // ExpList, we need to process this possible vector the same way.
+
+    if let Some(expected_ty @ sp!(tloc, HT::Multiple(etys))) = ty {
+        // We have to check that the arity of the expected type matches because some ill-typed
+        // programs flow through this code. In those cases, the error has already been reported and
+        // we bail.
+        if etys.len() == tys.len() {
+            let current_ty = sp(*tloc, HT::Multiple(tys));
+            match needs_freeze(context, &current_ty, expected_ty) {
+                Freeze::NotNeeded => es,
+                Freeze::Point => unreachable!(),
+                Freeze::Sub(_) => {
+                    let current_exp = H::Exp {
+                        ty: current_ty,
+                        exp: sp(loc, HE::Multiple(es)),
+                    };
+                    let frozen = freeze(context, result, expected_ty, current_exp);
+                    match frozen.exp.value {
+                        HE::Multiple(final_es) => final_es,
+                        _ => unreachable!(),
+                    }
+                }
+            }
+        } else {
+            es
+        }
+    } else {
+        es
+    }
+}
+
+fn exp_impl(
+    context: &mut Context,
+    result: &mut Block,
+    ty: H::Type,
+    eloc: Loc,
+    e_: T::UnannotatedExp_,
+) -> H::Exp {
+    use H::{Command_ as C, Statement_ as S, UnannotatedExp_ as HE};
+    use T::UnannotatedExp_ as TE;
+
+    let res = match e_ {
+        // Statement-like expressions
+        TE::While(tb, loop_body) => {
+            let mut cond_block = Block::new();
+            let cond_exp = exp(context, &mut cond_block, None, *tb);
+
+            let mut loop_block = Block::new();
+            let el = exp_(context, &mut loop_block, None, *loop_body);
+            ignore_and_pop(&mut loop_block, el);
+
+            let s_ = S::While {
+                cond: (cond_block, cond_exp),
+                block: loop_block,
+            };
+            result.push_back(sp(eloc, s_));
+            HE::Unit {
+                case: H::UnitCase::Implicit,
+            }
+        }
+        TE::Loop {
+            has_break,
+            body: loop_body,
+        } => {
+            let loop_block = statement_loop_body(context, *loop_body);
+
+            let s_ = S::Loop {
+                block: loop_block,
+                has_break,
+            };
+            result.push_back(sp(eloc, s_));
+            if !has_break {
+                HE::Unreachable
+            } else {
+                HE::Unit {
+                    case: H::UnitCase::Implicit,
+                }
+            }
+        }
+        TE::Block(seq) => return block(context, result, eloc, None, seq),
+
+        // Command-like expressions
+        TE::Return(te) => {
+            let expected_type = context.signature.as_ref().map(|s| s.return_type.clone());
+            let e = exp_(context, result, expected_type.as_ref(), *te);
+            let c = sp(
+                eloc,
+                C::Return {
+                    from_user: true,
+                    exp: e,
+                },
+            );
+            result.push_back(sp(eloc, S::Command(c)));
+            HE::Unreachable
+        }
+        TE::Abort(te) => {
+            let e = exp_(context, result, None, *te);
+            let c = sp(eloc, C::Abort(e));
+            result.push_back(sp(eloc, S::Command(c)));
+            HE::Unreachable
+        }
+        TE::Break => {
+            let c = sp(eloc, C::Break);
+            result.push_back(sp(eloc, S::Command(c)));
+            HE::Unreachable
+        }
+        TE::Continue => {
+            let c = sp(eloc, C::Continue);
+            result.push_back(sp(eloc, S::Command(c)));
+            HE::Unreachable
+        }
+        TE::Assign(assigns, lvalue_ty, te) => {
+            let expected_type = expected_types(context, eloc, lvalue_ty);
+            let e = exp(context, result, Some(&expected_type), *te);
+            assign_command(context, result, eloc, assigns, *e);
+            HE::Unit {
+                case: H::UnitCase::Implicit,
+            }
+        }
+        TE::Mutate(tl, tr) => {
+            let er = exp(context, result, None, *tr);
+            let el = exp(context, result, None, *tl);
+            let c = sp(eloc, C::Mutate(el, er));
+            result.push_back(sp(eloc, S::Command(c)));
+            HE::Unit {
+                case: H::UnitCase::Implicit,
+            }
+        }
+        // All other expressiosn
+        TE::Unit { trailing } => HE::Unit {
+            case: if trailing {
+                H::UnitCase::Trailing
+            } else {
+                H::UnitCase::FromUser
+            },
+        },
+        TE::Value(ev) => HE::Value(value(context, ev)),
+        TE::Constant(_m, c) => {
+            // Currently only private constants exist
+            HE::Constant(c)
+        }
+        TE::Move { from_user, var } => {
+            let annotation = if from_user {
+                MoveOpAnnotation::FromUser
+            } else {
+                MoveOpAnnotation::InferredNoCopy
+            };
+            HE::Move {
+                annotation,
+                var: translate_var(var),
+            }
+        }
+        TE::Copy { from_user, var } => HE::Copy {
+            from_user,
+            var: translate_var(var),
+        },
+        TE::BorrowLocal(mut_, v) => HE::BorrowLocal(mut_, translate_var(v)),
+
+        TE::Use(_) => panic!("ICE unexpanded use"),
+        TE::ModuleCall(call) => {
+            let T::ModuleCall {
+                module,
+                name,
+                type_arguments,
+                arguments,
+                parameter_types,
+            } = *call;
+            let expected_type = H::Type_::from_vec(eloc, single_types(context, parameter_types));
+            let htys = base_types(context, type_arguments);
+            let hargs = exp_list(context, result, Some(&expected_type), *arguments);
+            let call = H::ModuleCall {
+                module,
+                name,
+                type_arguments: htys,
+                arguments: hargs,
+            };
+            HE::ModuleCall(Box::new(call))
+        }
+        TE::Builtin(bf, targ) => builtin(context, result, eloc, *bf, targ),
+        TE::Vector(vec_loc, n, tty, targ) => {
+            let ty = Box::new(base_type(context, *tty));
+            let args = exp_list(context, result, None, *targ);
+            HE::Vector(vec_loc, n, ty, args)
+        }
+        TE::Dereference(te) => {
+            let e = exp(context, result, None, *te);
+            HE::Dereference(e)
+        }
+        TE::UnaryExp(op, te) => {
+            let e = exp(context, result, None, *te);
+            HE::UnaryExp(op, e)
+        }
+
+        TE::Pack(m, s, tbs, tfields) => {
+            // all fields of a packed struct type are used
+            context
+                .used_fields
+                .entry(s.value())
+                .or_default()
+                .extend(tfields.iter().map(|(_, s, _)| *s));
+
+            let bs = base_types(context, tbs);
+
+            let decl_fields = context.fields(&m, &s);
+            let mut count = 0;
+            let mut decl_field = |f: &Field| -> usize {
+                match decl_fields {
+                    Some(field_map) => *field_map.get(f).unwrap(),
+                    None => {
+                        // none can occur with errors in typing
+                        let i = count;
+                        count += 1;
+                        i
+                    }
+                }
+            };
+
+            let mut texp_fields: Vec<(usize, Field, usize, N::Type, T::Exp)> = tfields
+                .into_iter()
+                .map(|(f, (exp_idx, (bt, tf)))| (decl_field(&f), f, exp_idx, bt, tf))
+                .collect();
+            texp_fields.sort_by(|(_, _, eidx1, _, _), (_, _, eidx2, _, _)| eidx1.cmp(eidx2));
+
+            let bind_all_fields = texp_fields
+                .iter()
+                .any(|(decl_idx, _, exp_idx, _, _)| decl_idx != exp_idx);
+            let fields = if !bind_all_fields {
+                let mut fs = vec![];
+                let tes = texp_fields
+                    .into_iter()
+                    .map(|(_, f, _, bt, te)| {
+                        let bt = base_type(context, bt);
+                        fs.push((f, bt.clone()));
+                        let t = H::Type_::base(bt);
+                        (te, Some(t))
+                    })
+                    .collect();
+                let es = exp_evaluation_order(context, result, tes);
+                assert!(
+                    fs.len() == es.len(),
+                    "ICE exp_evaluation_order changed arity"
+                );
+                es.into_iter()
+                    .zip(fs)
+                    .map(|(e, (f, bt))| (f, bt, e))
+                    .collect()
+            } else {
+                let num_fields = decl_fields.as_ref().map(|m| m.len()).unwrap_or(0);
+                let mut fields = (0..num_fields).map(|_| None).collect::<Vec<_>>();
+                for (decl_idx, f, _exp_idx, bt, tf) in texp_fields {
+                    // Might have too many arguments, there will be an error from typing
+                    if decl_idx >= fields.len() {
+                        debug_assert!(context.env.has_errors());
+                        break;
+                    }
+                    let bt = base_type(context, bt);
+                    let t = H::Type_::base(bt.clone());
+                    let ef = exp_(context, result, Some(&t), tf);
+                    assert!(fields.get(decl_idx).unwrap().is_none());
+                    let move_tmp = bind_exp(context, result, ef);
+                    fields[decl_idx] = Some((f, bt, move_tmp))
+                }
+                // Might have too few arguments, there will be an error from typing if so
+                fields
+                    .into_iter()
+                    .filter_map(|o| {
+                        // if o is None, context should have errors
+                        debug_assert!(o.is_some() || context.env.has_errors());
+                        o
+                    })
+                    .collect()
+            };
+            HE::Pack(s, bs, fields)
+        }
+        TE::ExpList(items) => {
+            HE::Multiple(exp_list_items_to_vec(context, result, None, eloc, items))
+        }
+        TE::Borrow(mut_, te, f) => {
+            let e = exp(context, result, None, *te);
+            if let Some(struct_name) = struct_name(&e.ty) {
+                context
+                    .used_fields
+                    .entry(struct_name.value())
+                    .or_default()
+                    .insert(f.value());
+            }
+            HE::Borrow(mut_, e, f, None)
+        }
+        TE::TempBorrow(mut_, te) => {
+            let eb = exp_(context, result, None, *te);
+            let tmp = match bind_exp_impl(context, result, eb, true).exp.value {
+                HE::Move {
+                    annotation: MoveOpAnnotation::InferredLastUsage,
+                    var,
+                } => var,
+                _ => panic!("ICE invalid bind_exp for single value"),
+            };
+            HE::BorrowLocal(mut_, tmp)
+        }
+        TE::Cast(te, rhs_ty) => {
+            use N::BuiltinTypeName_ as BT;
+            let e = exp(context, result, None, *te);
+            let bt = match rhs_ty.value.builtin_name() {
+                Some(bt @ sp!(_, BT::U8))
+                | Some(bt @ sp!(_, BT::U16))
+                | Some(bt @ sp!(_, BT::U32))
+                | Some(bt @ sp!(_, BT::U64))
+                | Some(bt @ sp!(_, BT::U128))
+                | Some(bt @ sp!(_, BT::U256)) => *bt,
+                _ => panic!("ICE typing failed for cast"),
+            };
+            HE::Cast(e, bt)
+        }
+        TE::Annotate(te, rhs_ty) => {
+            let expected_ty = type_(context, *rhs_ty);
+            return exp_(context, result, Some(&expected_ty), *te);
+        }
+        TE::Spec(u, tused_locals) => {
+            let used_locals = tused_locals
+                .into_iter()
+                .map(|(var, ty)| {
+                    let v = translate_var(var);
+                    let st = single_type(context, ty);
+                    (v, st)
+                })
+                .collect();
+            HE::Spec(u, used_locals)
+        }
+        TE::UnresolvedError => {
+            assert!(context.env.has_errors());
+            HE::UnresolvedError
+        }
+
+        TE::IfElse(..) | TE::BinopExp(..) => unreachable!(),
+    };
+    H::exp(ty, sp(eloc, res))
+}
+
+fn struct_name(sp!(_, t): &H::Type) -> Option<StructName> {
+    let H::Type_::Single(st) = t else {
+        return None;
+    };
+    let bt = match &st.value {
+        H::SingleType_::Base(bt) => bt,
+        H::SingleType_::Ref(_, bt) => bt,
+    };
+    let H::BaseType_::Apply(_, tname, _) = &bt.value else {
+        return None;
+    };
+    if let H::TypeName_::ModuleType(_, struct_name) = tname.value {
+        return Some(struct_name);
+    }
+    None
+}
+
+fn exp_evaluation_order(
+    context: &mut Context,
+    result: &mut Block,
+    tes: Vec<(T::Exp, Option<H::Type>)>,
+) -> Vec<H::Exp> {
+    let mut needs_binding = false;
+    let mut e_results = vec![];
+    for (te, expected_type) in tes.into_iter().rev() {
+        let mut tmp_result = Block::new();
+        let e = *exp(context, &mut tmp_result, expected_type.as_ref(), te);
+        // If evaluating this expression introduces statements, all previous exps need to be bound
+        // to preserve left-to-right evaluation order
+        let adds_to_result = !tmp_result.is_empty();
+
+        let e = if needs_binding {
+            bind_exp(context, &mut tmp_result, e)
+        } else {
+            e
+        };
+        e_results.push((tmp_result, e));
+
+        needs_binding = needs_binding || adds_to_result;
+    }
+
+    let mut es = vec![];
+    for (mut tmp_result, e) in e_results.into_iter().rev() {
+        result.append(&mut tmp_result);
+        es.push(e)
+    }
+    es
+}
+
+fn make_temps(context: &mut Context, loc: Loc, ty: H::Type) -> Vec<(H::Var, H::SingleType)> {
+    use H::Type_ as T;
+    match ty.value {
+        T::Unit => vec![],
+        T::Single(s) => vec![(context.new_temp(loc, s.clone()), s)],
+        T::Multiple(ss) => ss
+            .into_iter()
+            .map(|s| (context.new_temp(loc, s.clone()), s))
+            .collect(),
+    }
+}
+
+fn bind_exp(context: &mut Context, result: &mut Block, e: H::Exp) -> H::Exp {
+    bind_exp_impl(context, result, e, false)
+}
+
+fn bind_exp_(
+    result: &mut Block,
+    loc: Loc,
+    tmps: Vec<(H::Var, H::SingleType)>,
+    e: H::Exp,
+) -> H::UnannotatedExp_ {
+    bind_exp_impl_(result, loc, tmps, e, false)
+}
+
+fn bind_exp_impl(
+    context: &mut Context,
+    result: &mut Block,
+    e: H::Exp,
+    bind_unreachable: bool,
+) -> H::Exp {
+    if matches!(&e.exp.value, H::UnannotatedExp_::Unreachable) && !bind_unreachable {
+        return e;
+    }
+    let loc = e.exp.loc;
+    let ty = e.ty.clone();
+    let tmps = make_temps(context, loc, ty.clone());
+    H::exp(
+        ty,
+        sp(loc, bind_exp_impl_(result, loc, tmps, e, bind_unreachable)),
+    )
+}
+
+fn bind_exp_impl_(
+    result: &mut Block,
+    loc: Loc,
+    tmps: Vec<(H::Var, H::SingleType)>,
+    e: H::Exp,
+    bind_unreachable: bool,
+) -> H::UnannotatedExp_ {
+    use H::{Command_ as C, Statement_ as S, UnannotatedExp_ as E};
+    if matches!(&e.exp.value, H::UnannotatedExp_::Unreachable) && !bind_unreachable {
+        return H::UnannotatedExp_::Unreachable;
+    }
+
+    if tmps.is_empty() {
+        let cmd = sp(loc, C::IgnoreAndPop { pop_num: 0, exp: e });
+        result.push_back(sp(loc, S::Command(cmd)));
+        return E::Unit {
+            case: H::UnitCase::Implicit,
+        };
+    }
+    let lvalues = tmps
+        .iter()
+        .map(|(v, st)| sp(v.loc(), H::LValue_::Var(*v, Box::new(st.clone()))))
+        .collect();
+    let asgn = sp(loc, C::Assign(lvalues, e));
+    result.push_back(sp(loc, S::Command(asgn)));
+
+    let mut etemps = tmps
+        .into_iter()
+        .map(|(var, st)| {
+            let evar_ = sp(var.loc(), use_tmp(var));
+            let ty = sp(st.loc, H::Type_::Single(st));
+            H::exp(ty, evar_)
+        })
+        .collect::<Vec<_>>();
+    match etemps.len() {
+        0 => unreachable!(),
+        1 => etemps.pop().unwrap().exp.value,
+        _ => E::Multiple(etemps),
+    }
+}
+
+fn use_tmp(var: H::Var) -> H::UnannotatedExp_ {
+    use H::UnannotatedExp_ as E;
+    E::Move {
+        annotation: MoveOpAnnotation::InferredLastUsage,
+        var,
+    }
+}
+
+fn builtin(
+    context: &mut Context,
+    result: &mut Block,
+    _eloc: Loc,
+    sp!(_, tb_): T::BuiltinFunction,
+    targ: Box<T::Exp>,
+) -> H::UnannotatedExp_ {
+    use H::UnannotatedExp_ as E;
+    use T::BuiltinFunction_ as TB;
+    match tb_ {
+        TB::Freeze(_bt) => {
+            let arg = exp(context, result, None, *targ);
+            E::Freeze(arg)
+        }
+        TB::Assert(_) => unreachable!(),
+    }
+}
+
+fn value(_context: &mut Context, sp!(loc, ev_): E::Value) -> H::Value {
+    use E::Value_ as EV;
+    use H::Value_ as HV;
+    let v_ = match ev_ {
+        EV::InferredNum(_) => panic!("ICE should have been expanded"),
+        EV::Address(a) => HV::Address(a.into_addr_bytes()),
+        EV::U8(u) => HV::U8(u),
+        EV::U16(u) => HV::U16(u),
+        EV::U32(u) => HV::U32(u),
+        EV::U64(u) => HV::U64(u),
+        EV::U128(u) => HV::U128(u),
+        EV::U256(u) => HV::U256(u),
+        EV::Bool(u) => HV::Bool(u),
+        EV::Bytearray(bytes) => HV::Vector(
+            Box::new(H::BaseType_::u8(loc)),
+            bytes.into_iter().map(|b| sp(loc, HV::U8(b))).collect(),
+        ),
+    };
+    sp(loc, v_)
+}
+
+//**************************************************************************************************
+// Freezing
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq)]
+enum Freeze {
+    NotNeeded,
+    Point,
+    Sub(Vec<bool>),
+}
+
+fn needs_freeze(context: &Context, sp!(_, actual): &H::Type, sp!(_, expected): &H::Type) -> Freeze {
+    use H::Type_ as T;
+    match (actual, expected) {
+        (T::Unit, T::Unit) => Freeze::NotNeeded,
+        (T::Single(actaul_s), T::Single(actual_e)) => {
+            let needs = needs_freeze_single(actaul_s, actual_e);
+            if needs {
+                Freeze::Point
+            } else {
+                Freeze::NotNeeded
+            }
+        }
+        (T::Multiple(actual_ss), T::Multiple(actual_es)) => {
+            assert!(actual_ss.len() == actual_es.len());
+            let points = actual_ss
+                .iter()
+                .zip(actual_es)
+                .map(|(a, e)| needs_freeze_single(a, e))
+                .collect::<Vec<_>>();
+            if points.iter().any(|needs| *needs) {
+                Freeze::Sub(points)
+            } else {
+                Freeze::NotNeeded
+            }
+        }
+        (_actual, _expected) => {
+            assert!(context.env.has_errors());
+            Freeze::NotNeeded
+        }
+    }
+}
+
+fn needs_freeze_single(sp!(_, actual): &H::SingleType, sp!(_, expected): &H::SingleType) -> bool {
+    use H::SingleType_ as T;
+    matches!((actual, expected), (T::Ref(true, _), T::Ref(false, _)))
+}
+
+fn freeze(context: &mut Context, result: &mut Block, expected_type: &H::Type, e: H::Exp) -> H::Exp {
+    use H::{Type_ as T, UnannotatedExp_ as E};
+
+    match needs_freeze(context, &e.ty, expected_type) {
+        Freeze::NotNeeded => e,
+        Freeze::Point => freeze_point(e),
+        Freeze::Sub(points) => {
+            let loc = e.exp.loc;
+            let actual_tys = match &e.ty.value {
+                T::Multiple(v) => v.clone(),
+                _ => unreachable!("ICE needs_freeze failed"),
+            };
+            assert!(actual_tys.len() == points.len());
+            let new_temps = actual_tys
+                .into_iter()
+                .map(|ty| (context.new_temp(loc, ty.clone()), ty))
+                .collect::<Vec<_>>();
+
+            let lvalues = new_temps
+                .iter()
+                .cloned()
+                .map(|(v, ty)| sp(loc, H::LValue_::Var(v, Box::new(ty))))
+                .collect::<Vec<_>>();
+            let assign = sp(loc, H::Command_::Assign(lvalues, e));
+            result.push_back(sp(loc, H::Statement_::Command(assign)));
+
+            let exps = new_temps
+                .into_iter()
+                .zip(points)
+                .map(|((var, ty), needs_freeze)| {
+                    let e_ = sp(loc, use_tmp(var));
+                    let e = H::exp(T::single(ty), e_);
+                    if needs_freeze {
+                        freeze_point(e)
+                    } else {
+                        e
+                    }
+                })
+                .collect::<Vec<_>>();
+            let tys = exps
+                .iter()
+                .map(|e| match &e.ty.value {
+                    T::Single(s) => s.clone(),
+                    _ => panic!("ICE list item has Multple type"),
+                })
+                .collect::<Vec<_>>();
+            H::exp(sp(loc, T::Multiple(tys)), sp(loc, E::Multiple(exps)))
+        }
+    }
+}
+
+fn freeze_point(e: H::Exp) -> H::Exp {
+    let frozen_ty = freeze_ty(e.ty.clone());
+    let eloc = e.exp.loc;
+    let e_ = H::UnannotatedExp_::Freeze(Box::new(e));
+    H::exp(frozen_ty, sp(eloc, e_))
+}
+
+fn freeze_ty(sp!(tloc, t): H::Type) -> H::Type {
+    use H::Type_ as T;
+    match t {
+        T::Single(s) => sp(tloc, T::Single(freeze_single(s))),
+        t => sp(tloc, t),
+    }
+}
+
+fn freeze_single(sp!(sloc, s): H::SingleType) -> H::SingleType {
+    use H::SingleType_ as S;
+    match s {
+        S::Ref(true, inner) => sp(sloc, S::Ref(false, inner)),
+        s => sp(sloc, s),
+    }
+}
+
+fn bind_for_short_circuit(e: &T::Exp) -> bool {
+    use T::UnannotatedExp_ as TE;
+    match &e.exp.value {
+        TE::Use(_) => panic!("ICE should have been expanded"),
+        TE::Value(_)
+        | TE::Constant(_, _)
+        | TE::Move { .. }
+        | TE::Copy { .. }
+        | TE::UnresolvedError => false,
+
+        // TODO might want to case ModuleCall for fake natives
+        TE::ModuleCall(_) => true,
+
+        TE::Block(seq) => bind_for_short_circuit_sequence(seq),
+        TE::Annotate(el, _) => bind_for_short_circuit(el),
+
+        TE::Break
+        | TE::Continue
+        | TE::IfElse(_, _, _)
+        | TE::While(_, _)
+        | TE::Loop { .. }
+        | TE::Return(_)
+        | TE::Abort(_)
+        | TE::Builtin(_, _)
+        | TE::Dereference(_)
+        | TE::UnaryExp(_, _)
+        | TE::Borrow(_, _, _)
+        | TE::TempBorrow(_, _)
+        | TE::BinopExp(_, _, _, _) => true,
+
+        TE::Unit { .. }
+        | TE::Spec(_, _)
+        | TE::Assign(_, _, _)
+        | TE::Mutate(_, _)
+        | TE::Pack(_, _, _, _)
+        | TE::Vector(_, _, _, _)
+        | TE::BorrowLocal(_, _)
+        | TE::ExpList(_)
+        | TE::Cast(_, _) => panic!("ICE unexpected exp in short circuit check: {:?}", e),
+    }
+}
+
+fn bind_for_short_circuit_sequence(seq: &T::Sequence) -> bool {
+    use T::SequenceItem_ as TItem;
+    seq.len() != 1
+        || match &seq[0].value {
+            TItem::Seq(e) => bind_for_short_circuit(e),
+            item @ TItem::Declare(_) | item @ TItem::Bind(_, _, _) => {
+                panic!("ICE unexpected item in short circuit check: {:?}", item)
+            }
+        }
+}
+
+//**************************************************************************************************
+// Trailing semicolon
+//**************************************************************************************************
+
+fn check_trailing_unit(context: &mut Context, block: &mut Block) {
+    use H::{Command_ as C, Statement_ as S, UnannotatedExp_ as E};
+    macro_rules! hcmd {
+        ($loc:pat, $cmd:pat) => {
+            sp!(_, S::Command(sp!($loc, $cmd)))
+        };
+    }
+    macro_rules! hignored {
+        ($loc:pat, $e:pat) => {
+            hcmd!(
+                _,
+                C::IgnoreAndPop {
+                    exp: H::Exp {
+                        exp: sp!($loc, $e),
+                        ..
+                    },
+                    ..
+                }
+            )
+        };
+    }
+    macro_rules! trailing {
+        ($uloc: pat) => {
+            hcmd!(
+                _,
+                C::IgnoreAndPop {
+                    exp: H::Exp {
+                        exp: sp!(
+                            $uloc,
+                            E::Unit {
+                                case: H::UnitCase::Trailing
+                            }
+                        ),
+                        ..
+                    },
+                    ..
+                }
+            )
+        };
+    }
+    macro_rules! trailing_returned {
+        ($uloc:pat) => {
+            hcmd!(
+                _,
+                C::Return {
+                    exp: H::Exp {
+                        exp: sp!(
+                            $uloc,
+                            E::Unit {
+                                case: H::UnitCase::Trailing
+                            }
+                        ),
+                        ..
+                    },
+                    ..
+                }
+            )
+        };
+    }
+    fn divergent_block(block: &Block) -> bool {
+        matches!(
+            block.back(),
+            Some(hcmd!(_, C::Break))
+                | Some(hcmd!(_, C::Continue))
+                | Some(hcmd!(_, C::Abort(_)))
+                | Some(hcmd!(_, C::Return { .. }))
+                | Some(hignored!(_, E::Unreachable))
+        )
+    }
+    macro_rules! invalid_trailing_unit {
+        ($context:ident, $loc:expr, $uloc:expr) => {{
+            let semi_msg = "Invalid trailing ';'";
+            let unreachable_msg = "Any code after this expression will not be reached";
+            let info_msg = "A trailing ';' in an expression block implicitly adds a '()' value \
+                        after the semicolon. That '()' value will not be reachable";
+            $context.env.add_diag(diag!(
+                UnusedItem::TrailingSemi,
+                ($uloc, semi_msg),
+                ($loc, unreachable_msg),
+                ($uloc, info_msg),
+            ));
+            block.pop_back();
+        }};
+    }
+
+    block
+        .iter_mut()
+        .for_each(|s| check_trailing_unit_statement(context, s));
+    let len = block.len();
+    if len < 2 {
+        return;
+    }
+    match (&block[len - 2], &block[len - 1]) {
+        (
+            sp!(
+                loc,
+                S::IfElse {
+                    if_block,
+                    else_block,
+                    ..
+                }
+            ),
+            trailing!(uloc),
+        )
+        | (
+            sp!(
+                loc,
+                S::IfElse {
+                    if_block,
+                    else_block,
+                    ..
+                }
+            ),
+            trailing_returned!(uloc),
+        ) if divergent_block(if_block) && divergent_block(else_block) => {
+            invalid_trailing_unit!(context, *loc, *uloc)
+        }
+        (sp!(loc, S::Loop { has_break, .. }), trailing!(uloc))
+        | (sp!(loc, S::Loop { has_break, .. }), trailing_returned!(uloc))
+            if !has_break =>
+        {
+            invalid_trailing_unit!(context, *loc, *uloc)
+        }
+        (hcmd!(loc, C::Break), trailing!(uloc))
+        | (hcmd!(loc, C::Break), trailing_returned!(uloc))
+        | (hcmd!(loc, C::Continue), trailing!(uloc))
+        | (hcmd!(loc, C::Continue), trailing_returned!(uloc))
+        | (hcmd!(loc, C::Abort(_)), trailing!(uloc))
+        | (hcmd!(loc, C::Abort(_)), trailing_returned!(uloc))
+        | (hcmd!(loc, C::Return { .. }), trailing!(uloc))
+        | (hcmd!(loc, C::Return { .. }), trailing_returned!(uloc))
+        | (hignored!(loc, E::Unreachable), trailing!(uloc))
+        | (hignored!(loc, E::Unreachable), trailing_returned!(uloc)) => {
+            invalid_trailing_unit!(context, *loc, *uloc)
+        }
+        _ => (),
+    };
+}
+
+fn check_trailing_unit_statement(context: &mut Context, sp!(_, s_): &mut H::Statement) {
+    use H::Statement_ as S;
+    match s_ {
+        S::Command(_) => (),
+        S::IfElse {
+            if_block,
+            else_block,
+            ..
+        } => {
+            check_trailing_unit(context, if_block);
+            check_trailing_unit(context, else_block)
+        }
+        S::While {
+            cond: (cond_block, _),
+            block,
+        } => {
+            check_trailing_unit(context, cond_block);
+            check_trailing_unit(context, block)
+        }
+        S::Loop { block, .. } => check_trailing_unit(context, block),
+    }
+}
+
+/// Generates warnings for unused struct fields.
+fn gen_unused_warnings(
+    context: &mut Context,
+    is_source_module: bool,
+    structs: &UniqueMap<StructName, H::StructDefinition>,
+) {
+    if !is_source_module {
+        // generate warnings only for modules compiled in this pass rather than for all modules
+        // including pre-compiled libraries for which we do not have source code available and
+        // cannot be analyzed in this pass
+        return;
+    }
+    let is_sui_mode = context.env.package_config(context.current_package).flavor == Flavor::Sui;
+
+    for (_, sname, sdef) in structs {
+        context
+            .env
+            .add_warning_filter_scope(sdef.warning_filter.clone());
+
+        let has_key = sdef.abilities.has_ability_(Ability_::Key);
+
+        if let H::StructFields::Defined(fields) = &sdef.fields {
+            for (f, _) in fields {
+                // skip for Sui ID fields
+                if is_sui_mode && has_key && f.value() == ID_FIELD_NAME {
+                    continue;
+                }
+                if !context
+                    .used_fields
+                    .get(sname)
+                    .is_some_and(|names| names.contains(&f.value()))
+                {
+                    let msg = format!("The '{}' field of the '{sname}' type is unused", f.value());
+                    context
+                        .env
+                        .add_diag(diag!(UnusedItem::StructField, (f.loc(), msg)));
+                }
+            }
+        }
+
+        context.env.pop_warning_filter_scope();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/interface_generator.rs b/vendors/move/crates/move-compiler/src/interface_generator.rs
new file mode 100644
index 000000000..bfc333307
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/interface_generator.rs
@@ -0,0 +1,387 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::shared::{NumberFormat, NumericalAddress};
+use anyhow::{anyhow, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        Ability, AbilitySet, CompiledModule, FunctionDefinition, ModuleHandle, SignatureToken,
+        StructDefinition, StructFieldInformation, StructHandleIndex, StructTypeParameter,
+        TypeParameterIndex, Visibility,
+    },
+};
+use move_core_types::language_storage::ModuleId;
+use std::{collections::BTreeMap, fs};
+
+macro_rules! push_line {
+    ($s:ident, $e:expr) => {{
+        $s = format!("{}{}\n", $s, $e);
+    }};
+}
+
+macro_rules! push {
+    ($s:ident, $e:expr) => {{
+        $s = format!("{}{}", $s, $e);
+    }};
+}
+
+/// Generate the text for the "interface" file of a compiled module. This "interface" is the
+/// publically visible contents of the CompiledModule, represented in source language syntax
+/// Additionally, it returns the module id (address+name) of the module that was deserialized
+pub fn write_file_to_string(
+    named_address_mapping: &BTreeMap<ModuleId, impl AsRef<str>>,
+    compiled_module_file_input_path: &str,
+) -> Result<(ModuleId, String)> {
+    let file_contents = fs::read(compiled_module_file_input_path)?;
+    let module = CompiledModule::deserialize_with_defaults(&file_contents).map_err(|e| {
+        anyhow!(
+            "Unable to deserialize module at '{}': {}",
+            compiled_module_file_input_path,
+            e
+        )
+    })?;
+    write_module_to_string(named_address_mapping, &module)
+}
+
+pub fn write_module_to_string(
+    named_address_mapping: &BTreeMap<ModuleId, impl AsRef<str>>,
+    module: &CompiledModule,
+) -> Result<(ModuleId, String)> {
+    let mut out = String::new();
+
+    let id = module.self_id();
+    push_line!(
+        out,
+        format!("module {} {{", write_module_id(named_address_mapping, &id))
+    );
+    push_line!(out, "");
+
+    let mut context = Context::new(module);
+    let mut members = vec![];
+
+    for fdecl in module.friend_decls() {
+        members.push(write_friend_decl(&mut context, fdecl));
+    }
+    if !module.friend_decls().is_empty() {
+        members.push("".to_string());
+    }
+
+    for sdef in module.struct_defs() {
+        members.push(write_struct_def(&mut context, sdef));
+    }
+    if !module.struct_defs().is_empty() {
+        members.push("".to_string());
+    }
+
+    let mut externally_visible_funs = module
+        .function_defs()
+        .iter()
+        .filter(|fdef| match fdef.visibility {
+            Visibility::Public | Visibility::Friend => true,
+            Visibility::Private => false,
+        })
+        .peekable();
+    let has_externally_visible_funs = externally_visible_funs.peek().is_some();
+    if has_externally_visible_funs {
+        members.push(format!("    {}", DISCLAIMER));
+    }
+    for fdef in externally_visible_funs {
+        members.push(write_function_def(&mut context, fdef));
+    }
+    if has_externally_visible_funs {
+        members.push("".to_string());
+    }
+
+    let has_uses = !context.uses.is_empty();
+    for (module_id, alias) in context.uses {
+        let use_ = if module_id.name().as_str() == alias {
+            format!(
+                "    use {};",
+                write_module_id(named_address_mapping, &module_id),
+            )
+        } else {
+            format!(
+                "    use {} as {};",
+                write_module_id(named_address_mapping, &module_id),
+                alias
+            )
+        };
+        push_line!(out, use_);
+    }
+    if has_uses {
+        push_line!(out, "");
+    }
+
+    if !members.is_empty() {
+        push_line!(out, members.join("\n"));
+    }
+    push_line!(out, "}");
+    Ok((id, out))
+}
+
+struct Context<'a> {
+    module: &'a CompiledModule,
+    uses: BTreeMap<ModuleId, String>,
+    counts: BTreeMap<String, usize>,
+}
+
+impl<'a> Context<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        Self {
+            module,
+            uses: BTreeMap::new(),
+            counts: BTreeMap::new(),
+        }
+    }
+
+    fn module_alias(&mut self, module_id: ModuleId) -> &String {
+        let module_name = module_id.name().to_owned().into_string();
+        let counts = &mut self.counts;
+        self.uses.entry(module_id).or_insert_with(|| {
+            let count = *counts
+                .entry(module_name.clone())
+                .and_modify(|c| *c += 1)
+                .or_insert(0);
+            if count == 0 {
+                module_name
+            } else {
+                format!("{}_{}", module_name, count)
+            }
+        })
+    }
+}
+
+const DISCLAIMER: &str =
+    "// NOTE: Functions are 'native' for simplicity. They may or may not be native in actuality.";
+
+fn write_module_id(
+    named_address_mapping: &BTreeMap<ModuleId, impl AsRef<str>>,
+    id: &ModuleId,
+) -> String {
+    match named_address_mapping.get(id) {
+        None => format!(
+            "{}::{}",
+            NumericalAddress::new(id.address().into_bytes(), NumberFormat::Hex),
+            id.name()
+        ),
+        Some(n) => format!("{}::{}", n.as_ref(), id.name()),
+    }
+}
+
+fn write_friend_decl(ctx: &mut Context, fdecl: &ModuleHandle) -> String {
+    format!(
+        "    friend {};",
+        ctx.module_alias(ctx.module.module_id_for_handle(fdecl))
+    )
+}
+
+fn write_struct_def(ctx: &mut Context, sdef: &StructDefinition) -> String {
+    let mut out = String::new();
+
+    let shandle = ctx.module.struct_handle_at(sdef.struct_handle);
+
+    push_line!(
+        out,
+        format!(
+            "    struct {}{}{} {{",
+            ctx.module.identifier_at(shandle.name),
+            write_struct_type_parameters(&shandle.type_parameters),
+            write_ability_modifiers(shandle.abilities),
+        )
+    );
+
+    let fields = match &sdef.field_information {
+        StructFieldInformation::Native => {
+            push!(out, "    }");
+            return out;
+        }
+        StructFieldInformation::Declared(fields) => fields,
+    };
+    for field in fields {
+        push_line!(
+            out,
+            format!(
+                "        {}: {},",
+                ctx.module.identifier_at(field.name),
+                write_signature_token(ctx, &field.signature.0),
+            )
+        )
+    }
+
+    push!(out, "    }");
+    out
+}
+
+fn write_function_def(ctx: &mut Context, fdef: &FunctionDefinition) -> String {
+    let fhandle = ctx.module.function_handle_at(fdef.function);
+    let parameters = &ctx.module.signature_at(fhandle.parameters).0;
+    let return_ = &ctx.module.signature_at(fhandle.return_).0;
+    format!(
+        "    native {}{}fun {}{}({}){};",
+        write_visibility(fdef.visibility),
+        if fdef.is_entry { "entry " } else { "" },
+        ctx.module.identifier_at(fhandle.name),
+        write_fun_type_parameters(&fhandle.type_parameters),
+        write_parameters(ctx, parameters),
+        write_return_type(ctx, return_)
+    )
+}
+
+fn write_visibility(visibility: Visibility) -> String {
+    match visibility {
+        Visibility::Public => "public ",
+        Visibility::Friend => "public(friend) ",
+        Visibility::Private => "",
+    }
+    .to_string()
+}
+
+fn write_ability_modifiers(abs: AbilitySet) -> String {
+    if abs == AbilitySet::EMPTY {
+        return "".to_string();
+    }
+    format!(
+        " has {}",
+        abs.into_iter()
+            .map(write_ability)
+            .collect::<Vec<_>>()
+            .join(", ")
+    )
+}
+
+fn write_ability_constraint(abs: AbilitySet) -> String {
+    if abs == AbilitySet::EMPTY {
+        return "".to_string();
+    }
+    format!(
+        ": {}",
+        abs.into_iter()
+            .map(write_ability)
+            .collect::<Vec<_>>()
+            .join("+ ")
+    )
+}
+
+fn write_ability(ab: Ability) -> String {
+    use crate::parser::ast::Ability_ as A_;
+    match ab {
+        Ability::Copy => A_::COPY,
+        Ability::Drop => A_::DROP,
+        Ability::Store => A_::STORE,
+        Ability::Key => A_::KEY,
+    }
+    .to_string()
+}
+
+fn write_struct_type_parameters(tps: &[StructTypeParameter]) -> String {
+    if tps.is_empty() {
+        return "".to_string();
+    }
+
+    let tp_and_constraints = tps
+        .iter()
+        .enumerate()
+        .map(|(idx, ty_param)| {
+            format!(
+                "{}{}{}",
+                if ty_param.is_phantom { "phantom " } else { "" },
+                write_type_parameter(idx as TypeParameterIndex),
+                write_ability_constraint(ty_param.constraints),
+            )
+        })
+        .collect::<Vec<_>>()
+        .join(", ");
+    format!("<{}>", tp_and_constraints)
+}
+
+fn write_fun_type_parameters(tps: &[AbilitySet]) -> String {
+    if tps.is_empty() {
+        return "".to_string();
+    }
+
+    let tp_and_constraints = tps
+        .iter()
+        .enumerate()
+        .map(|(idx, abs)| {
+            format!(
+                "{}{}",
+                write_type_parameter(idx as TypeParameterIndex),
+                write_ability_constraint(*abs),
+            )
+        })
+        .collect::<Vec<_>>()
+        .join(", ");
+    format!("<{}>", tp_and_constraints)
+}
+
+fn write_parameters(ctx: &mut Context, params: &[SignatureToken]) -> String {
+    params
+        .iter()
+        .enumerate()
+        .map(|(idx, ty)| format!("a{}: {}", idx, write_signature_token(ctx, ty)))
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+fn write_return_type(ctx: &mut Context, tys: &[SignatureToken]) -> String {
+    match tys.len() {
+        0 => "".to_string(),
+        1 => format!(": {}", write_signature_token(ctx, &tys[0])),
+        _ => format!(
+            ": ({})",
+            tys.iter()
+                .map(|ty| write_signature_token(ctx, ty))
+                .collect::<Vec<_>>()
+                .join(", ")
+        ),
+    }
+}
+
+fn write_signature_token(ctx: &mut Context, t: &SignatureToken) -> String {
+    match t {
+        SignatureToken::Bool => "bool".to_string(),
+        SignatureToken::U8 => "u8".to_string(),
+        SignatureToken::U16 => "u16".to_string(),
+        SignatureToken::U32 => "u32".to_string(),
+        SignatureToken::U64 => "u64".to_string(),
+        SignatureToken::U128 => "u128".to_string(),
+        SignatureToken::U256 => "u256".to_string(),
+        SignatureToken::Address => "address".to_string(),
+        SignatureToken::Signer => "signer".to_string(),
+        SignatureToken::Vector(inner) => format!("vector<{}>", write_signature_token(ctx, inner)),
+        SignatureToken::Struct(idx) => write_struct_handle_type(ctx, *idx),
+        SignatureToken::StructInstantiation(idx, types) => {
+            let n = write_struct_handle_type(ctx, *idx);
+            let tys = types
+                .iter()
+                .map(|ty| write_signature_token(ctx, ty))
+                .collect::<Vec<_>>()
+                .join(", ");
+            format!("{}<{}>", n, tys)
+        }
+        SignatureToken::Reference(inner) => format!("&{}", write_signature_token(ctx, inner)),
+        SignatureToken::MutableReference(inner) => {
+            format!("&mut {}", write_signature_token(ctx, inner))
+        }
+        SignatureToken::TypeParameter(idx) => write_type_parameter(*idx),
+    }
+}
+
+fn write_struct_handle_type(ctx: &mut Context, idx: StructHandleIndex) -> String {
+    let struct_handle = ctx.module.struct_handle_at(idx);
+    let struct_module_handle = ctx.module.module_handle_at(struct_handle.module);
+    let struct_module_id = ctx.module.module_id_for_handle(struct_module_handle);
+    let module_alias = ctx.module_alias(struct_module_id).clone();
+
+    format!(
+        "{}::{}",
+        module_alias,
+        ctx.module.identifier_at(struct_handle.name)
+    )
+}
+
+fn write_type_parameter(idx: TypeParameterIndex) -> String {
+    format!("T{}", idx)
+}
diff --git a/vendors/move/crates/move-compiler/src/ir_translation.rs b/vendors/move/crates/move-compiler/src/ir_translation.rs
new file mode 100644
index 000000000..083a1228d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/ir_translation.rs
@@ -0,0 +1,38 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use regex::{Captures, NoExpand, Regex};
+use std::{fs, path::Path};
+
+macro_rules! replace {
+    ($input:ident, $pat:expr, $replacer:expr) => {{
+        let regex = Regex::new($pat).unwrap();
+        regex.replace_all(&$input, $replacer)
+    }};
+}
+
+#[allow(clippy::trivial_regex)]
+pub fn fix_syntax_and_write(out_path: &Path, contents: String) {
+    // move(x) ~> move x
+    let contents = replace!(contents, r"move\((\w+)\)", "move $1");
+    // copy(x) ~> copy x
+    let contents = replace!(contents, r"copy\((\w+)\)", "copy $1");
+    // resource StructName ~> resource struct StructName
+    let contents = replace!(contents, r"resource\s+(\w)", "resource struct $1");
+    // copyable ~> copyable
+    let contents = replace!(contents, r":\s*copyable", NoExpand(": copyable"));
+    // import ~> use
+    let contents = replace!(contents, r"import", NoExpand("use"));
+    // Self. is unnecessary
+    let contents = replace!(contents, r"Self\.", NoExpand(""));
+    // Module|Address. ~> Module|Address::
+    let contents = replace!(contents, r"(([A-Z]\w*)|(\}\})|(0x\d+))\.", "$1::");
+    // add fun keyword to functions
+    let contents = replace!(
+        contents,
+        r"(((public|native| )*))(\w+\(.*\).*\{)",
+        |cap: &Captures| format!("{}fun {}", &cap[1], &cap[4])
+    );
+    fs::write(out_path, contents.as_bytes()).unwrap();
+}
diff --git a/vendors/move/crates/move-compiler/src/lib.rs b/vendors/move/crates/move-compiler/src/lib.rs
new file mode 100644
index 000000000..a0dc4a641
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/lib.rs
@@ -0,0 +1,40 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+#[macro_use(sp)]
+extern crate move_ir_types;
+
+#[macro_use(symbol)]
+extern crate move_symbol_pool;
+
+pub mod cfgir;
+pub mod command_line;
+pub mod compiled_unit;
+pub mod diagnostics;
+pub mod editions;
+pub mod expansion;
+pub mod hlir;
+pub mod interface_generator;
+pub mod ir_translation;
+pub mod naming;
+pub mod parser;
+pub mod shared;
+pub mod sui_mode;
+mod to_bytecode;
+pub mod typing;
+pub mod unit_test;
+pub mod verification;
+
+pub use command_line::{
+    compiler::{
+        construct_pre_compiled_lib, generate_interface_files, output_compiled_units, Compiler,
+        FullyCompiledProgram, SteppedCompiler, PASS_CFGIR, PASS_COMPILATION, PASS_EXPANSION,
+        PASS_HLIR, PASS_NAMING, PASS_PARSER, PASS_TYPING,
+    },
+    MOVE_COMPILED_INTERFACES_DIR,
+};
+pub use parser::comments::{CommentMap, FileCommentMap, MatchedFileCommentMap};
+pub use shared::Flags;
diff --git a/vendors/move/crates/move-compiler/src/naming/ast.rs b/vendors/move/crates/move-compiler/src/naming/ast.rs
new file mode 100644
index 000000000..8de5dcf9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/naming/ast.rs
@@ -0,0 +1,1456 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::WarningFilters,
+    expansion::ast::{
+        ability_constraints_ast_debug, ability_modifiers_ast_debug, AbilitySet, Attributes, Fields,
+        Friend, ImplicitUseFunCandidate, ModuleIdent, SpecId, Value, Value_, Visibility,
+    },
+    parser::ast::{
+        Ability_, BinOp, ConstantName, Field, FunctionName, Mutability, StructName, UnaryOp,
+        ENTRY_MODIFIER,
+    },
+    shared::{ast_debug::*, program_info::NamingProgramInfo, unique_map::UniqueMap, *},
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt,
+};
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    pub info: NamingProgramInfo,
+    pub inner: Program_,
+}
+
+#[derive(Debug, Clone)]
+pub struct Program_ {
+    pub modules: UniqueMap<ModuleIdent, ModuleDefinition>,
+    pub scripts: BTreeMap<Symbol, Script>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Neighbor_ {
+    Dependency,
+    Friend,
+}
+pub type Neighbor = Spanned<Neighbor_>;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum UseFunKind {
+    Explicit,
+    // From a function declaration in the module
+    FunctionDeclaration,
+    // From a normal, non 'use fun' use declaration,
+    UseAlias { used: bool },
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct UseFun {
+    pub loc: Loc,
+    pub attributes: Attributes,
+    pub is_public: Option<Loc>,
+    pub target_function: (ModuleIdent, FunctionName),
+    // If None, disregard any use/unused information.
+    // If Some, we track whether or not the associated function alias was used prior to receiver
+    pub kind: UseFunKind,
+}
+
+// Mapping from type to their possible "methods"
+pub type ResolvedUseFuns = BTreeMap<TypeName, UniqueMap<Name, UseFun>>;
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct UseFuns {
+    pub resolved: ResolvedUseFuns,
+    pub implicit_candidates: UniqueMap<Name, ImplicitUseFunCandidate>,
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub use_funs: UseFuns,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub function_name: FunctionName,
+    pub function: Function,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub loc: Loc,
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub is_source_module: bool,
+    pub use_funs: UseFuns,
+    pub friends: UniqueMap<ModuleIdent, Friend>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub functions: UniqueMap<FunctionName, Function>,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct StructDefinition {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub fields: StructFields,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct StructTypeParameter {
+    pub param: TParam,
+    pub is_phantom: bool,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum StructFields {
+    Defined(Fields<Type>),
+    Native(Loc),
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub struct FunctionSignature {
+    pub type_parameters: Vec<TParam>,
+    pub parameters: Vec<(Mutability, Var, Type)>,
+    pub return_type: Type,
+}
+
+#[derive(PartialEq, Debug, Clone)]
+pub enum FunctionBody_ {
+    Defined(Sequence),
+    Native,
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Function {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub body: FunctionBody,
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Constant {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub signature: Type,
+    pub value: Exp,
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Clone, Copy, PartialOrd, Eq, Ord)]
+pub enum BuiltinTypeName_ {
+    // address
+    Address,
+    // signer
+    Signer,
+    // u8
+    U8,
+    // u16
+    U16,
+    // u32
+    U32,
+    // u64
+    U64,
+    // u128
+    U128,
+    // u256
+    U256,
+    // Vector
+    Vector,
+    // bool
+    Bool,
+}
+pub type BuiltinTypeName = Spanned<BuiltinTypeName_>;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum TypeName_ {
+    // exp-list/tuple type
+    Multiple(usize),
+    Builtin(BuiltinTypeName),
+    ModuleType(ModuleIdent, StructName),
+}
+pub type TypeName = Spanned<TypeName_>;
+
+#[derive(Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Copy, Clone)]
+pub struct TParamID(pub u64);
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct TParam {
+    pub id: TParamID,
+    pub user_specified_name: Name,
+    pub abilities: AbilitySet,
+}
+
+#[derive(Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Copy, Clone)]
+pub struct TVar(u64);
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Type_ {
+    Unit,
+    Ref(bool, Box<Type>),
+    Param(TParam),
+    Apply(Option<AbilitySet>, TypeName, Vec<Type>),
+    Var(TVar),
+    Anything,
+    UnresolvedError,
+}
+pub type Type = Spanned<Type_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+#[derive(Debug, Eq, PartialEq, Copy, Clone, PartialOrd, Ord)]
+pub struct Var_ {
+    pub name: Symbol,
+    pub id: u16,
+    pub color: u16,
+}
+pub type Var = Spanned<Var_>;
+
+#[derive(Debug, PartialEq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum LValue_ {
+    Ignore,
+    Var {
+        mut_: Mutability,
+        var: Var,
+        unused_binding: bool,
+    },
+    Unpack(ModuleIdent, StructName, Option<Vec<Type>>, Fields<LValue>),
+}
+pub type LValue = Spanned<LValue_>;
+pub type LValueList_ = Vec<LValue>;
+pub type LValueList = Spanned<LValueList_>;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum ExpDotted_ {
+    Exp(Box<Exp>),
+    Dot(Box<ExpDotted>, Field),
+}
+pub type ExpDotted = Spanned<ExpDotted_>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum BuiltinFunction_ {
+    Freeze(Option<Type>),
+    Assert(/* is_macro */ bool),
+}
+pub type BuiltinFunction = Spanned<BuiltinFunction_>;
+
+#[derive(Debug, PartialEq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Exp_ {
+    Value(Value),
+    Move(Var),
+    Copy(Var),
+    Use(Var),
+    Constant(Option<ModuleIdent>, ConstantName),
+
+    ModuleCall(
+        ModuleIdent,
+        FunctionName,
+        Option<Vec<Type>>,
+        Spanned<Vec<Exp>>,
+    ),
+    MethodCall(ExpDotted, Name, Option<Vec<Type>>, Spanned<Vec<Exp>>),
+    Builtin(BuiltinFunction, Spanned<Vec<Exp>>),
+    Vector(Loc, Option<Type>, Spanned<Vec<Exp>>),
+
+    IfElse(Box<Exp>, Box<Exp>, Box<Exp>),
+    While(Box<Exp>, Box<Exp>),
+    Loop(Box<Exp>),
+    Block(Sequence),
+
+    Assign(LValueList, Box<Exp>),
+    FieldMutate(ExpDotted, Box<Exp>),
+    Mutate(Box<Exp>, Box<Exp>),
+
+    Return(Box<Exp>),
+    Abort(Box<Exp>),
+    Break,
+    Continue,
+
+    Dereference(Box<Exp>),
+    UnaryExp(UnaryOp, Box<Exp>),
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+
+    Pack(ModuleIdent, StructName, Option<Vec<Type>>, Fields<Exp>),
+    ExpList(Vec<Exp>),
+    Unit {
+        trailing: bool,
+    },
+
+    DerefBorrow(ExpDotted),
+    Borrow(bool, ExpDotted),
+
+    Cast(Box<Exp>, Type),
+    Annotate(Box<Exp>, Type),
+
+    Spec(SpecId, BTreeSet<Var>),
+
+    UnresolvedError,
+}
+pub type Exp = Spanned<Exp_>;
+
+pub type Sequence = (UseFuns, VecDeque<SequenceItem>);
+#[derive(Debug, PartialEq, Clone)]
+pub enum SequenceItem_ {
+    Seq(Exp),
+    Declare(LValueList, Option<Type>),
+    Bind(LValueList, Exp),
+}
+pub type SequenceItem = Spanned<SequenceItem_>;
+
+//**************************************************************************************************
+// traits
+//**************************************************************************************************
+
+impl TName for Var {
+    type Key = Var_;
+
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Self::Loc, Self::Key) {
+        let sp!(loc, value) = self;
+        (loc, value)
+    }
+
+    fn add_loc(loc: Self::Loc, key: Self::Key) -> Self {
+        sp(loc, key)
+    }
+
+    fn borrow(&self) -> (&Self::Loc, &Self::Key) {
+        let sp!(loc, value) = self;
+        (loc, value)
+    }
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+static BUILTIN_TYPE_ALL_NAMES: Lazy<BTreeSet<Symbol>> = Lazy::new(|| {
+    [
+        BuiltinTypeName_::ADDRESS,
+        BuiltinTypeName_::SIGNER,
+        BuiltinTypeName_::U_8,
+        BuiltinTypeName_::U_16,
+        BuiltinTypeName_::U_32,
+        BuiltinTypeName_::U_64,
+        BuiltinTypeName_::U_128,
+        BuiltinTypeName_::U_256,
+        BuiltinTypeName_::BOOL,
+        BuiltinTypeName_::VECTOR,
+    ]
+    .into_iter()
+    .map(Symbol::from)
+    .collect()
+});
+
+static BUILTIN_TYPE_NUMERIC: Lazy<BTreeSet<BuiltinTypeName_>> = Lazy::new(|| {
+    [
+        BuiltinTypeName_::U8,
+        BuiltinTypeName_::U16,
+        BuiltinTypeName_::U32,
+        BuiltinTypeName_::U64,
+        BuiltinTypeName_::U128,
+        BuiltinTypeName_::U256,
+    ]
+    .into_iter()
+    .collect()
+});
+
+static BUILTIN_TYPE_BITS: Lazy<BTreeSet<BuiltinTypeName_>> =
+    Lazy::new(|| BUILTIN_TYPE_NUMERIC.clone());
+
+static BUILTIN_TYPE_ORDERED: Lazy<BTreeSet<BuiltinTypeName_>> =
+    Lazy::new(|| BUILTIN_TYPE_BITS.clone());
+
+impl BuiltinTypeName_ {
+    pub const ADDRESS: &'static str = "address";
+    pub const SIGNER: &'static str = "signer";
+    pub const U_8: &'static str = "u8";
+    pub const U_16: &'static str = "u16";
+    pub const U_32: &'static str = "u32";
+    pub const U_64: &'static str = "u64";
+    pub const U_128: &'static str = "u128";
+    pub const U_256: &'static str = "u256";
+    pub const BOOL: &'static str = "bool";
+    pub const VECTOR: &'static str = "vector";
+
+    pub fn all_names() -> &'static BTreeSet<Symbol> {
+        &BUILTIN_TYPE_ALL_NAMES
+    }
+
+    pub fn numeric() -> &'static BTreeSet<BuiltinTypeName_> {
+        &BUILTIN_TYPE_NUMERIC
+    }
+
+    pub fn bits() -> &'static BTreeSet<BuiltinTypeName_> {
+        &BUILTIN_TYPE_BITS
+    }
+
+    pub fn ordered() -> &'static BTreeSet<BuiltinTypeName_> {
+        &BUILTIN_TYPE_ORDERED
+    }
+
+    pub fn is_numeric(&self) -> bool {
+        Self::numeric().contains(self)
+    }
+
+    pub fn resolve(name_str: &str) -> Option<Self> {
+        use BuiltinTypeName_ as BT;
+        match name_str {
+            BT::ADDRESS => Some(BT::Address),
+            BT::SIGNER => Some(BT::Signer),
+            BT::U_8 => Some(BT::U8),
+            BT::U_16 => Some(BT::U16),
+            BT::U_32 => Some(BT::U32),
+            BT::U_64 => Some(BT::U64),
+            BT::U_128 => Some(BT::U128),
+            BT::U_256 => Some(BT::U256),
+            BT::BOOL => Some(BT::Bool),
+            BT::VECTOR => Some(BT::Vector),
+            _ => None,
+        }
+    }
+
+    pub fn declared_abilities(&self, loc: Loc) -> AbilitySet {
+        use BuiltinTypeName_ as B;
+        // Match here to make sure this function is fixed when collections are added
+        match self {
+            B::Address | B::U8 | B::U16 | B::U32 | B::U64 | B::U128 | B::U256 | B::Bool => {
+                AbilitySet::primitives(loc)
+            }
+            B::Signer => AbilitySet::signer(loc),
+            B::Vector => AbilitySet::collection(loc),
+        }
+    }
+
+    pub fn tparam_constraints(&self, _loc: Loc) -> Vec<AbilitySet> {
+        use BuiltinTypeName_ as B;
+        // Match here to make sure this function is fixed when collections are added
+        match self {
+            B::Address
+            | B::Signer
+            | B::U8
+            | B::U16
+            | B::U32
+            | B::U64
+            | B::U128
+            | B::U256
+            | B::Bool => vec![],
+            B::Vector => vec![AbilitySet::empty()],
+        }
+    }
+}
+
+impl TParamID {
+    pub fn next() -> TParamID {
+        TParamID(Counter::next())
+    }
+}
+
+impl TVar {
+    pub fn next() -> TVar {
+        TVar(Counter::next())
+    }
+}
+
+static BUILTIN_FUNCTION_ALL_NAMES: Lazy<BTreeSet<Symbol>> = Lazy::new(|| {
+    [BuiltinFunction_::FREEZE, BuiltinFunction_::ASSERT_MACRO]
+        .into_iter()
+        .map(Symbol::from)
+        .collect()
+});
+
+impl BuiltinFunction_ {
+    pub const FREEZE: &'static str = "freeze";
+    pub const ASSERT_MACRO: &'static str = "assert";
+
+    pub fn all_names() -> &'static BTreeSet<Symbol> {
+        &BUILTIN_FUNCTION_ALL_NAMES
+    }
+
+    pub fn resolve(name_str: &str, arg: Option<Type>) -> Option<Self> {
+        use BuiltinFunction_ as BF;
+        match name_str {
+            BF::FREEZE => Some(BF::Freeze(arg)),
+            _ => None,
+        }
+    }
+
+    pub fn display_name(&self) -> &'static str {
+        use BuiltinFunction_ as BF;
+        match self {
+            BF::Freeze(_) => BF::FREEZE,
+            BF::Assert(_) => BF::ASSERT_MACRO,
+        }
+    }
+}
+
+impl TypeName_ {
+    pub fn is(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> bool {
+        match self {
+            TypeName_::Builtin(_) | TypeName_::Multiple(_) => false,
+            TypeName_::ModuleType(mident, n) => {
+                mident.value.is(address, module) && n == name.as_ref()
+            }
+        }
+    }
+}
+
+impl Type_ {
+    pub fn builtin_(b: BuiltinTypeName, ty_args: Vec<Type>) -> Type_ {
+        use BuiltinTypeName_ as B;
+        let abilities = match &b.value {
+            B::Address | B::U8 | B::U16 | B::U32 | B::U64 | B::U128 | B::U256 | B::Bool => {
+                Some(AbilitySet::primitives(b.loc))
+            }
+            B::Signer => Some(AbilitySet::signer(b.loc)),
+            B::Vector => None,
+        };
+        let n = sp(b.loc, TypeName_::Builtin(b));
+        Type_::Apply(abilities, n, ty_args)
+    }
+
+    pub fn builtin(loc: Loc, b: BuiltinTypeName, ty_args: Vec<Type>) -> Type {
+        sp(loc, Self::builtin_(b, ty_args))
+    }
+
+    pub fn bool(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::Bool), vec![])
+    }
+
+    pub fn address(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::Address), vec![])
+    }
+
+    pub fn signer(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::Signer), vec![])
+    }
+
+    pub fn u8(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U8), vec![])
+    }
+
+    pub fn u16(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U16), vec![])
+    }
+
+    pub fn u32(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U32), vec![])
+    }
+
+    pub fn u64(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U64), vec![])
+    }
+
+    pub fn u128(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U128), vec![])
+    }
+
+    pub fn u256(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U256), vec![])
+    }
+
+    pub fn vector(loc: Loc, elem: Type) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::Vector), vec![elem])
+    }
+
+    pub fn multiple(loc: Loc, tys: Vec<Type>) -> Type {
+        sp(loc, Self::multiple_(loc, tys))
+    }
+
+    pub fn multiple_(loc: Loc, mut tys: Vec<Type>) -> Type_ {
+        match tys.len() {
+            0 => Type_::Unit,
+            1 => tys.pop().unwrap().value,
+            n => Type_::Apply(None, sp(loc, TypeName_::Multiple(n)), tys),
+        }
+    }
+
+    pub fn builtin_name(&self) -> Option<&BuiltinTypeName> {
+        match self {
+            Type_::Apply(_, sp!(_, TypeName_::Builtin(b)), _) => Some(b),
+            _ => None,
+        }
+    }
+
+    pub fn type_name(&self) -> Option<&TypeName> {
+        match self {
+            Type_::Apply(_, tn, _) => Some(tn),
+            _ => None,
+        }
+    }
+
+    pub fn unfold_to_type_name(&self) -> Option<&TypeName> {
+        match self {
+            Type_::Apply(_, tn, _) => Some(tn),
+            Type_::Ref(_, inner) => return inner.value.unfold_to_type_name(),
+            _ => None,
+        }
+    }
+
+    pub fn is(
+        &self,
+        address: impl AsRef<str>,
+        module: impl AsRef<str>,
+        name: impl AsRef<str>,
+    ) -> bool {
+        self.type_name()
+            .is_some_and(|tn| tn.value.is(address, module, name))
+    }
+
+    pub fn abilities(&self, loc: Loc) -> Option<AbilitySet> {
+        match self {
+            Type_::Apply(abilities, _, _) => abilities.clone(),
+            Type_::Param(tp) => Some(tp.abilities.clone()),
+            Type_::Unit => Some(AbilitySet::collection(loc)),
+            Type_::Ref(_, _) => Some(AbilitySet::references(loc)),
+            Type_::Anything | Type_::UnresolvedError => Some(AbilitySet::all(loc)),
+            Type_::Var(_) => None,
+        }
+    }
+
+    pub fn has_ability_(&self, ability: Ability_) -> Option<bool> {
+        match self {
+            Type_::Apply(abilities, _, _) => abilities.as_ref().map(|s| s.has_ability_(ability)),
+            Type_::Param(tp) => Some(tp.abilities.has_ability_(ability)),
+            Type_::Unit => Some(AbilitySet::COLLECTION.contains(&ability)),
+            Type_::Ref(_, _) => Some(AbilitySet::REFERENCES.contains(&ability)),
+            Type_::Anything | Type_::UnresolvedError => Some(true),
+            Type_::Var(_) => None,
+        }
+    }
+}
+
+impl Value_ {
+    pub fn type_(&self, loc: Loc) -> Option<Type> {
+        use Value_::*;
+        Some(match self {
+            Address(_) => Type_::address(loc),
+            InferredNum(_) => return None,
+            U8(_) => Type_::u8(loc),
+            U16(_) => Type_::u16(loc),
+            U32(_) => Type_::u32(loc),
+            U64(_) => Type_::u64(loc),
+            U128(_) => Type_::u128(loc),
+            U256(_) => Type_::u256(loc),
+            Bool(_) => Type_::bool(loc),
+            Bytearray(_) => Type_::vector(loc, Type_::u8(loc)),
+        })
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for BuiltinTypeName_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use BuiltinTypeName_ as BT;
+        write!(
+            f,
+            "{}",
+            match self {
+                BT::Address => BT::ADDRESS,
+                BT::Signer => BT::SIGNER,
+                BT::U8 => BT::U_8,
+                BT::U16 => BT::U_16,
+                BT::U32 => BT::U_32,
+                BT::U64 => BT::U_64,
+                BT::U128 => BT::U_128,
+                BT::U256 => BT::U_256,
+                BT::Bool => BT::BOOL,
+                BT::Vector => BT::VECTOR,
+            }
+        )
+    }
+}
+
+impl fmt::Display for TypeName_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use TypeName_::*;
+        match self {
+            Multiple(_) => panic!("ICE cannot display expr-list type name"),
+            Builtin(b) => write!(f, "{}", b),
+            ModuleType(m, n) => write!(f, "{}::{}", m, n),
+        }
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.inner.ast_debug(w)
+    }
+}
+
+impl AstDebug for Program_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self { modules, scripts } = self;
+        for (m, mdef) in modules.key_cloned_iter() {
+            w.write(&format!("module {}", m));
+            w.block(|w| mdef.ast_debug(w));
+            w.new_line();
+        }
+
+        for (n, s) in scripts {
+            w.write(&format!("script {}", n));
+            w.block(|w| s.ast_debug(w));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for Neighbor_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Neighbor_::Dependency => w.write("neighbor#dependency"),
+            Neighbor_::Friend => w.write("neighbor#friend"),
+        }
+    }
+}
+
+impl AstDebug for UseFun {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let UseFun {
+            loc: _,
+            attributes,
+            is_public,
+            target_function: (target_m, target_f),
+            kind,
+        } = self;
+        attributes.ast_debug(w);
+        w.new_line();
+        if is_public.is_some() {
+            w.write("public ")
+        }
+        let kind_str = match kind {
+            UseFunKind::Explicit => "",
+            UseFunKind::UseAlias { used: true } => "#used",
+            UseFunKind::UseAlias { used: false } => "#unused",
+            UseFunKind::FunctionDeclaration => "#fundecl",
+        };
+        w.write(&format!("use{kind_str} {target_m}::{target_f}"));
+    }
+}
+
+impl AstDebug for (&TypeName, &UniqueMap<Name, UseFun>) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (tn, methods) = *self;
+        for (_, method_f, use_fun) in methods {
+            use_fun.ast_debug(w);
+            w.write(" as ");
+            tn.ast_debug(w);
+            w.writeln(&format!(".{method_f};"));
+        }
+    }
+}
+
+impl AstDebug for ResolvedUseFuns {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        for (tn, methods) in self {
+            (tn, methods).ast_debug(w);
+        }
+    }
+}
+
+impl AstDebug for UseFuns {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            resolved,
+            implicit_candidates,
+        } = self;
+        resolved.ast_debug(w);
+        w.write("unresolved ");
+        w.block(|w| {
+            for (_, _, implicit) in implicit_candidates {
+                implicit.ast_debug(w)
+            }
+        })
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            warning_filter,
+            package_name,
+            attributes,
+            loc: _loc,
+            use_funs,
+            constants,
+            function_name,
+            function,
+            spec_dependencies,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        use_funs.ast_debug(w);
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        (*function_name, function).ast_debug(w);
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            loc: _,
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            use_funs,
+            friends,
+            structs,
+            constants,
+            functions,
+            spec_dependencies,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        if *is_source_module {
+            w.writeln("library module")
+        } else {
+            w.writeln("source module")
+        }
+        use_funs.ast_debug(w);
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for (mident, _loc) in friends.key_cloned_iter() {
+            w.write(&format!("friend {};", mident));
+            w.new_line();
+        }
+        for sdef in structs.key_cloned_iter() {
+            sdef.ast_debug(w);
+            w.new_line();
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        for fdef in functions.key_cloned_iter() {
+            fdef.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for (StructName, &StructDefinition) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            StructDefinition {
+                warning_filter,
+                index,
+                attributes,
+                abilities,
+                type_parameters,
+                fields,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        if let StructFields::Native(_) = fields {
+            w.write("native ");
+        }
+        w.write(&format!("struct#{index} {name}"));
+        type_parameters.ast_debug(w);
+        ability_modifiers_ast_debug(w, abilities);
+        if let StructFields::Defined(fields) = fields {
+            w.block(|w| {
+                w.list(fields, ",", |w, (_, f, idx_st)| {
+                    let (idx, st) = idx_st;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    st.ast_debug(w);
+                    true
+                })
+            })
+        }
+    }
+}
+
+impl AstDebug for (FunctionName, &Function) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Function {
+                warning_filter,
+                index,
+                attributes,
+                visibility,
+                entry,
+                signature,
+                body,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun#{index} {name}"));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined(body) => body.ast_debug(w),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for FunctionSignature {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let FunctionSignature {
+            type_parameters,
+            parameters,
+            return_type,
+        } = self;
+        type_parameters.ast_debug(w);
+        w.write("(");
+        w.comma(parameters, |w, (mut_, v, st)| {
+            if mut_.is_some() {
+                w.write("mut ");
+            }
+            v.ast_debug(w);
+            w.write(": ");
+            st.ast_debug(w);
+        });
+        w.write("): ");
+        return_type.ast_debug(w)
+    }
+}
+
+impl AstDebug for Var_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self { name, id, color } = self;
+        let id = *id;
+        let color = *color;
+        w.write(&format!("{name}"));
+        if id != 0 {
+            w.write(&format!("#{id}"));
+        }
+        if color != 0 {
+            w.write(&format!("#{color}"));
+        }
+    }
+}
+
+impl AstDebug for Vec<TParam> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">")
+        }
+    }
+}
+
+impl AstDebug for Vec<StructTypeParameter> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">")
+        }
+    }
+}
+
+impl AstDebug for (ConstantName, &Constant) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Constant {
+                warning_filter,
+                index,
+                attributes,
+                loc: _loc,
+                signature,
+                value,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        w.write(&format!("const#{index} {name}:"));
+        signature.ast_debug(w);
+        w.write(" = ");
+        value.ast_debug(w);
+        w.write(";");
+    }
+}
+
+impl AstDebug for BuiltinTypeName_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self));
+    }
+}
+
+impl AstDebug for TypeName_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            TypeName_::Multiple(len) => w.write(&format!("Multiple({})", len)),
+            TypeName_::Builtin(bt) => bt.ast_debug(w),
+            TypeName_::ModuleType(m, s) => w.write(&format!("{}::{}", m, s)),
+        }
+    }
+}
+
+impl AstDebug for TParam {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let TParam {
+            id,
+            user_specified_name,
+            abilities,
+        } = self;
+        w.write(&format!("{}#{}", user_specified_name, id.0));
+        ability_constraints_ast_debug(w, abilities);
+    }
+}
+
+impl AstDebug for StructTypeParameter {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self { is_phantom, param } = self;
+        if *is_phantom {
+            w.write("phantom ");
+        }
+        param.ast_debug(w);
+    }
+}
+
+impl AstDebug for Type_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Type_::Unit => w.write("()"),
+            Type_::Ref(mut_, s) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                s.ast_debug(w)
+            }
+            Type_::Param(tp) => tp.ast_debug(w),
+            Type_::Apply(abilities_opt, sp!(_, TypeName_::Multiple(_)), ss) => {
+                let w_ty = move |w: &mut AstWriter| {
+                    w.write("(");
+                    ss.ast_debug(w);
+                    w.write(")");
+                };
+                match abilities_opt {
+                    None => w_ty(w),
+                    Some(abilities) => w.annotate_gen(w_ty, abilities, |w, annot| {
+                        w.list(annot, "+", |w, a| {
+                            a.ast_debug(w);
+                            false
+                        })
+                    }),
+                }
+            }
+            Type_::Apply(abilities_opt, m, ss) => {
+                let w_ty = move |w: &mut AstWriter| {
+                    m.ast_debug(w);
+                    if !ss.is_empty() {
+                        w.write("<");
+                        ss.ast_debug(w);
+                        w.write(">");
+                    }
+                };
+                match abilities_opt {
+                    None => w_ty(w),
+                    Some(abilities) => w.annotate_gen(w_ty, abilities, |w, annot| {
+                        w.list(annot, "+", |w, a| {
+                            a.ast_debug(w);
+                            false
+                        })
+                    }),
+                }
+            }
+            Type_::Var(tv) => w.write(&format!("#{}", tv.0)),
+            Type_::Anything => w.write("_"),
+            Type_::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for Vec<Type> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, s| s.ast_debug(w))
+    }
+}
+
+impl AstDebug for Sequence {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.block(|w| {
+            let (use_funs, items) = self;
+            use_funs.ast_debug(w);
+            w.semicolon(items, |w, item| item.ast_debug(w))
+        })
+    }
+}
+
+impl AstDebug for SequenceItem_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SequenceItem_ as I;
+        match self {
+            I::Seq(e) => e.ast_debug(w),
+            I::Declare(sp!(_, bs), ty_opt) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                if let Some(ty) = ty_opt {
+                    ty.ast_debug(w)
+                }
+            }
+            I::Bind(sp!(_, bs), e) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                w.write(" = ");
+                e.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for Exp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Exp_ as E;
+        match self {
+            E::Unit { trailing } if !trailing => w.write("()"),
+            E::Unit {
+                trailing: _trailing,
+            } => w.write("/*()*/"),
+            E::Value(v) => v.ast_debug(w),
+            E::Move(v) => {
+                w.write("move ");
+                v.ast_debug(w)
+            }
+            E::Copy(v) => {
+                w.write("copy ");
+                v.ast_debug(w)
+            }
+            E::Use(v) => v.ast_debug(w),
+            E::Constant(None, c) => w.write(&format!("{}", c)),
+            E::Constant(Some(m), c) => w.write(&format!("{}::{}", m, c)),
+            E::ModuleCall(m, f, tys_opt, sp!(_, rhs)) => {
+                w.write(&format!("{}::{}", m, f));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::MethodCall(e, f, tys_opt, sp!(_, rhs)) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", f));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Builtin(bf, sp!(_, rhs)) => {
+                bf.ast_debug(w);
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Vector(_loc, ty_opt, sp!(_, elems)) => {
+                w.write("vector");
+                if let Some(ty) = ty_opt {
+                    w.write("<");
+                    ty.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("[");
+                w.comma(elems, |w, e| e.ast_debug(w));
+                w.write("]");
+            }
+            E::Pack(m, s, tys_opt, fields) => {
+                w.write(&format!("{}::{}", m, s));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_e)| {
+                    let (idx, e) = idx_e;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    e.ast_debug(w);
+                });
+                w.write("}");
+            }
+            E::IfElse(b, t, f) => {
+                w.write("if (");
+                b.ast_debug(w);
+                w.write(") ");
+                t.ast_debug(w);
+                w.write(" else ");
+                f.ast_debug(w);
+            }
+            E::While(b, e) => {
+                w.write("while (");
+                b.ast_debug(w);
+                w.write(")");
+                e.ast_debug(w);
+            }
+            E::Loop(e) => {
+                w.write("loop ");
+                e.ast_debug(w);
+            }
+            E::Block(seq) => seq.ast_debug(w),
+            E::ExpList(es) => {
+                w.write("(");
+                w.comma(es, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+
+            E::Assign(sp!(_, lvalues), rhs) => {
+                lvalues.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            E::FieldMutate(ed, rhs) => {
+                ed.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            E::Mutate(lhs, rhs) => {
+                w.write("*");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+
+            E::Return(e) => {
+                w.write("return ");
+                e.ast_debug(w);
+            }
+            E::Abort(e) => {
+                w.write("abort ");
+                e.ast_debug(w);
+            }
+            E::Break => w.write("break"),
+            E::Continue => w.write("continue"),
+            E::Dereference(e) => {
+                w.write("*");
+                e.ast_debug(w)
+            }
+            E::UnaryExp(op, e) => {
+                op.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::BinopExp(l, op, r) => {
+                l.ast_debug(w);
+                w.write(" ");
+                op.ast_debug(w);
+                w.write(" ");
+                r.ast_debug(w)
+            }
+            E::Borrow(mut_, e) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+            }
+            E::DerefBorrow(ed) => {
+                w.write("(&*)");
+                ed.ast_debug(w)
+            }
+            E::Cast(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" as ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Annotate(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(": ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Spec(u, used_locals) => {
+                w.write(&format!("spec #{}", u));
+                if !used_locals.is_empty() {
+                    w.write("uses [");
+                    w.comma(used_locals, |w, n| n.ast_debug(w));
+                    w.write("]");
+                }
+            }
+            E::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for BuiltinFunction_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use BuiltinFunction_ as F;
+        let (n, bt) = match self {
+            F::Freeze(bt) => (F::FREEZE, bt),
+            F::Assert(_) => (F::ASSERT_MACRO, &None),
+        };
+        w.write(n);
+        if let Some(bt) = bt {
+            w.write("<");
+            bt.ast_debug(w);
+            w.write(">");
+        }
+    }
+}
+
+impl AstDebug for ExpDotted_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use ExpDotted_ as D;
+        match self {
+            D::Exp(e) => e.ast_debug(w),
+            D::Dot(e, n) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", n))
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<LValue> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, b| b.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for LValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use LValue_ as L;
+        match self {
+            L::Ignore => w.write("_"),
+            L::Var {
+                mut_,
+                var,
+                unused_binding,
+            } => {
+                if mut_.is_some() {
+                    w.write("mut ");
+                }
+                var.ast_debug(w);
+                if *unused_binding {
+                    w.write("#unused");
+                }
+            }
+            L::Unpack(m, s, tys_opt, fields) => {
+                w.write(&format!("{}::{}", m, s));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_b)| {
+                    let (idx, b) = idx_b;
+                    w.write(&format!("{}#{}: ", idx, f));
+                    b.ast_debug(w);
+                });
+                w.write("}");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/naming/fake_natives.rs b/vendors/move/crates/move-compiler/src/naming/fake_natives.rs
new file mode 100644
index 000000000..66cc38931
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/naming/fake_natives.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module verifies the usage of the "fake native" functions. These functions are declared
+//! as 'native`, but do not appear in the compiled module. For developer sanity, they must be marked
+//! with the `FAKE_NATIVE_ATTR`
+
+use std::convert::TryInto;
+
+use crate::{
+    diag,
+    expansion::ast::{Address, AttributeName_, ModuleIdent, ModuleIdent_},
+    naming::ast as N,
+    parser::ast::FunctionName,
+    shared::{
+        known_attributes::{KnownAttribute, NativeAttribute},
+        CompilationEnv, Identifier,
+    },
+};
+use move_ir_types::ast as IR;
+use move_symbol_pool::symbol;
+
+pub const FAKE_NATIVE_ATTR: AttributeName_ =
+    AttributeName_::Known(KnownAttribute::Native(NativeAttribute::BytecodeInstruction));
+
+/// verify `FAKE_NATIVE_ATTR` usage
+pub fn function(
+    env: &mut CompilationEnv,
+    module_opt: Option<ModuleIdent>,
+    function_name: FunctionName,
+    function: &N::Function,
+) {
+    let loc = match function.attributes.get_loc_(&FAKE_NATIVE_ATTR) {
+        None => return,
+        Some(loc) => *loc,
+    };
+    let module = match module_opt {
+        Some(module) => module,
+        None => {
+            let msg = format!(
+                "Invalid usage of '{}' attribute to map function to bytecode instruction.",
+                NativeAttribute::BYTECODE_INSTRUCTION
+            );
+            let smsg = "Script functions are never mapped to bytecode instructions";
+            let diag = diag!(
+                Attributes::InvalidBytecodeInst,
+                (loc, msg),
+                (function_name.loc(), smsg),
+            );
+            env.add_diag(diag);
+            return;
+        }
+    };
+    if resolve_builtin(&module, &function_name).is_none() {
+        let attr_msg = format!(
+            "Invalid usage of '{}' attribute to map function to bytecode instruction.",
+            NativeAttribute::BYTECODE_INSTRUCTION
+        );
+        let name_msg = format!(
+            "No known mapping of '{}::{}' to bytecode instruction",
+            module, function_name
+        );
+        let diag = diag!(
+            Attributes::InvalidBytecodeInst,
+            (loc, attr_msg),
+            (function_name.loc(), name_msg),
+        );
+        env.add_diag(diag);
+    }
+    match &function.body.value {
+        N::FunctionBody_::Native => (),
+        N::FunctionBody_::Defined(_) => {
+            let attr_msg = format!(
+                "Invalid usage of '{}' attribute on non-native function",
+                NativeAttribute::BYTECODE_INSTRUCTION
+            );
+            let diag = diag!(Attributes::InvalidBytecodeInst, (loc, attr_msg));
+            env.add_diag(diag);
+        }
+    }
+}
+
+/// Resolve the mapping for a module + function name to a bytecode instruction.
+/// The function should already be verified by `function` above
+pub fn resolve_builtin(
+    module: &ModuleIdent,
+    function: &FunctionName,
+) -> Option<fn(Vec<IR::Type>) -> IR::Bytecode_> {
+    let sp!(_, ModuleIdent_ { address, module }) = module;
+    // Only resolve if either (a) the address is named "std" or (b) its value is 0x1
+    match address {
+        Address::Numerical {
+            name: Some(sp!(_, n)),
+            ..
+        }
+        | Address::NamedUnassigned(sp!(_, n))
+            if *n == symbol!("std") => {}
+        _ => return None,
+    };
+    Some(match (module.value().as_str(), function.value().as_str()) {
+        ("vector", "empty") => |tys| IR::Bytecode_::VecPack(expect_one_ty_arg(tys), 0),
+        ("vector", "length") => |tys| IR::Bytecode_::VecLen(expect_one_ty_arg(tys)),
+        ("vector", "borrow") => |tys| IR::Bytecode_::VecImmBorrow(expect_one_ty_arg(tys)),
+        ("vector", "push_back") => |tys| IR::Bytecode_::VecPushBack(expect_one_ty_arg(tys)),
+        ("vector", "borrow_mut") => |tys| IR::Bytecode_::VecMutBorrow(expect_one_ty_arg(tys)),
+        ("vector", "pop_back") => |tys| IR::Bytecode_::VecPopBack(expect_one_ty_arg(tys)),
+        ("vector", "destroy_empty") => |tys| IR::Bytecode_::VecUnpack(expect_one_ty_arg(tys), 0),
+        ("vector", "swap") => |tys| IR::Bytecode_::VecSwap(expect_one_ty_arg(tys)),
+        _ => return None,
+    })
+}
+
+fn expect_one_ty_arg(ty_args: Vec<IR::Type>) -> IR::Type {
+    let [ty]: [IR::Type; 1] = ty_args
+        .try_into()
+        .expect("ICE native bytecode function expected a single type argument");
+    ty
+}
diff --git a/vendors/move/crates/move-compiler/src/naming/mod.rs b/vendors/move/crates/move-compiler/src/naming/mod.rs
new file mode 100644
index 000000000..e93fefbd1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/naming/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod ast;
+pub(crate) mod fake_natives;
+pub(crate) mod resolve_use_funs;
+pub(crate) mod translate;
diff --git a/vendors/move/crates/move-compiler/src/naming/resolve_use_funs.rs b/vendors/move/crates/move-compiler/src/naming/resolve_use_funs.rs
new file mode 100644
index 000000000..cbe76d9c0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/naming/resolve_use_funs.rs
@@ -0,0 +1,373 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::diag;
+use crate::expansion::ast::{self as E, ModuleIdent};
+use crate::naming::ast as N;
+use crate::parser::ast::{FunctionName, Visibility};
+use crate::shared::{program_info::NamingProgramInfo, unique_map::UniqueMap, *};
+use crate::typing::core;
+use move_ir_types::location::*;
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+struct Context<'env, 'info> {
+    env: &'env mut CompilationEnv,
+    info: &'info NamingProgramInfo,
+    current_module: Option<ModuleIdent>,
+}
+
+impl<'env, 'info> Context<'env, 'info> {
+    fn new(env: &'env mut CompilationEnv, info: &'info NamingProgramInfo) -> Self {
+        Self {
+            env,
+            info,
+            current_module: None,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(env: &mut CompilationEnv, info: &mut NamingProgramInfo, inner: &mut N::Program_) {
+    let mut context = Context::new(env, info);
+    let N::Program_ { modules, scripts } = inner;
+    for (mident, mdef) in modules.key_cloned_iter_mut() {
+        module(&mut context, mident, mdef);
+    }
+    for s in scripts.values_mut() {
+        script(&mut context, s);
+    }
+    let module_use_funs = modules
+        .key_cloned_iter()
+        .map(|(mident, mdef)| {
+            let N::UseFuns {
+                resolved,
+                implicit_candidates,
+            } = &mdef.use_funs;
+            assert!(implicit_candidates.is_empty());
+            (mident, resolved.clone())
+        })
+        .collect();
+    info.set_use_funs(module_use_funs);
+}
+
+fn module(context: &mut Context, mident: ModuleIdent, mdef: &mut N::ModuleDefinition) {
+    context.current_module = Some(mident);
+    context
+        .env
+        .add_warning_filter_scope(mdef.warning_filter.clone());
+    use_funs(context, &mut mdef.use_funs);
+    for (_, _, c) in &mut mdef.constants {
+        constant(context, c);
+    }
+    for (_, _, f) in &mut mdef.functions {
+        function(context, f);
+    }
+    context.env.pop_warning_filter_scope();
+}
+
+fn script(context: &mut Context, s: &mut N::Script) {
+    context.current_module = None;
+    context
+        .env
+        .add_warning_filter_scope(s.warning_filter.clone());
+    use_funs(context, &mut s.use_funs);
+    for (_, _, c) in &mut s.constants {
+        constant(context, c);
+    }
+    function(context, &mut s.function);
+    context.env.pop_warning_filter_scope();
+}
+
+fn constant(context: &mut Context, c: &mut N::Constant) {
+    context
+        .env
+        .add_warning_filter_scope(c.warning_filter.clone());
+    exp(context, &mut c.value);
+    context.env.pop_warning_filter_scope();
+}
+
+fn function(context: &mut Context, function: &mut N::Function) {
+    context
+        .env
+        .add_warning_filter_scope(function.warning_filter.clone());
+    if let N::FunctionBody_::Defined(seq) = &mut function.body.value {
+        sequence(context, seq)
+    }
+    context.env.pop_warning_filter_scope();
+}
+
+//**************************************************************************************************
+// Resolution
+//**************************************************************************************************
+
+fn use_funs(context: &mut Context, uf: &mut N::UseFuns) {
+    let N::UseFuns {
+        resolved,
+        implicit_candidates,
+    } = uf;
+    // remove any incorrect resolved functions
+    for (tn, methods) in &mut *resolved {
+        *methods = std::mem::take(methods).filter_map(|method, mut nuf| {
+            let loc = nuf.loc;
+            let (m, f) = nuf.target_function;
+            let kind = nuf.kind;
+            assert!(
+                kind == N::UseFunKind::Explicit,
+                "ICE all resolved use funs should be explicit at this stage. kind {kind:?}"
+            );
+            let (first_ty_loc, first_ty) = first_arg_type(context, &m, &f);
+            let is_valid = match first_ty
+                .as_ref()
+                .and_then(|ty| ty.value.unfold_to_type_name())
+            {
+                Some(first_tn) => first_tn == tn,
+                None => false,
+            };
+            if is_valid {
+                if let Some(public_loc) = nuf.is_public {
+                    let defining_module = match &tn.value {
+                        N::TypeName_::Multiple(_) => panic!("ICE unexpected tuple type"),
+                        N::TypeName_::Builtin(sp!(_, bt_)) => context.env.primitive_definer(*bt_),
+                        N::TypeName_::ModuleType(m, _) => Some(m),
+                    };
+                    if context.current_module.as_ref() != defining_module {
+                        let msg = "Invalid visibility for 'use fun' declaration";
+                        let vis_msg = format!(
+                            "Module level 'use fun' declarations can be '{}' for the \
+                            module's types, otherwise they must be internal to the declared scope.",
+                            Visibility::PUBLIC
+                        );
+                        let mut diag = diag!(
+                            Declarations::InvalidUseFun,
+                            (loc, msg),
+                            (public_loc, vis_msg)
+                        );
+                        if let Some(m) = defining_module {
+                            diag.add_secondary_label((
+                                m.loc,
+                                format!("The type '{tn}' is defined here"),
+                            ))
+                        }
+                        context.env.add_diag(diag);
+                        nuf.is_public = None;
+                    }
+                }
+                Some(nuf)
+            } else {
+                let msg = format!(
+                    "Invalid 'use fun' for '{tn}.{method}'. \
+                    Expected a '{tn}' type as the first argument \
+                    (either by reference '&' '&mut' or by value)",
+                );
+                let first_tn_msg = match first_ty {
+                    Some(ty) => {
+                        let tys_str = core::error_format(&ty, &core::Subst::empty());
+                        format!("But '{m}::{f}' has a first argument of type {tys_str}")
+                    }
+                    None => format!("But '{m}::{f}' takes no arguments"),
+                };
+                context.env.add_diag(diag!(
+                    Declarations::InvalidUseFun,
+                    (loc, msg),
+                    (first_ty_loc, first_tn_msg),
+                ));
+                None
+            }
+        });
+    }
+    // remove any empty use funs
+    resolved.retain(|_, methods| !methods.is_empty());
+
+    // resolve implicit candidates, removing if
+    // - It is not a valid method (i.e. if it would be invalid to declare as a 'use fun')
+    // - The name is already bound
+    for (method, implicit) in std::mem::take(implicit_candidates) {
+        let E::ImplicitUseFunCandidate {
+            loc,
+            attributes,
+            is_public,
+            function: (target_m, target_f),
+            kind: ekind,
+        } = implicit;
+        let Some((target_f, tn)) = is_valid_method(context, &target_m, target_f) else {
+            if matches!(ekind, E::ImplicitUseFunKind::UseAlias { used: false }) {
+                let msg = format!("Unused 'use' of alias '{}'. Consider removing it", method);
+                context
+                    .env
+                    .add_diag(diag!(UnusedItem::Alias, (method.loc, msg),))
+            }
+            continue;
+        };
+        let kind = match ekind {
+            E::ImplicitUseFunKind::FunctionDeclaration => N::UseFunKind::FunctionDeclaration,
+            E::ImplicitUseFunKind::UseAlias { used } => {
+                assert!(is_public.is_none());
+                N::UseFunKind::UseAlias { used }
+            }
+        };
+        let nuf = N::UseFun {
+            loc,
+            attributes,
+            is_public,
+            target_function: (target_m, target_f),
+            kind,
+        };
+        let nuf_loc = nuf.loc;
+        let methods = resolved.entry(tn.clone()).or_insert_with(UniqueMap::new);
+        if let Err((_, prev)) = methods.add(method, nuf) {
+            let msg = format!("Duplicate 'use fun' for '{}.{}'", tn, method);
+            let tn_msg = match ekind {
+                E::ImplicitUseFunKind::UseAlias { .. } => {
+                    "'use' function aliases create an implicit 'use fun' when their first \
+                    argument is a type defined in that module"
+                }
+                E::ImplicitUseFunKind::FunctionDeclaration => {
+                    "Function declarations create an implicit 'use fun' when their first \
+                    argument is a type defined in the same module"
+                }
+            };
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (nuf_loc, msg),
+                (prev, "Previously declared here"),
+                (tn.loc, tn_msg)
+            ))
+        }
+    }
+}
+
+fn is_valid_method(
+    context: &mut Context,
+    target_m: &ModuleIdent,
+    target_f: Name,
+) -> Option<(FunctionName, N::TypeName)> {
+    let target_f = FunctionName(target_f);
+    // possible the function was removed, e.g. a spec function
+    if !context
+        .info
+        .module(target_m)
+        .functions
+        .contains_key(&target_f)
+    {
+        return None;
+    }
+    let (_, first_ty) = first_arg_type(context, target_m, &target_f);
+    let first_ty = first_ty?;
+    let tn = first_ty.value.unfold_to_type_name()?;
+    let defining_module = match &tn.value {
+        N::TypeName_::Multiple(_) => return None,
+        N::TypeName_::Builtin(sp!(_, bt_)) => context.env.primitive_definer(*bt_)?,
+        N::TypeName_::ModuleType(m, _) => m,
+    };
+    if defining_module == target_m {
+        Some((target_f, tn.clone()))
+    } else {
+        None
+    }
+}
+
+fn first_arg_type(
+    context: &mut Context,
+    m: &ModuleIdent,
+    f: &FunctionName,
+) -> (Loc, Option<N::Type>) {
+    let finfo = context.info.function_info(m, f);
+    match finfo
+        .signature
+        .parameters
+        .first()
+        .map(|(_, _, t)| t.clone())
+    {
+        None => (finfo.defined_loc, None),
+        Some(t) => (t.loc, Some(t)),
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, (uf, seq): &mut N::Sequence) {
+    use_funs(context, uf);
+    for sp!(_, item_) in seq {
+        match item_ {
+            N::SequenceItem_::Seq(e) | N::SequenceItem_::Bind(_, e) => exp(context, e),
+            N::SequenceItem_::Declare(_, _) => (),
+        }
+    }
+}
+
+fn exp(context: &mut Context, sp!(_, e_): &mut N::Exp) {
+    match e_ {
+        N::Exp_::Value(_)
+        | N::Exp_::Move(_)
+        | N::Exp_::Copy(_)
+        | N::Exp_::Use(_)
+        | N::Exp_::Constant(_, _)
+        | N::Exp_::Break
+        | N::Exp_::Continue
+        | N::Exp_::Unit { .. }
+        | N::Exp_::Spec(_, _)
+        | N::Exp_::UnresolvedError => (),
+        N::Exp_::Return(e)
+        | N::Exp_::Abort(e)
+        | N::Exp_::Dereference(e)
+        | N::Exp_::UnaryExp(_, e)
+        | N::Exp_::Cast(e, _)
+        | N::Exp_::Assign(_, e)
+        | N::Exp_::Loop(e)
+        | N::Exp_::Annotate(e, _) => exp(context, e),
+        N::Exp_::IfElse(econd, et, ef) => {
+            exp(context, econd);
+            exp(context, et);
+            exp(context, ef);
+        }
+        N::Exp_::While(econd, ebody) => {
+            exp(context, econd);
+            exp(context, ebody)
+        }
+        N::Exp_::Block(s) => sequence(context, s),
+        N::Exp_::FieldMutate(ed, e) => {
+            exp_dotted(context, ed);
+            exp(context, e)
+        }
+        N::Exp_::Mutate(el, er) | N::Exp_::BinopExp(el, _, er) => {
+            exp(context, el);
+            exp(context, er)
+        }
+        N::Exp_::Pack(_, _, _, fields) => {
+            for (_, _, (_, e)) in fields {
+                exp(context, e)
+            }
+        }
+        N::Exp_::Builtin(_, sp!(_, es))
+        | N::Exp_::Vector(_, _, sp!(_, es))
+        | N::Exp_::ModuleCall(_, _, _, sp!(_, es))
+        | N::Exp_::ExpList(es) => {
+            for e in es {
+                exp(context, e)
+            }
+        }
+        N::Exp_::MethodCall(ed, _, _, sp!(_, es)) => {
+            exp_dotted(context, ed);
+            for e in es {
+                exp(context, e)
+            }
+        }
+
+        N::Exp_::DerefBorrow(ed) | N::Exp_::Borrow(_, ed) => exp_dotted(context, ed),
+    }
+}
+
+fn exp_dotted(context: &mut Context, sp!(_, ed_): &mut N::ExpDotted) {
+    match ed_ {
+        N::ExpDotted_::Exp(e) => exp(context, e),
+        N::ExpDotted_::Dot(ed, _) => exp_dotted(context, ed),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/naming/translate.rs b/vendors/move/crates/move-compiler/src/naming/translate.rs
new file mode 100644
index 000000000..049b3f1c1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/naming/translate.rs
@@ -0,0 +1,2239 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag,
+    diagnostics::codes::*,
+    editions::FeatureGate,
+    expansion::{
+        ast::{self as E, AbilitySet, ModuleIdent, Visibility},
+        translate::is_valid_struct_constant_or_schema_name as is_constant_name,
+    },
+    naming::ast::{self as N, Neighbor_},
+    parser::ast::{self as P, ConstantName, Field, FunctionName, StructName},
+    shared::{program_info::NamingProgramInfo, unique_map::UniqueMap, *},
+    FullyCompiledProgram,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, BTreeSet};
+
+use super::{
+    ast::{Neighbor, TParamID},
+    fake_natives,
+};
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+enum ResolvedType {
+    Module(Box<ResolvedModuleType>),
+    TParam(Loc, N::TParam),
+    BuiltinType(N::BuiltinTypeName_),
+    Unbound,
+}
+
+#[derive(Debug, Clone)]
+struct ResolvedModuleType {
+    // original names/locs are provided to preserve loc information if needed
+    original_loc: Loc,
+    original_type_name: Name,
+    module_type: ModuleType,
+}
+
+#[derive(Debug, Clone)]
+struct ModuleType {
+    original_mident: ModuleIdent,
+    decl_loc: Loc,
+    arity: usize,
+    is_positional: bool,
+}
+
+enum ResolvedFunction {
+    Builtin(N::BuiltinFunction),
+    Module(Box<ResolvedModuleFunction>),
+    Unbound,
+}
+
+struct ResolvedModuleFunction {
+    // original names/locs are provided to preserve loc information if needed
+    module: ModuleIdent,
+    function: FunctionName,
+    ty_args: Option<Vec<N::Type>>,
+}
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+    current_module: Option<ModuleIdent>,
+    scoped_types: BTreeMap<ModuleIdent, BTreeMap<Symbol, ModuleType>>,
+    unscoped_types: BTreeMap<Symbol, ResolvedType>,
+    scoped_functions: BTreeMap<ModuleIdent, BTreeMap<Symbol, Loc>>,
+    unscoped_constants: BTreeMap<Symbol, Loc>,
+    scoped_constants: BTreeMap<ModuleIdent, BTreeMap<Symbol, Loc>>,
+    local_scopes: Vec<BTreeMap<Symbol, u16>>,
+    local_count: BTreeMap<Symbol, u16>,
+    used_locals: BTreeSet<N::Var_>,
+    /// Type parameters used in a function (they have to be cleared after processing each function).
+    used_fun_tparams: BTreeSet<TParamID>,
+    /// Indicates if the compiler is currently translating a function (set to true before starting
+    /// to translate a function and to false after translation is over).
+    translating_fun: bool,
+    current_package: Option<Symbol>,
+}
+
+impl<'env> Context<'env> {
+    fn new(
+        compilation_env: &'env mut CompilationEnv,
+        pre_compiled_lib: Option<&FullyCompiledProgram>,
+        prog: &E::Program,
+    ) -> Self {
+        use ResolvedType as RT;
+        let all_modules = || {
+            prog.modules
+                .key_cloned_iter()
+                .chain(pre_compiled_lib.iter().flat_map(|pre_compiled| {
+                    pre_compiled
+                        .expansion
+                        .modules
+                        .key_cloned_iter()
+                        .filter(|(mident, _m)| !prog.modules.contains_key(mident))
+                }))
+        };
+        let scoped_types = all_modules()
+            .map(|(mident, mdef)| {
+                let mems = mdef
+                    .structs
+                    .key_cloned_iter()
+                    .map(|(s, sdef)| {
+                        let arity = sdef.type_parameters.len();
+                        let sname = s.value();
+                        let is_positional = matches!(sdef.fields, E::StructFields::Positional(_));
+                        let type_info = ModuleType {
+                            original_mident: mident,
+                            decl_loc: s.loc(),
+                            arity,
+                            is_positional,
+                        };
+                        (sname, type_info)
+                    })
+                    .collect();
+                (mident, mems)
+            })
+            .collect();
+        let scoped_functions = all_modules()
+            .map(|(mident, mdef)| {
+                let mems = mdef
+                    .functions
+                    .iter()
+                    .map(|(nloc, n, _)| (*n, nloc))
+                    .collect();
+                (mident, mems)
+            })
+            .collect();
+        let scoped_constants = all_modules()
+            .map(|(mident, mdef)| {
+                let mems = mdef
+                    .constants
+                    .iter()
+                    .map(|(nloc, n, _)| (*n, nloc))
+                    .collect();
+                (mident, mems)
+            })
+            .collect();
+        let unscoped_types = N::BuiltinTypeName_::all_names()
+            .iter()
+            .map(|s| {
+                let b_ = RT::BuiltinType(N::BuiltinTypeName_::resolve(s.as_str()).unwrap());
+                (*s, b_)
+            })
+            .collect();
+        Self {
+            env: compilation_env,
+            current_module: None,
+            scoped_types,
+            scoped_functions,
+            scoped_constants,
+            unscoped_types,
+            unscoped_constants: BTreeMap::new(),
+            local_scopes: vec![],
+            local_count: BTreeMap::new(),
+            used_locals: BTreeSet::new(),
+            used_fun_tparams: BTreeSet::new(),
+            translating_fun: false,
+            current_package: None,
+        }
+    }
+
+    fn resolve_module(&mut self, m: &ModuleIdent) -> bool {
+        // NOTE: piggybacking on `scoped_functions` to provide a set of modules in the context。
+        // TODO: a better solution would be to have a single `BTreeMap<ModuleIdent, ModuleInfo>`
+        // in the context that can be used to resolve modules, types, and functions.
+        let resolved = self.scoped_functions.contains_key(m);
+        if !resolved {
+            self.env.add_diag(diag!(
+                NameResolution::UnboundModule,
+                (m.loc, format!("Unbound module '{}'", m))
+            ))
+        }
+        resolved
+    }
+
+    fn resolve_module_type(&mut self, loc: Loc, m: &ModuleIdent, n: &Name) -> Option<ModuleType> {
+        let types = match self.scoped_types.get(m) {
+            None => {
+                self.env.add_diag(diag!(
+                    NameResolution::UnboundModule,
+                    (m.loc, format!("Unbound module '{}'", m)),
+                ));
+                return None;
+            }
+            Some(members) => members,
+        };
+        match types.get(&n.value) {
+            None => {
+                let msg = format!(
+                    "Invalid module access. Unbound struct '{}' in module '{}'",
+                    n, m
+                );
+                self.env
+                    .add_diag(diag!(NameResolution::UnboundModuleMember, (loc, msg)));
+                None
+            }
+            Some(module_type) => Some(module_type.clone()),
+        }
+    }
+
+    fn resolve_module_function(
+        &mut self,
+        loc: Loc,
+        m: &ModuleIdent,
+        n: &Name,
+    ) -> Option<FunctionName> {
+        let functions = match self.scoped_functions.get(m) {
+            None => {
+                self.env.add_diag(diag!(
+                    NameResolution::UnboundModule,
+                    (m.loc, format!("Unbound module '{}'", m)),
+                ));
+                return None;
+            }
+            Some(members) => members,
+        };
+        match functions.get(&n.value).cloned() {
+            None => {
+                let msg = format!(
+                    "Invalid module access. Unbound function '{}' in module '{}'",
+                    n, m
+                );
+                self.env
+                    .add_diag(diag!(NameResolution::UnboundModuleMember, (loc, msg)));
+                None
+            }
+            Some(_) => Some(FunctionName(*n)),
+        }
+    }
+
+    fn resolve_module_constant(
+        &mut self,
+        loc: Loc,
+        m: &ModuleIdent,
+        n: Name,
+    ) -> Option<ConstantName> {
+        let constants = match self.scoped_constants.get(m) {
+            None => {
+                self.env.add_diag(diag!(
+                    NameResolution::UnboundModule,
+                    (m.loc, format!("Unbound module '{}'", m)),
+                ));
+                return None;
+            }
+            Some(members) => members,
+        };
+        match constants.get(&n.value).cloned() {
+            None => {
+                let msg = format!(
+                    "Invalid module access. Unbound constant '{}' in module '{}'",
+                    n, m
+                );
+                self.env
+                    .add_diag(diag!(NameResolution::UnboundModuleMember, (loc, msg)));
+                None
+            }
+            Some(_) => Some(ConstantName(n)),
+        }
+    }
+
+    fn resolve_type(&mut self, sp!(nloc, ma_): E::ModuleAccess) -> ResolvedType {
+        use E::ModuleAccess_ as EN;
+        match ma_ {
+            EN::Name(n) => self.resolve_unscoped_type(nloc, n),
+            EN::ModuleAccess(m, n) => {
+                let Some(module_type) = self.resolve_module_type(nloc, &m, &n) else {
+                    assert!(self.env.has_errors());
+                    return ResolvedType::Unbound;
+                };
+                let mt = ResolvedModuleType {
+                    original_loc: nloc,
+                    original_type_name: n,
+                    module_type: ModuleType {
+                        original_mident: m,
+                        ..module_type
+                    },
+                };
+                ResolvedType::Module(Box::new(mt))
+            }
+        }
+    }
+
+    fn resolve_unscoped_type(&mut self, loc: Loc, n: Name) -> ResolvedType {
+        match self.unscoped_types.get(&n.value) {
+            None => {
+                let msg = format!("Unbound type '{}' in current scope", n);
+                self.env
+                    .add_diag(diag!(NameResolution::UnboundType, (loc, msg)));
+                ResolvedType::Unbound
+            }
+            Some(rn) => rn.clone(),
+        }
+    }
+
+    fn resolves_to_struct(&self, sp!(_, ma_): &E::ModuleAccess) -> bool {
+        use E::ModuleAccess_ as EA;
+        match ma_ {
+            EA::Name(n) => self.unscoped_types.get(&n.value).is_some_and(|rt| {
+                matches!(rt, ResolvedType::Module(_) | ResolvedType::BuiltinType(_))
+            }),
+            EA::ModuleAccess(m, n) => self
+                .scoped_types
+                .get(m)
+                .and_then(|types| types.get(&n.value))
+                .is_some(),
+        }
+    }
+
+    fn resolve_struct_name(
+        &mut self,
+        loc: Loc,
+        verb: &str,
+        ma: E::ModuleAccess,
+        etys_opt: Option<Vec<E::Type>>,
+    ) -> Option<(ModuleIdent, StructName, Option<Vec<N::Type>>, bool)> {
+        match self.resolve_type(ma) {
+            ResolvedType::Unbound => {
+                assert!(self.env.has_errors());
+                None
+            }
+            rt @ (ResolvedType::BuiltinType(_) | ResolvedType::TParam(_, _)) => {
+                let (rtloc, msg) = match rt {
+                    ResolvedType::TParam(loc, tp) => (
+                        loc,
+                        format!(
+                            "But '{}' was declared as a type parameter here",
+                            tp.user_specified_name
+                        ),
+                    ),
+                    ResolvedType::BuiltinType(n) => {
+                        (ma.loc, format!("But '{n}' is a builtin type"))
+                    }
+                    _ => unreachable!(),
+                };
+                self.env.add_diag(diag!(
+                    NameResolution::NamePositionMismatch,
+                    (ma.loc, format!("Invalid {}. Expected a struct name", verb)),
+                    (rtloc, msg)
+                ));
+                None
+            }
+            ResolvedType::Module(mt) => {
+                let ResolvedModuleType {
+                    module_type:
+                        ModuleType {
+                            original_mident: m,
+                            arity,
+                            is_positional,
+                            ..
+                        },
+                    original_type_name: n,
+                    ..
+                } = *mt;
+                let tys_opt = etys_opt.map(|etys| {
+                    let tys = types(self, etys);
+                    let name_f = || format!("{}::{}", &m, &n);
+                    check_type_argument_arity(self, loc, name_f, tys, arity)
+                });
+                Some((m, StructName(n), tys_opt, is_positional))
+            }
+        }
+    }
+
+    fn resolve_constant(
+        &mut self,
+        sp!(loc, ma_): E::ModuleAccess,
+    ) -> Option<(Option<ModuleIdent>, ConstantName)> {
+        use E::ModuleAccess_ as EA;
+        match ma_ {
+            EA::Name(n) => match self.unscoped_constants.get(&n.value) {
+                None => {
+                    self.env.add_diag(diag!(
+                        NameResolution::UnboundUnscopedName,
+                        (loc, format!("Unbound constant '{}'", n)),
+                    ));
+                    None
+                }
+                Some(_) => Some((None, ConstantName(n))),
+            },
+            EA::ModuleAccess(m, n) => match self.resolve_module_constant(loc, &m, n) {
+                None => {
+                    assert!(self.env.has_errors());
+                    None
+                }
+                Some(cname) => Some((Some(m), cname)),
+            },
+        }
+    }
+
+    fn bind_type(&mut self, s: Symbol, rt: ResolvedType) {
+        self.unscoped_types.insert(s, rt);
+    }
+
+    fn bind_constant(&mut self, s: Symbol, loc: Loc) {
+        self.unscoped_constants.insert(s, loc);
+    }
+
+    fn save_unscoped(&self) -> (BTreeMap<Symbol, ResolvedType>, BTreeMap<Symbol, Loc>) {
+        (self.unscoped_types.clone(), self.unscoped_constants.clone())
+    }
+
+    fn restore_unscoped(
+        &mut self,
+        (types, constants): (BTreeMap<Symbol, ResolvedType>, BTreeMap<Symbol, Loc>),
+    ) {
+        self.unscoped_types = types;
+        self.unscoped_constants = constants;
+    }
+
+    fn new_local_scope(&mut self) {
+        let cur = self.local_scopes.last().unwrap().clone();
+        self.local_scopes.push(cur)
+    }
+
+    fn close_local_scope(&mut self) {
+        self.local_scopes.pop();
+    }
+
+    fn declare_local(&mut self, is_parameter: bool, sp!(vloc, name): Name) -> N::Var {
+        let default = if is_parameter { 0 } else { 1 };
+        let id = *self
+            .local_count
+            .entry(name)
+            .and_modify(|c| *c += 1)
+            .or_insert(default);
+        self.local_scopes.last_mut().unwrap().insert(name, id);
+        // all locals start at color zero
+        // they will be incremented when substituted for macros
+        let nvar_ = N::Var_ { name, id, color: 0 };
+        sp(vloc, nvar_)
+    }
+
+    fn resolve_local(&mut self, loc: Loc, verb: &str, sp!(vloc, name): Name) -> Option<N::Var> {
+        let id_opt = self.local_scopes.last().unwrap().get(&name).copied();
+        match id_opt {
+            None => {
+                let msg = format!("Invalid {}. Unbound variable '{}'", verb, name);
+                self.env
+                    .add_diag(diag!(NameResolution::UnboundVariable, (loc, msg)));
+                None
+            }
+            Some(id) => {
+                // all locals start at color zero
+                // they will be incremented when substituted for macros
+                let nvar_ = N::Var_ { name, id, color: 0 };
+                self.used_locals.insert(nvar_);
+                Some(sp(vloc, nvar_))
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: E::Program,
+) -> N::Program {
+    let mut context = Context::new(compilation_env, pre_compiled_lib, &prog);
+    let E::Program {
+        modules: emodules,
+        scripts: escripts,
+    } = prog;
+    let modules = modules(&mut context, emodules);
+    let scripts = scripts(&mut context, escripts);
+    let mut inner = N::Program_ { modules, scripts };
+    let mut info = NamingProgramInfo::new(pre_compiled_lib, &inner);
+    super::resolve_use_funs::program(compilation_env, &mut info, &mut inner);
+    N::Program { info, inner }
+}
+
+fn modules(
+    context: &mut Context,
+    modules: UniqueMap<ModuleIdent, E::ModuleDefinition>,
+) -> UniqueMap<ModuleIdent, N::ModuleDefinition> {
+    modules.map(|ident, mdef| module(context, ident, mdef))
+}
+
+fn module(
+    context: &mut Context,
+    ident: ModuleIdent,
+    mdef: E::ModuleDefinition,
+) -> N::ModuleDefinition {
+    context.current_module = Some(ident);
+    let E::ModuleDefinition {
+        loc,
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        use_funs: euse_funs,
+        friends: efriends,
+        structs: estructs,
+        functions: efunctions,
+        constants: econstants,
+        specs,
+    } = mdef;
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let unscoped = context.save_unscoped();
+    let mut spec_dependencies = BTreeSet::new();
+    spec_blocks(&mut spec_dependencies, &specs);
+    let use_funs = use_funs(context, euse_funs);
+    let friends = efriends.filter_map(|mident, f| friend(context, mident, f));
+    let structs = estructs.map(|name, s| {
+        context.restore_unscoped(unscoped.clone());
+        struct_def(context, name, s)
+    });
+    let functions = efunctions.map(|name, f| {
+        context.restore_unscoped(unscoped.clone());
+        function(context, &mut spec_dependencies, Some(ident), name, f)
+    });
+    let constants = econstants.map(|name, c| {
+        context.restore_unscoped(unscoped.clone());
+        constant(context, name, c)
+    });
+    context.restore_unscoped(unscoped);
+    context.env.pop_warning_filter_scope();
+    context.current_package = None;
+    N::ModuleDefinition {
+        loc,
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        use_funs,
+        friends,
+        structs,
+        constants,
+        functions,
+        spec_dependencies,
+    }
+}
+
+fn scripts(
+    context: &mut Context,
+    escripts: BTreeMap<Symbol, E::Script>,
+) -> BTreeMap<Symbol, N::Script> {
+    escripts
+        .into_iter()
+        .map(|(n, s)| (n, script(context, s)))
+        .collect()
+}
+
+fn script(context: &mut Context, escript: E::Script) -> N::Script {
+    let E::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        use_funs: euse_funs,
+        constants: econstants,
+        function_name,
+        function: efunction,
+        specs,
+    } = escript;
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let outer_unscoped = context.save_unscoped();
+    let mut spec_dependencies = BTreeSet::new();
+    spec_blocks(&mut spec_dependencies, &specs);
+    let use_funs = use_funs(context, euse_funs);
+    for (loc, s, _) in &econstants {
+        context.bind_constant(*s, loc)
+    }
+    let inner_unscoped = context.save_unscoped();
+    let constants = econstants.map(|name, c| {
+        context.restore_unscoped(inner_unscoped.clone());
+        constant(context, name, c)
+    });
+    context.restore_unscoped(inner_unscoped);
+    let function = function(
+        context,
+        &mut spec_dependencies,
+        None,
+        function_name,
+        efunction,
+    );
+    context.restore_unscoped(outer_unscoped);
+    context.env.pop_warning_filter_scope();
+    context.current_package = None;
+    N::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        use_funs,
+        constants,
+        function_name,
+        function,
+        spec_dependencies,
+    }
+}
+
+//**************************************************************************************************
+// Use Funs
+//**************************************************************************************************
+
+fn use_funs(context: &mut Context, eufs: E::UseFuns) -> N::UseFuns {
+    let E::UseFuns {
+        explicit: eexplicit,
+        implicit: eimplicit,
+    } = eufs;
+    let mut resolved = N::ResolvedUseFuns::new();
+    let resolved_vec: Vec<_> = eexplicit
+        .into_iter()
+        .flat_map(|e| explicit_use_fun(context, e))
+        .collect();
+    for (tn, method, nuf) in resolved_vec {
+        let methods = resolved.entry(tn.clone()).or_default();
+        let nuf_loc = nuf.loc;
+        if let Err((_, prev)) = methods.add(method, nuf) {
+            let msg = format!("Duplicate 'use fun' for '{}.{}'", tn, method);
+            context.env.add_diag(diag!(
+                Declarations::DuplicateItem,
+                (nuf_loc, msg),
+                (prev, "Previously declared here"),
+            ))
+        }
+    }
+    N::UseFuns {
+        resolved,
+        implicit_candidates: eimplicit,
+    }
+}
+
+fn explicit_use_fun(
+    context: &mut Context,
+    e: E::ExplicitUseFun,
+) -> Option<(N::TypeName, Name, N::UseFun)> {
+    let E::ExplicitUseFun {
+        loc,
+        attributes,
+        is_public,
+        function,
+        ty,
+        method,
+    } = e;
+    let m_f_opt = match resolve_function(context, loc, function, None) {
+        ResolvedFunction::Module(mf) => {
+            let ResolvedModuleFunction {
+                module,
+                function,
+                ty_args,
+            } = *mf;
+            assert!(ty_args.is_none());
+            Some((module, function))
+        }
+        ResolvedFunction::Builtin(_) => {
+            let msg = "Invalid 'use fun'. Cannot use a builtin function as a method";
+            context
+                .env
+                .add_diag(diag!(Declarations::InvalidUseFun, (loc, msg)));
+            None
+        }
+        ResolvedFunction::Unbound => {
+            assert!(context.env.has_errors());
+            None
+        }
+    };
+    let tn_opt = match context.resolve_type(ty) {
+        ResolvedType::Unbound => {
+            assert!(context.env.has_errors());
+            None
+        }
+        ResolvedType::TParam(tloc, tp) => {
+            let tmsg = format!(
+                "But '{}' was declared as a type parameter here",
+                tp.user_specified_name
+            );
+            context.env.add_diag(diag!(
+                Declarations::InvalidUseFun,
+                (
+                    loc,
+                    "Invalid 'use fun'. Cannot associate a method a type parameter"
+                ),
+                (tloc, tmsg)
+            ));
+            None
+        }
+        ResolvedType::BuiltinType(bt_) => Some(N::TypeName_::Builtin(sp(ty.loc, bt_))),
+        ResolvedType::Module(mt) => Some(N::TypeName_::ModuleType(
+            mt.module_type.original_mident,
+            StructName(mt.original_type_name),
+        )),
+    };
+    let tn_ = tn_opt?;
+    let tn = sp(ty.loc, tn_);
+    if let Some(pub_loc) = is_public {
+        let current_module = context.current_module;
+        if let Err(def_loc_opt) = use_fun_module_defines(context, current_module, &tn) {
+            let msg = "Invalid 'use fun'. Cannot publicly associate a function with a \
+                type defined in another module";
+            let pub_msg = format!(
+                "Declared '{}' here. Consider removing to make a local 'use fun' instead",
+                Visibility::PUBLIC
+            );
+            let mut diag = diag!(Declarations::InvalidUseFun, (loc, msg), (pub_loc, pub_msg));
+            if let Some(def_loc) = def_loc_opt {
+                diag.add_secondary_label((def_loc, "Type defined in another module here"));
+            }
+            context.env.add_diag(diag);
+            return None;
+        }
+    }
+    let target_function = m_f_opt?;
+    let use_fun = N::UseFun {
+        loc,
+        attributes,
+        is_public,
+        target_function,
+        kind: N::UseFunKind::Explicit,
+    };
+    Some((tn, method, use_fun))
+}
+
+fn use_fun_module_defines(
+    context: &mut Context,
+    specified: Option<ModuleIdent>,
+    tn: &N::TypeName,
+) -> Result<(), Option<Loc>> {
+    match &tn.value {
+        N::TypeName_::Builtin(sp!(_, b_)) => {
+            let definer_opt = context.env.primitive_definer(*b_);
+            match (definer_opt, &specified) {
+                (None, _) => Err(None),
+                (Some(d), None) => Err(Some(d.loc)),
+                (Some(d), Some(s)) => {
+                    if d == s {
+                        Ok(())
+                    } else {
+                        Err(Some(d.loc))
+                    }
+                }
+            }
+        }
+        N::TypeName_::ModuleType(m, s) => {
+            if specified.as_ref().is_some_and(|s| s == m) {
+                Ok(())
+            } else {
+                let ModuleType { decl_loc, .. } = context
+                    .scoped_types
+                    .get(m)
+                    .unwrap()
+                    .get(&s.value())
+                    .unwrap();
+                Err(Some(*decl_loc))
+            }
+        }
+        N::TypeName_::Multiple(_) => panic!("ICE tuple should not be reachable from use fun"),
+    }
+}
+
+//**************************************************************************************************
+// Friends
+//**************************************************************************************************
+
+fn friend(context: &mut Context, mident: ModuleIdent, friend: E::Friend) -> Option<E::Friend> {
+    let current_mident = context.current_module.as_ref().unwrap();
+    if mident.value.address != current_mident.value.address {
+        // NOTE: in alignment with the bytecode verifier, this constraint is a policy decision
+        // rather than a technical requirement. The compiler, VM, and bytecode verifier DO NOT
+        // rely on the assumption that friend modules must reside within the same account address.
+        let msg = "Cannot declare modules out of the current address as a friend";
+        context.env.add_diag(diag!(
+            Declarations::InvalidFriendDeclaration,
+            (friend.loc, "Invalid friend declaration"),
+            (mident.loc, msg),
+        ));
+        None
+    } else if &mident == current_mident {
+        context.env.add_diag(diag!(
+            Declarations::InvalidFriendDeclaration,
+            (friend.loc, "Invalid friend declaration"),
+            (mident.loc, "Cannot declare the module itself as a friend"),
+        ));
+        None
+    } else if context.resolve_module(&mident) {
+        Some(friend)
+    } else {
+        assert!(context.env.has_errors());
+        None
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function(
+    context: &mut Context,
+    spec_dependencies: &mut BTreeSet<(ModuleIdent, Neighbor)>,
+    module_opt: Option<ModuleIdent>,
+    name: FunctionName,
+    ef: E::Function,
+) -> N::Function {
+    let E::Function {
+        warning_filter,
+        index,
+        attributes,
+        loc: _,
+        visibility,
+        entry,
+        signature,
+        body,
+        specs,
+    } = ef;
+    assert!(context.local_scopes.is_empty());
+    assert!(context.local_count.is_empty());
+    assert!(context.used_locals.is_empty());
+    assert!(context.used_fun_tparams.is_empty());
+    assert!(!context.translating_fun);
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    spec_blocks(spec_dependencies, specs.values());
+    context.local_scopes = vec![BTreeMap::new()];
+    context.local_count = BTreeMap::new();
+    context.translating_fun = true;
+    let signature = function_signature(context, signature);
+    let body = function_body(context, body);
+
+    if !matches!(body.value, N::FunctionBody_::Native) {
+        for tparam in &signature.type_parameters {
+            if !context.used_fun_tparams.contains(&tparam.id) {
+                let sp!(loc, n) = tparam.user_specified_name;
+                let msg = format!("Unused type parameter '{}'.", n);
+                context
+                    .env
+                    .add_diag(diag!(UnusedItem::FunTypeParam, (loc, msg)))
+            }
+        }
+    }
+
+    let mut f = N::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility,
+        entry,
+        signature,
+        body,
+    };
+    fake_natives::function(context.env, module_opt, name, &f);
+    let used_locals = std::mem::take(&mut context.used_locals);
+    remove_unused_bindings_function(context, &used_locals, &mut f);
+    context.local_scopes = vec![];
+    context.local_count = BTreeMap::new();
+    context.used_locals = BTreeSet::new();
+    context.used_fun_tparams = BTreeSet::new();
+    context.env.pop_warning_filter_scope();
+    context.translating_fun = false;
+    f
+}
+
+fn function_signature(context: &mut Context, sig: E::FunctionSignature) -> N::FunctionSignature {
+    let type_parameters = fun_type_parameters(context, sig.type_parameters);
+
+    let mut declared = UniqueMap::new();
+    let parameters = sig
+        .parameters
+        .into_iter()
+        .map(|(mut_, param, param_ty)| {
+            if let Err((param, prev_loc)) = declared.add(param, ()) {
+                if !param.is_underscore() {
+                    let msg = format!("Duplicate parameter with name '{}'", param);
+                    context.env.add_diag(diag!(
+                        Declarations::DuplicateItem,
+                        (param.loc(), msg),
+                        (prev_loc, "Previously declared here"),
+                    ))
+                }
+            }
+            let is_parameter = true;
+            let nparam = context.declare_local(is_parameter, param.0);
+            let nparam_ty = type_(context, param_ty);
+            (mut_, nparam, nparam_ty)
+        })
+        .collect();
+    let return_type = type_(context, sig.return_type);
+    N::FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    }
+}
+
+fn function_body(context: &mut Context, sp!(loc, b_): E::FunctionBody) -> N::FunctionBody {
+    match b_ {
+        E::FunctionBody_::Native => sp(loc, N::FunctionBody_::Native),
+        E::FunctionBody_::Defined(es) => sp(loc, N::FunctionBody_::Defined(sequence(context, es))),
+    }
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_def(
+    context: &mut Context,
+    _name: StructName,
+    sdef: E::StructDefinition,
+) -> N::StructDefinition {
+    let E::StructDefinition {
+        warning_filter,
+        index,
+        attributes,
+        loc: _loc,
+        abilities,
+        type_parameters,
+        fields,
+    } = sdef;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    let type_parameters = struct_type_parameters(context, type_parameters);
+    let fields = struct_fields(context, fields);
+    context.env.pop_warning_filter_scope();
+    N::StructDefinition {
+        warning_filter,
+        index,
+        attributes,
+        abilities,
+        type_parameters,
+        fields,
+    }
+}
+
+fn positional_field_name(loc: Loc, idx: usize) -> Field {
+    Field::add_loc(loc, format!("{idx}").into())
+}
+
+fn struct_fields(context: &mut Context, efields: E::StructFields) -> N::StructFields {
+    match efields {
+        E::StructFields::Native(loc) => N::StructFields::Native(loc),
+        E::StructFields::Named(em) => {
+            N::StructFields::Defined(em.map(|_f, (idx, t)| (idx, type_(context, t))))
+        }
+        E::StructFields::Positional(tys) => {
+            let fields = tys
+                .into_iter()
+                .map(|ty| type_(context, ty))
+                .enumerate()
+                .map(|(idx, ty)| {
+                    let field_name = positional_field_name(ty.loc, idx);
+                    (field_name, (idx, ty))
+                });
+            N::StructFields::Defined(UniqueMap::maybe_from_iter(fields).unwrap())
+        }
+    }
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+fn constant(context: &mut Context, _name: ConstantName, econstant: E::Constant) -> N::Constant {
+    let E::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature: esignature,
+        value: evalue,
+    } = econstant;
+    assert!(context.local_scopes.is_empty());
+    assert!(context.local_count.is_empty());
+    assert!(context.used_locals.is_empty());
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    context.local_scopes = vec![BTreeMap::new()];
+    let signature = type_(context, esignature);
+    let value = exp_(context, evalue);
+    context.local_scopes = vec![];
+    context.local_count = BTreeMap::new();
+    context.used_locals = BTreeSet::new();
+    context.env.pop_warning_filter_scope();
+    N::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value,
+    }
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn fun_type_parameters(
+    context: &mut Context,
+    type_parameters: Vec<(Name, AbilitySet)>,
+) -> Vec<N::TParam> {
+    let mut unique_tparams = UniqueMap::new();
+    type_parameters
+        .into_iter()
+        .map(|(name, abilities)| type_parameter(context, &mut unique_tparams, name, abilities))
+        .collect()
+}
+
+fn struct_type_parameters(
+    context: &mut Context,
+    type_parameters: Vec<E::StructTypeParameter>,
+) -> Vec<N::StructTypeParameter> {
+    let mut unique_tparams = UniqueMap::new();
+    type_parameters
+        .into_iter()
+        .map(|param| {
+            let is_phantom = param.is_phantom;
+            let param = type_parameter(context, &mut unique_tparams, param.name, param.constraints);
+            N::StructTypeParameter { param, is_phantom }
+        })
+        .collect()
+}
+
+fn type_parameter(
+    context: &mut Context,
+    unique_tparams: &mut UniqueMap<Name, ()>,
+    name: Name,
+    abilities: AbilitySet,
+) -> N::TParam {
+    let id = N::TParamID::next();
+    let user_specified_name = name;
+    let tp = N::TParam {
+        id,
+        user_specified_name,
+        abilities,
+    };
+    let loc = name.loc;
+    context.bind_type(name.value, ResolvedType::TParam(loc, tp.clone()));
+    if let Err((name, old_loc)) = unique_tparams.add(name, ()) {
+        let msg = format!("Duplicate type parameter declared with name '{}'", name);
+        context.env.add_diag(diag!(
+            Declarations::DuplicateItem,
+            (loc, msg),
+            (old_loc, "Type parameter previously defined here"),
+        ))
+    }
+    tp
+}
+
+fn types(context: &mut Context, tys: Vec<E::Type>) -> Vec<N::Type> {
+    tys.into_iter().map(|t| type_(context, t)).collect()
+}
+
+fn type_(context: &mut Context, sp!(loc, ety_): E::Type) -> N::Type {
+    use ResolvedType as RT;
+    use E::Type_ as ET;
+    use N::{TypeName_ as NN, Type_ as NT};
+    let ty_ = match ety_ {
+        ET::Unit => NT::Unit,
+        ET::Multiple(tys) => {
+            NT::multiple_(loc, tys.into_iter().map(|t| type_(context, t)).collect())
+        }
+        ET::Ref(mut_, inner) => NT::Ref(mut_, Box::new(type_(context, *inner))),
+        ET::UnresolvedError => {
+            assert!(context.env.has_errors());
+            NT::UnresolvedError
+        }
+        ET::Apply(ma, tys) => match context.resolve_type(ma) {
+            RT::Unbound => {
+                assert!(context.env.has_errors());
+                NT::UnresolvedError
+            }
+            RT::BuiltinType(bn_) => {
+                let name_f = || format!("{}", &bn_);
+                let arity = bn_.tparam_constraints(loc).len();
+                let tys = types(context, tys);
+                let tys = check_type_argument_arity(context, loc, name_f, tys, arity);
+                NT::builtin_(sp(ma.loc, bn_), tys)
+            }
+            RT::TParam(_, tp) => {
+                if !tys.is_empty() {
+                    context.env.add_diag(diag!(
+                        NameResolution::NamePositionMismatch,
+                        (loc, "Generic type parameters cannot take type arguments"),
+                    ));
+                    NT::UnresolvedError
+                } else {
+                    if context.translating_fun {
+                        context.used_fun_tparams.insert(tp.id);
+                    }
+                    NT::Param(tp)
+                }
+            }
+            RT::Module(mt) => {
+                let ResolvedModuleType {
+                    original_loc: nloc,
+                    original_type_name: n,
+                    module_type:
+                        ModuleType {
+                            original_mident: m,
+                            arity,
+                            ..
+                        },
+                } = *mt;
+                let tn = sp(nloc, NN::ModuleType(m, StructName(n)));
+                let tys = types(context, tys);
+                let name_f = || format!("{}", tn);
+                let tys = check_type_argument_arity(context, loc, name_f, tys, arity);
+                NT::Apply(None, tn, tys)
+            }
+        },
+        ET::Fun(_, _) => panic!("ICE only allowed in spec context"),
+    };
+    sp(loc, ty_)
+}
+
+fn check_type_argument_arity<F: FnOnce() -> String>(
+    context: &mut Context,
+    loc: Loc,
+    name_f: F,
+    mut ty_args: Vec<N::Type>,
+    arity: usize,
+) -> Vec<N::Type> {
+    let args_len = ty_args.len();
+    if args_len != arity {
+        let diag_code = if args_len > arity {
+            NameResolution::TooManyTypeArguments
+        } else {
+            NameResolution::TooFewTypeArguments
+        };
+        let msg = format!(
+            "Invalid instantiation of '{}'. Expected {} type argument(s) but got {}",
+            name_f(),
+            arity,
+            args_len
+        );
+        context.env.add_diag(diag!(diag_code, (loc, msg)));
+    }
+
+    while ty_args.len() > arity {
+        ty_args.pop();
+    }
+
+    while ty_args.len() < arity {
+        ty_args.push(sp(loc, N::Type_::UnresolvedError))
+    }
+
+    ty_args
+}
+
+//**************************************************************************************************
+// Exp
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, (euse_funs, seq): E::Sequence) -> N::Sequence {
+    context.new_local_scope();
+    let nuse_funs = use_funs(context, euse_funs);
+    let nseq = seq.into_iter().map(|s| sequence_item(context, s)).collect();
+    context.close_local_scope();
+    (nuse_funs, nseq)
+}
+
+fn sequence_item(context: &mut Context, sp!(loc, ns_): E::SequenceItem) -> N::SequenceItem {
+    use E::SequenceItem_ as ES;
+    use N::SequenceItem_ as NS;
+
+    let s_ = match ns_ {
+        ES::Seq(e) => NS::Seq(exp_(context, e)),
+        ES::Declare(b, ty_opt) => {
+            let bind_opt = bind_list(context, b);
+            let tys = ty_opt.map(|t| type_(context, t));
+            match bind_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    NS::Seq(sp(loc, N::Exp_::UnresolvedError))
+                }
+                Some(bind) => NS::Declare(bind, tys),
+            }
+        }
+        ES::Bind(b, e) => {
+            let e = exp_(context, e);
+            let bind_opt = bind_list(context, b);
+            match bind_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    NS::Seq(sp(loc, N::Exp_::UnresolvedError))
+                }
+                Some(bind) => NS::Bind(bind, e),
+            }
+        }
+    };
+    sp(loc, s_)
+}
+
+fn call_args(context: &mut Context, sp!(loc, es): Spanned<Vec<E::Exp>>) -> Spanned<Vec<N::Exp>> {
+    sp(loc, exps(context, es))
+}
+
+fn exps(context: &mut Context, es: Vec<E::Exp>) -> Vec<N::Exp> {
+    es.into_iter().map(|e| exp_(context, e)).collect()
+}
+
+fn exp(context: &mut Context, e: E::Exp) -> Box<N::Exp> {
+    Box::new(exp_(context, e))
+}
+
+fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
+    use E::Exp_ as EE;
+    use N::Exp_ as NE;
+    let sp!(eloc, e_) = e;
+    let ne_ = match e_ {
+        EE::Unit { trailing } => NE::Unit { trailing },
+        EE::Value(val) => NE::Value(val),
+        EE::Move(v) => match context.resolve_local(eloc, "move", v.0) {
+            None => {
+                debug_assert!(context.env.has_errors());
+                NE::UnresolvedError
+            }
+            Some(nv) => NE::Move(nv),
+        },
+        EE::Copy(v) => match context.resolve_local(eloc, "copy", v.0) {
+            None => {
+                debug_assert!(context.env.has_errors());
+                NE::UnresolvedError
+            }
+            Some(nv) => NE::Copy(nv),
+        },
+        EE::Name(sp!(aloc, E::ModuleAccess_::Name(v)), None) => {
+            if is_constant_name(&v.value) {
+                access_constant(context, sp(aloc, E::ModuleAccess_::Name(v)))
+            } else {
+                match context.resolve_local(eloc, "variable usage", v) {
+                    None => {
+                        debug_assert!(context.env.has_errors());
+                        NE::UnresolvedError
+                    }
+                    Some(nv) => NE::Use(nv),
+                }
+            }
+        }
+        EE::Name(ma, None) => access_constant(context, ma),
+
+        EE::IfElse(eb, et, ef) => {
+            NE::IfElse(exp(context, *eb), exp(context, *et), exp(context, *ef))
+        }
+        EE::While(eb, el) => NE::While(exp(context, *eb), exp(context, *el)),
+        EE::Loop(el) => NE::Loop(exp(context, *el)),
+        EE::Block(seq) => NE::Block(sequence(context, seq)),
+
+        EE::Assign(a, e) => {
+            let na_opt = assign_list(context, a);
+            let ne = exp(context, *e);
+            match na_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+                Some(na) => NE::Assign(na, ne),
+            }
+        }
+        EE::FieldMutate(edotted, er) => {
+            let ndot_opt = dotted(context, *edotted);
+            let ner = exp(context, *er);
+            match ndot_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+                Some(ndot) => NE::FieldMutate(ndot, ner),
+            }
+        }
+        EE::Mutate(el, er) => {
+            let nel = exp(context, *el);
+            let ner = exp(context, *er);
+            NE::Mutate(nel, ner)
+        }
+
+        EE::Return(es) => NE::Return(exp(context, *es)),
+        EE::Abort(es) => NE::Abort(exp(context, *es)),
+        EE::Break => NE::Break,
+        EE::Continue => NE::Continue,
+
+        EE::Dereference(e) => NE::Dereference(exp(context, *e)),
+        EE::UnaryExp(uop, e) => NE::UnaryExp(uop, exp(context, *e)),
+        EE::BinopExp(e1, bop, e2) => NE::BinopExp(exp(context, *e1), bop, exp(context, *e2)),
+
+        EE::Pack(tn, etys_opt, efields) => {
+            match context.resolve_struct_name(eloc, "construction", tn, etys_opt) {
+                None => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+                Some((m, sn, tys_opt, is_positional)) => {
+                    if is_positional {
+                        let msg = "Invalid struct instantiation. Positional struct declarations \
+                             require positional instantiations.";
+                        context
+                            .env
+                            .add_diag(diag!(NameResolution::PositionalCallMismatch, (eloc, msg)));
+                    }
+                    NE::Pack(
+                        m,
+                        sn,
+                        tys_opt,
+                        efields.map(|_, (idx, e)| (idx, exp_(context, e))),
+                    )
+                }
+            }
+        }
+        EE::ExpList(es) => {
+            assert!(es.len() > 1);
+            NE::ExpList(exps(context, es))
+        }
+
+        EE::Borrow(mut_, inner) => match *inner {
+            sp!(_, EE::ExpDotted(edot)) => match dotted(context, *edot) {
+                None => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+                Some(d) => NE::Borrow(mut_, d),
+            },
+            e => {
+                let ne = exp(context, e);
+                NE::Borrow(mut_, sp(ne.loc, N::ExpDotted_::Exp(ne)))
+            }
+        },
+
+        EE::ExpDotted(edot) => match dotted(context, *edot) {
+            None => {
+                assert!(context.env.has_errors());
+                NE::UnresolvedError
+            }
+            Some(d) => NE::DerefBorrow(d),
+        },
+
+        EE::Cast(e, t) => NE::Cast(exp(context, *e), type_(context, t)),
+        EE::Annotate(e, t) => NE::Annotate(exp(context, *e), type_(context, t)),
+
+        EE::Call(sp!(mloc, ma_), true, tys_opt, rhs) => {
+            use E::ModuleAccess_ as EA;
+            use N::BuiltinFunction_ as BF;
+            assert!(tys_opt.is_none(), "ICE macros do not have type arguments");
+            let nes = call_args(context, rhs);
+            match ma_ {
+                EA::Name(n) if n.value.as_str() == BF::ASSERT_MACRO => {
+                    NE::Builtin(sp(mloc, BF::Assert(true)), nes)
+                }
+                ma_ => {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundMacro,
+                        (mloc, format!("Unbound macro '{}'", ma_)),
+                    ));
+                    NE::UnresolvedError
+                }
+            }
+        }
+        EE::Call(ma, false, tys_opt, rhs) if context.resolves_to_struct(&ma) => {
+            context
+                .env
+                .check_feature(FeatureGate::PositionalFields, context.current_package, eloc);
+            let nes = call_args(context, rhs);
+            match context.resolve_struct_name(eloc, "construction", ma, tys_opt) {
+                None => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+                Some((m, sn, tys_opt, is_positional)) => {
+                    if !is_positional {
+                        let msg = "Invalid struct instantiation. Named struct declarations \
+                                   require named instantiations.";
+                        context
+                            .env
+                            .add_diag(diag!(NameResolution::PositionalCallMismatch, (eloc, msg)));
+                    }
+                    NE::Pack(
+                        m,
+                        sn,
+                        tys_opt,
+                        UniqueMap::maybe_from_iter(nes.value.into_iter().enumerate().map(
+                            |(idx, e)| {
+                                let field = Field::add_loc(e.loc, format!("{idx}").into());
+                                (field, (idx, e))
+                            },
+                        ))
+                        .unwrap(),
+                    )
+                }
+            }
+        }
+        EE::Call(ma, false, tys_opt, rhs) => {
+            let ty_args = tys_opt.map(|tys| types(context, tys));
+            let nes = call_args(context, rhs);
+            match resolve_function(context, eloc, ma, ty_args) {
+                ResolvedFunction::Builtin(f) => NE::Builtin(f, nes),
+                ResolvedFunction::Module(mf) => {
+                    let ResolvedModuleFunction {
+                        module,
+                        function,
+                        ty_args,
+                    } = *mf;
+                    NE::ModuleCall(module, function, ty_args, nes)
+                }
+                ResolvedFunction::Unbound => {
+                    assert!(context.env.has_errors());
+                    NE::UnresolvedError
+                }
+            }
+        }
+        EE::MethodCall(edot, n, tys_opt, rhs) => match dotted(context, *edot) {
+            None => {
+                assert!(context.env.has_errors());
+                NE::UnresolvedError
+            }
+            Some(d) => {
+                let ty_args = tys_opt.map(|tys| types(context, tys));
+                let nes = call_args(context, rhs);
+                NE::MethodCall(d, n, ty_args, nes)
+            }
+        },
+        EE::Vector(vec_loc, tys_opt, rhs) => {
+            let ty_args = tys_opt.map(|tys| types(context, tys));
+            let nes = call_args(context, rhs);
+            let ty_opt = check_builtin_ty_args_impl(
+                context,
+                vec_loc,
+                || "Invalid 'vector' instantation".to_string(),
+                eloc,
+                1,
+                ty_args,
+            )
+            .map(|mut v| {
+                assert!(v.len() == 1);
+                v.pop().unwrap()
+            });
+            NE::Vector(vec_loc, ty_opt, nes)
+        }
+
+        EE::Spec(u, unbound_names) => {
+            // Vars currently aren't shadowable by types/functions
+            let used_locals = unbound_names
+                .into_iter()
+                .filter_map(|v| {
+                    if context.local_scopes.last()?.contains_key(&v.value) {
+                        let nv = context
+                            .resolve_local(v.loc, "ICE should always resolve", v)
+                            .unwrap();
+                        Some(nv)
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            NE::Spec(u, used_locals)
+        }
+        EE::UnresolvedError => {
+            assert!(context.env.has_errors());
+            NE::UnresolvedError
+        }
+        // `Name` matches name variants only allowed in specs (we handle the allowed ones above)
+        EE::Index(..) | EE::Lambda(..) | EE::Quant(..) | EE::Name(_, Some(_)) => {
+            panic!("ICE unexpected specification construct")
+        }
+    };
+    sp(eloc, ne_)
+}
+
+fn access_constant(context: &mut Context, ma: E::ModuleAccess) -> N::Exp_ {
+    match context.resolve_constant(ma) {
+        None => {
+            assert!(context.env.has_errors());
+            N::Exp_::UnresolvedError
+        }
+        Some((m, c)) => N::Exp_::Constant(m, c),
+    }
+}
+
+fn dotted(context: &mut Context, edot: E::ExpDotted) -> Option<N::ExpDotted> {
+    let sp!(loc, edot_) = edot;
+    let nedot_ = match edot_ {
+        E::ExpDotted_::Exp(e) => {
+            let ne = exp(context, *e);
+            match &ne.value {
+                N::Exp_::UnresolvedError => return None,
+                _ => N::ExpDotted_::Exp(ne),
+            }
+        }
+        E::ExpDotted_::Dot(d, f) => N::ExpDotted_::Dot(Box::new(dotted(context, *d)?), Field(f)),
+    };
+    Some(sp(loc, nedot_))
+}
+
+#[derive(Clone, Copy)]
+enum LValueCase {
+    Bind,
+    Assign,
+}
+
+fn lvalue(
+    context: &mut Context,
+    seen_locals: &mut UniqueMap<Name, ()>,
+    case: LValueCase,
+    sp!(loc, l_): E::LValue,
+) -> Option<N::LValue> {
+    use LValueCase as C;
+    use E::LValue_ as EL;
+    use N::LValue_ as NL;
+    let nl_ = match l_ {
+        EL::Var(mut_, sp!(_, E::ModuleAccess_::Name(n)), None) => {
+            let v = P::Var(n);
+            if v.is_underscore() {
+                NL::Ignore
+            } else {
+                if let Err((var, prev_loc)) = seen_locals.add(n, ()) {
+                    let (primary, secondary) = match case {
+                        C::Bind => {
+                            let msg = format!(
+                                "Duplicate declaration for local '{}' in a given 'let'",
+                                &var
+                            );
+                            ((var.loc, msg), (prev_loc, "Previously declared here"))
+                        }
+                        C::Assign => {
+                            let msg = format!(
+                                "Duplicate usage of local '{}' in a given assignment",
+                                &var
+                            );
+                            ((var.loc, msg), (prev_loc, "Previously assigned here"))
+                        }
+                    };
+                    context
+                        .env
+                        .add_diag(diag!(Declarations::DuplicateItem, primary, secondary));
+                }
+                let nv = match case {
+                    C::Bind => {
+                        let is_parameter = false;
+                        context.declare_local(is_parameter, n)
+                    }
+                    C::Assign => context.resolve_local(loc, "assignment", n)?,
+                };
+                NL::Var {
+                    mut_,
+                    var: nv,
+                    // set later
+                    unused_binding: false,
+                }
+            }
+        }
+        EL::Unpack(tn, etys_opt, efields) => {
+            let msg = match case {
+                C::Bind => "deconstructing binding",
+                C::Assign => "deconstructing assignment",
+            };
+            let (m, sn, tys_opt, is_positional) =
+                context.resolve_struct_name(loc, msg, tn, etys_opt)?;
+            if is_positional && !matches!(efields, E::FieldBindings::Positional(_)) {
+                let msg = "Invalid deconstruction. Positional struct field declarations require \
+                           positional deconstruction";
+                context
+                    .env
+                    .add_diag(diag!(NameResolution::PositionalCallMismatch, (loc, msg)));
+            }
+
+            if !is_positional && matches!(efields, E::FieldBindings::Positional(_)) {
+                let msg = "Invalid deconstruction. Named struct field declarations require \
+                           named deconstruction";
+                context
+                    .env
+                    .add_diag(diag!(NameResolution::PositionalCallMismatch, (loc, msg)));
+            }
+            let efields = match efields {
+                E::FieldBindings::Named(efields) => efields,
+                E::FieldBindings::Positional(lvals) => {
+                    let lvals = lvals.into_iter().enumerate().map(|(idx, l)| {
+                        let field_name = Field::add_loc(l.loc, format!("{idx}").into());
+                        (field_name, (idx, l))
+                    });
+                    UniqueMap::maybe_from_iter(lvals).unwrap()
+                }
+            };
+            let nfields =
+                UniqueMap::maybe_from_opt_iter(efields.into_iter().map(|(k, (idx, inner))| {
+                    Some((k, (idx, lvalue(context, seen_locals, case, inner)?)))
+                }))?;
+            NL::Unpack(
+                m,
+                sn,
+                tys_opt,
+                nfields.expect("ICE fields were already unique"),
+            )
+        }
+        EL::Var(_, _, _) => panic!("unexpected specification construct"),
+    };
+    Some(sp(loc, nl_))
+}
+
+fn bind_list(context: &mut Context, ls: E::LValueList) -> Option<N::LValueList> {
+    lvalue_list(context, &mut UniqueMap::new(), LValueCase::Bind, ls)
+}
+
+fn assign_list(context: &mut Context, ls: E::LValueList) -> Option<N::LValueList> {
+    lvalue_list(context, &mut UniqueMap::new(), LValueCase::Assign, ls)
+}
+
+fn lvalue_list(
+    context: &mut Context,
+    seen_locals: &mut UniqueMap<Name, ()>,
+    case: LValueCase,
+    sp!(loc, b_): E::LValueList,
+) -> Option<N::LValueList> {
+    Some(sp(
+        loc,
+        b_.into_iter()
+            .map(|inner| lvalue(context, seen_locals, case, inner))
+            .collect::<Option<_>>()?,
+    ))
+}
+
+fn resolve_function(
+    context: &mut Context,
+    loc: Loc,
+    sp!(mloc, ma_): E::ModuleAccess,
+    ty_args: Option<Vec<N::Type>>,
+) -> ResolvedFunction {
+    use E::ModuleAccess_ as EA;
+    match ma_ {
+        EA::Name(n) if N::BuiltinFunction_::all_names().contains(&n.value) => {
+            match resolve_builtin_function(context, loc, &n, ty_args) {
+                None => {
+                    assert!(context.env.has_errors());
+                    ResolvedFunction::Unbound
+                }
+                Some(f) => ResolvedFunction::Builtin(sp(mloc, f)),
+            }
+        }
+        EA::Name(n) => {
+            context.env.add_diag(diag!(
+                NameResolution::UnboundUnscopedName,
+                (n.loc, format!("Unbound function '{}' in current scope", n)),
+            ));
+            ResolvedFunction::Unbound
+        }
+        EA::ModuleAccess(m, n) => match context.resolve_module_function(mloc, &m, &n) {
+            None => {
+                assert!(context.env.has_errors());
+                ResolvedFunction::Unbound
+            }
+            Some(_) => ResolvedFunction::Module(Box::new(ResolvedModuleFunction {
+                module: m,
+                function: FunctionName(n),
+                ty_args,
+            })),
+        },
+    }
+}
+
+fn resolve_builtin_function(
+    context: &mut Context,
+    loc: Loc,
+    b: &Name,
+    ty_args: Option<Vec<N::Type>>,
+) -> Option<N::BuiltinFunction_> {
+    use N::{BuiltinFunction_ as B, BuiltinFunction_::*};
+    Some(match b.value.as_str() {
+        B::FREEZE => Freeze(check_builtin_ty_arg(context, loc, b, ty_args)),
+        B::ASSERT_MACRO => {
+            let dep_msg = format!(
+                "'{}' function syntax has been deprecated and will be removed",
+                B::ASSERT_MACRO
+            );
+            // TODO make this a tip/hint?
+            let help_msg = format!(
+                "Replace with '{0}!'. '{0}' has been replaced with a '{0}!' built-in macro so \
+                 that arguments are no longer eagerly evaluated",
+                B::ASSERT_MACRO
+            );
+            context.env.add_diag(diag!(
+                Uncategorized::DeprecatedWillBeRemoved,
+                (b.loc, dep_msg),
+                (b.loc, help_msg),
+            ));
+            check_builtin_ty_args(context, loc, b, 0, ty_args);
+            Assert(false)
+        }
+        _ => {
+            context.env.add_diag(diag!(
+                NameResolution::UnboundUnscopedName,
+                (b.loc, format!("Unbound function: '{}'", b)),
+            ));
+            return None;
+        }
+    })
+}
+
+fn check_builtin_ty_arg(
+    context: &mut Context,
+    loc: Loc,
+    b: &Name,
+    ty_args: Option<Vec<N::Type>>,
+) -> Option<N::Type> {
+    let res = check_builtin_ty_args(context, loc, b, 1, ty_args);
+    res.map(|mut v| {
+        assert!(v.len() == 1);
+        v.pop().unwrap()
+    })
+}
+
+fn check_builtin_ty_args(
+    context: &mut Context,
+    loc: Loc,
+    b: &Name,
+    arity: usize,
+    ty_args: Option<Vec<N::Type>>,
+) -> Option<Vec<N::Type>> {
+    check_builtin_ty_args_impl(
+        context,
+        b.loc,
+        || format!("Invalid call to builtin function: '{}'", b),
+        loc,
+        arity,
+        ty_args,
+    )
+}
+
+fn check_builtin_ty_args_impl(
+    context: &mut Context,
+    msg_loc: Loc,
+    fmsg: impl Fn() -> String,
+    targs_loc: Loc,
+    arity: usize,
+    ty_args: Option<Vec<N::Type>>,
+) -> Option<Vec<N::Type>> {
+    let mut msg_opt = None;
+    ty_args.map(|mut args| {
+        let args_len = args.len();
+        if args_len != arity {
+            let diag_code = if args_len > arity {
+                NameResolution::TooManyTypeArguments
+            } else {
+                NameResolution::TooFewTypeArguments
+            };
+            let msg = msg_opt.get_or_insert_with(fmsg);
+            let targs_msg = format!("Expected {} type argument(s) but got {}", arity, args_len);
+            context
+                .env
+                .add_diag(diag!(diag_code, (msg_loc, msg), (targs_loc, targs_msg)));
+        }
+
+        while args.len() > arity {
+            args.pop();
+        }
+
+        while args.len() < arity {
+            args.push(sp(targs_loc, N::Type_::UnresolvedError));
+        }
+
+        args
+    })
+}
+
+//**************************************************************************************************
+// Unused locals
+//**************************************************************************************************
+
+fn remove_unused_bindings_function(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    f: &mut N::Function,
+) {
+    match &mut f.body.value {
+        N::FunctionBody_::Defined(seq) => remove_unused_bindings_seq(context, used, seq),
+        // no warnings for natives
+        N::FunctionBody_::Native => return,
+    }
+    for (_, v, _) in &mut f.signature.parameters {
+        if !used.contains(&v.value) {
+            report_unused_local(context, v);
+        }
+    }
+}
+
+fn remove_unused_bindings_seq(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    seq: &mut N::Sequence,
+) {
+    for sp!(_, item_) in &mut seq.1 {
+        match item_ {
+            N::SequenceItem_::Seq(e) => remove_unused_bindings_exp(context, used, e),
+            N::SequenceItem_::Declare(lvalues, _) => {
+                // unused bindings will be reported as unused assignments
+                remove_unused_bindings_lvalues(
+                    context, used, lvalues, /* report unused */ true,
+                )
+            }
+            N::SequenceItem_::Bind(lvalues, e) => {
+                remove_unused_bindings_lvalues(
+                    context, used, lvalues, /* report unused */ false,
+                );
+                remove_unused_bindings_exp(context, used, e)
+            }
+        }
+    }
+}
+
+fn remove_unused_bindings_lvalues(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    sp!(_, lvalues): &mut N::LValueList,
+    report: bool,
+) {
+    for lvalue in lvalues {
+        remove_unused_bindings_lvalue(context, used, lvalue, report)
+    }
+}
+
+fn remove_unused_bindings_lvalue(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    sp!(_, lvalue_): &mut N::LValue,
+    report: bool,
+) {
+    match lvalue_ {
+        N::LValue_::Ignore => (),
+        N::LValue_::Var {
+            var,
+            unused_binding,
+            ..
+        } if used.contains(&var.value) => {
+            debug_assert!(!*unused_binding);
+        }
+        N::LValue_::Var {
+            var,
+            unused_binding,
+            ..
+        } => {
+            debug_assert!(!*unused_binding);
+            if report {
+                report_unused_local(context, var);
+            }
+            *unused_binding = true;
+        }
+        N::LValue_::Unpack(_, _, _, lvalues) => {
+            for (_, _, (_, lvalue)) in lvalues {
+                remove_unused_bindings_lvalue(context, used, lvalue, report)
+            }
+        }
+    }
+}
+
+fn remove_unused_bindings_exp(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    sp!(_, e_): &mut N::Exp,
+) {
+    match e_ {
+        N::Exp_::Value(_)
+        | N::Exp_::Move(_)
+        | N::Exp_::Copy(_)
+        | N::Exp_::Use(_)
+        | N::Exp_::Constant(_, _)
+        | N::Exp_::Break
+        | N::Exp_::Continue
+        | N::Exp_::Unit { .. }
+        | N::Exp_::Spec(_, _)
+        | N::Exp_::UnresolvedError => (),
+        N::Exp_::Return(e)
+        | N::Exp_::Abort(e)
+        | N::Exp_::Dereference(e)
+        | N::Exp_::UnaryExp(_, e)
+        | N::Exp_::Cast(e, _)
+        | N::Exp_::Assign(_, e)
+        | N::Exp_::Loop(e)
+        | N::Exp_::Annotate(e, _) => remove_unused_bindings_exp(context, used, e),
+        N::Exp_::IfElse(econd, et, ef) => {
+            remove_unused_bindings_exp(context, used, econd);
+            remove_unused_bindings_exp(context, used, et);
+            remove_unused_bindings_exp(context, used, ef);
+        }
+        N::Exp_::While(econd, ebody) => {
+            remove_unused_bindings_exp(context, used, econd);
+            remove_unused_bindings_exp(context, used, ebody)
+        }
+        N::Exp_::Block(s) => remove_unused_bindings_seq(context, used, s),
+        N::Exp_::FieldMutate(ed, e) => {
+            remove_unused_bindings_exp_dotted(context, used, ed);
+            remove_unused_bindings_exp(context, used, e)
+        }
+        N::Exp_::Mutate(el, er) | N::Exp_::BinopExp(el, _, er) => {
+            remove_unused_bindings_exp(context, used, el);
+            remove_unused_bindings_exp(context, used, er)
+        }
+        N::Exp_::Pack(_, _, _, fields) => {
+            for (_, _, (_, e)) in fields {
+                remove_unused_bindings_exp(context, used, e)
+            }
+        }
+        N::Exp_::Builtin(_, sp!(_, es))
+        | N::Exp_::Vector(_, _, sp!(_, es))
+        | N::Exp_::ModuleCall(_, _, _, sp!(_, es))
+        | N::Exp_::ExpList(es) => {
+            for e in es {
+                remove_unused_bindings_exp(context, used, e)
+            }
+        }
+        N::Exp_::MethodCall(ed, _, _, sp!(_, es)) => {
+            remove_unused_bindings_exp_dotted(context, used, ed);
+            for e in es {
+                remove_unused_bindings_exp(context, used, e)
+            }
+        }
+
+        N::Exp_::DerefBorrow(ed) | N::Exp_::Borrow(_, ed) => {
+            remove_unused_bindings_exp_dotted(context, used, ed)
+        }
+    }
+}
+
+fn remove_unused_bindings_exp_dotted(
+    context: &mut Context,
+    used: &BTreeSet<N::Var_>,
+    sp!(_, ed_): &mut N::ExpDotted,
+) {
+    match ed_ {
+        N::ExpDotted_::Exp(e) => remove_unused_bindings_exp(context, used, e),
+        N::ExpDotted_::Dot(ed, _) => remove_unused_bindings_exp_dotted(context, used, ed),
+    }
+}
+
+fn report_unused_local(context: &mut Context, sp!(loc, unused_): &N::Var) {
+    if !unused_.name.starts_with(|c: char| c.is_ascii_lowercase()) {
+        return;
+    }
+    let N::Var_ { name, id, color } = unused_;
+    debug_assert!(*color == 0);
+    let is_parameter = *id == 0;
+    let kind = if is_parameter {
+        "parameter"
+    } else {
+        "local variable"
+    };
+    let msg = format!(
+        "Unused {kind} '{name}'. Consider removing or prefixing with an underscore: '_{name}'",
+    );
+    context
+        .env
+        .add_diag(diag!(UnusedItem::Variable, (*loc, msg)));
+}
+
+//**************************************************************************************************
+// Specs
+//**************************************************************************************************
+
+fn spec_blocks<'a>(
+    used: &mut BTreeSet<(ModuleIdent, Neighbor)>,
+    specs: impl IntoIterator<Item = &'a E::SpecBlock>,
+) {
+    for spec in specs {
+        spec_block(used, spec)
+    }
+}
+
+fn spec_block(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, sb_): &E::SpecBlock) {
+    sb_.members
+        .iter()
+        .for_each(|sbm| spec_block_member(used, sbm))
+}
+
+fn spec_block_member(
+    used: &mut BTreeSet<(ModuleIdent, Neighbor)>,
+    sp!(_, sbm_): &E::SpecBlockMember,
+) {
+    use E::SpecBlockMember_ as M;
+    match sbm_ {
+        M::Condition {
+            exp: e,
+            additional_exps: es,
+            ..
+        } => {
+            spec_exp(used, e);
+            es.iter().for_each(|e| spec_exp(used, e))
+        }
+        M::Function { body, .. } => {
+            if let E::FunctionBody_::Defined(seq) = &body.value {
+                spec_sequence(used, seq)
+            }
+        }
+        M::Let { def: e, .. } | M::Include { exp: e, .. } | M::Apply { exp: e, .. } => {
+            spec_exp(used, e)
+        }
+        M::Update { lhs, rhs } => {
+            spec_exp(used, lhs);
+            spec_exp(used, rhs);
+        }
+        // A special treatment to the `pragma friend` declarations.
+        //
+        // The `pragma friend = <address::module_name::function_name>` notion exists before the
+        // `friend` feature is implemented as a language feature. And it may still have a use case,
+        // that is, to friend a module that is compiled with other modules but not published.
+        //
+        // To illustrate, suppose we have module `A` and `B` compiled and proved together locally,
+        // but for some reason, module `A` is not published on-chain. In this case, we cannot
+        // declare `friend A;` in module `B` because that will lead to a linking error (the loader
+        // is unable to find module `A`). But the prover side still needs to know that `A` is a
+        // friend of `B` (e.g., to verify global invariants). So, the `pragma friend = ...` syntax
+        // might need to stay for this purpose. And for that, we need to add the module that is
+        // declared as a friend in the `immediate_neighbors`.
+        M::Pragma { properties } => {
+            for prop in properties {
+                let pragma = &prop.value;
+                if pragma.name.value.as_str() == "friend" {
+                    match &pragma.value {
+                        None => (),
+                        Some(E::PragmaValue::Literal(_)) => (),
+                        Some(E::PragmaValue::Ident(maccess)) => match &maccess.value {
+                            E::ModuleAccess_::Name(_) => (),
+                            E::ModuleAccess_::ModuleAccess(mident, _) => {
+                                used.insert((*mident, sp(maccess.loc, Neighbor_::Friend)));
+                            }
+                        },
+                    }
+                }
+            }
+        }
+        M::Variable { .. } => (),
+    }
+}
+
+fn spec_sequence(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, seq: &E::Sequence) {
+    for item in &seq.1 {
+        spec_sequence_item(used, item)
+    }
+}
+
+fn spec_sequence_item(
+    used: &mut BTreeSet<(ModuleIdent, Neighbor)>,
+    sp!(_, item_): &E::SequenceItem,
+) {
+    match item_ {
+        E::SequenceItem_::Declare(lvs, _) => spec_lvalues(used, lvs),
+        E::SequenceItem_::Bind(lvs, e) => {
+            spec_lvalues(used, lvs);
+            spec_exp(used, e);
+        }
+        E::SequenceItem_::Seq(e) => spec_exp(used, e),
+    }
+}
+
+fn spec_lvalues(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, lvs_): &E::LValueList) {
+    for lv in lvs_ {
+        spec_lvalue(used, lv)
+    }
+}
+
+fn spec_lvalue(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, lv_): &E::LValue) {
+    match lv_ {
+        E::LValue_::Var(_, m, tys_opt) => {
+            spec_module_access(used, m);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+        }
+        E::LValue_::Unpack(m, tys_opt, fields) => {
+            spec_module_access(used, m);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+            match fields {
+                E::FieldBindings::Named(fields) => {
+                    for (_, _, (_, field_lv)) in fields {
+                        spec_lvalue(used, field_lv)
+                    }
+                }
+                E::FieldBindings::Positional(lvals) => {
+                    for lval in lvals {
+                        spec_lvalue(used, lval)
+                    }
+                }
+            }
+        }
+    }
+}
+
+fn spec_types(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, tys: &[E::Type]) {
+    for ty in tys {
+        spec_type(used, ty)
+    }
+}
+
+fn spec_type(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, ty_): &E::Type) {
+    match ty_ {
+        E::Type_::Unit | E::Type_::UnresolvedError => (),
+        E::Type_::Multiple(tys) => spec_types(used, tys),
+        E::Type_::Apply(ma, tys) => {
+            spec_module_access(used, ma);
+            spec_types(used, tys)
+        }
+        E::Type_::Ref(_, inner) => spec_type(used, inner),
+        E::Type_::Fun(ty_params, ty_ret) => {
+            spec_types(used, ty_params);
+            spec_type(used, ty_ret);
+        }
+    }
+}
+
+fn spec_module_access(
+    used: &mut BTreeSet<(ModuleIdent, Neighbor)>,
+    sp!(loc, ma_): &E::ModuleAccess,
+) {
+    match ma_ {
+        E::ModuleAccess_::Name(_) => (),
+        E::ModuleAccess_::ModuleAccess(m, _) => {
+            used.insert((*m, sp(*loc, Neighbor_::Dependency)));
+        }
+    }
+}
+
+fn spec_exp(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, e_): &E::Exp) {
+    match e_ {
+        E::Exp_::Value(_)
+        | E::Exp_::Move(_)
+        | E::Exp_::Copy(_)
+        | E::Exp_::Break
+        | E::Exp_::Continue
+        | E::Exp_::Unit { .. }
+        | E::Exp_::Spec(_, _)
+        | E::Exp_::UnresolvedError => (),
+
+        E::Exp_::Loop(einner)
+        | E::Exp_::Return(einner)
+        | E::Exp_::Abort(einner)
+        | E::Exp_::Dereference(einner)
+        | E::Exp_::UnaryExp(_, einner)
+        | E::Exp_::Borrow(_, einner) => spec_exp(used, einner),
+
+        E::Exp_::Mutate(el, er) | E::Exp_::BinopExp(el, _, er) | E::Exp_::Index(el, er) => {
+            spec_exp(used, el);
+            spec_exp(used, er)
+        }
+
+        E::Exp_::Name(ma, tys_opt) => {
+            spec_module_access(used, ma);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+        }
+        E::Exp_::MethodCall(edotted, _, tys_opt, sp!(_, args_)) => {
+            spec_exp_dotted(used, edotted);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+            for arg in args_ {
+                spec_exp(used, arg)
+            }
+        }
+        E::Exp_::Call(ma, _, tys_opt, sp!(_, args_)) => {
+            spec_module_access(used, ma);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+            for arg in args_ {
+                spec_exp(used, arg)
+            }
+        }
+        E::Exp_::Pack(ma, tys_opt, fields) => {
+            spec_module_access(used, ma);
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+            for (_, _, (_, arg)) in fields {
+                spec_exp(used, arg)
+            }
+        }
+        E::Exp_::Vector(_, tys_opt, sp!(_, args_)) => {
+            if let Some(tys) = tys_opt {
+                spec_types(used, tys)
+            }
+            for arg in args_ {
+                spec_exp(used, arg)
+            }
+        }
+        E::Exp_::IfElse(econd, etrue, efalse) => {
+            spec_exp(used, econd);
+            spec_exp(used, etrue);
+            spec_exp(used, efalse);
+        }
+        E::Exp_::While(econd, ebody) => {
+            spec_exp(used, econd);
+            spec_exp(used, ebody)
+        }
+        E::Exp_::Block(seq) => spec_sequence(used, seq),
+        E::Exp_::Lambda(lvs, ebody) => {
+            spec_lvalues(used, lvs);
+            spec_exp(used, ebody)
+        }
+        E::Exp_::Quant(_, sp!(_, lvs_es_), ess, e_opt, inner) => {
+            for sp!(_, (lv, e)) in lvs_es_ {
+                spec_lvalue(used, lv);
+                spec_exp(used, e);
+            }
+            for es in ess {
+                for e in es {
+                    spec_exp(used, e)
+                }
+            }
+            if let Some(e) = e_opt {
+                spec_exp(used, e)
+            }
+            spec_exp(used, inner)
+        }
+        E::Exp_::Assign(lvs, er) => {
+            spec_lvalues(used, lvs);
+            spec_exp(used, er)
+        }
+        E::Exp_::FieldMutate(edotted, er) => {
+            spec_exp_dotted(used, edotted);
+            spec_exp(used, er)
+        }
+
+        E::Exp_::ExpList(es) => {
+            for e in es {
+                spec_exp(used, e)
+            }
+        }
+        E::Exp_::ExpDotted(edotted) => spec_exp_dotted(used, edotted),
+        E::Exp_::Cast(e, ty) | E::Exp_::Annotate(e, ty) => {
+            spec_exp(used, e);
+            spec_type(used, ty)
+        }
+    }
+}
+
+fn spec_exp_dotted(used: &mut BTreeSet<(ModuleIdent, Neighbor)>, sp!(_, edotted_): &E::ExpDotted) {
+    match edotted_ {
+        E::ExpDotted_::Exp(e) => spec_exp(used, e),
+        E::ExpDotted_::Dot(edotted, _) => spec_exp_dotted(used, edotted),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/ast.rs b/vendors/move/crates/move-compiler/src/parser/ast.rs
new file mode 100644
index 000000000..7c25a57e2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/ast.rs
@@ -0,0 +1,2071 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::shared::{
+    ast_debug::*, Identifier, Name, NamedAddressMap, NamedAddressMapIndex, NamedAddressMaps,
+    NumericalAddress, TName,
+};
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{fmt, hash::Hash};
+
+macro_rules! new_name {
+    ($n:ident) => {
+        #[derive(Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
+        pub struct $n(pub Name);
+
+        impl TName for $n {
+            type Key = Symbol;
+            type Loc = Loc;
+
+            fn drop_loc(self) -> (Loc, Symbol) {
+                (self.0.loc, self.0.value)
+            }
+
+            fn add_loc(loc: Loc, key: Symbol) -> Self {
+                $n(sp(loc, key))
+            }
+
+            fn borrow(&self) -> (&Loc, &Symbol) {
+                (&self.0.loc, &self.0.value)
+            }
+        }
+
+        impl PartialEq<str> for $n {
+            fn eq(&self, s: &str) -> bool {
+                self.0.value.as_str() == s
+            }
+        }
+
+        impl Identifier for $n {
+            fn value(&self) -> Symbol {
+                self.0.value
+            }
+            fn loc(&self) -> Loc {
+                self.0.loc
+            }
+        }
+
+        impl fmt::Display for $n {
+            fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+                write!(f, "{}", &self.0)
+            }
+        }
+    };
+}
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    pub named_address_maps: NamedAddressMaps,
+    pub source_definitions: Vec<PackageDefinition>,
+    pub lib_definitions: Vec<PackageDefinition>,
+}
+
+#[derive(Debug, Clone)]
+pub struct PackageDefinition {
+    pub package: Option<Symbol>,
+    pub named_address_map: NamedAddressMapIndex,
+    pub def: Definition,
+}
+
+#[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum Definition {
+    Module(ModuleDefinition),
+    Address(AddressDefinition),
+    Script(Script),
+}
+
+#[derive(Debug, Clone)]
+pub struct AddressDefinition {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub addr: LeadingNameAccess,
+    pub modules: Vec<ModuleDefinition>,
+}
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub uses: Vec<UseDecl>,
+    pub constants: Vec<Constant>,
+    pub function: Function,
+    pub specs: Vec<SpecBlock>,
+}
+
+#[derive(Debug, PartialEq, Clone, Eq)]
+pub enum Use {
+    ModuleUse(ModuleIdent, ModuleUse),
+    NestedModuleUses(LeadingNameAccess, Vec<(ModuleName, ModuleUse)>),
+    Fun {
+        visibility: Visibility,
+        function: Box<NameAccessChain>,
+        ty: Box<NameAccessChain>,
+        method: Name,
+    },
+}
+
+#[derive(Debug, PartialEq, Clone, Eq)]
+pub enum ModuleUse {
+    Module(Option<ModuleName>),
+    Members(Vec<(Name, Option<Name>)>),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct UseDecl {
+    pub loc: Loc,
+    pub attributes: Vec<Attributes>,
+    pub use_: Use,
+}
+
+//**************************************************************************************************
+// Attributes
+//**************************************************************************************************
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AttributeValue_ {
+    Value(Value),
+    ModuleAccess(NameAccessChain),
+}
+pub type AttributeValue = Spanned<AttributeValue_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Attribute_ {
+    Name(Name),
+    Assigned(Name, Box<AttributeValue>),
+    Parameterized(Name, Attributes),
+}
+pub type Attribute = Spanned<Attribute_>;
+
+pub type Attributes = Spanned<Vec<Attribute>>;
+
+impl Attribute_ {
+    pub fn attribute_name(&self) -> &Name {
+        match self {
+            Attribute_::Name(nm)
+            | Attribute_::Assigned(nm, _)
+            | Attribute_::Parameterized(nm, _) => nm,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+new_name!(ModuleName);
+
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+/// Specifies a name at the beginning of an access chain. Could be
+/// - A module name
+/// - A named address
+/// - An address numerical value
+pub enum LeadingNameAccess_ {
+    AnonymousAddress(NumericalAddress),
+    Name(Name),
+}
+pub type LeadingNameAccess = Spanned<LeadingNameAccess_>;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct ModuleIdent_ {
+    pub address: LeadingNameAccess,
+    pub module: ModuleName,
+}
+pub type ModuleIdent = Spanned<ModuleIdent_>;
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub address: Option<LeadingNameAccess>,
+    pub name: ModuleName,
+    pub is_spec_module: bool,
+    pub members: Vec<ModuleMember>,
+}
+
+#[derive(Debug, Clone)]
+pub enum ModuleMember {
+    Function(Function),
+    Struct(StructDefinition),
+    Use(UseDecl),
+    Friend(FriendDecl),
+    Constant(Constant),
+    Spec(SpecBlock),
+}
+
+//**************************************************************************************************
+// Friends
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct FriendDecl {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub friend: NameAccessChain,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+new_name!(Field);
+new_name!(StructName);
+
+pub type ResourceLoc = Option<Loc>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct StructTypeParameter {
+    pub is_phantom: bool,
+    pub name: Name,
+    pub constraints: Vec<Ability>,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct StructDefinition {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub abilities: Vec<Ability>,
+    pub name: StructName,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub fields: StructFields,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum StructFields {
+    Defined(Vec<(Field, Type)>),
+    Native(Loc),
+    Positional(Vec<Type>),
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+new_name!(FunctionName);
+
+pub const NATIVE_MODIFIER: &str = "native";
+pub const ENTRY_MODIFIER: &str = "entry";
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct FunctionSignature {
+    pub type_parameters: Vec<(Name, Vec<Ability>)>,
+    pub parameters: Vec<(Mutability, Var, Type)>,
+    pub return_type: Type,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub enum Visibility {
+    Public(Loc),
+    Script(Loc),
+    Friend(Loc),
+    Package(Loc),
+    Internal,
+}
+
+#[derive(PartialEq, Clone, Debug)]
+pub enum FunctionBody_ {
+    Defined(Sequence),
+    Native,
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(PartialEq, Debug, Clone)]
+// (public?) foo<T1(: copyable?), ..., TN(: copyable?)>(x1: t1, ..., xn: tn): t1 * ... * tn {
+//    body
+//  }
+// (public?) native foo<T1(: copyable?), ..., TN(: copyable?)>(x1: t1, ..., xn: tn): t1 * ... * tn;
+pub struct Function {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub name: FunctionName,
+    pub body: FunctionBody,
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+new_name!(ConstantName);
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Constant {
+    pub attributes: Vec<Attributes>,
+    pub loc: Loc,
+    pub signature: Type,
+    pub name: ConstantName,
+    pub value: Exp,
+}
+
+//**************************************************************************************************
+// Specification Blocks
+//**************************************************************************************************
+
+// Specification block:
+//    SpecBlock = "spec" <SpecBlockTarget> "{" SpecBlockMember* "}"
+#[derive(Debug, Clone, PartialEq)]
+pub struct SpecBlock_ {
+    pub attributes: Vec<Attributes>,
+    pub target: SpecBlockTarget,
+    pub uses: Vec<UseDecl>,
+    pub members: Vec<SpecBlockMember>,
+}
+
+pub type SpecBlock = Spanned<SpecBlock_>;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum SpecBlockTarget_ {
+    Code,
+    Module,
+    Member(Name, Option<Box<FunctionSignature>>),
+    Schema(Name, Vec<(Name, Vec<Ability>)>),
+}
+
+pub type SpecBlockTarget = Spanned<SpecBlockTarget_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PragmaProperty_ {
+    pub name: Name,
+    pub value: Option<PragmaValue>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PragmaValue {
+    Literal(Value),
+    Ident(NameAccessChain),
+}
+
+pub type PragmaProperty = Spanned<PragmaProperty_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SpecApplyPattern_ {
+    pub visibility: Option<Visibility>,
+    pub name_pattern: Vec<SpecApplyFragment>,
+    pub type_parameters: Vec<(Name, Vec<Ability>)>,
+}
+
+pub type SpecApplyPattern = Spanned<SpecApplyPattern_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum SpecApplyFragment_ {
+    Wildcard,
+    NamePart(Name),
+}
+
+pub type SpecApplyFragment = Spanned<SpecApplyFragment_>;
+
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum SpecBlockMember_ {
+    Condition {
+        kind: SpecConditionKind,
+        properties: Vec<PragmaProperty>,
+        exp: Exp,
+        additional_exps: Vec<Exp>,
+    },
+    Function {
+        uninterpreted: bool,
+        name: FunctionName,
+        signature: FunctionSignature,
+        body: FunctionBody,
+    },
+    Variable {
+        is_global: bool,
+        name: Name,
+        type_parameters: Vec<(Name, Vec<Ability>)>,
+        type_: Type,
+        init: Option<Exp>,
+    },
+    Let {
+        name: Name,
+        post_state: bool,
+        def: Exp,
+    },
+    Update {
+        lhs: Exp,
+        rhs: Exp,
+    },
+    Include {
+        properties: Vec<PragmaProperty>,
+        exp: Exp,
+    },
+    Apply {
+        exp: Exp,
+        patterns: Vec<SpecApplyPattern>,
+        exclusion_patterns: Vec<SpecApplyPattern>,
+    },
+    Pragma {
+        properties: Vec<PragmaProperty>,
+    },
+}
+
+pub type SpecBlockMember = Spanned<SpecBlockMember_>;
+
+// Specification condition kind.
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub enum SpecConditionKind_ {
+    Assert,
+    Assume,
+    Decreases,
+    AbortsIf,
+    AbortsWith,
+    SucceedsIf,
+    Modifies,
+    Emits,
+    Ensures,
+    Requires,
+    Invariant(Vec<(Name, Vec<Ability>)>),
+    InvariantUpdate(Vec<(Name, Vec<Ability>)>),
+    Axiom(Vec<(Name, Vec<Ability>)>),
+}
+pub type SpecConditionKind = Spanned<SpecConditionKind_>;
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+// A ModuleAccess references a local or global name or something from a module,
+// either a struct type or a function.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum NameAccessChain_ {
+    // <Name>
+    One(Name),
+    // (<Name>|<Num>)::<Name>
+    Two(LeadingNameAccess, Name),
+    // (<Name>|<Num>)::<Name>::<Name>
+    Three(Spanned<(LeadingNameAccess, Name)>, Name),
+}
+pub type NameAccessChain = Spanned<NameAccessChain_>;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash)]
+pub enum Ability_ {
+    Copy,
+    Drop,
+    Store,
+    Key,
+}
+pub type Ability = Spanned<Ability_>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Type_ {
+    // N
+    // N<t1, ... , tn>
+    Apply(Box<NameAccessChain>, Vec<Type>),
+    // &t
+    // &mut t
+    Ref(bool, Box<Type>),
+    // (t1,...,tn):t
+    Fun(Vec<Type>, Box<Type>),
+    // ()
+    Unit,
+    // (t1, t2, ... , tn)
+    // Used for return values and expression blocks
+    Multiple(Vec<Type>),
+}
+pub type Type = Spanned<Type_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+new_name!(Var);
+
+// Some with loc if the local had a `mut` prefix
+pub type Mutability = Option<Loc>;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FieldBindings {
+    Named(Vec<(Field, Bind)>),
+    Positional(Vec<Bind>),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Bind_ {
+    // mut x
+    // x
+    Var(Mutability, Var),
+    // T { f1: b1, ... fn: bn }
+    // T<t1, ... , tn> { f1: b1, ... fn: bn }
+    // T ( b1, ... bn )
+    // T<t1, ... , tn> ( b1, ... bn )
+    Unpack(Box<NameAccessChain>, Option<Vec<Type>>, FieldBindings),
+}
+pub type Bind = Spanned<Bind_>;
+// b1, ..., bn
+pub type BindList = Spanned<Vec<Bind>>;
+
+pub type BindWithRange = Spanned<(Bind, Exp)>;
+pub type BindWithRangeList = Spanned<Vec<BindWithRange>>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Value_ {
+    // @<num>
+    Address(LeadingNameAccess),
+    // <num>(u8|u16|u32|u64|u128|u256)?
+    Num(Symbol),
+    // false
+    Bool(bool),
+    // x"[0..9A..F]+"
+    HexString(Symbol),
+    // b"(<ascii> | \n | \r | \t | \\ | \0 | \" | \x[0..9A..F][0..9A..F])+"
+    ByteString(Symbol),
+}
+pub type Value = Spanned<Value_>;
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub enum UnaryOp_ {
+    // !
+    Not,
+}
+pub type UnaryOp = Spanned<UnaryOp_>;
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub enum BinOp_ {
+    // Int ops
+    // +
+    Add,
+    // -
+    Sub,
+    // *
+    Mul,
+    // %
+    Mod,
+    // /
+    Div,
+    // |
+    BitOr,
+    // &
+    BitAnd,
+    // ^
+    Xor,
+    // <<
+    Shl,
+    // >>
+    Shr,
+    // ..
+    Range, // spec only
+
+    // Bool ops
+    // ==>
+    Implies, // spec only
+    // <==>
+    Iff,
+    // &&
+    And,
+    // ||
+    Or,
+
+    // Compare Ops
+    // ==
+    Eq,
+    // !=
+    Neq,
+    // <
+    Lt,
+    // >
+    Gt,
+    // <=
+    Le,
+    // >=
+    Ge,
+}
+pub type BinOp = Spanned<BinOp_>;
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub enum QuantKind_ {
+    Forall,
+    Exists,
+    Choose,
+    ChooseMin,
+}
+pub type QuantKind = Spanned<QuantKind_>;
+
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum Exp_ {
+    Value(Value),
+    // move(x)
+    Move(Var),
+    // copy(x)
+    Copy(Var),
+    // [m::]n[<t1, .., tn>]
+    Name(NameAccessChain, Option<Vec<Type>>),
+
+    // f(earg,*)
+    // f!(earg,*)
+    Call(NameAccessChain, bool, Option<Vec<Type>>, Spanned<Vec<Exp>>),
+
+    // tn {f1: e1, ... , f_n: e_n }
+    Pack(NameAccessChain, Option<Vec<Type>>, Vec<(Field, Exp)>),
+
+    // vector [ e1, ..., e_n ]
+    // vector<t> [e1, ..., en ]
+    Vector(
+        /* name loc */ Loc,
+        Option<Vec<Type>>,
+        Spanned<Vec<Exp>>,
+    ),
+
+    // if (eb) et else ef
+    IfElse(Box<Exp>, Box<Exp>, Option<Box<Exp>>),
+    // while (eb) eloop
+    While(Box<Exp>, Box<Exp>),
+    // loop eloop
+    Loop(Box<Exp>),
+
+    // { seq }
+    Block(Sequence),
+    // fun (x1, ..., xn) e
+    Lambda(BindList, Box<Exp>), // spec only
+    // forall/exists x1 : e1, ..., xn [{ t1, .., tk } *] [where cond]: en.
+    Quant(
+        QuantKind,
+        BindWithRangeList,
+        Vec<Vec<Exp>>,
+        Option<Box<Exp>>,
+        Box<Exp>,
+    ), // spec only
+    // (e1, ..., en)
+    ExpList(Vec<Exp>),
+    // ()
+    Unit,
+
+    // a = e
+    Assign(Box<Exp>, Box<Exp>),
+
+    // return e
+    Return(Option<Box<Exp>>),
+    // abort e
+    Abort(Box<Exp>),
+    // break
+    Break,
+    // continue
+    Continue,
+
+    // *e
+    Dereference(Box<Exp>),
+    // op e
+    UnaryExp(UnaryOp, Box<Exp>),
+    // e1 op e2
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+
+    // &e
+    // &mut e
+    Borrow(bool, Box<Exp>),
+
+    // e.f
+    Dot(Box<Exp>, Name),
+    // e.f(earg,*)
+    DotCall(Box<Exp>, Name, Option<Vec<Type>>, Spanned<Vec<Exp>>),
+    // e[e']
+    Index(Box<Exp>, Box<Exp>), // spec only
+
+    // (e as t)
+    Cast(Box<Exp>, Type),
+    // (e: t)
+    Annotate(Box<Exp>, Type),
+
+    // spec { ... }
+    Spec(SpecBlock),
+
+    // Internal node marking an error was added to the error list
+    // This is here so the pass can continue even when an error is hit
+    UnresolvedError,
+}
+pub type Exp = Spanned<Exp_>;
+
+// { e1; ... ; en }
+// { e1; ... ; en; }
+// The Loc field holds the source location of the final semicolon, if there is one.
+pub type Sequence = (
+    Vec<UseDecl>,
+    Vec<SequenceItem>,
+    Option<Loc>,
+    Box<Option<Exp>>,
+);
+#[derive(Debug, Clone, PartialEq)]
+#[allow(clippy::large_enum_variant)]
+pub enum SequenceItem_ {
+    // e;
+    Seq(Box<Exp>),
+    // let b : t = e;
+    // let b = e;
+    Declare(BindList, Option<Type>),
+    // let b : t = e;
+    // let b = e;
+    Bind(BindList, Option<Type>, Box<Exp>),
+}
+pub type SequenceItem = Spanned<SequenceItem_>;
+
+//**************************************************************************************************
+// Traits
+//**************************************************************************************************
+
+impl TName for ModuleIdent {
+    type Key = ModuleIdent_;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Loc, ModuleIdent_) {
+        (self.loc, self.value)
+    }
+
+    fn add_loc(loc: Loc, value: ModuleIdent_) -> ModuleIdent {
+        sp(loc, value)
+    }
+
+    fn borrow(&self) -> (&Loc, &ModuleIdent_) {
+        (&self.loc, &self.value)
+    }
+}
+
+impl TName for Ability {
+    type Key = Ability_;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Self::Loc, Self::Key) {
+        let sp!(loc, ab_) = self;
+        (loc, ab_)
+    }
+
+    fn add_loc(loc: Self::Loc, key: Self::Key) -> Self {
+        sp(loc, key)
+    }
+
+    fn borrow(&self) -> (&Self::Loc, &Self::Key) {
+        (&self.loc, &self.value)
+    }
+}
+
+impl fmt::Debug for LeadingNameAccess_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+//**************************************************************************************************
+// Impl
+//**************************************************************************************************
+
+impl LeadingNameAccess_ {
+    pub const fn anonymous(address: NumericalAddress) -> Self {
+        Self::AnonymousAddress(address)
+    }
+}
+
+impl Definition {
+    pub fn file_hash(&self) -> FileHash {
+        match self {
+            Definition::Module(m) => m.loc.file_hash(),
+            Definition::Address(a) => a.loc.file_hash(),
+            Definition::Script(s) => s.loc.file_hash(),
+        }
+    }
+}
+
+impl ModuleName {
+    pub const SELF_NAME: &'static str = "Self";
+}
+
+impl Var {
+    pub fn is_underscore(&self) -> bool {
+        self.0.value == symbol!("_")
+    }
+
+    pub fn starts_with_underscore(&self) -> bool {
+        self.0.value.starts_with('_')
+    }
+}
+
+impl Ability_ {
+    pub const COPY: &'static str = "copy";
+    pub const DROP: &'static str = "drop";
+    pub const STORE: &'static str = "store";
+    pub const KEY: &'static str = "key";
+
+    /// For a struct with ability `a`, each field needs to have the ability `a.requires()`.
+    /// Consider a generic type Foo<t1, ..., tn>, for Foo<t1, ..., tn> to have ability `a`, Foo must
+    /// have been declared with `a` and each type argument ti must have the ability `a.requires()`
+    pub fn requires(self) -> Ability_ {
+        match self {
+            Ability_::Copy => Ability_::Copy,
+            Ability_::Drop => Ability_::Drop,
+            Ability_::Store => Ability_::Store,
+            Ability_::Key => Ability_::Store,
+        }
+    }
+
+    /// An inverse of `requires`, where x is in a.required_by() iff x.requires() == a
+    pub fn required_by(self) -> Vec<Ability_> {
+        match self {
+            Self::Copy => vec![Ability_::Copy],
+            Self::Drop => vec![Ability_::Drop],
+            Self::Store => vec![Ability_::Store, Ability_::Key],
+            Self::Key => vec![],
+        }
+    }
+}
+
+impl Type_ {
+    pub fn unit(loc: Loc) -> Type {
+        sp(loc, Type_::Unit)
+    }
+}
+
+impl UnaryOp_ {
+    pub const NOT: &'static str = "!";
+
+    pub fn symbol(&self) -> &'static str {
+        use UnaryOp_ as U;
+        match self {
+            U::Not => U::NOT,
+        }
+    }
+
+    pub fn is_pure(&self) -> bool {
+        use UnaryOp_ as U;
+        match self {
+            U::Not => true,
+        }
+    }
+}
+
+impl BinOp_ {
+    pub const ADD: &'static str = "+";
+    pub const SUB: &'static str = "-";
+    pub const MUL: &'static str = "*";
+    pub const MOD: &'static str = "%";
+    pub const DIV: &'static str = "/";
+    pub const BIT_OR: &'static str = "|";
+    pub const BIT_AND: &'static str = "&";
+    pub const XOR: &'static str = "^";
+    pub const SHL: &'static str = "<<";
+    pub const SHR: &'static str = ">>";
+    pub const AND: &'static str = "&&";
+    pub const OR: &'static str = "||";
+    pub const EQ: &'static str = "==";
+    pub const NEQ: &'static str = "!=";
+    pub const LT: &'static str = "<";
+    pub const GT: &'static str = ">";
+    pub const LE: &'static str = "<=";
+    pub const GE: &'static str = ">=";
+    pub const IMPLIES: &'static str = "==>";
+    pub const IFF: &'static str = "<==>";
+    pub const RANGE: &'static str = "..";
+
+    pub fn symbol(&self) -> &'static str {
+        use BinOp_ as B;
+        match self {
+            B::Add => B::ADD,
+            B::Sub => B::SUB,
+            B::Mul => B::MUL,
+            B::Mod => B::MOD,
+            B::Div => B::DIV,
+            B::BitOr => B::BIT_OR,
+            B::BitAnd => B::BIT_AND,
+            B::Xor => B::XOR,
+            B::Shl => B::SHL,
+            B::Shr => B::SHR,
+            B::And => B::AND,
+            B::Or => B::OR,
+            B::Eq => B::EQ,
+            B::Neq => B::NEQ,
+            B::Lt => B::LT,
+            B::Gt => B::GT,
+            B::Le => B::LE,
+            B::Ge => B::GE,
+            B::Implies => B::IMPLIES,
+            B::Iff => B::IFF,
+            B::Range => B::RANGE,
+        }
+    }
+
+    pub fn is_pure(&self) -> bool {
+        use BinOp_ as B;
+        match self {
+            B::Add | B::Sub | B::Mul | B::Mod | B::Div | B::Shl | B::Shr => false,
+            B::BitOr
+            | B::BitAnd
+            | B::Xor
+            | B::And
+            | B::Or
+            | B::Eq
+            | B::Neq
+            | B::Lt
+            | B::Gt
+            | B::Le
+            | B::Ge
+            | B::Range
+            | B::Implies
+            | B::Iff => true,
+        }
+    }
+
+    pub fn is_spec_only(&self) -> bool {
+        use BinOp_ as B;
+        matches!(self, B::Range | B::Implies | B::Iff)
+    }
+}
+
+impl Visibility {
+    pub const FRIEND: &'static str = "public(friend)";
+    pub const FRIEND_IDENT: &'static str = "friend";
+    pub const INTERNAL: &'static str = "";
+    pub const PACKAGE: &'static str = "public(package)";
+    pub const PACKAGE_IDENT: &'static str = "package";
+    pub const PUBLIC: &'static str = "public";
+    pub const SCRIPT: &'static str = "public(script)";
+
+    pub fn loc(&self) -> Option<Loc> {
+        match self {
+            Visibility::Friend(loc)
+            | Visibility::Package(loc)
+            | Visibility::Public(loc)
+            | Visibility::Script(loc) => Some(*loc),
+            Visibility::Internal => None,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for LeadingNameAccess_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        match self {
+            Self::AnonymousAddress(bytes) => write!(f, "{}", bytes),
+            Self::Name(n) => write!(f, "{}", n),
+        }
+    }
+}
+
+impl fmt::Display for ModuleIdent_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}::{}", self.address, &self.module)
+    }
+}
+
+impl fmt::Display for NameAccessChain_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        match self {
+            NameAccessChain_::One(n) => write!(f, "{}", n),
+            NameAccessChain_::Two(ln, n2) => write!(f, "{}::{}", ln, n2),
+            NameAccessChain_::Three(sp!(_, (ln, n2)), n3) => write!(f, "{}::{}::{}", ln, n2, n3),
+        }
+    }
+}
+
+impl fmt::Display for UnaryOp_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", self.symbol())
+    }
+}
+
+impl fmt::Display for BinOp_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", self.symbol())
+    }
+}
+
+impl fmt::Display for Visibility {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match &self {
+                Visibility::Friend(_) => Visibility::FRIEND,
+                Visibility::Internal => Visibility::INTERNAL,
+                Visibility::Package(_) => Visibility::PACKAGE,
+                Visibility::Public(_) => Visibility::PUBLIC,
+                Visibility::Script(_) => Visibility::SCRIPT,
+            }
+        )
+    }
+}
+
+impl fmt::Display for Ability_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match &self {
+                Ability_::Copy => Ability_::COPY,
+                Ability_::Drop => Ability_::DROP,
+                Ability_::Store => Ability_::STORE,
+                Ability_::Key => Ability_::KEY,
+            }
+        )
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            named_address_maps,
+            source_definitions,
+            lib_definitions,
+        } = self;
+        w.writeln("------ Lib Defs: ------");
+        for def in lib_definitions {
+            ast_debug_package_definition(w, named_address_maps, def)
+        }
+        w.new_line();
+        w.writeln("------ Source Defs: ------");
+        for def in source_definitions {
+            ast_debug_package_definition(w, named_address_maps, def)
+        }
+    }
+}
+
+fn ast_debug_package_definition(
+    w: &mut AstWriter,
+    named_address_maps: &NamedAddressMaps,
+    pkg: &PackageDefinition,
+) {
+    let PackageDefinition {
+        package,
+        named_address_map,
+        def,
+    } = pkg;
+    match package {
+        Some(n) => w.writeln(&format!("package: {}", n)),
+        None => w.writeln("no package"),
+    }
+    named_address_maps.get(*named_address_map).ast_debug(w);
+    def.ast_debug(w);
+}
+
+impl AstDebug for NamedAddressMap {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        for (sym, addr) in self {
+            w.write(&format!("{} => {}", sym, addr));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for Definition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Definition::Address(a) => a.ast_debug(w),
+            Definition::Module(m) => m.ast_debug(w),
+            Definition::Script(m) => m.ast_debug(w),
+        }
+    }
+}
+
+impl AstDebug for AddressDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let AddressDefinition {
+            attributes,
+            loc: _loc,
+            addr,
+            modules,
+        } = self;
+        attributes.ast_debug(w);
+        w.write(&format!("address {}", addr));
+        w.writeln(" {{");
+        for m in modules {
+            m.ast_debug(w)
+        }
+        w.writeln("}");
+    }
+}
+
+impl AstDebug for AttributeValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            AttributeValue_::Value(v) => v.ast_debug(w),
+            AttributeValue_::ModuleAccess(n) => n.ast_debug(w),
+        }
+    }
+}
+
+impl AstDebug for Attribute_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Attribute_::Name(n) => w.write(&format!("{}", n)),
+            Attribute_::Assigned(n, v) => {
+                w.write(&format!("{}", n));
+                w.write(" = ");
+                v.ast_debug(w);
+            }
+            Attribute_::Parameterized(n, inners) => {
+                w.write(&format!("{}", n));
+                w.write("(");
+                w.list(&inners.value, ", ", |w, inner| {
+                    inner.ast_debug(w);
+                    false
+                });
+                w.write(")");
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<Attribute> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write("#[");
+        w.list(self, ", ", |w, attr| {
+            attr.ast_debug(w);
+            false
+        });
+        w.write("]");
+    }
+}
+
+impl AstDebug for Vec<Attributes> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.list(self, "", |w, attrs| {
+            attrs.ast_debug(w);
+            true
+        });
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            attributes,
+            loc: _loc,
+            uses,
+            constants,
+            function,
+            specs,
+        } = self;
+        attributes.ast_debug(w);
+        for u in uses {
+            u.ast_debug(w);
+            w.new_line();
+        }
+        w.new_line();
+        for cdef in constants {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        w.new_line();
+        function.ast_debug(w);
+        for spec in specs {
+            spec.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            attributes,
+            loc: _loc,
+            address,
+            name,
+            is_spec_module,
+            members,
+        } = self;
+        attributes.ast_debug(w);
+        match address {
+            None => w.write(&format!(
+                "module {}{}",
+                if *is_spec_module { "spec " } else { "" },
+                name
+            )),
+            Some(addr) => w.write(&format!("module {}::{}", addr, name)),
+        };
+        w.block(|w| {
+            for mem in members {
+                mem.ast_debug(w)
+            }
+        });
+    }
+}
+
+impl AstDebug for ModuleMember {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            ModuleMember::Function(f) => f.ast_debug(w),
+            ModuleMember::Struct(s) => s.ast_debug(w),
+            ModuleMember::Use(u) => u.ast_debug(w),
+            ModuleMember::Friend(f) => f.ast_debug(w),
+            ModuleMember::Constant(c) => c.ast_debug(w),
+            ModuleMember::Spec(s) => s.ast_debug(w),
+        }
+    }
+}
+
+impl AstDebug for UseDecl {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let UseDecl {
+            attributes,
+            loc: _,
+            use_,
+        } = self;
+        attributes.ast_debug(w);
+        use_.ast_debug(w);
+    }
+}
+
+impl AstDebug for ModuleUse {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            ModuleUse::Module(alias) => {
+                alias.map(|alias| w.write(&format!("as {}", alias)));
+            }
+            ModuleUse::Members(members) => w.block(|w| {
+                w.comma(members, |w, (name, alias)| {
+                    w.write(&format!("{}", name));
+                    alias.map(|alias| w.write(&format!("as {}", alias.value)));
+                })
+            }),
+        }
+    }
+}
+
+impl AstDebug for Use {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write("use ");
+        match self {
+            Use::ModuleUse(mident, use_) => {
+                w.write(&format!("{}", mident));
+                use_.ast_debug(w);
+            }
+            Use::NestedModuleUses(addr, entries) => {
+                w.write(&format!("{}::", addr));
+                w.block(|w| {
+                    w.comma(entries, |w, (name, use_)| {
+                        w.write(&format!("{}::", name));
+                        use_.ast_debug(w);
+                    })
+                })
+            }
+            Use::Fun {
+                visibility,
+                function,
+                ty,
+                method,
+            } => {
+                visibility.ast_debug(w);
+                w.write(" use fun ");
+                function.ast_debug(w);
+                w.write(" as ");
+                ty.ast_debug(w);
+                w.write(format!(".{method}"));
+            }
+        }
+        w.write(";")
+    }
+}
+
+impl AstDebug for FriendDecl {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let FriendDecl {
+            attributes,
+            loc: _,
+            friend,
+        } = self;
+        attributes.ast_debug(w);
+        w.write(&format!("friend {}", friend));
+    }
+}
+
+impl AstDebug for StructDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let StructDefinition {
+            attributes,
+            loc: _loc,
+            abilities,
+            name,
+            type_parameters,
+            fields,
+        } = self;
+        attributes.ast_debug(w);
+
+        w.list(abilities, " ", |w, ab_mod| {
+            ab_mod.ast_debug(w);
+            false
+        });
+
+        if let StructFields::Native(_) = fields {
+            w.write("native ");
+        }
+
+        w.write(&format!("struct {}", name));
+        type_parameters.ast_debug(w);
+        match fields {
+            StructFields::Defined(fields) => w.block(|w| {
+                w.semicolon(fields, |w, (f, st)| {
+                    w.write(&format!("{}: ", f));
+                    st.ast_debug(w);
+                });
+            }),
+            StructFields::Positional(types) => w.block(|w| {
+                w.semicolon(types.iter().enumerate(), |w, (i, st)| {
+                    w.write(&format!("pos{}: ", i));
+                    st.ast_debug(w);
+                });
+            }),
+            StructFields::Native(_) => (),
+        }
+    }
+}
+
+impl AstDebug for SpecBlock_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write("spec ");
+        self.target.ast_debug(w);
+        w.write("{");
+        w.semicolon(&self.members, |w, m| m.ast_debug(w));
+        w.write("}");
+    }
+}
+
+impl AstDebug for SpecBlockTarget_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SpecBlockTarget_::Code => {}
+            SpecBlockTarget_::Module => w.write("module "),
+            SpecBlockTarget_::Member(name, sign_opt) => {
+                w.write(name.value);
+                if let Some(sign) = sign_opt {
+                    sign.ast_debug(w);
+                }
+            }
+            SpecBlockTarget_::Schema(n, tys) => {
+                w.write(&format!("schema {}", n.value));
+                if !tys.is_empty() {
+                    w.write("<");
+                    w.list(tys, ", ", |w, ty| {
+                        ty.ast_debug(w);
+                        true
+                    });
+                    w.write(">");
+                }
+            }
+        }
+    }
+}
+
+impl AstDebug for SpecConditionKind_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SpecConditionKind_::*;
+        match self {
+            Assert => w.write("assert "),
+            Assume => w.write("assume "),
+            Decreases => w.write("decreases "),
+            AbortsIf => w.write("aborts_if "),
+            AbortsWith => w.write("aborts_with "),
+            SucceedsIf => w.write("succeeds_if "),
+            Modifies => w.write("modifies "),
+            Emits => w.write("emits "),
+            Ensures => w.write("ensures "),
+            Requires => w.write("requires "),
+            Invariant(ty_params) => {
+                w.write("invariant");
+                ty_params.ast_debug(w);
+                w.write(" ")
+            }
+            InvariantUpdate(ty_params) => {
+                w.write("invariant");
+                ty_params.ast_debug(w);
+                w.write(" update ")
+            }
+            Axiom(ty_params) => {
+                w.write("axiom");
+                ty_params.ast_debug(w);
+                w.write(" ")
+            }
+        }
+    }
+}
+
+impl AstDebug for SpecBlockMember_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SpecBlockMember_::Condition {
+                kind,
+                properties: _,
+                exp,
+                additional_exps,
+            } => {
+                kind.ast_debug(w);
+                exp.ast_debug(w);
+                w.list(additional_exps, ",", |w, e| {
+                    e.ast_debug(w);
+                    true
+                });
+            }
+            SpecBlockMember_::Function {
+                uninterpreted,
+                signature,
+                name,
+                body,
+            } => {
+                if *uninterpreted {
+                    w.write("uninterpreted ");
+                } else if let FunctionBody_::Native = &body.value {
+                    w.write("native ");
+                }
+                w.write("fun ");
+                w.write(&format!("{}", name));
+                signature.ast_debug(w);
+                match &body.value {
+                    FunctionBody_::Defined(body) => w.block(|w| body.ast_debug(w)),
+                    FunctionBody_::Native => w.writeln(";"),
+                }
+            }
+            SpecBlockMember_::Variable {
+                is_global,
+                name,
+                type_parameters,
+                type_,
+                init: _,
+            } => {
+                if *is_global {
+                    w.write("global ");
+                } else {
+                    w.write("local");
+                }
+                w.write(&format!("{}", name));
+                type_parameters.ast_debug(w);
+                w.write(": ");
+                type_.ast_debug(w);
+            }
+            SpecBlockMember_::Update { lhs, rhs } => {
+                w.write("update ");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            SpecBlockMember_::Let {
+                name,
+                post_state,
+                def,
+            } => {
+                w.write(&format!(
+                    "let {}{} = ",
+                    if *post_state { "post " } else { "" },
+                    name
+                ));
+                def.ast_debug(w);
+            }
+            SpecBlockMember_::Include { properties: _, exp } => {
+                w.write("include ");
+                exp.ast_debug(w);
+            }
+            SpecBlockMember_::Apply {
+                exp,
+                patterns,
+                exclusion_patterns,
+            } => {
+                w.write("apply ");
+                exp.ast_debug(w);
+                w.write(" to ");
+                w.list(patterns, ", ", |w, p| {
+                    p.ast_debug(w);
+                    true
+                });
+                if !exclusion_patterns.is_empty() {
+                    w.write(" exclude ");
+                    w.list(exclusion_patterns, ", ", |w, p| {
+                        p.ast_debug(w);
+                        true
+                    });
+                }
+            }
+            SpecBlockMember_::Pragma { properties } => {
+                w.write("pragma ");
+                w.list(properties, ", ", |w, p| {
+                    p.ast_debug(w);
+                    true
+                });
+            }
+        }
+    }
+}
+
+impl AstDebug for SpecApplyPattern_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.list(&self.name_pattern, "", |w, f| {
+            f.ast_debug(w);
+            true
+        });
+        if !self.type_parameters.is_empty() {
+            w.write("<");
+            self.type_parameters.ast_debug(w);
+            w.write(">");
+        }
+    }
+}
+
+impl AstDebug for SpecApplyFragment_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            SpecApplyFragment_::Wildcard => w.write("*"),
+            SpecApplyFragment_::NamePart(n) => w.write(n.value),
+        }
+    }
+}
+
+impl AstDebug for PragmaProperty_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(self.name.value);
+        if let Some(value) = &self.value {
+            w.write(" = ");
+            match value {
+                PragmaValue::Literal(l) => l.ast_debug(w),
+                PragmaValue::Ident(i) => i.ast_debug(w),
+            }
+        }
+    }
+}
+
+impl AstDebug for Function {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Function {
+            attributes,
+            loc: _loc,
+            visibility,
+            entry,
+            signature,
+            name,
+            body,
+        } = self;
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun {}", name));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined(body) => w.block(|w| body.ast_debug(w)),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for Visibility {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{} ", self))
+    }
+}
+
+impl AstDebug for FunctionSignature {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let FunctionSignature {
+            type_parameters,
+            parameters,
+            return_type,
+        } = self;
+        type_parameters.ast_debug(w);
+        w.write("(");
+        w.comma(parameters, |w, (mut_, v, st)| {
+            if mut_.is_some() {
+                w.write("mut ");
+            }
+            w.write(&format!("{}: ", v));
+            st.ast_debug(w);
+        });
+        w.write(")");
+        w.write(": ");
+        return_type.ast_debug(w)
+    }
+}
+
+impl AstDebug for Constant {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Constant {
+            attributes,
+            loc: _loc,
+            name,
+            signature,
+            value,
+        } = self;
+        attributes.ast_debug(w);
+        w.write(&format!("const {}:", name));
+        signature.ast_debug(w);
+        w.write(" = ");
+        value.ast_debug(w);
+        w.write(";");
+    }
+}
+
+impl AstDebug for Vec<(Name, Vec<Ability>)> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">")
+        }
+    }
+}
+
+impl AstDebug for (Name, Vec<Ability>) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (n, abilities) = self;
+        w.write(n.value);
+        ability_constraints_ast_debug(w, abilities);
+    }
+}
+
+impl AstDebug for Vec<StructTypeParameter> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        if !self.is_empty() {
+            w.write("<");
+            w.comma(self, |w, tp| tp.ast_debug(w));
+            w.write(">");
+        }
+    }
+}
+
+impl AstDebug for StructTypeParameter {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Self {
+            is_phantom,
+            name,
+            constraints,
+        } = self;
+        if *is_phantom {
+            w.write("phantom ");
+        }
+        w.write(name.value);
+        ability_constraints_ast_debug(w, constraints);
+    }
+}
+
+fn ability_constraints_ast_debug(w: &mut AstWriter, abilities: &[Ability]) {
+    if !abilities.is_empty() {
+        w.write(": ");
+        w.list(abilities, "+", |w, ab| {
+            ab.ast_debug(w);
+            false
+        })
+    }
+}
+
+impl AstDebug for Ability_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self))
+    }
+}
+
+impl AstDebug for Type_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Type_::Unit => w.write("()"),
+            Type_::Multiple(ss) => {
+                w.write("(");
+                ss.ast_debug(w);
+                w.write(")")
+            }
+            Type_::Apply(m, ss) => {
+                m.ast_debug(w);
+                if !ss.is_empty() {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+            }
+            Type_::Ref(mut_, s) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                s.ast_debug(w)
+            }
+            Type_::Fun(args, result) => {
+                w.write("(");
+                w.comma(args, |w, ty| ty.ast_debug(w));
+                w.write("):");
+                result.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<Type> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, s| s.ast_debug(w))
+    }
+}
+
+impl AstDebug for NameAccessChain_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self))
+    }
+}
+
+impl AstDebug
+    for (
+        Vec<UseDecl>,
+        Vec<SequenceItem>,
+        Option<Loc>,
+        Box<Option<Exp>>,
+    )
+{
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (uses, seq, _, last_e) = self;
+        for u in uses {
+            u.ast_debug(w);
+            w.new_line();
+        }
+        w.semicolon(seq, |w, item| item.ast_debug(w));
+        if !seq.is_empty() {
+            w.writeln(";")
+        }
+        if let Some(e) = &**last_e {
+            e.ast_debug(w)
+        }
+    }
+}
+
+impl AstDebug for SequenceItem_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SequenceItem_ as I;
+        match self {
+            I::Seq(e) => e.ast_debug(w),
+            I::Declare(sp!(_, bs), ty_opt) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                if let Some(ty) = ty_opt {
+                    ty.ast_debug(w)
+                }
+            }
+            I::Bind(sp!(_, bs), ty_opt, e) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                if let Some(ty) = ty_opt {
+                    ty.ast_debug(w)
+                }
+                w.write(" = ");
+                e.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for Exp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Exp_ as E;
+        match self {
+            E::Unit => w.write("()"),
+            E::Value(v) => v.ast_debug(w),
+            E::Move(v) => w.write(&format!("move {}", v)),
+            E::Copy(v) => w.write(&format!("copy {}", v)),
+            E::Name(ma, tys_opt) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+            }
+            E::Call(ma, is_macro, tys_opt, sp!(_, rhs)) => {
+                ma.ast_debug(w);
+                if *is_macro {
+                    w.write("!");
+                }
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Pack(ma, tys_opt, fields) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("{");
+                w.comma(fields, |w, (f, e)| {
+                    w.write(&format!("{}: ", f));
+                    e.ast_debug(w);
+                });
+                w.write("}");
+            }
+            E::Vector(_loc, tys_opt, sp!(_, elems)) => {
+                w.write("vector");
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("[");
+                w.comma(elems, |w, e| e.ast_debug(w));
+                w.write("]");
+            }
+            E::IfElse(b, t, f_opt) => {
+                w.write("if (");
+                b.ast_debug(w);
+                w.write(") ");
+                t.ast_debug(w);
+                if let Some(f) = f_opt {
+                    w.write(" else ");
+                    f.ast_debug(w);
+                }
+            }
+            E::While(b, e) => {
+                w.write("while (");
+                b.ast_debug(w);
+                w.write(")");
+                e.ast_debug(w);
+            }
+            E::Loop(e) => {
+                w.write("loop ");
+                e.ast_debug(w);
+            }
+            E::Block(seq) => w.block(|w| seq.ast_debug(w)),
+            E::Lambda(sp!(_, bs), e) => {
+                w.write("fun ");
+                bs.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::Quant(kind, sp!(_, rs), trs, c_opt, e) => {
+                kind.ast_debug(w);
+                w.write(" ");
+                rs.ast_debug(w);
+                trs.ast_debug(w);
+                if let Some(c) = c_opt {
+                    w.write(" where ");
+                    c.ast_debug(w);
+                }
+                w.write(" : ");
+                e.ast_debug(w);
+            }
+            E::ExpList(es) => {
+                w.write("(");
+                w.comma(es, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Assign(lvalue, rhs) => {
+                lvalue.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+            E::Return(e) => {
+                w.write("return");
+                if let Some(v) = e {
+                    w.write(" ");
+                    v.ast_debug(w);
+                }
+            }
+            E::Abort(e) => {
+                w.write("abort ");
+                e.ast_debug(w);
+            }
+            E::Break => w.write("break"),
+            E::Continue => w.write("continue"),
+            E::Dereference(e) => {
+                w.write("*");
+                e.ast_debug(w)
+            }
+            E::UnaryExp(op, e) => {
+                op.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::BinopExp(l, op, r) => {
+                l.ast_debug(w);
+                w.write(" ");
+                op.ast_debug(w);
+                w.write(" ");
+                r.ast_debug(w)
+            }
+            E::Borrow(mut_, e) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+            }
+            E::Dot(e, n) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", n));
+            }
+            E::DotCall(e, n, tys_opt, sp!(_, rhs)) => {
+                e.ast_debug(w);
+                w.write(&format!(".{}", n));
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                w.write("(");
+                w.comma(rhs, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+            E::Cast(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" as ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Index(e, i) => {
+                e.ast_debug(w);
+                w.write("[");
+                i.ast_debug(w);
+                w.write("]");
+            }
+            E::Annotate(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(": ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Spec(s) => {
+                w.write("spec {");
+                s.ast_debug(w);
+                w.write("}");
+            }
+            E::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for BinOp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self));
+    }
+}
+
+impl AstDebug for UnaryOp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.write(&format!("{}", self));
+    }
+}
+
+impl AstDebug for QuantKind_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            QuantKind_::Forall => w.write("forall"),
+            QuantKind_::Exists => w.write("exists"),
+            QuantKind_::Choose => w.write("choose"),
+            QuantKind_::ChooseMin => w.write("min"),
+        }
+    }
+}
+
+impl AstDebug for Vec<BindWithRange> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, b| b.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for (Bind, Exp) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.0.ast_debug(w);
+        w.write(" in ");
+        self.1.ast_debug(w);
+    }
+}
+
+impl AstDebug for Value_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Value_ as V;
+        w.write(&match self {
+            V::Address(addr) => format!("@{}", addr),
+            V::Num(u) => u.to_string(),
+            V::Bool(b) => format!("{}", b),
+            V::HexString(s) => format!("x\"{}\"", s),
+            V::ByteString(s) => format!("b\"{}\"", s),
+        })
+    }
+}
+
+impl AstDebug for Vec<Bind> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, b| b.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for Vec<Vec<Exp>> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        for trigger in self {
+            w.write("{");
+            w.comma(trigger, |w, b| b.ast_debug(w));
+            w.write("}");
+        }
+    }
+}
+
+impl AstDebug for Bind_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use Bind_ as B;
+        match self {
+            B::Var(mut_, v) => {
+                if mut_.is_some() {
+                    w.write("mut ");
+                }
+                w.write(&format!("{}", v))
+            }
+            B::Unpack(ma, tys_opt, fields) => {
+                ma.ast_debug(w);
+                if let Some(ss) = tys_opt {
+                    w.write("<");
+                    ss.ast_debug(w);
+                    w.write(">");
+                }
+                fields.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for FieldBindings {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            FieldBindings::Named(bs) => {
+                w.write("{");
+                w.comma(bs, |w, (f, b)| {
+                    w.write(&format!("{}: ", f));
+                    b.ast_debug(w);
+                });
+                w.write("}");
+            }
+            FieldBindings::Positional(bs) => {
+                w.write("(");
+                w.comma(bs, |w, b| {
+                    b.ast_debug(w);
+                });
+                w.write(")");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/comments.rs b/vendors/move/crates/move-compiler/src/parser/comments.rs
new file mode 100644
index 000000000..fc675403f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/comments.rs
@@ -0,0 +1,43 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{diag, diagnostics::Diagnostics};
+use move_command_line_common::{
+    character_sets::{is_permitted_chars, DisplayChar},
+    files::FileHash,
+};
+use move_ir_types::location::*;
+use std::collections::BTreeMap;
+
+/// Types to represent comments.
+pub type CommentMap = BTreeMap<FileHash, MatchedFileCommentMap>;
+pub type MatchedFileCommentMap = BTreeMap<u32, String>;
+pub type FileCommentMap = BTreeMap<(u32, u32), String>;
+
+// We restrict strings to only ascii visual characters (0x20 <= c <= 0x7E) or a permitted newline
+// character--\r--,--\n--or a tab--\t.
+pub fn verify_string(file_hash: FileHash, string: &str) -> Result<(), Diagnostics> {
+    let chars: Vec<char> = string.chars().collect();
+    match chars
+        .iter()
+        .enumerate()
+        .find(|(idx, _)| !is_permitted_chars(&chars, *idx))
+    {
+        None => Ok(()),
+        Some((idx, c)) => {
+            let loc = Loc::new(file_hash, idx as u32, idx as u32);
+            let msg = format!(
+                "Invalid character '{}' found when reading file. \
+                For ASCII, only printable characters (tabs '\\t', lf '\\n' and crlf '\\r'+'\\n') \
+                are permitted. Unicode can be used in comments and string literals, \
+                excluding certain control characters.",
+                DisplayChar(*c),
+            );
+            Err(Diagnostics::from(vec![diag!(
+                Syntax::InvalidCharacter,
+                (loc, msg)
+            )]))
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/filter.rs b/vendors/move/crates/move-compiler/src/parser/filter.rs
new file mode 100644
index 000000000..a7e24daeb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/filter.rs
@@ -0,0 +1,322 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::sp;
+
+use crate::parser::ast as P;
+
+/// A trait that decides whether to include a parsed element in the compilation
+pub trait FilterContext {
+    /// Attribute-based node removal
+    fn should_remove_by_attributes(
+        &mut self,
+        _attrs: &[P::Attributes],
+        _is_source_def: bool,
+    ) -> bool {
+        false
+    }
+
+    fn filter_map_address(
+        &mut self,
+        address_def: P::AddressDefinition,
+        is_source_def: bool,
+    ) -> Option<P::AddressDefinition> {
+        if self.should_remove_by_attributes(&address_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(address_def)
+        }
+    }
+
+    fn filter_map_module(
+        &mut self,
+        module_def: P::ModuleDefinition,
+        is_source_def: bool,
+    ) -> Option<P::ModuleDefinition> {
+        if self.should_remove_by_attributes(&module_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(module_def)
+        }
+    }
+
+    fn filter_map_script(
+        &mut self,
+        script_def: P::Script,
+        is_source_def: bool,
+    ) -> Option<P::Script> {
+        if self.should_remove_by_attributes(&script_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(script_def)
+        }
+    }
+
+    fn filter_map_function(
+        &mut self,
+        function_def: P::Function,
+        is_source_def: bool,
+    ) -> Option<P::Function> {
+        if self.should_remove_by_attributes(&function_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(function_def)
+        }
+    }
+
+    fn filter_map_struct(
+        &mut self,
+        struct_def: P::StructDefinition,
+        is_source_def: bool,
+    ) -> Option<P::StructDefinition> {
+        if self.should_remove_by_attributes(&struct_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(struct_def)
+        }
+    }
+
+    fn filter_map_spec(
+        &mut self,
+        spec: P::SpecBlock_,
+        is_source_def: bool,
+    ) -> Option<P::SpecBlock_> {
+        if self.should_remove_by_attributes(&spec.attributes, is_source_def) {
+            None
+        } else {
+            Some(spec)
+        }
+    }
+
+    fn filter_map_use(&mut self, use_decl: P::UseDecl, is_source_def: bool) -> Option<P::UseDecl> {
+        if self.should_remove_by_attributes(&use_decl.attributes, is_source_def) {
+            None
+        } else {
+            Some(use_decl)
+        }
+    }
+
+    fn filter_map_friend(
+        &mut self,
+        friend_decl: P::FriendDecl,
+        is_source_def: bool,
+    ) -> Option<P::FriendDecl> {
+        if self.should_remove_by_attributes(&friend_decl.attributes, is_source_def) {
+            None
+        } else {
+            Some(friend_decl)
+        }
+    }
+
+    fn filter_map_constant(
+        &mut self,
+        constant: P::Constant,
+        is_source_def: bool,
+    ) -> Option<P::Constant> {
+        if self.should_remove_by_attributes(&constant.attributes, is_source_def) {
+            None
+        } else {
+            Some(constant)
+        }
+    }
+}
+
+/// This filters out module member from `prog` based on supplied `FilterContext` implementation
+pub fn filter_program<T: FilterContext>(context: &mut T, prog: P::Program) -> P::Program {
+    let P::Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    } = prog;
+
+    let lib_definitions: Vec<_> = lib_definitions
+        .into_iter()
+        .filter_map(
+            |P::PackageDefinition {
+                 package,
+                 named_address_map,
+                 def,
+             }| {
+                Some(P::PackageDefinition {
+                    package,
+                    named_address_map,
+                    def: filter_definition(context, def, false)?,
+                })
+            },
+        )
+        .collect();
+
+    let source_definitions: Vec<_> = source_definitions
+        .into_iter()
+        .filter_map(
+            |P::PackageDefinition {
+                 package,
+                 named_address_map,
+                 def,
+             }| {
+                Some(P::PackageDefinition {
+                    package,
+                    named_address_map,
+                    def: filter_definition(context, def, true)?,
+                })
+            },
+        )
+        .collect();
+
+    P::Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    }
+}
+
+fn filter_definition<T: FilterContext>(
+    context: &mut T,
+    def: P::Definition,
+    is_source_def: bool,
+) -> Option<P::Definition> {
+    match def {
+        P::Definition::Module(m) => {
+            filter_module(context, m, is_source_def).map(P::Definition::Module)
+        }
+        P::Definition::Address(a) => {
+            filter_address(context, a, is_source_def).map(P::Definition::Address)
+        }
+        P::Definition::Script(s) => {
+            filter_script(context, s, is_source_def).map(P::Definition::Script)
+        }
+    }
+}
+
+fn filter_address<T: FilterContext>(
+    context: &mut T,
+    address_def: P::AddressDefinition,
+    is_source_def: bool,
+) -> Option<P::AddressDefinition> {
+    let address_def = context.filter_map_address(address_def, is_source_def)?;
+
+    let P::AddressDefinition {
+        addr,
+        attributes,
+        loc,
+        modules,
+    } = address_def;
+
+    let modules = modules
+        .into_iter()
+        .filter_map(|m| filter_module(context, m, is_source_def))
+        .collect();
+
+    Some(P::AddressDefinition {
+        attributes,
+        loc,
+        addr,
+        modules,
+    })
+}
+
+fn filter_script<T: FilterContext>(
+    context: &mut T,
+    script_def: P::Script,
+    is_source_def: bool,
+) -> Option<P::Script> {
+    let script_def = context.filter_map_script(script_def, is_source_def)?;
+
+    let P::Script {
+        attributes,
+        uses,
+        constants,
+        function,
+        specs,
+        loc,
+    } = script_def;
+
+    // This is a bit weird, if the only function in the script is filtered, we consider
+    // the whole script is filtered as well
+    let new_function = context.filter_map_function(function, is_source_def)?;
+
+    let new_uses = uses
+        .into_iter()
+        .filter_map(|use_decl| context.filter_map_use(use_decl, is_source_def))
+        .collect();
+    let new_constants = constants
+        .into_iter()
+        .filter_map(|constant| context.filter_map_constant(constant, is_source_def))
+        .collect();
+    let new_specs = specs
+        .into_iter()
+        .filter_map(|sp!(spec_loc, spec)| {
+            context
+                .filter_map_spec(spec, is_source_def)
+                .map(|new_spec| sp(spec_loc, new_spec))
+        })
+        .collect();
+
+    Some(P::Script {
+        attributes,
+        function: new_function,
+        uses: new_uses,
+        constants: new_constants,
+        specs: new_specs,
+        loc,
+    })
+}
+
+fn filter_module<T: FilterContext>(
+    context: &mut T,
+    module_def: P::ModuleDefinition,
+    is_source_def: bool,
+) -> Option<P::ModuleDefinition> {
+    let module_def = context.filter_map_module(module_def, is_source_def)?;
+
+    let P::ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        name,
+        is_spec_module,
+        members,
+    } = module_def;
+
+    let new_members: Vec<_> = members
+        .into_iter()
+        .filter_map(|member| filter_module_member(context, member, is_source_def))
+        .collect();
+
+    Some(P::ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        name,
+        is_spec_module,
+        members: new_members,
+    })
+}
+
+fn filter_module_member<T: FilterContext>(
+    context: &mut T,
+    module_member: P::ModuleMember,
+    is_source_def: bool,
+) -> Option<P::ModuleMember> {
+    use P::ModuleMember as PM;
+
+    match module_member {
+        PM::Function(func_def) => context
+            .filter_map_function(func_def, is_source_def)
+            .map(PM::Function),
+        PM::Struct(struct_def) => context
+            .filter_map_struct(struct_def, is_source_def)
+            .map(PM::Struct),
+        PM::Spec(sp!(spec_loc, spec)) => context
+            .filter_map_spec(spec, is_source_def)
+            .map(|new_spec| PM::Spec(sp(spec_loc, new_spec))),
+        PM::Use(use_decl) => context.filter_map_use(use_decl, is_source_def).map(PM::Use),
+        PM::Friend(friend_decl) => context
+            .filter_map_friend(friend_decl, is_source_def)
+            .map(PM::Friend),
+        PM::Constant(constant) => context
+            .filter_map_constant(constant, is_source_def)
+            .map(PM::Constant),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/keywords.rs b/vendors/move/crates/move-compiler/src/parser/keywords.rs
new file mode 100644
index 000000000..a6d7fafb9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/keywords.rs
@@ -0,0 +1,70 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const KEYWORDS: &[&str] = &[
+    "abort",
+    "acquires",
+    "as",
+    "break",
+    "const",
+    "continue",
+    "copy",
+    "else",
+    "false",
+    "friend",
+    "fun",
+    "has",
+    "if",
+    "invariant",
+    "let",
+    "loop",
+    "module",
+    "move",
+    "native",
+    "public",
+    "return",
+    "script",
+    "spec",
+    "struct",
+    "true",
+    "use",
+    "while",
+];
+
+pub const CONTEXTUAL_KEYWORDS: &[&str] = &[
+    "aborts_if",
+    "aborts_with",
+    "address",
+    "apply",
+    "assume",
+    "axiom",
+    "choose",
+    "decreases",
+    "emits",
+    "ensures",
+    "except",
+    "forall",
+    "global",
+    "include",
+    "internal",
+    "local",
+    "min",
+    "modifies",
+    "mut",
+    "phantom",
+    "post",
+    "pragma",
+    "requires",
+    "Self",
+    "schema",
+    "succeeds_if",
+    "to",
+    "update",
+    "where",
+    "with",
+];
+
+pub const PRIMITIVE_TYPES: &[&str] = &["u8", "u16", "u32", "u64", "u128", "u256", "bool", "vector"];
+
+pub const BUILTINS: &[&str] = &["assert", "freeze", "old"];
diff --git a/vendors/move/crates/move-compiler/src/parser/lexer.rs b/vendors/move/crates/move-compiler/src/parser/lexer.rs
new file mode 100644
index 000000000..8a1964ce0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/lexer.rs
@@ -0,0 +1,759 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag, diagnostics::Diagnostic, editions::SyntaxEdition, parser::syntax::make_loc,
+    shared::CompilationEnv, FileCommentMap, MatchedFileCommentMap,
+};
+use move_command_line_common::{character_sets::DisplayChar, files::FileHash};
+use move_ir_types::location::Loc;
+use std::fmt;
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Tok {
+    EOF,
+    NumValue,
+    NumTypedValue,
+    ByteStringValue,
+    Identifier,
+    Exclaim,
+    ExclaimEqual,
+    Percent,
+    Amp,
+    AmpAmp,
+    AmpMut,
+    LParen,
+    RParen,
+    LBracket,
+    RBracket,
+    Star,
+    Plus,
+    Comma,
+    Minus,
+    Period,
+    PeriodPeriod,
+    Slash,
+    Colon,
+    ColonColon,
+    Semicolon,
+    Less,
+    LessEqual,
+    LessLess,
+    Equal,
+    EqualEqual,
+    EqualEqualGreater,
+    LessEqualEqualGreater,
+    Greater,
+    GreaterEqual,
+    GreaterGreater,
+    Caret,
+    Abort,
+    Acquires,
+    As,
+    Break,
+    Continue,
+    Copy,
+    Else,
+    False,
+    If,
+    Invariant,
+    Let,
+    Loop,
+    Module,
+    Move,
+    Native,
+    Public,
+    Return,
+    Spec,
+    Struct,
+    True,
+    Use,
+    While,
+    LBrace,
+    Pipe,
+    PipePipe,
+    RBrace,
+    Fun,
+    Script,
+    Const,
+    Friend,
+    NumSign,
+    AtSign,
+    RestrictedIdentifier,
+    Mut,
+    Enum,
+    Type,
+    Match,
+}
+
+impl fmt::Display for Tok {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+        use Tok::*;
+        let s = match *self {
+            EOF => "[end-of-file]",
+            NumValue => "[Num]",
+            NumTypedValue => "[NumTyped]",
+            ByteStringValue => "[ByteString]",
+            Identifier => "[Identifier]",
+            Exclaim => "!",
+            ExclaimEqual => "!=",
+            Percent => "%",
+            Amp => "&",
+            AmpAmp => "&&",
+            AmpMut => "&mut",
+            LParen => "(",
+            RParen => ")",
+            LBracket => "[",
+            RBracket => "]",
+            Star => "*",
+            Plus => "+",
+            Comma => ",",
+            Minus => "-",
+            Period => ".",
+            PeriodPeriod => "..",
+            Slash => "/",
+            Colon => ":",
+            ColonColon => "::",
+            Semicolon => ";",
+            Less => "<",
+            LessEqual => "<=",
+            LessLess => "<<",
+            Equal => "=",
+            EqualEqual => "==",
+            EqualEqualGreater => "==>",
+            LessEqualEqualGreater => "<==>",
+            Greater => ">",
+            GreaterEqual => ">=",
+            GreaterGreater => ">>",
+            Caret => "^",
+            Abort => "abort",
+            Acquires => "acquires",
+            As => "as",
+            Break => "break",
+            Continue => "continue",
+            Copy => "copy",
+            Else => "else",
+            False => "false",
+            If => "if",
+            Invariant => "invariant",
+            Let => "let",
+            Loop => "loop",
+            Module => "module",
+            Move => "move",
+            Native => "native",
+            Public => "public",
+            Return => "return",
+            Spec => "spec",
+            Struct => "struct",
+            True => "true",
+            Use => "use",
+            While => "while",
+            LBrace => "{",
+            Pipe => "|",
+            PipePipe => "||",
+            RBrace => "}",
+            Fun => "fun",
+            Script => "script",
+            Const => "const",
+            Friend => "friend",
+            NumSign => "#",
+            AtSign => "@",
+            RestrictedIdentifier => "r#[Identifier]",
+            Mut => "mut",
+            Enum => "enum",
+            Type => "type",
+            Match => "match",
+        };
+        fmt::Display::fmt(s, formatter)
+    }
+}
+
+pub struct Lexer<'input> {
+    text: &'input str,
+    file_hash: FileHash,
+    syntax_edition: SyntaxEdition,
+    doc_comments: FileCommentMap,
+    matched_doc_comments: MatchedFileCommentMap,
+    prev_end: usize,
+    cur_start: usize,
+    cur_end: usize,
+    token: Tok,
+}
+
+impl<'input> Lexer<'input> {
+    pub fn new(
+        text: &'input str,
+        file_hash: FileHash,
+        syntax_edition: SyntaxEdition,
+    ) -> Lexer<'input> {
+        Lexer {
+            text,
+            file_hash,
+            syntax_edition,
+            doc_comments: FileCommentMap::new(),
+            matched_doc_comments: MatchedFileCommentMap::new(),
+            prev_end: 0,
+            cur_start: 0,
+            cur_end: 0,
+            token: Tok::EOF,
+        }
+    }
+
+    pub fn peek(&self) -> Tok {
+        self.token
+    }
+
+    pub fn content(&self) -> &'input str {
+        &self.text[self.cur_start..self.cur_end]
+    }
+
+    pub fn file_hash(&self) -> FileHash {
+        self.file_hash
+    }
+
+    pub fn start_loc(&self) -> usize {
+        self.cur_start
+    }
+
+    pub fn previous_end_loc(&self) -> usize {
+        self.prev_end
+    }
+
+    pub fn current_token_loc(&self) -> Loc {
+        make_loc(self.file_hash(), self.cur_start, self.cur_end)
+    }
+
+    /// Strips line and block comments from input source, and collects documentation comments,
+    /// putting them into a map indexed by the span of the comment region. Comments in the original
+    /// source will be replaced by spaces, such that positions of source items stay unchanged.
+    /// Block comments can be nested.
+    ///
+    /// Documentation comments are comments which start with
+    /// `///` or `/**`, but not `////` or `/***`. The actually comment delimiters
+    /// (`/// .. <newline>` and `/** .. */`) will be not included in extracted comment string. The
+    /// span in the returned map, however, covers the whole region of the comment, including the
+    /// delimiters.
+    fn trim_whitespace_and_comments(
+        &mut self,
+        offset: usize,
+    ) -> Result<&'input str, Box<Diagnostic>> {
+        let mut text = &self.text[offset..];
+
+        // A helper function to compute the index of the start of the given substring.
+        let len = text.len();
+        let get_offset = |substring: &str| offset + len - substring.len();
+
+        // Loop until we find text that isn't whitespace, and that isn't part of
+        // a multi-line or single-line comment.
+        loop {
+            // Trim the start whitespace characters.
+            text = trim_start_whitespace(text);
+
+            if text.starts_with("/*") {
+                // Strip multi-line comments like '/* ... */' or '/** ... */'.
+                // These can be nested, as in '/* /* ... */ */', so record the
+                // start locations of each nested comment as a stack. The
+                // boolean indicates whether it's a documentation comment.
+                let mut locs: Vec<(usize, bool)> = vec![];
+                loop {
+                    text = text.trim_start_matches(|c: char| c != '/' && c != '*');
+                    if text.is_empty() {
+                        // We've reached the end of string while searching for a
+                        // terminating '*/'.
+                        let loc = *locs.last().unwrap();
+                        // Highlight the '/**' if it's a documentation comment, or the '/*'
+                        // otherwise.
+                        let location =
+                            make_loc(self.file_hash, loc.0, loc.0 + if loc.1 { 3 } else { 2 });
+                        return Err(Box::new(diag!(
+                            Syntax::InvalidDocComment,
+                            (location, "Unclosed block comment"),
+                        )));
+                    } else if text.starts_with("/*") {
+                        // We've found a (perhaps nested) multi-line comment.
+                        let start = get_offset(text);
+                        text = &text[2..];
+
+                        // Check if this is a documentation comment: '/**', but not '/***'.
+                        // A documentation comment cannot be nested within another comment.
+                        let is_doc =
+                            text.starts_with('*') && !text.starts_with("**") && locs.is_empty();
+
+                        locs.push((start, is_doc));
+                    } else if text.starts_with("*/") {
+                        // We've found a multi-line comment terminator that ends
+                        // our innermost nested comment.
+                        let loc = locs.pop().unwrap();
+                        text = &text[2..];
+
+                        // If this was a documentation comment, record it in our map.
+                        if loc.1 {
+                            let end = get_offset(text);
+                            self.doc_comments.insert(
+                                (loc.0 as u32, end as u32),
+                                self.text[(loc.0 + 3)..(end - 2)].to_string(),
+                            );
+                        }
+
+                        // If this terminated our last comment, exit the loop.
+                        if locs.is_empty() {
+                            break;
+                        }
+                    } else {
+                        // This is a solitary '/' or '*' that isn't part of any comment delimiter.
+                        // Skip over it.
+                        let c = text.chars().next().unwrap();
+                        text = &text[c.len_utf8()..];
+                    }
+                }
+
+                // Continue the loop immediately after the multi-line comment.
+                // There may be whitespace or another comment following this one.
+                continue;
+            } else if text.starts_with("//") {
+                let start = get_offset(text);
+                let is_doc = text.starts_with("///") && !text.starts_with("////");
+                text = text.trim_start_matches(|c: char| c != '\n');
+
+                // If this was a documentation comment, record it in our map.
+                if is_doc {
+                    let end = get_offset(text);
+                    let mut comment = &self.text[(start + 3)..end];
+                    comment = comment.trim_end_matches(|c: char| c == '\r');
+
+                    self.doc_comments
+                        .insert((start as u32, end as u32), comment.to_string());
+                }
+
+                // Continue the loop on the following line, which may contain leading
+                // whitespace or comments of its own.
+                continue;
+            }
+            break;
+        }
+        Ok(text)
+    }
+
+    // Look ahead to the next token after the current one and return it, and its starting offset,
+    // without advancing the state of the lexer.
+    pub fn lookahead(&mut self) -> Result<Tok, Box<Diagnostic>> {
+        let text = self.trim_whitespace_and_comments(self.cur_end)?;
+        let next_start = self.text.len() - text.len();
+        let (tok, _) = find_token(self.file_hash, self.syntax_edition, text, next_start)?;
+        Ok(tok)
+    }
+
+    // Look ahead to the next two tokens after the current one and return them without advancing
+    // the state of the lexer.
+    pub fn lookahead2(&mut self) -> Result<(Tok, Tok), Box<Diagnostic>> {
+        let text = self.trim_whitespace_and_comments(self.cur_end)?;
+        let offset = self.text.len() - text.len();
+        let (first, length) = find_token(self.file_hash, self.syntax_edition, text, offset)?;
+        let text2 = self.trim_whitespace_and_comments(offset + length)?;
+        let offset2 = self.text.len() - text2.len();
+        let (second, _) = find_token(self.file_hash, self.syntax_edition, text2, offset2)?;
+        Ok((first, second))
+    }
+
+    // Matches the doc comments after the last token (or the beginning of the file) to the position
+    // of the current token. This moves the comments out of `doc_comments` and
+    // into `matched_doc_comments`. At the end of parsing, if `doc_comments` is not empty, errors
+    // for stale doc comments will be produced.
+    //
+    // Calling this function during parsing effectively marks a valid point for documentation
+    // comments. The documentation comments are not stored in the AST, but can be retrieved by
+    // using the start position of an item as an index into `matched_doc_comments`.
+    pub fn match_doc_comments(&mut self) {
+        let start = self.previous_end_loc() as u32;
+        let end = self.cur_start as u32;
+        let mut matched = vec![];
+        let merged = self
+            .doc_comments
+            .range((start, start)..(end, end))
+            .map(|(span, s)| {
+                matched.push(*span);
+                s.clone()
+            })
+            .collect::<Vec<String>>()
+            .join("\n");
+        for span in matched {
+            self.doc_comments.remove(&span);
+        }
+        self.matched_doc_comments.insert(end, merged);
+    }
+
+    // At the end of parsing, checks whether there are any unmatched documentation comments,
+    // producing errors if so. Otherwise returns a map from file position to associated
+    // documentation.
+    pub fn check_and_get_doc_comments(
+        &mut self,
+        env: &mut CompilationEnv,
+    ) -> MatchedFileCommentMap {
+        let msg = "Documentation comment cannot be matched to a language item";
+        let diags = self
+            .doc_comments
+            .iter()
+            .map(|((start, end), _)| {
+                let loc = Loc::new(self.file_hash, *start, *end);
+                diag!(Syntax::InvalidDocComment, (loc, msg))
+            })
+            .collect();
+        env.add_diags(diags);
+        std::mem::take(&mut self.matched_doc_comments)
+    }
+
+    pub fn advance(&mut self) -> Result<(), Box<Diagnostic>> {
+        self.prev_end = self.cur_end;
+        let text = self.trim_whitespace_and_comments(self.cur_end)?;
+        self.cur_start = self.text.len() - text.len();
+        let (token, len) = find_token(self.file_hash, self.syntax_edition, text, self.cur_start)?;
+        self.cur_end = self.cur_start + len;
+        self.token = token;
+        Ok(())
+    }
+
+    // Replace the current token. The lexer will always match the longest token,
+    // but sometimes the parser will prefer to replace it with a shorter one,
+    // e.g., ">" instead of ">>".
+    pub fn replace_token(&mut self, token: Tok, len: usize) {
+        self.token = token;
+        self.cur_end = self.cur_start + len
+    }
+}
+
+// Find the next token and its length without changing the state of the lexer.
+fn find_token(
+    file_hash: FileHash,
+    syntax_edition: SyntaxEdition,
+    text: &str,
+    start_offset: usize,
+) -> Result<(Tok, usize), Box<Diagnostic>> {
+    let c: char = match text.chars().next() {
+        Some(next_char) => next_char,
+        None => {
+            return Ok((Tok::EOF, 0));
+        }
+    };
+    let (tok, len) = match c {
+        '0'..='9' => {
+            if text.starts_with("0x") && text.len() > 2 {
+                let (tok, hex_len) = get_hex_number(&text[2..]);
+                if hex_len == 0 {
+                    // Fall back to treating this as a "0" token.
+                    (Tok::NumValue, 1)
+                } else {
+                    (tok, 2 + hex_len)
+                }
+            } else {
+                get_decimal_number(text)
+            }
+        }
+        '`' => {
+            let (is_valid, len) = if (text.len() > 1)
+                && matches!(text[1..].chars().next(), Some('A'..='Z' | 'a'..='z' | '_'))
+            {
+                let sub = &text[1..];
+                let len = get_name_len(sub);
+                if !matches!(text[1 + len..].chars().next(), Some('`')) {
+                    (false, len + 1)
+                } else {
+                    (true, len + 2)
+                }
+            } else {
+                (false, 1)
+            };
+            if !is_valid {
+                let loc = make_loc(file_hash, start_offset, start_offset + len);
+                let msg = "Missing closing backtick (`) for restricted identifier escaping";
+                return Err(Box::new(diag!(
+                    Syntax::InvalidRestrictedIdentifier,
+                    (loc, msg)
+                )));
+            } else {
+                (Tok::RestrictedIdentifier, len)
+            }
+        }
+        'A'..='Z' | 'a'..='z' | '_' => {
+            let is_hex = text.starts_with("x\"");
+            if is_hex || text.starts_with("b\"") {
+                let line = &text.lines().next().unwrap()[2..];
+                match get_string_len(line) {
+                    Some(last_quote) => (Tok::ByteStringValue, 2 + last_quote + 1),
+                    None => {
+                        let loc = make_loc(file_hash, start_offset, start_offset + line.len() + 2);
+                        return Err(Box::new(diag!(
+                            if is_hex {
+                                Syntax::InvalidHexString
+                            } else {
+                                Syntax::InvalidByteString
+                            },
+                            (loc, "Missing closing quote (\") after byte string")
+                        )));
+                    }
+                }
+            } else {
+                let len = get_name_len(text);
+                (get_name_token(syntax_edition, &text[..len]), len)
+            }
+        }
+        '&' => {
+            if text.starts_with("&mut ") {
+                (Tok::AmpMut, 5)
+            } else if text.starts_with("&&") {
+                (Tok::AmpAmp, 2)
+            } else {
+                (Tok::Amp, 1)
+            }
+        }
+        '|' => {
+            if text.starts_with("||") {
+                (Tok::PipePipe, 2)
+            } else {
+                (Tok::Pipe, 1)
+            }
+        }
+        '=' => {
+            if text.starts_with("==>") {
+                (Tok::EqualEqualGreater, 3)
+            } else if text.starts_with("==") {
+                (Tok::EqualEqual, 2)
+            } else {
+                (Tok::Equal, 1)
+            }
+        }
+        '!' => {
+            if text.starts_with("!=") {
+                (Tok::ExclaimEqual, 2)
+            } else {
+                (Tok::Exclaim, 1)
+            }
+        }
+        '<' => {
+            if text.starts_with("<==>") {
+                (Tok::LessEqualEqualGreater, 4)
+            } else if text.starts_with("<=") {
+                (Tok::LessEqual, 2)
+            } else if text.starts_with("<<") {
+                (Tok::LessLess, 2)
+            } else {
+                (Tok::Less, 1)
+            }
+        }
+        '>' => {
+            if text.starts_with(">=") {
+                (Tok::GreaterEqual, 2)
+            } else if text.starts_with(">>") {
+                (Tok::GreaterGreater, 2)
+            } else {
+                (Tok::Greater, 1)
+            }
+        }
+        ':' => {
+            if text.starts_with("::") {
+                (Tok::ColonColon, 2)
+            } else {
+                (Tok::Colon, 1)
+            }
+        }
+        '%' => (Tok::Percent, 1),
+        '(' => (Tok::LParen, 1),
+        ')' => (Tok::RParen, 1),
+        '[' => (Tok::LBracket, 1),
+        ']' => (Tok::RBracket, 1),
+        '*' => (Tok::Star, 1),
+        '+' => (Tok::Plus, 1),
+        ',' => (Tok::Comma, 1),
+        '-' => (Tok::Minus, 1),
+        '.' => {
+            if text.starts_with("..") {
+                (Tok::PeriodPeriod, 2)
+            } else {
+                (Tok::Period, 1)
+            }
+        }
+        '/' => (Tok::Slash, 1),
+        ';' => (Tok::Semicolon, 1),
+        '^' => (Tok::Caret, 1),
+        '{' => (Tok::LBrace, 1),
+        '}' => (Tok::RBrace, 1),
+        '#' => (Tok::NumSign, 1),
+        '@' => (Tok::AtSign, 1),
+        c => {
+            let loc = make_loc(file_hash, start_offset, start_offset);
+            return Err(Box::new(diag!(
+                Syntax::InvalidCharacter,
+                (loc, format!("Unexpected character: '{}'", DisplayChar(c),))
+            )));
+        }
+    };
+
+    Ok((tok, len))
+}
+
+// Return the length of the substring matching [a-zA-Z0-9_]. Note that
+// this does not do any special check for whether the first character
+// starts with a number, so the caller is responsible for any additional
+// checks on the first character.
+fn get_name_len(text: &str) -> usize {
+    text.chars()
+        .position(|c| !matches!(c, 'a'..='z' | 'A'..='Z' | '_' | '0'..='9'))
+        .unwrap_or(text.len())
+}
+
+fn get_decimal_number(text: &str) -> (Tok, usize) {
+    let num_text_len = text
+        .chars()
+        .position(|c| !matches!(c, '0'..='9' | '_'))
+        .unwrap_or(text.len());
+    get_number_maybe_with_suffix(text, num_text_len)
+}
+
+// Return the length of the substring containing characters in [0-9a-fA-F].
+fn get_hex_number(text: &str) -> (Tok, usize) {
+    let num_text_len = text
+        .find(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9'| '_'))
+        .unwrap_or(text.len());
+    get_number_maybe_with_suffix(text, num_text_len)
+}
+
+// Given the text for a number literal and the length for the characters that match to the number
+// portion, checks for a typed suffix.
+fn get_number_maybe_with_suffix(text: &str, num_text_len: usize) -> (Tok, usize) {
+    let rest = &text[num_text_len..];
+    if rest.starts_with("u8") {
+        (Tok::NumTypedValue, num_text_len + 2)
+    } else if rest.starts_with("u64") || rest.starts_with("u16") || rest.starts_with("u32") {
+        (Tok::NumTypedValue, num_text_len + 3)
+    } else if rest.starts_with("u128") || rest.starts_with("u256") {
+        (Tok::NumTypedValue, num_text_len + 4)
+    } else {
+        // No typed suffix
+        (Tok::NumValue, num_text_len)
+    }
+}
+
+// Return the length of the quoted string, or None if there is no closing quote.
+fn get_string_len(text: &str) -> Option<usize> {
+    let mut pos = 0;
+    let mut iter = text.chars();
+    while let Some(chr) = iter.next() {
+        if chr == '\\' {
+            // Skip over the escaped character (e.g., a quote or another backslash)
+            if iter.next().is_some() {
+                pos += 1;
+            }
+        } else if chr == '"' {
+            return Some(pos);
+        }
+        pos += chr.len_utf8();
+    }
+    None
+}
+
+fn get_name_token(syntax_edition: SyntaxEdition, name: &str) -> Tok {
+    match name {
+        "abort" => Tok::Abort,
+        "acquires" => Tok::Acquires,
+        "as" => Tok::As,
+        "break" => Tok::Break,
+        "const" => Tok::Const,
+        "continue" => Tok::Continue,
+        "copy" => Tok::Copy,
+        "else" => Tok::Else,
+        "false" => Tok::False,
+        "fun" => Tok::Fun,
+        "friend" => Tok::Friend,
+        "if" => Tok::If,
+        "invariant" => Tok::Invariant,
+        "let" => Tok::Let,
+        "loop" => Tok::Loop,
+        "module" => Tok::Module,
+        "move" => Tok::Move,
+        "native" => Tok::Native,
+        "public" => Tok::Public,
+        "return" => Tok::Return,
+        "script" => Tok::Script,
+        "spec" => Tok::Spec,
+        "struct" => Tok::Struct,
+        "true" => Tok::True,
+        "use" => Tok::Use,
+        "while" => Tok::While,
+        _ => match syntax_edition {
+            SyntaxEdition::Legacy => Tok::Identifier,
+            // New keywords in the 2024 edition
+            SyntaxEdition::E2024 => match name {
+                "mut" => Tok::Mut,
+                "enum" => Tok::Enum,
+                "type" => Tok::Type,
+                "match" => Tok::Match,
+                _ => Tok::Identifier,
+            },
+        },
+    }
+}
+
+// Trim the start whitespace characters, include: space, tab, lf(\n) and crlf(\r\n).
+fn trim_start_whitespace(text: &str) -> &str {
+    let mut pos = 0;
+    let mut iter = text.chars();
+
+    while let Some(chr) = iter.next() {
+        match chr {
+            ' ' | '\t' | '\n' => pos += 1,
+            '\r' if matches!(iter.next(), Some('\n')) => pos += 2,
+            _ => break,
+        };
+    }
+
+    &text[pos..]
+}
+
+#[cfg(test)]
+mod tests {
+    use super::trim_start_whitespace;
+
+    #[test]
+    fn test_trim_start_whitespace() {
+        assert_eq!(trim_start_whitespace("\r"), "\r");
+        assert_eq!(trim_start_whitespace("\rxxx"), "\rxxx");
+        assert_eq!(trim_start_whitespace("\t\rxxx"), "\rxxx");
+        assert_eq!(trim_start_whitespace("\r\n\rxxx"), "\rxxx");
+
+        assert_eq!(trim_start_whitespace("\n"), "");
+        assert_eq!(trim_start_whitespace("\r\n"), "");
+        assert_eq!(trim_start_whitespace("\t"), "");
+        assert_eq!(trim_start_whitespace(" "), "");
+
+        assert_eq!(trim_start_whitespace("\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\r\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\txxx"), "xxx");
+        assert_eq!(trim_start_whitespace(" xxx"), "xxx");
+
+        assert_eq!(trim_start_whitespace(" \r\n"), "");
+        assert_eq!(trim_start_whitespace("\t\r\n"), "");
+        assert_eq!(trim_start_whitespace("\n\r\n"), "");
+        assert_eq!(trim_start_whitespace("\r\n "), "");
+        assert_eq!(trim_start_whitespace("\r\n\t"), "");
+        assert_eq!(trim_start_whitespace("\r\n\n"), "");
+
+        assert_eq!(trim_start_whitespace(" \r\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\t\r\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\n\r\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\r\n xxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\r\n\txxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\r\n\nxxx"), "xxx");
+
+        assert_eq!(trim_start_whitespace(" \r\n\r\n"), "");
+        assert_eq!(trim_start_whitespace("\r\n \t\n"), "");
+
+        assert_eq!(trim_start_whitespace(" \r\n\r\nxxx"), "xxx");
+        assert_eq!(trim_start_whitespace("\r\n \t\nxxx"), "xxx");
+
+        assert_eq!(trim_start_whitespace(" \r\n\r\nxxx\n"), "xxx\n");
+        assert_eq!(trim_start_whitespace("\r\n \t\nxxx\r\n"), "xxx\r\n");
+        assert_eq!(trim_start_whitespace("\r\n\u{A0}\n"), "\u{A0}\n");
+        assert_eq!(trim_start_whitespace("\r\n\u{A0}\n"), "\u{A0}\n");
+        assert_eq!(trim_start_whitespace("\t  \u{0085}\n"), "\u{0085}\n")
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/merge_spec_modules.rs b/vendors/move/crates/move-compiler/src/parser/merge_spec_modules.rs
new file mode 100644
index 000000000..7aced3103
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/merge_spec_modules.rs
@@ -0,0 +1,171 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Merges specification modules into their target modules.
+//!
+//! There are some issues with this approach which we may want to fix down the road:
+//! - If a spec module contains a `use`, we don't want the target module be able to use it.
+//! - Similarly, we also *may* want the spec module not be able to see target module `use`
+//!   declarations, and require it to repeat them.
+//! A solution to both problems can be to mark names introduced by `use` to whether they
+//! are for specs or not, and allow the later to resolve only in spec contexts.
+
+use crate::{
+    diag,
+    parser::ast::{
+        Definition, LeadingNameAccess_, ModuleDefinition, ModuleMember, PackageDefinition, Program,
+    },
+    shared::*,
+};
+use move_symbol_pool::Symbol;
+use std::collections::BTreeMap;
+
+/// Given a parsed program, merge all specification modules into their target modules.
+pub fn program(compilation_env: &mut CompilationEnv, prog: Program) -> Program {
+    let Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    } = prog;
+
+    // Phase 1: extract all spec modules.
+    let mut spec_modules = BTreeMap::new();
+    let mut source_definitions = extract_spec_modules(&mut spec_modules, source_definitions);
+    let mut lib_definitions = extract_spec_modules(&mut spec_modules, lib_definitions);
+
+    // Report errors for misplaced members
+    for m in spec_modules.values() {
+        for mem in &m.members {
+            let (loc, msg) = match mem {
+                ModuleMember::Function(f) => {
+                    (f.loc, "functions not allowed in specification module")
+                }
+                ModuleMember::Struct(s) => (s.loc, "structs not allowed in specification module"),
+                ModuleMember::Constant(c) => {
+                    (c.loc, "constants not allowed in specification module")
+                }
+                ModuleMember::Use(_) | ModuleMember::Friend(_) | ModuleMember::Spec(_) => continue,
+            };
+            compilation_env.add_diag(diag!(Declarations::InvalidSpec, (loc, msg)))
+        }
+    }
+
+    // Phase 2: Go over remaining proper modules and merge spec modules.
+    merge_spec_modules(&mut spec_modules, &mut source_definitions);
+    merge_spec_modules(&mut spec_modules, &mut lib_definitions);
+
+    // Remaining spec modules could not be merged, report errors.
+    for (_, m) in spec_modules {
+        let msg = "Cannot associate specification with any target module in this compilation. A \
+                   module specification cannot be compiled standalone.";
+        compilation_env.add_diag(diag!(Declarations::InvalidSpec, (m.name.loc(), msg)))
+    }
+    Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    }
+}
+
+fn extract_spec_modules(
+    spec_modules: &mut BTreeMap<(Option<LeadingNameAccess_>, Symbol), ModuleDefinition>,
+    defs: Vec<PackageDefinition>,
+) -> Vec<PackageDefinition> {
+    // TODO check package name and address mappings line up
+    defs.into_iter()
+        .filter_map(
+            |PackageDefinition {
+                 package,
+                 named_address_map,
+                 def,
+             }| {
+                let def = match def {
+                    Definition::Module(m) => {
+                        Definition::Module(extract_spec_module(spec_modules, None, m)?)
+                    }
+                    Definition::Address(mut a) => {
+                        let addr_ = Some(&a.addr.value);
+                        a.modules = a
+                            .modules
+                            .into_iter()
+                            .filter_map(|m| extract_spec_module(spec_modules, addr_, m))
+                            .collect::<Vec<_>>();
+                        Definition::Address(a)
+                    }
+                    Definition::Script(s) => Definition::Script(s),
+                };
+                Some(PackageDefinition {
+                    package,
+                    named_address_map,
+                    def,
+                })
+            },
+        )
+        .collect()
+}
+
+fn extract_spec_module(
+    spec_modules: &mut BTreeMap<(Option<LeadingNameAccess_>, Symbol), ModuleDefinition>,
+    address_opt: Option<&LeadingNameAccess_>,
+    m: ModuleDefinition,
+) -> Option<ModuleDefinition> {
+    if m.is_spec_module {
+        // TODO check for duplicate spec modules?
+        spec_modules.insert(module_key(address_opt, &m), m);
+        None
+    } else {
+        Some(m)
+    }
+}
+
+fn merge_spec_modules(
+    spec_modules: &mut BTreeMap<(Option<LeadingNameAccess_>, Symbol), ModuleDefinition>,
+    defs: &mut [PackageDefinition],
+) {
+    use Definition::*;
+    // TODO check package name and address mappings line up
+    for PackageDefinition { def, .. } in defs {
+        match def {
+            Module(m) => merge_spec_module(spec_modules, None, m),
+            Address(a) => {
+                let addr_ = Some(&a.addr.value);
+                for m in &mut a.modules {
+                    merge_spec_module(spec_modules, addr_, m)
+                }
+            }
+            Script(_) => {}
+        }
+    }
+}
+
+fn merge_spec_module(
+    spec_modules: &mut BTreeMap<(Option<LeadingNameAccess_>, Symbol), ModuleDefinition>,
+    address_opt: Option<&LeadingNameAccess_>,
+    m: &mut ModuleDefinition,
+) {
+    if let Some(spec_module) = spec_modules.remove(&module_key(address_opt, m)) {
+        let ModuleDefinition {
+            attributes,
+            members,
+            loc: _,
+            address: _,
+            name: _,
+            is_spec_module,
+        } = spec_module;
+        assert!(is_spec_module);
+        m.attributes.extend(attributes);
+        m.members.extend(members);
+    }
+}
+
+fn module_key(
+    address_opt: Option<&LeadingNameAccess_>,
+    m: &ModuleDefinition,
+) -> (Option<LeadingNameAccess_>, Symbol) {
+    let addr_ = match &m.address {
+        Some(sp!(_, a_)) => Some(*a_),
+        None => address_opt.copied(),
+    };
+    (addr_, m.name.value())
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/mod.rs b/vendors/move/crates/move-compiler/src/parser/mod.rs
new file mode 100644
index 000000000..1083d4d7e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/mod.rs
@@ -0,0 +1,198 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod ast;
+pub mod comments;
+pub(crate) mod filter;
+pub mod keywords;
+pub mod lexer;
+pub(crate) mod merge_spec_modules;
+pub(crate) mod syntax;
+
+use crate::{
+    diagnostics::{codes::Severity, Diagnostics, FilesSourceText},
+    parser::{self, ast::PackageDefinition, syntax::parse_file_string},
+    shared::{CompilationEnv, IndexedPackagePath, NamedAddressMaps},
+};
+use anyhow::anyhow;
+use comments::*;
+use move_command_line_common::files::{find_move_filenames, FileHash};
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeSet, HashMap},
+    fs::File,
+    io::Read,
+};
+
+pub(crate) fn parse_program(
+    compilation_env: &mut CompilationEnv,
+    named_address_maps: NamedAddressMaps,
+    targets: Vec<IndexedPackagePath>,
+    deps: Vec<IndexedPackagePath>,
+) -> anyhow::Result<(
+    FilesSourceText,
+    Result<(parser::ast::Program, CommentMap), Diagnostics>,
+)> {
+    fn find_move_filenames_with_address_mapping(
+        paths_with_mapping: Vec<IndexedPackagePath>,
+    ) -> anyhow::Result<Vec<IndexedPackagePath>> {
+        let mut res = vec![];
+        for IndexedPackagePath {
+            package,
+            path,
+            named_address_map: named_address_mapping,
+        } in paths_with_mapping
+        {
+            res.extend(
+                find_move_filenames(&[path.as_str()], true)?
+                    .into_iter()
+                    .map(|s| IndexedPackagePath {
+                        package,
+                        path: Symbol::from(s),
+                        named_address_map: named_address_mapping,
+                    }),
+            );
+        }
+        // sort the filenames so errors about redefinitions, or other inter-file conflicts, are
+        // deterministic
+        res.sort_by(|p1, p2| p1.path.cmp(&p2.path));
+        Ok(res)
+    }
+
+    let targets = find_move_filenames_with_address_mapping(targets)?;
+    let mut deps = find_move_filenames_with_address_mapping(deps)?;
+    ensure_targets_deps_dont_intersect(compilation_env, &targets, &mut deps)?;
+    let mut files: FilesSourceText = HashMap::new();
+    let mut source_definitions = Vec::new();
+    let mut source_comments = CommentMap::new();
+    let mut lib_definitions = Vec::new();
+    let mut diags: Diagnostics = Diagnostics::new();
+
+    for IndexedPackagePath {
+        package,
+        path,
+        named_address_map,
+    } in targets
+    {
+        let (defs, comments, ds, file_hash) =
+            parse_file(compilation_env, &mut files, path, package)?;
+        source_definitions.extend(defs.into_iter().map(|def| PackageDefinition {
+            package,
+            named_address_map,
+            def,
+        }));
+        source_comments.insert(file_hash, comments);
+        diags.extend(ds);
+    }
+
+    for IndexedPackagePath {
+        package,
+        path,
+        named_address_map,
+    } in deps
+    {
+        let (defs, _, ds, _) = parse_file(compilation_env, &mut files, path, package)?;
+        lib_definitions.extend(defs.into_iter().map(|def| PackageDefinition {
+            package,
+            named_address_map,
+            def,
+        }));
+        diags.extend(ds);
+    }
+
+    // TODO fix this so it works likes other passes and the handling of errors is done outside of
+    // this function
+    let env_result = compilation_env.check_diags_at_or_above_severity(Severity::BlockingError);
+    if let Err(env_diags) = env_result {
+        diags.extend(env_diags)
+    }
+
+    let res = if diags.is_empty() {
+        let pprog = parser::ast::Program {
+            named_address_maps,
+            source_definitions,
+            lib_definitions,
+        };
+        Ok((pprog, source_comments))
+    } else {
+        Err(diags)
+    };
+    Ok((files, res))
+}
+
+fn ensure_targets_deps_dont_intersect(
+    compilation_env: &CompilationEnv,
+    targets: &[IndexedPackagePath],
+    deps: &mut Vec<IndexedPackagePath>,
+) -> anyhow::Result<()> {
+    /// Canonicalize a file path.
+    fn canonicalize(path: &Symbol) -> String {
+        let p = path.as_str();
+        match std::fs::canonicalize(p) {
+            Ok(s) => s.to_string_lossy().to_string(),
+            Err(_) => p.to_owned(),
+        }
+    }
+    let target_set = targets
+        .iter()
+        .map(|p| canonicalize(&p.path))
+        .collect::<BTreeSet<_>>();
+    let dep_set = deps
+        .iter()
+        .map(|p| canonicalize(&p.path))
+        .collect::<BTreeSet<_>>();
+    let intersection = target_set.intersection(&dep_set).collect::<Vec<_>>();
+    if intersection.is_empty() {
+        return Ok(());
+    }
+    if compilation_env.flags().sources_shadow_deps() {
+        deps.retain(|p| !intersection.contains(&&canonicalize(&p.path)));
+        return Ok(());
+    }
+    let all_files = intersection
+        .into_iter()
+        .map(|s| format!("    {}", s))
+        .collect::<Vec<_>>()
+        .join("\n");
+    Err(anyhow!(
+        "The following files were marked as both targets and dependencies:\n{}",
+        all_files
+    ))
+}
+
+fn parse_file(
+    compilation_env: &mut CompilationEnv,
+    files: &mut FilesSourceText,
+    fname: Symbol,
+    package: Option<Symbol>,
+) -> anyhow::Result<(
+    Vec<parser::ast::Definition>,
+    MatchedFileCommentMap,
+    Diagnostics,
+    FileHash,
+)> {
+    let mut diags = Diagnostics::new();
+    let mut f = File::open(fname.as_str())
+        .map_err(|err| std::io::Error::new(err.kind(), format!("{}: {}", err, fname)))?;
+    let mut source_buffer = String::new();
+    f.read_to_string(&mut source_buffer)?;
+    let file_hash = FileHash::new(&source_buffer);
+    let buffer = match verify_string(file_hash, &source_buffer) {
+        Err(ds) => {
+            diags.extend(ds);
+            files.insert(file_hash, (fname, source_buffer));
+            return Ok((vec![], MatchedFileCommentMap::new(), diags, file_hash));
+        }
+        Ok(()) => &source_buffer,
+    };
+    let (defs, comments) = match parse_file_string(compilation_env, file_hash, buffer, package) {
+        Ok(defs_and_comments) => defs_and_comments,
+        Err(ds) => {
+            diags.extend(ds);
+            (vec![], MatchedFileCommentMap::new())
+        }
+    };
+    files.insert(file_hash, (fname, source_buffer));
+    Ok((defs, comments, diags, file_hash))
+}
diff --git a/vendors/move/crates/move-compiler/src/parser/syntax.rs b/vendors/move/crates/move-compiler/src/parser/syntax.rs
new file mode 100644
index 000000000..9dfeb66e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/parser/syntax.rs
@@ -0,0 +1,3700 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// In the informal grammar comments in this file, Comma<T> is shorthand for:
+//      (<T> ",")* <T>?
+// Note that this allows an optional trailing comma.
+
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::*;
+use move_symbol_pool::{symbol, Symbol};
+
+use crate::{
+    diag,
+    diagnostics::{Diagnostic, Diagnostics},
+    editions::FeatureGate,
+    parser::{ast::*, lexer::*},
+    shared::*,
+    MatchedFileCommentMap,
+};
+
+struct Context<'env, 'lexer, 'input> {
+    package_name: Option<Symbol>,
+    env: &'env mut CompilationEnv,
+    tokens: &'lexer mut Lexer<'input>,
+}
+
+impl<'env, 'lexer, 'input> Context<'env, 'lexer, 'input> {
+    fn new(
+        env: &'env mut CompilationEnv,
+        tokens: &'lexer mut Lexer<'input>,
+        package_name: Option<Symbol>,
+    ) -> Self {
+        Self {
+            package_name,
+            env,
+            tokens,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Error Handling
+//**************************************************************************************************
+
+fn current_token_error_string(tokens: &Lexer) -> String {
+    if tokens.peek() == Tok::EOF {
+        "end-of-file".to_string()
+    } else {
+        format!("'{}'", tokens.content())
+    }
+}
+
+fn unexpected_token_error(tokens: &Lexer, expected: &str) -> Box<Diagnostic> {
+    unexpected_token_error_(tokens, tokens.start_loc(), expected)
+}
+
+fn unexpected_token_error_(
+    tokens: &Lexer,
+    expected_start_loc: usize,
+    expected: &str,
+) -> Box<Diagnostic> {
+    let unexpected_loc = current_token_loc(tokens);
+    let unexpected = current_token_error_string(tokens);
+    let expected_loc = if expected_start_loc < tokens.start_loc() {
+        make_loc(
+            tokens.file_hash(),
+            expected_start_loc,
+            tokens.previous_end_loc(),
+        )
+    } else {
+        unexpected_loc
+    };
+    Box::new(diag!(
+        Syntax::UnexpectedToken,
+        (unexpected_loc, format!("Unexpected {}", unexpected)),
+        (expected_loc, format!("Expected {}", expected)),
+    ))
+}
+
+fn add_type_args_ambiguity_label(loc: Loc, mut diag: Box<Diagnostic>) -> Box<Diagnostic> {
+    const MSG: &str = "Perhaps you need a blank space before this '<' operator?";
+    diag.add_secondary_label((loc, MSG));
+    diag
+}
+
+// A macro for providing better diagnostics when we expect a specific token and find some other
+// pattern instead. For example, we can use this to handle the case when a const is missing its
+// type annotation as:
+//
+//  expect_token!(
+//      context.tokens,
+//      Tok::Colon,
+//      Tok::Equal => (Syntax::UnexpectedToken, name.loc(), "Add type annotation to this constant")
+//  )?;
+//
+// This macro will fall through to an unexpected token error, but may also define its own default
+// as well:
+//
+//  expect_token!(
+//      context.tokens,
+//      Tok::Colon,
+//      Tok::Equal => (Syntax::UnexpectedToken, name.loc(), "Add type annotation to this constant")
+//      _ => (Syntax::UnexpectedToken, name.loc(), "Misformed constant definition")
+//  )?;
+//
+//  NB(cgswords): we could make $expected a pat if we required users to pass in a name for it as
+//  well for the default-case error reporting.
+
+macro_rules! expect_token {
+    ($tokens:expr, $expected:expr, $($tok:pat => ($code:expr, $loc:expr, $msg:expr)),+) => {
+        {
+            let next = $tokens.peek();
+            match next {
+                _ if next == $expected => {
+                    $tokens.advance()?;
+                    Ok(())
+                },
+                $($tok => Err(Box::new(diag!($code, ($loc, $msg)))),)+
+                _ => {
+                    let expected = format!("'{}'{}", next, $expected);
+                    Err(unexpected_token_error_($tokens, $tokens.start_loc(), &expected))
+                },
+            }
+        }
+    };
+    ($tokens:expr,
+     $expected:expr,
+     $($tok:pat => ($code:expr, $loc:expr, $msg:expr)),+
+     _ => ($dcode:expr, $dloc:expr, $dmsg:expr)) => {
+        {
+            let next = {
+                $tokens.advance()?;
+                Ok(())
+            };
+            match next {
+                _ if next == $expected => Ok(()),
+                $($tok => Err(Box::new(diag!($code, ($loc, $msg)))),)+
+                _ => Err(Box::new(diag!($dcode, ($dloc, $dmsg)))),
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Miscellaneous Utilities
+//**************************************************************************************************
+
+pub fn make_loc(file_hash: FileHash, start: usize, end: usize) -> Loc {
+    Loc::new(file_hash, start as u32, end as u32)
+}
+
+fn current_token_loc(tokens: &Lexer) -> Loc {
+    let start_loc = tokens.start_loc();
+    make_loc(
+        tokens.file_hash(),
+        start_loc,
+        start_loc + tokens.content().len(),
+    )
+}
+
+fn spanned<T>(file_hash: FileHash, start: usize, end: usize, value: T) -> Spanned<T> {
+    Spanned {
+        loc: make_loc(file_hash, start, end),
+        value,
+    }
+}
+
+// Check for the specified token and consume it if it matches.
+// Returns true if the token matches.
+fn match_token(tokens: &mut Lexer, tok: Tok) -> Result<bool, Box<Diagnostic>> {
+    if tokens.peek() == tok {
+        tokens.advance()?;
+        Ok(true)
+    } else {
+        Ok(false)
+    }
+}
+
+// Check for the specified token and return an error if it does not match.
+fn consume_token(tokens: &mut Lexer, tok: Tok) -> Result<(), Box<Diagnostic>> {
+    consume_token_(tokens, tok, tokens.start_loc(), "")
+}
+
+fn consume_token_(
+    tokens: &mut Lexer,
+    tok: Tok,
+    expected_start_loc: usize,
+    expected_case: &str,
+) -> Result<(), Box<Diagnostic>> {
+    if tokens.peek() == tok {
+        tokens.advance()?;
+        Ok(())
+    } else {
+        let expected = format!("'{}'{}", tok, expected_case);
+        Err(unexpected_token_error_(
+            tokens,
+            expected_start_loc,
+            &expected,
+        ))
+    }
+}
+
+// let unexp_loc = current_token_loc(tokens);
+// let unexp_msg = format!("Unexpected {}", current_token_error_string(tokens));
+
+// let end_loc = tokens.previous_end_loc();
+// let addr_loc = make_loc(tokens.file_hash(), start_loc, end_loc);
+// let exp_msg = format!("Expected '::' {}", case);
+// Err(vec![(unexp_loc, unexp_msg), (addr_loc, exp_msg)])
+
+// Check for the identifier token with specified value and return an error if it does not match.
+fn consume_identifier(tokens: &mut Lexer, value: &str) -> Result<(), Box<Diagnostic>> {
+    if tokens.peek() == Tok::Identifier && tokens.content() == value {
+        tokens.advance()
+    } else {
+        let expected = format!("'{}'", value);
+        Err(unexpected_token_error(tokens, &expected))
+    }
+}
+
+// If the next token is the specified kind, consume it and return
+// its source location.
+fn consume_optional_token_with_loc(
+    tokens: &mut Lexer,
+    tok: Tok,
+) -> Result<Option<Loc>, Box<Diagnostic>> {
+    if tokens.peek() == tok {
+        let start_loc = tokens.start_loc();
+        tokens.advance()?;
+        let end_loc = tokens.previous_end_loc();
+        Ok(Some(make_loc(tokens.file_hash(), start_loc, end_loc)))
+    } else {
+        Ok(None)
+    }
+}
+
+// While parsing a list and expecting a ">" token to mark the end, replace
+// a ">>" token with the expected ">". This handles the situation where there
+// are nested type parameters that result in two adjacent ">" tokens, e.g.,
+// "A<B<C>>".
+fn adjust_token(tokens: &mut Lexer, end_token: Tok) {
+    if tokens.peek() == Tok::GreaterGreater && end_token == Tok::Greater {
+        tokens.replace_token(Tok::Greater, 1);
+    }
+}
+
+// Parse a comma-separated list of items, including the specified starting and
+// ending tokens.
+fn parse_comma_list<F, R>(
+    context: &mut Context,
+    start_token: Tok,
+    end_token: Tok,
+    parse_list_item: F,
+    item_description: &str,
+) -> Result<Vec<R>, Box<Diagnostic>>
+where
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
+{
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, start_token)?;
+    parse_comma_list_after_start(
+        context,
+        start_loc,
+        start_token,
+        end_token,
+        parse_list_item,
+        item_description,
+    )
+}
+
+// Parse a comma-separated list of items, including the specified ending token, but
+// assuming that the starting token has already been consumed.
+fn parse_comma_list_after_start<F, R>(
+    context: &mut Context,
+    start_loc: usize,
+    start_token: Tok,
+    end_token: Tok,
+    parse_list_item: F,
+    item_description: &str,
+) -> Result<Vec<R>, Box<Diagnostic>>
+where
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
+{
+    adjust_token(context.tokens, end_token);
+    if match_token(context.tokens, end_token)? {
+        return Ok(vec![]);
+    }
+    let mut v = vec![];
+    loop {
+        if context.tokens.peek() == Tok::Comma {
+            let current_loc = context.tokens.start_loc();
+            let loc = make_loc(context.tokens.file_hash(), current_loc, current_loc);
+            return Err(Box::new(diag!(
+                Syntax::UnexpectedToken,
+                (loc, format!("Expected {}", item_description))
+            )));
+        }
+        v.push(parse_list_item(context)?);
+        adjust_token(context.tokens, end_token);
+        if match_token(context.tokens, end_token)? {
+            break Ok(v);
+        }
+        if !match_token(context.tokens, Tok::Comma)? {
+            let current_loc = context.tokens.start_loc();
+            let loc = make_loc(context.tokens.file_hash(), current_loc, current_loc);
+            let loc2 = make_loc(context.tokens.file_hash(), start_loc, start_loc);
+            return Err(Box::new(diag!(
+                Syntax::UnexpectedToken,
+                (loc, format!("Expected '{}'", end_token)),
+                (loc2, format!("To match this '{}'", start_token)),
+            )));
+        }
+        adjust_token(context.tokens, end_token);
+        if match_token(context.tokens, end_token)? {
+            break Ok(v);
+        }
+    }
+}
+
+// Parse a list of items, without specified start and end tokens, and the separator determined by
+// the passed function `parse_list_continue`.
+fn parse_list<C, F, R>(
+    context: &mut Context,
+    mut parse_list_continue: C,
+    parse_list_item: F,
+) -> Result<Vec<R>, Box<Diagnostic>>
+where
+    C: FnMut(&mut Context) -> Result<bool, Box<Diagnostic>>,
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
+{
+    let mut v = vec![];
+    loop {
+        v.push(parse_list_item(context)?);
+        if !parse_list_continue(context)? {
+            break Ok(v);
+        }
+    }
+}
+
+//**************************************************************************************************
+// Identifiers, Addresses, and Names
+//**************************************************************************************************
+
+// Parse an identifier:
+//      Identifier = <IdentifierValue>
+#[allow(clippy::needless_if)]
+fn parse_identifier(context: &mut Context) -> Result<Name, Box<Diagnostic>> {
+    if matches!(
+        context.tokens.peek(),
+        Tok::Identifier | Tok::RestrictedIdentifier
+    ) {}
+    let id: Symbol = match context.tokens.peek() {
+        Tok::Identifier => context.tokens.content().into(),
+        Tok::RestrictedIdentifier => {
+            // peel off backticks ``
+            let content = context.tokens.content();
+            let peeled = &content[1..content.len() - 1];
+            peeled.into()
+        }
+        _ => {
+            return Err(unexpected_token_error(context.tokens, "an identifier"));
+        }
+    };
+    let start_loc = context.tokens.start_loc();
+    context.tokens.advance()?;
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, id))
+}
+
+// Parse a numerical address value
+//     NumericalAddress = <Number>
+fn parse_address_bytes(
+    context: &mut Context,
+) -> Result<Spanned<NumericalAddress>, Box<Diagnostic>> {
+    let loc = current_token_loc(context.tokens);
+    let addr_res = NumericalAddress::parse_str(context.tokens.content());
+    consume_token(context.tokens, Tok::NumValue)?;
+    let addr_ = match addr_res {
+        Ok(addr_) => addr_,
+        Err(msg) => {
+            context
+                .env
+                .add_diag(diag!(Syntax::InvalidAddress, (loc, msg)));
+            NumericalAddress::DEFAULT_ERROR_ADDRESS
+        }
+    };
+    Ok(sp(loc, addr_))
+}
+
+// Parse the beginning of an access, either an address or an identifier:
+//      LeadingNameAccess = <NumericalAddress> | <Identifier>
+fn parse_leading_name_access(context: &mut Context) -> Result<LeadingNameAccess, Box<Diagnostic>> {
+    parse_leading_name_access_(context, || "an address or an identifier")
+}
+
+// Parse the beginning of an access, either an address or an identifier with a specific description
+fn parse_leading_name_access_<'a, F: FnOnce() -> &'a str>(
+    context: &mut Context,
+    item_description: F,
+) -> Result<LeadingNameAccess, Box<Diagnostic>> {
+    match context.tokens.peek() {
+        Tok::RestrictedIdentifier | Tok::Identifier => {
+            let loc = current_token_loc(context.tokens);
+            let n = parse_identifier(context)?;
+            Ok(sp(loc, LeadingNameAccess_::Name(n)))
+        }
+        Tok::NumValue => {
+            let sp!(loc, addr) = parse_address_bytes(context)?;
+            Ok(sp(loc, LeadingNameAccess_::AnonymousAddress(addr)))
+        }
+        _ => Err(unexpected_token_error(context.tokens, item_description())),
+    }
+}
+
+// Parse a variable name:
+//      Var = <Identifier>
+fn parse_var(context: &mut Context) -> Result<Var, Box<Diagnostic>> {
+    Ok(Var(parse_identifier(context)?))
+}
+
+// Parse a field name:
+//      Field = <Identifier>
+fn parse_field(context: &mut Context) -> Result<Field, Box<Diagnostic>> {
+    Ok(Field(parse_identifier(context)?))
+}
+
+// Parse a module name:
+//      ModuleName = <Identifier>
+fn parse_module_name(context: &mut Context) -> Result<ModuleName, Box<Diagnostic>> {
+    Ok(ModuleName(parse_identifier(context)?))
+}
+
+// Parse a module identifier:
+//      ModuleIdent = <LeadingNameAccess> "::" <ModuleName>
+
+// Parse a module access (a variable, struct type, or function):
+//      NameAccessChain = <LeadingNameAccess> ( "::" <Identifier> ( "::" <Identifier> )? )?
+fn parse_name_access_chain<'a, F: FnOnce() -> &'a str>(
+    context: &mut Context,
+    item_description: F,
+) -> Result<NameAccessChain, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let access = parse_name_access_chain_(context, item_description)?;
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        access,
+    ))
+}
+
+// Parse a module access with a specific description
+fn parse_name_access_chain_<'a, F: FnOnce() -> &'a str>(
+    context: &mut Context,
+    item_description: F,
+) -> Result<NameAccessChain_, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let ln = parse_leading_name_access_(context, item_description)?;
+    let ln = match ln {
+        // A name by itself is a valid access chain
+        sp!(_, LeadingNameAccess_::Name(n1)) if context.tokens.peek() != Tok::ColonColon => {
+            return Ok(NameAccessChain_::One(n1))
+        }
+        ln => ln,
+    };
+
+    consume_token_(
+        context.tokens,
+        Tok::ColonColon,
+        start_loc,
+        " after an address in a module access chain",
+    )?;
+    let n2 = parse_identifier(context)?;
+    if context.tokens.peek() != Tok::ColonColon {
+        return Ok(NameAccessChain_::Two(ln, n2));
+    }
+    let ln_n2_loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    consume_token(context.tokens, Tok::ColonColon)?;
+    let n3 = parse_identifier(context)?;
+    Ok(NameAccessChain_::Three(sp(ln_n2_loc, (ln, n2)), n3))
+}
+
+//**************************************************************************************************
+// Modifiers
+//**************************************************************************************************
+
+struct Modifiers {
+    visibility: Option<Visibility>,
+    entry: Option<Loc>,
+    native: Option<Loc>,
+}
+
+impl Modifiers {
+    fn empty() -> Self {
+        Self {
+            visibility: None,
+            entry: None,
+            native: None,
+        }
+    }
+}
+
+// Parse module member modifiers: visiblility and native.
+// The modifiers are also used for script-functions
+//      ModuleMemberModifiers = <ModuleMemberModifier>*
+//      ModuleMemberModifier = <Visibility> | "native"
+// ModuleMemberModifiers checks for uniqueness, meaning each individual ModuleMemberModifier can
+// appear only once
+fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Box<Diagnostic>> {
+    let mut mods = Modifiers::empty();
+    loop {
+        match context.tokens.peek() {
+            Tok::Public => {
+                let vis = parse_visibility(context)?;
+                if let Some(prev_vis) = mods.visibility {
+                    let msg = "Duplicate visibility modifier".to_string();
+                    let prev_msg = "Visibility modifier previously given here".to_string();
+                    context.env.add_diag(diag!(
+                        Declarations::DuplicateItem,
+                        (vis.loc().unwrap(), msg),
+                        (prev_vis.loc().unwrap(), prev_msg),
+                    ));
+                }
+                mods.visibility = Some(vis)
+            }
+            Tok::Native => {
+                let loc = current_token_loc(context.tokens);
+                context.tokens.advance()?;
+                if let Some(prev_loc) = mods.native {
+                    let msg = "Duplicate 'native' modifier".to_string();
+                    let prev_msg = "'native' modifier previously given here".to_string();
+                    context.env.add_diag(diag!(
+                        Declarations::DuplicateItem,
+                        (loc, msg),
+                        (prev_loc, prev_msg)
+                    ))
+                }
+                mods.native = Some(loc)
+            }
+            Tok::Identifier if context.tokens.content() == ENTRY_MODIFIER => {
+                let loc = current_token_loc(context.tokens);
+                context.tokens.advance()?;
+                if let Some(prev_loc) = mods.entry {
+                    let msg = format!("Duplicate '{}' modifier", ENTRY_MODIFIER);
+                    let prev_msg = format!("'{}' modifier previously given here", ENTRY_MODIFIER);
+                    context.env.add_diag(diag!(
+                        Declarations::DuplicateItem,
+                        (loc, msg),
+                        (prev_loc, prev_msg)
+                    ))
+                }
+                mods.entry = Some(loc)
+            }
+            _ => break,
+        }
+    }
+    Ok(mods)
+}
+
+// Parse a function visibility modifier:
+//      Visibility = "public" ( "(" "script" | "friend" | "package" ")" )?
+fn parse_visibility(context: &mut Context) -> Result<Visibility, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, Tok::Public)?;
+    let sub_public_vis = if match_token(context.tokens, Tok::LParen)? {
+        let (sub_token, tok_content) = (context.tokens.peek(), context.tokens.content());
+        context.tokens.advance()?;
+        if sub_token != Tok::RParen {
+            consume_token(context.tokens, Tok::RParen)?;
+        }
+        Some((sub_token, tok_content))
+    } else {
+        None
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    // this loc will cover the span of 'public' or 'public(...)' in entirety
+    let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+    Ok(match sub_public_vis {
+        None => Visibility::Public(loc),
+        Some((Tok::Script, _)) => Visibility::Script(loc),
+        Some((Tok::Friend, _)) => Visibility::Friend(loc),
+        Some((Tok::Identifier, Visibility::PACKAGE_IDENT)) => Visibility::Package(loc),
+        _ => {
+            let msg = format!(
+                "Invalid visibility modifier. Consider removing it or using '{}', '{}' or '{}'",
+                Visibility::PUBLIC,
+                Visibility::FRIEND,
+                Visibility::PACKAGE,
+            );
+            return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
+        }
+    })
+}
+// Parse an attribute value. Either a value literal or a module access
+//      AttributeValue =
+//          <Value>
+//          | <NameAccessChain>
+fn parse_attribute_value(context: &mut Context) -> Result<AttributeValue, Box<Diagnostic>> {
+    if let Some(v) = maybe_parse_value(context)? {
+        return Ok(sp(v.loc, AttributeValue_::Value(v)));
+    }
+
+    let ma = parse_name_access_chain(context, || "attribute name value")?;
+    Ok(sp(ma.loc, AttributeValue_::ModuleAccess(ma)))
+}
+
+// Parse a single attribute
+//      Attribute =
+//          <Identifier>
+//          | <Identifier> "=" <AttributeValue>
+//          | <Identifier> "(" Comma<Attribute> ")"
+fn parse_attribute(context: &mut Context) -> Result<Attribute, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let n = parse_identifier(context)?;
+    let attr_ = match context.tokens.peek() {
+        Tok::Equal => {
+            context.tokens.advance()?;
+            Attribute_::Assigned(n, Box::new(parse_attribute_value(context)?))
+        }
+        Tok::LParen => {
+            let args_ = parse_comma_list(
+                context,
+                Tok::LParen,
+                Tok::RParen,
+                parse_attribute,
+                "attribute",
+            )?;
+            let end_loc = context.tokens.previous_end_loc();
+            Attribute_::Parameterized(
+                n,
+                spanned(context.tokens.file_hash(), start_loc, end_loc, args_),
+            )
+        }
+        _ => Attribute_::Name(n),
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        attr_,
+    ))
+}
+
+// Parse attributes. Used to annotate a variety of AST nodes
+//      Attributes = ("#" "[" Comma<Attribute> "]")*
+fn parse_attributes(context: &mut Context) -> Result<Vec<Attributes>, Box<Diagnostic>> {
+    let mut attributes_vec = vec![];
+    while let Tok::NumSign = context.tokens.peek() {
+        let start_loc = context.tokens.start_loc();
+        context.tokens.advance()?;
+        let attributes_ = parse_comma_list(
+            context,
+            Tok::LBracket,
+            Tok::RBracket,
+            parse_attribute,
+            "attribute",
+        )?;
+        let end_loc = context.tokens.previous_end_loc();
+        attributes_vec.push(spanned(
+            context.tokens.file_hash(),
+            start_loc,
+            end_loc,
+            attributes_,
+        ))
+    }
+    Ok(attributes_vec)
+}
+
+//**************************************************************************************************
+// Fields and Bindings
+//**************************************************************************************************
+
+// Parse a field name optionally followed by a colon and an expression argument:
+//      ExpField = <Field> <":" <Exp>>?
+fn parse_exp_field(context: &mut Context) -> Result<(Field, Exp), Box<Diagnostic>> {
+    let f = parse_field(context)?;
+    let arg = if match_token(context.tokens, Tok::Colon)? {
+        parse_exp(context)?
+    } else {
+        sp(
+            f.loc(),
+            Exp_::Name(sp(f.loc(), NameAccessChain_::One(f.0)), None),
+        )
+    };
+    Ok((f, arg))
+}
+
+// Parse a field name optionally followed by a colon and a binding:
+//      BindField =
+//          <Field> <":" <Bind>>?
+//          | "mut" <Field>
+//
+// If the binding is not specified, the default is to use a variable
+// with the same name as the field.
+fn parse_bind_field(context: &mut Context) -> Result<(Field, Bind), Box<Diagnostic>> {
+    if context.tokens.peek() == Tok::Mut {
+        let start_loc = context.tokens.start_loc();
+        context.tokens.advance()?;
+        let end_loc = context.tokens.previous_end_loc();
+        let mut_loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+        let f = parse_field(context)?;
+        let arg = sp(f.loc(), Bind_::Var(Some(mut_loc), Var(f.0)));
+        Ok((f, arg))
+    } else {
+        let f = parse_field(context)?;
+        let arg = if match_token(context.tokens, Tok::Colon)? {
+            parse_bind(context)?
+        } else {
+            sp(f.loc(), Bind_::Var(None, Var(f.0)))
+        };
+        Ok((f, arg))
+    }
+}
+
+// Parse a binding:
+//      Bind =
+//          "mut"? <Var>
+//          | <NameAccessChain> <OptionalTypeArgs> "{" Comma<BindField> "}"
+//          | <NameAccessChain> <OptionalTypeArgs> "(" Comma<Bind> ")"
+fn parse_bind(context: &mut Context) -> Result<Bind, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    if matches!(
+        context.tokens.peek(),
+        Tok::Identifier | Tok::RestrictedIdentifier | Tok::Mut
+    ) {
+        let next_tok = context.tokens.lookahead()?;
+        if !matches!(
+            next_tok,
+            Tok::LBrace | Tok::Less | Tok::ColonColon | Tok::LParen
+        ) {
+            let mut_ = if context.tokens.peek() == Tok::Mut {
+                context.tokens.advance()?;
+                let end_loc = context.tokens.previous_end_loc();
+                Some(make_loc(context.tokens.file_hash(), start_loc, end_loc))
+            } else {
+                None
+            };
+            let v = Bind_::Var(mut_, parse_var(context)?);
+            let end_loc = context.tokens.previous_end_loc();
+            return Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, v));
+        }
+    }
+    // The item description specified here should include the special case above for
+    // variable names, because if the current context cannot be parsed as a struct name
+    // it is possible that the user intention was to use a variable name.
+    let ty = parse_name_access_chain(context, || "a variable or struct name")?;
+    let ty_args = parse_optional_type_args(context)?;
+    let args = if context.tokens.peek() == Tok::LParen {
+        let current_loc = current_token_loc(context.tokens);
+        context.env.check_feature(
+            FeatureGate::PositionalFields,
+            context.package_name,
+            current_loc,
+        );
+        let args = parse_comma_list(
+            context,
+            Tok::LParen,
+            Tok::RParen,
+            parse_bind,
+            "a field binding",
+        )?;
+        FieldBindings::Positional(args)
+    } else {
+        let args = parse_comma_list(
+            context,
+            Tok::LBrace,
+            Tok::RBrace,
+            parse_bind_field,
+            "a field binding",
+        )?;
+        FieldBindings::Named(args)
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    let unpack = Bind_::Unpack(Box::new(ty), ty_args, args);
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        unpack,
+    ))
+}
+
+// Parse a list of bindings, which can be zero, one, or more bindings:
+//      BindList =
+//          <Bind>
+//          | "(" Comma<Bind> ")"
+//
+// The list is enclosed in parenthesis, except that the parenthesis are
+// optional if there is a single Bind.
+fn parse_bind_list(context: &mut Context) -> Result<BindList, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let b = if context.tokens.peek() != Tok::LParen {
+        vec![parse_bind(context)?]
+    } else {
+        parse_comma_list(
+            context,
+            Tok::LParen,
+            Tok::RParen,
+            parse_bind,
+            "a variable or structure binding",
+        )?
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, b))
+}
+
+// Parse a list of bindings for lambda.
+//      LambdaBindList =
+//          "|" Comma<Bind> "|"
+fn parse_lambda_bind_list(context: &mut Context) -> Result<BindList, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let b = parse_comma_list(
+        context,
+        Tok::Pipe,
+        Tok::Pipe,
+        parse_bind,
+        "a variable or structure binding",
+    )?;
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, b))
+}
+
+//**************************************************************************************************
+// Values
+//**************************************************************************************************
+
+// Parse a byte string:
+//      ByteString = <ByteStringValue>
+fn parse_byte_string(context: &mut Context) -> Result<Value_, Box<Diagnostic>> {
+    if context.tokens.peek() != Tok::ByteStringValue {
+        return Err(unexpected_token_error(
+            context.tokens,
+            "a byte string value",
+        ));
+    }
+    let s = context.tokens.content();
+    let text = Symbol::from(&s[2..s.len() - 1]);
+    let value_ = if s.starts_with("x\"") {
+        Value_::HexString(text)
+    } else {
+        assert!(s.starts_with("b\""));
+        Value_::ByteString(text)
+    };
+    context.tokens.advance()?;
+    Ok(value_)
+}
+
+// Parse a value:
+//      Value =
+//          "@" <LeadingAccessName>
+//          | "true"
+//          | "false"
+//          | <Number>
+//          | <NumberTyped>
+//          | <ByteString>
+fn maybe_parse_value(context: &mut Context) -> Result<Option<Value>, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let val = match context.tokens.peek() {
+        Tok::AtSign => {
+            context.tokens.advance()?;
+            let addr = parse_leading_name_access(context)?;
+            Value_::Address(addr)
+        }
+        Tok::True => {
+            context.tokens.advance()?;
+            Value_::Bool(true)
+        }
+        Tok::False => {
+            context.tokens.advance()?;
+            Value_::Bool(false)
+        }
+        Tok::NumValue => {
+            //  If the number is followed by "::", parse it as the beginning of an address access
+            if let Ok(Tok::ColonColon) = context.tokens.lookahead() {
+                return Ok(None);
+            }
+            let num = context.tokens.content().into();
+            context.tokens.advance()?;
+            Value_::Num(num)
+        }
+        Tok::NumTypedValue => {
+            let num = context.tokens.content().into();
+            context.tokens.advance()?;
+            Value_::Num(num)
+        }
+
+        Tok::ByteStringValue => parse_byte_string(context)?,
+        _ => return Ok(None),
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(Some(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        val,
+    )))
+}
+
+fn parse_value(context: &mut Context) -> Result<Value, Box<Diagnostic>> {
+    Ok(maybe_parse_value(context)?.expect("parse_value called with invalid token"))
+}
+
+//**************************************************************************************************
+// Sequences
+//**************************************************************************************************
+
+// Parse a sequence item:
+//      SequenceItem =
+//          <Exp>
+//          | "let" <BindList> (":" <Type>)? ("=" <Exp>)?
+fn parse_sequence_item(context: &mut Context) -> Result<SequenceItem, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let item = if match_token(context.tokens, Tok::Let)? {
+        let b = parse_bind_list(context)?;
+        let ty_opt = if match_token(context.tokens, Tok::Colon)? {
+            Some(parse_type(context)?)
+        } else {
+            None
+        };
+        if match_token(context.tokens, Tok::Equal)? {
+            let e = parse_exp(context)?;
+            SequenceItem_::Bind(b, ty_opt, Box::new(e))
+        } else {
+            SequenceItem_::Declare(b, ty_opt)
+        }
+    } else {
+        let e = parse_exp(context)?;
+        SequenceItem_::Seq(Box::new(e))
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        item,
+    ))
+}
+
+// Parse a sequence:
+//      Sequence = <UseDecl>* (<SequenceItem> ";")* <Exp>? "}"
+//
+// Note that this does not include the opening brace of a block but it
+// does consume the closing right brace.
+fn parse_sequence(context: &mut Context) -> Result<Sequence, Box<Diagnostic>> {
+    let mut uses = vec![];
+    while context.tokens.peek() == Tok::Use {
+        let start_loc = context.tokens.start_loc();
+        uses.push(parse_use_decl(
+            vec![],
+            start_loc,
+            Modifiers::empty(),
+            context,
+        )?);
+    }
+
+    let mut seq: Vec<SequenceItem> = vec![];
+    let mut last_semicolon_loc = None;
+    let mut eopt = None;
+    while context.tokens.peek() != Tok::RBrace {
+        let item = parse_sequence_item(context)?;
+        if context.tokens.peek() == Tok::RBrace {
+            // If the sequence ends with an expression that is not
+            // followed by a semicolon, split out that expression
+            // from the rest of the SequenceItems.
+            match item.value {
+                SequenceItem_::Seq(e) => {
+                    eopt = Some(Spanned {
+                        loc: item.loc,
+                        value: e.value,
+                    });
+                }
+                _ => return Err(unexpected_token_error(context.tokens, "';'")),
+            }
+            break;
+        }
+        seq.push(item);
+        last_semicolon_loc = Some(current_token_loc(context.tokens));
+        consume_token(context.tokens, Tok::Semicolon)?;
+    }
+    context.tokens.advance()?; // consume the RBrace
+    Ok((uses, seq, last_semicolon_loc, Box::new(eopt)))
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+// Parse an expression term:
+//      Term =
+//          "break"
+//          | "continue"
+//          | "vector" ('<' Comma<Type> ">")? "[" Comma<Exp> "]"
+//          | <Value>
+//          | "(" Comma<Exp> ")"
+//          | "(" <Exp> ":" <Type> ")"
+//          | "(" <Exp> "as" <Type> ")"
+//          | "{" <Sequence>
+//          | "if" "(" <Exp> ")" <Exp> "else" "{" <Exp> "}"
+//          | "if" "(" <Exp> ")" "{" <Exp> "}"
+//          | "if" "(" <Exp> ")" <Exp> ("else" <Exp>)?
+//          | "while" "(" <Exp> ")" "{" <Exp> "}"
+//          | "while" "(" <Exp> ")" <Exp> (SpecBlock)?
+//          | "loop" <Exp>
+//          | "loop" "{" <Exp> "}"
+//          | "return" "{" <Exp> "}"
+//          | "return" <Exp>?
+//          | "abort" "{" <Exp> "}"
+//          | "abort" <Exp>
+fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
+    const VECTOR_IDENT: &str = "vector";
+
+    let start_loc = context.tokens.start_loc();
+    let term = match context.tokens.peek() {
+        tok if is_control_exp(tok) => {
+            let (control_exp, ends_in_block) = parse_control_exp(context)?;
+            if !ends_in_block || at_end_of_exp(context) {
+                return Ok(control_exp);
+            }
+
+            return parse_binop_exp(context, control_exp, /* min_prec */ 1);
+        }
+        Tok::Break => {
+            context.tokens.advance()?;
+            if at_start_of_exp(context) {
+                let mut diag = unexpected_token_error(context.tokens, "the end of an expression");
+                diag.add_note("'break' with a value is not yet supported");
+                return Err(diag);
+            }
+            Exp_::Break
+        }
+
+        Tok::Continue => {
+            context.tokens.advance()?;
+            Exp_::Continue
+        }
+
+        Tok::Identifier
+            if context.tokens.content() == VECTOR_IDENT
+                && matches!(context.tokens.lookahead(), Ok(Tok::Less | Tok::LBracket)) =>
+        {
+            consume_identifier(context.tokens, VECTOR_IDENT)?;
+            let vec_end_loc = context.tokens.previous_end_loc();
+            let vec_loc = make_loc(context.tokens.file_hash(), start_loc, vec_end_loc);
+            let targs_start_loc = context.tokens.start_loc();
+            let tys_opt = parse_optional_type_args(context).map_err(|diag| {
+                let targ_loc =
+                    make_loc(context.tokens.file_hash(), targs_start_loc, targs_start_loc);
+                add_type_args_ambiguity_label(targ_loc, diag)
+            })?;
+            let args_start_loc = context.tokens.start_loc();
+            let args_ = parse_comma_list(
+                context,
+                Tok::LBracket,
+                Tok::RBracket,
+                parse_exp,
+                "a vector argument expression",
+            )?;
+            let args_end_loc = context.tokens.previous_end_loc();
+            let args = spanned(
+                context.tokens.file_hash(),
+                args_start_loc,
+                args_end_loc,
+                args_,
+            );
+            Exp_::Vector(vec_loc, tys_opt, args)
+        }
+
+        Tok::Identifier | Tok::RestrictedIdentifier => parse_name_exp(context)?,
+
+        Tok::NumValue => {
+            // Check if this is a ModuleIdent (in a ModuleAccess).
+            if context.tokens.lookahead()? == Tok::ColonColon {
+                parse_name_exp(context)?
+            } else {
+                Exp_::Value(parse_value(context)?)
+            }
+        }
+
+        Tok::AtSign | Tok::True | Tok::False | Tok::NumTypedValue | Tok::ByteStringValue => {
+            Exp_::Value(parse_value(context)?)
+        }
+
+        // "(" Comma<Exp> ")"
+        // "(" <Exp> ":" <Type> ")"
+        // "(" <Exp> "as" <Type> ")"
+        Tok::LParen => {
+            let list_loc = context.tokens.start_loc();
+            context.tokens.advance()?; // consume the LParen
+            if match_token(context.tokens, Tok::RParen)? {
+                Exp_::Unit
+            } else {
+                // If there is a single expression inside the parens,
+                // then it may be followed by a colon and a type annotation.
+                let e = parse_exp(context)?;
+                if match_token(context.tokens, Tok::Colon)? {
+                    let ty = parse_type(context)?;
+                    consume_token(context.tokens, Tok::RParen)?;
+                    Exp_::Annotate(Box::new(e), ty)
+                } else if match_token(context.tokens, Tok::As)? {
+                    let ty = parse_type(context)?;
+                    consume_token(context.tokens, Tok::RParen)?;
+                    Exp_::Cast(Box::new(e), ty)
+                } else {
+                    if context.tokens.peek() != Tok::RParen {
+                        consume_token(context.tokens, Tok::Comma)?;
+                    }
+                    let mut es = parse_comma_list_after_start(
+                        context,
+                        list_loc,
+                        Tok::LParen,
+                        Tok::RParen,
+                        parse_exp,
+                        "an expression",
+                    )?;
+                    if es.is_empty() {
+                        e.value
+                    } else {
+                        es.insert(0, e);
+                        Exp_::ExpList(es)
+                    }
+                }
+            }
+        }
+
+        // "{" <Sequence>
+        Tok::LBrace => {
+            context.tokens.advance()?; // consume the LBrace
+            Exp_::Block(parse_sequence(context)?)
+        }
+
+        Tok::Spec => {
+            let spec_block = parse_spec_block(vec![], context)?;
+            Exp_::Spec(spec_block)
+        }
+
+        _ => {
+            return Err(unexpected_token_error(context.tokens, "an expression term"));
+        }
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        term,
+    ))
+}
+
+fn is_control_exp(tok: Tok) -> bool {
+    matches!(
+        tok,
+        Tok::If | Tok::While | Tok::Loop | Tok::Return | Tok::Abort
+    )
+}
+
+// if there is a block, only parse the block, not any subsequent tokens
+// e.g.           if (cond) e1 else { e2 } + 1
+// should be,    (if (cond) e1 else { e2 }) + 1
+// AND NOT,       if (cond) e1 else ({ e2 } + 1)
+// But otherwise, if (cond) e1 else e2 + 1
+// should be,     if (cond) e1 else (e2 + 1)
+fn parse_control_exp(context: &mut Context) -> Result<(Exp, bool), Box<Diagnostic>> {
+    fn parse_exp_or_sequence(context: &mut Context) -> Result<(Exp, bool), Box<Diagnostic>> {
+        match context.tokens.peek() {
+            Tok::LBrace => {
+                let block_start_loc = context.tokens.start_loc();
+                context.tokens.advance()?; // consume the LBrace
+                let block_ = Exp_::Block(parse_sequence(context)?);
+                let block_end_loc = context.tokens.previous_end_loc();
+                let exp = spanned(
+                    context.tokens.file_hash(),
+                    block_start_loc,
+                    block_end_loc,
+                    block_,
+                );
+                Ok((exp, true))
+            }
+            _ => Ok((parse_exp(context)?, false)),
+        }
+    }
+    let start_loc = context.tokens.start_loc();
+    let (exp_, ends_in_block) = match context.tokens.peek() {
+        Tok::If => {
+            context.tokens.advance()?;
+            consume_token(context.tokens, Tok::LParen)?;
+            let eb = Box::new(parse_exp(context)?);
+            consume_token(context.tokens, Tok::RParen)?;
+            let (et, ends_in_block) = parse_exp_or_sequence(context)?;
+            let (ef, ends_in_block) = if match_token(context.tokens, Tok::Else)? {
+                let (ef, ends_in_block) = parse_exp_or_sequence(context)?;
+                (Some(Box::new(ef)), ends_in_block)
+            } else {
+                (None, ends_in_block)
+            };
+            (Exp_::IfElse(eb, Box::new(et), ef), ends_in_block)
+        }
+        Tok::While => {
+            context.tokens.advance()?;
+            consume_token(context.tokens, Tok::LParen)?;
+            let econd = parse_exp(context)?;
+            consume_token(context.tokens, Tok::RParen)?;
+            let (eloop, ends_in_block) = parse_exp_or_sequence(context)?;
+            let (econd, ends_in_block) = if context.tokens.peek() == Tok::Spec {
+                // Parse a loop invariant. Also validate that only `invariant`
+                // properties are contained in the spec block. This is
+                // transformed into `while ({spec { .. }; cond) body`.
+                let spec = parse_spec_block(vec![], context)?;
+                for member in &spec.value.members {
+                    match member.value {
+                        // Ok
+                        SpecBlockMember_::Condition {
+                            kind: sp!(_, SpecConditionKind_::Invariant(..)),
+                            ..
+                        } => (),
+                        _ => {
+                            return Err(Box::new(diag!(
+                                Syntax::InvalidSpecBlockMember,
+                                (member.loc, "only 'invariant' allowed here")
+                            )))
+                        }
+                    }
+                }
+                let spec_seq = sp(
+                    spec.loc,
+                    SequenceItem_::Seq(Box::new(sp(spec.loc, Exp_::Spec(spec)))),
+                );
+                let loc = econd.loc;
+                let spec_block = Exp_::Block((vec![], vec![spec_seq], None, Box::new(Some(econd))));
+                (sp(loc, spec_block), true)
+            } else {
+                (econd, ends_in_block)
+            };
+            (Exp_::While(Box::new(econd), Box::new(eloop)), ends_in_block)
+        }
+        Tok::Loop => {
+            context.tokens.advance()?;
+            let (eloop, ends_in_block) = parse_exp_or_sequence(context)?;
+            (Exp_::Loop(Box::new(eloop)), ends_in_block)
+        }
+        Tok::Return => {
+            context.tokens.advance()?;
+            let (e, ends_in_block) = if !at_start_of_exp(context) {
+                (None, false)
+            } else {
+                let (e, ends_in_block) = parse_exp_or_sequence(context)?;
+                (Some(Box::new(e)), ends_in_block)
+            };
+            (Exp_::Return(e), ends_in_block)
+        }
+        Tok::Abort => {
+            context.tokens.advance()?;
+            let (e, ends_in_block) = parse_exp_or_sequence(context)?;
+            (Exp_::Abort(Box::new(e)), ends_in_block)
+        }
+        _ => unreachable!(),
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    let exp = spanned(context.tokens.file_hash(), start_loc, end_loc, exp_);
+    Ok((exp, ends_in_block))
+}
+
+// Parse a pack, call, or other reference to a name:
+//      NameExp =
+//          <NameAccessChain> <OptionalTypeArgs> "{" Comma<ExpField> "}"
+//          | <NameAccessChain> <OptionalTypeArgs> "(" Comma<Exp> ")"
+//          | <NameAccessChain> "!" "(" Comma<Exp> ")"
+//          | <NameAccessChain> <OptionalTypeArgs>
+fn parse_name_exp(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
+    let n = parse_name_access_chain(context, || {
+        panic!("parse_name_exp with something other than a ModuleAccess")
+    })?;
+
+    // There's an ambiguity if the name is followed by a '<'. If there is no whitespace
+    // after the name, treat it as the start of a list of type arguments. Otherwise
+    // assume that the '<' is a boolean operator.
+    let mut tys = None;
+    if context.tokens.peek() == Tok::Exclaim {
+        // TODO(macro) handle type arguments
+        context.tokens.advance()?;
+        let is_macro = true;
+        let rhs = parse_call_args(context)?;
+        return Ok(Exp_::Call(n, is_macro, tys, rhs));
+    }
+    let start_loc = context.tokens.start_loc();
+
+    if context.tokens.peek() == Tok::Less && n.loc.end() as usize == start_loc {
+        let loc = make_loc(context.tokens.file_hash(), start_loc, start_loc);
+        tys = parse_optional_type_args(context)
+            .map_err(|diag| add_type_args_ambiguity_label(loc, diag))?;
+    }
+
+    match context.tokens.peek() {
+        // Pack: "{" Comma<ExpField> "}"
+        Tok::LBrace => {
+            let fs = parse_comma_list(
+                context,
+                Tok::LBrace,
+                Tok::RBrace,
+                parse_exp_field,
+                "a field expression",
+            )?;
+            Ok(Exp_::Pack(n, tys, fs))
+        }
+
+        // Call: "(" Comma<Exp> ")"
+        Tok::Exclaim | Tok::LParen => {
+            let is_macro = false;
+            let rhs = parse_call_args(context)?;
+            Ok(Exp_::Call(n, is_macro, tys, rhs))
+        }
+
+        // Other name reference...
+        _ => Ok(Exp_::Name(n, tys)),
+    }
+}
+
+// Parse the arguments to a call: "(" Comma<Exp> ")"
+fn parse_call_args(context: &mut Context) -> Result<Spanned<Vec<Exp>>, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let args = parse_comma_list(
+        context,
+        Tok::LParen,
+        Tok::RParen,
+        parse_exp,
+        "a call argument expression",
+    )?;
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        args,
+    ))
+}
+
+// Return true if the current token is one that might occur after an Exp.
+// This is needed, for example, to check for the optional Exp argument to
+// a return (where "return" is itself an Exp).
+fn at_end_of_exp(context: &mut Context) -> bool {
+    matches!(
+        context.tokens.peek(),
+        // These are the tokens that can occur after an Exp. If the grammar
+        // changes, we need to make sure that these are kept up to date and that
+        // none of these tokens can occur at the beginning of an Exp.
+        Tok::Else | Tok::RBrace | Tok::RParen | Tok::Comma | Tok::Colon | Tok::Semicolon
+    )
+}
+
+fn at_start_of_exp(context: &mut Context) -> bool {
+    matches!(
+        context.tokens.peek(),
+        // value
+        Tok::NumValue
+            | Tok::NumTypedValue
+            | Tok::ByteStringValue
+            | Tok::Identifier
+            | Tok::RestrictedIdentifier
+            | Tok::AtSign
+            | Tok::Copy
+            | Tok::Move
+            | Tok::False
+            | Tok::True
+            | Tok::Amp
+            | Tok::AmpMut
+            | Tok::Star
+            | Tok::Exclaim
+            | Tok::LParen
+            | Tok::LBrace
+            | Tok::Abort
+            | Tok::Break
+            | Tok::Continue
+            | Tok::If
+            | Tok::Loop
+            | Tok::Return
+            | Tok::While
+    )
+}
+
+// Parse an expression:
+//      Exp =
+//            <LambdaBindList> <Exp>        spec only
+//          | <Quantifier>                  spec only
+//          | <BinOpExp>
+//          | <UnaryExp> "=" <Exp>
+fn parse_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let exp = match context.tokens.peek() {
+        Tok::Pipe => {
+            let bindings = parse_lambda_bind_list(context)?;
+            let body = Box::new(parse_exp(context)?);
+            Exp_::Lambda(bindings, body)
+        }
+        Tok::Identifier if is_quant(context) => parse_quant(context)?,
+        _ => {
+            // This could be either an assignment or a binary operator
+            // expression.
+            let lhs = parse_unary_exp(context)?;
+            if context.tokens.peek() != Tok::Equal {
+                return parse_binop_exp(context, lhs, /* min_prec */ 1);
+            }
+            context.tokens.advance()?; // consume the "="
+            let rhs = Box::new(parse_exp(context)?);
+            Exp_::Assign(Box::new(lhs), rhs)
+        }
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, exp))
+}
+
+// Get the precedence of a binary operator. The minimum precedence value
+// is 1, and larger values have higher precedence. For tokens that are not
+// binary operators, this returns a value of zero so that they will be
+// below the minimum value and will mark the end of the binary expression
+// for the code in parse_binop_exp.
+fn get_precedence(token: Tok) -> u32 {
+    match token {
+        // Reserved minimum precedence value is 1
+        Tok::EqualEqualGreater => 2,
+        Tok::LessEqualEqualGreater => 2,
+        Tok::PipePipe => 3,
+        Tok::AmpAmp => 4,
+        Tok::EqualEqual => 5,
+        Tok::ExclaimEqual => 5,
+        Tok::Less => 5,
+        Tok::Greater => 5,
+        Tok::LessEqual => 5,
+        Tok::GreaterEqual => 5,
+        Tok::PeriodPeriod => 6,
+        Tok::Pipe => 7,
+        Tok::Caret => 8,
+        Tok::Amp => 9,
+        Tok::LessLess => 10,
+        Tok::GreaterGreater => 10,
+        Tok::Plus => 11,
+        Tok::Minus => 11,
+        Tok::Star => 12,
+        Tok::Slash => 12,
+        Tok::Percent => 12,
+        _ => 0, // anything else is not a binary operator
+    }
+}
+
+// Parse a binary operator expression:
+//      BinOpExp =
+//          <BinOpExp> <BinOp> <BinOpExp>
+//          | <UnaryExp>
+//      BinOp = (listed from lowest to highest precedence)
+//          "==>"                                       spec only
+//          | "||"
+//          | "&&"
+//          | "==" | "!=" | '<' | ">" | "<=" | ">="
+//          | ".."                                      spec only
+//          | "|"
+//          | "^"
+//          | "&"
+//          | "<<" | ">>"
+//          | "+" | "-"
+//          | "*" | "/" | "%"
+//
+// This function takes the LHS of the expression as an argument, and it
+// continues parsing binary expressions as long as they have at least the
+// specified "min_prec" minimum precedence.
+fn parse_binop_exp(context: &mut Context, lhs: Exp, min_prec: u32) -> Result<Exp, Box<Diagnostic>> {
+    let mut result = lhs;
+    let mut next_tok_prec = get_precedence(context.tokens.peek());
+
+    while next_tok_prec >= min_prec {
+        // Parse the operator.
+        let op_start_loc = context.tokens.start_loc();
+        let op_token = context.tokens.peek();
+        context.tokens.advance()?;
+        let op_end_loc = context.tokens.previous_end_loc();
+
+        let mut rhs = parse_unary_exp(context)?;
+
+        // If the next token is another binary operator with a higher
+        // precedence, then recursively parse that expression as the RHS.
+        let this_prec = next_tok_prec;
+        next_tok_prec = get_precedence(context.tokens.peek());
+        if this_prec < next_tok_prec {
+            rhs = parse_binop_exp(context, rhs, this_prec + 1)?;
+            next_tok_prec = get_precedence(context.tokens.peek());
+        }
+
+        let op = match op_token {
+            Tok::EqualEqual => BinOp_::Eq,
+            Tok::ExclaimEqual => BinOp_::Neq,
+            Tok::Less => BinOp_::Lt,
+            Tok::Greater => BinOp_::Gt,
+            Tok::LessEqual => BinOp_::Le,
+            Tok::GreaterEqual => BinOp_::Ge,
+            Tok::PipePipe => BinOp_::Or,
+            Tok::AmpAmp => BinOp_::And,
+            Tok::Caret => BinOp_::Xor,
+            Tok::Pipe => BinOp_::BitOr,
+            Tok::Amp => BinOp_::BitAnd,
+            Tok::LessLess => BinOp_::Shl,
+            Tok::GreaterGreater => BinOp_::Shr,
+            Tok::Plus => BinOp_::Add,
+            Tok::Minus => BinOp_::Sub,
+            Tok::Star => BinOp_::Mul,
+            Tok::Slash => BinOp_::Div,
+            Tok::Percent => BinOp_::Mod,
+            Tok::PeriodPeriod => BinOp_::Range,
+            Tok::EqualEqualGreater => BinOp_::Implies,
+            Tok::LessEqualEqualGreater => BinOp_::Iff,
+            _ => panic!("Unexpected token that is not a binary operator"),
+        };
+        let sp_op = spanned(context.tokens.file_hash(), op_start_loc, op_end_loc, op);
+
+        let start_loc = result.loc.start() as usize;
+        let end_loc = context.tokens.previous_end_loc();
+        let e = Exp_::BinopExp(Box::new(result), sp_op, Box::new(rhs));
+        result = spanned(context.tokens.file_hash(), start_loc, end_loc, e);
+    }
+
+    Ok(result)
+}
+
+// Parse a unary expression:
+//      UnaryExp =
+//          "!" <UnaryExp>
+//          | "&mut" <UnaryExp>
+//          | "&" "mut" <UnaryExp>
+//          | "&" <UnaryExp>
+//          | "*" <UnaryExp>
+//          | "move" <Var>
+//          | "copy" <Var>
+//          | <DotOrIndexChain>
+fn parse_unary_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let exp = match context.tokens.peek() {
+        Tok::Exclaim => {
+            context.tokens.advance()?;
+            let op_end_loc = context.tokens.previous_end_loc();
+            let op = spanned(
+                context.tokens.file_hash(),
+                start_loc,
+                op_end_loc,
+                UnaryOp_::Not,
+            );
+            let e = parse_unary_exp(context)?;
+            Exp_::UnaryExp(op, Box::new(e))
+        }
+        Tok::AmpMut => {
+            context.tokens.advance()?;
+            let e = parse_unary_exp(context)?;
+            Exp_::Borrow(true, Box::new(e))
+        }
+        Tok::Amp => {
+            context.tokens.advance()?;
+            let is_mut = match_token(context.tokens, Tok::Mut)?;
+            let e = parse_unary_exp(context)?;
+            Exp_::Borrow(is_mut, Box::new(e))
+        }
+        Tok::Star => {
+            context.tokens.advance()?;
+            let e = parse_unary_exp(context)?;
+            Exp_::Dereference(Box::new(e))
+        }
+        Tok::Move => {
+            context.tokens.advance()?;
+            Exp_::Move(parse_var(context)?)
+        }
+        Tok::Copy => {
+            context.tokens.advance()?;
+            Exp_::Copy(parse_var(context)?)
+        }
+        _ => {
+            return parse_dot_or_index_chain(context);
+        }
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, exp))
+}
+
+// Parse an expression term optionally followed by a chain of dot or index accesses:
+//      DotOrIndexChain =
+//          <DotOrIndexChain> "." <Identifier>
+//          | <DotOrIndexChain> "." <Number>
+//          | <DotOrIndexChain> "[" <Exp> "]"                      spec only
+//          | <DotOrIndexChain> <OptionalTypeArgs> "(" Comma<Exp> ")"
+//          | <Term>
+fn parse_dot_or_index_chain(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let mut lhs = parse_term(context)?;
+    loop {
+        let exp = match context.tokens.peek() {
+            Tok::Period => {
+                context.tokens.advance()?;
+                let loc = current_token_loc(context.tokens);
+                match context.tokens.peek() {
+                    Tok::NumValue | Tok::NumTypedValue
+                        if context.env.check_feature(
+                            FeatureGate::PositionalFields,
+                            context.package_name,
+                            loc,
+                        ) =>
+                    {
+                        let contents = context.tokens.content();
+                        context.tokens.advance()?;
+                        match parse_u8(contents) {
+                            Ok((parsed, NumberFormat::Decimal)) => {
+                                let field_access = Name::new(loc, format!("{parsed}").into());
+                                Exp_::Dot(Box::new(lhs), field_access)
+                            }
+                            Ok((_, NumberFormat::Hex)) => {
+                                let msg = "Invalid field access. Expected a decimal number but was given a hexadecimal";
+                                let mut diag = diag!(Syntax::UnexpectedToken, (loc, msg));
+                                diag.add_note("Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`");
+                                context.env.add_diag(diag);
+                                // Continue on with the parsing
+                                let field_access = Name::new(loc, contents.into());
+                                Exp_::Dot(Box::new(lhs), field_access)
+                            }
+                            Err(_) => {
+                                let msg = format!(
+                                    "Invalid field access. Expected a number less than or equal to {}",
+                                    u8::MAX
+                                );
+                                let mut diag = diag!(Syntax::UnexpectedToken, (loc, msg));
+                                diag.add_note("Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`");
+                                context.env.add_diag(diag);
+                                // Continue on with the parsing
+                                let field_access = Name::new(loc, contents.into());
+                                Exp_::Dot(Box::new(lhs), field_access)
+                            }
+                        }
+                    }
+                    _ => {
+                        let n = parse_identifier(context)?;
+                        if is_start_of_call_after_function_name(context, &n) {
+                            let call_start = context.tokens.start_loc();
+                            let mut tys = None;
+                            if context.tokens.peek() == Tok::Less
+                                && n.loc.end() as usize == call_start
+                            {
+                                let loc =
+                                    make_loc(context.tokens.file_hash(), call_start, call_start);
+                                tys = parse_optional_type_args(context)
+                                    .map_err(|diag| add_type_args_ambiguity_label(loc, diag))?;
+                            }
+                            let args = parse_call_args(context)?;
+                            Exp_::DotCall(Box::new(lhs), n, tys, args)
+                        } else {
+                            Exp_::Dot(Box::new(lhs), n)
+                        }
+                    }
+                }
+            }
+            Tok::LBracket => {
+                context.tokens.advance()?;
+                let index = parse_exp(context)?;
+                let exp = Exp_::Index(Box::new(lhs), Box::new(index));
+                consume_token(context.tokens, Tok::RBracket)?;
+                exp
+            }
+            _ => break,
+        };
+        let end_loc = context.tokens.previous_end_loc();
+        lhs = spanned(context.tokens.file_hash(), start_loc, end_loc, exp);
+    }
+    Ok(lhs)
+}
+
+// Look ahead to determine if this is the start of a call expression. Used when parsing method calls
+// to determine if we should parse the type arguments and args following a name. Otherwise, we will
+// parse a field access
+fn is_start_of_call_after_function_name(context: &Context, n: &Name) -> bool {
+    // TODO(macro) consider macro Tok::Exlaim
+    let call_start = context.tokens.start_loc();
+    let peeked = context.tokens.peek();
+    (peeked == Tok::Less && n.loc.end() as usize == call_start) || peeked == Tok::LParen
+}
+
+// Lookahead to determine whether this is a quantifier. This matches
+//
+//      ( "exists" | "forall" | "choose" | "min" )
+//          <Identifier> ( ":" | <Identifier> ) ...
+//
+// as a sequence to identify a quantifier. While the <Identifier> after
+// the exists/forall would by syntactically sufficient (Move does not
+// have affixed identifiers in expressions), we add another token
+// of lookahead to keep the result more precise in the presence of
+// syntax errors.
+fn is_quant(context: &mut Context) -> bool {
+    if !matches!(context.tokens.content(), "exists" | "forall" | "choose") {
+        return false;
+    }
+    match context.tokens.lookahead2() {
+        Err(_) => false,
+        Ok((tok1, tok2)) => tok1 == Tok::Identifier && matches!(tok2, Tok::Colon | Tok::Identifier),
+    }
+}
+
+// Parses a quantifier expressions, assuming is_quant(context) is true.
+//
+//   <Quantifier> =
+//       ( "forall" | "exists" ) <QuantifierBindings> ({ (<Exp>)* })* ("where" <Exp>)? ":" Exp
+//     | ( "choose" [ "min" ] ) <QuantifierBind> "where" <Exp>
+//   <QuantifierBindings> = <QuantifierBind> ("," <QuantifierBind>)*
+//   <QuantifierBind> = <Identifier> ":" <Type> | <Identifier> "in" <Exp>
+//
+fn parse_quant(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let kind = match context.tokens.content() {
+        "exists" => {
+            context.tokens.advance()?;
+            QuantKind_::Exists
+        }
+        "forall" => {
+            context.tokens.advance()?;
+            QuantKind_::Forall
+        }
+        "choose" => {
+            context.tokens.advance()?;
+            match context.tokens.peek() {
+                Tok::Identifier if context.tokens.content() == "min" => {
+                    context.tokens.advance()?;
+                    QuantKind_::ChooseMin
+                }
+                _ => QuantKind_::Choose,
+            }
+        }
+        _ => unreachable!(),
+    };
+    let spanned_kind = spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        kind,
+    );
+
+    if matches!(kind, QuantKind_::Choose | QuantKind_::ChooseMin) {
+        let binding = parse_quant_binding(context)?;
+        consume_identifier(context.tokens, "where")?;
+        let body = parse_exp(context)?;
+        return Ok(Exp_::Quant(
+            spanned_kind,
+            Spanned {
+                loc: binding.loc,
+                value: vec![binding],
+            },
+            vec![],
+            None,
+            Box::new(body),
+        ));
+    }
+
+    let bindings_start_loc = context.tokens.start_loc();
+    let binds_with_range_list = parse_list(
+        context,
+        |context| {
+            if context.tokens.peek() == Tok::Comma {
+                context.tokens.advance()?;
+                Ok(true)
+            } else {
+                Ok(false)
+            }
+        },
+        parse_quant_binding,
+    )?;
+    let binds_with_range_list = spanned(
+        context.tokens.file_hash(),
+        bindings_start_loc,
+        context.tokens.previous_end_loc(),
+        binds_with_range_list,
+    );
+
+    let triggers = if context.tokens.peek() == Tok::LBrace {
+        parse_list(
+            context,
+            |context| {
+                if context.tokens.peek() == Tok::LBrace {
+                    Ok(true)
+                } else {
+                    Ok(false)
+                }
+            },
+            |context| {
+                parse_comma_list(
+                    context,
+                    Tok::LBrace,
+                    Tok::RBrace,
+                    parse_exp,
+                    "a trigger expresssion",
+                )
+            },
+        )?
+    } else {
+        Vec::new()
+    };
+
+    let condition = match context.tokens.peek() {
+        Tok::Identifier if context.tokens.content() == "where" => {
+            context.tokens.advance()?;
+            Some(Box::new(parse_exp(context)?))
+        }
+        _ => None,
+    };
+    consume_token(context.tokens, Tok::Colon)?;
+    let body = parse_exp(context)?;
+
+    Ok(Exp_::Quant(
+        spanned_kind,
+        binds_with_range_list,
+        triggers,
+        condition,
+        Box::new(body),
+    ))
+}
+
+// Parses one quantifier binding.
+fn parse_quant_binding(context: &mut Context) -> Result<Spanned<(Bind, Exp)>, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let ident = parse_identifier(context)?;
+    let bind = spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        Bind_::Var(None, Var(ident)),
+    );
+    let range = if context.tokens.peek() == Tok::Colon {
+        // This is a quantifier over the full domain of a type.
+        // Built `domain<ty>()` expression.
+        context.tokens.advance()?;
+        let ty = parse_type(context)?;
+        make_builtin_call(ty.loc, symbol!("$spec_domain"), Some(vec![ty]), vec![])
+    } else {
+        // This is a quantifier over a value, like a vector or a range.
+        consume_identifier(context.tokens, "in")?;
+        parse_exp(context)?
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        (bind, range),
+    ))
+}
+
+fn make_builtin_call(loc: Loc, name: Symbol, type_args: Option<Vec<Type>>, args: Vec<Exp>) -> Exp {
+    let maccess = sp(loc, NameAccessChain_::One(sp(loc, name)));
+    sp(loc, Exp_::Call(maccess, false, type_args, sp(loc, args)))
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+// Parse a Type:
+//      Type =
+//          <NameAccessChain> ('<' Comma<Type> ">")?
+//          | "&" <Type>
+//          | "&mut" <Type>
+//          | "&" "mut" <Type>
+//          | "|" Comma<Type> "|" Type   (spec only)
+//          | "(" Comma<Type> ")"
+fn parse_type(context: &mut Context) -> Result<Type, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let t = match context.tokens.peek() {
+        Tok::LParen => {
+            let mut ts = parse_comma_list(context, Tok::LParen, Tok::RParen, parse_type, "a type")?;
+            match ts.len() {
+                0 => Type_::Unit,
+                1 => ts.pop().unwrap().value,
+                _ => Type_::Multiple(ts),
+            }
+        }
+        Tok::Amp => {
+            context.tokens.advance()?;
+            let is_mut = match_token(context.tokens, Tok::Mut)?;
+            let t = parse_type(context)?;
+            Type_::Ref(is_mut, Box::new(t))
+        }
+        Tok::AmpMut => {
+            context.tokens.advance()?;
+            let t = parse_type(context)?;
+            Type_::Ref(true, Box::new(t))
+        }
+        Tok::Pipe => {
+            let args = parse_comma_list(context, Tok::Pipe, Tok::Pipe, parse_type, "a type")?;
+            let result = parse_type(context)?;
+            return Ok(spanned(
+                context.tokens.file_hash(),
+                start_loc,
+                context.tokens.previous_end_loc(),
+                Type_::Fun(args, Box::new(result)),
+            ));
+        }
+        _ => {
+            let tn = parse_name_access_chain(context, || "a type name")?;
+            let tys = if context.tokens.peek() == Tok::Less {
+                parse_comma_list(context, Tok::Less, Tok::Greater, parse_type, "a type")?
+            } else {
+                vec![]
+            };
+            Type_::Apply(Box::new(tn), tys)
+        }
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(context.tokens.file_hash(), start_loc, end_loc, t))
+}
+
+// Parse an optional list of type arguments.
+//    OptionalTypeArgs = '<' Comma<Type> ">" | <empty>
+fn parse_optional_type_args(context: &mut Context) -> Result<Option<Vec<Type>>, Box<Diagnostic>> {
+    if context.tokens.peek() == Tok::Less {
+        Ok(Some(parse_comma_list(
+            context,
+            Tok::Less,
+            Tok::Greater,
+            parse_type,
+            "a type",
+        )?))
+    } else {
+        Ok(None)
+    }
+}
+
+fn token_to_ability(token: Tok, content: &str) -> Option<Ability_> {
+    match (token, content) {
+        (Tok::Copy, _) => Some(Ability_::Copy),
+        (Tok::Identifier, Ability_::DROP) => Some(Ability_::Drop),
+        (Tok::Identifier, Ability_::STORE) => Some(Ability_::Store),
+        (Tok::Identifier, Ability_::KEY) => Some(Ability_::Key),
+        _ => None,
+    }
+}
+
+// Parse a type ability
+//      Ability =
+//          <Copy>
+//          | "drop"
+//          | "store"
+//          | "key"
+fn parse_ability(context: &mut Context) -> Result<Ability, Box<Diagnostic>> {
+    let loc = current_token_loc(context.tokens);
+    match token_to_ability(context.tokens.peek(), context.tokens.content()) {
+        Some(ability) => {
+            context.tokens.advance()?;
+            Ok(sp(loc, ability))
+        }
+        None => {
+            let msg = format!(
+                "Unexpected {}. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'",
+                current_token_error_string(context.tokens)
+            );
+            Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))))
+        }
+    }
+}
+
+// Parse a type parameter:
+//      TypeParameter =
+//          <Identifier> <Constraint>?
+//      Constraint =
+//          ":" <Ability> (+ <Ability>)*
+fn parse_type_parameter(context: &mut Context) -> Result<(Name, Vec<Ability>), Box<Diagnostic>> {
+    let n = parse_identifier(context)?;
+
+    let ability_constraints = if match_token(context.tokens, Tok::Colon)? {
+        parse_list(
+            context,
+            |context| match context.tokens.peek() {
+                Tok::Plus => {
+                    context.tokens.advance()?;
+                    Ok(true)
+                }
+                Tok::Greater | Tok::Comma => Ok(false),
+                _ => Err(unexpected_token_error(
+                    context.tokens,
+                    &format!(
+                        "one of: '{}', '{}', or '{}'",
+                        Tok::Plus,
+                        Tok::Greater,
+                        Tok::Comma
+                    ),
+                )),
+            },
+            parse_ability,
+        )?
+    } else {
+        vec![]
+    };
+    Ok((n, ability_constraints))
+}
+
+// Parse type parameter with optional phantom declaration:
+//   TypeParameterWithPhantomDecl = "phantom"? <TypeParameter>
+fn parse_type_parameter_with_phantom_decl(
+    context: &mut Context,
+) -> Result<StructTypeParameter, Box<Diagnostic>> {
+    let is_phantom =
+        if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "phantom" {
+            context.tokens.advance()?;
+            true
+        } else {
+            false
+        };
+    let (name, constraints) = parse_type_parameter(context)?;
+    Ok(StructTypeParameter {
+        is_phantom,
+        name,
+        constraints,
+    })
+}
+
+// Parse optional type parameter list.
+//    OptionalTypeParameters = '<' Comma<TypeParameter> ">" | <empty>
+fn parse_optional_type_parameters(
+    context: &mut Context,
+) -> Result<Vec<(Name, Vec<Ability>)>, Box<Diagnostic>> {
+    if context.tokens.peek() == Tok::Less {
+        parse_comma_list(
+            context,
+            Tok::Less,
+            Tok::Greater,
+            parse_type_parameter,
+            "a type parameter",
+        )
+    } else {
+        Ok(vec![])
+    }
+}
+
+// Parse optional struct type parameters:
+//    StructTypeParameter = '<' Comma<TypeParameterWithPhantomDecl> ">" | <empty>
+fn parse_struct_type_parameters(
+    context: &mut Context,
+) -> Result<Vec<StructTypeParameter>, Box<Diagnostic>> {
+    if context.tokens.peek() == Tok::Less {
+        parse_comma_list(
+            context,
+            Tok::Less,
+            Tok::Greater,
+            parse_type_parameter_with_phantom_decl,
+            "a type parameter",
+        )
+    } else {
+        Ok(vec![])
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+// Parse a function declaration:
+//      FunctionDecl =
+//          "fun"
+//          <FunctionDefName> "(" Comma<Parameter> ")"
+//          (":" <Type>)?
+//          ("acquires" <NameAccessChain> ("," <NameAccessChain>)*)?
+//          ("{" <Sequence> "}" | ";")
+//
+fn parse_function_decl(
+    attributes: Vec<Attributes>,
+    start_loc: usize,
+    modifiers: Modifiers,
+    context: &mut Context,
+) -> Result<Function, Box<Diagnostic>> {
+    let Modifiers {
+        visibility,
+        mut entry,
+        native,
+    } = modifiers;
+
+    if let Some(Visibility::Script(vloc)) = visibility {
+        let msg = format!(
+            "'{script}' is deprecated in favor of the '{entry}' modifier. \
+            Replace with '{public} {entry}'",
+            script = Visibility::SCRIPT,
+            public = Visibility::PUBLIC,
+            entry = ENTRY_MODIFIER,
+        );
+        context
+            .env
+            .add_diag(diag!(Uncategorized::DeprecatedWillBeRemoved, (vloc, msg,)));
+        if entry.is_none() {
+            entry = Some(vloc)
+        }
+    }
+
+    // "fun" <FunctionDefName>
+    consume_token(context.tokens, Tok::Fun)?;
+    let name = FunctionName(parse_identifier(context)?);
+    let type_parameters = parse_optional_type_parameters(context)?;
+
+    // "(" Comma<Parameter> ")"
+    let parameters = parse_comma_list(
+        context,
+        Tok::LParen,
+        Tok::RParen,
+        parse_parameter,
+        "a function parameter",
+    )?;
+
+    // (":" <Type>)?
+    let return_type = if match_token(context.tokens, Tok::Colon)? {
+        parse_type(context)?
+    } else {
+        sp(name.loc(), Type_::Unit)
+    };
+
+    // ("acquires" (<NameAccessChain> ",")* <NameAccessChain> ","?
+    let mut acquires = vec![];
+    if match_token(context.tokens, Tok::Acquires)? {
+        let follows_acquire = |tok| matches!(tok, Tok::Semicolon | Tok::LBrace);
+        loop {
+            acquires.push(parse_name_access_chain(context, || {
+                "a resource struct name"
+            })?);
+            if follows_acquire(context.tokens.peek()) {
+                break;
+            }
+            consume_token(context.tokens, Tok::Comma)?;
+            if follows_acquire(context.tokens.peek()) {
+                break;
+            }
+        }
+    }
+
+    let body = match native {
+        Some(loc) => {
+            consume_token(context.tokens, Tok::Semicolon)?;
+            sp(loc, FunctionBody_::Native)
+        }
+        _ => {
+            let start_loc = context.tokens.start_loc();
+            consume_token(context.tokens, Tok::LBrace)?;
+            let seq = parse_sequence(context)?;
+            let end_loc = context.tokens.previous_end_loc();
+            sp(
+                make_loc(context.tokens.file_hash(), start_loc, end_loc),
+                FunctionBody_::Defined(seq),
+            )
+        }
+    };
+
+    let signature = FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    };
+
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(Function {
+        attributes,
+        loc,
+        visibility: visibility.unwrap_or(Visibility::Internal),
+        entry,
+        signature,
+        name,
+        body,
+    })
+}
+
+// Parse a function parameter:
+//      Parameter = "mut"? <Var> ":" <Type>
+fn parse_parameter(context: &mut Context) -> Result<(Mutability, Var, Type), Box<Diagnostic>> {
+    let mut_ = if context.tokens.peek() == Tok::Mut {
+        let start_loc = context.tokens.start_loc();
+        context.tokens.advance()?;
+        let end_loc = context.tokens.previous_end_loc();
+        Some(make_loc(context.tokens.file_hash(), start_loc, end_loc))
+    } else {
+        None
+    };
+    let v = parse_var(context)?;
+    consume_token(context.tokens, Tok::Colon)?;
+    let t = parse_type(context)?;
+    Ok((mut_, v, t))
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+// Parse a struct definition:
+//      StructDecl =
+//          "struct" <StructDefName> ("has" <Ability> (, <Ability>)+)?
+//          (("{" Comma<FieldAnnot> "}" | "(" Comma<PosField> ")") ("has" <Ability> (, <Ability>)+;)? | ";")
+//      StructDefName =
+//          <Identifier> <OptionalTypeParameters>
+// Where the the two "has" statements are mutually exclusive -- a struct cannot be declared with
+// both infix and postfix ability declarations.
+fn parse_struct_decl(
+    attributes: Vec<Attributes>,
+    start_loc: usize,
+    modifiers: Modifiers,
+    context: &mut Context,
+) -> Result<StructDefinition, Box<Diagnostic>> {
+    let Modifiers {
+        visibility,
+        entry,
+        native,
+    } = modifiers;
+
+    check_struct_visibility(visibility, context);
+
+    if let Some(loc) = entry {
+        let msg = format!(
+            "Invalid constant declaration. '{}' is used only on functions",
+            ENTRY_MODIFIER
+        );
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
+    }
+
+    consume_token(context.tokens, Tok::Struct)?;
+
+    // <StructDefName>
+    let name = StructName(parse_identifier(context)?);
+    let type_parameters = parse_struct_type_parameters(context)?;
+
+    let infix_ability_declaration_loc =
+        if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "has" {
+            Some(current_token_loc(context.tokens))
+        } else {
+            None
+        };
+    let mut abilities = if infix_ability_declaration_loc.is_some() {
+        context.tokens.advance()?;
+        parse_list(
+            context,
+            |context| match context.tokens.peek() {
+                Tok::Comma => {
+                    context.tokens.advance()?;
+                    Ok(true)
+                }
+                Tok::LBrace | Tok::Semicolon | Tok::LParen => Ok(false),
+                _ => Err(unexpected_token_error(
+                    context.tokens,
+                    &format!(
+                        "one of: '{}', '{}', '{}', or '{}'",
+                        Tok::Comma,
+                        Tok::LBrace,
+                        Tok::LParen,
+                        Tok::Semicolon
+                    ),
+                )),
+            },
+            parse_ability,
+        )?
+    } else {
+        vec![]
+    };
+
+    let fields = match native {
+        Some(loc) => {
+            consume_token(context.tokens, Tok::Semicolon)?;
+            StructFields::Native(loc)
+        }
+        _ => {
+            let fields = parse_struct_fields(context)?;
+            parse_postfix_ability_declarations(
+                infix_ability_declaration_loc,
+                &mut abilities,
+                context,
+            )?;
+            fields
+        }
+    };
+
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(StructDefinition {
+        attributes,
+        loc,
+        abilities,
+        name,
+        type_parameters,
+        fields,
+    })
+}
+
+// Parse a field annotated with a type:
+//      FieldAnnot = <DocComments> <Field> ":" <Type>
+fn parse_field_annot(context: &mut Context) -> Result<(Field, Type), Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
+    let f = parse_field(context)?;
+    consume_token(context.tokens, Tok::Colon)?;
+    let st = parse_type(context)?;
+    Ok((f, st))
+}
+
+// Parse a positional struct field:
+//      PosField = <DocComments> <Type>
+fn parse_positional_field(context: &mut Context) -> Result<Type, Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
+    parse_type(context)
+}
+
+// Parse a postfix ability declaration:
+//     "has" <Ability> (, <Ability>)+;
+//  Error if:
+//      * Also has prefix ability declaration
+fn parse_postfix_ability_declarations(
+    infix_ability_declaration_loc: Option<Loc>,
+    abilities: &mut Vec<Ability>,
+    context: &mut Context,
+) -> Result<(), Box<Diagnostic>> {
+    let postfix_ability_declaration =
+        context.tokens.peek() == Tok::Identifier && context.tokens.content() == "has";
+    let has_location = current_token_loc(context.tokens);
+
+    if postfix_ability_declaration {
+        context.env.check_feature(
+            FeatureGate::PostFixAbilities,
+            context.package_name,
+            has_location,
+        );
+
+        context.tokens.advance()?;
+
+        // Only add a diagnostic about prefix xor postfix ability declarations if the feature is
+        // supported. Otherwise we will already have an error that the `has` is not supported in
+        // that position, and the feature check diagnostic as well, so adding this additional error
+        // could be confusing.
+        if let Some(previous_declaration_loc) = infix_ability_declaration_loc {
+            let msg = "Duplicate ability declaration. Abilities can be declared before \
+                       or after the field declarations, but not both.";
+            let prev_msg = "Ability declaration previously given here";
+            context.env.add_diag(diag!(
+                Syntax::InvalidModifier,
+                (has_location, msg),
+                (previous_declaration_loc, prev_msg)
+            ));
+        }
+
+        *abilities = parse_list(
+            context,
+            |context| match context.tokens.peek() {
+                Tok::Comma => {
+                    context.tokens.advance()?;
+                    Ok(true)
+                }
+                Tok::Semicolon => Ok(false),
+                _ => Err(unexpected_token_error(
+                    context.tokens,
+                    &format!("one of: '{}' or '{}'", Tok::Comma, Tok::Semicolon),
+                )),
+            },
+            parse_ability,
+        )?;
+        consume_token(context.tokens, Tok::Semicolon)?;
+    }
+    Ok(())
+}
+
+fn parse_struct_fields(context: &mut Context) -> Result<StructFields, Box<Diagnostic>> {
+    let positional_declaration = context.tokens.peek() == Tok::LParen;
+    if positional_declaration {
+        let current_package = context.package_name;
+        let loc = current_token_loc(context.tokens);
+        context
+            .env
+            .check_feature(FeatureGate::PositionalFields, current_package, loc);
+
+        let list = parse_comma_list(
+            context,
+            Tok::LParen,
+            Tok::RParen,
+            parse_positional_field,
+            "a type",
+        )?;
+        Ok(StructFields::Positional(list))
+    } else {
+        let fields = parse_comma_list(
+            context,
+            Tok::LBrace,
+            Tok::RBrace,
+            parse_field_annot,
+            "a field",
+        )?;
+        Ok(StructFields::Defined(fields))
+    }
+}
+
+fn check_struct_visibility(visibility: Option<Visibility>, context: &mut Context) {
+    let current_package = context.package_name;
+    if let Some(Visibility::Public(loc)) = &visibility {
+        context
+            .env
+            .check_feature(FeatureGate::StructTypeVisibility, current_package, *loc);
+    }
+
+    let supports_public = context
+        .env
+        .supports_feature(current_package, FeatureGate::StructTypeVisibility);
+
+    if supports_public {
+        if !matches!(visibility, Some(Visibility::Public(_))) {
+            let (loc, vis_str) = match visibility {
+                Some(vis) => (vis.loc().unwrap(), format!("'{vis}'")),
+                None => {
+                    let loc = current_token_loc(context.tokens);
+                    (loc, "Internal".to_owned())
+                }
+            };
+            let msg = format!(
+                "Invalid struct declaration. {vis_str} struct declarations are not yet supported"
+            );
+            let note = "Visibility annotations are required on struct declarations from the Move 2024 edition onwards.";
+            let mut err = diag!(Syntax::InvalidModifier, (loc, msg));
+            err.add_note(note);
+            context.env.add_diag(err);
+        }
+    } else if let Some(vis) = visibility {
+        let msg = format!(
+            "Invalid struct declaration. Structs cannot have visibility modifiers as they are \
+                always '{}'",
+            Visibility::PUBLIC
+        );
+        let note = "Starting in the Move 2024 edition visibility must be annotated on struct declarations.";
+        let mut err = diag!(Syntax::InvalidModifier, (vis.loc().unwrap(), msg));
+        err.add_note(note);
+        context.env.add_diag(err);
+    }
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+// Parse a constant:
+//      ConstantDecl = "const" <Identifier> ":" <Type> "=" <Exp> ";"
+fn parse_constant_decl(
+    attributes: Vec<Attributes>,
+    start_loc: usize,
+    modifiers: Modifiers,
+    context: &mut Context,
+) -> Result<Constant, Box<Diagnostic>> {
+    let Modifiers {
+        visibility,
+        entry,
+        native,
+    } = modifiers;
+    if let Some(vis) = visibility {
+        let msg = "Invalid constant declaration. Constants cannot have visibility modifiers as \
+                   they are always internal";
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (vis.loc().unwrap(), msg)));
+    }
+    if let Some(loc) = entry {
+        let msg = format!(
+            "Invalid constant declaration. '{}' is used only on functions",
+            ENTRY_MODIFIER
+        );
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
+    }
+    if let Some(loc) = native {
+        let msg = "Invalid constant declaration. 'native' constants are not supported";
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
+    }
+    consume_token(context.tokens, Tok::Const)?;
+    let name = ConstantName(parse_identifier(context)?);
+    expect_token!(
+        context.tokens,
+        Tok::Colon,
+        Tok::Equal =>
+        (
+            Syntax::UnexpectedToken,
+            context.tokens.current_token_loc(),
+            format!("Expected a type annotation for this constant, e.g. '{}: <type>'", name)
+        )
+    )?;
+    let signature = parse_type(context)?;
+    consume_token(context.tokens, Tok::Equal)?;
+    let value = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(Constant {
+        attributes,
+        loc,
+        signature,
+        name,
+        value,
+    })
+}
+
+//**************************************************************************************************
+// AddressBlock
+//**************************************************************************************************
+
+// Parse an address block:
+//      AddressBlock =
+//          "address" <LeadingNameAccess> "{" (<Attributes> <Module>)* "}"
+//
+// Note that "address" is not a token.
+fn parse_address_block(
+    attributes: Vec<Attributes>,
+    context: &mut Context,
+) -> Result<AddressDefinition, Box<Diagnostic>> {
+    const UNEXPECTED_TOKEN: &str = "Invalid code unit. Expected 'address', 'module', or 'script'";
+    if context.tokens.peek() != Tok::Identifier {
+        let start = context.tokens.start_loc();
+        let end = start + context.tokens.content().len();
+        let loc = make_loc(context.tokens.file_hash(), start, end);
+        let msg = format!(
+            "{}. Got {}",
+            UNEXPECTED_TOKEN,
+            current_token_error_string(context.tokens)
+        );
+        return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
+    }
+    let addr_name = parse_identifier(context)?;
+    if addr_name.value != symbol!("address") {
+        let msg = format!("{}. Got '{}'", UNEXPECTED_TOKEN, addr_name.value);
+        return Err(Box::new(diag!(
+            Syntax::UnexpectedToken,
+            (addr_name.loc, msg)
+        )));
+    }
+    let start_loc = context.tokens.start_loc();
+    let addr = parse_leading_name_access(context)?;
+    let end_loc = context.tokens.previous_end_loc();
+    let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+
+    let modules = match context.tokens.peek() {
+        Tok::LBrace => {
+            context.tokens.advance()?;
+            let mut modules = vec![];
+            while context.tokens.peek() != Tok::RBrace {
+                let attributes = parse_attributes(context)?;
+                modules.push(parse_module(attributes, context)?);
+            }
+            consume_token(context.tokens, Tok::RBrace)?;
+            modules
+        }
+        _ => return Err(unexpected_token_error(context.tokens, "'{'")),
+    };
+
+    Ok(AddressDefinition {
+        attributes,
+        loc,
+        addr,
+        modules,
+    })
+}
+
+//**************************************************************************************************
+// Friends
+//**************************************************************************************************
+
+// Parse a friend declaration:
+//      FriendDecl =
+//          "friend" <NameAccessChain> ";"
+fn parse_friend_decl(
+    attributes: Vec<Attributes>,
+    context: &mut Context,
+) -> Result<FriendDecl, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, Tok::Friend)?;
+    let friend = parse_name_access_chain(context, || "a friend declaration")?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(FriendDecl {
+        attributes,
+        loc,
+        friend,
+    })
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+// Parse a use declaration:
+//      UseDecl =
+//          "use" "fun" <NameAccessChain> "as" <Type> "." <Identifier> ";" |
+//          "use" <LeadingNameAccess> "::" "{" <Comma<UseModule>> "}" ";" |
+//          "use" <LeadingNameAccess> "::" <UseModule>> ";"
+fn parse_use_decl(
+    attributes: Vec<Attributes>,
+    start_loc: usize,
+    modifiers: Modifiers,
+    context: &mut Context,
+) -> Result<UseDecl, Box<Diagnostic>> {
+    consume_token(context.tokens, Tok::Use)?;
+    let Modifiers {
+        visibility,
+        entry,
+        native,
+    } = modifiers;
+    if let Some(loc) = entry {
+        let msg = format!(
+            "Invalid use declaration. '{}' is used only on functions",
+            ENTRY_MODIFIER
+        );
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
+    }
+    if let Some(loc) = native {
+        let msg = "Invalid use declaration. Unexpected 'native' modifier";
+        context
+            .env
+            .add_diag(diag!(Syntax::InvalidModifier, (loc, msg)));
+    }
+    let use_ = match context.tokens.peek() {
+        Tok::Fun => {
+            consume_token(context.tokens, Tok::Fun).unwrap();
+            let function = parse_name_access_chain(context, || "a function name")?;
+            consume_token(context.tokens, Tok::As)?;
+            let ty = parse_name_access_chain(context, || "a type name")?;
+            consume_token(context.tokens, Tok::Period)?;
+            let method = parse_identifier(context)?;
+            Use::Fun {
+                visibility: visibility.unwrap_or(Visibility::Internal),
+                function: Box::new(function),
+                ty: Box::new(ty),
+                method,
+            }
+        }
+        _ => {
+            if let Some(vis) = visibility {
+                let msg =
+                    "Invalid use declaration. Non-'use fun' declarations cannot have visibility \
+                           modifiers as they are always internal";
+                context
+                    .env
+                    .add_diag(diag!(Syntax::InvalidModifier, (vis.loc().unwrap(), msg)));
+            }
+            let address_start_loc = context.tokens.start_loc();
+            let address = parse_leading_name_access(context)?;
+            consume_token_(
+                context.tokens,
+                Tok::ColonColon,
+                start_loc,
+                " after an address in a use declaration",
+            )?;
+            match context.tokens.peek() {
+                Tok::LBrace => {
+                    let parse_inner = |ctxt: &mut Context<'_, '_, '_>| {
+                        let (name, _, use_) = parse_use_module(ctxt)?;
+                        Ok((name, use_))
+                    };
+                    let use_decls = parse_comma_list(
+                        context,
+                        Tok::LBrace,
+                        Tok::RBrace,
+                        parse_inner,
+                        "a module use clause",
+                    )?;
+                    Use::NestedModuleUses(address, use_decls)
+                }
+                _ => {
+                    let (name, end_loc, use_) = parse_use_module(context)?;
+                    let loc = make_loc(context.tokens.file_hash(), address_start_loc, end_loc);
+                    let module_ident = sp(
+                        loc,
+                        ModuleIdent_ {
+                            address,
+                            module: name,
+                        },
+                    );
+                    Use::ModuleUse(module_ident, use_)
+                }
+            }
+        }
+    };
+    consume_token(context.tokens, Tok::Semicolon)?;
+    let end_loc = context.tokens.previous_end_loc();
+    let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
+    Ok(UseDecl {
+        attributes,
+        loc,
+        use_,
+    })
+}
+
+// Parse a use declaration member:
+//      UseModule =
+//          <ModuleName> <UseAlias> |
+//          <ModuleName> "::" <UseMember> |
+//          <ModuleName> "::" "{" Comma<UseMember> "}"
+fn parse_use_module(
+    context: &mut Context,
+) -> Result<(ModuleName, usize, ModuleUse), Box<Diagnostic>> {
+    let module_name = parse_module_name(context)?;
+    let end_loc = context.tokens.previous_end_loc();
+    let alias_opt = parse_use_alias(context)?;
+    let module_use = match (&alias_opt, context.tokens.peek()) {
+        (None, Tok::ColonColon) => {
+            consume_token(context.tokens, Tok::ColonColon)?;
+            let sub_uses = match context.tokens.peek() {
+                Tok::LBrace => parse_comma_list(
+                    context,
+                    Tok::LBrace,
+                    Tok::RBrace,
+                    parse_use_member,
+                    "a module member alias",
+                )?,
+                _ => vec![parse_use_member(context)?],
+            };
+            ModuleUse::Members(sub_uses)
+        }
+        _ => ModuleUse::Module(alias_opt.map(ModuleName)),
+    };
+    Ok((module_name, end_loc, module_use))
+}
+
+// Parse an alias for a module member:
+//      UseMember = <Identifier> <UseAlias>
+fn parse_use_member(context: &mut Context) -> Result<(Name, Option<Name>), Box<Diagnostic>> {
+    let member = parse_identifier(context)?;
+    let alias_opt = parse_use_alias(context)?;
+    Ok((member, alias_opt))
+}
+
+// Parse an 'as' use alias:
+//      UseAlias = ("as" <Identifier>)?
+fn parse_use_alias(context: &mut Context) -> Result<Option<Name>, Box<Diagnostic>> {
+    Ok(if context.tokens.peek() == Tok::As {
+        context.tokens.advance()?;
+        Some(parse_identifier(context)?)
+    } else {
+        None
+    })
+}
+
+// Parse a module:
+//      Module =
+//          <DocComments> ( "spec" | "module") (<LeadingNameAccess>::)?<ModuleName> "{"
+//              ( <Attributes>
+//                  ( <FriendDecl> | <SpecBlock> |
+//                    <DocComments> <ModuleMemberModifiers>
+//                        (<ConstantDecl> | <StructDecl> | <FunctionDecl> | <UseDecl>) )
+//                  )
+//              )*
+//          "}"
+fn parse_module(
+    attributes: Vec<Attributes>,
+    context: &mut Context,
+) -> Result<ModuleDefinition, Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
+    let start_loc = context.tokens.start_loc();
+
+    let is_spec_module = if context.tokens.peek() == Tok::Spec {
+        context.tokens.advance()?;
+        true
+    } else {
+        consume_token(context.tokens, Tok::Module)?;
+        false
+    };
+    let sp!(n1_loc, n1_) = parse_leading_name_access(context)?;
+    let (address, name) = match (n1_, context.tokens.peek()) {
+        (addr_ @ LeadingNameAccess_::AnonymousAddress(_), _)
+        | (addr_ @ LeadingNameAccess_::Name(_), Tok::ColonColon) => {
+            let addr = sp(n1_loc, addr_);
+            consume_token(context.tokens, Tok::ColonColon)?;
+            let name = parse_module_name(context)?;
+            (Some(addr), name)
+        }
+        (LeadingNameAccess_::Name(name), _) => (None, ModuleName(name)),
+    };
+    consume_token(context.tokens, Tok::LBrace)?;
+
+    let mut members = vec![];
+    while context.tokens.peek() != Tok::RBrace {
+        members.push({
+            let attributes = parse_attributes(context)?;
+            match context.tokens.peek() {
+                // Top-level specification constructs
+                Tok::Invariant => {
+                    context.tokens.match_doc_comments();
+                    ModuleMember::Spec(singleton_module_spec_block(
+                        context,
+                        context.tokens.start_loc(),
+                        attributes,
+                        parse_invariant,
+                    )?)
+                }
+                Tok::Spec => {
+                    match context.tokens.lookahead() {
+                        Ok(Tok::Fun) | Ok(Tok::Native) => {
+                            context.tokens.match_doc_comments();
+                            let start_loc = context.tokens.start_loc();
+                            context.tokens.advance()?;
+                            // Add an extra check for better error message
+                            // if old syntax is used
+                            if context.tokens.lookahead2() == Ok((Tok::Identifier, Tok::LBrace)) {
+                                return Err(unexpected_token_error(
+                                    context.tokens,
+                                    "only 'spec', drop the 'fun' keyword",
+                                ));
+                            }
+                            ModuleMember::Spec(singleton_module_spec_block(
+                                context,
+                                start_loc,
+                                attributes,
+                                parse_spec_function,
+                            )?)
+                        }
+                        _ => {
+                            // Regular spec block
+                            ModuleMember::Spec(parse_spec_block(attributes, context)?)
+                        }
+                    }
+                }
+                // Regular move constructs
+                Tok::Friend => ModuleMember::Friend(parse_friend_decl(attributes, context)?),
+                _ => {
+                    context.tokens.match_doc_comments();
+                    let start_loc = context.tokens.start_loc();
+                    let modifiers = parse_module_member_modifiers(context)?;
+                    match context.tokens.peek() {
+                        Tok::Const => ModuleMember::Constant(parse_constant_decl(
+                            attributes, start_loc, modifiers, context,
+                        )?),
+                        Tok::Fun => ModuleMember::Function(parse_function_decl(
+                            attributes, start_loc, modifiers, context,
+                        )?),
+                        Tok::Struct => ModuleMember::Struct(parse_struct_decl(
+                            attributes, start_loc, modifiers, context,
+                        )?),
+                        Tok::Use => ModuleMember::Use(parse_use_decl(
+                            attributes, start_loc, modifiers, context,
+                        )?),
+                        _ => {
+                            return Err(unexpected_token_error(
+                                context.tokens,
+                                &format!(
+                                    "a module member: '{}', '{}', '{}', '{}', '{}', or '{}'",
+                                    Tok::Spec,
+                                    Tok::Use,
+                                    Tok::Friend,
+                                    Tok::Const,
+                                    Tok::Fun,
+                                    Tok::Struct
+                                ),
+                            ))
+                        }
+                    }
+                }
+            }
+        })
+    }
+    consume_token(context.tokens, Tok::RBrace)?;
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    let def = ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        name,
+        is_spec_module,
+        members,
+    };
+
+    Ok(def)
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+// Parse a script:
+//      Script =
+//          "script" "{"
+//              (<Attributes> <UseDecl>)*
+//              (<Attributes> <ConstantDecl>)*
+//              <Attributes> <DocComments> <ModuleMemberModifiers> <FunctionDecl>
+//              (<Attributes> <SpecBlock>)*
+//          "}"
+fn parse_script(
+    script_attributes: Vec<Attributes>,
+    context: &mut Context,
+) -> Result<Script, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+
+    consume_token(context.tokens, Tok::Script)?;
+    consume_token(context.tokens, Tok::LBrace)?;
+
+    // TODO better errors for modifiers
+    let mut uses = vec![];
+    let mut next_item_attributes = parse_attributes(context)?;
+    while context.tokens.peek() == Tok::Use {
+        let start_loc = context.tokens.start_loc();
+        uses.push(parse_use_decl(
+            next_item_attributes,
+            start_loc,
+            Modifiers::empty(),
+            context,
+        )?);
+        next_item_attributes = parse_attributes(context)?;
+    }
+    let mut constants = vec![];
+    while context.tokens.peek() == Tok::Const {
+        let start_loc = context.tokens.start_loc();
+        constants.push(parse_constant_decl(
+            next_item_attributes,
+            start_loc,
+            Modifiers::empty(),
+            context,
+        )?);
+        next_item_attributes = parse_attributes(context)?;
+    }
+
+    context.tokens.match_doc_comments(); // match doc comments to script function
+    let function_start_loc = context.tokens.start_loc();
+    let modifiers = parse_module_member_modifiers(context)?;
+    // don't need to check native modifier, it is checked later
+    let function =
+        parse_function_decl(next_item_attributes, function_start_loc, modifiers, context)?;
+
+    let mut specs = vec![];
+    while context.tokens.peek() == Tok::NumSign || context.tokens.peek() == Tok::Spec {
+        let attributes = parse_attributes(context)?;
+        specs.push(parse_spec_block(attributes, context)?);
+    }
+
+    if context.tokens.peek() != Tok::RBrace {
+        let loc = current_token_loc(context.tokens);
+        let msg = "Unexpected characters after end of 'script' function";
+        return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
+    }
+    consume_token(context.tokens, Tok::RBrace)?;
+
+    let loc = make_loc(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+    );
+    Ok(Script {
+        attributes: script_attributes,
+        loc,
+        uses,
+        constants,
+        function,
+        specs,
+    })
+}
+//**************************************************************************************************
+// Specification Blocks
+//**************************************************************************************************
+
+// Parse an optional specification block:
+//     SpecBlockTarget =
+//          <Identifier>
+//        |  "fun" <Identifier>  # deprecated
+//        | "struct <Identifier> # deprecated
+//        | "module"
+//        | "schema" <Identifier> <OptionalTypeParameters>
+//        | <empty>
+//     SpecBlock =
+//        <DocComments> "spec" ( <SpecFunction> | <SpecBlockTarget> "{" SpecBlockMember* "}" )
+fn parse_spec_block(
+    attributes: Vec<Attributes>,
+    context: &mut Context,
+) -> Result<SpecBlock, Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, Tok::Spec)?;
+    let target_start_loc = context.tokens.start_loc();
+    let target_ = match context.tokens.peek() {
+        Tok::Fun => {
+            return Err(unexpected_token_error(
+                context.tokens,
+                "only 'spec', drop the 'fun' keyword",
+            ));
+        }
+        Tok::Struct => {
+            return Err(unexpected_token_error(
+                context.tokens,
+                "only 'spec', drop the 'struct' keyword",
+            ));
+        }
+        Tok::Module => {
+            context.tokens.advance()?;
+            SpecBlockTarget_::Module
+        }
+        Tok::Identifier if context.tokens.content() == "schema" => {
+            context.tokens.advance()?;
+            let name = parse_identifier(context)?;
+            let type_parameters = parse_optional_type_parameters(context)?;
+            SpecBlockTarget_::Schema(name, type_parameters)
+        }
+        Tok::RestrictedIdentifier | Tok::Identifier => {
+            let name = parse_identifier(context)?;
+            let signature = parse_spec_target_signature_opt(&name.loc, context)?;
+            SpecBlockTarget_::Member(name, signature)
+        }
+        Tok::LBrace => SpecBlockTarget_::Code,
+        _ => {
+            return Err(unexpected_token_error(
+                context.tokens,
+                "one of `module`, `struct`, `fun`, `schema`, or `{`",
+            ));
+        }
+    };
+    let target = spanned(
+        context.tokens.file_hash(),
+        target_start_loc,
+        match target_ {
+            SpecBlockTarget_::Code => target_start_loc,
+            _ => context.tokens.previous_end_loc(),
+        },
+        target_,
+    );
+
+    consume_token(context.tokens, Tok::LBrace)?;
+    let mut uses = vec![];
+    // TODO better errrors for modifiers or attributes
+    while context.tokens.peek() == Tok::Use {
+        let start_loc = context.tokens.start_loc();
+        uses.push(parse_use_decl(
+            vec![],
+            start_loc,
+            Modifiers::empty(),
+            context,
+        )?);
+    }
+    let mut members = vec![];
+    while context.tokens.peek() != Tok::RBrace {
+        members.push(parse_spec_block_member(context)?);
+    }
+    consume_token(context.tokens, Tok::RBrace)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlock_ {
+            attributes,
+            target,
+            uses,
+            members,
+        },
+    ))
+}
+
+fn parse_spec_target_signature_opt(
+    loc: &Loc,
+    context: &mut Context,
+) -> Result<Option<Box<FunctionSignature>>, Box<Diagnostic>> {
+    match context.tokens.peek() {
+        Tok::Less | Tok::LParen => {
+            let type_parameters = parse_optional_type_parameters(context)?;
+            // "(" Comma<Parameter> ")"
+            let parameters = parse_comma_list(
+                context,
+                Tok::LParen,
+                Tok::RParen,
+                parse_parameter,
+                "a function parameter",
+            )?;
+            // (":" <Type>)?
+            let return_type = if match_token(context.tokens, Tok::Colon)? {
+                parse_type(context)?
+            } else {
+                sp(*loc, Type_::Unit)
+            };
+            Ok(Some(Box::new(FunctionSignature {
+                type_parameters,
+                parameters,
+                return_type,
+            })))
+        }
+        _ => Ok(None),
+    }
+}
+
+// Parse a spec block member:
+//    SpecBlockMember = <DocComments> ( <Invariant> | <Condition> | <SpecFunction> | <SpecVariable>
+//                                   | <SpecInclude> | <SpecApply> | <SpecPragma> | <SpecLet>
+//                                   | <SpecUpdate> | <SpecAxiom> )
+fn parse_spec_block_member(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
+    match context.tokens.peek() {
+        Tok::Invariant => parse_invariant(context),
+        Tok::Let => parse_spec_let(context),
+        Tok::Fun | Tok::Native => parse_spec_function(context),
+        Tok::Identifier => match context.tokens.content() {
+            "assert" | "assume" | "decreases" | "aborts_if" | "aborts_with" | "succeeds_if"
+            | "modifies" | "emits" | "ensures" | "requires" => parse_condition(context),
+            "axiom" => parse_axiom(context),
+            "include" => parse_spec_include(context),
+            "apply" => parse_spec_apply(context),
+            "pragma" => parse_spec_pragma(context),
+            "global" | "local" => parse_spec_variable(context),
+            "update" => parse_spec_update(context),
+            _ => {
+                // local is optional but supported to be able to declare variables which are
+                // named like the weak keywords above
+                parse_spec_variable(context)
+            }
+        },
+        _ => Err(unexpected_token_error(
+            context.tokens,
+            "one of `assert`, `assume`, `decreases`, `aborts_if`, `aborts_with`, `succeeds_if`, \
+             `modifies`, `emits`, `ensures`, `requires`, `include`, `apply`, `pragma`, `global`, \
+             or a name",
+        )),
+    }
+}
+
+// Parse a specification condition:
+//    SpecCondition =
+//        ("assert" | "assume" | "ensures" | "requires" ) <ConditionProperties> <Exp> ";"
+//      | "aborts_if" <ConditionProperties> <Exp> ["with" <Exp>] ";"
+//      | "aborts_with" <ConditionProperties> <Exp> [Comma <Exp>]* ";"
+//      | "decreases" <ConditionProperties> <Exp> ";"
+//      | "emits" <ConditionProperties> <Exp> "to" <Exp> [If <Exp>] ";"
+fn parse_condition(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let kind_ = match context.tokens.content() {
+        "assert" => SpecConditionKind_::Assert,
+        "assume" => SpecConditionKind_::Assume,
+        "decreases" => SpecConditionKind_::Decreases,
+        "aborts_if" => SpecConditionKind_::AbortsIf,
+        "aborts_with" => SpecConditionKind_::AbortsWith,
+        "succeeds_if" => SpecConditionKind_::SucceedsIf,
+        "modifies" => SpecConditionKind_::Modifies,
+        "emits" => SpecConditionKind_::Emits,
+        "ensures" => SpecConditionKind_::Ensures,
+        "requires" => SpecConditionKind_::Requires,
+        _ => unreachable!(),
+    };
+    context.tokens.advance()?;
+    let kind = spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        kind_.clone(),
+    );
+    let properties = parse_condition_properties(context)?;
+    let exp = if kind_ == SpecConditionKind_::AbortsWith || kind_ == SpecConditionKind_::Modifies {
+        // Use a dummy expression as a placeholder for this field.
+        let loc = make_loc(context.tokens.file_hash(), start_loc, start_loc + 1);
+        sp(loc, Exp_::Value(sp(loc, Value_::Bool(false))))
+    } else {
+        parse_exp(context)?
+    };
+    let additional_exps = if kind_ == SpecConditionKind_::AbortsIf
+        && context.tokens.peek() == Tok::Identifier
+        && context.tokens.content() == "with"
+    {
+        context.tokens.advance()?;
+        let codes = vec![parse_exp(context)?];
+        consume_token(context.tokens, Tok::Semicolon)?;
+        codes
+    } else if kind_ == SpecConditionKind_::AbortsWith || kind_ == SpecConditionKind_::Modifies {
+        parse_comma_list_after_start(
+            context,
+            context.tokens.start_loc(),
+            context.tokens.peek(),
+            Tok::Semicolon,
+            parse_exp,
+            "an aborts code or modifies target",
+        )?
+    } else if kind_ == SpecConditionKind_::Emits {
+        consume_identifier(context.tokens, "to")?;
+        let mut additional_exps = vec![parse_exp(context)?];
+        if match_token(context.tokens, Tok::If)? {
+            additional_exps.push(parse_exp(context)?);
+        }
+        consume_token(context.tokens, Tok::Semicolon)?;
+        additional_exps
+    } else {
+        consume_token(context.tokens, Tok::Semicolon)?;
+        vec![]
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        SpecBlockMember_::Condition {
+            kind,
+            properties,
+            exp,
+            additional_exps,
+        },
+    ))
+}
+
+// Parse properties in a condition.
+//   ConditionProperties = ( "[" Comma<SpecPragmaProperty> "]" )?
+fn parse_condition_properties(
+    context: &mut Context,
+) -> Result<Vec<PragmaProperty>, Box<Diagnostic>> {
+    let properties = if context.tokens.peek() == Tok::LBracket {
+        parse_comma_list(
+            context,
+            Tok::LBracket,
+            Tok::RBracket,
+            parse_spec_property,
+            "a condition property",
+        )?
+    } else {
+        vec![]
+    };
+    Ok(properties)
+}
+
+// Parse an axiom:
+//     a = "axiom" <OptionalTypeParameters> <ConditionProperties> <Exp> ";"
+fn parse_axiom(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_identifier(context.tokens, "axiom")?;
+    let type_parameters = parse_optional_type_parameters(context)?;
+    let kind = spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecConditionKind_::Axiom(type_parameters),
+    );
+    let properties = parse_condition_properties(context)?;
+    let exp = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Condition {
+            kind,
+            properties,
+            exp,
+            additional_exps: vec![],
+        },
+    ))
+}
+
+// Parse an invariant:
+//     Invariant = "invariant" <OptionalTypeParameters> [ "update" ] <ConditionProperties> <Exp> ";"
+fn parse_invariant(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, Tok::Invariant)?;
+    let type_parameters = parse_optional_type_parameters(context)?;
+    let kind_ = match context.tokens.peek() {
+        Tok::Identifier if context.tokens.content() == "update" => {
+            context.tokens.advance()?;
+            SpecConditionKind_::InvariantUpdate(type_parameters)
+        }
+        _ => SpecConditionKind_::Invariant(type_parameters),
+    };
+    let kind = spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        kind_,
+    );
+    let properties = parse_condition_properties(context)?;
+    let exp = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Condition {
+            kind,
+            properties,
+            exp,
+            additional_exps: vec![],
+        },
+    ))
+}
+
+// Parse a specification function.
+//     SpecFunction = "define" <SpecFunctionSignature> ( "{" <Sequence> "}" | ";" )
+//                  | "native" "define" <SpecFunctionSignature> ";"
+//     SpecFunctionSignature =
+//         <Identifier> <OptionalTypeParameters> "(" Comma<Parameter> ")" ":" <Type>
+fn parse_spec_function(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let native_opt = consume_optional_token_with_loc(context.tokens, Tok::Native)?;
+    consume_token(context.tokens, Tok::Fun)?;
+    let name = FunctionName(parse_identifier(context)?);
+    let type_parameters = parse_optional_type_parameters(context)?;
+    // "(" Comma<Parameter> ")"
+    let parameters = parse_comma_list(
+        context,
+        Tok::LParen,
+        Tok::RParen,
+        parse_parameter,
+        "a function parameter",
+    )?;
+
+    // ":" <Type>)
+    consume_token(context.tokens, Tok::Colon)?;
+    let return_type = parse_type(context)?;
+
+    let body_start_loc = context.tokens.start_loc();
+    let no_body = context.tokens.peek() != Tok::LBrace;
+    let (uninterpreted, body_) = if native_opt.is_some() || no_body {
+        consume_token(context.tokens, Tok::Semicolon)?;
+        (native_opt.is_none(), FunctionBody_::Native)
+    } else {
+        consume_token(context.tokens, Tok::LBrace)?;
+        let seq = parse_sequence(context)?;
+        (false, FunctionBody_::Defined(seq))
+    };
+    let body = spanned(
+        context.tokens.file_hash(),
+        body_start_loc,
+        context.tokens.previous_end_loc(),
+        body_,
+    );
+
+    let signature = FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    };
+
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Function {
+            signature,
+            uninterpreted,
+            name,
+            body,
+        },
+    ))
+}
+
+// Parse a specification variable.
+//     SpecVariable = ( "global" | "local" )?
+//                    <Identifier> <OptionalTypeParameters>
+//                    ":" <Type>
+//                    [ "=" Exp ]  // global only
+//                    ";"
+fn parse_spec_variable(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let is_global = match context.tokens.content() {
+        "global" => {
+            consume_token(context.tokens, Tok::Identifier)?;
+            true
+        }
+        "local" => {
+            consume_token(context.tokens, Tok::Identifier)?;
+            false
+        }
+        _ => false,
+    };
+    let name = parse_identifier(context)?;
+    let type_parameters = parse_optional_type_parameters(context)?;
+    consume_token(context.tokens, Tok::Colon)?;
+    let type_ = parse_type(context)?;
+    let init = if is_global && context.tokens.peek() == Tok::Equal {
+        context.tokens.advance()?;
+        Some(parse_exp(context)?)
+    } else {
+        None
+    };
+
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Variable {
+            is_global,
+            name,
+            type_parameters,
+            type_,
+            init,
+        },
+    ))
+}
+
+// Parse a specification update.
+//     SpecUpdate = "update" <Exp> = <Exp> ";"
+fn parse_spec_update(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_token(context.tokens, Tok::Identifier)?;
+    let lhs = parse_unary_exp(context)?;
+    consume_token(context.tokens, Tok::Equal)?;
+    let rhs = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Update { lhs, rhs },
+    ))
+}
+
+// Parse a specification let.
+//     SpecLet =  "let" [ "post" ] <Identifier> "=" <Exp> ";"
+fn parse_spec_let(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    context.tokens.advance()?;
+    let post_state =
+        if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "post" {
+            context.tokens.advance()?;
+            true
+        } else {
+            false
+        };
+    let name = parse_identifier(context)?;
+    consume_token(context.tokens, Tok::Equal)?;
+    let def = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Let {
+            name,
+            post_state,
+            def,
+        },
+    ))
+}
+
+// Parse a specification schema include.
+//    SpecInclude = "include" <Exp>
+fn parse_spec_include(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_identifier(context.tokens, "include")?;
+    let properties = parse_condition_properties(context)?;
+    let exp = parse_exp(context)?;
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Include { properties, exp },
+    ))
+}
+
+// Parse a specification schema apply.
+//    SpecApply = "apply" <Exp> "to" Comma<SpecApplyPattern>
+//                                   ( "except" Comma<SpecApplyPattern> )? ";"
+fn parse_spec_apply(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_identifier(context.tokens, "apply")?;
+    let exp = parse_exp(context)?;
+    consume_identifier(context.tokens, "to")?;
+    let parse_patterns = |context: &mut Context| {
+        parse_list(
+            context,
+            |context| {
+                if context.tokens.peek() == Tok::Comma {
+                    context.tokens.advance()?;
+                    Ok(true)
+                } else {
+                    Ok(false)
+                }
+            },
+            parse_spec_apply_pattern,
+        )
+    };
+    let patterns = parse_patterns(context)?;
+    let exclusion_patterns =
+        if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "except" {
+            context.tokens.advance()?;
+            parse_patterns(context)?
+        } else {
+            vec![]
+        };
+    consume_token(context.tokens, Tok::Semicolon)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Apply {
+            exp,
+            patterns,
+            exclusion_patterns,
+        },
+    ))
+}
+
+// Parse a function pattern:
+//     SpecApplyPattern = <SpecApplyFragment>+ <OptionalTypeArgs>
+fn parse_spec_apply_pattern(context: &mut Context) -> Result<SpecApplyPattern, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    // TODO: update the visibility parsing in the spec as well
+    let public_opt = consume_optional_token_with_loc(context.tokens, Tok::Public)?;
+    let visibility = if let Some(loc) = public_opt {
+        Some(Visibility::Public(loc))
+    } else if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "internal" {
+        // Its not ideal right now that we do not have a loc here, but acceptable for what
+        // we are doing with this in specs.
+        context.tokens.advance()?;
+        Some(Visibility::Internal)
+    } else {
+        None
+    };
+    let mut last_end = context.tokens.start_loc() + context.tokens.content().len();
+    let name_pattern = parse_list(
+        context,
+        |context| {
+            // We need name fragments followed by each other without space. So we do some
+            // magic here similar as with `>>` based on token distance.
+            let start_loc = context.tokens.start_loc();
+            let adjacent = last_end == start_loc;
+            last_end = start_loc + context.tokens.content().len();
+            Ok(adjacent && [Tok::Identifier, Tok::Star].contains(&context.tokens.peek()))
+        },
+        parse_spec_apply_fragment,
+    )?;
+    let type_parameters = parse_optional_type_parameters(context)?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecApplyPattern_ {
+            visibility,
+            name_pattern,
+            type_parameters,
+        },
+    ))
+}
+
+// Parse a name pattern fragment
+//     SpecApplyFragment = <Identifier> | "*"
+fn parse_spec_apply_fragment(context: &mut Context) -> Result<SpecApplyFragment, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let fragment = match context.tokens.peek() {
+        Tok::Identifier => SpecApplyFragment_::NamePart(parse_identifier(context)?),
+        Tok::Star => {
+            context.tokens.advance()?;
+            SpecApplyFragment_::Wildcard
+        }
+        _ => {
+            return Err(unexpected_token_error(
+                context.tokens,
+                "a name fragment or `*`",
+            ))
+        }
+    };
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        fragment,
+    ))
+}
+
+// Parse a specification pragma:
+//    SpecPragma = "pragma" Comma<SpecPragmaProperty> ";"
+fn parse_spec_pragma(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    consume_identifier(context.tokens, "pragma")?;
+    let properties = parse_comma_list_after_start(
+        context,
+        start_loc,
+        Tok::Identifier,
+        Tok::Semicolon,
+        parse_spec_property,
+        "a pragma property",
+    )?;
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        SpecBlockMember_::Pragma { properties },
+    ))
+}
+
+// Parse a specification pragma property:
+//    SpecPragmaProperty = <Identifier> ( "=" <Value> | <NameAccessChain> )?
+fn parse_spec_property(context: &mut Context) -> Result<PragmaProperty, Box<Diagnostic>> {
+    let start_loc = context.tokens.start_loc();
+    let name = match consume_optional_token_with_loc(context.tokens, Tok::Friend)? {
+        // special treatment for `pragma friend = ...` as friend is a keyword
+        // TODO: this might violate the assumption that a keyword can never be a name.
+        Some(loc) => Name::new(loc, symbol!("friend")),
+        None => parse_identifier(context)?,
+    };
+    let value = if context.tokens.peek() == Tok::Equal {
+        context.tokens.advance()?;
+        match context.tokens.peek() {
+            Tok::AtSign | Tok::True | Tok::False | Tok::NumTypedValue | Tok::ByteStringValue => {
+                Some(PragmaValue::Literal(parse_value(context)?))
+            }
+            Tok::NumValue
+                if !context
+                    .tokens
+                    .lookahead()
+                    .map(|tok| tok == Tok::ColonColon)
+                    .unwrap_or(false) =>
+            {
+                Some(PragmaValue::Literal(parse_value(context)?))
+            }
+            _ => {
+                // Parse as a module access for a possibly qualified identifier
+                Some(PragmaValue::Ident(parse_name_access_chain(
+                    context,
+                    || "an identifier as pragma value",
+                )?))
+            }
+        }
+    } else {
+        None
+    };
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        context.tokens.previous_end_loc(),
+        PragmaProperty_ { name, value },
+    ))
+}
+
+/// Creates a module spec block for a single member.
+fn singleton_module_spec_block(
+    context: &mut Context,
+    start_loc: usize,
+    attributes: Vec<Attributes>,
+    member_parser: impl Fn(&mut Context) -> Result<SpecBlockMember, Box<Diagnostic>>,
+) -> Result<SpecBlock, Box<Diagnostic>> {
+    let member = member_parser(context)?;
+    let end_loc = context.tokens.previous_end_loc();
+    Ok(spanned(
+        context.tokens.file_hash(),
+        start_loc,
+        end_loc,
+        SpecBlock_ {
+            attributes,
+            target: spanned(
+                context.tokens.file_hash(),
+                start_loc,
+                start_loc,
+                SpecBlockTarget_::Module,
+            ),
+            uses: vec![],
+            members: vec![member],
+        },
+    ))
+}
+
+//**************************************************************************************************
+// File
+//**************************************************************************************************
+
+// Parse a file:
+//      File =
+//          (<Attributes> (<AddressBlock> | <Module> | <Script>))*
+fn parse_file(context: &mut Context) -> Result<Vec<Definition>, Box<Diagnostic>> {
+    let mut defs = vec![];
+    while context.tokens.peek() != Tok::EOF {
+        let attributes = parse_attributes(context)?;
+        defs.push(match context.tokens.peek() {
+            Tok::Spec | Tok::Module => Definition::Module(parse_module(attributes, context)?),
+            Tok::Script => Definition::Script(parse_script(attributes, context)?),
+            _ => Definition::Address(parse_address_block(attributes, context)?),
+        })
+    }
+    Ok(defs)
+}
+
+/// Parse the `input` string as a file of Move source code and return the
+/// result as either a pair of FileDefinition and doc comments or some Diagnostics. The `file` name
+/// is used to identify source locations in error messages.
+pub fn parse_file_string(
+    env: &mut CompilationEnv,
+    file_hash: FileHash,
+    input: &str,
+    package: Option<Symbol>,
+) -> Result<(Vec<Definition>, MatchedFileCommentMap), Diagnostics> {
+    let edition = env.syntax_edition(package);
+    let mut tokens = Lexer::new(input, file_hash, edition);
+    match tokens.advance() {
+        Err(err) => Err(Diagnostics::from(vec![*err])),
+        Ok(..) => Ok(()),
+    }?;
+    match parse_file(&mut Context::new(env, &mut tokens, package)) {
+        Err(err) => Err(Diagnostics::from(vec![*err])),
+        Ok(def) => Ok((def, tokens.check_and_get_doc_comments(env))),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/ast_debug.rs b/vendors/move/crates/move-compiler/src/shared/ast_debug.rs
new file mode 100644
index 000000000..a795a2d8e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/ast_debug.rs
@@ -0,0 +1,259 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/// Simple trait used for pretty printing the various AST
+///
+/// Unfortunately, the trait implementation cannot be derived. The actual implementation should
+/// closely resemble the source syntax. As suchfield does not get printed in a direct manner, and
+/// most of the logic is ad hoc
+///
+/// To avoid missing fields in the printing, be sure to fully pattern match against the struct
+/// (without the use of `..`) when implementing `AstDebug`. For example,
+///
+/// ```rust,ignore
+/// impl AstDebug for StructDefinition {
+///     fn ast_debug(&self, w: &mut AstWriter) {
+///         let StructDefinition {
+///             resource_opt,
+///             name,
+///             type_parameters,
+///             fields,
+///         } = self;
+///         ...
+///     }
+/// }
+/// ```
+//**************************************************************************************************
+// Macros
+//**************************************************************************************************
+use std::fmt::Display;
+
+#[macro_export]
+macro_rules! debug_print {
+    ($e:expr) => {
+        $crate::shared::ast_debug::print(&$e)
+    };
+}
+
+#[macro_export]
+macro_rules! debug_print_verbose {
+    ($e:expr) => {
+        $crate::shared::ast_debug::print_verbose(&$e)
+    };
+}
+
+#[macro_export]
+macro_rules! debug_display {
+    ($e:expr) => {
+        $crate::shared::ast_debug::DisplayWrapper(&$e, false)
+    };
+}
+
+#[macro_export]
+macro_rules! debug_display_verbose {
+    ($e:expr) => {
+        $crate::shared::ast_debug::DisplayWrapper(&$e, true)
+    };
+}
+
+//**************************************************************************************************
+// Printer
+//**************************************************************************************************
+
+pub trait AstDebug {
+    fn ast_debug(&self, w: &mut AstWriter);
+    fn print(&self) {
+        let mut writer = AstWriter::normal();
+        self.ast_debug(&mut writer);
+        print!("{}", writer);
+    }
+    fn print_verbose(&self) {
+        let mut writer = AstWriter::verbose();
+        self.ast_debug(&mut writer);
+        print!("{}", writer);
+    }
+}
+
+impl<T: AstDebug> AstDebug for Box<T> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.as_ref().ast_debug(w)
+    }
+}
+
+impl<T: AstDebug> AstDebug for &T {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        AstDebug::ast_debug(*self, w)
+    }
+}
+
+impl<T: AstDebug> AstDebug for &mut T {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        AstDebug::ast_debug(*self, w)
+    }
+}
+
+pub struct AstWriter {
+    verbose: bool,
+    margin: usize,
+    lines: Vec<String>,
+}
+
+impl AstWriter {
+    fn new(verbose: bool) -> Self {
+        Self {
+            verbose,
+            margin: 0,
+            lines: vec![String::new()],
+        }
+    }
+
+    fn normal() -> Self {
+        Self::new(false)
+    }
+
+    fn verbose() -> Self {
+        Self::new(true)
+    }
+
+    fn cur(&mut self) -> &mut String {
+        self.lines.last_mut().unwrap()
+    }
+
+    pub fn new_line(&mut self) {
+        self.lines.push(String::new());
+    }
+
+    pub fn write(&mut self, s: impl AsRef<str>) {
+        let margin = self.margin;
+        let cur = self.cur();
+        if cur.is_empty() {
+            (0..margin).for_each(|_| cur.push(' '));
+        }
+        cur.push_str(s.as_ref());
+    }
+
+    pub fn writeln(&mut self, s: impl AsRef<str>) {
+        self.write(s);
+        self.new_line();
+    }
+
+    pub fn indent<F: FnOnce(&mut AstWriter)>(&mut self, inc: usize, f: F) {
+        self.new_line();
+        self.margin += inc;
+        f(self);
+        self.margin -= inc;
+        self.new_line();
+    }
+
+    pub fn block<F: FnOnce(&mut AstWriter)>(&mut self, f: F) {
+        self.write(" {");
+        self.indent(4, f);
+        self.write("}");
+    }
+
+    pub fn annotate<F: FnOnce(&mut AstWriter), Annot: AstDebug>(&mut self, f: F, annot: &Annot) {
+        self.annotate_gen(f, annot, |w, annot| annot.ast_debug(w))
+    }
+
+    pub fn annotate_gen<
+        F: FnOnce(&mut AstWriter),
+        Annot,
+        FAnnot: FnOnce(&mut AstWriter, &Annot),
+    >(
+        &mut self,
+        f: F,
+        annot: &Annot,
+        annot_writer: FAnnot,
+    ) {
+        if self.verbose {
+            self.write("(");
+        }
+        f(self);
+        if self.verbose {
+            self.write(": ");
+            annot_writer(self, annot);
+            self.write(")");
+        }
+    }
+
+    pub fn list<T, F: FnMut(&mut AstWriter, T) -> bool>(
+        &mut self,
+        items: impl std::iter::IntoIterator<Item = T>,
+        sep: &str,
+        mut f: F,
+    ) {
+        let iter = items.into_iter();
+        let len = match iter.size_hint() {
+            (lower, None) => {
+                assert!(lower == 0);
+                return;
+            }
+            (_, Some(len)) => len,
+        };
+        for (idx, item) in iter.enumerate() {
+            let needs_newline = f(self, item);
+            if idx + 1 != len {
+                self.write(sep);
+                if needs_newline {
+                    self.new_line()
+                }
+            }
+        }
+    }
+
+    pub fn comma<T, F: FnMut(&mut AstWriter, T)>(
+        &mut self,
+        items: impl std::iter::IntoIterator<Item = T>,
+        mut f: F,
+    ) {
+        self.list(items, ", ", |w, item| {
+            f(w, item);
+            false
+        })
+    }
+
+    pub fn semicolon<T, F: FnMut(&mut AstWriter, T)>(
+        &mut self,
+        items: impl std::iter::IntoIterator<Item = T>,
+        mut f: F,
+    ) {
+        self.list(items, ";", |w, item| {
+            f(w, item);
+            true
+        })
+    }
+}
+
+impl Display for AstWriter {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        for line in &self.lines {
+            writeln!(f, "{}", line)?;
+        }
+        Ok(())
+    }
+}
+
+impl<T: AstDebug> AstDebug for move_ir_types::location::Spanned<T> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.value.ast_debug(w)
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+pub struct DisplayWrapper<'a, T: AstDebug>(pub &'a T, /* verbose */ pub bool);
+
+impl<T: AstDebug> Display for DisplayWrapper<'_, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let mut writer = if self.1 {
+            AstWriter::verbose()
+        } else {
+            AstWriter::normal()
+        };
+        self.0.ast_debug(&mut writer);
+        writer.fmt(f)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/mod.rs b/vendors/move/crates/move-compiler/src/shared/mod.rs
new file mode 100644
index 000000000..79de6a15a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/mod.rs
@@ -0,0 +1,1090 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::visitor::{AbsIntVisitorObj, AbstractInterpreterVisitor},
+    command_line as cli,
+    diagnostics::{
+        codes::{Category, Declarations, DiagnosticsID, Severity, UnusedItem, WarningFilter},
+        Diagnostic, Diagnostics, WarningFilters,
+    },
+    editions::{
+        check_feature as edition_check_feature, Edition, FeatureGate, Flavor, SyntaxEdition,
+    },
+    expansion::ast as E,
+    naming::ast as N,
+    naming::ast::ModuleDefinition,
+    sui_mode,
+    typing::visitor::{TypingVisitor, TypingVisitorObj},
+};
+use clap::*;
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use petgraph::{algo::astar as petgraph_astar, graphmap::DiGraphMap};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+    hash::Hash,
+    rc::Rc,
+    sync::atomic::{AtomicUsize, Ordering as AtomicOrdering},
+};
+
+pub mod ast_debug;
+pub mod program_info;
+pub mod remembering_unique_map;
+pub mod unique_map;
+pub mod unique_set;
+
+//**************************************************************************************************
+// Numbers
+//**************************************************************************************************
+
+pub use move_command_line_common::parser::{
+    parse_address_number as parse_address, parse_u128, parse_u16, parse_u256, parse_u32, parse_u64,
+    parse_u8, NumberFormat,
+};
+
+//**************************************************************************************************
+// Address
+//**************************************************************************************************
+
+pub use move_command_line_common::address::NumericalAddress;
+
+pub fn parse_named_address(s: &str) -> anyhow::Result<(String, NumericalAddress)> {
+    let before_after = s.split('=').collect::<Vec<_>>();
+
+    if before_after.len() != 2 {
+        anyhow::bail!(
+            "Invalid named address assignment. Must be of the form <address_name>=<address>, but \
+             found '{}'",
+            s
+        );
+    }
+    let name = before_after[0].parse()?;
+    let addr = NumericalAddress::parse_str(before_after[1])
+        .map_err(|err| anyhow::format_err!("{}", err))?;
+
+    Ok((name, addr))
+}
+
+//**************************************************************************************************
+// Name
+//**************************************************************************************************
+
+pub trait TName: Eq + Ord + Clone {
+    type Key: Ord + Clone;
+    type Loc: Copy;
+    fn drop_loc(self) -> (Self::Loc, Self::Key);
+    fn add_loc(loc: Self::Loc, key: Self::Key) -> Self;
+    fn borrow(&self) -> (&Self::Loc, &Self::Key);
+}
+
+pub trait Identifier {
+    fn value(&self) -> Symbol;
+    fn loc(&self) -> Loc;
+}
+
+// TODO maybe we should intern these strings somehow
+pub type Name = Spanned<Symbol>;
+
+impl TName for Name {
+    type Key = Symbol;
+    type Loc = Loc;
+
+    fn drop_loc(self) -> (Loc, Symbol) {
+        (self.loc, self.value)
+    }
+
+    fn add_loc(loc: Loc, key: Symbol) -> Self {
+        sp(loc, key)
+    }
+
+    fn borrow(&self) -> (&Loc, &Symbol) {
+        (&self.loc, &self.value)
+    }
+}
+
+//**************************************************************************************************
+// Graphs
+//**************************************************************************************************
+
+pub fn shortest_cycle<'a, T: Ord + Hash>(
+    dependency_graph: &DiGraphMap<&'a T, ()>,
+    start: &'a T,
+) -> Vec<&'a T> {
+    let shortest_path = dependency_graph
+        .neighbors(start)
+        .fold(None, |shortest_path, neighbor| {
+            let path_opt = petgraph_astar(
+                dependency_graph,
+                neighbor,
+                |finish| finish == start,
+                |_e| 1,
+                |_| 0,
+            );
+            match (shortest_path, path_opt) {
+                (p, None) | (None, p) => p,
+                (Some((acc_len, acc_path)), Some((cur_len, cur_path))) => {
+                    Some(if cur_len < acc_len {
+                        (cur_len, cur_path)
+                    } else {
+                        (acc_len, acc_path)
+                    })
+                }
+            }
+        });
+    let (_, mut path) = shortest_path.unwrap();
+    path.insert(0, start);
+    path
+}
+
+//**************************************************************************************************
+// Compilation Env
+//**************************************************************************************************
+
+pub const FILTER_ALL: &str = "all";
+pub const FILTER_UNUSED: &str = "unused";
+pub const FILTER_MISSING_PHANTOM: &str = "missing_phantom";
+pub const FILTER_UNUSED_USE: &str = "unused_use";
+pub const FILTER_UNUSED_VARIABLE: &str = "unused_variable";
+pub const FILTER_UNUSED_ASSIGNMENT: &str = "unused_assignment";
+pub const FILTER_UNUSED_TRAILING_SEMI: &str = "unused_trailing_semi";
+pub const FILTER_UNUSED_ATTRIBUTE: &str = "unused_attribute";
+pub const FILTER_UNUSED_TYPE_PARAMETER: &str = "unused_type_parameter";
+pub const FILTER_UNUSED_FUNCTION: &str = "unused_function";
+pub const FILTER_UNUSED_STRUCT_FIELD: &str = "unused_field";
+pub const FILTER_UNUSED_CONST: &str = "unused_const";
+pub const FILTER_DEAD_CODE: &str = "dead_code";
+pub const FILTER_UNUSED_LET_MUT: &str = "unused_let_mut";
+pub const FILTER_UNUSED_MUT_REF: &str = "unused_mut_ref";
+pub const FILTER_UNUSED_MUT_PARAM: &str = "unused_mut_parameter";
+
+pub type NamedAddressMap = BTreeMap<Symbol, NumericalAddress>;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub struct NamedAddressMapIndex(usize);
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct NamedAddressMaps(Vec<NamedAddressMap>);
+
+impl NamedAddressMaps {
+    pub fn new() -> Self {
+        Self(vec![])
+    }
+
+    pub fn insert(&mut self, m: NamedAddressMap) -> NamedAddressMapIndex {
+        let index = self.0.len();
+        self.0.push(m);
+        NamedAddressMapIndex(index)
+    }
+
+    pub fn get(&self, idx: NamedAddressMapIndex) -> &NamedAddressMap {
+        &self.0[idx.0]
+    }
+
+    pub fn all(&self) -> &[NamedAddressMap] {
+        &self.0
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct PackagePaths<Path: Into<Symbol> = Symbol, NamedAddress: Into<Symbol> = Symbol> {
+    pub name: Option<(Symbol, PackageConfig)>,
+    pub paths: Vec<Path>,
+    pub named_address_map: BTreeMap<NamedAddress, NumericalAddress>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct IndexedPackagePath {
+    pub package: Option<Symbol>,
+    pub path: Symbol,
+    pub named_address_map: NamedAddressMapIndex,
+}
+
+pub type AttributeDeriver = dyn Fn(&mut CompilationEnv, &mut ModuleDefinition);
+
+/// Filter info for example filter #[allow(unused_function)] would have `name` to be
+/// `unused_function` and `attribute_name` to be `allow`
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct KnownFilterInfo {
+    name: Symbol,
+    attribute_name: E::AttributeName_,
+}
+
+impl KnownFilterInfo {
+    pub fn new(n: impl Into<Symbol>, attribute_name: E::AttributeName_) -> Self {
+        let name = n.into();
+        KnownFilterInfo {
+            name,
+            attribute_name,
+        }
+    }
+}
+
+pub struct CompilationEnv {
+    flags: Flags,
+    // filters warnings when added.
+    warning_filter: Vec<WarningFilters>,
+    diags: Diagnostics,
+    visitors: Rc<Visitors>,
+    package_configs: BTreeMap<Symbol, PackageConfig>,
+    /// Config for any package not found in `package_configs`, or for inputs without a package.
+    default_config: PackageConfig,
+    /// Maps warning filter key (filter name and filter attribute name) to the filter itself.
+    known_filters: BTreeMap<KnownFilterInfo, BTreeSet<WarningFilter>>,
+    /// Maps a diagnostics ID to a known filter name.
+    known_filter_names: BTreeMap<DiagnosticsID, KnownFilterInfo>,
+    /// Attribute names (including externally provided ones) identifying known warning filters.
+    known_filter_attributes: BTreeSet<E::AttributeName_>,
+    prim_definers:
+        BTreeMap<crate::naming::ast::BuiltinTypeName_, crate::expansion::ast::ModuleIdent>,
+    // TODO(tzakian): Remove the global counter and use this counter instead
+    // pub counter: u64,
+}
+
+macro_rules! known_code_filter {
+    ($name:ident, $category:ident::$code:ident, $attr_name:ident) => {
+        (
+            KnownFilterInfo::new($name, $attr_name),
+            BTreeSet::from([WarningFilter::Code {
+                prefix: None,
+                category: Category::$category as u8,
+                code: $category::$code as u8,
+                name: Some($name),
+            }]),
+        )
+    };
+}
+
+impl CompilationEnv {
+    pub fn new(
+        flags: Flags,
+        mut visitors: Vec<cli::compiler::Visitor>,
+        package_configs: BTreeMap<Symbol, PackageConfig>,
+        default_config: Option<PackageConfig>,
+    ) -> Self {
+        visitors.extend([
+            sui_mode::id_leak::IDLeakVerifier.visitor(),
+            sui_mode::typing::SuiTypeChecks.visitor(),
+        ]);
+        let filter_attr_name =
+            E::AttributeName_::Known(known_attributes::KnownAttribute::Diagnostic(
+                known_attributes::DiagnosticAttribute::Allow,
+            ));
+        let filter_attributes = BTreeSet::from([filter_attr_name]);
+        let known_filters = BTreeMap::from([
+            (
+                KnownFilterInfo::new(FILTER_ALL, filter_attr_name),
+                BTreeSet::from([WarningFilter::All(None)]),
+            ),
+            (
+                KnownFilterInfo::new(FILTER_UNUSED, filter_attr_name),
+                BTreeSet::from([WarningFilter::Category {
+                    prefix: None,
+                    category: Category::UnusedItem as u8,
+                    name: Some(FILTER_UNUSED),
+                }]),
+            ),
+            known_code_filter!(
+                FILTER_MISSING_PHANTOM,
+                Declarations::InvalidNonPhantomUse,
+                filter_attr_name
+            ),
+            known_code_filter!(FILTER_UNUSED_USE, UnusedItem::Alias, filter_attr_name),
+            known_code_filter!(
+                FILTER_UNUSED_VARIABLE,
+                UnusedItem::Variable,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_ASSIGNMENT,
+                UnusedItem::Assignment,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_TRAILING_SEMI,
+                UnusedItem::TrailingSemi,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_ATTRIBUTE,
+                UnusedItem::Attribute,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_FUNCTION,
+                UnusedItem::Function,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_STRUCT_FIELD,
+                UnusedItem::StructField,
+                filter_attr_name
+            ),
+            (
+                KnownFilterInfo::new(FILTER_UNUSED_TYPE_PARAMETER, filter_attr_name),
+                BTreeSet::from([
+                    WarningFilter::Code {
+                        prefix: None,
+                        category: Category::UnusedItem as u8,
+                        code: UnusedItem::StructTypeParam as u8,
+                        name: Some(FILTER_UNUSED_TYPE_PARAMETER),
+                    },
+                    WarningFilter::Code {
+                        prefix: None,
+                        category: Category::UnusedItem as u8,
+                        code: UnusedItem::FunTypeParam as u8,
+                        name: Some(FILTER_UNUSED_TYPE_PARAMETER),
+                    },
+                ]),
+            ),
+            known_code_filter!(FILTER_UNUSED_CONST, UnusedItem::Constant, filter_attr_name),
+            known_code_filter!(FILTER_DEAD_CODE, UnusedItem::DeadCode, filter_attr_name),
+            known_code_filter!(
+                FILTER_UNUSED_LET_MUT,
+                UnusedItem::MutModifier,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_MUT_REF,
+                UnusedItem::MutReference,
+                filter_attr_name
+            ),
+            known_code_filter!(
+                FILTER_UNUSED_MUT_PARAM,
+                UnusedItem::MutParam,
+                filter_attr_name
+            ),
+        ]);
+
+        let known_filter_names: BTreeMap<DiagnosticsID, KnownFilterInfo> = known_filters
+            .iter()
+            .flat_map(|(known_filter_info, filters)| {
+                filters.iter().filter_map(|v| {
+                    if let WarningFilter::Code {
+                        prefix,
+                        category,
+                        code,
+                        ..
+                    } = v
+                    {
+                        Some(((*prefix, *category, *code), known_filter_info.clone()))
+                    } else {
+                        None
+                    }
+                })
+            })
+            .collect();
+
+        let warning_filter = if flags.silence_warnings() {
+            let mut f = WarningFilters::new_for_source();
+            f.add(WarningFilter::All(None));
+            vec![f]
+        } else {
+            vec![]
+        };
+        Self {
+            flags,
+            warning_filter,
+            diags: Diagnostics::new(),
+            visitors: Rc::new(Visitors::new(visitors)),
+            package_configs,
+            default_config: default_config.unwrap_or_default(),
+            known_filters,
+            known_filter_names,
+            known_filter_attributes: filter_attributes,
+            prim_definers: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_diag(&mut self, mut diag: Diagnostic) {
+        let filter = self.warning_filter.last();
+        let is_filtered = filter
+            .map(|filter| filter.is_filtered(&diag))
+            .unwrap_or(false);
+        if !is_filtered {
+            // add help to suppress warning, if applicable
+            // TODO do we want a centralized place for tips like this?
+            if diag.info().severity() == Severity::Warning {
+                if let Some(filter_info) = self.known_filter_names.get(&diag.info().id()) {
+                    let help = format!(
+                        "This warning can be suppressed with '#[{}({})]' \
+                         applied to the 'module' or module member ('const', 'fun', or 'struct')",
+                        filter_info.attribute_name.name(),
+                        filter_info.name.as_str()
+                    );
+                    diag.add_note(help)
+                }
+                if self.flags().warnings_are_errors() {
+                    diag = diag.set_severity(Severity::NonblockingError)
+                }
+            }
+            self.diags.add(diag)
+        } else if !filter.unwrap().for_dependency() {
+            // unwrap above is safe as the filter has been used (thus it must exist)
+            self.diags.add_source_filtered(diag)
+        }
+    }
+
+    pub fn add_diags(&mut self, diags: Diagnostics) {
+        for diag in diags.into_vec() {
+            self.add_diag(diag)
+        }
+    }
+
+    pub fn has_warnings_or_errors(&self) -> bool {
+        !self.diags.is_empty()
+    }
+
+    pub fn has_errors(&self) -> bool {
+        // Non-blocking Error is the min level considered an error
+        self.has_diags_at_or_above_severity(Severity::NonblockingError)
+    }
+
+    pub fn count_diags(&self) -> usize {
+        self.diags.len()
+    }
+
+    pub fn has_diags_at_or_above_severity(&self, threshold: Severity) -> bool {
+        match self.diags.max_severity() {
+            Some(max) if max >= threshold => true,
+            Some(_) | None => false,
+        }
+    }
+
+    pub fn check_diags_at_or_above_severity(
+        &mut self,
+        threshold: Severity,
+    ) -> Result<(), Diagnostics> {
+        if self.has_diags_at_or_above_severity(threshold) {
+            Err(std::mem::take(&mut self.diags))
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Should only be called after compilation is finished
+    pub fn take_final_warning_diags(&mut self) -> Diagnostics {
+        let final_diags = std::mem::take(&mut self.diags);
+        debug_assert!(final_diags
+            .max_severity()
+            .map(|s| s == Severity::Warning)
+            .unwrap_or(true));
+        final_diags
+    }
+
+    /// Add a new filter for warnings
+    pub fn add_warning_filter_scope(&mut self, mut filter: WarningFilters) {
+        // This essentially "clones" the current filter into the next scope. This should be
+        // efficient enough since the diag_filter vec should be only about 2 or 3 elements deep
+        // and the size of the filter should only be relatively small (at most 10 or so elements)
+        debug_assert!(
+            self.warning_filter.len() <= 3,
+            "TODO If triggered this TODO you might want to make this more efficient"
+        );
+        if let Some(cur_filter) = self.warning_filter.last() {
+            filter.union(cur_filter)
+        }
+        self.warning_filter.push(filter)
+    }
+
+    pub fn pop_warning_filter_scope(&mut self) {
+        self.warning_filter.pop().unwrap();
+    }
+
+    pub fn filter_from_str(
+        &self,
+        name: impl Into<Symbol>,
+        attribute_name: E::AttributeName_,
+    ) -> BTreeSet<WarningFilter> {
+        self.known_filters
+            .get(&KnownFilterInfo::new(name, attribute_name))
+            .cloned()
+            .unwrap_or_default()
+    }
+
+    pub fn filter_attributes(&self) -> &BTreeSet<E::AttributeName_> {
+        &self.known_filter_attributes
+    }
+
+    pub fn add_custom_known_filters(
+        &mut self,
+        filters: Vec<WarningFilter>,
+        filter_attr_name: E::AttributeName_,
+    ) -> anyhow::Result<()> {
+        self.known_filter_attributes.insert(filter_attr_name);
+        for filter in filters {
+            match filter {
+                WarningFilter::All(_) => {
+                    self.known_filters
+                        .entry(KnownFilterInfo::new(FILTER_ALL, filter_attr_name))
+                        .or_default()
+                        .insert(filter);
+                }
+                WarningFilter::Category { name, .. } => {
+                    let Some(n) = name else {
+                        anyhow::bail!("A known Category warning filter must have a name specified");
+                    };
+                    self.known_filters
+                        .entry(KnownFilterInfo::new(n, filter_attr_name))
+                        .or_default()
+                        .insert(filter);
+                }
+                WarningFilter::Code {
+                    prefix,
+                    category,
+                    code,
+                    name,
+                } => {
+                    let Some(n) = name else {
+                        anyhow::bail!("A known Code warning filter must have a name specified");
+                    };
+                    let known_filter_info = KnownFilterInfo::new(n, filter_attr_name);
+                    self.known_filters
+                        .entry(known_filter_info.clone())
+                        .or_default()
+                        .insert(filter);
+                    self.known_filter_names
+                        .insert((prefix, category, code), known_filter_info);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn flags(&self) -> &Flags {
+        &self.flags
+    }
+
+    pub fn visitors(&self) -> Rc<Visitors> {
+        self.visitors.clone()
+    }
+
+    // Logs an error if the feature isn't supported. Returns `false` if the feature is not
+    // supported, and `true` otherwise.
+    pub fn check_feature(
+        &mut self,
+        feature: FeatureGate,
+        package: Option<Symbol>,
+        loc: Loc,
+    ) -> bool {
+        edition_check_feature(self, self.package_config(package).edition, feature, loc)
+    }
+
+    pub fn supports_feature(&self, package: Option<Symbol>, feature: FeatureGate) -> bool {
+        self.package_config(package).edition.supports(feature)
+    }
+
+    pub fn syntax_edition(&self, package: Option<Symbol>) -> SyntaxEdition {
+        self.package_config(package).edition.syntax()
+    }
+
+    pub fn package_config(&self, package: Option<Symbol>) -> &PackageConfig {
+        package
+            .and_then(|p| self.package_configs.get(&p))
+            .unwrap_or(&self.default_config)
+    }
+
+    pub fn set_primitive_type_definers(
+        &mut self,
+        m: BTreeMap<N::BuiltinTypeName_, E::ModuleIdent>,
+    ) {
+        self.prim_definers = m
+    }
+
+    pub fn primitive_definer(&self, t: N::BuiltinTypeName_) -> Option<&E::ModuleIdent> {
+        self.prim_definers.get(&t)
+    }
+}
+
+//**************************************************************************************************
+// Counter
+//**************************************************************************************************
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct Counter(usize);
+
+impl Counter {
+    pub fn next() -> u64 {
+        static COUNTER_NEXT: AtomicUsize = AtomicUsize::new(0);
+
+        COUNTER_NEXT.fetch_add(1, AtomicOrdering::AcqRel) as u64
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+pub fn format_delim<T: fmt::Display, I: IntoIterator<Item = T>>(items: I, delim: &str) -> String {
+    items
+        .into_iter()
+        .map(|item| format!("{}", item))
+        .collect::<Vec<_>>()
+        .join(delim)
+}
+
+pub fn format_comma<T: fmt::Display, I: IntoIterator<Item = T>>(items: I) -> String {
+    format_delim(items, ", ")
+}
+
+//**************************************************************************************************
+// Flags
+//**************************************************************************************************
+
+#[derive(Clone, Debug, Eq, PartialEq, Parser)]
+pub struct Flags {
+    /// Compile in test mode
+    #[clap(
+        short = cli::TEST_SHORT,
+        long = cli::TEST,
+    )]
+    test: bool,
+
+    /// Compile in verification mode
+    #[clap(
+        short = cli::VERIFY_SHORT,
+        long = cli::VERIFY,
+    )]
+    verify: bool,
+
+    /// If set, warnings become errors.
+    #[clap(
+        long = cli::WARNINGS_ARE_ERRORS,
+    )]
+    warnings_are_errors: bool,
+
+    /// If set, all warnings are silenced
+    #[clap(
+        long = cli::SILENCE_WARNINGS,
+        short = cli::SILENCE_WARNINGS_SHORT,
+    )]
+    silence_warnings: bool,
+
+    /// If set, source files will not shadow dependency files. If the same file is passed to both,
+    /// an error will be raised
+    #[clap(
+        name = "SOURCES_SHADOW_DEPS",
+        short = cli::SHADOW_SHORT,
+        long = cli::SHADOW,
+    )]
+    shadow: bool,
+
+    /// Bytecode version.
+    #[clap(
+        long = cli::BYTECODE_VERSION,
+    )]
+    bytecode_version: Option<u32>,
+
+    /// Internal flag used by the model builder to maintain functions which would be otherwise
+    /// included only in tests, without creating the unit test code regular tests do.
+    #[clap(skip)]
+    keep_testing_functions: bool,
+}
+
+impl Flags {
+    pub fn empty() -> Self {
+        Self {
+            test: false,
+            verify: false,
+            shadow: false,
+            bytecode_version: None,
+            warnings_are_errors: false,
+            silence_warnings: false,
+            keep_testing_functions: false,
+        }
+    }
+
+    pub fn testing() -> Self {
+        Self {
+            test: true,
+            verify: false,
+            shadow: false,
+            bytecode_version: None,
+            warnings_are_errors: false,
+            silence_warnings: false,
+            keep_testing_functions: false,
+        }
+    }
+
+    pub fn verification() -> Self {
+        Self {
+            test: false,
+            verify: true,
+            shadow: true, // allows overlapping between sources and deps
+            bytecode_version: None,
+            warnings_are_errors: false,
+            silence_warnings: false,
+            keep_testing_functions: false,
+        }
+    }
+
+    pub fn set_keep_testing_functions(self, value: bool) -> Self {
+        Self {
+            keep_testing_functions: value,
+            ..self
+        }
+    }
+
+    pub fn set_sources_shadow_deps(self, sources_shadow_deps: bool) -> Self {
+        Self {
+            shadow: sources_shadow_deps,
+            ..self
+        }
+    }
+
+    pub fn set_warnings_are_errors(self, value: bool) -> Self {
+        Self {
+            warnings_are_errors: value,
+            ..self
+        }
+    }
+
+    pub fn set_silence_warnings(self, value: bool) -> Self {
+        Self {
+            silence_warnings: value,
+            ..self
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self == &Self::empty()
+    }
+
+    pub fn is_testing(&self) -> bool {
+        self.test
+    }
+
+    pub fn keep_testing_functions(&self) -> bool {
+        self.test || self.keep_testing_functions
+    }
+
+    pub fn is_verification(&self) -> bool {
+        self.verify
+    }
+
+    pub fn sources_shadow_deps(&self) -> bool {
+        self.shadow
+    }
+
+    pub fn bytecode_version(&self) -> Option<u32> {
+        self.bytecode_version
+    }
+
+    pub fn warnings_are_errors(&self) -> bool {
+        self.warnings_are_errors
+    }
+
+    pub fn silence_warnings(&self) -> bool {
+        self.silence_warnings
+    }
+}
+
+//**************************************************************************************************
+// Package Level Config
+//**************************************************************************************************
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub struct PackageConfig {
+    pub is_dependency: bool,
+    pub warning_filter: WarningFilters,
+    pub flavor: Flavor,
+    pub edition: Edition,
+}
+
+impl Default for PackageConfig {
+    fn default() -> Self {
+        Self {
+            is_dependency: false,
+            warning_filter: WarningFilters::new_for_source(),
+            flavor: Flavor::default(),
+            edition: Edition::default(),
+        }
+    }
+}
+
+//**************************************************************************************************
+// Visitors
+//**************************************************************************************************
+
+pub struct Visitors {
+    pub typing: Vec<RefCell<TypingVisitorObj>>,
+    pub abs_int: Vec<RefCell<AbsIntVisitorObj>>,
+}
+
+impl Visitors {
+    pub fn new(passes: Vec<cli::compiler::Visitor>) -> Self {
+        use cli::compiler::Visitor;
+        let mut vs = Visitors {
+            typing: vec![],
+            abs_int: vec![],
+        };
+        for pass in passes {
+            match pass {
+                Visitor::AbsIntVisitor(f) => vs.abs_int.push(RefCell::new(f)),
+                Visitor::TypingVisitor(f) => vs.typing.push(RefCell::new(f)),
+            }
+        }
+        vs
+    }
+}
+
+//**************************************************************************************************
+// Attributes
+//**************************************************************************************************
+
+pub mod known_attributes {
+    use once_cell::sync::Lazy;
+    use std::{collections::BTreeSet, fmt};
+
+    use crate::diagnostics::codes::WARNING_FILTER_ATTR;
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum AttributePosition {
+        AddressBlock,
+        Module,
+        Script,
+        Use,
+        Friend,
+        Constant,
+        Struct,
+        Function,
+        Spec,
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum KnownAttribute {
+        Testing(TestingAttribute),
+        Verification(VerificationAttribute),
+        Native(NativeAttribute),
+        Diagnostic(DiagnosticAttribute),
+        DefinesPrimitive(DefinesPrimitive),
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum TestingAttribute {
+        // Can be called by other testing code, and included in compilation in test mode
+        TestOnly,
+        // Is a test that will be run
+        Test,
+        // This test is expected to fail
+        ExpectedFailure,
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum VerificationAttribute {
+        // The associated AST node will be included in the compilation in prove mode
+        VerifyOnly,
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum NativeAttribute {
+        // It is a fake native function that actually compiles to a bytecode instruction
+        BytecodeInstruction,
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum DiagnosticAttribute {
+        Allow,
+    }
+
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub struct DefinesPrimitive;
+
+    impl fmt::Display for AttributePosition {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self {
+                Self::AddressBlock => write!(f, "address block"),
+                Self::Module => write!(f, "module"),
+                Self::Script => write!(f, "script"),
+                Self::Use => write!(f, "use"),
+                Self::Friend => write!(f, "friend"),
+                Self::Constant => write!(f, "constant"),
+                Self::Struct => write!(f, "struct"),
+                Self::Function => write!(f, "function"),
+                Self::Spec => write!(f, "spec"),
+            }
+        }
+    }
+
+    impl KnownAttribute {
+        pub fn resolve(attribute_str: impl AsRef<str>) -> Option<Self> {
+            Some(match attribute_str.as_ref() {
+                TestingAttribute::TEST => Self::Testing(TestingAttribute::Test),
+                TestingAttribute::TEST_ONLY => Self::Testing(TestingAttribute::TestOnly),
+                TestingAttribute::EXPECTED_FAILURE => {
+                    Self::Testing(TestingAttribute::ExpectedFailure)
+                }
+                VerificationAttribute::VERIFY_ONLY => {
+                    Self::Verification(VerificationAttribute::VerifyOnly)
+                }
+                NativeAttribute::BYTECODE_INSTRUCTION => {
+                    Self::Native(NativeAttribute::BytecodeInstruction)
+                }
+                DiagnosticAttribute::ALLOW => Self::Diagnostic(DiagnosticAttribute::Allow),
+                DefinesPrimitive::DEFINES_PRIM => Self::DefinesPrimitive(DefinesPrimitive),
+                _ => return None,
+            })
+        }
+
+        pub const fn name(&self) -> &str {
+            match self {
+                Self::Testing(a) => a.name(),
+                Self::Verification(a) => a.name(),
+                Self::Native(a) => a.name(),
+                Self::Diagnostic(a) => a.name(),
+                Self::DefinesPrimitive(a) => a.name(),
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            match self {
+                Self::Testing(a) => a.expected_positions(),
+                Self::Verification(a) => a.expected_positions(),
+                Self::Native(a) => a.expected_positions(),
+                Self::Diagnostic(a) => a.expected_positions(),
+                Self::DefinesPrimitive(a) => a.expected_positions(),
+            }
+        }
+    }
+
+    impl TestingAttribute {
+        pub const TEST: &'static str = "test";
+        pub const EXPECTED_FAILURE: &'static str = "expected_failure";
+        pub const TEST_ONLY: &'static str = "test_only";
+        pub const ABORT_CODE_NAME: &'static str = "abort_code";
+        pub const ARITHMETIC_ERROR_NAME: &'static str = "arithmetic_error";
+        pub const VECTOR_ERROR_NAME: &'static str = "vector_error";
+        pub const OUT_OF_GAS_NAME: &'static str = "out_of_gas";
+        pub const MAJOR_STATUS_NAME: &'static str = "major_status";
+        pub const MINOR_STATUS_NAME: &'static str = "minor_status";
+        pub const ERROR_LOCATION: &'static str = "location";
+
+        pub const fn name(&self) -> &str {
+            match self {
+                Self::Test => Self::TEST,
+                Self::TestOnly => Self::TEST_ONLY,
+                Self::ExpectedFailure => Self::EXPECTED_FAILURE,
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static TEST_ONLY_POSITIONS: Lazy<BTreeSet<AttributePosition>> = Lazy::new(|| {
+                BTreeSet::from([
+                    AttributePosition::AddressBlock,
+                    AttributePosition::Module,
+                    AttributePosition::Use,
+                    AttributePosition::Friend,
+                    AttributePosition::Constant,
+                    AttributePosition::Struct,
+                    AttributePosition::Function,
+                ])
+            });
+            static TEST_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
+                Lazy::new(|| BTreeSet::from([AttributePosition::Function]));
+            static EXPECTED_FAILURE_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
+                Lazy::new(|| BTreeSet::from([AttributePosition::Function]));
+            match self {
+                TestingAttribute::TestOnly => &TEST_ONLY_POSITIONS,
+                TestingAttribute::Test => &TEST_POSITIONS,
+                TestingAttribute::ExpectedFailure => &EXPECTED_FAILURE_POSITIONS,
+            }
+        }
+
+        pub fn expected_failure_cases() -> &'static [&'static str] {
+            &[
+                Self::ABORT_CODE_NAME,
+                Self::ARITHMETIC_ERROR_NAME,
+                Self::VECTOR_ERROR_NAME,
+                Self::OUT_OF_GAS_NAME,
+                Self::MAJOR_STATUS_NAME,
+            ]
+        }
+    }
+
+    impl VerificationAttribute {
+        pub const VERIFY_ONLY: &'static str = "verify_only";
+
+        pub const fn name(&self) -> &str {
+            match self {
+                Self::VerifyOnly => Self::VERIFY_ONLY,
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static VERIFY_ONLY_POSITIONS: Lazy<BTreeSet<AttributePosition>> = Lazy::new(|| {
+                BTreeSet::from([
+                    AttributePosition::AddressBlock,
+                    AttributePosition::Module,
+                    AttributePosition::Use,
+                    AttributePosition::Friend,
+                    AttributePosition::Constant,
+                    AttributePosition::Struct,
+                    AttributePosition::Function,
+                ])
+            });
+            match self {
+                Self::VerifyOnly => &VERIFY_ONLY_POSITIONS,
+            }
+        }
+    }
+
+    impl NativeAttribute {
+        pub const BYTECODE_INSTRUCTION: &'static str = "bytecode_instruction";
+
+        pub const fn name(&self) -> &str {
+            match self {
+                NativeAttribute::BytecodeInstruction => Self::BYTECODE_INSTRUCTION,
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static BYTECODE_INSTRUCTION_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
+                Lazy::new(|| IntoIterator::into_iter([AttributePosition::Function]).collect());
+            match self {
+                NativeAttribute::BytecodeInstruction => &BYTECODE_INSTRUCTION_POSITIONS,
+            }
+        }
+    }
+
+    impl DiagnosticAttribute {
+        pub const ALLOW: &'static str = WARNING_FILTER_ATTR;
+
+        pub const fn name(&self) -> &str {
+            match self {
+                DiagnosticAttribute::Allow => Self::ALLOW,
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static ALLOW_WARNING_POSITIONS: Lazy<BTreeSet<AttributePosition>> = Lazy::new(|| {
+                BTreeSet::from([
+                    AttributePosition::Module,
+                    AttributePosition::Script,
+                    AttributePosition::Constant,
+                    AttributePosition::Struct,
+                    AttributePosition::Function,
+                ])
+            });
+            match self {
+                DiagnosticAttribute::Allow => &ALLOW_WARNING_POSITIONS,
+            }
+        }
+    }
+
+    impl DefinesPrimitive {
+        pub const DEFINES_PRIM: &'static str = "defines_primitive";
+
+        pub const fn name(&self) -> &str {
+            Self::DEFINES_PRIM
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static DEFINES_PRIM_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
+                Lazy::new(|| IntoIterator::into_iter([AttributePosition::Module]).collect());
+            &DEFINES_PRIM_POSITIONS
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/program_info.rs b/vendors/move/crates/move-compiler/src/shared/program_info.rs
new file mode 100644
index 000000000..829081b56
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/program_info.rs
@@ -0,0 +1,185 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeMap;
+
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+
+use crate::{
+    expansion::ast::{AbilitySet, Attributes, ModuleIdent, Visibility},
+    naming::ast::{
+        self as N, FunctionSignature, ResolvedUseFuns, StructDefinition, StructTypeParameter, Type,
+    },
+    parser::ast::{ConstantName, FunctionName, StructName},
+    shared::unique_map::UniqueMap,
+    shared::*,
+    typing::ast::{self as T},
+    FullyCompiledProgram,
+};
+
+#[derive(Debug, Clone)]
+pub struct FunctionInfo {
+    pub attributes: Attributes,
+    pub defined_loc: Loc,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+}
+
+#[derive(Debug, Clone)]
+pub struct ConstantInfo {
+    pub attributes: Attributes,
+    pub defined_loc: Loc,
+    pub signature: Type,
+}
+
+#[derive(Debug, Clone)]
+pub struct ModuleInfo {
+    pub attributes: Attributes,
+    pub package: Option<Symbol>,
+    pub use_funs: ResolvedUseFuns,
+    pub friends: UniqueMap<ModuleIdent, Loc>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub functions: UniqueMap<FunctionName, FunctionInfo>,
+    pub constants: UniqueMap<ConstantName, ConstantInfo>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProgramInfo<const AFTER_TYPING: bool> {
+    pub modules: UniqueMap<ModuleIdent, ModuleInfo>,
+}
+pub type NamingProgramInfo = ProgramInfo<false>;
+pub type TypingProgramInfo = ProgramInfo<true>;
+
+macro_rules! program_info {
+    ($pre_compiled_lib:ident, $prog:ident, $pass:ident, $module_use_funs:ident) => {{
+        let all_modules = $prog.modules.key_cloned_iter();
+        let mut modules = UniqueMap::maybe_from_iter(all_modules.map(|(mident, mdef)| {
+            let structs = mdef.structs.clone();
+            let functions = mdef.functions.ref_map(|fname, fdef| FunctionInfo {
+                attributes: fdef.attributes.clone(),
+                defined_loc: fname.loc(),
+                visibility: fdef.visibility.clone(),
+                entry: fdef.entry,
+                signature: fdef.signature.clone(),
+            });
+            let constants = mdef.constants.ref_map(|cname, cdef| ConstantInfo {
+                attributes: cdef.attributes.clone(),
+                defined_loc: cname.loc(),
+                signature: cdef.signature.clone(),
+            });
+            let use_funs = $module_use_funs
+                .as_mut()
+                .map(|module_use_funs| module_use_funs.remove(&mident).unwrap())
+                .unwrap_or_default();
+            let minfo = ModuleInfo {
+                attributes: mdef.attributes.clone(),
+                package: mdef.package_name,
+                use_funs,
+                friends: mdef.friends.ref_map(|_, friend| friend.loc),
+                structs,
+                functions,
+                constants,
+            };
+            (mident, minfo)
+        }))
+        .unwrap();
+        if let Some(pre_compiled_lib) = $pre_compiled_lib {
+            for (mident, minfo) in pre_compiled_lib.$pass.info.modules.key_cloned_iter() {
+                if !modules.contains_key(&mident) {
+                    modules.add(mident, minfo.clone()).unwrap();
+                }
+            }
+        }
+        ProgramInfo { modules }
+    }};
+}
+
+impl TypingProgramInfo {
+    pub fn new(
+        pre_compiled_lib: Option<&FullyCompiledProgram>,
+        prog: &T::Program_,
+        mut module_use_funs: BTreeMap<ModuleIdent, ResolvedUseFuns>,
+    ) -> Self {
+        let mut module_use_funs = Some(&mut module_use_funs);
+        program_info!(pre_compiled_lib, prog, typing, module_use_funs)
+    }
+}
+
+impl NamingProgramInfo {
+    pub fn new(pre_compiled_lib: Option<&FullyCompiledProgram>, prog: &N::Program_) -> Self {
+        // use_funs will be populated later
+        let mut module_use_funs: Option<&mut BTreeMap<ModuleIdent, ResolvedUseFuns>> = None;
+        program_info!(pre_compiled_lib, prog, naming, module_use_funs)
+    }
+}
+
+impl<const AFTER_TYPING: bool> ProgramInfo<AFTER_TYPING> {
+    pub fn module(&self, m: &ModuleIdent) -> &ModuleInfo {
+        self.modules
+            .get(m)
+            .expect("ICE should have failed in naming")
+    }
+
+    pub fn struct_definition(&self, m: &ModuleIdent, n: &StructName) -> &StructDefinition {
+        let minfo = self.module(m);
+        minfo
+            .structs
+            .get(n)
+            .expect("ICE should have failed in naming")
+    }
+
+    pub fn struct_declared_abilities(&self, m: &ModuleIdent, n: &StructName) -> &AbilitySet {
+        &self.struct_definition(m, n).abilities
+    }
+
+    pub fn struct_declared_loc(&self, m: &ModuleIdent, n: &StructName) -> Loc {
+        self.struct_declared_loc_(m, &n.0.value)
+    }
+
+    pub fn struct_declared_loc_(&self, m: &ModuleIdent, n: &Symbol) -> Loc {
+        let minfo = self.module(m);
+        *minfo
+            .structs
+            .get_loc_(n)
+            .expect("ICE should have failed in naming")
+    }
+
+    pub fn struct_type_parameters(
+        &self,
+        m: &ModuleIdent,
+        n: &StructName,
+    ) -> &Vec<StructTypeParameter> {
+        &self.struct_definition(m, n).type_parameters
+    }
+
+    pub fn function_info(&self, m: &ModuleIdent, n: &FunctionName) -> &FunctionInfo {
+        self.module(m)
+            .functions
+            .get(n)
+            .expect("ICE should have failed in naming")
+    }
+
+    pub fn constant_info(&mut self, m: &ModuleIdent, n: &ConstantName) -> &ConstantInfo {
+        let constants = &self.module(m).constants;
+        constants.get(n).expect("ICE should have failed in naming")
+    }
+}
+
+impl NamingProgramInfo {
+    pub fn set_use_funs(&mut self, module_use_funs: BTreeMap<ModuleIdent, ResolvedUseFuns>) {
+        for (mident, use_funs) in module_use_funs {
+            let use_funs_ref = &mut self.modules.get_mut(&mident).unwrap().use_funs;
+            assert!(use_funs_ref.is_empty());
+            *use_funs_ref = use_funs;
+        }
+    }
+
+    pub fn take_use_funs(self) -> BTreeMap<ModuleIdent, ResolvedUseFuns> {
+        self.modules
+            .into_iter()
+            .map(|(mident, minfo)| (mident, minfo.use_funs))
+            .collect()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/remembering_unique_map.rs b/vendors/move/crates/move-compiler/src/shared/remembering_unique_map.rs
new file mode 100644
index 000000000..b1176aed4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/remembering_unique_map.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{unique_map::UniqueMap, *};
+use std::{collections::BTreeSet, fmt, iter::IntoIterator};
+
+//**************************************************************************************************
+// UniqueMap
+//**************************************************************************************************
+
+/// wrapper around `UniqueMap` that remembers which values were asked for in `get`
+#[derive(Clone)]
+pub struct RememberingUniqueMap<K: TName + Ord, V> {
+    map: UniqueMap<K, V>,
+    gotten_keys: BTreeSet<K>,
+}
+
+#[allow(clippy::new_without_default)]
+impl<K: TName, V> RememberingUniqueMap<K, V> {
+    pub fn new() -> Self {
+        RememberingUniqueMap {
+            map: UniqueMap::new(),
+            gotten_keys: BTreeSet::new(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.map.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.map.len()
+    }
+
+    pub fn add(&mut self, key: K, value: V) -> Result<(), (K, K::Loc)> {
+        self.map.add(key, value)
+    }
+
+    pub fn key_gotten(&self, key: &K) -> bool {
+        self.gotten_keys.contains(key)
+    }
+
+    pub fn contains_key(&self, key: &K) -> bool {
+        self.map.contains_key(key)
+    }
+
+    pub fn contains_key_(&self, key_: &K::Key) -> bool {
+        self.map.contains_key_(key_)
+    }
+
+    pub fn get(&mut self, key: &K) -> Option<&V> {
+        self.gotten_keys.insert(key.clone());
+        self.map.get(key)
+    }
+
+    pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
+        self.gotten_keys.insert(key.clone());
+        self.map.get_mut(key)
+    }
+
+    pub fn get_loc(&mut self, key: &K) -> Option<&K::Loc> {
+        self.gotten_keys.insert(key.clone());
+        self.map.get_loc(key)
+    }
+
+    pub fn remove(&mut self, key: &K) -> Option<V> {
+        self.gotten_keys.remove(key);
+        self.map.remove(key)
+    }
+
+    pub fn map<V2, F>(self, f: F) -> RememberingUniqueMap<K, V2>
+    where
+        F: FnMut(K, V) -> V2,
+    {
+        RememberingUniqueMap {
+            map: self.map.map(f),
+            gotten_keys: self.gotten_keys,
+        }
+    }
+
+    pub fn ref_map<V2, F>(&self, f: F) -> RememberingUniqueMap<K, V2>
+    where
+        F: FnMut(K, &V) -> V2,
+    {
+        RememberingUniqueMap {
+            map: self.map.ref_map(f),
+            gotten_keys: self.gotten_keys.clone(),
+        }
+    }
+
+    pub fn union_with<F>(&self, other: &Self, f: F) -> Self
+    where
+        V: Clone,
+        F: FnMut(&K, &V, &V) -> V,
+    {
+        RememberingUniqueMap {
+            map: self.map.union_with(&other.map, f),
+            gotten_keys: self
+                .gotten_keys
+                .union(&other.gotten_keys)
+                .cloned()
+                .collect(),
+        }
+    }
+
+    pub fn iter(&self) -> Iter<K, V> {
+        self.into_iter()
+    }
+
+    pub fn iter_mut(&mut self) -> IterMut<K, V> {
+        self.into_iter()
+    }
+
+    pub fn maybe_from_opt_iter(
+        iter: impl Iterator<Item = Option<(K, V)>>,
+    ) -> Option<Result<RememberingUniqueMap<K, V>, (K::Key, K::Loc, K::Loc)>> {
+        let map_res = UniqueMap::maybe_from_opt_iter(iter)?;
+        Some(map_res.map(|map| RememberingUniqueMap {
+            map,
+            gotten_keys: BTreeSet::new(),
+        }))
+    }
+
+    pub fn maybe_from_iter(
+        iter: impl Iterator<Item = (K, V)>,
+    ) -> Result<RememberingUniqueMap<K, V>, (K::Key, K::Loc, K::Loc)> {
+        let map = UniqueMap::maybe_from_iter(iter)?;
+        Ok(RememberingUniqueMap {
+            map,
+            gotten_keys: BTreeSet::new(),
+        })
+    }
+
+    pub fn into_inner(self) -> UniqueMap<K, V> {
+        self.map
+    }
+
+    pub fn remember(self) -> BTreeSet<K> {
+        self.gotten_keys
+    }
+}
+
+impl<K: TName, V: PartialEq> PartialEq for RememberingUniqueMap<K, V> {
+    fn eq(&self, other: &RememberingUniqueMap<K, V>) -> bool {
+        self.map == other.map && self.gotten_keys == other.gotten_keys
+    }
+}
+impl<K: TName, V: Eq> Eq for RememberingUniqueMap<K, V> {}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl<K: TName + fmt::Debug, V: fmt::Debug> fmt::Debug for RememberingUniqueMap<K, V>
+where
+    K::Key: fmt::Debug,
+    K::Loc: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "RememberingUniqueMap {{ map: {:#?}, gotten_keys: {:#?} }}",
+            self.map, self.gotten_keys
+        )
+    }
+}
+
+//**************************************************************************************************
+// IntoIter
+//**************************************************************************************************
+
+pub struct IntoIter<K: TName, V>(unique_map::IntoIter<K, V>);
+
+impl<K: TName, V> Iterator for IntoIter<K, V> {
+    type Item = (K, V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<K: TName, V> IntoIterator for RememberingUniqueMap<K, V> {
+    type Item = (K, V);
+    type IntoIter = IntoIter<K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter(self.map.into_iter())
+    }
+}
+
+//**************************************************************************************************
+// Iter
+//**************************************************************************************************
+
+pub struct Iter<'a, K: TName, V>(unique_map::Iter<'a, K, V>);
+
+impl<'a, K: TName, V> Iterator for Iter<'a, K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<'a, K: TName, V> IntoIterator for &'a RememberingUniqueMap<K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a V);
+    type IntoIter = Iter<'a, K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let m = &self.map;
+        Iter(m.into_iter())
+    }
+}
+
+//**************************************************************************************************
+// IterMut
+//**************************************************************************************************
+
+pub struct IterMut<'a, K: TName, V>(unique_map::IterMut<'a, K, V>);
+
+impl<'a, K: TName, V> Iterator for IterMut<'a, K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a mut V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+}
+
+impl<'a, K: TName, V> IntoIterator for &'a mut RememberingUniqueMap<K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a mut V);
+    type IntoIter = IterMut<'a, K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let m = &mut self.map;
+        IterMut(m.into_iter())
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/unique_map.rs b/vendors/move/crates/move-compiler/src/shared/unique_map.rs
new file mode 100644
index 000000000..3d5a5ca19
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/unique_map.rs
@@ -0,0 +1,406 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::*;
+use std::{collections::BTreeMap, fmt::Debug, iter::IntoIterator};
+
+//**************************************************************************************************
+// UniqueMap
+//**************************************************************************************************
+
+/// Unique wrapper around `BTreeMap` that throws on duplicate inserts
+#[derive(Clone, Debug)]
+pub struct UniqueMap<K: TName, V>(pub(crate) BTreeMap<K::Key, (K::Loc, V)>);
+
+impl<K: TName, V> UniqueMap<K, V> {
+    pub fn new() -> Self {
+        UniqueMap(BTreeMap::new())
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn add(&mut self, key: K, value: V) -> Result<(), (K, K::Loc)> {
+        if let Some(old_loc) = self.get_loc(&key) {
+            return Err((key, *old_loc));
+        }
+        let (loc, key_) = key.drop_loc();
+        let old_value = self.0.insert(key_, (loc, value));
+        assert!(old_value.is_none());
+        Ok(())
+    }
+
+    pub fn contains_key(&self, key: &K) -> bool {
+        self.contains_key_(key.borrow().1)
+    }
+
+    pub fn contains_key_(&self, key_: &K::Key) -> bool {
+        self.0.contains_key(key_)
+    }
+
+    pub fn get(&self, key: &K) -> Option<&V> {
+        self.get_(key.borrow().1)
+    }
+
+    pub fn get_(&self, key_: &K::Key) -> Option<&V> {
+        self.0.get(key_).map(|loc_value| &loc_value.1)
+    }
+
+    pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
+        self.get_mut_(key.borrow().1)
+    }
+
+    pub fn get_mut_(&mut self, key_: &K::Key) -> Option<&mut V> {
+        self.0.get_mut(key_).map(|loc_value| &mut loc_value.1)
+    }
+
+    pub fn get_loc(&self, key: &K) -> Option<&K::Loc> {
+        self.get_loc_(key.borrow().1)
+    }
+
+    pub fn get_loc_(&self, key_: &K::Key) -> Option<&K::Loc> {
+        self.0.get(key_).map(|loc_value| &loc_value.0)
+    }
+
+    pub fn get_key(&self, key: &K) -> Option<&K::Key> {
+        self.get_key_(key.borrow().1)
+    }
+
+    pub fn get_key_(&self, key: &K::Key) -> Option<&K::Key> {
+        self.0.get_key_value(key).map(|(k, _v)| k)
+    }
+
+    pub fn get_full_key(&self, key: &K) -> Option<K> {
+        self.get_full_key_(key.borrow().1)
+    }
+
+    pub fn get_full_key_(&self, key: &K::Key) -> Option<K> {
+        self.0
+            .get_key_value(key)
+            .map(|(k, (loc, _))| K::add_loc(*loc, k.clone()))
+    }
+
+    pub fn remove(&mut self, key: &K) -> Option<V> {
+        self.remove_(key.borrow().1)
+    }
+
+    pub fn remove_(&mut self, key_: &K::Key) -> Option<V> {
+        self.0.remove(key_).map(|loc_value| loc_value.1)
+    }
+
+    pub fn map<V2, F>(self, mut f: F) -> UniqueMap<K, V2>
+    where
+        F: FnMut(K, V) -> V2,
+    {
+        UniqueMap(
+            self.0
+                .into_iter()
+                .map(|(k_, (loc, v))| {
+                    let v2 = f(K::add_loc(loc, k_.clone()), v);
+                    (k_, (loc, v2))
+                })
+                .collect(),
+        )
+    }
+
+    pub fn filter_map<V2, F>(self, mut f: F) -> UniqueMap<K, V2>
+    where
+        F: FnMut(K, V) -> Option<V2>,
+    {
+        UniqueMap(
+            self.0
+                .into_iter()
+                .filter_map(|(k_, (loc, v))| {
+                    let v2_opt = f(K::add_loc(loc, k_.clone()), v);
+                    v2_opt.map(|v2| (k_, (loc, v2)))
+                })
+                .collect(),
+        )
+    }
+
+    pub fn ref_map<V2, F>(&self, mut f: F) -> UniqueMap<K, V2>
+    where
+        F: FnMut(K, &V) -> V2,
+    {
+        UniqueMap(
+            self.0
+                .iter()
+                .map(|(k_, loc_v)| {
+                    let loc = loc_v.0;
+                    let v = &loc_v.1;
+                    let k = K::add_loc(loc, k_.clone());
+                    let v2 = f(k, v);
+                    (k_.clone(), (loc, v2))
+                })
+                .collect(),
+        )
+    }
+
+    pub fn ref_filter_map<V2, F>(&self, mut f: F) -> UniqueMap<K, V2>
+    where
+        F: FnMut(K, &V) -> Option<V2>,
+    {
+        UniqueMap(
+            self.0
+                .iter()
+                .filter_map(|(k_, loc_v)| {
+                    let loc = loc_v.0;
+                    let v = &loc_v.1;
+                    let k = K::add_loc(loc, k_.clone());
+                    let v2_opt = f(k, v);
+                    v2_opt.map(|v2| (k_.clone(), (loc, v2)))
+                })
+                .collect(),
+        )
+    }
+
+    pub fn union_with<F>(&self, other: &Self, mut f: F) -> Self
+    where
+        V: Clone,
+        F: FnMut(&K, &V, &V) -> V,
+    {
+        let mut joined = Self::new();
+        for (loc, k_, v1) in self.iter() {
+            let k = K::add_loc(loc, k_.clone());
+            let v = match other.get(&k) {
+                None => v1.clone(),
+                Some(v2) => f(&k, v1, v2),
+            };
+            assert!(joined.add(k, v).is_ok())
+        }
+        for (loc, k_, v2) in other.iter() {
+            if !joined.contains_key_(k_) {
+                let k = K::add_loc(loc, k_.clone());
+                assert!(joined.add(k, v2.clone()).is_ok())
+            }
+        }
+        joined
+    }
+
+    pub fn iter(&self) -> Iter<K, V> {
+        self.into_iter()
+    }
+
+    pub fn key_cloned_iter(&self) -> impl Iterator<Item = (K, &V)> {
+        self.into_iter()
+            .map(|(loc, k_, v)| (K::add_loc(loc, k_.clone()), v))
+    }
+
+    pub fn iter_mut(&mut self) -> IterMut<K, V> {
+        self.into_iter()
+    }
+
+    pub fn key_cloned_iter_mut(&mut self) -> impl Iterator<Item = (K, &mut V)> {
+        self.into_iter()
+            .map(|(loc, k_, v)| (K::add_loc(loc, k_.clone()), v))
+    }
+
+    pub fn maybe_from_opt_iter(
+        iter: impl Iterator<Item = Option<(K, V)>>,
+    ) -> Option<Result<UniqueMap<K, V>, (K::Key, K::Loc, K::Loc)>> {
+        // TODO remove collect in favor of more efficient impl
+        Some(Self::maybe_from_iter(
+            iter.collect::<Option<Vec<_>>>()?.into_iter(),
+        ))
+    }
+
+    pub fn maybe_from_iter(
+        iter: impl Iterator<Item = (K, V)>,
+    ) -> Result<UniqueMap<K, V>, (K::Key, K::Loc, K::Loc)> {
+        let mut m = Self::new();
+        for (k, v) in iter {
+            if let Err((k, old_loc)) = m.add(k, v) {
+                let (loc, key_) = k.drop_loc();
+                return Err((key_, loc, old_loc));
+            }
+        }
+        Ok(m)
+    }
+}
+
+impl<K: TName, V: PartialEq> PartialEq for UniqueMap<K, V> {
+    fn eq(&self, other: &UniqueMap<K, V>) -> bool {
+        self.iter()
+            .all(|(_, k_, v1)| other.get_(k_).map(|v2| v1 == v2).unwrap_or(false))
+            && other.iter().all(|(_, k_, _)| self.contains_key_(k_))
+    }
+}
+impl<K: TName, V: Eq> Eq for UniqueMap<K, V> {}
+
+impl<K: TName, V: PartialOrd> PartialOrd for UniqueMap<K, V> {
+    fn partial_cmp(&self, other: &UniqueMap<K, V>) -> Option<std::cmp::Ordering> {
+        self.0
+            .iter()
+            .map(|(k_, loc_v)| {
+                let v = &loc_v.1;
+                (k_, v)
+            })
+            .partial_cmp(other.0.iter().map(|(k_, loc_v)| {
+                let v = &loc_v.1;
+                (k_, v)
+            }))
+    }
+}
+impl<K: TName, V: Ord> Ord for UniqueMap<K, V> {
+    fn cmp(&self, other: &UniqueMap<K, V>) -> std::cmp::Ordering {
+        self.0
+            .iter()
+            .map(|(k_, loc_v)| {
+                let v = &loc_v.1;
+                (k_, v)
+            })
+            .cmp(other.0.iter().map(|(k_, loc_v)| {
+                let v = &loc_v.1;
+                (k_, v)
+            }))
+    }
+}
+
+impl<K: TName, V: Hash> Hash for UniqueMap<K, V>
+where
+    K::Key: Hash,
+{
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        for (k_, loc_v) in &self.0 {
+            let v = &loc_v.1;
+            k_.hash(state);
+            v.hash(state);
+        }
+    }
+}
+
+impl<K: TName, V> Default for UniqueMap<K, V> {
+    fn default() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+//**************************************************************************************************
+// IntoIter
+//**************************************************************************************************
+
+pub struct IntoIter<K: TName, V>(
+    std::iter::Map<
+        std::collections::btree_map::IntoIter<K::Key, (K::Loc, V)>,
+        fn((K::Key, (K::Loc, V))) -> (K, V),
+    >,
+    usize,
+);
+
+impl<K: TName, V> Iterator for IntoIter<K, V> {
+    type Item = (K, V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.1 > 0 {
+            self.1 -= 1;
+        }
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.1, Some(self.1))
+    }
+}
+
+impl<K: TName, V> IntoIterator for UniqueMap<K, V> {
+    type Item = (K, V);
+    type IntoIter = IntoIter<K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let len = self.len();
+        IntoIter(
+            self.0.into_iter().map(|(k_, loc_v)| {
+                let loc = loc_v.0;
+                let v = loc_v.1;
+                let k = K::add_loc(loc, k_);
+                (k, v)
+            }),
+            len,
+        )
+    }
+}
+
+//**************************************************************************************************
+// Iter
+//**************************************************************************************************
+
+pub struct Iter<'a, K: TName, V>(
+    std::iter::Map<
+        std::collections::btree_map::Iter<'a, K::Key, (K::Loc, V)>,
+        fn((&'a K::Key, &'a (K::Loc, V))) -> (K::Loc, &'a K::Key, &'a V),
+    >,
+    usize,
+);
+
+impl<'a, K: TName, V> Iterator for Iter<'a, K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.1 > 0 {
+            self.1 -= 1;
+        }
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.1, Some(self.1))
+    }
+}
+
+impl<'a, K: TName, V> IntoIterator for &'a UniqueMap<K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a V);
+    type IntoIter = Iter<'a, K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let fix = |(k_, loc_v): (&'a K::Key, &'a (K::Loc, V))| -> (K::Loc, &'a K::Key, &'a V) {
+            let loc = loc_v.0;
+            let v = &loc_v.1;
+            (loc, k_, v)
+        };
+        Iter(self.0.iter().map(fix), self.len())
+    }
+}
+
+//**************************************************************************************************
+// IterMut
+//**************************************************************************************************
+
+pub struct IterMut<'a, K: TName, V>(
+    std::iter::Map<
+        std::collections::btree_map::IterMut<'a, K::Key, (K::Loc, V)>,
+        fn((&'a K::Key, &'a mut (K::Loc, V))) -> (K::Loc, &'a K::Key, &'a mut V),
+    >,
+    usize,
+);
+
+impl<'a, K: TName, V> Iterator for IterMut<'a, K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a mut V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.1 > 0 {
+            self.1 -= 1;
+        }
+        self.0.next()
+    }
+}
+
+impl<'a, K: TName, V> IntoIterator for &'a mut UniqueMap<K, V> {
+    type Item = (K::Loc, &'a K::Key, &'a mut V);
+    type IntoIter = IterMut<'a, K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let len = self.len();
+        let fix =
+            |(k_, loc_v): (&'a K::Key, &'a mut (K::Loc, V))| -> (K::Loc, &'a K::Key, &'a mut V) {
+                let loc = loc_v.0;
+                let v = &mut loc_v.1;
+                (loc, k_, v)
+            };
+        IterMut(self.0.iter_mut().map(fix), len)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/shared/unique_set.rs b/vendors/move/crates/move-compiler/src/shared/unique_set.rs
new file mode 100644
index 000000000..fc239b447
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/shared/unique_set.rs
@@ -0,0 +1,229 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{unique_map::UniqueMap, *};
+use std::{cmp::Ordering, fmt::Debug, iter::IntoIterator};
+
+/// Unique set wrapper around `UniqueMap` where the value of the map is not needed
+#[derive(Clone)]
+pub struct UniqueSet<T: TName>(UniqueMap<T, ()>);
+
+impl<T: TName> UniqueSet<T> {
+    pub fn new() -> Self {
+        Self(UniqueMap::new())
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn add(&mut self, x: T) -> Result<(), (T, T::Loc)> {
+        self.0.add(x, ())
+    }
+
+    pub fn remove(&mut self, x: &T) -> bool {
+        self.0.remove(x).is_some()
+    }
+
+    pub fn remove_(&mut self, x: &T::Key) -> bool {
+        self.0.remove_(x).is_some()
+    }
+
+    pub fn contains(&self, x: &T) -> bool {
+        self.0.contains_key(x)
+    }
+
+    pub fn contains_(&self, x_: &T::Key) -> bool {
+        self.0.contains_key_(x_)
+    }
+
+    pub fn get_loc(&self, x: &T) -> Option<&T::Loc> {
+        self.0.get_loc(x)
+    }
+
+    pub fn get_loc_(&self, x_: &T::Key) -> Option<&T::Loc> {
+        self.0.get_loc_(x_)
+    }
+
+    // intersection of two sets. Keeps the loc of the first set
+    pub fn intersect(&self, other: &Self) -> Self {
+        let mut intersection = Self::new();
+        for x in self.cloned_iter() {
+            if !other.contains(&x) {
+                continue;
+            }
+            assert!(intersection.add(x).is_ok());
+        }
+        intersection
+    }
+
+    // union of two sets. Prefers the loc of the first set
+    pub fn union(&self, other: &Self) -> Self {
+        let mut joined = Self::new();
+        for x in self.cloned_iter() {
+            assert!(joined.add(x).is_ok());
+        }
+        for (loc, x_) in other {
+            if joined.contains_(x_) {
+                continue;
+            }
+            assert!(joined.add(T::add_loc(loc, x_.clone())).is_ok())
+        }
+        joined
+    }
+
+    pub fn is_subset(&self, other: &Self) -> bool {
+        self.iter().all(|(_, x_)| other.contains_(x_))
+    }
+
+    pub fn iter(&self) -> Iter<T> {
+        self.into_iter()
+    }
+
+    pub fn cloned_iter(&self) -> impl Iterator<Item = T> {
+        self.into_iter()
+            .map(|(loc, k_)| T::add_loc(loc, k_.clone()))
+            .collect::<Vec<_>>()
+            .into_iter()
+    }
+
+    pub fn from_elements(
+        iter: impl IntoIterator<Item = T>,
+    ) -> Result<Self, (T::Key, T::Loc, T::Loc)> {
+        Ok(Self(UniqueMap::maybe_from_iter(
+            iter.into_iter().map(|x| (x, ())),
+        )?))
+    }
+
+    pub fn from_elements_(
+        loc: T::Loc,
+        iter: impl IntoIterator<Item = T::Key>,
+    ) -> Result<Self, (T::Key, T::Loc, T::Loc)> {
+        Ok(Self(UniqueMap::maybe_from_iter(
+            iter.into_iter().map(|x_| (T::add_loc(loc, x_), ())),
+        )?))
+    }
+}
+
+impl<T: TName> PartialEq for UniqueSet<T> {
+    fn eq(&self, other: &UniqueSet<T>) -> bool {
+        self.0 == other.0
+    }
+}
+impl<T: TName> Eq for UniqueSet<T> {}
+
+#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+impl<T: TName> PartialOrd for UniqueSet<T> {
+    fn partial_cmp(&self, other: &UniqueSet<T>) -> Option<Ordering> {
+        (self.0).0.keys().partial_cmp((other.0).0.keys())
+    }
+}
+
+impl<T: TName> Ord for UniqueSet<T> {
+    fn cmp(&self, other: &UniqueSet<T>) -> Ordering {
+        (self.0).0.keys().cmp((other.0).0.keys())
+    }
+}
+
+impl<T: TName + Debug> Debug for UniqueSet<T>
+where
+    T::Key: Debug,
+    T::Loc: Debug,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T: TName> Hash for UniqueSet<T>
+where
+    T::Key: Hash,
+{
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        for k in (self.0).0.keys() {
+            k.hash(state);
+        }
+    }
+}
+
+//**************************************************************************************************
+// IntoIter
+//**************************************************************************************************
+
+pub struct IntoIter<T: TName>(
+    std::iter::Map<unique_map::IntoIter<T, ()>, fn((T, ())) -> T>,
+    usize,
+);
+
+impl<T: TName> Iterator for IntoIter<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.1 > 0 {
+            self.1 -= 1;
+        }
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.1, Some(self.1))
+    }
+}
+
+impl<T: TName> IntoIterator for UniqueSet<T> {
+    type Item = T;
+    type IntoIter = IntoIter<T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let len = self.len();
+        IntoIter(
+            self.0.into_iter().map(|ab_v| {
+                let (ab, ()) = ab_v;
+                ab
+            }),
+            len,
+        )
+    }
+}
+
+//**************************************************************************************************
+// Iter
+//**************************************************************************************************
+
+pub struct Iter<'a, T: TName>(
+    std::iter::Map<
+        unique_map::Iter<'a, T, ()>,
+        fn((T::Loc, &'a T::Key, &'a ())) -> (T::Loc, &'a T::Key),
+    >,
+    usize,
+);
+
+impl<'a, T: TName> Iterator for Iter<'a, T> {
+    type Item = (T::Loc, &'a T::Key);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.1 > 0 {
+            self.1 -= 1;
+        }
+        self.0.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.1, Some(self.1))
+    }
+}
+
+impl<'a, T: TName> IntoIterator for &'a UniqueSet<T> {
+    type Item = (T::Loc, &'a T::Key);
+    type IntoIter = Iter<'a, T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        let len = self.len();
+        Iter(self.0.iter().map(|(loc, x_, ())| (loc, x_)), len)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/sui_mode/id_leak.rs b/vendors/move/crates/move-compiler/src/sui_mode/id_leak.rs
new file mode 100644
index 000000000..fa4947fc7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/sui_mode/id_leak.rs
@@ -0,0 +1,244 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+
+use crate::{
+    cfgir::{
+        self,
+        absint::JoinResult,
+        visitor::{
+            LocalState, SimpleAbsInt, SimpleAbsIntConstructor, SimpleDomain, SimpleExecutionContext,
+        },
+        CFGContext, MemberName,
+    },
+    diag,
+    diagnostics::{Diagnostic, Diagnostics},
+    editions::Flavor,
+    expansion::ast::AbilitySet,
+    hlir::ast::{Exp, Label, ModuleCall, SingleType, Type, Type_, Var},
+    parser::ast::{Ability_, StructName},
+    shared::{unique_map::UniqueMap, CompilationEnv, Identifier},
+    sui_mode::{OBJECT_NEW, TEST_SCENARIO_MODULE_NAME, TS_NEW_OBJECT},
+};
+use std::collections::BTreeMap;
+
+use super::{
+    AUTHENTICATOR_STATE_CREATE, AUTHENTICATOR_STATE_MODULE_NAME, CLOCK_MODULE_NAME, ID_LEAK_DIAG,
+    OBJECT_MODULE_NAME, OBJECT_NEW_UID_FROM_HASH, SUI_ADDR_NAME, SUI_CLOCK_CREATE,
+    SUI_SYSTEM_ADDR_NAME, SUI_SYSTEM_CREATE, SUI_SYSTEM_MODULE_NAME, UID_TYPE_NAME,
+};
+
+pub const FRESH_ID_FUNCTIONS: &[(Symbol, Symbol, Symbol)] = &[
+    (SUI_ADDR_NAME, OBJECT_MODULE_NAME, OBJECT_NEW),
+    (SUI_ADDR_NAME, OBJECT_MODULE_NAME, OBJECT_NEW_UID_FROM_HASH),
+    (SUI_ADDR_NAME, TEST_SCENARIO_MODULE_NAME, TS_NEW_OBJECT),
+];
+pub const FUNCTIONS_TO_SKIP: &[(Symbol, Symbol, Symbol)] = &[
+    (
+        SUI_SYSTEM_ADDR_NAME,
+        SUI_SYSTEM_MODULE_NAME,
+        SUI_SYSTEM_CREATE,
+    ),
+    (SUI_ADDR_NAME, CLOCK_MODULE_NAME, SUI_CLOCK_CREATE),
+    (
+        SUI_ADDR_NAME,
+        AUTHENTICATOR_STATE_MODULE_NAME,
+        AUTHENTICATOR_STATE_CREATE,
+    ),
+];
+
+//**************************************************************************************************
+// types
+//**************************************************************************************************
+
+pub struct IDLeakVerifier;
+pub struct IDLeakVerifierAI<'a> {
+    declared_abilities: &'a UniqueMap<StructName, AbilitySet>,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default)]
+pub enum Value {
+    FreshID(Loc),
+    NotFresh(Loc),
+    #[default]
+    Other,
+}
+
+pub struct ExecutionContext {
+    diags: Diagnostics,
+}
+
+#[derive(Clone, Debug)]
+pub struct State {
+    locals: BTreeMap<Var, LocalState<Value>>,
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl SimpleAbsIntConstructor for IDLeakVerifier {
+    type AI<'a> = IDLeakVerifierAI<'a>;
+
+    fn new<'a>(
+        env: &CompilationEnv,
+        program: &'a cfgir::ast::Program,
+        context: &'a CFGContext<'a>,
+        _init_state: &mut <Self::AI<'a> as SimpleAbsInt>::State,
+    ) -> Option<Self::AI<'a>> {
+        let Some(module) = &context.module else {
+            return None;
+        };
+        let package_name = program.modules.get(module).unwrap().package_name;
+        let config = env.package_config(package_name);
+        if config.flavor != Flavor::Sui {
+            return None;
+        }
+        if let MemberName::Function(n) = &context.member {
+            let should_skip = FUNCTIONS_TO_SKIP
+                .iter()
+                .any(|to_skip| module.value.is(to_skip.0, to_skip.1) && n.value == to_skip.2);
+            if should_skip {
+                return None;
+            }
+        }
+
+        let declared_abilities = context.struct_declared_abilities.get(module).unwrap();
+        Some(IDLeakVerifierAI { declared_abilities })
+    }
+}
+
+impl<'a> SimpleAbsInt for IDLeakVerifierAI<'a> {
+    type State = State;
+    type ExecutionContext = ExecutionContext;
+
+    fn finish(&mut self, _final_states: BTreeMap<Label, State>, diags: Diagnostics) -> Diagnostics {
+        diags
+    }
+
+    fn start_command(&self, _: &mut State) -> ExecutionContext {
+        ExecutionContext {
+            diags: Diagnostics::new(),
+        }
+    }
+
+    fn finish_command(&self, context: ExecutionContext, _state: &mut State) -> Diagnostics {
+        let ExecutionContext { diags } = context;
+        diags
+    }
+
+    fn exp_custom(
+        &self,
+        context: &mut ExecutionContext,
+        state: &mut State,
+        e: &Exp,
+    ) -> Option<Vec<Value>> {
+        use crate::hlir::ast::UnannotatedExp_ as E;
+
+        let e__ = &e.exp.value;
+        let E::Pack(s, _tys, fields) = e__ else {
+            return None;
+        };
+        let abilities = self.declared_abilities.get(s).unwrap();
+        if !abilities.has_ability_(Ability_::Key) {
+            return None;
+        }
+
+        let mut fields_iter = fields.iter();
+        let (f, _, first_e) = fields_iter.next().unwrap();
+        let first_value = self.exp(context, state, first_e).pop().unwrap_or_default();
+        if !matches!(first_value, Value::FreshID(_)) {
+            let msg = "Invalid object creation without a newly created UID.".to_string();
+            let uid_msg = format!(
+                "The UID must come directly from {sui}::{object}::{new}. \
+                Or for tests, it can come from {sui}::{ts}::{ts_new}",
+                sui = SUI_ADDR_NAME,
+                object = OBJECT_MODULE_NAME,
+                new = OBJECT_NEW,
+                ts = TEST_SCENARIO_MODULE_NAME,
+                ts_new = TS_NEW_OBJECT,
+            );
+            let mut d = diag!(ID_LEAK_DIAG, (e.exp.loc, msg), (f.loc(), uid_msg));
+            if let Value::NotFresh(stale) = first_value {
+                d.add_secondary_label((stale, "Non fresh UID from this position"))
+            }
+            context.add_diag(d)
+        }
+
+        for (_, _, inner) in fields_iter {
+            self.exp(context, state, inner);
+        }
+
+        Some(vec![Value::default()])
+    }
+
+    fn call_custom(
+        &self,
+        _context: &mut ExecutionContext,
+        _state: &mut State,
+        loc: &Loc,
+        return_ty: &Type,
+        f: &ModuleCall,
+        _args: Vec<Value>,
+    ) -> Option<Vec<Value>> {
+        if FRESH_ID_FUNCTIONS
+            .iter()
+            .any(|makes_fresh| f.is(makes_fresh.0, makes_fresh.1, makes_fresh.2))
+        {
+            return Some(vec![Value::FreshID(*loc)]);
+        }
+        Some(match &return_ty.value {
+            Type_::Unit => vec![],
+            Type_::Single(t) => vec![value_for_ty(loc, t)],
+            Type_::Multiple(ts) => ts.iter().map(|t| value_for_ty(loc, t)).collect(),
+        })
+    }
+}
+
+fn value_for_ty(loc: &Loc, sp!(_, t): &SingleType) -> Value {
+    if t.is_apply(SUI_ADDR_NAME, OBJECT_MODULE_NAME, UID_TYPE_NAME)
+        .is_some()
+    {
+        Value::NotFresh(*loc)
+    } else {
+        Value::Other
+    }
+}
+
+impl SimpleDomain for State {
+    type Value = Value;
+
+    fn new(_: &CFGContext, locals: BTreeMap<Var, LocalState<Value>>) -> Self {
+        State { locals }
+    }
+
+    fn locals_mut(&mut self) -> &mut BTreeMap<Var, LocalState<Value>> {
+        &mut self.locals
+    }
+
+    fn locals(&self) -> &BTreeMap<Var, LocalState<Value>> {
+        &self.locals
+    }
+
+    fn join_value(v1: &Value, v2: &Value) -> Value {
+        match (v1, v2) {
+            (stale @ Value::NotFresh(_), _) | (_, stale @ Value::NotFresh(_)) => *stale,
+
+            (Value::FreshID(_), Value::FreshID(_)) => *v1,
+
+            (Value::FreshID(_), Value::Other)
+            | (Value::Other, Value::FreshID(_))
+            | (Value::Other, Value::Other) => Value::Other,
+        }
+    }
+
+    fn join_impl(&mut self, _: &Self, _: &mut JoinResult) {}
+}
+
+impl SimpleExecutionContext for ExecutionContext {
+    fn add_diag(&mut self, diag: Diagnostic) {
+        self.diags.add(diag)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/sui_mode/mod.rs b/vendors/move/crates/move-compiler/src/sui_mode/mod.rs
new file mode 100644
index 000000000..92e8ec35a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/sui_mode/mod.rs
@@ -0,0 +1,142 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_symbol_pool::Symbol;
+
+use crate::diagnostics::codes::{custom, DiagnosticInfo, Severity};
+
+pub mod id_leak;
+pub mod typing;
+
+pub const INIT_FUNCTION_NAME: Symbol = symbol!("init");
+pub const ID_FIELD_NAME: Symbol = symbol!("id");
+
+pub const STD_ADDR_NAME: Symbol = symbol!("std");
+pub const OPTION_MODULE_NAME: Symbol = symbol!("option");
+pub const OPTION_TYPE_NAME: Symbol = symbol!("Option");
+pub const UTF_MODULE_NAME: Symbol = symbol!("string");
+pub const UTF_TYPE_NAME: Symbol = symbol!("String");
+pub const ASCII_MODULE_NAME: Symbol = symbol!("ascii");
+pub const ASCII_TYPE_NAME: Symbol = symbol!("String");
+
+pub const SUI_ADDR_NAME: Symbol = symbol!("sui");
+pub const OBJECT_MODULE_NAME: Symbol = symbol!("object");
+pub const OBJECT_NEW: Symbol = symbol!("new");
+pub const OBJECT_NEW_UID_FROM_HASH: Symbol = symbol!("new_uid_from_hash");
+pub const TEST_SCENARIO_MODULE_NAME: Symbol = symbol!("test_scenario");
+pub const TS_NEW_OBJECT: Symbol = symbol!("new_object");
+pub const UID_TYPE_NAME: Symbol = symbol!("UID");
+pub const ID_TYPE_NAME: Symbol = symbol!("ID");
+pub const TX_CONTEXT_MODULE_NAME: Symbol = symbol!("tx_context");
+pub const TX_CONTEXT_TYPE_NAME: Symbol = symbol!("TxContext");
+pub const SUI_MODULE_NAME: Symbol = symbol!("sui");
+pub const SUI_OTW_NAME: Symbol = symbol!("SUI");
+
+pub const SUI_SYSTEM_ADDR_NAME: Symbol = symbol!("sui_system");
+pub const SUI_SYSTEM_MODULE_NAME: Symbol = symbol!("sui_system");
+pub const SUI_SYSTEM_CREATE: Symbol = symbol!("create");
+pub const CLOCK_MODULE_NAME: Symbol = symbol!("clock");
+pub const CLOCK_TYPE_NAME: Symbol = symbol!("Clock");
+pub const SUI_CLOCK_CREATE: Symbol = symbol!("create");
+pub const AUTHENTICATOR_STATE_MODULE_NAME: Symbol = symbol!("authenticator_state");
+pub const AUTHENTICATOR_STATE_TYPE_NAME: Symbol = symbol!("AuthenticatorState");
+pub const AUTHENTICATOR_STATE_CREATE: Symbol = symbol!("create");
+
+pub const EVENT_MODULE_NAME: Symbol = symbol!("event");
+pub const EVENT_FUNCTION_NAME: Symbol = symbol!("emit");
+
+pub const TRANSFER_MODULE_NAME: Symbol = symbol!("transfer");
+pub const TRANSFER_FUNCTION_NAME: Symbol = symbol!("transfer");
+pub const FREEZE_FUNCTION_NAME: Symbol = symbol!("freeze_object");
+pub const SHARE_FUNCTION_NAME: Symbol = symbol!("share_object");
+pub const RECEIVE_FUNCTION_NAME: Symbol = symbol!("receive");
+pub const RECEIVING_TYPE_NAME: Symbol = symbol!("Receiving");
+
+pub const PRIVATE_TRANSFER_FUNCTIONS: &[Symbol] = &[
+    TRANSFER_FUNCTION_NAME,
+    FREEZE_FUNCTION_NAME,
+    SHARE_FUNCTION_NAME,
+    RECEIVE_FUNCTION_NAME,
+];
+
+//**************************************************************************************************
+// Diagnostics
+//**************************************************************************************************
+
+pub const SUI_DIAG_PREFIX: &str = "Sui ";
+
+// Categories
+pub const ID_LEAK_CATEGORY: u8 = 1;
+pub const TYPING: u8 = 2;
+
+pub const ID_LEAK_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ ID_LEAK_CATEGORY,
+    /* code */ 1,
+    "invalid object construction",
+);
+
+pub const SCRIPT_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 1,
+    "scripts are not supported",
+);
+pub const ENTRY_FUN_SIGNATURE_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 2,
+    "invalid 'entry' function signature",
+);
+pub const INIT_FUN_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 3,
+    "invalid 'init' function",
+);
+pub const OTW_DECL_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 4,
+    "invalid one-time witness declaration",
+);
+pub const OTW_USAGE_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 5,
+    "invalid one-time witness usage",
+);
+pub const INIT_CALL_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 6,
+    "invalid 'init' call",
+);
+pub const OBJECT_DECL_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 7,
+    "invalid object declaration",
+);
+pub const EVENT_EMIT_CALL_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 8,
+    "invalid event",
+);
+pub const PRIVATE_TRANSFER_CALL_DIAG: DiagnosticInfo = custom(
+    SUI_DIAG_PREFIX,
+    Severity::NonblockingError,
+    /* category */ TYPING,
+    /* code */ 9,
+    "invalid private transfer call",
+);
diff --git a/vendors/move/crates/move-compiler/src/sui_mode/typing.rs b/vendors/move/crates/move-compiler/src/sui_mode/typing.rs
new file mode 100644
index 000000000..5390a61e1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/sui_mode/typing.rs
@@ -0,0 +1,1045 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+
+use crate::{
+    diag,
+    diagnostics::{Diagnostic, WarningFilters},
+    editions::Flavor,
+    expansion::ast::{AbilitySet, AttributeName_, Fields, ModuleIdent, Visibility},
+    naming::ast::{
+        self as N, BuiltinTypeName_, FunctionSignature, StructFields, Type, TypeName_, Type_, Var,
+    },
+    parser::ast::{Ability_, FunctionName, Mutability, StructName},
+    shared::{
+        known_attributes::{KnownAttribute, TestingAttribute},
+        program_info::TypingProgramInfo,
+        CompilationEnv, Identifier,
+    },
+    sui_mode::*,
+    typing::{
+        ast::{self as T, ModuleCall},
+        core::{ability_not_satisfied_tips, error_format, error_format_, Subst},
+        visitor::{TypingVisitorConstructor, TypingVisitorContext},
+    },
+};
+
+//**************************************************************************************************
+// Visitor
+//**************************************************************************************************
+
+pub struct SuiTypeChecks;
+
+impl TypingVisitorConstructor for SuiTypeChecks {
+    type Context<'a> = Context<'a>;
+    fn context<'a>(
+        env: &'a mut CompilationEnv,
+        program_info: &'a TypingProgramInfo,
+        _program: &T::Program_,
+    ) -> Self::Context<'a> {
+        Context::new(env, program_info)
+    }
+}
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+#[allow(unused)]
+pub struct Context<'a> {
+    env: &'a mut CompilationEnv,
+    info: &'a TypingProgramInfo,
+    sui_transfer_ident: Option<ModuleIdent>,
+    current_module: Option<ModuleIdent>,
+    otw_name: Option<Symbol>,
+    one_time_witness: Option<Result<StructName, ()>>,
+    in_test: bool,
+}
+
+impl<'a> Context<'a> {
+    fn new(env: &'a mut CompilationEnv, info: &'a TypingProgramInfo) -> Self {
+        let sui_module_ident = info
+            .modules
+            .key_cloned_iter()
+            .find(|(m, _)| m.value.is(SUI_ADDR_NAME, TRANSFER_MODULE_NAME))
+            .map(|(m, _)| m);
+        Context {
+            env,
+            info,
+            sui_transfer_ident: sui_module_ident,
+            current_module: None,
+            otw_name: None,
+            one_time_witness: None,
+            in_test: false,
+        }
+    }
+
+    fn set_module(&mut self, current_module: ModuleIdent) {
+        self.current_module = Some(current_module);
+        self.otw_name = Some(Symbol::from(
+            current_module.value.module.0.value.as_str().to_uppercase(),
+        ));
+        self.one_time_witness = None;
+    }
+
+    fn current_module(&self) -> &ModuleIdent {
+        self.current_module.as_ref().unwrap()
+    }
+
+    fn otw_name(&self) -> Symbol {
+        self.otw_name.unwrap()
+    }
+}
+
+const OTW_NOTE: &str = "One-time witness types are structs with the following requirements: \
+                        their name is the upper-case version of the module's name, \
+                        they have no fields (or a single boolean field), \
+                        they have no type parameters, \
+                        and they have only the 'drop' ability.";
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+impl<'a> TypingVisitorContext for Context<'a> {
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters) {
+        self.env.add_warning_filter_scope(filter)
+    }
+
+    fn pop_warning_filter_scope(&mut self) {
+        self.env.pop_warning_filter_scope()
+    }
+
+    fn visit_script_custom(&mut self, _name: Symbol, script: &mut T::Script) -> bool {
+        let config = self.env.package_config(script.package_name);
+        if config.flavor == Flavor::Sui {
+            // TODO point to PTB docs?
+            let msg = "'scripts' are not supported on Sui. \
+                        Consider removing or refactoring into a 'module'";
+            self.env.add_diag(diag!(SCRIPT_DIAG, (script.loc, msg)));
+        }
+        // skip scripts
+        true
+    }
+
+    fn visit_module_custom(&mut self, ident: ModuleIdent, mdef: &mut T::ModuleDefinition) -> bool {
+        let config = self.env.package_config(mdef.package_name);
+        if config.flavor != Flavor::Sui {
+            // skip if not sui
+            return true;
+        }
+
+        if !mdef.is_source_module {
+            // Skip non-source, dependency modules
+            return true;
+        }
+
+        self.set_module(ident);
+        self.in_test = mdef.attributes.iter().any(|(_, attr_, _)| {
+            matches!(
+                attr_,
+                AttributeName_::Known(KnownAttribute::Testing(TestingAttribute::TestOnly))
+            )
+        });
+        if let Some(sdef) = mdef.structs.get_(&self.otw_name()) {
+            let valid_fields = if let N::StructFields::Defined(fields) = &sdef.fields {
+                invalid_otw_field_loc(fields).is_none()
+            } else {
+                true
+            };
+            if valid_fields {
+                let name = mdef.structs.get_full_key_(&self.otw_name()).unwrap();
+                check_otw_type(self, name, sdef, None)
+            }
+        }
+
+        if let Some(fdef) = mdef.functions.get_(&INIT_FUNCTION_NAME) {
+            let name = mdef.functions.get_full_key_(&INIT_FUNCTION_NAME).unwrap();
+            init_signature(self, name, &fdef.signature)
+        }
+
+        for (name, sdef) in mdef.structs.key_cloned_iter() {
+            struct_def(self, name, sdef)
+        }
+
+        // do not skip module
+        false
+    }
+
+    fn visit_function_custom(
+        &mut self,
+        module: Option<ModuleIdent>,
+        name: FunctionName,
+        fdef: &mut T::Function,
+    ) -> bool {
+        debug_assert!(self.current_module == module);
+        function(self, name, fdef);
+        // skip since we have already visited the body
+        true
+    }
+
+    fn visit_exp_custom(&mut self, e: &mut T::Exp) -> bool {
+        exp(self, e);
+        // do not skip recursion
+        false
+    }
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_def(context: &mut Context, name: StructName, sdef: &N::StructDefinition) {
+    let N::StructDefinition {
+        warning_filter: _,
+        index: _,
+        attributes: _,
+        abilities,
+        type_parameters: _,
+        fields,
+    } = sdef;
+    let Some(key_loc) = abilities.ability_loc_(Ability_::Key) else {
+        // not an object, no extra rules
+        return;
+    };
+
+    let StructFields::Defined(fields) = fields else {
+        return;
+    };
+    let invalid_first_field = if fields.is_empty() {
+        // no fields
+        Some(name.loc())
+    } else {
+        fields
+            .iter()
+            .find(|(_, name, (idx, _))| *idx == 0 && **name != ID_FIELD_NAME)
+            .map(|(loc, _, _)| loc)
+    };
+    if let Some(loc) = invalid_first_field {
+        // no fields or an invalid 'id' field
+        context
+            .env
+            .add_diag(invalid_object_id_field_diag(key_loc, loc, name));
+        return;
+    };
+
+    let (_, id_field_type) = fields.get_(&ID_FIELD_NAME).unwrap();
+    let id_field_loc = fields.get_loc_(&ID_FIELD_NAME).unwrap();
+    if !id_field_type
+        .value
+        .is(SUI_ADDR_NAME, OBJECT_MODULE_NAME, UID_TYPE_NAME)
+    {
+        let actual = format!(
+            "But found type: {}",
+            error_format(id_field_type, &Subst::empty())
+        );
+        let mut diag = invalid_object_id_field_diag(key_loc, *id_field_loc, name);
+        diag.add_secondary_label((id_field_type.loc, actual));
+        context.env.add_diag(diag);
+    }
+}
+
+fn invalid_object_id_field_diag(key_loc: Loc, loc: Loc, name: StructName) -> Diagnostic {
+    const KEY_MSG: &str = "The 'key' ability is used to declare objects in Sui";
+
+    let msg = format!(
+        "Invalid object '{}'. \
+        Structs with the '{}' ability must have '{}: {}::{}::{}' as their first field",
+        name,
+        Ability_::Key,
+        ID_FIELD_NAME,
+        SUI_ADDR_NAME,
+        OBJECT_MODULE_NAME,
+        UID_TYPE_NAME
+    );
+    diag!(OBJECT_DECL_DIAG, (loc, msg), (key_loc, KEY_MSG))
+}
+
+//**************************************************************************************************
+// Functions
+//**********************************************************************************************
+
+fn function(context: &mut Context, name: FunctionName, fdef: &mut T::Function) {
+    let T::Function {
+        visibility,
+        signature,
+        body,
+        warning_filter: _,
+        index: _,
+        attributes,
+        entry,
+    } = fdef;
+    let prev_in_test = context.in_test;
+    if attributes.iter().any(|(_, attr_, _)| {
+        matches!(
+            attr_,
+            AttributeName_::Known(KnownAttribute::Testing(
+                TestingAttribute::Test | TestingAttribute::TestOnly
+            ))
+        )
+    }) {
+        context.in_test = true;
+    }
+    if name.0.value == INIT_FUNCTION_NAME {
+        init_visibility(context, name, *visibility, *entry);
+    }
+    if let Some(entry_loc) = entry {
+        entry_signature(context, *entry_loc, name, signature);
+    }
+    if let sp!(_, T::FunctionBody_::Defined(seq)) = body {
+        context.visit_seq(seq)
+    }
+    context.in_test = prev_in_test;
+}
+
+//**************************************************************************************************
+// init
+//**************************************************************************************************
+
+fn init_visibility(
+    context: &mut Context,
+    name: FunctionName,
+    visibility: Visibility,
+    entry: Option<Loc>,
+) {
+    match visibility {
+        Visibility::Public(loc) | Visibility::Friend(loc) | Visibility::Package(loc) => {
+            context.env.add_diag(diag!(
+                INIT_FUN_DIAG,
+                (name.loc(), "Invalid 'init' function declaration"),
+                (loc, "'init' functions must be internal to their module"),
+            ))
+        }
+        Visibility::Internal => (),
+    }
+    if let Some(entry) = entry {
+        context.env.add_diag(diag!(
+            INIT_FUN_DIAG,
+            (name.loc(), "Invalid 'init' function declaration"),
+            (entry, "'init' functions cannot be 'entry' functions"),
+        ));
+    }
+}
+
+fn init_signature(context: &mut Context, name: FunctionName, signature: &FunctionSignature) {
+    let FunctionSignature {
+        type_parameters,
+        parameters,
+        return_type,
+    } = signature;
+    if !type_parameters.is_empty() {
+        let tp_loc = type_parameters[0].user_specified_name.loc;
+        context.env.add_diag(diag!(
+            INIT_FUN_DIAG,
+            (name.loc(), "Invalid 'init' function declaration"),
+            (tp_loc, "'init' functions cannot have type parameters"),
+        ));
+    }
+    if !matches!(return_type, sp!(_, Type_::Unit)) {
+        let msg = format!(
+            "'init' functions must have a return type of {}",
+            error_format_(&Type_::Unit, &Subst::empty())
+        );
+        context.env.add_diag(diag!(
+            INIT_FUN_DIAG,
+            (name.loc(), "Invalid 'init' function declaration"),
+            (return_type.loc, msg),
+        ))
+    }
+    let last_loc = parameters
+        .last()
+        .map(|(_, _, sp!(loc, _))| *loc)
+        .unwrap_or(name.loc());
+    let tx_ctx_kind = parameters
+        .last()
+        .map(|(_, _, last_param_ty)| tx_context_kind(last_param_ty))
+        .unwrap_or(TxContextKind::None);
+    if tx_ctx_kind == TxContextKind::None {
+        let msg = format!(
+            "'init' functions must have their last parameter as \
+            '&{a}::{m}::{t}' or '&mut {a}::{m}::{t}'",
+            a = SUI_ADDR_NAME,
+            m = TX_CONTEXT_MODULE_NAME,
+            t = TX_CONTEXT_TYPE_NAME,
+        );
+        context.env.add_diag(diag!(
+            INIT_FUN_DIAG,
+            (name.loc(), "Invalid 'init' function declaration"),
+            (last_loc, msg),
+        ))
+    }
+
+    let otw_name: Symbol = context.otw_name();
+    if parameters.len() == 1
+        && context.one_time_witness.is_some()
+        && tx_ctx_kind != TxContextKind::None
+    {
+        // if there is 1 parameter, and a OTW, this is an error since the OTW must be used
+        let msg = format!(
+            "Invalid first parameter to 'init'. \
+            Expected this module's one-time witness type '{}::{otw_name}'",
+            context.current_module(),
+        );
+        let otw_loc = context
+            .info
+            .struct_declared_loc_(context.current_module(), &otw_name);
+        let otw_msg = "One-time witness declared here";
+        let mut diag = diag!(
+            INIT_FUN_DIAG,
+            (parameters[0].2.loc, msg),
+            (otw_loc, otw_msg),
+        );
+        diag.add_note(OTW_NOTE);
+        context.env.add_diag(diag)
+    } else if parameters.len() > 1 {
+        // if there is more than one parameter, the first must be the OTW
+        let (_, first_var, first_ty) = parameters.first().unwrap();
+        let is_otw = matches!(&first_ty.value, Type_::UnresolvedError | Type_::Var(_))
+            || matches!(
+                first_ty.value.type_name(),
+                Some(sp!(_, TypeName_::ModuleType(m, n)))
+                    if m == context.current_module() && n.value() == otw_name
+            );
+        if !is_otw {
+            let msg = format!(
+                "Invalid parameter '{}' of type {}. \
+                Expected a one-time witness type, '{}::{otw_name}",
+                first_var.value.name,
+                error_format(first_ty, &Subst::empty()),
+                context.current_module(),
+            );
+            let mut diag = diag!(
+                INIT_FUN_DIAG,
+                (name.loc(), "Invalid 'init' function declaration"),
+                (first_ty.loc, msg)
+            );
+            diag.add_note(OTW_NOTE);
+            context.env.add_diag(diag)
+        } else if let Some(sdef) = context
+            .info
+            .module(context.current_module())
+            .structs
+            .get_(&otw_name)
+        {
+            let name = context
+                .info
+                .module(context.current_module())
+                .structs
+                .get_full_key_(&otw_name)
+                .unwrap();
+            check_otw_type(context, name, sdef, Some(first_ty.loc))
+        }
+    }
+    if parameters.len() > 2 {
+        // no init function can take more than 2 parameters (the OTW and the TxContext)
+        let (_, third_var, _) = &parameters[2];
+        context.env.add_diag(diag!(
+            INIT_FUN_DIAG,
+            (name.loc(), "Invalid 'init' function declaration"),
+            (
+                third_var.loc,
+                "'init' functions can have at most two parameters"
+            ),
+        ));
+    }
+}
+
+// While theoretically we could call this just once for the upper cased module struct, we break it
+// out into a separate function to help programmers understand the rules for one-time witness types,
+// when trying to write an 'init' function.
+fn check_otw_type(
+    context: &mut Context,
+    name: StructName,
+    sdef: &N::StructDefinition,
+    usage_loc: Option<Loc>,
+) {
+    const OTW_USAGE: &str = "Attempted usage as a one-time witness here";
+    if context.one_time_witness.is_some() {
+        return;
+    }
+
+    let otw_diag = |mut diag: Diagnostic| {
+        if let Some(usage) = usage_loc {
+            diag.add_secondary_label((usage, OTW_USAGE))
+        }
+        diag.add_note(OTW_NOTE);
+        diag
+    };
+    let mut valid = true;
+    if let Some(tp) = sdef.type_parameters.first() {
+        let msg = "One-time witness types cannot have type parameters";
+        context.env.add_diag(otw_diag(diag!(
+            OTW_DECL_DIAG,
+            (name.loc(), "Invalid one-time witness declaration"),
+            (tp.param.user_specified_name.loc, msg),
+        )));
+        valid = false;
+    }
+
+    if let N::StructFields::Defined(fields) = &sdef.fields {
+        let invalid_otw_opt = invalid_otw_field_loc(fields);
+        if let Some(invalid_otw_opt) = invalid_otw_opt {
+            let msg_base = format!(
+                "One-time witness types must have no fields, \
+                or exactly one field of type {}",
+                error_format(&Type_::bool(name.loc()), &Subst::empty())
+            );
+            let (invalid_loc, invalid_msg) = match invalid_otw_opt {
+                InvalidOTW::FirstFieldNotBool(loc) => (loc, msg_base),
+                InvalidOTW::MoreThanOneField(loc) => {
+                    (loc, format!("Found more than one field. {msg_base}"))
+                }
+            };
+            context.env.add_diag(otw_diag(diag!(
+                OTW_DECL_DIAG,
+                (name.loc(), "Invalid one-time witness declaration"),
+                (invalid_loc, invalid_msg),
+            )));
+            valid = false
+        };
+    }
+
+    let invalid_ability_loc =
+        if !sdef.abilities.has_ability_(Ability_::Drop) || sdef.abilities.len() > 1 {
+            let loc = sdef
+                .abilities
+                .iter()
+                .find_map(|a| {
+                    if a.value != Ability_::Drop {
+                        Some(a.loc)
+                    } else {
+                        None
+                    }
+                })
+                .unwrap_or(name.loc());
+            Some(loc)
+        } else {
+            None
+        };
+    if let Some(loc) = invalid_ability_loc {
+        let msg = format!(
+            "One-time witness types can only have the have the '{}' ability",
+            Ability_::Drop
+        );
+        context.env.add_diag(otw_diag(diag!(
+            OTW_DECL_DIAG,
+            (name.loc(), "Invalid one-time witness declaration"),
+            (loc, msg),
+        )));
+        valid = false
+    }
+
+    context.one_time_witness = Some(if valid { Ok(name) } else { Err(()) })
+}
+
+enum InvalidOTW {
+    FirstFieldNotBool(Loc),
+    MoreThanOneField(Loc),
+}
+
+// Find the first invalid field in a one-time witness type, if any.
+// First looks for a non-boolean field, otherwise looks for any field after the first.
+fn invalid_otw_field_loc(fields: &Fields<Type>) -> Option<InvalidOTW> {
+    let invalid_first_field = fields.iter().find_map(|(loc, _, (idx, ty))| {
+        if *idx != 0 {
+            return None;
+        }
+        match ty.value.builtin_name() {
+            Some(sp!(_, BuiltinTypeName_::Bool)) => None,
+            _ => Some(loc),
+        }
+    });
+    if let Some(loc) = invalid_first_field {
+        return Some(InvalidOTW::FirstFieldNotBool(loc));
+    }
+
+    let more_than_one_field = fields
+        .iter()
+        .find(|(_, _, (idx, _))| *idx > 0)
+        .map(|(loc, _, _)| loc);
+    if let Some(loc) = more_than_one_field {
+        return Some(InvalidOTW::MoreThanOneField(loc));
+    }
+
+    None
+}
+
+//**************************************************************************************************
+// entry types
+//**************************************************************************************************
+
+fn entry_signature(
+    context: &mut Context,
+    entry_loc: Loc,
+    name: FunctionName,
+    signature: &FunctionSignature,
+) {
+    let FunctionSignature {
+        type_parameters: _,
+        parameters,
+        return_type,
+    } = signature;
+    let all_non_ctx_parameters = match parameters.last() {
+        Some((_, _, last_param_ty)) if tx_context_kind(last_param_ty) != TxContextKind::None => {
+            &parameters[0..parameters.len() - 1]
+        }
+        _ => parameters,
+    };
+    entry_param(context, entry_loc, name, all_non_ctx_parameters);
+    entry_return(context, entry_loc, name, return_type);
+}
+
+fn tx_context_kind(sp!(_, last_param_ty_): &Type) -> TxContextKind {
+    // Already an error, so assume a valid, mutable TxContext
+    if matches!(last_param_ty_, Type_::UnresolvedError | Type_::Var(_)) {
+        return TxContextKind::Mutable;
+    }
+
+    let Type_::Ref(is_mut, inner_ty) = last_param_ty_ else {
+        // not a reference
+        return TxContextKind::None;
+    };
+    let Type_::Apply(_, sp!(_, inner_name), _) = &inner_ty.value else {
+        // not a user defined type
+        return TxContextKind::None;
+    };
+    if inner_name.is(SUI_ADDR_NAME, TX_CONTEXT_MODULE_NAME, TX_CONTEXT_TYPE_NAME) {
+        if *is_mut {
+            TxContextKind::Mutable
+        } else {
+            TxContextKind::Immutable
+        }
+    } else {
+        // not the tx context
+        TxContextKind::None
+    }
+}
+
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum TxContextKind {
+    // No TxContext
+    None,
+    // &mut TxContext
+    Mutable,
+    // &TxContext
+    Immutable,
+}
+
+fn entry_param(
+    context: &mut Context,
+    entry_loc: Loc,
+    name: FunctionName,
+    parameters: &[(Mutability, Var, Type)],
+) {
+    for (_, var, ty) in parameters {
+        entry_param_ty(context, entry_loc, name, var, ty);
+    }
+}
+
+/// A valid entry param type is
+/// - A primitive (including strings, ID, and object)
+/// - A vector of primitives (including nested vectors)
+///
+/// - An object
+/// - A reference to an object
+/// - A vector of objects
+fn entry_param_ty(
+    context: &mut Context,
+    entry_loc: Loc,
+    name: FunctionName,
+    param: &Var,
+    param_ty: &Type,
+) {
+    let is_mut_clock = is_mut_clock(param_ty);
+    // TODO better error message for cases such as `MyObject<InnerTypeWithoutStore>`
+    // which should give a contextual error about `MyObject` having `key`, but the instantiation
+    // `MyObject<InnerTypeWithoutStore>` not having `key` due to `InnerTypeWithoutStore` not having
+    // `store`
+    let is_valid = is_entry_primitive_ty(param_ty)
+        || is_entry_object_ty(param_ty)
+        || is_entry_receiving_ty(param_ty);
+    if is_mut_clock || !is_valid {
+        let pmsg = format!(
+            "Invalid 'entry' parameter type for parameter '{}'",
+            param.value.name
+        );
+        let tmsg = if is_mut_clock {
+            format!(
+                "{a}::{m}::{n} must be passed by immutable reference, e.g. '&{a}::{m}::{n}'",
+                a = SUI_ADDR_NAME,
+                m = CLOCK_MODULE_NAME,
+                n = CLOCK_TYPE_NAME,
+            )
+        } else {
+            "'entry' parameters must be primitives (by-value), vectors of primitives, objects \
+            (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)"
+                .to_owned()
+        };
+        let emsg = format!("'{name}' was declared 'entry' here");
+        context.env.add_diag(diag!(
+            ENTRY_FUN_SIGNATURE_DIAG,
+            (param.loc, pmsg),
+            (param_ty.loc, tmsg),
+            (entry_loc, emsg)
+        ));
+    }
+}
+
+fn is_mut_clock(param_ty: &Type) -> bool {
+    match &param_ty.value {
+        Type_::Ref(/* mut */ false, _) => false,
+        Type_::Ref(/* mut */ true, t) => is_mut_clock(t),
+        Type_::Apply(_, sp!(_, n_), _) => n_.is(SUI_ADDR_NAME, CLOCK_MODULE_NAME, CLOCK_TYPE_NAME),
+        Type_::Unit
+        | Type_::Param(_)
+        | Type_::Var(_)
+        | Type_::Anything
+        | Type_::UnresolvedError => false,
+    }
+}
+
+fn is_entry_receiving_ty(param_ty: &Type) -> bool {
+    match &param_ty.value {
+        Type_::Ref(_, t) => is_entry_receiving_ty(t),
+        Type_::Apply(_, sp!(_, n), targs)
+            if n.is(SUI_ADDR_NAME, TRANSFER_MODULE_NAME, RECEIVING_TYPE_NAME) =>
+        {
+            debug_assert!(targs.len() == 1);
+            // Don't care about the type parameter, just that it's a receiving type -- since it has
+            // a `key` requirement on the type parameter it must be an object or type checking will
+            // fail.
+            true
+        }
+        _ => false,
+    }
+}
+
+fn is_entry_primitive_ty(param_ty: &Type) -> bool {
+    use BuiltinTypeName_ as B;
+    use TypeName_ as N;
+
+    match &param_ty.value {
+        // A bit of a hack since no primitive has key
+        Type_::Param(tp) => !tp.abilities.has_ability_(Ability_::Key),
+        // nonsensical, but no error needed
+        Type_::Apply(_, sp!(_, N::Multiple(_)), ts) => ts.iter().all(is_entry_primitive_ty),
+        // Simple recursive cases
+        Type_::Ref(_, t) => is_entry_primitive_ty(t),
+        Type_::Apply(_, sp!(_, N::Builtin(sp!(_, B::Vector))), targs) => {
+            debug_assert!(targs.len() == 1);
+            is_entry_primitive_ty(&targs[0])
+        }
+
+        // custom "primitives"
+        Type_::Apply(_, sp!(_, n), targs)
+            if n.is(STD_ADDR_NAME, ASCII_MODULE_NAME, ASCII_TYPE_NAME)
+                || n.is(STD_ADDR_NAME, UTF_MODULE_NAME, UTF_TYPE_NAME)
+                || n.is(SUI_ADDR_NAME, OBJECT_MODULE_NAME, ID_TYPE_NAME) =>
+        {
+            debug_assert!(targs.is_empty());
+            true
+        }
+        Type_::Apply(_, sp!(_, n), targs)
+            if n.is(STD_ADDR_NAME, OPTION_MODULE_NAME, OPTION_TYPE_NAME) =>
+        {
+            debug_assert!(targs.len() == 1);
+            is_entry_primitive_ty(&targs[0])
+        }
+
+        // primitives
+        Type_::Apply(_, sp!(_, N::Builtin(_)), targs) => {
+            debug_assert!(targs.is_empty());
+            true
+        }
+
+        // Non primitive
+        Type_::Apply(_, sp!(_, N::ModuleType(_, _)), _) => false,
+        Type_::Unit => false,
+
+        // Error case nothing to do
+        Type_::UnresolvedError | Type_::Anything | Type_::Var(_) => true,
+    }
+}
+
+fn is_entry_object_ty(param_ty: &Type) -> bool {
+    use BuiltinTypeName_ as B;
+    use TypeName_ as N;
+    match &param_ty.value {
+        Type_::Ref(_, t) => is_entry_object_ty_inner(t),
+        Type_::Apply(_, sp!(_, N::Builtin(sp!(_, B::Vector))), targs) => {
+            debug_assert!(targs.len() == 1);
+            is_entry_object_ty_inner(&targs[0])
+        }
+        _ => is_entry_object_ty_inner(param_ty),
+    }
+}
+
+fn is_entry_object_ty_inner(param_ty: &Type) -> bool {
+    use TypeName_ as N;
+    match &param_ty.value {
+        Type_::Param(tp) => tp.abilities.has_ability_(Ability_::Key),
+        // nonsensical, but no error needed
+        Type_::Apply(_, sp!(_, N::Multiple(_)), ts) => ts.iter().all(is_entry_object_ty_inner),
+        // Simple recursive cases, shouldn't be hit but no need to error
+        Type_::Ref(_, t) => is_entry_object_ty_inner(t),
+
+        // Objects
+        Type_::Apply(Some(abilities), _, _) => abilities.has_ability_(Ability_::Key),
+
+        // Error case nothing to do
+        Type_::UnresolvedError | Type_::Anything | Type_::Var(_) | Type_::Unit => true,
+        // Unreachable cases
+        Type_::Apply(None, _, _) => unreachable!("ICE abilities should have been expanded"),
+    }
+}
+
+fn entry_return(
+    context: &mut Context,
+    entry_loc: Loc,
+    name: FunctionName,
+    return_type @ sp!(tloc, return_type_): &Type,
+) {
+    match return_type_ {
+        // unit is fine, nothing to do
+        Type_::Unit => (),
+        Type_::Ref(_, _) => {
+            let fmsg = format!("Invalid return type for entry function '{}'", name);
+            let tmsg = "Expected a non-reference type";
+            context.env.add_diag(diag!(
+                ENTRY_FUN_SIGNATURE_DIAG,
+                (entry_loc, fmsg),
+                (*tloc, tmsg)
+            ))
+        }
+        Type_::Param(tp) => {
+            if !tp.abilities.has_ability_(Ability_::Drop) {
+                let declared_loc_opt = Some(tp.user_specified_name.loc);
+                let declared_abilities = tp.abilities.clone();
+                invalid_entry_return_ty(
+                    context,
+                    entry_loc,
+                    name,
+                    return_type,
+                    declared_loc_opt,
+                    &declared_abilities,
+                    std::iter::empty(),
+                )
+            }
+        }
+        Type_::Apply(Some(abilities), sp!(_, tn_), ty_args) => {
+            if !abilities.has_ability_(Ability_::Drop) {
+                let (declared_loc_opt, declared_abilities) = match tn_ {
+                    TypeName_::Multiple(_) => (None, AbilitySet::collection(*tloc)),
+                    TypeName_::ModuleType(m, n) => (
+                        Some(context.info.struct_declared_loc(m, n)),
+                        context.info.struct_declared_abilities(m, n).clone(),
+                    ),
+                    TypeName_::Builtin(b) => (None, b.value.declared_abilities(b.loc)),
+                };
+                invalid_entry_return_ty(
+                    context,
+                    entry_loc,
+                    name,
+                    return_type,
+                    declared_loc_opt,
+                    &declared_abilities,
+                    ty_args.iter().map(|ty_arg| (ty_arg, get_abilities(ty_arg))),
+                )
+            }
+        }
+        // Error case nothing to do
+        Type_::UnresolvedError | Type_::Anything | Type_::Var(_) => (),
+        // Unreachable cases
+        Type_::Apply(None, _, _) => unreachable!("ICE abilities should have been expanded"),
+    }
+}
+
+fn get_abilities(sp!(loc, ty_): &Type) -> AbilitySet {
+    ty_.abilities(*loc)
+        .expect("ICE abilities should have been expanded")
+}
+
+fn invalid_entry_return_ty<'a>(
+    context: &mut Context,
+    entry_loc: Loc,
+    name: FunctionName,
+    ty: &Type,
+    declared_loc_opt: Option<Loc>,
+    declared_abilities: &AbilitySet,
+    ty_args: impl IntoIterator<Item = (&'a Type, AbilitySet)>,
+) {
+    let fmsg = format!("Invalid return type for entry function '{}'", name);
+    let mut diag = diag!(ENTRY_FUN_SIGNATURE_DIAG, (entry_loc, fmsg));
+    ability_not_satisfied_tips(
+        &Subst::empty(),
+        &mut diag,
+        Ability_::Drop,
+        ty,
+        declared_loc_opt,
+        declared_abilities,
+        ty_args,
+    );
+    context.env.add_diag(diag)
+}
+
+//**************************************************************************************************
+// Expr
+//**************************************************************************************************
+
+fn exp(context: &mut Context, e: &T::Exp) {
+    match &e.exp.value {
+        T::UnannotatedExp_::ModuleCall(mcall) => {
+            let T::ModuleCall { module, name, .. } = &**mcall;
+            if !context.in_test && name.value() == symbol!("init") {
+                let msg = format!(
+                    "Invalid call to '{}::{}'. \
+                    Module initializers cannot be called directly",
+                    module, name
+                );
+                let mut diag = diag!(INIT_CALL_DIAG, (e.exp.loc, msg));
+                diag.add_note(
+                    "Module initializers are called implicitly upon publishing. \
+                    If you need to reuse this function (or want to call it from a test), \
+                    consider extracting the logic into a new function and \
+                    calling that instead.",
+                );
+                context.env.add_diag(diag)
+            }
+            if module.value.is(SUI_ADDR_NAME, EVENT_MODULE_NAME)
+                && name.value() == EVENT_FUNCTION_NAME
+            {
+                check_event_emit(context, e.exp.loc, mcall)
+            }
+            let is_transfer_module = module.value.is(SUI_ADDR_NAME, TRANSFER_MODULE_NAME);
+            if is_transfer_module && PRIVATE_TRANSFER_FUNCTIONS.contains(&name.value()) {
+                check_private_transfer(context, e.exp.loc, mcall)
+            }
+        }
+        T::UnannotatedExp_::Pack(m, s, _, _) => {
+            if !context.in_test
+                && !context
+                    .current_module()
+                    .value
+                    .is(SUI_ADDR_NAME, SUI_MODULE_NAME)
+                && context.one_time_witness.as_ref().is_some_and(|otw| {
+                    otw.as_ref()
+                        .is_ok_and(|o| m == context.current_module() && o == s)
+                })
+            {
+                let msg = "Invalid one-time witness construction. One-time witness types \
+                    cannot be created manually, but are passed as an argument 'init'";
+                let mut diag = diag!(OTW_USAGE_DIAG, (e.exp.loc, msg));
+                diag.add_note(OTW_NOTE);
+                context.env.add_diag(diag)
+            }
+        }
+        _ => (),
+    }
+}
+
+fn check_event_emit(context: &mut Context, loc: Loc, mcall: &ModuleCall) {
+    let current_module = context.current_module();
+    let ModuleCall {
+        module,
+        name,
+        type_arguments,
+        ..
+    } = mcall;
+    let Some(first_ty) = type_arguments.first() else {
+        // invalid arity
+        debug_assert!(false, "ICE arity should have been expanded for errors");
+        return;
+    };
+    let is_defined_in_current_module = matches!(first_ty.value.type_name(), Some(sp!(_, TypeName_::ModuleType(m, _))) if m == current_module);
+    if !is_defined_in_current_module {
+        let msg = format!(
+            "Invalid event. The function '{}::{}' must be called with a type defined in the current module",
+            module, name
+        );
+        let ty_msg = format!(
+            "The type {} is not declared in the current module",
+            error_format(first_ty, &Subst::empty()),
+        );
+        context.env.add_diag(diag!(
+            EVENT_EMIT_CALL_DIAG,
+            (loc, msg),
+            (first_ty.loc, ty_msg)
+        ));
+    }
+}
+
+fn check_private_transfer(context: &mut Context, loc: Loc, mcall: &ModuleCall) {
+    let ModuleCall {
+        module,
+        name,
+        type_arguments,
+        ..
+    } = mcall;
+    let current_module = context.current_module();
+    if current_module
+        .value
+        .is(SUI_ADDR_NAME, TRANSFER_FUNCTION_NAME)
+    {
+        // inside the transfer module, so no private transfer rules
+        return;
+    }
+    let Some(first_ty) = type_arguments.first() else {
+        // invalid arity
+        debug_assert!(false, "ICE arity should have been expanded for errors");
+        return;
+    };
+    let (in_current_module, first_ty_tn) = match first_ty.value.type_name() {
+        Some(sp!(_, TypeName_::Multiple(_))) | Some(sp!(_, TypeName_::Builtin(_))) | None => {
+            (false, None)
+        }
+        Some(sp!(_, TypeName_::ModuleType(m, n))) => (m == current_module, Some((m, n))),
+    };
+    if !in_current_module {
+        let mut msg = format!(
+            "Invalid private transfer. \
+            The function '{}::{}' is restricted to being called in the object's module",
+            module, name,
+        );
+        if let Some((first_ty_module, _)) = &first_ty_tn {
+            msg = format!("{}, '{}'", msg, first_ty_module);
+        };
+        let ty_msg = format!(
+            "The type {} is not declared in the current module",
+            error_format(first_ty, &Subst::empty()),
+        );
+        let mut diag = diag!(
+            PRIVATE_TRANSFER_CALL_DIAG,
+            (loc, msg),
+            (first_ty.loc, ty_msg)
+        );
+        if first_ty
+            .value
+            .has_ability_(Ability_::Store)
+            .is_some_and(|b| b)
+        {
+            let store_loc = if let Some((first_ty_module, first_ty_name)) = &first_ty_tn {
+                let abilities = context
+                    .info
+                    .struct_declared_abilities(first_ty_module, first_ty_name);
+                abilities.ability_loc_(Ability_::Store).unwrap()
+            } else {
+                first_ty
+                    .value
+                    .abilities(first_ty.loc)
+                    .expect("ICE abilities should have been expanded")
+                    .ability_loc_(Ability_::Store)
+                    .unwrap()
+            };
+            let store_msg = format!(
+                "The object has '{}' so '{}::public_{}' can be called instead",
+                Ability_::Store,
+                module,
+                name
+            );
+            diag.add_secondary_label((store_loc, store_msg))
+        }
+        context.env.add_diag(diag)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs b/vendors/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs
new file mode 100644
index 000000000..8e68e0316
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs
@@ -0,0 +1,464 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        Bytecode, CodeUnit, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature, SignatureToken,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+        TableIndex,
+    },
+    internals::ModuleIndex,
+    CompiledModule,
+};
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::Symbol;
+
+/// Pass to order handles in compiled modules and scripts stably and canonically.  Performs the
+/// following canonicalizations:
+///
+/// - Identifiers are sorted in lexicographic order.
+///
+/// - Module Handles are sorted so the self-module comes first, followed by modules with named
+///   addresses in lexical order (by address name and module name), followed by unnamed addresses in
+///   their original order.
+///
+/// - Struct and Function Handles are sorted so that definitions in the module come first, in
+///   definition order, and remaining handles follow, in lexicographical order by fully-qualified
+///   name.
+///
+/// - Friend Declarations are sorted in lexical order (by address name and module name), followed by
+///   unnamed addresses in their original order.
+
+/// Key for ordering module handles, distinguishing the module's self handle, handles with names,
+/// and handles without names.
+#[derive(Eq, PartialEq, Ord, PartialOrd)]
+enum ModuleKey {
+    SelfModule,
+    Named {
+        address: Symbol,
+        name: IdentifierIndex,
+    },
+    Unnamed,
+}
+
+/// Key for ordering function and struct handles, distinguishing handles for definitions in
+/// the module and handles for externally defined functions and structs.
+#[derive(Eq, PartialEq, Ord, PartialOrd)]
+enum ReferenceKey {
+    Internal(TableIndex),
+    External {
+        module: ModuleHandleIndex,
+        name: IdentifierIndex,
+    },
+}
+
+/// Forward the index at `$ix`, of type `$Ix` to its new location according to the `$perm`utation
+/// array.
+macro_rules! remap {
+    ($Ix:ty, $ix:expr, $perm:expr) => {
+        $ix = <$Ix>::new($perm[$ix.into_index()])
+    };
+}
+
+/// Apply canonicalization to a compiled module.
+pub fn in_module(
+    module: &mut CompiledModule,
+    address_names: &HashMap<(AccountAddress, &str), Symbol>,
+) {
+    // 1 (a). Choose ordering for identifiers.
+    let identifiers = permutation(&module.identifiers, |_ix, ident| ident);
+
+    // 1 (b). Update references to identifiers.
+    for module in &mut module.module_handles {
+        remap!(IdentifierIndex, module.name, identifiers);
+    }
+
+    for module in &mut module.friend_decls {
+        remap!(IdentifierIndex, module.name, identifiers);
+    }
+
+    for fun in &mut module.function_handles {
+        remap!(IdentifierIndex, fun.name, identifiers);
+    }
+
+    for struct_ in &mut module.struct_handles {
+        remap!(IdentifierIndex, struct_.name, identifiers);
+    }
+
+    for def in &mut module.struct_defs {
+        if let StructFieldInformation::Declared(fields) = &mut def.field_information {
+            for field in fields {
+                remap!(IdentifierIndex, field.name, identifiers);
+            }
+        };
+    }
+
+    // 1 (c). Update ordering for identifiers.  Note that updates need to happen before other
+    //        handles are re-ordered, so that they can continue referencing identifiers in their own
+    //        comparators.
+    apply_permutation(&mut module.identifiers, identifiers);
+
+    // 2 (a). Choose ordering for module handles.
+    let modules = permutation(&module.module_handles, |_ix, handle| {
+        // Order the self module first
+        if handle == module.self_handle() {
+            return ModuleKey::SelfModule;
+        }
+
+        // Preserve order between modules without a named address, pushing them to the end of the
+        // pool.
+        let Some(address_name) = address_names.get(&(
+            module.address_identifiers[handle.address.0 as usize],
+            module.identifiers[handle.name.0 as usize].as_str(),
+        )) else {
+            return ModuleKey::Unnamed;
+        };
+
+        // Layout remaining modules in lexicographical order of named address and module name.
+        ModuleKey::Named {
+            address: *address_name,
+            name: handle.name,
+        }
+    });
+
+    // 2 (b). Update references to module handles.
+    remap!(ModuleHandleIndex, module.self_module_handle_idx, modules);
+
+    for fun in &mut module.function_handles {
+        remap!(ModuleHandleIndex, fun.module, modules);
+    }
+
+    for struct_ in &mut module.struct_handles {
+        remap!(ModuleHandleIndex, struct_.module, modules);
+    }
+
+    // 2 (c). Update ordering for module handles.
+    apply_permutation(&mut module.module_handles, modules);
+
+    // 3 (a). Choose ordering for struct handles.
+    let struct_defs = struct_definition_order(&module.struct_defs);
+    let structs = permutation(&module.struct_handles, |ix, handle| {
+        if handle.module == module.self_handle_idx() {
+            // Order structs from this module first, and in definition order
+            let Some(def_position) = struct_defs.get(&StructHandleIndex(ix)) else {
+                panic!("ICE struct handle from module without definition: {handle:?}");
+            };
+            ReferenceKey::Internal(def_position.0)
+        } else {
+            // Order the remaining handles afterwards, in lexicographical order of module, then
+            // struct name.
+            ReferenceKey::External {
+                module: handle.module,
+                name: handle.name,
+            }
+        }
+    });
+
+    // 3 (b). Update references to struct handles.
+    for def in &mut module.struct_defs {
+        remap!(StructHandleIndex, def.struct_handle, structs);
+        if let StructFieldInformation::Declared(fields) = &mut def.field_information {
+            for field in fields {
+                remap_signature_token(&mut field.signature.0, &structs);
+            }
+        };
+    }
+
+    for Signature(tokens) in &mut module.signatures {
+        for token in tokens {
+            remap_signature_token(token, &structs);
+        }
+    }
+
+    // 3 (c). Update ordering for struct handles.
+    apply_permutation(&mut module.struct_handles, structs);
+
+    // 4 (a). Choose ordering for function handles.
+    let function_defs = function_definition_order(&module.function_defs);
+    let functions = permutation(&module.function_handles, |ix, handle| {
+        if handle.module == module.self_handle_idx() {
+            // Order functions from this module first, and in definition order
+            let Some(def_position) = function_defs.get(&FunctionHandleIndex(ix)) else {
+                panic!("ICE function handle from module without definition: {handle:?}");
+            };
+            ReferenceKey::Internal(def_position.0)
+        } else {
+            // Order the remaining handles afterwards, in lexicographical order of module, then
+            // function name.
+            ReferenceKey::External {
+                module: handle.module,
+                name: handle.name,
+            }
+        }
+    });
+
+    // 4 (b). Update references to function handles.
+    for inst in &mut module.function_instantiations {
+        remap!(FunctionHandleIndex, inst.handle, functions);
+    }
+
+    for def in &mut module.function_defs {
+        remap!(FunctionHandleIndex, def.function, functions);
+        if let Some(code) = &mut def.code {
+            remap_code(code, &functions);
+        }
+    }
+
+    // 4 (c). Update ordering for function handles.
+    apply_permutation(&mut module.function_handles, functions);
+
+    // 5. Update ordering for friend decls, (it has no internal references pointing to it).
+    module.friend_decls.sort_by_key(|handle| {
+        // Preserve order between modules without a named address, pushing them to the end of the
+        // pool.
+        let Some(address_name) = address_names.get(&(
+            module.address_identifiers[handle.address.0 as usize],
+            module.identifiers[handle.name.0 as usize].as_str(),
+        )) else {
+            return ModuleKey::Unnamed;
+        };
+
+        // Layout remaining modules in lexicographical order of named address and module name.
+        ModuleKey::Named {
+            address: *address_name,
+            name: handle.name,
+        }
+    });
+}
+
+/// Apply canonicalization to a compiled script.
+pub fn in_script(
+    script: &mut CompiledScript,
+    address_names: &HashMap<(AccountAddress, &str), Symbol>,
+) {
+    // 1 (a). Choose ordering for identifiers.
+    let identifiers = permutation(&script.identifiers, |_ix, ident| ident);
+
+    // 1 (b). Update references to identifiers.
+    for module in &mut script.module_handles {
+        remap!(IdentifierIndex, module.name, identifiers);
+    }
+
+    for fun in &mut script.function_handles {
+        remap!(IdentifierIndex, fun.name, identifiers);
+    }
+
+    for struct_ in &mut script.struct_handles {
+        remap!(IdentifierIndex, struct_.name, identifiers);
+    }
+
+    // 1 (c). Update ordering for identifiers.  Note that updates need to happen before other
+    //        handles are re-ordered, so that they can continue referencing identifiers in their own
+    //        comparators.
+    apply_permutation(&mut script.identifiers, identifiers);
+
+    // 2 (a). Choose ordering for module handles.
+    let modules = permutation(&script.module_handles, |_ix, handle| {
+        // Preserve order between modules without a named address, pushing them to the end of the
+        // pool.
+        let Some(address_name) = address_names.get(&(
+            script.address_identifiers[handle.address.0 as usize],
+            script.identifiers[handle.name.0 as usize].as_str(),
+        )) else {
+            return ModuleKey::Unnamed;
+        };
+
+        // Layout remaining modules in lexicographical order of named address and module name.
+        ModuleKey::Named {
+            address: *address_name,
+            name: handle.name,
+        }
+    });
+
+    // 2 (b). Update references to module handles.
+    for fun in &mut script.function_handles {
+        remap!(ModuleHandleIndex, fun.module, modules);
+    }
+
+    for struct_ in &mut script.struct_handles {
+        remap!(ModuleHandleIndex, struct_.module, modules);
+    }
+
+    // 2 (c). Update ordering for module handles.
+    apply_permutation(&mut script.module_handles, modules);
+
+    // 3 (a). Choose ordering for struct handles.
+    let structs = permutation(&script.struct_handles, |_ix, handle| {
+        ReferenceKey::External {
+            module: handle.module,
+            name: handle.name,
+        }
+    });
+
+    // 3 (b). Update references to struct handles.
+    for Signature(tokens) in &mut script.signatures {
+        for token in tokens {
+            remap_signature_token(token, &structs);
+        }
+    }
+
+    // 3 (b). Update ordering for struct handles.
+    apply_permutation(&mut script.struct_handles, structs);
+
+    // 4 (a). Choose ordering for function handles.
+    let functions = permutation(&script.function_handles, |_ix, handle| {
+        // Order handles in lexicographical order of module, then function name.
+        ReferenceKey::External {
+            module: handle.module,
+            name: handle.name,
+        }
+    });
+
+    // 4 (b). Update references to function handles.
+    for inst in &mut script.function_instantiations {
+        remap!(FunctionHandleIndex, inst.handle, functions);
+    }
+
+    remap_code(&mut script.code, &functions);
+
+    // 4 (c). Update ordering for function handles.
+    apply_permutation(&mut script.function_handles, functions);
+}
+
+/// Reverses mapping from `StructDefinition(Index)` to `StructHandle`, so that handles for structs
+/// defined in a module can be arranged in definition order.
+fn struct_definition_order(
+    defs: &[StructDefinition],
+) -> HashMap<StructHandleIndex, StructDefinitionIndex> {
+    defs.iter()
+        .enumerate()
+        .map(|(ix, def)| (def.struct_handle, StructDefinitionIndex(ix as TableIndex)))
+        .collect()
+}
+
+/// Reverses mapping from `FunctionDefinition(Index)` to `FunctionHandle`, so that handles for
+/// structs defined in a module can be arranged in definition order.
+fn function_definition_order(
+    defs: &[FunctionDefinition],
+) -> HashMap<FunctionHandleIndex, FunctionDefinitionIndex> {
+    defs.iter()
+        .enumerate()
+        .map(|(ix, def)| (def.function, FunctionDefinitionIndex(ix as TableIndex)))
+        .collect()
+}
+
+/// Update references to `StructHandle`s within signatures according to the permutation defined by
+/// `structs`.
+fn remap_signature_token(token: &mut SignatureToken, structs: &[TableIndex]) {
+    use SignatureToken as T;
+    match token {
+        T::Bool
+        | T::U8
+        | T::U16
+        | T::U32
+        | T::U64
+        | T::U128
+        | T::U256
+        | T::Address
+        | T::Signer
+        | T::TypeParameter(_) => (),
+
+        T::Vector(token) | T::Reference(token) | T::MutableReference(token) => {
+            remap_signature_token(token, structs)
+        }
+
+        T::Struct(handle) => remap!(StructHandleIndex, *handle, structs),
+
+        T::StructInstantiation(handle, tokens) => {
+            remap!(StructHandleIndex, *handle, structs);
+            for token in tokens {
+                remap_signature_token(token, structs)
+            }
+        }
+    }
+}
+
+/// Update references to function handles within code according to the permutation defined by
+/// `functions`.
+fn remap_code(code: &mut CodeUnit, functions: &[TableIndex]) {
+    for instr in &mut code.code {
+        if let Bytecode::Call(function) = instr {
+            remap!(FunctionHandleIndex, *function, functions);
+        }
+    }
+}
+
+/// Calculates the permutation of indices in `pool` that sorts it according to the key function
+/// `key`:  The resulting `permutation` array is such that, new `pool'` defined by:
+///
+///   pool'[permutation[i]] = pool[i]
+///
+/// is sorted according to `key`.
+fn permutation<'p, T, K: Ord>(
+    pool: &'p Vec<T>,
+    key: impl Fn(TableIndex, &'p T) -> K + 'p,
+) -> Vec<TableIndex> {
+    let mut inverse: Vec<_> = (0..pool.len() as TableIndex).collect();
+    inverse.sort_by_key(move |ix| key(*ix, &pool[*ix as usize]));
+
+    let mut permutation = vec![0 as TableIndex; pool.len()];
+    for (ix, jx) in inverse.into_iter().enumerate() {
+        permutation[jx as usize] = ix as TableIndex;
+    }
+
+    permutation
+}
+
+/// Re-order `pool` according to the `permutation` array.  `permutation[i]` is the new location of
+/// `pool[i]`.
+fn apply_permutation<T>(pool: &mut Vec<T>, mut permutation: Vec<TableIndex>) {
+    assert_eq!(pool.len(), permutation.len());
+
+    // At every iteration we confirm that one more value is in its final position in the pool,
+    // either because we discover it is already in the correct place, or we move it to its correct
+    // place.
+    for ix in 0..pool.len() {
+        loop {
+            let jx = permutation[ix] as usize;
+            if ix == jx {
+                break;
+            }
+            pool.swap(ix, jx);
+            permutation.swap(ix, jx);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn permutation_reverse() {
+        let mut orig = vec![0i32, 1, 2, 3];
+
+        let perm = permutation(&orig, |_, i| -i);
+        assert_eq!(perm, vec![3, 2, 1, 0]);
+
+        apply_permutation(&mut orig, perm);
+        assert_eq!(orig, vec![3, 2, 1, 0]);
+    }
+
+    #[test]
+    fn permutation_stability() {
+        let orig = vec![5, 3, 6, 2, 1, 4];
+
+        // Generating the permutation
+        let perm = permutation(&orig, |_, i| i % 2 == 1);
+        assert_eq!(perm, vec![3, 4, 0, 1, 5, 2]);
+
+        // Applying the permutation
+        let mut sort = orig.clone();
+        apply_permutation(&mut sort, perm.clone());
+        assert_eq!(sort, vec![6, 2, 4, 5, 3, 1]);
+
+        // Confirm the definition of the permutation array
+        for (ix, i) in orig.iter().enumerate() {
+            assert_eq!(sort[perm[ix] as usize], *i, "{ix}: {i}");
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/context.rs b/vendors/move/crates/move-compiler/src/to_bytecode/context.rs
new file mode 100644
index 000000000..777324763
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/context.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    expansion::ast::{Address, ModuleIdent, ModuleIdent_, SpecId},
+    hlir::ast::{self as H, Var},
+    parser::ast::{ConstantName, FunctionName, StructName},
+    shared::{CompilationEnv, NumericalAddress},
+};
+use move_core_types::account_address::AccountAddress as MoveAddress;
+use move_ir_types::ast as IR;
+use move_symbol_pool::Symbol;
+use std::{
+    clone::Clone,
+    collections::{BTreeMap, BTreeSet, HashMap},
+};
+use IR::Ability;
+
+/// Compilation context for a single compilation unit (module or script).
+/// Contains all of the dependencies actually used in the module
+pub struct Context<'a> {
+    pub env: &'a mut CompilationEnv,
+    current_package: Option<Symbol>,
+    current_module: Option<&'a ModuleIdent>,
+    seen_structs: BTreeSet<(ModuleIdent, StructName)>,
+    seen_functions: BTreeSet<(ModuleIdent, FunctionName)>,
+    spec_info: BTreeMap<SpecId, (IR::NopLabel, BTreeMap<Var, H::SingleType>)>,
+}
+
+impl<'a> Context<'a> {
+    pub fn new(
+        env: &'a mut CompilationEnv,
+        current_package: Option<Symbol>,
+        current_module: Option<&'a ModuleIdent>,
+    ) -> Self {
+        Self {
+            env,
+            current_package,
+            current_module,
+            seen_structs: BTreeSet::new(),
+            seen_functions: BTreeSet::new(),
+            spec_info: BTreeMap::new(),
+        }
+    }
+
+    #[allow(unused)]
+    pub fn current_package(&self) -> Option<Symbol> {
+        self.current_package
+    }
+
+    pub fn current_module(&self) -> Option<&'a ModuleIdent> {
+        self.current_module
+    }
+
+    fn is_current_module(&self, m: &ModuleIdent) -> bool {
+        self.current_module.map(|cur| cur == m).unwrap_or(false)
+    }
+
+    pub fn finish_function(
+        &mut self,
+    ) -> BTreeMap<SpecId, (IR::NopLabel, BTreeMap<Var, H::SingleType>)> {
+        std::mem::take(&mut self.spec_info)
+    }
+
+    //**********************************************************************************************
+    // Dependency item building
+    //**********************************************************************************************
+
+    pub fn materialize(
+        self,
+        dependency_orderings: &HashMap<ModuleIdent, usize>,
+        struct_declarations: &HashMap<
+            (ModuleIdent, StructName),
+            (BTreeSet<IR::Ability>, Vec<IR::StructTypeParameter>),
+        >,
+        function_declarations: &HashMap<
+            (ModuleIdent, FunctionName),
+            (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+        >,
+    ) -> (Vec<IR::ImportDefinition>, Vec<IR::ModuleDependency>) {
+        let Context {
+            current_module: _current_module,
+            mut seen_structs,
+            seen_functions,
+            ..
+        } = self;
+        let mut module_dependencies = BTreeMap::new();
+        Self::function_dependencies(
+            function_declarations,
+            &mut module_dependencies,
+            &mut seen_structs,
+            seen_functions,
+        );
+        Self::struct_dependencies(struct_declarations, &mut module_dependencies, seen_structs);
+        let mut imports = vec![];
+        let mut ordered_dependencies = vec![];
+        for (module, (structs, functions)) in module_dependencies {
+            let dependency_order = dependency_orderings[&module];
+            let ir_name = Self::ir_module_alias(&module);
+            let ir_ident = Self::translate_module_ident(module);
+            imports.push(IR::ImportDefinition::new(ir_ident, Some(ir_name)));
+            ordered_dependencies.push((
+                dependency_order,
+                IR::ModuleDependency {
+                    name: ir_name,
+                    structs,
+                    functions,
+                },
+            ));
+        }
+        ordered_dependencies.sort_by_key(|(ordering, _)| *ordering);
+        let dependencies = ordered_dependencies.into_iter().map(|(_, m)| m).collect();
+        (imports, dependencies)
+    }
+
+    fn insert_struct_dependency(
+        module_dependencies: &mut BTreeMap<
+            ModuleIdent,
+            (Vec<IR::StructDependency>, Vec<IR::FunctionDependency>),
+        >,
+        module: ModuleIdent,
+        struct_dep: IR::StructDependency,
+    ) {
+        module_dependencies
+            .entry(module)
+            .or_insert_with(|| (vec![], vec![]))
+            .0
+            .push(struct_dep);
+    }
+
+    fn insert_function_dependency(
+        module_dependencies: &mut BTreeMap<
+            ModuleIdent,
+            (Vec<IR::StructDependency>, Vec<IR::FunctionDependency>),
+        >,
+        module: ModuleIdent,
+        function_dep: IR::FunctionDependency,
+    ) {
+        module_dependencies
+            .entry(module)
+            .or_insert_with(|| (vec![], vec![]))
+            .1
+            .push(function_dep);
+    }
+
+    fn struct_dependencies(
+        struct_declarations: &HashMap<
+            (ModuleIdent, StructName),
+            (BTreeSet<Ability>, Vec<IR::StructTypeParameter>),
+        >,
+        module_dependencies: &mut BTreeMap<
+            ModuleIdent,
+            (Vec<IR::StructDependency>, Vec<IR::FunctionDependency>),
+        >,
+        seen_structs: BTreeSet<(ModuleIdent, StructName)>,
+    ) {
+        for (module, sname) in seen_structs {
+            let struct_dep = Self::struct_dependency(struct_declarations, &module, sname);
+            Self::insert_struct_dependency(module_dependencies, module, struct_dep);
+        }
+    }
+
+    fn struct_dependency(
+        struct_declarations: &HashMap<
+            (ModuleIdent, StructName),
+            (BTreeSet<Ability>, Vec<IR::StructTypeParameter>),
+        >,
+        module: &ModuleIdent,
+        sname: StructName,
+    ) -> IR::StructDependency {
+        let key = (*module, sname);
+        let (abilities, type_formals) = struct_declarations.get(&key).unwrap().clone();
+        let name = Self::translate_struct_name(sname);
+        IR::StructDependency {
+            abilities,
+            name,
+            type_formals,
+        }
+    }
+
+    fn function_dependencies(
+        function_declarations: &HashMap<
+            (ModuleIdent, FunctionName),
+            (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+        >,
+        module_dependencies: &mut BTreeMap<
+            ModuleIdent,
+            (Vec<IR::StructDependency>, Vec<IR::FunctionDependency>),
+        >,
+        seen_structs: &mut BTreeSet<(ModuleIdent, StructName)>,
+        seen_functions: BTreeSet<(ModuleIdent, FunctionName)>,
+    ) {
+        for (module, fname) in seen_functions {
+            let (functions_seen_structs, function_dep) =
+                Self::function_dependency(function_declarations, &module, fname);
+            Self::insert_function_dependency(module_dependencies, module, function_dep);
+            seen_structs.extend(functions_seen_structs)
+        }
+    }
+
+    fn function_dependency(
+        function_declarations: &HashMap<
+            (ModuleIdent, FunctionName),
+            (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+        >,
+        module: &ModuleIdent,
+        fname: FunctionName,
+    ) -> (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionDependency) {
+        let key = (*module, fname);
+        let (seen_structs, signature) = function_declarations.get(&key).unwrap().clone();
+        let name = Self::translate_function_name(fname);
+        (seen_structs, IR::FunctionDependency { name, signature })
+    }
+
+    //**********************************************************************************************
+    // Name translation
+    //**********************************************************************************************
+
+    fn ir_module_alias(sp!(_, ModuleIdent_ { address, module }): &ModuleIdent) -> IR::ModuleName {
+        let s = match address {
+            Address::Numerical {
+                value: sp!(_, a_), ..
+            } => format!("{:X}::{}", a_, module),
+            Address::NamedUnassigned(name) => format!("{}::{}", name, module),
+        };
+        IR::ModuleName(s.into())
+    }
+
+    pub fn resolve_address(&self, addr: Address) -> NumericalAddress {
+        addr.into_addr_bytes()
+    }
+
+    pub fn translate_module_ident(
+        sp!(_, ModuleIdent_ { address, module }): ModuleIdent,
+    ) -> IR::ModuleIdent {
+        let address_bytes = address.into_addr_bytes();
+        let name = Self::translate_module_name_(module.0.value);
+        IR::ModuleIdent::new(name, MoveAddress::new(address_bytes.into_bytes()))
+    }
+
+    fn translate_module_name_(s: Symbol) -> IR::ModuleName {
+        IR::ModuleName(s)
+    }
+
+    fn translate_struct_name(n: StructName) -> IR::StructName {
+        IR::StructName(n.0.value)
+    }
+
+    fn translate_constant_name(n: ConstantName) -> IR::ConstantName {
+        IR::ConstantName(n.0.value)
+    }
+
+    fn translate_function_name(n: FunctionName) -> IR::FunctionName {
+        IR::FunctionName(n.0.value)
+    }
+
+    //**********************************************************************************************
+    // Name resolution
+    //**********************************************************************************************
+
+    pub fn struct_definition_name(&self, m: &ModuleIdent, s: StructName) -> IR::StructName {
+        assert!(
+            self.is_current_module(m),
+            "ICE invalid struct definition lookup"
+        );
+        Self::translate_struct_name(s)
+    }
+
+    pub fn qualified_struct_name(
+        &mut self,
+        m: &ModuleIdent,
+        s: StructName,
+    ) -> IR::QualifiedStructIdent {
+        let mname = if self.is_current_module(m) {
+            IR::ModuleName::module_self()
+        } else {
+            self.seen_structs.insert((*m, s));
+            Self::ir_module_alias(m)
+        };
+        let n = Self::translate_struct_name(s);
+        IR::QualifiedStructIdent::new(mname, n)
+    }
+
+    pub fn function_definition_name(
+        &self,
+        m: Option<&ModuleIdent>,
+        f: FunctionName,
+    ) -> IR::FunctionName {
+        assert!(
+            self.current_module == m,
+            "ICE invalid function definition lookup"
+        );
+        Self::translate_function_name(f)
+    }
+
+    pub fn qualified_function_name(
+        &mut self,
+        m: &ModuleIdent,
+        f: FunctionName,
+    ) -> (IR::ModuleName, IR::FunctionName) {
+        let mname = if self.is_current_module(m) {
+            IR::ModuleName::module_self()
+        } else {
+            self.seen_functions.insert((*m, f));
+            Self::ir_module_alias(m)
+        };
+        let n = Self::translate_function_name(f);
+        (mname, n)
+    }
+
+    pub fn constant_definition_name(
+        &self,
+        m: Option<&ModuleIdent>,
+        f: ConstantName,
+    ) -> IR::ConstantName {
+        assert!(
+            self.current_module == m,
+            "ICE invalid constant definition lookup"
+        );
+        Self::translate_constant_name(f)
+    }
+
+    pub fn constant_name(&mut self, f: ConstantName) -> IR::ConstantName {
+        Self::translate_constant_name(f)
+    }
+
+    //**********************************************************************************************
+    // Nops
+    //**********************************************************************************************
+
+    pub fn spec(&mut self, id: SpecId, used_locals: BTreeMap<Var, H::SingleType>) -> IR::NopLabel {
+        let label = IR::NopLabel(format!("{}", id).into());
+        assert!(self
+            .spec_info
+            .insert(id, (label.clone(), used_locals))
+            .is_none());
+        label
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/mod.rs b/vendors/move/crates/move-compiler/src/to_bytecode/mod.rs
new file mode 100644
index 000000000..70c806a91
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/mod.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod canonicalize_handles;
+#[macro_use]
+mod context;
+mod optimize;
+pub mod translate;
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/optimize/mod.rs b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/mod.rs
new file mode 100644
index 000000000..3dc46c0e4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/mod.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod remove_fallthrough_jumps;
+mod remove_nop_store;
+mod remove_unused_locals;
+mod remove_write_back;
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast::{self as IR};
+use std::collections::{BTreeSet, HashMap};
+
+pub type Optimization = fn(
+    &FunctionName,
+    &BTreeSet<IR::BlockLabel_>,
+    &mut Vec<(IR::Var, IR::Type)>,
+    &mut IR::BytecodeBlocks,
+) -> bool;
+
+const OPTIMIZATIONS: &[Optimization] = &[
+    remove_fallthrough_jumps::optimize,
+    remove_nop_store::optimize,
+    remove_write_back::optimize,
+    remove_unused_locals::optimize,
+];
+
+pub(crate) fn code(
+    f: &FunctionName,
+    loop_heads: &BTreeSet<IR::BlockLabel_>,
+    locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) {
+    let mut count = 0;
+    for optimization in OPTIMIZATIONS.iter().cycle() {
+        // if we have fully cycled through the list of optimizations without a change,
+        // it is safe to stop
+        if count >= OPTIMIZATIONS.len() {
+            debug_assert_eq!(count, OPTIMIZATIONS.len());
+            break;
+        }
+
+        // reset the count if something has changed
+        if optimization(f, loop_heads, locals, blocks) {
+            count = 0
+        } else {
+            count += 1
+        }
+    }
+}
+
+fn remap_labels(blocks: &mut IR::BytecodeBlocks, map: &HashMap<IR::BlockLabel_, IR::BlockLabel_>) {
+    use IR::Bytecode_ as B;
+    for (_, block) in blocks {
+        for instr in block {
+            match &mut instr.value {
+                B::Branch(lbl) | B::BrTrue(lbl) | B::BrFalse(lbl) => {
+                    *lbl = map[lbl].clone();
+                }
+                _ => (),
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs
new file mode 100644
index 000000000..763e83cbb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs
@@ -0,0 +1,70 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast::{self as IR};
+use std::collections::{BTreeSet, HashMap};
+
+// Removes any "fall through jumps", i.e. this a is a jump directly to the next instruction.
+// Iterates to find a fixpoint as it might create empty blocks which could create more jumps to
+// clean up
+
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let fall_through_removed = remove_fall_through(loop_heads, blocks);
+    let block_removed = remove_empty_blocks(blocks);
+    fall_through_removed || block_removed
+}
+
+fn remove_fall_through(
+    loop_heads: &BTreeSet<IR::BlockLabel_>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    use IR::Bytecode_ as B;
+    let mut changed = false;
+    for idx in 0..(blocks.len() - 1) {
+        let next_block = &blocks[idx + 1].0.clone();
+        let (lbl, block) = &mut blocks[idx];
+        // Don't inline loop heads for the move-prover
+        if loop_heads.contains(lbl) {
+            continue;
+        }
+
+        let remove_last =
+            matches!(&block.last().unwrap().value, B::Branch(lbl) if lbl == next_block);
+        if remove_last {
+            changed = true;
+            block.pop();
+        }
+    }
+    changed
+}
+
+fn remove_empty_blocks(blocks: &mut IR::BytecodeBlocks) -> bool {
+    let mut label_map = HashMap::new();
+    let mut cur_label = None;
+    let mut removed = false;
+    let old_blocks = std::mem::take(blocks);
+    for (label, block) in old_blocks.into_iter().rev() {
+        if block.is_empty() {
+            removed = true;
+        } else {
+            cur_label = Some(label.clone());
+            blocks.push((label.clone(), block))
+        }
+        label_map.insert(label, cur_label.clone().unwrap());
+    }
+    blocks.reverse();
+
+    if removed {
+        super::remap_labels(blocks, &label_map);
+    }
+
+    removed
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs
new file mode 100644
index 000000000..3f37dcf7c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unnecessary storing to a local just to move the value out.
+
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut changed = false;
+    for (_lbl, block) in blocks {
+        let mut new_block = vec![];
+        let mut i = 0;
+        while i < block.len() {
+            match (&block[i], block.get(i + 1)) {
+                (sp!(_, IR::Bytecode_::StLoc(v1)), Some(sp!(_, IR::Bytecode_::MoveLoc(v2))))
+                    if v1 == v2 =>
+                {
+                    changed = true;
+                    i += 2
+                }
+                (instr, _) => {
+                    new_block.push(instr.clone());
+                    i += 1
+                }
+            }
+        }
+        *block = new_block;
+    }
+
+    changed
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs
new file mode 100644
index 000000000..bf13d738d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs
@@ -0,0 +1,42 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unused locals. Most likely generated from other optimizations
+
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut unused = locals
+        .iter()
+        .map(|(sp!(_, v_), _)| v_.clone())
+        .collect::<BTreeSet<_>>();
+    for (_lbl, block) in blocks {
+        for sp!(_, instr_) in block {
+            match instr_ {
+                IR::Bytecode_::CopyLoc(sp!(_, v_))
+                | IR::Bytecode_::MoveLoc(sp!(_, v_))
+                | IR::Bytecode_::StLoc(sp!(_, v_))
+                | IR::Bytecode_::MutBorrowLoc(sp!(_, v_))
+                | IR::Bytecode_::ImmBorrowLoc(sp!(_, v_)) => {
+                    unused.remove(v_);
+                }
+                _ => (),
+            }
+        }
+    }
+    if unused.is_empty() {
+        return false;
+    }
+    *locals = std::mem::take(locals)
+        .into_iter()
+        .filter(|(sp!(_, v_), _)| !unused.contains(v_))
+        .collect();
+    true
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_write_back.rs b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_write_back.rs
new file mode 100644
index 000000000..7832db108
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/optimize/remove_write_back.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unnecessary moving/copying a value out of a local just to reassign the value back.
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut changed = false;
+    for (_lbl, block) in blocks {
+        let mut new_block = vec![];
+        let mut i = 0;
+        while i < block.len() {
+            match (&block[i], block.get(i + 1)) {
+                (sp!(_, IR::Bytecode_::CopyLoc(v1)), Some(sp!(_, IR::Bytecode_::StLoc(v2))))
+                | (sp!(_, IR::Bytecode_::MoveLoc(v1)), Some(sp!(_, IR::Bytecode_::StLoc(v2))))
+                    if v1 == v2 =>
+                {
+                    changed = true;
+                    i += 2
+                }
+                (instr, _) => {
+                    new_block.push(instr.clone());
+                    i += 1
+                }
+            }
+        }
+        *block = new_block;
+    }
+
+    changed
+}
diff --git a/vendors/move/crates/move-compiler/src/to_bytecode/translate.rs b/vendors/move/crates/move-compiler/src/to_bytecode/translate.rs
new file mode 100644
index 000000000..7cdc41fbf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/to_bytecode/translate.rs
@@ -0,0 +1,1233 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{canonicalize_handles, context::*, optimize};
+use crate::{
+    cfgir::{ast as G, translate::move_value_from_value_},
+    compiled_unit::*,
+    diag,
+    expansion::ast::{AbilitySet, Address, Attributes, ModuleIdent, ModuleIdent_, SpecId},
+    hlir::{
+        ast::{self as H, Value_, Var, Visibility},
+        translate::{display_var, DisplayVar},
+    },
+    naming::{
+        ast::{BuiltinTypeName_, StructTypeParameter, TParam},
+        fake_natives,
+    },
+    parser::ast::{
+        Ability, Ability_, BinOp, BinOp_, ConstantName, Field, FunctionName, ModuleName,
+        StructName, UnaryOp, UnaryOp_,
+    },
+    shared::{unique_map::UniqueMap, *},
+    FullyCompiledProgram,
+};
+use move_binary_format::file_format as F;
+use move_bytecode_source_map::source_map::SourceMap;
+use move_core_types::account_address::AccountAddress as MoveAddress;
+use move_ir_types::{ast as IR, location::*};
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    convert::TryInto,
+};
+
+type CollectedInfos = UniqueMap<FunctionName, CollectedInfo>;
+type CollectedInfo = (
+    Vec<(Var, H::SingleType)>,
+    BTreeMap<SpecId, (IR::NopLabel, BTreeMap<Var, H::SingleType>)>,
+    Attributes,
+);
+
+fn extract_decls(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: &G::Program,
+) -> (
+    HashMap<ModuleIdent, usize>,
+    HashMap<(ModuleIdent, StructName), (BTreeSet<IR::Ability>, Vec<IR::StructTypeParameter>)>,
+    HashMap<
+        (ModuleIdent, FunctionName),
+        (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+    >,
+) {
+    let pre_compiled_modules = || {
+        pre_compiled_lib.iter().flat_map(|pre_compiled| {
+            pre_compiled
+                .cfgir
+                .modules
+                .key_cloned_iter()
+                .filter(|(mident, _m)| !prog.modules.contains_key(mident))
+        })
+    };
+
+    let mut max_ordering = 0;
+    let mut orderings: HashMap<ModuleIdent, usize> = pre_compiled_modules()
+        .map(|(m, mdef)| {
+            max_ordering = std::cmp::max(max_ordering, mdef.dependency_order);
+            (m, mdef.dependency_order)
+        })
+        .collect();
+    for (m, mdef) in prog.modules.key_cloned_iter() {
+        orderings.insert(m, mdef.dependency_order + 1 + max_ordering);
+    }
+
+    let all_modules = || prog.modules.key_cloned_iter().chain(pre_compiled_modules());
+    let sdecls = all_modules()
+        .flat_map(|(m, mdef)| {
+            mdef.structs.key_cloned_iter().map(move |(s, sdef)| {
+                let key = (m, s);
+                let abilities = abilities(&sdef.abilities);
+                let type_parameters = struct_type_parameters(sdef.type_parameters.clone());
+                (key, (abilities, type_parameters))
+            })
+        })
+        .collect();
+    let context = &mut Context::new(compilation_env, None, None);
+    let fdecls = all_modules()
+        .flat_map(|(m, mdef)| {
+            mdef.functions
+                .key_cloned_iter()
+                // TODO full prover support for vector bytecode instructions
+                // TODO filter out fake natives
+                // These cannot be filtered out due to lacking prover support for the operations
+                // .filter(|(_, fdef)| {
+                //            !fdef
+                //             .attributes
+                //             .contains_key_(&fake_natives::FAKE_NATIVE_ATTR)
+                // })
+                .map(move |(f, fdef)| {
+                    let key = (m, f);
+                    let seen = seen_structs(&fdef.signature);
+                    let gsig = fdef.signature.clone();
+                    (key, (seen, gsig))
+                })
+        })
+        .map(|(key, (seen, gsig))| (key, (seen, function_signature(context, gsig))))
+        .collect();
+    (orderings, sdecls, fdecls)
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: G::Program,
+) -> Vec<AnnotatedCompiledUnit> {
+    let mut units = vec![];
+
+    let (orderings, sdecls, fdecls) = extract_decls(compilation_env, pre_compiled_lib, &prog);
+    let G::Program {
+        modules: gmodules,
+        scripts: gscripts,
+    } = prog;
+
+    let mut source_modules = gmodules
+        .into_iter()
+        .filter(|(_, mdef)| mdef.is_source_module)
+        .collect::<Vec<_>>();
+    source_modules.sort_by_key(|(_, mdef)| mdef.dependency_order);
+    for (m, mdef) in source_modules {
+        if let Some(unit) = module(compilation_env, m, mdef, &orderings, &sdecls, &fdecls) {
+            units.push(unit)
+        }
+    }
+    for (key, s) in gscripts {
+        let G::Script {
+            warning_filter: _warning_filter,
+            package_name,
+            attributes: _attributes,
+            loc: _loc,
+            constants,
+            function_name,
+            function,
+        } = s;
+        if let Some(unit) = script(
+            compilation_env,
+            package_name,
+            key,
+            constants,
+            function_name,
+            function,
+            &orderings,
+            &sdecls,
+            &fdecls,
+        ) {
+            units.push(unit)
+        }
+    }
+    units
+}
+
+fn module(
+    compilation_env: &mut CompilationEnv,
+    ident: ModuleIdent,
+    mdef: G::ModuleDefinition,
+    dependency_orderings: &HashMap<ModuleIdent, usize>,
+    struct_declarations: &HashMap<
+        (ModuleIdent, StructName),
+        (BTreeSet<IR::Ability>, Vec<IR::StructTypeParameter>),
+    >,
+    function_declarations: &HashMap<
+        (ModuleIdent, FunctionName),
+        (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+    >,
+) -> Option<AnnotatedCompiledUnit> {
+    let G::ModuleDefinition {
+        warning_filter: _warning_filter,
+        package_name,
+        attributes: _attributes,
+        is_source_module: _is_source_module,
+        dependency_order: _dependency_order,
+        friends: gfriends,
+        structs: gstructs,
+        constants: gconstants,
+        functions: gfunctions,
+    } = mdef;
+    let mut context = Context::new(compilation_env, package_name, Some(&ident));
+    let structs = struct_defs(&mut context, &ident, gstructs);
+    let constants = constants(&mut context, Some(&ident), gconstants);
+    let (collected_function_infos, functions) = functions(&mut context, Some(&ident), gfunctions);
+
+    let friends = gfriends
+        .into_iter()
+        .map(|(mident, _loc)| Context::translate_module_ident(mident))
+        .collect();
+
+    let addr_name = match &ident.value.address {
+        Address::Numerical { name: None, .. } => None,
+        Address::Numerical {
+            name: Some(name), ..
+        }
+        | Address::NamedUnassigned(name) => Some(*name),
+    };
+    let addr_bytes = context.resolve_address(ident.value.address);
+    let (imports, explicit_dependency_declarations) = context.materialize(
+        dependency_orderings,
+        struct_declarations,
+        function_declarations,
+    );
+
+    let sp!(
+        ident_loc,
+        ModuleIdent_ {
+            address: _,
+            module: module_name
+        }
+    ) = ident;
+    let ir_module = IR::ModuleDefinition {
+        loc: ident_loc,
+        identifier: IR::ModuleIdent {
+            address: MoveAddress::new(addr_bytes.into_bytes()),
+            name: IR::ModuleName(module_name.0.value),
+        },
+        friends,
+        imports,
+        explicit_dependency_declarations,
+        structs,
+        constants,
+        functions,
+        synthetics: vec![],
+    };
+    let deps: Vec<&F::CompiledModule> = vec![];
+    let (mut module, source_map) =
+        match move_ir_to_bytecode::compiler::compile_module(ir_module, deps) {
+            Ok(res) => res,
+            Err(e) => {
+                compilation_env.add_diag(diag!(
+                    Bug::BytecodeGeneration,
+                    (ident_loc, format!("IR ERROR: {}", e))
+                ));
+                return None;
+            }
+        };
+    canonicalize_handles::in_module(&mut module, &address_names(dependency_orderings.keys()));
+    let function_infos = module_function_infos(&module, &source_map, &collected_function_infos);
+    let module = NamedCompiledModule {
+        package_name: mdef.package_name,
+        address: addr_bytes,
+        name: module_name.value(),
+        module,
+        source_map,
+    };
+    Some(AnnotatedCompiledUnit::Module(AnnotatedCompiledModule {
+        loc: ident_loc,
+        address_name: addr_name,
+        module_name_loc: module_name.loc(),
+        named_module: module,
+        function_infos,
+    }))
+}
+
+fn script(
+    compilation_env: &mut CompilationEnv,
+    package_name: Option<Symbol>,
+    key: Symbol,
+    gconstants: UniqueMap<ConstantName, G::Constant>,
+    name: FunctionName,
+    fdef: G::Function,
+    dependency_orderings: &HashMap<ModuleIdent, usize>,
+    struct_declarations: &HashMap<
+        (ModuleIdent, StructName),
+        (BTreeSet<IR::Ability>, Vec<IR::StructTypeParameter>),
+    >,
+    function_declarations: &HashMap<
+        (ModuleIdent, FunctionName),
+        (BTreeSet<(ModuleIdent, StructName)>, IR::FunctionSignature),
+    >,
+) -> Option<AnnotatedCompiledUnit> {
+    let loc = name.loc();
+    let mut context = Context::new(compilation_env, package_name, None);
+
+    let constants = constants(&mut context, None, gconstants);
+
+    let ((_, main), info) = function(&mut context, None, name, fdef);
+
+    let (imports, explicit_dependency_declarations) = context.materialize(
+        dependency_orderings,
+        struct_declarations,
+        function_declarations,
+    );
+    let ir_script = IR::Script {
+        loc,
+        imports,
+        explicit_dependency_declarations,
+        constants,
+        main,
+    };
+    let deps: Vec<&F::CompiledModule> = vec![];
+    let (mut script, source_map) =
+        match move_ir_to_bytecode::compiler::compile_script(ir_script, deps) {
+            Ok(res) => res,
+            Err(e) => {
+                compilation_env.add_diag(diag!(
+                    Bug::BytecodeGeneration,
+                    (loc, format!("IR ERROR: {}", e))
+                ));
+                return None;
+            }
+        };
+    canonicalize_handles::in_script(&mut script, &address_names(dependency_orderings.keys()));
+    let function_info = script_function_info(&source_map, info);
+    let script = NamedCompiledScript {
+        package_name,
+        name: key,
+        script,
+        source_map,
+    };
+    Some(AnnotatedCompiledUnit::Script(AnnotatedCompiledScript {
+        loc,
+        named_script: script,
+        function_info,
+    }))
+}
+
+/// Generate a mapping from numerical address and module name to named address, for modules whose
+/// identities contained a named address.
+fn address_names<'a>(
+    dependencies: impl Iterator<Item = &'a ModuleIdent>,
+) -> HashMap<(MoveAddress, &'a str), Symbol> {
+    dependencies
+        .filter_map(|sp!(_, mident)| {
+            let ModuleIdent_ { address, module } = mident;
+            let ModuleName(sp!(_, module)) = module;
+            if let Address::Numerical {
+                name: Some(sp!(_, named)),
+                value: sp!(_, numeric),
+                ..
+            } = address
+            {
+                Some(((numeric.into_inner(), module.as_str()), *named))
+            } else {
+                None
+            }
+        })
+        .collect()
+}
+
+fn module_function_infos(
+    compile_module: &F::CompiledModule,
+    source_map: &SourceMap,
+    collected_function_infos: &CollectedInfos,
+) -> UniqueMap<FunctionName, FunctionInfo> {
+    UniqueMap::maybe_from_iter((0..compile_module.function_defs.len()).map(|i| {
+        let idx = F::FunctionDefinitionIndex(i as F::TableIndex);
+        function_info_map(compile_module, source_map, collected_function_infos, idx)
+    }))
+    .unwrap()
+}
+
+fn function_info_map(
+    compile_module: &F::CompiledModule,
+    source_map: &SourceMap,
+    collected_function_infos: &CollectedInfos,
+    idx: F::FunctionDefinitionIndex,
+) -> (FunctionName, FunctionInfo) {
+    let module = compile_module;
+    let handle_idx = module.function_defs[idx.0 as usize].function;
+    let name_idx = module.function_handles[handle_idx.0 as usize].name;
+    let name = module.identifiers[name_idx.0 as usize].as_str().into();
+
+    let function_source_map = source_map.get_function_source_map(idx).unwrap();
+    let local_map = function_source_map
+        .make_local_name_to_index_map()
+        .into_iter()
+        .map(|(n, v)| (Symbol::from(n.as_str()), v))
+        .collect();
+    let (params, specs, attributes) = collected_function_infos.get_(&name).unwrap();
+    let parameters = params
+        .iter()
+        .map(|(v, ty)| var_info(&local_map, *v, ty.clone()))
+        .collect();
+    let spec_info = specs
+        .iter()
+        .map(|(id, (label, used_local_types))| {
+            let offset = *function_source_map.nops.get(label).unwrap();
+            let used_locals = used_local_info(&local_map, used_local_types);
+            let info = SpecInfo {
+                offset,
+                used_locals,
+            };
+            (*id, info)
+        })
+        .collect();
+    let function_info = FunctionInfo {
+        spec_info,
+        parameters,
+        attributes: attributes.clone(),
+    };
+
+    let name_loc = *collected_function_infos.get_loc_(&name).unwrap();
+    let function_name = FunctionName(sp(name_loc, name));
+    (function_name, function_info)
+}
+
+fn script_function_info(
+    source_map: &SourceMap,
+    (params, specs, attributes): CollectedInfo,
+) -> FunctionInfo {
+    let idx = F::FunctionDefinitionIndex(0);
+    let function_source_map = source_map.get_function_source_map(idx).unwrap();
+    let local_map = function_source_map
+        .make_local_name_to_index_map()
+        .into_iter()
+        .map(|(n, v)| (Symbol::from(n.as_str()), v))
+        .collect();
+    let parameters = params
+        .into_iter()
+        .map(|(v, ty)| var_info(&local_map, v, ty))
+        .collect();
+    let spec_info = specs
+        .into_iter()
+        .map(|(id, (label, used_local_types))| {
+            let offset = *function_source_map.nops.get(&label).unwrap();
+            let used_locals = used_local_info(&local_map, &used_local_types);
+            let info = SpecInfo {
+                offset,
+                used_locals,
+            };
+            (id, info)
+        })
+        .collect();
+    FunctionInfo {
+        spec_info,
+        parameters,
+        attributes,
+    }
+}
+
+fn used_local_info(
+    local_map: &BTreeMap<Symbol, F::LocalIndex>,
+    used_local_types: &BTreeMap<Var, H::SingleType>,
+) -> UniqueMap<Var, VarInfo> {
+    UniqueMap::maybe_from_iter(used_local_types.iter().map(|(v, ty)| {
+        let (v, info) = var_info(local_map, *v, ty.clone());
+        let v_orig_ = match display_var(v.0.value) {
+            DisplayVar::Tmp => panic!("ICE spec block captured a tmp"),
+            DisplayVar::Orig(s) => s,
+        };
+        let v_orig = Var(sp(v.0.loc, v_orig_.into()));
+        (v_orig, info)
+    }))
+    .unwrap()
+}
+
+fn var_info(
+    local_map: &BTreeMap<Symbol, F::LocalIndex>,
+    v: Var,
+    type_: H::SingleType,
+) -> (Var, VarInfo) {
+    let index = *local_map.get(&v.0.value).unwrap();
+    (v, VarInfo { type_, index })
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_defs(
+    context: &mut Context,
+    m: &ModuleIdent,
+    structs: UniqueMap<StructName, H::StructDefinition>,
+) -> Vec<IR::StructDefinition> {
+    let mut structs = structs.into_iter().collect::<Vec<_>>();
+    structs.sort_by_key(|(_, s)| s.index);
+    structs
+        .into_iter()
+        .map(|(s, sdef)| struct_def(context, m, s, sdef))
+        .collect()
+}
+
+fn struct_def(
+    context: &mut Context,
+    m: &ModuleIdent,
+    s: StructName,
+    sdef: H::StructDefinition,
+) -> IR::StructDefinition {
+    let H::StructDefinition {
+        warning_filter: _warning_filter,
+        index: _index,
+        attributes: _attributes,
+        abilities: abs,
+        type_parameters: tys,
+        fields,
+    } = sdef;
+    let loc = s.loc();
+    let name = context.struct_definition_name(m, s);
+    let abilities = abilities(&abs);
+    let type_formals = struct_type_parameters(tys);
+    let fields = struct_fields(context, loc, fields);
+    sp(
+        loc,
+        IR::StructDefinition_ {
+            name,
+            abilities,
+            type_formals,
+            fields,
+            invariants: vec![],
+        },
+    )
+}
+
+fn struct_fields(
+    context: &mut Context,
+    loc: Loc,
+    gfields: H::StructFields,
+) -> IR::StructDefinitionFields {
+    use H::StructFields as HF;
+    use IR::StructDefinitionFields as IRF;
+    match gfields {
+        HF::Native(_) => IRF::Native,
+        HF::Defined(field_vec) if field_vec.is_empty() => {
+            // empty fields are not allowed in the bytecode, add a dummy field
+            let fake_field = vec![(
+                Field(sp(loc, symbol!("dummy_field"))),
+                H::BaseType_::bool(loc),
+            )];
+            struct_fields(context, loc, HF::Defined(fake_field))
+        }
+        HF::Defined(field_vec) => {
+            let fields = field_vec
+                .into_iter()
+                .map(|(f, ty)| (field(f), base_type(context, ty)))
+                .collect();
+            IRF::Move { fields }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn constants(
+    context: &mut Context,
+    m: Option<&ModuleIdent>,
+    constants: UniqueMap<ConstantName, G::Constant>,
+) -> Vec<IR::Constant> {
+    let mut constants = constants.into_iter().collect::<Vec<_>>();
+    constants.sort_by_key(|(_, c)| c.index);
+    constants
+        .into_iter()
+        .map(|(n, c)| constant(context, m, n, c))
+        .collect::<Vec<_>>()
+}
+
+fn constant(
+    context: &mut Context,
+    m: Option<&ModuleIdent>,
+    n: ConstantName,
+    c: G::Constant,
+) -> IR::Constant {
+    let name = context.constant_definition_name(m, n);
+    let signature = base_type(context, c.signature);
+    let value = c.value.unwrap();
+    IR::Constant {
+        name,
+        signature,
+        value,
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn functions(
+    context: &mut Context,
+    m: Option<&ModuleIdent>,
+    functions: UniqueMap<FunctionName, G::Function>,
+) -> (CollectedInfos, Vec<(IR::FunctionName, IR::Function)>) {
+    let mut functions = functions.into_iter().collect::<Vec<_>>();
+    functions.sort_by_key(|(_, f)| f.index);
+    let mut collected_function_infos = UniqueMap::new();
+    let functions_vec = functions
+        .into_iter()
+        // TODO full prover support for vector bytecode instructions
+        // TODO filter out fake natives
+        // These cannot be filtered out due to lacking prover support for the operations
+        // .filter(|(_, fdef)| {
+        //            !fdef
+        //             .attributes
+        //             .contains_key_(&fake_natives::FAKE_NATIVE_ATTR)
+        // })
+        .map(|(f, fdef)| {
+            let (res, info) = function(context, m, f, fdef);
+            collected_function_infos.add(f, info).unwrap();
+            res
+        })
+        .collect::<Vec<_>>();
+    (collected_function_infos, functions_vec)
+}
+
+fn function(
+    context: &mut Context,
+    m: Option<&ModuleIdent>,
+    f: FunctionName,
+    fdef: G::Function,
+) -> ((IR::FunctionName, IR::Function), CollectedInfo) {
+    let G::Function {
+        warning_filter: _warning_filter,
+        index: _index,
+        attributes,
+        visibility: v,
+        entry,
+        signature,
+        body,
+    } = fdef;
+    let v = visibility(context, v);
+    let parameters = signature.parameters.clone();
+    let signature = function_signature(context, signature);
+    let body = match body.value {
+        G::FunctionBody_::Native => IR::FunctionBody::Native,
+        G::FunctionBody_::Defined {
+            locals,
+            start,
+            block_info,
+            blocks,
+        } => {
+            let (locals, code) = function_body(
+                context,
+                &f,
+                parameters.clone(),
+                locals,
+                block_info,
+                start,
+                blocks,
+            );
+            IR::FunctionBody::Bytecode { locals, code }
+        }
+    };
+    let loc = f.loc();
+    let name = context.function_definition_name(m, f);
+    let ir_function = IR::Function_ {
+        visibility: v,
+        is_entry: entry.is_some(),
+        signature,
+        specifications: vec![],
+        body,
+    };
+    (
+        (name, sp(loc, ir_function)),
+        (parameters, context.finish_function(), attributes),
+    )
+}
+
+fn visibility(_context: &mut Context, v: Visibility) -> IR::FunctionVisibility {
+    match v {
+        Visibility::Public(_) => IR::FunctionVisibility::Public,
+        Visibility::Friend(_) => IR::FunctionVisibility::Friend,
+        Visibility::Internal => IR::FunctionVisibility::Internal,
+    }
+}
+
+fn function_signature(context: &mut Context, sig: H::FunctionSignature) -> IR::FunctionSignature {
+    let return_type = types(context, sig.return_type);
+    let formals = sig
+        .parameters
+        .into_iter()
+        .map(|(v, st)| (var(v), single_type(context, st)))
+        .collect();
+    let type_parameters = fun_type_parameters(sig.type_parameters);
+    IR::FunctionSignature {
+        return_type,
+        formals,
+        type_formals: type_parameters,
+    }
+}
+
+fn seen_structs(sig: &H::FunctionSignature) -> BTreeSet<(ModuleIdent, StructName)> {
+    let mut seen = BTreeSet::new();
+    seen_structs_type(&mut seen, &sig.return_type);
+    sig.parameters
+        .iter()
+        .for_each(|(_, st)| seen_structs_single_type(&mut seen, st));
+    seen
+}
+
+fn seen_structs_type(seen: &mut BTreeSet<(ModuleIdent, StructName)>, sp!(_, t_): &H::Type) {
+    use H::Type_ as T;
+    match t_ {
+        T::Unit => (),
+        T::Single(st) => seen_structs_single_type(seen, st),
+        T::Multiple(ss) => ss.iter().for_each(|st| seen_structs_single_type(seen, st)),
+    }
+}
+
+fn seen_structs_single_type(
+    seen: &mut BTreeSet<(ModuleIdent, StructName)>,
+    sp!(_, st_): &H::SingleType,
+) {
+    use H::SingleType_ as S;
+    match st_ {
+        S::Base(bt) | S::Ref(_, bt) => seen_structs_base_type(seen, bt),
+    }
+}
+
+fn seen_structs_base_type(
+    seen: &mut BTreeSet<(ModuleIdent, StructName)>,
+    sp!(_, bt_): &H::BaseType,
+) {
+    use H::{BaseType_ as B, TypeName_ as TN};
+    match bt_ {
+        B::Unreachable | B::UnresolvedError => {
+            panic!("ICE should not have reached compilation if there are errors")
+        }
+        B::Apply(_, sp!(_, tn_), tys) => {
+            if let TN::ModuleType(m, s) = tn_ {
+                seen.insert((*m, *s));
+            }
+            tys.iter().for_each(|st| seen_structs_base_type(seen, st))
+        }
+        B::Param(TParam { .. }) => (),
+    }
+}
+
+fn function_body(
+    context: &mut Context,
+    f: &FunctionName,
+    parameters: Vec<(Var, H::SingleType)>,
+    mut locals_map: UniqueMap<Var, H::SingleType>,
+    block_info: BTreeMap<H::Label, G::BlockInfo>,
+    start: H::Label,
+    blocks_map: H::BasicBlocks,
+) -> (Vec<(IR::Var, IR::Type)>, IR::BytecodeBlocks) {
+    parameters
+        .iter()
+        .for_each(|(var, _)| assert!(locals_map.remove(var).is_some()));
+    let mut locals = locals_map
+        .into_iter()
+        .filter(|(_, ty)| {
+            // filter out any locals generated for unreachable code
+            let bt = match &ty.value {
+                H::SingleType_::Base(b) | H::SingleType_::Ref(_, b) => b,
+            };
+            !matches!(&bt.value, H::BaseType_::Unreachable)
+        })
+        .map(|(v, ty)| (var(v), single_type(context, ty)))
+        .collect();
+    let mut blocks = blocks_map.into_iter().collect::<Vec<_>>();
+    blocks.sort_by_key(|(lbl, _)| *lbl);
+
+    let mut bytecode_blocks = Vec::new();
+    for (idx, (lbl, basic_block)) in blocks.into_iter().enumerate() {
+        // first idx should be the start label
+        assert!(idx != 0 || lbl == start);
+        assert!(idx == bytecode_blocks.len());
+
+        let mut code = IR::BytecodeBlock::new();
+        for cmd in basic_block {
+            command(context, &mut code, cmd);
+        }
+        bytecode_blocks.push((label(lbl), code));
+    }
+
+    let loop_heads = block_info
+        .into_iter()
+        .filter(|(_lbl, info)| matches!(info, G::BlockInfo::LoopHead(_)))
+        .map(|(lbl, _)| label(lbl))
+        .collect();
+    optimize::code(f, &loop_heads, &mut locals, &mut bytecode_blocks);
+
+    (locals, bytecode_blocks)
+}
+
+//**************************************************************************************************
+// Names
+//**************************************************************************************************
+
+fn type_var(sp!(loc, n): Name) -> IR::TypeVar {
+    sp(loc, IR::TypeVar_(n))
+}
+
+fn var(v: Var) -> IR::Var {
+    sp(v.0.loc, IR::Var_(v.0.value))
+}
+
+fn field(f: Field) -> IR::Field {
+    // If it's a positional field, lower it into `pos{field_idx}` so they're a valid identifier
+    let field_ident = if f.0.value.parse::<u8>().is_ok() {
+        format!("pos{}", f.0.value).into()
+    } else {
+        f.0.value
+    };
+    sp(f.0.loc, IR::Field_(field_ident))
+}
+
+fn struct_definition_name(
+    context: &mut Context,
+    sp!(_, t_): H::Type,
+) -> (IR::StructName, Vec<IR::Type>) {
+    match t_ {
+        H::Type_::Single(st) => struct_definition_name_single(context, st),
+        _ => panic!("ICE expected single type"),
+    }
+}
+
+fn struct_definition_name_single(
+    context: &mut Context,
+    sp!(_, st_): H::SingleType,
+) -> (IR::StructName, Vec<IR::Type>) {
+    match st_ {
+        H::SingleType_::Ref(_, bt) | H::SingleType_::Base(bt) => {
+            struct_definition_name_base(context, bt)
+        }
+    }
+}
+
+fn struct_definition_name_base(
+    context: &mut Context,
+    sp!(_, bt_): H::BaseType,
+) -> (IR::StructName, Vec<IR::Type>) {
+    use H::{BaseType_ as B, TypeName_ as TN};
+    match bt_ {
+        B::Apply(_, sp!(_, TN::ModuleType(m, s)), tys) => (
+            context.struct_definition_name(&m, s),
+            base_types(context, tys),
+        ),
+        _ => panic!("ICE expected module struct type"),
+    }
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn ability(sp!(_, a_): Ability) -> IR::Ability {
+    use Ability_ as A;
+    use IR::Ability as IRA;
+    match a_ {
+        A::Copy => IRA::Copy,
+        A::Drop => IRA::Drop,
+        A::Store => IRA::Store,
+        A::Key => IRA::Key,
+    }
+}
+
+fn abilities(set: &AbilitySet) -> BTreeSet<IR::Ability> {
+    set.iter().map(ability).collect()
+}
+
+fn fun_type_parameters(tps: Vec<TParam>) -> Vec<(IR::TypeVar, BTreeSet<IR::Ability>)> {
+    tps.into_iter()
+        .map(|tp| (type_var(tp.user_specified_name), abilities(&tp.abilities)))
+        .collect()
+}
+
+fn struct_type_parameters(tps: Vec<StructTypeParameter>) -> Vec<IR::StructTypeParameter> {
+    tps.into_iter()
+        .map(|StructTypeParameter { is_phantom, param }| {
+            let name = type_var(param.user_specified_name);
+            let constraints = abilities(&param.abilities);
+            (is_phantom, name, constraints)
+        })
+        .collect()
+}
+
+fn base_types(context: &mut Context, bs: Vec<H::BaseType>) -> Vec<IR::Type> {
+    bs.into_iter().map(|b| base_type(context, b)).collect()
+}
+
+fn base_type(context: &mut Context, sp!(_, bt_): H::BaseType) -> IR::Type {
+    use BuiltinTypeName_ as BT;
+    use H::{BaseType_ as B, TypeName_ as TN};
+    use IR::Type as IRT;
+    match bt_ {
+        B::Unreachable | B::UnresolvedError => {
+            panic!("ICE should not have reached compilation if there are errors")
+        }
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Address))), _) => IRT::Address,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Signer))), _) => IRT::Signer,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U8))), _) => IRT::U8,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U16))), _) => IRT::U16,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U32))), _) => IRT::U32,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U64))), _) => IRT::U64,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U128))), _) => IRT::U128,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U256))), _) => IRT::U256,
+
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Bool))), _) => IRT::Bool,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Vector))), mut args) => {
+            assert!(
+                args.len() == 1,
+                "ICE vector must have exactly 1 type argument"
+            );
+            IRT::Vector(Box::new(base_type(context, args.pop().unwrap())))
+        }
+        B::Apply(_, sp!(_, TN::ModuleType(m, s)), tys) => {
+            let n = context.qualified_struct_name(&m, s);
+            let tys = base_types(context, tys);
+            IRT::Struct(n, tys)
+        }
+        B::Param(TParam {
+            user_specified_name,
+            ..
+        }) => IRT::TypeParameter(type_var(user_specified_name).value),
+    }
+}
+
+fn single_type(context: &mut Context, sp!(_, st_): H::SingleType) -> IR::Type {
+    use H::SingleType_ as S;
+    use IR::Type as IRT;
+    match st_ {
+        S::Base(bt) => base_type(context, bt),
+        S::Ref(mut_, bt) => IRT::Reference(mut_, Box::new(base_type(context, bt))),
+    }
+}
+
+fn types(context: &mut Context, sp!(_, t_): H::Type) -> Vec<IR::Type> {
+    use H::Type_ as T;
+    match t_ {
+        T::Unit => vec![],
+        T::Single(st) => vec![single_type(context, st)],
+        T::Multiple(ss) => ss.into_iter().map(|st| single_type(context, st)).collect(),
+    }
+}
+
+//**************************************************************************************************
+// Commands
+//**************************************************************************************************
+
+fn label(lbl: H::Label) -> IR::BlockLabel_ {
+    IR::BlockLabel_(format!("{}", lbl).into())
+}
+
+fn command(context: &mut Context, code: &mut IR::BytecodeBlock, sp!(loc, cmd_): H::Command) {
+    use H::Command_ as C;
+    use IR::Bytecode_ as B;
+    match cmd_ {
+        C::Assign(ls, e) => {
+            exp(context, code, e);
+            lvalues(context, code, ls);
+        }
+        C::Mutate(eref, ervalue) => {
+            exp(context, code, *ervalue);
+            exp(context, code, *eref);
+            code.push(sp(loc, B::WriteRef));
+        }
+        C::Abort(ecode) => {
+            exp(context, code, ecode);
+            code.push(sp(loc, B::Abort));
+        }
+        C::Return { exp: e, .. } => {
+            exp(context, code, e);
+            code.push(sp(loc, B::Ret));
+        }
+        C::IgnoreAndPop { pop_num, exp: e } => {
+            exp(context, code, e);
+            for _ in 0..pop_num {
+                code.push(sp(loc, B::Pop));
+            }
+        }
+        C::Jump { target, .. } => code.push(sp(loc, B::Branch(label(target)))),
+        C::JumpIf {
+            cond,
+            if_true,
+            if_false,
+        } => {
+            exp(context, code, cond);
+            code.push(sp(loc, B::BrFalse(label(if_false))));
+            code.push(sp(loc, B::Branch(label(if_true))));
+        }
+        C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
+    }
+}
+
+fn lvalues(context: &mut Context, code: &mut IR::BytecodeBlock, ls: Vec<H::LValue>) {
+    lvalues_(context, code, ls.into_iter())
+}
+
+fn lvalues_(
+    context: &mut Context,
+    code: &mut IR::BytecodeBlock,
+    ls: impl std::iter::DoubleEndedIterator<Item = H::LValue>,
+) {
+    for l in ls.rev() {
+        lvalue(context, code, l)
+    }
+}
+
+fn lvalue(context: &mut Context, code: &mut IR::BytecodeBlock, sp!(loc, l_): H::LValue) {
+    use H::LValue_ as L;
+    use IR::Bytecode_ as B;
+    match l_ {
+        L::Ignore => {
+            code.push(sp(loc, B::Pop));
+        }
+        L::Var(v, _) => {
+            code.push(sp(loc, B::StLoc(var(v))));
+        }
+        L::Unpack(s, tys, field_ls) if field_ls.is_empty() => {
+            let n = context.struct_definition_name(context.current_module().unwrap(), s);
+            code.push(sp(loc, B::Unpack(n, base_types(context, tys))));
+            // Pop off false
+            code.push(sp(loc, B::Pop));
+        }
+
+        L::Unpack(s, tys, field_ls) => {
+            let n = context.struct_definition_name(context.current_module().unwrap(), s);
+            code.push(sp(loc, B::Unpack(n, base_types(context, tys))));
+
+            lvalues_(context, code, field_ls.into_iter().map(|(_, l)| l));
+        }
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn exp(context: &mut Context, code: &mut IR::BytecodeBlock, e: H::Exp) {
+    use Value_ as V;
+    use H::UnannotatedExp_ as E;
+    use IR::Bytecode_ as B;
+    let sp!(loc, e_) = e.exp;
+    match e_ {
+        E::Unreachable => panic!("ICE should not compile dead code"),
+        E::UnresolvedError => panic!("ICE should not have reached compilation if there are errors"),
+        E::Unit { .. } => (),
+        // remember to switch to orig_name
+        E::Spec(id, used_locals) => code.push(sp(loc, B::Nop(Some(context.spec(id, used_locals))))),
+        E::Value(sp!(_, v_)) => {
+            let ld_value = match v_ {
+                V::U8(u) => B::LdU8(u),
+                V::U16(u) => B::LdU16(u),
+                V::U32(u) => B::LdU32(u),
+                V::U64(u) => B::LdU64(u),
+                V::U128(u) => B::LdU128(u),
+                V::U256(u) => B::LdU256(u),
+                V::Bool(b) => {
+                    if b {
+                        B::LdTrue
+                    } else {
+                        B::LdFalse
+                    }
+                }
+                v_ @ V::Address(_) | v_ @ V::Vector(_, _) => {
+                    let [ty]: [IR::Type; 1] = types(context, e.ty)
+                        .try_into()
+                        .expect("ICE value type should have one element");
+                    B::LdConst(ty, move_value_from_value_(v_))
+                }
+            };
+            code.push(sp(loc, ld_value));
+        }
+        E::Move { var: v, .. } => {
+            code.push(sp(loc, B::MoveLoc(var(v))));
+        }
+        E::Copy { var: v, .. } => code.push(sp(loc, B::CopyLoc(var(v)))),
+
+        E::Constant(c) => code.push(sp(loc, B::LdNamedConst(context.constant_name(c)))),
+
+        E::ModuleCall(mcall) => {
+            for arg in mcall.arguments {
+                exp(context, code, arg);
+            }
+            module_call(
+                context,
+                loc,
+                code,
+                mcall.module,
+                mcall.name,
+                mcall.type_arguments,
+            );
+        }
+
+        E::Freeze(er) => {
+            exp(context, code, *er);
+            code.push(sp(loc, B::FreezeRef));
+        }
+
+        E::Dereference(er) => {
+            exp(context, code, *er);
+            code.push(sp(loc, B::ReadRef));
+        }
+
+        E::UnaryExp(op, er) => {
+            exp(context, code, *er);
+            unary_op(code, op);
+        }
+
+        E::BinopExp(el, op, er) => {
+            exp(context, code, *el);
+            exp(context, code, *er);
+            binary_op(code, op);
+        }
+
+        E::Pack(s, tys, field_args) if field_args.is_empty() => {
+            // empty fields are not allowed in the bytecode, add a dummy field
+            // empty structs have a dummy field of type 'bool' added
+
+            // Push on fake field
+            code.push(sp(loc, B::LdFalse));
+
+            let n = context.struct_definition_name(context.current_module().unwrap(), s);
+            code.push(sp(loc, B::Pack(n, base_types(context, tys))))
+        }
+
+        E::Pack(s, tys, field_args) => {
+            for (_, _, earg) in field_args {
+                exp(context, code, earg);
+            }
+            let n = context.struct_definition_name(context.current_module().unwrap(), s);
+            code.push(sp(loc, B::Pack(n, base_types(context, tys))))
+        }
+
+        E::Vector(_, n, bt, args) => {
+            let ty = base_type(context, *bt);
+            for arg in args {
+                exp(context, code, arg);
+            }
+            code.push(sp(loc, B::VecPack(ty, n.try_into().unwrap())))
+        }
+
+        E::Multiple(es) => {
+            for e in es {
+                exp(context, code, e);
+            }
+        }
+
+        E::Borrow(mut_, el, f, _) => {
+            let (n, tys) = struct_definition_name(context, el.ty.clone());
+            exp(context, code, *el);
+            let instr = if mut_ {
+                B::MutBorrowField(n, tys, field(f))
+            } else {
+                B::ImmBorrowField(n, tys, field(f))
+            };
+            code.push(sp(loc, instr));
+        }
+
+        E::BorrowLocal(mut_, v) => {
+            let instr = if mut_ {
+                B::MutBorrowLoc(var(v))
+            } else {
+                B::ImmBorrowLoc(var(v))
+            };
+            code.push(sp(loc, instr));
+        }
+
+        E::Cast(el, sp!(_, bt_)) => {
+            use BuiltinTypeName_ as BT;
+            exp(context, code, *el);
+            let instr = match bt_ {
+                BT::U8 => B::CastU8,
+                BT::U16 => B::CastU16,
+                BT::U32 => B::CastU32,
+                BT::U64 => B::CastU64,
+                BT::U128 => B::CastU128,
+                BT::U256 => B::CastU256,
+                BT::Address | BT::Signer | BT::Vector | BT::Bool => {
+                    panic!("ICE type checking failed. unexpected cast")
+                }
+            };
+            code.push(sp(loc, instr));
+        }
+    }
+}
+
+fn module_call(
+    context: &mut Context,
+    loc: Loc,
+    code: &mut IR::BytecodeBlock,
+    mident: ModuleIdent,
+    fname: FunctionName,
+    tys: Vec<H::BaseType>,
+) {
+    use IR::Bytecode_ as B;
+    match fake_natives::resolve_builtin(&mident, &fname) {
+        Some(mk_bytecode) => code.push(sp(loc, mk_bytecode(base_types(context, tys)))),
+        _ => {
+            let (m, n) = context.qualified_function_name(&mident, fname);
+            code.push(sp(loc, B::Call(m, n, base_types(context, tys))))
+        }
+    }
+}
+
+fn unary_op(code: &mut IR::BytecodeBlock, sp!(loc, op_): UnaryOp) {
+    use UnaryOp_ as O;
+    use IR::Bytecode_ as B;
+    code.push(sp(
+        loc,
+        match op_ {
+            O::Not => B::Not,
+        },
+    ));
+}
+
+fn binary_op(code: &mut IR::BytecodeBlock, sp!(loc, op_): BinOp) {
+    use BinOp_ as O;
+    use IR::Bytecode_ as B;
+    code.push(sp(
+        loc,
+        match op_ {
+            O::Add => B::Add,
+            O::Sub => B::Sub,
+            O::Mul => B::Mul,
+            O::Mod => B::Mod,
+            O::Div => B::Div,
+            O::BitOr => B::BitOr,
+            O::BitAnd => B::BitAnd,
+            O::Xor => B::Xor,
+            O::Shl => B::Shl,
+            O::Shr => B::Shr,
+
+            O::And => B::And,
+            O::Or => B::Or,
+
+            O::Eq => B::Eq,
+            O::Neq => B::Neq,
+
+            O::Lt => B::Lt,
+            O::Gt => B::Gt,
+
+            O::Le => B::Le,
+            O::Ge => B::Ge,
+
+            O::Range | O::Implies | O::Iff => panic!("specification operator unexpected"),
+        },
+    ));
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/ast.rs b/vendors/move/crates/move-compiler/src/typing/ast.rs
new file mode 100644
index 000000000..2ed713bf7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/ast.rs
@@ -0,0 +1,814 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::WarningFilters,
+    expansion::ast::{Address, Attributes, Fields, Friend, ModuleIdent, SpecId, Value, Visibility},
+    naming::ast::{FunctionSignature, Neighbor, StructDefinition, Type, TypeName_, Type_, Var},
+    parser::ast::{BinOp, ConstantName, Field, FunctionName, StructName, UnaryOp, ENTRY_MODIFIER},
+    shared::{ast_debug::*, program_info::TypingProgramInfo, unique_map::UniqueMap},
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt,
+};
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Program {
+    pub info: TypingProgramInfo,
+    pub inner: Program_,
+}
+
+#[derive(Debug, Clone)]
+pub struct Program_ {
+    pub modules: UniqueMap<ModuleIdent, ModuleDefinition>,
+    pub scripts: BTreeMap<Symbol, Script>,
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct Script {
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub immediate_neighbors: UniqueMap<ModuleIdent, Neighbor>,
+    pub used_addresses: BTreeSet<Address>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub function_name: FunctionName,
+    pub function: Function,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+pub struct ModuleDefinition {
+    pub loc: Loc,
+    pub warning_filter: WarningFilters,
+    // package name metadata from compiler arguments, not used for any language rules
+    pub package_name: Option<Symbol>,
+    pub attributes: Attributes,
+    pub is_source_module: bool,
+    /// `dependency_order` is the topological order/rank in the dependency graph.
+    /// `dependency_order` is initialized at `0` and set in the uses pass
+    pub dependency_order: usize,
+    pub immediate_neighbors: UniqueMap<ModuleIdent, Neighbor>,
+    pub used_addresses: BTreeSet<Address>,
+    pub friends: UniqueMap<ModuleIdent, Friend>,
+    pub structs: UniqueMap<StructName, StructDefinition>,
+    pub constants: UniqueMap<ConstantName, Constant>,
+    pub functions: UniqueMap<FunctionName, Function>,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+#[derive(PartialEq, Debug, Clone)]
+pub enum FunctionBody_ {
+    Defined(Sequence),
+    Native,
+}
+pub type FunctionBody = Spanned<FunctionBody_>;
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Function {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub visibility: Visibility,
+    pub entry: Option<Loc>,
+    pub signature: FunctionSignature,
+    pub body: FunctionBody,
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct Constant {
+    pub warning_filter: WarningFilters,
+    // index in the original order as defined in the source file
+    pub index: usize,
+    pub attributes: Attributes,
+    pub loc: Loc,
+    pub signature: Type,
+    pub value: Exp,
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+#[derive(Debug, PartialEq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum LValue_ {
+    Ignore,
+    Var {
+        var: Var,
+        ty: Box<Type>,
+        unused_binding: bool,
+    },
+    Unpack(ModuleIdent, StructName, Vec<Type>, Fields<(Type, LValue)>),
+    BorrowUnpack(
+        bool,
+        ModuleIdent,
+        StructName,
+        Vec<Type>,
+        Fields<(Type, LValue)>,
+    ),
+}
+pub type LValue = Spanned<LValue_>;
+pub type LValueList_ = Vec<LValue>;
+pub type LValueList = Spanned<LValueList_>;
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct ModuleCall {
+    pub module: ModuleIdent,
+    pub name: FunctionName,
+    pub type_arguments: Vec<Type>,
+    pub arguments: Box<Exp>,
+    pub parameter_types: Vec<Type>,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub enum BuiltinFunction_ {
+    Freeze(Type),
+    Assert(/* is_macro */ bool),
+}
+pub type BuiltinFunction = Spanned<BuiltinFunction_>;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum UnannotatedExp_ {
+    Unit { trailing: bool },
+    Value(Value),
+    Move { from_user: bool, var: Var },
+    Copy { from_user: bool, var: Var },
+    Use(Var),
+    Constant(Option<ModuleIdent>, ConstantName),
+
+    ModuleCall(Box<ModuleCall>),
+    Builtin(Box<BuiltinFunction>, Box<Exp>),
+    Vector(Loc, usize, Box<Type>, Box<Exp>),
+
+    IfElse(Box<Exp>, Box<Exp>, Box<Exp>),
+    While(Box<Exp>, Box<Exp>),
+    Loop { has_break: bool, body: Box<Exp> },
+    Block(Sequence),
+    Assign(LValueList, Vec<Option<Type>>, Box<Exp>),
+    Mutate(Box<Exp>, Box<Exp>),
+    Return(Box<Exp>),
+    Abort(Box<Exp>),
+    Break,
+    Continue,
+
+    Dereference(Box<Exp>),
+    UnaryExp(UnaryOp, Box<Exp>),
+    BinopExp(Box<Exp>, BinOp, Box<Type>, Box<Exp>),
+
+    Pack(ModuleIdent, StructName, Vec<Type>, Fields<(Type, Exp)>),
+    ExpList(Vec<ExpListItem>),
+
+    Borrow(bool, Box<Exp>, Field),
+    TempBorrow(bool, Box<Exp>),
+    BorrowLocal(bool, Var),
+
+    Cast(Box<Exp>, Box<Type>),
+    Annotate(Box<Exp>, Box<Type>),
+
+    Spec(SpecId, BTreeMap<Var, Type>),
+
+    UnresolvedError,
+}
+pub type UnannotatedExp = Spanned<UnannotatedExp_>;
+#[derive(Debug, PartialEq, Clone)]
+pub struct Exp {
+    pub ty: Type,
+    pub exp: UnannotatedExp,
+}
+pub fn exp(ty: Type, exp: UnannotatedExp) -> Exp {
+    Exp { ty, exp }
+}
+
+pub type Sequence = VecDeque<SequenceItem>;
+#[derive(Debug, PartialEq, Clone)]
+pub enum SequenceItem_ {
+    Seq(Box<Exp>),
+    Declare(LValueList),
+    Bind(LValueList, Vec<Option<Type>>, Box<Exp>),
+}
+pub type SequenceItem = Spanned<SequenceItem_>;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum ExpListItem {
+    Single(Exp, Box<Type>),
+    Splat(Loc, Exp, Vec<Type>),
+}
+
+pub fn single_item(e: Exp) -> ExpListItem {
+    let ty = Box::new(e.ty.clone());
+    ExpListItem::Single(e, ty)
+}
+
+pub fn splat_item(splat_loc: Loc, e: Exp) -> ExpListItem {
+    let ss = match &e.ty {
+        sp!(_, Type_::Unit) => vec![],
+        sp!(_, Type_::Apply(_, sp!(_, TypeName_::Multiple(_)), ss)) => ss.clone(),
+        _ => panic!("ICE splat of non list type"),
+    };
+    ExpListItem::Splat(splat_loc, e, ss)
+}
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+impl BuiltinFunction_ {
+    pub fn display_name(&self) -> &'static str {
+        use crate::naming::ast::BuiltinFunction_ as NB;
+        use BuiltinFunction_ as B;
+        match self {
+            B::Freeze(_) => NB::FREEZE,
+            B::Assert(_) => NB::ASSERT_MACRO,
+        }
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for BuiltinFunction_ {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", self.display_name())
+    }
+}
+
+//**************************************************************************************************
+// Debug
+//**************************************************************************************************
+
+impl AstDebug for Program {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        self.inner.ast_debug(w)
+    }
+}
+
+impl AstDebug for Program_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Program_ { modules, scripts } = self;
+
+        for (m, mdef) in modules.key_cloned_iter() {
+            w.write(&format!("module {}", m));
+            w.block(|w| mdef.ast_debug(w));
+            w.new_line();
+        }
+
+        for (n, s) in scripts {
+            w.write(&format!("script {}", n));
+            w.block(|w| s.ast_debug(w));
+            w.new_line()
+        }
+    }
+}
+
+impl AstDebug for Script {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Script {
+            warning_filter,
+            package_name,
+            attributes,
+            loc: _loc,
+            immediate_neighbors,
+            used_addresses,
+            constants,
+            function_name,
+            function,
+            spec_dependencies,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        for (mident, neighbor) in immediate_neighbors.key_cloned_iter() {
+            w.write(&format!("{mident} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for addr in used_addresses {
+            w.write(&format!("uses address {};", addr));
+            w.new_line()
+        }
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        (*function_name, function).ast_debug(w);
+    }
+}
+
+impl AstDebug for ModuleDefinition {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleDefinition {
+            loc: _,
+            warning_filter,
+            package_name,
+            attributes,
+            is_source_module,
+            dependency_order,
+            immediate_neighbors,
+            used_addresses,
+            friends,
+            structs,
+            constants,
+            functions,
+            spec_dependencies,
+        } = self;
+        warning_filter.ast_debug(w);
+        if let Some(n) = package_name {
+            w.writeln(&format!("{}", n))
+        }
+        attributes.ast_debug(w);
+        if *is_source_module {
+            w.writeln("library module")
+        } else {
+            w.writeln("source module")
+        }
+        w.writeln(&format!("dependency order #{}", dependency_order));
+        for (mident, neighbor) in immediate_neighbors.key_cloned_iter() {
+            w.write(&format!("{mident} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for addr in used_addresses {
+            w.write(&format!("uses address {};", addr));
+            w.new_line()
+        }
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
+        for (mident, _loc) in friends.key_cloned_iter() {
+            w.write(&format!("friend {};", mident));
+            w.new_line();
+        }
+        for sdef in structs.key_cloned_iter() {
+            sdef.ast_debug(w);
+            w.new_line();
+        }
+        for cdef in constants.key_cloned_iter() {
+            cdef.ast_debug(w);
+            w.new_line();
+        }
+        for fdef in functions.key_cloned_iter() {
+            fdef.ast_debug(w);
+            w.new_line();
+        }
+    }
+}
+
+impl AstDebug for (FunctionName, &Function) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Function {
+                warning_filter,
+                index,
+                attributes,
+                visibility,
+                entry,
+                signature,
+                body,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        visibility.ast_debug(w);
+        if entry.is_some() {
+            w.write(&format!("{} ", ENTRY_MODIFIER));
+        }
+        if let FunctionBody_::Native = &body.value {
+            w.write("native ");
+        }
+        w.write(&format!("fun#{index} {name}"));
+        signature.ast_debug(w);
+        match &body.value {
+            FunctionBody_::Defined(body) => body.ast_debug(w),
+            FunctionBody_::Native => w.writeln(";"),
+        }
+    }
+}
+
+impl AstDebug for (ConstantName, &Constant) {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let (
+            name,
+            Constant {
+                warning_filter,
+                index,
+                attributes,
+                loc: _loc,
+                signature,
+                value,
+            },
+        ) = self;
+        warning_filter.ast_debug(w);
+        attributes.ast_debug(w);
+        w.write(&format!("const#{index} {name}:"));
+        signature.ast_debug(w);
+        w.write(" = ");
+        value.ast_debug(w);
+        w.write(";");
+    }
+}
+
+impl AstDebug for Sequence {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.block(|w| w.semicolon(self, |w, item| item.ast_debug(w)))
+    }
+}
+
+impl AstDebug for SequenceItem_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use SequenceItem_ as I;
+        match self {
+            I::Seq(e) => e.ast_debug(w),
+            I::Declare(sp!(_, bs)) => {
+                w.write("let ");
+                bs.ast_debug(w);
+            }
+            I::Bind(sp!(_, bs), expected_types, e) => {
+                w.write("let ");
+                bs.ast_debug(w);
+                w.write(": (");
+                expected_types.ast_debug(w);
+                w.write(")");
+                w.write(" = ");
+                e.ast_debug(w);
+            }
+        }
+    }
+}
+
+impl AstDebug for UnannotatedExp_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use UnannotatedExp_ as E;
+        match self {
+            E::Unit { trailing } if !trailing => w.write("()"),
+            E::Unit {
+                trailing: _trailing,
+            } => w.write("/*()*/"),
+            E::Value(v) => v.ast_debug(w),
+            E::Move {
+                from_user: false,
+                var: v,
+            } => {
+                w.write("move ");
+                v.ast_debug(w)
+            }
+            E::Move {
+                from_user: true,
+                var: v,
+            } => {
+                w.write("move@");
+                v.ast_debug(w)
+            }
+            E::Copy {
+                from_user: false,
+                var: v,
+            } => {
+                w.write("copy ");
+                v.ast_debug(w)
+            }
+            E::Copy {
+                from_user: true,
+                var: v,
+            } => {
+                w.write("copy@");
+                v.ast_debug(w)
+            }
+            E::Use(v) => {
+                w.write("use@");
+                v.ast_debug(w)
+            }
+            E::Constant(None, c) => w.write(&format!("{}", c)),
+            E::Constant(Some(m), c) => w.write(&format!("{}::{}", m, c)),
+            E::ModuleCall(mcall) => {
+                mcall.ast_debug(w);
+            }
+            E::Builtin(bf, rhs) => {
+                bf.ast_debug(w);
+                w.write("(");
+                rhs.ast_debug(w);
+                w.write(")");
+            }
+            E::Vector(_loc, usize, ty, elems) => {
+                w.write(format!("vector#{}", usize));
+                w.write("<");
+                ty.ast_debug(w);
+                w.write(">");
+                w.write("[");
+                elems.ast_debug(w);
+                w.write("]");
+            }
+            E::Pack(m, s, tys, fields) => {
+                w.write(&format!("{}::{}", m, s));
+                w.write("<");
+                tys.ast_debug(w);
+                w.write(">");
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_bt_e)| {
+                    let (idx, (bt, e)) = idx_bt_e;
+                    w.write(&format!("({}#{}:", idx, f));
+                    bt.ast_debug(w);
+                    w.write("): ");
+                    e.ast_debug(w);
+                });
+                w.write("}");
+            }
+            E::IfElse(b, t, f) => {
+                w.write("if (");
+                b.ast_debug(w);
+                w.write(") ");
+                t.ast_debug(w);
+                w.write(" else ");
+                f.ast_debug(w);
+            }
+            E::While(b, e) => {
+                w.write("while (");
+                b.ast_debug(w);
+                w.write(")");
+                e.ast_debug(w);
+            }
+            E::Loop { has_break, body } => {
+                w.write("loop");
+                if *has_break {
+                    w.write("#with_break");
+                }
+                w.write(" ");
+                body.ast_debug(w);
+            }
+            E::Block(seq) => seq.ast_debug(w),
+            E::ExpList(es) => {
+                w.write("(");
+                w.comma(es, |w, e| e.ast_debug(w));
+                w.write(")");
+            }
+
+            E::Assign(sp!(_, lvalues), expected_types, rhs) => {
+                lvalues.ast_debug(w);
+                w.write(": (");
+                expected_types.ast_debug(w);
+                w.write(") = ");
+                rhs.ast_debug(w);
+            }
+
+            E::Mutate(lhs, rhs) => {
+                w.write("*");
+                lhs.ast_debug(w);
+                w.write(" = ");
+                rhs.ast_debug(w);
+            }
+
+            E::Return(e) => {
+                w.write("return ");
+                e.ast_debug(w);
+            }
+            E::Abort(e) => {
+                w.write("abort ");
+                e.ast_debug(w);
+            }
+            E::Break => w.write("break"),
+            E::Continue => w.write("continue"),
+            E::Dereference(e) => {
+                w.write("*");
+                e.ast_debug(w)
+            }
+            E::UnaryExp(op, e) => {
+                op.ast_debug(w);
+                w.write(" ");
+                e.ast_debug(w);
+            }
+            E::BinopExp(l, op, ty, r) => {
+                l.ast_debug(w);
+                w.write(" ");
+                op.ast_debug(w);
+                w.write("@");
+                ty.ast_debug(w);
+                w.write(" ");
+                r.ast_debug(w)
+            }
+            E::Borrow(mut_, e, f) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+                w.write(&format!(".{}", f));
+            }
+            E::TempBorrow(mut_, e) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                e.ast_debug(w);
+            }
+            E::BorrowLocal(mut_, v) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                v.ast_debug(w);
+            }
+            E::Cast(e, ty) => {
+                w.write("(");
+                e.ast_debug(w);
+                w.write(" as ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Annotate(e, ty) => {
+                w.write("annot(");
+                e.ast_debug(w);
+                w.write(": ");
+                ty.ast_debug(w);
+                w.write(")");
+            }
+            E::Spec(u, used_locals) => {
+                w.write(&format!("spec #{}", u));
+                if !used_locals.is_empty() {
+                    w.write("uses [");
+                    w.comma(used_locals, |w, (n, ty)| w.annotate(|w| n.ast_debug(w), ty));
+                    w.write("]");
+                }
+            }
+            E::UnresolvedError => w.write("_|_"),
+        }
+    }
+}
+
+impl AstDebug for Exp {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let Exp { ty, exp } = self;
+        w.annotate(|w| exp.ast_debug(w), ty)
+    }
+}
+
+impl AstDebug for ModuleCall {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let ModuleCall {
+            module,
+            name,
+            type_arguments,
+            parameter_types,
+            arguments,
+        } = self;
+        w.write(&format!("{}::{}", module, name));
+        if !parameter_types.is_empty() {
+            w.write("[");
+            if !parameter_types.is_empty() {
+                w.write("parameter_types: [");
+                parameter_types.ast_debug(w);
+                w.write("]");
+            }
+        }
+        w.write("<");
+        type_arguments.ast_debug(w);
+        w.write(">");
+        w.write("(");
+        arguments.ast_debug(w);
+        w.write(")");
+    }
+}
+
+impl AstDebug for BuiltinFunction_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use crate::naming::ast::BuiltinFunction_ as NF;
+        use BuiltinFunction_ as F;
+        let (n, bt_opt) = match self {
+            F::Freeze(bt) => (NF::FREEZE, Some(bt)),
+            F::Assert(_) => (NF::ASSERT_MACRO, None),
+        };
+        w.write(n);
+        if let Some(bt) = bt_opt {
+            w.write("<");
+            bt.ast_debug(w);
+            w.write(">");
+        }
+    }
+}
+
+impl AstDebug for ExpListItem {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            ExpListItem::Single(e, st) => w.annotate(|w| e.ast_debug(w), st),
+            ExpListItem::Splat(_, e, ss) => {
+                w.write("~");
+                w.annotate(|w| e.ast_debug(w), ss)
+            }
+        }
+    }
+}
+
+impl AstDebug for Vec<Option<Type>> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        w.comma(self, |w, t_opt| match t_opt {
+            Some(t) => t.ast_debug(w),
+            None => w.write("%no_exp%"),
+        })
+    }
+}
+
+impl AstDebug for Vec<LValue> {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        let parens = self.len() != 1;
+        if parens {
+            w.write("(");
+        }
+        w.comma(self, |w, a| a.ast_debug(w));
+        if parens {
+            w.write(")");
+        }
+    }
+}
+
+impl AstDebug for LValue_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        use LValue_ as L;
+        match self {
+            L::Ignore => w.write("_"),
+            L::Var {
+                var: v,
+                ty: st,
+                unused_binding,
+            } => w.annotate(
+                |w| {
+                    v.ast_debug(w);
+                    if *unused_binding {
+                        w.write("#unused")
+                    }
+                },
+                st,
+            ),
+            L::Unpack(m, s, tys, fields) => {
+                w.write(&format!("{}::{}", m, s));
+                w.write("<");
+                tys.ast_debug(w);
+                w.write(">");
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_bt_a)| {
+                    let (idx, (bt, a)) = idx_bt_a;
+                    w.annotate(|w| w.write(&format!("{}#{}", idx, f)), bt);
+                    w.write(": ");
+                    a.ast_debug(w);
+                });
+                w.write("}");
+            }
+            L::BorrowUnpack(mut_, m, s, tys, fields) => {
+                w.write("&");
+                if *mut_ {
+                    w.write("mut ");
+                }
+                w.write(&format!("{}::{}", m, s));
+                w.write("<");
+                tys.ast_debug(w);
+                w.write(">");
+                w.write("{");
+                w.comma(fields, |w, (_, f, idx_bt_a)| {
+                    let (idx, (bt, a)) = idx_bt_a;
+                    w.annotate(|w| w.write(&format!("{}#{}", idx, f)), bt);
+                    w.write(": ");
+                    a.ast_debug(w);
+                });
+                w.write("}");
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/core.rs b/vendors/move/crates/move-compiler/src/typing/core.rs
new file mode 100644
index 000000000..8d8407d26
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/core.rs
@@ -0,0 +1,1891 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    debug_display, diag,
+    diagnostics::{codes::NameResolution, Diagnostic},
+    expansion::ast::{AbilitySet, AttributeName_, ModuleIdent, ModuleIdent_, Visibility},
+    naming::ast::{
+        self as N, BuiltinTypeName_, ResolvedUseFuns, StructDefinition, StructTypeParameter,
+        TParam, TParamID, TVar, Type, TypeName, TypeName_, Type_, UseFunKind, Var,
+    },
+    parser::ast::{
+        Ability_, ConstantName, Field, FunctionName, Mutability, StructName, ENTRY_MODIFIER,
+    },
+    shared::{
+        known_attributes::{KnownAttribute, TestingAttribute},
+        program_info::*,
+        unique_map::UniqueMap,
+        *,
+    },
+    FullyCompiledProgram,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, BTreeSet, HashMap};
+
+//**************************************************************************************************
+// Context
+//**************************************************************************************************
+
+struct UseFunsScope {
+    count: usize,
+    unused: BTreeMap<(TypeName, Name), (Loc, UseFunKind, /* depth */ usize)>,
+    use_funs: ResolvedUseFuns,
+}
+
+pub enum Constraint {
+    AbilityConstraint {
+        loc: Loc,
+        msg: Option<String>,
+        ty: Type,
+        constraints: AbilitySet,
+    },
+    NumericConstraint(Loc, &'static str, Type),
+    BitsConstraint(Loc, &'static str, Type),
+    OrderedConstraint(Loc, &'static str, Type),
+    BaseTypeConstraint(Loc, String, Type),
+    SingleTypeConstraint(Loc, String, Type),
+}
+pub type Constraints = Vec<Constraint>;
+pub type TParamSubst = HashMap<TParamID, Type>;
+
+pub struct LoopInfo(LoopInfo_);
+
+enum LoopInfo_ {
+    NotInLoop,
+    BreakTypeUnknown,
+    BreakType(Box<Type>),
+}
+
+pub struct Local {
+    pub mut_: Mutability,
+    pub ty: Type,
+    pub used_mut: Option<Loc>,
+}
+
+pub struct Context<'env> {
+    pub modules: NamingProgramInfo,
+    pub env: &'env mut CompilationEnv,
+
+    use_funs: Vec<UseFunsScope>,
+    pub current_package: Option<Symbol>,
+    pub current_module: Option<ModuleIdent>,
+    pub current_function: Option<FunctionName>,
+    pub current_script_constants: Option<UniqueMap<ConstantName, ConstantInfo>>,
+    pub return_type: Option<Type>,
+    locals: UniqueMap<Var, Local>,
+
+    pub subst: Subst,
+    pub constraints: Constraints,
+
+    loop_info: LoopInfo,
+
+    /// collects all friends that should be added over the course of 'public(package)' calls
+    /// structured as (defining module, new friend, location) where `new friend` is usually the
+    /// context's current module. Note there may be more than one location in practice, but
+    /// tracking a single one is sufficient for error reporting.
+    pub new_friends: BTreeSet<(ModuleIdent, Loc)>,
+    /// collects all used module members (functions and constants) but it's a superset of these in
+    /// that it may contain other identifiers that do not in fact represent a function or a constant
+    pub used_module_members: BTreeMap<ModuleIdent_, BTreeSet<Symbol>>,
+}
+
+impl UseFunsScope {
+    pub fn global(info: &NamingProgramInfo) -> Self {
+        let count = 1;
+        let unused = BTreeMap::new();
+        let mut use_funs = BTreeMap::new();
+        for (_, _, minfo) in &info.modules {
+            for (tn, methods) in &minfo.use_funs {
+                let public_methods = methods.ref_filter_map(|_, uf| {
+                    if uf.is_public.is_some() {
+                        Some(uf.clone())
+                    } else {
+                        None
+                    }
+                });
+                if public_methods.is_empty() {
+                    continue;
+                }
+
+                assert!(
+                    !use_funs.contains_key(tn),
+                    "ICE public methods should have been filtered to the defining module.
+                    tn: {tn}.
+                    prev: {}
+                    new: {}",
+                    debug_display!((tn, (use_funs.get(tn).unwrap()))),
+                    debug_display!((tn, &public_methods))
+                );
+                use_funs.insert(tn.clone(), public_methods);
+            }
+        }
+        UseFunsScope {
+            count,
+            unused,
+            use_funs,
+        }
+    }
+}
+
+impl<'env> Context<'env> {
+    pub fn new(
+        env: &'env mut CompilationEnv,
+        _pre_compiled_lib: Option<&FullyCompiledProgram>,
+        info: NamingProgramInfo,
+    ) -> Self {
+        let global_use_funs = UseFunsScope::global(&info);
+        Context {
+            use_funs: vec![global_use_funs],
+            subst: Subst::empty(),
+            current_package: None,
+            current_module: None,
+            current_function: None,
+            current_script_constants: None,
+            return_type: None,
+            constraints: vec![],
+            locals: UniqueMap::new(),
+            loop_info: LoopInfo(LoopInfo_::NotInLoop),
+            modules: info,
+            env,
+            new_friends: BTreeSet::new(),
+            used_module_members: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_use_funs_scope(&mut self, new_scope: N::UseFuns) {
+        let N::UseFuns {
+            resolved: new_scope,
+            implicit_candidates,
+        } = new_scope;
+        assert!(
+            implicit_candidates.is_empty(),
+            "ICE use fun candidates should have been resolved"
+        );
+        let depth = self.use_funs.len();
+        let cur = self.use_funs.last_mut().unwrap();
+        if new_scope.is_empty() {
+            cur.count += 1;
+            return;
+        }
+        let mut unused = cur.unused.clone();
+        let mut use_funs = cur.use_funs.clone();
+        for (tn, additional_methods) in new_scope {
+            for (method, nuf) in additional_methods {
+                match nuf.kind {
+                    UseFunKind::Explicit if nuf.is_public.is_none() => {
+                        unused.insert((tn.clone(), method), (nuf.loc, nuf.kind, depth));
+                    }
+                    UseFunKind::UseAlias { used: false } => {
+                        unused.insert((tn.clone(), method), (nuf.loc, nuf.kind, depth));
+                    }
+                    _ => (),
+                }
+                let cur_methods = use_funs.entry(tn.clone()).or_default();
+                cur_methods.remove(&method);
+                cur_methods.add(method, nuf).unwrap();
+            }
+        }
+        self.use_funs.push(UseFunsScope {
+            count: 1,
+            unused,
+            use_funs,
+        })
+    }
+
+    pub fn pop_use_funs_scope(&mut self) {
+        let cur = self.use_funs.last_mut().unwrap();
+        if cur.count > 1 {
+            cur.count -= 1;
+            return;
+        }
+        let UseFunsScope { unused, .. } = self.use_funs.pop().unwrap();
+        let cur_depth = self.use_funs.len();
+        let mut new_unused = BTreeMap::new();
+        for ((tn, method), (loc, kind, depth)) in unused {
+            if depth != cur_depth {
+                // the unused was added in a scope above
+                assert!(depth < cur_depth);
+                new_unused.insert((tn, method), (loc, kind, depth));
+                continue;
+            }
+            let msg = match kind {
+                UseFunKind::Explicit => {
+                    format!("Unused 'use fun' of '{tn}.{method}'. Consider removing it")
+                }
+                UseFunKind::UseAlias { used } => {
+                    assert!(!used);
+                    format!("Unused 'use' of alias '{method}'. Consider removing it")
+                }
+                UseFunKind::FunctionDeclaration => {
+                    panic!("ICE function declaration use funs should never be added to use fun")
+                }
+            };
+            self.env.add_diag(diag!(UnusedItem::Alias, (loc, msg)))
+        }
+        self.use_funs.last_mut().unwrap().unused = new_unused;
+    }
+
+    pub fn reset_for_module_item(&mut self) {
+        assert!(
+            matches!(&self.loop_info, LoopInfo(LoopInfo_::NotInLoop)),
+            "ICE loop_info should be reset after the loop"
+        );
+        self.return_type = None;
+        self.locals = UniqueMap::new();
+        self.subst = Subst::empty();
+        self.constraints = Constraints::new();
+        self.current_function = None;
+    }
+
+    pub fn bind_script_constants(&mut self, constants: &UniqueMap<ConstantName, N::Constant>) {
+        assert!(self.current_script_constants.is_none());
+        self.current_script_constants = Some(constants.ref_map(|cname, cdef| ConstantInfo {
+            attributes: cdef.attributes.clone(),
+            defined_loc: cname.loc(),
+            signature: cdef.signature.clone(),
+        }));
+    }
+
+    pub fn error_type(&mut self, loc: Loc) -> Type {
+        sp(loc, Type_::UnresolvedError)
+    }
+
+    pub fn add_ability_constraint(
+        &mut self,
+        loc: Loc,
+        msg_opt: Option<impl Into<String>>,
+        ty: Type,
+        ability_: Ability_,
+    ) {
+        self.add_ability_set_constraint(
+            loc,
+            msg_opt,
+            ty,
+            AbilitySet::from_abilities(vec![sp(loc, ability_)]).unwrap(),
+        )
+    }
+
+    pub fn add_ability_set_constraint(
+        &mut self,
+        loc: Loc,
+        msg_opt: Option<impl Into<String>>,
+        ty: Type,
+        constraints: AbilitySet,
+    ) {
+        self.constraints.push(Constraint::AbilityConstraint {
+            loc,
+            msg: msg_opt.map(|s| s.into()),
+            ty,
+            constraints,
+        })
+    }
+
+    pub fn add_base_type_constraint(&mut self, loc: Loc, msg: impl Into<String>, t: Type) {
+        self.constraints
+            .push(Constraint::BaseTypeConstraint(loc, msg.into(), t))
+    }
+
+    pub fn add_single_type_constraint(&mut self, loc: Loc, msg: impl Into<String>, t: Type) {
+        self.constraints
+            .push(Constraint::SingleTypeConstraint(loc, msg.into(), t))
+    }
+
+    pub fn add_numeric_constraint(&mut self, loc: Loc, op: &'static str, t: Type) {
+        self.constraints
+            .push(Constraint::NumericConstraint(loc, op, t))
+    }
+
+    pub fn add_bits_constraint(&mut self, loc: Loc, op: &'static str, t: Type) {
+        self.constraints
+            .push(Constraint::BitsConstraint(loc, op, t))
+    }
+
+    pub fn add_ordered_constraint(&mut self, loc: Loc, op: &'static str, t: Type) {
+        self.constraints
+            .push(Constraint::OrderedConstraint(loc, op, t))
+    }
+
+    pub fn declare_local(&mut self, mut_: Mutability, var: Var, ty: Type) {
+        let local = Local {
+            mut_,
+            ty,
+            used_mut: None,
+        };
+        self.locals.add(var, local).unwrap()
+    }
+
+    pub fn get_local_type(&mut self, var: &Var) -> Type {
+        // should not fail, already checked in naming
+        self.locals.get(var).unwrap().ty.clone()
+    }
+
+    pub fn mark_mutable_usage(&mut self, loc: Loc, var: &Var) -> (Loc, Mutability) {
+        // should not fail, already checked in naming
+        let decl_loc = *self.locals.get_loc(var).unwrap();
+        let local = self.locals.get_mut(var).unwrap();
+        local.used_mut = Some(loc);
+        (decl_loc, local.mut_)
+    }
+
+    pub fn take_locals(&mut self) -> UniqueMap<Var, Local> {
+        std::mem::take(&mut self.locals)
+    }
+
+    pub fn is_current_module(&self, m: &ModuleIdent) -> bool {
+        match &self.current_module {
+            Some(curm) => curm == m,
+            None => false,
+        }
+    }
+
+    pub fn is_current_function(&self, m: &ModuleIdent, f: &FunctionName) -> bool {
+        self.is_current_module(m) && matches!(&self.current_function, Some(curf) if curf == f)
+    }
+
+    pub fn current_package(&self) -> Option<Symbol> {
+        self.current_module
+            .as_ref()
+            .and_then(|mident| self.module_info(mident).package)
+    }
+
+    // `loc` indicates the location that caused the add to occur
+    fn record_current_module_as_friend(&mut self, m: &ModuleIdent, loc: Loc) {
+        if matches!(self.current_module, Some(current_mident) if m != &current_mident) {
+            self.new_friends.insert((*m, loc));
+        }
+    }
+
+    fn current_module_shares_package_and_address(&self, m: &ModuleIdent) -> bool {
+        self.current_module.is_some_and(|current_mident| {
+            m.value.address == current_mident.value.address
+                && self.module_info(m).package == self.module_info(&current_mident).package
+        })
+    }
+
+    fn current_module_is_a_friend_of(&self, m: &ModuleIdent) -> bool {
+        match &self.current_module {
+            None => false,
+            Some(current_mident) => {
+                let minfo = self.module_info(m);
+                minfo.friends.contains_key(current_mident)
+            }
+        }
+    }
+
+    /// current_module.is_test_only || current_function.is_test_only || current_function.is_test
+    fn is_testing_context(&self) -> bool {
+        // TODO should we store this in the context?
+        let test_only = AttributeName_::Known(KnownAttribute::Testing(TestingAttribute::TestOnly));
+        let test = AttributeName_::Known(KnownAttribute::Testing(TestingAttribute::Test));
+
+        self.current_module.as_ref().is_some_and(|m| {
+            let minfo = self.module_info(m);
+            let is_test_only = minfo.attributes.contains_key_(&test_only);
+            is_test_only
+                || self.current_function.as_ref().is_some_and(|f| {
+                    let finfo = minfo.functions.get(f).unwrap();
+                    finfo.attributes.contains_key_(&test_only)
+                        || finfo.attributes.contains_key_(&test)
+                })
+        })
+    }
+
+    fn module_info(&self, m: &ModuleIdent) -> &ModuleInfo {
+        self.modules.module(m)
+    }
+
+    fn struct_definition(&self, m: &ModuleIdent, n: &StructName) -> &StructDefinition {
+        self.modules.struct_definition(m, n)
+    }
+
+    pub fn struct_declared_abilities(&self, m: &ModuleIdent, n: &StructName) -> &AbilitySet {
+        self.modules.struct_declared_abilities(m, n)
+    }
+
+    pub fn struct_declared_loc(&self, m: &ModuleIdent, n: &StructName) -> Loc {
+        self.modules.struct_declared_loc(m, n)
+    }
+
+    pub fn struct_tparams(&self, m: &ModuleIdent, n: &StructName) -> &Vec<StructTypeParameter> {
+        self.modules.struct_type_parameters(m, n)
+    }
+
+    fn function_info(&self, m: &ModuleIdent, n: &FunctionName) -> &FunctionInfo {
+        self.modules.function_info(m, n)
+    }
+
+    fn constant_info(&mut self, m_opt: &Option<ModuleIdent>, n: &ConstantName) -> &ConstantInfo {
+        let constants = match m_opt {
+            None => self.current_script_constants.as_ref().unwrap(),
+            Some(m) => &self.module_info(m).constants,
+        };
+        constants.get(n).expect("ICE should have failed in naming")
+    }
+
+    pub fn in_loop(&self) -> bool {
+        match &self.loop_info.0 {
+            LoopInfo_::NotInLoop => false,
+            LoopInfo_::BreakTypeUnknown | LoopInfo_::BreakType(_) => true,
+        }
+    }
+
+    pub fn get_break_type(&self) -> Option<&Type> {
+        match &self.loop_info.0 {
+            LoopInfo_::NotInLoop | LoopInfo_::BreakTypeUnknown => None,
+            LoopInfo_::BreakType(t) => Some(t),
+        }
+    }
+
+    pub fn set_break_type(&mut self, t: Type) {
+        match &self.loop_info.0 {
+            LoopInfo_::NotInLoop => (),
+            LoopInfo_::BreakTypeUnknown | LoopInfo_::BreakType(_) => {
+                self.loop_info.0 = LoopInfo_::BreakType(Box::new(t))
+            }
+        }
+    }
+
+    pub fn enter_loop(&mut self) -> LoopInfo {
+        std::mem::replace(&mut self.loop_info, LoopInfo(LoopInfo_::BreakTypeUnknown))
+    }
+
+    // Reset loop info and return the loop's break type, if it has one
+    pub fn exit_loop(&mut self, old_info: LoopInfo) -> Option<Type> {
+        match std::mem::replace(&mut self.loop_info, old_info).0 {
+            LoopInfo_::NotInLoop => panic!("ICE exit_loop called while not in a loop"),
+            LoopInfo_::BreakTypeUnknown => None,
+            LoopInfo_::BreakType(t) => Some(*t),
+        }
+    }
+}
+
+//**************************************************************************************************
+// Subst
+//**************************************************************************************************
+
+#[derive(Clone, Debug)]
+pub struct Subst {
+    tvars: HashMap<TVar, Type>,
+    num_vars: HashMap<TVar, Loc>,
+}
+
+impl Subst {
+    pub fn empty() -> Self {
+        Self {
+            tvars: HashMap::new(),
+            num_vars: HashMap::new(),
+        }
+    }
+
+    pub fn insert(&mut self, tvar: TVar, bt: Type) {
+        self.tvars.insert(tvar, bt);
+    }
+
+    pub fn get(&self, tvar: TVar) -> Option<&Type> {
+        self.tvars.get(&tvar)
+    }
+
+    pub fn new_num_var(&mut self, loc: Loc) -> TVar {
+        let tvar = TVar::next();
+        assert!(self.num_vars.insert(tvar, loc).is_none());
+        tvar
+    }
+
+    pub fn set_num_var(&mut self, tvar: TVar, loc: Loc) {
+        self.num_vars.entry(tvar).or_insert(loc);
+        if let Some(sp!(_, Type_::Var(next))) = self.get(tvar) {
+            let next = *next;
+            self.set_num_var(next, loc)
+        }
+    }
+
+    pub fn is_num_var(&self, tvar: TVar) -> bool {
+        self.num_vars.contains_key(&tvar)
+    }
+}
+
+impl ast_debug::AstDebug for Subst {
+    fn ast_debug(&self, w: &mut ast_debug::AstWriter) {
+        let Subst { tvars, num_vars } = self;
+
+        w.write("tvars:");
+        w.indent(4, |w| {
+            let mut tvars = tvars.iter().collect::<Vec<_>>();
+            tvars.sort_by_key(|(v, _)| *v);
+            for (tvar, bt) in tvars {
+                w.write(&format!("{:?} => ", tvar));
+                bt.ast_debug(w);
+                w.new_line();
+            }
+        });
+        w.write("num_vars:");
+        w.indent(4, |w| {
+            let mut num_vars = num_vars.keys().collect::<Vec<_>>();
+            num_vars.sort();
+            for tvar in num_vars {
+                w.writeln(&format!("{:?}", tvar))
+            }
+        })
+    }
+}
+
+//**************************************************************************************************
+// Type error display
+//**************************************************************************************************
+
+pub fn error_format(b: &Type, subst: &Subst) -> String {
+    error_format_impl(b, subst, false)
+}
+
+pub fn error_format_(b_: &Type_, subst: &Subst) -> String {
+    error_format_impl_(b_, subst, false)
+}
+
+pub fn error_format_nested(b: &Type, subst: &Subst) -> String {
+    error_format_impl(b, subst, true)
+}
+
+fn error_format_impl(sp!(_, b_): &Type, subst: &Subst, nested: bool) -> String {
+    error_format_impl_(b_, subst, nested)
+}
+
+fn error_format_impl_(b_: &Type_, subst: &Subst, nested: bool) -> String {
+    use Type_::*;
+    let res = match b_ {
+        UnresolvedError | Anything => "_".to_string(),
+        Unit => "()".to_string(),
+        Var(id) => {
+            let last_id = forward_tvar(subst, *id);
+            match subst.get(last_id) {
+                Some(sp!(_, Var(_))) => unreachable!(),
+                Some(t) => error_format_nested(t, subst),
+                None if nested && subst.is_num_var(last_id) => "{integer}".to_string(),
+                None if subst.is_num_var(last_id) => return "integer".to_string(),
+                None => "_".to_string(),
+            }
+        }
+        Apply(_, sp!(_, TypeName_::Multiple(_)), tys) => {
+            let inner = format_comma(tys.iter().map(|s| error_format_nested(s, subst)));
+            format!("({})", inner)
+        }
+        Apply(_, n, tys) => {
+            let tys_str = if !tys.is_empty() {
+                format!(
+                    "<{}>",
+                    format_comma(tys.iter().map(|t| error_format_nested(t, subst)))
+                )
+            } else {
+                "".to_string()
+            };
+            format!("{}{}", n, tys_str)
+        }
+        Param(tp) => tp.user_specified_name.value.to_string(),
+        Ref(mut_, ty) => format!(
+            "&{}{}",
+            if *mut_ { "mut " } else { "" },
+            error_format_nested(ty, subst)
+        ),
+    };
+    if nested {
+        res
+    } else {
+        format!("'{}'", res)
+    }
+}
+
+//**************************************************************************************************
+// Type utils
+//**************************************************************************************************
+
+pub fn infer_abilities<const INFO_PASS: bool>(
+    context: &ProgramInfo<INFO_PASS>,
+    subst: &Subst,
+    ty: Type,
+) -> AbilitySet {
+    use Type_ as T;
+    let loc = ty.loc;
+    match unfold_type(subst, ty).value {
+        T::Unit => AbilitySet::collection(loc),
+        T::Ref(_, _) => AbilitySet::references(loc),
+        T::Var(_) => unreachable!("ICE unfold_type failed, which is impossible"),
+        T::UnresolvedError | T::Anything => AbilitySet::all(loc),
+        T::Param(TParam { abilities, .. }) | T::Apply(Some(abilities), _, _) => abilities,
+        T::Apply(None, n, ty_args) => {
+            let (declared_abilities, ty_args) = match &n.value {
+                TypeName_::Multiple(_) => (AbilitySet::collection(loc), ty_args),
+                TypeName_::Builtin(b) => (b.value.declared_abilities(b.loc), ty_args),
+                TypeName_::ModuleType(m, n) => {
+                    let declared_abilities = context.struct_declared_abilities(m, n).clone();
+                    let non_phantom_ty_args = ty_args
+                        .into_iter()
+                        .zip(context.struct_type_parameters(m, n))
+                        .filter(|(_, param)| !param.is_phantom)
+                        .map(|(arg, _)| arg)
+                        .collect::<Vec<_>>();
+                    (declared_abilities, non_phantom_ty_args)
+                }
+            };
+            let ty_args_abilities = ty_args
+                .into_iter()
+                .map(|ty| infer_abilities(context, subst, ty))
+                .collect::<Vec<_>>();
+            AbilitySet::from_abilities(declared_abilities.into_iter().filter(|ab| {
+                let requirement = ab.value.requires();
+                ty_args_abilities
+                    .iter()
+                    .all(|ty_arg_abilities| ty_arg_abilities.has_ability_(requirement))
+            }))
+            .unwrap()
+        }
+    }
+}
+
+// Returns
+// - the declared location where abilities are added (if applicable)
+// - the set of declared abilities
+// - its type arguments
+fn debug_abilities_info(context: &Context, ty: &Type) -> (Option<Loc>, AbilitySet, Vec<Type>) {
+    use Type_ as T;
+    let loc = ty.loc;
+    match &ty.value {
+        T::Unit | T::Ref(_, _) => (None, AbilitySet::references(loc), vec![]),
+        T::Var(_) => panic!("ICE call unfold_type before debug_abilities_info"),
+        T::UnresolvedError | T::Anything => (None, AbilitySet::all(loc), vec![]),
+        T::Param(TParam {
+            abilities,
+            user_specified_name,
+            ..
+        }) => (Some(user_specified_name.loc), abilities.clone(), vec![]),
+        T::Apply(_, sp!(_, TypeName_::Multiple(_)), ty_args) => {
+            (None, AbilitySet::collection(loc), ty_args.clone())
+        }
+        T::Apply(_, sp!(_, TypeName_::Builtin(b)), ty_args) => {
+            (None, b.value.declared_abilities(b.loc), ty_args.clone())
+        }
+        T::Apply(_, sp!(_, TypeName_::ModuleType(m, n)), ty_args) => (
+            Some(context.struct_declared_loc(m, n)),
+            context.struct_declared_abilities(m, n).clone(),
+            ty_args.clone(),
+        ),
+    }
+}
+
+pub fn make_num_tvar(context: &mut Context, loc: Loc) -> Type {
+    let tvar = context.subst.new_num_var(loc);
+    sp(loc, Type_::Var(tvar))
+}
+
+pub fn make_tvar(_context: &mut Context, loc: Loc) -> Type {
+    sp(loc, Type_::Var(TVar::next()))
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+pub fn make_struct_type(
+    context: &mut Context,
+    loc: Loc,
+    m: &ModuleIdent,
+    n: &StructName,
+    ty_args_opt: Option<Vec<Type>>,
+) -> (Type, Vec<Type>) {
+    let tn = sp(loc, TypeName_::ModuleType(*m, *n));
+    let sdef = context.struct_definition(m, n);
+    match ty_args_opt {
+        None => {
+            let constraints = sdef
+                .type_parameters
+                .iter()
+                .map(|tp| (loc, tp.param.abilities.clone()))
+                .collect();
+            let ty_args = make_tparams(context, loc, TVarCase::Base, constraints);
+            (sp(loc, Type_::Apply(None, tn, ty_args.clone())), ty_args)
+        }
+        Some(ty_args) => {
+            let tapply_ = instantiate_apply(context, loc, None, tn, ty_args);
+            let targs = match &tapply_ {
+                Type_::Apply(_, _, targs) => targs.clone(),
+                _ => panic!("ICE instantiate_apply returned non Apply"),
+            };
+            (sp(loc, tapply_), targs)
+        }
+    }
+}
+
+pub fn make_expr_list_tvars(
+    context: &mut Context,
+    loc: Loc,
+    constraint_msg: impl Into<String>,
+    locs: Vec<Loc>,
+) -> Vec<Type> {
+    let constraints = locs.iter().map(|l| (*l, AbilitySet::empty())).collect();
+    let tys = make_tparams(
+        context,
+        loc,
+        TVarCase::Single(constraint_msg.into()),
+        constraints,
+    );
+    tys.into_iter()
+        .zip(locs)
+        .map(|(tvar, l)| sp(l, tvar.value))
+        .collect()
+}
+
+// ty_args should come from make_struct_type
+pub fn make_field_types(
+    context: &mut Context,
+    _loc: Loc,
+    m: &ModuleIdent,
+    n: &StructName,
+    ty_args: Vec<Type>,
+) -> N::StructFields {
+    let sdef = context.struct_definition(m, n);
+    let tparam_subst = &make_tparam_subst(
+        context
+            .struct_definition(m, n)
+            .type_parameters
+            .iter()
+            .map(|tp| &tp.param),
+        ty_args,
+    );
+    match &sdef.fields {
+        N::StructFields::Native(loc) => N::StructFields::Native(*loc),
+        N::StructFields::Defined(m) => {
+            N::StructFields::Defined(m.ref_map(|_, (idx, field_ty)| {
+                (*idx, subst_tparams(tparam_subst, field_ty.clone()))
+            }))
+        }
+    }
+}
+
+// ty_args should come from make_struct_type
+pub fn make_field_type(
+    context: &mut Context,
+    loc: Loc,
+    m: &ModuleIdent,
+    n: &StructName,
+    ty_args: Vec<Type>,
+    field: &Field,
+) -> Type {
+    let sdef = context.struct_definition(m, n);
+    let fields_map = match &sdef.fields {
+        N::StructFields::Native(nloc) => {
+            let nloc = *nloc;
+            let msg = format!("Unbound field '{}' for native struct '{}::{}'", field, m, n);
+            context.env.add_diag(diag!(
+                NameResolution::UnboundField,
+                (loc, msg),
+                (nloc, "Struct declared 'native' here")
+            ));
+            return context.error_type(loc);
+        }
+        N::StructFields::Defined(m) => m,
+    };
+    match fields_map.get(field).cloned() {
+        None => {
+            context.env.add_diag(diag!(
+                NameResolution::UnboundField,
+                (loc, format!("Unbound field '{}' in '{}::{}'", field, m, n)),
+            ));
+            context.error_type(loc)
+        }
+        Some((_, field_ty)) => {
+            let tparam_subst = &make_tparam_subst(
+                context
+                    .struct_definition(m, n)
+                    .type_parameters
+                    .iter()
+                    .map(|tp| &tp.param),
+                ty_args,
+            );
+            subst_tparams(tparam_subst, field_ty)
+        }
+    }
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+pub fn make_constant_type(
+    context: &mut Context,
+    loc: Loc,
+    m: &Option<ModuleIdent>,
+    c: &ConstantName,
+) -> Type {
+    let in_current_module = m == &context.current_module;
+    let (defined_loc, signature) = {
+        let ConstantInfo {
+            attributes: _,
+            defined_loc,
+            signature,
+        } = context.constant_info(m, c);
+        (*defined_loc, signature.clone())
+    };
+    if !in_current_module {
+        let msg = match m {
+            None => format!("Invalid access of '{}'", c),
+            Some(mident) => format!("Invalid access of '{}::{}'", mident, c),
+        };
+        let internal_msg = "Constants are internal to their module, and cannot can be accessed \
+                            outside of their module";
+        context.env.add_diag(diag!(
+            TypeSafety::Visibility,
+            (loc, msg),
+            (defined_loc, internal_msg)
+        ));
+    }
+
+    signature
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+pub fn make_method_call_type(
+    context: &mut Context,
+    loc: Loc,
+    lhs_ty: &Type,
+    tn: &TypeName,
+    method: Name,
+    ty_args_opt: Option<Vec<Type>>,
+) -> Option<(
+    Loc,
+    ModuleIdent,
+    FunctionName,
+    Vec<Type>,
+    Vec<(Var, Type)>,
+    Type,
+)> {
+    let target_function_opt = context
+        .use_funs
+        .last()
+        .unwrap()
+        .use_funs
+        .get(tn)
+        .and_then(|methods| Some(methods.get(&method)?.target_function));
+    // try to find a function in the defining module for errors
+    let Some((target_m, target_f)) = target_function_opt else {
+        let lhs_ty_str = error_format_nested(lhs_ty, &Subst::empty());
+        let defining_module = match &tn.value {
+            TypeName_::Multiple(_) => panic!("ICE method on tuple"),
+            TypeName_::Builtin(sp!(_, bt_)) => context.env.primitive_definer(*bt_),
+            TypeName_::ModuleType(m, _) => Some(m),
+        };
+        let finfo_opt = defining_module.and_then(|m| {
+            let finfo = context
+                .modules
+                .module(m)
+                .functions
+                .get(&FunctionName(method))?;
+            Some((m, finfo))
+        });
+        // if we found a function with the method name, it must have the wrong type
+        if let Some((m, finfo)) = finfo_opt {
+            let (first_ty_loc, first_ty) = match finfo
+                .signature
+                .parameters
+                .first()
+                .map(|(_, _, t)| t.clone())
+            {
+                None => (finfo.defined_loc, None),
+                Some(t) => (t.loc, Some(t)),
+            };
+            let arg_msg = match first_ty {
+                Some(ty) => {
+                    let tys_str = error_format(&ty, &Subst::empty());
+                    format!("but it has a different type for its first argument, {tys_str}")
+                }
+                None => "but it takes no arguments".to_owned(),
+            };
+            let msg = format!(
+                "Invalid method call. \
+                No known method '{method}' on type '{lhs_ty_str}'"
+            );
+            let fmsg = format!("The function '{m}::{method}' exists, {arg_msg}");
+            context.env.add_diag(diag!(
+                TypeSafety::InvalidMethodCall,
+                (loc, msg),
+                (first_ty_loc, fmsg)
+            ));
+        } else {
+            let msg = format!(
+                "Invalid method call. \
+                No known method '{method}' on type '{lhs_ty_str}'"
+            );
+            let decl_msg = match defining_module {
+                Some(m) => {
+                    format!(", and no function '{method}' was found in the defining module '{m}'")
+                }
+                None => "".to_owned(),
+            };
+            let fmsg =
+                format!("No local 'use fun' alias was found for '{lhs_ty_str}.{method}'{decl_msg}");
+            context.env.add_diag(diag!(
+                TypeSafety::InvalidMethodCall,
+                (loc, msg),
+                (method.loc, fmsg)
+            ));
+        }
+        return None;
+    };
+    // mark the method as used
+    context
+        .use_funs
+        .last_mut()
+        .unwrap()
+        .unused
+        .remove(&(tn.clone(), method));
+
+    let (defined_loc, ty_args, params, return_ty) =
+        make_function_type(context, loc, &target_m, &target_f, ty_args_opt);
+
+    Some((defined_loc, target_m, target_f, ty_args, params, return_ty))
+}
+
+pub fn make_function_type(
+    context: &mut Context,
+    loc: Loc,
+    m: &ModuleIdent,
+    f: &FunctionName,
+    ty_args_opt: Option<Vec<Type>>,
+) -> (Loc, Vec<Type>, Vec<(Var, Type)>, Type) {
+    let in_current_module = match &context.current_module {
+        Some(current) => m == current,
+        None => false,
+    };
+    let constraints: Vec<_> = context
+        .function_info(m, f)
+        .signature
+        .type_parameters
+        .iter()
+        .map(|tp| tp.abilities.clone())
+        .collect();
+
+    let ty_args = match ty_args_opt {
+        None => {
+            let locs_constraints = constraints.into_iter().map(|k| (loc, k)).collect();
+            make_tparams(context, loc, TVarCase::Base, locs_constraints)
+        }
+        Some(ty_args) => {
+            let ty_args = check_type_argument_arity(
+                context,
+                loc,
+                || format!("{}::{}", m, f),
+                ty_args,
+                &constraints,
+            );
+            instantiate_type_args(context, loc, None, ty_args, constraints)
+        }
+    };
+
+    let finfo = context.function_info(m, f);
+    let tparam_subst = &make_tparam_subst(&finfo.signature.type_parameters, ty_args.clone());
+    let params = finfo
+        .signature
+        .parameters
+        .iter()
+        .map(|(_, n, t)| (*n, subst_tparams(tparam_subst, t.clone())))
+        .collect();
+    let return_ty = subst_tparams(tparam_subst, finfo.signature.return_type.clone());
+
+    let defined_loc = finfo.defined_loc;
+    let public_for_testing =
+        public_testing_visibility(context.env, context.current_package, f, finfo.entry);
+    let is_testing_context = context.is_testing_context();
+    match finfo.visibility {
+        _ if is_testing_context && public_for_testing.is_some() => (),
+        Visibility::Internal if in_current_module => (),
+        Visibility::Internal => {
+            let internal_msg = format!(
+                "This function is internal to its module. Only '{}', '{}', and '{}' functions can \
+                 be called outside of their module",
+                Visibility::PUBLIC,
+                Visibility::FRIEND,
+                Visibility::PACKAGE
+            );
+            visibility_error(
+                context,
+                public_for_testing,
+                (loc, format!("Invalid call to '{}::{}'", m, f)),
+                (defined_loc, internal_msg),
+            );
+        }
+        Visibility::Package(loc)
+            if in_current_module || context.current_module_shares_package_and_address(m) =>
+        {
+            context.record_current_module_as_friend(m, loc);
+        }
+        Visibility::Package(vis_loc) => {
+            let internal_msg = format!(
+                "A '{}' function can only be called from the same address and package as \
+                module '{}' in package '{}'. This call is from address '{}' in package '{}'",
+                Visibility::PACKAGE,
+                m,
+                context
+                    .module_info(m)
+                    .package
+                    .map(|pkg_name| format!("{}", pkg_name))
+                    .unwrap_or("<unknown package>".to_string()),
+                &context
+                    .current_module
+                    .map(|cur_module| cur_module.value.address.to_string())
+                    .unwrap_or("<unknown addr>".to_string()),
+                &context
+                    .current_module
+                    .and_then(|cur_module| context.module_info(&cur_module).package)
+                    .map(|pkg_name| format!("{}", pkg_name))
+                    .unwrap_or("<unknown package>".to_string())
+            );
+            visibility_error(
+                context,
+                public_for_testing,
+                (loc, format!("Invalid call to '{}::{}'", m, f)),
+                (vis_loc, internal_msg),
+            );
+        }
+        Visibility::Friend(_) if in_current_module || context.current_module_is_a_friend_of(m) => {}
+        Visibility::Friend(vis_loc) => {
+            let internal_msg = format!(
+                "This function can only be called from a 'friend' of module '{}'",
+                m
+            );
+            visibility_error(
+                context,
+                public_for_testing,
+                (loc, format!("Invalid call to '{}::{}'", m, f)),
+                (vis_loc, internal_msg),
+            );
+        }
+        Visibility::Public(_) => (),
+    };
+    (defined_loc, ty_args, params, return_ty)
+}
+
+pub enum PublicForTesting {
+    /// The function is entry, so it can be called in unit tests
+    Entry(Loc),
+    // TODO we should allow calling init in unit tests, but this would need Sui bytecode verifier
+    // support. Or we would need to name dodge init in unit tests
+    // SuiInit(Loc),
+}
+
+pub fn public_testing_visibility(
+    env: &CompilationEnv,
+    _package: Option<Symbol>,
+    _callee_name: &FunctionName,
+    callee_entry: Option<Loc>,
+) -> Option<PublicForTesting> {
+    // is_testing && (is_entry || is_sui_init)
+    if !env.flags().is_testing() {
+        return None;
+    }
+
+    // TODO support sui init functions
+    // let flavor = env.package_config(package).flavor;
+    // flavor == Flavor::Sui && callee_name.value() == INIT_FUNCTION_NAME
+    callee_entry.map(PublicForTesting::Entry)
+}
+
+fn visibility_error(
+    context: &mut Context,
+    public_for_testing: Option<PublicForTesting>,
+    (call_loc, call_msg): (Loc, impl ToString),
+    (vis_loc, vis_msg): (Loc, impl ToString),
+) {
+    let mut diag = diag!(
+        TypeSafety::Visibility,
+        (call_loc, call_msg),
+        (vis_loc, vis_msg),
+    );
+    if context.env.flags().is_testing() {
+        if let Some(case) = public_for_testing {
+            let (test_loc, test_msg) = match case {
+                PublicForTesting::Entry(entry_loc) => {
+                    let entry_msg = format!(
+                        "'{}' functions can be called in tests, \
+                    but only from testing contexts, e.g. '#[{}]' or '#[{}]'",
+                        ENTRY_MODIFIER,
+                        TestingAttribute::TEST,
+                        TestingAttribute::TEST_ONLY,
+                    );
+                    (entry_loc, entry_msg)
+                }
+            };
+            diag.add_secondary_label((test_loc, test_msg))
+        }
+    }
+    context.env.add_diag(diag)
+}
+
+//**************************************************************************************************
+// Constraints
+//**************************************************************************************************
+
+pub fn solve_constraints(context: &mut Context) {
+    use BuiltinTypeName_ as BT;
+    let num_vars = context.subst.num_vars.clone();
+    let mut subst = std::mem::replace(&mut context.subst, Subst::empty());
+    for (num_var, loc) in num_vars {
+        let tvar = sp(loc, Type_::Var(num_var));
+        match unfold_type(&subst, tvar.clone()).value {
+            Type_::UnresolvedError | Type_::Anything => {
+                let next_subst = join(subst, &Type_::u64(loc), &tvar).unwrap().0;
+                subst = next_subst;
+            }
+            _ => (),
+        }
+    }
+    context.subst = subst;
+
+    let constraints = std::mem::take(&mut context.constraints);
+    for constraint in constraints {
+        match constraint {
+            Constraint::AbilityConstraint {
+                loc,
+                msg,
+                ty,
+                constraints,
+            } => solve_ability_constraint(context, loc, msg, ty, constraints),
+            Constraint::NumericConstraint(loc, op, t) => {
+                solve_builtin_type_constraint(context, BT::numeric(), loc, op, t)
+            }
+            Constraint::BitsConstraint(loc, op, t) => {
+                solve_builtin_type_constraint(context, BT::bits(), loc, op, t)
+            }
+            Constraint::OrderedConstraint(loc, op, t) => {
+                solve_builtin_type_constraint(context, BT::ordered(), loc, op, t)
+            }
+            Constraint::BaseTypeConstraint(loc, msg, t) => {
+                solve_base_type_constraint(context, loc, msg, &t)
+            }
+            Constraint::SingleTypeConstraint(loc, msg, t) => {
+                solve_single_type_constraint(context, loc, msg, &t)
+            }
+        }
+    }
+}
+
+fn solve_ability_constraint(
+    context: &mut Context,
+    loc: Loc,
+    given_msg_opt: Option<String>,
+    ty: Type,
+    constraints: AbilitySet,
+) {
+    let ty = unfold_type(&context.subst, ty);
+    let ty_abilities = infer_abilities(&context.modules, &context.subst, ty.clone());
+
+    let (declared_loc_opt, declared_abilities, ty_args) = debug_abilities_info(context, &ty);
+    for constraint in constraints {
+        if ty_abilities.has_ability(&constraint) {
+            continue;
+        }
+
+        let constraint_msg = match &given_msg_opt {
+            Some(s) => s.clone(),
+            None => format!("'{}' constraint not satisifed", constraint),
+        };
+        let mut diag = diag!(AbilitySafety::Constraint, (loc, constraint_msg));
+        ability_not_satisfied_tips(
+            &context.subst,
+            &mut diag,
+            constraint.value,
+            &ty,
+            declared_loc_opt,
+            &declared_abilities,
+            ty_args.iter().map(|ty_arg| {
+                let abilities = infer_abilities(&context.modules, &context.subst, ty_arg.clone());
+                (ty_arg, abilities)
+            }),
+        );
+
+        // is none if it is from a user constraint and not a part of the type system
+        if given_msg_opt.is_none() {
+            diag.add_secondary_label((
+                constraint.loc,
+                format!("'{}' constraint declared here", constraint),
+            ));
+        }
+        context.env.add_diag(diag)
+    }
+}
+
+pub fn ability_not_satisfied_tips<'a>(
+    subst: &Subst,
+    diag: &mut Diagnostic,
+    constraint: Ability_,
+    ty: &Type,
+    declared_loc_opt: Option<Loc>,
+    declared_abilities: &AbilitySet,
+    ty_args: impl IntoIterator<Item = (&'a Type, AbilitySet)>,
+) {
+    let ty_str = error_format(ty, subst);
+    let ty_msg = format!(
+        "The type {} does not have the ability '{}'",
+        ty_str, constraint
+    );
+    diag.add_secondary_label((ty.loc, ty_msg));
+    match (
+        declared_loc_opt,
+        declared_abilities.has_ability_(constraint),
+    ) {
+        // Type was not given the ability
+        (Some(dloc), false) => diag.add_secondary_label((
+            dloc,
+            format!(
+                "To satisfy the constraint, the '{}' ability would need to be added here",
+                constraint
+            ),
+        )),
+        // Type does not have the ability
+        (_, false) => (),
+        // Type has the ability but a type argument causes it to fail
+        (_, true) => {
+            let requirement = constraint.requires();
+            let mut label_added = false;
+            for (ty_arg, ty_arg_abilities) in ty_args {
+                if !ty_arg_abilities.has_ability_(requirement) {
+                    let ty_arg_str = error_format(ty_arg, subst);
+                    let msg = format!(
+                        "The type {ty} can have the ability '{constraint}' but the type argument \
+                         {ty_arg} does not have the required ability '{requirement}'",
+                        ty = ty_str,
+                        ty_arg = ty_arg_str,
+                        constraint = constraint,
+                        requirement = requirement,
+                    );
+                    diag.add_secondary_label((ty_arg.loc, msg));
+                    label_added = true;
+                    break;
+                }
+            }
+            assert!(label_added)
+        }
+    }
+}
+
+fn solve_builtin_type_constraint(
+    context: &mut Context,
+    builtin_set: &BTreeSet<BuiltinTypeName_>,
+    loc: Loc,
+    op: &'static str,
+    ty: Type,
+) {
+    use TypeName_::*;
+    use Type_::*;
+    let t = unfold_type(&context.subst, ty);
+    let tloc = t.loc;
+    let mk_tmsg = || {
+        let set_msg = if builtin_set.is_empty() {
+            "the operation is not yet supported on any type".to_string()
+        } else {
+            format!(
+                "expected: {}",
+                format_comma(builtin_set.iter().map(|b| format!("'{}'", b)))
+            )
+        };
+        format!(
+            "Found: {}. But {}",
+            error_format(&t, &context.subst),
+            set_msg
+        )
+    };
+    match &t.value {
+        // already failed, ignore
+        UnresolvedError => (),
+        // Will fail later in compiling, either through dead code, or unknown type variable
+        Anything => (),
+        Apply(abilities_opt, sp!(_, Builtin(sp!(_, b))), args) if builtin_set.contains(b) => {
+            if let Some(abilities) = abilities_opt {
+                assert!(
+                    abilities.has_ability_(Ability_::Drop),
+                    "ICE assumes this type is being consumed so should have drop"
+                );
+            }
+            assert!(args.is_empty());
+        }
+        _ => {
+            let tmsg = mk_tmsg();
+            context.env.add_diag(diag!(
+                TypeSafety::BuiltinOperation,
+                (loc, format!("Invalid argument to '{}'", op)),
+                (tloc, tmsg)
+            ))
+        }
+    }
+}
+
+fn solve_base_type_constraint(context: &mut Context, loc: Loc, msg: String, ty: &Type) {
+    use TypeName_::*;
+    use Type_::*;
+    let sp!(tyloc, unfolded_) = unfold_type(&context.subst, ty.clone());
+    match unfolded_ {
+        Var(_) => unreachable!(),
+        Unit | Ref(_, _) | Apply(_, sp!(_, Multiple(_)), _) => {
+            let tystr = error_format(ty, &context.subst);
+            let tmsg = format!("Expected a single non-reference type, but found: {}", tystr);
+            context.env.add_diag(diag!(
+                TypeSafety::ExpectedBaseType,
+                (loc, msg),
+                (tyloc, tmsg)
+            ))
+        }
+        UnresolvedError | Anything | Param(_) | Apply(_, _, _) => (),
+    }
+}
+
+fn solve_single_type_constraint(context: &mut Context, loc: Loc, msg: String, ty: &Type) {
+    use TypeName_::*;
+    use Type_::*;
+    let sp!(tyloc, unfolded_) = unfold_type(&context.subst, ty.clone());
+    match unfolded_ {
+        Var(_) => unreachable!(),
+        Unit | Apply(_, sp!(_, Multiple(_)), _) => {
+            let tmsg = format!(
+                "Expected a single type, but found expression list type: {}",
+                error_format(ty, &context.subst)
+            );
+            context.env.add_diag(diag!(
+                TypeSafety::ExpectedSingleType,
+                (loc, msg),
+                (tyloc, tmsg)
+            ))
+        }
+        UnresolvedError | Anything | Ref(_, _) | Param(_) | Apply(_, _, _) => (),
+    }
+}
+
+//**************************************************************************************************
+// Subst
+//**************************************************************************************************
+
+pub fn unfold_type(subst: &Subst, sp!(loc, t_): Type) -> Type {
+    match t_ {
+        Type_::Var(i) => {
+            let last_tvar = forward_tvar(subst, i);
+            match subst.get(last_tvar) {
+                Some(sp!(_, Type_::Var(_))) => unreachable!(),
+                None => sp(loc, Type_::Anything),
+                Some(inner) => inner.clone(),
+            }
+        }
+        x => sp(loc, x),
+    }
+}
+
+// Equivelent to unfold_type, but only returns the loc.
+// The hope is to point to the last loc in a chain of type var's, giving the loc closest to the
+// actual type in the source code
+pub fn best_loc(subst: &Subst, sp!(loc, t_): &Type) -> Loc {
+    match t_ {
+        Type_::Var(i) => {
+            let last_tvar = forward_tvar(subst, *i);
+            match subst.get(last_tvar) {
+                Some(sp!(_, Type_::Var(_))) => unreachable!(),
+                None => *loc,
+                Some(sp!(inner_loc, _)) => *inner_loc,
+            }
+        }
+        _ => *loc,
+    }
+}
+
+pub fn make_tparam_subst<'a, I1, I2>(tps: I1, args: I2) -> TParamSubst
+where
+    I1: IntoIterator<Item = &'a TParam>,
+    I1::IntoIter: ExactSizeIterator,
+    I2: IntoIterator<Item = Type>,
+    I2::IntoIter: ExactSizeIterator,
+{
+    let tps = tps.into_iter();
+    let args = args.into_iter();
+    assert!(tps.len() == args.len());
+    let mut subst = TParamSubst::new();
+    for (tp, arg) in tps.zip(args) {
+        let old_val = subst.insert(tp.id, arg);
+        assert!(old_val.is_none())
+    }
+    subst
+}
+
+pub fn subst_tparams(subst: &TParamSubst, sp!(loc, t_): Type) -> Type {
+    use Type_::*;
+    match t_ {
+        x @ Unit | x @ UnresolvedError | x @ Anything => sp(loc, x),
+        Var(_) => panic!("ICE tvar in subst_tparams"),
+        Ref(mut_, t) => sp(loc, Ref(mut_, Box::new(subst_tparams(subst, *t)))),
+        Param(tp) => subst
+            .get(&tp.id)
+            .expect("ICE unmapped tparam in subst_tparams_base")
+            .clone(),
+        Apply(k, n, ty_args) => {
+            let ftys = ty_args
+                .into_iter()
+                .map(|t| subst_tparams(subst, t))
+                .collect();
+            sp(loc, Apply(k, n, ftys))
+        }
+    }
+}
+
+pub fn ready_tvars(subst: &Subst, sp!(loc, t_): Type) -> Type {
+    use Type_::*;
+    match t_ {
+        x @ UnresolvedError | x @ Unit | x @ Anything | x @ Param(_) => sp(loc, x),
+        Ref(mut_, t) => sp(loc, Ref(mut_, Box::new(ready_tvars(subst, *t)))),
+        Apply(k, n, tys) => {
+            let tys = tys.into_iter().map(|t| ready_tvars(subst, t)).collect();
+            sp(loc, Apply(k, n, tys))
+        }
+        Var(i) => {
+            let last_var = forward_tvar(subst, i);
+            match subst.get(last_var) {
+                Some(sp!(_, Var(_))) => unreachable!(),
+                None => sp(loc, Var(last_var)),
+                Some(t) => ready_tvars(subst, t.clone()),
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Instantiate
+//**************************************************************************************************
+
+pub fn instantiate(context: &mut Context, sp!(loc, t_): Type) -> Type {
+    use Type_::*;
+    let it_ = match t_ {
+        Unit => Unit,
+        UnresolvedError => UnresolvedError,
+        Anything => make_tvar(context, loc).value,
+        Ref(mut_, b) => {
+            let inner = *b;
+            context.add_base_type_constraint(loc, "Invalid reference type", inner.clone());
+            Ref(mut_, Box::new(instantiate(context, inner)))
+        }
+        Apply(abilities_opt, n, ty_args) => {
+            instantiate_apply(context, loc, abilities_opt, n, ty_args)
+        }
+        x @ Param(_) => x,
+        Var(_) => panic!("ICE instantiate type variable"),
+    };
+    sp(loc, it_)
+}
+
+// abilities_opt is expected to be None for non primitive types
+fn instantiate_apply(
+    context: &mut Context,
+    loc: Loc,
+    abilities_opt: Option<AbilitySet>,
+    n: TypeName,
+    ty_args: Vec<Type>,
+) -> Type_ {
+    let tparam_constraints: Vec<AbilitySet> = match &n {
+        sp!(nloc, N::TypeName_::Builtin(b)) => b.value.tparam_constraints(*nloc),
+        sp!(_, N::TypeName_::Multiple(len)) => {
+            debug_assert!(abilities_opt.is_none(), "ICE instantiated expanded type");
+            (0..*len).map(|_| AbilitySet::empty()).collect()
+        }
+        sp!(_, N::TypeName_::ModuleType(m, s)) => {
+            debug_assert!(abilities_opt.is_none(), "ICE instantiated expanded type");
+            let tps = context.struct_tparams(m, s);
+            tps.iter().map(|tp| tp.param.abilities.clone()).collect()
+        }
+    };
+
+    let tys = instantiate_type_args(context, loc, Some(&n.value), ty_args, tparam_constraints);
+    Type_::Apply(abilities_opt, n, tys)
+}
+
+// The type arguments are bound to type variables after intantiation
+// i.e. vec<t1, ..., tn> ~> vec<a1, ..., an> s.t a1 => t1, ... , an => tn
+// This might be needed for any variance case, and I THINK that it should be fine without it
+// BUT I'm adding it as a safeguard against instantiating twice. Can always remove once this
+// stabilizes
+fn instantiate_type_args(
+    context: &mut Context,
+    loc: Loc,
+    n: Option<&TypeName_>,
+    mut ty_args: Vec<Type>,
+    constraints: Vec<AbilitySet>,
+) -> Vec<Type> {
+    assert!(ty_args.len() == constraints.len());
+    let locs_constraints = constraints
+        .into_iter()
+        .zip(&ty_args)
+        .map(|(abilities, t)| (t.loc, abilities))
+        .collect();
+    let tvar_case = match n {
+        Some(TypeName_::Multiple(_)) => {
+            TVarCase::Single("Invalid expression list type argument".to_owned())
+        }
+        None | Some(TypeName_::Builtin(_)) | Some(TypeName_::ModuleType(_, _)) => TVarCase::Base,
+    };
+    let tvars = make_tparams(context, loc, tvar_case, locs_constraints);
+    ty_args = ty_args
+        .into_iter()
+        .map(|t| instantiate(context, t))
+        .collect();
+
+    assert!(ty_args.len() == tvars.len());
+    let mut res = vec![];
+    let subst = std::mem::replace(&mut context.subst, /* dummy value */ Subst::empty());
+    context.subst = tvars
+        .into_iter()
+        .zip(ty_args)
+        .fold(subst, |subst, (tvar, ty_arg)| {
+            // tvar is just a type variable, so shouldn't throw ever...
+            let (subst, t) = join(subst, &tvar, &ty_arg).ok().unwrap();
+            res.push(t);
+            subst
+        });
+    res
+}
+
+fn check_type_argument_arity<F: FnOnce() -> String>(
+    context: &mut Context,
+    loc: Loc,
+    name_f: F,
+    mut ty_args: Vec<Type>,
+    tparam_constraints: &[AbilitySet],
+) -> Vec<Type> {
+    let args_len = ty_args.len();
+    let arity = tparam_constraints.len();
+    if args_len != arity {
+        let code = if args_len < arity {
+            NameResolution::TooFewTypeArguments
+        } else {
+            NameResolution::TooManyTypeArguments
+        };
+        let msg = format!(
+            "Invalid instantiation of '{}'. Expected {} type argument(s) but got {}",
+            name_f(),
+            arity,
+            args_len
+        );
+        context.env.add_diag(diag!(code, (loc, msg)));
+    }
+
+    while ty_args.len() > arity {
+        ty_args.pop();
+    }
+
+    while ty_args.len() < arity {
+        ty_args.push(context.error_type(loc));
+    }
+
+    ty_args
+}
+
+enum TVarCase {
+    Single(String),
+    Base,
+}
+
+fn make_tparams(
+    context: &mut Context,
+    loc: Loc,
+    case: TVarCase,
+    tparam_constraints: Vec<(Loc, AbilitySet)>,
+) -> Vec<Type> {
+    tparam_constraints
+        .into_iter()
+        .map(|(vloc, constraint)| {
+            let tvar = make_tvar(context, vloc);
+            context.add_ability_set_constraint(loc, None::<String>, tvar.clone(), constraint);
+            match &case {
+                TVarCase::Single(msg) => context.add_single_type_constraint(loc, msg, tvar.clone()),
+                TVarCase::Base => {
+                    context.add_base_type_constraint(loc, "Invalid type argument", tvar.clone())
+                }
+            };
+            tvar
+        })
+        .collect()
+}
+
+//**************************************************************************************************
+// Subtype and joining
+//**************************************************************************************************
+
+#[derive(Debug)]
+pub enum TypingError {
+    SubtypeError(Box<Type>, Box<Type>),
+    Incompatible(Box<Type>, Box<Type>),
+    ArityMismatch(usize, Box<Type>, usize, Box<Type>),
+    RecursiveType(Loc),
+}
+
+#[derive(Clone, Copy, Debug)]
+enum TypingCase {
+    Join,
+    Subtype,
+}
+
+pub fn subtype(subst: Subst, lhs: &Type, rhs: &Type) -> Result<(Subst, Type), TypingError> {
+    join_impl(subst, TypingCase::Subtype, lhs, rhs)
+}
+
+pub fn join(subst: Subst, lhs: &Type, rhs: &Type) -> Result<(Subst, Type), TypingError> {
+    join_impl(subst, TypingCase::Join, lhs, rhs)
+}
+
+fn join_impl(
+    mut subst: Subst,
+    case: TypingCase,
+    lhs: &Type,
+    rhs: &Type,
+) -> Result<(Subst, Type), TypingError> {
+    use TypeName_::*;
+    use Type_::*;
+    use TypingCase::*;
+    match (lhs, rhs) {
+        (sp!(_, Anything), other) | (other, sp!(_, Anything)) => Ok((subst, other.clone())),
+
+        (sp!(_, Unit), sp!(loc, Unit)) => Ok((subst, sp(*loc, Unit))),
+
+        (sp!(loc1, Ref(mut1, t1)), sp!(loc2, Ref(mut2, t2))) => {
+            let (loc, mut_) = match (case, mut1, mut2) {
+                (Join, _, _) => {
+                    // if 1 is imm and 2 is mut, use loc1. Else, loc2
+                    let loc = if !*mut1 && *mut2 { *loc1 } else { *loc2 };
+                    (loc, *mut1 && *mut2)
+                }
+                // imm <: imm
+                // mut <: imm
+                (Subtype, false, false) | (Subtype, true, false) => (*loc2, false),
+                // mut <: mut
+                (Subtype, true, true) => (*loc2, true),
+                // imm <\: mut
+                (Subtype, false, true) => {
+                    return Err(TypingError::SubtypeError(
+                        Box::new(lhs.clone()),
+                        Box::new(rhs.clone()),
+                    ))
+                }
+            };
+            let (subst, t) = join_impl(subst, case, t1, t2)?;
+            Ok((subst, sp(loc, Ref(mut_, Box::new(t)))))
+        }
+        (sp!(_, Param(TParam { id: id1, .. })), sp!(_, Param(TParam { id: id2, .. })))
+            if id1 == id2 =>
+        {
+            Ok((subst, rhs.clone()))
+        }
+        (sp!(_, Apply(_, sp!(_, Multiple(n1)), _)), sp!(_, Apply(_, sp!(_, Multiple(n2)), _)))
+            if n1 != n2 =>
+        {
+            Err(TypingError::ArityMismatch(
+                *n1,
+                Box::new(lhs.clone()),
+                *n2,
+                Box::new(rhs.clone()),
+            ))
+        }
+        (sp!(_, Apply(k1, n1, tys1)), sp!(loc, Apply(k2, n2, tys2))) if n1 == n2 => {
+            assert!(
+                k1 == k2,
+                "ICE failed naming: {:#?}kind != {:#?}kind. {:#?} !=  {:#?}",
+                n1,
+                n2,
+                k1,
+                k2
+            );
+            let (subst, tys) = join_impl_types(subst, case, tys1, tys2)?;
+            Ok((subst, sp(*loc, Apply(k2.clone(), n2.clone(), tys))))
+        }
+        (sp!(loc1, Var(id1)), sp!(loc2, Var(id2))) => {
+            if *id1 == *id2 {
+                Ok((subst, sp(*loc2, Var(*id2))))
+            } else {
+                join_tvar(subst, case, *loc1, *id1, *loc2, *id2)
+            }
+        }
+        (sp!(loc, Var(id)), other) if subst.get(*id).is_none() => {
+            if join_bind_tvar(&mut subst, *loc, *id, other.clone())? {
+                Ok((subst, sp(*loc, Var(*id))))
+            } else {
+                Err(TypingError::Incompatible(
+                    Box::new(sp(*loc, Var(*id))),
+                    Box::new(other.clone()),
+                ))
+            }
+        }
+        (other, sp!(loc, Var(id))) if subst.get(*id).is_none() => {
+            if join_bind_tvar(&mut subst, *loc, *id, other.clone())? {
+                Ok((subst, sp(*loc, Var(*id))))
+            } else {
+                Err(TypingError::Incompatible(
+                    Box::new(other.clone()),
+                    Box::new(sp(*loc, Var(*id))),
+                ))
+            }
+        }
+        (sp!(loc, Var(id)), other) => {
+            let new_tvar = TVar::next();
+            subst.insert(new_tvar, other.clone());
+            join_tvar(subst, case, *loc, *id, other.loc, new_tvar)
+        }
+        (other, sp!(loc, Var(id))) => {
+            let new_tvar = TVar::next();
+            subst.insert(new_tvar, other.clone());
+            join_tvar(subst, case, other.loc, new_tvar, *loc, *id)
+        }
+
+        (sp!(_, UnresolvedError), other) | (other, sp!(_, UnresolvedError)) => {
+            Ok((subst, other.clone()))
+        }
+        _ => Err(TypingError::Incompatible(
+            Box::new(lhs.clone()),
+            Box::new(rhs.clone()),
+        )),
+    }
+}
+
+fn join_impl_types(
+    mut subst: Subst,
+    case: TypingCase,
+    tys1: &[Type],
+    tys2: &[Type],
+) -> Result<(Subst, Vec<Type>), TypingError> {
+    // if tys1.len() != tys2.len(), we will get an error when instantiating the type elsewhere
+    // as all types are instantiated as a sanity check
+    let mut tys = vec![];
+    for (ty1, ty2) in tys1.iter().zip(tys2) {
+        let (nsubst, t) = join_impl(subst, case, ty1, ty2)?;
+        subst = nsubst;
+        tys.push(t)
+    }
+    Ok((subst, tys))
+}
+
+fn join_tvar(
+    mut subst: Subst,
+    case: TypingCase,
+    loc1: Loc,
+    id1: TVar,
+    loc2: Loc,
+    id2: TVar,
+) -> Result<(Subst, Type), TypingError> {
+    use Type_::*;
+    let last_id1 = forward_tvar(&subst, id1);
+    let last_id2 = forward_tvar(&subst, id2);
+    let ty1 = match subst.get(last_id1) {
+        None => sp(loc1, Anything),
+        Some(t) => t.clone(),
+    };
+    let ty2 = match subst.get(last_id2) {
+        None => sp(loc2, Anything),
+        Some(t) => t.clone(),
+    };
+
+    let new_tvar = TVar::next();
+    let num_loc_1 = subst.num_vars.get(&last_id1);
+    let num_loc_2 = subst.num_vars.get(&last_id2);
+    match (num_loc_1, num_loc_2) {
+        (_, Some(nloc)) | (Some(nloc), _) => {
+            let nloc = *nloc;
+            subst.set_num_var(new_tvar, nloc);
+        }
+        _ => (),
+    }
+    subst.insert(last_id1, sp(loc1, Var(new_tvar)));
+    subst.insert(last_id2, sp(loc2, Var(new_tvar)));
+
+    let (mut subst, new_ty) = join_impl(subst, case, &ty1, &ty2)?;
+    match subst.get(new_tvar) {
+        Some(sp!(tloc, _)) => Err(TypingError::RecursiveType(*tloc)),
+        None => {
+            if join_bind_tvar(&mut subst, loc2, new_tvar, new_ty)? {
+                Ok((subst, sp(loc2, Var(new_tvar))))
+            } else {
+                let ty1 = match ty1 {
+                    sp!(loc, Anything) => sp(loc, Var(id1)),
+                    t => t,
+                };
+                let ty2 = match ty2 {
+                    sp!(loc, Anything) => sp(loc, Var(id2)),
+                    t => t,
+                };
+                Err(TypingError::Incompatible(Box::new(ty1), Box::new(ty2)))
+            }
+        }
+    }
+}
+
+fn forward_tvar(subst: &Subst, id: TVar) -> TVar {
+    let mut cur = id;
+    loop {
+        match subst.get(cur) {
+            Some(sp!(_, Type_::Var(next))) => cur = *next,
+            Some(_) | None => break cur,
+        }
+    }
+}
+
+fn join_bind_tvar(subst: &mut Subst, loc: Loc, tvar: TVar, ty: Type) -> Result<bool, TypingError> {
+    assert!(
+        subst.get(tvar).is_none(),
+        "ICE join_bind_tvar called on bound tvar"
+    );
+
+    fn used_tvars(used: &mut BTreeMap<TVar, Loc>, sp!(loc, t_): &Type) {
+        use Type_ as T;
+        match t_ {
+            T::Var(v) => {
+                used.insert(*v, *loc);
+            }
+            T::Ref(_, inner) => used_tvars(used, inner),
+            T::Apply(_, _, inners) => inners
+                .iter()
+                .rev()
+                .for_each(|inner| used_tvars(used, inner)),
+            T::Unit | T::Param(_) | T::Anything | T::UnresolvedError => (),
+        }
+    }
+
+    // check not necessary for soundness but improves error message structure
+    if !check_num_tvar(subst, loc, tvar, &ty) {
+        return Ok(false);
+    }
+
+    let used = &mut BTreeMap::new();
+    used_tvars(used, &ty);
+    if let Some(_rec_loc) = used.get(&tvar) {
+        return Err(TypingError::RecursiveType(loc));
+    }
+
+    match &ty.value {
+        Type_::Anything => (),
+        _ => subst.insert(tvar, ty),
+    }
+    Ok(true)
+}
+
+fn check_num_tvar(subst: &Subst, _loc: Loc, tvar: TVar, ty: &Type) -> bool {
+    !subst.is_num_var(tvar) || check_num_tvar_(subst, ty)
+}
+
+fn check_num_tvar_(subst: &Subst, ty: &Type) -> bool {
+    use Type_::*;
+    match &ty.value {
+        UnresolvedError | Anything => true,
+        Apply(_, sp!(_, TypeName_::Builtin(sp!(_, bt))), _) => bt.is_numeric(),
+
+        Var(v) => {
+            let last_tvar = forward_tvar(subst, *v);
+            match subst.get(last_tvar) {
+                Some(sp!(_, Var(_))) => unreachable!(),
+                None => subst.is_num_var(last_tvar),
+                Some(t) => check_num_tvar_(subst, t),
+            }
+        }
+        _ => false,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/dependency_ordering.rs b/vendors/move/crates/move-compiler/src/typing/dependency_ordering.rs
new file mode 100644
index 000000000..47bf7f936
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/dependency_ordering.rs
@@ -0,0 +1,503 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diagnostics::{codes::*, Diagnostic},
+    expansion::ast::{Address, ModuleIdent, Value_},
+    naming::ast::{self as N, Neighbor, Neighbor_},
+    shared::{unique_map::UniqueMap, *},
+    typing::ast as T,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use petgraph::{algo::toposort as petgraph_toposort, graphmap::DiGraphMap};
+use std::collections::{BTreeMap, BTreeSet};
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    modules: &mut UniqueMap<ModuleIdent, T::ModuleDefinition>,
+    scripts: &mut BTreeMap<Symbol, T::Script>,
+) {
+    let imm_modules = &modules;
+    let mut context = Context::new(imm_modules);
+    module_defs(&mut context, modules);
+    script_defs(&mut context, scripts);
+
+    let Context {
+        module_neighbors,
+        neighbors_by_node,
+        addresses_by_node,
+        ..
+    } = context;
+    let graph = dependency_graph(&module_neighbors);
+    match petgraph_toposort(&graph, None) {
+        Err(cycle_node) => {
+            let cycle_ident = *cycle_node.node_id();
+            let error = cycle_error(&module_neighbors, cycle_ident);
+            compilation_env.add_diag(error);
+        }
+        Ok(ordered_ids) => {
+            for (order, mident) in ordered_ids.iter().rev().enumerate() {
+                modules.get_mut(mident).unwrap().dependency_order = order;
+            }
+        }
+    }
+    for (node, neighbors) in neighbors_by_node {
+        match node {
+            NodeIdent::Module(mident) => {
+                let module = modules.get_mut(&mident).unwrap();
+                module.immediate_neighbors = neighbors;
+            }
+            NodeIdent::Script(sname) => {
+                let script = scripts.get_mut(&sname).unwrap();
+                script.immediate_neighbors = neighbors;
+            }
+        }
+    }
+    for (node, used_addresses) in addresses_by_node {
+        match node {
+            NodeIdent::Module(mident) => {
+                let module = modules.get_mut(&mident).unwrap();
+                module.used_addresses = used_addresses;
+            }
+            NodeIdent::Script(sname) => {
+                let script = scripts.get_mut(&sname).unwrap();
+                script.used_addresses = used_addresses;
+            }
+        }
+    }
+}
+
+#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd)]
+enum DepType {
+    Use,
+    Friend,
+}
+
+#[derive(Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[allow(clippy::large_enum_variant)]
+enum NodeIdent {
+    Module(ModuleIdent),
+    Script(Symbol),
+}
+
+struct Context<'a> {
+    modules: &'a UniqueMap<ModuleIdent, T::ModuleDefinition>,
+    // A union of uses and friends for modules (used for cyclyc dependency checking)
+    // - if A uses B,    add edge A -> B
+    // - if A friends B, add edge B -> A
+    // NOTE: neighbors of scripts are not tracked by this field, as nothing can depend on a script
+    // and a script cannot declare friends. Hence, is no way to form a cyclic dependency via scripts
+    module_neighbors: BTreeMap<ModuleIdent, BTreeMap<ModuleIdent, BTreeMap<DepType, Loc>>>,
+    // A summary of neighbors keyed by module or script
+    neighbors_by_node: BTreeMap<NodeIdent, UniqueMap<ModuleIdent, Neighbor>>,
+    // All addresses used by a node
+    addresses_by_node: BTreeMap<NodeIdent, BTreeSet<Address>>,
+    // The module or script we are currently exploring
+    current_node: Option<NodeIdent>,
+}
+
+impl<'a> Context<'a> {
+    fn new(modules: &'a UniqueMap<ModuleIdent, T::ModuleDefinition>) -> Self {
+        Context {
+            modules,
+            module_neighbors: BTreeMap::new(),
+            neighbors_by_node: BTreeMap::new(),
+            addresses_by_node: BTreeMap::new(),
+            current_node: None,
+        }
+    }
+
+    fn add_neighbor(&mut self, mident: ModuleIdent, dep_type: DepType, loc: Loc) {
+        if !self.modules.contains_key(&mident) {
+            // as the dependency checking happens before the naming phase, it is possible to refer
+            // to a module with a ModuleIdent outside of the compilation context. Do not add such
+            // modules as neighbors.
+            return;
+        }
+
+        let current = self.current_node.clone().unwrap();
+        if matches!(&current, NodeIdent::Module(current_mident) if &mident == current_mident) {
+            // do not add the module itself as a neighbor
+            return;
+        }
+
+        let neighbor_ = match dep_type {
+            DepType::Use => Neighbor_::Dependency,
+            DepType::Friend => Neighbor_::Friend,
+        };
+        let current_neighbors = self.neighbors_by_node.entry(current.clone()).or_default();
+        let current_used_addresses = self.addresses_by_node.entry(current.clone()).or_default();
+        current_neighbors.remove(&mident);
+        current_neighbors.add(mident, sp(loc, neighbor_)).unwrap();
+        current_used_addresses.insert(mident.value.address);
+
+        match current {
+            NodeIdent::Module(current_mident) => {
+                let (node, new_neighbor) = match dep_type {
+                    DepType::Use => (current_mident, mident),
+                    DepType::Friend => (mident, current_mident),
+                };
+                let m = self
+                    .module_neighbors
+                    .entry(node)
+                    .or_default()
+                    .entry(new_neighbor)
+                    .or_default();
+                if m.contains_key(&dep_type) {
+                    return;
+                }
+                m.insert(dep_type, loc);
+            }
+            NodeIdent::Script(_) => (),
+        }
+    }
+
+    fn add_usage(&mut self, mident: ModuleIdent, loc: Loc) {
+        self.add_neighbor(mident, DepType::Use, loc);
+    }
+
+    fn add_friend(&mut self, mident: ModuleIdent, loc: Loc) {
+        self.add_neighbor(mident, DepType::Friend, loc);
+    }
+
+    fn add_address_usage(&mut self, address: Address) {
+        self.addresses_by_node
+            .entry(self.current_node.clone().unwrap())
+            .or_default()
+            .insert(address);
+    }
+}
+
+fn dependency_graph(
+    deps: &BTreeMap<ModuleIdent, BTreeMap<ModuleIdent, BTreeMap<DepType, Loc>>>,
+) -> DiGraphMap<&ModuleIdent, ()> {
+    let mut graph = DiGraphMap::new();
+    for (parent, children) in deps {
+        if children.is_empty() {
+            graph.add_node(parent);
+        } else {
+            for child in children.keys() {
+                graph.add_edge(parent, child, ());
+            }
+        }
+    }
+    graph
+}
+
+fn cycle_error(
+    deps: &BTreeMap<ModuleIdent, BTreeMap<ModuleIdent, BTreeMap<DepType, Loc>>>,
+    cycle_ident: ModuleIdent,
+) -> Diagnostic {
+    let graph = dependency_graph(deps);
+    // For printing uses, sort the cycle by location (earliest first)
+    let cycle = shortest_cycle(&graph, &cycle_ident);
+
+    let mut cycle_info = cycle
+        .windows(2)
+        .map(|pair| {
+            let node = pair[0];
+            let neighbor = pair[1];
+            let relations = deps.get(node).unwrap().get(neighbor).unwrap();
+            match (
+                relations.get(&DepType::Use),
+                relations.get(&DepType::Friend),
+            ) {
+                (Some(loc), _) => (
+                    *loc,
+                    DepType::Use,
+                    format!("'{}' uses '{}'", neighbor, node),
+                    node,
+                    neighbor,
+                ),
+                (_, Some(loc)) => (
+                    *loc,
+                    DepType::Friend,
+                    format!("'{}' is a friend of '{}'", node, neighbor),
+                    node,
+                    neighbor,
+                ),
+                (None, None) => unreachable!(),
+            }
+        })
+        .collect::<Vec<_>>();
+    debug_assert!({
+        let first_node = cycle_info.first().unwrap().3;
+        let last_neighbor = cycle_info.last().unwrap().4;
+        first_node == last_neighbor
+    });
+    let cycle_last = cycle_info.pop().unwrap();
+
+    let (cycle_loc, use_msg) = {
+        let (loc, dep_type, case_msg, _node, _neighbor) = cycle_last;
+        let case = match dep_type {
+            DepType::Use => "use",
+            DepType::Friend => "friend",
+        };
+        let msg = format!(
+            "{}. This '{}' relationship creates a dependency cycle.",
+            case_msg, case
+        );
+        (loc, msg)
+    };
+
+    Diagnostic::new(
+        Declarations::InvalidModule,
+        (cycle_loc, use_msg),
+        cycle_info
+            .into_iter()
+            .map(|(loc, _dep_type, msg, _node, _neighbor)| (loc, msg)),
+        std::iter::empty::<String>(),
+    )
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+fn module_defs(context: &mut Context, modules: &UniqueMap<ModuleIdent, T::ModuleDefinition>) {
+    modules
+        .key_cloned_iter()
+        .for_each(|(mident, mdef)| module(context, mident, mdef))
+}
+
+fn module(context: &mut Context, mident: ModuleIdent, mdef: &T::ModuleDefinition) {
+    context.current_node = Some(NodeIdent::Module(mident));
+    mdef.friends
+        .key_cloned_iter()
+        .for_each(|(mident, friend)| context.add_friend(mident, friend.loc));
+    mdef.structs
+        .iter()
+        .for_each(|(_, _, sdef)| struct_def(context, sdef));
+    mdef.functions
+        .iter()
+        .for_each(|(_, _, fdef)| function(context, fdef));
+    for (mident, sp!(loc, neighbor_)) in &mdef.spec_dependencies {
+        let dep = match neighbor_ {
+            Neighbor_::Dependency => DepType::Use,
+            Neighbor_::Friend => DepType::Friend,
+        };
+        context.add_neighbor(*mident, dep, *loc);
+    }
+}
+
+//**************************************************************************************************
+// Scripts
+//**************************************************************************************************
+
+// Scripts cannot affect the dependency graph because 1) a script cannot friend anything and 2)
+// nothing can depends on a script. Therefore, we iterate over the scripts just to collect their
+// immediate dependencies.
+fn script_defs(context: &mut Context, scripts: &BTreeMap<Symbol, T::Script>) {
+    scripts
+        .iter()
+        .for_each(|(sname, sdef)| script(context, *sname, sdef))
+}
+
+fn script(context: &mut Context, sname: Symbol, sdef: &T::Script) {
+    context.current_node = Some(NodeIdent::Script(sname));
+    function(context, &sdef.function);
+    for (mident, sp!(loc, neighbor_)) in &sdef.spec_dependencies {
+        let dep = match neighbor_ {
+            Neighbor_::Dependency => DepType::Use,
+            Neighbor_::Friend => DepType::Friend,
+        };
+        context.add_neighbor(*mident, dep, *loc);
+    }
+}
+
+//**************************************************************************************************
+// Function
+//**************************************************************************************************
+
+fn function(context: &mut Context, fdef: &T::Function) {
+    function_signature(context, &fdef.signature);
+    if let T::FunctionBody_::Defined(seq) = &fdef.body.value {
+        sequence(context, seq)
+    }
+}
+
+fn function_signature(context: &mut Context, sig: &N::FunctionSignature) {
+    types(context, sig.parameters.iter().map(|(_, _, st)| st));
+    type_(context, &sig.return_type)
+}
+
+//**************************************************************************************************
+// Struct
+//**************************************************************************************************
+
+fn struct_def(context: &mut Context, sdef: &N::StructDefinition) {
+    if let N::StructFields::Defined(fields) = &sdef.fields {
+        fields.iter().for_each(|(_, _, (_, bt))| type_(context, bt));
+    }
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn types<'a>(context: &mut Context, tys: impl IntoIterator<Item = &'a N::Type>) {
+    tys.into_iter().for_each(|ty| type_(context, ty))
+}
+
+fn type_(context: &mut Context, sp!(_, ty_): &N::Type) {
+    use N::Type_ as T;
+    match ty_ {
+        T::Apply(_, tn, tys) => {
+            type_name(context, tn);
+            types(context, tys);
+        }
+        T::Ref(_, t) => type_(context, t),
+        T::Unit | T::Param(_) | T::Var(_) | T::Anything | T::UnresolvedError => (),
+    }
+}
+
+fn type_name(context: &mut Context, sp!(loc, tn_): &N::TypeName) {
+    match tn_ {
+        N::TypeName_::Multiple(_) | N::TypeName_::Builtin(_) => (),
+        N::TypeName_::ModuleType(m, _) => {
+            context.add_usage(*m, *loc);
+        }
+    }
+}
+
+fn type_opt(context: &mut Context, t_opt: &Option<N::Type>) {
+    t_opt.iter().for_each(|t| type_(context, t))
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, sequence: &T::Sequence) {
+    use T::SequenceItem_ as SI;
+    for sp!(_, item_) in sequence {
+        match item_ {
+            SI::Seq(e) => exp(context, e),
+            SI::Declare(sp!(_, lvs_)) => {
+                lvalues(context, lvs_);
+            }
+            SI::Bind(sp!(_, lvs_), ty_opts, e) => {
+                lvalues(context, lvs_);
+                for ty_opt in ty_opts {
+                    type_opt(context, ty_opt);
+                }
+                exp(context, e)
+            }
+        }
+    }
+}
+
+fn lvalues<'a>(context: &mut Context, al: impl IntoIterator<Item = &'a T::LValue>) {
+    al.into_iter().for_each(|a| lvalue(context, a))
+}
+
+fn lvalue(context: &mut Context, sp!(loc, lv_): &T::LValue) {
+    use T::LValue_ as L;
+    match lv_ {
+        L::Ignore => (),
+        L::Var { ty, .. } => type_(context, ty),
+        L::Unpack(m, _, tys, fields) | L::BorrowUnpack(_, m, _, tys, fields) => {
+            context.add_usage(*m, *loc);
+            types(context, tys);
+            for (_, _, (_, (_, field))) in fields {
+                lvalue(context, field)
+            }
+        }
+    }
+}
+
+fn exp(context: &mut Context, e: &T::Exp) {
+    use T::UnannotatedExp_ as E;
+    match &e.exp.value {
+        E::Value(sp!(_, Value_::Address(a))) => context.add_address_usage(*a),
+
+        E::ModuleCall(c) => {
+            let T::ModuleCall {
+                module,
+                type_arguments,
+                arguments,
+                ..
+            } = &**c;
+            context.add_usage(*module, e.exp.loc);
+            types(context, type_arguments);
+            exp(context, arguments);
+        }
+        E::Builtin(_, e) => exp(context, e),
+        E::Vector(_, _, ty, e) => {
+            type_(context, ty);
+            exp(context, e);
+        }
+        E::IfElse(e1, e2, e3) => {
+            exp(context, e1);
+            exp(context, e2);
+            exp(context, e3);
+        }
+        E::While(e1, e2) => {
+            exp(context, e1);
+            exp(context, e2);
+        }
+        E::Loop { has_break: _, body } => exp(context, body),
+        E::Block(seq) => sequence(context, seq),
+        E::Assign(sp!(_, lvs_), ty_opts, e) => {
+            lvalues(context, lvs_);
+            for ty_opt in ty_opts {
+                type_opt(context, ty_opt);
+            }
+            exp(context, e)
+        }
+        E::Mutate(e1, e2) => {
+            exp(context, e1);
+            exp(context, e2);
+        }
+        E::Return(e) => exp(context, e),
+        E::Abort(e) => exp(context, e),
+        E::Dereference(e) => exp(context, e),
+        E::UnaryExp(_, e) => exp(context, e),
+        E::BinopExp(e1, _, _, e2) => {
+            exp(context, e1);
+            exp(context, e2);
+        }
+        E::Pack(m, _, tys, fields) => {
+            context.add_usage(*m, e.exp.loc);
+            types(context, tys);
+            for (_, _, (_, (_, e))) in fields {
+                exp(context, e)
+            }
+        }
+        E::ExpList(list) => {
+            for l in list {
+                match l {
+                    T::ExpListItem::Single(e, _) => exp(context, e),
+                    T::ExpListItem::Splat(_, e, _) => exp(context, e),
+                }
+            }
+        }
+        E::Borrow(_, e, _) => exp(context, e),
+        E::TempBorrow(_, e) => exp(context, e),
+        E::Cast(e, ty) => {
+            exp(context, e);
+            type_(context, ty)
+        }
+        E::Annotate(e, ty) => {
+            exp(context, e);
+            type_(context, ty)
+        }
+        E::Unit { .. }
+        | E::Value(_)
+        | E::Move { .. }
+        | E::Copy { .. }
+        | E::Use(_)
+        | E::Constant(..)
+        | E::Break
+        | E::Continue
+        | E::BorrowLocal(..)
+        | E::Spec(..)
+        | E::UnresolvedError => (),
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/expand.rs b/vendors/move/crates/move-compiler/src/typing/expand.rs
new file mode 100644
index 000000000..aa6f171ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/expand.rs
@@ -0,0 +1,363 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::core::{self, Context};
+use crate::{
+    diag,
+    expansion::ast::Value_,
+    naming::ast::{BuiltinTypeName_, FunctionSignature, Type, TypeName_, Type_},
+    parser::ast::Ability_,
+    typing::ast as T,
+};
+use move_core_types::u256::U256;
+use move_ir_types::location::*;
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+pub fn function_body_(context: &mut Context, b_: &mut T::FunctionBody_) {
+    match b_ {
+        T::FunctionBody_::Native => (),
+        T::FunctionBody_::Defined(es) => sequence(context, es),
+    }
+}
+
+pub fn function_signature(context: &mut Context, sig: &mut FunctionSignature) {
+    for (_, _, st) in &mut sig.parameters {
+        type_(context, st);
+    }
+    type_(context, &mut sig.return_type);
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn expected_types(context: &mut Context, ss: &mut [Option<Type>]) {
+    for st_opt in ss.iter_mut().flatten() {
+        type_(context, st_opt);
+    }
+}
+
+fn types(context: &mut Context, ss: &mut Vec<Type>) {
+    for st in ss {
+        type_(context, st);
+    }
+}
+
+pub fn type_(context: &mut Context, ty: &mut Type) {
+    use Type_::*;
+    match &mut ty.value {
+        Anything | UnresolvedError | Param(_) | Unit => (),
+        Ref(_, b) => type_(context, b),
+        Var(tvar) => {
+            let ty_tvar = sp(ty.loc, Var(*tvar));
+            let replacement = core::unfold_type(&context.subst, ty_tvar);
+            let replacement = match replacement {
+                sp!(_, Var(_)) => panic!("ICE unfold_type_base failed to expand"),
+                sp!(loc, Anything) => {
+                    let msg = "Could not infer this type. Try adding an annotation";
+                    context
+                        .env
+                        .add_diag(diag!(TypeSafety::UninferredType, (ty.loc, msg)));
+                    sp(loc, UnresolvedError)
+                }
+                t => t,
+            };
+            *ty = replacement;
+            type_(context, ty);
+        }
+        Apply(Some(_), sp!(_, TypeName_::Builtin(_)), tys) => types(context, tys),
+        Apply(Some(_), _, _) => panic!("ICE expanding pre expanded type"),
+        Apply(None, _, _) => {
+            let abilities = core::infer_abilities(&context.modules, &context.subst, ty.clone());
+            match &mut ty.value {
+                Apply(abilities_opt, _, tys) => {
+                    *abilities_opt = Some(abilities);
+                    types(context, tys);
+                }
+                _ => panic!("ICE impossible. tapply switched to nontapply"),
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, seq: &mut T::Sequence) {
+    for item in seq {
+        sequence_item(context, item)
+    }
+}
+
+fn sequence_item(context: &mut Context, item: &mut T::SequenceItem) {
+    use T::SequenceItem_ as S;
+    match &mut item.value {
+        S::Seq(te) => exp(context, te),
+
+        S::Declare(tbind) => lvalues(context, tbind),
+        S::Bind(tbind, tys, te) => {
+            lvalues(context, tbind);
+            expected_types(context, tys);
+            exp(context, te)
+        }
+    }
+}
+
+pub fn exp(context: &mut Context, e: &mut T::Exp) {
+    use T::UnannotatedExp_ as E;
+    match &e.exp.value {
+        // dont expand the type for return, abort, break, or continue
+        E::Break | E::Continue | E::Return(_) | E::Abort(_) => {
+            let t = e.ty.clone();
+            match core::unfold_type(&context.subst, t) {
+                sp!(_, Type_::Anything) => (),
+                mut t => {
+                    // report errors if there is an uninferred type argument somewhere
+                    type_(context, &mut t);
+                }
+            }
+            e.ty = sp(e.ty.loc, Type_::Anything)
+        }
+        // Loop's default type is ()
+        E::Loop {
+            has_break: false, ..
+        } => {
+            let t = e.ty.clone();
+            match core::unfold_type(&context.subst, t) {
+                sp!(_, Type_::Anything) => (),
+                mut t => {
+                    // report errors if there is an uninferred type argument somewhere
+                    type_(context, &mut t);
+                }
+            }
+            e.ty = sp(e.ty.loc, Type_::Anything)
+        }
+        _ => type_(context, &mut e.ty),
+    }
+    match &mut e.exp.value {
+        E::Use(v) => {
+            let from_user = false;
+            let var = *v;
+            let abs = core::infer_abilities(&context.modules, &context.subst, e.ty.clone());
+            e.exp.value = if abs.has_ability_(Ability_::Copy) {
+                E::Copy { from_user, var }
+            } else {
+                E::Move { from_user, var }
+            }
+        }
+        E::Value(sp!(vloc, Value_::InferredNum(v))) => {
+            use BuiltinTypeName_ as BT;
+            let bt = match e.ty.value.builtin_name() {
+                Some(sp!(_, bt)) if bt.is_numeric() => bt,
+                _ => panic!("ICE inferred num failed {:?}", &e.ty.value),
+            };
+            let v = *v;
+            let u8_max = U256::from(std::u8::MAX);
+            let u16_max = U256::from(std::u16::MAX);
+            let u32_max = U256::from(std::u32::MAX);
+            let u64_max = U256::from(std::u64::MAX);
+            let u128_max = U256::from(std::u128::MAX);
+            let u256_max = U256::max_value();
+            let max = match bt {
+                BT::U8 => u8_max,
+                BT::U16 => u16_max,
+                BT::U32 => u32_max,
+                BT::U64 => u64_max,
+                BT::U128 => u128_max,
+                BT::U256 => u256_max,
+                BT::Address | BT::Signer | BT::Vector | BT::Bool => unreachable!(),
+            };
+            let new_exp = if v > max {
+                let msg = format!(
+                    "Expected a literal of type '{}', but the value is too large.",
+                    bt
+                );
+                let fix_bt = if v > u128_max {
+                    BT::U256
+                } else if v > u64_max {
+                    BT::U128
+                } else if v > u32_max {
+                    BT::U64
+                } else if v > u16_max {
+                    BT::U32
+                } else {
+                    assert!(v > u8_max);
+                    BT::U16
+                };
+
+                let fix = format!(
+                    "Annotating the literal might help inference: '{value}{type}'",
+                    value=v,
+                    type=fix_bt,
+                );
+                context.env.add_diag(diag!(
+                    TypeSafety::InvalidNum,
+                    (e.exp.loc, "Invalid numerical literal"),
+                    (e.ty.loc, msg),
+                    (e.exp.loc, fix),
+                ));
+                E::UnresolvedError
+            } else {
+                let value_ = match bt {
+                    BT::U8 => Value_::U8(v.down_cast_lossy()),
+                    BT::U16 => Value_::U16(v.down_cast_lossy()),
+                    BT::U32 => Value_::U32(v.down_cast_lossy()),
+                    BT::U64 => Value_::U64(v.down_cast_lossy()),
+                    BT::U128 => Value_::U128(v.down_cast_lossy()),
+                    BT::U256 => Value_::U256(v),
+                    BT::Address | BT::Signer | BT::Vector | BT::Bool => unreachable!(),
+                };
+                E::Value(sp(*vloc, value_))
+            };
+            e.exp.value = new_exp;
+        }
+
+        E::Spec(_, used_locals) => used_locals.values_mut().for_each(|ty| type_(context, ty)),
+
+        E::Unit { .. }
+        | E::Value(_)
+        | E::Constant(_, _)
+        | E::Move { .. }
+        | E::Copy { .. }
+        | E::BorrowLocal(_, _)
+        | E::Break
+        | E::Continue
+        | E::UnresolvedError => (),
+
+        E::ModuleCall(call) => module_call(context, call),
+        E::Builtin(b, args) => {
+            builtin_function(context, b);
+            exp(context, args);
+        }
+        E::Vector(_vec_loc, _n, ty_arg, args) => {
+            type_(context, ty_arg);
+            exp(context, args);
+        }
+
+        E::IfElse(eb, et, ef) => {
+            exp(context, eb);
+            exp(context, et);
+            exp(context, ef);
+        }
+        E::While(eb, eloop) => {
+            exp(context, eb);
+            exp(context, eloop);
+        }
+        E::Loop { body: eloop, .. } => exp(context, eloop),
+        E::Block(seq) => sequence(context, seq),
+        E::Assign(assigns, tys, er) => {
+            lvalues(context, assigns);
+            expected_types(context, tys);
+            exp(context, er);
+        }
+
+        E::Return(er)
+        | E::Abort(er)
+        | E::Dereference(er)
+        | E::UnaryExp(_, er)
+        | E::Borrow(_, er, _)
+        | E::TempBorrow(_, er) => exp(context, er),
+        E::Mutate(el, er) => {
+            exp(context, el);
+            exp(context, er)
+        }
+        E::BinopExp(el, _, operand_ty, er) => {
+            exp(context, el);
+            exp(context, er);
+            type_(context, operand_ty);
+        }
+
+        E::Pack(_, _, bs, fields) => {
+            types(context, bs);
+            for (_, _, (_, (bt, fe))) in fields.iter_mut() {
+                type_(context, bt);
+                exp(context, fe)
+            }
+        }
+        E::ExpList(el) => exp_list(context, el),
+        E::Cast(el, rhs_ty) | E::Annotate(el, rhs_ty) => {
+            exp(context, el);
+            type_(context, rhs_ty);
+        }
+    }
+}
+
+fn lvalues(context: &mut Context, binds: &mut T::LValueList) {
+    for b in &mut binds.value {
+        lvalue(context, b)
+    }
+}
+
+fn lvalue(context: &mut Context, b: &mut T::LValue) {
+    use T::LValue_ as L;
+    match &mut b.value {
+        L::Ignore => (),
+        L::Var {
+            ty,
+            unused_binding: true,
+            ..
+        } => {
+            // silence type inference error for unused bindings
+            if let Type_::Var(tvar) = &ty.value {
+                let ty_tvar = sp(ty.loc, Type_::Var(*tvar));
+                let replacement = core::unfold_type(&context.subst, ty_tvar);
+                if let sp!(_, Type_::Anything) = replacement {
+                    b.value = L::Ignore;
+                    return;
+                }
+            }
+            type_(context, ty);
+        }
+        L::Var { ty, .. } => {
+            type_(context, ty);
+        }
+        L::BorrowUnpack(_, _, _, bts, fields) | L::Unpack(_, _, bts, fields) => {
+            types(context, bts);
+            for (_, _, (_, (bt, innerb))) in fields.iter_mut() {
+                type_(context, bt);
+                lvalue(context, innerb)
+            }
+        }
+    }
+}
+
+fn module_call(context: &mut Context, call: &mut T::ModuleCall) {
+    types(context, &mut call.type_arguments);
+    exp(context, &mut call.arguments);
+    types(context, &mut call.parameter_types)
+}
+
+fn builtin_function(context: &mut Context, b: &mut T::BuiltinFunction) {
+    use T::BuiltinFunction_ as B;
+    match &mut b.value {
+        B::Freeze(bt) => {
+            type_(context, bt);
+        }
+        B::Assert(_) => (),
+    }
+}
+
+fn exp_list(context: &mut Context, items: &mut Vec<T::ExpListItem>) {
+    for item in items {
+        exp_list_item(context, item)
+    }
+}
+
+fn exp_list_item(context: &mut Context, item: &mut T::ExpListItem) {
+    use T::ExpListItem as I;
+    match item {
+        I::Single(e, st) => {
+            exp(context, e);
+            type_(context, st);
+        }
+        I::Splat(_, e, ss) => {
+            exp(context, e);
+            types(context, ss);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/infinite_instantiations.rs b/vendors/move/crates/move-compiler/src/typing/infinite_instantiations.rs
new file mode 100644
index 000000000..7f36049f1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/infinite_instantiations.rs
@@ -0,0 +1,438 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::core::{self, Subst, TParamSubst};
+use crate::{
+    diagnostics::{codes::TypeSafety, Diagnostic},
+    expansion::ast::ModuleIdent,
+    naming::ast::{self as N, TParam, TParamID, Type, Type_},
+    parser::ast::FunctionName,
+    shared::{unique_map::UniqueMap, CompilationEnv},
+    typing::ast as T,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use petgraph::{
+    algo::{astar as petgraph_astar, tarjan_scc as petgraph_scc},
+    graphmap::DiGraphMap,
+};
+use std::collections::BTreeMap;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum Edge {
+    Identity,
+    Nested,
+}
+
+#[derive(Clone, Debug)]
+struct EdgeInfo {
+    name: FunctionName,
+    type_argument: Type,
+    loc: Loc,
+    edge: Edge,
+}
+
+struct Context<'a> {
+    tparams: &'a BTreeMap<ModuleIdent, BTreeMap<FunctionName, &'a Vec<TParam>>>,
+    tparam_type_arguments: BTreeMap<TParam, BTreeMap<TParam, EdgeInfo>>,
+    current_module: ModuleIdent,
+}
+
+impl<'a> Context<'a> {
+    fn new(
+        tparams: &'a BTreeMap<ModuleIdent, BTreeMap<FunctionName, &'a Vec<TParam>>>,
+        current_module: ModuleIdent,
+    ) -> Self {
+        Context {
+            tparams,
+            current_module,
+            tparam_type_arguments: BTreeMap::new(),
+        }
+    }
+
+    fn add_usage(&mut self, loc: Loc, module: &ModuleIdent, fname: &FunctionName, targs: &[Type]) {
+        if &self.current_module != module {
+            return;
+        }
+        self.tparams[module][fname]
+            .iter()
+            .zip(targs)
+            .for_each(|(tparam, targ)| {
+                let info = EdgeInfo {
+                    name: *fname,
+                    type_argument: targ.clone(),
+                    loc,
+                    edge: Edge::Identity,
+                };
+                Self::add_tparam_edges(&mut self.tparam_type_arguments, tparam, info, targ)
+            })
+    }
+
+    fn add_tparam_edges(
+        acc: &mut BTreeMap<TParam, BTreeMap<TParam, EdgeInfo>>,
+        tparam: &TParam,
+        info: EdgeInfo,
+        sp!(_, targ_): &Type,
+    ) {
+        use N::Type_::*;
+        match targ_ {
+            Var(_) => panic!("ICE tvar after expansion"),
+            Unit | Anything | UnresolvedError => (),
+            Ref(_, t) => {
+                let info = EdgeInfo {
+                    edge: Edge::Nested,
+                    ..info
+                };
+                Self::add_tparam_edges(acc, tparam, info, t)
+            }
+            Apply(_, _, tys) => {
+                let info = EdgeInfo {
+                    edge: Edge::Nested,
+                    ..info
+                };
+                tys.iter()
+                    .for_each(|t| Self::add_tparam_edges(acc, tparam, info.clone(), t))
+            }
+            Param(tp) => {
+                let tp_neighbors = acc.entry(tp.clone()).or_default();
+                match tp_neighbors.get(tparam) {
+                    Some(EdgeInfo {
+                        edge: Edge::Nested, ..
+                    }) => (),
+                    None
+                    | Some(EdgeInfo {
+                        edge: Edge::Identity,
+                        ..
+                    }) => {
+                        tp_neighbors.insert(tparam.clone(), info);
+                    }
+                }
+            }
+        }
+    }
+
+    fn instantiation_graph(&self) -> DiGraphMap<&TParam, Edge> {
+        let edges = self
+            .tparam_type_arguments
+            .iter()
+            .flat_map(|(parent, children)| {
+                children
+                    .iter()
+                    .map(move |(child, info)| (parent, child, info.edge))
+            });
+        DiGraphMap::from_edges(edges)
+    }
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+pub fn modules(
+    compilation_env: &mut CompilationEnv,
+    modules: &UniqueMap<ModuleIdent, T::ModuleDefinition>,
+) {
+    let tparams = modules
+        .key_cloned_iter()
+        .map(|(mname, mdef)| {
+            let tparams = mdef
+                .functions
+                .key_cloned_iter()
+                .map(|(fname, fdef)| (fname, &fdef.signature.type_parameters))
+                .collect();
+            (mname, tparams)
+        })
+        .collect();
+    modules
+        .key_cloned_iter()
+        .for_each(|(mname, m)| module(compilation_env, &tparams, mname, m))
+}
+
+macro_rules! scc_edges {
+    ($graph:expr, $scc:expr) => {{
+        let g = $graph;
+        let s = $scc;
+        s.iter().flat_map(move |v| {
+            s.iter()
+                .filter_map(move |u| g.edge_weight(v, u).cloned().map(|e| (v, e, u)))
+        })
+    }};
+}
+
+fn module<'a>(
+    compilation_env: &mut CompilationEnv,
+    tparams: &'a BTreeMap<ModuleIdent, BTreeMap<FunctionName, &'a Vec<TParam>>>,
+    mname: ModuleIdent,
+    module: &T::ModuleDefinition,
+) {
+    let context = &mut Context::new(tparams, mname);
+    module
+        .functions
+        .key_cloned_iter()
+        .for_each(|(_fname, fdef)| function_body(context, &fdef.body));
+    let graph = context.instantiation_graph();
+    // - get the strongly connected components
+    // - fitler out SCCs that do not contain a 'nested' or 'strong' edge
+    // - report those cycles
+    petgraph_scc(&graph)
+        .into_iter()
+        .filter(|scc| scc_edges!(&graph, scc).any(|(_, e, _)| e == Edge::Nested))
+        .for_each(|scc| compilation_env.add_diag(cycle_error(context, &graph, scc)))
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function_body(context: &mut Context, sp!(_, b_): &T::FunctionBody) {
+    match b_ {
+        T::FunctionBody_::Native => (),
+        T::FunctionBody_::Defined(es) => sequence(context, es),
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+fn sequence(context: &mut Context, seq: &T::Sequence) {
+    seq.iter().for_each(|item| sequence_item(context, item))
+}
+
+fn sequence_item(context: &mut Context, item: &T::SequenceItem) {
+    use T::SequenceItem_ as S;
+    match &item.value {
+        S::Bind(_, _, te) | S::Seq(te) => exp(context, te),
+        S::Declare(_) => (),
+    }
+}
+
+fn exp(context: &mut Context, e: &T::Exp) {
+    use T::UnannotatedExp_ as E;
+    match &e.exp.value {
+        E::Use(_) => panic!("ICE should have been expanded"),
+
+        E::Unit { .. }
+        | E::Value(_)
+        | E::Constant(_, _)
+        | E::Move { .. }
+        | E::Copy { .. }
+        | E::BorrowLocal(_, _)
+        | E::Break
+        | E::Continue
+        | E::Spec(_, _)
+        | E::UnresolvedError => (),
+
+        E::ModuleCall(call) => {
+            context.add_usage(e.exp.loc, &call.module, &call.name, &call.type_arguments);
+            exp(context, &call.arguments)
+        }
+
+        E::IfElse(eb, et, ef) => {
+            exp(context, eb);
+            exp(context, et);
+            exp(context, ef);
+        }
+        E::While(eb, eloop) => {
+            exp(context, eb);
+            exp(context, eloop);
+        }
+        E::Loop { body: eloop, .. } => exp(context, eloop),
+        E::Block(seq) => sequence(context, seq),
+        E::Assign(_, _, er) => exp(context, er),
+
+        E::Builtin(_, er)
+        | E::Vector(_, _, _, er)
+        | E::Return(er)
+        | E::Abort(er)
+        | E::Dereference(er)
+        | E::UnaryExp(_, er)
+        | E::Borrow(_, er, _)
+        | E::TempBorrow(_, er) => exp(context, er),
+        E::Mutate(el, er) | E::BinopExp(el, _, _, er) => {
+            exp(context, el);
+            exp(context, er)
+        }
+
+        E::Pack(_, _, _, fields) => {
+            for (_, _, (_, (_, fe))) in fields.iter() {
+                exp(context, fe)
+            }
+        }
+        E::ExpList(el) => exp_list(context, el),
+
+        E::Cast(e, _) | E::Annotate(e, _) => exp(context, e),
+    }
+}
+
+fn exp_list(context: &mut Context, items: &[T::ExpListItem]) {
+    items.iter().for_each(|item| exp_list_item(context, item))
+}
+
+fn exp_list_item(context: &mut Context, item: &T::ExpListItem) {
+    use T::ExpListItem as I;
+    match item {
+        I::Single(e, _) | I::Splat(_, e, _) => {
+            exp(context, e);
+        }
+    }
+}
+
+//**************************************************************************************************
+// Errors
+//**************************************************************************************************
+
+fn cycle_error(
+    context: &Context,
+    graph: &DiGraphMap<&TParam, Edge>,
+    scc: Vec<&TParam>,
+) -> Diagnostic {
+    let critical_edge = scc_edges!(graph, &scc).find(|(_, e, _)| e == &Edge::Nested);
+    // tail -> head
+    let (critical_tail, _, critical_head) = critical_edge.unwrap();
+    let (_, cycle_nodes) = petgraph_astar(
+        graph,
+        critical_head,
+        |finish| &finish == critical_tail,
+        |_e| 1,
+        |_| 0,
+    )
+    .unwrap();
+    assert!(!cycle_nodes.is_empty());
+    let next = |i| (i + 1) % cycle_nodes.len();
+    let prev = |i: usize| i.checked_sub(1).unwrap_or(cycle_nodes.len() - 1);
+
+    assert!(&cycle_nodes[0] == critical_head);
+    let param_info = &context.tparam_type_arguments[cycle_nodes[0]][cycle_nodes[next(0)]];
+    let arg_info = &context.tparam_type_arguments[cycle_nodes[prev(0)]][cycle_nodes[0]];
+
+    let call_loc = arg_info.loc;
+    let call_msg = format!(
+        "Invalid call to '{}::{}'",
+        &context.current_module, &arg_info.name,
+    );
+    let ty_loc = arg_info.type_argument.loc;
+    let ty_str = core::error_format(&arg_info.type_argument, &Subst::empty());
+    let case = match cycle_nodes.len() {
+        1 => "This recursive call",
+        2 => "These mutually recursive calls",
+        _ => "A cycle of recursive calls",
+    };
+    let tparam_msg = format!(
+        "The type parameter '{param_n}::{param_t}' was instantiated with the type {ty}, which \
+         contains the type parameter '{arg_n}::{arg_t}'. {case} causes the instantiation to \
+         recurse infinitely",
+        param_n = &param_info.name,
+        param_t = &critical_head.user_specified_name,
+        ty = ty_str,
+        arg_n = &arg_info.name,
+        arg_t = &critical_tail.user_specified_name,
+        case = case,
+    );
+
+    let mut secondary_labels = vec![(ty_loc, tparam_msg)];
+
+    if cycle_nodes.len() > 1 {
+        let (mut subst, init_call) = {
+            let ftparam = cycle_nodes[0];
+            let prev_tparam = cycle_nodes[prev(0)];
+            let init_state = &context.tparam_type_arguments[prev_tparam][ftparam];
+            let ftparam_ty = {
+                let qualified_ = Symbol::from(format!(
+                    "{}::{}",
+                    &init_state.name, &ftparam.user_specified_name
+                ));
+                let qualified = sp(ftparam.user_specified_name.loc, qualified_);
+                let qualified_tp = TParam {
+                    user_specified_name: qualified,
+                    ..ftparam.clone()
+                };
+                sp(init_state.loc, Type_::Param(qualified_tp))
+            };
+            let init_call = make_call_string(context, init_state, ftparam.id, &ftparam_ty);
+            let loc = ftparam.user_specified_name.loc;
+            let subst = make_subst(context, loc, init_state, ftparam.id, ftparam_ty);
+            (subst, init_call)
+        };
+
+        let cycle_calls = cycle_nodes
+            .iter()
+            .enumerate()
+            .map(|(i, targ_tparam)| {
+                let tparam = cycle_nodes[next(i)];
+                let cur = &context.tparam_type_arguments[targ_tparam][tparam];
+                let targ = core::subst_tparams(&subst, cur.type_argument.clone());
+                let res = make_call_string(context, cur, tparam.id, &targ);
+                let loc = tparam.user_specified_name.loc;
+                subst = make_subst(context, loc, cur, tparam.id, targ);
+                res
+            })
+            .collect::<Vec<_>>();
+        cycle_calls
+            .iter()
+            .enumerate()
+            .for_each(|(i, (loc, next_call))| {
+                let (_, prev_call) = if i == 0 {
+                    &init_call
+                } else {
+                    &cycle_calls[prev(i)]
+                };
+                let msg = format!("'{}' calls '{}'", prev_call, next_call);
+                secondary_labels.push((*loc, msg))
+            });
+    }
+
+    Diagnostic::new(
+        TypeSafety::CyclicInstantiation,
+        (call_loc, call_msg),
+        secondary_labels,
+        std::iter::empty::<String>(),
+    )
+}
+
+fn make_subst(
+    context: &Context,
+    loc: Loc,
+    state: &EdgeInfo,
+    tparam: TParamID,
+    tparam_ty: Type,
+) -> TParamSubst {
+    let mut tparam_ty = Some(tparam_ty);
+    context.tparams[&context.current_module][&state.name]
+        .iter()
+        .map(|tp| {
+            let ty = if tp.id == tparam {
+                tparam_ty.take().unwrap()
+            } else {
+                sp(loc, Type_::Anything)
+            };
+            (tp.id, ty)
+        })
+        .collect::<TParamSubst>()
+}
+
+fn make_call_string(
+    context: &Context,
+    cur: &EdgeInfo,
+    tparam: TParamID,
+    targ: &Type,
+) -> (Loc, String) {
+    let targs = context.tparams[&context.current_module][&cur.name]
+        .iter()
+        .map(|tp| {
+            if tp.id == tparam {
+                core::error_format_nested(targ, &Subst::empty())
+            } else {
+                "_".to_owned()
+            }
+        })
+        .collect::<Vec<_>>()
+        .join(", ");
+    let targs = if targs.is_empty() {
+        targs
+    } else {
+        format!("<{}>", targs)
+    };
+    (cur.loc, format!("{}{}", &cur.name, targs))
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/mod.rs b/vendors/move/crates/move-compiler/src/typing/mod.rs
new file mode 100644
index 000000000..189255a46
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/mod.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod ast;
+pub mod core;
+mod dependency_ordering;
+mod expand;
+mod infinite_instantiations;
+mod recursive_structs;
+pub(crate) mod translate;
+pub mod visitor;
diff --git a/vendors/move/crates/move-compiler/src/typing/recursive_structs.rs b/vendors/move/crates/move-compiler/src/typing/recursive_structs.rs
new file mode 100644
index 000000000..dec930d63
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/recursive_structs.rs
@@ -0,0 +1,154 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    diag,
+    diagnostics::Diagnostic,
+    expansion::ast::ModuleIdent,
+    naming::ast::{self as N, TypeName_},
+    parser::ast::StructName,
+    shared::{unique_map::UniqueMap, *},
+    typing::ast as T,
+};
+use move_ir_types::location::*;
+use petgraph::{algo::tarjan_scc as petgraph_scc, graphmap::DiGraphMap};
+use std::collections::BTreeMap;
+
+struct Context {
+    struct_neighbors: BTreeMap<StructName, BTreeMap<StructName, Loc>>,
+    current_module: ModuleIdent,
+    current_struct: Option<StructName>,
+}
+
+impl Context {
+    fn new(current_module: ModuleIdent) -> Self {
+        Context {
+            current_module,
+            struct_neighbors: BTreeMap::new(),
+            current_struct: None,
+        }
+    }
+
+    fn add_usage(&mut self, loc: Loc, module: &ModuleIdent, sname: &StructName) {
+        if &self.current_module != module {
+            return;
+        }
+        self.struct_neighbors
+            .entry(self.current_struct.unwrap())
+            .or_default()
+            .insert(*sname, loc);
+    }
+
+    fn struct_graph(&self) -> DiGraphMap<&StructName, ()> {
+        let edges = self
+            .struct_neighbors
+            .iter()
+            .flat_map(|(parent, children)| children.iter().map(move |(child, _)| (parent, child)));
+        DiGraphMap::from_edges(edges)
+    }
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+pub fn modules(
+    compilation_env: &mut CompilationEnv,
+    modules: &UniqueMap<ModuleIdent, T::ModuleDefinition>,
+) {
+    modules
+        .key_cloned_iter()
+        .for_each(|(mname, m)| module(compilation_env, mname, m))
+}
+
+fn module(compilation_env: &mut CompilationEnv, mname: ModuleIdent, module: &T::ModuleDefinition) {
+    let context = &mut Context::new(mname);
+    module
+        .structs
+        .key_cloned_iter()
+        .for_each(|(sname, sdef)| struct_def(context, sname, sdef));
+    let graph = context.struct_graph();
+    // - get the strongly connected components
+    // - filter out single nodes that do not connect to themselves
+    // - report those cycles
+    petgraph_scc(&graph)
+        .into_iter()
+        .filter(|scc| scc.len() > 1 || graph.contains_edge(scc[0], scc[0]))
+        .for_each(|scc| compilation_env.add_diag(cycle_error(context, &graph, scc[0])))
+}
+
+fn struct_def(context: &mut Context, sname: StructName, sdef: &N::StructDefinition) {
+    assert!(
+        context.current_struct.is_none(),
+        "ICE struct name not unset"
+    );
+    context.current_struct = Some(sname);
+    match &sdef.fields {
+        N::StructFields::Native(_) => (),
+        N::StructFields::Defined(fields) => {
+            fields.iter().for_each(|(_, _, (_, ty))| type_(context, ty))
+        }
+    };
+    context.current_struct = None;
+}
+
+fn type_(context: &mut Context, sp!(loc, ty_): &N::Type) {
+    use N::Type_::*;
+    match ty_ {
+        Var(_) => panic!("ICE tvar in struct field type"),
+        Unit | Anything | UnresolvedError | Param(_) => (),
+        Ref(_, t) => type_(context, t),
+        Apply(_, sp!(_, tn_), tys) => {
+            if let TypeName_::ModuleType(m, s) = tn_ {
+                context.add_usage(*loc, m, s)
+            }
+            tys.iter().for_each(|t| type_(context, t))
+        }
+    }
+}
+
+fn cycle_error(
+    context: &Context,
+    graph: &DiGraphMap<&StructName, ()>,
+    cycle_node: &StructName,
+) -> Diagnostic {
+    let cycle = shortest_cycle(graph, cycle_node);
+
+    // For printing uses, sort the cycle by location (earliest first)
+    let cycle_strings = cycle
+        .iter()
+        .map(|m| format!("'{}'", m))
+        .collect::<Vec<_>>()
+        .join(" contains ");
+
+    let (used_loc, user, used) = best_cycle_loc(context, cycle);
+
+    let use_msg = format!("Invalid field containing '{}' in struct '{}'.", used, user);
+    let cycle_msg = format!("Using this struct creates a cycle: {}", cycle_strings);
+    diag!(
+        TypeSafety::CyclicData,
+        (used_loc, use_msg),
+        (used_loc, cycle_msg)
+    )
+}
+
+fn best_cycle_loc<'a>(
+    context: &'a Context,
+    cycle: Vec<&'a StructName>,
+) -> (Loc, &'a StructName, &'a StructName) {
+    let get_loc = |user, used| context.struct_neighbors[user][used];
+    let len = cycle.len();
+    match len {
+        1 => (get_loc(cycle[0], cycle[0]), cycle[0], cycle[0]),
+        2 => (get_loc(cycle[0], cycle[1]), cycle[0], cycle[1]),
+        _ => {
+            let first = cycle[0];
+            let user = cycle[len - 2];
+            let used = cycle[len - 1];
+            assert!(first == used);
+            let used_loc = get_loc(user, used);
+            (used_loc, user, used)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/translate.rs b/vendors/move/crates/move-compiler/src/typing/translate.rs
new file mode 100644
index 000000000..b4e188d1d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/translate.rs
@@ -0,0 +1,2611 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{
+    core::{self, Context, Local, Subst},
+    expand, infinite_instantiations, recursive_structs,
+};
+use crate::{
+    diag,
+    diagnostics::{codes::*, Diagnostic},
+    editions::{FeatureGate, Flavor},
+    expansion::ast::{
+        AttributeName_, AttributeValue_, Attribute_, Attributes, Fields, Friend, ModuleAccess_,
+        ModuleIdent, ModuleIdent_, Value_, Visibility,
+    },
+    naming::ast::{self as N, TParam, TParamID, Type, TypeName_, Type_},
+    parser::ast::{Ability_, BinOp_, ConstantName, Field, FunctionName, StructName, UnaryOp_},
+    shared::{
+        known_attributes::{KnownAttribute, TestingAttribute},
+        program_info::TypingProgramInfo,
+        unique_map::UniqueMap,
+        *,
+    },
+    sui_mode,
+    typing::{
+        ast as T,
+        core::{public_testing_visibility, PublicForTesting},
+        dependency_ordering,
+    },
+    FullyCompiledProgram,
+};
+use move_ir_types::location::*;
+use move_symbol_pool::Symbol;
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn program(
+    compilation_env: &mut CompilationEnv,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
+    prog: N::Program,
+) -> T::Program {
+    let N::Program {
+        info,
+        inner: N::Program_ {
+            modules: nmodules,
+            scripts: nscripts,
+        },
+    } = prog;
+    let mut context = Context::new(compilation_env, pre_compiled_lib, info);
+
+    // we extract module use funs into the module info context
+    let mut modules = modules(&mut context, nmodules);
+    let mut scripts = scripts(&mut context, nscripts);
+
+    assert!(context.constraints.is_empty());
+    dependency_ordering::program(context.env, &mut modules, &mut scripts);
+    recursive_structs::modules(context.env, &modules);
+    infinite_instantiations::modules(context.env, &modules);
+    let mut prog = T::Program_ { modules, scripts };
+    let module_use_funs = context
+        .modules
+        .modules
+        .into_iter()
+        .map(|(mident, minfo)| (mident, minfo.use_funs))
+        .collect();
+    let module_info = TypingProgramInfo::new(pre_compiled_lib, &prog, module_use_funs);
+    for v in &compilation_env.visitors().typing {
+        let mut v = v.borrow_mut();
+        v.visit(compilation_env, &module_info, &mut prog);
+    }
+    T::Program {
+        info: module_info,
+        inner: prog,
+    }
+}
+
+fn modules(
+    context: &mut Context,
+    modules: UniqueMap<ModuleIdent, N::ModuleDefinition>,
+) -> UniqueMap<ModuleIdent, T::ModuleDefinition> {
+    let mut all_new_friends = BTreeMap::new();
+    let mut typed_modules = modules.map(|ident, mdef| {
+        let (typed_mdef, new_friends) = module(context, ident, mdef);
+        for (pub_package_module, loc) in new_friends {
+            let friend = Friend {
+                attributes: UniqueMap::new(),
+                loc,
+            };
+            all_new_friends
+                .entry(pub_package_module)
+                .or_insert_with(BTreeMap::new)
+                .insert(ident, friend);
+        }
+        typed_mdef
+    });
+
+    for (mident, friends) in all_new_friends {
+        let mdef = typed_modules.get_mut(&mident).unwrap();
+        // point of interest: if we have any new friends, we know there can't be any
+        // "current" friends becahse all thew new friends are generated off of
+        // `public(package)` usage, which disallows other friends.
+        mdef.friends = UniqueMap::maybe_from_iter(friends.into_iter())
+            .expect("ICE compiler added duplicate friends to public(package) friend list");
+    }
+
+    for (_, mident, mdef) in &typed_modules {
+        unused_module_members(context, mident, mdef);
+    }
+
+    typed_modules
+}
+
+fn module(
+    context: &mut Context,
+    ident: ModuleIdent,
+    mdef: N::ModuleDefinition,
+) -> (T::ModuleDefinition, BTreeSet<(ModuleIdent, Loc)>) {
+    assert!(context.current_script_constants.is_none());
+    assert!(context.current_package.is_none());
+
+    let N::ModuleDefinition {
+        loc,
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        use_funs,
+        friends,
+        mut structs,
+        functions: nfunctions,
+        constants: nconstants,
+        spec_dependencies,
+    } = mdef;
+    context.current_module = Some(ident);
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    context.add_use_funs_scope(use_funs);
+    structs
+        .iter_mut()
+        .for_each(|(_, _, s)| struct_def(context, s));
+    process_attributes(context, &attributes);
+    let constants = nconstants.map(|name, c| constant(context, name, c));
+    let functions = nfunctions.map(|name, f| function(context, name, f, false));
+    assert!(context.constraints.is_empty());
+    context.current_package = None;
+    context.pop_use_funs_scope();
+    context.env.pop_warning_filter_scope();
+    let typed_module = T::ModuleDefinition {
+        loc,
+        warning_filter,
+        package_name,
+        attributes,
+        is_source_module,
+        dependency_order: 0,
+        immediate_neighbors: UniqueMap::new(),
+        used_addresses: BTreeSet::new(),
+        friends,
+        structs,
+        constants,
+        functions,
+        spec_dependencies,
+    };
+    // get the list of new friends and reset the list.
+    let new_friends = std::mem::take(&mut context.new_friends);
+    (typed_module, new_friends)
+}
+
+fn scripts(
+    context: &mut Context,
+    nscripts: BTreeMap<Symbol, N::Script>,
+) -> BTreeMap<Symbol, T::Script> {
+    nscripts
+        .into_iter()
+        .map(|(n, s)| (n, script(context, s)))
+        .collect()
+}
+
+fn script(context: &mut Context, nscript: N::Script) -> T::Script {
+    assert!(context.current_script_constants.is_none());
+    assert!(context.current_package.is_none());
+    context.current_module = None;
+    let N::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        use_funs,
+        constants: nconstants,
+        function_name,
+        function: nfunction,
+        spec_dependencies,
+    } = nscript;
+    context.current_package = package_name;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    context.add_use_funs_scope(use_funs);
+    context.bind_script_constants(&nconstants);
+    let constants = nconstants.map(|name, c| constant(context, name, c));
+    let function = function(context, function_name, nfunction, true);
+    context.current_script_constants = None;
+    context.current_package = None;
+    context.pop_use_funs_scope();
+    context.env.pop_warning_filter_scope();
+    T::Script {
+        warning_filter,
+        package_name,
+        attributes,
+        loc,
+        immediate_neighbors: UniqueMap::new(),
+        used_addresses: BTreeSet::new(),
+        constants,
+        function_name,
+        function,
+        spec_dependencies,
+    }
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+fn function(
+    context: &mut Context,
+    name: FunctionName,
+    f: N::Function,
+    is_script: bool,
+) -> T::Function {
+    let loc = name.loc();
+    let N::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility,
+        entry,
+        mut signature,
+        body: n_body,
+    } = f;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+    assert!(context.constraints.is_empty());
+    context.reset_for_module_item();
+    context.current_function = Some(name);
+    process_attributes(context, &attributes);
+    let visibility =
+        match public_testing_visibility(context.env, context.current_package, &name, entry) {
+            Some(PublicForTesting::Entry(loc)) => Visibility::Public(loc),
+            None => visibility,
+        };
+    function_signature(context, &signature);
+    if is_script {
+        let mk_msg = || {
+            let tu = core::error_format_(&Type_::Unit, &Subst::empty());
+            format!(
+                "Invalid 'script' function return type. The function entry point to a \
+                 'script' must have the return type {}",
+                tu
+            )
+        };
+        subtype(
+            context,
+            loc,
+            mk_msg,
+            signature.return_type.clone(),
+            sp(loc, Type_::Unit),
+        );
+    }
+    expand::function_signature(context, &mut signature);
+
+    let body = function_body(context, n_body);
+    unused_let_muts(context);
+    context.current_function = None;
+    context.env.pop_warning_filter_scope();
+    T::Function {
+        warning_filter,
+        index,
+        attributes,
+        visibility,
+        entry,
+        signature,
+        body,
+    }
+}
+
+fn function_signature(context: &mut Context, sig: &N::FunctionSignature) {
+    assert!(context.constraints.is_empty());
+
+    for (mut_, param, param_ty) in &sig.parameters {
+        let param_ty = core::instantiate(context, param_ty.clone());
+        context.add_single_type_constraint(
+            param_ty.loc,
+            "Invalid parameter type",
+            param_ty.clone(),
+        );
+        context.declare_local(*mut_, *param, param_ty);
+    }
+    context.return_type = Some(core::instantiate(context, sig.return_type.clone()));
+    core::solve_constraints(context);
+}
+
+fn function_body(context: &mut Context, sp!(loc, nb_): N::FunctionBody) -> T::FunctionBody {
+    assert!(context.constraints.is_empty());
+    let mut b_ = match nb_ {
+        N::FunctionBody_::Native => T::FunctionBody_::Native,
+        N::FunctionBody_::Defined(es) => {
+            let seq = sequence(context, es);
+            let ety = sequence_type(&seq);
+            let ret_ty = context.return_type.clone().unwrap();
+            let sloc = seq.back().unwrap().loc;
+            subtype(
+                context,
+                sloc,
+                || "Invalid return expression",
+                ety.clone(),
+                ret_ty,
+            );
+            T::FunctionBody_::Defined(seq)
+        }
+    };
+    core::solve_constraints(context);
+    expand::function_body_(context, &mut b_);
+    // freeze::function_body_(context, &mut b_);
+    sp(loc, b_)
+}
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+fn constant(context: &mut Context, _name: ConstantName, nconstant: N::Constant) -> T::Constant {
+    assert!(context.constraints.is_empty());
+    context.reset_for_module_item();
+
+    let N::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value: nvalue,
+    } = nconstant;
+    context.env.add_warning_filter_scope(warning_filter.clone());
+
+    process_attributes(context, &attributes);
+
+    // Don't need to add base type constraint, as it is checked in `check_valid_constant::signature`
+    let mut signature = core::instantiate(context, signature);
+    check_valid_constant::signature(
+        context,
+        signature.loc,
+        || "Unpermitted constant type",
+        TypeSafety::TypeForConstant,
+        &signature,
+    );
+    context.return_type = Some(signature.clone());
+
+    let mut value = exp_(context, nvalue);
+    unused_let_muts(context);
+    subtype(
+        context,
+        signature.loc,
+        || "Invalid constant signature",
+        value.ty.clone(),
+        signature.clone(),
+    );
+    core::solve_constraints(context);
+
+    expand::type_(context, &mut signature);
+    expand::exp(context, &mut value);
+
+    check_valid_constant::exp(context, &value);
+    context.env.pop_warning_filter_scope();
+
+    T::Constant {
+        warning_filter,
+        index,
+        attributes,
+        loc,
+        signature,
+        value,
+    }
+}
+
+mod check_valid_constant {
+    use super::subtype_no_report;
+    use crate::{
+        diag,
+        diagnostics::codes::DiagnosticCode,
+        naming::ast::{Type, Type_},
+        shared::*,
+        typing::{
+            ast as T,
+            core::{self, Context, Subst},
+        },
+    };
+    use move_ir_types::location::*;
+
+    pub(crate) fn signature<T: ToString, F: FnOnce() -> T>(
+        context: &mut Context,
+        sloc: Loc,
+        fmsg: F,
+        code: impl DiagnosticCode,
+        ty: &Type,
+    ) {
+        let loc = ty.loc;
+
+        let mut acceptable_types = vec![
+            Type_::u8(loc),
+            Type_::u16(loc),
+            Type_::u32(loc),
+            Type_::u64(loc),
+            Type_::u128(loc),
+            Type_::u256(loc),
+            Type_::bool(loc),
+            Type_::address(loc),
+        ];
+        let ty_is_an_acceptable_type = acceptable_types.iter().any(|acceptable_type| {
+            let old_subst = context.subst.clone();
+            let result = subtype_no_report(context, ty.clone(), acceptable_type.clone());
+            context.subst = old_subst;
+            result.is_ok()
+        });
+        if ty_is_an_acceptable_type {
+            return;
+        }
+
+        let inner_tvar = core::make_tvar(context, sloc);
+        let vec_ty = Type_::vector(sloc, inner_tvar.clone());
+        let old_subst = context.subst.clone();
+        let is_vec = subtype_no_report(context, ty.clone(), vec_ty.clone()).is_ok();
+        let inner = core::ready_tvars(&context.subst, inner_tvar);
+        context.subst = old_subst;
+        if is_vec {
+            signature(context, sloc, fmsg, code, &inner);
+            return;
+        }
+
+        acceptable_types.push(vec_ty);
+        let tys = acceptable_types
+            .iter()
+            .map(|t| core::error_format(t, &Subst::empty()));
+        let tmsg = format!(
+            "Found: {}. But expected one of: {}",
+            core::error_format(ty, &Subst::empty()),
+            format_comma(tys),
+        );
+        context
+            .env
+            .add_diag(diag!(code, (sloc, fmsg()), (loc, tmsg)))
+    }
+
+    pub fn exp(context: &mut Context, e: &T::Exp) {
+        exp_(context, &e.exp)
+    }
+
+    fn exp_(context: &mut Context, sp!(loc, e_): &T::UnannotatedExp) {
+        use T::UnannotatedExp_ as E;
+        const REFERENCE_CASE: &str = "References (and reference operations) are";
+        let s;
+        let error_case = match e_ {
+            //*****************************************
+            // Error cases handled elsewhere
+            //*****************************************
+            E::Use(_) | E::Continue | E::Break | E::UnresolvedError => return,
+
+            //*****************************************
+            // Valid cases
+            //*****************************************
+            E::Unit { .. } | E::Value(_) | E::Move { .. } | E::Copy { .. } => return,
+            E::Block(seq) => {
+                sequence(context, seq);
+                return;
+            }
+            E::UnaryExp(_, er) => {
+                exp(context, er);
+                return;
+            }
+            E::BinopExp(el, _, _, er) => {
+                exp(context, el);
+                exp(context, er);
+                return;
+            }
+            E::Cast(el, _) | E::Annotate(el, _) => {
+                exp(context, el);
+                return;
+            }
+            E::Vector(_, _, _, eargs) => {
+                exp(context, eargs);
+                return;
+            }
+            E::ExpList(el) => {
+                exp_list(context, el);
+                return;
+            }
+
+            // NB: module scoping is checked during constant type creation, so we don't need to
+            // relitigate here.
+            E::Constant(_, _) => {
+                return;
+            }
+
+            //*****************************************
+            // Invalid cases
+            //*****************************************
+            E::Spec(_, _) => "Spec blocks are",
+            E::BorrowLocal(_, _) => REFERENCE_CASE,
+            E::ModuleCall(call) => {
+                exp(context, &call.arguments);
+                "Module calls are"
+            }
+            E::Builtin(b, args) => {
+                exp(context, args);
+                s = format!("'{}' is", b);
+                &s
+            }
+            E::IfElse(eb, et, ef) => {
+                exp(context, eb);
+                exp(context, et);
+                exp(context, ef);
+                "'if' expressions are"
+            }
+            E::While(eb, eloop) => {
+                exp(context, eb);
+                exp(context, eloop);
+                "'while' expressions are"
+            }
+            E::Loop { body: eloop, .. } => {
+                exp(context, eloop);
+                "'loop' expressions are"
+            }
+            E::Assign(_assigns, _tys, er) => {
+                exp(context, er);
+                "Assignments are"
+            }
+            E::Return(er) => {
+                exp(context, er);
+                "'return' expressions are"
+            }
+            E::Abort(er) => {
+                exp(context, er);
+                "'abort' expressions are"
+            }
+            E::Dereference(er) | E::Borrow(_, er, _) | E::TempBorrow(_, er) => {
+                exp(context, er);
+                REFERENCE_CASE
+            }
+            E::Mutate(el, er) => {
+                exp(context, el);
+                exp(context, er);
+                REFERENCE_CASE
+            }
+            E::Pack(_, _, _, fields) => {
+                for (_, _, (_, (_, fe))) in fields {
+                    exp(context, fe)
+                }
+                "Structs are"
+            }
+        };
+        context.env.add_diag(diag!(
+            TypeSafety::UnsupportedConstant,
+            (*loc, format!("{} not supported in constants", error_case))
+        ));
+    }
+
+    fn exp_list(context: &mut Context, items: &[T::ExpListItem]) {
+        for item in items {
+            exp_list_item(context, item)
+        }
+    }
+
+    fn exp_list_item(context: &mut Context, item: &T::ExpListItem) {
+        use T::ExpListItem as I;
+        match item {
+            I::Single(e, _st) => {
+                exp(context, e);
+            }
+            I::Splat(_, e, _ss) => {
+                exp(context, e);
+            }
+        }
+    }
+
+    fn sequence(context: &mut Context, seq: &T::Sequence) {
+        for item in seq {
+            sequence_item(context, item)
+        }
+    }
+
+    fn sequence_item(context: &mut Context, sp!(loc, item_): &T::SequenceItem) {
+        use T::SequenceItem_ as S;
+        let error_case = match &item_ {
+            S::Seq(te) => {
+                exp(context, te);
+                return;
+            }
+
+            S::Declare(_) => "'let' declarations",
+            S::Bind(_, _, te) => {
+                exp(context, te);
+                "'let' declarations"
+            }
+        };
+        let msg = format!("{} are not supported in constants", error_case);
+        context
+            .env
+            .add_diag(diag!(TypeSafety::UnsupportedConstant, (*loc, msg),))
+    }
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+fn struct_def(context: &mut Context, s: &mut N::StructDefinition) {
+    assert!(context.constraints.is_empty());
+    context.reset_for_module_item();
+    context
+        .env
+        .add_warning_filter_scope(s.warning_filter.clone());
+
+    let field_map = match &mut s.fields {
+        N::StructFields::Native(_) => return,
+        N::StructFields::Defined(m) => m,
+    };
+
+    // instantiate types and check constraints
+    for (_field_loc, _field, idx_ty) in field_map.iter() {
+        let loc = idx_ty.1.loc;
+        let inst_ty = core::instantiate(context, idx_ty.1.clone());
+        context.add_base_type_constraint(loc, "Invalid field type", inst_ty.clone());
+    }
+    core::solve_constraints(context);
+
+    // substitute the declared type parameters with an Any type to check for ability field
+    // requirements
+    let declared_abilities = &s.abilities;
+    let tparam_subst = &core::make_tparam_subst(
+        s.type_parameters.iter().map(|tp| &tp.param),
+        s.type_parameters
+            .iter()
+            .map(|tp| sp(tp.param.user_specified_name.loc, Type_::Anything)),
+    );
+    for (_field_loc, _field, idx_ty) in field_map.iter() {
+        let loc = idx_ty.1.loc;
+        let subst_ty = core::subst_tparams(tparam_subst, idx_ty.1.clone());
+        for declared_ability in declared_abilities {
+            let required = declared_ability.value.requires();
+            let msg = format!(
+                "Invalid field type. The struct was declared with the ability '{}' so all fields \
+                 require the ability '{}'",
+                declared_ability, required
+            );
+            context.add_ability_constraint(loc, Some(msg), subst_ty.clone(), required)
+        }
+    }
+    core::solve_constraints(context);
+
+    for (_field_loc, _field_, idx_ty) in field_map.iter_mut() {
+        expand::type_(context, &mut idx_ty.1);
+    }
+    check_type_params_usage(context, &s.type_parameters, field_map);
+    context.env.pop_warning_filter_scope();
+}
+
+fn check_type_params_usage(
+    context: &mut Context,
+    type_parameters: &[N::StructTypeParameter],
+    field_map: &Fields<Type>,
+) {
+    let has_unresolved = field_map
+        .iter()
+        .any(|(_, _, ty)| has_unresolved_error_type(&ty.1));
+
+    if has_unresolved {
+        return;
+    }
+
+    // true = used at least once in non-phantom pos
+    // false = only used in phantom pos
+    // not in the map = never used
+    let mut non_phantom_use: BTreeMap<TParamID, bool> = BTreeMap::new();
+    let phantom_params: BTreeSet<TParamID> = type_parameters
+        .iter()
+        .filter(|ty_param| ty_param.is_phantom)
+        .map(|param| param.param.id)
+        .collect();
+    for (_, _, idx_ty) in field_map.iter() {
+        visit_type_params(
+            context,
+            &idx_ty.1,
+            ParamPos::FIELD,
+            &mut |context, loc, param, pos| {
+                let param_is_phantom = phantom_params.contains(&param.id);
+                match (pos, param_is_phantom) {
+                    (ParamPos::NonPhantom(non_phantom_pos), true) => {
+                        invalid_phantom_use_error(context, non_phantom_pos, param, loc);
+                    }
+                    (_, false) => {
+                        let used_in_non_phantom_pos =
+                            non_phantom_use.entry(param.id).or_insert(false);
+                        *used_in_non_phantom_pos |= !pos.is_phantom();
+                    }
+                    _ => {}
+                }
+            },
+        );
+    }
+    for ty_param in type_parameters {
+        if !ty_param.is_phantom {
+            check_non_phantom_param_usage(
+                context,
+                &ty_param.param,
+                non_phantom_use.get(&ty_param.param.id).copied(),
+            );
+        }
+    }
+}
+
+#[derive(Clone, Copy)]
+enum ParamPos {
+    Phantom,
+    NonPhantom(NonPhantomPos),
+}
+
+impl ParamPos {
+    const FIELD: ParamPos = ParamPos::NonPhantom(NonPhantomPos::FieldType);
+
+    /// Returns `true` if the param_pos is [`Phantom`].
+    fn is_phantom(&self) -> bool {
+        matches!(self, Self::Phantom)
+    }
+}
+
+#[derive(Clone, Copy)]
+enum NonPhantomPos {
+    FieldType,
+    TypeArg,
+}
+
+fn visit_type_params(
+    context: &mut Context,
+    ty: &Type,
+    param_pos: ParamPos,
+    f: &mut impl FnMut(&mut Context, Loc, &TParam, ParamPos),
+) {
+    match &ty.value {
+        Type_::Param(param) => {
+            f(context, ty.loc, param, param_pos);
+        }
+        // References cannot appear in structs, but we still report them as a non-phantom position
+        // for full information.
+        Type_::Ref(_, ty) => {
+            visit_type_params(context, ty, ParamPos::NonPhantom(NonPhantomPos::TypeArg), f)
+        }
+        Type_::Apply(_, n, ty_args) => match &n.value {
+            // Tuples cannot appear in structs, but we still report them as a non-phantom position
+            // for full information.
+            TypeName_::Builtin(_) | TypeName_::Multiple(_) => {
+                for ty_arg in ty_args {
+                    visit_type_params(
+                        context,
+                        ty_arg,
+                        ParamPos::NonPhantom(NonPhantomPos::TypeArg),
+                        f,
+                    );
+                }
+            }
+            TypeName_::ModuleType(m, n) => {
+                let param_is_phantom: Vec<_> = context
+                    .struct_tparams(m, n)
+                    .iter()
+                    .map(|param| param.is_phantom)
+                    .collect();
+                // Length of params and args may be different but we can still report errors
+                // for parameters with information
+                for (is_phantom, ty_arg) in param_is_phantom.into_iter().zip(ty_args) {
+                    let pos = if is_phantom {
+                        ParamPos::Phantom
+                    } else {
+                        ParamPos::NonPhantom(NonPhantomPos::TypeArg)
+                    };
+                    visit_type_params(context, ty_arg, pos, f);
+                }
+            }
+        },
+        Type_::Var(_) | Type_::Anything | Type_::UnresolvedError => {}
+        Type_::Unit => {}
+    }
+}
+
+fn invalid_phantom_use_error(
+    context: &mut Context,
+    non_phantom_pos: NonPhantomPos,
+    param: &TParam,
+    ty_loc: Loc,
+) {
+    let msg = match non_phantom_pos {
+        NonPhantomPos::FieldType => "Phantom type parameter cannot be used as a field type",
+        NonPhantomPos::TypeArg => {
+            "Phantom type parameter cannot be used as an argument to a non-phantom parameter"
+        }
+    };
+    let decl_msg = format!("'{}' declared here as phantom", &param.user_specified_name);
+    context.env.add_diag(diag!(
+        Declarations::InvalidPhantomUse,
+        (ty_loc, msg),
+        (param.user_specified_name.loc, decl_msg),
+    ));
+}
+
+fn check_non_phantom_param_usage(
+    context: &mut Context,
+    param: &N::TParam,
+    param_usage: Option<bool>,
+) {
+    let name = &param.user_specified_name;
+    match param_usage {
+        None => {
+            let msg = format!(
+                "Unused type parameter '{}'. Consider declaring it as phantom",
+                name
+            );
+            context
+                .env
+                .add_diag(diag!(UnusedItem::StructTypeParam, (name.loc, msg)))
+        }
+        Some(false) => {
+            let msg = format!(
+                "The parameter '{}' is only used as an argument to phantom parameters. Consider \
+                 adding a phantom declaration here",
+                name
+            );
+            context
+                .env
+                .add_diag(diag!(Declarations::InvalidNonPhantomUse, (name.loc, msg)))
+        }
+        Some(true) => {}
+    }
+}
+
+fn has_unresolved_error_type(ty: &Type) -> bool {
+    match &ty.value {
+        Type_::UnresolvedError => true,
+        Type_::Ref(_, ty) => has_unresolved_error_type(ty),
+        Type_::Apply(_, _, ty_args) => ty_args.iter().any(has_unresolved_error_type),
+        Type_::Param(_) | Type_::Var(_) | Type_::Anything | Type_::Unit => false,
+    }
+}
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+fn typing_error<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    from_subtype: bool,
+    loc: Loc,
+    mk_msg: F,
+    e: core::TypingError,
+) -> Diagnostic {
+    use super::core::TypingError::*;
+    let msg = mk_msg().to_string();
+    let subst = &context.subst;
+
+    match e {
+        SubtypeError(t1, t2) => {
+            let loc1 = core::best_loc(subst, &t1);
+            let loc2 = core::best_loc(subst, &t2);
+            let t1_str = core::error_format(&t1, subst);
+            let t2_str = core::error_format(&t2, subst);
+            let m1 = format!("Given: {}", t1_str);
+            let m2 = format!("Expected: {}", t2_str);
+            diag!(TypeSafety::SubtypeError, (loc, msg), (loc1, m1), (loc2, m2))
+        }
+        ArityMismatch(n1, t1, n2, t2) => {
+            let loc1 = core::best_loc(subst, &t1);
+            let loc2 = core::best_loc(subst, &t2);
+            let t1_str = core::error_format(&t1, subst);
+            let t2_str = core::error_format(&t2, subst);
+            let msg1 = if from_subtype {
+                format!("Given expression list of length {}: {}", n1, t1_str)
+            } else {
+                format!(
+                    "Found expression list of length {}: {}. It is not compatible with the other \
+                     type of length {}.",
+                    n1, t1_str, n2
+                )
+            };
+            let msg2 = if from_subtype {
+                format!("Expected expression list of length {}: {}", n2, t2_str)
+            } else {
+                format!(
+                    "Found expression list of length {}: {}. It is not compatible with the other \
+                     type of length {}.",
+                    n2, t2_str, n1
+                )
+            };
+
+            diag!(
+                TypeSafety::JoinError,
+                (loc, msg),
+                (loc1, msg1),
+                (loc2, msg2)
+            )
+        }
+        Incompatible(t1, t2) => {
+            let loc1 = core::best_loc(subst, &t1);
+            let loc2 = core::best_loc(subst, &t2);
+            let t1_str = core::error_format(&t1, subst);
+            let t2_str = core::error_format(&t2, subst);
+            let m1 = if from_subtype {
+                format!("Given: {}", t1_str)
+            } else {
+                format!(
+                    "Found: {}. It is not compatible with the other type.",
+                    t1_str
+                )
+            };
+            let m2 = if from_subtype {
+                format!("Expected: {}", t2_str)
+            } else {
+                format!(
+                    "Found: {}. It is not compatible with the other type.",
+                    t2_str
+                )
+            };
+            diag!(TypeSafety::JoinError, (loc, msg), (loc1, m1), (loc2, m2))
+        }
+        RecursiveType(rloc) => diag!(
+            TypeSafety::RecursiveType,
+            (loc, msg),
+            (rloc, "Unable to infer the type. Recursive type found."),
+        ),
+    }
+}
+
+fn subtype_no_report(
+    context: &mut Context,
+    pre_lhs: Type,
+    pre_rhs: Type,
+) -> Result<Type, core::TypingError> {
+    let subst = std::mem::replace(&mut context.subst, Subst::empty());
+    let lhs = core::ready_tvars(&subst, pre_lhs);
+    let rhs = core::ready_tvars(&subst, pre_rhs);
+    core::subtype(subst, &lhs, &rhs).map(|(next_subst, ty)| {
+        context.subst = next_subst;
+        ty
+    })
+}
+
+fn subtype_impl<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    pre_lhs: Type,
+    pre_rhs: Type,
+) -> Result<Type, Type> {
+    let subst = std::mem::replace(&mut context.subst, Subst::empty());
+    let lhs = core::ready_tvars(&subst, pre_lhs);
+    let rhs = core::ready_tvars(&subst, pre_rhs);
+    match core::subtype(subst.clone(), &lhs, &rhs) {
+        Err(e) => {
+            context.subst = subst;
+            let diag = typing_error(context, /* from_subtype */ true, loc, msg, e);
+            context.env.add_diag(diag);
+            Err(rhs)
+        }
+        Ok((next_subst, ty)) => {
+            context.subst = next_subst;
+            Ok(ty)
+        }
+    }
+}
+
+fn subtype_opt<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    pre_lhs: Type,
+    pre_rhs: Type,
+) -> Option<Type> {
+    match subtype_impl(context, loc, msg, pre_lhs, pre_rhs) {
+        Err(_rhs) => None,
+        Ok(t) => Some(t),
+    }
+}
+
+fn subtype<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    pre_lhs: Type,
+    pre_rhs: Type,
+) -> Type {
+    match subtype_impl(context, loc, msg, pre_lhs, pre_rhs) {
+        Err(rhs) => rhs,
+        Ok(t) => t,
+    }
+}
+
+fn join_opt<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    pre_t1: Type,
+    pre_t2: Type,
+) -> Option<Type> {
+    let subst = std::mem::replace(&mut context.subst, Subst::empty());
+    let t1 = core::ready_tvars(&subst, pre_t1);
+    let t2 = core::ready_tvars(&subst, pre_t2);
+    match core::join(subst.clone(), &t1, &t2) {
+        Err(e) => {
+            context.subst = subst;
+            let diag = typing_error(context, /* from_subtype */ false, loc, msg, e);
+            context.env.add_diag(diag);
+            None
+        }
+        Ok((next_subst, ty)) => {
+            context.subst = next_subst;
+            Some(ty)
+        }
+    }
+}
+
+fn join<T: ToString, F: FnOnce() -> T>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    pre_t1: Type,
+    pre_t2: Type,
+) -> Type {
+    match join_opt(context, loc, msg, pre_t1, pre_t2) {
+        None => context.error_type(loc),
+        Some(ty) => ty,
+    }
+}
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+enum SeqCase {
+    Seq(Loc, Box<T::Exp>),
+    Declare {
+        loc: Loc,
+        b: T::LValueList,
+    },
+    Bind {
+        loc: Loc,
+        b: T::LValueList,
+        e: Box<T::Exp>,
+    },
+}
+
+fn sequence(context: &mut Context, (use_funs, seq): N::Sequence) -> T::Sequence {
+    use N::SequenceItem_ as NS;
+    use T::SequenceItem_ as TS;
+
+    context.add_use_funs_scope(use_funs);
+    let mut work_queue = VecDeque::new();
+    let mut resulting_sequence = T::Sequence::new();
+
+    let len = seq.len();
+    for (idx, sp!(loc, ns_)) in seq.into_iter().enumerate() {
+        match ns_ {
+            NS::Seq(ne) => {
+                let e = exp_(context, ne);
+                // If it is not the last element
+                if idx < len - 1 {
+                    context.add_ability_constraint(
+                        loc,
+                        Some(format!(
+                            "Cannot ignore values without the '{}' ability. The value must be used",
+                            Ability_::Drop
+                        )),
+                        e.ty.clone(),
+                        Ability_::Drop,
+                    )
+                }
+                work_queue.push_front(SeqCase::Seq(loc, Box::new(e)));
+            }
+            NS::Declare(nbind, ty_opt) => {
+                let instantiated_ty_op = ty_opt.map(|t| core::instantiate(context, t));
+                let b = bind_list(context, nbind, instantiated_ty_op);
+                work_queue.push_front(SeqCase::Declare { loc, b });
+            }
+            NS::Bind(nbind, nr) => {
+                let e = exp_(context, nr);
+                let b = bind_list(context, nbind, Some(e.ty.clone()));
+                work_queue.push_front(SeqCase::Bind {
+                    loc,
+                    b,
+                    e: Box::new(e),
+                });
+            }
+        }
+    }
+
+    for case in work_queue {
+        match case {
+            SeqCase::Seq(loc, e) => resulting_sequence.push_front(sp(loc, TS::Seq(e))),
+            SeqCase::Declare { loc, b } => resulting_sequence.push_front(sp(loc, TS::Declare(b))),
+            SeqCase::Bind { loc, b, e } => {
+                let lvalue_ty = lvalues_expected_types(context, &b);
+                resulting_sequence.push_front(sp(loc, TS::Bind(b, lvalue_ty, e)))
+            }
+        }
+    }
+    context.pop_use_funs_scope();
+    resulting_sequence
+}
+
+fn sequence_type(seq: &T::Sequence) -> &Type {
+    use T::SequenceItem_ as TS;
+    match seq.back().unwrap() {
+        sp!(_, TS::Bind(_, _, _)) | sp!(_, TS::Declare(_)) => {
+            panic!("ICE unit should have been inserted past bind/decl")
+        }
+        sp!(_, TS::Seq(last_e)) => &last_e.ty,
+    }
+}
+
+fn exp_vec(context: &mut Context, es: Vec<N::Exp>) -> Vec<T::Exp> {
+    es.into_iter().map(|e| exp_(context, e)).collect()
+}
+
+fn exp(context: &mut Context, ne: Box<N::Exp>) -> Box<T::Exp> {
+    Box::new(exp_(context, *ne))
+}
+
+fn exp_(context: &mut Context, initial_ne: N::Exp) -> T::Exp {
+    use N::Exp_ as NE;
+    use T::UnannotatedExp_ as TE;
+    struct Stack<'a, 'env> {
+        frames: Vec<Box<dyn FnOnce(&mut Self)>>,
+        operands: Vec<T::Exp>,
+        context: &'a mut Context<'env>,
+    }
+    macro_rules! inner {
+        ($e:expr) => {{
+            move |s: &mut Stack| exp_loop(s, $e)
+        }};
+    }
+    fn exp_loop(stack: &mut Stack, sp!(loc, cur_): N::Exp) {
+        match cur_ {
+            NE::BinopExp(nlhs, bop, nrhs) => {
+                let f_lhs = inner!(*nlhs);
+                let f_rhs = inner!(*nrhs);
+                let f_binop = move |s: &mut Stack| {
+                    let er = Box::new(s.operands.pop().unwrap());
+                    let el = Box::new(s.operands.pop().unwrap());
+                    use BinOp_::*;
+                    let msg = || format!("Incompatible arguments to '{}'", &bop);
+                    let context = &mut s.context;
+                    let (ty, operand_ty) = match &bop.value {
+                        Sub | Add | Mul | Mod | Div => {
+                            context.add_numeric_constraint(
+                                el.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            context.add_numeric_constraint(
+                                er.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            let operand_ty =
+                                join(context, bop.loc, msg, el.ty.clone(), er.ty.clone());
+                            (operand_ty.clone(), operand_ty)
+                        }
+
+                        BitOr | BitAnd | Xor => {
+                            context.add_bits_constraint(
+                                el.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            context.add_bits_constraint(
+                                er.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            let operand_ty =
+                                join(context, bop.loc, msg, el.ty.clone(), er.ty.clone());
+                            (operand_ty.clone(), operand_ty)
+                        }
+
+                        Shl | Shr => {
+                            let msg = || format!("Invalid argument to '{}'", &bop);
+                            let u8ty = Type_::u8(er.exp.loc);
+                            context.add_bits_constraint(
+                                el.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            subtype(context, er.exp.loc, msg, er.ty.clone(), u8ty);
+                            (el.ty.clone(), el.ty.clone())
+                        }
+
+                        Lt | Gt | Le | Ge => {
+                            context.add_ordered_constraint(
+                                el.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            context.add_ordered_constraint(
+                                er.exp.loc,
+                                bop.value.symbol(),
+                                el.ty.clone(),
+                            );
+                            let operand_ty =
+                                join(context, bop.loc, msg, el.ty.clone(), er.ty.clone());
+                            (Type_::bool(loc), operand_ty)
+                        }
+
+                        Eq | Neq => {
+                            let ability_msg = Some(format!(
+                                "'{}' requires the '{}' ability as the value is consumed. Try \
+                                 borrowing the values with '&' first.'",
+                                &bop,
+                                Ability_::Drop,
+                            ));
+                            context.add_ability_constraint(
+                                el.exp.loc,
+                                ability_msg.clone(),
+                                el.ty.clone(),
+                                Ability_::Drop,
+                            );
+                            context.add_ability_constraint(
+                                er.exp.loc,
+                                ability_msg,
+                                er.ty.clone(),
+                                Ability_::Drop,
+                            );
+                            let ty = join(context, bop.loc, msg, el.ty.clone(), er.ty.clone());
+                            context.add_single_type_constraint(loc, msg(), ty.clone());
+                            (Type_::bool(loc), ty)
+                        }
+
+                        And | Or => {
+                            let msg = || format!("Invalid argument to '{}'", &bop);
+                            let lloc = el.exp.loc;
+                            subtype(context, lloc, msg, el.ty.clone(), Type_::bool(bop.loc));
+                            let rloc = er.exp.loc;
+                            subtype(context, rloc, msg, er.ty.clone(), Type_::bool(bop.loc));
+                            (Type_::bool(loc), Type_::bool(loc))
+                        }
+
+                        Range | Implies | Iff => panic!("specification operator unexpected"),
+                    };
+                    let binop =
+                        T::exp(ty, sp(loc, TE::BinopExp(el, bop, Box::new(operand_ty), er)));
+                    s.operands.push(binop)
+                };
+
+                stack.frames.push(Box::new(f_binop));
+                stack.frames.push(Box::new(f_rhs));
+                stack.frames.push(Box::new(f_lhs));
+            }
+            cur_ => stack.operands.push(exp_inner(stack.context, sp(loc, cur_))),
+        }
+    }
+
+    let mut stack = Stack {
+        frames: vec![],
+        operands: vec![],
+        context,
+    };
+    exp_loop(&mut stack, initial_ne);
+    while let Some(f) = stack.frames.pop() {
+        f(&mut stack)
+    }
+    let e_res = stack.operands.pop().unwrap();
+    assert!(stack.frames.is_empty());
+    assert!(stack.operands.is_empty());
+    e_res
+}
+
+fn exp_inner(context: &mut Context, sp!(eloc, ne_): N::Exp) -> T::Exp {
+    use N::Exp_ as NE;
+    use T::UnannotatedExp_ as TE;
+    let (ty, e_) = match ne_ {
+        NE::Unit { trailing } => (sp(eloc, Type_::Unit), TE::Unit { trailing }),
+        NE::Value(sp!(vloc, Value_::InferredNum(v))) => (
+            core::make_num_tvar(context, eloc),
+            TE::Value(sp(vloc, Value_::InferredNum(v))),
+        ),
+        NE::Value(sp!(vloc, v)) => (v.type_(vloc).unwrap(), TE::Value(sp(vloc, v))),
+
+        NE::Constant(m, c) => {
+            let ty = core::make_constant_type(context, eloc, &m, &c);
+            if let Some(mident) = m {
+                context
+                    .used_module_members
+                    .entry(mident.value)
+                    .or_default()
+                    .insert(c.value());
+            }
+            (ty, TE::Constant(m, c))
+        }
+
+        NE::Move(var) => {
+            let ty = context.get_local_type(&var);
+            let from_user = true;
+            (ty, TE::Move { var, from_user })
+        }
+        NE::Copy(var) => {
+            let ty = context.get_local_type(&var);
+            context.add_ability_constraint(
+                eloc,
+                Some(format!(
+                    "Invalid 'copy' of owned value without the '{}' ability",
+                    Ability_::Copy
+                )),
+                ty.clone(),
+                Ability_::Copy,
+            );
+            let from_user = true;
+            (ty, TE::Copy { var, from_user })
+        }
+        NE::Use(var) => {
+            let ty = context.get_local_type(&var);
+            (ty, TE::Use(var))
+        }
+        NE::MethodCall(ndotted, f, ty_args_opt, sp!(argloc, nargs_)) => {
+            let (edotted, last_ty) = exp_dotted(context, None, ndotted);
+            let args = exp_vec(context, nargs_);
+            let ty_call_opt = method_call(
+                context,
+                eloc,
+                edotted,
+                last_ty,
+                f,
+                ty_args_opt,
+                argloc,
+                args,
+            );
+            match ty_call_opt {
+                None => {
+                    assert!(context.env.has_errors());
+                    (context.error_type(eloc), TE::UnresolvedError)
+                }
+                Some(ty_call) => ty_call,
+            }
+        }
+        NE::ModuleCall(m, f, ty_args_opt, sp!(argloc, nargs_)) => {
+            let args = exp_vec(context, nargs_);
+            module_call(context, eloc, m, f, ty_args_opt, argloc, args)
+        }
+        NE::Builtin(b, sp!(argloc, nargs_)) => {
+            let args = exp_vec(context, nargs_);
+            builtin_call(context, eloc, b, argloc, args)
+        }
+        NE::Vector(vec_loc, ty_opt, sp!(argloc, nargs_)) => {
+            let args_ = exp_vec(context, nargs_);
+            vector_pack(context, eloc, vec_loc, ty_opt, argloc, args_)
+        }
+
+        NE::IfElse(nb, nt, nf) => {
+            let eb = exp(context, nb);
+            let bloc = eb.exp.loc;
+            subtype(
+                context,
+                bloc,
+                || "Invalid if condition",
+                eb.ty.clone(),
+                Type_::bool(bloc),
+            );
+            let et = exp(context, nt);
+            let ef = exp(context, nf);
+            let ty = join(
+                context,
+                eloc,
+                || "Incompatible branches",
+                et.ty.clone(),
+                ef.ty.clone(),
+            );
+            (ty, TE::IfElse(eb, et, ef))
+        }
+        NE::While(nb, nloop) => {
+            let eb = exp(context, nb);
+            let bloc = eb.exp.loc;
+            subtype(
+                context,
+                bloc,
+                || "Invalid while condition",
+                eb.ty.clone(),
+                Type_::bool(bloc),
+            );
+            let (_has_break, ty, body) = loop_body(context, eloc, false, nloop);
+            (sp(eloc, ty.value), TE::While(eb, body))
+        }
+        NE::Loop(nloop) => {
+            let (has_break, ty, body) = loop_body(context, eloc, true, nloop);
+            let eloop = TE::Loop { has_break, body };
+            (sp(eloc, ty.value), eloop)
+        }
+        NE::Block(nseq) => {
+            let seq = sequence(context, nseq);
+            (sequence_type(&seq).clone(), TE::Block(seq))
+        }
+
+        NE::Assign(na, nr) => {
+            let er = exp(context, nr);
+            let a = assign_list(context, na, er.ty.clone());
+            let lvalue_ty = lvalues_expected_types(context, &a);
+            (sp(eloc, Type_::Unit), TE::Assign(a, lvalue_ty, er))
+        }
+
+        NE::Mutate(nl, nr) => {
+            let el = exp(context, nl);
+            let er = exp(context, nr);
+            check_mutation(context, el.exp.loc, el.ty.clone(), &er.ty);
+            (sp(eloc, Type_::Unit), TE::Mutate(el, er))
+        }
+
+        NE::FieldMutate(ndotted, nr) => {
+            let lhsloc = ndotted.loc;
+            let er = exp(context, nr);
+            let (edotted, _) = exp_dotted(context, Some("mutation"), ndotted);
+            let eborrow = exp_dotted_to_borrow(context, lhsloc, true, edotted);
+            check_mutation(context, eborrow.exp.loc, eborrow.ty.clone(), &er.ty);
+            (sp(eloc, Type_::Unit), TE::Mutate(Box::new(eborrow), er))
+        }
+
+        NE::Return(nret) => {
+            let eret = exp(context, nret);
+            let ret_ty = context.return_type.clone().unwrap();
+            subtype(context, eloc, || "Invalid return", eret.ty.clone(), ret_ty);
+            (sp(eloc, Type_::Anything), TE::Return(eret))
+        }
+        NE::Abort(ncode) => {
+            let ecode = exp(context, ncode);
+            let code_ty = Type_::u64(eloc);
+            subtype(context, eloc, || "Invalid abort", ecode.ty.clone(), code_ty);
+            (sp(eloc, Type_::Anything), TE::Abort(ecode))
+        }
+        NE::Break => {
+            if !context.in_loop() {
+                let msg = "Invalid usage of 'break'. 'break' can only be used inside a loop body";
+                context
+                    .env
+                    .add_diag(diag!(TypeSafety::InvalidLoopControl, (eloc, msg)))
+            }
+            let current_break_ty = sp(eloc, Type_::Unit);
+            let break_ty = match context.get_break_type() {
+                None => current_break_ty,
+                Some(t) => {
+                    let t = t.clone();
+                    join(context, eloc, || "Invalid break.", t, current_break_ty)
+                }
+            };
+            context.set_break_type(break_ty);
+            (sp(eloc, Type_::Anything), TE::Break)
+        }
+        NE::Continue => {
+            if !context.in_loop() {
+                let msg =
+                    "Invalid usage of 'continue'. 'continue' can only be used inside a loop body";
+                context
+                    .env
+                    .add_diag(diag!(TypeSafety::InvalidLoopControl, (eloc, msg)))
+            }
+            (sp(eloc, Type_::Anything), TE::Continue)
+        }
+
+        NE::Dereference(nref) => {
+            let eref = exp(context, nref);
+            let inner = core::make_tvar(context, eloc);
+            let ref_ty = sp(eloc, Type_::Ref(false, Box::new(inner.clone())));
+            subtype(
+                context,
+                eloc,
+                || "Invalid dereference.",
+                eref.ty.clone(),
+                ref_ty,
+            );
+            context.add_ability_constraint(
+                eloc,
+                Some(format!(
+                    "Invalid dereference. Dereference requires the '{}' ability",
+                    Ability_::Copy
+                )),
+                inner.clone(),
+                Ability_::Copy,
+            );
+            (inner, TE::Dereference(eref))
+        }
+        NE::UnaryExp(uop, nr) => {
+            use UnaryOp_::*;
+            let msg = || format!("Invalid argument to '{}'", &uop);
+            let er = exp(context, nr);
+            let ty = match &uop.value {
+                Not => {
+                    let rloc = er.exp.loc;
+                    subtype(context, rloc, msg, er.ty.clone(), Type_::bool(rloc));
+                    Type_::bool(eloc)
+                }
+            };
+            (ty, TE::UnaryExp(uop, er))
+        }
+
+        NE::ExpList(nes) => {
+            assert!(!nes.is_empty());
+            let es = exp_vec(context, nes);
+            let locs = es.iter().map(|e| e.exp.loc).collect();
+            let tvars = core::make_expr_list_tvars(
+                context,
+                eloc,
+                "Invalid expression list type argument",
+                locs,
+            );
+            for (e, tvar) in es.iter().zip(&tvars) {
+                join(
+                    context,
+                    e.exp.loc,
+                    || -> String { panic!("ICE failed tvar join") },
+                    e.ty.clone(),
+                    tvar.clone(),
+                );
+            }
+            let ty = Type_::multiple(eloc, tvars);
+            let items = es.into_iter().map(T::single_item).collect();
+            (ty, TE::ExpList(items))
+        }
+        NE::Pack(m, n, ty_args_opt, nfields) => {
+            let (bt, targs) = core::make_struct_type(context, eloc, &m, &n, ty_args_opt);
+            let typed_nfields =
+                add_field_types(context, eloc, "argument", &m, &n, targs.clone(), nfields);
+
+            let tfields = typed_nfields.map(|f, (idx, (fty, narg))| {
+                let arg = exp_(context, narg);
+                subtype(
+                    context,
+                    arg.exp.loc,
+                    || format!("Invalid argument for field '{}' for '{}::{}'", f, &m, &n),
+                    arg.ty.clone(),
+                    fty.clone(),
+                );
+                (idx, (fty, arg))
+            });
+            if !context.is_current_module(&m) {
+                let msg = format!(
+                    "Invalid instantiation of '{}::{}'.\nAll structs can only be constructed in \
+                     the module in which they are declared",
+                    &m, &n,
+                );
+                context
+                    .env
+                    .add_diag(diag!(TypeSafety::Visibility, (eloc, msg)));
+            }
+            (bt, TE::Pack(m, n, targs, tfields))
+        }
+
+        NE::Borrow(mut_, sp!(_, N::ExpDotted_::Exp(ner))) => {
+            let er = exp_(context, *ner);
+            context.add_base_type_constraint(eloc, "Invalid borrow", er.ty.clone());
+            let ty = sp(eloc, Type_::Ref(mut_, Box::new(er.ty.clone())));
+            let eborrow = match er.exp {
+                sp!(_, TE::Use(v)) => {
+                    if mut_ {
+                        check_mutability(context, eloc, "mutable borrow", &v);
+                    }
+                    TE::BorrowLocal(mut_, v)
+                }
+                erexp => TE::TempBorrow(mut_, Box::new(T::exp(er.ty, erexp))),
+            };
+            (ty, eborrow)
+        }
+
+        NE::Borrow(mut_, ndotted) => {
+            let (edotted, _) = exp_dotted(context, Some("borrow"), ndotted);
+            let eborrow = exp_dotted_to_borrow(context, eloc, mut_, edotted);
+            (eborrow.ty, eborrow.exp.value)
+        }
+
+        NE::DerefBorrow(ndotted) => {
+            assert!(!matches!(ndotted, sp!(_, N::ExpDotted_::Exp(_))));
+
+            let (edotted, inner_ty) = exp_dotted(context, Some("dot access"), ndotted);
+            let ederefborrow = exp_dotted_to_owned_value(context, eloc, edotted, inner_ty);
+            (ederefborrow.ty, ederefborrow.exp.value)
+        }
+
+        NE::Cast(nl, ty) => {
+            let el = exp(context, nl);
+            let tyloc = ty.loc;
+            let rhs = core::instantiate(context, ty);
+            context.add_numeric_constraint(el.exp.loc, "as", el.ty.clone());
+            context.add_numeric_constraint(tyloc, "as", rhs.clone());
+            (rhs.clone(), TE::Cast(el, Box::new(rhs)))
+        }
+
+        NE::Annotate(nl, ty_annot) => {
+            let el = exp(context, nl);
+            let annot_loc = ty_annot.loc;
+            let rhs = core::instantiate(context, ty_annot);
+            subtype(
+                context,
+                annot_loc,
+                || "Invalid type annotation",
+                el.ty.clone(),
+                rhs.clone(),
+            );
+            (rhs.clone(), TE::Annotate(el, Box::new(rhs)))
+        }
+        NE::Spec(u, used_locals) => {
+            let used_local_types = used_locals
+                .into_iter()
+                .map(|v| {
+                    let ty = context.get_local_type(&v);
+                    (v, ty)
+                })
+                .collect();
+            (sp(eloc, Type_::Unit), TE::Spec(u, used_local_types))
+        }
+        NE::UnresolvedError => {
+            assert!(context.env.has_errors());
+            (context.error_type(eloc), TE::UnresolvedError)
+        }
+
+        NE::BinopExp(..) => unreachable!(),
+    };
+    T::exp(ty, sp(eloc, e_))
+}
+
+fn loop_body(
+    context: &mut Context,
+    eloc: Loc,
+    is_loop: bool,
+    nloop: Box<N::Exp>,
+) -> (bool, Type, Box<T::Exp>) {
+    let old_loop_info = context.enter_loop();
+    let eloop = exp(context, nloop);
+    let break_type_opt = context.exit_loop(old_loop_info);
+
+    let lloc = eloop.exp.loc;
+    subtype(
+        context,
+        lloc,
+        || "Invalid loop body",
+        eloop.ty.clone(),
+        sp(lloc, Type_::Unit),
+    );
+    let has_break = break_type_opt.is_some();
+    let ty = if is_loop && !has_break {
+        core::make_tvar(context, lloc)
+    } else {
+        break_type_opt.unwrap_or_else(|| sp(eloc, Type_::Unit))
+    };
+    (has_break, ty, eloop)
+}
+
+//**************************************************************************************************
+// Locals and LValues
+//**************************************************************************************************
+
+fn lvalues_expected_types(
+    context: &mut Context,
+    sp!(_loc, bs_): &T::LValueList,
+) -> Vec<Option<N::Type>> {
+    bs_.iter()
+        .map(|b| lvalue_expected_types(context, b))
+        .collect()
+}
+
+fn lvalue_expected_types(_context: &mut Context, sp!(loc, b_): &T::LValue) -> Option<N::Type> {
+    use N::Type_::*;
+    use T::LValue_ as L;
+    let loc = *loc;
+    match b_ {
+        L::Ignore => None,
+        L::Var { ty, .. } => Some(*ty.clone()),
+        L::BorrowUnpack(mut_, m, s, tys, _) => {
+            let tn = sp(loc, N::TypeName_::ModuleType(*m, *s));
+            Some(sp(
+                loc,
+                Ref(*mut_, Box::new(sp(loc, Apply(None, tn, tys.clone())))),
+            ))
+        }
+        L::Unpack(m, s, tys, _) => {
+            let tn = sp(loc, N::TypeName_::ModuleType(*m, *s));
+            Some(sp(loc, Apply(None, tn, tys.clone())))
+        }
+    }
+}
+
+#[derive(Clone, Copy)]
+enum LValueCase {
+    Bind,
+    Assign,
+}
+
+fn bind_list(context: &mut Context, ls: N::LValueList, ty_opt: Option<Type>) -> T::LValueList {
+    lvalue_list(context, LValueCase::Bind, ls, ty_opt)
+}
+
+fn assign_list(context: &mut Context, ls: N::LValueList, rvalue_ty: Type) -> T::LValueList {
+    lvalue_list(context, LValueCase::Assign, ls, Some(rvalue_ty))
+}
+
+fn lvalue_list(
+    context: &mut Context,
+    case: LValueCase,
+    sp!(loc, nlvalues): N::LValueList,
+    ty_opt: Option<Type>,
+) -> T::LValueList {
+    use LValueCase as C;
+    let arity = nlvalues.len();
+    let locs = nlvalues.iter().map(|sp!(loc, _)| *loc).collect();
+    let msg = "Invalid type for local";
+    let ty_vars = core::make_expr_list_tvars(context, loc, msg, locs);
+    let var_ty = match arity {
+        0 => sp(loc, Type_::Unit),
+        1 => sp(loc, ty_vars[0].value.clone()),
+        _ => Type_::multiple(loc, ty_vars.clone()),
+    };
+    if let Some(ty) = ty_opt {
+        let result = subtype_opt(
+            context,
+            loc,
+            || {
+                format!(
+                    "Invalid value for {}",
+                    match case {
+                        C::Bind => "binding",
+                        C::Assign => "assignment",
+                    }
+                )
+            },
+            ty,
+            var_ty,
+        );
+        if result.is_none() {
+            for ty_var in ty_vars.clone() {
+                let ety = context.error_type(ty_var.loc);
+                join(
+                    context,
+                    loc,
+                    || -> String { panic!("ICE unresolved error join, failed") },
+                    ty_var,
+                    ety,
+                );
+            }
+        }
+    }
+    assert!(ty_vars.len() == nlvalues.len(), "ICE invalid lvalue tvars");
+    let tbinds = nlvalues
+        .into_iter()
+        .zip(ty_vars)
+        .map(|(l, t)| lvalue(context, case, l, t))
+        .collect();
+    sp(loc, tbinds)
+}
+
+fn lvalue(
+    context: &mut Context,
+    case: LValueCase,
+    sp!(loc, nl_): N::LValue,
+    ty: Type,
+) -> T::LValue {
+    use LValueCase as C;
+
+    use N::LValue_ as NL;
+    use T::LValue_ as TL;
+    let tl_ = match nl_ {
+        NL::Ignore => {
+            context.add_ability_constraint(
+                loc,
+                Some(format!(
+                    "Cannot ignore values without the '{}' ability. The value must be used",
+                    Ability_::Drop
+                )),
+                ty,
+                Ability_::Drop,
+            );
+            TL::Ignore
+        }
+        NL::Var {
+            mut_,
+            var,
+            unused_binding,
+        } => {
+            let var_ty = match case {
+                C::Bind => {
+                    context.declare_local(mut_, var, ty.clone());
+                    ty
+                }
+                C::Assign => {
+                    check_mutability(context, loc, "assignment", &var);
+                    let var_ty = context.get_local_type(&var);
+                    subtype(
+                        context,
+                        loc,
+                        || format!("Invalid assignment to variable '{}'", &var.value.name),
+                        ty,
+                        var_ty.clone(),
+                    );
+                    var_ty
+                }
+            };
+            TL::Var {
+                var,
+                ty: Box::new(var_ty),
+                unused_binding,
+            }
+        }
+        NL::Unpack(m, n, ty_args_opt, fields) => {
+            let (bt, targs) = core::make_struct_type(context, loc, &m, &n, ty_args_opt);
+            let (ref_mut, ty_inner) = match core::unfold_type(&context.subst, ty.clone()).value {
+                Type_::Ref(mut_, inner) => (Some(mut_), *inner),
+                _ => {
+                    // Do not need base constraint because of the join below
+                    (None, ty)
+                }
+            };
+            match case {
+                C::Bind => subtype(
+                    context,
+                    loc,
+                    || "Invalid deconstruction binding",
+                    bt,
+                    ty_inner,
+                ),
+                C::Assign => subtype(
+                    context,
+                    loc,
+                    || "Invalid deconstruction assignment",
+                    bt,
+                    ty_inner,
+                ),
+            };
+            let verb = match case {
+                C::Bind => "binding",
+                C::Assign => "assignment",
+            };
+            let typed_fields = add_field_types(context, loc, verb, &m, &n, targs.clone(), fields);
+            let tfields = typed_fields.map(|f, (idx, (fty, nl))| {
+                let nl_ty = match ref_mut {
+                    None => fty.clone(),
+                    Some(mut_) => sp(f.loc(), Type_::Ref(mut_, Box::new(fty.clone()))),
+                };
+                let tl = lvalue(context, case, nl, nl_ty);
+                (idx, (fty, tl))
+            });
+            if !context.is_current_module(&m) {
+                let msg = format!(
+                    "Invalid deconstruction {} of '{}::{}'.\n All structs can only be \
+                     deconstructed in the module in which they are declared",
+                    verb, &m, &n,
+                );
+                context
+                    .env
+                    .add_diag(diag!(TypeSafety::Visibility, (loc, msg)));
+            }
+            match ref_mut {
+                None => TL::Unpack(m, n, targs, tfields),
+                Some(mut_) => TL::BorrowUnpack(mut_, m, n, targs, tfields),
+            }
+        }
+    };
+    sp(loc, tl_)
+}
+
+fn check_mutation(context: &mut Context, loc: Loc, given_ref: Type, rvalue_ty: &Type) -> Type {
+    let inner = core::make_tvar(context, loc);
+    let ref_ty = sp(loc, Type_::Ref(true, Box::new(inner.clone())));
+    let res_ty = subtype(
+        context,
+        loc,
+        || "Invalid mutation. Expected a mutable reference",
+        given_ref,
+        ref_ty,
+    );
+    subtype(
+        context,
+        loc,
+        || "Invalid mutation. New value is not valid for the reference",
+        rvalue_ty.clone(),
+        inner.clone(),
+    );
+    context.add_ability_constraint(
+        loc,
+        Some(format!(
+            "Invalid mutation. Mutation requires the '{}' ability as the old value is destroyed",
+            Ability_::Drop
+        )),
+        inner,
+        Ability_::Drop,
+    );
+    res_ty
+}
+
+fn check_mutability(context: &mut Context, eloc: Loc, usage: &str, v: &N::Var) {
+    let (decl_loc, mut_) = context.mark_mutable_usage(eloc, v);
+    if mut_.is_none() {
+        let v = &v.value.name;
+        let usage_msg = format!("Invalid {usage} of immutable variable '{v}'");
+        let decl_msg =
+            format!("To use the variable mutably, it must be declared 'mut', e.g. 'mut {v}'");
+        context.env.add_diag(diag!(
+            TypeSafety::InvalidImmVariableUsage,
+            (eloc, usage_msg),
+            (decl_loc, decl_msg),
+        ))
+    }
+}
+
+//**************************************************************************************************
+// Fields
+//**************************************************************************************************
+
+fn resolve_field(context: &mut Context, loc: Loc, ty: Type, field: &Field) -> Type {
+    use TypeName_::*;
+    use Type_::*;
+    const UNINFERRED_MSG: &str =
+        "Could not infer the type before field access. Try annotating here";
+    let msg = || format!("Unbound field '{}'", field);
+    match core::ready_tvars(&context.subst, ty) {
+        sp!(_, UnresolvedError) => context.error_type(loc),
+        sp!(tloc, Anything) => {
+            context.env.add_diag(diag!(
+                TypeSafety::UninferredType,
+                (loc, msg()),
+                (tloc, UNINFERRED_MSG),
+            ));
+            context.error_type(loc)
+        }
+        sp!(tloc, Var(i)) if !context.subst.is_num_var(i) => {
+            context.env.add_diag(diag!(
+                TypeSafety::UninferredType,
+                (loc, msg()),
+                (tloc, UNINFERRED_MSG),
+            ));
+            context.error_type(loc)
+        }
+        sp!(_, Apply(_, sp!(_, ModuleType(m, n)), targs)) => {
+            if !context.is_current_module(&m) {
+                let msg = format!(
+                    "Invalid access of field '{}' on '{}::{}'. Fields can only be accessed inside \
+                     the struct's module",
+                    field, &m, &n
+                );
+                context
+                    .env
+                    .add_diag(diag!(TypeSafety::Visibility, (loc, msg)));
+            }
+            core::make_field_type(context, loc, &m, &n, targs, field)
+        }
+        t => {
+            let smsg = format!(
+                "Expected a struct type in the current module but got: {}",
+                core::error_format(&t, &context.subst)
+            );
+            context.env.add_diag(diag!(
+                TypeSafety::ExpectedSpecificType,
+                (loc, msg()),
+                (t.loc, smsg),
+            ));
+            context.error_type(loc)
+        }
+    }
+}
+
+fn add_field_types<T>(
+    context: &mut Context,
+    loc: Loc,
+    verb: &str,
+    m: &ModuleIdent,
+    n: &StructName,
+    targs: Vec<Type>,
+    fields: Fields<T>,
+) -> Fields<(Type, T)> {
+    let maybe_fields_ty = core::make_field_types(context, loc, m, n, targs);
+    let mut fields_ty = match maybe_fields_ty {
+        N::StructFields::Defined(m) => m,
+        N::StructFields::Native(nloc) => {
+            let msg = format!(
+                "Invalid {} usage for native struct '{}::{}'. Native structs cannot be directly \
+                 constructed/deconstructed, and their fields cannot be dirctly accessed",
+                verb, m, n
+            );
+            context.env.add_diag(diag!(
+                TypeSafety::InvalidNativeUsage,
+                (loc, msg),
+                (nloc, "Struct declared 'native' here")
+            ));
+            return fields.map(|f, (idx, x)| (idx, (context.error_type(f.loc()), x)));
+        }
+    };
+    for (_, f_, _) in &fields_ty {
+        if fields.get_(f_).is_none() {
+            let msg = format!("Missing {} for field '{}' in '{}::{}'", verb, f_, m, n);
+            context
+                .env
+                .add_diag(diag!(TypeSafety::TooFewArguments, (loc, msg)))
+        }
+    }
+    fields.map(|f, (idx, x)| {
+        let fty = match fields_ty.remove(&f) {
+            None => {
+                context.env.add_diag(diag!(
+                    NameResolution::UnboundField,
+                    (loc, format!("Unbound field '{}' in '{}::{}'", &f, m, n))
+                ));
+                context.error_type(f.loc())
+            }
+            Some((_, fty)) => fty,
+        };
+        (idx, (fty, x))
+    })
+}
+
+enum ExpDotted_ {
+    Exp(Box<T::Exp>),
+    TmpBorrow(Box<T::Exp>, Box<Type>),
+    Dot(Box<ExpDotted>, Field, Box<Type>),
+}
+type ExpDotted = Spanned<ExpDotted_>;
+
+// if constraint_verb is None, no single typeconstraint is applied
+fn exp_dotted(
+    context: &mut Context,
+    constraint_verb: Option<&str>,
+    sp!(dloc, ndot_): N::ExpDotted,
+) -> (ExpDotted, Type) {
+    use N::ExpDotted_ as NE;
+    let (edot_, ty) = match ndot_ {
+        NE::Exp(ne) => {
+            use Type_::*;
+            let e = exp(context, ne);
+            let ety = &e.ty;
+            let unfolded = core::unfold_type(&context.subst, ety.clone());
+            let (borrow_needed, ty) = match unfolded.value {
+                Ref(_, inner) => (false, *inner),
+                _ => (true, ety.clone()),
+            };
+            let edot_ = if borrow_needed {
+                if let Some(verb) = constraint_verb {
+                    context.add_single_type_constraint(
+                        dloc,
+                        format!("Invalid {}", verb),
+                        ty.clone(),
+                    );
+                }
+                ExpDotted_::TmpBorrow(e, Box::new(ty.clone()))
+            } else {
+                ExpDotted_::Exp(e)
+            };
+            (edot_, ty)
+        }
+        NE::Dot(nlhs, field) => {
+            let (lhs, inner) = exp_dotted(context, Some("dot access"), *nlhs);
+            let field_ty = resolve_field(context, dloc, inner, &field);
+            (
+                ExpDotted_::Dot(Box::new(lhs), field, Box::new(field_ty.clone())),
+                field_ty,
+            )
+        }
+    };
+    (sp(dloc, edot_), ty)
+}
+
+fn exp_dotted_to_borrow(
+    context: &mut Context,
+    loc: Loc,
+    mut_: bool,
+    sp!(dloc, dot_): ExpDotted,
+) -> T::Exp {
+    use Type_::*;
+    use T::UnannotatedExp_ as TE;
+    match dot_ {
+        ExpDotted_::Exp(e) => *e,
+        ExpDotted_::TmpBorrow(eb, desired_inner_ty) => {
+            let eb_ty = eb.ty;
+            let sp!(ebloc, eb_) = eb.exp;
+            let e_ = match eb_ {
+                TE::Use(v) => {
+                    if mut_ {
+                        check_mutability(context, loc, "mutable borrow", &v);
+                    }
+                    TE::BorrowLocal(mut_, v)
+                }
+                eb_ => {
+                    match &eb_ {
+                        TE::Move { from_user, .. } | TE::Copy { from_user, .. } => {
+                            assert!(*from_user)
+                        }
+                        _ => (),
+                    }
+                    TE::TempBorrow(mut_, Box::new(T::exp(eb_ty, sp(ebloc, eb_))))
+                }
+            };
+            let ty = sp(loc, Ref(mut_, desired_inner_ty));
+            T::exp(ty, sp(dloc, e_))
+        }
+        ExpDotted_::Dot(lhs, field, field_ty) => {
+            let lhs_borrow = exp_dotted_to_borrow(context, dloc, mut_, *lhs);
+            let sp!(tyloc, unfolded_) = core::unfold_type(&context.subst, lhs_borrow.ty.clone());
+            let lhs_mut = match unfolded_ {
+                Ref(lhs_mut, _) => lhs_mut,
+                _ => panic!(
+                    "ICE expected a ref from exp_dotted borrow, otherwise should have gotten a \
+                     TmpBorrow"
+                ),
+            };
+            // lhs is immutable and current borrow is mutable
+            if !lhs_mut && mut_ {
+                context.env.add_diag(diag!(
+                    ReferenceSafety::RefTrans,
+                    (loc, "Invalid mutable borrow from an immutable reference"),
+                    (tyloc, "Immutable because of this position"),
+                ))
+            }
+            let e_ = TE::Borrow(mut_, Box::new(lhs_borrow), field);
+            let ty = sp(loc, Ref(mut_, field_ty));
+            T::exp(ty, sp(dloc, e_))
+        }
+    }
+}
+
+fn exp_dotted_to_owned_value(
+    context: &mut Context,
+    eloc: Loc,
+    edot: ExpDotted,
+    inner_ty: Type,
+) -> T::Exp {
+    use T::UnannotatedExp_ as TE;
+    match edot {
+        // TODO investigate this nonsense
+        sp!(_, ExpDotted_::Exp(lhs)) | sp!(_, ExpDotted_::TmpBorrow(lhs, _)) => *lhs,
+        edot => {
+            let name = match &edot {
+                sp!(_, ExpDotted_::Exp(_)) | sp!(_, ExpDotted_::TmpBorrow(_, _)) => {
+                    panic!("ICE covered above")
+                }
+                sp!(_, ExpDotted_::Dot(_, name, _)) => *name,
+            };
+            let eborrow = exp_dotted_to_borrow(context, eloc, false, edot);
+            context.add_ability_constraint(
+                eloc,
+                Some(format!(
+                    "Invalid implicit copy of field '{}' without the '{}' ability",
+                    name,
+                    Ability_::COPY,
+                )),
+                inner_ty.clone(),
+                Ability_::Copy,
+            );
+            T::exp(inner_ty, sp(eloc, TE::Dereference(Box::new(eborrow))))
+        }
+    }
+}
+
+impl crate::shared::ast_debug::AstDebug for ExpDotted_ {
+    fn ast_debug(&self, w: &mut crate::shared::ast_debug::AstWriter) {
+        use ExpDotted_ as D;
+        match self {
+            D::Exp(e) => e.ast_debug(w),
+            D::TmpBorrow(e, ty) => {
+                w.write("&tmp ");
+                w.annotate(|w| e.ast_debug(w), ty)
+            }
+            D::Dot(e, n, ty) => {
+                e.ast_debug(w);
+                w.write(".");
+                w.annotate(|w| w.write(&format!("{}", n)), ty)
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Calls
+//**************************************************************************************************
+
+fn method_call(
+    context: &mut Context,
+    loc: Loc,
+    mut edotted: ExpDotted,
+    edotted_ty: Type,
+    method: Name,
+    ty_args_opt: Option<Vec<Type>>,
+    argloc: Loc,
+    mut args: Vec<T::Exp>,
+) -> Option<(Type, T::UnannotatedExp_)> {
+    use TypeName_ as TN;
+    use Type_ as Ty;
+    use T::UnannotatedExp_ as TE;
+    let edotted_ty_unfolded = core::unfold_type(&context.subst, edotted_ty.clone());
+    let edotted_bty = edotted_ty_base(&edotted_ty_unfolded);
+    let tn = match &edotted_bty.value {
+        Ty::Apply(_, tn @ sp!(_, TN::ModuleType(_, _) | TN::Builtin(_)), _) => tn,
+        t => {
+            let msg = match t {
+                Ty::Anything => {
+                    "Unable to infer type for method call. Try annotating this type".to_owned()
+                }
+                Ty::Unit | Ty::Apply(_, sp!(_, TN::Multiple(_)), _) => {
+                    let tsubst = core::error_format_(t, &context.subst);
+                    format!(
+                        "Method calls are only supported on single types. \
+                          Got an expression of type: {tsubst}",
+                    )
+                }
+                Ty::Param(_) => {
+                    let tsubst = core::error_format_(t, &context.subst);
+                    format!(
+                        "Method calls are not supported on type parameters. \
+                        Got an expression of type: {tsubst}",
+                    )
+                }
+                Ty::UnresolvedError => {
+                    assert!(context.env.has_errors());
+                    return None;
+                }
+                Ty::Ref(_, _) | Ty::Var(_) => panic!("ICE unfolding failed"),
+                Ty::Apply(_, _, _) => unreachable!(),
+            };
+            context.env.add_diag(diag!(
+                TypeSafety::InvalidMethodCall,
+                (loc, "Invalid method call"),
+                (edotted_ty.loc, msg),
+            ));
+            return None;
+        }
+    };
+    let (_defined_loc, m, f, targs, parameters, ret_ty) =
+        core::make_method_call_type(context, loc, &edotted_ty, tn, method, ty_args_opt)?;
+
+    let first_arg = match &parameters[0].1.value {
+        Ty::Ref(mut_, _) => {
+            // add a borrow if needed
+            let mut cur = &mut edotted;
+            loop {
+                match cur {
+                    sp!(loc, ExpDotted_::Exp(e)) => {
+                        let e_ty = e.ty.clone();
+                        match core::unfold_type(&context.subst, e_ty.clone()).value {
+                            Ty::Ref(_, _) => (),
+                            _ => *cur = sp(*loc, ExpDotted_::TmpBorrow(e.clone(), Box::new(e_ty))),
+                        };
+                        break;
+                    }
+                    sp!(_, ExpDotted_::TmpBorrow(_, _)) => break,
+                    sp!(_, ExpDotted_::Dot(l, _, _)) => cur = l,
+                };
+            }
+            exp_dotted_to_borrow(context, loc, *mut_, edotted)
+        }
+        _ => exp_dotted_to_owned_value(context, loc, edotted, edotted_ty),
+    };
+    args.insert(0, first_arg);
+    let call = module_call_impl(context, loc, m, f, targs, parameters, argloc, args);
+    Some((ret_ty, TE::ModuleCall(Box::new(call))))
+}
+
+fn edotted_ty_base(ty: &Type) -> &Type {
+    match &ty.value {
+        Type_::Unit
+        | Type_::Param(_)
+        | Type_::Anything
+        | Type_::UnresolvedError
+        | Type_::Apply(_, _, _) => ty,
+        Type_::Ref(_, inner) => inner,
+        Type_::Var(_) => panic!("ICE unfolding failed"),
+    }
+}
+
+fn module_call(
+    context: &mut Context,
+    loc: Loc,
+    m: ModuleIdent,
+    f: FunctionName,
+    ty_args_opt: Option<Vec<Type>>,
+    argloc: Loc,
+    args: Vec<T::Exp>,
+) -> (Type, T::UnannotatedExp_) {
+    let (_, ty_args, parameters, ret_ty) =
+        core::make_function_type(context, loc, &m, &f, ty_args_opt);
+    let call = module_call_impl(context, loc, m, f, ty_args, parameters, argloc, args);
+    (ret_ty, T::UnannotatedExp_::ModuleCall(Box::new(call)))
+}
+
+fn module_call_impl(
+    context: &mut Context,
+    loc: Loc,
+    m: ModuleIdent,
+    f: FunctionName,
+    ty_args: Vec<Type>,
+    parameters: Vec<(N::Var, Type)>,
+    argloc: Loc,
+    args: Vec<T::Exp>,
+) -> T::ModuleCall {
+    let (arguments, arg_tys) = call_args(
+        context,
+        loc,
+        || format!("Invalid call of '{}::{}'", &m, &f),
+        parameters.len(),
+        argloc,
+        args,
+    );
+    assert!(arg_tys.len() == parameters.len());
+    for (arg_ty, (param, param_ty)) in arg_tys.into_iter().zip(parameters.clone()) {
+        let msg = || {
+            format!(
+                "Invalid call of '{}::{}'. Invalid argument for parameter '{}'",
+                &m, &f, &param.value.name
+            )
+        };
+        subtype(context, loc, msg, arg_ty, param_ty);
+    }
+    let params_ty_list = parameters.into_iter().map(|(_, ty)| ty).collect();
+    let call = T::ModuleCall {
+        module: m,
+        name: f,
+        type_arguments: ty_args,
+        arguments,
+        parameter_types: params_ty_list,
+    };
+    context
+        .used_module_members
+        .entry(m.value)
+        .or_default()
+        .insert(f.value());
+    call
+}
+
+fn builtin_call(
+    context: &mut Context,
+    loc: Loc,
+    sp!(bloc, nb_): N::BuiltinFunction,
+    argloc: Loc,
+    args: Vec<T::Exp>,
+) -> (Type, T::UnannotatedExp_) {
+    use N::BuiltinFunction_ as NB;
+    use T::BuiltinFunction_ as TB;
+    let mut mk_ty_arg = |ty_arg_opt| match ty_arg_opt {
+        None => core::make_tvar(context, loc),
+        Some(ty_arg) => core::instantiate(context, ty_arg),
+    };
+    let (b_, params_ty, ret_ty);
+    match nb_ {
+        NB::Freeze(ty_arg_opt) => {
+            let ty_arg = mk_ty_arg(ty_arg_opt);
+            b_ = TB::Freeze(ty_arg.clone());
+            params_ty = vec![sp(bloc, Type_::Ref(true, Box::new(ty_arg.clone())))];
+            ret_ty = sp(loc, Type_::Ref(false, Box::new(ty_arg)));
+        }
+        NB::Assert(is_macro) => {
+            b_ = TB::Assert(is_macro);
+            params_ty = vec![Type_::bool(bloc), Type_::u64(bloc)];
+            ret_ty = sp(loc, Type_::Unit);
+        }
+    };
+    let (arguments, arg_tys) = call_args(
+        context,
+        loc,
+        || format!("Invalid call of '{}'", &b_),
+        params_ty.len(),
+        argloc,
+        args,
+    );
+    assert!(arg_tys.len() == params_ty.len());
+    for ((idx, arg_ty), param_ty) in arg_tys.into_iter().enumerate().zip(params_ty) {
+        let msg = || {
+            format!(
+                "Invalid call of '{}'. Invalid argument for parameter '{}'",
+                &b_, idx
+            )
+        };
+        subtype(context, loc, msg, arg_ty, param_ty);
+    }
+    let call = T::UnannotatedExp_::Builtin(Box::new(sp(bloc, b_)), arguments);
+    (ret_ty, call)
+}
+
+fn vector_pack(
+    context: &mut Context,
+    eloc: Loc,
+    vec_loc: Loc,
+    ty_arg_opt: Option<Type>,
+    argloc: Loc,
+    args_: Vec<T::Exp>,
+) -> (Type, T::UnannotatedExp_) {
+    let arity = args_.len();
+    let (eargs, args_ty) = call_args(
+        context,
+        eloc,
+        || -> String { panic!("ICE. could not create vector args") },
+        arity,
+        argloc,
+        args_,
+    );
+    let mut inferred_vec_ty_arg = core::make_tvar(context, eloc);
+    for arg_ty in args_ty {
+        // TODO this could be improved... A LOT
+        // this ends up generating a new tvar chain for each element in the vector
+        // which ends up being n^2 chains
+        inferred_vec_ty_arg = join(
+            context,
+            eloc,
+            || "Invalid 'vector' instantiation. Incompatible argument",
+            inferred_vec_ty_arg,
+            arg_ty,
+        );
+    }
+    let vec_ty_arg = match ty_arg_opt {
+        None => inferred_vec_ty_arg,
+        Some(ty_arg) => {
+            let ty_arg = core::instantiate(context, ty_arg);
+            subtype(
+                context,
+                eloc,
+                || "Invalid 'vector' instantiation. Invalid argument type",
+                inferred_vec_ty_arg,
+                ty_arg.clone(),
+            );
+            ty_arg
+        }
+    };
+    context.add_base_type_constraint(eloc, "Invalid 'vector' type", vec_ty_arg.clone());
+    let ty_vec = Type_::vector(eloc, vec_ty_arg.clone());
+    let e_ = T::UnannotatedExp_::Vector(vec_loc, arity, Box::new(vec_ty_arg), eargs);
+    (ty_vec, e_)
+}
+
+fn call_args<S: std::fmt::Display, F: Fn() -> S>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    arity: usize,
+    argloc: Loc,
+    mut args: Vec<T::Exp>,
+) -> (Box<T::Exp>, Vec<Type>) {
+    use T::UnannotatedExp_ as TE;
+    let tys = args.iter().map(|e| e.ty.clone()).collect();
+    let tys = make_arg_types(context, loc, msg, arity, argloc, tys);
+    let arg = match args.len() {
+        0 => T::exp(
+            sp(argloc, Type_::Unit),
+            sp(argloc, TE::Unit { trailing: false }),
+        ),
+        1 => args.pop().unwrap(),
+        _ => {
+            let ty = Type_::multiple(argloc, tys.clone());
+            let items = args.into_iter().map(T::single_item).collect();
+            T::exp(ty, sp(argloc, TE::ExpList(items)))
+        }
+    };
+    (Box::new(arg), tys)
+}
+
+fn make_arg_types<S: std::fmt::Display, F: Fn() -> S>(
+    context: &mut Context,
+    loc: Loc,
+    msg: F,
+    arity: usize,
+    argloc: Loc,
+    mut given: Vec<Type>,
+) -> Vec<Type> {
+    let given_len = given.len();
+    if given_len != arity {
+        let code = if given_len < arity {
+            TypeSafety::TooFewArguments
+        } else {
+            TypeSafety::TooManyArguments
+        };
+        let cmsg = format!(
+            "{}. The call expected {} argument(s) but got {}",
+            msg(),
+            arity,
+            given_len
+        );
+        context.env.add_diag(diag!(
+            code,
+            (loc, cmsg),
+            (argloc, format!("Found {} argument(s) here", given_len)),
+        ));
+    }
+    while given.len() < arity {
+        given.push(context.error_type(argloc))
+    }
+    while given.len() > arity {
+        given.pop();
+    }
+    given
+}
+
+//**************************************************************************************************
+// Utils
+//**************************************************************************************************
+
+fn process_attributes(context: &mut Context, all_attributes: &Attributes) {
+    for (_, _, attr) in all_attributes {
+        match &attr.value {
+            Attribute_::Name(_) => (),
+            Attribute_::Parameterized(_, attrs) => process_attributes(context, attrs),
+            Attribute_::Assigned(_, val) => {
+                let AttributeValue_::ModuleAccess(mod_access) = &val.value else {
+                    continue;
+                };
+                if let ModuleAccess_::ModuleAccess(mident, name) = mod_access.value {
+                    // conservatively assume that each `ModuleAccess` refers to a constant name
+                    context
+                        .used_module_members
+                        .entry(mident.value)
+                        .or_default()
+                        .insert(name.value);
+                }
+            }
+        }
+    }
+}
+
+//**************************************************************************************************
+// Follow-up warnings
+//**************************************************************************************************
+
+/// Generates warnings for unused mut declerations
+/// Should be called at the end of functions/constants
+fn unused_let_muts(context: &mut Context) {
+    let locals = context.take_locals();
+    let supports_let_mut = context
+        .env
+        .supports_feature(context.current_package, FeatureGate::LetMut);
+    if !supports_let_mut {
+        return;
+    }
+    for (v, local) in locals {
+        let Local { mut_, used_mut, .. } = local;
+        let Some(mut_loc) = mut_ else { continue };
+        if used_mut.is_none() {
+            let decl_msg = format!("The variable '{}' is never used mutably", v.value.name);
+            let mut_msg = "Consider removing the 'mut' declaration here";
+            context.env.add_diag(diag!(
+                UnusedItem::MutModifier,
+                (v.loc, decl_msg),
+                (mut_loc, mut_msg)
+            ))
+        }
+    }
+}
+
+/// Generates warnings for unused (private) functions and unused constants.
+/// Should be called after the whole program has been processed.
+fn unused_module_members(context: &mut Context, mident: &ModuleIdent_, mdef: &T::ModuleDefinition) {
+    if !mdef.is_source_module {
+        // generate warnings only for modules compiled in this pass rather than for all modules
+        // including pre-compiled libraries for which we do not have source code available and
+        // cannot be analyzed in this pass
+        return;
+    }
+
+    let is_sui_mode = context.env.package_config(mdef.package_name).flavor == Flavor::Sui;
+    context
+        .env
+        .add_warning_filter_scope(mdef.warning_filter.clone());
+
+    for (loc, name, c) in &mdef.constants {
+        context
+            .env
+            .add_warning_filter_scope(c.warning_filter.clone());
+
+        let members = context.used_module_members.get(mident);
+        if members.is_none() || !members.unwrap().contains(name) {
+            let msg = format!("The constant '{name}' is never used. Consider removing it.");
+            context
+                .env
+                .add_diag(diag!(UnusedItem::Constant, (loc, msg)))
+        }
+
+        context.env.pop_warning_filter_scope();
+    }
+
+    for (loc, name, fun) in &mdef.functions {
+        if fun.attributes.iter().any(|(_, n, _)| {
+            n == &AttributeName_::Known(KnownAttribute::Testing(TestingAttribute::Test))
+        }) {
+            // functions with #[test] attribute are implicitly used
+            continue;
+        }
+        if is_sui_mode && *name == sui_mode::INIT_FUNCTION_NAME {
+            // a Sui-specific filter to avoid signaling that the init function is unused
+            continue;
+        }
+        context
+            .env
+            .add_warning_filter_scope(fun.warning_filter.clone());
+
+        let members = context.used_module_members.get(mident);
+        if fun.entry.is_none()
+            && matches!(fun.visibility, Visibility::Internal)
+            && (members.is_none() || !members.unwrap().contains(name))
+        {
+            // TODO: postponing handling of friend functions until we decide what to do with them
+            // vis-a-vis ideas around package-private
+            let msg = format!(
+                "The non-'public', non-'entry' function '{name}' is never called. \
+                Consider removing it."
+            );
+            context
+                .env
+                .add_diag(diag!(UnusedItem::Function, (loc, msg)))
+        }
+        context.env.pop_warning_filter_scope();
+    }
+
+    context.env.pop_warning_filter_scope();
+}
diff --git a/vendors/move/crates/move-compiler/src/typing/visitor.rs b/vendors/move/crates/move-compiler/src/typing/visitor.rs
new file mode 100644
index 000000000..f0dbd0898
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/typing/visitor.rs
@@ -0,0 +1,218 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::command_line::compiler::Visitor;
+use crate::diagnostics::WarningFilters;
+use crate::expansion::ast::ModuleIdent;
+use crate::parser::ast::FunctionName;
+use crate::shared::{program_info::TypingProgramInfo, CompilationEnv};
+use crate::typing::ast as T;
+use move_symbol_pool::Symbol;
+
+pub type TypingVisitorObj = Box<dyn TypingVisitor>;
+
+pub trait TypingVisitor {
+    fn visit(
+        &mut self,
+        env: &mut CompilationEnv,
+        program_info: &TypingProgramInfo,
+        program: &mut T::Program_,
+    );
+
+    fn visitor(self) -> Visitor
+    where
+        Self: 'static + Sized,
+    {
+        Visitor::TypingVisitor(Box::new(self))
+    }
+}
+
+pub trait TypingVisitorConstructor {
+    type Context<'a>: Sized + TypingVisitorContext;
+
+    fn context<'a>(
+        env: &'a mut CompilationEnv,
+        program_info: &'a TypingProgramInfo,
+        program: &T::Program_,
+    ) -> Self::Context<'a>;
+
+    fn visit(
+        &mut self,
+        env: &mut CompilationEnv,
+        program_info: &TypingProgramInfo,
+        program: &mut T::Program_,
+    ) {
+        let mut context = Self::context(env, program_info, program);
+        context.visit(program);
+    }
+}
+
+pub trait TypingVisitorContext {
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters);
+    fn pop_warning_filter_scope(&mut self);
+
+    fn visit_module_custom(
+        &mut self,
+        _ident: ModuleIdent,
+        _mdef: &mut T::ModuleDefinition,
+    ) -> bool {
+        false
+    }
+    fn visit_script_custom(&mut self, _name: Symbol, _script: &mut T::Script) -> bool {
+        false
+    }
+
+    /// By default, the visitor will visit all all expressions in all functions in all modules. A
+    /// custom version should of this function should be created if different type of analysis is
+    /// required.
+    fn visit(&mut self, program: &mut T::Program_) {
+        for (mident, mdef) in program.modules.key_cloned_iter_mut() {
+            self.add_warning_filter_scope(mdef.warning_filter.clone());
+            if self.visit_module_custom(mident, mdef) {
+                self.pop_warning_filter_scope();
+                continue;
+            }
+
+            for (function_name, fdef) in mdef.functions.key_cloned_iter_mut() {
+                self.visit_function(Some(mident), function_name, fdef)
+            }
+
+            self.pop_warning_filter_scope();
+        }
+        for (name, script) in &mut program.scripts {
+            self.add_warning_filter_scope(script.warning_filter.clone());
+            if self.visit_script_custom(*name, script) {
+                self.pop_warning_filter_scope();
+                continue;
+            }
+
+            self.visit_function(None, script.function_name, &mut script.function);
+            self.pop_warning_filter_scope();
+        }
+    }
+
+    fn visit_function_custom(
+        &mut self,
+        _module: Option<ModuleIdent>,
+        _function_name: FunctionName,
+        _fdef: &mut T::Function,
+    ) -> bool {
+        false
+    }
+    fn visit_function(
+        &mut self,
+        module: Option<ModuleIdent>,
+        function_name: FunctionName,
+        fdef: &mut T::Function,
+    ) {
+        self.add_warning_filter_scope(fdef.warning_filter.clone());
+        if self.visit_function_custom(module, function_name, fdef) {
+            self.pop_warning_filter_scope();
+            return;
+        }
+        if let T::FunctionBody_::Defined(seq) = &mut fdef.body.value {
+            self.visit_seq(seq);
+        }
+        self.pop_warning_filter_scope();
+    }
+
+    fn visit_seq(&mut self, seq: &mut T::Sequence) {
+        for s in seq {
+            self.visit_seq_item(s);
+        }
+    }
+
+    fn visit_seq_item(&mut self, sp!(_, seq_item): &mut T::SequenceItem) {
+        use T::SequenceItem_ as SI;
+        match seq_item {
+            SI::Seq(e) => self.visit_exp(e),
+            SI::Declare(_) => (),
+            SI::Bind(_, _, e) => self.visit_exp(e),
+        }
+    }
+
+    /// Custom visit for an expression. It will skip `visit_exp` if `visit_exp_custom` returns true.
+    fn visit_exp_custom(&mut self, _exp: &mut T::Exp) -> bool {
+        false
+    }
+
+    fn visit_exp(&mut self, exp: &mut T::Exp) {
+        use T::UnannotatedExp_ as E;
+        if self.visit_exp_custom(exp) {
+            return;
+        }
+        let sp!(_, uexp) = &mut exp.exp;
+        match uexp {
+            E::ModuleCall(c) => self.visit_exp(&mut c.arguments),
+            E::Builtin(_, e) => self.visit_exp(e),
+            E::Vector(_, _, _, e) => self.visit_exp(e),
+            E::IfElse(e1, e2, e3) => {
+                self.visit_exp(e1);
+                self.visit_exp(e2);
+                self.visit_exp(e3);
+            }
+            E::While(e1, e2) => {
+                self.visit_exp(e1);
+                self.visit_exp(e2);
+            }
+            E::Loop { has_break: _, body } => self.visit_exp(body),
+            E::Block(seq) => self.visit_seq(seq),
+            E::Assign(_, _, e) => self.visit_exp(e),
+            E::Mutate(e1, e2) => {
+                self.visit_exp(e1);
+                self.visit_exp(e2);
+            }
+            E::Return(e) => self.visit_exp(e),
+            E::Abort(e) => self.visit_exp(e),
+            E::Dereference(e) => self.visit_exp(e),
+            E::UnaryExp(_, e) => self.visit_exp(e),
+            E::BinopExp(e1, _, _, e2) => {
+                self.visit_exp(e1);
+                self.visit_exp(e2);
+            }
+            E::Pack(_, _, _, fields) => fields
+                .iter_mut()
+                .for_each(|(_, _, (_, (_, e)))| self.visit_exp(e)),
+            E::ExpList(list) => {
+                for l in list {
+                    match l {
+                        T::ExpListItem::Single(e, _) => self.visit_exp(e),
+                        T::ExpListItem::Splat(_, e, _) => self.visit_exp(e),
+                    }
+                }
+            }
+            E::Borrow(_, e, _) => self.visit_exp(e),
+            E::TempBorrow(_, e) => self.visit_exp(e),
+            E::Cast(e, _) => self.visit_exp(e),
+            E::Annotate(e, _) => self.visit_exp(e),
+            E::Unit { .. }
+            | E::Value(_)
+            | E::Move { .. }
+            | E::Copy { .. }
+            | E::Use(_)
+            | E::Constant(..)
+            | E::Break
+            | E::Continue
+            | E::BorrowLocal(..)
+            | E::Spec(..)
+            | E::UnresolvedError => (),
+        }
+    }
+}
+
+impl<V: TypingVisitor + 'static> From<V> for TypingVisitorObj {
+    fn from(value: V) -> Self {
+        Box::new(value)
+    }
+}
+
+impl<V: TypingVisitorConstructor> TypingVisitor for V {
+    fn visit(
+        &mut self,
+        env: &mut CompilationEnv,
+        program_info: &TypingProgramInfo,
+        program: &mut T::Program_,
+    ) {
+        self.visit(env, program_info, program)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/unit_test/filter_test_members.rs b/vendors/move/crates/move-compiler/src/unit_test/filter_test_members.rs
new file mode 100644
index 000000000..7b582698b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/unit_test/filter_test_members.rs
@@ -0,0 +1,249 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::{sp, Loc};
+use move_symbol_pool::Symbol;
+
+use crate::{
+    diag,
+    diagnostics::Diagnostics,
+    parser::{
+        ast as P,
+        filter::{filter_program, FilterContext},
+    },
+    shared::{known_attributes, CompilationEnv},
+};
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+}
+
+impl<'env> Context<'env> {
+    fn new(compilation_env: &'env mut CompilationEnv) -> Self {
+        Self {
+            env: compilation_env,
+        }
+    }
+}
+
+impl FilterContext for Context<'_> {
+    fn should_remove_by_attributes(
+        &mut self,
+        attrs: &[P::Attributes],
+        is_source_def: bool,
+    ) -> bool {
+        should_remove_node(self.env, attrs, is_source_def)
+    }
+
+    fn filter_map_module(
+        &mut self,
+        mut module_def: P::ModuleDefinition,
+        is_source_def: bool,
+    ) -> Option<P::ModuleDefinition> {
+        if self.should_remove_by_attributes(&module_def.attributes, is_source_def) {
+            return None;
+        }
+
+        // instrument the test poison
+        if !self.env.flags().is_testing() {
+            return Some(module_def);
+        }
+
+        let poison_function = create_test_poison(module_def.loc);
+        module_def.members.push(poison_function);
+        Some(module_def)
+    }
+
+    fn filter_map_script(
+        &mut self,
+        script_def: P::Script,
+        _is_source_def: bool,
+    ) -> Option<P::Script> {
+        // extra sanity check on scripts
+        let P::Script {
+            attributes,
+            uses,
+            constants,
+            function,
+            specs,
+            loc: _,
+        } = &script_def;
+
+        let script_attributes = attributes
+            .iter()
+            .chain(uses.iter().flat_map(|use_decl| &use_decl.attributes))
+            .chain(constants.iter().flat_map(|constant| &constant.attributes))
+            .chain(function.attributes.iter())
+            .chain(specs.iter().flat_map(|spec| &spec.value.attributes));
+
+        let diags: Diagnostics = script_attributes
+            .flat_map(|attr| {
+                test_attributes(attr).into_iter().map(|(loc, _)| {
+                    let msg = "Testing attributes are not allowed in scripts.";
+                    diag!(Attributes::InvalidTest, (loc, msg))
+                })
+            })
+            .collect();
+
+        // filter the script based on whether there are error messages
+        if diags.is_empty() {
+            Some(script_def)
+        } else {
+            self.env.add_diags(diags);
+            None
+        }
+    }
+}
+
+//***************************************************************************
+// Filtering of test-annotated module members
+//***************************************************************************
+
+const UNIT_TEST_MODULE_NAME: Symbol = symbol!("unit_test");
+const STDLIB_ADDRESS_NAME: Symbol = symbol!("std");
+
+// This filters out all test, and test-only annotated module member from `prog` if the `test` flag
+// in `compilation_env` is not set. If the test flag is set, no filtering is performed, and instead
+// a test plan is created for use by the testing framework.
+pub fn program(compilation_env: &mut CompilationEnv, prog: P::Program) -> P::Program {
+    if !check_has_unit_test_module(compilation_env, &prog) {
+        return prog;
+    }
+
+    // filter and instrument the parsed AST
+    let mut context = Context::new(compilation_env);
+    filter_program(&mut context, prog)
+}
+
+fn check_has_unit_test_module(compilation_env: &mut CompilationEnv, prog: &P::Program) -> bool {
+    let has_unit_test_module = prog
+        .lib_definitions
+        .iter()
+        .chain(prog.source_definitions.iter())
+        .any(|pkg| match &pkg.def {
+            P::Definition::Module(mdef) => {
+                mdef.name.0.value == UNIT_TEST_MODULE_NAME
+                    && mdef.address.is_some()
+                    && match &mdef.address.as_ref().unwrap().value {
+                        // TODO: remove once named addresses have landed in the stdlib
+                        P::LeadingNameAccess_::Name(name) => name.value == STDLIB_ADDRESS_NAME,
+                        P::LeadingNameAccess_::AnonymousAddress(_) => false,
+                    }
+            }
+            _ => false,
+        });
+
+    if !has_unit_test_module && compilation_env.flags().is_testing() {
+        if let Some(P::PackageDefinition { def, .. }) = prog
+            .source_definitions
+            .iter()
+            .chain(prog.lib_definitions.iter())
+            .next()
+        {
+            let loc = match def {
+                P::Definition::Module(P::ModuleDefinition { name, .. }) => name.0.loc,
+                P::Definition::Address(P::AddressDefinition { loc, .. })
+                | P::Definition::Script(P::Script { loc, .. }) => *loc,
+            };
+            compilation_env.add_diag(diag!(
+                Attributes::InvalidTest,
+                (
+                    loc,
+                    "Compilation in test mode requires passing the UnitTest module in the Move \
+                     stdlib as a dependency",
+                )
+            ));
+            return false;
+        }
+    }
+
+    true
+}
+
+/// If a module is being compiled in test mode, create a dummy function that calls a native
+/// function `0x1::UnitTest::create_signers_for_testing` that only exists if the VM is being run
+/// with the "unit_test" feature flag set. This will then cause the module to fail to link if
+/// an attempt is made to publish a module that has been compiled in test mode on a VM that is not
+/// running in test mode.
+fn create_test_poison(mloc: Loc) -> P::ModuleMember {
+    let signature = P::FunctionSignature {
+        type_parameters: vec![],
+        parameters: vec![],
+        return_type: sp(mloc, P::Type_::Unit),
+    };
+
+    let leading_name_access = sp(
+        mloc,
+        P::LeadingNameAccess_::Name(sp(mloc, STDLIB_ADDRESS_NAME)),
+    );
+
+    let mod_name = sp(mloc, UNIT_TEST_MODULE_NAME);
+    let mod_addr_name = sp(mloc, (leading_name_access, mod_name));
+    let fn_name = sp(mloc, "create_signers_for_testing".into());
+    let args_ = vec![sp(
+        mloc,
+        P::Exp_::Value(sp(mloc, P::Value_::Num("0".into()))),
+    )];
+    let nop_call = P::Exp_::Call(
+        sp(mloc, P::NameAccessChain_::Three(mod_addr_name, fn_name)),
+        false,
+        None,
+        sp(mloc, args_),
+    );
+
+    // fun unit_test_poison() { 0x1::UnitTest::create_signers_for_testing(0); () }
+    P::ModuleMember::Function(P::Function {
+        attributes: vec![],
+        loc: mloc,
+        visibility: P::Visibility::Internal,
+        entry: Some(mloc), // it's a bit of a hack to avoid treating this function as unused
+        signature,
+        name: P::FunctionName(sp(mloc, "unit_test_poison".into())),
+        body: sp(
+            mloc,
+            P::FunctionBody_::Defined((
+                vec![],
+                vec![sp(
+                    mloc,
+                    P::SequenceItem_::Seq(Box::new(sp(mloc, nop_call))),
+                )],
+                None,
+                Box::new(Some(sp(mloc, P::Exp_::Unit))),
+            )),
+        ),
+    })
+}
+
+// A module member should be removed if:
+// * It is annotated as a test function (test_only, test, abort) and test mode is not set; or
+// * If it is a library and is annotated as #[test]
+fn should_remove_node(env: &CompilationEnv, attrs: &[P::Attributes], is_source_def: bool) -> bool {
+    use known_attributes::TestingAttribute;
+    let flattened_attrs: Vec<_> = attrs.iter().flat_map(test_attributes).collect();
+    let is_test_only = flattened_attrs
+        .iter()
+        .any(|attr| matches!(attr.1, TestingAttribute::Test | TestingAttribute::TestOnly));
+    is_test_only && !env.flags().keep_testing_functions()
+        || (!is_source_def
+            && flattened_attrs
+                .iter()
+                .any(|attr| attr.1 == TestingAttribute::Test))
+}
+
+fn test_attributes(attrs: &P::Attributes) -> Vec<(Loc, known_attributes::TestingAttribute)> {
+    use known_attributes::KnownAttribute;
+    attrs
+        .value
+        .iter()
+        .filter_map(
+            |attr| match KnownAttribute::resolve(attr.value.attribute_name().value)? {
+                KnownAttribute::Testing(test_attr) => Some((attr.loc, test_attr)),
+                KnownAttribute::Verification(_)
+                | KnownAttribute::Native(_)
+                | KnownAttribute::Diagnostic(_)
+                | KnownAttribute::DefinesPrimitive(_) => None,
+            },
+        )
+        .collect()
+}
diff --git a/vendors/move/crates/move-compiler/src/unit_test/mod.rs b/vendors/move/crates/move-compiler/src/unit_test/mod.rs
new file mode 100644
index 000000000..252dde72e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/unit_test/mod.rs
@@ -0,0 +1,159 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compiled_unit::{AnnotatedCompiledUnit, NamedCompiledModule},
+    diagnostics::FilesSourceText,
+    shared::NumericalAddress,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    runtime_value::MoveValue, vm_status::StatusCode,
+};
+use std::{collections::BTreeMap, fmt};
+
+pub mod filter_test_members;
+pub mod plan_builder;
+
+pub type TestName = String;
+
+#[derive(Debug, Clone)]
+pub struct TestPlan {
+    pub files: FilesSourceText,
+    pub module_tests: BTreeMap<ModuleId, ModuleTestPlan>,
+    pub module_info: BTreeMap<ModuleId, NamedCompiledModule>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ModuleTestPlan {
+    pub module_id: ModuleId,
+    pub tests: BTreeMap<TestName, TestCase>,
+}
+
+#[derive(Debug, Clone)]
+pub struct TestCase {
+    pub test_name: TestName,
+    pub arguments: Vec<MoveValue>,
+    pub expected_failure: Option<ExpectedFailure>,
+}
+
+#[derive(Debug, Clone)]
+pub enum ExpectedFailure {
+    // expected failure, but codes are not checked
+    Expected,
+    // expected failure, abort code checked but without the module specified
+    ExpectedWithCodeDEPRECATED(u64),
+    // expected failure, abort code with the module specified
+    ExpectedWithError(ExpectedMoveError),
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct ExpectedMoveError(
+    pub StatusCode,
+    pub Option<u64>,
+    pub move_binary_format::errors::Location,
+);
+
+pub struct ExpectedMoveErrorDisplay<'a> {
+    error: &'a ExpectedMoveError,
+    is_past_tense: bool,
+}
+
+impl ModuleTestPlan {
+    pub fn new(
+        addr: &NumericalAddress,
+        module_name: &str,
+        tests: BTreeMap<TestName, TestCase>,
+    ) -> Self {
+        let addr = AccountAddress::new((*addr).into_bytes());
+        let name = Identifier::new(module_name.to_owned()).unwrap();
+        let module_id = ModuleId::new(addr, name);
+        ModuleTestPlan { module_id, tests }
+    }
+}
+
+impl TestPlan {
+    pub fn new(
+        tests: Vec<ModuleTestPlan>,
+        files: FilesSourceText,
+        units: Vec<AnnotatedCompiledUnit>,
+    ) -> Self {
+        let module_tests: BTreeMap<_, _> = tests
+            .into_iter()
+            .map(|module_test| (module_test.module_id.clone(), module_test))
+            .collect();
+
+        let module_info = units
+            .into_iter()
+            .filter_map(|unit| {
+                if let AnnotatedCompiledUnit::Module(annot_module) = unit {
+                    Some((
+                        annot_module.named_module.module.self_id(),
+                        annot_module.named_module,
+                    ))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        Self {
+            files,
+            module_tests,
+            module_info,
+        }
+    }
+}
+
+impl ExpectedMoveError {
+    pub fn verbiage(&self, is_past_tense: bool) -> ExpectedMoveErrorDisplay {
+        ExpectedMoveErrorDisplay {
+            error: self,
+            is_past_tense,
+        }
+    }
+}
+
+impl<'a> fmt::Display for ExpectedMoveErrorDisplay<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use move_binary_format::errors::Location;
+        let Self {
+            error: ExpectedMoveError(status, sub_status, location),
+            is_past_tense,
+        } = self;
+        let status_val: u64 = (*status).into();
+        if *is_past_tense {
+            match status {
+                StatusCode::ABORTED => write!(f, "aborted")?,
+                StatusCode::ARITHMETIC_ERROR => write!(f, "gave an arithmetic error")?,
+                StatusCode::VECTOR_OPERATION_ERROR => write!(f, "gave a vector operation error")?,
+                StatusCode::OUT_OF_GAS => write!(f, "ran out of gas")?,
+                _ => write!(f, "gave a {status:?} (code {status_val}) error")?,
+            };
+        } else {
+            match status {
+                StatusCode::ABORTED => write!(f, "to abort")?,
+                StatusCode::ARITHMETIC_ERROR => write!(f, "to give an arithmetic error")?,
+                StatusCode::VECTOR_OPERATION_ERROR => {
+                    write!(f, "to give a vector operation error")?
+                }
+                StatusCode::OUT_OF_GAS => write!(f, "to run out of gas")?,
+                _ => write!(f, "to give a {status:?} (code {status_val}) error")?,
+            };
+        }
+        if status == &StatusCode::ABORTED {
+            write!(f, " with code {}", sub_status.unwrap())?
+        } else if let Some(code) = sub_status {
+            write!(f, " with sub-status {code}")?
+        };
+        if status != &StatusCode::OUT_OF_GAS {
+            write!(f, " originating")?;
+        }
+        match location {
+            Location::Undefined => write!(f, " in an unknown location"),
+            Location::Script => write!(f, " in the script"),
+            Location::Module(id) => write!(f, " in the module {id}"),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/src/unit_test/plan_builder.rs b/vendors/move/crates/move-compiler/src/unit_test/plan_builder.rs
new file mode 100644
index 000000000..eefe4ea8c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/unit_test/plan_builder.rs
@@ -0,0 +1,705 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    cfgir::ast as G,
+    diag,
+    expansion::ast::{
+        self as E, Address, Attribute, AttributeValue, ModuleAccess_, ModuleIdent, ModuleIdent_,
+    },
+    hlir::translate::display_var,
+    parser::ast::ConstantName,
+    shared::{
+        known_attributes::{KnownAttribute, TestingAttribute},
+        unique_map::UniqueMap,
+        CompilationEnv, Identifier, NumericalAddress,
+    },
+    unit_test::{ExpectedFailure, ExpectedMoveError, ModuleTestPlan, TestCase},
+};
+use move_core_types::{
+    account_address::AccountAddress as MoveAddress, language_storage::ModuleId,
+    runtime_value::MoveValue, u256::U256, vm_status::StatusCode,
+};
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+use std::collections::BTreeMap;
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+    constants: UniqueMap<ModuleIdent, UniqueMap<ConstantName, (Loc, Option<u64>)>>,
+}
+
+impl<'env> Context<'env> {
+    fn new(compilation_env: &'env mut CompilationEnv, prog: &G::Program) -> Self {
+        let constants = prog.modules.ref_map(|_mident, module| {
+            module.constants.ref_map(|_name, constant| {
+                let v_opt = constant.value.as_ref().and_then(|v| match v {
+                    MoveValue::U64(u) => Some(*u),
+                    _ => None,
+                });
+                (constant.loc, v_opt)
+            })
+        });
+        Self {
+            env: compilation_env,
+            constants,
+        }
+    }
+
+    fn resolve_address(&self, addr: &Address) -> NumericalAddress {
+        (*addr).into_addr_bytes()
+    }
+
+    fn constants(&self) -> &UniqueMap<ModuleIdent, UniqueMap<ConstantName, (Loc, Option<u64>)>> {
+        &self.constants
+    }
+}
+
+//***************************************************************************
+// Test Plan Building
+//***************************************************************************
+
+// Constructs a test plan for each module in `prog`. This also validates the structure of the
+// attributes as the test plan is constructed.
+pub fn construct_test_plan(
+    compilation_env: &mut CompilationEnv,
+    package_filter: Option<Symbol>,
+    prog: &G::Program,
+) -> Option<Vec<ModuleTestPlan>> {
+    if !compilation_env.flags().is_testing() {
+        return None;
+    }
+
+    let mut context = Context::new(compilation_env, prog);
+    Some(
+        prog.modules
+            .key_cloned_iter()
+            .flat_map(|(module_ident, module_def)| {
+                construct_module_test_plan(&mut context, package_filter, module_ident, module_def)
+            })
+            .collect(),
+    )
+}
+
+fn construct_module_test_plan(
+    context: &mut Context,
+    package_filter: Option<Symbol>,
+    module_ident: ModuleIdent,
+    module: &G::ModuleDefinition,
+) -> Option<ModuleTestPlan> {
+    if package_filter.is_some() && module.package_name != package_filter {
+        return None;
+    }
+    let tests: BTreeMap<_, _> = module
+        .functions
+        .iter()
+        .filter_map(|(loc, fn_name, func)| {
+            build_test_info(context, loc, fn_name, func)
+                .map(|test_case| (fn_name.to_string(), test_case))
+        })
+        .collect();
+
+    if tests.is_empty() {
+        None
+    } else {
+        let sp!(_, ModuleIdent_ { address, module }) = &module_ident;
+        let addr_bytes = context.resolve_address(address);
+        Some(ModuleTestPlan::new(&addr_bytes, &module.0.value, tests))
+    }
+}
+
+fn build_test_info<'func>(
+    context: &mut Context,
+    fn_loc: Loc,
+    fn_name: &str,
+    function: &'func G::Function,
+) -> Option<TestCase> {
+    let get_attrs = |attr: TestingAttribute| -> Option<&'func E::Attribute> {
+        function
+            .attributes
+            .get_(&E::AttributeName_::Known(KnownAttribute::Testing(attr)))
+    };
+
+    const PREVIOUSLY_ANNOTATED_MSG: &str = "Previously annotated here";
+    const IN_THIS_TEST_MSG: &str = "Error found in this test";
+
+    let test_attribute_opt = get_attrs(TestingAttribute::Test);
+    let abort_attribute_opt = get_attrs(TestingAttribute::ExpectedFailure);
+    let test_only_attribute_opt = get_attrs(TestingAttribute::TestOnly);
+
+    let test_attribute = match test_attribute_opt {
+        None => {
+            // expected failures cannot be annotated on non-#[test] functions
+            if let Some(abort_attribute) = abort_attribute_opt {
+                let fn_msg = "Only functions defined as a test with #[test] can also have an \
+                              #[expected_failure] attribute";
+                let abort_msg = "Attributed as #[expected_failure] here";
+                context.env.add_diag(diag!(
+                    Attributes::InvalidUsage,
+                    (fn_loc, fn_msg),
+                    (abort_attribute.loc, abort_msg),
+                ))
+            }
+            return None;
+        }
+        Some(test_attribute) => test_attribute,
+    };
+
+    // A #[test] function cannot also be annotated #[test_only]
+    if let Some(test_only_attribute) = test_only_attribute_opt {
+        let msg = "Function annotated as both #[test(...)] and #[test_only]. You need to declare \
+                   it as either one or the other";
+        context.env.add_diag(diag!(
+            Attributes::InvalidUsage,
+            (test_only_attribute.loc, msg),
+            (test_attribute.loc, PREVIOUSLY_ANNOTATED_MSG),
+            (fn_loc, IN_THIS_TEST_MSG),
+        ))
+    }
+
+    let test_annotation_params = parse_test_attribute(context, test_attribute, 0);
+    let mut arguments = Vec::new();
+    for (var, _) in &function.signature.parameters {
+        let sp!(vloc, var_) = var.0;
+        let var_ = match display_var(var_) {
+            crate::hlir::translate::DisplayVar::Orig(s) => s.into(),
+            crate::hlir::translate::DisplayVar::Tmp => panic!("ICE temp as parameter"),
+        };
+        match test_annotation_params.get(&var_) {
+            Some(value) => arguments.push(value.clone()),
+            None => {
+                let missing_param_msg = "Missing test parameter assignment in test. Expected a \
+                                         parameter to be assigned in this attribute";
+                context.env.add_diag(diag!(
+                    Attributes::InvalidTest,
+                    (test_attribute.loc, missing_param_msg),
+                    (vloc, "Corresponding to this parameter"),
+                    (fn_loc, IN_THIS_TEST_MSG),
+                ))
+            }
+        }
+    }
+
+    let expected_failure = match abort_attribute_opt {
+        None => None,
+        Some(abort_attribute) => parse_failure_attribute(context, abort_attribute),
+    };
+
+    Some(TestCase {
+        test_name: fn_name.to_string(),
+        arguments,
+        expected_failure,
+    })
+}
+
+//***************************************************************************
+// Attribute parsers
+//***************************************************************************
+
+fn parse_test_attribute(
+    context: &mut Context,
+    sp!(aloc, test_attribute): &E::Attribute,
+    depth: usize,
+) -> BTreeMap<Symbol, MoveValue> {
+    use E::Attribute_ as EA;
+
+    match test_attribute {
+        EA::Name(_) | EA::Parameterized(_, _) if depth > 0 => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidTest,
+                (*aloc, "Unexpected nested attribute in test declaration"),
+            ));
+            BTreeMap::new()
+        }
+        EA::Name(nm) => {
+            assert!(
+                nm.value.as_str() == TestingAttribute::Test.name() && depth == 0,
+                "ICE: We should only be parsing a raw test attribute"
+            );
+            BTreeMap::new()
+        }
+        EA::Assigned(nm, attr_value) => {
+            if depth != 1 {
+                context.env.add_diag(diag!(
+                    Attributes::InvalidTest,
+                    (*aloc, "Unexpected nested attribute in test declaration"),
+                ));
+                return BTreeMap::new();
+            }
+            let sp!(assign_loc, attr_value) = &**attr_value;
+            let value = match convert_attribute_value_to_move_value(context, attr_value) {
+                Some(move_value) => move_value,
+                None => {
+                    context.env.add_diag(diag!(
+                        Attributes::InvalidValue,
+                        (*assign_loc, "Unsupported attribute value"),
+                        (*aloc, "Assigned in this attribute"),
+                    ));
+                    return BTreeMap::new();
+                }
+            };
+
+            let mut args = BTreeMap::new();
+            args.insert(nm.value, value);
+            args
+        }
+        EA::Parameterized(nm, attributes) => {
+            assert!(
+                nm.value.as_str() == TestingAttribute::Test.name() && depth == 0,
+                "ICE: We should only be parsing a raw test attribute"
+            );
+            attributes
+                .iter()
+                .flat_map(|(_, _, attr)| parse_test_attribute(context, attr, depth + 1))
+                .collect()
+        }
+    }
+}
+
+const BAD_ABORT_VALUE_WARNING: &str = "WARNING: passes for an abort from any module.";
+const INVALID_VALUE: &str = "Invalid value in attribute assignment";
+
+fn parse_failure_attribute(
+    context: &mut Context,
+    sp!(aloc, expected_attr): &E::Attribute,
+) -> Option<ExpectedFailure> {
+    use E::Attribute_ as EA;
+    match expected_attr {
+        EA::Name(nm) => {
+            assert!(
+                nm.value.as_str() == TestingAttribute::ExpectedFailure.name(),
+                "ICE: We should only be parsing a raw expected failure attribute"
+            );
+            Some(ExpectedFailure::Expected)
+        }
+        EA::Assigned(_, value) => {
+            let assign_loc = value.loc;
+            let invalid_assignment_msg = "Invalid expected failure code assignment";
+            let expected_msg =
+                "Expect an #[expected_failure(...)] attribute for error specification";
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (assign_loc, invalid_assignment_msg),
+                (*aloc, expected_msg),
+            ));
+            None
+        }
+        EA::Parameterized(sp!(_, nm), attrs) => {
+            assert!(
+                nm.as_str() == TestingAttribute::ExpectedFailure.name(),
+                "ICE: expected failure attribute must have the right name"
+            );
+            let mut attrs: BTreeMap<String, (Loc, Attribute)> = attrs
+                .key_cloned_iter()
+                .map(|(sp!(kloc, k_), v)| (k_.to_string(), (kloc, v.clone())))
+                .collect();
+            let mut expected_failure_kind_vec = TestingAttribute::expected_failure_cases()
+                .iter()
+                .filter_map(|k| {
+                    let k = k.to_string();
+                    let attr_opt = attrs.remove(&k)?;
+                    Some((k, attr_opt))
+                })
+                .collect::<Vec<_>>();
+            if expected_failure_kind_vec.len() != 1 {
+                let invalid_attr_msg = format!(
+                    "Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found {}. Expected one of: {}",
+                    expected_failure_kind_vec.len(),
+                    TestingAttribute::expected_failure_cases().to_vec().join(", ")
+                );
+                context
+                    .env
+                    .add_diag(diag!(Attributes::InvalidValue, (*aloc, invalid_attr_msg)));
+                return None;
+            }
+            let (expected_failure_kind, (attr_loc, attr)) =
+                expected_failure_kind_vec.pop().unwrap();
+            let location_opt = attrs.remove(TestingAttribute::ERROR_LOCATION);
+            let (status_code, sub_status_code, location) = match expected_failure_kind.as_str() {
+                TestingAttribute::ABORT_CODE_NAME => {
+                    let (value_name_loc, attr_value) = get_assigned_attribute(
+                        context,
+                        TestingAttribute::ABORT_CODE_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (value_loc, const_location_opt, u) =
+                        convert_constant_value_u64_constant_or_value(
+                            context,
+                            value_name_loc,
+                            &attr_value,
+                        )?;
+                    let location = if let Some((location_loc, location_attr)) = location_opt {
+                        convert_location(context, location_loc, location_attr)?
+                    } else if let Some(location) = const_location_opt {
+                        location
+                    } else {
+                        let tip = format!(
+                            "Replace value with constant from expected module or add `{}=...` \
+                            attribute.",
+                            TestingAttribute::ERROR_LOCATION
+                        );
+                        context.env.add_diag(diag!(
+                            Attributes::ValueWarning,
+                            (attr_loc, BAD_ABORT_VALUE_WARNING),
+                            (value_loc, tip)
+                        ));
+                        return Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(u));
+                    };
+                    (StatusCode::ABORTED, Some(u), location)
+                }
+                TestingAttribute::ARITHMETIC_ERROR_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::ARITHMETIC_ERROR_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::ARITHMETIC_ERROR_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::ARITHMETIC_ERROR, None, location)
+                }
+                TestingAttribute::OUT_OF_GAS_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::OUT_OF_GAS_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::OUT_OF_GAS_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::OUT_OF_GAS, None, location)
+                }
+                TestingAttribute::VECTOR_ERROR_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::VECTOR_ERROR_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let minor_attr_opt = attrs.remove(TestingAttribute::MINOR_STATUS_NAME);
+                    let minor_status = if let Some((minor_loc, minor_attr)) = minor_attr_opt {
+                        let (minor_value_loc, minor_value) = get_assigned_attribute(
+                            context,
+                            TestingAttribute::MINOR_STATUS_NAME,
+                            minor_loc,
+                            minor_attr,
+                        )?;
+                        let (_, _, minor_status) = convert_constant_value_u64_constant_or_value(
+                            context,
+                            minor_value_loc,
+                            &minor_value,
+                        )?;
+                        Some(minor_status)
+                    } else {
+                        None
+                    };
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::VECTOR_ERROR_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::VECTOR_OPERATION_ERROR, minor_status, location)
+                }
+                TestingAttribute::MAJOR_STATUS_NAME => {
+                    let (value_name_loc, attr_value) = get_assigned_attribute(
+                        context,
+                        TestingAttribute::MAJOR_STATUS_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (major_value_loc, _, major_status_u64) =
+                        convert_constant_value_u64_constant_or_value(
+                            context,
+                            value_name_loc,
+                            &attr_value,
+                        )?;
+                    let major_status = if let Ok(c) = StatusCode::try_from(major_status_u64) {
+                        c
+                    } else {
+                        let bad_value = format!(
+                            "Invalid value for '{}'",
+                            TestingAttribute::MAJOR_STATUS_NAME,
+                        );
+                        let no_code =
+                            format!("No status code associated with value '{major_status_u64}'");
+                        context.env.add_diag(diag!(
+                            Attributes::InvalidValue,
+                            (value_name_loc, bad_value),
+                            (major_value_loc, no_code)
+                        ));
+                        return None;
+                    };
+                    let minor_attr_opt = attrs.remove(TestingAttribute::MINOR_STATUS_NAME);
+                    let minor_status = if let Some((minor_loc, minor_attr)) = minor_attr_opt {
+                        let (minor_value_loc, minor_value) = get_assigned_attribute(
+                            context,
+                            TestingAttribute::MINOR_STATUS_NAME,
+                            minor_loc,
+                            minor_attr,
+                        )?;
+                        let (_, _, minor_status) = convert_constant_value_u64_constant_or_value(
+                            context,
+                            minor_value_loc,
+                            &minor_value,
+                        )?;
+                        Some(minor_status)
+                    } else {
+                        None
+                    };
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::MAJOR_STATUS_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (major_status, minor_status, location)
+                }
+                _ => unreachable!(),
+            };
+            // warn for any remaining attrs
+            for (_, (loc, _)) in attrs {
+                let msg = format!(
+                    "Unused attribute for {}",
+                    TestingAttribute::ExpectedFailure.name()
+                );
+                context
+                    .env
+                    .add_diag(diag!(UnusedItem::Attribute, (loc, msg)));
+            }
+            Some(ExpectedFailure::ExpectedWithError(ExpectedMoveError(
+                status_code,
+                sub_status_code,
+                move_binary_format::errors::Location::Module(location),
+            )))
+        }
+    }
+}
+
+fn check_attribute_unassigned(
+    context: &mut Context,
+    kind: &str,
+    attr_loc: Loc,
+    attr: Attribute,
+) -> Option<()> {
+    use E::Attribute_ as EA;
+    match attr {
+        sp!(_, EA::Name(sp!(_, nm))) => {
+            assert!(nm.as_str() == kind);
+            Some(())
+        }
+        sp!(loc, _) => {
+            let msg = format!(
+                "Expected no assigned value, e.g. '{}', for expected failure attribute",
+                kind
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (attr_loc, "Unsupported attribute in this location"),
+                (loc, msg)
+            ));
+            None
+        }
+    }
+}
+
+fn get_assigned_attribute(
+    context: &mut Context,
+    kind: &str,
+    attr_loc: Loc,
+    attr: Attribute,
+) -> Option<(Loc, AttributeValue)> {
+    use E::Attribute_ as EA;
+    match attr {
+        sp!(assign_loc, EA::Assigned(sp!(_, nm), value)) => {
+            assert!(nm.as_str() == kind);
+            Some((assign_loc, *value))
+        }
+        sp!(loc, _) => {
+            let msg = format!(
+                "Expected assigned value, e.g. '{}=...', for expected failure attribute",
+                kind
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (attr_loc, "Unsupported attribute in this location"),
+                (loc, msg)
+            ));
+            None
+        }
+    }
+}
+
+fn convert_location(context: &mut Context, attr_loc: Loc, attr: Attribute) -> Option<ModuleId> {
+    use E::AttributeValue_ as EAV;
+    let (loc, value) =
+        get_assigned_attribute(context, TestingAttribute::ERROR_LOCATION, attr_loc, attr)?;
+    match value {
+        sp!(vloc, EAV::Module(module)) => convert_module_id(context, vloc, &module),
+        sp!(vloc, _) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (vloc, "Expected a module identifier, e.g. 'std::vector'")
+            ));
+            None
+        }
+    }
+}
+
+fn convert_constant_value_u64_constant_or_value(
+    context: &mut Context,
+    loc: Loc,
+    value: &AttributeValue,
+) -> Option<(Loc, Option<ModuleId>, u64)> {
+    use E::AttributeValue_ as EAV;
+    let (vloc, module, member) = match value {
+        sp!(
+            vloc,
+            EAV::ModuleAccess(sp!(_, ModuleAccess_::ModuleAccess(m, n)))
+        ) => (*vloc, m, n),
+        _ => {
+            let (vloc, u) = convert_attribute_value_u64(context, loc, value)?;
+            return Some((vloc, None, u));
+        }
+    };
+    let module_id = convert_module_id(context, vloc, module)?;
+    let modules_constants = context.constants().get(module).unwrap();
+    let constant = match modules_constants.get_(&member.value) {
+        None => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (
+                    module.loc,
+                    format!("Unbound constant '{member}' in module '{module}'")
+                ),
+            ));
+            return None;
+        }
+        Some(c) => c,
+    };
+    match constant {
+        (cloc, None) => {
+            let msg = format!(
+                "Constant '{module}::{member}' has a non-u64 value. \
+                Only 'u64' values are permitted"
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (*cloc, msg),
+            ));
+            None
+        }
+        (_, Some(u)) => Some((vloc, Some(module_id), *u)),
+    }
+}
+
+fn convert_module_id(context: &mut Context, vloc: Loc, module: &ModuleIdent) -> Option<ModuleId> {
+    if !context.constants.contains_key(module) {
+        context.env.add_diag(diag!(
+            Attributes::InvalidValue,
+            (vloc, INVALID_VALUE),
+            (module.loc, format!("Unbound module '{module}'")),
+        ));
+        return None;
+    }
+    let sp!(mloc, ModuleIdent_ { address, module }) = module;
+    let addr = match address {
+        Address::Numerical {
+            value: sp!(_, a), ..
+        } => a.into_inner(),
+        Address::NamedUnassigned(addr) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (*mloc, format!("Unbound address '{addr}'")),
+            ));
+            return None;
+        }
+    };
+    let mname = move_core_types::identifier::Identifier::new(module.value().to_string()).unwrap();
+    let mid = ModuleId::new(addr, mname);
+    Some(mid)
+}
+
+fn convert_attribute_value_u64(
+    context: &mut Context,
+    loc: Loc,
+    value: &AttributeValue,
+) -> Option<(Loc, u64)> {
+    use E::{AttributeValue_ as EAV, Value_ as EV};
+    match value {
+        sp!(vloc, EAV::Value(sp!(_, EV::InferredNum(u)))) if *u <= U256::from(std::u64::MAX) => {
+            Some((*vloc, u.down_cast_lossy()))
+        }
+        sp!(vloc, EAV::Value(sp!(_, EV::U64(u)))) => Some((*vloc, *u)),
+        sp!(vloc, EAV::Value(sp!(_, EV::U8(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U16(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U32(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U128(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U256(_)))) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (*vloc, "Annotated non-u64 literals are not permitted"),
+            ));
+            None
+        }
+        sp!(vloc, _) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (*vloc, "Unsupported value in this assignment"),
+            ));
+            None
+        }
+    }
+}
+
+fn convert_attribute_value_to_move_value(
+    context: &mut Context,
+    value: &E::AttributeValue_,
+) -> Option<MoveValue> {
+    use E::{AttributeValue_ as EAV, Value_ as EV};
+    match value {
+        // Only addresses are allowed
+        EAV::Value(sp!(_, EV::Address(a))) => Some(MoveValue::Address(MoveAddress::new(
+            context.resolve_address(a).into_bytes(),
+        ))),
+        _ => None,
+    }
+}
+
+fn check_location<T>(
+    context: &mut Context,
+    loc: Loc,
+    attr: &str,
+    location: Option<T>,
+) -> Option<T> {
+    if location.is_none() {
+        let msg = format!(
+            "Expected '{}' following '{attr}'",
+            TestingAttribute::ERROR_LOCATION
+        );
+        context
+            .env
+            .add_diag(diag!(Attributes::InvalidUsage, (loc, msg)));
+    }
+    location
+}
diff --git a/vendors/move/crates/move-compiler/src/verification/ast_filter.rs b/vendors/move/crates/move-compiler/src/verification/ast_filter.rs
new file mode 100644
index 000000000..3671d5a37
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/verification/ast_filter.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::Loc;
+
+use crate::{
+    parser::{
+        ast as P,
+        filter::{filter_program, FilterContext},
+    },
+    shared::{known_attributes, CompilationEnv},
+};
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+}
+
+impl<'env> Context<'env> {
+    fn new(compilation_env: &'env mut CompilationEnv) -> Self {
+        Self {
+            env: compilation_env,
+        }
+    }
+}
+
+impl FilterContext for Context<'_> {
+    fn should_remove_by_attributes(
+        &mut self,
+        attrs: &[P::Attributes],
+        _is_source_def: bool,
+    ) -> bool {
+        should_remove_node(self.env, attrs)
+    }
+}
+
+//***************************************************************************
+// Filtering of verification-annotated module members
+//***************************************************************************
+
+// This filters out all AST elements annotated with verify-only annotated from `prog`
+// if the `verify` flag in `compilation_env` is not set. If the `verify` flag is set,
+// no filtering is performed.
+pub fn program(compilation_env: &mut CompilationEnv, prog: P::Program) -> P::Program {
+    let mut context = Context::new(compilation_env);
+    filter_program(&mut context, prog)
+}
+
+// An AST element should be removed if:
+// * It is annotated #[verify_only] and verify mode is not set
+fn should_remove_node(env: &CompilationEnv, attrs: &[P::Attributes]) -> bool {
+    use known_attributes::VerificationAttribute;
+    let flattened_attrs: Vec<_> = attrs.iter().flat_map(verification_attributes).collect();
+    let is_verify_only = flattened_attrs
+        .iter()
+        .any(|attr| matches!(attr.1, VerificationAttribute::VerifyOnly));
+    is_verify_only && !env.flags().is_verification()
+}
+
+fn verification_attributes(
+    attrs: &P::Attributes,
+) -> Vec<(Loc, known_attributes::VerificationAttribute)> {
+    use known_attributes::KnownAttribute;
+    attrs
+        .value
+        .iter()
+        .filter_map(
+            |attr| match KnownAttribute::resolve(attr.value.attribute_name().value)? {
+                KnownAttribute::Verification(verify_attr) => Some((attr.loc, verify_attr)),
+                KnownAttribute::Testing(_)
+                | KnownAttribute::Native(_)
+                | KnownAttribute::Diagnostic(_)
+                | KnownAttribute::DefinesPrimitive(_) => None,
+            },
+        )
+        .collect()
+}
diff --git a/vendors/move/crates/move-compiler/src/verification/mod.rs b/vendors/move/crates/move-compiler/src/verification/mod.rs
new file mode 100644
index 000000000..8d45d8fb0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/src/verification/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod ast_filter;
diff --git a/vendors/move/crates/move-compiler/tests/.gitattributes b/vendors/move/crates/move-compiler/tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/expansion/positional_struct_lhs_unpack.move b/vendors/move/crates/move-compiler/tests/move_2024/expansion/positional_struct_lhs_unpack.move
new file mode 100644
index 000000000..5885dfbc8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/expansion/positional_struct_lhs_unpack.move
@@ -0,0 +1,18 @@
+address 0x42 {
+module M {
+    public struct Foo(u16, u64) has copy, drop;
+    public struct Bar()
+
+    fun f(x: Foo) {
+        // Positional unpack of a struct. In expansion this gets moved from a a
+        // `Call` expr to a `Unpack` expr.
+        Foo(_, _) = x;
+    }
+
+    fun g(x: Bar) {
+        // Positional unpack of a struct. In expansion this gets moved from a a
+        // `Call` expr to a `Unpack` expr.
+        Bar() = x;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.exp
new file mode 100644
index 000000000..921e473e3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.exp
@@ -0,0 +1,27 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_2024/naming/duplicate_use_fun_explicit.move:10:5
+   │
+ 7 │     public use fun foobar as X.f;
+   │                                - Previously declared here
+   ·
+10 │     public use fun foobaz as X.f;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Duplicate 'use fun' for 'a::m::X.f'
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_2024/naming/duplicate_use_fun_explicit.move:25:5
+   │
+22 │     public use fun foobar as X.f;
+   │                                - Previously declared here
+   ·
+25 │     use fun foobaz as X.f;
+   │     ^^^^^^^^^^^^^^^^^^^^^^ Duplicate 'use fun' for 'a::m2::X.f'
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_2024/naming/duplicate_use_fun_explicit.move:40:5
+   │
+37 │     use fun foobar as X.f;
+   │                         - Previously declared here
+   ·
+40 │     use fun foobaz as X.f;
+   │     ^^^^^^^^^^^^^^^^^^^^^^ Duplicate 'use fun' for 'a::m3::X.f'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.move
new file mode 100644
index 000000000..622d59448
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_explicit.move
@@ -0,0 +1,46 @@
+// public+public
+// visibility should not affect these tests, but we are being exhausive
+// for this first test
+module a::m {
+    public struct X has copy, drop, store {}
+
+    public use fun foobar as X.f;
+    public fun foobar(_: &X) {}
+
+    public use fun foobaz as X.f;
+    public fun foobaz(_: &X, _: u64) {}
+
+    public fun dispatch(x: &X) {
+        x.f();
+    }
+}
+
+// public+internal
+module a::m2 {
+    public struct X has copy, drop, store {}
+
+    public use fun foobar as X.f;
+    public fun foobar(_: &X) {}
+
+    use fun foobaz as X.f;
+    fun foobaz(_: &X, _: u64) {}
+
+    public fun dispatch(x: &X) {
+        x.f();
+    }
+}
+
+// internal+internal
+module a::m3 {
+    public struct X has copy, drop, store {}
+
+    use fun foobar as X.f;
+    public fun foobar(_: &X) {}
+
+    use fun foobaz as X.f;
+    fun foobaz(_: &X, _: u64) {}
+
+    public fun dispatch(x: &X) {
+        x.f();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.exp
new file mode 100644
index 000000000..6c3b2bf11
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.exp
@@ -0,0 +1,11 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.move:7:9
+  │
+4 │     public use fun foobar as X.foobaz;
+  │                                ------ Previously declared here
+  ·
+7 │     fun foobaz(_: &X, _: u64) {}
+  │         ^^^^^^     - Function declarations create an implicit 'use fun' when their first argument is a type defined in the same module
+  │         │           
+  │         Duplicate 'use fun' for 'a::m::X.foobaz'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.move
new file mode 100644
index 000000000..0ba77fdff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_fun_declaration.move
@@ -0,0 +1,12 @@
+module a::m {
+    public struct X has copy, drop, store {}
+
+    public use fun foobar as X.foobaz;
+    public fun foobar(_: &X) {}
+
+    fun foobaz(_: &X, _: u64) {}
+
+    fun dispatch(x: &X) {
+        x.foobaz();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.exp
new file mode 100644
index 000000000..01e864dce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.exp
@@ -0,0 +1,22 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_2024/naming/duplicate_use_fun_with_normal_use.move:8:37
+  │
+4 │     public fun foobar(_: &X) {}
+  │                           - 'use' function aliases create an implicit 'use fun' when their first argument is a type defined in that module
+  ·
+8 │     use a::m::{X, foobar, foobar as foobaz};
+  │                                     ^^^^^^ Duplicate 'use fun' for 'a::m::X.foobaz'
+9 │     use fun foobar as X.foobaz;
+  │                         ------ Previously declared here
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_2024/naming/duplicate_use_fun_with_normal_use.move:19:41
+   │
+ 4 │     public fun foobar(_: &X) {}
+   │                           - 'use' function aliases create an implicit 'use fun' when their first argument is a type defined in that module
+   ·
+19 │         use a::m::{X, foobar, foobar as foobaz};
+   │                                         ^^^^^^ Duplicate 'use fun' for 'a::m::X.foobaz'
+20 │         use fun foobar as X.foobaz;
+   │                             ------ Previously declared here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.move
new file mode 100644
index 000000000..e98a49a53
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/duplicate_use_fun_with_normal_use.move
@@ -0,0 +1,24 @@
+module a::m {
+    public struct X has copy, drop, store {}
+
+    public fun foobar(_: &X) {}
+}
+
+module a::n1 {
+    use a::m::{X, foobar, foobar as foobaz};
+    use fun foobar as X.foobaz;
+
+    fun dispatch(x: &X) {
+        x.foobaz();
+    }
+}
+
+module a::n2 {
+
+    fun confusing(x: &a::m::X) {
+        use a::m::{X, foobar, foobar as foobaz};
+        use fun foobar as X.foobaz;
+        x.foobaz();
+        foobar(x);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/non_duplicate_use_fun.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/non_duplicate_use_fun.move
new file mode 100644
index 000000000..e6f92172e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/non_duplicate_use_fun.move
@@ -0,0 +1,62 @@
+// these cases look like they might cause duplicate use funs, but they
+// do not for some reasons (see comments on each case)
+
+module a::vals {
+    public struct Num has copy, drop {
+        num: u64,
+    }
+    public struct Cond has copy, drop {
+        cond: bool,
+    }
+
+    public fun copy_num(n: &Num): u64 {
+        n.num
+    }
+
+    public fun copy_cond(c: &Cond): bool {
+        c.cond
+    }
+
+    public fun code(): Num {
+        Num { num: 0 }
+    }
+}
+
+module a::malicious {
+    public fun num(num: &a::vals::Num): u64 {
+        abort num.copy_num()
+    }
+}
+
+module b::example {
+    use a::vals::{Self, Num, Cond};
+
+    public fun tnum(p: &Num): u64 {
+        // does not create a conflict since a::malicious::num does not
+        // define a::vals::Num
+        use fun vals::copy_num as Num.num;
+        use a::malicious::num;
+        let v = p.num();
+        if (v == 0) num(p)
+        else v
+    }
+
+    public fun tcond(p: &Num, cond: &Cond): u64 {
+        // does not create a conflict since a::vals::copy_cond does not
+        // take a a::vals::Num
+        use fun vals::copy_num as Num.f;
+        use a::vals::copy_cond as f;
+        if (f(cond)) p.f()
+        else 0
+    }
+
+    public fun tcode(p: &Num): u64 {
+        // does not create a conflict since a::vals::code does not
+        // take a a::vals::Num
+        use fun vals::copy_num as Num.code;
+        use a::vals::code;
+        let v = p.code();
+        if (v == 0) a::malicious::num(&code())
+        else v
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.exp
new file mode 100644
index 000000000..7b0ccd740
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.exp
@@ -0,0 +1,9 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_2024/naming/positional_pack_fn_call_shadow.move:6:9
+  │
+4 │     public struct Foo(u64) has copy, drop;
+  │                   --- Alias previously defined here
+5 │ 
+6 │     fun Foo(_x: u64) { }
+  │         ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.move
new file mode 100644
index 000000000..15a55dc4e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_fn_call_shadow.move
@@ -0,0 +1,13 @@
+address 0x42 {
+module M {
+    // Valid positional field struct declaration
+    public struct Foo(u64) has copy, drop;
+
+    fun Foo(_x: u64) { }
+
+    fun x() {
+        let _x = Foo(0);
+        abort 0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.exp
new file mode 100644
index 000000000..41346c6d3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.exp
@@ -0,0 +1,18 @@
+error[E03013]: positional call mismatch
+  ┌─ tests/move_2024/naming/positional_pack_of_non_positional_struct.move:7:18
+  │
+7 │         let _x = Foo(0);
+  │                  ^^^^^^ Invalid struct instantiation. Named struct declarations require named instantiations.
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_pack_of_non_positional_struct.move:7:18
+  │
+7 │         let _x = Foo(0);
+  │                  ^^^^^^ Missing argument for field 'field' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_2024/naming/positional_pack_of_non_positional_struct.move:7:18
+  │
+7 │         let _x = Foo(0);
+  │                  ^^^^^^ Unbound field '0' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.move
new file mode 100644
index 000000000..0c5bcfe5a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_non_positional_struct.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    public struct Foo { field: u64 } has copy, drop;
+
+    fun x() {
+        // Error: Positional pack of non-positional struct
+        let _x = Foo(0);
+        abort 0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_positional_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_positional_struct.move
new file mode 100644
index 000000000..0873d3cbc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_pack_of_positional_struct.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    public struct Foo(u64) has copy, drop;
+
+    fun x() {
+        let _x = Foo(0);
+        abort 0
+    }
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_fn_use_alias_shadow.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_fn_use_alias_shadow.move
new file mode 100644
index 000000000..3cb9cee89
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_fn_use_alias_shadow.move
@@ -0,0 +1,12 @@
+module a::m {
+    public struct X(u64, u64) has copy, drop;
+
+    fun f(t: X): u64 {
+        t.0 + t.1
+    }
+
+    fun user(t: X) {
+        use a::m::f as X;
+        let _ = X(t);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.exp
new file mode 100644
index 000000000..ef43f91f6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.exp
@@ -0,0 +1,202 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:7:13
+  │
+7 │         Foo(t, y) = x;
+  │             ^ Invalid assignment. Unbound variable 't'
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:8:9
+  │
+8 │         Foo() = x;
+  │         ^^^^^ Missing assignment for field '0' in '0x42::M::Foo'
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:8:9
+  │
+8 │         Foo() = x;
+  │         ^^^^^ Missing assignment for field '1' in '0x42::M::Foo'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:9:9
+  │
+6 │     fun f(x: Foo) {
+  │              --- Expected: '0x42::M::Foo'
+  ·
+9 │         Bar() = x;
+  │         ^^^^^
+  │         │
+  │         Invalid deconstruction assignment
+  │         Given: '0x42::M::Bar'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:10:9
+   │
+ 6 │     fun f(x: Foo) {
+   │              --- Expected: '0x42::M::Foo'
+   ·
+10 │         Bar(_, _) = x;
+   │         ^^^^^^^^^
+   │         │
+   │         Invalid deconstruction assignment
+   │         Given: '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:10:9
+   │
+10 │         Bar(_, _) = x;
+   │         ^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:10:9
+   │
+10 │         Bar(_, _) = x;
+   │         ^^^^^^^^^ Unbound field '1' in '0x42::M::Bar'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:14:13
+   │
+14 │         let Foo() = x;
+   │             ^^^^^ Missing binding for field '0' in '0x42::M::Foo'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:14:13
+   │
+14 │         let Foo() = x;
+   │             ^^^^^ Missing binding for field '1' in '0x42::M::Foo'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:15:13
+   │
+13 │     fun g(x: Foo) {
+   │              --- Expected: '0x42::M::Foo'
+14 │         let Foo() = x;
+15 │         let Bar() = x;
+   │             ^^^^^
+   │             │
+   │             Invalid deconstruction binding
+   │             Given: '0x42::M::Bar'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:16:13
+   │
+13 │     fun g(x: Foo) {
+   │              --- Expected: '0x42::M::Foo'
+   ·
+16 │         let Bar(c, d) = x;
+   │             ^^^^^^^^^
+   │             │
+   │             Invalid deconstruction binding
+   │             Given: '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:16:13
+   │
+16 │         let Bar(c, d) = x;
+   │             ^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:16:13
+   │
+16 │         let Bar(c, d) = x;
+   │             ^^^^^^^^^ Unbound field '1' in '0x42::M::Bar'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:20:9
+   │
+19 │     fun h(x: Bar) {
+   │              --- Expected: '0x42::M::Bar'
+20 │         Foo(_, _) = x;
+   │         ^^^^^^^^^
+   │         │
+   │         Invalid deconstruction assignment
+   │         Given: '0x42::M::Foo'
+
+error[E03009]: unbound variable
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:21:13
+   │
+21 │         Foo(t, y) = x;
+   │             ^ Invalid assignment. Unbound variable 't'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:22:9
+   │
+19 │     fun h(x: Bar) {
+   │              --- Expected: '0x42::M::Bar'
+   ·
+22 │         Foo() = x;
+   │         ^^^^^
+   │         │
+   │         Invalid deconstruction assignment
+   │         Given: '0x42::M::Foo'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:22:9
+   │
+22 │         Foo() = x;
+   │         ^^^^^ Missing assignment for field '0' in '0x42::M::Foo'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:22:9
+   │
+22 │         Foo() = x;
+   │         ^^^^^ Missing assignment for field '1' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:23:9
+   │
+23 │         Bar(_, _) = x;
+   │         ^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:23:9
+   │
+23 │         Bar(_, _) = x;
+   │         ^^^^^^^^^ Unbound field '1' in '0x42::M::Bar'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:27:13
+   │
+26 │     fun z(x: Bar) {
+   │              --- Expected: '0x42::M::Bar'
+27 │         let Foo(t, y) = x;
+   │             ^^^^^^^^^
+   │             │
+   │             Invalid deconstruction binding
+   │             Given: '0x42::M::Foo'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:28:13
+   │
+26 │     fun z(x: Bar) {
+   │              --- Expected: '0x42::M::Bar'
+27 │         let Foo(t, y) = x;
+28 │         let Foo() = x;
+   │             ^^^^^
+   │             │
+   │             Invalid deconstruction binding
+   │             Given: '0x42::M::Foo'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:28:13
+   │
+28 │         let Foo() = x;
+   │             ^^^^^ Missing binding for field '0' in '0x42::M::Foo'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:28:13
+   │
+28 │         let Foo() = x;
+   │             ^^^^^ Missing binding for field '1' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:29:13
+   │
+29 │         let Bar(_, _) = x;
+   │             ^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_lhs_unpack.move:29:13
+   │
+29 │         let Bar(_, _) = x;
+   │             ^^^^^^^^^ Unbound field '1' in '0x42::M::Bar'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.move
new file mode 100644
index 000000000..57f0ed178
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_lhs_unpack.move
@@ -0,0 +1,32 @@
+address 0x42 {
+module M {
+    public struct Foo(u16, u64) has copy, drop;
+    public struct Bar()
+
+    fun f(x: Foo) {
+        Foo(t, y) = x;
+        Foo() = x;
+        Bar() = x;
+        Bar(_, _) = x;
+    }
+
+    fun g(x: Foo) {
+        let Foo() = x;
+        let Bar() = x;
+        let Bar(c, d) = x;
+    }
+
+    fun h(x: Bar) {
+        Foo(_, _) = x;
+        Foo(t, y) = x;
+        Foo() = x;
+        Bar(_, _) = x;
+    }
+
+    fun z(x: Bar) {
+        let Foo(t, y) = x;
+        let Foo() = x;
+        let Bar(_, _) = x;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.exp
new file mode 100644
index 000000000..aac39ed2b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.exp
@@ -0,0 +1,18 @@
+error[E03013]: positional call mismatch
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_pack.move:7:18
+  │
+7 │         let _x = Foo { pos0: 0 };
+  │                  ^^^^^^^^^^^^^^^ Invalid struct instantiation. Positional struct declarations require positional instantiations.
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_pack.move:7:18
+  │
+7 │         let _x = Foo { pos0: 0 };
+  │                  ^^^^^^^^^^^^^^^ Missing argument for field '0' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_pack.move:7:18
+  │
+7 │         let _x = Foo { pos0: 0 };
+  │                  ^^^^^^^^^^^^^^^ Unbound field 'pos0' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.move
new file mode 100644
index 000000000..15b8eb043
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_pack.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    public struct Foo(u64) has copy, drop;
+
+    fun x() {
+        // Error: Non-positional pack of positional struct
+        let _x = Foo { pos0: 0 };
+        abort 0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.exp
new file mode 100644
index 000000000..bd806f152
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.exp
@@ -0,0 +1,36 @@
+error[E03013]: positional call mismatch
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:8:13
+  │
+8 │         let Foo { y: _ } = Foo(0);
+  │             ^^^^^^^^^^^^ Invalid deconstruction. Positional struct field declarations require positional deconstruction
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:8:13
+  │
+8 │         let Foo { y: _ } = Foo(0);
+  │             ^^^^^^^^^^^^ Missing binding for field '0' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:8:13
+  │
+8 │         let Foo { y: _ } = Foo(0);
+  │             ^^^^^^^^^^^^ Unbound field 'y' in '0x42::M::Foo'
+
+error[E03013]: positional call mismatch
+   ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:15:9
+   │
+15 │         Foo { y: _ } = Foo(0);
+   │         ^^^^^^^^^^^^ Invalid deconstruction. Positional struct field declarations require positional deconstruction
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:15:9
+   │
+15 │         Foo { y: _ } = Foo(0);
+   │         ^^^^^^^^^^^^ Missing assignment for field '0' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_struct_non_positional_unpack.move:15:9
+   │
+15 │         Foo { y: _ } = Foo(0);
+   │         ^^^^^^^^^^^^ Unbound field 'y' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.move
new file mode 100644
index 000000000..f011d4b2a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_non_positional_unpack.move
@@ -0,0 +1,20 @@
+address 0x42 {
+module M {
+    public struct Foo(u64) has copy, drop;
+
+    fun x() {
+        let x = Foo(0);
+        // Error: Non-positional unpack of positional struct
+        let Foo { y: _ } = Foo(0);
+        abort 0
+    }
+
+    fun y() {
+        let x = Foo(0);
+        // Error: Non-positional unpack of positional struct
+        Foo { y: _ } = Foo(0);
+        abort 0
+    }
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_resolution.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_resolution.move
new file mode 100644
index 000000000..eefd5bb85
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_struct_resolution.move
@@ -0,0 +1,19 @@
+module a::m {
+    public struct X(u64) has copy, drop;
+    public struct Y(bool, bool) has copy, drop;
+
+    fun caller() {
+        use a::m::X as Y;
+        let x = X(0u64);
+        let y = Y(1u64);
+        f(x);
+        f(y);
+    }
+
+    fun f(x: X) {
+        use a::m::X as Y;
+        let Y(_) = x;
+        Y(_) = x;
+        X(_) = x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.exp
new file mode 100644
index 000000000..15355c065
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.exp
@@ -0,0 +1,36 @@
+error[E03013]: positional call mismatch
+  ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:8:13
+  │
+8 │         let Foo(_) = x;
+  │             ^^^^^^ Invalid deconstruction. Named struct field declarations require named deconstruction
+
+error[E04016]: too few arguments
+  ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:8:13
+  │
+8 │         let Foo(_) = x;
+  │             ^^^^^^ Missing binding for field 'field' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:8:13
+  │
+8 │         let Foo(_) = x;
+  │             ^^^^^^ Unbound field '0' in '0x42::M::Foo'
+
+error[E03013]: positional call mismatch
+   ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:15:9
+   │
+15 │         Foo(_) = x;
+   │         ^^^^^^ Invalid deconstruction. Named struct field declarations require named deconstruction
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:15:9
+   │
+15 │         Foo(_) = x;
+   │         ^^^^^^ Missing assignment for field 'field' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/naming/positional_unpack_of_non_positional_struct.move:15:9
+   │
+15 │         Foo(_) = x;
+   │         ^^^^^^ Unbound field '0' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.move
new file mode 100644
index 000000000..11ad812da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_non_positional_struct.move
@@ -0,0 +1,20 @@
+address 0x42 {
+module M {
+    public struct Foo { field: u64 } has copy, drop;
+
+    fun x() {
+        let x = Foo { field: 0 };
+        // Error: Positional unpack of non-positional struct
+        let Foo(_) = x;
+        abort 0
+    }
+
+    fun y() {
+        let x = Foo { field: 0 };
+        // Error: Positional unpack of non-positional struct
+        Foo(_) = x;
+        abort 0
+    }
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_positional_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_positional_struct.move
new file mode 100644
index 000000000..cdc16c6cc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/positional_unpack_of_positional_struct.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module M {
+    public struct Foo(u64) has copy, drop;
+
+    fun x() {
+        let x = Foo(0);
+        let Foo(_) = x;
+        Foo(_) = x;
+        abort 0
+    }
+}
+}
+
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.exp
new file mode 100644
index 000000000..17c418aba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.exp
@@ -0,0 +1,33 @@
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/public_use_fun_invalid_type.move:21:5
+   │
+ 3 │     public struct X {}
+   │                   - Type defined in another module here
+   ·
+21 │     public use fun std::utilities::x_ex as std::utilities::X.ex;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │     │
+   │     Invalid 'use fun'. Cannot publicly associate a function with a type defined in another module
+   │     Declared 'public' here. Consider removing to make a local 'use fun' instead
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/public_use_fun_invalid_type.move:25:5
+   │
+25 │     public use fun std::utilities::vec_ex as vector.ex;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │     │
+   │     Invalid 'use fun'. Cannot publicly associate a function with a type defined in another module
+   │     Declared 'public' here. Consider removing to make a local 'use fun' instead
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/public_use_fun_invalid_type.move:29:5
+   │
+ 2 │ module std::utilities {
+   │             --------- Type defined in another module here
+   ·
+29 │     public use fun std::utilities::u64_ex as u64.ex;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │     │
+   │     Invalid 'use fun'. Cannot publicly associate a function with a type defined in another module
+   │     Declared 'public' here. Consider removing to make a local 'use fun' instead
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.move
new file mode 100644
index 000000000..987cd7542
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_invalid_type.move
@@ -0,0 +1,30 @@
+#[defines_primitive(u64)]
+module std::utilities {
+    public struct X {}
+
+    public fun x_ex(_: &X) {
+        abort 0
+    }
+    public fun vec_ex<T>(_: &vector<T>) {
+        abort 0
+    }
+    public fun u64_ex(_: u64) {
+        abort 0
+    }
+
+}
+
+// these modules should not be able to declare public use funs on these types since they did
+// not define them
+
+module std::x {
+    public use fun std::utilities::x_ex as std::utilities::X.ex;
+}
+
+module std::vector {
+    public use fun std::utilities::vec_ex as vector.ex;
+}
+
+module std::u64 {
+    public use fun std::utilities::u64_ex as u64.ex;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_valid_type.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_valid_type.move
new file mode 100644
index 000000000..860ab77ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/public_use_fun_valid_type.move
@@ -0,0 +1,30 @@
+module std::utilities {
+    public struct X {}
+
+    public use fun x_ex as X.ex;
+    fun x_ex(_: &X) {
+        abort 0
+    }
+    public fun vec_ex<T>(_: &vector<T>) {
+        abort 0
+    }
+    public fun u64_ex(_: u64) {
+        abort 0
+    }
+
+    public fun dispatch(x: &X, v: &vector<u64>, u: u64) {
+        x.ex();
+        v.ex();
+        u.ex();
+    }
+}
+
+#[defines_primitive(vector)]
+module std::vector {
+    public use fun std::utilities::vec_ex as vector.ex;
+}
+
+#[defines_primitive(u64)]
+module std::u64 {
+    public use fun std::utilities::u64_ex as u64.ex;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.exp
new file mode 100644
index 000000000..62cbc9afd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.exp
@@ -0,0 +1,81 @@
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:18:5
+   │
+ 5 │     public fun val_u64(_: u64) { abort 0 }
+   │                           --- But 'a::m::val_u64' has a first argument of type 'u64'
+   ·
+18 │     use fun val_u64 as Y.val_u64;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.val_u64'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:19:5
+   │
+ 6 │     public fun imm_vec(_: &vector<u64>) { abort 0 }
+   │                           ------------ But 'a::m::imm_vec' has a first argument of type '&vector<u64>'
+   ·
+19 │     use fun imm_vec as Y.imm_vec;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.imm_vec'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:20:5
+   │
+ 7 │     public fun mut_addr(_: &mut address) { abort 0 }
+   │                            ------------ But 'a::m::mut_addr' has a first argument of type '&mut address'
+   ·
+20 │     use fun mut_addr as Y.mut_addr;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.mut_addr'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:22:5
+   │
+ 9 │     public fun val_x(_: X) { abort 0 }
+   │                         - But 'a::m::val_x' has a first argument of type 'a::m::X'
+   ·
+22 │     use fun val_x as Y.val_x;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.val_x'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:23:5
+   │
+10 │     public fun imm_x(_: &X) { abort 0 }
+   │                         -- But 'a::m::imm_x' has a first argument of type '&a::m::X'
+   ·
+23 │     use fun imm_x as Y.imm_x;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.imm_x'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:24:5
+   │
+11 │     public fun mut_x(_: &mut X) { abort 0 }
+   │                         ------ But 'a::m::mut_x' has a first argument of type '&mut a::m::X'
+   ·
+24 │     use fun mut_x as Y.mut_x;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.mut_x'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:26:5
+   │
+13 │     public fun val_gen<T>(_: T) { abort 0 }
+   │                              - But 'a::m::val_gen' has a first argument of type 'T'
+   ·
+26 │     use fun val_gen as Y.val_gen;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.val_gen'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:27:5
+   │
+14 │     public fun imm_gen<T>(_: &T) { abort 0 }
+   │                              -- But 'a::m::imm_gen' has a first argument of type '&T'
+   ·
+27 │     use fun imm_gen as Y.imm_gen;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.imm_gen'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
+error[E02017]: invalid 'use fun' declaration
+   ┌─ tests/move_2024/naming/use_fun_bad_args.move:28:5
+   │
+15 │     public fun mut_gen<T>(_: &mut T) { abort 0 }
+   │                              ------ But 'a::m::mut_gen' has a first argument of type '&mut T'
+   ·
+28 │     use fun mut_gen as Y.mut_gen;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.mut_gen'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.move
new file mode 100644
index 000000000..cdc84a170
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_bad_args.move
@@ -0,0 +1,29 @@
+module a::m {
+    public struct X {}
+    public struct Y {}
+
+    public fun val_u64(_: u64) { abort 0 }
+    public fun imm_vec(_: &vector<u64>) { abort 0 }
+    public fun mut_addr(_: &mut address) { abort 0 }
+
+    public fun val_x(_: X) { abort 0 }
+    public fun imm_x(_: &X) { abort 0 }
+    public fun mut_x(_: &mut X) { abort 0 }
+
+    public fun val_gen<T>(_: T) { abort 0 }
+    public fun imm_gen<T>(_: &T) { abort 0 }
+    public fun mut_gen<T>(_: &mut T) { abort 0 }
+
+
+    use fun val_u64 as Y.val_u64;
+    use fun imm_vec as Y.imm_vec;
+    use fun mut_addr as Y.mut_addr;
+
+    use fun val_x as Y.val_x;
+    use fun imm_x as Y.imm_x;
+    use fun mut_x as Y.mut_x;
+
+    use fun val_gen as Y.val_gen;
+    use fun imm_gen as Y.imm_gen;
+    use fun mut_gen as Y.mut_gen;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.exp
new file mode 100644
index 000000000..dac59171d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.exp
@@ -0,0 +1,9 @@
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/naming/use_fun_no_args.move:6:5
+  │
+4 │     public fun no() { abort 0 }
+  │                -- But 'a::m::no' takes no arguments
+5 │ 
+6 │     use fun no as Y.no;
+  │     ^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::Y.no'. Expected a 'a::m::Y' type as the first argument (either by reference '&' '&mut' or by value)
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.move
new file mode 100644
index 000000000..eab464a2d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_no_args.move
@@ -0,0 +1,7 @@
+module a::m {
+    public struct Y {}
+
+    public fun no() { abort 0 }
+
+    use fun no as Y.no;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.exp
new file mode 100644
index 000000000..b2e9bf3ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.exp
@@ -0,0 +1,6 @@
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/naming/use_fun_with_builtin.move:2:5
+  │
+2 │     use fun freeze as vector.freeze;
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun'. Cannot use a builtin function as a method
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.move
new file mode 100644
index 000000000..6266f94e4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_builtin.move
@@ -0,0 +1,3 @@
+module a::m {
+    use fun freeze as vector.freeze;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.exp b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.exp
new file mode 100644
index 000000000..a430267e6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.exp
@@ -0,0 +1,17 @@
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/naming/use_fun_with_type_parameter.move:3:9
+  │
+2 │     fun foo<T>(x: T) {
+  │             - But 'T' was declared as a type parameter here
+3 │         use fun foo as T.foo;
+  │         ^^^^^^^^^^^^^^^^^^^^^ Invalid 'use fun'. Cannot associate a method a type parameter
+
+error[E04023]: invalid method call
+  ┌─ tests/move_2024/naming/use_fun_with_type_parameter.move:4:9
+  │
+2 │     fun foo<T>(x: T) {
+  │                   - Method calls are not supported on type parameters. Got an expression of type: 'T'
+3 │         use fun foo as T.foo;
+4 │         x.foo();
+  │         ^^^^^^^ Invalid method call
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.move b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.move
new file mode 100644
index 000000000..850f6e007
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/naming/use_fun_with_type_parameter.move
@@ -0,0 +1,7 @@
+module a::m {
+    fun foo<T>(x: T) {
+        use fun foo as T.foo;
+        x.foo();
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.exp
new file mode 100644
index 000000000..e8101b847
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.exp
@@ -0,0 +1,8 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_2024/parser/ability_modifier_infix_and_postfix.move:4:41
+  │
+4 │     public struct Foo has copy, drop {} has store;
+  │                       ---               ^^^ Duplicate ability declaration. Abilities can be declared before or after the field declarations, but not both.
+  │                       │                  
+  │                       Ability declaration previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.move
new file mode 100644
index 000000000..6a166ede0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // has both prefix and postfix ability declarations
+    public struct Foo has copy, drop {} has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.exp
new file mode 100644
index 000000000..896bf05c5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.move:5:46
+  │
+5 │     public native struct Foo has copy, drop; has store;
+  │                                              ^^^
+  │                                              │
+  │                                              Unexpected 'has'
+  │                                              Expected a module member: 'spec', 'use', 'friend', 'const', 'fun', or 'struct'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.move
new file mode 100644
index 000000000..87fb825a9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_and_postfix_native_struct.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // has both invalid declaration since postfix ability declarations
+    // are not allowed for native structs
+    public native struct Foo has copy, drop; has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.exp
new file mode 100644
index 000000000..d52bbc64b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.move:4:45
+  │
+4 │     public native struct Foo has copy, drop has store;
+  │                                             ^^^
+  │                                             │
+  │                                             Unexpected 'has'
+  │                                             Expected one of: ',', '{', '(', or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.move
new file mode 100644
index 000000000..c785b9c97
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // has both prefix and invalid postfix ability declarations
+    public native struct Foo has copy, drop has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp
new file mode 100644
index 000000000..60444e17b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move:4:46
+  │
+4 │     public native struct Foo has copy, drop, has store;
+  │                                              ^^^ Unexpected 'has'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move
new file mode 100644
index 000000000..c948aeeef
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // has both prefix and invalid postfix ability declarations
+    public native struct Foo has copy, drop, has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.exp
new file mode 100644
index 000000000..f745ac327
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.move:4:20
+  │
+4 │     struct Foo has {} has copy;
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.move
new file mode 100644
index 000000000..642988385
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_invalid_infix_with_valid_postfix.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {} has copy;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.exp
new file mode 100644
index 000000000..de24c7621
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_no_abilities.move:4:20
+  │
+4 │     struct Foo has {}
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.move
new file mode 100644
index 000000000..361635c3e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_no_abilities.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.exp
new file mode 100644
index 000000000..e6535654b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_missing_commas.move:4:36
+  │
+4 │     public struct Foo {} has store copy;
+  │                                    ^^^^
+  │                                    │
+  │                                    Unexpected 'copy'
+  │                                    Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.move
new file mode 100644
index 000000000..bf0135c2a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_commas.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Ability declarations require commas between them.
+    public struct Foo {} has store copy;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp
new file mode 100644
index 000000000..27e730130
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.move:5:5
+  │
+5 │     public struct Bar has key {}
+  │     ^^^^^^
+  │     │
+  │     Unexpected 'public'
+  │     Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.move
new file mode 100644
index 000000000..7a3325239
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_missing_semi_multiple_structs.move
@@ -0,0 +1,8 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons at the end.
+    public struct Foo {} has store
+    public struct Bar has key {}
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.exp
new file mode 100644
index 000000000..325a0cb0a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.move:5:1
+  │
+5 │ }
+  │ ^ Unexpected '}'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.move
new file mode 100644
index 000000000..e7508ab88
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_no_semi.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require at least one ability.
+    public struct Foo {} has
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.exp
new file mode 100644
index 000000000..7c91e1c46
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.move:4:29
+  │
+4 │     public struct Foo {} has;
+  │                             ^ Unexpected ';'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.move
new file mode 100644
index 000000000..6cddeb318
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_abilities_with_semi.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require at least one ability.
+    public struct Foo {} has;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.exp
new file mode 100644
index 000000000..13241ba3b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_no_fields.move:4:45
+  │
+4 │     public native struct Foo has copy, drop has store;
+  │                                             ^^^
+  │                                             │
+  │                                             Unexpected 'has'
+  │                                             Expected one of: ',', '{', '(', or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.move
new file mode 100644
index 000000000..37edb55f6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_fields.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // native structs cannot have suffix ability declarations.
+    public native struct Foo has copy, drop has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.exp
new file mode 100644
index 000000000..865330751
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifier_postfix_no_semi.move:5:1
+  │
+5 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.move
new file mode 100644
index 000000000..d6c78ef6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_no_semi.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons.
+    public struct Foo {} has store
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_with_semi.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_with_semi.move
new file mode 100644
index 000000000..2e1d03fd9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifier_postfix_with_semi.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M {
+    public struct Foo {} has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.exp
new file mode 100644
index 000000000..3fbfba8fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.move:4:31
+  │
+4 │     struct Foo has copy {} has;
+  │                               ^ Unexpected ';'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.move
new file mode 100644
index 000000000..a1314a592
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_infix_no_abilities_postfix.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has copy {} has;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.exp
new file mode 100644
index 000000000..b0a13df84
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.move:4:20
+  │
+4 │     struct Foo has {} has;
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.move
new file mode 100644
index 000000000..e48dc7ba1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/ability_modifies_no_abilities_infix_postfix.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {} has;
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence.move
new file mode 100644
index 000000000..574ffa316
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence.move
@@ -0,0 +1,27 @@
+module a::m {
+
+    public struct X has drop {}
+    public struct Y has drop {}
+
+    fun ximm(_: &X): &Y { abort 0 }
+    fun xmut(_: &mut X): &mut Y { abort 0}
+    fun xval(_: X): Y { abort 0 }
+
+    fun yimm(_: &Y): &X { abort 0 }
+    fun ymut(_: &mut Y): &mut X { abort 0}
+    fun yval(_: Y): X { abort 0 }
+
+    fun t(cond: bool) {
+        let y: &mut Y = &mut X { } . xval ();
+        *y = Y {};
+        let _: &mut Y = (&mut X { }) . xmut ();
+        let _: Y = if (cond) Y {} else X {} . xval ();
+        let _: Y = (if (cond) X {} else X {}) . xval ();
+        let _: X = X {} . xval () . yval();
+        let _: X = if (cond) X{}.xval().yval() else Y{}.yval().xval().yval();
+        let x: &mut X = &mut if (cond) X{}.xval().yval() else Y{}.yval().xval().yval();
+        *x = X {};
+        let _: &mut Y = (&mut if (cond) X{} else Y {} . yval ()) . xmut ();
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term.move
new file mode 100644
index 000000000..f0ee4e2d2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term.move
@@ -0,0 +1,45 @@
+// tests using all (potentially valid) terms on the LHS of a dot call
+
+module a::m {
+
+    public struct X has drop {}
+    public struct Y has drop {}
+
+    fun xeat(_: X) { abort 0 }
+    fun ximm(_: &X): &Y { abort 0 }
+    fun xmut(_: &mut X): &mut Y { abort 0}
+    fun xval(_: X): Y { abort 0 }
+
+    fun yimm(_: &Y): &X { abort 0 }
+    fun ymut(_: &mut Y): &mut X { abort 0}
+    fun yval(_: Y): X { abort 0 }
+
+    #[allow(dead_code)]
+    fun t(cond: bool): Y {
+        vector [0] .length();
+        vector<bool> [] .length();
+        0u64.next();
+        (0: u64).next();
+        (0u8 as u64).next();
+        { X{} }.xval();
+        if (cond) X{} else { X{} }.xval();
+        if (cond) X{}.xeat();
+        while (cond) X{}.xeat();
+        loop X{}.xeat();
+        abort 0u64.next();
+        Y {}
+    }
+
+}
+
+
+#[defines_primitive(vector)]
+module std::vector {
+    #[bytecode_instruction]
+    public native fun length<T>(v: &vector<T>): u64;
+}
+
+#[defines_primitive(u64)]
+module std::u64 {
+    public fun next(x: u64): u64 { x + 1 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.exp
new file mode 100644
index 000000000..853d4f196
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.exp
@@ -0,0 +1,96 @@
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:18:13
+   │
+18 │             break.xval();
+   │             ^^^^^^^^^^^^
+   │             │
+   │             Invalid method call
+   │             Unable to infer type for method call. Try annotating this type
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:19:13
+   │
+19 │             continue.xval();
+   │             ^^^^^^^^^^^^^^^
+   │             │
+   │             Invalid method call
+   │             Unable to infer type for method call. Try annotating this type
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:21:9
+   │
+21 │         vector [] .length();
+   │         ^^^^^^^^^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:21:9
+   │
+21 │         vector [] .length();
+   │         ^^^^^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:22:9
+   │
+22 │         (X{}, Y{}).xval();
+   │         ^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Method calls are only supported on single types. Got an expression of type: '(a::m::X, a::m::Y)'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:23:9
+   │
+23 │         0.next();
+   │         ^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Unable to infer type for method call. Try annotating this type
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:24:9
+   │
+24 │         while (cond) { }.xeat();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Method calls are only supported on single types. Got an expression of type: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:25:9
+   │
+16 │     fun t(cond: bool) {
+   │         - Expected: '()'
+   ·
+25 │         return { X{} }.xval();
+   │         ^^^^^^^^^^^^^^
+   │         │        │
+   │         │        Given: 'a::m::X'
+   │         Invalid return
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:25:9
+   │
+25 │         return { X{} }.xval();
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Unable to infer type for method call. Try annotating this type
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:26:9
+   │
+26 │         return.xval();
+   │         ^^^^^^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Unable to infer type for method call. Try annotating this type
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/parser/dot_call_precedence_term_nonsense.move:27:9
+   │
+27 │         abort { 0 } .length();
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid method call
+   │         Unable to infer type for method call. Try annotating this type
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.move
new file mode 100644
index 000000000..ce8550274
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_precedence_term_nonsense.move
@@ -0,0 +1,42 @@
+// tests using all (syntactically valid, but typing invalid) terms on the LHS of a dot call
+
+module a::m {
+
+    public struct X has drop {}
+    public struct Y has drop {}
+
+    fun ximm(_: &X): &Y { abort 0 }
+    fun xmut(_: &mut X): &mut Y { abort 0}
+    fun xval(_: X): Y { abort 0 }
+
+    fun yimm(_: &Y): &X { abort 0 }
+    fun ymut(_: &mut Y): &mut X { abort 0}
+    fun yval(_: Y): X { abort 0 }
+
+    fun t(cond: bool) {
+        loop {
+            break.xval();
+            continue.xval();
+        };
+        vector [] .length();
+        (X{}, Y{}).xval();
+        0.next();
+        while (cond) { }.xeat();
+        return { X{} }.xval();
+        return.xval();
+        abort { 0 } .length();
+    }
+
+}
+
+
+#[defines_primitive(vector)]
+module std::vector {
+    #[bytecode_instruction]
+    public native fun length<T>(v: &vector<T>): u64;
+}
+
+#[defines_primitive(u64)]
+module std::u64 {
+    public fun next(x: u64): u64 { x + 1 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments.move
new file mode 100644
index 000000000..f4f7e552f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments.move
@@ -0,0 +1,14 @@
+module a::m {
+    public struct Cup<T> {
+        value: T
+    }
+    public fun uncup<T>(c: Cup<T>): T {
+        let Cup { value } = c;
+        value
+    }
+
+    fun t() {
+        let c = Cup { value: 0 };
+        c.uncup<u64> ();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.exp
new file mode 100644
index 000000000..51f8d3c10
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.exp
@@ -0,0 +1,38 @@
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/dot_call_type_arguments_invalid.move:12:9
+   │
+12 │         c.uncup <u64> ();
+   │         ^^^^^^^ Unbound field 'uncup' in 'a::m::Cup'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_2024/parser/dot_call_type_arguments_invalid.move:12:9
+   │
+12 │         c.uncup <u64> ();
+   │         ^^^^^^^^^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E03009]: unbound variable
+   ┌─ tests/move_2024/parser/dot_call_type_arguments_invalid.move:12:18
+   │
+12 │         c.uncup <u64> ();
+   │                  ^^^ Invalid variable usage. Unbound variable 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/parser/dot_call_type_arguments_invalid.move:12:21
+   │
+12 │         c.uncup <u64> ();
+   │         ------------^ -- Found: '()'. It is not compatible with the other type.
+   │         │           │  
+   │         │           Incompatible arguments to '>'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_2024/parser/dot_call_type_arguments_invalid.move:12:23
+   │
+12 │         c.uncup <u64> ();
+   │         ------------  ^^ Invalid argument to '>'
+   │         │              
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.move
new file mode 100644
index 000000000..5412353ff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/dot_call_type_arguments_invalid.move
@@ -0,0 +1,14 @@
+module a::m {
+    public struct Cup<T> {
+        value: T
+    }
+    public fun uncup<T>(c: Cup<T>): T {
+        let Cup { value } = c;
+        value
+    }
+
+    fun t() {
+        let c = Cup { value: 0 };
+        c.uncup <u64> ();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.exp
new file mode 100644
index 000000000..ccaf6af99
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/enum_keyword.move:1:11
+  │
+1 │ module a::enum {}
+  │           ^^^^
+  │           │
+  │           Unexpected 'enum'
+  │           Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.move
new file mode 100644
index 000000000..7a77941bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/enum_keyword.move
@@ -0,0 +1 @@
+module a::enum {}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.exp
new file mode 100644
index 000000000..24eb96827
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.exp
@@ -0,0 +1,42 @@
+error[E03013]: positional call mismatch
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:13
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid deconstruction. Named struct field declarations require named deconstruction
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:13
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Missing binding for field 'f' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:13
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E03013]: positional call mismatch
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:21
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │                     ^^^^^^^^^^^^^^ Invalid deconstruction. Named struct field declarations require named deconstruction
+
+error[E04016]: too few arguments
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:21
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │                     ^^^^^^^^^^^^^^ Missing binding for field 'f' in '0x42::M::Bar'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:21
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │                     ^^^^^^^^^^^^^^ Unbound field '0' in '0x42::M::Bar'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move:27:21
+   │
+27 │         let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+   │                     ^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move
new file mode 100644
index 000000000..2c00a36ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/invalid_positional_struct_unpack_deeply_nested.move
@@ -0,0 +1,31 @@
+address 0x42 {
+module M {
+    public struct Foo<T>(T, u64) has drop;
+
+    public struct Bar<T> {
+        f: Foo<T>,
+    } has drop;
+
+    fun x(y: Foo<u64>): u64 {
+        y.0 + y.1
+    }
+
+    fun xx(y: Foo<u64>): u64 {
+        let Foo(x, y) = y;
+        x + y
+    }
+
+    fun t(y: Bar<u64>): u64 {
+        y.f.0 + y.f.1
+    }
+
+    fun z(y: Bar<Foo<Bar<u64>>>): u64 {
+        y.f.0.0.f.0 + y.f.0.0.f.1 + y.f.1
+    }
+
+    fun zz(y: Bar<Foo<Bar<u64>>>): u64 {
+        let Bar(Foo(Bar(Foo(x, y)), z)) = y;
+        x + y + z
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.exp
new file mode 100644
index 000000000..74b5be377
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/match_keyword.move:2:9
+  │
+2 │     fun match(_: u64): bool { false }
+  │         ^^^^^
+  │         │
+  │         Unexpected 'match'
+  │         Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.move
new file mode 100644
index 000000000..422fd611f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/match_keyword.move
@@ -0,0 +1,3 @@
+module a::m {
+    fun match(_: u64): bool { false }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.exp
new file mode 100644
index 000000000..a2dcaeeca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/mut_field_pun_invalid_assign.move:6:13
+  │
+6 │         S { mut f } = s1;
+  │             ^^^
+  │             │
+  │             Unexpected 'mut'
+  │             Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.move
new file mode 100644
index 000000000..6e45a11de
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_assign.move
@@ -0,0 +1,8 @@
+module a::m {
+    public struct S { f: u64 }
+
+    public fun foo(s: S) {
+        let f = 0;
+        S { mut f } = s1;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.exp
new file mode 100644
index 000000000..3502d1af3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/mut_field_pun_invalid_pack.move:6:13
+  │
+6 │         S { mut f }
+  │             ^^^
+  │             │
+  │             Unexpected 'mut'
+  │             Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.move
new file mode 100644
index 000000000..c3ca64669
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_invalid_pack.move
@@ -0,0 +1,8 @@
+module a::m {
+    public struct S { f: u64 }
+
+    public fun foo(): S {
+        let f = 0;
+        S { mut f }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_valid.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_valid.move
new file mode 100644
index 000000000..be795fd6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_field_pun_valid.move
@@ -0,0 +1,20 @@
+module a::m {
+    public struct S { f: u64 }
+
+    public fun foo(s1: S, s2: &mut S, s3: &S) {
+        let mut x = 0;
+        let S { mut f } = s1;
+        f = f + 1;
+        f;
+
+        let S { mut f } = s2;
+        f;
+        f = &mut x;
+        f;
+
+        let S { mut f } = s3;
+        f;
+        f = &x;
+        f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.exp
new file mode 100644
index 000000000..92e3a4248
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/mut_keyword.move:5:23
+  │
+5 │     public fun foo(mut: &mut u64): &mut u64 {
+  │                       ^
+  │                       │
+  │                       Unexpected ':'
+  │                       Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.move
new file mode 100644
index 000000000..9945bb65e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_keyword.move
@@ -0,0 +1,8 @@
+module a::m {
+    public struct S {
+        f: u64,
+    }
+    public fun foo(mut: &mut u64): &mut u64 {
+        mut
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_space.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_space.move
new file mode 100644
index 000000000..af4468f7b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/mut_space.move
@@ -0,0 +1,10 @@
+module a::m {
+    public struct S {
+        f: u64,
+    }
+    public fun foo(x: & mut S): & mut u64 {
+        & mut x.f;
+        &
+        mut x.f
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.exp
new file mode 100644
index 000000000..354e88d33
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/named_struct_with_positional_fields.move:4:26
+  │
+4 │     public struct Foo{u64, u16} has copy, drop;
+  │                          ^
+  │                          │
+  │                          Unexpected ','
+  │                          Expected ':'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.move
new file mode 100644
index 000000000..2bfec482b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/named_struct_with_positional_fields.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Invalid positional field struct declaration
+    public struct Foo{u64, u16} has copy, drop;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/new_keywords_restricted_ident.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/new_keywords_restricted_ident.move
new file mode 100644
index 000000000..96b28723e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/new_keywords_restricted_ident.move
@@ -0,0 +1,22 @@
+module a::m {
+    public fun foo(): u64 {
+        let mut `mut` = 0;
+        let mut `enum` = 0;
+        let mut `type` = 0;
+        let mut `match` = 0;
+        `mut` +
+        `enum`+
+        `type` +
+        `match` +
+        0;
+        `mut` = 1;
+        `enum` = 1;
+        `type` = 1;
+        `match` = 1;
+        `mut` +
+        `enum` +
+        `type` +
+        `match` +
+        0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.exp
new file mode 100644
index 000000000..1209bf230
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.exp
@@ -0,0 +1,40 @@
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/positional_field_access.move:26:9
+   │
+26 │         y.0x0 + y.0xff
+   │         ^^^^^ Unbound field '0x0' in '0x42::M::Foo'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/parser/positional_field_access.move:26:11
+   │
+26 │         y.0x0 + y.0xff
+   │           ^^^ Invalid field access. Expected a decimal number but was given a hexadecimal
+   │
+   = Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/positional_field_access.move:26:17
+   │
+26 │         y.0x0 + y.0xff
+   │                 ^^^^^^ Unbound field '0xff' in '0x42::M::Foo'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/parser/positional_field_access.move:26:19
+   │
+26 │         y.0x0 + y.0xff
+   │                   ^^^^ Invalid field access. Expected a decimal number but was given a hexadecimal
+   │
+   = Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/positional_field_access.move:30:9
+   │
+30 │         y.1_0 + y.1_0_0
+   │         ^^^^^ Unbound field '10' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+   ┌─ tests/move_2024/parser/positional_field_access.move:30:17
+   │
+30 │         y.1_0 + y.1_0_0
+   │                 ^^^^^^^ Unbound field '100' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.move
new file mode 100644
index 000000000..47e550dab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access.move
@@ -0,0 +1,33 @@
+address 0x42 {
+module M {
+    public struct Foo<T>(T, u64) has drop;
+
+    public struct Bar<T> {
+        f: Foo<T>,
+    } has drop;
+
+    fun x(y: Foo<u64>): u64 {
+        y.0 + y.1
+    }
+
+    fun t(y: Bar<u64>): u64 {
+        y.f.0 + y.f.1
+    }
+
+    fun z(y: Bar<Foo<Bar<u64>>>): u64 {
+        y.f.0.0.f.0 + y.f.0.0.f.1 + y.f.1
+    }
+
+    fun a(y: Foo<u64>): u64 {
+        y.0001 + y.0001
+    }
+
+    fun hex(y: Foo<u64>): u64 {
+        y.0x0 + y.0xff
+    }
+
+    fun underscores(y: Foo<u64>): u64 {
+        y.1_0 + y.1_0_0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.exp
new file mode 100644
index 000000000..68e37a54a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.exp
@@ -0,0 +1,14 @@
+error[E03010]: unbound field
+  ┌─ tests/move_2024/parser/positional_field_access_greater_than_u8_max.move:6:9
+  │
+6 │         y.256
+  │         ^^^^^ Unbound field '256' in '0x42::M::Foo'
+
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_field_access_greater_than_u8_max.move:6:11
+  │
+6 │         y.256
+  │           ^^^ Invalid field access. Expected a number less than or equal to 255
+  │
+  = Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.move
new file mode 100644
index 000000000..71777bf67
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_greater_than_u8_max.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module M {
+    public struct Foo(u64)
+
+    fun x(y: Foo): u64 {
+        y.256
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.exp
new file mode 100644
index 000000000..b6b258e02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.exp
@@ -0,0 +1,14 @@
+error[E03010]: unbound field
+  ┌─ tests/move_2024/parser/positional_field_access_no_annotations.move:6:9
+  │
+6 │         y.0_u8
+  │         ^^^^^^ Unbound field '0_u8' in '0x42::M::Foo'
+
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_field_access_no_annotations.move:6:11
+  │
+6 │         y.0_u8
+  │           ^^^^ Invalid field access. Expected a number less than or equal to 255
+  │
+  = Positional fields must be a decimal number in the range [0 .. 255] and not be typed, e.g. `0`
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.move
new file mode 100644
index 000000000..b3c551e3b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_field_access_no_annotations.move
@@ -0,0 +1,10 @@
+address 0x42 {
+module M {
+    public struct Foo(u64)
+
+    fun x(y: Foo): u64 {
+        y.0_u8
+    }
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.exp
new file mode 100644
index 000000000..c48c8f682
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_struct_explicit_type_arg_assign.move:6:22
+  │
+6 │         Foo <u64>(_) = Foo(0);
+  │                      ^
+  │                      │
+  │                      Unexpected '='
+  │                      Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.move
new file mode 100644
index 000000000..90c3cd3ab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_arg_assign.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module M {
+    public struct Foo<T>(T) has drop;
+
+    fun should_fail() {
+        Foo <u64>(_) = Foo(0);
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.exp
new file mode 100644
index 000000000..733f2ddf3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.exp
@@ -0,0 +1,38 @@
+error[E03003]: unbound module member
+   ┌─ tests/move_2024/parser/positional_struct_explicit_type_args.move:17:17
+   │
+17 │         let _ = Foo <u64>(0);
+   │                 ^^^ Invalid module access. Unbound constant 'Foo' in module '0x42::M'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_2024/parser/positional_struct_explicit_type_args.move:17:17
+   │
+17 │         let _ = Foo <u64>(0);
+   │                 ^^^^^^^^
+   │                 │
+   │                 Invalid argument to '>'
+   │                 Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E03009]: unbound variable
+   ┌─ tests/move_2024/parser/positional_struct_explicit_type_args.move:17:22
+   │
+17 │         let _ = Foo <u64>(0);
+   │                      ^^^ Invalid variable usage. Unbound variable 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/parser/positional_struct_explicit_type_args.move:17:25
+   │
+17 │         let _ = Foo <u64>(0);
+   │                 --------^--- Found: integer. It is not compatible with the other type.
+   │                 │       │ 
+   │                 │       Incompatible arguments to '>'
+   │                 Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_2024/parser/positional_struct_explicit_type_args.move:17:26
+   │
+17 │         let _ = Foo <u64>(0);
+   │                 -------- ^^^ Invalid argument to '>'
+   │                 │         
+   │                 Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.move
new file mode 100644
index 000000000..5e4ccad13
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_explicit_type_args.move
@@ -0,0 +1,20 @@
+address 0x42 {
+module M {
+    public struct Foo<T>(T) has drop;
+    public struct Bar<T>{ x: T } has drop;
+
+    fun should_pass() {
+        let x = Foo(0);
+        let y = Foo<u64>(0);
+        let Foo<u64>(_) = x;
+        Foo<u64>(_) = y;
+
+        let Foo <u64>(_) = Foo(0);
+        let Bar <u64>{x: _ } = Bar{ x: 0 };
+    }
+
+    fun should_fail() {
+        let _ = Foo <u64>(0);
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.exp
new file mode 100644
index 000000000..764b27f22
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_struct_fields_keyword_field.move:4:23
+  │
+4 │     public struct Foo(fun)
+  │                       ^^^
+  │                       │
+  │                       Unexpected 'fun'
+  │                       Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.move
new file mode 100644
index 000000000..a0cf9f984
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_keyword_field.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // keyword instead of a type
+    public struct Foo(fun)
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.exp
new file mode 100644
index 000000000..ca66e1456
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_struct_fields_non_type_field.move:4:27
+  │
+4 │     public struct Foo(Not a type)
+  │                      -    ^ Expected ')'
+  │                      │     
+  │                      To match this '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.move
new file mode 100644
index 000000000..97294bbd7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_non_type_field.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Invalid type inside a positional struct
+    public struct Foo(Not a type)
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple.move
new file mode 100644
index 000000000..8d4960254
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple.move
@@ -0,0 +1,13 @@
+address 0x42 {
+module M {
+    // Valid positional field struct declaration
+    public struct Foo(u64) has copy, drop;
+    public struct Bar has copy (u64) 
+    public struct Baz()
+    public struct Qux(
+        /// A field with a doc comment
+        u64,
+        /** another field with another doc comment **/
+        u64,)
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.exp
new file mode 100644
index 000000000..b6a9a9686
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.exp
@@ -0,0 +1,8 @@
+warning[W09003]: unused assignment
+   ┌─ tests/move_2024/parser/positional_struct_fields_simple_construct.move:14:13
+   │
+14 │         let x = Foo(0);
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.move
new file mode 100644
index 000000000..daa6a52a8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_simple_construct.move
@@ -0,0 +1,18 @@
+address 0x42 {
+module M {
+    // Valid positional field struct declaration
+    public struct Foo(u64) has copy, drop;
+    public struct Bar has copy (u64) 
+    public struct Baz()
+    public struct Qux(
+        /// A field with a doc comment
+        u64,
+        /** another field with another doc comment **/
+        u64,)
+
+    fun x() {
+        let x = Foo(0);
+        abort 0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.exp
new file mode 100644
index 000000000..f4b9b9379
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_struct_fields_with_idents.move:4:24
+  │
+4 │     public struct Foo(x: u64) has copy, drop;
+  │                      - ^ Expected ')'
+  │                      │  
+  │                      To match this '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.move
new file mode 100644
index 000000000..1d571a55e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_fields_with_idents.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // Valid positional field struct declaration
+    public struct Foo(x: u64) has copy, drop;
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_unpack.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_unpack.move
new file mode 100644
index 000000000..6fae0c077
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_unpack.move
@@ -0,0 +1,31 @@
+address 0x42 {
+module M {
+    public struct Foo<T>(T, u64) has drop;
+
+    public struct Bar<T> {
+        f: Foo<T>,
+    } has drop;
+
+    fun x(y: Foo<u64>): u64 {
+        y.0 + y.1
+    }
+
+    fun xx(y: Foo<u64>): u64 {
+        let Foo(x, y) = y;
+        x + y
+    }
+
+    fun t(y: Bar<u64>): u64 {
+        y.f.0 + y.f.1
+    }
+
+    fun z(y: Bar<Foo<Bar<u64>>>): u64 {
+        y.f.0.0.f.0 + y.f.0.0.f.1 + y.f.1
+    }
+
+    fun zz(y: Bar<Foo<Bar<u64>>>): u64 {
+        let Bar{f: Foo(Foo(Bar{f: Foo(x, y)}, z), t)} = y;
+        x + y + z + t
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.exp
new file mode 100644
index 000000000..90af4e595
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_struct_using_curlies.move:4:29
+  │
+4 │     public struct Foo { u64 }
+  │                             ^
+  │                             │
+  │                             Unexpected '}'
+  │                             Expected ':'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.move
new file mode 100644
index 000000000..237a6dcbc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_struct_using_curlies.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Positional struct declarations must use parenthesis and not braces
+    public struct Foo { u64 }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.exp
new file mode 100644
index 000000000..3008dedfc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/positional_with_named_struct_field.move:4:24
+  │
+4 │     public struct Foo(f: u64) has copy, drop;
+  │                      - ^ Expected ')'
+  │                      │  
+  │                      To match this '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.move
new file mode 100644
index 000000000..48256ea24
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/positional_with_named_struct_field.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Invalid positional field struct declaration
+    public struct Foo(f: u64) has copy, drop;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.exp
new file mode 100644
index 000000000..48870472d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.exp
@@ -0,0 +1,40 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_2024/parser/struct_public.move:3:5
+  │
+3 │     struct Foo {}
+  │     ^^^^^^ Invalid struct declaration. Internal struct declarations are not yet supported
+  │
+  = Visibility annotations are required on struct declarations from the Move 2024 edition onwards.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_2024/parser/struct_public.move:4:5
+  │
+4 │     public(friend) struct Foo {}
+  │     ^^^^^^^^^^^^^^ Invalid struct declaration. 'public(friend)' struct declarations are not yet supported
+  │
+  = Visibility annotations are required on struct declarations from the Move 2024 edition onwards.
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_2024/parser/struct_public.move:4:27
+  │
+3 │     struct Foo {}
+  │            --- Alias previously defined here
+4 │     public(friend) struct Foo {}
+  │                           ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_2024/parser/struct_public.move:5:5
+  │
+5 │     public(package) struct Foo {}
+  │     ^^^^^^^^^^^^^^^ Invalid struct declaration. 'public(package)' struct declarations are not yet supported
+  │
+  = Visibility annotations are required on struct declarations from the Move 2024 edition onwards.
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_2024/parser/struct_public.move:5:28
+  │
+4 │     public(friend) struct Foo {}
+  │                           --- Alias previously defined here
+5 │     public(package) struct Foo {}
+  │                            ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.move
new file mode 100644
index 000000000..5f790051a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/struct_public.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    // visibility modifiers on structs fail during parsing
+    struct Foo {}
+    public(friend) struct Foo {}
+    public(package) struct Foo {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.exp
new file mode 100644
index 000000000..b8fd73156
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/type_kewyord.move:2:12
+  │
+2 │     struct type<T> { t: T }
+  │            ^^^^
+  │            │
+  │            Unexpected 'type'
+  │            Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.move
new file mode 100644
index 000000000..8c4a95cdf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/type_kewyord.move
@@ -0,0 +1,3 @@
+module a::m {
+    struct type<T> { t: T }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun.move
new file mode 100644
index 000000000..5ac94a600
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun.move
@@ -0,0 +1,22 @@
+#[allow(unused_use)]
+module a::m {
+    public struct X {}
+
+    use fun Self::foo as X.f1;
+    use fun a::m::foo as X.f2;
+
+    use fun foo as Self::X.f3;
+    use fun foo as a::m::X.f4;
+
+    use fun foo as X.f5;
+
+    public use fun Self::foo as X.g1;
+    public use fun a::m::foo as X.g2;
+
+    public use fun foo as Self::X.g3;
+    public use fun foo as a::m::X.g4;
+
+    public use fun foo as X.g5;
+
+    fun foo(_: X) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.exp
new file mode 100644
index 000000000..5a7608e1a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/use_fun_multi.move:2:20
+  │
+2 │     use fun foo as (u64, bool).foo;
+  │                    ^
+  │                    │
+  │                    Unexpected '('
+  │                    Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.move
new file mode 100644
index 000000000..a1b3657d0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_multi.move
@@ -0,0 +1,4 @@
+module a::m {
+    use fun foo as (u64, bool).foo;
+    fun foo(_: u64, _: bool) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.exp
new file mode 100644
index 000000000..76c3f1da8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/use_fun_ref.move:3:20
+  │
+3 │     use fun foo as &X.foo;
+  │                    ^
+  │                    │
+  │                    Unexpected '&'
+  │                    Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.move
new file mode 100644
index 000000000..b3f69f830
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_ref.move
@@ -0,0 +1,5 @@
+module a::m {
+    public struct X {}
+    use fun foo as &X.foo;
+    fun foo(_: &X) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.exp
new file mode 100644
index 000000000..d7572427e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/use_fun_type_args.move:3:21
+  │
+3 │     use fun foo as X<u64>.foo;
+  │                     ^
+  │                     │
+  │                     Unexpected '<'
+  │                     Expected '.'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.move
new file mode 100644
index 000000000..1824a6ec3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_type_args.move
@@ -0,0 +1,5 @@
+module a::m {
+    public struct X<phantom T> {}
+    use fun foo as X<u64>.foo;
+    fun foo<T>(_: X<T>) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.exp
new file mode 100644
index 000000000..80fe702a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/parser/use_fun_unit.move:2:20
+  │
+2 │     use fun foo as ().foo;
+  │                    ^
+  │                    │
+  │                    Unexpected '('
+  │                    Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.move
new file mode 100644
index 000000000..6f6e6021d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_unit.move
@@ -0,0 +1,4 @@
+module a::m {
+    use fun foo as ().foo;
+    fun foo() { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.exp b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.exp
new file mode 100644
index 000000000..7e1b8dcb3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.exp
@@ -0,0 +1,27 @@
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/parser/use_fun_visibility.move:2:5
+  │
+2 │     public(script) use fun foo as S.f;
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │     │
+  │     Invalid visibility for 'use fun' declaration
+  │     Module level 'use fun' declarations can be 'public' for the module's types, otherwise they must internal to declared scope.
+
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/parser/use_fun_visibility.move:3:5
+  │
+3 │     public(friend) use fun foo as S.g;
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │     │
+  │     Invalid visibility for 'use fun' declaration
+  │     Module level 'use fun' declarations can be 'public' for the module's types, otherwise they must internal to declared scope.
+
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/parser/use_fun_visibility.move:4:5
+  │
+4 │     public(package) use fun foo as S.h;
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │     │
+  │     Invalid visibility for 'use fun' declaration
+  │     Module level 'use fun' declarations can be 'public' for the module's types, otherwise they must internal to declared scope.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.move b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.move
new file mode 100644
index 000000000..859f75c88
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/parser/use_fun_visibility.move
@@ -0,0 +1,12 @@
+module a::m {
+    public(script) use fun foo as S.f;
+    public(friend) use fun foo as S.g;
+    public(package) use fun foo as S.h;
+    public struct S {}
+    fun foo(s: &S) {
+        s.f();
+        s.g();
+        s.h();
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.exp b/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.exp
new file mode 100644
index 000000000..40d470726
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.exp
@@ -0,0 +1,14 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_2024/struct_invalid_visibility_progress_inside.move:2:5
+  │
+2 │     struct Foo {
+  │     ^^^^^^ Invalid struct declaration. Internal struct declarations are not yet supported
+  │
+  = Visibility annotations are required on struct declarations from the Move 2024 edition onwards.
+
+error[E03004]: unbound type
+  ┌─ tests/move_2024/struct_invalid_visibility_progress_inside.move:3:12
+  │
+3 │         x: Bar<foo>,
+  │            ^^^ Unbound type 'Bar' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.move b/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.move
new file mode 100644
index 000000000..367b94570
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/struct_invalid_visibility_progress_inside.move
@@ -0,0 +1,5 @@
+module 0x42::M {
+    struct Foo {
+        x: Bar<foo>,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/to_bytecode/positional_unpack_of_positional_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/to_bytecode/positional_unpack_of_positional_struct.move
new file mode 100644
index 000000000..cdc16c6cc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/to_bytecode/positional_unpack_of_positional_struct.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module M {
+    public struct Foo(u64) has copy, drop;
+
+    fun x() {
+        let x = Foo(0);
+        let Foo(_) = x;
+        Foo(_) = x;
+        abort 0
+    }
+}
+}
+
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/defines_primitive.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/defines_primitive.move
new file mode 100644
index 000000000..27c6e6f8f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/defines_primitive.move
@@ -0,0 +1,63 @@
+module a::m {
+    public struct S {}
+    public fun test(s: &signer) {
+        let _: &address = s.as_address();
+        let _: address = s.to_address();
+        let _: u64 = 0u64.max(1);
+
+        let mut v = vector[];
+        let _: u64 = v.length();
+        v.push_back(S {});
+        let _: &S = v.borrow(0);
+        let _: &mut S = v.borrow_mut(0);
+        v.swap(0, 0);
+        let S {} = v.pop_back();
+        v.destroy_empty();
+    }
+}
+
+#[defines_primitive(signer)]
+module std::signer {
+    native public fun borrow_address(s: &signer): &address;
+    public fun as_address(s: &signer): &address {
+        borrow_address(s)
+    }
+    public fun to_address(s: &signer): address {
+        *borrow_address(s)
+    }
+}
+
+#[defines_primitive(u64)]
+module std::u64 {
+    public fun max(a: u64, b: u64): u64 {
+        if (a >= b) a
+        else b
+    }
+}
+
+#[defines_primitive(vector)]
+module std::vector {
+    #[bytecode_instruction]
+    native public fun empty<Element>(): vector<Element>;
+
+    #[bytecode_instruction]
+    native public fun length<Element>(v: &vector<Element>): u64;
+
+    #[bytecode_instruction]
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+
+    #[bytecode_instruction]
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+
+    #[bytecode_instruction]
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+
+    #[bytecode_instruction]
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+
+    #[bytecode_instruction]
+    native public fun destroy_empty<Element>(v: vector<Element>);
+
+    #[bytecode_instruction]
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.exp
new file mode 100644
index 000000000..e54579452
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.exp
@@ -0,0 +1,18 @@
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_fails_to_resolve_help.move:31:9
+   │
+13 │     public fun zero(): Point {
+   │                ---- The function 'a::space::zero' exists, but it takes no arguments
+   ·
+31 │         p.zero();
+   │         ^^^^^^^^ Invalid method call. No known method 'zero' on type 'a::space::Point'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_fails_to_resolve_help.move:32:9
+   │
+21 │     public fun len(_: &Line): u64 {
+   │                       ----- The function 'a::space::len' exists, but it has a different type for its first argument, '&a::space::Line'
+   ·
+32 │         p.len();
+   │         ^^^^^^^ Invalid method call. No known method 'len' on type 'a::space::Point'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.move
new file mode 100644
index 000000000..0f99a4b52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help.move
@@ -0,0 +1,34 @@
+// tests the helper when a dot call fails to resolve
+module a::space {
+    public struct Point has copy, drop {
+        x: u64,
+        y: u64,
+    }
+
+    public struct Line has copy, drop {
+        a: Point,
+        b: Point,
+    }
+
+    public fun zero(): Point {
+        Point { x: 0, y: 0 }
+    }
+
+    public fun vec(p: &Point): Line {
+        Line { a: zero(),  b: *p, }
+    }
+
+    public fun len(_: &Line): u64 {
+        abort 0
+    }
+}
+
+
+module a::example {
+    use a::space::Point;
+
+    public fun t(p: &Point) {
+        p.zero();
+        p.len();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.exp
new file mode 100644
index 000000000..a20b42739
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.exp
@@ -0,0 +1,18 @@
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.move:34:9
+   │
+34 │         p.z();
+   │         ^^^^^
+   │         │ │
+   │         │ No local 'use fun' alias was found for 'a::space::Point.z', and no function 'z' was found in the defining module 'a::space'
+   │         Invalid method call. No known method 'z' on type 'a::space::Point'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.move:35:9
+   │
+35 │         p.l();
+   │         ^^^^^
+   │         │ │
+   │         │ No local 'use fun' alias was found for 'a::space::Point.l', and no function 'l' was found in the defining module 'a::space'
+   │         Invalid method call. No known method 'l' on type 'a::space::Point'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.move
new file mode 100644
index 000000000..4367decf9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_fails_to_resolve_help_under_alias.move
@@ -0,0 +1,37 @@
+// tests the helper when a dot call fails to resolve
+module a::space {
+    public struct Point has copy, drop {
+        x: u64,
+        y: u64,
+    }
+
+    public struct Line has copy, drop {
+        a: Point,
+        b: Point,
+    }
+
+    public fun zero(): Point {
+        Point { x: 0, y: 0 }
+    }
+
+    public fun vec(p: &Point): Line {
+        Line { a: zero(),  b: *p, }
+    }
+
+    public fun len(_: &Line): u64 {
+        abort 0
+    }
+}
+
+
+module a::example {
+    use a::space::Point;
+
+    #[allow(unused)]
+    public fun t(p: &Point) {
+        // TODO would be nice to help with this one
+        use a::space::{zero as z, len as l};
+        p.z();
+        p.l();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_mut_ref.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_mut_ref.move
new file mode 100644
index 000000000..f10549cec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_mut_ref.move
@@ -0,0 +1,18 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+fun f(_self: &mut X) {}
+
+public fun foo(mut x: X, x2: &mut X) {
+    x.f();
+    x2.f();
+}
+
+public fun bar(mut y: Y, y2: &mut Y) {
+    y.x.f();
+    y2.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.exp
new file mode 100644
index 000000000..f3e1e8889
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.exp
@@ -0,0 +1,18 @@
+error[E04023]: invalid method call
+  ┌─ tests/move_2024/typing/dot_call_no_parameters.move:9:5
+  │
+6 │ fun h() {}
+  │     - The function '0x42::t::h' exists, but it takes no arguments
+  ·
+9 │     x.h();
+  │     ^^^^^ Invalid method call. No known method 'h' on type '0x42::t::X'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_no_parameters.move:13:5
+   │
+ 6 │ fun h() {}
+   │     - The function '0x42::t::h' exists, but it takes no arguments
+   ·
+13 │     y.x.h();
+   │     ^^^^^^^ Invalid method call. No known method 'h' on type '0x42::t::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.move
new file mode 100644
index 000000000..57357d196
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_no_parameters.move
@@ -0,0 +1,16 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+fun h() {}
+
+public fun foo(x: &X) {
+    x.h();
+}
+
+public fun bar(y: &Y) {
+    y.x.h();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.exp
new file mode 100644
index 000000000..494f2b8aa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.exp
@@ -0,0 +1,120 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_2024/typing/dot_call_non_struct.move:6:9
+  │
+6 │     let x;
+  │         ^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_2024/typing/dot_call_non_struct.move:8:15
+  │
+8 │     let cup = Cup { value: x };
+  │               ^^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+
+error[E04023]: invalid method call
+  ┌─ tests/move_2024/typing/dot_call_non_struct.move:9:5
+  │
+9 │     0.f();
+  │     ^^^^^
+  │     │
+  │     Invalid method call
+  │     Unable to infer type for method call. Try annotating this type
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:10:5
+   │
+10 │     0u64.f();
+   │     ^^^^^^^^
+   │     │    │
+   │     │    No local 'use fun' alias was found for 'u64.f'
+   │     Invalid method call. No known method 'f' on type 'u64'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:11:5
+   │
+11 │     ().f();
+   │     ^^^^^^
+   │     │
+   │     Invalid method call
+   │     Method calls are only supported on single types. Got an expression of type: '()'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:12:5
+   │
+12 │     (0, 1).f();
+   │     ^^^^^^^^^^
+   │     │
+   │     Invalid method call
+   │     Method calls are only supported on single types. Got an expression of type: '({integer}, {integer})'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:13:5
+   │
+13 │     ().f.f();
+   │     ^^
+   │     │
+   │     Invalid dot access
+   │     Expected a single type, but found expression list type: '()'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:13:5
+   │
+13 │     ().f.f();
+   │     ^^^^
+   │     │
+   │     Unbound field 'f'
+   │     Expected a struct type in the current module but got: '()'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:14:5
+   │
+14 │     (0, 1).f.f();
+   │     ^^^^^^
+   │     │
+   │     Invalid dot access
+   │     Expected a single type, but found expression list type: '(u64, u64)'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:14:5
+   │
+14 │     (0, 1).f.f();
+   │     ^^^^^^^^
+   │     │
+   │     Unbound field 'f'
+   │     Expected a struct type in the current module but got: '({integer}, {integer})'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:15:5
+   │
+ 6 │     let x;
+   │         - Unable to infer type for method call. Try annotating this type
+   ·
+15 │     x.f();
+   │     ^^^^^ Invalid method call
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:16:5
+   │
+ 6 │     let x;
+   │         - Unable to infer type for method call. Try annotating this type
+   ·
+16 │     y.f();
+   │     ^^^^^ Invalid method call
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:17:5
+   │
+ 8 │     let cup = Cup { value: x };
+   │               ---------------- Unable to infer type for method call. Try annotating this type
+   ·
+17 │     cup.value.f();
+   │     ^^^^^^^^^^^^^ Invalid method call
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_non_struct.move:18:5
+   │
+ 5 │ fun call<T: drop>(t: T) {
+   │                      - Method calls are not supported on type parameters. Got an expression of type: 'T'
+   ·
+18 │     t.f();
+   │     ^^^^^ Invalid method call
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.move
new file mode 100644
index 000000000..13a74e3a0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_non_struct.move
@@ -0,0 +1,21 @@
+module 0x42::t {
+
+public struct Cup<T: drop> has drop { value: T }
+
+fun call<T: drop>(t: T) {
+    let x;
+    let y = &x;
+    let cup = Cup { value: x };
+    0.f();
+    0u64.f();
+    ().f();
+    (0, 1).f();
+    ().f.f();
+    (0, 1).f.f();
+    x.f();
+    y.f();
+    cup.value.f();
+    t.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned.move
new file mode 100644
index 000000000..9ca32519b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned.move
@@ -0,0 +1,14 @@
+module 0x42::t {
+
+public struct X has copy, drop {}
+public struct Y has copy, drop { x: X }
+
+fun f(_self: X) {}
+
+public fun foo (x: X, y1: Y, y2: &Y) {
+    x.f();
+    y1.x.f();
+    y2.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.exp
new file mode 100644
index 000000000..67e6ea831
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.exp
@@ -0,0 +1,33 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_2024/typing/dot_call_owned_invalid.move:9:5
+  │
+6 │ fun f(_self: X) {}
+  │              - Expected: '0x42::t::X'
+7 │ 
+8 │ public fun foo (x: &X, y1: Y, y2: &Y) {
+  │                    -- Given: '&0x42::t::X'
+9 │     x.f();
+  │     ^^^^^ Invalid call of '0x42::t::f'. Invalid argument for parameter '_self'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_2024/typing/dot_call_owned_invalid.move:10:5
+   │
+ 3 │ public struct X has drop {}
+   │               - To satisfy the constraint, the 'copy' ability would need to be added here
+ 4 │ public struct Y has drop { x: X }
+   │                               - The type '0x42::t::X' does not have the ability 'copy'
+   ·
+10 │     y1.x.f();
+   │     ^^^^^^^^ Invalid implicit copy of field 'x' without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_2024/typing/dot_call_owned_invalid.move:11:5
+   │
+ 3 │ public struct X has drop {}
+   │               - To satisfy the constraint, the 'copy' ability would need to be added here
+ 4 │ public struct Y has drop { x: X }
+   │                               - The type '0x42::t::X' does not have the ability 'copy'
+   ·
+11 │     y2.x.f();
+   │     ^^^^^^^^ Invalid implicit copy of field 'x' without the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.move
new file mode 100644
index 000000000..e969d94f6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_owned_invalid.move
@@ -0,0 +1,14 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+fun f(_self: X) {}
+
+public fun foo (x: &X, y1: Y, y2: &Y) {
+    x.f();
+    y1.x.f();
+    y2.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.exp
new file mode 100644
index 000000000..7026e89da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.exp
@@ -0,0 +1,18 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/dot_call_private.move:18:5
+   │
+ 7 │ fun f(_self: &X) {}
+   │     - This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+18 │     x.f();
+   │     ^^^^^ Invalid call to '0x42::t::f'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/dot_call_private.move:19:5
+   │
+ 7 │ fun f(_self: &X) {}
+   │     - This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+19 │     y.x.f();
+   │     ^^^^^^^ Invalid call to '0x42::t::f'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.move
new file mode 100644
index 000000000..86b0a4c10
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private.move
@@ -0,0 +1,22 @@
+module 0x42::t {
+
+friend 0x42::m;
+
+public struct X has drop {}
+
+fun f(_self: &X) {}
+
+}
+
+module 0x42::m {
+
+use 0x42::t::X;
+
+public struct Y has drop { x: X }
+
+public fun call(x: &X, y: Y) {
+    x.f();
+    y.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.exp
new file mode 100644
index 000000000..6b12fd252
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.exp
@@ -0,0 +1,6 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/dot_call_private_field.move:13:5
+   │
+13 │     y.x.f()
+   │     ^^^ Invalid access of field 'x' on '0x42::t::Y'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.move
new file mode 100644
index 000000000..1f9d7e2e4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_private_field.move
@@ -0,0 +1,16 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+public fun f(_self: &X) {}
+
+}
+
+module 0x43::m {
+
+public fun call_f(y: &0x42::t::Y) {
+    y.x.f()
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_public.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_public.move
new file mode 100644
index 000000000..a003e49e6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_public.move
@@ -0,0 +1,25 @@
+module 0x42::t {
+
+friend 0x42::m;
+
+public struct X has drop {}
+
+public fun pub(_self: &X) {}
+public(friend) fun fr(_self: &X) {}
+
+}
+
+module 0x42::m {
+
+use 0x42::t::X;
+
+public struct Y has drop { x: X }
+
+public fun call(x: &X, y: Y) {
+    x.pub();
+    x.fr();
+    y.x.pub();
+    y.x.fr();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref.move
new file mode 100644
index 000000000..71570c676
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref.move
@@ -0,0 +1,20 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+fun f(_self: &X) {}
+
+public fun foo(x: X, x2: &X, x3: &mut X) {
+    x.f();
+    x2.f();
+    x3.f();
+}
+
+public fun bar(y: Y, y2: &Y, y3: &mut Y) {
+    y.x.f();
+    y2.x.f();
+    y3.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.exp
new file mode 100644
index 000000000..565d94eb0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.exp
@@ -0,0 +1,19 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_2024/typing/dot_call_ref_mut_invalid.move:9:5
+  │
+6 │ fun f(_self: &mut X) {}
+  │              ------ Expected: '&mut 0x42::t::X'
+7 │ 
+8 │ public fun foo(x: &X) {
+  │                   -- Given: '&0x42::t::X'
+9 │     x.f();
+  │     ^^^^^ Invalid call of '0x42::t::f'. Invalid argument for parameter '_self'
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_2024/typing/dot_call_ref_mut_invalid.move:13:5
+   │
+12 │ public fun bar(y: &Y) {
+   │                   -- Immutable because of this position
+13 │     y.x.f();
+   │     ^^^^^^^ Invalid mutable borrow from an immutable reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.move
new file mode 100644
index 000000000..bf364611e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_ref_mut_invalid.move
@@ -0,0 +1,16 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+
+fun f(_self: &mut X) {}
+
+public fun foo(x: &X) {
+    x.f();
+}
+
+public fun bar(y: &Y) {
+    y.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.exp
new file mode 100644
index 000000000..b97578661
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.exp
@@ -0,0 +1,27 @@
+error[E04023]: invalid method call
+  ┌─ tests/move_2024/typing/dot_call_unbound.move:8:5
+  │
+8 │     x.f();
+  │     ^^^^^
+  │     │ │
+  │     │ No local 'use fun' alias was found for '0x42::t::X.f', and no function 'f' was found in the defining module '0x42::t'
+  │     Invalid method call. No known method 'f' on type '0x42::t::X'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_unbound.move:20:5
+   │
+20 │     x.f();
+   │     ^^^^^
+   │     │ │
+   │     │ No local 'use fun' alias was found for '0x42::t::X.f', and no function 'f' was found in the defining module '0x42::t'
+   │     Invalid method call. No known method 'f' on type '0x42::t::X'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_unbound.move:21:5
+   │
+21 │     y.x.f();
+   │     ^^^^^^^
+   │     │   │
+   │     │   No local 'use fun' alias was found for '0x42::t::X.f', and no function 'f' was found in the defining module '0x42::t'
+   │     Invalid method call. No known method 'f' on type '0x42::t::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.move
new file mode 100644
index 000000000..1c866f712
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_unbound.move
@@ -0,0 +1,24 @@
+module 0x42::t {
+
+friend 0x42::m;
+
+public struct X has drop {}
+
+fun call(x: &X) {
+    x.f();
+}
+
+}
+
+module 0x42::m {
+
+use 0x42::t::X;
+
+public struct Y has drop { x: X }
+
+public fun call(x: &X, y: Y) {
+    x.f();
+    y.x.f();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.exp
new file mode 100644
index 000000000..6f1e9935b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.exp
@@ -0,0 +1,18 @@
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_wrong_type_in_module.move:10:5
+   │
+ 7 │ fun g(_self: Z) {}
+   │              - The function '0x42::t::g' exists, but it has a different type for its first argument, '0x42::t::Z'
+   ·
+10 │     x.g();
+   │     ^^^^^ Invalid method call. No known method 'g' on type '0x42::t::X'
+
+error[E04023]: invalid method call
+   ┌─ tests/move_2024/typing/dot_call_wrong_type_in_module.move:14:5
+   │
+ 7 │ fun g(_self: Z) {}
+   │              - The function '0x42::t::g' exists, but it has a different type for its first argument, '0x42::t::Z'
+   ·
+14 │     y.x.g();
+   │     ^^^^^^^ Invalid method call. No known method 'g' on type '0x42::t::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.move
new file mode 100644
index 000000000..2d9025798
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/dot_call_wrong_type_in_module.move
@@ -0,0 +1,17 @@
+module 0x42::t {
+
+public struct X has drop {}
+public struct Y has drop { x: X }
+public struct Z has drop {}
+
+fun g(_self: Z) {}
+
+public fun foo(x: &X) {
+    x.g();
+}
+
+public fun bar(y: &Y) {
+    y.x.g();
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.exp
new file mode 100644
index 000000000..2a0680e60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.exp
@@ -0,0 +1,9 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_2024/typing/duplicate_defines_primitive.move:4:3
+  │
+2 │ module a::m {}
+  │           - Previously declared here
+3 │ 
+4 │ #[defines_primitive(u64)]
+  │   ^^^^^^^^^^^^^^^^^^^^^^ Duplicate definer annotated for primitive type 'u64'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.move
new file mode 100644
index 000000000..f2f7f25da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/duplicate_defines_primitive.move
@@ -0,0 +1,5 @@
+#[defines_primitive(u64)]
+module a::m {}
+
+#[defines_primitive(u64)]
+module a::n {}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.exp
new file mode 100644
index 000000000..ba27740df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.exp
@@ -0,0 +1,27 @@
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_assign.move:7:9
+  │
+3 │     public fun t(x: u64, s: S): u64  {
+  │                  - To use the variable mutably, it must be declared 'mut', e.g. 'mut x'
+  ·
+7 │         x = y + 1;
+  │         ^ Invalid assignment of immutable variable 'x'
+
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_assign.move:8:9
+  │
+5 │         let S { f } = s;
+  │                 - To use the variable mutably, it must be declared 'mut', e.g. 'mut f'
+  ·
+8 │         f = f + 1;
+  │         ^ Invalid assignment of immutable variable 'f'
+
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_assign.move:9:9
+  │
+4 │         let y = 0;
+  │             - To use the variable mutably, it must be declared 'mut', e.g. 'mut y'
+  ·
+9 │         y = x + f;
+  │         ^ Invalid assignment of immutable variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move
new file mode 100644
index 000000000..889604bb1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move
@@ -0,0 +1,12 @@
+module a::m {
+    public struct S { f: u64 }
+    public fun t(x: u64, s: S): u64  {
+        let y = 0;
+        let S { f } = s;
+        // these three assignments necessiate mut annotations above
+        x = y + 1;
+        f = f + 1;
+        y = x + f;
+        y
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.exp
new file mode 100644
index 000000000..dea877510
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.exp
@@ -0,0 +1,27 @@
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_borrow_mut.move:7:13
+  │
+3 │     public fun t(x: u64, s: S) {
+  │                  - To use the variable mutably, it must be declared 'mut', e.g. 'mut x'
+  ·
+7 │         foo(&mut x);
+  │             ^^^^^^ Invalid mutable borrow of immutable variable 'x'
+
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_borrow_mut.move:8:13
+  │
+4 │         let y = 0;
+  │             - To use the variable mutably, it must be declared 'mut', e.g. 'mut y'
+  ·
+8 │         foo(&mut y);
+  │             ^^^^^^ Invalid mutable borrow of immutable variable 'y'
+
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_borrow_mut.move:9:13
+  │
+5 │         let S { f } = s;
+  │                 - To use the variable mutably, it must be declared 'mut', e.g. 'mut f'
+  ·
+9 │         foo(&mut f);
+  │             ^^^^^^ Invalid mutable borrow of immutable variable 'f'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move
new file mode 100644
index 000000000..38d502608
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move
@@ -0,0 +1,12 @@
+module a::m {
+    public struct S { f: u64 }
+    public fun t(x: u64, s: S) {
+        let y = 0;
+        let S { f } = s;
+        // these three borrows necessiate mut annotations above
+        foo(&mut x);
+        foo(&mut y);
+        foo(&mut f);
+    }
+    public fun foo<T>(_: &mut T) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.exp
new file mode 100644
index 000000000..3749156b3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.exp
@@ -0,0 +1,27 @@
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_borrow_mut_dot_call.move:8:9
+  │
+4 │     public fun t(x: S, r: R) {
+  │                  - To use the variable mutably, it must be declared 'mut', e.g. 'mut x'
+  ·
+8 │         x.foo();
+  │         ^^^^^^^ Invalid mutable borrow of immutable variable 'x'
+
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_borrow_mut_dot_call.move:9:9
+  │
+5 │         let y = S { f: 0 };
+  │             - To use the variable mutably, it must be declared 'mut', e.g. 'mut y'
+  ·
+9 │         y.foo();
+  │         ^^^^^^^ Invalid mutable borrow of immutable variable 'y'
+
+error[E04024]: invalid usage of immutable variable
+   ┌─ tests/move_2024/typing/let_mut_borrow_mut_dot_call.move:10:9
+   │
+ 6 │         let R { s } = r;
+   │                 - To use the variable mutably, it must be declared 'mut', e.g. 'mut s'
+   ·
+10 │         s.foo();
+   │         ^^^^^^^ Invalid mutable borrow of immutable variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move
new file mode 100644
index 000000000..09741d554
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move
@@ -0,0 +1,13 @@
+module a::m {
+    public struct S has drop { f: u64 }
+    public struct R has drop { s: S }
+    public fun t(x: S, r: R) {
+        let y = S { f: 0 };
+        let R { s } = r;
+        // these three borrows necessiate mut annotations above
+        x.foo();
+        y.foo();
+        s.foo();
+    }
+    public fun foo(_: &mut S) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.exp
new file mode 100644
index 000000000..7ece26537
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.exp
@@ -0,0 +1,20 @@
+error[E04024]: invalid usage of immutable variable
+  ┌─ tests/move_2024/typing/let_mut_shadow.move:9:9
+  │
+3 │     public fun foo(x: u64) {
+  │                    - To use the variable mutably, it must be declared 'mut', e.g. 'mut x'
+  ·
+9 │         x = x + 1;
+  │         ^ Invalid assignment of immutable variable 'x'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_2024/typing/let_mut_shadow.move:10:9
+   │
+ 3 │     public fun foo(x: u64) {
+   │                ---    --- Given: 'u64'
+   │                │       
+   │                Expected: '()'
+   ·
+10 │         x
+   │         ^ Invalid return expression
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.move
new file mode 100644
index 000000000..2690b5e76
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/let_mut_shadow.move
@@ -0,0 +1,13 @@
+// double check mut respects shadowing
+module a::m {
+    public fun foo(x: u64) {
+        {
+            let mut x = 0;
+            x = x + 1;
+            bar(x)
+        };
+        x = x + 1;
+        x
+    }
+    fun bar(_: u64) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.exp
new file mode 100644
index 000000000..a50004aa6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.exp
@@ -0,0 +1,34 @@
+error[E02016]: invalid visibility modifier
+   ┌─ tests/move_2024/typing/module_call_visibility_mixed_invalid.move:10:5
+   │
+10 │     public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+   │     ^^^^^^^^^^^^^^^ Cannot mix 'package' and 'friend' visibilities in the same module
+11 │     public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+   │     -------------- 'friend' visibility used here
+
+error[E02016]: invalid visibility modifier
+   ┌─ tests/move_2024/typing/module_call_visibility_mixed_invalid.move:11:5
+   │
+10 │     public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+   │     --------------- 'public(package)' visibility used here
+11 │     public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+   │     ^^^^^^^^^^^^^^ Cannot mix 'friend' and 'package' visibilities in the same module
+
+error[E02016]: invalid visibility modifier
+   ┌─ tests/move_2024/typing/module_call_visibility_mixed_invalid.move:17:5
+   │
+17 │     friend 0x42::mod_1;
+   │     ^^^^^^^^^^^^^^^^^^^ Cannot define 'friend' modules and use 'public(package)' visibility in the same module
+18 │ 
+19 │     public(package) fun f_package_call_package(): u64 { 0 }
+   │     --------------- 'public(package)' visibility used here
+
+error[E02016]: invalid visibility modifier
+   ┌─ tests/move_2024/typing/module_call_visibility_mixed_invalid.move:19:5
+   │
+17 │     friend 0x42::mod_1;
+   │     ------------------- 'friend' visibility used here
+18 │ 
+19 │     public(package) fun f_package_call_package(): u64 { 0 }
+   │     ^^^^^^^^^^^^^^^ Cannot mix 'package' and 'friend' visibilities in the same module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.move
new file mode 100644
index 000000000..93d7e3544
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_mixed_invalid.move
@@ -0,0 +1,20 @@
+module 0x42::mod_0 {
+    fun f_private() {}
+    public(package) fun f_pkg_public() {}
+}
+
+module 0x42::mod_1 {
+    use 0x42::mod_0;
+
+    // a fun cannot call a package funs at another address
+    public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+    public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+    public fun f_public_call_package() { mod_0::f_pkg_public() }
+    fun f_private_call_package() { mod_0::f_pkg_public() }
+}
+
+module 0x42::mod_2 {
+    friend 0x42::mod_1;
+
+    public(package) fun f_package_call_package(): u64 { 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_nested.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_nested.move
new file mode 100644
index 000000000..689dc15ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_nested.move
@@ -0,0 +1,52 @@
+module 0x42::mod_0 {
+    friend 0x42::mod_1;
+    friend 0x42::mod_2;
+    friend 0x42::mod_3;
+    friend 0x42::mod_4;
+    public(friend) fun f_pkg_friend(): u64 { 0 }
+}
+
+module 0x42::mod_1 {
+    use 0x42::mod_0;
+    public(package) fun f_pkg_public(): u64 { mod_0::f_pkg_friend() }
+}
+
+module 0x42::mod_2 {
+    use 0x42::mod_0;
+    use 0x42::mod_1;
+
+    // a fun can call a public(friend) fun
+    public(package) fun f_package_call_friend(): u64 { mod_0::f_pkg_friend() }
+    public fun f_public_call_friend(): u64 { mod_0::f_pkg_friend() }
+    fun f_private_call_friend(): u64 { mod_0::f_pkg_friend() }
+
+    // a fun can call a public(package) fun
+    public(package) fun f_package_call_package(): u64 { mod_1::f_pkg_public() }
+    public fun f_public_call_package(): u64 { mod_1::f_pkg_public() }
+    fun f_private_call_package(): u64 { mod_1::f_pkg_public() }
+}
+
+// a module 0x42::with a friend but no friend-defined functions.
+module 0x42::mod_3 {
+    use 0x42::mod_0;
+    friend 0x42::mod_4;
+
+    public fun f_public_call_friend(): u64 { mod_0::f_pkg_friend() }
+    fun f_private_call_friend(): u64 { mod_0::f_pkg_friend() }
+}
+
+// a module 0x42::with public(friend) definitions that calls a public(package) function.
+module 0x42::mod_4 {
+    use 0x42::mod_0;
+    use 0x42::mod_1;
+
+    // a fun can call a public(friend) fun
+    public(friend) fun f_friend_call_friend(): u64 { mod_0::f_pkg_friend() }
+    public fun f_public_call_friend(): u64 { mod_0::f_pkg_friend() }
+    fun f_private_call_friend(): u64 { mod_0::f_pkg_friend() }
+
+    // a fun can call a public(package) fun
+    public(friend) fun f_friend_call_package(): u64 { mod_1::f_pkg_public() }
+    public fun f_public_call_package(): u64 { mod_1::f_pkg_public() }
+    fun f_private_call_package(): u64 { mod_1::f_pkg_public() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package.move
new file mode 100644
index 000000000..b3a509ccf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package.move
@@ -0,0 +1,38 @@
+module 0x42::mod_0 {
+    public fun f_public() {}
+}
+
+module 0x42::mod_1 {
+    public(package) fun f_package() {}
+}
+
+module 0x42::mod_2 {
+    use 0x42::mod_0;
+    use 0x42::mod_1;
+
+    public fun f_public() {}
+    public(package) fun f_package() {}
+    fun f_private() {}
+
+    // a public(fpackage) fun can call public funs in another module
+    public(package) fun f_package_call_public() { mod_0::f_public() }
+
+    // a public(package) fun can call private and public funs defined in its own module
+    public(package) fun f_package_call_self_private() { Self::f_private() }
+    public(package) fun f_package_call_self_public() { Self::f_public() }
+
+    // a public functions can call a public(package) function defined in the same module
+    // as well as package functions defined in other modules in the same package
+    public fun f_public_call_package() { mod_1::f_package() }
+    public fun f_public_call_self_package() { Self::f_package() }
+
+    // a public(package) functions can call a public(package) function defined in the same module
+    // as well as package functions defined in other modules in the same package
+    public(package) fun f_package_call_package() { mod_1::f_package() }
+    public(package) fun f_package_call_self_package() { Self::f_package() }
+
+    // a private functions can call a public(package) function defined in the same module
+    // as well as package functions defined in other modules in the same package
+    fun f_private_call_package() { mod_1::f_package() }
+    fun f_private_call_self_package() { Self::f_package() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.exp
new file mode 100644
index 000000000..c9f566640
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.exp
@@ -0,0 +1,54 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:10:52
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+10 │     public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+   │                                                    ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:11:42
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+11 │     public fun f_public_call_package() { mod_0::f_pkg_public() }
+   │                                          ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:12:36
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+12 │     fun f_private_call_package() { mod_0::f_pkg_public() }
+   │                                    ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:19:50
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+19 │     public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+   │                                                  ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:20:42
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+20 │     public fun f_public_call_package() { mod_0::f_pkg_public() }
+   │                                          ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_2024/typing/module_call_visibility_package_invalid.move:21:36
+   │
+ 3 │     public(package) fun f_pkg_public() {}
+   │     --------------- A 'public(package)' function can only be called from the same address and package as module '0x42::mod_0' in package '<unknown package>'. This call is from address '0x54' in package '<unknown package>'
+   ·
+21 │     fun f_private_call_package() { mod_0::f_pkg_public() }
+   │                                    ^^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::mod_0::f_pkg_public'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.move
new file mode 100644
index 000000000..b8a78f5ce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_invalid.move
@@ -0,0 +1,22 @@
+module 0x42::mod_0 {
+    fun f_private() {}
+    public(package) fun f_pkg_public() {}
+}
+
+module 0x54::mod_1 {
+    use 0x42::mod_0;
+
+    // a fun cannot call a package funs at another address
+    public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+    public fun f_public_call_package() { mod_0::f_pkg_public() }
+    fun f_private_call_package() { mod_0::f_pkg_public() }
+}
+
+module 0x54::mod_2 {
+    use 0x42::mod_0;
+
+    // a fun cannot call a package funs at another address
+    public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+    public fun f_public_call_package() { mod_0::f_pkg_public() }
+    fun f_private_call_package() { mod_0::f_pkg_public() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_valid.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_valid.move
new file mode 100644
index 000000000..b98b32ff6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/module_call_visibility_package_valid.move
@@ -0,0 +1,22 @@
+module 0x42::mod_0 {
+    fun f_private() {}
+    public(package) fun f_pkg_public() {}
+}
+
+module 0x42::mod_1 {
+    use 0x42::mod_0;
+
+    // a fun cannot call a package funs at another address
+    public(package) fun f_package_call_package() { mod_0::f_pkg_public() }
+    public fun f_public_call_package() { mod_0::f_pkg_public() }
+    fun f_private_call_package() { mod_0::f_pkg_public() }
+}
+
+module 0x42::mod_2 {
+    use 0x42::mod_0;
+
+    // a fun cannot call a package funs at another address
+    public(friend) fun f_friend_call_package() { mod_0::f_pkg_public() }
+    public fun f_public_call_package() { mod_0::f_pkg_public() }
+    fun f_private_call_package() { mod_0::f_pkg_public() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/multiple_fake_dot_call_candidates.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/multiple_fake_dot_call_candidates.move
new file mode 100644
index 000000000..87567e4ac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/multiple_fake_dot_call_candidates.move
@@ -0,0 +1,18 @@
+module a::m {
+    public struct S {}
+    public fun foo(_: &S) {}
+}
+
+module a::t1 {
+    // this needs to be removed from the use global use fun list or the compiler will panic
+    use a::m::foo as bar;
+
+    public fun foo(s: &a::m::S) { s.bar() }
+}
+
+module a::t2 {
+    // this needs to be removed from the use global use fun list or the compiler will panic
+    use a::m::foo as bar;
+
+    public fun foo(s: &a::m::S) { s.bar() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.exp
new file mode 100644
index 000000000..7e901764c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.exp
@@ -0,0 +1,12 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_2024/typing/unknown_defines_primitive.move:1:21
+  │
+1 │ #[defines_primitive(X)]
+  │                     ^ Invalid parameterization of 'defines_primitive'. Unknown primitive type 'X'
+
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_2024/typing/unknown_defines_primitive.move:6:21
+  │
+6 │ #[defines_primitive(Y)]
+  │                     ^ Invalid parameterization of 'defines_primitive'. Unknown primitive type 'Y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.move
new file mode 100644
index 000000000..457eebb56
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/unknown_defines_primitive.move
@@ -0,0 +1,7 @@
+#[defines_primitive(X)]
+module a::m {
+    public struct X {}
+}
+
+#[defines_primitive(Y)]
+module a::n {}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.exp b/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.exp
new file mode 100644
index 000000000..11ea11241
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.exp
@@ -0,0 +1,46 @@
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_2024/typing/unused_let_mut.move:5:9
+  │
+5 │         let mut x = 0;
+  │         ^^^^^^^^^^^^^ 'let' declarations are not supported in constants
+
+warning[W09012]: unused 'mut' modifiers
+  ┌─ tests/move_2024/typing/unused_let_mut.move:5:17
+  │
+5 │         let mut x = 0;
+  │             --- ^ The variable 'x' is never used mutably
+  │             │    
+  │             Consider removing the 'mut' declaration here
+  │
+  = This warning can be suppressed with '#[allow(unused_let_mut)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09012]: unused 'mut' modifiers
+  ┌─ tests/move_2024/typing/unused_let_mut.move:9:24
+  │
+9 │     public fun foo(mut x: u64, s: S): u64 {
+  │                    --- ^ The variable 'x' is never used mutably
+  │                    │    
+  │                    Consider removing the 'mut' declaration here
+  │
+  = This warning can be suppressed with '#[allow(unused_let_mut)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09012]: unused 'mut' modifiers
+   ┌─ tests/move_2024/typing/unused_let_mut.move:10:17
+   │
+10 │         let mut y = 0;
+   │             --- ^ The variable 'y' is never used mutably
+   │             │    
+   │             Consider removing the 'mut' declaration here
+   │
+   = This warning can be suppressed with '#[allow(unused_let_mut)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09012]: unused 'mut' modifiers
+   ┌─ tests/move_2024/typing/unused_let_mut.move:11:21
+   │
+11 │         let S { mut f } = s;
+   │                 --- ^ The variable 'f' is never used mutably
+   │                 │    
+   │                 Consider removing the 'mut' declaration here
+   │
+   = This warning can be suppressed with '#[allow(unused_let_mut)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.move b/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.move
new file mode 100644
index 000000000..9169e5100
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/typing/unused_let_mut.move
@@ -0,0 +1,19 @@
+module a::m {
+    public struct S { f: u64 }
+
+    const C: u64 = {
+        let mut x = 0;
+        x
+    };
+
+    public fun foo(mut x: u64, s: S): u64 {
+        let mut y = 0;
+        let S { mut f } = s;
+        bar(&x);
+        bar(&y);
+        bar(&f);
+        x + y + f
+    }
+
+    public fun bar(_: &u64) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.move b/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.move
new file mode 100644
index 000000000..2190df20b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.move
@@ -0,0 +1,7 @@
+module a::m {
+    public struct X {}
+    public fun foo(_: &X) {}
+
+    #[test_only]
+    use fun foo as X.f;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.unit_test b/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.unit_test.exp
new file mode 100644
index 000000000..f03ead117
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/unit_test/test_only_use_fun.unit_test.exp
@@ -0,0 +1,8 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_2024/unit_test/test_only_use_fun.move:6:5
+  │
+6 │     use fun foo as X.f;
+  │     ^^^^^^^^^^^^^^^^^^^ Unused 'use fun' of 'a::m::X.f'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.exp b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.exp
new file mode 100644
index 000000000..640e4b404
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.exp
@@ -0,0 +1,18 @@
+error[E02015]: invalid attribute
+  ┌─ tests/move_2024/warning_suppression/allow_on_use_fun.move:2:7
+  │
+2 │     #[allow(unused)]
+  │       ^^^^^
+  │       │
+  │       Known attribute 'allow' is not expected with a use
+  │       Expected to be used with one of the following: module, script, constant, struct, function
+
+error[E02017]: invalid 'use fun' declaration
+  ┌─ tests/move_2024/warning_suppression/allow_on_use_fun.move:3:5
+  │
+3 │     use fun foo as X.f;
+  │     ^^^^^^^^^^^^^^^^^^^ Invalid 'use fun' for 'a::m::X.f'. Expected a 'a::m::X' type as the first argument (either by reference '&' '&mut' or by value)
+4 │     public struct X {}
+5 │     fun foo() {}
+  │         --- But 'a::m::foo' takes no arguments
+
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.move b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.move
new file mode 100644
index 000000000..1162b10a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/allow_on_use_fun.move
@@ -0,0 +1,6 @@
+module a::m {
+    #[allow(unused)]
+    use fun foo as X.f;
+    public struct X {}
+    fun foo() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/unused_use_fun.move b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/unused_use_fun.move
new file mode 100644
index 000000000..af30efd6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_2024/warning_suppression/unused_use_fun.move
@@ -0,0 +1,44 @@
+#[allow(unused_use)]
+module a::m {
+    use fun foo as X.f;
+    public struct X {}
+    public fun foo(_: &X) {}
+}
+
+#[allow(unused_use)]
+script {
+    use fun a::m::foo as a::m::X.f;
+    fun main() {}
+}
+
+module a::m2 {
+    use a::m::{X, foo};
+    #[allow(unused_use)]
+    public fun bar(_: &X) {
+        use fun foo as X.f;
+    }
+    #[allow(unused_use)]
+    const C: u64 = {
+        use fun foo as X.f;
+        0
+    };
+}
+
+#[allow(unused)]
+script {
+    use fun a::m::foo as a::m::X.f;
+    fun main2() {}
+}
+
+module a::m3 {
+    use a::m::{X, foo};
+    #[allow(all)]
+    public fun bar(_: &X) {
+        use fun foo as X.f;
+    }
+    #[allow(all)]
+    const C: u64 = {
+        use fun foo as X.f;
+        0
+    };
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo.move
new file mode 100644
index 000000000..33af82654
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo.move
@@ -0,0 +1,53 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t4(cond: bool) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) s = S { f: 0, g: 0 } else { *f; };
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.exp
new file mode 100644
index 000000000..52c98ff54
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.exp
@@ -0,0 +1,40 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_combo_invalid.move:14:9
+   │
+13 │         if (cond) f = &s.f else f = &s.g;
+   │                                     ---- It is still being borrowed by this reference
+14 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_combo_invalid.move:23:9
+   │
+22 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- It is still being mutably borrowed by this reference
+23 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_combo_invalid.move:32:9
+   │
+31 │         if (cond) f = &mut s else f = other;
+   │                       ------ It is still being mutably borrowed by this reference
+32 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_combo_invalid.move:41:9
+   │
+40 │         if (cond) f = id_mut(&mut s) else f = other;
+   │                       -------------- It is still being mutably borrowed by this reference
+41 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_combo_invalid.move:49:19
+   │
+48 │         let f = &s.f;
+   │                 ---- It is still being borrowed by this reference
+49 │         if (cond) s = S { f: 0, g: 0 };
+   │                   ^ Invalid assignment of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.move
new file mode 100644
index 000000000..9771ca82a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_combo_invalid.move
@@ -0,0 +1,54 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t4(cond: bool) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field.move
new file mode 100644
index 000000000..d23a80ba7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field.move
@@ -0,0 +1,56 @@
+module 0x8675309::M {
+    struct S has drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id(&s.f);
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        *f;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        s = &mut S { f: 0, g: 0 };
+        *f;
+
+        let f = &mut s.f;
+        s = &mut S { f: 0, g: 0 };
+        *f;
+
+        let f = id(&s.f);
+        s = &mut S { f: 0, g: 0 };
+        *f;
+
+        let f = id_mut(&mut s.f);
+        s = &mut S { f: 0, g: 0 };
+        *f;
+
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.exp
new file mode 100644
index 000000000..831c66509
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_field_invalid.move:13:9
+   │
+12 │         let f = &s.f;
+   │                 ---- It is still being borrowed by this reference
+13 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_field_invalid.move:19:9
+   │
+18 │         let f = &mut s.f;
+   │                 -------- It is still being mutably borrowed by this reference
+19 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_field_invalid.move:25:9
+   │
+24 │         let f = id(&s.f);
+   │                 -------- It is still being borrowed by this reference
+25 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_field_invalid.move:31:9
+   │
+30 │         let f = id_mut(&mut s.f);
+   │                 ---------------- It is still being mutably borrowed by this reference
+31 │         s = S { f: 0, g: 0 };
+   │         ^ Invalid assignment of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.move
new file mode 100644
index 000000000..7ba486bc3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_field_invalid.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id(&s.f);
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full.move
new file mode 100644
index 000000000..28aa174b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &x;
+        *f;
+        x = 0;
+        x;
+
+        let x = 0;
+        let f = &mut x;
+        *f;
+        x = 0;
+        x;
+
+        let x = 0;
+        let f = id(&x);
+        *f;
+        x = 0;
+        x;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        *f;
+        x = 0;
+        x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.exp
new file mode 100644
index 000000000..348b5a22f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_full_invalid.move:13:9
+   │
+12 │         let f = &x;
+   │                 -- It is still being borrowed by this reference
+13 │         x = 0;
+   │         ^ Invalid assignment of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_full_invalid.move:19:9
+   │
+18 │         let f = &mut x;
+   │                 ------ It is still being mutably borrowed by this reference
+19 │         x = 0;
+   │         ^ Invalid assignment of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_full_invalid.move:25:9
+   │
+24 │         let f = id(&x);
+   │                 ------ It is still being borrowed by this reference
+25 │         x = 0;
+   │         ^ Invalid assignment of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/assign_local_full_invalid.move:31:9
+   │
+30 │         let f = id_mut(&mut x);
+   │                 -------------- It is still being mutably borrowed by this reference
+31 │         x = 0;
+   │         ^ Invalid assignment of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.move
new file mode 100644
index 000000000..8c1bd675b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/assign_local_full_invalid.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &x;
+        x = 0;
+        *f;
+        x;
+
+        let x = 0;
+        let f = &mut x;
+        x = 0;
+        *f;
+        x;
+
+        let x = 0;
+        let f = id(&x);
+        x = 0;
+        *f;
+        x;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        x = 0;
+        *f;
+        x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo.move
new file mode 100644
index 000000000..9c955c64c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo.move
@@ -0,0 +1,115 @@
+module 0x8675309::M {
+    struct Outer has copy, drop { s1: Inner, s2: Inner }
+    struct Inner has copy, drop { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, outer: &mut Outer, other: &mut Outer) {
+        let inner = &outer.s1;
+        let c; if (cond) c = copy inner else c = &outer.s1;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &outer.s1;
+        let c; if (cond) c = id(copy inner) else c = id(&outer.s1);
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = freeze(copy inner) else c = &other.s1;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id(freeze(copy inner)) else c = &other.s1;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = copy inner else c = &mut outer.s2;
+        let f1 = &mut c.f1;
+        *f1;
+        *c;
+        *inner;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id_mut(copy inner) else c = &mut outer.s2;
+        let f1 = &mut c.f1;
+        *f1;
+        *c;
+        *inner;
+    }
+
+    fun t1(cond: bool, outer: &mut Outer, other: &mut Outer) {
+        let inner = &outer.s1;
+        let c; if (cond) c = &inner.f1 else c = &inner.f2;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &outer.s1;
+        let c; if (cond) c = id(&inner.f1) else c = &other.s1.f2;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = &inner.f1 else c = &other.s1.f2;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id(&inner.f1) else c = &other.s1.f2;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = &mut inner.f1 else c = &mut inner.f2;
+        let f1 = &mut inner.f1;
+        *c;
+        *f1;
+        *inner;
+
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id_mut(&mut inner.f1) else c = &mut inner.f2;
+        let f1 = &mut inner.f1;
+        *c;
+        *f1;
+        *inner;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.exp
new file mode 100644
index 000000000..e9120d4b8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.exp
@@ -0,0 +1,48 @@
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:14:18
+   │
+13 │         let c; if (cond) c = copy inner else c = &mut outer.s1;
+   │                              ---------- It is still being mutably borrowed by this reference
+14 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:25:18
+   │
+24 │         let c; if (cond) c = id_mut(copy inner) else c = &mut outer.s1;
+   │                              ------------------ It is still being mutably borrowed by this reference
+25 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:36:18
+   │
+35 │         let c; if (cond) c = copy inner else c = &mut outer.s1;
+   │                              ---------- It is still being mutably borrowed by this reference
+36 │         let f1 = &mut inner.f1;
+   │                  ^^^^^^^^^^^^^ Invalid mutable borrow at field 'f1'.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:47:18
+   │
+46 │         let c; if (cond) c = id_mut(copy inner) else c = &mut outer.s1;
+   │                              ------------------ It is still being mutably borrowed by this reference
+47 │         let f1 = &mut inner.f1;
+   │                  ^^^^^^^^^^^^^ Invalid mutable borrow at field 'f1'.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:58:18
+   │
+57 │         let c; if (cond) c = &mut inner.f1 else c = &mut inner.f2;
+   │                              ------------- Field 'f1' is still being mutably borrowed by this reference
+58 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_combo_invalid.move:67:18
+   │
+66 │         let c; if (cond) c = id_mut(&mut inner.f1) else c = &mut inner.f1;
+   │                              --------------------- Field 'f1' is still being mutably borrowed by this reference
+67 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.move
new file mode 100644
index 000000000..0dfca53b3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_combo_invalid.move
@@ -0,0 +1,73 @@
+module 0x8675309::M {
+    struct Outer { s1: Inner, s2: Inner }
+    struct Inner { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = copy inner else c = &mut outer.s1;
+        let f1 = &inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+    }
+
+    fun t1(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id_mut(copy inner) else c = &mut outer.s1;
+        let f1 = &inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+    }
+
+    fun t2(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = copy inner else c = &mut outer.s1;
+        let f1 = &mut inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+    }
+
+    fun t3(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id_mut(copy inner) else c = &mut outer.s1;
+        let f1 = &mut inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+    }
+
+    fun t4(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = &mut inner.f1 else c = &mut inner.f2;
+        let f1 = &inner.f1;
+        f1;
+        c;
+        inner;
+    }
+
+    fun t5(cond: bool, outer: &mut Outer, _other: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c; if (cond) c = id_mut(&mut inner.f1) else c = &mut inner.f1;
+        let f1 = &inner.f1;
+        f1;
+        c;
+        inner;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field.move
new file mode 100644
index 000000000..8237c1f94
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field.move
@@ -0,0 +1,63 @@
+module 0x8675309::M {
+    struct Outer has copy, drop { s1: Inner, s2: Inner }
+    struct Inner has copy, drop { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(outer: &mut Outer) {
+        let inner = &outer.s1;
+        let c = &inner.f1;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &outer.s1;
+        let c = id(&inner.f1);
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = &inner.f1;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = id(&inner.f1);
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = &mut inner.f1;
+        let f1 = &mut inner.f1;
+        *c;
+        *f1;
+        *inner;
+
+        let inner = &mut outer.s1;
+        let c = id_mut(&mut inner.f1);
+        let f1 = &mut inner.f1;
+        *c;
+        *f1;
+        *inner;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.exp
new file mode 100644
index 000000000..3717d1d92
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.exp
@@ -0,0 +1,16 @@
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_field_invalid.move:14:18
+   │
+13 │         let c = &mut inner.f1;
+   │                 ------------- Field 'f1' is still being mutably borrowed by this reference
+14 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_field_invalid.move:21:18
+   │
+20 │         let c = id_mut(&mut inner.f1);
+   │                 --------------------- Field 'f1' is still being mutably borrowed by this reference
+21 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.move
new file mode 100644
index 000000000..e700f4c0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_field_invalid.move
@@ -0,0 +1,27 @@
+module 0x8675309::M {
+    struct Outer { s1: Inner, s2: Inner }
+    struct Inner { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(outer: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c = &mut inner.f1;
+        let f1 = &inner.f1;
+        f1;
+        c;
+        inner;
+
+        let inner = &mut outer.s1;
+        let c = id_mut(&mut inner.f1);
+        let f1 = &inner.f1;
+        f1;
+        c;
+        inner;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full.move
new file mode 100644
index 000000000..df51ecaf2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full.move
@@ -0,0 +1,63 @@
+module 0x8675309::M {
+    struct Outer has copy, drop { s1: Inner, s2: Inner }
+    struct Inner has copy, drop { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(outer: &mut Outer) {
+        let inner = &outer.s1;
+        let c = copy inner;
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &outer.s1;
+        let c = id(copy inner);
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = freeze(copy inner);
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = id(freeze(copy inner));
+        let f1 = &inner.f1;
+        *c;
+        *inner;
+        *f1;
+        *inner;
+        *c;
+
+        let inner = &mut outer.s1;
+        let c = copy inner;
+        let f1 = &mut c.f1;
+        *f1;
+        *c;
+        *inner;
+
+        let inner = &mut outer.s1;
+        let c = id_mut(copy inner);
+        let f1 = &mut c.f1;
+        *f1;
+        *c;
+        *inner;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.exp
new file mode 100644
index 000000000..9f7a55de5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.exp
@@ -0,0 +1,32 @@
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_full_invalid.move:14:18
+   │
+13 │         let c = copy inner;
+   │                 ---------- It is still being mutably borrowed by this reference
+14 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_field_full_invalid.move:23:18
+   │
+22 │         let c = id_mut(copy inner);
+   │                 ------------------ It is still being mutably borrowed by this reference
+23 │         let f1 = &inner.f1;
+   │                  ^^^^^^^^^ Invalid immutable borrow at field 'f1'.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_field_full_invalid.move:32:18
+   │
+31 │         let c = copy inner;
+   │                 ---------- It is still being mutably borrowed by this reference
+32 │         let f1 = &mut inner.f1;
+   │                  ^^^^^^^^^^^^^ Invalid mutable borrow at field 'f1'.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_field_full_invalid.move:41:18
+   │
+40 │         let c = id_mut(copy inner);
+   │                 ------------------ It is still being mutably borrowed by this reference
+41 │         let f1 = &mut inner.f1;
+   │                  ^^^^^^^^^^^^^ Invalid mutable borrow at field 'f1'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.move
new file mode 100644
index 000000000..7c15eacc6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_field_full_invalid.move
@@ -0,0 +1,49 @@
+module 0x8675309::M {
+    struct Outer { s1: Inner, s2: Inner }
+    struct Inner { f1: u64, f2: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(outer: &mut Outer) {
+        let inner = &mut outer.s1;
+        let c = copy inner;
+        let f1 = &inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+
+        let inner = &mut outer.s1;
+        let c = id_mut(copy inner);
+        let f1 = &inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+
+        let inner = &mut outer.s1;
+        let c = copy inner;
+        let f1 = &mut inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+
+        let inner = &mut outer.s1;
+        let c = id_mut(copy inner);
+        let f1 = &mut inner.f1;
+        c;
+        inner;
+        f1;
+        inner;
+        c;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo.move
new file mode 100644
index 000000000..e5953a8c8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo.move
@@ -0,0 +1,49 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: S, other: &S) {
+        let f;
+        if (cond) f = &s.f else f = &other.f;
+        let x = &mut s;
+        *f;
+        *x;
+    }
+
+    fun t1(cond: bool, s: S) {
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        let x = &mut s;
+        *f;
+        *x;
+    }
+
+    fun t2(cond: bool, s: S, other: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        let x = &mut s;
+        *f;
+        *x;
+    }
+
+    fun t3(cond: bool, s: S, other: &S) {
+        let x;
+        if (cond) x = &s else x = other;
+        let y = &s;
+        *x;
+        *y;
+    }
+
+    fun t4(cond: bool, s: S, other: &mut S) {
+        let x;
+        if (cond) x = &mut s else x = other;
+        let y = &mut s;
+        *x;
+        *y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.exp
new file mode 100644
index 000000000..229f9d4f7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.exp
@@ -0,0 +1,42 @@
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_local_combo_invalid.move:13:17
+   │
+12 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- It is still being mutably borrowed by this reference
+13 │         let x = &s;
+   │                 ^^ Invalid borrow of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_local_combo_invalid.move:23:9
+   │
+20 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- Field 'f' is still being mutably borrowed by this reference
+   ·
+23 │         *x;
+   │         ^^ Invalid dereference.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_local_combo_invalid.move:30:17
+   │
+29 │         if (cond) f = &mut s.f else f = &mut s.g;
+   │                                         -------- It is still being mutably borrowed by this reference
+30 │         let x = &s;
+   │                 ^^ Invalid borrow of variable 's'
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_local_combo_invalid.move:38:17
+   │
+37 │         if (cond) x = &mut s else x = other;
+   │                       ------ It is still being mutably borrowed by this reference
+38 │         let y = &s;
+   │                 ^^ Invalid borrow of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_local_combo_invalid.move:48:9
+   │
+46 │         if (cond) x = &mut s else x = other;
+   │                       ------ It is still being mutably borrowed by this reference
+47 │         let y = &mut s;
+48 │         *y;
+   │         ^^ Invalid dereference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.move
new file mode 100644
index 000000000..9ca0328dc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_combo_invalid.move
@@ -0,0 +1,52 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: S, other: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        let x = &s;
+        *f;
+        *x;
+    }
+
+    fun t1(cond: bool, s: S, other: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        let x = &mut s;
+        *f;
+        *x;
+        *f;
+    }
+
+    fun t2(cond: bool, s: S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut s.g;
+        let x = &s;
+        *f;
+        *x;
+    }
+
+    fun t3(cond: bool, s: S, other: &mut S) {
+        let x;
+        if (cond) x = &mut s else x = other;
+        let y = &s;
+        *y;
+        *x;
+        *y;
+    }
+
+    fun t4(cond: bool, s: S, other: &mut S) {
+        let x;
+        if (cond) x = &mut s else x = other;
+        let y = &mut s;
+        *y;
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field.move
new file mode 100644
index 000000000..52ef9eff3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field.move
@@ -0,0 +1,33 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let v = S { f: 0, g: 0 };
+        let f = &v.f;
+        let s = &v;
+        *f;
+        *s;
+        *f;
+
+        let v = S { f: 0, g: 0 };
+        let f = id(&v.f);
+        let s = &v;
+        *f;
+        *s;
+        *f;
+
+        let v = S { f: 0, g: 0 };
+        let f = &v.f;
+        let s = &mut v;
+        *f;
+        *s;
+        *f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.exp
new file mode 100644
index 000000000..d813e0040
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.exp
@@ -0,0 +1,17 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/borrow_local_field_invalid.move:14:9
+   │
+12 │         let f = &v.f;
+   │                 ---- Field 'f' is still being borrowed by this reference
+13 │         let s = &mut v;
+14 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_local_field_invalid.move:19:17
+   │
+18 │         let f = &mut v.f;
+   │                 -------- It is still being mutably borrowed by this reference
+19 │         let s = &v;
+   │                 ^^ Invalid borrow of variable 'v'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.move
new file mode 100644
index 000000000..f6b4c4a60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_field_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let v = S { f: 0, g: 0 };
+        let f = &v.f;
+        let s = &mut v;
+        *s = S { f: 0, g: 0 };
+        f;
+
+        let v = S { f: 0, g: 0 };
+        let f = &mut v.f;
+        let s = &v;
+        s;
+        f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full.move
new file mode 100644
index 000000000..09968d0de
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full.move
@@ -0,0 +1,41 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let v = 0;
+        let x = &mut v;
+        let y = &mut v;
+        *x;
+        *y;
+
+        let x = id_mut(&mut v);
+        let y = &mut v;
+        *x;
+        *y;
+
+        let x = &v;
+        let y = &mut v;
+        *y;
+        *x;
+        *y;
+
+        let x = &v;
+        let y = &v;
+        *x;
+        *y;
+        *x;
+
+        let x = id(&v);
+        let y = &v;
+        *x;
+        *y;
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.exp
new file mode 100644
index 000000000..0ffe913c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.exp
@@ -0,0 +1,34 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/borrow_local_full_invalid.move:14:9
+   │
+12 │         let x = &mut v;
+   │                 ------ It is still being mutably borrowed by this reference
+13 │         let y = &mut v;
+14 │         *y;
+   │         ^^ Invalid dereference.
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/borrow_local_full_invalid.move:18:17
+   │
+17 │         let x = &mut v;
+   │                 ------ It is still being mutably borrowed by this reference
+18 │         let y = id_mut(&mut v);
+   │                 ^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/borrow_local_full_invalid.move:24:9
+   │
+22 │         let x = &v;
+   │                 -- It is still being borrowed by this reference
+23 │         let y = &mut v;
+24 │         *y = 0;
+   │         ^^^^^^ Invalid mutation of reference.
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/borrows/borrow_local_full_invalid.move:33:17
+   │
+32 │         let x = &mut v;
+   │                 ------ It is still being mutably borrowed by this reference
+33 │         let y = &v;
+   │                 ^^ Invalid borrow of variable 'v'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.move
new file mode 100644
index 000000000..5133fe3f5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrow_local_full_invalid.move
@@ -0,0 +1,38 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let v = 0;
+        let x = &mut v;
+        let y = &mut v;
+        *y;
+        *x;
+
+        let x = &mut v;
+        let y = id_mut(&mut v);
+        *y;
+        *x;
+
+        let x = &v;
+        let y = &mut v;
+        *y = 0;
+        *x;
+
+    }
+
+    fun t1() {
+        let v = 0;
+
+        let x = &mut v;
+        let y = &v;
+        x;
+        y;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.exp
new file mode 100644
index 000000000..3bb18998e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.exp
@@ -0,0 +1,13 @@
+error[E07006]: ambiguous usage of variable
+  ┌─ tests/move_check/borrows/borrowed_before_last_usage.move:5:13
+  │
+4 │     let r = &x;
+  │             -- It is still being borrowed by this reference
+5 │     let y = x;
+  │             ^
+  │             │
+  │             Ambiguous usage of variable 'x'
+  │             Try an explicit annotation, e.g. 'move x' or 'copy x'
+  │
+  = Ambiguous inference of 'move' or 'copy' for a borrowed variable's last usage: A 'move' would invalidate the borrowing reference, but a 'copy' might not be the expected implicit behavior since this the last direct usage of the variable.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.move
new file mode 100644
index 000000000..d01517441
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/borrowed_before_last_usage.move
@@ -0,0 +1,8 @@
+script {
+fun main() {
+    let x = 0;
+    let r = &x;
+    let y = x;
+    assert!(*r == y, 0);
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows.move
new file mode 100644
index 000000000..e905bd456
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows.move
@@ -0,0 +1,26 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun imm_imm<T1, T2>(_x: &T1, _y: &T2) { }
+    fun mut_imm<T1, T2>(_x: &mut T1, _y: &T2) { }
+    fun mut_mut<T1, T2>(_x: &mut T1, _y: &mut T2) { }
+
+    fun t0(s1: &mut S, s2: &mut S) {
+        imm_imm(freeze(s1), freeze(s1));
+        imm_imm(freeze(s1), &s1.f);
+        imm_imm(&s1.f, &s1.f);
+        imm_imm(id(s1), s2);
+
+        mut_imm(&mut s1.f, &s1.g);
+        mut_imm(id_mut(&mut s1.f), id(&s1.g));
+
+        mut_mut(&mut s1.f, &mut s2.g);
+        mut_mut(id_mut(&mut s1.f), &mut s2.g);
+        mut_mut(s1, s2);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.exp
new file mode 100644
index 000000000..db7de6bda
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.exp
@@ -0,0 +1,83 @@
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:15:9
+   │
+14 │         let f = freeze(s1);
+   │                 ---------- It is still being borrowed by this reference
+15 │         mut_imm(s1, f);
+   │         ^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:17:9
+   │
+16 │         let f = &s1.f;
+   │                 ----- Field 'f' is still being borrowed by this reference
+17 │         mut_imm(s1, f);
+   │         ^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:19:9
+   │
+18 │         let f = &s1.f;
+   │                 ----- It is still being borrowed by this reference
+19 │         mut_imm(&mut s1.f, f);
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:21:9
+   │
+20 │         let f = id(&s1.f);
+   │                 --------- It is still being borrowed by this reference
+21 │         id_mut(&mut s1.f); f;
+   │         ^^^^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:23:9
+   │
+23 │         mut_mut(s1, s1);
+   │         ^^^^^^^^^^^^^^^
+   │         │       │
+   │         │       It is still being mutably borrowed by this reference
+   │         Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:25:9
+   │
+24 │         let f = &mut s1.f;
+   │                 --------- Field 'f' is still being mutably borrowed by this reference
+25 │         mut_mut(s1, f);
+   │         ^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:26:9
+   │
+26 │         mut_mut(&mut s1.f, s1);
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │       │
+   │         │       Field 'f' is still being mutably borrowed by this reference
+   │         Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:28:9
+   │
+27 │         let s = id_mut(s1);
+   │                 ---------- It is still being mutably borrowed by this reference
+28 │         id_mut(s1);
+   │         ^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:31:9
+   │
+30 │         let f = id_mut(&mut s1.f);
+   │                 ----------------- Field 'f' is still being mutably borrowed by this reference
+31 │         mut_mut(s1, f);
+   │         ^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/call_mutual_borrows_invalid.move:32:9
+   │
+32 │         mut_mut(id_mut(&mut s1.f), s1);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │       │
+   │         │       Field 'f' is still being mutably borrowed by this reference
+   │         Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.move
new file mode 100644
index 000000000..8afa06f3a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_mutual_borrows_invalid.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun imm_imm<T1, T2>(_x: &T1, _y: &T2) { }
+    fun mut_imm<T1, T2>(_x: &mut T1, _y: &T2) { }
+    fun mut_mut<T1, T2>(_x: &mut T1, _y: &mut T2) { }
+
+    fun t0(s1: &mut S, _s2: &mut S) {
+        let f = freeze(s1);
+        mut_imm(s1, f);
+        let f = &s1.f;
+        mut_imm(s1, f);
+        let f = &s1.f;
+        mut_imm(&mut s1.f, f);
+        let f = id(&s1.f);
+        id_mut(&mut s1.f); f;
+
+        mut_mut(s1, s1);
+        let f = &mut s1.f;
+        mut_mut(s1, f);
+        mut_mut(&mut s1.f, s1);
+        let s = id_mut(s1);
+        id_mut(s1);
+        s;
+        let f = id_mut(&mut s1.f);
+        mut_mut(s1, f);
+        mut_mut(id_mut(&mut s1.f), s1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.exp
new file mode 100644
index 000000000..626109186
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/borrows/call_ordering.move:7:13
+  │
+6 │         let f = &mut s.f;
+  │                 -------- Field 'f' is still being mutably borrowed by this reference
+7 │         foo(freeze(s), { *f = 0; 1 })
+  │             ^^^^^^^^^ Invalid freeze.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/call_ordering.move:12:25
+   │
+12 │         bar(&mut s.f, { s.f = 0; 1 })
+   │             --------    ^^^^^^^ Invalid mutation of reference.
+   │             │            
+   │             It is still being mutably borrowed by this reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.move
new file mode 100644
index 000000000..6fcc7f215
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_ordering.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun foo(_s: &S, _u: u64) {}
+    fun t0(s: &mut S) {
+        let f = &mut s.f;
+        foo(freeze(s), { *f = 0; 1 })
+    }
+
+    fun bar(_s: &mut u64, _u: u64) {}
+    fun t1(s: &mut S) {
+        bar(&mut s.f, { s.f = 0; 1 })
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows.move
new file mode 100644
index 000000000..aef80bed4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    fun take_imm_mut_give_mut(_x: &u64, y: &mut u64): &mut u64 {
+        y
+    }
+
+    fun take_imm_mut_give_imm(_x: &u64, y: &mut u64): &u64 {
+        y
+    }
+
+    fun t0() {
+        let x = 0;
+        let y = 0;
+        let x_ref = &x;
+        let y_ref = &mut y;
+        let r = take_imm_mut_give_mut(x_ref, y_ref);
+        *x_ref;
+        move x;
+        *r = 1;
+    }
+
+    fun t1() {
+        let x = 0;
+        let y = 0;
+        let x_ref = &x;
+        let y_ref = &mut y;
+        let r = take_imm_mut_give_imm(x_ref, y_ref);
+        *r;
+        *x_ref;
+        *y_ref;
+        *x_ref;
+        *r;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.exp
new file mode 100644
index 000000000..1c89ae138
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.exp
@@ -0,0 +1,25 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/call_transfer_borrows_invalid.move:16:9
+   │
+15 │         let r = take_imm_mut_give_mut(move x_ref, move y_ref);
+   │                 --------------------------------------------- It is still being mutably borrowed by this reference
+16 │         move y;
+   │         ^^^^^^ Invalid move of variable 'y'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/call_transfer_borrows_invalid.move:26:9
+   │
+25 │         let r = take_imm_mut_give_imm(move x_ref, move y_ref);
+   │                 --------------------------------------------- It is still being borrowed by this reference
+26 │         move x;
+   │         ^^^^^^ Invalid move of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/call_transfer_borrows_invalid.move:27:9
+   │
+25 │         let r = take_imm_mut_give_imm(move x_ref, move y_ref);
+   │                 --------------------------------------------- It is still being borrowed by this reference
+26 │         move x;
+27 │         move y;
+   │         ^^^^^^ Invalid move of variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.move
new file mode 100644
index 000000000..a5d22db6c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/call_transfer_borrows_invalid.move
@@ -0,0 +1,30 @@
+module 0x8675309::M {
+    fun take_imm_mut_give_mut(_x: &u64, y: &mut u64): &mut u64 {
+        y
+    }
+
+    fun take_imm_mut_give_imm(_x: &u64, y: &mut u64): &u64 {
+        y
+    }
+
+    fun t0() {
+        let x = 0;
+        let y = 0;
+        let x_ref = &x;
+        let y_ref = &mut y;
+        let r = take_imm_mut_give_mut(move x_ref, move y_ref);
+        move y;
+        *r = 1;
+    }
+
+    fun t1() {
+        let x = 0;
+        let y = 0;
+        let x_ref = &x;
+        let y_ref = &mut y;
+        let r = take_imm_mut_give_imm(move x_ref, move y_ref);
+        move x;
+        move y;
+        *r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo.move
new file mode 100644
index 000000000..c30d9320e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo.move
@@ -0,0 +1,60 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        copy s;
+        *f;
+        s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *f;
+        copy s;
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        *f;
+        copy s;
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        *f;
+        copy s;
+        s;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) { copy s; s; } else { *f; }
+    }
+
+    fun t5(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) { copy s; };
+        *f;
+    }
+
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.exp
new file mode 100644
index 000000000..145e441c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.exp
@@ -0,0 +1,32 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_combo_invalid.move:14:9
+   │
+13 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- It is still being mutably borrowed by this reference
+14 │         copy s;
+   │         ^^^^^^ Invalid copy of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_combo_invalid.move:23:9
+   │
+22 │         if (cond) f = &mut s else f = other;
+   │                       ------ It is still being mutably borrowed by this reference
+23 │         copy s;
+   │         ^^^^^^ Invalid copy of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_combo_invalid.move:32:9
+   │
+31 │         if (cond) f = id_mut(&mut s) else f = other;
+   │                       -------------- It is still being mutably borrowed by this reference
+32 │         copy s;
+   │         ^^^^^^ Invalid copy of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_combo_invalid.move:40:21
+   │
+39 │         let f = &mut s.f;
+   │                 -------- It is still being mutably borrowed by this reference
+40 │         if (cond) { copy s; };
+   │                     ^^^^^^ Invalid copy of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.move
new file mode 100644
index 000000000..967e860fb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_combo_invalid.move
@@ -0,0 +1,45 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        copy s;
+        *f;
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        copy s;
+        *f;
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        copy s;
+        *f;
+        s;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        if (cond) { copy s; };
+        *f;
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field.move
new file mode 100644
index 000000000..21fd3d23b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field.move
@@ -0,0 +1,35 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        copy s;
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        *f;
+        copy s;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id(&s.f);
+        copy s;
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        *f;
+        copy s;
+        s;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.exp
new file mode 100644
index 000000000..d1108e003
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_field_invalid.move:13:9
+   │
+12 │         let f = &mut s.f;
+   │                 -------- It is still being mutably borrowed by this reference
+13 │         copy s;
+   │         ^^^^^^ Invalid copy of variable 's'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_field_invalid.move:19:9
+   │
+18 │         let f = id_mut(&mut s.f);
+   │                 ---------------- It is still being mutably borrowed by this reference
+19 │         copy s;
+   │         ^^^^^^ Invalid copy of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.move
new file mode 100644
index 000000000..f30f39736
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_field_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        copy s;
+        *f;
+        s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        copy s;
+        *f;
+        s;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full.move
new file mode 100644
index 000000000..bec060242
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &x;
+        *f;
+        copy x;
+        x;
+
+        let x = 0;
+        let f = &mut x;
+        *f;
+        copy x;
+        x;
+
+        let x = 0;
+        let f = id(&x);
+        *f;
+        copy x;
+        x;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        *f;
+        copy x;
+        x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.exp
new file mode 100644
index 000000000..ec27eeee2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_full_invalid.move:13:9
+   │
+12 │         let f = &mut x;
+   │                 ------ It is still being mutably borrowed by this reference
+13 │         x;
+   │         ^ Invalid copy of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/copy_full_invalid.move:19:9
+   │
+18 │         let f = id_mut(&mut x);
+   │                 -------------- It is still being mutably borrowed by this reference
+19 │         x;
+   │         ^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.move
new file mode 100644
index 000000000..27b6174b2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/copy_full_invalid.move
@@ -0,0 +1,24 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &mut x;
+        x;
+        *f;
+        x;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        x;
+        *f;
+        x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo.move
new file mode 100644
index 000000000..cb27ec50b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo.move
@@ -0,0 +1,33 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: &mut S, other: &S,) {
+        let f;
+        if (cond) f = &s.f else f = &other.f;
+        *s;
+        *f;
+        *s;
+    }
+
+    fun t1(cond: bool, s: &mut S) {
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        *s;
+        *f;
+        *s;
+    }
+
+    fun t2(cond: bool, s: &mut S, other: &S) {
+        let x: &S;
+        if (cond) x = copy s else x = other;
+        *s;
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.exp
new file mode 100644
index 000000000..835c2840d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.exp
@@ -0,0 +1,26 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_combo_invalid.move:13:9
+   │
+12 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- Field 'f' is still being mutably borrowed by this reference
+13 │         *s;
+   │         ^^ Invalid dereference.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_combo_invalid.move:20:9
+   │
+19 │         if (cond) f = &mut s.f else f = &mut s.g;
+   │                       --------          -------- Field 'g' is still being mutably borrowed by this reference
+   │                       │                  
+   │                       Field 'f' is still being mutably borrowed by this reference
+20 │         *s;
+   │         ^^ Invalid dereference.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_combo_invalid.move:27:9
+   │
+26 │         if (cond) x = copy s else x = other;
+   │                       ------ It is still being mutably borrowed by this reference
+27 │         *s;
+   │         ^^ Invalid dereference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.move
new file mode 100644
index 000000000..0f6201bed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_combo_invalid.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: &mut S, other: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *s;
+        *f;
+    }
+
+    fun t1(cond: bool, s: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut s.g;
+        *s;
+        *f;
+    }
+
+    fun t2(cond: bool, s: &mut S, other: &mut S) {
+        let x;
+        if (cond) x = copy s else x = other;
+        *s;
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field.move
new file mode 100644
index 000000000..d27b7b2f4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(s: &mut S) {
+        let f = &mut s.f;
+        *f;
+        *s;
+    }
+
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        *s;
+        *f;
+        *s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.exp
new file mode 100644
index 000000000..31f6c58c9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_field_invalid.move:12:9
+   │
+11 │         let f = &mut s.f;
+   │                 -------- Field 'f' is still being mutably borrowed by this reference
+12 │         *s;
+   │         ^^ Invalid dereference.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_field_invalid.move:16:9
+   │
+15 │         let f = id_mut(&mut s.f);
+   │                 ---------------- Field 'f' is still being mutably borrowed by this reference
+16 │         *s;
+   │         ^^ Invalid dereference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.move
new file mode 100644
index 000000000..551ce7337
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_field_invalid.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(s: &mut S) {
+        let f = &mut s.f;
+        *s;
+        *f;
+
+        let f = id_mut(&mut s.f);
+        *s;
+        *f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full.move
new file mode 100644
index 000000000..e53298ee6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full.move
@@ -0,0 +1,33 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        let y = copy x;
+        *y;
+        *x;
+
+        let x = &mut 0;
+        let y = id_mut(x);
+        *y;
+        *x;
+
+        let x = &0;
+        let y = copy x;
+        *y;
+        *x;
+
+
+        let x = &0;
+        let y = id(x);
+        *y;
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.exp
new file mode 100644
index 000000000..951f7e865
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_full_invalid.move:13:9
+   │
+12 │         let y = copy x;
+   │                 ------ It is still being mutably borrowed by this reference
+13 │         *x;
+   │         ^^ Invalid dereference.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/dereference_full_invalid.move:18:9
+   │
+17 │         let y = id_mut(x);
+   │                 --------- It is still being mutably borrowed by this reference
+18 │         *x;
+   │         ^^ Invalid dereference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.move
new file mode 100644
index 000000000..48e847db5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/dereference_full_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        let y = copy x;
+        *x;
+        *y;
+
+        let x = &mut 0;
+        let y = id_mut(x);
+        *x;
+        *y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.exp
new file mode 100644
index 000000000..8286e89cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.exp
@@ -0,0 +1,8 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/borrows/eq_unassigned_local.move:5:9
+  │
+4 │         let ref;
+  │             --- The variable 'ref' does not have a value. The variable must be assigned a value before being used.
+5 │         ref == &x;
+  │         ^^^ Invalid usage of unassigned variable 'ref'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.move
new file mode 100644
index 000000000..aabb6e2e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/eq_unassigned_local.move
@@ -0,0 +1,7 @@
+script {
+    fun main() {
+        let x = 5;
+        let ref;
+        ref == &x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo.move
new file mode 100644
index 000000000..ee80dede7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: &mut S, other: &S) {
+        let f;
+        if (cond) f = &s.f else f = &other.f;
+        freeze(s);
+        *f;
+    }
+
+    fun t1(cond: bool, s: &mut S) {
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        freeze(s);
+        *f;
+    }
+
+    fun t2(cond: bool, s: &mut S, other: &S) {
+        let x;
+        if (cond) x = freeze(s) else x = other;
+        freeze(s);
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.exp
new file mode 100644
index 000000000..124ad01ec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.exp
@@ -0,0 +1,26 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/freeze_combo_invalid.move:13:9
+   │
+12 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- Field 'f' is still being mutably borrowed by this reference
+13 │         freeze(s);
+   │         ^^^^^^^^^ Invalid freeze.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/freeze_combo_invalid.move:20:9
+   │
+19 │         if (cond) f = &mut s.f else f = &mut s.g;
+   │                       --------          -------- Field 'g' is still being mutably borrowed by this reference
+   │                       │                  
+   │                       Field 'f' is still being mutably borrowed by this reference
+20 │         freeze(s);
+   │         ^^^^^^^^^ Invalid freeze.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/freeze_combo_invalid.move:27:9
+   │
+26 │         if (cond) x = s else x = other;
+   │                       - It is still being mutably borrowed by this reference
+27 │         freeze(s);
+   │         ^^^^^^^^^ Invalid freeze.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.move
new file mode 100644
index 000000000..e315e6fef
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_combo_invalid.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, s: &mut S, other: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        freeze(s);
+        *f;
+    }
+
+    fun t1(cond: bool, s: &mut S) {
+        let f;
+        if (cond) f = &mut s.f else f = &mut s.g;
+        freeze(s);
+        *f;
+    }
+
+    fun t2(cond: bool, s: &mut S, other: &mut S) {
+        let x;
+        if (cond) x = s else x = other;
+        freeze(s);
+        *x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field.move
new file mode 100644
index 000000000..137325451
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(s: &mut S) {
+        let f = &mut s.f;
+        *f;
+        freeze(s);
+    }
+
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        freeze(s);
+        *f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.exp
new file mode 100644
index 000000000..edfb5f118
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/freeze_field_invalid.move:12:9
+   │
+11 │         let f = &mut s.f;
+   │                 -------- Field 'f' is still being mutably borrowed by this reference
+12 │         freeze(s);
+   │         ^^^^^^^^^ Invalid freeze.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/borrows/freeze_field_invalid.move:19:9
+   │
+18 │         let g = &mut s.f;
+   │                 -------- Field 'f' is still being mutably borrowed by this reference
+19 │         freeze(s);
+   │         ^^^^^^^^^ Invalid freeze.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.move
new file mode 100644
index 000000000..6b94e8de0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_field_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(s: &mut S) {
+        let f = &mut s.f;
+        freeze(s);
+        *f;
+    }
+
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        let g = &mut s.f;
+        freeze(s);
+        *f;
+        *g;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full.move
new file mode 100644
index 000000000..599c5efc2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        freeze(x);
+
+        let x = id_mut(&mut 0);
+        freeze(x);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full_invalid.move
new file mode 100644
index 000000000..a62910b95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/freeze_full_invalid.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        freeze(x);
+        *x = 0;
+
+        let x = id_mut(&mut 0);
+        freeze(x);
+        *x = 0;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo.move
new file mode 100644
index 000000000..f03441cce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo.move
@@ -0,0 +1,48 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        *f;
+        move s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *f;
+        move s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        *f;
+        move s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        *f;
+        move s;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) { move s; } else { *f; }
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.exp
new file mode 100644
index 000000000..bad725681
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.exp
@@ -0,0 +1,40 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_combo_invalid.move:14:9
+   │
+13 │         if (cond) f = &s.f else f = &s.g;
+   │                                     ---- It is still being borrowed by this reference
+14 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_combo_invalid.move:22:9
+   │
+21 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- It is still being mutably borrowed by this reference
+22 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_combo_invalid.move:30:9
+   │
+29 │         if (cond) f = &mut s else f = other;
+   │                       ------ It is still being mutably borrowed by this reference
+30 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_combo_invalid.move:38:9
+   │
+37 │         if (cond) f = id_mut(&mut s) else f = other;
+   │                       -------------- It is still being mutably borrowed by this reference
+38 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_combo_invalid.move:45:21
+   │
+44 │         let f = &s.f;
+   │                 ---- It is still being borrowed by this reference
+45 │         if (cond) { move s; };
+   │                     ^^^^^^ Invalid move of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.move
new file mode 100644
index 000000000..220d62307
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_combo_invalid.move
@@ -0,0 +1,49 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        move s;
+        *f;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        move s;
+        *f;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        move s;
+        *f;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        move s;
+        *f;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) { move s; };
+        *f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field.move
new file mode 100644
index 000000000..ef186eb49
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        *f;
+        move s;
+
+
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        *f;
+        move s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id(&s.f);
+        *f;
+        move s;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        *f;
+        move s;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.exp
new file mode 100644
index 000000000..d7d6bc397
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_field_invalid.move:13:9
+   │
+12 │         let f = &s.f;
+   │                 ---- It is still being borrowed by this reference
+13 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_field_invalid.move:18:9
+   │
+17 │         let f = &mut s.f;
+   │                 -------- It is still being mutably borrowed by this reference
+18 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_field_invalid.move:23:9
+   │
+22 │         let f = id(&s.f);
+   │                 -------- It is still being borrowed by this reference
+23 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_field_invalid.move:28:9
+   │
+27 │         let f = id_mut(&mut s.f);
+   │                 ---------------- It is still being mutably borrowed by this reference
+28 │         move s;
+   │         ^^^^^^ Invalid move of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.move
new file mode 100644
index 000000000..bdcb3089a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_field_invalid.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let s = S { f: 0, g: 0 };
+        let f = &s.f;
+        move s;
+        *f;
+
+        let s = S { f: 0, g: 0 };
+        let f = &mut s.f;
+        move s;
+        *f;
+
+        let s = S { f: 0, g: 0 };
+        let f = id(&s.f);
+        move s;
+        *f;
+
+        let s = S { f: 0, g: 0 };
+        let f = id_mut(&mut s.f);
+        move s;
+        *f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full.move
new file mode 100644
index 000000000..bf6fe5784
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &x;
+        *f;
+        move x;
+
+        let x = 0;
+        let f = &mut x;
+        *f;
+        move x;
+
+        let x = 0;
+        let f = id(&x);
+        *f;
+        move x;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        *f;
+        move x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.exp
new file mode 100644
index 000000000..149c8287b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_full_invalid.move:13:9
+   │
+12 │         let f = &x;
+   │                 -- It is still being borrowed by this reference
+13 │         move x;
+   │         ^^^^^^ Invalid move of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_full_invalid.move:18:9
+   │
+17 │         let f = &mut x;
+   │                 ------ It is still being mutably borrowed by this reference
+18 │         move x;
+   │         ^^^^^^ Invalid move of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_full_invalid.move:23:9
+   │
+22 │         let f = id(&x);
+   │                 ------ It is still being borrowed by this reference
+23 │         move x;
+   │         ^^^^^^ Invalid move of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/move_full_invalid.move:28:9
+   │
+27 │         let f = id_mut(&mut x);
+   │                 -------------- It is still being mutably borrowed by this reference
+28 │         move x;
+   │         ^^^^^^ Invalid move of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.move
new file mode 100644
index 000000000..f5b469082
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/move_full_invalid.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = 0;
+        let f = &x;
+        move x;
+        *f;
+
+        let x = 0;
+        let f = &mut x;
+        move x;
+        *f;
+
+        let x = 0;
+        let f = id(&x);
+        move x;
+        *f;
+
+        let x = 0;
+        let f = id_mut(&mut x);
+        move x;
+        *f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo.move
new file mode 100644
index 000000000..28d665c02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo.move
@@ -0,0 +1,54 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, _other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        *f;
+        *s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *f;
+        *s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = s else f = other;
+        *f;
+        *s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(s) else f = other;
+        *f;
+        *s = S { f: 0, g: 0 };
+        s;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f = &s.f;
+        *f;
+        if (cond) *s = S { f: 0, g: 0 };
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.exp
new file mode 100644
index 000000000..ff56d53a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.exp
@@ -0,0 +1,42 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_combo_invalid.move:14:9
+   │
+13 │         if (cond) f = &s.f else f = &s.g;
+   │                       ----          ---- Field 'g' is still being borrowed by this reference
+   │                       │              
+   │                       Field 'f' is still being borrowed by this reference
+14 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_combo_invalid.move:23:9
+   │
+22 │         if (cond) f = &mut s.f else f = &mut other.f;
+   │                       -------- Field 'f' is still being mutably borrowed by this reference
+23 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_combo_invalid.move:32:9
+   │
+31 │         if (cond) f = s else f = other;
+   │                       - It is still being mutably borrowed by this reference
+32 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_combo_invalid.move:41:9
+   │
+40 │         if (cond) f = id_mut(s) else f = other;
+   │                       --------- It is still being mutably borrowed by this reference
+41 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_combo_invalid.move:49:19
+   │
+48 │         let f = &s.f;
+   │                 ---- Field 'f' is still being borrowed by this reference
+49 │         if (cond) *s = S { f: 0, g: 0 };
+   │                   ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.move
new file mode 100644
index 000000000..1cab7e705
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_combo_invalid.move
@@ -0,0 +1,54 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0(cond: bool, _other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &s.f else f = &s.g;
+        *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t1(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t2(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = s else f = other;
+        *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t3(cond: bool, other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(s) else f = other;
+        *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+    fun t4(cond: bool, _other: &mut S) {
+        let s = &mut S { f: 0, g: 0 };
+        let f = &s.f;
+        if (cond) *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field.move
new file mode 100644
index 000000000..e28ca08b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        *f;
+        s.g = 0;
+        *s = S { f: 0, g: 0 };
+
+        let f = &mut s.f;
+        *f;
+        s.g = 0;
+        *s = S { f: 0, g: 0 };
+
+        let f = id(&s.f);
+        *f;
+        s.g = 0;
+        *s = S { f: 0, g: 0 };
+
+        let f = id_mut(&mut s.f);
+        *f;
+        s.g = 0;
+        *s = S { f: 0, g: 0 };
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.exp
new file mode 100644
index 000000000..99a4ffc8d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_field_invalid.move:11:9
+   │
+10 │         let f = &s.f;
+   │                 ---- Field 'f' is still being borrowed by this reference
+11 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_field_invalid.move:15:9
+   │
+14 │         let f = &mut s.f;
+   │                 -------- Field 'f' is still being mutably borrowed by this reference
+15 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_field_invalid.move:19:9
+   │
+18 │         let f = id(&s.f);
+   │                 -------- Field 'f' is still being borrowed by this reference
+19 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_field_invalid.move:23:9
+   │
+22 │         let f = id_mut(&mut s.f);
+   │                 ---------------- Field 'f' is still being mutably borrowed by this reference
+23 │         *s = S { f: 0, g: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.move
new file mode 100644
index 000000000..983f51f88
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_field_invalid.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    struct S has drop { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun t1(s: &mut S) {
+        let f = &s.f;
+        *s = S { f: 0, g: 0 };
+        *f;
+
+        let f = &mut s.f;
+        *s = S { f: 0, g: 0 };
+        *f;
+
+        let f = id(&s.f);
+        *s = S { f: 0, g: 0 };
+        *f;
+
+        let f = id_mut(&mut s.f);
+        *s = S { f: 0, g: 0 };
+        *f;
+        s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full.move
new file mode 100644
index 000000000..77b2a7d52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full.move
@@ -0,0 +1,33 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        let f = x;
+        *f;
+        *x = 0;
+
+
+        let x = &mut 0;
+        let f = freeze(x);
+        *f;
+        *x = 0;
+
+        let x = &mut 0;
+        let f = id(x);
+        *f;
+        *x = 0;
+
+        let x = &mut 0;
+        let f = id_mut(x);
+        *f;
+        *x = 0;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.exp
new file mode 100644
index 000000000..c306b6443
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.exp
@@ -0,0 +1,32 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_full_invalid.move:13:9
+   │
+12 │         let f = x;
+   │                 - It is still being mutably borrowed by this reference
+13 │         *x = 0;
+   │         ^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_full_invalid.move:18:9
+   │
+17 │         let f = freeze(x);
+   │                 --------- It is still being borrowed by this reference
+18 │         *x = 0;
+   │         ^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_full_invalid.move:23:9
+   │
+22 │         let f = id(x);
+   │                 ----- It is still being borrowed by this reference
+23 │         *x = 0;
+   │         ^^^^^^ Invalid mutation of reference.
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/borrows/mutate_full_invalid.move:28:9
+   │
+27 │         let f = id_mut(x);
+   │                 --------- It is still being mutably borrowed by this reference
+28 │         *x = 0;
+   │         ^^^^^^ Invalid mutation of reference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.move
new file mode 100644
index 000000000..a452ddc72
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/mutate_full_invalid.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun t0() {
+        let x = &mut 0;
+        let f = x;
+        *x = 0;
+        *f;
+
+        let x = &mut 0;
+        let f = freeze(x);
+        *x = 0;
+        *f;
+
+        let x = &mut 0;
+        let f = id(x);
+        *x = 0;
+        *f;
+
+        let x = &mut 0;
+        let f = id_mut(x);
+        *x = 0;
+        *f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/release_cycle.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/release_cycle.move
new file mode 100644
index 000000000..02386d58f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/release_cycle.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let v = 0;
+        let (x, y);
+        if (cond) {
+            x = &v;
+            y = copy x;
+        } else {
+            y = &v;
+            x = copy y;
+        };
+        move x;
+        move y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local.move
new file mode 100644
index 000000000..b3929ee5d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun t0() {
+        let v1 = 0;
+        let v2 = 0;
+        let v3 = 0;
+        let v4 = 0;
+        let s1 = S { f: 0 };
+        let s2 = S { f: 0 };
+        let s3 = S { f: 0 };
+        let s4 = S { f: 0 };
+
+        &mut v1;
+        &v2;
+        id_mut(&mut v3);
+        id(&v4);
+        &mut s1.f;
+        &s2.f;
+        id_mut(&mut s3.f);
+        id(&s4.f);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.exp
new file mode 100644
index 000000000..a4c517eb8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.exp
@@ -0,0 +1,106 @@
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+23 │ │         &mut s1.f,
+   │ │         --------- It is still being mutably borrowed by this reference
+24 │ │         &s2.f,
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 's1' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+23 │ │         &mut s1.f,
+24 │ │         &s2.f,
+   │ │         ----- It is still being borrowed by this reference
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 's2' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+   · │
+25 │ │         id_mut(&mut s3.f),
+   │ │         ----------------- It is still being mutably borrowed by this reference
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 's3' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+   · │
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ │         --------- It is still being borrowed by this reference
+   │ ╰──────────────────^ Invalid return. Local variable 's4' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+   │            ------- It is still being mutably borrowed by this reference
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+   · │
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 'v1' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+   │ │         --- It is still being borrowed by this reference
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+   · │
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 'v2' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+   │ │         --------------- It is still being mutably borrowed by this reference
+22 │ │         id(&v4),
+   · │
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 'v3' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/borrows/return_borrowed_local_invalid.move:19:9
+   │  
+19 │ ╭         (&mut v1,
+20 │ │         &v2,
+21 │ │         id_mut(&mut v3),
+22 │ │         id(&v4),
+   │ │         ------- It is still being borrowed by this reference
+   · │
+25 │ │         id_mut(&mut s3.f),
+26 │ │         id(&s4.f))
+   │ ╰──────────────────^ Invalid return. Local variable 'v4' is still being borrowed.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.move
new file mode 100644
index 000000000..7367f8a31
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_borrowed_local_invalid.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun t0(): (&mut u64, &u64, &mut u64, &u64, &mut u64, &u64, &mut u64, &u64) {
+        let v1 = 0;
+        let v2 = 0;
+        let v3 = 0;
+        let v4 = 0;
+        let s1 = S { f: 0 };
+        let s2 = S { f: 0 };
+        let s3 = S { f: 0 };
+        let s4 = S { f: 0 };
+
+        (&mut v1,
+        &v2,
+        id_mut(&mut v3),
+        id(&v4),
+        &mut s1.f,
+        &s2.f,
+        id_mut(&mut s3.f),
+        id(&s4.f))
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows.move
new file mode 100644
index 000000000..3e1f44281
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+
+    fun imm_imm_0(s1: &mut S): (&S, &S) {
+        (freeze(s1), freeze(s1))
+    }
+    fun imm_imm_1(s1: &mut S): (&S, &u64) {
+        (freeze(s1), &s1.f)
+    }
+    fun imm_imm_2(s1: &mut S): (&u64, &u64) {
+        (&s1.f, &s1.f)
+    }
+    fun imm_imm_3(s1: &mut S, s2: &mut S): (&S, &S) {
+        (id(s1), s2)
+    }
+
+    fun mut_imm_0(s1: &mut S): (&mut u64, &u64) {
+        (&mut s1.f, &s1.g)
+    }
+    fun mut_imm_1(s1: &mut S): (&mut u64, &u64) {
+        (id_mut(&mut s1.f), id(&s1.g))
+    }
+
+    fun mut_mut_0(s1: &mut S, s2: &mut S): (&mut u64, &mut u64) {
+        (&mut s1.f, &mut s2.g)
+    }
+    fun mut_mut_1(s1: &mut S, s2: &mut S): (&mut u64, &mut u64) {
+        (id_mut(&mut s1.f), &mut s2.g)
+    }
+    fun mut_mut_2(s1: &mut S, s2: &mut S): (&mut S, &mut S) {
+        (s1, s2)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.exp
new file mode 100644
index 000000000..8c3bae8d8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.exp
@@ -0,0 +1,84 @@
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:15:9
+   │
+14 │         let f = freeze(s1);
+   │                 ---------- It is still being borrowed by this reference
+15 │         (s1, f)
+   │         ^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:19:9
+   │
+18 │         let f = &s1.f;
+   │                 ----- Field 'f' is still being borrowed by this reference
+19 │         (s1, f)
+   │         ^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:23:9
+   │
+22 │         let f = &s1.f;
+   │                 ----- It is still being borrowed by this reference
+23 │         (&mut s1.f, f)
+   │         ^^^^^^^^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:27:9
+   │
+26 │         let f = id(&s1.f);
+   │                 --------- It is still being borrowed by this reference
+27 │         (&mut s1.f, f)
+   │         ^^^^^^^^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:31:9
+   │
+31 │         (s1, s1)
+   │         ^^^^^^^^
+   │         ││
+   │         │It is still being mutably borrowed by this reference
+   │         Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:35:9
+   │
+34 │         let f =  &mut s1.f;
+   │                  --------- Field 'f' is still being mutably borrowed by this reference
+35 │         (s1, f)
+   │         ^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:38:9
+   │
+38 │         (&mut s1.f, s1)
+   │         ^^^^^^^^^^^^^^^
+   │         ││
+   │         │Field 'f' is still being mutably borrowed by this reference
+   │         Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:41:9
+   │
+41 │         (id_mut(s1), s1)
+   │         ^^^^^^^^^^^^^^^^
+   │         ││
+   │         │It is still being mutably borrowed by this reference
+   │         Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:45:9
+   │
+44 │         let f = id_mut(&mut s1.f);
+   │                 ----------------- Field 'f' is still being mutably borrowed by this reference
+45 │         (s1, f)
+   │         ^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/borrows/return_mutual_borrows_invalid.move:48:9
+   │
+48 │         (id_mut(&mut s1.f), s1)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^
+   │         ││
+   │         │Field 'f' is still being mutably borrowed by this reference
+   │         Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.move
new file mode 100644
index 000000000..7d2f679e6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_mutual_borrows_invalid.move
@@ -0,0 +1,50 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    fun id<T>(r: &T): &T {
+        r
+    }
+    fun id_mut<T>(r: &mut T): &mut T {
+        r
+    }
+    fun imm_imm<T1, T2>(_x: &T1, _xy: &T2) { }
+    fun mut_imm<T1, T2>(_x: &mut T1, _y: &T2) { }
+    fun mut_mut<T1, T2>(_x: &mut T1, _y: &mut T2) { }
+
+    fun mut_imm_0(s1: &mut S): (&mut S, &S) {
+        let f = freeze(s1);
+        (s1, f)
+    }
+    fun mut_imm_1(s1: &mut S): (&mut S, &u64) {
+        let f = &s1.f;
+        (s1, f)
+    }
+    fun mut_imm_2(s1: &mut S): (&mut u64, &u64) {
+        let f = &s1.f;
+        (&mut s1.f, f)
+    }
+    fun mut_imm_3(s1: &mut S): (&mut u64, &u64) {
+        let f = id(&s1.f);
+        (&mut s1.f, f)
+    }
+
+    fun mut_mut_0(s1: &mut S): (&mut S, &mut S) {
+        (s1, s1)
+    }
+    fun mut_mut_1(s1: &mut S): (&mut S, &mut u64) {
+        let f =  &mut s1.f;
+        (s1, f)
+    }
+    fun mut_mut_2(s1: &mut S): (&mut u64, &mut S) {
+        (&mut s1.f, s1)
+    }
+    fun mut_mut_3(s1: &mut S): (&mut S, &mut S) {
+        (id_mut(s1), s1)
+    }
+    fun mut_mut_4(s1: &mut S): (&mut S, &mut u64) {
+        let f = id_mut(&mut s1.f);
+        (s1, f)
+    }
+    fun mut_mut_5(s1: &mut S): (&mut u64, &mut S) {
+        (id_mut(&mut s1.f), s1)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_values_are_not_unused.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_values_are_not_unused.move
new file mode 100644
index 000000000..3c1559424
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_values_are_not_unused.move
@@ -0,0 +1,9 @@
+// unused mut references are not unused if they come from other functions
+module a::m {
+    public fun foo(): &mut u64 {
+        abort 0
+    }
+    public fun allowed() {
+        foo();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/return_values_are_not_unused.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/return_values_are_not_unused.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.move
new file mode 100644
index 000000000..10af6ac20
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.move
@@ -0,0 +1,13 @@
+// unused mutable references in combination with ifs
+module a::m {
+    public(friend) fun both_unused(cond: bool, x: &mut u64) {
+        let i = 0;
+        if (cond) copy x else &mut i;
+    }
+
+    public(friend) fun one_unused(cond: bool, x: &mut u64) {
+        let i = 0;
+        *x = 0;
+        if (cond) copy x else &mut i;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.unused.exp
new file mode 100644
index 000000000..fd7fd14b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_branches.unused.exp
@@ -0,0 +1,26 @@
+warning[W09014]: unused mutable reference '&mut' parameter
+  ┌─ tests/move_check/borrows/unused_mut_ref_branches.move:3:51
+  │
+3 │     public(friend) fun both_unused(cond: bool, x: &mut u64) {
+  │                                                -  ^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │                                                │   
+  │                                                For parameters, this can be silenced by prefixing the name with an underscore, e.g. '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+  ┌─ tests/move_check/borrows/unused_mut_ref_branches.move:5:31
+  │
+5 │         if (cond) copy x else &mut i;
+  │                               ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+   ┌─ tests/move_check/borrows/unused_mut_ref_branches.move:11:31
+   │
+11 │         if (cond) copy x else &mut i;
+   │                               ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.move
new file mode 100644
index 000000000..60aff2d5f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.move
@@ -0,0 +1,15 @@
+// warn on unused mutable reference, i.e. it could have been immutable
+// In these cases, the mutable reference is "used" but the extensions (fields) are not
+module a::m {
+    struct S has drop { f: u64 }
+
+    public fun t(param: &mut S) {
+        let s = S { f: 0 };
+        let r = &mut s;
+        let param_f = &mut param.f;
+        let r_f = &mut r.f;
+        &mut S { f: 0 }.f;
+        param_f;
+        r_f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.unused.exp
new file mode 100644
index 000000000..b9f57922e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_invalid.unused.exp
@@ -0,0 +1,24 @@
+warning[W09013]: unused mutable reference '&mut'
+  ┌─ tests/move_check/borrows/unused_mut_ref_field_invalid.move:9:23
+  │
+9 │         let param_f = &mut param.f;
+  │                       ^^^^^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+   ┌─ tests/move_check/borrows/unused_mut_ref_field_invalid.move:10:19
+   │
+10 │         let r_f = &mut r.f;
+   │                   ^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+   ┌─ tests/move_check/borrows/unused_mut_ref_field_invalid.move:11:9
+   │
+11 │         &mut S { f: 0 }.f;
+   │         ^^^^^^^^^^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_valid_usage.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_valid_usage.move
new file mode 100644
index 000000000..8fb59746b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_valid_usage.move
@@ -0,0 +1,31 @@
+// these usages mean the mutable reference is valid
+module a::m {
+    struct S has drop { f: u64 }
+
+    public fun assignment(param: &mut S) {
+        let s = S { f: 0 };
+        let r = &mut s;
+        let param_f = &mut param.f;
+        let r_f = &mut r.f;
+        *&mut S { f: 0 }.f = 1;
+        *param_f = 1;
+        *r_f = 1;
+    }
+
+    public fun call(param: &mut S) {
+        let s = S { f: 0 };
+        let r = &mut s;
+        let param_f = &mut param.f;
+        let r_f = &mut r.f;
+        ignore(&mut S { f: 0 }.f);
+        ignore(param_f);
+        ignore(r_f);
+    }
+
+    public fun ret(param: &mut S): &mut u64 {
+        &mut param.f
+    }
+
+    public fun ignore<T>(_: &mut T) {}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_valid_usage.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_field_valid_usage.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.move
new file mode 100644
index 000000000..a25e4b9c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.move
@@ -0,0 +1,28 @@
+// report unused mutable ref with immutable usage
+module a::m {
+    struct S has drop { f: u64 }
+
+    public(friend) fun param(x: &mut S): &S {
+        let r: &S;
+        freeze(x);
+        let _: &S = x;
+        let _: &u64 = &x.f;
+        ignore(x);
+        r = x;
+        r;
+        x
+    }
+
+    public(friend) fun local(s: S) {
+        let x = &mut s;
+        let r: &S;
+        freeze(x);
+        let _: &S = x;
+        let _: &u64 = &x.f;
+        ignore(x);
+        r = x;
+        r;
+    }
+
+    fun ignore<T>(_: &T) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.unused.exp
new file mode 100644
index 000000000..2eb85aa3e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_immutable_usage.unused.exp
@@ -0,0 +1,18 @@
+warning[W09014]: unused mutable reference '&mut' parameter
+  ┌─ tests/move_check/borrows/unused_mut_ref_immutable_usage.move:5:33
+  │
+5 │     public(friend) fun param(x: &mut S): &S {
+  │                              -  ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │                              │   
+  │                              For parameters, this can be silenced by prefixing the name with an underscore, e.g. '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+   ┌─ tests/move_check/borrows/unused_mut_ref_immutable_usage.move:17:17
+   │
+17 │         let x = &mut s;
+   │                 ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.move
new file mode 100644
index 000000000..5277e63a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.move
@@ -0,0 +1,16 @@
+// warn on unused mutable reference, i.e. it could have been immutable
+module a::m {
+    public(friend) fun unused(x: &mut u64) {
+        let i = 0;
+        let r = &mut i;
+        let r2 = copy r; // should point only to r
+        &mut 0;
+        x;
+        r;
+        r2;
+    }
+
+    public(friend) fun ret(x: &mut u64): &u64 {
+        x
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.unused.exp
new file mode 100644
index 000000000..0a1ce9f59
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_simple_invalid.unused.exp
@@ -0,0 +1,36 @@
+warning[W09014]: unused mutable reference '&mut' parameter
+  ┌─ tests/move_check/borrows/unused_mut_ref_simple_invalid.move:3:34
+  │
+3 │     public(friend) fun unused(x: &mut u64) {
+  │                               -  ^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │                               │   
+  │                               For parameters, this can be silenced by prefixing the name with an underscore, e.g. '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+  ┌─ tests/move_check/borrows/unused_mut_ref_simple_invalid.move:5:17
+  │
+5 │         let r = &mut i;
+  │                 ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09013]: unused mutable reference '&mut'
+  ┌─ tests/move_check/borrows/unused_mut_ref_simple_invalid.move:7:9
+  │
+7 │         &mut 0;
+  │         ^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+  │
+  = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09014]: unused mutable reference '&mut' parameter
+   ┌─ tests/move_check/borrows/unused_mut_ref_simple_invalid.move:13:31
+   │
+13 │     public(friend) fun ret(x: &mut u64): &u64 {
+   │                            -  ^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │                            │   
+   │                            For parameters, this can be silenced by prefixing the name with an underscore, e.g. '_x'
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_underscore_param.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_underscore_param.move
new file mode 100644
index 000000000..a8d654aff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_underscore_param.move
@@ -0,0 +1,17 @@
+// a param with a leading _ does not get unused mut ref warnings
+module a::m {
+    struct S has drop { f: u64 }
+
+    public fun param(_x: &mut S): &S {
+        let r: &S;
+        freeze(_x);
+        let _: &S = _x;
+        let _: &u64 = &_x.f;
+        ignore(_x);
+        r = _x;
+        r;
+        _x
+    }
+
+    fun ignore<T>(_: &T) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_underscore_param.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_underscore_param.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.move
new file mode 100644
index 000000000..c0d39b949
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.move
@@ -0,0 +1,20 @@
+module a::m {
+
+    struct FBox {
+        f: F,
+    }
+
+    struct F {
+        f1: u8,
+        f2: u16,
+        f3: u64,
+    }
+
+    // f1, f2, f3 never used mutably, so f is never used mutably
+    public fun foo(f: &mut FBox): &u8 {
+        let f = &mut f.f;
+        let F { f1, f2: _, f3 } = f;
+        assert!(*f3 >= 0, 42);
+        f1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.unused.exp
new file mode 100644
index 000000000..b8d6ce673
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_unpack.unused.exp
@@ -0,0 +1,8 @@
+warning[W09013]: unused mutable reference '&mut'
+   ┌─ tests/move_check/borrows/unused_mut_ref_unpack.move:15:17
+   │
+15 │         let f = &mut f.f;
+   │                 ^^^^^^^^ Mutable reference is never used mutably, consider switching to an immutable reference '&' instead
+   │
+   = This warning can be suppressed with '#[allow(unused_mut_ref)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_valid_usages.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_valid_usages.move
new file mode 100644
index 000000000..10ac9e5e0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_mut_ref_valid_usages.move
@@ -0,0 +1,28 @@
+// these usages mean the mutable reference is valid
+module a::m {
+    public fun assignment(x: &mut u64) {
+        let i = 0;
+        let r = &mut i;
+        let r2 = copy r;
+        *&mut 0 = 1;
+        *x = 1;
+        *r2 = 1;
+        *r = 1;
+    }
+
+    public fun call(x: &mut u64) {
+        let i = 0;
+        let r = &mut i;
+        let r2 = copy r;
+        ignore(&mut 0);
+        ignore(x);
+        ignore(r2);
+        ignore(r);
+    }
+
+    public fun ret(x: &mut u64): &mut u64 {
+        x
+    }
+
+    public fun ignore<T>(_: &mut T) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.exp b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.exp
new file mode 100644
index 000000000..eab735f32
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.exp
@@ -0,0 +1,9 @@
+error[E04017]: too many arguments
+   ┌─ tests/move_check/borrows/unused_ref.move:28:5
+   │
+28 │     borrow<u64, u64>(&mut x, 0, 0);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │     │               │
+   │     │               Found 3 argument(s) here
+   │     Invalid call of '0x42::m::borrow'. The call expected 2 argument(s) but got 3
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.move
new file mode 100644
index 000000000..9301e29a7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/unused_ref.move
@@ -0,0 +1,32 @@
+module 0x42::m {
+
+struct Txn { sender: address }
+struct X {}
+
+fun begin(sender: address): Txn {
+    Txn { sender }
+}
+
+fun new(_: &mut Txn): X {
+    X {}
+}
+
+fun add<K: copy + drop + store, V: store>(_x: &mut X, _k: K, _v: V) {
+    abort 0
+}
+
+
+fun borrow<K: copy + drop + store, V: store>(_x: &X, _k: K): &V {
+    abort 0
+}
+
+fun borrow_wrong_type() {
+    let sender = @0x0;
+    let scenario = begin(sender);
+    let x = new(&mut scenario);
+    add(&mut x, 0, 0);
+    borrow<u64, u64>(&mut x, 0, 0);
+    abort 42
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches.move
new file mode 100644
index 000000000..662a0de6c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches.move
@@ -0,0 +1,14 @@
+module a::m {
+    public fun both_unused(cond: bool, x: &mut u64) {
+        let i = 0;
+        let r = if (cond) copy x else &mut i;
+        *r = 0;
+    }
+
+    public fun one_unused(cond: bool, x: &mut u64) {
+        let i = 0;
+        *x = 0;
+        let r = if (cond) copy x else &mut i;
+        *r = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches_complicated.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches_complicated.move
new file mode 100644
index 000000000..9089f7ed9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches_complicated.move
@@ -0,0 +1,33 @@
+module a::m {
+    struct S has copy, drop { f: u64, g: u64 }
+
+    public fun t1(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s.f else f = &mut other.f;
+        *f = 0;
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    public fun t2(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = &mut s else f = other;
+        *f = S { f: 0, g: 0 };
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    public fun t3(cond: bool, other: &mut S) {
+        let s = S { f: 0, g: 0 };
+        let f;
+        if (cond) f = id_mut(&mut s) else f = other;
+        *f = S { f: 0, g: 0 };
+        s = S { f: 0, g: 0 };
+        s;
+    }
+
+    public fun id_mut<T>(x: &mut T): &mut T { x }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches_complicated.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_branches_complicated.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_in_loop.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_in_loop.move
new file mode 100644
index 000000000..6791a1d48
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_in_loop.move
@@ -0,0 +1,11 @@
+module a::m {
+    public fun used(cond: bool) {
+        let i = 0;
+        let j = 0;
+        let r = &mut i;
+        while (cond) {
+            *r = 1;
+            r = &mut j;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_in_loop.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_in_loop.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_unpack.move
new file mode 100644
index 000000000..64dcf4c12
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_unpack.move
@@ -0,0 +1,20 @@
+module a::m {
+
+    struct FBox {
+        f: F,
+    }
+
+    struct F {
+        f1: u8,
+        f2: u16,
+        f3: u64,
+    }
+
+    // f1 used mutably, so do not complain about f2 or f3
+    public fun foo(f: &mut FBox): &mut u8 {
+        let f = &mut f.f;
+        let F { f1, f2: _, f3 } = f;
+        assert!(*f3 >= 0, 42);
+        f1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_unpack.unused b/vendors/move/crates/move-compiler/tests/move_check/borrows/used_mut_ref_unpack.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.exp b/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.exp
new file mode 100644
index 000000000..fb513a035
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/control_flow/infinite_loop_with_dead_exits.move:13:17
+   │
+13 │             if (return) break;
+   │                 ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/control_flow/infinite_loop_with_dead_exits.move:13:25
+   │
+13 │             if (return) break;
+   │                         ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.move b/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.move
new file mode 100644
index 000000000..996885d2b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/control_flow/infinite_loop_with_dead_exits.move
@@ -0,0 +1,18 @@
+address 0x42 {
+module M {
+
+    // fun t1() {
+    //     loop {
+    //         continue;
+    //         break
+    //     };
+    // }
+
+    fun t2() {
+        loop {
+            if (return) break;
+        }
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/control_flow/loop_after_loop.move b/vendors/move/crates/move-compiler/tests/move_check/control_flow/loop_after_loop.move
new file mode 100644
index 000000000..6a89bf4c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/control_flow/loop_after_loop.move
@@ -0,0 +1,6 @@
+script {
+    fun main() {
+        loop { break };
+        loop ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.exp
new file mode 100644
index 000000000..93a732d61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.exp
@@ -0,0 +1,9 @@
+error[E02004]: invalid 'module' declaration
+  ┌─ tests/move_check/dependencies/friend_cycle_2.move:8:5
+  │
+4 │     friend 0x2::B;
+  │     -------------- '0x2::B' is a friend of '0x2::A'
+  ·
+8 │     friend 0x2::A;
+  │     ^^^^^^^^^^^^^^ '0x2::A' is a friend of '0x2::B'. This 'friend' relationship creates a dependency cycle.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.move
new file mode 100644
index 000000000..4663735fb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_2.move
@@ -0,0 +1,11 @@
+address 0x2 {
+
+module A {
+    friend 0x2::B;
+}
+
+module B {
+    friend 0x2::A;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.exp
new file mode 100644
index 000000000..ccb850deb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/friend_cycle_3.move:8:5
+   │
+ 4 │     friend 0x2::B;
+   │     -------------- '0x2::B' is a friend of '0x2::A'
+   ·
+ 8 │     friend 0x2::C;
+   │     ^^^^^^^^^^^^^^ '0x2::C' is a friend of '0x2::B'. This 'friend' relationship creates a dependency cycle.
+   ·
+12 │     friend 0x2::A;
+   │     -------------- '0x2::A' is a friend of '0x2::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.move
new file mode 100644
index 000000000..238219e4d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/friend_cycle_3.move
@@ -0,0 +1,15 @@
+address 0x2 {
+
+module A {
+    friend 0x2::B;
+}
+
+module B {
+    friend 0x2::C;
+}
+
+module C {
+    friend 0x2::A;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.exp
new file mode 100644
index 000000000..c8eda28cb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/intersecting_friend_cycles.move:8:5
+   │
+ 4 │     friend 0x2::B;
+   │     -------------- '0x2::B' is a friend of '0x2::A'
+   ·
+ 8 │     friend 0x2::C;
+   │     ^^^^^^^^^^^^^^ '0x2::C' is a friend of '0x2::B'. This 'friend' relationship creates a dependency cycle.
+   ·
+13 │     friend 0x2::A;
+   │     -------------- '0x2::A' is a friend of '0x2::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.move
new file mode 100644
index 000000000..f74c3033e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_friend_cycles.move
@@ -0,0 +1,25 @@
+address 0x2 {
+
+module A {
+    friend 0x2::B;
+}
+
+module B {
+    friend 0x2::C;
+    friend 0x2::D;
+}
+
+module C {
+    friend 0x2::A;
+}
+
+
+module D {
+    friend 0x2::E;
+}
+
+module E {
+    friend 0x2::B;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.exp
new file mode 100644
index 000000000..d77a689ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/intersecting_use_cycles.move:10:14
+   │
+ 5 │     fun b(): 0x2::B::S { abort 0 }
+   │              --------- '0x2::B' uses '0x2::A'
+   ·
+10 │     fun c(): 0x2::C::S { abort 0 }
+   │              ^^^^^^^^^ '0x2::C' uses '0x2::B'. This 'use' relationship creates a dependency cycle.
+   ·
+17 │     fun A(): 0x2::A::S { abort 0 }
+   │              --------- '0x2::A' uses '0x2::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.move
new file mode 100644
index 000000000..1b8ce2b20
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/intersecting_use_cycles.move
@@ -0,0 +1,31 @@
+address 0x2 {
+
+module A {
+    struct S {}
+    fun b(): 0x2::B::S { abort 0 }
+}
+
+module B {
+    struct S {}
+    fun c(): 0x2::C::S { abort 0 }
+
+    fun d(): 0x2::D::S { abort 0 }
+}
+
+module C {
+    struct S {}
+    fun A(): 0x2::A::S { abort 0 }
+}
+
+
+module D {
+    struct S {}
+    fun e(): 0x2::E::S { abort 0 }
+}
+
+module E {
+    struct S {}
+    fun b(): 0x2::B::S { abort 0 }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.exp
new file mode 100644
index 000000000..1e36fe191
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.exp
@@ -0,0 +1,9 @@
+error[E02004]: invalid 'module' declaration
+  ┌─ tests/move_check/dependencies/multiple_friend_cycles.move:8:5
+  │
+4 │     friend 0x2::B;
+  │     -------------- '0x2::B' is a friend of '0x2::A'
+  ·
+8 │     friend 0x2::A;
+  │     ^^^^^^^^^^^^^^ '0x2::A' is a friend of '0x2::B'. This 'friend' relationship creates a dependency cycle.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.move
new file mode 100644
index 000000000..4187964cc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_friend_cycles.move
@@ -0,0 +1,31 @@
+address 0x2 {
+
+module A {
+    friend 0x2::B;
+}
+
+module B {
+    friend 0x2::A;
+    friend 0x2::C;
+}
+
+module C {
+    friend 0x2::B;
+}
+
+
+module D {
+    friend 0x2::B;
+    friend 0x2::E;
+    friend 0x2::F;
+}
+
+module E {
+    friend 0x2::F;
+}
+
+module F {
+    friend 0x2::D;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.exp
new file mode 100644
index 000000000..5756c7026
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.exp
@@ -0,0 +1,9 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/multiple_use_cycles.move:25:14
+   │
+25 │     fun f(): 0x2::F::S { abort 0 }
+   │              ^^^^^^^^^ '0x2::F' uses '0x2::D'. This 'use' relationship creates a dependency cycle.
+   ·
+35 │     fun d(): 0x2::D::S { abort 0 }
+   │              --------- '0x2::D' uses '0x2::F'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.move
new file mode 100644
index 000000000..049e50352
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/multiple_use_cycles.move
@@ -0,0 +1,38 @@
+address 0x2 {
+
+module A {
+    struct S {}
+    fun b(): 0x2::B::S { abort 0 }
+}
+
+module B {
+    struct S {}
+    fun a(): 0x2::A::S { abort 0 }
+    fun c(): 0x2::C::S { abort 0 }
+}
+
+module C {
+    struct S {}
+    fun b(): 0x2::B::S { abort 0 }
+}
+
+
+module D {
+    struct S {}
+    fun b(): 0x2::B::S { abort 0 }
+
+    fun e(): 0x2::E::S { abort 0 }
+    fun f(): 0x2::F::S { abort 0 }
+}
+
+module E {
+    struct S {}
+    fun f(): 0x2::F::S { abort 0 }
+}
+
+module F {
+    struct S {}
+    fun d(): 0x2::D::S { abort 0 }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.exp
new file mode 100644
index 000000000..0d619971c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.exp
@@ -0,0 +1,9 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/use_cycle_2.move:5:9
+   │
+ 5 │         0x2::B::foo()
+   │         ^^^^^^^^^^^^^ '0x2::B' uses '0x2::A'. This 'use' relationship creates a dependency cycle.
+   ·
+11 │         0x2::A::foo()
+   │         ------------- '0x2::A' uses '0x2::B'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.move
new file mode 100644
index 000000000..d0e4104aa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_2.move
@@ -0,0 +1,15 @@
+address 0x2 {
+
+module A {
+    public fun foo() {
+        0x2::B::foo()
+    }
+}
+
+module B {
+    public fun foo() {
+        0x2::A::foo()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.exp
new file mode 100644
index 000000000..e3fc8b2b7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+    ┌─ tests/move_check/dependencies/use_cycle_3.move:95:16
+    │
+ 85 │     fun foo(): 0x4::A::S {
+    │                --------- '0x4::A' uses '0x4::C'
+    ·
+ 95 │     fun foo(): 0x4::C::S {
+    │                ^^^^^^^^^ '0x4::C' uses '0x4::B'. This 'use' relationship creates a dependency cycle.
+    ·
+106 │     fun foo(): 0x4::B::S {
+    │                --------- '0x4::B' uses '0x4::A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.move
new file mode 100644
index 000000000..fcf23ef7b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_cycle_3.move
@@ -0,0 +1,111 @@
+address 0x2 {
+
+module A {
+    use 0x2::B;
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo(): B::S {
+        0x2::B::s()
+    }
+}
+
+module B {
+    use 0x2::C;
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo(): C::S {
+        0x2::C::s()
+    }
+}
+
+module C {
+    use 0x2::A;
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo(): A::S {
+        0x2::A::s()
+    }
+}
+
+}
+
+address 0x3 {
+
+module A {
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo() {
+        0x3::B::s();
+    }
+}
+
+module C {
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo() {
+        0x3::A::s();
+    }
+}
+
+module B {
+
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo() {
+        0x3::C::s();
+    }
+}
+
+}
+
+address 0x4 {
+
+module C {
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo(): 0x4::A::S {
+        0x4::A::s()
+    }
+}
+
+module B {
+    struct S has drop {}
+
+    public fun s(): S { S{} }
+
+    fun foo(): 0x4::C::S {
+        0x4::C::s()
+    }
+}
+
+module A {
+
+    struct S{}
+
+    public fun s(): S { S{} }
+
+    fun foo(): 0x4::B::S {
+        0x4::B::s()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.exp
new file mode 100644
index 000000000..579b59f61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.exp
@@ -0,0 +1,9 @@
+error[E02004]: invalid 'module' declaration
+  ┌─ tests/move_check/dependencies/use_friend_direct.move:8:9
+  │
+5 │     friend B;
+  │     --------- '0x2::B' is a friend of '0x2::A'
+  ·
+8 │         B::b()
+  │         ^^^^^^ '0x2::B' uses '0x2::A'. This 'use' relationship creates a dependency cycle.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.move
new file mode 100644
index 000000000..b27b52020
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_direct.move
@@ -0,0 +1,16 @@
+address 0x2 {
+
+module A {
+    use 0x2::B;
+    friend B;
+
+    public fun a() {
+        B::b()
+    }
+}
+
+module B {
+    public fun b() {}
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.exp
new file mode 100644
index 000000000..480bc3d0c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/use_friend_transitive_by_friend.move:14:5
+   │
+ 6 │     friend B;
+   │     --------- '0x2::B' is a friend of '0x2::A'
+   ·
+ 9 │         C::c()
+   │         ------ '0x2::C' uses '0x2::A'
+   ·
+14 │     friend 0x2::C;
+   │     ^^^^^^^^^^^^^^ '0x2::C' is a friend of '0x2::B'. This 'friend' relationship creates a dependency cycle.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.move
new file mode 100644
index 000000000..c27300e22
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_friend.move
@@ -0,0 +1,21 @@
+address 0x2 {
+
+module A {
+    use 0x2::B;
+    use 0x2::C;
+    friend B;
+
+    public fun a() {
+        C::c()
+    }
+}
+
+module B {
+    friend 0x2::C;
+}
+
+module C {
+    public fun c() {}
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.exp b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.exp
new file mode 100644
index 000000000..0f5847436
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.exp
@@ -0,0 +1,12 @@
+error[E02004]: invalid 'module' declaration
+   ┌─ tests/move_check/dependencies/use_friend_transitive_by_use.move:16:9
+   │
+ 6 │     friend C;
+   │     --------- '0x2::C' is a friend of '0x2::A'
+   ·
+ 9 │         B::b()
+   │         ------ '0x2::B' uses '0x2::A'
+   ·
+16 │         C::c()
+   │         ^^^^^^ '0x2::C' uses '0x2::B'. This 'use' relationship creates a dependency cycle.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.move b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.move
new file mode 100644
index 000000000..2e6d3514b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/dependencies/use_friend_transitive_by_use.move
@@ -0,0 +1,24 @@
+address 0x2 {
+
+module A {
+    use 0x2::B;
+    use 0x2::C;
+    friend C;
+
+    public fun a() {
+        B::b()
+    }
+}
+
+module B {
+    use 0x2::C;
+    public fun b() {
+        C::c()
+    }
+}
+
+module C {
+    public fun c() {}
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.exp b/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.exp
new file mode 100644
index 000000000..fa9a276e8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.exp
@@ -0,0 +1,9 @@
+warning[W00001]: DEPRECATED. will be removed
+  ┌─ tests/move_check/deprecated/assert_function.move:3:9
+  │
+3 │         assert(true, 42);
+  │         ^^^^^^
+  │         │
+  │         'assert' function syntax has been deprecated and will be removed
+  │         Replace with 'assert!'. 'assert' has been replaced with a 'assert!' built-in macro so that arguments are no longer eagerly evaluated
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.move b/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.move
new file mode 100644
index 000000000..e961bc01e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/deprecated/assert_function.move
@@ -0,0 +1,5 @@
+script {
+    fun main() {
+        assert(true, 42);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives.move
new file mode 100644
index 000000000..f853c119c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives.move
@@ -0,0 +1,54 @@
+module 0x1::M {
+
+}
+
+address 0x2 {
+
+module M {
+    struct X {}
+
+    public fun x(): X {
+        X { }
+    }
+
+}
+
+}
+
+address 0x3{}
+address 0x4{}
+address 0x2{}
+address 0x4{
+
+module M {
+    use 0x2::M;
+
+    struct X {}
+
+    public fun x(): X {
+        X {}
+    }
+
+    public fun both(): (X, M::X) {
+        (X { }, M::x())
+    }
+
+}
+
+}
+
+address 0x2 {
+
+module M2 {
+    use 0x2::M as M1;
+    use 0x4::M as M3;
+
+    struct X {}
+
+    public fun x(): (M1::X, X, M3::X) {
+        (M1::x(), X {}, M3::x())
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives_empty.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives_empty.move
new file mode 100644
index 000000000..440dbabf6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/address_directives_empty.move
@@ -0,0 +1,4 @@
+address 0x3 {}
+address 0x4 {}
+address 0x2 {}
+address 0x4 {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/almost_invalid_local_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/almost_invalid_local_name.move
new file mode 100644
index 000000000..b3b3210d4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/almost_invalid_local_name.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct F has drop { No: u64 }
+
+    fun t(_No: u64) {
+    }
+
+    fun t2() {
+        let _No = 100;
+    }
+
+    fun t3() {
+        let _No;
+        _No = 100;
+    }
+
+    fun t4() {
+        let _No = 100;
+        F { No: _No };
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.exp
new file mode 100644
index 000000000..f9b6ea621
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.exp
@@ -0,0 +1,83 @@
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:16:9
+   │
+16 │         X::S = ();
+   │         ^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. 'X::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:17:9
+   │
+17 │         Self::S<u64> = ();
+   │         ^^^^^^^^^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. 'Self::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:18:9
+   │
+18 │         Self::R = ();
+   │         ^^^^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. 'Self::R {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:22:9
+   │
+22 │         0x42::X::S = ();
+   │         ^^^^^^^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::X::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:23:9
+   │
+23 │         0x42::M::S<u64> = ();
+   │         ^^^^^^^^^^^^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::M::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:24:9
+   │
+24 │         0x42::M::R = ();
+   │         ^^^^^^^^^^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::M::R {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:28:9
+   │
+28 │         x<u64> = ();
+   │         ^^^^^^ Unexpected assignment of instantiated type without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. 'x {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:29:9
+   │
+29 │         S<u64> = ();
+   │         ^^^^^^ Unexpected assignment of instantiated type without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. 'S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:33:9
+   │
+33 │         X = ();
+   │         ^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::X::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:34:9
+   │
+34 │         S = ();
+   │         ^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::M::S {}'
+
+error[E01010]: syntax item restricted to spec contexts
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:35:9
+   │
+35 │         R = ();
+   │         ^ Unexpected assignment of module access without fields outside of a spec context.
+If you are trying to unpack a struct, try adding fields, e.g. '0x42::M::R {}'
+
+error[E03009]: unbound variable
+   ┌─ tests/move_check/expansion/assign_non_simple_name.move:39:9
+   │
+39 │         Y = 0;
+   │         ^ Invalid assignment. Unbound variable 'Y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.move
new file mode 100644
index 000000000..c2f18d3b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/assign_non_simple_name.move
@@ -0,0 +1,42 @@
+address 0x42 {
+module X {
+    struct S {}
+}
+module M {
+    use 0x42::X;
+    use 0x42::X::S as X;
+
+    struct R {}
+    struct S<T> { f: T }
+
+
+    fun t() {
+        // Assign to qualified name
+        // should fail in non spec context
+        X::S = ();
+        Self::S<u64> = ();
+        Self::R = ();
+
+        // Assign to fully qualified name
+        // should fail in non spec context
+        0x42::X::S = ();
+        0x42::M::S<u64> = ();
+        0x42::M::R = ();
+
+        // Assign to name with type args, qualified/nonqualified/struct doesnt matter
+        // should fail in non spec context
+        x<u64> = ();
+        S<u64> = ();
+
+        // Assign to a name that is aliased in local context
+        // should fail in non spec context
+        X = ();
+        S = ();
+        R = ();
+
+        // Assign to a name that starts with A-Z
+        // Should fail with unbound local even though it is not a valid local name
+        Y = 0;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.exp
new file mode 100644
index 000000000..2cf560ff3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.exp
@@ -0,0 +1,36 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:8:24
+  │
+8 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+  │                        ^^ Invalid constant alias name 'c1'. Constant alias names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:8:33
+  │
+8 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+  │                                 ^^^ Invalid constant alias name '_C1'. Constant alias names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:8:43
+  │
+8 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+  │                                           ^^^^ Invalid constant alias name 'Self'. 'Self' is restricted and cannot be used to name a constant alias
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:13:24
+   │
+13 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+   │                        ^^ Invalid constant alias name 'c1'. Constant alias names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:13:33
+   │
+13 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+   │                                 ^^^ Invalid constant alias name '_C1'. Constant alias names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/constant_invalid_alias_names.move:13:43
+   │
+13 │     use 0x42::N::{C as c1, C as _C1, C as Self};
+   │                                           ^^^^ Invalid constant alias name 'Self'. 'Self' is restricted and cannot be used to name a constant alias
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.move
new file mode 100644
index 000000000..83c21df79
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_alias_names.move
@@ -0,0 +1,15 @@
+address 0x42 {
+
+module N {
+    const C: bool = false;
+}
+
+module M {
+    use 0x42::N::{C as c1, C as _C1, C as Self};
+}
+}
+
+script {
+    use 0x42::N::{C as c1, C as _C1, C as Self};
+    fun main() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.exp
new file mode 100644
index 000000000..e7b901152
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.exp
@@ -0,0 +1,36 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/constant_invalid_names.move:3:11
+  │
+3 │     const c1: u64 = 0;
+  │           ^^ Invalid constant name 'c1'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/constant_invalid_names.move:4:11
+  │
+4 │     const _C1: u64 = 0;
+  │           ^^^ Invalid constant name '_C1'. Constant names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/constant_invalid_names.move:5:11
+  │
+5 │     const Self: u64 = 0;
+  │           ^^^^ Invalid constant name 'Self'. 'Self' is restricted and cannot be used to name a constant
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/constant_invalid_names.move:11:11
+   │
+11 │     const c1: u64 = 0;
+   │           ^^ Invalid constant name 'c1'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/constant_invalid_names.move:12:11
+   │
+12 │     const _C1: u64 = 0;
+   │           ^^^ Invalid constant name '_C1'. Constant names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/constant_invalid_names.move:13:11
+   │
+13 │     const Self: u64 = 0;
+   │           ^^^^ Invalid constant name 'Self'. 'Self' is restricted and cannot be used to name a constant
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.move
new file mode 100644
index 000000000..5f6ee2e3a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/constant_invalid_names.move
@@ -0,0 +1,15 @@
+address 0x42 {
+module M {
+    const c1: u64 = 0;
+    const _C1: u64 = 0;
+    const Self: u64 = 0;
+}
+}
+
+
+script {
+    const c1: u64 = 0;
+    const _C1: u64 = 0;
+    const Self: u64 = 0;
+    fun main() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.exp
new file mode 100644
index 000000000..df3be389e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.exp
@@ -0,0 +1,56 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_abilities.move:4:26
+  │
+4 │     struct Foo has copy, copy {}
+  │                    ----  ^^^^ Duplicate 'copy' ability modifier
+  │                    │      
+  │                    Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_abilities.move:5:26
+  │
+5 │     struct Bar<T: drop + drop> { f: T }
+  │                   ----   ^^^^ Duplicate 'drop' ability constraint
+  │                   │       
+  │                   Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_abilities.move:6:24
+  │
+6 │     fun baz<T: store + store>() {}
+  │                -----   ^^^^^ Duplicate 'store' ability constraint
+  │                │        
+  │                Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_abilities.move:9:28
+  │
+9 │         invariant<T: key + key> exists<T>(0x1) == exists<T>(0x1);
+  │                      ---   ^^^ Duplicate 'key' ability constraint
+  │                      │      
+  │                      Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/duplicate_abilities.move:10:26
+   │
+10 │         axiom<T: store + store + key + key> exists<T>(0x2);
+   │                  -----   ^^^^^ Duplicate 'store' ability constraint
+   │                  │        
+   │                  Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/duplicate_abilities.move:10:40
+   │
+10 │         axiom<T: store + store + key + key> exists<T>(0x2);
+   │                                  ---   ^^^ Duplicate 'key' ability constraint
+   │                                  │      
+   │                                  Ability previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/duplicate_abilities.move:15:23
+   │
+15 │     fun main<T: key + key>() {}
+   │                 ---   ^^^ Duplicate 'key' ability constraint
+   │                 │      
+   │                 Ability previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.move
new file mode 100644
index 000000000..821e63955
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_abilities.move
@@ -0,0 +1,16 @@
+address 0x42 {
+module M {
+    // invalid duplicate abilities
+    struct Foo has copy, copy {}
+    struct Bar<T: drop + drop> { f: T }
+    fun baz<T: store + store>() {}
+
+    spec module {
+        invariant<T: key + key> exists<T>(0x1) == exists<T>(0x1);
+        axiom<T: store + store + key + key> exists<T>(0x2);
+    }
+}
+}
+script {
+    fun main<T: key + key>() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.exp
new file mode 100644
index 000000000..900bc7b35
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.exp
@@ -0,0 +1,16 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_alias.move:8:19
+  │
+7 │     use 0x2::X as Z;
+  │                   - Alias previously defined here
+8 │     use 0x2::Y as Z;
+  │                   ^ Duplicate module alias 'Z'. Module aliases must be unique within a given namespace
+
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/duplicate_alias.move:8:19
+  │
+8 │     use 0x2::Y as Z;
+  │                   ^ Unused 'use' of alias 'Z'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.move
new file mode 100644
index 000000000..b0187d162
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_alias.move
@@ -0,0 +1,11 @@
+address 0x2 {
+
+module X {}
+module Y {}
+
+module M {
+    use 0x2::X as Z;
+    use 0x2::Y as Z;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.exp
new file mode 100644
index 000000000..ff609e65f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_field.move:4:9
+  │
+3 │         f: u64,
+  │         - Field previously defined here
+4 │         f: u64,
+  │         ^ Duplicate definition for field 'f' in struct 'S'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.move
new file mode 100644
index 000000000..661314b8d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct S {
+        f: u64,
+        f: u64,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.exp
new file mode 100644
index 000000000..372a2af00
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.exp
@@ -0,0 +1,18 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_field_assign.move:5:9
+  │
+5 │         S { f, f } = S { f: 0 };
+  │         ^^^^^^^^^^
+  │         │   │  │
+  │         │   │  Duplicate assignment binding given for field 'f'
+  │         │   Field previously defined here
+  │         Invalid deconstructing assignment
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/expansion/duplicate_field_assign.move:5:13
+  │
+5 │         S { f, f } = S { f: 0 };
+  │             ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.move
new file mode 100644
index 000000000..43e69fcd0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_assign.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    fun foo() {
+        let f;
+        S { f, f } = S { f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.exp
new file mode 100644
index 000000000..ed46a4a29
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.exp
@@ -0,0 +1,10 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_field_pack.move:4:9
+  │
+4 │         S { f: 0, f: 0 };
+  │         ^^^^^^^^^^^^^^^^
+  │         │   │     │
+  │         │   │     Duplicate argument given for field 'f'
+  │         │   Field previously defined here
+  │         Invalid construction
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.move
new file mode 100644
index 000000000..53da0dac8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_pack.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    fun foo() {
+        S { f: 0, f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.exp
new file mode 100644
index 000000000..39317e0a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.exp
@@ -0,0 +1,10 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_field_unpack.move:4:13
+  │
+4 │         let S { f, f } = S { f: 0 };
+  │             ^^^^^^^^^^
+  │             │   │  │
+  │             │   │  Duplicate binding given for field 'f'
+  │             │   Field previously defined here
+  │             Invalid deconstruction binding
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.move
new file mode 100644
index 000000000..ccd46b724
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_field_unpack.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    fun foo() {
+        let S { f, f } = S { f: 0 };
+        f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.exp
new file mode 100644
index 000000000..7a60707cd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_function_in_module.move:3:9
+  │
+2 │     fun foo() { }
+  │         --- Alias previously defined here
+3 │     fun foo() { }
+  │         ^^^ Duplicate module member or alias 'foo'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.move
new file mode 100644
index 000000000..75b46aca9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_function_in_module.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    fun foo() { }
+    fun foo() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.exp
new file mode 100644
index 000000000..9f47b19f5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_module.move:2:19
+  │
+1 │ module 0x8675309::M {}
+  │                   - Module previously defined here, with '0x8675309::M'
+2 │ module 0x8675309::M {}
+  │                   ^ Duplicate definition for module '0x8675309::M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.move
new file mode 100644
index 000000000..1c62000d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module.move
@@ -0,0 +1,2 @@
+module 0x8675309::M {}
+module 0x8675309::M {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.exp
new file mode 100644
index 000000000..33a0ac290
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.exp
@@ -0,0 +1,24 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_module_after_mapping.move:5:11
+  │
+4 │ module K::M1 {}
+  │           -- Module previously defined here, with '(K=0x19)::M1'
+5 │ module k::M1 {}
+  │           ^^ Duplicate definition for module '(k=0x19)::M1'
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_module_after_mapping.move:9:11
+  │
+8 │ module 0x40::M2 {}
+  │              -- Module previously defined here, with '0x40::M2'
+9 │ module M::M2 {}
+  │           ^^ Duplicate definition for module 'M::M2'
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/duplicate_module_after_mapping.move:13:14
+   │
+12 │ module K::M3 {}
+   │           -- Module previously defined here, with '(K=0x19)::M3'
+13 │ module 0x19::M3 {}
+   │              ^^ Duplicate definition for module '0x19::M3'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.move
new file mode 100644
index 000000000..b4d912b08
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_module_after_mapping.move
@@ -0,0 +1,13 @@
+// Duplicate modules need to be checked with respect to name=>value mapping
+
+// Both modules named
+module K::M1 {}
+module k::M1 {}
+
+// Anon, named
+module 0x40::M2 {}
+module M::M2 {}
+
+// Named, Anon
+module K::M3 {}
+module 0x19::M3 {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.exp
new file mode 100644
index 000000000..b1df0baf6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/duplicate_struct.move:3:12
+  │
+2 │     struct S {}
+  │            - Alias previously defined here
+3 │     struct S {}
+  │            ^ Duplicate module member or alias 'S'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.move
new file mode 100644
index 000000000..6a5f4dc30
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/duplicate_struct.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    struct S {}
+    struct S {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/entry_main.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/entry_main.move
new file mode 100644
index 000000000..77174396e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/entry_main.move
@@ -0,0 +1,4 @@
+script {
+entry fun main() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.exp
new file mode 100644
index 000000000..3e4892e0d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/friend_decl_aliased_duplicates.move:7:5
+  │
+6 │     friend 0x42::A;
+  │     --------------- Friend previously declared here
+7 │     friend AliasedA;
+  │     ^^^^^^^^^^^^^^^^ Duplicate friend declaration '0x42::A'. Friend declarations in a module must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.move
new file mode 100644
index 000000000..03caa75a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_duplicates.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {}
+
+module M {
+    use 0x42::A as AliasedA;
+    friend 0x42::A;
+    friend AliasedA;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.exp
new file mode 100644
index 000000000..2e290f55a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/friend_decl_aliased_function.move:8:12
+  │
+8 │     friend a;
+  │            ^ Unbound module alias 'a'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.move
new file mode 100644
index 000000000..0dcf0b363
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_function.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module A {
+    public fun a() {}
+}
+
+module M {
+    use 0x42::A::a;
+    friend a;
+
+    public(friend) fun m() {
+        a()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.exp
new file mode 100644
index 000000000..d44974ffd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/friend_decl_aliased_struct.move:8:12
+  │
+8 │     friend A;
+  │            ^ Unbound module alias 'A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.move
new file mode 100644
index 000000000..2fc7aaaf6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_aliased_struct.move
@@ -0,0 +1,12 @@
+address 0x42 {
+module A {
+    struct A {}
+}
+
+module M {
+    use 0x42::A::A;
+    friend A;
+
+    public(friend) fun m(_a: A) {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.exp
new file mode 100644
index 000000000..3fa44401f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/friend_decl_imported_duplicates.move:7:5
+  │
+6 │     friend 0x42::A;
+  │     --------------- Friend previously declared here
+7 │     friend A;
+  │     ^^^^^^^^^ Duplicate friend declaration '0x42::A'. Friend declarations in a module must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.move
new file mode 100644
index 000000000..68b2da04d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_imported_duplicates.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {}
+
+module M {
+    use 0x42::A;
+    friend 0x42::A;
+    friend A;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.exp
new file mode 100644
index 000000000..b19219510
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/friend_decl_inner_scope_alias.move:7:12
+  │
+7 │     friend A;
+  │            ^ Unbound module alias 'A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.move
new file mode 100644
index 000000000..2294ef20d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_inner_scope_alias.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module A {
+    public fun a() {}
+}
+
+module M {
+    friend A;
+
+    public(friend) fun m() {
+        use 0x42::A;
+        A::a()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.exp
new file mode 100644
index 000000000..c8896a42e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/friend_decl_nonexistent_alias.move:3:12
+  │
+3 │     friend Nonexistent;
+  │            ^^^^^^^^^^^ Unbound module alias 'Nonexistent'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.move
new file mode 100644
index 000000000..bad55ea0a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_nonexistent_alias.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M {
+    friend Nonexistent;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.exp
new file mode 100644
index 000000000..2677a5d1e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/friend_decl_qualified_duplicates.move:6:5
+  │
+5 │     friend 0x42::A;
+  │     --------------- Friend previously declared here
+6 │     friend 0x42::A;
+  │     ^^^^^^^^^^^^^^^ Duplicate friend declaration '0x42::A'. Friend declarations in a module must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.move
new file mode 100644
index 000000000..6dcc4f12d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/friend_decl_qualified_duplicates.move
@@ -0,0 +1,8 @@
+address 0x42 {
+module A {}
+
+module M {
+    friend 0x42::A;
+    friend 0x42::A;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.exp
new file mode 100644
index 000000000..76eb3f0b8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.exp
@@ -0,0 +1,36 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/function_invalid_names.move:3:9
+  │
+3 │     fun _foo() {}
+  │         ^^^^ Invalid function name '_foo'. Function names cannot start with '_'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/function_invalid_names.move:4:9
+  │
+4 │     fun _() {}
+  │         ^ Invalid function name '_'. Function names cannot start with '_'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/function_invalid_names.move:5:9
+  │
+5 │     fun ___() {}
+  │         ^^^ Invalid function name '___'. Function names cannot start with '_'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/function_invalid_names.move:10:9
+   │
+10 │     fun _foo() {}
+   │         ^^^^ Invalid function name '_foo'. Function names cannot start with '_'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/function_invalid_names.move:13:9
+   │
+13 │     fun _() {}
+   │         ^ Invalid function name '_'. Function names cannot start with '_'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/function_invalid_names.move:16:9
+   │
+16 │     fun ___() {}
+   │         ^^^ Invalid function name '___'. Function names cannot start with '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.move
new file mode 100644
index 000000000..a3e893bac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/function_invalid_names.move
@@ -0,0 +1,17 @@
+address 0x42 {
+module M {
+    fun _foo() {}
+    fun _() {}
+    fun ___() {}
+}
+}
+
+script {
+    fun _foo() {}
+}
+script {
+    fun _() {}
+}
+script {
+    fun ___() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.exp
new file mode 100644
index 000000000..9a94aee4c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.exp
@@ -0,0 +1,12 @@
+error[E01008]: invalid hex string
+  ┌─ tests/move_check/expansion/hexstring_bad_value.move:3:11
+  │
+3 │         x"g0"
+  │           ^ Invalid hexadecimal character: 'g'
+
+error[E01008]: invalid hex string
+  ┌─ tests/move_check/expansion/hexstring_bad_value.move:6:9
+  │
+6 │         x"123"
+  │         ^^^^^^ Odd number of characters in hex string. Expected 2 hexadecimal digits for each byte
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.move
new file mode 100644
index 000000000..842322209
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/hexstring_bad_value.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    public fun bad_value(): vector<u8> {
+        x"g0"
+    }
+    public fun odd_length(): vector<u8> {
+        x"123"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.exp
new file mode 100644
index 000000000..ce39eb6ab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.exp
@@ -0,0 +1,44 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/invalid_local_name.move:4:11
+  │
+4 │     fun t(No: u64) {
+  │           ^^ Invalid local variable name 'No'. Local variable names must start with 'a'..'z' (or '_')
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/expansion/invalid_local_name.move:5:9
+  │
+5 │         No;
+  │         ^^ Unbound constant 'No'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/invalid_local_name.move:9:13
+  │
+9 │         let No;
+  │             ^^ Invalid local variable name 'No'. Local variable names must start with 'a'..'z' (or '_')
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/invalid_local_name.move:14:13
+   │
+14 │         let No = 100;
+   │             ^^ Invalid local variable name 'No'. Local variable names must start with 'a'..'z' (or '_')
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/expansion/invalid_local_name.move:15:13
+   │
+15 │         F { No };
+   │             ^^ Unbound constant 'No'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/invalid_local_name.move:23:13
+   │
+23 │         let vector;
+   │             ^^^^^^ Invalid variable name 'vector'. 'vector' is restricted and cannot be used to name a variable
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/expansion/invalid_local_name.move:23:13
+   │
+23 │         let vector;
+   │             ^^^^^^ Unused local variable 'vector'. Consider removing or prefixing with an underscore: '_vector'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.move
new file mode 100644
index 000000000..3b11cf38c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_local_name.move
@@ -0,0 +1,26 @@
+module 0x8675309::M {
+    struct F has drop { No: u64 }
+
+    fun t(No: u64) {
+        No;
+    }
+
+    fun t2() {
+        let No;
+        No = 100;
+    }
+
+    fun t3() {
+        let No = 100;
+        F { No };
+    }
+
+    fun t4() {
+        let _No;
+    }
+
+    fun t5() {
+        let vector;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.exp
new file mode 100644
index 000000000..d5a6b9fe2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.exp
@@ -0,0 +1,6 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/invalid_spec_schema_name.move:2:17
+  │
+2 │     spec schema foo<T> {
+  │                 ^^^ Invalid schema name 'foo'. Schema names must start with 'A'..'Z'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.move
new file mode 100644
index 000000000..7bf7aeca3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_spec_schema_name.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    spec schema foo<T> {
+        ensures true;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.exp
new file mode 100644
index 000000000..5ce832f5b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.exp
@@ -0,0 +1,66 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:2:12
+  │
+2 │     struct no {}
+  │            ^^ Invalid struct name 'no'. Struct names must start with 'A'..'Z'
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:3:19
+  │
+3 │     struct X { f: no }
+  │                   ^^ Unbound type 'no' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:5:15
+  │
+5 │     fun mk(x: no): no { x;
+  │               ^^ Unbound type 'no' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:5:20
+  │
+5 │     fun mk(x: no): no { x;
+  │                    ^^ Unbound type 'no' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:6:9
+  │
+6 │         no {}
+  │         ^^ Unbound type 'no' in current scope
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/invalid_struct_name.move:9:12
+  │
+9 │     struct no2 {}
+  │            ^^^ Invalid struct name 'no2'. Struct names must start with 'A'..'Z'
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/expansion/invalid_struct_name.move:10:19
+   │
+10 │     struct Y { f: no }
+   │                   ^^ Unbound type 'no' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/expansion/invalid_struct_name.move:12:16
+   │
+12 │     fun mk2(x: no2): no2 {
+   │                ^^^ Unbound type 'no2' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/expansion/invalid_struct_name.move:12:22
+   │
+12 │     fun mk2(x: no2): no2 {
+   │                      ^^^ Unbound type 'no2' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/expansion/invalid_struct_name.move:13:13
+   │
+13 │         let no2 {} = x;
+   │             ^^^ Unbound type 'no2' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/expansion/invalid_struct_name.move:14:9
+   │
+14 │         no2 {}
+   │         ^^^ Unbound type 'no2' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.move
new file mode 100644
index 000000000..d649b5b16
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_struct_name.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    struct no {}
+    struct X { f: no }
+
+    fun mk(x: no): no { x;
+        no {}
+    }
+
+    struct no2 {}
+    struct Y { f: no }
+
+    fun mk2(x: no2): no2 {
+        let no2 {} = x;
+        no2 {}
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.exp
new file mode 100644
index 000000000..e6d9ace1d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.move:4:11
+  │
+4 │         0 { f } = 0;
+  │           ^
+  │           │
+  │           Unexpected '{'
+  │           Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.move
new file mode 100644
index 000000000..eaffa813b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_not_name.move
@@ -0,0 +1,6 @@
+module M {
+    fun foo() {
+        let f = 0;
+        0 { f } = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.exp
new file mode 100644
index 000000000..ef6dec2e9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.move:3:11
+  │
+3 │         0 {} = 0;
+  │           ^
+  │           │
+  │           Unexpected '{'
+  │           Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.move
new file mode 100644
index 000000000..0b2e5c47b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_lhs_other_value.move
@@ -0,0 +1,9 @@
+module M {
+    fun foo() {
+        0 {} = 0;
+
+        foo() = 0;
+
+        foo().bar() = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.exp
new file mode 100644
index 000000000..55fe3e502
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.exp
@@ -0,0 +1,20 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move:3:9
+  │
+3 │         Self::f {} = 0;
+  │         ^^^^^^^ Invalid module access. Unbound struct 'f' in module '0x8675309::M'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move:4:9
+  │
+4 │         Self::f() = 0;
+  │         ^^^^^^^ Invalid module access. Unbound struct 'f' in module '0x8675309::M'
+
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move:4:9
+  │
+4 │         Self::f() = 0;
+  │         ^^^^^^^^^ Positional fields are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move
new file mode 100644
index 000000000..2bb2c34bd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/invalid_unpack_assign_mdot_no_struct.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun foo() {
+        Self::f {} = 0;
+        Self::f() = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.exp
new file mode 100644
index 000000000..618395f6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/mdot_with_non_address_exp.move:9:13
+  │
+9 │         01u8::X::bar()
+  │             ^^
+  │             │
+  │             Unexpected '::'
+  │             Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.move
new file mode 100644
index 000000000..b47bd9114
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/mdot_with_non_address_exp.move
@@ -0,0 +1,21 @@
+address 0x2 {
+
+module X {
+    fun bar() { }
+}
+module M {
+
+    fun foo() {
+        01u8::X::bar()
+    }
+
+    fun bar() {
+        false::X::bar()
+    }
+
+    fun baz() {
+        foo().bar().X::bar()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.exp
new file mode 100644
index 000000000..1f599ad80
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.exp
@@ -0,0 +1,14 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/module_alias_as_type.move:6:14
+  │
+6 │     use 0x2::X;
+  │              ^ Unused 'use' of alias 'X'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/module_alias_as_type.move:7:16
+  │
+7 │     fun foo(x: X) { x; }
+  │                ^ Unbound type 'X' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.move
new file mode 100644
index 000000000..d5f851158
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_alias_as_type.move
@@ -0,0 +1,10 @@
+address 0x2 {
+
+module X {}
+
+module M {
+    use 0x2::X;
+    fun foo(x: X) { x; }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.exp
new file mode 100644
index 000000000..b18dbbd07
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.exp
@@ -0,0 +1,18 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/module_invalid_names.move:2:8
+  │
+2 │ module _m {
+  │        ^^ Invalid module name '_m'. Module names cannot start with '_'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/module_invalid_names.move:4:8
+  │
+4 │ module _ {
+  │        ^ Invalid module name '_'. Module names cannot start with '_'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/module_invalid_names.move:6:8
+  │
+6 │ module ___ {
+  │        ^^^ Invalid module name '___'. Module names cannot start with '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.move
new file mode 100644
index 000000000..2ed661988
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/module_invalid_names.move
@@ -0,0 +1,8 @@
+address 0x42 {
+module _m {
+}
+module _ {
+}
+module ___ {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/multiple_alias.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/multiple_alias.move
new file mode 100644
index 000000000..2b7ddd142
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/multiple_alias.move
@@ -0,0 +1,26 @@
+address 0x2 {
+
+module M {
+    use 0x2::X;
+    use 0x2::X as X2;
+
+    struct F {
+        f: 0x2::X::S,
+        g: X::S,
+        h: X2::S,
+    }
+
+    fun foo(_x: 0x2::X::S, _y: X::S, _z: X2::S): (0x2::X::S, X::S, X2::S) {
+        let a : 0x2::X::S = 0x2::X::foo();
+        let b : X::S = X::foo();
+        let c : X2::S = X2::foo();
+        (a, b, c)
+    }
+}
+
+module X {
+    struct S has drop {}
+    public fun foo(): S { S{} }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.exp
new file mode 100644
index 000000000..705acdf35
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.exp
@@ -0,0 +1,6 @@
+error[E02004]: invalid 'module' declaration
+  ┌─ tests/move_check/expansion/no_address.move:1:8
+  │
+1 │ module M {}
+  │        ^ Invalid module declaration. The module does not have a specified address. Either declare it inside of an 'address <address> {' block or declare it with an address 'module <address>::M''
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.move
new file mode 100644
index 000000000..2e94b1c7f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/no_address.move
@@ -0,0 +1 @@
+module M {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_long.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_long.move
new file mode 100644
index 000000000..87c9d16a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_long.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    fun foo() {
+        0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001;
+        0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001;
+        (340282366920938463463374607431768211454: u128);
+        (0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: u128);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.exp
new file mode 100644
index 000000000..8795e64f3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.exp
@@ -0,0 +1,12 @@
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long.move:3:9
+  │
+3 │         0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u256'
+
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long.move:4:9
+  │
+4 │         340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.move
new file mode 100644
index 000000000..2abb369f0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun foo() {
+        0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
+        340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.exp
new file mode 100644
index 000000000..434fe318e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.exp
@@ -0,0 +1,12 @@
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u128.move:4:9
+  │
+4 │         0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into 'u128'
+
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u128.move:6:9
+  │
+6 │         340282366920938463463374607431768211456u128;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into 'u128'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.move
new file mode 100644
index 000000000..4f73c5115
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u128.move
@@ -0,0 +1,8 @@
+module 0x42::M {
+    fun long_u128() {
+        0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128;
+        0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128;
+        340282366920938463463374607431768211455u128;
+        340282366920938463463374607431768211456u128;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.exp
new file mode 100644
index 000000000..e789ee003
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.exp
@@ -0,0 +1,12 @@
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u64.move:4:9
+  │
+4 │         0x1FFFFFFFFFFFFFFFFu64;
+  │         ^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into 'u64'
+
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u64.move:6:9
+  │
+6 │         18446744073709551616u64;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into 'u64'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.move
new file mode 100644
index 000000000..886b5fab1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u64.move
@@ -0,0 +1,8 @@
+module 0x42::M {
+    fun long_u64() {
+        0x0FFFFFFFFFFFFFFFFu64;
+        0x1FFFFFFFFFFFFFFFFu64;
+        18446744073709551615u64;
+        18446744073709551616u64;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.exp
new file mode 100644
index 000000000..eb6b487e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.exp
@@ -0,0 +1,12 @@
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u8.move:4:9
+  │
+4 │         0x1FFu8;
+  │         ^^^^^^^ Invalid number literal. The given literal is too large to fit into 'u8'
+
+error[E01006]: invalid number literal
+  ┌─ tests/move_check/expansion/number_literal_too_long_u8.move:6:9
+  │
+6 │         256u8;
+  │         ^^^^^ Invalid number literal. The given literal is too large to fit into 'u8'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.move
new file mode 100644
index 000000000..f09b1e73f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/number_literal_too_long_u8.move
@@ -0,0 +1,8 @@
+module 0x42::M {
+    fun long_u8() {
+        0x0FFu8;
+        0x1FFu8;
+        255u8;
+        256u8;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_all_field_cases.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_all_field_cases.move
new file mode 100644
index 000000000..fec2428fe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_all_field_cases.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct T has drop {}
+    struct S has drop { f: u64, g: u64 }
+    fun foo() {
+        let f = 0;
+        let g = 1;
+        T {};
+        T { };
+        S { f, g };
+        S { f: 0, g: 0};
+        S { g: 0, f };
+        S { g, f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.exp
new file mode 100644
index 000000000..b922a9341
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/pack_no_fields_block_expr.move:4:21
+  │
+4 │         let s = S { let x = 0; x };
+  │                     ^^^
+  │                     │
+  │                     Unexpected 'let'
+  │                     Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.move
new file mode 100644
index 000000000..758bed953
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_block_expr.move
@@ -0,0 +1,7 @@
+module M {
+    struct S {}
+    fun foo() {
+        let s = S { let x = 0; x };
+        let s = S { let y = 0; let z = 0; x + foo() };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.exp
new file mode 100644
index 000000000..0b0036fb9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/pack_no_fields_single_block_expr.move:4:21
+  │
+4 │         let s = S { false };
+  │                     ^^^^^
+  │                     │
+  │                     Unexpected 'false'
+  │                     Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.move
new file mode 100644
index 000000000..11b314a7f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_expr.move
@@ -0,0 +1,7 @@
+module M {
+    struct S { f: u64 }
+    fun foo() {
+        let s = S { false };
+        let s = S { 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.exp
new file mode 100644
index 000000000..a23a1e35c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/pack_no_fields_single_block_other_expr.move:6:19
+  │
+6 │         let s = S 0;
+  │                   ^
+  │                   │
+  │                   Unexpected '0'
+  │                   Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.move
new file mode 100644
index 000000000..40776049e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/pack_no_fields_single_block_other_expr.move
@@ -0,0 +1,11 @@
+module M {
+    struct S { f: u64 }
+    struct G {}
+    fun foo() {
+        let f = 0;
+        let s = S 0;
+        let s = S f;
+        let g = G ();
+        let g = G { {} };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.exp
new file mode 100644
index 000000000..e58d8f6fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.exp
@@ -0,0 +1,6 @@
+error[E02002]: unnecessary or extraneous item
+  ┌─ tests/move_check/expansion/public_friend_main.move:2:1
+  │
+2 │ public(friend) fun main() {
+  │ ^^^^^^^^^^^^^^ Invalid 'public(friend)' visibility modifier. Script functions are not callable from other Move functions.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.move
new file mode 100644
index 000000000..4b31281ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_friend_main.move
@@ -0,0 +1,4 @@
+script {
+public(friend) fun main() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.exp
new file mode 100644
index 000000000..bdefec894
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.exp
@@ -0,0 +1,6 @@
+error[E02002]: unnecessary or extraneous item
+  ┌─ tests/move_check/expansion/public_main.move:2:1
+  │
+2 │ public fun main() {
+  │ ^^^^^^ Invalid 'public' visibility modifier. Script functions are not callable from other Move functions.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.move
new file mode 100644
index 000000000..bf3b9fee5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/public_main.move
@@ -0,0 +1,4 @@
+script {
+public fun main() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.exp
new file mode 100644
index 000000000..82c9e4914
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.exp
@@ -0,0 +1,12 @@
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_address_names.move:1:8
+  │
+1 │ module Self::A {}
+  │        ^^^^ Invalid address name 'Self'. 'Self' is restricted and cannot be used to name an address
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_address_names.move:2:8
+  │
+2 │ module vector::A {}
+  │        ^^^^^^ Invalid address name 'vector'. 'vector' is restricted and cannot be used to name an address
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.move
new file mode 100644
index 000000000..7adb250c5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_address_names.move
@@ -0,0 +1,2 @@
+module Self::A {}
+module vector::A {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.exp
new file mode 100644
index 000000000..cd4567ef3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.exp
@@ -0,0 +1,108 @@
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_alias_names.move:9:16
+  │
+9 │         foo as address,
+  │                ^^^^^^^ Invalid function alias name 'address'. 'address' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:10:16
+   │
+10 │         foo as signer,
+   │                ^^^^^^ Invalid function alias name 'signer'. 'signer' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:11:16
+   │
+11 │         foo as u8,
+   │                ^^ Invalid function alias name 'u8'. 'u8' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:12:16
+   │
+12 │         foo as u64,
+   │                ^^^ Invalid function alias name 'u64'. 'u64' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:13:16
+   │
+13 │         foo as u128,
+   │                ^^^^ Invalid function alias name 'u128'. 'u128' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:14:16
+   │
+14 │         foo as vector,
+   │                ^^^^^^ Invalid function alias name 'vector'. 'vector' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:15:16
+   │
+15 │         foo as freeze,
+   │                ^^^^^^ Invalid function alias name 'freeze'. 'freeze' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:16:16
+   │
+16 │         foo as assert,
+   │                ^^^^^^ Invalid function alias name 'assert'. 'assert' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:17:16
+   │
+17 │         foo as Self,
+   │                ^^^^ Invalid function alias name 'Self'. 'Self' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:25:16
+   │
+25 │         foo as address,
+   │                ^^^^^^^ Invalid function alias name 'address'. 'address' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:26:16
+   │
+26 │         foo as signer,
+   │                ^^^^^^ Invalid function alias name 'signer'. 'signer' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:27:16
+   │
+27 │         foo as u8,
+   │                ^^ Invalid function alias name 'u8'. 'u8' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:28:16
+   │
+28 │         foo as u64,
+   │                ^^^ Invalid function alias name 'u64'. 'u64' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:29:16
+   │
+29 │         foo as u128,
+   │                ^^^^ Invalid function alias name 'u128'. 'u128' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:30:16
+   │
+30 │         foo as vector,
+   │                ^^^^^^ Invalid function alias name 'vector'. 'vector' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:31:16
+   │
+31 │         foo as freeze,
+   │                ^^^^^^ Invalid function alias name 'freeze'. 'freeze' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:32:16
+   │
+32 │         foo as assert,
+   │                ^^^^^^ Invalid function alias name 'assert'. 'assert' is restricted and cannot be used to name a function alias
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_alias_names.move:33:16
+   │
+33 │         foo as Self,
+   │                ^^^^ Invalid function alias name 'Self'. 'Self' is restricted and cannot be used to name a function alias
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.move
new file mode 100644
index 000000000..edf977cb5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_alias_names.move
@@ -0,0 +1,36 @@
+address 0x2 {
+
+module N {
+    fun foo() {}
+}
+
+module M {
+    use 0x2::N::{
+        foo as address,
+        foo as signer,
+        foo as u8,
+        foo as u64,
+        foo as u128,
+        foo as vector,
+        foo as freeze,
+        foo as assert,
+        foo as Self,
+    };
+}
+
+}
+
+script {
+    use 0x2::N::{
+        foo as address,
+        foo as signer,
+        foo as u8,
+        foo as u64,
+        foo as u128,
+        foo as vector,
+        foo as freeze,
+        foo as assert,
+        foo as Self,
+    };
+    fun main() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.exp
new file mode 100644
index 000000000..c8c890bed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.exp
@@ -0,0 +1,108 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_constant_names.move:5:11
+  │
+5 │     const address: u64 = 0;
+  │           ^^^^^^^ Invalid constant name 'address'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_constant_names.move:6:11
+  │
+6 │     const signer: u64 = 0;
+  │           ^^^^^^ Invalid constant name 'signer'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_constant_names.move:7:11
+  │
+7 │     const u8: u64 = 0;
+  │           ^^ Invalid constant name 'u8'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_constant_names.move:8:11
+  │
+8 │     const u64: u64 = 0;
+  │           ^^^ Invalid constant name 'u64'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_constant_names.move:9:11
+  │
+9 │     const u128: u64 = 0;
+  │           ^^^^ Invalid constant name 'u128'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:10:11
+   │
+10 │     const vector: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'vector'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:11:11
+   │
+11 │     const freeze: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'freeze'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:12:11
+   │
+12 │     const assert: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'assert'. Constant names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:14:11
+   │
+14 │     const Self: u64 = 0;
+   │           ^^^^ Invalid constant name 'Self'. 'Self' is restricted and cannot be used to name a constant
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:21:11
+   │
+21 │     const address: u64 = 0;
+   │           ^^^^^^^ Invalid constant name 'address'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:22:11
+   │
+22 │     const signer: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'signer'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:23:11
+   │
+23 │     const u8: u64 = 0;
+   │           ^^ Invalid constant name 'u8'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:24:11
+   │
+24 │     const u64: u64 = 0;
+   │           ^^^ Invalid constant name 'u64'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:25:11
+   │
+25 │     const u128: u64 = 0;
+   │           ^^^^ Invalid constant name 'u128'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:26:11
+   │
+26 │     const vector: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'vector'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:27:11
+   │
+27 │     const freeze: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'freeze'. Constant names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:28:11
+   │
+28 │     const assert: u64 = 0;
+   │           ^^^^^^ Invalid constant name 'assert'. Constant names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_constant_names.move:30:11
+   │
+30 │     const Self: u64 = 0;
+   │           ^^^^ Invalid constant name 'Self'. 'Self' is restricted and cannot be used to name a constant
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.move
new file mode 100644
index 000000000..588f4bb76
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_constant_names.move
@@ -0,0 +1,32 @@
+address 0x2 {
+
+module M {
+    // restricted names are invalid due to not starting with A-Z
+    const address: u64 = 0;
+    const signer: u64 = 0;
+    const u8: u64 = 0;
+    const u64: u64 = 0;
+    const u128: u64 = 0;
+    const vector: u64 = 0;
+    const freeze: u64 = 0;
+    const assert: u64 = 0;
+    // restricted
+    const Self: u64 = 0;
+}
+
+}
+
+script {
+    // restricted names are invalid due to not starting with A-Z
+    const address: u64 = 0;
+    const signer: u64 = 0;
+    const u8: u64 = 0;
+    const u64: u64 = 0;
+    const u128: u64 = 0;
+    const vector: u64 = 0;
+    const freeze: u64 = 0;
+    const assert: u64 = 0;
+    // restricted
+    const Self: u64 = 0;
+    fun main() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.exp
new file mode 100644
index 000000000..df5002d77
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.exp
@@ -0,0 +1,108 @@
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:2:9
+  │
+2 │     fun address() { abort 0 }
+  │         ^^^^^^^ Invalid function name 'address'. 'address' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:3:9
+  │
+3 │     fun signer() { abort 0 }
+  │         ^^^^^^ Invalid function name 'signer'. 'signer' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:4:9
+  │
+4 │     fun u8() { abort 0 }
+  │         ^^ Invalid function name 'u8'. 'u8' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:5:9
+  │
+5 │     fun u64() { abort 0 }
+  │         ^^^ Invalid function name 'u64'. 'u64' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:6:9
+  │
+6 │     fun u128() { abort 0 }
+  │         ^^^^ Invalid function name 'u128'. 'u128' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:7:9
+  │
+7 │     fun vector<T>() { abort 0 }
+  │         ^^^^^^ Invalid function name 'vector'. 'vector' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:8:9
+  │
+8 │     fun freeze() { abort 0 }
+  │         ^^^^^^ Invalid function name 'freeze'. 'freeze' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_function_names.move:9:9
+  │
+9 │     fun assert() { abort 0 }
+  │         ^^^^^^ Invalid function name 'assert'. 'assert' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:10:9
+   │
+10 │     fun Self() { abort 0}
+   │         ^^^^ Invalid function name 'Self'. 'Self' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:13:14
+   │
+13 │ script { fun address() { abort 0 } }
+   │              ^^^^^^^ Invalid function name 'address'. 'address' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:14:14
+   │
+14 │ script { fun signer() { abort 0 } }
+   │              ^^^^^^ Invalid function name 'signer'. 'signer' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:15:14
+   │
+15 │ script { fun u8() { abort 0 } }
+   │              ^^ Invalid function name 'u8'. 'u8' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:16:14
+   │
+16 │ script { fun u64() { abort 0 } }
+   │              ^^^ Invalid function name 'u64'. 'u64' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:17:14
+   │
+17 │ script { fun u128() { abort 0 } }
+   │              ^^^^ Invalid function name 'u128'. 'u128' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:18:14
+   │
+18 │ script { fun vector<T>() { abort 0 } }
+   │              ^^^^^^ Invalid function name 'vector'. 'vector' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:19:14
+   │
+19 │ script { fun freeze() { abort 0 } }
+   │              ^^^^^^ Invalid function name 'freeze'. 'freeze' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:20:14
+   │
+20 │ script { fun assert() { abort 0 } }
+   │              ^^^^^^ Invalid function name 'assert'. 'assert' is restricted and cannot be used to name a function
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_function_names.move:21:14
+   │
+21 │ script { fun Self() { abort 0} }
+   │              ^^^^ Invalid function name 'Self'. 'Self' is restricted and cannot be used to name a function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.move
new file mode 100644
index 000000000..791ac8838
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_function_names.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    fun address() { abort 0 }
+    fun signer() { abort 0 }
+    fun u8() { abort 0 }
+    fun u64() { abort 0 }
+    fun u128() { abort 0 }
+    fun vector<T>() { abort 0 }
+    fun freeze() { abort 0 }
+    fun assert() { abort 0 }
+    fun Self() { abort 0}
+}
+
+script { fun address() { abort 0 } }
+script { fun signer() { abort 0 } }
+script { fun u8() { abort 0 } }
+script { fun u64() { abort 0 } }
+script { fun u128() { abort 0 } }
+script { fun vector<T>() { abort 0 } }
+script { fun freeze() { abort 0 } }
+script { fun assert() { abort 0 } }
+script { fun Self() { abort 0} }
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.exp
new file mode 100644
index 000000000..4e90b9b05
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.exp
@@ -0,0 +1,14 @@
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_module_alias_names.move:3:20
+  │
+3 │     use 0x42::M as Self;
+  │                    ^^^^ Invalid module alias name 'Self'. 'Self' is restricted and cannot be used to name a module alias
+
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/restricted_module_alias_names.move:5:20
+  │
+5 │     use 0x42::M as vector;
+  │                    ^^^^^^ Unused 'use' of alias 'vector'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.move
new file mode 100644
index 000000000..d772e30e0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_alias_names.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    // not allowed
+    use 0x42::M as Self;
+    // now allowed
+    use 0x42::M as vector;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.exp
new file mode 100644
index 000000000..6cf46b670
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.exp
@@ -0,0 +1,6 @@
+error[E03011]: invalid use of reserved name
+  ┌─ tests/move_check/expansion/restricted_module_names.move:2:14
+  │
+2 │ module 0x42::Self {}
+  │              ^^^^ Invalid module name 'Self'. 'Self' is restricted and cannot be used to name a module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.move
new file mode 100644
index 000000000..5405c0d33
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_module_names.move
@@ -0,0 +1,4 @@
+// not allowed
+module 0x42::Self {}
+// now allowed
+module 0x42::vector {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_names_valid.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_names_valid.move
new file mode 100644
index 000000000..441aafb1c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_names_valid.move
@@ -0,0 +1,72 @@
+address 0x2 {
+module N {
+    public fun t(): u64 { 0 }
+}
+
+module M {
+    use 0x2::N::{
+        Self as address,
+        Self as signer,
+        Self as u8,
+        Self as u64,
+        Self as u128,
+        // vector now keyworded in expressions, so this would be unusable
+        // Self as vector,
+        Self as move_to,
+        Self as move_from,
+        Self as borrow_global,
+        Self as borrow_global_mut,
+        Self as exists,
+        Self as freeze,
+        Self as assert,
+    };
+
+    fun t(): u64 {
+
+        let address = 0;
+        let signer = 0;
+        let u8 = 0;
+        let u64 = 0;
+        let u128 = 0;
+        // vector now keyworded in expressions, so this would be unusable
+        // let vector = 0;
+        let move_to = 0;
+        let move_from = 0;
+        let borrow_global = 0;
+        let borrow_global_mut = 0;
+        let exists = 0;
+        let freeze = 0;
+        let assert = 0;
+
+        address::t() +
+        signer::t() +
+        u8::t() +
+        u64::t() +
+        u128::t() +
+        // vector now keyworded in expressions, so this would fail in parsing
+        // vector::t() +
+        move_to::t() +
+        move_from::t() +
+        borrow_global::t() +
+        borrow_global_mut::t() +
+        exists::t() +
+        freeze::t() +
+        assert::t();
+
+        address +
+        signer +
+        u8 +
+        u64 +
+        u128 +
+        // vector now keyworded in expressions, so this would fail in parsing
+        // vector +
+        move_to +
+        move_from +
+        borrow_global +
+        borrow_global_mut +
+        exists +
+        freeze +
+        assert
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.exp
new file mode 100644
index 000000000..ddc9a5f95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.exp
@@ -0,0 +1,48 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:2:12
+  │
+2 │     struct address {}
+  │            ^^^^^^^ Invalid struct name 'address'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:3:12
+  │
+3 │     struct signer {}
+  │            ^^^^^^ Invalid struct name 'signer'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:4:12
+  │
+4 │     struct u8 {}
+  │            ^^ Invalid struct name 'u8'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:5:12
+  │
+5 │     struct u64 {}
+  │            ^^^ Invalid struct name 'u64'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:6:12
+  │
+6 │     struct u128 {}
+  │            ^^^^ Invalid struct name 'u128'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:7:12
+  │
+7 │     struct vector<T> { f: T }
+  │            ^^^^^^ Invalid struct name 'vector'. Struct names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/restricted_struct_names.move:9:12
+  │
+9 │     struct freeze {}
+  │            ^^^^^^ Invalid struct name 'freeze'. Struct names must start with 'A'..'Z'
+
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/restricted_struct_names.move:10:12
+   │
+10 │     struct Self {}
+   │            ^^^^ Invalid struct name 'Self'. 'Self' is restricted and cannot be used to name a struct
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.move
new file mode 100644
index 000000000..6973cb385
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/restricted_struct_names.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct address {}
+    struct signer {}
+    struct u8 {}
+    struct u64 {}
+    struct u128 {}
+    struct vector<T> { f: T }
+
+    struct freeze {}
+    struct Self {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.exp
new file mode 100644
index 000000000..1adea8d1f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.exp
@@ -0,0 +1,6 @@
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/expansion/spec_block_in_spec_context.move:5:13
+  │
+5 │             spec {};
+  │             ^^^^^^^ 'spec' blocks cannot be used inside of a spec context
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.move
new file mode 100644
index 000000000..c07844a47
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_in_spec_context.move
@@ -0,0 +1,16 @@
+address 0x42 {
+module M {
+    spec module {
+        fun S(): () {
+            spec {};
+        }
+    }
+
+    fun t(): () {
+        spec {};
+    }
+
+    fun a() {}
+    fun z() {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses.move
new file mode 100644
index 000000000..e7ebc0a6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses.move
@@ -0,0 +1,20 @@
+address 0x2 {
+module M {
+    struct S {}
+    struct R<T> { f: T }
+
+    fun t1(): (R<u64>, S) {
+        abort 0
+    }
+
+    spec module {
+        use 0x2::M::{S as R, R as S};
+        ensures exists<S<u64>>(0x1) == exists<R>(0x1);
+    }
+
+    fun t2(): (R<u64>, S) {
+        abort 0
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses_shadows_defines.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses_shadows_defines.move
new file mode 100644
index 000000000..26179025e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_block_uses_shadows_defines.move
@@ -0,0 +1,24 @@
+address 0x2 {
+module M {
+    struct R1 {}
+    struct R2<T> { f: T }
+
+    fun t1(): (R2<u64>, R1) {
+        abort 0
+    }
+
+    spec module {
+        use 0x2::M::{R1 as R, R2 as S};
+        // TODO syntax change to move spec heleprs outside of blocks
+        fun S(): bool { false }
+        fun R(): bool { false }
+
+        ensures exists<S<u64>>(0x1) == exists<R>(0x1);
+    }
+
+    fun t2(): (R2<u64>, R1) {
+        abort 0
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.exp
new file mode 100644
index 000000000..96a0f6d02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.exp
@@ -0,0 +1,45 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/spec_function_member_conflicts.move:7:12
+  │
+5 │         fun Foo(): bool { true }
+  │             --- Alias previously defined here
+6 │     }
+7 │     struct Foo {}
+  │            ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_function_member_conflicts.move:14:17
+   │
+12 │         fun Foo(): bool { true }
+   │             --- Alias previously defined here
+13 │     }
+14 │     spec schema Foo<T> {
+   │                 ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_function_member_conflicts.move:23:9
+   │
+21 │         fun Foo(): bool { true }
+   │             --- Alias previously defined here
+22 │     }
+23 │     fun Foo() {}
+   │         ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_function_member_conflicts.move:30:9
+   │
+28 │         fun foo(): bool { true }
+   │             --- Alias previously defined here
+29 │     }
+30 │     fun foo() {}
+   │         ^^^ Duplicate module member or alias 'foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_function_member_conflicts.move:38:13
+   │
+35 │         fun foo(): bool { true }
+   │             --- Alias previously defined here
+   ·
+38 │         fun foo(): bool { true }
+   │             ^^^ Duplicate module member or alias 'foo'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.move
new file mode 100644
index 000000000..623e43782
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_function_member_conflicts.move
@@ -0,0 +1,41 @@
+address 0x2 {
+
+module X1 {
+    spec module {
+        fun Foo(): bool { true }
+    }
+    struct Foo {}
+}
+
+module X2 {
+    spec module {
+        fun Foo(): bool { true }
+    }
+    spec schema Foo<T> {
+        ensures true;
+    }
+}
+
+module X3 {
+    spec module {
+        fun Foo(): bool { true }
+    }
+    fun Foo() {}
+}
+
+module X4 {
+    spec module {
+        fun foo(): bool { true }
+    }
+    fun foo() {}
+}
+
+module X5 {
+    spec module {
+        fun foo(): bool { true }
+    }
+    spec module {
+        fun foo(): bool { true }
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.exp
new file mode 100644
index 000000000..6b1e53475
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.exp
@@ -0,0 +1,36 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/spec_schema_member_conflicts.move:7:12
+  │
+4 │     spec schema Foo<T> {
+  │                 --- Alias previously defined here
+  ·
+7 │     struct Foo {}
+  │            ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_schema_member_conflicts.move:14:17
+   │
+11 │     spec schema Foo<T> {
+   │                 --- Alias previously defined here
+   ·
+14 │     spec schema Foo<T> {
+   │                 ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_schema_member_conflicts.move:23:9
+   │
+20 │     spec schema Foo<T> {
+   │                 --- Alias previously defined here
+   ·
+23 │     fun Foo() {}
+   │         ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/spec_schema_member_conflicts.move:31:13
+   │
+27 │     spec schema Foo<T> {
+   │                 --- Alias previously defined here
+   ·
+31 │         fun Foo(): bool { false }
+   │             ^^^ Duplicate module member or alias 'Foo'. Top level names in a namespace must be unique
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.move
new file mode 100644
index 000000000..0bc5c8d89
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/spec_schema_member_conflicts.move
@@ -0,0 +1,35 @@
+address 0x2 {
+
+module X1 {
+    spec schema Foo<T> {
+        ensures true;
+    }
+    struct Foo {}
+}
+
+module X2 {
+    spec schema Foo<T> {
+        ensures true;
+    }
+    spec schema Foo<T> {
+        ensures true;
+    }
+}
+
+module X3 {
+    spec schema Foo<T> {
+        ensures true;
+    }
+    fun Foo() {}
+}
+
+module X4 {
+    spec schema Foo<T> {
+        ensures true;
+    }
+    spec module {
+        fun Foo(): bool { false }
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.exp
new file mode 100644
index 000000000..4757b1b12
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/standalone_fields.move:3:11
+  │
+3 │         {f: 1, g: 0};
+  │           ^
+  │           │
+  │           Unexpected ':'
+  │           Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.move
new file mode 100644
index 000000000..f4615afc9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_fields.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo() {
+        {f: 1, g: 0};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.exp
new file mode 100644
index 000000000..457475316
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.exp
@@ -0,0 +1,6 @@
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/expansion/standalone_mname_with_type_args.move:3:21
+  │
+3 │         let _ = 0 + M<u64>;
+  │                     ^^^^^^ Expected name to be followed by a brace-enclosed list of field expressions or a parenthesized list of arguments for a function call
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.move
new file mode 100644
index 000000000..88dad3d31
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_mname_with_type_args.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun foo() {
+        let _ = 0 + M<u64>;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.exp
new file mode 100644
index 000000000..d7dc91d3a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.exp
@@ -0,0 +1,6 @@
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/expansion/standalone_name_with_type_args.move:3:17
+  │
+3 │         let _ = n<u64>;
+  │                 ^^^^^^ Expected name to be followed by a brace-enclosed list of field expressions or a parenthesized list of arguments for a function call
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.move
new file mode 100644
index 000000000..84114721a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/standalone_name_with_type_args.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun foo() {
+        let _ = n<u64>;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/top_level_not_named_main.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/top_level_not_named_main.move
new file mode 100644
index 000000000..fc7d4932f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/top_level_not_named_main.move
@@ -0,0 +1,4 @@
+script {
+fun foo() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.exp
new file mode 100644
index 000000000..ca954559a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/type_arguments_on_field_access.move:6:17
+  │
+6 │         x.f<u64>;
+  │                 ^
+  │                 │
+  │                 Unexpected ';'
+  │                 Expected '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.move
new file mode 100644
index 000000000..a9ef62a5c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/type_arguments_on_field_access.move
@@ -0,0 +1,8 @@
+module M {
+    struct X<T> {}
+    struct S { f: X<u64> }
+    fun foo() {
+        let x = S { f: X{} };
+        x.f<u64>;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp
new file mode 100644
index 000000000..64170c9de
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/unbound_module_alias_in_type.move:2:16
+  │
+2 │     fun foo(x: X::T) { x; }
+  │                ^ Unbound module alias 'X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.move
new file mode 100644
index 000000000..1d05d6cf4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_module_alias_in_type.move
@@ -0,0 +1,3 @@
+module 0x8675309::M {
+    fun foo(x: X::T) { x; }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.exp
new file mode 100644
index 000000000..260173bac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.exp
@@ -0,0 +1,87 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/unbound_named_address.move:3:9
+  │
+3 │     use B::X;
+  │         ^^^^ Invalid 'use'. Unbound module: 'B::X'
+
+error[E02011]: invalid 'friend' declaration
+  ┌─ tests/move_check/expansion/unbound_named_address.move:5:5
+  │
+5 │     friend C::M;
+  │     ^^^^^^^^^^^^
+  │     │      │
+  │     │      Cannot declare modules out of the current address as a friend
+  │     Invalid friend declaration
+
+error[E03001]: address with no value
+  ┌─ tests/move_check/expansion/unbound_named_address.move:5:12
+  │
+5 │     friend C::M;
+  │            ^ address 'C' is not assigned a value
+
+error[E03001]: address with no value
+  ┌─ tests/move_check/expansion/unbound_named_address.move:6:12
+  │
+6 │     friend D::M::foo;
+  │            ^ address 'D' is not assigned a value
+
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/expansion/unbound_named_address.move:6:18
+  │
+6 │     friend D::M::foo;
+  │                  ^^^ Unexpected module member access. Expected a module identifier only
+
+error[E03001]: address with no value
+  ┌─ tests/move_check/expansion/unbound_named_address.move:9:12
+  │
+9 │         x: E::M::S,
+  │            ^ address 'E' is not assigned a value
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/expansion/unbound_named_address.move:9:12
+  │
+9 │         x: E::M::S,
+  │            ^^^^ Unbound module 'E::M'
+
+error[E03001]: address with no value
+   ┌─ tests/move_check/expansion/unbound_named_address.move:13:17
+   │
+13 │         let x = F::M::S {}; x;
+   │                 ^ address 'F' is not assigned a value
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/unbound_named_address.move:13:17
+   │
+13 │         let x = F::M::S {}; x;
+   │                 ^^^^ Unbound module 'F::M'
+
+error[E03001]: address with no value
+   ┌─ tests/move_check/expansion/unbound_named_address.move:14:9
+   │
+14 │         G::M::foo();
+   │         ^ address 'G' is not assigned a value
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/unbound_named_address.move:14:9
+   │
+14 │         G::M::foo();
+   │         ^^^^ Unbound module 'G::M'
+
+error[E03001]: address with no value
+   ┌─ tests/move_check/expansion/unbound_named_address.move:15:17
+   │
+15 │         let c = H::M::C; c;
+   │                 ^ address 'H' is not assigned a value
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/unbound_named_address.move:15:17
+   │
+15 │         let c = H::M::C; c;
+   │                 ^^^^ Unbound module 'H::M'
+
+error[E03001]: address with no value
+   ┌─ tests/move_check/expansion/unbound_named_address.move:16:18
+   │
+16 │         let a = @I; a; // suggests declaration
+   │                  ^ address 'I' is not assigned a value. Try assigning it a value when calling the compiler
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.move
new file mode 100644
index 000000000..64ccb5e14
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unbound_named_address.move
@@ -0,0 +1,18 @@
+// Unbound address in all cases
+module A::M { // suggests declaration
+    use B::X;
+
+    friend C::M;
+    friend D::M::foo;
+
+    struct S {
+        x: E::M::S,
+    }
+
+    fun foo() {
+        let x = F::M::S {}; x;
+        G::M::foo();
+        let c = H::M::C; c;
+        let a = @I; a; // suggests declaration
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.exp
new file mode 100644
index 000000000..331a42491
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.exp
@@ -0,0 +1,34 @@
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/expansion/unpack_all_field_cases.move:10:13
+   │
+10 │         S { f, g } = copy s;
+   │             ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/expansion/unpack_all_field_cases.move:10:16
+   │
+10 │         S { f, g } = copy s;
+   │                ^ Unused assignment for variable 'g'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_g')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/expansion/unpack_all_field_cases.move:11:16
+   │
+11 │         S { f: 0, g: 0} = copy s;
+   │                ^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/expansion/unpack_all_field_cases.move:12:16
+   │
+12 │         S { g: 0, f } = copy s;
+   │                ^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/expansion/unpack_all_field_cases.move:13:19
+   │
+13 │         S { g, f: 0 } = copy s;
+   │                   ^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.move
new file mode 100644
index 000000000..5de06de65
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_all_field_cases.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct T {}
+    struct S has copy, drop { f: u64, g: u64 }
+    fun foo() {
+        let f;
+        let g;
+        let s = S{ f: 0, g: 0};
+        T {} = T{};
+        T { } = T{};
+        S { f, g } = copy s;
+        S { f: 0, g: 0} = copy s;
+        S { g: 0, f } = copy s;
+        S { g, f: 0 } = copy s;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.exp
new file mode 100644
index 000000000..bb406949d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/unpack_assign_block_expr.move:4:13
+  │
+4 │         S { let f = 0; } = S { f: 0 };
+  │             ^^^
+  │             │
+  │             Unexpected 'let'
+  │             Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.move
new file mode 100644
index 000000000..53509f43a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_expr.move
@@ -0,0 +1,6 @@
+module M {
+    struct S { f: u64 }
+    fun foo() {
+        S { let f = 0; } = S { f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.exp
new file mode 100644
index 000000000..704367ea3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/unpack_assign_block_single_expr.move:4:13
+  │
+4 │         S { 0 } = S { f: 0 };
+  │             ^
+  │             │
+  │             Unexpected '0'
+  │             Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.move
new file mode 100644
index 000000000..26d086112
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_block_single_expr.move
@@ -0,0 +1,6 @@
+module M {
+    struct S { f: u64 }
+    fun foo() {
+        S { 0 } = S { f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.exp
new file mode 100644
index 000000000..c7b21d511
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/unpack_assign_other_expr.move:9:11
+  │
+9 │         S f = S { f: 0 };
+  │           ^
+  │           │
+  │           Unexpected 'f'
+  │           Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.move
new file mode 100644
index 000000000..ccaf27d7b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/unpack_assign_other_expr.move
@@ -0,0 +1,14 @@
+module M {
+    struct G {}
+    struct S { f: u64 }
+    fun foo() {
+        let f: u64;
+        S ( f ) = S { f: 0 };
+
+        let f: u64;
+        S f = S { f: 0 };
+
+        G () = G {};
+        G {{}} = G{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function.move
new file mode 100644
index 000000000..0c705c6ac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function.move
@@ -0,0 +1,29 @@
+address 0x2 {
+module X {
+    public fun u(): u64 {
+        0
+    }
+    public fun a(): address {
+        @0x0
+    }
+    public fun bar() {}
+}
+
+module M {
+    use 0x2::X::{u, u as U, u as get_u, a, a as A, a as get_a};
+    fun t() {
+        (u(): u64);
+        (U(): u64);
+        (get_u(): u64);
+        (a(): address);
+        (A(): address);
+        (get_a(): address);
+    }
+
+    use 0x2::X::bar as baz;
+    fun bar() {
+        baz()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_overlap_with_module.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_overlap_with_module.move
new file mode 100644
index 000000000..56c85bf29
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_overlap_with_module.move
@@ -0,0 +1,13 @@
+address 0x2 {
+module X {
+    public fun u() {}
+}
+
+module M {
+    use 0x2::X::{Self, u as X};
+    fun foo() {
+        X();
+        X::u()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.exp
new file mode 100644
index 000000000..76797512c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.exp
@@ -0,0 +1,25 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_function_same_name_as_function.move:10:9
+   │
+ 9 │     use 0x2::X::u;
+   │                 - Alias previously defined here
+10 │     fun u() {
+   │         ^ Duplicate module member or alias 'u'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_function_same_name_as_function.move:17:22
+   │
+15 │     fun bar() {
+   │         --- Alias previously defined here
+16 │     }
+17 │     use 0x2::X::u as bar;
+   │                      ^^^ Duplicate module member or alias 'bar'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_function_same_name_as_function.move:17:22
+   │
+17 │     use 0x2::X::u as bar;
+   │                      ^^^ Unused 'use' of alias 'bar'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.move
new file mode 100644
index 000000000..30683c18e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_function.move
@@ -0,0 +1,20 @@
+address 0x2 {
+module X {
+    public fun u(): u64 {
+        0
+    }
+}
+
+module M {
+    use 0x2::X::u;
+    fun u() {
+    }
+}
+
+module N {
+    fun bar() {
+    }
+    use 0x2::X::u as bar;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.exp
new file mode 100644
index 000000000..706ae484b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.exp
@@ -0,0 +1,30 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/use_function_same_name_as_struct.move:9:17
+  │
+9 │     use 0x2::X::u;
+  │                 ^ Unused 'use' of alias 'u'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/use_function_same_name_as_struct.move:10:12
+   │
+10 │     struct u {}
+   │            ^ Invalid struct name 'u'. Struct names must start with 'A'..'Z'
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_function_same_name_as_struct.move:15:22
+   │
+14 │     struct Bar {}
+   │            --- Alias previously defined here
+15 │     use 0x2::X::u as Bar;
+   │                      ^^^ Duplicate module member or alias 'Bar'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_function_same_name_as_struct.move:15:22
+   │
+15 │     use 0x2::X::u as Bar;
+   │                      ^^^ Unused 'use' of alias 'Bar'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.move
new file mode 100644
index 000000000..b899be77f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_same_name_as_struct.move
@@ -0,0 +1,18 @@
+address 0x2 {
+module X {
+    public fun u(): u64 {
+        0
+    }
+}
+
+module M {
+    use 0x2::X::u;
+    struct u {}
+}
+
+module N {
+    struct Bar {}
+    use 0x2::X::u as Bar;
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.exp
new file mode 100644
index 000000000..432aa740f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.exp
@@ -0,0 +1,14 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/use_function_tparam_shadows.move:7:17
+  │
+7 │     use 0x2::X::foo;
+  │                 ^^^ Unused 'use' of alias 'foo'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/expansion/use_function_tparam_shadows.move:10:9
+   │
+10 │         foo()
+   │         ^^^ Unbound function 'foo' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.move
new file mode 100644
index 000000000..6cd4d9f50
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_tparam_shadows.move
@@ -0,0 +1,13 @@
+address 0x2 {
+module X {
+    fun foo() {}
+}
+
+module M {
+    use 0x2::X::foo;
+
+    fun bar<foo>() {
+        foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.exp
new file mode 100644
index 000000000..3ef303d0b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.exp
@@ -0,0 +1,15 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/expansion/use_function_unbound.move:6:17
+  │
+2 │ module X {
+  │        - Module '0x2::X' declared here
+  ·
+6 │     use 0x2::X::u;
+  │                 ^ Invalid 'use'. Unbound member 'u' in module '0x2::X'
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/expansion/use_function_unbound.move:9:9
+  │
+9 │         u()
+  │         ^ Unbound function 'u' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.move
new file mode 100644
index 000000000..4824e058b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_function_unbound.move
@@ -0,0 +1,12 @@
+address 0x2 {
+module X {
+}
+
+module M {
+    use 0x2::X::u;
+
+    fun bar() {
+        u()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope.move
new file mode 100644
index 000000000..db3f09095
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope.move
@@ -0,0 +1,27 @@
+address 0x2 {
+module M {
+    struct S1 has drop { b: bool }
+    struct S2 has drop { u: u64 }
+    fun check(): bool {
+        false
+    }
+    fun num(): u64 {
+        0
+    }
+
+    fun t() {
+        use 0x2::M::{check as num, num as check, S1 as S2, S2 as S1};
+        num() && false;
+        check() + 1;
+        S1 { u: 0 };
+        S2 { b: false };
+        {
+            use 0x2::M::{check, num, S1, S2};
+            check() && false;
+            num() + 1;
+            S2 { u: 0 };
+            S1 { b: false };
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.exp
new file mode 100644
index 000000000..c8e1d655a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.exp
@@ -0,0 +1,32 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_inner_scope_duplicates.move:13:43
+   │
+13 │         use 0x2::M::{check as foo, num as foo};
+   │                               ---         ^^^ Duplicate module member or alias 'foo'. Top level names in a namespace must be unique
+   │                               │            
+   │                               Alias previously defined here
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_inner_scope_duplicates.move:13:43
+   │
+13 │         use 0x2::M::{check as foo, num as foo};
+   │                                           ^^^ Unused 'use' of alias 'foo'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_inner_scope_duplicates.move:15:23
+   │
+14 │         use 0x2::M as N;
+   │                       - Alias previously defined here
+15 │         use 0x2::M as N;
+   │                       ^ Duplicate module alias 'N'. Module aliases must be unique within a given namespace
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_inner_scope_duplicates.move:15:23
+   │
+15 │         use 0x2::M as N;
+   │                       ^ Unused 'use' of alias 'N'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.move
new file mode 100644
index 000000000..14998f052
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_duplicates.move
@@ -0,0 +1,19 @@
+address 0x2 {
+module M {
+    struct S1 { b: bool }
+    struct S2 { u: u64 }
+    fun check(): bool {
+        false
+    }
+    fun num(): u64 {
+        0
+    }
+
+    fun t() {
+        use 0x2::M::{check as foo, num as foo};
+        use 0x2::M as N;
+        use 0x2::M as N;
+
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.exp
new file mode 100644
index 000000000..4e594664a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.exp
@@ -0,0 +1,18 @@
+error[E03011]: invalid use of reserved name
+   ┌─ tests/move_check/expansion/use_inner_scope_invalid.move:17:23
+   │
+17 │         use 0x2::M as Self;
+   │                       ^^^^ Invalid module alias name 'Self'. 'Self' is restricted and cannot be used to name a module alias
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/use_inner_scope_invalid.move:18:28
+   │
+18 │         use 0x2::M::{S1 as s1, Foo as foo};
+   │                            ^^ Invalid struct alias name 's1'. Struct alias names must start with 'A'..'Z'
+
+error[E02010]: invalid name
+   ┌─ tests/move_check/expansion/use_inner_scope_invalid.move:18:39
+   │
+18 │         use 0x2::M::{S1 as s1, Foo as foo};
+   │                                       ^^^ Invalid schema alias name 'foo'. Schema alias names must start with 'A'..'Z'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.move
new file mode 100644
index 000000000..188d6103e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_invalid.move
@@ -0,0 +1,22 @@
+address 0x2 {
+module M {
+    struct S1 { b: bool }
+    struct S2 { u: u64 }
+    fun check(): bool {
+        false
+    }
+    fun num(): u64 {
+        0
+    }
+
+    spec schema Foo<T> {
+        ensures true;
+    }
+
+    fun t() {
+        use 0x2::M as Self;
+        use 0x2::M::{S1 as s1, Foo as foo};
+
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_shadows.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_shadows.move
new file mode 100644
index 000000000..d7b8cfae1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_shadows.move
@@ -0,0 +1,42 @@
+address 0x2 {
+module M {
+    struct S1 has drop { b: bool }
+    struct S2 has drop { u: u64 }
+    struct S3 has drop { a: address }
+    fun check(): bool {
+        false
+    }
+    fun num(u: u64): u64 {
+        u + 1
+    }
+    spec schema Foo<T> {
+        ensures true;
+    }
+
+    fun t<T>(): S3 {
+        use 0x2::M::{check as num, num as t, S1 as S2, S2 as Foo, S3 as T};
+        num() && true;
+        t(0) + 1;
+        S2 { b: false };
+        Foo { u: 0 };
+        T { a: @0x0 }
+    }
+
+    fun t2<T>(x: T) {
+        {
+            use 0x2::M::{check as num, num as t, S1 as S2, S2 as Foo, S3 as T};
+            num() && true;
+            t(0) + 1;
+            S2 { b: false };
+            Foo { u: 0 };
+            T { a: @0x0 }
+        };
+        check() && true;
+        num(0) + 1;
+        t2<T>(x);
+        S1 { b: false };
+        S2 { u: 0 };
+        S3 { a: @0x0 };
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.exp
new file mode 100644
index 000000000..386edab05
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.exp
@@ -0,0 +1,15 @@
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/use_inner_scope_unbound.move:13:13
+   │
+13 │         use 0x2::N;
+   │             ^^^^^^ Invalid 'use'. Unbound module: '0x2::N'
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/expansion/use_inner_scope_unbound.move:14:21
+   │
+ 2 │ module M {
+   │        - Module '0x2::M' declared here
+   ·
+14 │         use 0x2::M::foo;
+   │                     ^^^ Invalid 'use'. Unbound member 'foo' in module '0x2::M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.move
new file mode 100644
index 000000000..3675df1e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unbound.move
@@ -0,0 +1,18 @@
+address 0x2 {
+module M {
+    struct S1 { b: bool }
+    struct S2 { u: u64 }
+    fun check(): bool {
+        false
+    }
+    fun num(): u64 {
+        0
+    }
+
+    fun t() {
+        use 0x2::N;
+        use 0x2::M::foo;
+
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.exp
new file mode 100644
index 000000000..e9d2bd9bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.exp
@@ -0,0 +1,24 @@
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_inner_scope_unused.move:13:23
+   │
+13 │         use 0x2::M as X;
+   │                       ^ Unused 'use' of alias 'X'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_inner_scope_unused.move:14:31
+   │
+14 │         use 0x2::M::{check as f, S1 as S8};
+   │                               ^ Unused 'use' of alias 'f'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_inner_scope_unused.move:14:40
+   │
+14 │         use 0x2::M::{check as f, S1 as S8};
+   │                                        ^^ Unused 'use' of alias 'S8'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.move
new file mode 100644
index 000000000..8f7804586
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_inner_scope_unused.move
@@ -0,0 +1,18 @@
+address 0x2 {
+module M {
+    struct S1 { b: bool }
+    struct S2 { u: u64 }
+    fun check(): bool {
+        false
+    }
+    fun num(): u64 {
+        0
+    }
+
+    fun t() {
+        use 0x2::M as X;
+        use 0x2::M::{check as f, S1 as S8};
+
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self.move
new file mode 100644
index 000000000..21cdb9ac6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self.move
@@ -0,0 +1,15 @@
+address 0x2 {
+module X {
+    struct S {}
+    public fun foo() {}
+}
+
+module M {
+    use 0x2::X::Self;
+
+    struct S { f: X::S }
+    fun foo() {
+        X::foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as.move
new file mode 100644
index 000000000..95a5be851
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as.move
@@ -0,0 +1,16 @@
+address 0x2 {
+    module X {
+        struct S {}
+        public fun foo() {}
+    }
+
+    module M {
+        use 0x2::X::{Self as B, foo, S};
+
+        struct X { f: B::S, f2: S }
+        fun bar() {
+            B::foo();
+            foo()
+        }
+    }
+    }
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp
new file mode 100644
index 000000000..a7f901516
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.exp
@@ -0,0 +1,20 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_check/expansion/use_nested_self_as_invalid.move:8:26
+  │
+8 │     use 0x2::X::{Self as B, foo, S};
+  │                          ^ Unused 'use' of alias 'B'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/use_nested_self_as_invalid.move:10:19
+   │
+10 │     struct X { f: X::S, f2: S }
+   │                   ^ Unbound module alias 'X'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/expansion/use_nested_self_as_invalid.move:12:9
+   │
+12 │         X::foo();
+   │         ^ Unbound module alias 'X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.move
new file mode 100644
index 000000000..aee8cbf91
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_as_invalid.move
@@ -0,0 +1,16 @@
+address 0x2 {
+module X {
+    struct S {}
+    public fun foo() {}
+}
+
+module M {
+    use 0x2::X::{Self as B, foo, S};
+
+    struct X { f: X::S, f2: S }
+    fun bar() {
+        X::foo();
+        foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.exp
new file mode 100644
index 000000000..ee7199c4c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/expansion/use_nested_self_duplicate.move:9:14
+  │
+8 │     use 0x2::X;
+  │              - Alias previously defined here
+9 │     use 0x2::X::Self;
+  │              ^ Duplicate module alias 'X'. Module aliases must be unique within a given namespace
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.move
new file mode 100644
index 000000000..e3132e781
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_nested_self_duplicate.move
@@ -0,0 +1,16 @@
+address 0x2 {
+module X {
+    struct S {}
+    public fun foo() {}
+}
+
+module M {
+    use 0x2::X;
+    use 0x2::X::Self;
+
+    struct S { f: X::S }
+    fun foo() {
+        X::foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function.move
new file mode 100644
index 000000000..170f9cdf2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function.move
@@ -0,0 +1,20 @@
+address 0x2 {
+module X {
+    spec module {
+        fun foo(): bool { true }
+        fun bar(): bool { true }
+    }
+}
+
+module M {
+    use 0x2::X::{foo, bar as baz};
+    fun t() {
+    }
+
+    spec t {
+        ensures foo();
+        ensures baz();
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.exp
new file mode 100644
index 000000000..6580c9c06
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/use_spec_function_as_normal_function.move:4:16
+  │
+4 │         define foo(): bool { true }
+  │                ^^^
+  │                │
+  │                Unexpected 'foo'
+  │                Expected ':'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.move
new file mode 100644
index 000000000..65160cc13
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_function_as_normal_function.move
@@ -0,0 +1,17 @@
+address 0x2 {
+module X {
+    spec module {
+        define foo(): bool { true }
+        define bar(): bool { true }
+    }
+}
+
+module M {
+    use 0x2::X::{foo, bar as baz};
+    fun t() {
+        foo();
+        baz();
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema.move
new file mode 100644
index 000000000..6e697daf8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema.move
@@ -0,0 +1,24 @@
+address 0x2 {
+module X {
+    spec schema Foo<T> {
+        ensures true;
+    }
+
+    spec schema Bar<T> {
+        ensures true;
+    }
+}
+
+module M {
+    use 0x2::X::{Foo, Bar as Baz};
+    struct S {}
+    fun t() {
+    }
+
+    spec t {
+        apply Foo<S> to t;
+        apply Baz<S> to t;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.exp
new file mode 100644
index 000000000..c2d7c5950
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.exp
@@ -0,0 +1,6 @@
+error[E03003]: unbound module member
+   ┌─ tests/move_check/expansion/use_spec_schema_as_struct.move:10:14
+   │
+10 │     fun t(): Foo<u64> {
+   │              ^^^ Invalid module access. Unbound struct 'Foo' in module '0x2::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.move
new file mode 100644
index 000000000..6a14ba51e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_as_struct.move
@@ -0,0 +1,15 @@
+address 0x2 {
+module X {
+    spec schema Foo<T> {
+        ensures true;
+    }
+}
+
+module M {
+    use 0x2::X::Foo;
+    fun t(): Foo<u64> {
+        abort 0
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.exp
new file mode 100644
index 000000000..ca1b73e99
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.exp
@@ -0,0 +1,6 @@
+error[E02010]: invalid name
+  ┌─ tests/move_check/expansion/use_spec_schema_invalid_as.move:9:25
+  │
+9 │     use 0x2::X::{Foo as foo};
+  │                         ^^^ Invalid schema alias name 'foo'. Schema alias names must start with 'A'..'Z'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.move
new file mode 100644
index 000000000..862da74d0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_spec_schema_invalid_as.move
@@ -0,0 +1,17 @@
+address 0x2 {
+module X {
+    spec schema Foo<T> {
+        ensures true;
+    }
+}
+
+module M {
+    use 0x2::X::{Foo as foo};
+    struct S {}
+
+    spec t {
+        apply foo<S> to t;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct.move
new file mode 100644
index 000000000..19a13670d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct.move
@@ -0,0 +1,21 @@
+address 0x2 {
+module X {
+    struct U {}
+    struct R {}
+}
+
+module M {
+    use 0x2::X::{U, U as U2};
+
+    fun f(u: U, r: R) {
+        g(u, r)
+    }
+
+    fun g(u: U2, r: R2) {
+        f(u, r)
+    }
+
+    use 0x2::X::{R, R as R2};
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.exp
new file mode 100644
index 000000000..035c871c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.exp
@@ -0,0 +1,15 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/expansion/use_struct_invalid_name.move:7:17
+  │
+2 │ module X {
+  │        - Module '0x2::X' declared here
+  ·
+7 │     use 0x2::X::u;
+  │                 ^ Invalid 'use'. Unbound member 'u' in module '0x2::X'
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/use_struct_invalid_name.move:8:19
+  │
+8 │     struct X { f: u }
+  │                   ^ Unbound type 'u' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.move
new file mode 100644
index 000000000..80a1a213a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_invalid_name.move
@@ -0,0 +1,10 @@
+address 0x2 {
+module X {
+    struct S {}
+}
+
+module M {
+    use 0x2::X::u;
+    struct X { f: u }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_overlap_with_module.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_overlap_with_module.move
new file mode 100644
index 000000000..b5bf9a383
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_overlap_with_module.move
@@ -0,0 +1,10 @@
+address 0x2 {
+module X {
+    struct S {}
+}
+
+module M {
+    use 0x2::X::{Self, S as X};
+    struct A { f1: X, f2: X::S }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.exp
new file mode 100644
index 000000000..5a666e062
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.exp
@@ -0,0 +1,52 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:10:9
+   │
+ 8 │     use 0x2::X::{U, U as U2};
+   │                  - Alias previously defined here
+ 9 │ 
+10 │     fun U() {}
+   │         ^ Duplicate module member or alias 'U'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:11:9
+   │
+ 8 │     use 0x2::X::{U, U as U2};
+   │                          -- Alias previously defined here
+   ·
+11 │     fun U2() {}
+   │         ^^ Duplicate module member or alias 'U2'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:15:18
+   │
+12 │     fun R() {}
+   │         - Alias previously defined here
+   ·
+15 │     use 0x2::X::{R, R as R2};
+   │                  ^ Duplicate module member or alias 'R'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:15:18
+   │
+15 │     use 0x2::X::{R, R as R2};
+   │                  ^ Unused 'use' of alias 'R'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:15:26
+   │
+13 │     fun R2() {}
+   │         -- Alias previously defined here
+14 │ 
+15 │     use 0x2::X::{R, R as R2};
+   │                          ^^ Duplicate module member or alias 'R2'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_function.move:15:26
+   │
+15 │     use 0x2::X::{R, R as R2};
+   │                          ^^ Unused 'use' of alias 'R2'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.move
new file mode 100644
index 000000000..417a475de
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_function.move
@@ -0,0 +1,18 @@
+address 0x2 {
+module X {
+    struct U {}
+    struct R {}
+}
+
+module M {
+    use 0x2::X::{U, U as U2};
+
+    fun U() {}
+    fun U2() {}
+    fun R() {}
+    fun R2() {}
+
+    use 0x2::X::{R, R as R2};
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.exp
new file mode 100644
index 000000000..b60cc7403
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.exp
@@ -0,0 +1,52 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:10:12
+   │
+ 8 │     use 0x2::X::{U, U as U2};
+   │                  - Alias previously defined here
+ 9 │ 
+10 │     struct U {}
+   │            ^ Duplicate module member or alias 'U'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:11:12
+   │
+ 8 │     use 0x2::X::{U, U as U2};
+   │                          -- Alias previously defined here
+   ·
+11 │     struct U2 {}
+   │            ^^ Duplicate module member or alias 'U2'. Top level names in a namespace must be unique
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:15:18
+   │
+13 │     struct R {}
+   │            - Alias previously defined here
+14 │ 
+15 │     use 0x2::X::{R, R as R2};
+   │                  ^ Duplicate module member or alias 'R'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:15:18
+   │
+15 │     use 0x2::X::{R, R as R2};
+   │                  ^ Unused 'use' of alias 'R'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:15:26
+   │
+12 │     struct R2 {}
+   │            -- Alias previously defined here
+   ·
+15 │     use 0x2::X::{R, R as R2};
+   │                          ^^ Duplicate module member or alias 'R2'. Top level names in a namespace must be unique
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/expansion/use_struct_same_name_as_struct.move:15:26
+   │
+15 │     use 0x2::X::{R, R as R2};
+   │                          ^^ Unused 'use' of alias 'R2'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.move
new file mode 100644
index 000000000..d7a1c8ccc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_same_name_as_struct.move
@@ -0,0 +1,18 @@
+address 0x2 {
+module X {
+    struct U {}
+    struct R {}
+}
+
+module M {
+    use 0x2::X::{U, U as U2};
+
+    struct U {}
+    struct U2 {}
+    struct R2 {}
+    struct R {}
+
+    use 0x2::X::{R, R as R2};
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.exp
new file mode 100644
index 000000000..8baaf8e03
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.exp
@@ -0,0 +1,10 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/expansion/use_struct_tparam_shadows.move:12:9
+   │
+11 │     fun foo<S>(x: S): 0x2::X::S {
+   │                   -   --------- Expected: '0x2::X::S'
+   │                   │    
+   │                   Given: 'S'
+12 │         x
+   │         ^ Invalid return expression
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.move
new file mode 100644
index 000000000..cb5090274
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_tparam_shadows.move
@@ -0,0 +1,15 @@
+address 0x2 {
+module X {
+    struct S {}
+}
+
+module M {
+    use 0x2::X::S;
+
+    struct X { f: S }
+
+    fun foo<S>(x: S): 0x2::X::S {
+        x
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.exp
new file mode 100644
index 000000000..20587d8ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.exp
@@ -0,0 +1,15 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/expansion/use_struct_unbound.move:6:17
+  │
+2 │ module X {
+  │        - Module '0x2::X' declared here
+  ·
+6 │     use 0x2::X::S;
+  │                 ^ Invalid 'use'. Unbound member 'S' in module '0x2::X'
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/expansion/use_struct_unbound.move:8:19
+  │
+8 │     struct X { f: S }
+  │                   ^ Unbound type 'S' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.move
new file mode 100644
index 000000000..e84aec5dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/use_struct_unbound.move
@@ -0,0 +1,10 @@
+address 0x2 {
+module X {
+}
+
+module M {
+    use 0x2::X::S;
+
+    struct X { f: S }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.exp
new file mode 100644
index 000000000..41f25f90c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/expansion/weird_apply_assign.move:7:11
+  │
+7 │         S f = S { f: 0 };
+  │           ^
+  │           │
+  │           Unexpected 'f'
+  │           Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.move b/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.move
new file mode 100644
index 000000000..97b17a761
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/expansion/weird_apply_assign.move
@@ -0,0 +1,9 @@
+module M {
+    struct S { f: u64 }
+    fun foo() {
+        let f: u64;
+        { f } = S { f: 0 };
+
+        S f = S { f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.exp b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.exp
new file mode 100644
index 000000000..261b126cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.exp
@@ -0,0 +1,56 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/feature_gate/dot_call.move:4:5
+  │
+4 │     public use fun imm as S.f;
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:13:9
+   │
+13 │         use fun mut as S.g;
+   │         ^^^^^^^^^^^^^^^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:14:9
+   │
+14 │         s.imm();
+   │         ^^^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:15:9
+   │
+15 │         s.f();
+   │         ^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:16:9
+   │
+16 │         s.mut();
+   │         ^^^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:17:9
+   │
+17 │         s.g();
+   │         ^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E13001]: feature is not supported in specified edition
+   ┌─ tests/move_check/feature_gate/dot_call.move:18:9
+   │
+18 │         s.val();
+   │         ^^^^^^^ Method syntax is not supported by current edition 'legacy', only '2024.alpha' support this feature
+   │
+   = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.move b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.move
new file mode 100644
index 000000000..52a978c88
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/dot_call.move
@@ -0,0 +1,20 @@
+module a::m {
+    struct S has copy, drop, store {}
+
+    public use fun imm as S.f;
+
+    fun val(_: S) {}
+
+    fun imm(_: &S) {}
+
+    fun mut(_: &mut S) {}
+
+    fun nonono(s: S) {
+        use fun mut as S.g;
+        s.imm();
+        s.f();
+        s.mut();
+        s.g();
+        s.val();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.exp b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.exp
new file mode 100644
index 000000000..69d5bfa64
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.exp
@@ -0,0 +1,8 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/feature_gate/public_package.move:2:5
+  │
+2 │     public(package) fun foo(): u64 { 0 }
+  │     ^^^^^^^^^^^^^^^ 'public(package)' is not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.move b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.move
new file mode 100644
index 000000000..c8420c8ac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/feature_gate/public_package.move
@@ -0,0 +1,3 @@
+module 0x42::mod0 {
+    public(package) fun foo(): u64 { 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/folding/non_constant_empty_vec.move b/vendors/move/crates/move-compiler/tests/move_check/folding/non_constant_empty_vec.move
new file mode 100644
index 000000000..3e7dd9ee1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/folding/non_constant_empty_vec.move
@@ -0,0 +1,30 @@
+// These vectors should not be made constants
+// If they are made constants, the IR will error
+
+module 0x42::M {
+    struct S {}
+
+    public fun empty_struct_vec(): vector<S> {
+        vector[]
+    }
+
+    public fun empty_signer_vec(): vector<signer> {
+        vector[]
+    }
+
+    public fun empty_generic_vec<T>(): vector<T> {
+        vector[]
+    }
+
+    public fun empty_struct_vec_vec(): vector<vector<S>> {
+        vector[]
+    }
+
+    public fun empty_signer_vec_vec(): vector<vector<signer>> {
+        vector[]
+    }
+
+    public fun empty_generic_vec_vec<T>(): vector<vector<T>> {
+        vector[]
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.exp b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.exp
new file mode 100644
index 000000000..e10ac0666
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.exp
@@ -0,0 +1,234 @@
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:3:22
+  │
+3 │     const SHL0: u8 = 1 << 8;
+  │                      ^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:4:23
+  │
+4 │     const SHL1: u64 = 1 << 64;
+  │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:5:24
+  │
+5 │     const SHL2: u128 = 1 << 128;
+  │                        ^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:6:23
+  │
+6 │     const SHL3: u16 = 1 << 16;
+  │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:7:23
+  │
+7 │     const SHL4: u32 = 1 << 32;
+  │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants.move:9:22
+  │
+9 │     const SHR0: u8 = 0 >> 8;
+  │                      ^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:10:23
+   │
+10 │     const SHR1: u64 = 0 >> 64;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:11:24
+   │
+11 │     const SHR2: u128 = 0 >> 128;
+   │                        ^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:12:23
+   │
+12 │     const SHR3: u16 = 0 >> 16;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:13:23
+   │
+13 │     const SHR4: u32 = 0 >> 32;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:15:22
+   │
+15 │     const DIV0: u8 = 1 / 0;
+   │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:16:23
+   │
+16 │     const DIV1: u64 = 1 / 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:17:24
+   │
+17 │     const DIV2: u128 = 1 / 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:18:23
+   │
+18 │     const DIV3: u16 = 1 / 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:19:23
+   │
+19 │     const DIV4: u32 = 1 / 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:20:24
+   │
+20 │     const DIV5: u256 = 1 / 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:22:22
+   │
+22 │     const MOD0: u8 = 1 % 0;
+   │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:23:23
+   │
+23 │     const MOD1: u64 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:24:24
+   │
+24 │     const MOD2: u128 = 1 % 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:25:23
+   │
+25 │     const MOD3: u16 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:26:23
+   │
+26 │     const MOD4: u32 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:27:24
+   │
+27 │     const MOD5: u256 = 1 % 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:29:22
+   │
+29 │     const ADD0: u8 = 255 + 255;
+   │                      ^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:30:23
+   │
+30 │     const ADD1: u64 = 18446744073709551615 + 18446744073709551615;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:32:9
+   │
+32 │         340282366920938463463374607431768211450 + 340282366920938463463374607431768211450;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:33:23
+   │
+33 │     const ADD3: u16 = 65535 + 65535;
+   │                       ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:34:23
+   │
+34 │     const ADD4: u32 = 4294967295 + 4294967295;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:36:9
+   │
+36 │         115792089237316195423570985008687907853269984665640564039457584007913129639935 + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:38:22
+   │
+38 │     const SUB0: u8 = 0 - 1;
+   │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:39:23
+   │
+39 │     const SUB1: u64 = 0 - 1;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:40:24
+   │
+40 │     const SUB2: u128 = 0 - 1;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:41:23
+   │
+41 │     const SUB3: u16 = 0 - 1;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:42:23
+   │
+42 │     const SUB4: u32 = 0 - 1;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:43:24
+   │
+43 │     const SUB5: u256 = 0 - 1;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:45:23
+   │
+45 │     const CAST0: u8 = ((256: u64) as u8);
+   │                       ^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:46:24
+   │
+46 │     const CAST1: u64 = ((340282366920938463463374607431768211450: u128) as u64);
+   │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:47:25
+   │
+47 │     const CAST4: u128 = ((340282366920938463463374607431768211456: u256) as u128);
+   │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:48:24
+   │
+48 │     const CAST2: u16 = ((65536: u64) as u16);
+   │                        ^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:49:24
+   │
+49 │     const CAST3: u32 = ((4294967296: u128) as u32);
+   │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.move b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.move
new file mode 100644
index 000000000..2d3dc1ea9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants.move
@@ -0,0 +1,51 @@
+address 0x42 {
+module M {
+    const SHL0: u8 = 1 << 8;
+    const SHL1: u64 = 1 << 64;
+    const SHL2: u128 = 1 << 128;
+    const SHL3: u16 = 1 << 16;
+    const SHL4: u32 = 1 << 32;
+
+    const SHR0: u8 = 0 >> 8;
+    const SHR1: u64 = 0 >> 64;
+    const SHR2: u128 = 0 >> 128;
+    const SHR3: u16 = 0 >> 16;
+    const SHR4: u32 = 0 >> 32;
+
+    const DIV0: u8 = 1 / 0;
+    const DIV1: u64 = 1 / 0;
+    const DIV2: u128 = 1 / 0;
+    const DIV3: u16 = 1 / 0;
+    const DIV4: u32 = 1 / 0;
+    const DIV5: u256 = 1 / 0;
+
+    const MOD0: u8 = 1 % 0;
+    const MOD1: u64 = 1 % 0;
+    const MOD2: u128 = 1 % 0;
+    const MOD3: u16 = 1 % 0;
+    const MOD4: u32 = 1 % 0;
+    const MOD5: u256 = 1 % 0;
+
+    const ADD0: u8 = 255 + 255;
+    const ADD1: u64 = 18446744073709551615 + 18446744073709551615;
+    const ADD2: u128 =
+        340282366920938463463374607431768211450 + 340282366920938463463374607431768211450;
+    const ADD3: u16 = 65535 + 65535;
+    const ADD4: u32 = 4294967295 + 4294967295;
+    const ADD5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+    const SUB0: u8 = 0 - 1;
+    const SUB1: u64 = 0 - 1;
+    const SUB2: u128 = 0 - 1;
+    const SUB3: u16 = 0 - 1;
+    const SUB4: u32 = 0 - 1;
+    const SUB5: u256 = 0 - 1;
+
+    const CAST0: u8 = ((256: u64) as u8);
+    const CAST1: u64 = ((340282366920938463463374607431768211450: u128) as u64);
+    const CAST4: u128 = ((340282366920938463463374607431768211456: u256) as u128);
+    const CAST2: u16 = ((65536: u64) as u16);
+    const CAST3: u32 = ((4294967296: u128) as u32);
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp
new file mode 100644
index 000000000..2465f6ced
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp
@@ -0,0 +1,234 @@
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:4:9
+  │
+4 │         (1: u8) << 8;
+  │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:5:9
+  │
+5 │         (1: u64) << 64;
+  │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:6:9
+  │
+6 │         (1: u128) << 128;
+  │         ^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:7:9
+  │
+7 │         (1: u16) << 16;
+  │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:8:9
+  │
+8 │         (1: u32) << 32;
+  │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:10:9
+   │
+10 │         (0: u8) >> 8;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:11:9
+   │
+11 │         (0: u64) >> 64;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:12:9
+   │
+12 │         (0: u128) >> 128;
+   │         ^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:13:9
+   │
+13 │         (0: u16) >> 16;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:14:9
+   │
+14 │         (0: u32) >> 32;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:16:9
+   │
+16 │         (1: u8) / 0;
+   │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:17:9
+   │
+17 │         (1: u64) / 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:18:9
+   │
+18 │         (1: u128) / 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:19:9
+   │
+19 │         (1: u16) / 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:20:9
+   │
+20 │         (1: u32) / 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:21:9
+   │
+21 │         (1: u256) / 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:23:9
+   │
+23 │         (1: u8) % 0;
+   │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:24:9
+   │
+24 │         (1: u64) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:25:9
+   │
+25 │         (1: u128) % 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:26:9
+   │
+26 │         (1: u16) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:27:9
+   │
+27 │         (1: u32) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:28:9
+   │
+28 │         (1: u256) % 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:30:9
+   │
+30 │         (255: u8) + 255;
+   │         ^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:31:9
+   │
+31 │         (18446744073709551615: u64) + 18446744073709551615;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:32:9
+   │
+32 │         (340282366920938463463374607431768211450: u128) + 340282366920938463463374607431768211450;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:33:9
+   │
+33 │         (65535: u16) + 65535;
+   │         ^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:34:9
+   │
+34 │         (4294967295: u32) + 4294967295;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:35:9
+   │
+35 │         (115792089237316195423570985008687907853269984665640564039457584007913129639935: u256) + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:37:9
+   │
+37 │         (0: u8) - 1;
+   │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:38:9
+   │
+38 │         (0: u64) - 1;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:39:9
+   │
+39 │         (0: u128) - 1;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:40:9
+   │
+40 │         (0: u16) - 1;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:41:9
+   │
+41 │         (0: u32) - 1;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:42:9
+   │
+42 │         (0: u256) - 1;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:44:9
+   │
+44 │         ((256: u64) as u8);
+   │         ^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:45:9
+   │
+45 │         ((340282366920938463463374607431768211450: u128) as u64);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:46:9
+   │
+46 │         ((340282366920938463463374607431768211456: u256) as u128);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:47:9
+   │
+47 │         ((65536: u64) as u16);
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:48:9
+   │
+48 │         ((4294967296: u128) as u32);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move
new file mode 100644
index 000000000..de6dbdfe0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move
@@ -0,0 +1,53 @@
+address 0x42 {
+module M {
+    const NO: u8 = {
+        (1: u8) << 8;
+        (1: u64) << 64;
+        (1: u128) << 128;
+        (1: u16) << 16;
+        (1: u32) << 32;
+
+        (0: u8) >> 8;
+        (0: u64) >> 64;
+        (0: u128) >> 128;
+        (0: u16) >> 16;
+        (0: u32) >> 32;
+
+        (1: u8) / 0;
+        (1: u64) / 0;
+        (1: u128) / 0;
+        (1: u16) / 0;
+        (1: u32) / 0;
+        (1: u256) / 0;
+
+        (1: u8) % 0;
+        (1: u64) % 0;
+        (1: u128) % 0;
+        (1: u16) % 0;
+        (1: u32) % 0;
+        (1: u256) % 0;
+
+        (255: u8) + 255;
+        (18446744073709551615: u64) + 18446744073709551615;
+        (340282366920938463463374607431768211450: u128) + 340282366920938463463374607431768211450;
+        (65535: u16) + 65535;
+        (4294967295: u32) + 4294967295;
+        (115792089237316195423570985008687907853269984665640564039457584007913129639935: u256) + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+        (0: u8) - 1;
+        (0: u64) - 1;
+        (0: u128) - 1;
+        (0: u16) - 1;
+        (0: u32) - 1;
+        (0: u256) - 1;
+
+        ((256: u64) as u8);
+        ((340282366920938463463374607431768211450: u128) as u64);
+        ((340282366920938463463374607431768211456: u256) as u128);
+        ((65536: u64) as u16);
+        ((4294967296: u128) as u32);
+
+        0
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.exp
new file mode 100644
index 000000000..d2c6d3bb3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.exp
@@ -0,0 +1,11 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/liveness/copy_after_move.move:5:9
+  │
+4 │         move x;
+  │         ------
+  │         │
+  │         The value of 'x' was previously moved here.
+  │         Suggestion: use 'copy x' to avoid the move.
+5 │         copy x;
+  │         ^^^^^^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.move
new file mode 100644
index 000000000..5d88b7157
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/copy_after_move.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun t0() {
+        let x = 0;
+        move x;
+        copy x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch.move
new file mode 100644
index 000000000..c6a2b28b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch.move
@@ -0,0 +1,54 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+        } else {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t2(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *move x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t3(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *move x_ref = 0;
+        } else {
+            _ = move x_ref;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t4(cond: bool) {
+        let x = cond;
+        let x_ref = &x;
+        if (*x_ref) {
+        } else {
+        };
+        _ = x;
+        _ = move x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both.move
new file mode 100644
index 000000000..54aed54ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both.move
@@ -0,0 +1,26 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *x_ref = 0;
+        } else {
+            _ = x_ref;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            _ = x_ref;
+        } else {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.exp
new file mode 100644
index 000000000..fc7b548b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.exp
@@ -0,0 +1,36 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_branch_both_invalid.move:10:13
+   │
+ 4 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+10 │         _ = x;
+   │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/liveness/dead_refs_branch_both_invalid.move:11:13
+   │
+ 4 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+11 │         _ = move x;
+   │             ^^^^^^ Invalid move of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_branch_both_invalid.move:23:13
+   │
+17 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+23 │         _ = x;
+   │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/liveness/dead_refs_branch_both_invalid.move:24:13
+   │
+17 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+24 │         _ = move x;
+   │             ^^^^^^ Invalid move of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.move
new file mode 100644
index 000000000..120725fe4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_both_invalid.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *x_ref = 0;
+        } else {
+            _ = x_ref;
+        };
+        _ = x;
+        _ = move x;
+        *x_ref = 0;
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            _ = x_ref;
+        } else {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+        _ = *x_ref;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.exp
new file mode 100644
index 000000000..937899e79
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.exp
@@ -0,0 +1,36 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/liveness/dead_refs_branch_invalid.move:8:13
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+  ·
+8 │         _ = x;
+  │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/liveness/dead_refs_branch_invalid.move:9:13
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+  ·
+9 │         _ = move x;
+  │             ^^^^^^ Invalid move of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_branch_invalid.move:20:13
+   │
+15 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+20 │         _ = x;
+   │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/liveness/dead_refs_branch_invalid.move:21:13
+   │
+15 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+21 │         _ = move x;
+   │             ^^^^^^ Invalid move of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.move
new file mode 100644
index 000000000..f3f5dad35
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_branch_invalid.move
@@ -0,0 +1,25 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+        *x_ref = 0;
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+        } else {
+            *x_ref = 0;
+        };
+        _ = x;
+        _ = move x;
+        _ = *x_ref;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop.move
new file mode 100644
index 000000000..f90eac37d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop.move
@@ -0,0 +1,43 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        while (cond) {
+            _ = x_ref;
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t1() {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+           _ = x_ref;
+           break
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t2(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+            if (cond) break else  { _ = x_ref; }
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t4(cond: bool) {
+        let x = cond;
+        let x_ref = &x;
+        while (*x_ref) {
+
+        };
+        _ = x;
+        _ = move x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.exp
new file mode 100644
index 000000000..3c01d675c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.exp
@@ -0,0 +1,27 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/liveness/dead_refs_loop_invalid.move:6:17
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+5 │         while (cond) {
+6 │             _ = x;
+  │                 ^ Invalid copy of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_loop_invalid.move:16:16
+   │
+13 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+16 │            _ = x;
+   │                ^ Invalid copy of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_loop_invalid.move:25:17
+   │
+22 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+25 │             _ = x;
+   │                 ^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.move
new file mode 100644
index 000000000..9d7473ec3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_loop_invalid.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        while (cond) {
+            _ = x;
+            _ = x_ref;
+        }
+    }
+
+    fun t1() {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+           _ = x_ref;
+           _ = x;
+        }
+    }
+
+    fun t2(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+            if (cond) break else  { _ = x_ref; };
+            _ = x;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested.move
new file mode 100644
index 000000000..ccb1d953f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        while (cond) {
+            while (cond) {
+                _ = x_ref
+            }
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t1() {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+           _ = x_ref;
+           loop {
+               _ = x_ref;
+               break
+           };
+           break
+        };
+        _ = x;
+        _ = move x;
+    }
+
+    fun t2(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+            if (cond) { _ = x; break } else { while (!cond) { _ = x_ref } }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.exp
new file mode 100644
index 000000000..ac916732d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.exp
@@ -0,0 +1,27 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/liveness/dead_refs_nested_invalid.move:9:17
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+  ·
+9 │             _ = x;
+  │                 ^ Invalid copy of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_nested_invalid.move:19:20
+   │
+15 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+   ·
+19 │                _ = x;
+   │                    ^ Invalid copy of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_nested_invalid.move:29:71
+   │
+27 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+28 │         loop {
+29 │             if (cond) { _ = x_ref; break } else { while (!cond) { _ = x } }
+   │                                                                       ^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.move
new file mode 100644
index 000000000..17d45cb50
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_nested_invalid.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        while (cond) {
+            while (cond) {
+                _ = x_ref
+            };
+            _ = x;
+        }
+    }
+
+    fun t1() {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+           _ = x_ref;
+           loop {
+               _ = x;
+               break
+           }
+        }
+    }
+
+    fun t2(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        loop {
+            if (cond) { _ = x_ref; break } else { while (!cond) { _ = x } }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple.move
new file mode 100644
index 000000000..7cc0a5749
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun t() {
+        let x = 0;
+        let x_ref = &mut x;
+        *x_ref = 0;
+        _ = x;
+        _ = move x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.exp
new file mode 100644
index 000000000..07fa9c254
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.exp
@@ -0,0 +1,34 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/liveness/dead_refs_simple_invalid.move:5:13
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+5 │         _ = x;
+  │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/liveness/dead_refs_simple_invalid.move:6:13
+  │
+4 │         let x_ref = &mut x;
+  │                     ------ It is still being mutably borrowed by this reference
+5 │         _ = x;
+6 │         _ = move x;
+  │             ^^^^^^ Invalid move of variable 'x'
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/liveness/dead_refs_simple_invalid.move:13:13
+   │
+12 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+13 │         _ = x;
+   │             ^ Invalid copy of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/liveness/dead_refs_simple_invalid.move:14:13
+   │
+12 │         let x_ref = &mut x;
+   │                     ------ It is still being mutably borrowed by this reference
+13 │         _ = x;
+14 │         _ = move x;
+   │             ^^^^^^ Invalid move of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.move
new file mode 100644
index 000000000..e883e9500
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/dead_refs_simple_invalid.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    fun t0() {
+        let x = 0;
+        let x_ref = &mut x;
+        _ = x;
+        _ = move x;
+        *x_ref = 0;
+    }
+
+    fun t1() {
+        let x = 0;
+        let x_ref = &mut x;
+        _ = x;
+        _ = move x;
+        _ = *x_ref;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/explicit_last_copy.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/explicit_last_copy.move
new file mode 100644
index 000000000..5682fc855
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/explicit_last_copy.move
@@ -0,0 +1,52 @@
+module 0x8675309::M {
+    fun t0() {
+        let x = 0;
+        copy x;
+    }
+
+    fun t1() {
+        let x = 0;
+        let x = copy x;
+        x;
+    }
+
+    fun t2(cond: bool) {
+        if (cond) {
+            let x = 0;
+            copy x;
+        }
+    }
+
+    fun t3(cond: bool) {
+        let x = 0;
+        copy x;
+        if (cond) {
+            copy x;
+        }
+    }
+
+    fun t4(cond: bool) {
+        let x = 0;
+        if (cond) {
+            copy x;
+        } else {
+            copy x;
+        }
+    }
+
+    fun t5(cond: bool) {
+        let x = 0;
+        while (cond) {
+            copy x;
+        };
+    }
+
+    fun t6(cond: bool) {
+        let x = 0;
+        while (cond) {
+            copy x;
+        };
+        copy x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/implicit_copy_with_continue.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/implicit_copy_with_continue.move
new file mode 100644
index 000000000..64bd8a024
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/implicit_copy_with_continue.move
@@ -0,0 +1,27 @@
+module 0x42::m {
+    public fun bar() {
+        abort 0
+    }
+
+    public fun foo(_: &u64) {
+        abort 0
+    }
+
+    public fun a() {
+        let index: u64 = 0;
+        let sum = 0;
+        while (index < 10) {
+
+            if (index % 2 == 0) {
+                sum = sum + index
+            } else {
+                index = index + 1;
+                bar();
+                continue
+            };
+
+            index = index + 1;
+        };
+        foo(&sum);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.exp
new file mode 100644
index 000000000..68f174d57
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.exp
@@ -0,0 +1,12 @@
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/move_check/liveness/loop_weirdness.move:9:43
+  │
+9 │                 if (my_local >= 0) { break; };
+  │                                      -----^
+  │                                      │    │
+  │                                      │    Invalid trailing ';'
+  │                                      │    A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │                                      Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.move
new file mode 100644
index 000000000..669c383ab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/loop_weirdness.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    fun t() {
+        let x = 0;
+        let t = 1;
+
+        if (x >= 0) {
+            loop {
+                let my_local = 0;
+                if (my_local >= 0) { break; };
+            };
+            x = 1
+        };
+        t;
+        x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.exp
new file mode 100644
index 000000000..4f45e29d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.exp
@@ -0,0 +1,20 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/liveness/move_in_infinite_loop_branched.move:5:28
+  │
+5 │             loop { let y = move x; y / y; }
+  │                            ^^^^^^
+  │                            │
+  │                            Invalid usage of previously moved variable 'x'.
+  │                            Suggestion: use 'copy x' to avoid the move.
+  │                            In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/liveness/move_in_infinite_loop_branched.move:7:28
+  │
+7 │             loop { let y = move x; y % y; }
+  │                            ^^^^^^
+  │                            │
+  │                            Invalid usage of previously moved variable 'x'.
+  │                            Suggestion: use 'copy x' to avoid the move.
+  │                            In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.move
new file mode 100644
index 000000000..5ec84ca16
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/move_in_infinite_loop_branched.move
@@ -0,0 +1,10 @@
+script {
+    fun main(cond: bool) {
+        let x = 0;
+        if (cond) {
+            loop { let y = move x; y / y; }
+        } else {
+            loop { let y = move x; y % y; }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.exp
new file mode 100644
index 000000000..1c5a311db
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.exp
@@ -0,0 +1,116 @@
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/move_check/liveness/trailing_semi.move:3:15
+  │
+3 │         return;
+  │         ------^
+  │         │     │
+  │         │     Invalid trailing ';'
+  │         │     A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │         Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/move_check/liveness/trailing_semi.move:9:16
+  │
+9 │         abort 0;
+  │         -------^
+  │         │      │
+  │         │      Invalid trailing ';'
+  │         │      A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │         Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:15:19
+   │
+15 │         { return };
+   │           ------  ^
+   │           │       │
+   │           │       Invalid trailing ';'
+   │           │       A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │           Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:21:20
+   │
+21 │         { abort 0 };
+   │           -------  ^
+   │           │        │
+   │           │        Invalid trailing ';'
+   │           │        A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │           Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:29:19
+   │
+29 │             return;
+   │             ------^
+   │             │     │
+   │             │     Invalid trailing ';'
+   │             │     A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │             Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:43:14
+   │  
+39 │ ╭             if (cond) {
+40 │ │                 return
+41 │ │             } else {
+42 │ │                 abort 0
+43 │ │             };
+   │ │              ^
+   │ │              │
+   │ │              Invalid trailing ';'
+   │ │              A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │ ╰─────────────' Any code after this expression will not be reached
+   │  
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:52:24
+   │
+52 │                 abort 0;
+   │                 -------^
+   │                 │      │
+   │                 │      Invalid trailing ';'
+   │                 │      A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │                 Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:54:23
+   │
+54 │                 return;
+   │                 ------^
+   │                 │     │
+   │                 │     Invalid trailing ';'
+   │                 │     A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │                 Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi.move:55:14
+   │  
+51 │ ╭             if (cond) {
+52 │ │                 abort 0;
+53 │ │             } else {
+54 │ │                 return;
+55 │ │             };
+   │ │              ^
+   │ │              │
+   │ │              Invalid trailing ';'
+   │ │              A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │ ╰─────────────' Any code after this expression will not be reached
+   │  
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.move
new file mode 100644
index 000000000..481e987c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi.move
@@ -0,0 +1,58 @@
+script {
+    fun main() {
+        return;
+    }
+}
+
+script {
+    fun main() {
+        abort 0;
+    }
+}
+
+script {
+    fun main() {
+        { return };
+    }
+}
+
+script {
+    fun main() {
+        { abort 0 };
+    }
+}
+
+
+script {
+    fun main(cond: bool) {
+        if (cond) {
+            return;
+        } else {
+            ()
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        {
+            if (cond) {
+                return
+            } else {
+                abort 0
+            };
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        {
+            if (cond) {
+                abort 0;
+            } else {
+                return;
+            };
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.exp
new file mode 100644
index 000000000..e053a48cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.exp
@@ -0,0 +1,201 @@
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/move_check/liveness/trailing_semi_loops.move:3:16
+  │
+3 │         loop ();
+  │         -------^
+  │         │      │
+  │         │      Invalid trailing ';'
+  │         │      A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │         Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/move_check/liveness/trailing_semi_loops.move:9:26
+  │
+9 │         { (loop (): ()) };
+  │            -------       ^
+  │            │             │
+  │            │             Invalid trailing ';'
+  │            │             A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │            Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:18:10
+   │  
+15 │ ╭         loop {
+16 │ │             let x = 0;
+17 │ │             0 + x + 0;
+18 │ │         };
+   │ │          ^
+   │ │          │
+   │ │          Invalid trailing ';'
+   │ │          A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │ ╰─────────' Any code after this expression will not be reached
+   │  
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:27:26
+   │
+27 │             let _: u64 = if (true) break else break;
+   │                          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:35:18
+   │
+35 │             break;
+   │             -----^
+   │             │    │
+   │             │    Invalid trailing ';'
+   │             │    A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │             Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:44:22
+   │
+44 │                 break;
+   │                 -----^
+   │                 │    │
+   │                 │    Invalid trailing ';'
+   │                 │    A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │                 Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:55:42
+   │
+55 │             if (cond) continue else break;
+   │             -----------------------------^
+   │             │                            │
+   │             │                            Invalid trailing ';'
+   │             │                            A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │             Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:63:42
+   │
+63 │             if (cond) abort 0 else return;
+   │             -----------------------------^
+   │             │                            │
+   │             │                            Invalid trailing ';'
+   │             │                            A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │             Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:76:17
+   │
+76 │                 x = 2;
+   │                 ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:78:14
+   │  
+72 │ ╭             if (cond) {
+73 │ │                 x = 1;
+74 │ │                 break
+75 │ │             } else {
+76 │ │                 x = 2;
+77 │ │                 continue
+78 │ │             };
+   │ │              ^
+   │ │              │
+   │ │              Invalid trailing ';'
+   │ │              A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │ ╰─────────────' Any code after this expression will not be reached
+   │  
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:88:22
+   │
+88 │                 break;
+   │                 -----^
+   │                 │    │
+   │                 │    Invalid trailing ';'
+   │                 │    A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │                 Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:90:25
+   │
+90 │                 continue;
+   │                 --------^
+   │                 │       │
+   │                 │       Invalid trailing ';'
+   │                 │       A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │                 Any code after this expression will not be reached
+   │
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+   ┌─ tests/move_check/liveness/trailing_semi_loops.move:91:14
+   │  
+87 │ ╭             if (cond) {
+88 │ │                 break;
+89 │ │             } else {
+90 │ │                 continue;
+91 │ │             };
+   │ │              ^
+   │ │              │
+   │ │              Invalid trailing ';'
+   │ │              A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+   │ ╰─────────────' Any code after this expression will not be reached
+   │  
+   = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+    ┌─ tests/move_check/liveness/trailing_semi_loops.move:100:23
+    │
+100 │                 return;
+    │                 ------^
+    │                 │     │
+    │                 │     Invalid trailing ';'
+    │                 │     A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+    │                 Any code after this expression will not be reached
+    │
+    = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+    ┌─ tests/move_check/liveness/trailing_semi_loops.move:102:24
+    │
+102 │                 abort 0;
+    │                 -------^
+    │                 │      │
+    │                 │      Invalid trailing ';'
+    │                 │      A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+    │                 Any code after this expression will not be reached
+    │
+    = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09004]: unnecessary trailing semicolon
+    ┌─ tests/move_check/liveness/trailing_semi_loops.move:103:14
+    │  
+ 99 │ ╭             if (cond) {
+100 │ │                 return;
+101 │ │             } else {
+102 │ │                 abort 0;
+103 │ │             };
+    │ │              ^
+    │ │              │
+    │ │              Invalid trailing ';'
+    │ │              A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+    │ ╰─────────────' Any code after this expression will not be reached
+    │  
+    = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.move
new file mode 100644
index 000000000..0d042a9a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/trailing_semi_loops.move
@@ -0,0 +1,106 @@
+script {
+    fun main() {
+        loop ();
+    }
+}
+
+script {
+    fun main() {
+        { (loop (): ()) };
+    }
+}
+
+script {
+    fun main() {
+        loop {
+            let x = 0;
+            0 + x + 0;
+        };
+    }
+}
+
+script {
+    fun main() {
+        loop {
+            // TODO can probably improve this message,
+            // but its different than the normal trailing case
+            let _: u64 = if (true) break else break;
+        }
+    }
+}
+
+script {
+    fun main() {
+        loop {
+            break;
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        loop {
+            if (cond) {
+                break;
+            } else {
+                ()
+            }
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        loop {
+            if (cond) continue else break;
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        loop {
+            if (cond) abort 0 else return;
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        let x;
+        loop {
+            if (cond) {
+                x = 1;
+                break
+            } else {
+                x = 2;
+                continue
+            };
+        };
+        x;
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        loop {
+            if (cond) {
+                break;
+            } else {
+                continue;
+            };
+        }
+    }
+}
+
+script {
+    fun main(cond: bool) {
+        loop {
+            if (cond) {
+                return;
+            } else {
+                abort 0;
+            };
+        }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.exp b/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.exp
new file mode 100644
index 000000000..3a795cd1f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.exp
@@ -0,0 +1,72 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/liveness/unused_assignment.move:3:13
+  │
+3 │         let x = 0;
+  │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/liveness/unused_assignment.move:7:13
+  │
+7 │         let x = 0;
+  │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/liveness/unused_assignment.move:8:9
+  │
+8 │         x = 0;
+  │         ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:13:17
+   │
+13 │             let x = 0;
+   │                 ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:21:13
+   │
+21 │             x = 0;
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:26:13
+   │
+26 │         let x = 0;
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:28:13
+   │
+28 │             x = 1;
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:30:13
+   │
+30 │             x = 2;
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/liveness/unused_assignment.move:41:13
+   │
+41 │             x = 1;
+   │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.move b/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.move
new file mode 100644
index 000000000..6b0516e51
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/liveness/unused_assignment.move
@@ -0,0 +1,45 @@
+module 0x8675309::M {
+    fun t0() {
+        let x = 0;
+    }
+
+    fun t1() {
+        let x = 0;
+        x = 0;
+    }
+
+    fun t2(cond: bool) {
+        if (cond) {
+            let x = 0;
+        }
+    }
+
+    fun t3(cond: bool) {
+        let x = 0;
+        x;
+        if (cond) {
+            x = 0;
+        }
+    }
+
+    fun t4(cond: bool) {
+        let x = 0;
+        if (cond) {
+            x = 1;
+        } else {
+            x = 2;
+        }
+    }
+
+    fun t5(cond: bool) {
+        let x;
+        while (cond) {
+            x = 0;
+            if (cond) {
+                x;
+            };
+            x = 1;
+        }
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.exp
new file mode 100644
index 000000000..58628f147
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.exp
@@ -0,0 +1,121 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/locals/assign_partial_resource.move:6:21
+  │
+6 │         if (cond) { r = R{}; };
+  │                     ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/locals/assign_partial_resource.move:7:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let r: R;
+  │                - The type '0x8675309::M::R' does not have the ability 'drop'
+6 │         if (cond) { r = R{}; };
+  │                     - The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+7 │         r = R{};
+  │         ^ Invalid assignment to variable 'r'
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/assign_partial_resource.move:13:29
+   │
+13 │         if (cond) {} else { r = R{}; };
+   │                             ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_partial_resource.move:14:9
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+12 │         let r: R;
+   │                - The type '0x8675309::M::R' does not have the ability 'drop'
+13 │         if (cond) {} else { r = R{}; };
+   │                             - The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+14 │         r = R{};
+   │         ^ Invalid assignment to variable 'r'
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/assign_partial_resource.move:20:24
+   │
+20 │         while (cond) { r = R{} };
+   │                        ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_partial_resource.move:20:24
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+19 │         let r: R;
+   │                - The type '0x8675309::M::R' does not have the ability 'drop'
+20 │         while (cond) { r = R{} };
+   │                        ^
+   │                        │
+   │                        Invalid assignment to variable 'r'
+   │                        The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_partial_resource.move:21:9
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+19 │         let r: R;
+   │                - The type '0x8675309::M::R' does not have the ability 'drop'
+20 │         while (cond) { r = R{} };
+   │                        - The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+21 │         r = R{};
+   │         ^ Invalid assignment to variable 'r'
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/assign_partial_resource.move:27:16
+   │
+27 │         loop { r = R{} }
+   │                ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_partial_resource.move:27:16
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+26 │         let r: R;
+   │                - The type '0x8675309::M::R' does not have the ability 'drop'
+27 │         loop { r = R{} }
+   │                ^
+   │                │
+   │                Invalid assignment to variable 'r'
+   │                The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_partial_resource.move:31:21
+   │
+30 │     fun t5<T>(cond: bool, x: T, y: T): (T, T) {
+   │            -              -  - The type 'T' does not have the ability 'drop'
+   │            │              │   
+   │            │              The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+   │            To satisfy the constraint, the 'drop' ability would need to be added here
+31 │         if (cond) { x = y };
+   │                     ^ Invalid assignment to variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/assign_partial_resource.move:32:13
+   │
+31 │         if (cond) { x = y };
+   │                         -
+   │                         │
+   │                         The value of 'y' might have been previously moved here.
+   │                         Suggestion: use 'copy y' to avoid the move.
+32 │         (x, y)
+   │             ^ Invalid usage of previously moved variable 'y'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.move b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.move
new file mode 100644
index 000000000..6b7794772
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_partial_resource.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t1(cond: bool) {
+        let r: R;
+        if (cond) { r = R{}; };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r: R;
+        if (cond) {} else { r = R{}; };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r: R;
+        while (cond) { r = R{} };
+        r = R{};
+        R{} = r;
+    }
+
+    fun t4() {
+        let r: R;
+        loop { r = R{} }
+    }
+
+    fun t5<T>(cond: bool, x: T, y: T): (T, T) {
+        if (cond) { x = y };
+        (x, y)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.exp
new file mode 100644
index 000000000..352f67613
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.exp
@@ -0,0 +1,92 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/locals/assign_resource.move:5:13
+  │
+5 │         let r = R{};
+  │             ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/locals/assign_resource.move:6:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let r = R{};
+  │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │    
+  │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+6 │         r = R{};
+  │         ^ Invalid assignment to variable 'r'
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_resource.move:12:21
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+12 │         if (cond) { r = R{}; };
+   │                     ^ Invalid assignment to variable 'r'
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_resource.move:18:29
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+17 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+18 │         if (cond) {} else { r = R{}; };
+   │                             ^ Invalid assignment to variable 'r'
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_resource.move:24:24
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+23 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+24 │         while (cond) { r = R{} };
+   │                        ^ Invalid assignment to variable 'r'
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/assign_resource.move:29:13
+   │
+29 │         let r = R{};
+   │             ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_resource.move:30:16
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+29 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+30 │         loop { r = R{}; R {} = r }
+   │                ^ Invalid assignment to variable 'r'
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/assign_resource.move:34:9
+   │
+33 │     fun t5<T>(x: T, y: T): T {
+   │            -  -  - The type 'T' does not have the ability 'drop'
+   │            │  │   
+   │            │  The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+   │            To satisfy the constraint, the 'drop' ability would need to be added here
+34 │         x = y;
+   │         ^ Invalid assignment to variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.move b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.move
new file mode 100644
index 000000000..cd6ace6d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/assign_resource.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let r = R{};
+        r = R{};
+        R{} = r;
+    }
+
+    fun t1(cond: bool) {
+        let r = R{};
+        if (cond) { r = R{}; };
+        R{} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r = R{};
+        if (cond) {} else { r = R{}; };
+        R{} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r = R{};
+        while (cond) { r = R{} };
+        R{} = r;
+    }
+
+    fun t4() {
+        let r = R{};
+        loop { r = R{}; R {} = r }
+    }
+
+    fun t5<T>(x: T, y: T): T {
+        x = y;
+        x
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.exp
new file mode 100644
index 000000000..423a30e70
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.exp
@@ -0,0 +1,25 @@
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/drop_conditional.move:14:11
+   │
+11 │         let x = Cup<R> { f: R{} };
+   │             -   -----------------
+   │             │   │   │
+   │             │   │   The type '0x42::M::Cup<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │             │   The type '0x42::M::Cup<0x42::M::R>' does not have the ability 'drop'
+   │             The local variable 'x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+   ·
+14 │         &x;
+   │           ^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/drop_conditional.move:14:11
+   │
+13 │         let x = Pair<S, R> { f1: S{}, f2: R{} };
+   │             -   -------------------------------
+   │             │   │       │
+   │             │   │       The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │             │   The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' does not have the ability 'drop'
+   │             The local variable 'x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+14 │         &x;
+   │           ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.move b/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.move
new file mode 100644
index 000000000..89b0f81a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/drop_conditional.move
@@ -0,0 +1,17 @@
+address 0x42 {
+module M {
+
+    struct Cup<T> has drop { f: T }
+    struct Pair<T1, T2> has drop { f1: T1, f2: T2 }
+    struct R {}
+    struct S has drop {}
+
+    // Error on a type that can have the drop ability, but the instantiation does not
+    fun t() {
+        let x = Cup<R> { f: R{} };
+        &x;
+        let x = Pair<S, R> { f1: S{}, f2: R{} };
+        &x;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.exp
new file mode 100644
index 000000000..3199c2d61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.exp
@@ -0,0 +1,24 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/locals/eliminate_temps.move:7:47
+  │
+7 │         let (boom, u): (&u64, u64) = (&mut x, x);
+  │                                       ------  ^ Invalid copy of variable 'x'
+  │                                       │        
+  │                                       It is still being mutably borrowed by this reference
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/locals/eliminate_temps.move:14:39
+   │
+14 │         let (f, u): (&u64, u64) = (r, *r);
+   │                                    -  ^^ Invalid dereference.
+   │                                    │   
+   │                                    It is still being mutably borrowed by this reference
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/locals/eliminate_temps.move:20:46
+   │
+20 │         let (f, u): (&u64, u64) = (&mut s.f, s.f);
+   │                                    --------  ^^^ Invalid immutable borrow at field 'f'.
+   │                                    │          
+   │                                    Field 'f' is still being mutably borrowed by this reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.move b/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.move
new file mode 100644
index 000000000..6cec415a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/eliminate_temps.move
@@ -0,0 +1,24 @@
+module 0x8675309::M {
+    struct S has drop {f: u64}
+    struct R has key {}
+
+    public fun borrow_local(x: u64): u64 {
+        // implicit freeze creates a temp local. If the temp is inlined, the copy won't fail
+        let (boom, u): (&u64, u64) = (&mut x, x);
+        *boom + u + x
+    }
+
+    public fun deref(x: u64): u64 {
+        let r = &mut x;
+        // implicit freeze creates a temp local. If the temp is inlined, the deref won't fail
+        let (f, u): (&u64, u64) = (r, *r);
+        *f + u + x
+    }
+
+    public fun borrow_field(s: &mut S): u64 {
+        // implicit freeze creates a temp local. If the temp is inlined, the borrow field won't fail
+        let (f, u): (&u64, u64) = (&mut s.f, s.f);
+        *f + u
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.exp
new file mode 100644
index 000000000..472e06309
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.exp
@@ -0,0 +1,16 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/locals/reassign_parameter.move:7:9
+  │  
+2 │       struct R {}
+  │              - To satisfy the constraint, the 'drop' ability would need to be added here
+3 │   
+4 │       public fun reassign_parameter(r: R) {
+  │                                        - The type '0x8675309::M::R' does not have the ability 'drop'
+5 │           let R { } = r;
+6 │           r = R {};
+  │           - The parameter 'r' might still contain a value. The value does not have the 'drop' ability and must be consumed before the function returns
+7 │ ╭         if  (true) {
+8 │ │             let R { } = r;
+9 │ │         }
+  │ ╰─────────^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.move b/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.move
new file mode 100644
index 000000000..c35f10402
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/reassign_parameter.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct R {}
+
+    public fun reassign_parameter(r: R) {
+        let R { } = r;
+        r = R {};
+        if  (true) {
+            let R { } = r;
+        }
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.exp
new file mode 100644
index 000000000..08651810e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.exp
@@ -0,0 +1,24 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/locals/unused_copyable.move:5:12
+  │
+5 │     fun t0(i: u64, s: S) {
+  │            ^ Unused parameter 'i'. Consider removing or prefixing with an underscore: '_i'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/locals/unused_copyable.move:5:20
+  │
+5 │     fun t0(i: u64, s: S) {
+  │                    ^ Unused parameter 's'. Consider removing or prefixing with an underscore: '_s'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/locals/unused_copyable.move:9:13
+  │
+9 │         let s = S{};
+  │             ^ Unused assignment for variable 's'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_s')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.move b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.move
new file mode 100644
index 000000000..db26cb543
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_copyable.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct S has drop {}
+
+    // this produces unused parameter warnings for i and s, but not unused resource warnings
+    fun t0(i: u64, s: S) {
+    }
+
+    fun t1() {
+        let s = S{};
+    }
+
+    fun t2() {
+        // prefixing an unused non-resource with _ suppresses the warning
+        let _s = S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.exp
new file mode 100644
index 000000000..ffd220910
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.exp
@@ -0,0 +1,150 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/locals/unused_resource.move:5:13
+  │
+5 │         let r = R{};
+  │             ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/locals/unused_resource.move:5:20
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let r = R{};
+  │             -   ---^ Invalid return
+  │             │   │   
+  │             │   The type '0x8675309::M::R' does not have the ability 'drop'
+  │             The local variable 'r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:10:21
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+10 │         let _r = R{};
+   │             --   ---^ Invalid return
+   │             │    │   
+   │             │    The type '0x8675309::M::R' does not have the ability 'drop'
+   │             The local variable '_r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/unused_resource.move:15:21
+   │
+15 │         if (cond) { r = R{}; };
+   │                     ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:15:31
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+15 │         if (cond) { r = R{}; };
+   │                     -   ---   ^ Invalid return
+   │                     │   │      
+   │                     │   The type '0x8675309::M::R' does not have the ability 'drop'
+   │                     The local variable 'r' might still contain a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/unused_resource.move:20:29
+   │
+20 │         if (cond) {} else { r = R{}; };
+   │                             ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:20:39
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+20 │         if (cond) {} else { r = R{}; };
+   │                             -   ---   ^ Invalid return
+   │                             │   │      
+   │                             │   The type '0x8675309::M::R' does not have the ability 'drop'
+   │                             The local variable 'r' might still contain a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/unused_resource.move:25:24
+   │
+25 │         while (cond) { r = R{} };
+   │                        ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:25:24
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+25 │         while (cond) { r = R{} };
+   │                        ^   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │                        │    
+   │                        Invalid assignment to variable 'r'
+   │                        The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:25:33
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+25 │         while (cond) { r = R{} };
+   │                        -   ---  ^ Invalid return
+   │                        │   │     
+   │                        │   The type '0x8675309::M::R' does not have the ability 'drop'
+   │                        The local variable 'r' might still contain a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/unused_resource.move:29:20
+   │
+29 │         loop { let r = R{}; }
+   │                    ^ Unused assignment for variable 'r'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:29:20
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+29 │         loop { let r = R{}; }
+   │                    ^   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │                    │    
+   │                    Invalid assignment to variable 'r'
+   │                    The variable might contain a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:33:21
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+33 │         let _ = &R{};
+   │                  ---^ Invalid return
+   │                  │   
+   │                  The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                  The type '0x8675309::M::R' does not have the ability 'drop'
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource.move:36:22
+   │  
+ 2 │       struct R {}
+   │              - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·  
+36 │       fun t7<T>(_x: R) {
+   │                 --  - The type '0x8675309::M::R' does not have the ability 'drop'
+   │                 │    
+   │                 The parameter '_x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+   │ ╭──────────────────────^
+37 │ │     }
+   │ ╰─────^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.move b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.move
new file mode 100644
index 000000000..4121a8c05
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let r = R{};
+    }
+
+    fun t1() {
+        // prefixing an unused resource with _ does not work
+        let _r = R{};
+    }
+
+    fun t2(cond: bool) {
+        let r;
+        if (cond) { r = R{}; };
+    }
+
+    fun t3(cond: bool) {
+        let r;
+        if (cond) {} else { r = R{}; };
+    }
+
+    fun t4(cond: bool) {
+        let r;
+        while (cond) { r = R{} };
+    }
+
+    fun t5() {
+        loop { let r = R{}; }
+    }
+
+    fun t6() {
+        let _ = &R{};
+    }
+
+    fun t7<T>(_x: R) {
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.exp
new file mode 100644
index 000000000..b0bb82d79
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.exp
@@ -0,0 +1,88 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/locals/unused_resource_explicit_return.move:5:13
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let _ = R{};
+  │             ^   --- The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │    
+  │             Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:11:21
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+10 │         let r = R {};
+   │             -   ---- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The local variable 'r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+11 │         if (cond) { return () };
+   │                     ^^^^^^^^^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:17:29
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+16 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The local variable 'r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+17 │         if (cond) {} else { return () };
+   │                             ^^^^^^^^^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:23:24
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+22 │         let r = R {};
+   │             -   ---- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The local variable 'r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+23 │         while (cond) { return () };
+   │                        ^^^^^^^^^ Invalid return
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:28:13
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+28 │         let _ = R{};
+   │             ^   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:34:9
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+33 │         let _ = &R{};
+   │                  ---
+   │                  │
+   │                  The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                  The type '0x8675309::M::R' does not have the ability 'drop'
+34 │         return ()
+   │         ^^^^^^^^^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/locals/unused_resource_explicit_return.move:38:9
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+37 │     fun t6<T>(_x: R) {
+   │               --  - The type '0x8675309::M::R' does not have the ability 'drop'
+   │               │    
+   │               The parameter '_x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+38 │         return ()
+   │         ^^^^^^^^^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.move b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.move
new file mode 100644
index 000000000..676d5cd68
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/unused_resource_explicit_return.move
@@ -0,0 +1,40 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let _ = R{};
+        return ()
+    }
+
+    fun t1(cond: bool) {
+        let r = R {};
+        if (cond) { return () };
+        R {} = r;
+    }
+
+    fun t2(cond: bool) {
+        let r = R{};
+        if (cond) {} else { return () };
+        R {} = r;
+    }
+
+    fun t3(cond: bool) {
+        let r = R {};
+        while (cond) { return () };
+        R {} = r;
+    }
+
+    fun t4() {
+        let _ = R{};
+        loop { return () }
+    }
+
+    fun t5() {
+        let _ = &R{};
+        return ()
+    }
+
+    fun t6<T>(_x: R) {
+        return ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.exp
new file mode 100644
index 000000000..7b0e8c7f8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.exp
@@ -0,0 +1,33 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_if.move:5:17
+  │
+4 │         if (cond) { _ = move x };
+  │                         ------
+  │                         │
+  │                         The value of 'x' might have been previously moved here.
+  │                         Suggestion: use 'copy x' to avoid the move.
+5 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if.move:11:17
+   │
+10 │         if (cond) { _ = move x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' might have been previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+11 │         let _ = x + 1;
+   │                 ^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if.move:17:17
+   │
+16 │         if (cond) { _ = move x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' might have been previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+17 │         let _ = &x;
+   │                 ^^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.move
new file mode 100644
index 000000000..dacda0340
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    fun tmove(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x };
+        let _ = move x + 1;
+    }
+
+    fun tcopy(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x };
+        let _ = x + 1;
+    }
+
+    fun tborrow(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x };
+        let _ = &x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.exp
new file mode 100644
index 000000000..f6dd5b611
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.exp
@@ -0,0 +1,66 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_if_else.move:5:17
+  │
+4 │         if (cond) { _ = move x } else { _ = move x };
+  │                         ------
+  │                         │
+  │                         The value of 'x' was previously moved here.
+  │                         Suggestion: use 'copy x' to avoid the move.
+5 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if_else.move:11:17
+   │
+10 │         if (cond) { _ = move x } else { _ = x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' might have been previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+11 │         let _ = move x + 1;
+   │                 ^^^^^^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if_else.move:17:17
+   │
+16 │         if (cond) { _ = move x } else { _ = move x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' was previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+17 │         let _ = x + 1;
+   │                 ^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if_else.move:24:17
+   │
+23 │         if (cond) { _ = move x } else { _ = x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' might have been previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+24 │         let _ = x + 1;
+   │                 ^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if_else.move:30:17
+   │
+29 │         if (cond) { _ = move x } else { _ = move x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' was previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+30 │         let _ = &x;
+   │                 ^^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_if_else.move:36:17
+   │
+35 │         if (cond) { _ = move x } else { _ = x };
+   │                         ------
+   │                         │
+   │                         The value of 'x' might have been previously moved here.
+   │                         Suggestion: use 'copy x' to avoid the move.
+36 │         let _ = &x;
+   │                 ^^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.move
new file mode 100644
index 000000000..d3e6f60cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_if_else.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    fun tmove1(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x } else { _ = move x };
+        let _ = move x + 1;
+    }
+
+    fun tmove2(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x } else { _ = x };
+        let _ = move x + 1;
+    }
+
+    fun tcopy1(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x } else { _ = move x };
+        let _ = x + 1;
+    }
+
+    fun tcopy2(cond: bool) {
+
+        let x = 0;
+        if (cond) { _ = move x } else { _ = x };
+        let _ = x + 1;
+    }
+
+    fun tborrow1(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x } else { _ = move x };
+        let _ = &x;
+    }
+
+    fun tborrow2(cond: bool) {
+        let x = 0;
+        if (cond) { _ = move x } else { _ = x };
+        let _ = &x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.exp
new file mode 100644
index 000000000..7f21aa643
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.exp
@@ -0,0 +1,80 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_loop.move:4:20
+  │
+4 │         loop { _ = move x }
+  │                    ^^^^^^
+  │                    │
+  │                    Invalid usage of previously moved variable 'x'.
+  │                    Suggestion: use 'copy x' to avoid the move.
+  │                    In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_loop.move:9:37
+  │
+9 │         loop { if (cond) break; _ = move x }
+  │                                     ^^^^^^
+  │                                     │
+  │                                     Invalid usage of previously moved variable 'x'.
+  │                                     Suggestion: use 'copy x' to avoid the move.
+  │                                     In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:14:24
+   │
+14 │         loop { let y = x; _ = move x; y; }
+   │                        ^      ------
+   │                        │      │
+   │                        │      The value of 'x' might have been previously moved here.
+   │                        │      Suggestion: use 'copy x' to avoid the move.
+   │                        Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:14:31
+   │
+14 │         loop { let y = x; _ = move x; y; }
+   │                               ^^^^^^
+   │                               │
+   │                               Invalid usage of previously moved variable 'x'.
+   │                               Suggestion: use 'copy x' to avoid the move.
+   │                               In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:19:24
+   │
+19 │         loop { let y = x; if (cond) continue; _ = move x; y; }
+   │                        ^                          ------
+   │                        │                          │
+   │                        │                          The value of 'x' might have been previously moved here.
+   │                        │                          Suggestion: use 'copy x' to avoid the move.
+   │                        Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:19:51
+   │
+19 │         loop { let y = x; if (cond) continue; _ = move x; y; }
+   │                                                   ^^^^^^
+   │                                                   │
+   │                                                   Invalid usage of previously moved variable 'x'.
+   │                                                   Suggestion: use 'copy x' to avoid the move.
+   │                                                   In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:24:24
+   │
+24 │         loop { let y = &x; _ = move y; _ = move x }
+   │                        ^^                  ------
+   │                        │                   │
+   │                        │                   The value of 'x' might have been previously moved here.
+   │                        │                   Suggestion: use 'copy x' to avoid the move.
+   │                        Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_loop.move:24:44
+   │
+24 │         loop { let y = &x; _ = move y; _ = move x }
+   │                                            ^^^^^^
+   │                                            │
+   │                                            Invalid usage of previously moved variable 'x'.
+   │                                            Suggestion: use 'copy x' to avoid the move.
+   │                                            In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.move
new file mode 100644
index 000000000..57084fe07
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_loop.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    fun tmove1() {
+        let x = 0;
+        loop { _ = move x }
+    }
+
+    fun tmove2(cond: bool) {
+        let x = 0;
+        loop { if (cond) break; _ = move x }
+    }
+
+    fun tcopy1() {
+        let x = 0;
+        loop { let y = x; _ = move x; y; }
+    }
+
+    fun tcopy2(cond: bool) {
+        let x = 0;
+        loop { let y = x; if (cond) continue; _ = move x; y; }
+    }
+
+    fun tborrow1() {
+        let x = 0;
+        loop { let y = &x; _ = move y; _ = move x }
+    }
+
+    fun tborrow2(cond: bool) {
+        let x = 0;
+        loop { let y = &x; _ = move y; if (cond) {_ = move x }; break }
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.exp
new file mode 100644
index 000000000..53d07b25f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.exp
@@ -0,0 +1,33 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_simple.move:7:17
+  │
+6 │         move x;
+  │         ------
+  │         │
+  │         The value of 'x' was previously moved here.
+  │         Suggestion: use 'copy x' to avoid the move.
+7 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_simple.move:17:17
+   │
+16 │         move x;
+   │         ------
+   │         │
+   │         The value of 'x' was previously moved here.
+   │         Suggestion: use 'copy x' to avoid the move.
+17 │         let _ = x + 1;
+   │                 ^ Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_simple.move:27:17
+   │
+26 │         move x;
+   │         ------
+   │         │
+   │         The value of 'x' was previously moved here.
+   │         Suggestion: use 'copy x' to avoid the move.
+27 │         let _ = &x;
+   │                 ^^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.move
new file mode 100644
index 000000000..bf4e34d12
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_simple.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct S has copy, drop {}
+
+    fun tmove() {
+        let x = 0;
+        move x;
+        let _ = move x + 1;
+
+        let s = S{};
+        let _s2 = s;
+        let _s3 = s;
+    }
+
+    fun tcopy() {
+        let x = 0;
+        move x;
+        let _ = x + 1;
+
+        let s = S{};
+        let _s2 = s;
+        let _s3 = copy s;
+    }
+
+    fun tborrow() {
+        let x = 0;
+        move x;
+        let _ = &x;
+
+        let s = S{};
+        let _s2 = s;
+        let _s3 = &s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.exp
new file mode 100644
index 000000000..f0c950d97
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.exp
@@ -0,0 +1,80 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_while.move:4:28
+  │
+4 │         while (cond) { _ = move x };
+  │                            ^^^^^^
+  │                            │
+  │                            Invalid usage of previously moved variable 'x'.
+  │                            Suggestion: use 'copy x' to avoid the move.
+  │                            In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_after_move_while.move:9:45
+  │
+9 │         while (cond) { if (cond) break; _ = move x };
+  │                                             ^^^^^^
+  │                                             │
+  │                                             Invalid usage of previously moved variable 'x'.
+  │                                             Suggestion: use 'copy x' to avoid the move.
+  │                                             In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:14:32
+   │
+14 │         while (cond) { let y = x; _ = move x; y; };
+   │                                ^      ------
+   │                                │      │
+   │                                │      The value of 'x' might have been previously moved here.
+   │                                │      Suggestion: use 'copy x' to avoid the move.
+   │                                Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:14:39
+   │
+14 │         while (cond) { let y = x; _ = move x; y; };
+   │                                       ^^^^^^
+   │                                       │
+   │                                       Invalid usage of previously moved variable 'x'.
+   │                                       Suggestion: use 'copy x' to avoid the move.
+   │                                       In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:19:32
+   │
+19 │         while (cond) { let y = x; if (cond) continue; _ = move x; y; };
+   │                                ^                          ------
+   │                                │                          │
+   │                                │                          The value of 'x' might have been previously moved here.
+   │                                │                          Suggestion: use 'copy x' to avoid the move.
+   │                                Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:19:59
+   │
+19 │         while (cond) { let y = x; if (cond) continue; _ = move x; y; };
+   │                                                           ^^^^^^
+   │                                                           │
+   │                                                           Invalid usage of previously moved variable 'x'.
+   │                                                           Suggestion: use 'copy x' to avoid the move.
+   │                                                           In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:24:32
+   │
+24 │         while (cond) { let y = &x; _ = move y; _ = move x };
+   │                                ^^                  ------
+   │                                │                   │
+   │                                │                   The value of 'x' might have been previously moved here.
+   │                                │                   Suggestion: use 'copy x' to avoid the move.
+   │                                Invalid usage of previously moved variable 'x'.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_after_move_while.move:24:52
+   │
+24 │         while (cond) { let y = &x; _ = move y; _ = move x };
+   │                                                    ^^^^^^
+   │                                                    │
+   │                                                    Invalid usage of previously moved variable 'x'.
+   │                                                    Suggestion: use 'copy x' to avoid the move.
+   │                                                    In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.move
new file mode 100644
index 000000000..181c0bdaa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_after_move_while.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    fun tmove1(cond: bool) {
+        let x = 0;
+        while (cond) { _ = move x };
+    }
+
+    fun tmove2(cond: bool) {
+        let x = 0;
+        while (cond) { if (cond) break; _ = move x };
+    }
+
+    fun tcopy1(cond: bool) {
+        let x = 0;
+        while (cond) { let y = x; _ = move x; y; };
+    }
+
+    fun tcopy2(cond: bool) {
+        let x = 0;
+        while (cond) { let y = x; if (cond) continue; _ = move x; y; };
+    }
+
+    fun tborrow1(cond: bool) {
+        let x = 0;
+        while (cond) { let y = &x; _ = move y; _ = move x };
+    }
+
+    fun tborrow2(cond: bool) {
+        let x = 0;
+        while (cond) { let y = &x; _ = move y; if (cond) { _ = move x }; break };
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.exp
new file mode 100644
index 000000000..d43ffe9d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.exp
@@ -0,0 +1,27 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_if.move:5:17
+  │
+3 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │         if (cond) { x = 0 };
+5 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_if.move:11:17
+   │
+ 9 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+10 │         if (cond) { x = 0 };
+11 │         let _ = x + 1;
+   │                 ^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_if.move:17:17
+   │
+15 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+16 │         if (cond) { x = 0 };
+17 │         let _ = &x;
+   │                 ^^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.move
new file mode 100644
index 000000000..8952f5f7b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    fun tmove(cond: bool) {
+        let x: u64;
+        if (cond) { x = 0 };
+        let _ = move x + 1;
+    }
+
+    fun tcopy(cond: bool) {
+        let x: u64;
+        if (cond) { x = 0 };
+        let _ = x + 1;
+    }
+
+    fun tborrow(cond: bool) {
+        let x: u64;
+        if (cond) { x = 0 };
+        let _ = &x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.exp
new file mode 100644
index 000000000..03c0d416d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.exp
@@ -0,0 +1,27 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_if_else.move:5:17
+  │
+3 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │         if (cond) { } else { x = 0 };
+5 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_if_else.move:11:17
+   │
+ 9 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+10 │         if (cond) { } else { x = 0 };
+11 │         let _ = move x + 1;
+   │                 ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_if_else.move:17:17
+   │
+15 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+16 │         if (cond) { } else { x = 0 };
+17 │         let _ = move x + 1;
+   │                 ^^^^^^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.move
new file mode 100644
index 000000000..f0eba9c1e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_if_else.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    fun tmove(cond: bool) {
+        let x: u64;
+        if (cond) { } else { x = 0 };
+        let _ = move x + 1;
+    }
+
+    fun tcopy(cond: bool) {
+        let x: u64;
+        if (cond) { } else { x = 0 };
+        let _ = move x + 1;
+    }
+
+    fun tborrow(cond: bool) {
+        let x: u64;
+        if (cond) { } else { x = 0 };
+        let _ = move x + 1;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.exp
new file mode 100644
index 000000000..50f347b01
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.exp
@@ -0,0 +1,41 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_loop.move:4:24
+  │
+3 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │         loop { let y = move x + 1; x = 0; y; }
+  │                        ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_loop.move:9:24
+  │
+8 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+9 │         loop { let y = x + 1; if (cond) { continue }; x = 0; y; }
+  │                        ^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_loop.move:14:24
+   │
+13 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+14 │         loop { let y = &x; _ = move y; x = 0 }
+   │                        ^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_loop.move:19:24
+   │
+18 │         let x: u64;
+   │             - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+19 │         loop { let y = &x; _ = move y; if (cond) { x = 0 }; break };
+   │                        ^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_loop.move:20:9
+   │
+18 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+19 │         loop { let y = &x; _ = move y; if (cond) { x = 0 }; break };
+20 │         x;
+   │         ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.move
new file mode 100644
index 000000000..1747a1680
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_loop.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    fun tmove() {
+        let x: u64;
+        loop { let y = move x + 1; x = 0; y; }
+    }
+
+    fun tcopy(cond: bool) {
+        let x: u64;
+        loop { let y = x + 1; if (cond) { continue }; x = 0; y; }
+    }
+
+    fun tborrow1() {
+        let x: u64;
+        loop { let y = &x; _ = move y; x = 0 }
+    }
+
+    fun tborrow2(cond: bool) {
+        let x: u64;
+        loop { let y = &x; _ = move y; if (cond) { x = 0 }; break };
+        x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.exp
new file mode 100644
index 000000000..9fa8f9b7a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.exp
@@ -0,0 +1,48 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_simple.move:6:17
+  │
+5 │         let x: u64;
+  │             - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+6 │         let _ = move x + 1;
+  │                 ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_simple.move:9:19
+  │
+8 │         let s: S;
+  │             - The variable 's' does not have a value. The variable must be assigned a value before being used.
+9 │         let _s2 = s;
+  │                   ^ Invalid usage of unassigned variable 's'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_simple.move:14:17
+   │
+13 │         let x: u64;
+   │             - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+14 │         let _ = x + 1;
+   │                 ^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_simple.move:17:19
+   │
+16 │         let s: S;
+   │             - The variable 's' does not have a value. The variable must be assigned a value before being used.
+17 │         let _s3 = copy s;
+   │                   ^^^^^^ Invalid usage of unassigned variable 's'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_simple.move:22:17
+   │
+21 │         let x: u64;
+   │             - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+22 │         let _ = &x;
+   │                 ^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_simple.move:25:19
+   │
+24 │         let s: S;
+   │             - The variable 's' does not have a value. The variable must be assigned a value before being used.
+25 │         let _s2 = &s;
+   │                   ^^ Invalid usage of unassigned variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.move
new file mode 100644
index 000000000..44a1433b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_simple.move
@@ -0,0 +1,28 @@
+module 0x8675309::M {
+    struct S has copy, drop {}
+
+    fun tmove() {
+        let x: u64;
+        let _ = move x + 1;
+
+        let s: S;
+        let _s2 = s;
+    }
+
+    fun tcopy() {
+        let x: u64;
+        let _ = x + 1;
+
+        let s: S;
+        let _s3 = copy s;
+    }
+
+    fun tborrow() {
+        let x: u64;
+        let _ = &x;
+
+        let s: S;
+        let _s2 = &s;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.exp b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.exp
new file mode 100644
index 000000000..e2cc76a37
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.exp
@@ -0,0 +1,40 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_while.move:4:32
+  │
+3 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │         while (cond) { let y = move x + 1; x = 0; y; }
+  │                                ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/locals/use_before_assign_while.move:9:32
+  │
+8 │         let x: u64;
+  │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+9 │         while (cond) { let y = move x + 1; if (cond) { continue }; x = 0; y; }
+  │                                ^^^^^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_while.move:14:32
+   │
+13 │         let x: u64;
+   │             - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+14 │         while (cond) { let y = &x; _ = move y; x = 0 }
+   │                                ^^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/locals/use_before_assign_while.move:19:32
+   │
+18 │         let x: u64;
+   │             - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+19 │         while (cond) { let y = &x; _ = move y; if (cond) { x = 0 }; break }
+   │                                ^^ Invalid usage of unassigned variable 'x'
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/locals/use_before_assign_while.move:19:60
+   │
+19 │         while (cond) { let y = &x; _ = move y; if (cond) { x = 0 }; break }
+   │                                                            ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.move b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.move
new file mode 100644
index 000000000..e50e3571b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/locals/use_before_assign_while.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    fun tmove(cond: bool) {
+        let x: u64;
+        while (cond) { let y = move x + 1; x = 0; y; }
+    }
+
+    fun tcopy(cond: bool) {
+        let x: u64;
+        while (cond) { let y = move x + 1; if (cond) { continue }; x = 0; y; }
+    }
+
+    fun tborrow1(cond: bool) {
+        let x: u64;
+        while (cond) { let y = &x; _ = move y; x = 0 }
+    }
+
+    fun tborrow2(cond: bool) {
+        let x: u64;
+        while (cond) { let y = &x; _ = move y; if (cond) { x = 0 }; break }
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.exp
new file mode 100644
index 000000000..a4a7db80e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.exp
@@ -0,0 +1,33 @@
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/assert_one_arg.move:3:9
+  │
+3 │         assert!(false);
+  │         ^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Found 1 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 1
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/assert_one_arg.move:4:9
+  │
+4 │         assert!(0 != 1);
+  │         ^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Found 1 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 1
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/assert_one_arg.move:5:9
+  │
+5 │         assert!(x != y);
+  │         ^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Found 1 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 1
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/naming/assert_one_arg.move:5:22
+  │
+5 │         assert!(x != y);
+  │                      ^ Invalid variable usage. Unbound variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.move b/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.move
new file mode 100644
index 000000000..ede2797e1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/assert_one_arg.move
@@ -0,0 +1,7 @@
+module 0x42::M {
+    fun foo(x: &mut u64) {
+        assert!(false);
+        assert!(0 != 1);
+        assert!(x != y);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.exp
new file mode 100644
index 000000000..8deabf581
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.exp
@@ -0,0 +1,24 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_function.move:2:16
+  │
+2 │     fun foo<T, T>() {}
+  │             -  ^ Duplicate type parameter declared with name 'T'
+  │             │   
+  │             Type parameter previously defined here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_function.move:3:23
+  │
+3 │     fun foo2<T: drop, T: key, T>() {}
+  │              -        ^ Duplicate type parameter declared with name 'T'
+  │              │         
+  │              Type parameter previously defined here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_function.move:3:31
+  │
+3 │     fun foo2<T: drop, T: key, T>() {}
+  │              -                ^ Duplicate type parameter declared with name 'T'
+  │              │                 
+  │              Type parameter previously defined here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.move b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.move
new file mode 100644
index 000000000..ef1bbc52f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_function.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    fun foo<T, T>() {}
+    fun foo2<T: drop, T: key, T>() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.exp
new file mode 100644
index 000000000..619bd572a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.exp
@@ -0,0 +1,96 @@
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:2:14
+  │
+2 │     struct S<T, T> { f: T }
+  │              ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:2:17
+  │
+2 │     struct S<T, T> { f: T }
+  │              -  ^ Duplicate type parameter declared with name 'T'
+  │              │   
+  │              Type parameter previously defined here
+
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:3:15
+  │
+3 │     struct S2<T: drop, T: key, T> { f: T }
+  │               ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:3:24
+  │
+3 │     struct S2<T: drop, T: key, T> { f: T }
+  │               -        ^ Duplicate type parameter declared with name 'T'
+  │               │         
+  │               Type parameter previously defined here
+
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:3:24
+  │
+3 │     struct S2<T: drop, T: key, T> { f: T }
+  │                        ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:3:32
+  │
+3 │     struct S2<T: drop, T: key, T> { f: T }
+  │               -                ^ Duplicate type parameter declared with name 'T'
+  │               │                 
+  │               Type parameter previously defined here
+
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:4:14
+  │
+4 │     struct R<T, T> { f: T }
+  │              ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:4:17
+  │
+4 │     struct R<T, T> { f: T }
+  │              -  ^ Duplicate type parameter declared with name 'T'
+  │              │   
+  │              Type parameter previously defined here
+
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:5:15
+  │
+5 │     struct R2<T: drop, T: key, T> { f: T }
+  │               ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:5:24
+  │
+5 │     struct R2<T: drop, T: key, T> { f: T }
+  │               -        ^ Duplicate type parameter declared with name 'T'
+  │               │         
+  │               Type parameter previously defined here
+
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:5:24
+  │
+5 │     struct R2<T: drop, T: key, T> { f: T }
+  │                        ^ Unused type parameter 'T'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/naming/duplicate_type_parameter_struct.move:5:32
+  │
+5 │     struct R2<T: drop, T: key, T> { f: T }
+  │               -                ^ Duplicate type parameter declared with name 'T'
+  │               │                 
+  │               Type parameter previously defined here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.move b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.move
new file mode 100644
index 000000000..7812fdd5d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/duplicate_type_parameter_struct.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct S<T, T> { f: T }
+    struct S2<T: drop, T: key, T> { f: T }
+    struct R<T, T> { f: T }
+    struct R2<T: drop, T: key, T> { f: T }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.exp
new file mode 100644
index 000000000..173d0a986
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.exp
@@ -0,0 +1,9 @@
+error[E02011]: invalid 'friend' declaration
+  ┌─ tests/move_check/naming/friend_decl_out_of_account_addr.move:7:5
+  │
+7 │     friend 0x2::M;
+  │     ^^^^^^^^^^^^^^
+  │     │      │
+  │     │      Cannot declare modules out of the current address as a friend
+  │     Invalid friend declaration
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.move b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.move
new file mode 100644
index 000000000..aa204f9ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_out_of_account_addr.move
@@ -0,0 +1,9 @@
+address 0x2 {
+module M {}
+}
+
+address 0x3 {
+module M {
+    friend 0x2::M;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.exp
new file mode 100644
index 000000000..0bee6380b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.exp
@@ -0,0 +1,18 @@
+error[E02011]: invalid 'friend' declaration
+  ┌─ tests/move_check/naming/friend_decl_self.move:3:5
+  │
+3 │     friend Self;
+  │     ^^^^^^^^^^^^
+  │     │      │
+  │     │      Cannot declare the module itself as a friend
+  │     Invalid friend declaration
+
+error[E02011]: invalid 'friend' declaration
+  ┌─ tests/move_check/naming/friend_decl_self.move:9:5
+  │
+9 │     friend 0x43::M;
+  │     ^^^^^^^^^^^^^^^
+  │     │      │
+  │     │      Cannot declare the module itself as a friend
+  │     Invalid friend declaration
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.move b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.move
new file mode 100644
index 000000000..ddd9bb39c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_self.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    friend Self;
+}
+}
+
+address 0x43 {
+module M {
+    friend 0x43::M;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.exp
new file mode 100644
index 000000000..10b5f7bb3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/naming/friend_decl_unbound_module.move:3:12
+  │
+3 │     friend 0x42::Nonexistent;
+  │            ^^^^^^^^^^^^^^^^^ Unbound module '0x42::Nonexistent'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.move b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.move
new file mode 100644
index 000000000..13eaa7b76
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/friend_decl_unbound_module.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M {
+    friend 0x42::Nonexistent;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing.move b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing.move
new file mode 100644
index 000000000..5ccf51c48
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing.move
@@ -0,0 +1,14 @@
+address 0x2 {
+
+module M {
+    struct S {}
+
+    fun foo<S: copy + drop>(s: S): S {
+        let s: S = (s: S);
+        let s: S = s;
+        s
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.exp
new file mode 100644
index 000000000..6ba73e157
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.exp
@@ -0,0 +1,41 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/naming/generics_shadowing_invalid.move:7:14
+  │
+6 │     fun foo<S: drop>(s1: S, _: S): S {
+  │                          - Given: 'S'
+7 │         (s1: Self::S);
+  │              ^^^^^^^
+  │              │
+  │              Invalid type annotation
+  │              Expected: '0x2::M::S'
+
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/naming/generics_shadowing_invalid.move:8:20
+  │
+6 │     fun foo<S: drop>(s1: S, _: S): S {
+  │             - But 'S' was declared as a type parameter here
+7 │         (s1: Self::S);
+8 │         let _: S = S {}; // TODO error? should this try to construct the generic ?
+  │                    ^ Invalid construction. Expected a struct name
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/naming/generics_shadowing_invalid.move:9:9
+   │
+ 6 │     fun foo<S: drop>(s1: S, _: S): S {
+   │                          - Given: 'S'
+   ·
+ 9 │         bar(s1);
+   │         ^^^^^^^ Invalid call of '0x2::M::bar'. Invalid argument for parameter '_'
+   ·
+13 │     fun bar(_: S) {}
+   │                - Expected: '0x2::M::S'
+
+error[E03006]: unexpected name in this position
+   ┌─ tests/move_check/naming/generics_shadowing_invalid.move:10:9
+   │
+ 6 │     fun foo<S: drop>(s1: S, _: S): S {
+   │             - But 'S' was declared as a type parameter here
+   ·
+10 │         S {}
+   │         ^ Invalid construction. Expected a struct name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.move
new file mode 100644
index 000000000..d179a6f0a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_shadowing_invalid.move
@@ -0,0 +1,16 @@
+address 0x2 {
+
+module M {
+    struct S has drop {}
+
+    fun foo<S: drop>(s1: S, _: S): S {
+        (s1: Self::S);
+        let _: S = S {}; // TODO error? should this try to construct the generic ?
+        bar(s1);
+        S {}
+    }
+
+    fun bar(_: S) {}
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.exp
new file mode 100644
index 000000000..a068d8f25
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.exp
@@ -0,0 +1,18 @@
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/naming/generics_with_type_parameters.move:2:22
+  │
+2 │     struct S<T> { f: T<u64> }
+  │                      ^^^^^^ Generic type parameters cannot take type arguments
+
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/naming/generics_with_type_parameters.move:3:19
+  │
+3 │     fun foo<T>(_: T<bool>): T<u64> {}
+  │                   ^^^^^^^ Generic type parameters cannot take type arguments
+
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/naming/generics_with_type_parameters.move:3:29
+  │
+3 │     fun foo<T>(_: T<bool>): T<u64> {}
+  │                             ^^^^^^ Generic type parameters cannot take type arguments
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.move b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.move
new file mode 100644
index 000000000..f040c41e7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/generics_with_type_parameters.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    struct S<T> { f: T<u64> }
+    fun foo<T>(_: T<bool>): T<u64> {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.exp
new file mode 100644
index 000000000..8941d902f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.exp
@@ -0,0 +1,9 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/naming/named_address_distinct_from_each_others_value.move:18:9
+   │
+ 6 │     const C: u64 = 0;
+   │           - Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+18 │         k::M::C;
+   │         ^^^^^^^ Invalid access of '(k=0x19)::M::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.move b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.move
new file mode 100644
index 000000000..8634e47e8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_distinct_from_each_others_value.move
@@ -0,0 +1,25 @@
+// These checks straddle a few different passes but
+// Named addresses are no longer distinct from their value, even with a different name
+// This is due to the package system mostly maintaining the value
+
+module K::M {
+    const C: u64 = 0;
+    struct S {}
+    public fun s(): S { S{} }
+}
+
+module K::Ex0 {
+    friend K::M;
+}
+
+module K::Ex1 {
+    use k::M;
+    public fun ex(): K::M::S {
+        k::M::C;
+        k::M::s()
+    }
+
+    public fun ex2(): M::S {
+        ex()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.exp
new file mode 100644
index 000000000..93039985a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.exp
@@ -0,0 +1,9 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/naming/named_address_not_distinct_from_value.move:18:9
+   │
+ 6 │     const C: u64 = 0;
+   │           - Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+18 │         0x41::M::C;
+   │         ^^^^^^^^^^ Invalid access of '0x41::M::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.move b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.move
new file mode 100644
index 000000000..87befcfcc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/named_address_not_distinct_from_value.move
@@ -0,0 +1,25 @@
+// These checks straddle a few different passes but
+// Named addresses are no longer distinct from their value
+// This is due to the package system mostly maintaining the value
+
+module A::M {
+    const C: u64 = 0;
+    struct S {}
+    public fun s(): S { S{} }
+}
+
+module A::Ex0 {
+    friend 0x41::M;
+}
+
+module A::Ex1 {
+    use 0x41::M;
+    public fun ex(): 0x41::M::S {
+        0x41::M::C;
+        0x41::M::s()
+    }
+
+    public fun ex2(): M::S {
+        ex()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.exp
new file mode 100644
index 000000000..abd87e631
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.exp
@@ -0,0 +1,45 @@
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/naming/other_builtins_invalid.move:3:9
+  │
+3 │         freeze<u64, bool>(x);
+  │         ^^^^^^--------------
+  │         │
+  │         Expected 1 type argument(s) but got 2
+  │         Invalid call to builtin function: 'freeze'
+
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/naming/other_builtins_invalid.move:4:9
+  │
+4 │         freeze<>(x);
+  │         ^^^^^^-----
+  │         │
+  │         Expected 1 type argument(s) but got 0
+  │         Invalid call to builtin function: 'freeze'
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/other_builtins_invalid.move:5:9
+  │
+5 │         assert!();
+  │         ^^^^^^^^^
+  │         │      │
+  │         │      Found 0 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 0
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/other_builtins_invalid.move:6:9
+  │
+6 │         assert!(false);
+  │         ^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Found 1 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 1
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/naming/other_builtins_invalid.move:7:9
+  │
+7 │         assert!(0 != 1);
+  │         ^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Found 1 argument(s) here
+  │         Invalid call of 'assert'. The call expected 2 argument(s) but got 1
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.move
new file mode 100644
index 000000000..5135bc3c6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/other_builtins_invalid.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun foo(x: &mut u64) {
+        freeze<u64, bool>(x);
+        freeze<>(x);
+        assert!();
+        assert!(false);
+        assert!(0 != 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.exp
new file mode 100644
index 000000000..758376433
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.exp
@@ -0,0 +1,6 @@
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/standalone_mname.move:3:17
+  │
+3 │         let m = M; m;
+  │                 ^ Unbound constant 'M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.move b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.move
new file mode 100644
index 000000000..38b51dc64
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_mname.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun foo() {
+        let m = M; m;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.exp
new file mode 100644
index 000000000..b13eb9a0f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.exp
@@ -0,0 +1,32 @@
+warning[W09001]: unused alias
+  ┌─ tests/move_check/naming/standalone_module_ident.move:6:14
+  │
+6 │     use 0x2::X;
+  │              ^ Unused 'use' of alias 'X'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/standalone_module_ident.move:8:17
+  │
+8 │         let x = X; x;
+  │                 ^ Unbound constant 'X'
+
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/naming/standalone_module_ident.move:9:17
+  │
+9 │         let x = 0x2::X; x;
+  │                 ^^^^^^
+  │                 │
+  │                 Unexpected module identifier. A module identifier is not a valid expression
+  │                 Expected a module name
+
+error[E03006]: unexpected name in this position
+   ┌─ tests/move_check/naming/standalone_module_ident.move:10:17
+   │
+10 │         let y = 0x2::Y; y;
+   │                 ^^^^^^
+   │                 │
+   │                 Unexpected module identifier. A module identifier is not a valid expression
+   │                 Expected a module name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.move b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.move
new file mode 100644
index 000000000..6595fa965
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/standalone_module_ident.move
@@ -0,0 +1,14 @@
+address 0x2 {
+
+module X {}
+
+module M {
+    use 0x2::X;
+    fun foo() {
+        let x = X; x;
+        let x = 0x2::X; x;
+        let y = 0x2::Y; y;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/struct_in_current_module.move b/vendors/move/crates/move-compiler/tests/move_check/naming/struct_in_current_module.move
new file mode 100644
index 000000000..ee9388972
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/struct_in_current_module.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct R { f: u64 }
+
+    fun foo() {
+        let _ : Self::S = S { f: 0 };
+        let R { f: _ } : Self::R = R { f: 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.exp
new file mode 100644
index 000000000..fa12ca73c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.exp
@@ -0,0 +1,18 @@
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_builtin.move:3:9
+  │
+3 │         global_borrow();
+  │         ^^^^^^^^^^^^^ Unbound function 'global_borrow' in current scope
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_builtin.move:4:9
+  │
+4 │         release<u64>();
+  │         ^^^^^^^ Unbound function 'release' in current scope
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_builtin.move:5:9
+  │
+5 │         sudo(false);
+  │         ^^^^ Unbound function 'sudo' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.move
new file mode 100644
index 000000000..5488b28be
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_builtin.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun foo() {
+        global_borrow();
+        release<u64>();
+        sudo(false);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.exp
new file mode 100644
index 000000000..17ec34dcb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.exp
@@ -0,0 +1,48 @@
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_constant.move:4:17
+  │
+4 │         let x = CONSTANT; x;
+  │                 ^^^^^^^^ Unbound constant 'CONSTANT'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_constant.move:5:17
+  │
+5 │         let y = Self::CONSTANT; y;
+  │                 ^^^^^^^^^^^^^^ Invalid module access. Unbound constant 'CONSTANT' in module '0x42::M'
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_constant.move:6:13
+  │
+6 │         0 + CONSTANT + Self::CONSTANT;
+  │             ^^^^^^^^ Unbound constant 'CONSTANT'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_constant.move:6:24
+  │
+6 │         0 + CONSTANT + Self::CONSTANT;
+  │                        ^^^^^^^^^^^^^^ Invalid module access. Unbound constant 'CONSTANT' in module '0x42::M'
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/naming/unbound_constant.move:13:17
+   │
+13 │         let x = CONSTANT; x;
+   │                 ^^^^^^^^ Unbound constant 'CONSTANT'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/naming/unbound_constant.move:14:17
+   │
+14 │         let y = Self::CONSTANT; y;
+   │                 ^^^^ Unbound module alias 'Self'
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/naming/unbound_constant.move:15:13
+   │
+15 │         0 + CONSTANT + Self::CONSTANT;
+   │             ^^^^^^^^ Unbound constant 'CONSTANT'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/naming/unbound_constant.move:15:24
+   │
+15 │         0 + CONSTANT + Self::CONSTANT;
+   │                        ^^^^ Unbound module alias 'Self'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.move
new file mode 100644
index 000000000..6cfcdcc23
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_constant.move
@@ -0,0 +1,17 @@
+address 0x42 {
+module M {
+    fun t() {
+        let x = CONSTANT; x;
+        let y = Self::CONSTANT; y;
+        0 + CONSTANT + Self::CONSTANT;
+    }
+}
+}
+
+script {
+    fun t() {
+        let x = CONSTANT; x;
+        let y = Self::CONSTANT; y;
+        0 + CONSTANT + Self::CONSTANT;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.exp
new file mode 100644
index 000000000..094aaa515
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.exp
@@ -0,0 +1,12 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/naming/unbound_module.move:2:9
+  │
+2 │     use 0x1::X as X;
+  │         ^^^^^^ Invalid 'use'. Unbound module: '0x1::X'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/naming/unbound_module.move:4:9
+  │
+4 │         X::foo();
+  │         ^ Unbound module alias 'X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.move
new file mode 100644
index 000000000..26d629a4f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    use 0x1::X as X;
+    fun foo() {
+        X::foo();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.exp
new file mode 100644
index 000000000..bbbb37fcd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.exp
@@ -0,0 +1,24 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_module_name.move:7:17
+  │
+7 │         let x = N::c; x;
+  │                 ^^^^ Invalid module access. Unbound constant 'c' in module '0x42::N'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_module_name.move:8:17
+  │
+8 │         let y = Self::c; y;
+  │                 ^^^^^^^ Invalid module access. Unbound constant 'c' in module '0x42::M'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_module_name.move:9:13
+  │
+9 │         0 + N::c + Self::c;
+  │             ^^^^ Invalid module access. Unbound constant 'c' in module '0x42::N'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_module_name.move:9:20
+  │
+9 │         0 + N::c + Self::c;
+  │                    ^^^^^^^ Invalid module access. Unbound constant 'c' in module '0x42::M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.move
new file mode 100644
index 000000000..dcc5cf641
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_module_name.move
@@ -0,0 +1,12 @@
+address 0x42 {
+module N {
+}
+module M {
+    use 0x42::N;
+    fun t() {
+        let x = N::c; x;
+        let y = Self::c; y;
+        0 + N::c + Self::c;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.exp
new file mode 100644
index 000000000..124cda075
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.exp
@@ -0,0 +1,48 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_struct_in_current.move:2:16
+  │
+2 │     fun foo(s: Self::S): Self::S {
+  │                ^^^^^^^ Invalid module access. Unbound struct 'S' in module '0x8675309::M'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_struct_in_current.move:2:26
+  │
+2 │     fun foo(s: Self::S): Self::S {
+  │                          ^^^^^^^ Invalid module access. Unbound struct 'S' in module '0x8675309::M'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_struct_in_current.move:7:16
+  │
+7 │     fun bar(): Self::S {
+  │                ^^^^^^^ Invalid module access. Unbound struct 'S' in module '0x8675309::M'
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unbound_struct_in_current.move:8:9
+  │
+8 │         S {}
+  │         ^ Unbound type 'S' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/naming/unbound_struct_in_current.move:12:9
+   │
+12 │         S {} = bar();
+   │         ^ Unbound type 'S' in current scope
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/naming/unbound_struct_in_current.move:13:9
+   │
+13 │         Self::S {} = bar();
+   │         ^^^^^^^ Invalid module access. Unbound struct 'S' in module '0x8675309::M'
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/naming/unbound_struct_in_current.move:17:13
+   │
+17 │         let S {} = bar();
+   │             ^ Unbound type 'S' in current scope
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/naming/unbound_struct_in_current.move:18:13
+   │
+18 │         let Self::S {} = bar();
+   │             ^^^^^^^ Invalid module access. Unbound struct 'S' in module '0x8675309::M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.move
new file mode 100644
index 000000000..296e19882
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_current.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    fun foo(s: Self::S): Self::S {
+        let s = s;
+        s
+    }
+
+    fun bar(): Self::S {
+        S {}
+    }
+
+    fun baz() {
+        S {} = bar();
+        Self::S {} = bar();
+    }
+
+    fun bug() {
+        let S {} = bar();
+        let Self::S {} = bar();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.exp
new file mode 100644
index 000000000..d2decbde0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.exp
@@ -0,0 +1,12 @@
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_struct_in_module.move:6:16
+  │
+6 │     fun foo(s: X::S): X::S {
+  │                ^^^^ Invalid module access. Unbound struct 'S' in module '0x2::X'
+
+error[E03003]: unbound module member
+  ┌─ tests/move_check/naming/unbound_struct_in_module.move:6:23
+  │
+6 │     fun foo(s: X::S): X::S {
+  │                       ^^^^ Invalid module access. Unbound struct 'S' in module '0x2::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.move
new file mode 100644
index 000000000..974119181
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_struct_in_module.move
@@ -0,0 +1,11 @@
+address 0x2 {
+module X {}
+module M {
+    use 0x2::X;
+
+    fun foo(s: X::S): X::S {
+        let s = s;
+        s
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.exp
new file mode 100644
index 000000000..72656275d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.exp
@@ -0,0 +1,18 @@
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_unqualified_function.move:3:9
+  │
+3 │         bar();
+  │         ^^^ Unbound function 'bar' in current scope
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_unqualified_function.move:4:17
+  │
+4 │         let x = bar(); x;
+  │                 ^^^ Unbound function 'bar' in current scope
+
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/naming/unbound_unqualified_function.move:5:10
+  │
+5 │         *bar() = 0;
+  │          ^^^ Unbound function 'bar' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.move
new file mode 100644
index 000000000..61d4a150f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unbound_unqualified_function.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun foo() {
+        bar();
+        let x = bar(); x;
+        *bar() = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.exp
new file mode 100644
index 000000000..d14642714
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.exp
@@ -0,0 +1,30 @@
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_no_args.move:2:22
+  │
+2 │     struct Mine { f: A }
+  │                      ^ Unbound type 'A' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_no_args.move:3:16
+  │
+3 │     fun foo(_: S): G {
+  │                ^ Unbound type 'S' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_no_args.move:3:20
+  │
+3 │     fun foo(_: S): G {
+  │                    ^ Unbound type 'G' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_no_args.move:4:16
+  │
+4 │         let _: B = (0: P);
+  │                ^ Unbound type 'B' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_no_args.move:4:24
+  │
+4 │         let _: B = (0: P);
+  │                        ^ Unbound type 'P' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.move
new file mode 100644
index 000000000..af793716f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_no_args.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct Mine { f: A }
+    fun foo(_: S): G {
+        let _: B = (0: P);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.exp
new file mode 100644
index 000000000..20f726493
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.exp
@@ -0,0 +1,36 @@
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:2:28
+  │
+2 │     struct Mine<T, U> { f: A<T, U>, g: X<U> }
+  │                            ^ Unbound type 'A' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:2:40
+  │
+2 │     struct Mine<T, U> { f: A<T, U>, g: X<U> }
+  │                                        ^ Unbound type 'X' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:3:22
+  │
+3 │     fun foo<T, U>(_: S<T>): G<T, U> {
+  │                      ^ Unbound type 'S' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:3:29
+  │
+3 │     fun foo<T, U>(_: S<T>): G<T, U> {
+  │                             ^ Unbound type 'G' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:4:16
+  │
+4 │         let _: B<U> = (0: P<U, T>);
+  │                ^ Unbound type 'B' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/naming/unresolved_type_with_args.move:4:27
+  │
+4 │         let _: B<U> = (0: P<U, T>);
+  │                           ^ Unbound type 'P' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.move
new file mode 100644
index 000000000..9a9262f73
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unresolved_type_with_args.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct Mine<T, U> { f: A<T, U>, g: X<U> }
+    fun foo<T, U>(_: S<T>): G<T, U> {
+        let _: B<U> = (0: P<U, T>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.move b/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.move
new file mode 100644
index 000000000..270429479
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.move
@@ -0,0 +1,15 @@
+module 0x42::unused_fun_tparam {
+
+    public fun unused<T>(): u64 {
+        42
+    }
+
+    public fun one_unused<T1, T2>(v: T1): T1 {
+        v
+    }
+
+    public fun all_unused<T1, T2>(): u64 {
+        42
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.unused b/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.unused.exp
new file mode 100644
index 000000000..8c7b6d43d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/unused_fun_tparam.unused.exp
@@ -0,0 +1,32 @@
+warning[W09010]: unused function type parameter
+  ┌─ tests/move_check/naming/unused_fun_tparam.move:3:23
+  │
+3 │     public fun unused<T>(): u64 {
+  │                       ^ Unused type parameter 'T'.
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09010]: unused function type parameter
+  ┌─ tests/move_check/naming/unused_fun_tparam.move:7:31
+  │
+7 │     public fun one_unused<T1, T2>(v: T1): T1 {
+  │                               ^^ Unused type parameter 'T2'.
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09010]: unused function type parameter
+   ┌─ tests/move_check/naming/unused_fun_tparam.move:11:27
+   │
+11 │     public fun all_unused<T1, T2>(): u64 {
+   │                           ^^ Unused type parameter 'T1'.
+   │
+   = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09010]: unused function type parameter
+   ┌─ tests/move_check/naming/unused_fun_tparam.move:11:31
+   │
+11 │     public fun all_unused<T1, T2>(): u64 {
+   │                               ^^ Unused type parameter 'T2'.
+   │
+   = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/used_fun_tparam.move b/vendors/move/crates/move-compiler/tests/move_check/naming/used_fun_tparam.move
new file mode 100644
index 000000000..6938e66d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/used_fun_tparam.move
@@ -0,0 +1,51 @@
+module 0x42::used_fun_tparam {
+    // no warnings related to unused function type params should be generated for functions in this
+    // module
+
+
+    struct S<phantom T: key + drop> has key, drop {
+    }
+
+    public fun foo<T>(): T {
+        abort 0
+    }
+
+    public fun bar<T>(_: T) {
+        abort 0
+    }
+
+
+    public fun no_warn_sig_direct<T>(v: T): T {
+        v
+    }
+
+    public fun no_warn_sig_indirect<T: key + drop>(v: S<T>): S<T> {
+        v
+    }
+
+    public fun no_warn_pack<T: key + drop>() {
+        let _ = S<T> {};
+    }
+
+    public fun no_warn_pack_unpack<T: key + drop>() {
+        let x = S {};
+        let S<T> {} = x;
+    }
+
+    public fun no_warn_bind<T: key + drop>() {
+        let _: T = foo();
+    }
+
+    public fun no_warn_call<T: key + drop>() {
+        let _ = foo<T>();
+    }
+
+    public fun no_warn_annotation<T: key + drop>() {
+        let x = foo();
+        bar((x: T));
+    }
+
+
+
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/used_fun_tparam.unused b/vendors/move/crates/move-compiler/tests/move_check/naming/used_fun_tparam.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.exp b/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.exp
new file mode 100644
index 000000000..32d1c4332
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.exp
@@ -0,0 +1,28 @@
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/naming/vector_literal_type_arity.move:4:18
+  │
+4 │         let v0 = vector<>[]; v0;
+  │                  ^^^^^^----
+  │                  │
+  │                  Expected 1 type argument(s) but got 0
+  │                  Invalid 'vector' instantation
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/naming/vector_literal_type_arity.move:5:18
+  │
+5 │         let v2 = vector<u64, bool>[0, false]; v2;
+  │                  ^^^^^^---------------------
+  │                  │
+  │                  Expected 1 type argument(s) but got 2
+  │                  Invalid 'vector' instantation
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/naming/vector_literal_type_arity.move:5:18
+  │
+5 │         let v2 = vector<u64, bool>[0, false]; v2;
+  │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │                  │                 │  │
+  │                  │                 │  Found: 'bool'. It is not compatible with the other type.
+  │                  │                 Found: integer. It is not compatible with the other type.
+  │                  Invalid 'vector' instantiation. Incompatible argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.move b/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.move
new file mode 100644
index 000000000..926aad09b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/naming/vector_literal_type_arity.move
@@ -0,0 +1,7 @@
+module 0x42::Test {
+    fun t() {
+        // check that vector expects 1 type argument
+        let v0 = vector<>[]; v0;
+        let v2 = vector<u64, bool>[0, false]; v2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.exp
new file mode 100644
index 000000000..6fd97bf51
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_constraint_trailing_plus.move:4:22
+  │
+4 │     fun foo<T: copy +>() {}
+  │                      ^ Unexpected '>'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.move
new file mode 100644
index 000000000..b0784f546
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_constraint_trailing_plus.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // unexpected trailing plus
+    fun foo<T: copy +>() {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.exp
new file mode 100644
index 000000000..e33e4f914
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.exp
@@ -0,0 +1,16 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_infix_and_postfix.move:5:34
+  │
+5 │     struct Foo has copy, drop {} has store;
+  │                                  ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/ability_modifier_infix_and_postfix.move:5:34
+  │
+5 │     struct Foo has copy, drop {} has store;
+  │                ---               ^^^ Duplicate ability declaration. Abilities can be declared before or after the field declarations, but not both.
+  │                │                  
+  │                Ability declaration previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.move
new file mode 100644
index 000000000..9c4638819
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_and_postfix.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // has both prefix and postfix ability declarations
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo has copy, drop {} has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.exp
new file mode 100644
index 000000000..b7a905f60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_infix_postfix_no_fields.move:5:38
+  │
+5 │     native struct Foo has copy, drop has store;
+  │                                      ^^^
+  │                                      │
+  │                                      Unexpected 'has'
+  │                                      Expected one of: ',', '{', '(', or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.move
new file mode 100644
index 000000000..af6a59f80
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // has both prefix and postfix ability declarations
+    // Postfix ability declarations are not supported before 2024 edition
+    native struct Foo has copy, drop has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp
new file mode 100644
index 000000000..af6fc5564
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move:5:39
+  │
+5 │     native struct Foo has copy, drop, has store;
+  │                                       ^^^ Unexpected 'has'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move
new file mode 100644
index 000000000..67443de1a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_infix_postfix_no_fields_with_comma_sep.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // has both prefix and postfix ability declarations
+    // Postfix ability declarations are not supported before 2024 edition
+    native struct Foo has copy, drop, has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.exp
new file mode 100644
index 000000000..1f36cb821
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.move:4:20
+  │
+4 │     struct Foo has {} has copy;
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.move
new file mode 100644
index 000000000..642988385
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_invalid_infix_with_valid_postfix.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {} has copy;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.exp
new file mode 100644
index 000000000..006f8ae3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_no_abilities.move:4:20
+  │
+4 │     struct Foo has {}
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.move
new file mode 100644
index 000000000..361635c3e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_no_abilities.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.exp
new file mode 100644
index 000000000..2e9595685
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.exp
@@ -0,0 +1,17 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_missing_commas.move:5:19
+  │
+5 │     struct Foo {} has store copy;
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_missing_commas.move:5:29
+  │
+5 │     struct Foo {} has store copy;
+  │                             ^^^^
+  │                             │
+  │                             Unexpected 'copy'
+  │                             Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.move
new file mode 100644
index 000000000..ac8ae4fd0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_commas.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // Ability declarations require commas between them (this will error before hitting this though).
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has store copy;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp
new file mode 100644
index 000000000..6f79e15cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.exp
@@ -0,0 +1,17 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.move:5:19
+  │
+5 │     struct Foo {} has store
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.move:6:5
+  │
+6 │     struct Bar has key {}
+  │     ^^^^^^
+  │     │
+  │     Unexpected 'struct'
+  │     Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.move
new file mode 100644
index 000000000..5b7212f5b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_missing_semi_multiple_structs.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons (this will error before hitting this though).
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has store
+    struct Bar has key {}
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.exp
new file mode 100644
index 000000000..2a9fbb64f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.exp
@@ -0,0 +1,14 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.move:5:19
+  │
+5 │     struct Foo {} has
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.move:6:1
+  │
+6 │ }
+  │ ^ Unexpected '}'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.move
new file mode 100644
index 000000000..b3a631d9a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_no_semi.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons (this will error before hitting this though).
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.exp
new file mode 100644
index 000000000..42c701813
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.exp
@@ -0,0 +1,14 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.move:5:19
+  │
+5 │     struct Foo {} has;
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.move:5:22
+  │
+5 │     struct Foo {} has;
+  │                      ^ Unexpected ';'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.move
new file mode 100644
index 000000000..0ad7465c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_abilities_with_semi.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons (this will error before hitting this though).
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.exp
new file mode 100644
index 000000000..316ba2082
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_fields.move:5:38
+  │
+5 │     native struct Foo has copy, drop has store;
+  │                                      ^^^
+  │                                      │
+  │                                      Unexpected 'has'
+  │                                      Expected one of: ',', '{', '(', or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.move
new file mode 100644
index 000000000..af6a59f80
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_fields.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // has both prefix and postfix ability declarations
+    // Postfix ability declarations are not supported before 2024 edition
+    native struct Foo has copy, drop has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.exp
new file mode 100644
index 000000000..ede4135f8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.exp
@@ -0,0 +1,17 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_semi.move:5:19
+  │
+5 │     struct Foo {} has store
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_postfix_no_semi.move:6:1
+  │
+6 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected one of: ',' or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.move
new file mode 100644
index 000000000..180e9ab52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_no_semi.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations require semicolons (this will error before hitting this though).
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has store
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.exp
new file mode 100644
index 000000000..3ebe9bed3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.exp
@@ -0,0 +1,8 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifier_postfix_with_semi.move:4:19
+  │
+4 │     struct Foo {} has store;
+  │                   ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.move
new file mode 100644
index 000000000..db00881b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_postfix_with_semi.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Postfix ability declarations are not supported before 2024 edition
+    struct Foo {} has store;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.exp
new file mode 100644
index 000000000..54573205f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifier_trailing_comma.move:4:32
+  │
+4 │     struct Foo has copy, drop, {}
+  │                                ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.move
new file mode 100644
index 000000000..c509d1208
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifier_trailing_comma.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid trailing comma
+    struct Foo has copy, drop, {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.exp
new file mode 100644
index 000000000..9621cf9fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.exp
@@ -0,0 +1,22 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move:4:28
+  │
+4 │     struct Foo has copy {} has;
+  │                            ^^^ Postfix abilities are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move:4:28
+  │
+4 │     struct Foo has copy {} has;
+  │                ---         ^^^ Duplicate ability declaration. Abilities can be declared before or after the field declarations, but not both.
+  │                │            
+  │                Ability declaration previously given here
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move:4:31
+  │
+4 │     struct Foo has copy {} has;
+  │                               ^ Unexpected ';'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move
new file mode 100644
index 000000000..a1314a592
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_infix_no_abilities_postfix.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has copy {} has;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.exp
new file mode 100644
index 000000000..ab5a1e856
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.move:4:20
+  │
+4 │     struct Foo has {} has;
+  │                    ^ Unexpected '{'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.move
new file mode 100644
index 000000000..e48dc7ba1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/ability_modifies_no_abilities_infix_postfix.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module M {
+    // invalid ability declaration
+    struct Foo has {} has;
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.exp
new file mode 100644
index 000000000..0d44fb451
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/acquires_list_generic.move:6:25
+  │
+6 │     fun foo() acquires B<CupC<R>> {
+  │                         ^
+  │                         │
+  │                         Unexpected '<'
+  │                         Expected ','
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.move b/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.move
new file mode 100644
index 000000000..b3cc6c30c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/acquires_list_generic.move
@@ -0,0 +1,9 @@
+module M {
+    struct CupC<T: drop> {}
+    struct R {}
+    struct B<T> {}
+
+    fun foo() acquires B<CupC<R>> {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.exp
new file mode 100644
index 000000000..1a7123b2c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/address_misspelled.move:1:1
+  │
+1 │ addrexx 0x1:
+  │ ^^^^^^^ Invalid code unit. Expected 'address', 'module', or 'script'. Got 'addrexx'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.move
new file mode 100644
index 000000000..544f1ea64
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_misspelled.move
@@ -0,0 +1 @@
+addrexx 0x1:
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_not_hex.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_not_hex.move
new file mode 100644
index 000000000..249619a65
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_not_hex.move
@@ -0,0 +1,3 @@
+address 1 {
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.exp
new file mode 100644
index 000000000..6e29aa1c6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.exp
@@ -0,0 +1,6 @@
+error[E01005]: invalid address
+  ┌─ tests/move_check/parser/address_too_long.move:2:9
+  │
+2 │ address 0x112233445566778899101122334455667788992011223344556677889930112233 {
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid address literal. The numeric value is too large. The maximum size is 32 bytes
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.move
new file mode 100644
index 000000000..22ee75579
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long.move
@@ -0,0 +1,4 @@
+// Addresses are at most 16 bytes long.
+address 0x112233445566778899101122334455667788992011223344556677889930112233 {
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.exp
new file mode 100644
index 000000000..8f0d24db3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.exp
@@ -0,0 +1,6 @@
+error[E01005]: invalid address
+  ┌─ tests/move_check/parser/address_too_long_decimal.move:1:9
+  │
+1 │ address 340282366920938463463374607431768211456123451234512345123451234512345123451234576969869689 {
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid address literal. The numeric value is too large. The maximum size is 32 bytes
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.move
new file mode 100644
index 000000000..814a377bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal.move
@@ -0,0 +1,3 @@
+address 340282366920938463463374607431768211456123451234512345123451234512345123451234576969869689 {
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.exp
new file mode 100644
index 000000000..b21feb13e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.exp
@@ -0,0 +1,6 @@
+error[E01005]: invalid address
+  ┌─ tests/move_check/parser/address_too_long_decimal_exp.move:4:18
+  │
+4 │         let x = @3402823669209384634633746074317682114568097213470921387019238740912836510928347019247; x;
+  │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid address literal. The numeric value is too large. The maximum size is 32 bytes
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.move
new file mode 100644
index 000000000..99abaa225
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_decimal_exp.move
@@ -0,0 +1,6 @@
+// Addresses are at most 16 bytes long.
+script {
+    fun main() {
+        let x = @3402823669209384634633746074317682114568097213470921387019238740912836510928347019247; x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.exp
new file mode 100644
index 000000000..40b264ed8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.exp
@@ -0,0 +1,6 @@
+error[E01005]: invalid address
+  ┌─ tests/move_check/parser/address_too_long_exp.move:4:18
+  │
+4 │         let x = @0x112233445566778899101122334455667788992011223344556677889930112233; x;
+  │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid address literal. The numeric value is too large. The maximum size is 32 bytes
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.move b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.move
new file mode 100644
index 000000000..d972e3f24
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/address_too_long_exp.move
@@ -0,0 +1,6 @@
+// Addresses are at most 16 bytes long.
+script {
+    fun main() {
+        let x = @0x112233445566778899101122334455667788992011223344556677889930112233; x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.exp
new file mode 100644
index 000000000..bfc04c017
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/attribute_no_closing_bracket.move:4:5
+  │
+3 │     #[attr = 0
+  │      - To match this '['
+4 │     fun foo() {}
+  │     ^ Expected ']'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.move b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.move
new file mode 100644
index 000000000..9a28c27c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_no_closing_bracket.move
@@ -0,0 +1,5 @@
+module 0x42::M {
+    // Errors expecting a ']'
+    #[attr = 0
+    fun foo() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.exp
new file mode 100644
index 000000000..ee09f15b2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/attribute_num_sign_no_bracket.move:4:5
+  │
+4 │     fun foo() {}
+  │     ^^^
+  │     │
+  │     Unexpected 'fun'
+  │     Expected '['
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.move b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.move
new file mode 100644
index 000000000..467110986
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_num_sign_no_bracket.move
@@ -0,0 +1,5 @@
+module 0x42::M {
+    // Errors expecting a '['
+    #
+    fun foo() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_placement.move b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_placement.move
new file mode 100644
index 000000000..0c50c6f7a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_placement.move
@@ -0,0 +1,46 @@
+#[attr]
+address 0x42 {
+#[attr]
+module M {
+    #[attr]
+    use 0x42::N;
+
+    #[attr]
+    struct S {}
+
+    #[attr]
+    const C: u64 = 0;
+
+    #[attr]
+    public fun foo() { N::bar() }
+
+    #[attr]
+    spec foo {}
+}
+}
+
+#[attr]
+module 0x42::N {
+    #[attr]
+    friend 0x42::M;
+
+    #[attr]
+    public fun bar() {}
+}
+
+#[attr]
+script {
+    #[attr]
+    use 0x42::M;
+
+    #[attr]
+    const C: u64 = 0;
+
+    #[attr]
+    fun main() {
+        M::foo();
+    }
+
+    #[attr]
+    spec main { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_variants.move b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_variants.move
new file mode 100644
index 000000000..482fa4cba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/attribute_variants.move
@@ -0,0 +1,6 @@
+#[]
+#[attr0]
+#[attr1=0, attr2=b"hello", attr3=x"0f", attr4=0x42, attr5(attr0, attr1, attr2(attr0, attr1=0))]
+#[bttr0=false, bttr1=0u8, bttr2=0u64, bttr3=0u128]
+#[]
+module 0x42::M {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.exp
new file mode 100644
index 000000000..144ccb4dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/borrow_mut_space.move:6:15
+  │
+6 │         & mut x.f
+  │               ^
+  │               │
+  │               Unexpected 'x'
+  │               Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.move b/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.move
new file mode 100644
index 000000000..b09c62b0a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/borrow_mut_space.move
@@ -0,0 +1,8 @@
+module a::m {
+    struct S {
+        f: u64,
+    }
+    public fun foo(x: &mut S): &mut u64 {
+        & mut x.f
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.exp
new file mode 100644
index 000000000..47d6c036f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.exp
@@ -0,0 +1,11 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/break_with_value.move:3:22
+  │
+3 │         loop { break 0 };
+  │                      ^
+  │                      │
+  │                      Unexpected '0'
+  │                      Expected the end of an expression
+  │
+  = 'break' with a value is not yet supported
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.move
new file mode 100644
index 000000000..c37d4dd02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/break_with_value.move
@@ -0,0 +1,5 @@
+module 0x42::M {
+    fun t(cond: bool) {
+        loop { break 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.exp
new file mode 100644
index 000000000..f52303046
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.exp
@@ -0,0 +1,6 @@
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_invalid_escaped_sequence.move:3:15
+  │
+3 │         b"libr\a"
+  │               ^^ Invalid escape sequence: '\a'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.move
new file mode 100644
index 000000000..0d8f3fef4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_escaped_sequence.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    public fun bad_value1(): vector<u8> {
+        b"libr\a"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.exp
new file mode 100644
index 000000000..f1eb56084
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.exp
@@ -0,0 +1,6 @@
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_invalid_hex.move:3:18
+  │
+3 │         b"diem \xG0"
+  │                  ^ Invalid hexadecimal character: 'G'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.move
new file mode 100644
index 000000000..278d1fac1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_invalid_hex.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    public fun bad_value(): vector<u8> {
+        b"diem \xG0"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_success.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_success.move
new file mode 100644
index 000000000..b5eb37aa0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_success.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    public fun byte_string(): vector<u8> {
+        b"Diem"
+    }
+    public fun byte_string_with_quotes(): vector<u8> {
+        b"\"Diem\""
+    }
+    public fun byte_string_with_escaped_sequence(): vector<u8> {
+        b"Hello\n diem. \n Newline; \r Carriage return; \t Tab; \\ Backslash; \0 Null"
+    }
+    public fun empty_byte_string(): vector<u8> {
+        b""
+    }
+    public fun byte_string_with_hex(): vector<u8> {
+        b"\x00\x01\x02"
+    }
+    public fun escaped_backslash_before_quote(): vector<u8> {
+        b"\\"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.exp
new file mode 100644
index 000000000..0b9316490
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.exp
@@ -0,0 +1,6 @@
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_token_eof1.move:3:9
+  │
+3 │         b"diem\"
+  │         ^^^^^^^^ Missing closing quote (") after byte string
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.move
new file mode 100644
index 000000000..642d99d9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof1.move
@@ -0,0 +1,5 @@
+module M {
+    public fun bad_value(): vector<u8> {
+        b"diem\"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.exp
new file mode 100644
index 000000000..9877efef9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.exp
@@ -0,0 +1,6 @@
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_token_eof2.move:3:9
+  │
+3 │         b"Diem
+  │         ^^^^^^ Missing closing quote (") after byte string
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.move
new file mode 100644
index 000000000..eaed8acda
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof2.move
@@ -0,0 +1,5 @@
+module M {
+    public fun bad_value(): vector<u8> {
+        b"Diem
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.exp
new file mode 100644
index 000000000..8d901b3d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.exp
@@ -0,0 +1,12 @@
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_token_eof3.move:3:11
+  │
+3 │         b"\x0";
+  │           ^^^ Invalid escape: '\x0'. Hex literals are represented by two symbols: [\x00-\xFF].
+
+error[E01007]: invalid byte string
+  ┌─ tests/move_check/parser/byte_string_token_eof3.move:4:11
+  │
+4 │         b"\x"
+  │           ^^ Invalid escape: '\x'. Hex literals are represented by two symbols: [\x00-\xFF].
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.move b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.move
new file mode 100644
index 000000000..2cc2b6146
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/byte_string_token_eof3.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    public fun bad_value(): vector<u8> {
+        b"\x0";
+        b"\x"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.exp
new file mode 100644
index 000000000..8b0a03fd0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.exp
@@ -0,0 +1,6 @@
+warning[W01004]: invalid documentation comment
+  ┌─ tests/move_check/parser/comments_nested_unbalanced.move:1:4
+  │
+1 │ /* /** /** * / */ /** */
+  │    ^^ Unclosed block comment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.move b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.move
new file mode 100644
index 000000000..e3fb89196
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_nested_unbalanced.move
@@ -0,0 +1 @@
+/* /** /** * / */ /** */
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/comments_ok.move b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_ok.move
new file mode 100644
index 000000000..314fbd306
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_ok.move
@@ -0,0 +1,21 @@
+/// This is a test.
+module 0x8675309::M {
+    /**
+     * One can have /* nested */
+     * // block comments
+     */
+    fun f() { }
+
+    /* This is a nested /* regular comment // */ */
+    fun g() {}
+
+    // This is a line comment which contains unbalanced /* delimiter.
+    fun h() {}
+
+    // Comments in strings are not comments at all.
+    fun str(): vector<u8> {
+        b"http://diem.com"
+    }
+
+    // This is a regular comment which appears where a doc comment would not be allowed.
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.exp
new file mode 100644
index 000000000..3e2c3fba1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.exp
@@ -0,0 +1,6 @@
+warning[W01004]: invalid documentation comment
+  ┌─ tests/move_check/parser/comments_unbalanced.move:3:5
+  │
+3 │     /** This comment must be closed.
+  │     ^^^ Unclosed block comment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.move b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.move
new file mode 100644
index 000000000..b2215a556
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/comments_unbalanced.move
@@ -0,0 +1,5 @@
+/// This is a test.
+module M {
+    /** This comment must be closed.
+    fun f() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.exp
new file mode 100644
index 000000000..93a09b33d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.exp
@@ -0,0 +1,6 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/constant_native.move:3:5
+  │
+3 │     native const Foo: u64 = 0;
+  │     ^^^^^^ Invalid constant declaration. 'native' constants are not supported
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.move
new file mode 100644
index 000000000..a8400bbfb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_native.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    // native modifiers on constants fail during parsing
+    native const Foo: u64 = 0;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.exp
new file mode 100644
index 000000000..0a1a277b8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.exp
@@ -0,0 +1,6 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/constant_public.move:3:5
+  │
+3 │     public const Foo: u64 = 0;
+  │     ^^^^^^ Invalid constant declaration. Constants cannot have visibility modifiers as they are always internal
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.move
new file mode 100644
index 000000000..ebec7b24b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_public.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    // visibility modifiers on constants fail during parsing
+    public const Foo: u64 = 0;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.exp
new file mode 100644
index 000000000..2274e5c50
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/constant_type_annotation_invalid.move:2:25
+  │
+2 │     const EThreadMaxxed = 1;
+  │                         ^ Expected a type annotation for this constant, e.g. 'EThreadMaxxed: <type>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.move
new file mode 100644
index 000000000..1c9984830
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_type_annotation_invalid.move
@@ -0,0 +1,3 @@
+module 0x42::m {
+    const EThreadMaxxed = 1;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constant_values.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_values.move
new file mode 100644
index 000000000..34db1a547
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constant_values.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    fun int8(): u8 {
+        1u8
+    }
+    fun int64(): u64 {
+        2 + 3u64
+    }
+    fun int128(): u128 {
+        4u128
+    }
+    fun int16(): u16 {
+        123u16
+    }
+    fun int32(): u32 {
+        84 + 53u32
+    }
+    fun int256(): u256 {
+        4u256
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.exp
new file mode 100644
index 000000000..85db8c177
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.exp
@@ -0,0 +1,51 @@
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_blocks.move:5:23
+  │
+5 │     const C1: u64 = { u() };
+  │                       ^^^ Module calls are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_blocks.move:7:24
+  │
+7 │     const C3: bool = { loop () };
+  │                        ^^^^^^^ 'loop' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_blocks.move:8:22
+  │
+8 │     const C4: u8 = { if (false) 0 else 1 };
+  │                      ^^^^^^^^^^^^^^^^^^^ 'if' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_blocks.move:9:40
+  │
+9 │     const C5: vector<vector<bool>> = { abort 0 };
+  │                                        ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04012]: invalid type for constant
+   ┌─ tests/move_check/parser/constants_blocks.move:11:15
+   │
+11 │     const C7: () = {
+   │               ^^
+   │               │
+   │               Unpermitted constant type
+   │               Found: '()'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/parser/constants_blocks.move:12:9
+   │
+12 │         let x = 0;
+   │         ^^^^^^^^^ 'let' declarations are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/parser/constants_blocks.move:13:9
+   │
+13 │         let y = 1;
+   │         ^^^^^^^^^ 'let' declarations are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/parser/constants_blocks.move:19:9
+   │
+19 │         u();
+   │         ^^^ Module calls are not supported in constants
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.move
new file mode 100644
index 000000000..1e00bf44b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_blocks.move
@@ -0,0 +1,23 @@
+address 0x42 {
+module M {
+    fun u(): u64 { 0 }
+
+    const C1: u64 = { u() };
+    const C2: u64 = { 0 + 1 * 2 % 3 / 4 >> 1 << 2 };
+    const C3: bool = { loop () };
+    const C4: u8 = { if (false) 0 else 1 };
+    const C5: vector<vector<bool>> = { abort 0 };
+    const C6: u128 = { 0 };
+    const C7: () = {
+        let x = 0;
+        let y = 1;
+        x + y;
+    };
+    const C8: address = {
+        0;
+        1 + 1;
+        u();
+        @0x0
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.exp
new file mode 100644
index 000000000..73b871b04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.exp
@@ -0,0 +1,30 @@
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_simple.move:5:21
+  │
+5 │     const C1: u64 = u();
+  │                     ^^^ Module calls are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_simple.move:7:22
+  │
+7 │     const C3: bool = loop ();
+  │                      ^^^^^^^ 'loop' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_simple.move:8:20
+  │
+8 │     const C4: u8 = if (cond) 0 else 1;
+  │                    ^^^^^^^^^^^^^^^^^^ 'if' expressions are not supported in constants
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/constants_simple.move:8:24
+  │
+8 │     const C4: u8 = if (cond) 0 else 1;
+  │                        ^^^^ Invalid variable usage. Unbound variable 'cond'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/parser/constants_simple.move:9:38
+  │
+9 │     const C5: vector<vector<bool>> = abort 0;
+  │                                      ^^^^^^^ 'abort' expressions are not supported in constants
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.move
new file mode 100644
index 000000000..dc5e980cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_simple.move
@@ -0,0 +1,16 @@
+address 0x42 {
+module M {
+    fun u(): u64 { 0 }
+
+    const C1: u64 = u();
+    const C2: u64 = 0 + 1 * 2 % 3 / 4 - 5 >> 6 << 7;
+    const C3: bool = loop ();
+    const C4: u8 = if (cond) 0 else 1;
+    const C5: vector<vector<bool>> = abort 0;
+    const C6: u128 = 0;
+    const C7: u256 = 4 / 3 + 4 - 1 << 143;
+    const C8: u16 = 123;
+    const C9: u32 = (453 as u32);
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.exp
new file mode 100644
index 000000000..232ac333b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/constants_standalone_let.move:4:21
+  │
+4 │     const C1: u64 = let x = 0;
+  │                     ^^^
+  │                     │
+  │                     Unexpected 'let'
+  │                     Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.move b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.move
new file mode 100644
index 000000000..4b4768cb6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/constants_standalone_let.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+
+    const C1: u64 = let x = 0;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.exp
new file mode 100644
index 000000000..d1e3d8d07
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.exp
@@ -0,0 +1,48 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/control_exp_as_term.move:7:13
+  │
+7 │         1 + loop {} + 2;
+  │             ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/control_exp_as_term.move:8:13
+  │
+8 │         1 + return + 0;
+  │             ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:10:14
+   │
+10 │         foo(&if (cond) 0 else 1);
+   │              ^^^^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:11:14
+   │
+11 │         foo(&loop {});
+   │              ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:12:14
+   │
+12 │         foo(&return);
+   │              ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:13:14
+   │
+13 │         foo(&abort 0);
+   │              ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.move
new file mode 100644
index 000000000..4b6193fbe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_as_term.move
@@ -0,0 +1,15 @@
+module 0x42::M {
+
+    fun foo(_: &u64) {}
+
+    fun t(cond: bool) {
+        1 + if (cond) 0 else { 1 } + 2;
+        1 + loop {} + 2;
+        1 + return + 0;
+
+        foo(&if (cond) 0 else 1);
+        foo(&loop {});
+        foo(&return);
+        foo(&abort 0);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity.move
new file mode 100644
index 000000000..c9f44701b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity.move
@@ -0,0 +1,10 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+module 0x42::M {
+    fun t(cond: bool) {
+        let _: u64 = 1 + if (cond) 0 else 10 + 10;
+        let _: bool = true || if (cond) false else 10 == 10;
+        let _: bool = if (cond) 10 else { 10 } == 10;
+        let _: u64 = if (cond) 0 else { 10 } + 1;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp
new file mode 100644
index 000000000..a05e423d0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+   ┌─ tests/move_check/parser/control_exp_associativity_else_after_if_block.move:13:28
+   │
+13 │         if (cond) { s1 }.f else s2.f
+   │                            ^^^^
+   │                            │
+   │                            Unexpected 'else'
+   │                            Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move
new file mode 100644
index 000000000..cf1c1d789
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move
@@ -0,0 +1,17 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+module 0x42::M {
+
+    struct S has copy, drop { f: u64 }
+
+    fun t(cond: bool, s1: S, s2: S) {
+        // (if (cond) s1 else s2).f
+        let _: u64 = if (cond) { s1 } else { s2 }.f;
+
+        // (if (cond) s1).f else (s2.f)
+        // so parsing error
+        if (cond) { s1 }.f else s2.f
+
+
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move
new file mode 100644
index 000000000..8581cea7f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move
@@ -0,0 +1,16 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// valid usage with field access
+
+module 0x42::M {
+
+    struct S has copy, drop { f: u64 }
+
+    fun t(cond: bool, s1: S, s2: S) {
+        let _: u64 = if (cond) 0 else s2.f;
+        let _: u64 = if (cond) s1.f else s2.f;
+        let _: u64 = if (cond) s1 else { s2 }.f;
+        let _: u64 = if (cond) { s1 } else { s2 }.f;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp
new file mode 100644
index 000000000..789d0a379
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp
@@ -0,0 +1,88 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:12:9
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Found: 'u64'. It is not compatible with the other type.
+   ·
+12 │         if (cond) bar() + 1;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Incompatible branches
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:9
+   │
+15 │         if (cond) { foo() } + 1;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:29
+   │
+15 │         if (cond) { foo() } + 1;
+   │         ------------------- ^ - Found: integer. It is not compatible with the other type.
+   │         │                   │  
+   │         │                   Incompatible arguments to '+'
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:31
+   │
+15 │         if (cond) { foo() } + 1;
+   │         -------------------   ^ Invalid argument to '+'
+   │         │                      
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:19:22
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Given: 'u64'
+   ·
+19 │         while (cond) bar() + 2;
+   │                      ^^^^^^^^^
+   │                      │
+   │                      Invalid loop body
+   │                      Expected: '()'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:9
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:32
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ---------------------- ^ - Found: integer. It is not compatible with the other type.
+   │         │                      │  
+   │         │                      Incompatible arguments to '+'
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:34
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ----------------------   ^ Invalid argument to '+'
+   │         │                         
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:26:14
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Given: 'u64'
+   ·
+26 │         loop bar() + 2;
+   │              ^^^^^^^^^
+   │              │
+   │              Invalid loop body
+   │              Expected: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move
new file mode 100644
index 000000000..69b19a99d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move
@@ -0,0 +1,29 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// these cases do not type check
+
+module 0x42::M {
+    fun foo() {}
+    fun bar(): u64 { 0 }
+
+    fun t(cond: bool) {
+        // if (cond) (bar() + 1);
+        // so error about incompatible branches
+        if (cond) bar() + 1;
+        // (if (cond) bar()) + 1;
+        // so error about wrong argument to +
+        if (cond) { foo() } + 1;
+
+        // while (cond) (bar() + 1);
+        // so error about invalid loop body type
+        while (cond) bar() + 2;
+        // (while (cond) foo()) + 2
+        // so error about wrong argument to +
+        while (cond) { foo() } + 2;
+
+        // loop (bar() + 1);
+        // so error about invalid loop body type
+        loop bar() + 2;
+        // loop { foo() } + 2; would type check
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp
new file mode 100644
index 000000000..6ed941f6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp
@@ -0,0 +1,96 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:9:11
+  │
+9 │     fun t(cond: bool): u64 {
+  │           ^^^^ Unused parameter 'cond'. Consider removing or prefixing with an underscore: '_cond'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:11:13
+   │
+11 │         1 + loop { foo() } + 2;
+   │             ^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:12:13
+   │
+12 │         1 + loop foo();
+   │             ^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:12:18
+   │
+12 │         1 + loop foo();
+   │                  ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:13:9
+   │
+13 │         loop { foo() } + 1;
+   │         ^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:13:16
+   │
+13 │         loop { foo() } + 1;
+   │                ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:17:9
+   │
+17 │         return { 1 + 2 };
+   │         ^^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:18:9
+   │
+18 │         return { 1 } && false;
+   │         ^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:18:9
+   │
+18 │         return { 1 } && false;
+   │         ^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:22:9
+   │
+22 │         abort { 1 + 2 };
+   │         ^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:23:9
+   │
+23 │         abort { 1 } && false;
+   │         ^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:23:9
+   │
+23 │         abort { 1 } && false;
+   │         ^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move
new file mode 100644
index 000000000..e7f8b2cab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move
@@ -0,0 +1,27 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// these cases type check, but have dead code
+
+module 0x42::M {
+    fun foo() {}
+    fun bar(): u64 { 0 }
+
+    fun t(cond: bool): u64 {
+        // loop
+        1 + loop { foo() } + 2;
+        1 + loop foo();
+        loop { foo() } + 1;
+
+        // return
+        return 1 + 2;
+        return { 1 + 2 };
+        return { 1 } && false;
+
+        // abort
+        abort 1 + 2;
+        abort { 1 + 2 };
+        abort { 1 } && false;
+
+        0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/decimal_address.move b/vendors/move/crates/move-compiler/tests/move_check/parser/decimal_address.move
new file mode 100644
index 000000000..d8b405639
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/decimal_address.move
@@ -0,0 +1,16 @@
+// Addresses can be decimal numbers
+address 123 {
+module M {
+    struct S {}
+    public fun nop() {}
+    public fun bar(): S { S{} }
+}
+}
+module 123::N {
+    use 123::M;
+    use 123::M::S;
+    fun foo(): 123::M::S {
+        M::nop();
+        (123::M::bar(): S)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.exp
new file mode 100644
index 000000000..0178da0fb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.exp
@@ -0,0 +1,24 @@
+warning[W01004]: invalid documentation comment
+   ┌─ tests/move_check/parser/doc_comments_placement.move:16:9
+   │
+16 │         /// There can be no doc comment after last field.
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Documentation comment cannot be matched to a language item
+
+warning[W01004]: invalid documentation comment
+   ┌─ tests/move_check/parser/doc_comments_placement.move:23:9
+   │
+23 │         /// There can be no doc comment after last block member.
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Documentation comment cannot be matched to a language item
+
+warning[W01004]: invalid documentation comment
+   ┌─ tests/move_check/parser/doc_comments_placement.move:26:5
+   │
+26 │     /// There can be no doc comment after last module item.
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Documentation comment cannot be matched to a language item
+
+warning[W01004]: invalid documentation comment
+   ┌─ tests/move_check/parser/doc_comments_placement.move:29:1
+   │
+29 │ /// There can be no doc comment at end of file.
+   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Documentation comment cannot be matched to a language item
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.move b/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.move
new file mode 100644
index 000000000..b7a80591f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/doc_comments_placement.move
@@ -0,0 +1,29 @@
+/// This is documentation for module M.
+
+/// Documentation comments can have multiple blocks.
+/** They may use different limiters. */
+module 0x42::M {
+    /** There can be no doc comment on uses. */
+    use std::option::Option;
+
+    /// This is f.
+    fun f() { }
+
+    /// This is T
+    struct T {
+        /// This is a field of T.
+        f: Option<u64>,
+        /// There can be no doc comment after last field.
+    }
+
+    /// This is some spec.
+    spec module {
+        /// This is a pragma.
+        pragma verify = true;
+        /// There can be no doc comment after last block member.
+    }
+
+    /// There can be no doc comment after last module item.
+}
+
+/// There can be no doc comment at end of file.
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.exp
new file mode 100644
index 000000000..4930a1562
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.exp
@@ -0,0 +1,24 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/duplicate_attributes.move:2:10
+  │
+2 │     #[a, a(x = 0)]
+  │       -  ^^^^^^^^ Duplicate attribute 'a' attached to the same item
+  │       │   
+  │       Attribute previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/duplicate_attributes.move:5:12
+  │
+5 │     #[b(a, a = 0, a(x = 1))]
+  │         -  ^^^^^ Duplicate attribute 'a' attached to the same item
+  │         │   
+  │         Attribute previously given here
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/duplicate_attributes.move:5:19
+  │
+5 │     #[b(a, a = 0, a(x = 1))]
+  │         -         ^^^^^^^^ Duplicate attribute 'a' attached to the same item
+  │         │          
+  │         Attribute previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.move b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.move
new file mode 100644
index 000000000..e2de77f0f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_attributes.move
@@ -0,0 +1,7 @@
+module 0x42::M {
+    #[a, a(x = 0)]
+    fun foo() {}
+
+    #[b(a, a = 0, a(x = 1))]
+    fun bar() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.exp
new file mode 100644
index 000000000..f35cc6390
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.exp
@@ -0,0 +1,8 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/duplicate_entry_modifier.move:2:11
+  │
+2 │     entry entry fun foo() {}
+  │     ----- ^^^^^ Duplicate 'entry' modifier
+  │     │      
+  │     'entry' modifier previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.move b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.move
new file mode 100644
index 000000000..c0193914b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/duplicate_entry_modifier.move
@@ -0,0 +1,3 @@
+module 0x2::M {
+    entry entry fun foo() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/empty_file.move b/vendors/move/crates/move-compiler/tests/move_check/parser/empty_file.move
new file mode 100644
index 000000000..238961cac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/empty_file.move
@@ -0,0 +1 @@
+// The grammar allows a module file to be empty.
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.exp
new file mode 100644
index 000000000..cfe4bcbb9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.exp
@@ -0,0 +1,6 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/entry_const.move:3:5
+  │
+3 │     entry const S: u64 = 0;
+  │     ^^^^^ Invalid constant declaration. 'entry' is used only on functions
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.move b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.move
new file mode 100644
index 000000000..915964c46
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_const.move
@@ -0,0 +1,4 @@
+module 0x2::M {
+    // invalid modifier
+    entry const S: u64 = 0;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/entry_function.move b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_function.move
new file mode 100644
index 000000000..c2c9505e9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_function.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    public entry fun f0() {}
+    entry public fun f1() {}
+    entry fun f2() {}
+    native entry fun f3();
+    entry native fun f4();
+    entry native public fun f5();
+    native entry public fun f6();
+    native public entry fun f7();
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.exp
new file mode 100644
index 000000000..db53d0924
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.exp
@@ -0,0 +1,6 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/entry_struct.move:3:5
+  │
+3 │     entry struct S {}
+  │     ^^^^^ Invalid constant declaration. 'entry' is used only on functions
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.move b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.move
new file mode 100644
index 000000000..4371a5fe8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/entry_struct.move
@@ -0,0 +1,4 @@
+module 0x2::M {
+    // invalid modifier
+    entry struct S {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_braces.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_braces.move
new file mode 100644
index 000000000..9fb277bb1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_braces.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun f(v: u64) {
+        // Braces or parenthesis are not required for a control expression
+        // inside an "abort" expression.
+        abort if (v == 0) 10 else v
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.exp
new file mode 100644
index 000000000..802e95f26
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/expr_abort_missing_value.move:5:5
+  │
+5 │     }
+  │     ^
+  │     │
+  │     Unexpected '}'
+  │     Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.move
new file mode 100644
index 000000000..bf7c75da2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_abort_missing_value.move
@@ -0,0 +1,6 @@
+module M {
+    fun f(v: u64) {
+        // Aborts always require a value
+        if (v > 100) abort
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_braces.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_braces.move
new file mode 100644
index 000000000..d8fe67710
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_braces.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f(cond: bool) {
+        // Braces or parenthesis are not required for a control expression
+        // inside an "if" expression.
+        if (cond) { if (cond) () };
+        if (cond) ( if (cond) () );
+        if (cond) if (cond) ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.exp
new file mode 100644
index 000000000..8662ae1ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/expr_if_missing_parens.move:4:12
+  │
+4 │         if v < 3 ()
+  │            ^
+  │            │
+  │            Unexpected 'v'
+  │            Expected '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.move
new file mode 100644
index 000000000..3e8fee7af
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_if_missing_parens.move
@@ -0,0 +1,6 @@
+module M {
+    fun f(v: u64) {
+        // Test an "if" expression missing parenthesis around the condition
+        if v < 3 ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_loop_braces.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_loop_braces.move
new file mode 100644
index 000000000..074687630
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_loop_braces.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f(v: u64) {
+        // Braces or parenthesis are not required for a control expression
+        // inside a "loop" expression.
+        loop { if (v < 10) break };
+        loop ( if (v < 10) break );
+        loop if (v < 10) break
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_braces.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_braces.move
new file mode 100644
index 000000000..b7d98247e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_braces.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun f(v: u64): u64 {
+        // Braces or parenthesis are not required for a control expression
+        // inside a "return" expression.
+        return if (v > 10) 10 else v
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_missing_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_missing_value.move
new file mode 100644
index 000000000..1b3e861d9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_return_missing_value.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun f(v: u64) {
+        // Check a return without the optional return value
+        if (v > 100) return
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.exp
new file mode 100644
index 000000000..79265cd4f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/expr_unary_negation.move:5:19
+  │
+5 │     assert!(((1 - -2) == 3) && (-(1 - 2) == 1), 100);
+  │                   ^
+  │                   │
+  │                   Unexpected '-'
+  │                   Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.move
new file mode 100644
index 000000000..30885131f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_negation.move
@@ -0,0 +1,7 @@
+script {
+
+fun main() {
+    // Unary negation is not supported.
+    assert!(((1 - -2) == 3) && (-(1 - 2) == 1), 100);
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_ops.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_ops.move
new file mode 100644
index 000000000..2401f9aa1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_unary_ops.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    fun f(v: u64) {
+        let x = *&mut *&v; // Test borrows and dereferences
+        x;
+    }
+    fun annotated(v: u64): u64 {
+        (v : u64) // Test an expression annotated with a type
+    }
+    fun cast(v: u64): u64 {
+        (v as u64) // Test a type cast
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_braces.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_braces.move
new file mode 100644
index 000000000..33721b0ce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_braces.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f(v: u64) {
+        // Braces or parenthesis are not required for a control expression
+        // inside a "while" expression.
+        while (v < 10) { v = v + 1 };
+        while (v < 10) ( v = v + 1 );
+        while (v < 10) v = v + 1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.exp
new file mode 100644
index 000000000..f98b6300a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/expr_while_missing_parens.move:4:15
+  │
+4 │         while v < 3 { v = v + 1 }
+  │               ^
+  │               │
+  │               Unexpected 'v'
+  │               Expected '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.move b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.move
new file mode 100644
index 000000000..7b063837c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/expr_while_missing_parens.move
@@ -0,0 +1,6 @@
+module M {
+    fun f(v: u64) {
+        // Test a "while" expression missing parenthesis around the condition
+        while v < 3 { v = v + 1 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.exp
new file mode 100644
index 000000000..349dcb2c1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/extra_text_after_main.move:6:1
+  │
+6 │ fun foo() {
+  │ ^^^ Unexpected characters after end of 'script' function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.move b/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.move
new file mode 100644
index 000000000..6812c00e3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/extra_text_after_main.move
@@ -0,0 +1,8 @@
+// There should not be any tokens after the top-level main function.
+script {
+fun main() {
+}
+
+fun foo() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.exp
new file mode 100644
index 000000000..c16692439
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/friend_decl_address_only.move:3:16
+  │
+3 │     friend 0x42;
+  │            ----^ Unexpected ';'
+  │            │    
+  │            Expected '::' after an address in a module access chain
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.move
new file mode 100644
index 000000000..f20dd1e6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_address_only.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M {
+    friend 0x42;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.exp
new file mode 100644
index 000000000..60deb474e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/friend_decl_inside_function.move:6:9
+  │
+6 │         friend 0x42::A;
+  │         ^^^^^^
+  │         │
+  │         Unexpected 'friend'
+  │         Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.move
new file mode 100644
index 000000000..09ff00ec3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_inside_function.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {}
+
+module M {
+    fun M() {
+        friend 0x42::A;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.exp
new file mode 100644
index 000000000..3aeda3d38
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/friend_decl_missing_semicolon.move:6:1
+  │
+6 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.move
new file mode 100644
index 000000000..2e92ac6cf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_missing_semicolon.move
@@ -0,0 +1,7 @@
+address 0x42 {
+module A {}
+
+module M {
+    friend 0x42::A
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.exp
new file mode 100644
index 000000000..b767cf1f5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/friend_decl_more_than_one_module.move:7:14
+  │
+7 │     friend A 0x42::B;
+  │              ^^^^
+  │              │
+  │              Unexpected '0x42'
+  │              Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.move
new file mode 100644
index 000000000..59cbcb1c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_more_than_one_module.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {}
+module B {}
+
+module M {
+    use 0x42::A;
+    friend A 0x42::B;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.exp
new file mode 100644
index 000000000..7d3eeb9aa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.exp
@@ -0,0 +1,6 @@
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/parser/friend_decl_qualified_function.move:7:21
+  │
+7 │     friend 0x42::A::a;
+  │                     ^ Unexpected module member access. Expected a module identifier only
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.move
new file mode 100644
index 000000000..ff40c8362
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_function.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {
+    fun a() {}
+}
+
+module M {
+    friend 0x42::A::a;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.exp
new file mode 100644
index 000000000..b81bd3249
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.exp
@@ -0,0 +1,6 @@
+error[E03006]: unexpected name in this position
+  ┌─ tests/move_check/parser/friend_decl_qualified_struct.move:7:21
+  │
+7 │     friend 0x42::A::A;
+  │                     ^ Unexpected module member access. Expected a module identifier only
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.move
new file mode 100644
index 000000000..7237c60e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_qualified_struct.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module A {
+    struct A {}
+}
+
+module M {
+    friend 0x42::A::A;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_valid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_valid.move
new file mode 100644
index 000000000..6efd20a39
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/friend_decl_valid.move
@@ -0,0 +1,18 @@
+address 0x42 {
+module A {}
+module B {}
+module C {}
+
+module M {
+    // friend with fully qualified module id
+    friend 0x42::A;
+
+    // friend with imported name
+    use 0x42::B;
+    friend B;
+
+    // friend with asliased name
+    use 0x42::C as AliasedC;
+    friend AliasedC;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.exp
new file mode 100644
index 000000000..9a714dd18
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_acquires_bad_name.move:3:22
+  │
+3 │     fun f() acquires {
+  │                      ^
+  │                      │
+  │                      Unexpected '{'
+  │                      Expected a resource struct name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.move
new file mode 100644
index 000000000..26c524835
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_bad_name.move
@@ -0,0 +1,5 @@
+module M {
+    // Test for an invalid (i.e., missing) resource name
+    fun f() acquires {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.exp
new file mode 100644
index 000000000..97c74a338
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_acquires_missing_comma.move:5:25
+  │
+5 │     fun f() acquires X1 X2 {
+  │                         ^^
+  │                         │
+  │                         Unexpected 'X2'
+  │                         Expected ','
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.move
new file mode 100644
index 000000000..f72d37b3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_acquires_missing_comma.move
@@ -0,0 +1,9 @@
+module M {
+    struct X1 {}
+    struct X2 {}
+    // Test a missing comma in the acquires list.
+    fun f() acquires X1 X2 {
+        borrow_global_mut<X1>(0x1);
+        borrow_global_mut<X2>(0x1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.exp
new file mode 100644
index 000000000..27429d9b0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_incomplete.move:5:1
+  │
+5 │ 
+  │ ^
+  │ 
+  │ Unexpected end-of-file
+  │ Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.move
new file mode 100644
index 000000000..b7cb01a83
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_incomplete.move
@@ -0,0 +1,4 @@
+script {
+fun main() {
+// }
+//}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.exp
new file mode 100644
index 000000000..030ea84a2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_native_with_body.move:3:21
+  │
+3 │     native fun fn() {}
+  │                     ^
+  │                     │
+  │                     Unexpected '{'
+  │                     Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.move
new file mode 100644
index 000000000..a02159772
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_native_with_body.move
@@ -0,0 +1,4 @@
+module M {
+    // Native functions should not specify a function body.
+    native fun fn() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_commas.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_commas.move
new file mode 100644
index 000000000..3b3907151
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_commas.move
@@ -0,0 +1,3 @@
+module 0x8675309::M {
+    fun g(_q1: &mut u64, _q2: u64,) { } // Trailing commas are OK
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.exp
new file mode 100644
index 000000000..bdfecb2e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_params_missing.move:3:12
+  │
+3 │     fun fn { }
+  │            ^
+  │            │
+  │            Unexpected '{'
+  │            Expected '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.move
new file mode 100644
index 000000000..06ceea855
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_params_missing.move
@@ -0,0 +1,4 @@
+module M {
+    // The function parameters (in parens) must always be specified.
+    fun fn { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_public_native.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_public_native.move
new file mode 100644
index 000000000..716bbd8a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_public_native.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    // visibility can come before native. previously not allowed
+    public native fun f();
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_trailing_comma.move
new file mode 100644
index 000000000..6000129d0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_trailing_comma.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    // Trailing commas are *not* allowed in multi-value types.
+    fun f(): (u64, u64,) { (1, 2) }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type.move
new file mode 100644
index 000000000..904eda448
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    // Test a unit return value.
+    fun f1(): () { }
+
+    // Test a single type return value.
+    fun f2(): u64 { 1 }
+    fun f3(): (u64) { 1 }
+    fun f4(p: &u64): &u64 { p }
+
+    // Test multiple return values.
+    fun f5(): (u64, u64) { (1, 2) }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.exp
new file mode 100644
index 000000000..50b9d4caf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_return_type_missing.move:3:14
+  │
+3 │     fun f(): { }
+  │              ^
+  │              │
+  │              Unexpected '{'
+  │              Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.move
new file mode 100644
index 000000000..06edfac30
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_return_type_missing.move
@@ -0,0 +1,4 @@
+module M {
+    // Test a missing return type (but with a colon)
+    fun f(): { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_empty.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_empty.move
new file mode 100644
index 000000000..2d77127c6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_empty.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    // Test an empty list of type parameters.
+    fun fn<>() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.exp
new file mode 100644
index 000000000..e39a42d04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_type_extra_comma.move:2:12
+  │
+2 │     fun fn<,T>() { } // Test a comma before the first type parameter
+  │            ^ Expected a type parameter
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.move
new file mode 100644
index 000000000..975400e9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_extra_comma.move
@@ -0,0 +1,3 @@
+module M {
+    fun fn<,T>() { } // Test a comma before the first type parameter
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.exp
new file mode 100644
index 000000000..39804ea21
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_type_missing_angle.move:3:19
+  │
+3 │     fun fn<T1, T2 () { }
+  │           -       ^ Expected '>'
+  │           │        
+  │           To match this '<'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.move
new file mode 100644
index 000000000..83c3441a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_missing_angle.move
@@ -0,0 +1,4 @@
+module M {
+    // Test a missing ">" after the type parameters.
+    fun fn<T1, T2 () { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_nested.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_nested.move
new file mode 100644
index 000000000..040264c1f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_nested.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct R {}
+    struct B<T> { f: T }
+    fun fn<T>() { }
+    fun caller() {
+        fn<B<R>>(); // make sure '>>' is not parsed as a shift operator
+        fn<B<R,>>(); // also test with trailing comma
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_trailing_comma.move
new file mode 100644
index 000000000..5246ac45e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_type_trailing_comma.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun fn<T,>() { } // Test a trailing comma in the type parameters
+    fun caller() {
+        fn<u64,>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.exp
new file mode 100644
index 000000000..d508f0f6a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_visibility_empty.move:2:5
+  │
+2 │     public() fun f() {}
+  │     ^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public', 'public(friend)' or 'public(package)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.move
new file mode 100644
index 000000000..d85f127fa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_empty.move
@@ -0,0 +1,3 @@
+module M {
+    public() fun f() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend.move
new file mode 100644
index 000000000..175201bf6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    public(friend) fun f() {}
+    public (friend) fun g() {}
+    public ( friend ) fun h() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.exp
new file mode 100644
index 000000000..dc22cff72
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.exp
@@ -0,0 +1,22 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/function_visibility_friend_script.move:2:20
+  │
+2 │     public(friend) public(script) fun f() {}
+  │     -------------- ^^^^^^^^^^^^^^ Duplicate visibility modifier
+  │     │               
+  │     Visibility modifier previously given here
+
+warning[W00001]: DEPRECATED. will be removed
+  ┌─ tests/move_check/parser/function_visibility_friend_script.move:2:20
+  │
+2 │     public(friend) public(script) fun f() {}
+  │                    ^^^^^^^^^^^^^^ 'public(script)' is deprecated in favor of the 'entry' modifier. Replace with 'public entry'
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/parser/function_visibility_friend_script.move:3:20
+  │
+3 │     public(script) public(friend) fun g() {}
+  │     -------------- ^^^^^^^^^^^^^^ Duplicate visibility modifier
+  │     │               
+  │     Visibility modifier previously given here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.move
new file mode 100644
index 000000000..062b67e74
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_friend_script.move
@@ -0,0 +1,4 @@
+module 0x0::M {
+    public(friend) public(script) fun f() {}
+    public(script) public(friend) fun g() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.exp
new file mode 100644
index 000000000..daf7792dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_visibility_invalid.move:2:5
+  │
+2 │     public(invalid_modifier) fun f() {}
+  │     ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid visibility modifier. Consider removing it or using 'public', 'public(friend)' or 'public(package)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.move
new file mode 100644
index 000000000..dc5007051
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_invalid.move
@@ -0,0 +1,3 @@
+module M {
+    public(invalid_modifier) fun f() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.exp
new file mode 100644
index 000000000..875cd48c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_visibility_multiple.move:2:19
+  │
+2 │     public(script script) fun f() {}
+  │                   ^^^^^^
+  │                   │
+  │                   Unexpected 'script'
+  │                   Expected ')'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.move
new file mode 100644
index 000000000..393402590
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_multiple.move
@@ -0,0 +1,3 @@
+module M {
+    public(script script) fun f() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.exp
new file mode 100644
index 000000000..db5fdc64d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.exp
@@ -0,0 +1,18 @@
+warning[W00001]: DEPRECATED. will be removed
+  ┌─ tests/move_check/parser/function_visibility_script.move:2:5
+  │
+2 │     public(script) fun f() {}
+  │     ^^^^^^^^^^^^^^ 'public(script)' is deprecated in favor of the 'entry' modifier. Replace with 'public entry'
+
+warning[W00001]: DEPRECATED. will be removed
+  ┌─ tests/move_check/parser/function_visibility_script.move:3:5
+  │
+3 │     public (script) fun g() {}
+  │     ^^^^^^^^^^^^^^^ 'public(script)' is deprecated in favor of the 'entry' modifier. Replace with 'public entry'
+
+warning[W00001]: DEPRECATED. will be removed
+  ┌─ tests/move_check/parser/function_visibility_script.move:4:5
+  │
+4 │     public ( script ) fun h() {}
+  │     ^^^^^^^^^^^^^^^^^ 'public(script)' is deprecated in favor of the 'entry' modifier. Replace with 'public entry'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.move
new file mode 100644
index 000000000..a6db257e0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_visibility_script.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    public(script) fun f() {}
+    public (script) fun g() {}
+    public ( script ) fun h() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.exp
new file mode 100644
index 000000000..a13153934
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/function_without_body.move:3:13
+  │
+3 │     fun fn();
+  │             ^
+  │             │
+  │             Unexpected ';'
+  │             Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.move b/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.move
new file mode 100644
index 000000000..635b2746b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/function_without_body.move
@@ -0,0 +1,4 @@
+module M {
+    // Non-native functions must specify the function body.
+    fun fn();
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.exp
new file mode 100644
index 000000000..c48cafaa9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+   ┌─ tests/move_check/parser/global_access.move:13:24
+   │
+13 │         let _ : bool = ::exists<Self::R>(0x0);
+   │                        ^^
+   │                        │
+   │                        Unexpected '::'
+   │                        Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.move b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.move
new file mode 100644
index 000000000..5e8b0b3c0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access.move
@@ -0,0 +1,30 @@
+module M {
+    struct R {}
+
+    fun exists(): u64 { 0 }
+    fun move_to(): u64 { 0 }
+    fun borrow_global(): u64 { 0 }
+    fun borrow_global_mut(): u64 { 0 }
+    fun move_from(): u64 { 0 }
+    fun freeze(): u64 { 0 }
+
+    fun t(account: &signer) acquires Self::R {
+        let _ : u64 = exists();
+        let _ : bool = ::exists<Self::R>(0x0);
+
+        let _ : u64 = move_to();
+        let () = ::move_to<Self::R>(account, Self::R{});
+
+        let _ : u64 = borrow_global();
+        let _ : &Self::R = ::borrow_global<Self::R>(0x0);
+
+        let _ : u64 = move_from();
+        let Self::R {} = ::move_from<Self::R>(0x0);
+
+        let _ : u64 = borrow_global();
+        let r : &mut Self::R = ::borrow_global_mut<Self::R>(0x0);
+
+        let _ : u64 = freeze();
+        let _ : &Self::R = ::freeze<Self::R>(r);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.exp
new file mode 100644
index 000000000..843e3f8c6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/global_access_pack.move:3:9
+  │
+3 │         ::S { }
+  │         ^^
+  │         │
+  │         Unexpected '::'
+  │         Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.move b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.move
new file mode 100644
index 000000000..e43daeb2f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_pack.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo() {
+        ::S { }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.exp
new file mode 100644
index 000000000..dea99379c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/global_access_value.move:3:13
+  │
+3 │         1 + ::global_value
+  │             ^^
+  │             │
+  │             Unexpected '::'
+  │             Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.move
new file mode 100644
index 000000000..22e84f8aa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/global_access_value.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo(): u64 {
+        1 + ::global_value
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring.move b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring.move
new file mode 100644
index 000000000..5b3352afd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    public fun hexstring(): vector<u8> {
+        x"abcd"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.exp
new file mode 100644
index 000000000..64247938e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.exp
@@ -0,0 +1,6 @@
+error[E01008]: invalid hex string
+  ┌─ tests/move_check/parser/hexstring_missing_quote.move:3:9
+  │
+3 │         x"abcd
+  │         ^^^^^^ Missing closing quote (") after byte string
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.move b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.move
new file mode 100644
index 000000000..6fa4b1b75
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_missing_quote.move
@@ -0,0 +1,5 @@
+module M {
+    public fun missing_quote(): vector<u8> {
+        x"abcd
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.exp
new file mode 100644
index 000000000..e8b22c3df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.exp
@@ -0,0 +1,6 @@
+error[E01008]: invalid hex string
+  ┌─ tests/move_check/parser/hexstring_token_eof1.move:3:9
+  │
+3 │         x"
+  │         ^^ Missing closing quote (") after byte string
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.move b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.move
new file mode 100644
index 000000000..86bd981a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof1.move
@@ -0,0 +1,3 @@
+module M {
+    public fun foo(): vector<u8> {
+        x"
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.exp
new file mode 100644
index 000000000..1190c337c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.exp
@@ -0,0 +1,6 @@
+error[E01008]: invalid hex string
+  ┌─ tests/move_check/parser/hexstring_token_eof2.move:3:9
+  │
+3 │         x"abcd
+  │         ^^^^^^ Missing closing quote (") after byte string
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.move b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.move
new file mode 100644
index 000000000..c2672fe9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/hexstring_token_eof2.move
@@ -0,0 +1,3 @@
+module M {
+    public fun foo(): vector<u8> {
+        x"abcd
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.exp
new file mode 100644
index 000000000..fee0df0f4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_call_lhs_complex_expression.move:3:29
+  │
+3 │         (if (true) 5 else 0)();
+  │                             ^
+  │                             │
+  │                             Unexpected '('
+  │                             Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.move
new file mode 100644
index 000000000..8451f7c04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_complex_expression.move
@@ -0,0 +1,6 @@
+module M {
+    fun foo() {
+        (if (true) 5 else 0)();
+        (while (false) {})(0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.exp
new file mode 100644
index 000000000..49558ae33
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_call_lhs_parens_around_name.move:3:14
+  │
+3 │         (foo)()
+  │              ^
+  │              │
+  │              Unexpected '('
+  │              Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.move
new file mode 100644
index 000000000..ec2118f3a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_parens_around_name.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo() {
+        (foo)()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.exp
new file mode 100644
index 000000000..89356898a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_call_lhs_return.move:3:20
+  │
+3 │         (return ())(0, 1);
+  │                    ^
+  │                    │
+  │                    Unexpected '('
+  │                    Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.move
new file mode 100644
index 000000000..c82b6fae4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_return.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo() {
+        (return ())(0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.exp
new file mode 100644
index 000000000..e75abc53e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_call_lhs_value.move:3:10
+  │
+3 │         5();
+  │          ^
+  │          │
+  │          Unexpected '('
+  │          Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.move
new file mode 100644
index 000000000..d952ee683
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_call_lhs_value.move
@@ -0,0 +1,6 @@
+module M {
+    fun foo() {
+        5();
+        5(0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.exp
new file mode 100644
index 000000000..ccae2a21c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.exp
@@ -0,0 +1,6 @@
+error[E01001]: invalid character
+  ┌─ tests/move_check/parser/invalid_character.move:1:12
+  │
+1 │ address 0x1~
+  │            ^ Unexpected character: '~'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.move
new file mode 100644
index 000000000..47d742002
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character.move
@@ -0,0 +1 @@
+address 0x1~
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.exp
new file mode 100644
index 000000000..b8aba9dd3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.exp
@@ -0,0 +1,6 @@
+error[E01001]: invalid character
+  ┌─ tests/move_check/parser/invalid_character_emoji.move:5:4
+  │
+5 │    ❤️
+  │    ^ Unexpected character: '\u{2764}'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.move
new file mode 100644
index 000000000..d8f4ce77e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_emoji.move
@@ -0,0 +1,8 @@
+address 0x1 {
+
+// Check that we provide good error messages for non-ASCII characters.
+module Temp {
+   ❤️
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.exp
new file mode 100644
index 000000000..573f68255
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.exp
@@ -0,0 +1,6 @@
+error[E01001]: invalid character
+  ┌─ tests/move_check/parser/invalid_character_non_ascii.move:5:4
+  │
+5 │    ф
+  │    ^ Unexpected character: 'ф'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.move
new file mode 100644
index 000000000..dacd4e6f2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_character_non_ascii.move
@@ -0,0 +1,8 @@
+address 0x1 {
+
+// Check that we provide good error messages for non-ASCII characters.
+module Temp {
+   ф
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.exp
new file mode 100644
index 000000000..08bdff024
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_named_address_assignment.move:1:14
+  │
+1 │ address Addr = 0x1; // Named address assignments are not allowed
+  │              ^
+  │              │
+  │              Unexpected '='
+  │              Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.move
new file mode 100644
index 000000000..de91e491f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_assignment.move
@@ -0,0 +1 @@
+address Addr = 0x1; // Named address assignments are not allowed
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.exp
new file mode 100644
index 000000000..1efe90ed2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_named_address_declaration.move:3:13
+  │
+3 │ address Addr;
+  │             ^
+  │             │
+  │             Unexpected ';'
+  │             Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.move
new file mode 100644
index 000000000..2b34716c0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_named_address_declaration.move
@@ -0,0 +1,3 @@
+// Named addresses do not need to be declared nor can they be declared in Move
+// source.
+address Addr;
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.exp
new file mode 100644
index 000000000..e258afd66
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_pack_mname_non_addr.move:4:14
+  │
+4 │         false::M::S { }
+  │              ^^
+  │              │
+  │              Unexpected '::'
+  │              Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.move
new file mode 100644
index 000000000..b89cf567a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_pack_mname_non_addr.move
@@ -0,0 +1,10 @@
+module M {
+    struct S {}
+    fun foo() {
+        false::M::S { }
+    }
+
+    fun bar() {
+        fun bar()::bar()::M::S { }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.exp
new file mode 100644
index 000000000..46bc5a920
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.move:4:14
+  │
+4 │         false::M { f } = 0;
+  │              ^^
+  │              │
+  │              Unexpected '::'
+  │              Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.move
new file mode 100644
index 000000000..d549c6e97
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_lhs_mdot_no_addr.move
@@ -0,0 +1,13 @@
+module M {
+    fun foo() {
+        let f = 0;
+        false::M { f } = 0;
+
+        let f = 0;
+        0::M { f } = 0;
+
+        let f = 0;
+        foo().M { f } = 0;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.exp
new file mode 100644
index 000000000..120e273bb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+   ┌─ tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.move:11:14
+   │
+11 │         X::S 0 = 0;
+   │              ^
+   │              │
+   │              Unexpected '0'
+   │              Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.move
new file mode 100644
index 000000000..428fb2c43
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/invalid_unpack_assign_rhs_not_fields.move
@@ -0,0 +1,17 @@
+address 0x2 {
+
+module X {}
+
+module M {
+    use 0x2::X;
+
+    fun foo() {
+        X::S () = 0;
+
+        X::S 0 = 0;
+
+        X::S { 0 } = 0;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.exp
new file mode 100644
index 000000000..e0434213e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/less_than_space.move:5:18
+  │
+5 │         if (v< 10) return v;
+  │              - --^ Unexpected ')'
+  │              │ │  
+  │              │ Expected '::' after an address in a module access chain
+  │              Perhaps you need a blank space before this '<' operator?
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.move b/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.move
new file mode 100644
index 000000000..0638e4ac4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/less_than_space.move
@@ -0,0 +1,8 @@
+module 0x42::M {
+    fun f(v: u64): u64 {
+        if (v < 5) return 5;
+	// Check for a useful diagnostic message when missing a space before '<'
+        if (v< 10) return v;
+        0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding.move
new file mode 100644
index 000000000..0baf67239
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct R has copy, drop {
+        f: u64
+    }
+    struct Generic<T> has copy, drop {
+        g: T
+    }
+    fun f() {
+        let () = ();
+        let (): () = ();
+        // Test with whitespace between parenthesis.
+        let ( ) = ( );
+        let ( ): ( ) = ( );
+        let v1 = 1;
+        let v2: u64 = 2;
+        let (v3) = 3; // for consistency, check a single variable inside parens
+        let (x1, x2) = (1, 2);
+        let (x3, x4): (u64, u64) = (3, 4);
+        v1;
+        v2;
+        v3;
+        x1;
+        x2;
+        x3;
+        x4;
+    }
+    fun g(r: R, g: Generic<R>) {
+        let R { f } = copy r;
+        let (R { f: f1 }, R { f: f2 }) = (copy r, move r);
+        let Generic<R> { g: R { f: f3 } } = g;
+        f;
+        f1;
+        f2;
+        f3;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.exp
new file mode 100644
index 000000000..c318d5bd8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/let_binding_bad_name.move:4:13
+  │
+4 │         let {};
+  │             ^
+  │             │
+  │             Unexpected '{'
+  │             Expected a variable or struct name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.move
new file mode 100644
index 000000000..1268590c1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_bad_name.move
@@ -0,0 +1,6 @@
+module M {
+    fun f() {
+        // Test for a bad variable or struct type name
+        let {};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.exp
new file mode 100644
index 000000000..e3e56c915
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/let_binding_missing_fields.move:6:26
+  │
+6 │         let Generic<u64> = g; // Test a type name with no field bindings
+  │                          ^
+  │                          │
+  │                          Unexpected '='
+  │                          Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.move
new file mode 100644
index 000000000..b063a7633
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_fields.move
@@ -0,0 +1,8 @@
+module M {
+    struct Generic<T> {
+        g: T
+    }
+    fun g(g: Generic<u64>) {
+        let Generic<u64> = g; // Test a type name with no field bindings
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.exp
new file mode 100644
index 000000000..642075d24
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/let_binding_missing_paren.move:3:21
+  │
+3 │         let (x1, x2 = (1, 2); // Test a missing right parenthesis
+  │             -       ^ Expected ')'
+  │             │        
+  │             To match this '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.move
new file mode 100644
index 000000000..3fe0d128c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_paren.move
@@ -0,0 +1,5 @@
+module M {
+    fun f() {
+        let (x1, x2 = (1, 2); // Test a missing right parenthesis
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.exp
new file mode 100644
index 000000000..2ec0f5b6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/let_binding_missing_semicolon.move:4:5
+  │
+4 │     }
+  │     ^
+  │     │
+  │     Unexpected '}'
+  │     Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.move
new file mode 100644
index 000000000..202da1b2e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_semicolon.move
@@ -0,0 +1,5 @@
+module M {
+    fun f() {
+        let x // Test a missing semicolon
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.exp
new file mode 100644
index 000000000..aebde0c2a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/let_binding_missing_type.move:3:17
+  │
+3 │         let x : = 0; // Test a missing let type (but with a colon)
+  │                 ^
+  │                 │
+  │                 Unexpected '='
+  │                 Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.move
new file mode 100644
index 000000000..9961158d4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_missing_type.move
@@ -0,0 +1,5 @@
+module M {
+    fun f() {
+        let x : = 0; // Test a missing let type (but with a colon)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_trailing_comma.move
new file mode 100644
index 000000000..b8e325a43
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/let_binding_trailing_comma.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun f() {
+        let (x1, x2,) = (1, 2); // Test a trailing comma in the let binding
+        x1;
+        x2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.exp
new file mode 100644
index 000000000..1cbfa3ebe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/missing_angle_brace_close.move:3:22
+  │
+3 │         let x = t<u64;
+  │                  -   ^ Expected '>'
+  │                  │    
+  │                  To match this '<'
+  │                  Perhaps you need a blank space before this '<' operator?
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.move b/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.move
new file mode 100644
index 000000000..f187f973d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/missing_angle_brace_close.move
@@ -0,0 +1,5 @@
+module M {
+    fun foo() {
+        let x = t<u64;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.exp
new file mode 100644
index 000000000..38454c592
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/module_missing_lbrace.move:2:5
+  │
+2 │     fun f() {}
+  │     ^^^
+  │     │
+  │     Unexpected 'fun'
+  │     Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.move b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.move
new file mode 100644
index 000000000..45dd1f491
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_lbrace.move
@@ -0,0 +1,3 @@
+module M // {
+    fun f() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.exp
new file mode 100644
index 000000000..049ed28ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/module_missing_rbrace.move:4:1
+  │
+4 │ 
+  │ ^
+  │ 
+  │ Unexpected end-of-file
+  │ Expected a module member: 'spec', 'use', 'friend', 'const', 'fun', or 'struct'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.move b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.move
new file mode 100644
index 000000000..0ea18608e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_missing_rbrace.move
@@ -0,0 +1,3 @@
+module M {
+    fun f() {}
+// }
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_struct_after_func.move b/vendors/move/crates/move-compiler/tests/move_check/parser/module_struct_after_func.move
new file mode 100644
index 000000000..6c4eb3cce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_struct_after_func.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun fn() {}
+    // Struct declarations can be intermixed with function declarations.
+    struct S {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_func.move b/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_func.move
new file mode 100644
index 000000000..b7568f652
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_func.move
@@ -0,0 +1,13 @@
+address 0x2 {
+module X {
+    public fun foo() {}
+}
+
+module M {
+    fun f() {}
+    // Use declarations can come after function declarations.
+    use 0x2::X;
+
+    fun g() { X::foo() }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_struct.move b/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_struct.move
new file mode 100644
index 000000000..11ff54af9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/module_use_after_struct.move
@@ -0,0 +1,13 @@
+address 0x2 {
+module X {
+    public fun foo() {}
+}
+
+module M {
+    struct S {}
+    // Use declarations can come after struct declarations.
+    use 0x2::X;
+
+    fun g() { X::foo() }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/named_address.move b/vendors/move/crates/move-compiler/tests/move_check/parser/named_address.move
new file mode 100644
index 000000000..98e1f96fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/named_address.move
@@ -0,0 +1,18 @@
+// All valid positions of named addresses
+address M {}
+
+module M::Mod {
+
+    struct S {}
+
+    friend M::M;
+    public(friend) fun foo() {}
+}
+
+module M::M {
+    use M::Mod::foo;
+
+    struct X { s: M::Mod::S }
+
+    fun bar() { foo() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/named_address_value.move b/vendors/move/crates/move-compiler/tests/move_check/parser/named_address_value.move
new file mode 100644
index 000000000..3583aca81
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/named_address_value.move
@@ -0,0 +1,5 @@
+script {
+    fun main() {
+        (@M: address);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.exp
new file mode 100644
index 000000000..09b6746db
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.exp
@@ -0,0 +1,6 @@
+error[E02005]: invalid 'script' declaration
+  ┌─ tests/move_check/parser/native_main.move:2:1
+  │
+2 │ native fun main();
+  │ ^^^^^^ Invalid 'native' function. 'script' functions must have a defined body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.move b/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.move
new file mode 100644
index 000000000..d273bf865
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/native_main.move
@@ -0,0 +1,3 @@
+script {
+native fun main();
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use.move b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use.move
new file mode 100644
index 000000000..11d5f2b4a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use.move
@@ -0,0 +1,37 @@
+module 0x42::a {
+        
+    struct A has drop {} 
+
+    public fun foo(_a: A): u64 { 0 }
+
+    public fun bar(): A { A {} }
+
+}
+
+module 0x42::b {
+    struct B has drop {} 
+
+    public fun baz(): B { B {} }
+}
+
+module 0x42::c {
+    use 0x42::{a::{A, Self as g, foo as f}, b::{Self as q, B, baz as bar}};
+
+    fun use_a() {
+        let x: A = g::bar();
+        let _y = f(x);
+        let _g: q::B = bar();
+        let _h: B = bar();
+    }
+
+}
+
+module 0x42::d {
+    use 0x42::{a::{A, bar as foo}, a as g};
+
+    fun use_a() {
+        let x: A = foo();
+        let _y = g::foo(x);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.exp
new file mode 100644
index 000000000..481db0ac2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.exp
@@ -0,0 +1,50 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:18:59
+   │
+18 │     use 0x42::{a::{A, Self as q, foo as bar}, b::{Self as q, B, baz as bar}};
+   │                               -                           ^ Duplicate module alias 'q'. Module aliases must be unique within a given namespace
+   │                               │                            
+   │                               Alias previously defined here
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:18:72
+   │
+18 │     use 0x42::{a::{A, Self as q, foo as bar}, b::{Self as q, B, baz as bar}};
+   │                                         ---                            ^^^ Duplicate module member or alias 'bar'. Top level names in a namespace must be unique
+   │                                         │                               
+   │                                         Alias previously defined here
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:21:20
+   │
+21 │         let x: A = q::bar();
+   │                    ^^^^^^ Invalid module access. Unbound function 'bar' in module '0x42::b'
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:22:18
+   │
+22 │         let _y = f(x);
+   │                  ^ Unbound function 'f' in current scope
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:30:31
+   │
+30 │     use 0x42::{a::{A, Self as q, foo as f}, a as g};
+   │                               ^ Unused 'use' of alias 'q'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09001]: unused alias
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:30:41
+   │
+30 │     use 0x42::{a::{A, Self as q, foo as f}, a as g};
+   │                                         ^ Unused 'use' of alias 'f'. Consider removing it
+   │
+   = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/parser/nested_module_use_invalid.move:34:18
+   │
+34 │         let _y = bar(x);
+   │                  ^^^ Unbound function 'bar' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.move
new file mode 100644
index 000000000..26c736508
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/nested_module_use_invalid.move
@@ -0,0 +1,37 @@
+module 0x42::a {
+        
+    struct A has drop {} 
+
+    public fun foo(_a: A): u64 { 0 }
+
+    public fun bar(): A { A {} }
+
+}
+
+module 0x42::b {
+    struct B has drop {} 
+
+    public fun baz(): B { B {} }
+}
+
+module 0x42::c {
+    use 0x42::{a::{A, Self as q, foo as bar}, b::{Self as q, B, baz as bar}};
+
+    fun use_a() {
+        let x: A = q::bar();
+        let _y = f(x);
+        let _g: q::B = bar();
+        let _h: B = bar();
+    }
+
+}
+
+module 0x42::d {
+    use 0x42::{a::{A, Self as q, foo as f}, a as g};
+
+    fun use_a() {
+        let x: A = g::bar();
+        let _y = bar(x);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/newline_crlf.move b/vendors/move/crates/move-compiler/tests/move_check/parser/newline_crlf.move
new file mode 100644
index 000000000..314fbd306
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/newline_crlf.move
@@ -0,0 +1,21 @@
+/// This is a test.
+module 0x8675309::M {
+    /**
+     * One can have /* nested */
+     * // block comments
+     */
+    fun f() { }
+
+    /* This is a nested /* regular comment // */ */
+    fun g() {}
+
+    // This is a line comment which contains unbalanced /* delimiter.
+    fun h() {}
+
+    // Comments in strings are not comments at all.
+    fun str(): vector<u8> {
+        b"http://diem.com"
+    }
+
+    // This is a regular comment which appears where a doc comment would not be allowed.
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_comment.move b/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_comment.move
new file mode 100644
index 000000000..3029d52ef
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_comment.move
@@ -0,0 +1,19 @@
+address 0x1 {
+
+// Non-ASCII characters in comments (e.g., ф) are also allowed.
+module temp {
+    /// ❤️ Also in doc comments 💝
+    public fun foo() {}
+    /* block
+    Comment
+    Γ ⊢ λ x. x : ∀α. α → α
+    */
+    public fun bar() {}
+}
+
+}
+
+module a::n {
+    public fun foo() { 0x1::temp::foo() }
+    public fun bar() { 0x1::temp::bar() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_string.move b/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_string.move
new file mode 100644
index 000000000..92aa9fd74
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/non_ascii_character_string.move
@@ -0,0 +1,5 @@
+module a::m {
+    public fun foo(): vector<u8> {
+        b"Γ ⊢ λ x. x : ∀α. α → α"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp
new file mode 100644
index 000000000..38bc61d77
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_leading.move:4:17
+  │
+4 │         let _ = _0x0u8;
+  │                 ^^^^^^ Invalid variable usage. Unbound variable '_0x0u8'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move
new file mode 100644
index 000000000..3022ad9d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0x0u8;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp
new file mode 100644
index 000000000..e1a9f747d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move:4:17
+  │
+4 │         let _ = _0x76;
+  │                 ^^^^^ Invalid variable usage. Unbound variable '_0x76'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move
new file mode 100644
index 000000000..521d66985
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0x76;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp
new file mode 100644
index 000000000..04b118fd5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_trailing.move:4:22
+  │
+4 │         let _ = 0x0u8_;
+  │                      ^
+  │                      │
+  │                      Unexpected '_'
+  │                      Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move
new file mode 100644
index 000000000..c6d4a0abe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Trailing underscore after bit-width suffix not allowed
+        let _ = 0x0u8_;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore.move
new file mode 100644
index 000000000..12173339d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore.move
@@ -0,0 +1,43 @@
+module 0x42::M {
+    fun t() {
+        // Single underscore separations allowed
+        let _ = 8_5u128;
+        let _ = 8_5;
+        let _: u8 = 8_5;
+        let _ = 0x8_5u128;
+        let _ = 0x8_5;
+        let _: u8 = 0x8_5;
+
+        // Multiple underscore separations allowed
+        let _ = 02345677_15463636363_36464784848_456847568568775u256;
+        let _ = 0_1_3_4;
+        let _: u64 = 0_1_3_4;
+        let _ = 0x02345677_15463636363_36464784848_456847568568775u256;
+        let _ = 0x0_1_3_4;
+        let _: u64 = 0x0_1_3_4;
+
+        // Single trailing allowed
+        let _ = 567_u64;
+        let _ = 567_;
+        let _: u64 = 5_6_7;
+        let _ = 0x567_u64;
+        let _ = 0x567_;
+        let _: u64 = 0x5_6_7;
+
+        // Multiple trailing allowed
+        let _ = 567___u32;
+        let _ = 567___;
+        let _: u64 = 567___;
+        let _ = 0x567___u32;
+        let _ = 0x567___;
+        let _: u64 = 0x567___;
+
+        // Multiple underscore in tandem allowed
+        let _ = 0__8u16;
+        let _ = 0__8;
+        let _: u8 = 0__8;
+        let _ = 0x0__8u16;
+        let _ = 0x0__8;
+        let _: u8 = 0x0__8;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp
new file mode 100644
index 000000000..c95799052
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_literal_underscore_leading.move:4:17
+  │
+4 │         let _ = _0u8;
+  │                 ^^^^ Invalid variable usage. Unbound variable '_0u8'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move
new file mode 100644
index 000000000..556ebaffc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0u8;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp
new file mode 100644
index 000000000..83138513e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move:4:17
+  │
+4 │         let _ = _76;
+  │                 ^^^ Invalid variable usage. Unbound variable '_76'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move
new file mode 100644
index 000000000..5c26884a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _76;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp
new file mode 100644
index 000000000..9a2c332fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/num_literal_underscore_trailing.move:4:20
+  │
+4 │         let _ = 0u8_;
+  │                    ^
+  │                    │
+  │                    Unexpected '_'
+  │                    Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move
new file mode 100644
index 000000000..f464a0c1a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Trailing underscore after bit-width suffix not allowed
+        let _ = 0u8_;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.exp
new file mode 100644
index 000000000..fb059a72c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/phantom_param_invalid_keyword.move:2:25
+  │
+2 │     struct S<T1, phatom T2> {
+  │             -           ^ Expected '>'
+  │             │            
+  │             To match this '<'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.move b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.move
new file mode 100644
index 000000000..d9581bcb1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_invalid_keyword.move
@@ -0,0 +1,5 @@
+module M {
+    struct S<T1, phatom T2> {
+        a: T1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.exp
new file mode 100644
index 000000000..24719de8b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/phantom_param_missing_type_var.move:2:25
+  │
+2 │     struct S<T1, phantom> {
+  │                         ^
+  │                         │
+  │                         Unexpected '>'
+  │                         Expected an identifier
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.move b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.move
new file mode 100644
index 000000000..c3b3eb314
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/phantom_param_missing_type_var.move
@@ -0,0 +1,5 @@
+module M {
+    struct S<T1, phantom> {
+        f1: u64
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.exp
new file mode 100644
index 000000000..4271454a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.exp
@@ -0,0 +1,8 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/positional_struct_declaration.move:4:15
+  │
+4 │     struct Foo(u64)
+  │               ^ Positional fields are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.move b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.move
new file mode 100644
index 000000000..323390c66
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_declaration.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // Positional struct declarations are not supported till 2024
+    struct Foo(u64)
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.exp
new file mode 100644
index 000000000..8f85df0df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.exp
@@ -0,0 +1,33 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/positional_struct_fields_keyword_field.move:4:5
+  │
+4 │     public struct Foo(fun)
+  │     ^^^^^^ Struct visibility modifiers are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/positional_struct_fields_keyword_field.move:4:5
+  │
+4 │     public struct Foo(fun)
+  │     ^^^^^^ Invalid struct declaration. Structs cannot have visibility modifiers as they are always 'public'
+  │
+  = Starting in the Move 2024 edition visibility must be annotated on struct declarations.
+
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/positional_struct_fields_keyword_field.move:4:22
+  │
+4 │     public struct Foo(fun)
+  │                      ^ Positional fields are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/positional_struct_fields_keyword_field.move:4:23
+  │
+4 │     public struct Foo(fun)
+  │                       ^^^
+  │                       │
+  │                       Unexpected 'fun'
+  │                       Expected a type name
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.move b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.move
new file mode 100644
index 000000000..a0cf9f984
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_fields_keyword_field.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // keyword instead of a type
+    public struct Foo(fun)
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.exp
new file mode 100644
index 000000000..789b17fa3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.exp
@@ -0,0 +1,26 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/positional_struct_pack.move:7:17
+  │
+7 │         let _ = Foo(0);
+  │                 ^^^^^^ Positional fields are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E03013]: positional call mismatch
+  ┌─ tests/move_check/parser/positional_struct_pack.move:7:17
+  │
+7 │         let _ = Foo(0);
+  │                 ^^^^^^ Invalid struct instantiation. Named struct declarations require named instantiations.
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/parser/positional_struct_pack.move:7:17
+  │
+7 │         let _ = Foo(0);
+  │                 ^^^^^^ Missing argument for field 'x' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/parser/positional_struct_pack.move:7:17
+  │
+7 │         let _ = Foo(0);
+  │                 ^^^^^^ Unbound field '0' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.move b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.move
new file mode 100644
index 000000000..dd703c883
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_pack.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    // Positional struct declarations are not supported till 2024
+    struct Foo has drop { x: u64 }
+
+    fun f() {
+        let _ = Foo(0);
+    }
+}
+}
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.exp
new file mode 100644
index 000000000..26146ac87
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.exp
@@ -0,0 +1,26 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/positional_struct_unpack.move:7:9
+  │
+7 │         Foo(_) = x;
+  │         ^^^^^^ Positional fields are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E03013]: positional call mismatch
+  ┌─ tests/move_check/parser/positional_struct_unpack.move:7:9
+  │
+7 │         Foo(_) = x;
+  │         ^^^^^^ Invalid deconstruction. Named struct field declarations require named deconstruction
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/parser/positional_struct_unpack.move:7:9
+  │
+7 │         Foo(_) = x;
+  │         ^^^^^^ Missing assignment for field 'f' in '0x42::M::Foo'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/parser/positional_struct_unpack.move:7:9
+  │
+7 │         Foo(_) = x;
+  │         ^^^^^^ Unbound field '0' in '0x42::M::Foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.move
new file mode 100644
index 000000000..b7f15388e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/positional_struct_unpack.move
@@ -0,0 +1,10 @@
+address 0x42 {
+module M {
+    // Positional struct declarations are not supported till 2024
+    struct Foo { f: u64 }
+
+    fun f(x: Foo) {
+        Foo(_) = x;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.exp
new file mode 100644
index 000000000..d9a365d74
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.exp
@@ -0,0 +1,12 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/preserve_address_syntax.move:5:9
+  │
+5 │         0x00042::M::foo();
+  │         ^^^^^^^^^^ Unbound module '0x42::M'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/preserve_address_syntax.move:6:9
+  │
+6 │         000112::N::bar();
+  │         ^^^^^^^^^ Unbound module '112::N'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.move b/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.move
new file mode 100644
index 000000000..86e441218
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/preserve_address_syntax.move
@@ -0,0 +1,8 @@
+// make sure addresses are printed as parsed
+// but zeros are still trimmed
+script {
+    fun ex() {
+        0x00042::M::foo();
+        000112::N::bar();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_positions.move b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_positions.move
new file mode 100644
index 000000000..7101c3980
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_positions.move
@@ -0,0 +1,10 @@
+module `a`::`acquries` {
+    struct `As`<`break`> { `const`: `break`, `move`: u64 }
+    const `False`: bool = false;
+    fun `invariant`<`break`>(`as`: `As`<`break`>): `break` {
+        let `As` { `const`, `move`: `copy` } = `as`;
+        assert!(`copy` > 1, 0);
+        `copy`;
+        `const`
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_tokens.move b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_tokens.move
new file mode 100644
index 000000000..e86a9d944
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_ident_tokens.move
@@ -0,0 +1,56 @@
+module a::example {
+    fun examples(): u64 {
+        let `abort` = 0;
+        let `acquires` = 0;
+        let `as` = 0;
+        let `break` = 0;
+        let `const` = 0;
+        let `continue` = 0;
+        let `copy` = 0;
+        let `else` = 0;
+        let `false` = 0;
+        let `fun` = 0;
+        let `friend` = 0;
+        let `if` = 0;
+        let `invariant` = 0;
+        let `let` = 0;
+        let `loop` = 0;
+        let `module` = 0;
+        let `move` = 0;
+        let `native` = 0;
+        let `public` = 0;
+        let `return` = 0;
+        let `script` = 0;
+        let `spec` = 0;
+        let `struct` = 0;
+        let `true` = 0;
+        let `use` = 0;
+        let `while` = 0;
+        `abort` +
+        `acquires` +
+        `as` +
+        `break` +
+        `const` +
+        `continue` +
+        `copy` +
+        `else` +
+        `false` +
+        `fun` +
+        `friend` +
+        `if` +
+        `invariant` +
+        `let` +
+        `loop` +
+        `module` +
+        `move` +
+        `native` +
+        `public` +
+        `return` +
+        `script` +
+        `spec` +
+        `struct` +
+        `true` +
+        `use` +
+        `while`
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_identifier_interchangeable.move b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_identifier_interchangeable.move
new file mode 100644
index 000000000..17aa7c519
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/restricted_identifier_interchangeable.move
@@ -0,0 +1,5 @@
+// `x` and x are interchangeable
+
+module a::m {
+    fun foo(`x`: u64): u64 { x }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.exp
new file mode 100644
index 000000000..1626b7a51
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.exp
@@ -0,0 +1,128 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:3:9
+  │
+3 │         return >> 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:4:9
+  │
+4 │         return << 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:5:9
+  │
+5 │         return || false;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:6:9
+  │
+6 │         return && false;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:7:9
+  │
+7 │         return + 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:8:9
+  │
+8 │         return - 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:9:9
+  │
+9 │         return % 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:10:9
+   │
+10 │         return / 1;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:11:9
+   │
+11 │         return < 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:12:9
+   │
+12 │         return > 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:13:9
+   │
+13 │         return <= 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:14:9
+   │
+14 │         return == 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:15:9
+   │
+15 │         return >= 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:16:9
+   │
+16 │         return != 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:17:9
+   │
+17 │         return | 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:18:9
+   │
+18 │         return ^ 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.move b/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.move
new file mode 100644
index 000000000..9cdee087b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/return_in_binop.move
@@ -0,0 +1,20 @@
+module 0x42::M {
+    fun t() {
+        return >> 0;
+        return << 0;
+        return || false;
+        return && false;
+        return + 0;
+        return - 0;
+        return % 0;
+        return / 1;
+        return < 0;
+        return > 0;
+        return <= 0;
+        return == 0;
+        return >= 0;
+        return != 0;
+        return | 0;
+        return ^ 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.exp
new file mode 100644
index 000000000..911edcdb2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/spec_parsing_emits_fail.move:3:19
+  │
+3 │         emits _msg;
+  │                   ^
+  │                   │
+  │                   Unexpected ';'
+  │                   Expected 'to'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.move
new file mode 100644
index 000000000..0760332a8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_emits_fail.move
@@ -0,0 +1,8 @@
+module M {
+    spec with_emits {
+        emits _msg;
+    }
+    fun with_emits<T: drop>(_guid: vector<u8>, _msg: T, x: u64): u64 {
+        x
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.exp
new file mode 100644
index 000000000..65704ea71
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.exp
@@ -0,0 +1,14 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/parser/spec_parsing_fun_type_fail.move:2:26
+  │
+2 │     fun fun_type_in_prog(p: |u64|u64) {
+  │                          ^ Unused parameter 'p'. Consider removing or prefixing with an underscore: '_p'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/parser/spec_parsing_fun_type_fail.move:2:29
+  │
+2 │     fun fun_type_in_prog(p: |u64|u64) {
+  │                             ^^^^^^^^ `|_|_` function type only allowed in specifications
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.move
new file mode 100644
index 000000000..8fa45abaf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_fun_type_fail.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    fun fun_type_in_prog(p: |u64|u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.exp
new file mode 100644
index 000000000..b40d5f253
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/spec_parsing_generic_condition_fail.move:3:16
+  │
+3 │         ensures<T> exists<T>(0x1) <==> exists<T>(0x1);
+  │                ^
+  │                │
+  │                Unexpected '<'
+  │                Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.move
new file mode 100644
index 000000000..e71b2d1a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_generic_condition_fail.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    spec schema InvalidGenericEnsures {
+        ensures<T> exists<T>(0x1) <==> exists<T>(0x1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.exp
new file mode 100644
index 000000000..37e03b2f0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.exp
@@ -0,0 +1,6 @@
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/parser/spec_parsing_implies_fail.move:3:15
+  │
+3 │       let _ = x ==> x;
+  │               ^^^^^^^ `==>` operator only allowed in specifications
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.move
new file mode 100644
index 000000000..d13dc7af5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_implies_fail.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun implies_in_prog() {
+      let _ = x ==> x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp
new file mode 100644
index 000000000..d6c6c76ec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.exp
@@ -0,0 +1,14 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/parser/spec_parsing_index_fail.move:2:23
+  │
+2 │     fun index_in_prog(x: u64) {
+  │                       ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/parser/spec_parsing_index_fail.move:3:15
+  │
+3 │       let _ = x[1];
+  │               ^^^^ `_[_]` index operator only allowed in specifications
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.move
new file mode 100644
index 000000000..ef8fccec9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_index_fail.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun index_in_prog(x: u64) {
+      let _ = x[1];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp
new file mode 100644
index 000000000..bbf44aced
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp
@@ -0,0 +1,54 @@
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:32:9
+   │
+32 │         spec {} + 1;
+   │         ^^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:32:17
+   │
+32 │         spec {} + 1;
+   │         ------- ^ - Found: integer. It is not compatible with the other type.
+   │         │       │  
+   │         │       Incompatible arguments to '+'
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:32:19
+   │
+32 │         spec {} + 1;
+   │         -------   ^ Invalid argument to '+'
+   │         │          
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:33:9
+   │
+33 │         spec {} && spec {};
+   │         ^^^^^^^ -- Expected: 'bool'
+   │         │        
+   │         Invalid argument to '&&'
+   │         Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:33:20
+   │
+33 │         spec {} && spec {};
+   │                 -- ^^^^^^^
+   │                 │  │
+   │                 │  Invalid argument to '&&'
+   │                 │  Given: '()'
+   │                 Expected: 'bool'
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:34:9
+   │
+34 │         &mut spec {};
+   │         ^^^^^^^^^^^^
+   │         │    │
+   │         │    Expected a single non-reference type, but found: '()'
+   │         Invalid borrow
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.move
new file mode 100644
index 000000000..7b493a41a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    fun specs_in_fun(x: u64, n: u64) {
+        // an ordinary assume
+        spec {
+            assume x > 42;
+        };
+
+        // loop invariant is written in a spec block inside the loop condition
+        while ({spec {assert x < 42;}; n < 64}) {
+            spec {
+                assert x > 42;
+                assert 0 < x;
+            };
+            n = n + 1
+        };
+
+        // an ordinary assert
+        spec {
+            assert x > 42;
+        };
+
+        // loop invariant is written in a spec block at the beginning of loop body
+        loop {
+            spec {
+                assert x > 42;
+                assert 0 < x;
+            };
+            n = n + 1
+        };
+
+        // the following should parse successfully but fail typing
+        spec {} + 1;
+        spec {} && spec {};
+        &mut spec {};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.exp
new file mode 100644
index 000000000..73613344d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.exp
@@ -0,0 +1,14 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/parser/spec_parsing_lambda_fail.move:2:24
+  │
+2 │     fun lambda_in_prog(x: u64) {
+  │                        ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/parser/spec_parsing_lambda_fail.move:3:15
+  │
+3 │       let _ = |y| x + y;
+  │               ^^^^^^^^^ lambda expression only allowed in specifications
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.move
new file mode 100644
index 000000000..52fd4dd47
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_lambda_fail.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun lambda_in_prog(x: u64) {
+      let _ = |y| x + y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_ok.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_ok.move
new file mode 100644
index 000000000..b6ad9da6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_ok.move
@@ -0,0 +1,139 @@
+// These are some basic parsing tests for specifications which are expected to succeed.
+// Full testing of spec parsing correctness is done outside of this crate.
+//
+// Note that even though we only test parsing, we still need to ensure that the move code (not the specification)
+// is type checking correctly, because with no parsing error, the test harness
+// will run subsequent phases of the move-compiler compiler.
+//
+// For parse failures, see the `spec_*_fail.move` test cases.
+
+module 0x8675309::M {
+    spec module {
+        global expected_coin_sum: u64;
+        global other: bool;
+
+        native fun all<T>(x: SomeCollection<T>, predicate: |T|bool): bool;
+
+        fun spec_fun_using_spec_constructs(x: u64, y: u64) : u64 {
+            // This function would crash in phases after expansion if we would pass it on as a regular function. Testing
+            // here that we don't pass it on.
+            let _ = |z| z + 1;
+            let _ = x .. y;
+            x
+        }
+    }
+
+    struct T has key {x: u64}
+    struct R has key {x: u64}
+
+    struct SomeCoin {
+        x : u64,
+        y: u64,
+    }
+
+    spec SomeCoin {
+        // Data invariants
+        invariant x > 0;
+        invariant x == y;
+    }
+
+    spec with_aborts_if {
+      aborts_if x == 0;
+    }
+    fun with_aborts_if(x: u64): u64 {
+        x
+    }
+
+    spec with_ensures {
+        ensures RET == x + 1;
+    }
+    fun with_ensures(x: u64): u64 {
+        x + 1
+    }
+
+    spec using_block {
+        ensures RET = {let y = x; y + 1};
+    }
+    fun using_block(x: u64): u64 {
+        x + 1
+    }
+
+    spec using_lambda
+    {
+        ensures all(x, |y, z| x + y + z);
+    }
+    fun using_lambda(x: u64): u64 {
+        x
+    }
+
+    spec using_index_and_range {
+        ensures RET = x[1] && x[0..3];
+    }
+    fun using_index_and_range(x: u64): u64 {
+        x
+    }
+
+    spec using_implies {
+        ensures x > 0 ==> RET == x - 1;
+        ensures x == 0 ==> RET == x;
+    }
+    fun using_implies(x: u64): u64 {
+        x
+    }
+
+    spec with_emits {
+        emits _msg to _guid;
+        emits _msg to _guid if true;
+        emits _msg to _guid if x > 7;
+    }
+    fun with_emits<T: drop>(_guid: vector<u8>, _msg: T, x: u64): u64 {
+        x
+    }
+
+    spec module {
+        global x: u64;
+        local y: u64;
+        z: u64;
+        global generic<T>: u64;
+        invariant update generic<u64> = 23;
+        invariant update Self::generic<u64> = 24;
+    }
+
+    fun some_generic<T>() {
+    }
+    spec some_generic {
+        ensures generic<T> == 1;
+        ensures Self::generic<T> == 1;
+    }
+
+    spec schema ModuleInvariant<X, Y> {
+        requires global<X>(0x0).f == global<X>(0x1).f;
+        ensures global<X>(0x0).f == global<X>(0x1).f;
+    }
+
+    spec some_generic {
+        include ModuleInvariant<T, T>{foo:bar, x:y};
+    }
+
+    spec module {
+        apply ModuleInvariant<X, Y> to *foo*<Y, X>;
+        apply ModuleInvariant<X, Y> to *foo*<Y, X>, bar except public *, internal baz<X>;
+        pragma do_not_verify, timeout = 60;
+    }
+
+    spec module {
+        invariant forall x: num, y: num, z: num : x == y && y == z ==> x == z;
+        invariant forall x: num : exists y: num : y >= x;
+        invariant exists x in 1..10, y in 8..12 : x == y;
+        invariant<X: key> exists<X>(0x0) <==> exists<X>(0x0);
+        invariant<X: key, Y: key> exists<X>(0x0) && exists<Y>(0x1) <==> exists<Y>(0x1) && exists<X>(0x0);
+    }
+
+    spec module {
+        fun spec_fun_non_zero(): num;
+        axiom spec_fun_non_zero() > 0;
+
+        fun spec_fun_identity<T>(x: T): T;
+        axiom<T> forall x: T: spec_fun_identity(x) == x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.exp
new file mode 100644
index 000000000..3a8b67b95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/spec_parsing_old_fun_fail.move:5:10
+  │
+5 │     spec fun with_aborts_if {
+  │          ^^^
+  │          │
+  │          Unexpected 'fun'
+  │          Expected only 'spec', drop the 'fun' keyword
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.move
new file mode 100644
index 000000000..8622c620f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_old_fun_fail.move
@@ -0,0 +1,12 @@
+// Tests error reporting for use of old spec fun syntax.
+
+module 0x8675309::M {
+
+    spec fun with_aborts_if {
+      aborts_if x == 0;
+    }
+    fun with_aborts_if(x: u64): u64 {
+        x
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.exp
new file mode 100644
index 000000000..cc9a96a49
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/spec_parsing_quantifier_fail.move:3:33
+  │
+3 │         invariant forall x: num y: num : x == y;
+  │                                 ^
+  │                                 │
+  │                                 Unexpected 'y'
+  │                                 Expected ':'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.move
new file mode 100644
index 000000000..858972a6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_quantifier_fail.move
@@ -0,0 +1,5 @@
+module M {
+    spec module {
+        invariant forall x: num y: num : x == y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.exp
new file mode 100644
index 000000000..c3fd93d69
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.exp
@@ -0,0 +1,6 @@
+error[E01010]: syntax item restricted to spec contexts
+  ┌─ tests/move_check/parser/spec_parsing_range_fail.move:3:15
+  │
+3 │       let _ = 1 .. 2;
+  │               ^^^^^^ `..` operator only allowed in specifications
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.move b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.move
new file mode 100644
index 000000000..dd3728253
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/spec_parsing_range_fail.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun range_in_prog() {
+      let _ = 1 .. 2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.exp
new file mode 100644
index 000000000..ca6fb2748
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_field_missing_type.move:2:18
+  │
+2 │     struct S { f } // Each field must specify a type
+  │                  ^
+  │                  │
+  │                  Unexpected '}'
+  │                  Expected ':'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.move
new file mode 100644
index 000000000..fa6bef679
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_field_missing_type.move
@@ -0,0 +1,3 @@
+module M {
+    struct S { f } // Each field must specify a type
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.exp
new file mode 100644
index 000000000..3e9643810
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_missing_lbrace.move:3:5
+  │
+2 │     struct S { f: u64 // }
+  │              - To match this '{'
+3 │     fun f() {}
+  │     ^ Expected '}'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.move
new file mode 100644
index 000000000..8aca7c674
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_missing_lbrace.move
@@ -0,0 +1,4 @@
+module M {
+    struct S { f: u64 // }
+    fun f() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.exp
new file mode 100644
index 000000000..1330d54a8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_native_missing_semicolon.move:3:1
+  │
+3 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.move
new file mode 100644
index 000000000..0acdc6d66
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_missing_semicolon.move
@@ -0,0 +1,3 @@
+module M {
+    native struct S // ;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.exp
new file mode 100644
index 000000000..af199ee8e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_native_with_fields.move:3:21
+  │
+3 │     native struct S { f: u64 }
+  │                     ^
+  │                     │
+  │                     Unexpected '{'
+  │                     Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.move
new file mode 100644
index 000000000..e29d1ad9d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_native_with_fields.move
@@ -0,0 +1,4 @@
+module M {
+    // Native structs should not specify fields.
+    native struct S { f: u64 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.exp
new file mode 100644
index 000000000..61be168d3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.exp
@@ -0,0 +1,32 @@
+error[E13001]: feature is not supported in specified edition
+  ┌─ tests/move_check/parser/struct_public.move:3:5
+  │
+3 │     public struct Foo {}
+  │     ^^^^^^ Struct visibility modifiers are not supported by current edition 'legacy', only '2024.alpha' support this feature
+  │
+  = You can update the edition in the 'Move.toml', or via command line flag if invoking the compiler directly.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/struct_public.move:3:5
+  │
+3 │     public struct Foo {}
+  │     ^^^^^^ Invalid struct declaration. Structs cannot have visibility modifiers as they are always 'public'
+  │
+  = Starting in the Move 2024 edition visibility must be annotated on struct declarations.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/struct_public.move:4:5
+  │
+4 │     public(friend) struct Foo {}
+  │     ^^^^^^^^^^^^^^ Invalid struct declaration. Structs cannot have visibility modifiers as they are always 'public'
+  │
+  = Starting in the Move 2024 edition visibility must be annotated on struct declarations.
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/struct_public.move:5:5
+  │
+5 │     public(package) struct Foo {}
+  │     ^^^^^^^^^^^^^^^ Invalid struct declaration. Structs cannot have visibility modifiers as they are always 'public'
+  │
+  = Starting in the Move 2024 edition visibility must be annotated on struct declarations.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.move
new file mode 100644
index 000000000..286d1a8a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_public.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    // visibility modifiers on structs fail during parsing
+    public struct Foo {}
+    public(friend) struct Foo {}
+    public(package) struct Foo {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_trailing_comma.move
new file mode 100644
index 000000000..0fbed4ccb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_trailing_comma.move
@@ -0,0 +1,3 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64, } // Test a trailing comma after the last field
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_empty.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_empty.move
new file mode 100644
index 000000000..4915e40df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_empty.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    // Test an empty list of type parameters.
+    struct S<> { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.exp
new file mode 100644
index 000000000..61702f120
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_type_extra_comma.move:2:14
+  │
+2 │     struct S<,T> { } // Test a comma before the first type parameter
+  │              ^ Expected a type parameter
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.move
new file mode 100644
index 000000000..dad273524
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_extra_comma.move
@@ -0,0 +1,3 @@
+module M {
+    struct S<,T> { } // Test a comma before the first type parameter
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.exp
new file mode 100644
index 000000000..820d61672
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_type_missing_angle.move:3:21
+  │
+3 │     struct S<T1, T2 { }
+  │             -       ^ Expected '>'
+  │             │        
+  │             To match this '<'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.move
new file mode 100644
index 000000000..e5e26f9a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_missing_angle.move
@@ -0,0 +1,4 @@
+module M {
+    // Test a missing ">" after the type parameters.
+    struct S<T1, T2 { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.exp
new file mode 100644
index 000000000..5264697fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_type_misspelled_copy_constraint.move:3:17
+  │
+3 │     struct S<T: copyable> { }
+  │                 ^^^^^^^^ Unexpected 'copyable'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.move
new file mode 100644
index 000000000..f5b81f77c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_copy_constraint.move
@@ -0,0 +1,4 @@
+module M {
+    // Check misspelling of "copy" constraint.
+    struct S<T: copyable> { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.exp
new file mode 100644
index 000000000..59ca8bb04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_type_misspelled_key_constraint.move:3:17
+  │
+3 │     struct S<T: ky> { }
+  │                 ^^ Unexpected 'ky'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.move
new file mode 100644
index 000000000..ed6822283
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_misspelled_key_constraint.move
@@ -0,0 +1,4 @@
+module M {
+    // Check misspelling of "key" constraint.
+    struct S<T: ky> { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_trailing_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_trailing_comma.move
new file mode 100644
index 000000000..57595ffba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_type_trailing_comma.move
@@ -0,0 +1,3 @@
+module 0x8675309::M {
+    struct S<T1, T2,> { f1: T1, f2: T2 } // Test a trailing comma in the type parameters
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.exp
new file mode 100644
index 000000000..eb68eb704
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/struct_without_fields.move:3:13
+  │
+3 │     struct S;
+  │             ^
+  │             │
+  │             Unexpected ';'
+  │             Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.move b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.move
new file mode 100644
index 000000000..626d7c0e9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/struct_without_fields.move
@@ -0,0 +1,4 @@
+module M {
+    // Non-native structs must specify the list of fields.
+    struct S;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.exp
new file mode 100644
index 000000000..b717706ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.exp
@@ -0,0 +1,6 @@
+error[E01001]: invalid character
+  ┌─ tests/move_check/parser/trojan_source.move:3:24
+  │
+3 │         agent == b"user‮ ⁦// Check if user⁩ ⁦"
+  │                         Invalid character '\u{202e}' found when reading file. For ASCII, only printable characters (tabs '\t', lf '\n' and crlf '\r'+'\n') are permitted. Unicode can be used in comments and string literals, excluding certain control characters.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.move b/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.move
new file mode 100644
index 000000000..bd14dfffc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/trojan_source.move
@@ -0,0 +1,5 @@
+module a::m {
+    public fun is_user(agent: vector<u8>): bool {
+        agent == b"user‮ ⁦// Check if user⁩ ⁦"
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.exp
new file mode 100644
index 000000000..cb34b0990
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.exp
@@ -0,0 +1,8 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/type_mut_space.move:5:29
+  │
+5 │     public fun foo(x: & mut S): & mut S {
+  │                   -         ^ Expected ')'
+  │                   │          
+  │                   To match this '('
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.move b/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.move
new file mode 100644
index 000000000..1ce890692
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/type_mut_space.move
@@ -0,0 +1,8 @@
+module a::m {
+    struct S {
+        f: u64,
+    }
+    public fun foo(x: & mut S): & mut S {
+        s
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.exp
new file mode 100644
index 000000000..2482eef2e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/unexpected_token_after_ability_function_constraint.move:4:21
+  │
+4 │     fun foo<T: copy & drop>() {}
+  │                     ^
+  │                     │
+  │                     Unexpected '&'
+  │                     Expected one of: '+', '>', or ','
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.move
new file mode 100644
index 000000000..0fb8d6b3f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_function_constraint.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // incorrect delim for ability constraint
+    fun foo<T: copy & drop>() {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.exp
new file mode 100644
index 000000000..07e8c52da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/unexpected_token_after_ability_modifier.move:4:25
+  │
+4 │     struct Foo has copy & drop {}
+  │                         ^
+  │                         │
+  │                         Unexpected '&'
+  │                         Expected one of: ',', '{', '(', or ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.move
new file mode 100644
index 000000000..40c735469
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unexpected_token_after_ability_modifier.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // incorrect delim for ability modifiers
+    struct Foo has copy & drop {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.exp
new file mode 100644
index 000000000..9e5c7d0ae
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/unknown_ability_name_function_constraint.move:4:16
+  │
+4 │     fun foo<T: blah>() {}
+  │                ^^^^ Unexpected 'blah'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.move
new file mode 100644
index 000000000..94044e5e4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_function_constraint.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid constraint
+    fun foo<T: blah>() {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.exp
new file mode 100644
index 000000000..1be24f714
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/unknown_ability_name_modifier.move:4:20
+  │
+4 │     struct Foo has blah {}
+  │                    ^^^^ Unexpected 'blah'. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.move
new file mode 100644
index 000000000..3b234ce31
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unknown_ability_name_modifier.move
@@ -0,0 +1,6 @@
+address 0x42 {
+module M {
+    // invalid ability name
+    struct Foo has blah {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.exp
new file mode 100644
index 000000000..99418a763
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.exp
@@ -0,0 +1,6 @@
+error[E01012]: invalid identifier escape
+  ┌─ tests/move_check/parser/unmatched_restricted_identifier.move:4:13
+  │
+4 │     fun foo(`x: u64): u64 { `x }
+  │             ^^ Missing closing backtick (`) for restricted identifier escaping
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.move
new file mode 100644
index 000000000..7f666fe02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier.move
@@ -0,0 +1,5 @@
+// unmatched `
+
+module a::m {
+    fun foo(`x: u64): u64 { `x }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.exp
new file mode 100644
index 000000000..e73a3f774
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.exp
@@ -0,0 +1,6 @@
+error[E01012]: invalid identifier escape
+  ┌─ tests/move_check/parser/unmatched_restricted_identifier_no_text.move:4:9
+  │
+4 │     fun `
+  │         ^ Missing closing backtick (`) for restricted identifier escaping
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.move b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.move
new file mode 100644
index 000000000..07ba54761
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/unmatched_restricted_identifier_no_text.move
@@ -0,0 +1,4 @@
+// an unmatched ` with no text following
+
+module a::m {
+    fun `
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.exp
new file mode 100644
index 000000000..89b34a71f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.exp
@@ -0,0 +1,96 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_inner_scope.move:5:13
+  │
+5 │         use 0x2::Mango;
+  │             ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_inner_scope.move:6:13
+  │
+6 │         use 0x2::Mango as M;
+  │             ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_inner_scope.move:7:13
+  │
+7 │         use 0x2::Mango::baz;
+  │             ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_inner_scope.move:8:13
+  │
+8 │         use 0x2::Salsa::{Self, foo as bar, foo};
+  │             ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Salsa'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:10:17
+   │
+10 │             use 0x2::Mango;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:11:17
+   │
+11 │             use 0x3::Mango as M;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:12:17
+   │
+12 │             use 0x3::Mango::baz;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:13:17
+   │
+13 │             use 0x3::Salsa::{Self, foo as bar, foo};
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Salsa'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:27:53
+   │
+27 │                                                 use 0x2::Mango;
+   │                                                     ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:28:53
+   │
+28 │                                                 use 0x3::Mango as M;
+   │                                                     ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:29:53
+   │
+29 │                                                 use 0x3::Mango::baz;
+   │                                                     ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:30:53
+   │
+30 │                                                 use 0x3::Salsa::{Self, foo as bar, foo};
+   │                                                     ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Salsa'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:43:17
+   │
+43 │             use 0x2::Mango;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x2::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:44:17
+   │
+44 │             use 0x3::Mango as M;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:45:17
+   │
+45 │             use 0x3::Mango::baz;
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Mango'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/parser/use_inner_scope.move:46:17
+   │
+46 │             use 0x3::Salsa::{Self, foo as bar, foo};
+   │                 ^^^^^^^^^^ Invalid 'use'. Unbound module: '0x3::Salsa'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.move
new file mode 100644
index 000000000..69f052ab0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope.move
@@ -0,0 +1,51 @@
+address 0x2 {
+module M {
+
+    fun t() {
+        use 0x2::Mango;
+        use 0x2::Mango as M;
+        use 0x2::Mango::baz;
+        use 0x2::Salsa::{Self, foo as bar, foo};
+        let x = {
+            use 0x2::Mango;
+            use 0x3::Mango as M;
+            use 0x3::Mango::baz;
+            use 0x3::Salsa::{Self, foo as bar, foo};
+
+            0
+        }; x;
+        {
+            {
+                {
+                    {
+                        {
+                            {
+                                {
+                                    {
+                                        {
+                                            {
+                                                use 0x2::Mango;
+                                                use 0x3::Mango as M;
+                                                use 0x3::Mango::baz;
+                                                use 0x3::Salsa::{Self, foo as bar, foo};
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+        while (true) {
+            use 0x2::Mango;
+            use 0x3::Mango as M;
+            use 0x3::Mango::baz;
+            use 0x3::Salsa::{Self, foo as bar, foo};
+
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.exp
new file mode 100644
index 000000000..719fc5807
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_inner_scope_invalid.move:6:9
+  │
+6 │         use 0x1::M::foo;
+  │         ^^^
+  │         │
+  │         Unexpected 'use'
+  │         Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.move
new file mode 100644
index 000000000..100cf42d3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid.move
@@ -0,0 +1,9 @@
+address 0x2 {
+module M {
+    fun t() {
+        let x = 0;
+
+        use 0x1::M::foo;
+        foo(x)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.exp
new file mode 100644
index 000000000..8bc8bd6f3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_inner_scope_invalid_inner.move:4:19
+  │
+4 │         if (cond) use 0x2::M;
+  │                   ^^^
+  │                   │
+  │                   Unexpected 'use'
+  │                   Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.move
new file mode 100644
index 000000000..70a4283a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_inner_scope_invalid_inner.move
@@ -0,0 +1,6 @@
+address 0x2 {
+module M {
+    fun t() {
+        if (cond) use 0x2::M;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member.move
new file mode 100644
index 000000000..285da306d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member.move
@@ -0,0 +1,37 @@
+address 0x1 {
+
+module X {
+    struct S {}
+    public fun foo() {}
+}
+
+module Y {
+    struct S {}
+    public fun foo() {}
+}
+
+module Z {
+    struct S {}
+    public fun foo() {}
+}
+
+module M {
+
+    struct A { f1: XS, f2: S, f3: Z}
+
+    use 0x1::X::{S as XS, foo};
+    use 0x1::Z::{
+        S as Z,
+        foo as zfoo,
+    };
+
+    public fun m() {
+        foo();
+        Foo();
+        zfoo();
+    }
+
+    use 0x1::Y::S;
+    use 0x1::Y::foo as Foo;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.exp
new file mode 100644
index 000000000..713a1f820
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_module_member_invalid_comma.move:4:26
+  │
+4 │     use 0x1::X::{S as XS,,};
+  │                          ^ Expected a module member alias
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.move
new file mode 100644
index 000000000..dbf7005b7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_comma.move
@@ -0,0 +1,5 @@
+
+module M {
+
+    use 0x1::X::{S as XS,,};
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp
new file mode 100644
index 000000000..e3ea87150
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_module_member_invalid_missing_close_brace.move:6:5
+  │
+4 │     use 0x1::X::{S as XS
+  │                 - To match this '{'
+5 │ 
+6 │     fun foo() {
+  │     ^ Expected '}'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move
new file mode 100644
index 000000000..e009dd193
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move
@@ -0,0 +1,9 @@
+
+module M {
+
+    use 0x1::X::{S as XS
+
+    fun foo() {
+
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp
new file mode 100644
index 000000000..b7adf6097
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_module_member_invalid_missing_semicolon.move:5:1
+  │
+5 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected ';'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move
new file mode 100644
index 000000000..9d7795fca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move
@@ -0,0 +1,5 @@
+
+module M {
+
+    use 0x1::X::{S as XS,}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.exp
new file mode 100644
index 000000000..3a1019d71
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_with_address.move:2:1
+  │
+2 │ use 0x1::Module;
+  │ ^^^ Invalid code unit. Expected 'address', 'module', or 'script'. Got 'use'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.move
new file mode 100644
index 000000000..90d309732
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_address.move
@@ -0,0 +1,3 @@
+// Top-level "use" are currently meaningless. The feature might be added some day
+use 0x1::Module;
+address 0x2 {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.exp
new file mode 100644
index 000000000..0c719dd6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.exp
@@ -0,0 +1,18 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_with_main.move:3:5
+  │
+3 │ use 0x0::Module;
+  │     ^^^^^^^^^^^ Invalid 'use'. Unbound module: '0x0::Module'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_with_main.move:4:5
+  │
+4 │ use 0xaBcD::Module as M;
+  │     ^^^^^^^^^^^^^^ Invalid 'use'. Unbound module: '0xABCD::Module'
+
+error[E03002]: unbound module
+  ┌─ tests/move_check/parser/use_with_main.move:5:5
+  │
+5 │ use 0x0000::Z;
+  │     ^^^^^^^^^ Invalid 'use'. Unbound module: '0x0::Z'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.move
new file mode 100644
index 000000000..fba072387
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_main.move
@@ -0,0 +1,8 @@
+// Test various "use" declarations at the file level.
+script {
+use 0x0::Module;
+use 0xaBcD::Module as M;
+use 0x0000::Z;
+fun main() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.exp
new file mode 100644
index 000000000..12708300c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.exp
@@ -0,0 +1,42 @@
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:3:5
+  │
+3 │     public use a::m as m1;
+  │     ^^^^^^ Invalid use declaration. Non-'use fun' declarations cannot have visibility modifiers as they are always internal
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:4:5
+  │
+4 │     public(friend) use a::m as m2;
+  │     ^^^^^^^^^^^^^^ Invalid use declaration. Non-'use fun' declarations cannot have visibility modifiers as they are always internal
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:5:5
+  │
+5 │     entry use a::m as m3;
+  │     ^^^^^ Invalid use declaration. 'entry' is used only on functions
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:6:5
+  │
+6 │     native use a::m as m4;
+  │     ^^^^^^ Invalid use declaration. Unexpected 'native' modifier
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:7:5
+  │
+7 │     public native entry use a::m as m5;
+  │     ^^^^^^ Invalid use declaration. Non-'use fun' declarations cannot have visibility modifiers as they are always internal
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:7:12
+  │
+7 │     public native entry use a::m as m5;
+  │            ^^^^^^ Invalid use declaration. Unexpected 'native' modifier
+
+error[E01003]: invalid modifier
+  ┌─ tests/move_check/parser/use_with_modifiers.move:7:19
+  │
+7 │     public native entry use a::m as m5;
+  │                   ^^^^^ Invalid use declaration. 'entry' is used only on functions
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.move
new file mode 100644
index 000000000..1376b6d96
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers.move
@@ -0,0 +1,8 @@
+#[allow(unused)]
+module a::m {
+    public use a::m as m1;
+    public(friend) use a::m as m2;
+    entry use a::m as m3;
+    native use a::m as m4;
+    public native entry use a::m as m5;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.exp
new file mode 100644
index 000000000..ab857fa1c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_with_modifiers_exp.move:3:9
+  │
+3 │         public use fun bar as X.baz;
+  │         ^^^^^^
+  │         │
+  │         Unexpected 'public'
+  │         Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.move
new file mode 100644
index 000000000..f0647ffb8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_modifiers_exp.move
@@ -0,0 +1,5 @@
+module a::m {
+    public fun foo() {
+        public use fun bar as X.baz;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.exp
new file mode 100644
index 000000000..89ec56f9f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.exp
@@ -0,0 +1,6 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/use_with_module.move:2:1
+  │
+2 │ use 0x1::Module;
+  │ ^^^ Invalid code unit. Expected 'address', 'module', or 'script'. Got 'use'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.move b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.move
new file mode 100644
index 000000000..1624d8ab6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/use_with_module.move
@@ -0,0 +1,4 @@
+// Top-level "use" are currently meaningless. The feature might be added some day
+use 0x1::Module;
+module M {
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.exp
new file mode 100644
index 000000000..0bacce802
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/vector_literal_unclosed_args.move:5:5
+  │
+5 │     }
+  │     ^
+  │     │
+  │     Unexpected '}'
+  │     Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.move b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.move
new file mode 100644
index 000000000..11595991c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_args.move
@@ -0,0 +1,6 @@
+module 0x42::Test {
+    fun t() {
+        // test missing ]
+        let v = vector[
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.exp
new file mode 100644
index 000000000..e2045fd0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/vector_literal_unclosed_type_args.move:4:27
+  │
+4 │         let v = vector<u64[0, 1];
+  │                       -   ^ Expected '>'
+  │                       │    
+  │                       To match this '<'
+  │                       Perhaps you need a blank space before this '<' operator?
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.move b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.move
new file mode 100644
index 000000000..0d9abe450
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_literal_unclosed_type_args.move
@@ -0,0 +1,6 @@
+module 0x42::Test {
+    fun t() {
+        // test missing >
+        let v = vector<u64[0, 1];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.exp b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.exp
new file mode 100644
index 000000000..c8666a0f1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/vector_space_after_less.move:4:29
+  │
+4 │         let a = vector < 100;
+  │                        - ---^ Unexpected ';'
+  │                        │ │   
+  │                        │ Expected '::' after an address in a module access chain
+  │                        Perhaps you need a blank space before this '<' operator?
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.move b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.move
new file mode 100644
index 000000000..d494a9fa3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/parser/vector_space_after_less.move
@@ -0,0 +1,6 @@
+module 0x42::Test {
+    fun t() {
+        // tests there being a space after <
+        let a = vector < 100;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/to_bytecode/unassigned_address.move b/vendors/move/crates/move-compiler/tests/move_check/to_bytecode/unassigned_address.move
new file mode 100644
index 000000000..adb4bdfe8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/to_bytecode/unassigned_address.move
@@ -0,0 +1,18 @@
+// Tests compilation is stopped for unassigned addresses
+// Named addresses don't exist at the bytecode level
+
+address A {
+module Ex {}
+}
+
+module A::M {
+    struct S {}
+    friend A::N;
+    public(friend) fun foo(_: address): S { S{} }
+}
+
+module A::N {
+    fun bar(): A::M::S {
+        A::M::foo(@A)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.exp
new file mode 100644
index 000000000..994d6986a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.move:8:14
+  │
+4 │     let ref;
+  │         --- The variable 'ref' might not have a value. The variable must be assigned a value before being used.
+  ·
+8 │     assert!(*move ref == 5, 42);
+  │              ^^^^^^^^ Invalid usage of unassigned variable 'ref'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.move
new file mode 100644
index 000000000..b7c239564
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_if.move
@@ -0,0 +1,12 @@
+script {
+fun main() {
+    let x = 5;
+    let ref;
+    if (true) {
+        ref = &x;
+    };
+    assert!(*move ref == 5, 42);
+}
+}
+
+// check: MOVELOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.exp
new file mode 100644
index 000000000..dee9b5709
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.exp
@@ -0,0 +1,9 @@
+error[E07005]: invalid transfer of references
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.move:9:9
+  │
+7 │         let ref_x_f_g = &ref_x_f.g;
+  │                         ---------- Field 'g' is still being borrowed by this reference
+8 │ 
+9 │         (ref_x_f, ref_x_f_g)
+  │         ^^^^^^^^^^^^^^^^^^^^ Invalid return of reference. Cannot transfer a mutable reference that is being borrowed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.move
new file mode 100644
index 000000000..b2c842326
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/borrow_return_mutable_borrow_bad.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct X { f: Y }
+    struct Y { g: u64, h: u64 }
+
+    fun t1(ref_x: &mut X): (&mut Y, &u64)  {
+        let ref_x_f = &mut ref_x.f;
+        let ref_x_f_g = &ref_x_f.g;
+
+        (ref_x_f, ref_x_f_g)
+    }
+}
+
+// check: RET_BORROWED_MUTABLE_REFERENCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed.move
new file mode 100644
index 000000000..b78a43d41
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed.move
@@ -0,0 +1,10 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let r1 = &x;
+        let r2 = &x;
+        x + copy x;
+        r1;
+        r2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field.move
new file mode 100644
index 000000000..acccf1dd7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field.move
@@ -0,0 +1,12 @@
+module 0x8675309::Tester {
+    struct T has copy, drop { f: u64 }
+
+    fun t() {
+        let x = T { f: 0 };
+        let r1 = &x.f;
+        let r2 = &x.f;
+        copy x;
+        r1;
+        r2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.exp
new file mode 100644
index 000000000..ddd12a3c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.exp
@@ -0,0 +1,8 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.move:7:9
+  │
+6 │         let r1 = &mut x.f;
+  │                  -------- It is still being mutably borrowed by this reference
+7 │         copy x;
+  │         ^^^^^^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.move
new file mode 100644
index 000000000..96681bc19
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_field_invalid.move
@@ -0,0 +1,12 @@
+module 0x8675309::Tester {
+    struct T has copy, drop { f: u64 }
+
+    fun t() {
+        let x = T { f: 0 };
+        let r1 = &mut x.f;
+        copy x;
+        r1;
+    }
+}
+
+// check: COPYLOC_EXISTS_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect.move
new file mode 100644
index 000000000..be29aae6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect.move
@@ -0,0 +1,16 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let y = 0;
+        let r1 = foo(&x, &y);
+        let r2 = foo(&x, &y);
+        x + copy x;
+        y + copy y;
+        r1;
+        r2;
+    }
+
+    fun foo(_r: &u64, r2: &u64): &u64 {
+        r2
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.exp
new file mode 100644
index 000000000..2d6253974
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.exp
@@ -0,0 +1,8 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.move:6:9
+  │
+5 │         let r1 = foo(&mut x, &mut y);
+  │                  ------------------- It is still being mutably borrowed by this reference
+6 │         copy x;
+  │         ^^^^^^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.move
new file mode 100644
index 000000000..3ae0bd396
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_indirect_invalid.move
@@ -0,0 +1,13 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let y = 0;
+        let r1 = foo(&mut x, &mut y);
+        copy x;
+        r1;
+    }
+
+    fun foo(_r: &mut u64, r2: &mut u64): &mut u64 {
+        r2
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.exp
new file mode 100644
index 000000000..1420c8365
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.exp
@@ -0,0 +1,8 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.move:5:9
+  │
+4 │         let r1 = &mut x;
+  │                  ------ It is still being mutably borrowed by this reference
+5 │         copy x;
+  │         ^^^^^^ Invalid copy of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.move
new file mode 100644
index 000000000..1d8c5848c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/copy_loc_borrowed_invalid.move
@@ -0,0 +1,10 @@
+module 0x8675309::Tester {
+    fun t() {
+        let x = 0;
+        let r1 = &mut x;
+        copy x;
+        r1;
+    }
+}
+
+// check: COPYLOC_EXISTS_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_bad.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_bad.move
new file mode 100644
index 000000000..0ce38d3e7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_bad.move
@@ -0,0 +1,42 @@
+module 0x8675309::Tester {
+    fun eqtest1() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = copy r == copy r;
+    }
+
+    fun eqtest2() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = copy r == move r;
+    }
+
+    fun neqtest1() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = copy r != copy r;
+    }
+
+    fun neqtest2() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = copy r != move r;
+    }
+}
+
+// check: READREF_EXISTS_MUTABLE_BORROW_ERROR
+// check: READREF_EXISTS_MUTABLE_BORROW_ERROR
+// check: READREF_EXISTS_MUTABLE_BORROW_ERROR
+// check: READREF_EXISTS_MUTABLE_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_ok.move
new file mode 100644
index 000000000..5ee78d10b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/eq_ok.move
@@ -0,0 +1,37 @@
+module 0x8675309::Tester {
+    fun eqtest1() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy r) == freeze(copy r);
+    }
+
+    fun eqtest2() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy r) == freeze(move r);
+    }
+
+    fun neqtest1() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy r) != freeze(copy r);
+    }
+
+    fun neqtest2() {
+        let x: u64;
+        let r: &mut u64;
+
+        x = 0;
+        r = &mut x;
+        _ = freeze(copy r) != freeze(move r);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.exp
new file mode 100644
index 000000000..a0c4b4296
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.exp
@@ -0,0 +1,18 @@
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.move:12:9
+   │
+ 9 │         let f_g = &mut f.g;
+   │                   -------- Field 'g' is still being mutably borrowed by this reference
+   ·
+12 │         foo(f_g, f);
+   │         ^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.move:22:9
+   │
+19 │         let f_g = &mut f.g;
+   │                   -------- Field 'g' is still being mutably borrowed by this reference
+   ·
+22 │         bar(f, f_g);
+   │         ^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.move
new file mode 100644
index 000000000..bb7a655ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_1.move
@@ -0,0 +1,30 @@
+module 0x8675309::M {
+    struct X has copy, drop { f: Y }
+    struct Y has copy, drop { g: u64, h: u64 }
+
+    fun t1() {
+        let x = X { f: Y { g: 0, h: 0 } };
+
+        let f = &mut x.f;
+        let f_g = &mut f.g;
+
+        // Error: the argument for parameter b is borrowed
+        foo(f_g, f);
+    }
+
+    fun t2() {
+        let x = X { f: Y { g: 0, h: 0 } };
+
+        let f = &mut x.f;
+        let f_g = &mut f.g;
+
+        // Error: the argument for parameter a is borrowed
+        bar(f, f_g);
+    }
+
+    fun foo(_a: &mut u64, _b: &mut Y) {
+    }
+
+    fun bar(_a: &mut Y, _b: &mut u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.exp
new file mode 100644
index 000000000..e83c30a4e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.exp
@@ -0,0 +1,9 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.move:8:9
+  │
+6 │         let eps = if (cond) bar(root) else &x1;
+  │                             --------- It is still being borrowed by this reference
+7 │         // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+8 │         &mut root.g;
+  │         ^^^^^^^^^^^ Invalid mutable borrow at field 'g'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.move
new file mode 100644
index 000000000..df43dbb33
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_invalid_2.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    struct S { g: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let x1 = 0;
+        let eps = if (cond) bar(root) else &x1;
+        // Error: root has weak empty borrow and hence a field cannot be borrowed mutably
+        &mut root.g;
+        eps;
+    }
+
+    fun bar(a: &mut S): &u64 {
+        &a.g
+    }
+}
+
+// check: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_1.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_1.move
new file mode 100644
index 000000000..04a2f0cd6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_1.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct X has copy, drop { f: Y }
+    struct Y has copy, drop { g: u64, h: u64 }
+
+    fun t1() {
+        let x = X { f: Y { g: 0, h: 0 } };
+        let g = &mut x.f.g;
+        let h = &mut x.f.h;
+
+        *g = *h;
+        *h = *g;
+
+        foo(g, h);
+    }
+
+    fun foo(_a: &mut u64, _b: &mut u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_2.move
new file mode 100644
index 000000000..16192f630
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/factor_valid_2.move
@@ -0,0 +1,45 @@
+module 0x8675309::M {
+    struct S { g: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let x1 = 0;
+        let eps = if (cond) bar(root) else &x1;
+        let g = &root.g;
+        eps;
+        g;
+        eps;
+    }
+
+    fun t2() {
+        let x1 = 0;
+        let x2 = 1;
+        let eps = foo(&x1, &x2);
+        baz(&x1, eps);
+    }
+
+    fun t3() {
+        let x1 = 0;
+        let x2 = 1;
+        let eps = foo(&x1, &x2);
+        baz(freeze(&mut x1), eps);
+    }
+
+    fun foo(a: &u64, b: &u64): &u64 {
+        let ret;
+        if (*a > *b) {
+            ret = move a;
+            move b;
+        } else {
+            ret = move b;
+            move a;
+        };
+        ret
+    }
+
+    fun bar(a: &mut S): &u64 {
+        &a.g
+    }
+
+    fun baz(_a: &u64, _b: &u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial.move
new file mode 100644
index 000000000..d4d213a04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial.move
@@ -0,0 +1,18 @@
+module 0x8675309::Tester {
+    struct X has key { f: u64 }
+
+    fun bump_and_give(x_ref: &mut X, _other: &u64): &u64 {
+        x_ref.f = x_ref.f + 1;
+        &x_ref.f
+    }
+
+    fun contrived_example(result: &mut u64) {
+        let x = X { f: 0 };
+        let other = 100;
+        let returned_ref = bump_and_give(&mut x, &other);
+        // imagine some more interesting check than this assert
+        assert!(*returned_ref == x.f, 42);
+        *result = *returned_ref;
+        X { f: _ } = x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial_valid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial_valid.move
new file mode 100644
index 000000000..9a3eb620a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_loc_trivial_valid.move
@@ -0,0 +1,18 @@
+module 0x8675309::Tester {
+    struct X has key { f: u64 }
+
+    fun bump_and_give(x_ref: &mut X, _other: &u64): &u64 {
+        x_ref.f = x_ref.f + 1;
+        &x_ref.f
+    }
+
+    fun contrived_example(result: &mut u64) {
+        let x = X { f: 0 };
+        let other = 100;
+        let returned_ref = bump_and_give(&mut x, &other);
+        // imagine some more interesting check than this assert
+        assert!(*returned_ref == freeze(&mut x).f, 42);
+        *result = *returned_ref;
+        X { f: _ } = x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial.move
new file mode 100644
index 000000000..6cb7e9463
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial.move
@@ -0,0 +1,15 @@
+module 0x8675309::Tester {
+    struct X { f: u64 }
+
+    fun bump_and_give(x_ref: &mut X): &u64 {
+        x_ref.f = x_ref.f + 1;
+        &x_ref.f
+    }
+
+    fun contrived_example(x_ref: &mut X): &u64 {
+        let returned_ref = bump_and_give(x_ref);
+        // imagine some more interesting check than this assert
+        assert!(*returned_ref == *&x_ref.f, 42);
+        returned_ref
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.exp
new file mode 100644
index 000000000..2c8874764
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.exp
@@ -0,0 +1,9 @@
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.move:12:42
+   │
+10 │         let returned_ref = bump_and_give(x_ref);
+   │                            -------------------- It is still being borrowed by this reference
+11 │         // ERROR Cannot mutably borrow from `x_ref` it is being borrowed by `returned_ref`
+12 │         assert!(*returned_ref == *freeze(&mut x_ref.f) + 1, 42);
+   │                                          ^^^^^^^^^^^^ Invalid mutable borrow at field 'f'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.move
new file mode 100644
index 000000000..434ad624f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/imm_borrow_on_mut_trivial_invalid.move
@@ -0,0 +1,25 @@
+module 0x8675309::Tester {
+    struct X { f: u64 }
+
+    fun bump_and_give(x_ref: &mut X): &u64 {
+        x_ref.f = x_ref.f + 1;
+        &x_ref.f
+    }
+
+    fun contrived_example_no(x_ref: &mut X): &u64 {
+        let returned_ref = bump_and_give(x_ref);
+        // ERROR Cannot mutably borrow from `x_ref` it is being borrowed by `returned_ref`
+        assert!(*returned_ref == *freeze(&mut x_ref.f) + 1, 42);
+        returned_ref
+    }
+
+    fun contrived_example_valid(x_ref: &mut X): &u64 {
+        let returned_ref = bump_and_give(x_ref);
+        // This is still valid, but might not be in other cases. See other Imm Borrow tests
+        // i.e. you might hit FreezeRefExistsMutableBorrowError
+        assert!(*returned_ref == *(&freeze(x_ref).f) + 1, 42);
+        returned_ref
+    }
+}
+
+// check: BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/join_borrow_unavailable_valid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/join_borrow_unavailable_valid.move
new file mode 100644
index 000000000..09191ba36
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/join_borrow_unavailable_valid.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let u = 0;
+
+        let x = if (cond) {
+            &u
+        } else {
+            move u;
+            &root.f
+        };
+        *x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/move_one_branch.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/move_one_branch.move
new file mode 100644
index 000000000..d59b580d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/move_one_branch.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+            *move x_ref = 1;
+        };
+        x = 1;
+        x;
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        let x_ref = &mut x;
+        if (cond) {
+        } else {
+            *move x_ref = 1;
+        };
+        x = 1;
+        x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.exp
new file mode 100644
index 000000000..0778b34ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.exp
@@ -0,0 +1,18 @@
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.move:9:9
+  │
+6 │         let x = if (cond) &mut root.f else &mut root.g;
+  │                           ----------- It is still being mutably borrowed by this reference
+  ·
+9 │         root.f = 1;
+  │         ^^^^^^^^^^ Invalid mutation of reference.
+
+error[E07005]: invalid transfer of references
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.move:17:9
+   │
+14 │         let x = if (cond) &mut root.f else &mut root.g;
+   │                           ----------- It is still being mutably borrowed by this reference
+   ·
+17 │         foo(x, &mut root.f);
+   │         ^^^^^^^^^^^^^^^^^^^ Invalid usage of reference as function argument. Cannot transfer a mutable reference that is being borrowed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.move
new file mode 100644
index 000000000..b4a2fe6be
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_invalid.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64, h: u64 }
+
+
+    fun t1(root: &mut S, cond: bool) {
+        let x = if (cond) &mut root.f else &mut root.g;
+
+        // INVALID
+        root.f = 1;
+        *x;
+    }
+
+    fun t2(root: &mut S, cond: bool) {
+        let x = if (cond) &mut root.f else &mut root.g;
+
+        // INVALID
+        foo(x, &mut root.f);
+    }
+
+    fun foo(_x: &mut u64, _y: &mut u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice.move
new file mode 100644
index 000000000..d701271f1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun t1() {
+        let a = 0;
+        let r1 = &mut a;
+        let r2 = &mut a;
+        *r1 = 1;
+        *r2 = 2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.exp
new file mode 100644
index 000000000..faba5757b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.exp
@@ -0,0 +1,9 @@
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.move:6:9
+  │
+4 │         let r1 = &mut a;
+  │                  ------ It is still being mutably borrowed by this reference
+5 │         let r2 = &mut a;
+6 │         *r2 = 2;
+  │         ^^^^^^^ Invalid mutation of reference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.move
new file mode 100644
index 000000000..6bd703e0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutable_borrow_local_twice_invalid.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    fun t1() {
+        let a = 0;
+        let r1 = &mut a;
+        let r2 = &mut a;
+        *r2 = 2;
+        *r1 = 1;
+    }
+}
+
+// check: WRITEREF_EXISTS_BORROW_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc.move
new file mode 100644
index 000000000..b136e9aef
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun t1() {
+        let x = 0;
+        let y = &x;
+        y;
+        y = &x;
+        y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.exp
new file mode 100644
index 000000000..481de4324
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.exp
@@ -0,0 +1,8 @@
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.move:5:9
+  │
+4 │         let y = &x;
+  │                 -- It is still being borrowed by this reference
+5 │         x = 0;
+  │         ^ Invalid assignment of variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.move
new file mode 100644
index 000000000..20be8bd9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_invalid.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    fun t1() {
+        let x = 0;
+        let y = &x;
+        x = 0;
+        y;
+        x;
+    }
+
+}
+
+// check: STLOC_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.exp
new file mode 100644
index 000000000..45edf08b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.exp
@@ -0,0 +1,30 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move:7:9
+  │
+2 │     struct X has key { b: bool }
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let x = X { b: true };
+  │             -   ------------- The type '0x8675309::M::X' does not have the ability 'drop'
+  │             │    
+  │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+6 │         let y = &x;
+7 │         x = X { b: true };
+  │         ^ Invalid assignment to variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move:7:9
+  │
+6 │         let y = &x;
+  │                 -- It is still being borrowed by this reference
+7 │         x = X { b: true };
+  │         ^ Invalid assignment of variable 'x'
+
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move:16:9
+   │
+15 │         let z = &y.z;
+   │                 ---- It is still being borrowed by this reference
+16 │         s = S { z: 7 };
+   │         ^ Invalid assignment of variable 's'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move
new file mode 100644
index 000000000..18219d3e1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/mutate_with_borrowed_loc_struct_invalid.move
@@ -0,0 +1,24 @@
+module 0x8675309::M {
+    struct X has key { b: bool }
+    struct S has copy, drop { z: u64 }
+    fun t1() {
+        let x = X { b: true };
+        let y = &x;
+        x = X { b: true };
+        move y;
+        X { b: _ } = x;
+    }
+
+    fun t2() {
+        let s = S { z: 2 };
+        let y = &s;
+        let z = &y.z;
+        s = S { z: 7 };
+        z;
+        s;
+    }
+
+}
+
+// check: STLOC_UNSAFE_TO_DESTROY_ERROR
+// check: STLOC_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/ref_moved_one_branch.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/ref_moved_one_branch.move
new file mode 100644
index 000000000..710396d6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/ref_moved_one_branch.move
@@ -0,0 +1,13 @@
+module 0x8675309::A {
+    struct S {value: u64}
+
+    public fun t(changed: bool, s: &mut S) {
+        if (changed) {
+            foo(&mut (move s).value);
+        }
+    }
+
+    fun foo(x: &mut u64) {
+        *x = *x + 1;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/release_cycle.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/release_cycle.move
new file mode 100644
index 000000000..359f8c17a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/release_cycle.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        let v = 0;
+        let x;
+        let y;
+        if (move cond) {
+            x = &v;
+            y = copy x;
+        } else {
+            y = &v;
+            x = copy y;
+        };
+        move x;
+        move y;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc.move
new file mode 100644
index 000000000..cfc0e9297
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct X has copy, drop { y: Y }
+    struct Y has copy, drop { u: u64 }
+
+    fun t1() {
+        let x = 0;
+        let y = &x;
+        copy y;
+    }
+
+    fun t2() {
+        let s = X { y: Y { u: 0 } };
+        let x = &s;
+        let y = &x.y;
+        let u = &y.u;
+        copy x;
+        copy y;
+        copy u;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.exp
new file mode 100644
index 000000000..875567c7a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.exp
@@ -0,0 +1,35 @@
+error[E07004]: invalid return of locally borrowed state
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move:7:9
+  │
+7 │         &x
+  │         ^^
+  │         │
+  │         Invalid return. Local variable 'x' is still being borrowed.
+  │         It is still being borrowed by this reference
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move:13:9
+   │
+13 │         copy y
+   │         ^^^^^^
+   │         │
+   │         Invalid return. Local variable 'x' is still being borrowed.
+   │         It is still being borrowed by this reference
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move:21:9
+   │
+20 │         let u = &y.u;
+   │                 ---- It is still being borrowed by this reference
+21 │         move u
+   │         ^^^^^^ Invalid return. Local variable 's' is still being borrowed.
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move:29:9
+   │
+29 │         copy u
+   │         ^^^^^^
+   │         │
+   │         Invalid return. Local variable 's' is still being borrowed.
+   │         It is still being borrowed by this reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move
new file mode 100644
index 000000000..591af3778
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_invalid.move
@@ -0,0 +1,36 @@
+module 0x8675309::M {
+    struct X has copy, drop { y: Y }
+    struct Y has copy, drop { u: u64 }
+
+    fun t1(): &u64 {
+        let x = 0;
+        &x
+    }
+
+    fun t2(): &u64 {
+        let x = 0;
+        let y = &x;
+        copy y
+    }
+
+    fun t3(): &u64 {
+        let s = X { y: Y { u: 0 } };
+        let x = &s;
+        let y = &x.y;
+        let u = &y.u;
+        move u
+    }
+
+    fun t4(): &u64 {
+        let s = X { y: Y { u: 0 } };
+        let x = &s;
+        let y = &x.y;
+        let u = &y.u;
+        copy u
+    }
+}
+
+// check: RET_UNSAFE_TO_DESTROY_ERROR
+// check: RET_UNSAFE_TO_DESTROY_ERROR
+// check: RET_UNSAFE_TO_DESTROY_ERROR
+// check: RET_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.exp
new file mode 100644
index 000000000..bff208664
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.exp
@@ -0,0 +1,14 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.move:7:15
+  │
+2 │     struct X has key { u: u64 }
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let s = X { u: 0 };
+  │             -   ---------- The type '0x8675309::M::X' does not have the ability 'drop'
+  │             │    
+  │             The local variable 's' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+6 │         let u = &s.u;
+7 │         copy u;
+  │               ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.move
new file mode 100644
index 000000000..3b4b6b130
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/return_with_borrowed_loc_resource_invalid.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct X has key { u: u64 }
+
+    fun t() {
+        let s = X { u: 0 };
+        let u = &s.u;
+        copy u;
+    }
+}
+
+// check: RET_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.exp
new file mode 100644
index 000000000..7593083a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.exp
@@ -0,0 +1,9 @@
+error[E07003]: invalid operation, could create dangling a reference
+   ┌─ tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.move:10:9
+   │
+ 6 │         let v_mut = &mut root.g.v;
+   │                     ------------- Field 'v' is still being mutably borrowed by this reference
+   ·
+10 │         *g_mut = G { v: 0 };
+   │         ^^^^^^^^^^^^^^^^^^^ Invalid mutation of reference.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.move
new file mode 100644
index 000000000..39bd22c34
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_invalid.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct G has copy, drop { v: u64 }
+    struct S has copy, drop { g: G }
+
+    fun t1(root: &mut S) {
+        let v_mut = &mut root.g.v;
+        let g_mut = &mut root.g;
+
+        // INVALID
+        *g_mut = G { v: 0 };
+        v_mut;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid1.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid1.move
new file mode 100644
index 000000000..33bf93d3e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid1.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct G has copy, drop { v1: u64, v2: u64 }
+    struct S has copy, drop { g1: G, g2: G }
+
+    fun t1(root: &mut S) {
+        let v1_mut = &mut root.g1.v1;
+        let v2_mut = &mut root.g1.v2;
+        let g2_mut = &mut root.g2;
+
+        *g2_mut = G { v1: 0, v2: 0 };
+        *v2_mut = 0;
+        *v1_mut = 1;
+        v2_mut;
+        g2_mut;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid2.move
new file mode 100644
index 000000000..3d2c67c46
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/borrow_tests/writeref_borrow_valid2.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64, h: u64 }
+
+    fun t1(root: &mut S, cond: bool) {
+        let x = if (cond) &mut root.f else &mut root.g;
+        root.h = 0;
+        x;
+    }
+
+    fun t2(root: &mut S, cond: bool) {
+        let x = if (cond) &mut root.f else &mut root.g;
+
+        &mut root.f;
+        &mut root.g;
+        x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.exp
new file mode 100644
index 000000000..95782c0d7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.move:6:1
+  │
+6 │ }
+  │ ^
+  │ │
+  │ Unexpected '}'
+  │ Expected an expression term
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.move
new file mode 100644
index 000000000..b3c48f260
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/abort_negative_stack_size.move
@@ -0,0 +1,7 @@
+// check: NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+script {
+
+fun main() {
+    abort
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.exp
new file mode 100644
index 000000000..f198d8689
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.exp
@@ -0,0 +1,18 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.move:7:5
+  │
+3 │     let x;
+  │         - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+  ·
+7 │     x == y;
+  │     ^ Invalid usage of unassigned variable 'x'
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.move:7:10
+  │
+4 │     let y;
+  │         - The variable 'y' might not have a value. The variable must be assigned a value before being used.
+  ·
+7 │     x == y;
+  │          ^ Invalid usage of unassigned variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.move
new file mode 100644
index 000000000..17afcfc0c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_in_one_if_branch.move
@@ -0,0 +1,11 @@
+script {
+fun main() {
+    let x;
+    let y;
+    if (true) x = 5 else ();
+    if (true) y = 5;
+    x == y;
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.exp
new file mode 100644
index 000000000..73b641003
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.exp
@@ -0,0 +1,26 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_resource.move:6:9
+  │
+2 │     struct T {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let t = T{}; &t;
+  │             -   --- The type '0x8675309::M::T' does not have the ability 'drop'
+  │             │    
+  │             The variable contains a value due to this assignment. The value does not have the 'drop' ability and must be used before you assign to this variable again
+6 │         t = T {}; &t;
+  │         ^ Invalid assignment to variable 't'
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_resource.move:6:21
+  │
+2 │     struct T {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let t = T{}; &t;
+  │                 --- The type '0x8675309::M::T' does not have the ability 'drop'
+6 │         t = T {}; &t;
+  │         -           ^ Invalid return
+  │         │            
+  │         The local variable 't' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.move
new file mode 100644
index 000000000..b5098c592
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_resource.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct T {}
+
+    fun no() {
+        let t = T{}; &t;
+        t = T {}; &t;
+    }
+
+}
+
+// check: STLOC_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.exp
new file mode 100644
index 000000000..6b26c9ffc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.move:5:13
+  │
+3 │     let x: u64;
+  │         - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │     if (true) () else x = 100;
+5 │     assert!(x == 100, 42);
+  │             ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.move
new file mode 100644
index 000000000..5ba1a2749
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+    let x: u64;
+    if (true) () else x = 100;
+    assert!(x == 100, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.exp
new file mode 100644
index 000000000..4ec5f7de1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.move:5:13
+  │
+3 │     let x: u64;
+  │         - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │     if (false) x = 100;
+5 │     assert!(x == 100, 42);
+  │             ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.move
new file mode 100644
index 000000000..60b5aae60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_if_branch_no_else.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+    let x: u64;
+    if (false) x = 100;
+    assert!(x == 100, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.exp
new file mode 100644
index 000000000..ff015989d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.exp
@@ -0,0 +1,10 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.move:6:5
+  │
+5 │     let x: u64;
+  │            --- Expected: 'u64'
+6 │     x = false
+  │     ^   ----- Given: 'bool'
+  │     │    
+  │     Invalid assignment to variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.move
new file mode 100644
index 000000000..d9537b8c8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/assign_wrong_type.move
@@ -0,0 +1,8 @@
+// check: STLOC_TYPE_MISMATCH_ERROR
+script {
+
+fun main() {
+    let x: u64;
+    x = false
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.exp
new file mode 100644
index 000000000..663a254fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.exp
@@ -0,0 +1,12 @@
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.move:12:13
+   │
+ 7 │         y = move x;
+   │             ------
+   │             │
+   │             The value of 'x' might have been previously moved here.
+   │             Suggestion: use 'copy x' to avoid the move.
+   ·
+12 │     assert!(x == 5, 42);
+   │             ^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.move
new file mode 100644
index 000000000..9eef4f406
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/branch_assigns_then_moves.move
@@ -0,0 +1,16 @@
+script {
+fun main() {
+    let x;
+    let y;
+    if (true) {
+        x = 1;
+        y = move x;
+        y;
+    } else {
+        x = 0;
+    };
+    assert!(x == 5, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.exp
new file mode 100644
index 000000000..b1ef9f725
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/translated_ir_tests/move/commands/break_outside_loop.move:3:5
+  │
+3 │     break
+  │     ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.move
new file mode 100644
index 000000000..33e6ac49b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    break
+}
+}
+
+// check: break outside loop
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.exp
new file mode 100644
index 000000000..d67f52782
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.move:3:24
+  │
+3 │     if (false) () else break;
+  │                        ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.move
new file mode 100644
index 000000000..d454331b0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_else.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    if (false) () else break;
+}
+}
+
+// check: break outside loop
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.exp
new file mode 100644
index 000000000..af09278df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.move:3:15
+  │
+3 │     if (true) break
+  │               ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.move
new file mode 100644
index 000000000..da630a316
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_outside_loop_in_if.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    if (true) break
+}
+}
+
+// check: break outside loop
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.exp
new file mode 100644
index 000000000..4f23dbbfb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.exp
@@ -0,0 +1,8 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/break_unreachable.move:8:9
+  │
+8 │         x = 5;
+  │         ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.move
new file mode 100644
index 000000000..03fa7fda8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/break_unreachable.move
@@ -0,0 +1,13 @@
+script {
+fun main() {
+    let x;
+    while (true) {
+        x = 3;
+        x;
+        break;
+        x = 5;
+        x;
+        break
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.exp
new file mode 100644
index 000000000..f432e37bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.move:3:5
+  │
+3 │     continue
+  │     ^^^^^^^^ Invalid usage of 'continue'. 'continue' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.move
new file mode 100644
index 000000000..76591ff02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    continue
+}
+}
+
+// check: continue outside loop
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.exp
new file mode 100644
index 000000000..3fcbd596b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.move:3:15
+  │
+3 │     if (true) continue;
+  │               ^^^^^^^^ Invalid usage of 'continue'. 'continue' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.move
new file mode 100644
index 000000000..f1710de94
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/continue_outside_loop_in_if.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    if (true) continue;
+}
+}
+
+// check: continue outside loop
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.exp
new file mode 100644
index 000000000..362b040b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.exp
@@ -0,0 +1,8 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/dead_return.move:4:9
+  │
+4 │         return 0
+  │         ^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.move
new file mode 100644
index 000000000..095f86547
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return.move
@@ -0,0 +1,6 @@
+module 0x8675309::Test {
+    public fun t(): u64 {
+        return 100;
+        return 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.exp
new file mode 100644
index 000000000..a27732424
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/dead_return_local.move:4:5
+  │
+4 │     assert!(false, 42);
+  │     ^^^^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/dead_return_local.move:5:5
+  │
+5 │     return ()
+  │     ^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.move
new file mode 100644
index 000000000..499338368
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/dead_return_local.move
@@ -0,0 +1,7 @@
+script {
+fun main() {
+    return ();
+    assert!(false, 42);
+    return ()
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.exp
new file mode 100644
index 000000000..f0d8c7861
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.move:11:13
+   │
+ 4 │     let y;
+   │         - The variable 'y' might not have a value. The variable must be assigned a value before being used.
+   ·
+11 │     assert!(y == 0, 42);
+   │             ^ Invalid usage of unassigned variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.move
new file mode 100644
index 000000000..819096298
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_assigns_if_doesnt.move
@@ -0,0 +1,15 @@
+script {
+fun main() {
+    let x;
+    let y;
+    if (true) {
+        y = 0;
+    } else {
+        x = 42;
+        x;
+    };
+    assert!(y == 0, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.exp
new file mode 100644
index 000000000..17d8e8d42
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.exp
@@ -0,0 +1,11 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.move:5:13
+  │
+4 │     let y = if (true) 0 else move x; y;
+  │                              ------
+  │                              │
+  │                              The value of 'x' might have been previously moved here.
+  │                              Suggestion: use 'copy x' to avoid the move.
+5 │     assert!(x == 0, 42);
+  │             ^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.move
new file mode 100644
index 000000000..8fc23e2f6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/else_moves_if_doesnt.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+    let x = 0;
+    let y = if (true) 0 else move x; y;
+    assert!(x == 0, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.exp
new file mode 100644
index 000000000..4621d192e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.move:11:13
+   │
+ 3 │     let x;
+   │         - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+   ·
+11 │     assert!(x == 42, 42);
+   │             ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.move
new file mode 100644
index 000000000..532e51acc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_else_doesnt.move
@@ -0,0 +1,15 @@
+script {
+fun main() {
+    let x;
+    let y;
+    if (true) {
+        x = 42;
+    } else {
+        y = 0;
+        y;
+    };
+    assert!(x == 42, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.exp
new file mode 100644
index 000000000..54d4190ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.exp
@@ -0,0 +1,9 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.move:5:13
+  │
+3 │     let x;
+  │         - The variable 'x' might not have a value. The variable must be assigned a value before being used.
+4 │     if (true) x = 42;
+5 │     assert!(x == 42, 42);
+  │             ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.move
new file mode 100644
index 000000000..ba8c29c6e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_assigns_no_else.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+    let x;
+    if (true) x = 42;
+    assert!(x == 42, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.exp
new file mode 100644
index 000000000..15ef18290
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.exp
@@ -0,0 +1,12 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.move:6:13
+  │
+4 │     let y = if (true) move x else 0;
+  │                       ------
+  │                       │
+  │                       The value of 'x' might have been previously moved here.
+  │                       Suggestion: use 'copy x' to avoid the move.
+5 │     y;
+6 │     assert!(x == 0, 42);
+  │             ^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.move
new file mode 100644
index 000000000..867d9fc67
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_else_doesnt.move
@@ -0,0 +1,10 @@
+script {
+fun main() {
+    let x = 0;
+    let y = if (true) move x else 0;
+    y;
+    assert!(x == 0, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.exp
new file mode 100644
index 000000000..639f39fb8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.exp
@@ -0,0 +1,12 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.move:8:13
+  │
+5 │         let y = move x;
+  │                 ------
+  │                 │
+  │                 The value of 'x' might have been previously moved here.
+  │                 Suggestion: use 'copy x' to avoid the move.
+  ·
+8 │     assert!(x == 0, 42);
+  │             ^ Invalid usage of previously moved variable 'x'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.move
new file mode 100644
index 000000000..21b2a26eb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/if_moves_no_else.move
@@ -0,0 +1,12 @@
+script {
+fun main() {
+    let x = 0;
+    if (true) {
+        let y = move x;
+        y;
+    };
+    assert!(x == 0, 42);
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.exp
new file mode 100644
index 000000000..e6d2d1a98
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.exp
@@ -0,0 +1,8 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.move:5:3
+  │
+5 │   x = 7
+  │   ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.move
new file mode 100644
index 000000000..2caf0afac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough2.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+  let x: u64;
+  return ();
+  x = 7
+}
+}
+
+// check: INVALID_FALL_THROUGH
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.exp
new file mode 100644
index 000000000..c5978886a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.exp
@@ -0,0 +1,8 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.move:5:3
+  │
+5 │   x = 7;
+  │   ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.move
new file mode 100644
index 000000000..6728e45ff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/invalid_fallthrough3.move
@@ -0,0 +1,9 @@
+script {
+fun main() {
+  let x: u64;
+  if (true) return () else return ();
+  x = 7;
+}
+}
+
+// check: INVALID_FALL_THROUGH
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.exp
new file mode 100644
index 000000000..96c940fc1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.exp
@@ -0,0 +1,12 @@
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/translated_ir_tests/move/commands/join_failure.move:13:21
+   │
+ 8 │             R{ f } = move r;
+   │                      ------
+   │                      │
+   │                      The value of 'r' might have been previously moved here.
+   │                      Suggestion: use 'copy r' to avoid the move.
+   ·
+13 │         R{ f: _ } = move r;
+   │                     ^^^^^^ Invalid usage of previously moved variable 'r'.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.move
new file mode 100644
index 000000000..67c2e2528
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/join_failure.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R { f:bool }
+    fun t0() {
+        let r = R{ f: false };
+        let f;
+
+        if (true) {
+            R{ f } = move r;
+        } else {
+            R{ f } = move r;
+            r = R{ f: false };
+        };
+        R{ f: _ } = move r;
+        f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.exp
new file mode 100644
index 000000000..cb5dd1018
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.exp
@@ -0,0 +1,28 @@
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move:11:13
+   │
+11 │         let r_ref = &mut r;
+   │             ^^^^^ Unused assignment for variable 'r_ref'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_r_ref')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+   ┌─ tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move:12:13
+   │
+12 │         let s = S { f: 0 };
+   │             ^ Unused assignment for variable 's'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_s')
+   │
+   = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move:14:19
+   │
+14 │         (_, _, _, s.f) = four();
+   │                   ^^^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move:15:19
+   │
+15 │         (_, _, _, *r_ref) = four();
+   │                   ^^^^^^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move
new file mode 100644
index 000000000..2858e5b6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/mixed_lvalue.move
@@ -0,0 +1,17 @@
+module 0x8675309::A {
+
+    struct S has drop { f: u64 }
+
+    fun four(): (u64, u64, u64, u64) {
+        (0, 1, 2, 3)
+    }
+
+    public fun mixed() {
+        let r = 0;
+        let r_ref = &mut r;
+        let s = S { f: 0 };
+
+        (_, _, _, s.f) = four();
+        (_, _, _, *r_ref) = four();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.exp
new file mode 100644
index 000000000..1bd19843b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.exp
@@ -0,0 +1,16 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/translated_ir_tests/move/commands/move_before_assign.move:4:9
+  │
+4 │     let y = move x;
+  │         ^ Unused assignment for variable 'y'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_y')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/move_before_assign.move:4:13
+  │
+3 │     let x: u64;
+  │         - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+4 │     let y = move x;
+  │             ^^^^^^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.move
new file mode 100644
index 000000000..5af97478c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/move_before_assign.move
@@ -0,0 +1,8 @@
+script {
+fun main() {
+    let x: u64;
+    let y = move x;
+}
+}
+
+// check: MOVELOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.exp
new file mode 100644
index 000000000..605733406
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.exp
@@ -0,0 +1,18 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move:4:9
+  │
+4 │         y = 5;
+  │         ^ Invalid assignment. Unbound variable 'y'
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move:6:9
+  │
+6 │         y = 0;
+  │         ^ Invalid assignment. Unbound variable 'y'
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move:8:13
+  │
+8 │     assert!(y == 5, 42);
+  │             ^ Invalid variable usage. Unbound variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move
new file mode 100644
index 000000000..697c7a2d0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/no_let_outside_if.move
@@ -0,0 +1,10 @@
+script {
+fun main() {
+    if (true) {
+        y = 5;
+    } else {
+        y = 0;
+    };
+    assert!(y == 5, 42);
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.exp
new file mode 100644
index 000000000..beaf31c77
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.exp
@@ -0,0 +1,12 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/translated_ir_tests/move/commands/pop_negative.move:7:9
+  │
+2 │     fun three(): (u64, u64, u64) {
+  │                  --------------- Given expression list of length 3: '(u64, u64, u64)'
+  ·
+7 │         (_, _, _, _) = three();
+  │         ^^^^^^^^^^^^
+  │         │
+  │         Invalid value for assignment
+  │         Expected expression list of length 4: '(_, _, _, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.move
new file mode 100644
index 000000000..f5f14b8af
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_negative.move
@@ -0,0 +1,11 @@
+module 0x8675309::A {
+    fun three(): (u64, u64, u64) {
+        (0, 1, 2)
+    }
+
+    fun pop() {
+        (_, _, _, _) = three();
+    }
+}
+
+// check: NEGATIVE_STACK_SIZE_WITHIN_BLOCK
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.exp
new file mode 100644
index 000000000..83b4a3abe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.exp
@@ -0,0 +1,12 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/translated_ir_tests/move/commands/pop_positive.move:7:9
+  │
+2 │     fun three(): (u64, u64, u64) {
+  │                  --------------- Given expression list of length 3: '(u64, u64, u64)'
+  ·
+7 │         (_, _) = three();
+  │         ^^^^^^
+  │         │
+  │         Invalid value for assignment
+  │         Expected expression list of length 2: '(_, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.move
new file mode 100644
index 000000000..6afcd641e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_positive.move
@@ -0,0 +1,11 @@
+module 0x8675309::A {
+    fun three(): (u64, u64, u64) {
+        (0, 1, 2)
+    }
+
+    fun pop() {
+        (_, _) = three();
+    }
+}
+
+// check: POSITIVE_STACK_SIZE_AT_BLOCK_END
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.exp
new file mode 100644
index 000000000..125d31cdf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.exp
@@ -0,0 +1,17 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/translated_ir_tests/move/commands/pop_weird.move:13:9
+   │
+13 │         (_, _) = ();
+   │         ^^^^^^   -- Given: '()'
+   │         │         
+   │         Invalid value for assignment
+   │         Expected: '(_, _)'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/translated_ir_tests/move/commands/pop_weird.move:14:9
+   │
+14 │         (_) = ();
+   │         ^^^   -- Expected a single type, but found expression list type: '()'
+   │         │      
+   │         Invalid type for local
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.move
new file mode 100644
index 000000000..97ce37edc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/pop_weird.move
@@ -0,0 +1,16 @@
+module 0x8675309::A {
+    fun three(): (u64, u64, u64) {
+        (0, 1, 2)
+    }
+
+    fun pop_correct() {
+        three();
+        (_, _, _) = three();
+    }
+
+    fun pop() {
+        three();
+        (_, _) = ();
+        (_) = ();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.exp
new file mode 100644
index 000000000..42f319547
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.exp
@@ -0,0 +1,22 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.move:7:9
+  │
+2 │     struct X {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let x = X {};
+  │             -   ---- The type '0x8675309::M::X' does not have the ability 'drop'
+  │             │    
+  │             The local variable 'x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+6 │         &x;
+7 │         false
+  │         ^^^^^ Invalid return
+
+error[E07004]: invalid return of locally borrowed state
+   ┌─ tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.move:13:9
+   │
+12 │         let r = &u;
+   │                 -- It is still being borrowed by this reference
+13 │         r
+   │         ^ Invalid return. Local variable 'u' is still being borrowed.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.move
new file mode 100644
index 000000000..87849a368
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/return_type_mismatch_and_unused_resource.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct X {}
+
+    fun t1(): bool {
+        let x = X {};
+        &x;
+        false
+    }
+
+    fun t2(): &u64 {
+        let u = 0;
+        let r = &u;
+        r
+    }
+}
+
+// check: RET_UNSAFE_TO_DESTROY_ERROR
+// check: RET_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.exp
new file mode 100644
index 000000000..ef8d0ef62
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.exp
@@ -0,0 +1,6 @@
+error[E03010]: unbound field
+   ┌─ tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.move:11:13
+   │
+11 │         let T { i, x, b: flag } = t;
+   │             ^^^^^^^^^^^^^^^^^^^ Unbound field 'b' in '0x8675309::Test::T'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.move
new file mode 100644
index 000000000..346e11015
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_extra_binding.move
@@ -0,0 +1,16 @@
+module 0x8675309::Test {
+    struct X { b: bool }
+    struct T { i: u64, x: X }
+
+    public fun new_t(): T {
+        let x = X { b: true };
+        T { i: 0, x }
+    }
+
+    public fun destroy_t(t: T): (u64, X, bool) {
+        let T { i, x, b: flag } = t;
+        (i, x, flag)
+    }
+
+}
+// check: NEGATIVE_STACK_SIZE_WITHIN_BLOCK
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.exp
new file mode 100644
index 000000000..b09e31b47
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.exp
@@ -0,0 +1,6 @@
+error[E04016]: too few arguments
+   ┌─ tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.move:11:13
+   │
+11 │         let T { i, x, b: flag } = t;
+   │             ^^^^^^^^^^^^^^^^^^^ Missing binding for field 'y' in '0x8675309::Test::T'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.move
new file mode 100644
index 000000000..2c01d43cb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_missing_binding.move
@@ -0,0 +1,15 @@
+module 0x8675309::Test {
+    struct X { b: bool }
+    struct T { i: u64, x: X, b: bool, y: u64 }
+
+    public fun new_t(): T {
+        let x = X { b: true };
+        T { i: 0, x: move x, b: false, y: 0 }
+    }
+
+    public fun destroy_t(t: T): (u64, X, bool) {
+        let T { i, x, b: flag } = t;
+        (i, x, flag)
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.exp
new file mode 100644
index 000000000..944751884
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.exp
@@ -0,0 +1,11 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.move:6:9
+  │
+5 │     public fun destroy_t(t: T) {
+  │                             - Expected: '0x8675309::Test::T'
+6 │         X { b: _ } = t;
+  │         ^^^^^^^^^^
+  │         │
+  │         Invalid deconstruction assignment
+  │         Given: '0x8675309::Test::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.move
new file mode 100644
index 000000000..c11d34e34
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/unpack_wrong_type.move
@@ -0,0 +1,9 @@
+module 0x8675309::Test {
+    struct X { b: bool }
+    struct T { b: bool }
+
+    public fun destroy_t(t: T) {
+        X { b: _ } = t;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.exp
new file mode 100644
index 000000000..b0433f089
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.exp
@@ -0,0 +1,16 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/translated_ir_tests/move/commands/use_before_assign.move:4:9
+  │
+4 │     let y = x;
+  │         ^ Unused assignment for variable 'y'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_y')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/use_before_assign.move:4:13
+  │
+3 │     let x: u64;
+  │         - The variable 'x' does not have a value. The variable must be assigned a value before being used.
+4 │     let y = x;
+  │             ^ Invalid usage of unassigned variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.move
new file mode 100644
index 000000000..0baa595e4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/use_before_assign.move
@@ -0,0 +1,8 @@
+script {
+fun main() {
+    let x: u64;
+    let y = x;
+}
+}
+
+// check: COPYLOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.exp
new file mode 100644
index 000000000..24917ff43
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.exp
@@ -0,0 +1,10 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/while_move_local.move:7:13
+  │
+7 │         y = move x;
+  │             ^^^^^^
+  │             │
+  │             Invalid usage of previously moved variable 'x'.
+  │             Suggestion: use 'copy x' to avoid the move.
+  │             In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.move
new file mode 100644
index 000000000..42a1042b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local.move
@@ -0,0 +1,15 @@
+script {
+fun main() {
+    let x = 0;
+    let y;
+    let b = true;
+    while (copy b) {
+        y = move x;
+        y;
+        b = false
+    }
+}
+}
+// TODO: fix verifier remove identical errors
+// check: MOVELOC_UNAVAILABLE_ERROR
+// check: MOVELOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.exp
new file mode 100644
index 000000000..ed555ec52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.exp
@@ -0,0 +1,20 @@
+error[E06002]: use of unassigned variable
+  ┌─ tests/move_check/translated_ir_tests/move/commands/while_move_local_2.move:8:17
+  │
+8 │             y = move x;
+  │                 ^^^^^^
+  │                 │
+  │                 Invalid usage of previously moved variable 'x'.
+  │                 Suggestion: use 'copy x' to avoid the move.
+  │                 In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
+error[E06002]: use of unassigned variable
+   ┌─ tests/move_check/translated_ir_tests/move/commands/while_move_local_2.move:10:17
+   │
+10 │             x = move y;
+   │                 ^^^^^^
+   │                 │
+   │                 Invalid usage of previously moved variable 'y'.
+   │                 Suggestion: use 'copy y' to avoid the move.
+   │                 In a loop, this typically means it was moved in the first iteration, and is not available by the second iteration.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.move
new file mode 100644
index 000000000..44aaf50d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/commands/while_move_local_2.move
@@ -0,0 +1,18 @@
+script {
+fun main() {
+    let x = 0;
+    let y = 0;
+    let b = true;
+    while (true) {
+        if (b) {
+            y = move x;
+        } else {
+            x = move y;
+        };
+        b = false;
+    }
+}
+}
+// TODO: fix verifier remove identical errors
+// check: MOVELOC_UNAVAILABLE_ERROR
+// check: MOVELOC_UNAVAILABLE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.exp
new file mode 100644
index 000000000..d8433e225
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.exp
@@ -0,0 +1,31 @@
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.move:10:9
+   │
+10 │         c<S<T2>, bool>()
+   │         ^^^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'c::T1' was instantiated with the type '0x8675309::M::S<T2>', which contains the type parameter 'c::T2'. A cycle of recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x8675309::M::c'
+   │         'b<_, c::T1>' calls 'c<0x8675309::M::S<c::T1>, _>'
+   ·
+14 │         c<u64, T1>();
+   │         ------------ 'c<c::T1, _>' calls 'c<_, c::T1>'
+15 │         d<T2>();
+   │         ------- 'c<_, c::T1>' calls 'd<c::T1>'
+   ·
+20 │         b<u64, T>()
+   │         ----------- 'd<c::T1>' calls 'b<_, c::T1>'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.move:31:9
+   │
+27 │         g<T>()
+   │         ------ 'f<f::T>' calls 'g<f::T>'
+   ·
+31 │         f<S<T>>()
+   │         ^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'g::T' was instantiated with the type '0x8675309::M::S<T>', which contains the type parameter 'f::T'. These mutually recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x8675309::M::f'
+   │         'g<f::T>' calls 'f<0x8675309::M::S<f::T>>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.move
new file mode 100644
index 000000000..d76282d95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/complex_1.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun a<T>() {
+        b<S<T>, u64>()
+    }
+
+    fun b<T1, T2>() {
+        f<T1>();
+        c<S<T2>, bool>()
+    }
+
+    fun c<T1, T2>() {
+        c<u64, T1>();
+        d<T2>();
+        e<T2>()
+    }
+
+    fun d<T>() {
+        b<u64, T>()
+    }
+
+    fun e<T>() {
+    }
+
+    fun f<T>() {
+        g<T>()
+    }
+
+    fun g<T>() {
+        f<S<T>>()
+    }
+}
+
+// There are two disjoint loops in the resulting graph:
+
+// loop 1: f#T --> g#T --S<T>--> f#T
+
+// loop 2: c#T1 --> c#T2 --> d#T --> b#T2 --S<T2>--> c#T1
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_just_type_params_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_just_type_params_ok.move
new file mode 100644
index 000000000..ac623e539
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_just_type_params_ok.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f<T>() {
+        g<T>()
+    }
+
+    fun g<T>() {
+        f<T>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_non_generic_type_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_non_generic_type_ok.move
new file mode 100644
index 000000000..733213fac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_non_generic_type_ok.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T>() {
+        g<S<T>>()
+    }
+
+    fun g<T>() {
+        f<u64>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.move
new file mode 100644
index 000000000..da3019d08
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    fun f<T1, T2, T3>() {
+        g<T2, T3, T1>()
+    }
+
+    fun g<T1, T2, T3>() {
+        h<T1, T2, T3>()
+    }
+
+    fun h<T1, T2, T3>() {
+        f<T1, T2, T3>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.move
new file mode 100644
index 000000000..f48b4688e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T1, T2, T3>() {
+        g<T2, T3, T1>()
+    }
+
+    fun g<T1, T2, T3>() {
+        h<T1, T2, S<T3>>()
+    }
+
+    fun h<T1, T2, T3>() {
+        // The bool breaks the chain.
+        f<T1, bool, T3>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp
new file mode 100644
index 000000000..97e6f3490
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp
@@ -0,0 +1,26 @@
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.move:9:9
+   │
+ 5 │         g<T2, T3, T1>()
+   │         ---------------
+   │         │
+   │         'f<_, _, h::T3>' calls 'g<_, h::T3, _>'
+   │         'f<h::T3, _, _>' calls 'g<_, _, h::T3>'
+   │         'f<_, h::T3, _>' calls 'g<h::T3, _, _>'
+   ·
+ 9 │         h<T1, T2, S<T3>>()
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         The type parameter 'f::T3' was instantiated with the type '0x8675309::M::S<T3>', which contains the type parameter 'h::T3'. A cycle of recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x8675309::M::h'
+   │         'g<_, _, h::T3>' calls 'h<_, _, 0x8675309::M::S<h::T3>>'
+   │         'g<h::T3, _, _>' calls 'h<h::T3, _, _>'
+   │         'g<_, h::T3, _>' calls 'h<_, h::T3, _>'
+   ·
+13 │         f<T1, T2, T3>()
+   │         ---------------
+   │         │
+   │         'h<_, _, h::T3>' calls 'f<_, _, h::T3>'
+   │         'h<h::T3, _, _>' calls 'f<h::T3, _, _>'
+   │         'h<_, h::T3, _>' calls 'f<_, h::T3, _>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.move
new file mode 100644
index 000000000..2ea66bde3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_three_args_type_con_shifting.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T1, T2, T3>() {
+        g<T2, T3, T1>()
+    }
+
+    fun g<T1, T2, T3>() {
+        h<T1, T2, S<T3>>()
+    }
+
+    fun h<T1, T2, T3>() {
+        f<T1, T2, T3>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.move
new file mode 100644
index 000000000..3d47874ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_non_generic_type_and_type_param_ok.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f<T1, T2>() {
+        g<u64, T1>()
+    }
+
+    fun g<T1, T2>() {
+        f<bool, T1>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.move
new file mode 100644
index 000000000..ebc53daa0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun f<T1, T2>() {
+        g<T2, T1>();
+    }
+
+    fun g<T1, T2>() {
+        f<T1, T2>();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp
new file mode 100644
index 000000000..7b99fc17e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp
@@ -0,0 +1,17 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.move:9:9
+  │
+5 │         g<T2, T1>()
+  │         -----------
+  │         │
+  │         'f<_, f::T2, _>' calls 'g<f::T2, _>'
+  │         'f<f::T2, _, _>' calls 'g<_, f::T2>'
+  ·
+9 │         f<T1, S<T2>, u64>()
+  │         ^^^^^^^^^^^^^^^^^^^
+  │         │     │
+  │         │     The type parameter 'g::T2' was instantiated with the type '0x8675309::M::S<T2>', which contains the type parameter 'f::T2'. A cycle of recursive calls causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::f'
+  │         'g<_, f::T2>' calls 'f<_, 0x8675309::M::S<f::T2>, _>'
+  │         'g<f::T2, _>' calls 'f<f::T2, _, _>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.move
new file mode 100644
index 000000000..e1c575eb5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_two_args_swapping_type_con.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T1, T2, T3>() {
+        g<T2, T1>()
+    }
+
+    fun g<T1, T2>() {
+        f<T1, S<T2>, u64>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.exp
new file mode 100644
index 000000000..64ee00f54
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.exp
@@ -0,0 +1,13 @@
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.move:8:9
+   │
+ 8 │         g<S<T>>()
+   │         ^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'f::T' was instantiated with the type '0x8675309::M::S<T>', which contains the type parameter 'g::T'. These mutually recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x8675309::M::g'
+   │         'f<g::T>' calls 'g<0x8675309::M::S<g::T>>'
+   ·
+12 │         f<T>()
+   │         ------ 'g<g::T>' calls 'f<g::T>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.move
new file mode 100644
index 000000000..f43140dba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/mutually_recursive_type_con.move
@@ -0,0 +1,14 @@
+// Not good: infinitely many types/instances.
+//           f<T>, g<S<T>>, f<S<T>>, g<S<S<T>>>, ...
+
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T>() {
+        g<S<T>>()
+    }
+
+    fun g<T>() {
+        f<T>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.exp
new file mode 100644
index 000000000..234d68f2f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.exp
@@ -0,0 +1,9 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.move:5:9
+  │
+5 │         foo<S<S<T>>>()
+  │         ^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type parameter 'foo::T' was instantiated with the type '0x8675309::M::S<0x8675309::M::S<T>>', which contains the type parameter 'foo::T'. This recursive call causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.move
new file mode 100644
index 000000000..8968a1075
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_1.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun foo<T>() {
+        foo<S<S<T>>>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.exp
new file mode 100644
index 000000000..a9bb0e2f5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.exp
@@ -0,0 +1,9 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.move:6:9
+  │
+6 │         foo<R<u64, S<S<T>>>>()
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type parameter 'foo::T' was instantiated with the type '0x8675309::M::R<u64, 0x8675309::M::S<0x8675309::M::S<T>>>', which contains the type parameter 'foo::T'. This recursive call causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.move
new file mode 100644
index 000000000..dd8df4cc2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/nested_types_2.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct S<T> { f: T }
+    struct R<T1, T2> { f1: T1, f2: T2 }
+
+    fun foo<T>() {
+        foo<R<u64, S<S<T>>>>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.exp
new file mode 100644
index 000000000..4d9f158e8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.exp
@@ -0,0 +1,9 @@
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.move:11:18
+   │
+11 │         unbox<T>(f<Box<T>>(n - 1, Box<T> { x }))
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │ │
+   │                  │ The type parameter 'f::T' was instantiated with the type '0x8675309::M::Box<T>', which contains the type parameter 'f::T'. This recursive call causes the instantiation to recurse infinitely
+   │                  Invalid call to '0x8675309::M::f'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.move
new file mode 100644
index 000000000..4082475b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_infinite_type_terminates.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct Box<T> { x: T }
+
+    fun unbox<T>(b: Box<T>): T {
+        let Box { x } = b;
+        x
+    }
+
+    fun f<T>(n: u64, x: T): T {
+        if (n == 0) return x;
+        unbox<T>(f<Box<T>>(n - 1, Box<T> { x }))
+    }
+}
+
+// Function f calls an instance of itself instantiated with a boxed type, but it does
+// terminate properly if we allow new types to be created on the fly.
+//
+// As reference, the equivalent Haskell code compiles & terminates:
+//
+//   data Boxed a = Box a
+//
+//   unbox (Box a) = a
+//
+//   f :: Integer -> a -> a
+//   f 0 x = x
+//   f n x = unbox (f (n-1) (Box x))
+//
+//    main = do
+//      let x = 42
+//      putStrLn (show (f 5 x))
+//
+// Without the annotation f :: Integer -> a -> a GHC complains about not being able to
+// construct the infinite type a ~ Boxed a.
+//
+// We are taking a conservative approach and forbids such construction in move.
+
+// check: LOOP_IN_INSTANTIATION_GRAPH
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_just_type_params_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_just_type_params_ok.move
new file mode 100644
index 000000000..c75712f3e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_just_type_params_ok.move
@@ -0,0 +1,7 @@
+// This is good as there is only one instance foo<T> for any T::
+
+module 0x8675309::M {
+    public fun f<T>(x: T) {
+        f<T>(x)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_non_generic_type_ok.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_non_generic_type_ok.move
new file mode 100644
index 000000000..7062921d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_non_generic_type_ok.move
@@ -0,0 +1,7 @@
+// Good: two instances foo<T> & foo<u64> (if T != u64) for any T::
+
+module 0x8675309::M {
+    fun f<T>() {
+        f<u64>()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.exp
new file mode 100644
index 000000000..a7ef509d9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.exp
@@ -0,0 +1,9 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.move:7:9
+  │
+7 │         f<S<T>>(S<T> { f: x })
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │         │ │
+  │         │ The type parameter 'f::T' was instantiated with the type '0x8675309::M::S<T>', which contains the type parameter 'f::T'. This recursive call causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::f'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.move
new file mode 100644
index 000000000..54cfdca61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_one_arg_type_con.move
@@ -0,0 +1,9 @@
+// Bad! Can have infinitely many instances: f<T>, f<S<T>>, f<S<S<T>>>, ...
+
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T>(x: T) {
+        f<S<T>>(S<T> { f: x })
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.exp
new file mode 100644
index 000000000..35baf378b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.exp
@@ -0,0 +1,11 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.move:8:9
+  │
+8 │         f<S<T2>, T1>(S<T2> { x }, a)
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │ │
+  │         │ The type parameter 'f::T1' was instantiated with the type '0x8675309::M::S<T2>', which contains the type parameter 'f::T2'. These mutually recursive calls causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::f'
+  │         'f<_, f::T1>' calls 'f<0x8675309::M::S<f::T1>, _>'
+  │         'f<f::T1, _>' calls 'f<_, f::T1>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.move
new file mode 100644
index 000000000..ba19453eb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/recursive_two_args_swapping_type_con.move
@@ -0,0 +1,12 @@
+// Similar to the case with one argument, but swaps the two type parameters.
+// f<T1, T2> => f<S<T2>, T1> => f<S<T1>, S<T2>> => f<S<S<T2>>, S<T1>> => ...
+
+module 0x8675309::M {
+    struct S<T> { x: T }
+
+    fun f<T1, T2>(a: T1, x: T2) {
+        f<S<T2>, T1>(S<T2> { x }, a)
+    }
+}
+
+// check: LOOP_IN_INSTANTIATION_GRAPH
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.exp
new file mode 100644
index 000000000..423865ee2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.exp
@@ -0,0 +1,18 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.move:8:9
+  │
+8 │         f<S<T>>()
+  │         ^^^^^^^^^
+  │         │ │
+  │         │ The type parameter 'f::T' was instantiated with the type '0x8675309::M::S<T>', which contains the type parameter 'f::T'. This recursive call causes the instantiation to recurse infinitely
+  │         Invalid call to '0x8675309::M::f'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.move:12:9
+   │
+12 │         g<S<T>>()
+   │         ^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'g::T' was instantiated with the type '0x8675309::M::S<T>', which contains the type parameter 'g::T'. This recursive call causes the instantiation to recurse infinitely
+   │         Invalid call to '0x8675309::M::g'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.move
new file mode 100644
index 000000000..0951b6544
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/generics/instantiation_loops/two_loops.move
@@ -0,0 +1,17 @@
+// Two loops in the resulting graph.
+// One error for each loop.
+
+module 0x8675309::M {
+    struct S<T> { f: T }
+
+    fun f<T>() {
+        f<S<T>>()
+    }
+
+    fun g<T>() {
+        g<S<T>>()
+    }
+}
+
+// check: LOOP_IN_INSTANTIATION_GRAPH
+// check: LOOP_IN_INSTANTIATION_GRAPH
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.exp
new file mode 100644
index 000000000..e9de1a9eb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.exp
@@ -0,0 +1,10 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.move:3:6
+  │
+3 │     !0;
+  │      ^
+  │      │
+  │      Invalid argument to '!'
+  │      Expected: 'bool'
+  │      Given: integer
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.move
new file mode 100644
index 000000000..4f3824d18
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/boolean_not_non_boolean.move
@@ -0,0 +1,6 @@
+script {
+fun main() {
+    !0;
+}
+}
+// check: BOOLEAN_OP_TYPE_MISMATCH_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp
new file mode 100644
index 000000000..6a2928ae9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp
@@ -0,0 +1,72 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:4:10
+  │
+4 │         (S { x: true } as u8);
+  │          ^^^^^^^^^^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:5:10
+  │
+5 │         (S { x: true } as u64);
+  │          ^^^^^^^^^^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:6:10
+  │
+6 │         (S { x: true } as u128);
+  │          ^^^^^^^^^^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:7:10
+  │
+7 │         (true as u8);
+  │          ^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:8:10
+  │
+8 │         (true as u64);
+  │          ^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:9:10
+  │
+9 │         (true as u128);
+  │          ^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:10:10
+   │
+10 │         (@0x0 as u64);
+   │          ^^^^
+   │          │
+   │          Invalid argument to 'as'
+   │          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:11:10
+   │
+11 │         (@0x0 as u128);
+   │          ^^^^
+   │          │
+   │          Invalid argument to 'as'
+   │          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move
new file mode 100644
index 000000000..0616d7af5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S { x: bool }
+    fun f() {
+        (S { x: true } as u8);
+        (S { x: true } as u64);
+        (S { x: true } as u128);
+        (true as u8);
+        (true as u64);
+        (true as u128);
+        (@0x0 as u64);
+        (@0x0 as u128);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/integer_binary_operators_types_mismatch.move_TODO b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/integer_binary_operators_types_mismatch.move_TODO
new file mode 100644
index 000000000..f6626315e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/operators/integer_binary_operators_types_mismatch.move_TODO
@@ -0,0 +1,1435 @@
+// !!!! generated file, do NOT edit manually !!!!
+
+// operator +
+fun main() {
+    _ = 0u8 + 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 + 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 + 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 + 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 + 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 + 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 + true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true + 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true + true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 + 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 + 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 + 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 + (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) + 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) + (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator -
+//! new-transaction
+fun main() {
+    _ = 0u8 - 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 - 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 - 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 - 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 - 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 - 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 - true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true - 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true - true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 - 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 - 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 - 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 - (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) - 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) - (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator *
+//! new-transaction
+fun main() {
+    _ = 0u8 * 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 * 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 * 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 * 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 * 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 * 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 * true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true * 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true * true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 * 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 * 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 * 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 * (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) * 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) * (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator /
+//! new-transaction
+fun main() {
+    _ = 0u8 / 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 / 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 / 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 / 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 / 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 / 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 / true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true / 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true / true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 / 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 / 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 / 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 / (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) / 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) / (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator &
+//! new-transaction
+fun main() {
+    _ = 0u8 & 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 & 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 & 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 & 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 & 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 & 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 & true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true & 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true & true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 & 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 & 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 & 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 & (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) & 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) & (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator |
+//! new-transaction
+fun main() {
+    _ = 0u8 | 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 | 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 | 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 | 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 | 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 | 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 | true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true | 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true | true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 | 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 | 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 | 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 | (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) | 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) | (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator ^
+//! new-transaction
+fun main() {
+    _ = 0u8 ^ 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 ^ 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 ^ 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 ^ 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 ^ 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 ^ 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 ^ true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true ^ 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true ^ true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 ^ 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 ^ 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 ^ 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 ^ (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) ^ 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) ^ (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator ==
+//! new-transaction
+fun main() {
+    _ = 0u8 == 0u64;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 == 0u128;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 == 0u8;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 == 0u128;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 == 0u8;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 == 0u64;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 == true;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true == 0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 == 0x0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 == 0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 == (R { x: true });
+        return;
+    }
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) == 0;
+        return;
+    }
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+
+// operator !=
+//! new-transaction
+fun main() {
+    _ = 0u8 != 0u64;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 != 0u128;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 != 0u8;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 != 0u128;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 != 0u8;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 != 0u64;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 != true;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true != 0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 != 0x0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 != 0;
+    return;
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 != (R { x: true });
+        return;
+    }
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) != 0;
+        return;
+    }
+}
+// check: EQUALITY_OP_TYPE_MISMATCH_ERROR
+
+
+// operator <
+//! new-transaction
+fun main() {
+    _ = 0u8 < 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 < 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 < 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 < 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 < 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 < 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 < true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true < 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 < 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 < 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+// operator >
+//! new-transaction
+fun main() {
+    _ = 0u8 > 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 > 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 > 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 > 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 > 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 > 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 > true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true > 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 > 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 > 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+// operator <=
+//! new-transaction
+fun main() {
+    _ = 0u8 <= 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 <= 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 <= 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 <= 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 <= 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 <= 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 <= true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true <= 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 <= 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 <= 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+// operator >=
+//! new-transaction
+fun main() {
+    _ = 0u8 >= 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u8 >= 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 >= 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u64 >= 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 >= 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0u128 >= 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 >= true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true >= 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 >= 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 >= 0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+// operator <<
+//! new-transaction
+fun main() {
+    _ = 0 << true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 << 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 << 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 << 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true << 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true << true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 << 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 << 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 << (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) << 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) << (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+
+// operator >>
+//! new-transaction
+fun main() {
+    _ = 0 >> true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 >> 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 >> 0u64;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0 >> 0u128;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true >> 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = true >> true;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 >> 0u8;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+fun main() {
+    _ = 0x0 >> 0x0;
+    return;
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun f() {
+        _ = 0 >> (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun g() {
+        _ = (R { x: true }) >> 0;
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
+//! new-transaction
+module M {
+    resource struct R { x: bool }
+    fun h() {
+        _ = (R { x: true }) >> (R { x: true });
+        return;
+    }
+}
+// check: INTEGER_OP_TYPE_MISMATCH_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.exp
new file mode 100644
index 000000000..75bc8b15b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.exp
@@ -0,0 +1,8 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/translated_ir_tests/move/signer/copy_loc.move:3:9
+  │
+2 │     fun t(s: signer): signer {
+  │              ------ The type 'signer' does not have the ability 'copy'
+3 │         copy s
+  │         ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.move
new file mode 100644
index 000000000..eef0d7573
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun t(s: signer): signer {
+        copy s
+    }
+}
+// check: COPYLOC_RESOURCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.exp
new file mode 100644
index 000000000..161166d92
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.exp
@@ -0,0 +1,11 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.move:5:9
+  │
+4 │         let x = S<signer> { s };
+  │                 ---------------
+  │                 │ │
+  │                 │ The type '0x8675309::M::S<signer>' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy'
+  │                 The type '0x8675309::M::S<signer>' does not have the ability 'copy'
+5 │         copy x
+  │         ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.move
new file mode 100644
index 000000000..7cd4ee8d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/copy_loc_transitive.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct S<T> has copy, drop { s: T }
+    fun t(s: signer): S<signer> {
+        let x = S<signer> { s };
+        copy x
+    }
+}
+
+// check: COPYLOC_RESOURCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/double_signer.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/double_signer.move
new file mode 100644
index 000000000..246602008
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/double_signer.move
@@ -0,0 +1,16 @@
+// script functions no longer have any built in checks outside of visibility rules
+
+script {
+    fun t0(_s: signer, _s2: signer) {
+    }
+}
+
+script {
+    fun t1(_s: signer, _s2: signer, _u: u64) {
+    }
+}
+
+script {
+    fun t2(_s: signer, _u: u64, _s2: signer) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/keyword.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/keyword.move
new file mode 100644
index 000000000..c1828d57f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/keyword.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun foo(signer: address) {
+        signer;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/misplaced_signer_arg.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/misplaced_signer_arg.move
new file mode 100644
index 000000000..f10801323
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/misplaced_signer_arg.move
@@ -0,0 +1,11 @@
+// script functions no longer have any built in checks outside of visibility rules
+
+script {
+    fun t0(_u: u64, _s: signer) {
+    }
+}
+
+script {
+    fun t1(_u: u64, _s: signer, _u2: u64) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/move_to_sender.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/move_to_sender.move
new file mode 100644
index 000000000..48e8a53f2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/move_to_sender.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    // TODO(tmn) update when abilities hit
+    // resource struct R { s: signer }
+    // fun t(s1: &signer, s: signer) {
+    //     move_to(s1, R { s })
+    // }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.exp
new file mode 100644
index 000000000..7b1aa51b7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.exp
@@ -0,0 +1,8 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/translated_ir_tests/move/signer/read_ref.move:3:9
+  │
+2 │     fun t(s: &signer): signer {
+  │               ------ The type 'signer' does not have the ability 'copy'
+3 │         *s
+  │         ^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.move
new file mode 100644
index 000000000..a36411230
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun t(s: &signer): signer {
+        *s
+    }
+}
+// check: READREF_RESOURCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.exp b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.exp
new file mode 100644
index 000000000..5f08417e7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.exp
@@ -0,0 +1,19 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.move:5:9
+  │
+4 │         let x = S<signer> { s };
+  │                 ---------------
+  │                 │ │
+  │                 │ The type '0x8675309::M::S<signer>' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy'
+  │                 The type '0x8675309::M::S<signer>' does not have the ability 'copy'
+5 │         *&x
+  │         ^^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.move:15:9
+   │
+14 │         let x = S<signer> { s };
+   │                   ------ The type 'signer' does not have the ability 'copy'
+15 │         x.s
+   │         ^^^ Invalid implicit copy of field 's' without the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.move
new file mode 100644
index 000000000..50e567e8b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/read_ref_transitive.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct S<T> has copy, drop { s: T }
+    fun t(s: signer): S<signer> {
+        let x = S<signer> { s };
+        *&x
+    }
+}
+// check: READREF_RESOURCE_ERROR
+
+//! new-transaction
+module 0x8675309::N {
+    struct S<T> has copy, drop { s: T }
+    fun t(s: signer): signer {
+        let x = S<signer> { s };
+        x.s
+    }
+}
+// check: READREF_RESOURCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc.move
new file mode 100644
index 000000000..234662e45
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    fun t(s1: signer, s2: signer): signer {
+        s1 = s2;
+        s1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc_partial.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc_partial.move
new file mode 100644
index 000000000..e7ac90ac0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/st_loc_partial.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    fun consume(s: signer) {
+        consume(move s)
+    }
+
+    fun t(cond: bool, s1: signer, s2: signer) {
+        if (cond) consume(s1);
+        s1 = s2;
+        consume(s1);
+    }
+}
+
+// check: STLOC_UNSAFE_TO_DESTROY_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/transitive.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/transitive.move
new file mode 100644
index 000000000..2fe351b16
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/transitive.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct S<T> has drop {
+        f: T,
+    }
+
+    fun t(s: signer) {
+        let _ = S<signer> { f: s };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/triple_signer.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/triple_signer.move
new file mode 100644
index 000000000..6acb1df05
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/triple_signer.move
@@ -0,0 +1,26 @@
+// script functions no longer have any built in checks outside of visibility rules
+
+script {
+    fun t0(_s: signer, _s2: signer, _s3: signer) {
+    }
+}
+
+script {
+    fun t1(_s: signer, _s2: signer, _s3: signer, _u: u64) {
+    }
+}
+
+script {
+    fun t1(_s: signer, _s2: signer, _u: u64, _s3: signer) {
+    }
+}
+
+script {
+    fun t2(_u: u64, _s2: signer) {
+    }
+}
+
+script {
+    fun t2(_s: signer, _u: u64, _s2: signer) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused.move
new file mode 100644
index 000000000..4081de578
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused.move
@@ -0,0 +1,4 @@
+module 0x8675309::M {
+    fun t(_s: signer) {
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused_partial.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused_partial.move
new file mode 100644
index 000000000..a1faf3252
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/unused_partial.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun consume(s: signer) {
+        consume(move s)
+    }
+
+    fun t(cond: bool, s: signer) {
+        if (cond) consume(s)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/write_ref.move b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/write_ref.move
new file mode 100644
index 000000000..4851c60a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/translated_ir_tests/move/signer/write_ref.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun t(sref: &mut signer, s: signer) {
+        *sref = s;
+    }
+}
+
+// check: WRITEREF_RESOURCE_ERROR
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp
new file mode 100644
index 000000000..28ae29e45
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp
@@ -0,0 +1,26 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/ability_constraint_generic_in_field.move:3:22
+  │
+2 │     struct S<T: copy> { v: T }
+  │                 ---- 'copy' constraint declared here
+3 │     struct B<T> { v: S<T> }
+  │              -       ^^^^
+  │              │       │ │
+  │              │       │ The type 'T' does not have the ability 'copy'
+  │              │       'copy' constraint not satisifed
+  │              To satisfy the constraint, the 'copy' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_generic_in_field.move:10:22
+   │
+ 7 │     struct A<T: copy> has copy { a: T }
+   │                 ---- 'copy' constraint declared here
+ 8 │ 
+ 9 │     struct B<T> has copy {
+   │              - To satisfy the constraint, the 'copy' ability would need to be added here
+10 │         data: vector<A<T>>
+   │                      ^^^^
+   │                      │ │
+   │                      │ The type 'T' does not have the ability 'copy'
+   │                      'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move
new file mode 100644
index 000000000..4c5ec887a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move
@@ -0,0 +1,12 @@
+module 0x42::m {
+    struct S<T: copy> { v: T }
+    struct B<T> { v: S<T> }
+}
+
+module 0x42::n {
+    struct A<T: copy> has copy { a: T }
+
+    struct B<T> has copy {
+        data: vector<A<T>>
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp
new file mode 100644
index 000000000..152e2bda5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp
@@ -0,0 +1,479 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:20:9
+   │
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+20 │         c<signer>();
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type 'signer' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:21:9
+   │
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+21 │         c<vector<signer>>();
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │ │      │
+   │         │ │      The type 'vector<signer>' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy'
+   │         │ The type 'vector<signer>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:22:9
+   │
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+22 │         c<vector<NoC>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │ │      │
+   │         │ │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │         │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:23:9
+   │
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+23 │         k<u64>();
+   │         ^^^^^^^^
+   │         │ │
+   │         │ The type 'u64' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:24:9
+   │
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+24 │         k<signer>();
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type 'signer' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:25:9
+   │
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+25 │         k<vector<NoC>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type 'vector<0x42::M::NoC>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:26:9
+   │
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+26 │         k<vector<NoK>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type 'vector<0x42::M::NoK>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:27:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+27 │         cds<signer>();
+   │         ^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type 'signer' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:27:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+27 │         cds<signer>();
+   │         ^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type 'signer' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:28:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+28 │         cds<vector<NoC>>();
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │   │      │
+   │         │   │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │         │   The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+29 │         cds<vector<Cup<u8>>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │      │
+   │         │   │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'copy' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'copy'
+   │         │   The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                       ---- 'drop' constraint declared here
+   ·
+29 │         cds<vector<Cup<u8>>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │      │
+   │         │   │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'drop' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'drop'
+   │         │   The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+29 │         cds<vector<Cup<u8>>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │      │
+   │         │   │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'store' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'store'
+   │         │   The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:30:13
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+30 │         let Sc {} = Sc<signer> {};
+   │             ^^^^^      ------ The type 'signer' does not have the ability 'copy'
+   │             │           
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:30:21
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+30 │         let Sc {} = Sc<signer> {};
+   │                     ^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'signer' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:31:13
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+31 │         let Sc {} = Sc<vector<signer>> {};
+   │             ^^^^^      --------------
+   │             │          │      │
+   │             │          │      The type 'vector<signer>' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy'
+   │             │          The type 'vector<signer>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:31:21
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+31 │         let Sc {} = Sc<vector<signer>> {};
+   │                     ^^^^^^^^^^^^^^^^^^^^^
+   │                     │  │      │
+   │                     │  │      The type 'vector<signer>' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy'
+   │                     │  The type 'vector<signer>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:32:13
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+32 │         let Sc {} = Sc<vector<NoC>> {};
+   │             ^^^^^      -----------
+   │             │          │      │
+   │             │          │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │             │          The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:32:21
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+32 │         let Sc {} = Sc<vector<NoC>> {};
+   │                     ^^^^^^^^^^^^^^^^^^
+   │                     │  │      │
+   │                     │  │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │                     │  The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:33:13
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+33 │         let Sk {} = Sk<u64> {};
+   │             ^^^^^      --- The type 'u64' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:33:21
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+33 │         let Sk {} = Sk<u64> {};
+   │                     ^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'u64' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:34:13
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+34 │         let Sk {} = Sk<signer> {};
+   │             ^^^^^      ------ The type 'signer' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:34:21
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+34 │         let Sk {} = Sk<signer> {};
+   │                     ^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'signer' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:35:13
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+35 │         let Sk {} = Sk<vector<NoC>> {};
+   │             ^^^^^      ----------- The type 'vector<0x42::M::NoC>' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:35:21
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+35 │         let Sk {} = Sk<vector<NoC>> {};
+   │                     ^^^^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'vector<0x42::M::NoC>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:36:13
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+36 │         let Sk {} = Sk<vector<NoK>> {};
+   │             ^^^^^      ----------- The type 'vector<0x42::M::NoK>' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:36:21
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+36 │         let Sk {} = Sk<vector<NoK>> {};
+   │                     ^^^^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'vector<0x42::M::NoK>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+37 │         let Scds {} = Scds<signer> {};
+   │             ^^^^^^^        ------ The type 'signer' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+37 │         let Scds {} = Scds<signer> {};
+   │             ^^^^^^^        ------ The type 'signer' does not have the ability 'store'
+   │             │               
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+37 │         let Scds {} = Scds<signer> {};
+   │                       ^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type 'signer' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+37 │         let Scds {} = Scds<signer> {};
+   │                       ^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type 'signer' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:38:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<vector<NoC>> {};
+   │             ^^^^^^^        -----------
+   │             │              │      │
+   │             │              │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │             │              The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:38:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<vector<NoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^
+   │                       │    │      │
+   │                       │    │      The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │                       │    The type 'vector<0x42::M::NoC>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │             ^^^^^^^        ---------------
+   │             │              │      │
+   │             │              │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'copy' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'copy'
+   │             │              The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │             ^^^^^^^        ---------------
+   │             │              │      │
+   │             │              │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'drop' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'drop'
+   │             │              The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'drop'
+   │             'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │             ^^^^^^^        ---------------
+   │             │              │      │
+   │             │              │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'store' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'store'
+   │             │              The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'store'
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                       │    │      │
+   │                       │    │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'copy' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'copy'
+   │                       │    The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                       │    │      │
+   │                       │    │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'drop' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'drop'
+   │                       │    The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'drop'
+   │                       'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+39 │         let Scds {} = Scds<vector<Cup<u8>>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                       │    │      │
+   │                       │    │      The type 'vector<0x42::M::Cup<u8>>' can have the ability 'store' but the type argument '0x42::M::Cup<u8>' does not have the required ability 'store'
+   │                       │    The type 'vector<0x42::M::Cup<u8>>' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.move
new file mode 100644
index 000000000..f37a75c98
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.move
@@ -0,0 +1,44 @@
+address 0x42 {
+module M {
+    struct NoC has drop, store, key {}
+    struct NoK has copy, drop, store {}
+    struct Cup<T> { f: T }
+    struct Box<T> has copy, drop, store, key { f: T }
+    struct Pair<T1, T2> has copy, drop, store, key { f1: T1, f2: T2 }
+
+    fun c<T: copy>() {}
+    fun k<T: key>() {}
+    fun cds<T: copy + drop + store>() {}
+
+    struct Sc<phantom T: copy> {}
+    struct Sk<phantom T: key> {}
+    struct Scds<phantom T: copy + drop + store> {}
+
+    // tests that a variety of constraint instantiations are all invalid
+    fun t() {
+        // prims
+        c<signer>();
+        c<vector<signer>>();
+        c<vector<NoC>>();
+        k<u64>();
+        k<signer>();
+        k<vector<NoC>>();
+        k<vector<NoK>>();
+        cds<signer>();
+        cds<vector<NoC>>();
+        cds<vector<Cup<u8>>>();
+        let Sc {} = Sc<signer> {};
+        let Sc {} = Sc<vector<signer>> {};
+        let Sc {} = Sc<vector<NoC>> {};
+        let Sk {} = Sk<u64> {};
+        let Sk {} = Sk<signer> {};
+        let Sk {} = Sk<vector<NoC>> {};
+        let Sk {} = Sk<vector<NoK>> {};
+        let Scds {} = Scds<signer> {};
+        let Scds {} = Scds<vector<NoC>> {};
+        let Scds {} = Scds<vector<Cup<u8>>> {};
+    }
+
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp
new file mode 100644
index 000000000..7d71e664c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp
@@ -0,0 +1,601 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:19:9
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+19 │         c<NoC>();
+   │         ^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::NoC' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:20:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+20 │         c<Cup<u64>>();
+   │         ^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:21:9
+   │
+ 9 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+21 │         c<Box<NoC>>();
+   │         ^^^^^^^^^^^^^
+   │         │ │   │
+   │         │ │   The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │         │ The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:22:9
+   │
+ 4 │     struct NoK has copy, drop, store {}
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+22 │         k<NoK>();
+   │         ^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::NoK' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:23:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+23 │         k<Cup<u64>>();
+   │         ^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::Cup<u64>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:24:9
+   │
+10 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+24 │         k<Box<Cup<u64>>>();
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │ │   │
+   │         │ │   The type '0x42::M::Box<0x42::M::Cup<u64>>' can have the ability 'key' but the type argument '0x42::M::Cup<u64>' does not have the required ability 'store'
+   │         │ The type '0x42::M::Box<0x42::M::Cup<u64>>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:25:9
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+25 │         cds<NoC>();
+   │         ^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::NoC' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+26 │         cds<Cup<u64>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                       ---- 'drop' constraint declared here
+   ·
+26 │         cds<Cup<u64>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<u64>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+26 │         cds<Cup<u64>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<u64>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+27 │         cds<Cup<NoC>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                       ---- 'drop' constraint declared here
+   ·
+27 │         cds<Cup<NoC>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+11 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+27 │         cds<Cup<NoC>>();
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:28:9
+   │
+11 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+28 │         cds<Pair<u64, NoC>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │   │         │
+   │         │   │         The type '0x42::M::Pair<u64, 0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │         │   The type '0x42::M::Pair<u64, 0x42::M::NoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:29:13
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+29 │         let Sc {} = Sc<NoC> {};
+   │             ^^^^^      --- The type '0x42::M::NoC' does not have the ability 'copy'
+   │             │           
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:29:21
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+29 │         let Sc {} = Sc<NoC> {};
+   │                     ^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::NoC' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:30:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+30 │         let Sc {} = Sc<Cup<u64>> {};
+   │             ^^^^^      -------- The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │             │           
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:30:21
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+30 │         let Sc {} = Sc<Cup<u64>> {};
+   │                     ^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:31:13
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+31 │         let Sc {} = Sc<Box<NoC>> {};
+   │             ^^^^^      --------
+   │             │          │   │
+   │             │          │   The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │             │          The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:31:21
+   │
+13 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+31 │         let Sc {} = Sc<Box<NoC>> {};
+   │                     ^^^^^^^^^^^^^^^
+   │                     │  │   │
+   │                     │  │   The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │                     │  The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:32:13
+   │
+ 4 │     struct NoK has copy, drop, store {}
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+32 │         let Sk {} = Sk<NoK> {};
+   │             ^^^^^      --- The type '0x42::M::NoK' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:32:21
+   │
+ 4 │     struct NoK has copy, drop, store {}
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+32 │         let Sk {} = Sk<NoK> {};
+   │                     ^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::NoK' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:33:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+33 │         let Sk {} = Sk<Cup<u64>> {};
+   │             ^^^^^      -------- The type '0x42::M::Cup<u64>' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:33:21
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+33 │         let Sk {} = Sk<Cup<u64>> {};
+   │                     ^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::Cup<u64>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:34:13
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+34 │         let Sk {} = Sk<Box<Cup<u64>>> {};
+   │             ^^^^^      -------------
+   │             │          │   │
+   │             │          │   The type '0x42::M::Box<0x42::M::Cup<u64>>' can have the ability 'key' but the type argument '0x42::M::Cup<u64>' does not have the required ability 'store'
+   │             │          The type '0x42::M::Box<0x42::M::Cup<u64>>' does not have the ability 'key'
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:34:21
+   │
+14 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+34 │         let Sk {} = Sk<Box<Cup<u64>>> {};
+   │                     ^^^^^^^^^^^^^^^^^^^^
+   │                     │  │   │
+   │                     │  │   The type '0x42::M::Box<0x42::M::Cup<u64>>' can have the ability 'key' but the type argument '0x42::M::Cup<u64>' does not have the required ability 'store'
+   │                     │  The type '0x42::M::Box<0x42::M::Cup<u64>>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:35:13
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+35 │         let Scds {} = Scds<NoC> {};
+   │             ^^^^^^^        --- The type '0x42::M::NoC' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:35:23
+   │
+ 3 │     struct NoC has drop, store, key {}
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+35 │         let Scds {} = Scds<NoC> {};
+   │                       ^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::NoC' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<u64>' does not have the ability 'drop'
+   │             │               
+   │             'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<u64>' does not have the ability 'store'
+   │             │               
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<u64>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<u64>' does not have the ability 'drop'
+   │                       'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+36 │         let Scds {} = Scds<Cup<u64>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<u64>' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop'
+   │             │               
+   │             'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │             ^^^^^^^        -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store'
+   │             │               
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop'
+   │                       'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23
+   │
+ 5 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+37 │         let Scds {} = Scds<Cup<NoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:38:13
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Pair<u64, NoC>> {};
+   │             ^^^^^^^        --------------
+   │             │              │         │
+   │             │              │         The type '0x42::M::Pair<u64, 0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │             │              The type '0x42::M::Pair<u64, 0x42::M::NoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:38:23
+   │
+15 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Pair<u64, NoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^
+   │                       │    │         │
+   │                       │    │         The type '0x42::M::Pair<u64, 0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy'
+   │                       │    The type '0x42::M::Pair<u64, 0x42::M::NoC>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.move
new file mode 100644
index 000000000..f51edb380
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.move
@@ -0,0 +1,43 @@
+address 0x42 {
+module M {
+    struct NoC has drop, store, key {}
+    struct NoK has copy, drop, store {}
+    struct Cup<T> { f: T }
+    struct Box<T> has copy, drop, store, key { f: T }
+    struct Pair<T1, T2> has copy, drop, store, key { f1: T1, f2: T2 }
+
+    fun c<T: copy>() {}
+    fun k<T: key>() {}
+    fun cds<T: copy + drop + store>() {}
+
+    struct Sc<phantom T: copy> {}
+    struct Sk<phantom T: key> {}
+    struct Scds<phantom T: copy + drop + store> {}
+
+    // tests that a variety of constraint instantiations are all invalid
+    fun t() {
+        c<NoC>();
+        c<Cup<u64>>();
+        c<Box<NoC>>();
+        k<NoK>();
+        k<Cup<u64>>();
+        k<Box<Cup<u64>>>();
+        cds<NoC>();
+        cds<Cup<u64>>();
+        cds<Cup<NoC>>();
+        cds<Pair<u64, NoC>>();
+        let Sc {} = Sc<NoC> {};
+        let Sc {} = Sc<Cup<u64>> {};
+        let Sc {} = Sc<Box<NoC>> {};
+        let Sk {} = Sk<NoK> {};
+        let Sk {} = Sk<Cup<u64>> {};
+        let Sk {} = Sk<Box<Cup<u64>>> {};
+        let Scds {} = Scds<NoC> {};
+        let Scds {} = Scds<Cup<u64>> {};
+        let Scds {} = Scds<Cup<NoC>> {};
+        let Scds {} = Scds<Pair<u64, NoC>> {};
+    }
+
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp
new file mode 100644
index 000000000..3060f5e03
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp
@@ -0,0 +1,601 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:21:9
+   │
+ 7 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+21 │         c<TnoC>();
+   │         ^^^^^^^^^
+   │         │ │
+   │         │ The type 'TnoC' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:22:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 7 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+22 │         c<Cup<TnoK>>();
+   │         ^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:23:9
+   │
+ 7 │     fun c<T: copy>() {}
+   │              ---- 'copy' constraint declared here
+   ·
+23 │         c<Box<TnoC>>();
+   │         ^^^^^^^^^^^^^^
+   │         │ │   │
+   │         │ │   The type '0x42::M::Box<TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │         │ The type '0x42::M::Box<TnoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:24:9
+   │
+ 8 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+18 │         TnoK: copy + drop + store,
+   │         ---- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+24 │         k<TnoK>();
+   │         ^^^^^^^^^
+   │         │ │
+   │         │ The type 'TnoK' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:25:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+ 8 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+25 │         k<Cup<TnoC>>();
+   │         ^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::Cup<TnoC>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:26:9
+   │
+ 8 │     fun k<T: key>() {}
+   │              --- 'key' constraint declared here
+   ·
+26 │         k<Box<Cup<TnoC>>>();
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │ │   │
+   │         │ │   The type '0x42::M::Box<0x42::M::Cup<TnoC>>' can have the ability 'key' but the type argument '0x42::M::Cup<TnoC>' does not have the required ability 'store'
+   │         │ The type '0x42::M::Box<0x42::M::Cup<TnoC>>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:27:9
+   │
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+27 │         cds<TnoC>();
+   │         ^^^^^^^^^^^
+   │         │   │
+   │         │   The type 'TnoC' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+28 │         cds<Cup<TnoC>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                       ---- 'drop' constraint declared here
+   ·
+28 │         cds<Cup<TnoC>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoC>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+28 │         cds<Cup<TnoC>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoC>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+29 │         cds<Cup<TnoK>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                       ---- 'drop' constraint declared here
+   ·
+29 │         cds<Cup<TnoK>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoK>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                              ----- 'store' constraint declared here
+   ·
+29 │         cds<Cup<TnoK>>();
+   │         ^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Cup<TnoK>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:30:9
+   │
+ 9 │     fun cds<T: copy + drop + store>() {}
+   │                ---- 'copy' constraint declared here
+   ·
+30 │         cds<Pair<u64, TnoC>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │         │
+   │         │   │         The type '0x42::M::Pair<u64, TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │         │   The type '0x42::M::Pair<u64, TnoC>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:31:13
+   │
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+31 │         let Sc {} = Sc<TnoC> {};
+   │             ^^^^^      ---- The type 'TnoC' does not have the ability 'copy'
+   │             │           
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:31:21
+   │
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+31 │         let Sc {} = Sc<TnoC> {};
+   │                     ^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'TnoC' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:32:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+32 │         let Sc {} = Sc<Cup<TnoK>> {};
+   │             ^^^^^      --------- The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │             │           
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:32:21
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+32 │         let Sc {} = Sc<Cup<TnoK>> {};
+   │                     ^^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:33:13
+   │
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+33 │         let Sc {} = Sc<Box<TnoC>> {};
+   │             ^^^^^      ---------
+   │             │          │   │
+   │             │          │   The type '0x42::M::Box<TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │             │          The type '0x42::M::Box<TnoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:33:21
+   │
+11 │     struct Sc<phantom T: copy> {}
+   │                          ---- 'copy' constraint declared here
+   ·
+33 │         let Sc {} = Sc<Box<TnoC>> {};
+   │                     ^^^^^^^^^^^^^^^^
+   │                     │  │   │
+   │                     │  │   The type '0x42::M::Box<TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │                     │  The type '0x42::M::Box<TnoC>' does not have the ability 'copy'
+   │                     'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:34:13
+   │
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+18 │         TnoK: copy + drop + store,
+   │         ---- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+34 │         let Sk {} = Sk<TnoK> {};
+   │             ^^^^^      ---- The type 'TnoK' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:34:21
+   │
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+18 │         TnoK: copy + drop + store,
+   │         ---- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+34 │         let Sk {} = Sk<TnoK> {};
+   │                     ^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type 'TnoK' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:35:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+35 │         let Sk {} = Sk<Cup<TnoC>> {};
+   │             ^^^^^      --------- The type '0x42::M::Cup<TnoC>' does not have the ability 'key'
+   │             │           
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:35:21
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+35 │         let Sk {} = Sk<Cup<TnoC>> {};
+   │                     ^^^^^^^^^^^^^^^^
+   │                     │  │
+   │                     │  The type '0x42::M::Cup<TnoC>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:36:13
+   │
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+36 │         let Sk {} = Sk<Box<Cup<TnoC>>> {};
+   │             ^^^^^      --------------
+   │             │          │   │
+   │             │          │   The type '0x42::M::Box<0x42::M::Cup<TnoC>>' can have the ability 'key' but the type argument '0x42::M::Cup<TnoC>' does not have the required ability 'store'
+   │             │          The type '0x42::M::Box<0x42::M::Cup<TnoC>>' does not have the ability 'key'
+   │             'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:36:21
+   │
+12 │     struct Sk<phantom T: key> {}
+   │                          --- 'key' constraint declared here
+   ·
+36 │         let Sk {} = Sk<Box<Cup<TnoC>>> {};
+   │                     ^^^^^^^^^^^^^^^^^^^^^
+   │                     │  │   │
+   │                     │  │   The type '0x42::M::Box<0x42::M::Cup<TnoC>>' can have the ability 'key' but the type argument '0x42::M::Cup<TnoC>' does not have the required ability 'store'
+   │                     │  The type '0x42::M::Box<0x42::M::Cup<TnoC>>' does not have the ability 'key'
+   │                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:37:13
+   │
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+37 │         let Scds {} = Scds<TnoC> {};
+   │             ^^^^^^^        ---- The type 'TnoC' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:37:23
+   │
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+17 │         TnoC: drop + store + key,
+   │         ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+37 │         let Scds {} = Scds<TnoC> {};
+   │                       ^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type 'TnoC' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoC>' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoC>' does not have the ability 'drop'
+   │             │               
+   │             'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoC>' does not have the ability 'store'
+   │             │               
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoC>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoC>' does not have the ability 'drop'
+   │                       'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+38 │         let Scds {} = Scds<Cup<TnoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoC>' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │             │               
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoK>' does not have the ability 'drop'
+   │             │               
+   │             'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │             ^^^^^^^        --------- The type '0x42::M::Cup<TnoK>' does not have the ability 'store'
+   │             │               
+   │             'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoK>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                   ---- 'drop' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoK>' does not have the ability 'drop'
+   │                       'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23
+   │
+ 3 │     struct Cup<T> { f: T }
+   │            --- To satisfy the constraint, the 'store' ability would need to be added here
+   ·
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                                          ----- 'store' constraint declared here
+   ·
+39 │         let Scds {} = Scds<Cup<TnoK>> {};
+   │                       ^^^^^^^^^^^^^^^^^^
+   │                       │    │
+   │                       │    The type '0x42::M::Cup<TnoK>' does not have the ability 'store'
+   │                       'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:40:13
+   │
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+40 │         let Scds {} = Scds<Pair<u64, TnoC>> {};
+   │             ^^^^^^^        ---------------
+   │             │              │         │
+   │             │              │         The type '0x42::M::Pair<u64, TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │             │              The type '0x42::M::Pair<u64, TnoC>' does not have the ability 'copy'
+   │             'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:40:23
+   │
+13 │     struct Scds<phantom T: copy + drop + store> {}
+   │                            ---- 'copy' constraint declared here
+   ·
+40 │         let Scds {} = Scds<Pair<u64, TnoC>> {};
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                       │    │         │
+   │                       │    │         The type '0x42::M::Pair<u64, TnoC>' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy'
+   │                       │    The type '0x42::M::Pair<u64, TnoC>' does not have the ability 'copy'
+   │                       'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.move
new file mode 100644
index 000000000..366e1cdda
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.move
@@ -0,0 +1,43 @@
+address 0x42 {
+module M {
+    struct Cup<T> { f: T }
+    struct Box<T> has copy, drop, store, key { f: T }
+    struct Pair<T1, T2> has copy, drop, store, key { f1: T1, f2: T2 }
+
+    fun c<T: copy>() {}
+    fun k<T: key>() {}
+    fun cds<T: copy + drop + store>() {}
+
+    struct Sc<phantom T: copy> {}
+    struct Sk<phantom T: key> {}
+    struct Scds<phantom T: copy + drop + store> {}
+
+    // tests that a variety of constraint instantiations are all invalid
+    fun t<
+        TnoC: drop + store + key,
+        TnoK: copy + drop + store,
+        T,
+    >() {
+        c<TnoC>();
+        c<Cup<TnoK>>();
+        c<Box<TnoC>>();
+        k<TnoK>();
+        k<Cup<TnoC>>();
+        k<Box<Cup<TnoC>>>();
+        cds<TnoC>();
+        cds<Cup<TnoC>>();
+        cds<Cup<TnoK>>();
+        cds<Pair<u64, TnoC>>();
+        let Sc {} = Sc<TnoC> {};
+        let Sc {} = Sc<Cup<TnoK>> {};
+        let Sc {} = Sc<Box<TnoC>> {};
+        let Sk {} = Sk<TnoK> {};
+        let Sk {} = Sk<Cup<TnoC>> {};
+        let Sk {} = Sk<Box<Cup<TnoC>>> {};
+        let Scds {} = Scds<TnoC> {};
+        let Scds {} = Scds<Cup<TnoC>> {};
+        let Scds {} = Scds<Cup<TnoK>> {};
+        let Scds {} = Scds<Pair<u64, TnoC>> {};
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraints.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraints.move
new file mode 100644
index 000000000..716d7134a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ability_constraints.move
@@ -0,0 +1,141 @@
+address 0x42 {
+module M {
+    struct S has copy, drop, store, key {}
+    struct R has key, store {}
+    struct Box<T> has copy, drop, store, key { f: T }
+    struct Pair<T1, T2> has copy, drop, store, key { f1: T1, f2: T2 }
+
+    fun c<T: copy>() {}
+    fun d<T: drop>() {}
+    fun s<T: store>() {}
+    fun k<T: key>() {}
+    fun sk<T: store + key>() {}
+    fun cds<T: copy + drop + store>() {}
+
+    struct Sc<phantom T: copy> {}
+    struct Sd<phantom T: drop> {}
+    struct Ss<phantom T: store> {}
+    struct Sk<phantom T: key> {}
+    struct Ssk<phantom T: store + key> {}
+    struct Scds<phantom T: copy + drop + store> {}
+
+    // tests that a variety of constraint instantiations are all valid
+    fun t1<
+        Tc: copy,
+        Td: drop,
+        Ts: store,
+        Tk: key,
+        Tcd: copy + drop,
+        Tcs: copy + store,
+        Tds: drop + store,
+        Tsk: store + key,
+        Tcds: copy + drop + store
+    >() {
+        // functions with prims
+        c<u64>();
+        d<signer>();
+        s<bool>();
+        cds<address>();
+        c<vector<u64>>();
+        d<vector<signer>>();
+        s<vector<bool>>();
+        cds<vector<address>>();
+        // structs with prims
+        let Sc {} = Sc<u64> {};
+        let Sd {} = Sd<signer> {};
+        let Ss {} = Ss<bool> {};
+        let Scds {} = Scds<address> {};
+        let Sc {} = Sc<vector<u64>> {};
+        let Sd {} = Sd<vector<signer>> {};
+        let Ss {} = Ss<vector<bool>> {};
+        let Scds {} = Scds<vector<address>> {};
+
+        // functions with tparams
+        c<Tc>();
+        c<Tcd>();
+        c<Tcs>();
+        c<Tcds>();
+        d<Td>();
+        d<Tcd>();
+        d<Tds>();
+        d<Tcds>();
+        s<Ts>();
+        s<Tcs>();
+        s<Tds>();
+        s<Tsk>();
+        s<Tcds>();
+        k<Tk>();
+        k<Tsk>();
+        sk<Tsk>();
+        cds<Tcds>();
+        // structs with tparams
+        let Sc {} = Sc<Tc> {};
+        let Sc {} = Sc<Tcd> {};
+        let Sc {} = Sc<Tcs> {};
+        let Sc {} = Sc<Tcds> {};
+        let Sd {} = Sd<Td> {};
+        let Sd {} = Sd<Tcd> {};
+        let Sd {} = Sd<Tds> {};
+        let Sd {} = Sd<Tcds> {};
+        let Ss {} = Ss<Ts> {};
+        let Ss {} = Ss<Tcs> {};
+        let Ss {} = Ss<Tds> {};
+        let Ss {} = Ss<Tsk> {};
+        let Ss {} = Ss<Tcds> {};
+        let Sk {} = Sk<Tk> {};
+        let Sk {} = Sk<Tsk> {};
+        let Ssk {} = Ssk<Tsk> {};
+        let Scds {} = Scds<Tcds> {};
+
+        // functions with structs
+        c<S>();
+        c<Box<S>>();
+        c<Pair<Box<S>, S>>();
+        d<S>();
+        d<Box<S>>();
+        d<Pair<Box<S>, S>>();
+        s<S>();
+        s<R>();
+        s<Box<S>>();
+        s<Box<R>>();
+        s<Pair<Box<S>, S>>();
+        s<Pair<R, Box<Pair<R, S>>>>();
+        k<R>();
+        k<Box<R>>();
+        k<Pair<R, Box<R>>>();
+        k<Pair<R, Box<Pair<R, S>>>>();
+        sk<R>();
+        sk<Box<R>>();
+        sk<Pair<R, Box<R>>>();
+        sk<Pair<R, Box<Pair<R, S>>>>();
+        cds<S>();
+        cds<Box<S>>();
+        cds<Pair<Box<S>, S>>();
+        // structs with structs
+        let Sc {} = Sc<S> {};
+        let Sc {} = Sc<Box<S>> {};
+        let Sc {} = Sc<Pair<Box<S>, S>> {};
+        let Sd {} = Sd<S> {};
+        let Sd {} = Sd<Box<S>> {};
+        let Sd {} = Sd<Pair<Box<S>, S>> {};
+        let Ss {} = Ss<S> {};
+        let Ss {} = Ss<R> {};
+        let Ss {} = Ss<Box<S>> {};
+        let Ss {} = Ss<Box<R>> {};
+        let Ss {} = Ss<Pair<Box<S>, S>> {};
+        let Ss {} = Ss<Pair<R, Box<Pair<R, S>>>> {};
+        let Sk {} = Sk<R> {};
+        let Sk {} = Sk<Box<R>> {};
+        let Sk {} = Sk<Pair<R, Box<R>>> {};
+        let Sk {} = Sk<Pair<R, Box<Pair<R, S>>>> {};
+        let Ssk {} = Ssk<R> {};
+        let Ssk {} = Ssk<Box<R>> {};
+        let Ssk {} = Ssk<Pair<R, Box<R>>> {};
+        let Ssk {} = Ssk<Pair<R, Box<Pair<R, S>>>> {};
+        let Scds {} = Scds<S> {};
+        let Scds {} = Scds<Box<S>> {};
+        let Scds {} = Scds<Pair<Box<S>, S>> {};
+
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.exp
new file mode 100644
index 000000000..a2d2d097d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/abort_any_type.move:5:13
+  │
+5 │         0 + (abort 0);
+  │             ^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/abort_any_type.move:9:13
+  │
+9 │         foo(abort 0);
+  │             ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.move
new file mode 100644
index 000000000..4b56d87c5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/abort_any_type.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct Coin {}
+
+    fun t0() {
+        0 + (abort 0);
+    }
+
+    fun t1() {
+        foo(abort 0);
+    }
+
+
+    fun foo(c: Coin) {
+        Coin {} = c;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/annotated_types.move b/vendors/move/crates/move-compiler/tests/move_check/typing/annotated_types.move
new file mode 100644
index 000000000..737ca140f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/annotated_types.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct S has drop {}
+    struct R {}
+
+    fun t() {
+        ((): ());
+        (0: u64);
+        (S{}: S);
+        R{} = (R{}: R);
+        (_, _, R{}) = ((0, S{}, R{}): (u64, S, R));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/anything_bindings.TODO b/vendors/move/crates/move-compiler/tests/move_check/typing/anything_bindings.TODO
new file mode 100644
index 000000000..ee92dfa91
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/anything_bindings.TODO
@@ -0,0 +1,10 @@
+module M {
+    struct S {}
+
+    foo() {
+        let () = return 0;
+        let (x, y) = abort 0;
+        let S { f } = loop { };
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.exp
new file mode 100644
index 000000000..db12664c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.exp
@@ -0,0 +1,64 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:6:10
+  │
+6 │         (x, x) = (0, 0);
+  │          ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:6:13
+  │
+6 │         (x, x) = (0, 0);
+  │          -  ^ Duplicate usage of local 'x' in a given assignment
+  │          │   
+  │          Previously assigned here
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:6:13
+  │
+6 │         (x, x) = (0, 0);
+  │             ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:8:10
+  │
+8 │         (f, R{f}, f) = (0, R { f: 0 }, 0);
+  │          ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:8:15
+  │
+8 │         (f, R{f}, f) = (0, R { f: 0 }, 0);
+  │          -    ^ Duplicate usage of local 'f' in a given assignment
+  │          │     
+  │          Previously assigned here
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:8:15
+  │
+8 │         (f, R{f}, f) = (0, R { f: 0 }, 0);
+  │               ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:8:19
+  │
+8 │         (f, R{f}, f) = (0, R { f: 0 }, 0);
+  │          -        ^ Duplicate usage of local 'f' in a given assignment
+  │          │         
+  │          Previously assigned here
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/assign_duplicate_assigning.move:8:19
+  │
+8 │         (f, R{f}, f) = (0, R { f: 0 }, 0);
+  │                   ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.move
new file mode 100644
index 000000000..51277dc0b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_duplicate_assigning.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let x;
+        (x, x) = (0, 0);
+        let f;
+        (f, R{f}, f) = (0, R { f: 0 }, 0);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.exp
new file mode 100644
index 000000000..d0adf9c28
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.exp
@@ -0,0 +1,14 @@
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/assign_nested.move:10:13
+   │
+10 │         let x: u64;
+   │             ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E01009]: invalid assignment
+   ┌─ tests/move_check/typing/assign_nested.move:14:19
+   │
+14 │         (_, x, _, s.f) = four();
+   │                   ^^^ Invalid assignment syntax. Expected: a local, a field write, or a deconstructing assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.move
new file mode 100644
index 000000000..ba5a9c652
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_nested.move
@@ -0,0 +1,17 @@
+module 0x8675309::A {
+
+    struct S has drop { f: u64 }
+
+    fun four(): (u64, u64, u64, u64) {
+        (0, 1, 2, 3)
+    }
+
+    public fun mixed() {
+        let x: u64;
+        let r = 0;
+        let _r_ref = &mut r;
+        let _s = S { f: 0 };
+        (_, x, _, s.f) = four();
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.exp
new file mode 100644
index 000000000..9df5cfa18
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.exp
@@ -0,0 +1,33 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/assign_pop_resource.move:5:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         _ = R{};
+  │         ^   --- The type '0x8675309::M::R' does not have the ability 'drop'
+  │         │    
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/assign_pop_resource.move:6:10
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+6 │         (_, _) = (R{}, R{});
+  │          ^        --- The type '0x8675309::M::R' does not have the ability 'drop'
+  │          │         
+  │          Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/assign_pop_resource.move:6:13
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+6 │         (_, _) = (R{}, R{});
+  │             ^          --- The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │           
+  │             Cannot ignore values without the 'drop' ability. The value must be used
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.move
new file mode 100644
index 000000000..84a4bb478
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_pop_resource.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        _ = R{};
+        (_, _) = (R{}, R{});
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.exp
new file mode 100644
index 000000000..42eaf280d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.exp
@@ -0,0 +1,30 @@
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/assign_unpack_references.move:20:14
+   │
+ 3 │     struct R { s1: S, s2: S }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+17 │         R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+   │                                  ------------------------------
+   │                                  │
+   │                                  The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                                  The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+20 │         f; s2;
+   │              ^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/assign_unpack_references.move:30:14
+   │
+ 3 │     struct R { s1: S, s2: S }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+27 │         R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+   │                                      ------------------------------
+   │                                      │
+   │                                      The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                                      The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+30 │         f; s2;
+   │              ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.move
new file mode 100644
index 000000000..34b25f05d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S has drop{ f: u64 }
+    struct R { s1: S, s2: S }
+
+    fun t0() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = 0;
+        s2 = S { f: 0 };
+        f; s2;
+    }
+
+    fun t1() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = &0;
+        s2 = &S { f: 0 };
+        f; s2;
+
+    }
+
+    fun t2() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = &mut 0;
+        s2 = &mut S { f: 0 };
+        f; s2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.exp
new file mode 100644
index 000000000..c95a57194
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.exp
@@ -0,0 +1,65 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:9:9
+  │
+8 │         R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+  │                     - Expected: '&u64'
+9 │         f = 0;
+  │         ^
+  │         │
+  │         Invalid assignment to variable 'f'
+  │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:10:9
+   │
+ 8 │         R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+   │                          -- Expected: '&0x8675309::M::S'
+ 9 │         f = 0;
+10 │         s2 = S { f: 0 }
+   │         ^^   ---------- Given: '0x8675309::M::S'
+   │         │     
+   │         Invalid assignment to variable 's2'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:17:9
+   │
+16 │         R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                     - Expected: '&mut u64'
+17 │         f = 0;
+   │         ^
+   │         │
+   │         Invalid assignment to variable 'f'
+   │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:18:9
+   │
+16 │         R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                          -- Expected: '&mut 0x8675309::M::S'
+17 │         f = 0;
+18 │         s2 = S { f: 0 }
+   │         ^^   ---------- Given: '0x8675309::M::S'
+   │         │     
+   │         Invalid assignment to variable 's2'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:26:9
+   │
+25 │         R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                     - Expected: '&mut u64'
+26 │         f = &0;
+   │         ^   -- Given: '&{integer}'
+   │         │    
+   │         Invalid assignment to variable 'f'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/assign_unpack_references_invalid.move:27:9
+   │
+25 │         R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                          -- Expected: '&mut 0x8675309::M::S'
+26 │         f = &0;
+27 │         s2 = &S { f: 0 }
+   │         ^^   ----------- Given: '&0x8675309::M::S'
+   │         │     
+   │         Invalid assignment to variable 's2'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.move
new file mode 100644
index 000000000..5bcc18afb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_unpack_references_invalid.move
@@ -0,0 +1,29 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    struct R { s1: S, s2: S }
+
+    fun t0() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+        f = 0;
+        s2 = S { f: 0 }
+    }
+
+    fun t1() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+        f = 0;
+        s2 = S { f: 0 }
+    }
+
+
+    fun t2() {
+        let f;
+        let s2;
+        R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+        f = &0;
+        s2 = &S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.exp
new file mode 100644
index 000000000..8537b4c40
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.exp
@@ -0,0 +1,61 @@
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/assign_wrong_arity.move:5:13
+  │
+5 │         let x;
+  │             ^ Invalid type for local
+6 │         x = ();
+  │             -- Expected a single type, but found expression list type: '()'
+
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/assign_wrong_arity.move:6:9
+  │
+6 │         x = ();
+  │         ^   -- Expected a single type, but found expression list type: '()'
+  │         │    
+  │         Invalid type for local
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/assign_wrong_arity.move:7:9
+  │
+6 │         x = ();
+  │             -- Expected: '()'
+7 │         x = (0, 1, 2);
+  │         ^   --------- Given: '({integer}, {integer}, {integer})'
+  │         │    
+  │         Invalid assignment to variable 'x'
+
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/assign_wrong_arity.move:7:9
+  │
+7 │         x = (0, 1, 2);
+  │         ^   --------- Expected a single type, but found expression list type: '(u64, u64, u64)'
+  │         │    
+  │         Invalid type for local
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/assign_wrong_arity.move:8:9
+  │
+8 │         () = 0;
+  │         ^^   - Given: integer
+  │         │     
+  │         Invalid value for assignment
+  │         Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_arity.move:11:9
+   │
+11 │         (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0});
+   │         ^^^^^^^^^^^^   ---------------------------- Given expression list of length 4: '({integer}, bool, 0x8675309::M::R, 0x8675309::M::R)'
+   │         │               
+   │         Invalid value for assignment
+   │         Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_arity.move:12:9
+   │
+12 │         (x, b, R{f}) = (0, false);
+   │         ^^^^^^^^^^^^   ---------- Given expression list of length 2: '({integer}, bool)'
+   │         │               
+   │         Invalid value for assignment
+   │         Expected expression list of length 3: '(_, _, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.move
new file mode 100644
index 000000000..6d8f40698
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_arity.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let x;
+        x = ();
+        x = (0, 1, 2);
+        () = 0;
+        let b;
+        let f;
+        (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0});
+        (x, b, R{f}) = (0, false);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.exp
new file mode 100644
index 000000000..e4bf98556
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.exp
@@ -0,0 +1,107 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/assign_wrong_type.move:8:9
+  │
+8 │         S { g } = R {f :0};
+  │         ^^^^^^^   -------- Expected: '0x8675309::M::R'
+  │         │          
+  │         Invalid deconstruction assignment
+  │         Given: '0x8675309::M::S'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/assign_wrong_type.move:9:10
+  │
+9 │         (S { g }, R { f }) = (R{ f: 0 }, R{ f: 1 });
+  │          ^^^^^^^              --------- Expected: '0x8675309::M::R'
+  │          │                     
+  │          Invalid deconstruction assignment
+  │          Given: '0x8675309::M::S'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/assign_wrong_type.move:13:13
+   │
+13 │         let x;
+   │             ^ Invalid type for local
+   ·
+16 │         x = ();
+   │             -- Expected a single type, but found expression list type: '()'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/assign_wrong_type.move:16:9
+   │
+16 │         x = ();
+   │         ^   -- Expected a single type, but found expression list type: '()'
+   │         │    
+   │         Invalid type for local
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:17:9
+   │
+17 │         () = 0;
+   │         ^^   - Given: integer
+   │         │     
+   │         Invalid value for assignment
+   │         Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:18:9
+   │
+18 │         (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0});
+   │         ^^^^^^^^^^^^   ---------------------------- Given expression list of length 4: '({integer}, bool, 0x8675309::M::R, 0x8675309::M::R)'
+   │         │               
+   │         Invalid value for assignment
+   │         Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:19:9
+   │
+19 │         (x, b, R{f}) = (0, false);
+   │         ^^^^^^^^^^^^   ---------- Given expression list of length 2: '({integer}, bool)'
+   │         │               
+   │         Invalid value for assignment
+   │         Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:27:10
+   │
+23 │         let x = false;
+   │                 ----- Expected: 'bool'
+   ·
+27 │         (x, b, R{f}, r) = (0, false, R{f: 0}, R{f: 0});
+   │          ^
+   │          │
+   │          Invalid assignment to variable 'x'
+   │          Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:27:13
+   │
+24 │         let b = 0;
+   │             - Expected: integer
+   ·
+27 │         (x, b, R{f}, r) = (0, false, R{f: 0}, R{f: 0});
+   │             ^                 ----- Given: 'bool'
+   │             │                  
+   │             Invalid assignment to variable 'b'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:27:18
+   │
+ 2 │     struct R {f: u64}
+   │                  --- Given: 'u64'
+   ·
+25 │         let f = @0x0;
+   │                 ---- Expected: 'address'
+26 │         let r = S{ g: 0 };
+27 │         (x, b, R{f}, r) = (0, false, R{f: 0}, R{f: 0});
+   │                  ^ Invalid assignment to variable 'f'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/assign_wrong_type.move:27:22
+   │
+26 │         let r = S{ g: 0 };
+   │                 --------- Expected: '0x8675309::M::S'
+27 │         (x, b, R{f}, r) = (0, false, R{f: 0}, R{f: 0});
+   │                      ^                        ------- Given: '0x8675309::M::R'
+   │                      │                         
+   │                      Invalid assignment to variable 'r'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.move
new file mode 100644
index 000000000..71f08ba5c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/assign_wrong_type.move
@@ -0,0 +1,29 @@
+module 0x8675309::M {
+    struct R {f: u64}
+    struct S has drop { g: u64 }
+
+    fun t0() {
+        let g;
+        let f;
+        S { g } = R {f :0};
+        (S { g }, R { f }) = (R{ f: 0 }, R{ f: 1 });
+    }
+
+    fun t1() {
+        let x;
+        let b;
+        let f;
+        x = ();
+        () = 0;
+        (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0});
+        (x, b, R{f}) = (0, false);
+    }
+
+    fun t2() {
+        let x = false;
+        let b = 0;
+        let f = @0x0;
+        let r = S{ g: 0 };
+        (x, b, R{f}, r) = (0, false, R{f: 0}, R{f: 0});
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp
new file mode 100644
index 000000000..3f5bf93e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp
@@ -0,0 +1,90 @@
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:6:15
+  │
+6 │     const S1: S = S { f: 0 };
+  │               ^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:6:15
+  │
+6 │     const S1: S = S { f: 0 };
+  │               ^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:6:19
+  │
+6 │     const S1: S = S { f: 0 };
+  │                   ^^^^^^^^^^ Structs are not supported in constants
+
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:7:15
+  │
+7 │     const S2: S<> = S { f: 0 };
+  │               ^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:7:15
+  │
+7 │     const S2: S<> = S { f: 0 };
+  │               ^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:7:21
+  │
+7 │     const S2: S<> = S { f: 0 };
+  │                     ^^^^^^^^^^ Structs are not supported in constants
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:8:15
+  │
+8 │     const S3: S<u64, bool> = S { f: 0 };
+  │               ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:8:15
+  │
+8 │     const S3: S<u64, bool> = S { f: 0 };
+  │               ^^^^^^^^^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:8:30
+  │
+8 │     const S3: S<u64, bool> = S { f: 0 };
+  │                              ^^^^^^^^^^ Structs are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:9:15
+  │
+9 │     const S4: S<S<u64, bool>> = S { f: S { f: 0 } };
+  │               ^^^^^^^^^^^^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:9:17
+  │
+9 │     const S4: S<S<u64, bool>> = S { f: S { f: 0 } };
+  │                 ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:9:33
+  │
+9 │     const S4: S<S<u64, bool>> = S { f: S { f: 0 } };
+  │                                 ^^^^^^^^^^^^^^^^^^^ Structs are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:9:40
+  │
+9 │     const S4: S<S<u64, bool>> = S { f: S { f: 0 } };
+  │                                        ^^^^^^^^^^ Structs are not supported in constants
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.move
new file mode 100644
index 000000000..8819939c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.move
@@ -0,0 +1,20 @@
+address 0x42 {
+module M {
+
+    struct S<T> has copy, drop { f: T }
+
+    const S1: S = S { f: 0 };
+    const S2: S<> = S { f: 0 };
+    const S3: S<u64, bool> = S { f: 0 };
+    const S4: S<S<u64, bool>> = S { f: S { f: 0 } };
+
+    fun t() {
+        S1.f;
+        S2.f;
+        S3.f;
+        *&S4.f;
+        S4.f.f;
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.exp
new file mode 100644
index 000000000..1e99fa4e2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.exp
@@ -0,0 +1,27 @@
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_fun.move:11:17
+   │
+11 │         let x = foo<>(0); x;
+   │                 ^^^^^^^^ Invalid instantiation of '0x42::M::foo'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_fun.move:12:17
+   │
+12 │         let b = foo<bool, u64>(false);
+   │                 ^^^^^^^^^^^^^^^^^^^^^ Invalid instantiation of '0x42::M::foo'. Expected 1 type argument(s) but got 2
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_fun.move:14:17
+   │
+14 │         let r = foo<&mut u64, bool>(&mut 0);
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid instantiation of '0x42::M::foo'. Expected 1 type argument(s) but got 2
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/bad_type_argument_arity_fun.move:14:17
+   │
+14 │         let r = foo<&mut u64, bool>(&mut 0);
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                 │   │
+   │                 │   Expected a single non-reference type, but found: '&mut u64'
+   │                 Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.move
new file mode 100644
index 000000000..bd4f85529
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_fun.move
@@ -0,0 +1,20 @@
+address 0x42 {
+module M {
+
+    struct S<T> { f: T }
+
+    fun foo<T>(x: T): T {
+        x
+    }
+
+    fun bar() {
+        let x = foo<>(0); x;
+        let b = foo<bool, u64>(false);
+        b && false;
+        let r = foo<&mut u64, bool>(&mut 0);
+        *r = 1;
+
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.exp
new file mode 100644
index 000000000..17c688af9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.exp
@@ -0,0 +1,72 @@
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:7:13
+  │
+7 │         s1: S,
+  │             ^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:8:13
+  │
+8 │         s2: S<>,
+  │             ^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:9:13
+  │
+9 │         s3: S<bool, u64>,
+  │             ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:13:13
+   │
+13 │         s1: S,
+   │             ^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:14:13
+   │
+14 │         s2: S<>,
+   │             ^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:15:13
+   │
+15 │         s3: S<u64, bool>,
+   │             ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:16:15
+   │
+16 │         s4: S<S<u64, bool>>
+   │               ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:17:9
+   │
+17 │     ): (S, S<>, S<u64, address>, S<S<u64, u8>>) {
+   │         ^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:17:12
+   │
+17 │     ): (S, S<>, S<u64, address>, S<S<u64, u8>>) {
+   │            ^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:17:17
+   │
+17 │     ): (S, S<>, S<u64, address>, S<S<u64, u8>>) {
+   │                 ^^^^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E03007]: too many type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:17:36
+   │
+17 │     ): (S, S<>, S<u64, address>, S<S<u64, u8>>) {
+   │                                    ^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
+error[E03008]: too few type arguments
+   ┌─ tests/move_check/typing/bad_type_argument_arity_struct.move:27:21
+   │
+27 │     fun s<T>(f: T): S {
+   │                     ^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.move
new file mode 100644
index 000000000..882e3b425
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct.move
@@ -0,0 +1,37 @@
+address 0x42 {
+module M {
+
+    struct S<T> has copy, drop { f: T }
+
+    struct B {
+        s1: S,
+        s2: S<>,
+        s3: S<bool, u64>,
+    }
+
+    fun foo(
+        s1: S,
+        s2: S<>,
+        s3: S<u64, bool>,
+        s4: S<S<u64, bool>>
+    ): (S, S<>, S<u64, address>, S<S<u64, u8>>) {
+        s1.f;
+        s2.f;
+        s3.f;
+        *&s4.f;
+        s4.f.f;
+
+        (s1, s2, s3, s4)
+    }
+
+    fun s<T>(f: T): S {
+        S { f }
+    }
+
+    fun bar(): u64 {
+        let s = s(0);
+        s.f
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.exp
new file mode 100644
index 000000000..cbc2d0ffc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.exp
@@ -0,0 +1,12 @@
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct_pack.move:7:9
+  │
+7 │         S<> { f: 0 };
+  │         ^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct_pack.move:8:9
+  │
+8 │         S<u64, u64> { f: 0 };
+  │         ^^^^^^^^^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.move
new file mode 100644
index 000000000..f497efeed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_pack.move
@@ -0,0 +1,12 @@
+address 0x42 {
+module M {
+
+    struct S<T> has drop { f: T }
+
+    fun ex() {
+        S<> { f: 0 };
+        S<u64, u64> { f: 0 };
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.exp
new file mode 100644
index 000000000..3cdf7b8bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.exp
@@ -0,0 +1,12 @@
+error[E03008]: too few type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct_unpack.move:7:13
+  │
+7 │         let S<> { f } = copy s;
+  │             ^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 0
+
+error[E03007]: too many type arguments
+  ┌─ tests/move_check/typing/bad_type_argument_arity_struct_unpack.move:9:13
+  │
+9 │         let S<u64, u64> { f } = copy s;
+  │             ^^^^^^^^^^^^^^^^^ Invalid instantiation of '0x42::M::S'. Expected 1 type argument(s) but got 2
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.move
new file mode 100644
index 000000000..e4e852457
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bad_type_argument_arity_struct_unpack.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module M {
+
+    struct S<T> has drop, copy { f: T }
+
+    fun ex(s: S<u64>) {
+        let S<> { f } = copy s;
+        f;
+        let S<u64, u64> { f } = copy s;
+        f;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add.move
new file mode 100644
index 000000000..5ea3430b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 + 0;
+        1 + 0;
+        0 + 1;
+        0 + (1: u8);
+        (0: u8) + 1;
+        0 + (1: u128);
+        (0: u128) + 1;
+        (0) + (1);
+        copy x + move x;
+        r.f + r.f;
+        1 + r.f + r.f + 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.exp
new file mode 100644
index 000000000..8eabd8dfe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_add_invalid.move:8:9
+  │
+8 │         false + true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '+'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_add_invalid.move:8:17
+  │
+8 │         false + true;
+  │         -----   ^^^^ Invalid argument to '+'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_add_invalid.move:9:11
+  │
+9 │         1 + false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '+'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:10:9
+   │
+10 │         false + 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:10:15
+   │
+10 │         false + 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '+'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:10:17
+   │
+10 │         false + 1;
+   │         -----   ^ Invalid argument to '+'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:11:9
+   │
+11 │         @0x0 + @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:11:16
+   │
+11 │         @0x0 + @0x1;
+   │         ----   ^^^^ Invalid argument to '+'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:12:17
+   │
+12 │         (0: u8) + (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '+'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r + r;
+   │         ^ Invalid argument to '+'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_add_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r + r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r + r;
+   │             ^ Invalid argument to '+'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s + s;
+   │         ^ Invalid argument to '+'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s + s;
+   │             ^ Invalid argument to '+'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:15:9
+   │
+15 │         1 + false + @0x0 + 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '+'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:15:11
+   │
+15 │         1 + false + @0x0 + 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '+'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:15:26
+   │
+15 │         1 + false + @0x0 + 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '+'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:15:28
+   │
+15 │         1 + false + @0x0 + 0;
+   │                     ----   ^ Invalid argument to '+'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:16:9
+   │
+16 │         () + ();
+   │         ^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:16:14
+   │
+16 │         () + ();
+   │         --   ^^ Invalid argument to '+'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:17:11
+   │
+17 │         1 + ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '+'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:18:9
+   │
+18 │         (0, 1) + (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_add_invalid.move:18:16
+   │
+18 │         (0, 1) + (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '+'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:18:18
+   │
+18 │         (0, 1) + (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '+'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:19:9
+   │
+19 │         (1, 2) + (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_add_invalid.move:19:18
+   │
+19 │         (1, 2) + (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '+'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.move
new file mode 100644
index 000000000..44f166833
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_add_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false + true;
+        1 + false;
+        false + 1;
+        @0x0 + @0x1;
+        (0: u8) + (1: u128);
+        r + r;
+        s + s;
+        1 + false + @0x0 + 0;
+        () + ();
+        1 + ();
+        (0, 1) + (0, 1, 2);
+        (1, 2) + (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and.move
new file mode 100644
index 000000000..940ec29c8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {
+        f: bool
+    }
+
+    fun t0(x: bool, r: R) {
+        true && false;
+        false && true;
+        true && false;
+        (true) && (true);
+        copy x && move x;
+        r.f && r.f;
+        true && false && (true && false);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.exp
new file mode 100644
index 000000000..602a00fa3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.exp
@@ -0,0 +1,187 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_and_invalid.move:8:9
+  │
+8 │         0 && 1;
+  │         ^ -- Expected: 'bool'
+  │         │  
+  │         Invalid argument to '&&'
+  │         Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_and_invalid.move:8:14
+  │
+8 │         0 && 1;
+  │           -- ^
+  │           │  │
+  │           │  Invalid argument to '&&'
+  │           │  Given: integer
+  │           Expected: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_and_invalid.move:9:9
+  │
+9 │         1 && false;
+  │         ^ -- Expected: 'bool'
+  │         │  
+  │         Invalid argument to '&&'
+  │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:10:18
+   │
+10 │         false && 1;
+   │               -- ^
+   │               │  │
+   │               │  Invalid argument to '&&'
+   │               │  Given: integer
+   │               Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:11:9
+   │
+11 │         @0x0 && @0x1;
+   │         ^^^^ -- Expected: 'bool'
+   │         │     
+   │         Invalid argument to '&&'
+   │         Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:11:17
+   │
+11 │         @0x0 && @0x1;
+   │              -- ^^^^
+   │              │  │
+   │              │  Invalid argument to '&&'
+   │              │  Given: 'address'
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:12:9
+   │
+12 │         (0: u8) && (1: u128);
+   │         ^^^^^^^ -- Expected: 'bool'
+   │         │   │    
+   │         │   Given: 'u8'
+   │         Invalid argument to '&&'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:12:20
+   │
+12 │         (0: u8) && (1: u128);
+   │                 -- ^^^^^^^^^
+   │                 │  │   │
+   │                 │  │   Given: 'u128'
+   │                 │  Invalid argument to '&&'
+   │                 Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r && r;
+   │         ^ -- Expected: 'bool'
+   │         │  
+   │         Invalid argument to '&&'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r && r;
+   │           -- ^ Invalid argument to '&&'
+   │           │   
+   │           Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s && s;
+   │         ^ -- Expected: 'bool'
+   │         │  
+   │         Invalid argument to '&&'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s && s;
+   │           -- ^ Invalid argument to '&&'
+   │           │   
+   │           Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:15:9
+   │
+15 │         () && ();
+   │         ^^ -- Expected: 'bool'
+   │         │   
+   │         Invalid argument to '&&'
+   │         Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:15:15
+   │
+15 │         () && ();
+   │            -- ^^
+   │            │  │
+   │            │  Invalid argument to '&&'
+   │            │  Given: '()'
+   │            Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:16:17
+   │
+16 │         true && ();
+   │              -- ^^
+   │              │  │
+   │              │  Invalid argument to '&&'
+   │              │  Given: '()'
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:17:9
+   │
+17 │         (true, false) && (true, false, true);
+   │         ^^^^^^^^^^^^^ -- Expected: 'bool'
+   │         │              
+   │         Invalid argument to '&&'
+   │         Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:17:26
+   │
+17 │         (true, false) && (true, false, true);
+   │                       -- ^^^^^^^^^^^^^^^^^^^
+   │                       │  │
+   │                       │  Invalid argument to '&&'
+   │                       │  Given: '(bool, bool, bool)'
+   │                       Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:18:9
+   │
+18 │         (true, true) && (false, false);
+   │         ^^^^^^^^^^^^ -- Expected: 'bool'
+   │         │             
+   │         Invalid argument to '&&'
+   │         Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_and_invalid.move:18:25
+   │
+18 │         (true, true) && (false, false);
+   │                      -- ^^^^^^^^^^^^^^
+   │                      │  │
+   │                      │  Invalid argument to '&&'
+   │                      │  Given: '(bool, bool)'
+   │                      Expected: 'bool'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.move
new file mode 100644
index 000000000..1e37a5f2d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_and_invalid.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        0 && 1;
+        1 && false;
+        false && 1;
+        @0x0 && @0x1;
+        (0: u8) && (1: u128);
+        r && r;
+        s && s;
+        () && ();
+        true && ();
+        (true, false) && (true, false, true);
+        (true, true) && (false, false);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and.move
new file mode 100644
index 000000000..c88e0ed2a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 & 0;
+        1 & 0;
+        0 & 1;
+        0 & (1: u8);
+        (0: u8) & 1;
+        0 & (1: u128);
+        (0: u128) & 1;
+        (0) & (1);
+        copy x & move x;
+        r.f & r.f;
+        1 & r.f & r.f & 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp
new file mode 100644
index 000000000..3db8b345e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_and_invalid.move:8:9
+  │
+8 │         false & true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '&'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_and_invalid.move:8:17
+  │
+8 │         false & true;
+  │         -----   ^^^^ Invalid argument to '&'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_bit_and_invalid.move:9:11
+  │
+9 │         1 & false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '&'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:10:9
+   │
+10 │         false & 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '&'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:10:15
+   │
+10 │         false & 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '&'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:10:17
+   │
+10 │         false & 1;
+   │         -----   ^ Invalid argument to '&'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:11:9
+   │
+11 │         @0x0 & @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '&'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:11:16
+   │
+11 │         @0x0 & @0x1;
+   │         ----   ^^^^ Invalid argument to '&'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:12:17
+   │
+12 │         (0: u8) & (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '&'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r & r;
+   │         ^ Invalid argument to '&'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r & r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r & r;
+   │             ^ Invalid argument to '&'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s & s;
+   │         ^ Invalid argument to '&'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s & s;
+   │             ^ Invalid argument to '&'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:9
+   │
+15 │         1 & false & @0x0 & 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '&'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:11
+   │
+15 │         1 & false & @0x0 & 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '&'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:26
+   │
+15 │         1 & false & @0x0 & 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '&'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:28
+   │
+15 │         1 & false & @0x0 & 0;
+   │                     ----   ^ Invalid argument to '&'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:16:9
+   │
+16 │         () & ();
+   │         ^^
+   │         │
+   │         Invalid argument to '&'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:16:14
+   │
+16 │         () & ();
+   │         --   ^^ Invalid argument to '&'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:17:11
+   │
+17 │         1 & ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '&'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:18:9
+   │
+18 │         (0, 1) & (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '&'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:18:16
+   │
+18 │         (0, 1) & (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '&'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:18:18
+   │
+18 │         (0, 1) & (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '&'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:19:9
+   │
+19 │         (1, 2) & (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '&'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:19:18
+   │
+19 │         (1, 2) & (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '&'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.move
new file mode 100644
index 000000000..e7989977c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_and_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false & true;
+        1 & false;
+        false & 1;
+        @0x0 & @0x1;
+        (0: u8) & (1: u128);
+        r & r;
+        s & s;
+        1 & false & @0x0 & 0;
+        () & ();
+        1 & ();
+        (0, 1) & (0, 1, 2);
+        (1, 2) & (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or.move
new file mode 100644
index 000000000..2d8e1e806
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 | 0;
+        1 | 0;
+        0 | 1;
+        0 | (1: u8);
+        (0: u8) | 1;
+        0 | (1: u128);
+        (0: u128) | 1;
+        (0) | (1);
+        copy x | move x;
+        r.f | r.f;
+        1 | r.f | r.f | 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp
new file mode 100644
index 000000000..3a6f83314
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_or_invalid.move:8:9
+  │
+8 │         false | true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '|'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_or_invalid.move:8:17
+  │
+8 │         false | true;
+  │         -----   ^^^^ Invalid argument to '|'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_bit_or_invalid.move:9:11
+  │
+9 │         1 | false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '|'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:10:9
+   │
+10 │         false | 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '|'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:10:15
+   │
+10 │         false | 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '|'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:10:17
+   │
+10 │         false | 1;
+   │         -----   ^ Invalid argument to '|'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:11:9
+   │
+11 │         @0x0 | @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '|'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:11:16
+   │
+11 │         @0x0 | @0x1;
+   │         ----   ^^^^ Invalid argument to '|'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:12:17
+   │
+12 │         (0: u8) | (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '|'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r | r;
+   │         ^ Invalid argument to '|'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r | r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r | r;
+   │             ^ Invalid argument to '|'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s | s;
+   │         ^ Invalid argument to '|'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s | s;
+   │             ^ Invalid argument to '|'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:9
+   │
+15 │         1 | false | @0x0 | 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '|'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:11
+   │
+15 │         1 | false | @0x0 | 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '|'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:26
+   │
+15 │         1 | false | @0x0 | 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '|'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:28
+   │
+15 │         1 | false | @0x0 | 0;
+   │                     ----   ^ Invalid argument to '|'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:16:9
+   │
+16 │         () | ();
+   │         ^^
+   │         │
+   │         Invalid argument to '|'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:16:14
+   │
+16 │         () | ();
+   │         --   ^^ Invalid argument to '|'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:17:11
+   │
+17 │         1 | ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '|'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:18:9
+   │
+18 │         (0, 1) | (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '|'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:18:16
+   │
+18 │         (0, 1) | (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '|'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:18:18
+   │
+18 │         (0, 1) | (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '|'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:19:9
+   │
+19 │         (1, 2) | (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '|'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:19:18
+   │
+19 │         (1, 2) | (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '|'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.move
new file mode 100644
index 000000000..87b98dd64
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_or_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false | true;
+        1 | false;
+        false | 1;
+        @0x0 | @0x1;
+        (0: u8) | (1: u128);
+        r | r;
+        s | s;
+        1 | false | @0x0 | 0;
+        () | ();
+        1 | ();
+        (0, 1) | (0, 1, 2);
+        (1, 2) | (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp
new file mode 100644
index 000000000..4b2cc7991
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:8:9
+  │
+8 │         false ^ true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '^'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:8:17
+  │
+8 │         false ^ true;
+  │         -----   ^^^^ Invalid argument to '^'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:9:11
+  │
+9 │         1 ^ false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '^'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:10:9
+   │
+10 │         false ^ 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '^'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:10:15
+   │
+10 │         false ^ 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '^'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:10:17
+   │
+10 │         false ^ 1;
+   │         -----   ^ Invalid argument to '^'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:11:9
+   │
+11 │         @0x0 ^ @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '^'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:11:16
+   │
+11 │         @0x0 ^ @0x1;
+   │         ----   ^^^^ Invalid argument to '^'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:12:17
+   │
+12 │         (0: u8) ^ (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '^'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r ^ r;
+   │         ^ Invalid argument to '^'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r ^ r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r ^ r;
+   │             ^ Invalid argument to '^'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s ^ s;
+   │         ^ Invalid argument to '^'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s ^ s;
+   │             ^ Invalid argument to '^'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:9
+   │
+15 │         1 ^ false ^ @0x0 ^ 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '^'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:11
+   │
+15 │         1 ^ false ^ @0x0 ^ 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '^'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:26
+   │
+15 │         1 ^ false ^ @0x0 ^ 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '^'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:28
+   │
+15 │         1 ^ false ^ @0x0 ^ 0;
+   │                     ----   ^ Invalid argument to '^'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:16:9
+   │
+16 │         () ^ ();
+   │         ^^
+   │         │
+   │         Invalid argument to '^'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:16:14
+   │
+16 │         () ^ ();
+   │         --   ^^ Invalid argument to '^'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:17:11
+   │
+17 │         1 ^ ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '^'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:18:9
+   │
+18 │         (0, 1) ^ (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '^'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:18:16
+   │
+18 │         (0, 1) ^ (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '^'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:18:18
+   │
+18 │         (0, 1) ^ (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '^'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:19:9
+   │
+19 │         (1, 2) ^ (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '^'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:19:18
+   │
+19 │         (1, 2) ^ (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '^'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.move
new file mode 100644
index 000000000..64a4138ef
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false ^ true;
+        1 ^ false;
+        false ^ 1;
+        @0x0 ^ @0x1;
+        (0: u8) ^ (1: u128);
+        r ^ r;
+        s ^ s;
+        1 ^ false ^ @0x0 ^ 0;
+        () ^ ();
+        1 ^ ();
+        (0, 1) ^ (0, 1, 2);
+        (1, 2) ^ (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div.move
new file mode 100644
index 000000000..77bac5414
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 / 0;
+        1 / 0;
+        0 / 1;
+        0 / (1: u8);
+        (0: u8) / 1;
+        0 / (1: u128);
+        (0: u128) / 1;
+        (0) / (1);
+        copy x / move x;
+        r.f / r.f;
+        1 / r.f / r.f / 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.exp
new file mode 100644
index 000000000..ac4bf6d55
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_div_invalid.move:8:9
+  │
+8 │         false / true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '/'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_div_invalid.move:8:17
+  │
+8 │         false / true;
+  │         -----   ^^^^ Invalid argument to '/'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_div_invalid.move:9:11
+  │
+9 │         1 / false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '/'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:10:9
+   │
+10 │         false / 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '/'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:10:15
+   │
+10 │         false / 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '/'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:10:17
+   │
+10 │         false / 1;
+   │         -----   ^ Invalid argument to '/'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:11:9
+   │
+11 │         @0x0 / @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '/'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:11:16
+   │
+11 │         @0x0 / @0x1;
+   │         ----   ^^^^ Invalid argument to '/'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:12:17
+   │
+12 │         (0: u8) / (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '/'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r / r;
+   │         ^ Invalid argument to '/'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_div_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r / r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r / r;
+   │             ^ Invalid argument to '/'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s / s;
+   │         ^ Invalid argument to '/'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s / s;
+   │             ^ Invalid argument to '/'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:15:9
+   │
+15 │         1 / false / @0x0 / 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '/'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:15:11
+   │
+15 │         1 / false / @0x0 / 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '/'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:15:26
+   │
+15 │         1 / false / @0x0 / 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '/'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:15:28
+   │
+15 │         1 / false / @0x0 / 0;
+   │                     ----   ^ Invalid argument to '/'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:16:9
+   │
+16 │         () / ();
+   │         ^^
+   │         │
+   │         Invalid argument to '/'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:16:14
+   │
+16 │         () / ();
+   │         --   ^^ Invalid argument to '/'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:17:11
+   │
+17 │         1 / ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '/'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:18:9
+   │
+18 │         (0, 1) / (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '/'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_div_invalid.move:18:16
+   │
+18 │         (0, 1) / (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '/'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:18:18
+   │
+18 │         (0, 1) / (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '/'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:19:9
+   │
+19 │         (1, 2) / (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '/'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_div_invalid.move:19:18
+   │
+19 │         (1, 2) / (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '/'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.move
new file mode 100644
index 000000000..69570ddb5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_div_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false / true;
+        1 / false;
+        false / 1;
+        @0x0 / @0x1;
+        (0: u8) / (1: u128);
+        r / r;
+        s / s;
+        1 / false / @0x0 / 0;
+        () / ();
+        1 / ();
+        (0, 1) / (0, 1, 2);
+        (1, 2) / (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq.move
new file mode 100644
index 000000000..87cef8ef2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 >= 0;
+        1 >= 0;
+        0 >= 1;
+        0 >= (1: u8);
+        (0: u8) >= 1;
+        0 >= (1: u128);
+        (0: u128) >= 1;
+        (0) >= (1);
+        copy x >= move x;
+        r.f >= r.f;
+        (1 >= r.f) && (r.f >= 0);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.exp
new file mode 100644
index 000000000..add104405
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.exp
@@ -0,0 +1,244 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_geq_invalid.move:8:9
+  │
+8 │         false >= true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '>='
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_geq_invalid.move:8:18
+  │
+8 │         false >= true;
+  │         -----    ^^^^ Invalid argument to '>='
+  │         │         
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_geq_invalid.move:9:11
+  │
+9 │         1 >= false;
+  │         - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │   
+  │         │ Incompatible arguments to '>='
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:10:9
+   │
+10 │         false >= 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:10:15
+   │
+10 │         false >= 1;
+   │         ----- ^^ - Found: integer. It is not compatible with the other type.
+   │         │     │   
+   │         │     Incompatible arguments to '>='
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:10:18
+   │
+10 │         false >= 1;
+   │         -----    ^ Invalid argument to '>='
+   │         │         
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:11:9
+   │
+11 │         @0x0 >= @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:11:17
+   │
+11 │         @0x0 >= @0x1;
+   │         ----    ^^^^ Invalid argument to '>='
+   │         │        
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:12:17
+   │
+12 │         (0: u8) >= (1: u128);
+   │             --  ^^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │       
+   │             │   Incompatible arguments to '>='
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r >= r;
+   │         ^ Invalid argument to '>='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r >= r;
+   │              ^ Invalid argument to '>='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s >= s;
+   │         ^ Invalid argument to '>='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s >= s;
+   │              ^ Invalid argument to '>='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:15:9
+   │
+15 │         0 >= 1 >= 2;
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:15:16
+   │
+15 │         0 >= 1 >= 2;
+   │         ------ ^^ - Found: integer. It is not compatible with the other type.
+   │         │      │   
+   │         │      Incompatible arguments to '>='
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:15:19
+   │
+15 │         0 >= 1 >= 2;
+   │         ------    ^ Invalid argument to '>='
+   │         │          
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:16:12
+   │
+16 │         (1 >= false) && (@0x0 >= 0);
+   │          - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+   │          │ │   
+   │          │ Incompatible arguments to '>='
+   │          Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:16:26
+   │
+16 │         (1 >= false) && (@0x0 >= 0);
+   │                          ^^^^
+   │                          │
+   │                          Invalid argument to '>='
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:16:31
+   │
+16 │         (1 >= false) && (@0x0 >= 0);
+   │                          ---- ^^ - Found: integer. It is not compatible with the other type.
+   │                          │    │   
+   │                          │    Incompatible arguments to '>='
+   │                          Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:16:34
+   │
+16 │         (1 >= false) && (@0x0 >= 0);
+   │                          ----    ^ Invalid argument to '>='
+   │                          │        
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:17:9
+   │
+17 │         () >= ();
+   │         ^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:17:15
+   │
+17 │         () >= ();
+   │         --    ^^ Invalid argument to '>='
+   │         │      
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:18:11
+   │
+18 │         1 >= ();
+   │         - ^^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '>='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:19:9
+   │
+19 │         (0, 1) >= (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:19:16
+   │
+19 │         (0, 1) >= (0, 1, 2);
+   │         ------ ^^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │   
+   │         │      Incompatible arguments to '>='
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:19:19
+   │
+19 │         (0, 1) >= (0, 1, 2);
+   │         ------    ^^^^^^^^^ Invalid argument to '>='
+   │         │          
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:20:9
+   │
+20 │         (1, 2) >= (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>='
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_geq_invalid.move:20:19
+   │
+20 │         (1, 2) >= (0, 1);
+   │         ------    ^^^^^^ Invalid argument to '>='
+   │         │          
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.move
new file mode 100644
index 000000000..7500e9f35
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_geq_invalid.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false >= true;
+        1 >= false;
+        false >= 1;
+        @0x0 >= @0x1;
+        (0: u8) >= (1: u128);
+        r >= r;
+        s >= s;
+        0 >= 1 >= 2;
+        (1 >= false) && (@0x0 >= 0);
+        () >= ();
+        1 >= ();
+        (0, 1) >= (0, 1, 2);
+        (1, 2) >= (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt.move
new file mode 100644
index 000000000..d08117af9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 > 0;
+        1 > 0;
+        0 > 1;
+        0 > (1: u8);
+        (0: u8) > 1;
+        0 > (1: u128);
+        (0: u128) > 1;
+        (0) > (1);
+        copy x > move x;
+        r.f > r.f;
+        (1 > r.f) && (r.f > 0);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.exp
new file mode 100644
index 000000000..cb623d10b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.exp
@@ -0,0 +1,244 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_gt_invalid.move:8:9
+  │
+8 │         false > true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '>'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_gt_invalid.move:8:17
+  │
+8 │         false > true;
+  │         -----   ^^^^ Invalid argument to '>'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_gt_invalid.move:9:11
+  │
+9 │         1 > false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '>'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:10:9
+   │
+10 │         false > 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:10:15
+   │
+10 │         false > 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '>'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:10:17
+   │
+10 │         false > 1;
+   │         -----   ^ Invalid argument to '>'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:11:9
+   │
+11 │         @0x0 > @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:11:16
+   │
+11 │         @0x0 > @0x1;
+   │         ----   ^^^^ Invalid argument to '>'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:12:17
+   │
+12 │         (0: u8) > (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '>'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r > r;
+   │         ^ Invalid argument to '>'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r > r;
+   │             ^ Invalid argument to '>'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s > s;
+   │         ^ Invalid argument to '>'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s > s;
+   │             ^ Invalid argument to '>'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:15:9
+   │
+15 │         0 > 1 > 2;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:15:15
+   │
+15 │         0 > 1 > 2;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '>'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:15:17
+   │
+15 │         0 > 1 > 2;
+   │         -----   ^ Invalid argument to '>'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:16:12
+   │
+16 │         (1 > false) && (@0x0 > 0);
+   │          - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │          │ │  
+   │          │ Incompatible arguments to '>'
+   │          Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:16:25
+   │
+16 │         (1 > false) && (@0x0 > 0);
+   │                         ^^^^
+   │                         │
+   │                         Invalid argument to '>'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:16:30
+   │
+16 │         (1 > false) && (@0x0 > 0);
+   │                         ---- ^ - Found: integer. It is not compatible with the other type.
+   │                         │    │  
+   │                         │    Incompatible arguments to '>'
+   │                         Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:16:32
+   │
+16 │         (1 > false) && (@0x0 > 0);
+   │                         ----   ^ Invalid argument to '>'
+   │                         │       
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:17:9
+   │
+17 │         () > ();
+   │         ^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:17:14
+   │
+17 │         () > ();
+   │         --   ^^ Invalid argument to '>'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:18:11
+   │
+18 │         1 > ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '>'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:19:9
+   │
+19 │         (0, 1) > (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:19:16
+   │
+19 │         (0, 1) > (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '>'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:19:18
+   │
+19 │         (0, 1) > (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '>'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:20:9
+   │
+20 │         (1, 2) > (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_gt_invalid.move:20:18
+   │
+20 │         (1, 2) > (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '>'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.move
new file mode 100644
index 000000000..3205e6a21
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_gt_invalid.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false > true;
+        1 > false;
+        false > 1;
+        @0x0 > @0x1;
+        (0: u8) > (1: u128);
+        r > r;
+        s > s;
+        0 > 1 > 2;
+        (1 > false) && (@0x0 > 0);
+        () > ();
+        1 > ();
+        (0, 1) > (0, 1, 2);
+        (1, 2) > (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq.move
new file mode 100644
index 000000000..de8250e95
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 <= 0;
+        1 <= 0;
+        0 <= 1;
+        0 <= (1: u8);
+        (0: u8) <= 1;
+        0 <= (1: u128);
+        (0: u128) <= 1;
+        (0) <= (1);
+        copy x <= move x;
+        r.f <= r.f;
+        (1 <= r.f) && (r.f <= 0);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.exp
new file mode 100644
index 000000000..1296f90f8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.exp
@@ -0,0 +1,244 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_leq_invalid.move:8:9
+  │
+8 │         false <= true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '<='
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_leq_invalid.move:8:18
+  │
+8 │         false <= true;
+  │         -----    ^^^^ Invalid argument to '<='
+  │         │         
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_leq_invalid.move:9:11
+  │
+9 │         1 <= false;
+  │         - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │   
+  │         │ Incompatible arguments to '<='
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:10:9
+   │
+10 │         false <= 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:10:15
+   │
+10 │         false <= 1;
+   │         ----- ^^ - Found: integer. It is not compatible with the other type.
+   │         │     │   
+   │         │     Incompatible arguments to '<='
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:10:18
+   │
+10 │         false <= 1;
+   │         -----    ^ Invalid argument to '<='
+   │         │         
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:11:9
+   │
+11 │         @0x0 <= @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:11:17
+   │
+11 │         @0x0 <= @0x1;
+   │         ----    ^^^^ Invalid argument to '<='
+   │         │        
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:12:17
+   │
+12 │         (0: u8) <= (1: u128);
+   │             --  ^^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │       
+   │             │   Incompatible arguments to '<='
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r <= r;
+   │         ^ Invalid argument to '<='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r <= r;
+   │              ^ Invalid argument to '<='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s <= s;
+   │         ^ Invalid argument to '<='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s <= s;
+   │              ^ Invalid argument to '<='
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:15:9
+   │
+15 │         0 <= 1 <= 2;
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:15:16
+   │
+15 │         0 <= 1 <= 2;
+   │         ------ ^^ - Found: integer. It is not compatible with the other type.
+   │         │      │   
+   │         │      Incompatible arguments to '<='
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:15:19
+   │
+15 │         0 <= 1 <= 2;
+   │         ------    ^ Invalid argument to '<='
+   │         │          
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:16:12
+   │
+16 │         (1 <= false) && (@0x0 <= 0);
+   │          - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+   │          │ │   
+   │          │ Incompatible arguments to '<='
+   │          Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:16:26
+   │
+16 │         (1 <= false) && (@0x0 <= 0);
+   │                          ^^^^
+   │                          │
+   │                          Invalid argument to '<='
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:16:31
+   │
+16 │         (1 <= false) && (@0x0 <= 0);
+   │                          ---- ^^ - Found: integer. It is not compatible with the other type.
+   │                          │    │   
+   │                          │    Incompatible arguments to '<='
+   │                          Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:16:34
+   │
+16 │         (1 <= false) && (@0x0 <= 0);
+   │                          ----    ^ Invalid argument to '<='
+   │                          │        
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:17:9
+   │
+17 │         () <= ();
+   │         ^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:17:15
+   │
+17 │         () <= ();
+   │         --    ^^ Invalid argument to '<='
+   │         │      
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:18:11
+   │
+18 │         1 <= ();
+   │         - ^^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '<='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:19:9
+   │
+19 │         (0, 1) <= (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:19:16
+   │
+19 │         (0, 1) <= (0, 1, 2);
+   │         ------ ^^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │   
+   │         │      Incompatible arguments to '<='
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:19:19
+   │
+19 │         (0, 1) <= (0, 1, 2);
+   │         ------    ^^^^^^^^^ Invalid argument to '<='
+   │         │          
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:20:9
+   │
+20 │         (1, 2) <= (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<='
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_leq_invalid.move:20:19
+   │
+20 │         (1, 2) <= (0, 1);
+   │         ------    ^^^^^^ Invalid argument to '<='
+   │         │          
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.move
new file mode 100644
index 000000000..114395468
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_leq_invalid.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false <= true;
+        1 <= false;
+        false <= 1;
+        @0x0 <= @0x1;
+        (0: u8) <= (1: u128);
+        r <= r;
+        s <= s;
+        0 <= 1 <= 2;
+        (1 <= false) && (@0x0 <= 0);
+        () <= ();
+        1 <= ();
+        (0, 1) <= (0, 1, 2);
+        (1, 2) <= (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt.move
new file mode 100644
index 000000000..5481fa137
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 < 0;
+        1 < 0;
+        0 < 1;
+        0 < (1: u8);
+        (0: u8) < 1;
+        0 < (1: u128);
+        (0: u128) < 1;
+        (0) < (1);
+        copy x < move x;
+        r.f < r.f;
+        (1 < r.f) && (r.f < 0);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.exp
new file mode 100644
index 000000000..9d8432a5c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.exp
@@ -0,0 +1,244 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_lt_invalid.move:8:9
+  │
+8 │         false < true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '<'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_lt_invalid.move:8:17
+  │
+8 │         false < true;
+  │         -----   ^^^^ Invalid argument to '<'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_lt_invalid.move:9:11
+  │
+9 │         1 < false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '<'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:10:9
+   │
+10 │         false < 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:10:15
+   │
+10 │         false < 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '<'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:10:17
+   │
+10 │         false < 1;
+   │         -----   ^ Invalid argument to '<'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:11:9
+   │
+11 │         @0x0 < @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:11:16
+   │
+11 │         @0x0 < @0x1;
+   │         ----   ^^^^ Invalid argument to '<'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:12:17
+   │
+12 │         (0: u8) < (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '<'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r < r;
+   │         ^ Invalid argument to '<'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r < r;
+   │             ^ Invalid argument to '<'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s < s;
+   │         ^ Invalid argument to '<'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s < s;
+   │             ^ Invalid argument to '<'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:15:9
+   │
+15 │         0 < 1 < 2;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:15:15
+   │
+15 │         0 < 1 < 2;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '<'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:15:17
+   │
+15 │         0 < 1 < 2;
+   │         -----   ^ Invalid argument to '<'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:16:12
+   │
+16 │         (1 < false) && (@0x0 < 0);
+   │          - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │          │ │  
+   │          │ Incompatible arguments to '<'
+   │          Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:16:25
+   │
+16 │         (1 < false) && (@0x0 < 0);
+   │                         ^^^^
+   │                         │
+   │                         Invalid argument to '<'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:16:30
+   │
+16 │         (1 < false) && (@0x0 < 0);
+   │                         ---- ^ - Found: integer. It is not compatible with the other type.
+   │                         │    │  
+   │                         │    Incompatible arguments to '<'
+   │                         Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:16:32
+   │
+16 │         (1 < false) && (@0x0 < 0);
+   │                         ----   ^ Invalid argument to '<'
+   │                         │       
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:17:9
+   │
+17 │         () < ();
+   │         ^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:17:14
+   │
+17 │         () < ();
+   │         --   ^^ Invalid argument to '<'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:18:11
+   │
+18 │         1 < ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '<'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:19:9
+   │
+19 │         (0, 1) < (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:19:16
+   │
+19 │         (0, 1) < (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '<'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:19:18
+   │
+19 │         (0, 1) < (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '<'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:20:9
+   │
+20 │         (1, 2) < (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_lt_invalid.move:20:18
+   │
+20 │         (1, 2) < (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '<'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.move
new file mode 100644
index 000000000..bd31256b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_lt_invalid.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false < true;
+        1 < false;
+        false < 1;
+        @0x0 < @0x1;
+        (0: u8) < (1: u128);
+        r < r;
+        s < s;
+        0 < 1 < 2;
+        (1 < false) && (@0x0 < 0);
+        () < ();
+        1 < ();
+        (0, 1) < (0, 1, 2);
+        (1, 2) < (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod.move
new file mode 100644
index 000000000..122c67c89
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 % 0;
+        1 % 0;
+        0 % 1;
+        0 % (1: u8);
+        (0: u8) % 1;
+        0 % (1: u128);
+        (0: u128) % 1;
+        (0) % (1);
+        copy x % move x;
+        r.f % r.f;
+        1 % r.f % r.f % 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.exp
new file mode 100644
index 000000000..0007a84f2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_mod_invalid.move:8:9
+  │
+8 │         false % true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '%'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_mod_invalid.move:8:17
+  │
+8 │         false % true;
+  │         -----   ^^^^ Invalid argument to '%'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_mod_invalid.move:9:11
+  │
+9 │         1 % false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '%'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:10:9
+   │
+10 │         false % 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '%'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:10:15
+   │
+10 │         false % 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '%'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:10:17
+   │
+10 │         false % 1;
+   │         -----   ^ Invalid argument to '%'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:11:9
+   │
+11 │         @0x0 % @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '%'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:11:16
+   │
+11 │         @0x0 % @0x1;
+   │         ----   ^^^^ Invalid argument to '%'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:12:17
+   │
+12 │         (0: u8) % (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '%'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r % r;
+   │         ^ Invalid argument to '%'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r % r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r % r;
+   │             ^ Invalid argument to '%'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s % s;
+   │         ^ Invalid argument to '%'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s % s;
+   │             ^ Invalid argument to '%'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:9
+   │
+15 │         1 % false % @0x0 % 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '%'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:11
+   │
+15 │         1 % false % @0x0 % 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '%'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:26
+   │
+15 │         1 % false % @0x0 % 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '%'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:28
+   │
+15 │         1 % false % @0x0 % 0;
+   │                     ----   ^ Invalid argument to '%'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:16:9
+   │
+16 │         () % ();
+   │         ^^
+   │         │
+   │         Invalid argument to '%'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:16:14
+   │
+16 │         () % ();
+   │         --   ^^ Invalid argument to '%'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:17:11
+   │
+17 │         1 % ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '%'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:18:9
+   │
+18 │         (0, 1) % (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '%'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:18:16
+   │
+18 │         (0, 1) % (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '%'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:18:18
+   │
+18 │         (0, 1) % (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '%'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:19:9
+   │
+19 │         (1, 2) % (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '%'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mod_invalid.move:19:18
+   │
+19 │         (1, 2) % (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '%'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.move
new file mode 100644
index 000000000..d2a9bccbe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mod_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false % true;
+        1 % false;
+        false % 1;
+        @0x0 % @0x1;
+        (0: u8) % (1: u128);
+        r % r;
+        s % s;
+        1 % false % @0x0 % 0;
+        () % ();
+        1 % ();
+        (0, 1) % (0, 1, 2);
+        (1, 2) % (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul.move
new file mode 100644
index 000000000..929ddee00
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 * 0;
+        1 * 0;
+        0 * 1;
+        0 * (1: u8);
+        (0: u8) * 1;
+        0 * (1: u128);
+        (0: u128) * 1;
+        (0) * (1);
+        copy x * move x;
+        r.f * r.f;
+        1 * r.f * r.f * 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.exp
new file mode 100644
index 000000000..7fa50b757
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_mul_invalid.move:8:9
+  │
+8 │         false * true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '*'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_mul_invalid.move:8:17
+  │
+8 │         false * true;
+  │         -----   ^^^^ Invalid argument to '*'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_mul_invalid.move:9:11
+  │
+9 │         1 * false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '*'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:10:9
+   │
+10 │         false * 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '*'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:10:15
+   │
+10 │         false * 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '*'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:10:17
+   │
+10 │         false * 1;
+   │         -----   ^ Invalid argument to '*'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:11:9
+   │
+11 │         @0x0 * @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '*'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:11:16
+   │
+11 │         @0x0 * @0x1;
+   │         ----   ^^^^ Invalid argument to '*'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:12:17
+   │
+12 │         (0: u8) * (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '*'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r * r;
+   │         ^ Invalid argument to '*'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r * r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r * r;
+   │             ^ Invalid argument to '*'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s * s;
+   │         ^ Invalid argument to '*'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s * s;
+   │             ^ Invalid argument to '*'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:9
+   │
+15 │         1 * false * @0x0 * 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '*'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:11
+   │
+15 │         1 * false * @0x0 * 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '*'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:26
+   │
+15 │         1 * false * @0x0 * 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '*'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:28
+   │
+15 │         1 * false * @0x0 * 0;
+   │                     ----   ^ Invalid argument to '*'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:16:9
+   │
+16 │         () * ();
+   │         ^^
+   │         │
+   │         Invalid argument to '*'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:16:14
+   │
+16 │         () * ();
+   │         --   ^^ Invalid argument to '*'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:17:11
+   │
+17 │         1 * ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '*'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:18:9
+   │
+18 │         (0, 1) * (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '*'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:18:16
+   │
+18 │         (0, 1) * (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '*'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:18:18
+   │
+18 │         (0, 1) * (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '*'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:19:9
+   │
+19 │         (1, 2) * (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '*'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_mul_invalid.move:19:18
+   │
+19 │         (1, 2) * (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '*'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.move
new file mode 100644
index 000000000..a35651e9c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_mul_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false * true;
+        1 * false;
+        false * 1;
+        @0x0 * @0x1;
+        (0: u8) * (1: u128);
+        r * r;
+        s * s;
+        1 * false * @0x0 * 0;
+        () * ();
+        1 * ();
+        (0, 1) * (0, 1, 2);
+        (1, 2) * (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or.move
new file mode 100644
index 000000000..16a98aa34
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {
+        f: bool
+    }
+
+    fun t0(x: bool, r: R) {
+        true || false;
+        false || true;
+        true || false;
+        (true) || (true);
+        copy x || move x;
+        r.f || r.f;
+        true || false || (true || false);
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.exp
new file mode 100644
index 000000000..b0fb8d1b8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.exp
@@ -0,0 +1,187 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_or_invalid.move:8:9
+  │
+8 │         0 || 1;
+  │         ^ -- Expected: 'bool'
+  │         │  
+  │         Invalid argument to '||'
+  │         Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_or_invalid.move:8:14
+  │
+8 │         0 || 1;
+  │           -- ^
+  │           │  │
+  │           │  Invalid argument to '||'
+  │           │  Given: integer
+  │           Expected: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_or_invalid.move:9:9
+  │
+9 │         1 || false;
+  │         ^ -- Expected: 'bool'
+  │         │  
+  │         Invalid argument to '||'
+  │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:10:18
+   │
+10 │         false || 1;
+   │               -- ^
+   │               │  │
+   │               │  Invalid argument to '||'
+   │               │  Given: integer
+   │               Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:11:9
+   │
+11 │         @0x0 || @0x1;
+   │         ^^^^ -- Expected: 'bool'
+   │         │     
+   │         Invalid argument to '||'
+   │         Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:11:17
+   │
+11 │         @0x0 || @0x1;
+   │              -- ^^^^
+   │              │  │
+   │              │  Invalid argument to '||'
+   │              │  Given: 'address'
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:12:9
+   │
+12 │         (0: u8) || (1: u128);
+   │         ^^^^^^^ -- Expected: 'bool'
+   │         │   │    
+   │         │   Given: 'u8'
+   │         Invalid argument to '||'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:12:20
+   │
+12 │         (0: u8) || (1: u128);
+   │                 -- ^^^^^^^^^
+   │                 │  │   │
+   │                 │  │   Given: 'u128'
+   │                 │  Invalid argument to '||'
+   │                 Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r || r;
+   │         ^ -- Expected: 'bool'
+   │         │  
+   │         Invalid argument to '||'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r || r;
+   │           -- ^ Invalid argument to '||'
+   │           │   
+   │           Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s || s;
+   │         ^ -- Expected: 'bool'
+   │         │  
+   │         Invalid argument to '||'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s || s;
+   │           -- ^ Invalid argument to '||'
+   │           │   
+   │           Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:15:9
+   │
+15 │         () || ();
+   │         ^^ -- Expected: 'bool'
+   │         │   
+   │         Invalid argument to '||'
+   │         Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:15:15
+   │
+15 │         () || ();
+   │            -- ^^
+   │            │  │
+   │            │  Invalid argument to '||'
+   │            │  Given: '()'
+   │            Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:16:17
+   │
+16 │         true || ();
+   │              -- ^^
+   │              │  │
+   │              │  Invalid argument to '||'
+   │              │  Given: '()'
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:17:9
+   │
+17 │         (true, false) || (true, false, true);
+   │         ^^^^^^^^^^^^^ -- Expected: 'bool'
+   │         │              
+   │         Invalid argument to '||'
+   │         Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:17:26
+   │
+17 │         (true, false) || (true, false, true);
+   │                       -- ^^^^^^^^^^^^^^^^^^^
+   │                       │  │
+   │                       │  Invalid argument to '||'
+   │                       │  Given: '(bool, bool, bool)'
+   │                       Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:18:9
+   │
+18 │         (true, true) || (false, false);
+   │         ^^^^^^^^^^^^ -- Expected: 'bool'
+   │         │             
+   │         Invalid argument to '||'
+   │         Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_or_invalid.move:18:25
+   │
+18 │         (true, true) || (false, false);
+   │                      -- ^^^^^^^^^^^^^^
+   │                      │  │
+   │                      │  Invalid argument to '||'
+   │                      │  Given: '(bool, bool)'
+   │                      Expected: 'bool'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.move
new file mode 100644
index 000000000..d537f02fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_or_invalid.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        0 || 1;
+        1 || false;
+        false || 1;
+        @0x0 || @0x1;
+        (0: u8) || (1: u128);
+        r || r;
+        s || s;
+        () || ();
+        true || ();
+        (true, false) || (true, false, true);
+        (true, true) || (false, false);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl.move
new file mode 100644
index 000000000..77865482b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64,
+        b: u8,
+    }
+
+    fun t0(x: u64, b: u8, r: R) {
+        0 << 0;
+        1 << 0;
+        0 << 1;
+        0 << (1: u8);
+        (0: u8) + 1;
+        (0: u128) << 1;
+        (0) << (1);
+        copy x << copy b;
+        r.f << r.b;
+        1 << r.b << r.b << 0;
+        R {f: _, b: _} = r
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.exp
new file mode 100644
index 000000000..da57b1e6a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.exp
@@ -0,0 +1,208 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_shl_invalid.move:8:9
+  │
+8 │         false << true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '<<'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_shl_invalid.move:8:18
+  │
+8 │         false << true;
+  │                  ^^^^
+  │                  │
+  │                  Invalid argument to '<<'
+  │                  Expected: 'u8'
+  │                  Given: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_shl_invalid.move:9:14
+  │
+9 │         1 << false;
+  │              ^^^^^
+  │              │
+  │              Invalid argument to '<<'
+  │              Expected: 'u8'
+  │              Given: 'bool'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:10:9
+   │
+10 │         false << 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '<<'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:11:9
+   │
+11 │         @0x0 << @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '<<'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:11:17
+   │
+11 │         @0x0 << @0x1;
+   │                 ^^^^
+   │                 │
+   │                 Invalid argument to '<<'
+   │                 Expected: 'u8'
+   │                 Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:12:20
+   │
+12 │         (0: u8) << (1: u128);
+   │                    ^^^^^^^^^
+   │                    │   │
+   │                    │   Given: 'u128'
+   │                    Invalid argument to '<<'
+   │                    Expected: 'u8'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r << r;
+   │         ^ Invalid argument to '<<'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r << r;
+   │         ^^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r << r;
+   │              ^
+   │              │
+   │              Invalid argument to '<<'
+   │              Expected: 'u8'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s << s;
+   │         ^ Invalid argument to '<<'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s << s;
+   │              ^
+   │              │
+   │              Invalid argument to '<<'
+   │              Expected: 'u8'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:15:14
+   │
+15 │         1 << false << @0x0 << 0;
+   │              ^^^^^
+   │              │
+   │              Invalid argument to '<<'
+   │              Expected: 'u8'
+   │              Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:15:23
+   │
+15 │         1 << false << @0x0 << 0;
+   │                       ^^^^
+   │                       │
+   │                       Invalid argument to '<<'
+   │                       Expected: 'u8'
+   │                       Given: 'address'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:16:9
+   │
+16 │         () << ();
+   │         ^^
+   │         │
+   │         Invalid argument to '<<'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:16:15
+   │
+16 │         () << ();
+   │               ^^
+   │               │
+   │               Invalid argument to '<<'
+   │               Expected: 'u8'
+   │               Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:17:14
+   │
+17 │         1 << ();
+   │              ^^
+   │              │
+   │              Invalid argument to '<<'
+   │              Expected: 'u8'
+   │              Given: '()'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:18:9
+   │
+18 │         (0, 1) << (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<<'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:18:19
+   │
+18 │         (0, 1) << (0, 1, 2);
+   │                   ^^^^^^^^^
+   │                   │
+   │                   Invalid argument to '<<'
+   │                   Expected: 'u8'
+   │                   Given: '({integer}, {integer}, {integer})'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:19:9
+   │
+19 │         (1, 2) << (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '<<'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shl_invalid.move:19:19
+   │
+19 │         (1, 2) << (0, 1);
+   │                   ^^^^^^
+   │                   │
+   │                   Invalid argument to '<<'
+   │                   Expected: 'u8'
+   │                   Given: '({integer}, {integer})'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.move
new file mode 100644
index 000000000..ab21266b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shl_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false << true;
+        1 << false;
+        false << 1;
+        @0x0 << @0x1;
+        (0: u8) << (1: u128);
+        r << r;
+        s << s;
+        1 << false << @0x0 << 0;
+        () << ();
+        1 << ();
+        (0, 1) << (0, 1, 2);
+        (1, 2) << (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr.move
new file mode 100644
index 000000000..55b4bd3ab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64,
+        b: u8,
+    }
+
+    fun t0(x: u64, b: u8, r: R) {
+        0 >> 0;
+        1 >> 0;
+        0 >> 1;
+        0 >> (1: u8);
+        (0: u8) + 1;
+        (0: u128) >> 1;
+        (0) >> (1);
+        copy x >> copy b;
+        r.f >> r.b;
+        1 >> r.b >> r.b >> 0;
+        R {f: _, b: _} = r
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.exp
new file mode 100644
index 000000000..78bda44e8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.exp
@@ -0,0 +1,208 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_shr_invalid.move:8:9
+  │
+8 │         false >> true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '>>'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_shr_invalid.move:8:18
+  │
+8 │         false >> true;
+  │                  ^^^^
+  │                  │
+  │                  Invalid argument to '>>'
+  │                  Expected: 'u8'
+  │                  Given: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_shr_invalid.move:9:14
+  │
+9 │         1 >> false;
+  │              ^^^^^
+  │              │
+  │              Invalid argument to '>>'
+  │              Expected: 'u8'
+  │              Given: 'bool'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:10:9
+   │
+10 │         false >> 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '>>'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:11:9
+   │
+11 │         @0x0 >> @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '>>'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:11:17
+   │
+11 │         @0x0 >> @0x1;
+   │                 ^^^^
+   │                 │
+   │                 Invalid argument to '>>'
+   │                 Expected: 'u8'
+   │                 Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:12:20
+   │
+12 │         (0: u8) >> (1: u128);
+   │                    ^^^^^^^^^
+   │                    │   │
+   │                    │   Given: 'u128'
+   │                    Invalid argument to '>>'
+   │                    Expected: 'u8'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r >> r;
+   │         ^ Invalid argument to '>>'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r >> r;
+   │         ^^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:13:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Given: '0x8675309::M::R'
+   ·
+13 │         r >> r;
+   │              ^
+   │              │
+   │              Invalid argument to '>>'
+   │              Expected: 'u8'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s >> s;
+   │         ^ Invalid argument to '>>'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:14:14
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Given: '0x8675309::M::S'
+   ·
+14 │         s >> s;
+   │              ^
+   │              │
+   │              Invalid argument to '>>'
+   │              Expected: 'u8'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:15:14
+   │
+15 │         1 >> false >> @0x0 >> 0;
+   │              ^^^^^
+   │              │
+   │              Invalid argument to '>>'
+   │              Expected: 'u8'
+   │              Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:15:23
+   │
+15 │         1 >> false >> @0x0 >> 0;
+   │                       ^^^^
+   │                       │
+   │                       Invalid argument to '>>'
+   │                       Expected: 'u8'
+   │                       Given: 'address'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:16:9
+   │
+16 │         () >> ();
+   │         ^^
+   │         │
+   │         Invalid argument to '>>'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:16:15
+   │
+16 │         () >> ();
+   │               ^^
+   │               │
+   │               Invalid argument to '>>'
+   │               Expected: 'u8'
+   │               Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:17:14
+   │
+17 │         1 >> ();
+   │              ^^
+   │              │
+   │              Invalid argument to '>>'
+   │              Expected: 'u8'
+   │              Given: '()'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:18:9
+   │
+18 │         (0, 1) >> (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>>'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:18:19
+   │
+18 │         (0, 1) >> (0, 1, 2);
+   │                   ^^^^^^^^^
+   │                   │
+   │                   Invalid argument to '>>'
+   │                   Expected: 'u8'
+   │                   Given: '({integer}, {integer}, {integer})'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:19:9
+   │
+19 │         (1, 2) >> (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '>>'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_shr_invalid.move:19:19
+   │
+19 │         (1, 2) >> (0, 1);
+   │                   ^^^^^^
+   │                   │
+   │                   Invalid argument to '>>'
+   │                   Expected: 'u8'
+   │                   Given: '({integer}, {integer})'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.move
new file mode 100644
index 000000000..49cbfb6dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_shr_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false >> true;
+        1 >> false;
+        false >> 1;
+        @0x0 >> @0x1;
+        (0: u8) >> (1: u128);
+        r >> r;
+        s >> s;
+        1 >> false >> @0x0 >> 0;
+        () >> ();
+        1 >> ();
+        (0, 1) >> (0, 1, 2);
+        (1, 2) >> (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub.move
new file mode 100644
index 000000000..60a428a8f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 - 0;
+        1 - 0;
+        0 - 1;
+        0 - (1: u8);
+        (0: u8) - 1;
+        0 - (1: u128);
+        (0: u128) - 1;
+        (0) - (1);
+        copy x - move x;
+        r.f - r.f;
+        1 - r.f - r.f - 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.exp
new file mode 100644
index 000000000..1bf9c0b1b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.exp
@@ -0,0 +1,230 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_sub_invalid.move:8:9
+  │
+8 │         false - true;
+  │         ^^^^^
+  │         │
+  │         Invalid argument to '-'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/binary_sub_invalid.move:8:17
+  │
+8 │         false - true;
+  │         -----   ^^^^ Invalid argument to '-'
+  │         │        
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/binary_sub_invalid.move:9:11
+  │
+9 │         1 - false;
+  │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+  │         │ │  
+  │         │ Incompatible arguments to '-'
+  │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:10:9
+   │
+10 │         false - 1;
+   │         ^^^^^
+   │         │
+   │         Invalid argument to '-'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:10:15
+   │
+10 │         false - 1;
+   │         ----- ^ - Found: integer. It is not compatible with the other type.
+   │         │     │  
+   │         │     Incompatible arguments to '-'
+   │         Found: 'bool'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:10:17
+   │
+10 │         false - 1;
+   │         -----   ^ Invalid argument to '-'
+   │         │        
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:11:9
+   │
+11 │         @0x0 - @0x1;
+   │         ^^^^
+   │         │
+   │         Invalid argument to '-'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:11:16
+   │
+11 │         @0x0 - @0x1;
+   │         ----   ^^^^ Invalid argument to '-'
+   │         │       
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:12:17
+   │
+12 │         (0: u8) - (1: u128);
+   │             --  ^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │      
+   │             │   Incompatible arguments to '-'
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:13:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r - r;
+   │         ^ Invalid argument to '-'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:13:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 7 │     fun t0(r: R, s: S) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+13 │         r - r;
+   │         ^^^^^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:13:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │               - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+13 │         r - r;
+   │             ^ Invalid argument to '-'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:14:9
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s - s;
+   │         ^ Invalid argument to '-'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:14:13
+   │
+ 7 │     fun t0(r: R, s: S) {
+   │                     - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   ·
+14 │         s - s;
+   │             ^ Invalid argument to '-'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:9
+   │
+15 │         1 - false - @0x0 - 0;
+   │         ^^^^^^^^^^^^^^^^
+   │         │           │
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+   │         Invalid argument to '-'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:11
+   │
+15 │         1 - false - @0x0 - 0;
+   │         - ^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '-'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:26
+   │
+15 │         1 - false - @0x0 - 0;
+   │                     ---- ^ - Found: integer. It is not compatible with the other type.
+   │                     │    │  
+   │                     │    Incompatible arguments to '-'
+   │                     Found: 'address'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:28
+   │
+15 │         1 - false - @0x0 - 0;
+   │                     ----   ^ Invalid argument to '-'
+   │                     │       
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:16:9
+   │
+16 │         () - ();
+   │         ^^
+   │         │
+   │         Invalid argument to '-'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:16:14
+   │
+16 │         () - ();
+   │         --   ^^ Invalid argument to '-'
+   │         │     
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:17:11
+   │
+17 │         1 - ();
+   │         - ^ -- Found: '()'. It is not compatible with the other type.
+   │         │ │  
+   │         │ Incompatible arguments to '-'
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:18:9
+   │
+18 │         (0, 1) - (0, 1, 2);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '-'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:18:16
+   │
+18 │         (0, 1) - (0, 1, 2);
+   │         ------ ^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │  
+   │         │      Incompatible arguments to '-'
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:18:18
+   │
+18 │         (0, 1) - (0, 1, 2);
+   │         ------   ^^^^^^^^^ Invalid argument to '-'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:19:9
+   │
+19 │         (1, 2) - (0, 1);
+   │         ^^^^^^
+   │         │
+   │         Invalid argument to '-'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/binary_sub_invalid.move:19:18
+   │
+19 │         (1, 2) - (0, 1);
+   │         ------   ^^^^^^ Invalid argument to '-'
+   │         │         
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.move
new file mode 100644
index 000000000..aae3226c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_sub_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+
+    fun t0(r: R, s: S) {
+        false - true;
+        1 - false;
+        false - 1;
+        @0x0 - @0x1;
+        (0: u8) - (1: u128);
+        r - r;
+        s - s;
+        1 - false - @0x0 - 0;
+        () - ();
+        1 - ();
+        (0, 1) - (0, 1, 2);
+        (1, 2) - (0, 1);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/binary_xor.move b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_xor.move
new file mode 100644
index 000000000..2876b2fb0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/binary_xor.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct R {
+        f: u64
+    }
+
+    fun t0(x: u64, r: R) {
+        0 ^ 0;
+        1 ^ 0;
+        0 ^ 1;
+        0 ^ (1: u8);
+        (0: u8) ^ 1;
+        0 ^ (1: u128);
+        (0: u128) ^ 1;
+        (0) ^ (1);
+        copy x ^ move x;
+        r.f ^ r.f;
+        1 ^ r.f ^ r.f ^ 0;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.exp
new file mode 100644
index 000000000..fb7343051
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.exp
@@ -0,0 +1,48 @@
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:5:14
+  │
+5 │         let (x, x) = (0, 0); x;
+  │              ^ Unused assignment for variable 'x'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_x')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:5:17
+  │
+5 │         let (x, x) = (0, 0); x;
+  │              -  ^ Duplicate declaration for local 'x' in a given 'let'
+  │              │   
+  │              Previously declared here
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:6:14
+  │
+6 │         let (f, R{f}, f) = (0, R { f: 0 }, 0); f;
+  │              ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:6:19
+  │
+6 │         let (f, R{f}, f) = (0, R { f: 0 }, 0); f;
+  │              -    ^ Duplicate declaration for local 'f' in a given 'let'
+  │              │     
+  │              Previously declared here
+
+warning[W09003]: unused assignment
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:6:19
+  │
+6 │         let (f, R{f}, f) = (0, R { f: 0 }, 0); f;
+  │                   ^ Unused assignment for variable 'f'. Consider removing, replacing with '_', or prefixing with '_' (e.g., '_f')
+  │
+  = This warning can be suppressed with '#[allow(unused_assignment)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/bind_duplicate_binding.move:6:23
+  │
+6 │         let (f, R{f}, f) = (0, R { f: 0 }, 0); f;
+  │              -        ^ Duplicate declaration for local 'f' in a given 'let'
+  │              │         
+  │              Previously declared here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.move
new file mode 100644
index 000000000..b7671ef6c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_duplicate_binding.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let (x, x) = (0, 0); x;
+        let (f, R{f}, f) = (0, R { f: 0 }, 0); f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.exp
new file mode 100644
index 000000000..359defa77
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.exp
@@ -0,0 +1,46 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/bind_pop_resource.move:5:13
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let _: R = R{};
+  │             ^  - The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │   
+  │             Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/bind_pop_resource.move:9:14
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+9 │         let (_, _):(R, R) = (R{}, R{});
+  │              ^      - The type '0x8675309::M::R' does not have the ability 'drop'
+  │              │       
+  │              Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/bind_pop_resource.move:9:17
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+9 │         let (_, _):(R, R) = (R{}, R{});
+  │                 ^      - The type '0x8675309::M::R' does not have the ability 'drop'
+  │                 │       
+  │                 Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/typing/bind_pop_resource.move:9:39
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+8 │         let _r: R = R{};
+  │             --  - The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │    
+  │             The local variable '_r' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+9 │         let (_, _):(R, R) = (R{}, R{});
+  │                                       ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.move
new file mode 100644
index 000000000..991070c3b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_pop_resource.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        let _: R = R{};
+        // the following is an invalid binding too but its error message will
+        // not show because the compilation fails early at the typing phase
+        let _r: R = R{};
+        let (_, _):(R, R) = (R{}, R{});
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.exp
new file mode 100644
index 000000000..ae04983b2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.exp
@@ -0,0 +1,30 @@
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/bind_unpack_references.move:16:14
+   │
+ 3 │     struct R { s1: S, s2: S }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+13 │         let R { s1: S { f }, s2 }: &R = &R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+   │                                          ------------------------------
+   │                                          │
+   │                                          The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                                          The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+16 │         f; s2;
+   │              ^ Invalid return
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/bind_unpack_references.move:23:14
+   │
+ 3 │     struct R { s1: S, s2: S }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+20 │         let R { s1: S { f }, s2 }: &mut R = &mut R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+   │                                                  ------------------------------
+   │                                                  │
+   │                                                  The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+   │                                                  The type '0x8675309::M::R' does not have the ability 'drop'
+   ·
+23 │         f; s2;
+   │              ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.move
new file mode 100644
index 000000000..30839a540
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references.move
@@ -0,0 +1,25 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct R { s1: S, s2: S }
+
+    fun t0() {
+        let R { s1: S { f }, s2 }: R = R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = 0;
+        s2 = S { f: 0 };
+        f; s2;
+    }
+
+    fun t1() {
+        let R { s1: S { f }, s2 }: &R = &R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = &0;
+        s2 = &S { f: 0 };
+        f; s2;
+    }
+
+    fun t2() {
+        let R { s1: S { f }, s2 }: &mut R = &mut R { s1: S{f: 0}, s2: S{f: 1} }; f; s2;
+        f = &mut 0;
+        s2 = &mut S { f: 0 };
+        f; s2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.exp
new file mode 100644
index 000000000..bbc0de5a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.exp
@@ -0,0 +1,65 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:7:9
+  │
+6 │         let R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+  │                         - Expected: '&u64'
+7 │         f = 0;
+  │         ^
+  │         │
+  │         Invalid assignment to variable 'f'
+  │         Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:8:9
+  │
+6 │         let R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+  │                              -- Expected: '&0x8675309::M::S'
+7 │         f = 0;
+8 │         s2 = S { f: 0 }
+  │         ^^   ---------- Given: '0x8675309::M::S'
+  │         │     
+  │         Invalid assignment to variable 's2'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:13:9
+   │
+12 │         let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                         - Expected: '&mut u64'
+13 │         f = 0;
+   │         ^
+   │         │
+   │         Invalid assignment to variable 'f'
+   │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:14:9
+   │
+12 │         let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                              -- Expected: '&mut 0x8675309::M::S'
+13 │         f = 0;
+14 │         s2 = S { f: 0 }
+   │         ^^   ---------- Given: '0x8675309::M::S'
+   │         │     
+   │         Invalid assignment to variable 's2'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:20:9
+   │
+19 │         let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                         - Expected: '&mut u64'
+20 │         f = &0;
+   │         ^   -- Given: '&{integer}'
+   │         │    
+   │         Invalid assignment to variable 'f'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/bind_unpack_references_invalid.move:21:9
+   │
+19 │         let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+   │                              -- Expected: '&mut 0x8675309::M::S'
+20 │         f = &0;
+21 │         s2 = &S { f: 0 }
+   │         ^^   ----------- Given: '&0x8675309::M::S'
+   │         │     
+   │         Invalid assignment to variable 's2'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.move
new file mode 100644
index 000000000..c38a8d8d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_unpack_references_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    struct R { s1: S, s2: S }
+
+    fun t0() {
+        let R { s1: S { f }, s2 } = &R { s1: S{f: 0}, s2: S{f: 1} };
+        f = 0;
+        s2 = S { f: 0 }
+    }
+
+    fun t1() {
+        let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+        f = 0;
+        s2 = S { f: 0 }
+    }
+
+
+    fun t2() {
+        let R { s1: S { f }, s2 } = &mut R { s1: S{f: 0}, s2: S{f: 1} };
+        f = &0;
+        s2 = &S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_with_type_annot.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_with_type_annot.move
new file mode 100644
index 000000000..2113f0037
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_with_type_annot.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let (): () = ();
+        let x: u64 = 0; x;
+        let (x, b, R{f}): (u64, bool, R) = (0, false, R { f: 0 }); x; b; f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.exp
new file mode 100644
index 000000000..8f7052bdb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.exp
@@ -0,0 +1,35 @@
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/bind_wrong_arity.move:5:13
+  │
+5 │         let x: () = (); x;
+  │             ^  -- Expected a single type, but found expression list type: '()'
+  │             │   
+  │             Invalid type for local
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_wrong_arity.move:6:13
+  │
+6 │         let (): u64 = 0;
+  │             ^^  --- Given: 'u64'
+  │             │    
+  │             Invalid value for binding
+  │             Expected: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_wrong_arity.move:7:13
+  │
+7 │         let (x, b, R{f}): (u64, bool, R, R) = (0, false, R{f: 0}, R{f: 0}); x; b; f;
+  │             ^^^^^^^^^^^^  ----------------- Given expression list of length 4: '(u64, bool, 0x8675309::M::R, 0x8675309::M::R)'
+  │             │              
+  │             Invalid value for binding
+  │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_wrong_arity.move:8:13
+  │
+8 │         let (x, b, R{f}): (u64, bool) = (0, false); x; b; f;
+  │             ^^^^^^^^^^^^  ----------- Given expression list of length 2: '(u64, bool)'
+  │             │              
+  │             Invalid value for binding
+  │             Expected expression list of length 3: '(_, _, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.move
new file mode 100644
index 000000000..50ee5ebd4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_arity.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let x: () = (); x;
+        let (): u64 = 0;
+        let (x, b, R{f}): (u64, bool, R, R) = (0, false, R{f: 0}, R{f: 0}); x; b; f;
+        let (x, b, R{f}): (u64, bool) = (0, false); x; b; f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.exp
new file mode 100644
index 000000000..c6cd1d923
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.exp
@@ -0,0 +1,124 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_wrong_type.move:6:13
+  │
+6 │         let S { g } = R {f :0}; g;
+  │             ^^^^^^^   -------- Expected: '0x8675309::M::R'
+  │             │          
+  │             Invalid deconstruction binding
+  │             Given: '0x8675309::M::S'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/bind_wrong_type.move:7:14
+  │
+7 │         let (S { g }, R { f }) = (R{ f: 0 }, R{ f: 1 }); g; f;
+  │              ^^^^^^^              --------- Expected: '0x8675309::M::R'
+  │              │                     
+  │              Invalid deconstruction binding
+  │              Given: '0x8675309::M::S'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/bind_wrong_type.move:11:13
+   │
+11 │         let x = (); x;
+   │             ^   -- Expected a single type, but found expression list type: '()'
+   │             │    
+   │             Invalid type for local
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:12:13
+   │
+12 │         let () = 0;
+   │             ^^   - Given: integer
+   │             │     
+   │             Invalid value for binding
+   │             Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:13:13
+   │
+13 │         let (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0}); x; b; f;
+   │             ^^^^^^^^^^^^   ---------------------------- Given expression list of length 4: '({integer}, bool, 0x8675309::M::R, 0x8675309::M::R)'
+   │             │               
+   │             Invalid value for binding
+   │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:14:13
+   │
+14 │         let (x, b, R{f}) = (0, false); x; b; f;
+   │             ^^^^^^^^^^^^   ---------- Given expression list of length 2: '({integer}, bool)'
+   │             │               
+   │             Invalid value for binding
+   │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/bind_wrong_type.move:18:13
+   │
+18 │         let x: () = 0; x;
+   │             ^  -- Expected a single type, but found expression list type: '()'
+   │             │   
+   │             Invalid type for local
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:18:16
+   │
+18 │         let x: () = 0; x;
+   │                ^^   - Given: integer
+   │                │     
+   │                Invalid type annotation
+   │                Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:19:13
+   │
+19 │         let (): u64 = ();
+   │             ^^  --- Given: 'u64'
+   │             │    
+   │             Invalid value for binding
+   │             Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:19:17
+   │
+19 │         let (): u64 = ();
+   │                 ^^^   -- Given: '()'
+   │                 │      
+   │                 Invalid type annotation
+   │                 Expected: 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:20:13
+   │
+20 │         let (x, b, R{f}): (u64, bool, R, R) = (0, false, R{f: 0}); x; b; f;
+   │             ^^^^^^^^^^^^  ----------------- Given expression list of length 4: '(u64, bool, 0x8675309::M::R, 0x8675309::M::R)'
+   │             │              
+   │             Invalid value for binding
+   │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:20:27
+   │
+20 │         let (x, b, R{f}): (u64, bool, R, R) = (0, false, R{f: 0}); x; b; f;
+   │                           ^^^^^^^^^^^^^^^^^   ------------------- Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+   │                           │                    
+   │                           Invalid type annotation
+   │                           Expected expression list of length 4: '(u64, bool, 0x8675309::M::R, 0x8675309::M::R)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:21:13
+   │
+21 │         let (x, b, R{f}): (u64, bool) = (0, false, R{f: 0}); x; b; f;
+   │             ^^^^^^^^^^^^  ----------- Given expression list of length 2: '(u64, bool)'
+   │             │              
+   │             Invalid value for binding
+   │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/bind_wrong_type.move:21:27
+   │
+21 │         let (x, b, R{f}): (u64, bool) = (0, false, R{f: 0}); x; b; f;
+   │                           ^^^^^^^^^^^   ------------------- Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+   │                           │              
+   │                           Invalid type annotation
+   │                           Expected expression list of length 2: '(u64, bool)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.move
new file mode 100644
index 000000000..cc505fb6c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/bind_wrong_type.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct R {f: u64}
+    struct S { g: u64 }
+
+    fun t0() {
+        let S { g } = R {f :0}; g;
+        let (S { g }, R { f }) = (R{ f: 0 }, R{ f: 1 }); g; f;
+    }
+
+    fun t1() {
+        let x = (); x;
+        let () = 0;
+        let (x, b, R{f}) = (0, false, R{f: 0}, R{f: 0}); x; b; f;
+        let (x, b, R{f}) = (0, false); x; b; f;
+    }
+
+    fun t2() {
+        let x: () = 0; x;
+        let (): u64 = ();
+        let (x, b, R{f}): (u64, bool, R, R) = (0, false, R{f: 0}); x; b; f;
+        let (x, b, R{f}): (u64, bool) = (0, false, R{f: 0}); x; b; f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty.move
new file mode 100644
index 000000000..f5ea9fc4d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    fun t0() {
+        ({}: ());
+        ({
+        }: ());
+        ({{}}: ());
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.exp
new file mode 100644
index 000000000..1759e4d36
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.exp
@@ -0,0 +1,30 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_empty_invalid.move:3:14
+  │
+3 │         ({}: u64);
+  │          --  ^^^
+  │          │   │
+  │          │   Invalid type annotation
+  │          │   Expected: 'u64'
+  │          Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_empty_invalid.move:4:14
+  │
+4 │         ({}: &u64);
+  │          --  ^^^^
+  │          │   │
+  │          │   Invalid type annotation
+  │          │   Expected: '&u64'
+  │          Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_empty_invalid.move:5:14
+  │
+5 │         ({}: (u64, bool));
+  │          --  ^^^^^^^^^^^
+  │          │   │
+  │          │   Invalid type annotation
+  │          │   Expected: '(u64, bool)'
+  │          Given: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.move
new file mode 100644
index 000000000..41cdaf273
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_empty_invalid.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun t0() {
+        ({}: u64);
+        ({}: &u64);
+        ({}: (u64, bool));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr.move
new file mode 100644
index 000000000..483c862ec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {}
+    fun t0() {
+        ({ 0 } : u64);
+        ({ &0 } : &u64);
+        ({ &mut 0 } : &mut u64);
+        R {} = ({ R {} } : R);
+        ({ (0, false) } : (u64, bool));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.exp
new file mode 100644
index 000000000..15173b93d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.exp
@@ -0,0 +1,52 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_single_expr_invalid.move:4:18
+  │
+4 │         ({ 0 } : bool);
+  │            -     ^^^^
+  │            │     │
+  │            │     Invalid type annotation
+  │            │     Expected: 'bool'
+  │            Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_single_expr_invalid.move:5:19
+  │
+5 │         ({ &0 } : u64);
+  │            --     ^^^
+  │            │      │
+  │            │      Invalid type annotation
+  │            │      Expected: 'u64'
+  │            Given: '&{integer}'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_single_expr_invalid.move:6:23
+  │
+6 │         ({ &mut 0 } : ());
+  │            ------     ^^
+  │            │          │
+  │            │          Invalid type annotation
+  │            │          Expected: '()'
+  │            Given: '&mut {integer}'
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/block_single_expr_invalid.move:7:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+7 │         ({ R {} } : R);
+  │         ^^^^^^^^^^^^^^
+  │         │           │
+  │         │           The type '0x8675309::M::R' does not have the ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_single_expr_invalid.move:8:34
+  │
+8 │         ({ (0, false, false) } : (u64, bool));
+  │            -----------------     ^^^^^^^^^^^
+  │            │                     │
+  │            │                     Invalid type annotation
+  │            │                     Expected expression list of length 2: '(u64, bool)'
+  │            Given expression list of length 3: '({integer}, bool, bool)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.move
new file mode 100644
index 000000000..fc469525b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_single_expr_invalid.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {}
+    fun t0() {
+        ({ 0 } : bool);
+        ({ &0 } : u64);
+        ({ &mut 0 } : ());
+        ({ R {} } : R);
+        ({ (0, false, false) } : (u64, bool));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements.move
new file mode 100644
index 000000000..d3e967239
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {}
+    fun t0() {
+        ({ let x = 0; x } : u64);
+        ({ let x = 0; &x } : &u64);
+        ({ let y = 0; &mut (y + 1) } : &mut u64);
+        R {} = ({ let r = { let r = R {}; r }; r } : R);
+        ({ let x = 0; (x, false) } : (u64, bool));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.exp
new file mode 100644
index 000000000..f1d9b5f3a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.exp
@@ -0,0 +1,52 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_with_statements_invalid.move:4:29
+  │
+4 │         ({ let x = 0; x } : bool);
+  │                -            ^^^^
+  │                │            │
+  │                │            Invalid type annotation
+  │                │            Expected: 'bool'
+  │                Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_with_statements_invalid.move:5:30
+  │
+5 │         ({ let x = 0; &x } : u64);
+  │                       --     ^^^
+  │                       │      │
+  │                       │      Invalid type annotation
+  │                       │      Expected: 'u64'
+  │                       Given: '&{integer}'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_with_statements_invalid.move:6:40
+  │
+6 │         ({ let y = 0; &mut (y + 1) } : ());
+  │                       ------------     ^^
+  │                       │                │
+  │                       │                Invalid type annotation
+  │                       │                Expected: '()'
+  │                       Given: '&mut {integer}'
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/block_with_statements_invalid.move:7:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+7 │         ({ let r = { let r = R {}; r }; r } : R);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │                                     │
+  │         │                                     The type '0x8675309::M::R' does not have the ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/block_with_statements_invalid.move:8:45
+  │
+8 │         ({ let x = 0; (x, false, false) } : (u64, bool));
+  │                       -----------------     ^^^^^^^^^^^
+  │                       │                     │
+  │                       │                     Invalid type annotation
+  │                       │                     Expected expression list of length 2: '(u64, bool)'
+  │                       Given expression list of length 3: '({integer}, bool, bool)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.move
new file mode 100644
index 000000000..fe3197be6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/block_with_statements_invalid.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {}
+    fun t0() {
+        ({ let x = 0; x } : bool);
+        ({ let x = 0; &x } : u64);
+        ({ let y = 0; &mut (y + 1) } : ());
+        ({ let r = { let r = R {}; r }; r } : R);
+        ({ let x = 0; (x, false, false) } : (u64, bool));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.exp
new file mode 100644
index 000000000..9a830bdb6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.exp
@@ -0,0 +1,24 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/borrow_divergent.move:4:13
+  │
+4 │            &break;
+  │             ^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/borrow_divergent.move:11:12
+   │
+11 │         &{ return };
+   │            ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/borrow_divergent.move:18:10
+   │
+18 │         &(if (cond) return else return);
+   │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.move
new file mode 100644
index 000000000..63f053ac9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_divergent.move
@@ -0,0 +1,20 @@
+script {
+    fun main1() {
+        loop {
+           &break;
+        }
+    }
+}
+
+script {
+    fun main2() {
+        &{ return };
+    }
+}
+
+
+script {
+    fun main3(cond: bool) {
+        &(if (cond) return else return);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field.move
new file mode 100644
index 000000000..3bfa89d41
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun t0(s: &S, s_mut: &mut S, s_mut2: &mut S): (&u64, &u64, &mut u64) {
+        (&s.f, &s_mut.f, &mut s_mut2.f)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain.move
new file mode 100644
index 000000000..362624afd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct X1 { x2: X2 }
+    struct X2 { x3: X3 }
+    struct X3 { f: u64, }
+
+    fun t0(x1: &X1, x1_mut: &mut X1) {
+        (&x1.x2: &X2);
+        (&x1.x2.x3: &X3);
+        (&x1.x2.x3.f: &u64);
+
+        (&x1_mut.x2: &X2);
+        (&x1_mut.x2.x3: &X3);
+        (&x1_mut.x2.x3.f: &u64);
+
+        (&mut x1_mut.x2: &mut X2);
+        (&mut x1_mut.x2.x3: &mut X3);
+        (&mut x1_mut.x2.x3.f: &mut u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.exp
new file mode 100644
index 000000000..1f2762725
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.exp
@@ -0,0 +1,54 @@
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/borrow_field_chain_missing.move:7:10
+  │
+7 │         &x1.f;
+  │          ^^^^ Unbound field 'f' in '0x8675309::M::X1'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/borrow_field_chain_missing.move:8:10
+  │
+8 │         &x1.x2.f;
+  │          ^^^^^^^ Unbound field 'f' in '0x8675309::M::X2'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/borrow_field_chain_missing.move:9:10
+  │
+9 │         &x1.x2.x3.g;
+  │          ^^^^^^^^^^ Unbound field 'g' in '0x8675309::M::X3'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:11:10
+   │
+11 │         &x1_mut.f;
+   │          ^^^^^^^^ Unbound field 'f' in '0x8675309::M::X1'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:12:10
+   │
+12 │         &x1_mut.x2.f;
+   │          ^^^^^^^^^^^ Unbound field 'f' in '0x8675309::M::X2'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:13:10
+   │
+13 │         &x1_mut.x2.x3.g;
+   │          ^^^^^^^^^^^^^^ Unbound field 'g' in '0x8675309::M::X3'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:15:14
+   │
+15 │         &mut x1_mut.f;
+   │              ^^^^^^^^ Unbound field 'f' in '0x8675309::M::X1'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:16:14
+   │
+16 │         &mut x1_mut.x2.f;
+   │              ^^^^^^^^^^^ Unbound field 'f' in '0x8675309::M::X2'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/borrow_field_chain_missing.move:17:14
+   │
+17 │         &mut x1_mut.x2.x3.g;
+   │              ^^^^^^^^^^^^^^ Unbound field 'g' in '0x8675309::M::X3'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.move
new file mode 100644
index 000000000..1467ae805
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_chain_missing.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct X1 { x2: X2 }
+    struct X2 { x3: X3 }
+    struct X3 { f: u64, }
+
+    fun t0(x1: &X1, x1_mut: &mut X1) {
+        &x1.f;
+        &x1.x2.f;
+        &x1.x2.x3.g;
+
+        &x1_mut.f;
+        &x1_mut.x2.f;
+        &x1_mut.x2.x3.g;
+
+        &mut x1_mut.f;
+        &mut x1_mut.x2.f;
+        &mut x1_mut.x2.x3.g;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_complex_root_expr.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_complex_root_expr.move
new file mode 100644
index 000000000..fa3f109b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_complex_root_expr.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(cond: bool, s: &S, s_mut: &mut S) {
+        (&(if (cond) s else s).f: &u64);
+        (&(if (cond) s_mut else s).f: &u64);
+        (&(if (cond) s else s_mut).f: &u64);
+        (&(if (cond) s_mut else s_mut).f: &u64);
+        (&mut (if (cond) s_mut else s_mut).f: &mut u64);
+        (&{ let s = S{f: 0}; &s }.f: &u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.exp
new file mode 100644
index 000000000..6e21652c6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.exp
@@ -0,0 +1,90 @@
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:6:10
+  │
+6 │         &0.f;
+  │          ^^^
+  │          │
+  │          Unbound field 'f'
+  │          Expected a struct type in the current module but got: integer
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:7:10
+  │
+7 │         &0.g;
+  │          ^^^
+  │          │
+  │          Unbound field 'g'
+  │          Expected a struct type in the current module but got: integer
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:8:10
+  │
+5 │     fun t0(u: u64, cond: bool, addr: address) {
+  │               --- Expected a struct type in the current module but got: 'u64'
+  ·
+8 │         &u.value;
+  │          ^^^^^^^ Unbound field 'value'
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:9:10
+  │
+5 │     fun t0(u: u64, cond: bool, addr: address) {
+  │                          ---- Expected a struct type in the current module but got: 'bool'
+  ·
+9 │         &cond.value;
+  │          ^^^^^^^^^^ Unbound field 'value'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:10:10
+   │
+ 5 │     fun t0(u: u64, cond: bool, addr: address) {
+   │                                      ------- Expected a struct type in the current module but got: 'address'
+   ·
+10 │         &addr.R;
+   │          ^^^^^^ Unbound field 'R'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:11:10
+   │
+ 5 │     fun t0(u: u64, cond: bool, addr: address) {
+   │                                      ------- Expected a struct type in the current module but got: 'address'
+   ·
+11 │         &addr.f;
+   │          ^^^^^^ Unbound field 'f'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:12:10
+   │
+12 │         &().R;
+   │          ^^
+   │          │
+   │          Invalid dot access
+   │          Expected a single type, but found expression list type: '()'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:12:10
+   │
+12 │         &().R;
+   │          ^^^^
+   │          │
+   │          Unbound field 'R'
+   │          Expected a struct type in the current module but got: '()'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:13:10
+   │
+13 │         &(&S{f: 0}, &S{f:0}).f;
+   │          ^^^^^^^^^^^^^^^^^^^
+   │          │
+   │          Invalid dot access
+   │          Expected a single type, but found expression list type: '(&0x8675309::M::S, &0x8675309::M::S)'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/borrow_field_from_non_struct.move:13:10
+   │
+13 │         &(&S{f: 0}, &S{f:0}).f;
+   │          ^^^^^^^^^^^^^^^^^^^^^
+   │          │
+   │          Unbound field 'f'
+   │          Expected a struct type in the current module but got: '(&0x8675309::M::S, &0x8675309::M::S)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.move
new file mode 100644
index 000000000..d5fc33c11
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_from_non_struct.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    struct R {}
+
+    fun t0(u: u64, cond: bool, addr: address) {
+        &0.f;
+        &0.g;
+        &u.value;
+        &cond.value;
+        &addr.R;
+        &addr.f;
+        &().R;
+        &(&S{f: 0}, &S{f:0}).f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.exp
new file mode 100644
index 000000000..daa1e57c0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.exp
@@ -0,0 +1,12 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/borrow_field_internal.move:13:11
+   │
+13 │         (&X::s().f: &u64);
+   │           ^^^^^^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/borrow_field_internal.move:15:11
+   │
+15 │         (&s.f: &u64);
+   │           ^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.move
new file mode 100644
index 000000000..a7d0f6a5e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_internal.move
@@ -0,0 +1,20 @@
+address 0x2 {
+
+module X {
+    struct S { f: u64 }
+    public fun s(): S {
+        S { f: 0 }
+    }
+}
+
+module M {
+    use 0x2::X;
+    fun t0() {
+        (&X::s().f: &u64);
+        let s = &X::s();
+        (&s.f: &u64);
+        abort 0
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.exp
new file mode 100644
index 000000000..596f16255
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.exp
@@ -0,0 +1,12 @@
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/borrow_field_missing.move:5:10
+  │
+5 │         &s.g;
+  │          ^^^ Unbound field 'g' in '0x8675309::M::S'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/borrow_field_missing.move:6:10
+  │
+6 │         &s_mut.h;
+  │          ^^^^^^^ Unbound field 'h' in '0x8675309::M::S'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.move
new file mode 100644
index 000000000..e5c94e3d6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_missing.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun t0(s: &S, s_mut: &mut S) {
+        &s.g;
+        &s_mut.h;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.exp
new file mode 100644
index 000000000..719d6d6a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/borrow_field_non_ref_non_local_root.move:9:22
+   │
+ 2 │     struct S has drop { f: u64 }
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+ 9 │         (&(if (cond) *foo() else bar()).f : &u64);
+   │                      ^^^^^^ Invalid dereference. Dereference requires the 'copy' ability
+   ·
+12 │     fun foo(): &S {
+   │                 - The type '0x8675309::M::S' does not have the ability 'copy'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.move
new file mode 100644
index 000000000..104ea386b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_non_local_root.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(cond: bool, _s: S) {
+        (&foo().f: &u64);
+        (&bar().f: &u64);
+        (&mut bar().f: &mut u64);
+        (&(if (cond) foo() else &bar()).f : &u64);
+        (&(if (cond) *foo() else bar()).f : &u64);
+    }
+
+    fun foo(): &S {
+        abort 0
+    }
+
+    fun bar(): S {
+        S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_root.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_root.move
new file mode 100644
index 000000000..a2622e717
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_field_non_ref_root.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(cond: bool, s: S) {
+        (&s.f: &u64);
+        (&mut s.f: &mut u64);
+        (&(if (cond) S { f: 0 } else S { f: 1 }).f : &u64);
+        (&mut (if (cond) S { f: 0 } else S { f: 1 }).f : &mut u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local.move
new file mode 100644
index 000000000..e9f7c26ce
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct S has drop {}
+    struct R {}
+
+    fun t0(b: bool, u: u64, s: S, r: R): R {
+        (&b : &bool);
+        (&mut b : &mut bool);
+        (&u : &u64);
+        (&mut u : &mut u64);
+        (&s : &S);
+        (&mut s : &mut S);
+        (&r: &R);
+        (&mut r: &mut R);
+        r
+    }
+
+    fun t1(): R {
+        let b = true;
+        let u = 0;
+        let s = S {};
+        let r = R {};
+
+        (&b : &bool);
+        (&mut b : &mut bool);
+        (&u : &u64);
+        (&mut u : &mut u64);
+        (&s : &S);
+        (&mut s : &mut S);
+        (&r: &R);
+        (&mut r: &mut R);
+        r
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.exp
new file mode 100644
index 000000000..ad4064fda
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.exp
@@ -0,0 +1,35 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_invalid.move:3:9
+  │
+2 │     fun t0(r: &u64, r_mut: &mut u64) {
+  │               ---- Expected a single non-reference type, but found: '&u64'
+3 │         &r;
+  │         ^^ Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_invalid.move:4:9
+  │
+2 │     fun t0(r: &u64, r_mut: &mut u64) {
+  │                            -------- Expected a single non-reference type, but found: '&mut u64'
+3 │         &r;
+4 │         &r_mut;
+  │         ^^^^^^ Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_invalid.move:5:9
+  │
+2 │     fun t0(r: &u64, r_mut: &mut u64) {
+  │               ---- Expected a single non-reference type, but found: '&u64'
+  ·
+5 │         &mut r;
+  │         ^^^^^^ Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_invalid.move:6:9
+  │
+2 │     fun t0(r: &u64, r_mut: &mut u64) {
+  │                            -------- Expected a single non-reference type, but found: '&mut u64'
+  ·
+6 │         &mut r_mut;
+  │         ^^^^^^^^^^ Invalid borrow
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.move
new file mode 100644
index 000000000..84750cc42
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_invalid.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    fun t0(r: &u64, r_mut: &mut u64) {
+        &r;
+        &r_mut;
+        &mut r;
+        &mut r_mut;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp.move
new file mode 100644
index 000000000..52adb654a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S has drop {}
+    struct R {}
+
+    fun t0() {
+        (&true : &bool);
+        (&mut false : &mut bool);
+        (&0 : &u64);
+        (&mut 1 : &mut u64);
+        (&S {} : &S);
+        (&mut S{} : &mut S);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.exp
new file mode 100644
index 000000000..5e7f85033
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.exp
@@ -0,0 +1,63 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:3:9
+  │
+3 │         &();
+  │         ^^^
+  │         ││
+  │         │Expected a single non-reference type, but found: '()'
+  │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:4:9
+  │
+4 │         &(0, 1);
+  │         ^^^^^^^
+  │         ││
+  │         │Expected a single non-reference type, but found: '(u64, u64)'
+  │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:5:9
+  │
+5 │         &(0, 1, true, @0x0);
+  │         ^^^^^^^^^^^^^^^^^^^
+  │         ││
+  │         │Expected a single non-reference type, but found: '(u64, u64, bool, address)'
+  │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:9:9
+  │
+9 │         &(&0);
+  │         ^^^^^
+  │         ││
+  │         │Expected a single non-reference type, but found: '&u64'
+  │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:10:9
+   │
+10 │         &(&mut 1);
+   │         ^^^^^^^^^
+   │         ││
+   │         │Expected a single non-reference type, but found: '&mut u64'
+   │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:11:9
+   │
+11 │         &mut &2;
+   │         ^^^^^^^
+   │         │    │
+   │         │    Expected a single non-reference type, but found: '&u64'
+   │         Invalid borrow
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/borrow_local_temp_invalid.move:12:9
+   │
+12 │         &mut &mut 3;
+   │         ^^^^^^^^^^^
+   │         │    │
+   │         │    Expected a single non-reference type, but found: '&mut u64'
+   │         Invalid borrow
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.move
new file mode 100644
index 000000000..cd367d462
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_invalid.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    fun t0() {
+        &();
+        &(0, 1);
+        &(0, 1, true, @0x0);
+    }
+
+    fun t1() {
+        &(&0);
+        &(&mut 1);
+        &mut &2;
+        &mut &mut 3;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.exp
new file mode 100644
index 000000000..4634b047a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.exp
@@ -0,0 +1,26 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/typing/borrow_local_temp_resource.move:7:17
+  │
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+6 │         &R{};
+  │          ---
+  │          │
+  │          The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+  │          The type '0x8675309::M::R' does not have the ability 'drop'
+7 │         &mut R{};
+  │                 ^ Invalid return
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/typing/borrow_local_temp_resource.move:7:17
+  │
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+7 │         &mut R{};
+  │              ---^ Invalid return
+  │              │   
+  │              The value is created but not used. The value does not have the 'drop' ability and must be consumed before the function returns
+  │              The type '0x8675309::M::R' does not have the ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.move
new file mode 100644
index 000000000..5030ca27d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/borrow_local_temp_resource.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct S {}
+    struct R {}
+
+    fun t0() {
+        &R{};
+        &mut R{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.exp
new file mode 100644
index 000000000..364e3cbc3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/break_any_type.move:6:17
+  │
+6 │             0 + break;
+  │                 ^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/break_any_type.move:12:17
+   │
+12 │             foo(break)
+   │                 ^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.move
new file mode 100644
index 000000000..6e1a4f218
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/break_any_type.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct Coin {}
+
+    fun t0() {
+        while (true) {
+            0 + break;
+        }
+    }
+
+    fun t1() {
+        while (true) {
+            foo(break)
+        }
+    }
+
+
+    fun foo(c: Coin) {
+        Coin {} = c;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.exp
new file mode 100644
index 000000000..3de5cf1da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.exp
@@ -0,0 +1,18 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/typing/break_outside_loop.move:6:9
+  │
+6 │         break
+  │         ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
+error[E04014]: invalid loop control
+   ┌─ tests/move_check/typing/break_outside_loop.move:10:9
+   │
+10 │         break;
+   │         ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
+error[E04014]: invalid loop control
+   ┌─ tests/move_check/typing/break_outside_loop.move:14:21
+   │
+14 │         if (x >= 5) break;
+   │                     ^^^^^ Invalid usage of 'break'. 'break' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.move b/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.move
new file mode 100644
index 000000000..6fedb187e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/break_outside_loop.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    fun foo() {
+        while (true) {
+            break
+        };
+        break
+    }
+
+    fun bar() {
+        break;
+    }
+
+    fun baz(x: u64): u64 {
+        if (x >= 5) break;
+        0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/cast.move b/vendors/move/crates/move-compiler/tests/move_check/typing/cast.move
new file mode 100644
index 000000000..6e01e6359
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/cast.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    fun t0(x8: u8, x64: u64, x128: u128) {
+        let _: u8 = (0 as u8);
+        let _: u64 = (0 as u64);
+        let _: u128 = (0 as u128);
+
+        let _: u8 = (x8 as u8);
+        let _: u64 = (x64 as u64);
+        let _: u128 = (x128 as u128);
+
+        let _: u8 = (x64 as u8);
+        let _: u64 = (x128 as u64);
+        let _: u128 = (x8 as u128);
+
+        let _: u8 = (x128 as u8);
+        let _: u64 = (x8 as u64);
+        let _: u128 = (x64 as u128);
+
+        let _: u8 = (340282366920938463463374607431768211455u128 as u8);
+        let _: u64 = (340282366920938463463374607431768211455u128 as u64);
+        let _: u128 = (340282366920938463463374607431768211455u128 as u128);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.exp
new file mode 100644
index 000000000..da00dfbf0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.exp
@@ -0,0 +1,99 @@
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/cast_invalid.move:6:10
+  │
+6 │         (false as u8);
+  │          ^^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/cast_invalid.move:7:10
+  │
+7 │         (true as u128);
+  │          ^^^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+  ┌─ tests/move_check/typing/cast_invalid.move:9:10
+  │
+9 │         (() as u64);
+  │          ^^
+  │          │
+  │          Invalid argument to 'as'
+  │          Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:10:10
+   │
+10 │         ((0, 1) as u8);
+   │          ^^^^^^
+   │          │
+   │          Invalid argument to 'as'
+   │          Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:12:15
+   │
+12 │         (0 as bool);
+   │               ^^^^
+   │               │
+   │               Invalid argument to 'as'
+   │               Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:13:15
+   │
+13 │         (0 as address);
+   │               ^^^^^^^
+   │               │
+   │               Invalid argument to 'as'
+   │               Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:14:21
+   │
+14 │         R{} = (0 as R);
+   │                     ^
+   │                     │
+   │                     Invalid argument to 'as'
+   │                     Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:15:15
+   │
+15 │         (0 as Cup<u8>);
+   │               ^^^^^^^
+   │               │
+   │               Invalid argument to 'as'
+   │               Found: '0x8675309::M::Cup<u8>'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:16:15
+   │
+16 │         (0 as ());
+   │               ^^
+   │               │
+   │               Invalid argument to 'as'
+   │               Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:17:15
+   │
+17 │         (0 as (u64, u8));
+   │               ^^^^^^^^^
+   │               │
+   │               Invalid argument to 'as'
+   │               Found: '(u64, u8)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/typing/cast_invalid.move:19:7
+   │
+19 │         (x"1234" as u64);
+   │          ^^^^^^^
+   │          │
+   │          Invalid argument to 'as'
+   │          Found: 'vector<u8>'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.move
new file mode 100644
index 000000000..904d791a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/cast_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct R {}
+    struct Cup<T> has copy, drop { f: T }
+
+    fun t0() {
+        (false as u8);
+        (true as u128);
+
+        (() as u64);
+        ((0, 1) as u8);
+
+        (0 as bool);
+        (0 as address);
+        R{} = (0 as R);
+        (0 as Cup<u8>);
+        (0 as ());
+        (0 as (u64, u8));
+
+	    (x"1234" as u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.exp
new file mode 100644
index 000000000..f7b6edadc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.exp
@@ -0,0 +1,110 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:15:16
+   │
+14 │         let x = Box<R> { f: R{} };
+   │                 -----------------
+   │                 │   │
+   │                 │   The type '0x42::M::Box<0x42::M::R>' can have the ability 'copy' but the type argument '0x42::M::R' does not have the required ability 'copy'
+   │                 The type '0x42::M::Box<0x42::M::R>' does not have the ability 'copy'
+15 │         ignore(copy x);
+   │                ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:17:16
+   │
+16 │         let x = Box<Box<R>> { f: Box { f: R{} } };
+   │                 ---------------------------------
+   │                 │   │
+   │                 │   The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' can have the ability 'copy' but the type argument '0x42::M::Box<0x42::M::R>' does not have the required ability 'copy'
+   │                 The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' does not have the ability 'copy'
+17 │         ignore(copy x);
+   │                ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:19:16
+   │
+18 │         let x = Box<T> { f: t1 };
+   │                 ----------------
+   │                 │   │
+   │                 │   The type '0x42::M::Box<T>' can have the ability 'copy' but the type argument 'T' does not have the required ability 'copy'
+   │                 The type '0x42::M::Box<T>' does not have the ability 'copy'
+19 │         ignore(copy x);
+   │                ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:21:16
+   │
+20 │         let x = Box<Box<T>> { f: Box { f: t2 } };
+   │                 --------------------------------
+   │                 │   │
+   │                 │   The type '0x42::M::Box<0x42::M::Box<T>>' can have the ability 'copy' but the type argument '0x42::M::Box<T>' does not have the required ability 'copy'
+   │                 The type '0x42::M::Box<0x42::M::Box<T>>' does not have the ability 'copy'
+21 │         ignore(copy x);
+   │                ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:23:16
+   │
+22 │         let x = Pair<S, R> { f1: S{}, f2: R{} };
+   │                 -------------------------------
+   │                 │       │
+   │                 │       The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' can have the ability 'copy' but the type argument '0x42::M::R' does not have the required ability 'copy'
+   │                 The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' does not have the ability 'copy'
+23 │         ignore(copy x);
+   │                ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:27:16
+   │
+26 │         let x = &Box<R> { f: R{} };
+   │                  -----------------
+   │                  │   │
+   │                  │   The type '0x42::M::Box<0x42::M::R>' can have the ability 'copy' but the type argument '0x42::M::R' does not have the required ability 'copy'
+   │                  The type '0x42::M::Box<0x42::M::R>' does not have the ability 'copy'
+27 │         ignore(*x);
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:29:16
+   │
+28 │         let x = &Box<Box<R>> { f: Box { f: R{} } };
+   │                  ---------------------------------
+   │                  │   │
+   │                  │   The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' can have the ability 'copy' but the type argument '0x42::M::Box<0x42::M::R>' does not have the required ability 'copy'
+   │                  The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' does not have the ability 'copy'
+29 │         ignore(*x);
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:31:16
+   │
+30 │         let x = &Box<T> { f: t3 };
+   │                  ----------------
+   │                  │   │
+   │                  │   The type '0x42::M::Box<T>' can have the ability 'copy' but the type argument 'T' does not have the required ability 'copy'
+   │                  The type '0x42::M::Box<T>' does not have the ability 'copy'
+31 │         ignore(*x);
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:33:16
+   │
+32 │         let x = &Box<Box<T>> { f: Box { f: t4 } };
+   │                  --------------------------------
+   │                  │   │
+   │                  │   The type '0x42::M::Box<0x42::M::Box<T>>' can have the ability 'copy' but the type argument '0x42::M::Box<T>' does not have the required ability 'copy'
+   │                  The type '0x42::M::Box<0x42::M::Box<T>>' does not have the ability 'copy'
+33 │         ignore(*x);
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_copy_invalid.move:35:16
+   │
+34 │         let x = &Pair<R, S> { f1: R{}, f2: S{} };
+   │                  -------------------------------
+   │                  │    │
+   │                  │    The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' can have the ability 'copy' but the type argument '0x42::M::R' does not have the required ability 'copy'
+   │                  The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' does not have the ability 'copy'
+35 │         ignore(*x);
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.move
new file mode 100644
index 000000000..00f4a1c9a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_copy_invalid.move
@@ -0,0 +1,40 @@
+address 0x42 {
+module M {
+    struct S has copy, drop, store {}
+    struct R {}
+    struct Box<T> has copy { f: T }
+    struct Pair<T1, T2> has copy { f1: T1, f2: T2}
+
+    fun ignore<T>(_x: T) {
+        abort 0
+    }
+
+    // types that can have copy but the specific instantiation does not
+    fun ex<T>(t1: T, t2: T, t3: T, t4: T) {
+        let x = Box<R> { f: R{} };
+        ignore(copy x);
+        let x = Box<Box<R>> { f: Box { f: R{} } };
+        ignore(copy x);
+        let x = Box<T> { f: t1 };
+        ignore(copy x);
+        let x = Box<Box<T>> { f: Box { f: t2 } };
+        ignore(copy x);
+        let x = Pair<S, R> { f1: S{}, f2: R{} };
+        ignore(copy x);
+
+
+        let x = &Box<R> { f: R{} };
+        ignore(*x);
+        let x = &Box<Box<R>> { f: Box { f: R{} } };
+        ignore(*x);
+        let x = &Box<T> { f: t3 };
+        ignore(*x);
+        let x = &Box<Box<T>> { f: Box { f: t4 } };
+        ignore(*x);
+        let x = &Pair<R, S> { f1: R{}, f2: S{} };
+        ignore(*x);
+
+        abort 0
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.exp
new file mode 100644
index 000000000..19bb6bd67
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.exp
@@ -0,0 +1,160 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:10:9
+   │
+10 │         Box<R> { f: R{} };
+   │         ^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::Box<0x42::M::R>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:11:9
+   │
+11 │         Box<Box<R>> { f: Box { f: R{} } };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' can have the ability 'drop' but the type argument '0x42::M::Box<0x42::M::R>' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:12:9
+   │
+12 │         Box<T> { f: t };
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<T>' can have the ability 'drop' but the type argument 'T' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::Box<T>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:13:9
+   │
+13 │         Box<Box<T>> { f: Box { f: t } };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::Box<T>>' can have the ability 'drop' but the type argument '0x42::M::Box<T>' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::Box<0x42::M::Box<T>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:14:9
+   │
+14 │         Pair<S, R> { f1: S{}, f2: R{} };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │       │
+   │         │       The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::Pair<0x42::M::S, 0x42::M::R>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:15:9
+   │
+15 │         (Pair<S, R> { f1: S{}, f2: R{} }, 0, @0x1);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         ││
+   │         │The type '(0x42::M::Pair<0x42::M::S, 0x42::M::R>, u64, address)' can have the ability 'drop' but the type argument '0x42::M::Pair<0x42::M::S, 0x42::M::R>' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '(0x42::M::Pair<0x42::M::S, 0x42::M::R>, u64, address)' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:17:9
+   │
+17 │         Box<R> { f: R {} } == Box<R> { f: R {} };
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x42::M::Box<0x42::M::R>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:17:31
+   │
+17 │         Box<R> { f: R {} } == Box<R> { f: R {} };
+   │                               ^^^^^^^^^^^^^^^^^^
+   │                               │   │
+   │                               │   The type '0x42::M::Box<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │                               '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                               The type '0x42::M::Box<0x42::M::R>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:18:9
+   │
+18 │         Box<Box<R>> { f: Box { f: R {} } } == Box<Box<R>> { f: Box { f: R {} }};
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' can have the ability 'drop' but the type argument '0x42::M::Box<0x42::M::R>' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:18:47
+   │
+18 │         Box<Box<R>> { f: Box { f: R {} } } == Box<Box<R>> { f: Box { f: R {} }};
+   │                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                                               │   │
+   │                                               │   The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' can have the ability 'drop' but the type argument '0x42::M::Box<0x42::M::R>' does not have the required ability 'drop'
+   │                                               '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                                               The type '0x42::M::Box<0x42::M::Box<0x42::M::R>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:19:9
+   │
+19 │         Box<T> { f: t } == Box<T> { f: t };
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<T>' can have the ability 'drop' but the type argument 'T' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x42::M::Box<T>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:19:28
+   │
+19 │         Box<T> { f: t } == Box<T> { f: t };
+   │                            ^^^^^^^^^^^^^^^
+   │                            │   │
+   │                            │   The type '0x42::M::Box<T>' can have the ability 'drop' but the type argument 'T' does not have the required ability 'drop'
+   │                            '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                            The type '0x42::M::Box<T>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:20:9
+   │
+20 │         Box<Box<T>> { f: Box { f: t } } == Box<Box<T>> { f: Box { f: t} };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   The type '0x42::M::Box<0x42::M::Box<T>>' can have the ability 'drop' but the type argument '0x42::M::Box<T>' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x42::M::Box<0x42::M::Box<T>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:20:44
+   │
+20 │         Box<Box<T>> { f: Box { f: t } } == Box<Box<T>> { f: Box { f: t} };
+   │                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                                            │   │
+   │                                            │   The type '0x42::M::Box<0x42::M::Box<T>>' can have the ability 'drop' but the type argument '0x42::M::Box<T>' does not have the required ability 'drop'
+   │                                            '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                                            The type '0x42::M::Box<0x42::M::Box<T>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:21:9
+   │
+21 │         Pair<R, S> { f1: R{}, f2: S{} } == Pair<R, S> { f1: R{}, f2: S{} };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │    │
+   │         │    The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/conditional_drop_invalid.move:21:44
+   │
+21 │         Pair<R, S> { f1: R{}, f2: S{} } == Pair<R, S> { f1: R{}, f2: S{} };
+   │                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                                            │    │
+   │                                            │    The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │                                            '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                                            The type '0x42::M::Pair<0x42::M::R, 0x42::M::S>' does not have the ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.move
new file mode 100644
index 000000000..322b200b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/conditional_drop_invalid.move
@@ -0,0 +1,24 @@
+address 0x42 {
+module M {
+    struct S has copy, drop, store {}
+    struct R {}
+    struct Box<T> has drop { f: T }
+    struct Pair<T1, T2> has drop { f1: T1, f2: T2 }
+
+    // types that can have drop but the specific instantiation does not
+    fun ex<T: copy>(t: T) {
+        Box<R> { f: R{} };
+        Box<Box<R>> { f: Box { f: R{} } };
+        Box<T> { f: t };
+        Box<Box<T>> { f: Box { f: t } };
+        Pair<S, R> { f1: S{}, f2: R{} };
+        (Pair<S, R> { f1: S{}, f2: R{} }, 0, @0x1);
+
+        Box<R> { f: R {} } == Box<R> { f: R {} };
+        Box<Box<R>> { f: Box { f: R {} } } == Box<Box<R>> { f: Box { f: R {} }};
+        Box<T> { f: t } == Box<T> { f: t };
+        Box<Box<T>> { f: Box { f: t } } == Box<Box<T>> { f: Box { f: t} };
+        Pair<R, S> { f1: R{}, f2: S{} } == Pair<R, S> { f1: R{}, f2: S{} };
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const.move b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const.move
new file mode 100644
index 000000000..cc566b200
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const.move
@@ -0,0 +1,22 @@
+module 0x42::t {
+
+const C_ZERO: u64 = 0;
+const C_ONE: u64 = C_ZERO + 1;
+const C_TWO: u64 = 2;
+const C_VEC: vector<u64> = vector[C_ZERO, C_ONE, C_TWO];
+const C_FIVE: u64 = 5;
+const C_V2: vector<u64> = vector[C_ZERO, C_FIVE];
+
+public fun foo(): u64 {
+    C_ZERO 
+}
+
+public fun bar(): u64 {
+    C_ONE 
+}
+
+public fun baz(): vector<u64> {
+    C_VEC 
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.exp
new file mode 100644
index 000000000..b921c3f6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.exp
@@ -0,0 +1,42 @@
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/typing/const_in_const_circular.move:5:11
+  │
+3 │     const C0: u64 = C1 + 1;
+  │           -- Cyclic constant defined here
+4 │ 
+5 │     const C1: u64 = C2 + 1;
+  │           ^^ Constant definitions form a circular dependency: C1, C0, C2
+6 │     
+7 │     const C2: u64 = C0 + 1;
+  │           -- Cyclic constant defined here
+
+error[E08001]: cannot compute constant value
+  ┌─ tests/move_check/typing/const_in_const_circular.move:9:11
+  │
+9 │     const C3: u64 = C1 + 1;
+  │           ^^ Constant uses constant C1, which has a circular dependency
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/typing/const_in_const_circular.move:13:11
+   │
+13 │     const C5: u64 = C1 + C4;
+   │           ^^ Constant uses constant C1, which has a circular dependency
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/typing/const_in_const_circular.move:15:11
+   │
+15 │     const C6: u64 = C7 + 1;
+   │           ^^ Constant definitions form a circular dependency: C6, C9, C7
+16 │     
+17 │     const C7: u64 = C9 + 1;
+   │           -- Cyclic constant defined here
+   ·
+21 │     const C9: u64 = C6 + C6;
+   │           -- Cyclic constant defined here
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/typing/const_in_const_circular.move:23:11
+   │
+23 │     const C10: u64 = C0 + C6;
+   │           ^^^ Constant uses constant C0, which has a circular dependency
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.move b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.move
new file mode 100644
index 000000000..0003842b2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_circular.move
@@ -0,0 +1,24 @@
+
+module 0x42::circular {
+    const C0: u64 = C1 + 1;
+
+    const C1: u64 = C2 + 1;
+    
+    const C2: u64 = C0 + 1;
+    
+    const C3: u64 = C1 + 1;
+    
+    const C4: u64 = 4;
+    
+    const C5: u64 = C1 + C4;
+    
+    const C6: u64 = C7 + 1;
+    
+    const C7: u64 = C9 + 1;
+    
+    const C8: u64 = C4 + 1;
+    
+    const C9: u64 = C6 + C6;
+    
+    const C10: u64 = C0 + C6;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.exp
new file mode 100644
index 000000000..7731ee0c7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.exp
@@ -0,0 +1,30 @@
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/const_in_const_invalid.move:4:20
+  │
+4 │ const C_ONE: u64 = if (C_ZERO == 0) { 1 } else { 2 };
+  │                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 'if' expressions are not supported in constants
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/const_in_const_invalid.move:13:20
+   │
+ 3 │ const C_ZERO: u64 = 0;
+   │       ------ Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+13 │ const C_ONE: u64 = C_ZERO + 1;
+   │                    ^^^^^^ Invalid access of '0x42::t::C_ZERO'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/const_in_const_invalid.move:14:34
+   │
+ 3 │ const C_ZERO: u64 = 0;
+   │       ------ Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+14 │ const C_V2: vector<u64> = vector[C_ZERO, C_FIVE];
+   │                                  ^^^^^^ Invalid access of '0x42::t::C_ZERO'
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/typing/const_in_const_invalid.move:14:42
+   │
+14 │ const C_V2: vector<u64> = vector[C_ZERO, C_FIVE];
+   │                                          ^^^^^^ Unbound constant 'C_FIVE'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.move
new file mode 100644
index 000000000..ea2d80815
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/const_in_const_invalid.move
@@ -0,0 +1,16 @@
+module 0x42::t {
+
+const C_ZERO: u64 = 0;
+const C_ONE: u64 = if (C_ZERO == 0) { 1 } else { 2 };
+const C_FIVE: u64 = 5;
+
+}
+
+module 0x42::d {
+
+use 0x42::t::C_ZERO;
+
+const C_ONE: u64 = C_ZERO + 1;
+const C_V2: vector<u64> = vector[C_ZERO, C_FIVE];
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_all_valid_types.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_all_valid_types.move
new file mode 100644
index 000000000..6a942539c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_all_valid_types.move
@@ -0,0 +1,39 @@
+address 0x42 {
+module M {
+    const C1: u8 = 0;
+    const C2: u64 = 0;
+    const C3: u128 = 0;
+    const C4: bool = false;
+    const C5: address = @0x0;
+    const C6: vector<u8> = x"0123";
+    const C7: vector<u8> = b"abcd";
+
+    fun t1(): u8 { C1 }
+    fun t2(): u64 { C2 }
+    fun t3(): u128 { C3 }
+    fun t4(): bool { C4 }
+    fun t5(): address { C5 }
+    fun t6(): vector<u8> { C6 }
+    fun t7(): vector<u8> { C7 }
+}
+}
+
+script {
+    const C1: u8 = 0;
+    const C2: u64 = 0;
+    const C3: u128 = 0;
+    const C4: bool = false;
+    const C5: address = @0x0;
+    const C6: vector<u8> = x"0123";
+    const C7: vector<u8> = b"abcd";
+
+    fun t() {
+        (C1: u8);
+        (C2: u64);
+        (C3: u128);
+        (C4: bool);
+        (C5: address);
+        (C6: vector<u8>);
+        (C7: vector<u8>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.exp
new file mode 100644
index 000000000..17652d90e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.exp
@@ -0,0 +1,18 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/typing/constant_allowed_but_not_supported.move:4:9
+  │
+4 │         move x;
+  │         ^^^^^^ Invalid move. Unbound variable 'x'
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/typing/constant_allowed_but_not_supported.move:5:9
+  │
+5 │         copy y;
+  │         ^^^^^^ Invalid copy. Unbound variable 'y'
+
+error[E03009]: unbound variable
+  ┌─ tests/move_check/typing/constant_allowed_but_not_supported.move:6:9
+  │
+6 │         z;
+  │         ^ Invalid variable usage. Unbound variable 'z'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.move
new file mode 100644
index 000000000..37b7b246a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_allowed_but_not_supported.move
@@ -0,0 +1,10 @@
+address 0x42 {
+module M {
+    const C: u64 = {
+        move x;
+        copy y;
+        z;
+        0
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.exp
new file mode 100644
index 000000000..cbafab5dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.exp
@@ -0,0 +1,18 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/constant_internal.move:10:9
+   │
+ 4 │     const C: u64 = 0;
+   │           - Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+10 │         X::C;
+   │         ^^^^ Invalid access of '0x2::X::C'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/constant_internal.move:11:9
+   │
+ 4 │     const C: u64 = 0;
+   │           - Constants are internal to their module, and cannot can be accessed outside of their module
+   ·
+11 │         C;
+   │         ^ Invalid access of '0x2::X::C'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.move
new file mode 100644
index 000000000..76f763a9f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_internal.move
@@ -0,0 +1,15 @@
+address 0x2 {
+
+module X {
+    const C: u64 = 0;
+}
+
+module M {
+    use 0x2::X::{Self, C};
+    fun foo() {
+        X::C;
+        C;
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp
new file mode 100644
index 000000000..399e471cd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp
@@ -0,0 +1,105 @@
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:6:15
+  │
+6 │     const C1: signer = abort 0;
+  │               ^^^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: 'signer'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:6:24
+  │
+6 │     const C1: signer = abort 0;
+  │                        ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:7:15
+  │
+7 │     const C2: S = S{};
+  │               ^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:7:19
+  │
+7 │     const C2: S = S{};
+  │                   ^^^ Structs are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:8:15
+  │
+8 │     const C3: R = R{};
+  │               ^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:8:19
+  │
+8 │     const C3: R = R{};
+  │                   ^^^ Structs are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:9:15
+  │
+9 │     const C4: vector<S> = abort 0;
+  │               ^^^^^^^^^
+  │               │      │
+  │               │      Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+  │               Unpermitted constant type
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_invalid_base_type.move:9:27
+  │
+9 │     const C4: vector<S> = abort 0;
+  │                           ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04012]: invalid type for constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:10:15
+   │
+10 │     const C5: vector<R> = abort 0;
+   │               ^^^^^^^^^
+   │               │      │
+   │               │      Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+   │               Unpermitted constant type
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:10:27
+   │
+10 │     const C5: vector<R> = abort 0;
+   │                           ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04012]: invalid type for constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:11:15
+   │
+11 │     const C6: vector<vector<S>> = abort 0;
+   │               ^^^^^^^^^^^^^^^^^
+   │               │             │
+   │               │             Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+   │               Unpermitted constant type
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:11:35
+   │
+11 │     const C6: vector<vector<S>> = abort 0;
+   │                                   ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04012]: invalid type for constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:12:15
+   │
+12 │     const C7: vector<vector<R>> = abort 0;
+   │               ^^^^^^^^^^^^^^^^^
+   │               │             │
+   │               │             Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+   │               Unpermitted constant type
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_invalid_base_type.move:12:35
+   │
+12 │     const C7: vector<vector<R>> = abort 0;
+   │                                   ^^^^^^^ 'abort' expressions are not supported in constants
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.move
new file mode 100644
index 000000000..c7c388050
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_base_type.move
@@ -0,0 +1,14 @@
+address 0x42 {
+module M {
+    struct S {}
+    struct R {}
+
+    const C1: signer = abort 0;
+    const C2: S = S{};
+    const C3: R = R{};
+    const C4: vector<S> = abort 0;
+    const C5: vector<R> = abort 0;
+    const C6: vector<vector<S>> = abort 0;
+    const C7: vector<vector<R>> = abort 0;
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.exp
new file mode 100644
index 000000000..3bfb1416d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.exp
@@ -0,0 +1,77 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:11:20
+   │
+ 8 │     const C6: vector<u8> = x"0123";
+   │               ---------- Given: 'vector<u8>'
+   ·
+11 │     fun t1(): u8 { C6 }
+   │               --   ^^ Invalid return expression
+   │               │     
+   │               Expected: 'u8'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:12:21
+   │
+ 9 │     const C7: vector<u8> = b"abcd";
+   │               ---------- Given: 'vector<u8>'
+   ·
+12 │     fun t2(): u64 { C7 }
+   │               ---   ^^ Invalid return expression
+   │               │      
+   │               Expected: 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:13:22
+   │
+ 3 │     const C1: u8 = 0;
+   │               -- Given: 'u8'
+   ·
+13 │     fun t3(): u128 { C1 }
+   │               ----   ^^ Invalid return expression
+   │               │       
+   │               Expected: 'u128'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:14:22
+   │
+ 4 │     const C2: u64 = 0;
+   │               --- Given: 'u64'
+   ·
+14 │     fun t4(): bool { C2 }
+   │               ----   ^^ Invalid return expression
+   │               │       
+   │               Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:15:25
+   │
+ 5 │     const C3: u128 = 0;
+   │               ---- Given: 'u128'
+   ·
+15 │     fun t5(): address { C3 }
+   │               -------   ^^ Invalid return expression
+   │               │          
+   │               Expected: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:16:28
+   │
+ 6 │     const C4: bool = false;
+   │               ---- Given: 'bool'
+   ·
+16 │     fun t6(): vector<u8> { C4 }
+   │               ----------   ^^ Invalid return expression
+   │               │             
+   │               Expected: 'vector<u8>'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/constant_invalid_usage.move:17:28
+   │
+ 7 │     const C5: address = @0x0;
+   │               ------- Given: 'address'
+   ·
+17 │     fun t7(): vector<u8> { C5 }
+   │               ----------   ^^ Invalid return expression
+   │               │             
+   │               Expected: 'vector<u8>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.move
new file mode 100644
index 000000000..08f150db3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_invalid_usage.move
@@ -0,0 +1,19 @@
+address 0x42 {
+module M {
+    const C1: u8 = 0;
+    const C2: u64 = 0;
+    const C3: u128 = 0;
+    const C4: bool = false;
+    const C5: address = @0x0;
+    const C6: vector<u8> = x"0123";
+    const C7: vector<u8> = b"abcd";
+
+    fun t1(): u8 { C6 }
+    fun t2(): u64 { C7 }
+    fun t3(): u128 { C1 }
+    fun t4(): bool { C2 }
+    fun t5(): address { C3 }
+    fun t6(): vector<u8> { C4 }
+    fun t7(): vector<u8> { C5 }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.exp
new file mode 100644
index 000000000..dbc957ec7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.exp
@@ -0,0 +1,57 @@
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:3:15
+  │
+3 │     const C1: &u64 = &0;
+  │               ^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '&u64'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:3:22
+  │
+3 │     const C1: &u64 = &0;
+  │                      ^^ References (and reference operations) are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:4:15
+  │
+4 │     const C2: &mut u64 = &0;
+  │               ^^^^^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '&mut u64'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/constant_non_base_type.move:4:15
+  │
+4 │     const C2: &mut u64 = &0;
+  │               ^^^^^^^^   -- Given: '&{integer}'
+  │               │           
+  │               Invalid constant signature
+  │               Expected: '&mut u64'
+
+error[E04013]: invalid statement or expression in constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:4:26
+  │
+4 │     const C2: &mut u64 = &0;
+  │                          ^^ References (and reference operations) are not supported in constants
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:5:15
+  │
+5 │     const C3: () = ();
+  │               ^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '()'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
+error[E04012]: invalid type for constant
+  ┌─ tests/move_check/typing/constant_non_base_type.move:6:15
+  │
+6 │     const C4: (address, bool) = (@0x0, false);
+  │               ^^^^^^^^^^^^^^^
+  │               │
+  │               Unpermitted constant type
+  │               Found: '(_, _)'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.move
new file mode 100644
index 000000000..8198fd261
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_non_base_type.move
@@ -0,0 +1,8 @@
+address 0x42 {
+module M {
+    const C1: &u64 = &0;
+    const C2: &mut u64 = &0;
+    const C3: () = ();
+    const C4: (address, bool) = (@0x0, false);
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_supported_exps.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_supported_exps.move
new file mode 100644
index 000000000..e613d6be4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_supported_exps.move
@@ -0,0 +1,31 @@
+address 0x42 {
+module M {
+    const C: u64 = {
+        ();
+        0;
+        { (); () };
+        !false;
+        false && false;
+        true && true;
+        2 + 1;
+        2 - 1;
+        2 * 1;
+        2 / 1;
+        2 % 1;
+        2 >> 1;
+        2 << 1;
+        2 ^ 1;
+        2 & 1;
+        2 | 1;
+        0x0 == 0x1;
+        b"ab" != x"01";
+        (0 as u8);
+        (0 as u64);
+        (0 as u128);
+        (0: u8);
+        (0, 1);
+        (0, 1, false, @112);
+        0
+    };
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp
new file mode 100644
index 000000000..569a46f02
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.exp
@@ -0,0 +1,234 @@
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:14:9
+   │
+14 │         let x = 0;
+   │         ^^^^^^^^^ 'let' declarations are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:15:9
+   │
+15 │         let s: signer = abort 0;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^ 'let' declarations are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:15:25
+   │
+15 │         let s: signer = abort 0;
+   │                         ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:16:9
+   │
+16 │         let b = B { f: 0 };
+   │         ^^^^^^^^^^^^^^^^^^ 'let' declarations are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:16:17
+   │
+16 │         let b = B { f: 0 };
+   │                 ^^^^^^^^^^ Structs are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:17:9
+   │
+17 │         spec { };
+   │         ^^^^^^^^ Spec blocks are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:18:9
+   │
+18 │         &x;
+   │         ^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:19:9
+   │
+19 │         &mut x;
+   │         ^^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:20:9
+   │
+20 │         f_public();
+   │         ^^^^^^^^^^ Module calls are not supported in constants
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:21:9
+   │
+21 │         f_script();
+   │         ^^^^^^^^ Unbound function 'f_script' in current scope
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:22:9
+   │
+22 │         f_friend();
+   │         ^^^^^^^^^^ Module calls are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:23:9
+   │
+23 │         f_private();
+   │         ^^^^^^^^^^^ Module calls are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:24:9
+   │
+24 │         0x42::X::f_public();
+   │         ^^^^^^^^^^^^^^^^^^^ Module calls are not supported in constants
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:25:9
+   │
+25 │         0x42::X::f_script();
+   │         ^^^^^^^^^^^^^^^^^ Invalid module access. Unbound function 'f_script' in module '0x42::X'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:26:9
+   │
+ 4 │     public(friend) fun f_friend() {}
+   │     -------------- This function can only be called from a 'friend' of module '0x42::X'
+   ·
+26 │         0x42::X::f_friend();
+   │         ^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::X::f_friend'
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:26:9
+   │
+26 │         0x42::X::f_friend();
+   │         ^^^^^^^^^^^^^^^^^^^ Module calls are not supported in constants
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:27:9
+   │
+ 5 │     fun f_private() {}
+   │         --------- This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+27 │         0x42::X::f_private();
+   │         ^^^^^^^^^^^^^^^^^^^^ Invalid call to '0x42::X::f_private'
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:27:9
+   │
+27 │         0x42::X::f_private();
+   │         ^^^^^^^^^^^^^^^^^^^^ Module calls are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:28:9
+   │
+28 │         freeze(&mut x);
+   │         ^^^^^^^^^^^^^^ 'freeze' is not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:28:16
+   │
+28 │         freeze(&mut x);
+   │                ^^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:29:9
+   │
+29 │         assert!(true, 42);
+   │         ^^^^^^^^^^^^^^^^^ 'assert' is not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:30:9
+   │
+30 │         if (true) 0 else 1;
+   │         ^^^^^^^^^^^^^^^^^^ 'if' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:31:9
+   │
+31 │         loop ();
+   │         ^^^^^^^ 'loop' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:32:9
+   │
+32 │         loop { break; continue; };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ 'loop' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:33:9
+   │
+33 │         while (true) ();
+   │         ^^^^^^^^^^^^^^^ 'while' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:34:9
+   │
+34 │         x = 1;
+   │         ^^^^^ Assignments are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:35:9
+   │
+35 │         return 0;
+   │         ^^^^^^^^ 'return' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:36:9
+   │
+36 │         abort 0;
+   │         ^^^^^^^ 'abort' expressions are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:37:9
+   │
+37 │         *(&mut 0) = 0;
+   │         ^^^^^^^^^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:37:10
+   │
+37 │         *(&mut 0) = 0;
+   │          ^^^^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:38:9
+   │
+38 │         b.f = 0;
+   │         ^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:38:9
+   │
+38 │         b.f = 0;
+   │         ^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:38:9
+   │
+38 │         b.f = 0;
+   │         ^^^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:39:9
+   │
+39 │         b.f;
+   │         ^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:39:9
+   │
+39 │         b.f;
+   │         ^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:40:9
+   │
+40 │         *&b.f;
+   │         ^^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:40:10
+   │
+40 │         *&b.f;
+   │          ^^^^ References (and reference operations) are not supported in constants
+
+error[E04013]: invalid statement or expression in constant
+   ┌─ tests/move_check/typing/constant_unsupported_exps.move:40:11
+   │
+40 │         *&b.f;
+   │           ^ References (and reference operations) are not supported in constants
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.move
new file mode 100644
index 000000000..bffbaa1e9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constant_unsupported_exps.move
@@ -0,0 +1,48 @@
+address 0x42 {
+module X {
+    public fun f_public() {}
+    public(friend) fun f_friend() {}
+    fun f_private() {}
+}
+
+module M {
+    struct R has key {}
+    struct B has drop { f: u64 }
+
+    const FLAG: bool = false;
+    const C: u64 = {
+        let x = 0;
+        let s: signer = abort 0;
+        let b = B { f: 0 };
+        spec { };
+        &x;
+        &mut x;
+        f_public();
+        f_script();
+        f_friend();
+        f_private();
+        0x42::X::f_public();
+        0x42::X::f_script();
+        0x42::X::f_friend();
+        0x42::X::f_private();
+        freeze(&mut x);
+        assert!(true, 42);
+        if (true) 0 else 1;
+        loop ();
+        loop { break; continue; };
+        while (true) ();
+        x = 1;
+        return 0;
+        abort 0;
+        *(&mut 0) = 0;
+        b.f = 0;
+        b.f;
+        *&b.f;
+        FLAG;
+        0
+    };
+    public fun f_public() {}
+    public(friend) fun f_friend() {}
+    fun f_private() {}
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp
new file mode 100644
index 000000000..eeb37808c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp
@@ -0,0 +1,81 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:7:30
+  │
+3 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+  ·
+7 │     fun no_constraint<T>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+  │                       -      ^^^^^^^
+  │                       │      │    │
+  │                       │      │    The type 'T' does not have the ability 'copy'
+  │                       │      'copy' constraint not satisifed
+  │                       To satisfy the constraint, the 'copy' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:7:43
+  │
+2 │     struct CupR<T: key> { f: T }
+  │                    --- 'key' constraint declared here
+  ·
+7 │     fun no_constraint<T>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+  │                       -                   ^^^^^^^
+  │                       │                   │    │
+  │                       │                   │    The type 'T' does not have the ability 'key'
+  │                       │                   'key' constraint not satisifed
+  │                       To satisfy the constraint, the 'key' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:9:32
+  │
+3 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+  ·
+9 │     fun t_resource<T: key>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+  │                    -           ^^^^^^^
+  │                    │           │    │
+  │                    │           │    The type 'T' does not have the ability 'copy'
+  │                    │           'copy' constraint not satisifed
+  │                    To satisfy the constraint, the 'copy' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:11:46
+   │
+ 2 │     struct CupR<T: key> { f: T }
+   │                    --- 'key' constraint declared here
+   ·
+11 │     fun t_copyable<T: copy>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+   │                    -                         ^^^^^^^
+   │                    │                         │    │
+   │                    │                         │    The type 'T' does not have the ability 'key'
+   │                    │                         'key' constraint not satisifed
+   │                    To satisfy the constraint, the 'key' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:13:15
+   │
+ 3 │     struct CupC<T: copy> { f: T }
+   │                    ---- 'copy' constraint declared here
+ 4 │     struct R has key {}
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+13 │     fun r(_c: CupC<R>, _r: CupR<R>) { abort 0 }
+   │               ^^^^^^^
+   │               │    │
+   │               │    The type '0x8675309::M::R' does not have the ability 'copy'
+   │               'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:15:28
+   │
+ 2 │     struct CupR<T: key> { f: T }
+   │                    --- 'key' constraint declared here
+   ·
+ 5 │     struct C has copy {}
+   │            - To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+15 │     fun c(_c: CupC<C>, _r: CupR<C>) { abort 0 }
+   │                            ^^^^^^^
+   │                            │    │
+   │                            │    The type '0x8675309::M::C' does not have the ability 'key'
+   │                            'key' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.move
new file mode 100644
index 000000000..88707815f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct CupR<T: key> { f: T }
+    struct CupC<T: copy> { f: T }
+    struct R has key {}
+    struct C has copy {}
+
+    fun no_constraint<T>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+
+    fun t_resource<T: key>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+
+    fun t_copyable<T: copy>(_c: CupC<T>, _r: CupR<T>) { abort 0 }
+
+    fun r(_c: CupC<R>, _r: CupR<R>) { abort 0 }
+
+    fun c(_c: CupC<C>, _r: CupR<C>) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp
new file mode 100644
index 000000000..764660a69
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp
@@ -0,0 +1,14 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_function_parameter.move:5:17
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+4 │ 
+5 │     fun foo(_x: CupC<R>) { abort 0 }
+  │                 ^^^^^^^
+  │                 │    │
+  │                 │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │                 'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.move
new file mode 100644
index 000000000..e3ce5f044
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    fun foo(_x: CupC<R>) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp
new file mode 100644
index 000000000..7ccbfef40
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp
@@ -0,0 +1,14 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_function_return_type.move:5:17
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+4 │ 
+5 │     fun foo():  CupC<R> {
+  │                 ^^^^^^^
+  │                 │    │
+  │                 │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │                 'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.move
new file mode 100644
index 000000000..d3198f4c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    fun foo():  CupC<R> {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp
new file mode 100644
index 000000000..0ab029eb2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp
@@ -0,0 +1,22 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move:6:17
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+6 │         let _x: CupC<R> = abort 0;
+  │                 ^^^^^^^
+  │                 │    │
+  │                 │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │                 'copy' constraint not satisifed
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move:6:27
+  │
+6 │         let _x: CupC<R> = abort 0;
+  │                           ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move
new file mode 100644
index 000000000..77d8a9d5f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    fun foo() {
+        let _x: CupC<R> = abort 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp
new file mode 100644
index 000000000..c524b45d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp
@@ -0,0 +1,14 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.move:6:17
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+6 │         let _x: CupC<R>;
+  │                 ^^^^^^^
+  │                 │    │
+  │                 │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │                 'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.move
new file mode 100644
index 000000000..131efca76
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    fun foo() {
+        let _x: CupC<R>;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp
new file mode 100644
index 000000000..ec60bc7e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp
@@ -0,0 +1,44 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move:8:15
+  │
+2 │     struct CupC<phantom T: copy> {}
+  │                            ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+8 │         let B<CupC<R>> {} = abort 0;
+  │               ^^^^^^^
+  │               │    │
+  │               │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │               'copy' constraint not satisifed
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move:8:29
+  │
+8 │         let B<CupC<R>> {} = abort 0;
+  │                             ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move:9:11
+  │
+2 │     struct CupC<phantom T: copy> {}
+  │                            ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+9 │         B<CupC<R>> {} = abort 0;
+  │           ^^^^^^^
+  │           │    │
+  │           │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │           'copy' constraint not satisifed
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move:9:25
+  │
+9 │         B<CupC<R>> {} = abort 0;
+  │                         ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move
new file mode 100644
index 000000000..2e5b4e4a7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct CupC<phantom T: copy> {}
+    struct R {}
+
+    struct B<phantom T>{}
+
+    fun foo() {
+        let B<CupC<R>> {} = abort 0;
+        B<CupC<R>> {} = abort 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp
new file mode 100644
index 000000000..dea7b7bd6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp
@@ -0,0 +1,14 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_struct_field.move:6:12
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+6 │         f: CupC<R>,
+  │            ^^^^^^^
+  │            │    │
+  │            │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │            'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.move
new file mode 100644
index 000000000..0acb131d9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    struct B {
+        f: CupC<R>,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp
new file mode 100644
index 000000000..3bb1502cb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp
@@ -0,0 +1,23 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_annotation.move:7:17
+  │
+7 │         ignore((abort 0: CupC<R>));
+  │                 ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_annotation.move:7:26
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct C {}
+4 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+7 │         ignore((abort 0: CupC<R>));
+  │                          ^^^^^^^
+  │                          │    │
+  │                          │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │                          'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.move
new file mode 100644
index 000000000..b088cc493
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct C {}
+    struct R {}
+
+    fun foo() {
+        ignore((abort 0: CupC<R>));
+    }
+
+    fun ignore<T>(_x: T) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp
new file mode 100644
index 000000000..c0c475af8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp
@@ -0,0 +1,14 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.move:9:13
+  │
+2 │     struct CupC<T: copy> { f: T }
+  │                    ---- 'copy' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+9 │         box<CupC<R>>();
+  │             ^^^^^^^
+  │             │    │
+  │             │    The type '0x8675309::M::R' does not have the ability 'copy'
+  │             'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.move
new file mode 100644
index 000000000..5e48a0ef4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct CupC<T: copy> { f: T }
+    struct R {}
+
+    fun box<T>() {
+    }
+
+    fun foo() {
+        box<CupC<R>>();
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp
new file mode 100644
index 000000000..d708381ea
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp
@@ -0,0 +1,42 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move:8:9
+  │
+8 │         Box<CupD<R>>{ f: abort 0 };
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type '0x8675309::M::Box<0x8675309::M::CupD<0x8675309::M::R>>' can have the ability 'drop' but the type argument '0x8675309::M::CupD<0x8675309::M::R>' does not have the required ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '0x8675309::M::Box<0x8675309::M::CupD<0x8675309::M::R>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move:8:13
+  │
+2 │     struct CupD<T: drop> has drop { f: T }
+  │                    ---- 'drop' constraint declared here
+3 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+8 │         Box<CupD<R>>{ f: abort 0 };
+  │             ^^^^^^^
+  │             │    │
+  │             │    The type '0x8675309::M::R' does not have the ability 'drop'
+  │             'drop' constraint not satisifed
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move:8:26
+  │
+8 │         Box<CupD<R>>{ f: abort 0 };
+  │                          ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move:9:9
+  │
+9 │         Box<R>{ f: R{} };
+  │         ^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type '0x8675309::M::Box<0x8675309::M::R>' can have the ability 'drop' but the type argument '0x8675309::M::R' does not have the required ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '0x8675309::M::Box<0x8675309::M::R>' does not have the ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move
new file mode 100644
index 000000000..1f814e806
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct CupD<T: drop> has drop { f: T }
+    struct R {}
+
+    struct Box<T> has drop { f: T }
+
+    fun foo() {
+        Box<CupD<R>>{ f: abort 0 };
+        Box<R>{ f: R{} };
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.exp
new file mode 100644
index 000000000..dd7bad852
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/continue_any_type.move:6:17
+  │
+6 │             0 + continue;
+  │                 ^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/continue_any_type.move:12:17
+   │
+12 │             foo(continue)
+   │                 ^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.move
new file mode 100644
index 000000000..992b37b70
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_any_type.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct Coin {}
+
+    fun t0() {
+        while (true) {
+            0 + continue;
+        }
+    }
+
+    fun t1() {
+        while (true) {
+            foo(continue)
+        }
+    }
+
+
+    fun foo(c: Coin) {
+        Coin {} = c;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.exp
new file mode 100644
index 000000000..189f79703
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.exp
@@ -0,0 +1,6 @@
+error[E04014]: invalid loop control
+  ┌─ tests/move_check/typing/continue_outside_loop.move:6:9
+  │
+6 │         continue
+  │         ^^^^^^^^ Invalid usage of 'continue'. 'continue' can only be used inside a loop body
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.move b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.move
new file mode 100644
index 000000000..c86051979
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/continue_outside_loop.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    fun foo() {
+        while (true) {
+            continue
+        };
+        continue
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/decl_unpack_references.move b/vendors/move/crates/move-compiler/tests/move_check/typing/decl_unpack_references.move
new file mode 100644
index 000000000..cc0a8d5f2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/decl_unpack_references.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct R { s1: S, s2: S }
+
+    fun t0() {
+        let R { s1: S { f }, s2 }: R;
+        f = 0; f;
+        s2 = S { f: 0 }; s2;
+    }
+
+    fun t1() {
+        let R { s1: S { f }, s2 }: &R;
+        f = &0; f;
+        s2 = &S { f: 0 }; s2;
+    }
+
+    fun t2() {
+        let R { s1: S { f }, s2 }: &mut R;
+        f = &mut 0; f;
+        s2 = &mut S { f: 0 }; s2;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.exp
new file mode 100644
index 000000000..85d3b1df0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.exp
@@ -0,0 +1,48 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:5:14
+  │
+5 │         let (x, x);
+  │              ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:5:17
+  │
+5 │         let (x, x);
+  │              -  ^ Duplicate declaration for local 'x' in a given 'let'
+  │              │   
+  │              Previously declared here
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:6:14
+  │
+6 │         let (f, R{f}, f);
+  │              ^ Unused local variable 'f'. Consider removing or prefixing with an underscore: '_f'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:6:19
+  │
+6 │         let (f, R{f}, f);
+  │              -    ^ Duplicate declaration for local 'f' in a given 'let'
+  │              │     
+  │              Previously declared here
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:6:19
+  │
+6 │         let (f, R{f}, f);
+  │                   ^ Unused local variable 'f'. Consider removing or prefixing with an underscore: '_f'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/declare_duplicate_binding.move:6:23
+  │
+6 │         let (f, R{f}, f);
+  │              -        ^ Duplicate declaration for local 'f' in a given 'let'
+  │              │         
+  │              Previously declared here
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.move b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.move
new file mode 100644
index 000000000..18d4d758e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_duplicate_binding.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let (x, x);
+        let (f, R{f}, f);
+        x = 0; x;
+        f = 0; f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.exp
new file mode 100644
index 000000000..9c7c29fe4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.exp
@@ -0,0 +1,33 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/declare_pop_resource.move:5:13
+  │
+2 │     struct R {f: u64}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         let _: R;
+  │             ^  - The type '0x8675309::M::R' does not have the ability 'drop'
+  │             │   
+  │             Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/declare_pop_resource.move:9:14
+  │
+2 │     struct R {f: u64}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+9 │         let (_, _):(R, R);
+  │              ^      - The type '0x8675309::M::R' does not have the ability 'drop'
+  │              │       
+  │              Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/declare_pop_resource.move:9:17
+  │
+2 │     struct R {f: u64}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+9 │         let (_, _):(R, R);
+  │                 ^      - The type '0x8675309::M::R' does not have the ability 'drop'
+  │                 │       
+  │                 Cannot ignore values without the 'drop' ability. The value must be used
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.move
new file mode 100644
index 000000000..006107318
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_pop_resource.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let _: R;
+        // the following is an invalid binding too but its error message will
+        // not show because the compilation fails early at the typing phase
+        let _r: R;
+        let (_, _):(R, R);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.exp
new file mode 100644
index 000000000..ce5f5f46b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.exp
@@ -0,0 +1,32 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_with_type_annot.move:6:13
+  │
+6 │         let x: u64;
+  │             ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_with_type_annot.move:7:14
+  │
+7 │         let (x, b, R{f}): (u64, bool, R);
+  │              ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_with_type_annot.move:7:17
+  │
+7 │         let (x, b, R{f}): (u64, bool, R);
+  │                 ^ Unused local variable 'b'. Consider removing or prefixing with an underscore: '_b'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/declare_with_type_annot.move:7:22
+  │
+7 │         let (x, b, R{f}): (u64, bool, R);
+  │                      ^ Unused local variable 'f'. Consider removing or prefixing with an underscore: '_f'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.move b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.move
new file mode 100644
index 000000000..e989bd146
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_with_type_annot.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let (): ();
+        let x: u64;
+        let (x, b, R{f}): (u64, bool, R);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.exp
new file mode 100644
index 000000000..92d7ba0ec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.exp
@@ -0,0 +1,35 @@
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/declare_wrong_arity.move:5:13
+  │
+5 │         let _x: ();
+  │             ^^  -- Expected a single type, but found expression list type: '()'
+  │             │    
+  │             Invalid type for local
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/declare_wrong_arity.move:6:13
+  │
+6 │         let (): u64;
+  │             ^^  --- Given: 'u64'
+  │             │    
+  │             Invalid value for binding
+  │             Expected: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/declare_wrong_arity.move:7:13
+  │
+7 │         let (x, b, R{f}): (u64, bool, R, R); x; b; f;
+  │             ^^^^^^^^^^^^  ----------------- Given expression list of length 4: '(u64, bool, 0x8675309::M::R, 0x8675309::M::R)'
+  │             │              
+  │             Invalid value for binding
+  │             Expected expression list of length 3: '(_, _, _)'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/declare_wrong_arity.move:8:13
+  │
+8 │         let (x, b, R{f}): (u64, bool); x; b; f;
+  │             ^^^^^^^^^^^^  ----------- Given expression list of length 2: '(u64, bool)'
+  │             │              
+  │             Invalid value for binding
+  │             Expected expression list of length 3: '(_, _, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.move b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.move
new file mode 100644
index 000000000..ffa8209be
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_arity.move
@@ -0,0 +1,10 @@
+module 0x8675309::M {
+    struct R {f: u64}
+
+    fun t0() {
+        let _x: ();
+        let (): u64;
+        let (x, b, R{f}): (u64, bool, R, R); x; b; f;
+        let (x, b, R{f}): (u64, bool); x; b; f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.exp
new file mode 100644
index 000000000..771a28fe3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.exp
@@ -0,0 +1,18 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/declare_wrong_type.move:6:13
+  │
+6 │         let S { g } : R; g = 0;
+  │             ^^^^^^^   - Expected: '0x8675309::M::R'
+  │             │          
+  │             Invalid deconstruction binding
+  │             Given: '0x8675309::M::S'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/declare_wrong_type.move:7:14
+  │
+7 │         let (S { g }, R { f }): (R, R);
+  │              ^^^^^^^             - Expected: '0x8675309::M::R'
+  │              │                    
+  │              Invalid deconstruction binding
+  │              Given: '0x8675309::M::S'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.move
new file mode 100644
index 000000000..12275aae2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/declare_wrong_type.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct R {f: u64}
+    struct S { g: u64 }
+
+    fun t0() {
+        let S { g } : R; g = 0;
+        let (S { g }, R { f }): (R, R);
+        g = 0;
+        f = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence.move b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence.move
new file mode 100644
index 000000000..74e193517
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct X has copy, drop {}
+    struct S has copy, drop { f: u64, x: X }
+
+    fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+        (*x : u64);
+        (*x_mut: u64);
+
+        (*s: S);
+        (*&s.f: u64);
+        (s.f: u64);
+        (*&s.x: X);
+
+        (*s_mut: S);
+        (*&s_mut.f: u64);
+        (*&mut s_mut.f: u64);
+        (s_mut.f: u64);
+        (*&s_mut.x: X);
+        (*&mut s_mut.x: X);
+
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.exp
new file mode 100644
index 000000000..cea8ee304
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.exp
@@ -0,0 +1,143 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/derefrence_invalid.move:6:15
+  │
+5 │     fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+  │                --- Given: 'u64'
+6 │         (*x : bool);
+  │               ^^^^
+  │               │
+  │               Invalid type annotation
+  │               Expected: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/derefrence_invalid.move:7:18
+  │
+5 │     fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+  │                                 --- Given: 'u64'
+6 │         (*x : bool);
+7 │         (*x_mut: &u64);
+  │                  ^^^^
+  │                  │
+  │                  Invalid type annotation
+  │                  Expected: '&u64'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/derefrence_invalid.move:9:14
+  │
+5 │     fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+  │                                          - Given: '0x8675309::M::S'
+  ·
+9 │         (*s: X);
+  │              ^
+  │              │
+  │              Invalid type annotation
+  │              Expected: '0x8675309::M::X'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:10:17
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                  --- Given: 'u64'
+   ·
+10 │         (*&s.f: bool);
+   │                 ^^^^
+   │                 │
+   │                 Invalid type annotation
+   │                 Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:11:15
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                  --- Given: 'u64'
+   ·
+11 │         (s.f: &u64);
+   │               ^^^^
+   │               │
+   │               Invalid type annotation
+   │               Expected: '&u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:12:17
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                          - Given: '0x8675309::M::X'
+   ·
+12 │         (*&s.x: &X);
+   │                 ^^
+   │                 │
+   │                 Invalid type annotation
+   │                 Expected: '&0x8675309::M::X'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:14:18
+   │
+ 5 │     fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+   │                                                         - Given: '0x8675309::M::S'
+   ·
+14 │         (*s_mut: X);
+   │                  ^
+   │                  │
+   │                  Invalid type annotation
+   │                  Expected: '0x8675309::M::X'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:15:21
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                  --- Given: 'u64'
+   ·
+15 │         (*&s_mut.f: bool);
+   │                     ^^^^
+   │                     │
+   │                     Invalid type annotation
+   │                     Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:16:25
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                  --- Given: 'u64'
+   ·
+16 │         (*&mut s_mut.f: (bool, u64));
+   │                         ^^^^^^^^^^^
+   │                         │
+   │                         Invalid type annotation
+   │                         Expected: '(bool, u64)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:17:19
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                  --- Given: 'u64'
+   ·
+17 │         (s_mut.f: &u64);
+   │                   ^^^^
+   │                   │
+   │                   Invalid type annotation
+   │                   Expected: '&u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:18:21
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                          - Given: '0x8675309::M::X'
+   ·
+18 │         (*&s_mut.x: (X, S));
+   │                     ^^^^^^
+   │                     │
+   │                     Invalid type annotation
+   │                     Expected: '(0x8675309::M::X, 0x8675309::M::S)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/derefrence_invalid.move:19:25
+   │
+ 3 │     struct S has copy, drop { f: u64, x: X }
+   │                                          - Given: '0x8675309::M::X'
+   ·
+19 │         (*&mut s_mut.x: ());
+   │                         ^^
+   │                         │
+   │                         Invalid type annotation
+   │                         Expected: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.move
new file mode 100644
index 000000000..ec37f0a93
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct X has copy, drop {}
+    struct S has copy, drop { f: u64, x: X }
+
+    fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){
+        (*x : bool);
+        (*x_mut: &u64);
+
+        (*s: X);
+        (*&s.f: bool);
+        (s.f: &u64);
+        (*&s.x: &X);
+
+        (*s_mut: X);
+        (*&s_mut.f: bool);
+        (*&mut s_mut.f: (bool, u64));
+        (s_mut.f: &u64);
+        (*&s_mut.x: (X, S));
+        (*&mut s_mut.x: ());
+
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.exp
new file mode 100644
index 000000000..027ca6cc6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.exp
@@ -0,0 +1,79 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/derefrence_reference.move:6:16
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+  ·
+5 │     fun t0(r: &R, b: &B) {
+  │                - The type '0x8675309::M::R' does not have the ability 'copy'
+6 │         R {} = *r;
+  │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/derefrence_reference.move:7:24
+  │
+3 │     struct B { r: R }
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+4 │ 
+5 │     fun t0(r: &R, b: &B) {
+  │                       - The type '0x8675309::M::B' does not have the ability 'copy'
+6 │         R {} = *r;
+7 │         B { r: R{} } = *b;
+  │                        ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/derefrence_reference.move:8:15
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+3 │     struct B { r: R }
+  │                   - The type '0x8675309::M::R' does not have the ability 'copy'
+  ·
+8 │         R{} = *&b.r;
+  │               ^^^^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/derefrence_reference.move:12:16
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     fun t1(r: &mut R, b: &mut B) {
+   │                    - The type '0x8675309::M::R' does not have the ability 'copy'
+12 │         R {} = *r;
+   │                ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/derefrence_reference.move:13:24
+   │
+ 3 │     struct B { r: R }
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+11 │     fun t1(r: &mut R, b: &mut B) {
+   │                               - The type '0x8675309::M::B' does not have the ability 'copy'
+12 │         R {} = *r;
+13 │         B { r: R{} } = *b;
+   │                        ^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/derefrence_reference.move:14:15
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+ 3 │     struct B { r: R }
+   │                   - The type '0x8675309::M::R' does not have the ability 'copy'
+   ·
+14 │         R{} = *&b.r;
+   │               ^^^^^ Invalid dereference. Dereference requires the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/derefrence_reference.move:15:15
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+ 3 │     struct B { r: R }
+   │                   - The type '0x8675309::M::R' does not have the ability 'copy'
+   ·
+15 │         R{} = *&mut b.r;
+   │               ^^^^^^^^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.move b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.move
new file mode 100644
index 000000000..addbbbf60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/derefrence_reference.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct R {}
+    struct B { r: R }
+
+    fun t0(r: &R, b: &B) {
+        R {} = *r;
+        B { r: R{} } = *b;
+        R{} = *&b.r;
+    }
+
+    fun t1(r: &mut R, b: &mut B) {
+        R {} = *r;
+        B { r: R{} } = *b;
+        R{} = *&b.r;
+        R{} = *&mut b.r;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.exp
new file mode 100644
index 000000000..2ff098616
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.exp
@@ -0,0 +1,24 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/duplicate_function_parameter_names.move:2:13
+  │
+2 │     fun foo(x: u64, x: u64) {}
+  │             ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/typing/duplicate_function_parameter_names.move:2:21
+  │
+2 │     fun foo(x: u64, x: u64) {}
+  │             -       ^ Duplicate parameter with name 'x'
+  │             │        
+  │             Previously declared here
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/duplicate_function_parameter_names.move:2:21
+  │
+2 │     fun foo(x: u64, x: u64) {}
+  │                     ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.move b/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.move
new file mode 100644
index 000000000..35890595f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/duplicate_function_parameter_names.move
@@ -0,0 +1,3 @@
+module 0x8675309::M {
+    fun foo(x: u64, x: u64) {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/entry_on_any_vis.move b/vendors/move/crates/move-compiler/tests/move_check/typing/entry_on_any_vis.move
new file mode 100644
index 000000000..11bf11709
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/entry_on_any_vis.move
@@ -0,0 +1,6 @@
+module 0x2::M {
+    // entry can go on any visibility
+    entry fun f1() {}
+    entry public fun f2() {}
+    entry public(friend) fun f3() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/entry_signature_no_warning.move b/vendors/move/crates/move-compiler/tests/move_check/typing/entry_signature_no_warning.move
new file mode 100644
index 000000000..edf376034
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/entry_signature_no_warning.move
@@ -0,0 +1,21 @@
+module 0x42::M {
+
+    struct CoolStruct has drop {}
+
+    // entry functions no longer have any built in checks outside of visibility rules
+
+    public entry fun signer_ref(_: &signer) {}
+
+    public entry fun late_signer(_u: u64, _s: signer) {}
+
+    public entry fun struct_arg(_: CoolStruct) {}
+
+    public entry fun u64_ret(): u64 {
+        0
+    }
+
+    public entry fun struct_ret(): CoolStruct {
+        CoolStruct {}
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/eq.move b/vendors/move/crates/move-compiler/tests/move_check/typing/eq.move
new file mode 100644
index 000000000..b4f2fd482
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/eq.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+    struct G<T> has drop { f: T }
+
+    fun t0(r: &R, r_mut: &mut R, s: S, s_ref: &S, s_mut: &mut S) {
+        (0 == 1: bool);
+        (0 == (1: u8): bool);
+        ((0: u8) == 1: bool);
+        (0 == (1: u128): bool);
+        ((0: u128) == 1: bool);
+        (&0 == &1: bool);
+        (true == false: bool);
+        (0x0 == 0x1: bool);
+        (&s == s_ref: bool);
+        (&mut s == s_ref: bool);
+        (&mut s == s_mut: bool);
+        (&s == s_mut: bool);
+        (s_ref == s_mut: bool);
+        (s_mut == s_mut: bool);
+        (S{u: 0} == s: bool);
+        (r == r: bool);
+        (r_mut == r_mut: bool);
+        (r == r_mut: bool);
+        (r_mut == r: bool);
+        (G { f: 1 } == G<u64> { f: 1 }: bool);
+        (G<u64> { f: 1 } == G { f: 1 }: bool);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.exp
new file mode 100644
index 000000000..c1d4ba743
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.exp
@@ -0,0 +1,196 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:12:17
+   │
+12 │         (0: u8) == (1: u128);
+   │             --  ^^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │       
+   │             │   Incompatible arguments to '=='
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:13:11
+   │
+13 │         0 == false;
+   │         - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '=='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:14:12
+   │
+14 │         &0 == 1;
+   │         -- ^^ - Found: integer. It is not compatible with the other type.
+   │         │  │   
+   │         │  Incompatible arguments to '=='
+   │         Found: '&{integer}'. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:15:11
+   │
+15 │         1 == &0;
+   │         - ^^ -- Found: '&{integer}'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '=='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:16:9
+   │
+ 2 │     struct S { u: u64 }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               - The type '0x8675309::M::S' does not have the ability 'drop'
+   ·
+16 │         s == s_ref;
+   │         ^ '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:16:11
+   │
+11 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               -         -- Found: '&0x8675309::M::S'. It is not compatible with the other type.
+   │               │          
+   │               Found: '0x8675309::M::S'. It is not compatible with the other type.
+   ·
+16 │         s == s_ref;
+   │           ^^ Incompatible arguments to '=='
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:17:15
+   │
+11 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               -                    ------ Found: '&mut 0x8675309::M::S'. It is not compatible with the other type.
+   │               │                     
+   │               Found: '0x8675309::M::S'. It is not compatible with the other type.
+   ·
+17 │         s_mut == s;
+   │               ^^ Incompatible arguments to '=='
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:17:18
+   │
+ 2 │     struct S { u: u64 }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               - The type '0x8675309::M::S' does not have the ability 'drop'
+   ·
+17 │         s_mut == s;
+   │                  ^ '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:21:9
+   │
+ 3 │     struct R has key {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+20 │     fun t1(r: R) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+21 │         r == r;
+   │         ^ '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:21:14
+   │
+ 3 │     struct R has key {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+20 │     fun t1(r: R) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+21 │         r == r;
+   │              ^ '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:25:9
+   │
+25 │         G0<R>{ f: R { f: 1 } } == G0<R>{ f: R { f: 1 } };
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  The type '0x8675309::M::G0<0x8675309::M::R>' can have the ability 'drop' but the type argument '0x8675309::M::R' does not have the required ability 'drop'
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x8675309::M::G0<0x8675309::M::R>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:25:35
+   │
+25 │         G0<R>{ f: R { f: 1 } } == G0<R>{ f: R { f: 1 } };
+   │                                   ^^^^^^^^^^^^^^^^^^^^^^
+   │                                   │  │
+   │                                   │  The type '0x8675309::M::G0<0x8675309::M::R>' can have the ability 'drop' but the type argument '0x8675309::M::R' does not have the required ability 'drop'
+   │                                   '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                                   The type '0x8675309::M::G0<0x8675309::M::R>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/eq_invalid.move:27:9
+   │
+27 │         G2{} == G2{};
+   │         ^^^^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/eq_invalid.move:27:17
+   │
+27 │         G2{} == G2{};
+   │                 ^^^^ Could not infer this type. Try adding an annotation
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:28:9
+   │
+ 7 │     struct G1<T: key> { f: T }
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+28 │         G1{ f: t } == G1{ f: t };
+   │         ^^^^^^^^^^
+   │         │
+   │         '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x8675309::M::G1<T>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/eq_invalid.move:28:23
+   │
+ 7 │     struct G1<T: key> { f: T }
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+28 │         G1{ f: t } == G1{ f: t };
+   │                       ^^^^^^^^^^
+   │                       │
+   │                       '==' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                       The type '0x8675309::M::G1<T>' does not have the ability 'drop'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/eq_invalid.move:32:9
+   │
+32 │         () == ();
+   │         ^^^^^^^^
+   │         │     │
+   │         │     Expected a single type, but found expression list type: '()'
+   │         Incompatible arguments to '=='
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/eq_invalid.move:33:9
+   │
+33 │         (0, 1) == (0, 1);
+   │         ^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         Expected a single type, but found expression list type: '(u64, u64)'
+   │         Incompatible arguments to '=='
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:34:19
+   │
+34 │         (1, 2, 3) == (0, 1);
+   │         --------- ^^ ------ Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+   │         │         │   
+   │         │         Incompatible arguments to '=='
+   │         Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/eq_invalid.move:35:16
+   │
+35 │         (0, 1) == (1, 2, 3);
+   │         ------ ^^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │   
+   │         │      Incompatible arguments to '=='
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.move
new file mode 100644
index 000000000..f5e25b085
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/eq_invalid.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R has key {
+        f: u64
+    }
+    struct G0<T> has drop { f: T }
+    struct G1<T: key> { f: T }
+    struct G2<phantom T> has drop {}
+
+
+    fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+        (0: u8) == (1: u128);
+        0 == false;
+        &0 == 1;
+        1 == &0;
+        s == s_ref;
+        s_mut == s;
+    }
+
+    fun t1(r: R) {
+        r == r;
+    }
+
+    fun t3<T: copy + key>(t: T) {
+        G0<R>{ f: R { f: 1 } } == G0<R>{ f: R { f: 1 } };
+        // can be dropped, but cannot infer type
+        G2{} == G2{};
+        G1{ f: t } == G1{ f: t };
+    }
+
+    fun t4() {
+        () == ();
+        (0, 1) == (0, 1);
+        (1, 2, 3) == (0, 1);
+        (0, 1) == (1, 2, 3);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list.move b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list.move
new file mode 100644
index 000000000..a62bc4f0d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct R<T> { f: T }
+    struct S {}
+
+    fun t0(): (u64, S, R<R<u64>>) {
+        (0, S{}, R{ f: R { f: 1 } })
+    }
+
+    fun t1(s: &S, r: &mut R<u64>): (u64, &S, &mut R<u64>) {
+        (0, s, r)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.exp
new file mode 100644
index 000000000..309506472
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.exp
@@ -0,0 +1,26 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/exp_list_nested.move:6:9
+  │
+5 │     fun t0(): (u64, S, R<u64>) {
+  │               ---------------- Expected expression list of length 3: '(u64, 0x8675309::M::S, 0x8675309::M::R<u64>)'
+6 │         (0, (S{}, R{}))
+  │         ^^^^^^^^^^^^^^^
+  │         │
+  │         Invalid return expression
+  │         Given expression list of length 2: '({integer}, (0x8675309::M::S, 0x8675309::M::R<_>))'
+
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/exp_list_nested.move:6:9
+  │
+6 │         (0, (S{}, R{}))
+  │         ^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   Expected a single type, but found expression list type: '(0x8675309::M::S, 0x8675309::M::R<_>)'
+  │         Invalid expression list type argument
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/exp_list_nested.move:6:19
+  │
+6 │         (0, (S{}, R{}))
+  │                   ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.move b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.move
new file mode 100644
index 000000000..9fdb6056b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_nested.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct R<phantom T> {}
+    struct S {}
+
+    fun t0(): (u64, S, R<u64>) {
+        (0, (S{}, R{}))
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.exp
new file mode 100644
index 000000000..740e1b0b2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.exp
@@ -0,0 +1,36 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/exp_list_resource_drop.move:7:9
+  │
+7 │         (0, S{ }, R<u64> { f: 1 });
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type '(u64, 0x8675309::M::S, 0x8675309::M::R<u64>)' can have the ability 'drop' but the type argument '0x8675309::M::S' does not have the required ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '(u64, 0x8675309::M::S, 0x8675309::M::R<u64>)' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/exp_list_resource_drop.move:8:9
+  │
+8 │         (0, S{ }, Box<R<u64>> { f: R { f: 1 } });
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type '(u64, 0x8675309::M::S, 0x8675309::M::Box<0x8675309::M::R<u64>>)' can have the ability 'drop' but the type argument '0x8675309::M::S' does not have the required ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '(u64, 0x8675309::M::S, 0x8675309::M::Box<0x8675309::M::R<u64>>)' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/exp_list_resource_drop.move:9:9
+  │
+9 │         (0, S{ }, Box { f: abort 0 });
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │
+  │         │   The type '(u64, 0x8675309::M::S, 0x8675309::M::Box<_>)' can have the ability 'drop' but the type argument '0x8675309::M::S' does not have the required ability 'drop'
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '(u64, 0x8675309::M::S, 0x8675309::M::Box<_>)' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/exp_list_resource_drop.move:9:19
+  │
+9 │         (0, S{ }, Box { f: abort 0 });
+  │                   ^^^^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.move b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.move
new file mode 100644
index 000000000..2dc1a47e8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/exp_list_resource_drop.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct R<T> { f: T }
+    struct S {}
+    struct Box<T> has drop { f: T }
+
+    fun t0() {
+        (0, S{ }, R<u64> { f: 1 });
+        (0, S{ }, Box<R<u64>> { f: R { f: 1 } });
+        (0, S{ }, Box { f: abort 0 });
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_copy.move b/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_copy.move
new file mode 100644
index 000000000..cffeacc86
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_copy.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S has copy, drop {}
+    struct R {}
+
+    fun t() {
+        let u = 0;
+        let s = S{};
+        (copy u: u64);
+        (copy s: S);
+        s;
+        u;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_move.move b/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_move.move
new file mode 100644
index 000000000..d9a3c03c9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/explicit_move.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S has drop {}
+    struct R {}
+
+    fun t() {
+        let u = 0;
+        let s = S{};
+        let r = R{};
+        (move u: u64);
+        (move s: S);
+        R{} = (move r: R);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/hex_and_decimal_address.move b/vendors/move/crates/move-compiler/tests/move_check/typing/hex_and_decimal_address.move
new file mode 100644
index 000000000..a14df511b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/hex_and_decimal_address.move
@@ -0,0 +1,17 @@
+// Addresses can be decimal numbers
+address 123 {
+module M {
+    struct S has copy, drop {}
+    public fun s(): S { S{} }
+    public fun take(_s: S) {}
+}
+}
+
+script {
+    fun main() {
+        0x7B::M::take(0x7B::M::s());
+        0x7B::M::take(123::M::s());
+        123::M::take(0x7B::M::s());
+        123::M::take(123::M::s());
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype.move
new file mode 100644
index 000000000..f22673f3c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    fun t0(cond: bool, u: &u64, u_mut: &mut u64) {
+        let _: &u64 = if (cond) u else u_mut;
+        let _: &u64 = if (cond) u_mut else u;
+        let _: &u64 = if (cond) u_mut else u_mut;
+    }
+
+    fun t1(cond: bool, u: &u64, u_mut: &mut u64) {
+        let (_, _): (&u64, &u64) = if (cond) (u, u) else (u_mut, u_mut);
+        let (_, _): (&u64, &u64) = if (cond) (u_mut, u) else (u, u_mut);
+        let (_, _): (&u64, &u64) = if (cond) (u, u_mut) else (u_mut, u);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.exp
new file mode 100644
index 000000000..24d5087e2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.exp
@@ -0,0 +1,157 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:3:16
+  │
+2 │     fun t0(cond: bool, u: &u64, u_mut: &mut u64) {
+  │                           ---- Given: '&u64'
+3 │         let _: &mut u64 = if (cond) u else u_mut;
+  │                ^^^^^^^^
+  │                │
+  │                Invalid type annotation
+  │                Expected: '&mut u64'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:4:16
+  │
+2 │     fun t0(cond: bool, u: &u64, u_mut: &mut u64) {
+  │                           ---- Given: '&u64'
+3 │         let _: &mut u64 = if (cond) u else u_mut;
+4 │         let _: &mut u64 = if (cond) u_mut else u;
+  │                ^^^^^^^^
+  │                │
+  │                Invalid type annotation
+  │                Expected: '&mut u64'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:5:16
+  │
+2 │     fun t0(cond: bool, u: &u64, u_mut: &mut u64) {
+  │                           ---- Given: '&u64'
+  ·
+5 │         let _: &mut u64 = if (cond) u else u;
+  │                ^^^^^^^^
+  │                │
+  │                Invalid type annotation
+  │                Expected: '&mut u64'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:9:23
+  │
+8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+  │                            ---                       ---- Found: 'bool'. It is not compatible with the other type.
+  │                            │                          
+  │                            Found: 'u64'. It is not compatible with the other type.
+9 │         let _: &u64 = if (cond) u else b;
+  │                       ^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:10:23
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                            ---                       ---- Found: 'bool'. It is not compatible with the other type.
+   │                            │                          
+   │                            Found: 'u64'. It is not compatible with the other type.
+ 9 │         let _: &u64 = if (cond) u else b;
+10 │         let _: &u64 = if (cond) b else u;
+   │                       ^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:12:23
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                                             ---      ---- Found: 'bool'. It is not compatible with the other type.
+   │                                             │         
+   │                                             Found: 'u64'. It is not compatible with the other type.
+   ·
+12 │         let _: &u64 = if (cond) u_mut else b;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:13:23
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                                             ---      ---- Found: 'bool'. It is not compatible with the other type.
+   │                                             │         
+   │                                             Found: 'u64'. It is not compatible with the other type.
+   ·
+13 │         let _: &u64 = if (cond) b else u_mut;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:15:23
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                            ---                                         ---- Found: 'bool'. It is not compatible with the other type.
+   │                            │                                            
+   │                            Found: 'u64'. It is not compatible with the other type.
+   ·
+15 │         let _: &u64 = if (cond) u else b_mut;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:16:23
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                            ---                                         ---- Found: 'bool'. It is not compatible with the other type.
+   │                            │                                            
+   │                            Found: 'u64'. It is not compatible with the other type.
+   ·
+16 │         let _: &u64 = if (cond) b_mut else u;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:19:27
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                                             ---                        ---- Found: 'bool'. It is not compatible with the other type.
+   │                                             │                           
+   │                                             Found: 'u64'. It is not compatible with the other type.
+   ·
+19 │         let _: &mut u64 = if (cond) u_mut else b_mut;
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:20:27
+   │
+ 8 │     fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+   │                                             ---                        ---- Found: 'bool'. It is not compatible with the other type.
+   │                                             │                           
+   │                                             Found: 'u64'. It is not compatible with the other type.
+   ·
+20 │         let _: &mut u64 = if (cond) b_mut else u_mut;
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^^^ Incompatible branches
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:25:21
+   │
+24 │     fun t2(cond: bool, u: &u64, u_mut: &mut u64) {
+   │                           ---- Given: '&u64'
+25 │         let (_, _): (&mut u64, &mut u64) = if (cond) (u, u) else (u_mut, u_mut);
+   │                     ^^^^^^^^^^^^^^^^^^^^
+   │                     ││
+   │                     │Expected: '&mut u64'
+   │                     Invalid type annotation
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:26:21
+   │
+24 │     fun t2(cond: bool, u: &u64, u_mut: &mut u64) {
+   │                           ---- Given: '&u64'
+25 │         let (_, _): (&mut u64, &mut u64) = if (cond) (u, u) else (u_mut, u_mut);
+26 │         let (_, _): (&mut u64, &mut u64) = if (cond) (u_mut, u) else (u, u_mut);
+   │                     ^^^^^^^^^^^^^^^^^^^^
+   │                     ││
+   │                     │Expected: '&mut u64'
+   │                     Invalid type annotation
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/if_branches_subtype_invalid.move:27:21
+   │
+24 │     fun t2(cond: bool, u: &u64, u_mut: &mut u64) {
+   │                           ---- Given: '&u64'
+   ·
+27 │         let (_, _): (&mut u64, &mut u64) = if (cond) (u, u_mut) else (u_mut, u);
+   │                     ^^^^^^^^^^^^^^^^^^^^
+   │                     ││
+   │                     │Expected: '&mut u64'
+   │                     Invalid type annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.move
new file mode 100644
index 000000000..e2b84012d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_branches_subtype_invalid.move
@@ -0,0 +1,29 @@
+module 0x8675309::M {
+    fun t0(cond: bool, u: &u64, u_mut: &mut u64) {
+        let _: &mut u64 = if (cond) u else u_mut;
+        let _: &mut u64 = if (cond) u_mut else u;
+        let _: &mut u64 = if (cond) u else u;
+    }
+
+    fun t1(cond: bool, u: &u64, u_mut: &mut u64, b: &bool, b_mut: &mut bool) {
+        let _: &u64 = if (cond) u else b;
+        let _: &u64 = if (cond) b else u;
+
+        let _: &u64 = if (cond) u_mut else b;
+        let _: &u64 = if (cond) b else u_mut;
+
+        let _: &u64 = if (cond) u else b_mut;
+        let _: &u64 = if (cond) b_mut else u;
+
+
+        let _: &mut u64 = if (cond) u_mut else b_mut;
+        let _: &mut u64 = if (cond) b_mut else u_mut;
+
+    }
+
+    fun t2(cond: bool, u: &u64, u_mut: &mut u64) {
+        let (_, _): (&mut u64, &mut u64) = if (cond) (u, u) else (u_mut, u_mut);
+        let (_, _): (&mut u64, &mut u64) = if (cond) (u_mut, u) else (u, u_mut);
+        let (_, _): (&mut u64, &mut u64) = if (cond) (u, u_mut) else (u_mut, u);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition.move
new file mode 100644
index 000000000..30a76f1a4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    fun t0() {
+        if (true) () else ();
+        if (false) () else ()
+    }
+
+    fun t1() {
+        if ({ let x = true; x }) () else ();
+        if ({ let x = false; x }) () else ()
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.exp
new file mode 100644
index 000000000..6027a7f82
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.exp
@@ -0,0 +1,81 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_condition_invalid.move:3:13
+  │
+3 │         if (()) () else ();
+  │             ^^
+  │             │
+  │             Invalid if condition
+  │             Expected: 'bool'
+  │             Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_condition_invalid.move:4:13
+  │
+4 │         if ((())) () else ();
+  │             ^^^^
+  │             │
+  │             Invalid if condition
+  │             Expected: 'bool'
+  │             Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_condition_invalid.move:5:13
+  │
+5 │         if ({}) () else ()
+  │             ^^
+  │             │
+  │             Invalid if condition
+  │             Expected: 'bool'
+  │             Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_condition_invalid.move:9:13
+  │
+8 │     fun t1<T: drop>(x: T) {
+  │                        - Given: 'T'
+9 │         if (x) () else ();
+  │             ^
+  │             │
+  │             Invalid if condition
+  │             Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_condition_invalid.move:10:13
+   │
+10 │         if (0) () else ();
+   │             ^
+   │             │
+   │             Invalid if condition
+   │             Expected: 'bool'
+   │             Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_condition_invalid.move:11:13
+   │
+11 │         if (@0x0) () else ()
+   │             ^^^^
+   │             │
+   │             Invalid if condition
+   │             Expected: 'bool'
+   │             Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_condition_invalid.move:15:13
+   │
+15 │         if ((false, true)) () else ();
+   │             ^^^^^^^^^^^^^
+   │             │
+   │             Invalid if condition
+   │             Expected: 'bool'
+   │             Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_condition_invalid.move:16:13
+   │
+16 │         if ((0, false)) () else ()
+   │             ^^^^^^^^^^
+   │             │
+   │             Invalid if condition
+   │             Expected: 'bool'
+   │             Given: '({integer}, bool)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.move
new file mode 100644
index 000000000..63adcad13
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_condition_invalid.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    fun t0() {
+        if (()) () else ();
+        if ((())) () else ();
+        if ({}) () else ()
+    }
+
+    fun t1<T: drop>(x: T) {
+        if (x) () else ();
+        if (0) () else ();
+        if (@0x0) () else ()
+    }
+
+    fun t2() {
+        if ((false, true)) () else ();
+        if ((0, false)) () else ()
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_default_else.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_default_else.move
new file mode 100644
index 000000000..6e43b8a51
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_default_else.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        if (cond) ();
+        let () = if (cond) ();
+        let () = if (cond) { let x = 0; x; };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_matched_branches.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_matched_branches.move
new file mode 100644
index 000000000..56b184000
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_matched_branches.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(cond: bool) {
+        if (cond) () else ();
+    }
+
+    fun t1(cond: bool) {
+        if (cond) 0x0 else 0x0;
+        if (cond) false else false;
+        R {} = if (cond) R{} else R{};
+        if (cond) &0 else &1;
+        if (cond) &mut 0 else &mut 1;
+    }
+
+    fun t2(cond: bool) {
+        if (cond) (0, false) else (1, true);
+        (_, _, _, R{}) = if (cond) (0, 0x0, &0, R{}) else (1, 0x1, &1, R{});
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.exp
new file mode 100644
index 000000000..3b348568b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.exp
@@ -0,0 +1,90 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_mismatched_branches.move:3:9
+  │
+3 │         if (cond) () else 0;
+  │         ^^^^^^^^^^^^^^^^^^^
+  │         │         │       │
+  │         │         │       Found: integer. It is not compatible with the other type.
+  │         │         Found: '()'. It is not compatible with the other type.
+  │         Incompatible branches
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_mismatched_branches.move:4:9
+  │
+4 │         if (cond) 0 else ();
+  │         ^^^^^^^^^^^^^^^^^^^
+  │         │         │      │
+  │         │         │      Found: '()'. It is not compatible with the other type.
+  │         │         Found: integer. It is not compatible with the other type.
+  │         Incompatible branches
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_mismatched_branches.move:8:9
+  │
+8 │         if (cond) @0x0 else 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^
+  │         │         │         │
+  │         │         │         Found: integer. It is not compatible with the other type.
+  │         │         Found: 'address'. It is not compatible with the other type.
+  │         Incompatible branches
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/if_mismatched_branches.move:9:9
+  │
+9 │         if (cond) 0 else false;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │         │         │      │
+  │         │         │      Found: 'bool'. It is not compatible with the other type.
+  │         │         Found: integer. It is not compatible with the other type.
+  │         Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_mismatched_branches.move:13:9
+   │
+13 │         if (cond) (0, false) else (1, 1);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │             │               │
+   │         │             │               Found: integer. It is not compatible with the other type.
+   │         │             Found: 'bool'. It is not compatible with the other type.
+   │         Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_mismatched_branches.move:14:9
+   │
+14 │         if (cond) (0, false) else (false, false);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │          │               │
+   │         │          │               Found: 'bool'. It is not compatible with the other type.
+   │         │          Found: integer. It is not compatible with the other type.
+   │         Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_mismatched_branches.move:15:9
+   │
+15 │         if (cond) (0, false) else (true, @0x0);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │          │               │
+   │         │          │               Found: 'bool'. It is not compatible with the other type.
+   │         │          Found: integer. It is not compatible with the other type.
+   │         Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_mismatched_branches.move:19:9
+   │
+19 │         if (cond) (0, false, 0) else (0, false);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │         │                  │
+   │         │         │                  Found expression list of length 2: '({integer}, bool)'. It is not compatible with the other type of length 3.
+   │         │         Found expression list of length 3: '({integer}, bool, {integer})'. It is not compatible with the other type of length 2.
+   │         Incompatible branches
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/if_mismatched_branches.move:20:9
+   │
+20 │         if (cond) (0, false) else (0, false, 0);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │         │               │
+   │         │         │               Found expression list of length 3: '({integer}, bool, {integer})'. It is not compatible with the other type of length 2.
+   │         │         Found expression list of length 2: '({integer}, bool)'. It is not compatible with the other type of length 3.
+   │         Incompatible branches
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.move b/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.move
new file mode 100644
index 000000000..47d71d8f9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/if_mismatched_branches.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        if (cond) () else 0;
+        if (cond) 0 else ();
+    }
+
+    fun t1(cond: bool) {
+        if (cond) @0x0 else 0;
+        if (cond) 0 else false;
+    }
+
+    fun t2(cond: bool) {
+        if (cond) (0, false) else (1, 1);
+        if (cond) (0, false) else (false, false);
+        if (cond) (0, false) else (true, @0x0);
+    }
+
+    fun t3(cond: bool) {
+        if (cond) (0, false, 0) else (0, false);
+        if (cond) (0, false) else (0, false, 0);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.exp
new file mode 100644
index 000000000..5b4865281
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.exp
@@ -0,0 +1,18 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/ignore_inferred_resource.move:4:9
+  │
+2 │     struct S<phantom T> {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+3 │     fun no() {
+4 │         S{};
+  │         ^^^
+  │         │
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '0x8675309::M::S<_>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/ignore_inferred_resource.move:4:9
+  │
+4 │         S{};
+  │         ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.move
new file mode 100644
index 000000000..8ad1d8202
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/ignore_inferred_resource.move
@@ -0,0 +1,6 @@
+module 0x8675309::M {
+    struct S<phantom T> {}
+    fun no() {
+        S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field.move
new file mode 100644
index 000000000..c38b71858
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun t0(s: &S, s_mut: &mut S): (u64, u64) {
+        (s.f, s_mut.f)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain.move
new file mode 100644
index 000000000..a3a05c16e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    struct X1 { x2: X2 }
+    struct X2 { x3: X3 }
+    struct X3 { f: u64, }
+
+    fun t0(x1: &X1, x1_mut: &mut X1, x2: &X2, x2_mut: &mut X2) {
+        (x1.x2.x3.f: u64);
+        (x1_mut.x2.x3.f: u64);
+        (x2.x3.f: u64);
+        (x2_mut.x3.f: u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.exp
new file mode 100644
index 000000000..19071c34e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.exp
@@ -0,0 +1,54 @@
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:7:9
+  │
+7 │         x1.f;
+  │         ^^^^ Unbound field 'f' in '0x8675309::M::X1'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:8:9
+  │
+8 │         x1.x2.f;
+  │         ^^^^^^^ Unbound field 'f' in '0x8675309::M::X2'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:9:9
+  │
+9 │         x1.x2.x3.g;
+  │         ^^^^^^^^^^ Unbound field 'g' in '0x8675309::M::X3'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:10:9
+   │
+ 4 │     struct X3 { f: u64, }
+   │                    --- Expected a struct type in the current module but got: 'u64'
+   ·
+10 │         x1.x2.x3.f.g;
+   │         ^^^^^^^^^^^^ Unbound field 'g'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:11:9
+   │
+11 │         x1_mut.f;
+   │         ^^^^^^^^ Unbound field 'f' in '0x8675309::M::X1'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:12:9
+   │
+12 │         x1_mut.x2.f;
+   │         ^^^^^^^^^^^ Unbound field 'f' in '0x8675309::M::X2'
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:13:9
+   │
+13 │         x1_mut.x2.x3.g;
+   │         ^^^^^^^^^^^^^^ Unbound field 'g' in '0x8675309::M::X3'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move:14:9
+   │
+ 4 │     struct X3 { f: u64, }
+   │                    --- Expected a struct type in the current module but got: 'u64'
+   ·
+14 │         x1_mut.x2.x3.f.g;
+   │         ^^^^^^^^^^^^^^^^ Unbound field 'g'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move
new file mode 100644
index 000000000..f4e06667a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_chain_missing.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct X1 { x2: X2 }
+    struct X2 { x3: X3 }
+    struct X3 { f: u64, }
+
+    fun t0(x1: &X1, x1_mut: &mut X1) {
+        x1.f;
+        x1.x2.f;
+        x1.x2.x3.g;
+        x1.x2.x3.f.g;
+        x1_mut.f;
+        x1_mut.x2.f;
+        x1_mut.x2.x3.g;
+        x1_mut.x2.x3.f.g;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_complex_root_expr.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_complex_root_expr.move
new file mode 100644
index 000000000..ff1f08447
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_complex_root_expr.move
@@ -0,0 +1,11 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(cond: bool, s: &S, s_mut: &mut S) {
+        ((if (cond) s else s).f: u64);
+        ((if (cond) s_mut else s).f: u64);
+        ((if (cond) s else s_mut).f: u64);
+        ((if (cond) s_mut else s_mut).f: u64);
+        ({ let s = S{f: 0}; &s }.f: u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.exp
new file mode 100644
index 000000000..4f6f0a6ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.exp
@@ -0,0 +1,90 @@
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:6:9
+  │
+6 │         0.f;
+  │         ^^^
+  │         │
+  │         Unbound field 'f'
+  │         Expected a struct type in the current module but got: integer
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:7:9
+  │
+7 │         0.g;
+  │         ^^^
+  │         │
+  │         Unbound field 'g'
+  │         Expected a struct type in the current module but got: integer
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:8:9
+  │
+5 │     fun t0(u: u64, cond: bool, addr: address) {
+  │               --- Expected a struct type in the current module but got: 'u64'
+  ·
+8 │         u.value;
+  │         ^^^^^^^ Unbound field 'value'
+
+error[E04009]: expected specific type
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:9:9
+  │
+5 │     fun t0(u: u64, cond: bool, addr: address) {
+  │                          ---- Expected a struct type in the current module but got: 'bool'
+  ·
+9 │         cond.value;
+  │         ^^^^^^^^^^ Unbound field 'value'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:10:9
+   │
+ 5 │     fun t0(u: u64, cond: bool, addr: address) {
+   │                                      ------- Expected a struct type in the current module but got: 'address'
+   ·
+10 │         addr.R;
+   │         ^^^^^^ Unbound field 'R'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:11:9
+   │
+ 5 │     fun t0(u: u64, cond: bool, addr: address) {
+   │                                      ------- Expected a struct type in the current module but got: 'address'
+   ·
+11 │         addr.f;
+   │         ^^^^^^ Unbound field 'f'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:12:9
+   │
+12 │         ().R;
+   │         ^^
+   │         │
+   │         Invalid dot access
+   │         Expected a single type, but found expression list type: '()'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:12:9
+   │
+12 │         ().R;
+   │         ^^^^
+   │         │
+   │         Unbound field 'R'
+   │         Expected a struct type in the current module but got: '()'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:13:9
+   │
+13 │         (S{f: 0}, S{f:0}).f;
+   │         ^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid dot access
+   │         Expected a single type, but found expression list type: '(0x8675309::M::S, 0x8675309::M::S)'
+
+error[E04009]: expected specific type
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move:13:9
+   │
+13 │         (S{f: 0}, S{f:0}).f;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Unbound field 'f'
+   │         Expected a struct type in the current module but got: '(0x8675309::M::S, 0x8675309::M::S)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move
new file mode 100644
index 000000000..79c287722
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_from_non_struct.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+    struct R {}
+
+    fun t0(u: u64, cond: bool, addr: address) {
+        0.f;
+        0.g;
+        u.value;
+        cond.value;
+        addr.R;
+        addr.f;
+        ().R;
+        (S{f: 0}, S{f:0}).f;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.exp
new file mode 100644
index 000000000..6be0e228c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.exp
@@ -0,0 +1,12 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_internal.move:13:10
+   │
+13 │         (X::s().f: u64);
+   │          ^^^^^^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_internal.move:15:10
+   │
+15 │         (s.f: u64);
+   │          ^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.move
new file mode 100644
index 000000000..5ed6a052d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_internal.move
@@ -0,0 +1,20 @@
+address 0x2 {
+
+module X {
+    struct S { f: u64 }
+    public fun s(): S {
+        S { f: 0 }
+    }
+}
+
+module M {
+    use 0x2::X;
+    fun t0() {
+        (X::s().f: u64);
+        let s = &X::s();
+        (s.f: u64);
+        abort 0
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.exp
new file mode 100644
index 000000000..e473e966b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.exp
@@ -0,0 +1,18 @@
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_missing.move:5:9
+  │
+5 │         s.g;
+  │         ^^^ Unbound field 'g' in '0x8675309::M::S'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_missing.move:6:9
+  │
+6 │         sref.g;
+  │         ^^^^^^ Unbound field 'g' in '0x8675309::M::S'
+
+error[E03010]: unbound field
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_missing.move:7:9
+  │
+7 │         s_mut.h;
+  │         ^^^^^^^ Unbound field 'h' in '0x8675309::M::S'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.move
new file mode 100644
index 000000000..a1df9755c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_missing.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct S { f: u64 }
+
+    fun t0(s: S, sref: &S, s_mut: &mut S) {
+        s.g;
+        sref.g;
+        s_mut.h;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_non_local_root.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_non_local_root.move
new file mode 100644
index 000000000..6e602a759
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_non_local_root.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64 }
+
+    fun t0(cond: bool, _s: S) {
+        (foo().f: u64);
+        (bar().f: u64);
+        ((if (cond) foo() else &bar()).f : u64);
+        ((if (cond) *foo() else bar()).f : u64);
+    }
+
+    fun foo(): &S {
+        abort 0
+    }
+
+    fun bar(): S {
+        S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_root.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_root.move
new file mode 100644
index 000000000..7482187d9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_non_ref_root.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(cond: bool, s: S) {
+        (s.f: u64);
+        ((if (cond) S { f: 0 } else S { f: 1 }).f : u64);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.exp
new file mode 100644
index 000000000..6d4676a14
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.exp
@@ -0,0 +1,24 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/implicit_deref_borrow_field_not_copyable.move:8:15
+  │
+2 │     struct R has drop {}
+  │            - To satisfy the constraint, the 'copy' ability would need to be added here
+3 │     struct S has copy, drop {}
+4 │     struct B has drop { s: S, r: R }
+  │                                  - The type '0x8675309::M::R' does not have the ability 'copy'
+  ·
+8 │         R{} = b.r;
+  │               ^^^ Invalid implicit copy of field 'r' without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/implicit_deref_borrow_field_not_copyable.move:11:15
+   │
+ 2 │     struct R has drop {}
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+ 3 │     struct S has copy, drop {}
+ 4 │     struct B has drop { s: S, r: R }
+   │                                  - The type '0x8675309::M::R' does not have the ability 'copy'
+   ·
+11 │         R{} = bref.r;
+   │               ^^^^^^ Invalid implicit copy of field 'r' without the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.move b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.move
new file mode 100644
index 000000000..a4469faf4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/implicit_deref_borrow_field_not_copyable.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct R has drop {}
+    struct S has copy, drop {}
+    struct B has drop { s: S, r: R }
+
+    fun t1(b: B, bref: &B) {
+        (b.s: S);
+        R{} = b.r;
+
+        (bref.s: S);
+        R{} = bref.r;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.exp
new file mode 100644
index 000000000..a62e8d135
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.exp
@@ -0,0 +1,82 @@
+error[E04019]: cyclic type instantiation
+  ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:7:9
+  │
+7 │         t<Box<T>>()
+  │         ^^^^^^^^^^^
+  │         │ │
+  │         │ The type parameter 't::T' was instantiated with the type '0x42::X::Box<T>', which contains the type parameter 't::T'. This recursive call causes the instantiation to recurse infinitely
+  │         Invalid call to '0x42::X::t'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:14:9
+   │
+11 │         y<Box<T>>()
+   │         ----------- 'x<x::T>' calls 'y<0x42::X::Box<x::T>>'
+   ·
+14 │         x<Box<T>>()
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'y::T' was instantiated with the type '0x42::X::Box<T>', which contains the type parameter 'x::T'. These mutually recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x42::X::x'
+   │         'y<0x42::X::Box<x::T>>' calls 'x<0x42::X::Box<0x42::X::Box<x::T>>>'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:24:9
+   │
+18 │         b<A>()
+   │         ------ 'a<a::A>' calls 'b<a::A>'
+   ·
+21 │         c<B>()
+   │         ------ 'b<a::A>' calls 'c<a::A>'
+   ·
+24 │         a<Box<C>>()
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'b::A' was instantiated with the type '0x42::X::Box<C>', which contains the type parameter 'a::C'. A cycle of recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x42::X::a'
+   │         'c<a::A>' calls 'a<0x42::X::Box<a::A>>'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:38:9
+   │
+38 │         z<Box<T>>()
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'z::T' was instantiated with the type '0x42::Y::Box<T>', which contains the type parameter 'z::T'. This recursive call causes the instantiation to recurse infinitely
+   │         Invalid call to '0x42::Y::z'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:48:9
+   │
+42 │         b<A>()
+   │         ------ 'a<d::D>' calls 'b<d::D>'
+   ·
+45 │         c<B>()
+   │         ------ 'b<d::D>' calls 'c<d::D>'
+   ·
+48 │         d<Box<C>>()
+   │         ^^^^^^^^^^^
+   │         │ │
+   │         │ The type parameter 'a::D' was instantiated with the type '0x42::Y::Box<C>', which contains the type parameter 'd::C'. A cycle of recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x42::Y::d'
+   │         'c<d::D>' calls 'd<0x42::Y::Box<d::D>>'
+   ·
+51 │         a<D>()
+   │         ------ 'd<d::D>' calls 'a<d::D>'
+
+error[E04019]: cyclic type instantiation
+   ┌─ tests/move_check/typing/infinite_instantiations_invalid.move:62:9
+   │
+59 │         tr<TL>()
+   │         -------- 'tl<bl::BL>' calls 'tr<bl::BL>'
+   ·
+62 │         bl<Box<TR>>();
+   │         ^^^^^^^^^^^^^
+   │         │  │
+   │         │  The type parameter 'tl::BL' was instantiated with the type '0x42::Z::Box<TR>', which contains the type parameter 'bl::TR'. A cycle of recursive calls causes the instantiation to recurse infinitely
+   │         Invalid call to '0x42::Z::bl'
+   │         'tr<bl::BL>' calls 'bl<0x42::Z::Box<bl::BL>>'
+   ·
+69 │         tl<BL>()
+   │         -------- 'bl<bl::BL>' calls 'tl<bl::BL>'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.move
new file mode 100644
index 000000000..36d979b34
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_invalid.move
@@ -0,0 +1,73 @@
+address 0x42 {
+
+module X {
+    struct Box<T> { f: T }
+
+    public fun t<T>() {
+        t<Box<T>>()
+    }
+
+    public fun x<T>() {
+        y<Box<T>>()
+    }
+    public fun y<T>() {
+        x<Box<T>>()
+    }
+
+    public fun a<A>() {
+        b<A>()
+    }
+    public fun b<B>() {
+        c<B>()
+    }
+    public fun c<C>() {
+        a<Box<C>>()
+    }
+}
+
+module Y {
+    struct Box<T> { f: T }
+
+    public fun x<T>() {
+        y<Box<T>>()
+    }
+    public fun y<T>() {
+        z<Box<T>>()
+    }
+    public fun z<T>() {
+        z<Box<T>>()
+    }
+
+    public fun a<A>() {
+        b<A>()
+    }
+    public fun b<B>() {
+        c<B>()
+    }
+    public fun c<C>() {
+        d<Box<C>>()
+    }
+    public fun d<D>() {
+        a<D>()
+    }
+}
+
+module Z {
+    struct Box<T> { f: T }
+
+    public fun tl<TL>() {
+        tr<TL>()
+    }
+    public fun tr<TR>() {
+        bl<Box<TR>>();
+        br<TR>()
+    }
+    public fun br<BR>() {
+        bl<BR>()
+    }
+    public fun bl<BL>() {
+        tl<BL>()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_valid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_valid.move
new file mode 100644
index 000000000..c0df258ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/infinite_instantiations_valid.move
@@ -0,0 +1,35 @@
+address 0x42 {
+
+module M {
+    struct Box<T> { f: T }
+
+    public fun t0<T>() {
+        t1<T>();
+        t0<T>()
+    }
+
+    public fun t1<T>() {
+        t0<T>();
+        t1<T>()
+    }
+
+    public fun x<T>() {
+        y<Box<T>>()
+    }
+    public fun y<T>() {
+        z<Box<T>>()
+    }
+    public fun z<T>() {
+        z<T>()
+    }
+
+}
+
+module N {
+    use 0x42::M;
+    public fun t<T>() {
+        M::t0<M::Box<T>>()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp
new file mode 100644
index 000000000..737f55989
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp
@@ -0,0 +1,306 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:11:13
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+11 │         f1: S<R>,
+   │             ^^^^
+   │             │ │
+   │             │ The type '0x42::M::R' does not have the ability 'drop'
+   │             'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:12:13
+   │
+12 │         f2: S<&u64>,
+   │             ^^^^^^^
+   │             │ │
+   │             │ Expected a single non-reference type, but found: '&u64'
+   │             Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:13:13
+   │
+13 │         f3: &(&u64),
+   │             ^^^^^^^
+   │             ││
+   │             │Expected a single non-reference type, but found: '&u64'
+   │             Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:13:13
+   │
+13 │         f3: &(&u64),
+   │             ^^^^^^^
+   │             │
+   │             Invalid field type
+   │             Expected a single non-reference type, but found: '&&u64'
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:14:13
+   │
+14 │         f4: S<(u64, u64)>,
+   │             ^^^^^^^^^^^^^
+   │             │ │
+   │             │ Expected a single non-reference type, but found: '(u64, u64)'
+   │             Invalid type argument
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:18:14
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+18 │         _f1: S<R>,
+   │              ^^^^
+   │              │ │
+   │              │ The type '0x42::M::R' does not have the ability 'drop'
+   │              'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:19:14
+   │
+19 │         _f2: S<&u64>,
+   │              ^^^^^^^
+   │              │ │
+   │              │ Expected a single non-reference type, but found: '&u64'
+   │              Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:20:14
+   │
+20 │         _f3: &(&u64),
+   │              ^^^^^^^
+   │              ││
+   │              │Expected a single non-reference type, but found: '&u64'
+   │              Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:21:14
+   │
+21 │         _f4: S<(u64, u64)>,
+   │              ^^^^^^^^^^^^^
+   │              │ │
+   │              │ Expected a single non-reference type, but found: '(u64, u64)'
+   │              Invalid type argument
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:23:9
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+23 │         S<R>,
+   │         ^^^^
+   │         │ │
+   │         │ The type '0x42::M::R' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:24:9
+   │
+24 │         S<&u64>,
+   │         ^^^^^^^
+   │         │ │
+   │         │ Expected a single non-reference type, but found: '&u64'
+   │         Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:25:9
+   │
+25 │         &(&u64),
+   │         ^^^^^^^
+   │         ││
+   │         │Expected a single non-reference type, but found: '&u64'
+   │         Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:26:9
+   │
+26 │         S<(u64, u64)>,
+   │         ^^^^^^^^^^^^^
+   │         │ │
+   │         │ Expected a single non-reference type, but found: '(u64, u64)'
+   │         Invalid type argument
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:32:18
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+32 │         let _f1: S<R> = abort 0;
+   │                  ^^^^
+   │                  │ │
+   │                  │ The type '0x42::M::R' does not have the ability 'drop'
+   │                  'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:33:18
+   │
+33 │         let _f2: S<&u64> = abort 0;
+   │                  ^^^^^^^
+   │                  │ │
+   │                  │ Expected a single non-reference type, but found: '&u64'
+   │                  Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:34:18
+   │
+34 │         let _f3: &(&u64) = abort 0;
+   │                  ^^^^^^^
+   │                  ││
+   │                  │Expected a single non-reference type, but found: '&u64'
+   │                  Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:35:18
+   │
+35 │         let _f4: S<(u64, u64)> = abort 0;
+   │                  ^^^^^^^^^^^^^
+   │                  │ │
+   │                  │ Expected a single non-reference type, but found: '(u64, u64)'
+   │                  Invalid type argument
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:37:9
+   │
+37 │         id<S<R>>(abort 0);
+   │         ^^^^^^^^^^^^^^^^^
+   │         │  │ │
+   │         │  │ The type '0x42::M::S<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         │  The type '0x42::M::S<0x42::M::R>' does not have the ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:37:12
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+37 │         id<S<R>>(abort 0);
+   │            ^^^^
+   │            │ │
+   │            │ The type '0x42::M::R' does not have the ability 'drop'
+   │            'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:38:12
+   │
+38 │         id<S<&u64>>(abort 0);
+   │            ^^^^^^^
+   │            │ │
+   │            │ Expected a single non-reference type, but found: '&u64'
+   │            Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:39:9
+   │
+39 │         id<&(&u64)>(abort 0);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Expected a single non-reference type, but found: '&&u64'
+   │         Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:39:12
+   │
+39 │         id<&(&u64)>(abort 0);
+   │            ^^^^^^^
+   │            ││
+   │            │Expected a single non-reference type, but found: '&u64'
+   │            Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:40:12
+   │
+40 │         id<S<(u64, u64)>>(abort 0);
+   │            ^^^^^^^^^^^^^
+   │            │ │
+   │            │ Expected a single non-reference type, but found: '(u64, u64)'
+   │            Invalid type argument
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:42:9
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+   ·
+42 │         S<S<R>> { f: abort 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │ │ │
+   │         │ │ The type '0x42::M::S<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop'
+   │         │ The type '0x42::M::S<0x42::M::R>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:42:9
+   │
+42 │         S<S<R>> { f: abort 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │ │
+   │         │ The type '0x42::M::S<0x42::M::S<0x42::M::R>>' can have the ability 'drop' but the type argument '0x42::M::S<0x42::M::R>' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x42::M::S<0x42::M::S<0x42::M::R>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/instantiate_signatures.move:42:11
+   │
+ 3 │     struct S<T: drop> has drop { f: T }
+   │                 ---- 'drop' constraint declared here
+ 4 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+42 │         S<S<R>> { f: abort 0 };
+   │           ^^^^
+   │           │ │
+   │           │ The type '0x42::M::R' does not have the ability 'drop'
+   │           'drop' constraint not satisifed
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:43:11
+   │
+43 │         S<S<&u64>> { f: abort 0 };
+   │           ^^^^^^^
+   │           │ │
+   │           │ Expected a single non-reference type, but found: '&u64'
+   │           Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:44:9
+   │
+44 │         S<&(&u64)> { f: abort 0 };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │ │
+   │         │ Expected a single non-reference type, but found: '&&u64'
+   │         Invalid type argument
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:44:11
+   │
+44 │         S<&(&u64)> { f: abort 0 };
+   │           ^^^^^^^
+   │           ││
+   │           │Expected a single non-reference type, but found: '&u64'
+   │           Invalid reference type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/instantiate_signatures.move:45:11
+   │
+45 │         S<S<(u64, u64)>> { f: abort 0 };
+   │           ^^^^^^^^^^^^^
+   │           │ │
+   │           │ Expected a single non-reference type, but found: '(u64, u64)'
+   │           Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.move b/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.move
new file mode 100644
index 000000000..ac405798c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.move
@@ -0,0 +1,48 @@
+address 0x42 {
+module M {
+    struct S<T: drop> has drop { f: T }
+    struct R {}
+    fun id<T>(x: T): T { x }
+
+    // Written types with unsatisified constraints
+    // Checked in various positions
+
+    struct S1 {
+        f1: S<R>,
+        f2: S<&u64>,
+        f3: &(&u64),
+        f4: S<(u64, u64)>,
+    }
+
+    fun f1(
+        _f1: S<R>,
+        _f2: S<&u64>,
+        _f3: &(&u64),
+        _f4: S<(u64, u64)>,
+    ): (
+        S<R>,
+        S<&u64>,
+        &(&u64),
+        S<(u64, u64)>,
+    ) {
+        abort 0
+    }
+
+    fun f2() {
+        let _f1: S<R> = abort 0;
+        let _f2: S<&u64> = abort 0;
+        let _f3: &(&u64) = abort 0;
+        let _f4: S<(u64, u64)> = abort 0;
+
+        id<S<R>>(abort 0);
+        id<S<&u64>>(abort 0);
+        id<&(&u64)>(abort 0);
+        id<S<(u64, u64)>>(abort 0);
+
+        S<S<R>> { f: abort 0 };
+        S<S<&u64>> { f: abort 0 };
+        S<&(&u64)> { f: abort 0 };
+        S<S<(u64, u64)>> { f: abort 0 };
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/large_binop.move b/vendors/move/crates/move-compiler/tests/move_check/typing/large_binop.move
new file mode 100644
index 000000000..0f6d51650
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/large_binop.move
@@ -0,0 +1,139 @@
+script {
+    fun main() {
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42") ||
+        (b"hello" != b"bye") &&
+        (true && true) &&
+        (!false) ||
+        (1 << 7 == 128) &&
+        (128 >> 7 == 1) ||
+        (255 / 2 == 127) &&
+        (255 % 2 == 1) ||
+        (254 + 1 == 255) &&
+        (255 - 255 == 0) ||
+        (255 & 255 == 255) &&
+        (255 | 255 == 255) ||
+        (255 ^ 255 == 0) &&
+        (x"42" == x"42");
+        // TODO fix this to parse
+        // (b"hello" != b"bye") == (
+        // 0 == (((((((((((((((((((((((((((((((((((((((((((((0 + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0) + 0)
+        // ) == (
+        // 0 == (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + (0 + 0))))))))))))))))))))))))))))))))
+        // );
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body.move b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body.move
new file mode 100644
index 000000000..52aad36da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    fun t0() {
+        loop ()
+    }
+
+    fun t1() {
+        loop (())
+    }
+
+    fun t2() {
+        loop {}
+    }
+
+    fun t3() {
+        loop { let x = 0; x; }
+    }
+
+    fun t4() {
+        loop { if (true) () }
+    }
+
+    fun t5() {
+        loop break;
+        loop { break };
+        loop return ()
+    }
+
+    fun t6() {
+        loop continue
+    }
+
+    fun t7() {
+        loop { continue }
+    }
+
+    fun t8() {
+        loop { loop { break } }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.exp
new file mode 100644
index 000000000..cc49fce66
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.exp
@@ -0,0 +1,50 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/loop_body_invalid.move:3:14
+  │
+3 │         loop 0
+  │              ^
+  │              │
+  │              Invalid loop body
+  │              Expected: '()'
+  │              Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/loop_body_invalid.move:7:14
+  │
+7 │         loop false
+  │              ^^^^^
+  │              │
+  │              Invalid loop body
+  │              Expected: '()'
+  │              Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_body_invalid.move:11:14
+   │
+11 │         loop { @0x0 }
+   │              ^^^^^^^^
+   │              │ │
+   │              │ Given: 'address'
+   │              Invalid loop body
+   │              Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_body_invalid.move:15:14
+   │
+15 │         loop { let x = 0; x }
+   │              ^^^^^^^^^^^^^^^^
+   │              │     │
+   │              │     Given: integer
+   │              Invalid loop body
+   │              Expected: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_body_invalid.move:19:14
+   │
+19 │         loop { if (true) 1 else 0 }
+   │              ^^^^^^^^^^^^^^^^^^^^^^
+   │              │                  │
+   │              │                  Given: integer
+   │              Invalid loop body
+   │              Expected: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.move
new file mode 100644
index 000000000..3898c700a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_body_invalid.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    fun t0() {
+        loop 0
+    }
+
+    fun t1() {
+        loop false
+    }
+
+    fun t2() {
+        loop { @0x0 }
+    }
+
+    fun t3() {
+        loop { let x = 0; x }
+    }
+
+    fun t4() {
+        loop { if (true) 1 else 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.exp
new file mode 100644
index 000000000..92d83d804
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/loop_result_type.move:19:13
+   │
+19 │         foo(loop {})
+   │             ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/typing/loop_result_type.move:25:23
+   │
+25 │         let x: X::R = loop { 0; };
+   │                       ^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+   │
+   = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.move
new file mode 100644
index 000000000..48f24213c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type.move
@@ -0,0 +1,36 @@
+address 0x2 {
+
+module X {
+    struct R {}
+}
+
+module M {
+    use 0x2::X;
+
+    fun t0(): X::R {
+        loop {}
+    }
+
+    fun t1(): u64 {
+        loop { let x = 0; x; }
+    }
+
+    fun t2() {
+        foo(loop {})
+    }
+
+    fun foo(_x: u64) {}
+
+    fun t3(): X::R {
+        let x: X::R = loop { 0; };
+        x
+    }
+
+    fun t4() {
+        let () = loop { break };
+        let () = loop { if (false) break };
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.exp
new file mode 100644
index 000000000..88ebb2d22
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.exp
@@ -0,0 +1,51 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_result_type_invalid.move:11:9
+   │
+10 │     fun t0(): X::R {
+   │               ---- Expected: '0x2::X::R'
+11 │         loop { if (false) break }
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid return expression
+   │         Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_result_type_invalid.move:15:9
+   │
+14 │     fun t1(): u64 {
+   │               --- Expected: 'u64'
+15 │         loop { let _x = 0; break }
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid return expression
+   │         Given: '()'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_result_type_invalid.move:19:9
+   │
+19 │         foo(loop { break })
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Given: '()'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+   ·
+22 │     fun foo(_: u64) {}
+   │                --- Expected: 'u64'
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/loop_result_type_invalid.move:25:13
+   │
+25 │         let _x = loop { break };
+   │             ^^   -------------- Expected a single type, but found expression list type: '()'
+   │             │     
+   │             Invalid type for local
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/loop_result_type_invalid.move:26:13
+   │
+26 │         let (_x, _y) = loop { if (false) break };
+   │             ^^^^^^^^   ------------------------- Given: '()'
+   │             │           
+   │             Invalid value for binding
+   │             Expected: '(_, _)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.move
new file mode 100644
index 000000000..0dd73b78b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/loop_result_type_invalid.move
@@ -0,0 +1,30 @@
+address 0x2 {
+
+module X {
+    struct R {}
+}
+
+module M {
+    use 0x2::X;
+
+    fun t0(): X::R {
+        loop { if (false) break }
+    }
+
+    fun t1(): u64 {
+        loop { let _x = 0; break }
+    }
+
+    fun t2() {
+        foo(loop { break })
+    }
+
+    fun foo(_: u64) {}
+
+    fun t3() {
+        let _x = loop { break };
+        let (_x, _y) = loop { if (false) break };
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments.move
new file mode 100644
index 000000000..4e8399f00
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments.move
@@ -0,0 +1,37 @@
+script {
+fun main(
+    _sender: signer,
+
+    _a: address,
+    _x8: u8,
+    _x64: u64,
+    _x128: u128,
+    _b: bool,
+
+    _v8: vector<u8>,
+    _va: vector<address>,
+    _v64: vector<u64>,
+    _v128: vector<u128>,
+    _vb: vector<bool>,
+
+    _vv8: vector<vector<u8>>,
+    _vva: vector<vector<address>>,
+    _vv64: vector<vector<u64>>,
+    _vv128: vector<vector<u128>>,
+    _vvb: vector<vector<bool>>,
+
+    _vvv8: vector<vector<vector<u8>>>,
+    _vvva: vector<vector<vector<address>>>,
+    _vvv64: vector<vector<vector<u64>>>,
+    _vvv128: vector<vector<vector<u128>>>,
+    _vvvb: vector<vector<vector<bool>>>,
+
+    _vvvv8: vector<vector<vector<vector<u8>>>>,
+    _vvvva: vector<vector<vector<vector<address>>>>,
+    _vvvv64: vector<vector<vector<vector<u64>>>>,
+    _vvvv128: vector<vector<vector<vector<u128>>>>,
+    _vvvvb: vector<vector<vector<vector<bool>>>>,
+) {
+
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments_various_caes.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments_various_caes.move
new file mode 100644
index 000000000..6755f14dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_arguments_various_caes.move
@@ -0,0 +1,29 @@
+address 0x42 {
+module M {
+    struct R {}
+    struct S {}
+    struct Cup<T> { f1: T }
+
+    public fun eat(r: R) {
+        R{} = r
+    }
+}
+}
+
+script {
+use 0x42::M::{S, R, Cup};
+// script functions no longer have any built in checks outside of visibility rules
+fun main<T: drop>(
+    _s: &signer,
+    _a0: T,
+    _a1: vector<T>,
+    _a2: vector<vector<T>>,
+    _a3: S,
+    _a4: R,
+    _a5: Cup<u8>,
+    _a6: Cup<T>,
+    _a7: vector<S>,
+) {
+    abort 0
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_entry.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_entry.move
new file mode 100644
index 000000000..bfc514e7d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_entry.move
@@ -0,0 +1,11 @@
+address 0x2 {
+module X {
+    public entry fun foo() {}
+}
+}
+
+script {
+fun main() {
+    0x2::X::foo()
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.exp
new file mode 100644
index 000000000..b4fabd54a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.exp
@@ -0,0 +1,9 @@
+error[E04001]: restricted visibility
+  ┌─ tests/move_check/typing/main_call_visibility_friend.move:9:5
+  │
+3 │     public(friend) fun foo() {}
+  │     -------------- This function can only be called from a 'friend' of module '0x2::X'
+  ·
+9 │     0x2::X::foo()
+  │     ^^^^^^^^^^^^^ Invalid call to '0x2::X::foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.move
new file mode 100644
index 000000000..64781b75a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_call_visibility_friend.move
@@ -0,0 +1,11 @@
+address 0x2 {
+module X {
+    public(friend) fun foo() {}
+}
+}
+
+script {
+fun main() {
+    0x2::X::foo()
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.exp
new file mode 100644
index 000000000..991ffdab8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.exp
@@ -0,0 +1,9 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/main_return_type_not_unit.move:4:5
+  │
+4 │ fun main(): u64 {
+  │     ^^^^    --- Given: 'u64'
+  │     │        
+  │     Invalid 'script' function return type. The function entry point to a 'script' must have the return type '()'
+  │     Expected: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.move
new file mode 100644
index 000000000..39ffdec21
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_return_type_not_unit.move
@@ -0,0 +1,7 @@
+script {
+// despite script functions no longer have any built in checks,
+// scripts still do not support return values
+fun main(): u64 {
+    0
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/main_with_type_parameters.move b/vendors/move/crates/move-compiler/tests/move_check/typing/main_with_type_parameters.move
new file mode 100644
index 000000000..f6d922c8a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/main_with_type_parameters.move
@@ -0,0 +1,4 @@
+script {
+fun main<T1: drop, T2, T3: key>() {
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.exp
new file mode 100644
index 000000000..4577a4432
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.exp
@@ -0,0 +1,276 @@
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:43:18
+   │
+43 │         let () = X::bing(X::baz(X::bar(X::foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │      │
+   │                  │      Found 1 argument(s) here
+   │                  Invalid call of '0x2::X::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:43:18
+   │
+ 8 │     public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                           -------------- Given: '(bool, (address, u64), _)'
+   ·
+11 │     public fun bing(_: bool, _: address, _: u64) {
+   │                        ---- Expected: 'bool'
+   ·
+43 │         let () = X::bing(X::baz(X::bar(X::foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::X::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:43:26
+   │
+43 │         let () = X::bing(X::baz(X::bar(X::foo())));
+   │                          ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                          │     │
+   │                          │     Found 1 argument(s) here
+   │                          Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:43:26
+   │
+ 5 │     public fun bar(x: u64): (address, u64) {
+   │                             -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+43 │         let () = X::bing(X::baz(X::bar(X::foo())));
+   │                          ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:44:18
+   │
+44 │         let () = X::bing (X::baz (X::bar (X::foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │       │
+   │                  │       Found 1 argument(s) here
+   │                  Invalid call of '0x2::X::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:44:18
+   │
+ 8 │     public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                           -------------- Given: '(bool, (address, u64), _)'
+   ·
+11 │     public fun bing(_: bool, _: address, _: u64) {
+   │                        ---- Expected: 'bool'
+   ·
+44 │         let () = X::bing (X::baz (X::bar (X::foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::X::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:44:27
+   │
+44 │         let () = X::bing (X::baz (X::bar (X::foo())));
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                           │      │
+   │                           │      Found 1 argument(s) here
+   │                           Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:44:27
+   │
+ 5 │     public fun bar(x: u64): (address, u64) {
+   │                             -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+44 │         let () = X::bing (X::baz (X::bar (X::foo())));
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:45:18
+   │
+45 │         let () = X::bing (X::baz (X::bar(1)));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │       │
+   │                  │       Found 1 argument(s) here
+   │                  Invalid call of '0x2::X::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:45:18
+   │
+ 8 │     public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                           -------------- Given: '(bool, (address, u64), _)'
+   ·
+11 │     public fun bing(_: bool, _: address, _: u64) {
+   │                        ---- Expected: 'bool'
+   ·
+45 │         let () = X::bing (X::baz (X::bar(1)));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::X::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:45:27
+   │
+45 │         let () = X::bing (X::baz (X::bar(1)));
+   │                           ^^^^^^^^^^^^^^^^^^
+   │                           │      │
+   │                           │      Found 1 argument(s) here
+   │                           Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:45:27
+   │
+ 5 │     public fun bar(x: u64): (address, u64) {
+   │                             -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+45 │         let () = X::bing (X::baz (X::bar(1)));
+   │                           ^^^^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:46:18
+   │
+46 │         let () = X::bing (X::baz (@0x0, 1));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │       │
+   │                  │       Found 1 argument(s) here
+   │                  Invalid call of '0x2::X::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:46:18
+   │
+ 8 │     public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                           -------------- Given: '(bool, address, {integer})'
+   ·
+11 │     public fun bing(_: bool, _: address, _: u64) {
+   │                        ---- Expected: 'bool'
+   ·
+46 │         let () = X::bing (X::baz (@0x0, 1));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::X::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:51:18
+   │
+51 │         let () = bing(baz(bar(foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^
+   │                  │   │
+   │                  │   Found 1 argument(s) here
+   │                  Invalid call of '0x2::M::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:51:18
+   │
+22 │     fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                    -------------- Given: '(bool, (address, u64), _)'
+   ·
+25 │     fun bing(_: bool, _: address, _: u64) {
+   │                 ---- Expected: 'bool'
+   ·
+51 │         let () = bing(baz(bar(foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::M::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:51:23
+   │
+51 │         let () = bing(baz(bar(foo())));
+   │                       ^^^^^^^^^^^^^^^
+   │                       │  │
+   │                       │  Found 1 argument(s) here
+   │                       Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:51:23
+   │
+19 │     fun bar(x: u64): (address, u64) {
+   │                      -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+51 │         let () = bing(baz(bar(foo())));
+   │                       ^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:52:18
+   │
+52 │         let () = bing (baz (bar (foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^
+   │                  │    │
+   │                  │    Found 1 argument(s) here
+   │                  Invalid call of '0x2::M::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:52:18
+   │
+22 │     fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                    -------------- Given: '(bool, (address, u64), _)'
+   ·
+25 │     fun bing(_: bool, _: address, _: u64) {
+   │                 ---- Expected: 'bool'
+   ·
+52 │         let () = bing (baz (bar (foo())));
+   │                  ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::M::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:52:24
+   │
+52 │         let () = bing (baz (bar (foo())));
+   │                        ^^^^^^^^^^^^^^^^^
+   │                        │   │
+   │                        │   Found 1 argument(s) here
+   │                        Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:52:24
+   │
+19 │     fun bar(x: u64): (address, u64) {
+   │                      -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+52 │         let () = bing (baz (bar (foo())));
+   │                        ^^^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:53:18
+   │
+53 │         let () = bing (baz (bar(1)));
+   │                  ^^^^^^^^^^^^^^^^^^^
+   │                  │    │
+   │                  │    Found 1 argument(s) here
+   │                  Invalid call of '0x2::M::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:53:18
+   │
+22 │     fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                    -------------- Given: '(bool, (address, u64), _)'
+   ·
+25 │     fun bing(_: bool, _: address, _: u64) {
+   │                 ---- Expected: 'bool'
+   ·
+53 │         let () = bing (baz (bar(1)));
+   │                  ^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::M::bing'. Invalid argument for parameter '_'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:53:24
+   │
+53 │         let () = bing (baz (bar(1)));
+   │                        ^^^^^^^^^^^^
+   │                        │   │
+   │                        │   Found 1 argument(s) here
+   │                        Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call.move:53:24
+   │
+19 │     fun bar(x: u64): (address, u64) {
+   │                      -------------- Expected a single non-reference type, but found: '(address, u64)'
+   ·
+53 │         let () = bing (baz (bar(1)));
+   │                        ^^^^^^^^^^^^ Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call.move:54:18
+   │
+54 │         let () = bing (baz (@0x0, 1));
+   │                  ^^^^^^^^^^^^^^^^^^^^
+   │                  │    │
+   │                  │    Found 1 argument(s) here
+   │                  Invalid call of '0x2::M::bing'. The call expected 3 argument(s) but got 1
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call.move:54:18
+   │
+22 │     fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+   │                                    -------------- Given: '(bool, address, {integer})'
+   ·
+25 │     fun bing(_: bool, _: address, _: u64) {
+   │                 ---- Expected: 'bool'
+   ·
+54 │         let () = bing (baz (@0x0, 1));
+   │                  ^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x2::M::bing'. Invalid argument for parameter '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.move
new file mode 100644
index 000000000..2888dc40c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call.move
@@ -0,0 +1,60 @@
+address 0x2 {
+
+module X {
+    public fun foo(): u64 { 0 }
+    public fun bar(x: u64): (address, u64) {
+        (@0x0, x)
+    }
+    public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+        (false, a, x)
+    }
+    public fun bing(_: bool, _: address, _: u64) {
+
+    }
+}
+
+module M {
+    use 0x2::X;
+    fun foo(): u64 { 0 }
+    fun bar(x: u64): (address, u64) {
+        (@0x0, x)
+    }
+    fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+        (false, a, x)
+    }
+    fun bing(_: bool, _: address, _: u64) {
+    }
+
+    fun t0() {
+        (X::foo(): u64);
+        (X::bar(0): (address, u64));
+        (X::baz(@0x0, 0): (bool, address, u64));
+        (X::bing(false, @0x0, 0): ());
+    }
+
+    fun t1() {
+        (foo(): u64);
+        (bar(0): (address, u64));
+        (baz(@0x0, 0): (bool, address, u64));
+        (bing(false, @0x0, 0): ());
+    }
+
+    fun t2() {
+        let () = X::bing(X::baz(X::bar(X::foo())));
+        let () = X::bing (X::baz (X::bar (X::foo())));
+        let () = X::bing (X::baz (X::bar(1)));
+        let () = X::bing (X::baz (@0x0, 1));
+        let () = X::bing (false, @0x0, 1);
+    }
+
+    fun t3() {
+        let () = bing(baz(bar(foo())));
+        let () = bing (baz (bar (foo())));
+        let () = bing (baz (bar(1)));
+        let () = bing (baz (@0x0, 1));
+        let () = bing (false, @0x0, 1);
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.exp
new file mode 100644
index 000000000..318bd43fa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.exp
@@ -0,0 +1,162 @@
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:11:9
+   │
+11 │         foo (if (cond) () else ());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:13:9
+   │
+13 │         baz (if (cond) (false, @0x0) else (true, @0x1));
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:13:9
+   │
+13 │         baz (if (cond) (false, @0x0) else (true, @0x1));
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                                 │
+   │         │                                 Expected a single non-reference type, but found: '(bool, address)'
+   │         Invalid type argument
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:17:9
+   │
+17 │         foo(if (cond) () else ());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:19:9
+   │
+19 │         baz(if (cond) (false, @0x0) else (true, @0x1));
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:19:9
+   │
+19 │         baz(if (cond) (false, @0x0) else (true, @0x1));
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                                │
+   │         │                                Expected a single non-reference type, but found: '(bool, address)'
+   │         Invalid type argument
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:23:9
+   │
+23 │         foo({});
+   │         ^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:24:9
+   │
+24 │         foo({ let _x = 0; });
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:31:9
+   │
+31 │         baz({ (a, x) });
+   │         ^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:31:9
+   │
+31 │         baz({ (a, x) });
+   │         ^^^^^^^^^^^^^^^
+   │         │     │
+   │         │     Expected a single non-reference type, but found: '(address, u64)'
+   │         Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:32:9
+   │
+32 │         baz({ let a = false; (a, x) });
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:32:9
+   │
+32 │         baz({ let a = false; (a, x) });
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                    │
+   │         │                    Expected a single non-reference type, but found: '(bool, u64)'
+   │         Invalid type argument
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:36:9
+   │
+36 │         foo({});
+   │         ^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:37:9
+   │
+37 │         foo({ let _x = 0; });
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:44:9
+   │
+44 │         baz({ (a, x) });
+   │         ^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:44:9
+   │
+44 │         baz({ (a, x) });
+   │         ^^^^^^^^^^^^^^^
+   │         │     │
+   │         │     Expected a single non-reference type, but found: '(address, u64)'
+   │         Invalid type argument
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:45:9
+   │
+45 │         baz({ let a = false; (a, x) });
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x8675309::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/module_call_complicated_rhs.move:45:9
+   │
+45 │         baz({ let a = false; (a, x) });
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                    │
+   │         │                    Expected a single non-reference type, but found: '(bool, u64)'
+   │         Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.move
new file mode 100644
index 000000000..5310bf4f7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_complicated_rhs.move
@@ -0,0 +1,47 @@
+module 0x8675309::M {
+    fun foo(): u64 { 0 }
+    fun bar(x: u64): (address, u64) {
+        (@0x0, x)
+    }
+    fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+        (false, a, x)
+    }
+
+    fun t0(cond: bool) {
+        foo (if (cond) () else ());
+        bar (if (cond) 0 else 0);
+        baz (if (cond) (false, @0x0) else (true, @0x1));
+    }
+
+    fun t1(cond: bool) {
+        foo(if (cond) () else ());
+        bar(if (cond) 0 else 0);
+        baz(if (cond) (false, @0x0) else (true, @0x1));
+    }
+
+    fun t2() {
+        foo({});
+        foo({ let _x = 0; });
+
+        let x = 0;
+        bar({ x });
+        bar({ let x = 0; x });
+
+        let a = @0x0;
+        baz({ (a, x) });
+        baz({ let a = false; (a, x) });
+    }
+
+    fun t3() {
+        foo({});
+        foo({ let _x = 0; });
+
+        let x = 0;
+        bar({ x });
+        bar({ let x = 0; x });
+
+        let a = @0x0;
+        baz({ (a, x) });
+        baz({ let a = false; (a, x) });
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp
new file mode 100644
index 000000000..93c3ea62c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp
@@ -0,0 +1,312 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:28:9
+   │
+ 2 │     struct S has copy, drop {}
+   │            - To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                 --- 'key' constraint declared here
+   ·
+28 │         both(S{}, Coin{});
+   │         ^^^^^^^^^^^^^^^^^
+   │         │    │
+   │         │    The type '0x8675309::M::S' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:28:9
+   │
+ 3 │     struct Coin has key {}
+   │            ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                         ---- 'copy' constraint declared here
+   ·
+28 │         both(S{}, Coin{});
+   │         ^^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         The type '0x8675309::M::Coin' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:29:9
+   │
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                 --- 'key' constraint declared here
+   ·
+29 │         both(0, Coin{})
+   │         ^^^^^^^^^^^^^^^
+   │         │    │
+   │         │    The type 'u64' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:29:9
+   │
+ 3 │     struct Coin has key {}
+   │            ---- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                         ---- 'copy' constraint declared here
+   ·
+29 │         both(0, Coin{})
+   │         ^^^^^^^^^^^^^^^
+   │         │       │
+   │         │       The type '0x8675309::M::Coin' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:33:9
+   │
+ 4 │     struct Box<T> has copy, drop { f: T }
+   │            --- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+ 7 │     fun new_box<T>(): Box<T> {
+   │                       ------ The type '0x8675309::M::Box<C>' does not have the ability 'key'
+   ·
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                 --- 'key' constraint declared here
+   ·
+33 │         both(new_box<C>(), new_box<R>())
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:33:9
+   │
+ 7 │     fun new_box<T>(): Box<T> {
+   │                       ------ The type '0x8675309::M::Box<R>' does not have the ability 'copy'
+   ·
+15 │     fun both<R: key, C: copy>(_r: R, _c: C) {
+   │                         ---- 'copy' constraint declared here
+   ·
+33 │         both(new_box<C>(), new_box<R>())
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                          │
+   │         │                          The type '0x8675309::M::Box<R>' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:37:9
+   │
+ 5 │     struct Box3<T1, T2, T3> has copy, drop { f1: T1, f2: T2, f3: T3 }
+   │            ---- To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, C, C>' does not have the ability 'key'
+   ·
+23 │     fun rsrc<R: key>(_r: R) {
+   │                 --- 'key' constraint declared here
+   ·
+37 │         rsrc(new_box3<C, C, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:39:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<R, C, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+39 │         cpy(new_box3<R, C, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<R, C, C>' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:40:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, R, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+40 │         cpy(new_box3<C, R, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, R, C>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:41:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, C, R>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+41 │         cpy(new_box3<C, C, R>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, C, R>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:43:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, R, R>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+43 │         cpy(new_box3<C, R, R>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, R, R>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:44:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<R, C, R>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+44 │         cpy(new_box3<R, C, R>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<R, C, R>' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:45:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<R, R, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+45 │         cpy(new_box3<R, R, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<R, R, C>' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:47:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<R, R, R>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+47 │         cpy(new_box3<R, R, R>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<R, R, R>' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:51:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<U, C, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+51 │         cpy(new_box3<U, C, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<U, C, C>' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:52:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, U, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+52 │         cpy(new_box3<C, U, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, U, C>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:53:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, C, U>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+53 │         cpy(new_box3<C, C, U>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, C, U>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:55:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<C, U, U>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+55 │         cpy(new_box3<C, U, U>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<C, U, U>' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:56:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<U, C, U>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+56 │         cpy(new_box3<U, C, U>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<U, C, U>' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:57:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<U, U, C>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+57 │         cpy(new_box3<U, U, C>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<U, U, C>' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:59:9
+   │
+11 │     fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+   │                                 ---------------- The type '0x8675309::M::Box3<U, U, U>' does not have the ability 'copy'
+   ·
+19 │     fun cpy<C: copy>(_c: C) {
+   │                ---- 'copy' constraint declared here
+   ·
+59 │         cpy(new_box3<U, U, U>());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            The type '0x8675309::M::Box3<U, U, U>' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy'
+   │         'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.move
new file mode 100644
index 000000000..22470e4d2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.move
@@ -0,0 +1,61 @@
+module 0x8675309::M {
+    struct S has copy, drop {}
+    struct Coin has key {}
+    struct Box<T> has copy, drop { f: T }
+    struct Box3<T1, T2, T3> has copy, drop { f1: T1, f2: T2, f3: T3 }
+
+    fun new_box<T>(): Box<T> {
+        abort 0
+    }
+
+    fun new_box3<T1, T2, T3>(): Box3<T1, T2, T3> {
+        abort 0
+    }
+
+    fun both<R: key, C: copy>(_r: R, _c: C) {
+        abort 0
+    }
+
+    fun cpy<C: copy>(_c: C) {
+        abort 0
+    }
+
+    fun rsrc<R: key>(_r: R) {
+        abort 0
+    }
+
+    fun t0() {
+        both(S{}, Coin{});
+        both(0, Coin{})
+    }
+
+    fun t1<R: key, C: drop>() {
+        both(new_box<C>(), new_box<R>())
+    }
+
+    fun t2<R: key, C: drop>() {
+        rsrc(new_box3<C, C, C>());
+
+        cpy(new_box3<R, C, C>());
+        cpy(new_box3<C, R, C>());
+        cpy(new_box3<C, C, R>());
+
+        cpy(new_box3<C, R, R>());
+        cpy(new_box3<R, C, R>());
+        cpy(new_box3<R, R, C>());
+
+        cpy(new_box3<R, R, R>());
+    }
+
+    fun t3<U, C: drop>() {
+        cpy(new_box3<U, C, C>());
+        cpy(new_box3<C, U, C>());
+        cpy(new_box3<C, C, U>());
+
+        cpy(new_box3<C, U, U>());
+        cpy(new_box3<U, C, U>());
+        cpy(new_box3<U, U, C>());
+
+        cpy(new_box3<U, U, U>());
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function.move
new file mode 100644
index 000000000..b89be8a6d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function.move
@@ -0,0 +1,37 @@
+address 0x2 {
+
+// no visibility restructions around entry
+
+
+module X {
+    public fun f_public() {}
+    public entry fun f_script() {}
+}
+
+module Y {
+    friend 0x2::M;
+    public(friend) fun f_friend() {}
+}
+
+module M {
+    use 0x2::X;
+    use 0x2::Y;
+
+    public fun f_public() {}
+    public(friend) fun f_friend() {}
+    public entry fun f_script() {}
+    fun f_private() {}
+
+    public entry fun f_script_call_script() { X::f_script() }
+
+    public entry fun f_script_call_friend() { Y::f_friend() }
+
+    public entry fun f_script_call_public() { X::f_public() }
+
+    public entry fun f_script_call_self_private() { Self::f_private() }
+    public entry fun f_script_call_self_public() { Self::f_public() }
+    public entry fun f_script_call_self_friend() { Self::f_friend() }
+    public entry fun f_script_call_self_script() { Self::f_script() }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp
new file mode 100644
index 000000000..03093b840
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.exp
@@ -0,0 +1,9 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/module_call_entry_function_was_invalid.move:26:48
+   │
+ 8 │     fun f_private() {}
+   │         --------- This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+26 │     public entry fun f_script_call_private() { X::f_private() }
+   │                                                ^^^^^^^^^^^^^^ Invalid call to '0x2::X::f_private'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move
new file mode 100644
index 000000000..3d9fe2f03
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move
@@ -0,0 +1,31 @@
+address 0x2 {
+
+// entry functions (previously public(script)) used to have visbility restrictions.
+// These have been removed
+
+module X {
+    friend 0x2::M;
+    fun f_private() {}
+    public entry fun f_script() {}
+    public(friend) fun f_friend() {}
+}
+
+module M {
+    use 0x2::X;
+
+    public entry fun f_script_call_script() { X::f_script() }
+
+    fun f_private_call_script() { X::f_script() }
+    public(friend) fun f_friend_call_script() { X::f_script() }
+    public fun f_public_call_script() { X::f_script() }
+
+    fun f_private_call_self_script() { f_script_call_script() }
+    public(friend) fun f_friend_call_self_script() { f_script_call_script() }
+    public fun f_public_call_self_script() { f_script_call_script() }
+
+    public entry fun f_script_call_private() { X::f_private() }
+
+    public entry fun f_script_call_friend() { X::f_friend() }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.exp
new file mode 100644
index 000000000..f20d70f9c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.exp
@@ -0,0 +1,24 @@
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments.move:2:33
+  │  
+2 │       fun foo<T, U>(_x: T, _y: U) {
+  │               -     --  - The type 'T' does not have the ability 'drop'
+  │               │     │    
+  │               │     The parameter '_x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+  │               To satisfy the constraint, the 'drop' ability would need to be added here
+  │ ╭─────────────────────────────────^
+3 │ │     }
+  │ ╰─────^ Invalid return
+
+error[E06001]: unused value without 'drop'
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments.move:2:33
+  │  
+2 │       fun foo<T, U>(_x: T, _y: U) {
+  │                  -         --  - The type 'U' does not have the ability 'drop'
+  │                  │         │    
+  │                  │         The parameter '_y' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+  │                  To satisfy the constraint, the 'drop' ability would need to be added here
+  │ ╭─────────────────────────────────^
+3 │ │     }
+  │ ╰─────^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.move
new file mode 100644
index 000000000..09f9fcd51
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    fun foo<T, U>(_x: T, _y: U) {
+    }
+
+    fun t1() {
+        foo<bool, bool>(false, false);
+        foo<u64, bool>(0, false);
+        foo<bool, u64>(false, 0);
+        foo<u64, u64>(0, 0);
+    }
+
+    fun t2<T, U, V>(t: T, u: U, v: V) {
+        foo<T, u64>(t, 0);
+        foo<U, V>(u, v);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.exp
new file mode 100644
index 000000000..a628c3ea1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.exp
@@ -0,0 +1,95 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:6:9
+  │
+6 │         foo<u64, u64>(false, false);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │         │
+  │         │   │         Given: 'bool'
+  │         │   Expected: 'u64'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:6:9
+  │
+6 │         foo<u64, u64>(false, false);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │        │           │
+  │         │        │           Given: 'bool'
+  │         │        Expected: 'u64'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:7:9
+  │
+7 │         foo<bool, bool>(0, false);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │   │           │
+  │         │   │           Given: integer
+  │         │   Expected: 'bool'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:8:9
+  │
+8 │         foo<bool, bool>(false, 0);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │         │            │
+  │         │         │            Given: integer
+  │         │         Expected: 'bool'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:9:9
+  │
+9 │         foo<bool, bool>(0, 0);
+  │         ^^^^^^^^^^^^^^^^^^^^^
+  │         │   │           │
+  │         │   │           Given: integer
+  │         │   Expected: 'bool'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:9:9
+  │
+9 │         foo<bool, bool>(0, 0);
+  │         ^^^^^^^^^^^^^^^^^^^^^
+  │         │         │        │
+  │         │         │        Given: integer
+  │         │         Expected: 'bool'
+  │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:13:9
+   │
+12 │     fun t2<T, U, V>(t: T, u: U, v: V) {
+   │                        - Given: 'T'
+13 │         foo<U, u64>(t, 0);
+   │         ^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Expected: 'U'
+   │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:14:9
+   │
+12 │     fun t2<T, U, V>(t: T, u: U, v: V) {
+   │                              - Given: 'U'
+13 │         foo<U, u64>(t, 0);
+14 │         foo<V, T>(u, v);
+   │         ^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Expected: 'V'
+   │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_explicit_type_arguments_invalid.move:14:9
+   │
+12 │     fun t2<T, U, V>(t: T, u: U, v: V) {
+   │                                    - Given: 'V'
+13 │         foo<U, u64>(t, 0);
+14 │         foo<V, T>(u, v);
+   │         ^^^^^^^^^^^^^^^
+   │         │      │
+   │         │      Expected: 'T'
+   │         Invalid call of '0x8675309::M::foo'. Invalid argument for parameter '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.move
new file mode 100644
index 000000000..0e5c56c14
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_explicit_type_arguments_invalid.move
@@ -0,0 +1,17 @@
+module 0x8675309::M {
+    fun foo<T, U>(_: T, _: U) {
+    }
+
+    fun t1() {
+        foo<u64, u64>(false, false);
+        foo<bool, bool>(0, false);
+        foo<bool, bool>(false, 0);
+        foo<bool, bool>(0, 0);
+    }
+
+    fun t2<T, U, V>(t: T, u: U, v: V) {
+        foo<U, u64>(t, 0);
+        foo<V, T>(u, v);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.exp
new file mode 100644
index 000000000..a4663b828
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.exp
@@ -0,0 +1,9 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/module_call_internal.move:10:9
+   │
+ 4 │     fun foo() {}
+   │         --- This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+10 │         X::foo()
+   │         ^^^^^^^^ Invalid call to '0x2::X::foo'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.move
new file mode 100644
index 000000000..d9dc614f7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_internal.move
@@ -0,0 +1,14 @@
+address 0x2 {
+
+module X {
+    fun foo() {}
+}
+
+module M {
+    use 0x2::X;
+    fun foo() {
+        X::foo()
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.exp
new file mode 100644
index 000000000..d86facbff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.exp
@@ -0,0 +1,18 @@
+error[E03003]: unbound module member
+   ┌─ tests/move_check/typing/module_call_missing_function.move:13:9
+   │
+13 │         Self::fooo();
+   │         ^^^^^^^^^^ Invalid module access. Unbound function 'fooo' in module '0x2::M'
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/typing/module_call_missing_function.move:14:9
+   │
+14 │         foooo();
+   │         ^^^^^ Unbound function 'foooo' in current scope
+
+error[E03003]: unbound module member
+   ┌─ tests/move_check/typing/module_call_missing_function.move:15:9
+   │
+15 │         X::foooooo();
+   │         ^^^^^^^^^^ Invalid module access. Unbound function 'foooooo' in module '0x2::X'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.move
new file mode 100644
index 000000000..f5c59fb2e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_missing_function.move
@@ -0,0 +1,19 @@
+address 0x2 {
+
+module X {
+    public fun foo(): u64 { 0 }
+}
+
+module M {
+    use 0x2::X;
+
+    fun foo(): u64 { 0 }
+
+    fun t0() {
+        Self::fooo();
+        foooo();
+        X::foooooo();
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend.move
new file mode 100644
index 000000000..2e963c31a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend.move
@@ -0,0 +1,43 @@
+address 0x2 {
+
+module X {
+    public fun f_public() {}
+}
+
+module Y {
+    friend 0x2::M;
+    public(friend) fun f_friend() {}
+}
+
+module M {
+    use 0x2::X;
+    use 0x2::Y;
+
+    public fun f_public() {}
+    public(friend) fun f_friend() {}
+    fun f_private() {}
+
+    // a public(friend) fun can call public funs in another module
+    public(friend) fun f_friend_call_public() { X::f_public() }
+
+    // a public(friend) fun can call private and public funs defined in its own module
+    public(friend) fun f_friend_call_self_private() { Self::f_private() }
+    public(friend) fun f_friend_call_self_public() { Self::f_public() }
+
+    // a public functions can call a public(friend) function defined in the same module
+    // as well as friend functions defined in other modules (subject to friend list)
+    public fun f_public_call_friend() { Y::f_friend() }
+    public fun f_public_call_self_friend() { Self::f_friend() }
+
+    // a public(friend) functions can call a public(friend) function defined in the same module
+    // as well as friend functions defined in other modules (subject to friend list)
+    public(friend) fun f_friend_call_friend() { Y::f_friend() }
+    public(friend) fun f_friend_call_self_friend() { Self::f_friend() }
+
+    // a private functions can call a public(friend) function defined in the same module
+    // as well as friend functions defined in other modules (subject to friend list)
+    fun f_private_call_friend() { Y::f_friend() }
+    fun f_private_call_self_friend() { Self::f_friend() }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp
new file mode 100644
index 000000000..a36e2c63c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.exp
@@ -0,0 +1,27 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/module_call_visibility_friend_invalid.move:18:49
+   │
+ 5 │     public(friend) fun f_friend() {}
+   │     -------------- This function can only be called from a 'friend' of module '0x2::X'
+   ·
+18 │     public(friend) fun f_friend_call_friend() { X::f_friend() }
+   │                                                 ^^^^^^^^^^^^^ Invalid call to '0x2::X::f_friend'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/module_call_visibility_friend_invalid.move:22:52
+   │
+ 4 │     fun f_private() {}
+   │         --------- This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+22 │     public(friend) fun f_friend_call_private_1() { X::f_private() }
+   │                                                    ^^^^^^^^^^^^^^ Invalid call to '0x2::X::f_private'
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/module_call_visibility_friend_invalid.move:23:52
+   │
+10 │     fun f_private() {}
+   │         --------- This function is internal to its module. Only 'public', 'public(friend)', and 'public(package)' functions can be called outside of their module
+   ·
+23 │     public(friend) fun f_friend_call_private_2() { Y::f_private() }
+   │                                                    ^^^^^^^^^^^^^^ Invalid call to '0x2::Y::f_private'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.move
new file mode 100644
index 000000000..479acd863
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_visibility_friend_invalid.move
@@ -0,0 +1,26 @@
+address 0x2 {
+
+module X {
+    fun f_private() {}
+    public(friend) fun f_friend() {}
+}
+
+module Y {
+    friend 0x2::M;
+    fun f_private() {}
+}
+
+module M {
+    use 0x2::X;
+    use 0x2::Y;
+
+    // a public(friend) fun cannot call friend funs in other modules if not being in the friend list
+    public(friend) fun f_friend_call_friend() { X::f_friend() }
+
+    // a public(friend) fun cannot call private funs in other modules, regardless of whether being
+    // in the friend list of not.
+    public(friend) fun f_friend_call_private_1() { X::f_private() }
+    public(friend) fun f_friend_call_private_2() { Y::f_private() }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.exp
new file mode 100644
index 000000000..5cd720d62
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.exp
@@ -0,0 +1,216 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:20:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+20 │         foo(false, 0, S{});
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:21:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+21 │         foo(@0x0, false, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:22:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::M::S'
+   ·
+22 │         foo(@0x0, 0, false);
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:23:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+23 │         foo(@0x0, false, false);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:23:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::M::S'
+   ·
+23 │         foo(@0x0, false, false);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                │
+   │         │                Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:24:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+24 │         foo(false, 0, false);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:24:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::M::S'
+   ·
+24 │         foo(false, 0, false);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │             │
+   │         │             Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:25:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+25 │         foo(false, false, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │   │
+   │         │   Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:25:9
+   │
+16 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+25 │         foo(false, false, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │          │
+   │         │          Given: 'bool'
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:29:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+29 │         X::foo(false, 0, X::s());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │      │
+   │         │      Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:30:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+30 │         X::foo(@0x0, false, X::s());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:31:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::X::S'
+   ·
+31 │         X::foo(@0x0, 0, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │               │
+   │         │               Given: '0x2::M::S'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:32:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+32 │         X::foo(@0x0, false, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:32:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::X::S'
+   ·
+32 │         X::foo(@0x0, false, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                   │
+   │         │                   Given: '0x2::M::S'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:33:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+33 │         X::foo(false, 0, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │      │
+   │         │      Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:33:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                           - Expected: '0x2::X::S'
+   ·
+33 │         X::foo(false, 0, S{});
+   │         ^^^^^^^^^^^^^^^^^^^^^
+   │         │                │
+   │         │                Given: '0x2::M::S'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:34:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                       ------- Expected: 'address'
+   ·
+34 │         X::foo(false, false, X::s());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │      │
+   │         │      Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_argument_in_list.move:34:9
+   │
+ 8 │     public fun foo(_: address, _: u64, _: S) {
+   │                                   --- Expected: 'u64'
+   ·
+34 │         X::foo(false, false, X::s());
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │             │
+   │         │             Given: 'bool'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.move
new file mode 100644
index 000000000..1e281a3c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_argument_in_list.move
@@ -0,0 +1,39 @@
+address 0x2 {
+
+module X {
+    struct S {}
+    public fun s(): S {
+        S{}
+    }
+    public fun foo(_: address, _: u64, _: S) {
+    }
+}
+
+module M {
+    use 0x2::X;
+    struct S {}
+
+    public fun foo(_: address, _: u64, _: S) {
+    }
+
+    fun t0() {
+        foo(false, 0, S{});
+        foo(@0x0, false, S{});
+        foo(@0x0, 0, false);
+        foo(@0x0, false, false);
+        foo(false, 0, false);
+        foo(false, false, S{});
+    }
+
+    fun t1() {
+        X::foo(false, 0, X::s());
+        X::foo(@0x0, false, X::s());
+        X::foo(@0x0, 0, S{});
+        X::foo(@0x0, false, S{});
+        X::foo(false, 0, S{});
+        X::foo(false, false, X::s());
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.exp
new file mode 100644
index 000000000..ab235c5ee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.exp
@@ -0,0 +1,126 @@
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:27:9
+   │
+27 │         X::foo(1);
+   │         ^^^^^^^^^
+   │         │     │
+   │         │     Found 1 argument(s) here
+   │         Invalid call of '0x2::X::foo'. The call expected 0 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:28:9
+   │
+28 │         X::foo(1, 2);
+   │         ^^^^^^^^^^^^
+   │         │     │
+   │         │     Found 2 argument(s) here
+   │         Invalid call of '0x2::X::foo'. The call expected 0 argument(s) but got 2
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:29:9
+   │
+29 │         X::bar();
+   │         ^^^^^^^^
+   │         │     │
+   │         │     Found 0 argument(s) here
+   │         Invalid call of '0x2::X::bar'. The call expected 1 argument(s) but got 0
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:30:9
+   │
+30 │         X::bar(1, 2);
+   │         ^^^^^^^^^^^^
+   │         │     │
+   │         │     Found 2 argument(s) here
+   │         Invalid call of '0x2::X::bar'. The call expected 1 argument(s) but got 2
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:31:9
+   │
+31 │         X::baz<u64, u64>();
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │               │
+   │         │               Found 0 argument(s) here
+   │         Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 0
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:32:9
+   │
+32 │         X::baz<u64, u64>(1);
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │               │
+   │         │               Found 1 argument(s) here
+   │         Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:33:9
+   │
+33 │         X::baz(1, 2, 3);
+   │         ^^^^^^^^^^^^^^^
+   │         │     │
+   │         │     Found 3 argument(s) here
+   │         Invalid call of '0x2::X::baz'. The call expected 2 argument(s) but got 3
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:37:9
+   │
+37 │         foo(1);
+   │         ^^^^^^
+   │         │  │
+   │         │  Found 1 argument(s) here
+   │         Invalid call of '0x2::M::foo'. The call expected 0 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:38:9
+   │
+38 │         foo(1, 2);
+   │         ^^^^^^^^^
+   │         │  │
+   │         │  Found 2 argument(s) here
+   │         Invalid call of '0x2::M::foo'. The call expected 0 argument(s) but got 2
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:39:9
+   │
+39 │         bar();
+   │         ^^^^^
+   │         │  │
+   │         │  Found 0 argument(s) here
+   │         Invalid call of '0x2::M::bar'. The call expected 1 argument(s) but got 0
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:40:9
+   │
+40 │         bar(1, 2);
+   │         ^^^^^^^^^
+   │         │  │
+   │         │  Found 2 argument(s) here
+   │         Invalid call of '0x2::M::bar'. The call expected 1 argument(s) but got 2
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:41:9
+   │
+41 │         baz<u64, u64>();
+   │         ^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Found 0 argument(s) here
+   │         Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 0
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:42:9
+   │
+42 │         baz<u64, u64>(1);
+   │         ^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Found 1 argument(s) here
+   │         Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 1
+
+error[E04017]: too many arguments
+   ┌─ tests/move_check/typing/module_call_wrong_arity.move:43:9
+   │
+43 │         baz(1, 2, 3);
+   │         ^^^^^^^^^^^^
+   │         │  │
+   │         │  Found 3 argument(s) here
+   │         Invalid call of '0x2::M::baz'. The call expected 2 argument(s) but got 3
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.move
new file mode 100644
index 000000000..0c953a83f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_arity.move
@@ -0,0 +1,48 @@
+
+address 0x2 {
+
+module X {
+    public fun foo(): u64 { 0 }
+    public fun bar(x: u64): (address, u64) {
+        (@0x0, x)
+    }
+    public fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+        (false, a, x)
+    }
+}
+
+
+module M {
+    use 0x2::X;
+
+    fun foo(): u64 { 0 }
+    fun bar(x: u64): (address, u64) {
+        (@0x0, x)
+    }
+    fun baz<T1, T2>(a: T1, x: T2): (bool, T1, T2) {
+        (false, a, x)
+    }
+
+    fun t0() {
+        X::foo(1);
+        X::foo(1, 2);
+        X::bar();
+        X::bar(1, 2);
+        X::baz<u64, u64>();
+        X::baz<u64, u64>(1);
+        X::baz(1, 2, 3);
+    }
+
+    fun t1() {
+        foo(1);
+        foo(1, 2);
+        bar();
+        bar(1, 2);
+        baz<u64, u64>();
+        baz<u64, u64>(1);
+        baz(1, 2, 3);
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.exp
new file mode 100644
index 000000000..01f070042
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.exp
@@ -0,0 +1,84 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:24:9
+   │
+17 │     public fun foo(_: S) {
+   │                       - Expected: '0x2::M::S'
+   ·
+24 │         foo(0);
+   │         ^^^^^^
+   │         │   │
+   │         │   Given: integer
+   │         Invalid call of '0x2::M::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:25:9
+   │
+20 │     public fun bar(_: u64) {
+   │                       --- Expected: 'u64'
+   ·
+25 │         bar(S{});
+   │         ^^^^^^^^
+   │         │   │
+   │         │   Given: '0x2::M::S'
+   │         Invalid call of '0x2::M::bar'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:26:9
+   │
+20 │     public fun bar(_: u64) {
+   │                       --- Expected: 'u64'
+   ·
+26 │         bar(@0x0);
+   │         ^^^^^^^^^
+   │         │   │
+   │         │   Given: 'address'
+   │         Invalid call of '0x2::M::bar'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:30:9
+   │
+ 6 │     public fun foo(_: S) {
+   │                       - Expected: '0x2::X::S'
+   ·
+30 │         X::foo(S{});
+   │         ^^^^^^^^^^^
+   │         │      │
+   │         │      Given: '0x2::M::S'
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:31:9
+   │
+ 6 │     public fun foo(_: S) {
+   │                       - Expected: '0x2::X::S'
+   ·
+31 │         X::foo(0);
+   │         ^^^^^^^^^
+   │         │      │
+   │         │      Given: integer
+   │         Invalid call of '0x2::X::foo'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:32:9
+   │
+ 9 │     public fun bar(_: u64) {
+   │                       --- Expected: 'u64'
+   ·
+32 │         X::bar(S{});
+   │         ^^^^^^^^^^^
+   │         │      │
+   │         │      Given: '0x2::M::S'
+   │         Invalid call of '0x2::X::bar'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/module_call_wrong_single_argument.move:33:9
+   │
+ 9 │     public fun bar(_: u64) {
+   │                       --- Expected: 'u64'
+   ·
+33 │         X::bar(false);
+   │         ^^^^^^^^^^^^^
+   │         │      │
+   │         │      Given: 'bool'
+   │         Invalid call of '0x2::X::bar'. Invalid argument for parameter '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.move b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.move
new file mode 100644
index 000000000..197a5fb57
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/module_call_wrong_single_argument.move
@@ -0,0 +1,38 @@
+address 0x2 {
+
+module X {
+    struct S {}
+
+    public fun foo(_: S) {
+    }
+
+    public fun bar(_: u64) {
+    }
+}
+
+module M {
+    use 0x2::X;
+    struct S {}
+
+    public fun foo(_: S) {
+    }
+
+    public fun bar(_: u64) {
+    }
+
+    fun t0() {
+        foo(0);
+        bar(S{});
+        bar(@0x0);
+    }
+
+    fun t1() {
+        X::foo(S{});
+        X::foo(0);
+        X::bar(S{});
+        X::bar(false);
+    }
+
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.exp
new file mode 100644
index 000000000..a2964c389
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.exp
@@ -0,0 +1,59 @@
+error[E07001]: referential transparency violated
+  ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:6:9
+  │
+6 │         &mut (&s).v;
+  │         ^^^^^^^^^^^
+  │         │    │
+  │         │    Immutable because of this position
+  │         Invalid mutable borrow from an immutable reference
+
+error[E07001]: referential transparency violated
+  ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:7:9
+  │
+7 │         &mut (&s.x).f;
+  │         ^^^^^^^^^^^^^
+  │         │    │
+  │         │    Immutable because of this position
+  │         Invalid mutable borrow from an immutable reference
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:10:9
+   │
+ 8 │         let sref = &s;
+   │                    -- Immutable because of this position
+ 9 │         let xref = &s.x;
+10 │         &mut sref.v;
+   │         ^^^^^^^^^^^ Invalid mutable borrow from an immutable reference
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:11:9
+   │
+ 9 │         let xref = &s.x;
+   │                    ---- Immutable because of this position
+10 │         &mut sref.v;
+11 │         &mut xref.v;
+   │         ^^^^^^^^^^^ Invalid mutable borrow from an immutable reference
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:11:14
+   │
+11 │         &mut xref.v;
+   │              ^^^^^^ Unbound field 'v' in '0x8675309::M::X'
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:15:9
+   │
+14 │     fun t2(s: &S, x: &X) {
+   │                      -- Immutable because of this position
+15 │         x.f = x.f + 1;
+   │         ^^^ Invalid mutable borrow from an immutable reference
+
+error[E07001]: referential transparency violated
+   ┌─ tests/move_check/typing/mutable_borrow_from_immutable.move:16:9
+   │
+14 │     fun t2(s: &S, x: &X) {
+   │               -- Immutable because of this position
+15 │         x.f = x.f + 1;
+16 │         s.x.f = s.x.f + 1
+   │         ^^^^^ Invalid mutable borrow from an immutable reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.move
new file mode 100644
index 000000000..1c42e445e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_borrow_from_immutable.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct X { f: u64 }
+    struct S { v: u64, x: X }
+    fun t() {
+        let s = S { v: 0, x: X { f: 0 }};
+        &mut (&s).v;
+        &mut (&s.x).f;
+        let sref = &s;
+        let xref = &s.x;
+        &mut sref.v;
+        &mut xref.v;
+    }
+
+    fun t2(s: &S, x: &X) {
+        x.f = x.f + 1;
+        s.x.f = s.x.f + 1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq.move
new file mode 100644
index 000000000..eb94e8b06
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct S { f: u64, g: u64 }
+    struct B { f: bool }
+    struct P { b1: B, b2: B }
+
+    fun t(r1: &mut u64, r2: &mut u64, s: &mut S) {
+        r1 == r1;
+        r1 == r2;
+        r2 == r2;
+        r2 == r2;
+
+        r1 != r1;
+        r1 != r2;
+        r2 != r2;
+        r2 != r2;
+
+        (&mut s.f) == (&mut s.f);
+        (&mut s.f) == (&mut s.g);
+        (&mut s.g) == (&mut s.f);
+        (&mut s.g) == (&mut s.g);
+
+        (&mut s.f) != (&mut s.f);
+        (&mut s.f) != (&mut s.g);
+        (&mut s.g) != (&mut s.f);
+        (&mut s.g) != (&mut s.g);
+    }
+
+    fun t1(p: &mut P) {
+        let comp = (&mut p.b1) == (&mut p.b2);
+        p.b1.f = comp
+    }
+
+    fun t2(p: &mut P) {
+        let comp = (&mut p.b1) != (&mut p.b2);
+        p.b1.f = comp
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.exp
new file mode 100644
index 000000000..bc44ea7ec
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.exp
@@ -0,0 +1,16 @@
+error[E07002]: mutable ownership violated
+  ┌─ tests/move_check/typing/mutable_eq_and_neq_invalid.move:7:20
+  │
+6 │         let f = &mut p.b1.f;
+  │                 ----------- Field 'f' is still being mutably borrowed by this reference
+7 │         let comp = (&mut p.b1) == (&mut p.b2);
+  │                    ^^^^^^^^^^^ Invalid freeze.
+
+error[E07002]: mutable ownership violated
+   ┌─ tests/move_check/typing/mutable_eq_and_neq_invalid.move:13:20
+   │
+12 │         let f = &mut p.b1.f;
+   │                 ----------- Field 'f' is still being mutably borrowed by this reference
+13 │         let comp = (&mut p.b1) != (&mut p.b2);
+   │                    ^^^^^^^^^^^ Invalid freeze.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.move
new file mode 100644
index 000000000..a36ce668e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutable_eq_and_neq_invalid.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct B { f: bool }
+    struct P { b1: B, b2: B }
+
+    fun t0(p: &mut P) {
+        let f = &mut p.b1.f;
+        let comp = (&mut p.b1) == (&mut p.b2);
+        *f = comp
+    }
+
+    fun t1(p: &mut P) {
+        let f = &mut p.b1.f;
+        let comp = (&mut p.b1) != (&mut p.b2);
+        *f = comp
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate.move
new file mode 100644
index 000000000..0f9f5ebfe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate.move
@@ -0,0 +1,32 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64 }
+    fun t0() {
+        *&mut 0 = 1;
+        *&mut S{f:0}.f = 1;
+        *foo(&mut 0) = 1;
+        bar(&mut S{f:0}).f = 1;
+        *&mut bar(&mut S{f:0}).f = 1;
+        baz().f = 1;
+        *&mut baz().f = 1;
+    }
+
+    fun t1() {
+        let r = &mut S{ f: 0 };
+        *r = S { f: 1 };
+
+        r.f = 1;
+        *&mut r.f = 1;
+    }
+
+    fun foo(x: &mut u64): &mut u64 {
+        x
+    }
+
+    fun bar(s: &mut S): &mut S {
+        s
+    }
+
+    fun baz(): S {
+        S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.exp
new file mode 100644
index 000000000..bd85c9158
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.exp
@@ -0,0 +1,12 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/mutate_field_internal.move:13:9
+   │
+13 │         X::s().f = 0;
+   │         ^^^^^^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/mutate_field_internal.move:15:9
+   │
+15 │         s.f = 0;
+   │         ^^^ Invalid access of field 'f' on '0x2::X::S'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.move
new file mode 100644
index 000000000..2d8bdf344
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_field_internal.move
@@ -0,0 +1,20 @@
+address 0x2 {
+
+module X {
+    struct S { f: u64 }
+    public fun s(): S {
+        S { f: 0 }
+    }
+}
+
+module M {
+    use 0x2::X;
+    fun t0() {
+        X::s().f = 0;
+        let s = &mut X::s();
+        s.f = 0;
+        abort 0
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.exp
new file mode 100644
index 000000000..30f9afa6f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.exp
@@ -0,0 +1,31 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/mutate_immutable.move:5:10
+  │
+5 │         *(s: &S) = S { f: 0 };
+  │          ^^^^^^^
+  │          │   │
+  │          │   Given: '&0x8675309::M::S'
+  │          Invalid mutation. Expected a mutable reference
+  │          Expected: '&mut _'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/mutate_immutable.move:6:10
+  │
+6 │         *&0 = 1;
+  │          ^^
+  │          │
+  │          Invalid mutation. Expected a mutable reference
+  │          Expected: '&mut _'
+  │          Given: '&{integer}'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/mutate_immutable.move:10:10
+   │
+ 9 │         let x_ref: &u64 = x_ref;
+   │                    ---- Given: '&u64'
+10 │         *x_ref = 0;
+   │          ^^^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.move
new file mode 100644
index 000000000..fbf94acba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_immutable.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+
+    fun t0(s: &mut S) {
+        *(s: &S) = S { f: 0 };
+        *&0 = 1;
+        let x = 0;
+        let x_ref = &mut x;
+        let x_ref: &u64 = x_ref;
+        *x_ref = 0;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.exp
new file mode 100644
index 000000000..a1abc085a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.exp
@@ -0,0 +1,107 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/mutate_invalid.move:6:10
+  │
+6 │         *&mut 0 = false;
+  │          ^^^^^^   ----- Given: 'bool'
+  │          │         
+  │          Invalid mutation. New value is not valid for the reference
+  │          Expected: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/mutate_invalid.move:7:10
+  │
+2 │     struct S has drop { f: u64 }
+  │                            --- Expected: 'u64'
+  ·
+7 │         *&mut S{f:0}.f = &1;
+  │          ^^^^^^^^^^^^^   -- Given: '&{integer}'
+  │          │                
+  │          Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:8:10
+   │
+ 8 │         *foo(&mut 0) = (1, 0);
+   │          ^^^^^^^^^^^   ------ Given: '({integer}, {integer})'
+   │          │              
+   │          Invalid mutation. New value is not valid for the reference
+   ·
+23 │     fun foo(x: &mut u64): &mut u64 {
+   │                                --- Expected: 'u64'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/mutate_invalid.move:9:9
+  │
+2 │     struct S has drop { f: u64 }
+  │                            --- Expected: 'u64'
+  ·
+9 │         bar(&mut S{f:0}).f = ();
+  │         ^^^^^^^^^^^^^^^^^^   -- Given: '()'
+  │         │                     
+  │         Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:10:10
+   │
+ 2 │     struct S has drop { f: u64 }
+   │                            --- Expected: 'u64'
+   ·
+10 │         *&mut bar(&mut S{f:0}).f = &0;
+   │          ^^^^^^^^^^^^^^^^^^^^^^^   -- Given: '&{integer}'
+   │          │                          
+   │          Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:11:9
+   │
+ 2 │     struct S has drop { f: u64 }
+   │                            --- Expected: 'u64'
+   ·
+11 │         baz().f = false;
+   │         ^^^^^^^   ----- Given: 'bool'
+   │         │          
+   │         Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:12:10
+   │
+ 2 │     struct S has drop { f: u64 }
+   │                            --- Expected: 'u64'
+   ·
+12 │         *&mut baz().f = false;
+   │          ^^^^^^^^^^^^   ----- Given: 'bool'
+   │          │               
+   │          Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:17:10
+   │
+16 │         let r = &mut S{ f: 0 };
+   │                      --------- Expected: '0x8675309::M::S'
+17 │         *r = X { f: 1 };
+   │          ^   ---------- Given: '0x8675309::M::X'
+   │          │    
+   │          Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:19:9
+   │
+ 2 │     struct S has drop { f: u64 }
+   │                            --- Expected: 'u64'
+   ·
+19 │         r.f = &0;
+   │         ^^^   -- Given: '&{integer}'
+   │         │      
+   │         Invalid mutation. New value is not valid for the reference
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_invalid.move:20:10
+   │
+ 2 │     struct S has drop { f: u64 }
+   │                            --- Expected: 'u64'
+   ·
+20 │         *&mut r.f = ();
+   │          ^^^^^^^^   -- Given: '()'
+   │          │           
+   │          Invalid mutation. New value is not valid for the reference
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.move
new file mode 100644
index 000000000..552c56e11
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_invalid.move
@@ -0,0 +1,34 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct X { f: u64 }
+
+    fun t0() {
+        *&mut 0 = false;
+        *&mut S{f:0}.f = &1;
+        *foo(&mut 0) = (1, 0);
+        bar(&mut S{f:0}).f = ();
+        *&mut bar(&mut S{f:0}).f = &0;
+        baz().f = false;
+        *&mut baz().f = false;
+    }
+
+    fun t1() {
+        let r = &mut S{ f: 0 };
+        *r = X { f: 1 };
+
+        r.f = &0;
+        *&mut r.f = ();
+    }
+
+    fun foo(x: &mut u64): &mut u64 {
+        x
+    }
+
+    fun bar(s: &mut S): &mut S {
+        s
+    }
+
+    fun baz(): S {
+        S { f: 0 }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.exp
new file mode 100644
index 000000000..4361fb9a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.exp
@@ -0,0 +1,94 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/mutate_non_ref.move:7:10
+  │
+6 │         let u = 0;
+  │             - Given: integer
+7 │         *u = 1;
+  │          ^
+  │          │
+  │          Invalid mutation. Expected a mutable reference
+  │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:10:10
+   │
+ 9 │         let s = S { f: 0 };
+   │                 ---------- Given: '0x8675309::M::S'
+10 │         *s = S { f: 0 };
+   │          ^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:11:10
+   │
+ 2 │     struct S has copy, drop { f: u64 }
+   │                                  --- Given: 'u64'
+   ·
+11 │         *s.f = 0;
+   │          ^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:14:10
+   │
+ 2 │     struct S has copy, drop { f: u64 }
+   │                                  --- Given: 'u64'
+   ·
+14 │         *s_ref.f = 0;
+   │          ^^^^^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:17:10
+   │
+ 3 │     struct X has copy, drop { s: S }
+   │                                  - Given: '0x8675309::M::S'
+   ·
+17 │         *x.s = S { f: 0 };
+   │          ^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:18:10
+   │
+ 2 │     struct S has copy, drop { f: u64 }
+   │                                  --- Given: 'u64'
+   ·
+18 │         *x.s.f = 0;
+   │          ^^^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:21:10
+   │
+ 3 │     struct X has copy, drop { s: S }
+   │                                  - Given: '0x8675309::M::S'
+   ·
+21 │         *x_ref.s = S{ f: 0 };
+   │          ^^^^^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/mutate_non_ref.move:22:10
+   │
+ 2 │     struct S has copy, drop { f: u64 }
+   │                                  --- Given: 'u64'
+   ·
+22 │         *x_ref.s.f = 0;
+   │          ^^^^^^^^^
+   │          │
+   │          Invalid mutation. Expected a mutable reference
+   │          Expected: '&mut _'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.move
new file mode 100644
index 000000000..ae5f835d5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_non_ref.move
@@ -0,0 +1,25 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64 }
+    struct X has copy, drop { s: S }
+
+    fun t0() {
+        let u = 0;
+        *u = 1;
+
+        let s = S { f: 0 };
+        *s = S { f: 0 };
+        *s.f = 0;
+
+        let s_ref = &mut S { f: 0 };
+        *s_ref.f = 0;
+
+        let x = X { s: *&s };
+        *x.s = S { f: 0 };
+        *x.s.f = 0;
+
+        let x_ref = &mut X { s: *&s };
+        *x_ref.s = S{ f: 0 };
+        *x_ref.s.f = 0;
+
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.exp
new file mode 100644
index 000000000..68cb8901c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.exp
@@ -0,0 +1,31 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/mutate_resource.move:5:10
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+3 │ 
+4 │     fun t0(r: &mut R) {
+  │                    - The type '0x8675309::M::R' does not have the ability 'drop'
+5 │         *r = R {};
+  │          ^ Invalid mutation. Mutation requires the 'drop' ability as the old value is destroyed
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/mutate_resource.move:9:10
+  │
+8 │     fun t1<T>(r: &mut T, x: T) {
+  │            -          - The type 'T' does not have the ability 'drop'
+  │            │           
+  │            To satisfy the constraint, the 'drop' ability would need to be added here
+9 │         *r = x;
+  │          ^ Invalid mutation. Mutation requires the 'drop' ability as the old value is destroyed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/mutate_resource.move:13:10
+   │
+12 │     fun t2<T: key>(r: &mut T, x: T) {
+   │            -               - The type 'T' does not have the ability 'drop'
+   │            │                
+   │            To satisfy the constraint, the 'drop' ability would need to be added here
+13 │         *r = x;
+   │          ^ Invalid mutation. Mutation requires the 'drop' ability as the old value is destroyed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.move
new file mode 100644
index 000000000..a17f6a9f4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/mutate_resource.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(r: &mut R) {
+        *r = R {};
+    }
+
+    fun t1<T>(r: &mut T, x: T) {
+        *r = x;
+    }
+
+    fun t2<T: key>(r: &mut T, x: T) {
+        *r = x;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.exp
new file mode 100644
index 000000000..ad9ed6328
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.exp
@@ -0,0 +1,47 @@
+error[E04015]: invalid use of native item
+  ┌─ tests/move_check/typing/native_structs_pack_unpack.move:9:9
+  │
+3 │     native struct T;
+  │     ------ Struct declared 'native' here
+  ·
+9 │         C::T {}
+  │         ^^^^^^^ Invalid argument usage for native struct '0x42::C::T'. Native structs cannot be directly constructed/deconstructed, and their fields cannot be dirctly accessed
+
+error[E04001]: restricted visibility
+  ┌─ tests/move_check/typing/native_structs_pack_unpack.move:9:9
+  │
+9 │         C::T {}
+  │         ^^^^^^^ Invalid instantiation of '0x42::C::T'.
+All structs can only be constructed in the module in which they are declared
+
+error[E04015]: invalid use of native item
+   ┌─ tests/move_check/typing/native_structs_pack_unpack.move:12:13
+   │
+ 3 │     native struct T;
+   │     ------ Struct declared 'native' here
+   ·
+12 │         let C::T {} = c;
+   │             ^^^^^^^ Invalid binding usage for native struct '0x42::C::T'. Native structs cannot be directly constructed/deconstructed, and their fields cannot be dirctly accessed
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/native_structs_pack_unpack.move:12:13
+   │
+12 │         let C::T {} = c;
+   │             ^^^^^^^ Invalid deconstruction binding of '0x42::C::T'.
+ All structs can only be deconstructed in the module in which they are declared
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/native_structs_pack_unpack.move:15:18
+   │
+15 │         let _f = c.f;
+   │                  ^^^ Invalid access of field 'f' on '0x42::C::T'. Fields can only be accessed inside the struct's module
+
+error[E03010]: unbound field
+   ┌─ tests/move_check/typing/native_structs_pack_unpack.move:15:18
+   │
+ 3 │     native struct T;
+   │     ------ Struct declared 'native' here
+   ·
+15 │         let _f = c.f;
+   │                  ^^^ Unbound field 'f' for native struct '0x42::C::T'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.move
new file mode 100644
index 000000000..3a47a8635
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/native_structs_pack_unpack.move
@@ -0,0 +1,18 @@
+address 0x42 {
+module C {
+    native struct T;
+}
+
+module B {
+    use 0x42::C;
+    public fun foo(): C::T {
+        C::T {}
+    }
+    public fun bar(c: C::T) {
+        let C::T {} = c;
+    }
+    public fun baz(c: C::T) {
+        let _f = c.f;
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/neq.move b/vendors/move/crates/move-compiler/tests/move_check/typing/neq.move
new file mode 100644
index 000000000..d9af0e1c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/neq.move
@@ -0,0 +1,31 @@
+module 0x8675309::M {
+    struct S has drop { u: u64 }
+    struct R {
+        f: u64
+    }
+    struct G<T> has drop { f: T }
+
+    fun t0(r: &R, r_mut: &mut R, s: S, s_ref: &S, s_mut: &mut S) {
+        (0 != 1: bool);
+        (0 != (1: u8): bool);
+        ((0: u8) != 1: bool);
+        (0 != (1: u128): bool);
+        ((0: u128) != 1: bool);
+        (&0 != &1: bool);
+        (true != false: bool);
+        (0x0 != 0x1: bool);
+        (&s != s_ref: bool);
+        (&mut s != s_ref: bool);
+        (&mut s != s_mut: bool);
+        (&s != s_mut: bool);
+        (s_ref != s_mut: bool);
+        (s_mut != s_mut: bool);
+        (S{u: 0} != s: bool);
+        (r != r: bool);
+        (r_mut != r_mut: bool);
+        (r != r_mut: bool);
+        (r_mut != r: bool);
+        (G { f: 1 } != G<u64> { f: 2 }: bool);
+        (G<u64> { f: 1 } != G { f: 2 }: bool);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.exp
new file mode 100644
index 000000000..d6ac4f61a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.exp
@@ -0,0 +1,224 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:13:17
+   │
+13 │         (0: u8) != (1: u128);
+   │             --  ^^     ---- Found: 'u128'. It is not compatible with the other type.
+   │             │   │       
+   │             │   Incompatible arguments to '!='
+   │             Found: 'u8'. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:14:11
+   │
+14 │         0 != false;
+   │         - ^^ ----- Found: 'bool'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '!='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:15:12
+   │
+15 │         &0 != 1;
+   │         -- ^^ - Found: integer. It is not compatible with the other type.
+   │         │  │   
+   │         │  Incompatible arguments to '!='
+   │         Found: '&{integer}'. It is not compatible with the other type.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:16:11
+   │
+16 │         1 != &0;
+   │         - ^^ -- Found: '&{integer}'. It is not compatible with the other type.
+   │         │ │   
+   │         │ Incompatible arguments to '!='
+   │         Found: integer. It is not compatible with the other type.
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:17:9
+   │
+ 2 │     struct S { u: u64 }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+12 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               - The type '0x8675309::M::S' does not have the ability 'drop'
+   ·
+17 │         s != s_ref;
+   │         ^ '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:17:11
+   │
+12 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               -         -- Found: '&0x8675309::M::S'. It is not compatible with the other type.
+   │               │          
+   │               Found: '0x8675309::M::S'. It is not compatible with the other type.
+   ·
+17 │         s != s_ref;
+   │           ^^ Incompatible arguments to '!='
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:18:15
+   │
+12 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               -                    ------ Found: '&mut 0x8675309::M::S'. It is not compatible with the other type.
+   │               │                     
+   │               Found: '0x8675309::M::S'. It is not compatible with the other type.
+   ·
+18 │         s_mut != s;
+   │               ^^ Incompatible arguments to '!='
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:18:18
+   │
+ 2 │     struct S { u: u64 }
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+12 │     fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+   │               - The type '0x8675309::M::S' does not have the ability 'drop'
+   ·
+18 │         s_mut != s;
+   │                  ^ '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:22:9
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+21 │     fun t1(r: R) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+22 │         r != r;
+   │         ^ '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:22:14
+   │
+ 3 │     struct R {
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+21 │     fun t1(r: R) {
+   │               - The type '0x8675309::M::R' does not have the ability 'drop'
+22 │         r != r;
+   │              ^ '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:26:9
+   │
+26 │         G0{} != G0{};
+   │         ^^^^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:26:17
+   │
+26 │         G0{} != G0{};
+   │                 ^^^^ Could not infer this type. Try adding an annotation
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:27:9
+   │
+ 7 │     struct G1<phantom T: key> {}
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+27 │         G1{} != G1{};
+   │         ^^^^
+   │         │
+   │         '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x8675309::M::G1<_>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:27:9
+   │
+27 │         G1{} != G1{};
+   │         ^^^^ Could not infer this type. Try adding an annotation
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:27:17
+   │
+ 7 │     struct G1<phantom T: key> {}
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+27 │         G1{} != G1{};
+   │                 ^^^^
+   │                 │
+   │                 '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                 The type '0x8675309::M::G1<_>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:27:17
+   │
+27 │         G1{} != G1{};
+   │                 ^^^^ Could not infer this type. Try adding an annotation
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:28:9
+   │
+ 8 │     struct G2<phantom T> {}
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+28 │         G2{} != G2{};
+   │         ^^^^
+   │         │
+   │         '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │         The type '0x8675309::M::G2<_>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:28:9
+   │
+28 │         G2{} != G2{};
+   │         ^^^^ Could not infer this type. Try adding an annotation
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/neq_invalid.move:28:17
+   │
+ 8 │     struct G2<phantom T> {}
+   │            -- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+28 │         G2{} != G2{};
+   │                 ^^^^
+   │                 │
+   │                 '!=' requires the 'drop' ability as the value is consumed. Try borrowing the values with '&' first.'
+   │                 The type '0x8675309::M::G2<_>' does not have the ability 'drop'
+
+error[E04010]: cannot infer type
+   ┌─ tests/move_check/typing/neq_invalid.move:28:17
+   │
+28 │         G2{} != G2{};
+   │                 ^^^^ Could not infer this type. Try adding an annotation
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/neq_invalid.move:32:9
+   │
+32 │         () != ();
+   │         ^^^^^^^^
+   │         │     │
+   │         │     Expected a single type, but found expression list type: '()'
+   │         Incompatible arguments to '!='
+
+error[E04005]: expected a single type
+   ┌─ tests/move_check/typing/neq_invalid.move:33:9
+   │
+33 │         (0, 1) != (0, 1);
+   │         ^^^^^^^^^^^^^^^^
+   │         │         │
+   │         │         Expected a single type, but found expression list type: '(u64, u64)'
+   │         Incompatible arguments to '!='
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:34:19
+   │
+34 │         (1, 2, 3) != (0, 1);
+   │         --------- ^^ ------ Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+   │         │         │   
+   │         │         Incompatible arguments to '!='
+   │         Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/neq_invalid.move:35:16
+   │
+35 │         (0, 1) != (1, 2, 3);
+   │         ------ ^^ --------- Found expression list of length 3: '({integer}, {integer}, {integer})'. It is not compatible with the other type of length 2.
+   │         │      │   
+   │         │      Incompatible arguments to '!='
+   │         Found expression list of length 2: '({integer}, {integer})'. It is not compatible with the other type of length 3.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.move
new file mode 100644
index 000000000..962cd8a9d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/neq_invalid.move
@@ -0,0 +1,37 @@
+module 0x8675309::M {
+    struct S { u: u64 }
+    struct R {
+        f: u64
+    }
+    struct G0<phantom T> has drop {}
+    struct G1<phantom T: key> {}
+    struct G2<phantom T> {}
+
+
+
+    fun t0(s: S, s_ref: &S, s_mut: &mut S) {
+        (0: u8) != (1: u128);
+        0 != false;
+        &0 != 1;
+        1 != &0;
+        s != s_ref;
+        s_mut != s;
+    }
+
+    fun t1(r: R) {
+        r != r;
+    }
+
+    fun t3() {
+        G0{} != G0{};
+        G1{} != G1{};
+        G2{} != G2{};
+    }
+
+    fun t4() {
+        () != ();
+        (0, 1) != (0, 1);
+        (1, 2, 3) != (0, 1);
+        (0, 1) != (1, 2, 3);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.exp
new file mode 100644
index 000000000..74002cf16
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.exp
@@ -0,0 +1,16 @@
+warning[W02014]: invalid non-phantom type parameter usage
+  ┌─ tests/move_check/typing/non_phantom_in_phantom_pos.move:5:15
+  │
+5 │     struct S2<T1, T2> {
+  │               ^^ The parameter 'T1' is only used as an argument to phantom parameters. Consider adding a phantom declaration here
+  │
+  = This warning can be suppressed with '#[allow(missing_phantom)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W02014]: invalid non-phantom type parameter usage
+   ┌─ tests/move_check/typing/non_phantom_in_phantom_pos.move:15:15
+   │
+15 │     struct S4<T1, T2> {
+   │               ^^ The parameter 'T1' is only used as an argument to phantom parameters. Consider adding a phantom declaration here
+   │
+   = This warning can be suppressed with '#[allow(missing_phantom)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.move b/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.move
new file mode 100644
index 000000000..b5c2327b9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/non_phantom_in_phantom_pos.move
@@ -0,0 +1,18 @@
+module 0x42::M {
+    struct S1<phantom T1, T2> { f: T2 }
+
+    // T1 is only being used in phantom position
+    struct S2<T1, T2> {
+        a: S1<T1, T2>
+    }
+
+    // This is ok, because T is used both in phantom and non-phantom position.
+    struct S3<T> {
+        a: S1<T, T>
+    }
+
+    // Invalid position inside another type
+    struct S4<T1, T2> {
+        a: S2<S1<T1, T2>, T2>
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.exp
new file mode 100644
index 000000000..1a676a9b1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.exp
@@ -0,0 +1,92 @@
+error[E04021]: invalid number after type inference
+  ┌─ tests/move_check/typing/number_literal_too_large.move:3:9
+  │
+3 │         340282366920938463463374607431768211455;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │
+  │         Invalid numerical literal
+  │         Annotating the literal might help inference: '340282366920938463463374607431768211455u128'
+  │         Expected a literal of type 'u64', but the value is too large.
+
+error[E04021]: invalid number after type inference
+  ┌─ tests/move_check/typing/number_literal_too_large.move:5:10
+  │
+5 │         (340282366920938463463374607431768211454: u64);
+  │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  --- Expected a literal of type 'u64', but the value is too large.
+  │          │                                         
+  │          Invalid numerical literal
+  │          Annotating the literal might help inference: '340282366920938463463374607431768211454u128'
+
+error[E04021]: invalid number after type inference
+  ┌─ tests/move_check/typing/number_literal_too_large.move:6:10
+  │
+6 │         (340282366920938463463374607431768211454: u8);
+  │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  -- Expected a literal of type 'u8', but the value is too large.
+  │          │                                         
+  │          Invalid numerical literal
+  │          Annotating the literal might help inference: '340282366920938463463374607431768211454u128'
+
+error[E04021]: invalid number after type inference
+  ┌─ tests/move_check/typing/number_literal_too_large.move:8:10
+  │
+8 │         (18446744073709551616: u64);
+  │          ^^^^^^^^^^^^^^^^^^^^  --- Expected a literal of type 'u64', but the value is too large.
+  │          │                      
+  │          Invalid numerical literal
+  │          Annotating the literal might help inference: '18446744073709551616u128'
+
+error[E04021]: invalid number after type inference
+  ┌─ tests/move_check/typing/number_literal_too_large.move:9:10
+  │
+9 │         (18446744073709551616: u8);
+  │          ^^^^^^^^^^^^^^^^^^^^  -- Expected a literal of type 'u8', but the value is too large.
+  │          │                      
+  │          Invalid numerical literal
+  │          Annotating the literal might help inference: '18446744073709551616u128'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:11:10
+   │
+11 │         (18446744073709551615: u8);
+   │          ^^^^^^^^^^^^^^^^^^^^  -- Expected a literal of type 'u8', but the value is too large.
+   │          │                      
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '18446744073709551615u64'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:13:10
+   │
+13 │         (256: u8);
+   │          ^^^  -- Expected a literal of type 'u8', but the value is too large.
+   │          │     
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '256u16'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:19:10
+   │
+19 │         (3402534025: u16);
+   │          ^^^^^^^^^^  --- Expected a literal of type 'u16', but the value is too large.
+   │          │            
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '3402534025u32'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:22:10
+   │
+22 │         (3402534025534025: u32);
+   │          ^^^^^^^^^^^^^^^^  --- Expected a literal of type 'u32', but the value is too large.
+   │          │                  
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '3402534025534025u64'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:24:9
+   │
+24 │         340282366920938463463374607431768211455607431768211455;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid numerical literal
+   │         Annotating the literal might help inference: '340282366920938463463374607431768211455607431768211455u256'
+   │         Expected a literal of type 'u64', but the value is too large.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.move b/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.move
new file mode 100644
index 000000000..cad6ab85c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/number_literal_too_large.move
@@ -0,0 +1,26 @@
+module 0x8675309::M {
+    fun foo() {
+        340282366920938463463374607431768211455;
+
+        (340282366920938463463374607431768211454: u64);
+        (340282366920938463463374607431768211454: u8);
+
+        (18446744073709551616: u64);
+        (18446744073709551616: u8);
+
+        (18446744073709551615: u8);
+
+        (256: u8);
+
+        34025;
+        (34025: u16);
+
+        3402534025;
+        (3402534025: u16);
+
+        3402534025534025;
+        (3402534025534025: u32);
+
+        340282366920938463463374607431768211455607431768211455;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins.move b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins.move
new file mode 100644
index 000000000..e78dacfca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins.move
@@ -0,0 +1,14 @@
+
+module 0x8675309::M {
+    fun foo(x: &mut u64) {
+        (freeze<u64>(x): &u64);
+        (freeze<vector<bool>>(&mut any()): &vector<bool>);
+
+        (assert!(true && false, *x): ());
+        (assert!(true || false, (0u8 as u64)): ());
+    }
+
+    fun any<T>(): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.exp
new file mode 100644
index 000000000..01b9b343f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.exp
@@ -0,0 +1,87 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:4:10
+  │
+3 │     fun foo(x: &u64) {
+  │                ---- Given: '&u64'
+4 │         (freeze<u64>(x): &mut u64);
+  │          ^^^^^^^^^^^^^^
+  │          │
+  │          Invalid call of 'freeze'. Invalid argument for parameter '0'
+  │          Expected: '&mut u64'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:4:26
+  │
+4 │         (freeze<u64>(x): &mut u64);
+  │          --------------  ^^^^^^^^
+  │          │               │
+  │          │               Invalid type annotation
+  │          │               Expected: '&mut u64'
+  │          Given: '&u64'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:5:10
+  │
+5 │         (freeze<vector<bool>>(&any()): &mut vector<bool>);
+  │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │          │                    │
+  │          │                    Given: '&_'
+  │          Invalid call of 'freeze'. Invalid argument for parameter '0'
+  │          Expected: '&mut vector<bool>'
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:5:32
+  │
+5 │         (freeze<vector<bool>>(&any()): &mut vector<bool>);
+  │                                ^^^^^ Could not infer this type. Try adding an annotation
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:5:40
+  │
+5 │         (freeze<vector<bool>>(&any()): &mut vector<bool>);
+  │          ----------------------------  ^^^^^^^^^^^^^^^^^
+  │          │                             │
+  │          │                             Invalid type annotation
+  │          │                             Expected: '&mut vector<bool>'
+  │          Given: '&vector<bool>'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:7:10
+  │
+7 │         (assert!(42, true): ());
+  │          ^^^^^^^^^^^^^^^^^
+  │          │       │
+  │          │       Given: integer
+  │          Invalid call of 'assert'. Invalid argument for parameter '0'
+  │          Expected: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:7:10
+  │
+7 │         (assert!(42, true): ());
+  │          ^^^^^^^^^^^^^^^^^
+  │          │           │
+  │          │           Given: 'bool'
+  │          Invalid call of 'assert'. Invalid argument for parameter '1'
+  │          Expected: 'u64'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:8:38
+  │
+8 │         (assert!(true && false, *x): bool);
+  │          --------------------------  ^^^^
+  │          │                           │
+  │          │                           Invalid type annotation
+  │          │                           Expected: 'bool'
+  │          Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/other_builtins_invalid.move:9:9
+  │
+9 │         assert!(true || false, 0u8);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │                      │
+  │         │                      Given: 'u8'
+  │         Invalid call of 'assert'. Invalid argument for parameter '1'
+  │         Expected: 'u64'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.move
new file mode 100644
index 000000000..68cc2cd7f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/other_builtins_invalid.move
@@ -0,0 +1,15 @@
+
+module 0x8675309::M {
+    fun foo(x: &u64) {
+        (freeze<u64>(x): &mut u64);
+        (freeze<vector<bool>>(&any()): &mut vector<bool>);
+
+        (assert!(42, true): ());
+        (assert!(true && false, *x): bool);
+        assert!(true || false, 0u8);
+    }
+
+    fun any<T>(): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack.exp
new file mode 100644
index 000000000..5d19339c9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack.move:14:27
+   │
+ 2 │     struct S has drop { f: u64 }
+   │            - To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+12 │         let s = S{ f: 0 };
+   │                 --------- The type '0x8675309::M::S' does not have the ability 'copy'
+13 │         let n1 = Nat { f };
+14 │         let n2 = Nat { f: *&s };
+   │                           ^^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack.move
new file mode 100644
index 000000000..1c9a1ae5f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct Nat<T> has drop { f: T }
+    struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+
+    fun t0() {
+        (S { f: 0 } : S);
+        let s = S{ f: 0 };
+        R { s: _, f: _, n1: _, n2: _ } = (R { s: S{f: 0}, n2: Nat{f: s}, n1: Nat{f: 0}, f: 0, }: R);
+
+        let f = 0;
+        let s = S{ f: 0 };
+        let n1 = Nat { f };
+        let n2 = Nat { f: *&s };
+        R { s: _, f: _, n1: _, n2: _ } = (R { s, n2, f, n1 }: R);
+
+        (Nat { f: Nat { f: Nat {f: S { f }}}}: Nat<Nat<Nat<S>>>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp
new file mode 100644
index 000000000..118a0b52a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp
@@ -0,0 +1,136 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:7:9
+  │
+3 │     struct R<T: key>  { r: T }
+  │                 --- 'key' constraint declared here
+  ·
+7 │         R {r:_ } = R { r: 0 };
+  │         ^^^^^^^^          - The type 'u64' does not have the ability 'key'
+  │         │                  
+  │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:7:20
+  │
+3 │     struct R<T: key>  { r: T }
+  │                 --- 'key' constraint declared here
+  ·
+7 │         R {r:_ } = R { r: 0 };
+  │                    ^^^^^^^^^^
+  │                    │      │
+  │                    │      The type 'u64' does not have the ability 'key'
+  │                    'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:8:9
+  │
+2 │     struct Coin {}
+  │            ---- To satisfy the constraint, the 'drop' ability would need to be added here
+3 │     struct R<T: key>  { r: T }
+4 │     struct S<T: drop> has drop { c: T }
+  │                 ---- 'drop' constraint declared here
+  ·
+8 │         S { c: Coin {} };
+  │         ^^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      The type '0x8675309::M::Coin' does not have the ability 'drop'
+  │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:8:9
+  │
+8 │         S { c: Coin {} };
+  │         ^^^^^^^^^^^^^^^^
+  │         │
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '0x8675309::M::S<0x8675309::M::Coin>' can have the ability 'drop' but the type argument '0x8675309::M::Coin' does not have the required ability 'drop'
+  │         The type '0x8675309::M::S<0x8675309::M::Coin>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:9
+   │
+ 3 │     struct R<T: key>  { r: T }
+   │            -    --- 'key' constraint declared here
+   │            │     
+   │            To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+12 │         R {r: R { r: _ } } = R { r: R { r: 0 }};
+   │         ^^^^^^^^^^^^^^^^^^          ---------- The type '0x8675309::M::R<u64>' does not have the ability 'key'
+   │         │                            
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:15
+   │
+ 3 │     struct R<T: key>  { r: T }
+   │                 --- 'key' constraint declared here
+   ·
+12 │         R {r: R { r: _ } } = R { r: R { r: 0 }};
+   │               ^^^^^^^^^^                   - The type 'u64' does not have the ability 'key'
+   │               │                             
+   │               'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:30
+   │
+ 3 │     struct R<T: key>  { r: T }
+   │            -    --- 'key' constraint declared here
+   │            │     
+   │            To satisfy the constraint, the 'key' ability would need to be added here
+   ·
+12 │         R {r: R { r: _ } } = R { r: R { r: 0 }};
+   │                              ^^^^^^^^^^^^^^^^^^
+   │                              │      │
+   │                              │      The type '0x8675309::M::R<u64>' does not have the ability 'key'
+   │                              'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:37
+   │
+ 3 │     struct R<T: key>  { r: T }
+   │                 --- 'key' constraint declared here
+   ·
+12 │         R {r: R { r: _ } } = R { r: R { r: 0 }};
+   │                                     ^^^^^^^^^^
+   │                                     │      │
+   │                                     │      The type 'u64' does not have the ability 'key'
+   │                                     'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:13:9
+   │
+ 4 │     struct S<T: drop> has drop { c: T }
+   │                 ---- 'drop' constraint declared here
+   ·
+13 │         S { c: S { c: Coin {} } };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │      │      │
+   │         │      │      The type '0x8675309::M::S<0x8675309::M::Coin>' can have the ability 'drop' but the type argument '0x8675309::M::Coin' does not have the required ability 'drop'
+   │         │      The type '0x8675309::M::S<0x8675309::M::Coin>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:13:9
+   │
+13 │         S { c: S { c: Coin {} } };
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '0x8675309::M::S<0x8675309::M::S<0x8675309::M::Coin>>' can have the ability 'drop' but the type argument '0x8675309::M::S<0x8675309::M::Coin>' does not have the required ability 'drop'
+   │         The type '0x8675309::M::S<0x8675309::M::S<0x8675309::M::Coin>>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:13:16
+   │
+ 2 │     struct Coin {}
+   │            ---- To satisfy the constraint, the 'drop' ability would need to be added here
+ 3 │     struct R<T: key>  { r: T }
+ 4 │     struct S<T: drop> has drop { c: T }
+   │                 ---- 'drop' constraint declared here
+   ·
+13 │         S { c: S { c: Coin {} } };
+   │                ^^^^^^^^^^^^^^^^
+   │                │      │
+   │                │      The type '0x8675309::M::Coin' does not have the ability 'drop'
+   │                'drop' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.move
new file mode 100644
index 000000000..6337a7c50
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct Coin {}
+    struct R<T: key>  { r: T }
+    struct S<T: drop> has drop { c: T }
+
+    fun t0() {
+        R {r:_ } = R { r: 0 };
+        S { c: Coin {} };
+    }
+
+    fun t1() {
+        R {r: R { r: _ } } = R { r: R { r: 0 }};
+        S { c: S { c: Coin {} } };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.exp
new file mode 100644
index 000000000..e0097886b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.exp
@@ -0,0 +1,60 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/pack_invalid_argument.move:7:17
+  │
+2 │     struct S has drop { f: u64 }
+  │                            --- Expected: 'u64'
+  ·
+7 │         (S { f: false } : S);
+  │                 ^^^^^
+  │                 │
+  │                 Invalid argument for field 'f' for '0x8675309::M::S'
+  │                 Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/pack_invalid_argument.move:17:16
+   │
+ 4 │     struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+   │                   - Expected: '0x8675309::M::S'
+   ·
+15 │          } : R);
+   │              - Given: '0x8675309::M::R'
+16 │         (R {
+17 │             s: r,
+   │                ^ Invalid argument for field 's' for '0x8675309::M::R'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/pack_invalid_argument.move:18:16
+   │
+ 4 │     struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+   │                         --- Expected: 'u64'
+   ·
+18 │             f: false,
+   │                ^^^^^
+   │                │
+   │                Invalid argument for field 'f' for '0x8675309::M::R'
+   │                Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/pack_invalid_argument.move:19:17
+   │
+ 4 │     struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+   │                                      --- Expected: 'u64'
+   ·
+19 │             n1: Nat { f: false },
+   │                 ^^^^^^^^^^^^^^^^
+   │                 │        │
+   │                 │        Given: 'bool'
+   │                 Invalid argument for field 'n1' for '0x8675309::M::R'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/pack_invalid_argument.move:20:17
+   │
+ 4 │     struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+   │                                                    - Expected: '0x8675309::M::S'
+   ·
+15 │          } : R);
+   │              - Given: '0x8675309::M::R'
+   ·
+20 │             n2: Nat{ f: r }
+   │                 ^^^^^^^^^^^ Invalid argument for field 'n2' for '0x8675309::M::R'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.move
new file mode 100644
index 000000000..ffa2e2fee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_invalid_argument.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S has drop { f: u64 }
+    struct Nat<T> has drop { f: T }
+    struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+
+    fun t0(): R {
+        (S { f: false } : S);
+
+        let s = S { f: 0 };
+        let r = (R {
+            s: S{f: 0},
+            n2: Nat{f: s},
+            n1: Nat{f: 0},
+            f: 0
+         } : R);
+        (R {
+            s: r,
+            f: false,
+            n1: Nat { f: false },
+            n2: Nat{ f: r }
+        }: R)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.exp
new file mode 100644
index 000000000..b48b1799e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.exp
@@ -0,0 +1,24 @@
+error[E04016]: too few arguments
+  ┌─ tests/move_check/typing/pack_missing_field.move:7:10
+  │
+7 │         (S { } : S);
+  │          ^^^^^ Missing argument for field 'f' in '0x8675309::M::S'
+
+error[E04016]: too few arguments
+  ┌─ tests/move_check/typing/pack_missing_field.move:8:37
+  │
+8 │         R {s:_, f:_, n1:_, n2:_} = (R { s: S{f: 0}, n1: Nat{f: 0}, f: 0, } : R);
+  │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Missing argument for field 'n2' in '0x8675309::M::R'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/pack_missing_field.move:14:37
+   │
+14 │         R {s:_, f:_, n1:_, n2:_} = (R { s, n2, n1 }: R);
+   │                                     ^^^^^^^^^^^^^^^ Missing argument for field 'f' in '0x8675309::M::R'
+
+error[E04016]: too few arguments
+   ┌─ tests/move_check/typing/pack_missing_field.move:16:28
+   │
+16 │         (Nat { f: Nat { f: Nat { }}}: Nat<Nat<Nat<S>>>);
+   │                            ^^^^^^^ Missing argument for field 'f' in '0x8675309::M::Nat'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.move
new file mode 100644
index 000000000..f1a22704d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_missing_field.move
@@ -0,0 +1,18 @@
+module 0x8675309::M {
+    struct S has copy, drop { f: u64 }
+    struct Nat<T> has drop { f: T }
+    struct R { s: S, f: u64, n1: Nat<u64>, n2: Nat<S> }
+
+    fun t0() {
+        (S { } : S);
+        R {s:_, f:_, n1:_, n2:_} = (R { s: S{f: 0}, n1: Nat{f: 0}, f: 0, } : R);
+
+        let f = 0;
+        let s = S{ f: 0 };
+        let n1 = Nat { f };
+        let n2 = Nat { f: *&s };
+        R {s:_, f:_, n1:_, n2:_} = (R { s, n2, n1 }: R);
+
+        (Nat { f: Nat { f: Nat { }}}: Nat<Nat<Nat<S>>>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.exp
new file mode 100644
index 000000000..94723c555
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.exp
@@ -0,0 +1,27 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_multiple.move:5:9
+  │
+5 │         Box { f: (0, 1) };
+  │         ^^^^^^^^^^^^^^^^^
+  │         │        │
+  │         │        Expected a single non-reference type, but found: '(u64, u64)'
+  │         Invalid type argument
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_multiple.move:6:9
+  │
+6 │         Box { f: (0, 1, 2) };
+  │         ^^^^^^^^^^^^^^^^^^^^
+  │         │        │
+  │         │        Expected a single non-reference type, but found: '(u64, u64, u64)'
+  │         Invalid type argument
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_multiple.move:7:9
+  │
+7 │         Box { f: (true, Box { f: 0 }) };
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │        │
+  │         │        Expected a single non-reference type, but found: '(bool, 0x8675309::M::Box<u64>)'
+  │         Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.move
new file mode 100644
index 000000000..0ff80864a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_multiple.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f: T }
+
+    fun t0() {
+        Box { f: (0, 1) };
+        Box { f: (0, 1, 2) };
+        Box { f: (true, Box { f: 0 }) };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.exp
new file mode 100644
index 000000000..abfe6082a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.exp
@@ -0,0 +1,13 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/pack_private_with_field.move:19:11
+   │  
+19 │     let s = S {
+   │ ╭───────────^
+20 │ │     f1: 0,
+21 │ │     f4: 0,
+22 │ │     f2: 0,
+23 │ │     f3: 0,
+24 │ │   };
+   │ ╰───^ Invalid instantiation of '0x42::m::S'.
+All structs can only be constructed in the module in which they are declared
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.move
new file mode 100644
index 000000000..fb46af0a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_private_with_field.move
@@ -0,0 +1,28 @@
+module 0x42::m {
+
+struct S {
+    f1: u64,
+    f2: u64,
+    f3: u64,
+    f4: u64,
+}
+
+public fun consume(_: S) { abort 0 }
+
+}
+
+module 0x42::n {
+
+use 0x42::m::S;
+
+fun f() {
+  let s = S {
+    f1: 0,
+    f4: 0,
+    f2: 0,
+    f3: 0,
+  };
+  0x42::m::consume(s);
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.exp
new file mode 100644
index 000000000..5949ebca4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.exp
@@ -0,0 +1,17 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_reference.move:5:9
+  │
+4 │     fun t0(r_imm: &u64, r_mut: &mut u64) {
+  │                   ---- Expected a single non-reference type, but found: '&u64'
+5 │         Box { f: r_imm };
+  │         ^^^^^^^^^^^^^^^^ Invalid type argument
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_reference.move:6:9
+  │
+4 │     fun t0(r_imm: &u64, r_mut: &mut u64) {
+  │                                -------- Expected a single non-reference type, but found: '&mut u64'
+5 │         Box { f: r_imm };
+6 │         Box { f: r_mut };
+  │         ^^^^^^^^^^^^^^^^ Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.move
new file mode 100644
index 000000000..f4b3a3252
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_reference.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f: T }
+
+    fun t0(r_imm: &u64, r_mut: &mut u64) {
+        Box { f: r_imm };
+        Box { f: r_mut };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.exp
new file mode 100644
index 000000000..f4f157afc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.exp
@@ -0,0 +1,9 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/pack_unit.move:5:9
+  │
+5 │         Box { f: () };
+  │         ^^^^^^^^^^^^^
+  │         │        │
+  │         │        Expected a single non-reference type, but found: '()'
+  │         Invalid type argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.move
new file mode 100644
index 000000000..e9d956c8c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unit.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f: T }
+
+    fun t0() {
+        Box { f: () };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.exp
new file mode 100644
index 000000000..5b501d41b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.exp
@@ -0,0 +1,14 @@
+error[E04001]: restricted visibility
+  ┌─ tests/move_check/typing/pack_unpack_private.move:8:9
+  │
+8 │         C::T {}
+  │         ^^^^^^^ Invalid instantiation of '0x43::C::T'.
+All structs can only be constructed in the module in which they are declared
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/pack_unpack_private.move:11:13
+   │
+11 │         let C::T {} = c;
+   │             ^^^^^^^ Invalid deconstruction binding of '0x43::C::T'.
+ All structs can only be deconstructed in the module in which they are declared
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.move
new file mode 100644
index 000000000..ecf581684
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private.move
@@ -0,0 +1,13 @@
+module 0x43::C {
+    struct T {}
+}
+
+module 0x42::B {
+    use 0x43::C;
+    public fun foo(): C::T {
+        C::T {}
+    }
+    public fun bar(c: C::T) {
+        let C::T {} = c;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.exp
new file mode 100644
index 000000000..6882fea0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.exp
@@ -0,0 +1,14 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/pack_unpack_private_script.move:12:17
+   │
+12 │         let t = T {  };
+   │                 ^^^^^^ Invalid instantiation of '0x42::M::T'.
+All structs can only be constructed in the module in which they are declared
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/pack_unpack_private_script.move:13:13
+   │
+13 │         let T {} = t;
+   │             ^^^^ Invalid deconstruction binding of '0x42::M::T'.
+ All structs can only be deconstructed in the module in which they are declared
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.move b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.move
new file mode 100644
index 000000000..1aa3e3bae
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/pack_unpack_private_script.move
@@ -0,0 +1,15 @@
+module 0x42::M {
+    struct T {}
+
+}
+
+
+script {
+
+    use 0x42::M::T;
+
+    fun main() {
+        let t = T {  };
+        let T {} = t;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities.move
new file mode 100644
index 000000000..c067546c9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities.move
@@ -0,0 +1,32 @@
+module 0x42::M {
+    struct NoAbilities { }
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a: T2 }
+    struct HasStore<phantom T1, T2> has store { a: T2}
+    struct HasKey<phantom T1, T2> has key { a : T2 }
+    struct RequireStore<T: store> { a: T }
+
+    // Writing to a references requires drop
+    fun f1(ref: &mut HasDrop<NoAbilities, u64>) {
+        *ref = HasDrop<NoAbilities, u64> { a: 1 };
+    }
+
+    // Ignoring values requires drop
+    fun f2() {
+        _ = HasDrop<NoAbilities, u64> { a: 1 };
+    }
+
+    // Leaving value in local requires drop
+    fun f3(_x: HasDrop<NoAbilities, u64>) {
+    }
+
+    // `copy` requires copy
+    fun f4(x: HasCopy<NoAbilities, u64>): (HasCopy<NoAbilities, u64>,  HasCopy<NoAbilities, u64>) {
+        (copy x, x)
+    }
+
+    // Explicit store constraint
+    fun f8(): RequireStore<HasStore<NoAbilities, u64>> {
+        RequireStore<HasStore<NoAbilities, u64>> { a: HasStore { a: 1 } }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp
new file mode 100644
index 000000000..24413e10c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp
@@ -0,0 +1,71 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:11:10
+   │
+10 │     fun f1(ref: &mut HasDrop<NoAbilities, NoAbilities>) {
+   │                      ---------------------------------
+   │                      │       │
+   │                      │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │                      The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+11 │         *ref = HasDrop<NoAbilities, NoAbilities> { a: NoAbilities { } };
+   │          ^^^ Invalid mutation. Mutation requires the 'drop' ability as the old value is destroyed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:16:9
+   │
+16 │         _ = HasDrop<NoAbilities, NoAbilities> { a: NoAbilities { } };
+   │         ^   --------------------------------------------------------
+   │         │   │       │
+   │         │   │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │         │   The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:20:51
+   │  
+20 │       fun f3(_x: HasDrop<NoAbilities, NoAbilities>) {
+   │              --  ---------------------------------
+   │              │   │       │
+   │              │   │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │              │   The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+   │              The parameter '_x' still contains a value. The value does not have the 'drop' ability and must be consumed before the function returns
+   │ ╭───────────────────────────────────────────────────^
+21 │ │     }
+   │ ╰─────^ Invalid return
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:25:10
+   │
+24 │     fun f4(x: HasCopy<NoAbilities, NoAbilities>): (HasCopy<NoAbilities, NoAbilities>,  HasCopy<NoAbilities, NoAbilities>) {
+   │               ---------------------------------
+   │               │       │
+   │               │       The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │               The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+25 │         (copy x, x)
+   │          ^^^^^^ Invalid 'copy' of owned value without the 'copy' ability
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:29:15
+   │
+ 7 │     struct RequireStore<T: store> { a: T }
+   │                            ----- 'store' constraint declared here
+   ·
+29 │     fun f8(): RequireStore<HasStore<NoAbilities, NoAbilities>> {
+   │               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │               │            │        │
+   │               │            │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │               │            The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+   │               'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:30:9
+   │
+ 7 │     struct RequireStore<T: store> { a: T }
+   │                            ----- 'store' constraint declared here
+   ·
+30 │         RequireStore<HasStore<NoAbilities, NoAbilities>> { a: HasStore { a: NoAbilities {} } }
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │            │        │
+   │         │            │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │         │            The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.move
new file mode 100644
index 000000000..a07b606f9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.move
@@ -0,0 +1,32 @@
+module 0x42::M {
+    struct NoAbilities { }
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a: T2 }
+    struct HasStore<phantom T1, T2> has store { a: T2}
+    struct HasKey<phantom T1, T2> has key { a : T2 }
+    struct RequireStore<T: store> { a: T }
+
+    // Writing to a references requires drop
+    fun f1(ref: &mut HasDrop<NoAbilities, NoAbilities>) {
+        *ref = HasDrop<NoAbilities, NoAbilities> { a: NoAbilities { } };
+    }
+
+    // Ignoring values requires drop
+    fun f2() {
+        _ = HasDrop<NoAbilities, NoAbilities> { a: NoAbilities { } };
+    }
+
+    // Leaving value in local requires drop
+    fun f3(_x: HasDrop<NoAbilities, NoAbilities>) {
+    }
+
+    // `copy` requires copy
+    fun f4(x: HasCopy<NoAbilities, NoAbilities>): (HasCopy<NoAbilities, NoAbilities>,  HasCopy<NoAbilities, NoAbilities>) {
+        (copy x, x)
+    }
+
+    // Explicit store constraint
+    fun f8(): RequireStore<HasStore<NoAbilities, NoAbilities>> {
+        RequireStore<HasStore<NoAbilities, NoAbilities>> { a: HasStore { a: NoAbilities {} } }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl.move
new file mode 100644
index 000000000..f1fb0944c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl.move
@@ -0,0 +1,26 @@
+module 0x42::M1 {
+    // Not using a phantom parameter at all is ok.
+    struct S1<phantom T> {
+        a: u64
+    }
+
+    // Phantom parameters can be used in phantom position.
+    struct S2<phantom T> {
+        a: S1<T>,
+        b: vector<S1<T>>
+    }
+
+    // Mixing phantom and non-phantom parameters
+    struct S3<phantom T1, T2, phantom T3, T4> {
+        a: T2,
+        b: T4
+    }
+
+    // Phantom parameters should be allowed to be declared with constraints.
+    struct S4<phantom T: copy> {
+        a: u64
+    }
+    struct S5<phantom T: copy + drop + store> {
+        a: S4<T>
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp
new file mode 100644
index 000000000..ac8f85e66
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp
@@ -0,0 +1,56 @@
+error[E02013]: invalid phantom type parameter usage
+  ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:4:12
+  │
+2 │     struct S1<phantom T> {
+  │                       - 'T' declared here as phantom
+3 │         // A phantom parameter cannot be used as the type of a field
+4 │         a: T,
+  │            ^ Phantom type parameter cannot be used as a field type
+
+error[E02013]: invalid phantom type parameter usage
+  ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:6:19
+  │
+2 │     struct S1<phantom T> {
+  │                       - 'T' declared here as phantom
+  ·
+6 │         b: vector<T>
+  │                   ^ Phantom type parameter cannot be used as an argument to a non-phantom parameter
+
+error[E02013]: invalid phantom type parameter usage
+   ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:12:15
+   │
+11 │     struct S3<phantom T> {
+   │                       - 'T' declared here as phantom
+12 │         a: S2<T>
+   │               ^ Phantom type parameter cannot be used as an argument to a non-phantom parameter
+
+error[E02013]: invalid phantom type parameter usage
+   ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:17:18
+   │
+16 │     struct S4<phantom T> {
+   │                       - 'T' declared here as phantom
+17 │         a: S2<S2<T>>
+   │                  ^ Phantom type parameter cannot be used as an argument to a non-phantom parameter
+
+error[E02013]: invalid phantom type parameter usage
+   ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:23:12
+   │
+21 │     struct S5<T1, phantom T2, T3> {
+   │                           -- 'T2' declared here as phantom
+22 │         a: T1,
+23 │         b: T2,
+   │            ^^ Phantom type parameter cannot be used as a field type
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:30:12
+   │
+28 │     struct S6<phantom T: copy> { a: bool }
+   │                          ---- 'copy' constraint declared here
+29 │     struct S7<phantom T> {
+   │                       - To satisfy the constraint, the 'copy' ability would need to be added here
+30 │         a: S6<T>
+   │            ^^^^^
+   │            │  │
+   │            │  The type 'T' does not have the ability 'copy'
+   │            'copy' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.move
new file mode 100644
index 000000000..873a2b75d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.move
@@ -0,0 +1,32 @@
+module 0x42::M {
+    struct S1<phantom T> {
+        // A phantom parameter cannot be used as the type of a field
+        a: T,
+        // The parameter of vector is non-phantom and a phantom parameter shouldn't be allowed in that position
+        b: vector<T>
+    }
+
+    // A phantom parameter cannot be used as the argument to a non-phantom parameter
+    struct S2<T> { a: T }
+    struct S3<phantom T> {
+        a: S2<T>
+    }
+
+    // Phantom position violation inside another type argument
+    struct S4<phantom T> {
+        a: S2<S2<T>>
+    }
+
+    // Mixing phantom and non-phantom parameters
+    struct S5<T1, phantom T2, T3> {
+        a: T1,
+        b: T2,
+        c: T3
+    }
+
+    // Phantom parameters should satisfy constraints
+    struct S6<phantom T: copy> { a: bool }
+    struct S7<phantom T> {
+        a: S6<T>
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities.move
new file mode 100644
index 000000000..ea8973006
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities.move
@@ -0,0 +1,36 @@
+module 0x42::M {
+    struct NoAbilities { a: bool }
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a: T2 }
+    struct HasStore<phantom T1, T2> has store { a: T2 }
+    struct HasKey<phantom T1, T2> has key { a: T2 }
+    struct HasAbilities<phantom T1, T2> has drop, copy, store, key { a: T2 }
+
+    struct S1<T: drop + copy + store + key> { a: T }
+    struct S2 {
+        a: S1<HasAbilities<NoAbilities, u64>>,
+    }
+
+    struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+    struct S4 {
+        a: S3< HasDrop<NoAbilities, u64>,
+               HasCopy<NoAbilities, u64>,
+               HasStore<NoAbilities, u64>,
+               HasKey<NoAbilities, u64>
+             >
+    }
+
+    fun f1<T: drop + copy + store + key>() { }
+    fun f2() {
+        f1<HasAbilities<NoAbilities, u64>>();
+    }
+
+    fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+    fun f4() {
+        f3< HasDrop<NoAbilities, u64>,
+            HasCopy<NoAbilities, u64>,
+            HasStore<NoAbilities, u64>,
+            HasKey<NoAbilities, u64>
+          >();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp
new file mode 100644
index 000000000..4c3b52b9f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp
@@ -0,0 +1,244 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12
+   │
+ 9 │     struct S1<T: drop + copy + store + key> { a: T }
+   │                         ---- 'copy' constraint declared here
+10 │     struct S2 {
+11 │         a: S1<HasAbilities<NoAbilities, NoAbilities>>,
+   │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │            │  │            │
+   │            │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │            │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+   │            'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12
+   │
+ 9 │     struct S1<T: drop + copy + store + key> { a: T }
+   │                  ---- 'drop' constraint declared here
+10 │     struct S2 {
+11 │         a: S1<HasAbilities<NoAbilities, NoAbilities>>,
+   │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │            │  │            │
+   │            │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │            │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+   │            'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12
+   │
+ 9 │     struct S1<T: drop + copy + store + key> { a: T }
+   │                                ----- 'store' constraint declared here
+10 │     struct S2 {
+11 │         a: S1<HasAbilities<NoAbilities, NoAbilities>>,
+   │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │            │  │            │
+   │            │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │            │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+   │            'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12
+   │
+ 9 │     struct S1<T: drop + copy + store + key> { a: T }
+   │                                        --- 'key' constraint declared here
+10 │     struct S2 {
+11 │         a: S1<HasAbilities<NoAbilities, NoAbilities>>,
+   │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │            │  │            │
+   │            │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │            │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key'
+   │            'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12
+   │  
+14 │       struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+   │                     ---- 'drop' constraint declared here
+15 │       struct S4 {
+16 │           a: S3< HasDrop<NoAbilities, NoAbilities>,
+   │                  ---------------------------------
+   │                  │       │
+   │                  │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │                  The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+   │ ╭────────────^
+17 │ │                HasCopy<NoAbilities, NoAbilities>,
+18 │ │                HasStore<NoAbilities, NoAbilities>,
+19 │ │                HasKey<NoAbilities, NoAbilities>
+20 │ │              >
+   │ ╰──────────────^ 'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12
+   │  
+14 │       struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+   │                               ---- 'copy' constraint declared here
+15 │       struct S4 {
+16 │           a: S3< HasDrop<NoAbilities, NoAbilities>,
+   │ ╭────────────^
+17 │ │                HasCopy<NoAbilities, NoAbilities>,
+   │ │                ---------------------------------
+   │ │                │       │
+   │ │                │       The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │ │                The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+18 │ │                HasStore<NoAbilities, NoAbilities>,
+19 │ │                HasKey<NoAbilities, NoAbilities>
+20 │ │              >
+   │ ╰──────────────^ 'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12
+   │  
+14 │       struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+   │                                         ----- 'store' constraint declared here
+15 │       struct S4 {
+16 │           a: S3< HasDrop<NoAbilities, NoAbilities>,
+   │ ╭────────────^
+17 │ │                HasCopy<NoAbilities, NoAbilities>,
+18 │ │                HasStore<NoAbilities, NoAbilities>,
+   │ │                ----------------------------------
+   │ │                │        │
+   │ │                │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │ │                The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+19 │ │                HasKey<NoAbilities, NoAbilities>
+20 │ │              >
+   │ ╰──────────────^ 'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12
+   │  
+14 │       struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+   │                                                    --- 'key' constraint declared here
+15 │       struct S4 {
+16 │           a: S3< HasDrop<NoAbilities, NoAbilities>,
+   │ ╭────────────^
+17 │ │                HasCopy<NoAbilities, NoAbilities>,
+18 │ │                HasStore<NoAbilities, NoAbilities>,
+19 │ │                HasKey<NoAbilities, NoAbilities>
+   │ │                --------------------------------
+   │ │                │      │
+   │ │                │      The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │ │                The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key'
+20 │ │              >
+   │ ╰──────────────^ 'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9
+   │
+23 │     fun f1<T: drop + copy + store + key>() { }
+   │                      ---- 'copy' constraint declared here
+24 │     fun f2() {
+25 │         f1<HasAbilities<NoAbilities, NoAbilities>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │            │
+   │         │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │         │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+   │         'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9
+   │
+23 │     fun f1<T: drop + copy + store + key>() { }
+   │               ---- 'drop' constraint declared here
+24 │     fun f2() {
+25 │         f1<HasAbilities<NoAbilities, NoAbilities>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │            │
+   │         │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │         │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+   │         'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9
+   │
+23 │     fun f1<T: drop + copy + store + key>() { }
+   │                             ----- 'store' constraint declared here
+24 │     fun f2() {
+25 │         f1<HasAbilities<NoAbilities, NoAbilities>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │            │
+   │         │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │         │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+   │         'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9
+   │
+23 │     fun f1<T: drop + copy + store + key>() { }
+   │                                     --- 'key' constraint declared here
+24 │     fun f2() {
+25 │         f1<HasAbilities<NoAbilities, NoAbilities>>();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │  │            │
+   │         │  │            The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │         │  The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key'
+   │         'key' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9
+   │  
+28 │       fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+   │                  ---- 'drop' constraint declared here
+29 │       fun f4() {
+30 │ ╭         f3< HasDrop<NoAbilities, NoAbilities>,
+   │               ---------------------------------
+   │               │       │
+   │               │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+   │               The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+31 │ │             HasCopy<NoAbilities, NoAbilities>,
+32 │ │             HasStore<NoAbilities, NoAbilities>,
+33 │ │             HasKey<NoAbilities, NoAbilities>
+34 │ │           >();
+   │ ╰─────────────^ 'drop' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9
+   │  
+28 │       fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+   │                            ---- 'copy' constraint declared here
+29 │       fun f4() {
+30 │ ╭         f3< HasDrop<NoAbilities, NoAbilities>,
+31 │ │             HasCopy<NoAbilities, NoAbilities>,
+   │ │             ---------------------------------
+   │ │             │       │
+   │ │             │       The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │ │             The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+32 │ │             HasStore<NoAbilities, NoAbilities>,
+33 │ │             HasKey<NoAbilities, NoAbilities>
+34 │ │           >();
+   │ ╰─────────────^ 'copy' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9
+   │  
+28 │       fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+   │                                      ----- 'store' constraint declared here
+29 │       fun f4() {
+30 │ ╭         f3< HasDrop<NoAbilities, NoAbilities>,
+31 │ │             HasCopy<NoAbilities, NoAbilities>,
+32 │ │             HasStore<NoAbilities, NoAbilities>,
+   │ │             ----------------------------------
+   │ │             │        │
+   │ │             │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │ │             The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+33 │ │             HasKey<NoAbilities, NoAbilities>
+34 │ │           >();
+   │ ╰─────────────^ 'store' constraint not satisifed
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9
+   │  
+28 │       fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+   │                                                 --- 'key' constraint declared here
+29 │       fun f4() {
+30 │ ╭         f3< HasDrop<NoAbilities, NoAbilities>,
+31 │ │             HasCopy<NoAbilities, NoAbilities>,
+32 │ │             HasStore<NoAbilities, NoAbilities>,
+33 │ │             HasKey<NoAbilities, NoAbilities>
+   │ │             --------------------------------
+   │ │             │      │
+   │ │             │      The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │ │             The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key'
+34 │ │           >();
+   │ ╰─────────────^ 'key' constraint not satisifed
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.move
new file mode 100644
index 000000000..b475a9432
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.move
@@ -0,0 +1,36 @@
+module 0x42::M {
+    struct NoAbilities { a: bool }
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a: T2 }
+    struct HasStore<phantom T1, T2> has store { a: T2 }
+    struct HasKey<phantom T1, T2> has key { a: T2 }
+    struct HasAbilities<phantom T1, T2> has drop, copy, store, key { a: T2 }
+
+    struct S1<T: drop + copy + store + key> { a: T }
+    struct S2 {
+        a: S1<HasAbilities<NoAbilities, NoAbilities>>,
+    }
+
+    struct S3<T1: drop, T2: copy, T3: store, T4: key> { a: T1, b: T2, c: T3, d: T4 }
+    struct S4 {
+        a: S3< HasDrop<NoAbilities, NoAbilities>,
+               HasCopy<NoAbilities, NoAbilities>,
+               HasStore<NoAbilities, NoAbilities>,
+               HasKey<NoAbilities, NoAbilities>
+             >
+    }
+
+    fun f1<T: drop + copy + store + key>() { }
+    fun f2() {
+        f1<HasAbilities<NoAbilities, NoAbilities>>();
+    }
+
+    fun f3<T1: drop, T2: copy, T3: store, T4: key>() { }
+    fun f4() {
+        f3< HasDrop<NoAbilities, NoAbilities>,
+            HasCopy<NoAbilities, NoAbilities>,
+            HasStore<NoAbilities, NoAbilities>,
+            HasKey<NoAbilities, NoAbilities>
+          >();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities.move
new file mode 100644
index 000000000..a0fbe26ea
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities.move
@@ -0,0 +1,13 @@
+module 0x42::M {
+    struct NoAbilities { }
+
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a : T2 }
+    struct HasStore<phantom T1, T2> has store { a : T2 }
+    struct HasKey<phantom T1, T2> has key { a : T2 }
+
+    struct S1 has drop { a: HasDrop<NoAbilities, u64> }
+    struct S2 has copy { a: HasCopy<NoAbilities, u64> }
+    struct S3 has store { a: HasStore<NoAbilities, u64> }
+    struct S4 has key { a: HasStore<NoAbilities, u64> }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.exp
new file mode 100644
index 000000000..8e427a7ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.exp
@@ -0,0 +1,40 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/phantom_params_field_abilities_invalid.move:9:29
+  │
+9 │     struct S1 has drop { a: HasDrop<NoAbilities, NoAbilities> }
+  │                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │                             │       │
+  │                             │       The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop'
+  │                             Invalid field type. The struct was declared with the ability 'drop' so all fields require the ability 'drop'
+  │                             The type '0x42::M::HasDrop<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_field_abilities_invalid.move:10:29
+   │
+10 │     struct S2 has copy { a: HasCopy<NoAbilities, NoAbilities> }
+   │                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                             │       │
+   │                             │       The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy'
+   │                             Invalid field type. The struct was declared with the ability 'copy' so all fields require the ability 'copy'
+   │                             The type '0x42::M::HasCopy<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_field_abilities_invalid.move:11:30
+   │
+11 │     struct S3 has store { a: HasStore<NoAbilities, NoAbilities> }
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                              │        │
+   │                              │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │                              Invalid field type. The struct was declared with the ability 'store' so all fields require the ability 'store'
+   │                              The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_params_field_abilities_invalid.move:12:28
+   │
+12 │     struct S4 has key { a: HasStore<NoAbilities, NoAbilities> }
+   │                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                            │        │
+   │                            │        The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store'
+   │                            Invalid field type. The struct was declared with the ability 'key' so all fields require the ability 'store'
+   │                            The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.move
new file mode 100644
index 000000000..320ec78bd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/phantom_params_field_abilities_invalid.move
@@ -0,0 +1,13 @@
+module 0x42::M {
+    struct NoAbilities { }
+
+    struct HasDrop<phantom T1, T2> has drop { a: T2 }
+    struct HasCopy<phantom T1, T2> has copy { a : T2 }
+    struct HasStore<phantom T1, T2> has store { a : T2 }
+    struct HasKey<phantom T1, T2> has key { a : T2 }
+
+    struct S1 has drop { a: HasDrop<NoAbilities, NoAbilities> }
+    struct S2 has copy { a: HasCopy<NoAbilities, NoAbilities> }
+    struct S3 has store { a: HasStore<NoAbilities, NoAbilities> }
+    struct S4 has key { a: HasStore<NoAbilities, NoAbilities> }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.exp
new file mode 100644
index 000000000..f4894001f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.exp
@@ -0,0 +1,28 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/recursive_local.move:4:13
+  │
+4 │         let x;
+  │             ^ Could not infer this type. Try adding an annotation
+
+error[E04008]: invalid type. recursive type found
+  ┌─ tests/move_check/typing/recursive_local.move:5:9
+  │
+4 │         let x;
+  │             - Unable to infer the type. Recursive type found.
+5 │         x = (x, 0);
+  │         ^ Invalid assignment to variable 'x'
+
+error[E04005]: expected a single type
+  ┌─ tests/move_check/typing/recursive_local.move:5:9
+  │
+5 │         x = (x, 0);
+  │         ^   ------ Expected a single type, but found expression list type: '(_, u64)'
+  │         │    
+  │         Invalid type for local
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/recursive_local.move:5:14
+  │
+5 │         x = (x, 0);
+  │              ^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.move b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.move
new file mode 100644
index 000000000..59b08300b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_local.move
@@ -0,0 +1,8 @@
+address 0x42 {
+module M {
+    fun t() {
+        let x;
+        x = (x, 0);
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.exp
new file mode 100644
index 000000000..c0accddbb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.exp
@@ -0,0 +1,45 @@
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs.move:4:21
+  │
+4 │     struct Foo { f: Foo }
+  │                     ^^^
+  │                     │
+  │                     Invalid field containing 'Foo' in struct 'Foo'.
+  │                     Using this struct creates a cycle: 'Foo' contains 'Foo'
+
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs.move:7:25
+  │
+7 │     struct Bar { f: Cup<Bar> }
+  │                         ^^^
+  │                         │
+  │                         Invalid field containing 'Bar' in struct 'Bar'.
+  │                         Using this struct creates a cycle: 'Bar' contains 'Bar'
+
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs.move:9:26
+  │
+9 │     struct X { y: vector<Y> }
+  │                          ^
+  │                          │
+  │                          Invalid field containing 'Y' in struct 'X'.
+  │                          Using this struct creates a cycle: 'Y' contains 'X' contains 'Y'
+
+error[E04018]: cyclic data
+   ┌─ tests/move_check/typing/recursive_structs.move:17:29
+   │
+17 │     struct Foo { f: M0::Cup<Foo> }
+   │                             ^^^
+   │                             │
+   │                             Invalid field containing 'Foo' in struct 'Foo'.
+   │                             Using this struct creates a cycle: 'Foo' contains 'Foo'
+
+error[E04018]: cyclic data
+   ┌─ tests/move_check/typing/recursive_structs.move:21:26
+   │
+21 │     struct C { d: vector<D> }
+   │                          ^
+   │                          │
+   │                          Invalid field containing 'D' in struct 'C'.
+   │                          Using this struct creates a cycle: 'D' contains 'A' contains 'B' contains 'C' contains 'D'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.move b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.move
new file mode 100644
index 000000000..119d6d5d1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs.move
@@ -0,0 +1,25 @@
+address 0x42 {
+
+module M0 {
+    struct Foo { f: Foo }
+
+    struct Cup<T> { f: T }
+    struct Bar { f: Cup<Bar> }
+
+    struct X { y: vector<Y> }
+    struct Y { x: vector<X> }
+
+}
+
+module M1 {
+    use 0x42::M0;
+
+    struct Foo { f: M0::Cup<Foo> }
+
+    struct A { b: B }
+    struct B { c: C }
+    struct C { d: vector<D> }
+    struct D { x: M0::Cup<M0::Cup<M0::Cup<A>>> }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.exp
new file mode 100644
index 000000000..ee623657b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.exp
@@ -0,0 +1,54 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:4:21
+  │
+4 │     struct Foo { f: (Foo, Foo) }
+  │                     ^^^^^^^^^^
+  │                     │
+  │                     Invalid field type
+  │                     Expected a single non-reference type, but found: '(0x42::M0::Foo, 0x42::M0::Foo)'
+
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:4:27
+  │
+4 │     struct Foo { f: (Foo, Foo) }
+  │                           ^^^
+  │                           │
+  │                           Invalid field containing 'Foo' in struct 'Foo'.
+  │                           Using this struct creates a cycle: 'Foo' contains 'Foo'
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:5:21
+  │
+5 │     struct Bar { f: &Bar }
+  │                     ^^^^
+  │                     │
+  │                     Invalid field type
+  │                     Expected a single non-reference type, but found: '&0x42::M0::Bar'
+
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:5:22
+  │
+5 │     struct Bar { f: &Bar }
+  │                      ^^^
+  │                      │
+  │                      Invalid field containing 'Bar' in struct 'Bar'.
+  │                      Using this struct creates a cycle: 'Bar' contains 'Bar'
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:6:21
+  │
+6 │     struct Baz { f: vector<(&Baz, &mut Baz)> }
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^
+  │                     │      │
+  │                     │      Expected a single non-reference type, but found: '(&0x42::M0::Baz, &mut 0x42::M0::Baz)'
+  │                     Invalid type argument
+
+error[E04018]: cyclic data
+  ┌─ tests/move_check/typing/recursive_structs_malformed.move:6:40
+  │
+6 │     struct Baz { f: vector<(&Baz, &mut Baz)> }
+  │                                        ^^^
+  │                                        │
+  │                                        Invalid field containing 'Baz' in struct 'Baz'.
+  │                                        Using this struct creates a cycle: 'Baz' contains 'Baz'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.move b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.move
new file mode 100644
index 000000000..64d475d37
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/recursive_structs_malformed.move
@@ -0,0 +1,9 @@
+address 0x42 {
+
+module M0 {
+    struct Foo { f: (Foo, Foo) }
+    struct Bar { f: &Bar }
+    struct Baz { f: vector<(&Baz, &mut Baz)> }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.exp
new file mode 100644
index 000000000..2d08f3ca9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.exp
@@ -0,0 +1,16 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/return_any_type.move:5:13
+  │
+5 │         0 + (return ());
+  │             ^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/typing/return_any_type.move:9:13
+  │
+9 │         foo(return ());
+  │             ^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+  │
+  = This warning can be suppressed with '#[allow(dead_code)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.move
new file mode 100644
index 000000000..a74a83048
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_any_type.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct Coin {}
+
+    fun t0() {
+        0 + (return ());
+    }
+
+    fun t1() {
+        foo(return ());
+    }
+
+
+    fun foo(c: Coin) {
+        Coin {} = c;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp.move b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp.move
new file mode 100644
index 000000000..d2e6dcc60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(): () {
+        if (true) return () else return ()
+    }
+
+    fun t1(): u64 {
+        return 0
+    }
+
+    fun t2(): (u64, bool, R) {
+        while (true) return (0, false, R{});
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.exp
new file mode 100644
index 000000000..0f90e8ba3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.exp
@@ -0,0 +1,66 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:5:9
+  │
+4 │     fun t0(): u64 {
+  │               --- Expected: 'u64'
+5 │         return ()
+  │         ^^^^^^^^^
+  │         │      │
+  │         │      Given: '()'
+  │         Invalid return
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:9:19
+  │
+8 │     fun t1(): () {
+  │               -- Expected: '()'
+9 │         if (true) return 1 else return 0
+  │                   ^^^^^^^^
+  │                   │      │
+  │                   │      Given: integer
+  │                   Invalid return
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:9:33
+  │
+8 │     fun t1(): () {
+  │               -- Expected: '()'
+9 │         if (true) return 1 else return 0
+  │                                 ^^^^^^^^
+  │                                 │      │
+  │                                 │      Given: integer
+  │                                 Invalid return
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:13:14
+   │
+12 │     fun t2(): (u64, bool) {
+   │               ----------- Expected expression list of length 2: '(u64, bool)'
+13 │         loop return (0, false, R{});
+   │              ^^^^^^^^^^^^^^^^^^^^^^
+   │              │      │
+   │              │      Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+   │              Invalid return
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:18:22
+   │
+17 │     fun t3(): (u64, bool, R, bool) {
+   │               -------------------- Expected expression list of length 4: '(u64, bool, 0x8675309::M::R, bool)'
+18 │         while (true) return (0, false, R{});
+   │                      ^^^^^^^^^^^^^^^^^^^^^^
+   │                      │      │
+   │                      │      Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+   │                      Invalid return
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_explicit_exp_invalid.move:23:23
+   │
+22 │     fun t4(): (bool, u64, R) {
+   │                ---- Expected: 'bool'
+23 │         while (false) return (0, false, R{});
+   │                       ^^^^^^^^^^^^^^^^^^^^^^
+   │                       │       │
+   │                       │       Given: integer
+   │                       Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.move
new file mode 100644
index 000000000..991ab2daf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_explicit_exp_invalid.move
@@ -0,0 +1,26 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(): u64 {
+        return ()
+    }
+
+    fun t1(): () {
+        if (true) return 1 else return 0
+    }
+
+    fun t2(): (u64, bool) {
+        loop return (0, false, R{});
+        abort 0
+    }
+
+    fun t3(): (u64, bool, R, bool) {
+        while (true) return (0, false, R{});
+        abort 0
+    }
+
+    fun t4(): (bool, u64, R) {
+        while (false) return (0, false, R{});
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp.move b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp.move
new file mode 100644
index 000000000..da9500385
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(): () {
+        ()
+    }
+
+    fun t1(): u64 {
+        0
+    }
+
+    fun t2(): (u64, bool, R) {
+        (0, false, R{})
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.exp
new file mode 100644
index 000000000..68f05a986
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.exp
@@ -0,0 +1,55 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/return_type_last_exp_invalid.move:5:9
+  │
+4 │     fun t0(): u64 {
+  │               --- Expected: 'u64'
+5 │         ()
+  │         ^^
+  │         │
+  │         Invalid return expression
+  │         Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/return_type_last_exp_invalid.move:9:9
+  │
+8 │     fun t1(): () {
+  │               -- Expected: '()'
+9 │         0
+  │         ^
+  │         │
+  │         Invalid return expression
+  │         Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_last_exp_invalid.move:13:9
+   │
+12 │     fun t2(): (u64, bool) {
+   │               ----------- Expected expression list of length 2: '(u64, bool)'
+13 │         (0, false, R{})
+   │         ^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid return expression
+   │         Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_last_exp_invalid.move:17:9
+   │
+16 │     fun t3(): (u64, bool, R, bool) {
+   │               -------------------- Expected expression list of length 4: '(u64, bool, 0x8675309::M::R, bool)'
+17 │         (0, false, R{})
+   │         ^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid return expression
+   │         Given expression list of length 3: '({integer}, bool, 0x8675309::M::R)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/return_type_last_exp_invalid.move:21:9
+   │
+20 │     fun t4(): (bool, u64, R) {
+   │                ---- Expected: 'bool'
+21 │         (0, false, R{})
+   │         ^^^^^^^^^^^^^^^
+   │         ││
+   │         │Given: integer
+   │         Invalid return expression
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.move
new file mode 100644
index 000000000..7e9374a90
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/return_type_last_exp_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0(): u64 {
+        ()
+    }
+
+    fun t1(): () {
+        0
+    }
+
+    fun t2(): (u64, bool) {
+        (0, false, R{})
+    }
+
+    fun t3(): (u64, bool, R, bool) {
+        (0, false, R{})
+    }
+
+    fun t4(): (bool, u64, R) {
+        (0, false, R{})
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.exp
new file mode 100644
index 000000000..4fba9582e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.exp
@@ -0,0 +1,57 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/seq_cannot_ignore_resource.move:5:9
+  │
+2 │     struct R {}
+  │            - To satisfy the constraint, the 'drop' ability would need to be added here
+  ·
+5 │         R{};
+  │         ^^^
+  │         │
+  │         Cannot ignore values without the 'drop' ability. The value must be used
+  │         The type '0x8675309::M::R' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/seq_cannot_ignore_resource.move:10:9
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+ 9 │         let r = R{};
+   │                 --- The type '0x8675309::M::R' does not have the ability 'drop'
+10 │         r;
+   │         ^ Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/seq_cannot_ignore_resource.move:14:9
+   │
+14 │         (0, false, R{});
+   │         ^^^^^^^^^^^^^^^
+   │         │          │
+   │         │          The type '(u64, bool, 0x8675309::M::R)' can have the ability 'drop' but the type argument '0x8675309::M::R' does not have the required ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+   │         The type '(u64, bool, 0x8675309::M::R)' does not have the ability 'drop'
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/seq_cannot_ignore_resource.move:19:9
+   │
+18 │         let r = R{};
+   │                 --- The type '(u64, bool, 0x8675309::M::R)' can have the ability 'drop' but the type argument '0x8675309::M::R' does not have the required ability 'drop'
+19 │         if (true) (0, false, R{}) else (0, false, r);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │                              │
+   │         │                              The type '(u64, bool, 0x8675309::M::R)' does not have the ability 'drop'
+   │         Cannot ignore values without the 'drop' ability. The value must be used
+
+error[E06001]: unused value without 'drop'
+   ┌─ tests/move_check/typing/seq_cannot_ignore_resource.move:19:53
+   │
+ 2 │     struct R {}
+   │            - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+18 │         let r = R{};
+   │             -   --- The type '0x8675309::M::R' does not have the ability 'drop'
+   │             │    
+   │             The local variable 'r' might still contain a value. The value does not have the 'drop' ability and must be consumed before the function returns
+19 │         if (true) (0, false, R{}) else (0, false, r);
+   │                                                     ^ Invalid return
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.move b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.move
new file mode 100644
index 000000000..414ed6a81
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_cannot_ignore_resource.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct R {}
+
+    fun t0() {
+        R{};
+    }
+
+    fun t1() {
+        let r = R{};
+        r;
+    }
+
+    fun t2() {
+        (0, false, R{});
+    }
+
+    fun t3() {
+        let r = R{};
+        if (true) (0, false, R{}) else (0, false, r);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/seq_ignores_value.move b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_ignores_value.move
new file mode 100644
index 000000000..bda0ac926
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/seq_ignores_value.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S has drop {}
+
+    fun t0() {
+        ();
+    }
+
+    fun t1() {
+        0;
+    }
+
+    fun t2() {
+        (0, false, S{});
+    }
+
+    fun t3() {
+        if (true) (0, false, S{}) else (0, false, S{});
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing.move b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing.move
new file mode 100644
index 000000000..52873ce6c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct S {f: u64, b: bool}
+
+    fun t0() {
+        let x = 0;
+
+        { let x = false; x; };
+        (x: u64);
+
+        { let x = false; (x: bool); };
+        (x: u64);
+
+        { let x = false; { let x = @0x0; (x: address); }; (x: bool); };
+        (x: u64);
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        if (cond) {
+            let (a, x) = (false, false);
+            (a && x: bool);
+        } else {
+            let x = @0x0;
+            (x: address);
+        };
+        (x: u64);
+    }
+
+    fun t2() {
+        let x = 0;
+        loop {
+            let S { f: _, b: x } = S { f: 0, b: false};
+            (x: bool);
+            break
+        };
+        (x: u64);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.exp
new file mode 100644
index 000000000..00c3a44b7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/typing/shadowing_invalid_scope.move:5:10
+  │
+5 │         (x: bool);
+  │          ^ Invalid variable usage. Unbound variable 'x'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.move b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.move
new file mode 100644
index 000000000..5127d2c0b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_scope.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+
+    fun t0() {
+        { let x = false; x; };
+        (x: bool);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.exp
new file mode 100644
index 000000000..66fee4623
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.exp
@@ -0,0 +1,124 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/shadowing_invalid_types.move:8:13
+  │
+5 │         let x = 0;
+  │             - Given: integer
+  ·
+8 │         (x: bool);
+  │             ^^^^
+  │             │
+  │             Invalid type annotation
+  │             Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:10:30
+   │
+10 │         { let x = false; (x: u64); };
+   │                   -----      ^^^
+   │                   │          │
+   │                   │          Invalid type annotation
+   │                   │          Expected: 'u64'
+   │                   Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:11:13
+   │
+ 5 │         let x = 0;
+   │             - Given: integer
+   ·
+11 │         (x: bool);
+   │             ^^^^
+   │             │
+   │             Invalid type annotation
+   │             Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:13:46
+   │
+13 │         { let x = false; { let x = @0x0; (x: u64); }; (x: address); };
+   │                                    ----      ^^^
+   │                                    │         │
+   │                                    │         Invalid type annotation
+   │                                    │         Expected: 'u64'
+   │                                    Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:13:59
+   │
+13 │         { let x = false; { let x = @0x0; (x: u64); }; (x: address); };
+   │                   -----                                   ^^^^^^^
+   │                   │                                       │
+   │                   │                                       Invalid type annotation
+   │                   │                                       Expected: 'address'
+   │                   Given: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:14:13
+   │
+ 5 │         let x = 0;
+   │             - Given: integer
+   ·
+14 │         (x: bool);
+   │             ^^^^
+   │             │
+   │             Invalid type annotation
+   │             Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:21:17
+   │
+20 │             let (a, x) = (false, false);
+   │                                  ----- Given: 'bool'
+21 │             (x: u64);
+   │                 ^^^
+   │                 │
+   │                 Invalid type annotation
+   │                 Expected: 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:25:17
+   │
+24 │             let x = @0x0;
+   │                     ---- Given: 'address'
+25 │             (x: u64);
+   │                 ^^^
+   │                 │
+   │                 Invalid type annotation
+   │                 Expected: 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:27:13
+   │
+18 │         let x = 0;
+   │             - Given: integer
+   ·
+27 │         (x: address);
+   │             ^^^^^^^
+   │             │
+   │             Invalid type annotation
+   │             Expected: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:34:17
+   │
+ 2 │     struct S {f: u64, b: bool}
+   │                          ---- Given: 'bool'
+   ·
+34 │             (x: u64);
+   │                 ^^^
+   │                 │
+   │                 Invalid type annotation
+   │                 Expected: 'u64'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/shadowing_invalid_types.move:37:13
+   │
+31 │         let x = 0;
+   │             - Given: integer
+   ·
+37 │         (x: bool);
+   │             ^^^^
+   │             │
+   │             Invalid type annotation
+   │             Expected: 'bool'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.move b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.move
new file mode 100644
index 000000000..b83a6a46a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/shadowing_invalid_types.move
@@ -0,0 +1,39 @@
+module 0x8675309::M {
+    struct S {f: u64, b: bool}
+
+    fun t0() {
+        let x = 0;
+
+        { let x = false; x; };
+        (x: bool);
+
+        { let x = false; (x: u64); };
+        (x: bool);
+
+        { let x = false; { let x = @0x0; (x: u64); }; (x: address); };
+        (x: bool);
+    }
+
+    fun t1(cond: bool) {
+        let x = 0;
+        if (cond) {
+            let (a, x) = (false, false);
+            (x: u64);
+            (a && x: bool);
+        } else {
+            let x = @0x0;
+            (x: u64);
+        };
+        (x: address);
+    }
+
+    fun t2() {
+        let x = 0;
+        loop {
+            let S { f: _, b: x } = S { f: 0, b: false};
+            (x: u64);
+            break
+        };
+        (x: bool);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.exp
new file mode 100644
index 000000000..68b191fd8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.exp
@@ -0,0 +1,30 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/spec_block_fail.move:3:19
+  │
+3 │         (spec {}: u64);
+  │          -------  ^^^
+  │          │        │
+  │          │        Invalid type annotation
+  │          │        Expected: 'u64'
+  │          Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/spec_block_fail.move:4:19
+  │
+4 │         (spec {}: &u64);
+  │          -------  ^^^^
+  │          │        │
+  │          │        Invalid type annotation
+  │          │        Expected: '&u64'
+  │          Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/spec_block_fail.move:5:19
+  │
+5 │         (spec {}: (u64, u64));
+  │          -------  ^^^^^^^^^^
+  │          │        │
+  │          │        Invalid type annotation
+  │          │        Expected: '(u64, u64)'
+  │          Given: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.move b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.move
new file mode 100644
index 000000000..047712ad3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_fail.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun specs_in_fun(_x: u64) {
+        (spec {}: u64);
+        (spec {}: &u64);
+        (spec {}: (u64, u64));
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_ok.move b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_ok.move
new file mode 100644
index 000000000..eecb89ff4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/spec_block_ok.move
@@ -0,0 +1,5 @@
+module 0x8675309::M {
+    fun specs_in_fun(_x: u64) {
+        (spec {}: ())
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation.move
new file mode 100644
index 000000000..ed3f9ff0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation.move
@@ -0,0 +1,21 @@
+module 0x8675309::M {
+    struct S has drop {}
+
+    fun t0() {
+        (&mut 0: &mut u64);
+        (&mut 0: &u64);
+        (&0: &u64);
+
+        (&mut S{}: &mut S);
+        (&mut S{}: &S);
+        (&S{}: &S);
+    }
+
+    fun t1() {
+        ((&mut 0, &mut 0): (&mut u64, &mut u64));
+        ((&mut 0, &mut 0): (&mut u64, &u64));
+        ((&mut 0, &mut 0): (&u64, &mut u64));
+        ((&mut 0, &mut 0): (&u64, &u64));
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.exp
new file mode 100644
index 000000000..726afce6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.exp
@@ -0,0 +1,40 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_annotation_invalid.move:5:14
+  │
+5 │         (&0: &mut u64);
+  │          --  ^^^^^^^^
+  │          │   │
+  │          │   Invalid type annotation
+  │          │   Expected: '&mut u64'
+  │          Given: '&{integer}'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_annotation_invalid.move:9:20
+  │
+9 │         ((&0, &0): (&mut u64, &mut u64));
+  │           --       ^^^^^^^^^^^^^^^^^^^^
+  │           │        ││
+  │           │        │Expected: '&mut u64'
+  │           │        Invalid type annotation
+  │           Given: '&{integer}'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_annotation_invalid.move:10:20
+   │
+10 │         ((&0, &0): (&mut u64, &u64));
+   │           --       ^^^^^^^^^^^^^^^^
+   │           │        ││
+   │           │        │Expected: '&mut u64'
+   │           │        Invalid type annotation
+   │           Given: '&{integer}'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_annotation_invalid.move:11:20
+   │
+11 │         ((&0, &0): (&u64, &mut u64));
+   │               --   ^^^^^^^^^^^^^^^^
+   │               │    │      │
+   │               │    │      Expected: '&mut u64'
+   │               │    Invalid type annotation
+   │               Given: '&{integer}'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.move
new file mode 100644
index 000000000..d67bd2263
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_annotation_invalid.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0() {
+        (&0: &mut u64);
+    }
+
+    fun t1() {
+        ((&0, &0): (&mut u64, &mut u64));
+        ((&0, &0): (&mut u64, &u64));
+        ((&0, &0): (&u64, &mut u64));
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args.move
new file mode 100644
index 000000000..70bb47f62
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args.move
@@ -0,0 +1,22 @@
+module 0x8675309::M {
+    struct S has drop {}
+
+    fun imm<T>(_x: &T) {}
+    fun imm_mut<T>(_x: &T, _y: &mut T) {}
+    fun mut_imm<T>(_x: &mut T, _y: &T) {}
+    fun imm_imm<T>(_x: &T, _y: &T) {}
+
+    fun t0() {
+        imm(&mut 0);
+        imm(&0);
+
+        imm(&mut S{});
+        imm(&S{});
+    }
+
+    fun t1() {
+        imm_mut(&mut 0, &mut 0);
+        mut_imm(&mut 0, &mut 0);
+        imm_imm(&mut 0, &mut 0);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.exp
new file mode 100644
index 000000000..2a4615ab7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.exp
@@ -0,0 +1,72 @@
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:10:9
+   │
+ 4 │     fun mut<T>(_x: &mut T) {}
+   │                    ------ Expected: '&mut u64'
+   ·
+10 │         mut<u64>(&0);
+   │         ^^^^^^^^^^^^
+   │         │        │
+   │         │        Given: '&{integer}'
+   │         Invalid call of '0x8675309::M::mut'. Invalid argument for parameter '_x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:11:9
+   │
+ 4 │     fun mut<T>(_x: &mut T) {}
+   │                    ------ Expected: '&mut u64'
+   ·
+11 │         mut<u64>(&S{});
+   │         ^^^^^^^^^^^^^^
+   │         │        │
+   │         │        Given: '&0x8675309::M::S'
+   │         Invalid call of '0x8675309::M::mut'. Invalid argument for parameter '_x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:15:9
+   │
+ 5 │     fun imm_mut<T>(_x: &T, _y: &mut T) {}
+   │                                ------ Expected: '&mut u64'
+   ·
+15 │         imm_mut<u64>(&0, &0);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │                │
+   │         │                Given: '&{integer}'
+   │         Invalid call of '0x8675309::M::imm_mut'. Invalid argument for parameter '_y'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:16:9
+   │
+ 6 │     fun mut_imm<T>(_x: &mut T, _y: &T) {}
+   │                        ------ Expected: '&mut u64'
+   ·
+16 │         mut_imm<u64>(&0, &0);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Given: '&{integer}'
+   │         Invalid call of '0x8675309::M::mut_imm'. Invalid argument for parameter '_x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:17:9
+   │
+ 7 │     fun mut_mut<T>(_x: &mut T, _y: &mut T) {}
+   │                        ------ Expected: '&mut u64'
+   ·
+17 │         mut_mut<u64>(&0, &0);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │            │
+   │         │            Given: '&{integer}'
+   │         Invalid call of '0x8675309::M::mut_mut'. Invalid argument for parameter '_x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_args_invalid.move:17:9
+   │
+ 7 │     fun mut_mut<T>(_x: &mut T, _y: &mut T) {}
+   │                                    ------ Expected: '&mut u64'
+   ·
+17 │         mut_mut<u64>(&0, &0);
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │         │                │
+   │         │                Given: '&{integer}'
+   │         Invalid call of '0x8675309::M::mut_mut'. Invalid argument for parameter '_y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.move
new file mode 100644
index 000000000..c5390aaad
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_args_invalid.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun mut<T>(_x: &mut T) {}
+    fun imm_mut<T>(_x: &T, _y: &mut T) {}
+    fun mut_imm<T>(_x: &mut T, _y: &T) {}
+    fun mut_mut<T>(_x: &mut T, _y: &mut T) {}
+
+    fun t0() {
+        mut<u64>(&0);
+        mut<u64>(&S{});
+    }
+
+    fun t1() {
+        imm_mut<u64>(&0, &0);
+        mut_imm<u64>(&0, &0);
+        mut_mut<u64>(&0, &0);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign.move
new file mode 100644
index 000000000..089b2edb2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign.move
@@ -0,0 +1,24 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0() {
+        let x: &u64;
+        x = &mut 0;
+        x;
+    }
+
+    fun t1() {
+        let (x, y): (&mut u64, &u64);
+        (x, y) = (&mut 0, &mut 0);
+        x; y;
+
+        let (x, y): (&u64, &mut u64);
+        (x, y) = (&mut 0, &mut 0);
+        x; y;
+
+        let (x, y): (&u64, &u64);
+        (x, y) = (&mut 0, &mut 0);
+        x; y;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.exp
new file mode 100644
index 000000000..9287dda55
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.exp
@@ -0,0 +1,49 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_assign_invalid.move:5:17
+  │
+5 │         let _x: &mut u64 = &0;
+  │                 ^^^^^^^^   -- Given: '&{integer}'
+  │                 │           
+  │                 Invalid type annotation
+  │                 Expected: '&mut u64'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_assign_invalid.move:10:10
+   │
+ 9 │         let (x, y): (&mut u64, &mut u64);
+   │                      -------- Expected: '&mut u64'
+10 │         (x, y) = (&0, &0);
+   │          ^        -- Given: '&{integer}'
+   │          │         
+   │          Invalid assignment to variable 'x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_assign_invalid.move:10:13
+   │
+ 9 │         let (x, y): (&mut u64, &mut u64);
+   │                                -------- Expected: '&mut u64'
+10 │         (x, y) = (&0, &0);
+   │             ^         -- Given: '&{integer}'
+   │             │          
+   │             Invalid assignment to variable 'y'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_assign_invalid.move:13:10
+   │
+12 │         let (x, y): (&mut u64, &u64);
+   │                      -------- Expected: '&mut u64'
+13 │         (x, y) = (&0, &0);
+   │          ^        -- Given: '&{integer}'
+   │          │         
+   │          Invalid assignment to variable 'x'
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_assign_invalid.move:16:13
+   │
+15 │         let (x, y): (&u64, &mut u64);
+   │                            -------- Expected: '&mut u64'
+16 │         (x, y)= (&0, &0);
+   │             ^        -- Given: '&{integer}'
+   │             │         
+   │             Invalid assignment to variable 'y'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.move
new file mode 100644
index 000000000..18dc01bf2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_assign_invalid.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0() {
+        let _x: &mut u64 = &0;
+    }
+
+    fun t1() {
+        let (x, y): (&mut u64, &mut u64);
+        (x, y) = (&0, &0);
+
+        let (x, y): (&mut u64, &u64);
+        (x, y) = (&0, &0);
+
+        let (x, y): (&u64, &mut u64);
+        (x, y)= (&0, &0);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind.move
new file mode 100644
index 000000000..05c8dc3dc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0() {
+        let x: &u64 = &mut 0; x;
+    }
+
+    fun t1() {
+        let (x, y): (&mut u64, &u64) = (&mut 0, &mut 0); x; y;
+        let (x, y): (&u64, &mut u64) = (&mut 0, &mut 0); x; y;
+        let (x, y): (&u64, &u64) = (&mut 0, &mut 0); x; y;
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.exp
new file mode 100644
index 000000000..714ce0ac2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.exp
@@ -0,0 +1,36 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_bind_invalid.move:5:17
+  │
+5 │         let _x: &mut u64 = &0;
+  │                 ^^^^^^^^   -- Given: '&{integer}'
+  │                 │           
+  │                 Invalid type annotation
+  │                 Expected: '&mut u64'
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_bind_invalid.move:9:23
+  │
+9 │         let (_x, _y): (&mut u64, &mut u64) = (&0, &0);
+  │                       ^^^^^^^^^^^^^^^^^^^^    -- Given: '&{integer}'
+  │                       ││                       
+  │                       │Expected: '&mut u64'
+  │                       Invalid type annotation
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_bind_invalid.move:10:23
+   │
+10 │         let (_x, _y): (&mut u64, &u64) = (&0, &0);
+   │                       ^^^^^^^^^^^^^^^^    -- Given: '&{integer}'
+   │                       ││                   
+   │                       │Expected: '&mut u64'
+   │                       Invalid type annotation
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_bind_invalid.move:11:23
+   │
+11 │         let (_x, _y): (&u64, &mut u64) = (&0, &0);
+   │                       ^^^^^^^^^^^^^^^^        -- Given: '&{integer}'
+   │                       │      │                 
+   │                       │      Expected: '&mut u64'
+   │                       Invalid type annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.move
new file mode 100644
index 000000000..11a932239
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_bind_invalid.move
@@ -0,0 +1,14 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0() {
+        let _x: &mut u64 = &0;
+    }
+
+    fun t1() {
+        let (_x, _y): (&mut u64, &mut u64) = (&0, &0);
+        let (_x, _y): (&mut u64, &u64) = (&0, &0);
+        let (_x, _y): (&u64, &mut u64) = (&0, &0);
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return.move
new file mode 100644
index 000000000..ede711a52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0(u: &mut u64): &u64 {
+        u
+    }
+
+    fun t1(s: &mut S): &S {
+        s
+    }
+
+    fun t2(u1: &mut u64, u2: &mut u64): (&u64, &mut u64) {
+        (u1, u2)
+    }
+
+    fun t3(u1: &mut u64, u2: &mut u64): (&mut u64, &u64) {
+        (u1, u2)
+    }
+
+    fun t4(u1: &mut u64, u2: &mut u64): (&u64, &u64) {
+        (u1, u2)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.exp
new file mode 100644
index 000000000..174149150
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.exp
@@ -0,0 +1,50 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_return_invalid.move:5:9
+  │
+4 │     fun t0(u: &u64): &mut u64 {
+  │               ----   -------- Expected: '&mut u64'
+  │               │       
+  │               Given: '&u64'
+5 │         u
+  │         ^ Invalid return expression
+
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/subtype_return_invalid.move:9:9
+  │
+8 │     fun t1(s: &S): &mut S {
+  │               --   ------ Expected: '&mut 0x8675309::M::S'
+  │               │     
+  │               Given: '&0x8675309::M::S'
+9 │         s
+  │         ^ Invalid return expression
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_return_invalid.move:13:9
+   │
+12 │     fun t2(u1: &u64, u2: &u64): (&u64, &mut u64) {
+   │                          ----          -------- Expected: '&mut u64'
+   │                          │              
+   │                          Given: '&u64'
+13 │         (u1, u2)
+   │         ^^^^^^^^ Invalid return expression
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_return_invalid.move:17:9
+   │
+16 │     fun t3(u1: &u64, u2: &u64): (&mut u64, &u64) {
+   │                ----              -------- Expected: '&mut u64'
+   │                │                  
+   │                Given: '&u64'
+17 │         (u1, u2)
+   │         ^^^^^^^^ Invalid return expression
+
+error[E04006]: invalid subtype
+   ┌─ tests/move_check/typing/subtype_return_invalid.move:21:9
+   │
+20 │     fun t4(u1: &u64, u2: &u64): (&mut u64, &mut u64) {
+   │                ----              -------- Expected: '&mut u64'
+   │                │                  
+   │                Given: '&u64'
+21 │         (u1, u2)
+   │         ^^^^^^^^ Invalid return expression
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.move
new file mode 100644
index 000000000..0205c6037
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/subtype_return_invalid.move
@@ -0,0 +1,23 @@
+module 0x8675309::M {
+    struct S {}
+
+    fun t0(u: &u64): &mut u64 {
+        u
+    }
+
+    fun t1(s: &S): &mut S {
+        s
+    }
+
+    fun t2(u1: &u64, u2: &u64): (&u64, &mut u64) {
+        (u1, u2)
+    }
+
+    fun t3(u1: &u64, u2: &u64): (&mut u64, &u64) {
+        (u1, u2)
+    }
+
+    fun t4(u1: &u64, u2: &u64): (&mut u64, &mut u64) {
+        (u1, u2)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.exp
new file mode 100644
index 000000000..f1a4af325
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/typing/type_variable_join_single_pack.move:2:19
+  │
+2 │     struct Box<T> copy, drop { f1: T, f2: T }
+  │                   ^^^^
+  │                   │
+  │                   Unexpected 'copy'
+  │                   Expected '{'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.move
new file mode 100644
index 000000000..d777d15bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack.move
@@ -0,0 +1,10 @@
+module M {
+    struct Box<T> copy, drop { f1: T, f2: T }
+
+    fun t0() {
+        let b = Box { f1: 0, f2: 1 };
+        (*&b: Box<u64>);
+        let b2 = Box { f1: *&b, f2: b };
+        (b2: Box<Box<u64>>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.exp
new file mode 100644
index 000000000..a944cc3a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.exp
@@ -0,0 +1,20 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/type_variable_join_single_pack_invalid.move:5:39
+  │
+5 │         let _b = Box { f1: false, f2: 1 };
+  │                            -----      ^
+  │                            │          │
+  │                            │          Invalid argument for field 'f2' for '0x8675309::M::Box'
+  │                            │          Given: integer
+  │                            Expected: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/type_variable_join_single_pack_invalid.move:6:56
+  │
+6 │         let _b2 = Box { f1: Box { f1: 0, f2: 0 }, f2:  Box { f1: false, f2: false } };
+  │                             --------------------       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │                             │                          │         │
+  │                             │                          │         Given: 'bool'
+  │                             │                          Invalid argument for field 'f2' for '0x8675309::M::Box'
+  │                             Expected: integer
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.move
new file mode 100644
index 000000000..065ba227f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_pack_invalid.move
@@ -0,0 +1,8 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun t0() {
+        let _b = Box { f1: false, f2: 1 };
+        let _b2 = Box { f1: Box { f1: 0, f2: 0 }, f2:  Box { f1: false, f2: false } };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack.move
new file mode 100644
index 000000000..43d92a4de
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0() {
+        let Box { f1, f2 } = new();
+        (f1: u64);
+        (f2: u64);
+        let Box { f1, f2 } = new();
+        (f1: Box<u64>);
+        (f2: Box<u64>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign.move
new file mode 100644
index 000000000..6ceec3032
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0() {
+        let f1;
+        let f2;
+        Box { f1, f2 } = new();
+        (f1: u64);
+        (f2: u64);
+        let f1;
+        let f2;
+        Box { f1, f2 } = new();
+        (f1: Box<u64>);
+        (f2: Box<u64>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.exp
new file mode 100644
index 000000000..dea69f69a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.exp
@@ -0,0 +1,22 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.move:13:14
+   │
+12 │         (f1: u64);
+   │              --- Given: 'u64'
+13 │         (f2: bool);
+   │              ^^^^
+   │              │
+   │              Invalid type annotation
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.move:18:14
+   │
+17 │         (f1: Box<u64>);
+   │                  --- Given: 'u64'
+18 │         (f2: Box<bool>);
+   │              ^^^^^^^^^
+   │              │   │
+   │              │   Expected: 'bool'
+   │              Invalid type annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.move
new file mode 100644
index 000000000..7a97e1d46
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_assign_invalid.move
@@ -0,0 +1,20 @@
+module 0x8675309::M {
+    struct Box<T> has drop, copy { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0() {
+        let f1;
+        let f2;
+        Box { f1, f2 } = new();
+        (f1: u64);
+        (f2: bool);
+        let f1;
+        let f2;
+        Box { f1, f2 } = new();
+        (f1: Box<u64>);
+        (f2: Box<bool>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.exp
new file mode 100644
index 000000000..0c59d9c71
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.exp
@@ -0,0 +1,22 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_single_unpack_invalid.move:11:14
+   │
+10 │         (f1: u64);
+   │              --- Given: 'u64'
+11 │         (f2: bool);
+   │              ^^^^
+   │              │
+   │              Invalid type annotation
+   │              Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_single_unpack_invalid.move:14:14
+   │
+13 │         (f1: Box<u64>);
+   │                  --- Given: 'u64'
+14 │         (f2: Box<bool>);
+   │              ^^^^^^^^^
+   │              │   │
+   │              │   Expected: 'bool'
+   │              Invalid type annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.move
new file mode 100644
index 000000000..306111981
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_single_unpack_invalid.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0() {
+        let Box { f1, f2 } = new();
+        (f1: u64);
+        (f2: bool);
+        let Box { f1, f2 } = new();
+        (f1: Box<u64>);
+        (f2: Box<bool>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack.move
new file mode 100644
index 000000000..bb5e2bae9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack.move
@@ -0,0 +1,34 @@
+address 0x2 {
+
+module Container {
+    struct T<V> has drop { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun t0(): Box<u64> {
+        let v = Container::new();
+        let x = Container::get(&v);
+        let b = Box { f1: x, f2: x };
+        Container::put(&mut v, 0);
+        b
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp
new file mode 100644
index 000000000..827465e03
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp
@@ -0,0 +1,27 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_threaded_pack_invalid.move:42:9
+   │
+35 │     fun t0(): Box<bool> {
+   │                   ---- Expected: 'bool'
+   ·
+38 │         let b = Box { f1: x, f2: x };
+   │                 -------------------- Given: integer
+   ·
+42 │         b
+   │         ^ Invalid return expression
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/type_variable_join_threaded_pack_invalid.move:47:17
+   │
+10 │     public fun get<V: drop>(_self: &T<V>): V {
+   │                       ---- 'drop' constraint declared here
+   ·
+27 │     struct Box<T> { f1: T, f2: T }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+47 │         let x = Container::get(&v);
+   │                 ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed
+48 │         let b = Box { f1: x, f2: x };
+49 │         Container::put(&mut v, Box {f1: R{}, f2: R{}});
+   │                                ---------------------- The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.move
new file mode 100644
index 000000000..75bb97d62
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.move
@@ -0,0 +1,54 @@
+address 0x2 {
+
+module Container {
+    struct T<V> { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+
+    public fun get_ref<V: drop>(_self: &T<V>): &V {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> { f1: T, f2: T }
+    struct R {}
+
+    fun id<T>(r: &T): &T {
+        r
+    }
+
+
+    fun t0(): Box<bool> {
+        let v = Container::new();
+        let x = Container::get(&v);
+        let b = Box { f1: x, f2: x };
+        Container::put(&mut v, 0);
+        let r = Container::get_ref(&v);
+        id(r);
+        b
+    }
+
+    fun t2(): Box<Box<R>> {
+        let v = Container::new();
+        let x = Container::get(&v);
+        let b = Box { f1: x, f2: x };
+        Container::put(&mut v, Box {f1: R{}, f2: R{}});
+        b
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.exp
new file mode 100644
index 000000000..132382faa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack.move:39:42
+   │
+23 │     struct Box<T> has drop { f1: T, f2: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+36 │     fun t1(): Box<Box<u64>> {
+   │               ------------- The type '0x2::M::Box<0x2::M::Box<u64>>' does not have the ability 'copy'
+   ·
+39 │         Container::put(&mut v, Box { f1: *&f1, f2 });
+   │                                          ^^^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.move
new file mode 100644
index 000000000..d6c7bb237
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack.move
@@ -0,0 +1,44 @@
+address 0x2 {
+
+module Container {
+    struct T<V> has drop { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0(): u64 {
+        let v = Container::new();
+        let Box { f1, f2 }  = Container::get(&v); f2;
+        Container::put(&mut v, Box { f1: 0, f2: 0});
+        f1
+    }
+
+    fun t1(): Box<Box<u64>> {
+        let v = Container::new();
+        let Box { f1, f2 }  = Container::get(&v);
+        Container::put(&mut v, Box { f1: *&f1, f2 });
+        f1
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.exp
new file mode 100644
index 000000000..ab7fffea6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack_assign.move:44:42
+   │
+23 │     struct Box<T> has drop { f1: T, f2: T }
+   │            --- To satisfy the constraint, the 'copy' ability would need to be added here
+   ·
+39 │     fun t1(): Box<Box<u64>> {
+   │               ------------- The type '0x2::M::Box<0x2::M::Box<u64>>' does not have the ability 'copy'
+   ·
+44 │         Container::put(&mut v, Box { f1: *&f1, f2 });
+   │                                          ^^^^ Invalid dereference. Dereference requires the 'copy' ability
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.move
new file mode 100644
index 000000000..24315f5d3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign.move
@@ -0,0 +1,49 @@
+address 0x2 {
+
+module Container {
+    struct T<V> has drop { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> has drop { f1: T, f2: T }
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0(): u64 {
+        let v = Container::new();
+        let f1;
+        let f2;
+        Box { f1, f2 }  = Container::get(&v);
+        f2;
+        Container::put(&mut v, Box { f1: 0, f2: 0});
+        f1
+    }
+
+    fun t1(): Box<Box<u64>> {
+        let v = Container::new();
+        let f1;
+        let f2;
+        Box { f1, f2 }  = Container::get(&v);
+        Container::put(&mut v, Box { f1: *&f1, f2 });
+        f1
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp
new file mode 100644
index 000000000..50e8a4f7e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp
@@ -0,0 +1,24 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.move:36:9
+   │
+30 │     fun t0(): bool {
+   │               ---- Expected: 'bool'
+31 │         let v = Container::new();
+32 │         let f1;
+   │             -- Given: integer
+   ·
+36 │         f1
+   │         ^^ Invalid return expression
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.move:43:27
+   │
+10 │     public fun get<V: drop>(_self: &T<V>): V {
+   │                       ---- 'drop' constraint declared here
+   ·
+43 │         Box { f1, f2 }  = Container::get(&v);
+   │         --------------    ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed
+   │         │                  
+   │         The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop'
+   │         The type '0x2::M::Box<0x2::M::R>' can have the ability 'drop' but the type argument '0x2::M::R' does not have the required ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.move
new file mode 100644
index 000000000..fff0affc8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.move
@@ -0,0 +1,49 @@
+address 0x2 {
+
+module Container {
+    struct T<V> has drop { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> has drop { f1: T, f2: T }
+    struct R {}
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0(): bool {
+        let v = Container::new();
+        let f1;
+        let f2;
+        Box { f1, f2 }  = Container::get(&v);
+        Container::put(&mut v, Box { f1: 0, f2: 0});
+        f1
+    }
+
+    fun t1(): R {
+        let v = Container::new();
+        let f1;
+        let f2;
+        Box { f1, f2 }  = Container::get(&v);
+        Container::put(&mut v, Box { f1: R{}, f2 });
+        f1
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp
new file mode 100644
index 000000000..da3765cc3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp
@@ -0,0 +1,24 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack_invalid.move:34:9
+   │
+30 │     fun t0(): bool {
+   │               ---- Expected: 'bool'
+31 │         let v = Container::new();
+32 │         let Box { f1, f2 }  = Container::get(&v); f2;
+   │             -------------- Given: integer
+33 │         Container::put(&mut v, Box { f1: 0, f2: 0});
+34 │         f1
+   │         ^^ Invalid return expression
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/type_variable_join_threaded_unpack_invalid.move:39:31
+   │
+10 │     public fun get<V: drop>(_self: &T<V>): V {
+   │                       ---- 'drop' constraint declared here
+   ·
+39 │         let Box { f1, f2 }  = Container::get(&v);
+   │             --------------    ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed
+   │             │                  
+   │             The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop'
+   │             The type '0x2::M::Box<0x2::M::R>' can have the ability 'drop' but the type argument '0x2::M::R' does not have the required ability 'drop'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.move
new file mode 100644
index 000000000..481b61305
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.move
@@ -0,0 +1,45 @@
+address 0x2 {
+
+module Container {
+    struct T<V> has drop { f: V }
+
+    public fun new<V>(): T<V> {
+        abort 0
+    }
+
+    public fun get<V: drop>(_self: &T<V>): V {
+        abort 0
+    }
+
+    public fun put<V>(_self: &mut T<V>, _item: V) {
+        abort 0
+    }
+}
+
+
+module M {
+    use 0x2::Container;
+
+    struct Box<T> has drop { f1: T, f2: T }
+    struct R {}
+
+    fun new<T>(): Box<T> {
+        abort 0
+    }
+
+    fun t0(): bool {
+        let v = Container::new();
+        let Box { f1, f2 }  = Container::get(&v); f2;
+        Container::put(&mut v, Box { f1: 0, f2: 0});
+        f1
+    }
+
+    fun t1(): R {
+        let v = Container::new();
+        let Box { f1, f2 }  = Container::get(&v);
+        Container::put(&mut v, Box { f1: R{}, f2 });
+        f1
+    }
+}
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not.move
new file mode 100644
index 000000000..eeb9a909c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    struct R {
+        f: bool
+    }
+
+    fun t0(x: bool, r: R) {
+        !true;
+        !false;
+        !x;
+        !copy x;
+        !move x;
+        !r.f;
+        let R {f: _} = r;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.exp
new file mode 100644
index 000000000..8f9a7a459
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.exp
@@ -0,0 +1,84 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/unary_not_invalid.move:7:10
+  │
+7 │         !&true;
+  │          ^^^^^
+  │          │
+  │          Invalid argument to '!'
+  │          Expected: 'bool'
+  │          Given: '&bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/unary_not_invalid.move:8:10
+  │
+8 │         !&false;
+  │          ^^^^^^
+  │          │
+  │          Invalid argument to '!'
+  │          Expected: 'bool'
+  │          Given: '&bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/unary_not_invalid.move:9:10
+  │
+9 │         !0;
+  │          ^
+  │          │
+  │          Invalid argument to '!'
+  │          Expected: 'bool'
+  │          Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/unary_not_invalid.move:10:10
+   │
+10 │         !1;
+   │          ^
+   │          │
+   │          Invalid argument to '!'
+   │          Expected: 'bool'
+   │          Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/unary_not_invalid.move:11:10
+   │
+ 6 │     fun t0(r: R) {
+   │               - Given: '0x8675309::M::R'
+   ·
+11 │         !r;
+   │          ^
+   │          │
+   │          Invalid argument to '!'
+   │          Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/unary_not_invalid.move:12:10
+   │
+ 6 │     fun t0(r: R) {
+   │               - Given: '0x8675309::M::R'
+   ·
+12 │         !r;
+   │          ^
+   │          │
+   │          Invalid argument to '!'
+   │          Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/unary_not_invalid.move:13:10
+   │
+13 │         !(0, false);
+   │          ^^^^^^^^^^
+   │          │
+   │          Invalid argument to '!'
+   │          Expected: 'bool'
+   │          Given: '({integer}, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/unary_not_invalid.move:14:10
+   │
+14 │         !();
+   │          ^^
+   │          │
+   │          Invalid argument to '!'
+   │          Expected: 'bool'
+   │          Given: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.move
new file mode 100644
index 000000000..47867596b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unary_not_invalid.move
@@ -0,0 +1,16 @@
+module 0x8675309::M {
+    struct R {
+        f: bool
+    }
+
+    fun t0(r: R) {
+        !&true;
+        !&false;
+        !0;
+        !1;
+        !r;
+        !r;
+        !(0, false);
+        !();
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.exp
new file mode 100644
index 000000000..1bb217842
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.exp
@@ -0,0 +1,6 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_call.move:3:9
+  │
+3 │         foo()
+  │         ^^^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.move b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.move
new file mode 100644
index 000000000..09223a4fe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_call.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun t() {
+        foo()
+    }
+
+    fun foo<T>() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.exp
new file mode 100644
index 000000000..d62df38b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.exp
@@ -0,0 +1,6 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_pack.move:5:9
+  │
+5 │         S{};
+  │         ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.move b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.move
new file mode 100644
index 000000000..b351d4045
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_pack.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S<phantom T> has drop {}
+
+    fun t() {
+        S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.exp
new file mode 100644
index 000000000..a1af273a9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.exp
@@ -0,0 +1,12 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_unpack_assign.move:5:9
+  │
+5 │         S{} = S{};
+  │         ^^^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_unpack_assign.move:5:15
+  │
+5 │         S{} = S{};
+  │               ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.move b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.move
new file mode 100644
index 000000000..e5f691417
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_assign.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S<phantom T> {}
+
+    fun t() {
+        S{} = S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.exp
new file mode 100644
index 000000000..ff9cc61ed
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.exp
@@ -0,0 +1,12 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_unpack_bind.move:5:13
+  │
+5 │         let S{} = S{};
+  │             ^^^ Could not infer this type. Try adding an annotation
+
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_unpack_bind.move:5:19
+  │
+5 │         let S{} = S{};
+  │                   ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.move b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.move
new file mode 100644
index 000000000..c28a9f2c0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_bind.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S<phantom T> { }
+
+    fun t() {
+        let S{} = S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.exp
new file mode 100644
index 000000000..4e21d9e99
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.exp
@@ -0,0 +1,6 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/uninferred_type_unpack_decl.move:5:13
+  │
+5 │         let S{};
+  │             ^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.move b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.move
new file mode 100644
index 000000000..b2c29b055
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/uninferred_type_unpack_decl.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    struct S<phantom T> { }
+
+    fun t() {
+        let S{};
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unit.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unit.move
new file mode 100644
index 000000000..a7b3c40ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unit.move
@@ -0,0 +1,7 @@
+module 0x8675309::M {
+    fun foo(): () {
+        let (): () = ();
+        ();
+        ()
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.move
new file mode 100644
index 000000000..15d008525
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.move
@@ -0,0 +1,3 @@
+module 0x42::unused_consts {
+    const UNUSED: u64 = 42;
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.unused b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.unused.exp
new file mode 100644
index 000000000..0c6d9de9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_const.unused.exp
@@ -0,0 +1,8 @@
+warning[W09011]: unused constant
+  ┌─ tests/move_check/typing/unused_const.move:2:11
+  │
+2 │     const UNUSED: u64 = 42;
+  │           ^^^^^^ The constant 'UNUSED' is never used. Consider removing it.
+  │
+  = This warning can be suppressed with '#[allow(unused_const)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.move
new file mode 100644
index 000000000..ef3ec5325
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.move
@@ -0,0 +1,14 @@
+module 0x42::unused_functions {
+
+    fun init() {
+    }
+
+    public fun f() {
+        used_private()
+    }
+
+    // make sure that defining a function after its use does not matter
+    fun unused_private() {}
+
+    fun used_private() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.unused b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.unused.exp
new file mode 100644
index 000000000..c921043fd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_functions.unused.exp
@@ -0,0 +1,16 @@
+warning[W09008]: unused function
+  ┌─ tests/move_check/typing/unused_functions.move:3:9
+  │
+3 │     fun init() {
+  │         ^^^^ The non-'public', non-'entry' function 'init' is never called. Consider removing it.
+  │
+  = This warning can be suppressed with '#[allow(unused_function)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09008]: unused function
+   ┌─ tests/move_check/typing/unused_functions.move:11:9
+   │
+11 │     fun unused_private() {}
+   │         ^^^^^^^^^^^^^^ The non-'public', non-'entry' function 'unused_private' is never called. Consider removing it.
+   │
+   = This warning can be suppressed with '#[allow(unused_function)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.move
new file mode 100644
index 000000000..2d5d1be12
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.move
@@ -0,0 +1,11 @@
+
+// tests that the example which is allowed in sui mode is not allowed outside of that mode
+
+module a::m {
+    struct Obj has key { id: sui::object::UID }
+}
+
+module sui::object {
+    struct UID has store { value: address }
+    public fun borrow_address(id: &UID): &address { &id.value }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.unused b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.unused.exp
new file mode 100644
index 000000000..cb49f75c8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_id_field.unused.exp
@@ -0,0 +1,8 @@
+warning[W09009]: unused struct field
+  ┌─ tests/move_check/typing/unused_id_field.move:5:26
+  │
+5 │     struct Obj has key { id: sui::object::UID }
+  │                          ^^ The 'id' field of the 'Obj' type is unused
+  │
+  = This warning can be suppressed with '#[allow(unused_field)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.exp
new file mode 100644
index 000000000..954aea579
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.exp
@@ -0,0 +1,80 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/unused_local.move:5:13
+  │
+5 │         let x: u64;
+  │             ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/unused_local.move:9:14
+  │
+9 │         let (x, y): (u64, u64);
+  │              ^ Unused local variable 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+  ┌─ tests/move_check/typing/unused_local.move:9:17
+  │
+9 │         let (x, y): (u64, u64);
+  │                 ^ Unused local variable 'y'. Consider removing or prefixing with an underscore: '_y'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:13:16
+   │
+13 │         let S{ f, g }: S;
+   │                ^ Unused local variable 'f'. Consider removing or prefixing with an underscore: '_f'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:13:19
+   │
+13 │         let S{ f, g }: S;
+   │                   ^ Unused local variable 'g'. Consider removing or prefixing with an underscore: '_g'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:25:22
+   │
+25 │     fun unused_param(x: u64) {
+   │                      ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:28:20
+   │
+28 │     fun two_unused(x: u64, y: bool) {
+   │                    ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:28:28
+   │
+28 │     fun two_unused(x: u64, y: bool) {
+   │                            ^ Unused parameter 'y'. Consider removing or prefixing with an underscore: '_y'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:31:35
+   │
+31 │     fun unused_param1_used_param2(x: u64, y: bool): bool {
+   │                                   ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09002]: unused variable
+   ┌─ tests/move_check/typing/unused_local.move:35:43
+   │
+35 │     fun unused_param2_used_param1(x: u64, y: bool): u64 {
+   │                                           ^ Unused parameter 'y'. Consider removing or prefixing with an underscore: '_y'
+   │
+   = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.move
new file mode 100644
index 000000000..f2c060a71
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_local.move
@@ -0,0 +1,46 @@
+module 0x8675309::M {
+    struct S { f: u64, g: bool }
+
+    fun t0() {
+        let x: u64;
+    }
+
+    fun t1() {
+        let (x, y): (u64, u64);
+    }
+
+    fun t2() {
+        let S{ f, g }: S;
+    }
+
+    fun unused_local_suppressed1() {
+        let _x: u64;
+    }
+
+    fun unused_local_suppressed2() {
+        let _: u64;
+    }
+
+
+    fun unused_param(x: u64) {
+    }
+
+    fun two_unused(x: u64, y: bool) {
+    }
+
+    fun unused_param1_used_param2(x: u64, y: bool): bool {
+        y
+    }
+
+    fun unused_param2_used_param1(x: u64, y: bool): u64 {
+        x
+    }
+
+    fun unused_param_suppressed1(_: u64) {
+    }
+
+    fun unused_param_suppressed2(_x: u64) {
+    }
+
+    native fun unused_native_ok(x: u64, y: bool);
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.exp
new file mode 100644
index 000000000..1c9058640
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.exp
@@ -0,0 +1,8 @@
+warning[W09006]: unused struct type parameter
+  ┌─ tests/move_check/typing/unused_non_phantom_param.move:2:18
+  │
+2 │     struct S<T1, T2> {
+  │                  ^^ Unused type parameter 'T2'. Consider declaring it as phantom
+  │
+  = This warning can be suppressed with '#[allow(unused_type_parameter)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.move
new file mode 100644
index 000000000..bda68114d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_non_phantom_param.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    struct S<T1, T2> {
+        a: u64,
+        b: T1
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.exp
new file mode 100644
index 000000000..231d73a20
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.exp
@@ -0,0 +1,6 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/unused_struct_field.move:63:57
+   │
+63 │     public fun flaky(x: 0x42::private_struct::S): u64 { x.f }
+   │                                                         ^^^ Invalid access of field 'f' on '0x42::private_struct::S'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.move b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.move
new file mode 100644
index 000000000..41cb1e5ae
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.move
@@ -0,0 +1,64 @@
+module 0x42::unused_fields {
+
+    // there should be unused field warning (no fields)
+    native struct NativeStruct;
+
+    // there should be unused field warning (no fields)
+    struct EmptyStruct { }
+
+    struct OneUnusedFieldStruct {
+        field_used_borrow: u8,
+        field_used_borrow_mut: u8,
+        field_used_borrow_var: u8,
+        field_unused: u8
+    }
+
+    struct AllFieldsUsedPackStruct {
+        field1: u8,
+        field2: u8,
+    }
+
+    struct AllFieldsUsedUnpackStruct {
+        field1: u8,
+        field2: u8,
+    }
+
+    struct AllUnusedFieldsStruct {
+        field1: u8,
+        field2: u8,
+    }
+
+    public fun foo(s: &OneUnusedFieldStruct): u8 {
+        s.field_used_borrow
+    }
+
+    public fun bar(s: &mut OneUnusedFieldStruct) {
+        s.field_used_borrow_mut = 42;
+    }
+
+    public fun baz(s: &mut OneUnusedFieldStruct) {
+        let v = s;
+        v.field_used_borrow_var = 42;
+    }
+
+    public fun pack(): AllFieldsUsedPackStruct {
+        AllFieldsUsedPackStruct { field1: 42, field2: 7 }
+    }
+
+    public fun unpack(s: AllFieldsUsedUnpackStruct): (u8, u8) {
+        let AllFieldsUsedUnpackStruct { field1, field2 } = s;
+        (field1, field2)
+    }
+}
+
+// part of the test below is to guard against potential future change to access fields of structs
+// from other modules; if this fails, we need to re-think how we implement unused struct field
+// warning
+
+module 0x42::private_struct {
+    struct S has drop { f: u64 }
+}
+module 0x42::m {
+    struct S has drop { f: u64 }
+    public fun flaky(x: 0x42::private_struct::S): u64 { x.f }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.unused b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.unused.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.unused.exp
new file mode 100644
index 000000000..71820572d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/unused_struct_field.unused.exp
@@ -0,0 +1,30 @@
+warning[W09009]: unused struct field
+   ┌─ tests/move_check/typing/unused_struct_field.move:13:9
+   │
+13 │         field_unused: u8
+   │         ^^^^^^^^^^^^ The 'field_unused' field of the 'OneUnusedFieldStruct' type is unused
+   │
+   = This warning can be suppressed with '#[allow(unused_field)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09009]: unused struct field
+   ┌─ tests/move_check/typing/unused_struct_field.move:27:9
+   │
+27 │         field1: u8,
+   │         ^^^^^^ The 'field1' field of the 'AllUnusedFieldsStruct' type is unused
+   │
+   = This warning can be suppressed with '#[allow(unused_field)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09009]: unused struct field
+   ┌─ tests/move_check/typing/unused_struct_field.move:28:9
+   │
+28 │         field2: u8,
+   │         ^^^^^^ The 'field2' field of the 'AllUnusedFieldsStruct' type is unused
+   │
+   = This warning can be suppressed with '#[allow(unused_field)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/unused_struct_field.move:63:57
+   │
+63 │     public fun flaky(x: 0x42::private_struct::S): u64 { x.f }
+   │                                                         ^^^ Invalid access of field 'f' on '0x42::private_struct::S'. Fields can only be accessed inside the struct's module
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/use_local.move b/vendors/move/crates/move-compiler/tests/move_check/typing/use_local.move
new file mode 100644
index 000000000..57d7b5ec3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/use_local.move
@@ -0,0 +1,13 @@
+module 0x8675309::M {
+    struct S has drop {}
+    struct R {}
+
+    fun t() {
+        let u = 0;
+        let s = S{};
+        let r = R{};
+        (u: u64);
+        (s: S);
+        R{} = (r: R);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/used_const.move b/vendors/move/crates/move-compiler/tests/move_check/typing/used_const.move
new file mode 100644
index 000000000..8ca40adb2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/used_const.move
@@ -0,0 +1,20 @@
+module 0x42::used_consts {
+
+    // at this point consts can only be used in functions and annotations (and not, for example, to
+    // define other constants) so we can only test for that
+
+    const USED_IN_FUN: u64 = 42;
+    const USED_IN_ANNOTATION: u64 = 42;
+
+    public fun foo(): u64 {
+        USED_IN_FUN
+    }
+
+    #[test(p = @42)]
+    #[expected_failure(abort_code = USED_IN_ANNOTATION)]
+    public fun baz(p: u64) {
+        assert!(p > 7, 42);
+    }
+
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/used_const.unused b/vendors/move/crates/move-compiler/tests/move_check/typing/used_const.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/values.move b/vendors/move/crates/move-compiler/tests/move_check/typing/values.move
new file mode 100644
index 000000000..c634c1582
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/values.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun t() {
+        (@0x1: address);
+        (0: u64);
+        (10000: u64);
+        (true: bool);
+        (false: bool);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_basic_cases.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_basic_cases.move
new file mode 100644
index 000000000..d65e77432
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_basic_cases.move
@@ -0,0 +1,31 @@
+module 0x42::Test {
+    struct X has drop {}
+
+    // test basic, valid vector literals
+    fun none() {
+        (vector[]: vector<bool>);
+    }
+
+
+    fun one() {
+        (vector[0]: vector<u8>);
+        (vector[0]: vector<u64>);
+        (vector[0]: vector<u128>);
+        (vector[@0]: vector<address>);
+        (vector[X{}]: vector<X>);
+
+        (vector[vector[]]: vector<vector<address>>);
+        (vector[vector[vector[]]]: vector<vector<vector<address>>>);
+    }
+
+    fun many() {
+        (vector[0, 1, 2]: vector<u8>);
+        (vector[0, 1, 2]: vector<u64>);
+        (vector[0, 1, 2]: vector<u128>);
+        (vector[@0, @1]: vector<address>);
+        (vector[X{}, X{}]: vector<X>);
+
+        (vector[vector[], vector[]]: vector<vector<address>>);
+        (vector[vector[vector[], vector[]], vector[]]: vector<vector<vector<address>>>);
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.exp
new file mode 100644
index 000000000..70ae728a8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.exp
@@ -0,0 +1,50 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/vector_mismatched_args.move:7:9
+  │
+7 │         vector[0, false];
+  │         ^^^^^^^^^^^^^^^^
+  │         │      │  │
+  │         │      │  Found: 'bool'. It is not compatible with the other type.
+  │         │      Found: integer. It is not compatible with the other type.
+  │         Invalid 'vector' instantiation. Incompatible argument
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/vector_mismatched_args.move:8:9
+  │
+8 │         vector[0u8, 0u64, 0u128];
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^
+  │         │      │    │
+  │         │      │    Found: 'u64'. It is not compatible with the other type.
+  │         │      Found: 'u8'. It is not compatible with the other type.
+  │         Invalid 'vector' instantiation. Incompatible argument
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/vector_mismatched_args.move:9:9
+  │
+9 │         vector[0, @0];
+  │         ^^^^^^^^^^^^^
+  │         │      │  │
+  │         │      │  Found: 'address'. It is not compatible with the other type.
+  │         │      Found: integer. It is not compatible with the other type.
+  │         Invalid 'vector' instantiation. Incompatible argument
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/vector_mismatched_args.move:10:9
+   │
+10 │         vector[X{}, Y{}];
+   │         ^^^^^^^^^^^^^^^^
+   │         │      │    │
+   │         │      │    Found: '0x42::Test::Y'. It is not compatible with the other type.
+   │         │      Found: '0x42::Test::X'. It is not compatible with the other type.
+   │         Invalid 'vector' instantiation. Incompatible argument
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/vector_mismatched_args.move:11:9
+   │
+11 │         vector[&0, &false];
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │       │   │
+   │         │       │   Found: 'bool'. It is not compatible with the other type.
+   │         │       Found: integer. It is not compatible with the other type.
+   │         Invalid 'vector' instantiation. Incompatible argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.move
new file mode 100644
index 000000000..b5ec982a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args.move
@@ -0,0 +1,13 @@
+module 0x42::Test {
+    struct X has drop {}
+    struct Y has drop {}
+
+    fun t() {
+        // test args of incompatible types
+        vector[0, false];
+        vector[0u8, 0u64, 0u128];
+        vector[0, @0];
+        vector[X{}, Y{}];
+        vector[&0, &false];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.exp
new file mode 100644
index 000000000..d9ae23fb2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.exp
@@ -0,0 +1,29 @@
+error[E04006]: invalid subtype
+  ┌─ tests/move_check/typing/vector_mismatched_args_non_base_type.move:7:9
+  │
+7 │         vector<&mut u64>[&0];
+  │         ^^^^^^^^^^^^^^^^^^^^
+  │         │      │         │
+  │         │      │         Given: '&{integer}'
+  │         │      Expected: '&mut u64'
+  │         Invalid 'vector' instantiation. Invalid argument type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_mismatched_args_non_base_type.move:7:9
+  │
+7 │         vector<&mut u64>[&0];
+  │         ^^^^^^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '&mut u64'
+  │         Invalid 'vector' type
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/vector_mismatched_args_non_base_type.move:8:9
+  │
+8 │         vector[(), (0, 1)];
+  │         ^^^^^^^^^^^^^^^^^^
+  │         │      │   │
+  │         │      │   Found: '({integer}, {integer})'. It is not compatible with the other type.
+  │         │      Found: '()'. It is not compatible with the other type.
+  │         Invalid 'vector' instantiation. Incompatible argument
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.move
new file mode 100644
index 000000000..2d5f5518b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_mismatched_args_non_base_type.move
@@ -0,0 +1,10 @@
+module 0x42::Test {
+    struct X has drop {}
+    struct Y has drop {}
+
+    fun t() {
+        // test args of incompatible types
+        vector<&mut u64>[&0];
+        vector[(), (0, 1)];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.exp
new file mode 100644
index 000000000..cad83c588
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.exp
@@ -0,0 +1,6 @@
+error[E04010]: cannot infer type
+  ┌─ tests/move_check/typing/vector_no_type_inferred.move:4:9
+  │
+4 │         vector[];
+  │         ^^^^^^^^ Could not infer this type. Try adding an annotation
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.move
new file mode 100644
index 000000000..4e74ac0ae
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_no_type_inferred.move
@@ -0,0 +1,6 @@
+module 0x42::Test {
+    fun t() {
+        // should error as it cannot infer a type
+        vector[];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.exp
new file mode 100644
index 000000000..19b82ed30
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.exp
@@ -0,0 +1,36 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type.move:4:17
+  │
+4 │         let _ = vector<&u64>[];
+  │                 ^^^^^^^^^^^^^^
+  │                 │      │
+  │                 │      Expected a single non-reference type, but found: '&u64'
+  │                 Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type.move:5:17
+  │
+5 │         let _ = vector<&mut u64>[];
+  │                 ^^^^^^^^^^^^^^^^^^
+  │                 │      │
+  │                 │      Expected a single non-reference type, but found: '&mut u64'
+  │                 Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type.move:6:17
+  │
+6 │         let _ = vector<()>[];
+  │                 ^^^^^^^^^^^^
+  │                 │      │
+  │                 │      Expected a single non-reference type, but found: '()'
+  │                 Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type.move:7:17
+  │
+7 │         let _ = vector<(u64, bool)>[];
+  │                 ^^^^^^^^^^^^^^^^^^^^^
+  │                 │      │
+  │                 │      Expected a single non-reference type, but found: '(u64, bool)'
+  │                 Invalid 'vector' type
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.move
new file mode 100644
index 000000000..3c66b726d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type.move
@@ -0,0 +1,9 @@
+module 0x42::Test {
+    fun t() {
+        // test invalid vector instatiation
+        let _ = vector<&u64>[];
+        let _ = vector<&mut u64>[];
+        let _ = vector<()>[];
+        let _ = vector<(u64, bool)>[];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.exp
new file mode 100644
index 000000000..46fc4e149
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.exp
@@ -0,0 +1,54 @@
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:4:9
+  │
+4 │         vector[&0];
+  │         ^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '&u64'
+  │         Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:5:9
+  │
+5 │         vector[&mut 0];
+  │         ^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '&mut u64'
+  │         Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:6:9
+  │
+6 │         vector[()];
+  │         ^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '()'
+  │         Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:7:9
+  │
+7 │         vector[(0, false)];
+  │         ^^^^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '(u64, bool)'
+  │         Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+  ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:9:9
+  │
+9 │         vector[&0, &mut 0];
+  │         ^^^^^^^^^^^^^^^^^^
+  │         │      │
+  │         │      Expected a single non-reference type, but found: '&u64'
+  │         Invalid 'vector' type
+
+error[E04004]: expected a single non-reference type
+   ┌─ tests/move_check/typing/vector_with_non_base_type_inferred.move:10:9
+   │
+10 │         vector[&mut 0, &0];
+   │         ^^^^^^^^^^^^^^^^^^
+   │         │              │
+   │         │              Expected a single non-reference type, but found: '&u64'
+   │         Invalid 'vector' type
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.move b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.move
new file mode 100644
index 000000000..849cf07b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/vector_with_non_base_type_inferred.move
@@ -0,0 +1,12 @@
+module 0x42::Test {
+    fun t() {
+        // test invalid vector instatiation, inferred type
+        vector[&0];
+        vector[&mut 0];
+        vector[()];
+        vector[(0, false)];
+        // tests valid subtyping join... although not important at the moment
+        vector[&0, &mut 0];
+        vector[&mut 0, &0];
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_body.move b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body.move
new file mode 100644
index 000000000..b37b324c5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body.move
@@ -0,0 +1,15 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        while (cond) ();
+        while (cond) (());
+        while (cond) {};
+        while (cond) { let x = 0; x; };
+        while (cond) { if (cond) () };
+        while (cond) break;
+        while (cond) { break };
+        while (cond) continue;
+        while (cond) { continue };
+        while (cond) return ();
+        while (cond) { while (cond) { break } }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.exp
new file mode 100644
index 000000000..65803893d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.exp
@@ -0,0 +1,50 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_body_invalid.move:3:22
+  │
+3 │         while (cond) 0;
+  │                      ^
+  │                      │
+  │                      Invalid loop body
+  │                      Expected: '()'
+  │                      Given: integer
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_body_invalid.move:4:22
+  │
+4 │         while (cond) false;
+  │                      ^^^^^
+  │                      │
+  │                      Invalid loop body
+  │                      Expected: '()'
+  │                      Given: 'bool'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_body_invalid.move:5:22
+  │
+5 │         while (cond) { @0x0 };
+  │                      ^^^^^^^^
+  │                      │ │
+  │                      │ Given: 'address'
+  │                      Invalid loop body
+  │                      Expected: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_body_invalid.move:6:22
+  │
+6 │         while (cond) { let x = 0; x };
+  │                      ^^^^^^^^^^^^^^^^
+  │                      │     │
+  │                      │     Given: integer
+  │                      Invalid loop body
+  │                      Expected: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_body_invalid.move:7:22
+  │
+7 │         while (cond) { if (cond) 1 else 0 };
+  │                      ^^^^^^^^^^^^^^^^^^^^^^
+  │                      │                  │
+  │                      │                  Given: integer
+  │                      Invalid loop body
+  │                      Expected: '()'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.move
new file mode 100644
index 000000000..52ba4ed4f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_body_invalid.move
@@ -0,0 +1,9 @@
+module 0x8675309::M {
+    fun t0(cond: bool) {
+        while (cond) 0;
+        while (cond) false;
+        while (cond) { @0x0 };
+        while (cond) { let x = 0; x };
+        while (cond) { if (cond) 1 else 0 };
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition.move b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition.move
new file mode 100644
index 000000000..c585d90f4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition.move
@@ -0,0 +1,12 @@
+module 0x8675309::M {
+    fun t0() {
+        while (true) ();
+        while (false) ()
+    }
+
+    fun t1() {
+        while ({ let foo = true; foo }) ();
+        while ({ let bar = false; bar }) ()
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.exp
new file mode 100644
index 000000000..c4dca699d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.exp
@@ -0,0 +1,81 @@
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_condition_invalid.move:3:16
+  │
+3 │         while (()) ();
+  │                ^^
+  │                │
+  │                Invalid while condition
+  │                Expected: 'bool'
+  │                Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_condition_invalid.move:4:16
+  │
+4 │         while ((())) ();
+  │                ^^^^
+  │                │
+  │                Invalid while condition
+  │                Expected: 'bool'
+  │                Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_condition_invalid.move:5:16
+  │
+5 │         while ({}) ()
+  │                ^^
+  │                │
+  │                Invalid while condition
+  │                Expected: 'bool'
+  │                Given: '()'
+
+error[E04007]: incompatible types
+  ┌─ tests/move_check/typing/while_condition_invalid.move:9:16
+  │
+8 │     fun t1<T: drop>(x: T) {
+  │                        - Given: 'T'
+9 │         while (x) ();
+  │                ^
+  │                │
+  │                Invalid while condition
+  │                Expected: 'bool'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/while_condition_invalid.move:10:16
+   │
+10 │         while (0) ();
+   │                ^
+   │                │
+   │                Invalid while condition
+   │                Expected: 'bool'
+   │                Given: integer
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/while_condition_invalid.move:11:16
+   │
+11 │         while (@0x0) ()
+   │                ^^^^
+   │                │
+   │                Invalid while condition
+   │                Expected: 'bool'
+   │                Given: 'address'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/while_condition_invalid.move:15:16
+   │
+15 │         while ((false, true)) ();
+   │                ^^^^^^^^^^^^^
+   │                │
+   │                Invalid while condition
+   │                Expected: 'bool'
+   │                Given: '(bool, bool)'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/typing/while_condition_invalid.move:16:16
+   │
+16 │         while ((0, false)) ()
+   │                ^^^^^^^^^^
+   │                │
+   │                Invalid while condition
+   │                Expected: 'bool'
+   │                Given: '({integer}, bool)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.move
new file mode 100644
index 000000000..8fe88716d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/typing/while_condition_invalid.move
@@ -0,0 +1,19 @@
+module 0x8675309::M {
+    fun t0() {
+        while (()) ();
+        while ((())) ();
+        while ({}) ()
+    }
+
+    fun t1<T: drop>(x: T) {
+        while (x) ();
+        while (0) ();
+        while (@0x0) ()
+    }
+
+    fun t2() {
+        while ((false, true)) ();
+        while ((0, false)) ()
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location.move
new file mode 100644
index 000000000..2ece812bb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location.move
@@ -0,0 +1,33 @@
+#[test_only]
+address 0x42 {
+module A {
+    struct T {}
+}
+}
+
+#[test_only]
+module 0x42::M {
+}
+
+module 0x42::N {
+    #[test_only]
+    friend 0x42::M;
+
+    #[test_only]
+    use 0x42::A;
+
+    #[test_only]
+    const C: u64 = 0;
+
+    #[test_only]
+    struct S { f: A::T }
+
+    #[test_only]
+    fun foo() {}
+}
+
+module 0x42::Z {
+    #[test]
+    #[expected_failure(abort_code = 0, location = 0x42::Z )]
+    fun foo() { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.exp
new file mode 100644
index 000000000..75e136bf8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.exp
@@ -0,0 +1,15 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/attribute_location_invalid.move:1:3
+  │
+1 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E02015]: invalid attribute
+   ┌─ tests/move_check/unit_test/attribute_location_invalid.move:10:7
+   │
+10 │     #[expected_failure(abort_code = 0)]
+   │       ^^^^^^^^^^^^^^^^
+   │       │
+   │       Known attribute 'expected_failure' is not expected with a struct
+   │       Expected to be used with one of the following: function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.move
new file mode 100644
index 000000000..e87b8b22b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.move
@@ -0,0 +1,12 @@
+#[test_only]
+script {
+    fun main() {}
+}
+
+#[test]
+module 0x42::M {}
+
+module 0x42::N {
+    #[expected_failure(abort_code = 0)]
+    struct S {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.unit_test.exp
new file mode 100644
index 000000000..545bbcb91
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/attribute_location_invalid.unit_test.exp
@@ -0,0 +1,24 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/attribute_location_invalid.move:1:3
+  │
+1 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/attribute_location_invalid.move:6:3
+  │
+6 │ #[test]
+  │   ^^^^
+  │   │
+  │   Known attribute 'test' is not expected with a module
+  │   Expected to be used with one of the following: function
+
+error[E02015]: invalid attribute
+   ┌─ tests/move_check/unit_test/attribute_location_invalid.move:10:7
+   │
+10 │     #[expected_failure(abort_code = 0)]
+   │       ^^^^^^^^^^^^^^^^
+   │       │
+   │       Known attribute 'expected_failure' is not expected with a struct
+   │       Expected to be used with one of the following: function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members.move
new file mode 100644
index 000000000..40b60250e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members.move
@@ -0,0 +1,24 @@
+// Check that test_only filtering and calling is supported across modules and
+// different types of module members
+address 0x1 {
+module A {
+    #[test_only]
+    struct Foo has drop {}
+
+    #[test_only]
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[test_only]
+    use 0x1::A::{Self, Foo};
+
+    #[test_only]
+    fun x(_: Foo) { }
+
+    #[test]
+    fun tester() {
+        x(A::build_foo())
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp
new file mode 100644
index 000000000..416d8f009
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.exp
@@ -0,0 +1,12 @@
+error[E03004]: unbound type
+   ┌─ tests/move_check/unit_test/cross_module_members_non_test_function.move:23:23
+   │
+23 │     public fun bad(): Foo {
+   │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/unit_test/cross_module_members_non_test_function.move:24:9
+   │
+24 │         A::build_foo()
+   │         ^ Unbound module alias 'A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.move
new file mode 100644
index 000000000..1cb0df8ff
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.move
@@ -0,0 +1,27 @@
+// check that `use`'s are filtered out correctly in non-test mode
+address 0x1 {
+module A {
+    struct Foo has drop {}
+
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[test_only]
+    use 0x1::A::{Self, Foo};
+
+    #[test_only]
+    fun x(_: Foo) { }
+
+    #[test]
+    fun tester() {
+        x(A::build_foo())
+    }
+
+    // this should fail find the A module in non-test mode as the use statement
+    // for `A` is test_only.
+    public fun bad(): Foo {
+        A::build_foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_members_non_test_function.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp
new file mode 100644
index 000000000..d1d5dd6fc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.exp
@@ -0,0 +1,12 @@
+error[E03002]: unbound module
+   ┌─ tests/move_check/unit_test/cross_module_test_only_module.move:10:9
+   │
+10 │     use 0x1::M;
+   │         ^^^^^^ Invalid 'use'. Unbound module: '0x1::M'
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/unit_test/cross_module_test_only_module.move:13:9
+   │
+13 │         M::foo()
+   │         ^ Unbound module alias 'M'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.move
new file mode 100644
index 000000000..90bf3320c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.move
@@ -0,0 +1,16 @@
+// check that modules that are annotated as test_only are filtered out correctly
+address 0x1 {
+#[test_only]
+module M {
+    public fun foo() { }
+}
+
+module Tests {
+    // this use should cause an unbound module error as M should be filtered out
+    use 0x1::M;
+
+    fun bar() {
+        M::foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/cross_module_test_only_module.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.move
new file mode 100644
index 000000000..2f25f3658
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.move
@@ -0,0 +1,21 @@
+// entry functions are public if called from test or test_only
+
+module a::m {
+    entry fun internal(_ :u64) {}
+}
+
+#[test_only]
+module a::test_only {
+    fun example() {
+        // force a type error to make sure visibility is allowed
+        a::m::internal(0u8)
+    }
+}
+
+module a::tests {
+    #[test]
+    fun test() {
+        // force a type error to make sure visibility is allowed
+        a::m::internal(0u8)
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.unit_test.exp
new file mode 100644
index 000000000..590a6b864
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/entry_is_public_in_test_contexts.unit_test.exp
@@ -0,0 +1,24 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/unit_test/entry_is_public_in_test_contexts.move:11:9
+   │
+ 4 │     entry fun internal(_ :u64) {}
+   │                           --- Expected: 'u64'
+   ·
+11 │         a::m::internal(0u8)
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │              │
+   │         │              Given: 'u8'
+   │         Invalid call of 'a::m::internal'. Invalid argument for parameter '_'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/unit_test/entry_is_public_in_test_contexts.move:19:9
+   │
+ 4 │     entry fun internal(_ :u64) {}
+   │                           --- Expected: 'u64'
+   ·
+19 │         a::m::internal(0u8)
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │              │
+   │         │              Given: 'u8'
+   │         Invalid call of 'a::m::internal'. Invalid argument for parameter '_'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.move
new file mode 100644
index 000000000..bc113722c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.move
@@ -0,0 +1,25 @@
+// check that invalid abort_code values cannot be assigned
+module 0x1::A {
+    #[test_only]
+    struct Foo has drop {}
+
+    #[test]
+    #[expected_failure(abort_code=true)]
+    fun assign_boolean_abort_code() { }
+
+    #[test]
+    #[expected_failure(abort_code=x"")]
+    fun assign_hexbyte_abort_code() { }
+
+    #[test]
+    #[expected_failure(abort_code=b"")]
+    fun assign_byte_abort_code() { }
+
+    #[test]
+    #[expected_failure(abort_code=Foo)]
+    fun assign_struct_abort_code() { }
+
+    #[test]
+    #[expected_failure(abort_code=@0xC0FFEE)]
+    fun assign_address_abort_code() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp
new file mode 100644
index 000000000..aa00a53a2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp
@@ -0,0 +1,45 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:7:24
+  │
+7 │     #[expected_failure(abort_code=true)]
+  │                        ^^^^^^^^^^^^^^^
+  │                        │          │
+  │                        │          Unsupported value in this assignment
+  │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:11:24
+   │
+11 │     #[expected_failure(abort_code=x"")]
+   │                        ^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:15:24
+   │
+15 │     #[expected_failure(abort_code=b"")]
+   │                        ^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:19:35
+   │
+ 2 │ module 0x1::A {
+   │             - Unbound constant 'Foo' in module '0x1::A'
+   ·
+19 │     #[expected_failure(abort_code=Foo)]
+   │                                   ^^^ Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:23:24
+   │
+23 │     #[expected_failure(abort_code=@0xC0FFEE)]
+   │                        ^^^^^^^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants.move
new file mode 100644
index 000000000..3ecbcdedd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants.move
@@ -0,0 +1,33 @@
+module 0x2::m {
+    const C: u64 = 0 + 1 + 2;
+}
+
+// check that constants can be used
+module 0x1::A {
+    #[test_only]
+    use 0x2::m as x;
+
+    const C0: u64 = 0;
+    #[test_only]
+    const C1: u64 = 0;
+
+    #[test]
+    #[expected_failure(abort_code=C0)]
+    fun use_c0() { }
+
+    #[test]
+    #[expected_failure(abort_code=C1)]
+    fun use_c1() { }
+
+    #[test]
+    #[expected_failure(abort_code=x::C)]
+    fun use_through_alias() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x1::A::C0)]
+    fun use_explicit_internal() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x2::m::C)]
+    fun use_explicit_external() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move
new file mode 100644
index 000000000..60c3aac52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move
@@ -0,0 +1,19 @@
+module 0x2::m {
+    const C: u8 = 0 + 1 + 2;
+}
+
+// check invalid constant usage
+module 0x1::A {
+
+    #[test]
+    #[expected_failure(abort_code=0x2::m::C)]
+    fun not_u64() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x2::x::C)]
+    fun unbound_module() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x1::A::C0)]
+    fun unbound_constant() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp
new file mode 100644
index 000000000..c4d55c45e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp
@@ -0,0 +1,27 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:9:35
+  │
+2 │     const C: u8 = 0 + 1 + 2;
+  │     ------------------------ Constant '0x2::m::C' has a non-u64 value. Only 'u64' values are permitted
+  ·
+9 │     #[expected_failure(abort_code=0x2::m::C)]
+  │                                   ^^^^^^^^^ Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:13:35
+   │
+13 │     #[expected_failure(abort_code=0x2::x::C)]
+   │                                   ^^^^^^^^^
+   │                                   │
+   │                                   Invalid value in attribute assignment
+   │                                   Unbound module '0x2::x'
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:17:35
+   │
+17 │     #[expected_failure(abort_code=0x1::A::C0)]
+   │                                   ^^^^^^^^^^
+   │                                   │
+   │                                   Invalid value in attribute assignment
+   │                                   Unbound constant 'C0' in module '0x1::A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move
new file mode 100644
index 000000000..511dd2458
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move
@@ -0,0 +1,21 @@
+// check that only non-annotated integer literals and u64s can be assigned to
+// abort codes
+address 0x1 {
+module M {
+    #[test]
+    #[expected_failure(abort_code=0, location=0x1::M)]
+    fun ok1() { }
+
+    #[test]
+    #[expected_failure(abort_code=0u64, location=0x1::M)]
+    fun ok2() { }
+
+    #[test]
+    #[expected_failure(abort_code=0u8, location=0x1::M)]
+    fun fail_annot1() { }
+
+    #[test]
+    #[expected_failure(abort_code=0u128, location=0x1::M)]
+    fun fail_annot3() { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp
new file mode 100644
index 000000000..be8293fc8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp
@@ -0,0 +1,18 @@
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_invalid_literals.move:14:24
+   │
+14 │     #[expected_failure(abort_code=0u8, location=0x1::M)]
+   │                        ^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Annotated non-u64 literals are not permitted
+   │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_invalid_literals.move:18:24
+   │
+18 │     #[expected_failure(abort_code=0u128, location=0x1::M)]
+   │                        ^^^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Annotated non-u64 literals are not permitted
+   │                        Invalid value in attribute assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.move
new file mode 100644
index 000000000..dc0a6a618
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.move
@@ -0,0 +1,8 @@
+// expected_failure attributes can only be placed on #[test] functions
+module 0x1::A {
+    #[expected_failure]
+    fun foo() { }
+
+    #[test_only, expected_failure]
+    fun bar() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.unit_test.exp
new file mode 100644
index 000000000..b9edf0d76
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_not_test.unit_test.exp
@@ -0,0 +1,16 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_check/unit_test/expected_failure_not_test.move:4:9
+  │
+3 │     #[expected_failure]
+  │       ---------------- Attributed as #[expected_failure] here
+4 │     fun foo() { }
+  │         ^^^ Only functions defined as a test with #[test] can also have an #[expected_failure] attribute
+
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_check/unit_test/expected_failure_not_test.move:7:9
+  │
+6 │     #[test_only, expected_failure]
+  │                  ---------------- Attributed as #[expected_failure] here
+7 │     fun bar() { }
+  │         ^^^ Only functions defined as a test with #[test] can also have an #[expected_failure] attribute
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.exp
new file mode 100644
index 000000000..0adc53246
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.exp
@@ -0,0 +1,27 @@
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:3:7
+  │
+3 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a struct
+  │       Expected to be used with one of the following: function
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:6:7
+  │
+6 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a use
+  │       Expected to be used with one of the following: function
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:9:7
+  │
+9 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a constant
+  │       Expected to be used with one of the following: function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.move
new file mode 100644
index 000000000..94822f1b4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.move
@@ -0,0 +1,13 @@
+// expected_failure attributes can only be placed on #[test] functions
+module 0x1::A {
+    #[expected_failure]
+    struct Foo {}
+
+    #[expected_failure]
+    use 0x1::A;
+
+    #[expected_failure]
+    const C: u64 = 0;
+
+    struct Bar { f: A::Foo }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.unit_test.exp
new file mode 100644
index 000000000..0adc53246
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_on_non_function.unit_test.exp
@@ -0,0 +1,27 @@
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:3:7
+  │
+3 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a struct
+  │       Expected to be used with one of the following: function
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:6:7
+  │
+6 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a use
+  │       Expected to be used with one of the following: function
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/unit_test/expected_failure_on_non_function.move:9:7
+  │
+9 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^
+  │       │
+  │       Known attribute 'expected_failure' is not expected with a constant
+  │       Expected to be used with one of the following: function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.move
new file mode 100644
index 000000000..1564dee73
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.move
@@ -0,0 +1,19 @@
+// abort_code numbers need to remain in the u64 range
+address 0x1 {
+module M {
+    // at u64::max - 1, OK
+    #[test]
+    #[expected_failure(abort_code=18446744073709551614)]
+    fun ok() { }
+
+    // at u64::max, OK
+    #[test]
+    #[expected_failure(abort_code=18446744073709551615)]
+    fun at_max_ok() { }
+
+    // at u64::max + 1, raise an error
+    #[test]
+    #[expected_failure(abort_code=18446744073709551616)]
+    fun past_max_should_fail() { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp
new file mode 100644
index 000000000..1d0455885
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp
@@ -0,0 +1,25 @@
+warning[W10007]: potential issue with attribute value
+  ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:6:24
+  │
+6 │     #[expected_failure(abort_code=18446744073709551614)]
+  │                        ^^^^^^^^^^ -------------------- Replace value with constant from expected module or add `location=...` attribute.
+  │                        │           
+  │                        WARNING: passes for an abort from any module.
+
+warning[W10007]: potential issue with attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:11:24
+   │
+11 │     #[expected_failure(abort_code=18446744073709551615)]
+   │                        ^^^^^^^^^^ -------------------- Replace value with constant from expected module or add `location=...` attribute.
+   │                        │           
+   │                        WARNING: passes for an abort from any module.
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:16:24
+   │
+16 │     #[expected_failure(abort_code=18446744073709551616)]
+   │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                        │          │
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.move
new file mode 100644
index 000000000..33bf5eda3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.move
@@ -0,0 +1,27 @@
+// tests non-abort related execution failures
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error, location=std::vector, hello=0)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=n, wowza)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self, so_many_attrs)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, an_attr_here_is_unused, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_code=0, location=Self)]
+    fun t4() { }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp
new file mode 100644
index 000000000..cdb20d48d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp
@@ -0,0 +1,40 @@
+warning[W09007]: unused attribute
+  ┌─ tests/move_check/unit_test/extra_attributes.move:8:60
+  │
+8 │     #[expected_failure(vector_error, location=std::vector, hello=0)]
+  │                                                            ^^^^^ Unused attribute for expected_failure
+  │
+  = This warning can be suppressed with '#[allow(unused_attribute)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:12:54
+   │
+12 │     #[expected_failure(arithmetic_error, location=n, wowza)]
+   │                                                      ^^^^^ Unused attribute for expected_failure
+   │
+   = This warning can be suppressed with '#[allow(unused_attribute)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:16:51
+   │
+16 │     #[expected_failure(out_of_gas, location=Self, so_many_attrs)]
+   │                                                   ^^^^^^^^^^^^^ Unused attribute for expected_failure
+   │
+   = This warning can be suppressed with '#[allow(unused_attribute)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:20:43
+   │
+20 │     #[expected_failure(major_status=4004, an_attr_here_is_unused, location=Self)]
+   │                                           ^^^^^^^^^^^^^^^^^^^^^^ Unused attribute for expected_failure
+   │
+   = This warning can be suppressed with '#[allow(unused_attribute)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:24:43
+   │
+24 │     #[expected_failure(major_status=4016, minor_code=0, location=Self)]
+   │                                           ^^^^^^^^^^ Unused attribute for expected_failure
+   │
+   = This warning can be suppressed with '#[allow(unused_attribute)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.move
new file mode 100644
index 000000000..c81a2f6db
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.move
@@ -0,0 +1,14 @@
+// only "abort_code" can be used as the expected_failure abort code assignment name
+module 0x1::M {
+    #[test]
+    #[expected_failure(cod=1)]
+    fun no() {}
+
+    #[test]
+    #[expected_failure(code=1)]
+    fun nope() {}
+
+    #[test]
+    #[expected_failure(abort_cod=1)]
+    fun noo() {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp
new file mode 100644
index 000000000..e74424e0e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp
@@ -0,0 +1,18 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:4:7
+  │
+4 │     #[expected_failure(cod=1)]
+  │       ^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
+
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:8:7
+  │
+8 │     #[expected_failure(code=1)]
+  │       ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:12:7
+   │
+12 │     #[expected_failure(abort_cod=1)]
+   │       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.move
new file mode 100644
index 000000000..8d20123ca
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.move
@@ -0,0 +1,6 @@
+// straight assignment of an abort code to the expected_failure attribute isn't allowed
+module 0x1::M {
+    #[test]
+    #[expected_failure=1]
+    fun f() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp
new file mode 100644
index 000000000..ddc82bdea
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp
@@ -0,0 +1,9 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/invalid_expected_failure_name.move:4:24
+  │
+4 │     #[expected_failure=1]
+  │       -----------------^
+  │       │                │
+  │       │                Invalid expected failure code assignment
+  │       Expect an #[expected_failure(...)] attribute for error specification
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.move
new file mode 100644
index 000000000..b16f86093
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.move
@@ -0,0 +1,45 @@
+// test that we handle multiple errors in the same file correctly and don't stop at the first one
+address 0x1 {
+module M {
+    #[test_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    #[test_only]
+    public fun bar() { }
+
+    #[test]
+    public fun go() { }
+
+    #[test(_a=@0x1)]
+    public fun a(_a: signer) { }
+
+    // failure: invalid value in test parameter assignment
+    #[test(_a=Foo)]
+    public fun b(_a: signer) { }
+
+    #[test(_a=@0x1, _b=@0x2)]
+    public fun c(_a: signer, _b: signer) { }
+
+    // failure: double annotation
+    #[test(_a=@0x1)]
+    #[test(_b=@0x2)]
+    public fun d(_a: signer, _b: signer) { }
+
+    // failure: annotated as both test and test_only
+    #[test(_a=@0x1)]
+    #[test_only]
+    public fun e(_a: signer, _b: signer) { }
+
+    // failure: invalid number of signer arguments
+    #[test(_a=@0x1)]
+    public fun f(_a: signer, _b: signer) { }
+
+    // failure: double annotation
+    #[test(_a=@0x1)]
+    #[expected_failure]
+    #[expected_failure]
+    public fun g(_a: signer, _b: signer) { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.unit_test.exp
new file mode 100644
index 000000000..51c8f9325
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_errors.unit_test.exp
@@ -0,0 +1,16 @@
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/unit_test/multiple_errors.move:27:7
+   │
+26 │     #[test(_a=@0x1)]
+   │       ---- Attribute previously given here
+27 │     #[test(_b=@0x2)]
+   │       ^^^^^^^^^^^^^ Duplicate attribute 'test' attached to the same item
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/unit_test/multiple_errors.move:42:7
+   │
+41 │     #[expected_failure]
+   │       ---------------- Attribute previously given here
+42 │     #[expected_failure]
+   │       ^^^^^^^^^^^^^^^^ Duplicate attribute 'expected_failure' attached to the same item
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.move
new file mode 100644
index 000000000..e5502ad96
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.move
@@ -0,0 +1,13 @@
+// cannot have multiple #[test] attributes. Only one test attribute is allowed,
+// and all signer arguments need to be assigned in that attribute.
+address 0x1 {
+module M {
+    #[test(_a=@0x1)]
+    #[test(_b=@0x2)]
+    public fun a(_a: signer, _b: signer) { }
+
+    #[test]
+    #[test(_a=@0x1, _b=@0x2)]
+    public fun b(_a: signer, _b: signer) { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.unit_test.exp
new file mode 100644
index 000000000..a035c5694
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/multiple_test_annotations.unit_test.exp
@@ -0,0 +1,16 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/unit_test/multiple_test_annotations.move:6:7
+  │
+5 │     #[test(_a=@0x1)]
+  │       ---- Attribute previously given here
+6 │     #[test(_b=@0x2)]
+  │       ^^^^^^^^^^^^^ Duplicate attribute 'test' attached to the same item
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/unit_test/multiple_test_annotations.move:10:7
+   │
+ 9 │     #[test]
+   │       ---- Attribute previously given here
+10 │     #[test(_a=@0x1, _b=@0x2)]
+   │       ^^^^^^^^^^^^^^^^^^^^^^ Duplicate attribute 'test' attached to the same item
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.move
new file mode 100644
index 000000000..b820da2dd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.move
@@ -0,0 +1,4 @@
+module 0x1::M {
+    #[test(_a = @UnboundAddr)]
+    fun test(_a: signer) { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.unit_test.exp
new file mode 100644
index 000000000..4550b8891
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/named_address_no_value_in_annotation.unit_test.exp
@@ -0,0 +1,6 @@
+error[E03001]: address with no value
+  ┌─ tests/move_check/unit_test/named_address_no_value_in_annotation.move:2:18
+  │
+2 │     #[test(_a = @UnboundAddr)]
+  │                  ^^^^^^^^^^^ address 'UnboundAddr' is not assigned a value. Try assigning it a value when calling the compiler
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move
new file mode 100644
index 000000000..ce6141528
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move
@@ -0,0 +1,32 @@
+// tests non-abort related execution failures
+// invalid assignment
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error=0, location=std::vector)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=x"", location=std::vector)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error=@0, location=n)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(out_of_gas=bool, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4004u128, location=Self)]
+    fun t4() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=b"", location=Self)]
+    fun t5() { }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp
new file mode 100644
index 000000000..e4f196f2e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp
@@ -0,0 +1,54 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:9:24
+  │
+9 │     #[expected_failure(vector_error=0, location=std::vector)]
+  │                        ^^^^^^^^^^^^--
+  │                        │
+  │                        Expected no assigned value, e.g. 'vector_error', for expected failure attribute
+  │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:13:38
+   │
+13 │     #[expected_failure(vector_error, minor_status=x"", location=std::vector)]
+   │                                      ^^^^^^^^^^^^^^^^
+   │                                      │            │
+   │                                      │            Unsupported value in this assignment
+   │                                      Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:17:24
+   │
+17 │     #[expected_failure(arithmetic_error=@0, location=n)]
+   │                        ^^^^^^^^^^^^^^^^---
+   │                        │
+   │                        Expected no assigned value, e.g. 'arithmetic_error', for expected failure attribute
+   │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:21:24
+   │
+21 │     #[expected_failure(out_of_gas=bool, location=Self)]
+   │                        ^^^^^^^^^^-----
+   │                        │
+   │                        Expected no assigned value, e.g. 'out_of_gas', for expected failure attribute
+   │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:25:24
+   │
+25 │     #[expected_failure(major_status=4004u128, location=Self)]
+   │                        ^^^^^^^^^^^^^^^^^^^^^
+   │                        │            │
+   │                        │            Annotated non-u64 literals are not permitted
+   │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:29:43
+   │
+29 │     #[expected_failure(major_status=4016, minor_status=b"", location=Self)]
+   │                                           ^^^^^^^^^^^^^^^^
+   │                                           │            │
+   │                                           │            Unsupported value in this assignment
+   │                                           Invalid value in attribute assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move
new file mode 100644
index 000000000..786652248
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move
@@ -0,0 +1,41 @@
+// tests non-abort related execution failures
+// missing or invalid location
+module 0x1::m {
+
+    #[test]
+    #[expected_failure(vector_error)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_code=0)]
+    fun t4() { }
+
+    #[test]
+    #[expected_failure(vector_error, location=x)]
+    fun u0() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=0x1::m::t0)]
+    fun u2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, location=self)]
+    fun u3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=0, location=0)]
+    fun u4() { }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp
new file mode 100644
index 000000000..af555fa5a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp
@@ -0,0 +1,66 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:6:24
+  │
+6 │     #[expected_failure(vector_error)]
+  │                        ^^^^^^^^^^^^ Expected 'location' following 'vector_error'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:10:24
+   │
+10 │     #[expected_failure(arithmetic_error)]
+   │                        ^^^^^^^^^^^^^^^^ Expected 'location' following 'arithmetic_error'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:14:24
+   │
+14 │     #[expected_failure(out_of_gas)]
+   │                        ^^^^^^^^^^ Expected 'location' following 'out_of_gas'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:18:24
+   │
+18 │     #[expected_failure(major_status=4004)]
+   │                        ^^^^^^^^^^^^ Expected 'location' following 'major_status'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:22:24
+   │
+22 │     #[expected_failure(major_status=4016, minor_code=0)]
+   │                        ^^^^^^^^^^^^ Expected 'location' following 'major_status'
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:26:38
+   │
+26 │     #[expected_failure(vector_error, location=x)]
+   │                                      ^^^^^^^^^^
+   │                                      │        │
+   │                                      │        Expected a module identifier, e.g. 'std::vector'
+   │                                      Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:30:36
+   │
+30 │     #[expected_failure(out_of_gas, location=0x1::m::t0)]
+   │                                    ^^^^^^^^^^^^^^^^^^^
+   │                                    │        │
+   │                                    │        Expected a module identifier, e.g. 'std::vector'
+   │                                    Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:34:43
+   │
+34 │     #[expected_failure(major_status=4004, location=self)]
+   │                                           ^^^^^^^^^^^^^
+   │                                           │        │
+   │                                           │        Expected a module identifier, e.g. 'std::vector'
+   │                                           Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:38:59
+   │
+38 │     #[expected_failure(major_status=4016, minor_status=0, location=0)]
+   │                                                           ^^^^^^^^^^
+   │                                                           │        │
+   │                                                           │        Expected a module identifier, e.g. 'std::vector'
+   │                                                           Invalid value in attribute assignment
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move
new file mode 100644
index 000000000..7b5cd5a42
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move
@@ -0,0 +1,9 @@
+// tests non-abort related execution failures
+// invalid module in location
+module 0x1::m {
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=0x2::m)]
+    fun u1() { }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp
new file mode 100644
index 000000000..4fb767ca4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/unit_test/other_failures_invalid_location_module.move:6:51
+  │
+6 │     #[expected_failure(arithmetic_error, location=0x2::m)]
+  │                                                   ^^^^^^ Unbound module '0x2::m'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_valid.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_valid.move
new file mode 100644
index 000000000..c04e9d5c3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_valid.move
@@ -0,0 +1,27 @@
+// tests non-abort related execution failures
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error, location=std::vector)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=n)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=0, location=Self)]
+    fun t4() { }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_valid.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/other_failures_valid.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.exp
new file mode 100644
index 000000000..2e02df13a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.exp
@@ -0,0 +1,18 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:4:7
+  │
+4 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:5:7
+  │
+5 │     #[test_only, test]
+  │       ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:5:18
+  │
+5 │     #[test_only, test]
+  │                  ^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.move
new file mode 100644
index 000000000..7bd77e2b0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.move
@@ -0,0 +1,7 @@
+// test-related attributes are not allowed in and/or on scripts. We should get an error
+// pointing to each one of the attributes in this test. Test annotations inside of a script.
+script {
+    #[expected_failure]
+    #[test_only, test]
+    fun main() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.unit_test.exp
new file mode 100644
index 000000000..2e02df13a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_on_main.unit_test.exp
@@ -0,0 +1,18 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:4:7
+  │
+4 │     #[expected_failure]
+  │       ^^^^^^^^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:5:7
+  │
+5 │     #[test_only, test]
+  │       ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_on_main.move:5:18
+  │
+5 │     #[test_only, test]
+  │                  ^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.exp
new file mode 100644
index 000000000..46c739088
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.exp
@@ -0,0 +1,18 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:3:3
+  │
+3 │ #[test, expected_failure]
+  │   ^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:3:9
+  │
+3 │ #[test, expected_failure]
+  │         ^^^^^^^^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:4:3
+  │
+4 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.move
new file mode 100644
index 000000000..1742f4e6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.move
@@ -0,0 +1,7 @@
+// test-related attributes are not allowed in and/or on scripts. We should get an error
+// pointing to each one of the attributes in this test. Test annotations on a script.
+#[test, expected_failure]
+#[test_only]
+script {
+    fun main() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.unit_test.exp
new file mode 100644
index 000000000..46c739088
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_multiple_top_level.unit_test.exp
@@ -0,0 +1,18 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:3:3
+  │
+3 │ #[test, expected_failure]
+  │   ^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:3:9
+  │
+3 │ #[test, expected_failure]
+  │         ^^^^^^^^^^^^^^^^ Testing attributes are not allowed in scripts.
+
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_multiple_top_level.move:4:3
+  │
+4 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.exp
new file mode 100644
index 000000000..7bff3e304
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.exp
@@ -0,0 +1,6 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_test_on_main.move:3:7
+  │
+3 │     #[test]
+  │       ^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.move
new file mode 100644
index 000000000..596a98be2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.move
@@ -0,0 +1,5 @@
+// Test a single annotation inside of a script that isn't allowed.
+script {
+    #[test]
+    fun main() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.unit_test.exp
new file mode 100644
index 000000000..7bff3e304
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_on_main.unit_test.exp
@@ -0,0 +1,6 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_test_on_main.move:3:7
+  │
+3 │     #[test]
+  │       ^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.exp
new file mode 100644
index 000000000..4575c01af
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.exp
@@ -0,0 +1,6 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_test_top_level.move:2:3
+  │
+2 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.move
new file mode 100644
index 000000000..baa84e752
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.move
@@ -0,0 +1,5 @@
+// test a single test-related attribute on a script that isn't allowed
+#[test_only]
+script {
+    fun main() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.unit_test.exp
new file mode 100644
index 000000000..4575c01af
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/script_with_test_top_level.unit_test.exp
@@ -0,0 +1,6 @@
+error[E10005]: unable to generate test
+  ┌─ tests/move_check/unit_test/script_with_test_top_level.move:2:3
+  │
+2 │ #[test_only]
+  │   ^^^^^^^^^ Testing attributes are not allowed in scripts.
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.move
new file mode 100644
index 000000000..7da60126e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.move
@@ -0,0 +1,8 @@
+// functions cannot be annotated as both #[test] and #[test_only]
+address 0x1 {
+module M {
+    #[test(_a=@0x1, _b=@0x2)]
+    #[test_only]
+    public fun boo(_a: signer, _b: signer) { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.unit_test.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.unit_test.exp
new file mode 100644
index 000000000..36d499a36
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_and_test_only_annotation.unit_test.exp
@@ -0,0 +1,10 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_check/unit_test/test_and_test_only_annotation.move:5:7
+  │
+4 │     #[test(_a=@0x1, _b=@0x2)]
+  │       ---------------------- Previously annotated here
+5 │     #[test_only]
+  │       ^^^^^^^^^ Function annotated as both #[test(...)] and #[test_only]. You need to declare it as either one or the other
+6 │     public fun boo(_a: signer, _b: signer) { }
+  │                --- Error found in this test
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.exp
new file mode 100644
index 000000000..dc35110a9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.exp
@@ -0,0 +1,6 @@
+error[E03005]: unbound unscoped name
+  ┌─ tests/move_check/unit_test/test_filter_function.move:6:24
+  │
+6 │     public fun foo() { bar() }
+  │                        ^^^ Unbound function 'bar' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.move
new file mode 100644
index 000000000..33d17ad27
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_function.move
@@ -0,0 +1,11 @@
+// #[test_only] functions should be filtered out in non-test mode
+address 0x1 {
+module M {
+    // This should cause an unbound function error in non-test mode as `bar`
+    // was filtered out
+    public fun foo() { bar() }
+
+    #[test_only]
+    public fun bar() { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.exp b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.exp
new file mode 100644
index 000000000..bb710372a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.exp
@@ -0,0 +1,12 @@
+error[E03004]: unbound type
+  ┌─ tests/move_check/unit_test/test_filter_struct.move:9:23
+  │
+9 │     public fun foo(): Foo {
+  │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03004]: unbound type
+   ┌─ tests/move_check/unit_test/test_filter_struct.move:10:9
+   │
+10 │         Foo {}
+   │         ^^^ Unbound type 'Foo' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.move
new file mode 100644
index 000000000..553671ab0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/test_filter_struct.move
@@ -0,0 +1,13 @@
+// #[test_only] structs should be filtered out in non-test mode
+address 0x1 {
+module M {
+    #[test_only]
+    struct Foo {}
+
+    // This should cause an unbound type error in non-test mode as the Foo
+    // struct declaration was filtered out
+    public fun foo(): Foo {
+        Foo {}
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/valid_test_module.move b/vendors/move/crates/move-compiler/tests/move_check/unit_test/valid_test_module.move
new file mode 100644
index 000000000..29a038802
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/unit_test/valid_test_module.move
@@ -0,0 +1,50 @@
+// Make sure that legal usage is allowed
+module 0x1::M {
+    // test-only struct
+    #[test_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    // test-only struct used in a test-only function
+    #[test_only]
+    public fun bar(): Foo { Foo{} }
+
+    // tests with no arguments are allowed
+    #[test]
+    public fun go() { }
+
+    // proper number of signers, and correct parameter names
+    #[test(_a=@0x1)]
+    public fun a(_a: signer) { }
+
+    // multiple signers are supported
+    #[test(_a=@0x1, _b=@0x2)]
+    public fun b(_a: signer, _b: signer) { }
+
+    // multiple attributes are supported in the same annotation
+    #[test(_a=@0x1, _b=@0x2), expected_failure]
+    public fun c(_a: signer, _b: signer) { }
+
+    // Can also break them apart into separate annotations
+    #[test(_a=@0x1, _b=@0x2)]
+    #[expected_failure]
+    public fun d(_a: signer, _b: signer) { }
+
+    // Can assign abort codes
+    #[test(_a=@0x1, _b=@0x2)]
+    #[expected_failure(abort_code=5, location=0x1::M)]
+    public fun e(_a: signer, _b: signer) { }
+
+    // singe annotation with multiple attributes and an abort code assignment
+    #[test(_a=@0x1, _b=@0x2), expected_failure(abort_code=5, location=0x1::M)]
+    public fun g(_a: signer, _b: signer) { }
+
+    // single annotation without any arguments and an abort code assignment
+    #[test, expected_failure(abort_code=5, location=0x1::M)]
+    public fun h() { }
+
+    // single annotation with no arguments and no abort code annotation
+    #[test, expected_failure]
+    public fun i() { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/unit_test/valid_test_module.unit_test b/vendors/move/crates/move-compiler/tests/move_check/unit_test/valid_test_module.unit_test
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.exp
new file mode 100644
index 000000000..b2f6304e5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.exp
@@ -0,0 +1,12 @@
+error[E03004]: unbound type
+   ┌─ tests/move_check/verification/cross_module_invalid.move:22:23
+   │
+22 │     public fun bad(): Foo {
+   │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/verification/cross_module_invalid.move:23:9
+   │
+23 │         A::build_foo()
+   │         ^ Unbound module alias 'A'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.move
new file mode 100644
index 000000000..9d78d065a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_invalid.move
@@ -0,0 +1,26 @@
+// check that `use`'s are filtered out correctly
+address 0x1 {
+module A {
+    struct Foo has drop {}
+
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+
+    // this should fail
+    public fun bad(): Foo {
+        A::build_foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_valid.move b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_valid.move
new file mode 100644
index 000000000..c141dc283
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_valid.move
@@ -0,0 +1,24 @@
+// Check that verify_only filtering and calling is supported across modules and
+// different types of module members
+address 0x1 {
+module A {
+    #[verify_only]
+    struct Foo has drop {}
+
+    #[verify_only]
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_valid.verification b/vendors/move/crates/move-compiler/tests/move_check/verification/cross_module_valid.verification
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.move b/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.move
new file mode 100644
index 000000000..60f63be52
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.move
@@ -0,0 +1,21 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    struct Bar {}
+
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    public fun d(_a: signer, _b: signer) { }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.verification b/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.verification
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.verification.exp b/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.verification.exp
new file mode 100644
index 000000000..8329be310
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/double_annotation.verification.exp
@@ -0,0 +1,16 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/verification/double_annotation.move:8:7
+  │
+7 │     #[verify_only]
+  │       ----------- Attribute previously given here
+8 │     #[verify_only]
+  │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/verification/double_annotation.move:18:7
+   │
+17 │     #[verify_only]
+   │       ----------- Attribute previously given here
+18 │     #[verify_only]
+   │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.exp b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.exp
new file mode 100644
index 000000000..f0daf039c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.exp
@@ -0,0 +1,18 @@
+error[E03004]: unbound type
+  ┌─ tests/move_check/verification/single_module_invalid.move:8:23
+  │
+8 │     public fun foo(): Foo {
+  │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/verification/single_module_invalid.move:9:9
+  │
+9 │         Foo {}
+  │         ^^^ Unbound type 'Foo' in current scope
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/verification/single_module_invalid.move:17:24
+   │
+17 │     public fun baz() { bar() }
+   │                        ^^^ Unbound function 'bar' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.move b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.move
new file mode 100644
index 000000000..06043755f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.move
@@ -0,0 +1,19 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // This should cause an unbound type error in non-verify mode
+    // as the Foo struct declaration was filtered out
+    public fun foo(): Foo {
+        Foo {}
+    }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should cause an unbound function error in non-verify mode
+    // as `bar` was filtered out
+    public fun baz() { bar() }
+}
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.verification b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_invalid.verification
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_valid.move b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_valid.move
new file mode 100644
index 000000000..a50d4ab3c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_valid.move
@@ -0,0 +1,16 @@
+// Make sure that legal usage is allowed
+module 0x1::M {
+    // verify-only struct
+    #[verify_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    // verify-only struct used in a verify-only function
+    #[verify_only]
+    public fun bar(): Foo { Foo{} }
+
+    // verify-only function used in a verify-only function
+    #[verify_only]
+    public fun baz(): Foo { bar() }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_valid.verification b/vendors/move/crates/move-compiler/tests/move_check/verification/single_module_valid.verification
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/all.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/all.move
new file mode 100644
index 000000000..08a264438
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/all.move
@@ -0,0 +1,42 @@
+module 0x42::x {}
+
+#[allow(all)]
+module 0x42::m {
+    struct B<phantom T> {}
+    struct S<T1, T2> { f: B<T1> }
+
+    use 0x42::x;
+    fun var(a: u64) {
+        use 0x42::x;
+        let x;
+    }
+    fun dead() {
+        use 0x42::x;
+        loop {};
+        assert!(1 == 0, 0)
+    }
+    fun ab() {
+        abort 0;
+    }
+    fun assgn(x: u64) {
+        let y = 0;
+        x = 1;
+    }
+}
+
+module 0x42::n {
+    struct B<phantom T> {}
+    #[allow(all)]
+    struct S<T1, T2> { f: B<T1> }
+
+    #[allow(all)]
+    fun dead(a: u64) {
+        use 0x42::x;
+        let y;
+        let z = 0;
+        a = 0;
+        let x = abort 0;
+        x + 1;
+        abort 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.exp b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.exp
new file mode 100644
index 000000000..8044b2a63
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.exp
@@ -0,0 +1,6 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/allow_with_no_filter.move:2:3
+  │
+2 │ #[allow]
+  │   ^^^^^ Expected list of warnings, e.g. 'allow(unused)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.move
new file mode 100644
index 000000000..194ee80a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/allow_with_no_filter.move
@@ -0,0 +1,3 @@
+// allow needs a warning
+#[allow]
+module 0x42::m {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.exp b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.exp
new file mode 100644
index 000000000..88faec6b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.exp
@@ -0,0 +1,24 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/bad_attr.move:3:3
+  │
+3 │ #[allow(all(), unused = true, unused_(assignment, variable))]
+  │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unknown warning filter 'unused_'
+
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/bad_attr.move:3:9
+  │
+3 │ #[allow(all(), unused = true, unused_(assignment, variable))]
+  │         ^^^ Expected a stand alone warning filter identifier, e.g. 'allow(all)'
+
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/bad_attr.move:3:16
+  │
+3 │ #[allow(all(), unused = true, unused_(assignment, variable))]
+  │                ^^^^^^ Expected a stand alone warning filter identifier, e.g. 'allow(unused)'
+
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/bad_attr.move:3:31
+  │
+3 │ #[allow(all(), unused = true, unused_(assignment, variable))]
+  │                               ^^^^^^^ Expected a stand alone warning filter identifier, e.g. 'allow(unused_)'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.move
new file mode 100644
index 000000000..8bd26fe81
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_attr.move
@@ -0,0 +1,5 @@
+// tests an incorrect attribute for warning supression
+
+#[allow(all(), unused = true, unused_(assignment, variable))]
+module 0x42::m {
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.exp b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.exp
new file mode 100644
index 000000000..f8ca442f0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.exp
@@ -0,0 +1,26 @@
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/warning_suppression/bad_location.move:4:7
+  │
+4 │     #[allow(unused)]
+  │       ^^^^^
+  │       │
+  │       Known attribute 'allow' is not expected with a use
+  │       Expected to be used with one of the following: module, script, constant, struct, function
+
+warning[W09001]: unused alias
+  ┌─ tests/move_check/warning_suppression/bad_location.move:5:15
+  │
+5 │     use 0x42::x;
+  │               ^ Unused 'use' of alias 'x'. Consider removing it
+  │
+  = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+error[E02015]: invalid attribute
+  ┌─ tests/move_check/warning_suppression/bad_location.move:7:7
+  │
+7 │     #[allow(all)]
+  │       ^^^^^
+  │       │
+  │       Known attribute 'allow' is not expected with a friend
+  │       Expected to be used with one of the following: module, script, constant, struct, function
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.move
new file mode 100644
index 000000000..493191e3c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/bad_location.move
@@ -0,0 +1,13 @@
+// tests an unsupported location for the attribute for warning supression
+
+module 0x42::m {
+    #[allow(unused)]
+    use 0x42::x;
+
+    #[allow(all)]
+    friend 0x42::a;
+}
+
+module 0x42::x {}
+
+module 0x42::a {}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/dead_code.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/dead_code.move
new file mode 100644
index 000000000..b5ecb9def
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/dead_code.move
@@ -0,0 +1,15 @@
+#[allow(dead_code)]
+module 0x42::m {
+    fun foo() {
+        loop {};
+        assert!(1 == 0, 0)
+    }
+}
+
+module 0x42::n {
+    #[allow(dead_code)]
+    fun foo() {
+        let x = abort 0;
+        x + 1;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/missing_phantom.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/missing_phantom.move
new file mode 100644
index 000000000..9de1b9754
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/missing_phantom.move
@@ -0,0 +1,12 @@
+#[allow(missing_phantom)]
+module 0x42::m {
+    struct B<phantom T> {}
+    struct S<T> { f: B<T> }
+}
+
+module 0x42::n {
+    struct B<phantom T> {}
+
+    #[allow(missing_phantom)]
+    struct S<T> { f: B<T> }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.exp b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.exp
new file mode 100644
index 000000000..24cbe7182
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.exp
@@ -0,0 +1,6 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/warning_suppression/unknown_warning.move:3:3
+  │
+3 │ #[allow(who_am_i)]
+  │   ^^^^^^^^^^^^^^^ Unknown warning filter 'who_am_i'
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.move
new file mode 100644
index 000000000..dca4336fb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unknown_warning.move
@@ -0,0 +1,5 @@
+// tests a unknown warning
+
+#[allow(who_am_i)]
+module 0x42::m {
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.exp b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.exp
new file mode 100644
index 000000000..87b7d982c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.exp
@@ -0,0 +1,16 @@
+warning[W02014]: invalid non-phantom type parameter usage
+  ┌─ tests/move_check/warning_suppression/unused.move:8:14
+  │
+8 │     struct S<T1, T2> { f: B<T1> }
+  │              ^^ The parameter 'T1' is only used as an argument to phantom parameters. Consider adding a phantom declaration here
+  │
+  = This warning can be suppressed with '#[allow(missing_phantom)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[W02014]: invalid non-phantom type parameter usage
+   ┌─ tests/move_check/warning_suppression/unused.move:32:14
+   │
+32 │     struct S<T1, T2> { f: B<T1> }
+   │              ^^ The parameter 'T1' is only used as an argument to phantom parameters. Consider adding a phantom declaration here
+   │
+   = This warning can be suppressed with '#[allow(missing_phantom)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.move
new file mode 100644
index 000000000..b6e506ad1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused.move
@@ -0,0 +1,44 @@
+// missing_phantom is currently the only unused
+
+module 0x42::x {}
+
+#[allow(unused)]
+module 0x42::m {
+    struct B<phantom T> {}
+    struct S<T1, T2> { f: B<T1> }
+
+    use 0x42::x;
+    fun var(a: u64) {
+        use 0x42::x;
+        let x;
+    }
+    fun dead() {
+        use 0x42::x;
+        loop {};
+        assert!(1 == 0, 0)
+    }
+    fun ab() {
+        abort 0;
+    }
+    fun assgn(x: u64) {
+        let y = 0;
+        x = 1;
+    }
+}
+
+module 0x42::n {
+    struct B<phantom T> {}
+    #[allow(unused)]
+    struct S<T1, T2> { f: B<T1> }
+
+    #[allow(unused)]
+    fun dead(a: u64) {
+        use 0x42::x;
+        let y;
+        let z = 0;
+        a = 0;
+        let x = abort 0;
+        x + 1;
+        abort 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_assignment.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_assignment.move
new file mode 100644
index 000000000..1d2e83fe6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_assignment.move
@@ -0,0 +1,26 @@
+#[allow(unused_assignment)]
+module 0x42::m {
+    fun foo() {
+        let x = 0;
+    }
+
+    fun bar() {
+        let x = 1;
+        assert!(x == 1, 0);
+        x = 0;
+    }
+}
+
+module 0x42::n {
+    #[allow(unused_assignment)]
+    fun foo() {
+        let x = 0;
+    }
+
+    #[allow(unused_assignment)]
+    fun bar() {
+        let x = 1;
+        assert!(x == 1, 0);
+        x = 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_trailing_semi.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_trailing_semi.move
new file mode 100644
index 000000000..250ad2e61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_trailing_semi.move
@@ -0,0 +1,13 @@
+#[allow(unused_trailing_semi)]
+module 0x42::m {
+    fun foo() {
+        abort 0;
+    }
+}
+
+module 0x42::n {
+    #[allow(unused_trailing_semi)]
+    fun foo() {
+        abort 0;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_type_parameter.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_type_parameter.move
new file mode 100644
index 000000000..f5098948e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_type_parameter.move
@@ -0,0 +1,9 @@
+#[allow(unused_type_parameter)]
+module 0x42::m {
+    struct S<T> { }
+}
+
+module 0x42::n {
+    #[allow(unused_type_parameter)]
+    struct S<T> { }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_use.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_use.move
new file mode 100644
index 000000000..6f15114c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_use.move
@@ -0,0 +1,19 @@
+module 0x42::x {}
+
+#[allow(unused_use)]
+module 0x42::m {
+    use 0x42::x;
+}
+
+module 0x42::n {
+    #[allow(unused_use)]
+    const FOO: u64 = {
+        use 0x42::x;
+        0
+    };
+
+    #[allow(unused_use)]
+    fun foo() {
+        use 0x42::x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_variable.move b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_variable.move
new file mode 100644
index 000000000..608c392df
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check/warning_suppression/unused_variable.move
@@ -0,0 +1,13 @@
+#[allow(unused_variable)]
+module 0x42::m {
+    fun foo(a: u64) {
+        let x;
+    }
+}
+
+module 0x42::n {
+    #[allow(unused_variable)]
+    fun foo(a: u64) {
+        let x;
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/move_check_testsuite.rs b/vendors/move/crates/move-compiler/tests/move_check_testsuite.rs
new file mode 100644
index 000000000..bdcddf770
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/move_check_testsuite.rs
@@ -0,0 +1,240 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, fs, path::Path};
+
+use move_command_line_common::{
+    env::read_bool_env_var,
+    testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT, OUT_EXT},
+};
+use move_compiler::{
+    command_line::compiler::move_check_for_errors,
+    diagnostics::*,
+    editions::{Edition, Flavor},
+    shared::{Flags, NumericalAddress, PackageConfig, PackagePaths},
+    Compiler, PASS_PARSER,
+};
+
+/// Shared flag to keep any temporary results of the test
+const KEEP_TMP: &str = "KEEP";
+
+const TEST_EXT: &str = "unit_test";
+const VERIFICATION_EXT: &str = "verification";
+const UNUSED_EXT: &str = "unused";
+
+const SUI_MODE_DIR: &str = "sui_mode";
+const MOVE_2024_DIR: &str = "move_2024";
+
+fn default_testing_addresses(flavor: Flavor) -> BTreeMap<String, NumericalAddress> {
+    let mut mapping = vec![
+        ("std", "0x1"),
+        ("sui", "0x2"),
+        ("M", "0x40"),
+        ("A", "0x41"),
+        ("B", "0x42"),
+        ("K", "0x19"),
+        ("a", "0x44"),
+        ("b", "0x45"),
+        ("k", "0x19"),
+    ];
+    if flavor == Flavor::Sui {
+        mapping.extend([("sui", "0x2"), ("sui_system", "0x3")]);
+    }
+    mapping
+        .into_iter()
+        .map(|(name, addr)| (name.to_string(), NumericalAddress::parse_str(addr).unwrap()))
+        .collect()
+}
+
+fn move_check_testsuite(path: &Path) -> datatest_stable::Result<()> {
+    let flavor = if path.components().any(|c| c.as_os_str() == SUI_MODE_DIR) {
+        Flavor::Sui
+    } else {
+        Flavor::default()
+    };
+    let edition = if path.components().any(|c| c.as_os_str() == MOVE_2024_DIR) {
+        Edition::E2024_ALPHA
+    } else {
+        Edition::default()
+    };
+    let config = PackageConfig {
+        flavor,
+        edition,
+        ..PackageConfig::default()
+    };
+    testsuite(path, config)
+}
+
+fn testsuite(path: &Path, mut config: PackageConfig) -> datatest_stable::Result<()> {
+    // A test is marked that it should also be compiled in test mode by having a `path.unit_test`
+    // file.
+    if path.with_extension(TEST_EXT).exists() {
+        let test_exp_path = format!(
+            "{}.unit_test.{}",
+            path.with_extension("").to_string_lossy(),
+            EXP_EXT
+        );
+        let test_out_path = format!(
+            "{}.unit_test.{}",
+            path.with_extension("").to_string_lossy(),
+            OUT_EXT
+        );
+        let mut config = config.clone();
+        config
+            .warning_filter
+            .union(&WarningFilters::unused_warnings_filter_for_test());
+        run_test(
+            path,
+            Path::new(&test_exp_path),
+            Path::new(&test_out_path),
+            Flags::testing(),
+            config,
+        )?;
+    }
+
+    // A verification case is marked that it should also be compiled in verification mode by having
+    // a `path.verification` file.
+    if path.with_extension(VERIFICATION_EXT).exists() {
+        let verification_exp_path = format!(
+            "{}.verification.{}",
+            path.with_extension("").to_string_lossy(),
+            EXP_EXT
+        );
+        let verification_out_path = format!(
+            "{}.verification.{}",
+            path.with_extension("").to_string_lossy(),
+            OUT_EXT
+        );
+        let mut config = config.clone();
+        config
+            .warning_filter
+            .union(&WarningFilters::unused_warnings_filter_for_test());
+        run_test(
+            path,
+            Path::new(&verification_exp_path),
+            Path::new(&verification_out_path),
+            Flags::verification(),
+            config,
+        )?;
+    }
+
+    // A cross-module unused case that should run without unused warnings suppression
+    if path.with_extension(UNUSED_EXT).exists() {
+        let unused_exp_path = format!(
+            "{}.unused.{}",
+            path.with_extension("").to_string_lossy(),
+            EXP_EXT
+        );
+        let unused_out_path = format!(
+            "{}.unused.{}",
+            path.with_extension("").to_string_lossy(),
+            OUT_EXT
+        );
+        run_test(
+            path,
+            Path::new(&unused_exp_path),
+            Path::new(&unused_out_path),
+            Flags::testing(),
+            config.clone(),
+        )?;
+    }
+
+    let exp_path = path.with_extension(EXP_EXT);
+    let out_path = path.with_extension(OUT_EXT);
+
+    let flags = Flags::empty();
+
+    config
+        .warning_filter
+        .union(&WarningFilters::unused_warnings_filter_for_test());
+    run_test(path, &exp_path, &out_path, flags, config)?;
+    Ok(())
+}
+
+// Runs all tests under the test/testsuite directory.
+pub fn run_test(
+    path: &Path,
+    exp_path: &Path,
+    out_path: &Path,
+    flags: Flags,
+    default_config: PackageConfig,
+) -> anyhow::Result<()> {
+    let targets: Vec<String> = vec![path.to_str().unwrap().to_owned()];
+    let named_address_map = default_testing_addresses(default_config.flavor);
+    let deps = vec![PackagePaths {
+        name: Some(("stdlib".into(), PackageConfig::default())),
+        paths: move_stdlib::move_stdlib_files(),
+        named_address_map: named_address_map.clone(),
+    }];
+    let targets = vec![PackagePaths {
+        name: None,
+        paths: targets,
+        named_address_map,
+    }];
+
+    let flags = flags.set_sources_shadow_deps(true);
+    let (files, comments_and_compiler_res) = Compiler::from_package_paths(targets, deps)
+        .unwrap()
+        .set_flags(flags)
+        .set_default_config(default_config)
+        .run::<PASS_PARSER>()?;
+    let diags = move_check_for_errors(comments_and_compiler_res);
+
+    let has_diags = !diags.is_empty();
+    let diag_buffer = if has_diags {
+        report_diagnostics_to_buffer(&files, diags)
+    } else {
+        vec![]
+    };
+
+    let save_diags = read_bool_env_var(KEEP_TMP);
+    let update_baseline = read_env_update_baseline();
+
+    let rendered_diags = std::str::from_utf8(&diag_buffer)?;
+    if save_diags {
+        fs::write(out_path, &diag_buffer)?;
+    }
+
+    if update_baseline {
+        if has_diags {
+            fs::write(exp_path, rendered_diags)?;
+        } else if exp_path.is_file() {
+            fs::remove_file(exp_path)?;
+        }
+        return Ok(());
+    }
+
+    let exp_exists = exp_path.is_file();
+    match (has_diags, exp_exists) {
+        (false, false) => Ok(()),
+        (true, false) => {
+            let msg = format!(
+                "Expected success. Unexpected diagnostics:\n{}",
+                rendered_diags
+            );
+            anyhow::bail!(add_update_baseline_fix(msg))
+        }
+        (false, true) => {
+            let msg = format!(
+                "Unexpected success. Expected diagnostics:\n{}",
+                fs::read_to_string(exp_path)?
+            );
+            anyhow::bail!(add_update_baseline_fix(msg))
+        }
+        (true, true) => {
+            let expected_diags = fs::read_to_string(exp_path)?;
+            if rendered_diags != expected_diags {
+                let msg = format!(
+                    "Expected diagnostics differ from actual diagnostics:\n{}",
+                    format_diff(expected_diags, rendered_diags),
+                );
+                anyhow::bail!(add_update_baseline_fix(msg))
+            } else {
+                Ok(())
+            }
+        }
+    }
+}
+
+datatest_stable::harness!(move_check_testsuite, "tests/", r".*\.move$");
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.exp
new file mode 100644
index 000000000..e05355834
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/clock_mut.move:4:35
+  │
+4 │     public entry fun no_clock_mut(_: &mut sui::clock::Clock) {
+  │            -----                  ^  ---------------------- sui::clock::Clock must be passed by immutable reference, e.g. '&sui::clock::Clock'
+  │            │                      │   
+  │            │                      Invalid 'entry' parameter type for parameter '_'
+  │            'no_clock_mut' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.move
new file mode 100644
index 000000000..0f609a94e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_mut.move
@@ -0,0 +1,19 @@
+// invalid, Clock by mutable reference
+
+module a::m {
+    public entry fun no_clock_mut(_: &mut sui::clock::Clock) {
+        abort 0
+    }
+}
+
+module sui::clock {
+    struct Clock has key {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_ref.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_ref.move
new file mode 100644
index 000000000..0d985d113
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_ref.move
@@ -0,0 +1,19 @@
+// valid, Clock by immutable reference
+
+module a::m {
+    public entry fun yes_clock_ref(_: &sui::clock::Clock) {
+        abort 0
+    }
+}
+
+module sui::clock {
+    struct Clock has key {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.exp
new file mode 100644
index 000000000..bdb220a81
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/clock_val.move:4:35
+  │
+4 │     public entry fun no_clock_val(_: sui::clock::Clock) {
+  │            -----                  ^  ----------------- sui::clock::Clock must be passed by immutable reference, e.g. '&sui::clock::Clock'
+  │            │                      │   
+  │            │                      Invalid 'entry' parameter type for parameter '_'
+  │            'no_clock_val' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.move
new file mode 100644
index 000000000..95e543770
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/clock_val.move
@@ -0,0 +1,19 @@
+// invalid, Clock by value
+
+module a::m {
+    public entry fun no_clock_val(_: sui::clock::Clock) {
+        abort 0
+    }
+}
+
+module sui::clock {
+    struct Clock has key {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_and_generic_object_params.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_and_generic_object_params.move
new file mode 100644
index 000000000..3bf0c8096
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_and_generic_object_params.move
@@ -0,0 +1,18 @@
+module a::m {
+    use sui::object;
+    struct Obj<T> has key {
+        id: object::UID,
+        value: T,
+    }
+
+    public entry fun foo<T0: key, T1: store>(_: T0, _: Obj<T1>) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.exp
new file mode 100644
index 000000000..606e3b030
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/generic_obj_mut_ref_vector.move:5:32
+  │
+5 │     public entry fun no<T:key>(_: &mut vector<T>) {
+  │            -----               ^  -------------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │                   │   
+  │            │                   Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.move
new file mode 100644
index 000000000..08757ebc9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_mut_ref_vector.move
@@ -0,0 +1,9 @@
+// invalid, a mutable reference to vector of objects
+
+module a::m {
+
+    public entry fun no<T:key>(_: &mut vector<T>) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.exp
new file mode 100644
index 000000000..323d92010
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/generic_obj_ref_vector.move:4:32
+  │
+4 │     public entry fun no<T:key>(_: &vector<T>) {
+  │            -----               ^  ---------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │                   │   
+  │            │                   Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.move
new file mode 100644
index 000000000..941af53b5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_obj_ref_vector.move
@@ -0,0 +1,8 @@
+// invalid, a mutable reference to vector of objects
+
+module a::m {
+    public entry fun no<T:key>(_: &vector<T>) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_param_after_primitive.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_param_after_primitive.move
new file mode 100644
index 000000000..3c34970a1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_param_after_primitive.move
@@ -0,0 +1,16 @@
+module a::m {
+    use sui::object;
+    struct Obj has key {
+        id: object::UID,
+    }
+    public entry fun foo<T>(_: Obj, _: u64, _: T) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.exp
new file mode 100644
index 000000000..5e9ceb81a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.exp
@@ -0,0 +1,18 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/generic_with_key_invalid.move:6:31
+  │
+6 │     public entry fun t<T:key>(_: option::Option<T>) {
+  │            -----              ^  ----------------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │                  │   
+  │            │                  Invalid 'entry' parameter type for parameter '_'
+  │            't' was declared 'entry' here
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/entry_points/generic_with_key_invalid.move:10:32
+   │
+10 │     public entry fun t2<T:key>(_: vector<option::Option<T>>) {
+   │            -----               ^  ------------------------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+   │            │                   │   
+   │            │                   Invalid 'entry' parameter type for parameter '_'
+   │            't2' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.move
new file mode 100644
index 000000000..45154d5ba
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_invalid.move
@@ -0,0 +1,14 @@
+// invalid, type parameters with key are not valid when nested as no primitive has key
+
+module a::m {
+    use std::option;
+
+    public entry fun t<T:key>(_: option::Option<T>) {
+        abort 0
+    }
+
+    public entry fun t2<T:key>(_: vector<option::Option<T>>) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_valid.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_valid.move
new file mode 100644
index 000000000..66706ac5b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/generic_with_key_valid.move
@@ -0,0 +1,8 @@
+// valid, type parameters with key are valid as long as they are not nested
+
+module a::m {
+    public entry fun yes<T:key>(_: T, _: &T, _: &mut T) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/id.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/id.move
new file mode 100644
index 000000000..329a729f0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/id.move
@@ -0,0 +1,20 @@
+// valid, ID is allowed
+
+module a::m {
+    use sui::object;
+
+    public entry fun yes<T>(
+        _: object::ID,
+        _: vector<object::ID>,
+        _: vector<vector<object::ID>>,
+    ) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct ID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/immut_receiving_ref.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/immut_receiving_ref.move
new file mode 100644
index 000000000..3af390d56
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/immut_receiving_ref.move
@@ -0,0 +1,22 @@
+// valid, Receiving type by immut ref with object type param
+
+module a::m {
+    use sui::object;
+    use sui::transfer::Receiving;
+
+    struct S has key { id: object::UID }
+
+    public entry fun yes(_: &Receiving<S>) { }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    struct Receiving<phantom T: key> has drop {
+        id: address
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/mut_receiving_ref.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/mut_receiving_ref.move
new file mode 100644
index 000000000..fbaead9a0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/mut_receiving_ref.move
@@ -0,0 +1,22 @@
+// valid, Receiving type by mut ref with object type param
+
+module a::m {
+    use sui::object;
+    use sui::transfer::Receiving;
+
+    struct S has key { id: object::UID }
+
+    public entry fun yes(_: &mut Receiving<S>) { }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    struct Receiving<phantom T: key> has drop {
+        id: address
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_generic_vector_param.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_generic_vector_param.move
new file mode 100644
index 000000000..0c29fa984
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_generic_vector_param.move
@@ -0,0 +1,6 @@
+// can have nested primitive vectors
+module a::m {
+    public entry fun foo<T>(_: vector<vector<T>>) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.exp
new file mode 100644
index 000000000..5600e180c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/nested_key_generic_vector_param.move:3:34
+  │
+3 │     public entry fun foo<T: key>(_: vector<vector<T>>) {
+  │            -----                 ^  ----------------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │                     │   
+  │            │                     Invalid 'entry' parameter type for parameter '_'
+  │            'foo' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.move
new file mode 100644
index 000000000..5e3d239a0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/nested_key_generic_vector_param.move
@@ -0,0 +1,6 @@
+// cannot have nested object vectors
+module a::m {
+    public entry fun foo<T: key>(_: vector<vector<T>>) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.exp
new file mode 100644
index 000000000..9c3763751
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/non_key_struct.move:6:25
+  │
+6 │     public entry fun no(_: S) {
+  │            -----        ^  - 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │            │   
+  │            │            Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.move
new file mode 100644
index 000000000..bff48aeeb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct.move
@@ -0,0 +1,9 @@
+// invalid, non key structs are not supported
+
+module a::m {
+    struct S has copy, drop, store { value: u64 }
+
+    public entry fun no(_: S) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.exp
new file mode 100644
index 000000000..8b4c4a45d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.exp
@@ -0,0 +1,18 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/non_key_struct_generic.move:9:25
+  │
+9 │     public entry fun t1(_: Obj<NoStore>) {
+  │            -----        ^  ------------ 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │            │   
+  │            │            Invalid 'entry' parameter type for parameter '_'
+  │            't1' was declared 'entry' here
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/entry_points/non_key_struct_generic.move:14:28
+   │
+14 │     public entry fun t2<T>(_: Obj<T>) {
+   │            -----           ^  ------ 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+   │            │               │   
+   │            │               Invalid 'entry' parameter type for parameter '_'
+   │            't2' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.move
new file mode 100644
index 000000000..193f66ceb
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic.move
@@ -0,0 +1,24 @@
+// invalid as NoStore doesn't have store, so Obj doesn't have key
+
+module a::m {
+    use sui::object;
+
+    struct Obj<T> has key { id: object::UID, value: T }
+    struct NoStore has copy, drop { value: u64 }
+
+    public entry fun t1(_: Obj<NoStore>) {
+        abort 0
+    }
+
+    // valid, while T doesn't have store, and might it later, we require it to be annotated
+    public entry fun t2<T>(_: Obj<T>) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic_valid.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic_valid.move
new file mode 100644
index 000000000..c82a22580
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_generic_valid.move
@@ -0,0 +1,17 @@
+// valid, T has store, thus Obj has key
+
+module a::m {
+    use sui::object;
+
+    struct Obj<T> has key { id: object::UID, value: T }
+
+    public entry fun no<T: store>(_: Obj<T>) {
+        abort 0
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.exp
new file mode 100644
index 000000000..f3d21d93e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/non_key_struct_vector.move:6:25
+  │
+6 │     public entry fun no(_: vector<S>) {
+  │            -----        ^  --------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │            │   
+  │            │            Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.move
new file mode 100644
index 000000000..9c1772bf0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/non_key_struct_vector.move
@@ -0,0 +1,10 @@
+// invalid, non key structs are not supported, even in vectors
+
+module a::m {
+    struct S has copy, drop, store { value: u64 }
+
+    public entry fun no(_: vector<S>) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.exp
new file mode 100644
index 000000000..8a7d091e3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/obj_mut_ref_vector.move:8:25
+  │
+8 │     public entry fun no(_: &mut vector<S>) {
+  │            -----        ^  -------------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │            │   
+  │            │            Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.move
new file mode 100644
index 000000000..703506855
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_mut_ref_vector.move
@@ -0,0 +1,17 @@
+// invalid, a mutable reference to vector of objects
+
+module a::m {
+    use sui::object;
+
+    struct S has key { id: object::UID }
+
+    public entry fun no(_: &mut vector<S>) {
+        abort 0
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.exp
new file mode 100644
index 000000000..8f772bd61
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.exp
@@ -0,0 +1,9 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/obj_ref_vector.move:8:25
+  │
+8 │     public entry fun no(_: &vector<S>) {
+  │            -----        ^  ---------- 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+  │            │            │   
+  │            │            Invalid 'entry' parameter type for parameter '_'
+  │            'no' was declared 'entry' here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.move
new file mode 100644
index 000000000..0a99828f3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/obj_ref_vector.move
@@ -0,0 +1,18 @@
+// invalid, a reference to vector of objects
+
+module a::m {
+    use sui::object;
+
+    struct S has key { id: object::UID }
+
+    public entry fun no(_: &vector<S>) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/ok.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/ok.move
new file mode 100644
index 000000000..de87879a9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/ok.move
@@ -0,0 +1,16 @@
+// TxContext by immutable or mutable ref
+
+module a::m {
+    use sui::tx_context;
+    public entry fun f(_: &tx_context::TxContext) {
+        abort 0
+    }
+
+    public entry fun t2(_: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/option.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/option.move
new file mode 100644
index 000000000..001e7aaac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/option.move
@@ -0,0 +1,16 @@
+// valid, option of primitives is allowed
+
+module a::m {
+    use std::option;
+
+    public entry fun yes<T>(
+        _: option::Option<u64>,
+        _: option::Option<option::Option<u64>>,
+        _: option::Option<vector<u64>>,
+        _: vector<option::Option<u64>>,
+        _: option::Option<option::Option<T>>,
+    ) {
+        abort 0
+    }
+
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/optional_txn_context.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/optional_txn_context.move
new file mode 100644
index 000000000..0731ce654
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/optional_txn_context.move
@@ -0,0 +1,18 @@
+// TxContext does not have to be present
+
+module a::m {
+    public entry fun t() {
+        abort 0
+    }
+
+    struct Obj has key { id: sui::object::UID }
+    public entry fun t2(_: bool, _: &mut Obj) {
+        abort 0
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.exp
new file mode 100644
index 000000000..3422c96ab
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/sui_mode/entry_points/receiving_non_object_type.move:6:28
+   │
+ 6 │     public entry fun no(_: Receiving<u64>) { abort 0 }
+   │                            ^^^^^^^^^^^^^^
+   │                            │         │
+   │                            │         The type 'u64' does not have the ability 'key'
+   │                            'key' constraint not satisifed
+   ·
+10 │     struct Receiving<phantom T: key> has drop {
+   │                                 --- 'key' constraint declared here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.move
new file mode 100644
index 000000000..56aad0326
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_non_object_type.move
@@ -0,0 +1,13 @@
+// invalid, Receiving type with non-object type param
+
+module a::m {
+    use sui::transfer::Receiving;
+
+    public entry fun no(_: Receiving<u64>) { abort 0 }
+}
+
+module sui::transfer {
+    struct Receiving<phantom T: key> has drop {
+        id: address
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_with_object_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_with_object_type.move
new file mode 100644
index 000000000..9979bdc60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/receiving_with_object_type.move
@@ -0,0 +1,22 @@
+// valid, Receiving type with object type param
+
+module a::m {
+    use sui::object;
+    use sui::transfer::Receiving;
+
+    struct S has key { id: object::UID }
+
+    public entry fun yes(_: Receiving<S>) { }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    struct Receiving<phantom T: key> has drop {
+        id: address
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values.move
new file mode 100644
index 000000000..19d04c45d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values.move
@@ -0,0 +1,24 @@
+// return values from entry functions must have drop
+
+module a::m {
+    public entry fun t0(): u64 {
+        abort 0
+    }
+
+    public entry fun t1(): (u64, u8) {
+        abort 0
+    }
+
+    public entry fun t2(): vector<u8> {
+        abort 0
+    }
+
+    struct Droppable has drop { flag: bool }
+    public entry fun t3(): Droppable {
+        abort 0
+    }
+
+    public entry fun t4(): (vector<Droppable>, u64) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.exp b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.exp
new file mode 100644
index 000000000..81359485b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.exp
@@ -0,0 +1,46 @@
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/return_values_invalid.move:4:12
+  │
+4 │     public entry fun t0(): &u8 {
+  │            ^^^^^           --- Expected a non-reference type
+  │            │                
+  │            Invalid return type for entry function 't0'
+
+error[Sui E02002]: invalid 'entry' function signature
+  ┌─ tests/sui_mode/entry_points/return_values_invalid.move:7:12
+  │
+7 │     public entry fun t1(): &mut u8 {
+  │            ^^^^^           ------- Expected a non-reference type
+  │            │                
+  │            Invalid return type for entry function 't1'
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/entry_points/return_values_invalid.move:14:12
+   │
+13 │     struct Copyable has copy, store {}
+   │            -------- To satisfy the constraint, the 'drop' ability would need to be added here
+14 │     public entry fun t3(): Copyable {
+   │            ^^^^^           -------- The type 'a::m::Copyable' does not have the ability 'drop'
+   │            │                
+   │            Invalid return type for entry function 't3'
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/entry_points/return_values_invalid.move:18:12
+   │
+17 │     struct Obj has key, store { id: sui::object::UID }
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+18 │     public entry fun t4(): Obj {
+   │            ^^^^^           --- The type 'a::m::Obj' does not have the ability 'drop'
+   │            │                
+   │            Invalid return type for entry function 't4'
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/entry_points/return_values_invalid.move:21:12
+   │
+21 │     public entry fun t5(): vector<Obj> {
+   │            ^^^^^           -----------
+   │            │               │      │
+   │            │               │      The type 'vector<a::m::Obj>' can have the ability 'drop' but the type argument 'a::m::Obj' does not have the required ability 'drop'
+   │            │               The type 'vector<a::m::Obj>' does not have the ability 'drop'
+   │            Invalid return type for entry function 't5'
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.move
new file mode 100644
index 000000000..14439f8f7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/return_values_invalid.move
@@ -0,0 +1,30 @@
+// return values from entry functions must have drop
+
+module a::m {
+    public entry fun t0(): &u8 {
+        abort 0
+    }
+    public entry fun t1(): &mut u8 {
+        abort 0
+    }
+    public entry fun t2(): (u64,&u8,u8) {
+        abort 0
+    }
+    struct Copyable has copy, store {}
+    public entry fun t3(): Copyable {
+        abort 0
+    }
+    struct Obj has key, store { id: sui::object::UID }
+    public entry fun t4(): Obj {
+        abort 0
+    }
+    public entry fun t5(): vector<Obj> {
+        abort 0
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_generic_vector_param.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_generic_vector_param.move
new file mode 100644
index 000000000..ff3a06abe
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_generic_vector_param.move
@@ -0,0 +1,5 @@
+module a::m {
+    public entry fun foo<T>(_: vector<T>) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param.move
new file mode 100644
index 000000000..4d18a8a8c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param.move
@@ -0,0 +1,12 @@
+module a::m {
+    use sui::tx_context;
+
+    public entry fun foo<T>(_: T, _: &mut tx_context::TxContext) {
+        abort 0
+    }
+
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_generic_object.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_generic_object.move
new file mode 100644
index 000000000..af582ab04
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_generic_object.move
@@ -0,0 +1,22 @@
+module a::m {
+    use sui::object;
+    use sui::tx_context;
+    struct Obj<T> has key {
+        id: object::UID,
+        value: T,
+    }
+    public entry fun foo<T: store>(_: Obj<T>, _: &mut tx_context::TxContext) {
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_key.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_key.move
new file mode 100644
index 000000000..7a45891f1
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/single_type_param_key.move
@@ -0,0 +1,18 @@
+// type parameters can have key
+module a::m {
+    use sui::tx_context;
+
+    public entry fun t1<T: key>(_: T, _: &mut tx_context::TxContext) {
+        abort 0
+    }
+    public entry fun t2<T: key>(_: &T, _: &mut tx_context::TxContext) {
+        abort 0
+    }
+    public entry fun t3<T: key>(_: &mut T, _: &mut tx_context::TxContext) {
+        abort 0
+    }
+
+}
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/string.move b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/string.move
new file mode 100644
index 000000000..c8df416e0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/entry_points/string.move
@@ -0,0 +1,29 @@
+// valid, ASCII and UTF strings is allowed
+
+module a::m {
+    use sui::tx_context;
+    use std::ascii;
+    use std::string;
+
+    public entry fun yes_ascii<T>(
+        _: ascii::String,
+        _: vector<ascii::String>,
+        _: vector<vector<ascii::String>>,
+        _: &mut tx_context::TxContext,
+    ) {
+        abort 0
+    }
+
+    public entry fun yes_utf8<T>(
+        _: string::String,
+        _: vector<string::String>,
+        _: vector<vector<string::String>>,
+        _: &mut tx_context::TxContext,
+    ) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/direct_leak_through_call.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/direct_leak_through_call.move
new file mode 100644
index 000000000..495a9b42b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/direct_leak_through_call.move
@@ -0,0 +1,25 @@
+// allowed since no object is being created with the UID
+
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    public fun transfer(_: UID) {
+        abort 0
+    }
+
+    public fun foo(f: Foo) {
+        let Foo { id } = f;
+        transfer(id);
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.exp
new file mode 100644
index 000000000..6bfb9fbe7
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.exp
@@ -0,0 +1,9 @@
+error[Sui E01001]: invalid object construction
+   ┌─ tests/sui_mode/id_leak/indirect_leak_through_call.move:15:18
+   │
+15 │         transfer(Foo { id });
+   │                  ^^^^^^^^^^
+   │                  │     │
+   │                  │     The UID must come directly from sui::object::new. Or for tests, it can come from sui::test_scenario::new_object
+   │                  Invalid object creation without a newly created UID.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.move
new file mode 100644
index 000000000..bd21a01a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/indirect_leak_through_call.move
@@ -0,0 +1,44 @@
+// not allowed since Foo is not packed with a fresh UID
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    fun transfer(_: Foo) {
+        abort 0
+    }
+
+    public fun foo(f: Foo) {
+        let Foo { id } = f;
+        transfer(Foo { id });
+    }
+
+}
+
+// allowed since no packing occurs
+module k::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    fun transfer(_: UID) {
+        abort 0
+    }
+
+    public fun foo(f: Foo) {
+        let Foo { id } = f;
+        transfer(id);
+    }
+
+}
+
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/infinite_loop.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/infinite_loop.move
new file mode 100644
index 000000000..a6669af74
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/infinite_loop.move
@@ -0,0 +1,59 @@
+// Modules with infinite loops to stress the ID leak verifier
+module a::m {
+    use sui::object::{Self, UID};
+    use sui::tx_context::TxContext;
+
+    struct Obj has key {
+        id: UID,
+    }
+
+    public entry fun loop_forever(ctx: &mut TxContext) {
+        let obj = Obj { id:  object::new(ctx) };
+        let Obj { id: uid } = obj;
+        loop {
+            object::delete(uid);
+            uid = object::new(ctx);
+        }
+    }
+
+    public entry fun loop_forever_2(ctx: &mut TxContext) {
+        let obj = Obj { id:  object::new(ctx) };
+        let Obj { id: uid } = obj;
+        loop {
+            object::delete(uid);
+            obj = Obj { id: object::new(ctx) };
+            loop {
+                Obj { id: uid } = obj;
+                object::delete(uid);
+                uid = object::new(ctx);
+                break
+            }
+        }
+    }
+}
+
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+    public fun new(_: &mut sui::tx_context::TxContext): UID {
+        abort 0
+    }
+    public fun delete(_: UID) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+    public fun sender(_: &TxContext): address {
+        @0
+    }
+}
+
+module sui::transfer {
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/loop.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/loop.move
new file mode 100644
index 000000000..823bde594
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/loop.move
@@ -0,0 +1,48 @@
+// allowed, even though a bit pointless
+module a::m {
+    use sui::object::{Self, UID};
+    use sui::tx_context::{Self, TxContext};
+    use sui::transfer::transfer;
+
+    struct Obj has key {
+        id: UID
+    }
+
+    public entry fun transmute(ctx: &mut TxContext) {
+        let i = 0;
+        let id = object::new(ctx);
+        while (i <= 10) {
+            object::delete(id);
+            id = object::new(ctx);
+            i = i + 1;
+        };
+        let obj = Obj { id };
+        transfer(obj, tx_context::sender(ctx))
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+    public fun new(_: &mut sui::tx_context::TxContext): UID {
+        abort 0
+    }
+    public fun delete(_: UID) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+    public fun sender(_: &TxContext): address {
+        @0
+    }
+}
+
+module sui::transfer {
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.exp
new file mode 100644
index 000000000..414a1d03e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.exp
@@ -0,0 +1,9 @@
+error[Sui E01001]: invalid object construction
+   ┌─ tests/sui_mode/id_leak/through_call_with_borrow_field.move:11:9
+   │
+11 │         Object { id }
+   │         ^^^^^^^^^^^^^
+   │         │        │
+   │         │        The UID must come directly from sui::object::new. Or for tests, it can come from sui::test_scenario::new_object
+   │         Invalid object creation without a newly created UID.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.move
new file mode 100644
index 000000000..816bb2bc4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_call_with_borrow_field.move
@@ -0,0 +1,33 @@
+// not allowed, the call tries to make a new UID
+module a::m {
+    use sui::object::UID;
+    use sui::transfer::transfer;
+
+    struct S has copy, drop { f: u64 }
+
+    struct Object has key { id: UID }
+
+    public fun new(id: UID): Object {
+        Object { id }
+    }
+
+    public entry fun foo(obj: Object) {
+        let s = S { f: 0 };
+        let Object { id } = obj;
+        _ = &s.f;
+        transfer(new(id), @42);
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_direct_return.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_direct_return.move
new file mode 100644
index 000000000..5a518d516
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_direct_return.move
@@ -0,0 +1,19 @@
+// allowed, no object is being made with the UID
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    public fun foo(f: Foo): UID {
+        let Foo { id } = f;
+        id
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.exp
new file mode 100644
index 000000000..eafe42517
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.exp
@@ -0,0 +1,9 @@
+error[Sui E01001]: invalid object construction
+   ┌─ tests/sui_mode/id_leak/through_indirect_return.move:11:9
+   │
+11 │         Foo { id }
+   │         ^^^^^^^^^^
+   │         │     │
+   │         │     The UID must come directly from sui::object::new. Or for tests, it can come from sui::test_scenario::new_object
+   │         Invalid object creation without a newly created UID.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.move
new file mode 100644
index 000000000..3e848b918
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_indirect_return.move
@@ -0,0 +1,20 @@
+// not allowed, a new object is being made with the UID
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    public fun foo(f: Foo): Foo {
+        let Foo { id } = f;
+        Foo { id }
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.exp
new file mode 100644
index 000000000..b4142af9e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.exp
@@ -0,0 +1,9 @@
+error[Sui E01001]: invalid object construction
+   ┌─ tests/sui_mode/id_leak/through_pack.move:22:17
+   │
+22 │         let c = C { id };
+   │                 ^^^^^^^^
+   │                 │   │
+   │                 │   The UID must come directly from sui::object::new. Or for tests, it can come from sui::test_scenario::new_object
+   │                 Invalid object creation without a newly created UID.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.move
new file mode 100644
index 000000000..8d834db30
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_pack.move
@@ -0,0 +1,65 @@
+// not allowed since C is not packed with a fresh UID
+module b::test {
+    use sui::object::UID;
+    use sui::transfer::transfer;
+
+    struct A has key {
+        id: UID
+    }
+
+    struct C has key {
+        id: UID
+    }
+
+    struct B {
+        id: UID
+    }
+
+    public entry fun test(x: A) {
+        let A { id } = x;
+        let b = B { id };
+        let B { id } = b;
+        let c = C { id };
+        transfer(c, @1);
+    }
+}
+
+// allowed since Bar does not have key
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    struct Bar {
+        id: UID,
+        v: u64,
+    }
+
+    public fun foo(f: Foo) {
+        let Foo { id } = f;
+        let _b = Bar { id, v: 0 };
+        abort 0
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+    public fun sender(_: &TxContext): address {
+        @0
+    }
+}
+
+module sui::transfer {
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.exp
new file mode 100644
index 000000000..dae66d375
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/sui_mode/id_leak/through_reference.move:11:10
+   │
+ 9 │     public fun foo(f: Foo, ref: &mut UID) {
+   │                                      --- The type 'sui::object::UID' does not have the ability 'drop'
+10 │         let Foo { id } = f;
+11 │         *ref = id;
+   │          ^^^ Invalid mutation. Mutation requires the 'drop' ability as the old value is destroyed
+   ·
+17 │     struct UID has store {
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.move
new file mode 100644
index 000000000..5752d2be2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_reference.move
@@ -0,0 +1,20 @@
+// cannot assign to UID reference
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    public fun foo(f: Foo, ref: &mut UID) {
+        let Foo { id } = f;
+        *ref = id;
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_vector.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_vector.move
new file mode 100644
index 000000000..849584de2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/through_vector.move
@@ -0,0 +1,20 @@
+// allowed, anything can be done with a UID after unpacking, as long as it isn't repacked
+module a::m {
+    use sui::object::UID;
+
+    struct Foo has key {
+        id: UID,
+    }
+
+    public fun foo(f: Foo, v: &mut vector<UID>) {
+        let Foo { id } = f;
+        std::vector::push_back(v, id)
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.exp b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.exp
new file mode 100644
index 000000000..7124dd969
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.exp
@@ -0,0 +1,9 @@
+error[Sui E01001]: invalid object construction
+   ┌─ tests/sui_mode/id_leak/transmute.move:17:19
+   │
+17 │         let dog = Dog { id };
+   │                   ^^^^^^^^^^
+   │                   │     │
+   │                   │     The UID must come directly from sui::object::new. Or for tests, it can come from sui::test_scenario::new_object
+   │                   Invalid object creation without a newly created UID.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.move b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.move
new file mode 100644
index 000000000..0f2ce8c32
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/id_leak/transmute.move
@@ -0,0 +1,40 @@
+// not allowed, it re-uses an ID in a new object
+module a::m {
+    use sui::object::UID;
+    use sui::tx_context::{Self, TxContext};
+    use sui::transfer::transfer;
+
+    struct Cat has key {
+        id: UID,
+    }
+
+    struct Dog has key {
+        id: UID,
+    }
+
+    public fun transmute(cat: Cat, ctx: &mut TxContext) {
+        let Cat { id } = cat;
+        let dog = Dog { id };
+        transfer(dog, tx_context::sender(ctx));
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+    public fun sender(_: &TxContext): address {
+        @0
+    }
+}
+
+module sui::transfer {
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.exp
new file mode 100644
index 000000000..bb9c41d3d
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.exp
@@ -0,0 +1,8 @@
+error[Sui E02006]: invalid 'init' call
+  ┌─ tests/sui_mode/init/cannot_call_init.move:9:9
+  │
+9 │         init(ctx)
+  │         ^^^^^^^^^ Invalid call to 'a::m::init'. Module initializers cannot be called directly
+  │
+  = Module initializers are called implicitly upon publishing. If you need to reuse this function (or want to call it from a test), consider extracting the logic into a new function and calling that instead.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.move
new file mode 100644
index 000000000..1874cff2f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/cannot_call_init.move
@@ -0,0 +1,15 @@
+// cannot directly call init
+module a::m {
+    use sui::tx_context;
+    fun init(_ctx: &mut tx_context::TxContext) {
+        abort 0
+    }
+
+    public entry fun init_again(ctx: &mut tx_context::TxContext) {
+        init(ctx)
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/imm_tx_context.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/imm_tx_context.move
new file mode 100644
index 000000000..fcbf1f9a3
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/imm_tx_context.move
@@ -0,0 +1,11 @@
+// TxContext can be immutable, even for init
+module a::m {
+    use sui::tx_context;
+    fun init(_ctx: &tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.exp
new file mode 100644
index 000000000..5040e7370
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.exp
@@ -0,0 +1,19 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/init/must_have_txn_context.move:3:9
+  │
+3 │     fun init() {
+  │         ^^^^
+  │         │
+  │         Invalid 'init' function declaration
+  │         'init' functions must have their last parameter as '&sui::tx_context::TxContext' or '&mut sui::tx_context::TxContext'
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/init/must_have_txn_context.move:11:9
+   │
+11 │     fun init(_ctx: &mut tx_context::TxContext, _ctx2: &mut tx_context::TxContext) {
+   │         ^^^^       -------------------------- Invalid parameter '_ctx' of type '&mut sui::tx_context::TxContext'. Expected a one-time witness type, 'a::n::N
+   │         │           
+   │         Invalid 'init' function declaration
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.move
new file mode 100644
index 000000000..201290071
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/must_have_txn_context.move
@@ -0,0 +1,18 @@
+// must have TxContext
+module a::m {
+    fun init() {
+        abort 0
+    }
+}
+
+// cannot have mroe than one TxContext
+module a::n {
+    use sui::tx_context;
+    fun init(_ctx: &mut tx_context::TxContext, _ctx2: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.exp
new file mode 100644
index 000000000..12e4a8916
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.exp
@@ -0,0 +1,8 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/init/not_generic.move:4:9
+  │
+4 │     fun init<T>(_ctx: &mut tx_context::TxContext) {
+  │         ^^^^ - 'init' functions cannot have type parameters
+  │         │     
+  │         Invalid 'init' function declaration
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.move
new file mode 100644
index 000000000..eedf270a6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_generic.move
@@ -0,0 +1,11 @@
+// init functions cannot have generics
+module a::m {
+    use sui::tx_context;
+    fun init<T>(_ctx: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.exp
new file mode 100644
index 000000000..f798e2dee
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.exp
@@ -0,0 +1,24 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/init/not_private.move:4:16
+  │
+4 │     public fun init(_ctxctx: &mut tx_context::TxContext) {
+  │     ------     ^^^^ Invalid 'init' function declaration
+  │     │           
+  │     'init' functions must be internal to their module
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/init/not_private.move:11:15
+   │
+11 │     entry fun init(_ctx: &mut tx_context::TxContext) {
+   │     -----     ^^^^ Invalid 'init' function declaration
+   │     │          
+   │     'init' functions cannot be 'entry' functions
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/init/not_private.move:18:24
+   │
+18 │     public(friend) fun init(_ctx: &mut tx_context::TxContext) {
+   │     --------------     ^^^^ Invalid 'init' function declaration
+   │     │                   
+   │     'init' functions must be internal to their module
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.move
new file mode 100644
index 000000000..26820c100
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_private.move
@@ -0,0 +1,25 @@
+// init functions cannot be public, cannot have entry, cannot be public(friend)
+module a::m0 {
+    use sui::tx_context;
+    public fun init(_ctxctx: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module a::m1 {
+    use sui::tx_context;
+    entry fun init(_ctx: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module a::m2 {
+    use sui::tx_context;
+    public(friend) fun init(_ctx: &mut tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.exp
new file mode 100644
index 000000000..2ae78773e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.exp
@@ -0,0 +1,24 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/init/not_txn_context.move:3:9
+  │
+3 │     fun init(_: u64) {
+  │         ^^^^    --- 'init' functions must have their last parameter as '&sui::tx_context::TxContext' or '&mut sui::tx_context::TxContext'
+  │         │        
+  │         Invalid 'init' function declaration
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/init/not_txn_context.move:10:9
+   │
+10 │     fun init(_: TxContext) {
+   │         ^^^^    --------- 'init' functions must have their last parameter as '&sui::tx_context::TxContext' or '&mut sui::tx_context::TxContext'
+   │         │        
+   │         Invalid 'init' function declaration
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/init/not_txn_context.move:17:9
+   │
+17 │     fun init(_: tx_context::TxContext) {
+   │         ^^^^    --------------------- 'init' functions must have their last parameter as '&sui::tx_context::TxContext' or '&mut sui::tx_context::TxContext'
+   │         │        
+   │         Invalid 'init' function declaration
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.move
new file mode 100644
index 000000000..e50ed4610
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/not_txn_context.move
@@ -0,0 +1,24 @@
+// init must have & or &mut sui::tx_context::TxContext as first argument
+module a::m1 {
+    fun init(_: u64) {
+        abort 0
+    }
+}
+
+module a::tx_context {
+    struct TxContext { value: u64 }
+    fun init(_: TxContext) {
+        abort 0
+    }
+}
+
+module a::m2 {
+    use sui::tx_context;
+    fun init(_: tx_context::TxContext) {
+        abort 0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/ok.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/ok.move
new file mode 100644
index 000000000..d27a662f9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/ok.move
@@ -0,0 +1,10 @@
+// valid init function
+module a::m {
+    use sui::tx_context;
+    fun init(_: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.exp b/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.exp
new file mode 100644
index 000000000..c215c96a8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.exp
@@ -0,0 +1,8 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/init/return_values.move:4:9
+  │
+4 │     fun init(_: &mut tx_context::TxContext): u64 {
+  │         ^^^^                                 --- 'init' functions must have a return type of '()'
+  │         │                                     
+  │         Invalid 'init' function declaration
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.move
new file mode 100644
index 000000000..cb7d7cb7c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/return_values.move
@@ -0,0 +1,11 @@
+// init cannot have return values
+module a::m {
+    use sui::tx_context;
+    fun init(_: &mut tx_context::TxContext): u64 {
+        0
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/init/unused_function.move b/vendors/move/crates/move-compiler/tests/sui_mode/init/unused_function.move
new file mode 100644
index 000000000..acb51ac5e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/init/unused_function.move
@@ -0,0 +1,8 @@
+// init is unused but does not error because we are in Sui mode
+module a::m {
+    fun init(_: &mut sui::tx_context::TxContext) {}
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.exp
new file mode 100644
index 000000000..a37470fc5
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.exp
@@ -0,0 +1,12 @@
+warning[W09004]: unnecessary trailing semicolon
+  ┌─ tests/sui_mode/one_time_witness/bool_field.move:9:15
+  │
+9 │         return;
+  │         ------^
+  │         │     │
+  │         │     Invalid trailing ';'
+  │         │     A trailing ';' in an expression block implicitly adds a '()' value after the semicolon. That '()' value will not be reachable
+  │         Any code after this expression will not be reached
+  │
+  = This warning can be suppressed with '#[allow(unused_trailing_semi)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.move
new file mode 100644
index 000000000..e85ea5d6b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/bool_field.move
@@ -0,0 +1,15 @@
+// correct, bool field specified at source level
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { some_field: bool }
+
+    fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+        return;
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.exp
new file mode 100644
index 000000000..e322aa96b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.exp
@@ -0,0 +1,40 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:2:9
+  │
+2 │     fun init(_: who::X, _: who::Y, _: who::Z) {}
+  │         ^^^^                       - 'init' functions can have at most two parameters
+  │         │                           
+  │         Invalid 'init' function declaration
+
+error[E03002]: unbound module
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:2:17
+  │
+2 │     fun init(_: who::X, _: who::Y, _: who::Z) {}
+  │                 ^^^ Unbound module alias 'who'
+
+error[E03002]: unbound module
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:2:28
+  │
+2 │     fun init(_: who::X, _: who::Y, _: who::Z) {}
+  │                            ^^^ Unbound module alias 'who'
+
+error[E03002]: unbound module
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:2:39
+  │
+2 │     fun init(_: who::X, _: who::Y, _: who::Z) {}
+  │                                       ^^^ Unbound module alias 'who'
+
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:7:9
+  │
+7 │     fun init(_: Who, _: u64, _: &mut sui::tx_context::TxContext) {}
+  │         ^^^^                 - 'init' functions can have at most two parameters
+  │         │                     
+  │         Invalid 'init' function declaration
+
+error[E03004]: unbound type
+  ┌─ tests/sui_mode/one_time_witness/init_many_wrong_parameters.move:7:17
+  │
+7 │     fun init(_: Who, _: u64, _: &mut sui::tx_context::TxContext) {}
+  │                 ^^^ Unbound type 'Who' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.move
new file mode 100644
index 000000000..cfd7e72be
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_many_wrong_parameters.move
@@ -0,0 +1,12 @@
+module a::m {
+    fun init(_: who::X, _: who::Y, _: who::Z) {}
+}
+
+module a::beep {
+    struct BEEP has drop {}
+    fun init(_: Who, _: u64, _: &mut sui::tx_context::TxContext) {}
+}
+
+module sui::tx_context {
+    struct TxContext {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.exp
new file mode 100644
index 000000000..a8381192f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.exp
@@ -0,0 +1,12 @@
+error[E03002]: unbound module
+  ┌─ tests/sui_mode/one_time_witness/init_unbound_type.move:2:20
+  │
+2 │     fun init(_ctx: who::TxContext) {}
+  │                    ^^^ Unbound module alias 'who'
+
+error[E03004]: unbound type
+  ┌─ tests/sui_mode/one_time_witness/init_unbound_type.move:7:17
+  │
+7 │     fun init(_: Who, _ctx: &mut sui::tx_context::TxContext) {}
+  │                 ^^^ Unbound type 'Who' in current scope
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.move
new file mode 100644
index 000000000..1c2f1393a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/init_unbound_type.move
@@ -0,0 +1,12 @@
+module a::m {
+    fun init(_ctx: who::TxContext) {}
+}
+
+module a::beep {
+    struct BEEP has drop {}
+    fun init(_: Who, _ctx: &mut sui::tx_context::TxContext) {}
+}
+
+module sui::tx_context {
+    struct TxContext {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.exp
new file mode 100644
index 000000000..a1c405cc6
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.exp
@@ -0,0 +1,8 @@
+error[Sui E02005]: invalid one-time witness usage
+   ┌─ tests/sui_mode/one_time_witness/instantiate.move:12:9
+   │
+12 │         M { dummy: false }
+   │         ^^^^^^^^^^^^^^^^^^ Invalid one-time witness construction. One-time witness types cannot be created manually, but are passed as an argument 'init'
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.move
new file mode 100644
index 000000000..5720ece0a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/instantiate.move
@@ -0,0 +1,18 @@
+// invalid, otw type packed
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { dummy: bool }
+
+    fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+    }
+
+    fun pack(): M {
+        M { dummy: false }
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.exp
new file mode 100644
index 000000000..b8c677812
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.exp
@@ -0,0 +1,13 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/many_fields_invalid.move:5:12
+  │
+5 │     struct M has drop { some_field: bool, some_field2: bool  }
+  │            ^                              ----------- Found more than one field. One-time witness types must have no fields, or exactly one field of type 'bool'
+  │            │                               
+  │            Invalid one-time witness declaration
+6 │ 
+7 │     fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+  │                    - Attempted usage as a one-time witness here
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.move
new file mode 100644
index 000000000..b35623425
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_invalid.move
@@ -0,0 +1,13 @@
+// Incorrect, more than one field means not a OTW
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { some_field: bool, some_field2: bool  }
+
+    fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_valid.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_valid.move
new file mode 100644
index 000000000..78fdb6f43
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/many_fields_valid.move
@@ -0,0 +1,8 @@
+// Since it is not a OTW (because of the multiple fields), we can pack it
+module a::n {
+    struct N has drop { some_field: bool, some_field2: bool  }
+
+    public fun new(): N {
+        N { some_field: false, some_field2: true }
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.exp
new file mode 100644
index 000000000..91d1713c9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.exp
@@ -0,0 +1,30 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/more_abilities.move:6:12
+  │
+6 │     struct M1 has drop, copy { dummy: bool }
+  │            ^^           ---- One-time witness types can only have the have the 'drop' ability
+  │            │             
+  │            Invalid one-time witness declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
+error[Sui E02004]: invalid one-time witness declaration
+   ┌─ tests/sui_mode/one_time_witness/more_abilities.move:16:12
+   │
+16 │     struct M2 has drop, store { dummy: bool }
+   │            ^^           ----- One-time witness types can only have the have the 'drop' ability
+   │            │             
+   │            Invalid one-time witness declaration
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
+error[Sui E02004]: invalid one-time witness declaration
+   ┌─ tests/sui_mode/one_time_witness/more_abilities.move:26:12
+   │
+26 │     struct M3 has drop, copy, store { dummy: bool }
+   │            ^^           ---- One-time witness types can only have the have the 'drop' ability
+   │            │             
+   │            Invalid one-time witness declaration
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.move
new file mode 100644
index 000000000..9cb152cb0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/more_abilities.move
@@ -0,0 +1,35 @@
+// invalid, struct type has abilities beyond drop
+
+module a::m1 {
+    use sui::tx_context;
+
+    struct M1 has drop, copy { dummy: bool }
+
+    fun init(_otw: M1, _ctx: &mut tx_context::TxContext) {
+    }
+
+}
+
+module a::m2 {
+    use sui::tx_context;
+
+    struct M2 has drop, store { dummy: bool }
+
+    fun init(_otw: M2, _ctx: &mut tx_context::TxContext) {
+    }
+
+}
+
+module a::m3 {
+    use sui::tx_context;
+
+    struct M3 has drop, copy, store { dummy: bool }
+
+    fun init(_otw: M3, _ctx: &mut tx_context::TxContext) {
+    }
+
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.exp
new file mode 100644
index 000000000..1d29bd8c2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.exp
@@ -0,0 +1,11 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/no_drop.move:7:12
+  │
+7 │     struct M { dummy: bool }
+  │            ^
+  │            │
+  │            Invalid one-time witness declaration
+  │            One-time witness types can only have the have the 'drop' ability
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.move
new file mode 100644
index 000000000..1e7a86ef9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_drop.move
@@ -0,0 +1,16 @@
+// invalid, one-time witness type has no drop ability
+
+//# publish
+module a::m {
+    use sui::tx_context;
+
+    struct M { dummy: bool }
+
+    fun init(otw: M, _ctx: &mut tx_context::TxContext) {
+        let M { dummy: _ } = otw;
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_field.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_field.move
new file mode 100644
index 000000000..d15ac88da
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_field.move
@@ -0,0 +1,15 @@
+// structs are always given a field in the source language
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop {}
+
+    fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+    }
+
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.exp
new file mode 100644
index 000000000..b81835de9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.exp
@@ -0,0 +1,11 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/no_init_arg.move:8:20
+  │
+6 │     struct M has drop { dummy: bool }
+  │            - One-time witness declared here
+7 │ 
+8 │     fun init(_ctx: &mut tx_context::TxContext) {
+  │                    ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid first parameter to 'init'. Expected this module's one-time witness type 'a::m::M'
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.move
new file mode 100644
index 000000000..ddc84691c
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/no_init_arg.move
@@ -0,0 +1,14 @@
+// invalid, no one-time witness type parameter in init
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { dummy: bool }
+
+    fun init(_ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.exp
new file mode 100644
index 000000000..119f8efa0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.exp
@@ -0,0 +1,10 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/other_mod_def.move:7:9
+  │
+7 │     fun init(_otw: sui::SUI, _ctx: &mut tx_context::TxContext) {
+  │         ^^^^       -------- Invalid parameter '_otw' of type 'sui::sui::SUI'. Expected a one-time witness type, 'a::n::N
+  │         │           
+  │         Invalid 'init' function declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.move
new file mode 100644
index 000000000..b318c1586
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/other_mod_def.move
@@ -0,0 +1,19 @@
+// invalid, one-time witness type candidate used in a different module
+
+module a::n {
+    use sui::sui;
+    use sui::tx_context;
+
+    fun init(_otw: sui::SUI, _ctx: &mut tx_context::TxContext) {
+    }
+
+}
+
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
+
+module sui::sui {
+    struct SUI has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.exp
new file mode 100644
index 000000000..ff2fc49d2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.exp
@@ -0,0 +1,39 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/type_param.move:7:12
+  │
+7 │     struct M<phantom T> has drop { dummy: bool }
+  │            ^         - One-time witness types cannot have type parameters
+  │            │          
+  │            Invalid one-time witness declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/type_param.move:9:9
+  │
+9 │     fun init<T>(_otw: M<T>, _ctx: &mut tx_context::TxContext) {
+  │         ^^^^ - 'init' functions cannot have type parameters
+  │         │     
+  │         Invalid 'init' function declaration
+
+error[Sui E02004]: invalid one-time witness declaration
+   ┌─ tests/sui_mode/one_time_witness/type_param.move:16:12
+   │
+16 │     struct X<phantom T> has drop { dummy: bool }
+   │            ^         - One-time witness types cannot have type parameters
+   │            │          
+   │            Invalid one-time witness declaration
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
+error[Sui E02003]: invalid 'init' function
+   ┌─ tests/sui_mode/one_time_witness/type_param.move:18:20
+   │
+16 │     struct X<phantom T> has drop { dummy: bool }
+   │            - One-time witness declared here
+17 │ 
+18 │     fun init(_ctx: &mut tx_context::TxContext) {
+   │                    ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid first parameter to 'init'. Expected this module's one-time witness type 'a::x::X'
+   │
+   = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.move
new file mode 100644
index 000000000..0f873e522
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/type_param.move
@@ -0,0 +1,24 @@
+// invalid, struct type has type param
+
+//# publish
+module a::m {
+    use sui::tx_context;
+
+    struct M<phantom T> has drop { dummy: bool }
+
+    fun init<T>(_otw: M<T>, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module a::x {
+    use sui::tx_context;
+
+    struct X<phantom T> has drop { dummy: bool }
+
+    fun init(_ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type.move
new file mode 100644
index 000000000..279d28a86
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type.move
@@ -0,0 +1,26 @@
+// correct, wrong struct field type but not one-time witness candidate
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has store, drop { value: u64 }
+
+    fun init(_ctx: &mut tx_context::TxContext) {
+    }
+
+    fun foo() {
+        _ = M { value: 7 };
+        _ = M { value: 42 };
+    }
+}
+
+module 0::beep {
+  struct BEEP has store { boop: sui::table::Table<u8, bool> }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
+module sui::table {
+    struct Table<phantom K, phantom V> has store {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field.move
new file mode 100644
index 000000000..d7bb4e290
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field.move
@@ -0,0 +1,12 @@
+module a::beep {
+    struct BEEP has drop {
+        f0: u64,
+        f1: bool,
+    }
+    fun init(_ctx: &mut sui::tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.exp
new file mode 100644
index 000000000..abce69a44
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.exp
@@ -0,0 +1,13 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.move:2:12
+  │
+2 │     struct BEEP has drop {
+  │            ^^^^ Invalid one-time witness declaration
+3 │         f0: u64,
+  │         -- One-time witness types must have no fields, or exactly one field of type 'bool'
+  ·
+6 │     fun init(_: BEEP, _ctx: &mut sui::tx_context::TxContext) {
+  │                 ---- Attempted usage as a one-time witness here
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.move
new file mode 100644
index 000000000..fbc5a0c86
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_and_extra_field_with_init.move
@@ -0,0 +1,12 @@
+module a::beep {
+    struct BEEP has drop {
+        f0: u64,
+        f1: bool,
+    }
+    fun init(_: BEEP, _ctx: &mut sui::tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.exp
new file mode 100644
index 000000000..714baf8fa
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.exp
@@ -0,0 +1,13 @@
+error[Sui E02004]: invalid one-time witness declaration
+  ┌─ tests/sui_mode/one_time_witness/wrong_field_type_with_init.move:6:12
+  │
+6 │     struct M has drop { value: u64 }
+  │            ^            ----- One-time witness types must have no fields, or exactly one field of type 'bool'
+  │            │             
+  │            Invalid one-time witness declaration
+7 │ 
+8 │     fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+  │                    - Attempted usage as a one-time witness here
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.move
new file mode 100644
index 000000000..ea3447426
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_field_type_with_init.move
@@ -0,0 +1,14 @@
+// invalid, wrong struct field type
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { value: u64 }
+
+    fun init(_otw: M, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.exp
new file mode 100644
index 000000000..010372633
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.exp
@@ -0,0 +1,10 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/wrong_init_type.move:9:9
+  │
+9 │     fun init(_otw: N, _ctx: &mut tx_context::TxContext) {
+  │         ^^^^       - Invalid parameter '_otw' of type 'a::m::N'. Expected a one-time witness type, 'a::m::M
+  │         │           
+  │         Invalid 'init' function declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.move
new file mode 100644
index 000000000..7d090f1d9
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_init_type.move
@@ -0,0 +1,15 @@
+// invalid, wrong type of the init function's first param
+
+module a::m {
+    use sui::tx_context;
+
+    struct M has drop { dummy: bool }
+    struct N has drop { dummy: bool }
+
+    fun init(_otw: N, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.exp
new file mode 100644
index 000000000..b267e06bc
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.exp
@@ -0,0 +1,10 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/wrong_name.move:8:9
+  │
+8 │     fun init(_otw: OneTimeWitness, _ctx: &mut tx_context::TxContext) {
+  │         ^^^^       -------------- Invalid parameter '_otw' of type 'a::m::OneTimeWitness'. Expected a one-time witness type, 'a::m::M
+  │         │           
+  │         Invalid 'init' function declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.move
new file mode 100644
index 000000000..c86d811ac
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name.move
@@ -0,0 +1,14 @@
+// invalid, wrong one-time witness type name
+
+module a::m {
+    use sui::tx_context;
+
+    struct OneTimeWitness has drop { dummy: bool }
+
+    fun init(_otw: OneTimeWitness, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.exp b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.exp
new file mode 100644
index 000000000..eba886486
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.exp
@@ -0,0 +1,10 @@
+error[Sui E02003]: invalid 'init' function
+  ┌─ tests/sui_mode/one_time_witness/wrong_name_format.move:8:9
+  │
+8 │     fun init(_mod: Mod, _ctx: &mut tx_context::TxContext) {
+  │         ^^^^       --- Invalid parameter '_mod' of type 'a::mod::Mod'. Expected a one-time witness type, 'a::mod::MOD
+  │         │           
+  │         Invalid 'init' function declaration
+  │
+  = One-time witness types are structs with the following requirements: their name is the upper-case version of the module's name, they have no fields (or a single boolean field), they have no type parameters, and they have only the 'drop' ability.
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.move b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.move
new file mode 100644
index 000000000..8a0348550
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/one_time_witness/wrong_name_format.move
@@ -0,0 +1,14 @@
+// invalid, wrong one-time witness type name format
+
+module a::mod {
+    use sui::tx_context;
+
+    struct Mod has drop { dummy: bool }
+
+    fun init(_mod: Mod, _ctx: &mut tx_context::TxContext) {
+    }
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.exp b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.exp
new file mode 100644
index 000000000..d6ed18a68
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.exp
@@ -0,0 +1,32 @@
+error[Sui E02009]: invalid private transfer call
+  ┌─ tests/sui_mode/private_generics/no_public_transfer.move:9:9
+  │
+8 │     public fun t1(s: other::S) {
+  │                      -------- The type 'a::other::S' is not declared in the current module
+9 │         transfer::transfer(s, @0x100);
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::transfer' is restricted to being called in the object's module, 'a::other'
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer.move:13:9
+   │
+12 │     public fun t2(s: other::S) {
+   │                      -------- The type 'a::other::S' is not declared in the current module
+13 │         transfer::freeze_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::freeze_object' is restricted to being called in the object's module, 'a::other'
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer.move:17:9
+   │
+16 │     public fun t3(s: other::S) {
+   │                      -------- The type 'a::other::S' is not declared in the current module
+17 │         transfer::share_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::share_object' is restricted to being called in the object's module, 'a::other'
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer.move:21:9
+   │
+20 │     public fun t4(p: &mut UID, s: Receiving<other::S>): other::S {
+   │                                             -------- The type 'a::other::S' is not declared in the current module
+21 │         transfer::receive(p, s)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::receive' is restricted to being called in the object's module, 'a::other'
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.move
new file mode 100644
index 000000000..8eefeb0a0
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer.move
@@ -0,0 +1,73 @@
+// tests modules cannot use transfer internal functions outside of the defining module
+
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use a::other;
+    use sui::object::UID;
+
+    public fun t1(s: other::S) {
+        transfer::transfer(s, @0x100);
+    }
+
+    public fun t2(s: other::S) {
+        transfer::freeze_object(s);
+    }
+
+    public fun t3(s: other::S) {
+        transfer::share_object(s);
+    }
+
+    public fun t4(p: &mut UID, s: Receiving<other::S>): other::S {
+        transfer::receive(p, s)
+    }
+}
+
+module a::other {
+    struct S has key {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.exp b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.exp
new file mode 100644
index 000000000..5710d1a25
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.exp
@@ -0,0 +1,32 @@
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_generic.move:10:9
+   │
+ 9 │     public fun t1<T: key>(s: T) {
+   │                              - The type 'T' is not declared in the current module
+10 │         transfer::transfer(s, @0x100);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::transfer' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_generic.move:14:9
+   │
+13 │     public fun t2<T: key>(s: T) {
+   │                              - The type 'T' is not declared in the current module
+14 │         transfer::freeze_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::freeze_object' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_generic.move:18:9
+   │
+17 │     public fun t3<T: key>(s: T) {
+   │                              - The type 'T' is not declared in the current module
+18 │         transfer::share_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::share_object' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_generic.move:22:9
+   │
+21 │     public fun t4<T: key>(p: &mut UID, s: Receiving<T>): T {
+   │                                                     - The type 'T' is not declared in the current module
+22 │         transfer::receive(p, s)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::receive' is restricted to being called in the object's module
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.move
new file mode 100644
index 000000000..f70c48f5e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_generic.move
@@ -0,0 +1,68 @@
+// tests modules cannot use transfer internal functions outside of the defining module
+// Note: it is not possible to make a generic type `T<...> has key, store`
+// where a given instantiation`T<...>` has key but does _not_ have store
+
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use sui::object::UID;
+
+    public fun t1<T: key>(s: T) {
+        transfer::transfer(s, @0x100);
+    }
+
+    public fun t2<T: key>(s: T) {
+        transfer::freeze_object(s);
+    }
+
+    public fun t3<T: key>(s: T) {
+        transfer::share_object(s);
+    }
+
+    public fun t4<T: key>(p: &mut UID, s: Receiving<T>): T {
+        transfer::receive(p, s)
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.exp b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.exp
new file mode 100644
index 000000000..998579184
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.exp
@@ -0,0 +1,44 @@
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store.move:10:9
+   │
+ 9 │     public fun t1(s: other::S) {
+   │                      -------- The type 'a::other::S' is not declared in the current module
+10 │         transfer::transfer(s, @0x100);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::transfer' is restricted to being called in the object's module, 'a::other'
+   ·
+27 │     struct S has key, store {
+   │                       ----- The object has 'store' so 'sui::transfer::public_transfer' can be called instead
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store.move:14:9
+   │
+13 │     public fun t2(s: other::S) {
+   │                      -------- The type 'a::other::S' is not declared in the current module
+14 │         transfer::freeze_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::freeze_object' is restricted to being called in the object's module, 'a::other'
+   ·
+27 │     struct S has key, store {
+   │                       ----- The object has 'store' so 'sui::transfer::public_freeze_object' can be called instead
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store.move:18:9
+   │
+17 │     public fun t3(s: other::S) {
+   │                      -------- The type 'a::other::S' is not declared in the current module
+18 │         transfer::share_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::share_object' is restricted to being called in the object's module, 'a::other'
+   ·
+27 │     struct S has key, store {
+   │                       ----- The object has 'store' so 'sui::transfer::public_share_object' can be called instead
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store.move:22:9
+   │
+21 │     public fun t4(p: &mut UID, s: Receiving<other::S>): other::S {
+   │                                             -------- The type 'a::other::S' is not declared in the current module
+22 │         transfer::receive(p, s)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::receive' is restricted to being called in the object's module, 'a::other'
+   ·
+27 │     struct S has key, store {
+   │                       ----- The object has 'store' so 'sui::transfer::public_receive' can be called instead
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.move
new file mode 100644
index 000000000..b48486e60
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store.move
@@ -0,0 +1,74 @@
+// tests modules cannot use transfer internal functions outside of the defining module
+// even if it has store
+
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use a::other;
+    use sui::object::UID;
+
+    public fun t1(s: other::S) {
+        transfer::transfer(s, @0x100);
+    }
+
+    public fun t2(s: other::S) {
+        transfer::freeze_object(s);
+    }
+
+    public fun t3(s: other::S) {
+        transfer::share_object(s);
+    }
+
+    public fun t4(p: &mut UID, s: Receiving<other::S>): other::S {
+        transfer::receive(p, s)
+    }
+}
+
+module a::other {
+    struct S has key, store {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.exp b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.exp
new file mode 100644
index 000000000..e82afd841
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.exp
@@ -0,0 +1,40 @@
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store_generic.move:11:9
+   │
+10 │     public fun t1<T: key + store>(s: T) {
+   │                            -----     - The type 'T' is not declared in the current module
+   │                            │          
+   │                            The object has 'store' so 'sui::transfer::public_transfer' can be called instead
+11 │         transfer::transfer(s, @0x100);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::transfer' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store_generic.move:15:9
+   │
+14 │     public fun t2<T: key + store>(s: T) {
+   │                            -----     - The type 'T' is not declared in the current module
+   │                            │          
+   │                            The object has 'store' so 'sui::transfer::public_freeze_object' can be called instead
+15 │         transfer::freeze_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::freeze_object' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store_generic.move:19:9
+   │
+18 │     public fun t3<T: key + store>(s: T) {
+   │                            -----     - The type 'T' is not declared in the current module
+   │                            │          
+   │                            The object has 'store' so 'sui::transfer::public_share_object' can be called instead
+19 │         transfer::share_object(s);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::share_object' is restricted to being called in the object's module
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/private_generics/no_public_transfer_store_generic.move:23:9
+   │
+22 │     public fun t4<T: key + store>(p: &mut UID, s: Receiving<T>): T {
+   │                            -----                            - The type 'T' is not declared in the current module
+   │                            │                                 
+   │                            The object has 'store' so 'sui::transfer::public_receive' can be called instead
+23 │         transfer::receive(p, s)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::receive' is restricted to being called in the object's module
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.move
new file mode 100644
index 000000000..fef0d8ccf
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/no_public_transfer_store_generic.move
@@ -0,0 +1,69 @@
+// tests modules cannot use transfer internal functions outside of the defining module
+// even if it has store
+// Note: it is not possible to make a generic type `T<...> has key, store`
+// where a given instantiation`T<...>` has key but does _not_ have store
+
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use sui::object::UID;
+
+    public fun t1<T: key + store>(s: T) {
+        transfer::transfer(s, @0x100);
+    }
+
+    public fun t2<T: key + store>(s: T) {
+        transfer::freeze_object(s);
+    }
+
+    public fun t3<T: key + store>(s: T) {
+        transfer::share_object(s);
+    }
+
+    public fun t4<T: key + store>(p: &mut UID, s: Receiving<T>): T {
+        transfer::receive(p, s)
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.exp b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.exp
new file mode 100644
index 000000000..046e3f1bd
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.exp
@@ -0,0 +1,32 @@
+error[Sui E02008]: invalid event
+  ┌─ tests/sui_mode/private_generics/private_event_emit.move:8:9
+  │
+7 │     public fun t(s: a::other::Event) {
+  │                     --------------- The type 'a::other::Event' is not declared in the current module
+8 │         event::emit(s)
+  │         ^^^^^^^^^^^^^^ Invalid event. The function 'sui::event::emit' must be called with a type defined in the current module
+
+error[Sui E02008]: invalid event
+   ┌─ tests/sui_mode/private_generics/private_event_emit.move:12:9
+   │
+11 │     public fun gen<T: copy + drop>(x: T) {
+   │                                       - The type 'T' is not declared in the current module
+12 │         event::emit(move x)
+   │         ^^^^^^^^^^^^^^^^^^^ Invalid event. The function 'sui::event::emit' must be called with a type defined in the current module
+
+error[Sui E02008]: invalid event
+   ┌─ tests/sui_mode/private_generics/private_event_emit.move:16:9
+   │
+15 │     public fun prim(x: u64) {
+   │                        --- The type 'u64' is not declared in the current module
+16 │         event::emit(x)
+   │         ^^^^^^^^^^^^^^ Invalid event. The function 'sui::event::emit' must be called with a type defined in the current module
+
+error[Sui E02008]: invalid event
+   ┌─ tests/sui_mode/private_generics/private_event_emit.move:20:9
+   │
+19 │     public fun vec(x: vector<X>) {
+   │                       --------- The type 'vector<a::m::X>' is not declared in the current module
+20 │         event::emit(move x)
+   │         ^^^^^^^^^^^^^^^^^^^ Invalid event. The function 'sui::event::emit' must be called with a type defined in the current module
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.move
new file mode 100644
index 000000000..b1be1dab8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/private_event_emit.move
@@ -0,0 +1,30 @@
+// tests modules cannot emit events for types not defined in the current module
+module a::m {
+    use sui::event;
+
+    struct X has copy, drop {}
+
+    public fun t(s: a::other::Event) {
+        event::emit(s)
+    }
+
+    public fun gen<T: copy + drop>(x: T) {
+        event::emit(move x)
+    }
+
+    public fun prim(x: u64) {
+        event::emit(x)
+    }
+
+    public fun vec(x: vector<X>) {
+        event::emit(move x)
+    }
+}
+
+module a::other {
+    struct Event has copy, drop {}
+}
+
+module sui::event {
+    public fun emit<T: copy + drop>(_: T) { abort 0 }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store.move
new file mode 100644
index 000000000..4562e1d4b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store.move
@@ -0,0 +1,73 @@
+// tests modules can use transfer functions outside of the defining module, if the type
+// has store
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use a::other;
+    use sui::object::UID;
+
+    public fun t(s: other::S) {
+        transfer::public_transfer(s, @0x100)
+    }
+
+    public fun f(s: other::S) {
+        transfer::public_freeze_object(s)
+    }
+
+    public fun s(s: other::S) {
+        transfer::public_share_object(s)
+    }
+
+    public fun r(p: &mut UID, s: Receiving<other::S>): other::S {
+        transfer::public_receive(p, s)
+    }
+}
+
+module a::other {
+    struct S has key, store {
+        id: sui::object::UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store_generic.move b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store_generic.move
new file mode 100644
index 000000000..e4e0f9e7a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/private_generics/public_transfer_with_store_generic.move
@@ -0,0 +1,88 @@
+// tests modules can use transfer functions outside of the defining module, if the type
+// has store.
+
+module a::m {
+    use sui::transfer::{Self, Receiving};
+    use a::other;
+    use sui::object::UID;
+
+    public fun t<T: store>(s: other::S<T>) {
+        transfer::public_transfer(s, @0x100)
+    }
+    public fun t_gen<T: key + store>(s: T) {
+        transfer::public_transfer(s, @0x100)
+    }
+
+    public fun f<T: store>(s: other::S<T>) {
+        transfer::public_freeze_object(s)
+    }
+    public fun f_gen<T: key + store>(s: T) {
+        transfer::public_freeze_object(s)
+    }
+
+    public fun s<T: store>(s: other::S<T>) {
+        transfer::public_share_object(s)
+    }
+    public fun s_gen<T: key + store>(s: T) {
+        transfer::public_share_object(s)
+    }
+
+    public fun r<T: store>(p: &mut UID, s: Receiving<other::S<T>>): other::S<T> {
+        transfer::public_receive(p, s)
+    }
+
+    public fun r_gen<T: key + store>(p: &mut UID, s: Receiving<T>): T {
+        transfer::public_receive(p, s)
+    }
+}
+
+module a::other {
+    struct S<T> has key, store {
+        id: sui::object::UID,
+        value: T,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    use sui::object::UID;
+
+    struct Receiving<phantom T: key> { }
+
+    public fun transfer<T: key>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun public_transfer<T: key + store>(_: T, _: address) {
+        abort 0
+    }
+
+    public fun freeze_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_freeze_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun share_object<T: key>(_: T) {
+        abort 0
+    }
+
+    public fun public_share_object<T: key + store>(_: T) {
+        abort 0
+    }
+
+    public fun receive<T: key>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+
+    public fun public_receive<T: key + store>(_: &mut UID, _: Receiving<T>): T {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.exp
new file mode 100644
index 000000000..055d2d9c4
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.exp
@@ -0,0 +1,8 @@
+error[Sui E02007]: invalid object declaration
+  ┌─ tests/sui_mode/struct_with_key/key_struct_first_field_not_id.move:4:9
+  │
+3 │     struct S has key {
+  │                  --- The 'key' ability is used to declare objects in Sui
+4 │         flag: bool
+  │         ^^^^ Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.move
new file mode 100644
index 000000000..bfeb2bfe2
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_first_field_not_id.move
@@ -0,0 +1,6 @@
+// invalid, first field of an ojbect must be sui::object::UID
+module a::m {
+    struct S has key {
+        flag: bool
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.exp
new file mode 100644
index 000000000..60ec0b43e
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.exp
@@ -0,0 +1,20 @@
+error[Sui E02007]: invalid object declaration
+  ┌─ tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.move:5:9
+  │
+4 │     struct S has key {
+  │                  --- The 'key' ability is used to declare objects in Sui
+5 │         id: UID
+  │         ^^  --- But found type: 'a::object::UID'
+  │         │    
+  │         Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
+error[Sui E02007]: invalid object declaration
+   ┌─ tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.move:13:9
+   │
+12 │     struct S has key {
+   │                  --- The 'key' ability is used to declare objects in Sui
+13 │         id: UID
+   │         ^^  --- But found type: '0x2::object::UID'
+   │         │    
+   │         Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.move
new file mode 100644
index 000000000..842e3877a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_address.move
@@ -0,0 +1,15 @@
+// invalid, the object has a UID field, but not the sui::object::UID
+module a::object {
+    struct UID has store { flag: bool }
+    struct S has key {
+        id: UID
+    }
+}
+
+// TODO we might want to support this
+module 0x2::object {
+    struct UID has store { flag: bool }
+    struct S has key {
+        id: UID
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.exp
new file mode 100644
index 000000000..1c76a8075
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.exp
@@ -0,0 +1,10 @@
+error[Sui E02007]: invalid object declaration
+  ┌─ tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.move:5:9
+  │
+4 │     struct S has key {
+  │                  --- The 'key' ability is used to declare objects in Sui
+5 │         id: object::ID
+  │         ^^  ---------- But found type: 'sui::object::ID'
+  │         │    
+  │         Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.move
new file mode 100644
index 000000000..4204ec559
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_struct_name.move
@@ -0,0 +1,13 @@
+// invalid, objects need UID not ID
+module a::m {
+    use sui::object;
+    struct S has key {
+        id: object::ID
+    }
+}
+
+module sui::object {
+    struct ID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.exp
new file mode 100644
index 000000000..41074849a
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.exp
@@ -0,0 +1,10 @@
+error[Sui E02007]: invalid object declaration
+  ┌─ tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.move:4:9
+  │
+3 │     struct S has key {
+  │                  --- The 'key' ability is used to declare objects in Sui
+4 │         id: bool
+  │         ^^  ---- But found type: 'bool'
+  │         │    
+  │         Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.move
new file mode 100644
index 000000000..461ff9943
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_incorrect_type.move
@@ -0,0 +1,6 @@
+// invalid, id field must have type UID
+module a::m {
+    struct S has key {
+        id: bool
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_valid.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_valid.move
new file mode 100644
index 000000000..8281a48b8
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_id_field_valid.move
@@ -0,0 +1,13 @@
+// valid
+module a::m {
+    use sui::object;
+    struct S has key {
+        id: object::UID
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.exp
new file mode 100644
index 000000000..5dc557584
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.exp
@@ -0,0 +1,16 @@
+error[Sui E02007]: invalid object declaration
+  ┌─ tests/sui_mode/struct_with_key/key_struct_second_field_id.move:6:9
+  │
+5 │     struct S has key {
+  │                  --- The 'key' ability is used to declare objects in Sui
+6 │         flag: bool,
+  │         ^^^^ Invalid object 'S'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
+error[Sui E02007]: invalid object declaration
+   ┌─ tests/sui_mode/struct_with_key/key_struct_second_field_id.move:11:9
+   │
+10 │     struct R has key {
+   │                  --- The 'key' ability is used to declare objects in Sui
+11 │         flag: bool,
+   │         ^^^^ Invalid object 'R'. Structs with the 'key' ability must have 'id: sui::object::UID' as their first field
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.move
new file mode 100644
index 000000000..edb1d4369
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_second_field_id.move
@@ -0,0 +1,20 @@
+// invalid, object must have UID as first field not some other field
+
+module a::m {
+    use sui::object;
+    struct S has key {
+        flag: bool,
+        id: object::UID,
+    }
+
+    struct R has key {
+        flag: bool,
+        id: address,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.exp b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.exp
new file mode 100644
index 000000000..b37a23fad
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.exp
@@ -0,0 +1,12 @@
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/sui_mode/struct_with_key/key_struct_with_drop.move:6:13
+   │
+ 6 │         id: object::UID,
+   │             ^^^^^^^^^^^
+   │             │
+   │             Invalid field type. The struct was declared with the ability 'drop' so all fields require the ability 'drop'
+   │             The type 'sui::object::UID' does not have the ability 'drop'
+   ·
+12 │     struct UID has store {
+   │            --- To satisfy the constraint, the 'drop' ability would need to be added here
+
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.move
new file mode 100644
index 000000000..bd5ac040b
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/key_struct_with_drop.move
@@ -0,0 +1,15 @@
+// invalid, object cannot have drop since UID does not have drop
+
+module a::m {
+    use sui::object;
+    struct S has key, drop {
+        id: object::UID,
+        flag: bool
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/unused_id_field.move b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/unused_id_field.move
new file mode 100644
index 000000000..52a1ea59f
--- /dev/null
+++ b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/unused_id_field.move
@@ -0,0 +1,8 @@
+module a::m {
+    struct Obj has key { id: sui::object::UID }
+}
+
+module sui::object {
+    struct UID has store { value: address }
+    public fun borrow_address(id: &UID): &address { &id.value }
+}
diff --git a/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/unused_id_field.unused b/vendors/move/crates/move-compiler/tests/sui_mode/struct_with_key/unused_id_field.unused
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-core-types/Cargo.toml b/vendors/move/crates/move-core-types/Cargo.toml
new file mode 100644
index 000000000..4bad736df
--- /dev/null
+++ b/vendors/move/crates/move-core-types/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "move-core-types"
+version = "0.0.4"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core types for Move"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = ["crates-io"]
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+hex.workspace = true
+once_cell.workspace = true
+proptest = { workspace = true, optional = true }
+proptest-derive = { workspace = true, optional = true }
+rand.workspace = true
+ref-cast.workspace = true
+serde.workspace = true
+serde_bytes.workspace = true
+primitive-types.workspace = true
+uint.workspace = true
+num.workspace = true
+ethnum.workspace = true
+arbitrary = { workspace = true, optional = true }
+enum-compat-util.workspace = true
+move-proc-macros.workspace = true
+bcs.workspace = true
+
+[dev-dependencies]
+proptest.workspace = true
+proptest-derive.workspace = true
+regex.workspace = true
+serde_json.workspace = true
+arbitrary = { workspace = true, features = ["derive_arbitrary"] }
+
+[features]
+default = []
+fuzzing = ["proptest", "proptest-derive", "arbitrary"]
diff --git a/vendors/move/crates/move-core-types/src/abi.rs b/vendors/move/crates/move-core-types/src/abi.rs
new file mode 100644
index 000000000..7e3cee86f
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/abi.rs
@@ -0,0 +1,197 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::language_storage::{ModuleId, TypeTag};
+use serde::{Deserialize, Serialize};
+
+/// How to call a particular Move script (aka. an "ABI").
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub enum ScriptABI {
+    TransactionScript(TransactionScriptABI),
+    ScriptFunction(ScriptFunctionABI),
+}
+
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ScriptFunctionABI {
+    /// The public name of the script.
+    name: String,
+    /// The module name where the script lives.
+    module_name: ModuleId,
+    /// Some text comment.
+    doc: String,
+    /// The names of the type arguments.
+    ty_args: Vec<TypeArgumentABI>,
+    /// The description of regular arguments.
+    args: Vec<ArgumentABI>,
+}
+
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct TransactionScriptABI {
+    /// The public name of the script.
+    name: String,
+    /// Some text comment.
+    doc: String,
+    /// The `code` value to set in the `Script` object.
+    #[serde(with = "serde_bytes")]
+    code: Vec<u8>,
+    /// The names of the type arguments.
+    ty_args: Vec<TypeArgumentABI>,
+    /// The description of regular arguments.
+    args: Vec<ArgumentABI>,
+}
+
+/// The description of a (regular) argument in a script.
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ArgumentABI {
+    /// The name of the argument.
+    name: String,
+    /// The expected type.
+    /// In Move scripts, this does contain generics type parameters.
+    type_tag: TypeTag,
+}
+
+/// The description of a type argument in a script.
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct TypeArgumentABI {
+    /// The name of the argument.
+    name: String,
+}
+
+impl TransactionScriptABI {
+    pub fn new(
+        name: String,
+        doc: String,
+        code: Vec<u8>,
+        ty_args: Vec<TypeArgumentABI>,
+        args: Vec<ArgumentABI>,
+    ) -> Self {
+        Self {
+            name,
+            doc,
+            code,
+            ty_args,
+            args,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn doc(&self) -> &str {
+        &self.doc
+    }
+
+    pub fn code(&self) -> &[u8] {
+        &self.code
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        &self.ty_args
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        &self.args
+    }
+}
+
+impl ScriptFunctionABI {
+    pub fn new(
+        name: String,
+        module_name: ModuleId,
+        doc: String,
+        ty_args: Vec<TypeArgumentABI>,
+        args: Vec<ArgumentABI>,
+    ) -> Self {
+        Self {
+            name,
+            module_name,
+            doc,
+            ty_args,
+            args,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn module_name(&self) -> &ModuleId {
+        &self.module_name
+    }
+
+    pub fn doc(&self) -> &str {
+        &self.doc
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        &self.ty_args
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        &self.args
+    }
+}
+
+impl ScriptABI {
+    pub fn is_script_fun_abi(&self) -> bool {
+        matches!(self, Self::ScriptFunction(_))
+    }
+
+    pub fn is_transaction_script_abi(&self) -> bool {
+        matches!(self, Self::TransactionScript(_))
+    }
+
+    pub fn name(&self) -> &str {
+        match self {
+            Self::TransactionScript(abi) => abi.name(),
+            Self::ScriptFunction(abi) => abi.name(),
+        }
+    }
+
+    pub fn doc(&self) -> &str {
+        match self {
+            Self::TransactionScript(abi) => abi.doc(),
+            Self::ScriptFunction(abi) => abi.doc(),
+        }
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        match self {
+            Self::TransactionScript(abi) => abi.ty_args(),
+            Self::ScriptFunction(abi) => abi.ty_args(),
+        }
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        match self {
+            Self::TransactionScript(abi) => abi.args(),
+            Self::ScriptFunction(abi) => abi.args(),
+        }
+    }
+}
+
+impl ArgumentABI {
+    pub fn new(name: String, type_tag: TypeTag) -> Self {
+        Self { name, type_tag }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn type_tag(&self) -> &TypeTag {
+        &self.type_tag
+    }
+}
+
+impl TypeArgumentABI {
+    pub fn new(name: String) -> Self {
+        Self { name }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/account_address.rs b/vendors/move/crates/move-core-types/src/account_address.rs
new file mode 100644
index 000000000..d2507d8a9
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/account_address.rs
@@ -0,0 +1,482 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex::FromHex;
+use rand::{rngs::OsRng, Rng};
+use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
+use std::{convert::TryFrom, fmt, str::FromStr};
+
+use crate::gas_algebra::AbstractMemorySize;
+
+/// A struct that represents an account address.
+#[derive(Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
+pub struct AccountAddress([u8; AccountAddress::LENGTH]);
+
+impl AccountAddress {
+    pub const fn new(address: [u8; Self::LENGTH]) -> Self {
+        Self(address)
+    }
+
+    /// The number of bytes in an address.
+    pub const LENGTH: usize = 32;
+
+    /// Hex address: 0x0
+    pub const ZERO: Self = Self([0u8; Self::LENGTH]);
+
+    /// Hex address: 0x1
+    pub const ONE: Self = Self::get_hex_address_one();
+
+    /// Hex address: 0x2
+    pub const TWO: Self = Self::get_hex_address_two();
+
+    const fn get_hex_address_one() -> Self {
+        let mut addr = [0u8; AccountAddress::LENGTH];
+        addr[AccountAddress::LENGTH - 1] = 1u8;
+        Self(addr)
+    }
+
+    const fn get_hex_address_two() -> Self {
+        let mut addr = [0u8; AccountAddress::LENGTH];
+        addr[AccountAddress::LENGTH - 1] = 2u8;
+        Self(addr)
+    }
+
+    pub fn random() -> Self {
+        let mut rng = OsRng;
+        let buf: [u8; Self::LENGTH] = rng.gen();
+        Self(buf)
+    }
+
+    /// Return a canonical string representation of the address
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// e.g., 0000000000000000000000000000000a, *not* 0x0000000000000000000000000000000a, 0xa, or 0xA
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM.
+    /// However, one can pass with_prefix=true to get its representation with the 0x prefix.
+    pub fn to_canonical_string(&self, with_prefix: bool) -> String {
+        self.to_canonical_display(with_prefix).to_string()
+    }
+
+    /// Implements Display for the address, with the prefix 0x if with_prefix is true.
+    pub fn to_canonical_display(&self, with_prefix: bool) -> impl fmt::Display + '_ {
+        struct HexDisplay<'a> {
+            data: &'a [u8],
+            with_prefix: bool,
+        }
+
+        impl<'a> fmt::Display for HexDisplay<'a> {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                if self.with_prefix {
+                    write!(f, "0x{}", hex::encode(self.data))
+                } else {
+                    write!(f, "{}", hex::encode(self.data))
+                }
+            }
+        }
+        HexDisplay {
+            data: &self.0,
+            with_prefix,
+        }
+    }
+
+    pub fn short_str_lossless(&self) -> String {
+        let hex_str = hex::encode(self.0).trim_start_matches('0').to_string();
+        if hex_str.is_empty() {
+            "0".to_string()
+        } else {
+            hex_str
+        }
+    }
+
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.0.to_vec()
+    }
+
+    pub fn into_bytes(self) -> [u8; Self::LENGTH] {
+        self.0
+    }
+
+    pub fn from_hex_literal(literal: &str) -> Result<Self, AccountAddressParseError> {
+        if !literal.starts_with("0x") {
+            return Err(AccountAddressParseError);
+        }
+
+        let hex_len = literal.len() - 2;
+
+        // If the string is too short, pad it
+        if hex_len < Self::LENGTH * 2 {
+            let mut hex_str = String::with_capacity(Self::LENGTH * 2);
+            for _ in 0..Self::LENGTH * 2 - hex_len {
+                hex_str.push('0');
+            }
+            hex_str.push_str(&literal[2..]);
+            AccountAddress::from_hex(hex_str)
+        } else {
+            AccountAddress::from_hex(&literal[2..])
+        }
+    }
+
+    pub fn to_hex_literal(&self) -> String {
+        format!("0x{}", self.short_str_lossless())
+    }
+
+    pub fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self, AccountAddressParseError> {
+        <[u8; Self::LENGTH]>::from_hex(hex)
+            .map_err(|_| AccountAddressParseError)
+            .map(Self)
+    }
+
+    pub fn to_hex(&self) -> String {
+        format!("{:x}", self)
+    }
+
+    pub fn from_bytes<T: AsRef<[u8]>>(bytes: T) -> Result<Self, AccountAddressParseError> {
+        <[u8; Self::LENGTH]>::try_from(bytes.as_ref())
+            .map_err(|_| AccountAddressParseError)
+            .map(Self)
+    }
+
+    /// TODO (ade): use macro to enfornce determinism
+    pub fn abstract_size_for_gas_metering(&self) -> AbstractMemorySize {
+        AbstractMemorySize::new(Self::LENGTH as u64)
+    }
+}
+
+impl AsRef<[u8]> for AccountAddress {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
+
+impl std::ops::Deref for AccountAddress {
+    type Target = [u8; Self::LENGTH];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl fmt::Display for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{:x}", self)
+    }
+}
+
+impl fmt::Debug for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:x}", self)
+    }
+}
+
+impl fmt::LowerHex for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "0x")?;
+        }
+
+        for byte in &self.0 {
+            write!(f, "{:02x}", byte)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl fmt::UpperHex for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "0x")?;
+        }
+
+        for byte in &self.0 {
+            write!(f, "{:02X}", byte)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl From<[u8; AccountAddress::LENGTH]> for AccountAddress {
+    fn from(bytes: [u8; AccountAddress::LENGTH]) -> Self {
+        Self::new(bytes)
+    }
+}
+
+impl TryFrom<&[u8]> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    /// Tries to convert the provided byte array into Address.
+    fn try_from(bytes: &[u8]) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_bytes(bytes)
+    }
+}
+
+impl TryFrom<Vec<u8>> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    /// Tries to convert the provided byte buffer into Address.
+    fn try_from(bytes: Vec<u8>) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_bytes(bytes)
+    }
+}
+
+impl From<AccountAddress> for Vec<u8> {
+    fn from(addr: AccountAddress) -> Vec<u8> {
+        addr.0.to_vec()
+    }
+}
+
+impl From<&AccountAddress> for Vec<u8> {
+    fn from(addr: &AccountAddress) -> Vec<u8> {
+        addr.0.to_vec()
+    }
+}
+
+impl From<AccountAddress> for [u8; AccountAddress::LENGTH] {
+    fn from(addr: AccountAddress) -> Self {
+        addr.0
+    }
+}
+
+impl From<&AccountAddress> for [u8; AccountAddress::LENGTH] {
+    fn from(addr: &AccountAddress) -> Self {
+        addr.0
+    }
+}
+
+impl From<&AccountAddress> for String {
+    fn from(addr: &AccountAddress) -> String {
+        ::hex::encode(addr.as_ref())
+    }
+}
+
+impl TryFrom<String> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    fn try_from(s: String) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_hex(s)
+    }
+}
+
+impl FromStr for AccountAddress {
+    type Err = AccountAddressParseError;
+
+    fn from_str(s: &str) -> Result<Self, AccountAddressParseError> {
+        // Accept 0xADDRESS or ADDRESS
+        if let Ok(address) = AccountAddress::from_hex_literal(s) {
+            Ok(address)
+        } else {
+            Self::from_hex(s)
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for AccountAddress {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        if deserializer.is_human_readable() {
+            let s = <String>::deserialize(deserializer)?;
+            AccountAddress::from_str(&s).map_err(D::Error::custom)
+        } else {
+            // In order to preserve the Serde data model and help analysis tools,
+            // make sure to wrap our value in a container with the same name
+            // as the original type.
+            #[derive(::serde::Deserialize)]
+            #[serde(rename = "AccountAddress")]
+            struct Value([u8; AccountAddress::LENGTH]);
+
+            let value = Value::deserialize(deserializer)?;
+            Ok(AccountAddress::new(value.0))
+        }
+    }
+}
+
+impl Serialize for AccountAddress {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if serializer.is_human_readable() {
+            self.to_hex().serialize(serializer)
+        } else {
+            // See comment in deserialize.
+            serializer.serialize_newtype_struct("AccountAddress", &self.0)
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct AccountAddressParseError;
+
+impl fmt::Display for AccountAddressParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "Unable to parse AccountAddress (must be hex string of length {})",
+            AccountAddress::LENGTH
+        )
+    }
+}
+
+impl std::error::Error for AccountAddressParseError {}
+
+#[cfg(test)]
+mod tests {
+    use super::AccountAddress;
+    use crate::gas_algebra::AbstractMemorySize;
+    use hex::FromHex;
+    use proptest::prelude::*;
+    use std::{
+        convert::{AsRef, TryFrom},
+        str::FromStr,
+    };
+
+    #[test]
+    fn test_display_impls() {
+        let hex = "1234567890abcdef1234567890abcdefca843279e3427144cead5e4d5999a3d0";
+        let upper_hex = "1234567890ABCDEF1234567890ABCDEFCA843279E3427144CEAD5E4D5999A3D0";
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(format!("{}", address), hex);
+        assert_eq!(format!("{:?}", address), hex);
+        assert_eq!(format!("{:X}", address), upper_hex);
+        assert_eq!(format!("{:x}", address), hex);
+
+        assert_eq!(format!("{:#x}", address), format!("0x{}", hex));
+        assert_eq!(format!("{:#X}", address), format!("0x{}", upper_hex));
+    }
+
+    #[test]
+    fn test_short_str_lossless() {
+        let address = AccountAddress::from_hex(
+            "1234567890abcdef1234567890abcdef00c0f1f95c5b1c5f0eda533eff269000",
+        )
+        .unwrap();
+
+        assert_eq!(
+            address.short_str_lossless(),
+            "1234567890abcdef1234567890abcdef00c0f1f95c5b1c5f0eda533eff269000",
+        );
+    }
+
+    #[test]
+    fn test_short_str_lossless_zero() {
+        let address = AccountAddress::from_hex(
+            "0000000000000000000000000000000000000000000000000000000000000000",
+        )
+        .unwrap();
+
+        assert_eq!(address.short_str_lossless(), "0");
+    }
+
+    #[test]
+    fn test_address() {
+        let hex = "1234567890abcdef1234567890abcdefca843279e3427144cead5e4d5999a3d0";
+        let bytes = Vec::from_hex(hex).expect("You must provide a valid Hex format");
+
+        assert_eq!(
+            bytes.len(),
+            AccountAddress::LENGTH,
+            "Address {:?} is not {}-bytes long. Addresses must be {} bytes",
+            bytes,
+            AccountAddress::LENGTH,
+            AccountAddress::LENGTH,
+        );
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(address.as_ref().to_vec(), bytes);
+    }
+
+    #[test]
+    fn test_from_hex_literal() {
+        let hex_literal = "0x1";
+        let hex = "0000000000000000000000000000000000000000000000000000000000000001";
+
+        let address_from_literal = AccountAddress::from_hex_literal(hex_literal).unwrap();
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(address_from_literal, address);
+        assert_eq!(hex_literal, address.to_hex_literal());
+
+        // Missing '0x'
+        AccountAddress::from_hex_literal(hex).unwrap_err();
+        // Too long
+        AccountAddress::from_hex_literal(
+            "0x10000000000000000000000000000000000000000000000000000000000000001",
+        )
+        .unwrap_err();
+    }
+
+    #[test]
+    fn test_ref() {
+        let address = AccountAddress::new([1u8; AccountAddress::LENGTH]);
+        let _: &[u8] = address.as_ref();
+    }
+
+    #[test]
+    fn test_address_from_proto_invalid_length() {
+        let bytes = vec![1; 123];
+        AccountAddress::from_bytes(bytes).unwrap_err();
+    }
+
+    #[test]
+    fn test_deserialize_from_json_value() {
+        let address = AccountAddress::random();
+        let json_value = serde_json::to_value(address).expect("serde_json::to_value fail.");
+        let address2: AccountAddress =
+            serde_json::from_value(json_value).expect("serde_json::from_value fail.");
+        assert_eq!(address, address2)
+    }
+
+    #[test]
+    fn test_serde_json() {
+        let hex = "1234567890abcdef1234567890abcdefca843279e3427144cead5e4d5999a3d0";
+        let json_hex = "\"1234567890abcdef1234567890abcdefca843279e3427144cead5e4d5999a3d0\"";
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        let json = serde_json::to_string(&address).unwrap();
+        let json_address: AccountAddress = serde_json::from_str(json_hex).unwrap();
+
+        assert_eq!(json, json_hex);
+        assert_eq!(address, json_address);
+    }
+
+    #[test]
+    fn test_address_from_empty_string() {
+        assert!(AccountAddress::try_from("".to_string()).is_err());
+        assert!(AccountAddress::from_str("").is_err());
+    }
+
+    #[test]
+    fn test_abstract_size() {
+        assert_eq!(
+            AccountAddress::random().abstract_size_for_gas_metering(),
+            AbstractMemorySize::new(AccountAddress::LENGTH as u64)
+        );
+    }
+
+    proptest! {
+        #[test]
+        fn test_address_string_roundtrip(addr in any::<AccountAddress>()) {
+            let s = String::from(&addr);
+            let addr2 = AccountAddress::try_from(s).expect("roundtrip to string should work");
+            prop_assert_eq!(addr, addr2);
+        }
+
+        #[test]
+        fn test_address_protobuf_roundtrip(addr in any::<AccountAddress>()) {
+            let bytes = addr.to_vec();
+            prop_assert_eq!(bytes.clone(), addr.as_ref());
+            let addr2 = AccountAddress::try_from(&bytes[..]).unwrap();
+            prop_assert_eq!(addr, addr2);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/annotated_value.rs b/vendors/move/crates/move-core-types/src/annotated_value.rs
new file mode 100644
index 000000000..d25c87d66
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/annotated_value.rs
@@ -0,0 +1,433 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    fmt_list,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    runtime_value as R, u256,
+};
+use anyhow::Result as AResult;
+use serde::{
+    de::Error as DeError,
+    ser::{SerializeMap, SerializeSeq, SerializeStruct},
+    Deserialize, Serialize,
+};
+use std::{
+    convert::From,
+    fmt::{self, Debug},
+};
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this name
+pub const MOVE_STRUCT_NAME: &str = "struct";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the first field
+pub const MOVE_STRUCT_TYPE: &str = "type";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the second field
+pub const MOVE_STRUCT_FIELDS: &str = "fields";
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct MoveStruct {
+    pub type_: StructTag,
+    pub fields: Vec<(Identifier, MoveValue)>,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum MoveValue {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Bool(bool),
+    Address(AccountAddress),
+    Vector(Vec<MoveValue>),
+    Struct(MoveStruct),
+    Signer(AccountAddress),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MoveFieldLayout {
+    pub name: Identifier,
+    pub layout: MoveTypeLayout,
+}
+
+impl MoveFieldLayout {
+    pub fn new(name: Identifier, layout: MoveTypeLayout) -> Self {
+        Self { name, layout }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MoveStructLayout {
+    /// An decorated representation with both types and human-readable field names
+    pub type_: StructTag,
+    pub fields: Vec<MoveFieldLayout>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum MoveTypeLayout {
+    #[serde(rename(serialize = "bool", deserialize = "bool"))]
+    Bool,
+    #[serde(rename(serialize = "u8", deserialize = "u8"))]
+    U8,
+    #[serde(rename(serialize = "u64", deserialize = "u64"))]
+    U64,
+    #[serde(rename(serialize = "u128", deserialize = "u128"))]
+    U128,
+    #[serde(rename(serialize = "address", deserialize = "address"))]
+    Address,
+    #[serde(rename(serialize = "vector", deserialize = "vector"))]
+    Vector(Box<MoveTypeLayout>),
+    #[serde(rename(serialize = "struct", deserialize = "struct"))]
+    Struct(MoveStructLayout),
+    #[serde(rename(serialize = "signer", deserialize = "signer"))]
+    Signer,
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename(serialize = "u16", deserialize = "u16"))]
+    U16,
+    #[serde(rename(serialize = "u32", deserialize = "u32"))]
+    U32,
+    #[serde(rename(serialize = "u256", deserialize = "u256"))]
+    U256,
+}
+
+impl MoveValue {
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveTypeLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn simple_serialize(&self) -> Option<Vec<u8>> {
+        bcs::to_bytes(self).ok()
+    }
+
+    pub fn undecorate(self) -> R::MoveValue {
+        match self {
+            Self::Struct(s) => R::MoveValue::Struct(s.undecorate()),
+            Self::Vector(vals) => {
+                R::MoveValue::Vector(vals.into_iter().map(MoveValue::undecorate).collect())
+            }
+            MoveValue::U8(u) => R::MoveValue::U8(u),
+            MoveValue::U64(u) => R::MoveValue::U64(u),
+            MoveValue::U128(u) => R::MoveValue::U128(u),
+            MoveValue::Bool(b) => R::MoveValue::Bool(b),
+            MoveValue::Address(a) => R::MoveValue::Address(a),
+            MoveValue::Signer(s) => R::MoveValue::Signer(s),
+            MoveValue::U16(u) => R::MoveValue::U16(u),
+            MoveValue::U32(u) => R::MoveValue::U32(u),
+            MoveValue::U256(u) => R::MoveValue::U256(u),
+        }
+    }
+}
+
+pub fn serialize_values<'a, I>(vals: I) -> Vec<Vec<u8>>
+where
+    I: IntoIterator<Item = &'a MoveValue>,
+{
+    vals.into_iter()
+        .map(|val| {
+            val.simple_serialize()
+                .expect("serialization should succeed")
+        })
+        .collect()
+}
+
+impl MoveStruct {
+    pub fn new(type_: StructTag, fields: Vec<(Identifier, MoveValue)>) -> Self {
+        Self { type_, fields }
+    }
+
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveStructLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn into_fields(self) -> Vec<MoveValue> {
+        self.fields.into_iter().map(|(_, f)| f).collect()
+    }
+
+    pub fn undecorate(self) -> R::MoveStruct {
+        R::MoveStruct(
+            self.into_fields()
+                .into_iter()
+                .map(MoveValue::undecorate)
+                .collect(),
+        )
+    }
+}
+
+impl MoveStructLayout {
+    pub fn new(type_: StructTag, fields: Vec<MoveFieldLayout>) -> Self {
+        Self { type_, fields }
+    }
+
+    pub fn into_fields(self) -> Vec<MoveTypeLayout> {
+        self.fields.into_iter().map(|f| f.layout).collect()
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveTypeLayout {
+    type Value = MoveValue;
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        match self {
+            MoveTypeLayout::Bool => bool::deserialize(deserializer).map(MoveValue::Bool),
+            MoveTypeLayout::U8 => u8::deserialize(deserializer).map(MoveValue::U8),
+            MoveTypeLayout::U16 => u16::deserialize(deserializer).map(MoveValue::U16),
+            MoveTypeLayout::U32 => u32::deserialize(deserializer).map(MoveValue::U32),
+            MoveTypeLayout::U64 => u64::deserialize(deserializer).map(MoveValue::U64),
+            MoveTypeLayout::U128 => u128::deserialize(deserializer).map(MoveValue::U128),
+            MoveTypeLayout::U256 => u256::U256::deserialize(deserializer).map(MoveValue::U256),
+            MoveTypeLayout::Address => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Address)
+            }
+            MoveTypeLayout::Signer => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Signer)
+            }
+            MoveTypeLayout::Struct(ty) => Ok(MoveValue::Struct(ty.deserialize(deserializer)?)),
+            MoveTypeLayout::Vector(layout) => Ok(MoveValue::Vector(
+                deserializer.deserialize_seq(VectorElementVisitor(layout))?,
+            )),
+        }
+    }
+}
+
+struct VectorElementVisitor<'a>(&'a MoveTypeLayout);
+
+impl<'d, 'a> serde::de::Visitor<'d> for VectorElementVisitor<'a> {
+    type Value = Vec<MoveValue>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Vector")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        while let Some(elem) = seq.next_element_seed(self.0)? {
+            vals.push(elem)
+        }
+        Ok(vals)
+    }
+}
+
+struct DecoratedStructFieldVisitor<'a>(&'a [MoveFieldLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for DecoratedStructFieldVisitor<'a> {
+    type Value = Vec<(Identifier, MoveValue)>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        for (i, layout) in self.0.iter().enumerate() {
+            match seq.next_element_seed(layout)? {
+                Some(elem) => vals.push(elem),
+                None => return Err(A::Error::invalid_length(i, &self)),
+            }
+        }
+        Ok(vals)
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveFieldLayout {
+    type Value = (Identifier, MoveValue);
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        Ok((self.name.clone(), self.layout.deserialize(deserializer)?))
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveStructLayout {
+    type Value = MoveStruct;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        let fields = deserializer
+            .deserialize_tuple(self.fields.len(), DecoratedStructFieldVisitor(&self.fields))?;
+        Ok(MoveStruct {
+            type_: self.type_.clone(),
+            fields,
+        })
+    }
+}
+
+impl serde::Serialize for MoveValue {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match self {
+            MoveValue::Struct(s) => s.serialize(serializer),
+            MoveValue::Bool(b) => serializer.serialize_bool(*b),
+            MoveValue::U8(i) => serializer.serialize_u8(*i),
+            MoveValue::U16(i) => serializer.serialize_u16(*i),
+            MoveValue::U32(i) => serializer.serialize_u32(*i),
+            MoveValue::U64(i) => serializer.serialize_u64(*i),
+            MoveValue::U128(i) => serializer.serialize_u128(*i),
+            MoveValue::U256(i) => i.serialize(serializer),
+            MoveValue::Address(a) => a.serialize(serializer),
+            MoveValue::Signer(a) => a.serialize(serializer),
+            MoveValue::Vector(v) => {
+                let mut t = serializer.serialize_seq(Some(v.len()))?;
+                for val in v {
+                    t.serialize_element(val)?;
+                }
+                t.end()
+            }
+        }
+    }
+}
+
+struct MoveFields<'a>(&'a [(Identifier, MoveValue)]);
+
+impl<'a> serde::Serialize for MoveFields<'a> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut t = serializer.serialize_map(Some(self.0.len()))?;
+        for (f, v) in self.0.iter() {
+            t.serialize_entry(f, v)?;
+        }
+        t.end()
+    }
+}
+
+impl serde::Serialize for MoveStruct {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        // Serialize a Move struct as Serde struct type named `struct `with two fields named `type` and `fields`.
+        // `fields` will get serialized as a Serde map.
+        // Unfortunately, we can't serialize this in the logical way: as a Serde struct named `type` with a field for
+        // each of `fields` because serde insists that struct and field names be `'static &str`'s
+        let mut t = serializer.serialize_struct(MOVE_STRUCT_NAME, 2)?;
+        // serialize type as string (e.g., 0x0::ModuleName::StructName<TypeArg1,TypeArg2>) instead of (e.g.
+        // { address: 0x0...0, module: ModuleName, name: StructName, type_args: [TypeArg1, TypeArg2]})
+        t.serialize_field(MOVE_STRUCT_TYPE, &self.type_.to_string())?;
+        t.serialize_field(MOVE_STRUCT_FIELDS, &MoveFields(&self.fields))?;
+        t.end()
+    }
+}
+
+impl fmt::Display for MoveTypeLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use MoveTypeLayout::*;
+        match self {
+            Bool => write!(f, "bool"),
+            U8 => write!(f, "u8"),
+            U16 => write!(f, "u16"),
+            U32 => write!(f, "u32"),
+            U64 => write!(f, "u64"),
+            U128 => write!(f, "u128"),
+            U256 => write!(f, "u256"),
+            Address => write!(f, "address"),
+            Signer => write!(f, "signer"),
+            Vector(typ) if f.alternate() => write!(f, "vector<{typ:#}>"),
+            Vector(typ) => write!(f, "vector<{typ}>"),
+            Struct(s) if f.alternate() => write!(f, "{s:#}"),
+            Struct(s) => write!(f, "{s}"),
+        }
+    }
+}
+
+/// Helper type that uses `T`'s `Display` implementation as its own `Debug` implementation, to allow
+/// other `Display` implementations in this module to take advantage of the structured formatting
+/// helpers that Rust uses for its own debug types.
+struct DebugAsDisplay<'a, T>(&'a T);
+impl<'a, T: fmt::Display> fmt::Debug for DebugAsDisplay<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "{:#}", self.0)
+        } else {
+            write!(f, "{}", self.0)
+        }
+    }
+}
+
+impl fmt::Display for MoveStructLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use DebugAsDisplay as DD;
+        write!(f, "struct ")?;
+        write!(f, "{} ", self.type_)?;
+        let mut map = f.debug_map();
+        for field in &self.fields {
+            map.entry(&DD(&field.name), &DD(&field.layout));
+        }
+        map.finish()
+    }
+}
+
+impl From<&MoveTypeLayout> for TypeTag {
+    fn from(val: &MoveTypeLayout) -> TypeTag {
+        match val {
+            MoveTypeLayout::Address => TypeTag::Address,
+            MoveTypeLayout::Bool => TypeTag::Bool,
+            MoveTypeLayout::U8 => TypeTag::U8,
+            MoveTypeLayout::U16 => TypeTag::U16,
+            MoveTypeLayout::U32 => TypeTag::U32,
+            MoveTypeLayout::U64 => TypeTag::U64,
+            MoveTypeLayout::U128 => TypeTag::U128,
+            MoveTypeLayout::U256 => TypeTag::U256,
+            MoveTypeLayout::Signer => TypeTag::Signer,
+            MoveTypeLayout::Vector(v) => {
+                let inner_type = &**v;
+                TypeTag::Vector(Box::new(inner_type.into()))
+            }
+            MoveTypeLayout::Struct(v) => TypeTag::Struct(Box::new(v.into())),
+        }
+    }
+}
+
+impl From<&MoveStructLayout> for StructTag {
+    fn from(val: &MoveStructLayout) -> StructTag {
+        val.type_.clone()
+    }
+}
+
+impl fmt::Display for MoveValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            MoveValue::U8(u) => write!(f, "{}u8", u),
+            MoveValue::U16(u) => write!(f, "{}u16", u),
+            MoveValue::U32(u) => write!(f, "{}u32", u),
+            MoveValue::U64(u) => write!(f, "{}u64", u),
+            MoveValue::U128(u) => write!(f, "{}u128", u),
+            MoveValue::U256(u) => write!(f, "{}u256", u),
+            MoveValue::Bool(false) => write!(f, "false"),
+            MoveValue::Bool(true) => write!(f, "true"),
+            MoveValue::Address(a) => write!(f, "{}", a.to_hex_literal()),
+            MoveValue::Signer(a) => write!(f, "signer({})", a.to_hex_literal()),
+            MoveValue::Vector(v) => fmt_list(f, "vector[", v, "]"),
+            MoveValue::Struct(s) => fmt::Display::fmt(s, f),
+        }
+    }
+}
+
+impl fmt::Display for MoveStruct {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&self.type_, f)?;
+        fmt_list(f, " {", self.fields.iter().map(DisplayFieldBinding), "}")
+    }
+}
+
+struct DisplayFieldBinding<'a>(&'a (Identifier, MoveValue));
+
+impl fmt::Display for DisplayFieldBinding<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let DisplayFieldBinding((field, value)) = self;
+        write!(f, "{}: {}", field, value)
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/effects.rs b/vendors/move/crates/move-core-types/src/effects.rs
new file mode 100644
index 000000000..7bec071e3
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/effects.rs
@@ -0,0 +1,298 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use anyhow::{bail, Result};
+use std::collections::btree_map::{self, BTreeMap};
+
+/// A storage operation.
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Op<T> {
+    /// Inserts some new data into an empty slot.
+    New(T),
+    /// Modifies some data that currently exists.
+    Modify(T),
+    /// Deletes some data that currently exists.
+    Delete,
+}
+
+impl<T> Op<T> {
+    pub fn as_ref(&self) -> Op<&T> {
+        use Op::*;
+
+        match self {
+            New(data) => New(data),
+            Modify(data) => Modify(data),
+            Delete => Delete,
+        }
+    }
+
+    pub fn map<F, U>(self, f: F) -> Op<U>
+    where
+        F: FnOnce(T) -> U,
+    {
+        use Op::*;
+
+        match self {
+            New(data) => New(f(data)),
+            Modify(data) => Modify(f(data)),
+            Delete => Delete,
+        }
+    }
+
+    pub fn ok(self) -> Option<T> {
+        use Op::*;
+
+        match self {
+            New(data) | Modify(data) => Some(data),
+            Delete => None,
+        }
+    }
+}
+
+/// A collection of resource and module operations on a Move account.
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct AccountChangeSet {
+    modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+    resources: BTreeMap<StructTag, Op<Vec<u8>>>,
+}
+
+/// This implements an algorithm to squash two change sets together by merging pairs of operations
+/// on the same item together. This is similar to squashing two commits in a version control system.
+///
+/// It should be noted that all operation types have some implied pre and post conditions:
+///   - New
+///     - before: data doesn't exist
+///     - after: data exists (new)
+///   - Modify
+///     - before: data exists
+///     - after: data exists (modified)
+///   - Delete
+///     - before: data exists
+///     - after: data does not exist (deleted)
+///
+/// It is possible to have a pair of operations resulting in conflicting states, in which case the
+/// squash will fail.
+fn squash<K, V>(map: &mut BTreeMap<K, Op<V>>, other: BTreeMap<K, Op<V>>) -> Result<()>
+where
+    K: Ord,
+{
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (key, op) in other.into_iter() {
+        match map.entry(key) {
+            Occupied(mut entry) => {
+                let r = entry.get_mut();
+                match (r.as_ref(), op) {
+                    (Modify(_) | New(_), New(_)) | (Delete, Delete | Modify(_)) => {
+                        bail!("The given change sets cannot be squashed")
+                    }
+                    (Modify(_), Modify(data)) => *r = Modify(data),
+                    (New(_), Modify(data)) => *r = New(data),
+                    (Modify(_), Delete) => *r = Delete,
+                    (Delete, New(data)) => *r = Modify(data),
+                    (New(_), Delete) => {
+                        entry.remove();
+                    }
+                }
+            }
+            Vacant(entry) => {
+                entry.insert(op);
+            }
+        }
+    }
+
+    Ok(())
+}
+
+impl AccountChangeSet {
+    pub fn from_modules_resources(
+        modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+        resources: BTreeMap<StructTag, Op<Vec<u8>>>,
+    ) -> Self {
+        Self { modules, resources }
+    }
+
+    pub fn new() -> Self {
+        Self {
+            modules: BTreeMap::new(),
+            resources: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_module_op(&mut self, name: Identifier, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.modules.entry(name) {
+            Occupied(entry) => bail!("Module {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn add_resource_op(&mut self, struct_tag: StructTag, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.resources.entry(struct_tag) {
+            Occupied(entry) => bail!("Resource {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn into_inner(
+        self,
+    ) -> (
+        BTreeMap<Identifier, Op<Vec<u8>>>,
+        BTreeMap<StructTag, Op<Vec<u8>>>,
+    ) {
+        (self.modules, self.resources)
+    }
+
+    pub fn into_resources(self) -> BTreeMap<StructTag, Op<Vec<u8>>> {
+        self.resources
+    }
+
+    pub fn into_modules(self) -> BTreeMap<Identifier, Op<Vec<u8>>> {
+        self.modules
+    }
+
+    pub fn modules(&self) -> &BTreeMap<Identifier, Op<Vec<u8>>> {
+        &self.modules
+    }
+
+    pub fn resources(&self) -> &BTreeMap<StructTag, Op<Vec<u8>>> {
+        &self.resources
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.modules.is_empty() && self.resources.is_empty()
+    }
+
+    pub fn squash(&mut self, other: Self) -> Result<()> {
+        squash(&mut self.modules, other.modules)?;
+        squash(&mut self.resources, other.resources)
+    }
+}
+
+// TODO: ChangeSet does not have a canonical representation so the derived Ord is not sound.
+
+/// A collection of changes to a Move state. Each AccountChangeSet in the domain of `accounts`
+/// is guaranteed to be nonempty
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct ChangeSet {
+    accounts: BTreeMap<AccountAddress, AccountChangeSet>,
+}
+
+impl ChangeSet {
+    pub fn new() -> Self {
+        Self {
+            accounts: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_account_changeset(
+        &mut self,
+        addr: AccountAddress,
+        account_changeset: AccountChangeSet,
+    ) -> Result<()> {
+        match self.accounts.entry(addr) {
+            btree_map::Entry::Occupied(_) => bail!(
+                "Failed to add account change set. Account {} already exists.",
+                addr
+            ),
+            btree_map::Entry::Vacant(entry) => {
+                entry.insert(account_changeset);
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn accounts(&self) -> &BTreeMap<AccountAddress, AccountChangeSet> {
+        &self.accounts
+    }
+
+    pub fn into_inner(self) -> BTreeMap<AccountAddress, AccountChangeSet> {
+        self.accounts
+    }
+
+    fn get_or_insert_account_changeset(&mut self, addr: AccountAddress) -> &mut AccountChangeSet {
+        match self.accounts.entry(addr) {
+            btree_map::Entry::Occupied(entry) => entry.into_mut(),
+            btree_map::Entry::Vacant(entry) => entry.insert(AccountChangeSet::new()),
+        }
+    }
+
+    pub fn add_module_op(&mut self, module_id: ModuleId, op: Op<Vec<u8>>) -> Result<()> {
+        let account = self.get_or_insert_account_changeset(*module_id.address());
+        account.add_module_op(module_id.name().to_owned(), op)
+    }
+
+    pub fn add_resource_op(
+        &mut self,
+        addr: AccountAddress,
+        struct_tag: StructTag,
+        op: Op<Vec<u8>>,
+    ) -> Result<()> {
+        let account = self.get_or_insert_account_changeset(addr);
+        account.add_resource_op(struct_tag, op)
+    }
+
+    pub fn squash(&mut self, other: Self) -> Result<()> {
+        for (addr, other_account_changeset) in other.accounts {
+            match self.accounts.entry(addr) {
+                btree_map::Entry::Occupied(mut entry) => {
+                    entry.get_mut().squash(other_account_changeset)?;
+                }
+                btree_map::Entry::Vacant(entry) => {
+                    entry.insert(other_account_changeset);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn into_modules(self) -> impl Iterator<Item = (ModuleId, Op<Vec<u8>>)> {
+        self.accounts.into_iter().flat_map(|(addr, account)| {
+            account
+                .modules
+                .into_iter()
+                .map(move |(module_name, blob_opt)| (ModuleId::new(addr, module_name), blob_opt))
+        })
+    }
+
+    pub fn modules(&self) -> impl Iterator<Item = (AccountAddress, &Identifier, Op<&[u8]>)> {
+        self.accounts.iter().flat_map(|(addr, account)| {
+            let addr = *addr;
+            account
+                .modules
+                .iter()
+                .map(move |(module_name, op)| (addr, module_name, op.as_ref().map(|v| v.as_ref())))
+        })
+    }
+
+    pub fn resources(&self) -> impl Iterator<Item = (AccountAddress, &StructTag, Op<&[u8]>)> {
+        self.accounts.iter().flat_map(|(addr, account)| {
+            let addr = *addr;
+            account
+                .resources
+                .iter()
+                .map(move |(struct_tag, op)| (addr, struct_tag, op.as_ref().map(|v| v.as_ref())))
+        })
+    }
+}
+
+pub type Event = (Vec<u8>, u64, TypeTag, Vec<u8>);
diff --git a/vendors/move/crates/move-core-types/src/errmap.rs b/vendors/move/crates/move-core-types/src/errmap.rs
new file mode 100644
index 000000000..19b9d4935
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/errmap.rs
@@ -0,0 +1,79 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::language_storage::ModuleId;
+use anyhow::{bail, Result};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::BTreeMap,
+    fs::File,
+    io::{Read, Write},
+    path::Path,
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ErrorDescription {
+    /// The constant name of error e.g., ECANT_PAY_DEPOSIT
+    pub code_name: String,
+    /// The code description. This is generated from the doc comments on the constant.
+    pub code_description: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct ErrorMapping {
+    /// The set of error categories and their descriptions
+    pub error_categories: BTreeMap<u64, ErrorDescription>,
+    /// The set of modules, and the module-specific errors
+    pub module_error_maps: BTreeMap<ModuleId, BTreeMap<u64, ErrorDescription>>,
+}
+
+impl ErrorMapping {
+    pub fn add_error_category(
+        &mut self,
+        category_id: u64,
+        description: ErrorDescription,
+    ) -> Result<()> {
+        if let Some(previous_entry) = self.error_categories.insert(category_id, description) {
+            bail!(format!(
+                "Entry for category {} already taken by: {:#?}",
+                category_id, previous_entry
+            ))
+        }
+        Ok(())
+    }
+
+    pub fn add_module_error(
+        &mut self,
+        module_id: ModuleId,
+        abort_code: u64,
+        description: ErrorDescription,
+    ) -> Result<()> {
+        let module_error_map = self.module_error_maps.entry(module_id.clone()).or_default();
+        if let Some(previous_entry) = module_error_map.insert(abort_code, description) {
+            bail!(format!(
+                "Duplicate entry for abort code {} found in {}, previous entry: {:#?}",
+                abort_code, module_id, previous_entry
+            ))
+        }
+        Ok(())
+    }
+
+    pub fn from_file<P: AsRef<Path>>(path: P) -> Self {
+        let mut bytes = Vec::new();
+        File::open(path).unwrap().read_to_end(&mut bytes).unwrap();
+        bcs::from_bytes(&bytes).unwrap()
+    }
+
+    pub fn to_file<P: AsRef<Path>>(&self, path: P) {
+        let bytes = bcs::to_bytes(self).unwrap();
+        let mut file = File::create(path).unwrap();
+        file.write_all(&bytes).unwrap();
+    }
+
+    pub fn get_explanation(&self, module: &ModuleId, output_code: u64) -> Option<ErrorDescription> {
+        self.module_error_maps
+            .get(module)
+            .and_then(|module_map| module_map.get(&output_code).cloned())
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/gas_algebra.rs b/vendors/move/crates/move-core-types/src/gas_algebra.rs
new file mode 100644
index 000000000..589c8521c
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/gas_algebra.rs
@@ -0,0 +1,435 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::{
+    cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd},
+    convert::From,
+    fmt::{self, Debug, Display},
+    marker::PhantomData,
+    ops::{Add, AddAssign, Mul},
+};
+
+// TODO(Gas): deprecate the concept of abstract memory size
+
+/***************************************************************************************************
+ * Units of Measurement
+ *
+ **************************************************************************************************/
+/// Unit of internal gas.
+pub enum InternalGasUnit {}
+
+/// Unit for counting bytes.
+pub enum Byte {}
+
+/// Alternative unit for counting bytes. 1 kibibyte = 1024 bytes.
+pub enum KibiByte {}
+
+/// Alternative unit for counting bytes. 1 mebibyte = 1024 kibibytes.
+pub enum MebiByte {}
+
+/// Alternative unit for counting bytes. 1 gibibyte = 1024 mebibytes.
+pub enum GibiByte {}
+
+/// Unit of abstract memory usage in the Move VM.
+pub enum AbstractMemoryUnit {}
+
+/// Unit for counting arguments.
+pub enum Arg {}
+
+/// A derived unit resulted from the division of two given units.
+/// This is used to permit type-safe multiplications.
+///
+/// A real life example: 3 gas units/byte * 5 bytes = 15 gas units
+pub struct UnitDiv<U1, U2> {
+    phantom: PhantomData<(U1, U2)>,
+}
+
+/***************************************************************************************************
+ * Gas Quantities
+ *
+ **************************************************************************************************/
+/// An opaque representation of a certain quantity, with the unit being encoded in the type.
+/// This type implements checked addition and subtraction, and only permits type-safe multiplication.
+#[derive(Serialize, Deserialize)]
+pub struct GasQuantity<U> {
+    val: u64,
+    phantom: PhantomData<U>,
+}
+
+pub type InternalGas = GasQuantity<InternalGasUnit>;
+
+pub type NumBytes = GasQuantity<Byte>;
+
+pub type NumArgs = GasQuantity<Arg>;
+
+/// An abstract measurement of the memory footprint of some Move concept (e.g. value, type etc.)
+/// in the Move VM.
+///
+/// This is a legacy concept that is not well defined and will be deprecated very soon.
+/// New applications should not be using this.
+pub type AbstractMemorySize = GasQuantity<AbstractMemoryUnit>;
+
+pub type InternalGasPerByte = GasQuantity<UnitDiv<InternalGasUnit, Byte>>;
+
+pub type InternalGasPerAbstractMemoryUnit =
+    GasQuantity<UnitDiv<InternalGasUnit, AbstractMemoryUnit>>;
+
+pub type InternalGasPerArg = GasQuantity<UnitDiv<InternalGasUnit, Arg>>;
+
+/// Abstract size of Rust Box pointer
+/// This might be an over-estimation in many cases
+pub const BOX_ABSTRACT_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// Base abstract size of Rust enum
+pub const ENUM_BASE_ABSTRACT_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/***************************************************************************************************
+ * Constructors
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    pub const fn new(val: u64) -> Self {
+        Self {
+            val,
+            phantom: PhantomData,
+        }
+    }
+
+    pub const fn zero() -> Self {
+        Self::new(0)
+    }
+
+    pub const fn one() -> Self {
+        Self::new(1)
+    }
+
+    pub const fn is_zero(&self) -> bool {
+        self.val == 0
+    }
+}
+
+/***************************************************************************************************
+ * Conversion
+ *
+ **************************************************************************************************/
+impl<U> From<u64> for GasQuantity<U> {
+    fn from(val: u64) -> Self {
+        Self::new(val)
+    }
+}
+
+// TODO(Gas): This allows the gas value to escape the monad, which weakens the type-level
+//            protection it provides. It's currently needed for practical reasons but
+//            we should look for ways to get rid of it.
+impl<U> From<GasQuantity<U>> for u64 {
+    fn from(gas: GasQuantity<U>) -> Self {
+        gas.val
+    }
+}
+
+/***************************************************************************************************
+ * Clone & Copy
+ *
+ **************************************************************************************************/
+#[allow(clippy::incorrect_clone_impl_on_copy_type)]
+impl<U> Clone for GasQuantity<U> {
+    fn clone(&self) -> Self {
+        Self::new(self.val)
+    }
+}
+
+impl<U> Copy for GasQuantity<U> {}
+
+/***************************************************************************************************
+ * Display & Debug
+ *
+ **************************************************************************************************/
+impl<U> Display for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.val)
+    }
+}
+
+impl<U> Debug for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} ({})", self.val, std::any::type_name::<U>())
+    }
+}
+
+/***************************************************************************************************
+ * Comparison
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    fn cmp_impl(&self, other: &Self) -> Ordering {
+        self.val.cmp(&other.val)
+    }
+}
+
+impl<U> PartialEq for GasQuantity<U> {
+    fn eq(&self, other: &Self) -> bool {
+        matches!(self.cmp_impl(other), Ordering::Equal)
+    }
+}
+
+impl<U> Eq for GasQuantity<U> {}
+
+impl<U> PartialOrd for GasQuantity<U> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(std::cmp::Ord::cmp(self, other))
+    }
+}
+
+impl<U> Ord for GasQuantity<U> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.cmp_impl(other)
+    }
+}
+
+/***************************************************************************************************
+ * Addition & Subtraction
+ *
+ **************************************************************************************************/
+impl<U> Add<GasQuantity<U>> for GasQuantity<U> {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::new(self.val.saturating_add(rhs.val))
+    }
+}
+
+impl<U> AddAssign<GasQuantity<U>> for GasQuantity<U> {
+    fn add_assign(&mut self, rhs: GasQuantity<U>) {
+        *self = *self + rhs
+    }
+}
+
+impl<U> GasQuantity<U> {
+    pub fn checked_sub(self, other: Self) -> Option<Self> {
+        self.val.checked_sub(other.val).map(Self::new)
+    }
+
+    pub fn saturating_sub(self, other: Self) -> Self {
+        self.val.saturating_sub(other.val).into()
+    }
+}
+
+/***************************************************************************************************
+ * Multiplication
+ *
+ **************************************************************************************************/
+fn mul_impl<U1, U2>(x: GasQuantity<U2>, y: GasQuantity<UnitDiv<U1, U2>>) -> GasQuantity<U1> {
+    GasQuantity::new(x.val.saturating_mul(y.val))
+}
+
+impl<U1, U2> Mul<GasQuantity<UnitDiv<U1, U2>>> for GasQuantity<U2> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<UnitDiv<U1, U2>>) -> Self::Output {
+        mul_impl(self, rhs)
+    }
+}
+
+impl<U1, U2> Mul<GasQuantity<U2>> for GasQuantity<UnitDiv<U1, U2>> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<U2>) -> Self::Output {
+        mul_impl(rhs, self)
+    }
+}
+
+/***************************************************************************************************
+ * To Unit
+ *
+ **************************************************************************************************/
+fn apply_ratio_round_down(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let res = val as u128 * nominator as u128 / denominator as u128;
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+fn apply_ratio_round_up(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let n = val as u128 * nominator as u128;
+    let d = denominator as u128;
+
+    let res = n / d + if n % d == 0 { 0 } else { 1 };
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// integral conversion rate.
+pub trait ToUnit<U> {
+    const MULTIPLIER: u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// fractional conversion rate.
+pub trait ToUnitFractional<U> {
+    const NOMINATOR: u64;
+    const DENOMINATOR: u64;
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnit` trait.
+    pub fn to_unit<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnit<T>,
+    {
+        assert_ne!(U::MULTIPLIER, 0);
+
+        GasQuantity::new(self.val.saturating_mul(U::MULTIPLIER))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_down<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_down(
+            self.val,
+            U::NOMINATOR,
+            U::DENOMINATOR,
+        ))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_up<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_up(self.val, U::NOMINATOR, U::DENOMINATOR))
+    }
+}
+
+impl ToUnit<Byte> for KibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<Byte> for MebiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<Byte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024 * 1024;
+}
+
+impl ToUnit<KibiByte> for MebiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<KibiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<MebiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnitFractional<KibiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<MebiByte> for KibiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<MebiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024;
+}
+
+impl ToUnitFractional<GibiByte> for MebiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<GibiByte> for KibiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024;
+}
+
+impl ToUnitFractional<GibiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024 * 1024;
+}
+
+/***************************************************************************************************
+ * To Unit With Params
+ *
+ **************************************************************************************************/
+/// Trait that defines a conversion from one unit to another, with an integral conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitWithParams<U> {
+    type Params;
+
+    fn multiplier(params: &Self::Params) -> u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a fractional conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitFractionalWithParams<U> {
+    type Params;
+
+    fn ratio(params: &Self::Params) -> (u64, u64);
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnitWithParams` trait.
+    pub fn to_unit_with_params<T>(
+        self,
+        params: &<U as ToUnitWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitWithParams<T>,
+    {
+        let multiplier = <U as ToUnitWithParams<T>>::multiplier(params);
+        assert_ne!(multiplier, 0);
+        GasQuantity::new(self.val.saturating_mul(multiplier))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_down_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_down(self.val, n, d))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_up_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_up(self.val, n, d))
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/identifier.rs b/vendors/move/crates/move-core-types/src/identifier.rs
new file mode 100644
index 000000000..019adcc27
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/identifier.rs
@@ -0,0 +1,325 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! An identifier is the name of an entity (module, resource, function, etc) in Move.
+//!
+//! A valid identifier consists of an ASCII string which satisfies any of the conditions:
+//!
+//! * The first character is a letter and the remaining characters are letters, digits or
+//!   underscores.
+//! * The first character is an underscore, and there is at least one further letter, digit or
+//!   underscore.
+//!
+//! The spec for allowed identifiers is similar to Rust's spec
+//! ([as of version 1.38](https://doc.rust-lang.org/1.38.0/reference/identifiers.html)).
+//!
+//! Allowed identifiers are currently restricted to ASCII due to unresolved issues with Unicode
+//! normalization. See [Rust issue #55467](https://github.com/rust-lang/rust/issues/55467) and the
+//! associated RFC for some discussion. Unicode identifiers may eventually be supported once these
+//! issues are worked out.
+//!
+//! This module only determines allowed identifiers at the bytecode level. Move source code will
+//! likely be more restrictive than even this, with a "raw identifier" escape hatch similar to
+//! Rust's `r#` identifiers.
+//!
+//! Among other things, identifiers are used to:
+//! * specify keys for lookups in storage
+//! * do cross-module lookups while executing transactions
+
+use crate::gas_algebra::AbstractMemorySize;
+use anyhow::{bail, Result};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+use ref_cast::RefCast;
+use serde::{Deserialize, Serialize};
+use std::{borrow::Borrow, fmt, ops::Deref, str::FromStr};
+
+/// Return true if this character can appear in a Move identifier.
+///
+/// Note: there are stricter restrictions on whether a character can begin a Move
+/// identifier--only alphabetic characters are allowed here.
+#[inline]
+pub const fn is_valid_identifier_char(c: char) -> bool {
+    matches!(c, '_' | 'a'..='z' | 'A'..='Z' | '0'..='9')
+}
+
+/// Returns `true` if all bytes in `b` after the offset `start_offset` are valid
+/// ASCII identifier characters.
+const fn all_bytes_valid(b: &[u8], start_offset: usize) -> bool {
+    let mut i = start_offset;
+    // TODO(philiphayes): use for loop instead of while loop when it's stable in const fn's.
+    while i < b.len() {
+        if !is_valid_identifier_char(b[i] as char) {
+            return false;
+        }
+        i += 1;
+    }
+    true
+}
+
+/// Describes what identifiers are allowed.
+///
+/// For now this is deliberately restrictive -- we would like to evolve this in the future.
+// TODO: "<SELF>" is coded as an exception. It should be removed once CompiledScript goes away.
+// Note: needs to be pub as it's used in the `ident_str!` macro.
+pub const fn is_valid(s: &str) -> bool {
+    // Rust const fn's don't currently support slicing or indexing &str's, so we
+    // have to operate on the underlying byte slice. This is not a problem as
+    // valid identifiers are (currently) ASCII-only.
+    let b = s.as_bytes();
+    match b {
+        b"<SELF>" => true,
+        [b'a'..=b'z', ..] | [b'A'..=b'Z', ..] => all_bytes_valid(b, 1),
+        [b'_', ..] if b.len() > 1 => all_bytes_valid(b, 1),
+        _ => false,
+    }
+}
+
+/// A regex describing what identifiers are allowed. Used for proptests.
+// TODO: "<SELF>" is coded as an exception. It should be removed once CompiledScript goes away.
+#[cfg(any(test, feature = "fuzzing"))]
+#[allow(dead_code)]
+pub(crate) static ALLOWED_IDENTIFIERS: &str =
+    r"(?:[a-zA-Z][a-zA-Z0-9_]*)|(?:_[a-zA-Z0-9_]+)|(?:<SELF>)";
+#[cfg(any(test, feature = "fuzzing"))]
+pub(crate) static ALLOWED_NO_SELF_IDENTIFIERS: &str =
+    r"(?:[a-zA-Z][a-zA-Z0-9_]*)|(?:_[a-zA-Z0-9_]+)";
+
+/// An owned identifier.
+///
+/// For more details, see the module level documentation.
+#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct Identifier(Box<str>);
+// An identifier cannot be mutated so use Box<str> instead of String -- it is 1 word smaller.
+
+impl Identifier {
+    /// Creates a new `Identifier` instance.
+    pub fn new(s: impl Into<Box<str>>) -> Result<Self> {
+        let s = s.into();
+        if Self::is_valid(&s) {
+            Ok(Self(s))
+        } else {
+            bail!("Invalid identifier '{}'", s);
+        }
+    }
+
+    /// Returns true if this string is a valid identifier.
+    pub fn is_valid(s: impl AsRef<str>) -> bool {
+        is_valid(s.as_ref())
+    }
+
+    /// Returns if this identifier is "<SELF>".
+    /// TODO: remove once we fully separate CompiledScript & CompiledModule.
+    pub fn is_self(&self) -> bool {
+        &*self.0 == "<SELF>"
+    }
+
+    /// Converts a vector of bytes to an `Identifier`.
+    pub fn from_utf8(vec: Vec<u8>) -> Result<Self> {
+        let s = String::from_utf8(vec)?;
+        Self::new(s)
+    }
+
+    /// Creates a borrowed version of `self`.
+    pub fn as_ident_str(&self) -> &IdentStr {
+        self
+    }
+
+    /// Converts this `Identifier` into a `String`.
+    ///
+    /// This is not implemented as a `From` trait to discourage automatic conversions -- these
+    /// conversions should not typically happen.
+    pub fn into_string(self) -> String {
+        self.0.into()
+    }
+
+    /// Converts this `Identifier` into a UTF-8-encoded byte sequence.
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.into_string().into_bytes()
+    }
+}
+
+impl FromStr for Identifier {
+    type Err = anyhow::Error;
+
+    fn from_str(data: &str) -> Result<Self> {
+        Self::new(data)
+    }
+}
+
+impl From<&IdentStr> for Identifier {
+    fn from(ident_str: &IdentStr) -> Self {
+        ident_str.to_owned()
+    }
+}
+
+impl AsRef<IdentStr> for Identifier {
+    fn as_ref(&self) -> &IdentStr {
+        self
+    }
+}
+
+impl Deref for Identifier {
+    type Target = IdentStr;
+
+    fn deref(&self) -> &IdentStr {
+        // Identifier and IdentStr maintain the same invariants, so it is safe to
+        // convert.
+        IdentStr::ref_cast(&self.0)
+    }
+}
+
+impl fmt::Display for Identifier {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", &self.0)
+    }
+}
+
+/// A borrowed identifier.
+///
+/// For more details, see the module level documentation.
+#[derive(Debug, Eq, Hash, Ord, PartialEq, PartialOrd, RefCast)]
+#[repr(transparent)]
+pub struct IdentStr(str);
+
+impl IdentStr {
+    pub fn new(s: &str) -> Result<&IdentStr> {
+        if Self::is_valid(s) {
+            Ok(IdentStr::ref_cast(s))
+        } else {
+            bail!("Invalid identifier '{}'", s);
+        }
+    }
+
+    /// Returns true if this string is a valid identifier.
+    pub fn is_valid(s: impl AsRef<str>) -> bool {
+        is_valid(s.as_ref())
+    }
+
+    /// Returns the length of `self` in bytes.
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Returns `true` if `self` has a length of zero bytes.
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Converts `self` to a `&str`.
+    ///
+    /// This is not implemented as a `From` trait to discourage automatic conversions -- these
+    /// conversions should not typically happen.
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Converts `self` to a byte slice.
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+
+    /// Returns the abstract size of the struct
+    /// TODO (ade): use macro to enfornce determinism
+    pub fn abstract_size_for_gas_metering(&self) -> AbstractMemorySize {
+        AbstractMemorySize::new((self.len()) as u64)
+    }
+}
+
+impl Borrow<IdentStr> for Identifier {
+    fn borrow(&self) -> &IdentStr {
+        self
+    }
+}
+
+impl ToOwned for IdentStr {
+    type Owned = Identifier;
+
+    fn to_owned(&self) -> Identifier {
+        Identifier(self.0.into())
+    }
+}
+
+impl fmt::Display for IdentStr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", &self.0)
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for Identifier {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with((): ()) -> Self::Strategy {
+        ALLOWED_NO_SELF_IDENTIFIERS
+            .prop_map(|s| {
+                // Identifier::new will verify that generated identifiers are correct.
+                Identifier::new(s).unwrap()
+            })
+            .boxed()
+    }
+}
+
+// const assert that IdentStr impls RefCast<From = str>
+// This assertion is what guarantees the unsafe transmute is safe.
+const _: fn() = || {
+    fn assert_impl_all<T: ?Sized + ::ref_cast::RefCast<From = str>>() {}
+    assert_impl_all::<IdentStr>();
+};
+
+/// `ident_str!` is a compile-time validated macro that constructs a
+/// `&'static IdentStr` from a const `&'static str`.
+///
+/// ### Example
+///
+/// Creating a valid static or const [`IdentStr`]:
+///
+/// ```rust
+/// use move_core_types::{ident_str, identifier::IdentStr};
+/// const VALID_IDENT: &'static IdentStr = ident_str!("MyCoolIdentifier");
+///
+/// const THING_NAME: &'static str = "thing_name";
+/// const THING_IDENT: &'static IdentStr = ident_str!(THING_NAME);
+/// ```
+///
+/// In contrast, creating an invalid [`IdentStr`] will fail at compile time:
+///
+/// ```rust,compile_fail
+/// use move_core_types::{ident_str, identifier::IdentStr};
+/// const INVALID_IDENT: &'static IdentStr = ident_str!("123Foo"); // Fails to compile!
+/// ```
+// TODO(philiphayes): this should really be an associated const fn like `IdentStr::new`;
+// unfortunately, both unsafe-reborrow and unsafe-transmute don't currently work
+// inside const fn's. Only unsafe-transmute works inside static const-blocks
+// (but not const-fn's).
+#[macro_export]
+macro_rules! ident_str {
+    ($ident:expr) => {{
+        // Only static strings allowed.
+        let s: &'static str = $ident;
+
+        // Only valid identifier strings are allowed.
+        // Note: Work-around hack to print an error message in a const block.
+        let is_valid = $crate::identifier::is_valid(s);
+        ["String is not a valid Move identifier"][!is_valid as usize];
+
+        // SAFETY: the following transmute is safe because
+        // (1) it's equivalent to the unsafe-reborrow inside IdentStr::ref_cast()
+        //     (which we can't use b/c it's not const).
+        // (2) we've just asserted that IdentStr impls RefCast<From = str>, which
+        //     already guarantees the transmute is safe (RefCast checks that
+        //     IdentStr(str) is #[repr(transparent)]).
+        // (3) both in and out lifetimes are 'static, so we're not widening the lifetime.
+        // (4) we've just asserted that the IdentStr passes the is_valid check.
+        //
+        // Note: this lint is unjustified and no longer checked. See issue:
+        // https://github.com/rust-lang/rust-clippy/issues/6372
+        #[allow(clippy::transmute_ptr_to_ptr)]
+        unsafe {
+            ::std::mem::transmute::<&'static str, &'static $crate::identifier::IdentStr>(s)
+        }
+    }};
+}
diff --git a/vendors/move/crates/move-core-types/src/language_storage.rs b/vendors/move/crates/move-core-types/src/language_storage.rs
new file mode 100644
index 000000000..26d822f54
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/language_storage.rs
@@ -0,0 +1,396 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    gas_algebra::{AbstractMemorySize, BOX_ABSTRACT_SIZE, ENUM_BASE_ABSTRACT_SIZE},
+    identifier::{IdentStr, Identifier},
+    parser::{parse_struct_tag, parse_type_tag},
+};
+use move_proc_macros::test_variant_order;
+use once_cell::sync::Lazy;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt::{Display, Formatter},
+    str::FromStr,
+};
+
+pub const CODE_TAG: u8 = 0;
+pub const RESOURCE_TAG: u8 = 1;
+
+/// Hex address: 0x1
+pub const CORE_CODE_ADDRESS: AccountAddress = AccountAddress::ONE;
+
+/// Rough estimate of abstract size for TypeTag
+pub static TYPETAG_ENUM_ABSTRACT_SIZE: Lazy<AbstractMemorySize> =
+    Lazy::new(|| ENUM_BASE_ABSTRACT_SIZE + BOX_ABSTRACT_SIZE);
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+#[test_variant_order(src/unit_tests/staged_enum_variant_order/type_tag.yaml)]
+pub enum TypeTag {
+    // alias for compatibility with old json serialized data.
+    #[serde(rename = "bool", alias = "Bool")]
+    Bool,
+    #[serde(rename = "u8", alias = "U8")]
+    U8,
+    #[serde(rename = "u64", alias = "U64")]
+    U64,
+    #[serde(rename = "u128", alias = "U128")]
+    U128,
+    #[serde(rename = "address", alias = "Address")]
+    Address,
+    #[serde(rename = "signer", alias = "Signer")]
+    Signer,
+    #[serde(rename = "vector", alias = "Vector")]
+    Vector(Box<TypeTag>),
+    #[serde(rename = "struct", alias = "Struct")]
+    Struct(Box<StructTag>),
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename = "u16", alias = "U16")]
+    U16,
+    #[serde(rename = "u32", alias = "U32")]
+    U32,
+    #[serde(rename = "u256", alias = "U256")]
+    U256,
+}
+
+impl TypeTag {
+    /// Return a canonical string representation of the type. All types are represented
+    /// using their source syntax:
+    /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String` or
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+    /// With or without the prefix 0x depending on the `with_prefix` flag.
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self, with_prefix: bool) -> String {
+        self.to_canonical_display(with_prefix).to_string()
+    }
+
+    /// Return the canonical string representation of the TypeTag conditionally with prefix 0x
+    pub fn to_canonical_display(&self, with_prefix: bool) -> impl std::fmt::Display + '_ {
+        struct CanonicalDisplay<'a> {
+            data: &'a TypeTag,
+            with_prefix: bool,
+        }
+
+        impl std::fmt::Display for CanonicalDisplay<'_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                match self.data {
+                    TypeTag::Bool => write!(f, "bool"),
+                    TypeTag::U8 => write!(f, "u8"),
+                    TypeTag::U16 => write!(f, "u16"),
+                    TypeTag::U32 => write!(f, "u32"),
+                    TypeTag::U64 => write!(f, "u64"),
+                    TypeTag::U128 => write!(f, "u128"),
+                    TypeTag::U256 => write!(f, "u256"),
+                    TypeTag::Address => write!(f, "address"),
+                    TypeTag::Signer => write!(f, "signer"),
+                    TypeTag::Vector(t) => {
+                        write!(f, "vector<{}>", t.to_canonical_display(self.with_prefix))
+                    }
+                    TypeTag::Struct(s) => write!(f, "{}", s.to_canonical_display(self.with_prefix)),
+                }
+            }
+        }
+
+        CanonicalDisplay {
+            data: self,
+            with_prefix,
+        }
+    }
+
+    /// Return the abstract size we use for gas metering
+    /// This size might be imperfect but should be consistent across platforms
+    /// TODO (ade): use macro to enfornce determinism
+    pub fn abstract_size_for_gas_metering(&self) -> AbstractMemorySize {
+        *TYPETAG_ENUM_ABSTRACT_SIZE
+            + match self {
+                TypeTag::Bool
+                | TypeTag::U8
+                | TypeTag::U64
+                | TypeTag::U128
+                | TypeTag::Address
+                | TypeTag::Signer
+                | TypeTag::U16
+                | TypeTag::U32
+                | TypeTag::U256 => AbstractMemorySize::new(0),
+                TypeTag::Vector(x) => x.abstract_size_for_gas_metering(),
+                TypeTag::Struct(y) => y.abstract_size_for_gas_metering(),
+            }
+    }
+}
+
+impl FromStr for TypeTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_type_tag(s)
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub struct StructTag {
+    pub address: AccountAddress,
+    pub module: Identifier,
+    pub name: Identifier,
+    // alias for compatibility with old json serialized data.
+    #[serde(rename = "type_args", alias = "type_params")]
+    pub type_params: Vec<TypeTag>,
+}
+
+impl StructTag {
+    pub fn access_vector(&self) -> Vec<u8> {
+        let mut key = vec![RESOURCE_TAG];
+        key.append(&mut bcs::to_bytes(self).unwrap());
+        key
+    }
+
+    /// Returns true if this is a `StructTag` for an `std::ascii::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_ascii_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("ascii")
+            && self.name.as_str().eq("String")
+    }
+
+    /// Returns true if this is a `StructTag` for an `std::string::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_std_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("string")
+            && self.name.as_str().eq("String")
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        ModuleId::new(self.address, self.module.to_owned())
+    }
+
+    /// Return a canonical string representation of the struct.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String`,
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`,
+    /// or `0000000000000000000000000000000a::module_name2::type_name2<bool,u64,u128>.
+    /// With or without the prefix 0x depending on the `with_prefix` flag.
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self, with_prefix: bool) -> String {
+        self.to_canonical_display(with_prefix).to_string()
+    }
+
+    /// Implements the canonical string representation of the StructTag with the prefix 0x
+    pub fn to_canonical_display(&self, with_prefix: bool) -> impl std::fmt::Display + '_ {
+        struct CanonicalDisplay<'a> {
+            data: &'a StructTag,
+            with_prefix: bool,
+        }
+
+        impl std::fmt::Display for CanonicalDisplay<'_> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(
+                    f,
+                    "{}::{}::{}",
+                    self.data.address.to_canonical_display(self.with_prefix),
+                    self.data.module,
+                    self.data.name
+                )?;
+
+                if let Some(first_ty) = self.data.type_params.first() {
+                    write!(f, "<")?;
+                    write!(f, "{}", first_ty.to_canonical_display(self.with_prefix))?;
+                    for ty in self.data.type_params.iter().skip(1) {
+                        // Note that unlike Display for StructTag, there is no space between the comma and canonical display.
+                        // This follows the original to_canonical_string() implementation.
+                        write!(f, ",{}", ty.to_canonical_display(self.with_prefix))?;
+                    }
+                    write!(f, ">")?;
+                }
+                Ok(())
+            }
+        }
+
+        CanonicalDisplay {
+            data: self,
+            with_prefix,
+        }
+    }
+
+    /// Return the abstract size we use for gas metering
+    /// This size might be imperfect but should be consistent across platforms
+    /// TODO (ade): use macro to enfornce determinism
+    pub fn abstract_size_for_gas_metering(&self) -> AbstractMemorySize {
+        // TODO: make this more robust as struct size changes
+        self.address.abstract_size_for_gas_metering()
+            + self.module.abstract_size_for_gas_metering()
+            + self.name.abstract_size_for_gas_metering()
+            + self
+                .type_params
+                .iter()
+                .fold(AbstractMemorySize::new(0), |accum, val| {
+                    accum + val.abstract_size_for_gas_metering()
+                })
+    }
+}
+
+impl FromStr for StructTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_struct_tag(s)
+    }
+}
+
+/// Represents the initial key into global storage where we first index by the address, and then
+/// the struct tag
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub struct ResourceKey {
+    pub address: AccountAddress,
+    pub type_: StructTag,
+}
+
+impl ResourceKey {
+    pub fn address(&self) -> AccountAddress {
+        self.address
+    }
+
+    pub fn type_(&self) -> &StructTag {
+        &self.type_
+    }
+}
+
+impl ResourceKey {
+    pub fn new(address: AccountAddress, type_: StructTag) -> Self {
+        ResourceKey { address, type_ }
+    }
+}
+
+/// Represents the initial key into global storage where we first index by the address, and then
+/// the struct tag
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub struct ModuleId {
+    address: AccountAddress,
+    name: Identifier,
+}
+
+impl From<ModuleId> for (AccountAddress, Identifier) {
+    fn from(module_id: ModuleId) -> Self {
+        (module_id.address, module_id.name)
+    }
+}
+
+impl ModuleId {
+    pub fn new(address: AccountAddress, name: Identifier) -> Self {
+        ModuleId { address, name }
+    }
+
+    pub fn name(&self) -> &IdentStr {
+        &self.name
+    }
+
+    pub fn address(&self) -> &AccountAddress {
+        &self.address
+    }
+
+    pub fn access_vector(&self) -> Vec<u8> {
+        let mut key = vec![CODE_TAG];
+        key.append(&mut bcs::to_bytes(self).unwrap());
+        key
+    }
+}
+
+impl Display for ModuleId {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "{}::{}", self.address, self.name)
+    }
+}
+
+impl ModuleId {
+    pub fn short_str_lossless(&self) -> String {
+        format!("0x{}::{}", self.address.short_str_lossless(), self.name)
+    }
+}
+
+impl Display for StructTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "0x{}::{}::{}",
+            self.address.short_str_lossless(),
+            self.module,
+            self.name
+        )?;
+        if let Some(first_ty) = self.type_params.first() {
+            write!(f, "<")?;
+            write!(f, "{}", first_ty)?;
+            for ty in self.type_params.iter().skip(1) {
+                write!(f, ", {}", ty)?;
+            }
+            write!(f, ">")?;
+        }
+        Ok(())
+    }
+}
+
+impl Display for TypeTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self {
+            TypeTag::Struct(s) => write!(f, "{}", s),
+            TypeTag::Vector(ty) => write!(f, "vector<{}>", ty),
+            TypeTag::U8 => write!(f, "u8"),
+            TypeTag::U16 => write!(f, "u16"),
+            TypeTag::U32 => write!(f, "u32"),
+            TypeTag::U64 => write!(f, "u64"),
+            TypeTag::U128 => write!(f, "u128"),
+            TypeTag::U256 => write!(f, "u256"),
+            TypeTag::Address => write!(f, "address"),
+            TypeTag::Signer => write!(f, "signer"),
+            TypeTag::Bool => write!(f, "bool"),
+        }
+    }
+}
+
+impl Display for ResourceKey {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "0x{}/{}", self.address.short_str_lossless(), self.type_)
+    }
+}
+
+impl From<StructTag> for TypeTag {
+    fn from(t: StructTag) -> TypeTag {
+        TypeTag::Struct(Box::new(t))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TypeTag;
+    use crate::{
+        account_address::AccountAddress, identifier::Identifier, language_storage::StructTag,
+    };
+    use std::mem;
+
+    #[test]
+    fn test_type_tag_serde() {
+        let a = TypeTag::Struct(Box::new(StructTag {
+            address: AccountAddress::ONE,
+            module: Identifier::from_utf8(("abc".as_bytes()).to_vec()).unwrap(),
+            name: Identifier::from_utf8(("abc".as_bytes()).to_vec()).unwrap(),
+            type_params: vec![TypeTag::U8],
+        }));
+        let b = serde_json::to_string(&a).unwrap();
+        let c: TypeTag = serde_json::from_str(&b).unwrap();
+        assert!(a.eq(&c), "Typetag serde error");
+        assert_eq!(mem::size_of::<TypeTag>(), 16);
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/lib.rs b/vendors/move/crates/move-core-types/src/lib.rs
new file mode 100644
index 000000000..a4545913a
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/lib.rs
@@ -0,0 +1,47 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Core types for Move.
+
+use std::fmt;
+
+pub mod abi;
+pub mod account_address;
+pub mod annotated_value;
+pub mod effects;
+pub mod errmap;
+pub mod gas_algebra;
+pub mod identifier;
+pub mod language_storage;
+pub mod metadata;
+pub mod move_resource;
+pub mod parser;
+#[cfg(any(test, feature = "fuzzing"))]
+pub mod proptest_types;
+pub mod resolver;
+pub mod runtime_value;
+pub mod state;
+pub mod transaction_argument;
+pub mod u256;
+#[cfg(test)]
+mod unit_tests;
+pub mod vm_status;
+
+pub(crate) fn fmt_list<T: fmt::Display>(
+    f: &mut fmt::Formatter<'_>,
+    begin: &str,
+    items: impl IntoIterator<Item = T>,
+    end: &str,
+) -> fmt::Result {
+    write!(f, "{}", begin)?;
+    let mut items = items.into_iter();
+    if let Some(x) = items.next() {
+        write!(f, "{}", x)?;
+        for x in items {
+            write!(f, ", {}", x)?;
+        }
+    }
+    write!(f, "{}", end)?;
+    Ok(())
+}
diff --git a/vendors/move/crates/move-core-types/src/metadata.rs b/vendors/move/crates/move-core-types/src/metadata.rs
new file mode 100644
index 000000000..bf5b11446
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/metadata.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+
+/// Representation of metadata,
+#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct Metadata {
+    /// The key identifying the type of metadata.
+    pub key: Vec<u8>,
+    /// The value of the metadata.
+    pub value: Vec<u8>,
+}
diff --git a/vendors/move/crates/move-core-types/src/move_resource.rs b/vendors/move/crates/move-core-types/src/move_resource.rs
new file mode 100644
index 000000000..a9cb9cf02
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/move_resource.rs
@@ -0,0 +1,43 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{StructTag, TypeTag},
+};
+use serde::de::DeserializeOwned;
+
+pub trait MoveStructType {
+    const ADDRESS: AccountAddress = crate::language_storage::CORE_CODE_ADDRESS;
+    const MODULE_NAME: &'static IdentStr;
+    const STRUCT_NAME: &'static IdentStr;
+
+    fn module_identifier() -> Identifier {
+        Self::MODULE_NAME.to_owned()
+    }
+
+    fn struct_identifier() -> Identifier {
+        Self::STRUCT_NAME.to_owned()
+    }
+
+    fn type_params() -> Vec<TypeTag> {
+        vec![]
+    }
+
+    fn struct_tag() -> StructTag {
+        StructTag {
+            address: Self::ADDRESS,
+            name: Self::struct_identifier(),
+            module: Self::module_identifier(),
+            type_params: Self::type_params(),
+        }
+    }
+}
+
+pub trait MoveResource: MoveStructType + DeserializeOwned {
+    fn resource_path() -> Vec<u8> {
+        Self::struct_tag().access_vector()
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/parser.rs b/vendors/move/crates/move-core-types/src/parser.rs
new file mode 100644
index 000000000..cd9d5b72b
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/parser.rs
@@ -0,0 +1,661 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::{self, Identifier},
+    language_storage::{StructTag, TypeTag},
+    transaction_argument::TransactionArgument,
+};
+use anyhow::{bail, format_err, Result};
+use std::iter::Peekable;
+
+#[derive(Eq, PartialEq, Debug)]
+enum Token {
+    U8Type,
+    U16Type,
+    U32Type,
+    U64Type,
+    U128Type,
+    U256Type,
+    BoolType,
+    AddressType,
+    VectorType,
+    SignerType,
+    Whitespace(String),
+    Name(String),
+    Address(String),
+    U8(String),
+    U16(String),
+    U32(String),
+    U64(String),
+    U128(String),
+    U256(String),
+
+    Bytes(String),
+    True,
+    False,
+    ColonColon,
+    Lt,
+    Gt,
+    Comma,
+    EOF,
+}
+
+impl Token {
+    fn is_whitespace(&self) -> bool {
+        matches!(self, Self::Whitespace(_))
+    }
+}
+
+fn token_as_name(tok: Token) -> Result<String> {
+    use Token::*;
+    Ok(match tok {
+        U8Type => "u8".to_string(),
+        U16Type => "u16".to_string(),
+        U32Type => "u32".to_string(),
+        U64Type => "u64".to_string(),
+        U128Type => "u128".to_string(),
+        U256Type => "u256".to_string(),
+        BoolType => "bool".to_string(),
+        AddressType => "address".to_string(),
+        VectorType => "vector".to_string(),
+        True => "true".to_string(),
+        False => "false".to_string(),
+        SignerType => "signer".to_string(),
+        Name(s) => s,
+        Whitespace(_) | Address(_) | U8(_) | U16(_) | U32(_) | U64(_) | U128(_) | U256(_)
+        | Bytes(_) | ColonColon | Lt | Gt | Comma | EOF => {
+            bail!("Invalid token. Expected a name but got {:?}", tok)
+        }
+    })
+}
+
+fn name_token(s: String) -> Token {
+    match s.as_str() {
+        "u8" => Token::U8Type,
+        "u16" => Token::U16Type,
+        "u32" => Token::U32Type,
+        "u64" => Token::U64Type,
+        "u128" => Token::U128Type,
+        "u256" => Token::U256Type,
+        "bool" => Token::BoolType,
+        "address" => Token::AddressType,
+        "vector" => Token::VectorType,
+        "true" => Token::True,
+        "false" => Token::False,
+        "signer" => Token::SignerType,
+        _ => Token::Name(s),
+    }
+}
+
+fn next_number(initial: char, mut it: impl Iterator<Item = char>) -> Result<(Token, usize)> {
+    let mut num = String::new();
+    num.push(initial);
+    loop {
+        match it.next() {
+            Some(c) if c.is_ascii_digit() || c == '_' => num.push(c),
+            Some(c) if c.is_alphanumeric() => {
+                let mut suffix = String::new();
+                suffix.push(c);
+                loop {
+                    match it.next() {
+                        Some(c) if c.is_ascii_alphanumeric() => suffix.push(c),
+                        _ => {
+                            let len = num.len() + suffix.len();
+                            let tok = match suffix.as_str() {
+                                "u8" => Token::U8(num),
+                                "u16" => Token::U16(num),
+                                "u32" => Token::U32(num),
+                                "u64" => Token::U64(num),
+                                "u128" => Token::U128(num),
+                                "u256" => Token::U256(num),
+                                _ => bail!("invalid suffix"),
+                            };
+                            return Ok((tok, len));
+                        }
+                    }
+                }
+            }
+            _ => {
+                let len = num.len();
+                return Ok((Token::U64(num), len));
+            }
+        }
+    }
+}
+
+#[allow(clippy::many_single_char_names)]
+fn next_token(s: &str) -> Result<Option<(Token, usize)>> {
+    let mut it = s.chars().peekable();
+    match it.next() {
+        None => Ok(None),
+        Some(c) => Ok(Some(match c {
+            '<' => (Token::Lt, 1),
+            '>' => (Token::Gt, 1),
+            ',' => (Token::Comma, 1),
+            ':' => match it.next() {
+                Some(':') => (Token::ColonColon, 2),
+                _ => bail!("unrecognized token"),
+            },
+            '0' if it.peek() == Some(&'x') || it.peek() == Some(&'X') => {
+                it.next().unwrap();
+                match it.next() {
+                    Some(c) if c.is_ascii_hexdigit() => {
+                        let mut r = String::new();
+                        r.push('0');
+                        r.push('x');
+                        r.push(c);
+                        for c in it {
+                            if c.is_ascii_hexdigit() {
+                                r.push(c);
+                            } else {
+                                break;
+                            }
+                        }
+                        let len = r.len();
+                        (Token::Address(r), len)
+                    }
+                    _ => bail!("unrecognized token"),
+                }
+            }
+            c if c.is_ascii_digit() => next_number(c, it)?,
+            'b' if it.peek() == Some(&'"') => {
+                it.next().unwrap();
+                let mut r = String::new();
+                loop {
+                    match it.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii() => r.push(c),
+                        _ => bail!("unrecognized token"),
+                    }
+                }
+                let len = r.len() + 3;
+                (Token::Bytes(hex::encode(r)), len)
+            }
+            'x' if it.peek() == Some(&'"') => {
+                it.next().unwrap();
+                let mut r = String::new();
+                loop {
+                    match it.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii_hexdigit() => r.push(c),
+                        _ => bail!("unrecognized token"),
+                    }
+                }
+                let len = r.len() + 3;
+                (Token::Bytes(r), len)
+            }
+            c if c.is_ascii_whitespace() => {
+                let mut r = String::new();
+                r.push(c);
+                for c in it {
+                    if c.is_ascii_whitespace() {
+                        r.push(c);
+                    } else {
+                        break;
+                    }
+                }
+                let len = r.len();
+                (Token::Whitespace(r), len)
+            }
+            c if c.is_ascii_alphabetic() => {
+                let mut r = String::new();
+                r.push(c);
+                for c in it {
+                    if identifier::is_valid_identifier_char(c) {
+                        r.push(c);
+                    } else {
+                        break;
+                    }
+                }
+                let len = r.len();
+                (name_token(r), len)
+            }
+            _ => bail!("unrecognized token"),
+        })),
+    }
+}
+
+fn tokenize(mut s: &str) -> Result<Vec<Token>> {
+    let mut v = vec![];
+    while let Some((tok, n)) = next_token(s)? {
+        v.push(tok);
+        s = &s[n..];
+    }
+    Ok(v)
+}
+
+struct Parser<I: Iterator<Item = Token>> {
+    it: Peekable<I>,
+}
+
+impl<I: Iterator<Item = Token>> Parser<I> {
+    fn new<T: IntoIterator<Item = Token, IntoIter = I>>(v: T) -> Self {
+        Self {
+            it: v.into_iter().peekable(),
+        }
+    }
+
+    fn next(&mut self) -> Result<Token> {
+        match self.it.next() {
+            Some(tok) => Ok(tok),
+            None => bail!("out of tokens, this should not happen"),
+        }
+    }
+
+    fn peek(&mut self) -> Option<&Token> {
+        self.it.peek()
+    }
+
+    fn consume(&mut self, tok: Token) -> Result<()> {
+        let t = self.next()?;
+        if t != tok {
+            bail!("expected token {:?}, got {:?}", tok, t)
+        }
+        Ok(())
+    }
+
+    fn parse_comma_list<F, R>(
+        &mut self,
+        parse_list_item: F,
+        end_token: Token,
+        allow_trailing_comma: bool,
+    ) -> Result<Vec<R>>
+    where
+        F: Fn(&mut Self) -> Result<R>,
+        R: std::fmt::Debug,
+    {
+        let mut v = vec![];
+        if !(self.peek() == Some(&end_token)) {
+            loop {
+                v.push(parse_list_item(self)?);
+                if self.peek() == Some(&end_token) {
+                    break;
+                }
+                self.consume(Token::Comma)?;
+                if self.peek() == Some(&end_token) && allow_trailing_comma {
+                    break;
+                }
+            }
+        }
+        Ok(v)
+    }
+
+    fn parse_string(&mut self) -> Result<String> {
+        Ok(match self.next()? {
+            Token::Name(s) => s,
+            tok => bail!("unexpected token {:?}, expected string", tok),
+        })
+    }
+
+    fn parse_type_tag(&mut self) -> Result<TypeTag> {
+        Ok(match self.next()? {
+            Token::U8Type => TypeTag::U8,
+            Token::U16Type => TypeTag::U16,
+            Token::U32Type => TypeTag::U32,
+            Token::U64Type => TypeTag::U64,
+            Token::U128Type => TypeTag::U128,
+            Token::U256Type => TypeTag::U256,
+            Token::BoolType => TypeTag::Bool,
+            Token::AddressType => TypeTag::Address,
+            Token::SignerType => TypeTag::Signer,
+            Token::VectorType => {
+                self.consume(Token::Lt)?;
+                let ty = self.parse_type_tag()?;
+                self.consume(Token::Gt)?;
+                TypeTag::Vector(Box::new(ty))
+            }
+            Token::Address(addr) => {
+                self.consume(Token::ColonColon)?;
+                let module = self.next().and_then(token_as_name)?;
+                self.consume(Token::ColonColon)?;
+                let name = self.next().and_then(token_as_name)?;
+                let ty_args = if self.peek() == Some(&Token::Lt) {
+                    self.next()?;
+                    let ty_args =
+                        self.parse_comma_list(|parser| parser.parse_type_tag(), Token::Gt, true)?;
+                    self.consume(Token::Gt)?;
+                    ty_args
+                } else {
+                    vec![]
+                };
+                TypeTag::Struct(Box::new(StructTag {
+                    address: AccountAddress::from_hex_literal(&addr)?,
+                    module: Identifier::new(module)?,
+                    name: Identifier::new(name)?,
+                    type_params: ty_args,
+                }))
+            }
+            tok => bail!("unexpected token {:?}, expected type tag", tok),
+        })
+    }
+
+    fn parse_transaction_argument(&mut self) -> Result<TransactionArgument> {
+        Ok(match self.next()? {
+            Token::U8(s) => TransactionArgument::U8(s.replace('_', "").parse()?),
+            Token::U16(s) => TransactionArgument::U16(s.replace('_', "").parse()?),
+            Token::U32(s) => TransactionArgument::U32(s.replace('_', "").parse()?),
+            Token::U64(s) => TransactionArgument::U64(s.replace('_', "").parse()?),
+            Token::U128(s) => TransactionArgument::U128(s.replace('_', "").parse()?),
+            Token::U256(s) => TransactionArgument::U256(s.replace('_', "").parse()?),
+            Token::True => TransactionArgument::Bool(true),
+            Token::False => TransactionArgument::Bool(false),
+            Token::Address(addr) => {
+                TransactionArgument::Address(AccountAddress::from_hex_literal(&addr)?)
+            }
+            Token::Bytes(s) => TransactionArgument::U8Vector(hex::decode(s)?),
+            tok => bail!("unexpected token {:?}, expected transaction argument", tok),
+        })
+    }
+}
+
+fn parse<F, T>(s: &str, f: F) -> Result<T>
+where
+    F: Fn(&mut Parser<std::vec::IntoIter<Token>>) -> Result<T>,
+{
+    let mut tokens: Vec<_> = tokenize(s)?
+        .into_iter()
+        .filter(|tok| !tok.is_whitespace())
+        .collect();
+    tokens.push(Token::EOF);
+    let mut parser = Parser::new(tokens);
+    let res = f(&mut parser)?;
+    parser.consume(Token::EOF)?;
+    Ok(res)
+}
+
+pub fn parse_string_list(s: &str) -> Result<Vec<String>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(|parser| parser.parse_string(), Token::EOF, true)
+    })
+}
+
+pub fn parse_type_tags(s: &str) -> Result<Vec<TypeTag>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(|parser| parser.parse_type_tag(), Token::EOF, true)
+    })
+}
+
+pub fn parse_type_tag(s: &str) -> Result<TypeTag> {
+    parse(s, |parser| parser.parse_type_tag())
+}
+
+pub fn parse_transaction_arguments(s: &str) -> Result<Vec<TransactionArgument>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(
+            |parser| parser.parse_transaction_argument(),
+            Token::EOF,
+            true,
+        )
+    })
+}
+
+pub fn parse_transaction_argument(s: &str) -> Result<TransactionArgument> {
+    parse(s, |parser| parser.parse_transaction_argument())
+}
+
+pub fn parse_struct_tag(s: &str) -> Result<StructTag> {
+    let type_tag = parse(s, |parser| parser.parse_type_tag())
+        .map_err(|e| format_err!("invalid struct tag: {}, {}", s, e))?;
+    if let TypeTag::Struct(struct_tag) = type_tag {
+        Ok(*struct_tag)
+    } else {
+        bail!("invalid struct tag: {}", s)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+
+    use crate::{
+        account_address::AccountAddress,
+        parser::{parse_struct_tag, parse_transaction_argument, parse_type_tag},
+        transaction_argument::TransactionArgument,
+        u256,
+    };
+
+    #[allow(clippy::unreadable_literal)]
+    #[test]
+    fn tests_parse_transaction_argument_positive() {
+        use TransactionArgument as T;
+
+        for (s, expected) in &[
+            ("  0u8", T::U8(0)),
+            ("0u8", T::U8(0)),
+            ("255u8", T::U8(255)),
+            ("0", T::U64(0)),
+            ("0123", T::U64(123)),
+            ("0u64", T::U64(0)),
+            ("18446744073709551615", T::U64(18446744073709551615)),
+            ("18446744073709551615u64", T::U64(18446744073709551615)),
+            ("0u128", T::U128(0)),
+            ("1_0u8", T::U8(1_0)),
+            ("10_u8", T::U8(10)),
+            ("10___u8", T::U8(10)),
+            ("1_000u64", T::U64(1_000)),
+            ("1_000", T::U64(1_000)),
+            ("1_0_0_0u64", T::U64(1_000)),
+            ("1_000_000u128", T::U128(1_000_000)),
+            (
+                "340282366920938463463374607431768211455u128",
+                T::U128(340282366920938463463374607431768211455),
+            ),
+            ("  0u16", T::U16(0)),
+            ("0u16", T::U16(0)),
+            ("532u16", T::U16(532)),
+            ("65535u16", T::U16(65535)),
+            ("0u32", T::U32(0)),
+            ("01239498u32", T::U32(1239498)),
+            ("35366u32", T::U32(35366)),
+            ("4294967295u32", T::U32(4294967295)),
+            ("0u256", T::U256(u256::U256::from(0u8))),
+            ("1_0u16", T::U16(1_0)),
+            ("10_u16", T::U16(10)),
+            ("10___u16", T::U16(10)),
+            ("1_000u32", T::U32(1_000)),
+            ("1_0_00u32", T::U32(1_000)),
+            ("1_0_0_0u32", T::U32(1_000)),
+            ("1_000_000u256", T::U256(u256::U256::from(1_000_000u64))),
+            (
+                "1_000_000_000u256",
+                T::U256(u256::U256::from(1_000_000_000u128)),
+            ),
+            (
+                "3402823669209384634633746074317682114551234u256",
+                T::U256(
+                    u256::U256::from_str("3402823669209384634633746074317682114551234").unwrap(),
+                ),
+            ),
+            ("true", T::Bool(true)),
+            ("false", T::Bool(false)),
+            (
+                "0x0",
+                T::Address(AccountAddress::from_hex_literal("0x0").unwrap()),
+            ),
+            (
+                "0x54afa3526",
+                T::Address(AccountAddress::from_hex_literal("0x54afa3526").unwrap()),
+            ),
+            (
+                "0X54afa3526",
+                T::Address(AccountAddress::from_hex_literal("0x54afa3526").unwrap()),
+            ),
+            ("x\"7fff\"", T::U8Vector(vec![0x7f, 0xff])),
+            ("x\"\"", T::U8Vector(vec![])),
+            ("x\"00\"", T::U8Vector(vec![0x00])),
+            ("x\"deadbeef\"", T::U8Vector(vec![0xde, 0xad, 0xbe, 0xef])),
+        ] {
+            assert_eq!(&parse_transaction_argument(s).unwrap(), expected)
+        }
+    }
+
+    #[test]
+    fn tests_parse_transaction_argument_negative() {
+        /// Test cases for the parser that should always fail.
+        const PARSE_VALUE_NEGATIVE_TEST_CASES: &[&str] = &[
+            "-3",
+            "0u42",
+            "0u645",
+            "0u64x",
+            "0u6 4",
+            "0u",
+            "_10",
+            "_10_u8",
+            "_10__u8",
+            "_1014__u32",
+            "10_u8__",
+            "_",
+            "__",
+            "__4",
+            "_u8",
+            "5_bool",
+            "256u8",
+            "18446744073709551616u64",
+            "340282366920938463463374607431768211456u128",
+            "340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456u256",
+            "0xg",
+            "0x00g0",
+            "0x",
+            "0x_",
+            "",
+            "@@",
+            "()",
+            "x\"ffff",
+            "x\"a \"",
+            "x\" \"",
+            "x\"0g\"",
+            "x\"0\"",
+            "garbage",
+            "true3",
+            "3false",
+            "3 false",
+            "",
+        ];
+
+        for s in PARSE_VALUE_NEGATIVE_TEST_CASES {
+            assert!(
+                parse_transaction_argument(s).is_err(),
+                "test case unexpectedly succeeded: {}",
+                s
+            )
+        }
+    }
+
+    #[test]
+    fn test_type_tag() {
+        for s in &[
+            "u64",
+            "bool",
+            "vector<u8>",
+            "vector<vector<u64>>",
+            "vector<u16>",
+            "vector<vector<u16>>",
+            "vector<u32>",
+            "vector<vector<u32>>",
+            "vector<u128>",
+            "vector<vector<u128>>",
+            "vector<u256>",
+            "vector<vector<u256>>",
+            "signer",
+            "0x1::M::S",
+            "0x2::M::S_",
+            "0x3::M_::S",
+            "0x4::M_::S_",
+            "0x00000000004::M::S",
+            "0x1::M::S<u64>",
+            "0x1::M::S<u16>",
+            "0x1::M::S<u32>",
+            "0x1::M::S<u256>",
+            "0x1::M::S<0x2::P::Q>",
+            "vector<0x1::M::S>",
+            "vector<0x1::M_::S_>",
+            "vector<vector<0x1::M_::S_>>",
+            "0x1::M::S<vector<u8>>",
+            "0x1::M::S<vector<u16>>",
+            "0x1::M::S<vector<u32>>",
+            "0x1::M::S<vector<u64>>",
+            "0x1::M::S<vector<u128>>",
+            "0x1::M::S<vector<u256>>",
+        ] {
+            assert!(parse_type_tag(s).is_ok(), "Failed to parse tag {}", s);
+        }
+    }
+
+    #[test]
+    fn test_parse_valid_struct_tag() {
+        let valid = vec![
+            "0x1::Diem::Diem",
+            "0x1::Diem_Type::Diem",
+            "0x1::Diem_::Diem",
+            "0x1::X_123::X32_",
+            "0x1::Diem::Diem_Type",
+            "0x1::Diem::Diem<0x1::XDX::XDX>",
+            "0x1::Diem::Diem<0x1::XDX::XDX_Type>",
+            "0x1::Diem::Diem<u8>",
+            "0x1::Diem::Diem<u64>",
+            "0x1::Diem::Diem<u128>",
+            "0x1::Diem::Diem<u16>",
+            "0x1::Diem::Diem<u32>",
+            "0x1::Diem::Diem<u256>",
+            "0x1::Diem::Diem<bool>",
+            "0x1::Diem::Diem<address>",
+            "0x1::Diem::Diem<signer>",
+            "0x1::Diem::Diem<vector<0x1::XDX::XDX>>",
+            "0x1::Diem::Diem<u8,bool>",
+            "0x1::Diem::Diem<u8,   bool>",
+            "0x1::Diem::Diem<u16,bool>",
+            "0x1::Diem::Diem<u32,   bool>",
+            "0x1::Diem::Diem<u128,bool>",
+            "0x1::Diem::Diem<u256,   bool>",
+            "0x1::Diem::Diem<u8  ,bool>",
+            "0x1::Diem::Diem<u8 , bool  ,    vector<u8>,address,signer>",
+            "0x1::Diem::Diem<vector<0x1::Diem::Struct<0x1::XUS::XUS>>>",
+            "0x1::Diem::Diem<0x1::Diem::Struct<vector<0x1::XUS::XUS>, 0x1::Diem::Diem<vector<0x1::Diem::Struct<0x1::XUS::XUS>>>>>",
+        ];
+        for text in valid {
+            let st = parse_struct_tag(text).expect("valid StructTag");
+            assert_eq!(
+                st.to_string().replace(' ', ""),
+                text.replace(' ', ""),
+                "text: {:?}, StructTag: {:?}",
+                text,
+                st
+            );
+        }
+    }
+
+    #[test]
+    fn test_parse_struct_tag_with_type_names() {
+        let names = vec![
+            "address", "vector", "u128", "u256", "u64", "u32", "u16", "u8", "bool", "signer",
+        ];
+
+        let mut tests = vec![];
+        for name in &names {
+            for name_type in &names {
+                tests.push(format!("0x1::{name}::{name_type}"))
+            }
+        }
+
+        let mut instantiations = vec![];
+        for ty in &tests {
+            for other_ty in &tests {
+                instantiations.push(format!("{ty}<{other_ty}>"))
+            }
+        }
+
+        for text in tests.iter().chain(instantiations.iter()) {
+            let st = parse_struct_tag(text).expect("valid StructTag");
+            assert_eq!(
+                st.to_string().replace(' ', ""),
+                text.replace(' ', ""),
+                "text: {:?}, StructTag: {:?}",
+                text,
+                st
+            );
+        }
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/proptest_types.rs b/vendors/move/crates/move-core-types/src/proptest_types.rs
new file mode 100644
index 000000000..73bb35a71
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/proptest_types.rs
@@ -0,0 +1,67 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    transaction_argument::TransactionArgument,
+};
+use proptest::{collection::vec, prelude::*};
+impl Arbitrary for TypeTag {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        use TypeTag::*;
+        let leaf = prop_oneof![
+            Just(Bool),
+            Just(U8),
+            Just(U16),
+            Just(U32),
+            Just(U64),
+            Just(U128),
+            Just(U256),
+            Just(Address),
+            Just(Vector(Box::new(Bool))),
+        ];
+        leaf.prop_recursive(
+            8,  // levels deep
+            16, // max size
+            4,  // max number of items per collection
+            |inner| {
+                (
+                    any::<AccountAddress>(),
+                    any::<Identifier>(),
+                    any::<Identifier>(),
+                    vec(inner, 0..4),
+                )
+                    .prop_map(|(address, module, name, type_params)| {
+                        Struct(Box::new(StructTag {
+                            address,
+                            module,
+                            name,
+                            type_params,
+                        }))
+                    })
+            },
+        )
+        .boxed()
+    }
+}
+
+impl Arbitrary for TransactionArgument {
+    type Parameters = ();
+    fn arbitrary_with(_args: ()) -> Self::Strategy {
+        prop_oneof![
+            any::<bool>().prop_map(TransactionArgument::Bool),
+            any::<u64>().prop_map(TransactionArgument::U64),
+            any::<AccountAddress>().prop_map(TransactionArgument::Address),
+            vec(any::<u8>(), 0..10).prop_map(TransactionArgument::U8Vector),
+        ]
+        .boxed()
+    }
+
+    type Strategy = BoxedStrategy<Self>;
+}
diff --git a/vendors/move/crates/move-core-types/src/resolver.rs b/vendors/move/crates/move-core-types/src/resolver.rs
new file mode 100644
index 000000000..0b4cf6b4c
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/resolver.rs
@@ -0,0 +1,143 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::IdentStr,
+    language_storage::{ModuleId, StructTag},
+};
+use std::fmt::Debug;
+use std::sync::Arc;
+
+/// Traits for resolving Move modules and resources from persistent storage
+
+/// An execution context that remaps the modules referred to at runtime according to a linkage
+/// table, allowing the same module in storage to be run against different dependencies.
+///
+/// Default implementation does no re-linking (Module IDs are unchanged by relocation and the
+/// link context is a constant value).
+pub trait LinkageResolver {
+    type Error: Debug;
+
+    /// The link context identifies the mapping from runtime `ModuleId`s to the `ModuleId`s in
+    /// storage that they are loaded from as returned by `relocate`.
+    fn link_context(&self) -> AccountAddress {
+        AccountAddress::ZERO
+    }
+
+    /// Translate the runtime `module_id` to the on-chain `ModuleId` that it should be loaded from.
+    fn relocate(&self, module_id: &ModuleId) -> Result<ModuleId, Self::Error> {
+        Ok(module_id.clone())
+    }
+
+    /// Translate the runtime fully-qualified struct name to the on-chain `ModuleId` that originally
+    /// defined that type.
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        _struct: &IdentStr,
+    ) -> Result<ModuleId, Self::Error> {
+        Ok(module_id.clone())
+    }
+}
+
+/// A persistent storage backend that can resolve modules by address + name.
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ModuleResolver {
+    type Error: Debug;
+
+    fn get_module(&self, id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error>;
+}
+
+/// A persistent storage backend that can resolve resources by address + type
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ResourceResolver {
+    type Error: Debug;
+
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        typ: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error>;
+}
+
+/// A persistent storage implementation that can resolve both resources and modules
+pub trait MoveResolver:
+    LinkageResolver<Error = Self::Err>
+    + ModuleResolver<Error = Self::Err>
+    + ResourceResolver<Error = Self::Err>
+{
+    type Err: Debug;
+}
+
+impl<
+        E: Debug,
+        T: LinkageResolver<Error = E>
+            + ModuleResolver<Error = E>
+            + ResourceResolver<Error = E>
+            + ?Sized,
+    > MoveResolver for T
+{
+    type Err = E;
+}
+
+impl<T: ResourceResolver + ?Sized> ResourceResolver for &T {
+    type Error = T::Error;
+
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        (**self).get_resource(address, tag)
+    }
+}
+
+impl<T: ModuleResolver + ?Sized> ModuleResolver for &T {
+    type Error = T::Error;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        (**self).get_module(module_id)
+    }
+}
+
+impl<T: ModuleResolver + ?Sized> ModuleResolver for Arc<T> {
+    type Error = T::Error;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        (**self).get_module(module_id)
+    }
+}
+
+impl<T: LinkageResolver + ?Sized> LinkageResolver for &T {
+    type Error = T::Error;
+
+    fn link_context(&self) -> AccountAddress {
+        (**self).link_context()
+    }
+
+    fn relocate(&self, module_id: &ModuleId) -> Result<ModuleId, Self::Error> {
+        (**self).relocate(module_id)
+    }
+
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> Result<ModuleId, Self::Error> {
+        (**self).defining_module(module_id, struct_)
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/runtime_value.rs b/vendors/move/crates/move-core-types/src/runtime_value.rs
new file mode 100644
index 000000000..759f398c7
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/runtime_value.rs
@@ -0,0 +1,385 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{account_address::AccountAddress, annotated_value as A, fmt_list, u256};
+use anyhow::{anyhow, Result as AResult};
+use move_proc_macros::test_variant_order;
+use serde::{
+    de::Error as DeError,
+    ser::{SerializeSeq, SerializeTuple},
+    Deserialize, Serialize,
+};
+use std::fmt::{self, Debug};
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this name
+pub const MOVE_STRUCT_NAME: &str = "struct";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the first field
+pub const MOVE_STRUCT_TYPE: &str = "type";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the second field
+pub const MOVE_STRUCT_FIELDS: &str = "fields";
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct MoveStruct(pub Vec<MoveValue>);
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum MoveValue {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Bool(bool),
+    Address(AccountAddress),
+    Vector(Vec<MoveValue>),
+    Struct(MoveStruct),
+    Signer(AccountAddress),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MoveStructLayout(pub Vec<MoveTypeLayout>);
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[test_variant_order(src/unit_tests/staged_enum_variant_order/move_type_layout.yaml)]
+pub enum MoveTypeLayout {
+    #[serde(rename(serialize = "bool", deserialize = "bool"))]
+    Bool,
+    #[serde(rename(serialize = "u8", deserialize = "u8"))]
+    U8,
+    #[serde(rename(serialize = "u64", deserialize = "u64"))]
+    U64,
+    #[serde(rename(serialize = "u128", deserialize = "u128"))]
+    U128,
+    #[serde(rename(serialize = "address", deserialize = "address"))]
+    Address,
+    #[serde(rename(serialize = "vector", deserialize = "vector"))]
+    Vector(Box<MoveTypeLayout>),
+    #[serde(rename(serialize = "struct", deserialize = "struct"))]
+    Struct(MoveStructLayout),
+    #[serde(rename(serialize = "signer", deserialize = "signer"))]
+    Signer,
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename(serialize = "u16", deserialize = "u16"))]
+    U16,
+    #[serde(rename(serialize = "u32", deserialize = "u32"))]
+    U32,
+    #[serde(rename(serialize = "u256", deserialize = "u256"))]
+    U256,
+}
+
+impl MoveValue {
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveTypeLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn simple_serialize(&self) -> Option<Vec<u8>> {
+        bcs::to_bytes(self).ok()
+    }
+
+    pub fn vector_u8(v: Vec<u8>) -> Self {
+        MoveValue::Vector(v.into_iter().map(MoveValue::U8).collect())
+    }
+
+    /// Converts the `Vec<MoveValue>` to a `Vec<u8>` if the inner `MoveValue` is a `MoveValue::U8`,
+    /// or returns an error otherwise.
+    pub fn vec_to_vec_u8(vec: Vec<MoveValue>) -> AResult<Vec<u8>> {
+        let mut vec_u8 = Vec::with_capacity(vec.len());
+
+        for byte in vec {
+            match byte {
+                MoveValue::U8(u8) => {
+                    vec_u8.push(u8);
+                }
+                _ => {
+                    return Err(anyhow!(
+                        "Expected inner MoveValue in Vec<MoveValue> to be a MoveValue::U8"
+                            .to_string(),
+                    ));
+                }
+            }
+        }
+        Ok(vec_u8)
+    }
+
+    pub fn vector_address(v: Vec<AccountAddress>) -> Self {
+        MoveValue::Vector(v.into_iter().map(MoveValue::Address).collect())
+    }
+
+    pub fn decorate(self, layout: &A::MoveTypeLayout) -> A::MoveValue {
+        match (self, layout) {
+            (MoveValue::Struct(s), A::MoveTypeLayout::Struct(l)) => {
+                A::MoveValue::Struct(s.decorate(l))
+            }
+            (MoveValue::Vector(vals), A::MoveTypeLayout::Vector(t)) => {
+                A::MoveValue::Vector(vals.into_iter().map(|v| v.decorate(t)).collect())
+            }
+            (MoveValue::U8(a), _) => A::MoveValue::U8(a),
+            (MoveValue::U64(u), _) => A::MoveValue::U64(u),
+            (MoveValue::U128(u), _) => A::MoveValue::U128(u),
+            (MoveValue::Bool(b), _) => A::MoveValue::Bool(b),
+            (MoveValue::Address(a), _) => A::MoveValue::Address(a),
+            (MoveValue::Signer(a), _) => A::MoveValue::Signer(a),
+            (MoveValue::U16(u), _) => A::MoveValue::U16(u),
+            (MoveValue::U32(u), _) => A::MoveValue::U32(u),
+            (MoveValue::U256(u), _) => A::MoveValue::U256(u),
+            _ => panic!("Invalid decoration"),
+        }
+    }
+}
+
+pub fn serialize_values<'a, I>(vals: I) -> Vec<Vec<u8>>
+where
+    I: IntoIterator<Item = &'a MoveValue>,
+{
+    vals.into_iter()
+        .map(|val| {
+            val.simple_serialize()
+                .expect("serialization should succeed")
+        })
+        .collect()
+}
+
+impl MoveStruct {
+    pub fn new(value: Vec<MoveValue>) -> Self {
+        Self(value)
+    }
+
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveStructLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn decorate(self, layout: &A::MoveStructLayout) -> A::MoveStruct {
+        let MoveStruct(vals) = self;
+        let A::MoveStructLayout { type_, fields } = layout;
+        A::MoveStruct {
+            type_: type_.clone(),
+            fields: vals
+                .into_iter()
+                .zip(fields)
+                .map(|(v, l)| (l.name.clone(), v.decorate(&l.layout)))
+                .collect(),
+        }
+    }
+
+    pub fn fields(&self) -> &[MoveValue] {
+        &self.0
+    }
+
+    pub fn into_fields(self) -> Vec<MoveValue> {
+        self.0
+    }
+}
+
+impl MoveStructLayout {
+    pub fn new(types: Vec<MoveTypeLayout>) -> Self {
+        Self(types)
+    }
+
+    pub fn fields(&self) -> &[MoveTypeLayout] {
+        &self.0
+    }
+
+    pub fn into_fields(self) -> Vec<MoveTypeLayout> {
+        self.0
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveTypeLayout {
+    type Value = MoveValue;
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        match self {
+            MoveTypeLayout::Bool => bool::deserialize(deserializer).map(MoveValue::Bool),
+            MoveTypeLayout::U8 => u8::deserialize(deserializer).map(MoveValue::U8),
+            MoveTypeLayout::U16 => u16::deserialize(deserializer).map(MoveValue::U16),
+            MoveTypeLayout::U32 => u32::deserialize(deserializer).map(MoveValue::U32),
+            MoveTypeLayout::U64 => u64::deserialize(deserializer).map(MoveValue::U64),
+            MoveTypeLayout::U128 => u128::deserialize(deserializer).map(MoveValue::U128),
+            MoveTypeLayout::U256 => u256::U256::deserialize(deserializer).map(MoveValue::U256),
+            MoveTypeLayout::Address => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Address)
+            }
+            MoveTypeLayout::Signer => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Signer)
+            }
+            MoveTypeLayout::Struct(ty) => Ok(MoveValue::Struct(ty.deserialize(deserializer)?)),
+            MoveTypeLayout::Vector(layout) => Ok(MoveValue::Vector(
+                deserializer.deserialize_seq(VectorElementVisitor(layout))?,
+            )),
+        }
+    }
+}
+
+struct VectorElementVisitor<'a>(&'a MoveTypeLayout);
+
+impl<'d, 'a> serde::de::Visitor<'d> for VectorElementVisitor<'a> {
+    type Value = Vec<MoveValue>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Vector")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        while let Some(elem) = seq.next_element_seed(self.0)? {
+            vals.push(elem)
+        }
+        Ok(vals)
+    }
+}
+
+struct StructFieldVisitor<'a>(&'a [MoveTypeLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
+    type Value = Vec<MoveValue>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut val = Vec::new();
+        for (i, field_type) in self.0.iter().enumerate() {
+            match seq.next_element_seed(field_type)? {
+                Some(elem) => val.push(elem),
+                None => return Err(A::Error::invalid_length(i, &self)),
+            }
+        }
+        Ok(val)
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveStructLayout {
+    type Value = MoveStruct;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        Ok(MoveStruct(deserializer.deserialize_tuple(
+            self.0.len(),
+            StructFieldVisitor(&self.0),
+        )?))
+    }
+}
+
+impl serde::Serialize for MoveValue {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match self {
+            MoveValue::Struct(s) => s.serialize(serializer),
+            MoveValue::Bool(b) => serializer.serialize_bool(*b),
+            MoveValue::U8(i) => serializer.serialize_u8(*i),
+            MoveValue::U16(i) => serializer.serialize_u16(*i),
+            MoveValue::U32(i) => serializer.serialize_u32(*i),
+            MoveValue::U64(i) => serializer.serialize_u64(*i),
+            MoveValue::U128(i) => serializer.serialize_u128(*i),
+            MoveValue::U256(i) => i.serialize(serializer),
+            MoveValue::Address(a) => a.serialize(serializer),
+            MoveValue::Signer(a) => a.serialize(serializer),
+            MoveValue::Vector(v) => {
+                let mut t = serializer.serialize_seq(Some(v.len()))?;
+                for val in v {
+                    t.serialize_element(val)?;
+                }
+                t.end()
+            }
+        }
+    }
+}
+
+impl serde::Serialize for MoveStruct {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut t = serializer.serialize_tuple(self.0.len())?;
+        for v in self.0.iter() {
+            t.serialize_element(v)?;
+        }
+        t.end()
+    }
+}
+
+impl fmt::Display for MoveTypeLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use MoveTypeLayout::*;
+        match self {
+            Bool => write!(f, "bool"),
+            U8 => write!(f, "u8"),
+            U16 => write!(f, "u16"),
+            U32 => write!(f, "u32"),
+            U64 => write!(f, "u64"),
+            U128 => write!(f, "u128"),
+            U256 => write!(f, "u256"),
+            Address => write!(f, "address"),
+            Signer => write!(f, "signer"),
+            Vector(typ) if f.alternate() => write!(f, "vector<{typ:#}>"),
+            Vector(typ) => write!(f, "vector<{typ}>"),
+            Struct(s) if f.alternate() => write!(f, "{s:#}"),
+            Struct(s) => write!(f, "{s}"),
+        }
+    }
+}
+
+/// Helper type that uses `T`'s `Display` implementation as its own `Debug` implementation, to allow
+/// other `Display` implementations in this module to take advantage of the structured formatting
+/// helpers that Rust uses for its own debug types.
+struct DebugAsDisplay<'a, T>(&'a T);
+impl<'a, T: fmt::Display> fmt::Debug for DebugAsDisplay<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "{:#}", self.0)
+        } else {
+            write!(f, "{}", self.0)
+        }
+    }
+}
+
+impl fmt::Display for MoveStructLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use DebugAsDisplay as DD;
+
+        write!(f, "struct ")?;
+        let mut map = f.debug_map();
+        for (i, l) in self.0.iter().enumerate() {
+            map.entry(&i, &DD(&l));
+        }
+
+        map.finish()
+    }
+}
+
+impl fmt::Display for MoveValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            MoveValue::U8(u) => write!(f, "{}u8", u),
+            MoveValue::U16(u) => write!(f, "{}u16", u),
+            MoveValue::U32(u) => write!(f, "{}u32", u),
+            MoveValue::U64(u) => write!(f, "{}u64", u),
+            MoveValue::U128(u) => write!(f, "{}u128", u),
+            MoveValue::U256(u) => write!(f, "{}u256", u),
+            MoveValue::Bool(false) => write!(f, "false"),
+            MoveValue::Bool(true) => write!(f, "true"),
+            MoveValue::Address(a) => write!(f, "{}", a.to_hex_literal()),
+            MoveValue::Signer(a) => write!(f, "signer({})", a.to_hex_literal()),
+            MoveValue::Vector(v) => fmt_list(f, "vector[", v, "]"),
+            MoveValue::Struct(s) => fmt::Display::fmt(s, f),
+        }
+    }
+}
+
+impl fmt::Display for MoveStruct {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt_list(f, "struct[", &self.0, "]")
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/state.rs b/vendors/move/crates/move-core-types/src/state.rs
new file mode 100644
index 000000000..6d94c574a
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/state.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::cell::RefCell;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VMState {
+    DESERIALIZER,
+    VERIFIER,
+    RUNTIME,
+    OTHER,
+}
+
+thread_local! {
+    static STATE: RefCell<VMState> = RefCell::new(VMState::OTHER);
+}
+
+pub fn set_state(state: VMState) -> VMState {
+    STATE.with(|s| s.replace(state))
+}
+
+pub fn get_state() -> VMState {
+    STATE.with(|s| *s.borrow())
+}
diff --git a/vendors/move/crates/move-core-types/src/transaction_argument.rs b/vendors/move/crates/move-core-types/src/transaction_argument.rs
new file mode 100644
index 000000000..43c60f65d
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/transaction_argument.rs
@@ -0,0 +1,150 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{account_address::AccountAddress, runtime_value::MoveValue, u256};
+use anyhow::{anyhow, Error, Result};
+use move_proc_macros::test_variant_order;
+use serde::{Deserialize, Serialize};
+use std::{convert::TryFrom, fmt};
+
+#[derive(Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[test_variant_order(src/unit_tests/staged_enum_variant_order/transaction_argument.yaml)]
+pub enum TransactionArgument {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Address(AccountAddress),
+    U8Vector(#[serde(with = "serde_bytes")] Vec<u8>),
+    Bool(bool),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+impl fmt::Debug for TransactionArgument {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            TransactionArgument::U8(value) => write!(f, "{{U8: {}}}", value),
+            TransactionArgument::U64(value) => write!(f, "{{U64: {}}}", value),
+            TransactionArgument::U128(value) => write!(f, "{{U128: {}}}", value),
+            TransactionArgument::Bool(boolean) => write!(f, "{{BOOL: {}}}", boolean),
+            TransactionArgument::Address(address) => write!(f, "{{ADDRESS: {:?}}}", address),
+            TransactionArgument::U8Vector(vector) => {
+                write!(f, "{{U8Vector: 0x{}}}", hex::encode(vector))
+            }
+            TransactionArgument::U16(value) => write!(f, "{{U16: {}}}", value),
+            TransactionArgument::U32(value) => write!(f, "{{U32: {}}}", value),
+            TransactionArgument::U256(value) => write!(f, "{{U256: {}}}", value),
+        }
+    }
+}
+
+impl From<TransactionArgument> for MoveValue {
+    fn from(val: TransactionArgument) -> Self {
+        match val {
+            TransactionArgument::U8(i) => MoveValue::U8(i),
+            TransactionArgument::U64(i) => MoveValue::U64(i),
+            TransactionArgument::U128(i) => MoveValue::U128(i),
+            TransactionArgument::Address(a) => MoveValue::Address(a),
+            TransactionArgument::Bool(b) => MoveValue::Bool(b),
+            TransactionArgument::U8Vector(v) => MoveValue::vector_u8(v),
+            TransactionArgument::U16(i) => MoveValue::U16(i),
+            TransactionArgument::U32(i) => MoveValue::U32(i),
+            TransactionArgument::U256(i) => MoveValue::U256(i),
+        }
+    }
+}
+
+impl TryFrom<MoveValue> for TransactionArgument {
+    type Error = Error;
+    fn try_from(val: MoveValue) -> Result<Self> {
+        Ok(match val {
+            MoveValue::U8(i) => TransactionArgument::U8(i),
+            MoveValue::U64(i) => TransactionArgument::U64(i),
+            MoveValue::U128(i) => TransactionArgument::U128(i),
+            MoveValue::Address(a) => TransactionArgument::Address(a),
+            MoveValue::Bool(b) => TransactionArgument::Bool(b),
+            MoveValue::Vector(v) => TransactionArgument::U8Vector(
+                v.into_iter()
+                    .map(|mv| {
+                        if let MoveValue::U8(byte) = mv {
+                            Ok(byte)
+                        } else {
+                            Err(anyhow!("unexpected value in bytes: {:?}", mv))
+                        }
+                    })
+                    .collect::<Result<Vec<u8>>>()?,
+            ),
+            MoveValue::Signer(_) | MoveValue::Struct(_) => {
+                return Err(anyhow!("invalid transaction argument: {:?}", val))
+            }
+            MoveValue::U16(i) => TransactionArgument::U16(i),
+            MoveValue::U32(i) => TransactionArgument::U32(i),
+            MoveValue::U256(i) => TransactionArgument::U256(i),
+        })
+    }
+}
+
+/// Convert the transaction arguments into Move values.
+pub fn convert_txn_args(args: &[TransactionArgument]) -> Vec<Vec<u8>> {
+    args.iter()
+        .map(|arg| {
+            MoveValue::from(arg.clone())
+                .simple_serialize()
+                .expect("transaction arguments must serialize")
+        })
+        .collect()
+}
+
+/// Struct for encoding vector<vector<u8>> arguments for script functions
+#[derive(Clone, Hash, Eq, PartialEq, Deserialize)]
+pub struct VecBytes(Vec<serde_bytes::ByteBuf>);
+
+impl VecBytes {
+    pub fn from(vec_bytes: Vec<Vec<u8>>) -> Self {
+        VecBytes(
+            vec_bytes
+                .into_iter()
+                .map(serde_bytes::ByteBuf::from)
+                .collect(),
+        )
+    }
+
+    pub fn into_vec(self) -> Vec<Vec<u8>> {
+        self.0
+            .into_iter()
+            .map(|byte_buf| byte_buf.into_vec())
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::convert::{From, TryInto};
+
+    use crate::{
+        account_address::AccountAddress, runtime_value::MoveValue,
+        transaction_argument::TransactionArgument, u256::U256,
+    };
+
+    #[test]
+    fn test_from_and_to_move_value() {
+        let vals = vec![
+            TransactionArgument::U8(1),
+            TransactionArgument::U16(u16::MAX),
+            TransactionArgument::U32(u32::MAX),
+            TransactionArgument::U64(u64::MAX),
+            TransactionArgument::U128(u128::MAX),
+            TransactionArgument::U256(U256::max_value()),
+            TransactionArgument::Bool(true),
+            TransactionArgument::Address(AccountAddress::from_hex_literal("0x1").unwrap()),
+            TransactionArgument::U8Vector(vec![1, 2, 3, 4]),
+        ];
+        for val in vals {
+            let ret: TransactionArgument = MoveValue::from(val.clone()).try_into().unwrap();
+            assert_eq!(ret, val);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-core-types/src/u256.rs b/vendors/move/crates/move-core-types/src/u256.rs
new file mode 100644
index 000000000..fb240326c
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/u256.rs
@@ -0,0 +1,720 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use ethnum::U256 as EthnumU256;
+use num::{bigint::Sign, BigInt};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::strategy::BoxedStrategy;
+use rand::{
+    distributions::{
+        uniform::{SampleUniform, UniformSampler},
+        Distribution, Standard,
+    },
+    Rng,
+};
+use std::{
+    fmt,
+    mem::size_of,
+    ops::{
+        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitXor, Div, DivAssign, Mul, MulAssign, Rem,
+        RemAssign, Shl, Shr, Sub, SubAssign,
+    },
+};
+use uint::FromStrRadixErr;
+
+// This U256 impl was chosen for now but we are open to changing it as needed
+use primitive_types::U256 as PrimitiveU256;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+const NUM_BITS_PER_BYTE: usize = 8;
+const U256_NUM_BITS: usize = 256;
+pub const U256_NUM_BYTES: usize = U256_NUM_BITS / NUM_BITS_PER_BYTE;
+
+#[derive(Debug)]
+pub struct U256FromStrError(FromStrRadixErr);
+
+/// A list of error categories encountered when parsing numbers.
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum U256CastErrorKind {
+    /// Value too large to fit in U8.
+    TooLargeForU8,
+
+    /// Value too large to fit in U16.
+    TooLargeForU16,
+
+    /// Value too large to fit in U32.
+    TooLargeForU32,
+
+    /// Value too large to fit in U64.
+    TooLargeForU64,
+
+    /// Value too large to fit in U128.
+    TooLargeForU128,
+}
+
+#[derive(Debug)]
+pub struct U256CastError {
+    kind: U256CastErrorKind,
+    val: U256,
+}
+
+impl U256CastError {
+    pub fn new<T: std::convert::Into<U256>>(val: T, kind: U256CastErrorKind) -> Self {
+        Self {
+            kind,
+            val: val.into(),
+        }
+    }
+}
+
+impl std::error::Error for U256CastError {}
+
+impl fmt::Display for U256CastError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let type_str = match self.kind {
+            U256CastErrorKind::TooLargeForU8 => "u8",
+            U256CastErrorKind::TooLargeForU16 => "u16",
+            U256CastErrorKind::TooLargeForU32 => "u32",
+            U256CastErrorKind::TooLargeForU64 => "u64",
+            U256CastErrorKind::TooLargeForU128 => "u128",
+        };
+        let err_str = format!("Cast failed. {} too large for {}.", self.val, type_str);
+        write!(f, "{err_str}")
+    }
+}
+
+impl std::error::Error for U256FromStrError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.0.source()
+    }
+}
+
+impl fmt::Display for U256FromStrError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Copy, PartialOrd, Ord, Default)]
+pub struct U256(PrimitiveU256);
+
+impl fmt::Display for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl fmt::UpperHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::UpperHex::fmt(&self.0, f)
+    }
+}
+
+impl fmt::LowerHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(&self.0, f)
+    }
+}
+
+impl std::str::FromStr for U256 {
+    type Err = U256FromStrError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::from_str_radix(s, 10)
+    }
+}
+
+impl<'de> Deserialize<'de> for U256 {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(U256::from_le_bytes(
+            &(<[u8; U256_NUM_BYTES]>::deserialize(deserializer)?),
+        ))
+    }
+}
+
+impl Serialize for U256 {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.to_le_bytes().serialize(serializer)
+    }
+}
+
+impl Shl<u32> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u32) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shl<u8> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shr<u8> for U256 {
+    type Output = Self;
+
+    fn shr(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs >> rhs)
+    }
+}
+
+impl BitOr<U256> for U256 {
+    type Output = Self;
+
+    fn bitor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs | rhs)
+    }
+}
+
+impl BitAnd<U256> for U256 {
+    type Output = Self;
+
+    fn bitand(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs & rhs)
+    }
+}
+
+impl BitXor<U256> for U256 {
+    type Output = Self;
+
+    fn bitxor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs ^ rhs)
+    }
+}
+
+impl BitAndAssign<U256> for U256 {
+    fn bitand_assign(&mut self, rhs: U256) {
+        *self = *self & rhs;
+    }
+}
+
+// Ignores overflows
+impl Add<U256> for U256 {
+    type Output = Self;
+
+    fn add(self, rhs: U256) -> Self::Output {
+        self.wrapping_add(rhs)
+    }
+}
+
+impl AddAssign<U256> for U256 {
+    fn add_assign(&mut self, rhs: U256) {
+        *self = *self + rhs;
+    }
+}
+
+// Ignores underflows
+impl Sub<U256> for U256 {
+    type Output = Self;
+
+    fn sub(self, rhs: U256) -> Self::Output {
+        self.wrapping_sub(rhs)
+    }
+}
+
+impl SubAssign<U256> for U256 {
+    fn sub_assign(&mut self, rhs: U256) {
+        *self = *self - rhs;
+    }
+}
+
+// Ignores overflows
+impl Mul<U256> for U256 {
+    type Output = Self;
+
+    fn mul(self, rhs: U256) -> Self::Output {
+        self.wrapping_mul(rhs)
+    }
+}
+
+impl MulAssign<U256> for U256 {
+    fn mul_assign(&mut self, rhs: U256) {
+        *self = *self * rhs;
+    }
+}
+
+impl Div<U256> for U256 {
+    type Output = Self;
+
+    fn div(self, rhs: U256) -> Self::Output {
+        Self(self.0 / rhs.0)
+    }
+}
+
+impl DivAssign<U256> for U256 {
+    fn div_assign(&mut self, rhs: U256) {
+        *self = *self / rhs;
+    }
+}
+
+impl Rem<U256> for U256 {
+    type Output = Self;
+
+    fn rem(self, rhs: U256) -> Self::Output {
+        Self(self.0 % rhs.0)
+    }
+}
+
+impl RemAssign<U256> for U256 {
+    fn rem_assign(&mut self, rhs: U256) {
+        *self = Self(self.0 % rhs.0);
+    }
+}
+
+impl U256 {
+    /// Zero value as U256
+    pub const fn zero() -> Self {
+        Self(PrimitiveU256::zero())
+    }
+
+    /// One value as U256
+    pub const fn one() -> Self {
+        Self(PrimitiveU256::one())
+    }
+
+    /// Max value of U256: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    pub const fn max_value() -> Self {
+        Self(PrimitiveU256::max_value())
+    }
+
+    /// U256 from string with radix 10 or 16
+    pub fn from_str_radix(src: &str, radix: u32) -> Result<Self, U256FromStrError> {
+        PrimitiveU256::from_str_radix(src.trim_start_matches('0'), radix)
+            .map(Self)
+            .map_err(U256FromStrError)
+    }
+
+    /// U256 from 32 little endian bytes
+    pub fn from_le_bytes(slice: &[u8; U256_NUM_BYTES]) -> Self {
+        Self(PrimitiveU256::from_little_endian(slice))
+    }
+
+    /// U256 to 32 little endian bytes
+    pub fn to_le_bytes(self) -> [u8; U256_NUM_BYTES] {
+        let mut bytes = [0u8; U256_NUM_BYTES];
+        self.0.to_little_endian(&mut bytes);
+        bytes
+    }
+
+    /// Leading zeros of the number
+    pub fn leading_zeros(&self) -> u32 {
+        self.0.leading_zeros()
+    }
+
+    // Unchecked downcasting. Values as truncated if larger than target max
+    pub fn unchecked_as_u8(&self) -> u8 {
+        self.0.low_u128() as u8
+    }
+
+    pub fn unchecked_as_u16(&self) -> u16 {
+        self.0.low_u128() as u16
+    }
+
+    pub fn unchecked_as_u32(&self) -> u32 {
+        self.0.low_u128() as u32
+    }
+
+    pub fn unchecked_as_u64(&self) -> u64 {
+        self.0.low_u128() as u64
+    }
+
+    pub fn unchecked_as_u128(&self) -> u128 {
+        self.0.low_u128()
+    }
+
+    // Check arithmetic
+    /// Checked integer addition. Computes self + rhs, returning None if overflow occurred.
+    pub fn checked_add(self, rhs: Self) -> Option<Self> {
+        self.0.checked_add(rhs.0).map(Self)
+    }
+
+    /// Checked integer subtraction. Computes self - rhs, returning None if overflow occurred.
+    pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+
+    /// Checked integer multiplication. Computes self * rhs, returning None if overflow occurred.
+    pub fn checked_mul(self, rhs: Self) -> Option<Self> {
+        self.0.checked_mul(rhs.0).map(Self)
+    }
+
+    /// Checked integer division. Computes self / rhs, returning None if rhs == 0.
+    pub fn checked_div(self, rhs: Self) -> Option<Self> {
+        self.0.checked_div(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_rem(self, rhs: Self) -> Option<Self> {
+        self.0.checked_rem(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_shl(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shl(rhs)))
+    }
+
+    /// Checked shift right. Computes self >> rhs, returning None if rhs is larger than or equal to the number of bits in self.
+    pub fn checked_shr(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shr(rhs)))
+    }
+
+    /// Downcast to a an unsigned value of type T
+    /// T must be at most u128
+    pub fn down_cast_lossy<T: std::convert::TryFrom<u128>>(self) -> T {
+        // Size of this type
+        let type_size = size_of::<T>();
+        // Maximum value for this type
+        let max_val: u128 = if type_size < 16 {
+            (1u128 << (NUM_BITS_PER_BYTE * type_size)) - 1u128
+        } else {
+            u128::MAX
+        };
+        // This should never fail
+        match T::try_from(self.0.low_u128() & max_val) {
+            Ok(w) => w,
+            Err(_) => panic!("Fatal! Downcast failed"),
+        }
+    }
+
+    /// Wrapping integer addition. Computes self + rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+    pub fn wrapping_add(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_add(rhs.0).0)
+    }
+
+    /// Wrapping integer subtraction. Computes self - rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a - b) % (2^N), where N is bit width
+    pub fn wrapping_sub(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_sub(rhs.0).0)
+    }
+
+    /// Wrapping integer multiplication. Computes self * rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_mul(b) = (a * b) % (2^N), where N is bit width
+    pub fn wrapping_mul(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_mul(rhs.0).0)
+    }
+
+    /// Implementation of widenining multiply
+    /// https://github.com/rust-random/rand/blob/master/src/distributions/utils.rs
+    #[inline(always)]
+    fn wmul(self, b: Self) -> (Self, Self) {
+        let half = 128;
+        #[allow(non_snake_case)]
+        let LOWER_MASK: U256 = Self::max_value() >> half;
+
+        let mut low = (self & LOWER_MASK).wrapping_mul(b & LOWER_MASK);
+        let mut t = low >> half;
+        low &= LOWER_MASK;
+        t += (self >> half).wrapping_mul(b & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        let mut high = t >> half;
+        t = low >> half;
+        low &= LOWER_MASK;
+        t += (b >> half).wrapping_mul(self & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        high += t >> half;
+        high += (self >> half).wrapping_mul(b >> half);
+
+        (high, low)
+    }
+}
+
+impl From<u8> for U256 {
+    fn from(n: u8) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u16> for U256 {
+    fn from(n: u16) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u32> for U256 {
+    fn from(n: u32) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u64> for U256 {
+    fn from(n: u64) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u128> for U256 {
+    fn from(n: u128) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from BigInt
+impl From<&U256> for BigInt {
+    fn from(n: &U256) -> Self {
+        BigInt::from_bytes_le(Sign::Plus, &n.to_le_bytes())
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from EthnumU256
+impl From<&U256> for EthnumU256 {
+    fn from(n: &U256) -> EthnumU256 {
+        // TODO (ade): use better solution for conversion
+        // Currently using str because EthnumU256 can be little or big endian
+        let num_str = format!("{:X}", n.0);
+        // TODO (ade): remove expect()
+        EthnumU256::from_str_radix(&num_str, 16).expect("Cannot convert to U256")
+    }
+}
+
+impl TryFrom<U256> for u8 {
+    type Error = U256CastError;
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u8::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU8))
+        } else {
+            Ok(n as u8)
+        }
+    }
+}
+
+impl TryFrom<U256> for u16 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u16::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU16))
+        } else {
+            Ok(n as u16)
+        }
+    }
+}
+
+impl TryFrom<U256> for u32 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u32::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU32))
+        } else {
+            Ok(n as u32)
+        }
+    }
+}
+
+impl TryFrom<U256> for u64 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u128();
+        if n > u64::MAX as u128 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU64))
+        } else {
+            Ok(n as u64)
+        }
+    }
+}
+
+impl TryFrom<U256> for u128 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        if n > U256::from(u128::MAX) {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU128))
+        } else {
+            Ok(n.0.low_u128())
+        }
+    }
+}
+
+impl Distribution<U256> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> U256 {
+        let mut dest = [0; U256_NUM_BYTES];
+        rng.fill_bytes(&mut dest);
+        U256::from_le_bytes(&dest)
+    }
+}
+
+// Rand impl below are inspired by u128 impl found in https://rust-random.github.io/rand/src/rand/distributions/uniform.rs.html
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct UniformU256 {
+    low: U256,
+    range: U256,
+    z: U256,
+}
+
+impl SampleUniform for U256 {
+    type Sampler = UniformU256;
+}
+
+impl UniformSampler for UniformU256 {
+    type X = U256;
+
+    fn new<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "Uniform::new called with `low >= high`");
+        UniformSampler::new_inclusive(low, high - U256::one())
+    }
+
+    fn new_inclusive<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "Uniform::new_inclusive called with `low > high`"
+        );
+        let unsigned_max = U256::max_value();
+
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+
+        let ints_to_reject = if range > U256::zero() {
+            (unsigned_max - range) + U256::one() % range
+        } else {
+            U256::zero()
+        };
+
+        UniformU256 {
+            low,
+            range,
+            z: ints_to_reject,
+        }
+    }
+
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+        let range = self.range;
+        if range > U256::zero() {
+            let unsigned_max = U256::max_value();
+            let zone = unsigned_max - self.z;
+            loop {
+                let v: U256 = rng.gen();
+                let (hi, lo) = v.wmul(range);
+                if lo <= zone {
+                    return self.low.wrapping_add(hi);
+                }
+            }
+        } else {
+            // Sample from the entire integer range.
+            rng.gen()
+        }
+    }
+
+    fn sample_single<R: rand::Rng + ?Sized, B1, B2>(low: B1, high: B2, rng: &mut R) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "UniformSampler::sample_single: low >= high");
+        Self::sample_single_inclusive(low, high - U256::one(), rng)
+    }
+
+    fn sample_single_inclusive<R: rand::Rng + ?Sized, B1, B2>(
+        low: B1,
+        high: B2,
+        rng: &mut R,
+    ) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "UniformSampler::sample_single_inclusive: low > high"
+        );
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+        // If the above resulted in wrap-around to 0, the range is U256::MIN..=U256::MAX,
+        // and any integer will do.
+        if range == U256::zero() {
+            return rng.gen();
+        }
+        // conservative but fast approximation. `- 1` is necessary to allow the
+        // same comparison without bias.
+        let zone = (range << range.leading_zeros()).wrapping_sub(U256::one());
+
+        loop {
+            let v: U256 = rng.gen();
+            let (hi, lo) = v.wmul(range);
+            if lo <= zone {
+                return low.wrapping_add(hi);
+            }
+        }
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl proptest::prelude::Arbitrary for U256 {
+    type Strategy = BoxedStrategy<Self>;
+    type Parameters = ();
+    fn arbitrary_with(_params: Self::Parameters) -> Self::Strategy {
+        use proptest::strategy::Strategy as _;
+        proptest::arbitrary::any::<[u8; U256_NUM_BYTES]>()
+            .prop_map(|q| U256::from_le_bytes(&q))
+            .boxed()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl<'a> arbitrary::Arbitrary<'a> for U256 {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        let bytes = <[u8; U256_NUM_BYTES]>::arbitrary(u)?;
+        Ok(U256::from_le_bytes(&bytes))
+    }
+}
+
+#[test]
+fn wrapping_add() {
+    // a + b overflows U256::MAX by 100
+    // By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+
+    let a = U256::from(1234u32);
+    let b = U256::from_str_radix(
+        "115792089237316195423570985008687907853269984665640564039457584007913129638801",
+        10,
+    )
+    .unwrap();
+
+    assert!(a.wrapping_add(b) == U256::from(99u8));
+}
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/identifier_test.rs b/vendors/move/crates/move-core-types/src/unit_tests/identifier_test.rs
new file mode 100644
index 000000000..d59252c79
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/identifier_test.rs
@@ -0,0 +1,139 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    gas_algebra::AbstractMemorySize,
+    identifier::{IdentStr, Identifier, ALLOWED_IDENTIFIERS, ALLOWED_NO_SELF_IDENTIFIERS},
+};
+use bcs::test_helpers::assert_canonical_encode_decode;
+use once_cell::sync::Lazy;
+use proptest::prelude::*;
+use regex::Regex;
+use std::borrow::Borrow;
+
+#[test]
+fn valid_identifiers() {
+    let valid_identifiers = [
+        "foo",
+        "FOO",
+        "Foo",
+        "foo0",
+        "FOO_0",
+        "_Foo1",
+        "FOO2_",
+        "foo_bar_baz",
+        "_0",
+        "__",
+        "____________________",
+        // TODO: <SELF> is an exception. It should be removed once CompiledScript goes away.
+        "<SELF>",
+    ];
+    for identifier in &valid_identifiers {
+        assert!(
+            Identifier::is_valid(identifier),
+            "Identifier '{}' should be valid",
+            identifier
+        );
+    }
+}
+
+#[test]
+fn invalid_identifiers() {
+    let invalid_identifiers = [
+        "",
+        "_",
+        "0",
+        "01",
+        "9876",
+        "0foo",
+        ":foo",
+        "fo\\o",
+        "fo/o",
+        "foo.",
+        "foo-bar",
+        "foo\u{1f389}",
+    ];
+    for identifier in &invalid_identifiers {
+        assert!(
+            !Identifier::is_valid(identifier),
+            "Identifier '{}' should be invalid",
+            identifier
+        );
+    }
+}
+
+proptest! {
+    #[test]
+    fn invalid_identifiers_proptest(identifier in invalid_identifier_strategy()) {
+        // This effectively checks that if a string doesn't match the ALLOWED_IDENTIFIERS regex, it
+        // will be rejected by the is_valid validator. Note that the converse is checked by the
+        // Arbitrary impl for Identifier.
+        prop_assert!(!Identifier::is_valid(&identifier));
+    }
+
+    #[test]
+    fn valid_identifiers_proptest(identifier in ALLOWED_NO_SELF_IDENTIFIERS) {
+        prop_assert!(Identifier::is_valid(&identifier));
+    }
+
+    #[test]
+    fn identifier_string_roundtrip(identifier in any::<Identifier>()) {
+        let s = identifier.clone().into_string();
+        let id2 = Identifier::new(s).expect("identifier should parse correctly");
+        prop_assert_eq!(identifier, id2);
+    }
+
+    #[test]
+    fn identifier_ident_str_equivalence(identifier in any::<Identifier>()) {
+        let s = identifier.clone().into_string();
+        let ident_str = IdentStr::new(&s).expect("identifier should parse correctly");
+        prop_assert_eq!(ident_str, identifier.as_ident_str());
+        prop_assert_eq!(ident_str, identifier.as_ref());
+        prop_assert_eq!(ident_str, identifier.borrow());
+        prop_assert_eq!(ident_str.to_owned(), identifier);
+    }
+
+    #[test]
+    fn serde_json_roundtrip(identifier in any::<Identifier>()) {
+        let ser = serde_json::to_string(&identifier).expect("should serialize correctly");
+        let id2 = serde_json::from_str(&ser).expect("should deserialize correctly");
+        prop_assert_eq!(identifier, id2);
+    }
+
+    #[test]
+    fn identifier_canonical_serialization(identifier in any::<Identifier>()) {
+        assert_canonical_encode_decode(identifier);
+    }
+}
+
+fn invalid_identifier_strategy() -> impl Strategy<Value = String> {
+    static ALLOWED_IDENTIFIERS_REGEX: Lazy<Regex> = Lazy::new(|| {
+        // Need to add anchors to ensure the entire string is matched.
+        Regex::new(&format!("^(?:{})$", ALLOWED_IDENTIFIERS)).unwrap()
+    });
+
+    ".*".prop_filter("Valid identifiers should not be generated", |s| {
+        // Most strings won't match the regex above, so local rejects are OK.
+        !ALLOWED_IDENTIFIERS_REGEX.is_match(s)
+    })
+}
+
+/// Ensure that Identifier instances serialize into strings directly, with no wrapper.
+#[test]
+fn serde_serialize_no_wrapper() {
+    let foobar = Identifier::new("foobar").expect("should parse correctly");
+    let s = serde_json::to_string(&foobar).expect("Identifier should serialize correctly");
+    assert_eq!(s, "\"foobar\"");
+}
+
+/// Ensure abstract size is properly computed
+#[test]
+fn test_abstract_size() {
+    let foobar = Identifier::new("foobar").expect("should parse correctly");
+
+    // Size should be 6 chars * 1 byte/char + = 6 bytes.
+    let expected = AbstractMemorySize::new(6);
+    let actual = foobar.abstract_size_for_gas_metering();
+    assert_eq!(expected, actual);
+}
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/language_storage_test.rs b/vendors/move/crates/move-core-types/src/unit_tests/language_storage_test.rs
new file mode 100644
index 000000000..c36d29e74
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/language_storage_test.rs
@@ -0,0 +1,129 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    gas_algebra::AbstractMemorySize,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag, TYPETAG_ENUM_ABSTRACT_SIZE},
+};
+use bcs::test_helpers::assert_canonical_encode_decode;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_module_id_canonical_roundtrip(module_id in any::<ModuleId>()) {
+        assert_canonical_encode_decode(module_id);
+    }
+}
+
+#[test]
+fn test_type_tag_abstract_size() {
+    // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+    let type_tag1 = TypeTag::Vector(Box::new(TypeTag::U16));
+    // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+    let type_tag2 = TypeTag::Vector(Box::new(TypeTag::U256));
+    // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+    let type_tag3 = TypeTag::Vector(Box::new(TypeTag::U128));
+
+    assert_eq!(
+        type_tag1.abstract_size_for_gas_metering(),
+        *TYPETAG_ENUM_ABSTRACT_SIZE + *TYPETAG_ENUM_ABSTRACT_SIZE
+    );
+    assert_eq!(
+        type_tag2.abstract_size_for_gas_metering(),
+        *TYPETAG_ENUM_ABSTRACT_SIZE + *TYPETAG_ENUM_ABSTRACT_SIZE
+    );
+    assert_eq!(
+        type_tag3.abstract_size_for_gas_metering(),
+        *TYPETAG_ENUM_ABSTRACT_SIZE + *TYPETAG_ENUM_ABSTRACT_SIZE
+    );
+
+    let struct_tag1 = StructTag {
+        // size = AccountAddress::LENGTH
+        address: AccountAddress::ONE,
+        // size = 10
+        module: Identifier::from(IdentStr::new("TestModule").unwrap()),
+        // size = 10
+        name: Identifier::from(IdentStr::new("TestStruct").unwrap()),
+        type_params: vec![
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U8,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U16,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U32,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U64,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U128,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::U256,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::Bool,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::Address,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE
+            TypeTag::Signer,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+            type_tag1,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+            type_tag2,
+            // size = TYPETAG_ENUM_ABSTRACT_SIZE + TYPETAG_ENUM_ABSTRACT_SIZE
+            type_tag3,
+        ],
+    };
+
+    assert_eq!(
+        struct_tag1.abstract_size_for_gas_metering(),
+        AbstractMemorySize::new(
+            u64::from(*TYPETAG_ENUM_ABSTRACT_SIZE) * 15 + 10 + 10 + (AccountAddress::LENGTH as u64)
+        )
+    );
+
+    let type_tag4 = TypeTag::Struct(Box::new(struct_tag1.clone()));
+
+    assert_eq!(
+        type_tag4.abstract_size_for_gas_metering(),
+        struct_tag1.abstract_size_for_gas_metering() + *TYPETAG_ENUM_ABSTRACT_SIZE
+    );
+}
+
+#[test]
+fn test_type_tag_deserialize_case_insensitive() {
+    let org_struct_tag = StructTag {
+        address: AccountAddress::ONE,
+        module: Identifier::from(IdentStr::new("TestModule").unwrap()),
+        name: Identifier::from(IdentStr::new("TestStruct").unwrap()),
+        type_params: vec![
+            TypeTag::U8,
+            TypeTag::U16,
+            TypeTag::U32,
+            TypeTag::U64,
+            TypeTag::U128,
+            TypeTag::U256,
+            TypeTag::Bool,
+            TypeTag::Address,
+            TypeTag::Signer,
+        ],
+    };
+
+    let current_json = serde_json::to_string(&org_struct_tag).unwrap();
+
+    let upper_case_json = format!(
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_params":["U8","U16","U32","U64","U128","U256","Bool","Address","Signer"]}}"##,
+        AccountAddress::ONE
+    );
+    let upper_case_decoded = serde_json::from_str(upper_case_json.as_str()).unwrap();
+    assert_eq!(org_struct_tag, upper_case_decoded);
+
+    let lower_case_json = format!(
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_args":["u8","u16","u32","u64","u128","u256","bool","address","signer"]}}"##,
+        AccountAddress::ONE
+    );
+    let lower_case_decoded = serde_json::from_str(lower_case_json.as_str()).unwrap();
+    assert_eq!(org_struct_tag, lower_case_decoded);
+
+    assert_eq!(current_json, lower_case_json);
+}
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/mod.rs b/vendors/move/crates/move-core-types/src/unit_tests/mod.rs
new file mode 100644
index 000000000..11f899e47
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod identifier_test;
+mod language_storage_test;
+mod value_test;
+mod vm_status_test;
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_type_layout.yaml b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_type_layout.yaml
new file mode 100644
index 000000000..ef64e6ce2
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_type_layout.yaml
@@ -0,0 +1,12 @@
+---
+0: Bool
+1: U8
+2: U64
+3: U128
+4: Address
+5: Vector
+6: Struct
+7: Signer
+8: U16
+9: U32
+10: U256
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_value.yaml b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_value.yaml
new file mode 100644
index 000000000..764463e99
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/move_value.yaml
@@ -0,0 +1,12 @@
+---
+0: U8
+1: U64
+2: U128
+3: Bool
+4: Address
+5: Vector
+6: Struct
+7: Signer
+8: U16
+9: U32
+10: U256
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/transaction_argument.yaml b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/transaction_argument.yaml
new file mode 100644
index 000000000..c55f97d83
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/transaction_argument.yaml
@@ -0,0 +1,10 @@
+---
+0: U8
+1: U64
+2: U128
+3: Address
+4: U8Vector
+5: Bool
+6: U16
+7: U32
+8: U256
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/type_tag.yaml b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/type_tag.yaml
new file mode 100644
index 000000000..3f0bc0066
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/staged_enum_variant_order/type_tag.yaml
@@ -0,0 +1,12 @@
+---
+0: Bool
+1: U8
+2: U64
+3: U128
+4: Address
+5: Signer
+6: Vector
+7: Struct
+8: U16
+9: U32
+10: U256
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/value_test.rs b/vendors/move/crates/move-core-types/src/unit_tests/value_test.rs
new file mode 100644
index 000000000..397de761e
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/value_test.rs
@@ -0,0 +1,120 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    annotated_value as A, ident_str,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    runtime_value as R,
+};
+use serde_json::json;
+
+#[test]
+fn struct_deserialization() {
+    let struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("MyStruct").to_owned(),
+        module: ident_str!("MyModule").to_owned(),
+        type_params: vec![],
+    };
+    let values = vec![R::MoveValue::U64(7), R::MoveValue::Bool(true)];
+    let avalues = vec![A::MoveValue::U64(7), A::MoveValue::Bool(true)];
+    let fields = vec![ident_str!("f").to_owned(), ident_str!("g").to_owned()];
+    let field_values: Vec<(Identifier, A::MoveValue)> =
+        fields.into_iter().zip(avalues.clone()).collect();
+
+    // test each deserialization scheme
+    let runtime_value = R::MoveStruct(values);
+    assert_eq!(
+        serde_json::to_value(&runtime_value).unwrap(),
+        json!([7, true])
+    );
+
+    let typed_value = A::MoveStruct::new(struct_type, field_values);
+    assert_eq!(
+        serde_json::to_value(&typed_value).unwrap(),
+        json!({
+                "fields": { "f": 7, "g": true },
+                "type": "0x0::MyModule::MyStruct"
+            }
+        )
+    );
+}
+
+/// A test which verifies that the BCS representation of
+/// a struct with a single field is equivalent to the BCS
+/// of the value in this field. It also tests
+/// that BCS serialization of utf8 strings is equivalent
+/// to the BCS serialization of vector<u8> of the bytes of
+/// the string.
+#[test]
+fn struct_one_field_equiv_value() {
+    let val = R::MoveValue::Vector(vec![
+        R::MoveValue::U8(1),
+        R::MoveValue::U8(22),
+        R::MoveValue::U8(13),
+        R::MoveValue::U8(99),
+    ]);
+    let s1 = R::MoveValue::Struct(R::MoveStruct(vec![val.clone()]))
+        .simple_serialize()
+        .unwrap();
+    let s2 = val.simple_serialize().unwrap();
+    assert_eq!(s1, s2);
+
+    let utf8_str = "çå∞≠¢õß∂ƒ∫";
+    let vec_u8 = R::MoveValue::Vector(
+        utf8_str
+            .as_bytes()
+            .iter()
+            .map(|c| R::MoveValue::U8(*c))
+            .collect(),
+    );
+    assert_eq!(
+        bcs::to_bytes(utf8_str).unwrap(),
+        vec_u8.simple_serialize().unwrap()
+    )
+}
+
+#[test]
+fn nested_typed_struct_deserialization() {
+    let struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("MyStruct").to_owned(),
+        module: ident_str!("MyModule").to_owned(),
+        type_params: vec![],
+    };
+    let nested_struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("NestedStruct").to_owned(),
+        module: ident_str!("NestedModule").to_owned(),
+        type_params: vec![TypeTag::U8],
+    };
+
+    // test each deserialization scheme
+    let nested_runtime_struct = R::MoveValue::Struct(R::MoveStruct(vec![R::MoveValue::U64(7)]));
+    let runtime_value = R::MoveStruct(vec![nested_runtime_struct]);
+    assert_eq!(serde_json::to_value(&runtime_value).unwrap(), json!([[7]]));
+
+    let nested_typed_struct = A::MoveValue::Struct(A::MoveStruct::new(
+        nested_struct_type,
+        vec![(ident_str!("f").to_owned(), A::MoveValue::U64(7))],
+    ));
+    let typed_value = A::MoveStruct::new(
+        struct_type,
+        vec![(ident_str!("inner").to_owned(), nested_typed_struct)],
+    );
+    assert_eq!(
+        serde_json::to_value(&typed_value).unwrap(),
+        json!({
+            "fields": {
+                "inner": {
+                    "fields": { "f": 7},
+                    "type": "0x0::NestedModule::NestedStruct<u8>",
+                }
+            },
+            "type": "0x0::MyModule::MyStruct"
+        })
+    );
+}
diff --git a/vendors/move/crates/move-core-types/src/unit_tests/vm_status_test.rs b/vendors/move/crates/move-core-types/src/unit_tests/vm_status_test.rs
new file mode 100644
index 000000000..02ba0a3e4
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/unit_tests/vm_status_test.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::vm_status::{StatusCode, VMStatus};
+
+#[test]
+fn test_stats_code() {
+    let vm_status = VMStatus::Error(StatusCode::OUT_OF_GAS);
+    let code = vm_status.status_code();
+    assert_eq!(code, StatusCode::OUT_OF_GAS);
+}
diff --git a/vendors/move/crates/move-core-types/src/vm_status.rs b/vendors/move/crates/move-core-types/src/vm_status.rs
new file mode 100644
index 000000000..69ac8832e
--- /dev/null
+++ b/vendors/move/crates/move-core-types/src/vm_status.rs
@@ -0,0 +1,794 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(clippy::unit_arg)]
+
+use crate::language_storage::ModuleId;
+use anyhow::Result;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use serde::{de, ser, Deserialize, Serialize};
+use std::{convert::TryFrom, fmt};
+
+/// The minimum status code for validation statuses
+pub static VALIDATION_STATUS_MIN_CODE: u64 = 0;
+
+/// The maximum status code for validation statuses
+pub static VALIDATION_STATUS_MAX_CODE: u64 = 999;
+
+/// The minimum status code for verification statuses
+pub static VERIFICATION_STATUS_MIN_CODE: u64 = 1000;
+
+/// The maximum status code for verification statuses
+pub static VERIFICATION_STATUS_MAX_CODE: u64 = 1999;
+
+/// The minimum status code for invariant violation statuses
+pub static INVARIANT_VIOLATION_STATUS_MIN_CODE: u64 = 2000;
+
+/// The maximum status code for invariant violation statuses
+pub static INVARIANT_VIOLATION_STATUS_MAX_CODE: u64 = 2999;
+
+/// The minimum status code for deserialization statuses
+pub static DESERIALIZATION_STATUS_MIN_CODE: u64 = 3000;
+
+/// The maximum status code for deserialization statuses
+pub static DESERIALIZATION_STATUS_MAX_CODE: u64 = 3999;
+
+/// The minimum status code for runtime statuses
+pub static EXECUTION_STATUS_MIN_CODE: u64 = 4000;
+
+/// The maximum status code for runtim statuses
+pub static EXECUTION_STATUS_MAX_CODE: u64 = 4999;
+
+/// A `VMStatus` is represented as either
+/// - `Executed` indicating successful execution
+/// - `Error` indicating an error from the VM itself
+/// - `MoveAbort` indicating an `abort` ocurred inside of a Move program
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum VMStatus {
+    /// The VM status corresponding to an EXECUTED status code
+    Executed,
+
+    /// Indicates an error from the VM, e.g. OUT_OF_GAS, INVALID_AUTH_KEY, RET_TYPE_MISMATCH_ERROR
+    /// etc.
+    /// The code will neither EXECUTED nor ABORTED
+    Error(StatusCode),
+
+    /// Indicates an `abort` from inside Move code. Contains the location of the abort and the code
+    MoveAbort(AbortLocation, /* code */ u64),
+
+    /// Indicates an failure from inside Move code, where the VM could not continue exection, e.g.
+    /// dividing by zero or a missing resource
+    ExecutionFailure {
+        status_code: StatusCode,
+        location: AbortLocation,
+        function: u16,
+        code_offset: u16,
+    },
+}
+
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum KeptVMStatus {
+    Executed,
+    OutOfGas,
+    MoveAbort(AbortLocation, /* code */ u64),
+    ExecutionFailure {
+        location: AbortLocation,
+        function: u16,
+        code_offset: u16,
+    },
+    MiscellaneousError,
+}
+
+impl KeptVMStatus {
+    pub fn is_success(&self) -> bool {
+        matches!(self, KeptVMStatus::Executed)
+    }
+}
+
+pub type DiscardedVMStatus = StatusCode;
+
+/// An `AbortLocation` specifies where a Move program `abort` occurred, either in a function in
+/// a module, or in a script
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum AbortLocation {
+    /// Indicates `abort` occurred in the specified module
+    Module(ModuleId),
+    /// Indicates the `abort` occurred in a script
+    Script,
+}
+
+/// A status type is one of 5 different variants, along with a fallback variant in the case that we
+/// don't recognize the status code.
+#[derive(Clone, PartialEq, Eq, Debug, Hash)]
+pub enum StatusType {
+    Validation,
+    Verification,
+    InvariantViolation,
+    Deserialization,
+    Execution,
+    Unknown,
+}
+
+impl VMStatus {
+    /// Return the status code for the `VMStatus`
+    pub fn status_code(&self) -> StatusCode {
+        match self {
+            Self::Executed => StatusCode::EXECUTED,
+            Self::MoveAbort(_, _) => StatusCode::ABORTED,
+            Self::ExecutionFailure { status_code, .. } => *status_code,
+            Self::Error(code) => {
+                let code = *code;
+                debug_assert!(code != StatusCode::EXECUTED);
+                debug_assert!(code != StatusCode::ABORTED);
+                code
+            }
+        }
+    }
+
+    /// Returns the Move abort code if the status is `MoveAbort`, and `None` otherwise
+    pub fn move_abort_code(&self) -> Option<u64> {
+        match self {
+            Self::MoveAbort(_, code) => Some(*code),
+            Self::Error(_) | Self::ExecutionFailure { .. } | Self::Executed => None,
+        }
+    }
+
+    /// Return the status type for this `VMStatus`. This is solely determined by the `status_code`
+    pub fn status_type(&self) -> StatusType {
+        self.status_code().status_type()
+    }
+
+    /// Returns `Ok` with a recorded status if it should be kept, `Err` of the error code if it
+    /// should be discarded
+    pub fn keep_or_discard(self) -> Result<KeptVMStatus, DiscardedVMStatus> {
+        match self {
+            VMStatus::Executed => Ok(KeptVMStatus::Executed),
+            VMStatus::MoveAbort(location, code) => Ok(KeptVMStatus::MoveAbort(location, code)),
+            VMStatus::ExecutionFailure {
+                status_code: StatusCode::OUT_OF_GAS,
+                ..
+            }
+            | VMStatus::Error(StatusCode::OUT_OF_GAS) => Ok(KeptVMStatus::OutOfGas),
+            VMStatus::ExecutionFailure {
+                status_code: _status_code,
+                location,
+                function,
+                code_offset,
+            } => Ok(KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            }),
+            VMStatus::Error(code) => {
+                match code.status_type() {
+                    // Any unknown error should be discarded
+                    StatusType::Unknown => Err(code),
+                    // Any error that is a validation status (i.e. an error arising from the prologue)
+                    // causes the transaction to not be included.
+                    StatusType::Validation => Err(code),
+                    // If the VM encountered an invalid internal state, we should discard the transaction.
+                    StatusType::InvariantViolation => Err(code),
+                    // A transaction that publishes code that cannot be verified will be charged.
+                    StatusType::Verification => Ok(KeptVMStatus::MiscellaneousError),
+                    // If we are able to decode the`SignedTransaction`, but failed to decode
+                    // `SingedTransaction.raw_transaction.payload` (i.e., the transaction script),
+                    // there should be a charge made to that user's account for the gas fees related
+                    // to decoding, running the prologue etc.
+                    StatusType::Deserialization => Ok(KeptVMStatus::MiscellaneousError),
+                    // Any error encountered during the execution of the transaction will charge gas.
+                    StatusType::Execution => Ok(KeptVMStatus::ExecutionFailure {
+                        location: AbortLocation::Script,
+                        function: 0,
+                        code_offset: 0,
+                    }),
+                }
+            }
+        }
+    }
+}
+
+impl fmt::Display for StatusType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let string = match self {
+            StatusType::Validation => "Validation",
+            StatusType::Verification => "Verification",
+            StatusType::InvariantViolation => "Invariant violation",
+            StatusType::Deserialization => "Deserialization",
+            StatusType::Execution => "Execution",
+            StatusType::Unknown => "Unknown",
+        };
+        write!(f, "{}", string)
+    }
+}
+
+impl fmt::Display for VMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let status_type = self.status_type();
+        let mut status = format!("status {:#?} of type {}", self.status_code(), status_type);
+
+        if let VMStatus::MoveAbort(_, code) = self {
+            status = format!("{} with sub status {}", status, code);
+        }
+
+        write!(f, "{}", status)
+    }
+}
+
+impl fmt::Display for KeptVMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "status ")?;
+        match self {
+            KeptVMStatus::Executed => write!(f, "EXECUTED"),
+            KeptVMStatus::OutOfGas => write!(f, "OUT_OF_GAS"),
+            KeptVMStatus::MiscellaneousError => write!(f, "MISCELLANEOUS_ERROR"),
+            KeptVMStatus::MoveAbort(location, code) => {
+                write!(f, "ABORTED with code {} in {}", code, location)
+            }
+            KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            } => write!(
+                f,
+                "EXECUTION_FAILURE at bytecode offset {} in function index {} in {}",
+                code_offset, function, location
+            ),
+        }
+    }
+}
+
+impl fmt::Debug for VMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            VMStatus::Executed => write!(f, "EXECUTED"),
+            VMStatus::Error(code) => f.debug_struct("ERROR").field("status_code", code).finish(),
+            VMStatus::MoveAbort(location, code) => f
+                .debug_struct("ABORTED")
+                .field("code", code)
+                .field("location", location)
+                .finish(),
+            VMStatus::ExecutionFailure {
+                status_code,
+                location,
+                function,
+                code_offset,
+            } => f
+                .debug_struct("EXECUTION_FAILURE")
+                .field("status_code", status_code)
+                .field("location", location)
+                .field("function_definition", function)
+                .field("code_offset", code_offset)
+                .finish(),
+        }
+    }
+}
+
+impl fmt::Debug for KeptVMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            KeptVMStatus::Executed => write!(f, "EXECUTED"),
+            KeptVMStatus::OutOfGas => write!(f, "OUT_OF_GAS"),
+            KeptVMStatus::MoveAbort(location, code) => f
+                .debug_struct("ABORTED")
+                .field("code", code)
+                .field("location", location)
+                .finish(),
+            KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            } => f
+                .debug_struct("EXECUTION_FAILURE")
+                .field("location", location)
+                .field("function_definition", function)
+                .field("code_offset", code_offset)
+                .finish(),
+            KeptVMStatus::MiscellaneousError => write!(f, "MISCELLANEOUS_ERROR"),
+        }
+    }
+}
+
+impl fmt::Display for AbortLocation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AbortLocation::Script => write!(f, "Script"),
+            AbortLocation::Module(id) => write!(f, "{}", id),
+        }
+    }
+}
+
+impl fmt::Debug for AbortLocation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+impl std::error::Error for VMStatus {}
+
+macro_rules! derive_status_try_from_repr {
+    (
+        #[repr($repr_ty:ident)]
+        $( #[$metas:meta] )*
+        $vis:vis enum $enum_name:ident {
+            $(
+                $variant:ident = $value: expr
+            ),*
+            $( , )?
+        }
+    ) => {
+        #[repr($repr_ty)]
+        $( #[$metas] )*
+        $vis enum $enum_name {
+            $(
+                $variant = $value
+            ),*
+        }
+
+        impl std::convert::TryFrom<$repr_ty> for $enum_name {
+            type Error = &'static str;
+            fn try_from(value: $repr_ty) -> Result<Self, Self::Error> {
+                match value {
+                    $(
+                        $value => Ok($enum_name::$variant),
+                    )*
+                    _ => Err("invalid StatusCode"),
+                }
+            }
+        }
+
+        #[cfg(any(test, feature = "fuzzing"))]
+        const STATUS_CODE_VALUES: &'static [$repr_ty] = &[
+            $($value),*
+        ];
+    };
+}
+
+derive_status_try_from_repr! {
+#[repr(u64)]
+#[allow(non_camel_case_types)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+/// We don't derive Arbitrary on this enum because it is too large and breaks proptest. It is
+/// written for a subset of these in proptest_types. We test conversion between this and protobuf
+/// with a hand-written test.
+pub enum StatusCode {
+    // The status of a transaction as determined by the prologue.
+    // Validation Errors: 0-999
+    // We don't want the default value to be valid
+    UNKNOWN_VALIDATION_STATUS = 0,
+    // The transaction has a bad signature
+    INVALID_SIGNATURE = 1,
+    // Bad account authentication key
+    INVALID_AUTH_KEY = 2,
+    // Sequence number is too old
+    SEQUENCE_NUMBER_TOO_OLD = 3,
+    // Sequence number is too new
+    SEQUENCE_NUMBER_TOO_NEW = 4,
+    // Insufficient balance to pay minimum transaction fee
+    INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE = 5,
+    // The transaction has expired
+    TRANSACTION_EXPIRED = 6,
+    // The sending account does not exist
+    SENDING_ACCOUNT_DOES_NOT_EXIST = 7,
+    // This write set transaction was rejected because it did not meet the
+    // requirements for one.
+    REJECTED_WRITE_SET = 8,
+    // This write set transaction cannot be applied to the current state.
+    INVALID_WRITE_SET = 9,
+    // Length of program field in raw transaction exceeded max length
+    EXCEEDED_MAX_TRANSACTION_SIZE = 10,
+    // This script is not in our allowlist of scripts.
+    UNKNOWN_SCRIPT = 11,
+    // Transaction is trying to publish a new module.
+    UNKNOWN_MODULE = 12,
+    // Max gas units submitted with transaction exceeds max gas units bound
+    // in VM
+    MAX_GAS_UNITS_EXCEEDS_MAX_GAS_UNITS_BOUND = 13,
+    // Max gas units submitted with transaction not enough to cover the
+    // intrinsic cost of the transaction.
+    MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS = 14,
+    // Gas unit price submitted with transaction is below minimum gas price
+    // set in the VM.
+    GAS_UNIT_PRICE_BELOW_MIN_BOUND = 15,
+    // Gas unit price submitted with the transaction is above the maximum
+    // gas price set in the VM.
+    GAS_UNIT_PRICE_ABOVE_MAX_BOUND = 16,
+    // Gas specifier submitted is either malformed (not a valid identifier),
+    // or does not refer to an accepted gas specifier
+    INVALID_GAS_SPECIFIER = 17,
+    // The sending account is frozen
+    SENDING_ACCOUNT_FROZEN = 18,
+    // Unable to deserialize the account blob
+    UNABLE_TO_DESERIALIZE_ACCOUNT = 19,
+    // The currency info was unable to be found
+    CURRENCY_INFO_DOES_NOT_EXIST = 20,
+    // The account sender doesn't have permissions to publish modules
+    INVALID_MODULE_PUBLISHER = 21,
+    // The sending account has no role
+    NO_ACCOUNT_ROLE = 22,
+    // The transaction's chain_id does not match the one published on-chain
+    BAD_CHAIN_ID = 23,
+    // The sequence number is too large and would overflow if the transaction were executed
+    SEQUENCE_NUMBER_TOO_BIG = 24,
+    // The gas currency is not registered as a TransactionFee currency
+    BAD_TRANSACTION_FEE_CURRENCY = 25,
+    // The feature requested is intended for a future Diem version instead of the current one
+    FEATURE_UNDER_GATING = 26,
+    // The number of secondary signer addresses is different from the number of secondary
+    // public keys provided.
+    SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH = 27,
+    // There are duplicates among signers, including the sender and all the secondary signers
+    SIGNERS_CONTAIN_DUPLICATES = 28,
+    // The sequence nonce in the transaction is invalid (too new, too old, or already used).
+    SEQUENCE_NONCE_INVALID = 29,
+    // There was an error when accessing chain-specific account information
+    CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST = 30,
+
+    // When a code module/script is published it is verified. These are the
+    // possible errors that can arise from the verification process.
+    // Verification Errors: 1000-1999
+    UNKNOWN_VERIFICATION_ERROR = 1000,
+    INDEX_OUT_OF_BOUNDS = 1001,
+    INVALID_SIGNATURE_TOKEN = 1003,
+    RECURSIVE_STRUCT_DEFINITION = 1005,
+    FIELD_MISSING_TYPE_ABILITY = 1006,
+    INVALID_FALL_THROUGH = 1007,
+    NEGATIVE_STACK_SIZE_WITHIN_BLOCK = 1009,
+    INVALID_MAIN_FUNCTION_SIGNATURE = 1011,
+    DUPLICATE_ELEMENT = 1012,
+    INVALID_MODULE_HANDLE = 1013,
+    UNIMPLEMENTED_HANDLE = 1014,
+    LOOKUP_FAILED = 1017,
+    TYPE_MISMATCH = 1020,
+    MISSING_DEPENDENCY = 1021,
+    POP_WITHOUT_DROP_ABILITY = 1023,
+    BR_TYPE_MISMATCH_ERROR = 1025,
+    ABORT_TYPE_MISMATCH_ERROR = 1026,
+    STLOC_TYPE_MISMATCH_ERROR = 1027,
+    STLOC_UNSAFE_TO_DESTROY_ERROR = 1028,
+    UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED = 1029,
+    RET_TYPE_MISMATCH_ERROR = 1030,
+    RET_BORROWED_MUTABLE_REFERENCE_ERROR = 1031,
+    FREEZEREF_TYPE_MISMATCH_ERROR = 1032,
+    FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR = 1033,
+    BORROWFIELD_TYPE_MISMATCH_ERROR = 1034,
+    BORROWFIELD_BAD_FIELD_ERROR = 1035,
+    BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR = 1036,
+    COPYLOC_UNAVAILABLE_ERROR = 1037,
+    COPYLOC_WITHOUT_COPY_ABILITY = 1038,
+    COPYLOC_EXISTS_BORROW_ERROR = 1039,
+    MOVELOC_UNAVAILABLE_ERROR = 1040,
+    MOVELOC_EXISTS_BORROW_ERROR = 1041,
+    BORROWLOC_REFERENCE_ERROR = 1042,
+    BORROWLOC_UNAVAILABLE_ERROR = 1043,
+    BORROWLOC_EXISTS_BORROW_ERROR = 1044,
+    CALL_TYPE_MISMATCH_ERROR = 1045,
+    CALL_BORROWED_MUTABLE_REFERENCE_ERROR = 1046,
+    PACK_TYPE_MISMATCH_ERROR = 1047,
+    UNPACK_TYPE_MISMATCH_ERROR = 1048,
+    READREF_TYPE_MISMATCH_ERROR = 1049,
+    READREF_WITHOUT_COPY_ABILITY = 1050,
+    READREF_EXISTS_MUTABLE_BORROW_ERROR = 1051,
+    WRITEREF_TYPE_MISMATCH_ERROR = 1052,
+    WRITEREF_WITHOUT_DROP_ABILITY = 1053,
+    WRITEREF_EXISTS_BORROW_ERROR = 1054,
+    WRITEREF_NO_MUTABLE_REFERENCE_ERROR = 1055,
+    INTEGER_OP_TYPE_MISMATCH_ERROR = 1056,
+    BOOLEAN_OP_TYPE_MISMATCH_ERROR = 1057,
+    EQUALITY_OP_TYPE_MISMATCH_ERROR = 1058,
+    EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT = 1059,
+    BORROWGLOBAL_TYPE_MISMATCH_ERROR = 1060,
+    BORROWGLOBAL_WITHOUT_KEY_ABILITY= 1061,
+    MOVEFROM_TYPE_MISMATCH_ERROR = 1062,
+    MOVEFROM_WITHOUT_KEY_ABILITY = 1063,
+    MOVETO_TYPE_MISMATCH_ERROR = 1064,
+    MOVETO_WITHOUT_KEY_ABILITY= 1065,
+    // The self address of a module the transaction is publishing is not the sender address
+    MODULE_ADDRESS_DOES_NOT_MATCH_SENDER = 1067,
+    // The module does not have any module handles. Each module or script must have at least one
+    // module handle.
+    NO_MODULE_HANDLES = 1068,
+    POSITIVE_STACK_SIZE_AT_BLOCK_END = 1069,
+    MISSING_ACQUIRES_ANNOTATION = 1070,
+    EXTRANEOUS_ACQUIRES_ANNOTATION = 1071,
+    DUPLICATE_ACQUIRES_ANNOTATION = 1072,
+    INVALID_ACQUIRES_ANNOTATION = 1073,
+    GLOBAL_REFERENCE_ERROR = 1074,
+    CONSTRAINT_NOT_SATISFIED = 1075,
+    NUMBER_OF_TYPE_ARGUMENTS_MISMATCH = 1076,
+    LOOP_IN_INSTANTIATION_GRAPH = 1077,
+    // Reported when a struct has zero fields
+    ZERO_SIZED_STRUCT = 1080,
+    LINKER_ERROR = 1081,
+    INVALID_CONSTANT_TYPE = 1082,
+    MALFORMED_CONSTANT_DATA = 1083,
+    EMPTY_CODE_UNIT = 1084,
+    INVALID_LOOP_SPLIT = 1085,
+    INVALID_LOOP_BREAK = 1086,
+    INVALID_LOOP_CONTINUE = 1087,
+    UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP = 1088,
+    TOO_MANY_LOCALS = 1089,
+    GENERIC_MEMBER_OPCODE_MISMATCH = 1090,
+    FUNCTION_RESOLUTION_FAILURE = 1091,
+    INVALID_OPERATION_IN_SCRIPT = 1094,
+    // The sender is trying to publish two modules with the same name in one transaction
+    DUPLICATE_MODULE_NAME = 1095,
+    // The sender is trying to publish a module that breaks the compatibility checks
+    BACKWARD_INCOMPATIBLE_MODULE_UPDATE = 1096,
+    // The updated module introduces a cyclic dependency (i.e., A uses B and B also uses A)
+    CYCLIC_MODULE_DEPENDENCY = 1097,
+    NUMBER_OF_ARGUMENTS_MISMATCH = 1098,
+    INVALID_PARAM_TYPE_FOR_DESERIALIZATION = 1099,
+    FAILED_TO_DESERIALIZE_ARGUMENT = 1100,
+    NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH = 1101,
+    CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE = 1102,
+    EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION = 1103,
+    // Cannot mark the module itself as a friend
+    INVALID_FRIEND_DECL_WITH_SELF = 1104,
+    // Cannot declare modules outside of account address as friends
+    INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS = 1105,
+    // Cannot declare modules that this module depends on as friends
+    INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES = 1106,
+    // The updated module introduces a cyclic friendship (i.e., A friends B and B also friends A)
+    CYCLIC_MODULE_FRIENDSHIP = 1107,
+    // A phantom type parameter was used in a non-phantom position.
+    INVALID_PHANTOM_TYPE_PARAM_POSITION = 1108,
+    VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR = 1109,
+    VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR = 1110,
+    // Loops are too deeply nested.
+    LOOP_MAX_DEPTH_REACHED = 1111,
+    TOO_MANY_TYPE_PARAMETERS = 1112,
+    TOO_MANY_PARAMETERS = 1113,
+    TOO_MANY_BASIC_BLOCKS = 1114,
+    VALUE_STACK_OVERFLOW = 1115,
+    TOO_MANY_TYPE_NODES = 1116,
+    VALUE_STACK_PUSH_OVERFLOW = 1117,
+    MAX_DEPENDENCY_DEPTH_REACHED = 1118,
+    MAX_FUNCTION_DEFINITIONS_REACHED = 1119,
+    MAX_STRUCT_DEFINITIONS_REACHED = 1120,
+    MAX_FIELD_DEFINITIONS_REACHED = 1121,
+    // Reserved error code for future use
+    TOO_MANY_BACK_EDGES = 1122,
+    RESERVED_VERIFICATION_ERROR_1 = 1123,
+    RESERVED_VERIFICATION_ERROR_2 = 1124,
+    RESERVED_VERIFICATION_ERROR_3 = 1125,
+    RESERVED_VERIFICATION_ERROR_4 = 1126,
+    RESERVED_VERIFICATION_ERROR_5 = 1127,
+
+    TOO_MANY_VECTOR_ELEMENTS = 1128,
+    IDENTIFIER_TOO_LONG = 1129,
+
+    // Bytecode verifier determined code to complex
+    // or took too long to run based on metering policies
+    PROGRAM_TOO_COMPLEX = 1130,
+
+    // These are errors that the VM might raise if a violation of internal
+    // invariants takes place.
+    // Invariant Violation Errors: 2000-2999
+    UNKNOWN_INVARIANT_VIOLATION_ERROR = 2000,
+    EMPTY_VALUE_STACK = 2003,
+    PC_OVERFLOW = 2005,
+    VERIFICATION_ERROR = 2006,
+    STORAGE_ERROR = 2008,
+    INTERNAL_TYPE_ERROR = 2009,
+    EVENT_KEY_MISMATCH = 2010,
+    UNREACHABLE = 2011,
+    VM_STARTUP_FAILURE = 2012,
+    UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION = 2015,
+    VERIFIER_INVARIANT_VIOLATION = 2016,
+    UNEXPECTED_VERIFIER_ERROR = 2017,
+    UNEXPECTED_DESERIALIZATION_ERROR = 2018,
+    FAILED_TO_SERIALIZE_WRITE_SET_CHANGES = 2019,
+    FAILED_TO_DESERIALIZE_RESOURCE = 2020,
+    // Failed to resolve type due to linking being broken after verification
+    TYPE_RESOLUTION_FAILURE = 2021,
+    DUPLICATE_NATIVE_FUNCTION = 2022,
+    ARITHMETIC_OVERFLOW = 2023,
+
+    // Errors that can arise from binary decoding (deserialization)
+    // Deserializtion Errors: 3000-3999
+    UNKNOWN_BINARY_ERROR = 3000,
+    MALFORMED = 3001,
+    BAD_MAGIC = 3002,
+    UNKNOWN_VERSION = 3003,
+    UNKNOWN_TABLE_TYPE = 3004,
+    UNKNOWN_SIGNATURE_TYPE = 3005,
+    UNKNOWN_SERIALIZED_TYPE = 3006,
+    UNKNOWN_OPCODE = 3007,
+    BAD_HEADER_TABLE = 3008,
+    UNEXPECTED_SIGNATURE_TYPE = 3009,
+    DUPLICATE_TABLE = 3010,
+    UNKNOWN_ABILITY = 3013,
+    UNKNOWN_NATIVE_STRUCT_FLAG = 3014,
+    BAD_U16 = 3017,
+    BAD_U32 = 3018,
+    BAD_U64 = 3019,
+    BAD_U128 = 3020,
+    BAD_U256 = 3021,
+    VALUE_SERIALIZATION_ERROR = 3022,
+    VALUE_DESERIALIZATION_ERROR = 3023,
+    CODE_DESERIALIZATION_ERROR = 3024,
+    INVALID_FLAG_BITS = 3025,
+    TRAILING_BYTES = 3026,
+
+    // Errors that can arise at runtime
+    // Runtime Errors: 4000-4999
+    UNKNOWN_RUNTIME_STATUS = 4000,
+    EXECUTED = 4001,
+    OUT_OF_GAS = 4002,
+    // We tried to access a resource that does not exist under the account.
+    RESOURCE_DOES_NOT_EXIST = 4003,
+    // We tried to create a resource under an account where that resource
+    // already exists.
+    RESOURCE_ALREADY_EXISTS = 4004,
+    MISSING_DATA = 4008,
+    DATA_FORMAT_ERROR = 4009,
+    ABORTED = 4016,
+    ARITHMETIC_ERROR = 4017,
+    VECTOR_OPERATION_ERROR = 4018,
+    EXECUTION_STACK_OVERFLOW = 4020,
+    CALL_STACK_OVERFLOW = 4021,
+    VM_MAX_TYPE_DEPTH_REACHED = 4024,
+    VM_MAX_VALUE_DEPTH_REACHED = 4025,
+    VM_EXTENSION_ERROR = 4026,
+    STORAGE_WRITE_LIMIT_REACHED = 4027,
+    MEMORY_LIMIT_EXCEEDED = 4028,
+    VM_MAX_TYPE_NODES_REACHED = 4029,
+
+    // A reserved status to represent an unknown vm status.
+    // this is std::u64::MAX, but we can't pattern match on that, so put the hardcoded value in
+    UNKNOWN_STATUS = 18446744073709551615,
+}
+}
+
+impl StatusCode {
+    /// Return the status type for this status code
+    pub fn status_type(self) -> StatusType {
+        let major_status_number: u64 = self.into();
+        if major_status_number >= VALIDATION_STATUS_MIN_CODE
+            && major_status_number <= VALIDATION_STATUS_MAX_CODE
+        {
+            return StatusType::Validation;
+        }
+
+        if major_status_number >= VERIFICATION_STATUS_MIN_CODE
+            && major_status_number <= VERIFICATION_STATUS_MAX_CODE
+        {
+            return StatusType::Verification;
+        }
+
+        if major_status_number >= INVARIANT_VIOLATION_STATUS_MIN_CODE
+            && major_status_number <= INVARIANT_VIOLATION_STATUS_MAX_CODE
+        {
+            return StatusType::InvariantViolation;
+        }
+
+        if major_status_number >= DESERIALIZATION_STATUS_MIN_CODE
+            && major_status_number <= DESERIALIZATION_STATUS_MAX_CODE
+        {
+            return StatusType::Deserialization;
+        }
+
+        if major_status_number >= EXECUTION_STATUS_MIN_CODE
+            && major_status_number <= EXECUTION_STATUS_MAX_CODE
+        {
+            return StatusType::Execution;
+        }
+
+        StatusType::Unknown
+    }
+}
+
+// TODO(#1307)
+impl ser::Serialize for StatusCode {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: ser::Serializer,
+    {
+        serializer.serialize_u64((*self).into())
+    }
+}
+
+impl<'de> de::Deserialize<'de> for StatusCode {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: de::Deserializer<'de>,
+    {
+        struct StatusCodeVisitor;
+        impl<'de> de::Visitor<'de> for StatusCodeVisitor {
+            type Value = StatusCode;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+                formatter.write_str("StatusCode as u64")
+            }
+
+            fn visit_u64<E>(self, v: u64) -> std::result::Result<StatusCode, E>
+            where
+                E: de::Error,
+            {
+                Ok(StatusCode::try_from(v).unwrap_or(StatusCode::UNKNOWN_STATUS))
+            }
+        }
+
+        deserializer.deserialize_u64(StatusCodeVisitor)
+    }
+}
+
+impl From<StatusCode> for u64 {
+    fn from(status: StatusCode) -> u64 {
+        status as u64
+    }
+}
+
+pub mod sub_status {
+    // Native Function Error sub-codes
+    pub const NFE_VECTOR_ERROR_BASE: u64 = 0;
+    // Ran out gas while executing native
+    pub const NFE_OUT_OF_GAS: u64 = 1;
+    // Failure in BCS deserialization
+    pub const NFE_BCS_SERIALIZATION_FAILURE: u64 = 0x1C5;
+}
+
+/// The `Arbitrary` impl only generates validation statuses since the full enum is too large.
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for StatusCode {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: ()) -> Self::Strategy {
+        (any::<usize>())
+            .prop_map(|index| {
+                let status_code_value = STATUS_CODE_VALUES[index % STATUS_CODE_VALUES.len()];
+                StatusCode::try_from(status_code_value).unwrap()
+            })
+            .boxed()
+    }
+}
+
+#[test]
+fn test_status_codes() {
+    use std::collections::HashSet;
+    // Make sure that within the 0-EXECUTION_STATUS_MAX_CODE that all of the status codes succeed
+    // when they should, and fail when they should.
+    for possible_major_status_code in 0..=EXECUTION_STATUS_MAX_CODE {
+        if STATUS_CODE_VALUES.contains(&possible_major_status_code) {
+            let status = StatusCode::try_from(possible_major_status_code);
+            assert!(status.is_ok());
+            let to_major_status_code = u64::from(status.unwrap());
+            assert_eq!(possible_major_status_code, to_major_status_code);
+        } else {
+            assert!(StatusCode::try_from(possible_major_status_code).is_err())
+        }
+    }
+
+    let mut seen_statuses = HashSet::new();
+    let mut seen_codes = HashSet::new();
+    // Now make sure that all of the error codes (including any that may be out-of-range) succeed.
+    // Make sure there aren't any duplicate mappings
+    for major_status_code in STATUS_CODE_VALUES.iter() {
+        assert!(
+            !seen_codes.contains(major_status_code),
+            "Duplicate major_status_code found"
+        );
+        seen_codes.insert(*major_status_code);
+        let status = StatusCode::try_from(*major_status_code);
+        assert!(status.is_ok());
+        let unwrapped_status = status.unwrap();
+        assert!(
+            !seen_statuses.contains(&unwrapped_status),
+            "Found duplicate u64 -> Status mapping"
+        );
+        seen_statuses.insert(unwrapped_status);
+        let to_major_status_code = u64::from(unwrapped_status);
+        assert_eq!(*major_status_code, to_major_status_code);
+    }
+}
diff --git a/vendors/move/crates/move-core/types/Cargo.toml b/vendors/move/crates/move-core/types/Cargo.toml
new file mode 100644
index 000000000..fbfd938df
--- /dev/null
+++ b/vendors/move/crates/move-core/types/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "move-core-types"
+version = "0.0.4"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core types for Move"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = ["crates-io"]
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"], optional = true }
+ethnum = "1.0.4"
+hex = "0.4.3"
+num = "0.4.0"
+once_cell = "1.7.2"
+primitive-types = { version = "0.10.1", features = ["impl-serde"] }
+proptest = { version = "1.0.0", default-features = false, optional = true }
+proptest-derive = { version = "0.3.0", default-features = false, optional = true }
+rand = "0.8.3"
+ref-cast = "1.0.6"
+serde = { version = "1.0.124", default-features = false }
+serde_bytes = "0.11.5"
+uint = "0.9.4"
+
+bcs = { workspace = true }
+
+[dev-dependencies]
+arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"] }
+proptest = "1.0.0"
+proptest-derive = "0.3.0"
+regex = "1.5.5"
+serde_json = "1.0.64"
+
+[features]
+default = []
+fuzzing = ["proptest", "proptest-derive", "arbitrary"]
diff --git a/vendors/move/crates/move-core/types/src/abi.rs b/vendors/move/crates/move-core/types/src/abi.rs
new file mode 100644
index 000000000..7e3cee86f
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/abi.rs
@@ -0,0 +1,197 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::language_storage::{ModuleId, TypeTag};
+use serde::{Deserialize, Serialize};
+
+/// How to call a particular Move script (aka. an "ABI").
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub enum ScriptABI {
+    TransactionScript(TransactionScriptABI),
+    ScriptFunction(ScriptFunctionABI),
+}
+
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ScriptFunctionABI {
+    /// The public name of the script.
+    name: String,
+    /// The module name where the script lives.
+    module_name: ModuleId,
+    /// Some text comment.
+    doc: String,
+    /// The names of the type arguments.
+    ty_args: Vec<TypeArgumentABI>,
+    /// The description of regular arguments.
+    args: Vec<ArgumentABI>,
+}
+
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct TransactionScriptABI {
+    /// The public name of the script.
+    name: String,
+    /// Some text comment.
+    doc: String,
+    /// The `code` value to set in the `Script` object.
+    #[serde(with = "serde_bytes")]
+    code: Vec<u8>,
+    /// The names of the type arguments.
+    ty_args: Vec<TypeArgumentABI>,
+    /// The description of regular arguments.
+    args: Vec<ArgumentABI>,
+}
+
+/// The description of a (regular) argument in a script.
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ArgumentABI {
+    /// The name of the argument.
+    name: String,
+    /// The expected type.
+    /// In Move scripts, this does contain generics type parameters.
+    type_tag: TypeTag,
+}
+
+/// The description of a type argument in a script.
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub struct TypeArgumentABI {
+    /// The name of the argument.
+    name: String,
+}
+
+impl TransactionScriptABI {
+    pub fn new(
+        name: String,
+        doc: String,
+        code: Vec<u8>,
+        ty_args: Vec<TypeArgumentABI>,
+        args: Vec<ArgumentABI>,
+    ) -> Self {
+        Self {
+            name,
+            doc,
+            code,
+            ty_args,
+            args,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn doc(&self) -> &str {
+        &self.doc
+    }
+
+    pub fn code(&self) -> &[u8] {
+        &self.code
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        &self.ty_args
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        &self.args
+    }
+}
+
+impl ScriptFunctionABI {
+    pub fn new(
+        name: String,
+        module_name: ModuleId,
+        doc: String,
+        ty_args: Vec<TypeArgumentABI>,
+        args: Vec<ArgumentABI>,
+    ) -> Self {
+        Self {
+            name,
+            module_name,
+            doc,
+            ty_args,
+            args,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn module_name(&self) -> &ModuleId {
+        &self.module_name
+    }
+
+    pub fn doc(&self) -> &str {
+        &self.doc
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        &self.ty_args
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        &self.args
+    }
+}
+
+impl ScriptABI {
+    pub fn is_script_fun_abi(&self) -> bool {
+        matches!(self, Self::ScriptFunction(_))
+    }
+
+    pub fn is_transaction_script_abi(&self) -> bool {
+        matches!(self, Self::TransactionScript(_))
+    }
+
+    pub fn name(&self) -> &str {
+        match self {
+            Self::TransactionScript(abi) => abi.name(),
+            Self::ScriptFunction(abi) => abi.name(),
+        }
+    }
+
+    pub fn doc(&self) -> &str {
+        match self {
+            Self::TransactionScript(abi) => abi.doc(),
+            Self::ScriptFunction(abi) => abi.doc(),
+        }
+    }
+
+    pub fn ty_args(&self) -> &[TypeArgumentABI] {
+        match self {
+            Self::TransactionScript(abi) => abi.ty_args(),
+            Self::ScriptFunction(abi) => abi.ty_args(),
+        }
+    }
+
+    pub fn args(&self) -> &[ArgumentABI] {
+        match self {
+            Self::TransactionScript(abi) => abi.args(),
+            Self::ScriptFunction(abi) => abi.args(),
+        }
+    }
+}
+
+impl ArgumentABI {
+    pub fn new(name: String, type_tag: TypeTag) -> Self {
+        Self { name, type_tag }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn type_tag(&self) -> &TypeTag {
+        &self.type_tag
+    }
+}
+
+impl TypeArgumentABI {
+    pub fn new(name: String) -> Self {
+        Self { name }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/account_address.rs b/vendors/move/crates/move-core/types/src/account_address.rs
new file mode 100644
index 000000000..caaa13cbb
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/account_address.rs
@@ -0,0 +1,441 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex::FromHex;
+use rand::{rngs::OsRng, Rng};
+use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
+use std::{convert::TryFrom, fmt, str::FromStr};
+
+/// A struct that represents an account address.
+#[derive(Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
+pub struct AccountAddress([u8; AccountAddress::LENGTH]);
+
+impl AccountAddress {
+    /// The number of bytes in an address.
+    /// Default to 16 bytes, can be set to 20 bytes with address20 feature.
+    pub const LENGTH: usize = 32;
+    /// Hex address: 0x1
+    pub const ONE: Self = Self::get_hex_address_one();
+    /// Hex address: 0x2
+    pub const TWO: Self = Self::get_hex_address_two();
+    /// Hex address: 0x0
+    pub const ZERO: Self = Self([0u8; Self::LENGTH]);
+
+    pub const fn new(address: [u8; Self::LENGTH]) -> Self {
+        Self(address)
+    }
+
+    const fn get_hex_address_one() -> Self {
+        let mut addr = [0u8; AccountAddress::LENGTH];
+        addr[AccountAddress::LENGTH - 1] = 1u8;
+        Self(addr)
+    }
+
+    const fn get_hex_address_two() -> Self {
+        let mut addr = [0u8; AccountAddress::LENGTH];
+        addr[AccountAddress::LENGTH - 1] = 2u8;
+        Self(addr)
+    }
+
+    pub fn random() -> Self {
+        let mut rng = OsRng;
+        let buf: [u8; Self::LENGTH] = rng.gen();
+        Self(buf)
+    }
+
+    /// Return a canonical string representation of the address
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// e.g., 0000000000000000000000000000000a, *not* 0x0000000000000000000000000000000a, 0xa, or 0xA
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM.
+    pub fn to_canonical_string(&self) -> String {
+        hex::encode(self.0)
+    }
+
+    pub fn short_str_lossless(&self) -> String {
+        let hex_str = hex::encode(self.0).trim_start_matches('0').to_string();
+        if hex_str.is_empty() {
+            "0".to_string()
+        } else {
+            hex_str
+        }
+    }
+
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.0.to_vec()
+    }
+
+    pub fn into_bytes(self) -> [u8; Self::LENGTH] {
+        self.0
+    }
+
+    pub fn from_hex_literal(literal: &str) -> Result<Self, AccountAddressParseError> {
+        if !literal.starts_with("0x") {
+            return Err(AccountAddressParseError);
+        }
+
+        let hex_len = literal.len() - 2;
+
+        // If the string is too short, pad it
+        if hex_len < Self::LENGTH * 2 {
+            let mut hex_str = String::with_capacity(Self::LENGTH * 2);
+            for _ in 0..Self::LENGTH * 2 - hex_len {
+                hex_str.push('0');
+            }
+            hex_str.push_str(&literal[2..]);
+            AccountAddress::from_hex(hex_str)
+        } else {
+            AccountAddress::from_hex(&literal[2..])
+        }
+    }
+
+    pub fn to_hex_literal(&self) -> String {
+        format!("0x{}", self.short_str_lossless())
+    }
+
+    pub fn from_hex<T: AsRef<[u8]>>(hex: T) -> Result<Self, AccountAddressParseError> {
+        <[u8; Self::LENGTH]>::from_hex(hex)
+            .map_err(|_| AccountAddressParseError)
+            .map(Self)
+    }
+
+    pub fn to_hex(&self) -> String {
+        format!("{:x}", self)
+    }
+
+    pub fn from_bytes<T: AsRef<[u8]>>(bytes: T) -> Result<Self, AccountAddressParseError> {
+        <[u8; Self::LENGTH]>::try_from(bytes.as_ref())
+            .map_err(|_| AccountAddressParseError)
+            .map(Self)
+    }
+}
+
+impl AsRef<[u8]> for AccountAddress {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
+
+impl std::ops::Deref for AccountAddress {
+    type Target = [u8; Self::LENGTH];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl fmt::Display for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{:x}", self)
+    }
+}
+
+impl fmt::Debug for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:x}", self)
+    }
+}
+
+impl fmt::LowerHex for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "0x")?;
+        }
+
+        for byte in &self.0 {
+            write!(f, "{:02x}", byte)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl fmt::UpperHex for AccountAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if f.alternate() {
+            write!(f, "0x")?;
+        }
+
+        for byte in &self.0 {
+            write!(f, "{:02X}", byte)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl From<[u8; AccountAddress::LENGTH]> for AccountAddress {
+    fn from(bytes: [u8; AccountAddress::LENGTH]) -> Self {
+        Self::new(bytes)
+    }
+}
+
+impl TryFrom<&[u8]> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    /// Tries to convert the provided byte array into Address.
+    fn try_from(bytes: &[u8]) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_bytes(bytes)
+    }
+}
+
+impl TryFrom<Vec<u8>> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    /// Tries to convert the provided byte buffer into Address.
+    fn try_from(bytes: Vec<u8>) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_bytes(bytes)
+    }
+}
+
+impl From<AccountAddress> for Vec<u8> {
+    fn from(addr: AccountAddress) -> Vec<u8> {
+        addr.0.to_vec()
+    }
+}
+
+impl From<&AccountAddress> for Vec<u8> {
+    fn from(addr: &AccountAddress) -> Vec<u8> {
+        addr.0.to_vec()
+    }
+}
+
+impl From<AccountAddress> for [u8; AccountAddress::LENGTH] {
+    fn from(addr: AccountAddress) -> Self {
+        addr.0
+    }
+}
+
+impl From<&AccountAddress> for [u8; AccountAddress::LENGTH] {
+    fn from(addr: &AccountAddress) -> Self {
+        addr.0
+    }
+}
+
+impl From<&AccountAddress> for String {
+    fn from(addr: &AccountAddress) -> String {
+        ::hex::encode(addr.as_ref())
+    }
+}
+
+impl TryFrom<String> for AccountAddress {
+    type Error = AccountAddressParseError;
+
+    fn try_from(s: String) -> Result<AccountAddress, AccountAddressParseError> {
+        Self::from_hex(s)
+    }
+}
+
+impl FromStr for AccountAddress {
+    type Err = AccountAddressParseError;
+
+    fn from_str(s: &str) -> Result<Self, AccountAddressParseError> {
+        // Accept 0xADDRESS or ADDRESS
+        if let Ok(address) = AccountAddress::from_hex_literal(s) {
+            Ok(address)
+        } else {
+            Self::from_hex(s)
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for AccountAddress {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        if deserializer.is_human_readable() {
+            let s = <String>::deserialize(deserializer)?;
+            AccountAddress::from_str(&s).map_err(D::Error::custom)
+        } else {
+            // In order to preserve the Serde data model and help analysis tools,
+            // make sure to wrap our value in a container with the same name
+            // as the original type.
+            #[derive(::serde::Deserialize)]
+            #[serde(rename = "AccountAddress")]
+            struct Value([u8; AccountAddress::LENGTH]);
+
+            let value = Value::deserialize(deserializer)?;
+            Ok(AccountAddress::new(value.0))
+        }
+    }
+}
+
+impl Serialize for AccountAddress {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if serializer.is_human_readable() {
+            self.to_hex().serialize(serializer)
+        } else {
+            // See comment in deserialize.
+            serializer.serialize_newtype_struct("AccountAddress", &self.0)
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct AccountAddressParseError;
+
+impl fmt::Display for AccountAddressParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "Unable to parse AccountAddress (must be hex string of length {})",
+            AccountAddress::LENGTH
+        )
+    }
+}
+
+impl std::error::Error for AccountAddressParseError {}
+
+#[cfg(test)]
+mod tests {
+    use super::AccountAddress;
+    use hex::FromHex;
+    use proptest::prelude::*;
+    use std::{
+        convert::{AsRef, TryFrom},
+        str::FromStr,
+    };
+
+    #[test]
+    fn test_display_impls() {
+        let hex = "ca843279e3427144cead5e4d5999a3d0ca843279e3427144cead5e4d5999a3d0";
+        let upper_hex = "CA843279E3427144CEAD5E4D5999A3D0CA843279E3427144CEAD5E4D5999A3D0";
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(format!("{}", address), hex);
+        assert_eq!(format!("{:?}", address), hex);
+        assert_eq!(format!("{:X}", address), upper_hex);
+        assert_eq!(format!("{:x}", address), hex);
+
+        assert_eq!(format!("{:#x}", address), format!("0x{}", hex));
+        assert_eq!(format!("{:#X}", address), format!("0x{}", upper_hex));
+    }
+
+    #[test]
+    fn test_short_str_lossless() {
+        let address = AccountAddress::from_hex(
+            "0000000000000000000000000000000000c0f1f95c5b1c5f0eda533eff269000",
+        )
+        .unwrap();
+
+        assert_eq!(
+            address.short_str_lossless(),
+            "c0f1f95c5b1c5f0eda533eff269000",
+        );
+    }
+
+    #[test]
+    fn test_short_str_lossless_zero() {
+        let address = AccountAddress::from_hex(
+            "0000000000000000000000000000000000000000000000000000000000000000",
+        )
+        .unwrap();
+
+        assert_eq!(address.short_str_lossless(), "0");
+    }
+
+    #[test]
+    fn test_address() {
+        let hex = "ca843279e3427144cead5e4d5999a3d0ca843279e3427144cead5e4d5999a3d0";
+        let bytes = Vec::from_hex(hex).expect("You must provide a valid Hex format");
+
+        assert_eq!(
+            bytes.len(),
+            AccountAddress::LENGTH,
+            "Address {:?} is not {}-bytes long. Addresses must be {} bytes",
+            bytes,
+            AccountAddress::LENGTH,
+            AccountAddress::LENGTH,
+        );
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(address.as_ref().to_vec(), bytes);
+    }
+
+    #[test]
+    fn test_from_hex_literal() {
+        let hex_literal = "0x1";
+        let hex = "0000000000000000000000000000000000000000000000000000000000000001";
+
+        let address_from_literal = AccountAddress::from_hex_literal(hex_literal).unwrap();
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        assert_eq!(address_from_literal, address);
+        assert_eq!(hex_literal, address.to_hex_literal());
+
+        // Missing '0x'
+        AccountAddress::from_hex_literal(hex).unwrap_err();
+        // Too long
+        AccountAddress::from_hex_literal(
+            "0x10000000000000000000000000000001100000000000000000000000000000001",
+        )
+        .unwrap_err();
+    }
+
+    #[test]
+    fn test_ref() {
+        let address = AccountAddress::new([1u8; AccountAddress::LENGTH]);
+        let _: &[u8] = address.as_ref();
+    }
+
+    #[test]
+    fn test_address_from_proto_invalid_length() {
+        let bytes = vec![1; 123];
+        AccountAddress::from_bytes(bytes).unwrap_err();
+    }
+
+    #[test]
+    fn test_deserialize_from_json_value() {
+        let address = AccountAddress::random();
+        let json_value = serde_json::to_value(address).expect("serde_json::to_value fail.");
+        let address2: AccountAddress =
+            serde_json::from_value(json_value).expect("serde_json::from_value fail.");
+        assert_eq!(address, address2)
+    }
+
+    #[test]
+    fn test_serde_json() {
+        let hex = "ca843279e3427144cead5e4d5999a3d0ca843279e3427144cead5e4d5999a3d0";
+        let json_hex = "\"ca843279e3427144cead5e4d5999a3d0ca843279e3427144cead5e4d5999a3d0\"";
+
+        let address = AccountAddress::from_hex(hex).unwrap();
+
+        let json = serde_json::to_string(&address).unwrap();
+        let json_address: AccountAddress = serde_json::from_str(json_hex).unwrap();
+
+        assert_eq!(json, json_hex);
+        assert_eq!(address, json_address);
+    }
+
+    #[test]
+    fn test_address_from_empty_string() {
+        assert!(AccountAddress::try_from("".to_string()).is_err());
+        assert!(AccountAddress::from_str("").is_err());
+    }
+
+    proptest! {
+        #[test]
+        fn test_address_string_roundtrip(addr in any::<AccountAddress>()) {
+            let s = String::from(&addr);
+            let addr2 = AccountAddress::try_from(s).expect("roundtrip to string should work");
+            prop_assert_eq!(addr, addr2);
+        }
+
+        #[test]
+        fn test_address_protobuf_roundtrip(addr in any::<AccountAddress>()) {
+            let bytes = addr.to_vec();
+            prop_assert_eq!(bytes.clone(), addr.as_ref());
+            let addr2 = AccountAddress::try_from(&bytes[..]).unwrap();
+            prop_assert_eq!(addr, addr2);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/effects.rs b/vendors/move/crates/move-core/types/src/effects.rs
new file mode 100644
index 000000000..5be85660f
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/effects.rs
@@ -0,0 +1,300 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use anyhow::{bail, Result};
+use std::collections::btree_map::{self, BTreeMap};
+
+/// A storage operation.
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Op<T> {
+    /// Inserts some new data into an empty slot.
+    New(T),
+    /// Modifies some data that currently exists.
+    Modify(T),
+    /// Deletes some data that currently exists.
+    Delete,
+}
+
+impl<T> Op<T> {
+    pub fn as_ref(&self) -> Op<&T> {
+        use Op::*;
+
+        match self {
+            New(data) => New(data),
+            Modify(data) => Modify(data),
+            Delete => Delete,
+        }
+    }
+
+    pub fn map<F, U>(self, f: F) -> Op<U>
+    where
+        F: FnOnce(T) -> U,
+    {
+        use Op::*;
+
+        match self {
+            New(data) => New(f(data)),
+            Modify(data) => Modify(f(data)),
+            Delete => Delete,
+        }
+    }
+
+    pub fn ok(self) -> Option<T> {
+        use Op::*;
+
+        match self {
+            New(data) | Modify(data) => Some(data),
+            Delete => None,
+        }
+    }
+}
+
+/// A collection of resource and module operations on a Move account.
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct AccountChangeSet {
+    modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+    resources: BTreeMap<StructTag, Op<Vec<u8>>>,
+}
+
+/// This implements an algorithm to squash two change sets together by merging pairs of operations
+/// on the same item together. This is similar to squashing two commits in a version control system.
+///
+/// It should be noted that all operation types have some implied pre and post conditions:
+///   - New
+///     - before: data doesn't exist
+///     - after: data exists (new)
+///   - Modify
+///     - before: data exists
+///     - after: data exists (modified)
+///   - Delete
+///     - before: data exists
+///     - after: data does not exist (deleted)
+///
+/// It is possible to have a pair of operations resulting in conflicting states, in which case the
+/// squash will fail.
+fn squash<K, V>(map: &mut BTreeMap<K, Op<V>>, other: BTreeMap<K, Op<V>>) -> Result<()>
+where
+    K: Ord,
+{
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (key, op) in other.into_iter() {
+        match map.entry(key) {
+            Occupied(mut entry) => {
+                let r = entry.get_mut();
+                match (r.as_ref(), op) {
+                    (Modify(_) | New(_), New(_)) | (Delete, Delete | Modify(_)) => {
+                        bail!("The given change sets cannot be squashed")
+                    },
+                    (Modify(_), Modify(data)) => *r = Modify(data),
+                    (New(_), Modify(data)) => *r = New(data),
+                    (Modify(_), Delete) => *r = Delete,
+                    (Delete, New(data)) => *r = Modify(data),
+                    (New(_), Delete) => {
+                        entry.remove();
+                    },
+                }
+            },
+            Vacant(entry) => {
+                entry.insert(op);
+            },
+        }
+    }
+
+    Ok(())
+}
+
+impl AccountChangeSet {
+    pub fn from_modules_resources(
+        modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+        resources: BTreeMap<StructTag, Op<Vec<u8>>>,
+    ) -> Self {
+        Self { modules, resources }
+    }
+
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            modules: BTreeMap::new(),
+            resources: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_module_op(&mut self, name: Identifier, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.modules.entry(name) {
+            Occupied(entry) => bail!("Module {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            },
+        }
+
+        Ok(())
+    }
+
+    pub fn add_resource_op(&mut self, struct_tag: StructTag, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.resources.entry(struct_tag) {
+            Occupied(entry) => bail!("Resource {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            },
+        }
+
+        Ok(())
+    }
+
+    pub fn into_inner(
+        self,
+    ) -> (
+        BTreeMap<Identifier, Op<Vec<u8>>>,
+        BTreeMap<StructTag, Op<Vec<u8>>>,
+    ) {
+        (self.modules, self.resources)
+    }
+
+    pub fn into_resources(self) -> BTreeMap<StructTag, Op<Vec<u8>>> {
+        self.resources
+    }
+
+    pub fn into_modules(self) -> BTreeMap<Identifier, Op<Vec<u8>>> {
+        self.modules
+    }
+
+    pub fn modules(&self) -> &BTreeMap<Identifier, Op<Vec<u8>>> {
+        &self.modules
+    }
+
+    pub fn resources(&self) -> &BTreeMap<StructTag, Op<Vec<u8>>> {
+        &self.resources
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.modules.is_empty() && self.resources.is_empty()
+    }
+
+    pub fn squash(&mut self, other: Self) -> Result<()> {
+        squash(&mut self.modules, other.modules)?;
+        squash(&mut self.resources, other.resources)
+    }
+}
+
+// TODO: ChangeSet does not have a canonical representation so the derived Ord is not sound.
+
+/// A collection of changes to a Move state. Each AccountChangeSet in the domain of `accounts`
+/// is guaranteed to be nonempty
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct ChangeSet {
+    accounts: BTreeMap<AccountAddress, AccountChangeSet>,
+}
+
+impl ChangeSet {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            accounts: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_account_changeset(
+        &mut self,
+        addr: AccountAddress,
+        account_changeset: AccountChangeSet,
+    ) -> Result<()> {
+        match self.accounts.entry(addr) {
+            btree_map::Entry::Occupied(_) => bail!(
+                "Failed to add account change set. Account {} already exists.",
+                addr
+            ),
+            btree_map::Entry::Vacant(entry) => {
+                entry.insert(account_changeset);
+            },
+        }
+
+        Ok(())
+    }
+
+    pub fn accounts(&self) -> &BTreeMap<AccountAddress, AccountChangeSet> {
+        &self.accounts
+    }
+
+    pub fn into_inner(self) -> BTreeMap<AccountAddress, AccountChangeSet> {
+        self.accounts
+    }
+
+    fn get_or_insert_account_changeset(&mut self, addr: AccountAddress) -> &mut AccountChangeSet {
+        match self.accounts.entry(addr) {
+            btree_map::Entry::Occupied(entry) => entry.into_mut(),
+            btree_map::Entry::Vacant(entry) => entry.insert(AccountChangeSet::new()),
+        }
+    }
+
+    pub fn add_module_op(&mut self, module_id: ModuleId, op: Op<Vec<u8>>) -> Result<()> {
+        let account = self.get_or_insert_account_changeset(*module_id.address());
+        account.add_module_op(module_id.name().to_owned(), op)
+    }
+
+    pub fn add_resource_op(
+        &mut self,
+        addr: AccountAddress,
+        struct_tag: StructTag,
+        op: Op<Vec<u8>>,
+    ) -> Result<()> {
+        let account = self.get_or_insert_account_changeset(addr);
+        account.add_resource_op(struct_tag, op)
+    }
+
+    pub fn squash(&mut self, other: Self) -> Result<()> {
+        for (addr, other_account_changeset) in other.accounts {
+            match self.accounts.entry(addr) {
+                btree_map::Entry::Occupied(mut entry) => {
+                    entry.get_mut().squash(other_account_changeset)?;
+                },
+                btree_map::Entry::Vacant(entry) => {
+                    entry.insert(other_account_changeset);
+                },
+            }
+        }
+        Ok(())
+    }
+
+    pub fn into_modules(self) -> impl Iterator<Item = (ModuleId, Op<Vec<u8>>)> {
+        self.accounts.into_iter().flat_map(|(addr, account)| {
+            account
+                .modules
+                .into_iter()
+                .map(move |(module_name, blob_opt)| (ModuleId::new(addr, module_name), blob_opt))
+        })
+    }
+
+    pub fn modules(&self) -> impl Iterator<Item = (AccountAddress, &Identifier, Op<&[u8]>)> {
+        self.accounts.iter().flat_map(|(addr, account)| {
+            let addr = *addr;
+            account
+                .modules
+                .iter()
+                .map(move |(module_name, op)| (addr, module_name, op.as_ref().map(|v| v.as_ref())))
+        })
+    }
+
+    pub fn resources(&self) -> impl Iterator<Item = (AccountAddress, &StructTag, Op<&[u8]>)> {
+        self.accounts.iter().flat_map(|(addr, account)| {
+            let addr = *addr;
+            account
+                .resources
+                .iter()
+                .map(move |(struct_tag, op)| (addr, struct_tag, op.as_ref().map(|v| v.as_ref())))
+        })
+    }
+}
+
+pub type Event = (Vec<u8>, u64, TypeTag, Vec<u8>);
diff --git a/vendors/move/crates/move-core/types/src/errmap.rs b/vendors/move/crates/move-core/types/src/errmap.rs
new file mode 100644
index 000000000..19b9d4935
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/errmap.rs
@@ -0,0 +1,79 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::language_storage::ModuleId;
+use anyhow::{bail, Result};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::BTreeMap,
+    fs::File,
+    io::{Read, Write},
+    path::Path,
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ErrorDescription {
+    /// The constant name of error e.g., ECANT_PAY_DEPOSIT
+    pub code_name: String,
+    /// The code description. This is generated from the doc comments on the constant.
+    pub code_description: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct ErrorMapping {
+    /// The set of error categories and their descriptions
+    pub error_categories: BTreeMap<u64, ErrorDescription>,
+    /// The set of modules, and the module-specific errors
+    pub module_error_maps: BTreeMap<ModuleId, BTreeMap<u64, ErrorDescription>>,
+}
+
+impl ErrorMapping {
+    pub fn add_error_category(
+        &mut self,
+        category_id: u64,
+        description: ErrorDescription,
+    ) -> Result<()> {
+        if let Some(previous_entry) = self.error_categories.insert(category_id, description) {
+            bail!(format!(
+                "Entry for category {} already taken by: {:#?}",
+                category_id, previous_entry
+            ))
+        }
+        Ok(())
+    }
+
+    pub fn add_module_error(
+        &mut self,
+        module_id: ModuleId,
+        abort_code: u64,
+        description: ErrorDescription,
+    ) -> Result<()> {
+        let module_error_map = self.module_error_maps.entry(module_id.clone()).or_default();
+        if let Some(previous_entry) = module_error_map.insert(abort_code, description) {
+            bail!(format!(
+                "Duplicate entry for abort code {} found in {}, previous entry: {:#?}",
+                abort_code, module_id, previous_entry
+            ))
+        }
+        Ok(())
+    }
+
+    pub fn from_file<P: AsRef<Path>>(path: P) -> Self {
+        let mut bytes = Vec::new();
+        File::open(path).unwrap().read_to_end(&mut bytes).unwrap();
+        bcs::from_bytes(&bytes).unwrap()
+    }
+
+    pub fn to_file<P: AsRef<Path>>(&self, path: P) {
+        let bytes = bcs::to_bytes(self).unwrap();
+        let mut file = File::create(path).unwrap();
+        file.write_all(&bytes).unwrap();
+    }
+
+    pub fn get_explanation(&self, module: &ModuleId, output_code: u64) -> Option<ErrorDescription> {
+        self.module_error_maps
+            .get(module)
+            .and_then(|module_map| module_map.get(&output_code).cloned())
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/gas_algebra.rs b/vendors/move/crates/move-core/types/src/gas_algebra.rs
new file mode 100644
index 000000000..c6231a011
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/gas_algebra.rs
@@ -0,0 +1,424 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::{
+    cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd},
+    convert::From,
+    fmt::{self, Debug, Display},
+    marker::PhantomData,
+    ops::{Add, AddAssign, Mul},
+};
+
+// TODO(Gas): deprecate the concept of abstract memory size
+
+/***************************************************************************************************
+ * Units of Measurement
+ *
+ **************************************************************************************************/
+/// Unit of internal gas.
+pub enum InternalGasUnit {}
+
+/// Unit for counting bytes.
+pub enum Byte {}
+
+/// Alternative unit for counting bytes. 1 kibibyte = 1024 bytes.
+pub enum KibiByte {}
+
+/// Alternative unit for counting bytes. 1 mebibyte = 1024 kibibytes.
+pub enum MebiByte {}
+
+/// Alternative unit for counting bytes. 1 gibibyte = 1024 mebibytes.
+pub enum GibiByte {}
+
+/// Unit of abstract memory usage in the Move VM.
+pub enum AbstractMemoryUnit {}
+
+/// Unit for counting arguments.
+pub enum Arg {}
+
+/// A derived unit resulted from the division of two given units.
+/// This is used to permit type-safe multiplications.
+///
+/// A real life example: 3 gas units/byte * 5 bytes = 15 gas units
+pub struct UnitDiv<U1, U2> {
+    phantom: PhantomData<(U1, U2)>,
+}
+
+/***************************************************************************************************
+ * Gas Quantities
+ *
+ **************************************************************************************************/
+/// An opaque representation of a certain quantity, with the unit being encoded in the type.
+/// This type implements checked addition and subtraction, and only permits type-safe multiplication.
+#[derive(Serialize, Deserialize)]
+pub struct GasQuantity<U> {
+    val: u64,
+    phantom: PhantomData<U>,
+}
+
+pub type InternalGas = GasQuantity<InternalGasUnit>;
+
+pub type NumBytes = GasQuantity<Byte>;
+
+pub type NumArgs = GasQuantity<Arg>;
+
+/// An abstract measurement of the memory footprint of some Move concept (e.g. value, type etc.)
+/// in the Move VM.
+///
+/// This is a legacy concept that is not well defined and will be deprecated very soon.
+/// New applications should not be using this.
+pub type AbstractMemorySize = GasQuantity<AbstractMemoryUnit>;
+
+pub type InternalGasPerByte = GasQuantity<UnitDiv<InternalGasUnit, Byte>>;
+
+pub type InternalGasPerAbstractMemoryUnit =
+    GasQuantity<UnitDiv<InternalGasUnit, AbstractMemoryUnit>>;
+
+pub type InternalGasPerArg = GasQuantity<UnitDiv<InternalGasUnit, Arg>>;
+
+/***************************************************************************************************
+ * Constructors
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    pub const fn new(val: u64) -> Self {
+        Self {
+            val,
+            phantom: PhantomData,
+        }
+    }
+
+    pub const fn zero() -> Self {
+        Self::new(0)
+    }
+
+    pub const fn one() -> Self {
+        Self::new(1)
+    }
+
+    pub const fn is_zero(&self) -> bool {
+        self.val == 0
+    }
+}
+
+/***************************************************************************************************
+ * Conversion
+ *
+ **************************************************************************************************/
+impl<U> From<u64> for GasQuantity<U> {
+    fn from(val: u64) -> Self {
+        Self::new(val)
+    }
+}
+
+// TODO(Gas): This allows the gas value to escape the monad, which weakens the type-level
+//            protection it provides. It's currently needed for practical reasons but
+//            we should look for ways to get rid of it.
+impl<U> From<GasQuantity<U>> for u64 {
+    fn from(gas: GasQuantity<U>) -> Self {
+        gas.val
+    }
+}
+
+/***************************************************************************************************
+ * Clone & Copy
+ *
+ **************************************************************************************************/
+impl<U> Clone for GasQuantity<U> {
+    fn clone(&self) -> Self {
+        Self::new(self.val)
+    }
+}
+
+impl<U> Copy for GasQuantity<U> {}
+
+/***************************************************************************************************
+ * Display & Debug
+ *
+ **************************************************************************************************/
+impl<U> Display for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.val)
+    }
+}
+
+impl<U> Debug for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} ({})", self.val, std::any::type_name::<U>())
+    }
+}
+
+/***************************************************************************************************
+ * Comparison
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    fn cmp_impl(&self, other: &Self) -> Ordering {
+        self.val.cmp(&other.val)
+    }
+}
+
+impl<U> PartialEq for GasQuantity<U> {
+    fn eq(&self, other: &Self) -> bool {
+        matches!(self.cmp_impl(other), Ordering::Equal)
+    }
+}
+
+impl<U> Eq for GasQuantity<U> {}
+
+impl<U> PartialOrd for GasQuantity<U> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp_impl(other))
+    }
+}
+
+impl<U> Ord for GasQuantity<U> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.cmp_impl(other)
+    }
+}
+
+/***************************************************************************************************
+ * Addition & Subtraction
+ *
+ **************************************************************************************************/
+impl<U> Add<GasQuantity<U>> for GasQuantity<U> {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::new(self.val.saturating_add(rhs.val))
+    }
+}
+
+impl<U> AddAssign<GasQuantity<U>> for GasQuantity<U> {
+    fn add_assign(&mut self, rhs: GasQuantity<U>) {
+        *self = *self + rhs
+    }
+}
+
+impl<U> GasQuantity<U> {
+    pub fn checked_sub(self, other: Self) -> Option<Self> {
+        self.val.checked_sub(other.val).map(Self::new)
+    }
+}
+
+/***************************************************************************************************
+ * Multiplication
+ *
+ **************************************************************************************************/
+fn mul_impl<U1, U2>(x: GasQuantity<U2>, y: GasQuantity<UnitDiv<U1, U2>>) -> GasQuantity<U1> {
+    GasQuantity::new(x.val.saturating_mul(y.val))
+}
+
+impl<U1, U2> Mul<GasQuantity<UnitDiv<U1, U2>>> for GasQuantity<U2> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<UnitDiv<U1, U2>>) -> Self::Output {
+        mul_impl(self, rhs)
+    }
+}
+
+impl<U1, U2> Mul<GasQuantity<U2>> for GasQuantity<UnitDiv<U1, U2>> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<U2>) -> Self::Output {
+        mul_impl(rhs, self)
+    }
+}
+
+/***************************************************************************************************
+ * To Unit
+ *
+ **************************************************************************************************/
+fn apply_ratio_round_down(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let res = val as u128 * nominator as u128 / denominator as u128;
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+#[allow(clippy::bool_to_int_with_if)]
+fn apply_ratio_round_up(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let n = val as u128 * nominator as u128;
+    let d = denominator as u128;
+
+    let res = n / d + if n % d == 0 { 0 } else { 1 };
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// integral conversion rate.
+pub trait ToUnit<U> {
+    const MULTIPLIER: u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// fractional conversion rate.
+pub trait ToUnitFractional<U> {
+    const NOMINATOR: u64;
+    const DENOMINATOR: u64;
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnit` trait.
+    pub fn to_unit<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnit<T>,
+    {
+        assert_ne!(U::MULTIPLIER, 0);
+
+        GasQuantity::new(self.val.saturating_mul(U::MULTIPLIER))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_down<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_down(
+            self.val,
+            U::NOMINATOR,
+            U::DENOMINATOR,
+        ))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_up<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_up(self.val, U::NOMINATOR, U::DENOMINATOR))
+    }
+}
+
+impl ToUnit<Byte> for KibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<Byte> for MebiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<Byte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024 * 1024;
+}
+
+impl ToUnit<KibiByte> for MebiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<KibiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<MebiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnitFractional<KibiByte> for Byte {
+    const DENOMINATOR: u64 = 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+impl ToUnitFractional<MebiByte> for KibiByte {
+    const DENOMINATOR: u64 = 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+impl ToUnitFractional<MebiByte> for Byte {
+    const DENOMINATOR: u64 = 1024 * 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+impl ToUnitFractional<GibiByte> for MebiByte {
+    const DENOMINATOR: u64 = 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+impl ToUnitFractional<GibiByte> for KibiByte {
+    const DENOMINATOR: u64 = 1024 * 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+impl ToUnitFractional<GibiByte> for Byte {
+    const DENOMINATOR: u64 = 1024 * 1024 * 1024;
+    const NOMINATOR: u64 = 1;
+}
+
+/***************************************************************************************************
+ * To Unit With Params
+ *
+ **************************************************************************************************/
+/// Trait that defines a conversion from one unit to another, with an integral conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitWithParams<U> {
+    type Params;
+
+    fn multiplier(params: &Self::Params) -> u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a fractional conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitFractionalWithParams<U> {
+    type Params;
+
+    fn ratio(params: &Self::Params) -> (u64, u64);
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnitWithParams` trait.
+    pub fn to_unit_with_params<T>(
+        self,
+        params: &<U as ToUnitWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitWithParams<T>,
+    {
+        let multiplier = <U as ToUnitWithParams<T>>::multiplier(params);
+        assert_ne!(multiplier, 0);
+        GasQuantity::new(self.val.saturating_mul(multiplier))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_down_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_down(self.val, n, d))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_up_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_up(self.val, n, d))
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/identifier.rs b/vendors/move/crates/move-core/types/src/identifier.rs
new file mode 100644
index 000000000..0aed508c7
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/identifier.rs
@@ -0,0 +1,318 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! An identifier is the name of an entity (module, resource, function, etc) in Move.
+//!
+//! A valid identifier consists of an ASCII string which satisfies any of the conditions:
+//!
+//! * The first character is a letter and the remaining characters are letters, digits or
+//!   underscores.
+//! * The first character is an underscore, and there is at least one further letter, digit or
+//!   underscore.
+//!
+//! The spec for allowed identifiers is similar to Rust's spec
+//! ([as of version 1.38](https://doc.rust-lang.org/1.38.0/reference/identifiers.html)).
+//!
+//! Allowed identifiers are currently restricted to ASCII due to unresolved issues with Unicode
+//! normalization. See [Rust issue #55467](https://github.com/rust-lang/rust/issues/55467) and the
+//! associated RFC for some discussion. Unicode identifiers may eventually be supported once these
+//! issues are worked out.
+//!
+//! This module only determines allowed identifiers at the bytecode level. Move source code will
+//! likely be more restrictive than even this, with a "raw identifier" escape hatch similar to
+//! Rust's `r#` identifiers.
+//!
+//! Among other things, identifiers are used to:
+//! * specify keys for lookups in storage
+//! * do cross-module lookups while executing transactions
+
+use anyhow::{bail, Result};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+use ref_cast::RefCast;
+use serde::{Deserialize, Serialize};
+use std::{borrow::Borrow, fmt, ops::Deref, str::FromStr};
+
+/// Return true if this character can appear in a Move identifier.
+///
+/// Note: there are stricter restrictions on whether a character can begin a Move
+/// identifier--only alphabetic characters are allowed here.
+#[inline]
+pub const fn is_valid_identifier_char(c: char) -> bool {
+    matches!(c, '_' | 'a'..='z' | 'A'..='Z' | '0'..='9')
+}
+
+/// Returns `true` if all bytes in `b` after the offset `start_offset` are valid
+/// ASCII identifier characters.
+const fn all_bytes_valid(b: &[u8], start_offset: usize) -> bool {
+    let mut i = start_offset;
+    // TODO(philiphayes): use for loop instead of while loop when it's stable in const fn's.
+    while i < b.len() {
+        if !is_valid_identifier_char(b[i] as char) {
+            return false;
+        }
+        i += 1;
+    }
+    true
+}
+
+/// Describes what identifiers are allowed.
+///
+/// For now this is deliberately restrictive -- we would like to evolve this in the future.
+// TODO: "<SELF>" is coded as an exception. It should be removed once CompiledScript goes away.
+// Note: needs to be pub as it's used in the `ident_str!` macro.
+pub const fn is_valid(s: &str) -> bool {
+    // Rust const fn's don't currently support slicing or indexing &str's, so we
+    // have to operate on the underlying byte slice. This is not a problem as
+    // valid identifiers are (currently) ASCII-only.
+    let b = s.as_bytes();
+    match b {
+        b"<SELF>" => true,
+        [b'a'..=b'z', ..] | [b'A'..=b'Z', ..] => all_bytes_valid(b, 1),
+        [b'_', ..] if b.len() > 1 => all_bytes_valid(b, 1),
+        _ => false,
+    }
+}
+
+/// A regex describing what identifiers are allowed. Used for proptests.
+// TODO: "<SELF>" is coded as an exception. It should be removed once CompiledScript goes away.
+#[cfg(any(test, feature = "fuzzing"))]
+#[allow(dead_code)]
+pub(crate) static ALLOWED_IDENTIFIERS: &str =
+    r"(?:[a-zA-Z][a-zA-Z0-9_]*)|(?:_[a-zA-Z0-9_]+)|(?:<SELF>)";
+#[cfg(any(test, feature = "fuzzing"))]
+pub(crate) static ALLOWED_NO_SELF_IDENTIFIERS: &str =
+    r"(?:[a-zA-Z][a-zA-Z0-9_]*)|(?:_[a-zA-Z0-9_]+)";
+
+/// An owned identifier.
+///
+/// For more details, see the module level documentation.
+#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct Identifier(Box<str>);
+// An identifier cannot be mutated so use Box<str> instead of String -- it is 1 word smaller.
+
+impl Identifier {
+    /// Creates a new `Identifier` instance.
+    pub fn new(s: impl Into<Box<str>>) -> Result<Self> {
+        let s = s.into();
+        if Self::is_valid(&s) {
+            Ok(Self(s))
+        } else {
+            bail!("Invalid identifier '{}'", s);
+        }
+    }
+
+    /// Returns true if this string is a valid identifier.
+    pub fn is_valid(s: impl AsRef<str>) -> bool {
+        is_valid(s.as_ref())
+    }
+
+    /// Returns if this identifier is `<SELF>`.
+    /// TODO: remove once we fully separate CompiledScript & CompiledModule.
+    pub fn is_self(&self) -> bool {
+        &*self.0 == "<SELF>"
+    }
+
+    /// Converts a vector of bytes to an `Identifier`.
+    pub fn from_utf8(vec: Vec<u8>) -> Result<Self> {
+        let s = String::from_utf8(vec)?;
+        Self::new(s)
+    }
+
+    /// Creates a borrowed version of `self`.
+    pub fn as_ident_str(&self) -> &IdentStr {
+        self
+    }
+
+    /// Converts this `Identifier` into a `String`.
+    ///
+    /// This is not implemented as a `From` trait to discourage automatic conversions -- these
+    /// conversions should not typically happen.
+    pub fn into_string(self) -> String {
+        self.0.into()
+    }
+
+    /// Converts this `Identifier` into a UTF-8-encoded byte sequence.
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.into_string().into_bytes()
+    }
+}
+
+impl FromStr for Identifier {
+    type Err = anyhow::Error;
+
+    fn from_str(data: &str) -> Result<Self> {
+        Self::new(data)
+    }
+}
+
+impl From<&IdentStr> for Identifier {
+    fn from(ident_str: &IdentStr) -> Self {
+        ident_str.to_owned()
+    }
+}
+
+impl AsRef<IdentStr> for Identifier {
+    fn as_ref(&self) -> &IdentStr {
+        self
+    }
+}
+
+impl Deref for Identifier {
+    type Target = IdentStr;
+
+    fn deref(&self) -> &IdentStr {
+        // Identifier and IdentStr maintain the same invariants, so it is safe to
+        // convert.
+        IdentStr::ref_cast(&self.0)
+    }
+}
+
+impl fmt::Display for Identifier {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", &self.0)
+    }
+}
+
+/// A borrowed identifier.
+///
+/// For more details, see the module level documentation.
+#[derive(Debug, Eq, Hash, Ord, PartialEq, PartialOrd, RefCast)]
+#[repr(transparent)]
+pub struct IdentStr(str);
+
+impl IdentStr {
+    pub fn new(s: &str) -> Result<&IdentStr> {
+        if Self::is_valid(s) {
+            Ok(IdentStr::ref_cast(s))
+        } else {
+            bail!("Invalid identifier '{}'", s);
+        }
+    }
+
+    /// Returns true if this string is a valid identifier.
+    pub fn is_valid(s: impl AsRef<str>) -> bool {
+        is_valid(s.as_ref())
+    }
+
+    /// Returns the length of `self` in bytes.
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Returns `true` if `self` has a length of zero bytes.
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Converts `self` to a `&str`.
+    ///
+    /// This is not implemented as a `From` trait to discourage automatic conversions -- these
+    /// conversions should not typically happen.
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Converts `self` to a byte slice.
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+}
+
+impl Borrow<IdentStr> for Identifier {
+    fn borrow(&self) -> &IdentStr {
+        self
+    }
+}
+
+impl ToOwned for IdentStr {
+    type Owned = Identifier;
+
+    fn to_owned(&self) -> Identifier {
+        Identifier(self.0.into())
+    }
+}
+
+impl fmt::Display for IdentStr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", &self.0)
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for Identifier {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with((): ()) -> Self::Strategy {
+        ALLOWED_NO_SELF_IDENTIFIERS
+            .prop_map(|s| {
+                // Identifier::new will verify that generated identifiers are correct.
+                Identifier::new(s).unwrap()
+            })
+            .boxed()
+    }
+}
+
+// const assert that IdentStr impls RefCast<From = str>
+// This assertion is what guarantees the unsafe transmute is safe.
+const _: fn() = || {
+    fn assert_impl_all<T: ?Sized + ::ref_cast::RefCast<From = str>>() {}
+    assert_impl_all::<IdentStr>();
+};
+
+/// `ident_str!` is a compile-time validated macro that constructs a
+/// `&'static IdentStr` from a const `&'static str`.
+///
+/// ### Example
+///
+/// Creating a valid static or const [`IdentStr`]:
+///
+/// ```rust
+/// use move_core_types::{ident_str, identifier::IdentStr};
+/// const VALID_IDENT: &'static IdentStr = ident_str!("MyCoolIdentifier");
+///
+/// const THING_NAME: &'static str = "thing_name";
+/// const THING_IDENT: &'static IdentStr = ident_str!(THING_NAME);
+/// ```
+///
+/// In contrast, creating an invalid [`IdentStr`] will fail at compile time:
+///
+/// ```rust,compile_fail
+/// use move_core_types::{ident_str, identifier::IdentStr};
+/// const INVALID_IDENT: &'static IdentStr = ident_str!("123Foo"); // Fails to compile!
+/// ```
+// TODO(philiphayes): this should really be an associated const fn like `IdentStr::new`;
+// unfortunately, both unsafe-reborrow and unsafe-transmute don't currently work
+// inside const fn's. Only unsafe-transmute works inside static const-blocks
+// (but not const-fn's).
+#[macro_export]
+macro_rules! ident_str {
+    ($ident:expr) => {{
+        // Only static strings allowed.
+        let s: &'static str = $ident;
+
+        // Only valid identifier strings are allowed.
+        // Note: Work-around hack to print an error message in a const block.
+        let is_valid = $crate::identifier::is_valid(s);
+        ["String is not a valid Move identifier"][!is_valid as usize];
+
+        // SAFETY: the following transmute is safe because
+        // (1) it's equivalent to the unsafe-reborrow inside IdentStr::ref_cast()
+        //     (which we can't use b/c it's not const).
+        // (2) we've just asserted that IdentStr impls RefCast<From = str>, which
+        //     already guarantees the transmute is safe (RefCast checks that
+        //     IdentStr(str) is #[repr(transparent)]).
+        // (3) both in and out lifetimes are 'static, so we're not widening the lifetime.
+        // (4) we've just asserted that the IdentStr passes the is_valid check.
+        //
+        // Note: this lint is unjustified and no longer checked. See issue:
+        // https://github.com/rust-lang/rust-clippy/issues/6372
+        #[allow(clippy::transmute_ptr_to_ptr)]
+        unsafe {
+            ::std::mem::transmute::<&'static str, &'static $crate::identifier::IdentStr>(s)
+        }
+    }};
+}
diff --git a/vendors/move/crates/move-core/types/src/language_storage.rs b/vendors/move/crates/move-core/types/src/language_storage.rs
new file mode 100644
index 000000000..ee9a88b9c
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/language_storage.rs
@@ -0,0 +1,382 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    parser::{parse_struct_tag, parse_type_tag},
+    safe_serialize,
+};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt::{Display, Formatter},
+    str::FromStr,
+};
+
+pub const CODE_TAG: u8 = 0;
+pub const RESOURCE_TAG: u8 = 1;
+
+/// Hex address: 0x1
+pub const CORE_CODE_ADDRESS: AccountAddress = AccountAddress::ONE;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub enum TypeTag {
+    // alias for compatibility with old json serialized data.
+    #[serde(rename = "bool", alias = "Bool")]
+    Bool,
+    #[serde(rename = "u8", alias = "U8")]
+    U8,
+    #[serde(rename = "u64", alias = "U64")]
+    U64,
+    #[serde(rename = "u128", alias = "U128")]
+    U128,
+    #[serde(rename = "address", alias = "Address")]
+    Address,
+    #[serde(rename = "signer", alias = "Signer")]
+    Signer,
+    #[serde(rename = "vector", alias = "Vector")]
+    Vector(
+        #[serde(
+            serialize_with = "safe_serialize::type_tag_recursive_serialize",
+            deserialize_with = "safe_serialize::type_tag_recursive_deserialize"
+        )]
+        Box<TypeTag>,
+    ),
+    #[serde(rename = "struct", alias = "Struct")]
+    Struct(
+        #[serde(
+            serialize_with = "safe_serialize::type_tag_recursive_serialize",
+            deserialize_with = "safe_serialize::type_tag_recursive_deserialize"
+        )]
+        Box<StructTag>,
+    ),
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename = "u16", alias = "U16")]
+    U16,
+    #[serde(rename = "u32", alias = "U32")]
+    U32,
+    #[serde(rename = "u256", alias = "U256")]
+    U256,
+}
+
+impl TypeTag {
+    /// Return a canonical string representation of the type. All types are represented
+    /// using their source syntax:
+    /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String` or
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self) -> String {
+        use TypeTag::*;
+        match self {
+            Bool => "bool".to_owned(),
+            U8 => "u8".to_owned(),
+            U16 => "u16".to_owned(),
+            U32 => "u32".to_owned(),
+            U64 => "u64".to_owned(),
+            U128 => "u128".to_owned(),
+            U256 => "u256".to_owned(),
+            Address => "address".to_owned(),
+            Signer => "signer".to_owned(),
+            Vector(t) => format!("vector<{}>", t.to_canonical_string()),
+            Struct(s) => s.to_canonical_string(),
+        }
+    }
+}
+
+impl FromStr for TypeTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_type_tag(s)
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub struct StructTag {
+    pub address: AccountAddress,
+    pub module: Identifier,
+    pub name: Identifier,
+    // alias for compatibility with old json serialized data.
+    #[serde(rename = "type_args", alias = "type_params")]
+    pub type_params: Vec<TypeTag>,
+}
+
+impl StructTag {
+    pub fn access_vector(&self) -> Vec<u8> {
+        let mut key = vec![RESOURCE_TAG];
+        key.append(&mut bcs::to_bytes(self).unwrap());
+        key
+    }
+
+    /// Returns true if this is a `StructTag` for an `std::ascii::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_ascii_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("ascii")
+            && self.name.as_str().eq("String")
+    }
+
+    /// Returns true if this is a `StructTag` for an `std::string::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_std_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("string")
+            && self.name.as_str().eq("String")
+    }
+
+    pub fn module_id(&self) -> ModuleId {
+        ModuleId::new(self.address, self.module.to_owned())
+    }
+
+    /// Return a canonical string representation of the struct.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String` or
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self) -> String {
+        let mut generics = String::new();
+        if let Some(first_ty) = self.type_params.first() {
+            generics.push('<');
+            generics.push_str(&first_ty.to_canonical_string());
+            for ty in self.type_params.iter().skip(1) {
+                generics.push_str(&ty.to_canonical_string())
+            }
+            generics.push('>');
+        }
+        format!(
+            "{}::{}::{}{}",
+            self.address.to_canonical_string(),
+            self.module,
+            self.name,
+            generics
+        )
+    }
+}
+
+impl FromStr for StructTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_struct_tag(s)
+    }
+}
+
+/// Represents the initial key into global storage where we first index by the address, and then
+/// the struct tag
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+pub struct ResourceKey {
+    pub address: AccountAddress,
+    pub type_: StructTag,
+}
+
+impl ResourceKey {
+    pub fn address(&self) -> AccountAddress {
+        self.address
+    }
+
+    pub fn type_(&self) -> &StructTag {
+        &self.type_
+    }
+}
+
+impl ResourceKey {
+    pub fn new(address: AccountAddress, type_: StructTag) -> Self {
+        ResourceKey { address, type_ }
+    }
+}
+
+/// Represents the initial key into global storage where we first index by the address, and then
+/// the struct tag
+#[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub struct ModuleId {
+    address: AccountAddress,
+    name: Identifier,
+}
+
+impl From<ModuleId> for (AccountAddress, Identifier) {
+    fn from(module_id: ModuleId) -> Self {
+        (module_id.address, module_id.name)
+    }
+}
+
+impl ModuleId {
+    pub fn new(address: AccountAddress, name: Identifier) -> Self {
+        ModuleId { address, name }
+    }
+
+    pub fn name(&self) -> &IdentStr {
+        &self.name
+    }
+
+    pub fn address(&self) -> &AccountAddress {
+        &self.address
+    }
+
+    pub fn access_vector(&self) -> Vec<u8> {
+        let mut key = vec![CODE_TAG];
+        key.append(&mut bcs::to_bytes(self).unwrap());
+        key
+    }
+}
+
+impl Display for ModuleId {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "{}::{}", self.address, self.name)
+    }
+}
+
+impl ModuleId {
+    pub fn short_str_lossless(&self) -> String {
+        format!("0x{}::{}", self.address.short_str_lossless(), self.name)
+    }
+}
+
+impl Display for StructTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "0x{}::{}::{}",
+            self.address.short_str_lossless(),
+            self.module,
+            self.name
+        )?;
+        if let Some(first_ty) = self.type_params.first() {
+            write!(f, "<")?;
+            write!(f, "{}", first_ty)?;
+            for ty in self.type_params.iter().skip(1) {
+                write!(f, ", {}", ty)?;
+            }
+            write!(f, ">")?;
+        }
+        Ok(())
+    }
+}
+
+impl Display for TypeTag {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self {
+            TypeTag::Struct(s) => write!(f, "{}", s),
+            TypeTag::Vector(ty) => write!(f, "vector<{}>", ty),
+            TypeTag::U8 => write!(f, "u8"),
+            TypeTag::U16 => write!(f, "u16"),
+            TypeTag::U32 => write!(f, "u32"),
+            TypeTag::U64 => write!(f, "u64"),
+            TypeTag::U128 => write!(f, "u128"),
+            TypeTag::U256 => write!(f, "u256"),
+            TypeTag::Address => write!(f, "address"),
+            TypeTag::Signer => write!(f, "signer"),
+            TypeTag::Bool => write!(f, "bool"),
+        }
+    }
+}
+
+impl Display for ResourceKey {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        write!(f, "0x{}/{}", self.address.short_str_lossless(), self.type_)
+    }
+}
+
+impl From<StructTag> for TypeTag {
+    fn from(t: StructTag) -> TypeTag {
+        TypeTag::Struct(Box::new(t))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TypeTag;
+    use crate::{
+        account_address::AccountAddress, identifier::Identifier, language_storage::StructTag,
+        safe_serialize::MAX_TYPE_TAG_NESTING,
+    };
+    use std::mem;
+
+    #[test]
+    fn test_type_tag_serde() {
+        let a = TypeTag::Struct(Box::new(StructTag {
+            address: AccountAddress::ONE,
+            module: Identifier::new("abc").unwrap(),
+            name: Identifier::new("abc").unwrap(),
+            type_params: vec![TypeTag::U8],
+        }));
+        let b = serde_json::to_string(&a).unwrap();
+        let c: TypeTag = serde_json::from_str(&b).unwrap();
+        assert!(a.eq(&c), "Typetag serde error");
+        assert_eq!(mem::size_of::<TypeTag>(), 16);
+    }
+
+    #[test]
+    fn test_nested_type_tag_struct_serde() {
+        let mut type_tags = vec![make_type_tag_struct(TypeTag::U8)];
+
+        let limit = MAX_TYPE_TAG_NESTING - 1;
+        while type_tags.len() < limit.into() {
+            type_tags.push(make_type_tag_struct(type_tags.last().unwrap().clone()));
+        }
+
+        // Note for this test serialize can handle one more nesting than deserialize
+        // Both directions work
+        let output = bcs::to_bytes(type_tags.last().unwrap()).unwrap();
+        bcs::from_bytes::<TypeTag>(&output).unwrap();
+
+        // One more, both should fail
+        type_tags.push(make_type_tag_struct(type_tags.last().unwrap().clone()));
+        let output = bcs::to_bytes(type_tags.last().unwrap()).unwrap();
+        bcs::from_bytes::<TypeTag>(&output).unwrap_err();
+
+        // One more and serialize fails
+        type_tags.push(make_type_tag_struct(type_tags.last().unwrap().clone()));
+        bcs::to_bytes(type_tags.last().unwrap()).unwrap_err();
+    }
+
+    #[test]
+    fn test_nested_type_tag_vector_serde() {
+        let mut type_tags = vec![make_type_tag_struct(TypeTag::U8)];
+
+        let limit = MAX_TYPE_TAG_NESTING - 1;
+        while type_tags.len() < limit.into() {
+            type_tags.push(make_type_tag_vector(type_tags.last().unwrap().clone()));
+        }
+
+        // Note for this test serialize can handle one more nesting than deserialize
+        // Both directions work
+        let output = bcs::to_bytes(type_tags.last().unwrap()).unwrap();
+        bcs::from_bytes::<TypeTag>(&output).unwrap();
+
+        // One more, serialize passes, deserialize fails
+        type_tags.push(make_type_tag_vector(type_tags.last().unwrap().clone()));
+        let output = bcs::to_bytes(type_tags.last().unwrap()).unwrap();
+        bcs::from_bytes::<TypeTag>(&output).unwrap_err();
+
+        // One more and serialize fails
+        type_tags.push(make_type_tag_vector(type_tags.last().unwrap().clone()));
+        bcs::to_bytes(type_tags.last().unwrap()).unwrap_err();
+    }
+
+    fn make_type_tag_vector(type_param: TypeTag) -> TypeTag {
+        TypeTag::Vector(Box::new(type_param))
+    }
+
+    fn make_type_tag_struct(type_param: TypeTag) -> TypeTag {
+        TypeTag::Struct(Box::new(StructTag {
+            address: AccountAddress::ONE,
+            module: Identifier::new("a").unwrap(),
+            name: Identifier::new("a").unwrap(),
+            type_params: vec![type_param],
+        }))
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/lib.rs b/vendors/move/crates/move-core/types/src/lib.rs
new file mode 100644
index 000000000..7e6b2637e
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/lib.rs
@@ -0,0 +1,27 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Core types for Move.
+
+pub mod abi;
+pub mod account_address;
+pub mod effects;
+pub mod errmap;
+pub mod gas_algebra;
+pub mod identifier;
+pub mod language_storage;
+pub mod metadata;
+pub mod move_resource;
+pub mod parser;
+#[cfg(any(test, feature = "fuzzing"))]
+pub mod proptest_types;
+pub mod resolver;
+mod safe_serialize;
+pub mod state;
+pub mod transaction_argument;
+pub mod u256;
+#[cfg(test)]
+mod unit_tests;
+pub mod value;
+pub mod vm_status;
diff --git a/vendors/move/crates/move-core/types/src/metadata.rs b/vendors/move/crates/move-core/types/src/metadata.rs
new file mode 100644
index 000000000..9191615d9
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/metadata.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/// Representation of metadata,
+#[derive(Clone, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
+pub struct Metadata {
+    /// The key identifying the type of metadata.
+    pub key: Vec<u8>,
+    /// The value of the metadata.
+    pub value: Vec<u8>,
+}
diff --git a/vendors/move/crates/move-core/types/src/move_resource.rs b/vendors/move/crates/move-core/types/src/move_resource.rs
new file mode 100644
index 000000000..a9cb9cf02
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/move_resource.rs
@@ -0,0 +1,43 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{StructTag, TypeTag},
+};
+use serde::de::DeserializeOwned;
+
+pub trait MoveStructType {
+    const ADDRESS: AccountAddress = crate::language_storage::CORE_CODE_ADDRESS;
+    const MODULE_NAME: &'static IdentStr;
+    const STRUCT_NAME: &'static IdentStr;
+
+    fn module_identifier() -> Identifier {
+        Self::MODULE_NAME.to_owned()
+    }
+
+    fn struct_identifier() -> Identifier {
+        Self::STRUCT_NAME.to_owned()
+    }
+
+    fn type_params() -> Vec<TypeTag> {
+        vec![]
+    }
+
+    fn struct_tag() -> StructTag {
+        StructTag {
+            address: Self::ADDRESS,
+            name: Self::struct_identifier(),
+            module: Self::module_identifier(),
+            type_params: Self::type_params(),
+        }
+    }
+}
+
+pub trait MoveResource: MoveStructType + DeserializeOwned {
+    fn resource_path() -> Vec<u8> {
+        Self::struct_tag().access_vector()
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/parser.rs b/vendors/move/crates/move-core/types/src/parser.rs
new file mode 100644
index 000000000..6145cf926
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/parser.rs
@@ -0,0 +1,637 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::{self, Identifier},
+    language_storage::{StructTag, TypeTag},
+    transaction_argument::TransactionArgument,
+};
+use anyhow::{bail, format_err, Result};
+use std::iter::Peekable;
+
+#[derive(Eq, PartialEq, Debug)]
+enum Token {
+    U8Type,
+    U16Type,
+    U32Type,
+    U64Type,
+    U128Type,
+    U256Type,
+    BoolType,
+    AddressType,
+    VectorType,
+    SignerType,
+    Whitespace(String),
+    Name(String),
+    Address(String),
+    U8(String),
+    U16(String),
+    U32(String),
+    U64(String),
+    U128(String),
+    U256(String),
+
+    Bytes(String),
+    True,
+    False,
+    ColonColon,
+    Lt,
+    Gt,
+    Comma,
+    EOF,
+}
+
+impl Token {
+    fn is_whitespace(&self) -> bool {
+        matches!(self, Self::Whitespace(_))
+    }
+}
+
+fn name_token(s: String) -> Token {
+    match s.as_str() {
+        "u8" => Token::U8Type,
+        "u16" => Token::U16Type,
+        "u32" => Token::U32Type,
+        "u64" => Token::U64Type,
+        "u128" => Token::U128Type,
+        "u256" => Token::U256Type,
+        "bool" => Token::BoolType,
+        "address" => Token::AddressType,
+        "vector" => Token::VectorType,
+        "true" => Token::True,
+        "false" => Token::False,
+        "signer" => Token::SignerType,
+        _ => Token::Name(s),
+    }
+}
+
+fn next_number(initial: char, mut it: impl Iterator<Item = char>) -> Result<(Token, usize)> {
+    let mut num = String::new();
+    num.push(initial);
+    loop {
+        match it.next() {
+            Some(c) if c.is_ascii_digit() || c == '_' => num.push(c),
+            Some(c) if c.is_alphanumeric() => {
+                let mut suffix = String::new();
+                suffix.push(c);
+                loop {
+                    match it.next() {
+                        Some(c) if c.is_ascii_alphanumeric() => suffix.push(c),
+                        _ => {
+                            let len = num.len() + suffix.len();
+                            let tok = match suffix.as_str() {
+                                "u8" => Token::U8(num),
+                                "u16" => Token::U16(num),
+                                "u32" => Token::U32(num),
+                                "u64" => Token::U64(num),
+                                "u128" => Token::U128(num),
+                                "u256" => Token::U256(num),
+                                _ => bail!("invalid suffix"),
+                            };
+                            return Ok((tok, len));
+                        },
+                    }
+                }
+            },
+            _ => {
+                let len = num.len();
+                return Ok((Token::U64(num), len));
+            },
+        }
+    }
+}
+
+#[allow(clippy::many_single_char_names)]
+fn next_token(s: &str) -> Result<Option<(Token, usize)>> {
+    let mut it = s.chars().peekable();
+    match it.next() {
+        None => Ok(None),
+        Some(c) => Ok(Some(match c {
+            '<' => (Token::Lt, 1),
+            '>' => (Token::Gt, 1),
+            ',' => (Token::Comma, 1),
+            ':' => match it.next() {
+                Some(':') => (Token::ColonColon, 2),
+                _ => bail!("unrecognized token"),
+            },
+            '0' if it.peek() == Some(&'x') || it.peek() == Some(&'X') => {
+                it.next().unwrap();
+                match it.next() {
+                    Some(c) if c.is_ascii_hexdigit() => {
+                        let mut r = String::new();
+                        r.push('0');
+                        r.push('x');
+                        r.push(c);
+                        for c in it {
+                            if c.is_ascii_hexdigit() {
+                                r.push(c);
+                            } else {
+                                break;
+                            }
+                        }
+                        let len = r.len();
+                        (Token::Address(r), len)
+                    },
+                    _ => bail!("unrecognized token"),
+                }
+            },
+            c if c.is_ascii_digit() => next_number(c, it)?,
+            'b' if it.peek() == Some(&'"') => {
+                it.next().unwrap();
+                let mut r = String::new();
+                loop {
+                    match it.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii() => r.push(c),
+                        _ => bail!("unrecognized token"),
+                    }
+                }
+                let len = r.len() + 3;
+                (Token::Bytes(hex::encode(r)), len)
+            },
+            'x' if it.peek() == Some(&'"') => {
+                it.next().unwrap();
+                let mut r = String::new();
+                loop {
+                    match it.next() {
+                        Some('"') => break,
+                        Some(c) if c.is_ascii_hexdigit() => r.push(c),
+                        _ => bail!("unrecognized token"),
+                    }
+                }
+                let len = r.len() + 3;
+                (Token::Bytes(r), len)
+            },
+            c if c.is_ascii_whitespace() => {
+                let mut r = String::new();
+                r.push(c);
+                for c in it {
+                    if c.is_ascii_whitespace() {
+                        r.push(c);
+                    } else {
+                        break;
+                    }
+                }
+                let len = r.len();
+                (Token::Whitespace(r), len)
+            },
+            c if c.is_ascii_alphabetic() => {
+                let mut r = String::new();
+                r.push(c);
+                for c in it {
+                    if identifier::is_valid_identifier_char(c) {
+                        r.push(c);
+                    } else {
+                        break;
+                    }
+                }
+                let len = r.len();
+                (name_token(r), len)
+            },
+            _ => bail!("unrecognized token"),
+        })),
+    }
+}
+
+fn tokenize(mut s: &str) -> Result<Vec<Token>> {
+    let mut v = vec![];
+    while let Some((tok, n)) = next_token(s)? {
+        v.push(tok);
+        s = &s[n..];
+    }
+    Ok(v)
+}
+
+struct Parser<I: Iterator<Item = Token>> {
+    it: Peekable<I>,
+}
+
+impl<I: Iterator<Item = Token>> Parser<I> {
+    fn new<T: IntoIterator<Item = Token, IntoIter = I>>(v: T) -> Self {
+        Self {
+            it: v.into_iter().peekable(),
+        }
+    }
+
+    fn next(&mut self) -> Result<Token> {
+        match self.it.next() {
+            Some(tok) => Ok(tok),
+            None => bail!("out of tokens, this should not happen"),
+        }
+    }
+
+    fn peek(&mut self) -> Option<&Token> {
+        self.it.peek()
+    }
+
+    fn consume(&mut self, tok: Token) -> Result<()> {
+        let t = self.next()?;
+        if t != tok {
+            bail!("expected token {:?}, got {:?}", tok, t)
+        }
+        Ok(())
+    }
+
+    fn parse_comma_list<F, R>(
+        &mut self,
+        parse_list_item: F,
+        end_token: Token,
+        allow_trailing_comma: bool,
+    ) -> Result<Vec<R>>
+    where
+        F: Fn(&mut Self) -> Result<R>,
+        R: std::fmt::Debug,
+    {
+        let mut v = vec![];
+        if !(self.peek() == Some(&end_token)) {
+            loop {
+                v.push(parse_list_item(self)?);
+                if self.peek() == Some(&end_token) {
+                    break;
+                }
+                self.consume(Token::Comma)?;
+                if self.peek() == Some(&end_token) && allow_trailing_comma {
+                    break;
+                }
+            }
+        }
+        Ok(v)
+    }
+
+    fn parse_string(&mut self) -> Result<String> {
+        Ok(match self.next()? {
+            Token::Name(s) => s,
+            tok => bail!("unexpected token {:?}, expected string", tok),
+        })
+    }
+
+    fn parse_type_tag(&mut self, depth: u8) -> Result<TypeTag> {
+        if depth >= crate::safe_serialize::MAX_TYPE_TAG_NESTING {
+            bail!("Exceeded TypeTag nesting limit during parsing: {}", depth);
+        }
+
+        Ok(match self.next()? {
+            Token::U8Type => TypeTag::U8,
+            Token::U16Type => TypeTag::U16,
+            Token::U32Type => TypeTag::U32,
+            Token::U64Type => TypeTag::U64,
+            Token::U128Type => TypeTag::U128,
+            Token::U256Type => TypeTag::U256,
+            Token::BoolType => TypeTag::Bool,
+            Token::AddressType => TypeTag::Address,
+            Token::SignerType => TypeTag::Signer,
+            Token::VectorType => {
+                self.consume(Token::Lt)?;
+                let ty = self.parse_type_tag(depth + 1)?;
+                self.consume(Token::Gt)?;
+                TypeTag::Vector(Box::new(ty))
+            },
+            Token::Address(addr) => {
+                self.consume(Token::ColonColon)?;
+                match self.next()? {
+                    Token::Name(module) => {
+                        self.consume(Token::ColonColon)?;
+                        match self.next()? {
+                            Token::Name(name) => {
+                                let ty_args = if self.peek() == Some(&Token::Lt) {
+                                    self.next()?;
+                                    let ty_args = self.parse_comma_list(
+                                        |parser| parser.parse_type_tag(depth + 1),
+                                        Token::Gt,
+                                        true,
+                                    )?;
+                                    self.consume(Token::Gt)?;
+                                    ty_args
+                                } else {
+                                    vec![]
+                                };
+                                TypeTag::Struct(Box::new(StructTag {
+                                    address: AccountAddress::from_hex_literal(&addr)?,
+                                    module: Identifier::new(module)?,
+                                    name: Identifier::new(name)?,
+                                    type_params: ty_args,
+                                }))
+                            },
+                            t => bail!("expected name, got {:?}", t),
+                        }
+                    },
+                    t => bail!("expected name, got {:?}", t),
+                }
+            },
+            tok => bail!("unexpected token {:?}, expected type tag", tok),
+        })
+    }
+
+    fn parse_transaction_argument(&mut self) -> Result<TransactionArgument> {
+        Ok(match self.next()? {
+            Token::U8(s) => TransactionArgument::U8(s.replace('_', "").parse()?),
+            Token::U16(s) => TransactionArgument::U16(s.replace('_', "").parse()?),
+            Token::U32(s) => TransactionArgument::U32(s.replace('_', "").parse()?),
+            Token::U64(s) => TransactionArgument::U64(s.replace('_', "").parse()?),
+            Token::U128(s) => TransactionArgument::U128(s.replace('_', "").parse()?),
+            Token::U256(s) => TransactionArgument::U256(s.replace('_', "").parse()?),
+            Token::True => TransactionArgument::Bool(true),
+            Token::False => TransactionArgument::Bool(false),
+            Token::Address(addr) => {
+                TransactionArgument::Address(AccountAddress::from_hex_literal(&addr)?)
+            },
+            Token::Bytes(s) => TransactionArgument::U8Vector(hex::decode(s)?),
+            tok => bail!("unexpected token {:?}, expected transaction argument", tok),
+        })
+    }
+}
+
+fn parse<F, T>(s: &str, f: F) -> Result<T>
+where
+    F: Fn(&mut Parser<std::vec::IntoIter<Token>>) -> Result<T>,
+{
+    let mut tokens: Vec<_> = tokenize(s)?
+        .into_iter()
+        .filter(|tok| !tok.is_whitespace())
+        .collect();
+    tokens.push(Token::EOF);
+    let mut parser = Parser::new(tokens);
+    let res = f(&mut parser)?;
+    parser.consume(Token::EOF)?;
+    Ok(res)
+}
+
+pub fn parse_string_list(s: &str) -> Result<Vec<String>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(|parser| parser.parse_string(), Token::EOF, true)
+    })
+}
+
+pub fn parse_type_tags(s: &str) -> Result<Vec<TypeTag>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(|parser| parser.parse_type_tag(0), Token::EOF, true)
+    })
+}
+
+pub fn parse_type_tag(s: &str) -> Result<TypeTag> {
+    parse(s, |parser| parser.parse_type_tag(0))
+}
+
+pub fn parse_transaction_arguments(s: &str) -> Result<Vec<TransactionArgument>> {
+    parse(s, |parser| {
+        parser.parse_comma_list(
+            |parser| parser.parse_transaction_argument(),
+            Token::EOF,
+            true,
+        )
+    })
+}
+
+pub fn parse_transaction_argument(s: &str) -> Result<TransactionArgument> {
+    parse(s, |parser| parser.parse_transaction_argument())
+}
+
+pub fn parse_struct_tag(s: &str) -> Result<StructTag> {
+    let type_tag = parse(s, |parser| parser.parse_type_tag(0))
+        .map_err(|e| format_err!("invalid struct tag: {}, {}", s, e))?;
+    if let TypeTag::Struct(struct_tag) = type_tag {
+        Ok(*struct_tag)
+    } else {
+        bail!("invalid struct tag: {}", s)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        account_address::AccountAddress,
+        parser::{parse_struct_tag, parse_transaction_argument, parse_type_tag},
+        transaction_argument::TransactionArgument,
+        u256,
+    };
+    use std::str::FromStr;
+
+    #[allow(clippy::unreadable_literal)]
+    #[test]
+    fn tests_parse_transaction_argument_positive() {
+        use TransactionArgument as T;
+
+        for (s, expected) in &[
+            ("  0u8", T::U8(0)),
+            ("0u8", T::U8(0)),
+            ("255u8", T::U8(255)),
+            ("0", T::U64(0)),
+            ("0123", T::U64(123)),
+            ("0u64", T::U64(0)),
+            ("18446744073709551615", T::U64(18446744073709551615)),
+            ("18446744073709551615u64", T::U64(18446744073709551615)),
+            ("0u128", T::U128(0)),
+            ("1_0u8", T::U8(1_0)),
+            ("10_u8", T::U8(10)),
+            ("10___u8", T::U8(10)),
+            ("1_000u64", T::U64(1_000)),
+            ("1_000", T::U64(1_000)),
+            ("1_0_0_0u64", T::U64(1_000)),
+            ("1_000_000u128", T::U128(1_000_000)),
+            (
+                "340282366920938463463374607431768211455u128",
+                T::U128(340282366920938463463374607431768211455),
+            ),
+            ("  0u16", T::U16(0)),
+            ("0u16", T::U16(0)),
+            ("532u16", T::U16(532)),
+            ("65535u16", T::U16(65535)),
+            ("0u32", T::U32(0)),
+            ("01239498u32", T::U32(1239498)),
+            ("35366u32", T::U32(35366)),
+            ("4294967295u32", T::U32(4294967295)),
+            ("0u256", T::U256(u256::U256::from(0u8))),
+            ("1_0u16", T::U16(1_0)),
+            ("10_u16", T::U16(10)),
+            ("10___u16", T::U16(10)),
+            ("1_000u32", T::U32(1_000)),
+            ("1_0_00u32", T::U32(1_000)),
+            ("1_0_0_0u32", T::U32(1_000)),
+            ("1_000_000u256", T::U256(u256::U256::from(1_000_000u64))),
+            (
+                "1_000_000_000u256",
+                T::U256(u256::U256::from(1_000_000_000u128)),
+            ),
+            (
+                "3402823669209384634633746074317682114551234u256",
+                T::U256(
+                    u256::U256::from_str("3402823669209384634633746074317682114551234").unwrap(),
+                ),
+            ),
+            ("true", T::Bool(true)),
+            ("false", T::Bool(false)),
+            (
+                "0x0",
+                T::Address(AccountAddress::from_hex_literal("0x0").unwrap()),
+            ),
+            (
+                "0x54afa3526",
+                T::Address(AccountAddress::from_hex_literal("0x54afa3526").unwrap()),
+            ),
+            (
+                "0X54afa3526",
+                T::Address(AccountAddress::from_hex_literal("0x54afa3526").unwrap()),
+            ),
+            ("x\"7fff\"", T::U8Vector(vec![0x7F, 0xFF])),
+            ("x\"\"", T::U8Vector(vec![])),
+            ("x\"00\"", T::U8Vector(vec![0x00])),
+            ("x\"deadbeef\"", T::U8Vector(vec![0xDE, 0xAD, 0xBE, 0xEF])),
+        ] {
+            assert_eq!(&parse_transaction_argument(s).unwrap(), expected)
+        }
+    }
+
+    #[test]
+    fn tests_parse_transaction_argument_negative() {
+        /// Test cases for the parser that should always fail.
+        const PARSE_VALUE_NEGATIVE_TEST_CASES: &[&str] = &[
+            "-3",
+            "0u42",
+            "0u645",
+            "0u64x",
+            "0u6 4",
+            "0u",
+            "_10",
+            "_10_u8",
+            "_10__u8",
+            "_1014__u32",
+            "10_u8__",
+            "_",
+            "__",
+            "__4",
+            "_u8",
+            "5_bool",
+            "256u8",
+            "18446744073709551616u64",
+            "340282366920938463463374607431768211456u128",
+            "340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456u256",
+            "0xg",
+            "0x00g0",
+            "0x",
+            "0x_",
+            "",
+            "@@",
+            "()",
+            "x\"ffff",
+            "x\"a \"",
+            "x\" \"",
+            "x\"0g\"",
+            "x\"0\"",
+            "garbage",
+            "true3",
+            "3false",
+            "3 false",
+            "",
+        ];
+
+        for s in PARSE_VALUE_NEGATIVE_TEST_CASES {
+            assert!(
+                parse_transaction_argument(s).is_err(),
+                "test case unexpectedly succeeded: {}",
+                s
+            )
+        }
+    }
+
+    #[test]
+    fn test_type_tag() {
+        for s in &[
+            "u64",
+            "bool",
+            "vector<u8>",
+            "vector<vector<u64>>",
+            "vector<u16>",
+            "vector<vector<u16>>",
+            "vector<u32>",
+            "vector<vector<u32>>",
+            "vector<u128>",
+            "vector<vector<u128>>",
+            "vector<u256>",
+            "vector<vector<u256>>",
+            "vector<vector<vector<vector<vector<vector<vector<u64>>>>>>>",
+            "signer",
+            "0x1::M::S",
+            "0x2::M::S_",
+            "0x3::M_::S",
+            "0x4::M_::S_",
+            "0x00000000004::M::S",
+            "0x1::M::S<u64>",
+            "0x1::M::S<u16>",
+            "0x1::M::S<u32>",
+            "0x1::M::S<u256>",
+            "0x1::M::S<0x2::P::Q>",
+            "vector<0x1::M::S>",
+            "vector<0x1::M_::S_>",
+            "vector<vector<0x1::M_::S_>>",
+            "0x1::M::S<vector<u8>>",
+            "0x1::M::S<vector<u16>>",
+            "0x1::M::S<vector<u32>>",
+            "0x1::M::S<vector<u64>>",
+            "0x1::M::S<vector<u128>>",
+            "0x1::M::S<vector<u256>>",
+        ] {
+            assert!(parse_type_tag(s).is_ok(), "Failed to parse tag {}", s);
+        }
+
+        let s =
+            "vector<vector<vector<vector<vector<vector<vector<vector<vector<vector<u64>>>>>>>>>>";
+        assert!(
+            parse_type_tag(s).is_err(),
+            "Should have failed to parse type tag {}",
+            s
+        );
+    }
+
+    #[test]
+    fn test_parse_valid_struct_tag() {
+        let valid = vec![
+            "0x1::Diem::Diem",
+            "0x1::Diem_Type::Diem",
+            "0x1::Diem_::Diem",
+            "0x1::X_123::X32_",
+            "0x1::Diem::Diem_Type",
+            "0x1::Diem::Diem<0x1::XDX::XDX>",
+            "0x1::Diem::Diem<0x1::XDX::XDX_Type>",
+            "0x1::Diem::Diem<u8>",
+            "0x1::Diem::Diem<u64>",
+            "0x1::Diem::Diem<u128>",
+            "0x1::Diem::Diem<u16>",
+            "0x1::Diem::Diem<u32>",
+            "0x1::Diem::Diem<u256>",
+            "0x1::Diem::Diem<bool>",
+            "0x1::Diem::Diem<address>",
+            "0x1::Diem::Diem<signer>",
+            "0x1::Diem::Diem<vector<0x1::XDX::XDX>>",
+            "0x1::Diem::Diem<u8,bool>",
+            "0x1::Diem::Diem<u8,   bool>",
+            "0x1::Diem::Diem<u16,bool>",
+            "0x1::Diem::Diem<u32,   bool>",
+            "0x1::Diem::Diem<u128,bool>",
+            "0x1::Diem::Diem<u256,   bool>",
+            "0x1::Diem::Diem<u8  ,bool>",
+            "0x1::Diem::Diem<u8 , bool  ,    vector<u8>,address,signer>",
+            "0x1::Diem::Diem<vector<0x1::Diem::Struct<0x1::XUS::XUS>>>",
+            "0x1::Diem::Diem<0x1::Diem::Struct<vector<0x1::XUS::XUS>, 0x1::Diem::Diem<vector<0x1::Diem::Struct<0x1::XUS::XUS>>>>>",
+            "0x1::Diem::Diem<vector<0x1::XDX::XDX<vector<vector<vector<0x1::XDX::XDX<vector<u64>>>>>>>>",
+        ];
+        for text in valid {
+            let st = parse_struct_tag(text).expect("valid StructTag");
+            assert_eq!(
+                st.to_string().replace(' ', ""),
+                text.replace(' ', ""),
+                "text: {:?}, StructTag: {:?}",
+                text,
+                st
+            );
+        }
+
+        let s = "0x1::Diem::Diem<vector<0x1::XDX::XDX<vector<vector<vector<0x1::XDX::XDX<vector<vector<u64>>>>>>>>>";
+        assert!(
+            parse_struct_tag(s).is_err(),
+            "Should have failed to parse type tag {}",
+            s
+        );
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/proptest_types.rs b/vendors/move/crates/move-core/types/src/proptest_types.rs
new file mode 100644
index 000000000..e7b3e9671
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/proptest_types.rs
@@ -0,0 +1,67 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    transaction_argument::TransactionArgument,
+};
+use proptest::{collection::vec, prelude::*};
+impl Arbitrary for TypeTag {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: Self::Parameters) -> Self::Strategy {
+        use TypeTag::*;
+        let leaf = prop_oneof![
+            Just(Bool),
+            Just(U8),
+            Just(U16),
+            Just(U32),
+            Just(U64),
+            Just(U128),
+            Just(U256),
+            Just(Address),
+            Just(Vector(Box::new(Bool))),
+        ];
+        leaf.prop_recursive(
+            8,  // levels deep
+            16, // max size
+            4,  // max number of items per collection
+            |inner| {
+                (
+                    any::<AccountAddress>(),
+                    any::<Identifier>(),
+                    any::<Identifier>(),
+                    vec(inner, 0..4),
+                )
+                    .prop_map(|(address, module, name, type_params)| {
+                        Struct(Box::new(StructTag {
+                            address,
+                            module,
+                            name,
+                            type_params,
+                        }))
+                    })
+            },
+        )
+        .boxed()
+    }
+}
+
+impl Arbitrary for TransactionArgument {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: ()) -> Self::Strategy {
+        prop_oneof![
+            any::<bool>().prop_map(TransactionArgument::Bool),
+            any::<u64>().prop_map(TransactionArgument::U64),
+            any::<AccountAddress>().prop_map(TransactionArgument::Address),
+            vec(any::<u8>(), 0..10).prop_map(TransactionArgument::U8Vector),
+        ]
+        .boxed()
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/resolver.rs b/vendors/move/crates/move-core/types/src/resolver.rs
new file mode 100644
index 000000000..b8995b676
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/resolver.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    language_storage::{ModuleId, StructTag},
+};
+use anyhow::Error;
+
+/// Traits for resolving Move modules and resources from persistent storage
+
+/// A persistent storage backend that can resolve modules by address + name.
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ModuleResolver {
+    fn get_module(&self, id: &ModuleId) -> Result<Option<Vec<u8>>, Error>;
+}
+
+/// A persistent storage backend that can resolve resources by address + type
+/// Storage backends should return
+///   - Ok(Some(..)) if the data exists
+///   - Ok(None)     if the data does not exist
+///   - Err(..)      only when something really wrong happens, for example
+///                    - invariants are broken and observable from the storage side
+///                      (this is not currently possible as ModuleId and StructTag
+///                       are always structurally valid)
+///                    - storage encounters internal error
+pub trait ResourceResolver {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        typ: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Error>;
+}
+
+/// A persistent storage implementation that can resolve both resources and modules
+pub trait MoveResolver: ModuleResolver + ResourceResolver {}
+
+impl<T: ModuleResolver + ResourceResolver + ?Sized> MoveResolver for T {}
+
+impl<T: ResourceResolver + ?Sized> ResourceResolver for &T {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Error> {
+        (**self).get_resource(address, tag)
+    }
+}
+
+impl<T: ModuleResolver + ?Sized> ModuleResolver for &T {
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Error> {
+        (**self).get_module(module_id)
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/safe_serialize.rs b/vendors/move/crates/move-core/types/src/safe_serialize.rs
new file mode 100644
index 000000000..a83b3ba74
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/safe_serialize.rs
@@ -0,0 +1,69 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Custom serializers which track recursion nesting with a thread local,
+//! and otherwise delegate to the derived serializers.
+//!
+//! This is currently only implemented for type tags, but can be easily
+//! generalized, as the the only type-tag specific thing is the allowed nesting.
+
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::cell::RefCell;
+
+pub(crate) const MAX_TYPE_TAG_NESTING: u8 = 9;
+
+thread_local! {
+    static TYPE_TAG_DEPTH: RefCell<u8> = RefCell::new(0);
+}
+
+pub(crate) fn type_tag_recursive_serialize<S, T>(t: &T, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: Serialize,
+{
+    use serde::ser::Error;
+
+    TYPE_TAG_DEPTH.with(|depth| {
+        let mut r = depth.borrow_mut();
+        if *r >= MAX_TYPE_TAG_NESTING {
+            // for testability, we allow one level more
+            return Err(S::Error::custom(
+                "type tag nesting exceeded during serialization",
+            ));
+        }
+        *r += 1;
+        Ok(())
+    })?;
+    let res = t.serialize(s);
+    TYPE_TAG_DEPTH.with(|depth| {
+        let mut r = depth.borrow_mut();
+        *r -= 1;
+    });
+    res
+}
+
+pub(crate) fn type_tag_recursive_deserialize<'de, D, T>(d: D) -> Result<T, D::Error>
+where
+    D: Deserializer<'de>,
+    T: Deserialize<'de>,
+{
+    use serde::de::Error;
+    TYPE_TAG_DEPTH.with(|depth| {
+        let mut r = depth.borrow_mut();
+        // For testability, we allow to serialize one more level than deserialize.
+        if *r >= MAX_TYPE_TAG_NESTING - 1 {
+            return Err(D::Error::custom(
+                "type tag nesting exceeded during deserialization",
+            ));
+        }
+        *r += 1;
+        Ok(())
+    })?;
+    let res = T::deserialize(d);
+    TYPE_TAG_DEPTH.with(|depth| {
+        let mut r = depth.borrow_mut();
+        *r -= 1;
+    });
+    res
+}
diff --git a/vendors/move/crates/move-core/types/src/state.rs b/vendors/move/crates/move-core/types/src/state.rs
new file mode 100644
index 000000000..6d94c574a
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/state.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::cell::RefCell;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VMState {
+    DESERIALIZER,
+    VERIFIER,
+    RUNTIME,
+    OTHER,
+}
+
+thread_local! {
+    static STATE: RefCell<VMState> = RefCell::new(VMState::OTHER);
+}
+
+pub fn set_state(state: VMState) -> VMState {
+    STATE.with(|s| s.replace(state))
+}
+
+pub fn get_state() -> VMState {
+    STATE.with(|s| *s.borrow())
+}
diff --git a/vendors/move/crates/move-core/types/src/transaction_argument.rs b/vendors/move/crates/move-core/types/src/transaction_argument.rs
new file mode 100644
index 000000000..687433b46
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/transaction_argument.rs
@@ -0,0 +1,148 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{account_address::AccountAddress, u256, value::MoveValue};
+use anyhow::{anyhow, Error, Result};
+use serde::{Deserialize, Serialize};
+use std::{convert::TryFrom, fmt};
+
+#[derive(Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
+pub enum TransactionArgument {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Address(AccountAddress),
+    U8Vector(#[serde(with = "serde_bytes")] Vec<u8>),
+    Bool(bool),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+impl fmt::Debug for TransactionArgument {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            TransactionArgument::U8(value) => write!(f, "{{U8: {}}}", value),
+            TransactionArgument::U64(value) => write!(f, "{{U64: {}}}", value),
+            TransactionArgument::U128(value) => write!(f, "{{U128: {}}}", value),
+            TransactionArgument::Bool(boolean) => write!(f, "{{BOOL: {}}}", boolean),
+            TransactionArgument::Address(address) => write!(f, "{{ADDRESS: {:?}}}", address),
+            TransactionArgument::U8Vector(vector) => {
+                write!(f, "{{U8Vector: 0x{}}}", hex::encode(vector))
+            },
+            TransactionArgument::U16(value) => write!(f, "{{U16: {}}}", value),
+            TransactionArgument::U32(value) => write!(f, "{{U32: {}}}", value),
+            TransactionArgument::U256(value) => write!(f, "{{U256: {}}}", value),
+        }
+    }
+}
+
+impl From<TransactionArgument> for MoveValue {
+    fn from(val: TransactionArgument) -> Self {
+        match val {
+            TransactionArgument::U8(i) => MoveValue::U8(i),
+            TransactionArgument::U64(i) => MoveValue::U64(i),
+            TransactionArgument::U128(i) => MoveValue::U128(i),
+            TransactionArgument::Address(a) => MoveValue::Address(a),
+            TransactionArgument::Bool(b) => MoveValue::Bool(b),
+            TransactionArgument::U8Vector(v) => MoveValue::vector_u8(v),
+            TransactionArgument::U16(i) => MoveValue::U16(i),
+            TransactionArgument::U32(i) => MoveValue::U32(i),
+            TransactionArgument::U256(i) => MoveValue::U256(i),
+        }
+    }
+}
+
+impl TryFrom<MoveValue> for TransactionArgument {
+    type Error = Error;
+
+    fn try_from(val: MoveValue) -> Result<Self> {
+        Ok(match val {
+            MoveValue::U8(i) => TransactionArgument::U8(i),
+            MoveValue::U64(i) => TransactionArgument::U64(i),
+            MoveValue::U128(i) => TransactionArgument::U128(i),
+            MoveValue::Address(a) => TransactionArgument::Address(a),
+            MoveValue::Bool(b) => TransactionArgument::Bool(b),
+            MoveValue::Vector(v) => TransactionArgument::U8Vector(
+                v.into_iter()
+                    .map(|mv| {
+                        if let MoveValue::U8(byte) = mv {
+                            Ok(byte)
+                        } else {
+                            Err(anyhow!("unexpected value in bytes: {:?}", mv))
+                        }
+                    })
+                    .collect::<Result<Vec<u8>>>()?,
+            ),
+            MoveValue::Signer(_) | MoveValue::Struct(_) => {
+                return Err(anyhow!("invalid transaction argument: {:?}", val))
+            },
+            MoveValue::U16(i) => TransactionArgument::U16(i),
+            MoveValue::U32(i) => TransactionArgument::U32(i),
+            MoveValue::U256(i) => TransactionArgument::U256(i),
+        })
+    }
+}
+
+/// Convert the transaction arguments into Move values.
+pub fn convert_txn_args(args: &[TransactionArgument]) -> Vec<Vec<u8>> {
+    args.iter()
+        .map(|arg| {
+            MoveValue::from(arg.clone())
+                .simple_serialize()
+                .expect("transaction arguments must serialize")
+        })
+        .collect()
+}
+
+/// Struct for encoding `vector<vector<u8>>` arguments for script functions
+#[derive(Clone, Hash, Eq, PartialEq, Deserialize)]
+pub struct VecBytes(Vec<serde_bytes::ByteBuf>);
+
+impl VecBytes {
+    pub fn from(vec_bytes: Vec<Vec<u8>>) -> Self {
+        VecBytes(
+            vec_bytes
+                .into_iter()
+                .map(serde_bytes::ByteBuf::from)
+                .collect(),
+        )
+    }
+
+    pub fn into_vec(self) -> Vec<Vec<u8>> {
+        self.0
+            .into_iter()
+            .map(|byte_buf| byte_buf.into_vec())
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        account_address::AccountAddress, transaction_argument::TransactionArgument, u256::U256,
+        value::MoveValue,
+    };
+    use std::convert::{From, TryInto};
+
+    #[test]
+    fn test_from_and_to_move_value() {
+        let vals = vec![
+            TransactionArgument::U8(1),
+            TransactionArgument::U16(u16::MAX),
+            TransactionArgument::U32(u32::MAX),
+            TransactionArgument::U64(u64::MAX),
+            TransactionArgument::U128(u128::MAX),
+            TransactionArgument::U256(U256::max_value()),
+            TransactionArgument::Bool(true),
+            TransactionArgument::Address(AccountAddress::from_hex_literal("0x1").unwrap()),
+            TransactionArgument::U8Vector(vec![1, 2, 3, 4]),
+        ];
+        for val in vals {
+            let ret: TransactionArgument = MoveValue::from(val.clone()).try_into().unwrap();
+            assert_eq!(ret, val);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-core/types/src/u256.rs b/vendors/move/crates/move-core/types/src/u256.rs
new file mode 100644
index 000000000..b73647ea0
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/u256.rs
@@ -0,0 +1,721 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use ethnum::U256 as EthnumU256;
+use num::{bigint::Sign, BigInt};
+// This U256 impl was chosen for now but we are open to changing it as needed
+use primitive_types::U256 as PrimitiveU256;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::strategy::BoxedStrategy;
+use rand::{
+    distributions::{
+        uniform::{SampleUniform, UniformSampler},
+        Distribution, Standard,
+    },
+    Rng,
+};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::{
+    fmt,
+    mem::size_of,
+    ops::{
+        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitXor, Div, DivAssign, Mul, MulAssign, Rem,
+        RemAssign, Shl, Shr, Sub, SubAssign,
+    },
+};
+use uint::FromStrRadixErr;
+
+const NUM_BITS_PER_BYTE: usize = 8;
+const U256_NUM_BITS: usize = 256;
+pub const U256_NUM_BYTES: usize = U256_NUM_BITS / NUM_BITS_PER_BYTE;
+
+#[derive(Debug)]
+pub struct U256FromStrError(FromStrRadixErr);
+
+/// A list of error categories encountered when parsing numbers.
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum U256CastErrorKind {
+    /// Value too large to fit in U8.
+    TooLargeForU8,
+
+    /// Value too large to fit in U16.
+    TooLargeForU16,
+
+    /// Value too large to fit in U32.
+    TooLargeForU32,
+
+    /// Value too large to fit in U64.
+    TooLargeForU64,
+
+    /// Value too large to fit in U128.
+    TooLargeForU128,
+}
+
+#[derive(Debug)]
+pub struct U256CastError {
+    kind: U256CastErrorKind,
+    val: U256,
+}
+
+impl U256CastError {
+    pub fn new<T: std::convert::Into<U256>>(val: T, kind: U256CastErrorKind) -> Self {
+        Self {
+            kind,
+            val: val.into(),
+        }
+    }
+}
+
+impl std::error::Error for U256CastError {}
+
+impl fmt::Display for U256CastError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let type_str = match self.kind {
+            U256CastErrorKind::TooLargeForU8 => "u8",
+            U256CastErrorKind::TooLargeForU16 => "u16",
+            U256CastErrorKind::TooLargeForU32 => "u32",
+            U256CastErrorKind::TooLargeForU64 => "u64",
+            U256CastErrorKind::TooLargeForU128 => "u128",
+        };
+        let err_str = format!("Cast failed. {} too large for {}.", self.val, type_str);
+        write!(f, "{err_str}")
+    }
+}
+
+impl std::error::Error for U256FromStrError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.0.source()
+    }
+}
+
+impl fmt::Display for U256FromStrError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Copy, PartialOrd, Ord, Default)]
+pub struct U256(PrimitiveU256);
+
+impl fmt::Display for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl fmt::UpperHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::UpperHex::fmt(&self.0, f)
+    }
+}
+
+impl fmt::LowerHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(&self.0, f)
+    }
+}
+
+impl std::str::FromStr for U256 {
+    type Err = U256FromStrError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::from_str_radix(s, 10)
+    }
+}
+
+impl<'de> Deserialize<'de> for U256 {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(U256::from_le_bytes(
+            &(<[u8; U256_NUM_BYTES]>::deserialize(deserializer)?),
+        ))
+    }
+}
+
+impl Serialize for U256 {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.to_le_bytes().serialize(serializer)
+    }
+}
+
+impl Shl<u32> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u32) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shl<u8> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shr<u8> for U256 {
+    type Output = Self;
+
+    fn shr(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs >> rhs)
+    }
+}
+
+impl BitOr<U256> for U256 {
+    type Output = Self;
+
+    fn bitor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs | rhs)
+    }
+}
+
+impl BitAnd<U256> for U256 {
+    type Output = Self;
+
+    fn bitand(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs & rhs)
+    }
+}
+
+impl BitXor<U256> for U256 {
+    type Output = Self;
+
+    fn bitxor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs ^ rhs)
+    }
+}
+
+impl BitAndAssign<U256> for U256 {
+    fn bitand_assign(&mut self, rhs: U256) {
+        *self = *self & rhs;
+    }
+}
+
+// Ignores overflows
+impl Add<U256> for U256 {
+    type Output = Self;
+
+    fn add(self, rhs: U256) -> Self::Output {
+        self.wrapping_add(rhs)
+    }
+}
+
+impl AddAssign<U256> for U256 {
+    fn add_assign(&mut self, rhs: U256) {
+        *self = *self + rhs;
+    }
+}
+
+// Ignores underflows
+impl Sub<U256> for U256 {
+    type Output = Self;
+
+    fn sub(self, rhs: U256) -> Self::Output {
+        self.wrapping_sub(rhs)
+    }
+}
+
+impl SubAssign<U256> for U256 {
+    fn sub_assign(&mut self, rhs: U256) {
+        *self = *self - rhs;
+    }
+}
+
+// Ignores overflows
+impl Mul<U256> for U256 {
+    type Output = Self;
+
+    fn mul(self, rhs: U256) -> Self::Output {
+        self.wrapping_mul(rhs)
+    }
+}
+
+impl MulAssign<U256> for U256 {
+    fn mul_assign(&mut self, rhs: U256) {
+        *self = *self * rhs;
+    }
+}
+
+impl Div<U256> for U256 {
+    type Output = Self;
+
+    fn div(self, rhs: U256) -> Self::Output {
+        Self(self.0 / rhs.0)
+    }
+}
+
+impl DivAssign<U256> for U256 {
+    fn div_assign(&mut self, rhs: U256) {
+        *self = *self / rhs;
+    }
+}
+
+impl Rem<U256> for U256 {
+    type Output = Self;
+
+    fn rem(self, rhs: U256) -> Self::Output {
+        Self(self.0 % rhs.0)
+    }
+}
+
+impl RemAssign<U256> for U256 {
+    fn rem_assign(&mut self, rhs: U256) {
+        *self = Self(self.0 % rhs.0);
+    }
+}
+
+impl U256 {
+    /// Zero value as U256
+    pub const fn zero() -> Self {
+        Self(PrimitiveU256::zero())
+    }
+
+    /// One value as U256
+    pub const fn one() -> Self {
+        Self(PrimitiveU256::one())
+    }
+
+    /// Max value of U256: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    pub const fn max_value() -> Self {
+        Self(PrimitiveU256::max_value())
+    }
+
+    /// U256 from string with radix 10 or 16
+    pub fn from_str_radix(src: &str, radix: u32) -> Result<Self, U256FromStrError> {
+        PrimitiveU256::from_str_radix(src.trim_start_matches('0'), radix)
+            .map(Self)
+            .map_err(U256FromStrError)
+    }
+
+    /// U256 from 32 little endian bytes
+    pub fn from_le_bytes(slice: &[u8; U256_NUM_BYTES]) -> Self {
+        Self(PrimitiveU256::from_little_endian(slice))
+    }
+
+    /// U256 to 32 little endian bytes
+    pub fn to_le_bytes(self) -> [u8; U256_NUM_BYTES] {
+        let mut bytes = [0u8; U256_NUM_BYTES];
+        self.0.to_little_endian(&mut bytes);
+        bytes
+    }
+
+    /// Leading zeros of the number
+    pub fn leading_zeros(&self) -> u32 {
+        self.0.leading_zeros()
+    }
+
+    // Unchecked downcasting. Values as truncated if larger than target max
+    pub fn unchecked_as_u8(&self) -> u8 {
+        self.0.low_u128() as u8
+    }
+
+    pub fn unchecked_as_u16(&self) -> u16 {
+        self.0.low_u128() as u16
+    }
+
+    pub fn unchecked_as_u32(&self) -> u32 {
+        self.0.low_u128() as u32
+    }
+
+    pub fn unchecked_as_u64(&self) -> u64 {
+        self.0.low_u128() as u64
+    }
+
+    pub fn unchecked_as_u128(&self) -> u128 {
+        self.0.low_u128()
+    }
+
+    // Check arithmetic
+    /// Checked integer addition. Computes self + rhs, returning None if overflow occurred.
+    pub fn checked_add(self, rhs: Self) -> Option<Self> {
+        self.0.checked_add(rhs.0).map(Self)
+    }
+
+    /// Checked integer subtraction. Computes self - rhs, returning None if overflow occurred.
+    pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+
+    /// Checked integer multiplication. Computes self * rhs, returning None if overflow occurred.
+    pub fn checked_mul(self, rhs: Self) -> Option<Self> {
+        self.0.checked_mul(rhs.0).map(Self)
+    }
+
+    /// Checked integer division. Computes self / rhs, returning None if rhs == 0.
+    pub fn checked_div(self, rhs: Self) -> Option<Self> {
+        self.0.checked_div(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_rem(self, rhs: Self) -> Option<Self> {
+        self.0.checked_rem(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_shl(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shl(rhs)))
+    }
+
+    /// Checked shift right. Computes self >> rhs, returning None if rhs is larger than or equal to the number of bits in self.
+    pub fn checked_shr(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shr(rhs)))
+    }
+
+    /// Downcast to a an unsigned value of type T
+    /// T must be at most u128
+    pub fn down_cast_lossy<T: std::convert::TryFrom<u128>>(self) -> T {
+        // Size of this type
+        let type_size = size_of::<T>();
+        // Maximum value for this type
+        let max_val: u128 = if type_size < 16 {
+            (1u128 << (NUM_BITS_PER_BYTE * type_size)) - 1u128
+        } else {
+            u128::MAX
+        };
+        // This should never fail
+        match T::try_from(self.0.low_u128() & max_val) {
+            Ok(w) => w,
+            Err(_) => panic!("Fatal! Downcast failed"),
+        }
+    }
+
+    /// Wrapping integer addition. Computes self + rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+    pub fn wrapping_add(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_add(rhs.0).0)
+    }
+
+    /// Wrapping integer subtraction. Computes self - rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a - b) % (2^N), where N is bit width
+    pub fn wrapping_sub(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_sub(rhs.0).0)
+    }
+
+    /// Wrapping integer multiplication. Computes self * rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_mul(b) = (a * b) % (2^N), where N is bit width
+    pub fn wrapping_mul(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_mul(rhs.0).0)
+    }
+
+    /// Implementation of widenining multiply
+    /// https://github.com/rust-random/rand/blob/master/src/distributions/utils.rs
+    #[inline(always)]
+    fn wmul(self, b: Self) -> (Self, Self) {
+        let half = 128;
+        #[allow(non_snake_case)]
+        let LOWER_MASK: U256 = Self::max_value() >> half;
+
+        let mut low = (self & LOWER_MASK).wrapping_mul(b & LOWER_MASK);
+        let mut t = low >> half;
+        low &= LOWER_MASK;
+        t += (self >> half).wrapping_mul(b & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        let mut high = t >> half;
+        t = low >> half;
+        low &= LOWER_MASK;
+        t += (b >> half).wrapping_mul(self & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        high += t >> half;
+        high += (self >> half).wrapping_mul(b >> half);
+
+        (high, low)
+    }
+}
+
+impl From<u8> for U256 {
+    fn from(n: u8) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u16> for U256 {
+    fn from(n: u16) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u32> for U256 {
+    fn from(n: u32) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u64> for U256 {
+    fn from(n: u64) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u128> for U256 {
+    fn from(n: u128) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from BigInt
+impl From<&U256> for BigInt {
+    fn from(n: &U256) -> Self {
+        BigInt::from_bytes_le(Sign::Plus, &n.to_le_bytes())
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from EthnumU256
+impl From<&U256> for EthnumU256 {
+    fn from(n: &U256) -> EthnumU256 {
+        // TODO (ade): use better solution for conversion
+        // Currently using str because EthnumU256 can be little or big endian
+        let num_str = format!("{:X}", n.0);
+        // TODO (ade): remove expect()
+        EthnumU256::from_str_radix(&num_str, 16).expect("Cannot convert to U256")
+    }
+}
+
+impl TryFrom<U256> for u8 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u8::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU8))
+        } else {
+            Ok(n as u8)
+        }
+    }
+}
+
+impl TryFrom<U256> for u16 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u16::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU16))
+        } else {
+            Ok(n as u16)
+        }
+    }
+}
+
+impl TryFrom<U256> for u32 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u32::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU32))
+        } else {
+            Ok(n as u32)
+        }
+    }
+}
+
+impl TryFrom<U256> for u64 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u128();
+        if n > u64::MAX as u128 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU64))
+        } else {
+            Ok(n as u64)
+        }
+    }
+}
+
+impl TryFrom<U256> for u128 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        if n > U256::from(u128::MAX) {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU128))
+        } else {
+            Ok(n.0.low_u128())
+        }
+    }
+}
+
+impl Distribution<U256> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> U256 {
+        let mut dest = [0; U256_NUM_BYTES];
+        rng.fill_bytes(&mut dest);
+        U256::from_le_bytes(&dest)
+    }
+}
+
+// Rand impl below are inspired by u128 impl found in https://rust-random.github.io/rand/src/rand/distributions/uniform.rs.html
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct UniformU256 {
+    low: U256,
+    range: U256,
+    z: U256,
+}
+
+impl SampleUniform for U256 {
+    type Sampler = UniformU256;
+}
+
+impl UniformSampler for UniformU256 {
+    type X = U256;
+
+    fn new<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "Uniform::new called with `low >= high`");
+        UniformSampler::new_inclusive(low, high - U256::one())
+    }
+
+    fn new_inclusive<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "Uniform::new_inclusive called with `low > high`"
+        );
+        let unsigned_max = U256::max_value();
+
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+
+        let ints_to_reject = if range > U256::zero() {
+            (unsigned_max - range) + U256::one() % range
+        } else {
+            U256::zero()
+        };
+
+        UniformU256 {
+            low,
+            range,
+            z: ints_to_reject,
+        }
+    }
+
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+        let range = self.range;
+        if range > U256::zero() {
+            let unsigned_max = U256::max_value();
+            let zone = unsigned_max - self.z;
+            loop {
+                let v: U256 = rng.gen();
+                let (hi, lo) = v.wmul(range);
+                if lo <= zone {
+                    return self.low.wrapping_add(hi);
+                }
+            }
+        } else {
+            // Sample from the entire integer range.
+            rng.gen()
+        }
+    }
+
+    fn sample_single<R: rand::Rng + ?Sized, B1, B2>(low: B1, high: B2, rng: &mut R) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "UniformSampler::sample_single: low >= high");
+        Self::sample_single_inclusive(low, high - U256::one(), rng)
+    }
+
+    fn sample_single_inclusive<R: rand::Rng + ?Sized, B1, B2>(
+        low: B1,
+        high: B2,
+        rng: &mut R,
+    ) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "UniformSampler::sample_single_inclusive: low > high"
+        );
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+        // If the above resulted in wrap-around to 0, the range is U256::MIN..=U256::MAX,
+        // and any integer will do.
+        if range == U256::zero() {
+            return rng.gen();
+        }
+        // conservative but fast approximation. `- 1` is necessary to allow the
+        // same comparison without bias.
+        let zone = (range << range.leading_zeros()).wrapping_sub(U256::one());
+
+        loop {
+            let v: U256 = rng.gen();
+            let (hi, lo) = v.wmul(range);
+            if lo <= zone {
+                return low.wrapping_add(hi);
+            }
+        }
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl proptest::prelude::Arbitrary for U256 {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_params: Self::Parameters) -> Self::Strategy {
+        use proptest::strategy::Strategy as _;
+        proptest::arbitrary::any::<[u8; U256_NUM_BYTES]>()
+            .prop_map(|q| U256::from_le_bytes(&q))
+            .boxed()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl<'a> arbitrary::Arbitrary<'a> for U256 {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        let bytes = <[u8; U256_NUM_BYTES]>::arbitrary(u)?;
+        Ok(U256::from_le_bytes(&bytes))
+    }
+}
+
+#[test]
+fn wrapping_add() {
+    // a + b overflows U256::MAX by 100
+    // By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+
+    let a = U256::from(1234u32);
+    let b = U256::from_str_radix(
+        "115792089237316195423570985008687907853269984665640564039457584007913129638801",
+        10,
+    )
+    .unwrap();
+
+    assert!(a.wrapping_add(b) == U256::from(99u8));
+}
diff --git a/vendors/move/crates/move-core/types/src/unit_tests/identifier_test.rs b/vendors/move/crates/move-core/types/src/unit_tests/identifier_test.rs
new file mode 100644
index 000000000..9c7aea272
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/unit_tests/identifier_test.rs
@@ -0,0 +1,125 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::identifier::{IdentStr, Identifier, ALLOWED_IDENTIFIERS, ALLOWED_NO_SELF_IDENTIFIERS};
+use bcs::test_helpers::assert_canonical_encode_decode;
+use once_cell::sync::Lazy;
+use proptest::prelude::*;
+use regex::Regex;
+use std::borrow::Borrow;
+
+#[test]
+fn valid_identifiers() {
+    let valid_identifiers = [
+        "foo",
+        "FOO",
+        "Foo",
+        "foo0",
+        "FOO_0",
+        "_Foo1",
+        "FOO2_",
+        "foo_bar_baz",
+        "_0",
+        "__",
+        "____________________",
+        // TODO: <SELF> is an exception. It should be removed once CompiledScript goes away.
+        "<SELF>",
+    ];
+    for identifier in &valid_identifiers {
+        assert!(
+            Identifier::is_valid(identifier),
+            "Identifier '{}' should be valid",
+            identifier
+        );
+    }
+}
+
+#[test]
+fn invalid_identifiers() {
+    let invalid_identifiers = [
+        "",
+        "_",
+        "0",
+        "01",
+        "9876",
+        "0foo",
+        ":foo",
+        "fo\\o",
+        "fo/o",
+        "foo.",
+        "foo-bar",
+        "foo\u{1f389}",
+    ];
+    for identifier in &invalid_identifiers {
+        assert!(
+            !Identifier::is_valid(identifier),
+            "Identifier '{}' should be invalid",
+            identifier
+        );
+    }
+}
+
+proptest! {
+    #[test]
+    fn invalid_identifiers_proptest(identifier in invalid_identifier_strategy()) {
+        // This effectively checks that if a string doesn't match the ALLOWED_IDENTIFIERS regex, it
+        // will be rejected by the is_valid validator. Note that the converse is checked by the
+        // Arbitrary impl for Identifier.
+        prop_assert!(!Identifier::is_valid(identifier));
+    }
+
+    #[test]
+    fn valid_identifiers_proptest(identifier in ALLOWED_NO_SELF_IDENTIFIERS) {
+        prop_assert!(Identifier::is_valid(identifier));
+    }
+
+    #[test]
+    fn identifier_string_roundtrip(identifier in any::<Identifier>()) {
+        let s = identifier.clone().into_string();
+        let id2 = Identifier::new(s).expect("identifier should parse correctly");
+        prop_assert_eq!(identifier, id2);
+    }
+
+    #[test]
+    fn identifier_ident_str_equivalence(identifier in any::<Identifier>()) {
+        let s = identifier.clone().into_string();
+        let ident_str = IdentStr::new(&s).expect("identifier should parse correctly");
+        prop_assert_eq!(ident_str, identifier.as_ident_str());
+        prop_assert_eq!(ident_str, identifier.as_ref());
+        prop_assert_eq!(ident_str, identifier.borrow());
+        prop_assert_eq!(ident_str.to_owned(), identifier);
+    }
+
+    #[test]
+    fn serde_json_roundtrip(identifier in any::<Identifier>()) {
+        let ser = serde_json::to_string(&identifier).expect("should serialize correctly");
+        let id2 = serde_json::from_str(&ser).expect("should deserialize correctly");
+        prop_assert_eq!(identifier, id2);
+    }
+
+    #[test]
+    fn identifier_canonical_serialization(identifier in any::<Identifier>()) {
+        assert_canonical_encode_decode(identifier);
+    }
+}
+
+fn invalid_identifier_strategy() -> impl Strategy<Value = String> {
+    static ALLOWED_IDENTIFIERS_REGEX: Lazy<Regex> = Lazy::new(|| {
+        // Need to add anchors to ensure the entire string is matched.
+        Regex::new(&format!("^(?:{})$", ALLOWED_IDENTIFIERS)).unwrap()
+    });
+
+    ".*".prop_filter("Valid identifiers should not be generated", |s| {
+        // Most strings won't match the regex above, so local rejects are OK.
+        !ALLOWED_IDENTIFIERS_REGEX.is_match(s)
+    })
+}
+
+/// Ensure that Identifier instances serialize into strings directly, with no wrapper.
+#[test]
+fn serde_serialize_no_wrapper() {
+    let foobar = Identifier::new("foobar").expect("should parse correctly");
+    let s = serde_json::to_string(&foobar).expect("Identifier should serialize correctly");
+    assert_eq!(s, "\"foobar\"");
+}
diff --git a/vendors/move/crates/move-core/types/src/unit_tests/language_storage_test.rs b/vendors/move/crates/move-core/types/src/unit_tests/language_storage_test.rs
new file mode 100644
index 000000000..1261b57f2
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/unit_tests/language_storage_test.rs
@@ -0,0 +1,57 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    ident_str,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use bcs::test_helpers::assert_canonical_encode_decode;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn test_module_id_canonical_roundtrip(module_id in any::<ModuleId>()) {
+        assert_canonical_encode_decode(module_id);
+    }
+}
+
+#[test]
+fn test_type_tag_deserialize_case_insensitive() {
+    let org_struct_tag = StructTag {
+        address: AccountAddress::ONE,
+        module: Identifier::from(ident_str!("TestModule")),
+        name: Identifier::from(ident_str!("TestStruct")),
+        type_params: vec![
+            TypeTag::U8,
+            TypeTag::U16,
+            TypeTag::U32,
+            TypeTag::U64,
+            TypeTag::U128,
+            TypeTag::U256,
+            TypeTag::Bool,
+            TypeTag::Address,
+            TypeTag::Signer,
+        ],
+    };
+
+    let current_json = serde_json::to_string(&org_struct_tag).unwrap();
+
+    let upper_case_json = format!(
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_params":["U8","U16","U32","U64","U128","U256","Bool","Address","Signer"]}}"##,
+        AccountAddress::ONE
+    );
+    let upper_case_decoded = serde_json::from_str(upper_case_json.as_str()).unwrap();
+    assert_eq!(org_struct_tag, upper_case_decoded);
+
+    let lower_case_json = format!(
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_args":["u8","u16","u32","u64","u128","u256","bool","address","signer"]}}"##,
+        AccountAddress::ONE
+    );
+    let lower_case_decoded = serde_json::from_str(lower_case_json.as_str()).unwrap();
+    assert_eq!(org_struct_tag, lower_case_decoded);
+
+    assert_eq!(current_json, lower_case_json);
+}
diff --git a/vendors/move/crates/move-core/types/src/unit_tests/mod.rs b/vendors/move/crates/move-core/types/src/unit_tests/mod.rs
new file mode 100644
index 000000000..11f899e47
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/unit_tests/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod identifier_test;
+mod language_storage_test;
+mod value_test;
+mod vm_status_test;
diff --git a/vendors/move/crates/move-core/types/src/unit_tests/value_test.rs b/vendors/move/crates/move-core/types/src/unit_tests/value_test.rs
new file mode 100644
index 000000000..ab53cf2d9
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/unit_tests/value_test.rs
@@ -0,0 +1,139 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    ident_str,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    value::{MoveStruct, MoveValue},
+};
+use serde_json::json;
+
+#[test]
+fn struct_deserialization() {
+    let struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("MyStruct").to_owned(),
+        module: ident_str!("MyModule").to_owned(),
+        type_params: vec![],
+    };
+    let values = vec![MoveValue::U64(7), MoveValue::Bool(true)];
+    let fields = vec![ident_str!("f").to_owned(), ident_str!("g").to_owned()];
+    let field_values: Vec<(Identifier, MoveValue)> =
+        fields.into_iter().zip(values.clone()).collect();
+
+    // test each deserialization scheme
+    let runtime_value = MoveStruct::Runtime(values);
+    assert_eq!(
+        serde_json::to_value(&runtime_value).unwrap(),
+        json!([7, true])
+    );
+
+    let fielded_value = MoveStruct::WithFields(field_values.clone());
+    assert_eq!(
+        serde_json::to_value(&fielded_value).unwrap(),
+        json!({ "f": 7, "g": true })
+    );
+
+    let typed_value = MoveStruct::with_types(struct_type, field_values);
+    assert_eq!(
+        serde_json::to_value(&typed_value).unwrap(),
+        json!({
+                "fields": { "f": 7, "g": true },
+                "type": "0x0::MyModule::MyStruct"
+            }
+        )
+    );
+}
+
+/// A test which verifies that the BCS representation of
+/// a struct with a single field is equivalent to the BCS
+/// of the value in this field. It also tests
+/// that BCS serialization of utf8 strings is equivalent
+/// to the BCS serialization of vector<u8> of the bytes of
+/// the string.
+#[test]
+fn struct_one_field_equiv_value() {
+    let val = MoveValue::Vector(vec![
+        MoveValue::U8(1),
+        MoveValue::U8(22),
+        MoveValue::U8(13),
+        MoveValue::U8(99),
+    ]);
+    let s1 = MoveValue::Struct(MoveStruct::Runtime(vec![val.clone()]))
+        .simple_serialize()
+        .unwrap();
+    let s2 = val.simple_serialize().unwrap();
+    assert_eq!(s1, s2);
+
+    let utf8_str = "çå∞≠¢õß∂ƒ∫";
+    let vec_u8 = MoveValue::Vector(
+        utf8_str
+            .as_bytes()
+            .iter()
+            .map(|c| MoveValue::U8(*c))
+            .collect(),
+    );
+    assert_eq!(
+        bcs::to_bytes(utf8_str).unwrap(),
+        vec_u8.simple_serialize().unwrap()
+    )
+}
+
+#[test]
+fn nested_typed_struct_deserialization() {
+    let struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("MyStruct").to_owned(),
+        module: ident_str!("MyModule").to_owned(),
+        type_params: vec![],
+    };
+    let nested_struct_type = StructTag {
+        address: AccountAddress::ZERO,
+        name: ident_str!("NestedStruct").to_owned(),
+        module: ident_str!("NestedModule").to_owned(),
+        type_params: vec![TypeTag::U8],
+    };
+
+    // test each deserialization scheme
+    let nested_runtime_struct = MoveValue::Struct(MoveStruct::Runtime(vec![MoveValue::U64(7)]));
+    let runtime_value = MoveStruct::Runtime(vec![nested_runtime_struct]);
+    assert_eq!(serde_json::to_value(&runtime_value).unwrap(), json!([[7]]));
+
+    let nested_fielded_struct = MoveValue::Struct(MoveStruct::with_fields(vec![(
+        ident_str!("f").to_owned(),
+        MoveValue::U64(7),
+    )]));
+    let fielded_value = MoveStruct::with_fields(vec![(
+        ident_str!("inner").to_owned(),
+        nested_fielded_struct,
+    )]);
+    assert_eq!(
+        serde_json::to_value(&fielded_value).unwrap(),
+        json!({ "inner": { "f": 7 } })
+    );
+
+    let nested_typed_struct =
+        MoveValue::Struct(MoveStruct::with_types(nested_struct_type, vec![(
+            ident_str!("f").to_owned(),
+            MoveValue::U64(7),
+        )]));
+    let typed_value = MoveStruct::with_types(struct_type, vec![(
+        ident_str!("inner").to_owned(),
+        nested_typed_struct,
+    )]);
+    assert_eq!(
+        serde_json::to_value(&typed_value).unwrap(),
+        json!({
+            "fields": {
+                "inner": {
+                    "fields": { "f": 7},
+                    "type": "0x0::NestedModule::NestedStruct<u8>",
+                }
+            },
+            "type": "0x0::MyModule::MyStruct"
+        })
+    );
+}
diff --git a/vendors/move/crates/move-core/types/src/unit_tests/vm_status_test.rs b/vendors/move/crates/move-core/types/src/unit_tests/vm_status_test.rs
new file mode 100644
index 000000000..568001d2c
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/unit_tests/vm_status_test.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::vm_status::{StatusCode, VMStatus};
+
+#[test]
+fn test_stats_code() {
+    let vm_status = VMStatus::Error(StatusCode::OUT_OF_GAS, None);
+    let code = vm_status.status_code();
+    assert_eq!(code, StatusCode::OUT_OF_GAS);
+}
diff --git a/vendors/move/crates/move-core/types/src/value.rs b/vendors/move/crates/move-core/types/src/value.rs
new file mode 100644
index 000000000..b0caed49d
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/value.rs
@@ -0,0 +1,653 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    u256,
+};
+use anyhow::{anyhow, bail, Result as AResult};
+use serde::{
+    de::Error as DeError,
+    ser::{SerializeMap, SerializeSeq, SerializeStruct, SerializeTuple},
+    Deserialize, Serialize,
+};
+use std::{
+    convert::TryInto,
+    fmt::{self, Debug},
+};
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this name
+pub const MOVE_STRUCT_NAME: &str = "struct";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the first field
+pub const MOVE_STRUCT_TYPE: &str = "type";
+
+/// In the `WithTypes` configuration, a Move struct gets serialized into a Serde struct with this as the second field
+pub const MOVE_STRUCT_FIELDS: &str = "fields";
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum MoveStruct {
+    /// The representation used by the MoveVM
+    Runtime(Vec<MoveValue>),
+    /// A decorated representation with human-readable field names
+    WithFields(Vec<(Identifier, MoveValue)>),
+    /// An even more decorated representation with both types and human-readable field names
+    WithTypes {
+        type_: StructTag,
+        fields: Vec<(Identifier, MoveValue)>,
+    },
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum MoveValue {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Bool(bool),
+    Address(AccountAddress),
+    Vector(Vec<MoveValue>),
+    Struct(MoveStruct),
+    Signer(AccountAddress),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+/// A layout associated with a named field
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MoveFieldLayout {
+    pub name: Identifier,
+    pub layout: MoveTypeLayout,
+}
+
+impl MoveFieldLayout {
+    pub fn new(name: Identifier, layout: MoveTypeLayout) -> Self {
+        Self { name, layout }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum MoveStructLayout {
+    /// The representation used by the MoveVM
+    Runtime(Vec<MoveTypeLayout>),
+    /// A decorated representation with human-readable field names that can be used by clients
+    WithFields(Vec<MoveFieldLayout>),
+    /// An even more decorated representation with both types and human-readable field names
+    WithTypes {
+        type_: StructTag,
+        fields: Vec<MoveFieldLayout>,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum MoveTypeLayout {
+    #[serde(rename(serialize = "bool", deserialize = "bool"))]
+    Bool,
+    #[serde(rename(serialize = "u8", deserialize = "u8"))]
+    U8,
+    #[serde(rename(serialize = "u64", deserialize = "u64"))]
+    U64,
+    #[serde(rename(serialize = "u128", deserialize = "u128"))]
+    U128,
+    #[serde(rename(serialize = "address", deserialize = "address"))]
+    Address,
+    #[serde(rename(serialize = "vector", deserialize = "vector"))]
+    Vector(Box<MoveTypeLayout>),
+    #[serde(rename(serialize = "struct", deserialize = "struct"))]
+    Struct(MoveStructLayout),
+    #[serde(rename(serialize = "signer", deserialize = "signer"))]
+    Signer,
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename(serialize = "u16", deserialize = "u16"))]
+    U16,
+    #[serde(rename(serialize = "u32", deserialize = "u32"))]
+    U32,
+    #[serde(rename(serialize = "u256", deserialize = "u256"))]
+    U256,
+}
+
+impl MoveValue {
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveTypeLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn simple_serialize(&self) -> Option<Vec<u8>> {
+        bcs::to_bytes(self).ok()
+    }
+
+    pub fn vector_u8(v: Vec<u8>) -> Self {
+        MoveValue::Vector(v.into_iter().map(MoveValue::U8).collect())
+    }
+
+    /// Converts the `Vec<MoveValue>` to a `Vec<u8>` if the inner `MoveValue` is a `MoveValue::U8`,
+    /// or returns an error otherwise.
+    pub fn vec_to_vec_u8(vec: Vec<MoveValue>) -> AResult<Vec<u8>> {
+        let mut vec_u8 = Vec::with_capacity(vec.len());
+
+        for byte in vec {
+            match byte {
+                MoveValue::U8(u8) => {
+                    vec_u8.push(u8);
+                },
+                _ => {
+                    return Err(anyhow!(
+                        "Expected inner MoveValue in Vec<MoveValue> to be a MoveValue::U8"
+                            .to_string(),
+                    ));
+                },
+            }
+        }
+        Ok(vec_u8)
+    }
+
+    pub fn vector_address(v: Vec<AccountAddress>) -> Self {
+        MoveValue::Vector(v.into_iter().map(MoveValue::Address).collect())
+    }
+
+    pub fn decorate(self, layout: &MoveTypeLayout) -> Self {
+        match (self, layout) {
+            (MoveValue::Struct(s), MoveTypeLayout::Struct(l)) => MoveValue::Struct(s.decorate(l)),
+            (MoveValue::Vector(vals), MoveTypeLayout::Vector(t)) => {
+                MoveValue::Vector(vals.into_iter().map(|v| v.decorate(t)).collect())
+            },
+            (v, _) => v,
+        }
+    }
+
+    pub fn undecorate(self) -> Self {
+        match self {
+            Self::Struct(s) => MoveValue::Struct(s.undecorate()),
+            Self::Vector(vals) => {
+                MoveValue::Vector(vals.into_iter().map(MoveValue::undecorate).collect())
+            },
+            v => v,
+        }
+    }
+}
+
+pub fn serialize_values<'a, I>(vals: I) -> Vec<Vec<u8>>
+where
+    I: IntoIterator<Item = &'a MoveValue>,
+{
+    vals.into_iter()
+        .map(|val| {
+            val.simple_serialize()
+                .expect("serialization should succeed")
+        })
+        .collect()
+}
+
+impl MoveStruct {
+    pub fn new(value: Vec<MoveValue>) -> Self {
+        Self::Runtime(value)
+    }
+
+    pub fn with_fields(values: Vec<(Identifier, MoveValue)>) -> Self {
+        Self::WithFields(values)
+    }
+
+    pub fn with_types(type_: StructTag, fields: Vec<(Identifier, MoveValue)>) -> Self {
+        Self::WithTypes { type_, fields }
+    }
+
+    pub fn simple_deserialize(blob: &[u8], ty: &MoveStructLayout) -> AResult<Self> {
+        Ok(bcs::from_bytes_seed(ty, blob)?)
+    }
+
+    pub fn decorate(self, layout: &MoveStructLayout) -> Self {
+        match (self, layout) {
+            (MoveStruct::Runtime(vals), MoveStructLayout::WithFields(layouts)) => {
+                MoveStruct::WithFields(
+                    vals.into_iter()
+                        .zip(layouts)
+                        .map(|(v, l)| (l.name.clone(), v.decorate(&l.layout)))
+                        .collect(),
+                )
+            },
+            (MoveStruct::Runtime(vals), MoveStructLayout::WithTypes { type_, fields }) => {
+                MoveStruct::WithTypes {
+                    type_: type_.clone(),
+                    fields: vals
+                        .into_iter()
+                        .zip(fields)
+                        .map(|(v, l)| (l.name.clone(), v.decorate(&l.layout)))
+                        .collect(),
+                }
+            },
+            (MoveStruct::WithFields(vals), MoveStructLayout::WithTypes { type_, fields }) => {
+                MoveStruct::WithTypes {
+                    type_: type_.clone(),
+                    fields: vals
+                        .into_iter()
+                        .zip(fields)
+                        .map(|((fld, v), l)| (fld, v.decorate(&l.layout)))
+                        .collect(),
+                }
+            },
+            (v, _) => v, // already decorated
+        }
+    }
+
+    pub fn fields(&self) -> &[MoveValue] {
+        match self {
+            Self::Runtime(vals) => vals,
+            Self::WithFields(_) | Self::WithTypes { .. } => {
+                // It's not possible to implement this without changing the return type, and thus
+                // panicking is the best move
+                panic!("Getting fields for decorated representation")
+            },
+        }
+    }
+
+    pub fn into_fields(self) -> Vec<MoveValue> {
+        match self {
+            Self::Runtime(vals) => vals,
+            Self::WithFields(fields) | Self::WithTypes { fields, .. } => {
+                fields.into_iter().map(|(_, f)| f).collect()
+            },
+        }
+    }
+
+    pub fn undecorate(self) -> Self {
+        Self::Runtime(
+            self.into_fields()
+                .into_iter()
+                .map(MoveValue::undecorate)
+                .collect(),
+        )
+    }
+}
+
+impl MoveStructLayout {
+    pub fn new(types: Vec<MoveTypeLayout>) -> Self {
+        Self::Runtime(types)
+    }
+
+    pub fn with_fields(types: Vec<MoveFieldLayout>) -> Self {
+        Self::WithFields(types)
+    }
+
+    pub fn with_types(type_: StructTag, fields: Vec<MoveFieldLayout>) -> Self {
+        Self::WithTypes { type_, fields }
+    }
+
+    pub fn fields(&self) -> &[MoveTypeLayout] {
+        match self {
+            Self::Runtime(vals) => vals,
+            Self::WithFields(_) | Self::WithTypes { .. } => {
+                // It's not possible to implement this without changing the return type, and some
+                // performance-critical VM serialization code uses the Runtime case of this.
+                // panicking is the best move
+                panic!("Getting fields for decorated representation")
+            },
+        }
+    }
+
+    pub fn into_fields(self) -> Vec<MoveTypeLayout> {
+        match self {
+            Self::Runtime(vals) => vals,
+            Self::WithFields(fields) | Self::WithTypes { fields, .. } => {
+                fields.into_iter().map(|f| f.layout).collect()
+            },
+        }
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveTypeLayout {
+    type Value = MoveValue;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        match self {
+            MoveTypeLayout::Bool => bool::deserialize(deserializer).map(MoveValue::Bool),
+            MoveTypeLayout::U8 => u8::deserialize(deserializer).map(MoveValue::U8),
+            MoveTypeLayout::U16 => u16::deserialize(deserializer).map(MoveValue::U16),
+            MoveTypeLayout::U32 => u32::deserialize(deserializer).map(MoveValue::U32),
+            MoveTypeLayout::U64 => u64::deserialize(deserializer).map(MoveValue::U64),
+            MoveTypeLayout::U128 => u128::deserialize(deserializer).map(MoveValue::U128),
+            MoveTypeLayout::U256 => u256::U256::deserialize(deserializer).map(MoveValue::U256),
+            MoveTypeLayout::Address => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Address)
+            },
+            MoveTypeLayout::Signer => {
+                AccountAddress::deserialize(deserializer).map(MoveValue::Signer)
+            },
+            MoveTypeLayout::Struct(ty) => Ok(MoveValue::Struct(ty.deserialize(deserializer)?)),
+            MoveTypeLayout::Vector(layout) => Ok(MoveValue::Vector(
+                deserializer.deserialize_seq(VectorElementVisitor(layout))?,
+            )),
+        }
+    }
+}
+
+struct VectorElementVisitor<'a>(&'a MoveTypeLayout);
+
+impl<'d, 'a> serde::de::Visitor<'d> for VectorElementVisitor<'a> {
+    type Value = Vec<MoveValue>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Vector")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        while let Some(elem) = seq.next_element_seed(self.0)? {
+            vals.push(elem)
+        }
+        Ok(vals)
+    }
+}
+
+struct DecoratedStructFieldVisitor<'a>(&'a [MoveFieldLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for DecoratedStructFieldVisitor<'a> {
+    type Value = Vec<(Identifier, MoveValue)>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        for (i, layout) in self.0.iter().enumerate() {
+            match seq.next_element_seed(layout)? {
+                Some(elem) => vals.push(elem),
+                None => return Err(A::Error::invalid_length(i, &self)),
+            }
+        }
+        Ok(vals)
+    }
+}
+
+struct StructFieldVisitor<'a>(&'a [MoveTypeLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
+    type Value = Vec<MoveValue>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut val = Vec::new();
+        for (i, field_type) in self.0.iter().enumerate() {
+            match seq.next_element_seed(field_type)? {
+                Some(elem) => val.push(elem),
+                None => return Err(A::Error::invalid_length(i, &self)),
+            }
+        }
+        Ok(val)
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveFieldLayout {
+    type Value = (Identifier, MoveValue);
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        Ok((self.name.clone(), self.layout.deserialize(deserializer)?))
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for &MoveStructLayout {
+    type Value = MoveStruct;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        match self {
+            MoveStructLayout::Runtime(layout) => {
+                let fields =
+                    deserializer.deserialize_tuple(layout.len(), StructFieldVisitor(layout))?;
+                Ok(MoveStruct::Runtime(fields))
+            },
+            MoveStructLayout::WithFields(layout) => {
+                let fields = deserializer
+                    .deserialize_tuple(layout.len(), DecoratedStructFieldVisitor(layout))?;
+                Ok(MoveStruct::WithFields(fields))
+            },
+            MoveStructLayout::WithTypes {
+                type_,
+                fields: layout,
+            } => {
+                let fields = deserializer
+                    .deserialize_tuple(layout.len(), DecoratedStructFieldVisitor(layout))?;
+                Ok(MoveStruct::WithTypes {
+                    type_: type_.clone(),
+                    fields,
+                })
+            },
+        }
+    }
+}
+
+impl serde::Serialize for MoveValue {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match self {
+            MoveValue::Struct(s) => s.serialize(serializer),
+            MoveValue::Bool(b) => serializer.serialize_bool(*b),
+            MoveValue::U8(i) => serializer.serialize_u8(*i),
+            MoveValue::U16(i) => serializer.serialize_u16(*i),
+            MoveValue::U32(i) => serializer.serialize_u32(*i),
+            MoveValue::U64(i) => serializer.serialize_u64(*i),
+            MoveValue::U128(i) => serializer.serialize_u128(*i),
+            MoveValue::U256(i) => i.serialize(serializer),
+            MoveValue::Address(a) => a.serialize(serializer),
+            MoveValue::Signer(a) => a.serialize(serializer),
+            MoveValue::Vector(v) => {
+                let mut t = serializer.serialize_seq(Some(v.len()))?;
+                for val in v {
+                    t.serialize_element(val)?;
+                }
+                t.end()
+            },
+        }
+    }
+}
+
+struct MoveFields<'a>(&'a [(Identifier, MoveValue)]);
+
+impl<'a> serde::Serialize for MoveFields<'a> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut t = serializer.serialize_map(Some(self.0.len()))?;
+        for (f, v) in self.0.iter() {
+            t.serialize_entry(f, v)?;
+        }
+        t.end()
+    }
+}
+
+impl serde::Serialize for MoveStruct {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match self {
+            Self::Runtime(s) => {
+                let mut t = serializer.serialize_tuple(s.len())?;
+                for v in s.iter() {
+                    t.serialize_element(v)?;
+                }
+                t.end()
+            },
+            Self::WithFields(fields) => MoveFields(fields).serialize(serializer),
+            Self::WithTypes { type_, fields } => {
+                // Serialize a Move struct as Serde struct type named `struct `with two fields named `type` and `fields`.
+                // `fields` will get serialized as a Serde map.
+                // Unfortunately, we can't serialize this in the logical way: as a Serde struct named `type` with a field for
+                // each of `fields` because serde insists that struct and field names be `'static &str`'s
+                let mut t = serializer.serialize_struct(MOVE_STRUCT_NAME, 2)?;
+                // serialize type as string (e.g., 0x0::ModuleName::StructName<TypeArg1,TypeArg2>) instead of (e.g.
+                // { address: 0x0...0, module: ModuleName, name: StructName, type_args: [TypeArg1, TypeArg2]})
+                t.serialize_field(MOVE_STRUCT_TYPE, &type_.to_string())?;
+                t.serialize_field(MOVE_STRUCT_FIELDS, &MoveFields(fields))?;
+                t.end()
+            },
+        }
+    }
+}
+
+impl fmt::Display for MoveFieldLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}: {}", self.name, self.layout)
+    }
+}
+
+impl fmt::Display for MoveTypeLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        use MoveTypeLayout::*;
+        match self {
+            Bool => write!(f, "bool"),
+            U8 => write!(f, "u8"),
+            U16 => write!(f, "u16"),
+            U32 => write!(f, "u32"),
+            U64 => write!(f, "u64"),
+            U128 => write!(f, "u128"),
+            U256 => write!(f, "u256"),
+            Address => write!(f, "address"),
+            Vector(typ) => write!(f, "vector<{}>", typ),
+            Struct(s) => write!(f, "{}", s),
+            Signer => write!(f, "signer"),
+        }
+    }
+}
+
+impl fmt::Display for MoveStructLayout {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{{ ")?;
+        match self {
+            Self::Runtime(layouts) => {
+                for (i, l) in layouts.iter().enumerate() {
+                    write!(f, "{}: {}, ", i, l)?
+                }
+            },
+            Self::WithFields(layouts) => {
+                for layout in layouts {
+                    write!(f, "{}, ", layout)?
+                }
+            },
+            Self::WithTypes { type_, fields } => {
+                write!(f, "Type: {}", type_)?;
+                write!(f, "Fields:")?;
+                for field in fields {
+                    write!(f, "{}, ", field)?
+                }
+            },
+        }
+        write!(f, "}}")
+    }
+}
+
+impl TryInto<TypeTag> for &MoveTypeLayout {
+    type Error = anyhow::Error;
+
+    fn try_into(self) -> Result<TypeTag, Self::Error> {
+        Ok(match self {
+            MoveTypeLayout::Address => TypeTag::Address,
+            MoveTypeLayout::Bool => TypeTag::Bool,
+            MoveTypeLayout::U8 => TypeTag::U8,
+            MoveTypeLayout::U16 => TypeTag::U16,
+            MoveTypeLayout::U32 => TypeTag::U32,
+            MoveTypeLayout::U64 => TypeTag::U64,
+            MoveTypeLayout::U128 => TypeTag::U128,
+            MoveTypeLayout::U256 => TypeTag::U256,
+            MoveTypeLayout::Signer => TypeTag::Signer,
+            MoveTypeLayout::Vector(v) => {
+                let inner_type = &**v;
+                TypeTag::Vector(Box::new(inner_type.try_into()?))
+            },
+            MoveTypeLayout::Struct(v) => TypeTag::Struct(Box::new(v.try_into()?)),
+        })
+    }
+}
+
+impl TryInto<StructTag> for &MoveStructLayout {
+    type Error = anyhow::Error;
+
+    fn try_into(self) -> Result<StructTag, Self::Error> {
+        use MoveStructLayout::*;
+        match self {
+            Runtime(..) | WithFields(..) => bail!(
+                "Invalid MoveTypeLayout -> StructTag conversion--needed MoveLayoutType::WithTypes"
+            ),
+            WithTypes { type_, .. } => Ok(type_.clone()),
+        }
+    }
+}
+
+impl fmt::Display for MoveValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            MoveValue::U8(u) => write!(f, "{}u8", u),
+            MoveValue::U16(u) => write!(f, "{}u16", u),
+            MoveValue::U32(u) => write!(f, "{}u32", u),
+            MoveValue::U64(u) => write!(f, "{}u64", u),
+            MoveValue::U128(u) => write!(f, "{}u128", u),
+            MoveValue::U256(u) => write!(f, "{}u256", u),
+            MoveValue::Bool(false) => write!(f, "false"),
+            MoveValue::Bool(true) => write!(f, "true"),
+            MoveValue::Address(a) => write!(f, "{}", a.to_hex_literal()),
+            MoveValue::Signer(a) => write!(f, "signer({})", a.to_hex_literal()),
+            MoveValue::Vector(v) => fmt_list(f, "vector[", v, "]"),
+            MoveValue::Struct(s) => fmt::Display::fmt(s, f),
+        }
+    }
+}
+
+impl fmt::Display for MoveStruct {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            MoveStruct::Runtime(v) => fmt_list(f, "struct[", v, "]"),
+            MoveStruct::WithFields(fields) => {
+                fmt_list(f, "{", fields.iter().map(DisplayFieldBinding), "}")
+            },
+            MoveStruct::WithTypes { type_, fields } => {
+                fmt::Display::fmt(type_, f)?;
+                fmt_list(f, " {", fields.iter().map(DisplayFieldBinding), "}")
+            },
+        }
+    }
+}
+
+struct DisplayFieldBinding<'a>(&'a (Identifier, MoveValue));
+
+impl fmt::Display for DisplayFieldBinding<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let DisplayFieldBinding((field, value)) = self;
+        write!(f, "{}: {}", field, value)
+    }
+}
+
+fn fmt_list<T: fmt::Display>(
+    f: &mut fmt::Formatter<'_>,
+    begin: &str,
+    items: impl IntoIterator<Item = T>,
+    end: &str,
+) -> fmt::Result {
+    write!(f, "{}", begin)?;
+    let mut items = items.into_iter();
+    if let Some(x) = items.next() {
+        write!(f, "{}", x)?;
+        for x in items {
+            write!(f, ", {}", x)?;
+        }
+    }
+    write!(f, "{}", end)?;
+    Ok(())
+}
diff --git a/vendors/move/crates/move-core/types/src/vm_status.rs b/vendors/move/crates/move-core/types/src/vm_status.rs
new file mode 100644
index 000000000..d7b18704c
--- /dev/null
+++ b/vendors/move/crates/move-core/types/src/vm_status.rs
@@ -0,0 +1,899 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(clippy::unit_arg)]
+
+use crate::language_storage::ModuleId;
+use anyhow::Result;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::prelude::*;
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest_derive::Arbitrary;
+use serde::{de, ser, Deserialize, Serialize};
+use std::{convert::TryFrom, fmt};
+
+/// The minimum status code for validation statuses
+pub static VALIDATION_STATUS_MIN_CODE: u64 = 0;
+
+/// The maximum status code for validation statuses
+pub static VALIDATION_STATUS_MAX_CODE: u64 = 999;
+
+/// The minimum status code for verification statuses
+pub static VERIFICATION_STATUS_MIN_CODE: u64 = 1000;
+
+/// The maximum status code for verification statuses
+pub static VERIFICATION_STATUS_MAX_CODE: u64 = 1999;
+
+/// The minimum status code for invariant violation statuses
+pub static INVARIANT_VIOLATION_STATUS_MIN_CODE: u64 = 2000;
+
+/// The maximum status code for invariant violation statuses
+pub static INVARIANT_VIOLATION_STATUS_MAX_CODE: u64 = 2999;
+
+/// The minimum status code for deserialization statuses
+pub static DESERIALIZATION_STATUS_MIN_CODE: u64 = 3000;
+
+/// The maximum status code for deserialization statuses
+pub static DESERIALIZATION_STATUS_MAX_CODE: u64 = 3999;
+
+/// The minimum status code for runtime statuses
+pub static EXECUTION_STATUS_MIN_CODE: u64 = 4000;
+
+/// The maximum status code for runtim statuses
+pub static EXECUTION_STATUS_MAX_CODE: u64 = 4999;
+
+/// A `VMStatus` is represented as either
+/// - `Executed` indicating successful execution
+/// - `Error` indicating an error from the VM itself
+/// - `MoveAbort` indicating an `abort` ocurred inside of a Move program
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum VMStatus {
+    /// The VM status corresponding to an EXECUTED status code
+    Executed,
+
+    /// Indicates an error from the VM, e.g. OUT_OF_GAS, INVALID_AUTH_KEY, RET_TYPE_MISMATCH_ERROR
+    /// etc.
+    /// The code will neither EXECUTED nor ABORTED
+    Error(StatusCode, Option<String>),
+
+    /// Indicates an `abort` from inside Move code. Contains the location of the abort and the code
+    MoveAbort(AbortLocation, /* code */ u64),
+
+    /// Indicates an failure from inside Move code, where the VM could not continue exection, e.g.
+    /// dividing by zero or a missing resource
+    ExecutionFailure {
+        status_code: StatusCode,
+        location: AbortLocation,
+        function: u16,
+        code_offset: u16,
+        message: Option<String>,
+    },
+}
+
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum KeptVMStatus {
+    Executed,
+    OutOfGas,
+    MoveAbort(AbortLocation, /* code */ u64),
+    ExecutionFailure {
+        location: AbortLocation,
+        function: u16,
+        code_offset: u16,
+    },
+    MiscellaneousError,
+}
+
+impl KeptVMStatus {
+    pub fn is_success(&self) -> bool {
+        matches!(self, KeptVMStatus::Executed)
+    }
+}
+
+pub type DiscardedVMStatus = StatusCode;
+
+/// An `AbortLocation` specifies where a Move program `abort` occurred, either in a function in
+/// a module, or in a script
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+pub enum AbortLocation {
+    /// Indicates `abort` occurred in the specified module
+    Module(ModuleId),
+    /// Indicates the `abort` occurred in a script
+    Script,
+}
+
+/// A status type is one of 5 different variants, along with a fallback variant in the case that we
+/// don't recognize the status code.
+#[derive(Clone, PartialEq, Eq, Debug, Hash)]
+pub enum StatusType {
+    Validation,
+    Verification,
+    InvariantViolation,
+    Deserialization,
+    Execution,
+    Unknown,
+}
+
+impl VMStatus {
+    /// Return the status code for the `VMStatus`
+    pub fn status_code(&self) -> StatusCode {
+        match self {
+            Self::Executed => StatusCode::EXECUTED,
+            Self::MoveAbort(_, _) => StatusCode::ABORTED,
+            Self::ExecutionFailure { status_code, .. } => *status_code,
+            Self::Error(code, _) => {
+                let code = *code;
+                debug_assert!(code != StatusCode::EXECUTED);
+                debug_assert!(code != StatusCode::ABORTED);
+                code
+            },
+        }
+    }
+
+    /// Returns the message associated with the `VMStatus`, if any.
+    pub fn message(&self) -> Option<&String> {
+        match self {
+            Self::Error(_, message) | Self::ExecutionFailure { message, .. } => message.as_ref(),
+            _ => None,
+        }
+    }
+
+    /// Returns the Move abort code if the status is `MoveAbort`, and `None` otherwise
+    pub fn move_abort_code(&self) -> Option<u64> {
+        match self {
+            Self::MoveAbort(_, code) => Some(*code),
+            Self::Error(..) | Self::ExecutionFailure { .. } | Self::Executed => None,
+        }
+    }
+
+    /// Return the status type for this `VMStatus`. This is solely determined by the `status_code`
+    pub fn status_type(&self) -> StatusType {
+        self.status_code().status_type()
+    }
+
+    /// Returns `Ok` with a recorded status if it should be kept, `Err` of the error code if it
+    /// should be discarded
+    pub fn keep_or_discard(self) -> Result<KeptVMStatus, DiscardedVMStatus> {
+        match self {
+            VMStatus::Executed => Ok(KeptVMStatus::Executed),
+            VMStatus::MoveAbort(location, code) => Ok(KeptVMStatus::MoveAbort(location, code)),
+            VMStatus::ExecutionFailure {
+                status_code: StatusCode::OUT_OF_GAS,
+                ..
+            }
+            | VMStatus::Error(StatusCode::OUT_OF_GAS, _) => Ok(KeptVMStatus::OutOfGas),
+
+            VMStatus::ExecutionFailure {
+                status_code:
+                    StatusCode::EXECUTION_LIMIT_REACHED
+                    | StatusCode::IO_LIMIT_REACHED
+                    | StatusCode::STORAGE_LIMIT_REACHED,
+                ..
+            }
+            | VMStatus::Error(
+                StatusCode::EXECUTION_LIMIT_REACHED
+                | StatusCode::IO_LIMIT_REACHED
+                | StatusCode::STORAGE_LIMIT_REACHED,
+                _,
+            ) => Ok(KeptVMStatus::MiscellaneousError),
+
+            VMStatus::ExecutionFailure {
+                status_code: _status_code,
+                location,
+                function,
+                code_offset,
+                ..
+            } => Ok(KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            }),
+            VMStatus::Error(code, _) => {
+                match code.status_type() {
+                    // Any unknown error should be discarded
+                    StatusType::Unknown => Err(code),
+                    // Any error that is a validation status (i.e. an error arising from the prologue)
+                    // causes the transaction to not be included.
+                    StatusType::Validation => Err(code),
+                    // If the VM encountered an invalid internal state, we should discard the transaction.
+                    StatusType::InvariantViolation => Err(code),
+                    // A transaction that publishes code that cannot be verified will be charged.
+                    StatusType::Verification => Ok(KeptVMStatus::MiscellaneousError),
+                    // If we are able to decode the`SignedTransaction`, but failed to decode
+                    // `SingedTransaction.raw_transaction.payload` (i.e., the transaction script),
+                    // there should be a charge made to that user's account for the gas fees related
+                    // to decoding, running the prologue etc.
+                    StatusType::Deserialization => Ok(KeptVMStatus::MiscellaneousError),
+                    // Any error encountered during the execution of the transaction will charge gas.
+                    StatusType::Execution => Ok(KeptVMStatus::ExecutionFailure {
+                        location: AbortLocation::Script,
+                        function: 0,
+                        code_offset: 0,
+                    }),
+                }
+            },
+        }
+    }
+}
+
+impl fmt::Display for StatusType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let string = match self {
+            StatusType::Validation => "Validation",
+            StatusType::Verification => "Verification",
+            StatusType::InvariantViolation => "Invariant violation",
+            StatusType::Deserialization => "Deserialization",
+            StatusType::Execution => "Execution",
+            StatusType::Unknown => "Unknown",
+        };
+        write!(f, "{}", string)
+    }
+}
+
+impl fmt::Display for VMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let status_type = self.status_type();
+        let mut status = format!("status {:#?} of type {}", self.status_code(), status_type);
+
+        if let VMStatus::MoveAbort(_, code) = self {
+            status = format!("{} with sub status {}", status, code);
+        }
+
+        write!(f, "{}", status)
+    }
+}
+
+impl fmt::Display for KeptVMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "status ")?;
+        match self {
+            KeptVMStatus::Executed => write!(f, "EXECUTED"),
+            KeptVMStatus::OutOfGas => write!(f, "OUT_OF_GAS"),
+            KeptVMStatus::MiscellaneousError => write!(f, "MISCELLANEOUS_ERROR"),
+            KeptVMStatus::MoveAbort(location, code) => {
+                write!(f, "ABORTED with code {} in {}", code, location)
+            },
+            KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            } => write!(
+                f,
+                "EXECUTION_FAILURE at bytecode offset {} in function index {} in {}",
+                code_offset, function, location
+            ),
+        }
+    }
+}
+
+impl fmt::Debug for VMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            VMStatus::Executed => write!(f, "EXECUTED"),
+            VMStatus::Error(code, msg) => f
+                .debug_struct("ERROR")
+                .field("status_code", code)
+                .field("message", msg)
+                .finish(),
+            VMStatus::MoveAbort(location, code) => f
+                .debug_struct("ABORTED")
+                .field("code", code)
+                .field("location", location)
+                .finish(),
+            VMStatus::ExecutionFailure {
+                status_code,
+                location,
+                function,
+                code_offset,
+                message,
+            } => f
+                .debug_struct("EXECUTION_FAILURE")
+                .field("status_code", status_code)
+                .field("location", location)
+                .field("function_definition", function)
+                .field("code_offset", code_offset)
+                .field("message", message)
+                .finish(),
+        }
+    }
+}
+
+impl fmt::Debug for KeptVMStatus {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            KeptVMStatus::Executed => write!(f, "EXECUTED"),
+            KeptVMStatus::OutOfGas => write!(f, "OUT_OF_GAS"),
+            KeptVMStatus::MoveAbort(location, code) => f
+                .debug_struct("ABORTED")
+                .field("code", code)
+                .field("location", location)
+                .finish(),
+            KeptVMStatus::ExecutionFailure {
+                location,
+                function,
+                code_offset,
+            } => f
+                .debug_struct("EXECUTION_FAILURE")
+                .field("location", location)
+                .field("function_definition", function)
+                .field("code_offset", code_offset)
+                .finish(),
+            KeptVMStatus::MiscellaneousError => write!(f, "MISCELLANEOUS_ERROR"),
+        }
+    }
+}
+
+impl fmt::Display for AbortLocation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AbortLocation::Script => write!(f, "Script"),
+            AbortLocation::Module(id) => write!(f, "{}", id),
+        }
+    }
+}
+
+impl fmt::Debug for AbortLocation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+impl std::error::Error for VMStatus {}
+
+pub mod known_locations {
+    use crate::{
+        ident_str,
+        identifier::IdentStr,
+        language_storage::{ModuleId, CORE_CODE_ADDRESS},
+        vm_status::AbortLocation,
+    };
+    use once_cell::sync::Lazy;
+
+    /// The Identifier for the Account module.
+    pub const CORE_ACCOUNT_MODULE_IDENTIFIER: &IdentStr = ident_str!("Account");
+    /// The ModuleId for the Account module.
+    pub static CORE_ACCOUNT_MODULE: Lazy<ModuleId> =
+        Lazy::new(|| ModuleId::new(CORE_CODE_ADDRESS, CORE_ACCOUNT_MODULE_IDENTIFIER.to_owned()));
+    /// Location for an abort in the Account module
+    pub fn core_account_module_abort() -> AbortLocation {
+        AbortLocation::Module(CORE_ACCOUNT_MODULE.clone())
+    }
+
+    /// The Identifier for the Account module.
+    pub const DIEM_ACCOUNT_MODULE_IDENTIFIER: &IdentStr = ident_str!("DiemAccount");
+    /// The ModuleId for the Account module.
+    pub static DIEM_ACCOUNT_MODULE: Lazy<ModuleId> =
+        Lazy::new(|| ModuleId::new(CORE_CODE_ADDRESS, DIEM_ACCOUNT_MODULE_IDENTIFIER.to_owned()));
+    /// Location for an abort in the Account module
+    pub fn diem_account_module_abort() -> AbortLocation {
+        AbortLocation::Module(DIEM_ACCOUNT_MODULE.clone())
+    }
+
+    /// The Identifier for the Diem module.
+    pub const DIEM_MODULE_IDENTIFIER: &IdentStr = ident_str!("Diem");
+    /// The ModuleId for the Diem module.
+    pub static DIEM_MODULE: Lazy<ModuleId> =
+        Lazy::new(|| ModuleId::new(CORE_CODE_ADDRESS, DIEM_MODULE_IDENTIFIER.to_owned()));
+    pub fn diem_module_abort() -> AbortLocation {
+        AbortLocation::Module(DIEM_MODULE.clone())
+    }
+
+    /// The Identifier for the Designated Dealer module.
+    pub const DESIGNATED_DEALER_MODULE_IDENTIFIER: &IdentStr = ident_str!("DesignatedDealer");
+    /// The ModuleId for the Designated Dealer module.
+    pub static DESIGNATED_DEALER_MODULE: Lazy<ModuleId> = Lazy::new(|| {
+        ModuleId::new(
+            CORE_CODE_ADDRESS,
+            DESIGNATED_DEALER_MODULE_IDENTIFIER.to_owned(),
+        )
+    });
+    pub fn designated_dealer_module_abort() -> AbortLocation {
+        AbortLocation::Module(DESIGNATED_DEALER_MODULE.clone())
+    }
+}
+
+macro_rules! derive_status_try_from_repr {
+    (
+        #[repr($repr_ty:ident)]
+        $( #[$metas:meta] )*
+        $vis:vis enum $enum_name:ident {
+            $(
+                $variant:ident = $value: expr
+            ),*
+            $( , )?
+        }
+    ) => {
+        #[repr($repr_ty)]
+        $( #[$metas] )*
+        $vis enum $enum_name {
+            $(
+                $variant = $value
+            ),*
+        }
+
+        impl std::convert::TryFrom<$repr_ty> for $enum_name {
+            type Error = &'static str;
+            fn try_from(value: $repr_ty) -> Result<Self, Self::Error> {
+                match value {
+                    $(
+                        $value => Ok($enum_name::$variant),
+                    )*
+                    _ => Err("invalid StatusCode"),
+                }
+            }
+        }
+
+        #[cfg(any(test, feature = "fuzzing"))]
+        const STATUS_CODE_VALUES: &'static [$repr_ty] = &[
+            $($value),*
+        ];
+    };
+}
+
+derive_status_try_from_repr! {
+#[repr(u64)]
+#[allow(non_camel_case_types)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+/// We don't derive Arbitrary on this enum because it is too large and breaks proptest. It is
+/// written for a subset of these in proptest_types. We test conversion between this and protobuf
+/// with a hand-written test.
+pub enum StatusCode {
+    // The status of a transaction as determined by the prologue.
+    // Validation Errors: 0-999
+    // We don't want the default value to be valid
+    UNKNOWN_VALIDATION_STATUS = 0,
+    // The transaction has a bad signature
+    INVALID_SIGNATURE = 1,
+    // Bad account authentication key
+    INVALID_AUTH_KEY = 2,
+    // Sequence number is too old
+    SEQUENCE_NUMBER_TOO_OLD = 3,
+    // Sequence number is too new
+    SEQUENCE_NUMBER_TOO_NEW = 4,
+    // Insufficient balance to pay minimum transaction fee
+    INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE = 5,
+    // The transaction has expired
+    TRANSACTION_EXPIRED = 6,
+    // The sending account does not exist
+    SENDING_ACCOUNT_DOES_NOT_EXIST = 7,
+    // This write set transaction was rejected because it did not meet the
+    // requirements for one.
+    REJECTED_WRITE_SET = 8,
+    // This write set transaction cannot be applied to the current state.
+    INVALID_WRITE_SET = 9,
+    // Length of program field in raw transaction exceeded max length
+    EXCEEDED_MAX_TRANSACTION_SIZE = 10,
+    // This script is not in our allowlist of scripts.
+    UNKNOWN_SCRIPT = 11,
+    // Transaction is trying to publish a new module.
+    UNKNOWN_MODULE = 12,
+    // Max gas units submitted with transaction exceeds max gas units bound
+    // in VM
+    MAX_GAS_UNITS_EXCEEDS_MAX_GAS_UNITS_BOUND = 13,
+    // Max gas units submitted with transaction not enough to cover the
+    // intrinsic cost of the transaction.
+    MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS = 14,
+    // Gas unit price submitted with transaction is below minimum gas price
+    // set in the VM.
+    GAS_UNIT_PRICE_BELOW_MIN_BOUND = 15,
+    // Gas unit price submitted with the transaction is above the maximum
+    // gas price set in the VM.
+    GAS_UNIT_PRICE_ABOVE_MAX_BOUND = 16,
+    // Gas specifier submitted is either malformed (not a valid identifier),
+    // or does not refer to an accepted gas specifier
+    INVALID_GAS_SPECIFIER = 17,
+    // The sending account is frozen
+    SENDING_ACCOUNT_FROZEN = 18,
+    // Unable to deserialize the account blob
+    UNABLE_TO_DESERIALIZE_ACCOUNT = 19,
+    // The currency info was unable to be found
+    CURRENCY_INFO_DOES_NOT_EXIST = 20,
+    // The account sender doesn't have permissions to publish modules
+    INVALID_MODULE_PUBLISHER = 21,
+    // The sending account has no role
+    NO_ACCOUNT_ROLE = 22,
+    // The transaction's chain_id does not match the one published on-chain
+    BAD_CHAIN_ID = 23,
+    // The sequence number is too large and would overflow if the transaction were executed
+    SEQUENCE_NUMBER_TOO_BIG = 24,
+    // The gas currency is not registered as a TransactionFee currency
+    BAD_TRANSACTION_FEE_CURRENCY = 25,
+    // The feature requested is intended for a future Diem version instead of the current one
+    FEATURE_UNDER_GATING = 26,
+    // The number of secondary signer addresses is different from the number of secondary
+    // public keys provided.
+    SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH = 27,
+    // There are duplicates among signers, including the sender and all the secondary signers
+    SIGNERS_CONTAIN_DUPLICATES = 28,
+    // The sequence nonce in the transaction is invalid (too new, too old, or already used).
+    SEQUENCE_NONCE_INVALID = 29,
+    // There was an error when accessing chain-specific account information
+    CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST = 30,
+    // Multisig account specific error codes
+    ACCOUNT_NOT_MULTISIG = 31,
+    NOT_MULTISIG_OWNER = 32,
+    MULTISIG_TRANSACTION_NOT_FOUND = 33,
+    MULTISIG_TRANSACTION_INSUFFICIENT_APPROVALS = 34,
+    MULTISIG_TRANSACTION_PAYLOAD_DOES_NOT_MATCH_HASH = 35,
+    // Reserved error code for future use
+    RESERVED_VALIDATION_ERROR_1 = 36,
+    RESERVED_VALIDATION_ERROR_2 = 37,
+    RESERVED_VALIDATION_ERROR_3 = 38,
+    RESERVED_VALIDATION_ERROR_4 = 39,
+    RESERVED_VALIDATION_ERROR_5 = 40,
+
+    // When a code module/script is published it is verified. These are the
+    // possible errors that can arise from the verification process.
+    // Verification Errors: 1000-1999
+    UNKNOWN_VERIFICATION_ERROR = 1000,
+    INDEX_OUT_OF_BOUNDS = 1001,
+    INVALID_SIGNATURE_TOKEN = 1003,
+    RECURSIVE_STRUCT_DEFINITION = 1005,
+    FIELD_MISSING_TYPE_ABILITY = 1006,
+    INVALID_FALL_THROUGH = 1007,
+    NEGATIVE_STACK_SIZE_WITHIN_BLOCK = 1009,
+    INVALID_MAIN_FUNCTION_SIGNATURE = 1011,
+    DUPLICATE_ELEMENT = 1012,
+    INVALID_MODULE_HANDLE = 1013,
+    UNIMPLEMENTED_HANDLE = 1014,
+    LOOKUP_FAILED = 1017,
+    TYPE_MISMATCH = 1020,
+    MISSING_DEPENDENCY = 1021,
+    POP_WITHOUT_DROP_ABILITY = 1023,
+    BR_TYPE_MISMATCH_ERROR = 1025,
+    ABORT_TYPE_MISMATCH_ERROR = 1026,
+    STLOC_TYPE_MISMATCH_ERROR = 1027,
+    STLOC_UNSAFE_TO_DESTROY_ERROR = 1028,
+    UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED = 1029,
+    RET_TYPE_MISMATCH_ERROR = 1030,
+    RET_BORROWED_MUTABLE_REFERENCE_ERROR = 1031,
+    FREEZEREF_TYPE_MISMATCH_ERROR = 1032,
+    FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR = 1033,
+    BORROWFIELD_TYPE_MISMATCH_ERROR = 1034,
+    BORROWFIELD_BAD_FIELD_ERROR = 1035,
+    BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR = 1036,
+    COPYLOC_UNAVAILABLE_ERROR = 1037,
+    COPYLOC_WITHOUT_COPY_ABILITY = 1038,
+    COPYLOC_EXISTS_BORROW_ERROR = 1039,
+    MOVELOC_UNAVAILABLE_ERROR = 1040,
+    MOVELOC_EXISTS_BORROW_ERROR = 1041,
+    BORROWLOC_REFERENCE_ERROR = 1042,
+    BORROWLOC_UNAVAILABLE_ERROR = 1043,
+    BORROWLOC_EXISTS_BORROW_ERROR = 1044,
+    CALL_TYPE_MISMATCH_ERROR = 1045,
+    CALL_BORROWED_MUTABLE_REFERENCE_ERROR = 1046,
+    PACK_TYPE_MISMATCH_ERROR = 1047,
+    UNPACK_TYPE_MISMATCH_ERROR = 1048,
+    READREF_TYPE_MISMATCH_ERROR = 1049,
+    READREF_WITHOUT_COPY_ABILITY = 1050,
+    READREF_EXISTS_MUTABLE_BORROW_ERROR = 1051,
+    WRITEREF_TYPE_MISMATCH_ERROR = 1052,
+    WRITEREF_WITHOUT_DROP_ABILITY = 1053,
+    WRITEREF_EXISTS_BORROW_ERROR = 1054,
+    WRITEREF_NO_MUTABLE_REFERENCE_ERROR = 1055,
+    INTEGER_OP_TYPE_MISMATCH_ERROR = 1056,
+    BOOLEAN_OP_TYPE_MISMATCH_ERROR = 1057,
+    EQUALITY_OP_TYPE_MISMATCH_ERROR = 1058,
+    EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT = 1059,
+    BORROWGLOBAL_TYPE_MISMATCH_ERROR = 1060,
+    BORROWGLOBAL_WITHOUT_KEY_ABILITY= 1061,
+    MOVEFROM_TYPE_MISMATCH_ERROR = 1062,
+    MOVEFROM_WITHOUT_KEY_ABILITY = 1063,
+    MOVETO_TYPE_MISMATCH_ERROR = 1064,
+    MOVETO_WITHOUT_KEY_ABILITY= 1065,
+    // The self address of a module the transaction is publishing is not the sender address
+    MODULE_ADDRESS_DOES_NOT_MATCH_SENDER = 1067,
+    // The module does not have any module handles. Each module or script must have at least one
+    // module handle.
+    NO_MODULE_HANDLES = 1068,
+    POSITIVE_STACK_SIZE_AT_BLOCK_END = 1069,
+    MISSING_ACQUIRES_ANNOTATION = 1070,
+    EXTRANEOUS_ACQUIRES_ANNOTATION = 1071,
+    DUPLICATE_ACQUIRES_ANNOTATION = 1072,
+    INVALID_ACQUIRES_ANNOTATION = 1073,
+    GLOBAL_REFERENCE_ERROR = 1074,
+    CONSTRAINT_NOT_SATISFIED = 1075,
+    NUMBER_OF_TYPE_ARGUMENTS_MISMATCH = 1076,
+    LOOP_IN_INSTANTIATION_GRAPH = 1077,
+    // Reported when a struct has zero fields
+    ZERO_SIZED_STRUCT = 1080,
+    LINKER_ERROR = 1081,
+    INVALID_CONSTANT_TYPE = 1082,
+    MALFORMED_CONSTANT_DATA = 1083,
+    EMPTY_CODE_UNIT = 1084,
+    INVALID_LOOP_SPLIT = 1085,
+    INVALID_LOOP_BREAK = 1086,
+    INVALID_LOOP_CONTINUE = 1087,
+    UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP = 1088,
+    TOO_MANY_LOCALS = 1089,
+    GENERIC_MEMBER_OPCODE_MISMATCH = 1090,
+    FUNCTION_RESOLUTION_FAILURE = 1091,
+    INVALID_OPERATION_IN_SCRIPT = 1094,
+    // The sender is trying to publish two modules with the same name in one transaction
+    DUPLICATE_MODULE_NAME = 1095,
+    // The sender is trying to publish a module that breaks the compatibility checks
+    BACKWARD_INCOMPATIBLE_MODULE_UPDATE = 1096,
+    // The updated module introduces a cyclic dependency (i.e., A uses B and B also uses A)
+    CYCLIC_MODULE_DEPENDENCY = 1097,
+    NUMBER_OF_ARGUMENTS_MISMATCH = 1098,
+    INVALID_PARAM_TYPE_FOR_DESERIALIZATION = 1099,
+    FAILED_TO_DESERIALIZE_ARGUMENT = 1100,
+    NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH = 1101,
+    CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE = 1102,
+    EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION = 1103,
+    // Cannot mark the module itself as a friend
+    INVALID_FRIEND_DECL_WITH_SELF = 1104,
+    // Cannot declare modules outside of account address as friends
+    INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS = 1105,
+    // Cannot declare modules that this module depends on as friends
+    INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES = 1106,
+    // The updated module introduces a cyclic friendship (i.e., A friends B and B also friends A)
+    CYCLIC_MODULE_FRIENDSHIP = 1107,
+    // A phantom type parameter was used in a non-phantom position.
+    INVALID_PHANTOM_TYPE_PARAM_POSITION = 1108,
+    VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR = 1109,
+    VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR = 1110,
+    // Loops are too deeply nested.
+    LOOP_MAX_DEPTH_REACHED = 1111,
+    TOO_MANY_TYPE_PARAMETERS = 1112,
+    TOO_MANY_PARAMETERS = 1113,
+    TOO_MANY_BASIC_BLOCKS = 1114,
+    VALUE_STACK_OVERFLOW = 1115,
+    TOO_MANY_TYPE_NODES = 1116,
+    VALUE_STACK_PUSH_OVERFLOW = 1117,
+    MAX_DEPENDENCY_DEPTH_REACHED = 1118,
+    MAX_FUNCTION_DEFINITIONS_REACHED = 1119,
+    MAX_STRUCT_DEFINITIONS_REACHED = 1120,
+    MAX_FIELD_DEFINITIONS_REACHED = 1121,
+    // Reserved error code for future use
+    TOO_MANY_BACK_EDGES = 1122,
+    RESERVED_VERIFICATION_ERROR_1 = 1123,
+    RESERVED_VERIFICATION_ERROR_2 = 1124,
+    RESERVED_VERIFICATION_ERROR_3 = 1125,
+    RESERVED_VERIFICATION_ERROR_4 = 1126,
+    RESERVED_VERIFICATION_ERROR_5 = 1127,
+
+    // These are errors that the VM might raise if a violation of internal
+    // invariants takes place.
+    // Invariant Violation Errors: 2000-2999
+    UNKNOWN_INVARIANT_VIOLATION_ERROR = 2000,
+    EMPTY_VALUE_STACK = 2003,
+    PC_OVERFLOW = 2005,
+    VERIFICATION_ERROR = 2006,
+    STORAGE_ERROR = 2008,
+    INTERNAL_TYPE_ERROR = 2009,
+    EVENT_KEY_MISMATCH = 2010,
+    UNREACHABLE = 2011,
+    VM_STARTUP_FAILURE = 2012,
+    UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION = 2015,
+    VERIFIER_INVARIANT_VIOLATION = 2016,
+    UNEXPECTED_VERIFIER_ERROR = 2017,
+    UNEXPECTED_DESERIALIZATION_ERROR = 2018,
+    FAILED_TO_SERIALIZE_WRITE_SET_CHANGES = 2019,
+    FAILED_TO_DESERIALIZE_RESOURCE = 2020,
+    // Failed to resolve type due to linking being broken after verification
+    TYPE_RESOLUTION_FAILURE = 2021,
+    DUPLICATE_NATIVE_FUNCTION = 2022,
+    // Reserved error code for future use
+    RESERVED_INVARIANT_VIOLATION_ERROR_1 = 2023,
+    RESERVED_INVARIANT_VIOLATION_ERROR_2 = 2024,
+    RESERVED_INVARIANT_VIOLATION_ERROR_3 = 2025,
+    RESERVED_INVARIANT_VIOLATION_ERROR_4 = 2026,
+    RESERVED_INVARIANT_VIOLATION_ERROR_5 = 2027,
+
+    // Errors that can arise from binary decoding (deserialization)
+    // Deserializtion Errors: 3000-3999
+    UNKNOWN_BINARY_ERROR = 3000,
+    MALFORMED = 3001,
+    BAD_MAGIC = 3002,
+    UNKNOWN_VERSION = 3003,
+    UNKNOWN_TABLE_TYPE = 3004,
+    UNKNOWN_SIGNATURE_TYPE = 3005,
+    UNKNOWN_SERIALIZED_TYPE = 3006,
+    UNKNOWN_OPCODE = 3007,
+    BAD_HEADER_TABLE = 3008,
+    UNEXPECTED_SIGNATURE_TYPE = 3009,
+    DUPLICATE_TABLE = 3010,
+    UNKNOWN_ABILITY = 3013,
+    UNKNOWN_NATIVE_STRUCT_FLAG = 3014,
+    BAD_U16 = 3017,
+    BAD_U32 = 3018,
+    BAD_U64 = 3019,
+    BAD_U128 = 3020,
+    BAD_U256 = 3021,
+    VALUE_SERIALIZATION_ERROR = 3022,
+    VALUE_DESERIALIZATION_ERROR = 3023,
+    CODE_DESERIALIZATION_ERROR = 3024,
+    INVALID_FLAG_BITS = 3025,
+    // Reserved error code for future use
+    RESERVED_DESERIALIZAION_ERROR_1 = 3026,
+    RESERVED_DESERIALIZAION_ERROR_2 = 3027,
+    RESERVED_DESERIALIZAION_ERROR_3 = 3028,
+    RESERVED_DESERIALIZAION_ERROR_4 = 3029,
+    RESERVED_DESERIALIZAION_ERROR_5 = 3030,
+
+    // Errors that can arise at runtime
+    // Runtime Errors: 4000-4999
+    UNKNOWN_RUNTIME_STATUS = 4000,
+    EXECUTED = 4001,
+    OUT_OF_GAS = 4002,
+    // We tried to access a resource that does not exist under the account.
+    RESOURCE_DOES_NOT_EXIST = 4003,
+    // We tried to create a resource under an account where that resource
+    // already exists.
+    RESOURCE_ALREADY_EXISTS = 4004,
+    MISSING_DATA = 4008,
+    DATA_FORMAT_ERROR = 4009,
+    ABORTED = 4016,
+    ARITHMETIC_ERROR = 4017,
+    VECTOR_OPERATION_ERROR = 4018,
+    EXECUTION_STACK_OVERFLOW = 4020,
+    CALL_STACK_OVERFLOW = 4021,
+    VM_MAX_TYPE_DEPTH_REACHED = 4024,
+    VM_MAX_VALUE_DEPTH_REACHED = 4025,
+    VM_EXTENSION_ERROR = 4026,
+    STORAGE_WRITE_LIMIT_REACHED = 4027,
+    MEMORY_LIMIT_EXCEEDED = 4028,
+    VM_MAX_TYPE_NODES_REACHED = 4029,
+    EXECUTION_LIMIT_REACHED = 4030,
+    IO_LIMIT_REACHED = 4031,
+    STORAGE_LIMIT_REACHED = 4032,
+    // Reserved error code for future use
+    RESERVED_RUNTIME_ERROR_1 = 4033,
+    RESERVED_RUNTIME_ERROR_2 = 4034,
+    RESERVED_RUNTIME_ERROR_3 = 4035,
+    RESERVED_RUNTIME_ERROR_4 = 4036,
+    RESERVED_RUNTIME_ERROR_5 = 4037,
+
+    // A reserved status to represent an unknown vm status.
+    // this is std::u64::MAX, but we can't pattern match on that, so put the hardcoded value in
+    UNKNOWN_STATUS = 18446744073709551615,
+}
+}
+
+impl StatusCode {
+    /// Return the status type for this status code
+    pub fn status_type(self) -> StatusType {
+        let major_status_number: u64 = self.into();
+        if major_status_number >= VALIDATION_STATUS_MIN_CODE
+            && major_status_number <= VALIDATION_STATUS_MAX_CODE
+        {
+            return StatusType::Validation;
+        }
+
+        if major_status_number >= VERIFICATION_STATUS_MIN_CODE
+            && major_status_number <= VERIFICATION_STATUS_MAX_CODE
+        {
+            return StatusType::Verification;
+        }
+
+        if major_status_number >= INVARIANT_VIOLATION_STATUS_MIN_CODE
+            && major_status_number <= INVARIANT_VIOLATION_STATUS_MAX_CODE
+        {
+            return StatusType::InvariantViolation;
+        }
+
+        if major_status_number >= DESERIALIZATION_STATUS_MIN_CODE
+            && major_status_number <= DESERIALIZATION_STATUS_MAX_CODE
+        {
+            return StatusType::Deserialization;
+        }
+
+        if major_status_number >= EXECUTION_STATUS_MIN_CODE
+            && major_status_number <= EXECUTION_STATUS_MAX_CODE
+        {
+            return StatusType::Execution;
+        }
+
+        StatusType::Unknown
+    }
+}
+
+// TODO(#1307)
+impl ser::Serialize for StatusCode {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: ser::Serializer,
+    {
+        serializer.serialize_u64((*self).into())
+    }
+}
+
+impl<'de> de::Deserialize<'de> for StatusCode {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: de::Deserializer<'de>,
+    {
+        struct StatusCodeVisitor;
+        impl<'de> de::Visitor<'de> for StatusCodeVisitor {
+            type Value = StatusCode;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+                formatter.write_str("StatusCode as u64")
+            }
+
+            fn visit_u64<E>(self, v: u64) -> std::result::Result<StatusCode, E>
+            where
+                E: de::Error,
+            {
+                Ok(StatusCode::try_from(v).unwrap_or(StatusCode::UNKNOWN_STATUS))
+            }
+        }
+
+        deserializer.deserialize_u64(StatusCodeVisitor)
+    }
+}
+
+impl From<StatusCode> for u64 {
+    fn from(status: StatusCode) -> u64 {
+        status as u64
+    }
+}
+
+pub mod sub_status {
+    // Native Function Error sub-codes
+    pub const NFE_VECTOR_ERROR_BASE: u64 = 0;
+    // Failure in BCS deserialization
+    pub const NFE_BCS_SERIALIZATION_FAILURE: u64 = 0x1C5;
+}
+
+/// The `Arbitrary` impl only generates validation statuses since the full enum is too large.
+#[cfg(any(test, feature = "fuzzing"))]
+impl Arbitrary for StatusCode {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with(_args: ()) -> Self::Strategy {
+        (any::<usize>())
+            .prop_map(|index| {
+                let status_code_value = STATUS_CODE_VALUES[index % STATUS_CODE_VALUES.len()];
+                StatusCode::try_from(status_code_value).unwrap()
+            })
+            .boxed()
+    }
+}
+
+#[test]
+fn test_status_codes() {
+    use std::collections::HashSet;
+    // Make sure that within the 0-EXECUTION_STATUS_MAX_CODE that all of the status codes succeed
+    // when they should, and fail when they should.
+    for possible_major_status_code in 0..=EXECUTION_STATUS_MAX_CODE {
+        if STATUS_CODE_VALUES.contains(&possible_major_status_code) {
+            let status = StatusCode::try_from(possible_major_status_code);
+            assert!(status.is_ok());
+            let to_major_status_code = u64::from(status.unwrap());
+            assert_eq!(possible_major_status_code, to_major_status_code);
+        } else {
+            assert!(StatusCode::try_from(possible_major_status_code).is_err())
+        }
+    }
+
+    let mut seen_statuses = HashSet::new();
+    let mut seen_codes = HashSet::new();
+    // Now make sure that all of the error codes (including any that may be out-of-range) succeed.
+    // Make sure there aren't any duplicate mappings
+    for major_status_code in STATUS_CODE_VALUES.iter() {
+        assert!(
+            !seen_codes.contains(major_status_code),
+            "Duplicate major_status_code found"
+        );
+        seen_codes.insert(*major_status_code);
+        let status = StatusCode::try_from(*major_status_code);
+        assert!(status.is_ok());
+        let unwrapped_status = status.unwrap();
+        assert!(
+            !seen_statuses.contains(&unwrapped_status),
+            "Found duplicate u64 -> Status mapping"
+        );
+        seen_statuses.insert(unwrapped_status);
+        let to_major_status_code = u64::from(unwrapped_status);
+        assert_eq!(*major_status_code, to_major_status_code);
+    }
+}
diff --git a/vendors/move/crates/move-coverage/Cargo.toml b/vendors/move/crates/move-coverage/Cargo.toml
new file mode 100644
index 000000000..8b80c505e
--- /dev/null
+++ b/vendors/move/crates/move-coverage/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "move-coverage"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem Move VM code coverage"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+petgraph.workspace = true
+clap.workspace = true
+serde.workspace = true
+anyhow = "1.0.71"
+codespan = { workspace = true, features = ["serialization"] }
+colored.workspace = true
+
+bcs.workspace = true
+
+move-command-line-common.workspace = true
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-binary-format.workspace = true
+move-bytecode-source-map.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-coverage/check_coverage.bash b/vendors/move/crates/move-coverage/check_coverage.bash
new file mode 100755
index 000000000..afd9d9379
--- /dev/null
+++ b/vendors/move/crates/move-coverage/check_coverage.bash
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+TRACE_PATH=$HOME/trace
+
+[ ! -e  "$TRACE_PATH" ] || rm -f "$TRACE_PATH"
+
+export MOVE_VM_TRACE=$TRACE_PATH
+
+echo "Rebuilding stdlib..."
+pushd ../../../diem-move/diem-framework || exit 1
+cargo run
+popd || exit 1
+
+# TODO: add coverage for transactional tests
+
+echo "---------------------------------------------------------------------------"
+echo "Running e2e testsuite..."
+echo "---------------------------------------------------------------------------"
+pushd ../../e2e-testsuite || exit 1
+cargo test -- --skip account_universe --skip fuzz_scripts
+popd || exit 1
+
+echo "---------------------------------------------------------------------------"
+echo "Running Move testsuite..."
+echo "---------------------------------------------------------------------------"
+pushd ../../move-compiler/functional-tests/tests || exit 1
+cargo test
+popd || exit 1
+
+echo "---------------------------------------------------------------------------"
+echo "Building Move modules and source maps.."
+echo "---------------------------------------------------------------------------"
+pushd ../../move-compiler || exit 1
+rm -rf build
+cargo run --bin move-build -- ../../diem-move/diem-framework/core/sources -m
+popd || exit 1
+
+echo "---------------------------------------------------------------------------"
+echo "Converting trace file..."
+echo "---------------------------------------------------------------------------"
+cargo run --bin move-trace-conversion -- -f "$TRACE_PATH" -o trace.mvcov
+
+echo "---------------------------------------------------------------------------"
+echo "Producing coverage summaries..."
+echo "---------------------------------------------------------------------------"
+cargo run --bin coverage-summaries -- -t trace.mvcov -s ../../../diem-move/diem-framework/DPN/releases/artifacts/current/modules
+
+echo "==========================================================================="
+echo "You can check source coverage for a module by running:"
+echo "> cargo run --bin source-coverage -- -t trace.mvcov -b ../../move-compiler/build/modules/<LOOK_FOR_MODULE_HERE>.mv -s ../../../diem-move/diem-framework/core/modules/<SOURCE_MODULE>.move"
+echo "---------------------------------------------------------------------------"
+echo "You can can also get a finer-grained coverage summary for each function by running:"
+echo "> cargo run --bin coverage-summaries -- -t trace.mvcov -s ../../../diem-move/diem-framework/DPN/releases/artifacts/current/stdlib.mv"
+echo "==========================================================================="
+
+unset MOVE_VM_TRACE
+
+echo "DONE"
diff --git a/vendors/move/crates/move-coverage/src/bin/coverage-summaries.rs b/vendors/move/crates/move-coverage/src/bin/coverage-summaries.rs
new file mode 100644
index 000000000..46bc59291
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/bin/coverage-summaries.rs
@@ -0,0 +1,137 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_binary_format::file_format::CompiledModule;
+use move_coverage::{
+    coverage_map::{CoverageMap, TraceMap},
+    format_csv_summary, format_human_summary, summary,
+};
+use std::{
+    fs::{self, File},
+    io::{self, Write},
+    path::Path,
+};
+
+#[derive(Debug, Parser)]
+#[clap(
+    name = "coverage-summaries",
+    about = "Creates a coverage summary from the trace data collected from the Move VM",
+    author,
+    version
+)]
+struct Args {
+    /// The path to the coverage map or trace file
+    #[clap(long = "input-trace-path", short = 't')]
+    pub input_trace_path: String,
+    /// Whether the passed-in file is a raw trace file or a serialized coverage map
+    #[clap(long = "is-raw-trace", short = 'r')]
+    pub is_raw_trace_file: bool,
+    /// The path to the module binary
+    #[clap(long = "module-path", short = 'b')]
+    pub module_binary_path: Option<String>,
+    /// Optional path for summaries. Printed to stdout if not present.
+    #[clap(long = "summary-path", short = 'o')]
+    pub summary_path: Option<String>,
+    /// Whether function coverage summaries should be displayed
+    #[clap(long = "summarize-functions", short = 'f')]
+    pub summarize_functions: bool,
+    /// The path to the standard library binary directory for Move
+    #[clap(long = "stdlib-path", short = 's')]
+    pub stdlib_path: Option<String>,
+    /// Whether path coverage should be derived (default is instruction coverage)
+    #[clap(long = "derive-path-coverage", short = 'p')]
+    pub derive_path_coverage: bool,
+    /// Output CSV data of coverage
+    #[clap(long = "csv", short = 'c')]
+    pub csv_output: bool,
+}
+
+fn get_modules(args: &Args) -> Vec<CompiledModule> {
+    let mut modules = Vec::new();
+    if let Some(stdlib_path) = &args.stdlib_path {
+        let stdlib_modules = fs::read_dir(stdlib_path).unwrap().map(|file| {
+            let bytes = fs::read(file.unwrap().path()).unwrap();
+            CompiledModule::deserialize_with_defaults(&bytes)
+                .expect("Module blob can't be deserialized")
+        });
+        modules.extend(stdlib_modules);
+    }
+
+    if let Some(module_binary_path) = &args.module_binary_path {
+        let bytecode_bytes = fs::read(module_binary_path).expect("Unable to read bytecode file");
+        let compiled_module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)
+            .expect("Module blob can't be deserialized");
+        modules.push(compiled_module);
+    }
+
+    if modules.is_empty() {
+        panic!("No modules provided for coverage checking")
+    }
+
+    modules
+}
+
+fn main() {
+    let args = Args::parse();
+    let input_trace_path = Path::new(&args.input_trace_path);
+
+    let mut summary_writer: Box<dyn Write> = match &args.summary_path {
+        Some(x) => {
+            let path = Path::new(x);
+            Box::new(File::create(path).unwrap())
+        }
+        None => Box::new(io::stdout()),
+    };
+
+    let modules = get_modules(&args);
+    if args.derive_path_coverage {
+        let trace_map = if args.is_raw_trace_file {
+            TraceMap::from_trace_file(input_trace_path)
+        } else {
+            TraceMap::from_binary_file(input_trace_path)
+        };
+        if !args.csv_output {
+            format_human_summary(
+                &modules,
+                &trace_map,
+                summary::summarize_path_cov,
+                &mut summary_writer,
+                args.summarize_functions,
+            )
+        } else {
+            format_csv_summary(
+                &modules,
+                &trace_map,
+                summary::summarize_path_cov,
+                &mut summary_writer,
+            )
+        }
+    } else {
+        let coverage_map = if args.is_raw_trace_file {
+            CoverageMap::from_trace_file(input_trace_path)
+        } else {
+            CoverageMap::from_binary_file(input_trace_path).unwrap()
+        };
+        let unified_exec_map = coverage_map.to_unified_exec_map();
+        if !args.csv_output {
+            format_human_summary(
+                &modules,
+                &unified_exec_map,
+                summary::summarize_inst_cov,
+                &mut summary_writer,
+                args.summarize_functions,
+            )
+        } else {
+            format_csv_summary(
+                &modules,
+                &unified_exec_map,
+                summary::summarize_inst_cov,
+                &mut summary_writer,
+            )
+        }
+    }
+}
diff --git a/vendors/move/crates/move-coverage/src/bin/move-trace-conversion.rs b/vendors/move/crates/move-coverage/src/bin/move-trace-conversion.rs
new file mode 100644
index 000000000..a8a42cfa7
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/bin/move-trace-conversion.rs
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_coverage::coverage_map::{output_map_to_file, CoverageMap, TraceMap};
+use std::path::Path;
+
+#[derive(Debug, Parser)]
+#[clap(
+    name = "move-trace-conversion",
+    about = "Creates a coverage map from the raw data collected from the Move VM",
+    author,
+    version
+)]
+struct Args {
+    /// The path to the input file
+    #[clap(long = "input-file-path", short = 'f')]
+    pub input_file_path: String,
+    /// The path to the output file location
+    #[clap(long = "output-file-path", short = 'o')]
+    pub output_file_path: String,
+    /// Add traces from `input_file_path` to an existing coverage map at `update_coverage_map`
+    #[clap(long = "update", short = 'u')]
+    pub update: Option<String>,
+    /// Collect structured trace instead of aggregated coverage information
+    #[clap(long = "use-trace-map", short = 't')]
+    pub use_trace_map: bool,
+}
+
+fn main() {
+    let args = Args::parse();
+    let input_path = Path::new(&args.input_file_path);
+    let output_path = Path::new(&args.output_file_path);
+
+    if !args.use_trace_map {
+        let coverage_map = if let Some(old_coverage_path) = &args.update {
+            let path = Path::new(&old_coverage_path);
+            let old_coverage_map = CoverageMap::from_binary_file(path).unwrap();
+            old_coverage_map.update_coverage_from_trace_file(input_path)
+        } else {
+            CoverageMap::from_trace_file(input_path)
+        };
+
+        output_map_to_file(output_path, &coverage_map)
+            .expect("Unable to serialize coverage map to output file")
+    } else {
+        let trace_map = if let Some(old_trace_path) = &args.update {
+            let path = Path::new(&old_trace_path);
+            let old_trace_map = TraceMap::from_binary_file(path);
+            old_trace_map.update_from_trace_file(input_path)
+        } else {
+            TraceMap::from_trace_file(input_path)
+        };
+
+        output_map_to_file(output_path, &trace_map)
+            .expect("Unable to serialize trace map to output file")
+    }
+}
diff --git a/vendors/move/crates/move-coverage/src/bin/source-coverage.rs b/vendors/move/crates/move-coverage/src/bin/source-coverage.rs
new file mode 100644
index 000000000..17852ca85
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/bin/source-coverage.rs
@@ -0,0 +1,76 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_source_map::utils::source_map_from_file;
+use move_command_line_common::files::SOURCE_MAP_EXTENSION;
+use move_coverage::{coverage_map::CoverageMap, source_coverage::SourceCoverageBuilder};
+use std::{
+    fs,
+    fs::File,
+    io::{self, Write},
+    path::Path,
+};
+
+#[derive(Debug, Parser)]
+#[clap(
+    name = "source-coverage",
+    about = "Annotate Move Source Code with Coverage Information",
+    author,
+    version
+)]
+struct Args {
+    /// The path to the coverage map or trace file
+    #[clap(long = "input-trace-path", short = 't')]
+    pub input_trace_path: String,
+    /// Whether the passed-in file is a raw trace file or a serialized coverage map
+    #[clap(long = "is-raw-trace", short = 'r')]
+    pub is_raw_trace_file: bool,
+    /// The path to the module binary
+    #[clap(long = "module-path", short = 'b')]
+    pub module_binary_path: String,
+    /// The path to the source file
+    #[clap(long = "source-path", short = 's')]
+    pub source_file_path: String,
+    /// Optional path to save coverage. Printed to stdout if not present.
+    #[clap(long = "coverage-path", short = 'o')]
+    pub coverage_path: Option<String>,
+}
+
+fn main() {
+    let args = Args::parse();
+    let source_map_extension = SOURCE_MAP_EXTENSION;
+    let coverage_map = if args.is_raw_trace_file {
+        CoverageMap::from_trace_file(&args.input_trace_path)
+    } else {
+        CoverageMap::from_binary_file(&args.input_trace_path).unwrap()
+    };
+
+    let bytecode_bytes = fs::read(&args.module_binary_path).expect("Unable to read bytecode file");
+    let compiled_module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)
+        .expect("Module blob can't be deserialized");
+
+    let source_map = source_map_from_file(
+        &Path::new(&args.module_binary_path).with_extension(source_map_extension),
+    )
+    .unwrap();
+    let source_path = Path::new(&args.source_file_path);
+    let source_cov = SourceCoverageBuilder::new(&compiled_module, &coverage_map, &source_map);
+
+    let mut coverage_writer: Box<dyn Write> = match &args.coverage_path {
+        Some(x) => {
+            let path = Path::new(x);
+            Box::new(File::create(path).unwrap())
+        }
+        None => Box::new(io::stdout()),
+    };
+
+    source_cov
+        .compute_source_coverage(source_path)
+        .output_source_coverage(&mut coverage_writer)
+        .unwrap();
+}
diff --git a/vendors/move/crates/move-coverage/src/coverage_map.rs b/vendors/move/crates/move-coverage/src/coverage_map.rs
new file mode 100644
index 000000000..357e69dd4
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/coverage_map.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use anyhow::{format_err, Result};
+use move_binary_format::file_format::{CodeOffset, CompiledModule};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::BTreeMap,
+    fs::File,
+    io::{BufRead, BufReader, Read, Write},
+    path::Path,
+};
+
+pub type FunctionCoverage = BTreeMap<u64, u64>;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CoverageMap {
+    pub exec_maps: BTreeMap<String, ExecCoverageMap>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ModuleCoverageMap {
+    pub module_addr: AccountAddress,
+    pub module_name: Identifier,
+    pub function_maps: BTreeMap<Identifier, FunctionCoverage>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ExecCoverageMap {
+    pub exec_id: String,
+    pub module_maps: BTreeMap<(AccountAddress, Identifier), ModuleCoverageMap>,
+}
+
+#[derive(Debug)]
+pub struct ExecCoverageMapWithModules {
+    pub module_maps: BTreeMap<(String, AccountAddress, Identifier), ModuleCoverageMap>,
+    pub compiled_modules: BTreeMap<String, CompiledModule>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TraceEntry {
+    pub module_addr: AccountAddress,
+    pub module_name: Identifier,
+    pub func_name: Identifier,
+    pub func_pc: CodeOffset,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TraceMap {
+    pub exec_maps: BTreeMap<String, Vec<TraceEntry>>,
+}
+
+impl CoverageMap {
+    /// Takes in a file containing a raw VM trace, and returns an updated coverage map.
+    pub fn update_coverage_from_trace_file<P: AsRef<Path> + std::fmt::Debug>(
+        mut self,
+        filename: P,
+    ) -> Self {
+        let file = File::open(&filename)
+            .unwrap_or_else(|_| panic!("Unable to open coverage trace file '{:?}'", filename));
+        for line in BufReader::new(file).lines() {
+            let line = line.unwrap();
+            let mut splits = line.split(',');
+            let exec_id = splits.next().unwrap();
+            let context = splits.next().unwrap();
+            let pc = splits.next().unwrap().parse::<u64>().unwrap();
+
+            let mut context_segs: Vec<_> = context.split("::").collect();
+            let is_script = context_segs.len() == 2;
+            if !is_script {
+                let func_name = Identifier::new(context_segs.pop().unwrap()).unwrap();
+                let module_name = Identifier::new(context_segs.pop().unwrap()).unwrap();
+                let module_addr =
+                    AccountAddress::from_hex_literal(context_segs.pop().unwrap()).unwrap();
+                self.insert(exec_id, module_addr, module_name, func_name, pc);
+            } else {
+                // Don't count scripts (for now)
+                assert_eq!(context_segs.pop().unwrap(), "main",);
+                assert_eq!(context_segs.pop().unwrap(), "Script",);
+            }
+        }
+        self
+    }
+
+    /// Takes in a file containing a raw VM trace, and returns a coverage map.
+    pub fn from_trace_file<P: AsRef<Path> + std::fmt::Debug>(filename: P) -> Self {
+        let empty_module_map = CoverageMap {
+            exec_maps: BTreeMap::new(),
+        };
+        empty_module_map.update_coverage_from_trace_file(filename)
+    }
+
+    /// Takes in a file containing a serialized coverage map and returns a coverage map.
+    pub fn from_binary_file<P: AsRef<Path> + std::fmt::Debug>(filename: P) -> Result<Self> {
+        let mut bytes = Vec::new();
+        File::open(&filename)
+            .map_err(|e| format_err!("{}: Coverage map file '{:?}' doesn't exist", e, filename))?
+            .read_to_end(&mut bytes)
+            .ok()
+            .ok_or_else(|| format_err!("Unable to read coverage map"))?;
+        bcs::from_bytes(&bytes).map_err(|_| format_err!("Error deserializing coverage map"))
+    }
+
+    // add entries in a cascading manner
+    pub fn insert(
+        &mut self,
+        exec_id: &str,
+        module_addr: AccountAddress,
+        module_name: Identifier,
+        func_name: Identifier,
+        pc: u64,
+    ) {
+        let exec_entry = self
+            .exec_maps
+            .entry(exec_id.to_owned())
+            .or_insert_with(|| ExecCoverageMap::new(exec_id.to_owned()));
+        exec_entry.insert(module_addr, module_name, func_name, pc);
+    }
+
+    pub fn to_unified_exec_map(&self) -> ExecCoverageMap {
+        let mut unified_map = ExecCoverageMap::new(String::new());
+        for (_, exec_map) in self.exec_maps.iter() {
+            for ((module_addr, module_name), module_map) in exec_map.module_maps.iter() {
+                for (func_name, func_map) in module_map.function_maps.iter() {
+                    for (pc, count) in func_map.iter() {
+                        unified_map.insert_multi(
+                            *module_addr,
+                            module_name.clone(),
+                            func_name.clone(),
+                            *pc,
+                            *count,
+                        );
+                    }
+                }
+            }
+        }
+        unified_map
+    }
+}
+
+impl ModuleCoverageMap {
+    pub fn new(module_addr: AccountAddress, module_name: Identifier) -> Self {
+        ModuleCoverageMap {
+            module_addr,
+            module_name,
+            function_maps: BTreeMap::new(),
+        }
+    }
+
+    pub fn insert_multi(&mut self, func_name: Identifier, pc: u64, count: u64) {
+        let func_entry = self.function_maps.entry(func_name).or_default();
+        let pc_entry = func_entry.entry(pc).or_insert(0);
+        *pc_entry += count;
+    }
+
+    pub fn insert(&mut self, func_name: Identifier, pc: u64) {
+        self.insert_multi(func_name, pc, 1);
+    }
+
+    pub fn merge(&mut self, another: ModuleCoverageMap) {
+        for (key, val) in another.function_maps {
+            self.function_maps.entry(key).or_default().extend(val);
+        }
+    }
+
+    pub fn get_function_coverage(&self, func_name: &IdentStr) -> Option<&FunctionCoverage> {
+        self.function_maps.get(func_name)
+    }
+}
+
+impl ExecCoverageMap {
+    pub fn new(exec_id: String) -> Self {
+        ExecCoverageMap {
+            exec_id,
+            module_maps: BTreeMap::new(),
+        }
+    }
+
+    pub fn insert_multi(
+        &mut self,
+        module_addr: AccountAddress,
+        module_name: Identifier,
+        func_name: Identifier,
+        pc: u64,
+        count: u64,
+    ) {
+        let module_entry = self
+            .module_maps
+            .entry((module_addr, module_name.clone()))
+            .or_insert_with(|| ModuleCoverageMap::new(module_addr, module_name));
+        module_entry.insert_multi(func_name, pc, count);
+    }
+
+    pub fn insert(
+        &mut self,
+        module_addr: AccountAddress,
+        module_name: Identifier,
+        func_name: Identifier,
+        pc: u64,
+    ) {
+        self.insert_multi(module_addr, module_name, func_name, pc, 1);
+    }
+
+    pub fn into_coverage_map_with_modules(
+        self,
+        modules: BTreeMap<AccountAddress, BTreeMap<Identifier, (String, CompiledModule)>>,
+    ) -> ExecCoverageMapWithModules {
+        let retained: BTreeMap<(String, AccountAddress, Identifier), ModuleCoverageMap> = self
+            .module_maps
+            .into_iter()
+            .filter_map(|((module_addr, module_name), module_cov)| {
+                modules.get(&module_addr).and_then(|func_map| {
+                    func_map.get(&module_name).map(|(module_path, _)| {
+                        ((module_path.clone(), module_addr, module_name), module_cov)
+                    })
+                })
+            })
+            .collect();
+
+        let compiled_modules = modules
+            .into_iter()
+            .flat_map(|(_, module_map)| {
+                module_map
+                    .into_iter()
+                    .map(|(_, (module_path, compiled_module))| (module_path, compiled_module))
+            })
+            .collect();
+
+        ExecCoverageMapWithModules {
+            module_maps: retained,
+            compiled_modules,
+        }
+    }
+}
+
+impl ExecCoverageMapWithModules {
+    pub fn empty() -> Self {
+        Self {
+            module_maps: BTreeMap::new(),
+            compiled_modules: BTreeMap::new(),
+        }
+    }
+
+    pub fn merge(&mut self, another: ExecCoverageMapWithModules) {
+        for ((module_path, module_addr, module_name), val) in another.module_maps {
+            self.module_maps
+                .entry((module_path.clone(), module_addr, module_name.clone()))
+                .or_insert_with(|| ModuleCoverageMap::new(module_addr, module_name))
+                .merge(val);
+        }
+
+        for (module_path, compiled_module) in another.compiled_modules {
+            self.compiled_modules
+                .entry(module_path)
+                .or_insert(compiled_module);
+        }
+    }
+}
+
+impl TraceMap {
+    /// Takes in a file containing a raw VM trace, and returns an updated coverage map.
+    pub fn update_from_trace_file<P: AsRef<Path>>(mut self, filename: P) -> Self {
+        let file = File::open(filename).unwrap();
+        for line in BufReader::new(file).lines() {
+            let line = line.unwrap();
+            let mut splits = line.split(',');
+            let exec_id = splits.next().unwrap();
+            let context = splits.next().unwrap();
+            let pc = splits.next().unwrap().parse::<u64>().unwrap();
+
+            let mut context_segs: Vec<_> = context.split("::").collect();
+            let is_script = context_segs.len() == 2;
+            if !is_script {
+                let func_name = Identifier::new(context_segs.pop().unwrap()).unwrap();
+                let module_name = Identifier::new(context_segs.pop().unwrap()).unwrap();
+                let module_addr =
+                    AccountAddress::from_hex_literal(context_segs.pop().unwrap()).unwrap();
+                self.insert(exec_id, module_addr, module_name, func_name, pc);
+            } else {
+                // Don't count scripts (for now)
+                assert_eq!(context_segs.pop().unwrap(), "main",);
+                assert_eq!(context_segs.pop().unwrap(), "Script",);
+            }
+        }
+        self
+    }
+
+    // Takes in a file containing a raw VM trace, and returns a parsed trace.
+    pub fn from_trace_file<P: AsRef<Path>>(filename: P) -> Self {
+        let trace_map = TraceMap {
+            exec_maps: BTreeMap::new(),
+        };
+        trace_map.update_from_trace_file(filename)
+    }
+
+    // Takes in a file containing a serialized trace and deserialize it.
+    pub fn from_binary_file<P: AsRef<Path>>(filename: P) -> Self {
+        let mut bytes = Vec::new();
+        File::open(filename)
+            .ok()
+            .and_then(|mut file| file.read_to_end(&mut bytes).ok())
+            .ok_or_else(|| format_err!("Error while reading in coverage map binary"))
+            .unwrap();
+        bcs::from_bytes(&bytes)
+            .map_err(|_| format_err!("Error deserializing into coverage map"))
+            .unwrap()
+    }
+
+    // add entries in a cascading manner
+    pub fn insert(
+        &mut self,
+        exec_id: &str,
+        module_addr: AccountAddress,
+        module_name: Identifier,
+        func_name: Identifier,
+        pc: u64,
+    ) {
+        let exec_entry = self.exec_maps.entry(exec_id.to_owned()).or_default();
+        exec_entry.push(TraceEntry {
+            module_addr,
+            module_name,
+            func_name,
+            func_pc: pc as CodeOffset,
+        });
+    }
+}
+
+pub fn output_map_to_file<M: Serialize, P: AsRef<Path>>(file_name: P, data: &M) -> Result<()> {
+    let bytes = bcs::to_bytes(data)?;
+    let mut file = File::create(file_name)?;
+    file.write_all(&bytes)?;
+    Ok(())
+}
diff --git a/vendors/move/crates/move-coverage/src/lib.rs b/vendors/move/crates/move-coverage/src/lib.rs
new file mode 100644
index 000000000..d50567548
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/lib.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::summary::ModuleSummary;
+use move_binary_format::CompiledModule;
+use std::io::Write;
+
+pub mod coverage_map;
+pub mod source_coverage;
+pub mod summary;
+
+pub fn format_human_summary<M, F, W: Write>(
+    modules: &[CompiledModule],
+    coverage_map: &M,
+    summary_func: F,
+    summary_writer: &mut W,
+    summarize_functions: bool,
+) where
+    F: Fn(&CompiledModule, &M) -> ModuleSummary,
+{
+    writeln!(summary_writer, "+-------------------------+").unwrap();
+    writeln!(summary_writer, "| Move Coverage Summary   |").unwrap();
+    writeln!(summary_writer, "+-------------------------+").unwrap();
+
+    let mut total_covered = 0;
+    let mut total_instructions = 0;
+
+    for module in modules.iter() {
+        let coverage_summary = summary_func(module, coverage_map);
+        let (total, covered) = coverage_summary
+            .summarize_human(summary_writer, summarize_functions)
+            .unwrap();
+        total_covered += covered;
+        total_instructions += total;
+    }
+
+    writeln!(summary_writer, "+-------------------------+").unwrap();
+    writeln!(
+        summary_writer,
+        "| % Move Coverage: {:.2}  |",
+        (total_covered as f64 / total_instructions as f64) * 100f64
+    )
+    .unwrap();
+    writeln!(summary_writer, "+-------------------------+").unwrap();
+}
+
+pub fn format_csv_summary<M, F, W: Write>(
+    modules: &[CompiledModule],
+    coverage_map: &M,
+    summary_func: F,
+    summary_writer: &mut W,
+) where
+    F: Fn(&CompiledModule, &M) -> ModuleSummary,
+{
+    writeln!(summary_writer, "ModuleName,FunctionName,Covered,Uncovered").unwrap();
+
+    for module in modules.iter() {
+        let coverage_summary = summary_func(module, coverage_map);
+        coverage_summary.summarize_csv(summary_writer).unwrap();
+    }
+}
diff --git a/vendors/move/crates/move-coverage/src/source_coverage.rs b/vendors/move/crates/move-coverage/src/source_coverage.rs
new file mode 100644
index 000000000..6825a9bd0
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/source_coverage.rs
@@ -0,0 +1,269 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::coverage_map::CoverageMap;
+use codespan::{Files, Span};
+use colored::*;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{CodeOffset, FunctionDefinitionIndex},
+    CompiledModule,
+};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_core_types::identifier::Identifier;
+use move_ir_types::location::Loc;
+use serde::Serialize;
+use std::{
+    collections::BTreeMap,
+    fs,
+    io::{self, Write},
+    path::Path,
+};
+
+#[derive(Clone, Debug, Serialize)]
+pub struct FunctionSourceCoverage {
+    pub fn_is_native: bool,
+    pub uncovered_locations: Vec<Loc>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct SourceCoverageBuilder<'a> {
+    uncovered_locations: BTreeMap<Identifier, FunctionSourceCoverage>,
+    source_map: &'a SourceMap,
+}
+
+#[derive(Debug, Serialize, Eq, PartialEq, Ord, PartialOrd)]
+pub enum AbstractSegment {
+    Bounded { start: u32, end: u32 },
+    BoundedRight { end: u32 },
+    BoundedLeft { start: u32 },
+}
+
+#[derive(Debug, Serialize)]
+pub enum StringSegment {
+    Covered(String),
+    Uncovered(String),
+}
+
+pub type AnnotatedLine = Vec<StringSegment>;
+
+#[derive(Debug, Serialize)]
+pub struct SourceCoverage {
+    pub annotated_lines: Vec<AnnotatedLine>,
+}
+
+impl<'a> SourceCoverageBuilder<'a> {
+    pub fn new(
+        module: &CompiledModule,
+        coverage_map: &CoverageMap,
+        source_map: &'a SourceMap,
+    ) -> Self {
+        let module_name = module.self_id();
+        let unified_exec_map = coverage_map.to_unified_exec_map();
+        let module_map = unified_exec_map
+            .module_maps
+            .get(&(*module_name.address(), module_name.name().to_owned()));
+
+        let uncovered_locations: BTreeMap<Identifier, FunctionSourceCoverage> = module
+            .function_defs()
+            .iter()
+            .enumerate()
+            .flat_map(|(function_def_idx, function_def)| {
+                let fn_handle = module.function_handle_at(function_def.function);
+                let fn_name = module.identifier_at(fn_handle.name).to_owned();
+                let function_def_idx = FunctionDefinitionIndex(function_def_idx as u16);
+
+                // If the function summary doesn't exist then that function hasn't been called yet.
+                let coverage = match &function_def.code {
+                    None => Some(FunctionSourceCoverage {
+                        fn_is_native: true,
+                        uncovered_locations: Vec::new(),
+                    }),
+                    Some(code_unit) => {
+                        module_map.map(|fn_map| match fn_map.function_maps.get(&fn_name) {
+                            None => {
+                                let function_map = source_map
+                                    .get_function_source_map(function_def_idx)
+                                    .unwrap();
+                                let mut uncovered_locations =
+                                    vec![function_map.definition_location];
+                                uncovered_locations.extend(function_map.code_map.values());
+
+                                FunctionSourceCoverage {
+                                    fn_is_native: false,
+                                    uncovered_locations,
+                                }
+                            }
+                            Some(function_coverage) => {
+                                let uncovered_locations: Vec<_> = (0..code_unit.code.len())
+                                    .flat_map(|code_offset| {
+                                        if !function_coverage.contains_key(&(code_offset as u64)) {
+                                            Some(
+                                                source_map
+                                                    .get_code_location(
+                                                        function_def_idx,
+                                                        code_offset as CodeOffset,
+                                                    )
+                                                    .unwrap(),
+                                            )
+                                        } else {
+                                            None
+                                        }
+                                    })
+                                    .collect();
+                                FunctionSourceCoverage {
+                                    fn_is_native: false,
+                                    uncovered_locations,
+                                }
+                            }
+                        })
+                    }
+                };
+                coverage.map(|x| (fn_name, x))
+            })
+            .collect();
+
+        Self {
+            uncovered_locations,
+            source_map,
+        }
+    }
+
+    pub fn compute_source_coverage(&self, file_path: &Path) -> SourceCoverage {
+        let file_contents = fs::read_to_string(file_path).unwrap();
+        assert!(
+            self.source_map.check(&file_contents),
+            "File contents out of sync with source map"
+        );
+        let mut files = Files::new();
+        let file_id = files.add(file_path.as_os_str().to_os_string(), file_contents.clone());
+
+        let mut uncovered_segments = BTreeMap::new();
+
+        for (_, fn_cov) in self.uncovered_locations.iter() {
+            for span in merge_spans(fn_cov.clone()).into_iter() {
+                let start_loc = files.location(file_id, span.start()).unwrap();
+                let end_loc = files.location(file_id, span.end()).unwrap();
+                let start_line = start_loc.line.0;
+                let end_line = end_loc.line.0;
+                let segments = uncovered_segments
+                    .entry(start_line)
+                    .or_insert_with(Vec::new);
+                if start_line == end_line {
+                    let segment = AbstractSegment::Bounded {
+                        start: start_loc.column.0,
+                        end: end_loc.column.0,
+                    };
+                    // TODO: There is some issue with the source map where we have multiple spans
+                    // from different functions. This can be seen in the source map for `Roles.move`
+                    if !segments.contains(&segment) {
+                        segments.push(segment);
+                    }
+                } else {
+                    segments.push(AbstractSegment::BoundedLeft {
+                        start: start_loc.column.0,
+                    });
+                    for i in start_line + 1..end_line {
+                        let segment = uncovered_segments.entry(i).or_insert_with(Vec::new);
+                        segment.push(AbstractSegment::BoundedLeft { start: 0 });
+                    }
+                    let last_segment = uncovered_segments.entry(end_line).or_insert_with(Vec::new);
+                    last_segment.push(AbstractSegment::BoundedRight {
+                        end: end_loc.column.0,
+                    });
+                }
+            }
+        }
+
+        let mut annotated_lines = Vec::new();
+        for (line_number, mut line) in file_contents.lines().map(|x| x.to_owned()).enumerate() {
+            match uncovered_segments.get(&(line_number as u32)) {
+                None => annotated_lines.push(vec![StringSegment::Covered(line)]),
+                Some(segments) => {
+                    // Note: segments are already pre-sorted by construction so don't need to be
+                    // resorted.
+                    let mut line_acc = Vec::new();
+                    let mut cursor = 0;
+                    for segment in segments {
+                        match segment {
+                            AbstractSegment::Bounded { start, end } => {
+                                let length = end - start;
+                                let (before, after) = line.split_at((start - cursor) as usize);
+                                let (uncovered, rest) = after.split_at(length as usize);
+                                line_acc.push(StringSegment::Covered(before.to_string()));
+                                line_acc.push(StringSegment::Uncovered(uncovered.to_string()));
+                                line = rest.to_string();
+                                cursor = *end;
+                            }
+                            AbstractSegment::BoundedRight { end } => {
+                                let (uncovered, rest) = line.split_at((end - cursor) as usize);
+                                line_acc.push(StringSegment::Uncovered(uncovered.to_string()));
+                                line = rest.to_string();
+                                cursor = *end;
+                            }
+                            AbstractSegment::BoundedLeft { start } => {
+                                let (before, after) = line.split_at((start - cursor) as usize);
+                                line_acc.push(StringSegment::Covered(before.to_string()));
+                                line_acc.push(StringSegment::Uncovered(after.to_string()));
+                                line = "".to_string();
+                                cursor = 0;
+                            }
+                        }
+                    }
+                    if !line.is_empty() {
+                        line_acc.push(StringSegment::Covered(line))
+                    }
+                    annotated_lines.push(line_acc)
+                }
+            }
+        }
+
+        SourceCoverage { annotated_lines }
+    }
+}
+
+impl SourceCoverage {
+    pub fn output_source_coverage<W: Write>(&self, output_writer: &mut W) -> io::Result<()> {
+        for line in self.annotated_lines.iter() {
+            for string_segment in line.iter() {
+                match string_segment {
+                    StringSegment::Covered(s) => write!(output_writer, "{}", s.green())?,
+                    StringSegment::Uncovered(s) => write!(output_writer, "{}", s.bold().red())?,
+                }
+            }
+            writeln!(output_writer)?;
+        }
+        Ok(())
+    }
+}
+
+fn merge_spans(cov: FunctionSourceCoverage) -> Vec<Span> {
+    if cov.uncovered_locations.is_empty() {
+        return vec![];
+    }
+
+    let mut covs: Vec<_> = cov
+        .uncovered_locations
+        .iter()
+        .map(|loc| Span::new(loc.start(), loc.end()))
+        .collect();
+    covs.sort();
+
+    let mut unioned = Vec::new();
+    let mut curr = covs.remove(0);
+
+    for interval in covs {
+        if curr.disjoint(interval) {
+            unioned.push(curr);
+            curr = interval;
+        } else {
+            curr = curr.merge(interval);
+        }
+    }
+
+    unioned.push(curr);
+    unioned
+}
diff --git a/vendors/move/crates/move-coverage/src/summary.rs b/vendors/move/crates/move-coverage/src/summary.rs
new file mode 100644
index 000000000..627e722c2
--- /dev/null
+++ b/vendors/move/crates/move-coverage/src/summary.rs
@@ -0,0 +1,459 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::coverage_map::{
+    ExecCoverageMap, ExecCoverageMapWithModules, ModuleCoverageMap, TraceMap,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph},
+    file_format::{Bytecode, CodeOffset},
+    CompiledModule,
+};
+use move_core_types::{identifier::Identifier, language_storage::ModuleId};
+use petgraph::{algo::tarjan_scc, Graph};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    io::{self, Write},
+};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ModuleSummary {
+    pub module_name: ModuleId,
+    pub function_summaries: BTreeMap<Identifier, FunctionSummary>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct FunctionSummary {
+    pub fn_is_native: bool,
+    pub total: u64,
+    pub covered: u64,
+}
+
+pub struct FunctionInfo {
+    pub fn_name: Identifier,
+    pub fn_entry: CodeOffset,
+    pub fn_returns: BTreeSet<CodeOffset>,
+    pub fn_branches: BTreeMap<CodeOffset, BTreeSet<CodeOffset>>,
+    pub fn_num_paths: u64,
+}
+
+impl ModuleSummary {
+    /// Summarizes the modules coverage in CSV format
+    pub fn summarize_csv<W: Write>(&self, summary_writer: &mut W) -> io::Result<()> {
+        let module = format!(
+            "{}::{}",
+            self.module_name.address(),
+            self.module_name.name()
+        );
+
+        let mut format_line = |fn_name, covered, uncovered| {
+            writeln!(
+                summary_writer,
+                "{},{},{},{}",
+                module, fn_name, covered, uncovered
+            )
+        };
+
+        for (fn_name, fn_summary) in self
+            .function_summaries
+            .iter()
+            .filter(|(_, summary)| !summary.fn_is_native)
+        {
+            format_line(fn_name, fn_summary.covered, fn_summary.total)?;
+        }
+
+        Ok(())
+    }
+
+    /// Summarizes the modules coverage, and returns the total module coverage in a human-readable
+    /// format.
+    pub fn summarize_human<W: Write>(
+        &self,
+        summary_writer: &mut W,
+        summarize_function_coverage: bool,
+    ) -> io::Result<(u64, u64)> {
+        let mut all_total = 0;
+        let mut all_covered = 0;
+
+        writeln!(
+            summary_writer,
+            "Module {}::{}",
+            self.module_name.address(),
+            self.module_name.name()
+        )?;
+
+        for (fn_name, fn_summary) in self.function_summaries.iter() {
+            all_total += fn_summary.total;
+            all_covered += fn_summary.covered;
+
+            if summarize_function_coverage {
+                let native = if fn_summary.fn_is_native {
+                    "native "
+                } else {
+                    ""
+                };
+                writeln!(summary_writer, "\t{}fun {}", native, fn_name)?;
+                writeln!(summary_writer, "\t\ttotal: {}", fn_summary.total)?;
+                writeln!(summary_writer, "\t\tcovered: {}", fn_summary.covered)?;
+                writeln!(
+                    summary_writer,
+                    "\t\t% coverage: {:.2}",
+                    fn_summary.percent_coverage()
+                )?;
+            }
+        }
+
+        let covered_percentage = (all_covered as f64) / (all_total as f64) * 100f64;
+        writeln!(
+            summary_writer,
+            ">>> % Module coverage: {:.2}",
+            covered_percentage
+        )?;
+        Ok((all_total, all_covered))
+    }
+}
+
+impl FunctionSummary {
+    pub fn percent_coverage(&self) -> f64 {
+        (self.covered as f64) / (self.total as f64) * 100f64
+    }
+}
+
+pub fn summarize_inst_cov_by_module(
+    module: &CompiledModule,
+    module_map: Option<&ModuleCoverageMap>,
+) -> ModuleSummary {
+    let module_name = module.self_id();
+    let function_summaries: BTreeMap<_, _> = module
+        .function_defs()
+        .iter()
+        .map(|function_def| {
+            let fn_handle = module.function_handle_at(function_def.function);
+            let fn_name = module.identifier_at(fn_handle.name).to_owned();
+
+            let fn_summmary = match &function_def.code {
+                None => FunctionSummary {
+                    fn_is_native: true,
+                    total: 0,
+                    covered: 0,
+                },
+                Some(code_unit) => {
+                    let total_number_of_instructions = code_unit.code.len() as u64;
+                    let covered_instructions = module_map
+                        .and_then(|fn_map| {
+                            fn_map
+                                .function_maps
+                                .get(&fn_name)
+                                .map(|function_map| function_map.len())
+                        })
+                        .unwrap_or(0) as u64;
+                    FunctionSummary {
+                        fn_is_native: false,
+                        total: total_number_of_instructions,
+                        covered: covered_instructions,
+                    }
+                }
+            };
+
+            (fn_name, fn_summmary)
+        })
+        .collect();
+
+    ModuleSummary {
+        module_name,
+        function_summaries,
+    }
+}
+
+pub fn summarize_inst_cov(
+    module: &CompiledModule,
+    coverage_map: &ExecCoverageMap,
+) -> ModuleSummary {
+    let module_name = module.self_id();
+    let module_map = coverage_map
+        .module_maps
+        .get(&(*module_name.address(), module_name.name().to_owned()));
+    summarize_inst_cov_by_module(module, module_map)
+}
+
+pub fn summarize_path_cov(module: &CompiledModule, trace_map: &TraceMap) -> ModuleSummary {
+    let module_name = module.self_id();
+
+    // collect branching information per function
+    let func_info: BTreeMap<_, _> = module
+        .function_defs()
+        .iter()
+        .filter_map(|function_def| {
+            match &function_def.code {
+                None => None,
+                Some(code_unit) => {
+                    // build control-flow graph
+                    let fn_cfg = VMControlFlowGraph::new(code_unit.code.as_slice());
+
+                    // get function entry and return points
+                    let fn_entry = fn_cfg.block_start(fn_cfg.entry_block_id());
+                    let mut fn_returns: BTreeSet<CodeOffset> = BTreeSet::new();
+                    for block_id in fn_cfg.blocks().into_iter() {
+                        for i in fn_cfg.block_start(block_id)..=fn_cfg.block_end(block_id) {
+                            if let Bytecode::Ret = &code_unit.code[i as usize] {
+                                fn_returns.insert(i);
+                            }
+                        }
+                    }
+
+                    // convert into strongly connected components (SCC) graph
+                    let mut fn_dgraph: Graph<BlockId, ()> = Graph::new();
+
+                    let block_to_node: BTreeMap<_, _> = fn_cfg
+                        .blocks()
+                        .into_iter()
+                        .map(|block_id| (block_id, fn_dgraph.add_node(block_id)))
+                        .collect();
+
+                    for block_id in fn_cfg.blocks().into_iter() {
+                        for succ_block_id in fn_cfg.successors(block_id).iter() {
+                            fn_dgraph.add_edge(
+                                *block_to_node.get(&block_id).unwrap(),
+                                *block_to_node.get(succ_block_id).unwrap(),
+                                (),
+                            );
+                        }
+                    }
+
+                    let scc_iter = tarjan_scc(&fn_dgraph).into_iter();
+
+                    // collect branching points
+                    let mut fn_branches: BTreeMap<CodeOffset, BTreeSet<CodeOffset>> =
+                        BTreeMap::new();
+
+                    let mut path_nums: BTreeMap<usize, BTreeMap<usize, usize>> = BTreeMap::new();
+                    let mut inst_locs: BTreeMap<CodeOffset, usize> = BTreeMap::new();
+                    for (scc_idx, scc) in scc_iter.enumerate() {
+                        // collect locations (i.e., offsets) in this SCC
+                        for node_idx in scc.iter() {
+                            let block_id = *fn_dgraph.node_weight(*node_idx).unwrap();
+                            for i in fn_cfg.block_start(block_id)..=fn_cfg.block_end(block_id) {
+                                // there is no way we could assign the same instruction twice
+                                assert!(inst_locs.insert(i, scc_idx).is_none());
+                            }
+                        }
+
+                        // collect branches out of this SCC
+                        let mut exits: BTreeSet<(CodeOffset, CodeOffset)> = BTreeSet::new();
+                        for node_idx in scc.iter() {
+                            let block_id = *fn_dgraph.node_weight(*node_idx).unwrap();
+                            let term_inst_id = fn_cfg.block_end(block_id);
+                            for dest in
+                                Bytecode::get_successors(term_inst_id, code_unit.code.as_slice())
+                                    .into_iter()
+                            {
+                                if *inst_locs.get(&dest).unwrap() != scc_idx {
+                                    assert!(exits.insert((term_inst_id, dest)));
+                                }
+                            }
+                        }
+
+                        // calculate number of possible paths
+                        if exits.is_empty() {
+                            // this is the termination scc
+                            assert!(path_nums.insert(scc_idx, BTreeMap::new()).is_none());
+                            path_nums.get_mut(&scc_idx).unwrap().insert(scc_idx, 1);
+                        } else {
+                            // update reachability map
+                            let mut reachability: BTreeMap<usize, usize> = BTreeMap::new();
+                            for (_, dst) in exits.iter() {
+                                let dst_scc_idx = inst_locs.get(dst).unwrap();
+                                for (path_end_scc, path_end_reach_set) in path_nums.iter() {
+                                    let reach_from_dst =
+                                        if let Some(v) = path_end_reach_set.get(dst_scc_idx) {
+                                            *v
+                                        } else {
+                                            0
+                                        };
+                                    let reach_from_scc =
+                                        reachability.entry(*path_end_scc).or_insert(0);
+                                    *reach_from_scc += reach_from_dst;
+                                }
+                            }
+
+                            for (path_end_scc, path_end_reachability) in reachability.into_iter() {
+                                assert!(path_nums
+                                    .get_mut(&path_end_scc)
+                                    .unwrap()
+                                    .insert(scc_idx, path_end_reachability)
+                                    .is_none());
+                            }
+
+                            // move to branch info if there are more than one branches
+                            if exits.len() > 1 {
+                                for (src, dst) in exits.into_iter() {
+                                    fn_branches.entry(src).or_default().insert(dst);
+                                }
+                            }
+                        }
+                    }
+
+                    // calculate path num
+                    let entry_scc = inst_locs
+                        .get(&fn_cfg.block_start(fn_cfg.entry_block_id()))
+                        .unwrap();
+                    let mut fn_num_paths: u64 = 0;
+                    for (_, path_end_reachability) in path_nums {
+                        fn_num_paths += if let Some(v) = path_end_reachability.get(entry_scc) {
+                            *v as u64
+                        } else {
+                            0
+                        };
+                    }
+
+                    // use function name as key
+                    let fn_name = module
+                        .identifier_at(module.function_handle_at(function_def.function).name)
+                        .to_owned();
+                    Some((
+                        fn_name.clone(),
+                        FunctionInfo {
+                            fn_name,
+                            fn_entry,
+                            fn_returns,
+                            fn_branches,
+                            fn_num_paths,
+                        },
+                    ))
+                }
+            }
+        })
+        .collect();
+
+    // examine the trace and check the path covered
+    let mut func_path_cov_stats: BTreeMap<
+        Identifier,
+        BTreeMap<BTreeSet<(CodeOffset, CodeOffset)>, u64>,
+    > = BTreeMap::new();
+
+    for (_, trace) in trace_map.exec_maps.iter() {
+        let mut call_stack: Vec<&FunctionInfo> = Vec::new();
+        let mut path_stack: Vec<BTreeSet<(CodeOffset, CodeOffset)>> = Vec::new();
+        let mut path_store: Vec<(Identifier, BTreeSet<(CodeOffset, CodeOffset)>)> = Vec::new();
+        for (index, record) in trace.iter().enumerate().filter(|(_, e)| {
+            e.module_addr == *module_name.address()
+                && e.module_name.as_ident_str() == module_name.name()
+        }) {
+            let (info, is_call) = if let Some(last) = call_stack.last() {
+                if last.fn_name.as_ident_str() != record.func_name.as_ident_str() {
+                    // calls into a new function
+                    (func_info.get(&record.func_name).unwrap(), true)
+                } else if last.fn_entry == record.func_pc {
+                    // recursive calls into itself
+                    (*last, true)
+                } else {
+                    // execution stayed within the function
+                    (*last, false)
+                }
+            } else {
+                // fresh into the module
+                (func_info.get(&record.func_name).unwrap(), true)
+            };
+
+            // push stacks if we call into a new function
+            if is_call {
+                assert_eq!(info.fn_entry, record.func_pc);
+                call_stack.push(info);
+                path_stack.push(BTreeSet::new());
+            }
+            let path = path_stack.last_mut().unwrap();
+
+            // check if branching
+            if let Some(dests) = info.fn_branches.get(&record.func_pc) {
+                // the nest instruction must be within the same function
+                let next_record = trace.get(index + 1).unwrap();
+                assert_eq!(record.func_name, next_record.func_name);
+
+                // add the transition to path
+                if dests.contains(&next_record.func_pc) {
+                    assert!(path.insert((record.func_pc, next_record.func_pc)));
+                }
+            }
+
+            // pop stacks if we returned
+            if info.fn_returns.contains(&record.func_pc) {
+                call_stack.pop().unwrap();
+                // save the full path temporarily in path_store
+                path_store.push((record.func_name.clone(), path_stack.pop().unwrap()));
+            }
+        }
+
+        // assert matches between calls and returns
+        if !call_stack.is_empty() {
+            // execution aborted...
+            // TODO: it is better to confirm this by adding a trace record
+            call_stack.clear();
+            path_stack.clear();
+            path_store.clear();
+        } else {
+            // record path only when execution finishes properly
+            for (func_name, path) in path_store.into_iter() {
+                let path_count = func_path_cov_stats
+                    .entry(func_name)
+                    .or_default()
+                    .entry(path)
+                    .or_insert(0);
+                *path_count += 1;
+            }
+        }
+    }
+
+    // calculate function summaries
+    let function_summaries: BTreeMap<_, _> = module
+        .function_defs()
+        .iter()
+        .map(|function_def| {
+            let fn_handle = module.function_handle_at(function_def.function);
+            let fn_name = module.identifier_at(fn_handle.name).to_owned();
+
+            let fn_summmary = match &function_def.code {
+                None => FunctionSummary {
+                    fn_is_native: true,
+                    total: 0,
+                    covered: 0,
+                },
+                Some(_) => FunctionSummary {
+                    fn_is_native: false,
+                    total: func_info.get(&fn_name).unwrap().fn_num_paths,
+                    covered: match func_path_cov_stats.get(&fn_name) {
+                        None => 0,
+                        Some(pathset) => pathset.len() as u64,
+                    },
+                },
+            };
+
+            (fn_name, fn_summmary)
+        })
+        .collect();
+
+    ModuleSummary {
+        module_name,
+        function_summaries,
+    }
+}
+
+impl ExecCoverageMapWithModules {
+    pub fn into_module_summaries(self) -> BTreeMap<String, ModuleSummary> {
+        let compiled_modules = self.compiled_modules;
+        self.module_maps
+            .into_iter()
+            .map(|((module_path, _, _), module_cov)| {
+                let module_summary = summarize_inst_cov_by_module(
+                    compiled_modules.get(&module_path).unwrap(),
+                    Some(&module_cov),
+                );
+                (module_path, module_summary)
+            })
+            .collect()
+    }
+}
diff --git a/vendors/move/crates/move-coverage/utils.sh b/vendors/move/crates/move-coverage/utils.sh
new file mode 100644
index 000000000..a4b0be399
--- /dev/null
+++ b/vendors/move/crates/move-coverage/utils.sh
@@ -0,0 +1,10 @@
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+alias coverage_update="pkill cargo; cargo run --release --bin move-trace-conversion -- -f $HOME/trace -u trace.mvcov -o trace.mvcov; rm -rf $HOME/trace"
+alias coverage_summary="pkill cargo; cargo run --release --bin coverage-summaries -- -t trace.mvcov -s ../../../diem-move/diem-framework/DPN/releases/artifacts/current/modules"
+function module_coverage() {
+    pkill cargo; cargo run --release --bin source-coverage -- -t trace.mvcov -b "../../move-compiler/build/modules/$1.mv" -s "../../../diem-move/diem-framework/core/sources/$2.move" -o tmp;
+    less tmp
+}
diff --git a/vendors/move/crates/move-disassembler/Cargo.toml b/vendors/move/crates/move-disassembler/Cargo.toml
new file mode 100644
index 000000000..3b4e52130
--- /dev/null
+++ b/vendors/move/crates/move-disassembler/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "move-disassembler"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Print a human-readable version of Move bytecode (.mv files)"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+colored.workspace = true
+
+move-bytecode-source-map.workspace = true
+move-command-line-common.workspace = true
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-binary-format.workspace = true
+move-coverage.workspace = true
+move-compiler.workspace = true
+
+bcs.workspace = true
+clap.workspace = true
+hex.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-disassembler/src/disassembler.rs b/vendors/move/crates/move-disassembler/src/disassembler.rs
new file mode 100644
index 000000000..8b32ca58a
--- /dev/null
+++ b/vendors/move/crates/move-disassembler/src/disassembler.rs
@@ -0,0 +1,1370 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+
+use anyhow::{bail, format_err, Error, Result};
+use clap::Parser;
+use colored::*;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
+    file_format::{
+        Ability, AbilitySet, Bytecode, CodeUnit, Constant, FieldHandleIndex, FunctionDefinition,
+        FunctionDefinitionIndex, FunctionHandle, ModuleHandle, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructDefinitionIndex, StructFieldInformation,
+        StructTypeParameter, TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_bytecode_source_map::{
+    mapping::SourceMapping,
+    source_map::{FunctionSourceMap, SourceName},
+};
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule, NamedCompiledScript};
+use move_core_types::{identifier::IdentStr, language_storage::ModuleId};
+use move_coverage::coverage_map::{ExecCoverageMap, FunctionCoverage};
+use move_ir_types::location::Loc;
+
+/// Holds the various options that we support while disassembling code.
+#[derive(Debug, Default, Parser)]
+pub struct DisassemblerOptions {
+    /// Only print non-private functions
+    #[clap(long = "only-public")]
+    pub only_externally_visible: bool,
+
+    /// Print the bytecode for the instructions within the function.
+    #[clap(long = "print-code")]
+    pub print_code: bool,
+
+    /// Print the basic blocks of the bytecode.
+    #[clap(long = "print-basic-blocks")]
+    pub print_basic_blocks: bool,
+
+    /// Print the locals inside each function body.
+    #[clap(long = "print-locals")]
+    pub print_locals: bool,
+}
+
+impl DisassemblerOptions {
+    pub fn new() -> Self {
+        Self {
+            only_externally_visible: false,
+            print_code: true,
+            print_basic_blocks: true,
+            print_locals: true,
+        }
+    }
+}
+
+pub struct Disassembler<'a> {
+    source_mapper: SourceMapping<'a>,
+    // The various options that we can set for disassembly.
+    options: DisassemblerOptions,
+    // Optional coverage map for use in displaying code coverage
+    coverage_map: Option<ExecCoverageMap>,
+    /// If the code being disassembled imports multiple modules of the form (a, SameModuleName)
+    /// `module_alias` will contain an entry for each distinct a
+    /// e.g., for `use 0xA::M; use 0xB::M`, this will contain [(0xA, M) -> M, (0xB, M) -> 1M]
+    module_aliases: HashMap<ModuleId, String>,
+}
+
+impl<'a> Disassembler<'a> {
+    pub fn new(source_mapper: SourceMapping<'a>, options: DisassemblerOptions) -> Self {
+        let mut module_names = HashMap::new();
+        let mut module_aliases = HashMap::new();
+        module_names.extend(
+            source_mapper
+                .bytecode
+                .self_id()
+                .map(|id| (id.name().to_string(), 0)),
+        );
+        for h in source_mapper.bytecode.module_handles() {
+            let id = source_mapper.bytecode.module_id_for_handle(h);
+            let module_name = id.name().to_string();
+            module_names
+                .entry(module_name.clone())
+                .and_modify(|name_count| {
+                    // This module imports >1 modules named `name`--add alias <count><module_name> for `id`.
+                    // Move identifiers cannot begin with an integer,
+                    // so this is guaranteed not to conflict with other module names.
+                    module_aliases.insert(id, format!("{}{}", name_count, module_name));
+                    *name_count += 1;
+                })
+                .or_insert(0);
+        }
+        Self {
+            source_mapper,
+            options,
+            coverage_map: None,
+            module_aliases,
+        }
+    }
+
+    pub fn from_view(view: BinaryIndexedView<'a>, default_loc: Loc) -> Result<Self> {
+        let mut options = DisassemblerOptions::new();
+        options.print_code = true;
+        Ok(Self::new(
+            SourceMapping::new_from_view(view, default_loc)?,
+            options,
+        ))
+    }
+
+    pub fn from_unit(unit: &'a CompiledUnit) -> Self {
+        let options = DisassemblerOptions::new();
+        let source_map = unit.source_map().clone();
+        let index_view = match unit {
+            CompiledUnit::Module(NamedCompiledModule { module, .. }) => {
+                BinaryIndexedView::Module(module)
+            }
+            CompiledUnit::Script(NamedCompiledScript { script, .. }) => {
+                BinaryIndexedView::Script(script)
+            }
+        };
+
+        let source_mapping = SourceMapping::new(source_map, index_view);
+        Disassembler::new(source_mapping, options)
+    }
+
+    pub fn add_coverage_map(&mut self, coverage_map: ExecCoverageMap) {
+        self.coverage_map = Some(coverage_map);
+    }
+
+    //***************************************************************************
+    // Helpers
+    //***************************************************************************
+
+    fn get_function_string(
+        &self,
+        module_handle: &ModuleHandle,
+        function_handle: &FunctionHandle,
+    ) -> String {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        let function_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(function_handle.name)
+            .to_string();
+        if self.is_self_id(&module_id) {
+            // this is the "self" module. Omit the "module_name::" prefix
+            function_name
+        } else {
+            let module_name = self
+                .module_aliases
+                .get(&module_id)
+                .cloned()
+                .unwrap_or_else(|| module_id.name().to_string());
+            format!("{}::{}", module_name, function_name)
+        }
+    }
+
+    fn get_import_string(&self, module_handle: &ModuleHandle) -> Option<String> {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        if self.is_self_id(&module_id) {
+            // No need to import self handle
+            None
+        } else if let Some(alias) = self.module_aliases.get(&module_id) {
+            Some(format!(
+                "use {}::{} as {};",
+                module_id.address(),
+                module_id.name(),
+                alias
+            ))
+        } else {
+            Some(format!(
+                "use {}::{};",
+                module_id.address(),
+                module_id.name()
+            ))
+        }
+    }
+
+    fn is_self_id(&self, mid: &ModuleId) -> bool {
+        self.source_mapper
+            .bytecode
+            .self_id()
+            .map(|id| &id == mid)
+            .unwrap_or(false)
+    }
+
+    fn get_function_def(
+        &self,
+        function_definition_index: FunctionDefinitionIndex,
+    ) -> Result<&FunctionDefinition> {
+        if function_definition_index.0 as usize
+            >= self
+                .source_mapper
+                .bytecode
+                .function_defs()
+                .map_or(0, |f| f.len())
+        {
+            bail!("Invalid function definition index supplied when marking function")
+        }
+        match self
+            .source_mapper
+            .bytecode
+            .function_def_at(function_definition_index)
+        {
+            Ok(definition) => Ok(definition),
+            Err(err) => Err(Error::new(err)),
+        }
+    }
+
+    fn get_struct_def(
+        &self,
+        struct_definition_index: StructDefinitionIndex,
+    ) -> Result<&StructDefinition> {
+        if struct_definition_index.0 as usize
+            >= self
+                .source_mapper
+                .bytecode
+                .struct_defs()
+                .map_or(0, |d| d.len())
+        {
+            bail!("Invalid struct definition index supplied when marking struct")
+        }
+        match self
+            .source_mapper
+            .bytecode
+            .struct_def_at(struct_definition_index)
+        {
+            Ok(definition) => Ok(definition),
+            Err(err) => Err(Error::new(err)),
+        }
+    }
+
+    //***************************************************************************
+    // Code Coverage Helpers
+    //***************************************************************************
+
+    fn get_function_coverage(&self, function_name: &IdentStr) -> Option<&FunctionCoverage> {
+        self.source_mapper
+            .source_map
+            .module_name_opt
+            .as_ref()
+            .and_then(|module| {
+                self.coverage_map.as_ref().and_then(|coverage_map| {
+                    coverage_map
+                        .module_maps
+                        .get(module)
+                        .and_then(|module_map| module_map.get_function_coverage(function_name))
+                })
+            })
+    }
+
+    fn is_function_called(&self, function_name: &IdentStr) -> bool {
+        self.get_function_coverage(function_name).is_some()
+    }
+
+    fn format_function_coverage(&self, name: &IdentStr, function_body: String) -> String {
+        if self.coverage_map.is_none() {
+            return function_body;
+        }
+        if self.is_function_called(name) {
+            function_body.green()
+        } else {
+            function_body.red()
+        }
+        .to_string()
+    }
+
+    fn format_with_instruction_coverage(
+        &self,
+        pc: usize,
+        function_coverage_map: Option<&FunctionCoverage>,
+        instruction: String,
+    ) -> String {
+        if self.coverage_map.is_none() {
+            return format!("\t{}: {}", pc, instruction);
+        }
+        let coverage = function_coverage_map.and_then(|map| map.get(&(pc as u64)));
+        match coverage {
+            Some(coverage) => format!("[{}]\t{}: {}", coverage, pc, instruction).green(),
+            None => format!("\t{}: {}", pc, instruction).red(),
+        }
+        .to_string()
+    }
+
+    //***************************************************************************
+    // Formatting Helpers
+    //***************************************************************************
+
+    fn name_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
+        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
+        let struct_def = self
+            .source_mapper
+            .bytecode
+            .struct_def_at(field_handle.owner)?;
+        let field_def = match &struct_def.field_information {
+            StructFieldInformation::Native => {
+                return Err(format_err!("Attempt to access field on a native struct"));
+            }
+            StructFieldInformation::Declared(fields) => fields
+                .get(field_handle.field as usize)
+                .ok_or_else(|| format_err!("Bad field index"))?,
+        };
+        let field_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(field_def.name)
+            .to_string();
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_def.struct_handle);
+        let struct_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+        Ok(format!("{}.{}", struct_name, field_name))
+    }
+
+    fn type_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
+        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
+        let struct_def = self
+            .source_mapper
+            .bytecode
+            .struct_def_at(field_handle.owner)?;
+        let field_def = match &struct_def.field_information {
+            StructFieldInformation::Native => {
+                return Err(format_err!("Attempt to access field on a native struct"));
+            }
+            StructFieldInformation::Declared(fields) => fields
+                .get(field_handle.field as usize)
+                .ok_or_else(|| format_err!("Bad field index"))?,
+        };
+        let struct_source_info = self
+            .source_mapper
+            .source_map
+            .get_struct_source_map(field_handle.owner)?;
+        let field_type_sig = field_def.signature.0.clone();
+        let ty = self.disassemble_sig_tok(field_type_sig, &struct_source_info.type_parameters)?;
+        Ok(ty)
+    }
+
+    fn struct_type_info(
+        &self,
+        struct_idx: StructDefinitionIndex,
+        signature: &Signature,
+        type_param_context: &[SourceName],
+    ) -> Result<(String, String)> {
+        let struct_definition = self.get_struct_def(struct_idx)?;
+        let type_arguments = signature
+            .0
+            .iter()
+            .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), type_param_context))
+            .collect::<Result<Vec<String>>>()?;
+
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_definition.struct_handle);
+        let name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+        Ok((name, Self::format_type_params(&type_arguments)))
+    }
+
+    fn name_for_parameter_or_local(
+        &self,
+        local_idx: usize,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let name = function_source_map
+                .get_parameter_or_local_name(local_idx as u64)
+                .ok_or_else(|| {
+                    format_err!(
+                        "Unable to get local name at index {} while disassembling location-based instruction", local_idx
+                    )
+                })?
+                .0;
+        Ok(name)
+    }
+
+    fn type_for_parameter_or_local(
+        &self,
+        idx: usize,
+        parameters: &Signature,
+        locals: &Signature,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let sig_tok = if idx < parameters.len() {
+            &parameters.0[idx]
+        } else if idx < parameters.len() + locals.len() {
+            &locals.0[idx - parameters.len()]
+        } else {
+            bail!("Unable to get type for parameter or local at index {}", idx)
+        };
+        self.disassemble_sig_tok(sig_tok.clone(), &function_source_map.type_parameters)
+    }
+
+    fn type_for_local(
+        &self,
+        local_idx: usize,
+        locals: &Signature,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let sig_tok = locals
+            .0
+            .get(local_idx)
+            .ok_or_else(|| format_err!("Unable to get type for local at index {}", local_idx))?;
+        self.disassemble_sig_tok(sig_tok.clone(), &function_source_map.type_parameters)
+    }
+
+    fn format_ability(a: Ability) -> String {
+        match a {
+            Ability::Copy => "copy",
+            Ability::Drop => "drop",
+            Ability::Store => "store",
+            Ability::Key => "key",
+        }
+        .to_string()
+    }
+
+    fn format_type_params(ty_params: &[String]) -> String {
+        if ty_params.is_empty() {
+            "".to_string()
+        } else {
+            format!("<{}>", ty_params.join(", "))
+        }
+    }
+
+    fn format_ret_type(ty_rets: &[String]) -> String {
+        if ty_rets.is_empty() {
+            "".to_string()
+        } else {
+            format!(": {}", ty_rets.join(" * "))
+        }
+    }
+
+    fn format_function_body(locals: Vec<String>, bytecode: Vec<String>) -> String {
+        if locals.is_empty() && bytecode.is_empty() {
+            "".to_string()
+        } else {
+            let body_iter: Vec<String> = locals
+                .into_iter()
+                .enumerate()
+                .map(|(local_idx, local)| format!("L{}:\t{}", local_idx, local))
+                .chain(bytecode)
+                .collect();
+            format!(" {{\n{}\n}}", body_iter.join("\n"))
+        }
+    }
+
+    fn preview_const(slice: &[u8]) -> String {
+        if slice.len() <= 4 {
+            hex::encode(slice)
+        } else {
+            format!("{}..", hex::encode(&slice[..4]))
+        }
+    }
+
+    //***************************************************************************
+    // Disassemblers
+    //***************************************************************************
+
+    // These need to be in the context of a function or a struct definition since type parameters
+    // can refer to function/struct type parameters.
+    fn disassemble_sig_tok(
+        &self,
+        sig_tok: SignatureToken,
+        type_param_context: &[SourceName],
+    ) -> Result<String> {
+        Ok(match sig_tok {
+            SignatureToken::Bool => "bool".to_string(),
+            SignatureToken::U8 => "u8".to_string(),
+            SignatureToken::U16 => "u16".to_string(),
+            SignatureToken::U32 => "u32".to_string(),
+            SignatureToken::U64 => "u64".to_string(),
+            SignatureToken::U128 => "u128".to_string(),
+            SignatureToken::U256 => "u256".to_string(),
+            SignatureToken::Address => "address".to_string(),
+            SignatureToken::Signer => "signer".to_string(),
+            SignatureToken::Struct(struct_handle_idx) => self
+                .source_mapper
+                .bytecode
+                .identifier_at(
+                    self.source_mapper
+                        .bytecode
+                        .struct_handle_at(struct_handle_idx)
+                        .name,
+                )
+                .to_string(),
+            SignatureToken::StructInstantiation(struct_handle_idx, instantiation) => {
+                let instantiation = instantiation
+                    .into_iter()
+                    .map(|tok| self.disassemble_sig_tok(tok, type_param_context))
+                    .collect::<Result<Vec<_>>>()?;
+                let formatted_instantiation = Self::format_type_params(&instantiation);
+                let name = self
+                    .source_mapper
+                    .bytecode
+                    .identifier_at(
+                        self.source_mapper
+                            .bytecode
+                            .struct_handle_at(struct_handle_idx)
+                            .name,
+                    )
+                    .to_string();
+                format!("{}{}", name, formatted_instantiation)
+            }
+            SignatureToken::Vector(sig_tok) => format!(
+                "vector<{}>",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::Reference(sig_tok) => format!(
+                "&{}",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::MutableReference(sig_tok) => format!(
+                "&mut {}",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::TypeParameter(ty_param_index) => type_param_context
+                .get(ty_param_index as usize)
+                .ok_or_else(|| {
+                    format_err!(
+                        "Type parameter index {} out of bounds while disassembling type signature",
+                        ty_param_index
+                    )
+                })?
+                .0
+                .to_string(),
+        })
+    }
+
+    fn disassemble_instruction(
+        &self,
+        parameters: &Signature,
+        instruction: &Bytecode,
+        locals_sigs: &Signature,
+        function_source_map: &FunctionSourceMap,
+        default_location: &Loc,
+    ) -> Result<String> {
+        match instruction {
+            Bytecode::LdConst(idx) => {
+                let constant = self.source_mapper.bytecode.constant_at(*idx);
+                Ok(format!(
+                    "LdConst[{}]({:?}: {})",
+                    idx,
+                    &constant.type_,
+                    Self::preview_const(&constant.data),
+                ))
+            }
+            Bytecode::CopyLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("CopyLoc[{}]({}: {})", local_idx, name, ty))
+            }
+            Bytecode::MoveLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("MoveLoc[{}]({}: {})", local_idx, name, ty))
+            }
+            Bytecode::StLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("StLoc[{}]({}: {})", local_idx, name, ty))
+            }
+            Bytecode::MutBorrowLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("MutBorrowLoc[{}]({}: {})", local_idx, name, ty))
+            }
+            Bytecode::ImmBorrowLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("ImmBorrowLoc[{}]({}: {})", local_idx, name, ty))
+            }
+            Bytecode::MutBorrowField(field_idx) => {
+                let name = self.name_for_field(*field_idx)?;
+                let ty = self.type_for_field(*field_idx)?;
+                Ok(format!("MutBorrowField[{}]({}: {})", field_idx, name, ty))
+            }
+            Bytecode::MutBorrowFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .field_instantiation_at(*field_idx)?;
+                let name = self.name_for_field(field_inst.handle)?;
+                let ty = self.type_for_field(field_inst.handle)?;
+                Ok(format!(
+                    "MutBorrowFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            }
+            Bytecode::ImmBorrowField(field_idx) => {
+                let name = self.name_for_field(*field_idx)?;
+                let ty = self.type_for_field(*field_idx)?;
+                Ok(format!("ImmBorrowField[{}]({}: {})", field_idx, name, ty))
+            }
+            Bytecode::ImmBorrowFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .field_instantiation_at(*field_idx)?;
+                let name = self.name_for_field(field_inst.handle)?;
+                let ty = self.type_for_field(field_inst.handle)?;
+                Ok(format!(
+                    "ImmBorrowFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            }
+            Bytecode::Pack(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Pack[{}]({}{})", struct_idx, name, ty_params))
+            }
+            Bytecode::PackGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "PackGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::Unpack(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Unpack[{}]({}{})", struct_idx, name, ty_params))
+            }
+            Bytecode::UnpackGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "UnpackGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::Exists(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Exists[{}]({}{})", struct_idx, name, ty_params))
+            }
+            Bytecode::ExistsGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ExistsGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::MutBorrowGlobal(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MutBorrowGlobal[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::MutBorrowGlobalGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MutBorrowGlobalGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::ImmBorrowGlobal(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ImmBorrowGlobal[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::ImmBorrowGlobalGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ImmBorrowGlobalGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::MoveFrom(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("MoveFrom[{}]({}{})", struct_idx, name, ty_params))
+            }
+            Bytecode::MoveFromGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MoveFromGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::MoveTo(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("MoveTo[{}]({}{})", struct_idx, name, ty_params))
+            }
+            Bytecode::MoveToGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MoveToGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            }
+            Bytecode::Call(method_idx) => {
+                let function_handle = self.source_mapper.bytecode.function_handle_at(*method_idx);
+                let module_handle = self
+                    .source_mapper
+                    .bytecode
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
+                let type_arguments = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &[]))
+                    .collect::<Result<Vec<String>>>()?
+                    .join(", ");
+                let type_rets = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.return_)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &[]))
+                    .collect::<Result<Vec<String>>>()?;
+                Ok(format!(
+                    "Call {}({}){}",
+                    fcall_name,
+                    type_arguments,
+                    Self::format_ret_type(&type_rets)
+                ))
+            }
+            Bytecode::CallGeneric(method_idx) => {
+                let func_inst = self
+                    .source_mapper
+                    .bytecode
+                    .function_instantiation_at(*method_idx);
+                let function_handle = self
+                    .source_mapper
+                    .bytecode
+                    .function_handle_at(func_inst.handle);
+                let module_handle = self
+                    .source_mapper
+                    .bytecode
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
+                let ty_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(func_inst.type_parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| {
+                        Ok((
+                            self.disassemble_sig_tok(
+                                sig_tok.clone(),
+                                &function_source_map.type_parameters,
+                            )?,
+                            *default_location,
+                        ))
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                let type_arguments = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &ty_params))
+                    .collect::<Result<Vec<String>>>()?
+                    .join(", ");
+                let type_rets = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.return_)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &ty_params))
+                    .collect::<Result<Vec<String>>>()?;
+                Ok(format!(
+                    "Call {}{}({}){}",
+                    fcall_name,
+                    Self::format_type_params(
+                        &ty_params.into_iter().map(|(s, _)| s).collect::<Vec<_>>()
+                    ),
+                    type_arguments,
+                    Self::format_ret_type(&type_rets)
+                ))
+            }
+            // All other instructions are OK to be printed using the standard debug print.
+            x => Ok(format!("{:#?}", x)),
+        }
+    }
+
+    fn disassemble_bytecode(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        function_name: &IdentStr,
+        parameters: SignatureIndex,
+        code: &CodeUnit,
+    ) -> Result<Vec<String>> {
+        if !self.options.print_code {
+            return Ok(vec!["".to_string()]);
+        }
+
+        let parameters = self.source_mapper.bytecode.signature_at(parameters);
+        let locals_sigs = self.source_mapper.bytecode.signature_at(code.locals);
+
+        let function_code_coverage_map = self.get_function_coverage(function_name);
+
+        let decl_location = &function_source_map.definition_location;
+        let instrs: Vec<String> = code
+            .code
+            .iter()
+            .map(|instruction| {
+                self.disassemble_instruction(
+                    parameters,
+                    instruction,
+                    locals_sigs,
+                    function_source_map,
+                    decl_location,
+                )
+            })
+            .collect::<Result<Vec<String>>>()?;
+
+        let mut instrs: Vec<String> = instrs
+            .into_iter()
+            .enumerate()
+            .map(|(instr_index, dis_instr)| {
+                self.format_with_instruction_coverage(
+                    instr_index,
+                    function_code_coverage_map,
+                    dis_instr,
+                )
+            })
+            .collect();
+
+        if self.options.print_basic_blocks {
+            let cfg = VMControlFlowGraph::new(&code.code);
+            for (block_number, block_id) in cfg.blocks().iter().enumerate() {
+                instrs.insert(
+                    *block_id as usize + block_number,
+                    format!("B{}:", block_number),
+                );
+            }
+        }
+
+        Ok(instrs)
+    }
+
+    fn disassemble_struct_type_formals(
+        source_map_ty_params: &[SourceName],
+        type_parameters: &[StructTypeParameter],
+    ) -> String {
+        let ty_params: Vec<String> = source_map_ty_params
+            .iter()
+            .zip(type_parameters)
+            .map(|((name, _), ty_param)| {
+                let abilities_str = if ty_param.constraints == AbilitySet::EMPTY {
+                    "".to_string()
+                } else {
+                    let ability_vec: Vec<_> = ty_param
+                        .constraints
+                        .into_iter()
+                        .map(Self::format_ability)
+                        .collect();
+                    format!(": {}", ability_vec.join(" + "))
+                };
+                format!(
+                    "{}{}{}",
+                    if ty_param.is_phantom { "phantom " } else { "" },
+                    name.as_str(),
+                    abilities_str
+                )
+            })
+            .collect();
+        Self::format_type_params(&ty_params)
+    }
+
+    fn disassemble_fun_type_formals(
+        source_map_ty_params: &[SourceName],
+        ablities: &[AbilitySet],
+    ) -> String {
+        let ty_params: Vec<String> = source_map_ty_params
+            .iter()
+            .zip(ablities)
+            .map(|((name, _), abs)| {
+                let abilities_str = if *abs == AbilitySet::EMPTY {
+                    "".to_string()
+                } else {
+                    let ability_vec: Vec<_> = abs.into_iter().map(Self::format_ability).collect();
+                    format!(": {}", ability_vec.join(" + "))
+                };
+                format!("{}{}", name.as_str(), abilities_str)
+            })
+            .collect();
+        Self::format_type_params(&ty_params)
+    }
+
+    fn disassemble_locals(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        locals_idx: SignatureIndex,
+        parameter_len: usize,
+    ) -> Result<Vec<String>> {
+        if !self.options.print_locals {
+            return Ok(vec![]);
+        }
+
+        let signature = self.source_mapper.bytecode.signature_at(locals_idx);
+        let locals_names_tys = function_source_map
+            .locals
+            .iter()
+            .skip(parameter_len)
+            .enumerate()
+            .map(|(local_idx, (name, _))| {
+                let ty =
+                    self.type_for_local(parameter_len + local_idx, signature, function_source_map)?;
+                Ok(format!("{}: {}", name, ty))
+            })
+            .collect::<Result<Vec<String>>>()?;
+        Ok(locals_names_tys)
+    }
+
+    /// Translates a compiled "function definition" into a disassembled bytecode string.
+    ///
+    /// Because a "function definition" can refer to either a function defined in a module or to a
+    /// script's "main" function (which is not represented by a function definition in the binary
+    /// format), this method takes a function definition and handle as optional arguments. These are
+    /// `None` when disassembling a script's "main" function.
+    pub fn disassemble_function_def(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        function: Option<(&FunctionDefinition, &FunctionHandle)>,
+        name: &IdentStr,
+        type_parameters: &[AbilitySet],
+        parameters: SignatureIndex,
+        code: Option<&CodeUnit>,
+    ) -> Result<String> {
+        debug_assert_eq!(
+            function_source_map.parameters.len(),
+            self.source_mapper.bytecode.signature_at(parameters).len(),
+            "Arity mismatch between function source map and bytecode for function {}",
+            name
+        );
+
+        let entry_modifier = if function.map(|(f, _)| f.is_entry).unwrap_or(false) {
+            "entry "
+        } else {
+            ""
+        };
+        let visibility_modifier = match function {
+            Some(function) => match function.0.visibility {
+                Visibility::Private => {
+                    if self.options.only_externally_visible {
+                        return Ok("".to_string());
+                    } else {
+                        ""
+                    }
+                }
+                Visibility::Friend => "public(friend) ",
+                Visibility::Public => "public ",
+            },
+            None => "",
+        };
+
+        let native_modifier = match function {
+            Some(function) if function.0.is_native() => "native ",
+            _ => "",
+        };
+
+        let ty_params = Self::disassemble_fun_type_formals(
+            &function_source_map.type_parameters,
+            type_parameters,
+        );
+        let params = &self
+            .source_mapper
+            .bytecode
+            .signature_at(parameters)
+            .0
+            .iter()
+            .zip(function_source_map.parameters.iter())
+            .map(|(tok, (name, _))| {
+                Ok(format!(
+                    "{}: {}",
+                    name,
+                    self.disassemble_sig_tok(tok.clone(), &function_source_map.type_parameters)?
+                ))
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        let ret_type = match function {
+            Some(function) => self
+                .source_mapper
+                .bytecode
+                .signature_at(function.1.return_)
+                .0
+                .iter()
+                .cloned()
+                .map(|sig_token| {
+                    let sig_tok_str =
+                        self.disassemble_sig_tok(sig_token, &function_source_map.type_parameters)?;
+                    Ok(sig_tok_str)
+                })
+                .collect::<Result<Vec<String>>>()?,
+            None => vec![],
+        };
+
+        let body = match code {
+            Some(code) => {
+                let locals =
+                    self.disassemble_locals(function_source_map, code.locals, params.len())?;
+                let bytecode =
+                    self.disassemble_bytecode(function_source_map, name, parameters, code)?;
+                Self::format_function_body(locals, bytecode)
+            }
+            None => "".to_string(),
+        };
+        Ok(self.format_function_coverage(
+            name,
+            format!(
+                "{entry_modifier}{native_modifier}{visibility_modifier}{name}{ty_params}({params}){ret_type}{body}",
+                params = &params.join(", "),
+                ret_type = Self::format_ret_type(&ret_type),
+            ),
+        ))
+    }
+
+    // The struct defs will filter out the structs that we print to only be the ones that are
+    // defined in the module in question.
+    pub fn disassemble_struct_def(&self, struct_def_idx: StructDefinitionIndex) -> Result<String> {
+        let struct_definition = self.get_struct_def(struct_def_idx)?;
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_definition.struct_handle);
+        let struct_source_map = self
+            .source_mapper
+            .source_map
+            .get_struct_source_map(struct_def_idx)?;
+
+        let field_info: Option<Vec<(&IdentStr, &TypeSignature)>> =
+            match &struct_definition.field_information {
+                StructFieldInformation::Native => None,
+                StructFieldInformation::Declared(fields) => Some(
+                    fields
+                        .iter()
+                        .map(|field_definition| {
+                            let type_sig = &field_definition.signature;
+                            let field_name = self
+                                .source_mapper
+                                .bytecode
+                                .identifier_at(field_definition.name);
+                            (field_name, type_sig)
+                        })
+                        .collect(),
+                ),
+            };
+
+        let native = if field_info.is_none() { "native " } else { "" };
+
+        let abilities = if struct_handle.abilities == AbilitySet::EMPTY {
+            String::new()
+        } else {
+            let ability_vec: Vec<_> = struct_handle
+                .abilities
+                .into_iter()
+                .map(Self::format_ability)
+                .collect();
+            format!(" has {}", ability_vec.join(", "))
+        };
+
+        let name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+
+        let ty_params = Self::disassemble_struct_type_formals(
+            &struct_source_map.type_parameters,
+            &struct_handle.type_parameters,
+        );
+        let mut fields = match field_info {
+            None => vec![],
+            Some(field_info) => field_info
+                .iter()
+                .map(|(name, ty)| {
+                    let ty_str =
+                        self.disassemble_sig_tok(ty.0.clone(), &struct_source_map.type_parameters)?;
+                    Ok(format!("{}: {}", name, ty_str))
+                })
+                .collect::<Result<Vec<String>>>()?,
+        };
+
+        if let Some(first_elem) = fields.first_mut() {
+            first_elem.insert_str(0, "{\n\t");
+        }
+
+        if let Some(last_elem) = fields.last_mut() {
+            last_elem.push_str("\n}");
+        }
+
+        Ok(format!(
+            "{native}struct {name}{ty_params}{abilities} {fields}",
+            native = native,
+            name = name,
+            ty_params = ty_params,
+            abilities = abilities,
+            fields = &fields.join(",\n\t"),
+        ))
+    }
+
+    pub fn disassemble_constant(
+        &self,
+        constant_index: usize,
+        Constant { type_, data }: &Constant,
+    ) -> Result<String> {
+        let data_str = match type_ {
+            SignatureToken::Vector(x) if x.as_ref() == &SignatureToken::U8 => {
+                match bcs::from_bytes::<Vec<u8>>(data)
+                    .ok()
+                    .and_then(|data| String::from_utf8(data).ok())
+                {
+                    Some(str) => "\"".to_owned() + &str + "\" // interpreted as UTF8 string",
+                    None => hex::encode(data),
+                }
+            }
+            _ => hex::encode(data),
+        };
+        let type_str = self.disassemble_sig_tok(type_.clone(), &[])?;
+        Ok(format!("\t{constant_index} => {}: {}", type_str, data_str))
+    }
+
+    pub fn disassemble(&self) -> Result<String> {
+        let name_opt = self.source_mapper.source_map.module_name_opt.as_ref();
+        let name = name_opt.map(|(addr, n)| format!("{}.{}", addr.short_str_lossless(), n));
+        let version = format!("{}", self.source_mapper.bytecode.version());
+        let header = match name {
+            Some(s) => format!("module {}", s),
+            None => "script".to_owned(),
+        };
+
+        let imports = self
+            .source_mapper
+            .bytecode
+            .module_handles()
+            .iter()
+            .filter_map(|h| self.get_import_string(h))
+            .collect::<Vec<String>>();
+        let struct_defs: Vec<String> = (0..self
+            .source_mapper
+            .bytecode
+            .struct_defs()
+            .map_or(0, |d| d.len()))
+            .map(|i| self.disassemble_struct_def(StructDefinitionIndex(i as TableIndex)))
+            .collect::<Result<Vec<String>>>()?;
+
+        let constants: Vec<String> = self
+            .source_mapper
+            .bytecode
+            .constant_pool()
+            .iter()
+            .enumerate()
+            .map(|(i, constant)| self.disassemble_constant(i, constant))
+            .collect::<Result<Vec<String>>>()?;
+
+        let function_defs: Vec<String> = match self.source_mapper.bytecode {
+            BinaryIndexedView::Script(script) => {
+                vec![self.disassemble_function_def(
+                    self.source_mapper
+                        .source_map
+                        .get_function_source_map(FunctionDefinitionIndex(0_u16))?,
+                    None,
+                    IdentStr::new("main")?,
+                    &script.type_parameters,
+                    script.parameters,
+                    Some(&script.code),
+                )?]
+            }
+            BinaryIndexedView::Module(module) => (0..module.function_defs.len())
+                .map(|i| {
+                    let function_definition_index = FunctionDefinitionIndex(i as TableIndex);
+                    let function_definition = self.get_function_def(function_definition_index)?;
+                    let function_handle = self
+                        .source_mapper
+                        .bytecode
+                        .function_handle_at(function_definition.function);
+                    self.disassemble_function_def(
+                        self.source_mapper
+                            .source_map
+                            .get_function_source_map(function_definition_index)?,
+                        Some((function_definition, function_handle)),
+                        self.source_mapper
+                            .bytecode
+                            .identifier_at(function_handle.name),
+                        &function_handle.type_parameters,
+                        function_handle.parameters,
+                        function_definition.code.as_ref(),
+                    )
+                })
+                .collect::<Result<Vec<String>>>()?,
+        };
+        let imports_str = if imports.is_empty() {
+            "".to_string()
+        } else {
+            format!("\n{}\n\n", imports.join("\n"))
+        };
+        let constant_pool_string = if constants.is_empty() {
+            "".to_string()
+        } else {
+            format!(
+                "\nConstants [\n{constants}\n]\n",
+                constants = constants.join("\n")
+            )
+        };
+        Ok(format!(
+            "// Move bytecode v{version}\n{header} {{{imports}\n{struct_defs}\n\n{function_defs}\n{constant_pool_string}}}",
+            version = version,
+            header = header,
+            imports = &imports_str,
+            struct_defs = &struct_defs.join("\n"),
+            function_defs = &function_defs.join("\n"),
+        ))
+    }
+}
diff --git a/vendors/move/crates/move-disassembler/src/lib.rs b/vendors/move/crates/move-disassembler/src/lib.rs
new file mode 100644
index 000000000..3e8002d01
--- /dev/null
+++ b/vendors/move/crates/move-disassembler/src/lib.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod disassembler;
diff --git a/vendors/move/crates/move-disassembler/src/main.rs b/vendors/move/crates/move-disassembler/src/main.rs
new file mode 100644
index 000000000..2737a7d53
--- /dev/null
+++ b/vendors/move/crates/move-disassembler/src/main.rs
@@ -0,0 +1,129 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_source_map::{mapping::SourceMapping, utils::source_map_from_file};
+use move_command_line_common::files::{
+    MOVE_COMPILED_EXTENSION, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
+};
+use move_coverage::coverage_map::CoverageMap;
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use move_ir_types::location::Spanned;
+use std::{fs, path::Path};
+
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// Skip printing of private functions.
+    #[clap(long = "skip-private")]
+    pub skip_private: bool,
+
+    /// Do not print the disassembled bytecodes of each function.
+    #[clap(long = "skip-code")]
+    pub skip_code: bool,
+
+    /// Do not print locals of each function.
+    #[clap(long = "skip-locals")]
+    pub skip_locals: bool,
+
+    /// Do not print the basic blocks of each function.
+    #[clap(long = "skip-basic-blocks")]
+    pub skip_basic_blocks: bool,
+
+    /// Treat input file as a script (default is to treat file as a module)
+    #[clap(short = 's', long = "script")]
+    pub is_script: bool,
+
+    /// The path to the bytecode file to disassemble; let's call it file.mv. We assume that two
+    /// other files reside under the same directory: a source map file.mvsm (possibly) and the Move
+    /// source code file.move.
+    #[clap(short = 'b', long = "bytecode")]
+    pub bytecode_file_path: String,
+
+    /// (Optional) Path to a coverage file for the VM in order to print trace information in the
+    /// disassembled output.
+    #[clap(short = 'c', long = "move-coverage-path")]
+    pub code_coverage_path: Option<String>,
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let move_extension = MOVE_EXTENSION;
+    let mv_bytecode_extension = MOVE_COMPILED_EXTENSION;
+    let source_map_extension = SOURCE_MAP_EXTENSION;
+
+    let source_path = Path::new(&args.bytecode_file_path);
+    let extension = source_path
+        .extension()
+        .expect("Missing file extension for bytecode file");
+    if extension != mv_bytecode_extension {
+        println!(
+            "Bad source file extension {:?}; expected {}",
+            extension, mv_bytecode_extension
+        );
+        std::process::exit(1);
+    }
+
+    let bytecode_bytes = fs::read(&args.bytecode_file_path).expect("Unable to read bytecode file");
+
+    let source_path = Path::new(&args.bytecode_file_path).with_extension(move_extension);
+    let source = fs::read_to_string(&source_path).ok();
+    let source_map = source_map_from_file(
+        &Path::new(&args.bytecode_file_path).with_extension(source_map_extension),
+    );
+
+    let mut disassembler_options = DisassemblerOptions::new();
+    disassembler_options.print_code = !args.skip_code;
+    disassembler_options.only_externally_visible = args.skip_private;
+    disassembler_options.print_basic_blocks = !args.skip_basic_blocks;
+    disassembler_options.print_locals = !args.skip_locals;
+
+    // TODO: make source mapping work with the Move source language
+    let no_loc = Spanned::unsafe_no_loc(()).loc;
+    let module: CompiledModule;
+    let script: CompiledScript;
+    let bytecode = if args.is_script {
+        script = CompiledScript::deserialize(&bytecode_bytes)
+            .expect("Script blob can't be deserialized");
+        BinaryIndexedView::Script(&script)
+    } else {
+        module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)
+            .expect("Module blob can't be deserialized");
+        BinaryIndexedView::Module(&module)
+    };
+
+    let mut source_mapping = {
+        if let Ok(s) = source_map {
+            SourceMapping::new(s, bytecode)
+        } else {
+            SourceMapping::new_from_view(bytecode, no_loc)
+                .expect("Unable to build dummy source mapping")
+        }
+    };
+
+    if let Some(source_code) = source {
+        source_mapping.with_source_code((source_path.to_str().unwrap().to_string(), source_code));
+    }
+
+    let mut disassembler = Disassembler::new(source_mapping, disassembler_options);
+
+    if let Some(file_path) = &args.code_coverage_path {
+        disassembler.add_coverage_map(
+            CoverageMap::from_binary_file(file_path)
+                .unwrap()
+                .to_unified_exec_map(),
+        );
+    }
+
+    let dissassemble_string = disassembler.disassemble().expect("Unable to dissassemble");
+
+    println!("{}", dissassemble_string);
+}
diff --git a/vendors/move/crates/move-docgen/Cargo.toml b/vendors/move/crates/move-docgen/Cargo.toml
new file mode 100644
index 000000000..3813f8793
--- /dev/null
+++ b/vendors/move/crates/move-docgen/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "move-docgen"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# diem dependencies
+move-compiler.workspace = true
+move-model.workspace = true
+
+# external dependencies
+codespan.workspace = true
+codespan-reporting.workspace = true
+itertools.workspace = true
+log.workspace = true
+num.workspace = true
+regex.workspace = true
+anyhow = "1.0.71"
+serde.workspace = true
+once_cell.workspace = true
+
+[dev-dependencies]
+move-prover.workspace = true
+datatest-stable.workspace = true
+tempfile.workspace = true
+move-prover-test-utils.workspace = true
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/move-docgen/README.md b/vendors/move/crates/move-docgen/README.md
new file mode 100644
index 000000000..b6a510f05
--- /dev/null
+++ b/vendors/move/crates/move-docgen/README.md
@@ -0,0 +1 @@
+For user documentation, see [../doc/user/docgen.md](../doc/user/docgen.md).
diff --git a/vendors/move/crates/move-docgen/src/docgen.rs b/vendors/move/crates/move-docgen/src/docgen.rs
new file mode 100644
index 000000000..8a3629e47
--- /dev/null
+++ b/vendors/move/crates/move-docgen/src/docgen.rs
@@ -0,0 +1,1818 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+
+use codespan::{ByteIndex, Span};
+use itertools::Itertools;
+use move_compiler::parser::keywords::{BUILTINS, CONTEXTUAL_KEYWORDS, KEYWORDS};
+use move_model::{
+    ast::{ModuleName, SpecBlockInfo, SpecBlockTarget},
+    code_writer::{CodeWriter, CodeWriterLabel},
+    emit, emitln,
+    model::{
+        AbilitySet, FunId, FunctionEnv, GlobalEnv, Loc, ModuleEnv, ModuleId, NamedConstantEnv,
+        Parameter, QualifiedId, StructEnv, TypeParameter,
+    },
+    symbol::Symbol,
+    ty::TypeDisplayContext,
+};
+use num::BigUint;
+use once_cell::sync::Lazy;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt::Write as FmtWrite,
+    fs::{self, File},
+    io::{Read, Write},
+    path::{Path, PathBuf},
+    process::{Command, Stdio},
+    rc::Rc,
+};
+
+/// The maximum number of subheadings that are allowed
+const MAX_SUBSECTIONS: usize = 6;
+
+/// Options passed into the documentation generator.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct DocgenOptions {
+    /// The level where we start sectioning. Often markdown sections are rendered with
+    /// unnecessary large section fonts, setting this value high reduces the size.
+    pub section_level_start: usize,
+    /// Whether to include private functions in the generated docs.
+    pub include_private_fun: bool,
+    /// Whether to include specifications in the generated docs.
+    pub include_specs: bool,
+    /// Whether to put specifications in the same section as a declaration or put them all
+    /// into an independent section.
+    pub specs_inlined: bool,
+    /// Whether to include Move implementations.
+    pub include_impl: bool,
+    /// Max depth to which sections are displayed in table-of-contents.
+    pub toc_depth: usize,
+    /// Whether to use collapsed sections (<details>) for impl and specs
+    pub collapsed_sections: bool,
+    /// In which directory to store output.
+    pub output_directory: String,
+    /// In which directories to look for references.
+    pub doc_path: Vec<String>,
+    /// A list of paths to files containing templates for root documents for the generated
+    /// documentation.
+    ///
+    /// A root document is a markdown file which contains placeholders for generated
+    /// documentation content. It is also processed following the same rules than
+    /// documentation comments in Move, including creation of cross-references and
+    /// Move code highlighting.
+    ///
+    /// A placeholder is a single line starting with a markdown quotation marker
+    /// of the following form:
+    ///
+    /// ```notrust
+    /// > {{move-include NAME_OF_MODULE_OR_SCRIPT}}
+    /// > {{move-toc}}
+    /// > {{move-index}}
+    /// ```
+    ///
+    /// These lines will be replaced by the generated content of the module or script,
+    /// or a table of contents, respectively.
+    ///
+    /// For a module or script which is included in the root document, no
+    /// separate file is generated. References between the included and the standalone
+    /// module/script content work transparently.
+    pub root_doc_templates: Vec<String>,
+    /// An optional file containing reference definitions. The content of this file will
+    /// be added to each generated markdown doc.
+    pub references_file: Option<String>,
+    /// Whether to include dependency diagrams in the generated docs.
+    pub include_dep_diagrams: bool,
+    /// Whether to include call diagrams in the generated docs.
+    pub include_call_diagrams: bool,
+    /// If this is being compiled relative to a different place where it will be stored (output directory).
+    pub compile_relative_to_output_dir: bool,
+}
+
+impl Default for DocgenOptions {
+    fn default() -> Self {
+        Self {
+            section_level_start: 1,
+            include_private_fun: true,
+            include_specs: true,
+            specs_inlined: true,
+            include_impl: true,
+            toc_depth: 3,
+            collapsed_sections: true,
+            output_directory: "doc".to_string(),
+            doc_path: vec!["doc".to_string()],
+            compile_relative_to_output_dir: false,
+            root_doc_templates: vec![],
+            references_file: None,
+            include_dep_diagrams: false,
+            include_call_diagrams: false,
+        }
+    }
+}
+
+/// The documentation generator.
+pub struct Docgen<'env> {
+    options: &'env DocgenOptions,
+    env: &'env GlobalEnv,
+    /// Mapping from module id to the set of schemas defined in this module.
+    /// We currently do not have this information in the environment.
+    declared_schemas: BTreeMap<ModuleId, BTreeSet<Symbol>>,
+    /// A list of file names and output generated for those files.
+    output: Vec<(String, String)>,
+    /// Map from module id to information about this module.
+    infos: BTreeMap<ModuleId, ModuleInfo>,
+    /// Current code writer.
+    writer: CodeWriter,
+    /// Current module.
+    current_module: Option<ModuleEnv<'env>>,
+    /// A counter for labels.
+    label_counter: RefCell<usize>,
+    /// A mapping from location to spec item defined at this location.
+    loc_to_spec_item_map: BTreeMap<Loc, Symbol>,
+    /// A table-of-contents list.
+    toc: RefCell<Vec<(usize, TocEntry)>>,
+    /// The current section next
+    section_nest: RefCell<usize>,
+    /// The last user provided (via an explicit # header) section nest.
+    last_root_section_nest: RefCell<usize>,
+}
+
+/// Information about the generated documentation for a specific script or module.
+#[derive(Debug, Default, Clone)]
+struct ModuleInfo {
+    /// The file in which the generated content for this module is located. This has a path
+    /// relative to the `options.output_directory`.
+    target_file: String,
+    /// The label in this file.
+    label: String,
+    /// Whether this module is included in another document instead of living in its own file.
+    /// Among others, we do not generate table-of-contents for included modules.
+    is_included: bool,
+}
+
+/// A table-of-contents entry.
+#[derive(Debug, Default, Clone)]
+struct TocEntry {
+    label: String,
+    title: String,
+}
+
+/// An element of the parsed root document template.
+enum TemplateElement {
+    Text(String),
+    IncludeModule(String),
+    IncludeToc,
+    Index,
+}
+
+/// A map from spec block targets to associated spec blocks.
+type SpecBlockMap<'a> = BTreeMap<SpecBlockTarget, Vec<&'a SpecBlockInfo>>;
+
+impl<'env> Docgen<'env> {
+    /// Creates a new documentation generator.
+    pub fn new(env: &'env GlobalEnv, options: &'env DocgenOptions) -> Self {
+        Self {
+            options,
+            env,
+            declared_schemas: Default::default(),
+            output: Default::default(),
+            infos: Default::default(),
+            writer: CodeWriter::new(env.unknown_loc()),
+            label_counter: RefCell::new(0),
+            current_module: None,
+            loc_to_spec_item_map: Default::default(),
+            toc: RefCell::new(Default::default()),
+            section_nest: RefCell::new(0),
+            last_root_section_nest: RefCell::new(0),
+        }
+    }
+
+    /// Generate document contents, returning pairs of output file names and generated contents.
+    pub fn gen(mut self) -> Vec<(String, String)> {
+        // Compute missing information about schemas.
+        self.compute_declared_schemas();
+
+        // If there is a root templates, parse them.
+        let root_templates = self
+            .options
+            .root_doc_templates
+            .iter()
+            .filter_map(|file_name| {
+                let root_out_name = PathBuf::from(file_name)
+                    .file_name()
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .replace("_template", "");
+                match self.parse_root_template(file_name) {
+                    Ok(elements) => Some((root_out_name, elements)),
+                    Err(_) => {
+                        self.env.error(
+                            &self.env.unknown_loc(),
+                            &format!("cannot read root template `{}`", file_name),
+                        );
+                        None
+                    }
+                }
+            })
+            .collect_vec();
+
+        // Compute module infos.
+        self.compute_module_infos(&root_templates);
+
+        // Expand all root templates.
+        for (out_file, elements) in root_templates {
+            self.expand_root_template(&out_file, elements);
+        }
+
+        // Generate documentation for standalone modules which are not included in the templates.
+        for (id, info) in self.infos.clone() {
+            let m = self.env.get_module(id);
+            if !info.is_included && m.is_target() {
+                self.gen_module(&m, &info);
+                let path = self.make_file_in_out_dir(&info.target_file);
+                self.output.push((path, self.writer.extract_result()));
+            }
+        }
+
+        // If there is a references_file, append it's content to each generated output.
+        if let Some(fname) = &self.options.references_file {
+            let mut content = String::new();
+            if File::open(fname)
+                .and_then(|mut file| file.read_to_string(&mut content))
+                .is_ok()
+            {
+                let trimmed_content = content.trim();
+                if !trimmed_content.is_empty() {
+                    for (_, out) in self.output.iter_mut() {
+                        out.push_str("\n\n");
+                        out.push_str(trimmed_content);
+                        out.push('\n');
+                    }
+                }
+            } else {
+                self.env.error(
+                    &self.env.unknown_loc(),
+                    &format!("cannot read references file `{}`", fname),
+                );
+            }
+        }
+
+        self.output
+    }
+
+    /// Compute the schemas declared in all modules. This information is currently not directly
+    /// in the environment, but can be derived from it.
+    fn compute_declared_schemas(&mut self) {
+        for module_env in self.env.get_modules() {
+            let mut schemas = BTreeSet::new();
+            for block in module_env.get_spec_block_infos() {
+                if let SpecBlockTarget::Schema(_, id, _) = &block.target {
+                    schemas.insert(id.symbol());
+                }
+            }
+            self.declared_schemas.insert(module_env.get_id(), schemas);
+        }
+    }
+
+    /// Parse a root template.
+    fn parse_root_template(&self, file_name: &str) -> anyhow::Result<Vec<TemplateElement>> {
+        static REX: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(
+                r"(?xm)^\s*>\s*\{\{
+                ( (?P<include>move-include\s+(?P<include_name>\w+))
+                | (?P<toc>move-toc)
+                | (?P<index>move-index)
+                )\s*}}.*$",
+            )
+            .unwrap()
+        });
+        let mut content = String::new();
+        let mut file = File::open(file_name)?;
+        file.read_to_string(&mut content)?;
+        let mut at = 0;
+        let mut res = vec![];
+        while let Some(cap) = REX.captures(&content[at..]) {
+            let start = cap.get(0).unwrap().start();
+            let end = cap.get(0).unwrap().end();
+            if start > 0 {
+                res.push(TemplateElement::Text(content[at..at + start].to_string()));
+            }
+            if cap.name("include").is_some() {
+                let name = cap.name("include_name").unwrap().as_str();
+                res.push(TemplateElement::IncludeModule(name.to_string()));
+            } else if cap.name("toc").is_some() {
+                res.push(TemplateElement::IncludeToc);
+            } else if cap.name("index").is_some() {
+                res.push(TemplateElement::Index);
+            } else {
+                unreachable!("regex misbehavior");
+            }
+            at += end;
+        }
+        if at < content.len() {
+            res.push(TemplateElement::Text(content[at..].to_string()));
+        }
+        Ok(res)
+    }
+
+    /// Expand the root template.
+    fn expand_root_template(&mut self, output_file_name: &str, elements: Vec<TemplateElement>) {
+        self.writer = CodeWriter::new(self.env.unknown_loc());
+        *self.label_counter.borrow_mut() = 0;
+        let mut toc_label = None;
+        self.toc = RefCell::new(Default::default());
+        for elem in elements {
+            match elem {
+                TemplateElement::Text(str) => self.doc_text_for_root(&str),
+                TemplateElement::IncludeModule(name) => {
+                    if let Some(module_env) = self
+                        .env
+                        .find_module_by_name(self.env.symbol_pool().make(&name))
+                    {
+                        let info = self
+                            .infos
+                            .get(&module_env.get_id())
+                            .expect("module defined")
+                            .clone();
+                        assert!(info.is_included);
+                        // Generate the module content in place, adjusting the section nest to
+                        // the last user provided one. This will nest the module underneath
+                        // whatever section is in the template.
+                        let saved_nest = *self.section_nest.borrow();
+                        *self.section_nest.borrow_mut() = *self.last_root_section_nest.borrow() + 1;
+                        self.gen_module(&module_env, &info);
+                        *self.section_nest.borrow_mut() = saved_nest;
+                    } else {
+                        emitln!(self.writer, "> undefined move-include `{}`", name);
+                    }
+                }
+                TemplateElement::IncludeToc => {
+                    if toc_label.is_none() {
+                        toc_label = Some(self.writer.create_label());
+                    } else {
+                        // CodeWriter can only maintain one label at a time.
+                        emitln!(self.writer, ">> duplicate move-toc (technical restriction)");
+                    }
+                }
+                TemplateElement::Index => {
+                    self.gen_index();
+                }
+            }
+        }
+        if let Some(label) = toc_label {
+            // Insert the TOC.
+            self.gen_toc(label);
+        }
+
+        // Add result to output.
+        self.output.push((
+            self.make_file_in_out_dir(output_file_name),
+            self.writer.extract_result(),
+        ));
+    }
+
+    /// Compute ModuleInfo for all modules, considering root template content.
+    fn compute_module_infos(&mut self, templates: &[(String, Vec<TemplateElement>)]) {
+        let mut out_dir = self.options.output_directory.to_string();
+        if out_dir.is_empty() {
+            out_dir = ".".to_string();
+        }
+        let log = |m: &ModuleEnv<'_>, i: &ModuleInfo| {
+            info!(
+                "{} `{}` in file `{}/{}` {}",
+                Self::module_modifier(m.get_name()),
+                m.get_name().display_full(m.symbol_pool()),
+                out_dir,
+                i.target_file,
+                if !m.is_target() {
+                    "exists"
+                } else {
+                    "will be generated"
+                }
+            );
+        };
+        // First process infos for modules included via template.
+        let mut included = BTreeSet::new();
+        for (template_out_file, elements) in templates {
+            for element in elements {
+                if let TemplateElement::IncludeModule(name) = element {
+                    // TODO: currently we only support simple names, we may want to add support for
+                    //   address qualification.
+                    let sym = self.env.symbol_pool().make(name.as_str());
+                    if let Some(module_env) = self.env.find_module_by_name(sym) {
+                        let info = ModuleInfo {
+                            target_file: template_out_file.to_string(),
+                            label: self.make_label_for_module(&module_env),
+                            is_included: true,
+                        };
+                        log(&module_env, &info);
+                        self.infos.insert(module_env.get_id(), info);
+                        included.insert(module_env.get_id());
+                    } else {
+                        // If this is not defined, we continue anyway and will not expand
+                        // the placeholder in the generated root doc (following common template
+                        // practice).
+                    }
+                }
+            }
+        }
+        // Now process infos for all remaining modules.
+        for m in self.env.get_modules() {
+            if !included.contains(&m.get_id()) {
+                if let Some(file_name) = self.compute_output_file(&m) {
+                    let info = ModuleInfo {
+                        target_file: file_name,
+                        label: self.make_label_for_module(&m),
+                        is_included: false,
+                    };
+                    log(&m, &info);
+                    self.infos.insert(m.get_id(), info);
+                }
+            }
+        }
+    }
+
+    fn module_modifier(name: &ModuleName) -> &str {
+        if name.is_script() {
+            "Script"
+        } else {
+            "Module"
+        }
+    }
+
+    /// Computes file location for a module. This considers if the module is a dependency
+    /// and if so attempts to locate already generated documentation for it.
+    fn compute_output_file(&self, module_env: &ModuleEnv<'env>) -> Option<String> {
+        let output_path = PathBuf::from(&self.options.output_directory);
+        let file_name = PathBuf::from(module_env.get_source_path())
+            .with_extension("md")
+            .file_name()
+            .expect("file name")
+            .to_os_string();
+        if !module_env.is_target() {
+            // Try to locate the file in the provided search path.
+            self.options.doc_path.iter().find_map(|dir| {
+                let mut path = PathBuf::from(dir);
+                path.push(&file_name);
+                if path.exists() {
+                    Some(
+                        self.path_relative_to(&path, &output_path)
+                            .to_string_lossy()
+                            .to_string(),
+                    )
+                } else {
+                    None
+                }
+            })
+        } else {
+            // We will generate this file in the provided output directory.
+            Some(file_name.to_string_lossy().to_string())
+        }
+    }
+
+    /// Make a file name in the output directory.
+    fn make_file_in_out_dir(&self, name: &str) -> String {
+        if self.options.compile_relative_to_output_dir {
+            name.to_string()
+        } else {
+            let mut path = PathBuf::from(&self.options.output_directory);
+            path.push(name);
+            path.to_string_lossy().to_string()
+        }
+    }
+
+    /// Make path relative to other path.
+    fn path_relative_to(&self, path: &Path, to: &Path) -> PathBuf {
+        if path.is_absolute() || to.is_absolute() {
+            path.to_path_buf()
+        } else {
+            let mut result = PathBuf::new();
+            for _ in to.components() {
+                result.push("..");
+            }
+            result.join(path)
+        }
+    }
+
+    /// Generates documentation for a module. The result is written into the current code
+    /// writer. Writer and other state is initialized if this module is standalone.
+    fn gen_module(&mut self, module_env: &ModuleEnv<'env>, info: &ModuleInfo) {
+        if !info.is_included {
+            // (Re-) initialize state for this module.
+            self.writer = CodeWriter::new(self.env.unknown_loc());
+            self.toc = RefCell::new(Default::default());
+            *self.section_nest.borrow_mut() = 0;
+            *self.label_counter.borrow_mut() = 0;
+        }
+        self.current_module = Some(module_env.clone());
+
+        // Initialize location to spec item map.
+        self.loc_to_spec_item_map.clear();
+        for (_, sfun) in module_env.get_spec_funs() {
+            self.loc_to_spec_item_map
+                .insert(sfun.loc.clone(), sfun.name);
+        }
+        for (_, svar) in module_env.get_spec_vars() {
+            self.loc_to_spec_item_map
+                .insert(svar.loc.clone(), svar.name);
+        }
+
+        // Print header
+        self.section_header(
+            &format!(
+                "{} `{}`",
+                Self::module_modifier(module_env.get_name()),
+                module_env.get_name().display_full(module_env.symbol_pool())
+            ),
+            &info.label,
+        );
+
+        self.increment_section_nest();
+
+        // Document module overview.
+        self.doc_text(module_env.get_doc());
+
+        // If this is a standalone doc, generate TOC header.
+        let toc_label = if !info.is_included {
+            Some(self.gen_toc_header())
+        } else {
+            None
+        };
+
+        // Generate usage information.
+        // We currently only include modules used in bytecode -- including specs
+        // creates a large usage list because of schema inclusion quickly pulling in
+        // many modules.
+        self.begin_code();
+        let used_modules = module_env
+            .get_used_modules(/*include_specs*/ false)
+            .iter()
+            .filter(|id| **id != module_env.get_id())
+            .map(|id| {
+                module_env
+                    .env
+                    .get_module(*id)
+                    .get_name()
+                    .display_full(module_env.symbol_pool())
+                    .to_string()
+            })
+            .sorted();
+        for used_module in used_modules {
+            self.code_text(&format!("use {};", used_module));
+        }
+        self.end_code();
+
+        if self.options.include_dep_diagrams {
+            let module_name = module_env.get_name().display(module_env.symbol_pool());
+            self.gen_dependency_diagram(module_env.get_id(), true);
+            self.begin_collapsed(&format!(
+                "Show all the modules that \"{}\" depends on directly or indirectly",
+                module_name
+            ));
+            self.image(&format!("img/{}_forward_dep.svg", module_name));
+            self.end_collapsed();
+
+            if !module_env.is_script_module() {
+                self.gen_dependency_diagram(module_env.get_id(), false);
+                self.begin_collapsed(&format!(
+                    "Show all the modules that depend on \"{}\" directly or indirectly",
+                    module_name
+                ));
+                self.image(&format!("img/{}_backward_dep.svg", module_name));
+                self.end_collapsed();
+            }
+        }
+
+        let spec_block_map = self.organize_spec_blocks(module_env);
+
+        if !module_env.get_structs().count() > 0 {
+            for s in module_env
+                .get_structs()
+                .sorted_by(|a, b| Ord::cmp(&a.get_loc(), &b.get_loc()))
+            {
+                self.gen_struct(&spec_block_map, &s);
+            }
+        }
+
+        if module_env.get_named_constant_count() > 0 {
+            // Introduce a Constant section
+            self.gen_named_constants();
+        }
+
+        let funs = module_env
+            .get_functions()
+            .filter(|f| self.options.include_private_fun || f.is_exposed())
+            .sorted_by(|a, b| Ord::cmp(&a.get_loc(), &b.get_loc()))
+            .collect_vec();
+        if !funs.is_empty() {
+            for f in funs {
+                self.gen_function(&spec_block_map, &f);
+            }
+        }
+
+        if !self.options.specs_inlined {
+            self.gen_spec_section(module_env, &spec_block_map);
+        } else {
+            match spec_block_map.get(&SpecBlockTarget::Module) {
+                Some(blocks) if !blocks.is_empty() => {
+                    self.section_header(
+                        "Module Specification",
+                        &self.label_for_section("Module Specification"),
+                    );
+                    self.increment_section_nest();
+                    self.gen_spec_blocks(module_env, "", &SpecBlockTarget::Module, &spec_block_map);
+                    self.decrement_section_nest();
+                }
+                _ => {}
+            }
+        }
+
+        self.decrement_section_nest();
+
+        // Generate table of contents if this is standalone.
+        if let Some(label) = toc_label {
+            self.gen_toc(label);
+        }
+    }
+
+    /// Generate a static call diagram (.svg) starting from the given function.
+    fn gen_call_diagram(&self, fun_id: QualifiedId<FunId>, is_forward: bool) {
+        let fun_env = self.env.get_function(fun_id);
+        let name_of = |env: &FunctionEnv| {
+            if fun_env.module_env.get_id() == env.module_env.get_id() {
+                env.get_simple_name_string()
+            } else {
+                Rc::from(format!("\"{}\"", env.get_name_string()))
+            }
+        };
+
+        let mut dot_src_lines: Vec<String> = vec!["digraph G {".to_string()];
+        let mut visited: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+        let mut queue: VecDeque<QualifiedId<FunId>> = VecDeque::new();
+
+        visited.insert(fun_id);
+        queue.push_back(fun_id);
+
+        while let Some(id) = queue.pop_front() {
+            let curr_env = self.env.get_function(id);
+            let curr_name = name_of(&curr_env);
+            let next_list = if is_forward {
+                curr_env.get_called_functions()
+            } else {
+                curr_env.get_calling_functions()
+            };
+
+            if fun_env.module_env.get_id() == curr_env.module_env.get_id() {
+                dot_src_lines.push(format!("\t{}", curr_name));
+            } else {
+                let module_name = curr_env
+                    .module_env
+                    .get_name()
+                    .display(curr_env.module_env.symbol_pool());
+                dot_src_lines.push(format!("\tsubgraph cluster_{} {{", module_name));
+                dot_src_lines.push(format!("\t\tlabel = \"{}\";", module_name));
+                dot_src_lines.push(format!(
+                    "\t\t{}[label=\"{}\"]",
+                    curr_name,
+                    curr_env.get_simple_name_string()
+                ));
+                dot_src_lines.push("\t}".to_string());
+            }
+
+            for next_id in next_list.iter() {
+                let next_env = self.env.get_function(*next_id);
+                let next_name = name_of(&next_env);
+                if is_forward {
+                    dot_src_lines.push(format!("\t{} -> {}", curr_name, next_name));
+                } else {
+                    dot_src_lines.push(format!("\t{} -> {}", next_name, curr_name));
+                }
+                if !visited.contains(next_id) {
+                    visited.insert(*next_id);
+                    queue.push_back(*next_id);
+                }
+            }
+        }
+        dot_src_lines.push("}".to_string());
+
+        let out_file_path = PathBuf::from(&self.options.output_directory)
+            .join("img")
+            .join(format!(
+                "{}_{}_call_graph.svg",
+                fun_env.get_name_string().to_string().replace("::", "_"),
+                (if is_forward { "forward" } else { "backward" })
+            ));
+
+        self.gen_svg_file(&out_file_path, &dot_src_lines.join("\n"));
+    }
+
+    /// Generate a forward (or backward) dependency diagram (.svg) for the given module.
+    fn gen_dependency_diagram(&self, module_id: ModuleId, is_forward: bool) {
+        let module_env = self.env.get_module(module_id);
+        let module_name = module_env.get_name().display(module_env.symbol_pool());
+
+        let mut dot_src_lines: Vec<String> = vec!["digraph G {".to_string()];
+        let mut visited: BTreeSet<ModuleId> = BTreeSet::new();
+        let mut queue: VecDeque<ModuleId> = VecDeque::new();
+
+        visited.insert(module_id);
+        queue.push_back(module_id);
+
+        while let Some(id) = queue.pop_front() {
+            let mod_env = self.env.get_module(id);
+            let mod_name = mod_env.get_name().display(mod_env.symbol_pool());
+            let dep_list = if is_forward {
+                mod_env.get_used_modules(false)
+            } else {
+                mod_env.get_using_modules(false)
+            };
+            dot_src_lines.push(format!("\t{}", mod_name));
+            for dep_id in dep_list.iter().filter(|dep_id| **dep_id != id) {
+                let dep_env = self.env.get_module(*dep_id);
+                let dep_name = dep_env.get_name().display(dep_env.symbol_pool());
+                if is_forward {
+                    dot_src_lines.push(format!("\t{} -> {}", mod_name, dep_name));
+                } else {
+                    dot_src_lines.push(format!("\t{} -> {}", dep_name, mod_name));
+                }
+                if !visited.contains(dep_id) {
+                    visited.insert(*dep_id);
+                    queue.push_back(*dep_id);
+                }
+            }
+        }
+        dot_src_lines.push("}".to_string());
+
+        let out_file_path = PathBuf::from(&self.options.output_directory)
+            .join("img")
+            .join(format!(
+                "{}_{}_dep.svg",
+                module_name,
+                (if is_forward { "forward" } else { "backward" })
+            ));
+
+        self.gen_svg_file(&out_file_path, &dot_src_lines.join("\n"));
+    }
+
+    /// Execute the external tool "dot" with doc_src as input to generate a .svg image file.
+    fn gen_svg_file(&self, out_file_path: &Path, dot_src: &str) {
+        if let Err(e) = fs::create_dir_all(out_file_path.parent().unwrap()) {
+            self.env.error(
+                &self.env.unknown_loc(),
+                &format!("cannot create a directory for images ({})", e),
+            );
+            return;
+        }
+
+        let mut child = match Command::new("dot")
+            .arg("-Tsvg")
+            .args(["-o", out_file_path.to_str().unwrap()])
+            .stdin(Stdio::piped())
+            .stderr(Stdio::piped())
+            .stdout(Stdio::piped())
+            .spawn()
+        {
+            Ok(c) => c,
+            Err(e) => {
+                self.env.error(
+                    &self.env.unknown_loc(),
+                    &format!("The Graphviz tool \"dot\" is not available. {}", e),
+                );
+                return;
+            }
+        };
+
+        if let Err(e) = child
+            .stdin
+            .as_mut()
+            .ok_or("Child process stdin has not been captured!")
+            .unwrap()
+            .write_all(dot_src.as_bytes())
+        {
+            self.env.error(&self.env.unknown_loc(), &format!("{}", e));
+            return;
+        }
+
+        match child.wait_with_output() {
+            Ok(output) => {
+                if !output.status.success() {
+                    self.env.error(
+                        &self.env.unknown_loc(),
+                        &format!(
+                            "dot failed to generate {}\n{}",
+                            out_file_path.to_str().unwrap(),
+                            dot_src
+                        ),
+                    );
+                }
+            }
+            Err(e) => {
+                self.env.error(&self.env.unknown_loc(), &format!("{}", e));
+            }
+        }
+    }
+
+    /// Generate header for TOC, returning label where we can later insert the content after
+    /// file generation is done.
+    fn gen_toc_header(&mut self) -> CodeWriterLabel {
+        // Create label where we later can insert the TOC
+        emitln!(self.writer);
+        let toc_label = self.writer.create_label();
+        emitln!(self.writer);
+        toc_label
+    }
+
+    /// Generate table of content and insert it at label.
+    fn gen_toc(&mut self, label: CodeWriterLabel) {
+        // We put this into a separate code writer and insert its content at the label.
+        let writer = std::mem::replace(&mut self.writer, CodeWriter::new(self.env.unknown_loc()));
+        {
+            let mut level = 0;
+            for (nest, entry) in self
+                .toc
+                .borrow()
+                .iter()
+                .filter(|(n, _)| *n > 0 && *n <= self.options.toc_depth)
+            {
+                let n = *nest - 1;
+                while level < n {
+                    self.begin_items();
+                    self.writer.indent();
+                    level += 1;
+                }
+                while level > n {
+                    self.end_items();
+                    self.writer.unindent();
+                    level -= 1;
+                }
+                self.item_text(&format!("[{}](#{})", entry.title, entry.label));
+            }
+            while level > 0 {
+                self.end_items();
+                self.writer.unindent();
+                level -= 1;
+            }
+            // Insert the result at label.
+            self.writer
+                .process_result(|s| writer.insert_at_label(label, s));
+        }
+        self.writer = writer;
+    }
+
+    /// Generate an index of all modules and scripts in the context. This includes generated
+    /// ones and those which are only dependencies.
+    fn gen_index(&self) {
+        // Sort all modules and script by simple name. (Perhaps we should include addresses?)
+        let sorted_infos = self.infos.iter().sorted_by(|(id1, _), (id2, _)| {
+            let name = |id: ModuleId| {
+                self.env
+                    .symbol_pool()
+                    .string(self.env.get_module(id).get_name().name())
+            };
+            Ord::cmp(name(**id1).as_str(), name(**id2).as_str())
+        });
+        self.begin_items();
+        for (id, _) in sorted_infos {
+            let module_env = self.env.get_module(*id);
+            if !module_env.is_target() {
+                // Do not include modules which are not target (outside of the package)
+                // into the index.
+                continue;
+            }
+            self.item_text(&format!(
+                "[`{}`]({})",
+                module_env.get_name().display_full(module_env.symbol_pool()),
+                self.ref_for_module(&module_env)
+            ))
+        }
+        self.end_items();
+    }
+
+    /// Generates documentation for all named constants.
+    fn gen_named_constants(&self) {
+        self.section_header("Constants", &self.label_for_section("Constants"));
+        self.increment_section_nest();
+        for const_env in self.current_module.as_ref().unwrap().get_named_constants() {
+            self.label(&self.label_for_module_item(&const_env.module_env, const_env.get_name()));
+            self.doc_text(const_env.get_doc());
+            self.code_block(&self.named_constant_display(&const_env));
+        }
+
+        self.decrement_section_nest();
+    }
+
+    /// Generates documentation for a struct.
+    fn gen_struct(&self, spec_block_map: &SpecBlockMap<'_>, struct_env: &StructEnv<'_>) {
+        let name = struct_env.get_name();
+        self.section_header(
+            &self.struct_title(struct_env),
+            &self.label_for_module_item(&struct_env.module_env, name),
+        );
+        self.increment_section_nest();
+        self.doc_text(struct_env.get_doc());
+        self.code_block(&self.struct_header_display(struct_env));
+
+        if self.options.include_impl || (self.options.include_specs && self.options.specs_inlined) {
+            // Include field documentation if either impls or specs are present and inlined,
+            // because they are used by both.
+            self.begin_collapsed("Fields");
+            self.gen_struct_fields(struct_env);
+            self.end_collapsed();
+        }
+
+        if self.options.specs_inlined {
+            self.gen_spec_blocks(
+                &struct_env.module_env,
+                "Specification",
+                &SpecBlockTarget::Struct(struct_env.module_env.get_id(), struct_env.get_id()),
+                spec_block_map,
+            );
+        }
+        self.decrement_section_nest();
+    }
+
+    /// Returns "Struct `N`" or "Resource `N`".
+    fn struct_title(&self, struct_env: &StructEnv<'_>) -> String {
+        // NOTE(mengxu): although we no longer declare structs with the `resource` keyword, it
+        // might be helpful in keeping `Resource N` in struct title as the boogie translator still
+        // depends on the `is_resource()` predicate to add additional functions to structs declared
+        // with the `key` ability.
+        format!(
+            "{} `{}`",
+            if struct_env.has_memory() {
+                "Resource"
+            } else {
+                "Struct"
+            },
+            self.name_string(struct_env.get_name())
+        )
+    }
+
+    /// Generates declaration for named constant
+    fn named_constant_display(&self, const_env: &NamedConstantEnv<'_>) -> String {
+        let name = self.name_string(const_env.get_name());
+        format!(
+            "const {}: {} = {};",
+            name,
+            const_env.get_type().display(&TypeDisplayContext::WithEnv {
+                env: self.env,
+                type_param_names: None,
+            }),
+            const_env.get_value(),
+        )
+    }
+
+    /// Generates code signature for a struct.
+    fn struct_header_display(&self, struct_env: &StructEnv<'_>) -> String {
+        let name = self.name_string(struct_env.get_name());
+        let type_params = self.type_parameter_list_display(&struct_env.get_named_type_parameters());
+        let ability_tokens = self.ability_tokens(struct_env.get_abilities());
+        if ability_tokens.is_empty() {
+            format!("struct {}{}", name, type_params)
+        } else {
+            format!(
+                "struct {}{} has {}",
+                name,
+                type_params,
+                ability_tokens.join(", ")
+            )
+        }
+    }
+
+    fn gen_struct_fields(&self, struct_env: &StructEnv<'_>) {
+        let tctx = self.type_display_context_for_struct(struct_env);
+        self.begin_definitions();
+        for field in struct_env.get_fields() {
+            self.definition_text(
+                &format!(
+                    "`{}: {}`",
+                    self.name_string(field.get_name()),
+                    field.get_type().display(&tctx)
+                ),
+                field.get_doc(),
+            );
+        }
+        self.end_definitions();
+    }
+
+    /// Generates documentation for a function.
+    fn gen_function(&self, spec_block_map: &SpecBlockMap<'_>, func_env: &FunctionEnv<'_>) {
+        let is_script = func_env.module_env.is_script_module();
+        let name = func_env.get_name();
+        if !is_script {
+            self.section_header(
+                &format!("Function `{}`", self.name_string(name)),
+                &self.label_for_module_item(&func_env.module_env, name),
+            );
+            self.increment_section_nest();
+        }
+        self.doc_text(func_env.get_doc());
+        let sig = self.function_header_display(func_env);
+        self.code_block(&sig);
+        if self.options.include_impl {
+            self.begin_collapsed("Implementation");
+            self.code_block(&self.get_source_with_indent(&func_env.get_loc()));
+            self.end_collapsed();
+        }
+        if self.options.specs_inlined {
+            self.gen_spec_blocks(
+                &func_env.module_env,
+                "Specification",
+                &SpecBlockTarget::Function(func_env.module_env.get_id(), func_env.get_id()),
+                spec_block_map,
+            )
+        }
+        if self.options.include_call_diagrams {
+            let func_name = func_env.get_simple_name_string();
+            self.gen_call_diagram(func_env.get_qualified_id(), true);
+            self.begin_collapsed(&format!(
+                "Show all the functions that \"{}\" calls",
+                &func_name
+            ));
+            self.image(&format!(
+                "img/{}_forward_call_graph.svg",
+                func_env.get_name_string().to_string().replace("::", "_")
+            ));
+            self.end_collapsed();
+
+            self.gen_call_diagram(func_env.get_qualified_id(), false);
+            self.begin_collapsed(&format!(
+                "Show all the functions that call \"{}\"",
+                &func_name
+            ));
+            self.image(&format!(
+                "img/{}_backward_call_graph.svg",
+                func_env.get_name_string().to_string().replace("::", "_")
+            ));
+            self.end_collapsed();
+        }
+        if !is_script {
+            self.decrement_section_nest();
+        }
+    }
+
+    /// Generates documentation for a function signature.
+    fn function_header_display(&self, func_env: &FunctionEnv<'_>) -> String {
+        let name = self.name_string(func_env.get_name());
+        let tctx = &self.type_display_context_for_fun(func_env);
+        let params = func_env
+            .get_parameters()
+            .iter()
+            .map(|Parameter(name, ty)| format!("{}: {}", self.name_string(*name), ty.display(tctx)))
+            .join(", ");
+        let return_types = func_env.get_return_types();
+        let return_str = match return_types.len() {
+            0 => "".to_owned(),
+            1 => format!(": {}", return_types[0].display(tctx)),
+            _ => format!(
+                ": ({})",
+                return_types.iter().map(|ty| ty.display(tctx)).join(", ")
+            ),
+        };
+        let entry_str = if func_env.is_entry() && !func_env.module_env.is_script_module() {
+            "entry ".to_owned()
+        } else {
+            "".to_owned()
+        };
+        format!(
+            "{}{}fun {}{}({}){}",
+            func_env.visibility_str(),
+            entry_str,
+            name,
+            self.type_parameter_list_display(&func_env.get_named_type_parameters()),
+            params,
+            return_str
+        )
+    }
+
+    /// Generates documentation for a series of spec blocks associated with spec block target.
+    fn gen_spec_blocks(
+        &self,
+        module_env: &ModuleEnv<'_>,
+        title: &str,
+        target: &SpecBlockTarget,
+        spec_block_map: &SpecBlockMap,
+    ) {
+        let no_blocks = &vec![];
+        let blocks = spec_block_map.get(target).unwrap_or(no_blocks);
+        if blocks.is_empty() || !self.options.include_specs {
+            return;
+        }
+        if !title.is_empty() {
+            self.begin_collapsed(title);
+        }
+        for block in blocks {
+            self.doc_text(self.env.get_doc(&block.loc));
+            let mut in_code = false;
+            let (is_schema, schema_header) =
+                if let SpecBlockTarget::Schema(_, sid, type_params) = &block.target {
+                    self.label(&format!(
+                        "{}_{}",
+                        self.label_for_module(module_env),
+                        self.name_string(sid.symbol())
+                    ));
+                    (
+                        true,
+                        format!(
+                            "schema {}{} {{",
+                            self.name_string(sid.symbol()),
+                            self.type_parameter_list_display(type_params)
+                        ),
+                    )
+                } else {
+                    (false, "".to_owned())
+                };
+            let begin_code = |in_code: &mut bool| {
+                if !*in_code {
+                    self.begin_code();
+                    if is_schema {
+                        self.code_text(&schema_header);
+                        self.writer.indent();
+                    }
+                    *in_code = true;
+                }
+            };
+            let end_code = |in_code: &mut bool| {
+                if *in_code {
+                    if is_schema {
+                        self.writer.unindent();
+                        self.code_text("}");
+                    }
+                    self.end_code();
+                    *in_code = false;
+                }
+            };
+            for loc in &block.member_locs {
+                let doc = self.env.get_doc(loc);
+                if !doc.is_empty() {
+                    end_code(&mut in_code);
+                    self.doc_text(doc);
+                }
+                // Inject label for spec item definition.
+                if let Some(item) = self.loc_to_spec_item_map.get(loc) {
+                    let label = &format!(
+                        "{}_{}",
+                        self.label_for_module(module_env),
+                        self.name_string(*item)
+                    );
+                    if in_code {
+                        self.label_in_code(label);
+                    } else {
+                        self.label(label);
+                    }
+                }
+                begin_code(&mut in_code);
+                self.code_text(&self.get_source_with_indent(loc));
+            }
+            end_code(&mut in_code);
+        }
+        if !title.is_empty() {
+            self.end_collapsed();
+        }
+    }
+
+    /// Organizes spec blocks in the module such that free items like schemas and module blocks
+    /// are associated with the context they appear in.
+    fn organize_spec_blocks(&self, module_env: &'env ModuleEnv<'env>) -> SpecBlockMap<'env> {
+        let mut result = BTreeMap::new();
+        let mut current_target = SpecBlockTarget::Module;
+        let mut last_block_end: Option<ByteIndex> = None;
+        for block in module_env.get_spec_block_infos() {
+            let may_merge_with_current = match &block.target {
+                SpecBlockTarget::Schema(..) => true,
+                SpecBlockTarget::Module
+                    if !block.member_locs.is_empty() || !self.is_single_liner(&block.loc) =>
+                {
+                    // This is a bit of a hack: if spec module is on a single line,
+                    // we consider it as a marker to switch doc context back to module level,
+                    // otherwise (the case in this branch), we merge it with the predecessor.
+                    true
+                }
+                _ => false,
+            };
+            if !may_merge_with_current
+                || last_block_end.is_none()
+                || self.has_move_code_inbetween(last_block_end.unwrap(), block.loc.span().start())
+            {
+                // Switch target if it's not a schema or module, or if there is any move code between
+                // this block and the last one.
+                current_target = block.target.clone();
+            }
+            last_block_end = Some(block.loc.span().end());
+            result
+                .entry(current_target.clone())
+                .or_insert_with(Vec::new)
+                .push(block);
+        }
+        result
+    }
+
+    /// Returns true if there is any move code (function or struct declaration)
+    /// between the start and end positions.
+    fn has_move_code_inbetween(&self, start: ByteIndex, end: ByteIndex) -> bool {
+        // TODO(wrwg): this might be a bit of inefficient for larger modules, and
+        //   we may want to precompute some of this if it becomses a bottleneck.
+        if let Some(m) = &self.current_module {
+            m.get_functions()
+                .map(|f| f.get_loc())
+                .chain(m.get_structs().map(|s| s.get_loc()))
+                .any(|loc| {
+                    let p = loc.span().start();
+                    p >= start && p < end
+                })
+        } else {
+            false
+        }
+    }
+
+    /// Check whether the location contains a single line of source.
+    fn is_single_liner(&self, loc: &Loc) -> bool {
+        self.env
+            .get_source(loc)
+            .map(|s| !s.contains('\n'))
+            .unwrap_or(false)
+    }
+
+    /// Generates standalone spec section. This is used if `options.specs_inlined` is false.
+    fn gen_spec_section(&self, module_env: &ModuleEnv<'_>, spec_block_map: &SpecBlockMap<'_>) {
+        if spec_block_map.is_empty() || !self.options.include_specs {
+            return;
+        }
+        let section_label = self.label_for_section("Specification");
+        self.section_header("Specification", &section_label);
+        self.increment_section_nest();
+        self.gen_spec_blocks(module_env, "", &SpecBlockTarget::Module, spec_block_map);
+        for struct_env in module_env
+            .get_structs()
+            .sorted_by(|a, b| Ord::cmp(&a.get_loc(), &b.get_loc()))
+        {
+            let target =
+                SpecBlockTarget::Struct(struct_env.module_env.get_id(), struct_env.get_id());
+            if spec_block_map.contains_key(&target) {
+                let name = self.name_string(struct_env.get_name());
+                self.section_header(
+                    &self.struct_title(&struct_env),
+                    &format!("{}_{}", section_label, name),
+                );
+                self.code_block(&self.struct_header_display(&struct_env));
+                self.gen_struct_fields(&struct_env);
+                self.gen_spec_blocks(module_env, "", &target, spec_block_map);
+            }
+        }
+        for func_env in module_env
+            .get_functions()
+            .sorted_by(|a, b| Ord::cmp(&a.get_loc(), &b.get_loc()))
+        {
+            let target = SpecBlockTarget::Function(func_env.module_env.get_id(), func_env.get_id());
+            if spec_block_map.contains_key(&target) {
+                let name = self.name_string(func_env.get_name());
+                self.section_header(
+                    &format!("Function `{}`", name),
+                    &format!("{}_{}", section_label, name),
+                );
+                self.code_block(&self.function_header_display(&func_env));
+                self.gen_spec_blocks(module_env, "", &target, spec_block_map);
+            }
+        }
+        self.decrement_section_nest();
+    }
+
+    // ============================================================================================
+    // Helpers
+
+    /// Returns a string for a name symbol.
+    fn name_string(&self, name: Symbol) -> Rc<String> {
+        self.env.symbol_pool().string(name)
+    }
+
+    /// Collect tokens in an ability set
+    fn ability_tokens(&self, abilities: AbilitySet) -> Vec<&'static str> {
+        let mut ability_tokens = vec![];
+        if abilities.has_copy() {
+            ability_tokens.push("copy");
+        }
+        if abilities.has_drop() {
+            ability_tokens.push("drop");
+        }
+        if abilities.has_store() {
+            ability_tokens.push("store");
+        }
+        if abilities.has_key() {
+            ability_tokens.push("key");
+        }
+        ability_tokens
+    }
+
+    /// Creates a type display context for a function.
+    fn type_display_context_for_fun(&self, func_env: &FunctionEnv<'_>) -> TypeDisplayContext<'_> {
+        let type_param_names = Some(
+            func_env
+                .get_named_type_parameters()
+                .iter()
+                .map(|TypeParameter(name, _)| *name)
+                .collect_vec(),
+        );
+        TypeDisplayContext::WithEnv {
+            env: self.env,
+            type_param_names,
+        }
+    }
+
+    /// Creates a type display context for a struct.
+    fn type_display_context_for_struct(
+        &self,
+        struct_env: &StructEnv<'_>,
+    ) -> TypeDisplayContext<'_> {
+        let type_param_names = Some(
+            struct_env
+                .get_named_type_parameters()
+                .iter()
+                .map(|TypeParameter(name, _)| *name)
+                .collect_vec(),
+        );
+        TypeDisplayContext::WithEnv {
+            env: self.env,
+            type_param_names,
+        }
+    }
+
+    /// Increments section nest.
+    fn increment_section_nest(&self) {
+        *self.section_nest.borrow_mut() += 1;
+    }
+
+    /// Decrements section nest, committing sub-sections to the table-of-contents map.
+    fn decrement_section_nest(&self) {
+        *self.section_nest.borrow_mut() -= 1;
+    }
+
+    /// Creates a new section header and inserts a table-of-contents entry into the generator.
+    fn section_header(&self, s: &str, label: &str) {
+        let level = *self.section_nest.borrow();
+        if usize::saturating_add(self.options.section_level_start, level) > MAX_SUBSECTIONS {
+            panic!("Maximum number of subheadings exceeded with heading: {}", s)
+        }
+        if !label.is_empty() {
+            self.label(label);
+            let entry = TocEntry {
+                title: s.to_owned(),
+                label: label.to_string(),
+            };
+            self.toc.borrow_mut().push((level, entry));
+        }
+        emitln!(
+            self.writer,
+            "{} {}",
+            self.repeat_str("#", self.options.section_level_start + level),
+            s,
+        );
+        emitln!(self.writer);
+    }
+
+    /// Includes the image in the given path.
+    fn image(&self, path: &str) {
+        emitln!(self.writer);
+        emitln!(self.writer, "![]({})", path);
+        emitln!(self.writer);
+    }
+
+    /// Generate label.
+    fn label(&self, label: &str) {
+        emitln!(self.writer);
+        emitln!(self.writer, "<a name=\"{}\"></a>", label);
+        emitln!(self.writer);
+    }
+
+    /// Generate label in code, without empty lines.
+    fn label_in_code(&self, label: &str) {
+        emitln!(self.writer, "<a name=\"{}\"></a>", label);
+    }
+
+    /// Begins a collapsed section.
+    fn begin_collapsed(&self, summary: &str) {
+        emitln!(self.writer);
+        if self.options.collapsed_sections {
+            emitln!(self.writer, "<details>");
+            emitln!(self.writer, "<summary>{}</summary>", summary);
+        } else {
+            emitln!(self.writer, "##### {}", summary);
+        }
+        emitln!(self.writer);
+    }
+
+    /// Ends a collapsed section.
+    fn end_collapsed(&self) {
+        if self.options.collapsed_sections {
+            emitln!(self.writer);
+            emitln!(self.writer, "</details>");
+        }
+    }
+
+    /// Outputs documentation text.
+    fn doc_text_general(&self, for_root: bool, text: &str) {
+        for line in self.decorate_text(text).lines() {
+            let line = line.trim();
+            if line.starts_with('#') {
+                let mut i = 1;
+                while line[i..].starts_with('#') {
+                    i += 1;
+                    self.increment_section_nest();
+                }
+                let header = line[i..].trim_start();
+                if for_root {
+                    *self.last_root_section_nest.borrow_mut() = *self.section_nest.borrow();
+                }
+                self.section_header(header, &self.label_for_section(header));
+                while i > 1 {
+                    self.decrement_section_nest();
+                    i -= 1;
+                }
+            } else {
+                emitln!(self.writer, line)
+            }
+        }
+        // Always be sure to have an empty line at the end of block.
+        emitln!(self.writer);
+    }
+
+    fn doc_text_for_root(&self, text: &str) {
+        self.doc_text_general(true, text)
+    }
+
+    fn doc_text(&self, text: &str) {
+        self.doc_text_general(false, text)
+    }
+
+    /// Makes a label from a string.
+    fn make_label_from_str(&self, s: &str) -> String {
+        format!("@{}", s.replace(' ', "_"))
+    }
+
+    /// Decorates documentation text, identifying code fragments and decorating them
+    /// as code. Code blocks in comments are untouched.
+    fn decorate_text(&self, text: &str) -> String {
+        let mut decorated_text = String::new();
+        let mut chars = text.chars();
+        let non_code_filter = |chr: &char| *chr != '`';
+
+        while let Some(chr) = chars.next() {
+            if chr == '`' {
+                // See if this is the start of a code block.
+                let is_start_of_code_block = chars.take_while_ref(|chr| *chr == '`').count() > 0;
+                if is_start_of_code_block {
+                    // Code block -- don't create a <code>text</code> for this.
+                    decorated_text += "```";
+                } else {
+                    // inside inline code section. Eagerly consume/match this '`'
+                    let code = chars.take_while_ref(non_code_filter).collect::<String>();
+                    // consume the remaining '`'. Report an error if we find an unmatched '`'.
+                    assert!(
+                                            chars.next() == Some('`'),
+                                            "Missing backtick found in {} while generating documentation for the following text: \"{}\"",
+                                            self.current_module.as_ref().unwrap().get_name().display_full(self.env.symbol_pool()), text,
+                                        );
+
+                    write!(
+                        &mut decorated_text,
+                        "<code>{}</code>",
+                        self.decorate_code(&code)
+                    )
+                    .unwrap()
+                }
+            } else {
+                decorated_text.push(chr);
+                decorated_text.extend(chars.take_while_ref(non_code_filter))
+            }
+        }
+        decorated_text
+    }
+
+    /// Begins a code block. This uses html, not markdown code blocks, so we are able to
+    /// insert style and links into the code.
+    fn begin_code(&self) {
+        emitln!(self.writer);
+        // If we newline after <pre><code>, an empty line will be created. So we don't.
+        // This, however, creates some ugliness with indented code.
+        emit!(self.writer, "<pre><code>");
+    }
+
+    /// Ends a code block.
+    fn end_code(&self) {
+        emitln!(self.writer, "</code></pre>\n");
+        // Always be sure to have an empty line at the end of block.
+        emitln!(self.writer);
+    }
+
+    /// Outputs decorated code text in context of a module.
+    fn code_text(&self, code: &str) {
+        emitln!(self.writer, &self.decorate_code(code));
+    }
+
+    /// Decorates a code fragment, for use in an html block. Replaces < and >, bolds keywords and
+    /// tries to resolve and cross-link references.
+    fn decorate_code(&self, code: &str) -> String {
+        static REX: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(
+                r"(?P<ident>(\b\w+\b\s*::\s*)*\b\w+\b)(?P<call>\s*[(<])?|(?P<lt><)|(?P<gt>>)",
+            )
+            .unwrap()
+        });
+        let mut r = String::new();
+        let mut at = 0;
+        while let Some(cap) = REX.captures(&code[at..]) {
+            let replacement = {
+                if cap.name("lt").is_some() {
+                    "&lt;".to_owned()
+                } else if cap.name("gt").is_some() {
+                    "&gt;".to_owned()
+                } else if let Some(m) = cap.name("ident") {
+                    let is_call = cap.name("call").is_some();
+                    let s = m.as_str();
+                    if KEYWORDS.contains(&s)
+                        || CONTEXTUAL_KEYWORDS.contains(&s)
+                        || BUILTINS.contains(&s)
+                    {
+                        format!("<b>{}</b>", &code[at + m.start()..at + m.end()])
+                    } else if let Some(label) = self.resolve_to_label(s, is_call) {
+                        format!("<a href=\"{}\">{}</a>", label, s)
+                    } else {
+                        "".to_owned()
+                    }
+                } else {
+                    "".to_owned()
+                }
+            };
+            if replacement.is_empty() {
+                r += &code[at..at + cap.get(0).unwrap().end()].replace('<', "&lt;");
+            } else {
+                r += &code[at..at + cap.get(0).unwrap().start()];
+                r += &replacement;
+                if let Some(m) = cap.name("call") {
+                    // Append the call or generic open we may have also matched to distinguish
+                    // a simple name from a function call or generic instantiation. Need to
+                    // replace the `<` as well.
+                    r += &m.as_str().replace('<', "&lt;");
+                }
+            }
+            at += cap.get(0).unwrap().end();
+        }
+        r += &code[at..];
+        r
+    }
+
+    /// Resolve a string of the form `ident`, `ident::ident`, or `0xN::ident::ident` into
+    /// the label for the declaration inside of this documentation. This uses a
+    /// heuristic and may not work in all cases or produce wrong results (for instance, it
+    /// ignores aliases). To improve on this, we would need best direct support by the compiler.
+    fn resolve_to_label(&self, mut s: &str, is_followed_by_open: bool) -> Option<String> {
+        // For clarity in documentation, we allow `script::` or `module::` as a prefix.
+        // However, right now it will be ignored for resolution.
+        let lower_s = s.to_lowercase();
+        if lower_s.starts_with("script::") {
+            s = &s["script::".len()..]
+        } else if lower_s.starts_with("module::") {
+            s = &s["module::".len()..]
+        }
+        let parts_data: Vec<&str> = s.splitn(3, "::").collect();
+        let mut parts = parts_data.as_slice();
+        let module_opt = if parts[0].starts_with("0x") {
+            if parts.len() == 1 {
+                // Cannot resolve.
+                return None;
+            }
+            let addr = BigUint::parse_bytes(parts[0][2..].as_bytes(), 16)?;
+            let mname = ModuleName::new(addr, self.env.symbol_pool().make(parts[1]));
+            parts = &parts[2..];
+            Some(self.env.find_module(&mname)?)
+        } else {
+            None
+        };
+        let try_func_struct_or_const =
+            |module: &ModuleEnv<'_>, name: Symbol, is_qualified: bool| {
+                // Below we only resolve a simple name to a hyperref if it is followed by a ( or <,
+                // or if it is a named constant in the module.
+                // Otherwise we get too many false positives where names are resolved to functions
+                // but are actually fields.
+                if module.find_struct(name).is_some()
+                    || module.find_named_constant(name).is_some()
+                    || module.find_spec_var(name).is_some()
+                    || self
+                        .declared_schemas
+                        .get(&module.get_id())
+                        .map(|s| s.contains(&name))
+                        .unwrap_or(false)
+                    || ((is_qualified || is_followed_by_open)
+                        && (module.find_function(name).is_some()
+                            || module.get_spec_funs_of_name(name).next().is_some()))
+                {
+                    Some(self.ref_for_module_item(module, name))
+                } else {
+                    None
+                }
+            };
+        let parts_sym = parts
+            .iter()
+            .map(|p| self.env.symbol_pool().make(p))
+            .collect_vec();
+
+        match (module_opt, parts_sym.len()) {
+            (Some(module), 0) => Some(self.ref_for_module(&module)),
+            (Some(module), 1) => try_func_struct_or_const(&module, parts_sym[0], true),
+            (None, 0) => None,
+            (None, 1) => {
+                // A simple name. Resolve either to module or to item in current module.
+                if let Some(module) = self.env.find_module_by_name(parts_sym[0]) {
+                    Some(self.ref_for_module(&module))
+                } else if let Some(module) = &self.current_module {
+                    try_func_struct_or_const(module, parts_sym[0], false)
+                } else {
+                    None
+                }
+            }
+            (None, 2) => {
+                // A qualified name, but without the address. This must be an item in a module
+                // denoted by the first name.
+                let module_opt = if parts[0] == "Self" {
+                    self.current_module.as_ref().cloned()
+                } else {
+                    self.env.find_module_by_name(parts_sym[0])
+                };
+                if let Some(module) = module_opt {
+                    try_func_struct_or_const(&module, parts_sym[1], true)
+                } else {
+                    None
+                }
+            }
+            (_, _) => None,
+        }
+    }
+
+    /// Create label for a module.
+    fn make_label_for_module(&self, module_env: &ModuleEnv<'_>) -> String {
+        module_env
+            .get_name()
+            .display_full(self.env.symbol_pool())
+            .to_string()
+            .replace("::", "_")
+    }
+
+    /// Return the label for a module.
+    fn label_for_module(&self, module_env: &ModuleEnv<'_>) -> &str {
+        if let Some(info) = self.infos.get(&module_env.get_id()) {
+            &info.label
+        } else {
+            ""
+        }
+    }
+
+    /// Return the reference for a module.
+    fn ref_for_module(&self, module_env: &ModuleEnv<'_>) -> String {
+        if let Some(info) = self.infos.get(&module_env.get_id()) {
+            format!("{}#{}", info.target_file, info.label)
+        } else {
+            "".to_string()
+        }
+    }
+
+    /// Return the label for an item in a module.
+    fn label_for_module_item(&self, module_env: &ModuleEnv<'_>, item: Symbol) -> String {
+        self.label_for_module_item_str(module_env, self.name_string(item).as_str())
+    }
+
+    /// Return the label for an item in a module.
+    fn label_for_module_item_str(&self, module_env: &ModuleEnv<'_>, s: &str) -> String {
+        format!("{}_{}", self.label_for_module(module_env), s)
+    }
+
+    /// Return the reference for an item in a module.
+    fn ref_for_module_item(&self, module_env: &ModuleEnv<'_>, item: Symbol) -> String {
+        format!(
+            "{}_{}",
+            self.ref_for_module(module_env),
+            item.display(self.env.symbol_pool())
+        )
+    }
+
+    /// Create a unique label for a section header.
+    fn label_for_section(&self, title: &str) -> String {
+        let counter = *self.label_counter.borrow();
+        *self.label_counter.borrow_mut() += 1;
+        self.make_label_from_str(&format!("{} {}", title, counter))
+    }
+
+    /// Shortcut for code_block in a module context.
+    fn code_block(&self, code: &str) {
+        self.begin_code();
+        self.code_text(code);
+        self.end_code();
+    }
+
+    /// Begin an itemized list.
+    fn begin_items(&self) {}
+
+    /// End an itemized list.
+    fn end_items(&self) {}
+
+    /// Emit an item.
+    fn item_text(&self, text: &str) {
+        emitln!(self.writer, "-  {}", text);
+    }
+
+    /// Begin a definition list.
+    fn begin_definitions(&self) {
+        emitln!(self.writer);
+        emitln!(self.writer, "<dl>");
+    }
+
+    /// End a definition list.
+    fn end_definitions(&self) {
+        emitln!(self.writer, "</dl>");
+        emitln!(self.writer);
+    }
+
+    /// Emit a definition.
+    fn definition_text(&self, term: &str, def: &str) {
+        emitln!(self.writer, "<dt>\n{}\n</dt>", self.decorate_text(term));
+        emitln!(self.writer, "<dd>\n{}\n</dd>", self.decorate_text(def));
+    }
+
+    /// Display a type parameter.
+    fn type_parameter_display(&self, tp: &TypeParameter) -> String {
+        let ability_tokens = self.ability_tokens(tp.1 .0);
+        if ability_tokens.is_empty() {
+            self.name_string(tp.0).to_string()
+        } else {
+            format!("{}: {}", self.name_string(tp.0), ability_tokens.join(", "))
+        }
+    }
+
+    /// Display a type parameter list.
+    fn type_parameter_list_display(&self, tps: &[TypeParameter]) -> String {
+        if tps.is_empty() {
+            "".to_owned()
+        } else {
+            format!(
+                "<{}>",
+                tps.iter()
+                    .map(|tp| self.type_parameter_display(tp))
+                    .join(", ")
+            )
+        }
+    }
+
+    /// Retrieves source of code fragment with adjusted indentation.
+    /// Typically code has the first line unindented because location tracking starts
+    /// at the first keyword of the item (e.g. `public fun`), but subsequent lines are then
+    /// indented. This uses a heuristic by guessing the indentation from the context.
+    fn get_source_with_indent(&self, loc: &Loc) -> String {
+        if let Ok(source) = self.env.get_source(loc) {
+            // Compute the indentation of this source fragment by looking at some
+            // characters preceding it.
+            let mut peek_start = loc.span().start().0;
+            if peek_start > 60 {
+                peek_start -= 60;
+            } else {
+                peek_start = 0;
+            }
+            let source_before = self
+                .env
+                .get_source(&Loc::new(
+                    loc.file_id(),
+                    Span::new(ByteIndex(peek_start), loc.span().start()),
+                ))
+                .unwrap_or("");
+            let newl_at = source_before.rfind('\n').unwrap_or(0);
+            let mut indent = source_before.len() - newl_at - 1;
+            if indent >= 4 && source_before.ends_with("spec ") {
+                // Special case for `spec define` and similar constructs.
+                indent -= 4;
+            }
+            // Remove the indent from all lines.
+            source
+                .lines()
+                .map(|l| {
+                    let mut i = 0;
+                    while i < indent && i < l.len() && l[i..].starts_with(' ') {
+                        i += 1;
+                    }
+                    &l[i..]
+                })
+                .join("\n")
+        } else {
+            "<unknown source>".to_string()
+        }
+    }
+
+    /// Repeats a string n times.
+    fn repeat_str(&self, s: &str, n: usize) -> String {
+        (0..n).map(|_| s).collect::<String>()
+    }
+}
diff --git a/vendors/move/crates/move-docgen/src/lib.rs b/vendors/move/crates/move-docgen/src/lib.rs
new file mode 100644
index 000000000..81be12007
--- /dev/null
+++ b/vendors/move/crates/move-docgen/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+mod docgen;
+
+pub use crate::docgen::*;
diff --git a/vendors/move/crates/move-docgen/tests/sources/code_block_test.move b/vendors/move/crates/move-docgen/tests/sources/code_block_test.move
new file mode 100644
index 000000000..d4f945b2b
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/code_block_test.move
@@ -0,0 +1,8 @@
+script {
+    /// # Explanation of the algorithm
+    /// ```
+    /// code block
+    /// ```
+    /// then `inline code`
+    fun main() { }
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline.md b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline.md
new file mode 100644
index 000000000..9f0300058
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline.md
@@ -0,0 +1,39 @@
+
+<a name="main"></a>
+
+# Script `main`
+
+
+
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Explanation_of_the_algorithm_0"></a>
+
+## Explanation of the algorithm
+
+```
+code block
+```
+then <code>inline code</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code_block_test.md#main">main</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
new file mode 100644
index 000000000..591510d88
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_inline_no_fold.md
@@ -0,0 +1,34 @@
+
+<a name="main"></a>
+
+# Script `main`
+
+
+
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Explanation_of_the_algorithm_0"></a>
+
+## Explanation of the algorithm
+
+```
+code block
+```
+then <code>inline code</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code_block_test.md#main">main</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+</code></pre>
diff --git a/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_separate.md b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_separate.md
new file mode 100644
index 000000000..9f0300058
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/code_block_test.spec_separate.md
@@ -0,0 +1,39 @@
+
+<a name="main"></a>
+
+# Script `main`
+
+
+
+-  [Explanation of the algorithm](#@Explanation_of_the_algorithm_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Explanation_of_the_algorithm_0"></a>
+
+## Explanation of the algorithm
+
+```
+code block
+```
+then <code>inline code</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="code_block_test.md#main">main</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="code_block_test.md#main">main</a>() { }
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/sources/different_visbilities.move b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.move
new file mode 100644
index 000000000..3d1aaad29
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.move
@@ -0,0 +1,16 @@
+address 0x2 {
+module TestViz {
+    /// This is a public function
+    public fun this_is_a_public_fun() { }
+
+    // /// This is a public friend function
+    // public(friend) fun this_is_a_public_friend_fun() {}
+
+    /// This is a public entry function
+    public entry fun this_is_a_public_script_fun() {}
+
+    #[allow(unused_function)]
+    /// This is a private function
+    fun this_is_a_private_fun() {}
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline.md b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline.md
new file mode 100644
index 000000000..a23dbcbcc
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline.md
@@ -0,0 +1,84 @@
+
+<a name="0x2_TestViz"></a>
+
+# Module `0x2::TestViz`
+
+
+
+-  [Function `this_is_a_public_fun`](#0x2_TestViz_this_is_a_public_fun)
+-  [Function `this_is_a_public_script_fun`](#0x2_TestViz_this_is_a_public_script_fun)
+-  [Function `this_is_a_private_fun`](#0x2_TestViz_this_is_a_private_fun)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x2_TestViz_this_is_a_public_fun"></a>
+
+## Function `this_is_a_public_fun`
+
+This is a public function
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>() { }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x2_TestViz_this_is_a_public_script_fun"></a>
+
+## Function `this_is_a_public_script_fun`
+
+This is a public entry function
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x2_TestViz_this_is_a_private_fun"></a>
+
+## Function `this_is_a_private_fun`
+
+This is a private function
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>() {}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md
new file mode 100644
index 000000000..02eb1509a
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md
@@ -0,0 +1,73 @@
+
+<a name="0x2_TestViz"></a>
+
+# Module `0x2::TestViz`
+
+
+
+-  [Function `this_is_a_public_fun`](#0x2_TestViz_this_is_a_public_fun)
+-  [Function `this_is_a_public_script_fun`](#0x2_TestViz_this_is_a_public_script_fun)
+-  [Function `this_is_a_private_fun`](#0x2_TestViz_this_is_a_private_fun)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x2_TestViz_this_is_a_public_fun"></a>
+
+## Function `this_is_a_public_fun`
+
+This is a public function
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>() { }
+</code></pre>
+
+
+
+<a name="0x2_TestViz_this_is_a_public_script_fun"></a>
+
+## Function `this_is_a_public_script_fun`
+
+This is a public entry function
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>() {}
+</code></pre>
+
+
+
+<a name="0x2_TestViz_this_is_a_private_fun"></a>
+
+## Function `this_is_a_private_fun`
+
+This is a private function
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>() {}
+</code></pre>
diff --git a/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_separate.md b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_separate.md
new file mode 100644
index 000000000..a23dbcbcc
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/different_visbilities.spec_separate.md
@@ -0,0 +1,84 @@
+
+<a name="0x2_TestViz"></a>
+
+# Module `0x2::TestViz`
+
+
+
+-  [Function `this_is_a_public_fun`](#0x2_TestViz_this_is_a_public_fun)
+-  [Function `this_is_a_public_script_fun`](#0x2_TestViz_this_is_a_public_script_fun)
+-  [Function `this_is_a_private_fun`](#0x2_TestViz_this_is_a_private_fun)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x2_TestViz_this_is_a_public_fun"></a>
+
+## Function `this_is_a_public_fun`
+
+This is a public function
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_fun">this_is_a_public_fun</a>() { }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x2_TestViz_this_is_a_public_script_fun"></a>
+
+## Function `this_is_a_public_script_fun`
+
+This is a public entry function
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x2_TestViz_this_is_a_private_fun"></a>
+
+## Function `this_is_a_private_fun`
+
+This is a private function
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_private_fun">this_is_a_private_fun</a>() {}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template.md b/vendors/move/crates/move-docgen/tests/sources/root_template.md
new file mode 100644
index 000000000..04c8af30f
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template.md
@@ -0,0 +1,28 @@
+
+# A Root Documentation Template
+
+This document contains the description of multiple move scripts.
+
+The script `yet_another` is documented in its own file.
+
+> {{move-toc}}
+
+## Some Scripts
+
+> {{move-include some}}
+
+## Other Scripts
+
+> {{move-include other}}
+
+## Some other scripts from a module
+
+> {{move-include OneTypeOfScript}}
+
+This is another module full of script funs too:
+
+> {{move-include AnotherTypeOfScript}}
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline.md b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline.md
new file mode 100644
index 000000000..9da618f47
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline.md
@@ -0,0 +1,260 @@
+
+
+<a name="@A_Root_Documentation_Template_0"></a>
+
+# A Root Documentation Template
+
+
+This document contains the description of multiple move scripts.
+
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
+
+-  [Some Scripts](#@Some_Scripts_1)
+    -  [Script `some`](#some)
+-  [Other Scripts](#@Other_Scripts_2)
+    -  [Script `other`](#other)
+-  [Some other scripts from a module](#@Some_other_scripts_from_a_module_3)
+    -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
+        -  [Function `script1`](#0x1_OneTypeOfScript_script1)
+        -  [Function `script2`](#0x1_OneTypeOfScript_script2)
+    -  [Module `0x1::AnotherTypeOfScript`](#0x1_AnotherTypeOfScript)
+        -  [Function `script3`](#0x1_AnotherTypeOfScript_script3)
+        -  [Function `script4`](#0x1_AnotherTypeOfScript_script4)
+-  [Index](#@Index_4)
+
+
+
+<a name="@Some_Scripts_1"></a>
+
+## Some Scripts
+
+
+
+<a name="some"></a>
+
+### Script `some`
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 1;
+</code></pre>
+
+
+
+</details>
+
+
+
+<a name="@Other_Scripts_2"></a>
+
+## Other Scripts
+
+
+
+<a name="other"></a>
+
+### Script `other`
+
+
+
+<pre><code></code></pre>
+
+
+This script does also abort.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 2
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 2;
+</code></pre>
+
+
+
+</details>
+
+
+
+<a name="@Some_other_scripts_from_a_module_3"></a>
+
+## Some other scripts from a module
+
+
+
+<a name="0x1_OneTypeOfScript"></a>
+
+### Module `0x1::OneTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_OneTypeOfScript_script1"></a>
+
+#### Function `script1`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_OneTypeOfScript_script2"></a>
+
+#### Function `script2`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>() {}
+</code></pre>
+
+
+
+</details>
+
+
+This is another module full of script funs too:
+
+
+<a name="0x1_AnotherTypeOfScript"></a>
+
+### Module `0x1::AnotherTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_AnotherTypeOfScript_script3"></a>
+
+#### Function `script3`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_AnotherTypeOfScript_script4"></a>
+
+#### Function `script4`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>() {}
+</code></pre>
+
+
+
+</details>
+
+
+
+<a name="@Index_4"></a>
+
+## Index
+
+
+-  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
+-  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline_no_fold.md b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
new file mode 100644
index 000000000..e7a8d12af
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
@@ -0,0 +1,236 @@
+
+
+<a name="@A_Root_Documentation_Template_0"></a>
+
+# A Root Documentation Template
+
+
+This document contains the description of multiple move scripts.
+
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
+
+-  [Some Scripts](#@Some_Scripts_1)
+    -  [Script `some`](#some)
+-  [Other Scripts](#@Other_Scripts_2)
+    -  [Script `other`](#other)
+-  [Some other scripts from a module](#@Some_other_scripts_from_a_module_3)
+    -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
+        -  [Function `script1`](#0x1_OneTypeOfScript_script1)
+        -  [Function `script2`](#0x1_OneTypeOfScript_script2)
+    -  [Module `0x1::AnotherTypeOfScript`](#0x1_AnotherTypeOfScript)
+        -  [Function `script3`](#0x1_AnotherTypeOfScript_script3)
+        -  [Function `script4`](#0x1_AnotherTypeOfScript_script4)
+-  [Index](#@Index_4)
+
+
+
+<a name="@Some_Scripts_1"></a>
+
+## Some Scripts
+
+
+
+<a name="some"></a>
+
+### Script `some`
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
+
+
+
+##### Specification
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 1;
+</code></pre>
+
+
+
+
+
+<a name="@Other_Scripts_2"></a>
+
+## Other Scripts
+
+
+
+<a name="other"></a>
+
+### Script `other`
+
+
+
+<pre><code></code></pre>
+
+
+This script does also abort.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 2
+}
+</code></pre>
+
+
+
+##### Specification
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 2;
+</code></pre>
+
+
+
+
+
+<a name="@Some_other_scripts_from_a_module_3"></a>
+
+## Some other scripts from a module
+
+
+
+<a name="0x1_OneTypeOfScript"></a>
+
+### Module `0x1::OneTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_OneTypeOfScript_script1"></a>
+
+#### Function `script1`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>() {}
+</code></pre>
+
+
+
+<a name="0x1_OneTypeOfScript_script2"></a>
+
+#### Function `script2`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>() {}
+</code></pre>
+
+
+
+
+This is another module full of script funs too:
+
+
+<a name="0x1_AnotherTypeOfScript"></a>
+
+### Module `0x1::AnotherTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_AnotherTypeOfScript_script3"></a>
+
+#### Function `script3`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>() {}
+</code></pre>
+
+
+
+<a name="0x1_AnotherTypeOfScript_script4"></a>
+
+#### Function `script4`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>() {}
+</code></pre>
+
+
+
+
+
+<a name="@Index_4"></a>
+
+## Index
+
+
+-  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
+-  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template.spec_separate.md b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_separate.md
new file mode 100644
index 000000000..c4aa58a96
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template.spec_separate.md
@@ -0,0 +1,280 @@
+
+
+<a name="@A_Root_Documentation_Template_0"></a>
+
+# A Root Documentation Template
+
+
+This document contains the description of multiple move scripts.
+
+The script <code><a href="root_template_script3.md#yet_another">yet_another</a></code> is documented in its own file.
+
+-  [Some Scripts](#@Some_Scripts_1)
+    -  [Script `some`](#some)
+        -  [Specification](#@Specification_2)
+-  [Other Scripts](#@Other_Scripts_3)
+    -  [Script `other`](#other)
+        -  [Specification](#@Specification_4)
+-  [Some other scripts from a module](#@Some_other_scripts_from_a_module_5)
+    -  [Module `0x1::OneTypeOfScript`](#0x1_OneTypeOfScript)
+        -  [Function `script1`](#0x1_OneTypeOfScript_script1)
+        -  [Function `script2`](#0x1_OneTypeOfScript_script2)
+    -  [Module `0x1::AnotherTypeOfScript`](#0x1_AnotherTypeOfScript)
+        -  [Function `script3`](#0x1_AnotherTypeOfScript_script3)
+        -  [Function `script4`](#0x1_AnotherTypeOfScript_script4)
+-  [Index](#@Index_6)
+
+
+
+<a name="@Some_Scripts_1"></a>
+
+## Some Scripts
+
+
+
+<a name="some"></a>
+
+### Script `some`
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Specification_2"></a>
+
+#### Specification
+
+
+<a name="@Specification_2_some"></a>
+
+##### Function `some`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 1;
+</code></pre>
+
+
+
+
+
+<a name="@Other_Scripts_3"></a>
+
+## Other Scripts
+
+
+
+<a name="other"></a>
+
+### Script `other`
+
+
+
+<pre><code></code></pre>
+
+
+This script does also abort.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 2
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Specification_4"></a>
+
+#### Specification
+
+
+<a name="@Specification_4_other"></a>
+
+##### Function `other`
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="root.md#other">other</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+
+<pre><code><b>aborts_if</b> <b>true</b> <b>with</b> 2;
+</code></pre>
+
+
+
+
+
+<a name="@Some_other_scripts_from_a_module_5"></a>
+
+## Some other scripts from a module
+
+
+
+<a name="0x1_OneTypeOfScript"></a>
+
+### Module `0x1::OneTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_OneTypeOfScript_script1"></a>
+
+#### Function `script1`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_OneTypeOfScript_script2"></a>
+
+#### Function `script2`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>() {}
+</code></pre>
+
+
+
+</details>
+
+
+This is another module full of script funs too:
+
+
+<a name="0x1_AnotherTypeOfScript"></a>
+
+### Module `0x1::AnotherTypeOfScript`
+
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_AnotherTypeOfScript_script3"></a>
+
+#### Function `script3`
+
+This is a script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>() {}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_AnotherTypeOfScript_script4"></a>
+
+#### Function `script4`
+
+This is another script
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>() {}
+</code></pre>
+
+
+
+</details>
+
+
+
+<a name="@Index_6"></a>
+
+## Index
+
+
+-  [`0x1::AnotherTypeOfScript`](root.md#0x1_AnotherTypeOfScript)
+-  [`0x1::OneTypeOfScript`](root.md#0x1_OneTypeOfScript)
+-  [`other`](root.md#other)
+-  [`some`](root.md#some)
+-  [`yet_another`](root_template_script3.md#yet_another)
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template_AnotherTypeOfScript.notest_move b/vendors/move/crates/move-docgen/tests/sources/root_template_AnotherTypeOfScript.notest_move
new file mode 100644
index 000000000..eb7dbd3b1
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template_AnotherTypeOfScript.notest_move
@@ -0,0 +1,10 @@
+address 0x1 {
+module AnotherTypeOfScript {
+
+    /// This is a script
+    entry fun script3() {}
+
+    /// This is another script
+    entry fun script4() {}
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template_OneTypeOfScript.notest_move b/vendors/move/crates/move-docgen/tests/sources/root_template_OneTypeOfScript.notest_move
new file mode 100644
index 000000000..e793028b2
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template_OneTypeOfScript.notest_move
@@ -0,0 +1,10 @@
+address 0x1 {
+module OneTypeOfScript {
+
+    /// This is a script
+    entry fun script1() {}
+
+    /// This is another script
+    entry fun script2() {}
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template_script1.notest_move b/vendors/move/crates/move-docgen/tests/sources/root_template_script1.notest_move
new file mode 100644
index 000000000..12117ae1d
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template_script1.notest_move
@@ -0,0 +1,10 @@
+script {
+#[allow(unused_type_parameter)]
+/// This script does really nothing but just aborts.
+fun some<T>(_account: signer) {
+    abort 1
+}
+spec some {
+    aborts_if true with 1;
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template_script2.notest_move b/vendors/move/crates/move-docgen/tests/sources/root_template_script2.notest_move
new file mode 100644
index 000000000..898372b29
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template_script2.notest_move
@@ -0,0 +1,10 @@
+script {
+#[allow(unused_type_parameter)]
+/// This script does also abort.
+fun other<T>(_account: signer) {
+    abort 2
+}
+spec other {
+    aborts_if true with 2;
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/root_template_script3.notest_move b/vendors/move/crates/move-docgen/tests/sources/root_template_script3.notest_move
new file mode 100644
index 000000000..4c10978c7
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/root_template_script3.notest_move
@@ -0,0 +1,10 @@
+script {
+#[allow(unused_type_parameter)]
+/// This script does also abort, similar as script `some` and `other`.
+fun yet_another<T>(_account: signer) {
+    abort 3
+}
+spec yet_another {
+    aborts_if true with 3;
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/some_script.move b/vendors/move/crates/move-docgen/tests/sources/some_script.move
new file mode 100644
index 000000000..c9ca3c26d
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/some_script.move
@@ -0,0 +1,7 @@
+script {
+#[allow(unused_type_parameter)]
+/// This script does really nothing but just aborts.
+fun some<T>(_account: signer) {
+    abort 1
+}
+}
diff --git a/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline.md b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline.md
new file mode 100644
index 000000000..8b6015b3b
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline.md
@@ -0,0 +1,32 @@
+
+<a name="some"></a>
+
+# Script `some`
+
+
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline_no_fold.md b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline_no_fold.md
new file mode 100644
index 000000000..685a34855
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_inline_no_fold.md
@@ -0,0 +1,27 @@
+
+<a name="some"></a>
+
+# Script `some`
+
+
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
diff --git a/vendors/move/crates/move-docgen/tests/sources/some_script.spec_separate.md b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_separate.md
new file mode 100644
index 000000000..8b6015b3b
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/sources/some_script.spec_separate.md
@@ -0,0 +1,32 @@
+
+<a name="some"></a>
+
+# Script `some`
+
+
+
+
+
+<pre><code></code></pre>
+
+
+This script does really nothing but just aborts.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="some_script.md#some">some</a>&lt;T&gt;(_account: signer) {
+    <b>abort</b> 1
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-docgen/tests/testsuite.rs b/vendors/move/crates/move-docgen/tests/testsuite.rs
new file mode 100644
index 000000000..da8a6f696
--- /dev/null
+++ b/vendors/move/crates/move-docgen/tests/testsuite.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::path::Path;
+
+use codespan_reporting::term::termcolor::Buffer;
+
+use move_prover::{cli::Options, run_move_prover};
+use move_prover_test_utils::baseline_test::verify_or_update_baseline;
+use std::path::PathBuf;
+use tempfile::TempDir;
+
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::debug;
+use std::{fs::File, io::Read};
+
+const FLAGS: &[&str] = &[
+    "--verbose=warn",
+    "--dependency=../move-stdlib/sources",
+    "--named-addresses=std=0x1",
+    "--docgen",
+];
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let mut args = vec!["mvp_test".to_string()];
+    args.extend(FLAGS.iter().map(|s| (*s).to_string()).collect_vec());
+
+    let is_root_template = path
+        .file_name()
+        .unwrap()
+        .to_string_lossy()
+        .to_string()
+        .ends_with("_template.md");
+    if !is_root_template {
+        args.push(path.to_string_lossy().to_string());
+    } else {
+        // add as sources all .notest_move files starting with the name of the template.
+        let base_name = path.file_stem().unwrap().to_string_lossy().to_string();
+        let dir_name = path.parent().unwrap();
+        dir_name.read_dir().unwrap().for_each(|res| {
+            let f = res.unwrap();
+            let name = f.file_name().to_string_lossy().to_string();
+            if name.starts_with(&base_name) && name.ends_with(".notest_move") {
+                args.push(f.path().to_string_lossy().to_string());
+            }
+        });
+    }
+
+    let mut options = Options::create_from_args(&args)?;
+    options.setup_logging_for_test();
+
+    if is_root_template {
+        options.docgen.root_doc_templates = vec![path.to_string_lossy().to_string()];
+    }
+
+    options.docgen.include_specs = true;
+    options.docgen.include_impl = true;
+    options.docgen.include_private_fun = true;
+
+    options.docgen.specs_inlined = true;
+    test_docgen(path, options.clone(), "spec_inline.md")?;
+
+    options.docgen.specs_inlined = false;
+    test_docgen(path, options.clone(), "spec_separate.md")?;
+
+    options.docgen.specs_inlined = true;
+    options.docgen.collapsed_sections = false;
+    test_docgen(path, options, "spec_inline_no_fold.md")?;
+
+    Ok(())
+}
+
+fn test_docgen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Result<()> {
+    let mut temp_path = PathBuf::from(TempDir::new()?.path());
+    options.docgen.output_directory = temp_path.to_string_lossy().to_string();
+    let base_name = format!(
+        "{}.md",
+        path.file_stem()
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .replace("_template", "")
+    );
+    temp_path.push(&base_name);
+
+    let mut error_writer = Buffer::no_color();
+    let mut output = match run_move_prover(&mut error_writer, options) {
+        Ok(()) => {
+            let mut contents = String::new();
+            println!("writing to {}", temp_path.display());
+            let mut file = File::open(temp_path.as_path()).unwrap();
+            file.read_to_string(&mut contents).unwrap();
+            contents
+        }
+        Err(err) => format!("Move prover docgen returns: {}\n", err),
+    };
+    output += &String::from_utf8_lossy(&error_writer.into_inner());
+    let baseline_path = path.with_extension(suffix);
+    verify_or_update_baseline(baseline_path.as_path(), &output)?;
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests/sources", r".*\.move|.*_template\.md",);
diff --git a/vendors/move/crates/move-errmapgen/Cargo.toml b/vendors/move/crates/move-errmapgen/Cargo.toml
new file mode 100644
index 000000000..4af053248
--- /dev/null
+++ b/vendors/move/crates/move-errmapgen/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "move-errmapgen"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# Move dependencies
+move-command-line-common.workspace = true
+move-model.workspace = true
+move-core-types.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+serde.workspace = true
+
+[dev-dependencies]
+codespan-reporting.workspace = true
+move-prover.workspace = true
+datatest-stable.workspace = true
diff --git a/vendors/move/crates/move-errmapgen/src/errmapgen.rs b/vendors/move/crates/move-errmapgen/src/errmapgen.rs
new file mode 100644
index 000000000..1a9aeb2b6
--- /dev/null
+++ b/vendors/move/crates/move-errmapgen/src/errmapgen.rs
@@ -0,0 +1,142 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION;
+use move_core_types::{
+    account_address::AccountAddress,
+    errmap::{ErrorDescription, ErrorMapping},
+    identifier::Identifier,
+    language_storage::ModuleId,
+};
+use move_model::{
+    ast::Value,
+    model::{GlobalEnv, ModuleEnv, NamedConstantEnv},
+    symbol::Symbol,
+};
+use serde::{Deserialize, Serialize};
+use std::{convert::TryFrom, rc::Rc};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ErrmapOptions {
+    /// The constant prefix that determines if a constant is an error or not
+    pub error_prefix: String,
+    /// The module ID of the error category module
+    pub error_category_module: ModuleId,
+    /// In which file to store the output
+    pub output_file: String,
+}
+
+impl Default for ErrmapOptions {
+    fn default() -> Self {
+        Self {
+            error_prefix: "E".to_string(),
+            error_category_module: ModuleId::new(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                Identifier::new("errors").unwrap(),
+            ),
+            output_file: MOVE_ERROR_DESC_EXTENSION.to_string(),
+        }
+    }
+}
+
+pub struct ErrmapGen<'env> {
+    /// Options for error map generation
+    options: &'env ErrmapOptions,
+    /// Input definitions
+    env: &'env GlobalEnv,
+    /// Output error mapping
+    output: ErrorMapping,
+}
+
+impl<'env> ErrmapGen<'env> {
+    pub fn new(env: &'env GlobalEnv, options: &'env ErrmapOptions) -> Self {
+        Self {
+            options,
+            env,
+            output: ErrorMapping::default(),
+        }
+    }
+
+    pub fn save_result(&self) {
+        self.output.to_file(&self.options.output_file);
+    }
+
+    pub fn gen(&mut self) {
+        for module in self.env.get_modules() {
+            if !module.is_script_module() {
+                self.build_error_map(&module).unwrap()
+            }
+        }
+    }
+
+    fn build_error_map(&mut self, module: &ModuleEnv<'_>) -> Result<()> {
+        let module_id = self.get_module_id_for_name(module);
+        if module_id == self.options.error_category_module {
+            self.build_error_categories(module)?
+        } else {
+            self.build_error_map_for_module(&module_id, module)?
+        }
+        Ok(())
+    }
+
+    fn build_error_categories(&mut self, module: &ModuleEnv<'_>) -> Result<()> {
+        for named_constant in module.get_named_constants() {
+            let name = self.name_string(named_constant.get_name());
+            let error_category = self.get_abort_code(&named_constant)?;
+            self.output.add_error_category(
+                error_category,
+                ErrorDescription {
+                    code_name: name.to_string(),
+                    code_description: named_constant.get_doc().to_string(),
+                },
+            )?
+        }
+        Ok(())
+    }
+
+    fn build_error_map_for_module(
+        &mut self,
+        module_id: &ModuleId,
+        module: &ModuleEnv<'_>,
+    ) -> Result<()> {
+        for named_constant in module.get_named_constants() {
+            let name = self.name_string(named_constant.get_name());
+            if name.starts_with(&self.options.error_prefix) {
+                let abort_code = self.get_abort_code(&named_constant)?;
+                self.output.add_module_error(
+                    module_id.clone(),
+                    abort_code,
+                    ErrorDescription {
+                        code_name: name.to_string(),
+                        code_description: named_constant.get_doc().to_string(),
+                    },
+                )?
+            }
+        }
+        Ok(())
+    }
+
+    fn get_abort_code(&self, constant: &NamedConstantEnv<'_>) -> Result<u64> {
+        match constant.get_value() {
+            Value::Number(big_int) => u64::try_from(big_int).map_err(|err| err.into()),
+            x => bail!(
+                "Invalid abort code constant {} found for code {}",
+                x,
+                self.name_string(constant.get_name())
+            ),
+        }
+    }
+
+    fn get_module_id_for_name(&self, module: &ModuleEnv<'_>) -> ModuleId {
+        let name = module.get_name();
+        let addr = AccountAddress::from_hex_literal(&format!("0x{:x}", name.addr())).unwrap();
+        let name = Identifier::new(self.name_string(name.name()).to_string()).unwrap();
+        ModuleId::new(addr, name)
+    }
+
+    fn name_string(&self, symbol: Symbol) -> Rc<String> {
+        self.env.symbol_pool().string(symbol)
+    }
+}
diff --git a/vendors/move/crates/move-errmapgen/src/lib.rs b/vendors/move/crates/move-errmapgen/src/lib.rs
new file mode 100644
index 000000000..90cc7d01f
--- /dev/null
+++ b/vendors/move/crates/move-errmapgen/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+mod errmapgen;
+
+pub use crate::errmapgen::*;
diff --git a/vendors/move/crates/move-explain/Cargo.toml b/vendors/move/crates/move-explain/Cargo.toml
new file mode 100644
index 000000000..641cabf04
--- /dev/null
+++ b/vendors/move/crates/move-explain/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "move-explain"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Explain Move abort codes. Errors are defined as a global category + module-specific reason for the error"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+clap.workspace = true
+move-command-line-common.workspace = true
+move-core-types.workspace = true
+
+bcs.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-explain/src/main.rs b/vendors/move/crates/move-explain/src/main.rs
new file mode 100644
index 000000000..c8bf95a64
--- /dev/null
+++ b/vendors/move/crates/move-explain/src/main.rs
@@ -0,0 +1,56 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Parser;
+use move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION;
+use move_core_types::{
+    account_address::AccountAddress, errmap::ErrorMapping, identifier::Identifier,
+    language_storage::ModuleId,
+};
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// The location (module id) returned with a `MoveAbort` error
+    #[clap(long = "location", short = 'l')]
+    location: String,
+    /// The abort code returned with a `MoveAbort` error
+    #[clap(long = "abort-code", short = 'a')]
+    abort_code: u64,
+    /// Path to the error code mapping file
+    #[clap(long = MOVE_ERROR_DESC_EXTENSION, short = 'e')]
+    errmap_path: String,
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let mut location = args.location.trim().split("::");
+    let mut address_literal = location.next().expect("Could not find address").to_string();
+    let module_name = location
+        .next()
+        .expect("Could not find module name")
+        .to_string();
+    if !address_literal.starts_with("0x") {
+        address_literal = format!("0x{}", address_literal);
+    }
+    let module_id = ModuleId::new(
+        AccountAddress::from_hex_literal(&address_literal).expect("Unable to parse module address"),
+        Identifier::new(module_name).expect("Invalid module name encountered"),
+    );
+
+    let errmap_bytes = std::fs::read(&args.errmap_path).expect("Could not load errmap from file");
+    let errmap: ErrorMapping =
+        bcs::from_bytes(&errmap_bytes).expect("Failed to deserialize errmap");
+
+    match errmap.get_explanation(&module_id, args.abort_code) {
+        None => println!(
+            "Unable to find a description for {}::{}",
+            args.location, args.abort_code
+        ),
+        Some(error_desc) => println!(
+            "Name: {}\nDescription: {}",
+            error_desc.code_name, error_desc.code_description,
+        ),
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/Cargo.toml b/vendors/move/crates/move-ir-compiler-transactional-tests/Cargo.toml
new file mode 100644
index 000000000..865ca5bfe
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "move-ir-compiler-transactional-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-transactional-test-runner.workspace = true
+
+[[test]]
+name = "tests"
+harness = false
+
+[dependencies]
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.exp
new file mode 100644
index 000000000..b1840c759
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.exp
@@ -0,0 +1,64 @@
+processed 2 tasks
+
+task 0 'print-bytecode'. lines 1-31:
+// Move bytecode v6
+module 3d10.Example {
+struct Coin {
+	value: u64
+}
+
+public value(Arg0: &Coin): u64 {
+B0:
+	0: MoveLoc[0](Arg0: &Coin)
+	1: ImmBorrowField[0](Coin.value: u64)
+	2: StLoc[1](loc0: &u64)
+	3: MoveLoc[1](loc0: &u64)
+	4: ReadRef
+	5: Ret
+}
+public deposit(Arg0: &mut Coin, Arg1: Coin) {
+L0:	loc2: &Coin
+L1:	loc3: u64
+L2:	loc4: u64
+L3:	loc5: u64
+B0:
+	0: MoveLoc[0](Arg0: &mut Coin)
+	1: MutBorrowField[0](Coin.value: u64)
+	2: StLoc[2](loc0: &mut u64)
+	3: CopyLoc[2](loc0: &mut u64)
+	4: ReadRef
+	5: StLoc[3](loc1: u64)
+	6: ImmBorrowLoc[1](Arg1: Coin)
+	7: StLoc[4](loc2: &Coin)
+	8: MoveLoc[4](loc2: &Coin)
+	9: Call value(&Coin): u64
+	10: StLoc[5](loc3: u64)
+	11: CopyLoc[3](loc1: u64)
+	12: CopyLoc[5](loc3: u64)
+	13: Add
+	14: StLoc[6](loc4: u64)
+	15: MoveLoc[6](loc4: u64)
+	16: MoveLoc[2](loc0: &mut u64)
+	17: WriteRef
+	18: MoveLoc[1](Arg1: Coin)
+	19: Unpack[0](Coin)
+	20: StLoc[7](loc5: u64)
+	21: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 33-46:
+// Move bytecode v6
+module 4d10.M {
+
+
+entry public f() {
+B0:
+	0: Ret
+}
+entry public g() {
+B0:
+	0: Call f()
+	1: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.mvir
new file mode 100644
index 000000000..9ad6417f6
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/function.mvir
@@ -0,0 +1,46 @@
+//# print-bytecode
+// This module defines several public functions with complex bodies.
+// This can be thought of as a smoke test that tests many different aspects of bytecode generation.
+module 0x3d10.Example {
+    struct Coin { value: u64 }
+
+    public value(this: &Self.Coin): u64 {
+        let value_ref: &u64;
+    label b0:
+        value_ref = &move(this).Coin::value;
+        return *move(value_ref);
+    }
+
+    public deposit(this: &mut Self.Coin, check: Self.Coin) {
+        let value_ref: &mut u64;
+        let value: u64;
+        let check_ref: &Self.Coin;
+        let check_value: u64;
+        let new_value: u64;
+        let i: u64;
+    label b0:
+        value_ref = &mut move(this).Coin::value;
+        value = *copy(value_ref);
+        check_ref = &check;
+        check_value = Self.value(move(check_ref));
+        new_value = copy(value) + copy(check_value);
+        *move(value_ref) = move(new_value);
+        Coin { value: i } = move(check);
+        return;
+    }
+}
+
+//# print-bytecode
+// Functions may be declared with entry modifier
+module 0x4d10.M {
+    public entry f() {
+    label b0:
+        return;
+    }
+
+    public entry g() {
+    label b0:
+        Self.f();
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.exp
new file mode 100644
index 000000000..dac26494f
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.exp
@@ -0,0 +1,16 @@
+processed 2 tasks
+
+task 0 'print-bytecode'. lines 1-9:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 11-20:
+Error: variable redefinition x
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.mvir
new file mode 100644
index 000000000..5f699b22e
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/declarations/let.mvir
@@ -0,0 +1,20 @@
+//# print-bytecode
+module 0x1.m {
+// `let` generates a local with the given type.
+entry foo() {
+    let x: u64;
+label b0:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x1.m {
+// Two `let` cannot use the same name for a local.
+entry foo() {
+    let x: u64;
+    let x: u64;
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.exp
new file mode 100644
index 000000000..97170bbb4
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.exp
@@ -0,0 +1,23 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-13:
+// Move bytecode v6
+module e.Expressions {
+
+
+binary_add() {
+L0:	loc0: u64
+L1:	loc1: u64
+L2:	loc2: u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: LdU64(5)
+	3: StLoc[1](loc1: u64)
+	4: MoveLoc[0](loc0: u64)
+	5: MoveLoc[1](loc1: u64)
+	6: Add
+	7: StLoc[2](loc2: u64)
+	8: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.mvir
new file mode 100644
index 000000000..02c496beb
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/binary_add.mvir
@@ -0,0 +1,13 @@
+//# print-bytecode
+module 0xE.Expressions {
+    binary_add() {
+        let x: u64;
+        let y: u64;
+        let z: u64;
+    label b0:
+        x = 3;
+        y = 5;
+        z = move(x) + move(y);
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.exp
new file mode 100644
index 000000000..84c506ba5
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.exp
@@ -0,0 +1,115 @@
+processed 9 tasks
+
+task 0 'print-bytecode'. lines 1-13:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+L1:	loc1: &u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: ImmBorrowLoc[0](loc0: u64)
+	3: StLoc[1](loc1: &u64)
+	4: MoveLoc[1](loc1: &u64)
+	5: Pop
+	6: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 15-28:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+L0:	loc0: u64
+L1:	loc1: &u64
+L2:	loc2: &u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: ImmBorrowLoc[0](loc0: u64)
+	3: StLoc[1](loc1: &u64)
+	4: ImmBorrowLoc[1](loc1: &u64)
+	5: StLoc[2](loc2: &u64)
+	6: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 30-63:
+// Move bytecode v6
+module 1d4.M {
+struct T {
+	u: u64
+}
+
+f(Arg0: &T) {
+B0:
+	0: MoveLoc[0](Arg0: &T)
+	1: ImmBorrowField[0](T.u: u64)
+	2: StLoc[1](loc0: &u64)
+	3: MoveLoc[1](loc0: &u64)
+	4: Pop
+	5: Ret
+}
+g(Arg0: &mut T) {
+B0:
+	0: MoveLoc[0](Arg0: &mut T)
+	1: ImmBorrowField[0](T.u: u64)
+	2: StLoc[1](loc0: &u64)
+	3: MoveLoc[1](loc0: &u64)
+	4: Pop
+	5: Ret
+}
+public h(Arg0: &mut T) {
+B0:
+	0: MoveLoc[0](Arg0: &mut T)
+	1: MutBorrowField[0](T.u: u64)
+	2: StLoc[1](loc0: &mut u64)
+	3: MoveLoc[1](loc0: &mut u64)
+	4: Pop
+	5: Ret
+}
+}
+
+task 3 'print-bytecode'. lines 65-84:
+// Move bytecode v6
+module 2d4.M {
+struct T<Ty0> {
+	u: Ty0
+}
+
+f(Arg0: &T<u64>) {
+B0:
+	0: MoveLoc[0](Arg0: &T<u64>)
+	1: ImmBorrowFieldGeneric[0](T.u: Ty0)
+	2: StLoc[1](loc0: &u64)
+	3: MoveLoc[1](loc0: &u64)
+	4: Pop
+	5: Ret
+}
+g(Arg0: &mut T<u128>) {
+B0:
+	0: MoveLoc[0](Arg0: &mut T<u128>)
+	1: ImmBorrowFieldGeneric[1](T.u: Ty0)
+	2: StLoc[1](loc0: &u128)
+	3: MoveLoc[1](loc0: &u128)
+	4: Pop
+	5: Ret
+}
+}
+
+task 5 'print-bytecode'. lines 97-112:
+Error: Unbound struct Self.T
+
+task 6 'print-bytecode'. lines 114-125:
+Error: Unbound struct Self.T
+
+task 7 'print-bytecode'. lines 127-142:
+Error: Unbound struct Self.T
+
+task 8 'print-bytecode'. lines 144-154:
+Error: Unbound module alias M
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.mvir
new file mode 100644
index 000000000..d73a45b61
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow.mvir
@@ -0,0 +1,154 @@
+//# print-bytecode
+module 0x1.m {
+// Borrowing a local produces a reference type.
+entry foo() {
+    let x: u64;
+    let ref_x: &u64;
+label b0:
+    x = 3;
+    ref_x = &x;
+    _ = move(ref_x);
+    return;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+// Borrowing a local reference produces a reference type.
+entry foo() {
+    let x: u64;
+    let ref_x: &u64;
+    let ref_ref_x: &u64;
+label b0:
+    x = 3;
+    ref_x = &x;
+    ref_ref_x = &ref_x;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x1d4.M {
+    struct T { u: u64 }
+
+    // An immutable borrow, of a field on an immutable reference to a struct,
+    // produces an immutable reference type.
+    f(t: &Self.T) {
+        let r: &u64;
+    label b0:
+        r = &move(t).T::u;
+        _ = move(r);
+        return;
+    }
+
+    // An immutable borrow, of a field on a mutable reference to a struct,
+    // produces an immutable reference type.
+    g(t: &mut Self.T) {
+        let r: &u64;
+    label b0:
+        r = &move(t).T::u;
+        _ = move(r);
+        return;
+    }
+
+    // A mutable borrow, of a field on a mutable reference to a struct,
+    // produces an mutable reference type.
+    public h(t: &mut Self.T) {
+        let r: &mut u64;
+    label b0:
+        r = &mut move(t).T::u;
+        _ = move(r);
+        return;
+    }
+}
+
+//# print-bytecode
+module 0x2d4.M {
+    struct T<U> { u: U }
+
+    f(t: &Self.T<u64>) {
+        let r: &u64;
+    label b0:
+        r = &move(t).T<u64>::u;
+        _ = move(r);
+        return;
+    }
+
+    g(t: &mut Self.T<u128>) {
+        let r: &u128;
+    label b0:
+        r = &move(t).T<u128>::u;
+        _ = move(r);
+        return;
+    }
+}
+
+//# publish
+module 0x3d4.M {
+    struct T has key { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+}
+
+
+//# print-bytecode
+// Attempting an immutable borrow of the field of a struct type defined in a
+// separate module is invalid.
+module 0x3d4.N {
+    import 0x1.signer;
+    import 0x3d4.M;
+
+    f(account: signer) {
+        let t: M.T;
+        let r: &bool;
+    label b0:
+        t = M.new();
+        _ = &(&mut t).T::b;
+        return;
+    }
+}
+
+//# print-bytecode
+module 0x1.m {
+import 0x3d4.M;
+entry foo(account: signer) {
+    let t: M.T;
+    let r: &bool;
+label b0:
+    t = M.new();
+    _ = &(&mut t).T::b;
+    return;
+}
+}
+
+//# print-bytecode
+// Attempting a mutable borrow of the field of a struct type defined in a
+// separate module is invalid.
+module 0x3d4.O {
+    import 0x1.signer;
+    import 0x3d4.M;
+
+    f(account: signer) {
+        let t: M.T;
+        let r: &bool;
+    label b0:
+        t = M.new();
+        _ = &mut (&mut t).T::b;
+        return;
+    }
+}
+
+//# print-bytecode
+module 0x1.m {
+entry foo(account: signer) {
+    let t: M.T;
+    let r: &bool;
+label b0:
+    t = M.new();
+    _ = &mut (&mut t).T::b;
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp
new file mode 100644
index 000000000..9532158c0
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp
@@ -0,0 +1,57 @@
+processed 3 tasks
+
+task 0 'print-bytecode'. lines 1-12:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+L1:	loc1: &mut u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: MutBorrowLoc[0](loc0: u64)
+	3: StLoc[1](loc1: &mut u64)
+	4: LdU64(42)
+	5: MoveLoc[1](loc1: &mut u64)
+	6: WriteRef
+	7: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 14-25:
+// Move bytecode v6
+module 3d.Foobar {
+struct FooCoin {
+	value: u64
+}
+
+public borrow_mut_field(Arg0: &mut FooCoin) {
+B0:
+	0: MoveLoc[0](Arg0: &mut FooCoin)
+	1: MutBorrowField[0](FooCoin.value: u64)
+	2: StLoc[1](loc0: &mut u64)
+	3: MoveLoc[1](loc0: &mut u64)
+	4: Pop
+	5: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 27-38:
+// Move bytecode v6
+module 4d.Foobar {
+struct FooCoin<Ty0> {
+	value: u64
+}
+
+public borrow_mut_field(Arg0: &mut FooCoin<address>) {
+B0:
+	0: MoveLoc[0](Arg0: &mut FooCoin<address>)
+	1: MutBorrowFieldGeneric[0](FooCoin.value: u64)
+	2: StLoc[1](loc0: &mut u64)
+	3: MoveLoc[1](loc0: &mut u64)
+	4: Pop
+	5: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.mvir
new file mode 100644
index 000000000..ee34b463c
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/borrow_mut.mvir
@@ -0,0 +1,38 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+    let x: u64;
+    let ref_x: &mut u64;
+label b0:
+    x = 3;
+    ref_x = &mut x;
+    *move(ref_x) = 42;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x3d.Foobar {
+    struct FooCoin { value: u64 }
+
+    public borrow_mut_field(arg: &mut Self.FooCoin) {
+        let field_ref: &mut u64;
+    label b0:
+        field_ref = &mut move(arg).FooCoin::value;
+        _ = move(field_ref);
+        return;
+    }
+}
+
+//# print-bytecode
+module 0x4d.Foobar {
+    struct FooCoin<T> { value: u64 }
+
+    public borrow_mut_field(arg: &mut Self.FooCoin<address>) {
+        let field_ref: &mut u64;
+    label b0:
+        field_ref = &mut move(arg).FooCoin<address>::value;
+        _ = move(field_ref);
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp
new file mode 100644
index 000000000..ec636e764
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp
@@ -0,0 +1,61 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-33:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: vector<u64>
+L1:	loc1: &vector<u64>
+L2:	loc2: &mut vector<u64>
+L3:	loc3: u64
+L4:	loc4: &u64
+L5:	loc5: &mut u64
+B0:
+	0: VecPack(2, 0)
+	1: StLoc[0](loc0: vector<u64>)
+	2: ImmBorrowLoc[0](loc0: vector<u64>)
+	3: StLoc[1](loc1: &vector<u64>)
+	4: CopyLoc[1](loc1: &vector<u64>)
+	5: VecLen(2)
+	6: StLoc[3](loc3: u64)
+	7: MoveLoc[1](loc1: &vector<u64>)
+	8: Pop
+	9: MutBorrowLoc[0](loc0: vector<u64>)
+	10: StLoc[2](loc2: &mut vector<u64>)
+	11: CopyLoc[2](loc2: &mut vector<u64>)
+	12: LdU64(0)
+	13: VecPushBack(2)
+	14: CopyLoc[2](loc2: &mut vector<u64>)
+	15: LdU64(1)
+	16: VecPushBack(2)
+	17: CopyLoc[2](loc2: &mut vector<u64>)
+	18: LdU64(0)
+	19: VecImmBorrow(2)
+	20: StLoc[4](loc4: &u64)
+	21: MoveLoc[4](loc4: &u64)
+	22: Pop
+	23: CopyLoc[2](loc2: &mut vector<u64>)
+	24: LdU64(1)
+	25: VecMutBorrow(2)
+	26: StLoc[5](loc5: &mut u64)
+	27: MoveLoc[5](loc5: &mut u64)
+	28: Pop
+	29: CopyLoc[2](loc2: &mut vector<u64>)
+	30: LdU64(0)
+	31: LdU64(1)
+	32: VecSwap(2)
+	33: CopyLoc[2](loc2: &mut vector<u64>)
+	34: VecPopBack(2)
+	35: Pop
+	36: CopyLoc[2](loc2: &mut vector<u64>)
+	37: VecPopBack(2)
+	38: Pop
+	39: MoveLoc[2](loc2: &mut vector<u64>)
+	40: Pop
+	41: MoveLoc[0](loc0: vector<u64>)
+	42: VecUnpack(2, 0)
+	43: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.mvir
new file mode 100644
index 000000000..607bb21e0
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/builtins/vector.mvir
@@ -0,0 +1,33 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+    let v: vector<u64>;
+    let v_imm: &vector<u64>;
+    let v_mut: &mut vector<u64>;
+    let v_len: u64;
+    let e_imm: &u64;
+    let e_mut: &mut u64;
+label b0:
+    v = vec_pack_0<u64>();
+    v_imm = &v;
+    v_len = vec_len<u64>(copy(v_imm));
+    _ = move(v_imm);
+
+    v_mut = &mut v;
+    vec_push_back<u64>(copy(v_mut), 0);
+    vec_push_back<u64>(copy(v_mut), 1);
+
+    e_imm = vec_imm_borrow<u64>(copy(v_mut), 0);
+    _ = move(e_imm);
+    e_mut = vec_mut_borrow<u64>(copy(v_mut), 1);
+    _ = move(e_mut);
+
+    vec_swap<u64>(copy(v_mut), 0, 1);
+    _ = vec_pop_back<u64>(copy(v_mut));
+    _ = vec_pop_back<u64>(copy(v_mut));
+    _ = move(v_mut);
+
+    vec_unpack_0<u64>(move(v));
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.exp
new file mode 100644
index 000000000..9244d56a3
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.exp
@@ -0,0 +1,27 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-13:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+L1:	loc1: u64
+L2:	loc2: u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: LdU64(5)
+	3: StLoc[1](loc1: u64)
+	4: MoveLoc[0](loc0: u64)
+	5: CopyLoc[1](loc1: u64)
+	6: LdU64(5)
+	7: Mul
+	8: Add
+	9: CopyLoc[1](loc1: u64)
+	10: Sub
+	11: StLoc[2](loc2: u64)
+	12: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.mvir
new file mode 100644
index 000000000..103f0b2bd
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/combined.mvir
@@ -0,0 +1,13 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x = 3;
+    y = 5;
+    z = move(x) + copy(y) * 5 - copy(y);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.exp
new file mode 100644
index 000000000..de02fcd4a
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.exp
@@ -0,0 +1,22 @@
+processed 3 tasks
+
+task 0 'print-bytecode'. lines 1-9:
+// Move bytecode v6
+module 2d20.M {
+struct T {
+	u: u64
+}
+
+f(): T {
+B0:
+	0: LdU64(0)
+	1: Pack[0](T)
+	2: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 11-20:
+Error: Unbound field x
+
+task 2 'print-bytecode'. lines 22-31:
+Error: Field y defined out of order for struct T
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.mvir
new file mode 100644
index 000000000..7040b18c1
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/pack.mvir
@@ -0,0 +1,31 @@
+//# print-bytecode
+module 0x2d20.M {
+    struct T { u: u64 }
+
+    f(): Self.T {
+    label b0:
+        return T { u: 0 };
+    }
+}
+
+//# print-bytecode
+module 0x3d20.M {
+    struct T { u: u64, v: u128 }
+
+    // A pack expression must use the correct field names.
+    f(): Self.T {
+    label b0:
+        return T { x: 1, y: 2 };
+    }
+}
+
+//# print-bytecode
+module 0x4d20.M {
+    struct T { x: u64, y: u64 }
+
+    // A pack expression must refer to the fields in the correct order.
+    f(): Self.T {
+    label b0:
+        return T { y: 1, x: 2 };
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.exp
new file mode 100644
index 000000000..8d57922ac
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.exp
@@ -0,0 +1,30 @@
+processed 3 tasks
+
+task 0 'print-bytecode'. lines 1-18:
+// Move bytecode v6
+module 1d12.M {
+struct T {
+	b: bool
+}
+
+new(): T {
+B0:
+	0: LdTrue
+	1: Pack[0](T)
+	2: Ret
+}
+f() {
+L0:	loc0: T
+L1:	loc1: bool
+B0:
+	0: Call new(): T
+	1: StLoc[0](loc0: T)
+	2: MoveLoc[0](loc0: T)
+	3: Unpack[0](T)
+	4: StLoc[1](loc1: bool)
+	5: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 31-44:
+Error: Missing struct definition for T
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.mvir
new file mode 100644
index 000000000..e4521b5c7
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/expressions/unpack.mvir
@@ -0,0 +1,44 @@
+//# print-bytecode
+module 0x1d12.M {
+    struct T { b: bool }
+
+    new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+
+    f() {
+        let t: Self.T;
+        let b: bool;
+    label b0:
+        t = Self.new();
+        T { b } = move(t);
+        return;
+    }
+}
+
+//# publish
+module 0x2d12.M {
+    struct T { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T { b: true };
+    }
+}
+
+
+//# print-bytecode
+// An unpack expression cannot reference a struct type defined in a separate module.
+module 0x2d12.N {
+    import 0x2d12.M;
+
+    f() {
+        let t: M.T;
+        let b: bool;
+    label b0:
+        t = M.new();
+        T { b } = move(t);
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.exp
new file mode 100644
index 000000000..beb16ac89
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.exp
@@ -0,0 +1,24 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-10:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(3)
+	1: StLoc[0](loc0: u64)
+	2: CopyLoc[0](loc0: u64)
+	3: LdU64(2)
+	4: Gt
+	5: Not
+	6: BrFalse(9)
+B1:
+	7: LdU64(42)
+	8: Abort
+B2:
+	9: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.mvir
new file mode 100644
index 000000000..b68fffd47
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assert.mvir
@@ -0,0 +1,10 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+    let x: u64;
+label b0:
+    x = 3;
+    assert(copy(x) > 2, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.exp
new file mode 100644
index 000000000..d0c64f05b
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-9:
+Error: variable x undefined
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.mvir
new file mode 100644
index 000000000..01d67d43a
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/assign.mvir
@@ -0,0 +1,9 @@
+//# print-bytecode
+module 0x1.m {
+// Un-declared locals cannot be assigned to.
+entry foo() {
+label b0:
+    x = 0;
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.exp
new file mode 100644
index 000000000..7e2bd210c
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'print-bytecode'. lines 1-8:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+B0:
+	0: Branch(0)
+}
+}
+
+task 1 'print-bytecode'. lines 10-19:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+B0:
+	0: Branch(1)
+B1:
+	1: Branch(0)
+}
+}
+
+task 2 'print-bytecode'. lines 21-32:
+Error: Invalid block labels, labels were used without being declared (bar)
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.mvir
new file mode 100644
index 000000000..098073027
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump.mvir
@@ -0,0 +1,32 @@
+//# print-bytecode
+module 0x1.m {
+// An endless loop is valid Move IR.
+entry foo() {
+label loop:
+    jump loop;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+// Jumping to a label that is declared after the jump statement itself is valid.
+entry foo() {
+label foo:
+    jump bar;
+label bar:
+    jump foo;
+}
+}
+
+//# print-bytecode
+// Jumping to a label that isn't declared in the same function is invalid.
+module 0x1.M {
+    f() {
+    label foo:
+        jump bar;
+    }
+    g() {
+    label bar:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.exp
new file mode 100644
index 000000000..b8a5eaa52
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.exp
@@ -0,0 +1,110 @@
+processed 4 tasks
+
+task 0 'print-bytecode'. lines 1-24:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(42)
+	1: LdU64(0)
+	2: Gt
+	3: BrTrue(5)
+B1:
+	4: Branch(8)
+B2:
+	5: LdU64(1)
+	6: StLoc[0](loc0: u64)
+	7: Branch(11)
+B3:
+	8: LdU64(2)
+	9: StLoc[0](loc0: u64)
+	10: Branch(11)
+B4:
+	11: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 26-45:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(42)
+	1: LdU64(0)
+	2: Gt
+	3: BrTrue(7)
+B1:
+	4: LdU64(2)
+	5: StLoc[0](loc0: u64)
+	6: Branch(9)
+B2:
+	7: LdU64(1)
+	8: StLoc[0](loc0: u64)
+B3:
+	9: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 47-65:
+// Move bytecode v6
+module 3.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(0)
+	1: LdU64(1)
+	2: Lt
+	3: BrTrue(7)
+B1:
+	4: LdU64(0)
+	5: StLoc[0](loc0: u64)
+	6: Branch(16)
+B2:
+	7: LdU64(2)
+	8: LdU64(1)
+	9: Gt
+	10: BrTrue(14)
+B3:
+	11: LdU64(1)
+	12: StLoc[0](loc0: u64)
+	13: Branch(16)
+B4:
+	14: LdU64(2)
+	15: StLoc[0](loc0: u64)
+B5:
+	16: Ret
+}
+}
+
+task 3 'print-bytecode'. lines 67-82:
+// Move bytecode v6
+module 4.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(0)
+	1: LdU64(1)
+	2: Neq
+	3: BrTrue(7)
+B1:
+	4: LdU64(1)
+	5: StLoc[0](loc0: u64)
+	6: Branch(10)
+B2:
+	7: LdU64(2)
+	8: StLoc[0](loc0: u64)
+	9: Ret
+B3:
+	10: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.mvir
new file mode 100644
index 000000000..f28d2c2cb
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if.mvir
@@ -0,0 +1,82 @@
+//# print-bytecode
+module 0x1.m {
+// This is roughly equivalent to the following Move program:
+// ```
+// if (42 > 0) { x = 1; } else { x = 2; }
+// return;
+// ```
+// This program uses `jump` statements between blocks, which is valid. Each
+// `jump` statement is translated to a bytecode instruction.
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (42 > 0) b1;
+    jump b2;
+label b1:
+    x = 1;
+    jump b3;
+label b2:
+    x = 2;
+    jump b3;
+label b3:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+// This is roughly equivalent to the following Move program:
+// ```
+// if (42 > 0) { x = 1; } else { x = 2; }
+// return;
+// ```
+// This program uses fallthrough instead of `jump` statements.
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (42 > 0) b1;
+    x = 2;
+    jump b2;
+label b1:
+    x = 1;
+label b2:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x3.m {
+// `jump_if` statements can be sequenced, akin to "nested" `if` statements in Move.
+entry foo() {
+    let x: u64;
+label begin:
+    jump_if (0 < 1) then_0;
+    x = 0;
+    jump end;
+label then_0:
+    jump_if (2 > 1) then_1;
+    x = 1;
+    jump end;
+label then_1:
+    x = 2;
+label end:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x4.m {
+// `return` statements can appear anywhere, including within a jump destination's block.
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (0 != 1) b1;
+    x = 1;
+    jump b2;
+label b1:
+    x = 2;
+    return;
+label b2:
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp
new file mode 100644
index 000000000..8044824dc
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp
@@ -0,0 +1,84 @@
+processed 4 tasks
+
+task 0 'print-bytecode'. lines 1-20:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(0)
+	1: StLoc[0](loc0: u64)
+B1:
+	2: CopyLoc[0](loc0: u64)
+	3: LdU64(5)
+	4: Lt
+	5: BrFalse(11)
+B2:
+	6: CopyLoc[0](loc0: u64)
+	7: LdU64(1)
+	8: Add
+	9: StLoc[0](loc0: u64)
+	10: Branch(2)
+B3:
+	11: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 22-36:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+L0:	loc0: u64
+B0:
+	0: LdU64(0)
+	1: StLoc[0](loc0: u64)
+B1:
+	2: LdTrue
+	3: BrFalse(6)
+B2:
+	4: Ret
+B3:
+	5: Branch(2)
+B4:
+	6: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 38-48:
+// Move bytecode v6
+module 3.m {
+
+
+entry foo() {
+B0:
+	0: LdTrue
+	1: BrFalse(3)
+B1:
+	2: Branch(3)
+B2:
+	3: Ret
+}
+}
+
+task 3 'print-bytecode'. lines 50-63:
+// Move bytecode v6
+module 4.m {
+
+
+entry foo() {
+B0:
+	0: Branch(2)
+B1:
+	1: Branch(0)
+B2:
+	2: Branch(4)
+B3:
+	3: Branch(0)
+B4:
+	4: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.mvir
new file mode 100644
index 000000000..0df1612cc
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/statements/jump_if_false.mvir
@@ -0,0 +1,63 @@
+//# print-bytecode
+module 0x1.m {
+// This is roughly equivalent to the following Move program:
+// ```
+// let x: u64 = 0;
+// while (x < 5) { x = x + 1; }
+// return;
+// ```
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label b1:
+    jump_if_false (copy(x) < 5) b2;
+    x = copy(x) + 1;
+    jump b1;
+label b2:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+// `return` statements can appear anywhere, even within a loop.
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label b1:
+    jump_if_false (true) b2;
+    return;
+    jump b1;
+label b2:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x3.m {
+// This is roughly equivalent to the following Move code: `while (true) { break; }`.
+entry foo() {
+label b0:
+    jump_if_false (true) b2;
+    jump b2;
+label b2:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x4.m {
+// This is roughly equivalent to the following Move code: `loop { loop { break; } break; }`.
+entry foo() {
+label b0:
+    jump b1;
+    jump b0;
+label b1:
+    jump b2;
+    jump b0;
+label b2:
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.exp
new file mode 100644
index 000000000..9b676c8f1
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-8:
+Error: Unbound struct Self.M
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.mvir
new file mode 100644
index 000000000..804ed3767
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/bytecode-generation/types/struct.mvir
@@ -0,0 +1,8 @@
+//# print-bytecode
+// Module names cannot be used as types.
+module 0x1d20.M {
+    f(m: Self.M) {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.exp
new file mode 100644
index 000000000..72bc6b652
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.exp
@@ -0,0 +1,59 @@
+processed 6 tasks
+
+task 0 'print-bytecode'. lines 1-8:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 10-18:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 20-26:
+// Move bytecode v6
+module 3.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 3 'print-bytecode'. lines 28-35:
+// Move bytecode v6
+module 4.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 4 'print-bytecode'. lines 37-46:
+Error: ParserError: Invalid Token: invalid token kind for statement Slash
+
+task 5 'print-bytecode'. lines 48-58:
+// Move bytecode v6
+module 6.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.mvir
new file mode 100644
index 000000000..91441a986
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/comments.mvir
@@ -0,0 +1,58 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+label b0:
+    // return;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+entry foo() {
+label b0:
+    // return;
+    // return;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x3.m {
+entry foo() {
+label b0:
+    return; // return;
+}
+}
+
+//# print-bytecode
+module 0x4.m {
+entry foo() {
+label b0:
+    // return;
+    return; // return;
+}
+}
+
+//# print-bytecode
+module 0x5.m {
+// In Move, /* */ are block comment delimiters. Not so in Move IR, so the `/*` below
+// cannot be parsed.
+entry foo() {
+label b0:
+    return;
+    /* return; */
+}
+}
+
+//# print-bytecode
+module 0x6.m {
+// Since /* */ are not block comment delimiters, they do not behave in any unique way when
+// they appear within comments.
+entry foo() {
+label b0:
+    // /*
+    return;
+    // */
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.exp
new file mode 100644
index 000000000..72bc6b652
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.exp
@@ -0,0 +1,59 @@
+processed 6 tasks
+
+task 0 'print-bytecode'. lines 1-8:
+// Move bytecode v6
+module 1.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 10-18:
+// Move bytecode v6
+module 2.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 2 'print-bytecode'. lines 20-26:
+// Move bytecode v6
+module 3.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 3 'print-bytecode'. lines 28-35:
+// Move bytecode v6
+module 4.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
+
+task 4 'print-bytecode'. lines 37-46:
+Error: ParserError: Invalid Token: invalid token kind for statement Slash
+
+task 5 'print-bytecode'. lines 48-58:
+// Move bytecode v6
+module 6.m {
+
+
+entry foo() {
+B0:
+	0: Ret
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.mvir
new file mode 100644
index 000000000..91441a986
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/crlf.mvir
@@ -0,0 +1,58 @@
+//# print-bytecode
+module 0x1.m {
+entry foo() {
+label b0:
+    // return;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+entry foo() {
+label b0:
+    // return;
+    // return;
+    return;
+}
+}
+
+//# print-bytecode
+module 0x3.m {
+entry foo() {
+label b0:
+    return; // return;
+}
+}
+
+//# print-bytecode
+module 0x4.m {
+entry foo() {
+label b0:
+    // return;
+    return; // return;
+}
+}
+
+//# print-bytecode
+module 0x5.m {
+// In Move, /* */ are block comment delimiters. Not so in Move IR, so the `/*` below
+// cannot be parsed.
+entry foo() {
+label b0:
+    return;
+    /* return; */
+}
+}
+
+//# print-bytecode
+module 0x6.m {
+// Since /* */ are not block comment delimiters, they do not behave in any unique way when
+// they appear within comments.
+entry foo() {
+label b0:
+    // /*
+    return;
+    // */
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.exp
new file mode 100644
index 000000000..97fa00b88
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-8:
+Error: ParserError: Invalid Token: expected Tok::NameValue
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.mvir
new file mode 100644
index 000000000..b64145bb9
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/keywords.mvir
@@ -0,0 +1,8 @@
+//# print-bytecode
+module 0x1.m {
+// `label` is a keyword so it cannot be used as a parameter name.
+entry foo(label: address) {
+label b0:
+    return;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.exp
new file mode 100644
index 000000000..4702e5335
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.exp
@@ -0,0 +1,4 @@
+processed 1 task
+
+task 0 'print-bytecode'. lines 1-13:
+Error: ParserError: Invalid Token: expected Colon, not LParen
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.mvir
new file mode 100644
index 000000000..26fadb6f7
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/structs.mvir
@@ -0,0 +1,13 @@
+//# print-bytecode
+// A struct declaration cannot contain function declarations (like the syntax for declaring
+// "methods" in other languages).
+module 0x3d8.M {
+    struct T {
+        x: u64,
+
+        f() {
+        label b0:
+            return;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.exp
new file mode 100644
index 000000000..359ce3c8d
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.exp
@@ -0,0 +1,7 @@
+processed 2 tasks
+
+task 0 'print-bytecode'. lines 1-8:
+Error: ParserError: Invalid Token: expected Tok::NameValue
+
+task 1 'print-bytecode'. lines 10-17:
+Error: ParserError: Invalid Token: expected Tok::NameValue
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.mvir
new file mode 100644
index 000000000..068ba2dbb
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/parsing/types.mvir
@@ -0,0 +1,17 @@
+//# print-bytecode
+module 0x1.m {
+// Struct field specifiers in immutable borrows must not be qualified.
+entry foo() {
+label b0:
+    _ = &(&mut t).M.T::f;
+}
+}
+
+//# print-bytecode
+module 0x2.m {
+// Struct field specifiers in mutable borrows must not be qualified.
+entry foo() {
+label b0:
+    _ = &mut (&mut t).M.T::f;
+}
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.exp
new file mode 100644
index 000000000..b134af1ae
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.exp
@@ -0,0 +1 @@
+processed 5 tasks
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.mvir
new file mode 100644
index 000000000..045f250b4
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/conditions.mvir
@@ -0,0 +1,245 @@
+//# init
+// Tests for parsing specifications
+
+// TODO: (DD, 1/6/20) This file could be integrated with the prover test framework
+// in language/move-prover/byte-code-to-boogie/tests
+// so we could run these through boogie.
+
+// Test parsing the conditions themselves relative to return values
+//# publish
+module 0x1.TestConditions {
+
+  struct T has key { i: u64 }
+
+  public ensures_alone()
+  ensures true
+  {
+      label b0: return;
+  }
+
+  public requires_alone()
+  requires true
+  {
+      label b0: return;
+  }
+
+  public aborts_if_alone()
+  aborts_if true   //! postcondition might not hold
+  {
+      label b0: return;
+  }
+
+  public succeeds_if_alone()
+  succeeds_if true
+  {
+      label b0: return;
+  }
+
+  public ensures_with_return(): bool
+  ensures true
+  {
+      label b0: return true;
+  }
+
+  public multiple_ensures()
+  ensures true
+  ensures false
+  ensures true
+  {
+      label b0: return;
+  }
+
+  public all_together_now(): bool
+  requires true
+  requires false
+  ensures true
+  ensures false
+  aborts_if true
+  aborts_if false
+  succeeds_if true
+  succeeds_if false
+  {
+    label b0:
+      return true;
+  }
+
+}
+
+// check that we can parse the language of spec expressions without access paths
+//# publish
+module 0x1.TestSpecExp {
+
+  struct T { b: bool }
+  struct T1<Name> { b: Name }
+
+  public ensures_ret()
+  ensures RET
+  {
+      label b0: return;
+  }
+
+  public ensures_multiple_ret()
+  ensures RET(0)
+  ensures RET(1)
+  {
+      label b0: return;
+  }
+
+
+  public ensures_txn_sender()
+  ensures txn_sender {
+      label b0: return;
+  }
+
+  public ensures_addr()
+  ensures 0x0
+  {
+      label b0: return;
+  }
+
+  public ensures_formal(b: bool)
+  ensures b
+  {
+      label b0: return;
+  }
+
+  public ensures_global(a: address)
+  ensures global<Self.T>(a)
+  {
+      label b0: return;
+  }
+
+
+  public ensures_generic_global(a: address)
+  ensures global<Self.T1<bool>>(a)
+  {
+      label b0: return;
+  }
+
+  public ensures_exists(a: address)
+  ensures global_exists<Self.T>(a)
+  {
+      label b0: return;
+  }
+
+  public ensures_exists_generic(a: address)
+  ensures global_exists<Self.T1<bool>>(a)
+  {
+      label b0: return;
+  }
+
+  public ensures_old(b: bool)
+  ensures old(b)
+  {
+      label b0: return;
+  }
+
+  public ensures_old_global(a: address)
+  ensures old(global<Self.T>(a))
+  {
+      label b0: return;
+  }
+
+}
+
+// check that we can handle the trickier case of access paths
+//# publish
+module 0x1.TestEnsuresAccessPath {
+
+  struct T { b: bool, a: address }
+  struct T1 { y: Self.T }
+  struct T2 { x: Self.T1 }
+
+
+  public ensures_access_path(t: Self.T): Self.T
+  ensures t.b
+  {
+      label b0: return move(t);
+  }
+
+  public ensures_access_path2(t: Self.T1): Self.T1
+  ensures t.y.b
+  {
+      label b0: return move(t);
+  }
+
+  public ensures_access_path3(t: Self.T2): Self.T2
+  ensures t.x.y.b
+  {
+      label b0: return move(t);
+  }
+
+  public ensures_old_access_path(t: Self.T): Self.T
+  ensures old(t.b)
+  {
+      label b0: return move(t);
+  }
+
+  public ensures_exists_access_path(t: Self.T): Self.T
+  ensures global_exists<Self.T>(t.a)
+  {
+      label b0: return move(t);
+  }
+
+  public ensures_global_access_path(t: Self.T): Self.T
+  ensures global<Self.T>(t.a)
+  {
+      label b0: return move(t);
+  }
+
+}
+
+//# publish
+module 0x1.TestBinaryOps {
+  struct T { b: bool }
+  struct Pair { x: u64, y: u64}
+
+  public ret_eq_seven(): u64
+  ensures RET == 7
+  {
+      label b0: return 7;
+  }
+
+  public ret_neq_seven(): u64
+  ensures RET != 7
+  {
+      label b0: return 5;
+  }
+
+  public ret_add(x: u64): u64
+  ensures RET == x + 1
+  {
+      label b0: return move(x) + 1;
+  }
+
+  public ret_sub(x: u64): u64
+  ensures RET - 1 == x
+  {
+      label b0: return move(x) + 1;
+  }
+
+  public ret_unop(x: bool): bool
+  ensures RET == !x
+  {
+      label b0: return !move(x);
+  }
+
+  public ret_access_path_exp(p: &Self.Pair): u64
+  ensures RET == p.x + p.y
+  {
+      label b0: return *&copy(p).Pair::y;
+  }
+
+  public ret_implies(x: u64): u64
+  ensures x >= 4 ==> RET == x % 4
+  ensures x < 4  ==> RET == x
+  {
+      label b0: return move(x) % 4;
+  }
+
+  public ret_spec_function(x: u64): u64
+  ensures some_function(x, x) > RET
+  {
+      label b0: return move(x);
+  }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.exp b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.mvir b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.mvir
new file mode 100644
index 000000000..b2e1c78ef
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/specification/invariants.mvir
@@ -0,0 +1,28 @@
+//# init
+// Tests for parsing invariants in specifications
+
+// Test parsing invariants and synthetics, parsing only.
+//# publish
+module 0x1.TestInvariants {
+
+  synthetic all_values: u128;
+
+  struct SingleInvariant {
+    i: u64,
+    invariant i > 0
+  }
+
+  struct TwoInvariants {
+    i: u64,
+    j: u64,
+    invariant i > 0,
+    invariant j > i
+  }
+
+  struct InvariantWithModifier {
+    i: u64,
+    invariant {update} old(i) < i && all_values == old(old_values) - old(i) + i,
+    invariant {unpack} all_values == old(old_values) - old(i),
+    invariant {pack}   all_values == old(old_values) + i,
+  }
+}
diff --git a/vendors/move/crates/move-ir-compiler-transactional-tests/tests/tests.rs b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/tests.rs
new file mode 100644
index 000000000..1580c737e
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler-transactional-tests/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.mvir$");
diff --git a/vendors/move/crates/move-ir-compiler/Cargo.toml b/vendors/move/crates/move-ir-compiler/Cargo.toml
new file mode 100644
index 000000000..294320c73
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "move-ir-compiler"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move IR to bytecode compiler"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+move-bytecode-verifier.workspace = true
+move-command-line-common.workspace = true
+move-ir-to-bytecode.workspace = true
+move-bytecode-source-map.workspace = true
+move-binary-format.workspace = true
+clap.workspace = true
+serde_json.workspace = true
+
+bcs.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-ir-compiler/README.md b/vendors/move/crates/move-ir-compiler/README.md
new file mode 100644
index 000000000..fb6725b6e
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/README.md
@@ -0,0 +1,81 @@
+---
+id: ir-to-bytecode
+title: Move IR Compiler
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-ir-compiler/README.md
+---
+
+
+## Summary
+
+The Move IR compiler compiles the Move IR down to its bytecode representation.
+
+## Overview
+
+The Move IR compiler compiles modules and scripts written in Move down to
+their respective bytecode representations. The two data types used to
+represent these outputs are `CompiledModule` and `CompiledScript`. These
+data types are defined in [file_format.rs](https://github.com/move-language/move/blob/main/language/move-binary-format/src/file_format.rs).
+
+Beyond translating Move IR to Move bytecode, the compiler's purpose is as a
+testing tool for the bytecode verifier. Because of this, its job is to
+output bytecode programs that correspond as closely as possible to the
+input IR; optimizations and advanced semantic checks are specifically not
+performed during the compilation process. In fact, the compiler goes out of
+its way to push these semantic checks into the bytecode, and compile
+semantically invalid code in the Move IR to equivalent---semantically
+invalid---bytecode programs. The semantics of the compiled bytecode is
+then verified by the [bytecode verifier](https://github.com/move-language/move/blob/main/language/move-bytecode-verifier/README.md). The compiler command line
+automatically calls the bytecode verifier at the end of compilation.
+
+## Command-line options
+
+```text
+USAGE:
+    compiler [FLAGS] [OPTIONS] <source-path>
+
+FLAGS:
+    -h, --help                 Prints help information
+    -l, --list-dependencies    Instead of compiling the source, emit a dependency list of the compiled source
+    -m, --module               Treat input file as a module (default is to treat file as a script)
+        --no-verify            Do not automatically run the bytecode verifier
+        --src-map
+    -V, --version              Prints version information
+
+OPTIONS:
+    -d, --deps <deps-path>    Path to the list of modules that we want to link with
+
+ARGS:
+    <source-path>    Path to the Move IR source to compile
+```
+
+### Example Usage
+
+> cargo build --bin compiler
+
+* This will build the compiler + verifier binary.
+* The binary can be found at `diem/target/debug/compiler`.
+* Alternatively, the binary can be run directly with `cargo run -p compiler`.
+
+To compile and verify `foo.mvir`, which contains a Move IR module:
+> `compiler --address 0x42 --no-stdlib -m foo.mvir`
+
+To compile and verify `bar.mvir`, which contains a transaction script:
+> `compiler --address 0xca --no-stdlib bar.mvir`
+
+## Folder Structure
+
+```text
+compiler                        # Main compiler crate. This depends on stdlib.
+├── ir-to-bytecode              # Core backend compiler logic, independent of stdlib.
+│   ├── src
+│   │   ├── compiler.rs         # Main compiler logic - converts an AST generated by `syntax.rs` to a `CompiledModule` or `CompiledScript`.
+│   │   └── parser.rs           # Wrapper around Move IR syntax crate.
+│   └── syntax                  # Crate containing Move IR syntax.
+│       └── src
+│           ├── ast.rs          # Contains all the data structures used to build the AST representing the parsed Move IR input.
+│           ├── lexer.rs        # Lexer for the Move IR language.
+|           └── syntax.rs       # Parser for the Move IR language.
+└── src
+    ├── main.rs                 # Compiler driver - parses command line options and calls the parser, compiler, and bytecode verifier.
+    └── util.rs                 # Misc compiler utilities.
+```
diff --git a/vendors/move/crates/move-ir-compiler/src/lib.rs b/vendors/move/crates/move-ir-compiler/src/lib.rs
new file mode 100644
index 000000000..030c9e0b8
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/lib.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod util;
+
+#[cfg(test)]
+mod unit_tests;
+
+use anyhow::Result;
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_ir_to_bytecode::{
+    compiler::{compile_module, compile_script},
+    parser::{parse_module, parse_script},
+};
+
+/// An API for the compiler. Supports setting custom options.
+#[derive(Clone, Debug)]
+pub struct Compiler<'a> {
+    /// Extra dependencies to compile with.
+    pub deps: Vec<&'a CompiledModule>,
+}
+
+impl<'a> Compiler<'a> {
+    pub fn new(deps: Vec<&'a CompiledModule>) -> Self {
+        Self { deps }
+    }
+
+    /// Compiles into a `CompiledScript` where the bytecode hasn't been serialized.
+    pub fn into_compiled_script_and_source_map(
+        self,
+        code: &str,
+    ) -> Result<(CompiledScript, SourceMap)> {
+        let (compiled_script, source_map) = self.compile_script(code)?;
+        Ok((compiled_script, source_map))
+    }
+
+    /// Compiles the script into a serialized form.
+    pub fn into_script_blob(self, code: &str) -> Result<Vec<u8>> {
+        let compiled_script = self.compile_script(code)?.0;
+
+        let mut serialized_script = Vec::<u8>::new();
+        compiled_script.serialize(&mut serialized_script)?;
+        Ok(serialized_script)
+    }
+
+    /// Compiles the module.
+    pub fn into_compiled_module(self, code: &str) -> Result<CompiledModule> {
+        Ok(self.compile_mod(code)?.0)
+    }
+
+    /// Compiles the module into a serialized form.
+    pub fn into_module_blob(self, code: &str) -> Result<Vec<u8>> {
+        let compiled_module = self.compile_mod(code)?.0;
+
+        let mut serialized_module = Vec::<u8>::new();
+        compiled_module.serialize(&mut serialized_module)?;
+        Ok(serialized_module)
+    }
+
+    fn compile_script(self, code: &str) -> Result<(CompiledScript, SourceMap)> {
+        let parsed_script = parse_script(code)?;
+        let (compiled_script, source_map) =
+            compile_script(parsed_script, self.deps.iter().copied())?;
+        Ok((compiled_script, source_map))
+    }
+
+    fn compile_mod(self, code: &str) -> Result<(CompiledModule, SourceMap)> {
+        let parsed_module = parse_module(code)?;
+        let (compiled_module, source_map) =
+            compile_module(parsed_module, self.deps.iter().copied())?;
+        Ok((compiled_module, source_map))
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler/src/main.rs b/vendors/move/crates/move-ir-compiler/src/main.rs
new file mode 100644
index 000000000..73cc02fe8
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/main.rs
@@ -0,0 +1,171 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use anyhow::Context;
+use clap::Parser;
+use move_binary_format::{
+    errors::VMError,
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_verifier::{dependencies, verify_module_unmetered, verify_script_unmetered};
+use move_command_line_common::files::{
+    MOVE_COMPILED_EXTENSION, MOVE_IR_EXTENSION, SOURCE_MAP_EXTENSION,
+};
+use move_ir_compiler::util;
+use move_ir_to_bytecode::parser::{parse_module, parse_script};
+use std::{
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// Treat input file as a module (default is to treat file as a script)
+    #[clap(short = 'm', long = "module")]
+    pub module_input: bool,
+    /// Do not automatically run the bytecode verifier
+    #[clap(long = "no-verify")]
+    pub no_verify: bool,
+    /// Path to the Move IR source to compile
+    pub source_path: PathBuf,
+    /// Instead of compiling the source, emit a dependency list of the compiled source
+    #[clap(short = 'l', long = "list-dependencies")]
+    pub list_dependencies: bool,
+    /// Path to the list of modules that we want to link with
+    #[clap(short = 'd', long = "deps")]
+    pub deps_path: Option<String>,
+
+    #[clap(long = "src-map")]
+    pub output_source_maps: bool,
+}
+
+fn print_error_and_exit(verification_error: &VMError) -> ! {
+    println!("Verification failed:");
+    println!("{:?}", verification_error);
+    std::process::exit(1);
+}
+
+fn do_verify_module(module: &CompiledModule, dependencies: &[CompiledModule]) {
+    verify_module_unmetered(module).unwrap_or_else(|err| print_error_and_exit(&err));
+    if let Err(err) = dependencies::verify_module(module, dependencies) {
+        print_error_and_exit(&err);
+    }
+}
+
+fn do_verify_script(script: &CompiledScript, dependencies: &[CompiledModule]) {
+    verify_script_unmetered(script).unwrap_or_else(|err| print_error_and_exit(&err));
+    if let Err(err) = dependencies::verify_script(script, dependencies) {
+        print_error_and_exit(&err);
+    }
+}
+
+fn write_output(path: &Path, buf: &[u8]) {
+    let mut f = fs::File::create(path)
+        .with_context(|| format!("Unable to open output file {:?}", path))
+        .unwrap();
+    f.write_all(buf)
+        .with_context(|| format!("Unable to write to output file {:?}", path))
+        .unwrap();
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let source_path = Path::new(&args.source_path);
+    let mvir_extension = MOVE_IR_EXTENSION;
+    let mv_extension = MOVE_COMPILED_EXTENSION;
+    let source_map_extension = SOURCE_MAP_EXTENSION;
+    let extension = source_path
+        .extension()
+        .expect("Missing file extension for input source file");
+    if extension != mvir_extension {
+        println!(
+            "Bad source file extension {:?}; expected {}",
+            extension, mvir_extension
+        );
+        std::process::exit(1);
+    }
+
+    if args.list_dependencies {
+        let source = fs::read_to_string(args.source_path.clone()).expect("Unable to read file");
+        let dependency_list = if args.module_input {
+            let module = parse_module(&source).expect("Unable to parse module");
+            module.get_external_deps()
+        } else {
+            let script = parse_script(&source).expect("Unable to parse module");
+            script.get_external_deps()
+        };
+        println!(
+            "{}",
+            serde_json::to_string(&dependency_list).expect("Unable to serialize dependencies")
+        );
+        return;
+    }
+
+    let deps_owned = {
+        if let Some(path) = args.deps_path {
+            let deps = fs::read_to_string(path).expect("Unable to read dependency file");
+            let deps_list: Vec<Vec<u8>> =
+                serde_json::from_str(deps.as_str()).expect("Unable to parse dependency file");
+            deps_list
+                .into_iter()
+                .map(|module_bytes| {
+                    let module = CompiledModule::deserialize_with_defaults(module_bytes.as_slice())
+                        .expect("Downloaded module blob can't be deserialized");
+                    verify_module_unmetered(&module)
+                        .expect("Downloaded module blob failed verifier");
+                    module
+                })
+                .collect()
+        } else {
+            vec![]
+        }
+    };
+
+    if args.module_input {
+        let (compiled_module, source_map) = util::do_compile_module(&args.source_path, &deps_owned);
+        if !args.no_verify {
+            do_verify_module(&compiled_module, &deps_owned);
+        }
+
+        if args.output_source_maps {
+            let source_map_bytes =
+                bcs::to_bytes(&source_map).expect("Unable to serialize source maps for module");
+            write_output(
+                &source_path.with_extension(source_map_extension),
+                &source_map_bytes,
+            );
+        }
+
+        let mut module = vec![];
+        compiled_module
+            .serialize(&mut module)
+            .expect("Unable to serialize module");
+        write_output(&source_path.with_extension(mv_extension), &module);
+    } else {
+        let (compiled_script, source_map) = util::do_compile_script(&args.source_path, &deps_owned);
+        if !args.no_verify {
+            do_verify_script(&compiled_script, &deps_owned);
+        }
+
+        if args.output_source_maps {
+            let source_map_bytes =
+                bcs::to_bytes(&source_map).expect("Unable to serialize source maps for script");
+            write_output(
+                &source_path.with_extension(source_map_extension),
+                &source_map_bytes,
+            );
+        }
+
+        let mut script = vec![];
+        compiled_script
+            .serialize(&mut script)
+            .expect("Unable to serialize script");
+        write_output(&source_path.with_extension(mv_extension), &script);
+    }
+}
diff --git a/vendors/move/crates/move-ir-compiler/src/unit_tests/cfg_tests.rs b/vendors/move/crates/move-ir-compiler/src/unit_tests/cfg_tests.rs
new file mode 100644
index 000000000..fda3328e8
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/unit_tests/cfg_tests.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::testutils::compile_script_string;
+use move_binary_format::{
+    access::ScriptAccess,
+    control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
+};
+
+#[test]
+fn cfg_compile_script_ret() {
+    let code = String::from(
+        "
+        main() {
+        label b0:
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 1);
+    assert_eq!(cfg.num_blocks(), 1);
+    assert_eq!(cfg.reachable_from(0).len(), 1);
+}
+
+#[test]
+fn cfg_compile_script_let() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+            let y: u64;
+            let z: u64;
+        label b0:
+            x = 3;
+            y = 5;
+            z = move(x) + copy(y) * 5 - copy(y);
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 1);
+    assert_eq!(cfg.num_blocks(), 1);
+    assert_eq!(cfg.reachable_from(0).len(), 1);
+}
+
+#[test]
+fn cfg_compile_if() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label b0:
+            x = 0;
+            jump_if (42 > 0) b2;
+        label b1:
+            jump b3;
+        label b2:
+            x = 1;
+            jump b3;
+        label b3:
+            return;
+        }
+        ",
+    );
+
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+}
+
+#[test]
+fn cfg_compile_if_else() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+            let y: u64;
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            y = 2;
+            x = 1;
+            jump b3;
+        label b2:
+            x = 1;
+            y = 2;
+            jump b3;
+        label b3:
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+}
+
+#[test]
+fn cfg_compile_if_else_with_else_return() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            return;
+        label b2:
+            x = 1;
+            jump b3;
+        label b3:
+            return;
+        }
+        ",
+    );
+
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+}
+
+#[test]
+fn cfg_compile_nested_if() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label entry:
+            jump_if (42 > 0) if_0_then;
+        label if_0_else:
+            jump_if (5 > 10) if_1_then;
+        label if_1_else:
+            x = 3;
+            jump if_1_cont;
+        label if_1_then:
+            x = 2;
+            jump if_1_cont;
+        label if_1_cont:
+            jump if_0_cont;
+        label if_0_then:
+            x = 1;
+            jump if_0_cont;
+        label if_0_cont:
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 7);
+    assert_eq!(cfg.num_blocks(), 7);
+    assert_eq!(cfg.reachable_from(8).len(), 3);
+}
+
+#[test]
+fn cfg_compile_if_else_with_if_return() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            x = 1;
+            jump b3;
+        label b2:
+            return;
+        label b3:
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+    assert_eq!(cfg.reachable_from(4).len(), 2);
+    assert_eq!(cfg.reachable_from(8).len(), 1);
+}
+
+#[test]
+fn cfg_compile_if_else_with_two_returns() {
+    let code = String::from(
+        "
+        main() {
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            return;
+        label b2:
+            return;
+        label b3:
+            return;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 3);
+    assert_eq!(cfg.reachable_from(4).len(), 1);
+    assert_eq!(cfg.reachable_from(5).len(), 1);
+    assert_eq!(cfg.reachable_from(6).len(), 1);
+}
+
+#[test]
+fn cfg_compile_if_else_with_else_abort() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            abort 0;
+        label b2:
+            x = 1;
+            jump b3;
+        label b3:
+            abort 0;
+        }
+        ",
+    );
+
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+}
+
+#[test]
+fn cfg_compile_if_else_with_if_abort() {
+    let code = String::from(
+        "
+        main() {
+            let x: u64;
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            x = 1;
+            jump b3;
+        label b2:
+            abort 0;
+        label b3:
+            abort 0;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 4);
+    assert_eq!(cfg.reachable_from(4).len(), 2);
+    assert_eq!(cfg.reachable_from(7).len(), 1);
+}
+
+#[test]
+fn cfg_compile_if_else_with_two_aborts() {
+    let code = String::from(
+        "
+        main() {
+        label b0:
+            jump_if (42 > 0) b2;
+        label b1:
+            abort 0;
+        label b2:
+            abort 0;
+        label b3:
+            abort 0;
+        }
+        ",
+    );
+    let compiled_script_res = compile_script_string(&code);
+    let compiled_script = compiled_script_res.unwrap();
+    let cfg: VMControlFlowGraph = VMControlFlowGraph::new(&compiled_script.code().code);
+    println!("SCRIPT:\n {:?}", compiled_script);
+    cfg.display();
+    assert_eq!(cfg.blocks().len(), 4);
+    assert_eq!(cfg.num_blocks(), 4);
+    assert_eq!(cfg.reachable_from(0).len(), 3);
+    assert_eq!(cfg.reachable_from(4).len(), 1);
+    assert_eq!(cfg.reachable_from(6).len(), 1);
+    assert_eq!(cfg.reachable_from(8).len(), 1);
+}
diff --git a/vendors/move/crates/move-ir-compiler/src/unit_tests/function_tests.rs b/vendors/move/crates/move-ir-compiler/src/unit_tests/function_tests.rs
new file mode 100644
index 000000000..a5af5b055
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/unit_tests/function_tests.rs
@@ -0,0 +1,54 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::testutils::compile_module_string;
+use std::fmt::Write;
+
+fn generate_function(name: &str, num_formals: usize, num_locals: usize) -> String {
+    let mut code = format!("public {}(", name);
+
+    code.reserve(30 * (num_formals + num_locals));
+
+    for i in 0..num_formals {
+        write!(&mut code, "formal_{}: u64", i).unwrap();
+        if i < num_formals - 1 {
+            code.push_str(", ");
+        }
+    }
+
+    code.push_str(") {\n");
+
+    for i in 0..num_locals {
+        writeln!(&mut code, "let x_{}: u64;", i).unwrap();
+    }
+    code.push_str("label b0:\n");
+    for i in 0..num_locals {
+        writeln!(&mut code, "x_{} = {};", i, i).unwrap();
+    }
+
+    code.push_str("return;");
+
+    code.push('}');
+
+    code
+}
+
+#[test]
+fn compile_module_with_large_frame() {
+    let mut code = String::from(
+        "
+        module 0x16.Foobar {
+            struct FooCoin { value: u64 }
+        ",
+    );
+
+    // Default metering in place, so use reasonable values. This may need to be changed
+    // when the metering changes, and gives a useful signal.
+    code.push_str(&generate_function("foo_func", 64, 90));
+
+    code.push('}');
+
+    let compiled_module_res = compile_module_string(&code);
+    assert!(compiled_module_res.is_ok());
+}
diff --git a/vendors/move/crates/move-ir-compiler/src/unit_tests/mod.rs b/vendors/move/crates/move-ir-compiler/src/unit_tests/mod.rs
new file mode 100644
index 000000000..e012445e3
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/unit_tests/mod.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Needs to be at the top to allow macros defined in here to be used in tests.
+#[macro_use]
+pub(crate) mod testutils;
+
+mod cfg_tests;
+mod function_tests;
diff --git a/vendors/move/crates/move-ir-compiler/src/unit_tests/testutils.rs b/vendors/move/crates/move-ir-compiler/src/unit_tests/testutils.rs
new file mode 100644
index 000000000..cb633b0dd
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/unit_tests/testutils.rs
@@ -0,0 +1,80 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_binary_format::{
+    errors::{Location, VMError},
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_verifier::{verify_module_unmetered, verify_script_unmetered};
+use move_ir_to_bytecode::{
+    compiler::{compile_module, compile_script},
+    parser::{parse_module, parse_script},
+};
+
+fn compile_script_string_impl(
+    code: &str,
+    deps: Vec<CompiledModule>,
+) -> Result<(CompiledScript, Option<VMError>)> {
+    let parsed_script = parse_script(code).unwrap();
+    let script = compile_script(parsed_script, &deps)?.0;
+
+    let mut serialized_script = Vec::<u8>::new();
+    script.serialize(&mut serialized_script)?;
+    let deserialized_script = CompiledScript::deserialize(&serialized_script)
+        .map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
+    assert_eq!(script, deserialized_script);
+
+    Ok(match verify_script_unmetered(&script) {
+        Ok(_) => (script, None),
+        Err(error) => (script, Some(error)),
+    })
+}
+
+fn compile_script_string_and_assert_no_error(
+    code: &str,
+    deps: Vec<CompiledModule>,
+) -> Result<CompiledScript> {
+    let (verified_script, verification_error) = compile_script_string_impl(code, deps)?;
+    assert!(verification_error.is_none());
+    Ok(verified_script)
+}
+
+pub fn compile_script_string(code: &str) -> Result<CompiledScript> {
+    compile_script_string_and_assert_no_error(code, vec![])
+}
+
+fn compile_module_string_impl(
+    code: &str,
+    deps: Vec<CompiledModule>,
+) -> Result<(CompiledModule, Option<VMError>)> {
+    let module = parse_module(code).unwrap();
+    let compiled_module = compile_module(module, &deps)?.0;
+
+    let mut serialized_module = Vec::<u8>::new();
+    compiled_module.serialize(&mut serialized_module)?;
+    let deserialized_module = CompiledModule::deserialize_with_defaults(&serialized_module)
+        .map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
+    assert_eq!(compiled_module, deserialized_module);
+
+    // Always return a CompiledModule because some callers explicitly care about unverified
+    // modules.
+    Ok(match verify_module_unmetered(&compiled_module) {
+        Ok(_) => (compiled_module, None),
+        Err(error) => (compiled_module, Some(error)),
+    })
+}
+
+fn compile_module_string_and_assert_no_error(
+    code: &str,
+    deps: Vec<CompiledModule>,
+) -> Result<CompiledModule> {
+    let (verified_module, verification_error) = compile_module_string_impl(code, deps)?;
+    assert!(verification_error.is_none());
+    Ok(verified_module)
+}
+
+pub fn compile_module_string(code: &str) -> Result<CompiledModule> {
+    compile_module_string_and_assert_no_error(code, vec![])
+}
diff --git a/vendors/move/crates/move-ir-compiler/src/util.rs b/vendors/move/crates/move-ir-compiler/src/util.rs
new file mode 100644
index 000000000..a27b597f5
--- /dev/null
+++ b/vendors/move/crates/move-ir-compiler/src/util.rs
@@ -0,0 +1,34 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Context;
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_ir_to_bytecode::{
+    compiler::{compile_module, compile_script},
+    parser::{parse_module, parse_script},
+};
+use std::{fs, path::Path};
+
+pub fn do_compile_script(
+    source_path: &Path,
+    dependencies: &[CompiledModule],
+) -> (CompiledScript, SourceMap) {
+    let source = fs::read_to_string(source_path)
+        .with_context(|| format!("Unable to read file: {:?}", source_path))
+        .unwrap();
+    let parsed_script = parse_script(&source).unwrap();
+    compile_script(parsed_script, dependencies).unwrap()
+}
+
+pub fn do_compile_module(
+    source_path: &Path,
+    dependencies: &[CompiledModule],
+) -> (CompiledModule, SourceMap) {
+    let source = fs::read_to_string(source_path)
+        .with_context(|| format!("Unable to read file: {:?}", source_path))
+        .unwrap();
+    let parsed_module = parse_module(&source).unwrap();
+    compile_module(parsed_module, dependencies).unwrap()
+}
diff --git a/vendors/move/crates/move-ir-to-bytecode-syntax/Cargo.toml b/vendors/move/crates/move-ir-to-bytecode-syntax/Cargo.toml
new file mode 100644
index 000000000..062ae4663
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode-syntax/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "move-ir-to-bytecode-syntax"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem ir to bytecode syntax"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+hex.workspace = true
+move-ir-types.workspace = true
+move-core-types.workspace = true
+move-symbol-pool.workspace = true
+move-command-line-common.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-ir-to-bytecode-syntax/src/lexer.rs b/vendors/move/crates/move-ir-to-bytecode-syntax/src/lexer.rs
new file mode 100644
index 000000000..44ef910a0
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode-syntax/src/lexer.rs
@@ -0,0 +1,485 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::syntax::ParseError;
+use move_command_line_common::files::FileHash;
+use move_ir_types::location::*;
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Tok {
+    EOF,
+    AccountAddressValue,
+    U8Value,
+    U16Value,
+    U32Value,
+    U64Value,
+    U128Value,
+    U256Value,
+    NameValue,
+    NameBeginTyValue,
+    DotNameValue,
+    ByteArrayValue,
+    Exclaim,
+    ExclaimEqual,
+    Percent,
+    Amp,
+    AmpAmp,
+    AmpMut,
+    LParen,
+    RParen,
+    Star,
+    Plus,
+    Comma,
+    Minus,
+    Period,
+    Slash,
+    Colon,
+    ColonEqual,
+    Semicolon,
+    Less,
+    LessEqual,
+    LessLess,
+    Equal,
+    EqualEqual,
+    EqualEqualGreater,
+    Greater,
+    GreaterEqual,
+    GreaterGreater,
+    Caret,
+    Underscore,
+    /// Abort statement in the Move language
+    Abort,
+    /// Aborts if in the spec language
+    AbortsIf,
+    As,
+    Assert,
+    Copy,
+    Ensures,
+    False,
+    Freeze,
+    /// Like borrow_global, but for spec language
+    Global,
+    /// Like exists, but for spec language
+    GlobalExists,
+    ToU8,
+    ToU16,
+    ToU32,
+    ToU64,
+    ToU128,
+    ToU256,
+    Import,
+    /// For spec language
+    Invariant,
+    Jump,
+    JumpIf,
+    JumpIfFalse,
+    Label,
+    Let,
+    Main,
+    Module,
+    Move,
+    Native,
+    Old,
+    Public,
+    Script,
+    Friend,
+    Requires,
+    /// Return in the specification language
+    SpecReturn,
+    /// Return statement in the Move language
+    Return,
+    Struct,
+    SucceedsIf,
+    Synthetic,
+    True,
+    VecPack(u64),
+    VecLen,
+    VecImmBorrow,
+    VecMutBorrow,
+    VecPushBack,
+    VecPopBack,
+    VecUnpack(u64),
+    VecSwap,
+    LBrace,
+    Pipe,
+    PipePipe,
+    RBrace,
+    LSquare,
+    RSquare,
+    PeriodPeriod,
+}
+
+impl Tok {
+    /// Return true if the given token is the beginning of a specification directive for the Move
+    /// prover
+    pub fn is_spec_directive(self) -> bool {
+        matches!(
+            self,
+            Tok::Ensures | Tok::Requires | Tok::SucceedsIf | Tok::AbortsIf
+        )
+    }
+}
+
+pub struct Lexer<'input> {
+    pub spec_mode: bool,
+    file_hash: FileHash,
+    text: &'input str,
+    prev_end: usize,
+    cur_start: usize,
+    cur_end: usize,
+    token: Tok,
+}
+
+impl<'input> Lexer<'input> {
+    pub fn new(file_hash: FileHash, s: &'input str) -> Lexer<'input> {
+        Lexer {
+            spec_mode: false, // read tokens without trailing punctuation during specs.
+            file_hash,
+            text: s,
+            prev_end: 0,
+            cur_start: 0,
+            cur_end: 0,
+            token: Tok::EOF,
+        }
+    }
+
+    pub fn peek(&self) -> Tok {
+        self.token
+    }
+
+    pub fn content(&self) -> &'input str {
+        &self.text[self.cur_start..self.cur_end]
+    }
+
+    pub fn file_hash(&self) -> FileHash {
+        self.file_hash
+    }
+
+    pub fn start_loc(&self) -> usize {
+        self.cur_start
+    }
+
+    pub fn previous_end_loc(&self) -> usize {
+        self.prev_end
+    }
+
+    fn trim_whitespace_and_comments(&self) -> &'input str {
+        let mut text = &self.text[self.cur_end..];
+        loop {
+            // Trim the only whitespace characters we recognize: newline, tab, and space.
+            text = text.trim_start_matches("\r\n");
+            text = text.trim_start_matches(|c: char| matches!(c, '\n' | '\t' | ' '));
+            // Trim the only comments we recognize: '// ... \n'.
+            if text.starts_with("//") {
+                text = text.trim_start_matches(|c: char| c != '\n');
+                // Continue the loop on the following line, which may contain leading
+                // whitespace or comments of its own.
+                continue;
+            }
+            break;
+        }
+        text
+    }
+
+    pub fn lookahead(&self) -> Result<Tok, ParseError<Loc, anyhow::Error>> {
+        let text = self.trim_whitespace_and_comments();
+        let offset = self.text.len() - text.len();
+        let (tok, _) = self.find_token(text, offset)?;
+        Ok(tok)
+    }
+
+    pub fn advance(&mut self) -> Result<(), ParseError<Loc, anyhow::Error>> {
+        self.prev_end = self.cur_end;
+        let text = self.trim_whitespace_and_comments();
+        self.cur_start = self.text.len() - text.len();
+        let (token, len) = self.find_token(text, self.cur_start)?;
+        self.cur_end = self.cur_start + len;
+        self.token = token;
+        Ok(())
+    }
+
+    pub fn replace_token(
+        &mut self,
+        token: Tok,
+        len: usize,
+    ) -> Result<(), ParseError<Loc, anyhow::Error>> {
+        self.token = token;
+        self.cur_end = self.cur_start.wrapping_add(len); // memory will run out long before this wraps
+        Ok(())
+    }
+
+    // Find the next token and its length without changing the state of the lexer.
+    fn find_token(
+        &self,
+        text: &str,
+        start_offset: usize,
+    ) -> Result<(Tok, usize), ParseError<Loc, anyhow::Error>> {
+        let c: char = match text.chars().next() {
+            Some(next_char) => next_char,
+            None => {
+                return Ok((Tok::EOF, 0));
+            }
+        };
+        let (tok, len) = match c {
+            '0'..='9' => {
+                if (text.starts_with("0x") || text.starts_with("0X")) && text.len() > 2 {
+                    let hex_len = get_hex_digits_len(&text[2..]);
+                    if hex_len == 0 {
+                        // Fall back to treating this as a "0" token.
+                        (Tok::U64Value, 1)
+                    } else {
+                        (Tok::AccountAddressValue, 2 + hex_len)
+                    }
+                } else {
+                    get_decimal_number(text)
+                }
+            }
+            'a'..='z' | 'A'..='Z' | '$' | '_' => {
+                let len = get_name_len(text);
+                let name = &text[..len];
+                if !self.spec_mode {
+                    match &text[len..].chars().next() {
+                        Some('"') => {
+                            // Special case for ByteArrayValue: h\"[0-9A-Fa-f]*\"
+                            let mut bvlen = 0;
+                            if name == "h" && {
+                                bvlen = get_byte_array_value_len(&text[(len + 1)..]);
+                                bvlen > 0
+                            } {
+                                (Tok::ByteArrayValue, 2 + bvlen)
+                            } else {
+                                (get_name_token(name), len)
+                            }
+                        }
+                        Some('.') => {
+                            let len2 = get_name_len(&text[(len + 1)..]);
+                            if len2 > 0 {
+                                (Tok::DotNameValue, len + 1 + len2)
+                            } else {
+                                (get_name_token(name), len)
+                            }
+                        }
+                        Some('<') => match name {
+                            "vec_len" => (Tok::VecLen, len),
+                            "vec_imm_borrow" => (Tok::VecImmBorrow, len),
+                            "vec_mut_borrow" => (Tok::VecMutBorrow, len),
+                            "vec_push_back" => (Tok::VecPushBack, len),
+                            "vec_pop_back" => (Tok::VecPopBack, len),
+                            "vec_swap" => (Tok::VecSwap, len),
+                            "main" => (Tok::Main, len),
+                            _ => {
+                                if let Some(stripped) = name.strip_prefix("vec_pack_") {
+                                    match stripped.parse::<u64>() {
+                                        Ok(num) => (Tok::VecPack(num), len),
+                                        Err(_) => (Tok::NameBeginTyValue, len + 1),
+                                    }
+                                } else if let Some(stripped) = name.strip_prefix("vec_unpack_") {
+                                    match stripped.parse::<u64>() {
+                                        Ok(num) => (Tok::VecUnpack(num), len),
+                                        Err(_) => (Tok::NameBeginTyValue, len + 1),
+                                    }
+                                } else {
+                                    (Tok::NameBeginTyValue, len + 1)
+                                }
+                            }
+                        },
+                        Some('(') => match name {
+                            "assert" => (Tok::Assert, len + 1),
+                            "copy" => (Tok::Copy, len + 1),
+                            "move" => (Tok::Move, len + 1),
+                            _ => (get_name_token(name), len),
+                        },
+                        _ => (get_name_token(name), len),
+                    }
+                } else {
+                    (get_name_token(name), len) // just return the name in spec_mode
+                }
+            }
+            '&' => {
+                if text.starts_with("&mut ") {
+                    (Tok::AmpMut, 5)
+                } else if text.starts_with("&&") {
+                    (Tok::AmpAmp, 2)
+                } else {
+                    (Tok::Amp, 1)
+                }
+            }
+            '|' => {
+                if text.starts_with("||") {
+                    (Tok::PipePipe, 2)
+                } else {
+                    (Tok::Pipe, 1)
+                }
+            }
+            '=' => {
+                if text.starts_with("==>") {
+                    (Tok::EqualEqualGreater, 3)
+                } else if text.starts_with("==") {
+                    (Tok::EqualEqual, 2)
+                } else {
+                    (Tok::Equal, 1)
+                }
+            }
+            '!' => {
+                if text.starts_with("!=") {
+                    (Tok::ExclaimEqual, 2)
+                } else {
+                    (Tok::Exclaim, 1)
+                }
+            }
+            '<' => {
+                if text.starts_with("<=") {
+                    (Tok::LessEqual, 2)
+                } else if text.starts_with("<<") {
+                    (Tok::LessLess, 2)
+                } else {
+                    (Tok::Less, 1)
+                }
+            }
+            '>' => {
+                if text.starts_with(">=") {
+                    (Tok::GreaterEqual, 2)
+                } else if text.starts_with(">>") {
+                    (Tok::GreaterGreater, 2)
+                } else {
+                    (Tok::Greater, 1)
+                }
+            }
+            '%' => (Tok::Percent, 1),
+            '(' => (Tok::LParen, 1),
+            ')' => (Tok::RParen, 1),
+            '*' => (Tok::Star, 1),
+            '+' => (Tok::Plus, 1),
+            ',' => (Tok::Comma, 1),
+            '-' => (Tok::Minus, 1),
+            '.' => {
+                if text.starts_with("..") {
+                    (Tok::PeriodPeriod, 2) // range, for specs
+                } else {
+                    (Tok::Period, 1)
+                }
+            }
+            '/' => (Tok::Slash, 1),
+            ':' => {
+                if text.starts_with(":=") {
+                    (Tok::ColonEqual, 2) // spec update
+                } else {
+                    (Tok::Colon, 1)
+                }
+            }
+            ';' => (Tok::Semicolon, 1),
+            '^' => (Tok::Caret, 1),
+            '{' => (Tok::LBrace, 1),
+            '}' => (Tok::RBrace, 1),
+            '[' => (Tok::LSquare, 1), // for vector specs
+            ']' => (Tok::RSquare, 1), // for vector specs
+            c => {
+                let idx = start_offset as u32;
+                let location = Loc::new(self.file_hash(), idx, idx);
+                return Err(ParseError::InvalidToken {
+                    location,
+                    message: format!("unrecognized character for token {:?}", c),
+                });
+            }
+        };
+
+        Ok((tok, len))
+    }
+}
+
+// Return the length of the substring matching [a-zA-Z$_][a-zA-Z0-9$_]
+fn get_name_len(text: &str) -> usize {
+    // If the first character is 0..=9 or EOF, then return a length of 0.
+    let first_char = text.chars().next().unwrap_or('0');
+    if first_char.is_ascii_digit() {
+        return 0;
+    }
+    text.chars()
+        .position(|c| !matches!(c, 'a'..='z' | 'A'..='Z' | '$' | '_' | '0'..='9'))
+        .unwrap_or(text.len())
+}
+
+fn get_decimal_number(text: &str) -> (Tok, usize) {
+    let len = text
+        .chars()
+        .position(|c| !matches!(c, '0'..='9' | '_'))
+        .unwrap_or(text.len());
+    let rest = &text[len..];
+    if rest.starts_with("u8") {
+        (Tok::U8Value, len + 2)
+    } else if rest.starts_with("u16") {
+        (Tok::U16Value, len + 3)
+    } else if rest.starts_with("u32") {
+        (Tok::U32Value, len + 3)
+    } else if rest.starts_with("u64") {
+        (Tok::U64Value, len + 3)
+    } else if rest.starts_with("u128") {
+        (Tok::U128Value, len + 4)
+    } else if rest.starts_with("u256") {
+        (Tok::U256Value, len + 4)
+    } else {
+        (Tok::U64Value, len)
+    }
+}
+
+// Return the length of the substring containing characters in [0-9a-fA-F].
+fn get_hex_digits_len(text: &str) -> usize {
+    text.chars()
+        .position(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9' | '_'))
+        .unwrap_or(text.len())
+}
+
+// Check for an optional sequence of hex digits following by a double quote, and return
+// the length of that string if found. This is used to lex ByteArrayValue tokens after
+// seeing the 'h"' prefix.
+fn get_byte_array_value_len(text: &str) -> usize {
+    let hex_len = get_hex_digits_len(text);
+    match &text[hex_len..].chars().next() {
+        Some('"') => hex_len + 1,
+        _ => 0,
+    }
+}
+
+fn get_name_token(name: &str) -> Tok {
+    match name {
+        "_" => Tok::Underscore,
+        "abort" => Tok::Abort,
+        "aborts_if" => Tok::AbortsIf,
+        "as" => Tok::As,
+        "copy" => Tok::Copy,
+        "ensures" => Tok::Ensures,
+        "false" => Tok::False,
+        "freeze" => Tok::Freeze,
+        "friend" => Tok::Friend,
+        "global" => Tok::Global,              // spec language
+        "global_exists" => Tok::GlobalExists, // spec language
+        "to_u8" => Tok::ToU8,
+        "to_u16" => Tok::ToU16,
+        "to_u32" => Tok::ToU32,
+        "to_u64" => Tok::ToU64,
+        "to_u128" => Tok::ToU128,
+        "to_u256" => Tok::ToU256,
+        "import" => Tok::Import,
+        "jump" => Tok::Jump,
+        "jump_if" => Tok::JumpIf,
+        "jump_if_false" => Tok::JumpIfFalse,
+        "label" => Tok::Label,
+        "let" => Tok::Let,
+        "main" => Tok::Main,
+        "module" => Tok::Module,
+        "native" => Tok::Native,
+        "invariant" => Tok::Invariant,
+        "old" => Tok::Old,
+        "public" => Tok::Public,
+        "requires" => Tok::Requires,
+        "RET" => Tok::SpecReturn,
+        "return" => Tok::Return,
+        "script" => Tok::Script,
+        "struct" => Tok::Struct,
+        "succeeds_if" => Tok::SucceedsIf,
+        "synthetic" => Tok::Synthetic,
+        "true" => Tok::True,
+        _ => Tok::NameValue,
+    }
+}
diff --git a/vendors/move/crates/move-ir-to-bytecode-syntax/src/lib.rs b/vendors/move/crates/move-ir-to-bytecode-syntax/src/lib.rs
new file mode 100644
index 000000000..62180934c
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode-syntax/src/lib.rs
@@ -0,0 +1,188 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! # Grammar
+//! ## Identifiers
+//! ```text
+//! f ∈ FieldName     // [a-zA-Z$_][a-zA-Z0-9$_]*
+//! p ∈ ProcedureName // [a-zA-Z$_][a-zA-Z0-9$_]*
+//! m ∈ ModuleName    // [a-zA-Z$_][a-zA-Z0-9$_]*
+//! n ∈ StructName    // [a-zA-Z$_][a-zA-Z0-9$_]*
+//! x ∈ Var           // [a-zA-Z$_][a-zA-Z0-9$_]*
+//! ```
+//!
+//! ## Types
+//! ```text
+//! k ∈ Kind ::=
+//!   | R // Linear resource struct value. Must be used, cannot be copied
+//!   | V // Non-resource struct value. Can be silently discarded, can be copied
+//!
+//! g ∈ GroundType ::=
+//!   | bool
+//!   | u8        // unsigned 8 bit integer
+//!   | u16       // unsigned 16 bit integer
+//!   | u32       // unsigned 32 bit integer
+//!   | u64       // unsigned 64 bit integer
+//!   | u128      // unsigned 128 bit integer
+//!   | u256      // unsigned 256 bit integer
+//!   | address   // 32 byte account address
+//!   | bytearray // immutable, arbitrarily sized array of bytes
+//!
+//! d ∈ ModuleAlias ::=
+//!   | m         // module name that is an alias to a declared module, addr.m
+//!   | Self      // current module
+//!
+//! t ∈ BaseType ::=
+//!   | g     // ground type
+//!   | k#d.n // struct 'n' declared in the module referenced by 'd' with kind 'k'
+//!           // the kind 'k' cannot differ from the declared kind
+//!
+//! 𝛕 ∈ Type ::=
+//!   | t      // base type
+//!   | &t     // immutable reference to a base type
+//!   | &mut t // mutable reference to a base type
+//!
+//! 𝛕-list ∈ [Type] ::=
+//!   | unit            // empty type list.
+//!                     // in the actual syntax, it is represented by the abscense of a type
+//!   | 𝛕_1 * ... * 𝛕_j // 'j' >= 1. list of multiple types. used for multiple return values
+//! ```
+//!
+//! ## Values
+//! ```text
+//! u ∈ Unsigned64        // Unsigned, 64-bit Integer
+//! addr ∈ AccountAddress // addresses of blockchain accounts
+//! bytes ∈ vector<u8>    // byte array of arbitrary length
+//! v ∈ Value ::=
+//!   | true
+//!   | false
+//!   | u        // u64 literal
+//!   | 0xaddr   // 32 byte address literal
+//!   | b"bytes" // arbitrary length bytearray literal
+//! ```
+//!
+//! ## Expressions
+//! ```text
+//! o ∈ VarOp ::=
+//!   | copy(x) // returns value bound to 'x'
+//!   | move(x) // moves the value out of 'x', i.e. returns the value and makes 'x' unusable
+//!
+//! r ∈ ReferenceOp ::=
+//!   | &x        // type: 't -> &mut t'
+//!               // creates an exclusive, mutable reference to a local
+//!   | &e.f      // type: '&t_1 -> &t_2' or '&mut t_1 -> &mut t_2'
+//!               // borrows a new reference to field 'f' of the struct 't_1'. inherits exclusive or shared from parent
+//!               // 't_1' must be a struct declared in the current module, i.e. 'f' is "private"
+//!   | *e        // type: '&t -> t' or '&mut t -> t'. Dereferencing. Not valid for resources
+//!
+//! e ∈ Exp ::=
+//!   | v
+//!   | o
+//!   | r
+//!   | n { f_1: e_1, ... , f_j: e_j } // type: '𝛕-list -> k#Self.n'
+//!                                    // "constructor" for 'n'
+//!                                    // "packs" the values, binding them to the fields, and creates a new instance of 'n'
+//!                                    // 'n' must be declared in the current module
+//!   // boolean operators
+//!   | !e_1
+//!   | e_1 || e_2
+//!   | e_1 && e_2
+//!   // u64 operators
+//!   | e_1 >= e_2
+//!   | e_1 <= e_2
+//!   | e_1 > e_2
+//!   | e_1 < e_2
+//!   | e_1 + e_2
+//!   | e_1 - e_2
+//!   | e_1 * e_2
+//!   | e_1 / e_2
+//!   | e_1 % e_2
+//!   | e_1 ^ e_2
+//!   | e_1 | e_2
+//!   | e_g & e_2
+//!   // operators over any ground type
+//!   | e_1 == e_2
+//!   | e_1 != e_2
+//! ```
+//! ## Commands
+//! ```text
+//!
+//! builtin ∈ Builtin ::=
+//!   | create_account(e)         // type: 'addr -> unit'
+//!                               // creates new account at the specified address, failing if it already exists
+//!   | release(e)                // type: '&t -> unit' or '&mut t -> unit'
+//!                               // releases the reference given
+//!   | freeze(x)                 // type: '&mut t -> &t'
+//!                               // coerce a mutable reference to an immutable reference
+//!
+//! call ∈ Call ::=
+//!   | mop
+//!   | builtin
+//!   | d.p(e_1, ..., e_j) // procedure 'p' defined in the module referenced by 'd'
+//!
+//! c ∈ Cmd ::=
+//!   | x = e                               // assign the result of evaluating 'e' to 'x'
+//!   | x_1, ..., x_j = call                // Invokes 'call', assigns result to 'x_1' to 'x_j'
+//!   | call                                // Invokes 'call' that has a return type of 'unit'
+//!   | *x = e                              // mutation, s.t. 'x: &mut t' and 'e: t' and 't' is not of resource kind
+//!   | assert(e_1, e_2)                    // type: 'bool * u64 -> unit'
+//!                                         // halts execution with error code 'e_2' if 'e_1' evaluates to 'false'
+//!   | break                               // exit a loop
+//!   | continue                            // return to the top of a loop
+//!   | return e_1, ..., e_n                // return values from procedure
+//!   | n { f_1: x_1, ... , f_j: x_j } = e  // "de-constructor" for 'n'
+//!                                         // "unpacks" a struct value 'e: _#Self.n'
+//!                                         // value for 'f_i' is bound to local 'x_i'
+//! ```
+//!
+//! ## Statements
+//! ```text
+//! s ∈ Stmt ::=
+//!   | if (e) { s_1 } else { s_2 } // conditional
+//!   | if (e) { s }                // conditional without else branch
+//!   | while (e) { s }             // while loop
+//!   | loop { s }                  // loops forever
+//!   | c;                          // command
+//!   | s_1 s_2                     // sequencing
+//! ```
+//!
+//! ## Imports
+//!```text
+//! idecl ∈ Import ::=
+//!   | import addr.m_1 as m_2; // imports 'addr.m_1' with the alias 'm_2'
+//!   | import addr.m_1;        // imports 'addr.m_1' with the alias 'm_1'
+//! ```
+//! ## Modules
+//! ```text
+//! sdecl ∈ StructDecl ::=
+//!   | resource n { f_1: t_1, ..., f_j: t_j } // declaration of a resource struct
+//!   | struct n { f_1: t_1, ..., f_j: t_j }   // declaration of a non-resource (value) struct
+//!                                            // s.t. any 't_i' is not of resource kind
+//!
+//! body ∈ ProcedureBody ::=
+//!  | let x_1; ... let x_j; s // The locals declared in this procedure, and the code for that procedure
+//!
+//! pdecl ∈ ProcedureDecl ::=
+//!   | (public?) p(x_1: 𝛕_1, ..., x_j: 𝛕_j): 𝛕-list { body } // declaration of a defined procedure
+//!                                                          // the procedure may be public, or internal to the module
+//!   | native (public?) p(x_1: 𝛕_1, ..., x_j: 𝛕_j): 𝛕-list; // declaration of a native procedure
+//!                                                         // the implementation is provided by the VM
+//!                                                         // the procedure may be public, or internal to the module
+//!
+//! mdecl ∈ ModuleDecl ::=
+//!   | module m { idecl_1 ... idecl_i sdecl_1 ... sdecl_j pdecl_1 ... pdecl_k }
+//! ```
+//!
+//! ## Transaction Scripts
+//! ```text
+//! TransactionScript ::=
+//!   // declaration of the transaction scripts procedure
+//!   // the 'main' procedure must be 'public' and any parameters must have a ground type
+//!   | idecl_1 ... idecl_i public main(x_1: g_1, ..., x_j: g_j) { s }
+//! ```
+
+mod lexer;
+pub mod syntax;
diff --git a/vendors/move/crates/move-ir-to-bytecode-syntax/src/syntax.rs b/vendors/move/crates/move-ir-to-bytecode-syntax/src/syntax.rs
new file mode 100644
index 000000000..247997279
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode-syntax/src/syntax.rs
@@ -0,0 +1,2140 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Context};
+use std::{collections::BTreeSet, fmt, str::FromStr};
+
+use crate::lexer::*;
+use move_command_line_common::files::FileHash;
+use move_core_types::{account_address::AccountAddress, u256};
+use move_ir_types::{ast::*, location::*, spec_language_ast::*};
+use move_symbol_pool::Symbol;
+
+// FIXME: The following simplified version of ParseError copied from
+// lalrpop-util should be replaced.
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum ParseError<L, E> {
+    InvalidToken { location: L, message: String },
+    User { location: L, error: E },
+}
+
+impl<L, E> fmt::Display for ParseError<L, E>
+where
+    L: fmt::Display,
+    E: fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use self::ParseError::*;
+        match *self {
+            User { ref error, .. } => write!(f, "{}", error),
+            InvalidToken {
+                ref location,
+                ref message,
+            } => write!(f, "Invalid token at {}: {}", location, message),
+        }
+    }
+}
+
+fn make_loc(file_hash: FileHash, start: usize, end: usize) -> Loc {
+    Loc::new(file_hash, start as u32, end as u32)
+}
+
+fn current_token_loc(tokens: &Lexer) -> Loc {
+    let start_loc = tokens.start_loc();
+    make_loc(
+        tokens.file_hash(),
+        start_loc,
+        start_loc + tokens.content().len(),
+    )
+}
+
+fn spanned<T>(file_hash: FileHash, start: usize, end: usize, value: T) -> Spanned<T> {
+    Spanned {
+        loc: make_loc(file_hash, start, end),
+        value,
+    }
+}
+
+// Check for the specified token and consume it if it matches.
+// Returns true if the token matches.
+fn match_token(tokens: &mut Lexer, tok: Tok) -> Result<bool, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() == tok {
+        tokens.advance()?;
+        Ok(true)
+    } else {
+        Ok(false)
+    }
+}
+
+fn consume_token(tokens: &mut Lexer, tok: Tok) -> Result<(), ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() != tok {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: format!("expected {:?}, not {:?}", tok, tokens.peek()),
+        });
+    }
+    tokens.advance()?;
+    Ok(())
+}
+
+fn adjust_token(
+    tokens: &mut Lexer,
+    list_end_tokens: &[Tok],
+) -> Result<(), ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() == Tok::GreaterGreater && list_end_tokens.contains(&Tok::Greater) {
+        tokens.replace_token(Tok::Greater, 1)?;
+    }
+    Ok(())
+}
+
+fn parse_comma_list<F, R>(
+    tokens: &mut Lexer,
+    list_end_tokens: &[Tok],
+    parse_list_item: F,
+    allow_trailing_comma: bool,
+) -> Result<Vec<R>, ParseError<Loc, anyhow::Error>>
+where
+    F: Fn(&mut Lexer) -> Result<R, ParseError<Loc, anyhow::Error>>,
+{
+    let mut v = vec![];
+    adjust_token(tokens, list_end_tokens)?;
+    if !list_end_tokens.contains(&tokens.peek()) {
+        loop {
+            v.push(parse_list_item(tokens)?);
+            adjust_token(tokens, list_end_tokens)?;
+            if list_end_tokens.contains(&tokens.peek()) {
+                break;
+            }
+            consume_token(tokens, Tok::Comma)?;
+            adjust_token(tokens, list_end_tokens)?;
+            if list_end_tokens.contains(&tokens.peek()) && allow_trailing_comma {
+                break;
+            }
+        }
+    }
+    Ok(v)
+}
+
+fn parse_list<C, F, R>(
+    tokens: &mut Lexer,
+    mut parse_list_continue: C,
+    parse_list_item: F,
+) -> Result<Vec<R>, ParseError<Loc, anyhow::Error>>
+where
+    C: FnMut(&mut Lexer) -> Result<bool, ParseError<Loc, anyhow::Error>>,
+    F: Fn(&mut Lexer) -> Result<R, ParseError<Loc, anyhow::Error>>,
+{
+    let mut v = vec![];
+    loop {
+        v.push(parse_list_item(tokens)?);
+        if !parse_list_continue(tokens)? {
+            break Ok(v);
+        }
+    }
+}
+
+fn parse_name(tokens: &mut Lexer) -> Result<Symbol, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() != Tok::NameValue {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: "expected Tok::NameValue".to_string(),
+        });
+    }
+    let name = tokens.content();
+    tokens.advance()?;
+    Ok(Symbol::from(name))
+}
+
+fn parse_name_begin_ty(tokens: &mut Lexer) -> Result<Symbol, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() != Tok::NameBeginTyValue {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: "expected Tok::NameBeginTyValue".to_string(),
+        });
+    }
+    let s = tokens.content();
+    // The token includes a "<" at the end, so chop that off to get the name.
+    let name = &s[..s.len() - 1];
+    tokens.advance()?;
+    Ok(Symbol::from(name))
+}
+
+fn parse_dot_name<'input>(
+    tokens: &mut Lexer<'input>,
+) -> Result<&'input str, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() != Tok::DotNameValue {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: "expected Tok::DotNameValue".to_string(),
+        });
+    }
+    let name = tokens.content();
+    tokens.advance()?;
+    Ok(name)
+}
+
+// AccountAddress: AccountAddress = {
+//     < s: r"0[xX][0-9a-fA-F]+" > => { ... }
+// };
+
+fn parse_account_address(
+    tokens: &mut Lexer,
+) -> Result<AccountAddress, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() != Tok::AccountAddressValue {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: "expected Tok::AccountAddressValue".to_string(),
+        });
+    }
+    let addr = AccountAddress::from_hex_literal(tokens.content())
+        .with_context(|| {
+            format!(
+                "The address {:?} is of invalid length. Addresses are at most 32-bytes long",
+                tokens.content()
+            )
+        })
+        .unwrap();
+    tokens.advance()?;
+    Ok(addr)
+}
+
+// Var: Var = {
+//     <n:Name> =>? Var::parse(n),
+// };
+
+fn parse_var_(tokens: &mut Lexer) -> Result<Var_, ParseError<Loc, anyhow::Error>> {
+    Ok(Var_(parse_name(tokens)?))
+}
+
+fn parse_var(tokens: &mut Lexer) -> Result<Var, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let var = parse_var_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, var))
+}
+
+// Field: Field = {
+//     <n:Name> =>? parse_field(n),
+// };
+
+fn parse_field(tokens: &mut Lexer) -> Result<Field, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let f = Field_(parse_name(tokens)?);
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, f))
+}
+
+/// field-ident: name-and-type-actuals '::' field
+fn parse_field_ident(tokens: &mut Lexer) -> Result<FieldIdent, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let (name, type_actuals) = parse_name_and_type_actuals(tokens)?;
+    // For now, the lexer produces 2 ':' tokens instead of a single '::' token.
+    consume_token(tokens, Tok::Colon)?;
+    consume_token(tokens, Tok::Colon)?;
+    let field = parse_field(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(
+        tokens.file_hash(),
+        start_loc,
+        end_loc,
+        FieldIdent_ {
+            struct_name: StructName(name),
+            type_actuals,
+            field,
+        },
+    ))
+}
+
+// CopyableVal: CopyableVal = {
+//     AccountAddress => CopyableVal::Address(<>),
+//     "true" => CopyableVal::Bool(true),
+//     "false" => CopyableVal::Bool(false),
+//     <i: U64> => CopyableVal::U64(i),
+//     <buf: ByteArray> => CopyableVal::ByteArray(buf),
+// }
+
+fn parse_copyable_val(tokens: &mut Lexer) -> Result<CopyableVal, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let val = match tokens.peek() {
+        Tok::AccountAddressValue => {
+            let addr = parse_account_address(tokens)?;
+            CopyableVal_::Address(addr)
+        }
+        Tok::True => {
+            tokens.advance()?;
+            CopyableVal_::Bool(true)
+        }
+        Tok::False => {
+            tokens.advance()?;
+            CopyableVal_::Bool(false)
+        }
+        Tok::U8Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u8") {
+                s = &s[..s.len() - 2]
+            }
+            let i = u8::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U8(i)
+        }
+        Tok::U16Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u16") {
+                s = &s[..s.len() - 3]
+            }
+            let i = u16::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U16(i)
+        }
+        Tok::U32Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u32") {
+                s = &s[..s.len() - 3]
+            }
+            let i = u32::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U32(i)
+        }
+        Tok::U64Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u64") {
+                s = &s[..s.len() - 3]
+            }
+            let i = u64::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U64(i)
+        }
+        Tok::U128Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u128") {
+                s = &s[..s.len() - 4]
+            }
+            let i = u128::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U128(i)
+        }
+        Tok::U256Value => {
+            let mut s = tokens.content();
+            if s.ends_with("256") {
+                s = &s[..s.len() - 4]
+            }
+            let i = u256::U256::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U256(i)
+        }
+        Tok::ByteArrayValue => {
+            let s = tokens.content();
+            let buf = hex::decode(&s[2..s.len() - 1]).unwrap_or_else(|_| {
+                // The lexer guarantees this, but tracking this knowledge all the way to here is tedious
+                unreachable!("The string {:?} is not a valid hex-encoded byte array", s)
+            });
+            tokens.advance()?;
+            CopyableVal_::ByteArray(buf)
+        }
+        t => {
+            return Err(ParseError::InvalidToken {
+                location: current_token_loc(tokens),
+                message: format!("unrecognized token kind {:?}", t),
+            })
+        }
+    };
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, val))
+}
+
+// Get the precedence of a binary operator. The minimum precedence value
+// is 1, and larger values have higher precedence. For tokens that are not
+// binary operators, this returns a value of zero so that they will be
+// below the minimum value and will mark the end of the binary expression
+// for the code in parse_rhs_of_binary_exp.
+// Precedences are not sequential to make it easier to add new binops without
+// renumbering everything.
+fn get_precedence(token: Tok) -> u32 {
+    match token {
+        // Reserved minimum precedence value is 1 (specified in parse_exp_)
+        // TODO
+        // Tok::EqualEqualGreater may not work right,
+        // since parse_spec_exp calls parse_rhs_of_spec_exp
+        // with min_prec = 1.  So parse_spec_expr will stop parsing instead of reading ==>
+        Tok::EqualEqualGreater => 1,
+        Tok::ColonEqual => 3,
+        Tok::PipePipe => 5,
+        Tok::AmpAmp => 10,
+        Tok::EqualEqual => 15,
+        Tok::ExclaimEqual => 15,
+        Tok::Less => 15,
+        Tok::Greater => 15,
+        Tok::LessEqual => 15,
+        Tok::GreaterEqual => 15,
+        Tok::PeriodPeriod => 20,
+        Tok::Pipe => 25,
+        Tok::Caret => 30,
+        Tok::Amp => 35,
+        Tok::LessLess => 40,
+        Tok::GreaterGreater => 40,
+        Tok::Plus => 45,
+        Tok::Minus => 45,
+        Tok::Star => 50,
+        Tok::Slash => 50,
+        Tok::Percent => 50,
+        _ => 0, // anything else is not a binary operator
+    }
+}
+
+fn parse_exp(tokens: &mut Lexer) -> Result<Exp, ParseError<Loc, anyhow::Error>> {
+    let lhs = parse_unary_exp(tokens)?;
+    parse_rhs_of_binary_exp(tokens, lhs, /* min_prec */ 1)
+}
+
+fn parse_rhs_of_binary_exp(
+    tokens: &mut Lexer,
+    lhs: Exp,
+    min_prec: u32,
+) -> Result<Exp, ParseError<Loc, anyhow::Error>> {
+    let mut result = lhs;
+    let mut next_tok_prec = get_precedence(tokens.peek());
+
+    // Continue parsing binary expressions as long as they have they
+    // specified minimum precedence.
+    while next_tok_prec >= min_prec {
+        let op_token = tokens.peek();
+        tokens.advance()?;
+
+        let mut rhs = parse_unary_exp(tokens)?;
+
+        // If the next token is another binary operator with a higher
+        // precedence, then recursively parse that expression as the RHS.
+        let this_prec = next_tok_prec;
+        next_tok_prec = get_precedence(tokens.peek());
+        if this_prec < next_tok_prec {
+            rhs = parse_rhs_of_binary_exp(tokens, rhs, this_prec + 1)?;
+            next_tok_prec = get_precedence(tokens.peek());
+        }
+
+        let op = match op_token {
+            Tok::EqualEqual => BinOp::Eq,
+            Tok::ExclaimEqual => BinOp::Neq,
+            Tok::Less => BinOp::Lt,
+            Tok::Greater => BinOp::Gt,
+            Tok::LessEqual => BinOp::Le,
+            Tok::GreaterEqual => BinOp::Ge,
+            Tok::PipePipe => BinOp::Or,
+            Tok::AmpAmp => BinOp::And,
+            Tok::Caret => BinOp::Xor,
+            Tok::LessLess => BinOp::Shl,
+            Tok::GreaterGreater => BinOp::Shr,
+            Tok::Pipe => BinOp::BitOr,
+            Tok::Amp => BinOp::BitAnd,
+            Tok::Plus => BinOp::Add,
+            Tok::Minus => BinOp::Sub,
+            Tok::Star => BinOp::Mul,
+            Tok::Slash => BinOp::Div,
+            Tok::Percent => BinOp::Mod,
+            _ => panic!("Unexpected token that is not a binary operator"),
+        };
+        let start_loc = result.loc.start();
+        let end_loc = tokens.previous_end_loc();
+        let e = Exp_::BinopExp(Box::new(result), op, Box::new(rhs));
+        result = spanned(tokens.file_hash(), start_loc as usize, end_loc, e);
+    }
+
+    Ok(result)
+}
+
+// QualifiedFunctionName : FunctionCall = {
+//     <f: Builtin> => FunctionCall::Builtin(f),
+//     <module_dot_name: DotName> <type_actuals: TypeActuals> =>? { ... }
+// }
+
+fn parse_qualified_function_name(
+    tokens: &mut Lexer,
+) -> Result<FunctionCall, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let call = match tokens.peek() {
+        Tok::VecPack(_)
+        | Tok::VecLen
+        | Tok::VecImmBorrow
+        | Tok::VecMutBorrow
+        | Tok::VecPushBack
+        | Tok::VecPopBack
+        | Tok::VecUnpack(_)
+        | Tok::VecSwap
+        | Tok::Freeze
+        | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
+        | Tok::ToU64
+        | Tok::ToU128
+        | Tok::ToU256 => {
+            let f = parse_builtin(tokens)?;
+            FunctionCall_::Builtin(f)
+        }
+        Tok::DotNameValue => {
+            let module_dot_name = parse_dot_name(tokens)?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            let v: Vec<&str> = module_dot_name.split('.').collect();
+            assert!(v.len() == 2);
+            FunctionCall_::ModuleFunctionCall {
+                module: ModuleName(Symbol::from(v[0])),
+                name: FunctionName(Symbol::from(v[1])),
+                type_actuals,
+            }
+        }
+        t => {
+            return Err(ParseError::InvalidToken {
+                location: current_token_loc(tokens),
+                message: format!(
+                    "unrecognized token kind for qualified function name {:?}",
+                    t
+                ),
+            })
+        }
+    };
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, call))
+}
+
+// UnaryExp : Exp = {
+//     "!" <e: Sp<UnaryExp>> => Exp::UnaryExp(UnaryOp::Not, Box::new(e)),
+//     "*" <e: Sp<UnaryExp>> => Exp::Dereference(Box::new(e)),
+//     "&mut " <e: Sp<UnaryExp>> "." <f: Field> => { ... },
+//     "&" <e: Sp<UnaryExp>> "." <f: Field> => { ... },
+//     CallOrTerm,
+// }
+
+fn parse_borrow_field_(
+    tokens: &mut Lexer,
+    mutable: bool,
+) -> Result<Exp_, ParseError<Loc, anyhow::Error>> {
+    // This could be either a field borrow (from UnaryExp) or
+    // a borrow of a local variable (from Term). In the latter case,
+    // only a simple name token is allowed, and it must not be
+    // the start of a pack expression.
+    let e = if tokens.peek() == Tok::NameValue {
+        if tokens.lookahead()? != Tok::LBrace {
+            let var = parse_var(tokens)?;
+            return Ok(Exp_::BorrowLocal(mutable, var));
+        }
+        let start_loc = tokens.start_loc();
+        let name = parse_name(tokens)?;
+        let end_loc = tokens.previous_end_loc();
+        let type_actuals: Vec<Type> = vec![];
+        spanned(
+            tokens.file_hash(),
+            start_loc,
+            end_loc,
+            parse_pack_(tokens, name, type_actuals)?,
+        )
+    } else {
+        parse_unary_exp(tokens)?
+    };
+    consume_token(tokens, Tok::Period)?;
+    let field = parse_field_ident(tokens)?;
+    Ok(Exp_::Borrow {
+        is_mutable: mutable,
+        exp: Box::new(e),
+        field,
+    })
+}
+
+fn parse_unary_exp_(tokens: &mut Lexer) -> Result<Exp_, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::Exclaim => {
+            tokens.advance()?;
+            let e = parse_unary_exp(tokens)?;
+            Ok(Exp_::UnaryExp(UnaryOp::Not, Box::new(e)))
+        }
+        Tok::Star => {
+            tokens.advance()?;
+            let e = parse_unary_exp(tokens)?;
+            Ok(Exp_::Dereference(Box::new(e)))
+        }
+        Tok::AmpMut => {
+            tokens.advance()?;
+            parse_borrow_field_(tokens, true)
+        }
+        Tok::Amp => {
+            tokens.advance()?;
+            parse_borrow_field_(tokens, false)
+        }
+        _ => parse_call_or_term_(tokens),
+    }
+}
+
+fn parse_unary_exp(tokens: &mut Lexer) -> Result<Exp, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let e = parse_unary_exp_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, e))
+}
+
+// Call: Exp = {
+//     <f: Sp<QualifiedFunctionName>> <exp: Sp<CallOrTerm>> => Exp::FunctionCall(f, Box::new(exp)),
+// }
+
+fn parse_call(tokens: &mut Lexer) -> Result<Exp, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let f = parse_qualified_function_name(tokens)?;
+    let exp = parse_call_or_term(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(
+        tokens.file_hash(),
+        start_loc,
+        end_loc,
+        Exp_::FunctionCall(f, Box::new(exp)),
+    ))
+}
+
+// CallOrTerm: Exp = {
+//     <f: Sp<QualifiedFunctionName>> <exp: Sp<CallOrTerm>> => Exp::FunctionCall(f, Box::new(exp)),
+//     Term,
+// }
+
+fn parse_call_or_term_(tokens: &mut Lexer) -> Result<Exp_, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::VecPack(_)
+        | Tok::VecLen
+        | Tok::VecImmBorrow
+        | Tok::VecMutBorrow
+        | Tok::VecPushBack
+        | Tok::VecPopBack
+        | Tok::VecUnpack(_)
+        | Tok::VecSwap
+        | Tok::Freeze
+        | Tok::DotNameValue
+        | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
+        | Tok::ToU64
+        | Tok::ToU128
+        | Tok::ToU256 => {
+            let f = parse_qualified_function_name(tokens)?;
+            let exp = parse_call_or_term(tokens)?;
+            Ok(Exp_::FunctionCall(f, Box::new(exp)))
+        }
+        _ => parse_term_(tokens),
+    }
+}
+
+fn parse_call_or_term(tokens: &mut Lexer) -> Result<Exp, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let v = parse_call_or_term_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, v))
+}
+
+// FieldExp: (Field_, Exp_) = {
+//     <f: Sp<Field>> ":" <e: Sp<Exp>> => (f, e)
+// }
+
+fn parse_field_exp(tokens: &mut Lexer) -> Result<(Field, Exp), ParseError<Loc, anyhow::Error>> {
+    let f = parse_field(tokens)?;
+    consume_token(tokens, Tok::Colon)?;
+    let e = parse_exp(tokens)?;
+    Ok((f, e))
+}
+
+// Term: Exp = {
+//     "move(" <v: Sp<Var>> ")" => Exp::Move(v),
+//     "copy(" <v: Sp<Var>> ")" => Exp::Copy(v),
+//     "&mut " <v: Sp<Var>> => Exp::BorrowLocal(true, v),
+//     "&" <v: Sp<Var>> => Exp::BorrowLocal(false, v),
+//     Sp<CopyableVal> => Exp::Value(<>),
+//     <name_and_type_actuals: NameAndTypeActuals> "{" <fs:Comma<FieldExp>> "}" =>? { ... },
+//     "(" <exps: Comma<Sp<Exp>>> ")" => Exp::ExprList(exps),
+// }
+
+fn parse_pack_(
+    tokens: &mut Lexer,
+    name: Symbol,
+    type_actuals: Vec<Type>,
+) -> Result<Exp_, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::LBrace)?;
+    let fs = parse_comma_list(tokens, &[Tok::RBrace], parse_field_exp, true)?;
+    consume_token(tokens, Tok::RBrace)?;
+    Ok(Exp_::Pack(
+        StructName(name),
+        type_actuals,
+        fs.into_iter().collect::<Vec<_>>(),
+    ))
+}
+
+fn parse_term_(tokens: &mut Lexer) -> Result<Exp_, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::Move => {
+            tokens.advance()?;
+            let v = parse_var(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            Ok(Exp_::Move(v))
+        }
+        Tok::Copy => {
+            tokens.advance()?;
+            let v = parse_var(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            Ok(Exp_::Copy(v))
+        }
+        Tok::AmpMut => {
+            tokens.advance()?;
+            let v = parse_var(tokens)?;
+            Ok(Exp_::BorrowLocal(true, v))
+        }
+        Tok::Amp => {
+            tokens.advance()?;
+            let v = parse_var(tokens)?;
+            Ok(Exp_::BorrowLocal(false, v))
+        }
+        Tok::AccountAddressValue
+        | Tok::True
+        | Tok::False
+        | Tok::U8Value
+        | Tok::U16Value
+        | Tok::U32Value
+        | Tok::U64Value
+        | Tok::U128Value
+        | Tok::U256Value
+        | Tok::ByteArrayValue => Ok(Exp_::Value(parse_copyable_val(tokens)?)),
+        Tok::NameValue | Tok::NameBeginTyValue => {
+            let (name, type_actuals) = parse_name_and_type_actuals(tokens)?;
+            parse_pack_(tokens, name, type_actuals)
+        }
+        Tok::LParen => {
+            tokens.advance()?;
+            let exps = parse_comma_list(tokens, &[Tok::RParen], parse_exp, true)?;
+            consume_token(tokens, Tok::RParen)?;
+            Ok(Exp_::ExprList(exps))
+        }
+        t => Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: format!("unrecognized token kind for term {:?}", t),
+        }),
+    }
+}
+
+// QualifiedStructIdent : QualifiedStructIdent = {
+//     <module_dot_struct: DotName> =>? { ... }
+// }
+
+fn parse_qualified_struct_ident(
+    tokens: &mut Lexer,
+) -> Result<QualifiedStructIdent, ParseError<Loc, anyhow::Error>> {
+    let module_dot_struct = parse_dot_name(tokens)?;
+    let v: Vec<&str> = module_dot_struct.split('.').collect();
+    assert!(v.len() == 2);
+    let m: ModuleName = ModuleName(Symbol::from(v[0]));
+    let n: StructName = StructName(Symbol::from(v[1]));
+    Ok(QualifiedStructIdent::new(m, n))
+}
+
+// ModuleName: ModuleName = {
+//     <n: Name> =>? ModuleName::parse(n),
+// }
+
+fn parse_module_name(tokens: &mut Lexer) -> Result<ModuleName, ParseError<Loc, anyhow::Error>> {
+    Ok(ModuleName(parse_name(tokens)?))
+}
+
+// Builtin: Builtin = {
+//     "exists<" <name_and_type_actuals: NameAndTypeActuals> ">" =>? { ... },
+//     "borrow_global<" <name_and_type_actuals: NameAndTypeActuals> ">" =>? { ... },
+//     "borrow_global_mut<" <name_and_type_actuals: NameAndTypeActuals> ">" =>? { ... },
+//     "move_to<" <name_and_type_actuals: NameAndTypeActuals> ">" =>? { ... },
+//     "move_from<" <name_and_type_actuals: NameAndTypeActuals> ">" =>? { ... },
+//     "vec_*<" <type_actuals: TypeActuals> ">" =>? { ... },
+//     "freeze" => Builtin::Freeze,
+// }
+
+fn parse_builtin(tokens: &mut Lexer) -> Result<Builtin, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::VecPack(num) => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecPack(type_actuals, num))
+        }
+        Tok::VecLen => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecLen(type_actuals))
+        }
+        Tok::VecImmBorrow => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecImmBorrow(type_actuals))
+        }
+        Tok::VecMutBorrow => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecMutBorrow(type_actuals))
+        }
+        Tok::VecPushBack => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecPushBack(type_actuals))
+        }
+        Tok::VecPopBack => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecPopBack(type_actuals))
+        }
+        Tok::VecUnpack(num) => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecUnpack(type_actuals, num))
+        }
+        Tok::VecSwap => {
+            tokens.advance()?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            Ok(Builtin::VecSwap(type_actuals))
+        }
+        Tok::Freeze => {
+            tokens.advance()?;
+            Ok(Builtin::Freeze)
+        }
+        Tok::ToU8 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU8)
+        }
+        Tok::ToU16 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU16)
+        }
+        Tok::ToU32 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU32)
+        }
+        Tok::ToU64 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU64)
+        }
+        Tok::ToU128 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU128)
+        }
+        Tok::ToU256 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU256)
+        }
+        t => Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: format!("unrecognized token kind for builtin {:?}", t),
+        }),
+    }
+}
+
+// LValue: LValue = {
+//     <l:Sp<Var>> => LValue::Var(l),
+//     "*" <e: Sp<Exp>> => LValue::Mutate(e),
+//     "_" => LValue::Pop,
+// }
+
+fn parse_lvalue_(tokens: &mut Lexer) -> Result<LValue_, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::NameValue => {
+            let l = parse_var(tokens)?;
+            Ok(LValue_::Var(l))
+        }
+        Tok::Star => {
+            tokens.advance()?;
+            let e = parse_exp(tokens)?;
+            Ok(LValue_::Mutate(e))
+        }
+        Tok::Underscore => {
+            tokens.advance()?;
+            Ok(LValue_::Pop)
+        }
+        t => Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: format!("unrecognized token kind for lvalue {:?}", t),
+        }),
+    }
+}
+
+fn parse_lvalue(tokens: &mut Lexer) -> Result<LValue, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let lv = parse_lvalue_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, lv))
+}
+
+// FieldBindings: (Field_, Var_) = {
+//     <f: Sp<Field>> ":" <v: Sp<Var>> => (f, v),
+//     <f: Sp<Field>> => { ... }
+// }
+
+fn parse_field_bindings(
+    tokens: &mut Lexer,
+) -> Result<(Field, Var), ParseError<Loc, anyhow::Error>> {
+    let f = parse_field(tokens)?;
+    if tokens.peek() == Tok::Colon {
+        tokens.advance()?; // consume the colon
+        let v = parse_var(tokens)?;
+        Ok((f, v))
+    } else {
+        Ok((
+            f.clone(),
+            Spanned {
+                loc: f.loc,
+                value: Var_(f.value.0),
+            },
+        ))
+    }
+}
+
+// pub Cmd : Cmd = {
+//     <lvalues: Comma<Sp<LValue>>> "=" <e: Sp<Exp>> => Cmd::Assign(lvalues, e),
+//     <name_and_type_actuals: NameAndTypeActuals> "{" <bindings: Comma<FieldBindings>> "}" "=" <e: Sp<Exp>> =>? { ... },
+//     "abort" <err: Sp<Exp>?> => { ... },
+//     "return" <v: Comma<Sp<Exp>>> => Cmd::Return(Box::new(Spanned::unsafe_no_loc(Exp::ExprList(v)))),
+//     "continue" => Cmd::Continue,
+//     "break" => Cmd::Break,
+//     <Sp<Call>> => Cmd::Exp(Box::new(<>)),
+//     "(" <Comma<Sp<Exp>>> ")" => Cmd::Exp(Box::new(Spanned::unsafe_no_loc(Exp::ExprList(<>)))),
+// }
+
+fn parse_assign_(tokens: &mut Lexer) -> Result<Statement_, ParseError<Loc, anyhow::Error>> {
+    let lvalues = parse_comma_list(tokens, &[Tok::Equal], parse_lvalue, false)?;
+    if lvalues.is_empty() {
+        return Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: "could not parse lvalues in assignment".to_string(),
+        });
+    }
+    consume_token(tokens, Tok::Equal)?;
+    let e = parse_exp(tokens)?;
+    Ok(Statement_::Assign(lvalues, e))
+}
+
+fn parse_unpack_(
+    tokens: &mut Lexer,
+    name: Symbol,
+    type_actuals: Vec<Type>,
+) -> Result<Statement_, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::LBrace)?;
+    let bindings = parse_comma_list(tokens, &[Tok::RBrace], parse_field_bindings, true)?;
+    consume_token(tokens, Tok::RBrace)?;
+    consume_token(tokens, Tok::Equal)?;
+    let e = parse_exp(tokens)?;
+    Ok(Statement_::Unpack(
+        StructName(name),
+        type_actuals,
+        bindings.into_iter().collect(),
+        Box::new(e),
+    ))
+}
+
+/// Parses a statement.
+fn parse_statement_(tokens: &mut Lexer) -> Result<Statement_, ParseError<Loc, anyhow::Error>> {
+    match tokens.peek() {
+        Tok::Abort => {
+            tokens.advance()?;
+            let val = if tokens.peek() == Tok::Semicolon {
+                None
+            } else {
+                Some(Box::new(parse_exp(tokens)?))
+            };
+            Ok(Statement_::Abort(val))
+        }
+        Tok::Assert => {
+            tokens.advance()?;
+            let e = parse_exp(tokens)?;
+            consume_token(tokens, Tok::Comma)?;
+            let err = parse_exp(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            let cond = {
+                let loc = e.loc;
+                sp(loc, Exp_::UnaryExp(UnaryOp::Not, Box::new(e)))
+            };
+            Ok(Statement_::Assert(Box::new(cond), Box::new(err)))
+        }
+        Tok::Jump => {
+            consume_token(tokens, Tok::Jump)?;
+            Ok(Statement_::Jump(parse_label(tokens)?))
+        }
+        Tok::JumpIf => {
+            consume_token(tokens, Tok::JumpIf)?;
+            consume_token(tokens, Tok::LParen)?;
+            let cond = parse_exp(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            Ok(Statement_::JumpIf(Box::new(cond), parse_label(tokens)?))
+        }
+        Tok::JumpIfFalse => {
+            consume_token(tokens, Tok::JumpIfFalse)?;
+            consume_token(tokens, Tok::LParen)?;
+            let cond = parse_exp(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            Ok(Statement_::JumpIfFalse(
+                Box::new(cond),
+                parse_label(tokens)?,
+            ))
+        }
+        Tok::NameValue => {
+            // This could be either an LValue for an assignment or
+            // NameAndTypeActuals (with no type_actuals) for an unpack.
+            if tokens.lookahead()? == Tok::LBrace {
+                let name = parse_name(tokens)?;
+                parse_unpack_(tokens, name, vec![])
+            } else {
+                parse_assign_(tokens)
+            }
+        }
+        Tok::Return => {
+            tokens.advance()?;
+            let start = tokens.start_loc();
+            let v = parse_comma_list(tokens, &[Tok::Semicolon], parse_exp, true)?;
+            let end = tokens.start_loc();
+            Ok(Statement_::Return(Box::new(spanned(
+                tokens.file_hash(),
+                start,
+                end,
+                Exp_::ExprList(v),
+            ))))
+        }
+        Tok::Star | Tok::Underscore => parse_assign_(tokens),
+        Tok::NameBeginTyValue => {
+            let (name, tys) = parse_name_and_type_actuals(tokens)?;
+            parse_unpack_(tokens, name, tys)
+        }
+        Tok::VecPack(_)
+        | Tok::VecLen
+        | Tok::VecImmBorrow
+        | Tok::VecMutBorrow
+        | Tok::VecPushBack
+        | Tok::VecPopBack
+        | Tok::VecUnpack(_)
+        | Tok::VecSwap
+        | Tok::Freeze
+        | Tok::DotNameValue
+        | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
+        | Tok::ToU64
+        | Tok::ToU128
+        | Tok::ToU256 => Ok(Statement_::Exp(Box::new(parse_call(tokens)?))),
+        Tok::LParen => {
+            tokens.advance()?;
+            let start = tokens.start_loc();
+            let v = parse_comma_list(tokens, &[Tok::RParen], parse_exp, true)?;
+            consume_token(tokens, Tok::RParen)?;
+            let end = tokens.start_loc();
+            Ok(Statement_::Exp(Box::new(spanned(
+                tokens.file_hash(),
+                start,
+                end,
+                Exp_::ExprList(v),
+            ))))
+        }
+        t => Err(ParseError::InvalidToken {
+            location: current_token_loc(tokens),
+            message: format!("invalid token kind for statement {:?}", t),
+        }),
+    }
+}
+
+/// Parses a statement with its location.
+fn parse_statement(tokens: &mut Lexer) -> Result<Statement, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let c = parse_statement_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    let cmd = spanned(tokens.file_hash(), start_loc, end_loc, c);
+    consume_token(tokens, Tok::Semicolon)?;
+    Ok(cmd)
+}
+
+/// Parses a label declaration for a block, e.g.: `label b0:`.
+fn parse_block_label(tokens: &mut Lexer) -> Result<BlockLabel, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Label)?;
+    let label = parse_label(tokens)?;
+    consume_token(tokens, Tok::Colon)?;
+    Ok(label)
+}
+
+/// Parses a label identifier, e.g.: the `b0` in the statement `jump b0;`.
+fn parse_label(tokens: &mut Lexer) -> Result<BlockLabel, ParseError<Loc, anyhow::Error>> {
+    let start = tokens.start_loc();
+    let name = parse_name(tokens)?;
+    let end = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start, end, BlockLabel_(name)))
+}
+
+/// Parses a sequence of blocks, such as would appear within the `{` and `}` delimiters of a
+/// function body.
+fn parse_blocks(tokens: &mut Lexer) -> Result<Vec<Block>, ParseError<Loc, anyhow::Error>> {
+    let mut blocks = vec![];
+    while tokens.peek() != Tok::RBrace {
+        blocks.push(parse_block(tokens)?);
+    }
+    Ok(blocks)
+}
+
+/// Parses a block: its block label `label b:`, and a sequence of 0 or more statements.
+fn parse_block(tokens: &mut Lexer) -> Result<Block, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let label = parse_block_label(tokens)?;
+    let mut statements = vec![];
+    while !matches!(tokens.peek(), Tok::Label | Tok::RBrace) {
+        statements.push(parse_statement(tokens)?);
+    }
+    Ok(spanned(
+        tokens.file_hash(),
+        start_loc,
+        tokens.previous_end_loc(),
+        Block_::new(label, statements),
+    ))
+}
+
+// Declaration: (Var_, Type) = {
+//   "let" <v: Sp<Var>> ":" <t: Type> ";" => (v, t),
+// }
+
+fn parse_declaration(tokens: &mut Lexer) -> Result<(Var, Type), ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Let)?;
+    let v = parse_var(tokens)?;
+    consume_token(tokens, Tok::Colon)?;
+    let t = parse_type(tokens)?;
+    consume_token(tokens, Tok::Semicolon)?;
+    Ok((v, t))
+}
+
+// Declarations: Vec<(Var_, Type)> = {
+//     <Declaration*>
+// }
+
+fn parse_declarations(
+    tokens: &mut Lexer,
+) -> Result<Vec<(Var, Type)>, ParseError<Loc, anyhow::Error>> {
+    let mut decls: Vec<(Var, Type)> = vec![];
+    // Declarations always begin with the "let" token so continue parsing
+    // them until we hit something else.
+    while tokens.peek() == Tok::Let {
+        decls.push(parse_declaration(tokens)?);
+    }
+    Ok(decls)
+}
+
+// FunctionBlock: (Vec<(Var_, Type)>, Block) = {
+//     "{" <locals: Declarations> <stmts: Statements> "}" => (locals, Block::new(stmts))
+// }
+
+fn parse_function_block_(
+    tokens: &mut Lexer,
+) -> Result<(Vec<(Var, Type)>, Vec<Block>), ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::LBrace)?;
+    let locals = parse_declarations(tokens)?;
+    let statements = parse_blocks(tokens)?;
+    consume_token(tokens, Tok::RBrace)?;
+    Ok((locals, statements))
+}
+
+fn token_to_ability(token: Tok, contents: &str) -> Option<Ability> {
+    match (token, contents) {
+        (Tok::Copy, _) => Some(Ability::Copy),
+        (Tok::NameValue, Ability::DROP) => Some(Ability::Drop),
+        (Tok::NameValue, Ability::STORE) => Some(Ability::Store),
+        (Tok::NameValue, Ability::KEY) => Some(Ability::Key),
+        _ => None,
+    }
+}
+
+// Ability: Ability = {
+//     "copy" => Ability::Copy,
+//     "drop" => Ability::Drop,
+//     "store" => Ability::Store,
+//     "key" => Ability::Key,
+// }
+fn parse_ability(tokens: &mut Lexer) -> Result<(Ability, Loc), ParseError<Loc, anyhow::Error>> {
+    let a = match token_to_ability(tokens.peek(), tokens.content()) {
+        Some(a) => (a, current_token_loc(tokens)),
+        None => {
+            return Err(ParseError::InvalidToken {
+                location: current_token_loc(tokens),
+                message: "could not parse ability".to_string(),
+            })
+        }
+    };
+    tokens.advance()?;
+    Ok(a)
+}
+
+// Type: Type = {
+//     "address" => Type::Address,
+//     "signer" => Type::Signer,
+//     "u64" => Type::U64,
+//     "bool" => Type::Bool,
+//     "bytearray" => Type::ByteArray,
+//     <s: QualifiedStructIdent> <tys: TypeActuals> => Type::Struct(s, tys),
+//     "&" <t: Type> => Type::Reference(false, Box::new(t)),
+//     "&mut " <t: Type> => Type::Reference(true, Box::new(t)),
+//     <n: Name> =>? Ok(Type::TypeParameter(TypeVar::parse(n)?)),
+// }
+
+fn parse_type(tokens: &mut Lexer) -> Result<Type, ParseError<Loc, anyhow::Error>> {
+    let t = match tokens.peek() {
+        Tok::NameValue if matches!(tokens.content(), "address") => {
+            tokens.advance()?;
+            Type::Address
+        }
+        Tok::NameValue if matches!(tokens.content(), "u8") => {
+            tokens.advance()?;
+            Type::U8
+        }
+        Tok::NameValue if matches!(tokens.content(), "u16") => {
+            tokens.advance()?;
+            Type::U16
+        }
+        Tok::NameValue if matches!(tokens.content(), "u32") => {
+            tokens.advance()?;
+            Type::U32
+        }
+        Tok::NameValue if matches!(tokens.content(), "u64") => {
+            tokens.advance()?;
+            Type::U64
+        }
+        Tok::NameValue if matches!(tokens.content(), "u128") => {
+            tokens.advance()?;
+            Type::U128
+        }
+        Tok::NameValue if matches!(tokens.content(), "u256") => {
+            tokens.advance()?;
+            Type::U256
+        }
+        Tok::NameValue if matches!(tokens.content(), "bool") => {
+            tokens.advance()?;
+            Type::Bool
+        }
+        Tok::NameValue if matches!(tokens.content(), "signer") => {
+            tokens.advance()?;
+            Type::Signer
+        }
+        Tok::NameBeginTyValue if matches!(tokens.content(), "vector<") => {
+            tokens.advance()?;
+            let ty = parse_type(tokens)?;
+            adjust_token(tokens, &[Tok::Greater])?;
+            consume_token(tokens, Tok::Greater)?;
+            Type::Vector(Box::new(ty))
+        }
+        Tok::DotNameValue => {
+            let s = parse_qualified_struct_ident(tokens)?;
+            let tys = parse_type_actuals(tokens)?;
+            Type::Struct(s, tys)
+        }
+        Tok::Amp => {
+            tokens.advance()?;
+            Type::Reference(false, Box::new(parse_type(tokens)?))
+        }
+        Tok::AmpMut => {
+            tokens.advance()?;
+            Type::Reference(true, Box::new(parse_type(tokens)?))
+        }
+        Tok::NameValue => Type::TypeParameter(TypeVar_(parse_name(tokens)?)),
+        t => {
+            return Err(ParseError::InvalidToken {
+                location: current_token_loc(tokens),
+                message: format!("invalid token kind for type {:?}", t),
+            })
+        }
+    };
+    Ok(t)
+}
+
+// TypeVar: TypeVar = {
+//     <n: Name> =>? TypeVar::parse(n),
+// }
+// TypeVar_ = Sp<TypeVar>;
+
+fn parse_type_var(tokens: &mut Lexer) -> Result<TypeVar, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    let type_var = TypeVar_(parse_name(tokens)?);
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(tokens.file_hash(), start_loc, end_loc, type_var))
+}
+
+fn parse_type_parameter_with_phantom_decl(
+    tokens: &mut Lexer,
+) -> Result<StructTypeParameter, ParseError<Loc, anyhow::Error>> {
+    let is_phantom = if tokens.peek() == Tok::NameValue && tokens.content() == "phantom" {
+        tokens.advance()?;
+        true
+    } else {
+        false
+    };
+    let (type_var, abilities) = parse_type_parameter(tokens)?;
+    Ok((is_phantom, type_var, abilities))
+}
+
+// TypeFormal: (TypeVar_, Kind) = {
+//     <type_var: Sp<TypeVar>> <k: (":" <Ability> ("+" <Ability>)*)?> =>? {
+// }
+
+fn parse_type_parameter(
+    tokens: &mut Lexer,
+) -> Result<(TypeVar, BTreeSet<Ability>), ParseError<Loc, anyhow::Error>> {
+    let type_var = parse_type_var(tokens)?;
+    if tokens.peek() == Tok::Colon {
+        tokens.advance()?; // consume the ":"
+        let abilities = parse_list(
+            tokens,
+            |tokens| {
+                if tokens.peek() == Tok::Plus {
+                    tokens.advance()?;
+                    Ok(true)
+                } else {
+                    Ok(false)
+                }
+            },
+            parse_ability,
+        )?;
+        let mut ability_set = BTreeSet::new();
+        for (ability, location) in abilities {
+            let was_new_element = ability_set.insert(ability);
+            if !was_new_element {
+                return Err(ParseError::User {
+                    location,
+                    error: anyhow!("Duplicate ability '{}'", ability),
+                });
+            }
+        }
+        Ok((type_var, ability_set))
+    } else {
+        Ok((type_var, BTreeSet::new()))
+    }
+}
+
+// TypeActuals: Vec<Type> = {
+//     <tys: ('<' <Comma<Type>> ">")?> => { ... }
+// }
+
+fn parse_type_actuals(tokens: &mut Lexer) -> Result<Vec<Type>, ParseError<Loc, anyhow::Error>> {
+    let tys = if tokens.peek() == Tok::Less {
+        tokens.advance()?; // consume the '<'
+        let list = parse_comma_list(tokens, &[Tok::Greater], parse_type, true)?;
+        consume_token(tokens, Tok::Greater)?;
+        list
+    } else {
+        vec![]
+    };
+    Ok(tys)
+}
+
+// NameAndTypeFormals: (String, Vec<(TypeVar_, Kind)>) = {
+//     <n: NameBeginTy> <k: Comma<TypeFormal>> ">" => (n, k),
+//     <n: Name> => (n, vec![]),
+// }
+
+fn parse_name_and_type_parameters<T, F>(
+    tokens: &mut Lexer,
+    param_parser: F,
+) -> Result<(Symbol, Vec<T>), ParseError<Loc, anyhow::Error>>
+where
+    F: Fn(&mut Lexer) -> Result<T, ParseError<Loc, anyhow::Error>>,
+{
+    let mut has_types = false;
+    let n = if tokens.peek() == Tok::NameBeginTyValue {
+        has_types = true;
+        parse_name_begin_ty(tokens)?
+    } else {
+        parse_name(tokens)?
+    };
+    let k = if has_types {
+        let list = parse_comma_list(tokens, &[Tok::Greater], param_parser, true)?;
+        consume_token(tokens, Tok::Greater)?;
+        list
+    } else {
+        vec![]
+    };
+    Ok((n, k))
+}
+
+// NameAndTypeActuals: (String, Vec<Type>) = {
+//     <n: NameBeginTy> '<' <tys: Comma<Type>> ">" => (n, tys),
+//     <n: Name> => (n, vec![]),
+// }
+
+fn parse_name_and_type_actuals(
+    tokens: &mut Lexer,
+) -> Result<(Symbol, Vec<Type>), ParseError<Loc, anyhow::Error>> {
+    let mut has_types = false;
+    let n = if tokens.peek() == Tok::NameBeginTyValue {
+        has_types = true;
+        parse_name_begin_ty(tokens)?
+    } else {
+        parse_name(tokens)?
+    };
+    let tys = if has_types {
+        let list = parse_comma_list(tokens, &[Tok::Greater], parse_type, true)?;
+        consume_token(tokens, Tok::Greater)?;
+        list
+    } else {
+        vec![]
+    };
+    Ok((n, tys))
+}
+
+// ArgDecl : (Var_, Type) = {
+//     <v: Sp<Var>> ":" <t: Type> => (v, t)
+// }
+
+fn parse_arg_decl(tokens: &mut Lexer) -> Result<(Var, Type), ParseError<Loc, anyhow::Error>> {
+    let v = parse_var(tokens)?;
+    consume_token(tokens, Tok::Colon)?;
+    let t = parse_type(tokens)?;
+    Ok((v, t))
+}
+
+// ReturnType: Vec<Type> = {
+//     ":" <t: Type> <v: ("*" <Type>)*> => { ... }
+// }
+
+fn parse_return_type(tokens: &mut Lexer) -> Result<Vec<Type>, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Colon)?;
+    let t = parse_type(tokens)?;
+    let mut v = vec![t];
+    while tokens.peek() == Tok::Star {
+        tokens.advance()?;
+        v.push(parse_type(tokens)?);
+    }
+    Ok(v)
+}
+
+/// Spec language parsing ///
+
+// parses Name '.' Name and returns pair of strings.
+fn spec_parse_dot_name(
+    tokens: &mut Lexer,
+) -> Result<(Symbol, Symbol), ParseError<Loc, anyhow::Error>> {
+    let name1 = parse_name(tokens)?;
+    consume_token(tokens, Tok::Period)?;
+    let name2 = parse_name(tokens)?;
+    Ok((name1, name2))
+}
+
+fn spec_parse_qualified_struct_ident(
+    tokens: &mut Lexer,
+) -> Result<QualifiedStructIdent, ParseError<Loc, anyhow::Error>> {
+    let (m_string, n_string) = spec_parse_dot_name(tokens)?;
+    let m: ModuleName = ModuleName(m_string);
+    let n: StructName = StructName(n_string);
+    Ok(QualifiedStructIdent::new(m, n))
+}
+
+fn parse_storage_location(
+    tokens: &mut Lexer,
+) -> Result<StorageLocation, ParseError<Loc, anyhow::Error>> {
+    let base = match tokens.peek() {
+        Tok::SpecReturn => {
+            // RET(i)
+            tokens.advance()?;
+            let i = {
+                if tokens.peek() == Tok::LParen {
+                    consume_token(tokens, Tok::LParen)?;
+                    let i = u8::from_str(tokens.content()).unwrap();
+                    consume_token(tokens, Tok::U64Value)?;
+                    consume_token(tokens, Tok::RParen)?;
+                    i
+                } else {
+                    // RET without brackets; use RET(0)
+                    0
+                }
+            };
+
+            StorageLocation::Ret(i)
+        }
+        Tok::AccountAddressValue => StorageLocation::Address(parse_account_address(tokens)?),
+        Tok::Global => {
+            consume_token(tokens, Tok::Global)?;
+            consume_token(tokens, Tok::Less)?;
+            let type_ = spec_parse_qualified_struct_ident(tokens)?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            consume_token(tokens, Tok::Greater)?;
+            consume_token(tokens, Tok::LParen)?;
+            let address = Box::new(parse_storage_location(tokens)?);
+            consume_token(tokens, Tok::RParen)?;
+            StorageLocation::GlobalResource {
+                type_,
+                type_actuals,
+                address,
+            }
+        }
+        _ => StorageLocation::Formal(parse_name(tokens)?),
+    };
+
+    // parsed the storage location base. now parse its fields and indices (if any)
+    let mut fields_and_indices = vec![];
+    loop {
+        let tok = tokens.peek();
+        if tok == Tok::Period {
+            tokens.advance()?;
+            fields_and_indices.push(FieldOrIndex::Field(parse_field(tokens)?.value));
+        } else if tok == Tok::LSquare {
+            tokens.advance()?;
+            // Index expr can be ordinary expr, subrange, or update.
+            let index_exp = parse_spec_exp(tokens)?;
+            fields_and_indices.push(FieldOrIndex::Index(index_exp));
+            consume_token(tokens, Tok::RSquare)?;
+        } else {
+            break;
+        }
+    }
+    if fields_and_indices.is_empty() {
+        Ok(base)
+    } else {
+        Ok(StorageLocation::AccessPath {
+            base: Box::new(base),
+            fields_and_indices,
+        })
+    }
+}
+
+fn parse_unary_spec_exp(tokens: &mut Lexer) -> Result<SpecExp, ParseError<Loc, anyhow::Error>> {
+    Ok(match tokens.peek() {
+        Tok::AccountAddressValue
+        | Tok::True
+        | Tok::False
+        | Tok::U8Value
+        | Tok::U16Value
+        | Tok::U32Value
+        | Tok::U64Value
+        | Tok::U128Value
+        | Tok::U256Value
+        | Tok::ByteArrayValue => SpecExp::Constant(parse_copyable_val(tokens)?.value),
+        Tok::GlobalExists => {
+            consume_token(tokens, Tok::GlobalExists)?;
+            consume_token(tokens, Tok::Less)?;
+            let type_ = spec_parse_qualified_struct_ident(tokens)?;
+            let type_actuals = parse_type_actuals(tokens)?;
+            consume_token(tokens, Tok::Greater)?;
+            consume_token(tokens, Tok::LParen)?;
+            let address = parse_storage_location(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            SpecExp::GlobalExists {
+                type_,
+                type_actuals,
+                address,
+            }
+        }
+        Tok::Star => {
+            tokens.advance()?;
+            let stloc = parse_storage_location(tokens)?;
+            SpecExp::Dereference(stloc)
+        }
+        Tok::Amp => {
+            tokens.advance()?;
+            let stloc = parse_storage_location(tokens)?;
+            SpecExp::Reference(stloc)
+        }
+        Tok::Exclaim => {
+            tokens.advance()?;
+            let exp = parse_unary_spec_exp(tokens)?;
+            SpecExp::Not(Box::new(exp))
+        }
+        Tok::Old => {
+            tokens.advance()?;
+            consume_token(tokens, Tok::LParen)?;
+            let exp = parse_spec_exp(tokens)?;
+            consume_token(tokens, Tok::RParen)?;
+            SpecExp::Old(Box::new(exp))
+        }
+        Tok::NameValue => {
+            let next = tokens.lookahead();
+            if next.is_err() || next.unwrap() != Tok::LParen {
+                SpecExp::StorageLocation(parse_storage_location(tokens)?)
+            } else {
+                let name = parse_name(tokens)?;
+                let mut args = vec![];
+                consume_token(tokens, Tok::LParen)?;
+                while tokens.peek() != Tok::RParen {
+                    let exp = parse_spec_exp(tokens)?;
+                    args.push(exp);
+                    if tokens.peek() != Tok::Comma {
+                        break;
+                    }
+                    consume_token(tokens, Tok::Comma)?;
+                }
+                consume_token(tokens, Tok::RParen)?;
+                SpecExp::Call(name, args)
+            }
+        }
+        _ => SpecExp::StorageLocation(parse_storage_location(tokens)?),
+    })
+}
+
+fn parse_rhs_of_spec_exp(
+    tokens: &mut Lexer,
+    lhs: SpecExp,
+    min_prec: u32,
+) -> Result<SpecExp, ParseError<Loc, anyhow::Error>> {
+    let mut result = lhs;
+    let mut next_tok_prec = get_precedence(tokens.peek());
+
+    // Continue parsing binary expressions as long as they have they
+    // specified minimum precedence.
+    while next_tok_prec >= min_prec {
+        let op_token = tokens.peek();
+        tokens.advance()?;
+
+        let mut rhs = parse_unary_spec_exp(tokens)?;
+
+        // If the next token is another binary operator with a higher
+        // precedence, then recursively parse that expression as the RHS.
+        let this_prec = next_tok_prec;
+        next_tok_prec = get_precedence(tokens.peek());
+        if this_prec < next_tok_prec {
+            rhs = parse_rhs_of_spec_exp(tokens, rhs, this_prec + 1)?;
+            next_tok_prec = get_precedence(tokens.peek());
+        }
+        // TODO: Should we treat ==> like a normal BinOp?
+        // TODO: Implement IFF
+        if op_token == Tok::EqualEqualGreater {
+            // Syntactic sugar: p ==> c ~~~> !p || c
+            result = SpecExp::Binop(
+                Box::new(SpecExp::Not(Box::new(result))),
+                BinOp::Or,
+                Box::new(rhs),
+            );
+        } else if op_token == Tok::ColonEqual {
+            // it's an update expr
+            result = SpecExp::Update(Box::new(result), Box::new(rhs))
+        } else {
+            let op = match op_token {
+                Tok::EqualEqual => BinOp::Eq,
+                Tok::ExclaimEqual => BinOp::Neq,
+                Tok::Less => BinOp::Lt,
+                Tok::Greater => BinOp::Gt,
+                Tok::LessEqual => BinOp::Le,
+                Tok::GreaterEqual => BinOp::Ge,
+                Tok::PipePipe => BinOp::Or,
+                Tok::AmpAmp => BinOp::And,
+                Tok::Caret => BinOp::Xor,
+                Tok::Pipe => BinOp::BitOr,
+                Tok::Amp => BinOp::BitAnd,
+                Tok::Plus => BinOp::Add,
+                Tok::Minus => BinOp::Sub,
+                Tok::Star => BinOp::Mul,
+                Tok::Slash => BinOp::Div,
+                Tok::Percent => BinOp::Mod,
+                Tok::PeriodPeriod => BinOp::Subrange,
+                _ => panic!("Unexpected token that is not a binary operator"),
+            };
+            result = SpecExp::Binop(Box::new(result), op, Box::new(rhs))
+        }
+    }
+    Ok(result)
+}
+
+fn parse_spec_exp(tokens: &mut Lexer) -> Result<SpecExp, ParseError<Loc, anyhow::Error>> {
+    let lhs = parse_unary_spec_exp(tokens)?;
+    parse_rhs_of_spec_exp(tokens, lhs, /* min_prec */ 1)
+}
+
+// Parse a top-level requires, modifies, ensures, aborts_if, or succeeds_if spec
+// in a function decl.  This has to set the lexer into "spec_mode" to
+// return names without eating trailing punctuation such as '<' or '.'.
+// That is needed to parse paths with dots separating field names.
+fn parse_spec_condition(tokens: &mut Lexer) -> Result<Condition_, ParseError<Loc, anyhow::Error>> {
+    // Set lexer to read names without trailing punctuation
+    tokens.spec_mode = true;
+    let retval = Ok(match tokens.peek() {
+        Tok::AbortsIf => {
+            tokens.advance()?;
+            Condition_::AbortsIf(parse_spec_exp(tokens)?)
+        }
+        Tok::Ensures => {
+            tokens.advance()?;
+            Condition_::Ensures(parse_spec_exp(tokens)?)
+        }
+        Tok::Requires => {
+            tokens.advance()?;
+            Condition_::Requires(parse_spec_exp(tokens)?)
+        }
+        Tok::SucceedsIf => {
+            tokens.advance()?;
+            Condition_::SucceedsIf(parse_spec_exp(tokens)?)
+        }
+        t => {
+            tokens.spec_mode = false;
+            return Err(ParseError::InvalidToken {
+                location: current_token_loc(tokens),
+                message: format!("invalid token kind for spec condition {:?}", t),
+            });
+        }
+    });
+    tokens.spec_mode = false;
+    retval
+}
+
+fn parse_invariant(tokens: &mut Lexer) -> Result<Invariant, ParseError<Loc, anyhow::Error>> {
+    // Set lexer to read names without trailing punctuation
+    tokens.spec_mode = true;
+    let start = tokens.start_loc();
+    let result = parse_invariant_(tokens);
+    tokens.spec_mode = false;
+    Ok(spanned(
+        tokens.file_hash(),
+        start,
+        tokens.previous_end_loc(),
+        result?,
+    ))
+}
+
+fn parse_invariant_(tokens: &mut Lexer) -> Result<Invariant_, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Invariant)?;
+    let modifier = if tokens.peek() == Tok::LBrace {
+        tokens.advance()?;
+        let s = parse_name(tokens)?;
+        consume_token(tokens, Tok::RBrace)?;
+        Some(s)
+    } else {
+        None
+    };
+    // Check whether this invariant has the assignment form `invariant target = <expr>;`
+    let target = if tokens.peek() == Tok::NameValue {
+        // There must always be some token following (e.g. ;), so we can force lookahead.
+        if tokens.lookahead()? == Tok::Equal {
+            let name = parse_name(tokens)?;
+            consume_token(tokens, Tok::Equal)?;
+            Some(name)
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+    let condition = parse_spec_exp(tokens)?;
+    Ok(Invariant_ {
+        modifier,
+        target,
+        exp: condition,
+    })
+}
+
+fn parse_synthetic(
+    tokens: &mut Lexer,
+) -> Result<SyntheticDefinition, ParseError<Loc, anyhow::Error>> {
+    // Set lexer to read names without trailing punctuation
+    tokens.spec_mode = true;
+    let start = tokens.start_loc();
+    let result = parse_synthetic_(tokens);
+    tokens.spec_mode = false;
+    Ok(spanned(
+        tokens.file_hash(),
+        start,
+        tokens.previous_end_loc(),
+        result?,
+    ))
+}
+
+fn parse_synthetic_(
+    tokens: &mut Lexer,
+) -> Result<SyntheticDefinition_, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Synthetic)?;
+    let field = parse_field(tokens)?;
+    let name = field.value.0;
+    consume_token(tokens, Tok::Colon)?;
+    let type_ = parse_type(tokens)?;
+    consume_token(tokens, Tok::Semicolon)?;
+    Ok(SyntheticDefinition_ { name, type_ })
+}
+
+// FunctionVisibility : FunctionVisibility = {
+//   (Public("("<v: Script | Friend>")")?)?
+// }
+fn parse_function_visibility(
+    tokens: &mut Lexer,
+) -> Result<FunctionVisibility, ParseError<Loc, anyhow::Error>> {
+    let visibility = if match_token(tokens, Tok::Public)? {
+        let sub_public_vis = if match_token(tokens, Tok::LParen)? {
+            let sub_token = tokens.peek();
+            match &sub_token {
+                Tok::Script | Tok::Friend => (),
+                t => {
+                    return Err(ParseError::InvalidToken {
+                        location: current_token_loc(tokens),
+                        message: format!("expected Tok::Script or Tok::Friend, not {:?}", t),
+                    });
+                }
+            }
+            tokens.advance()?;
+            consume_token(tokens, Tok::RParen)?;
+            Some(sub_token)
+        } else {
+            None
+        };
+        match sub_public_vis {
+            None => FunctionVisibility::Public,
+            Some(Tok::Friend) => FunctionVisibility::Friend,
+            _ => panic!("Unexpected token that is not a visibility modifier"),
+        }
+    } else {
+        FunctionVisibility::Internal
+    };
+    Ok(visibility)
+}
+
+// FunctionDecl : (FunctionName, Function_) = {
+//   <f: Sp<MoveFunctionDecl>> => (f.value.0, Spanned { span: f.loc, value: f.value.1 }),
+//   <f: Sp<NativeFunctionDecl>> => (f.value.0, Spanned { span: f.loc, value: f.value.1 }),
+// }
+
+// MoveFunctionDecl : (FunctionName, Function) = {
+//     <v: FunctionVisibility> <name_and_type_parameters: NameAndTypeFormals>
+//     "(" <args: (ArgDecl)*> ")" <ret: ReturnType?>
+//         <acquires: AcquireList?>
+//         <locals_body: FunctionBlock> =>? { ... }
+// }
+
+// NativeFunctionDecl: (FunctionName, Function) = {
+//     <nat: NativeTag> <v: FunctionVisibility> <name_and_type_parameters: NameAndTypeFormals>
+//     "(" <args: Comma<ArgDecl>> ")" <ret: ReturnType?>
+//         <acquires: AcquireList?>
+//         ";" =>? { ... }
+// }
+
+fn parse_function_decl(
+    tokens: &mut Lexer,
+) -> Result<(FunctionName, Function), ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+
+    let is_native = if tokens.peek() == Tok::Native {
+        tokens.advance()?;
+        true
+    } else {
+        false
+    };
+
+    let visibility = parse_function_visibility(tokens)?;
+    let is_entry = if tokens.peek() == Tok::NameValue && tokens.content() == "entry" {
+        tokens.advance()?;
+        true
+    } else {
+        false
+    };
+
+    let (name, type_parameters) = parse_name_and_type_parameters(tokens, parse_type_parameter)?;
+    consume_token(tokens, Tok::LParen)?;
+    let args = parse_comma_list(tokens, &[Tok::RParen], parse_arg_decl, true)?;
+    consume_token(tokens, Tok::RParen)?;
+
+    let ret = if tokens.peek() == Tok::Colon {
+        Some(parse_return_type(tokens)?)
+    } else {
+        None
+    };
+
+    // parse each specification directive--there may be zero or more
+    let mut specifications = Vec::new();
+    while tokens.peek().is_spec_directive() {
+        let start_loc = tokens.start_loc();
+        let cond = parse_spec_condition(tokens)?;
+        let end_loc = tokens.previous_end_loc();
+        specifications.push(spanned(tokens.file_hash(), start_loc, end_loc, cond));
+    }
+
+    let func_name = FunctionName(name);
+    let func = Function_::new(
+        visibility,
+        is_entry,
+        args,
+        ret.unwrap_or_default(),
+        type_parameters,
+        specifications,
+        if is_native {
+            consume_token(tokens, Tok::Semicolon)?;
+            FunctionBody::Native
+        } else {
+            let (locals, body) = parse_function_block_(tokens)?;
+            FunctionBody::Move { locals, code: body }
+        },
+    );
+
+    let end_loc = tokens.previous_end_loc();
+    Ok((
+        func_name,
+        spanned(tokens.file_hash(), start_loc, end_loc, func),
+    ))
+}
+
+// FieldDecl : (Field_, Type) = {
+//     <f: Sp<Field>> ":" <t: Type> => (f, t)
+// }
+
+fn parse_field_decl(tokens: &mut Lexer) -> Result<(Field, Type), ParseError<Loc, anyhow::Error>> {
+    let f = parse_field(tokens)?;
+    consume_token(tokens, Tok::Colon)?;
+    let t = parse_type(tokens)?;
+    Ok((f, t))
+}
+
+// pub Script : Script = {
+//     <imports: (ImportDecl)*>
+//     "main" "(" <args: Comma<ArgDecl>> ")" <locals_body: FunctionBlock> => { ... }
+// }
+
+fn parse_script(tokens: &mut Lexer) -> Result<Script, ParseError<Loc, anyhow::Error>> {
+    let script_start = tokens.start_loc();
+    let mut imports: Vec<ImportDefinition> = vec![];
+    while tokens.peek() == Tok::Import {
+        imports.push(parse_import_decl(tokens)?);
+    }
+    let fun_start = tokens.start_loc();
+    consume_token(tokens, Tok::Main)?;
+    let type_formals = if tokens.peek() == Tok::Less {
+        consume_token(tokens, Tok::Less)?;
+        let list = parse_comma_list(tokens, &[Tok::Greater], parse_type_parameter, true)?;
+        consume_token(tokens, Tok::Greater)?;
+        list
+    } else {
+        vec![]
+    };
+    consume_token(tokens, Tok::LParen)?;
+    let args = parse_comma_list(tokens, &[Tok::RParen], parse_arg_decl, true)?;
+    consume_token(tokens, Tok::RParen)?;
+    let (locals, code) = parse_function_block_(tokens)?;
+    let end_loc = tokens.previous_end_loc();
+    let main = Function_::new(
+        FunctionVisibility::Public,
+        /* is_entry */ true,
+        args,
+        vec![],
+        type_formals,
+        vec![],
+        FunctionBody::Move { locals, code },
+    );
+    let main = spanned(tokens.file_hash(), fun_start, end_loc, main);
+    let loc = make_loc(tokens.file_hash(), script_start, end_loc);
+    Ok(Script::new(loc, imports, vec![], vec![], main))
+}
+
+// StructDecl: StructDefinition_ = {
+//     "struct" <name_and_type_parameters:
+//     NameAndTypeFormals> ("has" <Ability> ("," <Ability)*)? "{" <data: Comma<FieldDecl>> "}"
+//     =>? { ... }
+//     <native: NativeTag> <name_and_type_parameters: NameAndTypeFormals>
+//     ("has" <Ability> ("," <Ability)*)?";" =>? { ... }
+// }
+fn parse_struct_decl(
+    tokens: &mut Lexer,
+) -> Result<StructDefinition, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+
+    let is_native = if tokens.peek() == Tok::Native {
+        tokens.advance()?;
+        true
+    } else {
+        false
+    };
+
+    consume_token(tokens, Tok::Struct)?;
+    let (name, type_parameters) =
+        parse_name_and_type_parameters(tokens, parse_type_parameter_with_phantom_decl)?;
+
+    let mut abilities = BTreeSet::new();
+    if tokens.peek() == Tok::NameValue && tokens.content() == "has" {
+        tokens.advance()?;
+        let abilities_vec =
+            parse_comma_list(tokens, &[Tok::LBrace, Tok::Semicolon], parse_ability, false)?;
+        for (ability, location) in abilities_vec {
+            let was_new_element = abilities.insert(ability);
+            if !was_new_element {
+                return Err(ParseError::User {
+                    location,
+                    error: anyhow!("Duplicate ability '{}'", ability),
+                });
+            }
+        }
+    }
+
+    if is_native {
+        consume_token(tokens, Tok::Semicolon)?;
+        let end_loc = tokens.previous_end_loc();
+        return Ok(spanned(
+            tokens.file_hash(),
+            start_loc,
+            end_loc,
+            StructDefinition_::native(abilities, name, type_parameters),
+        ));
+    }
+
+    consume_token(tokens, Tok::LBrace)?;
+    let fields = parse_comma_list(
+        tokens,
+        &[Tok::RBrace, Tok::Invariant],
+        parse_field_decl,
+        true,
+    )?;
+    let invariants = if tokens.peek() == Tok::Invariant {
+        parse_comma_list(tokens, &[Tok::RBrace], parse_invariant, true)?
+    } else {
+        vec![]
+    };
+    consume_token(tokens, Tok::RBrace)?;
+    let end_loc = tokens.previous_end_loc();
+    Ok(spanned(
+        tokens.file_hash(),
+        start_loc,
+        end_loc,
+        StructDefinition_::move_declared(abilities, name, type_parameters, fields, invariants),
+    ))
+}
+
+// ModuleIdent: ModuleIdent = {
+//     <a: AccountAddress> "." <m: ModuleName> => ModuleIdent::new(m, a),
+// }
+
+fn parse_module_ident(tokens: &mut Lexer) -> Result<ModuleIdent, ParseError<Loc, anyhow::Error>> {
+    let a = parse_account_address(tokens)?;
+    consume_token(tokens, Tok::Period)?;
+    let m = parse_module_name(tokens)?;
+    Ok(ModuleIdent::new(m, a))
+}
+
+// FriendDecl: ModuleIdent = {
+//     "friend" <ident: ModuleIdent> ";" => { ... }
+// }
+
+fn parse_friend_decl(tokens: &mut Lexer) -> Result<ModuleIdent, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Friend)?;
+    let ident = parse_module_ident(tokens)?;
+    consume_token(tokens, Tok::Semicolon)?;
+    Ok(ident)
+}
+
+// ImportAlias: ModuleName = {
+//     "as" <alias: ModuleName> => { ... }
+// }
+
+fn parse_import_alias(tokens: &mut Lexer) -> Result<ModuleName, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::As)?;
+    let alias = parse_module_name(tokens)?;
+    if alias == ModuleName::module_self() {
+        panic!(
+            "Invalid use of reserved module alias '{}'",
+            ModuleName::self_name()
+        );
+    }
+    Ok(alias)
+}
+
+// ImportDecl: ImportDefinition = {
+//     "import" <ident: ModuleIdent> <alias: ImportAlias?> ";" => { ... }
+// }
+
+fn parse_import_decl(
+    tokens: &mut Lexer,
+) -> Result<ImportDefinition, ParseError<Loc, anyhow::Error>> {
+    consume_token(tokens, Tok::Import)?;
+    let ident = parse_module_ident(tokens)?;
+    let alias = if tokens.peek() == Tok::As {
+        Some(parse_import_alias(tokens)?)
+    } else {
+        None
+    };
+    consume_token(tokens, Tok::Semicolon)?;
+    Ok(ImportDefinition::new(ident, alias))
+}
+
+// pub Module : ModuleDefinition = {
+//     "module" <n: Name> "{"
+//         <friends: (FriendDecl)*>
+//         <imports: (ImportDecl)*>
+//         <structs: (StructDecl)*>
+//         <functions: (FunctionDecl)*>
+//     "}" =>? ModuleDefinition::new(n, imports, structs, functions),
+// }
+
+fn is_struct_decl(tokens: &mut Lexer) -> Result<bool, ParseError<Loc, anyhow::Error>> {
+    let t = tokens.peek();
+    Ok(t == Tok::Struct || (t == Tok::Native && tokens.lookahead()? == Tok::Struct))
+}
+
+fn parse_module(tokens: &mut Lexer) -> Result<ModuleDefinition, ParseError<Loc, anyhow::Error>> {
+    let start_loc = tokens.start_loc();
+    consume_token(tokens, Tok::Module)?;
+    let identifier = parse_module_ident(tokens)?;
+    consume_token(tokens, Tok::LBrace)?;
+
+    let mut friends = vec![];
+    while tokens.peek() == Tok::Friend {
+        friends.push(parse_friend_decl(tokens)?);
+    }
+
+    let mut imports = vec![];
+    while tokens.peek() == Tok::Import {
+        imports.push(parse_import_decl(tokens)?);
+    }
+
+    let mut synthetics = vec![];
+    while tokens.peek() == Tok::Synthetic {
+        synthetics.push(parse_synthetic(tokens)?);
+    }
+
+    let mut structs: Vec<StructDefinition> = vec![];
+    while is_struct_decl(tokens)? {
+        structs.push(parse_struct_decl(tokens)?);
+    }
+
+    let mut functions: Vec<(FunctionName, Function)> = vec![];
+    while tokens.peek() != Tok::RBrace {
+        functions.push(parse_function_decl(tokens)?);
+    }
+    tokens.advance()?; // consume the RBrace
+    let end_loc = tokens.previous_end_loc();
+    let loc = make_loc(tokens.file_hash(), start_loc, end_loc);
+
+    Ok(ModuleDefinition::new(
+        loc,
+        identifier,
+        friends,
+        imports,
+        vec![],
+        structs,
+        vec![],
+        functions,
+        synthetics,
+    ))
+}
+
+// pub ScriptOrModule: ScriptOrModule = {
+//     <s: Script> => ScriptOrModule::Script(s),
+//     <m: Module> => ScriptOrModule::Module(m),
+// }
+
+fn parse_script_or_module(
+    tokens: &mut Lexer,
+) -> Result<ScriptOrModule, ParseError<Loc, anyhow::Error>> {
+    if tokens.peek() == Tok::Module {
+        Ok(ScriptOrModule::Module(parse_module(tokens)?))
+    } else {
+        Ok(ScriptOrModule::Script(parse_script(tokens)?))
+    }
+}
+
+pub fn parse_module_string(
+    input: &str,
+) -> Result<ModuleDefinition, ParseError<Loc, anyhow::Error>> {
+    let file_hash = FileHash::new(input);
+    let mut tokens = Lexer::new(file_hash, input);
+    tokens.advance()?;
+    let unit = parse_module(&mut tokens)?;
+    consume_token(&mut tokens, Tok::EOF)?;
+    Ok(unit)
+}
+
+pub fn parse_script_string(input: &str) -> Result<Script, ParseError<Loc, anyhow::Error>> {
+    let file_hash = FileHash::new(input);
+    let mut tokens = Lexer::new(file_hash, input);
+    tokens.advance()?;
+    let unit = parse_script(&mut tokens)?;
+    consume_token(&mut tokens, Tok::EOF)?;
+    Ok(unit)
+}
+
+pub fn parse_script_or_module_string(
+    input: &str,
+) -> Result<ScriptOrModule, ParseError<Loc, anyhow::Error>> {
+    let file_hash = FileHash::new(input);
+    let mut tokens = Lexer::new(file_hash, input);
+    tokens.advance()?;
+    let unit = parse_script_or_module(&mut tokens)?;
+    consume_token(&mut tokens, Tok::EOF)?;
+    Ok(unit)
+}
diff --git a/vendors/move/crates/move-ir-to-bytecode/Cargo.toml b/vendors/move/crates/move-ir-to-bytecode/Cargo.toml
new file mode 100644
index 000000000..721592560
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-ir-to-bytecode"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem ir to bytecode"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+move-ir-to-bytecode-syntax.workspace = true
+move-command-line-common.workspace = true
+move-core-types.workspace = true
+move-ir-types.workspace = true
+move-binary-format.workspace = true
+move-symbol-pool.workspace = true
+move-bytecode-source-map.workspace = true
+log.workspace = true
+codespan-reporting.workspace = true
+ouroboros.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-ir-to-bytecode/src/compiler.rs b/vendors/move/crates/move-ir-to-bytecode/src/compiler.rs
new file mode 100644
index 000000000..97f72f683
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode/src/compiler.rs
@@ -0,0 +1,1761 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::context::{CompiledDependency, Context, MaterializedPools, TABLE_MAX_SIZE};
+use anyhow::{bail, format_err, Result};
+use move_binary_format::{
+    file_format::{
+        Ability, AbilitySet, Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript,
+        Constant, FieldDefinition, FunctionDefinition, FunctionSignature, ModuleHandle, Signature,
+        SignatureToken, StructDefinition, StructDefinitionIndex, StructFieldInformation,
+        StructHandleIndex, StructTypeParameter, TableIndex, TypeParameterIndex, TypeSignature,
+        Visibility,
+    },
+    file_format_common::VERSION_MAX,
+};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_core_types::runtime_value::{MoveTypeLayout, MoveValue};
+use move_ir_types::{
+    ast::{self, Bytecode as IRBytecode, Bytecode_ as IRBytecode_, *},
+    sp,
+};
+use move_symbol_pool::Symbol;
+use std::{
+    clone::Clone,
+    collections::{
+        hash_map::Entry::{Occupied, Vacant},
+        BTreeSet, HashMap, HashSet,
+    },
+    fmt::Write,
+};
+
+macro_rules! record_src_loc {
+    (local: $context:expr, $var:expr) => {{
+        let source_name = ($var.value.0.as_str().to_owned(), $var.loc);
+        $context
+            .source_map
+            .add_local_mapping($context.current_function_definition_index(), source_name)?;
+    }};
+    (parameter: $context:expr, $var:expr) => {{
+        let source_name = ($var.value.0.as_str().to_owned(), $var.loc);
+        $context
+            .source_map
+            .add_parameter_mapping($context.current_function_definition_index(), source_name)?;
+    }};
+    (field: $context:expr, $idx: expr, $field:expr) => {{
+        $context
+            .source_map
+            .add_struct_field_mapping($idx, $field.loc)?;
+    }};
+    (function_type_formals: $context:expr, $var:expr) => {
+        for (ty_var, _) in $var.iter() {
+            let source_name = (ty_var.value.0.as_str().to_owned(), ty_var.loc);
+            $context.source_map.add_function_type_parameter_mapping(
+                $context.current_function_definition_index(),
+                source_name,
+            )?;
+        }
+    };
+    (function_decl: $context:expr, $location:expr, $function_index:expr, $is_native:expr) => {{
+        $context.set_function_index($function_index as TableIndex);
+        $context.source_map.add_top_level_function_mapping(
+            $context.current_function_definition_index(),
+            $location,
+            $is_native,
+        )?;
+    }};
+    (struct_type_formals: $context:expr, $var:expr) => {
+        for (_, ty_var, _) in $var.iter() {
+            let source_name = (ty_var.value.0.as_str().to_owned(), ty_var.loc);
+            $context.source_map.add_struct_type_parameter_mapping(
+                $context.current_struct_definition_index(),
+                source_name,
+            )?;
+        }
+    };
+    (struct_decl: $context:expr, $location:expr) => {
+        $context
+            .source_map
+            .add_top_level_struct_mapping($context.current_struct_definition_index(), $location)?;
+    };
+    (const_decl: $context:expr, $const_index:expr, $name:expr) => {
+        $context.source_map.add_const_mapping($const_index, $name)?;
+    };
+}
+
+macro_rules! make_push_instr {
+    ($context:ident, $code:ident) => {
+        macro_rules! push_instr {
+            ($loc:expr, $instr:expr) => {{
+                let code_offset = $code.len() as CodeOffset;
+                $context.source_map.add_code_mapping(
+                    $context.current_function_definition_index(),
+                    code_offset,
+                    $loc,
+                )?;
+                $code.push($instr);
+            }};
+        }
+    };
+}
+
+macro_rules! make_record_nop_label {
+    ($context:ident, $code:ident) => {
+        macro_rules! record_nop_label {
+            ($label:expr) => {{
+                let code_offset = $code.len() as CodeOffset;
+                $context.source_map.add_nop_mapping(
+                    $context.current_function_definition_index(),
+                    $label,
+                    code_offset,
+                )?;
+            }};
+        }
+    };
+}
+
+// Holds information about a function being compiled.
+#[derive(Debug)]
+struct FunctionFrame {
+    locals: HashMap<Var_, u8>,
+    local_types: Signature,
+    // i64 to allow the bytecode verifier to catch errors of
+    // - negative stack sizes
+    // - excessivley large stack sizes
+    // The max stack depth of the file_format is set as u16.
+    // Theoretically, we could use a BigInt here, but that is probably overkill for any testing
+    max_stack_depth: i64,
+    cur_stack_depth: i64,
+    type_parameters: HashMap<TypeVar_, TypeParameterIndex>,
+}
+
+impl FunctionFrame {
+    fn new(type_parameters: HashMap<TypeVar_, TypeParameterIndex>) -> FunctionFrame {
+        FunctionFrame {
+            locals: HashMap::new(),
+            local_types: Signature(vec![]),
+            max_stack_depth: 0,
+            cur_stack_depth: 0,
+            type_parameters,
+        }
+    }
+
+    // Manage the stack info for the function
+    fn push(&mut self) -> Result<()> {
+        if self.cur_stack_depth == i64::MAX {
+            bail!("ICE Stack depth accounting overflow. The compiler can only support a maximum stack depth of up to i64::max_value")
+        }
+        self.cur_stack_depth += 1;
+        self.max_stack_depth = std::cmp::max(self.max_stack_depth, self.cur_stack_depth);
+        Ok(())
+    }
+
+    fn pop(&mut self) -> Result<()> {
+        if self.cur_stack_depth == i64::MIN {
+            bail!("ICE Stack depth accounting underflow. The compiler can only support a minimum stack depth of up to i64::min_value")
+        }
+        self.cur_stack_depth -= 1;
+        Ok(())
+    }
+
+    fn get_local(&self, var: &Var_) -> Result<u8> {
+        match self.locals.get(var) {
+            None => bail!("variable {} undefined", var),
+            Some(idx) => Ok(*idx),
+        }
+    }
+
+    fn define_local(&mut self, var: &Var_, type_: SignatureToken) -> Result<u8> {
+        if self.locals.len() >= TABLE_MAX_SIZE {
+            bail!("Max number of locals reached");
+        }
+
+        let cur_loc_idx = self.locals.len() as u8;
+        let loc = var.clone();
+        let entry = self.locals.entry(loc);
+        match entry {
+            Occupied(_) => bail!("variable redefinition {}", var),
+            Vacant(e) => {
+                e.insert(cur_loc_idx);
+                self.local_types.0.push(type_);
+            }
+        }
+        Ok(cur_loc_idx)
+    }
+
+    fn type_parameters(&self) -> &HashMap<TypeVar_, TypeParameterIndex> {
+        &self.type_parameters
+    }
+}
+
+// Returns an error that lists any labels that have been redeclared, or used without being declared.
+fn label_verification_error(
+    redeclared: &[&BlockLabel_],
+    undeclared: &[&BlockLabel_],
+) -> Result<()> {
+    let mut message = "Invalid block labels".to_string();
+    if !redeclared.is_empty() {
+        write!(
+            &mut message,
+            ", labels were declared twice ({})",
+            redeclared
+                .iter()
+                .map(|l| l.to_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        )?;
+    }
+    if !undeclared.is_empty() {
+        write!(
+            &mut message,
+            ", labels were used without being declared ({})",
+            undeclared
+                .iter()
+                .map(|l| l.to_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        )?;
+    }
+    bail!(message);
+}
+
+fn verify_move_function_body(code: &[Block]) -> Result<()> {
+    let mut labels = HashSet::new();
+    let mut redeclared = vec![];
+    for block in code {
+        let label = &block.value.label.value;
+        if labels.contains(&label) {
+            redeclared.push(label);
+        } else {
+            labels.insert(label);
+        }
+    }
+
+    let mut undeclared = vec![];
+    for block in code {
+        for statement in &block.value.statements {
+            match &statement.value {
+                Statement_::Jump(label)
+                | Statement_::JumpIf(_, label)
+                | Statement_::JumpIfFalse(_, label) => {
+                    if !labels.contains(&label.value) {
+                        undeclared.push(&label.value);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    if redeclared.is_empty() && undeclared.is_empty() {
+        Ok(())
+    } else {
+        label_verification_error(&redeclared, &undeclared)
+    }
+}
+
+fn verify_bytecode_function_body(code: &[(BlockLabel_, BytecodeBlock)]) -> Result<()> {
+    let mut labels = HashSet::new();
+    let mut redeclared = vec![];
+    for block in code {
+        let label = &block.0;
+        if labels.contains(&label) {
+            redeclared.push(label);
+        } else {
+            labels.insert(label);
+        }
+    }
+
+    let mut undeclared = vec![];
+    for block in code {
+        for statement in &block.1 {
+            match &statement.value {
+                IRBytecode_::Branch(label)
+                | IRBytecode_::BrTrue(label)
+                | IRBytecode_::BrFalse(label) => {
+                    if !labels.contains(&label) {
+                        undeclared.push(label);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    if redeclared.is_empty() && undeclared.is_empty() {
+        Ok(())
+    } else {
+        label_verification_error(&redeclared, &undeclared)
+    }
+}
+
+/// Verify that, within a single function, no two blocks use the same label, and all jump statements
+/// specify a destination label that exists on some block. If any block labels or statements don't
+/// meet these conditions, return an error.
+fn verify_function(function: &Function) -> Result<()> {
+    match &function.value.body {
+        FunctionBody::Move { code, .. } => verify_move_function_body(code),
+        FunctionBody::Bytecode { code, .. } => verify_bytecode_function_body(code),
+        _ => Ok(()),
+    }
+}
+
+/// Verifies that the given module is semantically valid. Invoking this prior to compiling the
+/// module to bytecode may help diagnose malformed programs.
+fn verify_module(module: &ModuleDefinition) -> Result<()> {
+    for function in &module.functions {
+        verify_function(&function.1)?;
+    }
+    Ok(())
+}
+
+/// Verifies that the given script is semantically valid. Invoking this prior to compiling the
+/// script to bytecode may help diagnose malformed programs.
+fn verify_script(script: &Script) -> Result<()> {
+    verify_function(&script.main)
+}
+
+/// Compile a transaction script.
+pub fn compile_script<'a>(
+    script: Script,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> Result<(CompiledScript, SourceMap)> {
+    verify_script(&script)?;
+
+    let mut context = Context::new(script.loc, HashMap::new(), None)?;
+    for dep in dependencies {
+        context.add_compiled_dependency(dep)?;
+    }
+
+    compile_imports(&mut context, script.imports.clone())?;
+    // Add explicit handles/dependency declarations to `dependencies`
+    compile_explicit_dependency_declarations(
+        &mut context,
+        script.imports,
+        script.explicit_dependency_declarations,
+    )?;
+
+    for ir_constant in script.constants {
+        let constant = compile_constant(&mut context, ir_constant.signature, ir_constant.value)?;
+        context.declare_constant(ir_constant.name.clone(), constant.clone())?;
+        let const_idx = context.constant_index(constant)?;
+        record_src_loc!(const_decl: context, const_idx, ir_constant.name);
+    }
+
+    let function = script.main;
+
+    let sig = function_signature(&mut context, &function.value.signature)?;
+    let parameters_sig_idx = context.signature_index(Signature(sig.parameters))?;
+
+    record_src_loc!(
+        function_decl: context,
+        function.loc,
+        0,
+        matches!(function.value.body, FunctionBody::Native)
+    );
+    record_src_loc!(
+        function_type_formals: context,
+        &function.value.signature.type_formals
+    );
+    let code = compile_function_body_impl(&mut context, function.value)?.unwrap();
+
+    let (
+        MaterializedPools {
+            module_handles,
+            struct_handles,
+            function_handles,
+            signatures,
+            identifiers,
+            address_identifiers,
+            constant_pool,
+            function_instantiations,
+            ..
+        },
+        _compiled_deps,
+        source_map,
+    ) = context.materialize_pools();
+    let script = CompiledScript {
+        version: VERSION_MAX,
+        module_handles,
+        struct_handles,
+        function_handles,
+        function_instantiations,
+        signatures,
+        identifiers,
+        address_identifiers,
+        constant_pool,
+        metadata: vec![],
+
+        type_parameters: sig.type_parameters,
+        parameters: parameters_sig_idx,
+        code,
+    };
+    Ok((script, source_map))
+}
+
+/// Compile a module.
+pub fn compile_module<'a>(
+    module: ModuleDefinition,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> Result<(CompiledModule, SourceMap)> {
+    verify_module(&module)?;
+
+    let current_module = module.identifier;
+    let mut context = Context::new(module.loc, HashMap::new(), Some(current_module))?;
+    for dep in dependencies {
+        context.add_compiled_dependency(dep)?;
+    }
+
+    // Compile friends
+    let friend_decls = compile_friends(&mut context, module.friends)?;
+
+    // Compile imports
+    let self_name = ModuleName::module_self();
+    let self_module_handle_idx = context.declare_import(current_module, self_name)?;
+    // Explicitly declare all imports as they will be included even if not used
+    compile_imports(&mut context, module.imports.clone())?;
+
+    // Add explicit handles/dependency declarations to `dependencies`
+    compile_explicit_dependency_declarations(
+        &mut context,
+        module.imports,
+        module.explicit_dependency_declarations,
+    )?;
+
+    // Explicitly declare all structs as they will be included even if not used
+    for s in &module.structs {
+        let abilities = abilities(&s.value.abilities);
+        let ident = QualifiedStructIdent {
+            module: self_name,
+            name: s.value.name.clone(),
+        };
+        let type_parameters = struct_type_parameters(&s.value.type_formals);
+        context.declare_struct_handle_index(ident, abilities, type_parameters)?;
+    }
+
+    for ir_constant in module.constants {
+        let constant = compile_constant(&mut context, ir_constant.signature, ir_constant.value)?;
+        context.declare_constant(ir_constant.name.clone(), constant.clone())?;
+        let const_idx = context.constant_index(constant)?;
+        record_src_loc!(const_decl: context, const_idx, ir_constant.name);
+    }
+
+    for (name, function) in &module.functions {
+        let sig = function_signature(&mut context, &function.value.signature)?;
+        context.declare_function(self_name, name.clone(), sig)?;
+    }
+
+    // Compile definitions
+    let struct_defs = compile_structs(&mut context, &self_name, module.structs)?;
+    let function_defs = compile_functions(&mut context, &self_name, module.functions)?;
+
+    let (
+        MaterializedPools {
+            module_handles,
+            struct_handles,
+            function_handles,
+            field_handles,
+            signatures,
+            identifiers,
+            address_identifiers,
+            constant_pool,
+            function_instantiations,
+            struct_def_instantiations,
+            field_instantiations,
+        },
+        _compiled_deps,
+        source_map,
+    ) = context.materialize_pools();
+    let module = CompiledModule {
+        version: VERSION_MAX,
+        module_handles,
+        self_module_handle_idx,
+        struct_handles,
+        function_handles,
+        field_handles,
+        friend_decls,
+        struct_def_instantiations,
+        function_instantiations,
+        field_instantiations,
+        signatures,
+        identifiers,
+        address_identifiers,
+        constant_pool,
+        metadata: vec![],
+        struct_defs,
+        function_defs,
+    };
+    Ok((module, source_map))
+}
+
+// Note: DO NOT try to recover from this function as it zeros out the `outer_contexts` dependencies
+// and sets them after a successful result
+// Any `Error` should stop compilation in the caller
+fn compile_explicit_dependency_declarations(
+    outer_context: &mut Context,
+    imports: Vec<ImportDefinition>,
+    dependencies: Vec<ModuleDependency>,
+) -> Result<()> {
+    let mut dependencies_acc = outer_context.take_dependencies();
+    for dependency in dependencies {
+        let ModuleDependency {
+            name: mname,
+            structs,
+            functions,
+        } = dependency;
+        let current_module = outer_context.module_ident(&mname)?;
+        let mut context = Context::new(
+            outer_context.decl_location(),
+            dependencies_acc,
+            Some(*current_module),
+        )?;
+        compile_imports(&mut context, imports.clone())?;
+        let self_module_handle_idx = context.module_handle_index(&mname)?;
+        for struct_dep in structs {
+            let StructDependency {
+                abilities: abs,
+                name,
+                type_formals: tys,
+            } = struct_dep;
+            let sname = QualifiedStructIdent::new(mname, name);
+            let ability_set = abilities(&abs);
+            let kinds = struct_type_parameters(&tys);
+            context.declare_struct_handle_index(sname, ability_set, kinds)?;
+        }
+        for function_dep in functions {
+            let FunctionDependency { name, signature } = function_dep;
+            let sig = function_signature(&mut context, &signature)?;
+            context.declare_function(mname, name, sig)?;
+        }
+
+        let (
+            MaterializedPools {
+                module_handles,
+                struct_handles,
+                function_handles,
+                field_handles,
+                signatures,
+                identifiers,
+                address_identifiers,
+                constant_pool,
+                function_instantiations,
+                struct_def_instantiations,
+                field_instantiations,
+            },
+            compiled_deps,
+            _source_map,
+        ) = context.materialize_pools();
+        let compiled_module = CompiledModule {
+            version: VERSION_MAX,
+            module_handles,
+            self_module_handle_idx,
+            struct_handles,
+            function_handles,
+            field_handles,
+            friend_decls: vec![],
+            struct_def_instantiations,
+            function_instantiations,
+            field_instantiations,
+            signatures,
+            identifiers,
+            address_identifiers,
+            constant_pool,
+            metadata: vec![],
+            struct_defs: vec![],
+            function_defs: vec![],
+        };
+        dependencies_acc = compiled_deps;
+        dependencies_acc.insert(
+            *current_module,
+            CompiledDependency::stored(compiled_module)?,
+        );
+    }
+    outer_context.restore_dependencies(dependencies_acc);
+    Ok(())
+}
+
+fn compile_friends(
+    context: &mut Context,
+    friends: Vec<ast::ModuleIdent>,
+) -> Result<Vec<ModuleHandle>> {
+    let mut friend_decls = vec![];
+    for friend in friends {
+        friend_decls.push(context.declare_friend(friend)?);
+    }
+    Ok(friend_decls)
+}
+
+fn compile_imports(context: &mut Context, imports: Vec<ImportDefinition>) -> Result<()> {
+    for import in imports {
+        context.declare_import(import.ident, import.alias)?;
+    }
+    Ok(())
+}
+
+fn type_parameter_indexes<'a>(
+    ast_tys: impl IntoIterator<Item = &'a TypeVar>,
+) -> Result<HashMap<TypeVar_, TypeParameterIndex>> {
+    let mut m = HashMap::new();
+    for (idx, ty_var) in ast_tys.into_iter().enumerate() {
+        if idx > TABLE_MAX_SIZE {
+            bail!("Too many type parameters")
+        }
+        let old = m.insert(ty_var.value.clone(), idx as TypeParameterIndex);
+        if old.is_some() {
+            bail!("Type formal '{}'' already bound", ty_var)
+        }
+    }
+    Ok(m)
+}
+
+fn struct_type_parameters(ast_tys: &[ast::StructTypeParameter]) -> Vec<StructTypeParameter> {
+    ast_tys
+        .iter()
+        .map(|(is_phantom, _, abs)| StructTypeParameter {
+            constraints: abilities(abs),
+            is_phantom: *is_phantom,
+        })
+        .collect()
+}
+
+fn abilities(abilities: &BTreeSet<ast::Ability>) -> AbilitySet {
+    abilities
+        .iter()
+        .map(ability)
+        .fold(AbilitySet::EMPTY, |acc, a| acc | a)
+}
+
+fn ability(ab: &ast::Ability) -> Ability {
+    match ab {
+        ast::Ability::Copy => Ability::Copy,
+        ast::Ability::Drop => Ability::Drop,
+        ast::Ability::Store => Ability::Store,
+        ast::Ability::Key => Ability::Key,
+    }
+}
+
+fn compile_types(
+    context: &mut Context,
+    type_parameters: &HashMap<TypeVar_, TypeParameterIndex>,
+    tys: &[Type],
+) -> Result<Vec<SignatureToken>> {
+    tys.iter()
+        .map(|ty| compile_type(context, type_parameters, ty))
+        .collect::<Result<_>>()
+}
+
+fn compile_type(
+    context: &mut Context,
+    type_parameters: &HashMap<TypeVar_, TypeParameterIndex>,
+    ty: &Type,
+) -> Result<SignatureToken> {
+    Ok(match ty {
+        Type::Address => SignatureToken::Address,
+        Type::Signer => SignatureToken::Signer,
+        Type::U8 => SignatureToken::U8,
+        Type::U16 => SignatureToken::U16,
+        Type::U32 => SignatureToken::U32,
+        Type::U64 => SignatureToken::U64,
+        Type::U128 => SignatureToken::U128,
+        Type::U256 => SignatureToken::U256,
+        Type::Bool => SignatureToken::Bool,
+        Type::Vector(inner_type) => SignatureToken::Vector(Box::new(compile_type(
+            context,
+            type_parameters,
+            inner_type,
+        )?)),
+        Type::Reference(is_mutable, inner_type) => {
+            let inner_token = Box::new(compile_type(context, type_parameters, inner_type)?);
+            if *is_mutable {
+                SignatureToken::MutableReference(inner_token)
+            } else {
+                SignatureToken::Reference(inner_token)
+            }
+        }
+        Type::Struct(ident, tys) => {
+            let sh_idx = context.struct_handle_index(ident.clone())?;
+
+            if tys.is_empty() {
+                SignatureToken::Struct(sh_idx)
+            } else {
+                let tokens = compile_types(context, type_parameters, tys)?;
+                SignatureToken::StructInstantiation(sh_idx, tokens)
+            }
+        }
+        Type::TypeParameter(ty_var) => {
+            let idx = match type_parameters.get(ty_var) {
+                None => bail!("Unbound type parameter {}", ty_var),
+                Some(idx) => *idx,
+            };
+            SignatureToken::TypeParameter(idx)
+        }
+    })
+}
+
+fn function_signature(
+    context: &mut Context,
+    f: &ast::FunctionSignature,
+) -> Result<FunctionSignature> {
+    let m = type_parameter_indexes(f.type_formals.iter().map(|formal| &formal.0))?;
+    let return_ = compile_types(context, &m, &f.return_type)?;
+    let parameters = f
+        .formals
+        .iter()
+        .map(|(_, ty)| compile_type(context, &m, ty))
+        .collect::<Result<_>>()?;
+    let type_parameters = f
+        .type_formals
+        .iter()
+        .map(|(_, abs)| abilities(abs))
+        .collect();
+    Ok(move_binary_format::file_format::FunctionSignature {
+        return_,
+        parameters,
+        type_parameters,
+    })
+}
+
+fn compile_structs(
+    context: &mut Context,
+    self_name: &ModuleName,
+    structs: Vec<ast::StructDefinition>,
+) -> Result<Vec<StructDefinition>> {
+    let mut struct_defs = vec![];
+    for s in structs {
+        let sident = QualifiedStructIdent {
+            module: *self_name,
+            name: s.value.name.clone(),
+        };
+        let sh_idx = context.struct_handle_index(sident.clone())?;
+        record_src_loc!(struct_decl: context, s.loc);
+        record_src_loc!(struct_type_formals: context, &s.value.type_formals);
+        let m = type_parameter_indexes(s.value.type_formals.iter().map(|formal| &formal.1))?;
+        let sd_idx = context.declare_struct_definition_index(s.value.name)?;
+        let field_information = compile_fields(context, &m, sh_idx, sd_idx, s.value.fields)?;
+        struct_defs.push(StructDefinition {
+            struct_handle: sh_idx,
+            field_information,
+        });
+    }
+    Ok(struct_defs)
+}
+
+fn compile_fields(
+    context: &mut Context,
+    type_parameters: &HashMap<TypeVar_, TypeParameterIndex>,
+    sh_idx: StructHandleIndex,
+    sd_idx: StructDefinitionIndex,
+    sfields: StructDefinitionFields,
+) -> Result<StructFieldInformation> {
+    Ok(match sfields {
+        StructDefinitionFields::Native => StructFieldInformation::Native,
+        StructDefinitionFields::Move { fields } => {
+            let mut decl_fields = vec![];
+            for (decl_order, (f, ty)) in fields.into_iter().enumerate() {
+                let name = context.identifier_index(f.value.0)?;
+                record_src_loc!(field: context, sd_idx, f);
+                let sig_token = compile_type(context, type_parameters, &ty)?;
+                context.declare_field(sh_idx, sd_idx, f.value, sig_token.clone(), decl_order);
+                decl_fields.push(FieldDefinition {
+                    name,
+                    signature: TypeSignature(sig_token),
+                });
+            }
+            StructFieldInformation::Declared(decl_fields)
+        }
+    })
+}
+
+fn compile_functions(
+    context: &mut Context,
+    self_name: &ModuleName,
+    functions: Vec<(FunctionName, Function)>,
+) -> Result<Vec<FunctionDefinition>> {
+    functions
+        .into_iter()
+        .enumerate()
+        .map(|(func_index, (name, ast_function))| {
+            compile_function(context, self_name, name, ast_function, func_index)
+        })
+        .collect()
+}
+
+fn compile_function_body_impl(
+    context: &mut Context,
+    ast_function: Function_,
+) -> Result<Option<CodeUnit>> {
+    Ok(match ast_function.body {
+        FunctionBody::Move { locals, code } => {
+            let m = type_parameter_indexes(
+                ast_function
+                    .signature
+                    .type_formals
+                    .iter()
+                    .map(|formal| &formal.0),
+            )?;
+            Some(compile_function_body(
+                context,
+                m,
+                ast_function.signature.formals,
+                locals,
+                code,
+            )?)
+        }
+        FunctionBody::Bytecode { locals, code } => {
+            let m = type_parameter_indexes(
+                ast_function
+                    .signature
+                    .type_formals
+                    .iter()
+                    .map(|formal| &formal.0),
+            )?;
+            Some(compile_function_body_bytecode(
+                context,
+                m,
+                ast_function.signature.formals,
+                locals,
+                code,
+            )?)
+        }
+
+        FunctionBody::Native => {
+            for (var, _) in ast_function.signature.formals.into_iter() {
+                record_src_loc!(parameter: context, var)
+            }
+            None
+        }
+    })
+}
+
+fn compile_function(
+    context: &mut Context,
+    self_name: &ModuleName,
+    name: FunctionName,
+    ast_function: Function,
+    function_index: usize,
+) -> Result<FunctionDefinition> {
+    record_src_loc!(
+        function_decl: context,
+        ast_function.loc,
+        function_index,
+        matches!(ast_function.value.body, FunctionBody::Native)
+    );
+    record_src_loc!(
+        function_type_formals: context,
+        &ast_function.value.signature.type_formals
+    );
+    let fh_idx = context.function_handle(*self_name, name)?.1;
+
+    let ast_function = ast_function.value;
+
+    let is_entry = ast_function.is_entry;
+    let visibility = match ast_function.visibility {
+        FunctionVisibility::Public => Visibility::Public,
+        FunctionVisibility::Friend => Visibility::Friend,
+        FunctionVisibility::Internal => Visibility::Private,
+    };
+    let code = compile_function_body_impl(context, ast_function)?;
+
+    Ok(FunctionDefinition {
+        function: fh_idx,
+        visibility,
+        is_entry,
+        acquires_global_resources: vec![],
+        code,
+    })
+}
+
+fn compile_function_body(
+    context: &mut Context,
+    type_parameters: HashMap<TypeVar_, TypeParameterIndex>,
+    formals: Vec<(Var, Type)>,
+    locals: Vec<(Var, Type)>,
+    blocks: Vec<Block>,
+) -> Result<CodeUnit> {
+    let mut function_frame = FunctionFrame::new(type_parameters);
+    for (var, t) in formals {
+        let sig = compile_type(context, function_frame.type_parameters(), &t)?;
+        function_frame.define_local(&var.value, sig.clone())?;
+        record_src_loc!(parameter: context, var);
+    }
+
+    let mut locals_signature = Signature(vec![]);
+    for (var_, t) in locals {
+        let sig = compile_type(context, function_frame.type_parameters(), &t)?;
+        function_frame.define_local(&var_.value, sig.clone())?;
+        locals_signature.0.push(sig);
+        record_src_loc!(local: context, var_);
+    }
+
+    Ok(CodeUnit {
+        locals: context.signature_index(locals_signature)?,
+        code: compile_blocks(context, &mut function_frame, blocks)?,
+    })
+}
+
+/// Translates each of the blocks that a function body is composed of to bytecode.
+///
+/// Once the initial translation of statements to bytecode instructions is complete, instructions
+/// that jump to an offset in the bytecode are fixed up to refer to the correct offset.
+fn compile_blocks(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    blocks: Vec<Block>,
+) -> Result<Vec<Bytecode>> {
+    let mut code = vec![];
+    let mut label_to_index: HashMap<BlockLabel_, u16> = HashMap::new();
+    for block in blocks {
+        compile_block(
+            context,
+            function_frame,
+            &mut label_to_index,
+            &mut code,
+            block.value,
+        )?;
+    }
+    let fake_to_actual = context.build_index_remapping(label_to_index);
+    remap_branch_offsets(&mut code, &fake_to_actual);
+    Ok(code)
+}
+
+/// Translates a block's statements to bytecode instructions.
+fn compile_block(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    label_to_index: &mut HashMap<BlockLabel_, u16>,
+    code: &mut Vec<Bytecode>,
+    block: Block_,
+) -> Result<()> {
+    label_to_index.insert(block.label.value.clone(), code.len() as u16);
+    context.label_index(block.label.value)?;
+    for statement in block.statements {
+        compile_statement(context, function_frame, label_to_index, code, statement)?;
+    }
+    Ok(())
+}
+
+/// Translates a statement to one or more bytecode instructions.
+///
+/// Most statements do not impact the control flow of the program, except for the `assert`
+/// statement. When translating this statement, additional labels are added to our mapping, and
+/// jump instructions referring to those labels' offsets are inserted into the bytecode.
+fn compile_statement(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    label_to_index: &mut HashMap<BlockLabel_, u16>,
+    code: &mut Vec<Bytecode>,
+    statement: Statement,
+) -> Result<()> {
+    make_push_instr!(context, code);
+    match statement.value {
+        Statement_::Abort(exp_opt) => {
+            if let Some(exp) = exp_opt {
+                compile_expression(context, function_frame, code, *exp)?;
+            }
+            push_instr!(statement.loc, Bytecode::Abort);
+            function_frame.pop()?;
+        }
+        Statement_::Assert(cond, err) => {
+            // First, compile the bytecode for the assert's condition.
+            // The parser implicitly wraps the condition expression in a unary
+            // expression `!(exp)`.
+            let cond_loc = cond.loc;
+            compile_expression(context, function_frame, code, *cond)?;
+
+            // Create a conditional branch that continues execution if the condition holds,
+            // and otherwise falls through to an abort. Because the condition expression is
+            // evaluated as `!(exp)`, branch to the failure label if the condition is *false*.
+            let cont_label = BlockLabel_(Symbol::from(format!("assert_cont_{}", code.len())));
+            push_instr!(
+                cond_loc,
+                Bytecode::BrFalse(context.label_index(cont_label.clone())?)
+            );
+
+            // In case of a fallthrough, the assert has failed.
+            // Compile the bytecode for the error expression, then abort.
+            let err_loc = err.loc;
+            compile_expression(context, function_frame, code, *err)?;
+            push_instr!(err_loc, Bytecode::Abort);
+
+            // Record the continue block index as coming after the abort.
+            label_to_index.insert(cont_label, code.len() as u16);
+        }
+        Statement_::Assign(lvalues, rhs_expressions) => {
+            compile_expression(context, function_frame, code, rhs_expressions)?;
+            compile_lvalues(context, function_frame, code, lvalues)?;
+        }
+        Statement_::Exp(e) => {
+            compile_expression(context, function_frame, code, *e)?;
+        }
+        Statement_::Jump(label) => push_instr!(
+            label.loc,
+            Bytecode::Branch(context.label_index(label.value)?)
+        ),
+        Statement_::JumpIf(cond, label) => {
+            let loc = cond.loc;
+            compile_expression(context, function_frame, code, *cond)?;
+            push_instr!(loc, Bytecode::BrTrue(context.label_index(label.value)?));
+        }
+        Statement_::JumpIfFalse(cond, label) => {
+            let loc = cond.loc;
+            compile_expression(context, function_frame, code, *cond)?;
+            push_instr!(loc, Bytecode::BrFalse(context.label_index(label.value)?));
+        }
+        Statement_::Return(exps) => {
+            compile_expression(context, function_frame, code, *exps)?;
+            push_instr!(statement.loc, Bytecode::Ret);
+        }
+        Statement_::Unpack(name, tys, bindings, e) => {
+            let tokens = Signature(compile_types(
+                context,
+                function_frame.type_parameters(),
+                &tys,
+            )?);
+
+            compile_expression(context, function_frame, code, *e)?;
+
+            let def_idx = context.struct_definition_index(&name)?;
+            if tys.is_empty() {
+                push_instr!(statement.loc, Bytecode::Unpack(def_idx));
+            } else {
+                let type_parameters_id = context.signature_index(tokens)?;
+                let si_idx = context.struct_instantiation_index(def_idx, type_parameters_id)?;
+                push_instr!(statement.loc, Bytecode::UnpackGeneric(si_idx));
+            }
+            function_frame.pop()?;
+
+            for (field_, lhs_variable) in bindings.iter().rev() {
+                let loc_idx = function_frame.get_local(&lhs_variable.value)?;
+                let st_loc = Bytecode::StLoc(loc_idx);
+                push_instr!(field_.loc, st_loc);
+            }
+        }
+    }
+    Ok(())
+}
+
+fn compile_lvalues(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    code: &mut Vec<Bytecode>,
+    lvalues: Vec<LValue>,
+) -> Result<()> {
+    make_push_instr!(context, code);
+    for lvalue_ in lvalues.into_iter().rev() {
+        match lvalue_.value {
+            LValue_::Var(v) => {
+                let loc_idx = function_frame.get_local(&v.value)?;
+                push_instr!(lvalue_.loc, Bytecode::StLoc(loc_idx));
+                function_frame.pop()?;
+            }
+            LValue_::Mutate(e) => {
+                compile_expression(context, function_frame, code, e)?;
+                push_instr!(lvalue_.loc, Bytecode::WriteRef);
+                function_frame.pop()?;
+                function_frame.pop()?;
+            }
+            LValue_::Pop => {
+                push_instr!(lvalue_.loc, Bytecode::Pop);
+                function_frame.pop()?;
+            }
+        }
+    }
+    Ok(())
+}
+
+fn compile_expression(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    code: &mut Vec<Bytecode>,
+    exp: Exp,
+) -> Result<()> {
+    make_push_instr!(context, code);
+    match exp.value {
+        Exp_::Move(v) => {
+            let loc_idx = function_frame.get_local(&v.value)?;
+            let load_loc = Bytecode::MoveLoc(loc_idx);
+            push_instr!(exp.loc, load_loc);
+            function_frame.push()?;
+        }
+        Exp_::Copy(v) => {
+            let loc_idx = function_frame.get_local(&v.value)?;
+            let load_loc = Bytecode::CopyLoc(loc_idx);
+            push_instr!(exp.loc, load_loc);
+            function_frame.push()?;
+        }
+        Exp_::BorrowLocal(is_mutable, v) => {
+            let loc_idx = function_frame.get_local(&v.value)?;
+            if is_mutable {
+                push_instr!(exp.loc, Bytecode::MutBorrowLoc(loc_idx));
+            } else {
+                push_instr!(exp.loc, Bytecode::ImmBorrowLoc(loc_idx));
+            }
+            function_frame.push()?;
+        }
+        Exp_::Value(cv) => match cv.value {
+            CopyableVal_::Address(address) => {
+                let address_value = MoveValue::Address(address);
+                let constant = compile_constant(context, Type::Address, address_value)?;
+                let idx = context.constant_index(constant)?;
+                push_instr!(exp.loc, Bytecode::LdConst(idx));
+                function_frame.push()?;
+            }
+            CopyableVal_::U8(i) => {
+                push_instr!(exp.loc, Bytecode::LdU8(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U16(i) => {
+                push_instr!(exp.loc, Bytecode::LdU16(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U32(i) => {
+                push_instr!(exp.loc, Bytecode::LdU32(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U64(i) => {
+                push_instr!(exp.loc, Bytecode::LdU64(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U128(i) => {
+                push_instr!(exp.loc, Bytecode::LdU128(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U256(i) => {
+                push_instr!(exp.loc, Bytecode::LdU256(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::ByteArray(buf) => {
+                let vec_value = MoveValue::vector_u8(buf);
+                let ty = Type::Vector(Box::new(Type::U8));
+                let constant = compile_constant(context, ty, vec_value)?;
+                let idx = context.constant_index(constant)?;
+                push_instr!(exp.loc, Bytecode::LdConst(idx));
+                function_frame.push()?;
+            }
+            CopyableVal_::Bool(b) => {
+                push_instr! {exp.loc,
+                    if b {
+                        Bytecode::LdTrue
+                    } else {
+                        Bytecode::LdFalse
+                    }
+                };
+                function_frame.push()?;
+            }
+        },
+        Exp_::Pack(name, ast_tys, fields) => {
+            let sig_tys = compile_types(context, function_frame.type_parameters(), &ast_tys)?;
+            let tokens = Signature(sig_tys);
+            let type_actuals_id = context.signature_index(tokens)?;
+            let def_idx = context.struct_definition_index(&name)?;
+
+            let self_name = ModuleName::module_self();
+            let ident = QualifiedStructIdent {
+                module: self_name,
+                name: name.clone(),
+            };
+            let sh_idx = context.struct_handle_index(ident)?;
+
+            let num_fields = fields.len();
+            for (field_order, (field, e)) in fields.into_iter().enumerate() {
+                // Check that the fields are specified in order matching the definition.
+                let (_, _, decl_order) = context.field(sh_idx, field.value.clone())?;
+                if field_order != decl_order {
+                    bail!("Field {} defined out of order for struct {}", field, name);
+                }
+
+                compile_expression(context, function_frame, code, e)?;
+            }
+            if ast_tys.is_empty() {
+                push_instr!(exp.loc, Bytecode::Pack(def_idx));
+            } else {
+                let si_idx = context.struct_instantiation_index(def_idx, type_actuals_id)?;
+                push_instr!(exp.loc, Bytecode::PackGeneric(si_idx));
+            }
+            for _ in 0..num_fields {
+                function_frame.pop()?;
+            }
+            function_frame.push()?;
+        }
+        Exp_::UnaryExp(op, e) => {
+            compile_expression(context, function_frame, code, *e)?;
+            match op {
+                UnaryOp::Not => {
+                    push_instr!(exp.loc, Bytecode::Not);
+                }
+            }
+        }
+        Exp_::BinopExp(e1, op, e2) => {
+            compile_expression(context, function_frame, code, *e1)?;
+            compile_expression(context, function_frame, code, *e2)?;
+
+            function_frame.pop()?;
+            match op {
+                BinOp::Add => {
+                    push_instr!(exp.loc, Bytecode::Add);
+                }
+                BinOp::Sub => {
+                    push_instr!(exp.loc, Bytecode::Sub);
+                }
+                BinOp::Mul => {
+                    push_instr!(exp.loc, Bytecode::Mul);
+                }
+                BinOp::Mod => {
+                    push_instr!(exp.loc, Bytecode::Mod);
+                }
+                BinOp::Div => {
+                    push_instr!(exp.loc, Bytecode::Div);
+                }
+                BinOp::BitOr => {
+                    push_instr!(exp.loc, Bytecode::BitOr);
+                }
+                BinOp::BitAnd => {
+                    push_instr!(exp.loc, Bytecode::BitAnd);
+                }
+                BinOp::Xor => {
+                    push_instr!(exp.loc, Bytecode::Xor);
+                }
+                BinOp::Shl => {
+                    push_instr!(exp.loc, Bytecode::Shl);
+                }
+                BinOp::Shr => {
+                    push_instr!(exp.loc, Bytecode::Shr);
+                }
+                BinOp::Or => {
+                    push_instr!(exp.loc, Bytecode::Or);
+                }
+                BinOp::And => {
+                    push_instr!(exp.loc, Bytecode::And);
+                }
+                BinOp::Eq => {
+                    push_instr!(exp.loc, Bytecode::Eq);
+                }
+                BinOp::Neq => {
+                    push_instr!(exp.loc, Bytecode::Neq);
+                }
+                BinOp::Lt => {
+                    push_instr!(exp.loc, Bytecode::Lt);
+                }
+                BinOp::Gt => {
+                    push_instr!(exp.loc, Bytecode::Gt);
+                }
+                BinOp::Le => {
+                    push_instr!(exp.loc, Bytecode::Le);
+                }
+                BinOp::Ge => {
+                    push_instr!(exp.loc, Bytecode::Ge);
+                }
+                BinOp::Subrange => {
+                    unreachable!("Subrange operators should only appear in specification ASTs.");
+                }
+            }
+        }
+        Exp_::Dereference(e) => {
+            compile_expression(context, function_frame, code, *e)?;
+            push_instr!(exp.loc, Bytecode::ReadRef);
+        }
+        Exp_::Borrow {
+            is_mutable,
+            exp: inner_exp,
+            field,
+        } => {
+            // Compile the "inner expression." In the case of a field borrow
+            // such as `&mut move(s).S::f`, `move(s)` would be the inner
+            // expression.
+            compile_expression(context, function_frame, code, *inner_exp)?;
+
+            // We're compiling a field borrow expression. To transform an
+            // expression like this into bytecode, we need to create a borrow
+            // field instruction that references the correct field handle index.
+            // We can't know what the index of the field is without determining
+            // the type of the underlying struct.
+            let struct_ident = QualifiedStructIdent {
+                module: ModuleName::module_self(),
+                name: field.value.struct_name,
+            };
+            let sh_idx = context.struct_handle_index(struct_ident)?;
+            let (def_idx, _, field_offset) = context.field(sh_idx, field.value.field.value)?;
+
+            function_frame.pop()?;
+
+            let fh_idx = context.field_handle_index(def_idx, field_offset as u16)?;
+
+            if field.value.type_actuals.is_empty() {
+                // The field handle index is sufficient if borrowing a field
+                // from a struct with a concrete type.
+                if is_mutable {
+                    push_instr!(exp.loc, Bytecode::MutBorrowField(fh_idx));
+                } else {
+                    push_instr!(exp.loc, Bytecode::ImmBorrowField(fh_idx));
+                }
+            } else {
+                // To borrow a field from a generic struct, the generic borrow
+                // instruction needs the index of the field instantiation.
+                let tokens = Signature(compile_types(
+                    context,
+                    function_frame.type_parameters(),
+                    &field.value.type_actuals,
+                )?);
+                let type_parameters_id = context.signature_index(tokens)?;
+                let fi_idx = context.field_instantiation_index(fh_idx, type_parameters_id)?;
+                if is_mutable {
+                    push_instr!(exp.loc, Bytecode::MutBorrowFieldGeneric(fi_idx));
+                } else {
+                    push_instr!(exp.loc, Bytecode::ImmBorrowFieldGeneric(fi_idx));
+                }
+            }
+            function_frame.push()?;
+        }
+        Exp_::FunctionCall(f, exps) => {
+            compile_expression(context, function_frame, code, *exps)?;
+            compile_call(context, function_frame, code, f)?
+        }
+        Exp_::ExprList(exps) => {
+            for e in exps {
+                compile_expression(context, function_frame, code, e)?;
+            }
+        }
+    };
+    Ok(())
+}
+
+fn compile_call(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    code: &mut Vec<Bytecode>,
+    call: FunctionCall,
+) -> Result<()> {
+    make_push_instr!(context, code);
+    match call.value {
+        FunctionCall_::Builtin(function) => {
+            match function {
+                Builtin::VecPack(tys, num) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecPack(type_actuals_id, num));
+
+                    for _ in 0..num {
+                        function_frame.pop()?;
+                    }
+                    function_frame.push()?; // push the return value
+                }
+                Builtin::VecLen(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecLen(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.push()?; // push the return value
+                }
+                Builtin::VecImmBorrow(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecImmBorrow(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.pop()?; // pop the index
+                    function_frame.push()?; // push the return value
+                }
+                Builtin::VecMutBorrow(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecMutBorrow(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.pop()?; // pop the index
+                    function_frame.push()?; // push the return value
+                }
+                Builtin::VecPushBack(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecPushBack(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.pop()?; // pop the value
+                }
+                Builtin::VecPopBack(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecPopBack(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.push()?; // push the value
+                }
+                Builtin::VecUnpack(tys, num) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecUnpack(type_actuals_id, num));
+
+                    function_frame.pop()?; // pop the vector ref
+                    for _ in 0..num {
+                        function_frame.push()?;
+                    }
+                }
+                Builtin::VecSwap(tys) => {
+                    let tokens = compile_types(context, function_frame.type_parameters(), &tys)?;
+                    let type_actuals_id = context.signature_index(Signature(tokens))?;
+                    push_instr!(call.loc, Bytecode::VecSwap(type_actuals_id));
+
+                    function_frame.pop()?; // pop the vector ref
+                    function_frame.pop()?; // pop the first index
+                    function_frame.pop()?; // pop the second index
+                }
+                Builtin::Freeze => {
+                    push_instr!(call.loc, Bytecode::FreezeRef);
+                    function_frame.pop()?; // pop mut ref
+                    function_frame.push()?; // push imm ref
+                }
+                Builtin::ToU8 => {
+                    push_instr!(call.loc, Bytecode::CastU8);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU16 => {
+                    push_instr!(call.loc, Bytecode::CastU16);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU32 => {
+                    push_instr!(call.loc, Bytecode::CastU32);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU64 => {
+                    push_instr!(call.loc, Bytecode::CastU64);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU128 => {
+                    push_instr!(call.loc, Bytecode::CastU128);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU256 => {
+                    push_instr!(call.loc, Bytecode::CastU256);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+            }
+        }
+        FunctionCall_::ModuleFunctionCall {
+            module,
+            name,
+            type_actuals,
+        } => {
+            let ty_arg_tokens =
+                compile_types(context, function_frame.type_parameters(), &type_actuals)?;
+            let tokens = Signature(ty_arg_tokens);
+            let type_actuals_id = context.signature_index(tokens)?;
+            let fh_idx = context.function_handle(module, name)?.1;
+            let fcall = if type_actuals.is_empty() {
+                Bytecode::Call(fh_idx)
+            } else {
+                let fi_idx = context.function_instantiation_index(fh_idx, type_actuals_id)?;
+                Bytecode::CallGeneric(fi_idx)
+            };
+            push_instr!(call.loc, fcall);
+            for _ in 0..type_actuals.len() {
+                function_frame.pop()?;
+            }
+            // Return value of current function is pushed onto the stack.
+            function_frame.push()?;
+        }
+    };
+    Ok(())
+}
+
+fn compile_constant(_context: &mut Context, ty: Type, value: MoveValue) -> Result<Constant> {
+    fn type_layout(ty: Type) -> Result<MoveTypeLayout> {
+        Ok(match ty {
+            Type::Address => MoveTypeLayout::Address,
+            Type::Signer => MoveTypeLayout::Signer,
+            Type::U8 => MoveTypeLayout::U8,
+            Type::U16 => MoveTypeLayout::U16,
+            Type::U32 => MoveTypeLayout::U32,
+            Type::U64 => MoveTypeLayout::U64,
+            Type::U128 => MoveTypeLayout::U128,
+            Type::U256 => MoveTypeLayout::U256,
+            Type::Bool => MoveTypeLayout::Bool,
+            Type::Vector(inner_type) => MoveTypeLayout::Vector(Box::new(type_layout(*inner_type)?)),
+            Type::Reference(_, _) => bail!("References are not supported in constant type layouts"),
+            Type::TypeParameter(_) => {
+                bail!("Type parameters are not supported in constant type layouts")
+            }
+            Type::Struct(_ident, _tys) => {
+                bail!("TODO Structs are not *yet* supported in constant type layouts")
+            }
+        })
+    }
+
+    Constant::serialize_constant(&type_layout(ty)?, &value)
+        .ok_or_else(|| format_err!("Could not serialize constant"))
+}
+
+//**************************************************************************************************
+// Bytecode
+//**************************************************************************************************
+
+fn compile_function_body_bytecode(
+    context: &mut Context,
+    type_parameters: HashMap<TypeVar_, TypeParameterIndex>,
+    formals: Vec<(Var, Type)>,
+    locals: Vec<(Var, Type)>,
+    blocks: BytecodeBlocks,
+) -> Result<CodeUnit> {
+    let mut function_frame = FunctionFrame::new(type_parameters);
+    let mut locals_signature = Signature(vec![]);
+    for (var, t) in formals {
+        let sig = compile_type(context, function_frame.type_parameters(), &t)?;
+        function_frame.define_local(&var.value, sig.clone())?;
+        record_src_loc!(parameter: context, var);
+    }
+    for (var_, t) in locals {
+        let sig = compile_type(context, function_frame.type_parameters(), &t)?;
+        function_frame.define_local(&var_.value, sig.clone())?;
+        locals_signature.0.push(sig);
+        record_src_loc!(local: context, var_);
+    }
+    let sig_idx = context.signature_index(locals_signature)?;
+
+    let mut code = vec![];
+    let mut label_to_index: HashMap<BlockLabel_, u16> = HashMap::new();
+    for (label, block) in blocks {
+        label_to_index.insert(label.clone(), code.len() as u16);
+        context.label_index(label)?;
+        compile_bytecode_block(context, &mut function_frame, &mut code, block)?;
+    }
+    let fake_to_actual = context.build_index_remapping(label_to_index);
+    remap_branch_offsets(&mut code, &fake_to_actual);
+    Ok(CodeUnit {
+        locals: sig_idx,
+        code,
+    })
+}
+
+fn compile_bytecode_block(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    code: &mut Vec<Bytecode>,
+    block: BytecodeBlock,
+) -> Result<()> {
+    for instr in block {
+        compile_bytecode(context, function_frame, code, instr)?
+    }
+    Ok(())
+}
+
+fn compile_bytecode(
+    context: &mut Context,
+    function_frame: &mut FunctionFrame,
+    code: &mut Vec<Bytecode>,
+    sp!(loc, instr_): IRBytecode,
+) -> Result<()> {
+    make_push_instr!(context, code);
+    make_record_nop_label!(context, code);
+    let ff_instr = match instr_ {
+        IRBytecode_::Pop => Bytecode::Pop,
+        IRBytecode_::Ret => Bytecode::Ret,
+        IRBytecode_::Nop(None) => Bytecode::Nop,
+        IRBytecode_::Nop(Some(lbl)) => {
+            record_nop_label!(lbl);
+            Bytecode::Nop
+        }
+        IRBytecode_::BrTrue(lbl) => Bytecode::BrTrue(context.label_index(lbl)?),
+        IRBytecode_::BrFalse(lbl) => Bytecode::BrFalse(context.label_index(lbl)?),
+        IRBytecode_::Branch(lbl) => Bytecode::Branch(context.label_index(lbl)?),
+        IRBytecode_::LdU8(u) => Bytecode::LdU8(u),
+        IRBytecode_::LdU16(u) => Bytecode::LdU16(u),
+        IRBytecode_::LdU32(u) => Bytecode::LdU32(u),
+        IRBytecode_::LdU64(u) => Bytecode::LdU64(u),
+        IRBytecode_::LdU128(u) => Bytecode::LdU128(u),
+        IRBytecode_::LdU256(u) => Bytecode::LdU256(u),
+        IRBytecode_::CastU8 => Bytecode::CastU8,
+        IRBytecode_::CastU16 => Bytecode::CastU16,
+        IRBytecode_::CastU32 => Bytecode::CastU32,
+        IRBytecode_::CastU64 => Bytecode::CastU64,
+        IRBytecode_::CastU128 => Bytecode::CastU128,
+        IRBytecode_::CastU256 => Bytecode::CastU256,
+        IRBytecode_::LdTrue => Bytecode::LdTrue,
+        IRBytecode_::LdFalse => Bytecode::LdFalse,
+        IRBytecode_::LdConst(ty, v) => {
+            let constant = compile_constant(context, ty, v)?;
+            Bytecode::LdConst(context.constant_index(constant)?)
+        }
+        IRBytecode_::LdNamedConst(c) => Bytecode::LdConst(context.named_constant_index(&c)?),
+        IRBytecode_::CopyLoc(sp!(_, v_)) => Bytecode::CopyLoc(function_frame.get_local(&v_)?),
+        IRBytecode_::MoveLoc(sp!(_, v_)) => Bytecode::MoveLoc(function_frame.get_local(&v_)?),
+        IRBytecode_::StLoc(sp!(_, v_)) => Bytecode::StLoc(function_frame.get_local(&v_)?),
+        IRBytecode_::Call(m, n, tys) => {
+            let tokens = Signature(compile_types(
+                context,
+                function_frame.type_parameters(),
+                &tys,
+            )?);
+            let type_actuals_id = context.signature_index(tokens)?;
+            let fh_idx = context.function_handle(m, n)?.1;
+            if tys.is_empty() {
+                Bytecode::Call(fh_idx)
+            } else {
+                let fi_idx = context.function_instantiation_index(fh_idx, type_actuals_id)?;
+                Bytecode::CallGeneric(fi_idx)
+            }
+        }
+        IRBytecode_::Pack(n, tys) => {
+            let tokens = Signature(compile_types(
+                context,
+                function_frame.type_parameters(),
+                &tys,
+            )?);
+            let type_actuals_id = context.signature_index(tokens)?;
+            let def_idx = context.struct_definition_index(&n)?;
+            if tys.is_empty() {
+                Bytecode::Pack(def_idx)
+            } else {
+                let si_idx = context.struct_instantiation_index(def_idx, type_actuals_id)?;
+                Bytecode::PackGeneric(si_idx)
+            }
+        }
+        IRBytecode_::Unpack(n, tys) => {
+            let tokens = Signature(compile_types(
+                context,
+                function_frame.type_parameters(),
+                &tys,
+            )?);
+            let type_actuals_id = context.signature_index(tokens)?;
+            let def_idx = context.struct_definition_index(&n)?;
+            if tys.is_empty() {
+                Bytecode::Unpack(def_idx)
+            } else {
+                let si_idx = context.struct_instantiation_index(def_idx, type_actuals_id)?;
+                Bytecode::UnpackGeneric(si_idx)
+            }
+        }
+        IRBytecode_::ReadRef => Bytecode::ReadRef,
+        IRBytecode_::WriteRef => Bytecode::WriteRef,
+        IRBytecode_::FreezeRef => Bytecode::FreezeRef,
+        IRBytecode_::MutBorrowLoc(sp!(_, v_)) => {
+            Bytecode::MutBorrowLoc(function_frame.get_local(&v_)?)
+        }
+        IRBytecode_::ImmBorrowLoc(sp!(_, v_)) => {
+            Bytecode::ImmBorrowLoc(function_frame.get_local(&v_)?)
+        }
+        IRBytecode_::MutBorrowField(name, tys, sp!(_, field_)) => {
+            let qualified_struct_name = QualifiedStructIdent {
+                module: ModuleName::module_self(),
+                name,
+            };
+            let sh_idx = context.struct_handle_index(qualified_struct_name)?;
+            let (def_idx, _, field_offset) = context.field(sh_idx, field_)?;
+
+            let fh_idx = context.field_handle_index(def_idx, field_offset as u16)?;
+            if tys.is_empty() {
+                Bytecode::MutBorrowField(fh_idx)
+            } else {
+                let tokens = Signature(compile_types(
+                    context,
+                    function_frame.type_parameters(),
+                    &tys,
+                )?);
+                let type_actuals_id = context.signature_index(tokens)?;
+                let fi_idx = context.field_instantiation_index(fh_idx, type_actuals_id)?;
+                Bytecode::MutBorrowFieldGeneric(fi_idx)
+            }
+        }
+        IRBytecode_::ImmBorrowField(name, tys, sp!(_, field_)) => {
+            let qualified_struct_name = QualifiedStructIdent {
+                module: ModuleName::module_self(),
+                name,
+            };
+            let sh_idx = context.struct_handle_index(qualified_struct_name)?;
+            let (def_idx, _, field_offset) = context.field(sh_idx, field_)?;
+
+            let fh_idx = context.field_handle_index(def_idx, field_offset as u16)?;
+            if tys.is_empty() {
+                Bytecode::ImmBorrowField(fh_idx)
+            } else {
+                let tokens = Signature(compile_types(
+                    context,
+                    function_frame.type_parameters(),
+                    &tys,
+                )?);
+                let type_actuals_id = context.signature_index(tokens)?;
+                let fi_idx = context.field_instantiation_index(fh_idx, type_actuals_id)?;
+                Bytecode::ImmBorrowFieldGeneric(fi_idx)
+            }
+        }
+        IRBytecode_::Add => Bytecode::Add,
+        IRBytecode_::Sub => Bytecode::Sub,
+        IRBytecode_::Mul => Bytecode::Mul,
+        IRBytecode_::Mod => Bytecode::Mod,
+        IRBytecode_::Div => Bytecode::Div,
+        IRBytecode_::BitOr => Bytecode::BitOr,
+        IRBytecode_::BitAnd => Bytecode::BitAnd,
+        IRBytecode_::Xor => Bytecode::Xor,
+        IRBytecode_::Or => Bytecode::Or,
+        IRBytecode_::And => Bytecode::And,
+        IRBytecode_::Not => Bytecode::Not,
+        IRBytecode_::Eq => Bytecode::Eq,
+        IRBytecode_::Neq => Bytecode::Neq,
+        IRBytecode_::Lt => Bytecode::Lt,
+        IRBytecode_::Gt => Bytecode::Gt,
+        IRBytecode_::Le => Bytecode::Le,
+        IRBytecode_::Ge => Bytecode::Ge,
+        IRBytecode_::Abort => Bytecode::Abort,
+        IRBytecode_::Shl => Bytecode::Shl,
+        IRBytecode_::Shr => Bytecode::Shr,
+        IRBytecode_::VecPack(ty, n) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecPack(context.signature_index(sig)?, n)
+        }
+        IRBytecode_::VecLen(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecLen(context.signature_index(sig)?)
+        }
+        IRBytecode_::VecImmBorrow(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecImmBorrow(context.signature_index(sig)?)
+        }
+        IRBytecode_::VecMutBorrow(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecMutBorrow(context.signature_index(sig)?)
+        }
+        IRBytecode_::VecPushBack(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecPushBack(context.signature_index(sig)?)
+        }
+        IRBytecode_::VecPopBack(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecPopBack(context.signature_index(sig)?)
+        }
+        IRBytecode_::VecUnpack(ty, n) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecUnpack(context.signature_index(sig)?, n)
+        }
+        IRBytecode_::VecSwap(ty) => {
+            let tokens = compile_type(context, function_frame.type_parameters(), &ty)?;
+            let sig = Signature(vec![tokens]);
+            Bytecode::VecSwap(context.signature_index(sig)?)
+        }
+    };
+    push_instr!(loc, ff_instr);
+    Ok(())
+}
+
+fn remap_branch_offsets(code: &mut Vec<Bytecode>, fake_to_actual: &HashMap<u16, u16>) {
+    for instr in code {
+        match instr {
+            Bytecode::BrTrue(offset) | Bytecode::BrFalse(offset) | Bytecode::Branch(offset) => {
+                *offset = fake_to_actual[offset]
+            }
+            _ => (),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-ir-to-bytecode/src/context.rs b/vendors/move/crates/move-ir-to-bytecode/src/context.rs
new file mode 100644
index 000000000..8aa51bada
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode/src/context.rs
@@ -0,0 +1,881 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, format_err, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        AbilitySet, AddressIdentifierIndex, CodeOffset, Constant, ConstantPoolIndex, FieldHandle,
+        FieldHandleIndex, FieldInstantiation, FieldInstantiationIndex, FunctionDefinitionIndex,
+        FunctionHandle, FunctionHandleIndex, FunctionInstantiation, FunctionInstantiationIndex,
+        FunctionSignature, IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature,
+        SignatureIndex, SignatureToken, StructDefInstantiation, StructDefInstantiationIndex,
+        StructDefinitionIndex, StructHandle, StructHandleIndex, StructTypeParameter, TableIndex,
+    },
+    CompiledModule,
+};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+};
+use move_ir_types::{
+    ast::{
+        BlockLabel_, ConstantName, Field_, FunctionName, ModuleIdent, ModuleName,
+        QualifiedStructIdent, StructName,
+    },
+    location::Loc,
+};
+use std::{clone::Clone, collections::HashMap, hash::Hash};
+
+macro_rules! get_or_add_item_macro {
+    ($m:ident, $k_get:expr, $k_insert:expr) => {{
+        let k_key = $k_get;
+        Ok(if $m.contains_key(k_key) {
+            *$m.get(k_key).unwrap()
+        } else {
+            let len = $m.len();
+            if len >= TABLE_MAX_SIZE {
+                bail!("Max table size reached!")
+            }
+            let index = len as TableIndex;
+            $m.insert($k_insert, index);
+            index
+        })
+    }};
+}
+
+pub const TABLE_MAX_SIZE: usize = u16::max_value() as usize;
+fn get_or_add_item_ref<K: Clone + Eq + Hash>(
+    m: &mut HashMap<K, TableIndex>,
+    k: &K,
+) -> Result<TableIndex> {
+    get_or_add_item_macro!(m, k, k.clone())
+}
+
+fn get_or_add_item<K: Eq + Hash>(m: &mut HashMap<K, TableIndex>, k: K) -> Result<TableIndex> {
+    get_or_add_item_macro!(m, &k, k)
+}
+
+pub fn ident_str(s: &str) -> Result<&IdentStr> {
+    IdentStr::new(s)
+}
+
+#[derive(Clone, Debug)]
+pub struct CompiledDependencyView<'a> {
+    structs: HashMap<(&'a IdentStr, &'a IdentStr), TableIndex>,
+    functions: HashMap<&'a IdentStr, TableIndex>,
+
+    module_pool: &'a [ModuleHandle],
+    struct_pool: &'a [StructHandle],
+    function_pool: &'a [FunctionHandle],
+    identifiers: &'a [Identifier],
+    address_identifiers: &'a [AccountAddress],
+    signature_pool: &'a [Signature],
+}
+
+impl<'a> CompiledDependencyView<'a> {
+    pub fn new(dep: &'a CompiledModule) -> Result<Self> {
+        let mut structs = HashMap::new();
+        let mut functions = HashMap::new();
+
+        let self_handle = dep.self_handle_idx();
+
+        for shandle in dep.struct_handles() {
+            let mhandle = dep.module_handle_at(shandle.module);
+            let mname = dep.identifier_at(mhandle.name);
+            let sname = dep.identifier_at(shandle.name);
+            // get_or_add_item gets the proper struct handle index, as `dep.struct_handles()` is
+            // properly ordered
+            get_or_add_item(&mut structs, (mname, sname))?;
+        }
+
+        // keep only functions defined in the current module
+        // with module handle 0
+        let defined_function_handles = dep
+            .function_handles()
+            .iter()
+            .enumerate()
+            .filter(|(_idx, fhandle)| fhandle.module == self_handle);
+        for (idx, fhandle) in defined_function_handles {
+            let fname = dep.identifier_at(fhandle.name);
+            functions.insert(fname, idx as u16);
+        }
+
+        Ok(Self {
+            structs,
+            functions,
+            module_pool: dep.module_handles(),
+            struct_pool: dep.struct_handles(),
+            function_pool: dep.function_handles(),
+            identifiers: dep.identifiers(),
+            address_identifiers: dep.address_identifiers(),
+            signature_pool: dep.signatures(),
+        })
+    }
+
+    fn source_struct_info(&self, idx: StructHandleIndex) -> Option<(ModuleIdent, StructName)> {
+        let handle = self.struct_pool.get(idx.0 as usize)?;
+        let module_handle = self.module_pool.get(handle.module.0 as usize)?;
+        let address = *self
+            .address_identifiers
+            .get(module_handle.address.0 as usize)?;
+        let module = ModuleName(
+            self.identifiers
+                .get(module_handle.name.0 as usize)?
+                .as_str()
+                .into(),
+        );
+        assert!(module != ModuleName::module_self());
+        let ident = ModuleIdent {
+            address,
+            name: module,
+        };
+        let name = StructName(
+            self.identifiers
+                .get(handle.name.0 as usize)?
+                .as_str()
+                .into(),
+        );
+        Some((ident, name))
+    }
+
+    fn struct_handle(&self, module: &ModuleName, name: &StructName) -> Option<&'a StructHandle> {
+        self.structs
+            .get(&(
+                ident_str(module.0.as_str()).ok()?,
+                ident_str(name.0.as_str()).ok()?,
+            ))
+            .and_then(|idx| self.struct_pool.get(*idx as usize))
+    }
+
+    fn function_signature(&self, name: &FunctionName) -> Option<FunctionSignature> {
+        self.functions
+            .get(ident_str(name.0.as_str()).ok()?)
+            .and_then(|idx| {
+                let fh = self.function_pool.get(*idx as usize)?;
+                Some(FunctionSignature {
+                    parameters: self.signature_pool[fh.parameters.0 as usize].0.clone(),
+                    return_: self.signature_pool[fh.return_.0 as usize].0.clone(),
+                    type_parameters: fh.type_parameters.clone(),
+                })
+            })
+    }
+}
+
+#[ouroboros::self_referencing]
+pub(crate) struct StoredCompiledDependency {
+    module: Box<CompiledModule>,
+    #[borrows(module)]
+    #[covariant]
+    view: CompiledDependencyView<'this>,
+}
+
+impl StoredCompiledDependency {
+    pub fn create(module: CompiledModule) -> Result<Self> {
+        Self::try_new(Box::new(module), move |module| {
+            CompiledDependencyView::new(module)
+        })
+    }
+}
+
+pub(crate) enum CompiledDependency<'a> {
+    /// Simple `CompiledDependecyView` where the borrowed `CompiledModule` is held elsewehere,
+    /// Commonly, it is borrowed from outside of the compilers API
+    Borrowed(CompiledDependencyView<'a>),
+    /// `Stored` holds the `CompiledModule` as well as the `CompiledDependencyView` into the module
+    /// uses `rental` for a self referential struct
+    /// This is used to solve an issue of creating a `CompiledModule` and immediately needing to
+    /// borrow it for the `CompiledDependencyView`. The `StoredCompiledDependency` gets around this
+    /// by storing the module in it's first field, and then it's second field borrows the value in
+    /// the first field via the `rental` crate
+    Stored(StoredCompiledDependency),
+}
+
+impl<'a> CompiledDependency<'a> {
+    pub fn borrowed(module: &'a CompiledModule) -> Result<Self> {
+        Ok(Self::Borrowed(CompiledDependencyView::new(module)?))
+    }
+
+    pub fn stored(module: CompiledModule) -> Result<Self> {
+        Ok(Self::Stored(StoredCompiledDependency::create(module)?))
+    }
+}
+
+pub(crate) type CompiledDependencies<'a> = HashMap<ModuleIdent, CompiledDependency<'a>>;
+
+/// Represents all of the pools to be used in the file format, both by CompiledModule
+/// and CompiledScript.
+pub struct MaterializedPools {
+    /// Module handle pool
+    pub module_handles: Vec<ModuleHandle>,
+    /// Struct handle pool
+    pub struct_handles: Vec<StructHandle>,
+    /// Function handle pool
+    pub function_handles: Vec<FunctionHandle>,
+    /// Field handle pool
+    pub field_handles: Vec<FieldHandle>,
+    /// Struct instantiation pool
+    pub struct_def_instantiations: Vec<StructDefInstantiation>,
+    /// Function instantiation pool
+    pub function_instantiations: Vec<FunctionInstantiation>,
+    /// Field instantiation pool
+    pub field_instantiations: Vec<FieldInstantiation>,
+    /// Locals signatures pool
+    pub signatures: Vec<Signature>,
+    /// Identifier pool
+    pub identifiers: Vec<Identifier>,
+    /// Address identifier pool
+    pub address_identifiers: Vec<AccountAddress>,
+    /// Constant pool
+    pub constant_pool: Vec<Constant>,
+}
+
+/// Compilation context for a single compilation unit (module or script).
+/// Contains all of the pools as they are built up.
+/// Specific definitions to CompiledModule or CompiledScript are not stored.
+/// However, some fields, like struct_defs and fields, are not used in CompiledScript.
+pub(crate) struct Context<'a> {
+    dependencies: CompiledDependencies<'a>,
+
+    // helpers
+    aliases: HashMap<ModuleIdent, ModuleName>,
+    modules: HashMap<ModuleName, (ModuleIdent, ModuleHandle)>,
+    structs: HashMap<QualifiedStructIdent, StructHandle>,
+    struct_defs: HashMap<StructName, TableIndex>,
+    named_constants: HashMap<ConstantName, TableIndex>,
+    labels: HashMap<BlockLabel_, u16>,
+
+    // queryable pools
+    // TODO: lookup for Fields is not that seemless after binary format changes
+    // We need multiple lookups or a better representation for fields
+    fields: HashMap<(StructHandleIndex, Field_), (StructDefinitionIndex, SignatureToken, usize)>,
+    function_handles: HashMap<(ModuleName, FunctionName), (FunctionHandle, FunctionHandleIndex)>,
+    function_signatures: HashMap<(ModuleName, FunctionName), FunctionSignature>,
+
+    // Simple pools
+    module_handles: HashMap<ModuleHandle, TableIndex>,
+    struct_handles: HashMap<StructHandle, TableIndex>,
+    signatures: HashMap<Signature, TableIndex>,
+    identifiers: HashMap<Identifier, TableIndex>,
+    address_identifiers: HashMap<AccountAddress, TableIndex>,
+    constant_pool: HashMap<Constant, TableIndex>,
+    field_handles: HashMap<FieldHandle, TableIndex>,
+    struct_instantiations: HashMap<StructDefInstantiation, TableIndex>,
+    function_instantiations: HashMap<FunctionInstantiation, TableIndex>,
+    field_instantiations: HashMap<FieldInstantiation, TableIndex>,
+
+    // The current function index that we are on
+    current_function_index: FunctionDefinitionIndex,
+
+    // Source location mapping for this module
+    pub source_map: SourceMap,
+}
+
+impl<'a> Context<'a> {
+    /// Given the dependencies and the current module, creates an empty context.
+    /// The current module is a dummy `Self` for CompiledScript.
+    /// It initializes an "import" of `Self` as the alias for the current_module.
+    pub fn new(
+        decl_location: Loc,
+        dependencies: CompiledDependencies<'a>,
+        current_module_opt: Option<ModuleIdent>,
+    ) -> Result<Self> {
+        let context = Self {
+            dependencies,
+            aliases: HashMap::new(),
+            modules: HashMap::new(),
+            structs: HashMap::new(),
+            struct_defs: HashMap::new(),
+            named_constants: HashMap::new(),
+            labels: HashMap::new(),
+            fields: HashMap::new(),
+            function_handles: HashMap::new(),
+            function_signatures: HashMap::new(),
+            module_handles: HashMap::new(),
+            struct_handles: HashMap::new(),
+            field_handles: HashMap::new(),
+            struct_instantiations: HashMap::new(),
+            function_instantiations: HashMap::new(),
+            field_instantiations: HashMap::new(),
+            signatures: HashMap::new(),
+            identifiers: HashMap::new(),
+            address_identifiers: HashMap::new(),
+            constant_pool: HashMap::new(),
+            current_function_index: FunctionDefinitionIndex::new(0),
+            source_map: SourceMap::new(decl_location, current_module_opt),
+        };
+
+        Ok(context)
+    }
+
+    pub fn take_dependencies(&mut self) -> CompiledDependencies<'a> {
+        std::mem::take(&mut self.dependencies)
+    }
+
+    pub fn restore_dependencies(&mut self, dependencies: CompiledDependencies<'a>) {
+        assert!(self.dependencies.is_empty());
+        self.dependencies = dependencies;
+    }
+
+    pub fn add_compiled_dependency(&mut self, compiled_dep: &'a CompiledModule) -> Result<()> {
+        let ident = ModuleIdent {
+            address: *compiled_dep.address(),
+            name: ModuleName(compiled_dep.name().as_str().into()),
+        };
+        match self.dependencies.get(&ident) {
+            None => self
+                .dependencies
+                .insert(ident, CompiledDependency::borrowed(compiled_dep)?),
+            Some(_previous) => bail!("Duplicate dependency module for {}", ident),
+        };
+        Ok(())
+    }
+
+    fn materialize_pool<T: Clone>(
+        size: usize,
+        items: impl IntoIterator<Item = (T, TableIndex)>,
+    ) -> Vec<T> {
+        let mut options = vec![None; size];
+        for (item, idx) in items {
+            assert!(options[idx as usize].is_none());
+            options[idx as usize] = Some(item);
+        }
+        options.into_iter().map(|opt| opt.unwrap()).collect()
+    }
+
+    fn materialize_map<T: Clone>(m: HashMap<T, TableIndex>) -> Vec<T> {
+        Self::materialize_pool(m.len(), m)
+    }
+
+    /// Finish compilation, and materialize the pools for file format.
+    pub fn materialize_pools(self) -> (MaterializedPools, CompiledDependencies<'a>, SourceMap) {
+        let num_functions = self.function_handles.len();
+        assert!(num_functions == self.function_signatures.len());
+        let function_handles = Self::materialize_pool(
+            num_functions,
+            self.function_handles
+                .into_iter()
+                .map(|(_, (t, idx))| (t, idx.0)),
+        );
+        let materialized_pools = MaterializedPools {
+            function_handles,
+            module_handles: Self::materialize_map(self.module_handles),
+            struct_handles: Self::materialize_map(self.struct_handles),
+            field_handles: Self::materialize_map(self.field_handles),
+            signatures: Self::materialize_map(self.signatures),
+            identifiers: Self::materialize_map(self.identifiers),
+            address_identifiers: Self::materialize_map(self.address_identifiers),
+            constant_pool: Self::materialize_map(self.constant_pool),
+            function_instantiations: Self::materialize_map(self.function_instantiations),
+            struct_def_instantiations: Self::materialize_map(self.struct_instantiations),
+            field_instantiations: Self::materialize_map(self.field_instantiations),
+        };
+        (materialized_pools, self.dependencies, self.source_map)
+    }
+
+    pub fn build_index_remapping(
+        &mut self,
+        label_to_index: HashMap<BlockLabel_, u16>,
+    ) -> HashMap<u16, u16> {
+        let labels = std::mem::take(&mut self.labels);
+        label_to_index
+            .into_iter()
+            .map(|(lbl, actual_idx)| (labels[&lbl], actual_idx))
+            .collect()
+    }
+
+    //**********************************************************************************************
+    // Pools
+    //**********************************************************************************************
+
+    /// Get the alias for the identifier, fails if it is not bound.
+    fn module_alias(&self, ident: &ModuleIdent) -> Result<&ModuleName> {
+        self.aliases
+            .get(ident)
+            .ok_or_else(|| format_err!("Missing import for module {}", ident))
+    }
+
+    /// Get the handle for the alias, fails if it is not bound.
+    fn module_handle(&self, module_name: &ModuleName) -> Result<&ModuleHandle> {
+        match self.modules.get(module_name) {
+            None => bail!("Unbound module alias {}", module_name),
+            Some((_, mh)) => Ok(mh),
+        }
+    }
+
+    /// Get the identifier for the alias, fails if it is not bound.
+    pub fn module_ident(&self, module_name: &ModuleName) -> Result<&ModuleIdent> {
+        match self.modules.get(module_name) {
+            None => bail!("Unbound module alias {}", module_name),
+            Some((id, _)) => Ok(id),
+        }
+    }
+
+    /// Get the module handle index for the alias, fails if it is not bound.
+    pub fn module_handle_index(&self, module_name: &ModuleName) -> Result<ModuleHandleIndex> {
+        Ok(ModuleHandleIndex(
+            *self
+                .module_handles
+                .get(self.module_handle(module_name)?)
+                .unwrap(),
+        ))
+    }
+
+    /// Get the field handle index for the alias, adds it if missing.
+    pub fn field_handle_index(
+        &mut self,
+        owner: StructDefinitionIndex,
+        field: u16,
+    ) -> Result<FieldHandleIndex> {
+        let field_handle = FieldHandle { owner, field };
+        Ok(FieldHandleIndex(get_or_add_item(
+            &mut self.field_handles,
+            field_handle,
+        )?))
+    }
+
+    /// Get the struct instantiation index for the alias, adds it if missing.
+    pub fn struct_instantiation_index(
+        &mut self,
+        def: StructDefinitionIndex,
+        type_parameters: SignatureIndex,
+    ) -> Result<StructDefInstantiationIndex> {
+        let struct_inst = StructDefInstantiation {
+            def,
+            type_parameters,
+        };
+        Ok(StructDefInstantiationIndex(get_or_add_item(
+            &mut self.struct_instantiations,
+            struct_inst,
+        )?))
+    }
+
+    /// Get the function instantiation index for the alias, adds it if missing.
+    pub fn function_instantiation_index(
+        &mut self,
+        handle: FunctionHandleIndex,
+        type_parameters: SignatureIndex,
+    ) -> Result<FunctionInstantiationIndex> {
+        let func_inst = FunctionInstantiation {
+            handle,
+            type_parameters,
+        };
+        Ok(FunctionInstantiationIndex(get_or_add_item(
+            &mut self.function_instantiations,
+            func_inst,
+        )?))
+    }
+
+    /// Get the field instantiation index for the alias, adds it if missing.
+    pub fn field_instantiation_index(
+        &mut self,
+        handle: FieldHandleIndex,
+        type_parameters: SignatureIndex,
+    ) -> Result<FieldInstantiationIndex> {
+        let field_inst = FieldInstantiation {
+            handle,
+            type_parameters,
+        };
+        Ok(FieldInstantiationIndex(get_or_add_item(
+            &mut self.field_instantiations,
+            field_inst,
+        )?))
+    }
+
+    /// Get the fake offset for the label. Labels will be fixed to real offsets after compilation
+    pub fn label_index(&mut self, label: BlockLabel_) -> Result<CodeOffset> {
+        get_or_add_item(&mut self.labels, label)
+    }
+
+    /// Get the identifier pool index, adds it if missing.
+    pub fn identifier_index(&mut self, s: impl AsRef<str>) -> Result<IdentifierIndex> {
+        let ident = ident_str(s.as_ref())?;
+        let m = &mut self.identifiers;
+        let idx: Result<TableIndex> = get_or_add_item_macro!(m, ident, ident.to_owned());
+        Ok(IdentifierIndex(idx?))
+    }
+
+    /// Get the address pool index, adds it if missing.
+    pub fn address_index(&mut self, addr: AccountAddress) -> Result<AddressIdentifierIndex> {
+        Ok(AddressIdentifierIndex(get_or_add_item(
+            &mut self.address_identifiers,
+            addr,
+        )?))
+    }
+
+    /// Get the byte array pool index, adds it if missing.
+    #[allow(clippy::ptr_arg)]
+    pub fn constant_index(&mut self, constant: Constant) -> Result<ConstantPoolIndex> {
+        Ok(ConstantPoolIndex(get_or_add_item(
+            &mut self.constant_pool,
+            constant,
+        )?))
+    }
+
+    pub fn named_constant_index(&mut self, constant: &ConstantName) -> Result<ConstantPoolIndex> {
+        match self.named_constants.get(constant) {
+            None => bail!("Missing constant definition for {}", constant),
+            Some(idx) => Ok(ConstantPoolIndex(*idx)),
+        }
+    }
+
+    /// Get the field index, fails if it is not bound.
+    pub fn field(
+        &self,
+        s: StructHandleIndex,
+        f: Field_,
+    ) -> Result<(StructDefinitionIndex, SignatureToken, usize)> {
+        match self.fields.get(&(s, f.clone())) {
+            None => bail!("Unbound field {}", f),
+            Some((sd_idx, token, decl_order)) => Ok((*sd_idx, token.clone(), *decl_order)),
+        }
+    }
+
+    /// Get the struct definition index, fails if it is not bound.
+    pub fn struct_definition_index(&self, s: &StructName) -> Result<StructDefinitionIndex> {
+        match self.struct_defs.get(s) {
+            None => bail!("Missing struct definition for {}", s),
+            Some(idx) => Ok(StructDefinitionIndex(*idx)),
+        }
+    }
+
+    /// Get the signature pool index, adds it if missing.
+    pub fn signature_index(&mut self, sig: Signature) -> Result<SignatureIndex> {
+        Ok(SignatureIndex(get_or_add_item(&mut self.signatures, sig)?))
+    }
+
+    pub fn set_function_index(&mut self, index: TableIndex) {
+        self.current_function_index = FunctionDefinitionIndex(index);
+    }
+
+    pub fn current_function_definition_index(&self) -> FunctionDefinitionIndex {
+        self.current_function_index
+    }
+
+    pub fn current_struct_definition_index(&self) -> StructDefinitionIndex {
+        let idx = self.struct_defs.len();
+        StructDefinitionIndex(idx as TableIndex)
+    }
+
+    //**********************************************************************************************
+    // Declarations
+    //**********************************************************************************************
+
+    /// Add a friend. This creates a module handle for the friended module.
+    pub fn declare_friend(&mut self, id: ModuleIdent) -> Result<ModuleHandle> {
+        let address = self.address_index(id.address)?;
+        let name = self.identifier_index(id.name.0)?;
+        Ok(ModuleHandle { address, name })
+    }
+
+    /// Add an import. This creates a module handle index for the imported module.
+    pub fn declare_import(
+        &mut self,
+        id: ModuleIdent,
+        alias: ModuleName,
+    ) -> Result<ModuleHandleIndex> {
+        // We don't care about duplicate aliases, if they exist
+        self.aliases.insert(id, alias);
+        let address = self.address_index(id.address)?;
+        let name = self.identifier_index(id.name.0)?;
+        self.modules
+            .insert(alias, (id, ModuleHandle { address, name }));
+        Ok(ModuleHandleIndex(get_or_add_item_ref(
+            &mut self.module_handles,
+            &self.modules.get(&alias).unwrap().1,
+        )?))
+    }
+
+    /// Given an identifier and basic "signature" information, creates a struct handle
+    /// and adds it to the pool.
+    pub fn declare_struct_handle_index(
+        &mut self,
+        sname: QualifiedStructIdent,
+        abilities: AbilitySet,
+        type_parameters: Vec<StructTypeParameter>,
+    ) -> Result<StructHandleIndex> {
+        self.declare_struct_handle_index_with_abilities(sname, abilities, type_parameters)
+    }
+
+    fn declare_struct_handle_index_with_abilities(
+        &mut self,
+        sname: QualifiedStructIdent,
+        abilities: AbilitySet,
+        type_parameters: Vec<StructTypeParameter>,
+    ) -> Result<StructHandleIndex> {
+        let module = self.module_handle_index(&sname.module)?;
+        let name = self.identifier_index(sname.name.0)?;
+        self.structs.insert(
+            sname.clone(),
+            StructHandle {
+                module,
+                name,
+                abilities,
+                type_parameters,
+            },
+        );
+        Ok(StructHandleIndex(get_or_add_item_ref(
+            &mut self.struct_handles,
+            self.structs.get(&sname).unwrap(),
+        )?))
+    }
+
+    /// Given an identifier, declare the struct definition index.
+    pub fn declare_struct_definition_index(
+        &mut self,
+        s: StructName,
+    ) -> Result<StructDefinitionIndex> {
+        let idx = self.struct_defs.len();
+        if idx > TABLE_MAX_SIZE {
+            bail!("too many struct definitions {}", s)
+        }
+        // TODO: Add the decl of the struct definition name here
+        // need to handle duplicates
+        Ok(StructDefinitionIndex(
+            *self.struct_defs.entry(s).or_insert(idx as TableIndex),
+        ))
+    }
+
+    /// Given an identifier and a signature, creates a function handle and adds it to the pool.
+    /// Finds the index for the signature, or adds it to the pool if an identical one has not yet
+    /// been used.
+    pub fn declare_function(
+        &mut self,
+        mname: ModuleName,
+        fname: FunctionName,
+        signature: FunctionSignature,
+    ) -> Result<()> {
+        let m_f = (mname, fname.clone());
+        let module = self.module_handle_index(&mname)?;
+        let name = self.identifier_index(fname.0)?;
+
+        self.function_signatures
+            .insert(m_f.clone(), signature.clone());
+
+        let FunctionSignature {
+            return_,
+            parameters,
+            type_parameters,
+        } = signature;
+
+        let params_idx = get_or_add_item(&mut self.signatures, Signature(parameters))?;
+        let return_idx = get_or_add_item(&mut self.signatures, Signature(return_))?;
+
+        let handle = FunctionHandle {
+            module,
+            name,
+            parameters: SignatureIndex(params_idx as TableIndex),
+            return_: SignatureIndex(return_idx as TableIndex),
+            type_parameters,
+        };
+        // handle duplicate declarations
+        // erroring on duplicates needs to be done by the bytecode verifier
+        let hidx = match self.function_handles.get(&m_f) {
+            None => self.function_handles.len(),
+            Some((_, idx)) => idx.0 as usize,
+        };
+        if hidx > TABLE_MAX_SIZE {
+            bail!("too many functions: {}.{}", mname, fname)
+        }
+        let handle_index = FunctionHandleIndex(hidx as TableIndex);
+        self.function_handles.insert(m_f, (handle, handle_index));
+
+        Ok(())
+    }
+
+    /// Given a named constant, adds it to the pool
+    pub fn declare_constant(&mut self, name: ConstantName, constant: Constant) -> Result<()> {
+        let idx = self.constant_index(constant)?;
+        self.named_constants.insert(name, idx.0);
+        Ok(())
+    }
+
+    /// Given a struct handle and a field, adds it to the pool.
+    pub fn declare_field(
+        &mut self,
+        s: StructHandleIndex,
+        sd_idx: StructDefinitionIndex,
+        f: Field_,
+        token: SignatureToken,
+        decl_order: usize,
+    ) {
+        // need to handle duplicates
+        self.fields
+            .entry((s, f))
+            .or_insert((sd_idx, token, decl_order));
+    }
+
+    //**********************************************************************************************
+    // Dependency Resolution
+    //**********************************************************************************************
+
+    fn dependency(&self, m: &ModuleIdent) -> Result<&CompiledDependencyView> {
+        let dep = self
+            .dependencies
+            .get(m)
+            .ok_or_else(|| format_err!("Dependency not provided for {}", m))?;
+        Ok(match dep {
+            CompiledDependency::Borrowed(v) => v,
+            CompiledDependency::Stored(stored) => stored.borrow_view(),
+        })
+    }
+
+    fn dep_struct_handle(
+        &mut self,
+        s: &QualifiedStructIdent,
+    ) -> Result<(AbilitySet, Vec<StructTypeParameter>)> {
+        if s.module == ModuleName::module_self() {
+            bail!("Unbound struct {}", s)
+        }
+        let mident = *self.module_ident(&s.module)?;
+        let dep = self.dependency(&mident)?;
+        match dep.struct_handle(&mident.name, &s.name) {
+            None => bail!("Unbound struct {}", s),
+            Some(shandle) => Ok((shandle.abilities, shandle.type_parameters.clone())),
+        }
+    }
+
+    /// Given an identifier, find the struct handle index.
+    /// Creates the handle and adds it to the pool if it it is the *first* time it looks
+    /// up the struct in a dependency.
+    pub fn struct_handle_index(&mut self, s: QualifiedStructIdent) -> Result<StructHandleIndex> {
+        match self.structs.get(&s) {
+            Some(sh) => Ok(StructHandleIndex(*self.struct_handles.get(sh).unwrap())),
+            None => {
+                let (abilities, type_parameters) = self.dep_struct_handle(&s)?;
+                self.declare_struct_handle_index_with_abilities(s, abilities, type_parameters)
+            }
+        }
+    }
+
+    fn reindex_signature_token(
+        &mut self,
+        dep: &ModuleIdent,
+        orig: SignatureToken,
+    ) -> Result<SignatureToken> {
+        Ok(match orig {
+            x @ SignatureToken::Bool
+            | x @ SignatureToken::U8
+            | x @ SignatureToken::U16
+            | x @ SignatureToken::U32
+            | x @ SignatureToken::U64
+            | x @ SignatureToken::U128
+            | x @ SignatureToken::U256
+            | x @ SignatureToken::Address
+            | x @ SignatureToken::Signer
+            | x @ SignatureToken::TypeParameter(_) => x,
+            SignatureToken::Vector(inner) => {
+                let correct_inner = self.reindex_signature_token(dep, *inner)?;
+                SignatureToken::Vector(Box::new(correct_inner))
+            }
+            SignatureToken::Reference(inner) => {
+                let correct_inner = self.reindex_signature_token(dep, *inner)?;
+                SignatureToken::Reference(Box::new(correct_inner))
+            }
+            SignatureToken::MutableReference(inner) => {
+                let correct_inner = self.reindex_signature_token(dep, *inner)?;
+                SignatureToken::MutableReference(Box::new(correct_inner))
+            }
+            SignatureToken::Struct(orig_sh_idx) => {
+                let dep_info = self.dependency(dep)?;
+                let (mident, sname) = dep_info
+                    .source_struct_info(orig_sh_idx)
+                    .ok_or_else(|| format_err!("Malformed dependency"))?;
+                let module_name = *self.module_alias(&mident)?;
+                let sident = QualifiedStructIdent {
+                    module: module_name,
+                    name: sname,
+                };
+                let correct_sh_idx = self.struct_handle_index(sident)?;
+                SignatureToken::Struct(correct_sh_idx)
+            }
+            SignatureToken::StructInstantiation(orig_sh_idx, inners) => {
+                let dep_info = self.dependency(dep)?;
+                let (mident, sname) = dep_info
+                    .source_struct_info(orig_sh_idx)
+                    .ok_or_else(|| format_err!("Malformed dependency"))?;
+                let module_name = *self.module_alias(&mident)?;
+                let sident = QualifiedStructIdent {
+                    module: module_name,
+                    name: sname,
+                };
+                let correct_sh_idx = self.struct_handle_index(sident)?;
+                let correct_inners = inners
+                    .into_iter()
+                    .map(|t| self.reindex_signature_token(dep, t))
+                    .collect::<Result<_>>()?;
+                SignatureToken::StructInstantiation(correct_sh_idx, correct_inners)
+            }
+        })
+    }
+
+    fn reindex_function_signature(
+        &mut self,
+        dep: &ModuleIdent,
+        orig: FunctionSignature,
+    ) -> Result<FunctionSignature> {
+        let return_ = orig
+            .return_
+            .into_iter()
+            .map(|t| self.reindex_signature_token(dep, t))
+            .collect::<Result<_>>()?;
+        let parameters = orig
+            .parameters
+            .into_iter()
+            .map(|t| self.reindex_signature_token(dep, t))
+            .collect::<Result<_>>()?;
+        let type_parameters = orig.type_parameters;
+        Ok(FunctionSignature {
+            return_,
+            parameters,
+            type_parameters,
+        })
+    }
+
+    fn dep_function_signature(
+        &mut self,
+        m: &ModuleName,
+        f: &FunctionName,
+    ) -> Result<FunctionSignature> {
+        if m == &ModuleName::module_self() {
+            bail!("Unbound function {}.{}", m, f)
+        }
+        let mident = *self.module_ident(m)?;
+        let dep = self.dependency(&mident)?;
+        match dep.function_signature(f) {
+            None => bail!("Unbound function {}.{}", mident, f),
+            Some(sig) => self.reindex_function_signature(&mident, sig),
+        }
+    }
+
+    fn ensure_function_declared(&mut self, m: ModuleName, f: FunctionName) -> Result<()> {
+        let m_f = (m, f.clone());
+        if !self.function_handles.contains_key(&m_f) {
+            assert!(!self.function_signatures.contains_key(&m_f));
+            let sig = self.dep_function_signature(&m, &f)?;
+            self.declare_function(m, f, sig)?;
+        }
+
+        assert!(self.function_handles.contains_key(&m_f));
+        assert!(self.function_signatures.contains_key(&m_f));
+        Ok(())
+    }
+
+    /// Given an identifier, find the function handle and its index.
+    /// Creates the handle+signature and adds it to the pool if it it is the *first* time it looks
+    /// up the function in a dependency.
+    pub fn function_handle(
+        &mut self,
+        m: ModuleName,
+        f: FunctionName,
+    ) -> Result<&(FunctionHandle, FunctionHandleIndex)> {
+        self.ensure_function_declared(m, f.clone())?;
+        Ok(self.function_handles.get(&(m, f)).unwrap())
+    }
+
+    pub fn decl_location(&self) -> Loc {
+        self.source_map.definition_location
+    }
+}
diff --git a/vendors/move/crates/move-ir-to-bytecode/src/lib.rs b/vendors/move/crates/move-ir-to-bytecode/src/lib.rs
new file mode 100644
index 000000000..052905354
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode/src/lib.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate log;
+
+pub mod compiler;
+mod context;
+pub mod parser;
+
+// Unit tests for this crate are in the parent "compiler" crate.
diff --git a/vendors/move/crates/move-ir-to-bytecode/src/parser.rs b/vendors/move/crates/move-ir-to-bytecode/src/parser.rs
new file mode 100644
index 000000000..436094a26
--- /dev/null
+++ b/vendors/move/crates/move-ir-to-bytecode/src/parser.rs
@@ -0,0 +1,112 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use codespan_reporting::{
+    diagnostic::{Diagnostic, Label},
+    files::SimpleFiles,
+    term::{
+        emit,
+        termcolor::{ColorChoice, StandardStream},
+        Config,
+    },
+};
+use move_command_line_common::character_sets::is_permitted_chars;
+use move_ir_to_bytecode_syntax::syntax::{self, ParseError};
+use move_ir_types::{ast, location::*};
+
+// We restrict strings to only ascii visual characters (0x20 <= c <= 0x7E) or a permitted newline
+// character--\r--,--\n--or a tab--\t. Checking each character in the input string is more fool-proof
+// than checking each character later during lexing & tokenization, since that would require special
+// handling of characters inside of comments (usually not included as tokens) and within byte
+// array literals.
+fn verify_string(string: &str) -> Result<()> {
+    let chars: Vec<char> = string.chars().collect();
+    chars
+        .iter()
+        .enumerate()
+        .find(|(idx, _)| !is_permitted_chars(&chars, *idx))
+        .map_or(Ok(()), |(_, c)| {
+            bail!(
+                "Invalid character '{c}' found when reading file. \
+                For ASCII, only printable characters (tabs '\\t', lf '\\n' and crlf '\\r'+'\\n') \
+                are permitted. Unicode can be used, excluding certain control characters.",
+            )
+        })
+}
+
+/// Given the raw input of a file, creates a `ScriptOrModule` enum
+/// Fails with `Err(_)` if the text cannot be parsed`
+pub fn parse_script_or_module(s: &str) -> Result<ast::ScriptOrModule> {
+    verify_string(s)?;
+    syntax::parse_script_or_module_string(s).or_else(|e| handle_error(e, s))
+}
+
+/// Given the raw input of a file, creates a `Script` struct
+/// Fails with `Err(_)` if the text cannot be parsed
+pub fn parse_script(script_str: &str) -> Result<ast::Script> {
+    verify_string(script_str)?;
+    syntax::parse_script_string(script_str).or_else(|e| handle_error(e, script_str))
+}
+
+/// Given the raw input of a file, creates a single `ModuleDefinition` struct
+/// Fails with `Err(_)` if the text cannot be parsed
+pub fn parse_module(modules_str: &str) -> Result<ast::ModuleDefinition> {
+    verify_string(modules_str)?;
+    syntax::parse_module_string(modules_str).or_else(|e| handle_error(e, modules_str))
+}
+
+fn handle_error<T>(e: syntax::ParseError<Loc, anyhow::Error>, code_str: &str) -> Result<T> {
+    let location = match &e {
+        ParseError::InvalidToken { location, .. } => location,
+        ParseError::User { location, .. } => location,
+    };
+    let mut files = SimpleFiles::new();
+    let id = files.add(location.file_hash(), code_str.to_string());
+    let lbl = match &e {
+        ParseError::InvalidToken { message, .. } => Label::primary(id, location.usize_range())
+            .with_message(format!("Invalid Token: {}", message)),
+        ParseError::User { error, .. } => {
+            Label::primary(id, location.usize_range()).with_message(format!("{}", error))
+        }
+    };
+    let message = lbl.message.clone();
+    let error = Diagnostic::error()
+        .with_message("Parser Error")
+        .with_labels(vec![lbl]);
+    let writer = &mut StandardStream::stderr(ColorChoice::Auto);
+    emit(writer, &Config::default(), &files, &error).unwrap();
+    bail!("ParserError: {}", message)
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn verify_character_allowlist() {
+        let mut good_chars = (0x20..=0x7E).collect::<Vec<u8>>();
+        good_chars.push(0x0A);
+        good_chars.push(0x09);
+
+        let mut bad_chars = (0x0..0x09).collect::<Vec<_>>();
+        bad_chars.append(&mut vec![0x0B, 0x0C]);
+        bad_chars.append(&mut (0x0E..=0x1F).collect::<Vec<_>>());
+        bad_chars.push(0x7F);
+
+        // Test to make sure that all the characters that are in the allowlist pass.
+        {
+            let s = std::str::from_utf8(&good_chars)
+                .expect("Failed to construct string containing an invalid character. This shouldn't happen.");
+            assert!(super::verify_string(s).is_ok());
+        }
+
+        // Test to make sure that we fail for all characters not in the allowlist.
+        for bad_char in bad_chars {
+            good_chars.push(bad_char);
+            let s = std::str::from_utf8(&good_chars)
+                .expect("Failed to construct string containing an invalid character. This shouldn't happen.");
+            assert!(super::verify_string(s).is_err());
+            good_chars.pop();
+        }
+    }
+}
diff --git a/vendors/move/crates/move-ir-types/Cargo.toml b/vendors/move/crates/move-ir-types/Cargo.toml
new file mode 100644
index 000000000..5971af0ec
--- /dev/null
+++ b/vendors/move/crates/move-ir-types/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "move-ir-types"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Types for Move IR"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde.workspace = true
+hex.workspace = true
+once_cell.workspace = true
+
+move-core-types.workspace = true
+move-symbol-pool.workspace = true
+move-command-line-common.workspace = true
diff --git a/vendors/move/crates/move-ir-types/src/ast.rs b/vendors/move/crates/move-ir-types/src/ast.rs
new file mode 100644
index 000000000..176e47926
--- /dev/null
+++ b/vendors/move/crates/move-ir-types/src/ast.rs
@@ -0,0 +1,1780 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    location::*,
+    spec_language_ast::{Condition, Invariant, SyntheticDefinition},
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    runtime_value::MoveValue,
+};
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeSet, HashSet, VecDeque},
+    fmt,
+};
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// A set of Move modules and a Move transaction script
+pub struct Program {
+    /// The modules to publish
+    pub modules: Vec<ModuleDefinition>,
+    /// The transaction script to execute
+    pub script: Script,
+}
+
+//**************************************************************************************************
+// ScriptOrModule
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// A script or a module, used to represent the two types of transactions.
+pub enum ScriptOrModule {
+    /// The script to execute.
+    Script(Script),
+    /// The module to publish.
+    Module(ModuleDefinition),
+}
+
+//**************************************************************************************************
+// Script
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// The Move transaction script to be executed
+pub struct Script {
+    /// The source location for this script
+    pub loc: Loc,
+    /// The dependencies of `main`, i.e. of the transaction script
+    pub imports: Vec<ImportDefinition>,
+    /// Explicit declaration of dependencies. If not provided, will be inferred based on given
+    /// dependencies to the IR compiler
+    pub explicit_dependency_declarations: Vec<ModuleDependency>,
+    /// the constants that the module defines. Only a utility, the identifiers are not carried into
+    /// the Move bytecode
+    pub constants: Vec<Constant>,
+    /// The transaction script's `main` procedure
+    pub main: Function,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+/// Newtype for a name of a module
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct ModuleName(pub Symbol);
+
+/// Newtype of the address + the module name
+/// `addr.m`
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct ModuleIdent {
+    /// Name for the module. Will be unique among modules published under the same address
+    pub name: ModuleName,
+    /// Address that this module is published under
+    pub address: AccountAddress,
+}
+
+/// A Move module
+#[derive(Clone, Debug, PartialEq)]
+pub struct ModuleDefinition {
+    /// The location of this module
+    pub loc: Loc,
+    /// name and address of the module
+    pub identifier: ModuleIdent,
+    /// the module's friends
+    pub friends: Vec<ModuleIdent>,
+    /// the module's dependencies
+    pub imports: Vec<ImportDefinition>,
+    /// Explicit declaration of dependencies. If not provided, will be inferred based on given
+    /// dependencies to the IR compiler
+    pub explicit_dependency_declarations: Vec<ModuleDependency>,
+    /// the structs (including resources) that the module defines
+    pub structs: Vec<StructDefinition>,
+    /// the constants that the script defines. Only a utility, the identifiers are not carried into
+    /// the Move bytecode
+    pub constants: Vec<Constant>,
+    /// the procedure that the module defines
+    pub functions: Vec<(FunctionName, Function)>,
+    /// the synthetic, specification variables the module defines.
+    pub synthetics: Vec<SyntheticDefinition>,
+}
+
+/// Explicitly given dependency
+#[derive(Clone, Debug, PartialEq)]
+pub struct ModuleDependency {
+    /// Qualified identifer of the dependency
+    pub name: ModuleName,
+    /// The structs (including resources) that the dependency defines
+    pub structs: Vec<StructDependency>,
+    /// The signatures of functions that the dependency defines
+    pub functions: Vec<FunctionDependency>,
+}
+
+//**************************************************************************************************
+// Imports
+//**************************************************************************************************
+
+/// A dependency/import declaration
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ImportDefinition {
+    /// the dependency
+    /// `addr.m`
+    pub ident: ModuleIdent,
+    /// the alias for that dependency
+    /// `m`
+    pub alias: ModuleName,
+}
+
+//**************************************************************************************************
+// Vars
+//**************************************************************************************************
+
+/// Newtype for a variable/local
+#[derive(Debug, PartialEq, Hash, Eq, Clone, Ord, PartialOrd)]
+pub struct Var_(pub Symbol);
+
+/// The type of a variable with a location
+pub type Var = Spanned<Var_>;
+
+/// New type that represents a type variable. Used to declare type formals & reference them.
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub struct TypeVar_(pub Symbol);
+
+/// The type of a type variable with a location.
+pub type TypeVar = Spanned<TypeVar_>;
+
+//**************************************************************************************************
+// Abilities
+//**************************************************************************************************
+
+/// The abilities of a type. Analogous to `move_binary_format::file_format::Ability`.
+#[derive(Debug, Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd)]
+pub enum Ability {
+    /// Allows values of types with this ability to be copied
+    Copy,
+    /// Allows values of types with this ability to be dropped or if left in a local at return
+    Drop,
+    /// Allows values of types with this ability to exist inside a struct in global storage
+    Store,
+    /// Allows the type to serve as a key for global storage operations
+    Key,
+}
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+/// The type of a single value
+#[derive(Debug, PartialEq, Clone)]
+pub enum Type {
+    /// `address`
+    Address,
+    /// `signer`
+    Signer,
+    /// `u8`
+    U8,
+    /// `u16`
+    U16,
+    /// `u32`
+    U32,
+    /// `u64`
+    U64,
+    /// `u128`
+    U128,
+    /// `u256`
+    U256,
+    /// `bool`
+    Bool,
+    /// `vector`
+    Vector(Box<Type>),
+    /// A module defined struct
+    Struct(QualifiedStructIdent, Vec<Type>),
+    /// A reference type, the bool flag indicates whether the reference is mutable
+    Reference(bool, Box<Type>),
+    /// A type parameter
+    TypeParameter(TypeVar_),
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+/// Identifier for a struct definition. Tells us where to look in the storage layer to find the
+/// code associated with the interface
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct QualifiedStructIdent {
+    /// Module name and address in which the struct is contained
+    pub module: ModuleName,
+    /// Name for the struct class. Should be unique among structs published under the same
+    /// module+address
+    pub name: StructName,
+}
+
+/// The field newtype
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct Field_(pub Symbol);
+
+/// A field coupled with source location information
+pub type Field = Spanned<Field_>;
+
+/// A fully-qualified field identifier.
+///
+/// Rather than simply referring to a field 'f' with a single identifier and
+/// relying on type inference to determine the type of the struct being
+/// accessed, this type refers to the field 'f' on the explicit struct type
+/// 'S<T>' -- that is, 'S<T>::f'.
+#[derive(Clone, Debug, PartialEq)]
+pub struct FieldIdent_ {
+    /// The name of the struct type on which the field is declared.
+    pub struct_name: StructName,
+    /// For generic struct types, the type parameters used to instantiate the
+    /// struct type (this is an empty vector for non-generic struct types).
+    pub type_actuals: Vec<Type>,
+    /// The name of the field.
+    pub field: Field,
+}
+
+pub type FieldIdent = Spanned<FieldIdent_>;
+
+/// A field map
+pub type Fields<T> = Vec<(Field, T)>;
+
+/// Newtype for the name of a struct
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct StructName(pub Symbol);
+
+/// A struct type parameter with its constraints and whether it's declared as phantom.
+pub type StructTypeParameter = (bool, TypeVar, BTreeSet<Ability>);
+
+/// A Move struct
+#[derive(Clone, Debug, PartialEq)]
+pub struct StructDefinition_ {
+    /// The declared abilities for the struct
+    pub abilities: BTreeSet<Ability>,
+    /// Human-readable name for the struct that also serves as a nominal type
+    pub name: StructName,
+    /// The list of formal type arguments
+    pub type_formals: Vec<StructTypeParameter>,
+    /// the fields each instance has
+    pub fields: StructDefinitionFields,
+    /// the invariants for this struct
+    pub invariants: Vec<Invariant>,
+}
+/// The type of a StructDefinition along with its source location information
+pub type StructDefinition = Spanned<StructDefinition_>;
+
+/// An explicit struct dependency
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct StructDependency {
+    /// The declared abilities for the struct
+    pub abilities: BTreeSet<Ability>,
+    /// Human-readable name for the struct that also serves as a nominal type
+    pub name: StructName,
+    /// The list of formal type arguments
+    pub type_formals: Vec<StructTypeParameter>,
+}
+
+/// The fields of a Move struct definition
+#[derive(Clone, Debug, PartialEq)]
+pub enum StructDefinitionFields {
+    /// The fields are declared
+    Move { fields: Fields<Type> },
+    /// The struct is a type provided by the VM
+    Native,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+/// Newtype for the name of a constant
+#[derive(Debug, Serialize, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Clone)]
+pub struct ConstantName(pub Symbol);
+
+/// A constant declaration in a module or script
+#[derive(Clone, Debug, PartialEq)]
+pub struct Constant {
+    /// The constant's name. Not carried through to the Move bytecode
+    pub name: ConstantName,
+    /// The type of the constant's value
+    pub signature: Type,
+    /// The constant's value
+    pub value: MoveValue,
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+/// Newtype for the name of a function
+#[derive(Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Clone)]
+pub struct FunctionName(pub Symbol);
+
+/// The signature of a function
+#[derive(PartialEq, Debug, Clone)]
+pub struct FunctionSignature {
+    /// Possibly-empty list of (formal name, formal type) pairs. Names are unique.
+    pub formals: Vec<(Var, Type)>,
+    /// Optional return types
+    pub return_type: Vec<Type>,
+    /// Possibly-empty list of type parameters and their constraints
+    pub type_formals: Vec<(TypeVar, BTreeSet<Ability>)>,
+}
+
+/// An explicit function dependency
+#[derive(PartialEq, Debug, Clone)]
+pub struct FunctionDependency {
+    /// Name of the function dependency
+    pub name: FunctionName,
+    /// Signature of the function dependency
+    pub signature: FunctionSignature,
+}
+
+/// Public or internal modifier for a procedure
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub enum FunctionVisibility {
+    /// The procedure can be invoked anywhere
+    /// `public`
+    Public,
+    /// The procedure can be invoked internally as well as by modules in the friend list
+    /// `public(friend)`
+    Friend,
+    /// The procedure can be invoked only internally
+    /// `<no modifier>`
+    Internal,
+}
+
+/// The body of a Move function
+#[derive(PartialEq, Debug, Clone)]
+pub enum FunctionBody {
+    /// The body is declared
+    /// `locals` are all of the declared locals
+    /// `code` is the code that defines the procedure
+    Move {
+        locals: Vec<(Var, Type)>,
+        code: Vec<Block>,
+    },
+    Bytecode {
+        locals: Vec<(Var, Type)>,
+        code: BytecodeBlocks,
+    },
+    /// The body is provided by the runtime
+    Native,
+}
+
+/// A Move function/procedure
+#[derive(PartialEq, Debug, Clone)]
+pub struct Function_ {
+    /// The visibility
+    pub visibility: FunctionVisibility,
+    /// Is entry function
+    pub is_entry: bool,
+    /// The type signature
+    pub signature: FunctionSignature,
+    /// List of specifications for the Move prover (experimental)
+    pub specifications: Vec<Condition>,
+    /// The code for the procedure
+    pub body: FunctionBody,
+}
+
+/// The type of a Function coupled with its source location information.
+pub type Function = Spanned<Function_>;
+
+//**************************************************************************************************
+// Statements
+//**************************************************************************************************
+
+/// Builtin "function"-like operators that often have a signature not expressable in the
+/// type system and/or have access to some runtime/storage context
+#[derive(Debug, PartialEq, Clone)]
+pub enum Builtin {
+    /// Pack a vector fix a fixed number of elements. Zero elements means an empty vector.
+    VecPack(Vec<Type>, u64),
+    /// Get the length of a vector
+    VecLen(Vec<Type>),
+    /// Acquire an immutable reference to the element at a given index of the vector
+    VecImmBorrow(Vec<Type>),
+    /// Acquire a mutable reference to the element at a given index of the vector
+    VecMutBorrow(Vec<Type>),
+    /// Push an element to the end of the vector
+    VecPushBack(Vec<Type>),
+    /// Pop and return an element from the end of the vector
+    VecPopBack(Vec<Type>),
+    /// Destroy a vector of a fixed length. Zero length means destroying an empty vector.
+    VecUnpack(Vec<Type>, u64),
+    /// Swap the elements at twi indices in the vector
+    VecSwap(Vec<Type>),
+
+    /// Convert a mutable reference into an immutable one
+    Freeze,
+
+    /// Cast an integer into u8.
+    ToU8,
+    /// Cast an integer into u16.
+    ToU16,
+    /// Cast an integer into u32.
+    ToU32,
+    /// Cast an integer into u64.
+    ToU64,
+    /// Cast an integer into u128.
+    ToU128,
+    /// Cast an integer into u256.
+    ToU256,
+}
+
+/// Enum for different function calls
+#[derive(Debug, PartialEq, Clone)]
+pub enum FunctionCall_ {
+    /// functions defined in the host environment
+    Builtin(Builtin),
+    /// The call of a module defined procedure
+    ModuleFunctionCall {
+        module: ModuleName,
+        name: FunctionName,
+        type_actuals: Vec<Type>,
+    },
+}
+/// The type for a function call and its location
+pub type FunctionCall = Spanned<FunctionCall_>;
+
+/// Enum for Move lvalues
+#[derive(Debug, Clone, PartialEq)]
+pub enum LValue_ {
+    /// `x`
+    Var(Var),
+    /// `*e`
+    Mutate(Exp),
+    /// `_`
+    Pop,
+}
+pub type LValue = Spanned<LValue_>;
+
+/// A [`Block_`] is composed of zero or more "statements," which can be translated into one or more
+/// bytecode instructions.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Statement_ {
+    /// `abort e`.
+    Abort(Option<Box<Exp>>),
+    /// `assert(e_1, e_2)`
+    Assert(Box<Exp>, Box<Exp>),
+    /// `return e_1, ... , e_j`
+    Return(Box<Exp>),
+    /// `l_1, ..., l_n = e`
+    Assign(Vec<LValue>, Exp),
+    /// A statement representing an expression `e`.
+    Exp(Box<Exp>),
+    /// `jump lbl`
+    Jump(BlockLabel),
+    /// `jump_if (e) lbl`
+    JumpIf(Box<Exp>, BlockLabel),
+    /// `jump_if_false (e) lbl`
+    JumpIfFalse(Box<Exp>, BlockLabel),
+    /// `n { f_1: x_1, ... , f_j: x_j  } = e`
+    Unpack(StructName, Vec<Type>, Fields<Var>, Box<Exp>),
+}
+/// A [`Statement_`] with a location.
+pub type Statement = Spanned<Statement_>;
+
+/// A block is composed of a [`BlockLabel`], followed by 0 or more [`Statement`],
+/// e.g.: `label b: s_1; ... s_n;`.
+#[derive(Debug, PartialEq, Clone)]
+pub struct Block_ {
+    /// The label that can be used to jump to this block.
+    pub label: BlockLabel,
+    /// The statements that make up the block.
+    pub statements: VecDeque<Statement>,
+}
+/// A [`Block_`] with a location.
+pub type Block = Spanned<Block_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+/// Bottom of the value hierarchy. These values can be trivially copyable and stored in statedb as a
+/// single entry.
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum CopyableVal_ {
+    /// An address in the global storage
+    Address(AccountAddress),
+    /// An unsigned 8-bit integer
+    U8(u8),
+    /// An unsigned 16-bit integer
+    U16(u16),
+    /// An unsigned 32-bit integer
+    U32(u32),
+    /// An unsigned 64-bit integer
+    U64(u64),
+    /// An unsigned 128-bit integer
+    U128(u128),
+    /// An unsigned 256-bit integer
+    U256(move_core_types::u256::U256),
+    /// true or false
+    Bool(bool),
+    /// `b"<bytes>"`
+    ByteArray(Vec<u8>),
+}
+
+/// The type of a value and its location
+pub type CopyableVal = Spanned<CopyableVal_>;
+
+/// The type for fields and their bound expressions
+pub type ExpFields = Fields<Exp>;
+
+/// Enum for unary operators
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum UnaryOp {
+    /// Boolean negation
+    Not,
+}
+
+/// Enum for binary operators
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BinOp {
+    // u64 ops
+    /// `+`
+    Add,
+    /// `-`
+    Sub,
+    /// `*`
+    Mul,
+    /// `%`
+    Mod,
+    /// `/`
+    Div,
+    /// `|`
+    BitOr,
+    /// `&`
+    BitAnd,
+    /// `^`
+    Xor,
+    /// `<<`
+    Shl,
+    /// `>>`
+    Shr,
+
+    // Bool ops
+    /// `&&`
+    And,
+    /// `||`
+    Or,
+
+    // Compare Ops
+    /// `==`
+    Eq,
+    /// `!=`
+    Neq,
+    /// `<`
+    Lt,
+    /// `>`
+    Gt,
+    /// `<=`
+    Le,
+    /// `>=`
+    Ge,
+    /// '..'  only used in specs
+    Subrange,
+}
+
+/// Enum for all expressions
+#[derive(Debug, Clone, PartialEq)]
+pub enum Exp_ {
+    /// `*e`
+    Dereference(Box<Exp>),
+    /// `op e`
+    UnaryExp(UnaryOp, Box<Exp>),
+    /// `e_1 op e_2`
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+    /// Wrapper to lift `CopyableVal` into `Exp`
+    /// `v`
+    Value(CopyableVal),
+    /// Takes the given field values and instantiates the struct
+    /// Returns a fresh `StructInstance` whose type and kind (resource or otherwise)
+    /// as the current struct class (i.e., the class of the method we're currently executing).
+    /// `n { f_1: e_1, ... , f_j: e_j }`
+    Pack(StructName, Vec<Type>, ExpFields),
+    /// `&e.f`, `&mut e.f`
+    Borrow {
+        /// mutable or not
+        is_mutable: bool,
+        /// the expression containing the reference
+        exp: Box<Exp>,
+        /// the field being borrowed
+        field: FieldIdent,
+    },
+    /// `move(x)`
+    Move(Var),
+    /// `copy(x)`
+    Copy(Var),
+    /// `&x` or `&mut x`
+    BorrowLocal(bool, Var),
+    /// `f(e)` or `f(e_1, e_2, ..., e_j)`
+    FunctionCall(FunctionCall, Box<Exp>),
+    /// (e_1, e_2, e_3, ..., e_j)
+    ExprList(Vec<Exp>),
+}
+
+/// The type for a `Exp_` and its location
+pub type Exp = Spanned<Exp_>;
+
+//**************************************************************************************************
+// Bytecode
+//**************************************************************************************************
+
+pub type BytecodeBlocks = Vec<(BlockLabel_, BytecodeBlock)>;
+pub type BytecodeBlock = Vec<Bytecode>;
+
+#[derive(Debug, Clone, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct BlockLabel_(pub Symbol);
+pub type BlockLabel = Spanned<BlockLabel_>;
+
+#[derive(Debug, Clone, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct NopLabel(pub Symbol);
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Bytecode_ {
+    Pop,
+    Ret,
+    Nop(Option<NopLabel>),
+    BrTrue(BlockLabel_),
+    BrFalse(BlockLabel_),
+    Branch(BlockLabel_),
+    LdU8(u8),
+    LdU16(u16),
+    LdU32(u32),
+    LdU64(u64),
+    LdU128(u128),
+    LdU256(move_core_types::u256::U256),
+    CastU8,
+    CastU16,
+    CastU32,
+    CastU64,
+    CastU128,
+    CastU256,
+    LdTrue,
+    LdFalse,
+    LdConst(Type, MoveValue),
+    LdNamedConst(ConstantName),
+    CopyLoc(Var),
+    MoveLoc(Var),
+    StLoc(Var),
+    Call(ModuleName, FunctionName, Vec<Type>),
+    Pack(StructName, Vec<Type>),
+    Unpack(StructName, Vec<Type>),
+    ReadRef,
+    WriteRef,
+    FreezeRef,
+    MutBorrowLoc(Var),
+    ImmBorrowLoc(Var),
+    MutBorrowField(StructName, Vec<Type>, Field),
+    ImmBorrowField(StructName, Vec<Type>, Field),
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+    BitOr,
+    BitAnd,
+    Xor,
+    Or,
+    And,
+    Not,
+    Eq,
+    Neq,
+    Lt,
+    Gt,
+    Le,
+    Ge,
+    Abort,
+    Shl,
+    Shr,
+    VecPack(Type, u64),
+    VecLen(Type),
+    VecImmBorrow(Type),
+    VecMutBorrow(Type),
+    VecPushBack(Type),
+    VecPopBack(Type),
+    VecUnpack(Type, u64),
+    VecSwap(Type),
+}
+pub type Bytecode = Spanned<Bytecode_>;
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+fn get_external_deps(imports: &[ImportDefinition]) -> Vec<ModuleId> {
+    let mut deps = HashSet::new();
+    for dep in imports.iter() {
+        let identifier = Identifier::new(dep.ident.name.0.as_str().to_owned()).unwrap();
+        deps.insert(ModuleId::new(dep.ident.address, identifier));
+    }
+    deps.into_iter().collect()
+}
+
+impl Program {
+    /// Create a new `Program` from modules and transaction script
+    pub fn new(modules: Vec<ModuleDefinition>, script: Script) -> Self {
+        Program { modules, script }
+    }
+}
+
+impl Script {
+    /// Create a new `Script` from the imports and the main function
+    pub fn new(
+        loc: Loc,
+        imports: Vec<ImportDefinition>,
+        explicit_dependency_declarations: Vec<ModuleDependency>,
+        constants: Vec<Constant>,
+        main: Function,
+    ) -> Self {
+        Script {
+            loc,
+            imports,
+            explicit_dependency_declarations,
+            constants,
+            main,
+        }
+    }
+
+    /// Accessor for the body of the 'main' procedure
+    pub fn body(&self) -> &[Block] {
+        match self.main.value.body {
+            FunctionBody::Move { ref code, .. } => code,
+            FunctionBody::Bytecode { .. } => panic!("Invalid body access on bytecode main()"),
+            FunctionBody::Native => panic!("main() cannot be native"),
+        }
+    }
+
+    /// Return a vector of `ModuleId` for the external dependencies.
+    pub fn get_external_deps(&self) -> Vec<ModuleId> {
+        get_external_deps(self.imports.as_slice())
+    }
+}
+
+static SELF_MODULE_NAME: Lazy<Symbol> = Lazy::new(|| Symbol::from("Self"));
+
+impl ModuleName {
+    /// Name for the current module handle
+    pub fn self_name() -> &'static str {
+        SELF_MODULE_NAME.as_str()
+    }
+
+    /// Create a new `ModuleName` from `self_name`.
+    pub fn module_self() -> Self {
+        ModuleName(*SELF_MODULE_NAME)
+    }
+}
+
+impl ModuleIdent {
+    /// Creates a new fully qualified module identifier from the module name and the address at
+    /// which it is published
+    pub fn new(name: ModuleName, address: AccountAddress) -> Self {
+        ModuleIdent { name, address }
+    }
+
+    /// Accessor for the name of the fully qualified module identifier
+    pub fn name(&self) -> &ModuleName {
+        &self.name
+    }
+
+    /// Accessor for the address at which the module is published
+    pub fn address(&self) -> &AccountAddress {
+        &self.address
+    }
+}
+
+impl ModuleDefinition {
+    /// Creates a new `ModuleDefinition` from its string name, dependencies, structs+resources,
+    /// and procedures
+    /// Does not verify the correctness of any internal properties of its elements
+    pub fn new(
+        loc: Loc,
+        identifier: ModuleIdent,
+        friends: Vec<ModuleIdent>,
+        imports: Vec<ImportDefinition>,
+        explicit_dependency_declarations: Vec<ModuleDependency>,
+        structs: Vec<StructDefinition>,
+        constants: Vec<Constant>,
+        functions: Vec<(FunctionName, Function)>,
+        synthetics: Vec<SyntheticDefinition>,
+    ) -> Self {
+        ModuleDefinition {
+            loc,
+            identifier,
+            friends,
+            imports,
+            explicit_dependency_declarations,
+            structs,
+            constants,
+            functions,
+            synthetics,
+        }
+    }
+
+    /// Return a vector of `ModuleId` for the external dependencies.
+    pub fn get_external_deps(&self) -> Vec<ModuleId> {
+        get_external_deps(self.imports.as_slice())
+    }
+}
+
+impl Ability {
+    pub const COPY: &'static str = "copy";
+    pub const DROP: &'static str = "drop";
+    pub const STORE: &'static str = "store";
+    pub const KEY: &'static str = "key";
+}
+
+impl Type {
+    /// Creates a new struct type
+    pub fn r#struct(ident: QualifiedStructIdent, type_actuals: Vec<Type>) -> Type {
+        Type::Struct(ident, type_actuals)
+    }
+
+    /// Creates a new reference type from its mutability and underlying type
+    pub fn reference(is_mutable: bool, t: Type) -> Type {
+        Type::Reference(is_mutable, Box::new(t))
+    }
+
+    /// Creates a new address type
+    pub fn address() -> Type {
+        Type::Address
+    }
+
+    /// Creates a new u64 type
+    pub fn u64() -> Type {
+        Type::U64
+    }
+
+    /// Creates a new bool type
+    pub fn bool() -> Type {
+        Type::Bool
+    }
+}
+
+impl QualifiedStructIdent {
+    /// Creates a new StructType handle from the name of the module alias and the name of the struct
+    pub fn new(module: ModuleName, name: StructName) -> Self {
+        QualifiedStructIdent { module, name }
+    }
+
+    /// Accessor for the module alias
+    pub fn module(&self) -> &ModuleName {
+        &self.module
+    }
+
+    /// Accessor for the struct name
+    pub fn name(&self) -> &StructName {
+        &self.name
+    }
+}
+
+impl ImportDefinition {
+    /// Creates a new import definition from a module identifier and an optional alias
+    /// If the alias is `None`, the alias will be a cloned copy of the identifiers module name
+    pub fn new(ident: ModuleIdent, alias_opt: Option<ModuleName>) -> Self {
+        let alias = match alias_opt {
+            Some(alias) => alias,
+            None => *ident.name(),
+        };
+        ImportDefinition { ident, alias }
+    }
+}
+
+impl StructDefinition_ {
+    /// Creates a new StructDefinition from the abilities, the string representation of the name,
+    /// and the user specified fields, a map from their names to their types
+    /// Does not verify the correctness of any internal properties, e.g. doesn't check that the
+    /// fields do not have reference types
+    pub fn move_declared(
+        abilities: BTreeSet<Ability>,
+        name: Symbol,
+        type_formals: Vec<StructTypeParameter>,
+        fields: Fields<Type>,
+        invariants: Vec<Invariant>,
+    ) -> Self {
+        StructDefinition_ {
+            abilities,
+            name: StructName(name),
+            type_formals,
+            fields: StructDefinitionFields::Move { fields },
+            invariants,
+        }
+    }
+
+    /// Creates a new StructDefinition from the abilities, the string representation of the name,
+    /// and the user specified fields, a map from their names to their types
+    pub fn native(
+        abilities: BTreeSet<Ability>,
+        name: Symbol,
+        type_formals: Vec<StructTypeParameter>,
+    ) -> Self {
+        StructDefinition_ {
+            abilities,
+            name: StructName(name),
+            type_formals,
+            fields: StructDefinitionFields::Native,
+            invariants: vec![],
+        }
+    }
+}
+
+impl FunctionSignature {
+    /// Creates a new function signature from the parameters and the return types
+    pub fn new(
+        formals: Vec<(Var, Type)>,
+        return_type: Vec<Type>,
+        type_parameters: Vec<(TypeVar, BTreeSet<Ability>)>,
+    ) -> Self {
+        FunctionSignature {
+            formals,
+            return_type,
+            type_formals: type_parameters,
+        }
+    }
+}
+
+impl Function_ {
+    /// Creates a new function declaration from the components of the function
+    /// See the declaration of the struct `Function` for more details
+    pub fn new(
+        visibility: FunctionVisibility,
+        is_entry: bool,
+        formals: Vec<(Var, Type)>,
+        return_type: Vec<Type>,
+        type_parameters: Vec<(TypeVar, BTreeSet<Ability>)>,
+        specifications: Vec<Condition>,
+        body: FunctionBody,
+    ) -> Self {
+        let signature = FunctionSignature::new(formals, return_type, type_parameters);
+        Function_ {
+            visibility,
+            is_entry,
+            signature,
+            specifications,
+            body,
+        }
+    }
+}
+
+impl FunctionCall_ {
+    /// Creates a `FunctionCall::ModuleFunctionCall` variant
+    pub fn module_call(module: ModuleName, name: FunctionName, type_actuals: Vec<Type>) -> Self {
+        FunctionCall_::ModuleFunctionCall {
+            module,
+            name,
+            type_actuals,
+        }
+    }
+
+    /// Creates a `FunctionCall::Builtin` variant with no location information
+    pub fn builtin(bif: Builtin) -> FunctionCall {
+        Spanned::unsafe_no_loc(FunctionCall_::Builtin(bif))
+    }
+}
+
+impl Statement_ {
+    /// Creates a statement that returns no values.
+    pub fn return_empty() -> Self {
+        Statement_::Return(Box::new(Spanned::unsafe_no_loc(Exp_::ExprList(vec![]))))
+    }
+
+    /// Creates a statement that returns a single value.
+    pub fn return_(op: Exp) -> Self {
+        Statement_::Return(Box::new(op))
+    }
+}
+
+impl Block_ {
+    /// Creates a new block from a label and a vector of statements.
+    pub fn new(label: BlockLabel, statements: Vec<Statement>) -> Self {
+        Self {
+            label,
+            statements: VecDeque::from(statements),
+        }
+    }
+}
+
+impl Exp_ {
+    /// Creates a new address `Exp` with no location information
+    pub fn address(addr: AccountAddress) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Value(Spanned::unsafe_no_loc(CopyableVal_::Address(
+            addr,
+        ))))
+    }
+
+    /// Creates a new value `Exp` with no location information
+    pub fn value(b: CopyableVal_) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Value(Spanned::unsafe_no_loc(b)))
+    }
+
+    /// Creates a new u64 `Exp` with no location information
+    pub fn u64(i: u64) -> Exp {
+        Exp_::value(CopyableVal_::U64(i))
+    }
+
+    /// Creates a new bool `Exp` with no location information
+    pub fn bool(b: bool) -> Exp {
+        Exp_::value(CopyableVal_::Bool(b))
+    }
+
+    /// Creates a new bytearray `Exp` with no location information
+    pub fn byte_array(buf: Vec<u8>) -> Exp {
+        Exp_::value(CopyableVal_::ByteArray(buf))
+    }
+
+    /// Creates a new pack/struct-instantiation `Exp` with no location information
+    pub fn instantiate(n: StructName, tys: Vec<Type>, s: ExpFields) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Pack(n, tys, s))
+    }
+
+    /// Creates a new binary operator `Exp` with no location information
+    pub fn binop(lhs: Exp, op: BinOp, rhs: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::BinopExp(Box::new(lhs), op, Box::new(rhs)))
+    }
+
+    /// Creates a new `e+e` `Exp` with no location information
+    pub fn add(lhs: Exp, rhs: Exp) -> Exp {
+        Exp_::binop(lhs, BinOp::Add, rhs)
+    }
+
+    /// Creates a new `e-e` `Exp` with no location information
+    pub fn sub(lhs: Exp, rhs: Exp) -> Exp {
+        Exp_::binop(lhs, BinOp::Sub, rhs)
+    }
+
+    /// Creates a new `*e` `Exp` with no location information
+    pub fn dereference(e: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Dereference(Box::new(e)))
+    }
+
+    /// Creates a new borrow field `Exp` with no location information
+    pub fn borrow(is_mutable: bool, exp: Box<Exp>, field: FieldIdent) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Borrow {
+            is_mutable,
+            exp,
+            field,
+        })
+    }
+
+    /// Creates a new copy-local `Exp` with no location information
+    pub fn copy(v: Var) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Copy(v))
+    }
+
+    /// Creates a new move-local `Exp` with no location information
+    pub fn move_(v: Var) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Move(v))
+    }
+
+    /// Creates a new function call `Exp` with no location information
+    pub fn function_call(f: FunctionCall, e: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::FunctionCall(f, Box::new(e)))
+    }
+
+    pub fn expr_list(exps: Vec<Exp>) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::ExprList(exps))
+    }
+}
+
+//**************************************************************************************************
+// Trait impls
+//**************************************************************************************************
+
+impl PartialEq for Script {
+    fn eq(&self, other: &Script) -> bool {
+        self.imports == other.imports && self.main.value.body == other.main.value.body
+    }
+}
+
+impl Iterator for Block_ {
+    type Item = Statement;
+
+    fn next(&mut self) -> Option<Statement> {
+        self.statements.pop_front()
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for TypeVar_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for Ability {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                Ability::Copy => Ability::COPY,
+                Ability::Drop => Ability::DROP,
+                Ability::Store => Ability::STORE,
+                Ability::Key => Ability::KEY,
+            }
+        )
+    }
+}
+
+fn format_constraints(set: &BTreeSet<Ability>) -> String {
+    set.iter()
+        .map(|a| format!("{}", a))
+        .collect::<Vec<_>>()
+        .join(" + ")
+}
+
+impl fmt::Display for ScriptOrModule {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use ScriptOrModule::*;
+        match self {
+            Module(module_def) => write!(f, "{}", module_def),
+            Script(script) => write!(f, "{}", script),
+        }
+    }
+}
+
+impl fmt::Display for Script {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "Script(")?;
+
+        write!(f, "Imports(")?;
+        write!(f, "{}", intersperse(&self.imports, ", "))?;
+        writeln!(f, ")")?;
+
+        writeln!(f, "Dependency(")?;
+        for dependency in &self.explicit_dependency_declarations {
+            writeln!(f, "{},", dependency)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Constants(")?;
+        for constant in &self.constants {
+            writeln!(f, "{};", constant)?;
+        }
+        writeln!(f, ")")?;
+
+        write!(f, "Main(")?;
+        write!(f, "{}", self.main)?;
+        write!(f, ")")?;
+        write!(f, ")")
+    }
+}
+
+impl fmt::Display for ModuleName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for ModuleIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}.{}", self.address, self.name)
+    }
+}
+
+impl fmt::Display for ModuleDefinition {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "Module({}, ", self.identifier)?;
+
+        writeln!(f, "Imports(")?;
+        for import in &self.imports {
+            writeln!(f, "{};", import)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Dependency(")?;
+        for dependency in &self.explicit_dependency_declarations {
+            writeln!(f, "{},", dependency)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Structs(")?;
+        for struct_def in &self.structs {
+            writeln!(f, "{}, ", struct_def)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Constants(")?;
+        for constant in &self.constants {
+            writeln!(f, "{};", constant)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Functions(")?;
+        for (fun_name, fun) in &self.functions {
+            writeln!(f, "({}, {}), ", fun_name, fun)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, ")")
+    }
+}
+
+impl fmt::Display for ImportDefinition {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "import {} as {}", &self.ident, &self.alias)
+    }
+}
+
+impl fmt::Display for ModuleDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Dependency({}, ", &self.name)?;
+        for sdep in &self.structs {
+            writeln!(f, "{}, ", sdep)?
+        }
+        for fdep in &self.functions {
+            writeln!(f, "{}, ", fdep)?
+        }
+        writeln!(f, ")")
+    }
+}
+
+impl fmt::Display for StructDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "StructDep({} {}{}",
+            self.abilities
+                .iter()
+                .map(|a| format!("{}", a))
+                .collect::<Vec<_>>()
+                .join(" "),
+            &self.name,
+            format_struct_type_formals(&self.type_formals)
+        )
+    }
+}
+
+impl fmt::Display for FunctionDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "FunctionDep({}{}", &self.name, &self.signature)
+    }
+}
+
+impl fmt::Display for StructDefinition_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(
+            f,
+            "Struct({}{}, ",
+            self.name,
+            format_struct_type_formals(&self.type_formals)
+        )?;
+        match &self.fields {
+            StructDefinitionFields::Move { fields } => writeln!(f, "{}", format_fields(fields))?,
+            StructDefinitionFields::Native => writeln!(f, "{{native}}")?,
+        }
+        write!(f, ")")
+    }
+}
+
+impl fmt::Display for Constant {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "const {}: {} = {}",
+            &self.name.0,
+            self.signature,
+            format_move_value(&self.value)
+        )
+    }
+}
+
+impl fmt::Display for Function_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} ({})", self.signature, self.body)
+    }
+}
+
+impl fmt::Display for Field_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FieldIdent_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}::{}", self.struct_name, self.field)
+    }
+}
+
+impl fmt::Display for StructName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FunctionName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for BlockLabel_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for ConstantName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FunctionBody {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FunctionBody::Move {
+                ref locals,
+                ref code,
+            } => {
+                for (local, ty) in locals {
+                    write!(f, "let {}: {};", local, ty)?;
+                }
+                for block in code {
+                    writeln!(f, "{}", block.value)?;
+                }
+                Ok(())
+            }
+            FunctionBody::Bytecode { locals, code } => {
+                write!(f, "locals: [")?;
+                for (local, ty) in locals {
+                    write!(f, "{}: {},", local, ty)?;
+                }
+                writeln!(f, "]")?;
+                for (label, block) in code {
+                    writeln!(f, "{}:", &label)?;
+                    for instr in block {
+                        writeln!(f, "  {}", instr)?;
+                    }
+                }
+                Ok(())
+            }
+            FunctionBody::Native => write!(f, "native"),
+        }
+    }
+}
+
+// TODO: This function should take an iterator instead.
+fn intersperse<T: fmt::Display>(items: &[T], join: &str) -> String {
+    // TODO: Any performance issues here? Could be O(n^2) if not optimized.
+    items.iter().fold(String::new(), |acc, v| {
+        format!("{acc}{join}{v}", acc = acc, join = join, v = v)
+    })
+}
+
+fn format_fields<T: fmt::Display>(fields: &[(Field, T)]) -> String {
+    fields.iter().fold(String::new(), |acc, (field, val)| {
+        format!("{} {}: {},", acc, field.value, val)
+    })
+}
+
+impl fmt::Display for FunctionSignature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", format_fun_type_formals(&self.type_formals))?;
+        write!(f, "(")?;
+        for (v, ty) in self.formals.iter() {
+            write!(f, "{}: {}, ", v, ty)?;
+        }
+        write!(f, ")")?;
+        Ok(())
+    }
+}
+
+impl fmt::Display for QualifiedStructIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}", self.module, self.name)
+    }
+}
+
+fn format_type_actuals(tys: &[Type]) -> String {
+    if tys.is_empty() {
+        "".to_string()
+    } else {
+        format!("<{}>", intersperse(tys, ", "))
+    }
+}
+
+fn format_fun_type_formals(formals: &[(TypeVar, BTreeSet<Ability>)]) -> String {
+    if formals.is_empty() {
+        "".to_string()
+    } else {
+        let formatted = formals
+            .iter()
+            .map(|(tv, abilities)| format!("{}: {}", tv.value, format_constraints(abilities)))
+            .collect::<Vec<_>>();
+        format!("<{}>", intersperse(&formatted, ", "))
+    }
+}
+
+fn format_struct_type_formals(formals: &[StructTypeParameter]) -> String {
+    if formals.is_empty() {
+        "".to_string()
+    } else {
+        let formatted = formals
+            .iter()
+            .map(|(is_phantom, tv, abilities)| {
+                format!(
+                    "{}{}: {}",
+                    if *is_phantom { "phantom " } else { "" },
+                    tv.value,
+                    format_constraints(abilities)
+                )
+            })
+            .collect::<Vec<_>>();
+        format!("<{}>", intersperse(&formatted, ", "))
+    }
+}
+
+impl fmt::Display for Type {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Type::U8 => write!(f, "u8"),
+            Type::U16 => write!(f, "u16"),
+            Type::U32 => write!(f, "u32"),
+            Type::U64 => write!(f, "u64"),
+            Type::U128 => write!(f, "u128"),
+            Type::U256 => write!(f, "u256"),
+            Type::Bool => write!(f, "bool"),
+            Type::Address => write!(f, "address"),
+            Type::Signer => write!(f, "signer"),
+            Type::Vector(ty) => write!(f, "vector<{}>", ty),
+            Type::Struct(ident, tys) => write!(f, "{}{}", ident, format_type_actuals(tys)),
+            Type::Reference(is_mutable, t) => {
+                write!(f, "&{}{}", if *is_mutable { "mut " } else { "" }, t)
+            }
+            Type::TypeParameter(s) => write!(f, "{}", s),
+        }
+    }
+}
+
+impl fmt::Display for Var_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for Builtin {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Builtin::VecPack(tys, num) => write!(f, "vec_pack_{}{}", num, format_type_actuals(tys)),
+            Builtin::VecLen(tys) => write!(f, "vec_len{}", format_type_actuals(tys)),
+            Builtin::VecImmBorrow(tys) => write!(f, "vec_imm_borrow{}", format_type_actuals(tys)),
+            Builtin::VecMutBorrow(tys) => write!(f, "vec_mut_borrow{}", format_type_actuals(tys)),
+            Builtin::VecPushBack(tys) => write!(f, "vec_push_back{}", format_type_actuals(tys)),
+            Builtin::VecPopBack(tys) => write!(f, "vec_pop_back{}", format_type_actuals(tys)),
+            Builtin::VecUnpack(tys, num) => {
+                write!(f, "vec_unpack_{}{}", num, format_type_actuals(tys))
+            }
+            Builtin::VecSwap(tys) => write!(f, "vec_swap{}", format_type_actuals(tys)),
+            Builtin::Freeze => write!(f, "freeze"),
+            Builtin::ToU8 => write!(f, "to_u8"),
+            Builtin::ToU16 => write!(f, "to_u16"),
+            Builtin::ToU32 => write!(f, "to_u32"),
+            Builtin::ToU64 => write!(f, "to_u64"),
+            Builtin::ToU128 => write!(f, "to_u128"),
+            Builtin::ToU256 => write!(f, "to_u256"),
+        }
+    }
+}
+
+impl fmt::Display for FunctionCall_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FunctionCall_::Builtin(fun) => write!(f, "{}", fun),
+            FunctionCall_::ModuleFunctionCall {
+                module,
+                name,
+                type_actuals,
+            } => write!(
+                f,
+                "{}.{}{}",
+                module,
+                name,
+                format_type_actuals(type_actuals)
+            ),
+        }
+    }
+}
+
+impl fmt::Display for LValue_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            LValue_::Var(x) => write!(f, "{}", x),
+            LValue_::Mutate(e) => write!(f, "*{}", e),
+            LValue_::Pop => write!(f, "_"),
+        }
+    }
+}
+
+impl fmt::Display for Statement_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Statement_::Abort(None) => write!(f, "abort;"),
+            Statement_::Abort(Some(err)) => write!(f, "abort {};", err),
+            Statement_::Assert(cond, err) => write!(f, "assert({}, {});", cond, err),
+            Statement_::Assign(var_list, e) => {
+                if var_list.is_empty() {
+                    write!(f, "{};", e)
+                } else {
+                    write!(f, "{} = ({});", intersperse(var_list, ", "), e)
+                }
+            }
+            Statement_::Exp(e) => write!(f, "({});", e),
+            Statement_::Jump(label) => write!(f, "jump {}", label),
+            Statement_::JumpIf(e, label) => write!(f, "jump_if ({}) {}", e, label),
+            Statement_::JumpIfFalse(e, label) => write!(f, "jump_if_false ({}) {}", e, label),
+            Statement_::Return(exps) => write!(f, "return {};", exps),
+            Statement_::Unpack(n, tys, bindings, e) => write!(
+                f,
+                "{}{} {{ {} }} = {}",
+                n,
+                format_type_actuals(tys),
+                bindings
+                    .iter()
+                    .fold(String::new(), |acc, (field, var)| format!(
+                        "{} {} : {},",
+                        acc, field, var
+                    )),
+                e
+            ),
+        }
+    }
+}
+
+impl fmt::Display for Block_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "label {}:", self.label)?;
+        for statement in self.statements.iter() {
+            writeln!(f, "    {}", statement)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Display for CopyableVal_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            CopyableVal_::U8(v) => write!(f, "{}u8", v),
+            CopyableVal_::U16(v) => write!(f, "{}u16", v),
+            CopyableVal_::U32(v) => write!(f, "{}u32", v),
+            CopyableVal_::U64(v) => write!(f, "{}", v),
+            CopyableVal_::U128(v) => write!(f, "{}u128", v),
+            CopyableVal_::U256(v) => write!(f, "{}u256", v),
+            CopyableVal_::Bool(v) => write!(f, "{}", v),
+            CopyableVal_::ByteArray(v) => write!(f, "0b{}", hex::encode(v)),
+            CopyableVal_::Address(v) => write!(f, "0x{}", hex::encode(v)),
+        }
+    }
+}
+
+impl fmt::Display for UnaryOp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                UnaryOp::Not => "!",
+            }
+        )
+    }
+}
+
+impl fmt::Display for BinOp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                BinOp::Add => "+",
+                BinOp::Sub => "-",
+                BinOp::Mul => "*",
+                BinOp::Mod => "%",
+                BinOp::Div => "/",
+                BinOp::BitOr => "|",
+                BinOp::BitAnd => "&",
+                BinOp::Xor => "^",
+                BinOp::Shl => "<<",
+                BinOp::Shr => ">>",
+
+                // Bool ops
+                BinOp::Or => "||",
+                BinOp::And => "&&",
+
+                // Compare Ops
+                BinOp::Eq => "==",
+                BinOp::Neq => "!=",
+                BinOp::Lt => "<",
+                BinOp::Gt => ">",
+                BinOp::Le => "<=",
+                BinOp::Ge => ">=",
+                BinOp::Subrange => "..",
+            }
+        )
+    }
+}
+
+impl fmt::Display for Exp_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Exp_::Dereference(e) => write!(f, "*({})", e),
+            Exp_::UnaryExp(o, e) => write!(f, "({}{})", o, e),
+            Exp_::BinopExp(e1, o, e2) => write!(f, "({} {} {})", o, e1, e2),
+            Exp_::Value(v) => write!(f, "{}", v),
+            Exp_::Pack(n, tys, s) => write!(
+                f,
+                "{}{}{{{}}}",
+                n,
+                format_type_actuals(tys),
+                s.iter().fold(String::new(), |acc, (field, op)| format!(
+                    "{} {} : {},",
+                    acc, field, op,
+                ))
+            ),
+            Exp_::Borrow {
+                is_mutable,
+                exp,
+                field,
+            } => write!(
+                f,
+                "&{}{}.{}",
+                if *is_mutable { "mut " } else { "" },
+                exp,
+                field
+            ),
+            Exp_::Move(v) => write!(f, "move({})", v),
+            Exp_::Copy(v) => write!(f, "copy({})", v),
+            Exp_::BorrowLocal(is_mutable, v) => {
+                write!(f, "&{}{}", if *is_mutable { "mut " } else { "" }, v)
+            }
+            Exp_::FunctionCall(func, e) => write!(f, "{}({})", func, e),
+            Exp_::ExprList(exps) => {
+                if exps.is_empty() {
+                    write!(f, "()")
+                } else {
+                    write!(f, "({})", intersperse(exps, ", "))
+                }
+            }
+        }
+    }
+}
+
+impl fmt::Display for Bytecode_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Bytecode_::Pop => write!(f, "Pop"),
+            Bytecode_::Ret => write!(f, "Ret"),
+            Bytecode_::Nop(None) => write!(f, "Nop"),
+            Bytecode_::Nop(Some(s)) => write!(f, "Nop {}", &s.0),
+            Bytecode_::BrTrue(lbl) => write!(f, "BrTrue {}", &lbl.0),
+            Bytecode_::BrFalse(lbl) => write!(f, "BrFalse {}", &lbl.0),
+            Bytecode_::Branch(lbl) => write!(f, "Branch {}", &lbl.0),
+            Bytecode_::LdU8(u) => write!(f, "LdU8 {}", u),
+            Bytecode_::LdU16(u) => write!(f, "LdU16 {}", u),
+            Bytecode_::LdU32(u) => write!(f, "LdU32 {}", u),
+            Bytecode_::LdU64(u) => write!(f, "LdU64 {}", u),
+            Bytecode_::LdU128(u) => write!(f, "LdU128 {}", u),
+            Bytecode_::LdU256(u) => write!(f, "LdU256 {}", u),
+            Bytecode_::CastU8 => write!(f, "CastU8"),
+            Bytecode_::CastU16 => write!(f, "CastU16"),
+            Bytecode_::CastU32 => write!(f, "CastU32"),
+            Bytecode_::CastU64 => write!(f, "CastU64"),
+            Bytecode_::CastU128 => write!(f, "CastU128"),
+            Bytecode_::CastU256 => write!(f, "CastU256"),
+            Bytecode_::LdTrue => write!(f, "LdTrue"),
+            Bytecode_::LdFalse => write!(f, "LdFalse"),
+            Bytecode_::LdConst(ty, v) => write!(f, "LdConst<{}> {}", ty, format_move_value(v)),
+            Bytecode_::LdNamedConst(n) => write!(f, "LdNamedConst {}", &n.0),
+            Bytecode_::CopyLoc(v) => write!(f, "CopyLoc {}", v),
+            Bytecode_::MoveLoc(v) => write!(f, "MoveLoc {}", v),
+            Bytecode_::StLoc(v) => write!(f, "StLoc {}", v),
+            Bytecode_::Call(m, n, tys) => write!(f, "Call {}.{}{}", m, n, format_type_actuals(tys)),
+            Bytecode_::Pack(n, tys) => write!(f, "Pack {}{}", n, format_type_actuals(tys)),
+            Bytecode_::Unpack(n, tys) => write!(f, "Unpack {}{}", n, format_type_actuals(tys)),
+            Bytecode_::ReadRef => write!(f, "ReadRef"),
+            Bytecode_::WriteRef => write!(f, "WriteRef"),
+            Bytecode_::FreezeRef => write!(f, "FreezeRef"),
+            Bytecode_::MutBorrowLoc(v) => write!(f, "MutBorrowLoc {}", v),
+            Bytecode_::ImmBorrowLoc(v) => write!(f, "ImmBorrowLoc {}", v),
+            Bytecode_::MutBorrowField(n, tys, field) => write!(
+                f,
+                "MutBorrowField {}{}.{}",
+                n,
+                format_type_actuals(tys),
+                field
+            ),
+            Bytecode_::ImmBorrowField(n, tys, field) => write!(
+                f,
+                "ImmBorrowField {}{}.{}",
+                n,
+                format_type_actuals(tys),
+                field
+            ),
+            Bytecode_::Add => write!(f, "Add"),
+            Bytecode_::Sub => write!(f, "Sub"),
+            Bytecode_::Mul => write!(f, "Mul"),
+            Bytecode_::Mod => write!(f, "Mod"),
+            Bytecode_::Div => write!(f, "Div"),
+            Bytecode_::BitOr => write!(f, "BitOr"),
+            Bytecode_::BitAnd => write!(f, "BitAnd"),
+            Bytecode_::Xor => write!(f, "Xor"),
+            Bytecode_::Or => write!(f, "Or"),
+            Bytecode_::And => write!(f, "And"),
+            Bytecode_::Not => write!(f, "Not"),
+            Bytecode_::Eq => write!(f, "Eq"),
+            Bytecode_::Neq => write!(f, "Neq"),
+            Bytecode_::Lt => write!(f, "Lt"),
+            Bytecode_::Gt => write!(f, "Gt"),
+            Bytecode_::Le => write!(f, "Le"),
+            Bytecode_::Ge => write!(f, "Ge"),
+            Bytecode_::Abort => write!(f, "Abort"),
+            Bytecode_::Shl => write!(f, "Shl"),
+            Bytecode_::Shr => write!(f, "Shr"),
+            Bytecode_::VecPack(ty, n) => write!(f, "VecPack {} {}", ty, n),
+            Bytecode_::VecLen(ty) => write!(f, "VecLen {}", ty),
+            Bytecode_::VecImmBorrow(ty) => write!(f, "VecImmBorrow {}", ty),
+            Bytecode_::VecMutBorrow(ty) => write!(f, "VecMutBorrow {}", ty),
+            Bytecode_::VecPushBack(ty) => write!(f, "VecPushBack {}", ty),
+            Bytecode_::VecPopBack(ty) => write!(f, "VecPopBack {}", ty),
+            Bytecode_::VecUnpack(ty, n) => write!(f, "VecUnpack {} {}", ty, n),
+            Bytecode_::VecSwap(ty) => write!(f, "VecSwap {}", ty),
+        }
+    }
+}
+
+fn format_move_value(v: &MoveValue) -> String {
+    match v {
+        MoveValue::U8(u) => format!("{}u8", u),
+        MoveValue::U64(u) => format!("{}u64", u),
+        MoveValue::U128(u) => format!("{}u128", u),
+        MoveValue::Bool(true) => "true".to_owned(),
+        MoveValue::Bool(false) => "false".to_owned(),
+        MoveValue::Address(a) => format!("0x{}", a.short_str_lossless()),
+        MoveValue::Vector(v) => {
+            let items = v
+                .iter()
+                .map(format_move_value)
+                .collect::<Vec<_>>()
+                .join(", ");
+            format!("vector[{}]", items)
+        }
+        MoveValue::Struct(_) | MoveValue::Signer(_) => {
+            panic!("Should be inexpressible as a constant")
+        }
+        MoveValue::U16(u) => format!("{}u16", u),
+        MoveValue::U32(u) => format!("{}u32", u),
+        MoveValue::U256(u) => format!("{}u256", u),
+    }
+}
diff --git a/vendors/move/crates/move-ir-types/src/lib.rs b/vendors/move/crates/move-ir-types/src/lib.rs
new file mode 100644
index 000000000..a64dfadee
--- /dev/null
+++ b/vendors/move/crates/move-ir-types/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Base types for the Move IR.
+
+pub mod ast;
+pub mod location;
+pub mod spec_language_ast;
diff --git a/vendors/move/crates/move-ir-types/src/location.rs b/vendors/move/crates/move-ir-types/src/location.rs
new file mode 100644
index 000000000..a119b5538
--- /dev/null
+++ b/vendors/move/crates/move-ir-types/src/location.rs
@@ -0,0 +1,177 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_command_line_common::files::FileHash;
+use serde::{Deserialize, Serialize};
+use std::{
+    cmp::Ordering,
+    fmt,
+    hash::{Hash, Hasher},
+    ops::Range,
+};
+
+//**************************************************************************************************
+// Loc
+//**************************************************************************************************
+
+/// An index into a file.
+/// Much like the `codespan` crate, a `u32` is used here to for space efficiency.
+/// However, this assumes no file is larger than 4GB, so this might become a `usize` in the future
+/// if the space concerns turn out to not be an issue.
+pub type ByteIndex = u32;
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize, Hash)]
+/// The `Loc` struct is used to define a location in a file; where the file is considered to be a
+/// vector of bytes, and the range for a given `Loc` is defined by start and end index into that
+/// byte vector
+pub struct Loc {
+    /// The file the location points to
+    file_hash: FileHash,
+    /// The start byte index into file
+    start: ByteIndex,
+    /// The end byte index into file
+    end: ByteIndex,
+}
+
+impl Loc {
+    pub fn new(file_hash: FileHash, start: ByteIndex, end: ByteIndex) -> Loc {
+        Loc {
+            file_hash,
+            start,
+            end,
+        }
+    }
+
+    pub const fn invalid() -> Loc {
+        Loc {
+            file_hash: FileHash::empty(),
+            start: 0,
+            end: 0,
+        }
+    }
+
+    pub fn file_hash(self) -> FileHash {
+        self.file_hash
+    }
+
+    pub fn start(self) -> ByteIndex {
+        self.start
+    }
+
+    pub fn end(self) -> ByteIndex {
+        self.end
+    }
+
+    pub fn usize_range(self) -> Range<usize> {
+        Range {
+            start: self.start as usize,
+            end: self.end as usize,
+        }
+    }
+}
+
+impl PartialOrd for Loc {
+    fn partial_cmp(&self, other: &Loc) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Loc {
+    fn cmp(&self, other: &Loc) -> Ordering {
+        let file_ord = self.file_hash.cmp(&other.file_hash);
+        if file_ord != Ordering::Equal {
+            return file_ord;
+        }
+
+        let start_ord = self.start.cmp(&other.start);
+        if start_ord != Ordering::Equal {
+            return start_ord;
+        }
+
+        self.end.cmp(&other.end)
+    }
+}
+
+//**************************************************************************************************
+// Spanned
+//**************************************************************************************************
+
+#[derive(Copy, Clone)]
+pub struct Spanned<T> {
+    pub loc: Loc,
+    pub value: T,
+}
+
+impl<T> Spanned<T> {
+    pub fn new(loc: Loc, value: T) -> Spanned<T> {
+        Spanned { loc, value }
+    }
+
+    pub fn unsafe_no_loc(value: T) -> Spanned<T> {
+        Spanned {
+            value,
+            loc: Loc::new(FileHash::empty(), 0, 0),
+        }
+    }
+}
+
+impl<T: PartialEq> PartialEq for Spanned<T> {
+    fn eq(&self, other: &Spanned<T>) -> bool {
+        self.value == other.value
+    }
+}
+
+impl<T: Eq> Eq for Spanned<T> {}
+
+impl<T: Hash> Hash for Spanned<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.value.hash(state);
+    }
+}
+
+impl<T: PartialOrd> PartialOrd for Spanned<T> {
+    fn partial_cmp(&self, other: &Spanned<T>) -> Option<Ordering> {
+        self.value.partial_cmp(&other.value)
+    }
+}
+
+impl<T: Ord> Ord for Spanned<T> {
+    fn cmp(&self, other: &Spanned<T>) -> Ordering {
+        self.value.cmp(&other.value)
+    }
+}
+
+impl<T: fmt::Display> fmt::Display for Spanned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", &self.value)
+    }
+}
+
+impl<T: fmt::Debug> fmt::Debug for Spanned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", &self.value)
+    }
+}
+
+/// Function used to have nearly tuple-like syntax for creating a Spanned
+pub const fn sp<T>(loc: Loc, value: T) -> Spanned<T> {
+    Spanned { loc, value }
+}
+
+/// Macro used to create a tuple-like pattern match for Spanned
+#[macro_export]
+macro_rules! sp {
+    (_, $value:pat) => {
+        $crate::location::Spanned { value: $value, .. }
+    };
+    ($loc:pat, _) => {
+        $crate::location::Spanned { loc: $loc, .. }
+    };
+    ($loc:pat, $value:pat) => {
+        $crate::location::Spanned {
+            loc: $loc,
+            value: $value,
+        }
+    };
+}
diff --git a/vendors/move/crates/move-ir-types/src/spec_language_ast.rs b/vendors/move/crates/move-ir-types/src/spec_language_ast.rs
new file mode 100644
index 000000000..3a67860b1
--- /dev/null
+++ b/vendors/move/crates/move-ir-types/src/spec_language_ast.rs
@@ -0,0 +1,113 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    ast::{BinOp, CopyableVal_, Field_, QualifiedStructIdent, Type},
+    location::*,
+};
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::Symbol;
+
+/// AST for the Move Prover specification language.
+
+// .foo or [x + 1]
+#[derive(PartialEq, Debug, Clone)]
+pub enum FieldOrIndex {
+    Field(Field_),
+    Index(SpecExp),
+}
+
+/// A location that can store a value
+#[derive(PartialEq, Debug, Clone)]
+pub enum StorageLocation {
+    /// A formal of the current procedure
+    Formal(Symbol),
+    /// A resource of type `type_` stored in global storage at `address`
+    GlobalResource {
+        type_: QualifiedStructIdent,
+        type_actuals: Vec<Type>,
+        address: Box<StorageLocation>,
+    },
+    /// An access path rooted at `base` with nonempty offsets in `fields_or_indices`
+    AccessPath {
+        base: Box<StorageLocation>,
+        fields_and_indices: Vec<FieldOrIndex>,
+    },
+    /// Account address constant
+    Address(AccountAddress),
+    /// The ith return value of the current procedure
+    Ret(u8),
+    // TODO: useful constants like U64_MAX
+}
+
+/// An expression in the specification language
+#[derive(PartialEq, Debug, Clone)]
+pub enum SpecExp {
+    /// A Move constant
+    Constant(CopyableVal_),
+    /// A spec language storage location
+    StorageLocation(StorageLocation),
+    /// Lifting the Move exists operator to a storage location
+    GlobalExists {
+        type_: QualifiedStructIdent,
+        type_actuals: Vec<Type>,
+        address: StorageLocation,
+    },
+    /// Dereference of a storage location (written *s)
+    Dereference(StorageLocation),
+    /// Reference to a storage location (written &s)
+    Reference(StorageLocation),
+    /// Negation of a boolean expression (written !e),
+    Not(Box<SpecExp>),
+    /// Binary operators also suported by Move
+    Binop(Box<SpecExp>, BinOp, Box<SpecExp>),
+    /// Update expr (i := 1 inside [])
+    Update(Box<SpecExp>, Box<SpecExp>),
+    /// Value of expression evaluated in the state before function enter.
+    Old(Box<SpecExp>),
+    /// Call to a helper function.
+    Call(Symbol, Vec<SpecExp>),
+}
+
+/// A specification directive to be verified
+#[derive(PartialEq, Debug, Clone)]
+pub enum Condition_ {
+    /// Postconditions
+    Ensures(SpecExp),
+    /// Preconditions
+    Requires(SpecExp),
+    /// If the given expression is true, the procedure *must* terminate in an aborting state
+    AbortsIf(SpecExp),
+    /// If the given expression is true, the procedure *must* terminate in a succeeding state
+    SucceedsIf(SpecExp),
+}
+
+/// Specification directive with span.
+pub type Condition = Spanned<Condition_>;
+
+/// An invariant over a resource.
+#[derive(PartialEq, Debug, Clone)]
+pub struct Invariant_ {
+    /// A free string (for now) which specifies the function of this invariant.
+    pub modifier: Option<Symbol>,
+
+    /// An optional synthetic variable to which the below expression is assigned to.
+    pub target: Option<Symbol>,
+
+    /// A specification expression.
+    pub exp: SpecExp,
+}
+
+/// Invariant with span.
+pub type Invariant = Spanned<Invariant_>;
+
+/// A synthetic variable definition.
+#[derive(PartialEq, Debug, Clone)]
+pub struct SyntheticDefinition_ {
+    pub name: Symbol,
+    pub type_: Type,
+}
+
+/// Synthetic with span.
+pub type SyntheticDefinition = Spanned<SyntheticDefinition_>;
diff --git a/vendors/move/crates/move-ir/types/Cargo.toml b/vendors/move/crates/move-ir/types/Cargo.toml
new file mode 100644
index 000000000..af5df5e3e
--- /dev/null
+++ b/vendors/move/crates/move-ir/types/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "move-ir-types"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Types for Move IR"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.52"
+hex = "0.4.3"
+move-command-line-common = { path = "../../move-command-line-common" }
+once_cell = "1.7.2"
+serde = { version = "1.0.124", features = ["derive"] }
+
+move-core-types = { path = "../../move-core-types" }
+move-symbol-pool = { path = "../../move-symbol-pool" }
diff --git a/vendors/move/crates/move-ir/types/src/ast.rs b/vendors/move/crates/move-ir/types/src/ast.rs
new file mode 100644
index 000000000..076692e98
--- /dev/null
+++ b/vendors/move/crates/move-ir/types/src/ast.rs
@@ -0,0 +1,1814 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    location::*,
+    spec_language_ast::{Condition, Invariant, SyntheticDefinition},
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    value::MoveValue,
+};
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeSet, HashSet, VecDeque},
+    fmt,
+};
+
+//**************************************************************************************************
+// Program
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// A set of Move modules and a Move transaction script
+pub struct Program {
+    /// The modules to publish
+    pub modules: Vec<ModuleDefinition>,
+    /// The transaction script to execute
+    pub script: Script,
+}
+
+//**************************************************************************************************
+// ScriptOrModule
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// A script or a module, used to represent the two types of transactions.
+pub enum ScriptOrModule {
+    /// The script to execute.
+    Script(Script),
+    /// The module to publish.
+    Module(ModuleDefinition),
+}
+
+//**************************************************************************************************
+// Script
+//**************************************************************************************************
+
+#[derive(Debug, Clone)]
+/// The Move transaction script to be executed
+pub struct Script {
+    /// The source location for this script
+    pub loc: Loc,
+    /// The dependencies of `main`, i.e. of the transaction script
+    pub imports: Vec<ImportDefinition>,
+    /// Explicit declaration of dependencies. If not provided, will be inferred based on given
+    /// dependencies to the IR compiler
+    pub explicit_dependency_declarations: Vec<ModuleDependency>,
+    /// the constants that the module defines. Only a utility, the identifiers are not carried into
+    /// the Move bytecode
+    pub constants: Vec<Constant>,
+    /// The transaction script's `main` procedure
+    pub main: Function,
+}
+
+//**************************************************************************************************
+// Modules
+//**************************************************************************************************
+
+/// Newtype for a name of a module
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct ModuleName(pub Symbol);
+
+/// Newtype of the address + the module name
+/// `addr.m`
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct ModuleIdent {
+    /// Name for the module. Will be unique among modules published under the same address
+    pub name: ModuleName,
+    /// Address that this module is published under
+    pub address: AccountAddress,
+}
+
+/// A Move module
+#[derive(Clone, Debug, PartialEq)]
+pub struct ModuleDefinition {
+    /// The location of this module
+    pub loc: Loc,
+    /// name and address of the module
+    pub identifier: ModuleIdent,
+    /// the module's friends
+    pub friends: Vec<ModuleIdent>,
+    /// the module's dependencies
+    pub imports: Vec<ImportDefinition>,
+    /// Explicit declaration of dependencies. If not provided, will be inferred based on given
+    /// dependencies to the IR compiler
+    pub explicit_dependency_declarations: Vec<ModuleDependency>,
+    /// the structs (including resources) that the module defines
+    pub structs: Vec<StructDefinition>,
+    /// the constants that the script defines. Only a utility, the identifiers are not carried into
+    /// the Move bytecode
+    pub constants: Vec<Constant>,
+    /// the procedure that the module defines
+    pub functions: Vec<(FunctionName, Function)>,
+    /// the synthetic, specification variables the module defines.
+    pub synthetics: Vec<SyntheticDefinition>,
+}
+
+/// Explicitly given dependency
+#[derive(Clone, Debug, PartialEq)]
+pub struct ModuleDependency {
+    /// Qualified identifer of the dependency
+    pub name: ModuleName,
+    /// The structs (including resources) that the dependency defines
+    pub structs: Vec<StructDependency>,
+    /// The signatures of functions that the dependency defines
+    pub functions: Vec<FunctionDependency>,
+}
+
+//**************************************************************************************************
+// Imports
+//**************************************************************************************************
+
+/// A dependency/import declaration
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ImportDefinition {
+    /// the dependency
+    /// `addr.m`
+    pub ident: ModuleIdent,
+    /// the alias for that dependency
+    /// `m`
+    pub alias: ModuleName,
+}
+
+//**************************************************************************************************
+// Vars
+//**************************************************************************************************
+
+/// Newtype for a variable/local
+#[derive(Debug, PartialEq, Hash, Eq, Clone, Ord, PartialOrd)]
+pub struct Var_(pub Symbol);
+
+/// The type of a variable with a location
+pub type Var = Spanned<Var_>;
+
+/// New type that represents a type variable. Used to declare type formals & reference them.
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub struct TypeVar_(pub Symbol);
+
+/// The type of a type variable with a location.
+pub type TypeVar = Spanned<TypeVar_>;
+
+//**************************************************************************************************
+// Abilities
+//**************************************************************************************************
+
+/// The abilities of a type. Analogous to `move_binary_format::file_format::Ability`.
+#[derive(Debug, Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd)]
+pub enum Ability {
+    /// Allows values of types with this ability to be copied
+    Copy,
+    /// Allows values of types with this ability to be dropped or if left in a local at return
+    Drop,
+    /// Allows values of types with this ability to exist inside a struct in global storage
+    Store,
+    /// Allows the type to serve as a key for global storage operations
+    Key,
+}
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+/// The type of a single value
+#[derive(Debug, PartialEq, Clone)]
+pub enum Type {
+    /// `address`
+    Address,
+    /// `signer`
+    Signer,
+    /// `u8`
+    U8,
+    /// `u16`
+    U16,
+    /// `u32`
+    U32,
+    /// `u64`
+    U64,
+    /// `u128`
+    U128,
+    /// `u256`
+    U256,
+    /// `bool`
+    Bool,
+    /// `vector`
+    Vector(Box<Type>),
+    /// A module defined struct
+    Struct(QualifiedStructIdent, Vec<Type>),
+    /// A reference type, the bool flag indicates whether the reference is mutable
+    Reference(bool, Box<Type>),
+    /// A type parameter
+    TypeParameter(TypeVar_),
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+/// Identifier for a struct definition. Tells us where to look in the storage layer to find the
+/// code associated with the interface
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct QualifiedStructIdent {
+    /// Module name and address in which the struct is contained
+    pub module: ModuleName,
+    /// Name for the struct class. Should be unique among structs published under the same
+    /// module+address
+    pub name: StructName,
+}
+
+/// The field newtype
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct Field_(pub Symbol);
+
+/// A field coupled with source location information
+pub type Field = Spanned<Field_>;
+
+/// A fully-qualified field identifier.
+///
+/// Rather than simply referring to a field `f` with a single identifier and
+/// relying on type inference to determine the type of the struct being
+/// accessed, this type refers to the field `f` on the explicit struct type
+/// `S<T>` -- that is, `S<T>::f`.
+#[derive(Clone, Debug, PartialEq)]
+pub struct FieldIdent_ {
+    /// The name of the struct type on which the field is declared.
+    pub struct_name: StructName,
+    /// For generic struct types, the type parameters used to instantiate the
+    /// struct type (this is an empty vector for non-generic struct types).
+    pub type_actuals: Vec<Type>,
+    /// The name of the field.
+    pub field: Field,
+}
+
+pub type FieldIdent = Spanned<FieldIdent_>;
+
+/// A field map
+pub type Fields<T> = Vec<(Field, T)>;
+
+/// Newtype for the name of a struct
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct StructName(pub Symbol);
+
+/// A struct type parameter with its constraints and whether it's declared as phantom.
+pub type StructTypeParameter = (bool, TypeVar, BTreeSet<Ability>);
+
+/// A Move struct
+#[derive(Clone, Debug, PartialEq)]
+pub struct StructDefinition_ {
+    /// The declared abilities for the struct
+    pub abilities: BTreeSet<Ability>,
+    /// Human-readable name for the struct that also serves as a nominal type
+    pub name: StructName,
+    /// The list of formal type arguments
+    pub type_formals: Vec<StructTypeParameter>,
+    /// the fields each instance has
+    pub fields: StructDefinitionFields,
+    /// the invariants for this struct
+    pub invariants: Vec<Invariant>,
+}
+/// The type of a StructDefinition along with its source location information
+pub type StructDefinition = Spanned<StructDefinition_>;
+
+/// An explicit struct dependency
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct StructDependency {
+    /// The declared abilities for the struct
+    pub abilities: BTreeSet<Ability>,
+    /// Human-readable name for the struct that also serves as a nominal type
+    pub name: StructName,
+    /// The list of formal type arguments
+    pub type_formals: Vec<StructTypeParameter>,
+}
+
+/// The fields of a Move struct definition
+#[derive(Clone, Debug, PartialEq)]
+pub enum StructDefinitionFields {
+    /// The fields are declared
+    Move { fields: Fields<Type> },
+    /// The struct is a type provided by the VM
+    Native,
+}
+
+//**************************************************************************************************
+// Structs
+//**************************************************************************************************
+
+/// Newtype for the name of a constant
+#[derive(Debug, Serialize, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Clone)]
+pub struct ConstantName(pub Symbol);
+
+/// A constant declaration in a module or script
+#[derive(Clone, Debug, PartialEq)]
+pub struct Constant {
+    /// The constant's name. Not carried through to the Move bytecode
+    pub name: ConstantName,
+    /// The type of the constant's value
+    pub signature: Type,
+    /// The constant's value
+    pub value: MoveValue,
+}
+
+//**************************************************************************************************
+// Functions
+//**************************************************************************************************
+
+/// Newtype for the name of a function
+#[derive(Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Clone)]
+pub struct FunctionName(pub Symbol);
+
+/// The signature of a function
+#[derive(PartialEq, Debug, Clone)]
+pub struct FunctionSignature {
+    /// Possibly-empty list of (formal name, formal type) pairs. Names are unique.
+    pub formals: Vec<(Var, Type)>,
+    /// Optional return types
+    pub return_type: Vec<Type>,
+    /// Possibly-empty list of type parameters and their constraints
+    pub type_formals: Vec<(TypeVar, BTreeSet<Ability>)>,
+}
+
+/// An explicit function dependency
+#[derive(PartialEq, Debug, Clone)]
+pub struct FunctionDependency {
+    /// Name of the function dependency
+    pub name: FunctionName,
+    /// Signature of the function dependency
+    pub signature: FunctionSignature,
+}
+
+/// Public or internal modifier for a procedure
+#[derive(PartialEq, Eq, Debug, Clone)]
+pub enum FunctionVisibility {
+    /// The procedure can be invoked anywhere
+    /// `public`
+    Public,
+    /// The procedure can be invoked internally as well as by modules in the friend list
+    /// `public(friend)`
+    Friend,
+    /// The procedure can be invoked only internally
+    /// `<no modifier>`
+    Internal,
+}
+
+/// The body of a Move function
+#[derive(PartialEq, Debug, Clone)]
+pub enum FunctionBody {
+    /// The body is declared
+    /// `locals` are all of the declared locals
+    /// `code` is the code that defines the procedure
+    Move {
+        locals: Vec<(Var, Type)>,
+        code: Vec<Block>,
+    },
+    Bytecode {
+        locals: Vec<(Var, Type)>,
+        code: BytecodeBlocks,
+    },
+    /// The body is provided by the runtime
+    Native,
+}
+
+/// A Move function/procedure
+#[derive(PartialEq, Debug, Clone)]
+pub struct Function_ {
+    /// The visibility
+    pub visibility: FunctionVisibility,
+    /// Is entry function
+    pub is_entry: bool,
+    /// The type signature
+    pub signature: FunctionSignature,
+    /// List of nominal resources (declared in this module) that the procedure might access
+    /// Either through: BorrowGlobal, MoveFrom, or transitively through another procedure
+    /// This list of acquires grants the borrow checker the ability to statically verify the safety
+    /// of references into global storage
+    pub acquires: Vec<StructName>,
+    /// List of specifications for the Move prover (experimental)
+    pub specifications: Vec<Condition>,
+    /// The code for the procedure
+    pub body: FunctionBody,
+}
+
+/// The type of a Function coupled with its source location information.
+pub type Function = Spanned<Function_>;
+
+//**************************************************************************************************
+// Statements
+//**************************************************************************************************
+
+/// Builtin "function"-like operators that often have a signature not expressable in the
+/// type system and/or have access to some runtime/storage context
+#[derive(Debug, PartialEq, Clone)]
+pub enum Builtin {
+    /// Check if there is a struct object (`StructName` resolved by current module) associated with
+    /// the given address
+    Exists(StructName, Vec<Type>),
+    /// Get a reference to the resource(`StructName` resolved by current module) associated
+    /// with the given address
+    BorrowGlobal(bool, StructName, Vec<Type>),
+
+    /// Remove a resource of the given type from the account with the given address
+    MoveFrom(StructName, Vec<Type>),
+    /// Publish an instantiated struct object into signer's (signer is the first arg) account.
+    MoveTo(StructName, Vec<Type>),
+
+    /// Pack a vector fix a fixed number of elements. Zero elements means an empty vector.
+    VecPack(Vec<Type>, u64),
+    /// Get the length of a vector
+    VecLen(Vec<Type>),
+    /// Acquire an immutable reference to the element at a given index of the vector
+    VecImmBorrow(Vec<Type>),
+    /// Acquire a mutable reference to the element at a given index of the vector
+    VecMutBorrow(Vec<Type>),
+    /// Push an element to the end of the vector
+    VecPushBack(Vec<Type>),
+    /// Pop and return an element from the end of the vector
+    VecPopBack(Vec<Type>),
+    /// Destroy a vector of a fixed length. Zero length means destroying an empty vector.
+    VecUnpack(Vec<Type>, u64),
+    /// Swap the elements at twi indices in the vector
+    VecSwap(Vec<Type>),
+
+    /// Convert a mutable reference into an immutable one
+    Freeze,
+
+    /// Cast an integer into u8.
+    ToU8,
+    /// Cast an integer into u16.
+    ToU16,
+    /// Cast an integer into u32.
+    ToU32,
+    /// Cast an integer into u64.
+    ToU64,
+    /// Cast an integer into u128.
+    ToU128,
+    /// Cast an integer into u256.
+    ToU256,
+}
+
+/// Enum for different function calls
+#[derive(Debug, PartialEq, Clone)]
+pub enum FunctionCall_ {
+    /// functions defined in the host environment
+    Builtin(Builtin),
+    /// The call of a module defined procedure
+    ModuleFunctionCall {
+        module: ModuleName,
+        name: FunctionName,
+        type_actuals: Vec<Type>,
+    },
+}
+/// The type for a function call and its location
+pub type FunctionCall = Spanned<FunctionCall_>;
+
+/// Enum for Move lvalues
+#[derive(Debug, Clone, PartialEq)]
+pub enum LValue_ {
+    /// `x`
+    Var(Var),
+    /// `*e`
+    Mutate(Exp),
+    /// `_`
+    Pop,
+}
+pub type LValue = Spanned<LValue_>;
+
+/// A [`Block_`] is composed of zero or more "statements," which can be translated into one or more
+/// bytecode instructions.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Statement_ {
+    /// `abort e`.
+    Abort(Option<Box<Exp>>),
+    /// `assert(e_1, e_2)`
+    Assert(Box<Exp>, Box<Exp>),
+    /// `return e_1, ... , e_j`
+    Return(Box<Exp>),
+    /// `l_1, ..., l_n = e`
+    Assign(Vec<LValue>, Exp),
+    /// A statement representing an expression `e`.
+    Exp(Box<Exp>),
+    /// `jump lbl`
+    Jump(BlockLabel),
+    /// `jump_if (e) lbl`
+    JumpIf(Box<Exp>, BlockLabel),
+    /// `jump_if_false (e) lbl`
+    JumpIfFalse(Box<Exp>, BlockLabel),
+    /// `n { f_1: x_1, ... , f_j: x_j  } = e`
+    Unpack(StructName, Vec<Type>, Fields<Var>, Box<Exp>),
+}
+/// A [`Statement_`] with a location.
+pub type Statement = Spanned<Statement_>;
+
+/// A block is composed of a [`BlockLabel`], followed by 0 or more [`Statement`],
+/// e.g.: `label b: s_1; ... s_n;`.
+#[derive(Debug, PartialEq, Clone)]
+pub struct Block_ {
+    /// The label that can be used to jump to this block.
+    pub label: BlockLabel,
+    /// The statements that make up the block.
+    pub statements: VecDeque<Statement>,
+}
+/// A [`Block_`] with a location.
+pub type Block = Spanned<Block_>;
+
+//**************************************************************************************************
+// Expressions
+//**************************************************************************************************
+
+/// Bottom of the value hierarchy. These values can be trivially copyable and stored in statedb as a
+/// single entry.
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum CopyableVal_ {
+    /// An address in the global storage
+    Address(AccountAddress),
+    /// An unsigned 8-bit integer
+    U8(u8),
+    /// An unsigned 16-bit integer
+    U16(u16),
+    /// An unsigned 32-bit integer
+    U32(u32),
+    /// An unsigned 64-bit integer
+    U64(u64),
+    /// An unsigned 128-bit integer
+    U128(u128),
+    /// An unsigned 256-bit integer
+    U256(move_core_types::u256::U256),
+    /// true or false
+    Bool(bool),
+    /// `b"<bytes>"`
+    ByteArray(Vec<u8>),
+}
+
+/// The type of a value and its location
+pub type CopyableVal = Spanned<CopyableVal_>;
+
+/// The type for fields and their bound expressions
+pub type ExpFields = Fields<Exp>;
+
+/// Enum for unary operators
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum UnaryOp {
+    /// Boolean negation
+    Not,
+}
+
+/// Enum for binary operators
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BinOp {
+    // u64 ops
+    /// `+`
+    Add,
+    /// `-`
+    Sub,
+    /// `*`
+    Mul,
+    /// `%`
+    Mod,
+    /// `/`
+    Div,
+    /// `|`
+    BitOr,
+    /// `&`
+    BitAnd,
+    /// `^`
+    Xor,
+    /// `<<`
+    Shl,
+    /// `>>`
+    Shr,
+
+    // Bool ops
+    /// `&&`
+    And,
+    /// `||`
+    Or,
+
+    // Compare Ops
+    /// `==`
+    Eq,
+    /// `!=`
+    Neq,
+    /// `<`
+    Lt,
+    /// `>`
+    Gt,
+    /// `<=`
+    Le,
+    /// `>=`
+    Ge,
+    /// '..'  only used in specs
+    Subrange,
+}
+
+/// Enum for all expressions
+#[derive(Debug, Clone, PartialEq)]
+pub enum Exp_ {
+    /// `*e`
+    Dereference(Box<Exp>),
+    /// `op e`
+    UnaryExp(UnaryOp, Box<Exp>),
+    /// `e_1 op e_2`
+    BinopExp(Box<Exp>, BinOp, Box<Exp>),
+    /// Wrapper to lift `CopyableVal` into `Exp`
+    /// `v`
+    Value(CopyableVal),
+    /// Takes the given field values and instantiates the struct
+    /// Returns a fresh `StructInstance` whose type and kind (resource or otherwise)
+    /// as the current struct class (i.e., the class of the method we're currently executing).
+    /// `n { f_1: e_1, ... , f_j: e_j }`
+    Pack(StructName, Vec<Type>, ExpFields),
+    /// `&e.f`, `&mut e.f`
+    Borrow {
+        /// mutable or not
+        is_mutable: bool,
+        /// the expression containing the reference
+        exp: Box<Exp>,
+        /// the field being borrowed
+        field: FieldIdent,
+    },
+    /// `move(x)`
+    Move(Var),
+    /// `copy(x)`
+    Copy(Var),
+    /// `&x` or `&mut x`
+    BorrowLocal(bool, Var),
+    /// `f(e)` or `f(e_1, e_2, ..., e_j)`
+    FunctionCall(FunctionCall, Box<Exp>),
+    /// (e_1, e_2, e_3, ..., e_j)
+    ExprList(Vec<Exp>),
+}
+
+/// The type for a `Exp_` and its location
+pub type Exp = Spanned<Exp_>;
+
+//**************************************************************************************************
+// Bytecode
+//**************************************************************************************************
+
+pub type BytecodeBlocks = Vec<(BlockLabel_, BytecodeBlock)>;
+pub type BytecodeBlock = Vec<Bytecode>;
+
+#[derive(Debug, Clone, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct BlockLabel_(pub Symbol);
+pub type BlockLabel = Spanned<BlockLabel_>;
+
+#[derive(Debug, Clone, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct NopLabel(pub Symbol);
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Bytecode_ {
+    Pop,
+    Ret,
+    Nop(Option<NopLabel>),
+    BrTrue(BlockLabel_),
+    BrFalse(BlockLabel_),
+    Branch(BlockLabel_),
+    LdU8(u8),
+    LdU16(u16),
+    LdU32(u32),
+    LdU64(u64),
+    LdU128(u128),
+    LdU256(move_core_types::u256::U256),
+    CastU8,
+    CastU16,
+    CastU32,
+    CastU64,
+    CastU128,
+    CastU256,
+    LdTrue,
+    LdFalse,
+    LdConst(Type, MoveValue),
+    LdNamedConst(ConstantName),
+    CopyLoc(Var),
+    MoveLoc(Var),
+    StLoc(Var),
+    Call(ModuleName, FunctionName, Vec<Type>),
+    Pack(StructName, Vec<Type>),
+    Unpack(StructName, Vec<Type>),
+    ReadRef,
+    WriteRef,
+    FreezeRef,
+    MutBorrowLoc(Var),
+    ImmBorrowLoc(Var),
+    MutBorrowField(StructName, Vec<Type>, Field),
+    ImmBorrowField(StructName, Vec<Type>, Field),
+    MutBorrowGlobal(StructName, Vec<Type>),
+    ImmBorrowGlobal(StructName, Vec<Type>),
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+    BitOr,
+    BitAnd,
+    Xor,
+    Or,
+    And,
+    Not,
+    Eq,
+    Neq,
+    Lt,
+    Gt,
+    Le,
+    Ge,
+    Abort,
+    Exists(StructName, Vec<Type>),
+    MoveFrom(StructName, Vec<Type>),
+    MoveTo(StructName, Vec<Type>),
+    Shl,
+    Shr,
+    VecPack(Type, u64),
+    VecLen(Type),
+    VecImmBorrow(Type),
+    VecMutBorrow(Type),
+    VecPushBack(Type),
+    VecPopBack(Type),
+    VecUnpack(Type, u64),
+    VecSwap(Type),
+}
+pub type Bytecode = Spanned<Bytecode_>;
+
+//**************************************************************************************************
+// impls
+//**************************************************************************************************
+
+fn get_external_deps(imports: &[ImportDefinition]) -> Vec<ModuleId> {
+    let mut deps = HashSet::new();
+    for dep in imports.iter() {
+        let identifier = Identifier::new(dep.ident.name.0.as_str().to_owned()).unwrap();
+        deps.insert(ModuleId::new(dep.ident.address, identifier));
+    }
+    deps.into_iter().collect()
+}
+
+impl Program {
+    /// Create a new `Program` from modules and transaction script
+    pub fn new(modules: Vec<ModuleDefinition>, script: Script) -> Self {
+        Program { modules, script }
+    }
+}
+
+impl Script {
+    /// Create a new `Script` from the imports and the main function
+    pub fn new(
+        loc: Loc,
+        imports: Vec<ImportDefinition>,
+        explicit_dependency_declarations: Vec<ModuleDependency>,
+        constants: Vec<Constant>,
+        main: Function,
+    ) -> Self {
+        Script {
+            loc,
+            imports,
+            explicit_dependency_declarations,
+            constants,
+            main,
+        }
+    }
+
+    /// Accessor for the body of the 'main' procedure
+    pub fn body(&self) -> &[Block] {
+        match self.main.value.body {
+            FunctionBody::Move { ref code, .. } => code,
+            FunctionBody::Bytecode { .. } => panic!("Invalid body access on bytecode main()"),
+            FunctionBody::Native => panic!("main() cannot be native"),
+        }
+    }
+
+    /// Return a vector of `ModuleId` for the external dependencies.
+    pub fn get_external_deps(&self) -> Vec<ModuleId> {
+        get_external_deps(self.imports.as_slice())
+    }
+}
+
+static SELF_MODULE_NAME: Lazy<Symbol> = Lazy::new(|| Symbol::from("Self"));
+
+impl ModuleName {
+    /// Name for the current module handle
+    pub fn self_name() -> &'static str {
+        SELF_MODULE_NAME.as_str()
+    }
+
+    /// Create a new `ModuleName` from `self_name`.
+    pub fn module_self() -> Self {
+        ModuleName(*SELF_MODULE_NAME)
+    }
+}
+
+impl ModuleIdent {
+    /// Creates a new fully qualified module identifier from the module name and the address at
+    /// which it is published
+    pub fn new(name: ModuleName, address: AccountAddress) -> Self {
+        ModuleIdent { name, address }
+    }
+
+    /// Accessor for the name of the fully qualified module identifier
+    pub fn name(&self) -> &ModuleName {
+        &self.name
+    }
+
+    /// Accessor for the address at which the module is published
+    pub fn address(&self) -> &AccountAddress {
+        &self.address
+    }
+}
+
+impl ModuleDefinition {
+    /// Creates a new `ModuleDefinition` from its string name, dependencies, structs+resources,
+    /// and procedures
+    /// Does not verify the correctness of any internal properties of its elements
+    pub fn new(
+        loc: Loc,
+        identifier: ModuleIdent,
+        friends: Vec<ModuleIdent>,
+        imports: Vec<ImportDefinition>,
+        explicit_dependency_declarations: Vec<ModuleDependency>,
+        structs: Vec<StructDefinition>,
+        constants: Vec<Constant>,
+        functions: Vec<(FunctionName, Function)>,
+        synthetics: Vec<SyntheticDefinition>,
+    ) -> Self {
+        ModuleDefinition {
+            loc,
+            identifier,
+            friends,
+            imports,
+            explicit_dependency_declarations,
+            structs,
+            constants,
+            functions,
+            synthetics,
+        }
+    }
+
+    /// Return a vector of `ModuleId` for the external dependencies.
+    pub fn get_external_deps(&self) -> Vec<ModuleId> {
+        get_external_deps(self.imports.as_slice())
+    }
+}
+
+impl Ability {
+    pub const COPY: &'static str = "copy";
+    pub const DROP: &'static str = "drop";
+    pub const KEY: &'static str = "key";
+    pub const STORE: &'static str = "store";
+}
+
+impl Type {
+    /// Creates a new struct type
+    pub fn r#struct(ident: QualifiedStructIdent, type_actuals: Vec<Type>) -> Type {
+        Type::Struct(ident, type_actuals)
+    }
+
+    /// Creates a new reference type from its mutability and underlying type
+    pub fn reference(is_mutable: bool, t: Type) -> Type {
+        Type::Reference(is_mutable, Box::new(t))
+    }
+
+    /// Creates a new address type
+    pub fn address() -> Type {
+        Type::Address
+    }
+
+    /// Creates a new u64 type
+    pub fn u64() -> Type {
+        Type::U64
+    }
+
+    /// Creates a new bool type
+    pub fn bool() -> Type {
+        Type::Bool
+    }
+}
+
+impl QualifiedStructIdent {
+    /// Creates a new StructType handle from the name of the module alias and the name of the struct
+    pub fn new(module: ModuleName, name: StructName) -> Self {
+        QualifiedStructIdent { module, name }
+    }
+
+    /// Accessor for the module alias
+    pub fn module(&self) -> &ModuleName {
+        &self.module
+    }
+
+    /// Accessor for the struct name
+    pub fn name(&self) -> &StructName {
+        &self.name
+    }
+}
+
+impl ImportDefinition {
+    /// Creates a new import definition from a module identifier and an optional alias
+    /// If the alias is `None`, the alias will be a cloned copy of the identifiers module name
+    pub fn new(ident: ModuleIdent, alias_opt: Option<ModuleName>) -> Self {
+        let alias = match alias_opt {
+            Some(alias) => alias,
+            None => *ident.name(),
+        };
+        ImportDefinition { ident, alias }
+    }
+}
+
+impl StructDefinition_ {
+    /// Creates a new StructDefinition from the abilities, the string representation of the name,
+    /// and the user specified fields, a map from their names to their types
+    /// Does not verify the correctness of any internal properties, e.g. doesn't check that the
+    /// fields do not have reference types
+    pub fn move_declared(
+        abilities: BTreeSet<Ability>,
+        name: Symbol,
+        type_formals: Vec<StructTypeParameter>,
+        fields: Fields<Type>,
+        invariants: Vec<Invariant>,
+    ) -> Self {
+        StructDefinition_ {
+            abilities,
+            name: StructName(name),
+            type_formals,
+            fields: StructDefinitionFields::Move { fields },
+            invariants,
+        }
+    }
+
+    /// Creates a new StructDefinition from the abilities, the string representation of the name,
+    /// and the user specified fields, a map from their names to their types
+    pub fn native(
+        abilities: BTreeSet<Ability>,
+        name: Symbol,
+        type_formals: Vec<StructTypeParameter>,
+    ) -> Self {
+        StructDefinition_ {
+            abilities,
+            name: StructName(name),
+            type_formals,
+            fields: StructDefinitionFields::Native,
+            invariants: vec![],
+        }
+    }
+}
+
+impl FunctionSignature {
+    /// Creates a new function signature from the parameters and the return types
+    pub fn new(
+        formals: Vec<(Var, Type)>,
+        return_type: Vec<Type>,
+        type_parameters: Vec<(TypeVar, BTreeSet<Ability>)>,
+    ) -> Self {
+        FunctionSignature {
+            formals,
+            return_type,
+            type_formals: type_parameters,
+        }
+    }
+}
+
+impl Function_ {
+    /// Creates a new function declaration from the components of the function
+    /// See the declaration of the struct `Function` for more details
+    pub fn new(
+        visibility: FunctionVisibility,
+        is_entry: bool,
+        formals: Vec<(Var, Type)>,
+        return_type: Vec<Type>,
+        type_parameters: Vec<(TypeVar, BTreeSet<Ability>)>,
+        acquires: Vec<StructName>,
+        specifications: Vec<Condition>,
+        body: FunctionBody,
+    ) -> Self {
+        let signature = FunctionSignature::new(formals, return_type, type_parameters);
+        Function_ {
+            visibility,
+            is_entry,
+            signature,
+            acquires,
+            specifications,
+            body,
+        }
+    }
+}
+
+impl FunctionCall_ {
+    /// Creates a `FunctionCall::ModuleFunctionCall` variant
+    pub fn module_call(module: ModuleName, name: FunctionName, type_actuals: Vec<Type>) -> Self {
+        FunctionCall_::ModuleFunctionCall {
+            module,
+            name,
+            type_actuals,
+        }
+    }
+
+    /// Creates a `FunctionCall::Builtin` variant with no location information
+    pub fn builtin(bif: Builtin) -> FunctionCall {
+        Spanned::unsafe_no_loc(FunctionCall_::Builtin(bif))
+    }
+}
+
+impl Statement_ {
+    /// Creates a statement that returns no values.
+    pub fn return_empty() -> Self {
+        Statement_::Return(Box::new(Spanned::unsafe_no_loc(Exp_::ExprList(vec![]))))
+    }
+
+    /// Creates a statement that returns a single value.
+    pub fn return_(op: Exp) -> Self {
+        Statement_::Return(Box::new(op))
+    }
+}
+
+impl Block_ {
+    /// Creates a new block from a label and a vector of statements.
+    pub fn new(label: BlockLabel, statements: Vec<Statement>) -> Self {
+        Self {
+            label,
+            statements: VecDeque::from(statements),
+        }
+    }
+}
+
+impl Exp_ {
+    /// Creates a new address `Exp` with no location information
+    pub fn address(addr: AccountAddress) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Value(Spanned::unsafe_no_loc(CopyableVal_::Address(
+            addr,
+        ))))
+    }
+
+    /// Creates a new value `Exp` with no location information
+    pub fn value(b: CopyableVal_) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Value(Spanned::unsafe_no_loc(b)))
+    }
+
+    /// Creates a new u64 `Exp` with no location information
+    pub fn u64(i: u64) -> Exp {
+        Exp_::value(CopyableVal_::U64(i))
+    }
+
+    /// Creates a new bool `Exp` with no location information
+    pub fn bool(b: bool) -> Exp {
+        Exp_::value(CopyableVal_::Bool(b))
+    }
+
+    /// Creates a new bytearray `Exp` with no location information
+    pub fn byte_array(buf: Vec<u8>) -> Exp {
+        Exp_::value(CopyableVal_::ByteArray(buf))
+    }
+
+    /// Creates a new pack/struct-instantiation `Exp` with no location information
+    pub fn instantiate(n: StructName, tys: Vec<Type>, s: ExpFields) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Pack(n, tys, s))
+    }
+
+    /// Creates a new binary operator `Exp` with no location information
+    pub fn binop(lhs: Exp, op: BinOp, rhs: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::BinopExp(Box::new(lhs), op, Box::new(rhs)))
+    }
+
+    /// Creates a new `e+e` `Exp` with no location information
+    pub fn add(lhs: Exp, rhs: Exp) -> Exp {
+        Exp_::binop(lhs, BinOp::Add, rhs)
+    }
+
+    /// Creates a new `e-e` `Exp` with no location information
+    pub fn sub(lhs: Exp, rhs: Exp) -> Exp {
+        Exp_::binop(lhs, BinOp::Sub, rhs)
+    }
+
+    /// Creates a new `*e` `Exp` with no location information
+    pub fn dereference(e: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Dereference(Box::new(e)))
+    }
+
+    /// Creates a new borrow field `Exp` with no location information
+    pub fn borrow(is_mutable: bool, exp: Box<Exp>, field: FieldIdent) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Borrow {
+            is_mutable,
+            exp,
+            field,
+        })
+    }
+
+    /// Creates a new copy-local `Exp` with no location information
+    pub fn copy(v: Var) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Copy(v))
+    }
+
+    /// Creates a new move-local `Exp` with no location information
+    pub fn move_(v: Var) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::Move(v))
+    }
+
+    /// Creates a new function call `Exp` with no location information
+    pub fn function_call(f: FunctionCall, e: Exp) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::FunctionCall(f, Box::new(e)))
+    }
+
+    pub fn expr_list(exps: Vec<Exp>) -> Exp {
+        Spanned::unsafe_no_loc(Exp_::ExprList(exps))
+    }
+}
+
+//**************************************************************************************************
+// Trait impls
+//**************************************************************************************************
+
+impl PartialEq for Script {
+    fn eq(&self, other: &Script) -> bool {
+        self.imports == other.imports && self.main.value.body == other.main.value.body
+    }
+}
+
+impl Iterator for Block_ {
+    type Item = Statement;
+
+    fn next(&mut self) -> Option<Statement> {
+        self.statements.pop_front()
+    }
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for TypeVar_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for Ability {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", match self {
+            Ability::Copy => Ability::COPY,
+            Ability::Drop => Ability::DROP,
+            Ability::Store => Ability::STORE,
+            Ability::Key => Ability::KEY,
+        })
+    }
+}
+
+fn format_constraints(set: &BTreeSet<Ability>) -> String {
+    set.iter()
+        .map(|a| format!("{}", a))
+        .collect::<Vec<_>>()
+        .join(" + ")
+}
+
+impl fmt::Display for ScriptOrModule {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use ScriptOrModule::*;
+        match self {
+            Module(module_def) => write!(f, "{}", module_def),
+            Script(script) => write!(f, "{}", script),
+        }
+    }
+}
+
+impl fmt::Display for Script {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "Script(")?;
+
+        write!(f, "Imports(")?;
+        write!(f, "{}", intersperse(&self.imports, ", "))?;
+        writeln!(f, ")")?;
+
+        writeln!(f, "Dependency(")?;
+        for dependency in &self.explicit_dependency_declarations {
+            writeln!(f, "{},", dependency)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Constants(")?;
+        for constant in &self.constants {
+            writeln!(f, "{};", constant)?;
+        }
+        writeln!(f, ")")?;
+
+        write!(f, "Main(")?;
+        write!(f, "{}", self.main)?;
+        write!(f, ")")?;
+        write!(f, ")")
+    }
+}
+
+impl fmt::Display for ModuleName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for ModuleIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}.{}", self.address, self.name)
+    }
+}
+
+impl fmt::Display for ModuleDefinition {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "Module({}, ", self.identifier)?;
+
+        writeln!(f, "Imports(")?;
+        for import in &self.imports {
+            writeln!(f, "{};", import)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Dependency(")?;
+        for dependency in &self.explicit_dependency_declarations {
+            writeln!(f, "{},", dependency)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Structs(")?;
+        for struct_def in &self.structs {
+            writeln!(f, "{}, ", struct_def)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Constants(")?;
+        for constant in &self.constants {
+            writeln!(f, "{};", constant)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, "Functions(")?;
+        for (fun_name, fun) in &self.functions {
+            writeln!(f, "({}, {}), ", fun_name, fun)?;
+        }
+        writeln!(f, ")")?;
+
+        writeln!(f, ")")
+    }
+}
+
+impl fmt::Display for ImportDefinition {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "import {} as {}", &self.ident, &self.alias)
+    }
+}
+
+impl fmt::Display for ModuleDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Dependency({}, ", &self.name)?;
+        for sdep in &self.structs {
+            writeln!(f, "{}, ", sdep)?
+        }
+        for fdep in &self.functions {
+            writeln!(f, "{}, ", fdep)?
+        }
+        writeln!(f, ")")
+    }
+}
+
+impl fmt::Display for StructDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "StructDep({} {}{}",
+            self.abilities
+                .iter()
+                .map(|a| format!("{}", a))
+                .collect::<Vec<_>>()
+                .join(" "),
+            &self.name,
+            format_struct_type_formals(&self.type_formals)
+        )
+    }
+}
+
+impl fmt::Display for FunctionDependency {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "FunctionDep({}{}", &self.name, &self.signature)
+    }
+}
+
+impl fmt::Display for StructDefinition_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(
+            f,
+            "Struct({}{}, ",
+            self.name,
+            format_struct_type_formals(&self.type_formals)
+        )?;
+        match &self.fields {
+            StructDefinitionFields::Move { fields } => writeln!(f, "{}", format_fields(fields))?,
+            StructDefinitionFields::Native => writeln!(f, "{{native}}")?,
+        }
+        write!(f, ")")
+    }
+}
+
+impl fmt::Display for Constant {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "const {}: {} = {}",
+            &self.name.0,
+            self.signature,
+            format_move_value(&self.value)
+        )
+    }
+}
+
+impl fmt::Display for Function_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} ({})", self.signature, self.body)
+    }
+}
+
+impl fmt::Display for Field_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FieldIdent_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}::{}", self.struct_name, self.field)
+    }
+}
+
+impl fmt::Display for StructName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FunctionName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for BlockLabel_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for ConstantName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for FunctionBody {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FunctionBody::Move {
+                ref locals,
+                ref code,
+            } => {
+                for (local, ty) in locals {
+                    write!(f, "let {}: {};", local, ty)?;
+                }
+                for block in code {
+                    writeln!(f, "{}", block.value)?;
+                }
+                Ok(())
+            },
+            FunctionBody::Bytecode { locals, code } => {
+                write!(f, "locals: [")?;
+                for (local, ty) in locals {
+                    write!(f, "{}: {},", local, ty)?;
+                }
+                writeln!(f, "]")?;
+                for (label, block) in code {
+                    writeln!(f, "{}:", &label)?;
+                    for instr in block {
+                        writeln!(f, "  {}", instr)?;
+                    }
+                }
+                Ok(())
+            },
+            FunctionBody::Native => write!(f, "native"),
+        }
+    }
+}
+
+// TODO: This function should take an iterator instead.
+fn intersperse<T: fmt::Display>(items: &[T], join: &str) -> String {
+    // TODO: Any performance issues here? Could be O(n^2) if not optimized.
+    items.iter().fold(String::new(), |acc, v| {
+        format!("{acc}{join}{v}", acc = acc, join = join, v = v)
+    })
+}
+
+fn format_fields<T: fmt::Display>(fields: &[(Field, T)]) -> String {
+    fields.iter().fold(String::new(), |acc, (field, val)| {
+        format!("{} {}: {},", acc, field.value, val)
+    })
+}
+
+impl fmt::Display for FunctionSignature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", format_fun_type_formals(&self.type_formals))?;
+        write!(f, "(")?;
+        for (v, ty) in self.formals.iter() {
+            write!(f, "{}: {}, ", v, ty)?;
+        }
+        write!(f, ")")?;
+        Ok(())
+    }
+}
+
+impl fmt::Display for QualifiedStructIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}", self.module, self.name)
+    }
+}
+
+fn format_type_actuals(tys: &[Type]) -> String {
+    if tys.is_empty() {
+        "".to_string()
+    } else {
+        format!("<{}>", intersperse(tys, ", "))
+    }
+}
+
+fn format_fun_type_formals(formals: &[(TypeVar, BTreeSet<Ability>)]) -> String {
+    if formals.is_empty() {
+        "".to_string()
+    } else {
+        let formatted = formals
+            .iter()
+            .map(|(tv, abilities)| format!("{}: {}", tv.value, format_constraints(abilities)))
+            .collect::<Vec<_>>();
+        format!("<{}>", intersperse(&formatted, ", "))
+    }
+}
+
+fn format_struct_type_formals(formals: &[StructTypeParameter]) -> String {
+    if formals.is_empty() {
+        "".to_string()
+    } else {
+        let formatted = formals
+            .iter()
+            .map(|(is_phantom, tv, abilities)| {
+                format!(
+                    "{}{}: {}",
+                    if *is_phantom { "phantom " } else { "" },
+                    tv.value,
+                    format_constraints(abilities)
+                )
+            })
+            .collect::<Vec<_>>();
+        format!("<{}>", intersperse(&formatted, ", "))
+    }
+}
+
+impl fmt::Display for Type {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Type::U8 => write!(f, "u8"),
+            Type::U16 => write!(f, "u16"),
+            Type::U32 => write!(f, "u32"),
+            Type::U64 => write!(f, "u64"),
+            Type::U128 => write!(f, "u128"),
+            Type::U256 => write!(f, "u256"),
+            Type::Bool => write!(f, "bool"),
+            Type::Address => write!(f, "address"),
+            Type::Signer => write!(f, "signer"),
+            Type::Vector(ty) => write!(f, "vector<{}>", ty),
+            Type::Struct(ident, tys) => write!(f, "{}{}", ident, format_type_actuals(tys)),
+            Type::Reference(is_mutable, t) => {
+                write!(f, "&{}{}", if *is_mutable { "mut " } else { "" }, t)
+            },
+            Type::TypeParameter(s) => write!(f, "{}", s),
+        }
+    }
+}
+
+impl fmt::Display for Var_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for Builtin {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Builtin::Exists(t, tys) => write!(f, "exists<{}{}>", t, format_type_actuals(tys)),
+            Builtin::BorrowGlobal(mut_, t, tys) => {
+                let mut_flag = if *mut_ { "_mut" } else { "" };
+                write!(
+                    f,
+                    "borrow_global{}<{}{}>",
+                    mut_flag,
+                    t,
+                    format_type_actuals(tys)
+                )
+            },
+            Builtin::MoveFrom(t, tys) => write!(f, "move_from<{}{}>", t, format_type_actuals(tys)),
+            Builtin::MoveTo(t, tys) => write!(f, "move_to<{}{}>", t, format_type_actuals(tys)),
+            Builtin::VecPack(tys, num) => write!(f, "vec_pack_{}{}", num, format_type_actuals(tys)),
+            Builtin::VecLen(tys) => write!(f, "vec_len{}", format_type_actuals(tys)),
+            Builtin::VecImmBorrow(tys) => write!(f, "vec_imm_borrow{}", format_type_actuals(tys)),
+            Builtin::VecMutBorrow(tys) => write!(f, "vec_mut_borrow{}", format_type_actuals(tys)),
+            Builtin::VecPushBack(tys) => write!(f, "vec_push_back{}", format_type_actuals(tys)),
+            Builtin::VecPopBack(tys) => write!(f, "vec_pop_back{}", format_type_actuals(tys)),
+            Builtin::VecUnpack(tys, num) => {
+                write!(f, "vec_unpack_{}{}", num, format_type_actuals(tys))
+            },
+            Builtin::VecSwap(tys) => write!(f, "vec_swap{}", format_type_actuals(tys)),
+            Builtin::Freeze => write!(f, "freeze"),
+            Builtin::ToU8 => write!(f, "to_u8"),
+            Builtin::ToU16 => write!(f, "to_u16"),
+            Builtin::ToU32 => write!(f, "to_u32"),
+            Builtin::ToU64 => write!(f, "to_u64"),
+            Builtin::ToU128 => write!(f, "to_u128"),
+            Builtin::ToU256 => write!(f, "to_u256"),
+        }
+    }
+}
+
+impl fmt::Display for FunctionCall_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FunctionCall_::Builtin(fun) => write!(f, "{}", fun),
+            FunctionCall_::ModuleFunctionCall {
+                module,
+                name,
+                type_actuals,
+            } => write!(
+                f,
+                "{}.{}{}",
+                module,
+                name,
+                format_type_actuals(type_actuals)
+            ),
+        }
+    }
+}
+
+impl fmt::Display for LValue_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            LValue_::Var(x) => write!(f, "{}", x),
+            LValue_::Mutate(e) => write!(f, "*{}", e),
+            LValue_::Pop => write!(f, "_"),
+        }
+    }
+}
+
+impl fmt::Display for Statement_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Statement_::Abort(None) => write!(f, "abort;"),
+            Statement_::Abort(Some(err)) => write!(f, "abort {};", err),
+            Statement_::Assert(cond, err) => write!(f, "assert({}, {});", cond, err),
+            Statement_::Assign(var_list, e) => {
+                if var_list.is_empty() {
+                    write!(f, "{};", e)
+                } else {
+                    write!(f, "{} = ({});", intersperse(var_list, ", "), e)
+                }
+            },
+            Statement_::Exp(e) => write!(f, "({});", e),
+            Statement_::Jump(label) => write!(f, "jump {}", label),
+            Statement_::JumpIf(e, label) => write!(f, "jump_if ({}) {}", e, label),
+            Statement_::JumpIfFalse(e, label) => write!(f, "jump_if_false ({}) {}", e, label),
+            Statement_::Return(exps) => write!(f, "return {};", exps),
+            Statement_::Unpack(n, tys, bindings, e) => write!(
+                f,
+                "{}{} {{ {} }} = {}",
+                n,
+                format_type_actuals(tys),
+                bindings
+                    .iter()
+                    .fold(String::new(), |acc, (field, var)| format!(
+                        "{} {} : {},",
+                        acc, field, var
+                    )),
+                e
+            ),
+        }
+    }
+}
+
+impl fmt::Display for Block_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "label {}:", self.label)?;
+        for statement in self.statements.iter() {
+            writeln!(f, "    {}", statement)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Display for CopyableVal_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            CopyableVal_::U8(v) => write!(f, "{}u8", v),
+            CopyableVal_::U16(v) => write!(f, "{}u16", v),
+            CopyableVal_::U32(v) => write!(f, "{}u32", v),
+            CopyableVal_::U64(v) => write!(f, "{}", v),
+            CopyableVal_::U128(v) => write!(f, "{}u128", v),
+            CopyableVal_::U256(v) => write!(f, "{}u256", v),
+            CopyableVal_::Bool(v) => write!(f, "{}", v),
+            CopyableVal_::ByteArray(v) => write!(f, "0b{}", hex::encode(v)),
+            CopyableVal_::Address(v) => write!(f, "0x{}", hex::encode(v)),
+        }
+    }
+}
+
+impl fmt::Display for UnaryOp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", match self {
+            UnaryOp::Not => "!",
+        })
+    }
+}
+
+impl fmt::Display for BinOp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", match self {
+            BinOp::Add => "+",
+            BinOp::Sub => "-",
+            BinOp::Mul => "*",
+            BinOp::Mod => "%",
+            BinOp::Div => "/",
+            BinOp::BitOr => "|",
+            BinOp::BitAnd => "&",
+            BinOp::Xor => "^",
+            BinOp::Shl => "<<",
+            BinOp::Shr => ">>",
+
+            // Bool ops
+            BinOp::Or => "||",
+            BinOp::And => "&&",
+
+            // Compare Ops
+            BinOp::Eq => "==",
+            BinOp::Neq => "!=",
+            BinOp::Lt => "<",
+            BinOp::Gt => ">",
+            BinOp::Le => "<=",
+            BinOp::Ge => ">=",
+            BinOp::Subrange => "..",
+        })
+    }
+}
+
+impl fmt::Display for Exp_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Exp_::Dereference(e) => write!(f, "*({})", e),
+            Exp_::UnaryExp(o, e) => write!(f, "({}{})", o, e),
+            Exp_::BinopExp(e1, o, e2) => write!(f, "({} {} {})", o, e1, e2),
+            Exp_::Value(v) => write!(f, "{}", v),
+            Exp_::Pack(n, tys, s) => write!(
+                f,
+                "{}{}{{{}}}",
+                n,
+                format_type_actuals(tys),
+                s.iter().fold(String::new(), |acc, (field, op)| format!(
+                    "{} {} : {},",
+                    acc, field, op,
+                ))
+            ),
+            Exp_::Borrow {
+                is_mutable,
+                exp,
+                field,
+            } => write!(
+                f,
+                "&{}{}.{}",
+                if *is_mutable { "mut " } else { "" },
+                exp,
+                field
+            ),
+            Exp_::Move(v) => write!(f, "move({})", v),
+            Exp_::Copy(v) => write!(f, "copy({})", v),
+            Exp_::BorrowLocal(is_mutable, v) => {
+                write!(f, "&{}{}", if *is_mutable { "mut " } else { "" }, v)
+            },
+            Exp_::FunctionCall(func, e) => write!(f, "{}({})", func, e),
+            Exp_::ExprList(exps) => {
+                if exps.is_empty() {
+                    write!(f, "()")
+                } else {
+                    write!(f, "({})", intersperse(exps, ", "))
+                }
+            },
+        }
+    }
+}
+
+impl fmt::Display for Bytecode_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Bytecode_::Pop => write!(f, "Pop"),
+            Bytecode_::Ret => write!(f, "Ret"),
+            Bytecode_::Nop(None) => write!(f, "Nop"),
+            Bytecode_::Nop(Some(s)) => write!(f, "Nop {}", &s.0),
+            Bytecode_::BrTrue(lbl) => write!(f, "BrTrue {}", &lbl.0),
+            Bytecode_::BrFalse(lbl) => write!(f, "BrFalse {}", &lbl.0),
+            Bytecode_::Branch(lbl) => write!(f, "Branch {}", &lbl.0),
+            Bytecode_::LdU8(u) => write!(f, "LdU8 {}", u),
+            Bytecode_::LdU16(u) => write!(f, "LdU16 {}", u),
+            Bytecode_::LdU32(u) => write!(f, "LdU32 {}", u),
+            Bytecode_::LdU64(u) => write!(f, "LdU64 {}", u),
+            Bytecode_::LdU128(u) => write!(f, "LdU128 {}", u),
+            Bytecode_::LdU256(u) => write!(f, "LdU256 {}", u),
+            Bytecode_::CastU8 => write!(f, "CastU8"),
+            Bytecode_::CastU16 => write!(f, "CastU16"),
+            Bytecode_::CastU32 => write!(f, "CastU32"),
+            Bytecode_::CastU64 => write!(f, "CastU64"),
+            Bytecode_::CastU128 => write!(f, "CastU128"),
+            Bytecode_::CastU256 => write!(f, "CastU256"),
+            Bytecode_::LdTrue => write!(f, "LdTrue"),
+            Bytecode_::LdFalse => write!(f, "LdFalse"),
+            Bytecode_::LdConst(ty, v) => write!(f, "LdConst<{}> {}", ty, format_move_value(v)),
+            Bytecode_::LdNamedConst(n) => write!(f, "LdNamedConst {}", &n.0),
+            Bytecode_::CopyLoc(v) => write!(f, "CopyLoc {}", v),
+            Bytecode_::MoveLoc(v) => write!(f, "MoveLoc {}", v),
+            Bytecode_::StLoc(v) => write!(f, "StLoc {}", v),
+            Bytecode_::Call(m, n, tys) => write!(f, "Call {}.{}{}", m, n, format_type_actuals(tys)),
+            Bytecode_::Pack(n, tys) => write!(f, "Pack {}{}", n, format_type_actuals(tys)),
+            Bytecode_::Unpack(n, tys) => write!(f, "Unpack {}{}", n, format_type_actuals(tys)),
+            Bytecode_::ReadRef => write!(f, "ReadRef"),
+            Bytecode_::WriteRef => write!(f, "WriteRef"),
+            Bytecode_::FreezeRef => write!(f, "FreezeRef"),
+            Bytecode_::MutBorrowLoc(v) => write!(f, "MutBorrowLoc {}", v),
+            Bytecode_::ImmBorrowLoc(v) => write!(f, "ImmBorrowLoc {}", v),
+            Bytecode_::MutBorrowField(n, tys, field) => write!(
+                f,
+                "MutBorrowField {}{}.{}",
+                n,
+                format_type_actuals(tys),
+                field
+            ),
+            Bytecode_::ImmBorrowField(n, tys, field) => write!(
+                f,
+                "ImmBorrowField {}{}.{}",
+                n,
+                format_type_actuals(tys),
+                field
+            ),
+            Bytecode_::MutBorrowGlobal(n, tys) => {
+                write!(f, "MutBorrowGlobal {}{}", n, format_type_actuals(tys))
+            },
+            Bytecode_::ImmBorrowGlobal(n, tys) => {
+                write!(f, "ImmBorrowGlobal {}{}", n, format_type_actuals(tys))
+            },
+            Bytecode_::Add => write!(f, "Add"),
+            Bytecode_::Sub => write!(f, "Sub"),
+            Bytecode_::Mul => write!(f, "Mul"),
+            Bytecode_::Mod => write!(f, "Mod"),
+            Bytecode_::Div => write!(f, "Div"),
+            Bytecode_::BitOr => write!(f, "BitOr"),
+            Bytecode_::BitAnd => write!(f, "BitAnd"),
+            Bytecode_::Xor => write!(f, "Xor"),
+            Bytecode_::Or => write!(f, "Or"),
+            Bytecode_::And => write!(f, "And"),
+            Bytecode_::Not => write!(f, "Not"),
+            Bytecode_::Eq => write!(f, "Eq"),
+            Bytecode_::Neq => write!(f, "Neq"),
+            Bytecode_::Lt => write!(f, "Lt"),
+            Bytecode_::Gt => write!(f, "Gt"),
+            Bytecode_::Le => write!(f, "Le"),
+            Bytecode_::Ge => write!(f, "Ge"),
+            Bytecode_::Abort => write!(f, "Abort"),
+            Bytecode_::Exists(n, tys) => write!(f, "Exists {}{}", n, format_type_actuals(tys)),
+            Bytecode_::MoveFrom(n, tys) => write!(f, "MoveFrom {}{}", n, format_type_actuals(tys)),
+            Bytecode_::MoveTo(n, tys) => write!(f, "MoveTo {}{}", n, format_type_actuals(tys)),
+            Bytecode_::Shl => write!(f, "Shl"),
+            Bytecode_::Shr => write!(f, "Shr"),
+            Bytecode_::VecPack(ty, n) => write!(f, "VecPack {} {}", ty, n),
+            Bytecode_::VecLen(ty) => write!(f, "VecLen {}", ty),
+            Bytecode_::VecImmBorrow(ty) => write!(f, "VecImmBorrow {}", ty),
+            Bytecode_::VecMutBorrow(ty) => write!(f, "VecMutBorrow {}", ty),
+            Bytecode_::VecPushBack(ty) => write!(f, "VecPushBack {}", ty),
+            Bytecode_::VecPopBack(ty) => write!(f, "VecPopBack {}", ty),
+            Bytecode_::VecUnpack(ty, n) => write!(f, "VecUnpack {} {}", ty, n),
+            Bytecode_::VecSwap(ty) => write!(f, "VecSwap {}", ty),
+        }
+    }
+}
+
+fn format_move_value(v: &MoveValue) -> String {
+    match v {
+        MoveValue::U8(u) => format!("{}u8", u),
+        MoveValue::U64(u) => format!("{}u64", u),
+        MoveValue::U128(u) => format!("{}u128", u),
+        MoveValue::Bool(true) => "true".to_owned(),
+        MoveValue::Bool(false) => "false".to_owned(),
+        MoveValue::Address(a) => format!("0x{}", a.short_str_lossless()),
+        MoveValue::Vector(v) => {
+            let items = v
+                .iter()
+                .map(format_move_value)
+                .collect::<Vec<_>>()
+                .join(", ");
+            format!("vector[{}]", items)
+        },
+        MoveValue::Struct(_) | MoveValue::Signer(_) => {
+            panic!("Should be inexpressible as a constant")
+        },
+        MoveValue::U16(u) => format!("{}u16", u),
+        MoveValue::U32(u) => format!("{}u32", u),
+        MoveValue::U256(u) => format!("{}u256", u),
+    }
+}
diff --git a/vendors/move/crates/move-ir/types/src/lib.rs b/vendors/move/crates/move-ir/types/src/lib.rs
new file mode 100644
index 000000000..a64dfadee
--- /dev/null
+++ b/vendors/move/crates/move-ir/types/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Base types for the Move IR.
+
+pub mod ast;
+pub mod location;
+pub mod spec_language_ast;
diff --git a/vendors/move/crates/move-ir/types/src/location.rs b/vendors/move/crates/move-ir/types/src/location.rs
new file mode 100644
index 000000000..f97cd2e75
--- /dev/null
+++ b/vendors/move/crates/move-ir/types/src/location.rs
@@ -0,0 +1,169 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_command_line_common::files::FileHash;
+use serde::{Deserialize, Serialize};
+use std::{
+    cmp::Ordering,
+    fmt,
+    hash::{Hash, Hasher},
+    ops::Range,
+};
+
+//**************************************************************************************************
+// Loc
+//**************************************************************************************************
+
+/// An index into a file.
+/// Much like the `codespan` crate, a `u32` is used here to for space efficiency.
+/// However, this assumes no file is larger than 4GB, so this might become a `usize` in the future
+/// if the space concerns turn out to not be an issue.
+pub type ByteIndex = u32;
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize, Hash)]
+/// The `Loc` struct is used to define a location in a file; where the file is considered to be a
+/// vector of bytes, and the range for a given `Loc` is defined by start and end index into that
+/// byte vector
+pub struct Loc {
+    /// The file the location points to
+    file_hash: FileHash,
+    /// The start byte index into file
+    start: ByteIndex,
+    /// The end byte index into file
+    end: ByteIndex,
+}
+
+impl Loc {
+    pub fn new(file_hash: FileHash, start: ByteIndex, end: ByteIndex) -> Loc {
+        Loc {
+            file_hash,
+            start,
+            end,
+        }
+    }
+
+    pub fn file_hash(self) -> FileHash {
+        self.file_hash
+    }
+
+    pub fn start(self) -> ByteIndex {
+        self.start
+    }
+
+    pub fn end(self) -> ByteIndex {
+        self.end
+    }
+
+    pub fn usize_range(self) -> Range<usize> {
+        Range {
+            start: self.start as usize,
+            end: self.end as usize,
+        }
+    }
+}
+
+impl PartialOrd for Loc {
+    fn partial_cmp(&self, other: &Loc) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Loc {
+    fn cmp(&self, other: &Loc) -> Ordering {
+        let file_ord = self.file_hash.cmp(&other.file_hash);
+        if file_ord != Ordering::Equal {
+            return file_ord;
+        }
+
+        let start_ord = self.start.cmp(&other.start);
+        if start_ord != Ordering::Equal {
+            return start_ord;
+        }
+
+        self.end.cmp(&other.end)
+    }
+}
+
+//**************************************************************************************************
+// Spanned
+//**************************************************************************************************
+
+#[derive(Copy, Clone)]
+pub struct Spanned<T> {
+    pub loc: Loc,
+    pub value: T,
+}
+
+impl<T> Spanned<T> {
+    pub fn new(loc: Loc, value: T) -> Spanned<T> {
+        Spanned { loc, value }
+    }
+
+    pub fn unsafe_no_loc(value: T) -> Spanned<T> {
+        Spanned {
+            value,
+            loc: Loc::new(FileHash::empty(), 0, 0),
+        }
+    }
+}
+
+impl<T: PartialEq> PartialEq for Spanned<T> {
+    fn eq(&self, other: &Spanned<T>) -> bool {
+        self.value == other.value
+    }
+}
+
+impl<T: Eq> Eq for Spanned<T> {}
+
+impl<T: Hash> Hash for Spanned<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.value.hash(state);
+    }
+}
+
+impl<T: PartialOrd> PartialOrd for Spanned<T> {
+    fn partial_cmp(&self, other: &Spanned<T>) -> Option<Ordering> {
+        self.value.partial_cmp(&other.value)
+    }
+}
+
+impl<T: Ord> Ord for Spanned<T> {
+    fn cmp(&self, other: &Spanned<T>) -> Ordering {
+        self.value.cmp(&other.value)
+    }
+}
+
+impl<T: fmt::Display> fmt::Display for Spanned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", &self.value)
+    }
+}
+
+impl<T: fmt::Debug> fmt::Debug for Spanned<T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", &self.value)
+    }
+}
+
+/// Function used to have nearly tuple-like syntax for creating a Spanned
+pub const fn sp<T>(loc: Loc, value: T) -> Spanned<T> {
+    Spanned { loc, value }
+}
+
+/// Macro used to create a tuple-like pattern match for Spanned
+#[macro_export]
+macro_rules! sp {
+    (_, $value:pat) => {
+        $crate::location::Spanned { value: $value, .. }
+    };
+    ($loc:pat,_) => {
+        $crate::location::Spanned { loc: $loc, .. }
+    };
+    ($loc:pat, $value:pat) => {
+        $crate::location::Spanned {
+            loc: $loc,
+            value: $value,
+        }
+    };
+}
diff --git a/vendors/move/crates/move-ir/types/src/spec_language_ast.rs b/vendors/move/crates/move-ir/types/src/spec_language_ast.rs
new file mode 100644
index 000000000..3a67860b1
--- /dev/null
+++ b/vendors/move/crates/move-ir/types/src/spec_language_ast.rs
@@ -0,0 +1,113 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    ast::{BinOp, CopyableVal_, Field_, QualifiedStructIdent, Type},
+    location::*,
+};
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::Symbol;
+
+/// AST for the Move Prover specification language.
+
+// .foo or [x + 1]
+#[derive(PartialEq, Debug, Clone)]
+pub enum FieldOrIndex {
+    Field(Field_),
+    Index(SpecExp),
+}
+
+/// A location that can store a value
+#[derive(PartialEq, Debug, Clone)]
+pub enum StorageLocation {
+    /// A formal of the current procedure
+    Formal(Symbol),
+    /// A resource of type `type_` stored in global storage at `address`
+    GlobalResource {
+        type_: QualifiedStructIdent,
+        type_actuals: Vec<Type>,
+        address: Box<StorageLocation>,
+    },
+    /// An access path rooted at `base` with nonempty offsets in `fields_or_indices`
+    AccessPath {
+        base: Box<StorageLocation>,
+        fields_and_indices: Vec<FieldOrIndex>,
+    },
+    /// Account address constant
+    Address(AccountAddress),
+    /// The ith return value of the current procedure
+    Ret(u8),
+    // TODO: useful constants like U64_MAX
+}
+
+/// An expression in the specification language
+#[derive(PartialEq, Debug, Clone)]
+pub enum SpecExp {
+    /// A Move constant
+    Constant(CopyableVal_),
+    /// A spec language storage location
+    StorageLocation(StorageLocation),
+    /// Lifting the Move exists operator to a storage location
+    GlobalExists {
+        type_: QualifiedStructIdent,
+        type_actuals: Vec<Type>,
+        address: StorageLocation,
+    },
+    /// Dereference of a storage location (written *s)
+    Dereference(StorageLocation),
+    /// Reference to a storage location (written &s)
+    Reference(StorageLocation),
+    /// Negation of a boolean expression (written !e),
+    Not(Box<SpecExp>),
+    /// Binary operators also suported by Move
+    Binop(Box<SpecExp>, BinOp, Box<SpecExp>),
+    /// Update expr (i := 1 inside [])
+    Update(Box<SpecExp>, Box<SpecExp>),
+    /// Value of expression evaluated in the state before function enter.
+    Old(Box<SpecExp>),
+    /// Call to a helper function.
+    Call(Symbol, Vec<SpecExp>),
+}
+
+/// A specification directive to be verified
+#[derive(PartialEq, Debug, Clone)]
+pub enum Condition_ {
+    /// Postconditions
+    Ensures(SpecExp),
+    /// Preconditions
+    Requires(SpecExp),
+    /// If the given expression is true, the procedure *must* terminate in an aborting state
+    AbortsIf(SpecExp),
+    /// If the given expression is true, the procedure *must* terminate in a succeeding state
+    SucceedsIf(SpecExp),
+}
+
+/// Specification directive with span.
+pub type Condition = Spanned<Condition_>;
+
+/// An invariant over a resource.
+#[derive(PartialEq, Debug, Clone)]
+pub struct Invariant_ {
+    /// A free string (for now) which specifies the function of this invariant.
+    pub modifier: Option<Symbol>,
+
+    /// An optional synthetic variable to which the below expression is assigned to.
+    pub target: Option<Symbol>,
+
+    /// A specification expression.
+    pub exp: SpecExp,
+}
+
+/// Invariant with span.
+pub type Invariant = Spanned<Invariant_>;
+
+/// A synthetic variable definition.
+#[derive(PartialEq, Debug, Clone)]
+pub struct SyntheticDefinition_ {
+    pub name: Symbol,
+    pub type_: Type,
+}
+
+/// Synthetic with span.
+pub type SyntheticDefinition = Spanned<SyntheticDefinition_>;
diff --git a/vendors/move/crates/move-model/Cargo.toml b/vendors/move/crates/move-model/Cargo.toml
new file mode 100644
index 000000000..256f0efa7
--- /dev/null
+++ b/vendors/move/crates/move-model/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "move-model"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# diem dependencies
+move-compiler.workspace = true
+move-binary-format.workspace = true
+move-bytecode-source-map.workspace = true
+move-ir-types.workspace = true
+move-core-types.workspace = true
+move-disassembler.workspace = true
+move-command-line-common.workspace = true
+move-symbol-pool.workspace = true
+
+# external dependencies
+codespan.workspace = true
+codespan-reporting.workspace = true
+internment.workspace = true
+itertools.workspace = true
+log.workspace = true
+num.workspace = true
+once_cell.workspace = true
+regex.workspace = true
+anyhow = "1.0.71"
+serde.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-prover-test-utils.workspace = true
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/move-model/src/ast.rs b/vendors/move/crates/move-model/src/ast.rs
new file mode 100644
index 000000000..e84105883
--- /dev/null
+++ b/vendors/move/crates/move-model/src/ast.rs
@@ -0,0 +1,1497 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Contains AST definitions for the specification language fragments of the Move language.
+//! Note that in this crate, specs are represented in AST form, whereas code is represented
+//! as bytecodes. Therefore we do not need an AST for the Move code itself.
+
+use std::{
+    borrow::Borrow,
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, HashSet},
+    fmt,
+    fmt::{Debug, Error, Formatter},
+    hash::Hash,
+    ops::Deref,
+};
+
+use internment::LocalIntern;
+use itertools::Itertools;
+use num::{BigInt, BigUint, Num};
+use once_cell::sync::Lazy;
+
+use move_binary_format::file_format::CodeOffset;
+
+use crate::{
+    exp_rewriter::ExpRewriterFunctions,
+    model::{
+        EnvDisplay, FieldId, FunId, FunctionVisibility, GlobalEnv, GlobalId, Loc, ModuleId, NodeId,
+        QualifiedId, QualifiedInstId, SchemaId, SpecFunId, StructId, TypeParameter,
+        GHOST_MEMORY_PREFIX,
+    },
+    symbol::{Symbol, SymbolPool},
+    ty::{Type, TypeDisplayContext},
+};
+
+const MAX_ADDR_STRING: &str = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
+
+// =================================================================================================
+/// # Declarations
+
+#[derive(Debug)]
+pub struct SpecVarDecl {
+    pub loc: Loc,
+    pub name: Symbol,
+    pub type_params: Vec<(Symbol, Type)>,
+    pub type_: Type,
+    pub init: Option<Exp>,
+}
+
+#[derive(Clone, Debug)]
+pub struct SpecFunDecl {
+    pub loc: Loc,
+    pub name: Symbol,
+    pub type_params: Vec<(Symbol, Type)>,
+    pub params: Vec<(Symbol, Type)>,
+    pub context_params: Option<Vec<(Symbol, bool)>>,
+    pub result_type: Type,
+    pub used_memory: BTreeSet<QualifiedInstId<StructId>>,
+    pub uninterpreted: bool,
+    pub is_move_fun: bool,
+    pub is_native: bool,
+    pub body: Option<Exp>,
+    pub callees: BTreeSet<QualifiedId<SpecFunId>>,
+    pub is_recursive: RefCell<Option<bool>>,
+}
+
+// =================================================================================================
+/// # Attributes
+
+#[derive(Debug, Clone)]
+pub enum AttributeValue {
+    Value(NodeId, Value),
+    Name(NodeId, Option<ModuleName>, Symbol),
+}
+
+#[derive(Debug, Clone)]
+pub enum Attribute {
+    Apply(NodeId, Symbol, Vec<Attribute>),
+    Assign(NodeId, Symbol, AttributeValue),
+}
+
+// =================================================================================================
+/// # Conditions
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum ConditionKind {
+    LetPost(Symbol),
+    LetPre(Symbol),
+    Assert,
+    Assume,
+    Decreases,
+    AbortsIf,
+    AbortsWith,
+    SucceedsIf,
+    Modifies,
+    Emits,
+    Ensures,
+    Requires,
+    StructInvariant,
+    FunctionInvariant,
+    LoopInvariant,
+    GlobalInvariant(Vec<Symbol>),
+    GlobalInvariantUpdate(Vec<Symbol>),
+    SchemaInvariant,
+    Axiom(Vec<Symbol>),
+    Update,
+}
+
+impl ConditionKind {
+    /// Returns true of this condition allows the `old(..)` expression.
+    pub fn allows_old(&self) -> bool {
+        use ConditionKind::*;
+        matches!(
+            self,
+            LetPost(..)
+                | Assert
+                | Assume
+                | Emits
+                | Ensures
+                | LoopInvariant
+                | GlobalInvariantUpdate(..)
+        )
+    }
+
+    /// Returns true if this condition is allowed on a function declaration.
+    pub fn allowed_on_fun_decl(&self, _visibility: FunctionVisibility) -> bool {
+        use ConditionKind::*;
+        matches!(
+            self,
+            Requires
+                | AbortsIf
+                | AbortsWith
+                | SucceedsIf
+                | Emits
+                | Ensures
+                | Modifies
+                | FunctionInvariant
+                | LetPost(..)
+                | LetPre(..)
+                | Update
+        )
+    }
+
+    /// Returns true if this condition is allowed in a function body.
+    pub fn allowed_on_fun_impl(&self) -> bool {
+        use ConditionKind::*;
+        matches!(
+            self,
+            Assert | Assume | Decreases | LoopInvariant | LetPost(..) | LetPre(..) | Update
+        )
+    }
+
+    /// Returns true if this condition is allowed on a struct.
+    pub fn allowed_on_struct(&self) -> bool {
+        use ConditionKind::*;
+        matches!(self, StructInvariant)
+    }
+
+    /// Returns true if this condition is allowed on a module.
+    pub fn allowed_on_module(&self) -> bool {
+        use ConditionKind::*;
+        matches!(
+            self,
+            GlobalInvariant(..) | GlobalInvariantUpdate(..) | Axiom(..)
+        )
+    }
+}
+
+impl std::fmt::Display for ConditionKind {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        fn display_ty_params(f: &mut Formatter<'_>, ty_params: &[Symbol]) -> std::fmt::Result {
+            if !ty_params.is_empty() {
+                write!(
+                    f,
+                    "<{}>",
+                    (0..ty_params.len()).map(|i| format!("#{}", i)).join(", ")
+                )?;
+            }
+            Ok(())
+        }
+
+        use ConditionKind::*;
+        match self {
+            LetPost(sym) => write!(f, "let({:?})", sym),
+            LetPre(sym) => write!(f, "let old({:?})", sym),
+            Assert => write!(f, "assert"),
+            Assume => write!(f, "assume"),
+            Decreases => write!(f, "decreases"),
+            AbortsIf => write!(f, "aborts_if"),
+            AbortsWith => write!(f, "aborts_with"),
+            SucceedsIf => write!(f, "succeeds_if"),
+            Modifies => write!(f, "modifies"),
+            Emits => write!(f, "emits"),
+            Ensures => write!(f, "ensures"),
+            Requires => write!(f, "requires"),
+            StructInvariant | FunctionInvariant | LoopInvariant => write!(f, "invariant"),
+            GlobalInvariant(ty_params) => {
+                write!(f, "invariant")?;
+                display_ty_params(f, ty_params)
+            }
+            GlobalInvariantUpdate(ty_params) => {
+                write!(f, "invariant")?;
+                display_ty_params(f, ty_params)?;
+                write!(f, " update")
+            }
+            SchemaInvariant => {
+                write!(f, "invariant")
+            }
+            Axiom(ty_params) => {
+                write!(f, "axiom")?;
+                display_ty_params(f, ty_params)
+            }
+            Update => {
+                write!(f, "update")
+            }
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Clone, Copy, Eq, Hash)]
+pub enum QuantKind {
+    Forall,
+    Exists,
+    Choose,
+    ChooseMin,
+}
+
+impl QuantKind {
+    /// Returns true of this is a choice like Some or Min.
+    pub fn is_choice(self) -> bool {
+        matches!(self, QuantKind::Choose | QuantKind::ChooseMin)
+    }
+}
+
+impl std::fmt::Display for QuantKind {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        use QuantKind::*;
+        match self {
+            Forall => write!(f, "forall"),
+            Exists => write!(f, "exists"),
+            Choose => write!(f, "choose"),
+            ChooseMin => write!(f, "choose min"),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Condition {
+    pub loc: Loc,
+    pub kind: ConditionKind,
+    pub properties: PropertyBag,
+    pub exp: Exp,
+    pub additional_exps: Vec<Exp>,
+}
+
+impl Condition {
+    /// Return all expressions in the condition, the primary one and the additional ones.
+    pub fn all_exps(&self) -> impl Iterator<Item = &Exp> {
+        std::iter::once(&self.exp).chain(self.additional_exps.iter())
+    }
+}
+
+// =================================================================================================
+/// # Specifications
+
+/// A set of properties stemming from pragmas.
+pub type PropertyBag = BTreeMap<Symbol, PropertyValue>;
+
+/// The value of a property.
+#[derive(Debug, Clone)]
+pub enum PropertyValue {
+    Value(Value),
+    Symbol(Symbol),
+    QualifiedSymbol(QualifiedSymbol),
+}
+
+/// Specification and properties associated with a language item.
+#[derive(Debug, Clone, Default)]
+pub struct Spec {
+    // The location of this specification, if available.
+    pub loc: Option<Loc>,
+    // The set of conditions associated with this item.
+    pub conditions: Vec<Condition>,
+    // Any pragma properties associated with this item.
+    pub properties: PropertyBag,
+    // If this is a function, specs associated with individual code points.
+    pub on_impl: BTreeMap<CodeOffset, Spec>,
+}
+
+impl Spec {
+    pub fn has_conditions(&self) -> bool {
+        !self.conditions.is_empty()
+    }
+
+    pub fn filter<P>(&self, pred: P) -> impl Iterator<Item = &Condition>
+    where
+        P: FnMut(&&Condition) -> bool,
+    {
+        self.conditions.iter().filter(pred)
+    }
+
+    pub fn filter_kind(&self, kind: ConditionKind) -> impl Iterator<Item = &Condition> {
+        self.filter(move |c| c.kind == kind)
+    }
+
+    pub fn filter_kind_axiom(&self) -> impl Iterator<Item = &Condition> {
+        self.filter(move |c| matches!(c.kind, ConditionKind::Axiom(..)))
+    }
+
+    pub fn any<P>(&self, pred: P) -> bool
+    where
+        P: FnMut(&Condition) -> bool,
+    {
+        self.conditions.iter().any(pred)
+    }
+
+    pub fn any_kind(&self, kind: ConditionKind) -> bool {
+        self.any(move |c| c.kind == kind)
+    }
+}
+
+/// Information about a specification block in the source. This is used for documentation
+/// generation. In the object model, the original locations and documentation of spec blocks
+/// is reduced to conditions on a `Spec`, with expansion of schemas. This data structure
+/// allows us to discover the original spec blocks and their content.
+#[derive(Debug, Clone)]
+pub struct SpecBlockInfo {
+    /// The location of the entire spec block.
+    pub loc: Loc,
+    /// The target of the spec block.
+    pub target: SpecBlockTarget,
+    /// The locations of all members of the spec block.
+    pub member_locs: Vec<Loc>,
+}
+
+/// Describes the target of a spec block.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum SpecBlockTarget {
+    Module,
+    Struct(ModuleId, StructId),
+    Function(ModuleId, FunId),
+    FunctionCode(ModuleId, FunId, usize),
+    Schema(ModuleId, SchemaId, Vec<TypeParameter>),
+}
+
+/// Describes a global invariant.
+#[derive(Debug, Clone)]
+pub struct GlobalInvariant {
+    pub id: GlobalId,
+    pub loc: Loc,
+    pub kind: ConditionKind,
+    pub mem_usage: BTreeSet<QualifiedInstId<StructId>>,
+    pub declaring_module: ModuleId,
+    pub properties: PropertyBag,
+    pub cond: Exp,
+}
+
+// =================================================================================================
+/// # Expressions
+
+/// A type alias for temporaries. Those are locals used in bytecode.
+pub type TempIndex = usize;
+
+/// The type of expression data.
+///
+/// Expression layout follows the following design principles:
+///
+/// - We try to keep the number of expression variants minimal, for easier treatment in
+///   generic traversals. Builtin and user functions are abstracted into a general
+///   `Call(.., operation, args)` construct.
+/// - Each expression has a unique node id assigned. This id allows to build attribute tables
+///   for additional information, like expression type and source location. The id is globally
+///   unique.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum ExpData {
+    /// Represents an invalid expression. This is used as a stub for algorithms which
+    /// generate expressions but can fail with multiple errors, like a translator from
+    /// some other source into expressions. Consumers of expressions should assume this
+    /// variant is not present and can panic when seeing it.
+    Invalid(NodeId),
+    /// Represents a value.
+    Value(NodeId, Value),
+    /// Represents a reference to a local variable introduced by a specification construct,
+    /// e.g. a quantifier.
+    LocalVar(NodeId, Symbol),
+    /// Represents a reference to a temporary used in bytecode.
+    Temporary(NodeId, TempIndex),
+    /// Represents a call to an operation. The `Operation` enum covers all builtin functions
+    /// (including operators, constants, ...) as well as user functions.
+    Call(NodeId, Operation, Vec<Exp>),
+    /// Represents an invocation of a function value, as a lambda.
+    Invoke(NodeId, Exp, Vec<Exp>),
+    /// Represents a lambda.
+    Lambda(NodeId, Vec<LocalVarDecl>, Exp),
+    /// Represents a quantified formula over multiple variables and ranges.
+    Quant(
+        NodeId,
+        QuantKind,
+        /// Ranges
+        Vec<(LocalVarDecl, Exp)>,
+        /// Triggers
+        Vec<Vec<Exp>>,
+        /// Optional `where` clause
+        Option<Exp>,
+        /// Body
+        Exp,
+    ),
+    /// Represents a block which contains a set of variable bindings and an expression
+    /// for which those are defined.
+    Block(NodeId, Vec<LocalVarDecl>, Exp),
+    /// Represents a conditional.
+    IfElse(NodeId, Exp, Exp, Exp),
+}
+
+/// An internalized expression. We do use a wrapper around the underlying internement implementation
+/// variant to ensure a unique API (LocalIntern and ArcIntern e.g. differ in the presence of
+/// the Copy trait, and by wrapping we effectively remove the Copy from LocalIntern).
+#[derive(PartialEq, Eq, Hash, Clone)]
+pub struct Exp {
+    data: LocalIntern<ExpData>,
+}
+
+impl AsRef<ExpData> for Exp {
+    fn as_ref(&self) -> &ExpData {
+        self.data.as_ref()
+    }
+}
+
+impl Borrow<ExpData> for Exp {
+    fn borrow(&self) -> &ExpData {
+        self.as_ref()
+    }
+}
+
+impl Deref for Exp {
+    type Target = ExpData;
+    fn deref(&self) -> &Self::Target {
+        self.as_ref()
+    }
+}
+
+impl Debug for Exp {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self.data)
+    }
+}
+
+impl From<ExpData> for Exp {
+    fn from(data: ExpData) -> Self {
+        Exp {
+            data: LocalIntern::new(data),
+        }
+    }
+}
+
+impl From<Exp> for ExpData {
+    /// Takes an expression and returns expression data.
+    fn from(exp: Exp) -> ExpData {
+        exp.as_ref().to_owned()
+    }
+}
+
+impl ExpData {
+    /// Version of `into` which does not require type annotations.
+    pub fn into_exp(self) -> Exp {
+        self.into()
+    }
+
+    pub fn ptr_eq(e1: &Exp, e2: &Exp) -> bool {
+        // For the internement based implementations, we can just test equality. Other
+        // representations may need different measures.
+        e1 == e2
+    }
+
+    pub fn node_id(&self) -> NodeId {
+        use ExpData::*;
+        match self {
+            Invalid(node_id)
+            | Value(node_id, ..)
+            | LocalVar(node_id, ..)
+            | Temporary(node_id, ..)
+            | Call(node_id, ..)
+            | Invoke(node_id, ..)
+            | Lambda(node_id, ..)
+            | Quant(node_id, ..)
+            | Block(node_id, ..)
+            | IfElse(node_id, ..) => *node_id,
+        }
+    }
+
+    pub fn call_args(&self) -> &[Exp] {
+        match self {
+            ExpData::Call(_, _, args) => args,
+            _ => panic!("function must be called on Exp::Call(...)"),
+        }
+    }
+
+    pub fn node_ids(&self) -> Vec<NodeId> {
+        let mut ids = vec![];
+        self.visit(&mut |e| {
+            ids.push(e.node_id());
+        });
+        ids
+    }
+
+    /// Returns the free local variables, inclusive their types, used in this expression.
+    /// Result is ordered by occurrence.
+    pub fn free_vars(&self, env: &GlobalEnv) -> Vec<(Symbol, Type)> {
+        let mut vars = vec![];
+        let mut shadowed = vec![]; // Should be multiset but don't have this
+        let mut visitor = |up: bool, e: &ExpData| {
+            use ExpData::*;
+            let decls = match e {
+                Lambda(_, decls, _) | Block(_, decls, _) => {
+                    decls.iter().map(|d| d.name).collect_vec()
+                }
+                Quant(_, _, decls, ..) => decls.iter().map(|(d, _)| d.name).collect_vec(),
+                _ => vec![],
+            };
+            if !up {
+                shadowed.extend(decls.iter());
+            } else {
+                for sym in decls {
+                    if let Some(pos) = shadowed.iter().position(|s| *s == sym) {
+                        // Remove one instance of this symbol. The same symbol can appear
+                        // multiple times in `shadowed`.
+                        shadowed.remove(pos);
+                    }
+                }
+                if let LocalVar(id, sym) = e {
+                    if !shadowed.contains(sym) && !vars.iter().any(|(s, _)| s == sym) {
+                        vars.push((*sym, env.get_node_type(*id)));
+                    }
+                }
+            }
+        };
+        self.visit_pre_post(&mut visitor);
+        vars
+    }
+
+    /// Returns the free local variables with node id in this expression
+    pub fn free_local_vars_with_node_id(&self) -> BTreeMap<Symbol, NodeId> {
+        let mut vars = BTreeMap::new();
+        let mut visitor = |up: bool, e: &ExpData| {
+            use ExpData::*;
+            if up {
+                if let LocalVar(id, sym) = e {
+                    if !vars.iter().any(|(s, _)| s == sym) {
+                        vars.insert(*sym, *id);
+                    }
+                }
+            }
+        };
+        self.visit_pre_post(&mut visitor);
+        vars
+    }
+
+    /// Returns the used memory of this expression.
+    pub fn used_memory(
+        &self,
+        env: &GlobalEnv,
+    ) -> BTreeSet<(QualifiedInstId<StructId>, Option<MemoryLabel>)> {
+        let mut result = BTreeSet::new();
+        let mut visitor = |e: &ExpData| {
+            use ExpData::*;
+            use Operation::*;
+            match e {
+                Call(id, Exists(label), _) | Call(id, Global(label), _) => {
+                    let inst = &env.get_node_instantiation(*id);
+                    let (mid, sid, sinst) = inst[0].require_struct();
+                    result.insert((mid.qualified_inst(sid, sinst.to_owned()), label.to_owned()));
+                }
+                Call(id, Function(mid, fid, labels), _) => {
+                    let inst = &env.get_node_instantiation(*id);
+                    let module = env.get_module(*mid);
+                    let fun = module.get_spec_fun(*fid);
+                    for (i, mem) in fun.used_memory.iter().enumerate() {
+                        result.insert((
+                            mem.to_owned().instantiate(inst),
+                            labels.as_ref().map(|l| l[i]),
+                        ));
+                    }
+                }
+                _ => {}
+            }
+        };
+        self.visit(&mut visitor);
+        result
+    }
+
+    /// Returns the temporaries used in this expression. Result is ordered by occurrence.
+    pub fn used_temporaries(&self, env: &GlobalEnv) -> Vec<(TempIndex, Type)> {
+        let mut temps = vec![];
+        let mut visitor = |e: &ExpData| {
+            if let ExpData::Temporary(id, idx) = e {
+                if !temps.iter().any(|(i, _)| i == idx) {
+                    temps.push((*idx, env.get_node_type(*id)));
+                }
+            }
+        };
+        self.visit(&mut visitor);
+        temps
+    }
+
+    /// Visits expression, calling visitor on each sub-expression, depth first.
+    pub fn visit<F>(&self, visitor: &mut F)
+    where
+        F: FnMut(&ExpData),
+    {
+        self.visit_pre_post(&mut |up, e| {
+            if up {
+                visitor(e);
+            }
+        });
+    }
+
+    pub fn any<P>(&self, predicate: &mut P) -> bool
+    where
+        P: FnMut(&ExpData) -> bool,
+    {
+        let mut found = false;
+        self.visit(&mut |e| {
+            if !found {
+                // This still continues to visit after a match is found, may want to
+                // optimize if it becomes an issue.
+                found = predicate(e)
+            }
+        });
+        found
+    }
+
+    /// Visits expression, calling visitor on each sub-expression. `visitor(false, ..)` will
+    /// be called before descending into expression, and `visitor(true, ..)` after. Notice
+    /// we use one function instead of two so a lambda can be passed which encapsulates mutable
+    /// references.
+    pub fn visit_pre_post<F>(&self, visitor: &mut F)
+    where
+        F: FnMut(bool, &ExpData),
+    {
+        use ExpData::*;
+        visitor(false, self);
+        match self {
+            Call(_, _, args) => {
+                for exp in args {
+                    exp.visit_pre_post(visitor);
+                }
+            }
+            Invoke(_, target, args) => {
+                target.visit_pre_post(visitor);
+                for exp in args {
+                    exp.visit_pre_post(visitor);
+                }
+            }
+            Lambda(_, _, body) => body.visit_pre_post(visitor),
+            Quant(_, _, ranges, triggers, condition, body) => {
+                for (decl, range) in ranges {
+                    if let Some(binding) = &decl.binding {
+                        binding.visit_pre_post(visitor);
+                    }
+                    range.visit_pre_post(visitor);
+                }
+                for trigger in triggers {
+                    for e in trigger {
+                        e.visit_pre_post(visitor);
+                    }
+                }
+                if let Some(exp) = condition {
+                    exp.visit_pre_post(visitor);
+                }
+                body.visit_pre_post(visitor);
+            }
+            Block(_, decls, body) => {
+                for decl in decls {
+                    if let Some(def) = &decl.binding {
+                        def.visit_pre_post(visitor);
+                    }
+                }
+                body.visit_pre_post(visitor)
+            }
+            IfElse(_, c, t, e) => {
+                c.visit_pre_post(visitor);
+                t.visit_pre_post(visitor);
+                e.visit_pre_post(visitor);
+            }
+            // Explicitly list all enum variants
+            Value(..) | LocalVar(..) | Temporary(..) | Invalid(..) => {}
+        }
+        visitor(true, self);
+    }
+
+    /// Rewrites this expression and sub-expression based on the rewriter function. The
+    /// function returns `Ok(e)` if the expression is rewritten, and passes back ownership
+    /// using `Err(e)` if the expression stays unchanged. This function stops traversing
+    /// on `Ok(e)` and descents into sub-expressions on `Err(e)`.
+    pub fn rewrite<F>(exp: Exp, exp_rewriter: &mut F) -> Exp
+    where
+        F: FnMut(Exp) -> Result<Exp, Exp>,
+    {
+        ExpRewriter {
+            exp_rewriter,
+            node_rewriter: &mut |_| None,
+        }
+        .rewrite_exp(exp)
+    }
+
+    /// Rewrites the node ids in the expression. This is used to rewrite types of
+    /// expressions.
+    pub fn rewrite_node_id<F>(exp: Exp, node_rewriter: &mut F) -> Exp
+    where
+        F: FnMut(NodeId) -> Option<NodeId>,
+    {
+        ExpRewriter {
+            exp_rewriter: &mut Err,
+            node_rewriter,
+        }
+        .rewrite_exp(exp)
+    }
+
+    /// Rewrites the expression and for unchanged sub-expressions, the node ids in the expression
+    pub fn rewrite_exp_and_node_id<F, G>(
+        exp: Exp,
+        exp_rewriter: &mut F,
+        node_rewriter: &mut G,
+    ) -> Exp
+    where
+        F: FnMut(Exp) -> Result<Exp, Exp>,
+        G: FnMut(NodeId) -> Option<NodeId>,
+    {
+        ExpRewriter {
+            exp_rewriter,
+            node_rewriter,
+        }
+        .rewrite_exp(exp)
+    }
+
+    /// A function which can be used for `Exp::rewrite_node_id` to instantiate types in
+    /// an expression based on a type parameter instantiation.
+    pub fn instantiate_node(env: &GlobalEnv, id: NodeId, targs: &[Type]) -> Option<NodeId> {
+        if targs.is_empty() {
+            // shortcut
+            return None;
+        }
+        let node_ty = env.get_node_type(id);
+        let new_node_ty = node_ty.instantiate(targs);
+        let node_inst = env.get_node_instantiation_opt(id);
+        let new_node_inst = node_inst.clone().map(|i| Type::instantiate_vec(i, targs));
+        if node_ty != new_node_ty || node_inst != new_node_inst {
+            let loc = env.get_node_loc(id);
+            let new_id = env.new_node(loc, new_node_ty);
+            if let Some(inst) = new_node_inst {
+                env.set_node_instantiation(new_id, inst);
+            }
+            Some(new_id)
+        } else {
+            None
+        }
+    }
+
+    /// Returns the set of module ids used by this expression.
+    pub fn module_usage(&self, usage: &mut BTreeSet<ModuleId>) {
+        self.visit(&mut |e| {
+            if let ExpData::Call(_, oper, _) = e {
+                use Operation::*;
+                match oper {
+                    Function(mid, ..) | Pack(mid, ..) | Select(mid, ..) | UpdateField(mid, ..) => {
+                        usage.insert(*mid);
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+
+    /// Extract access to ghost memory from expression. Returns a tuple of the instantiated
+    /// struct, the field of the selected value, and the expression with the address of the access.
+    pub fn extract_ghost_mem_access(
+        &self,
+        env: &GlobalEnv,
+    ) -> Option<(QualifiedInstId<StructId>, FieldId, Exp)> {
+        if let ExpData::Call(_, Operation::Select(_, _, field_id), sargs) = self {
+            if let ExpData::Call(id, Operation::Global(None), gargs) = sargs[0].as_ref() {
+                let ty = &env.get_node_type(*id);
+                let (mid, sid, targs) = ty.require_struct();
+                if env
+                    .symbol_pool()
+                    .string(sid.symbol())
+                    .starts_with(GHOST_MEMORY_PREFIX)
+                {
+                    return Some((
+                        mid.qualified_inst(sid, targs.to_vec()),
+                        *field_id,
+                        gargs[0].clone(),
+                    ));
+                }
+            }
+        }
+        None
+    }
+
+    /// Collect struct-related operations
+    pub fn struct_usage(&self, usage: &mut BTreeSet<QualifiedId<StructId>>) {
+        self.visit(&mut |e| {
+            if let ExpData::Call(_, oper, _) = e {
+                use Operation::*;
+                match oper {
+                    Select(mid, sid, ..) | UpdateField(mid, sid, ..) | Pack(mid, sid) => {
+                        usage.insert(mid.qualified(*sid));
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+
+    /// Collect field-related operations
+    pub fn field_usage(&self, usage: &mut BTreeSet<(QualifiedId<StructId>, FieldId)>) {
+        self.visit(&mut |e| {
+            if let ExpData::Call(_, oper, _) = e {
+                use Operation::*;
+                match oper {
+                    Select(mid, sid, fid) | UpdateField(mid, sid, fid) => {
+                        usage.insert((mid.qualified(*sid), *fid));
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+
+    /// Collect vector-related operations
+    pub fn vector_usage(&self, usage: &mut HashSet<Operation>) {
+        self.visit(&mut |e| {
+            if let ExpData::Call(_, oper, _) = e {
+                use Operation::*;
+                match oper {
+                    Index | Slice | ConcatVec | EmptyVec | SingleVec | UpdateVec | IndexOfVec
+                    | ContainsVec | InRangeVec | RangeVec => {
+                        usage.insert(oper.clone());
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+}
+
+struct ExpRewriter<'a> {
+    exp_rewriter: &'a mut dyn FnMut(Exp) -> Result<Exp, Exp>,
+    node_rewriter: &'a mut dyn FnMut(NodeId) -> Option<NodeId>,
+}
+
+impl<'a> ExpRewriterFunctions for ExpRewriter<'a> {
+    fn rewrite_exp(&mut self, exp: Exp) -> Exp {
+        match (*self.exp_rewriter)(exp) {
+            Ok(new_exp) => new_exp,
+            Err(old_exp) => self.rewrite_exp_descent(old_exp),
+        }
+    }
+
+    fn rewrite_node_id(&mut self, id: NodeId) -> Option<NodeId> {
+        (*self.node_rewriter)(id)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum Operation {
+    Function(ModuleId, SpecFunId, Option<Vec<MemoryLabel>>),
+    Pack(ModuleId, StructId),
+    Tuple,
+    Select(ModuleId, StructId, FieldId),
+    UpdateField(ModuleId, StructId, FieldId),
+    Result(usize),
+    Index,
+    Slice,
+
+    // Binary operators
+    Range,
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+    BitOr,
+    BitAnd,
+    Xor,
+    Shl,
+    Shr,
+    Implies,
+    Iff,
+    And,
+    Or,
+    Eq,
+    Identical,
+    Neq,
+    Lt,
+    Gt,
+    Le,
+    Ge,
+
+    // Unary operators
+    Not,
+    Cast,
+
+    // Builtin functions
+    Len,
+    TypeValue,
+    TypeDomain,
+    ResourceDomain,
+    Global(Option<MemoryLabel>),
+    Exists(Option<MemoryLabel>),
+    CanModify,
+    Old,
+    Trace(TraceKind),
+    EmptyVec,
+    SingleVec,
+    UpdateVec,
+    ConcatVec,
+    IndexOfVec,
+    ContainsVec,
+    InRangeRange,
+    InRangeVec,
+    RangeVec,
+    MaxU8,
+    MaxU16,
+    MaxU32,
+    MaxU64,
+    MaxU128,
+    MaxU256,
+    Bv2Int,
+    Int2Bv,
+
+    // Functions which support the transformation and translation process.
+    AbortFlag,
+    AbortCode,
+    WellFormed,
+    BoxValue,
+    UnboxValue,
+    EmptyEventStore,
+    ExtendEventStore,
+    EventStoreIncludes,
+    EventStoreIncludedIn,
+
+    // Operation with no effect
+    NoOp,
+}
+
+/// A label used for referring to a specific memory in Global and Exists expressions.
+pub type MemoryLabel = GlobalId;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct LocalVarDecl {
+    pub id: NodeId,
+    pub name: Symbol,
+    pub binding: Option<Exp>,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum TraceKind {
+    /// A user level TRACE(..) in the source.
+    User,
+    /// An automatically generated trace
+    Auto,
+    /// A trace for a sub-expression of an assert or assume. The location of a
+    /// Call(.., Trace(SubAuto)) expression identifies the context of the assume or assert.
+    /// A backend may print those traces only if the assertion failed.
+    SubAuto,
+}
+
+impl fmt::Display for TraceKind {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        use TraceKind::*;
+        match self {
+            User => f.write_str("user"),
+            Auto => f.write_str("auto"),
+            SubAuto => f.write_str("subauto"),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub enum Value {
+    Address(BigUint),
+    Number(BigInt),
+    Bool(bool),
+    ByteArray(Vec<u8>),
+    AddressArray(Vec<BigUint>), // TODO: merge AddressArray to Vector type in the future
+    Vector(Vec<Value>),
+}
+
+impl fmt::Display for Value {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        match self {
+            Value::Address(address) => write!(f, "{:x}", address),
+            Value::Number(int) => write!(f, "{}", int),
+            Value::Bool(b) => write!(f, "{}", b),
+            // TODO(tzakian): Figure out a better story for byte array displays
+            Value::ByteArray(bytes) => write!(f, "{:?}", bytes),
+            Value::AddressArray(array) => write!(f, "{:?}", array),
+            Value::Vector(array) => write!(f, "{:?}", array),
+        }
+    }
+}
+
+// =================================================================================================
+/// # Purity of Expressions
+
+impl Operation {
+    /// Determines whether this operation depends on global memory
+    pub fn uses_memory<F>(&self, check_pure: &F) -> bool
+    where
+        F: Fn(ModuleId, SpecFunId) -> bool,
+    {
+        use Operation::*;
+        match self {
+            Exists(_) | Global(_) => false,
+            Function(mid, fid, _) => check_pure(*mid, *fid),
+            _ => true,
+        }
+    }
+}
+
+impl ExpData {
+    /// Determines whether this expression depends on global memory
+    pub fn uses_memory<F>(&self, check_pure: &F) -> bool
+    where
+        F: Fn(ModuleId, SpecFunId) -> bool,
+    {
+        use ExpData::*;
+        let mut no_use = true;
+        self.visit(&mut |exp: &ExpData| {
+            if let Call(_, oper, _) = exp {
+                no_use = no_use && oper.uses_memory(check_pure);
+            }
+        });
+        no_use
+    }
+}
+
+impl ExpData {
+    /// Checks whether the expression is pure, i.e. does not depend on memory or mutable
+    /// variables.
+    pub fn is_pure(&self, env: &GlobalEnv) -> bool {
+        let mut is_pure = true;
+        let mut visitor = |e: &ExpData| {
+            use ExpData::*;
+            use Operation::*;
+            match e {
+                Temporary(id, _) => {
+                    if env.get_node_type(*id).is_mutable_reference() {
+                        is_pure = false;
+                    }
+                }
+                Call(_, oper, _) => match oper {
+                    Exists(..) | Global(..) => is_pure = false,
+                    Function(mid, fid, _) => {
+                        let module = env.get_module(*mid);
+                        let fun = module.get_spec_fun(*fid);
+                        if !fun.used_memory.is_empty() {
+                            is_pure = false;
+                        }
+                    }
+                    _ => {}
+                },
+                _ => {}
+            }
+        };
+        self.visit(&mut visitor);
+        is_pure
+    }
+}
+
+// =================================================================================================
+/// # Names
+
+/// Represents a module name, consisting of address and name.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub struct ModuleName(BigUint, Symbol);
+
+impl ModuleName {
+    pub fn new(addr: BigUint, name: Symbol) -> ModuleName {
+        ModuleName(addr, name)
+    }
+
+    pub fn from_address_bytes_and_name(
+        addr: move_compiler::shared::NumericalAddress,
+        name: Symbol,
+    ) -> ModuleName {
+        ModuleName(BigUint::from_bytes_be(&addr.into_bytes()), name)
+    }
+
+    pub fn from_str(mut addr: &str, name: Symbol) -> ModuleName {
+        if addr.starts_with("0x") {
+            addr = &addr[2..];
+        }
+        let bi = BigUint::from_str_radix(addr, 16).expect("valid hex");
+        ModuleName(bi, name)
+    }
+
+    pub fn addr(&self) -> &BigUint {
+        &self.0
+    }
+
+    pub fn name(&self) -> Symbol {
+        self.1
+    }
+
+    /// Determine whether this is a script. The move-compiler infrastructure uses MAX_ADDR
+    /// for pseudo modules created from scripts, so use this address to check.
+    pub fn is_script(&self) -> bool {
+        static MAX_ADDR: Lazy<BigUint> =
+            Lazy::new(|| BigUint::from_str_radix(MAX_ADDR_STRING, 16).expect("valid hex"));
+        self.0 == *MAX_ADDR
+    }
+}
+
+impl ModuleName {
+    /// Creates a value implementing the Display trait which shows this name,
+    /// excluding address.
+    pub fn display<'a>(&'a self, pool: &'a SymbolPool) -> ModuleNameDisplay<'a> {
+        ModuleNameDisplay {
+            name: self,
+            pool,
+            with_address: false,
+        }
+    }
+
+    /// Creates a value implementing the Display trait which shows this name,
+    /// including address.
+    pub fn display_full<'a>(&'a self, pool: &'a SymbolPool) -> ModuleNameDisplay<'a> {
+        ModuleNameDisplay {
+            name: self,
+            pool,
+            with_address: true,
+        }
+    }
+}
+
+/// A helper to support module names in formatting.
+pub struct ModuleNameDisplay<'a> {
+    name: &'a ModuleName,
+    pool: &'a SymbolPool,
+    with_address: bool,
+}
+
+impl<'a> fmt::Display for ModuleNameDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        if self.with_address && !self.name.is_script() {
+            write!(f, "0x{}::", self.name.0.to_str_radix(16))?;
+        }
+        write!(f, "{}", self.name.1.display(self.pool))?;
+        Ok(())
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub struct QualifiedSymbol {
+    pub module_name: ModuleName,
+    pub symbol: Symbol,
+}
+
+impl QualifiedSymbol {
+    /// Creates a value implementing the Display trait which shows this symbol,
+    /// including module name but excluding address.
+    pub fn display<'a>(&'a self, pool: &'a SymbolPool) -> QualifiedSymbolDisplay<'a> {
+        QualifiedSymbolDisplay {
+            sym: self,
+            pool,
+            with_module: true,
+            with_address: false,
+        }
+    }
+
+    /// Creates a value implementing the Display trait which shows this qualified symbol,
+    /// excluding module name.
+    pub fn display_simple<'a>(&'a self, pool: &'a SymbolPool) -> QualifiedSymbolDisplay<'a> {
+        QualifiedSymbolDisplay {
+            sym: self,
+            pool,
+            with_module: false,
+            with_address: false,
+        }
+    }
+
+    /// Creates a value implementing the Display trait which shows this symbol,
+    /// including module name with address.
+    pub fn display_full<'a>(&'a self, pool: &'a SymbolPool) -> QualifiedSymbolDisplay<'a> {
+        QualifiedSymbolDisplay {
+            sym: self,
+            pool,
+            with_module: true,
+            with_address: true,
+        }
+    }
+}
+
+/// A helper to support qualified symbols in formatting.
+pub struct QualifiedSymbolDisplay<'a> {
+    sym: &'a QualifiedSymbol,
+    pool: &'a SymbolPool,
+    with_module: bool,
+    with_address: bool,
+}
+
+impl<'a> fmt::Display for QualifiedSymbolDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        if self.with_module {
+            write!(
+                f,
+                "{}::",
+                if self.with_address {
+                    self.sym.module_name.display_full(self.pool)
+                } else {
+                    self.sym.module_name.display(self.pool)
+                }
+            )?;
+        }
+        write!(f, "{}", self.sym.symbol.display(self.pool))?;
+        Ok(())
+    }
+}
+
+impl ExpData {
+    /// Creates a display of an expression which can be used in formatting.
+    pub fn display<'a>(&'a self, env: &'a GlobalEnv) -> ExpDisplay<'a> {
+        ExpDisplay { env, exp: self }
+    }
+}
+
+/// Helper type for expression display.
+pub struct ExpDisplay<'a> {
+    env: &'a GlobalEnv,
+    exp: &'a ExpData,
+}
+
+impl<'a> fmt::Display for ExpDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        use ExpData::*;
+        match self.exp {
+            Invalid(_) => write!(f, "*invalid*"),
+            Value(_, v) => write!(f, "{}", v),
+            LocalVar(_, name) => write!(f, "{}", name.display(self.env.symbol_pool())),
+            Temporary(_, idx) => write!(f, "$t{}", idx),
+            Call(node_id, oper, args) => {
+                write!(
+                    f,
+                    "{}({})",
+                    oper.display(self.env, *node_id),
+                    self.fmt_exps(args)
+                )
+            }
+            Lambda(_, decls, body) => {
+                write!(f, "|{}| {}", self.fmt_decls(decls), body.display(self.env))
+            }
+            Block(_, decls, body) => {
+                write!(
+                    f,
+                    "{{let {}; {}}}",
+                    self.fmt_decls(decls),
+                    body.display(self.env)
+                )
+            }
+            Quant(_, kind, decls, triggers, opt_where, body) => {
+                let triggers_str = triggers
+                    .iter()
+                    .map(|trigger| format!("{{{}}}", self.fmt_exps(trigger)))
+                    .collect_vec()
+                    .join("");
+                let where_str = if let Some(exp) = opt_where {
+                    format!(" where {}", exp.display(self.env))
+                } else {
+                    "".to_string()
+                };
+                write!(
+                    f,
+                    "{} {}{}{}: {}",
+                    kind,
+                    self.fmt_quant_decls(decls),
+                    triggers_str,
+                    where_str,
+                    body.display(self.env)
+                )
+            }
+            Invoke(_, fun, args) => {
+                write!(f, "({})({})", fun.display(self.env), self.fmt_exps(args))
+            }
+            IfElse(_, cond, if_exp, else_exp) => {
+                write!(
+                    f,
+                    "(if {} {{{}}} else {{{}}})",
+                    cond.display(self.env),
+                    if_exp.display(self.env),
+                    else_exp.display(self.env)
+                )
+            }
+        }
+    }
+}
+
+impl<'a> ExpDisplay<'a> {
+    fn fmt_decls(&self, decls: &[LocalVarDecl]) -> String {
+        decls
+            .iter()
+            .map(|decl| {
+                let binding = if let Some(exp) = &decl.binding {
+                    format!(" = {}", exp.display(self.env))
+                } else {
+                    "".to_string()
+                };
+                format!("{}{}", decl.name.display(self.env.symbol_pool()), binding)
+            })
+            .join(", ")
+    }
+
+    fn fmt_quant_decls(&self, decls: &[(LocalVarDecl, Exp)]) -> String {
+        decls
+            .iter()
+            .map(|(decl, domain)| {
+                format!(
+                    "{}: {}",
+                    decl.name.display(self.env.symbol_pool()),
+                    domain.display(self.env)
+                )
+            })
+            .join(", ")
+    }
+
+    fn fmt_exps(&self, exps: &[Exp]) -> String {
+        exps.iter()
+            .map(|e| e.display(self.env).to_string())
+            .join(", ")
+    }
+}
+
+impl Operation {
+    /// Creates a display of an operation which can be used in formatting.
+    pub fn display<'a>(&'a self, env: &'a GlobalEnv, node_id: NodeId) -> OperationDisplay<'a> {
+        OperationDisplay {
+            env,
+            oper: self,
+            node_id,
+        }
+    }
+}
+
+/// Helper type for operation display.
+pub struct OperationDisplay<'a> {
+    env: &'a GlobalEnv,
+    node_id: NodeId,
+    oper: &'a Operation,
+}
+
+impl<'a> fmt::Display for OperationDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        use Operation::*;
+        match self.oper {
+            Function(mid, fid, labels_opt) => {
+                write!(f, "{}", self.fun_str(mid, fid))?;
+                if let Some(labels) = labels_opt {
+                    write!(
+                        f,
+                        "[{}]",
+                        labels.iter().map(|l| format!("{}", l)).join(", ")
+                    )?;
+                }
+                Ok(())
+            }
+            Global(label_opt) => {
+                write!(f, "global")?;
+                if let Some(label) = label_opt {
+                    write!(f, "[{}]", label)?
+                }
+                Ok(())
+            }
+            Exists(label_opt) => {
+                write!(f, "exists")?;
+                if let Some(label) = label_opt {
+                    write!(f, "[{}]", label)?
+                }
+                Ok(())
+            }
+            Pack(mid, sid) => write!(f, "pack {}", self.struct_str(mid, sid)),
+            Select(mid, sid, fid) => {
+                write!(f, "select {}", self.field_str(mid, sid, fid))
+            }
+            UpdateField(mid, sid, fid) => {
+                write!(f, "update {}", self.field_str(mid, sid, fid))
+            }
+            Result(t) => write!(f, "result{}", t),
+            _ => write!(f, "{:?}", self.oper),
+        }?;
+
+        // If operation has a type instantiation, add it.
+        let type_inst = self.env.get_node_instantiation(self.node_id);
+        if !type_inst.is_empty() {
+            let tctx = TypeDisplayContext::WithEnv {
+                env: self.env,
+                type_param_names: None,
+            };
+            write!(
+                f,
+                "<{}>",
+                type_inst.iter().map(|ty| ty.display(&tctx)).join(", ")
+            )?;
+        }
+        Ok(())
+    }
+}
+
+impl<'a> OperationDisplay<'a> {
+    fn fun_str(&self, mid: &ModuleId, fid: &SpecFunId) -> String {
+        let module_env = self.env.get_module(*mid);
+        let fun = module_env.get_spec_fun(*fid);
+        format!(
+            "{}::{}",
+            module_env.get_name().display(self.env.symbol_pool()),
+            fun.name.display(self.env.symbol_pool()),
+        )
+    }
+
+    fn struct_str(&self, mid: &ModuleId, sid: &StructId) -> String {
+        let module_env = self.env.get_module(*mid);
+        let struct_env = module_env.get_struct(*sid);
+        format!(
+            "{}::{}",
+            module_env.get_name().display(self.env.symbol_pool()),
+            struct_env.get_name().display(self.env.symbol_pool()),
+        )
+    }
+
+    fn field_str(&self, mid: &ModuleId, sid: &StructId, fid: &FieldId) -> String {
+        let struct_env = self.env.get_module(*mid).into_struct(*sid);
+        let field_name = struct_env.get_field(*fid).get_name();
+        format!(
+            "{}.{}",
+            self.struct_str(mid, sid),
+            field_name.display(self.env.symbol_pool())
+        )
+    }
+}
+
+impl fmt::Display for MemoryLabel {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        write!(f, "@{}", self.as_usize())
+    }
+}
+
+impl<'a> fmt::Display for EnvDisplay<'a, Condition> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match &self.val.kind {
+            ConditionKind::LetPre(name) => write!(
+                f,
+                "let {} = {};",
+                name.display(self.env.symbol_pool()),
+                self.val.exp.display(self.env)
+            )?,
+            ConditionKind::LetPost(name) => write!(
+                f,
+                "let post {} = {};",
+                name.display(self.env.symbol_pool()),
+                self.val.exp.display(self.env)
+            )?,
+            ConditionKind::Emits => {
+                let exps = self.val.all_exps().collect_vec();
+                write!(
+                    f,
+                    "emit {} to {}",
+                    exps[0].display(self.env),
+                    exps[1].display(self.env)
+                )?;
+                if exps.len() > 2 {
+                    write!(f, "if {}", exps[2].display(self.env))?;
+                }
+                write!(f, ";")?
+            }
+            ConditionKind::Update => write!(
+                f,
+                "update {} = {};",
+                self.val.additional_exps[0].display(self.env),
+                self.val.exp.display(self.env)
+            )?,
+            _ => write!(f, "{} {};", self.val.kind, self.val.exp.display(self.env))?,
+        }
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for EnvDisplay<'a, Spec> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        writeln!(f, "spec {{")?;
+        for cond in &self.val.conditions {
+            writeln!(f, "  {}", self.env.display(cond))?
+        }
+        writeln!(f, "}}")?;
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-model/src/builder/README.md b/vendors/move/crates/move-model/src/builder/README.md
new file mode 100644
index 000000000..1828e76c1
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/README.md
@@ -0,0 +1,6 @@
+This module handles building a global environment for a set of Move modules merging multiple sources:
+the bytecode as produced by the Move compiler, source mapping information to map the bytecode back
+to the Move source, and the AST for specification constructs (derived from the internal AST
+of the Move compiler after its expansion phase). In order to create the AST for specs, type checking
+of the specification fragments is handled here as well. This might be refactored in the future when
+we move more of the Move specification language fragment into the Move compiler.
diff --git a/vendors/move/crates/move-model/src/builder/exp_translator.rs b/vendors/move/crates/move-model/src/builder/exp_translator.rs
new file mode 100644
index 000000000..ddf54836b
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/exp_translator.rs
@@ -0,0 +1,2032 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, LinkedList},
+};
+
+use itertools::Itertools;
+use num::{BigInt, BigUint, FromPrimitive, Zero};
+
+use move_compiler::{
+    expansion::ast as EA, hlir::ast as HA, naming::ast as NA, parser::ast as PA, shared::Name,
+};
+use move_core_types::runtime_value::MoveValue;
+use move_ir_types::location::Spanned;
+
+use crate::{
+    ast::{Exp, ExpData, LocalVarDecl, ModuleName, Operation, QualifiedSymbol, QuantKind, Value},
+    builder::{
+        model_builder::{ConstEntry, LocalVarEntry, SpecFunEntry},
+        module_builder::ModuleBuilder,
+    },
+    model::{FieldId, Loc, ModuleId, NodeId, QualifiedId, SpecFunId, StructId},
+    symbol::{Symbol, SymbolPool},
+    ty::{PrimitiveType, Substitution, Type, TypeDisplayContext, Variance, BOOL_TYPE},
+};
+
+#[derive(Debug)]
+pub(crate) struct ExpTranslator<'env, 'translator, 'module_translator> {
+    pub parent: &'module_translator mut ModuleBuilder<'env, 'translator>,
+    /// A symbol table for type parameters.
+    pub type_params_table: BTreeMap<Symbol, Type>,
+    /// Type parameters in sequence they have been added.
+    pub type_params: Vec<(Symbol, Type)>,
+    /// A scoped symbol table for local names. The first element in the list contains the most
+    /// inner scope.
+    pub local_table: LinkedList<BTreeMap<Symbol, LocalVarEntry>>,
+    /// When compiling a condition, the result type of the function the condition is associated
+    /// with.
+    #[allow(unused)]
+    pub result_type: Option<Type>,
+    /// Status for the `old(...)` expression form.
+    pub old_status: OldExpStatus,
+    /// The currently build type substitution.
+    pub subs: Substitution,
+    /// A counter for generating type variables.
+    pub type_var_counter: u16,
+    /// A marker to indicate the node_counter start state.
+    pub node_counter_start: usize,
+    /// The locals which have been accessed with this build. The boolean indicates whether
+    /// they ore accessed in `old(..)` context.
+    pub accessed_locals: BTreeSet<(Symbol, bool)>,
+    /// The number of outer context scopes in  `local_table` which are accounted for in
+    /// `accessed_locals`. See also documentation of function `mark_context_scopes`.
+    pub outer_context_scopes: usize,
+    /// A flag to indicate whether we are translating expressions in a spec fun.
+    pub translating_fun_as_spec_fun: bool,
+    /// A flag to indicate whether errors have been generated so far.
+    pub errors_generated: RefCell<bool>,
+    /// Set containing all the functions called during translation.
+    pub called_spec_funs: BTreeSet<(ModuleId, SpecFunId)>,
+}
+
+#[derive(Debug, PartialEq)]
+pub(crate) enum OldExpStatus {
+    NotSupported,
+    OutsideOld,
+    InsideOld,
+}
+
+/// # General
+
+impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'module_translator> {
+    pub fn new(parent: &'module_translator mut ModuleBuilder<'env, 'translator>) -> Self {
+        let node_counter_start = parent.parent.env.next_free_node_number();
+        Self {
+            parent,
+            type_params_table: BTreeMap::new(),
+            type_params: vec![],
+            local_table: LinkedList::new(),
+            result_type: None,
+            old_status: OldExpStatus::NotSupported,
+            subs: Substitution::new(),
+            type_var_counter: 0,
+            node_counter_start,
+            accessed_locals: BTreeSet::new(),
+            outer_context_scopes: 0,
+            /// Following flags used to translate pure Move functions.
+            translating_fun_as_spec_fun: false,
+            errors_generated: RefCell::new(false),
+            called_spec_funs: BTreeSet::new(),
+        }
+    }
+
+    pub fn new_with_old(
+        parent: &'module_translator mut ModuleBuilder<'env, 'translator>,
+        allow_old: bool,
+    ) -> Self {
+        let mut et = ExpTranslator::new(parent);
+        if allow_old {
+            et.old_status = OldExpStatus::OutsideOld;
+        } else {
+            et.old_status = OldExpStatus::NotSupported;
+        };
+        et
+    }
+
+    pub fn translate_fun_as_spec_fun(&mut self) {
+        self.translating_fun_as_spec_fun = true;
+    }
+
+    /// Extract a map from names to types from the scopes of this build.
+    pub fn extract_var_map(&self) -> BTreeMap<Symbol, LocalVarEntry> {
+        let mut vars: BTreeMap<Symbol, LocalVarEntry> = BTreeMap::new();
+        for s in &self.local_table {
+            vars.extend(s.clone());
+        }
+        vars
+    }
+
+    // Get type parameters from this build.
+    #[allow(unused)]
+    pub fn get_type_params(&self) -> Vec<Type> {
+        self.type_params
+            .iter()
+            .map(|(_, t)| t.clone())
+            .collect_vec()
+    }
+
+    // Get type parameters with names from this build.
+    pub fn get_type_params_with_name(&self) -> Vec<(Symbol, Type)> {
+        self.type_params.clone()
+    }
+
+    /// Shortcut for accessing symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        self.parent.parent.env.symbol_pool()
+    }
+
+    /// Shortcut for translating a Move AST location into ours.
+    pub fn to_loc(&self, loc: &move_ir_types::location::Loc) -> Loc {
+        self.parent.parent.env.to_loc(loc)
+    }
+
+    /// Shortcut for reporting an error.
+    pub fn error(&self, loc: &Loc, msg: &str) {
+        if self.translating_fun_as_spec_fun {
+            *self.errors_generated.borrow_mut() = true;
+        } else {
+            self.parent.parent.error(loc, msg);
+        }
+    }
+
+    /// Shortcut for reporting an error.
+    pub fn error_with_notes(&self, loc: &Loc, msg: &str, notes: Vec<String>) {
+        if self.translating_fun_as_spec_fun {
+            *self.errors_generated.borrow_mut() = true;
+        } else {
+            self.parent.parent.error_with_notes(loc, msg, notes);
+        }
+    }
+
+    /// Creates a fresh type variable.
+    fn fresh_type_var(&mut self) -> Type {
+        let var = Type::Var(self.type_var_counter);
+        self.type_var_counter += 1;
+        var
+    }
+
+    /// Shortcut to create a new node id.
+    fn new_node_id(&self) -> NodeId {
+        self.parent.parent.env.new_node_id()
+    }
+
+    /// Shortcut to create a new node id and assigns type and location to it.
+    pub fn new_node_id_with_type_loc(&self, ty: &Type, loc: &Loc) -> NodeId {
+        self.parent.parent.env.new_node(loc.clone(), ty.clone())
+    }
+
+    // Short cut for getting node type.
+    pub fn get_node_type(&self, node_id: NodeId) -> Type {
+        self.parent.parent.env.get_node_type(node_id)
+    }
+
+    // Short cut for getting node type.
+    fn get_node_type_opt(&self, node_id: NodeId) -> Option<Type> {
+        self.parent.parent.env.get_node_type_opt(node_id)
+    }
+
+    // Short cut for getting node location.
+    #[allow(dead_code)]
+    fn get_node_loc(&self, node_id: NodeId) -> Loc {
+        self.parent.parent.env.get_node_loc(node_id)
+    }
+
+    // Short cut for getting node instantiation.
+    fn get_node_instantiation_opt(&self, node_id: NodeId) -> Option<Vec<Type>> {
+        self.parent.parent.env.get_node_instantiation_opt(node_id)
+    }
+
+    /// Shortcut to update node type.
+    pub fn update_node_type(&self, node_id: NodeId, ty: Type) {
+        self.parent.parent.env.update_node_type(node_id, ty);
+    }
+
+    /// Shortcut to set/update instantiation for the given node id.
+    fn set_node_instantiation(&self, node_id: NodeId, instantiation: Vec<Type>) {
+        self.parent
+            .parent
+            .env
+            .set_node_instantiation(node_id, instantiation);
+    }
+
+    fn update_node_instantiation(&self, node_id: NodeId, instantiation: Vec<Type>) {
+        self.parent
+            .parent
+            .env
+            .update_node_instantiation(node_id, instantiation);
+    }
+
+    /// Finalizes types in this build, producing errors if some could not be inferred
+    /// and remained incomplete.
+    pub fn finalize_types(&mut self) {
+        for i in self.node_counter_start..self.parent.parent.env.next_free_node_number() {
+            let node_id = NodeId::new(i);
+
+            if let Some(ty) = self.get_node_type_opt(node_id) {
+                let ty = self.finalize_type(node_id, &ty);
+                self.update_node_type(node_id, ty);
+            }
+            if let Some(inst) = self.get_node_instantiation_opt(node_id) {
+                let inst = inst
+                    .iter()
+                    .map(|ty| self.finalize_type(node_id, ty))
+                    .collect_vec();
+                self.update_node_instantiation(node_id, inst);
+            }
+        }
+    }
+
+    /// Finalize the the given type, producing an error if it is not complete.
+    fn finalize_type(&self, node_id: NodeId, ty: &Type) -> Type {
+        let ty = self.subs.specialize(ty);
+        if ty.is_incomplete() {
+            // This type could not be fully inferred.
+            let loc = self.parent.parent.env.get_node_loc(node_id);
+            self.error(
+                &loc,
+                &format!(
+                    "unable to infer type: `{}`",
+                    ty.display(&self.type_display_context())
+                ),
+            );
+        }
+        ty
+    }
+
+    /// Fix any free type variables remaining in this expression build to a freshly
+    /// generated type parameter, adding them to the passed vector.
+    #[allow(unused)]
+    pub fn fix_types(&mut self, generated_params: &mut Vec<Type>) {
+        if self.parent.parent.env.has_errors() {
+            return;
+        }
+        for i in self.node_counter_start..self.parent.parent.env.next_free_node_number() {
+            let node_id = NodeId::new(i);
+
+            if let Some(ty) = self.get_node_type_opt(node_id) {
+                let ty = self.fix_type(generated_params, &ty);
+                self.update_node_type(node_id, ty);
+            }
+            if let Some(inst) = self.get_node_instantiation_opt(node_id) {
+                let inst = inst
+                    .iter()
+                    .map(|ty| self.fix_type(generated_params, ty))
+                    .collect_vec();
+                self.update_node_instantiation(node_id, inst);
+            }
+        }
+    }
+
+    /// Fix the given type, replacing any remaining free type variables with a type parameter.
+    fn fix_type(&mut self, generated_params: &mut Vec<Type>, ty: &Type) -> Type {
+        // First specialize the type.
+        let ty = self.subs.specialize(ty);
+        // Next get whatever free variables remain.
+        let vars = ty.get_vars();
+        // Assign a type parameter to each free variable and add it to substitution.
+        for var in vars {
+            let type_param = Type::TypeParameter(generated_params.len() as u16);
+            generated_params.push(type_param.clone());
+            self.subs.bind(var, type_param);
+        }
+        // Return type with type parameter substitution applied.
+        self.subs.specialize(&ty)
+    }
+
+    /// Constructs a type display context used to visualize types in error messages.
+    fn type_display_context(&self) -> TypeDisplayContext<'_> {
+        TypeDisplayContext::WithoutEnv {
+            symbol_pool: self.symbol_pool(),
+            reverse_struct_table: &self.parent.parent.reverse_struct_table,
+        }
+    }
+
+    /// Creates an error expression.
+    pub fn new_error_exp(&mut self) -> ExpData {
+        let id =
+            self.new_node_id_with_type_loc(&Type::Error, &self.parent.parent.env.internal_loc());
+        ExpData::Invalid(id)
+    }
+
+    /// Enters a new scope in the locals table.
+    pub fn enter_scope(&mut self) {
+        self.local_table.push_front(BTreeMap::new());
+    }
+
+    /// Exits the most inner scope of the locals table.
+    pub fn exit_scope(&mut self) {
+        self.local_table.pop_front();
+    }
+
+    /// Mark the current active scope level as context, i.e. symbols which are not
+    /// declared in this expression. This is used to determine what
+    /// `get_accessed_context_locals` returns.
+    #[allow(unused)]
+    pub fn mark_context_scopes(mut self) -> Self {
+        self.outer_context_scopes = self.local_table.len();
+        self
+    }
+
+    /// Gets the locals this build has accessed so far and which belong to the
+    /// context, i.a. are not declared in this expression.
+    #[allow(unused)]
+    pub fn get_accessed_context_locals(&self) -> Vec<(Symbol, bool)> {
+        self.accessed_locals.iter().cloned().collect_vec()
+    }
+
+    /// Defines a type parameter.
+    pub fn define_type_param(&mut self, loc: &Loc, name: Symbol, ty: Type) {
+        if let Type::TypeParameter(..) = &ty {
+            if self.type_params_table.insert(name, ty.clone()).is_some() {
+                let param_name = name.display(self.symbol_pool());
+                self.parent.parent.error(
+                    loc,
+                    &format!(
+                        "duplicate declaration of type parameter `{}`, \
+                        previously found in type parameters",
+                        param_name
+                    ),
+                );
+                return;
+            }
+            self.type_params.push((name, ty));
+        } else {
+            let param_name = name.display(self.symbol_pool());
+            let context = TypeDisplayContext::WithEnv {
+                env: self.parent.parent.env,
+                type_param_names: None,
+            };
+            self.parent.parent.error(
+                loc,
+                &format!(
+                    "expect type placeholder `{}` to be a `TypeParameter`, found `{}`",
+                    param_name,
+                    ty.display(&context)
+                ),
+            );
+        }
+    }
+
+    /// Defines a local in the most inner scope. This produces an error
+    /// if the name already exists. The operation option is used for names
+    /// which represent special operations.
+    pub fn define_local(
+        &mut self,
+        loc: &Loc,
+        name: Symbol,
+        type_: Type,
+        operation: Option<Operation>,
+        temp_index: Option<usize>,
+    ) {
+        self.internal_define_local(loc, name, type_, operation, temp_index)
+    }
+
+    /// Defines a let local.
+    pub fn define_let_local(&mut self, loc: &Loc, name: Symbol, type_: Type) {
+        self.internal_define_local(loc, name, type_, None, None)
+    }
+
+    fn internal_define_local(
+        &mut self,
+        loc: &Loc,
+        name: Symbol,
+        type_: Type,
+        operation: Option<Operation>,
+        temp_index: Option<usize>,
+    ) {
+        let entry = LocalVarEntry {
+            loc: loc.clone(),
+            type_,
+            operation,
+            temp_index,
+        };
+        if let Some(old) = self
+            .local_table
+            .front_mut()
+            .expect("symbol table empty")
+            .insert(name, entry)
+        {
+            let display = name.display(self.symbol_pool());
+            self.error(loc, &format!("duplicate declaration of `{}`", display));
+            self.error(&old.loc, &format!("previous declaration of `{}`", display));
+        }
+    }
+
+    /// Lookup a local in this build.
+    pub fn lookup_local(&mut self, name: Symbol, in_old: bool) -> Option<&LocalVarEntry> {
+        let mut depth = self.local_table.len();
+        for scope in &self.local_table {
+            if let Some(entry) = scope.get(&name) {
+                if depth <= self.outer_context_scopes {
+                    // Account for access if this belongs to one of the outer scopes
+                    // considered context (i.e. not declared in this expression).
+                    self.accessed_locals.insert((name, in_old));
+                }
+                return Some(entry);
+            }
+            depth -= 1;
+        }
+        None
+    }
+
+    /// Analyzes the sequence of type parameters as they are provided via the source AST and enters
+    /// them into the environment. Returns a vector for representing them in the target AST.
+    pub fn analyze_and_add_type_params<'a, I>(&mut self, type_params: I) -> Vec<(Symbol, Type)>
+    where
+        I: IntoIterator<Item = &'a Name>,
+    {
+        type_params
+            .into_iter()
+            .enumerate()
+            .map(|(i, n)| {
+                let ty = Type::TypeParameter(i as u16);
+                let sym = self.symbol_pool().make(n.value.as_str());
+                self.define_type_param(&self.to_loc(&n.loc), sym, ty.clone());
+                (sym, ty)
+            })
+            .collect_vec()
+    }
+
+    /// Analyzes the sequence of function parameters as they are provided via the source AST and
+    /// enters them into the environment. Returns a vector for representing them in the target AST.
+    pub fn analyze_and_add_params(
+        &mut self,
+        params: &[(PA::Mutability, PA::Var, EA::Type)],
+        for_move_fun: bool,
+    ) -> Vec<(Symbol, Type)> {
+        params
+            .iter()
+            .enumerate()
+            .map(|(idx, (_, v, ty))| {
+                let ty = self.translate_type(ty);
+                let sym = self.symbol_pool().make(v.0.value.as_str());
+                self.define_local(
+                    &self.to_loc(&v.0.loc),
+                    sym,
+                    ty.clone(),
+                    None,
+                    // If this is for a proper Move function (not spec function), add the
+                    // index so we can resolve this to a `Temporary` expression instead of
+                    // a `LocalVar`.
+                    if for_move_fun { Some(idx) } else { None },
+                );
+                (sym, ty)
+            })
+            .collect_vec()
+    }
+
+    /// Displays a call target for error messages.
+    fn display_call_target(&mut self, module: &Option<ModuleName>, name: Symbol) -> String {
+        if let Some(m) = module {
+            if m != &self.parent.parent.builtin_module() {
+                // Only print the module name if it is not the pseudo builtin module.
+                return format!(
+                    "{}",
+                    QualifiedSymbol {
+                        module_name: m.clone(),
+                        symbol: name,
+                    }
+                    .display(self.symbol_pool())
+                );
+            }
+        }
+        format!("{}", name.display(self.symbol_pool()))
+    }
+
+    /// Displays a call target candidate for error messages.
+    fn display_call_cand(
+        &mut self,
+        module: &Option<ModuleName>,
+        name: Symbol,
+        entry: &SpecFunEntry,
+    ) -> String {
+        let target = self.display_call_target(module, name);
+        let type_display_context = self.type_display_context();
+        format!(
+            "{}({}): {}",
+            target,
+            entry
+                .arg_types
+                .iter()
+                .map(|ty| ty.display(&type_display_context))
+                .join(", "),
+            entry.result_type.display(&type_display_context)
+        )
+    }
+}
+
+/// # Type Translation
+
+impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'module_translator> {
+    /// Translates an hlir type into a target AST type.
+    pub fn translate_hlir_single_type(&mut self, ty: &HA::SingleType) -> Type {
+        use HA::SingleType_::*;
+        match &ty.value {
+            Ref(is_mut, ty) => {
+                let ty = self.translate_hlir_base_type(ty);
+                if ty == Type::Error {
+                    Type::Error
+                } else {
+                    Type::Reference(*is_mut, Box::new(ty))
+                }
+            }
+            Base(ty) => self.translate_hlir_base_type(ty),
+        }
+    }
+
+    fn translate_hlir_base_type(&mut self, ty: &HA::BaseType) -> Type {
+        use HA::{BaseType_::*, TypeName_::*};
+        use NA::{BuiltinTypeName_::*, TParam};
+        match &ty.value {
+            Param(TParam {
+                user_specified_name,
+                ..
+            }) => {
+                let sym = self.symbol_pool().make(user_specified_name.value.as_str());
+                self.type_params_table[&sym].clone()
+            }
+            Apply(_, type_name, args) => {
+                let loc = self.to_loc(&type_name.loc);
+                match &type_name.value {
+                    Builtin(builtin_type_name) => match &builtin_type_name.value {
+                        Address => Type::new_prim(PrimitiveType::Address),
+                        Signer => Type::new_prim(PrimitiveType::Signer),
+                        U8 => Type::new_prim(PrimitiveType::U8),
+                        U16 => Type::new_prim(PrimitiveType::U16),
+                        U32 => Type::new_prim(PrimitiveType::U32),
+                        U64 => Type::new_prim(PrimitiveType::U64),
+                        U128 => Type::new_prim(PrimitiveType::U128),
+                        U256 => Type::new_prim(PrimitiveType::U256),
+                        Vector => Type::Vector(Box::new(self.translate_hlir_base_type(&args[0]))),
+                        Bool => Type::new_prim(PrimitiveType::Bool),
+                    },
+                    ModuleType(m, n) => {
+                        let addr_bytes = self.parent.parent.resolve_address(&loc, &m.value.address);
+                        let module_name = ModuleName::from_address_bytes_and_name(
+                            addr_bytes,
+                            self.symbol_pool().make(m.value.module.0.value.as_str()),
+                        );
+                        let symbol = self.symbol_pool().make(n.0.value.as_str());
+                        let qsym = QualifiedSymbol {
+                            module_name,
+                            symbol,
+                        };
+                        let rty = self.parent.parent.lookup_type(&loc, &qsym);
+                        if !args.is_empty() {
+                            // Replace type instantiation.
+                            if let Type::Struct(mid, sid, _) = &rty {
+                                let arg_types = self.translate_hlir_base_types(args);
+                                if arg_types.iter().any(|x| *x == Type::Error) {
+                                    Type::Error
+                                } else {
+                                    Type::Struct(*mid, *sid, arg_types)
+                                }
+                            } else {
+                                Type::Error
+                            }
+                        } else {
+                            rty
+                        }
+                    }
+                }
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    fn translate_hlir_base_types(&mut self, tys: &[HA::BaseType]) -> Vec<Type> {
+        tys.iter()
+            .map(|t| self.translate_hlir_base_type(t))
+            .collect()
+    }
+
+    /// Translates a source AST type into a target AST type.
+    pub fn translate_type(&mut self, ty: &EA::Type) -> Type {
+        use EA::Type_::*;
+        match &ty.value {
+            Apply(access, args) => {
+                if let EA::ModuleAccess_::Name(n) = &access.value {
+                    let check_zero_args = |et: &mut Self, ty: Type| {
+                        if args.is_empty() {
+                            ty
+                        } else {
+                            et.error(&et.to_loc(&n.loc), "expected no type arguments");
+                            Type::Error
+                        }
+                    };
+                    // Attempt to resolve as builtin type.
+                    match n.value.as_str() {
+                        "bool" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::Bool));
+                        }
+                        "u8" => return check_zero_args(self, Type::new_prim(PrimitiveType::U8)),
+                        "u16" => return check_zero_args(self, Type::new_prim(PrimitiveType::U16)),
+                        "u32" => return check_zero_args(self, Type::new_prim(PrimitiveType::U32)),
+                        "u64" => return check_zero_args(self, Type::new_prim(PrimitiveType::U64)),
+                        "u128" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::U128));
+                        }
+                        "u256" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::U256))
+                        }
+                        "num" => return check_zero_args(self, Type::new_prim(PrimitiveType::Num)),
+                        "range" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::Range));
+                        }
+                        "address" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::Address));
+                        }
+                        "signer" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::Signer));
+                        }
+                        "vector" => {
+                            if args.len() != 1 {
+                                self.error(
+                                    &self.to_loc(&ty.loc),
+                                    "expected one type argument for `vector`",
+                                );
+                                return Type::Error;
+                            } else {
+                                return Type::Vector(Box::new(self.translate_type(&args[0])));
+                            }
+                        }
+                        _ => {}
+                    }
+                    // Attempt to resolve as a type parameter.
+                    let sym = self.symbol_pool().make(n.value.as_str());
+                    if let Some(ty) = self.type_params_table.get(&sym).cloned() {
+                        return check_zero_args(self, ty);
+                    }
+                }
+                let loc = self.to_loc(&access.loc);
+                let sym = self.parent.module_access_to_qualified(access);
+                let rty = self.parent.parent.lookup_type(&loc, &sym);
+                // Replace type instantiation.
+                if let Type::Struct(mid, sid, params) = &rty {
+                    if params.len() != args.len() {
+                        self.error(&loc, "type argument count mismatch");
+                        Type::Error
+                    } else {
+                        Type::Struct(*mid, *sid, self.translate_types(args))
+                    }
+                } else if !args.is_empty() {
+                    self.error(&loc, "type cannot have type arguments");
+                    Type::Error
+                } else {
+                    rty
+                }
+            }
+            Ref(is_mut, ty) => Type::Reference(*is_mut, Box::new(self.translate_type(ty))),
+            Fun(args, result) => Type::Fun(
+                self.translate_types(args),
+                Box::new(self.translate_type(result)),
+            ),
+            Unit => Type::Tuple(vec![]),
+            Multiple(vst) => Type::Tuple(self.translate_types(vst)),
+            UnresolvedError => Type::Error,
+        }
+    }
+
+    /// Translates a slice of single types.
+    pub fn translate_types(&mut self, tys: &[EA::Type]) -> Vec<Type> {
+        tys.iter().map(|t| self.translate_type(t)).collect()
+    }
+
+    /// Translates option a slice of single types.
+    pub fn translate_types_opt(&mut self, tys_opt: &Option<Vec<EA::Type>>) -> Vec<Type> {
+        tys_opt
+            .as_deref()
+            .map(|tys| self.translate_types(tys))
+            .unwrap_or_default()
+    }
+}
+
+/// # Expression Translation
+
+impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'module_translator> {
+    /// Translates an expression representing a modify target
+    pub fn translate_modify_target(&mut self, exp: &EA::Exp) -> ExpData {
+        let loc = self.to_loc(&exp.loc);
+        let (_, exp) = self.translate_exp_free(exp);
+        match &exp {
+            ExpData::Call(_, Operation::Global(_), _) => exp,
+            _ => {
+                self.error(&loc, "global resource access expected");
+                self.new_error_exp()
+            }
+        }
+    }
+
+    /// Translates an expression, with given expected type, which might be a type variable.
+    pub fn translate_exp(&mut self, exp: &EA::Exp, expected_type: &Type) -> ExpData {
+        let loc = self.to_loc(&exp.loc);
+        let make_value = |et: &mut ExpTranslator, val: Value, ty: Type| {
+            let rty = et.check_type(&loc, &ty, expected_type, "in expression");
+            let id = et.new_node_id_with_type_loc(&rty, &loc);
+            ExpData::Value(id, val)
+        };
+        match &exp.value {
+            EA::Exp_::Value(v) => {
+                if let Some((v, ty)) = self.translate_value(v) {
+                    make_value(self, v, ty)
+                } else {
+                    self.new_error_exp()
+                }
+            }
+            EA::Exp_::Name(maccess, type_params) => {
+                self.translate_name(&loc, maccess, type_params.as_deref(), expected_type)
+            }
+            EA::Exp_::Call(maccess, _is_macro, type_params, args) => {
+                // Need to make a &[&Exp] out of args.
+                let args = args.value.iter().collect_vec();
+                self.translate_fun_call(expected_type, &loc, maccess, type_params.as_deref(), &args)
+            }
+            EA::Exp_::Pack(maccess, generics, fields) => {
+                self.translate_pack(&loc, maccess, generics, fields, expected_type)
+            }
+            EA::Exp_::IfElse(cond, then, else_) => {
+                let then = self.translate_exp(then, expected_type);
+                let else_ = self.translate_exp(else_, expected_type);
+                let cond = self.translate_exp(cond, &Type::new_prim(PrimitiveType::Bool));
+                let id = self.new_node_id_with_type_loc(expected_type, &loc);
+                ExpData::IfElse(id, cond.into(), then.into_exp(), else_.into_exp())
+            }
+            EA::Exp_::Block(seq) => self.translate_seq(&loc, seq, expected_type),
+            EA::Exp_::Lambda(bindings, exp) => {
+                self.translate_lambda(&loc, bindings, exp, expected_type)
+            }
+            EA::Exp_::Quant(kind, ranges, triggers, condition, body) => self.translate_quant(
+                &loc,
+                *kind,
+                ranges,
+                triggers,
+                condition,
+                body,
+                expected_type,
+            ),
+            EA::Exp_::BinopExp(l, op, r) => {
+                let args = vec![l.as_ref(), r.as_ref()];
+                let QualifiedSymbol {
+                    module_name,
+                    symbol,
+                } = self.parent.parent.bin_op_symbol(&op.value);
+                self.translate_call(&loc, &Some(module_name), symbol, None, &args, expected_type)
+            }
+            EA::Exp_::UnaryExp(op, exp) => {
+                let args = vec![exp.as_ref()];
+                let QualifiedSymbol {
+                    module_name,
+                    symbol,
+                } = self.parent.parent.unary_op_symbol(&op.value);
+                self.translate_call(&loc, &Some(module_name), symbol, None, &args, expected_type)
+            }
+            EA::Exp_::ExpDotted(dotted) => self.translate_dotted(dotted, expected_type),
+            EA::Exp_::Index(target, index) => {
+                self.translate_index(&loc, target, index, expected_type)
+            }
+            EA::Exp_::ExpList(exps) => {
+                let mut types = vec![];
+                let exps = exps
+                    .iter()
+                    .map(|exp| {
+                        let (ty, exp) = self.translate_exp_free(exp);
+                        types.push(ty);
+                        exp.into_exp()
+                    })
+                    .collect_vec();
+                let ty = self.check_type(
+                    &loc,
+                    &Type::Tuple(types),
+                    expected_type,
+                    "in expression list",
+                );
+                let id = self.new_node_id_with_type_loc(&ty, &loc);
+                ExpData::Call(id, Operation::Tuple, exps)
+            }
+            EA::Exp_::Unit { .. } => {
+                let ty = self.check_type(
+                    &loc,
+                    &Type::Tuple(vec![]),
+                    expected_type,
+                    "in unit expression",
+                );
+                let id = self.new_node_id_with_type_loc(&ty, &loc);
+                ExpData::Call(id, Operation::Tuple, vec![])
+            }
+            EA::Exp_::Assign(..) => {
+                self.error(&loc, "assignment only allowed in spec var updates");
+                self.new_error_exp()
+            }
+            EA::Exp_::Dereference(exp) | EA::Exp_::Borrow(_, exp) => {
+                if self.translating_fun_as_spec_fun {
+                    self.translate_exp(exp, expected_type)
+                } else {
+                    self.error(&loc, "expression construct not supported in specifications");
+                    self.new_error_exp()
+                }
+            }
+            EA::Exp_::Cast(exp, typ) => {
+                let ty = self.translate_type(typ);
+                self.check_type(&loc, &ty, expected_type, "in cast expression");
+                let (exp_ty, exp) = self.translate_exp_free(exp);
+                if !ty.is_number() || !exp_ty.is_number() {
+                    self.error(&loc, "the cast target can only be num types");
+                    self.new_error_exp()
+                } else {
+                    ExpData::Call(
+                        self.new_node_id_with_type_loc(&ty, &loc),
+                        Operation::Cast,
+                        vec![exp.into_exp()],
+                    )
+                }
+            }
+            _ => {
+                self.error(&loc, "expression construct not supported in specifications");
+                self.new_error_exp()
+            }
+        }
+    }
+
+    pub fn translate_value(&mut self, v: &EA::Value) -> Option<(Value, Type)> {
+        let loc = self.to_loc(&v.loc);
+        match &v.value {
+            EA::Value_::Address(addr) => {
+                let addr_bytes = self.parent.parent.resolve_address(&loc, addr);
+                let value = Value::Address(BigUint::from_bytes_be(&addr_bytes.into_bytes()));
+                Some((value, Type::new_prim(PrimitiveType::Address)))
+            }
+            EA::Value_::U8(x) => Some((
+                Value::Number(BigInt::from_u8(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U8),
+            )),
+            EA::Value_::U16(x) => Some((
+                Value::Number(BigInt::from_u16(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U16),
+            )),
+            EA::Value_::U32(x) => Some((
+                Value::Number(BigInt::from_u32(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U32),
+            )),
+            EA::Value_::U64(x) => Some((
+                Value::Number(BigInt::from_u64(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U64),
+            )),
+            EA::Value_::U128(x) => Some((
+                Value::Number(BigInt::from_u128(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U128),
+            )),
+            EA::Value_::InferredNum(x) | EA::Value_::U256(x) => Some((
+                Value::Number(BigInt::from(x)),
+                Type::new_prim(PrimitiveType::U256),
+            )),
+            EA::Value_::Bool(x) => Some((Value::Bool(*x), Type::new_prim(PrimitiveType::Bool))),
+            EA::Value_::Bytearray(x) => {
+                let ty = Type::Vector(Box::new(Type::new_prim(PrimitiveType::U8)));
+                Some((Value::ByteArray(x.clone()), ty))
+            }
+        }
+    }
+
+    fn translate_fun_call(
+        &mut self,
+        expected_type: &Type,
+        loc: &Loc,
+        maccess: &Spanned<EA::ModuleAccess_>,
+        generics: Option<&[EA::Type]>,
+        args: &[&EA::Exp],
+    ) -> ExpData {
+        // First check for builtin functions.
+        if let EA::ModuleAccess_::Name(n) = &maccess.value {
+            if n.value.as_str() == "update_field" {
+                return self.translate_update_field(expected_type, loc, generics, args);
+            }
+        }
+        // First check whether this is an Invoke on a function value.
+        if let EA::ModuleAccess_::Name(n) = &maccess.value {
+            let sym = self.symbol_pool().make(&n.value);
+            if let Some(entry) = self.lookup_local(sym, false) {
+                // Check whether the local has the expected function type.
+                let sym_ty = entry.type_.clone();
+                let (arg_types, args) = self.translate_exp_list(args, false);
+                let fun_t = Type::Fun(arg_types, Box::new(expected_type.clone()));
+                let sym_ty = self.check_type(loc, &sym_ty, &fun_t, "in expression");
+                let local_id = self.new_node_id_with_type_loc(&sym_ty, &self.to_loc(&n.loc));
+                let local_var = ExpData::LocalVar(local_id, sym);
+                let id = self.new_node_id_with_type_loc(expected_type, loc);
+                return ExpData::Invoke(id, local_var.into_exp(), args);
+            }
+        }
+        // Next treat this as a call to a global function.
+        let (module_name, name) = self.parent.module_access_to_parts(maccess);
+
+        // Ignore assert statement.
+        if name == self.parent.parent.assert_symbol() {
+            return ExpData::Call(
+                self.new_node_id_with_type_loc(expected_type, &self.to_loc(&maccess.loc)),
+                Operation::NoOp,
+                vec![],
+            );
+        }
+
+        let is_old = module_name.is_none() && name == self.parent.parent.old_symbol();
+        if is_old {
+            match self.old_status {
+                OldExpStatus::NotSupported => {
+                    self.error(loc, "`old(..)` expression not allowed in this context");
+                }
+                OldExpStatus::InsideOld => {
+                    self.error(loc, "`old(..old(..)..)` not allowed");
+                }
+                OldExpStatus::OutsideOld => {
+                    self.old_status = OldExpStatus::InsideOld;
+                }
+            }
+        }
+        let result = self.translate_call(loc, &module_name, name, generics, args, expected_type);
+        if is_old && self.old_status == OldExpStatus::InsideOld {
+            self.old_status = OldExpStatus::OutsideOld;
+        }
+        result
+    }
+
+    /// Translates an expression without any known type expectation. This creates a fresh type
+    /// variable and passes this in as expected type, then returns a pair of this type and the
+    /// translated expression.
+    pub fn translate_exp_free(&mut self, exp: &EA::Exp) -> (Type, ExpData) {
+        let tvar = self.fresh_type_var();
+        let exp = self.translate_exp(exp, &tvar);
+        (self.subs.specialize(&tvar), exp)
+    }
+
+    /// Translates a sequence expression.
+    pub fn translate_seq(
+        &mut self,
+        loc: &Loc,
+        (_, seq): &EA::Sequence,
+        expected_type: &Type,
+    ) -> ExpData {
+        let n = seq.len();
+        if n == 0 {
+            self.error(loc, "block sequence cannot be empty");
+            return self.new_error_exp();
+        }
+        // Process all items before the last one, which must be bindings, and accumulate
+        // declarations for them.
+        let mut decls = vec![];
+        let seq = seq.iter().collect_vec();
+        for item in &seq[0..seq.len() - 1] {
+            match &item.value {
+                EA::SequenceItem_::Bind(list, exp) => {
+                    let (t, e) = self.translate_exp_free(exp);
+                    if list.value.len() != 1 {
+                        self.error(
+                            &self.to_loc(&list.loc),
+                            "[current restriction] tuples not supported in let",
+                        );
+                        return ExpData::Invalid(self.new_node_id());
+                    }
+                    let bind_loc = self.to_loc(&list.value[0].loc);
+                    match &list.value[0].value {
+                        EA::LValue_::Var(_, maccess, _) => {
+                            let name = match &maccess.value {
+                                EA::ModuleAccess_::Name(n) => n,
+                                EA::ModuleAccess_::ModuleAccess(_, n) => n,
+                            };
+                            // Define the local. Currently we mimic
+                            // Rust/ML semantics here, allowing to shadow with each let,
+                            // thus entering a new scope.
+                            self.enter_scope();
+                            let name = self.symbol_pool().make(&name.value);
+                            self.define_local(&bind_loc, name, t.clone(), None, None);
+                            let id = self.new_node_id_with_type_loc(&t, &bind_loc);
+                            decls.push(LocalVarDecl {
+                                id,
+                                name,
+                                binding: Some(e.into_exp()),
+                            });
+                        }
+                        EA::LValue_::Unpack(..) => {
+                            self.error(
+                                &bind_loc,
+                                "[current restriction] unpack not supported in let",
+                            );
+                            return ExpData::Invalid(self.new_node_id());
+                        }
+                    }
+                }
+                EA::SequenceItem_::Seq(e) => {
+                    let translated = self.translate_exp(e, expected_type);
+                    match translated {
+                        ExpData::Call(_, Operation::NoOp, _) => { /* allow assert statement */ }
+                        _ => self.error(
+                            &self.to_loc(&item.loc),
+                            "only binding `let p = e; ...` allowed here",
+                        ),
+                    }
+                }
+                _ => self.error(
+                    &self.to_loc(&item.loc),
+                    "only binding `let p = e; ...` allowed here",
+                ),
+            }
+        }
+
+        // Process the last element, which must be an Exp item.
+        let last = match &seq[n - 1].value {
+            EA::SequenceItem_::Seq(e) => self.translate_exp(e, expected_type),
+            _ => {
+                self.error(
+                    &self.to_loc(&seq[n - 1].loc),
+                    "expected an expression as the last element of the block",
+                );
+                self.new_error_exp()
+            }
+        };
+
+        // Exit the scopes for variable bindings
+        for _ in 0..decls.len() {
+            self.exit_scope();
+        }
+
+        let id = self.new_node_id_with_type_loc(expected_type, loc);
+        ExpData::Block(id, decls, last.into_exp())
+    }
+
+    /// Translates a name. Reports an error if the name is not found.
+    fn translate_name(
+        &mut self,
+        loc: &Loc,
+        maccess: &EA::ModuleAccess,
+        type_args: Option<&[EA::Type]>,
+        expected_type: &Type,
+    ) -> ExpData {
+        let global_var_sym = match &maccess.value {
+            EA::ModuleAccess_::ModuleAccess(..) => self.parent.module_access_to_qualified(maccess),
+            EA::ModuleAccess_::Name(name) => {
+                // First try to resolve simple name as local.
+                let sym = self.symbol_pool().make(name.value.as_str());
+                if let Some(exp) = self.resolve_local(
+                    loc,
+                    sym,
+                    self.old_status == OldExpStatus::InsideOld,
+                    expected_type,
+                ) {
+                    return exp;
+                }
+
+                // If not found, try to resolve as builtin constant.
+                let builtin_sym = self.parent.parent.builtin_qualified_symbol(&name.value);
+                if let Some(entry) = self.parent.parent.const_table.get(&builtin_sym).cloned() {
+                    return self.translate_constant(loc, entry, expected_type);
+                }
+                // If not found, treat as global var in this module.
+                self.parent.qualified_by_module(sym)
+            }
+        };
+        if let Some(entry) = self.parent.parent.const_table.get(&global_var_sym).cloned() {
+            return self.translate_constant(loc, entry, expected_type);
+        }
+
+        if let Some(entry) = self.parent.parent.spec_var_table.get(&global_var_sym) {
+            let type_args = type_args.unwrap_or(&[]);
+            if entry.type_params.len() != type_args.len() {
+                self.error(
+                    loc,
+                    &format!(
+                        "generic count mismatch (expected {} but found {})",
+                        entry.type_params.len(),
+                        type_args.len()
+                    ),
+                );
+                return self.new_error_exp();
+            }
+            let ty = entry.type_.clone();
+            let module_id = entry.module_id;
+            let instantiation = self.translate_types(type_args);
+            let ty = ty.instantiate(&instantiation);
+            let ty = self.check_type(loc, &ty, expected_type, "in spec var expression");
+            // Create expression global<GhostMem>(@0).v which backs up the ghost variable.
+            let ghost_mem_id = StructId::new(
+                self.parent
+                    .parent
+                    .env
+                    .ghost_memory_name(global_var_sym.symbol),
+            );
+            let ghost_mem_ty = Type::Struct(module_id, ghost_mem_id, instantiation.clone());
+            let zero_addr = ExpData::Value(
+                self.new_node_id_with_type_loc(&Type::Primitive(PrimitiveType::Address), loc),
+                Value::Address(BigUint::zero()),
+            );
+            let global_id = self.new_node_id_with_type_loc(&ghost_mem_ty, loc);
+            self.set_node_instantiation(global_id, vec![ghost_mem_ty]);
+            let global_access = ExpData::Call(
+                global_id,
+                Operation::Global(None),
+                vec![zero_addr.into_exp()],
+            );
+            let select_id = self.new_node_id_with_type_loc(&ty, loc);
+            self.set_node_instantiation(select_id, instantiation);
+            return ExpData::Call(
+                select_id,
+                Operation::Select(
+                    module_id,
+                    ghost_mem_id,
+                    FieldId::new(self.symbol_pool().make("v")),
+                ),
+                vec![global_access.into_exp()],
+            );
+        }
+
+        self.error(
+            loc,
+            &format!(
+                "undeclared `{}`",
+                global_var_sym.display(self.symbol_pool())
+            ),
+        );
+        self.new_error_exp()
+    }
+
+    /// Creates an expression for a constant, checking the expected type.
+    fn translate_constant(
+        &mut self,
+        loc: &Loc,
+        entry: ConstEntry,
+        expected_type: &Type,
+    ) -> ExpData {
+        let ConstEntry { ty, value, .. } = entry;
+        let ty = self.check_type(loc, &ty, expected_type, "in const expression");
+        let id = self.new_node_id_with_type_loc(&ty, loc);
+        ExpData::Value(id, value)
+    }
+
+    fn resolve_local(
+        &mut self,
+        loc: &Loc,
+        sym: Symbol,
+        in_old: bool,
+        expected_type: &Type,
+    ) -> Option<ExpData> {
+        if let Some(entry) = self.lookup_local(sym, in_old) {
+            // Make copies of some fields to avoid borrowing issues.
+            let oper_opt = entry.operation.clone();
+            let index_opt = entry.temp_index;
+            let ty = entry.type_.clone();
+            let ty = self.check_type(loc, &ty, expected_type, "in name expression");
+            let id = self.new_node_id_with_type_loc(&ty, loc);
+            if let Some(oper) = oper_opt {
+                Some(ExpData::Call(id, oper, vec![]))
+            } else if let Some(index) = index_opt.filter(|_| !self.translating_fun_as_spec_fun) {
+                // Only create a temporary if we are not currently translating a move function as
+                // a spec function, or a let. In this case, the LocalVarEntry has a bytecode index, but
+                // we do not want to use this if interpreted as a spec fun.
+                Some(ExpData::Temporary(id, index))
+            } else {
+                Some(ExpData::LocalVar(id, sym))
+            }
+        } else {
+            None
+        }
+    }
+
+    #[allow(unused)]
+    pub fn make_context_local_name(&self, name: Symbol, in_old: bool) -> Symbol {
+        if in_old {
+            self.symbol_pool()
+                .make(&format!("{}_$old", name.display(self.symbol_pool())))
+        } else {
+            name
+        }
+    }
+
+    /// Translate an Index expression.
+    fn translate_index(
+        &mut self,
+        loc: &Loc,
+        target: &EA::Exp,
+        index: &EA::Exp,
+        expected_type: &Type,
+    ) -> ExpData {
+        // We must concretize the type of index to decide whether this is a slice
+        // or not. This is not compatible with full type inference, so we may
+        // try to actually represent slicing explicitly in the syntax to fix this.
+        // Alternatively, we could leave it to the backend to figure (after full
+        // type inference) whether this is slice or index.
+        let elem_ty = self.fresh_type_var();
+        let vector_ty = Type::Vector(Box::new(elem_ty.clone()));
+        let vector_exp = self.translate_exp(target, &vector_ty);
+        let (index_ty, ie) = self.translate_exp_free(index);
+        let index_ty = self.subs.specialize(&index_ty);
+        let (result_t, oper) = if let Type::Primitive(PrimitiveType::Range) = &index_ty {
+            (vector_ty, Operation::Slice)
+        } else {
+            // If this is not (known to be) a range, assume its an index.
+            self.check_type(
+                loc,
+                &index_ty,
+                &Type::new_prim(PrimitiveType::Num),
+                "in index expression",
+            );
+            (elem_ty, Operation::Index)
+        };
+        let result_t = self.check_type(loc, &result_t, expected_type, "in index expression");
+        let id = self.new_node_id_with_type_loc(&result_t, loc);
+        ExpData::Call(id, oper, vec![vector_exp.into_exp(), ie.into_exp()])
+    }
+
+    /// Translate a Dotted expression.
+    fn translate_dotted(&mut self, dotted: &EA::ExpDotted, expected_type: &Type) -> ExpData {
+        match &dotted.value {
+            EA::ExpDotted_::Exp(e) => self.translate_exp(e, expected_type),
+            EA::ExpDotted_::Dot(e, n) => {
+                let loc = self.to_loc(&dotted.loc);
+                let ty = self.fresh_type_var();
+                let exp = self.translate_dotted(e.as_ref(), &ty);
+                if let Some((struct_id, field_id, field_ty)) = self.lookup_field(&loc, &ty, n) {
+                    self.check_type(&loc, &field_ty, expected_type, "in field selection");
+                    let id = self.new_node_id_with_type_loc(&field_ty, &loc);
+                    ExpData::Call(
+                        id,
+                        Operation::Select(struct_id.module_id, struct_id.id, field_id),
+                        vec![exp.into_exp()],
+                    )
+                } else {
+                    self.new_error_exp()
+                }
+            }
+        }
+    }
+
+    /// Translate the builtin function `update_field<generics>(args)`. The first arg must
+    /// be a field name, the second the expression to assign the field.
+    fn translate_update_field(
+        &mut self,
+        expected_type: &Type,
+        loc: &Loc,
+        generics: Option<&[EA::Type]>,
+        args: &[&EA::Exp],
+    ) -> ExpData {
+        if generics.is_some() {
+            self.error(loc, "`update_field` cannot have type parameters");
+            return self.new_error_exp();
+        }
+        if args.len() != 3 {
+            self.error(loc, "`update_field` requires 3 arguments");
+            return self.new_error_exp();
+        }
+        let struct_exp = self.translate_exp(args[0], expected_type);
+        let expected_type = &self.subs.specialize(expected_type);
+        if let EA::Exp_::Name(
+            Spanned {
+                value: EA::ModuleAccess_::Name(name),
+                ..
+            },
+            None,
+        ) = &args[1].value
+        {
+            if let Some((struct_id, field_id, field_type)) =
+                self.lookup_field(loc, expected_type, name)
+            {
+                // Translate the new value with the field type as the expected type.
+                let value_exp = self.translate_exp(args[2], &self.subs.specialize(&field_type));
+                let id = self.new_node_id_with_type_loc(expected_type, loc);
+                self.set_node_instantiation(id, vec![expected_type.clone()]);
+                ExpData::Call(
+                    id,
+                    Operation::UpdateField(struct_id.module_id, struct_id.id, field_id),
+                    vec![struct_exp.into_exp(), value_exp.into_exp()],
+                )
+            } else {
+                // Error reported
+                self.new_error_exp()
+            }
+        } else {
+            self.error(
+                loc,
+                "second argument of `update_field` must be a field name",
+            );
+            self.new_error_exp()
+        }
+    }
+
+    /// Loops up a field in a struct. Returns field information or None after reporting errors.
+    fn lookup_field(
+        &mut self,
+        loc: &Loc,
+        struct_ty: &Type,
+        name: &Name,
+    ) -> Option<(QualifiedId<StructId>, FieldId, Type)> {
+        // Similar as with Index, we must concretize the type of the expression on which
+        // field selection is performed, violating pure type inference rules, so we can actually
+        // check and retrieve the field. To avoid this, we would need to introduce the concept
+        // of a type constraint to type unification, where the constraint would be
+        // 'type var X where X has field F'. This makes unification significant more complex,
+        // so lets see how far we get without this.
+        let struct_ty = self.subs.specialize(struct_ty);
+        let field_name = self.symbol_pool().make(&name.value);
+        if let Type::Struct(mid, sid, targs) = &struct_ty {
+            // Lookup the StructEntry in the build. It must be defined for valid
+            // Type::Struct instances.
+            let struct_name = self
+                .parent
+                .parent
+                .reverse_struct_table
+                .get(&(*mid, *sid))
+                .expect("invalid Type::Struct");
+            let entry = self
+                .parent
+                .parent
+                .struct_table
+                .get(struct_name)
+                .expect("invalid Type::Struct");
+            // Lookup the field in the struct.
+            if let Some(fields) = &entry.fields {
+                if let Some((_, field_ty)) = fields.get(&field_name) {
+                    // We must instantiate the field type by the provided type args.
+                    let field_ty = field_ty.instantiate(targs);
+                    Some((
+                        entry.module_id.qualified(entry.struct_id),
+                        FieldId::new(field_name),
+                        field_ty,
+                    ))
+                } else {
+                    self.error(
+                        loc,
+                        &format!(
+                            "field `{}` not declared in struct `{}`",
+                            field_name.display(self.symbol_pool()),
+                            struct_name.display(self.symbol_pool())
+                        ),
+                    );
+                    None
+                }
+            } else {
+                self.error(
+                    loc,
+                    &format!(
+                        "struct `{}` is native and does not support field selection",
+                        struct_name.display(self.symbol_pool())
+                    ),
+                );
+                None
+            }
+        } else {
+            self.error(
+                loc,
+                &format!(
+                    "type `{}` cannot be resolved as a struct",
+                    struct_ty.display(&self.type_display_context()),
+                ),
+            );
+            None
+        }
+    }
+
+    /// Translates a call, performing overload resolution. Reports an error if the function cannot be found.
+    /// This is used to resolve both calls to user spec functions and builtin operators.
+    fn translate_call(
+        &mut self,
+        loc: &Loc,
+        module: &Option<ModuleName>,
+        name: Symbol,
+        generics: Option<&[EA::Type]>,
+        args: &[&EA::Exp],
+        expected_type: &Type,
+    ) -> ExpData {
+        // Translate generic arguments, if any.
+        let generics = generics.as_ref().map(|ts| self.translate_types(ts));
+        // Translate arguments. Skip any lambda expressions; they are resolved after the overload
+        // is identified to avoid restrictions with type inference.
+        let (arg_types, mut translated_args) = self.translate_exp_list(args, true);
+        let args_have_errors = arg_types.iter().any(|t| t == &Type::Error);
+        // Lookup candidates.
+        let cand_modules = if let Some(m) = module {
+            vec![m.clone()]
+        } else {
+            // For an unqualified name, resolve it both in this and in the builtin pseudo module.
+            vec![
+                self.parent.module_name.clone(),
+                self.parent.parent.builtin_module(),
+            ]
+        };
+        let mut cands = vec![];
+        for module_name in cand_modules {
+            let full_name = QualifiedSymbol {
+                module_name,
+                symbol: name,
+            };
+            if let Some(list) = self.parent.parent.spec_fun_table.get(&full_name) {
+                cands.extend_from_slice(list);
+            }
+        }
+        if cands.is_empty() {
+            let display = self.display_call_target(module, name);
+            self.error(loc, &format!("no function named `{}` found", display));
+            return self.new_error_exp();
+        }
+        // Partition candidates in those which matched and which have been outruled.
+        let mut outruled = vec![];
+        let mut matching = vec![];
+        for cand in &cands {
+            if cand.arg_types.len() != translated_args.len() {
+                outruled.push((
+                    cand,
+                    format!(
+                        "argument count mismatch (expected {} but found {})",
+                        cand.arg_types.len(),
+                        translated_args.len()
+                    ),
+                ));
+                continue;
+            }
+            let (instantiation, diag) =
+                self.make_instantiation(cand.type_params.len(), vec![], generics.clone());
+            if let Some(msg) = diag {
+                outruled.push((cand, msg));
+                continue;
+            }
+            // Clone the current substitution, then unify arguments against parameter types.
+            let mut subs = self.subs.clone();
+            let mut success = true;
+            for (i, arg_ty) in arg_types.iter().enumerate() {
+                let instantiated = cand.arg_types[i].instantiate(&instantiation);
+                if let Err(err) = subs.unify(Variance::Allow, arg_ty, &instantiated) {
+                    outruled.push((
+                        cand,
+                        format!(
+                            "{} for argument {}",
+                            err.message(&self.type_display_context()),
+                            i + 1
+                        ),
+                    ));
+                    success = false;
+                    break;
+                }
+            }
+            if success {
+                matching.push((cand, subs, instantiation));
+            }
+        }
+        // Deliver results, reporting errors if there are no or ambiguous matches.
+        match matching.len() {
+            0 => {
+                // Only report error if args had no errors.
+                if !args_have_errors {
+                    let display = self.display_call_target(module, name);
+                    let notes = outruled
+                        .iter()
+                        .map(|(cand, msg)| {
+                            format!(
+                                "outruled candidate `{}` ({})",
+                                self.display_call_cand(module, name, cand),
+                                msg
+                            )
+                        })
+                        .collect_vec();
+                    self.error_with_notes(
+                        loc,
+                        &format!("no matching declaration of `{}`", display),
+                        notes,
+                    );
+                }
+                self.new_error_exp()
+            }
+            1 => {
+                let (cand, subs, instantiation) = matching.remove(0);
+                // Commit the candidate substitution to this expression build.
+                self.subs = subs;
+                // Now translate lambda-based arguments passing expected type to aid type inference.
+                for i in 0..translated_args.len() {
+                    let e = args[i];
+                    if matches!(e.value, EA::Exp_::Lambda(..)) {
+                        let expected_type = self.subs.specialize(&arg_types[i]);
+                        translated_args[i] = self.translate_exp(e, &expected_type).into_exp();
+                    }
+                }
+                // Check result type against expected type.
+                let ty = self.check_type(
+                    loc,
+                    &cand.result_type.instantiate(&instantiation),
+                    expected_type,
+                    "in expression",
+                );
+                // calls to built-in functions might have additional requirements on the types
+                match cand.oper {
+                    Operation::Exists(_) | Operation::Global(_) => {
+                        let ty_inst = &instantiation[0];
+                        if !matches!(ty_inst, Type::Struct(..)) {
+                            self.error(
+                                loc,
+                                &format!(
+                                    "The type argument to `exists` and `global` must be a struct \
+                                    type but {} is not a struct type.",
+                                    ty_inst.display(&self.type_display_context())
+                                ),
+                            );
+                            return self.new_error_exp();
+                        }
+                    }
+                    _ => (),
+                };
+
+                // Construct result.
+                let id = self.new_node_id_with_type_loc(&ty, loc);
+                self.set_node_instantiation(id, instantiation);
+
+                if let Operation::Function(module_id, spec_fun_id, None) = cand.oper {
+                    if !self.translating_fun_as_spec_fun {
+                        // Record the usage of spec function in specs, used later
+                        // in spec build.
+                        self.parent
+                            .parent
+                            .add_used_spec_fun(module_id.qualified(spec_fun_id));
+                    }
+                    let module_name = match module {
+                        Some(m) => m,
+                        _ => &self.parent.module_name,
+                    }
+                    .clone();
+                    let qsym = QualifiedSymbol {
+                        module_name,
+                        symbol: name,
+                    };
+                    // If the spec function called is from a Move function,
+                    // error if it is not pure.
+                    if let Some(entry) = self.parent.parent.fun_table.get(&qsym) {
+                        if !entry.is_pure {
+                            if self.translating_fun_as_spec_fun {
+                                // The Move function is calling another impure Move function,
+                                // so it should be considered impure.
+                                if module_id.to_usize() < self.parent.module_id.to_usize() {
+                                    self.error(loc, "Move function calls impure Move function");
+                                    return self.new_error_exp();
+                                }
+                            } else {
+                                let display = self.display_call_target(module, name);
+                                let notes = vec![format!(
+                                    "impure function `{}`",
+                                    self.display_call_cand(module, name, cand),
+                                )];
+                                self.parent.parent.env.error_with_notes(
+                                    loc,
+                                    &format!(
+                                        "calling impure function `{}` is not allowed",
+                                        display
+                                    ),
+                                    notes,
+                                );
+                                return self.new_error_exp();
+                            }
+                        }
+                    }
+                    self.called_spec_funs.insert((module_id, spec_fun_id));
+                }
+                ExpData::Call(id, cand.oper.clone(), translated_args)
+            }
+            _ => {
+                // Only report error if args had no errors.
+                if !args_have_errors {
+                    let display = self.display_call_target(module, name);
+                    let notes = matching
+                        .iter()
+                        .map(|(cand, _, _)| {
+                            format!(
+                                "matching candidate `{}`",
+                                self.display_call_cand(module, name, cand)
+                            )
+                        })
+                        .collect_vec();
+                    self.parent.parent.env.error_with_notes(
+                        loc,
+                        &format!("ambiguous application of `{}`", display),
+                        notes,
+                    );
+                }
+                self.new_error_exp()
+            }
+        }
+    }
+
+    /// Translate a list of expressions and deliver them together with their types.
+    fn translate_exp_list(
+        &mut self,
+        exps: &[&EA::Exp],
+        skip_lambda: bool,
+    ) -> (Vec<Type>, Vec<Exp>) {
+        let mut types = vec![];
+        let exps = exps
+            .iter()
+            .map(|e| {
+                let (t, e) = if !skip_lambda || !matches!(e.value, EA::Exp_::Lambda(..)) {
+                    let (ty, exp) = self.translate_exp_free(e);
+                    (ty, exp.into_exp())
+                } else {
+                    // In skip-lambda mode, just create a fresh type variable. We translate
+                    // the expression in a second pass, once the expected type is known.
+                    (
+                        self.fresh_type_var(),
+                        ExpData::Invalid(NodeId::new(0)).into_exp(),
+                    )
+                };
+                types.push(t);
+                e
+            })
+            .collect_vec();
+        (types, exps)
+    }
+
+    /// Creates a type instantiation based on provided actual type parameters.
+    fn make_instantiation(
+        &mut self,
+        param_count: usize,
+        context_args: Vec<Type>,
+        user_args: Option<Vec<Type>>,
+    ) -> (Vec<Type>, Option<String>) {
+        let mut args = context_args;
+        let expected_user_count = param_count - args.len();
+        if let Some(types) = user_args {
+            let n = types.len();
+            args.extend(types);
+            if n != expected_user_count {
+                (
+                    args,
+                    Some(format!(
+                        "generic count mismatch (expected {} but found {})",
+                        expected_user_count, n,
+                    )),
+                )
+            } else {
+                (args, None)
+            }
+        } else {
+            // Create fresh type variables for user args
+            for _ in 0..expected_user_count {
+                args.push(self.fresh_type_var());
+            }
+            (args, None)
+        }
+    }
+
+    fn translate_pack(
+        &mut self,
+        loc: &Loc,
+        maccess: &EA::ModuleAccess,
+        generics: &Option<Vec<EA::Type>>,
+        fields: &EA::Fields<EA::Exp>,
+        expected_type: &Type,
+    ) -> ExpData {
+        let struct_name = self.parent.module_access_to_qualified(maccess);
+        let struct_name_loc = self.to_loc(&maccess.loc);
+        let generics = generics.as_ref().map(|ts| self.translate_types(ts));
+        if let Some(entry) = self.parent.parent.struct_table.get(&struct_name) {
+            let entry = entry.clone();
+            let (instantiation, diag) =
+                self.make_instantiation(entry.type_params.len(), vec![], generics);
+            if let Some(msg) = diag {
+                self.error(loc, &msg);
+                return self.new_error_exp();
+            }
+            if let Some(field_decls) = &entry.fields {
+                let mut fields_not_covered: BTreeSet<Symbol> = BTreeSet::new();
+                fields_not_covered.extend(field_decls.keys());
+                let mut args = BTreeMap::new();
+                for (name_loc, name_, (_, exp)) in fields.iter() {
+                    let field_name = self.symbol_pool().make(name_);
+                    if let Some((idx, field_ty)) = field_decls.get(&field_name) {
+                        let exp = self.translate_exp(exp, &field_ty.instantiate(&instantiation));
+                        fields_not_covered.remove(&field_name);
+                        args.insert(idx, exp);
+                    } else {
+                        self.error(
+                            &self.to_loc(&name_loc),
+                            &format!(
+                                "field `{}` not declared in struct `{}`",
+                                field_name.display(self.symbol_pool()),
+                                struct_name.display(self.symbol_pool())
+                            ),
+                        );
+                    }
+                }
+                if !fields_not_covered.is_empty() {
+                    self.error(
+                        loc,
+                        &format!(
+                            "missing fields {}",
+                            fields_not_covered
+                                .iter()
+                                .map(|n| format!("`{}`", n.display(self.symbol_pool())))
+                                .join(", ")
+                        ),
+                    );
+                    self.new_error_exp()
+                } else {
+                    let struct_ty =
+                        Type::Struct(entry.module_id, entry.struct_id, instantiation.clone());
+                    let struct_ty =
+                        self.check_type(loc, &struct_ty, expected_type, "in pack expression");
+                    let mut args = args
+                        .into_iter()
+                        .sorted_by_key(|(i, _)| *i)
+                        .map(|(_, e)| e.into_exp())
+                        .collect_vec();
+                    if args.is_empty() {
+                        // The move compiler inserts a dummy field with the value of false
+                        // for structs with no fields. This is also what we find in the
+                        // Model metadata (i.e. a field `dummy_field`). We simulate this here
+                        // for now, though it would be better to remove it everywhere as it
+                        // can be confusing to users. However, its currently hard to do this,
+                        // because a user could also have defined the `dummy_field`.
+                        let id = self.new_node_id_with_type_loc(&BOOL_TYPE, loc);
+                        args.push(ExpData::Value(id, Value::Bool(false)).into_exp());
+                    }
+                    let id = self.new_node_id_with_type_loc(&struct_ty, loc);
+                    self.set_node_instantiation(id, instantiation);
+                    ExpData::Call(id, Operation::Pack(entry.module_id, entry.struct_id), args)
+                }
+            } else {
+                self.error(
+                    &struct_name_loc,
+                    &format!(
+                        "native struct `{}` cannot be packed",
+                        struct_name.display(self.symbol_pool())
+                    ),
+                );
+                self.new_error_exp()
+            }
+        } else {
+            self.error(
+                &struct_name_loc,
+                &format!(
+                    "undeclared struct `{}`",
+                    struct_name.display(self.symbol_pool())
+                ),
+            );
+            self.new_error_exp()
+        }
+    }
+
+    fn translate_lambda(
+        &mut self,
+        loc: &Loc,
+        bindings: &EA::LValueList,
+        body: &EA::Exp,
+        expected_type: &Type,
+    ) -> ExpData {
+        // Enter the lambda variables into a new local scope and collect their declarations.
+        self.enter_scope();
+        let mut decls = vec![];
+        let mut arg_types = vec![];
+        for bind in &bindings.value {
+            let loc = self.to_loc(&bind.loc);
+            match &bind.value {
+                EA::LValue_::Var(
+                    _,
+                    Spanned {
+                        value: EA::ModuleAccess_::Name(n),
+                        ..
+                    },
+                    _,
+                ) => {
+                    let name = self.symbol_pool().make(&n.value);
+                    let ty = self.fresh_type_var();
+                    let id = self.new_node_id_with_type_loc(&ty, &loc);
+                    self.define_local(&loc, name, ty.clone(), None, None);
+                    arg_types.push(ty);
+                    decls.push(LocalVarDecl {
+                        id,
+                        name,
+                        binding: None,
+                    });
+                }
+                EA::LValue_::Unpack(..) | EA::LValue_::Var(..) => {
+                    self.error(&loc, "[current restriction] tuples not supported in lambda")
+                }
+            }
+        }
+        // Create a fresh type variable for the body and check expected type before analyzing
+        // body. This aids type inference for the lambda parameters.
+        let ty = self.fresh_type_var();
+        let rty = self.check_type(
+            loc,
+            &Type::Fun(arg_types, Box::new(ty.clone())),
+            expected_type,
+            "in lambda",
+        );
+        let rbody = self.translate_exp(body, &ty);
+        self.exit_scope();
+        let id = self.new_node_id_with_type_loc(&rty, loc);
+        ExpData::Lambda(id, decls, rbody.into_exp())
+    }
+
+    fn translate_quant(
+        &mut self,
+        loc: &Loc,
+        kind: PA::QuantKind,
+        ranges: &EA::LValueWithRangeList,
+        triggers: &[Vec<EA::Exp>],
+        condition: &Option<Box<EA::Exp>>,
+        body: &EA::Exp,
+        expected_type: &Type,
+    ) -> ExpData {
+        let rkind = match kind.value {
+            PA::QuantKind_::Forall => QuantKind::Forall,
+            PA::QuantKind_::Exists => QuantKind::Exists,
+            PA::QuantKind_::Choose => QuantKind::Choose,
+            PA::QuantKind_::ChooseMin => QuantKind::ChooseMin,
+        };
+
+        // Enter the quantifier variables into a new local scope and collect their declarations.
+        self.enter_scope();
+        let mut rranges = vec![];
+        for range in &ranges.value {
+            // The quantified variable and its domain expression.
+            let (bind, exp) = &range.value;
+            let loc = self.to_loc(&bind.loc);
+            let (exp_ty, rexp) = self.translate_exp_free(exp);
+            let ty = self.fresh_type_var();
+            let exp_ty = self.subs.specialize(&exp_ty);
+            match &exp_ty {
+                Type::Vector(..) => {
+                    self.check_type(
+                        &loc,
+                        &exp_ty,
+                        &Type::Vector(Box::new(ty.clone())),
+                        "in quantification over vector",
+                    );
+                }
+                Type::TypeDomain(..) => {
+                    self.check_type(
+                        &loc,
+                        &exp_ty,
+                        &Type::TypeDomain(Box::new(ty.clone())),
+                        "in quantification over domain",
+                    );
+                }
+                Type::Primitive(PrimitiveType::Range) => {
+                    self.check_type(
+                        &loc,
+                        &ty,
+                        &Type::Primitive(PrimitiveType::Num),
+                        "in quantification over range",
+                    );
+                }
+                _ => {
+                    self.error(&loc, "quantified variables must range over a vector, a type domain, or a number range");
+                    return self.new_error_exp();
+                }
+            }
+            match &bind.value {
+                EA::LValue_::Var(
+                    _,
+                    Spanned {
+                        value: EA::ModuleAccess_::Name(n),
+                        ..
+                    },
+                    _,
+                ) => {
+                    let name = self.symbol_pool().make(&n.value);
+                    let id = self.new_node_id_with_type_loc(&ty, &loc);
+                    self.define_local(&loc, name, ty.clone(), None, None);
+                    let rbind = LocalVarDecl {
+                        id,
+                        name,
+                        binding: None,
+                    };
+                    rranges.push((rbind, rexp.into_exp()));
+                }
+                EA::LValue_::Unpack(..) | EA::LValue_::Var(..) => self.error(
+                    &loc,
+                    "[current restriction] tuples not supported in quantifiers",
+                ),
+            }
+        }
+        let rtriggers = triggers
+            .iter()
+            .map(|trigger| {
+                trigger
+                    .iter()
+                    .map(|e| self.translate_exp_free(e).1.into_exp())
+                    .collect()
+            })
+            .collect();
+        let rbody = self.translate_exp(body, &BOOL_TYPE);
+        let rcondition = condition
+            .as_ref()
+            .map(|cond| self.translate_exp(cond, &BOOL_TYPE).into_exp());
+        self.exit_scope();
+        let quant_ty = if rkind.is_choice() {
+            self.parent.parent.env.get_node_type(rranges[0].0.id)
+        } else {
+            BOOL_TYPE.clone()
+        };
+        self.check_type(loc, &quant_ty, expected_type, "in quantifier expression");
+        let id = self.new_node_id_with_type_loc(&quant_ty, loc);
+        ExpData::Quant(id, rkind, rranges, rtriggers, rcondition, rbody.into_exp())
+    }
+
+    pub fn check_type(&mut self, loc: &Loc, ty: &Type, expected: &Type, context_msg: &str) -> Type {
+        // Because of Rust borrow semantics, we must temporarily detach the substitution from
+        // the build. This is because we also need to inherently borrow self via the
+        // type_display_context which is passed into unification.
+        let mut subs = std::mem::replace(&mut self.subs, Substitution::new());
+        let result = match subs.unify(Variance::Shallow, ty, expected) {
+            Ok(t) => t,
+            Err(err) => {
+                self.error(
+                    loc,
+                    &format!(
+                        "{} {}",
+                        err.message(&self.type_display_context()),
+                        context_msg
+                    ),
+                );
+                Type::Error
+            }
+        };
+        self.subs = subs;
+        result
+    }
+
+    pub fn translate_from_move_value(&self, loc: &Loc, ty: &Type, value: &MoveValue) -> Value {
+        match (ty, value) {
+            (_, MoveValue::U8(n)) => Value::Number(BigInt::from_u8(*n).unwrap()),
+            (_, MoveValue::U16(n)) => Value::Number(BigInt::from_u16(*n).unwrap()),
+            (_, MoveValue::U32(n)) => Value::Number(BigInt::from_u32(*n).unwrap()),
+            (_, MoveValue::U64(n)) => Value::Number(BigInt::from_u64(*n).unwrap()),
+            (_, MoveValue::U128(n)) => Value::Number(BigInt::from_u128(*n).unwrap()),
+            (_, MoveValue::U256(n)) => Value::Number(BigInt::from(n)),
+            (_, MoveValue::Bool(b)) => Value::Bool(*b),
+            (_, MoveValue::Address(a)) => Value::Address(crate::addr_to_big_uint(a)),
+            (_, MoveValue::Signer(a)) => Value::Address(crate::addr_to_big_uint(a)),
+            (Type::Vector(inner), MoveValue::Vector(vs)) => match **inner {
+                Type::Primitive(PrimitiveType::U8) => {
+                    let b = vs
+                        .iter()
+                        .filter_map(|v| match v {
+                            MoveValue::U8(n) => Some(*n),
+                            _ => {
+                                self.error(loc, &format!("Expected u8 type, buf found: {:?}", v));
+                                None
+                            }
+                        })
+                        .collect::<Vec<u8>>();
+                    Value::ByteArray(b)
+                }
+                Type::Primitive(PrimitiveType::Address) => {
+                    let b = vs
+                        .iter()
+                        .filter_map(|v| match v {
+                            MoveValue::Address(a) => Some(crate::addr_to_big_uint(a)),
+                            _ => {
+                                self.error(
+                                    loc,
+                                    &format!("Expected address type, but found: {:?}", v),
+                                );
+                                None
+                            }
+                        })
+                        .collect::<Vec<BigUint>>();
+                    Value::AddressArray(b)
+                }
+                _ => {
+                    let b = vs
+                        .iter()
+                        .map(|v| self.translate_from_move_value(loc, inner, v))
+                        .collect::<Vec<Value>>();
+                    Value::Vector(b)
+                }
+            },
+            (Type::Primitive(_), MoveValue::Vector(_))
+            | (Type::Primitive(_), MoveValue::Struct(_))
+            | (Type::Tuple(_), MoveValue::Vector(_))
+            | (Type::Tuple(_), MoveValue::Struct(_))
+            | (Type::Vector(_), MoveValue::Struct(_))
+            | (Type::Struct(_, _, _), MoveValue::Vector(_))
+            | (Type::Struct(_, _, _), MoveValue::Struct(_))
+            | (Type::TypeParameter(_), MoveValue::Vector(_))
+            | (Type::TypeParameter(_), MoveValue::Struct(_))
+            | (Type::Reference(_, _), MoveValue::Vector(_))
+            | (Type::Reference(_, _), MoveValue::Struct(_))
+            | (Type::Fun(_, _), MoveValue::Vector(_))
+            | (Type::Fun(_, _), MoveValue::Struct(_))
+            | (Type::TypeDomain(_), MoveValue::Vector(_))
+            | (Type::TypeDomain(_), MoveValue::Struct(_))
+            | (Type::ResourceDomain(_, _, _), MoveValue::Vector(_))
+            | (Type::ResourceDomain(_, _, _), MoveValue::Struct(_))
+            | (Type::Error, MoveValue::Vector(_))
+            | (Type::Error, MoveValue::Struct(_))
+            | (Type::Var(_), MoveValue::Vector(_))
+            | (Type::Var(_), MoveValue::Struct(_)) => {
+                self.error(
+                    loc,
+                    &format!("Not yet supported constant value: {:?}", value),
+                );
+                Value::Bool(false)
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-model/src/builder/mod.rs b/vendors/move/crates/move-model/src/builder/mod.rs
new file mode 100644
index 000000000..8764add6a
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod exp_translator;
+pub(crate) mod model_builder;
+pub(crate) mod module_builder;
+mod spec_builtins;
diff --git a/vendors/move/crates/move-model/src/builder/model_builder.rs b/vendors/move/crates/move-model/src/builder/model_builder.rs
new file mode 100644
index 000000000..e73293630
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/model_builder.rs
@@ -0,0 +1,433 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Translates and validates specification language fragments as they are output from the Move
+//! compiler's expansion phase and adds them to the environment (which was initialized from the
+//! byte code). This includes identifying the Move sub-language supported by the specification
+//! system, as well as type checking it and translating it to the spec language ast.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use codespan_reporting::diagnostic::Severity;
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+use num::BigUint;
+
+use move_compiler::{expansion::ast as EA, parser::ast as PA, shared::NumericalAddress};
+
+use crate::{
+    ast::{Attribute, ModuleName, Operation, QualifiedSymbol, Spec, Value},
+    builder::spec_builtins,
+    intrinsics::IntrinsicDecl,
+    model::{
+        FunId, FunctionVisibility, GlobalEnv, Loc, ModuleId, QualifiedId, SpecFunId, SpecVarId,
+        StructId,
+    },
+    project_2nd,
+    symbol::Symbol,
+    ty::Type,
+};
+
+/// A builder is used to enter a sequence of modules in acyclic dependency order into the model. The
+/// builder maintains the incremental state of this process, such that the various tables
+/// are extended with each module translated. Each table is a mapping from fully qualified names
+/// (module names plus item name in the module) to the entity.
+#[derive(Debug)]
+pub(crate) struct ModelBuilder<'env> {
+    /// The global environment we are building.
+    pub env: &'env mut GlobalEnv,
+    /// A symbol table for specification functions. Because of overloading, and entry can
+    /// contain multiple functions.
+    pub spec_fun_table: BTreeMap<QualifiedSymbol, Vec<SpecFunEntry>>,
+    /// A symbol table for specification variables.
+    pub spec_var_table: BTreeMap<QualifiedSymbol, SpecVarEntry>,
+    /// A symbol table for specification schemas.
+    pub spec_schema_table: BTreeMap<QualifiedSymbol, SpecSchemaEntry>,
+    /// A symbol table storing unused schemas, used later to generate warnings. All schemas
+    /// are initially in the table and are removed when they are used in expressions.
+    pub unused_schema_set: BTreeSet<QualifiedSymbol>,
+    /// A symbol table for structs.
+    pub struct_table: BTreeMap<QualifiedSymbol, StructEntry>,
+    /// A reverse mapping from ModuleId/StructId pairs to QualifiedSymbol. This
+    /// is used for visualization of types in error messages.
+    pub reverse_struct_table: BTreeMap<(ModuleId, StructId), QualifiedSymbol>,
+    /// A symbol table for functions.
+    pub fun_table: BTreeMap<QualifiedSymbol, FunEntry>,
+    /// A symbol table for constants.
+    pub const_table: BTreeMap<QualifiedSymbol, ConstEntry>,
+    /// A call graph mapping callers to callees that are Move functions.
+    pub move_fun_call_graph: BTreeMap<QualifiedId<SpecFunId>, BTreeSet<QualifiedId<SpecFunId>>>,
+    /// A list of intrinsic declarations
+    pub intrinsics: Vec<IntrinsicDecl>,
+}
+
+/// A declaration of a specification function or operator in the builders state.
+#[derive(Debug, Clone)]
+pub(crate) struct SpecFunEntry {
+    #[allow(dead_code)]
+    pub loc: Loc,
+    pub oper: Operation,
+    pub type_params: Vec<Type>,
+    pub arg_types: Vec<Type>,
+    pub result_type: Type,
+}
+
+/// A declaration of a specification variable in the builders state.
+#[derive(Debug, Clone)]
+pub(crate) struct SpecVarEntry {
+    pub loc: Loc,
+    pub module_id: ModuleId,
+    #[allow(dead_code)]
+    pub var_id: SpecVarId,
+    pub type_params: Vec<(Symbol, Type)>,
+    pub type_: Type,
+}
+
+/// A declaration of a schema in the builders state.
+#[derive(Debug)]
+pub(crate) struct SpecSchemaEntry {
+    pub loc: Loc,
+    #[allow(dead_code)]
+    pub name: QualifiedSymbol,
+    pub module_id: ModuleId,
+    pub type_params: Vec<(Symbol, Type)>,
+    // The local variables declared in the schema.
+    pub vars: Vec<(Symbol, Type)>,
+    // The specifications in in this schema.
+    pub spec: Spec,
+    // All variables in scope of this schema, including those introduced by included schemas.
+    pub all_vars: BTreeMap<Symbol, LocalVarEntry>,
+    // The specification included from other schemas, after renaming and type instantiation.
+    pub included_spec: Spec,
+}
+
+/// A declaration of a struct.
+#[derive(Debug, Clone)]
+pub(crate) struct StructEntry {
+    pub loc: Loc,
+    pub module_id: ModuleId,
+    pub struct_id: StructId,
+    #[allow(dead_code)]
+    pub is_resource: bool,
+    pub type_params: Vec<(Symbol, Type)>,
+    pub fields: Option<BTreeMap<Symbol, (usize, Type)>>,
+    pub attributes: Vec<Attribute>,
+}
+
+/// A declaration of a function.
+#[derive(Debug, Clone)]
+pub(crate) struct FunEntry {
+    pub loc: Loc,
+    pub module_id: ModuleId,
+    pub fun_id: FunId,
+    pub visibility: FunctionVisibility,
+    pub is_entry: bool,
+    pub type_params: Vec<(Symbol, Type)>,
+    pub params: Vec<(Symbol, Type)>,
+    pub result_type: Type,
+    pub is_pure: bool,
+    pub attributes: Vec<Attribute>,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct ConstEntry {
+    pub loc: Loc,
+    pub ty: Type,
+    pub value: Value,
+}
+
+impl<'env> ModelBuilder<'env> {
+    /// Creates a builders.
+    pub fn new(env: &'env mut GlobalEnv) -> Self {
+        let mut translator = ModelBuilder {
+            env,
+            spec_fun_table: BTreeMap::new(),
+            spec_var_table: BTreeMap::new(),
+            spec_schema_table: BTreeMap::new(),
+            unused_schema_set: BTreeSet::new(),
+            struct_table: BTreeMap::new(),
+            reverse_struct_table: BTreeMap::new(),
+            fun_table: BTreeMap::new(),
+            const_table: BTreeMap::new(),
+            move_fun_call_graph: BTreeMap::new(),
+            intrinsics: Default::default(),
+        };
+        spec_builtins::declare_spec_builtins(&mut translator);
+        translator
+    }
+
+    /// Shortcut for translating a Move AST location into ours.
+    pub fn to_loc(&self, loc: &move_ir_types::location::Loc) -> Loc {
+        self.env.to_loc(loc)
+    }
+
+    /// Reports a type checking error.
+    pub fn error(&self, at: &Loc, msg: &str) {
+        self.env.error(at, msg)
+    }
+
+    /// Reports a type checking error with notes.
+    pub fn error_with_notes(&self, at: &Loc, msg: &str, notes: Vec<String>) {
+        self.env.error_with_notes(at, msg, notes)
+    }
+
+    /// Defines a spec function, adding it to the spec fun table.
+    pub fn define_spec_fun(&mut self, name: QualifiedSymbol, entry: SpecFunEntry) {
+        // TODO: check whether overloads are distinguishable
+        self.spec_fun_table.entry(name).or_default().push(entry);
+    }
+
+    /// Defines a spec variable.
+    pub fn define_spec_var(
+        &mut self,
+        loc: &Loc,
+        name: QualifiedSymbol,
+        module_id: ModuleId,
+        var_id: SpecVarId,
+        type_params: Vec<(Symbol, Type)>,
+        type_: Type,
+    ) {
+        let entry = SpecVarEntry {
+            loc: loc.clone(),
+            module_id,
+            var_id,
+            type_params,
+            type_,
+        };
+        if let Some(old) = self.spec_var_table.insert(name.clone(), entry) {
+            let var_name = name.display(self.env.symbol_pool());
+            self.error(loc, &format!("duplicate declaration of `{}`", var_name));
+            self.error(&old.loc, &format!("previous declaration of `{}`", var_name));
+        }
+    }
+
+    /// Defines a spec schema.
+    pub fn define_spec_schema(
+        &mut self,
+        loc: &Loc,
+        name: QualifiedSymbol,
+        module_id: ModuleId,
+        type_params: Vec<(Symbol, Type)>,
+        vars: Vec<(Symbol, Type)>,
+    ) {
+        let entry = SpecSchemaEntry {
+            loc: loc.clone(),
+            name: name.clone(),
+            module_id,
+            type_params,
+            vars,
+            spec: Spec::default(),
+            all_vars: BTreeMap::new(),
+            included_spec: Spec::default(),
+        };
+        if let Some(old) = self.spec_schema_table.insert(name.clone(), entry) {
+            let schema_display = name.display(self.env.symbol_pool());
+            self.error(
+                loc,
+                &format!("duplicate declaration of `{}`", schema_display),
+            );
+            self.error(
+                &old.loc,
+                &format!("previous declaration of `{}`", schema_display),
+            );
+        }
+        self.unused_schema_set.insert(name);
+    }
+
+    /// Defines a struct type.
+    pub fn define_struct(
+        &mut self,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        name: QualifiedSymbol,
+        module_id: ModuleId,
+        struct_id: StructId,
+        is_resource: bool,
+        type_params: Vec<(Symbol, Type)>,
+        fields: Option<BTreeMap<Symbol, (usize, Type)>>,
+    ) {
+        let entry = StructEntry {
+            loc,
+            attributes,
+            module_id,
+            struct_id,
+            is_resource,
+            type_params,
+            fields,
+        };
+        // Duplicate declarations have been checked by the Move compiler.
+        assert!(self.struct_table.insert(name.clone(), entry).is_none());
+        self.reverse_struct_table
+            .insert((module_id, struct_id), name);
+    }
+
+    /// Defines a function.
+    pub fn define_fun(
+        &mut self,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        name: QualifiedSymbol,
+        module_id: ModuleId,
+        fun_id: FunId,
+        visibility: FunctionVisibility,
+        is_entry: bool,
+        type_params: Vec<(Symbol, Type)>,
+        params: Vec<(Symbol, Type)>,
+        result_type: Type,
+    ) {
+        let entry = FunEntry {
+            loc,
+            attributes,
+            module_id,
+            fun_id,
+            visibility,
+            is_entry,
+            type_params,
+            params,
+            result_type,
+            is_pure: false,
+        };
+        // Duplicate declarations have been checked by the Move compiler.
+        assert!(self.fun_table.insert(name, entry).is_none());
+    }
+
+    /// Defines a constant.
+    pub fn define_const(&mut self, name: QualifiedSymbol, entry: ConstEntry) {
+        // Duplicate declarations have been checked by the Move compiler.
+        assert!(self.const_table.insert(name, entry).is_none());
+    }
+
+    pub fn resolve_address(&self, loc: &Loc, addr: &EA::Address) -> NumericalAddress {
+        match addr {
+            EA::Address::Numerical { value: bytes, .. } => bytes.value,
+            EA::Address::NamedUnassigned(name) => {
+                self.error(loc, &format!("Undeclared address `{}`", name));
+                NumericalAddress::DEFAULT_ERROR_ADDRESS
+            }
+        }
+    }
+
+    /// Looks up a type (struct), reporting an error if it is not found.
+    pub fn lookup_type(&self, loc: &Loc, name: &QualifiedSymbol) -> Type {
+        self.struct_table
+            .get(name)
+            .cloned()
+            .map(|e| Type::Struct(e.module_id, e.struct_id, project_2nd(&e.type_params)))
+            .unwrap_or_else(|| {
+                self.error(
+                    loc,
+                    &format!("undeclared `{}`", name.display_full(self.env.symbol_pool())),
+                );
+                Type::Error
+            })
+    }
+
+    // Generate warnings about unused schemas.
+    pub fn warn_unused_schemas(&self) {
+        for name in &self.unused_schema_set {
+            let entry = self.spec_schema_table.get(name).expect("schema defined");
+            let schema_name = name.display_simple(self.env.symbol_pool()).to_string();
+            let module_env = self.env.get_module(entry.module_id);
+            // Warn about unused schema only if the module is a target and schema name
+            // does not start with 'UNUSED'
+            if module_env.is_target() && !schema_name.starts_with("UNUSED") {
+                self.env.diag(
+                    Severity::Note,
+                    &entry.loc,
+                    &format!("unused schema {}", name.display(self.env.symbol_pool())),
+                );
+            }
+        }
+    }
+
+    /// Returns the symbol for a binary op.
+    pub fn bin_op_symbol(&self, op: &PA::BinOp_) -> QualifiedSymbol {
+        QualifiedSymbol {
+            module_name: self.builtin_module(),
+            symbol: self.env.symbol_pool().make(op.symbol()),
+        }
+    }
+
+    /// Returns the symbol for a unary op.
+    pub fn unary_op_symbol(&self, op: &PA::UnaryOp_) -> QualifiedSymbol {
+        QualifiedSymbol {
+            module_name: self.builtin_module(),
+            symbol: self.env.symbol_pool().make(op.symbol()),
+        }
+    }
+
+    /// Returns the symbol for a name in the builtin module.
+    pub fn builtin_qualified_symbol(&self, name: &str) -> QualifiedSymbol {
+        QualifiedSymbol {
+            module_name: self.builtin_module(),
+            symbol: self.env.symbol_pool().make(name),
+        }
+    }
+
+    /// Returns the symbol for the builtin function `old`.
+    pub fn old_symbol(&self) -> Symbol {
+        self.env.symbol_pool().make("old")
+    }
+
+    /// Returns the symbol for the builtin Move function `assert`.
+    pub fn assert_symbol(&self) -> Symbol {
+        self.env.symbol_pool().make("assert")
+    }
+
+    /// Returns the name for the pseudo builtin module.
+    pub fn builtin_module(&self) -> ModuleName {
+        ModuleName::new(BigUint::default(), self.env.symbol_pool().make("$$"))
+    }
+
+    /// Adds a spec function to used_spec_funs set.
+    pub fn add_used_spec_fun(&mut self, qid: QualifiedId<SpecFunId>) {
+        self.env.used_spec_funs.insert(qid);
+        self.propagate_move_fun_usage(qid);
+    }
+
+    /// Adds an edge from the caller to the callee to the Move fun call graph. The callee is
+    /// is instantiated in dependency of the type parameters of the caller.
+    pub fn add_edge_to_move_fun_call_graph(
+        &mut self,
+        caller: QualifiedId<SpecFunId>,
+        callee: QualifiedId<SpecFunId>,
+    ) {
+        self.move_fun_call_graph
+            .entry(caller)
+            .or_default()
+            .insert(callee);
+    }
+
+    /// Runs DFS to propagate the usage of Move functions from callers
+    /// to callees on the call graph.
+    pub fn propagate_move_fun_usage(&mut self, qid: QualifiedId<SpecFunId>) {
+        if let Some(neighbors) = self.move_fun_call_graph.get(&qid) {
+            neighbors.clone().iter().for_each(|n| {
+                if self.env.used_spec_funs.insert(*n) {
+                    // If the callee's usage has not been recorded, recursively
+                    // propagate the usage to the callee's callees, and so on.
+                    self.propagate_move_fun_usage(*n);
+                }
+            });
+        }
+    }
+
+    /// Pass model-level information to the global env
+    pub fn populate_env(&mut self) {
+        // register all intrinsic declarations
+        for decl in &self.intrinsics {
+            self.env.intrinsics.add_decl(decl);
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct LocalVarEntry {
+    pub loc: Loc,
+    pub type_: Type,
+    /// If this local is associated with an operation, this is set.
+    pub operation: Option<Operation>,
+    /// If this a temporary from Move code, this is it's index.
+    pub temp_index: Option<usize>,
+}
diff --git a/vendors/move/crates/move-model/src/builder/module_builder.rs b/vendors/move/crates/move-model/src/builder/module_builder.rs
new file mode 100644
index 000000000..54a9cc337
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/module_builder.rs
@@ -0,0 +1,3268 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    default::Default,
+    fmt,
+};
+
+use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
+use regex::Regex;
+
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{AbilitySet, Constant, FunctionDefinitionIndex, StructDefinitionIndex},
+    views::{FunctionHandleView, StructHandleView},
+    CompiledModule,
+};
+use move_bytecode_source_map::source_map::SourceMap;
+use move_compiler::{
+    compiled_unit::{FunctionInfo, SpecInfo},
+    expansion::ast as EA,
+    parser::ast as PA,
+    shared::{unique_map::UniqueMap, Name},
+};
+use move_ir_types::{ast::ConstantName, location::Spanned};
+
+use crate::{
+    ast::{
+        Attribute, AttributeValue, Condition, ConditionKind, Exp, ExpData, GlobalInvariant,
+        ModuleName, Operation, PropertyBag, PropertyValue, QualifiedSymbol, Spec, SpecBlockInfo,
+        SpecBlockTarget, SpecFunDecl, SpecVarDecl, Value,
+    },
+    builder::{
+        exp_translator::ExpTranslator,
+        model_builder::{ConstEntry, LocalVarEntry, ModelBuilder, SpecFunEntry},
+    },
+    exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
+    intrinsics::process_intrinsic_declaration,
+    model::{
+        AbilityConstraint, FieldId, FunId, FunctionData, FunctionVisibility, Loc, ModuleId,
+        MoveIrLoc, NamedConstantData, NamedConstantId, NodeId, QualifiedId, QualifiedInstId,
+        SchemaId, SpecFunId, SpecVarId, StructData, StructId, TypeParameter,
+        SCRIPT_BYTECODE_FUN_NAME,
+    },
+    options::ModelBuilderOptions,
+    pragmas::{
+        is_pragma_valid_for_block, is_property_valid_for_condition, CONDITION_ABSTRACT_PROP,
+        CONDITION_CONCRETE_PROP, CONDITION_DEACTIVATED_PROP, CONDITION_INJECTED_PROP,
+        OPAQUE_PRAGMA, VERIFY_PRAGMA,
+    },
+    project_1st,
+    symbol::{Symbol, SymbolPool},
+    ty::{PrimitiveType, Type, BOOL_TYPE},
+};
+
+#[derive(Debug)]
+pub(crate) struct ModuleBuilder<'env, 'translator> {
+    pub parent: &'translator mut ModelBuilder<'env>,
+    /// Id of the currently build module.
+    pub module_id: ModuleId,
+    /// Name of the currently build module.
+    pub module_name: ModuleName,
+    /// Translated specification functions.
+    pub spec_funs: Vec<SpecFunDecl>,
+    /// During the definition analysis, the index into `spec_funs` we are currently
+    /// handling
+    pub spec_fun_index: usize,
+    /// Translated specification variables.
+    pub spec_vars: Vec<SpecVarDecl>,
+    /// Translated function specifications.
+    pub fun_specs: BTreeMap<Symbol, Spec>,
+    /// Translated struct specifications.
+    pub struct_specs: BTreeMap<Symbol, Spec>,
+    /// Translated module spec
+    pub module_spec: Spec,
+    /// Spec block infos.
+    pub spec_block_infos: Vec<SpecBlockInfo>,
+    /// Let bindings for the current spec block, characterized by a boolean indicating whether
+    /// post state is active and the node id of the original expression of the let.
+    pub spec_block_lets: BTreeMap<Symbol, (bool, NodeId)>,
+}
+
+/// A value which we pass in to spec block analyzers, describing the resolved target of the spec
+/// block.
+#[derive(Debug)]
+pub enum SpecBlockContext<'a> {
+    Module,
+    Struct(QualifiedSymbol),
+    Function(QualifiedSymbol),
+    FunctionCode(QualifiedSymbol, &'a SpecInfo),
+    Schema(QualifiedSymbol),
+}
+
+impl<'a> fmt::Display for SpecBlockContext<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use SpecBlockContext::*;
+        match self {
+            Module => write!(f, "module context")?,
+            Struct(..) => write!(f, "struct context")?,
+            Function(..) => write!(f, "function context")?,
+            FunctionCode(..) => write!(f, "code context")?,
+            Schema(..) => write!(f, "schema context")?,
+        }
+        Ok(())
+    }
+}
+
+/// # Entry Points
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    pub fn new(
+        parent: &'translator mut ModelBuilder<'env>,
+        module_id: ModuleId,
+        module_name: ModuleName,
+    ) -> Self {
+        Self {
+            parent,
+            module_id,
+            module_name,
+            spec_funs: vec![],
+            spec_fun_index: 0,
+            spec_vars: vec![],
+            fun_specs: BTreeMap::new(),
+            struct_specs: BTreeMap::new(),
+            module_spec: Spec::default(),
+            spec_block_infos: Default::default(),
+            spec_block_lets: BTreeMap::new(),
+        }
+    }
+
+    /// Translates the given module definition from the Move compiler's expansion phase,
+    /// combined with a compiled module (bytecode) and a source map, and enters it into
+    /// this global environment. Any type check or others errors encountered will be collected
+    /// in the environment for later processing. Dependencies of this module are guaranteed to
+    /// have been analyzed and being already part of the environment.
+    ///
+    /// Translation happens in three phases:
+    ///
+    /// 1. In the *declaration analysis*, we collect all information about structs, functions,
+    ///    spec functions, spec vars, and schemas in a module. We do not yet analyze function
+    ///    bodies, conditions, and invariants, which we can only analyze after we know all
+    ///    global declarations (declaration of globals is order independent, and they can have
+    ///    cyclic references).
+    /// 2. In the *definition analysis*, we visit the definitions we have skipped in step (1),
+    ///    specifically analyzing and type checking expressions and schema inclusions.
+    /// 3. In the *population phase*, we populate the global environment with the information
+    ///    from this module.
+    pub fn translate(
+        &mut self,
+        loc: Loc,
+        module_def: EA::ModuleDefinition,
+        compiled_module: CompiledModule,
+        source_map: SourceMap,
+        function_infos: UniqueMap<PA::FunctionName, FunctionInfo>,
+    ) {
+        self.decl_ana(&module_def, &compiled_module, &source_map);
+        self.def_ana(&module_def, function_infos);
+        self.collect_spec_block_infos(&module_def);
+        let attrs = self.translate_attributes(&module_def.attributes);
+        self.populate_env_from_result(loc, attrs, compiled_module, source_map);
+    }
+}
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Shortcut for accessing the symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        self.parent.env.symbol_pool()
+    }
+
+    /// Qualifies the given symbol by the current module.
+    pub fn qualified_by_module(&self, sym: Symbol) -> QualifiedSymbol {
+        QualifiedSymbol {
+            module_name: self.module_name.clone(),
+            symbol: sym,
+        }
+    }
+
+    /// Qualifies the given name by the current module.
+    fn qualified_by_module_from_name(&self, name: &Name) -> QualifiedSymbol {
+        let sym = self.symbol_pool().make(&name.value);
+        self.qualified_by_module(sym)
+    }
+
+    /// Converts a ModuleAccess into its parts, an optional ModuleName and base name.
+    pub fn module_access_to_parts(
+        &self,
+        access: &EA::ModuleAccess,
+    ) -> (Option<ModuleName>, Symbol) {
+        match &access.value {
+            EA::ModuleAccess_::Name(n) => (None, self.symbol_pool().make(n.value.as_str())),
+            EA::ModuleAccess_::ModuleAccess(m, n) => {
+                let loc = self.parent.to_loc(&m.loc);
+                let addr_bytes = self.parent.resolve_address(&loc, &m.value.address);
+                let module_name = ModuleName::from_address_bytes_and_name(
+                    addr_bytes,
+                    self.symbol_pool().make(m.value.module.0.value.as_str()),
+                );
+                (Some(module_name), self.symbol_pool().make(n.value.as_str()))
+            }
+        }
+    }
+
+    /// Converts a ModuleAccess into a qualified symbol which can be used for lookup of
+    /// types or functions.
+    pub fn module_access_to_qualified(&self, access: &EA::ModuleAccess) -> QualifiedSymbol {
+        let (module_name_opt, symbol) = self.module_access_to_parts(access);
+        let module_name = module_name_opt.unwrap_or_else(|| self.module_name.clone());
+        QualifiedSymbol {
+            module_name,
+            symbol,
+        }
+    }
+
+    /// Creates a SpecBlockContext from the given SpecBlockTarget. The context is used during
+    /// definition analysis when visiting a schema block member (condition, invariant, etc.).
+    /// This returns None if the SpecBlockTarget cannnot be resolved; error reporting happens
+    /// at caller side.
+    fn get_spec_block_context<'pa>(
+        &self,
+        target: &'pa EA::SpecBlockTarget,
+    ) -> Option<SpecBlockContext<'pa>> {
+        match &target.value {
+            EA::SpecBlockTarget_::Code => None,
+            EA::SpecBlockTarget_::Member(name, _) => {
+                let qsym = self.qualified_by_module_from_name(name);
+                if self.parent.fun_table.contains_key(&qsym) {
+                    Some(SpecBlockContext::Function(qsym))
+                } else if self.parent.struct_table.contains_key(&qsym) {
+                    Some(SpecBlockContext::Struct(qsym))
+                } else {
+                    None
+                }
+            }
+            EA::SpecBlockTarget_::Schema(name, _) => {
+                let qsym = self.qualified_by_module_from_name(name);
+                if self.parent.spec_schema_table.contains_key(&qsym) {
+                    Some(SpecBlockContext::Schema(qsym))
+                } else {
+                    None
+                }
+            }
+            EA::SpecBlockTarget_::Module => Some(SpecBlockContext::Module),
+        }
+    }
+}
+
+/// # Attribute Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    pub fn translate_attributes(&mut self, attrs: &EA::Attributes) -> Vec<Attribute> {
+        attrs
+            .iter()
+            .map(|(_, _, attr)| self.translate_attribute(attr))
+            .collect()
+    }
+
+    pub fn translate_attribute(&mut self, attr: &EA::Attribute) -> Attribute {
+        let node_id = self
+            .parent
+            .env
+            .new_node(self.parent.to_loc(&attr.loc), Type::Tuple(vec![]));
+        match &attr.value {
+            EA::Attribute_::Name(n) => {
+                let sym = self.symbol_pool().make(n.value.as_str());
+                Attribute::Apply(node_id, sym, vec![])
+            }
+            EA::Attribute_::Parameterized(n, vs) => {
+                let sym = self.symbol_pool().make(n.value.as_str());
+                Attribute::Apply(node_id, sym, self.translate_attributes(vs))
+            }
+            EA::Attribute_::Assigned(n, v) => {
+                let value_node_id = self
+                    .parent
+                    .env
+                    .new_node(self.parent.to_loc(&v.loc), Type::Tuple(vec![]));
+                let v = match &v.value {
+                    EA::AttributeValue_::Value(val) => {
+                        let val =
+                            if let Some((val, _)) = ExpTranslator::new(self).translate_value(val) {
+                                val
+                            } else {
+                                // Error reported
+                                Value::Bool(false)
+                            };
+                        AttributeValue::Value(value_node_id, val)
+                    }
+                    EA::AttributeValue_::Module(mident) => {
+                        let addr_bytes = self.parent.resolve_address(
+                            &self.parent.to_loc(&mident.loc),
+                            &mident.value.address,
+                        );
+                        let module_name = ModuleName::from_address_bytes_and_name(
+                            addr_bytes,
+                            self.symbol_pool()
+                                .make(mident.value.module.0.value.as_str()),
+                        );
+                        // TODO support module attributes more than via empty string
+                        AttributeValue::Name(
+                            value_node_id,
+                            Some(module_name),
+                            self.symbol_pool().make(""),
+                        )
+                    }
+                    EA::AttributeValue_::ModuleAccess(macc) => match macc.value {
+                        EA::ModuleAccess_::Name(n) => AttributeValue::Name(
+                            value_node_id,
+                            None,
+                            self.symbol_pool().make(n.value.as_str()),
+                        ),
+                        EA::ModuleAccess_::ModuleAccess(mident, n) => {
+                            let addr_bytes = self.parent.resolve_address(
+                                &self.parent.to_loc(&macc.loc),
+                                &mident.value.address,
+                            );
+                            let module_name = ModuleName::from_address_bytes_and_name(
+                                addr_bytes,
+                                self.symbol_pool()
+                                    .make(mident.value.module.0.value.as_str()),
+                            );
+                            AttributeValue::Name(
+                                value_node_id,
+                                Some(module_name),
+                                self.symbol_pool().make(n.value.as_str()),
+                            )
+                        }
+                    },
+                };
+                Attribute::Assign(node_id, self.symbol_pool().make(n.value.as_str()), v)
+            }
+        }
+    }
+}
+
+/// # Declaration Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn decl_ana(
+        &mut self,
+        module_def: &EA::ModuleDefinition,
+        compiled_module: &CompiledModule,
+        source_map: &SourceMap,
+    ) {
+        for (name, struct_def) in module_def.structs.key_cloned_iter() {
+            self.decl_ana_struct(&name, struct_def);
+        }
+        for (name, fun_def) in module_def.functions.key_cloned_iter() {
+            self.decl_ana_fun(&name, fun_def);
+        }
+        for (name, const_def) in module_def.constants.key_cloned_iter() {
+            self.decl_ana_const(&name, const_def, compiled_module, source_map);
+        }
+        for spec in &module_def.specs {
+            self.decl_ana_spec_block(spec);
+        }
+    }
+
+    fn decl_ana_const(
+        &mut self,
+        name: &PA::ConstantName,
+        def: &EA::Constant,
+        compiled_module: &CompiledModule,
+        source_map: &SourceMap,
+    ) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let name = qsym.symbol;
+        let const_name = ConstantName(self.symbol_pool().string(name).to_string().into());
+        let const_idx = source_map
+            .constant_map
+            .get(&const_name)
+            .expect("constant not in source map");
+        let move_value =
+            Constant::deserialize_constant(&compiled_module.constant_pool()[*const_idx as usize])
+                .unwrap();
+        let mut et = ExpTranslator::new(self);
+        let loc = et.to_loc(&def.loc);
+        let ty = et.translate_type(&def.signature);
+        let value = et.translate_from_move_value(&loc, &ty, &move_value);
+        et.parent
+            .parent
+            .define_const(qsym, ConstEntry { loc, ty, value });
+    }
+
+    fn decl_ana_struct(&mut self, name: &PA::StructName, def: &EA::StructDefinition) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let struct_id = StructId::new(qsym.symbol);
+        let attrs = self.translate_attributes(&def.attributes);
+        let is_resource =
+            // TODO migrate to abilities
+            def.abilities.has_ability_(PA::Ability_::Key) || (
+                !def.abilities.has_ability_(PA::Ability_::Copy) &&
+                    !def.abilities.has_ability_(PA::Ability_::Drop)
+            );
+        let mut et = ExpTranslator::new(self);
+        let type_params =
+            et.analyze_and_add_type_params(def.type_parameters.iter().map(|param| &param.name));
+        et.parent.parent.define_struct(
+            et.to_loc(&def.loc),
+            attrs,
+            qsym,
+            et.parent.module_id,
+            struct_id,
+            is_resource,
+            type_params,
+            None, // will be filled in during definition analysis
+        );
+    }
+
+    fn decl_ana_fun(&mut self, name: &PA::FunctionName, def: &EA::Function) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let fun_id = FunId::new(qsym.symbol);
+        let attrs = self.translate_attributes(&def.attributes);
+        let mut et = ExpTranslator::new(self);
+        et.enter_scope();
+        let type_params = et.analyze_and_add_type_params(
+            def.signature.type_parameters.iter().map(|(name, _)| name),
+        );
+        et.enter_scope();
+        let params = et.analyze_and_add_params(&def.signature.parameters, true);
+        let result_type = et.translate_type(&def.signature.return_type);
+        let is_entry = def.entry.is_some();
+        let visibility = match def.visibility {
+            EA::Visibility::Public(_) => FunctionVisibility::Public,
+            // Packages are converted to friend during compilation.
+            EA::Visibility::Package(_) => FunctionVisibility::Friend,
+            EA::Visibility::Friend(_) => FunctionVisibility::Friend,
+            EA::Visibility::Internal => FunctionVisibility::Private,
+        };
+        let loc = et.to_loc(&def.loc);
+        et.parent.parent.define_fun(
+            loc.clone(),
+            attrs,
+            qsym.clone(),
+            et.parent.module_id,
+            fun_id,
+            visibility,
+            is_entry,
+            type_params.clone(),
+            params.clone(),
+            result_type.clone(),
+        );
+
+        // Add function as a spec fun entry as well.
+        let spec_fun_id = SpecFunId::new(self.spec_funs.len());
+        self.parent.define_spec_fun(
+            qsym,
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Function(self.module_id, spec_fun_id, None),
+                type_params: type_params.iter().map(|(_, ty)| ty.clone()).collect(),
+                arg_types: params.iter().map(|(_, ty)| ty.clone()).collect(),
+                result_type: result_type.clone(),
+            },
+        );
+
+        // Add $ to the name so the spec version does not name clash with the Move version.
+        let name = self.symbol_pool().make(&format!("${}", name.0.value));
+        let mut fun_decl = SpecFunDecl {
+            loc,
+            name,
+            type_params,
+            params,
+            context_params: None,
+            result_type,
+            used_memory: BTreeSet::new(),
+            uninterpreted: false,
+            is_move_fun: true,
+            is_native: false,
+            body: None,
+            callees: Default::default(),
+            is_recursive: Default::default(),
+        };
+        if let EA::FunctionBody_::Native = def.body.value {
+            fun_decl.is_native = true;
+        }
+        self.spec_funs.push(fun_decl);
+    }
+
+    fn decl_ana_spec_block(&mut self, block: &EA::SpecBlock) {
+        for member in &block.value.members {
+            self.decl_ana_spec_block_member(member)
+        }
+        // If this is a schema spec block, process its declaration.
+        if let EA::SpecBlockTarget_::Schema(name, type_params) = &block.value.target.value {
+            self.decl_ana_schema(block, name, type_params.iter().map(|(name, _)| name));
+        }
+    }
+
+    /// Process any spec block members which introduce global declarations.
+    fn decl_ana_spec_block_member(&mut self, member: &EA::SpecBlockMember) {
+        use EA::SpecBlockMember_::*;
+        let loc = self.parent.env.to_loc(&member.loc);
+        match &member.value {
+            Function {
+                uninterpreted,
+                name,
+                signature,
+                ..
+            } => self.decl_ana_spec_fun(&loc, *uninterpreted, name, signature),
+            Variable {
+                is_global: true,
+                name,
+                type_,
+                type_parameters,
+                init: _,
+            } => self.decl_ana_global_var(
+                &loc,
+                name,
+                type_parameters.iter().map(|(name, _)| name),
+                type_,
+            ),
+            _ => {}
+        }
+    }
+
+    fn decl_ana_spec_fun(
+        &mut self,
+        loc: &Loc,
+        uninterpreted: bool,
+        name: &PA::FunctionName,
+        signature: &EA::FunctionSignature,
+    ) {
+        let name = self.symbol_pool().make(&name.0.value);
+        let (type_params, params, result_type) = self.decl_ana_signature(signature, false);
+
+        // Add the function to the symbol table.
+        let fun_id = SpecFunId::new(self.spec_funs.len());
+        self.parent.define_spec_fun(
+            self.qualified_by_module(name),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Function(self.module_id, fun_id, None),
+                type_params: type_params.iter().map(|(_, ty)| ty.clone()).collect(),
+                arg_types: params.iter().map(|(_, ty)| ty.clone()).collect(),
+                result_type: result_type.clone(),
+            },
+        );
+
+        // Add a prototype of the SpecFunDecl to the module build. This
+        // will for now have an empty body which we fill in during a 2nd pass.
+        let fun_decl = SpecFunDecl {
+            loc: loc.clone(),
+            name,
+            type_params,
+            params,
+            context_params: None,
+            result_type,
+            used_memory: BTreeSet::new(),
+            uninterpreted,
+            is_move_fun: false,
+            is_native: false,
+            body: None,
+            callees: Default::default(),
+            is_recursive: Default::default(),
+        };
+        self.spec_funs.push(fun_decl);
+    }
+
+    fn decl_ana_signature(
+        &mut self,
+        signature: &EA::FunctionSignature,
+        for_move_fun: bool,
+    ) -> (Vec<(Symbol, Type)>, Vec<(Symbol, Type)>, Type) {
+        let et = &mut ExpTranslator::new(self);
+        let type_params =
+            et.analyze_and_add_type_params(signature.type_parameters.iter().map(|(name, _)| name));
+        et.enter_scope();
+        let params = et.analyze_and_add_params(&signature.parameters, for_move_fun);
+        let result_type = et.translate_type(&signature.return_type);
+        et.finalize_types();
+        (type_params, params, result_type)
+    }
+
+    fn decl_ana_global_var<'a, I>(
+        &mut self,
+        loc: &Loc,
+        name: &Name,
+        type_params: I,
+        type_: &EA::Type,
+    ) where
+        I: IntoIterator<Item = &'a Name>,
+    {
+        let name = self.symbol_pool().make(name.value.as_str());
+        let (type_params, type_) = {
+            let et = &mut ExpTranslator::new(self);
+            let type_params = et.analyze_and_add_type_params(type_params);
+            let type_ = et.translate_type(type_);
+            (type_params, type_)
+        };
+        if type_.is_reference() {
+            self.parent.error(
+                loc,
+                &format!(
+                    "`{}` cannot have reference type",
+                    name.display(self.symbol_pool())
+                ),
+            )
+        }
+        // Add the variable to the symbol table.
+        let var_id = SpecVarId::new(self.spec_vars.len());
+        self.parent.define_spec_var(
+            loc,
+            self.qualified_by_module(name),
+            self.module_id,
+            var_id,
+            type_params.clone(),
+            type_.clone(),
+        );
+        // Add the variable to the module builder. For now, the init expression stays unset.
+        let var_decl = SpecVarDecl {
+            loc: loc.clone(),
+            name,
+            type_params,
+            type_,
+            init: None,
+        };
+        self.spec_vars.push(var_decl);
+    }
+
+    fn decl_ana_schema<'a, I>(&mut self, block: &EA::SpecBlock, name: &Name, type_params: I)
+    where
+        I: IntoIterator<Item = &'a Name>,
+    {
+        let qsym = self.qualified_by_module_from_name(name);
+        let mut et = ExpTranslator::new(self);
+        et.enter_scope();
+        let type_params = et.analyze_and_add_type_params(type_params);
+        // Extract local variables.
+        let mut vars = vec![];
+        for member in &block.value.members {
+            if let EA::SpecBlockMember_::Variable {
+                is_global: false,
+                name,
+                type_,
+                type_parameters,
+                init: _,
+            } = &member.value
+            {
+                if !type_parameters.is_empty() {
+                    et.error(
+                        &et.to_loc(&member.loc),
+                        "schema variable cannot have type parameters",
+                    );
+                }
+                let name = et.symbol_pool().make(&name.value);
+                let type_ = et.translate_type(type_);
+                vars.push((name, type_));
+            }
+        }
+        // Add schema declaration prototype to the symbol table.
+        let loc = et.to_loc(&block.loc);
+        self.parent
+            .define_spec_schema(&loc, qsym, self.module_id, type_params, vars);
+    }
+}
+
+/// # Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn def_ana(
+        &mut self,
+        module_def: &EA::ModuleDefinition,
+        function_infos: UniqueMap<PA::FunctionName, FunctionInfo>,
+    ) {
+        // Analyze all structs.
+        for (name, def) in module_def.structs.key_cloned_iter() {
+            self.def_ana_struct(&name, def);
+        }
+
+        // Analyze all functions.
+        for (idx, (name, fun_def)) in module_def.functions.key_cloned_iter().enumerate() {
+            self.def_ana_fun(&name, &fun_def.body, idx);
+        }
+
+        // Propagate the impurity of functions: a Move function which calls an
+        // impure Move function is also considered impure.
+        let mut visited = BTreeMap::new();
+        for (idx, (name, _)) in module_def.functions.key_cloned_iter().enumerate() {
+            let is_pure = self.propagate_function_impurity(&mut visited, SpecFunId::new(idx));
+            let full_name = self.qualified_by_module_from_name(&name.0);
+            if is_pure {
+                // Modify the types of parameters, return values and expressions
+                // of pure Move functions so they no longer have references.
+                self.deref_move_fun_types(full_name.clone(), idx);
+            }
+            self.parent
+                .fun_table
+                .entry(full_name)
+                .and_modify(|e| e.is_pure = is_pure);
+        }
+
+        // Analyze all schemas. This must be done before other things because schemas need to be
+        // ready for inclusion. We also must do this recursively, so use a visited set to detect
+        // cycles.
+        {
+            let schema_defs: BTreeMap<QualifiedSymbol, &EA::SpecBlock> = module_def
+                .specs
+                .iter()
+                .filter_map(|block| {
+                    if let EA::SpecBlockTarget_::Schema(name, ..) = &block.value.target.value {
+                        let qsym = self.qualified_by_module_from_name(name);
+                        Some((qsym, block))
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            let mut visited = BTreeSet::new();
+            let mut visiting = vec![];
+            for (name, block) in schema_defs.iter() {
+                self.def_ana_schema(
+                    &schema_defs,
+                    &mut visited,
+                    &mut visiting,
+                    name.clone(),
+                    block,
+                );
+            }
+        }
+
+        // Analyze all module level spec blocks (except schemas)
+        for spec in &module_def.specs {
+            if matches!(spec.value.target.value, EA::SpecBlockTarget_::Schema(..)) {
+                continue;
+            }
+            match self.get_spec_block_context(&spec.value.target) {
+                Some(context) => {
+                    if let EA::SpecBlockTarget_::Member(_, Some(signature)) =
+                        &spec.value.target.value
+                    {
+                        // Validate that the provided signature matches the declaration
+                        let loc = self.parent.to_loc(&spec.value.target.loc);
+                        self.validate_target_signature(&context, loc, signature);
+                    }
+                    self.def_ana_spec_block(&context, spec)
+                }
+                None => {
+                    let loc = self.parent.env.to_loc(&spec.value.target.loc);
+                    self.parent.error(&loc, "unresolved spec target");
+                }
+            }
+        }
+
+        // Analyze in-function spec blocks.
+        for (name, fun_def) in module_def.functions.key_cloned_iter() {
+            let fun_spec_info = &function_infos.get(&name).unwrap().spec_info;
+            let qsym = self.qualified_by_module_from_name(&name.0);
+            for (spec_id, spec_block) in fun_def.specs.iter() {
+                for member in &spec_block.value.members {
+                    let loc = &self.parent.env.to_loc(&member.loc);
+                    match &member.value {
+                        EA::SpecBlockMember_::Condition {
+                            kind,
+                            properties,
+                            exp,
+                            additional_exps,
+                        } => {
+                            if fun_spec_info.contains_key(spec_id) {
+                                let context = SpecBlockContext::FunctionCode(
+                                    qsym.clone(),
+                                    &fun_spec_info[spec_id],
+                                );
+                                if let Some(kind) = self.convert_condition_kind(kind, &context) {
+                                    let properties =
+                                        self.translate_properties(properties, &|_, _, prop| {
+                                            if !is_property_valid_for_condition(&kind, prop) {
+                                                Some(loc.clone())
+                                            } else {
+                                                None
+                                            }
+                                        });
+                                    self.def_ana_condition(
+                                        loc,
+                                        &context,
+                                        kind,
+                                        properties,
+                                        exp,
+                                        additional_exps,
+                                    );
+                                }
+                            }
+                        }
+                        EA::SpecBlockMember_::Update { lhs, rhs } => {
+                            let context = SpecBlockContext::FunctionCode(
+                                qsym.clone(),
+                                &fun_spec_info[spec_id],
+                            );
+                            self.def_ana_global_var_update(loc, &context, lhs, rhs)
+                        }
+                        _ => {
+                            self.parent.error(loc, "item not allowed");
+                        }
+                    }
+                }
+            }
+        }
+
+        // Perform post analyzes of state usage in spec functions.
+        self.compute_state_usage();
+
+        // Perform post reduction of module invariants.
+        self.process_module_invariants();
+
+        // Apply tweaks after all specs are analyzed
+        self.apply_tweaks(module_def);
+    }
+
+    /// Validates whether a function signature provided with a spec block target matches the
+    /// function declaration. Currently we require literal matching. We may want to allow
+    /// matching modulo renaming to make specs more independent from the code, but this
+    /// requires some changes on the APIs has parameter names in specs are currently hardwired to be
+    /// discovered via function declarations.
+    fn validate_target_signature(
+        &mut self,
+        context: &SpecBlockContext,
+        loc: Loc,
+        signature: &EA::FunctionSignature,
+    ) {
+        match context {
+            SpecBlockContext::Function(qsym) => {
+                let (type_params, params, result_type) = self.decl_ana_signature(signature, true);
+                let fun_decl = self.parent.fun_table.get(qsym).expect("function defined");
+                let generic_msg = "provided function signature must match function declaration";
+                if fun_decl.type_params != type_params {
+                    self.parent
+                        .error(&loc, &format!("{}: type parameter mismatch", generic_msg));
+                }
+                if fun_decl.params != params {
+                    self.parent
+                        .error(&loc, &format!("{}: parameter mismatch", generic_msg));
+                }
+                if fun_decl.result_type != result_type {
+                    self.parent
+                        .error(&loc, &format!("{}: return type mismatch", generic_msg));
+                }
+            }
+            _ => self.parent.error(
+                &loc,
+                "the target is not a function and cannot have a signature",
+            ),
+        }
+    }
+}
+
+/// ## Struct Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn def_ana_struct(&mut self, name: &PA::StructName, def: &EA::StructDefinition) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let type_params = self
+            .parent
+            .struct_table
+            .get(&qsym)
+            .expect("struct invalid")
+            .type_params
+            .clone();
+        let mut et = ExpTranslator::new(self);
+        let loc = et.to_loc(&name.0.loc);
+        for (name, ty) in type_params {
+            et.define_type_param(&loc, name, ty);
+        }
+        let fields = match &def.fields {
+            EA::StructFields::Named(fields) => {
+                let mut field_map = BTreeMap::new();
+                for (_name_loc, field_name_, (idx, ty)) in fields {
+                    let field_sym = et.symbol_pool().make(field_name_);
+                    let field_ty = et.translate_type(ty);
+                    field_map.insert(field_sym, (*idx, field_ty));
+                }
+                Some(field_map)
+            }
+            EA::StructFields::Positional(tys) => {
+                let mut field_map = BTreeMap::new();
+                for (idx, ty) in tys.iter().enumerate() {
+                    let field_name_ = format!("{idx}");
+                    let field_sym = et.symbol_pool().make(&field_name_);
+                    let field_ty = et.translate_type(ty);
+                    field_map.insert(field_sym, (idx, field_ty));
+                }
+                Some(field_map)
+            }
+            EA::StructFields::Native(_) => None,
+        };
+        self.parent
+            .struct_table
+            .get_mut(&qsym)
+            .expect("struct invalid")
+            .fields = fields;
+    }
+}
+
+/// ## Move Function Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Definition analysis for Move functions.
+    /// If the function is pure, we translate its body.
+    fn def_ana_fun(&mut self, name: &PA::FunctionName, body: &EA::FunctionBody, fun_idx: usize) {
+        if let EA::FunctionBody_::Defined(seq) = &body.value {
+            let full_name = self.qualified_by_module_from_name(&name.0);
+            let entry = self
+                .parent
+                .fun_table
+                .get(&full_name)
+                .expect("function defined");
+            let type_params = entry.type_params.clone();
+            let params = entry.params.clone();
+            let result_type = entry.result_type.clone();
+            let mut et = ExpTranslator::new(self);
+            et.translate_fun_as_spec_fun();
+            let loc = et.to_loc(&body.loc);
+            for (n, ty) in &type_params {
+                et.define_type_param(&loc, *n, ty.clone());
+            }
+            et.enter_scope();
+            for (idx, (n, ty)) in params.iter().enumerate() {
+                et.define_local(&loc, *n, ty.clone(), None, Some(idx));
+            }
+            let translated = et.translate_seq(&loc, seq, &result_type);
+            et.finalize_types();
+            // If no errors were generated, then the function is considered pure.
+            if !*et.errors_generated.borrow() {
+                // Rewrite all type annotations in expressions to skip references.
+                for node_id in translated.node_ids() {
+                    let ty = et.get_node_type(node_id);
+                    et.update_node_type(node_id, ty.skip_reference().clone());
+                }
+                et.called_spec_funs.iter().for_each(|(mid, fid)| {
+                    self.parent.add_edge_to_move_fun_call_graph(
+                        self.module_id.qualified(SpecFunId::new(fun_idx)),
+                        mid.qualified(*fid),
+                    );
+                });
+                self.spec_funs[self.spec_fun_index].body = Some(translated.into_exp());
+            }
+        }
+        self.spec_fun_index += 1;
+    }
+
+    /// Propagate the impurity of Move functions from callees to callers so
+    /// that we can detect pure-looking Move functions which calls impure
+    /// Move functions.
+    fn propagate_function_impurity(
+        &mut self,
+        visited: &mut BTreeMap<SpecFunId, bool>,
+        spec_fun_id: SpecFunId,
+    ) -> bool {
+        if let Some(is_pure) = visited.get(&spec_fun_id) {
+            return *is_pure;
+        }
+        let spec_fun_idx = spec_fun_id.as_usize();
+        let body = if self.spec_funs[spec_fun_idx].body.is_some() {
+            self.spec_funs[spec_fun_idx].body.take().unwrap()
+        } else {
+            // If the function is native and contains no mutable references
+            // as parameters, consider it pure.
+            // Otherwise the function is non-native, its body cannot be parsed
+            // so we consider it impure.
+            // TODO(emmazzz) right now all the native Move functions without
+            // parameters of type mutable references are considered pure.
+            // In the future we might want to only allow a certain subset of the
+            // native Move functions, through something similar to an allow list or
+            // a pragma.
+            let no_mut_ref_param = self.spec_funs[spec_fun_idx]
+                .params
+                .iter()
+                .map(|(_, ty)| !ty.is_mutable_reference())
+                .all(|b| b); // `no_mut_ref_param` if none of the types are mut refs.
+            return self.spec_funs[spec_fun_idx].is_native && no_mut_ref_param;
+        };
+        let mut is_pure = true;
+        body.visit(&mut |e: &ExpData| {
+            if let ExpData::Call(_, Operation::Function(mid, fid, _), _) = e {
+                if mid.to_usize() < self.module_id.to_usize() {
+                    // This is calling a function from another module we already have
+                    // translated. In this case, the impurity has already been propagated
+                    // in translate_call.
+                } else {
+                    // This is calling a function from the module we are currently translating.
+                    // Need to recursively ensure we have propagated impurity because of
+                    // arbitrary call graphs, including cyclic.
+                    if !self.propagate_function_impurity(visited, *fid) {
+                        is_pure = false;
+                    }
+                }
+            }
+        });
+        if is_pure {
+            // Restore the function body if the Move function is pure.
+            self.spec_funs[spec_fun_idx].body = Some(body);
+        }
+        visited.insert(spec_fun_id, is_pure);
+        is_pure
+    }
+
+    fn deref_move_fun_types(&mut self, full_name: QualifiedSymbol, spec_fun_idx: usize) {
+        self.parent.spec_fun_table.entry(full_name).and_modify(|e| {
+            assert!(e.len() == 1);
+            e[0].arg_types = e[0]
+                .arg_types
+                .iter()
+                .map(|ty| ty.skip_reference().clone())
+                .collect_vec();
+            e[0].type_params = e[0]
+                .type_params
+                .iter()
+                .map(|ty| ty.skip_reference().clone())
+                .collect_vec();
+            e[0].result_type = e[0].result_type.skip_reference().clone();
+        });
+
+        let spec_fun_decl = &mut self.spec_funs[spec_fun_idx];
+        spec_fun_decl.params = spec_fun_decl
+            .params
+            .iter()
+            .map(|(s, ty)| (*s, ty.skip_reference().clone()))
+            .collect_vec();
+        spec_fun_decl.type_params = spec_fun_decl
+            .type_params
+            .iter()
+            .map(|(s, ty)| (*s, ty.skip_reference().clone()))
+            .collect_vec();
+        spec_fun_decl.result_type = spec_fun_decl.result_type.skip_reference().clone();
+    }
+}
+
+/// ## Spec Block Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn def_ana_spec_block(&mut self, context: &SpecBlockContext<'_>, block: &EA::SpecBlock) {
+        let block_loc = self.parent.env.to_loc(&block.loc);
+        self.update_spec(context, move |spec| spec.loc = Some(block_loc));
+
+        assert!(self.spec_block_lets.is_empty());
+
+        // Sort members so that lets are processed first. This is needed so that lets included
+        // from schemas are properly renamed on name clash.
+        let let_sorted_members = block.value.members.iter().sorted_by(|m1, m2| {
+            let m1_is_let = matches!(m1.value, EA::SpecBlockMember_::Let { .. });
+            let m2_is_let = matches!(m2.value, EA::SpecBlockMember_::Let { .. });
+            match (m1_is_let, m2_is_let) {
+                (true, true) | (false, false) => std::cmp::Ordering::Equal,
+                (true, false) => std::cmp::Ordering::Less,
+                (false, true) => std::cmp::Ordering::Greater,
+            }
+        });
+
+        for member in let_sorted_members {
+            self.def_ana_spec_block_member(context, member)
+        }
+
+        // clear the let bindings stored in the build.
+        self.spec_block_lets.clear();
+    }
+
+    fn def_ana_spec_block_member(
+        &mut self,
+        context: &SpecBlockContext,
+        member: &EA::SpecBlockMember,
+    ) {
+        use EA::SpecBlockMember_::*;
+        let loc = &self.parent.env.to_loc(&member.loc);
+        match &member.value {
+            Condition {
+                kind,
+                properties,
+                exp,
+                additional_exps,
+            } => {
+                if let Some(kind) = self.convert_condition_kind(kind, context) {
+                    let properties = self.translate_properties(properties, &|_, _, prop| {
+                        if !is_property_valid_for_condition(&kind, prop) {
+                            Some(loc.clone())
+                        } else {
+                            None
+                        }
+                    });
+                    self.def_ana_condition(loc, context, kind, properties, exp, additional_exps)
+                }
+            }
+            Function {
+                uninterpreted,
+                signature,
+                body,
+                ..
+            } => self.def_ana_spec_fun(*uninterpreted, signature, body),
+            Let {
+                name,
+                post_state,
+                def,
+            } => self.def_ana_let(context, loc, *post_state, name, def),
+            Include { properties, exp } => {
+                let properties = self.translate_properties(properties, &|_, _, _| None);
+                self.def_ana_schema_inclusion_outside_schema(loc, context, None, properties, exp)
+            }
+            Apply {
+                exp,
+                patterns,
+                exclusion_patterns,
+            } => self.def_ana_schema_apply(loc, context, exp, patterns, exclusion_patterns),
+            Pragma { properties } => self.def_ana_pragma(loc, context, properties),
+            Variable {
+                is_global: true,
+                name,
+                init,
+                ..
+            } => self.def_ana_global_var(loc, name, init.as_ref()),
+            Variable {
+                is_global: false, ..
+            } => { /* nothing to do right now */ }
+            Update { lhs, rhs } => self.def_ana_global_var_update(loc, context, lhs, rhs),
+        }
+    }
+}
+
+/// ## Let Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn def_ana_let(
+        &mut self,
+        context: &SpecBlockContext<'_>,
+        loc: &Loc,
+        post_state: bool,
+        name: &Name,
+        def: &EA::Exp,
+    ) {
+        // Check the expression and extract results.
+        let sym = self.symbol_pool().make(&name.value);
+        let kind = if post_state {
+            ConditionKind::LetPost(sym)
+        } else {
+            ConditionKind::LetPre(sym)
+        };
+        let mut et = self.exp_translator_for_context(loc, context, &kind);
+        let (_, def) = et.translate_exp_free(def);
+        et.finalize_types();
+
+        // Check whether a let of this name is already defined, and add it to the
+        // map which tracks lets in this block.
+        if self
+            .spec_block_lets
+            .insert(sym, (post_state, def.node_id()))
+            .is_some()
+        {
+            self.parent.error(
+                &self.parent.to_loc(&name.loc),
+                &format!("duplicate declaration of `{}`", name.value),
+            );
+        }
+
+        // Add the let to the context spec.
+        self.update_spec(context, |spec| {
+            spec.conditions.push(Condition {
+                loc: loc.clone(),
+                kind,
+                properties: Default::default(),
+                exp: def.into_exp(),
+                additional_exps: vec![],
+            })
+        })
+    }
+}
+
+/// ## Pragma Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Definition analysis for a pragma.
+    fn def_ana_pragma(
+        &mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        properties: &[EA::PragmaProperty],
+    ) {
+        let mut properties = self.translate_properties(properties, &|symbols, bag, prop| {
+            if !is_pragma_valid_for_block(symbols, bag, context, prop) {
+                Some(loc.clone())
+            } else {
+                None
+            }
+        });
+
+        // extra processing on concrete pragma declarations
+        process_intrinsic_declaration(self, loc, context, &mut properties);
+
+        self.update_spec(context, move |spec| {
+            spec.properties.extend(properties);
+        });
+    }
+
+    /// Translate properties (of conditions or in pragmas), using the provided function
+    /// to check their validness.
+    fn translate_properties<F>(
+        &mut self,
+        properties: &[EA::PragmaProperty],
+        check_prop: &F,
+    ) -> PropertyBag
+    where
+        // Returns the location if not valid
+        F: Fn(&SymbolPool, &PropertyBag, &str) -> Option<Loc>,
+    {
+        let mut props = PropertyBag::default();
+        for prop in properties {
+            self.process_one_property(&mut props, prop, check_prop);
+        }
+        props
+    }
+
+    fn process_one_property<F>(
+        &mut self,
+        bag: &mut PropertyBag,
+        prop: &EA::PragmaProperty,
+        check_prop: &F,
+    ) where
+        // Returns the location if not valid
+        F: Fn(&SymbolPool, &PropertyBag, &str) -> Option<Loc>,
+    {
+        let prop_str = prop.value.name.value.as_str();
+        if let Some(loc) = check_prop(self.symbol_pool(), bag, prop_str) {
+            self.parent.error(
+                &loc,
+                &format!("property `{}` is not valid in this context", prop_str),
+            );
+            return;
+        }
+
+        let name = self.symbol_pool().make(&prop.value.name.value);
+        let value = match &prop.value.value {
+            None => PropertyValue::Value(Value::Bool(true)),
+            Some(EA::PragmaValue::Literal(ev)) => {
+                let mut et = ExpTranslator::new(self);
+                match et.translate_value(ev) {
+                    None => {
+                        // Error reported
+                        return;
+                    }
+                    Some((v, _)) => PropertyValue::Value(v),
+                }
+            }
+            Some(EA::PragmaValue::Ident(ema)) => match self.module_access_to_parts(ema) {
+                (None, sym) => PropertyValue::Symbol(sym),
+                _ => PropertyValue::QualifiedSymbol(self.module_access_to_qualified(ema)),
+            },
+        };
+
+        if bag.insert(name, value).is_some() {
+            self.parent.error(
+                &self.parent.to_loc(&prop.loc),
+                &format!(
+                    "property `{}` specified more than once in the same pragma declaration",
+                    prop_str
+                ),
+            );
+        }
+    }
+
+    fn add_bool_property(&self, mut properties: PropertyBag, name: &str, val: bool) -> PropertyBag {
+        let sym = self.symbol_pool().make(name);
+        properties.insert(sym, PropertyValue::Value(Value::Bool(val)));
+        properties
+    }
+}
+
+/// ## General Helpers for Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Updates the Spec of a given context via an update function.
+    fn update_spec<F>(&mut self, context: &SpecBlockContext, update: F)
+    where
+        F: FnOnce(&mut Spec),
+    {
+        use SpecBlockContext::*;
+        match context {
+            Function(name) => update(self.fun_specs.entry(name.symbol).or_default()),
+            FunctionCode(name, spec_info) => update(
+                self.fun_specs
+                    .entry(name.symbol)
+                    .or_default()
+                    .on_impl
+                    .entry(spec_info.offset)
+                    .or_default(),
+            ),
+            Schema(name) => update(
+                &mut self
+                    .parent
+                    .spec_schema_table
+                    .get_mut(name)
+                    .expect("schema defined")
+                    .spec,
+            ),
+            Struct(name) => update(self.struct_specs.entry(name.symbol).or_default()),
+            Module => update(&mut self.module_spec),
+        }
+    }
+
+    /// Sets up an expression translator for the given spec block context. If kind
+    /// is given, includes all the symbols which can be consumed by the condition,
+    /// otherwise only defines type parameters.
+    fn exp_translator_for_context<'module_translator>(
+        &'module_translator mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        kind: &ConditionKind,
+    ) -> ExpTranslator<'env, 'translator, 'module_translator> {
+        use SpecBlockContext::*;
+        let allows_old = kind.allows_old();
+        let mut et = match context {
+            Function(name) => {
+                let entry = &self
+                    .parent
+                    .fun_table
+                    .get(name)
+                    .expect("invalid spec block context")
+                    .clone();
+                let mut et = ExpTranslator::new_with_old(self, allows_old);
+                for (n, ty) in &entry.type_params {
+                    et.define_type_param(loc, *n, ty.clone());
+                }
+
+                et.enter_scope();
+                for (idx, (n, ty)) in entry.params.iter().enumerate() {
+                    et.define_local(loc, *n, ty.clone(), None, Some(idx));
+                }
+                // Define the placeholders for the result values of a function if this is an
+                // Ensures condition.
+                if matches!(kind, ConditionKind::Ensures | ConditionKind::LetPost(..)) {
+                    et.enter_scope();
+                    if let Type::Tuple(ts) = &entry.result_type {
+                        for (i, ty) in ts.iter().enumerate() {
+                            let name = et.symbol_pool().make(&format!("result_{}", i + 1));
+                            let oper = Some(Operation::Result(i));
+                            et.define_local(loc, name, ty.clone(), oper, None);
+                        }
+                    } else {
+                        let name = et.symbol_pool().make("result");
+                        let oper = Some(Operation::Result(0));
+                        et.define_local(loc, name, entry.result_type.clone(), oper, None);
+                    }
+                }
+
+                et
+            }
+            FunctionCode(name, spec_info) => {
+                let entry = &self
+                    .parent
+                    .fun_table
+                    .get(name)
+                    .expect("invalid spec block context")
+                    .clone();
+                let mut et = ExpTranslator::new_with_old(self, allows_old);
+                for (n, ty) in &entry.type_params {
+                    et.define_type_param(loc, *n, ty.clone());
+                }
+
+                et.enter_scope();
+                for (_n_loc, n_, info) in &spec_info.used_locals {
+                    let sym = et.symbol_pool().make(n_);
+                    let ty = et.translate_hlir_single_type(&info.type_);
+                    if ty == Type::Error {
+                        et.error(
+                            loc,
+                            "[internal] error in translating hlir type to prover type",
+                        );
+                    }
+                    et.define_local(loc, sym, ty, None, Some(info.index as usize));
+                }
+
+                et
+            }
+            Struct(name) => {
+                let entry = &self
+                    .parent
+                    .struct_table
+                    .get(name)
+                    .expect("invalid spec block context")
+                    .clone();
+
+                let mut et = ExpTranslator::new_with_old(self, allows_old);
+                for (n, ty) in &entry.type_params {
+                    et.define_type_param(loc, *n, ty.clone());
+                }
+
+                if let Some(fields) = &entry.fields {
+                    et.enter_scope();
+                    for (n, (_, ty)) in fields {
+                        et.define_local(
+                            loc,
+                            *n,
+                            ty.clone(),
+                            Some(Operation::Select(
+                                entry.module_id,
+                                entry.struct_id,
+                                FieldId::new(*n),
+                            )),
+                            None,
+                        );
+                    }
+                }
+
+                et
+            }
+            Module => {
+                let mut et = ExpTranslator::new_with_old(self, allows_old);
+
+                // define the type params
+                match kind {
+                    ConditionKind::GlobalInvariant(ty_params)
+                    | ConditionKind::GlobalInvariantUpdate(ty_params) => {
+                        for (i, name) in ty_params.iter().enumerate() {
+                            et.define_type_param(loc, *name, Type::TypeParameter(i as u16));
+                        }
+                    }
+                    _ => (),
+                }
+
+                et
+            }
+            Schema(name) => {
+                let entry = self
+                    .parent
+                    .spec_schema_table
+                    .get(name)
+                    .expect("schema defined");
+                // Unfortunately need to clone elements from the entry because we need mut borrow
+                // of self for expression build.
+                let type_params = entry.type_params.clone();
+                let all_vars = entry.all_vars.clone();
+                let mut et = ExpTranslator::new_with_old(self, allows_old);
+                for (n, ty) in type_params {
+                    et.define_type_param(loc, n, ty);
+                }
+
+                et.enter_scope();
+                for (n, entry) in all_vars {
+                    et.define_local(loc, n, entry.type_, None, None);
+                }
+
+                et
+            }
+        };
+
+        // Add lets to translator.
+        if !et.parent.spec_block_lets.is_empty() {
+            // Put them into a new scope, they can shadow outer names.
+            et.enter_scope();
+            for (name, (post_state, node_id)) in et.parent.spec_block_lets.clone() {
+                // If allow_old is true, we are looking at a condition in a post state like ensures.
+                // In this case all lets are available. If allow_old is false, only !post_state
+                // lets are available.
+                if allows_old || !post_state {
+                    let ty = et.parent.parent.env.get_node_type(node_id);
+                    let loc = et.parent.parent.env.get_node_loc(node_id);
+                    et.define_let_local(&loc, name, ty);
+                }
+            }
+        }
+
+        et
+    }
+}
+
+/// ## Condition Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Check whether the condition is allowed in the given context. Return true if so, otherwise
+    /// report an error and return false.
+    fn check_condition_is_valid(
+        &mut self,
+        context: &SpecBlockContext,
+        loc: &Loc,
+        cond: &Condition,
+        detail: &str,
+    ) -> bool {
+        use SpecBlockContext::*;
+        let notes = vec![];
+        let mut ok = match context {
+            Module => cond.kind.allowed_on_module(),
+            Struct(_) => cond.kind.allowed_on_struct(),
+            Function(name) => {
+                let entry = self.parent.fun_table.get(name).expect("function defined");
+                cond.kind.allowed_on_fun_decl(entry.visibility)
+            }
+            FunctionCode(_, _) => cond.kind.allowed_on_fun_impl(),
+            Schema(_) => true,
+        };
+        if !ok {
+            self.parent.error_with_notes(
+                loc,
+                &format!("`{}` not allowed in {} {}", cond.kind, context, detail),
+                notes,
+            );
+        }
+        if !cond.kind.allows_old() {
+            // Check whether the inclusion is correct regards usage of post state.
+
+            // First check for lets.
+            for (name, _) in cond.exp.free_vars(self.parent.env) {
+                if let Some((true, id)) = self.spec_block_lets.get(&name) {
+                    let label_cond = (cond.loc.clone(), "not allowed to use post state".to_owned());
+                    let label_let = (
+                        self.parent.env.get_node_loc(*id),
+                        "let defined here".to_owned(),
+                    );
+                    self.parent.env.diag_with_labels(
+                        Severity::Error,
+                        loc,
+                        &format!(
+                            "let bound `{}` propagated via schema inclusion is referring to post state",
+                            name.display(self.parent.env.symbol_pool())
+                        ),
+                        vec![label_cond, label_let],
+                    );
+                    ok = false;
+                }
+            }
+
+            // Next check for old(..) and Operation::Result
+            let mut visitor = |e: &ExpData| {
+                if let ExpData::Call(id, Operation::Old, ..)
+                | ExpData::Call(id, Operation::Result(..), ..) = e
+                {
+                    let label_cond = (
+                        cond.loc.clone(),
+                        "not allowed to refer to post state".to_owned(),
+                    );
+                    let label_exp = (
+                        self.parent.env.get_node_loc(*id),
+                        "expression referring to post state".to_owned(),
+                    );
+                    self.parent.env.diag_with_labels(
+                        Severity::Error,
+                        loc,
+                        "invalid reference to post state",
+                        vec![label_cond, label_exp],
+                    );
+                    ok = false;
+                }
+            };
+            cond.exp.visit(&mut visitor);
+        } else if let FunctionCode(name, _) = context {
+            // Restrict accesses to function arguments only for `old(..)` in in-spec block
+            let entry = self.parent.fun_table.get(name).expect("function defined");
+            let mut visitor = |e: &ExpData| {
+                if let ExpData::Call(_, Operation::Old, args) = e {
+                    let arg = &args[0];
+                    match args[0].as_ref() {
+                        ExpData::Temporary(_, idx) if *idx < entry.params.len() => (),
+                        _ => {
+                            let label_cond = (
+                                cond.loc.clone(),
+                                "only a function parameter is allowed in old(..) expressions \
+                                in inline spec block"
+                                    .to_owned(),
+                            );
+                            let label_exp = (
+                                self.parent.env.get_node_loc(arg.node_id()),
+                                "this expression is not a function parameter".to_owned(),
+                            );
+                            self.parent.env.diag_with_labels(
+                                Severity::Error,
+                                loc,
+                                "invalid old(..) expression in inline spec block",
+                                vec![label_cond, label_exp],
+                            );
+                            ok = false;
+                        }
+                    };
+                }
+            };
+            cond.exp.visit(&mut visitor);
+        }
+        ok
+    }
+
+    /// Add the given conditions to the context, after checking whether they are valid in the
+    /// context. Reports errors for invalid conditions. Also detects name clashes of let-bound
+    /// names.
+    fn add_conditions_to_context(
+        &mut self,
+        context: &SpecBlockContext,
+        loc: &Loc,
+        conditions: Vec<Condition>,
+        context_properties: PropertyBag,
+        error_msg: &str,
+    ) {
+        use ConditionKind::*;
+        // Compute the let-bound names in the context block. (We misuse the update_spec function
+        // to get hold of them.)
+        let mut bound_lets = BTreeSet::new();
+        self.update_spec(context, |spec| {
+            bound_lets = spec
+                .conditions
+                .iter()
+                .filter_map(|c| match &c.kind {
+                    LetPost(name) | LetPre(name) => Some(*name),
+                    _ => None,
+                })
+                .collect()
+        });
+
+        // We build a substitution for imported let names which clash with names in the context.
+        let mut let_substitution = BTreeMap::new();
+        for mut cond in conditions {
+            if !let_substitution.is_empty() {
+                // If there is a non-empty let_substitution, apply it to all expressions in the
+                // condition.
+                let Condition {
+                    loc,
+                    kind,
+                    properties,
+                    exp,
+                    additional_exps,
+                } = cond;
+                let mut replacer = |id: NodeId, target: RewriteTarget| {
+                    if let RewriteTarget::LocalVar(name) = target {
+                        if let Some(unique_name) = let_substitution.get(&name) {
+                            return Some(ExpData::LocalVar(id, *unique_name).into_exp());
+                        }
+                    }
+                    None
+                };
+                let mut rewriter = ExpRewriter::new(self.parent.env, &mut replacer);
+                let exp = rewriter.rewrite_exp(exp);
+                let additional_exps = additional_exps
+                    .into_iter()
+                    .map(|e| rewriter.rewrite_exp(e))
+                    .collect_vec();
+                cond = Condition {
+                    loc,
+                    kind,
+                    properties,
+                    exp,
+                    additional_exps,
+                }
+            }
+
+            // If this is a let, check for name collision.
+            match &cond.kind {
+                LetPost(name) | LetPre(name) => {
+                    let name = *name;
+                    if bound_lets.contains(&name) {
+                        // Find a new name by appending #0, #1, .. to this name.
+                        let mut cnt = 1;
+                        let new_name = loop {
+                            let symbol_pool = self.parent.env.symbol_pool();
+                            let new_name =
+                                symbol_pool.make(&format!("{}#{}", name.display(symbol_pool), cnt));
+                            if !bound_lets.contains(&new_name) {
+                                break new_name;
+                            }
+                            cnt += 1;
+                        };
+                        let_substitution.insert(name, new_name);
+                        if matches!(&cond.kind, LetPost(..)) {
+                            cond.kind = LetPost(new_name)
+                        } else {
+                            cond.kind = LetPre(new_name)
+                        }
+                        bound_lets.insert(new_name);
+                    } else {
+                        bound_lets.insert(name);
+                    }
+                }
+                _ => {}
+            }
+
+            // If this is a schema invariant, convert the kind based on its application context
+            if cond.kind == ConditionKind::SchemaInvariant {
+                let new_kind = match context {
+                    SpecBlockContext::Module => ConditionKind::GlobalInvariant(vec![]),
+                    SpecBlockContext::Struct(..) => ConditionKind::StructInvariant,
+                    SpecBlockContext::Function(..) => ConditionKind::FunctionInvariant,
+                    SpecBlockContext::FunctionCode(..) => ConditionKind::LoopInvariant,
+                    SpecBlockContext::Schema(..) => {
+                        // this is the initial pass that put the condition into the schema context
+                        cond.kind.clone()
+                    }
+                };
+                cond.kind = new_kind;
+            }
+
+            // Expand invariants on functions in requires/ensures
+            let derived_conds = if matches!(context, SpecBlockContext::Function(..))
+                && matches!(cond.kind, FunctionInvariant)
+            {
+                let mut ensures = cond.clone();
+                ensures.kind = ConditionKind::Ensures;
+                cond.kind = ConditionKind::Requires;
+                vec![cond, ensures]
+            } else {
+                vec![cond]
+            };
+
+            for mut derived_cond in derived_conds {
+                // Merge context properties.
+                derived_cond.properties.extend(context_properties.clone());
+
+                // Add condition to context.
+                if self.check_condition_is_valid(context, loc, &derived_cond, error_msg)
+                    && !self
+                        .parent
+                        .env
+                        .is_property_true(&derived_cond.properties, CONDITION_DEACTIVATED_PROP)
+                        .unwrap_or(false)
+                {
+                    self.update_spec(context, |spec| spec.conditions.push(derived_cond));
+                }
+            }
+        }
+    }
+
+    /// Definition analysis for a condition.
+    fn def_ana_condition(
+        &mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        kind: ConditionKind,
+        properties: PropertyBag,
+        exp: &EA::Exp,
+        additional_exps: &[EA::Exp],
+    ) {
+        if matches!(kind, ConditionKind::Decreases | ConditionKind::SucceedsIf) {
+            self.parent.error(loc, "condition kind is not supported");
+            return;
+        }
+        let expected_type = self.expected_type_for_condition(&kind);
+        let mut et = self.exp_translator_for_context(loc, context, &kind);
+        let (translated, translated_additional) = match kind {
+            ConditionKind::AbortsIf => (
+                et.translate_exp(exp, &expected_type).into_exp(),
+                additional_exps
+                    .iter()
+                    .map(|code| {
+                        et.translate_exp(code, &Type::Primitive(PrimitiveType::Num))
+                            .into_exp()
+                    })
+                    .collect_vec(),
+            ),
+            ConditionKind::AbortsWith => {
+                // Parser has created a dummy exp, codes are all in additional_exps
+                let mut exps = additional_exps
+                    .iter()
+                    .map(|code| {
+                        et.translate_exp(code, &Type::Primitive(PrimitiveType::Num))
+                            .into_exp()
+                    })
+                    .collect_vec();
+                let first = exps.remove(0);
+                (first, exps)
+            }
+            ConditionKind::Modifies => {
+                // Parser has created a dummy exp, targets are all in additional_exps
+                let mut exps = additional_exps
+                    .iter()
+                    .map(|target| et.translate_modify_target(target).into_exp())
+                    .collect_vec();
+                let first = exps.remove(0);
+                (first, exps)
+            }
+            ConditionKind::Emits => {
+                // TODO: `first` is the "message" part, and `second` is the "handle" part.
+                //       `second` should have type std::event::EventHandle<T>, and `first`
+                //       should have type T.
+                let (_, first) = et.translate_exp_free(exp);
+                let (_, second) = et.translate_exp_free(&additional_exps[0]);
+                let mut exps = vec![second.into_exp()];
+                if additional_exps.len() > 1 {
+                    exps.push(et.translate_exp(&additional_exps[1], &BOOL_TYPE).into_exp());
+                }
+                (first.into_exp(), exps)
+            }
+            ConditionKind::Axiom(ref type_params) => {
+                for (i, sym) in type_params.iter().enumerate() {
+                    et.define_type_param(loc, *sym, Type::TypeParameter(i as u16))
+                }
+                (et.translate_exp(exp, &expected_type).into_exp(), vec![])
+            }
+            _ => {
+                if !additional_exps.is_empty() {
+                    et.error(
+                          loc,
+                          "additional expressions only allowed with `aborts_if`, `aborts_with`, `modifies`, or `emits`",
+                      );
+                }
+                (et.translate_exp(exp, &expected_type).into_exp(), vec![])
+            }
+        };
+        et.finalize_types();
+        self.add_conditions_to_context(
+            context,
+            loc,
+            vec![Condition {
+                loc: loc.clone(),
+                kind,
+                properties,
+                exp: translated,
+                additional_exps: translated_additional,
+            }],
+            PropertyBag::default(),
+            "",
+        );
+    }
+
+    /// Compute the expected type for the expression in a condition.
+    fn expected_type_for_condition(&mut self, _kind: &ConditionKind) -> Type {
+        BOOL_TYPE.clone()
+    }
+
+    /// Convert a condition kind from AST into the ConditionKind known by the move model.
+    fn convert_condition_kind(
+        &mut self,
+        kind: &EA::SpecConditionKind,
+        context: &SpecBlockContext,
+    ) -> Option<ConditionKind> {
+        // Defines a type local with duplication check
+        fn define_type_param(
+            builder: &mut ModuleBuilder,
+            ty_params_defined: &mut BTreeSet<Symbol>,
+            name: &Name,
+        ) -> Option<Symbol> {
+            let symbol = builder.symbol_pool().make(&name.value);
+            if !ty_params_defined.insert(symbol) {
+                builder.parent.env.error(
+                    &builder.parent.to_loc(&name.loc),
+                    &format!("duplicate declaration of `{}`", &name.value),
+                );
+                None
+            } else {
+                Some(symbol)
+            }
+        }
+
+        fn define_type_params(
+            builder: &mut ModuleBuilder,
+            type_params: &[(Name, EA::AbilitySet)],
+        ) -> Option<Vec<Symbol>> {
+            let mut ty_params_defined = BTreeSet::new();
+            type_params
+                .iter()
+                .map(|(name, _)| define_type_param(builder, &mut ty_params_defined, name))
+                .collect()
+        }
+
+        use ConditionKind::*;
+        use EA::SpecConditionKind_ as PK;
+        let converted = match &kind.value {
+            PK::Assert => Assert,
+            PK::Assume => Assume,
+            PK::Decreases => Decreases,
+            PK::Modifies => Modifies,
+            PK::Emits => Emits,
+            PK::Ensures => Ensures,
+            PK::Requires => Requires,
+            PK::AbortsIf => AbortsIf,
+            PK::AbortsWith => AbortsWith,
+            PK::SucceedsIf => SucceedsIf,
+            PK::Invariant(ty_params) => {
+                let tys = define_type_params(self, ty_params)?;
+                match context {
+                    SpecBlockContext::Module => GlobalInvariant(tys),
+                    SpecBlockContext::Struct(..) => {
+                        if !tys.is_empty() {
+                            self.parent.env.error(
+                                &self.parent.to_loc(&kind.loc),
+                                "type parameters are not allowed in struct invariants",
+                            )
+                        }
+                        StructInvariant
+                    }
+                    SpecBlockContext::Function(..) => {
+                        if !tys.is_empty() {
+                            self.parent.env.error(
+                                &self.parent.to_loc(&kind.loc),
+                                "type parameters are not allowed in function invariants",
+                            )
+                        }
+                        FunctionInvariant
+                    }
+                    SpecBlockContext::FunctionCode(..) => {
+                        if !tys.is_empty() {
+                            self.parent.env.error(
+                                &self.parent.to_loc(&kind.loc),
+                                "type parameters are not allowed in loop invariants",
+                            )
+                        }
+                        LoopInvariant
+                    }
+                    SpecBlockContext::Schema(..) => {
+                        if !tys.is_empty() {
+                            self.parent.env.error(
+                                &self.parent.to_loc(&kind.loc),
+                                "type parameters are not allowed in schema invariants",
+                            )
+                        }
+                        SchemaInvariant
+                    }
+                }
+            }
+            PK::InvariantUpdate(ty_params) => {
+                let tys = define_type_params(self, ty_params)?;
+                if !matches!(context, SpecBlockContext::Module) {
+                    self.parent.env.error(
+                        &self.parent.to_loc(&kind.loc),
+                        "update invariants are only allowed in module specs",
+                    )
+                }
+                GlobalInvariantUpdate(tys)
+            }
+            PK::Axiom(ty_params) => Axiom(define_type_params(self, ty_params)?),
+        };
+        Some(converted)
+    }
+}
+
+/// ## Spec Function Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Definition analysis for a specification helper function.
+    fn def_ana_spec_fun(
+        &mut self,
+        uninterpreted: bool,
+        _signature: &EA::FunctionSignature,
+        body: &EA::FunctionBody,
+    ) {
+        match &body.value {
+            EA::FunctionBody_::Defined(seq) => {
+                let entry = &self.spec_funs[self.spec_fun_index];
+                let type_params = entry.type_params.clone();
+                let params = entry.params.clone();
+                let result_type = entry.result_type.clone();
+                let mut et = ExpTranslator::new(self);
+                let loc = et.to_loc(&body.loc);
+                for (n, ty) in type_params {
+                    et.define_type_param(&loc, n, ty);
+                }
+                et.enter_scope();
+                for (n, ty) in params {
+                    et.define_local(&loc, n, ty, None, None);
+                }
+                let translated = et.translate_seq(&loc, seq, &result_type);
+                et.finalize_types();
+                self.spec_funs[self.spec_fun_index].body = Some(translated.into_exp());
+            }
+            EA::FunctionBody_::Native => {
+                if !uninterpreted {
+                    self.spec_funs[self.spec_fun_index].is_native = true
+                }
+            }
+        }
+        self.spec_fun_index += 1;
+    }
+}
+
+/// ## Global Variable Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Definition analysis for a specification variable function.
+    fn def_ana_global_var(&mut self, loc: &Loc, name: &Name, init: Option<&EA::Exp>) {
+        if let Some(exp) = init {
+            // Type check and translate the initialization expression.
+            let sym = self.qualified_by_module_from_name(name);
+            let entry = &self
+                .parent
+                .spec_var_table
+                .get(&sym)
+                .expect("spec var defined")
+                .clone();
+            let mut et = ExpTranslator::new(self);
+            for (n, ty) in &entry.type_params {
+                et.define_type_param(loc, *n, ty.clone());
+            }
+            let translated = et.translate_exp(exp, &entry.type_);
+            et.finalize_types();
+            // Store the translated init expression into the declaration.
+            let decl = self
+                .spec_vars
+                .iter_mut()
+                .find(|d| d.name == sym.symbol)
+                .expect("spec var defined");
+            decl.init = Some(translated.into_exp())
+        }
+    }
+
+    fn def_ana_global_var_update(
+        &mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        lhs: &EA::Exp,
+        rhs: &EA::Exp,
+    ) {
+        // Type check and translate lhs and rhs. They must have the same type.
+        let mut et = self.exp_translator_for_context(loc, context, &ConditionKind::Requires);
+        let (expected_ty, lhs) = et.translate_exp_free(lhs);
+        let rhs = et.translate_exp(rhs, &expected_ty);
+        et.finalize_types();
+        if lhs.extract_ghost_mem_access(self.parent.env).is_some() {
+            // Add as a condition to the context.
+            self.add_conditions_to_context(
+                context,
+                loc,
+                vec![Condition {
+                    loc: loc.clone(),
+                    kind: ConditionKind::Update,
+                    properties: Default::default(),
+                    exp: rhs.into_exp(),
+                    additional_exps: vec![lhs.into_exp()],
+                }],
+                PropertyBag::default(),
+                "",
+            );
+        } else {
+            self.parent.error(
+                &self.parent.env.get_node_loc(lhs.node_id()),
+                "target of `update` restricted to specification variables",
+            )
+        }
+    }
+}
+
+/// ## Schema Definition Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Definition analysis for a schema. This proceeds in two steps: first we ensure recursively
+    /// that all included schemas are analyzed, checking for cycles. Then we actually analyze this
+    /// schema's content.
+    fn def_ana_schema(
+        &mut self,
+        schema_defs: &BTreeMap<QualifiedSymbol, &EA::SpecBlock>,
+        visited: &mut BTreeSet<QualifiedSymbol>,
+        visiting: &mut Vec<QualifiedSymbol>,
+        name: QualifiedSymbol,
+        block: &EA::SpecBlock,
+    ) {
+        if !visited.insert(name.clone()) {
+            // Already analyzed.
+            return;
+        }
+        visiting.push(name.clone());
+
+        // First recursively visit all schema includes and ensure they are analyzed.
+        for included_name in
+            self.iter_schema_includes(&block.value.members)
+                .flat_map(|(_, _, exp)| {
+                    let mut res = vec![];
+                    extract_schema_access(exp, &mut res);
+                    res
+                })
+        {
+            let included_loc = self.parent.env.to_loc(&included_name.loc);
+            let included_name = self.module_access_to_qualified(included_name);
+            if included_name.module_name == self.module_name {
+                // A schema in the module we are currently analyzing. We need to check
+                // for cycles before recursively analyzing it.
+                if visiting.contains(&included_name) {
+                    self.parent.error(
+                        &included_loc,
+                        &format!(
+                            "cyclic schema dependency: {} -> {}",
+                            visiting
+                                .iter()
+                                .map(|name| format!("{}", name.display_simple(self.symbol_pool())))
+                                .join(" -> "),
+                            included_name.display_simple(self.symbol_pool())
+                        ),
+                    )
+                } else if let Some(included_block) = schema_defs.get(&included_name) {
+                    // Recursively analyze it, if its defined. If not, we report an undeclared
+                    // error in 2nd phase.
+                    self.def_ana_schema(
+                        schema_defs,
+                        visited,
+                        visiting,
+                        included_name,
+                        included_block,
+                    );
+                }
+            }
+        }
+
+        // Now actually analyze this schema.
+        self.def_ana_schema_content(name, block);
+
+        // Remove from visiting list
+        visiting.pop();
+    }
+
+    /// Analysis of schema after it is ensured that all included schemas are fully analyzed.
+    fn def_ana_schema_content(&mut self, name: QualifiedSymbol, block: &EA::SpecBlock) {
+        let loc = self.parent.env.to_loc(&block.loc);
+        let entry = self
+            .parent
+            .spec_schema_table
+            .get(&name)
+            .expect("schema defined");
+        let type_params = entry.type_params.clone();
+        let mut all_vars: BTreeMap<Symbol, LocalVarEntry> = entry
+            .vars
+            .iter()
+            .map(|(n, ty)| {
+                (
+                    *n,
+                    LocalVarEntry {
+                        loc: loc.clone(),
+                        type_: ty.clone(),
+                        operation: None,
+                        temp_index: None,
+                    },
+                )
+            })
+            .collect();
+        let mut included_spec = Spec::default();
+
+        // Store back all_vars computed so far (which does not include those coming from
+        // included schemas). This is needed so we can analyze lets.
+        {
+            let entry = self
+                .parent
+                .spec_schema_table
+                .get_mut(&name)
+                .expect("schema defined");
+            entry.all_vars = all_vars.clone();
+        }
+
+        // Process all lets. We need to do this before includes so we have them available
+        // in schema arguments of includes. This unfortunately means we can't refer in
+        // lets to variables included from schemas, but this seems to be a rare use case.
+        assert!(self.spec_block_lets.is_empty());
+        for member in &block.value.members {
+            let member_loc = self.parent.to_loc(&member.loc);
+            if let EA::SpecBlockMember_::Let {
+                name: let_name,
+                post_state,
+                def,
+            } = &member.value
+            {
+                let context = SpecBlockContext::Schema(name.clone());
+                self.def_ana_let(&context, &member_loc, *post_state, let_name, def);
+            }
+        }
+
+        // Process all schema includes. We need to do this before we type check expressions to have
+        // all variables from includes in the environment.
+        for (_, included_props, included_exp) in self.iter_schema_includes(&block.value.members) {
+            let included_props = self.translate_properties(included_props, &|_, _, _| None);
+            self.def_ana_schema_exp(
+                &type_params,
+                &mut all_vars,
+                &mut included_spec,
+                true,
+                &included_props,
+                included_exp,
+            );
+        }
+        // Store the results back to the schema entry.
+        {
+            let entry = self
+                .parent
+                .spec_schema_table
+                .get_mut(&name)
+                .expect("schema defined");
+            entry.all_vars = all_vars;
+            entry.included_spec = included_spec;
+        }
+
+        // Now process all conditions and invariants.
+        for member in &block.value.members {
+            let member_loc = self.parent.to_loc(&member.loc);
+            match &member.value {
+                EA::SpecBlockMember_::Variable {
+                    is_global: false, ..
+                } => { /* handled during decl analysis */ }
+                EA::SpecBlockMember_::Include { .. } => { /* handled above */ }
+                EA::SpecBlockMember_::Let { .. } => { /* handled above */ }
+                EA::SpecBlockMember_::Condition {
+                    kind,
+                    properties,
+                    exp,
+                    additional_exps,
+                } => {
+                    let context = SpecBlockContext::Schema(name.clone());
+                    if let Some(kind) = self.convert_condition_kind(kind, &context) {
+                        let properties = self.translate_properties(properties, &|_, _, prop| {
+                            if !is_property_valid_for_condition(&kind, prop) {
+                                Some(member_loc.clone())
+                            } else {
+                                None
+                            }
+                        });
+                        self.def_ana_condition(
+                            &member_loc,
+                            &context,
+                            kind,
+                            properties,
+                            exp,
+                            additional_exps,
+                        );
+                    }
+                }
+                _ => {
+                    self.parent.error(&member_loc, "item not allowed in schema");
+                }
+            };
+        }
+        self.spec_block_lets.clear();
+    }
+
+    /// Extracts all schema inclusions from a list of spec block members.
+    fn iter_schema_includes<'a>(
+        &self,
+        members: &'a [EA::SpecBlockMember],
+    ) -> impl Iterator<Item = (&'a MoveIrLoc, &'a Vec<EA::PragmaProperty>, &'a EA::Exp)> {
+        members.iter().filter_map(|m| {
+            if let EA::SpecBlockMember_::Include { properties, exp } = &m.value {
+                Some((&m.loc, properties, exp))
+            } else {
+                None
+            }
+        })
+    }
+
+    /// Analyzes a schema expression. Depending on whether `allow_new_vars` is true, this will
+    /// add new variables to `vars` and match types of existing ones. All conditions
+    /// from the schema are rewritten for the inclusion context and added to the provided spec.
+    ///
+    /// We accept a very restricted set of Move expressions for schemas:
+    ///
+    /// - `P ==> SchemaExp`: all conditions in the schema will be prefixed with `P ==> ..`.
+    ///   Conditions which are not based on boolean expressions (as VarUpdate et. al) will
+    ///   be rejected.
+    /// - `if (P) SchemaExp else SchemaExp`: this is treated similar as one include for
+    ///   `P ==> SchemaExp` and one for `!P ==> SchemaExp`.
+    /// - `SchemaExp1 && SchemaExp2`: this is treated as two includes for the both expressions.
+    /// - `SchemaExp1 || SchemaExp2`: this could be treated as
+    ///   `exists b: bool :: if (b) SchemaExp1 else SchemaExp2` (but as we do not have the
+    ///   existential quantifier yet in the spec language, it is actually not supported..)
+    ///
+    /// The implementation works via a recursive function which accumulates a path condition
+    /// leading to a Move "pack" expression which is interpreted as a schema reference.
+    fn def_ana_schema_exp(
+        &mut self,
+        context_type_params: &[(Symbol, Type)],
+        vars: &mut BTreeMap<Symbol, LocalVarEntry>,
+        spec: &mut Spec,
+        allow_new_vars: bool,
+        properties: &PropertyBag,
+        exp: &EA::Exp,
+    ) {
+        self.def_ana_schema_exp_oper(
+            context_type_params,
+            vars,
+            spec,
+            allow_new_vars,
+            None,
+            properties,
+            exp,
+        )
+    }
+
+    /// Analyzes operations in schema expressions. This extends the path condition as needed
+    /// and continues recursively.
+    fn def_ana_schema_exp_oper(
+        &mut self,
+        context_type_params: &[(Symbol, Type)],
+        vars: &mut BTreeMap<Symbol, LocalVarEntry>,
+        spec: &mut Spec,
+        allow_new_vars: bool,
+        path_cond: Option<Exp>,
+        properties: &PropertyBag,
+        exp: &EA::Exp,
+    ) {
+        let loc = self.parent.to_loc(&exp.loc);
+        match &exp.value {
+            EA::Exp_::BinopExp(
+                lhs,
+                Spanned {
+                    value: PA::BinOp_::Implies,
+                    ..
+                },
+                rhs,
+            ) => {
+                let mut et = self.exp_translator_for_schema(&loc, context_type_params, vars);
+                let lhs_exp = et.translate_exp(lhs, &BOOL_TYPE).into_exp();
+                et.finalize_types();
+                let path_cond = Some(self.extend_path_condition(&loc, path_cond, lhs_exp));
+                self.def_ana_schema_exp_oper(
+                    context_type_params,
+                    vars,
+                    spec,
+                    allow_new_vars,
+                    path_cond,
+                    properties,
+                    rhs,
+                );
+            }
+            EA::Exp_::BinopExp(
+                lhs,
+                Spanned {
+                    value: PA::BinOp_::And,
+                    ..
+                },
+                rhs,
+            ) => {
+                self.def_ana_schema_exp_oper(
+                    context_type_params,
+                    vars,
+                    spec,
+                    allow_new_vars,
+                    path_cond.clone(),
+                    properties,
+                    lhs,
+                );
+                self.def_ana_schema_exp_oper(
+                    context_type_params,
+                    vars,
+                    spec,
+                    allow_new_vars,
+                    path_cond,
+                    properties,
+                    rhs,
+                );
+            }
+            EA::Exp_::IfElse(c, t, e) => {
+                let mut et = self.exp_translator_for_schema(&loc, context_type_params, vars);
+                let c_exp = et.translate_exp(c, &BOOL_TYPE).into_exp();
+                et.finalize_types();
+                let t_path_cond =
+                    Some(self.extend_path_condition(&loc, path_cond.clone(), c_exp.clone()));
+                self.def_ana_schema_exp_oper(
+                    context_type_params,
+                    vars,
+                    spec,
+                    allow_new_vars,
+                    t_path_cond,
+                    properties,
+                    t,
+                );
+                let node_id = self.parent.env.new_node(loc.clone(), BOOL_TYPE.clone());
+                let not_c_exp = ExpData::Call(node_id, Operation::Not, vec![c_exp]).into_exp();
+                let e_path_cond = Some(self.extend_path_condition(&loc, path_cond, not_c_exp));
+                self.def_ana_schema_exp_oper(
+                    context_type_params,
+                    vars,
+                    spec,
+                    allow_new_vars,
+                    e_path_cond,
+                    properties,
+                    e,
+                );
+            }
+            EA::Exp_::Name(maccess, type_args_opt) => self.def_ana_schema_exp_leaf(
+                context_type_params,
+                vars,
+                spec,
+                allow_new_vars,
+                path_cond,
+                properties,
+                &loc,
+                maccess,
+                type_args_opt,
+                None,
+            ),
+            EA::Exp_::Pack(maccess, type_args_opt, fields) => self.def_ana_schema_exp_leaf(
+                context_type_params,
+                vars,
+                spec,
+                allow_new_vars,
+                path_cond,
+                properties,
+                &loc,
+                maccess,
+                type_args_opt,
+                Some(fields),
+            ),
+            _ => self
+                .parent
+                .error(&loc, "expression construct not supported for schemas"),
+        }
+    }
+
+    /// Analyzes a schema leaf expression.
+    fn def_ana_schema_exp_leaf(
+        &mut self,
+        context_type_params: &[(Symbol, Type)],
+        vars: &mut BTreeMap<Symbol, LocalVarEntry>,
+        spec: &mut Spec,
+        allow_new_vars: bool,
+        path_cond: Option<Exp>,
+        schema_properties: &PropertyBag,
+        loc: &Loc,
+        maccess: &EA::ModuleAccess,
+        type_args_opt: &Option<Vec<EA::Type>>,
+        args_opt: Option<&EA::Fields<EA::Exp>>,
+    ) {
+        let schema_name = self.module_access_to_qualified(maccess);
+
+        // Remove schema from unused table since it is used in an expression
+        self.parent.unused_schema_set.remove(&schema_name);
+
+        // We need to temporarily detach the schema entry from the parent table because of
+        // borrowing problems, as we need to traverse it while at the same time mutate self.
+        let schema_entry = if let Some(e) = self.parent.spec_schema_table.remove(&schema_name) {
+            e
+        } else {
+            self.parent.error(
+                loc,
+                &format!(
+                    "schema `{}` undeclared",
+                    schema_name.display(self.symbol_pool())
+                ),
+            );
+            return;
+        };
+
+        // Translate type arguments
+        let mut et = self.exp_translator_for_schema(loc, context_type_params, vars);
+        let type_arguments = &et.translate_types_opt(type_args_opt);
+        if schema_entry.type_params.len() != type_arguments.len() {
+            self.parent.error(
+                loc,
+                &format!(
+                    "wrong number of type arguments (expected {}, got {})",
+                    schema_entry.type_params.len(),
+                    type_arguments.len()
+                ),
+            );
+            // Don't forget to put schema back.
+            self.parent
+                .spec_schema_table
+                .insert(schema_name, schema_entry);
+            return;
+        }
+
+        // Translate schema arguments.
+        let mut argument_map: BTreeMap<Symbol, Exp> = args_opt
+            .map(|args| {
+                args.iter()
+                    .map(|(var_loc, schema_var_, (_, exp))| {
+                        let pool = et.symbol_pool();
+                        let schema_sym = pool.make(schema_var_);
+                        let schema_type = if let Some(LocalVarEntry { type_, .. }) =
+                            schema_entry.all_vars.get(&schema_sym)
+                        {
+                            type_.instantiate(type_arguments)
+                        } else {
+                            et.error(
+                                &et.to_loc(&var_loc),
+                                &format!("`{}` not declared in schema", schema_sym.display(pool)),
+                            );
+                            Type::Error
+                        };
+                        // Check the expression in the argument list.
+                        // Note we currently only use the vars defined so far in this context. Variables
+                        // which are introduced by schemas after the inclusion of this one are not in scope.
+                        let exp = et.translate_exp(exp, &schema_type).into_exp();
+                        et.finalize_types();
+                        (schema_sym, exp)
+                    })
+                    .collect()
+            })
+            .unwrap_or_default();
+
+        // Go over all variables in the schema which are not in the argument map and either match
+        // them against existing one or declare new, if allowed.
+        for (name, LocalVarEntry { type_, .. }) in &schema_entry.all_vars {
+            if argument_map.contains_key(name) {
+                continue;
+            }
+            let ty = type_.instantiate(type_arguments);
+            let pool = et.symbol_pool();
+            if let Some(entry) = vars.get(name) {
+                // Name already exists in inclusion context, check its type.
+                et.check_type(
+                    loc,
+                    &ty,
+                    &entry.type_,
+                    &format!(
+                        "for `{}` included from schema",
+                        name.display(et.symbol_pool())
+                    ),
+                );
+                // Put into argument map.
+                let node_id = et.new_node_id_with_type_loc(&entry.type_, loc);
+                let exp = if let Some(oper) = &entry.operation {
+                    ExpData::Call(node_id, oper.clone(), vec![])
+                } else if let Some(index) = &entry.temp_index {
+                    ExpData::Temporary(node_id, *index)
+                } else {
+                    ExpData::LocalVar(node_id, *name)
+                };
+                argument_map.insert(*name, exp.into_exp());
+            } else if allow_new_vars {
+                // Name does not yet exists in inclusion context, but is allowed to be introduced.
+                // This happens if we include a schema in another schema.
+                vars.insert(
+                    *name,
+                    LocalVarEntry {
+                        loc: loc.clone(),
+                        type_: ty.clone(),
+                        operation: None,
+                        temp_index: None,
+                    },
+                );
+            } else {
+                et.error(
+                    loc,
+                    &format!(
+                        "`{}` cannot be matched to an existing name in inclusion context",
+                        name.display(pool)
+                    ),
+                );
+            }
+        }
+        // Done with expression build; ensure all types are inferred correctly.
+        et.finalize_types();
+
+        // Go over all conditions in the schema, rewrite them, and add to the inclusion conditions.
+        for Condition {
+            loc,
+            kind,
+            properties,
+            exp,
+            additional_exps,
+        } in schema_entry
+            .spec
+            .conditions
+            .iter()
+            .chain(schema_entry.included_spec.conditions.iter())
+        {
+            let mut replacer = |_, target: RewriteTarget| {
+                if let RewriteTarget::LocalVar(sym) = target {
+                    argument_map.get(&sym).cloned()
+                } else {
+                    None
+                }
+            };
+            let mut rewriter =
+                ExpRewriter::new(self.parent.env, &mut replacer).set_type_args(type_arguments);
+            let mut exp = rewriter.rewrite_exp(exp.to_owned());
+            let mut additional_exps = rewriter.rewrite_vec(additional_exps);
+            if let Some(cond) = &path_cond {
+                // There is a path condition to be added.
+                if kind == &ConditionKind::Emits {
+                    let cond_exp = if additional_exps.len() < 2 {
+                        cond.clone()
+                    } else {
+                        self.make_path_expr(
+                            Operation::And,
+                            cond.node_id(),
+                            cond.clone(),
+                            additional_exps.pop().unwrap(),
+                        )
+                    };
+                    additional_exps.push(cond_exp);
+                } else if matches!(kind, ConditionKind::LetPre(..) | ConditionKind::LetPost(..)) {
+                    // Ignore path condition for lets.
+                } else {
+                    // In case of AbortsIf, the path condition is combined with the predicate using
+                    // &&, otherwise ==>.
+                    exp = self.make_path_expr(
+                        if kind == &ConditionKind::AbortsIf {
+                            Operation::And
+                        } else {
+                            Operation::Implies
+                        },
+                        cond.node_id(),
+                        cond.clone(),
+                        exp,
+                    );
+                }
+            }
+            let mut effective_properties = schema_properties.clone();
+            effective_properties.extend(properties.clone());
+            spec.conditions.push(Condition {
+                loc: loc.clone(),
+                kind: kind.clone(),
+                properties: effective_properties,
+                exp,
+                additional_exps,
+            });
+            match kind {
+                ConditionKind::LetPost(name) | ConditionKind::LetPre(name) => {
+                    // If a let name is introduced by this condition, remove it from argument_map
+                    // as it shadows schema arguments.
+                    argument_map.remove(name);
+                }
+                _ => {}
+            }
+        }
+
+        // Put schema entry back.
+        self.parent
+            .spec_schema_table
+            .insert(schema_name, schema_entry);
+    }
+
+    /// Make a path expression.
+    fn make_path_expr(&mut self, oper: Operation, node_id: NodeId, cond: Exp, exp: Exp) -> Exp {
+        let env = &self.parent.env;
+        let path_cond_loc = env.get_node_loc(node_id);
+        let new_node_id = env.new_node(path_cond_loc, BOOL_TYPE.clone());
+        ExpData::Call(new_node_id, oper, vec![cond, exp]).into_exp()
+    }
+
+    /// Creates an expression translator for use in schema expression. This defines the context
+    /// type parameters and the variables.
+    fn exp_translator_for_schema<'module_translator>(
+        &'module_translator mut self,
+        loc: &Loc,
+        context_type_params: &[(Symbol, Type)],
+        vars: &mut BTreeMap<Symbol, LocalVarEntry>,
+    ) -> ExpTranslator<'env, 'translator, 'module_translator> {
+        let mut et = ExpTranslator::new_with_old(self, true);
+        for (n, ty) in context_type_params {
+            et.define_type_param(loc, *n, ty.clone())
+        }
+        et.enter_scope();
+        for (n, entry) in vars.iter() {
+            et.define_local(
+                &entry.loc,
+                *n,
+                entry.type_.clone(),
+                entry.operation.clone(),
+                entry.temp_index,
+            );
+        }
+        et.enter_scope();
+        for (n, id) in et
+            .parent
+            .spec_block_lets
+            .iter()
+            .map(|(n, (_, id))| (*n, *id))
+            .collect_vec()
+        {
+            let ty = et.parent.parent.env.get_node_type(id);
+            let loc = et.parent.parent.env.get_node_loc(id);
+            et.define_let_local(&loc, n, ty);
+        }
+        et
+    }
+
+    /// Extends a path condition for schema expression analysis.
+    fn extend_path_condition(&mut self, loc: &Loc, path_cond: Option<Exp>, exp: Exp) -> Exp {
+        if let Some(cond) = path_cond {
+            let node_id = self.parent.env.new_node(loc.clone(), BOOL_TYPE.clone());
+            ExpData::Call(node_id, Operation::And, vec![cond, exp]).into_exp()
+        } else {
+            exp
+        }
+    }
+
+    /// Analyze schema inclusion in the spec block for a function, struct or module. This
+    /// instantiates the schema and adds all conditions and invariants it contains to the context.
+    ///
+    /// The `alt_context_type_params` allows to use different type parameter names as would
+    /// otherwise be inferred from the SchemaBlockContext. This is used for the apply weaving
+    /// operator which allows to use different type parameter names than the function declarations
+    /// to which it is applied to.
+    fn def_ana_schema_inclusion_outside_schema(
+        &mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        alt_context_type_params: Option<&[(Symbol, Type)]>,
+        context_properties: PropertyBag,
+        exp: &EA::Exp,
+    ) {
+        // Compute the type parameters and variables this spec block uses. We do this by constructing
+        // an expression translator and immediately extracting  from it. Depending on whether in
+        // function or struct context, we use a condition kind which defines the maximum
+        // of available symbols. We need to potentially revise this to only declare variables which
+        // have a proper use in a condition/invariant, depending on what is actually included in
+        // the block.
+        let (mut vars, context_type_params) = match context {
+            SpecBlockContext::Function(..) | SpecBlockContext::FunctionCode(..) => {
+                let et = self.exp_translator_for_context(loc, context, &ConditionKind::Ensures);
+                (et.extract_var_map(), et.get_type_params_with_name())
+            }
+            SpecBlockContext::Struct(..) => {
+                let et =
+                    self.exp_translator_for_context(loc, context, &ConditionKind::StructInvariant);
+                (et.extract_var_map(), et.get_type_params_with_name())
+            }
+            SpecBlockContext::Module => (BTreeMap::new(), vec![]),
+            SpecBlockContext::Schema { .. } => panic!("unexpected schema context"),
+        };
+        let mut spec = Spec::default();
+
+        // Analyze the schema inclusion. This will instantiate conditions for
+        // this block.
+        self.def_ana_schema_exp(
+            if let Some(type_params) = alt_context_type_params {
+                type_params
+            } else {
+                &context_type_params
+            },
+            &mut vars,
+            &mut spec,
+            false,
+            &PropertyBag::default(),
+            exp,
+        );
+
+        // Write the conditions to the context item.
+        self.add_conditions_to_context(
+            context,
+            loc,
+            spec.conditions,
+            context_properties,
+            "(included from schema)",
+        );
+    }
+
+    /// Analyzes a schema apply weaving operator.
+    fn def_ana_schema_apply(
+        &mut self,
+        loc: &Loc,
+        context: &SpecBlockContext,
+        exp: &EA::Exp,
+        patterns: &[PA::SpecApplyPattern],
+        exclusion_patterns: &[PA::SpecApplyPattern],
+    ) {
+        if !matches!(context, SpecBlockContext::Module) {
+            self.parent.error(
+                loc,
+                "the `apply` schema weaving operator can only be used inside a `spec module` block",
+            );
+            return;
+        }
+        for fun_name in self.parent.fun_table.keys().cloned().collect_vec() {
+            // Note we need the vector clone above to avoid borrowing self for the
+            // whole loop.
+            let entry = self.parent.fun_table.get(&fun_name).unwrap();
+            if entry.module_id != self.module_id {
+                // Not a function from this module
+                continue;
+            }
+            let is_public = matches!(entry.visibility, FunctionVisibility::Public);
+            let type_arg_count = entry.type_params.len();
+            let is_excluded = exclusion_patterns.iter().any(|p| {
+                self.apply_pattern_matches(fun_name.symbol, is_public, type_arg_count, true, p)
+            });
+            if is_excluded {
+                // Explicitly excluded from matching.
+                continue;
+            }
+            if let Some(matched) = patterns.iter().find(|p| {
+                self.apply_pattern_matches(fun_name.symbol, is_public, type_arg_count, false, p)
+            }) {
+                // This is a match, so apply this schema to this function.
+                let type_params = {
+                    let mut et = ExpTranslator::new(self);
+                    et.analyze_and_add_type_params(
+                        matched.value.type_parameters.iter().map(|(name, _)| name),
+                    );
+                    et.get_type_params_with_name()
+                };
+                // Create a property marking this as injected.
+                let context_properties =
+                    self.add_bool_property(PropertyBag::default(), CONDITION_INJECTED_PROP, true);
+                self.def_ana_schema_inclusion_outside_schema(
+                    loc,
+                    &SpecBlockContext::Function(fun_name),
+                    Some(&type_params),
+                    context_properties,
+                    exp,
+                );
+            }
+        }
+    }
+
+    /// Returns true if the pattern matches the function of name, type arity, and
+    /// visibility.
+    ///
+    /// The `ignore_type_args` parameter is used for exclusion matches. In exclusion matches we
+    /// do not want to include type args because its to easy for a user to get this wrong, so
+    /// we match based only on visibility and name pattern. On the other hand, we want a user
+    /// in inclusion matches to use a pattern like `*<X>` to match any generic function with
+    /// one type argument.
+    fn apply_pattern_matches(
+        &self,
+        name: Symbol,
+        is_public: bool,
+        type_arg_count: usize,
+        ignore_type_args: bool,
+        pattern: &PA::SpecApplyPattern,
+    ) -> bool {
+        if !ignore_type_args && pattern.value.type_parameters.len() != type_arg_count {
+            return false;
+        }
+        if let Some(v) = &pattern.value.visibility {
+            match v {
+                PA::Visibility::Public(..) => {
+                    if !is_public {
+                        return false;
+                    }
+                }
+                PA::Visibility::Internal => {
+                    if is_public {
+                        return false;
+                    }
+                }
+                PA::Visibility::Script(..) => {
+                    // TODO: model script visibility properly
+                    unimplemented!("Script visibility not supported yet")
+                }
+                PA::Visibility::Friend(..) => {
+                    // TODO: model friend visibility properly
+                    unimplemented!("Friend visibility not supported yet")
+                }
+                PA::Visibility::Package(..) => {
+                    // TODO: model friend visibility properly
+                    unimplemented!("Package visibility not supported yet")
+                }
+            }
+        }
+        let rex = Regex::new(&format!(
+            "^{}$",
+            pattern
+                .value
+                .name_pattern
+                .iter()
+                .map(|p| match &p.value {
+                    PA::SpecApplyFragment_::Wildcard => ".*".to_string(),
+                    PA::SpecApplyFragment_::NamePart(n) => n.value.to_string(),
+                })
+                .join("")
+        ))
+        .expect("regex valid");
+        rex.is_match(self.symbol_pool().string(name).as_str())
+    }
+}
+
+/// ## Spec Var Usage Analysis
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Compute state usage of spec funs.
+    fn compute_state_usage(&mut self) {
+        let mut visited = BTreeSet::new();
+        for idx in 0..self.spec_funs.len() {
+            self.compute_state_usage_and_callees_for_fun(&mut visited, idx);
+        }
+        // Check for purity requirements. All data invariants must be pure expressions and
+        // not depend on global state.
+        let check_uses_memory = |mid: ModuleId, fid: SpecFunId| {
+            if mid.to_usize() < self.parent.env.get_module_count() {
+                // This is calling a function from another module we already have
+                // translated.
+                let module_env = self.parent.env.get_module(mid);
+                let fun_decl = module_env.get_spec_fun(fid);
+                fun_decl.used_memory.is_empty()
+            } else {
+                // This is calling a function from the module we are currently translating.
+                let fun_decl = &self.spec_funs[fid.as_usize()];
+                fun_decl.used_memory.is_empty()
+            }
+        };
+
+        for struct_spec in self.struct_specs.values() {
+            for cond in &struct_spec.conditions {
+                if matches!(cond.kind, ConditionKind::StructInvariant)
+                    && !cond.exp.uses_memory(&check_uses_memory)
+                {
+                    self.parent.error(
+                        &cond.loc,
+                        "data invariants cannot depend on global state \
+                        (directly or indirectly uses a global spec var or resource storage).",
+                    );
+                }
+            }
+        }
+    }
+
+    /// Compute state usage for a given spec fun, defined via its index into the spec_funs
+    /// vector of the currently translated module. This recursively computes the values for
+    /// functions called from this one; the visited set is there to break cycles.
+    fn compute_state_usage_and_callees_for_fun(
+        &mut self,
+        visited: &mut BTreeSet<usize>,
+        fun_idx: usize,
+    ) {
+        if !visited.insert(fun_idx) {
+            return;
+        }
+
+        // Detach the current SpecFunDecl body so we can traverse it while at the same time mutating
+        // the full self. Rust requires us to do so (at least the author doesn't know better yet),
+        // but moving it should be not too expensive.
+        let body = if self.spec_funs[fun_idx].body.is_some() {
+            self.spec_funs[fun_idx].body.take().unwrap()
+        } else {
+            // No body: assume it is pure.
+            return;
+        };
+
+        let (used_memory, callees) =
+            self.compute_state_usage_and_callees_for_exp(Some(visited), &body);
+        let fun_decl = &mut self.spec_funs[fun_idx];
+        fun_decl.body = Some(body);
+        fun_decl.used_memory = used_memory;
+        fun_decl.callees = callees;
+    }
+
+    /// Computes state usage and called functions for an expression. If the visited_opt is
+    /// available, this recurses to compute the usage for any functions called. Otherwise
+    /// it assumes this information is already computed.
+    fn compute_state_usage_and_callees_for_exp(
+        &mut self,
+        mut visited_opt: Option<&mut BTreeSet<usize>>,
+        exp: &ExpData,
+    ) -> (
+        BTreeSet<QualifiedInstId<StructId>>,
+        BTreeSet<QualifiedId<SpecFunId>>,
+    ) {
+        let mut used_memory = BTreeSet::new();
+        let mut callees = BTreeSet::new();
+        exp.visit(&mut |e: &ExpData| {
+            match e {
+                ExpData::Call(id, Operation::Function(mid, fid, _), _) => {
+                    callees.insert(mid.qualified(*fid));
+                    let inst = self.parent.env.get_node_instantiation(*id);
+                    // Extend used memory with that of called functions, after applying type
+                    // instantiation of this call.
+                    if mid.to_usize() < self.parent.env.get_module_count() {
+                        // This is calling a function from another module we already have
+                        // translated.
+                        let module_env = self.parent.env.get_module(*mid);
+                        let fun_decl = module_env.get_spec_fun(*fid);
+                        used_memory.extend(
+                            fun_decl
+                                .used_memory
+                                .iter()
+                                .map(|id| id.instantiate_ref(&inst)),
+                        );
+                    } else {
+                        // This is calling a function from the module we are currently translating.
+                        // Need to recursively ensure we have computed used_spec_vars because of
+                        // arbitrary call graphs, including cyclic. If visted_opt is not set,
+                        // we know we already computed this.
+                        if let Some(visited) = &mut visited_opt {
+                            self.compute_state_usage_and_callees_for_fun(visited, fid.as_usize());
+                        }
+                        let fun_decl = &self.spec_funs[fid.as_usize()];
+                        used_memory.extend(
+                            fun_decl
+                                .used_memory
+                                .iter()
+                                .map(|id| id.instantiate_ref(&inst)),
+                        );
+                    }
+                }
+                ExpData::Call(node_id, Operation::Global(_), _)
+                | ExpData::Call(node_id, Operation::Exists(_), _) => {
+                    if !self.parent.env.has_errors() {
+                        // We would crash if the type is not valid, so only do this if no errors
+                        // have been reported so far.
+                        let ty = &self.parent.env.get_node_instantiation(*node_id)[0];
+                        let (mid, sid, inst) = ty.require_struct();
+                        used_memory.insert(mid.qualified_inst(sid, inst.to_owned()));
+                    }
+                }
+                _ => {}
+            }
+        });
+        (used_memory, callees)
+    }
+}
+
+/// ## Module Invariants
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Process module invariants, attaching them to the global env.
+    fn process_module_invariants(&mut self) {
+        for cond in self.module_spec.conditions.iter().cloned().collect_vec() {
+            if matches!(
+                cond.kind,
+                ConditionKind::GlobalInvariant(..) | ConditionKind::GlobalInvariantUpdate(..)
+            ) {
+                let (mem_usage, _) = self.compute_state_usage_and_callees_for_exp(None, &cond.exp);
+                let id = self.parent.env.new_global_id();
+                let Condition { loc, exp, .. } = cond;
+                self.parent.env.add_global_invariant(GlobalInvariant {
+                    id,
+                    loc,
+                    kind: cond.kind,
+                    mem_usage,
+                    declaring_module: self.module_id,
+                    cond: exp,
+                    properties: cond.properties.clone(),
+                });
+            }
+        }
+    }
+}
+
+/// # Spec Block Infos
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Collect location and target information for all spec blocks. This is used for documentation
+    /// generation.
+    fn collect_spec_block_infos(&mut self, module_def: &EA::ModuleDefinition) {
+        for block in &module_def.specs {
+            let block_loc = self.parent.to_loc(&block.loc);
+            let member_locs = block
+                .value
+                .members
+                .iter()
+                .map(|m| self.parent.to_loc(&m.loc))
+                .collect_vec();
+            let target = match self.get_spec_block_context(&block.value.target) {
+                Some(SpecBlockContext::Module) => SpecBlockTarget::Module,
+                Some(SpecBlockContext::Function(qsym)) => {
+                    SpecBlockTarget::Function(self.module_id, FunId::new(qsym.symbol))
+                }
+                Some(SpecBlockContext::FunctionCode(qsym, info)) => SpecBlockTarget::FunctionCode(
+                    self.module_id,
+                    FunId::new(qsym.symbol),
+                    info.offset as usize,
+                ),
+                Some(SpecBlockContext::Struct(qsym)) => {
+                    SpecBlockTarget::Struct(self.module_id, StructId::new(qsym.symbol))
+                }
+                Some(SpecBlockContext::Schema(qsym)) => {
+                    let entry = self
+                        .parent
+                        .spec_schema_table
+                        .get(&qsym)
+                        .expect("schema defined");
+                    SpecBlockTarget::Schema(
+                        self.module_id,
+                        SchemaId::new(qsym.symbol),
+                        entry
+                            .type_params
+                            .iter()
+                            .map(|(name, _)| {
+                                TypeParameter(*name, AbilityConstraint(AbilitySet::EMPTY))
+                            })
+                            .collect_vec(),
+                    )
+                }
+                None => {
+                    // This has been reported as an error. Choose a dummy target.
+                    SpecBlockTarget::Module
+                }
+            };
+            self.spec_block_infos.push(SpecBlockInfo {
+                loc: block_loc,
+                member_locs,
+                target,
+            })
+        }
+    }
+}
+
+/// # Tweak application
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    /// Tweak the specifications at the AST level based on `ModuleBuilderOptions`.
+    fn apply_tweaks(&mut self, module_def: &EA::ModuleDefinition) {
+        self.tweak_pragma_opaque(module_def);
+    }
+
+    /// If the `ignore_pragma_opaque_*` options are set, the opaque pragma will be
+    /// removed from the function spec property bag according to the options.
+    fn tweak_pragma_opaque(&mut self, module_def: &EA::ModuleDefinition) {
+        let env = &self.parent.env;
+        let options = env
+            .get_extension::<ModelBuilderOptions>()
+            .unwrap_or_default();
+        if !(options.ignore_pragma_opaque_when_possible
+            || options.ignore_pragma_opaque_internal_only)
+        {
+            return;
+        }
+
+        for spec in &module_def.specs {
+            if matches!(spec.value.target.value, EA::SpecBlockTarget_::Schema(..)) {
+                continue;
+            }
+            if let Some(SpecBlockContext::Function(fun_name)) =
+                self.get_spec_block_context(&spec.value.target)
+            {
+                if let Some(spec) = self.fun_specs.get_mut(&fun_name.symbol) {
+                    // if the spec does not have "pragma opaque;" do nothing,
+                    let has_pragma_opaque = env
+                        .is_property_true(&spec.properties, OPAQUE_PRAGMA)
+                        .unwrap_or(false);
+                    if !has_pragma_opaque {
+                        continue;
+                    }
+
+                    // if the spec has `pragma verify = false;` do not remove its `opaque` mark
+                    let is_verified = env
+                        .is_property_true(&spec.properties, VERIFY_PRAGMA)
+                        .unwrap_or(true)
+                        && env
+                            .is_property_true(&self.module_spec.properties, VERIFY_PRAGMA)
+                            .unwrap_or(true);
+                    if !is_verified {
+                        continue;
+                    }
+
+                    // if the spec has `[concrete]` or `[abstract]` properties, do not remove its
+                    // `opaque` mark
+                    let has_opaque_prop = spec.any(|cond| {
+                        env.is_property_true(&cond.properties, CONDITION_CONCRETE_PROP)
+                            .unwrap_or(false)
+                            || env
+                                .is_property_true(&cond.properties, CONDITION_ABSTRACT_PROP)
+                                .unwrap_or(false)
+                    });
+                    if has_opaque_prop {
+                        continue;
+                    }
+
+                    // if the function may have unknown callers, respect the option
+                    // `ignore_pragma_opaque_internal_only`.
+                    let fun_entry = self.parent.fun_table.get(&fun_name).unwrap_or_else(|| {
+                        panic!(
+                            "Unable to find function `{}`",
+                            fun_name.display(env.symbol_pool())
+                        )
+                    });
+                    let has_unknown_caller =
+                        matches!(fun_entry.visibility, FunctionVisibility::Public)
+                            || fun_entry.is_entry;
+                    if has_unknown_caller && options.ignore_pragma_opaque_internal_only {
+                        continue;
+                    }
+
+                    // everything is cleared, we can remove the `opaque` mark now
+                    let opaque_symbol = env.symbol_pool().make(OPAQUE_PRAGMA);
+                    spec.properties.remove(&opaque_symbol);
+                }
+            }
+        }
+    }
+}
+
+/// # Environment Population
+
+impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
+    fn populate_env_from_result(
+        &mut self,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        module: CompiledModule,
+        source_map: SourceMap,
+    ) {
+        let struct_data: BTreeMap<StructId, StructData> = (0..module.struct_defs().len())
+            .filter_map(|idx| {
+                let def_idx = StructDefinitionIndex(idx as u16);
+                let handle_idx = module.struct_def_at(def_idx).struct_handle;
+                let handle = module.struct_handle_at(handle_idx);
+                let view = StructHandleView::new(&module, handle);
+                let name = self.symbol_pool().make(view.name().as_str());
+                if let Some(entry) = self
+                    .parent
+                    .struct_table
+                    .get(&self.qualified_by_module(name))
+                {
+                    let struct_spec = self
+                        .struct_specs
+                        .remove(&name)
+                        .unwrap_or_default();
+                    Some((
+                        StructId::new(name),
+                        self.parent.env.create_move_struct_data(
+                            &module,
+                            def_idx,
+                            name,
+                            entry.loc.clone(),
+                            entry.attributes.clone(),
+                            struct_spec,
+                        ),
+                    ))
+                } else {
+                    self.parent.error(
+                        &self.parent.env.internal_loc(),
+                        &format!("[internal] bytecode does not match AST: `{}` in bytecode but not in AST", name.display(self.symbol_pool())));
+                    None
+                }
+            })
+            .collect();
+        let function_data: BTreeMap<FunId, FunctionData> = (0..module.function_defs().len())
+            .filter_map(|idx| {
+                let def_idx = FunctionDefinitionIndex(idx as u16);
+                let handle_idx = module.function_def_at(def_idx).function;
+                let handle = module.function_handle_at(handle_idx);
+                let view = FunctionHandleView::new(&module, handle);
+                let name_str = view.name().as_str();
+                let name = if name_str == SCRIPT_BYTECODE_FUN_NAME {
+                    // This is a pseudo script module, which has exactly one function. Determine
+                    // the name of this function.
+                    self.parent.fun_table.iter().filter_map(|(k, _)| {
+                        if k.module_name == self.module_name
+                        { Some(k.symbol) } else { None }
+                    }).next().expect("unexpected script with multiple or no functions")
+                } else {
+                    self.symbol_pool().make(name_str)
+                };
+                let fun_spec = self.fun_specs.remove(&name).unwrap_or_default();
+                if let Some(entry) = self.parent.fun_table.get(&self.qualified_by_module(name)) {
+                    let arg_names = project_1st(&entry.params);
+                    let type_arg_names = project_1st(&entry.type_params);
+                    Some((FunId::new(name), self.parent.env.create_function_data(
+                        &module,
+                        def_idx,
+                        name,
+                        entry.loc.clone(),
+                        entry.attributes.clone(),
+                        arg_names,
+                        type_arg_names,
+                        fun_spec,
+                    )))
+                } else {
+                    let funs = self.parent.fun_table.keys().map(|k| {
+                        format!("{}", k.display_full(self.symbol_pool()))
+                    }).join(", ");
+                    self.parent.error(
+                        &self.parent.env.internal_loc(),
+                        &format!("[internal] bytecode does not match AST: `{}` in bytecode but not in AST (available in AST: {})", name.display(self.symbol_pool()), funs));
+                    None
+                }
+            })
+            .collect();
+        let named_constants: BTreeMap<NamedConstantId, NamedConstantData> = self
+            .parent
+            .const_table
+            .iter()
+            .filter(|(name, _)| name.module_name == self.module_name)
+            .map(|(name, const_entry)| {
+                let ConstEntry { loc, value, ty } = const_entry.clone();
+                (
+                    NamedConstantId::new(name.symbol),
+                    self.parent
+                        .env
+                        .create_named_constant_data(name.symbol, loc, ty, value),
+                )
+            })
+            .collect();
+        self.parent.env.add(
+            loc,
+            attributes,
+            module,
+            source_map,
+            named_constants,
+            struct_data,
+            function_data,
+            std::mem::take(&mut self.spec_vars),
+            std::mem::take(&mut self.spec_funs),
+            std::mem::take(&mut self.module_spec),
+            std::mem::take(&mut self.spec_block_infos),
+        );
+    }
+}
+
+/// Extract all accesses of a schema from a schema expression.
+pub(crate) fn extract_schema_access<'a>(exp: &'a EA::Exp, res: &mut Vec<&'a EA::ModuleAccess>) {
+    match &exp.value {
+        EA::Exp_::Name(maccess, _) => res.push(maccess),
+        EA::Exp_::Pack(maccess, ..) => res.push(maccess),
+        EA::Exp_::BinopExp(_, _, rhs) => extract_schema_access(rhs, res),
+        EA::Exp_::IfElse(_, t, e) => {
+            extract_schema_access(t, res);
+            extract_schema_access(e, res);
+        }
+        _ => {}
+    }
+}
diff --git a/vendors/move/crates/move-model/src/builder/spec_builtins.rs b/vendors/move/crates/move-model/src/builder/spec_builtins.rs
new file mode 100644
index 000000000..2b6b41173
--- /dev/null
+++ b/vendors/move/crates/move-model/src/builder/spec_builtins.rs
@@ -0,0 +1,419 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Defines builtin functions for specifications, adding them to the build
+
+use crate::{
+    ast::{Operation, TraceKind, Value},
+    builder::model_builder::{ConstEntry, ModelBuilder, SpecFunEntry},
+    ty::{PrimitiveType, Type},
+};
+use move_compiler::parser::ast::{self as PA};
+use move_core_types::u256::U256;
+use num::BigInt;
+
+/// Declares builtins in the build. This adds functions and operators
+/// to the build which will be treated the same as user defined specification functions.
+pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
+    let loc = trans.env.internal_loc();
+    let bool_t = &Type::new_prim(PrimitiveType::Bool);
+    let num_t = &Type::new_prim(PrimitiveType::Num);
+    let range_t = &Type::new_prim(PrimitiveType::Range);
+    let address_t = &Type::new_prim(PrimitiveType::Address);
+
+    let param_t = &Type::TypeParameter(0);
+    let mk_num_const = |value: BigInt| ConstEntry {
+        loc: loc.clone(),
+        ty: num_t.clone(),
+        value: Value::Number(value),
+    };
+
+    {
+        // Constants
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U8"),
+            mk_num_const(BigInt::from(u8::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U16"),
+            mk_num_const(BigInt::from(u16::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U32"),
+            mk_num_const(BigInt::from(u32::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U64"),
+            mk_num_const(BigInt::from(u64::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U128"),
+            mk_num_const(BigInt::from(u128::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U256"),
+            mk_num_const(BigInt::from(&U256::max_value())),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("EXECUTION_FAILURE"),
+            mk_num_const(BigInt::from(-1)),
+        );
+
+        // Binary operators.
+        let mut declare_bin =
+            |op: PA::BinOp_, oper: Operation, param_type: &Type, result_type: &Type| {
+                trans.define_spec_fun(
+                    trans.bin_op_symbol(&op),
+                    SpecFunEntry {
+                        loc: loc.clone(),
+                        oper,
+                        type_params: vec![],
+                        arg_types: vec![param_type.clone(), param_type.clone()],
+                        result_type: result_type.clone(),
+                    },
+                );
+            };
+        use PA::BinOp_::*;
+        declare_bin(Add, Operation::Add, num_t, num_t);
+        declare_bin(Sub, Operation::Sub, num_t, num_t);
+        declare_bin(Mul, Operation::Mul, num_t, num_t);
+        declare_bin(Mod, Operation::Mod, num_t, num_t);
+        declare_bin(Div, Operation::Div, num_t, num_t);
+        declare_bin(BitOr, Operation::BitOr, num_t, num_t);
+        declare_bin(BitAnd, Operation::BitAnd, num_t, num_t);
+        declare_bin(Xor, Operation::Xor, num_t, num_t);
+        declare_bin(Shl, Operation::Shl, num_t, num_t);
+        declare_bin(Shr, Operation::Shr, num_t, num_t);
+
+        declare_bin(Range, Operation::Range, num_t, range_t);
+
+        declare_bin(Implies, Operation::Implies, bool_t, bool_t);
+        declare_bin(Iff, Operation::Iff, bool_t, bool_t);
+        declare_bin(And, Operation::And, bool_t, bool_t);
+        declare_bin(Or, Operation::Or, bool_t, bool_t);
+
+        declare_bin(Lt, Operation::Lt, num_t, bool_t);
+        declare_bin(Le, Operation::Le, num_t, bool_t);
+        declare_bin(Gt, Operation::Gt, num_t, bool_t);
+        declare_bin(Ge, Operation::Ge, num_t, bool_t);
+
+        // Eq and Neq have special treatment because they are generic.
+        trans.define_spec_fun(
+            trans.bin_op_symbol(&PA::BinOp_::Eq),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Eq,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone(), param_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.bin_op_symbol(&PA::BinOp_::Neq),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Neq,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone(), param_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+    }
+
+    {
+        // Unary operators.
+        trans.define_spec_fun(
+            trans.unary_op_symbol(&PA::UnaryOp_::Not),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Not,
+                type_params: vec![],
+                arg_types: vec![bool_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+    }
+
+    {
+        // Builtin functions.
+        let vector_t = &Type::Vector(Box::new(param_t.clone()));
+        let domain_t = &Type::TypeDomain(Box::new(param_t.clone()));
+
+        // Constants (max_u8(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u8"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU8,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        // Constants (max_u16(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u16"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU16,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        // Constants (max_u32(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u32"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU32,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u64"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU64,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u128"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU128,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        // Constants (max_u256(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u256"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU256,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        // Vectors
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("len"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Len,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone()],
+                result_type: num_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("update"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::UpdateVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone(), num_t.clone(), param_t.clone()],
+                result_type: vector_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("vec"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::EmptyVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![],
+                result_type: vector_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("vec"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::SingleVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: vector_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("concat"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::ConcatVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone(), vector_t.clone()],
+                result_type: vector_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("contains"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::ContainsVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone(), param_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("index_of"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::IndexOfVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone(), param_t.clone()],
+                result_type: num_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("in_range"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::InRangeVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone(), num_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("in_range"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::InRangeRange,
+                type_params: vec![],
+                arg_types: vec![range_t.clone(), num_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("range"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::RangeVec,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![vector_t.clone()],
+                result_type: range_t.clone(),
+            },
+        );
+
+        // Resources.
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("global"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Global(None),
+                type_params: vec![param_t.clone()],
+                arg_types: vec![address_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+        // TODO(emmazzz): declaring these as builtins will allow users to
+        // use borrow_global and borrow_global_mut in specs. Later we should
+        // map them to `global` instead.
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("borrow_global"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Global(None),
+                type_params: vec![param_t.clone()],
+                arg_types: vec![address_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("borrow_global_mut"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Global(None),
+                type_params: vec![param_t.clone()],
+                arg_types: vec![address_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("exists"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Exists(None),
+                type_params: vec![param_t.clone()],
+                arg_types: vec![address_t.clone()],
+                result_type: bool_t.clone(),
+            },
+        );
+
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("$spec_domain"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::TypeDomain,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![],
+                result_type: domain_t.clone(),
+            },
+        );
+
+        // Old
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("old"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Old,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+
+        // Tracing
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("TRACE"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Trace(TraceKind::User),
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+
+        // Explicit bv2int
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("bv2int"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Bv2Int,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+
+        // Explicit int2bv
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("int2bv"),
+            SpecFunEntry {
+                loc,
+                oper: Operation::Int2Bv,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+    }
+}
diff --git a/vendors/move/crates/move-model/src/code_writer.rs b/vendors/move/crates/move-model/src/code_writer.rs
new file mode 100644
index 000000000..0485d0ecf
--- /dev/null
+++ b/vendors/move/crates/move-model/src/code_writer.rs
@@ -0,0 +1,265 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! A helper for generating structured code.
+//!
+//! TODO(wrwg): this should be moved somewhere else. It is currently contained here
+//!   so its on the bottom of the dependency relation, and there is no `utility` crate
+//!   where it could belong to.
+
+use std::collections::{BTreeMap, Bound};
+
+use codespan::{ByteIndex, ByteOffset, ColumnIndex, Files, LineIndex, RawIndex, RawOffset};
+
+use crate::model::Loc;
+use std::cell::RefCell;
+
+struct CodeWriterData {
+    /// A function to be called on each emitted string. If the function does not change
+    /// anything, it returns None.
+    emit_hook: Box<dyn Fn(&str) -> Option<String>>,
+
+    /// The generated output string.
+    output: String,
+
+    /// Current active indentation.
+    indent: usize,
+
+    /// Current active location.
+    current_location: Loc,
+
+    /// A sparse mapping from byte index in written output to location in source file.
+    /// Any index not in this map is approximated by the next smaller index on lookup.
+    output_location_map: BTreeMap<ByteIndex, Loc>,
+
+    /// A map from label indices to the current position in output they are pointing to.
+    label_map: BTreeMap<ByteIndex, ByteIndex>,
+}
+
+/// A helper to emit code. Supports indentation and maintains source to target location information.
+pub struct CodeWriter(RefCell<CodeWriterData>);
+
+/// A label which can be created at the code writers current output position to later insert
+/// code at this position.
+#[derive(Debug, Clone, Copy)]
+pub struct CodeWriterLabel(ByteIndex);
+
+impl CodeWriter {
+    /// Creates new code writer, with the given default location.
+    pub fn new(loc: Loc) -> CodeWriter {
+        let zero = ByteIndex(0);
+        let mut output_location_map = BTreeMap::new();
+        output_location_map.insert(zero, loc.clone());
+        Self(RefCell::new(CodeWriterData {
+            emit_hook: Box::new(|_| None),
+            output: String::new(),
+            indent: 0,
+            current_location: loc,
+            output_location_map,
+            label_map: Default::default(),
+        }))
+    }
+
+    pub fn set_emit_hook<F>(&self, f: F)
+    where
+        F: Fn(&str) -> Option<String>,
+        F: 'static,
+    {
+        let mut data = self.0.borrow_mut();
+        data.emit_hook = Box::new(f)
+    }
+
+    /// Creates a label at which code can be inserted later.
+    pub fn create_label(&self) -> CodeWriterLabel {
+        let mut data = self.0.borrow_mut();
+        let index = ByteIndex(data.output.len() as RawIndex);
+        data.label_map.insert(index, index);
+        CodeWriterLabel(index)
+    }
+
+    /// Inserts code at the previously created label.
+    pub fn insert_at_label(&self, label: CodeWriterLabel, s: &str) {
+        let mut data = self.0.borrow_mut();
+        let index = *data.label_map.get(&label.0).expect("label undefined");
+        let shift = ByteOffset(s.len() as RawOffset);
+        // Shift indices after index.
+        data.label_map = std::mem::take(&mut data.label_map)
+            .into_iter()
+            .map(|(i, j)| if j > index { (i, j + shift) } else { (i, j) })
+            .collect();
+        data.output_location_map = std::mem::take(&mut data.output_location_map)
+            .into_iter()
+            .map(|(i, loc)| {
+                if i > index {
+                    (i + shift, loc)
+                } else {
+                    (i, loc)
+                }
+            })
+            .collect();
+        // Insert text.
+        data.output.insert_str(index.0 as usize, s);
+    }
+
+    /// Calls a function to process the code written so far. This is embedded into a function
+    /// so we ensure correct scoping of borrowed RefCell content.
+    pub fn process_result<T, F: FnMut(&str) -> T>(&self, mut f: F) -> T {
+        // Ensure that result is terminated by newline without spaces.
+        // This assumes that we already trimmed all individual lines.
+        let data = self.0.borrow();
+        let output = data.output.as_str();
+        let mut j = output.trim_end().len();
+        if j < output.len() && output[j..].starts_with('\n') {
+            j += 1;
+        }
+        f(&output[0..j])
+    }
+
+    /// Extracts the output as a string. Leaves the writers data empty.
+    pub fn extract_result(&self) -> String {
+        let mut s = std::mem::take(&mut self.0.borrow_mut().output);
+        // Eliminate any empty lines at end, but keep the lest EOL
+        s.truncate(s.trim_end().len());
+        if !s.ends_with('\n') {
+            s.push('\n');
+        }
+        s
+    }
+
+    /// Sets the current location. This location will be associated with all subsequently written
+    /// code so we can map back from the generated code to this location. If current loc
+    /// is already the passed one, nothing will be updated, so it is ok to call this method
+    /// repeatedly with the same value.
+    pub fn set_location(&self, loc: &Loc) {
+        let mut data = self.0.borrow_mut();
+        let code_at = ByteIndex(data.output.len() as u32);
+        if &data.current_location != loc {
+            data.output_location_map.insert(code_at, loc.clone());
+            data.current_location = loc.clone();
+        }
+    }
+
+    /// Given a byte index in the written output, return the best approximation of the source
+    /// which generated this output.
+    pub fn get_source_location(&self, output_index: ByteIndex) -> Option<Loc> {
+        let data = self.0.borrow();
+        if let Some(loc) = data
+            .output_location_map
+            .range((Bound::Unbounded, Bound::Included(&output_index)))
+            .next_back()
+            .map(|(_, v)| v)
+        {
+            return Some(loc.clone());
+        }
+        None
+    }
+
+    /// Given line/column location, determine ByteIndex of that location.
+    pub fn get_output_byte_index(&self, line: LineIndex, column: ColumnIndex) -> Option<ByteIndex> {
+        self.process_result(|s| {
+            let mut fmap = Files::new();
+            let id = fmap.add("dummy", s);
+            fmap.line_span(id, line).ok().map(|line_span| {
+                ByteIndex((line_span.start().to_usize() + column.to_usize()) as u32)
+            })
+        })
+    }
+
+    /// Indents any subsequently written output. The current line of output and any subsequent ones
+    /// will be indented. Note this works after the last output was `\n` but the line is still
+    /// empty.
+    pub fn indent(&self) {
+        let mut data = self.0.borrow_mut();
+        data.indent += 4;
+    }
+
+    /// Undo previously done indentation.
+    pub fn unindent(&self) {
+        let mut data = self.0.borrow_mut();
+        assert!(data.indent >= 4);
+        data.indent -= 4;
+    }
+
+    /// Emit some code with indentation
+    pub fn with_indent<F>(&self, mut f: F)
+    where
+        F: FnMut(),
+    {
+        self.indent();
+        f();
+        self.unindent();
+    }
+
+    /// Emit a string. The string will be broken down into lines to apply current indentation.
+    pub fn emit(&self, s: &str) {
+        let rewritten = (*self.0.borrow().emit_hook)(s);
+        let s = if let Some(r) = &rewritten {
+            r.as_str()
+        } else {
+            s
+        };
+        let mut first = true;
+        // str::lines ignores trailing newline, so deal with this ad-hoc
+        let end_newl = s.ends_with('\n');
+        for l in s.lines() {
+            if first {
+                first = false
+            } else {
+                Self::trim_trailing_whitespace(&mut self.0.borrow_mut().output);
+                self.0.borrow_mut().output.push('\n');
+            }
+            self.emit_str(l)
+        }
+        if end_newl {
+            Self::trim_trailing_whitespace(&mut self.0.borrow_mut().output);
+            self.0.borrow_mut().output.push('\n');
+        }
+    }
+
+    fn trim_trailing_whitespace(s: &mut String) {
+        s.truncate(s.trim_end_matches(' ').len());
+    }
+
+    /// Emits a string and then terminates the line.
+    pub fn emit_line(&self, s: &str) {
+        self.emit(s.trim_end_matches(' '));
+        self.emit("\n");
+    }
+
+    /// Helper for emitting a string for a single line.
+    fn emit_str(&self, s: &str) {
+        let mut data = self.0.borrow_mut();
+        // If we are looking at the beginning of a new line, emit indent now.
+        if data.indent > 0 && (data.output.is_empty() || data.output.ends_with('\n')) {
+            let n = data.indent;
+            data.output.push_str(&" ".repeat(n));
+        }
+        data.output.push_str(s);
+    }
+}
+
+/// Macro to emit a simple or formatted string.
+#[macro_export]
+macro_rules! emit {
+    ($target:expr, $s:expr) => (
+       $target.emit($s)
+    );
+    ($target:expr, $s:expr, $($arg:expr),+ $(,)?) => (
+       $target.emit(&format!($s, $($arg),+))
+    )
+}
+
+/// Macro to emit a simple or formatted string followed by a new line.
+#[macro_export]
+macro_rules! emitln {
+    ($target:expr) => (
+       $target.emit_line("")
+    );
+    ($target:expr, $s:expr) => (
+       $target.emit_line($s)
+    );
+    ($target:expr, $s:expr, $($arg:expr),+ $(,)?) => (
+       $target.emit_line(&format!($s, $($arg),+))
+    )
+}
diff --git a/vendors/move/crates/move-model/src/exp_generator.rs b/vendors/move/crates/move-model/src/exp_generator.rs
new file mode 100644
index 000000000..1f448f9ec
--- /dev/null
+++ b/vendors/move/crates/move-model/src/exp_generator.rs
@@ -0,0 +1,407 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use itertools::Itertools;
+use num::BigUint;
+
+use crate::{
+    ast::{Exp, ExpData, LocalVarDecl, Operation, QuantKind, TempIndex, Value},
+    model::{
+        FieldEnv, FunctionEnv, GlobalEnv, Loc, NodeId, QualifiedId, QualifiedInstId, SpecFunId,
+        StructId,
+    },
+    symbol::Symbol,
+    ty::{PrimitiveType, Type, BOOL_TYPE, NUM_TYPE},
+};
+
+/// A trait that defines a generator for `Exp`.
+pub trait ExpGenerator<'env> {
+    /// Get the functional environment
+    fn function_env(&self) -> &FunctionEnv<'env>;
+
+    /// Get the current location
+    fn get_current_loc(&self) -> Loc;
+
+    /// Set the current location
+    fn set_loc(&mut self, loc: Loc);
+
+    /// Add a local variable with given type, return the local index.
+    fn add_local(&mut self, ty: Type) -> TempIndex;
+
+    /// Get the type of a local given at `temp` index
+    fn get_local_type(&self, temp: TempIndex) -> Type;
+
+    /// Get the global environment
+    fn global_env(&self) -> &'env GlobalEnv {
+        self.function_env().module_env.env
+    }
+
+    /// Sets the default location from a node id.
+    fn set_loc_from_node(&mut self, node_id: NodeId) {
+        let loc = self.global_env().get_node_loc(node_id);
+        self.set_loc(loc);
+    }
+
+    /// Creates a new expression node id, using current default location, provided type,
+    /// and optional instantiation.
+    fn new_node(&self, ty: Type, inst_opt: Option<Vec<Type>>) -> NodeId {
+        let node_id = self.global_env().new_node(self.get_current_loc(), ty);
+        if let Some(inst) = inst_opt {
+            self.global_env().set_node_instantiation(node_id, inst);
+        }
+        node_id
+    }
+
+    /// Allocates a new temporary.
+    fn new_temp(&mut self, ty: Type) -> TempIndex {
+        self.add_local(ty)
+    }
+
+    /// Make a boolean constant expression.
+    fn mk_bool_const(&self, value: bool) -> Exp {
+        let node_id = self.new_node(BOOL_TYPE.clone(), None);
+        ExpData::Value(node_id, Value::Bool(value)).into_exp()
+    }
+
+    /// Make an address constant.
+    fn mk_address_const(&self, value: BigUint) -> Exp {
+        let node_id = self.new_node(Type::Primitive(PrimitiveType::Address), None);
+        ExpData::Value(node_id, Value::Address(value)).into_exp()
+    }
+
+    /// Makes a Call expression.
+    fn mk_call(&self, ty: &Type, oper: Operation, args: Vec<Exp>) -> Exp {
+        let node_id = self.new_node(ty.clone(), None);
+        ExpData::Call(node_id, oper, args).into_exp()
+    }
+
+    /// Makes a Call expression with type instantiation.
+    fn mk_call_with_inst(
+        &self,
+        ty: &Type,
+        inst: Vec<Type>,
+        oper: Operation,
+        args: Vec<Exp>,
+    ) -> Exp {
+        let node_id = self.new_node(ty.clone(), Some(inst));
+        ExpData::Call(node_id, oper, args).into_exp()
+    }
+
+    /// Makes an if-then-else expression.
+    fn mk_ite(&self, cond: ExpData, if_true: ExpData, if_false: ExpData) -> Exp {
+        let node_id = self.new_node(self.global_env().get_node_type(if_true.node_id()), None);
+        ExpData::IfElse(
+            node_id,
+            cond.into_exp(),
+            if_true.into_exp(),
+            if_false.into_exp(),
+        )
+        .into_exp()
+    }
+
+    /// Makes a Call expression with boolean result type.
+    fn mk_bool_call(&self, oper: Operation, args: Vec<Exp>) -> Exp {
+        self.mk_call(&BOOL_TYPE, oper, args)
+    }
+
+    /// Make a boolean not expression.
+    fn mk_not(&self, arg: Exp) -> Exp {
+        self.mk_bool_call(Operation::Not, vec![arg])
+    }
+
+    /// Make an equality expression.
+    fn mk_eq(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::Eq, vec![arg1, arg2])
+    }
+
+    /// Make an identical equality expression. This is stronger than `make_equal` because
+    /// it requires the exact same representation, not only interpretation.
+    fn mk_identical(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::Identical, vec![arg1, arg2])
+    }
+
+    /// Make an and expression.
+    fn mk_and(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::And, vec![arg1, arg2])
+    }
+
+    /// Make an or expression.
+    fn mk_or(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::Or, vec![arg1, arg2])
+    }
+
+    /// Make an implies expression.
+    fn mk_implies(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::Implies, vec![arg1, arg2])
+    }
+
+    /// Make an iff expression.
+    fn mk_iff(&self, arg1: Exp, arg2: Exp) -> Exp {
+        self.mk_bool_call(Operation::Iff, vec![arg1, arg2])
+    }
+
+    /// Make a numerical expression for some of the builtin constants.
+    fn mk_builtin_num_const(&self, oper: Operation) -> Exp {
+        assert!(matches!(
+            oper,
+            Operation::MaxU8
+                | Operation::MaxU16
+                | Operation::MaxU32
+                | Operation::MaxU64
+                | Operation::MaxU128
+                | Operation::MaxU256
+        ));
+        self.mk_call(&NUM_TYPE, oper, vec![])
+    }
+
+    /// Join an iterator of boolean expressions with a boolean binary operator.
+    fn mk_join_bool(&self, oper: Operation, args: impl Iterator<Item = Exp>) -> Option<Exp> {
+        args.reduce(|a, b| self.mk_bool_call(oper.clone(), vec![a, b]))
+    }
+
+    /// Join two boolean optional expression with binary operator.
+    fn mk_join_opt_bool(
+        &self,
+        oper: Operation,
+        arg1: Option<Exp>,
+        arg2: Option<Exp>,
+    ) -> Option<Exp> {
+        match (arg1, arg2) {
+            (Some(a1), Some(a2)) => Some(self.mk_bool_call(oper, vec![a1, a2])),
+            (Some(a1), None) => Some(a1),
+            (None, Some(a2)) => Some(a2),
+            _ => None,
+        }
+    }
+
+    /// Creates a quantifier over the content of a vector. The passed function `f` receives
+    /// an expression representing an element of the vector and returns the quantifiers predicate;
+    /// if it returns None, this function will also return None, otherwise the quantifier will be
+    /// returned.
+    fn mk_vector_quant_opt<F>(
+        &self,
+        kind: QuantKind,
+        vector: Exp,
+        elem_ty: &Type,
+        f: &mut F,
+    ) -> Option<Exp>
+    where
+        F: FnMut(Exp) -> Option<Exp>,
+    {
+        let elem = self.mk_local("$elem", elem_ty.clone());
+        if let Some(body) = f(elem) {
+            let range_decl = self.mk_decl(self.mk_symbol("$elem"), elem_ty.clone(), None);
+            let node_id = self.new_node(BOOL_TYPE.clone(), None);
+            Some(
+                ExpData::Quant(
+                    node_id,
+                    kind,
+                    vec![(range_decl, vector)],
+                    vec![],
+                    None,
+                    body,
+                )
+                .into_exp(),
+            )
+        } else {
+            None
+        }
+    }
+
+    /// Creates a quantifier over the content of a map. The passed function `f` receives
+    /// an expression representing an element of the map and returns the quantifiers predicate;
+    /// if it returns None, this function will also return None, otherwise the quantifier will be
+    /// returned.
+    ///
+    /// NOTE: the `spec_fun_get` argument is needed due to the fact that we do not have a native
+    /// operator of getting the value by key in from a map. In the `mk_vector_quant_opt` case,
+    /// we have the `Index` operator to map from an index to a value. But in the `map` case, we
+    /// need to use the spec function for the key-to-value conversion.
+    ///
+    /// Alternative design choices including:
+    /// - re-purpose the `Index` operator to take key and intrinsic maps
+    /// - add a new `Get` operator for this specific operation.
+    fn mk_map_quant_opt<F>(
+        &self,
+        kind: QuantKind,
+        map: Exp,
+        spec_fun_get: QualifiedId<SpecFunId>,
+        key_ty: &Type,
+        val_ty: &Type,
+        f: &mut F,
+    ) -> Option<Exp>
+    where
+        F: FnMut(Exp) -> Option<Exp>,
+    {
+        let key = self.mk_local("$key", key_ty.clone());
+        let val = self.mk_call_with_inst(
+            val_ty,
+            vec![key_ty.clone(), val_ty.clone()],
+            Operation::Function(spec_fun_get.module_id, spec_fun_get.id, None),
+            vec![map.clone(), key.clone()],
+        );
+        if let Some(body) = self.mk_join_opt_bool(Operation::And, f(key), f(val)) {
+            let range_decl = self.mk_decl(self.mk_symbol("$key"), key_ty.clone(), None);
+            let node_id = self.new_node(BOOL_TYPE.clone(), None);
+            Some(
+                ExpData::Quant(node_id, kind, vec![(range_decl, map)], vec![], None, body)
+                    .into_exp(),
+            )
+        } else {
+            None
+        }
+    }
+
+    /// Creates a quantifier over the content of memory. The passed function `f` receives
+    //  an expression representing a value in memory and returns the quantifiers predicate;
+    //  if it returns None, this function will also return None.
+    fn mk_mem_quant_opt<F>(
+        &self,
+        kind: QuantKind,
+        mem: QualifiedId<StructId>,
+        f: &mut F,
+    ) -> Option<ExpData>
+    where
+        F: FnMut(Exp) -> Option<Exp>,
+    {
+        // We generate `forall $val in resources<R>: INV[$val]`. The `resources<R>`
+        // quantifier domain is currently only available in the internal expression language,
+        // not on user level.
+        let struct_env = self
+            .global_env()
+            .get_module(mem.module_id)
+            .into_struct(mem.id);
+        let type_inst = (0..struct_env.get_type_parameters().len())
+            .map(|i| Type::TypeParameter(i as u16))
+            .collect_vec();
+        let struct_ty = Type::Struct(mem.module_id, mem.id, type_inst);
+        let value = self.mk_local("$rsc", struct_ty.clone());
+
+        if let Some(body) = f(value) {
+            let resource_domain_ty = Type::ResourceDomain(mem.module_id, mem.id, None);
+            let resource_domain_node_id =
+                self.new_node(resource_domain_ty, Some(vec![struct_ty.clone()]));
+            let resource_domain =
+                ExpData::Call(resource_domain_node_id, Operation::ResourceDomain, vec![])
+                    .into_exp();
+            let resource_decl = self.mk_decl(self.mk_symbol("$rsc"), struct_ty, None);
+            let quant_node_id = self.new_node(BOOL_TYPE.clone(), None);
+            Some(ExpData::Quant(
+                quant_node_id,
+                kind,
+                vec![(resource_decl, resource_domain)],
+                vec![],
+                None,
+                body,
+            ))
+        } else {
+            None
+        }
+    }
+
+    /// Creates a quantifier over the content of instantiated memory. The passed function `f`
+    /// receives an expression representing a value in memory and returns the quantifiers predicate;
+    //  if it returns None, this function will also return None.
+    fn mk_inst_mem_quant_opt<F>(
+        &self,
+        kind: QuantKind,
+        mem: &QualifiedInstId<StructId>,
+        f: &mut F,
+    ) -> Option<Exp>
+    where
+        F: FnMut(Exp) -> Option<Exp>,
+    {
+        // We generate `forall $val in resources<R>: INV[$val]`. The `resources<R>`
+        // quantifier domain is currently only available in the internal expression language,
+        // not on user level.
+        let struct_ty = Type::Struct(mem.module_id, mem.id, mem.inst.clone());
+        let value = self.mk_local("$rsc", struct_ty.clone());
+
+        if let Some(body) = f(value) {
+            let resource_domain_ty =
+                Type::ResourceDomain(mem.module_id, mem.id, Some(mem.inst.clone()));
+            let resource_domain_node_id =
+                self.new_node(resource_domain_ty, Some(vec![struct_ty.clone()]));
+            let resource_domain =
+                ExpData::Call(resource_domain_node_id, Operation::ResourceDomain, vec![])
+                    .into_exp();
+            let resource_decl = self.mk_decl(self.mk_symbol("$rsc"), struct_ty, None);
+            let quant_node_id = self.new_node(BOOL_TYPE.clone(), None);
+            Some(
+                ExpData::Quant(
+                    quant_node_id,
+                    kind,
+                    vec![(resource_decl, resource_domain)],
+                    vec![],
+                    None,
+                    body,
+                )
+                .into_exp(),
+            )
+        } else {
+            None
+        }
+    }
+
+    /// Makes a local variable declaration.
+    fn mk_decl(&self, name: Symbol, ty: Type, binding: Option<Exp>) -> LocalVarDecl {
+        let node_id = self.new_node(ty, None);
+        LocalVarDecl {
+            id: node_id,
+            name,
+            binding,
+        }
+    }
+
+    /// Makes a symbol from a string.
+    fn mk_symbol(&self, str: &str) -> Symbol {
+        self.global_env().symbol_pool().make(str)
+    }
+
+    /// Makes a type domain expression.
+    fn mk_type_domain(&self, ty: Type) -> Exp {
+        let domain_ty = Type::TypeDomain(Box::new(ty.clone()));
+        let node_id = self.new_node(domain_ty, Some(vec![ty]));
+        ExpData::Call(node_id, Operation::TypeDomain, vec![]).into_exp()
+    }
+
+    /// Makes an expression which selects a field from a struct.
+    fn mk_field_select(&self, field_env: &FieldEnv<'_>, targs: &[Type], exp: Exp) -> Exp {
+        let ty = field_env.get_type().instantiate(targs);
+        let node_id = self.new_node(ty, None);
+        ExpData::Call(
+            node_id,
+            Operation::Select(
+                field_env.struct_env.module_env.get_id(),
+                field_env.struct_env.get_id(),
+                field_env.get_id(),
+            ),
+            vec![exp],
+        )
+        .into_exp()
+    }
+
+    /// Makes an expression for a temporary.
+    fn mk_temporary(&self, temp: TempIndex) -> Exp {
+        let ty = self.get_local_type(temp);
+        let node_id = self.new_node(ty, None);
+        ExpData::Temporary(node_id, temp).into_exp()
+    }
+
+    /// Makes an expression for a named local.
+    fn mk_local(&self, name: &str, ty: Type) -> Exp {
+        let node_id = self.new_node(ty, None);
+        let sym = self.mk_symbol(name);
+        ExpData::LocalVar(node_id, sym).into_exp()
+    }
+
+    /// Get's the memory associated with a Call(Global,..) or Call(Exists, ..) node. Crashes
+    /// if the the node is not typed as expected.
+    fn get_memory_of_node(&self, node_id: NodeId) -> QualifiedInstId<StructId> {
+        // We do have a call `f<R<..>>` so extract the type from the function instantiation.
+        let rty = &self.global_env().get_node_instantiation(node_id)[0];
+        let (mid, sid, inst) = rty.require_struct();
+        mid.qualified_inst(sid, inst.to_owned())
+    }
+}
diff --git a/vendors/move/crates/move-model/src/exp_rewriter.rs b/vendors/move/crates/move-model/src/exp_rewriter.rs
new file mode 100644
index 000000000..d96994d18
--- /dev/null
+++ b/vendors/move/crates/move-model/src/exp_rewriter.rs
@@ -0,0 +1,437 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::{BTreeSet, VecDeque};
+
+use crate::{
+    ast::{Exp, ExpData, LocalVarDecl, MemoryLabel, Operation, TempIndex, Value},
+    model::{GlobalEnv, ModuleId, NodeId, SpecVarId},
+    symbol::Symbol,
+    ty::Type,
+};
+use itertools::Itertools;
+
+/// Rewriter for expressions, allowing to substitute locals by expressions as well as instantiate
+/// types.
+pub struct ExpRewriter<'env, 'rewriter> {
+    env: &'env GlobalEnv,
+    replacer: &'rewriter mut dyn FnMut(NodeId, RewriteTarget) -> Option<Exp>,
+    type_args: &'rewriter [Type],
+    shadowed: VecDeque<BTreeSet<Symbol>>,
+}
+
+/// A target for expression rewrites of either an `Exp::LocalVar` or an `Exp::Temporary`.
+/// This is used as a parameter to the `replacer` function which defines the behavior of
+/// the rewriter. Notice we use a single function entry point for `replacer` to allow it
+/// to be a function which mutates it's context.
+pub enum RewriteTarget {
+    LocalVar(Symbol),
+    Temporary(TempIndex),
+}
+
+impl<'env, 'rewriter> ExpRewriter<'env, 'rewriter> {
+    /// Creates a new rewriter with the given replacer map.
+    pub fn new<F>(env: &'env GlobalEnv, replacer: &'rewriter mut F) -> Self
+    where
+        F: FnMut(NodeId, RewriteTarget) -> Option<Exp>,
+    {
+        ExpRewriter {
+            env,
+            replacer,
+            type_args: &[],
+            shadowed: VecDeque::new(),
+        }
+    }
+
+    /// Adds a type argument list to this rewriter. Generic type parameters are replaced by
+    /// the given types.
+    pub fn set_type_args(mut self, type_args: &'rewriter [Type]) -> Self {
+        self.type_args = type_args;
+        self
+    }
+}
+
+impl<'env, 'rewriter> ExpRewriterFunctions for ExpRewriter<'env, 'rewriter> {
+    fn rewrite_local_var(&mut self, id: NodeId, sym: Symbol) -> Option<Exp> {
+        for vars in &self.shadowed {
+            if vars.contains(&sym) {
+                return None;
+            }
+        }
+        (*self.replacer)(id, RewriteTarget::LocalVar(sym))
+    }
+
+    fn rewrite_temporary(&mut self, id: NodeId, idx: TempIndex) -> Option<Exp> {
+        (*self.replacer)(id, RewriteTarget::Temporary(idx))
+    }
+
+    fn rewrite_node_id(&mut self, id: NodeId) -> Option<NodeId> {
+        ExpData::instantiate_node(self.env, id, self.type_args)
+    }
+}
+
+// ======================================================================================
+// Expression rewriting trait
+
+/// A general trait for expression rewriting.
+///
+/// This allows customization by re-implementing any of the `rewrite_local_var`,
+/// `rewrite_temporary`, etc. functions. Each expression node has an equivalent of such
+/// a function.
+///
+/// This rewriter takes care of preserving sharing between expressions: only expression trees
+/// which are actually modified are reconstructed.
+///
+/// For most rewriting problems, there are already specializations of this trait, like `ExpRewriter`
+/// in this module, and `Exp::rewrite` in the AST module.
+///
+/// When custom implementing this trait, consider the semantics of the generic logic used.
+/// When any of the `rewrite_<exp-variant>` functions is called, any arguments have been already
+/// recursively rewritten, inclusive of the passed node id. To implement a pre-descent
+/// transformation, you need to implement the `rewrite_exp` function and after pre-processing,
+/// continue (or not) descent with `rewrite_exp_descent` for sub-expressions.
+#[allow(unused)] // for trait default parameters
+pub trait ExpRewriterFunctions {
+    /// Top-level entry for rewriting an expression. Can be re-implemented to do some
+    /// pre/post processing embedding a call to `do_rewrite`.
+    fn rewrite_exp(&mut self, exp: Exp) -> Exp {
+        self.rewrite_exp_descent(exp)
+    }
+
+    fn rewrite_vec(&mut self, exps: &[Exp]) -> Vec<Exp> {
+        exps.iter().map(|e| self.rewrite_exp(e.clone())).collect()
+    }
+
+    // Functions to specialize for the rewriting problem
+    // --------------------------------------------------
+
+    fn rewrite_enter_scope<'a>(&mut self, decls: impl Iterator<Item = &'a LocalVarDecl>) {}
+    fn rewrite_exit_scope(&mut self) {}
+    fn rewrite_node_id(&mut self, id: NodeId) -> Option<NodeId> {
+        None
+    }
+    fn rewrite_local_var(&mut self, id: NodeId, sym: Symbol) -> Option<Exp> {
+        None
+    }
+    fn rewrite_temporary(&mut self, id: NodeId, idx: TempIndex) -> Option<Exp> {
+        None
+    }
+    fn rewrite_value(&mut self, id: NodeId, value: &Value) -> Option<Exp> {
+        None
+    }
+    fn rewrite_spec_var(
+        &mut self,
+        id: NodeId,
+        mid: ModuleId,
+        vid: SpecVarId,
+        label: &Option<MemoryLabel>,
+    ) -> Option<Exp> {
+        None
+    }
+    fn rewrite_call(&mut self, id: NodeId, oper: &Operation, args: &[Exp]) -> Option<Exp> {
+        None
+    }
+    fn rewrite_invoke(&mut self, id: NodeId, target: &Exp, args: &[Exp]) -> Option<Exp> {
+        None
+    }
+    fn rewrite_lambda(&mut self, id: NodeId, vars: &[LocalVarDecl], body: &Exp) -> Option<Exp> {
+        None
+    }
+    fn rewrite_block(&mut self, id: NodeId, vars: &[LocalVarDecl], body: &Exp) -> Option<Exp> {
+        None
+    }
+    fn rewrite_quant(
+        &mut self,
+        id: NodeId,
+        vars: &[(LocalVarDecl, Exp)],
+        triggers: &[Vec<Exp>],
+        cond: &Option<Exp>,
+        body: &Exp,
+    ) -> Option<Exp> {
+        None
+    }
+    fn rewrite_if_else(&mut self, id: NodeId, cond: &Exp, then: &Exp, else_: &Exp) -> Option<Exp> {
+        None
+    }
+
+    // Core traversal functions, not intended to be re-implemented
+    // -----------------------------------------------------------
+
+    fn rewrite_exp_descent(&mut self, exp: Exp) -> Exp {
+        use ExpData::*;
+        match exp.as_ref() {
+            Value(id, value) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                if let Some(new_exp) = self.rewrite_value(new_id, value) {
+                    new_exp
+                } else if id_changed {
+                    Value(new_id, value.clone()).into_exp()
+                } else {
+                    exp
+                }
+            }
+            LocalVar(id, sym) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                if let Some(new_exp) = self.rewrite_local_var(new_id, *sym) {
+                    new_exp
+                } else if id_changed {
+                    LocalVar(new_id, *sym).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Temporary(id, idx) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                if let Some(new_exp) = self.rewrite_temporary(new_id, *idx) {
+                    new_exp
+                } else if id_changed {
+                    Temporary(new_id, *idx).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Call(id, oper, args) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let new_args_opt = self.internal_rewrite_vec(args);
+                let args_ref = if let Some(new_args) = &new_args_opt {
+                    new_args.as_slice()
+                } else {
+                    args.as_slice()
+                };
+                if let Some(new_exp) = self.rewrite_call(new_id, oper, args_ref) {
+                    new_exp
+                } else if new_args_opt.is_some() || id_changed {
+                    let args_owned = if let Some(new_args) = new_args_opt {
+                        new_args
+                    } else {
+                        args.to_owned()
+                    };
+                    Call(new_id, oper.clone(), args_owned).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Invoke(id, target, args) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let (target_changed, new_target) = self.internal_rewrite_exp(target);
+                let new_args_opt = self.internal_rewrite_vec(args);
+                let args_ref = if let Some(new_args) = &new_args_opt {
+                    new_args.as_slice()
+                } else {
+                    args.as_slice()
+                };
+                if let Some(new_exp) = self.rewrite_invoke(new_id, &new_target, args_ref) {
+                    new_exp
+                } else if id_changed || target_changed || new_args_opt.is_some() {
+                    let args_owned = if let Some(new_args) = new_args_opt {
+                        new_args
+                    } else {
+                        args.to_owned()
+                    };
+                    Invoke(new_id, new_target, args_owned).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Lambda(id, vars, body) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let (vars_changed, new_vars) = self.internal_rewrite_decls(vars);
+                self.rewrite_enter_scope(new_vars.iter());
+                let (body_changed, new_body) = self.internal_rewrite_exp(body);
+                self.rewrite_exit_scope();
+                if let Some(new_exp) = self.rewrite_lambda(new_id, &new_vars, &new_body) {
+                    new_exp
+                } else if id_changed || vars_changed || body_changed {
+                    Lambda(new_id, new_vars, new_body).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Block(id, vars, body) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let (vars_changed, new_vars) = self.internal_rewrite_decls(vars);
+                self.rewrite_enter_scope(new_vars.iter());
+                let (body_changed, new_body) = self.internal_rewrite_exp(body);
+                self.rewrite_exit_scope();
+                if let Some(new_exp) = self.rewrite_block(new_id, &new_vars, &new_body) {
+                    new_exp
+                } else if id_changed || vars_changed || body_changed {
+                    Block(new_id, new_vars, new_body).into_exp()
+                } else {
+                    exp
+                }
+            }
+            Quant(id, kind, ranges, triggers, cond, body) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let (ranges_changed, new_ranges) = self.internal_rewrite_quant_decls(ranges);
+                self.rewrite_enter_scope(ranges.iter().map(|(decl, _)| decl));
+                let mut triggers_changed = false;
+                let new_triggers = triggers
+                    .iter()
+                    .map(|p| {
+                        let (c, new_p) = self
+                            .internal_rewrite_vec(p)
+                            .map(|pr| (true, pr))
+                            .unwrap_or_else(|| (false, p.clone()));
+                        triggers_changed = triggers_changed || c;
+                        new_p
+                    })
+                    .collect_vec();
+                let mut cond_changed = false;
+                let new_cond = cond.as_ref().map(|c| {
+                    let (c, new_c) = self.internal_rewrite_exp(c);
+                    cond_changed = c;
+                    new_c
+                });
+                let (body_changed, new_body) = self.internal_rewrite_exp(body);
+                self.rewrite_exit_scope();
+                if let Some(new_exp) =
+                    self.rewrite_quant(new_id, &new_ranges, &new_triggers, &new_cond, &new_body)
+                {
+                    new_exp
+                } else if id_changed
+                    || ranges_changed
+                    || triggers_changed
+                    || cond_changed
+                    || body_changed
+                {
+                    Quant(new_id, *kind, new_ranges, new_triggers, new_cond, new_body).into_exp()
+                } else {
+                    exp
+                }
+            }
+            IfElse(id, cond, then, else_) => {
+                let (id_changed, new_id) = self.internal_rewrite_id(id);
+                let (cond_changed, new_cond) = self.internal_rewrite_exp(cond);
+                let (then_changed, new_then) = self.internal_rewrite_exp(then);
+                let (else_changed, new_else) = self.internal_rewrite_exp(else_);
+                if let Some(new_exp) = self.rewrite_if_else(new_id, &new_cond, &new_then, &new_else)
+                {
+                    new_exp
+                } else if id_changed || cond_changed || then_changed || else_changed {
+                    IfElse(new_id, new_cond, new_then, new_else).into_exp()
+                } else {
+                    exp
+                }
+            }
+            // This can happen since we are calling the rewriter during type checking, and
+            // we may have encountered an error which is represented as an Invalid expression.
+            Invalid(id) => Invalid(*id).into_exp(),
+        }
+    }
+
+    fn internal_rewrite_id(&mut self, id: &NodeId) -> (bool, NodeId) {
+        if let Some(new_id) = self.rewrite_node_id(*id) {
+            (true, new_id)
+        } else {
+            (false, *id)
+        }
+    }
+
+    fn internal_rewrite_exp(&mut self, exp: &Exp) -> (bool, Exp) {
+        let new_exp = self.rewrite_exp(exp.clone());
+        (!ExpData::ptr_eq(exp, &new_exp), new_exp)
+    }
+
+    fn internal_rewrite_vec(&mut self, exps: &[Exp]) -> Option<Vec<Exp>> {
+        // The vector rewrite works a bit different as we try to avoid constructing
+        // new vectors if nothing changed, and optimize common cases of 0-3 arguments.
+        match exps.len() {
+            0 => None,
+            1 => {
+                let (c, e) = self.internal_rewrite_exp(&exps[0]);
+                if c {
+                    Some(vec![e])
+                } else {
+                    None
+                }
+            }
+            2 => {
+                let (c1, e1) = self.internal_rewrite_exp(&exps[0]);
+                let (c2, e2) = self.internal_rewrite_exp(&exps[1]);
+                if c1 || c2 {
+                    Some(vec![e1, e2])
+                } else {
+                    None
+                }
+            }
+            3 => {
+                let (c1, e1) = self.internal_rewrite_exp(&exps[0]);
+                let (c2, e2) = self.internal_rewrite_exp(&exps[1]);
+                let (c3, e3) = self.internal_rewrite_exp(&exps[2]);
+                if c1 || c2 || c3 {
+                    Some(vec![e1, e2, e3])
+                } else {
+                    None
+                }
+            }
+            _ => {
+                // generic treatment
+                let mut change = false;
+                let mut res = vec![];
+                for exp in exps {
+                    let (c, new_exp) = self.internal_rewrite_exp(exp);
+                    change = change || c;
+                    res.push(new_exp)
+                }
+                if change {
+                    Some(res)
+                } else {
+                    None
+                }
+            }
+        }
+    }
+
+    fn internal_rewrite_decls(&mut self, decls: &[LocalVarDecl]) -> (bool, Vec<LocalVarDecl>) {
+        let mut change = false;
+        let new_decls = decls
+            .iter()
+            .map(|d| LocalVarDecl {
+                id: {
+                    let (c, id) = self.internal_rewrite_id(&d.id);
+                    change = change || c;
+                    id
+                },
+                name: d.name,
+                binding: d.binding.as_ref().map(|e| {
+                    let (c, new_e) = self.internal_rewrite_exp(e);
+                    change = change || c;
+                    new_e
+                }),
+            })
+            .collect();
+        (change, new_decls)
+    }
+
+    fn internal_rewrite_quant_decls(
+        &mut self,
+        decls: &[(LocalVarDecl, Exp)],
+    ) -> (bool, Vec<(LocalVarDecl, Exp)>) {
+        let mut change = false;
+        let new_decls = decls
+            .iter()
+            .map(|(d, e)| {
+                assert!(d.binding.is_none());
+                (
+                    LocalVarDecl {
+                        id: {
+                            let (c, id) = self.internal_rewrite_id(&d.id);
+                            change = change || c;
+                            id
+                        },
+                        name: d.name,
+                        binding: None,
+                    },
+                    {
+                        let (c, new_e) = self.internal_rewrite_exp(e);
+                        change = change || c;
+                        new_e
+                    },
+                )
+            })
+            .collect();
+        (change, new_decls)
+    }
+}
diff --git a/vendors/move/crates/move-model/src/intrinsics.rs b/vendors/move/crates/move-model/src/intrinsics.rs
new file mode 100644
index 000000000..b71246b9a
--- /dev/null
+++ b/vendors/move/crates/move-model/src/intrinsics.rs
@@ -0,0 +1,357 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, ops::Deref};
+
+use num::BigUint;
+
+use crate::{
+    ast::{Operation, PropertyBag, PropertyValue, QualifiedSymbol},
+    builder::module_builder::SpecBlockContext,
+    model::{IntrinsicId, QualifiedId, SpecFunId},
+    pragmas::{INTRINSIC_PRAGMA, INTRINSIC_TYPE_MAP, INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS},
+    symbol::{Symbol, SymbolPool},
+    FunId, GlobalEnv, Loc, ModuleBuilder, StructId,
+};
+
+/// An information pack that holds the intrinsic declaration
+#[derive(Clone, Debug)]
+pub struct IntrinsicDecl {
+    move_type: QualifiedId<StructId>,
+    intrinsic_type: Symbol,
+    intrinsic_to_move_fun: BTreeMap<Symbol, QualifiedId<FunId>>,
+    move_fun_to_intrinsic: BTreeMap<QualifiedId<FunId>, Symbol>,
+    intrinsic_to_spec_fun: BTreeMap<Symbol, QualifiedId<SpecFunId>>,
+    spec_fun_to_intrinsic: BTreeMap<QualifiedId<SpecFunId>, Symbol>,
+}
+
+impl IntrinsicDecl {
+    pub fn get_fun_triple(&self, env: &GlobalEnv, name: &str) -> Option<(BigUint, String, String)> {
+        let symbol_pool = env.symbol_pool();
+        let sym = symbol_pool.make(name);
+        self.intrinsic_to_move_fun
+            .get(&sym)
+            .map(|qid| {
+                let fun_env = env.get_function(*qid);
+                let mod_name = fun_env.module_env.get_name();
+                (
+                    mod_name.addr().clone(),
+                    symbol_pool.string(mod_name.name()).to_string(),
+                    symbol_pool.string(fun_env.get_name()).to_string(),
+                )
+            })
+            .or_else(|| {
+                self.intrinsic_to_spec_fun.get(&sym).map(|qid| {
+                    let mod_env = env.get_module(qid.module_id);
+                    let mod_name = mod_env.get_name();
+                    let fun_decl = mod_env.get_spec_fun(qid.id);
+                    (
+                        mod_name.addr().clone(),
+                        symbol_pool.string(mod_name.name()).to_string(),
+                        symbol_pool.string(fun_decl.name).to_string(),
+                    )
+                })
+            })
+    }
+
+    pub fn lookup_spec_fun(&self, env: &GlobalEnv, name: &str) -> Option<QualifiedId<SpecFunId>> {
+        let symbol_pool = env.symbol_pool();
+        let sym = symbol_pool.make(name);
+        self.intrinsic_to_spec_fun.get(&sym).cloned()
+    }
+}
+
+pub(crate) fn process_intrinsic_declaration(
+    builder: &mut ModuleBuilder,
+    loc: &Loc,
+    context: &SpecBlockContext,
+    props: &mut PropertyBag,
+) {
+    // intrinsic declarations only appears in struct spec block
+    let type_qsym = match context {
+        SpecBlockContext::Struct(qsym) => qsym.clone(),
+        _ => {
+            return;
+        }
+    };
+
+    // search for intrinsic declarations
+    let symbol_pool = builder.symbol_pool();
+    let pragma_symbol = symbol_pool.make(INTRINSIC_PRAGMA);
+    let target = match props.get_mut(&pragma_symbol) {
+        None => {
+            // this is not an intrinsic declaration
+            return;
+        }
+        Some(val) => {
+            match val {
+                PropertyValue::Symbol(sym) => symbol_pool.string(*sym),
+                PropertyValue::QualifiedSymbol(_) => {
+                    builder
+                        .parent
+                        .error(loc, "expect a boolean value or a valid intrinsic type");
+                    return;
+                }
+                _ => {
+                    // this is the true/false pragma
+                    return;
+                }
+            }
+        }
+    };
+
+    // obtain the associated functions map
+    let associated_funs = match target.as_str() {
+        INTRINSIC_TYPE_MAP => INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS.deref(),
+        _ => {
+            builder
+                .parent
+                .error(loc, &format!("unknown intrinsic type: {}", target.as_str()));
+            return;
+        }
+    };
+
+    // prepare the decl
+    let type_entry = builder.parent.struct_table.get(&type_qsym).expect("struct");
+    let move_type = type_entry.module_id.qualified(type_entry.struct_id);
+
+    let mut decl = IntrinsicDecl {
+        move_type,
+        intrinsic_type: symbol_pool.make(target.as_str()),
+        intrinsic_to_move_fun: BTreeMap::new(),
+        move_fun_to_intrinsic: BTreeMap::new(),
+        intrinsic_to_spec_fun: BTreeMap::new(),
+        spec_fun_to_intrinsic: BTreeMap::new(),
+    };
+
+    // construct the pack
+    populate_intrinsic_decl(builder, loc, associated_funs, props, &mut decl);
+
+    // add the decl back
+    builder.parent.intrinsics.push(decl);
+}
+
+fn populate_intrinsic_decl(
+    builder: &mut ModuleBuilder,
+    loc: &Loc,
+    associated_funs: &BTreeMap<&str, bool>,
+    props: &mut PropertyBag,
+    decl: &mut IntrinsicDecl,
+) {
+    let symbol_pool = builder.symbol_pool();
+    for (&name, &is_move_fun) in associated_funs {
+        let key_sym = symbol_pool.make(name);
+
+        // look-up the target of the declaration, if present
+        let target_sym = match props.remove(&key_sym) {
+            None => {
+                continue;
+            }
+            Some(PropertyValue::Value(_)) => {
+                builder.parent.error(
+                    loc,
+                    &format!("invalid intrinsic function mapping: {}", name),
+                );
+                continue;
+            }
+            Some(PropertyValue::Symbol(val_sym)) => val_sym,
+            Some(PropertyValue::QualifiedSymbol(qual_sym)) => {
+                if qual_sym.module_name != builder.module_name {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "an intrinsic function mapping can only refer to functions \
+                            declared in the same module while `{}` is not",
+                            qual_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                qual_sym.symbol
+            }
+        };
+        let qualified_sym = QualifiedSymbol {
+            module_name: builder.module_name.clone(),
+            symbol: target_sym,
+        };
+
+        // check presence
+        if is_move_fun {
+            match builder.parent.fun_table.get(&qualified_sym) {
+                None => {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "unable to find move function for intrinsic mapping: {}",
+                            qualified_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                Some(entry) => {
+                    // TODO: in theory, we should also do some type checking on the function
+                    // signature. This is implicitly done by Boogie right now, but we may want to
+                    // make it more explicit and do the checking ourselves.
+                    let qid = entry.module_id.qualified(entry.fun_id);
+                    decl.intrinsic_to_move_fun.insert(key_sym, qid);
+                    if decl.move_fun_to_intrinsic.insert(qid, key_sym).is_some() {
+                        builder.parent.error(
+                            loc,
+                            &format!(
+                                "duplicated intrinsic mapping for move function: {}",
+                                qualified_sym.display(symbol_pool)
+                            ),
+                        );
+                        continue;
+                    }
+                }
+            }
+        } else {
+            match builder.parent.spec_fun_table.get(&qualified_sym) {
+                None => {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "unable to find spec function for intrinsic mapping: {}",
+                            qualified_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                Some(entries) => {
+                    if entries.len() != 1 {
+                        builder.parent.error(
+                            loc,
+                            &format!(
+                                "unable to find a unique spec function for intrinsic mapping: {}",
+                                qualified_sym.display(symbol_pool)
+                            ),
+                        );
+                        continue;
+                    }
+                    let entry = &entries[0];
+
+                    // TODO: in theory, we should also do some type checking on the function
+                    // signature. This is implicitly done by Boogie right now, but we may want to
+                    // make it more explicit and do the checking ourselves.
+                    if let Operation::Function(mid, fid, ..) = &entry.oper {
+                        let qid = mid.qualified(*fid);
+                        decl.intrinsic_to_spec_fun.insert(key_sym, qid);
+                        if decl.spec_fun_to_intrinsic.insert(qid, key_sym).is_some() {
+                            builder.parent.error(
+                                loc,
+                                &format!(
+                                    "duplicated intrinsic mapping for spec function: {}",
+                                    qualified_sym.display(symbol_pool)
+                                ),
+                            );
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Hosts all intrinsic declarations
+#[derive(Clone, Debug, Default)]
+pub struct IntrinsicsAnnotation {
+    /// Intrinsic declarations
+    decls: BTreeMap<IntrinsicId, IntrinsicDecl>,
+    /// A map from intrinsic types to intrinsic decl
+    intrinsic_structs: BTreeMap<QualifiedId<StructId>, IntrinsicId>,
+    /// A map from intrinsic move functions to intrinsic decl
+    intrinsic_move_funs: BTreeMap<QualifiedId<FunId>, IntrinsicId>,
+    /// A map from intrinsic spec functions to intrinsic decl
+    intrinsic_spec_funs: BTreeMap<QualifiedId<SpecFunId>, IntrinsicId>,
+}
+
+impl IntrinsicsAnnotation {
+    /// Add a declaration pack into the annotation set
+    pub fn add_decl(&mut self, decl: &IntrinsicDecl) {
+        let id = IntrinsicId::new(self.decls.len());
+        self.intrinsic_structs.insert(decl.move_type, id);
+        for move_fid in decl.move_fun_to_intrinsic.keys() {
+            self.intrinsic_move_funs.insert(*move_fid, id);
+        }
+        for spec_fid in decl.spec_fun_to_intrinsic.keys() {
+            self.intrinsic_spec_funs.insert(*spec_fid, id);
+        }
+        self.decls.insert(id, decl.clone());
+    }
+
+    /// Get the intrinsic decl for struct
+    pub fn get_decl_for_struct(&self, qid: &QualifiedId<StructId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_structs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Get the intrinsic decl for a move function
+    pub fn get_decl_for_move_fun(&self, qid: &QualifiedId<FunId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_move_funs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Get the intrinsic decl for a spec function
+    pub fn get_decl_for_spec_fun(&self, qid: &QualifiedId<SpecFunId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_spec_funs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Test whether a struct is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_struct(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<StructId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_structs.get(qid).map_or(false, |id| {
+            let decl = self.decls.get(id).expect("intrinsic decl");
+            let sym = symbol_pool.make(intrinsic_name);
+            decl.intrinsic_type == sym
+        })
+    }
+
+    /// Test whether a move function is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_move_fun(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<FunId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_move_funs
+            .get(qid)
+            .and_then(|id| {
+                self.decls
+                    .get(id)
+                    .expect("intrinsic decl")
+                    .move_fun_to_intrinsic
+                    .get(qid)
+            })
+            .map_or(false, |sym| sym == &symbol_pool.make(intrinsic_name))
+    }
+
+    /// Test whether a spec function is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_spec_fun(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<SpecFunId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_spec_funs
+            .get(qid)
+            .and_then(|id| {
+                self.decls
+                    .get(id)
+                    .expect("intrinsic decl")
+                    .spec_fun_to_intrinsic
+                    .get(qid)
+            })
+            .map_or(false, |sym| sym == &symbol_pool.make(intrinsic_name))
+    }
+}
diff --git a/vendors/move/crates/move-model/src/lib.rs b/vendors/move/crates/move-model/src/lib.rs
new file mode 100644
index 000000000..02dc6da6a
--- /dev/null
+++ b/vendors/move/crates/move-model/src/lib.rs
@@ -0,0 +1,680 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    rc::Rc,
+};
+
+use codespan::ByteIndex;
+use codespan_reporting::diagnostic::{Diagnostic, Label, LabelStyle};
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::warn;
+use num::{BigUint, Num};
+
+use builder::module_builder::ModuleBuilder;
+use move_binary_format::{
+    access::ModuleAccess,
+    check_bounds::BoundsChecker,
+    file_format::{
+        self_module_name, AddressIdentifierIndex, CompiledModule, CompiledScript,
+        FunctionDefinition, FunctionDefinitionIndex, FunctionHandle, FunctionHandleIndex,
+        IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+        StructDefinitionIndex, Visibility,
+    },
+};
+use move_compiler::{
+    self,
+    compiled_unit::{self, AnnotatedCompiledScript, AnnotatedCompiledUnit},
+    diagnostics::{Diagnostics, WarningFilters},
+    expansion::ast::{self as E, Address, ModuleDefinition, ModuleIdent, ModuleIdent_},
+    parser::ast::{self as P, ModuleName as ParserModuleName},
+    shared::{parse_named_address, unique_map::UniqueMap, NumericalAddress, PackagePaths},
+    typing::ast::{self as T},
+    Compiler, Flags, PASS_COMPILATION, PASS_EXPANSION, PASS_PARSER, PASS_TYPING,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use move_ir_types::location::sp;
+use move_symbol_pool::Symbol as MoveSymbol;
+
+use crate::{
+    ast::{ModuleName, Spec},
+    builder::model_builder::ModelBuilder,
+    model::{FunId, FunctionData, GlobalEnv, Loc, ModuleData, ModuleId, StructId},
+    options::ModelBuilderOptions,
+    simplifier::{SpecRewriter, SpecRewriterPipeline},
+};
+
+pub mod ast;
+mod builder;
+pub mod code_writer;
+pub mod exp_generator;
+pub mod exp_rewriter;
+pub mod intrinsics;
+pub mod model;
+pub mod options;
+pub mod pragmas;
+pub mod simplifier;
+pub mod spec_translator;
+pub mod symbol;
+pub mod ty;
+pub mod well_known;
+
+// =================================================================================================
+// Entry Point
+
+/// Build the move model with default compilation flags and default options and no named addresses.
+/// This collects transitive dependencies for move sources from the provided directory list.
+pub fn run_model_builder<
+    Paths: Into<MoveSymbol> + Clone,
+    NamedAddress: Into<MoveSymbol> + Clone,
+>(
+    move_sources: Vec<PackagePaths<Paths, NamedAddress>>,
+    deps: Vec<PackagePaths<Paths, NamedAddress>>,
+    warning_filter: Option<WarningFilters>,
+) -> anyhow::Result<GlobalEnv> {
+    run_model_builder_with_options(
+        move_sources,
+        deps,
+        ModelBuilderOptions::default(),
+        warning_filter,
+    )
+}
+
+/// Build the move model with default compilation flags and custom options and a set of provided
+/// named addreses.
+/// This collects transitive dependencies for move sources from the provided directory list.
+pub fn run_model_builder_with_options<
+    Paths: Into<MoveSymbol> + Clone,
+    NamedAddress: Into<MoveSymbol> + Clone,
+>(
+    move_sources: Vec<PackagePaths<Paths, NamedAddress>>,
+    deps: Vec<PackagePaths<Paths, NamedAddress>>,
+    options: ModelBuilderOptions,
+    warning_filter: Option<WarningFilters>,
+) -> anyhow::Result<GlobalEnv> {
+    run_model_builder_with_options_and_compilation_flags(
+        move_sources,
+        deps,
+        options,
+        Flags::verification(),
+        warning_filter,
+    )
+}
+
+/// Build the move model with custom compilation flags and custom options
+/// This collects transitive dependencies for move sources from the provided directory list.
+pub fn run_model_builder_with_options_and_compilation_flags<
+    Paths: Into<MoveSymbol> + Clone,
+    NamedAddress: Into<MoveSymbol> + Clone,
+>(
+    move_sources: Vec<PackagePaths<Paths, NamedAddress>>,
+    deps: Vec<PackagePaths<Paths, NamedAddress>>,
+    options: ModelBuilderOptions,
+    flags: Flags,
+    warning_filter: Option<WarningFilters>,
+) -> anyhow::Result<GlobalEnv> {
+    let mut env = GlobalEnv::new();
+    env.set_extension(options);
+
+    // Step 1: parse the program to get comments and a separation of targets and dependencies.
+    let (files, comments_and_compiler_res) = Compiler::from_package_paths(move_sources, deps)?
+        .set_flags(flags)
+        .set_warning_filter(warning_filter)
+        .run::<PASS_PARSER>()?;
+    let (comment_map, compiler) = match comments_and_compiler_res {
+        Err(diags) => {
+            // Add source files so that the env knows how to translate locations of parse errors
+            let empty_alias = Rc::new(BTreeMap::new());
+            for (fhash, (fname, fsrc)) in &files {
+                env.add_source(
+                    *fhash,
+                    empty_alias.clone(),
+                    fname.as_str(),
+                    fsrc,
+                    /* is_dep */ false,
+                );
+            }
+            add_move_lang_diagnostics(&mut env, diags);
+            return Ok(env);
+        }
+        Ok(res) => res,
+    };
+    let (compiler, parsed_prog) = compiler.into_ast();
+
+    // Add source files for targets and dependencies
+    let dep_files: BTreeSet<_> = parsed_prog
+        .lib_definitions
+        .iter()
+        .map(|p| p.def.file_hash())
+        .collect();
+
+    for member in parsed_prog
+        .source_definitions
+        .iter()
+        .chain(parsed_prog.lib_definitions.iter())
+    {
+        let fhash = member.def.file_hash();
+        let (fname, fsrc) = files.get(&fhash).unwrap();
+        let is_dep = dep_files.contains(&fhash);
+        let aliases = parsed_prog
+            .named_address_maps
+            .get(member.named_address_map)
+            .iter()
+            .map(|(symbol, addr)| (env.symbol_pool().make(symbol.as_str()), *addr))
+            .collect();
+        env.add_source(fhash, Rc::new(aliases), fname.as_str(), fsrc, is_dep);
+    }
+
+    // If a move file does not contain any definition, it will not appear in `parsed_prog`. Add them explicitly.
+    for fhash in files.keys().sorted() {
+        if env.get_file_id(*fhash).is_none() {
+            let (fname, fsrc) = files.get(fhash).unwrap();
+            let is_dep = dep_files.contains(fhash);
+            env.add_source(
+                *fhash,
+                Rc::new(BTreeMap::new()),
+                fname.as_str(),
+                fsrc,
+                is_dep,
+            );
+        }
+    }
+
+    // Add any documentation comments found by the Move compiler to the env.
+    for (fhash, documentation) in comment_map {
+        let file_id = env.get_file_id(fhash).expect("file name defined");
+        env.add_documentation(
+            file_id,
+            documentation
+                .into_iter()
+                .map(|(idx, s)| (ByteIndex(idx), s))
+                .collect(),
+        )
+    }
+
+    // Step 2: run the compiler up to expansion
+    let parsed_prog = {
+        let P::Program {
+            named_address_maps,
+            mut source_definitions,
+            lib_definitions,
+        } = parsed_prog;
+        source_definitions.extend(lib_definitions);
+        P::Program {
+            named_address_maps,
+            source_definitions,
+            lib_definitions: vec![],
+        }
+    };
+    let (compiler, expansion_ast) = match compiler.at_parser(parsed_prog).run::<PASS_EXPANSION>() {
+        Err(diags) => {
+            add_move_lang_diagnostics(&mut env, diags);
+            return Ok(env);
+        }
+        Ok(compiler) => compiler.into_ast(),
+    };
+    let (compiler, typing_ast) = match compiler
+        .at_expansion(expansion_ast.clone())
+        .run::<PASS_TYPING>()
+    {
+        Err(diags) => {
+            add_move_lang_diagnostics(&mut env, diags);
+            return Ok(env);
+        }
+        Ok(compiler) => compiler.into_ast(),
+    };
+
+    // Extract the module/script closure
+    let mut visited_modules = BTreeSet::new();
+    for (_, mident, mdef) in &typing_ast.inner.modules {
+        let src_file_hash = mdef.loc.file_hash();
+        if !dep_files.contains(&src_file_hash) {
+            collect_related_modules_recursive(
+                mident,
+                &typing_ast.inner.modules,
+                &mut visited_modules,
+            );
+        }
+    }
+    for sdef in typing_ast.inner.scripts.values() {
+        let src_file_hash = sdef.loc.file_hash();
+        if !dep_files.contains(&src_file_hash) {
+            for (_, mident, _neighbor) in &sdef.immediate_neighbors {
+                collect_related_modules_recursive(
+                    mident,
+                    &typing_ast.inner.modules,
+                    &mut visited_modules,
+                );
+            }
+        }
+    }
+
+    // Step 3: selective compilation.
+    let expansion_ast = {
+        let E::Program { modules, scripts } = expansion_ast;
+        let modules = modules.filter_map(|mident, mut mdef| {
+            visited_modules.contains(&mident.value).then(|| {
+                mdef.is_source_module = true;
+                mdef
+            })
+        });
+        E::Program { modules, scripts }
+    };
+    let typing_ast = {
+        let T::Program { info, inner } = typing_ast;
+        let T::Program_ { modules, scripts } = inner;
+        let modules = modules.filter_map(|mident, mut mdef| {
+            visited_modules.contains(&mident.value).then(|| {
+                mdef.is_source_module = true;
+                mdef
+            })
+        });
+        let inner = T::Program_ { modules, scripts };
+        T::Program { info, inner }
+    };
+
+    // Run the compiler fully to the compiled units
+    let units = match compiler.at_typing(typing_ast).run::<PASS_COMPILATION>() {
+        Err(diags) => {
+            add_move_lang_diagnostics(&mut env, diags);
+            return Ok(env);
+        }
+        Ok(compiler) => {
+            let (units, warnings) = compiler.into_compiled_units();
+            if !warnings.is_empty() {
+                // NOTE: these diagnostics are just warnings. it should be feasible to continue the
+                // model building here. But before that, register the warnings to the `GlobalEnv`
+                // first so we get a chance to report these warnings as well.
+                add_move_lang_diagnostics(&mut env, warnings);
+            }
+            units
+        }
+    };
+
+    // Check for bytecode verifier errors (there should not be any)
+    let diags = compiled_unit::verify_units(&units);
+    if !diags.is_empty() {
+        add_move_lang_diagnostics(&mut env, diags);
+        return Ok(env);
+    }
+
+    // Now that it is known that the program has no errors, run the spec checker on verified units
+    // plus expanded AST. This will populate the environment including any errors.
+    run_spec_checker(&mut env, units, expansion_ast);
+    Ok(env)
+}
+
+fn collect_related_modules_recursive<'a>(
+    mident: &'a ModuleIdent_,
+    modules: &'a UniqueMap<ModuleIdent, T::ModuleDefinition>,
+    visited_modules: &mut BTreeSet<ModuleIdent_>,
+) {
+    if visited_modules.contains(mident) {
+        return;
+    }
+    let mdef = modules.get_(mident).unwrap();
+    visited_modules.insert(*mident);
+    for (_, next_mident, _) in &mdef.immediate_neighbors {
+        collect_related_modules_recursive(next_mident, modules, visited_modules);
+    }
+}
+
+/// Build a `GlobalEnv` from a collection of `CompiledModule`'s. The `modules` list must be
+/// topologically sorted by the dependency relation (i.e., a child node in the dependency graph
+/// should appear earlier in the vector than its parents).
+pub fn run_bytecode_model_builder<'a>(
+    modules: impl IntoIterator<Item = &'a CompiledModule>,
+) -> anyhow::Result<GlobalEnv> {
+    let mut env = GlobalEnv::new();
+    for (i, m) in modules.into_iter().enumerate() {
+        let id = m.self_id();
+        let addr = addr_to_big_uint(id.address());
+        let module_name = ModuleName::new(addr, env.symbol_pool().make(id.name().as_str()));
+        let module_id = ModuleId::new(i);
+        let mut module_data = ModuleData::stub(module_name.clone(), module_id, m.clone());
+
+        // add functions
+        for (i, def) in m.function_defs().iter().enumerate() {
+            let def_idx = FunctionDefinitionIndex(i as u16);
+            let name = m.identifier_at(m.function_handle_at(def.function).name);
+            let symbol = env.symbol_pool().make(name.as_str());
+            let fun_id = FunId::new(symbol);
+            let data = FunctionData::stub(symbol, def_idx, def.function);
+            module_data.function_data.insert(fun_id, data);
+            module_data.function_idx_to_id.insert(def_idx, fun_id);
+        }
+
+        // add structs
+        for (i, def) in m.struct_defs().iter().enumerate() {
+            let def_idx = StructDefinitionIndex(i as u16);
+            let name = m.identifier_at(m.struct_handle_at(def.struct_handle).name);
+            let symbol = env.symbol_pool().make(name.as_str());
+            let struct_id = StructId::new(symbol);
+            let data = env.create_move_struct_data(
+                m,
+                def_idx,
+                symbol,
+                Loc::default(),
+                Vec::default(),
+                Spec::default(),
+            );
+            module_data.struct_data.insert(struct_id, data);
+            module_data.struct_idx_to_id.insert(def_idx, struct_id);
+        }
+
+        env.module_data.push(module_data);
+    }
+    Ok(env)
+}
+
+fn add_move_lang_diagnostics(env: &mut GlobalEnv, diags: Diagnostics) {
+    let mk_label = |is_primary: bool, (loc, msg): (move_ir_types::location::Loc, String)| {
+        let style = if is_primary {
+            LabelStyle::Primary
+        } else {
+            LabelStyle::Secondary
+        };
+        let loc = env.to_loc(&loc);
+        Label::new(style, loc.file_id(), loc.span()).with_message(msg)
+    };
+    for (severity, msg, primary_label, secondary_labels, notes) in diags.into_codespan_format() {
+        let diag = Diagnostic::new(severity)
+            .with_labels(vec![mk_label(true, primary_label)])
+            .with_message(msg.to_string())
+            .with_labels(
+                secondary_labels
+                    .into_iter()
+                    .map(|e| mk_label(false, e))
+                    .collect(),
+            )
+            .with_notes(notes);
+        env.add_diag(diag);
+    }
+}
+
+#[allow(deprecated)]
+fn script_into_module(compiled_script: CompiledScript) -> CompiledModule {
+    let mut script = compiled_script;
+
+    // Add the "<SELF>" identifier if it isn't present.
+    //
+    // Note: When adding an element to the table, in theory it is possible for the index
+    // to overflow. This will not be a problem if we get rid of the script/module conversion.
+    let self_ident_idx = match script
+        .identifiers
+        .iter()
+        .position(|ident| ident.as_ident_str() == self_module_name())
+    {
+        Some(idx) => IdentifierIndex::new(idx as u16),
+        None => {
+            let idx = IdentifierIndex::new(script.identifiers.len() as u16);
+            script
+                .identifiers
+                .push(Identifier::new(self_module_name().to_string()).unwrap());
+            idx
+        }
+    };
+
+    // Add a dummy adress if none exists.
+    let dummy_addr = AccountAddress::new([0xff; AccountAddress::LENGTH]);
+    let dummy_addr_idx = match script
+        .address_identifiers
+        .iter()
+        .position(|addr| addr == &dummy_addr)
+    {
+        Some(idx) => AddressIdentifierIndex::new(idx as u16),
+        None => {
+            let idx = AddressIdentifierIndex::new(script.address_identifiers.len() as u16);
+            script.address_identifiers.push(dummy_addr);
+            idx
+        }
+    };
+
+    // Add a self module handle.
+    let self_module_handle_idx = match script
+        .module_handles
+        .iter()
+        .position(|handle| handle.address == dummy_addr_idx && handle.name == self_ident_idx)
+    {
+        Some(idx) => ModuleHandleIndex::new(idx as u16),
+        None => {
+            let idx = ModuleHandleIndex::new(script.module_handles.len() as u16);
+            script.module_handles.push(ModuleHandle {
+                address: dummy_addr_idx,
+                name: self_ident_idx,
+            });
+            idx
+        }
+    };
+
+    // Find the index to the empty signature [].
+    // Create one if it doesn't exist.
+    let return_sig_idx = match script.signatures.iter().position(|sig| sig.0.is_empty()) {
+        Some(idx) => SignatureIndex::new(idx as u16),
+        None => {
+            let idx = SignatureIndex::new(script.signatures.len() as u16);
+            script.signatures.push(Signature(vec![]));
+            idx
+        }
+    };
+
+    // Create a function handle for the main function.
+    let main_handle_idx = FunctionHandleIndex::new(script.function_handles.len() as u16);
+    script.function_handles.push(FunctionHandle {
+        module: self_module_handle_idx,
+        name: self_ident_idx,
+        parameters: script.parameters,
+        return_: return_sig_idx,
+        type_parameters: script.type_parameters,
+    });
+
+    // Create a function definition for the main function.
+    let main_def = FunctionDefinition {
+        function: main_handle_idx,
+        visibility: Visibility::Public,
+        is_entry: true,
+        acquires_global_resources: vec![],
+        code: Some(script.code),
+    };
+
+    let module = CompiledModule {
+        version: script.version,
+        module_handles: script.module_handles,
+        self_module_handle_idx,
+        struct_handles: script.struct_handles,
+        function_handles: script.function_handles,
+        field_handles: vec![],
+        friend_decls: vec![],
+
+        struct_def_instantiations: vec![],
+        function_instantiations: script.function_instantiations,
+        field_instantiations: vec![],
+
+        signatures: script.signatures,
+
+        identifiers: script.identifiers,
+        address_identifiers: script.address_identifiers,
+        constant_pool: script.constant_pool,
+        metadata: script.metadata,
+
+        struct_defs: vec![],
+        function_defs: vec![main_def],
+    };
+    BoundsChecker::verify_module(&module).expect("invalid bounds in module");
+    module
+}
+
+#[allow(deprecated)]
+fn run_spec_checker(env: &mut GlobalEnv, units: Vec<AnnotatedCompiledUnit>, mut eprog: E::Program) {
+    let mut builder = ModelBuilder::new(env);
+    // Merge the compiled units with the expanded program, preserving the order of the compiled
+    // units which is topological w.r.t. use relation.
+    let modules = units
+        .into_iter()
+        .flat_map(|unit| {
+            Some(match unit {
+                AnnotatedCompiledUnit::Module(annot_module) => {
+                    let module_ident = annot_module.module_ident();
+                    let expanded_module = match eprog.modules.remove(&module_ident) {
+                        Some(m) => m,
+                        None => {
+                            warn!(
+                                "[internal] cannot associate bytecode module `{}` with AST",
+                                module_ident
+                            );
+                            return None;
+                        }
+                    };
+                    (
+                        module_ident,
+                        expanded_module,
+                        annot_module.named_module.module,
+                        annot_module.named_module.source_map,
+                        annot_module.function_infos,
+                    )
+                }
+                AnnotatedCompiledUnit::Script(AnnotatedCompiledScript {
+                    loc: _loc,
+                    named_script: script,
+                    function_info,
+                }) => {
+                    let move_compiler::expansion::ast::Script {
+                        warning_filter: _warning_filter,
+                        package_name,
+                        attributes,
+                        loc,
+                        function_name,
+                        use_funs,
+                        constants,
+                        function,
+                        specs,
+                    } = match eprog.scripts.remove(&script.name) {
+                        Some(s) => s,
+                        None => {
+                            warn!(
+                                "[internal] cannot associate bytecode script `{}` with AST",
+                                script.name
+                            );
+                            return None;
+                        }
+                    };
+                    // Convert the script into a module.
+                    let address = Address::anonymous(loc, NumericalAddress::DEFAULT_ERROR_ADDRESS);
+                    let ident = sp(
+                        loc,
+                        ModuleIdent_::new(address, ParserModuleName(function_name.0)),
+                    );
+                    let mut function_infos = UniqueMap::new();
+                    function_infos.add(function_name, function_info).unwrap();
+                    // Construct a pseudo module definition.
+                    let mut functions = UniqueMap::new();
+                    functions.add(function_name, function).unwrap();
+                    let expanded_module = ModuleDefinition {
+                        warning_filter: _warning_filter,
+                        package_name,
+                        attributes,
+                        loc,
+                        is_source_module: true,
+                        use_funs,
+                        friends: UniqueMap::new(),
+                        structs: UniqueMap::new(),
+                        constants,
+                        functions,
+                        specs,
+                    };
+                    let module = script_into_module(script.script);
+                    (
+                        ident,
+                        expanded_module,
+                        module,
+                        script.source_map,
+                        function_infos,
+                    )
+                }
+            })
+        })
+        .enumerate();
+    for (module_count, (module_id, expanded_module, compiled_module, source_map, function_infos)) in
+        modules
+    {
+        let loc = builder.to_loc(&expanded_module.loc);
+        let addr_bytes = builder.resolve_address(&loc, &module_id.value.address);
+        let module_name = ModuleName::from_address_bytes_and_name(
+            addr_bytes,
+            builder
+                .env
+                .symbol_pool()
+                .make(&module_id.value.module.0.value),
+        );
+        let module_id = ModuleId::new(module_count);
+        let mut module_translator = ModuleBuilder::new(&mut builder, module_id, module_name);
+        module_translator.translate(
+            loc,
+            expanded_module,
+            compiled_module,
+            source_map,
+            function_infos,
+        );
+    }
+
+    // Populate GlobalEnv with model-level information
+    builder.populate_env();
+
+    // After all specs have been processed, warn about any unused schemas.
+    builder.warn_unused_schemas();
+
+    // Apply simplification passes
+    run_spec_simplifier(env);
+}
+
+fn run_spec_simplifier(env: &mut GlobalEnv) {
+    let options = env
+        .get_extension::<ModelBuilderOptions>()
+        .expect("options for model builder");
+    let mut rewriter = SpecRewriterPipeline::new(&options.simplification_pipeline);
+    rewriter
+        .override_with_rewrite(env)
+        .unwrap_or_else(|e| panic!("Failed to run spec simplification: {}", e))
+}
+
+// =================================================================================================
+// Helpers
+
+/// Converts an address identifier to a number representing the address.
+pub fn addr_to_big_uint(addr: &AccountAddress) -> BigUint {
+    BigUint::from_str_radix(&addr.to_string(), 16).unwrap()
+}
+
+/// Converts a biguint into an account address
+pub fn big_uint_to_addr(i: &BigUint) -> AccountAddress {
+    // TODO: do this in more efficient way (e.g., i.to_le_bytes() and pad out the resulting Vec<u8>
+    // to ADDRESS_LENGTH
+    AccountAddress::from_hex_literal(&format!("{:#x}", i)).unwrap()
+}
+
+pub fn parse_addresses_from_options(
+    named_addr_strings: Vec<String>,
+) -> anyhow::Result<BTreeMap<String, NumericalAddress>> {
+    named_addr_strings
+        .iter()
+        .map(|x| parse_named_address(x))
+        .collect()
+}
+
+// =================================================================================================
+// Crate Helpers
+
+/// Helper to project the 1st element from a vector of pairs.
+pub(crate) fn project_1st<T: Clone, R>(v: &[(T, R)]) -> Vec<T> {
+    v.iter().map(|(x, _)| x.clone()).collect()
+}
+
+/// Helper to project the 2nd element from a vector of pairs.
+pub(crate) fn project_2nd<T, R: Clone>(v: &[(T, R)]) -> Vec<R> {
+    v.iter().map(|(_, x)| x.clone()).collect()
+}
diff --git a/vendors/move/crates/move-model/src/model.rs b/vendors/move/crates/move-model/src/model.rs
new file mode 100644
index 000000000..54cb25cf2
--- /dev/null
+++ b/vendors/move/crates/move-model/src/model.rs
@@ -0,0 +1,4093 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Provides a model for a set of Move modules (and scripts, which
+//! are handled like modules). The model allows to access many different aspects of the Move
+//! code: all declared functions and types, their associated bytecode, their source location,
+//! their source text, and the specification fragments.
+//!
+//! The environment is nested into a hierarchy:
+//!
+//! - A `GlobalEnv` which gives access to all modules plus other information on global level,
+//!   and is the owner of all related data.
+//! - A `ModuleEnv` which is a reference to the data of some module in the environment.
+//! - A `StructEnv` which is a reference to the data of some struct in a module.
+//! - A `FunctionEnv` which is a reference to the data of some function in a module.
+
+use std::{
+    any::{Any, TypeId},
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    ffi::OsStr,
+    fmt::{self, Formatter},
+    rc::Rc,
+};
+
+use codespan::{ByteIndex, ByteOffset, ColumnOffset, FileId, Files, LineOffset, Location, Span};
+use codespan_reporting::{
+    diagnostic::{Diagnostic, Label, Severity},
+    term::{emit, termcolor::WriteColor, Config},
+};
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::{info, warn};
+use num::{BigUint, One, ToPrimitive};
+use serde::{Deserialize, Serialize};
+
+pub use move_binary_format::file_format::{AbilitySet, Visibility as FunctionVisibility};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{
+        AddressIdentifierIndex, Bytecode, CodeOffset, Constant as VMConstant, ConstantPoolIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, FunctionInstantiation, SignatureIndex,
+        SignatureToken, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+        Visibility,
+    },
+    normalized::{FunctionRef, Type as MType},
+    views::{
+        FieldDefinitionView, FunctionDefinitionView, FunctionHandleView, SignatureTokenView,
+        StructDefinitionView, StructHandleView,
+    },
+    CompiledModule,
+};
+use move_bytecode_source_map::{mapping::SourceMapping, source_map::SourceMap};
+use move_command_line_common::{address::NumericalAddress, files::FileHash};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage,
+    runtime_value::MoveValue,
+};
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+
+use crate::{
+    ast::{
+        Attribute, ConditionKind, Exp, ExpData, GlobalInvariant, ModuleName, PropertyBag,
+        PropertyValue, Spec, SpecBlockInfo, SpecFunDecl, SpecVarDecl, Value,
+    },
+    intrinsics::IntrinsicsAnnotation,
+    pragmas::{
+        DELEGATE_INVARIANTS_TO_CALLER_PRAGMA, DISABLE_INVARIANTS_IN_BODY_PRAGMA, FRIEND_PRAGMA,
+        INTRINSIC_PRAGMA, OPAQUE_PRAGMA, VERIFY_PRAGMA,
+    },
+    symbol::{Symbol, SymbolPool},
+    ty::{PrimitiveType, Type, TypeDisplayContext, TypeUnificationAdapter, Variance},
+};
+
+// =================================================================================================
+/// # Constants
+
+/// A name we use to represent a script as a module.
+pub const SCRIPT_MODULE_NAME: &str = "<SELF>";
+
+/// Names used in the bytecode/AST to represent the main function of a script
+pub const SCRIPT_BYTECODE_FUN_NAME: &str = "<SELF>";
+
+/// A prefix used for structs which are backing specification ("ghost") memory.
+pub const GHOST_MEMORY_PREFIX: &str = "Ghost$";
+
+const SUI_FRAMEWORK_ADDRESS: AccountAddress = address_from_single_byte(2);
+
+const fn address_from_single_byte(b: u8) -> AccountAddress {
+    let mut addr = [0u8; AccountAddress::LENGTH];
+    addr[AccountAddress::LENGTH - 1] = b;
+    AccountAddress::new(addr)
+}
+
+// =================================================================================================
+/// # Locations
+
+/// A location, consisting of a FileId and a span in this file.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+pub struct Loc {
+    file_id: FileId,
+    span: Span,
+}
+
+impl Loc {
+    pub fn new(file_id: FileId, span: Span) -> Loc {
+        Loc { file_id, span }
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    pub fn file_id(&self) -> FileId {
+        self.file_id
+    }
+
+    // Delivers a location pointing to the end of this one.
+    pub fn at_end(&self) -> Loc {
+        if self.span.end() > ByteIndex(0) {
+            Loc::new(
+                self.file_id,
+                Span::new(self.span.end() - ByteOffset(1), self.span.end()),
+            )
+        } else {
+            self.clone()
+        }
+    }
+
+    // Delivers a location pointing to the start of this one.
+    pub fn at_start(&self) -> Loc {
+        Loc::new(
+            self.file_id,
+            Span::new(self.span.start(), self.span.start() + ByteOffset(1)),
+        )
+    }
+
+    /// Creates a location which encloses all the locations in the provided slice,
+    /// which must not be empty. All locations are expected to be in the same file.
+    pub fn enclosing(locs: &[&Loc]) -> Loc {
+        assert!(!locs.is_empty());
+        let loc = locs[0];
+        let mut start = loc.span.start();
+        let mut end = loc.span.end();
+        for l in locs.iter().skip(1) {
+            if l.file_id() == loc.file_id() {
+                start = std::cmp::min(start, l.span().start());
+                end = std::cmp::max(end, l.span().end());
+            }
+        }
+        Loc::new(loc.file_id(), Span::new(start, end))
+    }
+
+    /// Returns true if the other location is enclosed by this location.
+    pub fn is_enclosing(&self, other: &Loc) -> bool {
+        self.file_id == other.file_id && GlobalEnv::enclosing_span(self.span, other.span)
+    }
+}
+
+impl Default for Loc {
+    fn default() -> Self {
+        let mut files = Files::new();
+        let dummy_id = files.add(String::new(), String::new());
+        Loc::new(dummy_id, Span::default())
+    }
+}
+
+/// Return true if `f` is a Sui framework function declared in `module` with a name in `names`
+fn is_framework_function(f: &FunctionRef, module: &str, names: Vec<&str>) -> bool {
+    *f.module_id.address() == SUI_FRAMEWORK_ADDRESS
+        && f.module_id.name().to_string() == module
+        && names.contains(&f.function_ident.as_str())
+}
+
+/// Alias for the Loc variant of MoveIR. This uses a `&static str` instead of `FileId` for the
+/// file name.
+pub type MoveIrLoc = move_ir_types::location::Loc;
+
+// =================================================================================================
+/// # Identifiers
+///
+/// Identifiers are opaque values used to reference entities in the environment.
+///
+/// We have two kinds of ids: those based on an index, and those based on a symbol. We use
+/// the symbol based ids where we do not have control of the definition index order in bytecode
+/// (i.e. we do not know in which order move-compiler enters functions and structs into file format),
+/// and index based ids where we do have control (for modules, SpecFun and SpecVar).
+///
+/// In any case, ids are opaque in the sense that if someone has a StructId or similar in hand,
+/// it is known to be defined in the environment, as it has been obtained also from the environment.
+
+/// Raw index type used in ids. 16 bits are sufficient currently.
+pub type RawIndex = u16;
+
+/// Identifier for a module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct ModuleId(RawIndex);
+
+/// Identifier for a named constant, relative to module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct NamedConstantId(Symbol);
+
+/// Identifier for a structure/resource, relative to module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct StructId(Symbol);
+
+/// Identifier for a field of a structure, relative to struct.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct FieldId(Symbol);
+
+/// Identifier for a Move function, relative to module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct FunId(Symbol);
+
+/// Identifier for a schema.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct SchemaId(Symbol);
+
+/// Identifier for a specification function, relative to module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct SpecFunId(RawIndex);
+
+/// Identifier for a specification variable, relative to module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct SpecVarId(RawIndex);
+
+/// Identifier for a node in the AST, relative to a module. This is used to associate attributes
+/// with the node, like source location and type.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct NodeId(usize);
+
+/// A global id. Instances of this type represent unique identifiers relative to `GlobalEnv`.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct GlobalId(usize);
+
+/// Identifier for an intrinsic declaration, relative globally in `GlobalEnv`.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct IntrinsicId(usize);
+
+/// Some identifier qualified by a module.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct QualifiedId<Id> {
+    pub module_id: ModuleId,
+    pub id: Id,
+}
+
+/// Some identifier qualified by a module and a type instantiation.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub struct QualifiedInstId<Id> {
+    pub module_id: ModuleId,
+    pub inst: Vec<Type>,
+    pub id: Id,
+}
+
+impl NamedConstantId {
+    pub fn new(sym: Symbol) -> Self {
+        Self(sym)
+    }
+
+    pub fn symbol(self) -> Symbol {
+        self.0
+    }
+}
+
+impl FunId {
+    pub fn new(sym: Symbol) -> Self {
+        Self(sym)
+    }
+
+    pub fn symbol(self) -> Symbol {
+        self.0
+    }
+}
+
+impl SchemaId {
+    pub fn new(sym: Symbol) -> Self {
+        Self(sym)
+    }
+
+    pub fn symbol(self) -> Symbol {
+        self.0
+    }
+}
+
+impl StructId {
+    pub fn new(sym: Symbol) -> Self {
+        Self(sym)
+    }
+
+    pub fn symbol(self) -> Symbol {
+        self.0
+    }
+}
+
+impl FieldId {
+    pub fn new(sym: Symbol) -> Self {
+        Self(sym)
+    }
+
+    pub fn symbol(self) -> Symbol {
+        self.0
+    }
+}
+
+impl SpecFunId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as RawIndex)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+impl SpecVarId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as RawIndex)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+impl NodeId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
+impl ModuleId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as RawIndex)
+    }
+
+    pub fn to_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+impl ModuleId {
+    pub fn qualified<Id>(self, id: Id) -> QualifiedId<Id> {
+        QualifiedId {
+            module_id: self,
+            id,
+        }
+    }
+
+    pub fn qualified_inst<Id>(self, id: Id, inst: Vec<Type>) -> QualifiedInstId<Id> {
+        QualifiedInstId {
+            module_id: self,
+            inst,
+            id,
+        }
+    }
+}
+
+impl GlobalId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
+impl IntrinsicId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
+impl<Id: Clone> QualifiedId<Id> {
+    pub fn instantiate(self, inst: Vec<Type>) -> QualifiedInstId<Id> {
+        let QualifiedId { module_id, id } = self;
+        QualifiedInstId {
+            module_id,
+            inst,
+            id,
+        }
+    }
+}
+
+impl<Id: Clone> QualifiedInstId<Id> {
+    pub fn instantiate(self, params: &[Type]) -> Self {
+        if params.is_empty() {
+            self
+        } else {
+            let Self {
+                module_id,
+                inst,
+                id,
+            } = self;
+            Self {
+                module_id,
+                inst: Type::instantiate_vec(inst, params),
+                id,
+            }
+        }
+    }
+
+    pub fn instantiate_ref(&self, params: &[Type]) -> Self {
+        let res = self.clone();
+        res.instantiate(params)
+    }
+
+    pub fn to_qualified_id(&self) -> QualifiedId<Id> {
+        let Self { module_id, id, .. } = self;
+        module_id.qualified(id.to_owned())
+    }
+}
+
+impl QualifiedInstId<StructId> {
+    pub fn to_type(&self) -> Type {
+        Type::Struct(self.module_id, self.id, self.inst.to_owned())
+    }
+}
+
+// =================================================================================================
+/// # Verification Scope
+
+/// Defines what functions to verify.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum VerificationScope {
+    /// Verify only public functions.
+    Public,
+    /// Verify all functions.
+    All,
+    /// Verify only one function.
+    Only(String),
+    /// Verify only functions from the given module.
+    OnlyModule(String),
+    /// Verify no functions
+    None,
+}
+
+impl Default for VerificationScope {
+    fn default() -> Self {
+        Self::Public
+    }
+}
+
+impl VerificationScope {
+    /// Whether verification is exclusive to only one function or module. If set, this overrides
+    /// all implicitly included verification targets via invariants and friends.
+    pub fn is_exclusive(&self) -> bool {
+        matches!(
+            self,
+            VerificationScope::Only(_) | VerificationScope::OnlyModule(_)
+        )
+    }
+
+    /// Returns the target function if verification is exclusive to one function.
+    pub fn get_exclusive_verify_function_name(&self) -> Option<&String> {
+        match self {
+            VerificationScope::Only(s) => Some(s),
+            _ => None,
+        }
+    }
+}
+
+// =================================================================================================
+/// # Global Environment
+
+/// Global environment for a set of modules.
+#[derive(Debug)]
+pub struct GlobalEnv {
+    /// A Files database for the codespan crate which supports diagnostics.
+    source_files: Files<String>,
+    /// A map of FileId in the Files database to information about documentation comments in a file.
+    /// The comments are represented as map from ByteIndex into string, where the index is the
+    /// start position of the associated language item in the source.
+    doc_comments: BTreeMap<FileId, BTreeMap<ByteIndex, String>>,
+    /// A mapping from file hash to file name and associated FileId. Though this information is
+    /// already in `source_files`, we can't get it out of there so need to book keep here.
+    file_hash_map: BTreeMap<FileHash, (String, FileId)>,
+    /// A mapping from file id to associated alias map.
+    file_alias_map: BTreeMap<FileId, Rc<BTreeMap<Symbol, NumericalAddress>>>,
+    /// Bijective mapping between FileId and a plain int. FileId's are themselves wrappers around
+    /// ints, but the inner representation is opaque and cannot be accessed. This is used so we
+    /// can emit FileId's to generated code and read them back.
+    file_id_to_idx: BTreeMap<FileId, u16>,
+    file_idx_to_id: BTreeMap<u16, FileId>,
+    /// A set indicating whether a file id is a target or a dependency.
+    file_id_is_dep: BTreeSet<FileId>,
+    /// A special constant location representing an unknown location.
+    /// This uses a pseudo entry in `source_files` to be safely represented.
+    unknown_loc: Loc,
+    /// An equivalent of the MoveIrLoc to the above location. Used to map back and force between
+    /// them.
+    unknown_move_ir_loc: MoveIrLoc,
+    /// A special constant location representing an opaque location.
+    /// In difference to an `unknown_loc`, this is a well-known but undisclosed location.
+    internal_loc: Loc,
+    /// Accumulated diagnosis. In a RefCell so we can add to it without needing a mutable GlobalEnv.
+    /// The boolean indicates whether the diag was reported.
+    diags: RefCell<Vec<(Diagnostic<FileId>, bool)>>,
+    /// Pool of symbols -- internalized strings.
+    symbol_pool: SymbolPool,
+    /// A counter for allocating node ids.
+    next_free_node_id: RefCell<usize>,
+    /// A map from node id to associated information of the expression.
+    exp_info: RefCell<BTreeMap<NodeId, ExpInfo>>,
+    /// List of loaded modules, in order they have been provided using `add`.
+    pub module_data: Vec<ModuleData>,
+    /// A counter for issuing global ids.
+    global_id_counter: RefCell<usize>,
+    /// A map of global invariants.
+    global_invariants: BTreeMap<GlobalId, GlobalInvariant>,
+    /// A map from global memories to global invariants which refer to them.
+    global_invariants_for_memory: BTreeMap<QualifiedInstId<StructId>, BTreeSet<GlobalId>>,
+    /// A set containing spec functions which are called/used in specs. Note that these
+    /// are represented without type instantiation because we assume the backend can handle
+    /// generics in the expression language.
+    pub used_spec_funs: BTreeSet<QualifiedId<SpecFunId>>,
+    /// An annotation of all intrinsic declarations
+    pub intrinsics: IntrinsicsAnnotation,
+    /// A type-indexed container for storing extension data in the environment.
+    extensions: RefCell<BTreeMap<TypeId, Box<dyn Any>>>,
+    /// The address of the standard and extension libaries.
+    stdlib_address: Option<BigUint>,
+    extlib_address: Option<BigUint>,
+}
+
+/// Struct a helper type for implementing fmt::Display depending on GlobalEnv
+pub struct EnvDisplay<'a, T> {
+    pub env: &'a GlobalEnv,
+    pub val: &'a T,
+}
+
+impl GlobalEnv {
+    /// Creates a new environment.
+    pub fn new() -> Self {
+        let mut source_files = Files::new();
+        let mut file_hash_map = BTreeMap::new();
+        let mut file_id_to_idx = BTreeMap::new();
+        let mut file_idx_to_id = BTreeMap::new();
+        let mut fake_loc = |content: &str| {
+            let file_id = source_files.add(content, content.to_string());
+            let file_hash = FileHash::new(content);
+            file_hash_map.insert(file_hash, (content.to_string(), file_id));
+            let file_idx = file_id_to_idx.len() as u16;
+            file_id_to_idx.insert(file_id, file_idx);
+            file_idx_to_id.insert(file_idx, file_id);
+            Loc::new(
+                file_id,
+                Span::from(ByteIndex(0_u32)..ByteIndex(content.len() as u32)),
+            )
+        };
+        let unknown_loc = fake_loc("<unknown>");
+        let unknown_move_ir_loc = MoveIrLoc::new(FileHash::new("<unknown>"), 0, 0);
+        let internal_loc = fake_loc("<internal>");
+        GlobalEnv {
+            source_files,
+            doc_comments: Default::default(),
+            unknown_loc,
+            unknown_move_ir_loc,
+            internal_loc,
+            file_hash_map,
+            file_alias_map: BTreeMap::new(),
+            file_id_to_idx,
+            file_idx_to_id,
+            file_id_is_dep: BTreeSet::new(),
+            diags: RefCell::new(vec![]),
+            symbol_pool: SymbolPool::new(),
+            next_free_node_id: Default::default(),
+            exp_info: Default::default(),
+            module_data: vec![],
+            global_id_counter: RefCell::new(0),
+            global_invariants: Default::default(),
+            global_invariants_for_memory: Default::default(),
+            used_spec_funs: BTreeSet::new(),
+            intrinsics: Default::default(),
+            extensions: Default::default(),
+            stdlib_address: None,
+            extlib_address: None,
+        }
+    }
+
+    /// Creates a display container for the given value. There must be an implementation
+    /// of fmt::Display for an instance to work in formatting.
+    pub fn display<'a, T>(&'a self, val: &'a T) -> EnvDisplay<'a, T> {
+        EnvDisplay { env: self, val }
+    }
+
+    /// Stores extension data in the environment. This can be arbitrary data which is
+    /// indexed by type. Used by tools which want to store their own data in the environment,
+    /// like a set of tool dependent options/flags. This can also be used to update
+    /// extension data.
+    pub fn set_extension<T: Any>(&self, x: T) {
+        let id = TypeId::of::<T>();
+        self.extensions
+            .borrow_mut()
+            .insert(id, Box::new(Rc::new(x)));
+    }
+
+    /// Retrieves extension data from the environment. Use as in `env.get_extension::<T>()`.
+    /// An Rc<T> is returned because extension data is stored in a RefCell and we can't use
+    /// lifetimes (`&'a T`) to control borrowing.
+    pub fn get_extension<T: Any>(&self) -> Option<Rc<T>> {
+        let id = TypeId::of::<T>();
+        self.extensions
+            .borrow()
+            .get(&id)
+            .and_then(|d| d.downcast_ref::<Rc<T>>().cloned())
+    }
+
+    /// Retrieves a clone of the extension data from the environment. Use as in `env.get_cloned_extension::<T>()`.
+    pub fn get_cloned_extension<T: Any + Clone>(&self) -> T {
+        let id = TypeId::of::<T>();
+        let d = self
+            .extensions
+            .borrow_mut()
+            .remove(&id)
+            .expect("extension defined")
+            .downcast_ref::<Rc<T>>()
+            .cloned()
+            .unwrap();
+        Rc::try_unwrap(d).unwrap_or_else(|d| d.as_ref().clone())
+    }
+
+    /// Updates extension data. If they are no outstanding references to this extension it
+    /// is updated in place, otherwise it will be cloned before the update.
+    pub fn update_extension<T: Any + Clone>(&self, f: impl FnOnce(&mut T)) {
+        let id = TypeId::of::<T>();
+        let d = self
+            .extensions
+            .borrow_mut()
+            .remove(&id)
+            .expect("extension defined")
+            .downcast_ref::<Rc<T>>()
+            .cloned()
+            .unwrap();
+        let mut curr = Rc::try_unwrap(d).unwrap_or_else(|d| d.as_ref().clone());
+        f(&mut curr);
+        self.set_extension(curr);
+    }
+
+    /// Checks whether there is an extension of type `T`.
+    pub fn has_extension<T: Any>(&self) -> bool {
+        let id = TypeId::of::<T>();
+        self.extensions.borrow().contains_key(&id)
+    }
+
+    /// Clear extension data from the environment (return the data if it is previously set).
+    /// Use as in `env.clear_extension::<T>()` and an `Rc<T>` is returned if the extension data is
+    /// previously stored in the environment.
+    pub fn clear_extension<T: Any>(&self) -> Option<Rc<T>> {
+        let id = TypeId::of::<T>();
+        self.extensions
+            .borrow_mut()
+            .remove(&id)
+            .and_then(|d| d.downcast::<Rc<T>>().ok())
+            .map(|boxed| *boxed)
+    }
+
+    /// Create a new global id unique to this environment.
+    pub fn new_global_id(&self) -> GlobalId {
+        let mut counter = self.global_id_counter.borrow_mut();
+        let id = GlobalId::new(*counter);
+        *counter += 1;
+        id
+    }
+
+    /// Returns a reference to the symbol pool owned by this environment.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        &self.symbol_pool
+    }
+
+    /// Adds a source to this environment, returning a FileId for it.
+    pub fn add_source(
+        &mut self,
+        file_hash: FileHash,
+        address_aliases: Rc<BTreeMap<Symbol, NumericalAddress>>,
+        file_name: &str,
+        source: &str,
+        is_dep: bool,
+    ) -> FileId {
+        let file_id = self.source_files.add(file_name, source.to_string());
+        self.stdlib_address =
+            self.resolve_std_address_alias(self.stdlib_address.clone(), "std", &address_aliases);
+        self.extlib_address = self.resolve_std_address_alias(
+            self.extlib_address.clone(),
+            "Extensions",
+            &address_aliases,
+        );
+        self.file_alias_map.insert(file_id, address_aliases);
+        self.file_hash_map
+            .insert(file_hash, (file_name.to_string(), file_id));
+        let file_idx = self.file_id_to_idx.len() as u16;
+        self.file_id_to_idx.insert(file_id, file_idx);
+        self.file_idx_to_id.insert(file_idx, file_id);
+        if is_dep {
+            self.file_id_is_dep.insert(file_id);
+        }
+        file_id
+    }
+
+    fn resolve_std_address_alias(
+        &self,
+        def: Option<BigUint>,
+        name: &str,
+        aliases: &BTreeMap<Symbol, NumericalAddress>,
+    ) -> Option<BigUint> {
+        let name_sym = self.symbol_pool().make(name);
+        if let Some(a) = aliases.get(&name_sym) {
+            let addr = BigUint::from_bytes_be(a.as_ref());
+            if matches!(&def, Some(other_addr) if &addr != other_addr) {
+                self.error(
+                    &self.unknown_loc,
+                    &format!(
+                        "Ambiguous definition of standard address alias `{}` (`0x{} != 0x{}`).\
+                                 This alias currently must be unique across all packages.",
+                        name,
+                        addr,
+                        def.unwrap()
+                    ),
+                );
+            }
+            Some(addr)
+        } else {
+            def
+        }
+    }
+
+    /// Find all target modules and return in a vector
+    pub fn get_target_modules(&self) -> Vec<ModuleEnv> {
+        let mut target_modules: Vec<ModuleEnv> = vec![];
+        for module_env in self.get_modules() {
+            if module_env.is_target() {
+                target_modules.push(module_env);
+            }
+        }
+        target_modules
+    }
+
+    /// Adds documentation for a file.
+    pub fn add_documentation(&mut self, file_id: FileId, docs: BTreeMap<ByteIndex, String>) {
+        self.doc_comments.insert(file_id, docs);
+    }
+
+    /// Adds diagnostic to the environment.
+    pub fn add_diag(&self, diag: Diagnostic<FileId>) {
+        self.diags.borrow_mut().push((diag, false));
+    }
+
+    /// Adds an error to this environment, without notes.
+    pub fn error(&self, loc: &Loc, msg: &str) {
+        self.diag(Severity::Error, loc, msg)
+    }
+
+    /// Adds an error to this environment, with notes.
+    pub fn error_with_notes(&self, loc: &Loc, msg: &str, notes: Vec<String>) {
+        self.diag_with_notes(Severity::Error, loc, msg, notes)
+    }
+
+    /// Adds a diagnostic of given severity to this environment.
+    pub fn diag(&self, severity: Severity, loc: &Loc, msg: &str) {
+        let diag = Diagnostic::new(severity)
+            .with_message(msg)
+            .with_labels(vec![Label::primary(loc.file_id, loc.span)]);
+        self.add_diag(diag);
+    }
+
+    /// Adds a diagnostic of given severity to this environment, with notes.
+    pub fn diag_with_notes(&self, severity: Severity, loc: &Loc, msg: &str, notes: Vec<String>) {
+        let diag = Diagnostic::new(severity)
+            .with_message(msg)
+            .with_labels(vec![Label::primary(loc.file_id, loc.span)]);
+        let diag = diag.with_notes(notes);
+        self.add_diag(diag);
+    }
+
+    /// Adds a diagnostic of given severity to this environment, with secondary labels.
+    pub fn diag_with_labels(
+        &self,
+        severity: Severity,
+        loc: &Loc,
+        msg: &str,
+        labels: Vec<(Loc, String)>,
+    ) {
+        let diag = Diagnostic::new(severity)
+            .with_message(msg)
+            .with_labels(vec![Label::primary(loc.file_id, loc.span)]);
+        let labels = labels
+            .into_iter()
+            .map(|(l, m)| Label::secondary(l.file_id, l.span).with_message(m))
+            .collect_vec();
+        let diag = diag.with_labels(labels);
+        self.add_diag(diag);
+    }
+
+    /// Checks whether any of the diagnostics contains string.
+    pub fn has_diag(&self, pattern: &str) -> bool {
+        self.diags
+            .borrow()
+            .iter()
+            .any(|(d, _)| d.message.contains(pattern))
+    }
+
+    /// Clear all accumulated diagnosis.
+    pub fn clear_diag(&self) {
+        self.diags.borrow_mut().clear();
+    }
+
+    /// Returns the unknown location.
+    pub fn unknown_loc(&self) -> Loc {
+        self.unknown_loc.clone()
+    }
+
+    /// Returns a Move IR version of the unknown location which is guaranteed to map to the
+    /// regular unknown location via `to_loc`.
+    pub fn unknown_move_ir_loc(&self) -> MoveIrLoc {
+        self.unknown_move_ir_loc
+    }
+
+    /// Returns the internal location.
+    pub fn internal_loc(&self) -> Loc {
+        self.internal_loc.clone()
+    }
+
+    /// Converts a Loc as used by the move-compiler compiler to the one we are using here.
+    /// TODO: move-compiler should use FileId as well so we don't need this here. There is already
+    /// a todo in their code to remove the current use of `&'static str` for file names in Loc.
+    pub fn to_loc(&self, loc: &MoveIrLoc) -> Loc {
+        let file_id = self.get_file_id(loc.file_hash()).unwrap_or_else(|| {
+            panic!(
+                "Unable to find source file '{}' in the environment",
+                loc.file_hash()
+            )
+        });
+        Loc {
+            file_id,
+            span: Span::new(loc.start(), loc.end()),
+        }
+    }
+
+    /// Returns the file id for a file name, if defined.
+    pub fn get_file_id(&self, fhash: FileHash) -> Option<FileId> {
+        self.file_hash_map.get(&fhash).map(|(_, id)| id).cloned()
+    }
+
+    /// Maps a FileId to an index which can be mapped back to a FileId.
+    pub fn file_id_to_idx(&self, file_id: FileId) -> u16 {
+        *self
+            .file_id_to_idx
+            .get(&file_id)
+            .expect("file_id undefined")
+    }
+
+    /// Maps a an index which was obtained by `file_id_to_idx` back to a FileId.
+    pub fn file_idx_to_id(&self, file_idx: u16) -> FileId {
+        *self
+            .file_idx_to_id
+            .get(&file_idx)
+            .expect("file_idx undefined")
+    }
+
+    /// Returns file name and line/column position for a location, if available.
+    pub fn get_file_and_location(&self, loc: &Loc) -> Option<(String, Location)> {
+        self.get_location(loc).map(|line_column| {
+            (
+                self.source_files
+                    .name(loc.file_id())
+                    .to_string_lossy()
+                    .to_string(),
+                line_column,
+            )
+        })
+    }
+
+    /// Returns line/column position for a location, if available.
+    pub fn get_location(&self, loc: &Loc) -> Option<Location> {
+        self.source_files
+            .location(loc.file_id(), loc.span().start())
+            .ok()
+    }
+
+    /// Return the source text for the given location.
+    pub fn get_source(&self, loc: &Loc) -> Result<&str, codespan_reporting::files::Error> {
+        self.source_files.source_slice(loc.file_id, loc.span)
+    }
+
+    /// Return the source file name for `file_id`
+    pub fn get_file(&self, file_id: FileId) -> &OsStr {
+        self.source_files.name(file_id)
+    }
+
+    /// Return the source file names.
+    pub fn get_source_file_names(&self) -> Vec<String> {
+        self.file_hash_map
+            .iter()
+            .filter_map(|(_, (k, _))| {
+                if k.eq("<internal>") || k.eq("<unknown>") {
+                    None
+                } else {
+                    Some(k.clone())
+                }
+            })
+            .collect()
+    }
+
+    /// Return the source file ids.
+    pub fn get_source_file_ids(&self) -> Vec<FileId> {
+        self.file_hash_map
+            .iter()
+            .filter_map(|(_, (k, id))| {
+                if k.eq("<internal>") || k.eq("<unknown>") {
+                    None
+                } else {
+                    Some(*id)
+                }
+            })
+            .collect()
+    }
+
+    // Gets the number of source files in this environment.
+    pub fn get_file_count(&self) -> usize {
+        self.file_hash_map.len()
+    }
+
+    /// Returns true if diagnostics have error severity or worse.
+    pub fn has_errors(&self) -> bool {
+        self.error_count() > 0
+    }
+
+    /// Returns the number of diagnostics.
+    pub fn diag_count(&self, min_severity: Severity) -> usize {
+        self.diags
+            .borrow()
+            .iter()
+            .filter(|(d, _)| d.severity >= min_severity)
+            .count()
+    }
+
+    /// Returns the number of errors.
+    pub fn error_count(&self) -> usize {
+        self.diag_count(Severity::Error)
+    }
+
+    /// Returns true if diagnostics have warning severity or worse.
+    pub fn has_warnings(&self) -> bool {
+        self.diags
+            .borrow()
+            .iter()
+            .any(|(d, _)| d.severity >= Severity::Warning)
+    }
+
+    /// Writes accumulated diagnostics of given or higher severity.
+    pub fn report_diag<W: WriteColor>(&self, writer: &mut W, severity: Severity) {
+        self.report_diag_with_filter(writer, |d| d.severity >= severity)
+    }
+
+    /// Writes accumulated diagnostics that pass through `filter`
+    pub fn report_diag_with_filter<W: WriteColor, F: Fn(&Diagnostic<FileId>) -> bool>(
+        &self,
+        writer: &mut W,
+        filter: F,
+    ) {
+        let mut shown = BTreeSet::new();
+        for (diag, reported) in self
+            .diags
+            .borrow_mut()
+            .iter_mut()
+            .filter(|(d, _)| filter(d))
+        {
+            if !*reported {
+                // Avoid showing the same message twice. This can happen e.g. because of
+                // duplication of expressions via schema inclusion.
+                if shown.insert(format!("{:?}", diag)) {
+                    emit(writer, &Config::default(), &self.source_files, diag)
+                        .expect("emit must not fail");
+                }
+                *reported = true;
+            }
+        }
+    }
+
+    /// Adds a global invariant to this environment.
+    pub fn add_global_invariant(&mut self, inv: GlobalInvariant) {
+        let id = inv.id;
+        for memory in &inv.mem_usage {
+            self.global_invariants_for_memory
+                .entry(memory.clone())
+                .or_default()
+                .insert(id);
+        }
+        self.global_invariants.insert(id, inv);
+    }
+
+    /// Get global invariant by id.
+    pub fn get_global_invariant(&self, id: GlobalId) -> Option<&GlobalInvariant> {
+        self.global_invariants.get(&id)
+    }
+
+    /// Return the global invariants which refer to the given memory.
+    pub fn get_global_invariants_for_memory(
+        &self,
+        memory: &QualifiedInstId<StructId>,
+    ) -> BTreeSet<GlobalId> {
+        let mut inv_ids = BTreeSet::new();
+        for (key, val) in &self.global_invariants_for_memory {
+            if key.module_id != memory.module_id || key.id != memory.id {
+                continue;
+            }
+            assert_eq!(key.inst.len(), memory.inst.len());
+            let adapter = TypeUnificationAdapter::new_vec(&memory.inst, &key.inst, true, true);
+            let rel = adapter.unify(Variance::Allow, true);
+            if rel.is_some() {
+                inv_ids.extend(val.clone());
+            }
+        }
+        inv_ids
+    }
+
+    pub fn get_global_invariants_for_module(&self, module_id: ModuleId) -> Vec<&GlobalInvariant> {
+        self.global_invariants
+            .iter()
+            .filter(|(_, inv)| inv.declaring_module == module_id)
+            .map(|(_, inv)| inv)
+            .collect()
+    }
+
+    pub fn get_global_invariants_by_module(&self, module_id: ModuleId) -> BTreeSet<GlobalId> {
+        self.global_invariants
+            .iter()
+            .filter(|(_, inv)| inv.declaring_module == module_id)
+            .map(|(id, _)| *id)
+            .collect()
+    }
+
+    /// Returns true if a spec fun is used in specs.
+    pub fn is_spec_fun_used(&self, id: QualifiedId<SpecFunId>) -> bool {
+        self.used_spec_funs.contains(&id)
+    }
+
+    /// Determines whether the given spec fun is recursive.
+    pub fn is_spec_fun_recursive(&self, id: QualifiedId<SpecFunId>) -> bool {
+        fn is_caller(
+            env: &GlobalEnv,
+            visited: &mut BTreeSet<QualifiedId<SpecFunId>>,
+            caller: QualifiedId<SpecFunId>,
+            fun: QualifiedId<SpecFunId>,
+        ) -> bool {
+            if !visited.insert(caller) {
+                return false;
+            }
+            let module = env.get_module(caller.module_id);
+            let decl = module.get_spec_fun(caller.id);
+            decl.callees.contains(&fun)
+                || decl
+                    .callees
+                    .iter()
+                    .any(|trans_caller| is_caller(env, visited, *trans_caller, fun))
+        }
+        let module = self.get_module(id.module_id);
+        let is_recursive = *module.get_spec_fun(id.id).is_recursive.borrow();
+        if let Some(b) = is_recursive {
+            b
+        } else {
+            let b = is_caller(self, &mut BTreeSet::new(), id, id);
+            *module.get_spec_fun(id.id).is_recursive.borrow_mut() = Some(b);
+            b
+        }
+    }
+
+    /// Returns true if the type represents the well-known event handle type.
+    pub fn is_wellknown_event_handle_type(&self, ty: &Type) -> bool {
+        if let Type::Struct(mid, sid, _) = ty {
+            let module_env = self.get_module(*mid);
+            let struct_env = module_env.get_struct(*sid);
+            let module_name = module_env.get_name();
+            module_name.addr() == &BigUint::one()
+                && &*self.symbol_pool.string(module_name.name()) == "event"
+                && &*self.symbol_pool.string(struct_env.get_name()) == "EventHandle"
+        } else {
+            false
+        }
+    }
+
+    /// Adds a new module to the environment. StructData and FunctionData need to be provided
+    /// in definition index order. See `create_function_data` and `create_struct_data` for how
+    /// to create them.
+    #[allow(clippy::too_many_arguments)]
+    pub fn add(
+        &mut self,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        module: CompiledModule,
+        source_map: SourceMap,
+        named_constants: BTreeMap<NamedConstantId, NamedConstantData>,
+        mut struct_data: BTreeMap<StructId, StructData>,
+        function_data: BTreeMap<FunId, FunctionData>,
+        spec_vars: Vec<SpecVarDecl>,
+        spec_funs: Vec<SpecFunDecl>,
+        module_spec: Spec,
+        spec_block_infos: Vec<SpecBlockInfo>,
+    ) {
+        let idx = self.module_data.len();
+        let effective_name = if module.self_id().name().as_str() == SCRIPT_MODULE_NAME {
+            // Use the name of the first function in this module.
+            function_data
+                .iter()
+                .next()
+                .expect("functions in script")
+                .1
+                .name
+        } else {
+            self.symbol_pool.make(module.self_id().name().as_str())
+        };
+        let name = ModuleName::from_str(&module.self_id().address().to_string(), effective_name);
+        let struct_idx_to_id: BTreeMap<StructDefinitionIndex, StructId> = struct_data
+            .iter()
+            .filter_map(|(id, data)| match &data.info {
+                StructInfo::Declared { def_idx, .. } => Some((*def_idx, *id)),
+                StructInfo::Generated { .. } => None,
+            })
+            .collect();
+        let function_idx_to_id: BTreeMap<FunctionDefinitionIndex, FunId> = function_data
+            .iter()
+            .map(|(id, data)| (data.def_idx, *id))
+            .collect();
+        let spec_vars: BTreeMap<SpecVarId, SpecVarDecl> = spec_vars
+            .into_iter()
+            .enumerate()
+            .map(|(i, v)| (SpecVarId::new(i), v))
+            .collect();
+        // Generate ghost memory struct declarations for spec vars.
+        for (svar_id, svar) in &spec_vars {
+            let data = self.create_ghost_struct_data(
+                svar.loc.clone(),
+                svar.name,
+                *svar_id,
+                svar.type_.clone(),
+            );
+            struct_data.insert(StructId::new(data.name), data);
+        }
+        let spec_funs: BTreeMap<SpecFunId, SpecFunDecl> = spec_funs
+            .into_iter()
+            .enumerate()
+            .map(|(i, v)| (SpecFunId::new(i), v))
+            .collect();
+
+        self.module_data.push(ModuleData {
+            name,
+            id: ModuleId(idx as RawIndex),
+            module,
+            named_constants,
+            struct_data,
+            struct_idx_to_id,
+            function_data,
+            function_idx_to_id,
+            spec_vars,
+            spec_funs,
+            module_spec,
+            source_map,
+            loc,
+            attributes,
+            spec_block_infos,
+            used_modules: Default::default(),
+            friend_modules: Default::default(),
+        });
+    }
+
+    /// Creates data for a named constant.
+    pub fn create_named_constant_data(
+        &self,
+        name: Symbol,
+        loc: Loc,
+        typ: Type,
+        value: Value,
+    ) -> NamedConstantData {
+        NamedConstantData {
+            name,
+            loc,
+            typ,
+            value,
+        }
+    }
+
+    /// Creates data for a function, adding any information not contained in bytecode. This is
+    /// a helper for adding a new module to the environment.
+    pub fn create_function_data(
+        &self,
+        module: &CompiledModule,
+        def_idx: FunctionDefinitionIndex,
+        name: Symbol,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        arg_names: Vec<Symbol>,
+        type_arg_names: Vec<Symbol>,
+        spec: Spec,
+    ) -> FunctionData {
+        let handle_idx = module.function_def_at(def_idx).function;
+        FunctionData {
+            name,
+            loc,
+            attributes,
+            def_idx,
+            handle_idx,
+            arg_names,
+            type_arg_names,
+            spec,
+            called_funs: Default::default(),
+            calling_funs: Default::default(),
+            transitive_closure_of_called_funs: Default::default(),
+        }
+    }
+
+    /// Creates data for a struct declared in Move. Currently all information is contained in
+    /// the byte code. This is a helper for adding a new module to the environment.
+    pub fn create_move_struct_data(
+        &self,
+        module: &CompiledModule,
+        def_idx: StructDefinitionIndex,
+        name: Symbol,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        spec: Spec,
+    ) -> StructData {
+        let handle_idx = module.struct_def_at(def_idx).struct_handle;
+        let field_data = if let StructFieldInformation::Declared(fields) =
+            &module.struct_def_at(def_idx).field_information
+        {
+            let mut map = BTreeMap::new();
+            for (offset, field) in fields.iter().enumerate() {
+                let name = self
+                    .symbol_pool
+                    .make(module.identifier_at(field.name).as_str());
+                let info = FieldInfo::Declared { def_idx };
+                map.insert(FieldId(name), FieldData { name, offset, info });
+            }
+            map
+        } else {
+            BTreeMap::new()
+        };
+        let info = StructInfo::Declared {
+            def_idx,
+            handle_idx,
+        };
+        StructData {
+            name,
+            loc,
+            attributes,
+            info,
+            field_data,
+            spec,
+        }
+    }
+
+    /// Return the name of the ghost memory associated with spec var.
+    pub fn ghost_memory_name(&self, spec_var_name: Symbol) -> Symbol {
+        self.symbol_pool.make(&format!(
+            "{}{}",
+            GHOST_MEMORY_PREFIX,
+            self.symbol_pool.string(spec_var_name)
+        ))
+    }
+
+    /// Create a ghost memory struct declaration.
+    fn create_ghost_struct_data(
+        &self,
+        loc: Loc,
+        var_name: Symbol,
+        var_id: SpecVarId,
+        ty: Type,
+    ) -> StructData {
+        let field_name = self.symbol_pool.make("v");
+        let mut field_data = BTreeMap::new();
+        let field_id = FieldId::new(field_name);
+        field_data.insert(
+            field_id,
+            FieldData {
+                name: field_name,
+                offset: 0,
+                info: FieldInfo::Generated { type_: ty },
+            },
+        );
+        StructData {
+            name: self.ghost_memory_name(var_name),
+            loc,
+            attributes: Default::default(),
+            info: StructInfo::Generated { spec_var: var_id },
+            field_data,
+            spec: Spec::default(),
+        }
+    }
+
+    /// Finds a module by name and returns an environment for it.
+    pub fn find_module(&self, name: &ModuleName) -> Option<ModuleEnv<'_>> {
+        for module_data in &self.module_data {
+            let module_env = ModuleEnv {
+                env: self,
+                data: module_data,
+            };
+            if module_env.get_name() == name {
+                return Some(module_env);
+            }
+        }
+        None
+    }
+
+    /// Finds a module by simple name and returns an environment for it.
+    /// TODO: we may need to disallow this to support modules of the same simple name but with
+    ///    different addresses in one verification session.
+    pub fn find_module_by_name(&self, simple_name: Symbol) -> Option<ModuleEnv<'_>> {
+        self.get_modules()
+            .find(|m| m.get_name().name() == simple_name)
+    }
+
+    /// Find a module by its bytecode format ID
+    pub fn find_module_by_language_storage_id(
+        &self,
+        id: &language_storage::ModuleId,
+    ) -> Option<ModuleEnv<'_>> {
+        self.find_module(&self.to_module_name(id))
+    }
+
+    /// Find a function by its bytecode format name and ID
+    pub fn find_function_by_language_storage_id_name(
+        &self,
+        id: &language_storage::ModuleId,
+        name: &IdentStr,
+    ) -> Option<FunctionEnv<'_>> {
+        self.find_module_by_language_storage_id(id)
+            .and_then(|menv| menv.find_function(menv.symbol_pool().make(name.as_str())))
+    }
+
+    /// Gets a StructEnv in this module by its `StructTag`
+    pub fn find_struct_by_tag(
+        &self,
+        tag: &language_storage::StructTag,
+    ) -> Option<QualifiedId<StructId>> {
+        self.find_module(&self.to_module_name(&tag.module_id()))
+            .and_then(|menv| {
+                menv.find_struct_by_identifier(tag.name.clone())
+                    .map(|sid| menv.get_id().qualified(sid))
+            })
+    }
+
+    /// Return the module enclosing this location.
+    pub fn get_enclosing_module(&self, loc: &Loc) -> Option<ModuleEnv<'_>> {
+        for data in &self.module_data {
+            if data.loc.file_id() == loc.file_id()
+                && Self::enclosing_span(data.loc.span(), loc.span())
+            {
+                return Some(ModuleEnv { env: self, data });
+            }
+        }
+        None
+    }
+
+    /// Returns the function enclosing this location.
+    pub fn get_enclosing_function(&self, loc: &Loc) -> Option<FunctionEnv<'_>> {
+        // Currently we do a brute-force linear search, may need to speed this up if it appears
+        // to be a bottleneck.
+        let module_env = self.get_enclosing_module(loc)?;
+        for func_env in module_env.into_functions() {
+            if Self::enclosing_span(func_env.get_loc().span(), loc.span())
+                || Self::enclosing_span(
+                    func_env
+                        .get_spec()
+                        .loc
+                        .clone()
+                        .unwrap_or_else(|| self.unknown_loc.clone())
+                        .span(),
+                    loc.span(),
+                )
+            {
+                return Some(func_env.clone());
+            }
+        }
+        None
+    }
+
+    /// Returns the struct enclosing this location.
+    pub fn get_enclosing_struct(&self, loc: &Loc) -> Option<StructEnv<'_>> {
+        let module_env = self.get_enclosing_module(loc)?;
+        module_env
+            .into_structs()
+            .find(|struct_env| Self::enclosing_span(struct_env.get_loc().span(), loc.span()))
+    }
+
+    fn enclosing_span(outer: Span, inner: Span) -> bool {
+        inner.start() >= outer.start() && inner.end() <= outer.end()
+    }
+
+    /// Return the `FunctionEnv` for `fun`
+    pub fn get_function(&self, fun: QualifiedId<FunId>) -> FunctionEnv<'_> {
+        self.get_module(fun.module_id).into_function(fun.id)
+    }
+
+    /// Return the `StructEnv` for `str`
+    pub fn get_struct(&self, str: QualifiedId<StructId>) -> StructEnv<'_> {
+        self.get_module(str.module_id).into_struct(str.id)
+    }
+
+    // Gets the number of modules in this environment.
+    pub fn get_module_count(&self) -> usize {
+        self.module_data.len()
+    }
+
+    /// Gets a module by id.
+    pub fn get_module(&self, id: ModuleId) -> ModuleEnv<'_> {
+        let module_data = &self.module_data[id.0 as usize];
+        ModuleEnv {
+            env: self,
+            data: module_data,
+        }
+    }
+
+    /// Gets a struct by qualified id.
+    pub fn get_struct_qid(&self, qid: QualifiedId<StructId>) -> StructEnv<'_> {
+        self.get_module(qid.module_id).into_struct(qid.id)
+    }
+
+    /// Gets a function by qualified id.
+    pub fn get_function_qid(&self, qid: QualifiedId<FunId>) -> FunctionEnv<'_> {
+        self.get_module(qid.module_id).into_function(qid.id)
+    }
+
+    /// Returns an iterator for all modules in the environment.
+    pub fn get_modules(&self) -> impl Iterator<Item = ModuleEnv<'_>> {
+        self.module_data.iter().map(move |module_data| ModuleEnv {
+            env: self,
+            data: module_data,
+        })
+    }
+
+    /// Returns an iterator for all bytecode modules in the environment.
+    pub fn get_bytecode_modules(&self) -> impl Iterator<Item = &CompiledModule> {
+        self.module_data
+            .iter()
+            .map(|module_data| &module_data.module)
+    }
+
+    /// Returns all structs in all modules which carry invariants.
+    pub fn get_all_structs_with_conditions(&self) -> Vec<Type> {
+        let mut res = vec![];
+        for module_env in self.get_modules() {
+            for struct_env in module_env.get_structs() {
+                if struct_env.has_conditions() {
+                    let formals = struct_env
+                        .get_type_parameters()
+                        .iter()
+                        .enumerate()
+                        .map(|(idx, _)| Type::TypeParameter(idx as u16))
+                        .collect_vec();
+                    res.push(Type::Struct(
+                        module_env.get_id(),
+                        struct_env.get_id(),
+                        formals,
+                    ));
+                }
+            }
+        }
+        res
+    }
+
+    /// Converts a storage module id into an AST module name.
+    pub fn to_module_name(&self, storage_id: &language_storage::ModuleId) -> ModuleName {
+        ModuleName::from_str(
+            &storage_id.address().to_string(),
+            self.symbol_pool.make(storage_id.name().as_str()),
+        )
+    }
+
+    /// Get documentation associated with an item at Loc.
+    pub fn get_doc(&self, loc: &Loc) -> &str {
+        self.doc_comments
+            .get(&loc.file_id)
+            .and_then(|comments| comments.get(&loc.span.start()).map(|s| s.as_str()))
+            .unwrap_or("")
+    }
+
+    /// Returns true if the boolean property is true.
+    pub fn is_property_true(&self, properties: &PropertyBag, name: &str) -> Option<bool> {
+        let sym = &self.symbol_pool().make(name);
+        if let Some(PropertyValue::Value(Value::Bool(b))) = properties.get(sym) {
+            return Some(*b);
+        }
+        None
+    }
+
+    /// Returns the value of a number property.
+    pub fn get_num_property(&self, properties: &PropertyBag, name: &str) -> Option<usize> {
+        let sym = &self.symbol_pool().make(name);
+        if let Some(PropertyValue::Value(Value::Number(n))) = properties.get(sym) {
+            return n.to_usize();
+        }
+        None
+    }
+
+    /// Attempt to compute a struct tag for (`mid`, `sid`, `ts`). Returns `Some` if all types in
+    /// `ts` are closed, `None` otherwise
+    pub fn get_struct_tag(
+        &self,
+        mid: ModuleId,
+        sid: StructId,
+        ts: &[Type],
+    ) -> Option<language_storage::StructTag> {
+        self.get_struct_type(mid, sid, ts)?.into_struct_tag()
+    }
+
+    /// Attempt to compute a struct type for (`mid`, `sid`, `ts`).
+    pub fn get_struct_type(&self, mid: ModuleId, sid: StructId, ts: &[Type]) -> Option<MType> {
+        let menv = self.get_module(mid);
+        Some(MType::Struct {
+            address: *menv.self_address(),
+            module: menv.get_identifier(),
+            name: menv.get_struct(sid).get_identifier()?,
+            type_arguments: ts
+                .iter()
+                .map(|t| t.clone().into_normalized_type(self).unwrap())
+                .collect(),
+        })
+    }
+
+    /// Gets the location of the given node.
+    pub fn get_node_loc(&self, node_id: NodeId) -> Loc {
+        self.exp_info
+            .borrow()
+            .get(&node_id)
+            .map_or_else(|| self.unknown_loc(), |info| info.loc.clone())
+    }
+
+    /// Gets the type of the given node.
+    pub fn get_node_type(&self, node_id: NodeId) -> Type {
+        self.get_node_type_opt(node_id).expect("node type defined")
+    }
+
+    /// Gets the type of the given node, if available.
+    pub fn get_node_type_opt(&self, node_id: NodeId) -> Option<Type> {
+        self.exp_info
+            .borrow()
+            .get(&node_id)
+            .map(|info| info.ty.clone())
+    }
+
+    /// Converts an index into a node id.
+    pub fn index_to_node_id(&self, index: usize) -> Option<NodeId> {
+        let id = NodeId::new(index);
+        if self.exp_info.borrow().get(&id).is_some() {
+            Some(id)
+        } else {
+            None
+        }
+    }
+
+    /// Returns the next free node number.
+    pub fn next_free_node_number(&self) -> usize {
+        *self.next_free_node_id.borrow()
+    }
+
+    /// Allocates a new node id.
+    pub fn new_node_id(&self) -> NodeId {
+        let id = NodeId::new(*self.next_free_node_id.borrow());
+        let mut r = self.next_free_node_id.borrow_mut();
+        *r = r.checked_add(1).expect("NodeId overflow");
+        id
+    }
+
+    /// Allocates a new node id and assigns location and type to it.
+    pub fn new_node(&self, loc: Loc, ty: Type) -> NodeId {
+        let id = self.new_node_id();
+        self.exp_info.borrow_mut().insert(id, ExpInfo::new(loc, ty));
+        id
+    }
+
+    /// Updates type for the given node id. Must have been set before.
+    pub fn update_node_type(&self, node_id: NodeId, ty: Type) {
+        let mut mods = self.exp_info.borrow_mut();
+        let info = mods.get_mut(&node_id).expect("node exist");
+        info.ty = ty;
+    }
+
+    /// Sets instantiation for the given node id. Must not have been set before.
+    pub fn set_node_instantiation(&self, node_id: NodeId, instantiation: Vec<Type>) {
+        let mut mods = self.exp_info.borrow_mut();
+        let info = mods.get_mut(&node_id).expect("node exist");
+        assert!(info.instantiation.is_none());
+        info.instantiation = Some(instantiation);
+    }
+
+    /// Updates instantiation for the given node id. Must have been set before.
+    pub fn update_node_instantiation(&self, node_id: NodeId, instantiation: Vec<Type>) {
+        let mut mods = self.exp_info.borrow_mut();
+        let info = mods.get_mut(&node_id).expect("node exist");
+        assert!(info.instantiation.is_some());
+        info.instantiation = Some(instantiation);
+    }
+
+    /// Gets the type parameter instantiation associated with the given node.
+    pub fn get_node_instantiation(&self, node_id: NodeId) -> Vec<Type> {
+        self.get_node_instantiation_opt(node_id).unwrap_or_default()
+    }
+
+    /// Gets the type parameter instantiation associated with the given node, if it is available.
+    pub fn get_node_instantiation_opt(&self, node_id: NodeId) -> Option<Vec<Type>> {
+        self.exp_info
+            .borrow()
+            .get(&node_id)
+            .and_then(|info| info.instantiation.clone())
+    }
+
+    /// Gets the type parameter instantiation associated with the given node, if it is available.
+    pub fn get_nodes(&self) -> Vec<NodeId> {
+        (*self.exp_info.borrow()).clone().into_keys().collect_vec()
+    }
+
+    /// Return the total number of declared functions in the modules of `self`
+    pub fn get_declared_function_count(&self) -> usize {
+        let mut total = 0;
+        for m in &self.module_data {
+            total += m.module.function_defs().len();
+        }
+        total
+    }
+
+    /// Return the total number of declared structs in the modules of `self`
+    pub fn get_declared_struct_count(&self) -> usize {
+        let mut total = 0;
+        for m in &self.module_data {
+            total += m.module.struct_defs().len();
+        }
+        total
+    }
+
+    /// Return the total number of Move bytecode instructions (not stackless bytecode) in the modules of `self`
+    pub fn get_move_bytecode_instruction_count(&self) -> usize {
+        let mut total = 0;
+        for m in self.get_modules() {
+            for f in m.get_functions() {
+                total += f.get_bytecode().len();
+            }
+        }
+        total
+    }
+
+    /// Return the total number of Move modules that contain specs
+    pub fn get_modules_with_specs_count(&self) -> usize {
+        let mut total = 0;
+        for m in self.get_modules() {
+            if m.has_specs() {
+                total += 1
+            }
+        }
+        total
+    }
+
+    /// Override the specification for a given module
+    pub fn override_module_spec(&mut self, mid: ModuleId, spec: Spec) {
+        let module_data = self
+            .module_data
+            .iter_mut()
+            .filter(|m| m.id == mid)
+            .exactly_one()
+            .unwrap_or_else(|_| {
+                panic!("Expect one and only one module for {:?}", mid);
+            });
+        module_data.module_spec = spec;
+    }
+
+    /// Override the specification for a given function
+    pub fn override_function_spec(&mut self, fid: QualifiedId<FunId>, spec: Spec) {
+        let func_data = self
+            .module_data
+            .iter_mut()
+            .filter(|m| m.id == fid.module_id)
+            .flat_map(|m| {
+                m.function_data
+                    .iter_mut()
+                    .filter(|(k, _)| **k == fid.id)
+                    .map(|(_, v)| v)
+            })
+            .exactly_one()
+            .unwrap_or_else(|_| {
+                panic!("Expect one and only one function for {:?}", fid);
+            });
+        func_data.spec = spec;
+    }
+
+    /// Override the specification for a given code location
+    pub fn override_inline_spec(
+        &mut self,
+        fid: QualifiedId<FunId>,
+        code_offset: CodeOffset,
+        spec: Spec,
+    ) {
+        let func_data = self
+            .module_data
+            .iter_mut()
+            .filter(|m| m.id == fid.module_id)
+            .flat_map(|m| {
+                m.function_data
+                    .iter_mut()
+                    .filter(|(k, _)| **k == fid.id)
+                    .map(|(_, v)| v)
+            })
+            .exactly_one()
+            .unwrap_or_else(|_| {
+                panic!("Expect one and only one function for {:?}", fid);
+            });
+        func_data.spec.on_impl.insert(code_offset, spec);
+    }
+
+    /// Produce a TypeDisplayContext to print types within the scope of this env
+    pub fn get_type_display_ctx(&self) -> TypeDisplayContext {
+        TypeDisplayContext::WithEnv {
+            env: self,
+            type_param_names: None,
+        }
+    }
+
+    /// Returns the address where the standard lib is defined.
+    pub fn get_stdlib_address(&self) -> BigUint {
+        self.stdlib_address.clone().unwrap_or_else(|| 1u16.into())
+    }
+
+    /// Returns the address where the extensions libs are defined.
+    pub fn get_extlib_address(&self) -> BigUint {
+        self.extlib_address.clone().unwrap_or_else(|| 2u16.into())
+    }
+}
+
+impl Default for GlobalEnv {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+// =================================================================================================
+/// # Module Environment
+
+/// Represents data for a module.
+#[derive(Debug)]
+pub struct ModuleData {
+    /// Module name.
+    pub name: ModuleName,
+
+    /// Id of this module in the global env.
+    pub id: ModuleId,
+
+    /// Attributes attached to this module.
+    attributes: Vec<Attribute>,
+
+    /// Module byte code.
+    pub module: CompiledModule,
+
+    /// Named constant data
+    pub named_constants: BTreeMap<NamedConstantId, NamedConstantData>,
+
+    /// Struct data.
+    pub struct_data: BTreeMap<StructId, StructData>,
+
+    /// Mapping from struct definition index to id in above map.
+    pub struct_idx_to_id: BTreeMap<StructDefinitionIndex, StructId>,
+
+    /// Function data.
+    pub function_data: BTreeMap<FunId, FunctionData>,
+
+    /// Mapping from function definition index to id in above map.
+    pub function_idx_to_id: BTreeMap<FunctionDefinitionIndex, FunId>,
+
+    /// Specification variables, in SpecVarId order.
+    pub spec_vars: BTreeMap<SpecVarId, SpecVarDecl>,
+
+    /// Specification functions, in SpecFunId order.
+    pub spec_funs: BTreeMap<SpecFunId, SpecFunDecl>,
+
+    /// Module level specification.
+    pub module_spec: Spec,
+
+    /// Module source location information.
+    pub source_map: SourceMap,
+
+    /// The location of this module.
+    pub loc: Loc,
+
+    /// A list of spec block infos, for documentation generation.
+    pub spec_block_infos: Vec<SpecBlockInfo>,
+
+    /// A cache for the modules used by this one.
+    used_modules: RefCell<BTreeMap<bool, BTreeSet<ModuleId>>>,
+
+    /// A cache for the modules declared as friends by this one.
+    friend_modules: RefCell<Option<BTreeSet<ModuleId>>>,
+}
+
+impl ModuleData {
+    pub fn stub(name: ModuleName, id: ModuleId, module: CompiledModule) -> Self {
+        ModuleData {
+            name,
+            id,
+            module,
+            named_constants: BTreeMap::new(),
+            struct_data: BTreeMap::new(),
+            struct_idx_to_id: BTreeMap::new(),
+            function_data: BTreeMap::new(),
+            function_idx_to_id: BTreeMap::new(),
+            // below this line is source/prover specific
+            spec_vars: BTreeMap::new(),
+            spec_funs: BTreeMap::new(),
+            module_spec: Spec::default(),
+            source_map: SourceMap::new(MoveIrLoc::new(FileHash::empty(), 0, 0), None),
+            loc: Loc::default(),
+            attributes: Default::default(),
+            spec_block_infos: vec![],
+            used_modules: Default::default(),
+            friend_modules: Default::default(),
+        }
+    }
+}
+
+/// Represents a module environment.
+#[derive(Debug, Clone)]
+pub struct ModuleEnv<'env> {
+    /// Reference to the outer env.
+    pub env: &'env GlobalEnv,
+
+    /// Reference to the data of the module.
+    data: &'env ModuleData,
+}
+
+impl<'env> ModuleEnv<'env> {
+    /// Returns the id of this module in the global env.
+    pub fn get_id(&self) -> ModuleId {
+        self.data.id
+    }
+
+    /// Returns the name of this module.
+    pub fn get_name(&'env self) -> &'env ModuleName {
+        &self.data.name
+    }
+
+    /// Returns true if either the full name or simple name of this module matches the given string
+    pub fn matches_name(&self, name: &str) -> bool {
+        self.get_full_name_str() == name
+            || self.get_name().display(self.symbol_pool()).to_string() == name
+    }
+
+    /// Returns the location of this module.
+    pub fn get_loc(&'env self) -> Loc {
+        self.data.loc.clone()
+    }
+
+    /// Returns the attributes of this module.
+    pub fn get_attributes(&self) -> &[Attribute] {
+        &self.data.attributes
+    }
+
+    /// Returns full name as a string.
+    pub fn get_full_name_str(&self) -> String {
+        self.get_name().display_full(self.symbol_pool()).to_string()
+    }
+
+    /// Returns the VM identifier for this module
+    pub fn get_identifier(&'env self) -> Identifier {
+        self.data.module.name().to_owned()
+    }
+
+    /// Returns true if this is a module representing a script.
+    pub fn is_script_module(&self) -> bool {
+        self.data.name.is_script()
+    }
+
+    /// Returns true of this module is target of compilation. A non-target module is
+    /// a dependency only but not explicitly requested to process.
+    pub fn is_target(&self) -> bool {
+        let file_id = self.data.loc.file_id;
+        !self.env.file_id_is_dep.contains(&file_id)
+    }
+
+    /// Returns the path to source file of this module.
+    pub fn get_source_path(&self) -> &OsStr {
+        let file_id = self.data.loc.file_id;
+        self.env.source_files.name(file_id)
+    }
+
+    /// Return the set of language storage ModuleId's that this module's bytecode depends on
+    /// (including itself), friend modules are excluded from the return result.
+    pub fn get_dependencies(&self) -> Vec<language_storage::ModuleId> {
+        let compiled_module = &self.data.module;
+        let mut deps = compiled_module.immediate_dependencies();
+        deps.push(compiled_module.self_id());
+        deps
+    }
+
+    /// Return the set of language storage ModuleId's that this module declares as friends
+    pub fn get_friends(&self) -> Vec<language_storage::ModuleId> {
+        self.data.module.immediate_friends()
+    }
+
+    /// Returns the set of modules that use this one.
+    pub fn get_using_modules(&self, include_specs: bool) -> BTreeSet<ModuleId> {
+        self.env
+            .get_modules()
+            .filter_map(|module_env| {
+                if module_env
+                    .get_used_modules(include_specs)
+                    .contains(&self.data.id)
+                {
+                    Some(module_env.data.id)
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    /// Returns the set of modules this one uses.
+    pub fn get_used_modules(&self, include_specs: bool) -> BTreeSet<ModuleId> {
+        if let Some(usage) = self.data.used_modules.borrow().get(&include_specs) {
+            return usage.clone();
+        }
+        // Determine modules used in bytecode from the compiled module.
+        let mut usage: BTreeSet<ModuleId> = self
+            .get_dependencies()
+            .into_iter()
+            .map(|storage_id| self.env.to_module_name(&storage_id))
+            .filter_map(|name| self.env.find_module(&name))
+            .map(|env| env.get_id())
+            .filter(|id| *id != self.get_id())
+            .collect();
+        if include_specs {
+            // Add any usage in specs.
+            let add_usage_of_exp = |usage: &mut BTreeSet<ModuleId>, exp: &ExpData| {
+                exp.module_usage(usage);
+                for node_id in exp.node_ids() {
+                    self.env.get_node_type(node_id).module_usage(usage);
+                    for ty in self.env.get_node_instantiation(node_id) {
+                        ty.module_usage(usage);
+                    }
+                }
+            };
+            let add_usage_of_spec = |usage: &mut BTreeSet<ModuleId>, spec: &Spec| {
+                for cond in &spec.conditions {
+                    add_usage_of_exp(usage, &cond.exp);
+                }
+            };
+            add_usage_of_spec(&mut usage, self.get_spec());
+            for struct_env in self.get_structs() {
+                add_usage_of_spec(&mut usage, struct_env.get_spec())
+            }
+            for func_env in self.get_functions() {
+                add_usage_of_spec(&mut usage, func_env.get_spec())
+            }
+            for (_, decl) in self.get_spec_funs() {
+                if let Some(def) = &decl.body {
+                    add_usage_of_exp(&mut usage, def);
+                }
+            }
+        }
+        self.data
+            .used_modules
+            .borrow_mut()
+            .insert(include_specs, usage.clone());
+        usage
+    }
+
+    /// Returns the set of modules this one declares as friends.
+    pub fn get_friend_modules(&self) -> BTreeSet<ModuleId> {
+        self.data
+            .friend_modules
+            .borrow_mut()
+            .get_or_insert_with(|| {
+                // Determine modules used in bytecode from the compiled module.
+                self.get_friends()
+                    .into_iter()
+                    .map(|storage_id| self.env.to_module_name(&storage_id))
+                    .filter_map(|name| self.env.find_module(&name))
+                    .map(|env| env.get_id())
+                    .collect()
+            })
+            .clone()
+    }
+
+    /// Returns true if the given module is a transitive dependency of this one. The
+    /// transitive dependency set contains this module and all directly or indirectly used
+    /// modules (without spec usage).
+    pub fn is_transitive_dependency(&self, module_id: ModuleId) -> bool {
+        if self.get_id() == module_id {
+            true
+        } else {
+            for dep in self.get_used_modules(false) {
+                if self.env.get_module(dep).is_transitive_dependency(module_id) {
+                    return true;
+                }
+            }
+            false
+        }
+    }
+
+    /// Returns documentation associated with this module.
+    pub fn get_doc(&self) -> &str {
+        self.env.get_doc(&self.data.loc)
+    }
+
+    /// Returns spec block documentation infos.
+    pub fn get_spec_block_infos(&self) -> &[SpecBlockInfo] {
+        &self.data.spec_block_infos
+    }
+
+    /// Shortcut for accessing the symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        &self.env.symbol_pool
+    }
+
+    /// Gets the underlying bytecode module.
+    pub fn get_verified_module(&'env self) -> &'env CompiledModule {
+        &self.data.module
+    }
+
+    /// Gets a `NamedConstantEnv` in this module by name
+    pub fn find_named_constant(&'env self, name: Symbol) -> Option<NamedConstantEnv<'env>> {
+        let id = NamedConstantId(name);
+        self.data
+            .named_constants
+            .get(&id)
+            .map(|data| NamedConstantEnv {
+                module_env: self.clone(),
+                data,
+            })
+    }
+
+    /// Gets a `NamedConstantEnv` in this module by the constant's id
+    pub fn get_named_constant(&'env self, id: NamedConstantId) -> NamedConstantEnv<'env> {
+        self.clone().into_named_constant(id)
+    }
+
+    /// Gets a `NamedConstantEnv` by id
+    pub fn into_named_constant(self, id: NamedConstantId) -> NamedConstantEnv<'env> {
+        let data = self
+            .data
+            .named_constants
+            .get(&id)
+            .expect("NamedConstantId undefined");
+        NamedConstantEnv {
+            module_env: self,
+            data,
+        }
+    }
+
+    /// Gets the number of named constants in this module.
+    pub fn get_named_constant_count(&self) -> usize {
+        self.data.named_constants.len()
+    }
+
+    /// Returns iterator over `NamedConstantEnv`s in this module.
+    pub fn get_named_constants(&'env self) -> impl Iterator<Item = NamedConstantEnv<'env>> {
+        self.clone().into_named_constants()
+    }
+
+    /// Returns an iterator over `NamedConstantEnv`s in this module.
+    pub fn into_named_constants(self) -> impl Iterator<Item = NamedConstantEnv<'env>> {
+        self.data
+            .named_constants
+            .values()
+            .map(move |data| NamedConstantEnv {
+                module_env: self.clone(),
+                data,
+            })
+    }
+
+    /// Gets a FunctionEnv in this module by name.
+    pub fn find_function(&self, name: Symbol) -> Option<FunctionEnv<'env>> {
+        let id = FunId(name);
+        self.data
+            .function_data
+            .get(&id)
+            .map(move |data| FunctionEnv {
+                module_env: self.clone(),
+                data,
+            })
+    }
+
+    /// Gets a FunctionEnv by id.
+    pub fn get_function(&'env self, id: FunId) -> FunctionEnv<'env> {
+        self.clone().into_function(id)
+    }
+
+    /// Gets a FunctionEnv by id.
+    pub fn into_function(self, id: FunId) -> FunctionEnv<'env> {
+        let data = self.data.function_data.get(&id).expect("FunId undefined");
+        FunctionEnv {
+            module_env: self,
+            data,
+        }
+    }
+
+    /// Gets the number of functions in this module.
+    pub fn get_function_count(&self) -> usize {
+        self.data.function_data.len()
+    }
+
+    /// Returns iterator over FunctionEnvs in this module.
+    pub fn get_functions(&'env self) -> impl Iterator<Item = FunctionEnv<'env>> {
+        self.clone().into_functions()
+    }
+
+    /// Returns iterator over FunctionEnvs in this module.
+    pub fn into_functions(self) -> impl Iterator<Item = FunctionEnv<'env>> {
+        self.data
+            .function_data
+            .values()
+            .map(move |data| FunctionEnv {
+                module_env: self.clone(),
+                data,
+            })
+    }
+
+    /// Gets FunctionEnv for a function used in this module, via the FunctionHandleIndex. The
+    /// returned function might be from this or another module.
+    pub fn get_used_function(&self, idx: FunctionHandleIndex) -> FunctionEnv<'_> {
+        let view =
+            FunctionHandleView::new(&self.data.module, self.data.module.function_handle_at(idx));
+        let module_name = self.env.to_module_name(&view.module_id());
+        let module_env = self
+            .env
+            .find_module(&module_name)
+            .expect("unexpected reference to module not found in global env");
+        module_env.into_function(FunId::new(self.env.symbol_pool.make(view.name().as_str())))
+    }
+
+    /// Gets the function id from a definition index.
+    pub fn try_get_function_id(&self, idx: FunctionDefinitionIndex) -> Option<FunId> {
+        self.data.function_idx_to_id.get(&idx).cloned()
+    }
+
+    /// Gets the function definition index for the given function id. This is always defined.
+    pub fn get_function_def_idx(&self, fun_id: FunId) -> FunctionDefinitionIndex {
+        self.data
+            .function_data
+            .get(&fun_id)
+            .expect("function id defined")
+            .def_idx
+    }
+
+    /// Gets a StructEnv in this module by name.
+    pub fn find_struct(&self, name: Symbol) -> Option<StructEnv<'_>> {
+        let id = StructId(name);
+        self.data.struct_data.get(&id).map(|data| StructEnv {
+            module_env: self.clone(),
+            data,
+        })
+    }
+
+    /// Gets a StructEnv in this module by identifier
+    pub fn find_struct_by_identifier(&self, identifier: Identifier) -> Option<StructId> {
+        let some_id = Some(identifier);
+        for data in self.data.struct_data.values() {
+            let senv = StructEnv {
+                module_env: self.clone(),
+                data,
+            };
+            if senv.get_identifier() == some_id {
+                return Some(senv.get_id());
+            }
+        }
+        None
+    }
+
+    /// Gets the struct id from a definition index which must be valid for this environment.
+    pub fn get_struct_id(&self, idx: StructDefinitionIndex) -> StructId {
+        *self
+            .data
+            .struct_idx_to_id
+            .get(&idx)
+            .unwrap_or_else(|| panic!("undefined struct definition index {:?}", idx))
+    }
+
+    /// Gets a StructEnv by id.
+    pub fn get_struct(&self, id: StructId) -> StructEnv<'_> {
+        let data = self.data.struct_data.get(&id).expect("StructId undefined");
+        StructEnv {
+            module_env: self.clone(),
+            data,
+        }
+    }
+
+    pub fn get_struct_by_def_idx(&self, idx: StructDefinitionIndex) -> StructEnv<'_> {
+        self.get_struct(self.get_struct_id(idx))
+    }
+
+    /// Gets a StructEnv by id, consuming this module env.
+    pub fn into_struct(self, id: StructId) -> StructEnv<'env> {
+        let data = self.data.struct_data.get(&id).expect("StructId undefined");
+        StructEnv {
+            module_env: self,
+            data,
+        }
+    }
+
+    /// Gets the number of structs in this module.
+    pub fn get_struct_count(&self) -> usize {
+        self.data.struct_data.len()
+    }
+
+    /// Returns an iterator over structs in this module.
+    pub fn get_structs(&'env self) -> impl Iterator<Item = StructEnv<'env>> {
+        self.clone().into_structs()
+    }
+
+    /// Returns an iterator over all object types declared by this module
+    pub fn get_objects(&'env self) -> impl Iterator<Item = StructEnv<'env>> {
+        self.clone()
+            .into_structs()
+            .filter(|s| s.get_abilities().has_key())
+    }
+
+    /// Returns the object types that are shared by code in this module
+    /// If `transitive` is false, only return objects directly shared by functions declared in this module
+    /// If `transitive` is true, return objects shared by both functions declared in this module and by transitive callees
+    /// Note that this can include both types declared inside this module (common case) and types declared outside
+    /// Note that objects with `store` can be shared by modules that depend on this one (e.g., by returning the object and subsequently calling `public_share_object`)
+    pub fn get_shared_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut shared = BTreeSet::new();
+        for f in self.get_functions() {
+            shared.extend(f.get_shared_objects(transitive));
+        }
+        shared
+    }
+
+    /// Returns the object types that are frozen by this module
+    /// If `transitive` is false, only return objects directly transferred by functions declared in this module
+    /// If `transitive` is true, return objects transferred by both functions declared in this module and by transitive callees
+    /// Note that this function can return both types declared inside this module (common case) and types declared outside
+    /// Note that objects with `store` can be transferred by modules that depend on this one (e.g., by returning the object and subsequently calling `public_transfer`),
+    /// or transferred by a command in a programmable transaction block
+    pub fn get_transferred_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut transferred = BTreeSet::new();
+        for f in self.get_functions() {
+            transferred.extend(f.get_transferred_objects(transitive))
+        }
+        transferred
+    }
+
+    /// Returns the object types that are frozen by this module
+    /// If `transitive` is false, only return objects directly frozen by functions declared in this module
+    /// If `transitive` is true, return objects frozen by both functions declared in this module and by transitive callees
+    /// Note that this function can return both types declared inside this module (common case) and types declared outside
+    /// Note that objects with `store` can be frozen by modules that depend on this one (e.g., by returning the object and subsequently calling `public_freeze`)
+    pub fn get_frozen_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut frozen = BTreeSet::new();
+        for f in self.get_functions() {
+            frozen.extend(f.get_frozen_objects(transitive))
+        }
+        frozen
+    }
+
+    /// Returns the event types that are emitted by this module
+    /// If `transitive` is false, only return events directly emitted by functions declared in this module
+    /// If `transitive` is true, return events emitted by both functions declared in this module and by transitive callees
+    /// Note that this function can return both event types declared inside this module (common case) and event types declared outside
+    pub fn get_events(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut frozen = BTreeSet::new();
+        for f in self.get_functions() {
+            frozen.extend(f.get_frozen_objects(transitive))
+        }
+        frozen
+    }
+
+    /// Returns the objects types that are returned by externally callable (`public`, `entry`, and `friend`) functions in this module
+    /// Returned objects with `store` can be transferred, shared, frozen, or wrapped by a different module
+    /// Note that this function returns object types both with and without `store`
+    pub fn get_externally_returned_objects(&'env self) -> BTreeSet<Type> {
+        let mut returned = BTreeSet::new();
+        for f in self.get_functions() {
+            if !f.is_exposed() {
+                continue;
+            }
+            // Objects returned by a public function can be transferred, shared, frozen, or wrapped
+            // by a different module or (in the case of transfer) by a command in a programmable transaction block.
+            for f in f.get_return_types() {
+                if let Type::Struct(mid, sid, _) = f {
+                    let struct_env = self.env.get_module(mid).into_struct(sid);
+                    if struct_env.get_abilities().has_key() {
+                        returned.insert(f);
+                    }
+                }
+            }
+        }
+        returned
+    }
+
+    /// Returns iterator over structs in this module.
+    pub fn into_structs(self) -> impl Iterator<Item = StructEnv<'env>> {
+        self.data.struct_data.values().map(move |data| StructEnv {
+            module_env: self.clone(),
+            data,
+        })
+    }
+
+    /// Globalizes a signature local to this module.
+    pub fn globalize_signature(&self, sig: &SignatureToken) -> Type {
+        match sig {
+            SignatureToken::Bool => Type::Primitive(PrimitiveType::Bool),
+            SignatureToken::U8 => Type::Primitive(PrimitiveType::U8),
+            SignatureToken::U16 => Type::Primitive(PrimitiveType::U16),
+            SignatureToken::U32 => Type::Primitive(PrimitiveType::U32),
+            SignatureToken::U64 => Type::Primitive(PrimitiveType::U64),
+            SignatureToken::U128 => Type::Primitive(PrimitiveType::U128),
+            SignatureToken::U256 => Type::Primitive(PrimitiveType::U256),
+            SignatureToken::Address => Type::Primitive(PrimitiveType::Address),
+            SignatureToken::Signer => Type::Primitive(PrimitiveType::Signer),
+            SignatureToken::Reference(t) => {
+                Type::Reference(false, Box::new(self.globalize_signature(t)))
+            }
+            SignatureToken::MutableReference(t) => {
+                Type::Reference(true, Box::new(self.globalize_signature(t)))
+            }
+            SignatureToken::TypeParameter(index) => Type::TypeParameter(*index),
+            SignatureToken::Vector(bt) => Type::Vector(Box::new(self.globalize_signature(bt))),
+            SignatureToken::Struct(handle_idx) => {
+                let struct_view = StructHandleView::new(
+                    &self.data.module,
+                    self.data.module.struct_handle_at(*handle_idx),
+                );
+                let declaring_module_env = self
+                    .env
+                    .find_module(&self.env.to_module_name(&struct_view.module_id()))
+                    .expect("undefined module");
+                let struct_env = declaring_module_env
+                    .find_struct(self.env.symbol_pool.make(struct_view.name().as_str()))
+                    .expect("undefined struct");
+                Type::Struct(declaring_module_env.data.id, struct_env.get_id(), vec![])
+            }
+            SignatureToken::StructInstantiation(handle_idx, args) => {
+                let struct_view = StructHandleView::new(
+                    &self.data.module,
+                    self.data.module.struct_handle_at(*handle_idx),
+                );
+                let declaring_module_env = self
+                    .env
+                    .find_module(&self.env.to_module_name(&struct_view.module_id()))
+                    .expect("undefined module");
+                let struct_env = declaring_module_env
+                    .find_struct(self.env.symbol_pool.make(struct_view.name().as_str()))
+                    .expect("undefined struct");
+                Type::Struct(
+                    declaring_module_env.data.id,
+                    struct_env.get_id(),
+                    self.globalize_signatures(args),
+                )
+            }
+        }
+    }
+
+    /// Globalizes a list of signatures.
+    pub fn globalize_signatures(&self, sigs: &[SignatureToken]) -> Vec<Type> {
+        sigs.iter()
+            .map(|s| self.globalize_signature(s))
+            .collect_vec()
+    }
+
+    /// Gets a list of type actuals associated with the index in the bytecode.
+    pub fn get_type_actuals(&self, idx: Option<SignatureIndex>) -> Vec<Type> {
+        match idx {
+            Some(idx) => {
+                let actuals = &self.data.module.signature_at(idx).0;
+                self.globalize_signatures(actuals)
+            }
+            None => vec![],
+        }
+    }
+
+    /// Retrieve a constant from the pool
+    pub fn get_constant(&self, idx: ConstantPoolIndex) -> &VMConstant {
+        &self.data.module.constant_pool()[idx.0 as usize]
+    }
+
+    /// Converts a constant to the specified type. The type must correspond to the expected
+    /// cannonical representation as defined in `move_core_types::values`
+    pub fn get_constant_value(&self, constant: &VMConstant) -> MoveValue {
+        VMConstant::deserialize_constant(constant).unwrap()
+    }
+
+    /// Return the `AccountAdress` of this module
+    pub fn self_address(&self) -> &AccountAddress {
+        self.data.module.address()
+    }
+
+    /// Retrieve an address identifier from the pool
+    pub fn get_address_identifier(&self, idx: AddressIdentifierIndex) -> BigUint {
+        let addr = &self.data.module.address_identifiers()[idx.0 as usize];
+        crate::addr_to_big_uint(addr)
+    }
+
+    /// Returns specification variables of this module.
+    pub fn get_spec_vars(&'env self) -> impl Iterator<Item = (&'env SpecVarId, &'env SpecVarDecl)> {
+        self.data.spec_vars.iter()
+    }
+
+    /// Gets spec var by id.
+    pub fn get_spec_var(&self, id: SpecVarId) -> &SpecVarDecl {
+        self.data.spec_vars.get(&id).expect("spec var id defined")
+    }
+
+    /// Find spec var by name.
+    pub fn find_spec_var(&self, name: Symbol) -> Option<&SpecVarDecl> {
+        self.data
+            .spec_vars
+            .iter()
+            .find(|(_, svar)| svar.name == name)
+            .map(|(_, svar)| svar)
+    }
+
+    /// Returns specification functions of this module.
+    pub fn get_spec_funs(&'env self) -> impl Iterator<Item = (&'env SpecFunId, &'env SpecFunDecl)> {
+        self.data.spec_funs.iter()
+    }
+
+    /// Gets spec fun by id.
+    pub fn get_spec_fun(&self, id: SpecFunId) -> &SpecFunDecl {
+        self.data.spec_funs.get(&id).expect("spec fun id defined")
+    }
+
+    /// Gets module specification.
+    pub fn get_spec(&self) -> &Spec {
+        &self.data.module_spec
+    }
+
+    /// Returns whether a spec fun is ever called or not.
+    pub fn spec_fun_is_used(&self, spec_fun_id: SpecFunId) -> bool {
+        self.env
+            .used_spec_funs
+            .contains(&self.get_id().qualified(spec_fun_id))
+    }
+
+    /// Get all spec fun overloads with the given name.
+    pub fn get_spec_funs_of_name(
+        &self,
+        name: Symbol,
+    ) -> impl Iterator<Item = (&'env SpecFunId, &'env SpecFunDecl)> {
+        self.data
+            .spec_funs
+            .iter()
+            .filter(move |(_, decl)| decl.name == name)
+    }
+
+    /// Disassemble the module bytecode
+    pub fn disassemble(&self) -> String {
+        let disas = Disassembler::new(
+            SourceMapping::new(
+                self.data.source_map.clone(),
+                BinaryIndexedView::Module(self.get_verified_module()),
+            ),
+            DisassemblerOptions {
+                only_externally_visible: false,
+                print_code: true,
+                print_basic_blocks: true,
+                print_locals: true,
+            },
+        );
+        disas
+            .disassemble()
+            .expect("Failed to disassemble a verified module")
+    }
+
+    /// Return true if the module has any global, module, function, or struct specs
+    pub fn has_specs(&self) -> bool {
+        // module specs
+        if self.get_spec().has_conditions() {
+            return true;
+        }
+        // function specs
+        for f in self.get_functions() {
+            if f.get_spec().has_conditions() || !f.get_spec().on_impl.is_empty() {
+                return true;
+            }
+        }
+        // struct specs
+        for s in self.get_structs() {
+            if s.get_spec().has_conditions() {
+                return true;
+            }
+        }
+        // global specs
+        let global_invariants = self.env.get_global_invariants_by_module(self.get_id());
+        if !global_invariants.is_empty() {
+            return true;
+        }
+        false
+    }
+
+    fn match_module_name(&self, module_name: &str) -> bool {
+        self.get_name()
+            .name()
+            .display(self.env.symbol_pool())
+            .to_string()
+            == module_name
+    }
+
+    fn is_module_in_std(&self, module_name: &str) -> bool {
+        let addr = self.get_name().addr();
+        *addr == self.env.get_stdlib_address() && self.match_module_name(module_name)
+    }
+
+    fn is_module_in_ext(&self, module_name: &str) -> bool {
+        let addr = self.get_name().addr();
+        *addr == self.env.get_extlib_address() && self.match_module_name(module_name)
+    }
+
+    pub fn is_std_vector(&self) -> bool {
+        self.is_module_in_std("vector")
+    }
+
+    pub fn is_table(&self) -> bool {
+        self.is_module_in_std("table")
+            || self.is_module_in_std("table_with_length")
+            || self.is_module_in_ext("table")
+            || self.is_module_in_ext("table_with_length")
+    }
+}
+
+// =================================================================================================
+/// # Struct Environment
+
+#[derive(Debug)]
+pub struct StructData {
+    /// The name of this struct.
+    name: Symbol,
+
+    /// The location of this struct.
+    loc: Loc,
+
+    /// Attributes attached to this structure.
+    attributes: Vec<Attribute>,
+
+    /// List of function argument names. Not in bytecode but obtained from AST.
+    /// Information about this struct.
+    info: StructInfo,
+
+    /// Field definitions.
+    field_data: BTreeMap<FieldId, FieldData>,
+
+    /// Associated specification.
+    spec: Spec,
+}
+
+#[derive(Debug)]
+enum StructInfo {
+    /// Struct is declared in Move and info found in VM format.
+    Declared {
+        /// The definition index of this struct in its module.
+        def_idx: StructDefinitionIndex,
+
+        /// The handle index of this struct in its module.
+        handle_idx: StructHandleIndex,
+    },
+    /// Struct is generated by the prover.
+    Generated { spec_var: SpecVarId },
+}
+
+#[derive(Debug, Clone)]
+pub struct StructEnv<'env> {
+    /// Reference to enclosing module.
+    pub module_env: ModuleEnv<'env>,
+
+    /// Reference to the struct data.
+    data: &'env StructData,
+}
+
+impl<'env> StructEnv<'env> {
+    /// Returns the name of this struct.
+    pub fn get_name(&self) -> Symbol {
+        self.data.name
+    }
+
+    /// Gets full name as string.
+    pub fn get_full_name_str(&self) -> String {
+        format!(
+            "{}::{}",
+            self.module_env.get_name().display(self.symbol_pool()),
+            self.get_name().display(self.symbol_pool())
+        )
+    }
+
+    /// Gets full name with module address as string.
+    pub fn get_full_name_with_address(&self) -> String {
+        format!(
+            "{}::{}",
+            self.module_env.get_full_name_str(),
+            self.get_name().display(self.symbol_pool())
+        )
+    }
+
+    /// Returns the VM identifier for this struct
+    pub fn get_identifier(&self) -> Option<Identifier> {
+        match &self.data.info {
+            StructInfo::Declared { handle_idx, .. } => {
+                let handle = self.module_env.data.module.struct_handle_at(*handle_idx);
+                Some(
+                    self.module_env
+                        .data
+                        .module
+                        .identifier_at(handle.name)
+                        .to_owned(),
+                )
+            }
+            StructInfo::Generated { .. } => None,
+        }
+    }
+
+    /// Shortcut for accessing the symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        self.module_env.symbol_pool()
+    }
+
+    /// Returns the location of this struct.
+    pub fn get_loc(&self) -> Loc {
+        self.data.loc.clone()
+    }
+
+    /// Returns the attributes of this struct.
+    pub fn get_attributes(&self) -> &[Attribute] {
+        &self.data.attributes
+    }
+
+    /// Get documentation associated with this struct.
+    pub fn get_doc(&self) -> &str {
+        self.module_env.env.get_doc(&self.data.loc)
+    }
+
+    /// Returns properties from pragmas.
+    pub fn get_properties(&self) -> &PropertyBag {
+        &self.data.spec.properties
+    }
+
+    /// Gets the id associated with this struct.
+    pub fn get_id(&self) -> StructId {
+        StructId(self.data.name)
+    }
+
+    /// Gets the qualified id of this struct.
+    pub fn get_qualified_id(&self) -> QualifiedId<StructId> {
+        self.module_env.get_id().qualified(self.get_id())
+    }
+
+    /// Determines whether this struct is native.
+    pub fn is_native(&self) -> bool {
+        match &self.data.info {
+            StructInfo::Declared { def_idx, .. } => {
+                let def = self.module_env.data.module.struct_def_at(*def_idx);
+                def.field_information == StructFieldInformation::Native
+            }
+            StructInfo::Generated { .. } => false,
+        }
+    }
+
+    /// Returns true if this struct has the pragma intrinsic set to true.
+    pub fn is_intrinsic(&self) -> bool {
+        self.is_pragma_true(INTRINSIC_PRAGMA, || {
+            self.module_env
+                .env
+                .intrinsics
+                .get_decl_for_struct(&self.get_qualified_id())
+                .is_some()
+        })
+    }
+
+    /// Returns true if this is an intrinsic struct of a given name
+    pub fn is_intrinsic_of(&self, name: &str) -> bool {
+        self.module_env.env.intrinsics.is_intrinsic_of_for_struct(
+            self.symbol_pool(),
+            &self.get_qualified_id(),
+            name,
+        )
+    }
+
+    /// Returns true if this struct is ghost memory for a specification variable.
+    pub fn is_ghost_memory(&self) -> bool {
+        self.symbol_pool()
+            .string(self.data.name)
+            .starts_with(GHOST_MEMORY_PREFIX)
+    }
+
+    /// Get the specification variable associated with this struct if this is ghost memory.
+    pub fn get_ghost_memory_spec_var(&self) -> Option<QualifiedId<SpecVarId>> {
+        if self.is_ghost_memory() {
+            if let StructInfo::Generated { spec_var } = &self.data.info {
+                return Some(self.module_env.get_id().qualified(*spec_var));
+            }
+        }
+        None
+    }
+
+    /// Get the abilities of this struct.
+    pub fn get_abilities(&self) -> AbilitySet {
+        match &self.data.info {
+            StructInfo::Declared { def_idx, .. } => {
+                let def = self.module_env.data.module.struct_def_at(*def_idx);
+                let handle = self
+                    .module_env
+                    .data
+                    .module
+                    .struct_handle_at(def.struct_handle);
+                handle.abilities
+            }
+            StructInfo::Generated { .. } => AbilitySet::ALL,
+        }
+    }
+
+    /// Determines whether memory-related operations needs to be declared for this struct.
+    pub fn has_memory(&self) -> bool {
+        self.get_abilities().has_key()
+    }
+
+    /// Get an iterator for the fields, ordered by offset.
+    pub fn get_fields(&'env self) -> impl Iterator<Item = FieldEnv<'env>> {
+        self.data
+            .field_data
+            .values()
+            .sorted_by_key(|data| data.offset)
+            .map(move |data| FieldEnv {
+                struct_env: self.clone(),
+                data,
+            })
+    }
+
+    /// Return the number of fields in the struct.
+    pub fn get_field_count(&self) -> usize {
+        self.data.field_data.len()
+    }
+
+    /// Gets a field by its id.
+    pub fn get_field(&'env self, id: FieldId) -> FieldEnv<'env> {
+        let data = self.data.field_data.get(&id).expect("FieldId undefined");
+        FieldEnv {
+            struct_env: self.clone(),
+            data,
+        }
+    }
+
+    /// Find a field by its name.
+    pub fn find_field(&'env self, name: Symbol) -> Option<FieldEnv<'env>> {
+        let id = FieldId(name);
+        self.data.field_data.get(&id).map(|data| FieldEnv {
+            struct_env: self.clone(),
+            data,
+        })
+    }
+
+    /// Gets a field by its offset.
+    pub fn get_field_by_offset(&'env self, offset: usize) -> FieldEnv<'env> {
+        for data in self.data.field_data.values() {
+            if data.offset == offset {
+                return FieldEnv {
+                    struct_env: self.clone(),
+                    data,
+                };
+            }
+        }
+        unreachable!("invalid field lookup")
+    }
+
+    /// Whether the type parameter at position `idx` is declared as phantom.
+    pub fn is_phantom_parameter(&self, idx: usize) -> bool {
+        match &self.data.info {
+            StructInfo::Declared { def_idx, .. } => {
+                let def = self.module_env.data.module.struct_def_at(*def_idx);
+                self.module_env
+                    .data
+                    .module
+                    .struct_handle_at(def.struct_handle)
+                    .type_parameters[idx]
+                    .is_phantom
+            }
+            StructInfo::Generated { .. } => false,
+        }
+    }
+
+    /// Returns the type parameters associated with this struct.
+    pub fn get_type_parameters(&self) -> Vec<TypeParameter> {
+        // TODO: we currently do not know the original names of those formals, so we generate them.
+        let pool = &self.module_env.env.symbol_pool;
+        match &self.data.info {
+            StructInfo::Declared { def_idx, .. } => {
+                let view = StructDefinitionView::new(
+                    &self.module_env.data.module,
+                    self.module_env.data.module.struct_def_at(*def_idx),
+                );
+                view.type_parameters()
+                    .iter()
+                    .enumerate()
+                    .map(|(i, k)| {
+                        TypeParameter(
+                            pool.make(&format!("$tv{}", i)),
+                            AbilityConstraint(k.constraints),
+                        )
+                    })
+                    .collect_vec()
+            }
+            StructInfo::Generated { spec_var } => {
+                let var_decl = self.module_env.get_spec_var(*spec_var);
+                var_decl
+                    .type_params
+                    .iter()
+                    .map(|(n, _)| TypeParameter(*n, AbilityConstraint(AbilitySet::ALL)))
+                    .collect()
+            }
+        }
+    }
+
+    /// Returns the type parameters associated with this struct, with actual names.
+    pub fn get_named_type_parameters(&self) -> Vec<TypeParameter> {
+        match &self.data.info {
+            StructInfo::Declared { def_idx, .. } => {
+                let view = StructDefinitionView::new(
+                    &self.module_env.data.module,
+                    self.module_env.data.module.struct_def_at(*def_idx),
+                );
+                view.type_parameters()
+                    .iter()
+                    .enumerate()
+                    .map(|(i, k)| {
+                        let name = self
+                            .module_env
+                            .data
+                            .source_map
+                            .get_struct_source_map(*def_idx)
+                            .ok()
+                            .and_then(|smap| smap.type_parameters.get(i))
+                            .map(|(s, _)| s.clone())
+                            .unwrap_or_else(|| format!("unknown#{}", i));
+                        TypeParameter(
+                            self.module_env.env.symbol_pool.make(&name),
+                            AbilityConstraint(k.constraints),
+                        )
+                    })
+                    .collect_vec()
+            }
+            StructInfo::Generated { .. } => self.get_type_parameters(),
+        }
+    }
+
+    /// Returns true if this struct has specification conditions.
+    pub fn has_conditions(&self) -> bool {
+        !self.data.spec.conditions.is_empty()
+    }
+
+    /// Returns the data invariants associated with this struct.
+    pub fn get_spec(&'env self) -> &'env Spec {
+        &self.data.spec
+    }
+
+    /// Returns the value of a boolean pragma for this struct. This first looks up a
+    /// pragma in this struct, then the enclosing module, and finally uses the provided default.
+    /// value
+    pub fn is_pragma_true(&self, name: &str, default: impl FnOnce() -> bool) -> bool {
+        let env = self.module_env.env;
+        if let Some(b) = env.is_property_true(&self.get_spec().properties, name) {
+            return b;
+        }
+        if let Some(b) = env.is_property_true(&self.module_env.get_spec().properties, name) {
+            return b;
+        }
+        default()
+    }
+
+    /// Returns true if this struct is native or marked as intrinsic.
+    pub fn is_native_or_intrinsic(&self) -> bool {
+        self.is_native() || self.is_intrinsic()
+    }
+}
+
+// =================================================================================================
+/// # Field Environment
+
+#[derive(Debug)]
+pub struct FieldData {
+    /// The name of this field.
+    name: Symbol,
+
+    /// The offset of this field.
+    offset: usize,
+
+    /// More information about this field
+    info: FieldInfo,
+}
+
+#[derive(Debug)]
+enum FieldInfo {
+    /// The field is declared in Move.
+    Declared {
+        /// The struct definition index of this field in its VM module.
+        def_idx: StructDefinitionIndex,
+    },
+    /// The field is generated by the prover.
+    Generated { type_: Type },
+}
+
+#[derive(Debug)]
+pub struct FieldEnv<'env> {
+    /// Reference to enclosing struct.
+    pub struct_env: StructEnv<'env>,
+
+    /// Reference to the field data.
+    data: &'env FieldData,
+}
+
+impl<'env> FieldEnv<'env> {
+    /// Gets the name of this field.
+    pub fn get_name(&self) -> Symbol {
+        self.data.name
+    }
+
+    /// Gets the id of this field.
+    pub fn get_id(&self) -> FieldId {
+        FieldId(self.data.name)
+    }
+
+    /// Returns the VM identifier for this field
+    pub fn get_identifier(&'env self) -> Option<Identifier> {
+        if let FieldInfo::Declared { def_idx } = &self.data.info {
+            let m = &self.struct_env.module_env.data.module;
+            let def = m.struct_def_at(*def_idx);
+            let offset = self.data.offset;
+            Some(
+                FieldDefinitionView::new(m, def.field(offset).expect("Bad field offset"))
+                    .name()
+                    .to_owned(),
+            )
+        } else {
+            None
+        }
+    }
+
+    /// Get documentation associated with this field.
+    pub fn get_doc(&self) -> &str {
+        if let FieldInfo::Declared { def_idx } = &self.data.info {
+            if let Ok(smap) = self
+                .struct_env
+                .module_env
+                .data
+                .source_map
+                .get_struct_source_map(*def_idx)
+            {
+                let loc = self
+                    .struct_env
+                    .module_env
+                    .env
+                    .to_loc(&smap.fields[self.data.offset]);
+                self.struct_env.module_env.env.get_doc(&loc)
+            } else {
+                ""
+            }
+        } else {
+            ""
+        }
+    }
+
+    /// Gets the type of this field.
+    pub fn get_type(&self) -> Type {
+        match &self.data.info {
+            FieldInfo::Declared { def_idx } => {
+                let struct_def = self
+                    .struct_env
+                    .module_env
+                    .data
+                    .module
+                    .struct_def_at(*def_idx);
+                let field = match &struct_def.field_information {
+                    StructFieldInformation::Declared(fields) => &fields[self.data.offset],
+                    StructFieldInformation::Native => unreachable!(),
+                };
+                self.struct_env
+                    .module_env
+                    .globalize_signature(&field.signature.0)
+            }
+            FieldInfo::Generated { type_ } => type_.clone(),
+        }
+    }
+
+    /// Get field offset.
+    pub fn get_offset(&self) -> usize {
+        self.data.offset
+    }
+}
+
+// =================================================================================================
+/// # Named Constant Environment
+
+#[derive(Debug)]
+pub struct NamedConstantData {
+    /// The name of this constant
+    name: Symbol,
+
+    /// The location of this constant
+    loc: Loc,
+
+    /// The type of this constant
+    typ: Type,
+
+    /// The value of this constant
+    value: Value,
+}
+
+#[derive(Debug)]
+pub struct NamedConstantEnv<'env> {
+    /// Reference to enclosing module.
+    pub module_env: ModuleEnv<'env>,
+
+    data: &'env NamedConstantData,
+}
+
+impl<'env> NamedConstantEnv<'env> {
+    /// Returns the name of this constant
+    pub fn get_name(&self) -> Symbol {
+        self.data.name
+    }
+
+    /// Returns the id of this constant
+    pub fn get_id(&self) -> NamedConstantId {
+        NamedConstantId(self.data.name)
+    }
+
+    /// Returns documentation associated with this constant
+    pub fn get_doc(&self) -> &str {
+        self.module_env.env.get_doc(&self.data.loc)
+    }
+
+    /// Returns the location of this constant
+    pub fn get_loc(&self) -> Loc {
+        self.data.loc.clone()
+    }
+
+    /// Returns the type of the constant
+    pub fn get_type(&self) -> Type {
+        self.data.typ.clone()
+    }
+
+    /// Returns the value of this constant
+    pub fn get_value(&self) -> Value {
+        self.data.value.clone()
+    }
+}
+
+// =================================================================================================
+/// # Function Environment
+
+/// Represents a type parameter.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct TypeParameter(pub Symbol, pub AbilityConstraint);
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AbilityConstraint(pub AbilitySet);
+
+/// Represents a parameter.
+#[derive(Debug, Clone)]
+pub struct Parameter(pub Symbol, pub Type);
+
+#[derive(Debug)]
+pub struct FunctionData {
+    /// Name of this function.
+    name: Symbol,
+
+    /// Location of this function.
+    loc: Loc,
+
+    /// The definition index of this function in its module.
+    def_idx: FunctionDefinitionIndex,
+
+    /// The handle index of this function in its module.
+    handle_idx: FunctionHandleIndex,
+
+    /// Attributes attached to this function.
+    attributes: Vec<Attribute>,
+
+    /// List of function argument names. Not in bytecode but obtained from AST.
+    arg_names: Vec<Symbol>,
+
+    /// List of type argument names. Not in bytecode but obtained from AST.
+    #[allow(unused)]
+    type_arg_names: Vec<Symbol>,
+
+    /// Specification associated with this function.
+    spec: Spec,
+
+    /// A cache for the called functions.
+    called_funs: RefCell<Option<BTreeSet<QualifiedId<FunId>>>>,
+
+    /// A cache for the calling functions.
+    calling_funs: RefCell<Option<BTreeSet<QualifiedId<FunId>>>>,
+
+    /// A cache for the transitive closure of the called functions.
+    transitive_closure_of_called_funs: RefCell<Option<BTreeSet<QualifiedId<FunId>>>>,
+}
+
+impl FunctionData {
+    pub fn stub(
+        name: Symbol,
+        def_idx: FunctionDefinitionIndex,
+        handle_idx: FunctionHandleIndex,
+    ) -> Self {
+        FunctionData {
+            name,
+            loc: Loc::default(),
+            attributes: Vec::default(),
+            def_idx,
+            handle_idx,
+            arg_names: vec![],
+            type_arg_names: vec![],
+            spec: Spec::default(),
+            called_funs: Default::default(),
+            calling_funs: Default::default(),
+            transitive_closure_of_called_funs: Default::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct FunctionEnv<'env> {
+    /// Reference to enclosing module.
+    pub module_env: ModuleEnv<'env>,
+
+    /// Reference to the function data.
+    data: &'env FunctionData,
+}
+
+impl<'env> FunctionEnv<'env> {
+    /// Returns the name of this function.
+    pub fn get_name(&self) -> Symbol {
+        self.data.name
+    }
+
+    /// Gets full name as string.
+    pub fn get_full_name_str(&self) -> String {
+        format!(
+            "{}::{}",
+            self.module_env.get_name().display(self.symbol_pool()),
+            self.get_name_str()
+        )
+    }
+
+    pub fn get_name_str(&self) -> String {
+        self.get_name().display(self.symbol_pool()).to_string()
+    }
+
+    /// Returns the VM identifier for this function
+    pub fn get_identifier(&'env self) -> Identifier {
+        let m = &self.module_env.data.module;
+        m.identifier_at(m.function_handle_at(self.data.handle_idx).name)
+            .to_owned()
+    }
+
+    /// Gets the id of this function.
+    pub fn get_id(&self) -> FunId {
+        FunId(self.data.name)
+    }
+
+    /// Gets the qualified id of this function.
+    pub fn get_qualified_id(&self) -> QualifiedId<FunId> {
+        self.module_env.get_id().qualified(self.get_id())
+    }
+
+    /// Get documentation associated with this function.
+    pub fn get_doc(&self) -> &str {
+        self.module_env.env.get_doc(&self.data.loc)
+    }
+
+    /// Gets the definition index of this function.
+    pub fn get_def_idx(&self) -> FunctionDefinitionIndex {
+        self.data.def_idx
+    }
+
+    /// Shortcut for accessing the symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        self.module_env.symbol_pool()
+    }
+
+    /// Returns the location of this function.
+    pub fn get_loc(&self) -> Loc {
+        self.data.loc.clone()
+    }
+
+    /// Returns the attributes of this function.
+    pub fn get_attributes(&self) -> &[Attribute] {
+        &self.data.attributes
+    }
+
+    /// Returns the location of the specification block of this function. If the function has
+    /// none, returns that of the function itself.
+    pub fn get_spec_loc(&self) -> Loc {
+        if let Some(loc) = &self.data.spec.loc {
+            loc.clone()
+        } else {
+            self.get_loc()
+        }
+    }
+
+    /// Returns the location of the bytecode at the given offset.
+    pub fn get_bytecode_loc(&self, offset: u16) -> Loc {
+        if let Ok(fmap) = self
+            .module_env
+            .data
+            .source_map
+            .get_function_source_map(self.data.def_idx)
+        {
+            if let Some(loc) = fmap.get_code_location(offset) {
+                return self.module_env.env.to_loc(&loc);
+            }
+        }
+        self.get_loc()
+    }
+
+    /// Returns the bytecode associated with this function.
+    pub fn get_bytecode(&self) -> &[Bytecode] {
+        let function_definition = self
+            .module_env
+            .data
+            .module
+            .function_def_at(self.get_def_idx());
+        let function_definition_view =
+            FunctionDefinitionView::new(&self.module_env.data.module, function_definition);
+        match function_definition_view.code() {
+            Some(code) => &code.code,
+            None => &[],
+        }
+    }
+
+    /// Returns the value of a boolean pragma for this function. This first looks up a
+    /// pragma in this function, then the enclosing module, and finally uses the provided default.
+    /// value
+    pub fn is_pragma_true(&self, name: &str, default: impl FnOnce() -> bool) -> bool {
+        let env = self.module_env.env;
+        if let Some(b) = env.is_property_true(&self.get_spec().properties, name) {
+            return b;
+        }
+        if let Some(b) = env.is_property_true(&self.module_env.get_spec().properties, name) {
+            return b;
+        }
+        default()
+    }
+
+    /// Returns true if the value of a boolean pragma for this function is false.
+    pub fn is_pragma_false(&self, name: &str) -> bool {
+        let env = self.module_env.env;
+        if let Some(b) = env.is_property_true(&self.get_spec().properties, name) {
+            return !b;
+        }
+        if let Some(b) = env.is_property_true(&self.module_env.get_spec().properties, name) {
+            return !b;
+        }
+        false
+    }
+
+    /// Returns whether the value of a numeric pragma is explicitly set for this function.
+    pub fn is_num_pragma_set(&self, name: &str) -> bool {
+        let env = self.module_env.env;
+        env.get_num_property(&self.get_spec().properties, name)
+            .is_some()
+            || env
+                .get_num_property(&self.module_env.get_spec().properties, name)
+                .is_some()
+    }
+
+    /// Returns the value of a numeric pragma for this function. This first looks up a
+    /// pragma in this function, then the enclosing module, and finally uses the provided default.
+    /// value
+    pub fn get_num_pragma(&self, name: &str, default: impl FnOnce() -> usize) -> usize {
+        let env = self.module_env.env;
+        if let Some(n) = env.get_num_property(&self.get_spec().properties, name) {
+            return n;
+        }
+        if let Some(n) = env.get_num_property(&self.module_env.get_spec().properties, name) {
+            return n;
+        }
+        default()
+    }
+
+    /// Returns the value of a pragma representing an identifier for this function.
+    /// If such pragma is not specified for this function, None is returned.
+    pub fn get_ident_pragma(&self, name: &str) -> Option<Rc<String>> {
+        let sym = &self.symbol_pool().make(name);
+        match self.get_spec().properties.get(sym) {
+            Some(PropertyValue::Symbol(sym)) => Some(self.symbol_pool().string(*sym)),
+            Some(PropertyValue::QualifiedSymbol(qsym)) => {
+                let module_name = qsym.module_name.display(self.symbol_pool());
+                Some(Rc::from(format!(
+                    "{}::{}",
+                    module_name,
+                    self.symbol_pool().string(qsym.symbol)
+                )))
+            }
+            _ => None,
+        }
+    }
+
+    /// Returns the FunctionEnv of the function identified by the pragma, if the pragma
+    /// exists and its value represents a function in the system.
+    pub fn get_func_env_from_pragma(&self, name: &str) -> Option<FunctionEnv<'env>> {
+        let sym = &self.symbol_pool().make(name);
+        match self.get_spec().properties.get(sym) {
+            Some(PropertyValue::Symbol(sym)) => self.module_env.find_function(*sym),
+            Some(PropertyValue::QualifiedSymbol(qsym)) => {
+                if let Some(module_env) = self.module_env.env.find_module(&qsym.module_name) {
+                    module_env.find_function(qsym.symbol)
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        }
+    }
+
+    /// Returns true if this function is native.
+    pub fn is_native(&self) -> bool {
+        let view = self.definition_view();
+        view.is_native()
+    }
+
+    /// Returns true if this function has the pragma intrinsic set to true.
+    pub fn is_intrinsic(&self) -> bool {
+        self.is_pragma_true(INTRINSIC_PRAGMA, || {
+            self.module_env
+                .env
+                .intrinsics
+                .get_decl_for_move_fun(&self.get_qualified_id())
+                .is_some()
+        })
+    }
+
+    /// Returns true if function is either native or intrinsic.
+    pub fn is_native_or_intrinsic(&self) -> bool {
+        self.is_native() || self.is_intrinsic()
+    }
+
+    /// Returns true if this is an intrinsic struct of a given name
+    pub fn is_intrinsic_of(&self, name: &str) -> bool {
+        self.module_env.env.intrinsics.is_intrinsic_of_for_move_fun(
+            self.symbol_pool(),
+            &self.get_qualified_id(),
+            name,
+        )
+    }
+
+    /// Returns true if this is the well-known native or intrinsic function of the given name.
+    /// The function must reside either in stdlib or extlib address domain.
+    pub fn is_well_known(&self, name: &str) -> bool {
+        let env = self.module_env.env;
+        if !self.is_native_or_intrinsic() {
+            return false;
+        }
+        let addr = self.module_env.get_name().addr();
+        (addr == &env.get_stdlib_address() || addr == &env.get_extlib_address())
+            && self.get_full_name_str() == name
+    }
+
+    /// Returns true if this function is opaque.
+    pub fn is_opaque(&self) -> bool {
+        self.is_pragma_true(OPAQUE_PRAGMA, || false)
+    }
+
+    /// Return the visibility of this function
+    pub fn visibility(&self) -> FunctionVisibility {
+        self.definition_view().visibility()
+    }
+
+    /// Return true if the function is an entry fucntion
+    pub fn is_entry(&self) -> bool {
+        self.definition_view().is_entry()
+    }
+
+    /// Return the visibility string for this function. Useful for formatted printing.
+    pub fn visibility_str(&self) -> &str {
+        match self.visibility() {
+            Visibility::Public => "public ",
+            Visibility::Friend => "public(friend) ",
+            Visibility::Private => "",
+        }
+    }
+
+    /// Return whether this function is exposed outside of the module.
+    pub fn is_exposed(&self) -> bool {
+        self.module_env.is_script_module()
+            || self.definition_view().is_entry()
+            || match self.definition_view().visibility() {
+                Visibility::Public | Visibility::Friend => true,
+                Visibility::Private => false,
+            }
+    }
+
+    /// Return whether this function is exposed outside of the module.
+    pub fn has_unknown_callers(&self) -> bool {
+        self.module_env.is_script_module()
+            || self.definition_view().is_entry()
+            || match self.definition_view().visibility() {
+                Visibility::Public => true,
+                Visibility::Private | Visibility::Friend => false,
+            }
+    }
+
+    /// Returns true if the function is a script function
+    pub fn is_script(&self) -> bool {
+        // The main function of a scipt is a script function
+        self.module_env.is_script_module() || self.definition_view().is_entry()
+    }
+
+    /// Return true if this function is a friend function
+    pub fn is_friend(&self) -> bool {
+        self.definition_view().visibility() == Visibility::Friend
+    }
+
+    /// Returns true if invariants are declared disabled in body of function
+    pub fn are_invariants_disabled_in_body(&self) -> bool {
+        self.is_pragma_true(DISABLE_INVARIANTS_IN_BODY_PRAGMA, || false)
+    }
+
+    /// Returns true if invariants are declared disabled in body of function
+    pub fn are_invariants_disabled_at_call(&self) -> bool {
+        self.is_pragma_true(DELEGATE_INVARIANTS_TO_CALLER_PRAGMA, || false)
+    }
+
+    /// Returns true if this function mutates any references (i.e. has &mut parameters).
+    pub fn is_mutating(&self) -> bool {
+        self.get_parameters()
+            .iter()
+            .any(|Parameter(_, ty)| ty.is_mutable_reference())
+    }
+
+    /// Returns the name of the friend(the only allowed caller) of this function, if there is one.
+    pub fn get_friend_name(&self) -> Option<Rc<String>> {
+        self.get_ident_pragma(FRIEND_PRAGMA)
+    }
+
+    /// Returns true if a friend is specified for this function.
+    pub fn has_friend(&self) -> bool {
+        self.get_friend_name().is_some()
+    }
+
+    /// Returns the FunctionEnv of the friend function if the friend is specified
+    /// and the friend was compiled into the environment.
+    pub fn get_friend_env(&self) -> Option<FunctionEnv<'env>> {
+        self.get_func_env_from_pragma(FRIEND_PRAGMA)
+    }
+
+    /// Returns the FunctionEnv of the transitive friend of the function.
+    /// For example, if `f` has a friend `g` and `g` has a friend `h`, then
+    /// `f`'s transitive friend is `h`.
+    /// If a friend is not specified then the function itself is returned.
+    pub fn get_transitive_friend(&self) -> FunctionEnv<'env> {
+        if let Some(friend_env) = self.get_friend_env() {
+            return friend_env.get_transitive_friend();
+        }
+        self.clone()
+    }
+
+    /// Returns the type parameters associated with this function.
+    pub fn get_type_parameters(&self) -> Vec<TypeParameter> {
+        // TODO: currently the translation scheme isn't working with using real type
+        //   parameter names, so use indices instead.
+        let view = self.definition_view();
+        view.type_parameters()
+            .iter()
+            .enumerate()
+            .map(|(i, k)| {
+                TypeParameter(
+                    self.module_env.env.symbol_pool.make(&format!("$tv{}", i)),
+                    AbilityConstraint(*k),
+                )
+            })
+            .collect_vec()
+    }
+
+    /// Returns the type parameters with the real names.
+    pub fn get_named_type_parameters(&self) -> Vec<TypeParameter> {
+        let view = self.definition_view();
+        view.type_parameters()
+            .iter()
+            .enumerate()
+            .map(|(i, k)| {
+                let name = self
+                    .module_env
+                    .data
+                    .source_map
+                    .get_function_source_map(self.data.def_idx)
+                    .ok()
+                    .and_then(|fmap| fmap.type_parameters.get(i))
+                    .map(|(s, _)| s.clone())
+                    .unwrap_or_else(|| format!("unknown#{}", i));
+                TypeParameter(
+                    self.module_env.env.symbol_pool.make(&name),
+                    AbilityConstraint(*k),
+                )
+            })
+            .collect_vec()
+    }
+
+    pub fn get_parameter_count(&self) -> usize {
+        let view = self.definition_view();
+        view.arg_tokens().count()
+    }
+
+    /// Return the number of type parameters for self
+    pub fn get_type_parameter_count(&self) -> usize {
+        let view = self.definition_view();
+        view.type_parameters().len()
+    }
+
+    /// Return `true` if idx is a formal parameter index
+    pub fn is_parameter(&self, idx: usize) -> bool {
+        idx < self.get_parameter_count()
+    }
+
+    /// Return true if this is a named parameter of this function.
+    pub fn is_named_parameter(&self, name: &str) -> bool {
+        self.get_parameters()
+            .iter()
+            .any(|p| self.symbol_pool().string(p.0).as_ref() == name)
+    }
+
+    /// Returns the parameter types associated with this function
+    pub fn get_parameter_types(&self) -> Vec<Type> {
+        let view = self.definition_view();
+        view.arg_tokens()
+            .map(|tv: SignatureTokenView<CompiledModule>| {
+                self.module_env.globalize_signature(tv.signature_token())
+            })
+            .collect()
+    }
+
+    /// Returns the regular parameters associated with this function.
+    pub fn get_parameters(&self) -> Vec<Parameter> {
+        let view = self.definition_view();
+        view.arg_tokens()
+            .map(|tv: SignatureTokenView<CompiledModule>| {
+                self.module_env.globalize_signature(tv.signature_token())
+            })
+            .zip(self.data.arg_names.iter())
+            .map(|(s, i)| Parameter(*i, s))
+            .collect_vec()
+    }
+
+    /// Returns return types of this function.
+    pub fn get_return_types(&self) -> Vec<Type> {
+        let view = self.definition_view();
+        view.return_tokens()
+            .map(|tv: SignatureTokenView<CompiledModule>| {
+                self.module_env.globalize_signature(tv.signature_token())
+            })
+            .collect_vec()
+    }
+
+    /// Returns return type at given index.
+    pub fn get_return_type(&self, idx: usize) -> Type {
+        self.get_return_types()[idx].clone()
+    }
+
+    /// Returns the number of return values of this function.
+    pub fn get_return_count(&self) -> usize {
+        let view = self.definition_view();
+        view.return_count()
+    }
+
+    /// Get the name to be used for a local. If the local is an argument, use that for naming,
+    /// otherwise generate a unique name.
+    pub fn get_local_name(&self, idx: usize) -> Symbol {
+        if idx < self.data.arg_names.len() {
+            return self.data.arg_names[idx];
+        }
+        // Try to obtain name from source map.
+        if let Ok(fmap) = self
+            .module_env
+            .data
+            .source_map
+            .get_function_source_map(self.data.def_idx)
+        {
+            if let Some((ident, _)) = fmap.get_parameter_or_local_name(idx as u64) {
+                // The Move compiler produces temporary names of the form `<foo>%#<num>`,
+                // where <num> seems to be generated non-deterministically.
+                // Substitute this by a deterministic name which the backend accepts.
+                let clean_ident = if ident.contains("%#") {
+                    format!("tmp#${}", idx)
+                } else {
+                    ident
+                };
+                return self.module_env.env.symbol_pool.make(clean_ident.as_str());
+            }
+        }
+        self.module_env.env.symbol_pool.make(&format!("$t{}", idx))
+    }
+
+    /// Returns true if the index is for a temporary, not user declared local.
+    pub fn is_temporary(&self, idx: usize) -> bool {
+        if idx >= self.get_local_count() {
+            return true;
+        }
+        let name = self.get_local_name(idx);
+        self.symbol_pool().string(name).contains("tmp#$")
+    }
+
+    /// Gets the number of proper locals of this function. Those are locals which are declared
+    /// by the user and also have a user assigned name which can be discovered via `get_local_name`.
+    /// Note we may have more anonymous locals generated e.g by the 'stackless' transformation.
+    pub fn get_local_count(&self) -> usize {
+        let view = self.definition_view();
+        match view.locals_signature() {
+            Some(locals_view) => locals_view.len(),
+            None => view.parameters().len(),
+        }
+    }
+
+    /// Gets the type of the local at index. This must use an index in the range as determined by
+    /// `get_local_count`.
+    pub fn get_local_type(&self, idx: usize) -> Type {
+        let view = self.definition_view();
+        let parameters = view.parameters();
+
+        if idx < parameters.len() {
+            self.module_env.globalize_signature(&parameters.0[idx])
+        } else {
+            self.module_env.globalize_signature(
+                view.locals_signature()
+                    .unwrap()
+                    .token_at(idx as u8)
+                    .signature_token(),
+            )
+        }
+    }
+
+    /// Returns associated specification.
+    pub fn get_spec(&'env self) -> &'env Spec {
+        &self.data.spec
+    }
+
+    /// Returns the acquired global resource types.
+    pub fn get_acquires_global_resources(&'env self) -> Vec<StructId> {
+        let function_definition = self
+            .module_env
+            .data
+            .module
+            .function_def_at(self.get_def_idx());
+        function_definition
+            .acquires_global_resources
+            .iter()
+            .map(|x| self.module_env.get_struct_id(*x))
+            .collect()
+    }
+
+    /// Computes the modified targets of the spec clause, as a map from resource type names to
+    /// resource indices (list of types and address).
+    pub fn get_modify_targets(&self) -> BTreeMap<QualifiedId<StructId>, Vec<Exp>> {
+        // Compute the modify targets from `modifies` conditions.
+        let modify_conditions = self.get_spec().filter_kind(ConditionKind::Modifies);
+        let mut modify_targets: BTreeMap<QualifiedId<StructId>, Vec<Exp>> = BTreeMap::new();
+        for cond in modify_conditions {
+            cond.all_exps().for_each(|target| {
+                let node_id = target.node_id();
+                let rty = &self.module_env.env.get_node_instantiation(node_id)[0];
+                let (mid, sid, _) = rty.require_struct();
+                let type_name = mid.qualified(sid);
+                modify_targets
+                    .entry(type_name)
+                    .or_default()
+                    .push(target.clone());
+            });
+        }
+        modify_targets
+    }
+
+    /// Determine whether the function is target of verification.
+    pub fn should_verify(&self, default_scope: &VerificationScope) -> bool {
+        if let VerificationScope::Only(function_name) = default_scope {
+            // Overrides pragmas.
+            return self.matches_name(function_name);
+        }
+        if !self.module_env.is_target() {
+            // Don't generate verify method for functions from dependencies.
+            return false;
+        }
+
+        // We look up the `verify` pragma property first in this function, then in
+        // the module, and finally fall back to the value specified by default_scope.
+        let default = || match default_scope {
+            // By using `is_exposed`, we essentially mark all of Public, Script, Friend to be
+            // in the verification scope because they are "exposed" functions in this module.
+            // We may want to change `VerificationScope::Public` to `VerificationScope::Exposed` as
+            // well for consistency.
+            VerificationScope::Public => self.is_exposed(),
+            VerificationScope::All => true,
+            VerificationScope::Only(_) => unreachable!(),
+            VerificationScope::OnlyModule(module_name) => self.module_env.matches_name(module_name),
+            VerificationScope::None => false,
+        };
+        self.is_pragma_true(VERIFY_PRAGMA, default)
+    }
+
+    /// Returns true if either the name or simple name of this function matches the given string
+    pub fn matches_name(&self, name: &str) -> bool {
+        name.eq(&*self.get_simple_name_string()) || name.eq(&*self.get_name_string())
+    }
+
+    /// Determine whether this function is explicitly deactivated for verification.
+    pub fn is_explicitly_not_verified(&self, scope: &VerificationScope) -> bool {
+        !matches!(scope, VerificationScope::Only(..)) && self.is_pragma_false(VERIFY_PRAGMA)
+    }
+
+    /// Get the functions that call this one
+    pub fn get_calling_functions(&self) -> BTreeSet<QualifiedId<FunId>> {
+        if let Some(calling) = &*self.data.calling_funs.borrow() {
+            return calling.clone();
+        }
+        let mut set: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+        for module_env in self.module_env.env.get_modules() {
+            for fun_env in module_env.get_functions() {
+                if fun_env
+                    .get_called_functions()
+                    .contains(&self.get_qualified_id())
+                {
+                    set.insert(fun_env.get_qualified_id());
+                }
+            }
+        }
+        *self.data.calling_funs.borrow_mut() = Some(set.clone());
+        set
+    }
+
+    /// Get the functions that this one calls
+    pub fn get_called_functions(&self) -> BTreeSet<QualifiedId<FunId>> {
+        if let Some(called) = &*self.data.called_funs.borrow() {
+            return called.clone();
+        }
+        let called: BTreeSet<_> = self
+            .get_bytecode()
+            .iter()
+            .filter_map(|c| {
+                if let Bytecode::Call(i) = c {
+                    Some(self.module_env.get_used_function(*i).get_qualified_id())
+                } else if let Bytecode::CallGeneric(i) = c {
+                    let handle_idx = self
+                        .module_env
+                        .data
+                        .module
+                        .function_instantiation_at(*i)
+                        .handle;
+                    Some(
+                        self.module_env
+                            .get_used_function(handle_idx)
+                            .get_qualified_id(),
+                    )
+                } else {
+                    None
+                }
+            })
+            .collect();
+        *self.data.called_funs.borrow_mut() = Some(called.clone());
+        called
+    }
+
+    /// Get the transitive closure of the called functions
+    pub fn get_transitive_closure_of_called_functions(&self) -> BTreeSet<QualifiedId<FunId>> {
+        if let Some(trans_called) = &*self.data.transitive_closure_of_called_funs.borrow() {
+            return trans_called.clone();
+        }
+
+        let mut set = BTreeSet::new();
+        let mut reachable_funcs = VecDeque::new();
+        reachable_funcs.push_back(self.clone());
+
+        // BFS in reachable_funcs to collect all reachable functions
+        while !reachable_funcs.is_empty() {
+            let current_fnc = reachable_funcs.pop_front();
+            if let Some(fnc) = current_fnc {
+                for callee in fnc.get_called_functions() {
+                    let f = self.module_env.env.get_function(callee);
+                    let qualified_id = f.get_qualified_id();
+                    if !set.contains(&qualified_id) {
+                        set.insert(qualified_id);
+                        reachable_funcs.push_back(f.clone());
+                    }
+                }
+            }
+        }
+        *self.data.transitive_closure_of_called_funs.borrow_mut() = Some(set.clone());
+        set
+    }
+
+    /// Returns the function name excluding the address and the module name
+    pub fn get_simple_name_string(&self) -> Rc<String> {
+        self.symbol_pool().string(self.get_name())
+    }
+
+    /// Returns the function name with the module name excluding the address
+    pub fn get_name_string(&self) -> Rc<str> {
+        if self.module_env.is_script_module() {
+            Rc::from(format!("Script::{}", self.get_simple_name_string()))
+        } else {
+            let module_name = self
+                .module_env
+                .get_name()
+                .display(self.module_env.symbol_pool());
+            Rc::from(format!(
+                "{}::{}",
+                module_name,
+                self.get_simple_name_string()
+            ))
+        }
+    }
+
+    fn definition_view(&'env self) -> FunctionDefinitionView<'env, CompiledModule> {
+        FunctionDefinitionView::new(
+            &self.module_env.data.module,
+            self.module_env
+                .data
+                .module
+                .function_def_at(self.data.def_idx),
+        )
+    }
+
+    /// Produce a TypeDisplayContext to print types within the scope of this env
+    pub fn get_type_display_ctx(&self) -> TypeDisplayContext {
+        let type_param_names = self
+            .get_type_parameters()
+            .iter()
+            .map(|param| param.0)
+            .collect();
+        TypeDisplayContext::WithEnv {
+            env: self.module_env.env,
+            type_param_names: Some(type_param_names),
+        }
+    }
+
+    /// Returns the object types that may be shared by this function
+    /// If `transitive` is false, only return objects directly shared by this function
+    /// If `transitive` is true, return objects shared by both this function and its transitive callees
+    pub fn get_shared_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut shared = BTreeSet::new();
+        if transitive {
+            let callees = self.get_transitive_closure_of_called_functions();
+            for callee in callees {
+                let fenv = self.module_env.env.get_function(callee);
+                shared.extend(fenv.get_shared_objects(false));
+            }
+        } else {
+            let module = &self.module_env.data.module;
+            for b in self.get_bytecode() {
+                if let Bytecode::CallGeneric(fi_idx) = b {
+                    let FunctionInstantiation {
+                        handle,
+                        type_parameters,
+                    } = module.function_instantiation_at(*fi_idx);
+                    let f_ref = FunctionRef::from_idx(module, handle);
+                    if is_framework_function(
+                        &f_ref,
+                        "transfer",
+                        vec!["share_object", "public_share_object"],
+                    ) {
+                        let type_params = module.signature_at(*type_parameters);
+                        shared.insert(self.module_env.globalize_signature(&type_params.0[0]));
+                    }
+                }
+            }
+        }
+
+        shared
+    }
+
+    /// Returns the object types that may be transferred by this function
+    /// If `transitive` is false, only objects directly transferred by this function
+    /// If `transitive` is true, return objects transferred by both this function and its transitive callees
+    pub fn get_transferred_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut transferred = BTreeSet::new();
+        if transitive {
+            let callees = self.get_transitive_closure_of_called_functions();
+            for callee in callees {
+                let fenv = self.module_env.env.get_function(callee);
+                transferred.extend(fenv.get_shared_objects(false));
+            }
+        } else {
+            let module = &self.module_env.data.module;
+            for b in self.get_bytecode() {
+                if let Bytecode::CallGeneric(fi_idx) = b {
+                    let FunctionInstantiation {
+                        handle,
+                        type_parameters,
+                    } = module.function_instantiation_at(*fi_idx);
+                    let f_ref = FunctionRef::from_idx(module, handle);
+                    if is_framework_function(
+                        &f_ref,
+                        "transfer",
+                        vec!["transfer", "public_transfer"],
+                    ) {
+                        let type_params = module.signature_at(*type_parameters);
+                        transferred.insert(self.module_env.globalize_signature(&type_params.0[0]));
+                    }
+                }
+            }
+        }
+
+        transferred
+    }
+
+    /// Returns the object types that may be frozen by this function
+    /// If `transitive` is false, only return objects directly frozen by this function
+    /// If `transitive` is true, return objects frozen by both this function and its transitive callees
+    pub fn get_frozen_objects(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut frozen = BTreeSet::new();
+        if transitive {
+            let callees = self.get_transitive_closure_of_called_functions();
+            for callee in callees {
+                let fenv = self.module_env.env.get_function(callee);
+                frozen.extend(fenv.get_shared_objects(false));
+            }
+        } else {
+            let module = &self.module_env.data.module;
+            for b in self.get_bytecode() {
+                if let Bytecode::CallGeneric(fi_idx) = b {
+                    let FunctionInstantiation {
+                        handle,
+                        type_parameters,
+                    } = module.function_instantiation_at(*fi_idx);
+                    let f_ref = FunctionRef::from_idx(module, handle);
+                    if is_framework_function(
+                        &f_ref,
+                        "transfer",
+                        vec!["freeze_object", "public_freeze_object"],
+                    ) {
+                        let type_params = module.signature_at(*type_parameters);
+                        frozen.insert(self.module_env.globalize_signature(&type_params.0[0]));
+                    }
+                }
+            }
+        }
+
+        frozen
+    }
+
+    /// Returns the event types that may be emitted by this function
+    /// If `transitive` is false, only return events directly emitted by this function
+    /// If `transitive` is true, return events emitted by both this function and its transitive callees
+    pub fn get_events(&'env self, transitive: bool) -> BTreeSet<Type> {
+        let mut events = BTreeSet::new();
+        if transitive {
+            let callees = self.get_transitive_closure_of_called_functions();
+            for callee in callees {
+                let fenv = self.module_env.env.get_function(callee);
+                events.extend(fenv.get_events(false));
+            }
+        } else {
+            let module = &self.module_env.data.module;
+            for b in self.get_bytecode() {
+                if let Bytecode::CallGeneric(fi_idx) = b {
+                    let FunctionInstantiation {
+                        handle,
+                        type_parameters,
+                    } = module.function_instantiation_at(*fi_idx);
+                    let f_ref = FunctionRef::from_idx(module, handle);
+                    if is_framework_function(&f_ref, "event", vec!["emit"]) {
+                        let type_params = module.signature_at(*type_parameters);
+                        events.insert(self.module_env.globalize_signature(&type_params.0[0]));
+                    }
+                }
+            }
+        }
+
+        events
+    }
+}
+
+// =================================================================================================
+/// # Expression Environment
+
+/// Represents context for an expression.
+#[derive(Debug, Clone)]
+pub struct ExpInfo {
+    /// The associated location of this expression.
+    loc: Loc,
+    /// The type of this expression.
+    ty: Type,
+    /// The associated instantiation of type parameters for this expression, if applicable
+    instantiation: Option<Vec<Type>>,
+}
+
+impl ExpInfo {
+    pub fn new(loc: Loc, ty: Type) -> Self {
+        ExpInfo {
+            loc,
+            ty,
+            instantiation: None,
+        }
+    }
+}
+
+// =================================================================================================
+/// # Formatting
+
+pub struct LocDisplay<'env> {
+    loc: &'env Loc,
+    env: &'env GlobalEnv,
+    only_line: bool,
+}
+
+impl Loc {
+    pub fn display<'env>(&'env self, env: &'env GlobalEnv) -> LocDisplay<'env> {
+        LocDisplay {
+            loc: self,
+            env,
+            only_line: false,
+        }
+    }
+
+    pub fn display_line_only<'env>(&'env self, env: &'env GlobalEnv) -> LocDisplay<'env> {
+        LocDisplay {
+            loc: self,
+            env,
+            only_line: true,
+        }
+    }
+}
+
+impl<'env> fmt::Display for LocDisplay<'env> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Some((fname, pos)) = self.env.get_file_and_location(self.loc) {
+            if self.only_line {
+                write!(f, "at {}:{}", fname, pos.line + LineOffset(1))
+            } else {
+                let offset = self.loc.span.end() - self.loc.span.start();
+                write!(
+                    f,
+                    "at {}:{}:{}+{}",
+                    fname,
+                    pos.line + LineOffset(1),
+                    pos.column + ColumnOffset(1),
+                    offset,
+                )
+            }
+        } else {
+            write!(f, "{:?}", self.loc)
+        }
+    }
+}
+
+pub trait GetNameString {
+    fn get_name_for_display(&self, env: &GlobalEnv) -> String;
+}
+
+impl GetNameString for QualifiedId<StructId> {
+    fn get_name_for_display(&self, env: &GlobalEnv) -> String {
+        env.get_struct_qid(*self).get_full_name_str()
+    }
+}
+
+impl GetNameString for QualifiedId<FunId> {
+    fn get_name_for_display(&self, env: &GlobalEnv) -> String {
+        env.get_function_qid(*self).get_full_name_str()
+    }
+}
+
+impl<'a, Id: Clone> fmt::Display for EnvDisplay<'a, QualifiedId<Id>>
+where
+    QualifiedId<Id>: GetNameString,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.write_str(&self.val.get_name_for_display(self.env))
+    }
+}
+
+impl<'a, Id: Clone> fmt::Display for EnvDisplay<'a, QualifiedInstId<Id>>
+where
+    QualifiedId<Id>: GetNameString,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.env.display(&self.val.to_qualified_id()))?;
+        if !self.val.inst.is_empty() {
+            let tctx = TypeDisplayContext::WithEnv {
+                env: self.env,
+                type_param_names: None,
+            };
+            write!(f, "<")?;
+            let mut sep = "";
+            for ty in &self.val.inst {
+                write!(f, "{}{}", sep, ty.display(&tctx))?;
+                sep = ", ";
+            }
+            write!(f, ">")?;
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-model/src/options.rs b/vendors/move/crates/move-model/src/options.rs
new file mode 100644
index 000000000..fe337d29b
--- /dev/null
+++ b/vendors/move/crates/move-model/src/options.rs
@@ -0,0 +1,23 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+
+use crate::simplifier::SimplificationPass;
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct ModelBuilderOptions {
+    /// Ignore the "opaque" pragma on internal function (i.e., functions with no unknown callers)
+    /// specs when possible. The opaque can be ignored as long as the function spec has no property
+    /// marked as `[concrete]` or `[abstract]`.
+    pub ignore_pragma_opaque_internal_only: bool,
+
+    /// Ignore the "opaque" pragma on all function specs when possible. The opaque can be ignored
+    /// as long as the function spec has no property marked as `[concrete]` or `[abstract]`.
+    pub ignore_pragma_opaque_when_possible: bool,
+
+    /// List of simplification passes and the order each pass to be executed
+    pub simplification_pipeline: Vec<SimplificationPass>,
+}
diff --git a/vendors/move/crates/move-model/src/pragmas.rs b/vendors/move/crates/move-model/src/pragmas.rs
new file mode 100644
index 000000000..bf68a3205
--- /dev/null
+++ b/vendors/move/crates/move-model/src/pragmas.rs
@@ -0,0 +1,333 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Provides pragmas and properties of the specification language.
+
+use std::collections::BTreeMap;
+
+use once_cell::sync::Lazy;
+
+use crate::{
+    ast::{ConditionKind, PropertyBag, PropertyValue},
+    builder::module_builder::SpecBlockContext,
+    symbol::SymbolPool,
+};
+
+/// Pragma indicating whether verification should be performed for a function.
+pub const VERIFY_PRAGMA: &str = "verify";
+
+/// Pragma defining a timeout.
+pub const TIMEOUT_PRAGMA: &str = "timeout";
+
+/// Pragma defining a random seed.
+pub const SEED_PRAGMA: &str = "seed";
+
+/// Pragma indicating an estimate how long verification takes. Verification
+/// is skipped if the timeout is smaller than this.
+pub const VERIFY_DURATION_ESTIMATE_PRAGMA: &str = "verify_duration_estimate";
+
+/// Pragma indicating whether implementation of function should be ignored and
+/// instead treated to be like a native function.
+pub const INTRINSIC_PRAGMA: &str = "intrinsic";
+
+/// Pragma indicating whether implementation of function should be ignored and
+/// instead interpreted by its pre and post conditions only.
+pub const OPAQUE_PRAGMA: &str = "opaque";
+
+/// Pragma indicating whether emits specification should be considered partial.
+pub const EMITS_IS_PARTIAL_PRAGMA: &str = "emits_is_partial";
+
+/// Pragma indicating whether no emits specification should mean that no events are to be emitted.
+pub const EMITS_IS_STRICT_PRAGMA: &str = "emits_is_strict";
+
+/// Pragma indicating whether aborts_if specification should be considered partial.
+pub const ABORTS_IF_IS_PARTIAL_PRAGMA: &str = "aborts_if_is_partial";
+
+/// Pragma indicating whether no explicit aborts_if specification should be treated
+/// like `aborts_if` false.
+pub const ABORTS_IF_IS_STRICT_PRAGMA: &str = "aborts_if_is_strict";
+
+/// Pragma indicating that requires are also enforced if the aborts condition is true.
+pub const REQUIRES_IF_ABORTS_PRAGMA: &str = "requires_if_aborts";
+
+/// Pragma indicating that the function will run smoke tests
+pub const ALWAYS_ABORTS_TEST_PRAGMA: &str = "always_aborts_test";
+
+/// Pragma indicating that adding u64 or u128 values should not be checked
+/// for overflow.
+pub const ADDITION_OVERFLOW_UNCHECKED_PRAGMA: &str = "addition_overflow_unchecked";
+
+/// Pragma indicating that aborts from this function shall be ignored.
+pub const ASSUME_NO_ABORT_FROM_HERE_PRAGMA: &str = "assume_no_abort_from_here";
+
+/// Pragma which indicates that the function's abort and ensure conditions shall be exported
+/// to the verification context even if the implementation of the function is inlined.
+pub const EXPORT_ENSURES_PRAGMA: &str = "export_ensures";
+
+/// Pragma indicating that the function can only be called from certain caller.
+/// Unlike other pragmas, this pragma expects a function name like `0x1::M::f` instead
+/// of a boolean or a number.
+pub const FRIEND_PRAGMA: &str = "friend";
+
+/// Pragma indicating that invariants are not to be checked between entry and exit
+/// to this function
+pub const DISABLE_INVARIANTS_IN_BODY_PRAGMA: &str = "disable_invariants_in_body";
+
+/// Pragma indicating that invariants are not to be checked between entry and exit
+/// to this function
+pub const DELEGATE_INVARIANTS_TO_CALLER_PRAGMA: &str = "delegate_invariants_to_caller";
+
+/// # Pragmas for intrinsic table declaration
+
+/// The intrinsic type for `Map<K, V>`
+pub const INTRINSIC_TYPE_MAP: &str = "map";
+
+/// Create a new table with an empty content
+/// `[move] fun map_new<K, V>(): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_NEW: &str = "map_new";
+
+/// Create a new table with an empty content (the spec version)
+/// `[spec] fun map_new<K, V>(): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_NEW: &str = "map_spec_new";
+
+/// Get the value associated with key `k`.
+/// The behavior is undefined if `k` does not exist in the map
+/// `[spec] fun map_get<K, V>(m: Map<K, V>, k: K): V`
+pub const INTRINSIC_FUN_MAP_SPEC_GET: &str = "map_spec_get";
+
+/// Set the value to `v` with the key associated with `k`
+/// `[spec] fun map_set<K, V>(m: Map<K, V>, k: K, v: V): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_SET: &str = "map_spec_set";
+
+/// Remove the map entry associated with key `k`
+/// The behavior is undefined if `k` does not exist in the map
+/// `[spec] fun map_del<K, V>(m: Map<K, V>, k: K): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_DEL: &str = "map_spec_del";
+
+/// Get the number of entries in the map (the spec version)
+/// `[spec] fun map_len<K, V>(m: Map<K, V>): num`
+pub const INTRINSIC_FUN_MAP_SPEC_LEN: &str = "map_spec_len";
+
+/// Check whether the map is empty (the spec version)
+/// `[move] fun map_is_empty<K, V>(m: Map<K, V>): bool`
+pub const INTRINSIC_FUN_MAP_SPEC_IS_EMPTY: &str = "map_spec_is_empty";
+
+/// Get the number of entries in the map
+/// `[move] fun map_len<K, V>(m: &Map<K, V>): u64`
+pub const INTRINSIC_FUN_MAP_LEN: &str = "map_len";
+
+/// Check whether the map is empty
+/// `[move] fun map_is_empty<K, V>(m: &Map<K, V>): bool`
+pub const INTRINSIC_FUN_MAP_IS_EMPTY: &str = "map_is_empty";
+
+/// Check if the map has an entry associated with key `k` (the spec version)
+/// `[spec] fun map_has_key<K, V>(m: Map<K, V>, k: K): bool`
+pub const INTRINSIC_FUN_MAP_SPEC_HAS_KEY: &str = "map_spec_has_key";
+
+/// Check if the map has an entry associated with key `k`
+/// `[move] fun map_has_key<K, V>(m: &Map<K, V>, k: K): bool`
+pub const INTRINSIC_FUN_MAP_HAS_KEY: &str = "map_has_key";
+
+/// Destroys the map, aborts if the length is not zero.
+/// `[move] fun map_destroy_empty<K, V>(m: Map<K, V>)`
+pub const INTRINSIC_FUN_MAP_DESTROY_EMPTY: &str = "map_destroy_empty";
+
+/// Add a new entry to the map, aborts if the key already exists
+/// `[move] fun map_add_no_override<K, V>(m: &mut Map<K, V>, k: K, v: V)`
+pub const INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE: &str = "map_add_no_override";
+
+/// Add a new entry to the map, override if the key already exists
+/// `[move] fun map_add_override_if_exists<K, V>(m: &mut Map<K, V>, k: K, v: V)`
+pub const INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS: &str = "map_add_override_if_exists";
+
+/// Remove an entry from the map, aborts if the key does not exists
+/// `[move] fun map_del_must_exist<K, V>(m: &mut Map<K, V>, k: K): V`
+pub const INTRINSIC_FUN_MAP_DEL_MUST_EXIST: &str = "map_del_must_exist";
+
+/// Remove an entry from the map, aborts if the key does not exists
+/// `[move] fun map_del_return_key<K, V>(m: &mut Map<K, V>, k: K): (K, V)`
+pub const INTRINSIC_FUN_MAP_DEL_RETURN_KEY: &str = "map_del_return_key";
+
+/// Immutable borrow of a value from the map, aborts if the key does not exist
+/// `[move] fun map_borrow<K, V>(m: &Map<K, V>, k: K): &V`
+pub const INTRINSIC_FUN_MAP_BORROW: &str = "map_borrow";
+
+/// Mutable borrow of a value from the map, aborts if the key does not exist
+/// `[move] fun map_borrow_mut<K, V>(m: &mut Map<K, V>, k: K): &mut V`
+pub const INTRINSIC_FUN_MAP_BORROW_MUT: &str = "map_borrow_mut";
+
+/// All intrinsic functions associated with the map type
+pub static INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS: Lazy<BTreeMap<&'static str, bool>> =
+    Lazy::new(|| {
+        BTreeMap::from([
+            (INTRINSIC_FUN_MAP_NEW, true),
+            (INTRINSIC_FUN_MAP_SPEC_NEW, false),
+            (INTRINSIC_FUN_MAP_SPEC_GET, false),
+            (INTRINSIC_FUN_MAP_SPEC_SET, false),
+            (INTRINSIC_FUN_MAP_SPEC_DEL, false),
+            (INTRINSIC_FUN_MAP_SPEC_LEN, false),
+            (INTRINSIC_FUN_MAP_SPEC_IS_EMPTY, false),
+            (INTRINSIC_FUN_MAP_SPEC_HAS_KEY, false),
+            (INTRINSIC_FUN_MAP_LEN, true),
+            (INTRINSIC_FUN_MAP_IS_EMPTY, true),
+            (INTRINSIC_FUN_MAP_HAS_KEY, true),
+            (INTRINSIC_FUN_MAP_DESTROY_EMPTY, true),
+            (INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE, true),
+            (INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS, true),
+            (INTRINSIC_FUN_MAP_DEL_MUST_EXIST, true),
+            (INTRINSIC_FUN_MAP_DEL_RETURN_KEY, true),
+            (INTRINSIC_FUN_MAP_BORROW, true),
+            (INTRINSIC_FUN_MAP_BORROW_MUT, true),
+        ])
+    });
+
+/// Checks whether a pragma is valid in a specific spec block.
+pub fn is_pragma_valid_for_block(
+    symbols: &SymbolPool,
+    bag: &PropertyBag,
+    target: &SpecBlockContext<'_>,
+    pragma: &str,
+) -> bool {
+    use crate::builder::module_builder::SpecBlockContext::*;
+    match target {
+        Module => matches!(
+            pragma,
+            VERIFY_PRAGMA
+                | EMITS_IS_STRICT_PRAGMA
+                | EMITS_IS_PARTIAL_PRAGMA
+                | ABORTS_IF_IS_STRICT_PRAGMA
+                | ABORTS_IF_IS_PARTIAL_PRAGMA
+                | INTRINSIC_PRAGMA
+        ),
+        Function(..) => matches!(
+            pragma,
+            VERIFY_PRAGMA
+                | TIMEOUT_PRAGMA
+                | SEED_PRAGMA
+                | VERIFY_DURATION_ESTIMATE_PRAGMA
+                | INTRINSIC_PRAGMA
+                | OPAQUE_PRAGMA
+                | EMITS_IS_STRICT_PRAGMA
+                | EMITS_IS_PARTIAL_PRAGMA
+                | ABORTS_IF_IS_PARTIAL_PRAGMA
+                | ABORTS_IF_IS_STRICT_PRAGMA
+                | REQUIRES_IF_ABORTS_PRAGMA
+                | ALWAYS_ABORTS_TEST_PRAGMA
+                | ADDITION_OVERFLOW_UNCHECKED_PRAGMA
+                | ASSUME_NO_ABORT_FROM_HERE_PRAGMA
+                | EXPORT_ENSURES_PRAGMA
+                | FRIEND_PRAGMA
+                | DISABLE_INVARIANTS_IN_BODY_PRAGMA
+                | DELEGATE_INVARIANTS_TO_CALLER_PRAGMA
+                | BV_PARAM_PROP
+                | BV_RET_PROP
+        ),
+        Struct(..) => match pragma {
+            INTRINSIC_PRAGMA | BV_PARAM_PROP => true,
+            _ if INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS.contains_key(pragma) => bag
+                .get(&symbols.make(INTRINSIC_PRAGMA))
+                .map(|v| match v {
+                    PropertyValue::Symbol(s) => symbols.string(*s).as_str() == INTRINSIC_TYPE_MAP,
+                    _ => false,
+                })
+                .unwrap_or(false),
+            // all other cases
+            _ => false,
+        },
+        _ => false,
+    }
+}
+
+/// Internal property attached to conditions if they are injected via an apply or a module
+/// invariant.
+pub const CONDITION_INJECTED_PROP: &str = "$injected";
+
+/// Property which can be attached to conditions to make them exported into the VC context
+/// even if they are injected.
+pub const CONDITION_EXPORT_PROP: &str = "export";
+
+/// Property which can be attached to a module invariant to make it global.
+pub const CONDITION_GLOBAL_PROP: &str = "global";
+
+/// Property which can be attached to a global invariant to mark it as not to be used as
+/// an assumption in other verification steps. This can be used for invariants which are
+/// nonoperational constraints on system behavior, i.e. the systems "works" whether the
+/// invariant holds or not. Invariant marked as such are not assumed when
+/// memory is accessed, but only in the pre-state of a memory update.
+pub const CONDITION_ISOLATED_PROP: &str = "isolated";
+
+/// Abstract property which can be used together with an opaque specification. An abstract
+/// property is not verified against the implementation, but will be used for the
+/// function's behavior in the application context. This allows to "override" the specification
+/// with a more abstract version. In general we would need to prove the abstraction is
+/// subsumed by the implementation, but this is currently not done.
+pub const CONDITION_ABSTRACT_PROP: &str = "abstract";
+
+/// Opposite to the abstract property.
+pub const CONDITION_CONCRETE_PROP: &str = "concrete";
+
+/// Property which indicates that an aborts_if should be assumed.
+/// For callers of a function with such an aborts_if, the negation of the condition becomes
+/// an assumption.
+pub const CONDITION_ABORT_ASSUME_PROP: &str = "assume";
+
+/// Property which indicates that an aborts_if should be asserted.
+/// For callers of a function with such an aborts_if, the negation of the condition becomes
+/// an assertion.
+pub const CONDITION_ABORT_ASSERT_PROP: &str = "assert";
+
+/// A property which can be attached to any condition to exclude it from verification. The
+/// condition will still be type checked.
+pub const CONDITION_DEACTIVATED_PROP: &str = "deactivated";
+
+/// A property which can be attached to an aborts_with to indicate that it should act as check
+/// whether the function produces exactly the provided number of error codes.
+pub const CONDITION_CHECK_ABORT_CODES_PROP: &str = "check";
+
+/// A property that can be attached to a global invariant to indicate that it should be
+/// enabled disabled by the disable_invariant_in_body pragma
+pub const CONDITION_SUSPENDABLE_PROP: &str = "suspendable";
+
+/// A pragama defined in the spec block of a function or a struct
+/// to explicitly specify which argument or field will be translated into a bv type in the boogie file
+/// example: bv=b"0,1"
+pub const BV_PARAM_PROP: &str = "bv";
+
+/// A pragama defined in the spec block of a function
+/// to explicitly specify which return value will be translated into a bv type in the boogie file
+/// example: bv_ret=b"0,1"
+pub const BV_RET_PROP: &str = "bv_ret";
+
+/// A function which determines whether a property is valid for a given condition kind.
+pub fn is_property_valid_for_condition(kind: &ConditionKind, prop: &str) -> bool {
+    if matches!(
+        prop,
+        CONDITION_INJECTED_PROP
+            | CONDITION_EXPORT_PROP
+            | CONDITION_ABSTRACT_PROP
+            | CONDITION_CONCRETE_PROP
+            | CONDITION_DEACTIVATED_PROP
+    ) {
+        // Applicable everywhere.
+        return true;
+    }
+    use crate::ast::ConditionKind::*;
+    match kind {
+        GlobalInvariant(..) | GlobalInvariantUpdate(..) => {
+            matches!(
+                prop,
+                CONDITION_GLOBAL_PROP | CONDITION_ISOLATED_PROP | CONDITION_SUSPENDABLE_PROP
+            )
+        }
+        SucceedsIf | AbortsIf => matches!(
+            prop,
+            CONDITION_ABORT_ASSERT_PROP | CONDITION_ABORT_ASSUME_PROP
+        ),
+        AbortsWith => matches!(prop, CONDITION_CHECK_ABORT_CODES_PROP),
+        _ => {
+            // every other condition can only take general properties
+            false
+        }
+    }
+}
diff --git a/vendors/move/crates/move-model/src/simplifier/mod.rs b/vendors/move/crates/move-model/src/simplifier/mod.rs
new file mode 100644
index 000000000..bb358998e
--- /dev/null
+++ b/vendors/move/crates/move-model/src/simplifier/mod.rs
@@ -0,0 +1,128 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+use std::{fmt, str::FromStr};
+
+use move_binary_format::file_format::CodeOffset;
+
+use crate::{
+    ast::Spec,
+    model::{FunId, GlobalEnv, ModuleId, QualifiedId},
+};
+
+mod pass;
+mod pass_inline;
+
+pub use pass::SpecRewriter;
+use pass_inline::SpecPassInline;
+
+/// Available simplifications passes to run after tbe model is built
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum SimplificationPass {
+    Inline,
+}
+
+impl FromStr for SimplificationPass {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let r = match s {
+            "inline" => SimplificationPass::Inline,
+            _ => return Err(s.to_string()),
+        };
+        Ok(r)
+    }
+}
+
+impl fmt::Display for SimplificationPass {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Inline => write!(f, "inline"),
+        }
+    }
+}
+
+/// A rewriter pipeline that is composed of a chain of spec rewriters. Note that this composite
+/// rewriter is also a spec rewriter.
+pub struct SpecRewriterPipeline {
+    rewriters: Vec<Box<dyn SpecRewriter>>,
+}
+
+impl SpecRewriterPipeline {
+    /// Construct a pipeline rewriter by a list of passes
+    pub fn new(pipeline: &[SimplificationPass]) -> Self {
+        let mut result = Self { rewriters: vec![] };
+        for entry in pipeline {
+            match entry {
+                SimplificationPass::Inline => {
+                    result.rewriters.push(Box::<SpecPassInline>::default())
+                }
+            }
+        }
+        result
+    }
+}
+
+impl SpecRewriter for SpecRewriterPipeline {
+    fn rewrite_module_spec(
+        &mut self,
+        env: &GlobalEnv,
+        module_id: ModuleId,
+        spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        let mut current_spec = None;
+        for rewriter in self.rewriters.iter_mut() {
+            if let Some(new_spec) = rewriter.rewrite_module_spec(
+                env,
+                module_id,
+                current_spec.as_ref().unwrap_or(spec),
+            )? {
+                current_spec = Some(new_spec);
+            }
+        }
+        Ok(current_spec)
+    }
+
+    fn rewrite_function_spec(
+        &mut self,
+        env: &GlobalEnv,
+        fun_id: QualifiedId<FunId>,
+        spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        let mut current_spec = None;
+        for rewriter in self.rewriters.iter_mut() {
+            if let Some(new_spec) = rewriter.rewrite_function_spec(
+                env,
+                fun_id,
+                current_spec.as_ref().unwrap_or(spec),
+            )? {
+                current_spec = Some(new_spec);
+            }
+        }
+        Ok(current_spec)
+    }
+
+    fn rewrite_inline_spec(
+        &mut self,
+        env: &GlobalEnv,
+        fun_id: QualifiedId<FunId>,
+        code_offset: CodeOffset,
+        spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        let mut current_spec = None;
+        for rewriter in self.rewriters.iter_mut() {
+            if let Some(new_spec) = rewriter.rewrite_inline_spec(
+                env,
+                fun_id,
+                code_offset,
+                current_spec.as_ref().unwrap_or(spec),
+            )? {
+                current_spec = Some(new_spec);
+            }
+        }
+        Ok(current_spec)
+    }
+}
diff --git a/vendors/move/crates/move-model/src/simplifier/pass.rs b/vendors/move/crates/move-model/src/simplifier/pass.rs
new file mode 100644
index 000000000..8018a1f2f
--- /dev/null
+++ b/vendors/move/crates/move-model/src/simplifier/pass.rs
@@ -0,0 +1,99 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use std::collections::BTreeMap;
+
+use move_binary_format::file_format::CodeOffset;
+
+use crate::{
+    ast::Spec,
+    model::{FunId, GlobalEnv, ModuleId, QualifiedId},
+};
+
+/// A generic trait for rewriting the specifications in the `GlobalEnv`. A rewriter is expected to
+/// implement at least one `rewrite_*` function, depending on which type(s) of specs the rewriter
+/// targets. All the `rewrite_*` function should follow the convention on return value:
+/// - `Ok(None)`           --> nothing to rewrite on this spec
+/// - `Ok(Some(new_spec))` --> the spec is re-written and the `new_spec` is the output
+/// - `Err(..)`            --> something wrong (invariant violation) happened in the rewriting
+pub trait SpecRewriter {
+    /// Rewrite a module-level specification
+    fn rewrite_module_spec(
+        &mut self,
+        _env: &GlobalEnv,
+        _module_id: ModuleId,
+        _spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        Ok(None)
+    }
+
+    /// Rewrite a function-level specification
+    fn rewrite_function_spec(
+        &mut self,
+        _env: &GlobalEnv,
+        _fun_id: QualifiedId<FunId>,
+        _spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        Ok(None)
+    }
+
+    /// Rewrite a code-level specification
+    fn rewrite_inline_spec(
+        &mut self,
+        _env: &GlobalEnv,
+        _fun_id: QualifiedId<FunId>,
+        _code_offset: CodeOffset,
+        _spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        Ok(None)
+    }
+
+    /// Iterate over the specs in the `GlobalEnv`, rewrite each spec, and apply changes back to the
+    /// `GlobalEnv`.
+    fn override_with_rewrite(&mut self, env: &mut GlobalEnv) -> Result<()> {
+        // convert all module specs found in the model
+        let mut new_specs = BTreeMap::new();
+        for menv in env.get_modules() {
+            let mid = menv.get_id();
+            if let Some(new_spec) = self.rewrite_module_spec(env, mid, menv.get_spec())? {
+                new_specs.insert(mid, new_spec);
+            }
+        }
+        for (mid, spec) in new_specs {
+            env.override_module_spec(mid, spec);
+        }
+
+        // convert all functional specs found in the model
+        let mut new_specs = BTreeMap::new();
+        for menv in env.get_modules() {
+            for fenv in menv.get_functions() {
+                let fid = fenv.get_qualified_id();
+                if let Some(new_spec) = self.rewrite_function_spec(env, fid, fenv.get_spec())? {
+                    new_specs.insert(fid, new_spec);
+                }
+            }
+        }
+        for (fid, spec) in new_specs {
+            env.override_function_spec(fid, spec);
+        }
+
+        // convert all code-level specs found in the model
+        let mut new_specs = BTreeMap::new();
+        for menv in env.get_modules() {
+            for fenv in menv.get_functions() {
+                let fid = fenv.get_qualified_id();
+                for (offset, spec) in &fenv.get_spec().on_impl {
+                    if let Some(new_spec) = self.rewrite_inline_spec(env, fid, *offset, spec)? {
+                        new_specs.insert((fid, *offset), new_spec);
+                    }
+                }
+            }
+        }
+        for ((fid, offset), spec) in new_specs {
+            env.override_inline_spec(fid, offset, spec);
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-model/src/simplifier/pass_inline.rs b/vendors/move/crates/move-model/src/simplifier/pass_inline.rs
new file mode 100644
index 000000000..7ee35501c
--- /dev/null
+++ b/vendors/move/crates/move-model/src/simplifier/pass_inline.rs
@@ -0,0 +1,261 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use std::collections::BTreeMap;
+
+use crate::{
+    ast::{Condition, ConditionKind, Exp, ExpData, Operation, Spec, TempIndex},
+    model::{FunId, GlobalEnv, QualifiedId},
+    simplifier::pass::SpecRewriter,
+    symbol::Symbol,
+};
+
+/// A spec rewriter that produces a new spec by inlining all expressions in the given spec
+#[derive(Default)]
+pub struct SpecPassInline {}
+
+impl SpecRewriter for SpecPassInline {
+    fn rewrite_function_spec(
+        &mut self,
+        env: &GlobalEnv,
+        _fun_id: QualifiedId<FunId>,
+        spec: &Spec,
+    ) -> Result<Option<Spec>> {
+        let inliner = ExpInliner { env };
+
+        let Spec {
+            loc,
+            conditions,
+            properties,
+            on_impl,
+        } = spec.clone();
+
+        // expressions to be substituted when evaluated in a pre-context
+        let mut local_vars_pre = BTreeMap::new();
+        // expressions to be substituted when evaluated in a post-context
+        let mut local_vars_post = BTreeMap::new();
+
+        let mut new_conditions = vec![];
+        for cond in conditions {
+            let Condition {
+                loc,
+                kind,
+                properties,
+                exp,
+                additional_exps,
+            } = cond;
+
+            match &kind {
+                ConditionKind::LetPre(sym) => {
+                    let var_exp_pre = inliner.inline_exp(&exp, None, Some(&local_vars_pre));
+                    local_vars_pre.insert(*sym, var_exp_pre);
+
+                    let var_exp_post = inliner.inline_exp(&exp, None, Some(&local_vars_post));
+                    let var_exp_post = if var_exp_post.is_pure(env) {
+                        var_exp_post
+                    } else {
+                        let exp_ty = env.get_node_type(var_exp_post.node_id());
+                        let node_id = env.new_node(loc, exp_ty);
+                        ExpData::Call(node_id, Operation::Old, vec![var_exp_post]).into_exp()
+                    };
+                    local_vars_post.insert(*sym, var_exp_post);
+                }
+                ConditionKind::LetPost(sym) => {
+                    let var_exp = inliner.inline_exp(&exp, None, Some(&local_vars_post));
+                    local_vars_post.insert(*sym, var_exp);
+                }
+                _ => {
+                    let local_vars = match kind {
+                        ConditionKind::AbortsIf
+                        | ConditionKind::AbortsWith
+                        | ConditionKind::SucceedsIf
+                        | ConditionKind::Requires => Some(&local_vars_pre),
+                        ConditionKind::Ensures | ConditionKind::Modifies | ConditionKind::Emits => {
+                            Some(&local_vars_post)
+                        }
+                        _ => None,
+                    };
+                    let new_exp = inliner.inline_exp(&exp, None, local_vars);
+                    let new_additional_exps = additional_exps
+                        .into_iter()
+                        .map(|e| inliner.inline_exp(&e, None, local_vars))
+                        .collect();
+                    let new_cond = Condition {
+                        loc,
+                        kind,
+                        properties,
+                        exp: new_exp,
+                        additional_exps: new_additional_exps,
+                    };
+                    new_conditions.push(new_cond);
+                }
+            }
+        }
+
+        let new_spec = Spec {
+            loc,
+            conditions: new_conditions,
+            properties,
+            on_impl,
+        };
+        Ok(Some(new_spec))
+    }
+}
+
+/// A struct that capture the inlining logic for expressions
+struct ExpInliner<'env> {
+    env: &'env GlobalEnv,
+}
+
+impl ExpInliner<'_> {
+    /// Inline expressions in a bottom-up manner. Expressions to be inlined include:
+    /// - function calls
+    /// - invoke(lambda)
+    /// - block expressions (e.g., `{ let x = ..., x + 1 }`)
+    fn inline_exp(
+        &self,
+        exp: &Exp,
+        temp_var_repl: Option<&BTreeMap<TempIndex, Exp>>,
+        local_var_repl: Option<&BTreeMap<Symbol, Exp>>,
+    ) -> Exp {
+        use Operation::*;
+
+        let mut rewriter = |e: Exp| match e.as_ref() {
+            ExpData::LocalVar(_, sym) => match local_var_repl {
+                None => Err(e),
+                Some(var_map) => Ok(var_map.get(sym).unwrap().clone()),
+            },
+            ExpData::Temporary(_, idx) => match temp_var_repl {
+                None => Err(e),
+                Some(var_map) => Ok(var_map.get(idx).unwrap().clone()),
+            },
+            ExpData::Call(node_id, Function(mid, fid, _), args) => {
+                let callee_menv = self.env.get_module(*mid);
+                let callee_decl = callee_menv.get_spec_fun(*fid);
+                debug_assert_eq!(args.len(), callee_decl.params.len());
+                if callee_decl.is_native
+                    || callee_decl.uninterpreted
+                    || callee_decl.body.is_none()
+                    || self
+                        .env
+                        .is_spec_fun_recursive(callee_menv.get_id().qualified(*fid))
+                {
+                    Err(e)
+                } else {
+                    let callee_decl_body = callee_decl.body.as_ref().unwrap();
+                    // NOTE: if a spec function has a choice operator in it, do not unroll the spec
+                    // function. This is to guarantee the determinism of the spec function, i.e.,
+                    // `forall x in domain, f(x) == f(x)`. Unrolling it will lead to the boogie
+                    // backend producing two sets of choice predicates and axioms, which will
+                    // violate the determinism property.
+                    //
+                    // TODO: need to revisit this once we have a decision on whether we want the
+                    // determinism.
+                    let mut has_choice = false;
+                    callee_decl_body.visit(&mut |e| {
+                        if matches!(e, ExpData::Quant(_, kind, _, _, _, _) if kind.is_choice()) {
+                            has_choice = true;
+                        }
+                    });
+
+                    if has_choice {
+                        Err(e)
+                    } else {
+                        let mut callee_local_vars = local_var_repl.cloned().unwrap_or_default();
+                        for (arg_exp, (sym, _)) in args
+                            .iter()
+                            .map(|e| self.inline_exp(e, temp_var_repl, local_var_repl))
+                            .zip(callee_decl.params.iter())
+                        {
+                            callee_local_vars.insert(*sym, arg_exp);
+                        }
+
+                        let callee_targs = self.env.get_node_instantiation(*node_id);
+                        let callee_body =
+                            ExpData::rewrite_node_id(callee_decl_body.clone(), &mut |id| {
+                                ExpData::instantiate_node(self.env, id, &callee_targs)
+                            });
+                        Ok(self.inline_exp(&callee_body, temp_var_repl, Some(&callee_local_vars)))
+                    }
+                }
+            }
+            ExpData::Invoke(_, lambda, args) => match lambda.as_ref() {
+                ExpData::Lambda(_, locals, body) => {
+                    debug_assert_eq!(args.len(), locals.len());
+                    let mut lambda_local_vars = local_var_repl.cloned().unwrap_or_default();
+                    for (arg_exp, decl) in args
+                        .iter()
+                        .map(|e| self.inline_exp(e, temp_var_repl, local_var_repl))
+                        .zip(locals)
+                    {
+                        lambda_local_vars.insert(decl.name, arg_exp);
+                    }
+                    Ok(self.inline_exp(body, temp_var_repl, Some(&lambda_local_vars)))
+                }
+                _ => Err(e),
+            },
+            ExpData::Lambda(node_id, locals, body) => {
+                let mut lambda_local_vars = local_var_repl.cloned().unwrap_or_default();
+                for decl in locals {
+                    lambda_local_vars
+                        .insert(decl.name, ExpData::LocalVar(decl.id, decl.name).into_exp());
+                }
+
+                let new_body = self.inline_exp(body, temp_var_repl, Some(&lambda_local_vars));
+                Ok(ExpData::Lambda(*node_id, locals.clone(), new_body).into_exp())
+            }
+            ExpData::Quant(node_id, kind, ranges, triggers, constraint, body) => {
+                let mut new_ranges = vec![];
+                let mut quant_local_vars = local_var_repl.cloned().unwrap_or_default();
+                for (decl, range) in ranges {
+                    debug_assert!(decl.binding.is_none());
+                    new_ranges.push((
+                        decl.clone(),
+                        self.inline_exp(range, temp_var_repl, local_var_repl),
+                    ));
+                    quant_local_vars
+                        .insert(decl.name, ExpData::LocalVar(decl.id, decl.name).into_exp());
+                }
+
+                let new_triggers = triggers
+                    .iter()
+                    .map(|t| {
+                        t.iter()
+                            .map(|e| self.inline_exp(e, temp_var_repl, Some(&quant_local_vars)))
+                            .collect()
+                    })
+                    .collect();
+                let new_constraint = constraint
+                    .as_ref()
+                    .map(|e| self.inline_exp(e, temp_var_repl, Some(&quant_local_vars)));
+                let new_body = self.inline_exp(body, temp_var_repl, Some(&quant_local_vars));
+
+                Ok(ExpData::Quant(
+                    *node_id,
+                    *kind,
+                    new_ranges,
+                    new_triggers,
+                    new_constraint,
+                    new_body,
+                )
+                .into_exp())
+            }
+            ExpData::Block(_, var_decls, body) => {
+                let mut block_local_vars = local_var_repl.cloned().unwrap_or_default();
+                for var_decl in var_decls {
+                    let var_exp = self.inline_exp(
+                        var_decl.binding.as_ref().unwrap(),
+                        temp_var_repl,
+                        Some(&block_local_vars),
+                    );
+                    block_local_vars.insert(var_decl.name, var_exp);
+                }
+                Ok(self.inline_exp(body, temp_var_repl, Some(&block_local_vars)))
+            }
+            _ => Err(e),
+        };
+        ExpData::rewrite(exp.clone(), &mut rewriter)
+    }
+}
diff --git a/vendors/move/crates/move-model/src/spec_translator.rs b/vendors/move/crates/move-model/src/spec_translator.rs
new file mode 100644
index 000000000..78da15792
--- /dev/null
+++ b/vendors/move/crates/move-model/src/spec_translator.rs
@@ -0,0 +1,773 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module supports translations of specifications as found in the move-model to
+//! expressions which can be used in assumes/asserts in bytecode.
+
+use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
+use std::collections::{BTreeMap, BTreeSet};
+
+use crate::{
+    ast::{
+        Condition, ConditionKind, Exp, ExpData, GlobalInvariant, LocalVarDecl, MemoryLabel,
+        Operation, Spec, TempIndex, TraceKind,
+    },
+    exp_generator::ExpGenerator,
+    exp_rewriter::ExpRewriterFunctions,
+    model::{FunctionEnv, GlobalId, Loc, NodeId, QualifiedInstId, SpecVarId, StructId},
+    pragmas::{
+        ABORTS_IF_IS_STRICT_PRAGMA, CONDITION_ABSTRACT_PROP, CONDITION_CONCRETE_PROP,
+        CONDITION_EXPORT_PROP, CONDITION_INJECTED_PROP,
+    },
+    symbol::Symbol,
+    ty::{PrimitiveType, Type},
+};
+
+/// A helper which reduces specification conditions to assume/assert statements.
+pub struct SpecTranslator<'a, 'b, T: ExpGenerator<'a>> {
+    /// Whether we should autogenerate TRACE calls for top-level expressions of the VC.
+    auto_trace: bool,
+    /// The builder for the function we are currently translating.
+    /// Note this is not necessarily the same as the function for which we translate specs.
+    /// The builder must implement the expression generation trait.
+    builder: &'b mut T,
+    /// The function for which we translate specifications.
+    fun_env: &'b FunctionEnv<'a>,
+    /// The type instantiation of the function.
+    type_args: &'b [Type],
+    /// An optional substitution for parameters of the above function.
+    param_substitution: Option<&'b [TempIndex]>,
+    /// Whether we translate the expression in a post state.
+    in_post_state: bool,
+    /// An optional substitution for return vales.
+    ret_locals: &'b [TempIndex],
+    /// A set of locals which are declared by outer block, lambda, or quant expressions.
+    shadowed: Vec<BTreeSet<Symbol>>,
+    /// A map from let symbols to temporaries allocated for them.
+    let_locals: BTreeMap<Symbol, TempIndex>,
+    /// The translated spec.
+    result: TranslatedSpec,
+    /// Whether we are in "old" (pre-state) context
+    in_old: bool,
+}
+
+/// Represents a translated spec.
+#[derive(Default)]
+pub struct TranslatedSpec {
+    pub saved_memory: BTreeMap<QualifiedInstId<StructId>, MemoryLabel>,
+    pub saved_spec_vars: BTreeMap<QualifiedInstId<SpecVarId>, MemoryLabel>,
+    pub saved_params: BTreeMap<TempIndex, TempIndex>,
+    pub debug_traces: Vec<(NodeId, TraceKind, Exp)>,
+    pub pre: Vec<(Loc, Exp)>,
+    pub post: Vec<(Loc, Exp)>,
+    pub aborts: Vec<(Loc, Exp, Option<Exp>)>,
+    pub aborts_with: Vec<(Loc, Vec<Exp>)>,
+    pub emits: Vec<(Loc, Exp, Exp, Option<Exp>)>,
+    pub modifies: Vec<(Loc, Exp)>,
+    pub invariants: Vec<(Loc, GlobalId, Exp)>,
+    pub lets: Vec<(Loc, bool, TempIndex, Exp)>,
+    pub updates: Vec<(Loc, Exp, Exp)>,
+}
+
+impl TranslatedSpec {
+    /// Creates a boolean expression which describes the overall abort condition. This is
+    /// a disjunction of the individual abort conditions.
+    pub fn aborts_condition<'a, T: ExpGenerator<'a>>(&self, builder: &T) -> Option<Exp> {
+        builder.mk_join_bool(Operation::Or, self.aborts.iter().map(|(_, e, _)| e.clone()))
+    }
+
+    /// Creates a boolean expression which describes the overall condition which constraints
+    /// the abort code.
+    ///
+    /// Let (P1, C1)..(Pj, Cj) be aborts_if with a code, Pk..Pl aborts_if without a code, and the
+    /// Cm..Cn standalone aborts codes from an aborts_with:
+    ///
+    ///  ```notrust
+    ///   P1 && abort_code == C1 || .. || Pj && abort_code == Cj
+    ///       || Pk || .. || Pl
+    ///       || abort_code == Cm || .. || abort_code == Cn
+    /// ```
+    ///
+    /// This characterizes the allowed value of the code. In the presence of aborts_if with code,
+    /// whenever the aborts condition is true, the code must also be the specified ones. Notice
+    /// that still allows any other member of the disjunction to make the overall condition true.
+    /// Specifically, if someone specifies `aborts_if P with C1; aborts_with C2`, then even if
+    /// P is true, C2 is allowed as an abort code.
+    pub fn aborts_code_condition<'a, T: ExpGenerator<'a>>(
+        &self,
+        builder: &T,
+        actual_code: &Exp,
+    ) -> Option<Exp> {
+        let eq_code = |e: &Exp| builder.mk_eq(e.clone(), actual_code.clone());
+        builder.mk_join_bool(
+            Operation::Or,
+            self.aborts
+                .iter()
+                .map(|(_, exp, code)| {
+                    builder
+                        .mk_join_opt_bool(
+                            Operation::And,
+                            Some(exp.clone()),
+                            code.as_ref().map(eq_code),
+                        )
+                        .unwrap()
+                })
+                .chain(
+                    self.aborts_with
+                        .iter()
+                        .flat_map(|(_, codes)| codes.iter())
+                        .map(eq_code),
+                ),
+        )
+    }
+
+    /// Returns true if there are any specs about the abort code.
+    pub fn has_aborts_code_specs(&self) -> bool {
+        !self.aborts_with.is_empty() || self.aborts.iter().any(|(_, _, c)| c.is_some())
+    }
+
+    /// Return an iterator of effective pre conditions.
+    pub fn pre_conditions<'a, T: ExpGenerator<'a>>(
+        &self,
+        _builder: &T,
+    ) -> impl Iterator<Item = (Loc, Exp)> + '_ {
+        self.pre.iter().cloned()
+    }
+
+    /// Returns a sequence of EventStoreIncludes expressions which verify the `emits` clauses of a
+    /// function spec. While logically we could generate a single EventStoreIncludes, for better
+    /// error reporting we construct incrementally multiple EventStoreIncludes expressions with some
+    /// redundancy for each individual `emits, so we the see the exact failure at the right
+    /// emit condition.
+    pub fn emits_conditions<'a, T: ExpGenerator<'a>>(&self, builder: &T) -> Vec<(Loc, Exp)> {
+        let es_ty = Type::Primitive(PrimitiveType::EventStore);
+        let mut result = vec![];
+        for i in 0..self.emits.len() {
+            let loc = self.emits[i].0.clone();
+            let es = Self::build_event_store(
+                builder,
+                builder.mk_call(&es_ty, Operation::EmptyEventStore, vec![]),
+                &self.emits[0..i + 1],
+            );
+            result.push((
+                loc,
+                builder.mk_bool_call(Operation::EventStoreIncludes, vec![es]),
+            ));
+        }
+        result
+    }
+
+    pub fn emits_completeness_condition<'a, T: ExpGenerator<'a>>(&self, builder: &T) -> Exp {
+        let es_ty = Type::Primitive(PrimitiveType::EventStore);
+        let es = Self::build_event_store(
+            builder,
+            builder.mk_call(&es_ty, Operation::EmptyEventStore, vec![]),
+            &self.emits,
+        );
+        builder.mk_bool_call(Operation::EventStoreIncludedIn, vec![es])
+    }
+
+    fn build_event_store<'a, T: ExpGenerator<'a>>(
+        builder: &T,
+        es: Exp,
+        emits: &[(Loc, Exp, Exp, Option<Exp>)],
+    ) -> Exp {
+        if emits.is_empty() {
+            es
+        } else {
+            let (_, event, handle, cond) = &emits[0];
+            let mut args = vec![es, event.clone(), handle.clone()];
+            if let Some(c) = cond {
+                args.push(c.clone())
+            }
+            let es_ty = Type::Primitive(PrimitiveType::EventStore);
+            let extend_exp = builder.mk_call(&es_ty, Operation::ExtendEventStore, args);
+            Self::build_event_store(builder, extend_exp, &emits[1..])
+        }
+    }
+}
+
+impl<'a, 'b, T: ExpGenerator<'a>> SpecTranslator<'a, 'b, T> {
+    /// Translates the specification of function `fun_env`. This can happen for a call of the
+    /// function or for its definition (parameter `for_call`). This will process all the
+    /// conditions found in the spec block of the function, dealing with references to `old(..)`,
+    /// and creating respective memory/spec var saves. If `for_call` is true, abort conditions
+    /// will be translated for the current state, otherwise they will be treated as in an `old`.
+    /// and creating respective memory/spec var saves. It also allows to provide type arguments
+    /// with which the specifications are instantiated, as well as a substitution for temporaries.
+    /// The later two parameters are used to instantiate a function specification for a given
+    /// call context.
+    pub fn translate_fun_spec(
+        auto_trace: bool,
+        for_call: bool,
+        builder: &'b mut T,
+        fun_env: &'b FunctionEnv<'a>,
+        type_args: &[Type],
+        param_substitution: Option<&'b [TempIndex]>,
+        ret_locals: &'b [TempIndex],
+    ) -> TranslatedSpec {
+        let mut translator = SpecTranslator {
+            auto_trace,
+            builder,
+            fun_env,
+            type_args,
+            param_substitution,
+            ret_locals,
+            in_post_state: false,
+            shadowed: Default::default(),
+            result: Default::default(),
+            let_locals: Default::default(),
+            in_old: false,
+        };
+        translator.translate_spec(for_call);
+        translator.result
+    }
+
+    /// Translates a set of invariants with type instantiations. If there are any references to
+    /// `old(...)` they will be rewritten and respective memory/spec var saves will be generated.
+    pub fn translate_invariants(
+        auto_trace: bool,
+        builder: &'b mut T,
+        invariants: impl Iterator<Item = (&'b GlobalInvariant, Vec<Type>)>,
+    ) -> TranslatedSpec {
+        let fun_env = builder.function_env().clone();
+        let mut translator = SpecTranslator {
+            auto_trace,
+            builder,
+            fun_env: &fun_env,
+            type_args: &[],
+            param_substitution: Default::default(),
+            ret_locals: Default::default(),
+            in_post_state: false,
+            shadowed: Default::default(),
+            result: Default::default(),
+            let_locals: Default::default(),
+            in_old: false,
+        };
+        // Clone invariants so `inst` lives for the entire loop
+        let invariants = invariants.collect_vec();
+        for (inv, inst) in &invariants {
+            translator.type_args = inst;
+            let exp = translator.translate_exp(&translator.auto_trace(&inv.loc, &inv.cond), false);
+            translator
+                .result
+                .invariants
+                .push((inv.loc.clone(), inv.id, exp));
+        }
+        translator.result
+    }
+
+    /// Translate one inline property. If there are any references to `old(...)` they
+    /// will be rewritten and respective memory/spec var saves will be generated.
+    pub fn translate_inline_property(
+        loc: &Loc,
+        auto_trace: bool,
+        builder: &'b mut T,
+        prop: &Exp,
+    ) -> (TranslatedSpec, Exp) {
+        let fun_env = builder.function_env().clone();
+        let mut translator = SpecTranslator {
+            auto_trace,
+            builder,
+            fun_env: &fun_env,
+            type_args: &[],
+            param_substitution: Default::default(),
+            ret_locals: Default::default(),
+            in_post_state: false,
+            shadowed: Default::default(),
+            result: Default::default(),
+            let_locals: Default::default(),
+            in_old: false,
+        };
+
+        // Handle updating of global spec variables
+        for impl_spec in translator.fun_env.get_spec().on_impl.values() {
+            for cond in &impl_spec.conditions {
+                if cond.exp == prop.clone() && !cond.additional_exps.is_empty() {
+                    translator.in_post_state = false;
+                    let lhs = translator.translate_exp(
+                        &translator.auto_trace(&cond.loc, &cond.additional_exps[0]),
+                        false,
+                    );
+                    let rhs = translator
+                        .translate_exp(&translator.auto_trace(&cond.loc, &cond.exp), false);
+                    translator.result.updates.push((cond.loc.clone(), lhs, rhs));
+                    return (translator.result, cond.clone().exp);
+                }
+            }
+        }
+
+        let exp = translator.translate_exp(&translator.auto_trace(loc, prop), false);
+        (translator.result, exp)
+    }
+
+    pub fn translate_invariants_by_id(
+        auto_trace: bool,
+        builder: &'b mut T,
+        inv_ids: impl Iterator<Item = (GlobalId, Vec<Type>)>,
+    ) -> TranslatedSpec {
+        let global_env = builder.global_env();
+        SpecTranslator::translate_invariants(
+            auto_trace,
+            builder,
+            inv_ids.map(|(inv_id, inst)| (global_env.get_global_invariant(inv_id).unwrap(), inst)),
+        )
+    }
+
+    fn translate_spec(&mut self, for_call: bool) {
+        let fun_env = self.fun_env;
+        let env = fun_env.module_env.env;
+        let spec = fun_env.get_spec();
+
+        // A function which determines whether a condition is applicable in the context, which
+        // is `for_call` for the function being called, and `!for_call` if its verified.
+        // If a condition has the `[abstract]` property, it will only be included for calls,
+        // and if it has the `[concrete]` property only for verification. Also, conditions
+        // which are injected from a schema are only included on call site if they are also
+        // exported.
+        let is_applicable = |cond: &&Condition| {
+            let abstract_ = env
+                .is_property_true(&cond.properties, CONDITION_ABSTRACT_PROP)
+                .unwrap_or(false);
+            let concrete = env
+                .is_property_true(&cond.properties, CONDITION_CONCRETE_PROP)
+                .unwrap_or(false);
+            let injected = env
+                .is_property_true(&cond.properties, CONDITION_INJECTED_PROP)
+                .unwrap_or(false);
+            let exported = env
+                .is_property_true(&cond.properties, CONDITION_EXPORT_PROP)
+                .unwrap_or(false);
+            if for_call {
+                (!injected || exported) && (abstract_ || !concrete)
+            } else {
+                concrete || !abstract_
+            }
+        };
+
+        // First process `let` so subsequently expressions can refer to them.
+        self.translate_lets(false, spec);
+
+        // Next process requires
+        for cond in spec
+            .filter_kind(ConditionKind::Requires)
+            .filter(is_applicable)
+        {
+            self.in_post_state = false;
+            let exp = self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), false);
+            self.result.pre.push((cond.loc.clone(), exp));
+        }
+
+        // Next process updates. They come between pre and post conditions.
+        for cond in spec
+            .filter_kind(ConditionKind::Update)
+            .filter(is_applicable)
+        {
+            self.in_post_state = false;
+            let lhs =
+                self.translate_exp(&self.auto_trace(&cond.loc, &cond.additional_exps[0]), false);
+            let rhs = self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), false);
+            self.result.updates.push((cond.loc.clone(), lhs, rhs));
+        }
+
+        // Aborts conditions are translated in post state when they aren't handled for a call
+        // but for a definition. Otherwise, they are translated for a call of an opaque function
+        // and are evaluated in pre state.
+        self.in_post_state = !for_call;
+        for cond in spec
+            .filter_kind(ConditionKind::AbortsIf)
+            .filter(is_applicable)
+        {
+            let code_opt = if cond.additional_exps.is_empty() {
+                None
+            } else {
+                Some(self.translate_exp(&cond.additional_exps[0], self.in_post_state))
+            };
+            let exp =
+                self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), self.in_post_state);
+            self.result.aborts.push((cond.loc.clone(), exp, code_opt));
+        }
+
+        for cond in spec
+            .filter_kind(ConditionKind::AbortsWith)
+            .filter(is_applicable)
+        {
+            let codes = cond
+                .all_exps()
+                .map(|e| self.translate_exp(&self.auto_trace_no_loc(e), self.in_post_state))
+                .collect_vec();
+            self.result.aborts_with.push((cond.loc.clone(), codes));
+        }
+
+        // If there are no aborts_if and aborts_with, and the pragma `aborts_if_is_strict` is set,
+        // add an implicit aborts_if false.
+        if self.result.aborts.is_empty()
+            && self.result.aborts_with.is_empty()
+            && self
+                .fun_env
+                .is_pragma_true(ABORTS_IF_IS_STRICT_PRAGMA, || false)
+        {
+            self.result.aborts.push((
+                self.fun_env.get_loc().at_end(),
+                self.builder.mk_bool_const(false),
+                None,
+            ));
+        }
+
+        // Translate modifies.
+        for cond in spec
+            .filter_kind(ConditionKind::Modifies)
+            .filter(is_applicable)
+        {
+            self.in_post_state = false;
+            for exp in cond.all_exps() {
+                // Auto trace the inner address expression.
+                let exp = match exp.as_ref() {
+                    ExpData::Call(id, oper, args) if args.len() == 1 => ExpData::Call(
+                        *id,
+                        oper.clone(),
+                        vec![self.auto_trace(&cond.loc, &args[0])],
+                    )
+                    .into_exp(),
+                    _ => cond.exp.to_owned(),
+                };
+                let exp = self.translate_exp(&exp, false);
+                self.result.modifies.push((cond.loc.clone(), exp));
+            }
+        }
+
+        // Now translate `let update` which are evaluated in post state.
+        self.translate_lets(true, spec);
+
+        // Translate ensures.
+        for cond in spec
+            .filter_kind(ConditionKind::Ensures)
+            .filter(is_applicable)
+        {
+            self.in_post_state = true;
+            let exp = self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), false);
+            self.result.post.push((cond.loc.clone(), exp));
+        }
+
+        // Translate emits.
+        for cond in spec.filter_kind(ConditionKind::Emits).filter(is_applicable) {
+            self.in_post_state = true;
+            let event_exp = self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), false);
+            let handle_exp =
+                self.translate_exp(&self.auto_trace_no_loc(&cond.additional_exps[0]), false);
+            let cond_exp = if cond.additional_exps.len() > 1 {
+                Some(self.translate_exp(&self.auto_trace_no_loc(&cond.additional_exps[1]), false))
+            } else {
+                None
+            };
+            self.result
+                .emits
+                .push((cond.loc.clone(), event_exp, handle_exp, cond_exp));
+        }
+    }
+
+    fn translate_lets(&mut self, post_state: bool, spec: &Spec) {
+        for cond in &spec.conditions {
+            let sym = match &cond.kind {
+                ConditionKind::LetPost(sym) if post_state => sym,
+                ConditionKind::LetPre(sym) if !post_state => sym,
+                _ => continue,
+            };
+            let exp = self.translate_exp(&self.auto_trace(&cond.loc, &cond.exp), false);
+            let ty = self.builder.global_env().get_node_type(exp.node_id());
+            let temp = self.builder.add_local(ty.skip_reference().clone());
+            self.let_locals.insert(*sym, temp);
+            self.result
+                .lets
+                .push((cond.loc.clone(), post_state, temp, exp));
+        }
+    }
+
+    fn auto_trace(&self, loc: &Loc, exp: &Exp) -> Exp {
+        if self.auto_trace {
+            self.auto_trace_exp(loc, self.auto_trace_sub(exp), TraceKind::Auto)
+        } else {
+            exp.to_owned()
+        }
+    }
+
+    fn auto_trace_sub(&self, exp: &Exp) -> Exp {
+        ExpData::rewrite(exp.to_owned(), &mut |e| {
+            let (trace_this, e) = match e.as_ref() {
+                ExpData::Temporary(..)
+                | ExpData::Call(_, Operation::Old, ..)
+                | ExpData::Call(_, Operation::Result(_), ..) => (true, e),
+                ExpData::Call(id, op @ Operation::Function(..), args) => (
+                    true,
+                    ExpData::Call(
+                        *id,
+                        op.clone(),
+                        args.iter().map(|e| self.auto_trace_sub(e)).collect(),
+                    )
+                    .into_exp(),
+                ),
+                ExpData::LocalVar(_, sym) => (self.let_locals.contains_key(sym), e),
+                ExpData::Call(id, Operation::Global(None), args) => (
+                    true,
+                    ExpData::Call(
+                        *id,
+                        Operation::Global(None),
+                        vec![self.auto_trace_sub(&args[0])],
+                    )
+                    .into_exp(),
+                ),
+                ExpData::Call(id, Operation::Exists(None), args) => (
+                    true,
+                    ExpData::Call(
+                        *id,
+                        Operation::Exists(None),
+                        vec![self.auto_trace_sub(&args[0])],
+                    )
+                    .into_exp(),
+                ),
+                _ => (false, e),
+            };
+            if trace_this {
+                let l = self.builder.global_env().get_node_loc(e.node_id());
+                let traced = self.auto_trace_exp(&l, e, TraceKind::SubAuto);
+                Ok(traced)
+            } else {
+                // descent
+                Err(e)
+            }
+        })
+    }
+
+    fn auto_trace_exp(&self, loc: &Loc, exp: Exp, kind: TraceKind) -> Exp {
+        let env = self.builder.global_env();
+        let id = exp.node_id();
+        let ty = env.get_node_type(id);
+        let new_id = env.new_node(loc.clone(), ty.clone());
+        env.set_node_instantiation(new_id, vec![ty]);
+        ExpData::Call(new_id, Operation::Trace(kind), vec![exp]).into_exp()
+    }
+
+    fn auto_trace_no_loc(&self, exp: &Exp) -> Exp {
+        self.auto_trace(&self.builder.global_env().get_node_loc(exp.node_id()), exp)
+    }
+
+    fn translate_exp(&mut self, exp: &Exp, in_old: bool) -> Exp {
+        self.in_old = in_old;
+        self.rewrite_exp(exp.to_owned())
+    }
+
+    fn is_shadowed(&self, sym: Symbol) -> bool {
+        self.shadowed.iter().any(|bs| bs.contains(&sym))
+    }
+
+    /// Apply parameter substitution if present.
+    fn apply_param_substitution(&self, idx: TempIndex) -> TempIndex {
+        if let Some(map) = self.param_substitution {
+            map[idx]
+        } else {
+            idx
+        }
+    }
+
+    fn save_memory(&mut self, qid: QualifiedInstId<StructId>) -> MemoryLabel {
+        let builder = &mut self.builder;
+        *self
+            .result
+            .saved_memory
+            .entry(qid)
+            .or_insert_with(|| builder.global_env().new_global_id())
+    }
+
+    fn save_param(&mut self, idx: TempIndex) -> TempIndex {
+        if let Some(saved) = self.result.saved_params.get(&idx) {
+            *saved
+        } else {
+            let saved = self
+                .builder
+                .new_temp(self.builder.get_local_type(idx).skip_reference().clone());
+            self.result.saved_params.insert(idx, saved);
+            saved
+        }
+    }
+}
+
+impl<'a, 'b, T: ExpGenerator<'a>> ExpRewriterFunctions for SpecTranslator<'a, 'b, T> {
+    fn rewrite_exp(&mut self, exp: Exp) -> Exp {
+        // Do some pre-processing of the expression before actual rewrite, reporting
+        // errors.
+        let env = self.builder.global_env();
+        let mut is_old = false;
+        match exp.as_ref() {
+            ExpData::Call(id, Operation::Old, args) => {
+                is_old = true;
+                // Generate an error if an `old` function is applied to a pure expression.
+                let arg = &args[0];
+                if arg.is_pure(self.builder.global_env()) {
+                    let loc = self.builder.global_env().get_node_loc(*id);
+                    // Compute labels for any sub-expressions which are included into this
+                    // expression via substitution (from schema inclusion, for example). This
+                    // is done via checking the location of the sub-expression. We also try
+                    // to avoid to report a sub-expression which is a sub-expression of an
+                    // already reported one.
+                    let mut labels = vec![];
+                    let loc_contained = |loc: &Loc, cont: &Loc| {
+                        loc.file_id() == cont.file_id()
+                            && cont.span().start() >= loc.span().start()
+                            && cont.span().end() <= loc.span().end()
+                    };
+                    arg.visit_pre_post(&mut |up: bool, e: &ExpData| {
+                        let sub_loc = self.builder.global_env().get_node_loc(e.node_id());
+                        if !up
+                            && !loc_contained(&loc, &sub_loc)
+                            && !labels.iter().any(|(l, _)| loc_contained(l, &sub_loc))
+                        {
+                            labels.push((sub_loc, "substituted sub-expression".to_owned()))
+                        }
+                    });
+                    self.builder.global_env().diag_with_labels(
+                        Severity::Error,
+                        &loc,
+                        "`old(..)` applied to expression which does not depend on state",
+                        labels,
+                    )
+                }
+            }
+            ExpData::Call(id, Operation::Trace(TraceKind::User), args) => {
+                // Generate an error if a TRACE is applied to an expression where it is not
+                // allowed, i.e. if there are free LocalVar terms, excluding locals from lets.
+                let loc = env.get_node_loc(*id);
+                let has_free_vars = args[0]
+                    .free_vars(env)
+                    .iter()
+                    .any(|(s, _)| !self.let_locals.contains_key(s));
+                if has_free_vars {
+                    env.error(
+                        &loc,
+                        "`TRACE(..)` function cannot be used for expressions depending \
+                             on quantified variables or spec function parameters",
+                    )
+                }
+            }
+            _ => {}
+        }
+        if is_old {
+            self.in_old = true;
+        }
+        let exp = self.rewrite_exp_descent(exp);
+        if is_old {
+            self.in_old = false;
+        }
+        exp
+    }
+
+    fn rewrite_local_var(&mut self, id: NodeId, sym: Symbol) -> Option<Exp> {
+        if !self.is_shadowed(sym) {
+            if let Some(temp) = self.let_locals.get(&sym) {
+                // Need to create new node id since the replacement `temp` may
+                // differ w.r.t. references.
+                let env = self.builder.global_env();
+                let new_node_id =
+                    env.new_node(env.get_node_loc(id), self.builder.get_local_type(*temp));
+                return Some(ExpData::Temporary(new_node_id, *temp).into_exp());
+            }
+        }
+        None
+    }
+
+    fn rewrite_temporary(&mut self, id: NodeId, idx: TempIndex) -> Option<Exp> {
+        // Compute the effective index.
+        let mut effective_idx = self.apply_param_substitution(idx);
+        let local_type = self.builder.get_local_type(effective_idx);
+        if self.in_old || (self.in_post_state && !local_type.is_mutable_reference()) {
+            // We access a param inside of old context, or a value which might have been
+            // mutated as we are in the post state. We need to create a temporary
+            // to save their value at function entry, and deliver this temporary here.
+            //
+            // Notice that a redundant copy of a value (i.e. one which is not mutated)
+            // is removed by copy propagation, so we do not need to
+            // care about optimizing this here.
+            effective_idx = self.save_param(effective_idx);
+        }
+        if effective_idx != idx {
+            let effective_type = self.builder.get_local_type(effective_idx);
+            let loc = self.builder.global_env().get_node_loc(id);
+            let new_id = self.builder.global_env().new_node(loc, effective_type);
+            Some(ExpData::Temporary(new_id, effective_idx).into_exp())
+        } else {
+            None
+        }
+    }
+
+    fn rewrite_call(&mut self, id: NodeId, oper: &Operation, args: &[Exp]) -> Option<Exp> {
+        use ExpData::*;
+        use Operation::*;
+        match oper {
+            Global(None) if self.in_old => Some(
+                Call(
+                    id,
+                    Global(Some(self.save_memory(self.builder.get_memory_of_node(id)))),
+                    args.to_owned(),
+                )
+                .into_exp(),
+            ),
+            Exists(None) if self.in_old => Some(
+                Call(
+                    id,
+                    Exists(Some(self.save_memory(self.builder.get_memory_of_node(id)))),
+                    args.to_owned(),
+                )
+                .into_exp(),
+            ),
+            Function(mid, fid, None) if self.in_old => {
+                let used_memory = {
+                    let module_env = self.builder.global_env().get_module(*mid);
+                    let decl = module_env.get_spec_fun(*fid);
+                    // Unfortunately, the below clones are necessary, as we cannot borrow decl
+                    // and at the same time mutate self later.
+                    decl.used_memory.clone()
+                };
+                let inst = self.builder.global_env().get_node_instantiation(id);
+                let mut labels = vec![];
+                for mem in used_memory {
+                    let mem = mem.instantiate(&inst);
+                    labels.push(self.save_memory(mem));
+                }
+                Some(Call(id, Function(*mid, *fid, Some(labels)), args.to_owned()).into_exp())
+            }
+            Old => Some(args[0].to_owned()),
+            Result(n) => {
+                self.builder.set_loc_from_node(id);
+                Some(self.builder.mk_temporary(self.ret_locals[*n]))
+            }
+            Trace(kind) => {
+                let exp = args[0].to_owned();
+                let env = self.builder.global_env();
+                let loc = env.get_node_loc(id);
+                let trace_id = env.new_node(loc, env.get_node_type(exp.node_id()));
+                self.result
+                    .debug_traces
+                    .push((trace_id, *kind, exp.clone()));
+                Some(exp)
+            }
+            _ => None,
+        }
+    }
+
+    fn rewrite_node_id(&mut self, id: NodeId) -> Option<NodeId> {
+        if self.type_args.is_empty() {
+            None
+        } else {
+            ExpData::instantiate_node(self.builder.global_env(), id, self.type_args)
+        }
+    }
+
+    fn rewrite_enter_scope<'c>(&mut self, decls: impl Iterator<Item = &'c LocalVarDecl>) {
+        self.shadowed.push(decls.map(|d| d.name).collect())
+    }
+
+    fn rewrite_exit_scope(&mut self) {
+        self.shadowed.pop();
+    }
+}
diff --git a/vendors/move/crates/move-model/src/symbol.rs b/vendors/move/crates/move-model/src/symbol.rs
new file mode 100644
index 000000000..50741f536
--- /dev/null
+++ b/vendors/move/crates/move-model/src/symbol.rs
@@ -0,0 +1,91 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Contains definitions of symbols -- internalized strings which support fast hashing and
+//! comparison.
+
+use std::{
+    cell::RefCell,
+    collections::HashMap,
+    fmt,
+    fmt::{Error, Formatter},
+    rc::Rc,
+};
+
+/// Representation of a symbol.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct Symbol(usize);
+
+impl Symbol {
+    pub fn display<'a>(&'a self, pool: &'a SymbolPool) -> SymbolDisplay<'a> {
+        SymbolDisplay { sym: self, pool }
+    }
+}
+
+/// A helper to support symbols in formatting.
+pub struct SymbolDisplay<'a> {
+    sym: &'a Symbol,
+    pool: &'a SymbolPool,
+}
+
+impl<'a> fmt::Display for SymbolDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        f.write_str(&self.pool.string(*self.sym))
+    }
+}
+
+/// A pool of symbols. Allows to lookup a symbol by a string representation, and discover
+/// the string representation of an existing symbol. This struct does not need be mutable
+/// for operations on it, which is important so references to it can be freely passed around.
+#[derive(Debug)]
+pub struct SymbolPool {
+    inner: RefCell<InnerPool>,
+}
+
+#[derive(Debug)]
+struct InnerPool {
+    strings: Vec<Rc<String>>,
+    lookup: HashMap<Rc<String>, usize>,
+}
+
+impl SymbolPool {
+    /// Creates a new SymbolPool.
+    pub fn new() -> SymbolPool {
+        SymbolPool {
+            inner: RefCell::new(InnerPool {
+                strings: vec![],
+                lookup: HashMap::new(),
+            }),
+        }
+    }
+
+    /// Looks up a symbol by its string representation. If a symbol with this representation
+    /// already exists, it will be returned, otherwise a new one will be created in the
+    /// pool. The implementation uses internally a RefCell for storing symbols, so the pool
+    /// does not need to be mutable.
+    pub fn make(&self, s: &str) -> Symbol {
+        let mut pool = self.inner.borrow_mut();
+        let key = Rc::new(s.to_string());
+        if let Some(n) = pool.lookup.get(&key) {
+            return Symbol(*n);
+        }
+        let new_sym = pool.strings.len();
+        pool.strings.push(key.clone());
+        pool.lookup.insert(key, new_sym);
+        Symbol(new_sym)
+    }
+
+    /// Returns the string representation of this symbol, as an rc'ed string to avoid copies.
+    /// If the past symbol was not created from this pool, a runtime error may happen (or a wrong
+    /// string will be returned).
+    pub fn string(&self, sym: Symbol) -> Rc<String> {
+        self.inner.borrow().strings[sym.0].clone()
+    }
+}
+
+impl Default for SymbolPool {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/vendors/move/crates/move-model/src/ty.rs b/vendors/move/crates/move-model/src/ty.rs
new file mode 100644
index 000000000..688c6b5a2
--- /dev/null
+++ b/vendors/move/crates/move-model/src/ty.rs
@@ -0,0 +1,1314 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Contains types and related functions.
+
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt,
+    fmt::Formatter,
+};
+
+use move_binary_format::{file_format::TypeParameterIndex, normalized::Type as MType};
+use move_core_types::language_storage::{StructTag, TypeTag};
+
+use crate::{
+    ast::QualifiedSymbol,
+    model::{GlobalEnv, ModuleId, QualifiedInstId, StructEnv, StructId},
+    symbol::{Symbol, SymbolPool},
+};
+
+/// Represents a type.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
+pub enum Type {
+    Primitive(PrimitiveType),
+    Tuple(Vec<Type>),
+    Vector(Box<Type>),
+    Struct(ModuleId, StructId, Vec<Type>),
+    TypeParameter(u16),
+
+    // Types only appearing in programs.
+    Reference(bool, Box<Type>),
+
+    // Types only appearing in specifications
+    Fun(Vec<Type>, Box<Type>),
+    TypeDomain(Box<Type>),
+    ResourceDomain(ModuleId, StructId, Option<Vec<Type>>),
+
+    // Temporary types used during type checking
+    Error,
+    Var(u16),
+}
+
+pub const BOOL_TYPE: Type = Type::Primitive(PrimitiveType::Bool);
+pub const NUM_TYPE: Type = Type::Primitive(PrimitiveType::Num);
+
+/// Represents a primitive (builtin) type.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub enum PrimitiveType {
+    Bool,
+    U8,
+    U16,
+    U32,
+    U64,
+    U128,
+    U256,
+    Address,
+    Signer,
+    // Types only appearing in specifications
+    Num,
+    Range,
+    EventStore,
+}
+
+/// A type substitution.
+#[derive(Debug, Clone)]
+pub struct Substitution {
+    subs: BTreeMap<u16, Type>,
+}
+
+/// Represents an error resulting from type unification.
+pub enum TypeUnificationError {
+    TypeMismatch(Type, Type),
+    ArityMismatch(String, usize, usize),
+    CyclicSubstitution(Type, Type),
+}
+
+impl PrimitiveType {
+    /// Returns true if this type is a specification language only type
+    pub fn is_spec(&self) -> bool {
+        use PrimitiveType::*;
+        match self {
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => false,
+            Num | Range | EventStore => true,
+        }
+    }
+
+    /// Attempt to convert this type into a normalized::Type
+    pub fn into_normalized_type(self) -> Option<MType> {
+        use PrimitiveType::*;
+        Some(match self {
+            Bool => MType::Bool,
+            U8 => MType::U8,
+            U16 => MType::U16,
+            U32 => MType::U32,
+            U64 => MType::U64,
+            U128 => MType::U128,
+            U256 => MType::U256,
+            Address => MType::Address,
+            Signer => MType::Signer,
+            Num | Range | EventStore => return None,
+        })
+    }
+}
+
+impl Type {
+    pub fn new_prim(p: PrimitiveType) -> Type {
+        Type::Primitive(p)
+    }
+
+    /// Determines whether this is a type parameter.
+    pub fn is_type_parameter(&self) -> bool {
+        matches!(self, Type::TypeParameter(..))
+    }
+
+    /// Determines whether this is a reference.
+    pub fn is_reference(&self) -> bool {
+        matches!(self, Type::Reference(_, _))
+    }
+
+    /// Determines whether this is a mutable reference.
+    pub fn is_mutable_reference(&self) -> bool {
+        matches!(self, Type::Reference(true, _))
+    }
+
+    /// Determines whether this is an immutable reference.
+    pub fn is_immutable_reference(&self) -> bool {
+        matches!(self, Type::Reference(false, _))
+    }
+
+    /// Determines whether this type is a struct.
+    pub fn is_struct(&self) -> bool {
+        matches!(self, Type::Struct(..))
+    }
+
+    /// Determines whether this type is a vector
+    pub fn is_vector(&self) -> bool {
+        matches!(self, Type::Vector(..))
+    }
+
+    /// Determines whether this is a struct, or a vector of structs, or a reference to any of
+    /// those.
+    pub fn is_struct_or_vector_of_struct(&self) -> bool {
+        match self.skip_reference() {
+            Type::Struct(..) => true,
+            Type::Vector(ety) => ety.is_struct_or_vector_of_struct(),
+            _ => false,
+        }
+    }
+
+    /// Returns true if this type is a specification language only type or contains specification
+    /// language only types
+    pub fn is_spec(&self) -> bool {
+        use Type::*;
+        match self {
+            Primitive(p) => p.is_spec(),
+            Fun(..) | TypeDomain(..) | ResourceDomain(..) | Error => true,
+            Var(..) | TypeParameter(..) => false,
+            Tuple(ts) => ts.iter().any(|t| t.is_spec()),
+            Struct(_, _, ts) => ts.iter().any(|t| t.is_spec()),
+            Vector(et) => et.is_spec(),
+            Reference(_, bt) => bt.is_spec(),
+        }
+    }
+
+    /// Returns true if this is a bool.
+    pub fn is_bool(&self) -> bool {
+        if let Type::Primitive(PrimitiveType::Bool) = self {
+            return true;
+        }
+        false
+    }
+
+    /// Returns true if this is any number type.
+    pub fn is_number(&self) -> bool {
+        if let Type::Primitive(p) = self {
+            if let PrimitiveType::U8
+            | PrimitiveType::U16
+            | PrimitiveType::U32
+            | PrimitiveType::U64
+            | PrimitiveType::U128
+            | PrimitiveType::U256
+            | PrimitiveType::Num = p
+            {
+                return true;
+            }
+        }
+        false
+    }
+    /// Returns true if this is an address or signer type.
+    pub fn is_signer_or_address(&self) -> bool {
+        matches!(
+            self,
+            Type::Primitive(PrimitiveType::Signer) | Type::Primitive(PrimitiveType::Address)
+        )
+    }
+
+    /// Return true if this is an account address
+    pub fn is_address(&self) -> bool {
+        matches!(self, Type::Primitive(PrimitiveType::Address))
+    }
+
+    /// Return true if this is an account address
+    pub fn is_signer(&self) -> bool {
+        matches!(self, Type::Primitive(PrimitiveType::Signer))
+    }
+
+    /// Test whether this type can be used to substitute a type parameter
+    pub fn can_be_type_argument(&self) -> bool {
+        match self {
+            Type::Primitive(p) => !p.is_spec(),
+            Type::Tuple(..) => false,
+            Type::Vector(e) => e.can_be_type_argument(),
+            Type::Struct(_, _, insts) => insts.iter().all(|e| e.can_be_type_argument()),
+            Type::TypeParameter(..) => true,
+            // references cannot be a type argument
+            Type::Reference(..) => false,
+            // spec types cannot be a type argument
+            Type::Fun(..)
+            | Type::TypeDomain(..)
+            | Type::ResourceDomain(..)
+            | Type::Var(..)
+            | Type::Error => false,
+        }
+    }
+
+    /// Skip reference type.
+    pub fn skip_reference(&self) -> &Type {
+        if let Type::Reference(_, bt) = self {
+            bt
+        } else {
+            self
+        }
+    }
+
+    /// If this is a struct type, replace the type instantiation.
+    pub fn replace_struct_instantiation(&self, inst: &[Type]) -> Type {
+        match self {
+            Type::Struct(mid, sid, _) => Type::Struct(*mid, *sid, inst.to_vec()),
+            _ => self.clone(),
+        }
+    }
+
+    /// If this is a struct type, return the associated struct env and type parameters.
+    pub fn get_struct<'env>(
+        &'env self,
+        env: &'env GlobalEnv,
+    ) -> Option<(StructEnv<'env>, &'env [Type])> {
+        if let Type::Struct(module_idx, struct_idx, params) = self {
+            Some((env.get_module(*module_idx).into_struct(*struct_idx), params))
+        } else {
+            None
+        }
+    }
+
+    /// If this is a struct type, return the associated QualifiedInstId.
+    pub fn get_struct_id(&self, env: &GlobalEnv) -> Option<QualifiedInstId<StructId>> {
+        self.get_struct(env).map(|(se, inst)| {
+            se.module_env
+                .get_id()
+                .qualified(se.get_id())
+                .instantiate(inst.to_vec())
+        })
+    }
+
+    /// Require this to be a struct, if so extracts its content.
+    pub fn require_struct(&self) -> (ModuleId, StructId, &[Type]) {
+        if let Type::Struct(mid, sid, targs) = self {
+            (*mid, *sid, targs.as_slice())
+        } else {
+            panic!("expected `Type::Struct`, found: `{:?}`", self)
+        }
+    }
+
+    /// Instantiates type parameters in this type.
+    pub fn instantiate(&self, params: &[Type]) -> Type {
+        if params.is_empty() {
+            self.clone()
+        } else {
+            self.replace(Some(params), None)
+        }
+    }
+
+    /// Instantiate type parameters in the vector of types.
+    pub fn instantiate_vec(vec: Vec<Type>, params: &[Type]) -> Vec<Type> {
+        if params.is_empty() {
+            vec
+        } else {
+            vec.into_iter().map(|ty| ty.instantiate(params)).collect()
+        }
+    }
+
+    /// Instantiate type parameters in the slice of types.
+    pub fn instantiate_slice(slice: &[Type], params: &[Type]) -> Vec<Type> {
+        if params.is_empty() {
+            slice.to_owned()
+        } else {
+            slice.iter().map(|ty| ty.instantiate(params)).collect()
+        }
+    }
+
+    /// Convert a partial assignment for type parameters into an instantiation.
+    pub fn type_param_map_to_inst(arity: usize, map: BTreeMap<u16, Type>) -> Vec<Type> {
+        let mut inst: Vec<_> = (0..arity).map(|i| Type::TypeParameter(i as u16)).collect();
+        for (idx, ty) in map {
+            inst[idx as usize] = ty;
+        }
+        inst
+    }
+
+    /// A helper function to do replacement of type parameters.
+    fn replace(&self, params: Option<&[Type]>, subs: Option<&Substitution>) -> Type {
+        let replace_vec = |types: &[Type]| types.iter().map(|t| t.replace(params, subs)).collect();
+        match self {
+            Type::TypeParameter(i) => {
+                if let Some(ps) = params {
+                    ps[*i as usize].clone()
+                } else {
+                    self.clone()
+                }
+            }
+            Type::Var(i) => {
+                if let Some(s) = subs {
+                    if let Some(t) = s.subs.get(i) {
+                        // Recursively call replacement again here, in case the substitution s
+                        // refers to type variables.
+                        // TODO: a more efficient approach is to maintain that type assignments
+                        // are always fully specialized w.r.t. to the substitution.
+                        t.replace(params, subs)
+                    } else {
+                        self.clone()
+                    }
+                } else {
+                    self.clone()
+                }
+            }
+            Type::Reference(is_mut, bt) => {
+                Type::Reference(*is_mut, Box::new(bt.replace(params, subs)))
+            }
+            Type::Struct(mid, sid, args) => Type::Struct(*mid, *sid, replace_vec(args)),
+            Type::Fun(args, result) => {
+                Type::Fun(replace_vec(args), Box::new(result.replace(params, subs)))
+            }
+            Type::Tuple(args) => Type::Tuple(replace_vec(args)),
+            Type::Vector(et) => Type::Vector(Box::new(et.replace(params, subs))),
+            Type::TypeDomain(et) => Type::TypeDomain(Box::new(et.replace(params, subs))),
+            Type::ResourceDomain(mid, sid, args_opt) => {
+                Type::ResourceDomain(*mid, *sid, args_opt.as_ref().map(|args| replace_vec(args)))
+            }
+            Type::Primitive(..) | Type::Error => self.clone(),
+        }
+    }
+
+    /// Checks whether this type contains a type for which the predicate is true.
+    pub fn contains<P>(&self, p: &P) -> bool
+    where
+        P: Fn(&Type) -> bool,
+    {
+        if p(self) {
+            true
+        } else {
+            let contains_vec = |ts: &[Type]| ts.iter().any(p);
+            match self {
+                Type::Reference(_, bt) => bt.contains(p),
+                Type::Struct(_, _, args) => contains_vec(args),
+                Type::Fun(args, result) => contains_vec(args) || result.contains(p),
+                Type::Tuple(args) => contains_vec(args),
+                Type::Vector(et) => et.contains(p),
+                _ => false,
+            }
+        }
+    }
+
+    /// Returns true if this type is incomplete, i.e. contains any type variables.
+    pub fn is_incomplete(&self) -> bool {
+        use Type::*;
+        match self {
+            Var(_) => true,
+            Tuple(ts) => ts.iter().any(|t| t.is_incomplete()),
+            Fun(ts, r) => ts.iter().any(|t| t.is_incomplete()) || r.is_incomplete(),
+            Struct(_, _, ts) => ts.iter().any(|t| t.is_incomplete()),
+            Vector(et) => et.is_incomplete(),
+            Reference(_, bt) => bt.is_incomplete(),
+            TypeDomain(bt) => bt.is_incomplete(),
+            Error | Primitive(..) | TypeParameter(_) | ResourceDomain(..) => false,
+        }
+    }
+
+    /// Return true if this type contains generic types (i.e., types that can be instantiated).
+    pub fn is_open(&self) -> bool {
+        let mut has_var = false;
+        self.visit(&mut |t| has_var = has_var || matches!(t, Type::TypeParameter(_)));
+        has_var
+    }
+
+    /// Compute used modules in this type, adding them to the passed set.
+    pub fn module_usage(&self, usage: &mut BTreeSet<ModuleId>) {
+        use Type::*;
+        match self {
+            Tuple(ts) => ts.iter().for_each(|t| t.module_usage(usage)),
+            Fun(ts, r) => {
+                ts.iter().for_each(|t| t.module_usage(usage));
+                r.module_usage(usage);
+            }
+            Struct(mid, _, ts) => {
+                usage.insert(*mid);
+                ts.iter().for_each(|t| t.module_usage(usage));
+            }
+            Vector(et) => et.module_usage(usage),
+            Reference(_, bt) => bt.module_usage(usage),
+            TypeDomain(bt) => bt.module_usage(usage),
+            _ => {}
+        }
+    }
+
+    /// Attempt to convert this type into a normalized::Type
+    pub fn into_struct_type(self, env: &GlobalEnv) -> Option<MType> {
+        use Type::*;
+        match self {
+            Struct(mid, sid, ts) => env.get_struct_type(mid, sid, &ts),
+            _ => None,
+        }
+    }
+
+    /// Attempt to convert this type into a normalized::Type
+    pub fn into_normalized_type(self, env: &GlobalEnv) -> Option<MType> {
+        use Type::*;
+        match self {
+            Primitive(p) => Some(p.into_normalized_type().expect("Invariant violation: unexpected spec primitive")),
+            Struct(mid, sid, ts) =>
+                env.get_struct_type(mid, sid, &ts),
+            Vector(et) => Some(MType::Vector(
+                Box::new(et.into_normalized_type(env)
+                    .expect("Invariant violation: vector type argument contains incomplete, tuple, or spec type"))
+            )),
+            Reference(r, t) =>
+                if r {
+                    Some(MType::MutableReference(Box::new(t.into_normalized_type(env).expect("Invariant violation: reference type contains incomplete, tuple, or spec type"))))
+                } else {
+                    Some(MType::Reference(Box::new(t.into_normalized_type(env).expect("Invariant violation: reference type contains incomplete, tuple, or spec type"))))
+                }
+            TypeParameter(idx) => Some(MType::TypeParameter(idx)),
+            Tuple(..) | Error | Fun(..) | TypeDomain(..) | ResourceDomain(..) | Var(..) =>
+                None
+        }
+    }
+
+    /// Attempt to convert this type into a language_storage::StructTag
+    pub fn into_struct_tag(self, env: &GlobalEnv) -> Option<StructTag> {
+        self.into_struct_type(env)?.into_struct_tag()
+    }
+
+    /// Attempt to convert this type into a language_storage::TypeTag
+    pub fn into_type_tag(self, env: &GlobalEnv) -> Option<TypeTag> {
+        self.into_normalized_type(env)?.into_type_tag()
+    }
+
+    /// Create a `Type` from `t`
+    pub fn from_type_tag(t: &TypeTag, env: &GlobalEnv) -> Self {
+        use Type::*;
+        match t {
+            TypeTag::Bool => Primitive(PrimitiveType::Bool),
+            TypeTag::U8 => Primitive(PrimitiveType::U8),
+            TypeTag::U16 => Primitive(PrimitiveType::U8),
+            TypeTag::U32 => Primitive(PrimitiveType::U8),
+            TypeTag::U64 => Primitive(PrimitiveType::U64),
+            TypeTag::U128 => Primitive(PrimitiveType::U128),
+            TypeTag::U256 => Primitive(PrimitiveType::U8),
+            TypeTag::Address => Primitive(PrimitiveType::Address),
+            TypeTag::Signer => Primitive(PrimitiveType::Signer),
+            TypeTag::Struct(s) => {
+                let qid = env.find_struct_by_tag(s).unwrap_or_else(|| {
+                    panic!("Invariant violation: couldn't resolve struct {:?}", s)
+                });
+                let type_args = s
+                    .type_params
+                    .iter()
+                    .map(|arg| Self::from_type_tag(arg, env))
+                    .collect();
+                Struct(qid.module_id, qid.id, type_args)
+            }
+            TypeTag::Vector(type_param) => Vector(Box::new(Self::from_type_tag(type_param, env))),
+        }
+    }
+
+    /// Get the unbound type variables in the type.
+    pub fn get_vars(&self) -> BTreeSet<u16> {
+        let mut vars = BTreeSet::new();
+        self.internal_get_vars(&mut vars);
+        vars
+    }
+
+    fn internal_get_vars(&self, vars: &mut BTreeSet<u16>) {
+        use Type::*;
+        match self {
+            Var(id) => {
+                vars.insert(*id);
+            }
+            Tuple(ts) => ts.iter().for_each(|t| t.internal_get_vars(vars)),
+            Fun(ts, r) => {
+                r.internal_get_vars(vars);
+                ts.iter().for_each(|t| t.internal_get_vars(vars));
+            }
+            Struct(_, _, ts) => ts.iter().for_each(|t| t.internal_get_vars(vars)),
+            Vector(et) => et.internal_get_vars(vars),
+            Reference(_, bt) => bt.internal_get_vars(vars),
+            TypeDomain(bt) => bt.internal_get_vars(vars),
+            Error | Primitive(..) | TypeParameter(..) | ResourceDomain(..) => {}
+        }
+    }
+
+    pub fn visit<F: FnMut(&Type)>(&self, visitor: &mut F) {
+        let visit_slice = |s: &[Type], visitor: &mut F| {
+            for ty in s {
+                ty.visit(visitor);
+            }
+        };
+        match self {
+            Type::Tuple(tys) => visit_slice(tys, visitor),
+            Type::Vector(bt) => bt.visit(visitor),
+            Type::Struct(_, _, tys) => visit_slice(tys, visitor),
+            Type::Reference(_, ty) => ty.visit(visitor),
+            Type::Fun(tys, ty) => {
+                visit_slice(tys, visitor);
+                ty.visit(visitor);
+            }
+            Type::TypeDomain(bt) => bt.visit(visitor),
+            _ => {}
+        }
+        visitor(self)
+    }
+}
+
+/// A parameter for type unification that specifies the type compatibility rules to follow.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Variance {
+    /// Co-variance is allowed in all depths of the recursive type unification process
+    Allow,
+    /// Co-variance is only allowed for the outermost type unification round
+    Shallow,
+    /// Co-variance is not allowed at all
+    Disallow,
+}
+
+impl Substitution {
+    /// Creates a new substitution.
+    pub fn new() -> Self {
+        Self {
+            subs: BTreeMap::new(),
+        }
+    }
+
+    /// Binds the type variables.
+    pub fn bind(&mut self, var: u16, ty: Type) {
+        self.subs.insert(var, ty);
+    }
+
+    /// Specializes the type, substituting all variables bound in this substitution.
+    pub fn specialize(&self, t: &Type) -> Type {
+        t.replace(None, Some(self))
+    }
+
+    /// Return either a shallow or deep substitution of the type variable.
+    ///
+    /// If deep substitution is requested, follow down the substitution chain until either
+    /// - `Some(ty)` when the final type is not a type variable or
+    /// - `None` when the final type variable does not have a substitution
+    pub fn get_substitution(&self, var: u16, shallow: bool) -> Option<Type> {
+        match self.subs.get(&var) {
+            None => None,
+            Some(Type::Var(next_var)) => {
+                if shallow {
+                    Some(Type::Var(*next_var))
+                } else {
+                    self.get_substitution(*next_var, false)
+                }
+            }
+            Some(subst_ty) => Some(subst_ty.clone()),
+        }
+    }
+
+    /// Unify two types, returning the unified type.
+    ///
+    /// This currently implements the following notion of type compatibility:
+    ///
+    /// - 1) References are dropped (i.e. &T and T are compatible)
+    /// - 2) All integer types are compatible if co-variance is allowed.
+    /// - 3) With the joint effect of 1) and 2), if (P, Q) is compatible under co-variance,
+    ///      (&P, Q), (P, &Q), and (&P, &Q) are all compatible under co-variance.
+    /// - 4) If in two tuples (P1, P2, ..., Pn) and (Q1, Q2, ..., Qn), all (Pi, Qi) pairs are
+    ///      compatible under co-variance, then the two tuples are compatible under co-variance.
+    ///
+    /// The substitution will be refined by variable assignments as needed to perform
+    /// unification. If unification fails, the substitution will be in some intermediate state;
+    /// to implement transactional unification, the substitution must be cloned before calling
+    /// this.
+    pub fn unify(
+        &mut self,
+        variance: Variance,
+        t1: &Type,
+        t2: &Type,
+    ) -> Result<Type, TypeUnificationError> {
+        // Derive the variance level for recursion
+        let sub_variance = match variance {
+            Variance::Allow => Variance::Allow,
+            Variance::Shallow | Variance::Disallow => Variance::Disallow,
+        };
+        // If any of the arguments is a reference, drop it for unification, but ensure
+        // it is put back since we need to maintain this information for later phases.
+        if let Type::Reference(is_mut, bt1) = t1 {
+            // Avoid creating nested references.
+            let t2 = if let Type::Reference(_, bt2) = t2 {
+                bt2.as_ref()
+            } else {
+                t2
+            };
+            return Ok(Type::Reference(
+                *is_mut,
+                Box::new(self.unify(sub_variance, bt1.as_ref(), t2)?),
+            ));
+        }
+        if let Type::Reference(is_mut, bt2) = t2 {
+            return Ok(Type::Reference(
+                *is_mut,
+                Box::new(self.unify(sub_variance, t1, bt2.as_ref())?),
+            ));
+        }
+
+        // Substitute or assign variables.
+        if let Some(rt) = self.try_substitute_or_assign(variance, false, t1, t2)? {
+            return Ok(rt);
+        }
+        if let Some(rt) = self.try_substitute_or_assign(variance, true, t2, t1)? {
+            return Ok(rt);
+        }
+
+        // Accept any error type.
+        if matches!(t1, Type::Error) {
+            return Ok(t2.clone());
+        }
+        if matches!(t2, Type::Error) {
+            return Ok(t1.clone());
+        }
+
+        // Unify matching structured types.
+        match (t1, t2) {
+            (Type::Primitive(p1), Type::Primitive(p2)) => {
+                if p1 == p2 {
+                    return Ok(t1.clone());
+                }
+                // All integer types are compatible if co-variance is allowed.
+                if matches!(variance, Variance::Allow | Variance::Shallow)
+                    && t1.is_number()
+                    && t2.is_number()
+                {
+                    return Ok(Type::Primitive(PrimitiveType::Num));
+                }
+            }
+            (Type::TypeParameter(idx1), Type::TypeParameter(idx2)) => {
+                if idx1 == idx2 {
+                    return Ok(t1.clone());
+                }
+            }
+            (Type::Tuple(ts1), Type::Tuple(ts2)) => {
+                return Ok(Type::Tuple(self.unify_vec(
+                    sub_variance,
+                    ts1,
+                    ts2,
+                    "tuples",
+                )?));
+            }
+            (Type::Fun(ts1, r1), Type::Fun(ts2, r2)) => {
+                return Ok(Type::Fun(
+                    self.unify_vec(sub_variance, ts1, ts2, "functions")?,
+                    Box::new(self.unify(sub_variance, r1, r2)?),
+                ));
+            }
+            (Type::Struct(m1, s1, ts1), Type::Struct(m2, s2, ts2)) => {
+                if m1 == m2 && s1 == s2 {
+                    return Ok(Type::Struct(
+                        *m1,
+                        *s1,
+                        self.unify_vec(sub_variance, ts1, ts2, "structs")?,
+                    ));
+                }
+            }
+            (Type::Vector(e1), Type::Vector(e2)) => {
+                return Ok(Type::Vector(Box::new(self.unify(sub_variance, e1, e2)?)));
+            }
+            (Type::TypeDomain(e1), Type::TypeDomain(e2)) => {
+                return Ok(Type::TypeDomain(Box::new(self.unify(
+                    sub_variance,
+                    e1,
+                    e2,
+                )?)));
+            }
+            _ => {}
+        }
+        Err(TypeUnificationError::TypeMismatch(
+            self.specialize(t1),
+            self.specialize(t2),
+        ))
+    }
+
+    /// Helper to unify two type vectors.
+    fn unify_vec(
+        &mut self,
+        variance: Variance,
+        ts1: &[Type],
+        ts2: &[Type],
+        item_name: &str,
+    ) -> Result<Vec<Type>, TypeUnificationError> {
+        if ts1.len() != ts2.len() {
+            return Err(TypeUnificationError::ArityMismatch(
+                item_name.to_owned(),
+                ts1.len(),
+                ts2.len(),
+            ));
+        }
+        let mut rs = vec![];
+        for i in 0..ts1.len() {
+            rs.push(self.unify(variance, &ts1[i], &ts2[i])?);
+        }
+        Ok(rs)
+    }
+
+    /// Tries to substitute or assign a variable. Returned option is Some if unification
+    /// was performed, None if not.
+    fn try_substitute_or_assign(
+        &mut self,
+        variance: Variance,
+        swapped: bool,
+        t1: &Type,
+        t2: &Type,
+    ) -> Result<Option<Type>, TypeUnificationError> {
+        if let Type::Var(v1) = t1 {
+            if let Some(s1) = self.subs.get(v1).cloned() {
+                return if swapped {
+                    // Place the type terms in the right order again, so we
+                    // get the 'expected vs actual' direction right.
+                    Ok(Some(self.unify(variance, t2, &s1)?))
+                } else {
+                    Ok(Some(self.unify(variance, &s1, t2)?))
+                };
+            }
+            let is_t1_var = |t: &Type| {
+                if let Type::Var(v2) = t {
+                    v1 == v2
+                } else {
+                    false
+                }
+            };
+            // Skip the cycle check if we are unifying the same two variables.
+            if is_t1_var(t2) {
+                return Ok(Some(t1.clone()));
+            }
+            // Cycle check.
+            if !t2.contains(&is_t1_var) {
+                self.subs.insert(*v1, t2.clone());
+                Ok(Some(t2.clone()))
+            } else {
+                // It is not clear to me whether this can ever occur given we do no global
+                // unification with recursion, but to be on the save side, we have it.
+                Err(TypeUnificationError::CyclicSubstitution(
+                    self.specialize(t1),
+                    self.specialize(t2),
+                ))
+            }
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Default for Substitution {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Helper to unify types which stem from different generic contexts.
+///
+/// Both comparison side may have type parameters (equally named as #0, #1, ...).
+/// The helper converts the type parameter from or both sides into variables
+/// and then performs unification of the terms. The resulting substitution
+/// is converted back to parameter instantiations.
+///
+/// Example: consider a function f<X> which uses memory M<X, u64>, and invariant
+/// invariant<X> which uses memory M<bool, X>. Using this helper to unify both
+/// memories will result in instantiations which when applied create f<bool>
+/// and invariant<u64> respectively.
+pub struct TypeUnificationAdapter {
+    type_vars_map: BTreeMap<u16, (bool, TypeParameterIndex)>,
+    types_adapted_lhs: Vec<Type>,
+    types_adapted_rhs: Vec<Type>,
+}
+
+impl TypeUnificationAdapter {
+    /// Initialize the context for the type unifier.
+    ///
+    /// If `treat_lhs_type_param_as_var_after_index` is set to P,
+    /// - any type parameter on the LHS with index < P will be treated as concrete types and
+    /// - only type parameters on the LHS with index >= P are treated as variables and thus,
+    ///   participate in the type unification process.
+    /// The same rule applies to the RHS parameters via `treat_rhs_type_param_as_var_after_index`.
+    fn new<'a, I>(
+        lhs_types: I,
+        rhs_types: I,
+        treat_lhs_type_param_as_var_after_index: Option<TypeParameterIndex>,
+        treat_rhs_type_param_as_var_after_index: Option<TypeParameterIndex>,
+    ) -> Self
+    where
+        I: Iterator<Item = &'a Type> + Clone,
+    {
+        debug_assert!(
+            treat_lhs_type_param_as_var_after_index.is_some()
+                || treat_rhs_type_param_as_var_after_index.is_some(),
+            "At least one side of the unification must be treated as variable"
+        );
+
+        // Check the input types do not contain type variables.
+        debug_assert!(
+            lhs_types.clone().chain(rhs_types.clone()).all(|ty| {
+                let mut b = true;
+                ty.visit(&mut |t| b = b && !matches!(t, Type::Var(_)));
+                b
+            }),
+            "unexpected type variable"
+        );
+
+        // Compute the number of type parameters for each side.
+        let mut lhs_type_param_count = 0;
+        let mut rhs_type_param_count = 0;
+        let count_type_param = |t: &Type, current: &mut u16| {
+            if let Type::TypeParameter(idx) = t {
+                *current = (*current).max(*idx + 1);
+            }
+        };
+        for ty in lhs_types.clone() {
+            ty.visit(&mut |t| count_type_param(t, &mut lhs_type_param_count));
+        }
+        for ty in rhs_types.clone() {
+            ty.visit(&mut |t| count_type_param(t, &mut rhs_type_param_count));
+        }
+
+        // Create a type variable instantiation for each side.
+        let mut var_count = 0;
+        let mut type_vars_map = BTreeMap::new();
+        let lhs_inst = match treat_lhs_type_param_as_var_after_index {
+            None => vec![],
+            Some(boundary) => (0..boundary)
+                .map(Type::TypeParameter)
+                .chain((boundary..lhs_type_param_count).map(|i| {
+                    let idx = var_count;
+                    var_count += 1;
+                    type_vars_map.insert(idx, (true, i));
+                    Type::Var(idx)
+                }))
+                .collect(),
+        };
+        let rhs_inst = match treat_rhs_type_param_as_var_after_index {
+            None => vec![],
+            Some(boundary) => (0..boundary)
+                .map(Type::TypeParameter)
+                .chain((boundary..rhs_type_param_count).map(|i| {
+                    let idx = var_count;
+                    var_count += 1;
+                    type_vars_map.insert(idx, (false, i));
+                    Type::Var(idx)
+                }))
+                .collect(),
+        };
+
+        // Do the adaptation.
+        let types_adapted_lhs = lhs_types.map(|t| t.instantiate(&lhs_inst)).collect();
+        let types_adapted_rhs = rhs_types.map(|t| t.instantiate(&rhs_inst)).collect();
+
+        Self {
+            type_vars_map,
+            types_adapted_lhs,
+            types_adapted_rhs,
+        }
+    }
+
+    /// Create a TypeUnificationAdapter with the goal of unifying a pair of types.
+    ///
+    /// If `treat_lhs_type_param_as_var` is True, treat all type parameters on the LHS as variables.
+    /// If `treat_rhs_type_param_as_var` is True, treat all type parameters on the RHS as variables.
+    pub fn new_pair(
+        lhs_type: &Type,
+        rhs_type: &Type,
+        treat_lhs_type_param_as_var: bool,
+        treat_rhs_type_param_as_var: bool,
+    ) -> Self {
+        Self::new(
+            std::iter::once(lhs_type),
+            std::iter::once(rhs_type),
+            treat_lhs_type_param_as_var.then_some(0),
+            treat_rhs_type_param_as_var.then_some(0),
+        )
+    }
+
+    /// Create a TypeUnificationAdapter with the goal of unifying a pair of type tuples.
+    ///
+    /// If `treat_lhs_type_param_as_var` is True, treat all type parameters on the LHS as variables.
+    /// If `treat_rhs_type_param_as_var` is True, treat all type parameters on the RHS as variables.
+    pub fn new_vec(
+        lhs_types: &[Type],
+        rhs_types: &[Type],
+        treat_lhs_type_param_as_var: bool,
+        treat_rhs_type_param_as_var: bool,
+    ) -> Self {
+        Self::new(
+            lhs_types.iter(),
+            rhs_types.iter(),
+            treat_lhs_type_param_as_var.then_some(0),
+            treat_rhs_type_param_as_var.then_some(0),
+        )
+    }
+
+    /// Consume the TypeUnificationAdapter and produce the unification result. If type unification
+    /// is successful, return a pair of instantiations for type parameters on each side which
+    /// unify the LHS and RHS respectively. If the LHS and RHS cannot unify, None is returned.
+    pub fn unify(
+        self,
+        variance: Variance,
+        shallow_subst: bool,
+    ) -> Option<(BTreeMap<u16, Type>, BTreeMap<u16, Type>)> {
+        let mut subst = Substitution::new();
+        match subst.unify_vec(
+            variance,
+            &self.types_adapted_lhs,
+            &self.types_adapted_rhs,
+            "",
+        ) {
+            Ok(_) => {
+                let mut inst_lhs = BTreeMap::new();
+                let mut inst_rhs = BTreeMap::new();
+                for (var_idx, (is_lhs, param_idx)) in &self.type_vars_map {
+                    let subst_ty = match subst.get_substitution(*var_idx, shallow_subst) {
+                        None => continue,
+                        Some(Type::Var(subst_var_idx)) => {
+                            match self.type_vars_map.get(&subst_var_idx) {
+                                None => {
+                                    // If the original types do not contain free type
+                                    // variables, this should not happen.
+                                    panic!("unexpected type variable");
+                                }
+                                Some((_, subs_param_idx)) => {
+                                    // There can be either lhs or rhs type parameters left, but
+                                    // not both sides, so it is unambiguous to just return it here.
+                                    Type::TypeParameter(*subs_param_idx)
+                                }
+                            }
+                        }
+                        Some(subst_ty) => subst_ty.clone(),
+                    };
+                    let inst = if *is_lhs {
+                        &mut inst_lhs
+                    } else {
+                        &mut inst_rhs
+                    };
+                    inst.insert(*param_idx, subst_ty);
+                }
+
+                Some((inst_lhs, inst_rhs))
+            }
+            Err(_) => None,
+        }
+    }
+}
+
+impl TypeUnificationError {
+    pub fn message(&self, display_context: &TypeDisplayContext) -> String {
+        match self {
+            TypeUnificationError::TypeMismatch(t1, t2) => {
+                format!(
+                    "expected `{}` but found `{}`",
+                    t2.display(display_context),
+                    t1.display(display_context),
+                )
+            }
+            TypeUnificationError::ArityMismatch(item, a1, a2) => {
+                format!("{} have different arity ({} != {})", item, a1, a2)
+            }
+            TypeUnificationError::CyclicSubstitution(t1, t2) => {
+                format!(
+                    "[internal] type unification cycle check failed ({} =?= {})",
+                    t1.display(display_context),
+                    t2.display(display_context),
+                )
+            }
+        }
+    }
+}
+
+/// A helper to derive the set of instantiations for type parameters
+pub struct TypeInstantiationDerivation {}
+
+impl TypeInstantiationDerivation {
+    /// Find what the instantiations should we have for the type parameter at `target_param_index`.
+    ///
+    /// The invariant is, forall type parameters whose index < target_param_index, it should either
+    /// - be assigned with a concrete type already and hence, ceases to be a type parameter, or
+    /// - does not have any matching instantiation and hence, either remains a type parameter or is
+    ///   represented as a type error.
+    /// But in anyway, these type parameters no longer participate in type unification anymore.
+    ///
+    /// If `target_lhs` is True, derive instantiations for the type parameter with
+    /// `target_param_index` on the `lhs_types`. Otherwise, target the `rhs_types`.
+    fn derive_instantiations_for_target_parameter(
+        lhs_types: &BTreeSet<Type>,
+        rhs_types: &BTreeSet<Type>,
+        treat_lhs_type_param_as_var: bool,
+        treat_rhs_type_param_as_var: bool,
+        target_param_index: TypeParameterIndex,
+        target_lhs: bool,
+    ) -> BTreeSet<Type> {
+        // progressively increase the boundary
+        let treat_lhs_type_param_as_var_after_index =
+            treat_lhs_type_param_as_var.then_some(if target_lhs { target_param_index } else { 0 });
+        let treat_rhs_type_param_as_var_after_index =
+            treat_rhs_type_param_as_var.then_some(if target_lhs { 0 } else { target_param_index });
+
+        let mut target_param_insts = BTreeSet::new();
+        for t_lhs in lhs_types {
+            for t_rhs in rhs_types {
+                // Try to unify the instantiations
+                let adapter = TypeUnificationAdapter::new(
+                    std::iter::once(t_lhs),
+                    std::iter::once(t_rhs),
+                    treat_lhs_type_param_as_var_after_index,
+                    treat_rhs_type_param_as_var_after_index,
+                );
+                let rel = adapter.unify(Variance::Allow, false);
+                if let Some((subst_lhs, subst_rhs)) = rel {
+                    let subst = if target_lhs { subst_lhs } else { subst_rhs };
+                    for (param_idx, inst_ty) in subst.into_iter() {
+                        if param_idx != target_param_index {
+                            // this parameter will be unified at a later stage.
+                            //
+                            // NOTE: this code is inefficient when we have multiple type parameters,
+                            // but a vast majority of Move code we see so far have at most one type
+                            // parameter, so we trade-off efficiency with simplicity in code.
+                            assert!(param_idx > target_param_index);
+                            continue;
+                        }
+                        target_param_insts.insert(inst_ty);
+                    }
+                }
+            }
+        }
+        target_param_insts
+    }
+
+    /// Find the set of valid instantiation combinations for all the type parameters.
+    ///
+    /// The algorithm is progressive. For a list of parameters with arity `params_arity = N`, it
+    /// - first finds all possible instantiation for parameter at index 0 (`inst_param_0`) and,'
+    /// - for each instantiation in `inst_param_0`,
+    ///   - refines LHS or RHS types and
+    ///   - finds all possible instantiations for parameter at index 1 (`inst_param_1`)
+    ///   - for each instantiation in `inst_param_1`,
+    ///     - refines LHS or RHS types and
+    ///     - finds all possible instantiations for parameter at index 2 (`inst_param_2`)
+    ///     - for each instantiation in `inst_param_2`,
+    ///       - ......
+    /// The process continues until all type parameters are analyzed (i.e., reaching the type
+    /// parameter at index `N`).
+    ///
+    /// If `refine_lhs` is True, refine the `lhs_types` after each round; same for `refine_rhs`.
+    ///
+    /// If `target_lhs` is True, find instantiations for the type parameters in the `lhs_types`,
+    /// otherwise, target the `rhs_types`.
+    ///
+    /// If `mark_irrelevant_param_as_error` is True, type parameters that do not have any valid
+    /// instantiation will be marked as `Type::Error`. Otherwise, leave the type parameter as it is.
+    pub fn progressive_instantiation<'a, I>(
+        lhs_types: I,
+        rhs_types: I,
+        treat_lhs_type_param_as_var: bool,
+        treat_rhs_type_param_as_var: bool,
+        refine_lhs: bool,
+        refine_rhs: bool,
+        params_arity: usize,
+        target_lhs: bool,
+        mark_irrelevant_param_as_error: bool,
+    ) -> BTreeSet<Vec<Type>>
+    where
+        I: Iterator<Item = &'a Type> + Clone,
+    {
+        let initial_param_insts: Vec<_> = (0..params_arity)
+            .map(|idx| Type::TypeParameter(idx as TypeParameterIndex))
+            .collect();
+
+        let mut work_queue = VecDeque::new();
+        work_queue.push_back(initial_param_insts);
+        for target_param_index in 0..params_arity {
+            let mut for_next_round = vec![];
+            while let Some(param_insts) = work_queue.pop_front() {
+                // refine the memory usage sets with current param instantiations
+                let refined_lhs = lhs_types
+                    .clone()
+                    .map(|t| {
+                        if refine_lhs {
+                            t.instantiate(&param_insts)
+                        } else {
+                            t.clone()
+                        }
+                    })
+                    .collect();
+                let refined_rhs = rhs_types
+                    .clone()
+                    .map(|t| {
+                        if refine_rhs {
+                            t.instantiate(&param_insts)
+                        } else {
+                            t.clone()
+                        }
+                    })
+                    .collect();
+
+                // find type instantiations for the target parameter index
+                let mut target_param_insts = Self::derive_instantiations_for_target_parameter(
+                    &refined_lhs,
+                    &refined_rhs,
+                    treat_lhs_type_param_as_var,
+                    treat_rhs_type_param_as_var,
+                    target_param_index as TypeParameterIndex,
+                    target_lhs,
+                );
+
+                // decide what to do with an irrelevant type parameter
+                if target_param_insts.is_empty() {
+                    let irrelevant_type = if mark_irrelevant_param_as_error {
+                        Type::Error
+                    } else {
+                        Type::TypeParameter(target_param_index as TypeParameterIndex)
+                    };
+                    target_param_insts.insert(irrelevant_type);
+                }
+
+                // instantiate the target type parameter in every possible way
+                for inst in target_param_insts {
+                    let mut next_insts = param_insts.clone();
+                    next_insts[target_param_index] = inst;
+                    for_next_round.push(next_insts);
+                }
+            }
+            work_queue.extend(for_next_round);
+        }
+
+        // the final workqueue contains possible instantiations for all type parameters
+        work_queue.into_iter().collect()
+    }
+}
+
+/// Data providing context for displaying types.
+pub enum TypeDisplayContext<'a> {
+    WithoutEnv {
+        symbol_pool: &'a SymbolPool,
+        reverse_struct_table: &'a BTreeMap<(ModuleId, StructId), QualifiedSymbol>,
+    },
+    WithEnv {
+        env: &'a GlobalEnv,
+        type_param_names: Option<Vec<Symbol>>,
+    },
+}
+
+impl<'a> TypeDisplayContext<'a> {
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        match self {
+            TypeDisplayContext::WithEnv { env, .. } => env.symbol_pool(),
+            TypeDisplayContext::WithoutEnv { symbol_pool, .. } => symbol_pool,
+        }
+    }
+}
+
+/// Helper for type displays.
+pub struct TypeDisplay<'a> {
+    type_: &'a Type,
+    context: &'a TypeDisplayContext<'a>,
+}
+
+impl Type {
+    pub fn display<'a>(&'a self, context: &'a TypeDisplayContext<'a>) -> TypeDisplay<'a> {
+        TypeDisplay {
+            type_: self,
+            context,
+        }
+    }
+}
+
+impl<'a> fmt::Display for TypeDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use Type::*;
+        let comma_list = |f: &mut Formatter<'_>, ts: &[Type]| -> fmt::Result {
+            let mut first = true;
+            for t in ts {
+                if first {
+                    first = false
+                } else {
+                    f.write_str(", ")?;
+                }
+                write!(f, "{}", t.display(self.context))?;
+            }
+            Ok(())
+        };
+        match self.type_ {
+            Primitive(p) => write!(f, "{}", p),
+            Tuple(ts) => {
+                f.write_str("(")?;
+                comma_list(f, ts)?;
+                f.write_str(")")
+            }
+            Vector(t) => write!(f, "vector<{}>", t.display(self.context)),
+            TypeDomain(t) => write!(f, "domain<{}>", t.display(self.context)),
+            ResourceDomain(mid, sid, inst_opt) => {
+                write!(f, "resources<{}", self.struct_str(*mid, *sid))?;
+                if let Some(inst) = inst_opt {
+                    f.write_str("<")?;
+                    comma_list(f, inst)?;
+                    f.write_str(">")?;
+                }
+                f.write_str(">")
+            }
+            Fun(ts, t) => {
+                f.write_str("|")?;
+                comma_list(f, ts)?;
+                f.write_str("|")?;
+                write!(f, "{}", t.display(self.context))
+            }
+            Struct(mid, sid, ts) => {
+                write!(f, "{}", self.struct_str(*mid, *sid))?;
+                if !ts.is_empty() {
+                    f.write_str("<")?;
+                    comma_list(f, ts)?;
+                    f.write_str(">")?;
+                }
+                Ok(())
+            }
+            Reference(is_mut, t) => {
+                f.write_str("&")?;
+                if *is_mut {
+                    f.write_str("mut ")?;
+                }
+                write!(f, "{}", t.display(self.context))
+            }
+            TypeParameter(idx) => {
+                if let TypeDisplayContext::WithEnv {
+                    env,
+                    type_param_names: Some(names),
+                } = self.context
+                {
+                    let idx = *idx as usize;
+                    if idx < names.len() {
+                        write!(f, "{}", names[idx].display(env.symbol_pool()))
+                    } else {
+                        write!(f, "#{}", idx)
+                    }
+                } else {
+                    write!(f, "#{}", idx)
+                }
+            }
+            Var(idx) => write!(f, "?{}", idx),
+            Error => f.write_str("*error*"),
+        }
+    }
+}
+
+impl<'a> TypeDisplay<'a> {
+    fn struct_str(&self, mid: ModuleId, sid: StructId) -> String {
+        match self.context {
+            TypeDisplayContext::WithoutEnv {
+                symbol_pool,
+                reverse_struct_table,
+            } => {
+                if let Some(sym) = reverse_struct_table.get(&(mid, sid)) {
+                    sym.display(symbol_pool).to_string()
+                } else {
+                    "??unknown??".to_string()
+                }
+            }
+            TypeDisplayContext::WithEnv { env, .. } => {
+                let struct_env = env.get_module(mid).into_struct(sid);
+                format!(
+                    "{}::{}",
+                    struct_env.module_env.get_name().display(env.symbol_pool()),
+                    struct_env.get_name().display(env.symbol_pool())
+                )
+            }
+        }
+    }
+}
+
+impl fmt::Display for PrimitiveType {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use PrimitiveType::*;
+        match self {
+            Bool => f.write_str("bool"),
+            U8 => f.write_str("u8"),
+            U16 => f.write_str("u16"),
+            U32 => f.write_str("u32"),
+            U64 => f.write_str("u64"),
+            U128 => f.write_str("u128"),
+            U256 => f.write_str("u256"),
+            Address => f.write_str("address"),
+            Signer => f.write_str("signer"),
+            Range => f.write_str("range"),
+            Num => f.write_str("num"),
+            EventStore => f.write_str("estore"),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-model/src/well_known.rs b/vendors/move/crates/move-model/src/well_known.rs
new file mode 100644
index 000000000..609c97424
--- /dev/null
+++ b/vendors/move/crates/move-model/src/well_known.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Names of well-known functions.
+//!
+//! This currently only contains those declarations used somewhere, not all well-known
+//! declarations. It can be extended on the go.
+
+pub const VECTOR_BORROW_MUT: &str = "vector::borrow_mut";
+pub const EVENT_EMIT_EVENT: &str = "event::emit_event";
+
+pub const TYPE_NAME_MOVE: &str = "type_info::type_name";
+pub const TYPE_NAME_SPEC: &str = "type_info::$type_name";
+pub const TYPE_INFO_MOVE: &str = "type_info::type_of";
+pub const TYPE_INFO_SPEC: &str = "type_info::$type_of";
+pub const TYPE_SPEC_IS_STRUCT: &str = "type_info::spec_is_struct";
+
+pub const TYPE_NAME_GET_MOVE: &str = "type_name::get";
+pub const TYPE_NAME_GET_SPEC: &str = "type_name::$get";
+
+// NOTE: `type_info::type_name` and `type_name::get` are very similar.
+// The main difference (from a prover's perspective) include:
+// - formatting of an address (part of the struct name), and
+// - whether it is in `stdlib` or `extlib`.
diff --git a/vendors/move/crates/move-model/tests/sources/conditions_err.exp b/vendors/move/crates/move-model/tests/sources/conditions_err.exp
new file mode 100644
index 000000000..7929ede84
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/conditions_err.exp
@@ -0,0 +1,23 @@
+error: expected `bool` but found `u64` in name expression
+  ┌─ tests/sources/conditions_err.move:7:15
+  │
+7 │     aborts_if x;
+  │               ^
+
+error: expected `bool` but found `num` in expression
+  ┌─ tests/sources/conditions_err.move:8:13
+  │
+8 │     ensures old(x) + x;
+  │             ^^^^^^^^^^
+
+error: undeclared `M::result_1`
+   ┌─ tests/sources/conditions_err.move:10:13
+   │
+10 │     ensures result_1 == 0;
+   │             ^^^^^^^^
+
+error: expected `bool` but found `u64` in name expression
+   ┌─ tests/sources/conditions_err.move:17:28
+   │
+17 │     emits _msg to _guid if x;
+   │                            ^
diff --git a/vendors/move/crates/move-model/tests/sources/conditions_err.move b/vendors/move/crates/move-model/tests/sources/conditions_err.move
new file mode 100644
index 000000000..44eb4337b
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/conditions_err.move
@@ -0,0 +1,19 @@
+module 0x42::M {
+
+  fun add_some(x: &mut u64): u64 { *x = *x + 1; *x }
+
+  spec add_some {
+    // Type of condition not bool.
+    aborts_if x;
+    ensures old(x) + x;
+    // Using result which does not exist.
+    ensures result_1 == 0;
+  }
+
+  fun with_emits<T: drop>(_guid: vector<u8>, _msg: T, x: u64): u64 { x }
+
+  spec with_emits {
+    // Type of condition for "if" is not bool.
+    emits _msg to _guid if x;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/conditions_ok.exp b/vendors/move/crates/move-model/tests/sources/conditions_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/conditions_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/conditions_ok.move b/vendors/move/crates/move-model/tests/sources/conditions_ok.move
new file mode 100644
index 000000000..db1970789
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/conditions_ok.move
@@ -0,0 +1,25 @@
+module 0x42::M {
+
+  fun add_some(x: &mut u64): u64 { *x = *x + 1; *x }
+
+  spec add_some {
+    global some_global: u64;
+    aborts_if x == 0 || some_global == 0;
+    ensures old(x) > x;
+    ensures result == x;
+  }
+
+  fun multiple_results(x: u64): (u64, bool) { (x, true) }
+
+  spec multiple_results {
+    ensures x == result_1 && result_2 == true;
+  }
+
+  fun with_emits<T: drop>(_guid: vector<u8>, _msg: T, x: u64): u64 { x }
+
+  spec with_emits {
+    emits _msg to _guid;
+    emits _msg to _guid if true;
+    emits _msg to _guid if x > 7;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_err.exp b/vendors/move/crates/move-model/tests/sources/expressions_err.exp
new file mode 100644
index 000000000..4209d49f3
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_err.exp
@@ -0,0 +1,53 @@
+error: undeclared `M::x`
+   ┌─ tests/sources/expressions_err.move:12:7
+   │
+12 │       x
+   │       ^
+
+error: no function named `not_declared` found
+   ┌─ tests/sources/expressions_err.move:17:7
+   │
+17 │       not_declared()
+   │       ^^^^^^^^^^^^^^
+
+error: expected `num` but found `bool` in expression
+   ┌─ tests/sources/expressions_err.move:22:7
+   │
+22 │       false
+   │       ^^^^^
+
+error: no matching declaration of `>`
+   ┌─ tests/sources/expressions_err.move:27:7
+   │
+27 │       x > y
+   │       ^^^^^
+   │
+   = outruled candidate `>(num, num): bool` (expected `num` but found `vector<num>` for argument 1)
+
+error: expected `(num, bool)` but found `bool` in expression
+   ┌─ tests/sources/expressions_err.move:32:7
+   │
+32 │       false
+   │       ^^^^^
+
+error: no matching declaration of `M::wrongly_typed_callee`
+   ┌─ tests/sources/expressions_err.move:37:39
+   │
+37 │     fun wrongly_typed_caller(): num { wrongly_typed_callee(1, 1) }
+   │                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = outruled candidate `M::wrongly_typed_callee(num, bool): num` (expected `bool` but found `u256` for argument 2)
+
+error: expected `num` but found `bool` in expression
+   ┌─ tests/sources/expressions_err.move:41:80
+   │
+41 │     fun wrongly_typed_fun_arg_caller(): num { wrongly_typed_fun_arg_callee(|x| false) }
+   │                                                                                ^^^^^
+
+error: no matching declaration of `M::wrong_instantiation`
+   ┌─ tests/sources/expressions_err.move:46:7
+   │
+46 │       wrong_instantiation<u64>(x)
+   │       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = outruled candidate `M::wrong_instantiation(#0): #0` (generic count mismatch (expected 2 but found 1))
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_err.move b/vendors/move/crates/move-model/tests/sources/expressions_err.move
new file mode 100644
index 000000000..8e2afe492
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_err.move
@@ -0,0 +1,49 @@
+module 0x42::M {
+
+  struct S {
+    x: u64,
+    y: bool,
+  }
+
+  spec module {
+
+    // Undeclared simple name.
+    fun undeclared_name() : num {
+      x
+    }
+
+    // Undeclared specction.
+    fun undeclared_fun(): num {
+      not_declared()
+    }
+
+    // Wrong result type.
+    fun wrong_result_type(): num {
+      false
+    }
+
+    // No matching overload.
+    fun no_overload(x: vector<num>, y: vector<num>): bool {
+      x > y
+    }
+
+    // Wrong result type tuple.
+    fun wrong_result_type2(): (num, bool) {
+      false
+    }
+
+    // Wrongly typed function application.
+    fun wrongly_typed_callee(x: num, y: bool): num { x }
+    fun wrongly_typed_caller(): num { wrongly_typed_callee(1, 1) }
+
+    // Wrongly typed function argument.
+    fun wrongly_typed_fun_arg_callee(f: |num|num): num { 0 }
+    fun wrongly_typed_fun_arg_caller(): num { wrongly_typed_fun_arg_callee(|x| false) }
+
+    // Wrong instantiation
+    fun wrong_instantiation<T1, T2>(x: T1): T1 { x }
+    fun wrong_instantiation_caller(x: u64): u64 {
+      wrong_instantiation<u64>(x)
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_inference_err.exp b/vendors/move/crates/move-model/tests/sources/expressions_inference_err.exp
new file mode 100644
index 000000000..242c62091
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_inference_err.exp
@@ -0,0 +1,23 @@
+error: unable to infer type: `?2`
+  ┌─ tests/sources/expressions_inference_err.move:7:16
+  │
+7 │       let f = |x|x;
+  │                ^
+
+error: unable to infer type: `?2`
+  ┌─ tests/sources/expressions_inference_err.move:7:18
+  │
+7 │       let f = |x|x;
+  │                  ^
+
+error: unable to infer type: `|?2|?2`
+  ┌─ tests/sources/expressions_inference_err.move:7:15
+  │
+7 │       let f = |x|x;
+  │               ^^^^
+
+error: unable to infer type: `|?2|?2`
+  ┌─ tests/sources/expressions_inference_err.move:7:11
+  │
+7 │       let f = |x|x;
+  │           ^
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_inference_err.move b/vendors/move/crates/move-model/tests/sources/expressions_inference_err.move
new file mode 100644
index 000000000..77247404a
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_inference_err.move
@@ -0,0 +1,11 @@
+// Inference errors may only be reported if all else succeeds, so we put them in a different file.
+
+module 0x42::M {
+  spec module {
+    // Incomplete types.
+    fun incomplete_types(): u64 {
+      let f = |x|x;
+      0
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_ok.exp b/vendors/move/crates/move-model/tests/sources/expressions_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/expressions_ok.move b/vendors/move/crates/move-model/tests/sources/expressions_ok.move
new file mode 100644
index 000000000..0d1d632bd
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/expressions_ok.move
@@ -0,0 +1,82 @@
+module 0x42::M {
+
+  spec module {
+
+    fun add1(x: num): num { x + 1 }
+
+    fun call_other(x: num): num {
+      add1(x)
+    }
+
+    fun call_other_self(x: num): num {
+      Self::add1(x)
+    }
+
+    fun add_any_unsigned(x: u64, y: u8): num {
+      x + y
+    }
+
+    fun compare_any_unsigned(x: u64, y: u128, z: num): bool {
+      x == y && y == z ==> x == z
+    }
+
+    fun some_range(upper: num): range {
+      0..upper
+    }
+
+    fun add_with_let(x: num, y: num): num {
+      let r = x + y;
+      r
+    }
+
+    /* Produces an error as we have disallowed shadowing for now.
+     * TODO(wrwg): reactivate once we allow shadowing again
+    fun let_shadows(): num {
+      let x = true;
+      let b = !x;
+      let x = 1;
+      x
+    }
+    */
+
+    fun lambdas(p1: |num|bool, p2: |num|bool): |num|bool {
+      |x| p1(x) && p2(x)
+    }
+
+    fun call_lambdas(x: num): bool {
+      let f = lambdas(|y| y > 0, |y| y < 10);
+      f(x)
+    }
+
+    fun if_else(x: num, y: num): num {
+      if (x > 0) { x } else { y }
+    }
+
+    fun vector_builtins(v: vector<num>): bool {
+      len(v) > 2 && (forall x in v: x > 0) && (exists x in v: x > 10) && update(v, 2, 23)[2] == 23
+    }
+
+    fun range_builtins(v: vector<num>): bool {
+      (forall x in 1..10: x > 0) && (exists x in 5..10: x > 7)
+    }
+
+    fun vector_index(v: vector<num>): num {
+      v[2]
+    }
+
+    fun vector_slice(v: vector<num>): vector<num> {
+      v[2..3]
+    }
+
+    fun generic_function<T>(x: T, y: T): bool {
+      x == y
+    }
+    fun generic_function_call(): bool {
+      generic_function(1, 2)
+    }
+    fun generic_function_instantiated_call(): bool {
+      generic_function<num>(3, 3)
+    }
+
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/if_else_ok.exp b/vendors/move/crates/move-model/tests/sources/if_else_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/if_else_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/if_else_ok.move b/vendors/move/crates/move-model/tests/sources/if_else_ok.move
new file mode 100644
index 000000000..2f1b521cb
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/if_else_ok.move
@@ -0,0 +1,23 @@
+module 0x42::Test {
+    fun foo(cond: bool) {
+        // NOTE: `foo` will not be treated as a pure function because in
+        // move-model, the only thing allowed in an exp block is let-bindings
+        // (except for the last expression). This will cause the type unifier
+        // to treat the `addr` to have a type which is the same as the `dummy()`
+        // function call return type. This is clearly an erroneous state, but is
+        // okay because we have previously marked the spec fucntion translation
+        // as failure and subsequent errors can be ignored.
+        let addr = if (cond) {
+            dummy(0);
+            @0x1
+        } else {
+            dummy(42);
+            @0x2
+        };
+        bar(addr);
+    }
+
+    fun bar(_addr: address) {}
+
+    fun dummy(val: u8): u8 { val }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/inline_spec_err.exp b/vendors/move/crates/move-model/tests/sources/inline_spec_err.exp
new file mode 100644
index 000000000..45a35bb76
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/inline_spec_err.exp
@@ -0,0 +1,26 @@
+error: invalid old(..) expression in inline spec block
+  ┌─ tests/sources/inline_spec_err.move:9:7
+  │
+9 │       assert old(a) == y;
+  │       ^^^^^^^^^^^^^^^^^^^
+  │       │          │
+  │       │          this expression is not a function parameter
+  │       only a function parameter is allowed in old(..) expressions in inline spec block
+
+error: invalid old(..) expression in inline spec block
+   ┌─ tests/sources/inline_spec_err.move:10:7
+   │
+10 │       assert old(b) == 0;
+   │       ^^^^^^^^^^^^^^^^^^^
+   │       │          │
+   │       │          this expression is not a function parameter
+   │       only a function parameter is allowed in old(..) expressions in inline spec block
+
+error: invalid old(..) expression in inline spec block
+   ┌─ tests/sources/inline_spec_err.move:11:7
+   │
+11 │       assert old(x != y);
+   │       ^^^^^^^^^^^^^^^^^^^
+   │       │          │
+   │       │          this expression is not a function parameter
+   │       only a function parameter is allowed in old(..) expressions in inline spec block
diff --git a/vendors/move/crates/move-model/tests/sources/inline_spec_err.move b/vendors/move/crates/move-model/tests/sources/inline_spec_err.move
new file mode 100644
index 000000000..0477cc0ec
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/inline_spec_err.move
@@ -0,0 +1,14 @@
+module 0x42::M {
+
+  fun invalid_old_exp(x: &mut u64, y: u64) {
+    let a = x;
+    let b = &mut y;
+    *a = *b;
+    *b = 0;
+    spec {
+      assert old(a) == y;
+      assert old(b) == 0;
+      assert old(x != y);
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.exp b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.exp
new file mode 100644
index 000000000..0f13ded20
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.exp
@@ -0,0 +1,69 @@
+error: expect a boolean value or a valid intrinsic type
+   ┌─ tests/sources/intrinsic_decl_err.move:16:9
+   │
+16 │         pragma intrinsic = 0x42::M::MyTable;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: unknown intrinsic type: no_such_map
+   ┌─ tests/sources/intrinsic_decl_err.move:19:9
+   │
+19 │         pragma intrinsic = no_such_map;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: property `map_no_such_fun` is not valid in this context
+   ┌─ tests/sources/intrinsic_decl_err.move:22:9
+   │
+22 │ ╭         pragma intrinsic = map,
+23 │ │             map_no_such_fun = new;
+   │ ╰──────────────────────────────────^
+
+error: invalid intrinsic function mapping: map_len
+   ┌─ tests/sources/intrinsic_decl_err.move:26:9
+   │
+26 │ ╭         pragma intrinsic = map,
+27 │ │             map_len = true;
+   │ ╰───────────────────────────^
+
+error: an intrinsic function mapping can only refer to functions declared in the same module while `signer::address_of` is not
+   ┌─ tests/sources/intrinsic_decl_err.move:30:9
+   │
+30 │ ╭         pragma intrinsic = map,
+31 │ │             map_len = 0x1::signer::address_of;
+   │ ╰──────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::no_such_move_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:34:9
+   │
+34 │ ╭         pragma intrinsic = map,
+35 │ │             map_len = no_such_move_fun;
+   │ ╰───────────────────────────────────────^
+
+error: unable to find spec function for intrinsic mapping: M::no_such_spec_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:38:9
+   │
+38 │ ╭         pragma intrinsic = map,
+39 │ │             map_spec_len = no_such_spec_fun;
+   │ ╰────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:42:9
+   │
+42 │ ╭         pragma intrinsic = map,
+43 │ │             map_len = spec_len;
+   │ ╰───────────────────────────────^
+
+error: duplicated intrinsic mapping for move function: M::length
+   ┌─ tests/sources/intrinsic_decl_err.move:46:9
+   │
+46 │ ╭         pragma intrinsic = map,
+47 │ │             map_len = length,
+48 │ │             map_borrow_mut = length;
+   │ ╰────────────────────────────────────^
+
+error: duplicated intrinsic mapping for spec function: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:51:9
+   │
+51 │ ╭         pragma intrinsic = map,
+52 │ │             map_spec_len = spec_len,
+53 │ │             map_spec_set = spec_len;
+   │ ╰────────────────────────────────────^
diff --git a/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.move b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.move
new file mode 100644
index 000000000..f93cc0064
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_err.move
@@ -0,0 +1,55 @@
+module 0x42::M {
+    struct MyTable<phantom K, phantom V> {}
+    struct MyTable1<phantom K, phantom V> {}
+
+    native fun new<K, V>(): MyTable1<K, V>;
+    native fun destroy_empty<K, V>(t: MyTable1<K, V>);
+    native fun borrow_mut<K, V>(t: &mut MyTable1<K, V>, k: K): &mut V;
+    native fun length<K, V>(t: &MyTable1<K, V>): u64;
+
+    spec native fun spec_len<K, V>(t: MyTable1<K, V>): num;
+    spec native fun spec_set<K, V>(t: MyTable1<K, V>, k: K, v: V): MyTable1<K, V>;
+    spec native fun spec_get<K, V>(t: MyTable1<K, V>, k: K): V;
+
+    spec MyTable1 {
+        // expect failure
+        pragma intrinsic = 0x42::M::MyTable;
+
+        // expect failure
+        pragma intrinsic = no_such_map;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_no_such_fun = new;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = true;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = 0x1::signer::address_of;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = no_such_move_fun;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_spec_len = no_such_spec_fun;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = spec_len;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = length,
+            map_borrow_mut = length;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_spec_len = spec_len,
+            map_spec_set = spec_len;
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.exp b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.move b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.move
new file mode 100644
index 000000000..98cd520df
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/intrinsic_decl_ok.move
@@ -0,0 +1,45 @@
+module 0x42::M {
+    struct MyTable1<phantom K, phantom V> {}
+
+    native fun new<K, V>(): MyTable1<K, V>;
+    native fun destroy_empty<K, V>(t: MyTable1<K, V>);
+    native fun borrow_mut<K, V>(t: &mut MyTable1<K, V>, k: K): &mut V;
+    native fun length<K, V>(t: &MyTable1<K, V>): u64;
+
+    spec native fun spec_len<K, V>(t: MyTable1<K, V>): num;
+    spec native fun spec_set<K, V>(t: MyTable1<K, V>, k: K, v: V): MyTable1<K, V>;
+    spec native fun spec_get<K, V>(t: MyTable1<K, V>, k: K): V;
+
+    spec MyTable1 {
+        pragma intrinsic = map,
+            map_new = new,
+            map_destroy_empty = destroy_empty,
+            map_borrow_mut = borrow_mut,
+            map_len = length,
+            map_spec_len = spec_len,
+            map_spec_get = spec_get,
+            map_spec_set = spec_set;
+    }
+
+    struct MyTable2<phantom K, phantom V> {}
+
+    native fun new2<K, V>(): MyTable2<K, V>;
+    native fun contains<K, V>(t: &MyTable2<K, V>, k: K): bool;
+    native fun borrow<K, V>(t: &MyTable2<K, V>, k: K): &V;
+    native fun remove<K, V>(t: &mut MyTable2<K, V>, k: K): V;
+
+    spec native fun spec_len2<K, V>(t: MyTable2<K, V>): num;
+    spec native fun spec_del<K, V>(t: MyTable2<K, V>): num;
+    spec native fun spec_has_key<K, V>(t: MyTable2<K, V>, k: K): bool;
+
+    spec MyTable2 {
+        pragma intrinsic = map,
+            map_new = new2,
+            map_has_key = contains,
+            map_borrow = borrow,
+            map_del_must_exist = remove,
+            map_spec_len = spec_len2,
+            map_spec_del = spec_del,
+            map_spec_has_key = spec_has_key;
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/invariants_err.exp b/vendors/move/crates/move-model/tests/sources/invariants_err.exp
new file mode 100644
index 000000000..2d57290ac
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/invariants_err.exp
@@ -0,0 +1,56 @@
+error: expected `bool` but found `num` in expression
+  ┌─ tests/sources/invariants_err.move:9:15
+  │
+9 │     invariant x + 1;
+  │               ^^^^^
+
+error: `old(..)` expression not allowed in this context
+   ┌─ tests/sources/invariants_err.move:11:15
+   │
+11 │     invariant old(x) > 0;
+   │               ^^^^^^
+
+error: invalid reference to post state
+   ┌─ tests/sources/invariants_err.move:11:5
+   │
+11 │     invariant old(x) > 0;
+   │     ^^^^^^^^^^^^^^^^^^^^^
+   │     │         │
+   │     │         expression referring to post state
+   │     not allowed to refer to post state
+
+error: The type argument to `exists` and `global` must be a struct type but u64 is not a struct type.
+   ┌─ tests/sources/invariants_err.move:36:15
+   │
+36 │     invariant exists<u64>(@0x0);
+   │               ^^^^^^^^^^^^^^^^^
+
+error: The type argument to `exists` and `global` must be a struct type but #0 is not a struct type.
+   ┌─ tests/sources/invariants_err.move:37:18
+   │
+37 │     invariant<T> global<T>(@0x1) == global<T>(@0x2);
+   │                  ^^^^^^^^^^^^^^^
+
+error: The type argument to `exists` and `global` must be a struct type but #0 is not a struct type.
+   ┌─ tests/sources/invariants_err.move:37:37
+   │
+37 │     invariant<T> global<T>(@0x1) == global<T>(@0x2);
+   │                                     ^^^^^^^^^^^^^^^
+
+error: data invariants cannot depend on global state (directly or indirectly uses a global spec var or resource storage).
+   ┌─ tests/sources/invariants_err.move:13:5
+   │
+13 │     invariant exists<S>(@0x0);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: data invariants cannot depend on global state (directly or indirectly uses a global spec var or resource storage).
+   ┌─ tests/sources/invariants_err.move:14:5
+   │
+14 │     invariant global<S>(@0x0).x == x;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: data invariants cannot depend on global state (directly or indirectly uses a global spec var or resource storage).
+   ┌─ tests/sources/invariants_err.move:15:5
+   │
+15 │     invariant spec_var > 0;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-model/tests/sources/invariants_err.move b/vendors/move/crates/move-model/tests/sources/invariants_err.move
new file mode 100644
index 000000000..9c37c3440
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/invariants_err.move
@@ -0,0 +1,38 @@
+module 0x42::M {
+
+  struct S has key {
+    x: u64,
+  }
+
+  spec S {
+    // Expression not a bool
+    invariant x + 1;
+    // Old expression in data invariant
+    invariant old(x) > 0;
+    // Direct dependency from global state
+    invariant exists<S>(@0x0);
+    invariant global<S>(@0x0).x == x;
+    invariant spec_var > 0;
+    // Indirect dependency from global state via function call.
+    invariant rec_fun(true);
+  }
+
+  spec module {
+    global spec_var: num;
+
+    fun rec_fun(c: bool): bool {
+        if (c) {
+          rec_fun2(c)
+        } else {
+          spec_var > 0
+        }
+      }
+      fun rec_fun2(c: bool): bool {
+         rec_fun(!c)
+      }
+    }
+
+    // Type instantiation for global memory operations is not a struct type
+    invariant exists<u64>(@0x0);
+    invariant<T> global<T>(@0x1) == global<T>(@0x2);
+}
diff --git a/vendors/move/crates/move-model/tests/sources/invariants_ok.exp b/vendors/move/crates/move-model/tests/sources/invariants_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/invariants_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/invariants_ok.move b/vendors/move/crates/move-model/tests/sources/invariants_ok.move
new file mode 100644
index 000000000..c9edfd6cb
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/invariants_ok.move
@@ -0,0 +1,34 @@
+module 0x42::M {
+
+  struct S {
+    x: u64,
+    y: bool
+  }
+
+  struct R {
+    s: S,
+  }
+
+  spec S {
+    invariant x > 0 == y;
+    // invariant update old(x) < x;
+  }
+
+  spec R {
+    // Test that calling a recursive function in a data invariant is detected as pure.
+    invariant less10(true, s.x);
+  }
+
+  spec module {
+    fun less10(c: bool, x: num): bool {
+      if (c) {
+        less10a(c, x)
+      } else {
+        x < 10
+      }
+    }
+    fun less10a(c: bool, x: num): bool {
+       less10(!c, x)
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/lets_err.exp b/vendors/move/crates/move-model/tests/sources/lets_err.exp
new file mode 100644
index 000000000..bdaf417ea
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/lets_err.exp
@@ -0,0 +1,38 @@
+error: undeclared `M::one`
+  ┌─ tests/sources/lets_err.move:6:16
+  │
+6 │     let zero = one;
+  │                ^^^
+
+error: let bound `new_a` propagated via schema inclusion is referring to post state
+   ┌─ tests/sources/lets_err.move:22:5
+   │
+21 │     let post new_a = old(a) / sum;
+   │                      ------------ let defined here
+22 │     include Ensures{actual: a, expected: new_a + sum - sum};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   ·
+28 │     let a = expected;
+   │     ----------------- not allowed to use post state
+
+error: invalid reference to post state
+   ┌─ tests/sources/lets_err.move:43:5
+   │
+43 │     include Requires{a: result};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                         │
+   │                         expression referring to post state
+   ·
+48 │     requires a != 0;
+   │     ---------------- not allowed to refer to post state
+
+error: invalid reference to post state
+   ┌─ tests/sources/lets_err.move:44:5
+   │
+44 │     include Requires{a: old(x)};
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │                         │
+   │                         expression referring to post state
+   ·
+48 │     requires a != 0;
+   │     ---------------- not allowed to refer to post state
diff --git a/vendors/move/crates/move-model/tests/sources/lets_err.move b/vendors/move/crates/move-model/tests/sources/lets_err.move
new file mode 100644
index 000000000..9a2a4ddbe
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/lets_err.move
@@ -0,0 +1,50 @@
+module 0x42::M {
+
+  fun foo(x: &mut u64): u64 { *x = *x + 1; *x }
+
+  spec foo {
+    let zero = one;
+    ensures result == old(x) + 1;
+  }
+
+  fun spec_let_with_schema(a: &mut u64, b: &mut u64) {
+    let saved_a = *a;
+    *a = *a / (*a + *b);
+    *b = saved_a * *b;
+  }
+  spec spec_let_with_schema {
+    let sum = a + b;
+    let product = a * b;
+    aborts_if sum == 0;
+    aborts_if sum > MAX_U64;
+    aborts_if product > MAX_U64;
+    let post new_a = old(a) / sum;
+    include Ensures{actual: a, expected: new_a + sum - sum};
+    include Ensures{actual: b, expected: product};
+  }
+  spec schema Ensures {
+    actual: u64;
+    expected: u64;
+    let a = expected;
+    let b = actual;
+    include Ensures2{a: a, b: b};
+  }
+  spec schema Ensures2 {
+    a: u64;
+    b: u64;
+    ensures a == b;
+  }
+
+  fun result_with_schema(x: &mut u64): u64 {
+    *x = 2;
+    *x
+  }
+  spec result_with_schema {
+    include Requires{a: result};
+    include Requires{a: old(x)};
+  }
+  spec schema Requires {
+    a: u64;
+    requires a != 0;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/lets_ok.exp b/vendors/move/crates/move-model/tests/sources/lets_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/lets_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/lets_ok.move b/vendors/move/crates/move-model/tests/sources/lets_ok.move
new file mode 100644
index 000000000..86afc0f6e
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/lets_ok.move
@@ -0,0 +1,10 @@
+module 0x42::M {
+
+  fun foo(x: &mut u64): u64 { *x = *x + 1; *x }
+
+  spec foo {
+    let zero = 0;
+    let one = zero + 1;
+    ensures result == old(x) + one;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.exp b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.exp
new file mode 100644
index 000000000..acd83fcec
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.exp
@@ -0,0 +1,11 @@
+error: provided function signature must match function declaration: parameter mismatch
+   ┌─ tests/sources/module_level_spec_err_signature.move:11:10
+   │
+11 │     spec store(s: &signer) {
+   │          ^^^^^^^^^^^^^^^^^
+
+error: unresolved spec target
+   ┌─ tests/sources/module_level_spec_err_signature.move:14:10
+   │
+14 │     spec store_undefined(s: &signer, value: u64) {
+   │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.move b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.move
new file mode 100644
index 000000000..f0b57ec92
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_signature.move
@@ -0,0 +1,16 @@
+module 0x42::TestModule {
+
+    struct R has key { value: u64 }
+
+    fun store(_s: &signer, _value: u64) {
+
+    }
+}
+
+spec 0x42::TestModule {
+    spec store(s: &signer) {
+    }
+
+    spec store_undefined(s: &signer, value: u64) {
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.exp b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.exp
new file mode 100644
index 000000000..27db5dcbd
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.exp
@@ -0,0 +1,5 @@
+error: invalid 'spec' declaration
+  ┌─ tests/sources/module_level_spec_err_unassociated.move:4:12
+  │
+4 │ spec 0x42::TestModuleUndefined {
+  │            ^^^^^^^^^^^^^^^^^^^ Cannot associate specification with any target module in this compilation. A module specification cannot be compiled standalone.
diff --git a/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.move b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.move
new file mode 100644
index 000000000..20a652bea
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/module_level_spec_err_unassociated.move
@@ -0,0 +1,5 @@
+module 0x42::TestModule {
+}
+
+spec 0x42::TestModuleUndefined {
+}
diff --git a/vendors/move/crates/move-model/tests/sources/pack_err.exp b/vendors/move/crates/move-model/tests/sources/pack_err.exp
new file mode 100644
index 000000000..ba6b3d003
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/pack_err.exp
@@ -0,0 +1,8 @@
+error: unexpected token
+  ┌─ tests/sources/pack_err.move:9:20
+  │
+9 │     invariant pack sum = sum + x;
+  │                    ^^^
+  │                    │
+  │                    Unexpected 'sum'
+  │                    Expected ';'
diff --git a/vendors/move/crates/move-model/tests/sources/pack_err.move b/vendors/move/crates/move-model/tests/sources/pack_err.move
new file mode 100644
index 000000000..7adf0b4aa
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/pack_err.move
@@ -0,0 +1,12 @@
+module 0x42::M {
+
+  struct S has copy, drop {
+    x: u64,
+  }
+
+  spec S {
+    global sum: num;
+    invariant pack sum = sum + x;
+    invariant unpack sum = sum - x;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/pragmas_err.exp b/vendors/move/crates/move-model/tests/sources/pragmas_err.exp
new file mode 100644
index 000000000..735032376
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/pragmas_err.exp
@@ -0,0 +1,11 @@
+error: property `bar` is not valid in this context
+  ┌─ tests/sources/pragmas_err.move:7:9
+  │
+7 │         pragma bar = true;
+  │         ^^^^^^^^^^^^^^^^^^
+
+error: property `verify` specified more than once in the same pragma declaration
+   ┌─ tests/sources/pragmas_err.move:19:24
+   │
+19 │         pragma verify, verify;
+   │                        ^^^^^^
diff --git a/vendors/move/crates/move-model/tests/sources/pragmas_err.move b/vendors/move/crates/move-model/tests/sources/pragmas_err.move
new file mode 100644
index 000000000..c69dc00e1
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/pragmas_err.move
@@ -0,0 +1,25 @@
+module 0x42::M {
+    spec module {
+        // Should be fine
+        pragma verify = false;
+
+        // Should produce error that bar is not valid (not defined)
+        pragma bar = true;
+
+        // Should be ok (we do not check types of values)
+        pragma verify = a_valid_id;
+
+        // Should be ok (we do not check types of values)
+        pragma verify = 0x1::M::a_valid_id;
+
+        // Should be ok (we do not check types of values)
+        pragma verify = Self::a_valid_id;
+
+        // Should produce an error that the same property is defined twice on the same line
+        pragma verify, verify;
+
+        // The below produces an error from move_compiler because the relative module name cannot be resolved.
+        // We leave it here for illustration.
+        // pragma verify = M::a_valid_id;
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/quantifiers_ok.exp b/vendors/move/crates/move-model/tests/sources/quantifiers_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/quantifiers_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/quantifiers_ok.move b/vendors/move/crates/move-model/tests/sources/quantifiers_ok.move
new file mode 100644
index 000000000..1e665d87c
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/quantifiers_ok.move
@@ -0,0 +1,16 @@
+module 0x42::M {
+
+  struct S {
+    x: u64,
+  }
+
+  spec module {
+    fun exists_in_vector(v: vector<S>): bool {
+      exists s in v: s.x > 0
+    }
+
+    fun some_in_vector(v: vector<S>): S {
+        choose s in v where s.x == 0
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/schemas_err.exp b/vendors/move/crates/move-model/tests/sources/schemas_err.exp
new file mode 100644
index 000000000..a8fa744bd
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/schemas_err.exp
@@ -0,0 +1,83 @@
+error: undeclared `M::x`
+  ┌─ tests/sources/schemas_err.move:4:17
+  │
+4 │         ensures x > 0;
+  │                 ^
+
+error: schema `M::Undeclared` undeclared
+  ┌─ tests/sources/schemas_err.move:8:17
+  │
+8 │         include Undeclared;
+  │                 ^^^^^^^^^^
+
+error: wrong number of type arguments (expected 1, got 2)
+   ┌─ tests/sources/schemas_err.move:12:17
+   │
+12 │         include WrongTypeArgsIncluded<num, num>;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: `wrong` not declared in schema
+   ┌─ tests/sources/schemas_err.move:19:44
+   │
+19 │         include WrongTypeArgsIncluded<num>{wrong: 1};
+   │                                            ^^^^^
+
+error: expected `num` but found `bool` in name expression
+   ┌─ tests/sources/schemas_err.move:24:47
+   │
+24 │         include WrongTypeArgsIncluded<num>{x: y};
+   │                                               ^
+
+error: expected `bool` but found `num` in expression
+   ┌─ tests/sources/schemas_err.move:28:48
+   │
+28 │         include WrongTypeArgsIncluded<bool>{x: 1 + 2};
+   │                                                ^^^^^
+
+error: expected `bool` but found `num` for `x` included from schema
+   ┌─ tests/sources/schemas_err.move:33:17
+   │
+33 │         include WronglyTypedVarIncluded;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: expected `bool` but found `num` for `x` included from schema
+   ┌─ tests/sources/schemas_err.move:41:17
+   │
+41 │         include WronglyTypedInstantiationIncluded<num>;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: cyclic schema dependency: Cycle1 -> Cycle2 -> Cycle3 -> Cycle1
+   ┌─ tests/sources/schemas_err.move:80:17
+   │
+80 │         include Cycle1;
+   │                 ^^^^^^
+
+error: expected `bool` but found `u256` in expression
+   ┌─ tests/sources/schemas_err.move:84:17
+   │
+84 │         include 22 ==> Condition;
+   │                 ^^
+
+error: expression construct not supported for schemas
+   ┌─ tests/sources/schemas_err.move:85:26
+   │
+85 │         include true ==> 23;
+   │                          ^^
+
+error: expression construct not supported for schemas
+   ┌─ tests/sources/schemas_err.move:86:17
+   │
+86 │         include Condition || Condition;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^
+
+error: `y` cannot be matched to an existing name in inclusion context
+   ┌─ tests/sources/schemas_err.move:52:17
+   │
+52 │         include UndeclaredVarInInclude;
+   │                 ^^^^^^^^^^^^^^^^^^^^^^
+
+error: `requires` not allowed in struct context (included from schema)
+   ┌─ tests/sources/schemas_err.move:70:9
+   │
+70 │         include Condition;
+   │         ^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-model/tests/sources/schemas_err.move b/vendors/move/crates/move-model/tests/sources/schemas_err.move
new file mode 100644
index 000000000..2464dd8c9
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/schemas_err.move
@@ -0,0 +1,88 @@
+module 0x42::M {
+
+    spec schema UndeclaredVar {
+        ensures x > 0;
+    }
+
+    spec schema UndeclaredSchema {
+        include Undeclared;
+    }
+
+    spec schema WrongTypeArgs {
+        include WrongTypeArgsIncluded<num, num>;
+    }
+    spec schema WrongTypeArgsIncluded<T> {
+        x: T;
+    }
+
+    spec schema WrongRenaming {
+        include WrongTypeArgsIncluded<num>{wrong: 1};
+    }
+
+    spec schema WrongTypeAfterRenaming {
+        y: bool;
+        include WrongTypeArgsIncluded<num>{x: y};
+    }
+
+    spec schema WrongTypeAfterRenamingExp {
+        include WrongTypeArgsIncluded<bool>{x: 1 + 2};
+    }
+
+    spec schema WronglyTypedVar {
+        x: bool;
+        include WronglyTypedVarIncluded;
+    }
+    spec schema WronglyTypedVarIncluded {
+        x: num;
+    }
+
+    spec schema WronglyTypedInstantiation {
+        x: bool;
+        include WronglyTypedInstantiationIncluded<num>;
+    }
+    spec schema WronglyTypedInstantiationIncluded<T> {
+        x: T;
+    }
+
+    fun undeclared_var_in_include(x: u64): u64 { x }
+    spec schema UndeclaredVarInInclude {
+        y: u64;
+    }
+    spec undeclared_var_in_include {
+        include UndeclaredVarInInclude;
+    }
+
+    fun wrong_invariant_in_fun(x: u64): u64 { x }
+    spec schema Invariant {
+        x: num;
+        invariant x > 0;
+    }
+    spec wrong_invariant_in_fun {
+        include Invariant;
+    }
+
+    struct Wrong_condition_in_struct { x: u64 }
+    spec schema Condition {
+        x: num;
+        requires x > 0;
+    }
+    spec Wrong_condition_in_struct {
+        include Condition;
+    }
+
+    spec schema Cycle1 {
+        include Cycle2;
+    }
+    spec schema Cycle2 {
+        include Cycle3;
+    }
+    spec schema Cycle3 {
+        include Cycle1;
+    }
+
+    spec schema SchemaExp {
+        include 22 ==> Condition;
+        include true ==> 23;
+        include Condition || Condition;
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/schemas_ok.exp b/vendors/move/crates/move-model/tests/sources/schemas_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/schemas_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/schemas_ok.move b/vendors/move/crates/move-model/tests/sources/schemas_ok.move
new file mode 100644
index 000000000..a95c77602
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/schemas_ok.move
@@ -0,0 +1,75 @@
+module 0x42::M {
+
+    spec schema Increases {
+        x: num;
+        result: num;
+        requires x > 0;
+        ensures result >= x;
+    }
+
+    spec schema IncreasesStrictly {
+        include Increases;
+        ensures result > x;
+    }
+
+    spec schema IncreasesWithTwoResults {
+        result_1: num;
+        result_2: num;
+        include Increases{result: result_1};
+        ensures result_2 > result_1;
+    }
+
+    spec schema IsEqual<T> {
+        x: T;
+        y: T;
+        ensures x == y;
+    }
+
+    spec schema IsEqualConcrete {
+        z: num;
+        include IsEqual<num>{x: z};
+        ensures z <= y;
+    }
+
+    fun add(x: u64): u64 { x + 1 }
+    spec add {
+        include Increases;
+    }
+
+    fun id(x: u64): u64 { x }
+    spec add {
+        include IsEqual<num>{y: result};
+    }
+
+    spec schema InvariantIsEqual<T> {
+        x: T;
+        // invariant update x == old(x);
+    }
+    struct S<X> { x: X }
+    spec S {
+        include InvariantIsEqual<X>;
+    }
+
+    spec schema GenericIncludesGeneric<T> {
+        include InvariantIsEqual<T>;
+    }
+
+    spec schema MultipleTypeParams<T, R> {
+        _x: T;
+        _y: R;
+    }
+    fun multiple(_x: u64, _y: u64) {}
+    spec multiple {
+        include MultipleTypeParams<num, num>;
+        requires _x > _y;
+    }
+
+    spec schema SchemaExp<T> {
+        x: bool;
+        include x ==> InvariantIsEqual<bool>;
+        include !x ==> InvariantIsEqual<bool>;
+        include InvariantIsEqual<bool> && InvariantIsEqual<bool>;
+        include if (x) InvariantIsEqual<bool> else InvariantIsEqual<bool>;
+    }
+
+}
diff --git a/vendors/move/crates/move-model/tests/sources/structs_err.exp b/vendors/move/crates/move-model/tests/sources/structs_err.exp
new file mode 100644
index 000000000..30cf6337e
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/structs_err.exp
@@ -0,0 +1,35 @@
+error: field `xx` not declared in struct `M::S`
+   ┌─ tests/sources/structs_err.move:26:7
+   │
+26 │       s.xx
+   │       ^^^^
+
+error: expected `bool` but found `u64` in field selection
+   ┌─ tests/sources/structs_err.move:31:7
+   │
+31 │       s.x
+   │       ^^^
+
+error: expected `bool` but found `u64` in name expression
+   ┌─ tests/sources/structs_err.move:36:18
+   │
+36 │       S{x: x, y: y, z: z}
+   │                  ^
+
+error: missing fields `y`, `z`
+   ┌─ tests/sources/structs_err.move:40:7
+   │
+40 │       S{x: x}
+   │       ^^^^^^^
+
+error: expected `bool` but found `u64` in pack expression
+   ┌─ tests/sources/structs_err.move:45:7
+   │
+45 │       G{x: x, y: y}
+   │       ^^^^^^^^^^^^^
+
+error: generic count mismatch (expected 1 but found 2)
+   ┌─ tests/sources/structs_err.move:50:7
+   │
+50 │       G<u64, bool>{x: x, y: y}
+   │       ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-model/tests/sources/structs_err.move b/vendors/move/crates/move-model/tests/sources/structs_err.move
new file mode 100644
index 000000000..cd50e4210
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/structs_err.move
@@ -0,0 +1,53 @@
+module 0x42::M {
+
+  struct S has drop {
+    x: u64,
+    y: bool,
+    z: vector<u64>,
+  }
+
+  struct R has drop {
+    s: S
+  }
+
+  struct G<T> {
+    x: T,
+    y: bool,
+  }
+
+  struct T has key {
+    x: u64
+  }
+
+  spec module {
+
+    // Field undeclared
+    fun field_undeclared(s: S): u64 {
+      s.xx
+    }
+
+    // Field wrongly typed
+    fun field_wrongly_typed(s: S): bool {
+      s.x
+    }
+
+    // Pack wrongly typed
+    fun pack_wrongly_typed(x: u64, y: u64, z: vector<u64>): S {
+      S{x: x, y: y, z: z}
+    }
+
+    fun pack_misses_fields(x: u64): S {
+      S{x: x}
+    }
+
+    // Generic pack wrongly typed
+    fun generic_pack_wrongly_typed(x: u64, y: bool): G<bool> {
+      G{x: x, y: y}
+    }
+
+    // Wrong number of generics
+    fun wrong_number_generics(x: u64, y: bool): G<u64> {
+      G<u64, bool>{x: x, y: y}
+    }
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/structs_ok.exp b/vendors/move/crates/move-model/tests/sources/structs_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/structs_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/structs_ok.move b/vendors/move/crates/move-model/tests/sources/structs_ok.move
new file mode 100644
index 000000000..80a3da93d
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/structs_ok.move
@@ -0,0 +1,61 @@
+module 0x42::M {
+
+  struct S has drop {
+    x: u64,
+    y: bool,
+    z: vector<u64>,
+  }
+
+  struct R has drop {
+    s: S
+  }
+
+  struct G<T> {
+    x: T,
+    y: bool,
+  }
+
+  struct T has key {
+    x: u64
+  }
+
+  public fun f(r: R): T {
+    T { x: r.s.x }
+  }
+
+  spec module {
+
+    fun struct_access(s: S): u64 {
+      s.x
+    }
+
+    fun nested_struct_access(r: R): bool {
+      r.s.y
+    }
+
+    fun struct_pack(x: u64, y: bool, z: vector<u64>): S {
+      S{x: x, y: y, z: z}
+    }
+
+    fun struct_pack_other_order(x: u64, y: bool, z: vector<u64>): S {
+      S{z: z, y: y, x: x}
+    }
+
+    fun generic_struct_pack(x: u64, y: bool): G<u64> {
+      G{x: x, y: y}
+    }
+
+    fun generic_struct_pack_instantiated(x: u64, y: bool): G<u64> {
+      G<u64>{x: x, y: y}
+    }
+
+    fun resource_global(addr: address): T {
+      global<T>(addr)
+    }
+
+    fun resource_global_exists(addr: address): bool {
+      exists<T>(addr)
+    }
+
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/type_variance_ok.exp b/vendors/move/crates/move-model/tests/sources/type_variance_ok.exp
new file mode 100644
index 000000000..fd4dd9dc6
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/type_variance_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/vendors/move/crates/move-model/tests/sources/type_variance_ok.move b/vendors/move/crates/move-model/tests/sources/type_variance_ok.move
new file mode 100644
index 000000000..7bf0432bf
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/type_variance_ok.move
@@ -0,0 +1,9 @@
+module 0x42::M {
+  fun foo(v: vector<u8>): vector<u8> {
+    v
+  }
+
+  spec foo {
+    ensures result == vec(1);
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.exp b/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.exp
new file mode 100644
index 000000000..521c3ccde
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.exp
@@ -0,0 +1,13 @@
+error: undeclared `M::x`
+  ┌─ tests/sources/use_erroneous_schema.move:5:17
+  │
+5 │         ensures x > 0;
+  │                 ^
+
+error: no matching declaration of `<`
+   ┌─ tests/sources/use_erroneous_schema.move:13:17
+   │
+13 │         ensures 2 < true;
+   │                 ^^^^^^^^
+   │
+   = outruled candidate `<(num, num): bool` (expected `num` but found `bool` for argument 2)
diff --git a/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.move b/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.move
new file mode 100644
index 000000000..48debbe66
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/use_erroneous_schema.move
@@ -0,0 +1,15 @@
+module 0x42::M {
+
+    // This schema creates an error.
+    spec schema ErroneousSchema {
+        ensures x > 0;
+    }
+
+    // This function includes the schema with the error, but also has its own error. We expect the own error
+    // to be reported and no issue with the use of erroneous schema.
+    fun foo(x: u64): u64 { x }
+    spec foo {
+        include ErroneousSchema;
+        ensures 2 < true;
+    }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/variables_err.exp b/vendors/move/crates/move-model/tests/sources/variables_err.exp
new file mode 100644
index 000000000..ce21e503f
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/variables_err.exp
@@ -0,0 +1,8 @@
+error: unexpected token
+   ┌─ tests/sources/variables_err.move:20:20
+   │
+20 │     invariant pack x == 0;
+   │                    ^
+   │                    │
+   │                    Unexpected 'x'
+   │                    Expected ';'
diff --git a/vendors/move/crates/move-model/tests/sources/variables_err.move b/vendors/move/crates/move-model/tests/sources/variables_err.move
new file mode 100644
index 000000000..aebca540c
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/variables_err.move
@@ -0,0 +1,23 @@
+module 0x42::M {
+
+  struct S {
+    x: u64,
+  }
+
+  spec S {
+    global tick: num;
+
+    // Undeclared
+    // invariant update ticks = tick + 1;
+
+    // Wrong type
+    // invariant update tick = false;
+
+    // Cannot have assignment
+    invariant tick = x;
+
+    // Must have assignment
+    invariant pack x == 0;
+    invariant unpack x == 0;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/sources/variables_ok.exp b/vendors/move/crates/move-model/tests/sources/variables_ok.exp
new file mode 100644
index 000000000..47f2d6474
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/variables_ok.exp
@@ -0,0 +1,8 @@
+error: unexpected token
+  ┌─ tests/sources/variables_ok.move:9:20
+  │
+9 │     invariant pack sum = sum + x;
+  │                    ^^^
+  │                    │
+  │                    Unexpected 'sum'
+  │                    Expected ';'
diff --git a/vendors/move/crates/move-model/tests/sources/variables_ok.move b/vendors/move/crates/move-model/tests/sources/variables_ok.move
new file mode 100644
index 000000000..e48d1ea53
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/sources/variables_ok.move
@@ -0,0 +1,12 @@
+module 0x42::M {
+
+  struct S {
+    x: u64,
+  }
+
+  spec S {
+    global sum: num;
+    invariant pack sum = sum + x;
+    invariant unpack sum = sum - x;
+  }
+}
diff --git a/vendors/move/crates/move-model/tests/testsuite.rs b/vendors/move/crates/move-model/tests/testsuite.rs
new file mode 100644
index 000000000..b570e881b
--- /dev/null
+++ b/vendors/move/crates/move-model/tests/testsuite.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{FunctionDefinitionIndex, StructDefinitionIndex},
+};
+use move_command_line_common::testing::EXP_EXT;
+use move_compiler::{diagnostics::WarningFilters, shared::PackagePaths};
+use move_model::{run_bytecode_model_builder, run_model_builder};
+use move_prover_test_utils::baseline_test::verify_or_update_baseline;
+use std::path::Path;
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let targets = vec![PackagePaths {
+        name: None,
+        paths: vec![path.to_str().unwrap().to_string()],
+        named_address_map: std::collections::BTreeMap::<String, _>::new(),
+    }];
+    let env = run_model_builder(
+        targets,
+        vec![],
+        Some(WarningFilters::unused_warnings_filter_for_test()),
+    )?;
+    let diags = if env.diag_count(Severity::Warning) > 0 {
+        let mut writer = Buffer::no_color();
+        env.report_diag(&mut writer, Severity::Warning);
+        String::from_utf8_lossy(&writer.into_inner()).to_string()
+    } else {
+        // check that translating from bytecodes also works + yields similar results
+        let modules = env.get_bytecode_modules();
+        let bytecode_env = run_bytecode_model_builder(modules)?;
+        assert_eq!(bytecode_env.get_module_count(), env.get_module_count());
+        for m in bytecode_env.get_modules() {
+            let raw_module = m.get_verified_module();
+            let other_m = env
+                .find_module_by_language_storage_id(&raw_module.self_id())
+                .expect("Module not found");
+            assert_eq!(m.get_function_count(), other_m.get_function_count());
+            // other_m can have ghost structs, so only check that we have at least as many
+            // structs as in bytecode.
+            assert!(m.get_struct_count() <= other_m.get_struct_count());
+            for (i, _) in raw_module.struct_defs().iter().enumerate() {
+                let idx = StructDefinitionIndex(i as u16);
+                let s = m.get_struct_by_def_idx(idx);
+                let other_s = other_m.get_struct_by_def_idx(idx);
+                assert_eq!(s.get_field_count(), other_s.get_field_count());
+                for f in s.get_fields() {
+                    let other_f = other_s.get_field_by_offset(f.get_offset());
+                    assert_eq!(f.get_identifier(), other_f.get_identifier());
+                }
+            }
+            for (i, _) in raw_module.function_defs().iter().enumerate() {
+                let idx = FunctionDefinitionIndex(i as u16);
+                let fun = m.get_function(m.try_get_function_id(idx).expect("Function not found"));
+                let other_fun = other_m.get_function(
+                    other_m
+                        .try_get_function_id(idx)
+                        .expect("Function not found"),
+                );
+                assert_eq!(fun.get_identifier(), other_fun.get_identifier())
+            }
+        }
+
+        "All good, no errors!".to_string()
+    };
+    let baseline_path = path.with_extension(EXP_EXT);
+    verify_or_update_baseline(baseline_path.as_path(), &diags)?;
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests/sources", r".*\.move");
diff --git a/vendors/move/crates/move-package/Cargo.toml b/vendors/move/crates/move-package/Cargo.toml
new file mode 100644
index 000000000..0918db6ca
--- /dev/null
+++ b/vendors/move/crates/move-package/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "move-package"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Package and build system for Move code"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+toml.workspace = true
+serde.workspace = true
+petgraph.workspace = true
+anyhow = "1.0.71"
+walkdir.workspace = true
+clap.workspace = true
+colored.workspace = true
+serde_yaml.workspace = true
+tempfile.workspace = true
+sha2.workspace = true
+regex.workspace = true
+treeline.workspace = true
+once_cell.workspace = true
+named-lock.workspace = true
+
+move-binary-format.workspace = true
+move-compiler.workspace = true
+move-bytecode-source-map.workspace = true
+move-abigen.workspace = true
+move-docgen.workspace = true
+move-core-types.workspace = true
+move-symbol-pool.workspace = true
+move-command-line-common.workspace = true
+move-model.workspace = true
+move-bytecode-utils.workspace = true
+
+whoami.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+
+[[test]]
+name = "test_runner"
+harness = false
diff --git a/vendors/move/crates/move-package/README.md b/vendors/move/crates/move-package/README.md
new file mode 100644
index 000000000..fdffc87aa
--- /dev/null
+++ b/vendors/move/crates/move-package/README.md
@@ -0,0 +1,170 @@
+---
+id: move-package
+title: Move Package
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/move-package/README.md
+---
+
+# Summary
+
+The Move package crate contains the logic for parsing, resolving, and
+building Move packages. It is meant to be used as a library, both for
+building packages (e.g., by the Move CLI), or by other applications that
+may be working with Move packages. The package system is split into three
+main phases: parsing, resolution, and compilation.
+
+## Parsing and Manifest Layout
+
+The parsing and manifest layout logic is defined in the
+[`./src/source_package`](./src/source_package) directory. This defines the
+layout and the set of required and optional directories for a Move package
+in [`./src/source_package/layout.rs`](./src/source_package/layout.rs), it
+defines the format of the parsed Move package manifest ("`Move.toml`") in
+[`./src/source_package/parsed_manifest.rs`](./src/source_package/parsed_manifest.rs),
+and it defines the parser for the Move package manifest in
+[`./src/source_package/manifest_parser.rs`](./src/source_package/manifest_parser.rs).
+Note that we don't have a tokenizer/lexer as we use the TOML lexer. This
+also resolves git dependencies to where they will live on the local file
+system (but does not clone them).
+
+## Resolution
+
+The resolution phase is responsible for resolving all packages and building
+the package graph which represents the dependency relations between
+packages. It is also responsible for ensuring that all named addresses have
+a value assigned to them, and that there are no conflicting assignments.
+The package graph is rooted at the package being built and is a DAG.
+
+Discovering the full set of transitive dependencies (including
+dev-dependencies), regardless of the current build configuration
+results in a `DependencyGraph` which can optionally be serialized into
+(and deserialized out of) a `LockFile`. If a `DependencyGraph` can be
+created, it is guaranteed to:
+
+- Be acyclic.
+
+- Contain no conflicting dependencies, where the same package name
+  is required to come from two distinct sources.
+
+- Have well-nested relative local dependencies, where for all
+  dependency chains `R -> L0 -> L1 -> ... -> Ln` with `R` being
+  remote, `Li` being local with a relative path, and `X -> Y` meaning
+  `X` depends on `Y`, the paths of all `Li`s are sub-directories of
+  the repository containing `R` (but not necessarily sub-directories
+  of each other).
+
+The logic for exploring transitive dependencies is found in
+[`./src/resolution/dependency_graph.rs`](./src/resolution/dependency_graph.rs),
+and the logic for lock files (creation, commit, schema) is found in
+the [`./src/resolution/lock_file`](./src/resolution/lock_file)
+directory.
+
+A `DependencyGraph` is further processed into a `ResolvedGraph` which
+is specific to the current build configuration (e.g. only includes
+dev-dependencies and dev-address assignments if dev-mode is enabled),
+and further includes the following for each package:
+
+- Its source digest, which is a hash of its manifest and source files.
+
+- Its "renaming" table which includes in-scope addresses that
+  originate from dependencies but have been renamed.
+
+- Its "resolution table", which is a total mapping from its in-scope
+  named addresses to numerical addresses.
+
+If a `ResolvedGraph` can be created, it guarantees that:
+
+- All packages exist at their sources, and all of them are available
+  locally (fetched from remote sources such as git if necessary).
+
+- Package source digests match the source digests (if supplied) for
+  the dependencies they satisfy.
+
+- All packages have valid renaming tables, where all their bindings
+  refer to valid addresses in their dependencies and introduce
+  bindings that do not overlap with other renamings for the same
+  package.
+
+- A complete named address assignment exists, wherein every named
+  address in scope for every package is bound to some numerical
+  address.
+
+- A consistent named address assignment exists, wherein if address `A`
+  in package `P` is equivalent to address `B` in package `Q`, then `A`
+  and `B` are assigned the same numerical address. Informally, two
+  named addresses (across packages) are equivalent if they are related
+  by scope or renamings.  Formally, for packages `P`, `Q` and named
+  addresses `x`, `y`, this equivalence is the transitive reflexive
+  closure of the relation that corresponds `x` in `P` to `y` in `Q`
+  when,
+  - `P` depends on `Q`,
+  - `y` is in scope in `Q`,
+  - `P`'s renaming binds `x` to `(Q, y)`, or
+  - `x` is not in `P`'s renaming, and `x = y`.
+
+Named address assignment is implemented by unification, so if:
+
+- `P` depends on `Q`, renaming its `QA` to `PA`, and assigns `0x42` to `PA`.
+- `Q` depends on `R`, renaming its `RA` to `QA`,
+- `R` introduces unbound address `RA`.
+
+This results in a complete and consistent named address assignment where,
+
+- `PA = 0x42` in `P`'s resolution table,
+- `QA = 0x42` in `Q`'s resolution table,
+- `RA = 0x42` in `R`'s resolution table,
+
+even though only one concrete name was assigned.  Similarly, if:
+
+- `P` depends on `Q`, and assigns `0x42` to `QA`,
+- `P` depends on `R`, and assigns `0x43` to `RA`,
+- `Q` depends on `S` renaming its `SA` to `QA`,
+- `R` depends on `S` renaming its `SA` to `RA`,
+- `S` introduces unbound address `SA`.
+
+This results in an inconsistent named address assignment because it
+requires `SA` to be bound to both `0x42` and `0x43`.
+
+[`./src/resolution/resolution_graph.rs`](./src/resolution/resolution_graph.rs)
+defines `ResolvedGraph` and creating one from a `DependencyGraph`,
+with support for named address resolution (unification) in
+[`./src/resolution/resolving_table.rs`](./src/resolution/resolving_table.rs)
+and for calculating source digests in
+[`./src/resolution/digest.rs`](./src/resolution/digest.rs).
+
+## Compilation
+
+The final stage of the package system is compilation. All logic relating to
+the final build artifacts, or global environment creation, is contained in
+the [`./src/compilation`](./src/compilation) directory. The package layout
+for compiled Move packages is defined in
+[`./src/compilation/package_layout.rs`](./src/compilation/package_layout.rs).
+
+The [`./src/compilation/build_plan.rs`](./src/compilation/build_plan.rs)
+contains the logic for driving the compilation of a package and the
+compilation of all of the package's dependencies given a valid resolution
+graph. The logic in
+[`./src/compilation/compiled_package.rs`](./src/compilation/compiled_package.rs)
+contains the definition of the in-memory representation of compiled Move
+packages and other data structures and APIs relating to compiled Move
+packages, along with the logic for compiling a _single_ Move package
+assuming all of its dependencies are already compiled and saved to disk.
+This is driven by the logic in
+[`./src/compilation/build_plan.rs`](./src/compilation/build_plan.rs). The
+compilation process is also responsible for generating documentation, ABIs
+and the like, along with determining if a cached version of the
+to-be-built package already exists and if so, if the cached version
+can be used or if the cached copy is invalid and needs to be recompiled.
+
+One important thing to note here is that depending on the compilation
+flags, the caching policy may need to be updated and the `compiler_driver`
+function that is passed into the compilation process may change. However,
+what this function should be is determined by the client of the Move
+package library. In particular, when testing even if we are recompiling
+with the same flags we cannot cache the root package as we need to compile
+it to generate the test plan that will be used by the unit test runner
+later on. This gathering of the test plan is inserted into the compilation
+process via the `compiler_driver` function that is passed in by the client.
+In this case, the [`../move-cli/src/package`](../move-cli/src/package) is
+the client and it is responsible for supplying the correct function as the
+compiler driver to collect the test plan and to later pass that to the unit
+test runner.
diff --git a/vendors/move/crates/move-package/src/compilation/build_plan.rs b/vendors/move/crates/move-package/src/compilation/build_plan.rs
new file mode 100644
index 000000000..c0e8acdb1
--- /dev/null
+++ b/vendors/move/crates/move-package/src/compilation/build_plan.rs
@@ -0,0 +1,133 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compilation::compiled_package::CompiledPackage, resolution::resolution_graph::ResolvedGraph,
+    source_package::parsed_manifest::PackageName,
+};
+use anyhow::Result;
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit,
+    diagnostics::{report_diagnostics_to_color_buffer, report_warnings, FilesSourceText},
+    Compiler,
+};
+use std::{collections::BTreeSet, io::Write, path::Path};
+
+use super::package_layout::CompiledPackageLayout;
+
+#[derive(Debug, Clone)]
+pub struct BuildPlan {
+    root: PackageName,
+    sorted_deps: Vec<PackageName>,
+    resolution_graph: ResolvedGraph,
+}
+
+impl BuildPlan {
+    pub fn create(resolution_graph: ResolvedGraph) -> Result<Self> {
+        let mut sorted_deps = resolution_graph.topological_order();
+        sorted_deps.reverse();
+
+        Ok(Self {
+            root: resolution_graph.root_package(),
+            sorted_deps,
+            resolution_graph,
+        })
+    }
+
+    /// Compilation results in the process exit upon warning/failure
+    pub fn compile<W: Write>(&self, writer: &mut W) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, |compiler| compiler.build_and_report())
+    }
+
+    /// Compilation process does not exit even if warnings/failures are encountered
+    pub fn compile_no_exit<W: Write>(&self, writer: &mut W) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, |compiler| {
+            let (files, units_res) = compiler.build()?;
+            match units_res {
+                Ok((units, warning_diags)) => {
+                    report_warnings(&files, warning_diags);
+                    Ok((files, units))
+                }
+                Err(error_diags) => {
+                    assert!(!error_diags.is_empty());
+                    let diags_buf = report_diagnostics_to_color_buffer(&files, error_diags);
+                    if let Err(err) = std::io::stdout().write_all(&diags_buf) {
+                        anyhow::bail!("Cannot output compiler diagnostics: {}", err);
+                    }
+                    anyhow::bail!("Compilation error");
+                }
+            }
+        })
+    }
+
+    pub fn compile_with_driver<W: Write>(
+        &self,
+        writer: &mut W,
+        mut compiler_driver: impl FnMut(
+            Compiler,
+        )
+            -> anyhow::Result<(FilesSourceText, Vec<AnnotatedCompiledUnit>)>,
+    ) -> Result<CompiledPackage> {
+        let root_package = &self.resolution_graph.package_table[&self.root];
+        let project_root = match &self.resolution_graph.build_options.install_dir {
+            Some(under_path) => under_path.clone(),
+            None => self.resolution_graph.graph.root_path.clone(),
+        };
+        let immediate_dependencies_names =
+            root_package.immediate_dependencies(&self.resolution_graph);
+        let transitive_dependencies = self
+            .resolution_graph
+            .topological_order()
+            .into_iter()
+            .filter(|package_name| *package_name != self.root)
+            .map(|package_name| {
+                let dep_package = self
+                    .resolution_graph
+                    .package_table
+                    .get(&package_name)
+                    .unwrap();
+                let dep_source_paths = dep_package
+                    .get_sources(&self.resolution_graph.build_options)
+                    .unwrap();
+                (
+                    package_name,
+                    immediate_dependencies_names.contains(&package_name),
+                    dep_source_paths,
+                    &dep_package.resolved_table,
+                    dep_package.compiler_config(
+                        /* is_dependency */ true,
+                        &self.resolution_graph.build_options,
+                    ),
+                )
+            })
+            .collect();
+
+        let compiled = CompiledPackage::build_all(
+            writer,
+            &project_root,
+            root_package.clone(),
+            transitive_dependencies,
+            &self.resolution_graph,
+            &mut compiler_driver,
+        )?;
+
+        Self::clean(
+            &project_root.join(CompiledPackageLayout::Root.path()),
+            self.sorted_deps.iter().copied().collect(),
+        )?;
+        Ok(compiled)
+    }
+
+    // Clean out old packages that are no longer used, or no longer used under the current
+    // compilation flags
+    fn clean(build_root: &Path, keep_paths: BTreeSet<PackageName>) -> Result<()> {
+        for dir in std::fs::read_dir(build_root)? {
+            let path = dir?.path();
+            if !keep_paths.iter().any(|name| path.ends_with(name.as_str())) {
+                std::fs::remove_dir_all(&path)?;
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-package/src/compilation/compiled_package.rs b/vendors/move/crates/move-package/src/compilation/compiled_package.rs
new file mode 100644
index 000000000..7ee573348
--- /dev/null
+++ b/vendors/move/crates/move-package/src/compilation/compiled_package.rs
@@ -0,0 +1,937 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compilation::package_layout::CompiledPackageLayout,
+    resolution::resolution_graph::{Package, Renaming, ResolvedGraph, ResolvedTable},
+    source_package::{
+        layout::{SourcePackageLayout, REFERENCE_TEMPLATE_FILENAME},
+        parsed_manifest::{FileName, PackageDigest, PackageName},
+    },
+    BuildConfig,
+};
+use anyhow::{ensure, Result};
+use colored::Colorize;
+use move_abigen::{Abigen, AbigenOptions};
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_bytecode_source_map::utils::source_map_from_file;
+use move_bytecode_utils::Modules;
+use move_command_line_common::{
+    env::get_bytecode_version_from_env,
+    files::{
+        extension_equals, find_filenames, try_exists, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION,
+        SOURCE_MAP_EXTENSION,
+    },
+};
+use move_compiler::{
+    compiled_unit::{
+        self, AnnotatedCompiledUnit, CompiledUnit, NamedCompiledModule, NamedCompiledScript,
+    },
+    diagnostics::FilesSourceText,
+    shared::{NamedAddressMap, NumericalAddress, PackageConfig, PackagePaths},
+    Compiler,
+};
+use move_docgen::{Docgen, DocgenOptions};
+use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
+use move_symbol_pool::Symbol;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+#[derive(Debug, Clone)]
+pub enum CompilationCachingStatus {
+    /// The package and all if its dependencies were cached
+    Cached,
+    /// At least this package and/or one of its dependencies needed to be rebuilt
+    Recompiled,
+}
+
+#[derive(Debug, Clone)]
+pub struct CompiledUnitWithSource {
+    pub unit: CompiledUnit,
+    pub source_path: PathBuf,
+}
+
+/// Represents meta information about a package and the information it was compiled with. Shared
+/// across both the `CompiledPackage` and `OnDiskCompiledPackage` structs.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompiledPackageInfo {
+    /// The name of the compiled package
+    pub package_name: PackageName,
+    /// The instantiations for all named addresses that were used for compilation
+    pub address_alias_instantiation: ResolvedTable,
+    /// The hash of the source directory at the time of compilation. `None` if the source for this
+    /// package is not available/this package was not compiled.
+    pub source_digest: Option<PackageDigest>,
+    /// The build flags that were used when compiling this package.
+    pub build_flags: BuildConfig,
+}
+
+/// Represents a compiled package in memory.
+#[derive(Debug, Clone)]
+pub struct CompiledPackage {
+    /// Meta information about the compilation of this `CompiledPackage`
+    pub compiled_package_info: CompiledPackageInfo,
+    /// The output compiled bytecode in the root package (both module, and scripts) along with its
+    /// source file
+    pub root_compiled_units: Vec<CompiledUnitWithSource>,
+    /// The output compiled bytecode for dependencies
+    pub deps_compiled_units: Vec<(PackageName, CompiledUnitWithSource)>,
+
+    // Optional artifacts from compilation
+    //
+    /// filename -> doctext
+    pub compiled_docs: Option<Vec<(String, String)>>,
+    /// filename -> json bytes for ScriptABI. Can then be used to generate transaction builders in
+    /// various languages.
+    pub compiled_abis: Option<Vec<(String, Vec<u8>)>>,
+}
+
+/// Represents a compiled package that has been saved to disk. This holds only the minimal metadata
+/// needed to reconstruct a `CompiledPackage` package from it and to determine whether or not a
+/// recompilation of the package needs to be performed or not.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OnDiskPackage {
+    /// Information about the package and the specific compilation that was done.
+    pub compiled_package_info: CompiledPackageInfo,
+    /// Dependency names for this package.
+    pub dependencies: Vec<PackageName>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OnDiskCompiledPackage {
+    /// Path to the root of the package and its data on disk. Relative to/rooted at the directory
+    /// containing the `Move.toml` file for this package.
+    pub root_path: PathBuf,
+    pub package: OnDiskPackage,
+}
+
+impl CompilationCachingStatus {
+    /// Returns `true` if this package and all dependencies are cached
+    pub fn is_cached(&self) -> bool {
+        matches!(self, Self::Cached)
+    }
+
+    /// Returns `true` if this package or one of its dependencies was rebuilt
+    pub fn is_rebuilt(&self) -> bool {
+        !self.is_cached()
+    }
+}
+
+impl OnDiskCompiledPackage {
+    pub fn from_path(p: &Path) -> Result<Self> {
+        let (buf, build_path) = if try_exists(p)? && extension_equals(p, "yaml") {
+            (std::fs::read(p)?, p.parent().unwrap().parent().unwrap())
+        } else {
+            (
+                std::fs::read(p.join(CompiledPackageLayout::BuildInfo.path()))?,
+                p.parent().unwrap(),
+            )
+        };
+        let package = serde_yaml::from_slice::<OnDiskPackage>(&buf)?;
+        assert!(build_path.ends_with(CompiledPackageLayout::Root.path()));
+        let root_path = build_path.join(package.compiled_package_info.package_name.as_str());
+        Ok(Self { root_path, package })
+    }
+
+    pub fn into_compiled_package(&self) -> Result<CompiledPackage> {
+        let root_name = self.package.compiled_package_info.package_name;
+        assert!(self.root_path.ends_with(root_name.as_str()));
+        let root_compiled_units = self.get_compiled_units_paths(root_name)?;
+        let root_compiled_units = root_compiled_units
+            .into_iter()
+            .map(|bytecode_path| self.decode_unit(root_name, &bytecode_path))
+            .collect::<Result<Vec<_>>>()?;
+        let mut deps_compiled_units = vec![];
+        for dep_name in self.package.dependencies.iter().copied() {
+            let compiled_units = self.get_compiled_units_paths(dep_name)?;
+            for bytecode_path in compiled_units {
+                deps_compiled_units.push((dep_name, self.decode_unit(dep_name, &bytecode_path)?))
+            }
+        }
+
+        let docs_path = self
+            .root_path
+            .join(self.package.compiled_package_info.package_name.as_str())
+            .join(CompiledPackageLayout::CompiledDocs.path());
+        let compiled_docs = if docs_path.is_dir() {
+            Some(
+                find_filenames(&[docs_path.to_string_lossy().to_string()], |path| {
+                    extension_equals(path, "md")
+                })?
+                .into_iter()
+                .map(|path| {
+                    let contents = std::fs::read_to_string(&path).unwrap();
+                    (path, contents)
+                })
+                .collect(),
+            )
+        } else {
+            None
+        };
+
+        let abi_path = self
+            .root_path
+            .join(self.package.compiled_package_info.package_name.as_str())
+            .join(CompiledPackageLayout::CompiledABIs.path());
+        let compiled_abis = if abi_path.is_dir() {
+            Some(
+                find_filenames(&[abi_path.to_string_lossy().to_string()], |path| {
+                    extension_equals(path, "abi")
+                })?
+                .into_iter()
+                .map(|path| {
+                    let contents = std::fs::read(&path).unwrap();
+                    (path, contents)
+                })
+                .collect(),
+            )
+        } else {
+            None
+        };
+
+        Ok(CompiledPackage {
+            compiled_package_info: self.package.compiled_package_info.clone(),
+            root_compiled_units,
+            deps_compiled_units,
+            compiled_docs,
+            compiled_abis,
+        })
+    }
+
+    fn decode_unit(
+        &self,
+        package_name: Symbol,
+        bytecode_path_str: &str,
+    ) -> Result<CompiledUnitWithSource> {
+        let package_name_opt = Some(package_name);
+        let bytecode_path = Path::new(bytecode_path_str);
+        let path_to_file = CompiledPackageLayout::path_to_file_after_category(bytecode_path);
+        let bytecode_bytes = std::fs::read(bytecode_path)?;
+        let source_map = source_map_from_file(
+            &self
+                .root_path
+                .join(CompiledPackageLayout::SourceMaps.path())
+                .join(&path_to_file)
+                .with_extension(SOURCE_MAP_EXTENSION),
+        )?;
+        let source_path = self
+            .root_path
+            .join(CompiledPackageLayout::Sources.path())
+            .join(path_to_file)
+            .with_extension(MOVE_EXTENSION);
+        ensure!(
+            source_path.is_file(),
+            "Error decoding package: {}. \
+            Unable to find corresponding source file for '{}' in package {}",
+            self.package.compiled_package_info.package_name,
+            bytecode_path_str,
+            package_name
+        );
+        match CompiledScript::deserialize(&bytecode_bytes) {
+            Ok(script) => {
+                let name = FileName::from(
+                    bytecode_path
+                        .file_stem()
+                        .unwrap()
+                        .to_string_lossy()
+                        .to_string(),
+                );
+                let unit = CompiledUnit::Script(NamedCompiledScript {
+                    package_name: package_name_opt,
+                    name,
+                    script,
+                    source_map,
+                });
+                Ok(CompiledUnitWithSource { unit, source_path })
+            }
+            Err(_) => {
+                let module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)?;
+                let (address_bytes, module_name) = {
+                    let id = module.self_id();
+                    let parsed_addr = NumericalAddress::new(
+                        id.address().into_bytes(),
+                        move_compiler::shared::NumberFormat::Hex,
+                    );
+                    let module_name = FileName::from(id.name().as_str());
+                    (parsed_addr, module_name)
+                };
+                let unit = CompiledUnit::Module(NamedCompiledModule {
+                    package_name: package_name_opt,
+                    address: address_bytes,
+                    name: module_name,
+                    module,
+                    source_map,
+                });
+                Ok(CompiledUnitWithSource { unit, source_path })
+            }
+        }
+    }
+
+    /// Save `bytes` under `path_under` relative to the package on disk
+    pub(crate) fn save_under(&self, file: impl AsRef<Path>, bytes: &[u8]) -> Result<()> {
+        let path_to_save = self.root_path.join(file);
+        let parent = path_to_save.parent().unwrap();
+        std::fs::create_dir_all(parent)?;
+        std::fs::write(path_to_save, bytes).map_err(|err| err.into())
+    }
+
+    #[allow(unused)]
+    pub(crate) fn has_source_changed_since_last_compile(&self, resolved_package: &Package) -> bool {
+        match &self.package.compiled_package_info.source_digest {
+            // Don't have source available to us
+            None => false,
+            Some(digest) => digest != &resolved_package.source_digest,
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn are_build_flags_different(&self, build_config: &BuildConfig) -> bool {
+        build_config != &self.package.compiled_package_info.build_flags
+    }
+
+    fn get_compiled_units_paths(&self, package_name: Symbol) -> Result<Vec<String>> {
+        let package_dir = if self.package.compiled_package_info.package_name == package_name {
+            self.root_path.clone()
+        } else {
+            self.root_path
+                .join(CompiledPackageLayout::Dependencies.path())
+                .join(package_name.as_str())
+        };
+        let mut compiled_unit_paths = vec![];
+        let module_path = package_dir.join(CompiledPackageLayout::CompiledModules.path());
+        if try_exists(&module_path)? {
+            compiled_unit_paths.push(module_path);
+        }
+        let script_path = package_dir.join(CompiledPackageLayout::CompiledScripts.path());
+        if try_exists(&script_path)? {
+            compiled_unit_paths.push(script_path);
+        }
+        find_filenames(&compiled_unit_paths, |path| {
+            extension_equals(path, MOVE_COMPILED_EXTENSION)
+        })
+    }
+
+    fn save_compiled_unit(
+        &self,
+        package_name: Symbol,
+        compiled_unit: &CompiledUnitWithSource,
+    ) -> Result<()> {
+        let root_package = self.package.compiled_package_info.package_name;
+        assert!(self.root_path.ends_with(root_package.as_str()));
+        let category_dir = match &compiled_unit.unit {
+            CompiledUnit::Script(_) => CompiledPackageLayout::CompiledScripts.path(),
+            CompiledUnit::Module(_) => CompiledPackageLayout::CompiledModules.path(),
+        };
+        let file_path = if root_package == package_name {
+            PathBuf::new()
+        } else {
+            CompiledPackageLayout::Dependencies
+                .path()
+                .join(package_name.as_str())
+        }
+        .join(match &compiled_unit.unit {
+            CompiledUnit::Script(named) => named.name.as_str(),
+            CompiledUnit::Module(named) => named.name.as_str(),
+        });
+
+        self.save_under(
+            category_dir
+                .join(&file_path)
+                .with_extension(MOVE_COMPILED_EXTENSION),
+            compiled_unit
+                .unit
+                .serialize(get_bytecode_version_from_env())
+                .as_slice(),
+        )?;
+        self.save_under(
+            CompiledPackageLayout::SourceMaps
+                .path()
+                .join(&file_path)
+                .with_extension(SOURCE_MAP_EXTENSION),
+            compiled_unit.unit.serialize_source_map().as_slice(),
+        )?;
+        self.save_under(
+            CompiledPackageLayout::Sources
+                .path()
+                .join(&file_path)
+                .with_extension(MOVE_EXTENSION),
+            std::fs::read_to_string(&compiled_unit.source_path)?.as_bytes(),
+        )
+    }
+}
+
+impl CompiledPackage {
+    /// Returns all compiled units with sources for this package in transitive dependencies. Order
+    /// is not guaranteed.
+    pub fn all_compiled_units_with_source(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .chain(self.deps_compiled_units.iter().map(|(_, unit)| unit))
+    }
+
+    /// Returns all compiled units for this package in transitive dependencies. Order is not
+    /// guaranteed.
+    pub fn all_compiled_units(&self) -> impl Iterator<Item = &CompiledUnit> {
+        self.all_compiled_units_with_source().map(|unit| &unit.unit)
+    }
+
+    /// Returns compiled modules for this package and its transitive dependencies
+    pub fn all_modules_map(&self) -> Modules {
+        Modules::new(
+            self.all_compiled_units()
+                .filter_map(|unit| match unit {
+                    CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module),
+                    CompiledUnit::Script(_) => None,
+                })
+                .collect::<Vec<_>>(),
+        )
+    }
+
+    pub fn root_modules_map(&self) -> Modules {
+        Modules::new(
+            self.root_compiled_units
+                .iter()
+                .filter_map(|unit| match &unit.unit {
+                    CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module),
+                    CompiledUnit::Script(_) => None,
+                }),
+        )
+    }
+
+    /// `all_compiled_units_with_source` filtered over `CompiledUnit::Module`
+    pub fn all_modules(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.all_compiled_units_with_source()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Module(_)))
+    }
+
+    /// `root_compiled_units` filtered over `CompiledUnit::Module`
+    pub fn root_modules(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Module(_)))
+    }
+
+    pub fn get_module_by_name(
+        &self,
+        package_name: &str,
+        module_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        if self.compiled_package_info.package_name.as_str() == package_name {
+            return self.get_module_by_name_from_root(module_name);
+        }
+
+        self.deps_compiled_units
+            .iter()
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Module(_))
+            })
+            .map(|(_, unit)| unit)
+            .find(|unit| unit.unit.name().as_str() == module_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find module with name '{}' in package {}",
+                    module_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_script_by_name(
+        &self,
+        package_name: &str,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        if self.compiled_package_info.package_name.as_str() == package_name {
+            return self.get_script_by_name_from_root(script_name);
+        }
+
+        self.deps_compiled_units
+            .iter()
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Script(_))
+            })
+            .map(|(_, unit)| unit)
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_module_by_name_from_root(
+        &self,
+        module_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        self.root_modules()
+            .find(|unit| unit.unit.name().as_str() == module_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find module with name '{}' in package {}",
+                    module_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_script_by_name_from_root(
+        &self,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        self.scripts()
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn scripts(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Script(_)))
+    }
+
+    #[allow(unused)]
+    fn can_load_cached(
+        package: &OnDiskCompiledPackage,
+        resolution_graph: &ResolvedGraph,
+        resolved_package: &Package,
+        is_root_package: bool,
+    ) -> bool {
+        // TODO: add more tests for the different caching cases
+        !(package.has_source_changed_since_last_compile(resolved_package) // recompile if source has changed
+            // Recompile if the flags are different
+                || package.are_build_flags_different(&resolution_graph.build_options)
+                // Force root package recompilation in test mode
+                || resolution_graph.build_options.test_mode && is_root_package
+                // Recompile if force recompilation is set
+                || resolution_graph.build_options.force_recompilation) &&
+                // Dive deeper to make sure that instantiations haven't changed since that
+                // can be changed by other packages above us in the dependency graph possibly
+                package.package.compiled_package_info.address_alias_instantiation
+                    == resolved_package.resolved_table
+    }
+
+    pub(crate) fn build_all<W: Write>(
+        w: &mut W,
+        project_root: &Path,
+        resolved_package: Package,
+        transitive_dependencies: Vec<(
+            /* name */ Symbol,
+            /* is immediate */ bool,
+            /* source paths */ Vec<Symbol>,
+            /* address mapping */ &ResolvedTable,
+            /* compiler config */ PackageConfig,
+        )>,
+        resolution_graph: &ResolvedGraph,
+        mut compiler_driver: impl FnMut(
+            Compiler,
+        )
+            -> Result<(FilesSourceText, Vec<AnnotatedCompiledUnit>)>,
+    ) -> Result<CompiledPackage> {
+        let immediate_dependencies = transitive_dependencies
+            .iter()
+            .filter(|(_, is_immediate, _, _, _)| *is_immediate)
+            .map(|(name, _, _, _, _)| *name)
+            .collect::<Vec<_>>();
+        let transitive_dependencies = transitive_dependencies
+            .into_iter()
+            .map(
+                |(name, _is_immediate, source_paths, address_mapping, config)| {
+                    (name, source_paths, address_mapping, config)
+                },
+            )
+            .collect::<Vec<_>>();
+        for (dep_package_name, _, _, _) in &transitive_dependencies {
+            writeln!(
+                w,
+                "{} {}",
+                "INCLUDING DEPENDENCY".bold().green(),
+                dep_package_name
+            )?;
+        }
+        let root_package_name = resolved_package.source_package.package.name;
+        writeln!(w, "{} {}", "BUILDING".bold().green(), root_package_name)?;
+
+        // gather source/dep files with their address mappings
+        let (sources_package_paths, deps_package_paths) = make_source_and_deps_for_compiler(
+            resolution_graph,
+            &resolved_package,
+            transitive_dependencies,
+        )?;
+        let flags = resolution_graph.build_options.compiler_flags();
+        // invoke the compiler
+        let mut paths = deps_package_paths.clone();
+        paths.push(sources_package_paths.clone());
+
+        let compiler = Compiler::from_package_paths(paths, vec![])
+            .unwrap()
+            .set_flags(flags);
+        let (file_map, all_compiled_units) = compiler_driver(compiler)?;
+        let mut root_compiled_units = vec![];
+        let mut deps_compiled_units = vec![];
+        for annot_unit in all_compiled_units {
+            let source_path = PathBuf::from(file_map[&annot_unit.loc().file_hash()].0.as_str());
+            let package_name = match &annot_unit {
+                compiled_unit::CompiledUnitEnum::Module(m) => m.named_module.package_name.unwrap(),
+                compiled_unit::CompiledUnitEnum::Script(s) => s.named_script.package_name.unwrap(),
+            };
+            let unit = CompiledUnitWithSource {
+                unit: annot_unit.into_compiled_unit(),
+                source_path,
+            };
+            if package_name == root_package_name {
+                root_compiled_units.push(unit)
+            } else {
+                deps_compiled_units.push((package_name, unit))
+            }
+        }
+
+        let mut compiled_docs = None;
+        let mut compiled_abis = None;
+        if resolution_graph.build_options.generate_docs
+            || resolution_graph.build_options.generate_abis
+        {
+            let model = run_model_builder_with_options(
+                vec![sources_package_paths],
+                deps_package_paths,
+                ModelBuilderOptions::default(),
+                None,
+            )?;
+
+            if resolution_graph.build_options.generate_docs {
+                compiled_docs = Some(Self::build_docs(
+                    resolved_package.source_package.package.name,
+                    &model,
+                    &resolved_package.package_path,
+                    &immediate_dependencies,
+                    &resolution_graph.build_options.install_dir,
+                ));
+            }
+
+            if resolution_graph.build_options.generate_abis {
+                compiled_abis = Some(Self::build_abis(
+                    get_bytecode_version_from_env(),
+                    &model,
+                    &root_compiled_units,
+                ));
+            }
+        };
+
+        let compiled_package = CompiledPackage {
+            compiled_package_info: CompiledPackageInfo {
+                package_name: resolved_package.source_package.package.name,
+                address_alias_instantiation: resolved_package.resolved_table,
+                source_digest: Some(resolved_package.source_digest),
+                build_flags: resolution_graph.build_options.clone(),
+            },
+            root_compiled_units,
+            deps_compiled_units,
+            compiled_docs,
+            compiled_abis,
+        };
+
+        compiled_package.save_to_disk(project_root.join(CompiledPackageLayout::Root.path()))?;
+
+        Ok(compiled_package)
+    }
+
+    // We take the (restrictive) view that all filesystems are case insensitive to maximize
+    // portability of packages.
+    fn check_filepaths_ok(&self) -> Result<()> {
+        // A mapping of (lowercase_name => [info_for_each_occurence]
+        let mut insensitive_mapping = BTreeMap::new();
+        for compiled_unit in &self.root_compiled_units {
+            let is_module = matches!(&compiled_unit.unit, CompiledUnit::Module(_));
+            let name = match &compiled_unit.unit {
+                CompiledUnit::Script(named) => named.name.as_str(),
+                CompiledUnit::Module(named) => named.name.as_str(),
+            };
+            let entry = insensitive_mapping
+                .entry(name.to_lowercase())
+                .or_insert_with(Vec::new);
+            entry.push((
+                name,
+                is_module,
+                compiled_unit.source_path.to_string_lossy().to_string(),
+            ));
+        }
+        let errs = insensitive_mapping
+            .into_iter()
+            .filter_map(|(insensitive_name, occurence_infos)| {
+                if occurence_infos.len() > 1 {
+                    let name_conflict_error_msg = occurence_infos
+                        .into_iter()
+                        .map(|(name, is_module, fpath)| {
+                                format!(
+                                    "\t{} '{}' at path '{}'",
+                                    if is_module { "Module" } else { "Script" },
+                                    name,
+                                    fpath
+                                )
+                        })
+                        .collect::<Vec<_>>()
+                        .join("\n");
+                    Some(format!(
+                        "The following modules and/or scripts would collide as '{}' on the file system:\n{}",
+                        insensitive_name, name_conflict_error_msg
+                    ))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+        if !errs.is_empty() {
+            anyhow::bail!("Module and/or script names found that would cause failures on case insensitive \
+                file systems when compiling package '{}':\n{}\nPlease rename these scripts and/or modules to resolve these conflicts.",
+                self.compiled_package_info.package_name,
+                errs.join("\n"),
+            )
+        }
+        Ok(())
+    }
+
+    pub(crate) fn save_to_disk(&self, under_path: PathBuf) -> Result<OnDiskCompiledPackage> {
+        self.check_filepaths_ok()?;
+        assert!(under_path.ends_with(CompiledPackageLayout::Root.path()));
+        let root_package = self.compiled_package_info.package_name;
+        let on_disk_package = OnDiskCompiledPackage {
+            root_path: under_path.join(root_package.as_str()),
+            package: OnDiskPackage {
+                compiled_package_info: self.compiled_package_info.clone(),
+                dependencies: self
+                    .deps_compiled_units
+                    .iter()
+                    .map(|(package_name, _)| *package_name)
+                    .collect::<BTreeSet<_>>()
+                    .into_iter()
+                    .collect(),
+            },
+        };
+
+        // Clear out the build dir for this package so we don't keep artifacts from previous
+        // compilations
+        if on_disk_package.root_path.is_dir() {
+            std::fs::remove_dir_all(&on_disk_package.root_path)?;
+        }
+
+        std::fs::create_dir_all(&on_disk_package.root_path)?;
+
+        for compiled_unit in &self.root_compiled_units {
+            on_disk_package.save_compiled_unit(root_package, compiled_unit)?;
+        }
+        for (dep_name, compiled_unit) in &self.deps_compiled_units {
+            on_disk_package.save_compiled_unit(*dep_name, compiled_unit)?;
+        }
+
+        if let Some(docs) = &self.compiled_docs {
+            for (doc_filename, doc_contents) in docs {
+                on_disk_package.save_under(
+                    CompiledPackageLayout::CompiledDocs
+                        .path()
+                        .join(doc_filename)
+                        .with_extension("md"),
+                    doc_contents.clone().as_bytes(),
+                )?;
+            }
+        }
+
+        if let Some(abis) = &self.compiled_abis {
+            for (filename, abi_bytes) in abis {
+                on_disk_package.save_under(
+                    CompiledPackageLayout::CompiledABIs
+                        .path()
+                        .join(filename)
+                        .with_extension("abi"),
+                    abi_bytes,
+                )?;
+            }
+        }
+
+        on_disk_package.save_under(
+            CompiledPackageLayout::BuildInfo.path(),
+            serde_yaml::to_string(&on_disk_package.package)?.as_bytes(),
+        )?;
+
+        Ok(on_disk_package)
+    }
+
+    fn build_abis(
+        bytecode_version: Option<u32>,
+        model: &GlobalEnv,
+        compiled_units: &[CompiledUnitWithSource],
+    ) -> Vec<(String, Vec<u8>)> {
+        let bytecode_map: BTreeMap<_, _> = compiled_units
+            .iter()
+            .map(|unit| match &unit.unit {
+                CompiledUnit::Script(script) => (
+                    script.name.to_string(),
+                    unit.unit.serialize(bytecode_version),
+                ),
+                CompiledUnit::Module(module) => (
+                    module.name.to_string(),
+                    unit.unit.serialize(bytecode_version),
+                ),
+            })
+            .collect();
+        let abi_options = AbigenOptions {
+            in_memory_bytes: Some(bytecode_map),
+            output_directory: "".to_string(),
+            ..AbigenOptions::default()
+        };
+        let mut abigen = Abigen::new(model, &abi_options);
+        abigen.gen();
+        abigen.into_result()
+    }
+
+    fn build_docs(
+        package_name: PackageName,
+        model: &GlobalEnv,
+        package_root: &Path,
+        deps: &[PackageName],
+        install_dir: &Option<PathBuf>,
+    ) -> Vec<(String, String)> {
+        let root_doc_templates = find_filenames(
+            &[package_root
+                .join(SourcePackageLayout::DocTemplates.path())
+                .to_string_lossy()
+                .to_string()],
+            |path| extension_equals(path, "md"),
+        )
+        .unwrap_or_else(|_| vec![]);
+        let root_for_docs = if let Some(install_dir) = install_dir {
+            install_dir.join(CompiledPackageLayout::Root.path())
+        } else {
+            CompiledPackageLayout::Root.path().to_path_buf()
+        };
+        let dep_paths = deps
+            .iter()
+            .map(|dep_name| {
+                root_for_docs
+                    .join(dep_name.as_str())
+                    .join(CompiledPackageLayout::CompiledDocs.path())
+                    .to_string_lossy()
+                    .to_string()
+            })
+            .collect();
+        let in_pkg_doc_path = root_for_docs
+            .join(package_name.as_str())
+            .join(CompiledPackageLayout::CompiledDocs.path());
+        let references_path = package_root
+            .join(SourcePackageLayout::DocTemplates.path())
+            .join(REFERENCE_TEMPLATE_FILENAME);
+        let references_file = if references_path.exists() {
+            Some(references_path.to_string_lossy().to_string())
+        } else {
+            None
+        };
+        let doc_options = DocgenOptions {
+            doc_path: dep_paths,
+            output_directory: in_pkg_doc_path.to_string_lossy().to_string(),
+            root_doc_templates,
+            compile_relative_to_output_dir: true,
+            references_file,
+            ..DocgenOptions::default()
+        };
+        let docgen = Docgen::new(model, &doc_options);
+        docgen.gen()
+    }
+}
+
+pub(crate) fn named_address_mapping_for_compiler(
+    resolution_table: &ResolvedTable,
+) -> BTreeMap<Symbol, NumericalAddress> {
+    resolution_table
+        .iter()
+        .map(|(ident, addr)| {
+            let parsed_addr =
+                NumericalAddress::new(addr.into_bytes(), move_compiler::shared::NumberFormat::Hex);
+            (*ident, parsed_addr)
+        })
+        .collect::<BTreeMap<_, _>>()
+}
+
+pub(crate) fn apply_named_address_renaming(
+    current_package_name: Symbol,
+    address_resolution: BTreeMap<Symbol, NumericalAddress>,
+    renaming: &Renaming,
+) -> NamedAddressMap {
+    let package_renamings = renaming
+        .iter()
+        .filter_map(|(rename_to, (package_name, from_name))| {
+            if package_name == &current_package_name {
+                Some((from_name, *rename_to))
+            } else {
+                None
+            }
+        })
+        .collect::<BTreeMap<_, _>>();
+
+    address_resolution
+        .into_iter()
+        .map(|(name, value)| {
+            let new_name = package_renamings.get(&name).copied();
+            (new_name.unwrap_or(name), value)
+        })
+        .collect()
+}
+
+pub(crate) fn make_source_and_deps_for_compiler(
+    resolution_graph: &ResolvedGraph,
+    root: &Package,
+    deps: Vec<(
+        /* name */ Symbol,
+        /* source paths */ Vec<Symbol>,
+        /* address mapping */ &ResolvedTable,
+        /* compiler config */ PackageConfig,
+    )>,
+) -> Result<(
+    /* sources */ PackagePaths,
+    /* deps */ Vec<PackagePaths>,
+)> {
+    let deps_package_paths = deps
+        .into_iter()
+        .map(|(name, source_paths, resolved_table, config)| {
+            let paths = source_paths
+                .into_iter()
+                .collect::<BTreeSet<_>>()
+                .into_iter()
+                .collect::<Vec<_>>();
+            let named_address_map = named_address_mapping_for_compiler(resolved_table);
+            Ok(PackagePaths {
+                name: Some((name, config)),
+                paths,
+                named_address_map,
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let root_named_addrs = apply_named_address_renaming(
+        root.source_package.package.name,
+        named_address_mapping_for_compiler(&root.resolved_table),
+        &root.renaming,
+    );
+    let sources = root.get_sources(&resolution_graph.build_options)?;
+    let source_package_paths = PackagePaths {
+        name: Some((
+            root.source_package.package.name,
+            root.compiler_config(
+                /* is_dependency */ false,
+                &resolution_graph.build_options,
+            ),
+        )),
+        paths: sources,
+        named_address_map: root_named_addrs,
+    };
+    Ok((source_package_paths, deps_package_paths))
+}
diff --git a/vendors/move/crates/move-package/src/compilation/mod.rs b/vendors/move/crates/move-package/src/compilation/mod.rs
new file mode 100644
index 000000000..ad1035bf9
--- /dev/null
+++ b/vendors/move/crates/move-package/src/compilation/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod build_plan;
+pub mod compiled_package;
+pub mod model_builder;
+pub mod package_layout;
diff --git a/vendors/move/crates/move-package/src/compilation/model_builder.rs b/vendors/move/crates/move-package/src/compilation/model_builder.rs
new file mode 100644
index 000000000..0c9588ccc
--- /dev/null
+++ b/vendors/move/crates/move-package/src/compilation/model_builder.rs
@@ -0,0 +1,116 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compilation::compiled_package::make_source_and_deps_for_compiler,
+    resolution::resolution_graph::ResolvedGraph, ModelConfig,
+};
+use anyhow::Result;
+use move_compiler::shared::PackagePaths;
+use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
+
+#[derive(Debug, Clone)]
+pub struct ModelBuilder {
+    resolution_graph: ResolvedGraph,
+    model_config: ModelConfig,
+}
+
+impl ModelBuilder {
+    pub fn create(resolution_graph: ResolvedGraph, model_config: ModelConfig) -> Self {
+        Self {
+            resolution_graph,
+            model_config,
+        }
+    }
+
+    // NOTE: If there are now renamings, then the root package has the global resolution of all named
+    // addresses in the package graph in scope. So we can simply grab all of the source files
+    // across all packages and build the Move model from that.
+    // TODO: In the future we will need a better way to do this to support renaming in packages
+    // where we want to support building a Move model.
+    pub fn build_model(&self) -> Result<GlobalEnv> {
+        // Make sure no renamings have been performed
+        for (pkg_name, pkg) in self.resolution_graph.package_table.iter() {
+            if !pkg.renaming.is_empty() {
+                anyhow::bail!(
+                    "Found address renaming in package '{}' when \
+                    building Move model -- this is currently not supported",
+                    pkg_name
+                )
+            }
+        }
+
+        // Targets are all files in the root package
+        let root_name = self.resolution_graph.root_package();
+        let root_package = self.resolution_graph.get_package(root_name).clone();
+        let deps_source_info = self
+            .resolution_graph
+            .package_table
+            .iter()
+            .filter_map(|(nm, pkg)| {
+                if *nm == root_name {
+                    return None;
+                }
+                let dep_source_paths = pkg
+                    .get_sources(&self.resolution_graph.build_options)
+                    .unwrap();
+                Some(Ok((
+                    *nm,
+                    dep_source_paths,
+                    &pkg.resolved_table,
+                    pkg.compiler_config(
+                        /* is_dependency */ true,
+                        &self.resolution_graph.build_options,
+                    ),
+                )))
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        let (target, deps) = make_source_and_deps_for_compiler(
+            &self.resolution_graph,
+            &root_package,
+            deps_source_info,
+        )?;
+        let (all_targets, all_deps) = if self.model_config.all_files_as_targets {
+            let mut targets = vec![target];
+            targets.extend(deps);
+            (targets, vec![])
+        } else {
+            (vec![target], deps)
+        };
+        let (all_targets, all_deps) = match &self.model_config.target_filter {
+            Some(filter) => {
+                let mut new_targets = vec![];
+                let mut new_deps = all_deps;
+                for PackagePaths {
+                    name,
+                    paths,
+                    named_address_map,
+                } in all_targets
+                {
+                    let (true_targets, false_targets): (Vec<_>, Vec<_>) =
+                        paths.into_iter().partition(|t| t.contains(filter));
+                    if !true_targets.is_empty() {
+                        new_targets.push(PackagePaths {
+                            name: name.clone(),
+                            paths: true_targets,
+                            named_address_map: named_address_map.clone(),
+                        })
+                    }
+                    if !false_targets.is_empty() {
+                        new_deps.push(PackagePaths {
+                            name: name.clone(),
+                            paths: false_targets,
+                            named_address_map,
+                        })
+                    }
+                }
+                (new_targets, new_deps)
+            }
+            None => (all_targets, all_deps),
+        };
+
+        run_model_builder_with_options(all_targets, all_deps, ModelBuilderOptions::default(), None)
+    }
+}
diff --git a/vendors/move/crates/move-package/src/compilation/package_layout.rs b/vendors/move/crates/move-package/src/compilation/package_layout.rs
new file mode 100644
index 000000000..fc46ba2fb
--- /dev/null
+++ b/vendors/move/crates/move-package/src/compilation/package_layout.rs
@@ -0,0 +1,57 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, Clone)]
+pub enum CompiledPackageLayout {
+    BuildInfo,
+    Root,
+    Dependencies,
+    Sources,
+    SourceMaps,
+    LockFiles,
+    CompiledModules,
+    CompiledScripts,
+    CompiledDocs,
+    CompiledABIs,
+}
+
+impl CompiledPackageLayout {
+    pub fn path(&self) -> &Path {
+        let path = match self {
+            Self::BuildInfo => "BuildInfo.yaml",
+            Self::Root => "build",
+            Self::Dependencies => "dependencies",
+            Self::Sources => "sources",
+            Self::SourceMaps => "source_maps",
+            Self::LockFiles => "locks",
+            Self::CompiledModules => "bytecode_modules",
+            Self::CompiledScripts => "bytecode_scripts",
+            Self::CompiledDocs => "docs",
+            Self::CompiledABIs => "abis",
+        };
+        Path::new(path)
+    }
+
+    pub fn path_to_file_after_category(path: &Path) -> PathBuf {
+        let mut suffix_components = vec![];
+        // reverse iterate until Root is found
+        for component in path.components().rev() {
+            let component_path: &Path = component.as_ref();
+            if component_path == Self::Root.path() {
+                break;
+            }
+            suffix_components.push(component);
+        }
+        // pop root package name
+        suffix_components.pop();
+        // pop category
+        suffix_components.pop();
+        // put the components back in order
+        suffix_components.reverse();
+        // make the path
+        suffix_components.into_iter().collect()
+    }
+}
diff --git a/vendors/move/crates/move-package/src/lib.rs b/vendors/move/crates/move-package/src/lib.rs
new file mode 100644
index 000000000..b3a06f44c
--- /dev/null
+++ b/vendors/move/crates/move-package/src/lib.rs
@@ -0,0 +1,222 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod package_lock;
+
+pub mod compilation;
+pub mod lock_file;
+pub mod package_hooks;
+pub mod resolution;
+pub mod source_package;
+
+use anyhow::Result;
+use clap::*;
+use move_compiler::{
+    editions::{Edition, Flavor},
+    Flags,
+};
+use move_core_types::account_address::AccountAddress;
+use move_model::model::GlobalEnv;
+use resolution::{dependency_graph::DependencyGraphBuilder, resolution_graph::ResolvedGraph};
+use serde::{Deserialize, Serialize};
+use source_package::{layout::SourcePackageLayout, parsed_manifest::DependencyKind};
+use std::{
+    collections::BTreeMap,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    compilation::{
+        build_plan::BuildPlan, compiled_package::CompiledPackage, model_builder::ModelBuilder,
+    },
+    package_lock::PackageLock,
+};
+
+#[derive(Debug, Parser, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Default)]
+#[clap(about)]
+pub struct BuildConfig {
+    /// Compile in 'dev' mode. The 'dev-addresses' and 'dev-dependencies' fields will be used if
+    /// this flag is set. This flag is useful for development of packages that expose named
+    /// addresses that are not set to a specific value.
+    #[clap(name = "dev-mode", short = 'd', long = "dev", global = true)]
+    pub dev_mode: bool,
+
+    /// Compile in 'test' mode. The 'dev-addresses' and 'dev-dependencies' fields will be used
+    /// along with any code in the 'tests' directory.
+    #[clap(name = "test-mode", long = "test", global = true)]
+    pub test_mode: bool,
+
+    /// Generate documentation for packages
+    #[clap(name = "generate-docs", long = "doc", global = true)]
+    pub generate_docs: bool,
+
+    /// Generate ABIs for packages
+    #[clap(name = "generate-abis", long = "abi", global = true)]
+    pub generate_abis: bool,
+
+    /// Installation directory for compiled artifacts. Defaults to current directory.
+    #[clap(long = "install-dir", global = true)]
+    pub install_dir: Option<PathBuf>,
+
+    /// Force recompilation of all packages
+    #[clap(name = "force-recompilation", long = "force", global = true)]
+    pub force_recompilation: bool,
+
+    /// Optional location to save the lock file to, if package resolution succeeds.
+    #[clap(skip)]
+    pub lock_file: Option<PathBuf>,
+
+    /// Additional named address mapping. Useful for tools in rust
+    #[clap(skip)]
+    pub additional_named_addresses: BTreeMap<String, AccountAddress>,
+
+    /// Only fetch dependency repos to MOVE_HOME
+    #[clap(long = "fetch-deps-only", global = true)]
+    pub fetch_deps_only: bool,
+
+    /// Skip fetching latest git dependencies
+    #[clap(long = "skip-fetch-latest-git-deps", global = true)]
+    pub skip_fetch_latest_git_deps: bool,
+
+    /// Default flavor for move compilation, if not specified in the package's config
+    #[clap(long = "default-move-flavor", global = true)]
+    pub default_flavor: Option<Flavor>,
+
+    /// Default edition for move compilation, if not specified in the package's config
+    #[clap(long = "default-move-edition", global = true)]
+    pub default_edition: Option<Edition>,
+
+    /// If set, dependency packages are treated as root packages. Notably, this will remove
+    /// warning suppression in dependency packages.
+    #[clap(long = "dependencies-are-root", global = true)]
+    pub deps_as_root: bool,
+
+    /// If set, ignore any compiler warnings
+    #[clap(long = move_compiler::command_line::SILENCE_WARNINGS, global = true)]
+    pub silence_warnings: bool,
+
+    /// If set, warnings become errors
+    #[clap(long = move_compiler::command_line::WARNINGS_ARE_ERRORS, global = true)]
+    pub warnings_are_errors: bool,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+pub struct ModelConfig {
+    /// If set, also files which are in dependent packages are considered as targets.
+    pub all_files_as_targets: bool,
+    /// If set, a string how targets are filtered. A target is included if its file name
+    /// contains this string. This is similar as the `cargo test <string>` idiom.
+    pub target_filter: Option<String>,
+}
+
+impl BuildConfig {
+    /// Compile the package at `path` or the containing Move package. Exit process on warning or
+    /// failure.
+    pub fn compile_package<W: Write>(self, path: &Path, writer: &mut W) -> Result<CompiledPackage> {
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
+        let _mutx = PackageLock::lock(); // held until function returns
+        BuildPlan::create(resolved_graph)?.compile(writer)
+    }
+
+    /// Compile the package at `path` or the containing Move package. Do not exit process on warning
+    /// or failure.
+    pub fn compile_package_no_exit<W: Write>(
+        self,
+        path: &Path,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
+        let _mutx = PackageLock::lock(); // held until function returns
+        BuildPlan::create(resolved_graph)?.compile_no_exit(writer)
+    }
+
+    // NOTE: If there are no renamings, then the root package has the global resolution of all named
+    // addresses in the package graph in scope. So we can simply grab all of the source files
+    // across all packages and build the Move model from that.
+    // TODO: In the future we will need a better way to do this to support renaming in packages
+    // where we want to support building a Move model.
+    pub fn move_model_for_package(
+        self,
+        path: &Path,
+        model_config: ModelConfig,
+    ) -> Result<GlobalEnv> {
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolved_graph = self.resolution_graph_for_package(path, &mut Vec::new())?;
+        let _mutx = PackageLock::lock(); // held until function returns
+        ModelBuilder::create(resolved_graph, model_config).build_model()
+    }
+
+    pub fn download_deps_for_package<W: Write>(&self, path: &Path, writer: &mut W) -> Result<()> {
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let manifest_string =
+            std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))?;
+        let lock_string = std::fs::read_to_string(path.join(SourcePackageLayout::Lock.path())).ok();
+        let _mutx = PackageLock::lock(); // held until function returns
+
+        resolution::download_dependency_repos(manifest_string, lock_string, self, &path, writer)?;
+        Ok(())
+    }
+
+    pub fn resolution_graph_for_package<W: Write>(
+        mut self,
+        path: &Path,
+        writer: &mut W,
+    ) -> Result<ResolvedGraph> {
+        if self.test_mode {
+            self.dev_mode = true;
+        }
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let manifest_string =
+            std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))?;
+        let lock_string = std::fs::read_to_string(path.join(SourcePackageLayout::Lock.path())).ok();
+        let _mutx = PackageLock::lock(); // held until function returns
+
+        let install_dir = self.install_dir.as_ref().unwrap_or(&path).to_owned();
+
+        let mut dep_graph_builder = DependencyGraphBuilder::new(
+            self.skip_fetch_latest_git_deps,
+            writer,
+            install_dir.clone(),
+        );
+        let (dependency_graph, modified) = dep_graph_builder.get_graph(
+            &DependencyKind::default(),
+            path,
+            manifest_string,
+            lock_string,
+        )?;
+
+        if modified {
+            let lock = dependency_graph.write_to_lock(install_dir)?;
+            if let Some(lock_path) = &self.lock_file {
+                lock.commit(lock_path)?;
+            }
+        }
+
+        let DependencyGraphBuilder {
+            mut dependency_cache,
+            progress_output,
+            ..
+        } = dep_graph_builder;
+
+        ResolvedGraph::resolve(
+            dependency_graph,
+            self,
+            &mut dependency_cache,
+            progress_output,
+        )
+    }
+
+    pub fn compiler_flags(&self) -> Flags {
+        let flags = if self.test_mode {
+            Flags::testing()
+        } else {
+            Flags::empty()
+        };
+        flags
+            .set_warnings_are_errors(self.warnings_are_errors)
+            .set_silence_warnings(self.silence_warnings)
+    }
+}
diff --git a/vendors/move/crates/move-package/src/lock_file/mod.rs b/vendors/move/crates/move-package/src/lock_file/mod.rs
new file mode 100644
index 000000000..6277d9c99
--- /dev/null
+++ b/vendors/move/crates/move-package/src/lock_file/mod.rs
@@ -0,0 +1,84 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    fs::{self, File},
+    ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
+};
+
+use anyhow::{Context, Result};
+use tempfile::NamedTempFile;
+
+pub mod schema;
+
+use crate::compilation::package_layout::CompiledPackageLayout;
+
+/// Representation of a machine-generated, human-readable text file that is generated as part of the
+/// build, with the following properties:
+///
+///  - It is only updated by tooling, during the build.
+///  - It will be re-generated on each build.
+///  - Its content is stable (running the same build multiple times should result in a lock file
+///    with the same content).
+///  - It will only be updated if the operation touching it succeeds.
+///
+/// To support this model, the contents of the lock file is stored in a temporary file in the
+/// compiled package output directory, and it must be explicitly committed to its place in the
+/// package root on success, consuming the lock file.
+///
+/// Lock files wrap a `File` which can be accessed by dereferencing it.
+#[derive(Debug)]
+pub struct LockFile {
+    file: NamedTempFile,
+}
+
+impl LockFile {
+    /// Creates a new lock file in a sub-directory of `install_dir` (the compiled output directory
+    /// of a move package).
+    pub fn new(
+        install_dir: PathBuf,
+        manifest_digest: String,
+        deps_digest: String,
+    ) -> Result<LockFile> {
+        let mut locks_dir = install_dir;
+        locks_dir.extend([
+            CompiledPackageLayout::Root.path(),
+            CompiledPackageLayout::LockFiles.path(),
+        ]);
+        fs::create_dir_all(&locks_dir).context("Creating output directory")?;
+
+        let mut lock = tempfile::Builder::new()
+            .prefix("Move.lock")
+            .tempfile_in(locks_dir)
+            .context("Creating lock file")?;
+
+        schema::write_prologue(&mut lock, manifest_digest, deps_digest)
+            .context("Initializing lock file")?;
+
+        Ok(LockFile { file: lock })
+    }
+
+    /// Consume the lock file, moving it to its final position at `lock_path`.  NOTE: If this
+    /// function is not called, the contents of the lock file will be discarded.
+    pub fn commit(self, lock_path: impl AsRef<Path>) -> Result<()> {
+        self.file
+            .persist(lock_path)
+            .context("Committing lock file")?;
+        Ok(())
+    }
+}
+
+impl Deref for LockFile {
+    type Target = File;
+
+    fn deref(&self) -> &Self::Target {
+        self.file.as_file()
+    }
+}
+
+impl DerefMut for LockFile {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.file.as_file_mut()
+    }
+}
diff --git a/vendors/move/crates/move-package/src/lock_file/schema.rs b/vendors/move/crates/move-package/src/lock_file/schema.rs
new file mode 100644
index 000000000..760ee673c
--- /dev/null
+++ b/vendors/move/crates/move-package/src/lock_file/schema.rs
@@ -0,0 +1,138 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Serde compatible types to deserialize the schematized parts of the lock file (everything in the
+//! [move] table).  This module does not support serialization because of limitations in the `toml`
+//! crate related to serializing types as inline tables.
+
+use std::io::{Read, Write};
+
+use anyhow::{bail, Context, Result};
+use serde::{Deserialize, Serialize};
+use tempfile::NamedTempFile;
+use toml::value::Value;
+
+/// Lock file version written by this version of the compiler.  Backwards compatibility is
+/// guaranteed (the compiler can read lock files with older versions), forward compatibility is not
+/// (the compiler will fail to read lock files at newer versions).
+///
+/// TODO(amnn): Set to version 1 when stabilised.
+pub const VERSION: u64 = 0;
+
+#[derive(Deserialize)]
+pub struct Packages {
+    #[serde(rename = "package")]
+    pub packages: Option<Vec<Package>>,
+
+    #[serde(rename = "dependencies")]
+    pub root_dependencies: Option<Vec<Dependency>>,
+
+    #[serde(rename = "dev-dependencies")]
+    pub root_dev_dependencies: Option<Vec<Dependency>>,
+}
+
+#[derive(Deserialize)]
+pub struct Package {
+    /// The name of the package (corresponds to the name field from its source manifest).
+    pub name: String,
+
+    /// Where to find this dependency.  Schema is not described in terms of serde-compatible
+    /// structs, so it is deserialized into a generic data structure.
+    pub source: Value,
+
+    pub dependencies: Option<Vec<Dependency>>,
+    #[serde(rename = "dev-dependencies")]
+    pub dev_dependencies: Option<Vec<Dependency>>,
+}
+
+#[derive(Deserialize)]
+pub struct Dependency {
+    /// The name of the dependency (corresponds to the key for the dependency in the depending
+    /// package's source manifest).
+    pub name: String,
+
+    /// Mappings for named addresses to apply to the package being depended on, when referred to by
+    /// the depending package.
+    #[serde(rename = "addr_subst")]
+    pub subst: Option<Value>,
+
+    /// Expected hash for the source and manifest of the package being depended upon.
+    pub digest: Option<String>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Header {
+    pub version: u64,
+    /// A hash of the manifest file content this lock file was generated from computed using SHA-256
+    /// hashing algorithm.
+    pub manifest_digest: String,
+    /// A hash of all the dependencies (their lock file content) this lock file depends on, computed
+    /// by first hashing all lock files using SHA-256 hashing algorithm and then combining them into
+    /// a single digest using SHA-256 hasher (similarly to the package digest is computed). If there
+    /// are no dependencies, it's an empty string.
+    pub deps_digest: String,
+}
+
+#[derive(Serialize, Deserialize)]
+struct Schema<T> {
+    #[serde(rename = "move")]
+    move_: T,
+}
+
+impl Packages {
+    /// Read packages from the lock file, assuming the file's format matches the schema expected
+    /// by this lock file, and its version is not newer than the version supported by this library.
+    pub fn read(lock: &mut impl Read) -> Result<(Packages, Header)> {
+        let contents = {
+            let mut buf = String::new();
+            lock.read_to_string(&mut buf).context("Reading lock file")?;
+            buf
+        };
+        let Schema { move_: packages } =
+            toml::de::from_str::<Schema<Packages>>(&contents).context("Deserializing packages")?;
+
+        Ok((packages, read_header(&contents)?))
+    }
+}
+
+/// Read lock file header after verifying that the version of the lock is not newer than the version
+/// supported by this library.
+#[allow(clippy::ptr_arg)] // Allowed to avoid interface changes.
+pub fn read_header(contents: &String) -> Result<Header> {
+    let Schema { move_: header } =
+        toml::de::from_str::<Schema<Header>>(contents).context("Deserializing lock header")?;
+
+    if header.version > VERSION {
+        bail!(
+            "Lock file format is too new, expected version {} or below, found {}",
+            VERSION,
+            header.version
+        );
+    }
+
+    Ok(header)
+}
+
+/// Write the initial part of the lock file.
+pub(crate) fn write_prologue(
+    file: &mut NamedTempFile,
+    manifest_digest: String,
+    deps_digest: String,
+) -> Result<()> {
+    writeln!(
+        file,
+        "# @generated by Move, please check-in and do not edit manually.\n"
+    )?;
+
+    let prologue = toml::ser::to_string(&Schema {
+        move_: Header {
+            version: VERSION,
+            manifest_digest,
+            deps_digest,
+        },
+    })?;
+
+    write!(file, "{}", prologue)?;
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-package/src/package_hooks.rs b/vendors/move/crates/move-package/src/package_hooks.rs
new file mode 100644
index 000000000..9d6f33892
--- /dev/null
+++ b/vendors/move/crates/move-package/src/package_hooks.rs
@@ -0,0 +1,66 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::source_package::parsed_manifest::CustomDepInfo;
+use anyhow::bail;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use std::sync::Mutex;
+
+// TODO: remove static hooks and refactor this crate for better customizability
+
+/// A trait providing hooks to customize the package system for a particular Move application.
+/// An instance of the trait can be registered globally.
+pub trait PackageHooks {
+    /// Returns custom fields allowed in `PackageInfo`.
+    fn custom_package_info_fields(&self) -> Vec<String>;
+
+    /// Returns a custom key for dependencies, if available. This is the string used
+    /// in dependencies `{ <key> = value, address = addr }.
+    fn custom_dependency_key(&self) -> Option<String>;
+
+    /// A resolver for custom dependencies in the manifest. This is called to download the
+    /// dependency from the dependency into the `info.local_path` location, similar as with git
+    /// dependencies.
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()>;
+}
+static HOOKS: Lazy<Mutex<Option<Box<dyn PackageHooks + Send + Sync>>>> =
+    Lazy::new(|| Mutex::new(None));
+
+/// Registers package hooks for the process in which the package system is used.
+pub fn register_package_hooks(hooks: Box<dyn PackageHooks + Send + Sync>) {
+    *HOOKS.lock().unwrap() = Some(hooks)
+}
+
+/// Calls any registered hook to resolve a node dependency. Bails if none is registered.
+pub(crate) fn resolve_custom_dependency(
+    dep_name: Symbol,
+    info: &CustomDepInfo,
+) -> anyhow::Result<()> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.resolve_custom_dependency(dep_name, info)
+    } else {
+        bail!("use of unsupported custom dependency in package manifest")
+    }
+}
+
+pub(crate) fn custom_dependency_key() -> Option<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_dependency_key()
+    } else {
+        None
+    }
+}
+
+/// Calls any registered hook to return custom package fields.
+pub(crate) fn custom_package_info_fields() -> Vec<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_package_info_fields()
+    } else {
+        vec![]
+    }
+}
diff --git a/vendors/move/crates/move-package/src/package_lock.rs b/vendors/move/crates/move-package/src/package_lock.rs
new file mode 100644
index 000000000..8aa0f5d98
--- /dev/null
+++ b/vendors/move/crates/move-package/src/package_lock.rs
@@ -0,0 +1,38 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use named_lock::{NamedLock, NamedLockGuard};
+use once_cell::sync::Lazy;
+use std::sync::{Mutex, MutexGuard};
+use whoami::username;
+
+const PACKAGE_LOCK_NAME: &str = "move_pkg_lock";
+static PACKAGE_THREAD_MUTEX: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
+static PACKAGE_PROCESS_MUTEX: Lazy<NamedLock> = Lazy::new(|| {
+    let user_lock_file = format!("{}_{}", PACKAGE_LOCK_NAME, username());
+    NamedLock::create(user_lock_file.as_str()).unwrap()
+});
+
+/// The package lock is a lock held across threads and processes. This lock is held to ensure that
+/// the Move package manager has a consistent (read: serial) view of the file system. Without this
+/// lock we can easily get into race conditions around caching and overwriting of packages (e.g.,
+/// thread 1 and thread 2 compete to build package P in the same location), as well as downloading
+/// of git dependencies (thread 1 starts downloading git dependency, meanwhile thread 2 sees the
+/// git directory before it has been fully populated but assumes it has been fully downloaded and
+/// starts building the package before the git dependency has been fully downloaded by thread 1.
+/// This will then lead to file not found errors). These same issues could occur across processes,
+/// this is why we grab both a thread lock and process lock.
+pub(crate) struct PackageLock {
+    _thread_lock: MutexGuard<'static, ()>,
+    _process_lock: NamedLockGuard<'static>,
+}
+
+impl PackageLock {
+    pub(crate) fn lock() -> PackageLock {
+        Self {
+            _thread_lock: PACKAGE_THREAD_MUTEX.lock().unwrap(),
+            _process_lock: PACKAGE_PROCESS_MUTEX.lock().unwrap(),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-package/src/resolution/dependency_cache.rs b/vendors/move/crates/move-package/src/resolution/dependency_cache.rs
new file mode 100644
index 000000000..7d2886052
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/dependency_cache.rs
@@ -0,0 +1,223 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use colored::Colorize;
+use std::{
+    collections::BTreeSet,
+    ffi::OsStr,
+    io::Write,
+    path::PathBuf,
+    process::{Command, Stdio},
+};
+
+use crate::{
+    package_hooks,
+    source_package::parsed_manifest::{DependencyKind, GitInfo, PackageName},
+};
+
+use super::repository_path;
+
+/// Fetches remote dependencies and caches information about those already fetched when building a
+/// given package.
+#[derive(Debug, Clone)]
+pub struct DependencyCache {
+    /// A set of paths for remote dependencies that have already been fetched
+    fetched_deps: BTreeSet<PathBuf>,
+
+    /// Should a dependency fetched when building a different package be refreshed to the newest
+    /// version when building a new package
+    skip_fetch_latest_git_deps: bool,
+}
+
+impl DependencyCache {
+    pub fn new(skip_fetch_latest_git_deps: bool) -> DependencyCache {
+        let fetched_deps = BTreeSet::new();
+        DependencyCache {
+            fetched_deps,
+            skip_fetch_latest_git_deps,
+        }
+    }
+
+    pub fn download_and_update_if_remote<Progress: Write>(
+        &mut self,
+        dep_name: PackageName,
+        kind: &DependencyKind,
+        progress_output: &mut Progress,
+    ) -> Result<()> {
+        match kind {
+            DependencyKind::Local(_) => Ok(()),
+
+            DependencyKind::Custom(node_info) => {
+                // check if a give dependency type has already been fetched
+                if !self.fetched_deps.insert(repository_path(kind)) {
+                    return Ok(());
+                }
+                package_hooks::resolve_custom_dependency(dep_name, node_info)
+            }
+
+            DependencyKind::Git(GitInfo {
+                git_url,
+                git_rev,
+                subdir: _,
+            }) => {
+                let repository_path = repository_path(kind);
+                // check if a give dependency type has already been fetched
+                if !self.fetched_deps.insert(repository_path.clone()) {
+                    return Ok(());
+                }
+                let git_path = repository_path;
+                let os_git_url = OsStr::new(git_url.as_str());
+                let os_git_rev = OsStr::new(git_rev.as_str());
+
+                if !git_path.exists() {
+                    writeln!(
+                        progress_output,
+                        "{} {}",
+                        "FETCHING GIT DEPENDENCY".bold().green(),
+                        git_url,
+                    )?;
+                    // If the cached folder does not exist, download and clone accordingly
+                    Command::new("git")
+                        .args([OsStr::new("clone"), os_git_url, git_path.as_os_str()])
+                        .output()
+                        .map_err(|_| {
+                            anyhow::anyhow!(
+                                "Failed to clone Git repository for package '{}'",
+                                dep_name
+                            )
+                        })?;
+
+                    Command::new("git")
+                        .args([
+                            OsStr::new("-C"),
+                            git_path.as_os_str(),
+                            OsStr::new("checkout"),
+                            os_git_rev,
+                        ])
+                        .output()
+                        .map_err(|_| {
+                            anyhow::anyhow!(
+                                "Failed to checkout Git reference '{}' for package '{}'",
+                                git_rev,
+                                dep_name
+                            )
+                        })?;
+                } else if !self.skip_fetch_latest_git_deps {
+                    // Update the git dependency
+                    // Check first that it isn't a git rev (if it doesn't work, just continue with the
+                    // fetch)
+                    if let Ok(rev) = Command::new("git")
+                        .args([
+                            OsStr::new("-C"),
+                            git_path.as_os_str(),
+                            OsStr::new("rev-parse"),
+                            OsStr::new("--verify"),
+                            os_git_rev,
+                        ])
+                        .output()
+                    {
+                        if let Ok(parsable_version) = String::from_utf8(rev.stdout) {
+                            // If it's exactly the same, then it's a git rev
+                            if parsable_version.trim().starts_with(git_rev.as_str()) {
+                                return Ok(());
+                            }
+                        }
+                    }
+
+                    let tag = Command::new("git")
+                        .args([
+                            OsStr::new("-C"),
+                            git_path.as_os_str(),
+                            OsStr::new("tag"),
+                            OsStr::new("--list"),
+                            os_git_rev,
+                        ])
+                        .output();
+
+                    if let Ok(tag) = tag {
+                        if let Ok(parsable_version) = String::from_utf8(tag.stdout) {
+                            // If it's exactly the same, then it's a git tag, for now tags won't be updated
+                            // Tags don't easily update locally and you can't use reset --hard to cleanup
+                            // any extra files
+                            if parsable_version.trim().starts_with(git_rev.as_str()) {
+                                return Ok(());
+                            }
+                        }
+                    }
+
+                    writeln!(
+                        progress_output,
+                        "{} {}",
+                        "UPDATING GIT DEPENDENCY".bold().green(),
+                        git_url,
+                    )?;
+
+                    // If the current folder exists, do a fetch and reset to ensure that the branch
+                    // is up to date.
+                    //
+                    // NOTE: this means that you must run the package system with a working network
+                    // connection.
+                    let status = Command::new("git")
+                        .args([
+                            OsStr::new("-C"),
+                            git_path.as_os_str(),
+                            OsStr::new("fetch"),
+                            OsStr::new("origin"),
+                        ])
+                        .stdout(Stdio::null())
+                        .stderr(Stdio::null())
+                        .status()
+                        .map_err(|_| {
+                            anyhow::anyhow!(
+                                "Failed to fetch latest Git state for package '{}', to skip set \
+                             --skip-fetch-latest-git-deps",
+                                dep_name
+                            )
+                        })?;
+
+                    if !status.success() {
+                        return Err(anyhow::anyhow!(
+                            "Failed to fetch to latest Git state for package '{}', to skip set \
+                         --skip-fetch-latest-git-deps | Exit status: {}",
+                            dep_name,
+                            status
+                        ));
+                    }
+
+                    let status = Command::new("git")
+                        .args([
+                            OsStr::new("-C"),
+                            git_path.as_os_str(),
+                            OsStr::new("reset"),
+                            OsStr::new("--hard"),
+                            OsStr::new(&format!("origin/{}", git_rev)),
+                        ])
+                        .stdout(Stdio::null())
+                        .stderr(Stdio::null())
+                        .status()
+                        .map_err(|_| {
+                            anyhow::anyhow!(
+                            "Failed to reset to latest Git state '{}' for package '{}', to skip \
+                             set --skip-fetch-latest-git-deps",
+                            git_rev,
+                            dep_name
+                        )
+                        })?;
+
+                    if !status.success() {
+                        return Err(anyhow::anyhow!(
+                        "Failed to reset to latest Git state '{}' for package '{}', to skip set \
+                         --skip-fetch-latest-git-deps | Exit status: {}",
+                        git_rev,
+                        dep_name,
+                        status
+                    ));
+                    }
+                }
+
+                Ok(())
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-package/src/resolution/dependency_graph.rs b/vendors/move/crates/move-package/src/resolution/dependency_graph.rs
new file mode 100644
index 000000000..3ed706038
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/dependency_graph.rs
@@ -0,0 +1,1595 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Context, Result};
+use colored::Colorize;
+use move_symbol_pool::Symbol;
+use petgraph::{algo, prelude::DiGraphMap, Direction};
+use std::{
+    collections::{btree_map::Entry, BTreeMap, BTreeSet, VecDeque},
+    fmt,
+    io::{BufWriter, Read, Write},
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+use crate::{
+    lock_file::{schema, LockFile},
+    package_hooks,
+    source_package::{
+        layout::SourcePackageLayout,
+        manifest_parser::{
+            parse_dependency, parse_move_manifest_string, parse_source_manifest, parse_substitution,
+        },
+        parsed_manifest as PM,
+    },
+};
+
+use super::{
+    dependency_cache::DependencyCache,
+    digest::{digest_str, hashed_files_digest},
+    local_path,
+};
+
+/// A representation of the transitive dependency graph of a Move package.  If successfully created,
+/// the resulting graph:
+///
+/// - is directed, acyclic and `BuildConfig` agnostic,
+/// - mentions each package at most once (i.e. no duplicate packages), and
+/// - contains information about the source of every package (excluding the root package).
+///
+/// It can be built by recursively exploring a package's dependencies, fetching their sources if
+/// necessary, or by reading its serialized contents from a lock file (provided either alongside its
+/// manifest file in storage or by the external resolver).  Both these processes will fail if any of
+/// the criteria above cannot be met (e.g. if the graph contains a cycle, or information about a
+/// package's source is not available). The same package can be fetched from multiple sources as
+/// long as both fetches produce a matching output.
+///
+/// In order to be `BuildConfig` agnostic, it contains `dev-dependencies` as well as `dependencies`
+/// and labels edges in the graph accordingly, as `DevOnly`, or `Always` dependencies.
+///
+/// When building a dependency graph, different versions of the same (transitively) dependent
+/// package can be encountered. If this is indeed the case, a single version must be chosen by the
+/// developer to be the override, and this override must be specified in a manifest file whose
+/// package dominates all the conflicting "uses" of the dependent package. These overrides are taken
+/// into consideration during the dependency graph construction - sub-graphs being combined into the
+/// main graph are pruned based on the information about overrides (a package in a graph is pruned
+/// if its dominated by another overridden package).
+///
+/// If an up-to-date lock file for the dependency graph being constructed is not available, the
+/// graph construction proceeds bottom-up, by either reading sub-graphs from their respective lock
+/// files (if they are up-to-date) or by constructing sub-graphs by exploring all their (direct and
+/// indirect) dependencies specified in manifest files. These sub-graphs are then successively
+/// merged into larger graphs until the main combined graph is computed.
+#[derive(Debug, Clone)]
+pub struct DependencyGraph {
+    /// Path to the root package and its name (according to its manifest)
+    pub root_path: PathBuf,
+    pub root_package: PM::PackageName,
+
+    /// Transitive dependency graph, with dependency edges `P -> Q` labelled according to whether Q
+    /// is always a dependency of P or only in dev-mode.
+    pub package_graph: DiGraphMap<PM::PackageName, Dependency>,
+
+    /// The dependency that each package (keyed by name) originates from.  The root package is the
+    /// only node in `package_graph` that does not have an entry in `package_table`.
+    pub package_table: BTreeMap<PM::PackageName, Package>,
+
+    /// Packages that are transitive dependencies regardless of mode (the transitive closure of
+    /// `DependencyMode::Always` edges in `package_graph`).
+    pub always_deps: BTreeSet<PM::PackageName>,
+
+    /// A hash of the manifest file content this lock file was generated from.
+    pub manifest_digest: String,
+    /// A hash of all the dependencies (their lock file content) this lock file depends on.
+    pub deps_digest: String,
+}
+
+/// A helper to store additional information about a dependency graph
+#[derive(Debug, Clone)]
+pub struct DependencyGraphInfo {
+    /// The dependency graph itself.
+    pub g: DependencyGraph,
+    /// A mode of the dependency that the dependency graph represents.
+    pub mode: DependencyMode,
+    /// Is the dependency this graph represents an override?
+    pub is_override: bool,
+    /// Is the dependency graph externally resolved?
+    pub is_external: bool,
+}
+
+impl DependencyGraphInfo {
+    pub fn new(
+        g: DependencyGraph,
+        mode: DependencyMode,
+        is_override: bool,
+        is_external: bool,
+    ) -> Self {
+        Self {
+            g,
+            mode,
+            is_override,
+            is_external,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Eq, Ord, PartialOrd)]
+pub struct Package {
+    pub kind: PM::DependencyKind,
+    pub version: Option<PM::Version>,
+    /// Optional field set if the package was externally resolved.
+    resolver: Option<Symbol>,
+}
+
+impl PartialEq for Package {
+    fn eq(&self, other: &Self) -> bool {
+        // comparison omit the type of resolver (as it would actually lead to incorrect result when
+        // comparing packages during insertion of externally resolved ones - an internally resolved
+        // existing package in the graph would not be recognized as a potential different version of
+        // the externally resolved one)
+        self.kind == other.kind && self.version == other.version
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Dependency {
+    pub mode: DependencyMode,
+    pub subst: Option<PM::Substitution>,
+    pub digest: Option<PM::PackageDigest>,
+    pub dep_override: PM::DepOverride,
+}
+
+/// Indicates whether one package always depends on another, or only in dev-mode.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum DependencyMode {
+    Always,
+    DevOnly,
+}
+
+/// Wrapper struct to display a package as an inline table in the lock file (matching the
+/// convention in the source manifest).  This is necessary becase the `toml` crate does not
+/// currently support serializing types as inline tables.
+struct PackageTOML<'a>(&'a Package);
+struct PackageWithResolverTOML<'a>(&'a Package);
+struct DependencyTOML<'a>(PM::PackageName, &'a Dependency);
+struct SubstTOML<'a>(&'a PM::Substitution);
+
+/// A builder for `DependencyGraph`
+pub struct DependencyGraphBuilder<Progress: Write> {
+    /// Used to avoid re-fetching dependencies that are already present locally
+    pub dependency_cache: DependencyCache,
+    /// Logger
+    pub progress_output: Progress,
+    /// A chain of visited dependencies used for cycle detection
+    visited_dependencies: VecDeque<(PM::PackageName, PM::InternalDependency)>,
+    /// Installation directory for compiled artifacts (from BuildConfig).
+    install_dir: PathBuf,
+}
+
+impl<Progress: Write> DependencyGraphBuilder<Progress> {
+    pub fn new(
+        skip_fetch_latest_git_deps: bool,
+        progress_output: Progress,
+        install_dir: PathBuf,
+    ) -> Self {
+        DependencyGraphBuilder {
+            dependency_cache: DependencyCache::new(skip_fetch_latest_git_deps),
+            progress_output,
+            visited_dependencies: VecDeque::new(),
+            install_dir,
+        }
+    }
+
+    /// Get a new graph by either reading it from Move.lock file (if this file is up-to-date, in
+    /// which case also return false) or by computing a new graph based on the content of the
+    /// Move.toml (manifest) file (in which case also return true).
+    pub fn get_graph(
+        &mut self,
+        parent: &PM::DependencyKind,
+        root_path: PathBuf,
+        manifest_string: String,
+        lock_string_opt: Option<String>,
+    ) -> Result<(DependencyGraph, bool)> {
+        let toml_manifest = parse_move_manifest_string(manifest_string.clone())?;
+        let root_manifest = parse_source_manifest(toml_manifest)?;
+
+        // compute digests eagerly as even if we can't reuse existing lock file, they need to become
+        // part of the newly computed dependency graph
+        let new_manifest_digest = digest_str(manifest_string.into_bytes().as_slice());
+        let (old_manifest_digest_opt, old_deps_digest_opt, lock_string) = match lock_string_opt {
+            Some(lock_string) => match schema::read_header(&lock_string) {
+                Ok(header) => (
+                    Some(header.manifest_digest),
+                    Some(header.deps_digest),
+                    Some(lock_string),
+                ),
+                Err(_) => (None, None, None), // malformed header - regenerate lock file
+            },
+            None => (None, None, None),
+        };
+
+        // collect sub-graphs for "regular" and "dev" dependencies
+        let mut dep_graphs = self.collect_graphs(
+            parent,
+            root_manifest.package.name,
+            root_path.clone(),
+            DependencyMode::Always,
+            &root_manifest.dependencies,
+        )?;
+        let dep_lock_files = dep_graphs
+            .values()
+            .map(|graph_info| graph_info.g.write_to_lock(self.install_dir.clone()))
+            .collect::<Result<Vec<LockFile>>>()?;
+        let dev_dep_graphs = self.collect_graphs(
+            parent,
+            root_manifest.package.name,
+            root_path.clone(),
+            DependencyMode::DevOnly,
+            &root_manifest.dev_dependencies,
+        )?;
+
+        let dev_dep_lock_files = dev_dep_graphs
+            .values()
+            .map(|graph_info| graph_info.g.write_to_lock(self.install_dir.clone()))
+            .collect::<Result<Vec<LockFile>>>()?;
+        let new_deps_digest = self.dependency_digest(dep_lock_files, dev_dep_lock_files)?;
+        let (manifest_digest, deps_digest) =
+            match (old_manifest_digest_opt, old_deps_digest_opt, lock_string) {
+                (Some(old_manifest_digest), Some(old_deps_digest), Some(lock_string))
+                    if old_manifest_digest == new_manifest_digest
+                        && old_deps_digest == new_deps_digest =>
+                {
+                    return Ok((
+                        DependencyGraph::read_from_lock(
+                            root_path,
+                            root_manifest.package.name,
+                            &mut lock_string.as_bytes(), // safe since old_deps_digest exists
+                            None,
+                        )?,
+                        false,
+                    ));
+                }
+                _ => (new_manifest_digest, new_deps_digest),
+            };
+
+        dep_graphs.extend(dev_dep_graphs);
+
+        let mut combined_graph = DependencyGraph {
+            root_path,
+            root_package: root_manifest.package.name,
+            package_graph: DiGraphMap::new(),
+            package_table: BTreeMap::new(),
+            always_deps: BTreeSet::new(),
+            manifest_digest,
+            deps_digest,
+        };
+        // ensure there's always a root node, even if it has no edges
+        combined_graph
+            .package_graph
+            .add_node(combined_graph.root_package);
+
+        // get overrides
+        let mut overrides = collect_overrides(parent, &root_manifest.dependencies)?;
+        let dev_overrides = collect_overrides(parent, &root_manifest.dev_dependencies)?;
+
+        for (
+            dep_name,
+            DependencyGraphInfo {
+                g,
+                mode,
+                is_override,
+                is_external: _,
+            },
+        ) in dep_graphs.iter_mut()
+        {
+            g.prune_subgraph(
+                root_manifest.package.name,
+                *dep_name,
+                *is_override,
+                *mode,
+                &overrides,
+                &dev_overrides,
+            )?;
+        }
+
+        let mut all_deps = root_manifest.dependencies.clone();
+        all_deps.extend(root_manifest.dev_dependencies.clone());
+
+        // we can mash overrides together as the sets cannot overlap (it's asserted during pruning)
+        overrides.extend(dev_overrides);
+
+        combined_graph.merge(dep_graphs, parent, &all_deps, &overrides)?;
+
+        combined_graph.check_acyclic()?;
+        combined_graph.discover_always_deps();
+
+        Ok((combined_graph, true))
+    }
+
+    /// Given all dependencies from the parent manifest file, collects all the sub-graphs
+    /// representing these dependencies (both internally and externally resolved).
+    fn collect_graphs(
+        &mut self,
+        parent: &PM::DependencyKind,
+        parent_pkg: PM::PackageName,
+        root_path: PathBuf,
+        mode: DependencyMode,
+        dependencies: &PM::Dependencies,
+    ) -> Result<BTreeMap<PM::PackageName, DependencyGraphInfo>> {
+        let mut dep_graphs = BTreeMap::new();
+        for (dep_pkg_name, dep) in dependencies {
+            let (pkg_graph, is_override, is_external) = self
+                .new_for_dep(
+                    parent,
+                    dep,
+                    mode,
+                    parent_pkg,
+                    *dep_pkg_name,
+                    root_path.clone(),
+                )
+                .with_context(|| {
+                    format!(
+                        "Failed to resolve dependencies for package '{}'",
+                        parent_pkg
+                    )
+                })?;
+            dep_graphs.insert(
+                *dep_pkg_name,
+                DependencyGraphInfo::new(pkg_graph, mode, is_override, is_external),
+            );
+        }
+        Ok(dep_graphs)
+    }
+
+    /// Given a dependency in the parent's manifest file, creates a sub-graph for this dependency.
+    fn new_for_dep(
+        &mut self,
+        parent: &PM::DependencyKind,
+        dep: &PM::Dependency,
+        mode: DependencyMode,
+        parent_pkg: PM::PackageName,
+        dep_pkg_name: PM::PackageName,
+        dep_pkg_path: PathBuf,
+    ) -> Result<(DependencyGraph, bool, bool)> {
+        let (pkg_graph, is_override, is_external) = match dep {
+            PM::Dependency::Internal(d) => {
+                check_for_dep_cycles(d.clone(), dep_pkg_name, &mut self.visited_dependencies)?;
+                self.dependency_cache
+                    .download_and_update_if_remote(dep_pkg_name, &d.kind, &mut self.progress_output)
+                    .with_context(|| format!("Fetching '{}'", dep_pkg_name))?;
+                let pkg_path = dep_pkg_path.join(local_path(&d.kind));
+                let manifest_string =
+                    std::fs::read_to_string(pkg_path.join(SourcePackageLayout::Manifest.path()))
+                        .with_context(|| format!("Parsing manifest for '{}'", dep_pkg_name))?;
+                let lock_string =
+                    std::fs::read_to_string(pkg_path.join(SourcePackageLayout::Lock.path())).ok();
+                // save dependency for cycle detection
+                self.visited_dependencies
+                    .push_front((dep_pkg_name, d.clone()));
+                let (mut pkg_graph, modified) =
+                    self.get_graph(&d.kind, pkg_path, manifest_string, lock_string)?;
+                self.visited_dependencies.pop_front();
+                // reroot all packages to normalize local paths across all graphs
+                for (_, p) in pkg_graph.package_table.iter_mut() {
+                    if modified {
+                        // new sub-graph has been constructed whose paths are already re-rooted with
+                        // respect to its immediate parent
+                        p.kind.reroot(parent)?;
+                    } else {
+                        // a graph has been read from the lock file and its immediate parent is
+                        // specified in the dependency pointing to this sub-graph which must be used
+                        // for re-rooting
+                        p.kind.reroot(&d.kind)?;
+                    }
+                }
+                (pkg_graph, d.dep_override, false)
+            }
+            PM::Dependency::External(resolver) => {
+                let pkg_graph = DependencyGraph::get_external(
+                    mode,
+                    parent_pkg,
+                    dep_pkg_name,
+                    *resolver,
+                    &dep_pkg_path,
+                    &mut self.progress_output,
+                )?;
+                (pkg_graph, false, true)
+            }
+        };
+        Ok((pkg_graph, is_override, is_external))
+    }
+
+    /// Computes dependency hashes.
+    fn dependency_hashes(&mut self, lock_files: Vec<LockFile>) -> Result<Vec<String>> {
+        let mut hashed_lock_files = Vec::new();
+        for mut lock_file in lock_files {
+            let mut lock_string: String = "".to_string();
+            lock_file.read_to_string(&mut lock_string)?;
+            hashed_lock_files.push(digest_str(lock_string.as_bytes()));
+        }
+        Ok(hashed_lock_files)
+    }
+
+    /// Computes a digest of all dependencies in a manifest file (or digest of empty list if there
+    /// are no dependencies).
+    fn dependency_digest(
+        &mut self,
+        dep_lock_files: Vec<LockFile>,
+        dev_dep_lock_files: Vec<LockFile>,
+    ) -> Result<String> {
+        let mut dep_hashes = self.dependency_hashes(dep_lock_files)?;
+
+        let dev_dep_hashes = self.dependency_hashes(dev_dep_lock_files)?;
+
+        if dep_hashes.is_empty() && dev_dep_hashes.is_empty() {
+            Ok(digest_str(&[]))
+        } else {
+            dep_hashes.extend(dev_dep_hashes);
+            Ok(hashed_files_digest(dep_hashes))
+        }
+    }
+}
+
+impl DependencyGraph {
+    /// Main driver from sub-graph pruning based on information about overrides.
+    fn prune_subgraph(
+        &mut self,
+        root_package: PM::PackageName,
+        dep_name: PM::PackageName,
+        is_override: bool,
+        mode: DependencyMode,
+        overrides: &BTreeMap<PM::PackageName, Package>,
+        dev_overrides: &BTreeMap<PM::PackageName, Package>,
+    ) -> Result<()> {
+        if is_override {
+            // when pruning an overridden dependency, we must not prune the package actually
+            // specified by this dependency so we remove it from the set of overrides (see the
+            // diamond_problem_dual_override test for an example of what should be pruned and what
+            // should not)
+            let mut o = overrides.clone();
+            let mut dev_o = dev_overrides.clone();
+            DependencyGraph::remove_dep_override(
+                root_package,
+                dep_name,
+                &mut o,
+                &mut dev_o,
+                mode == DependencyMode::DevOnly,
+            )?;
+            self.prune_overriden_pkgs(root_package, mode, &o, &dev_o)?;
+        } else {
+            self.prune_overriden_pkgs(root_package, mode, overrides, dev_overrides)?;
+        }
+        Ok(())
+    }
+
+    /// Finds packages in a sub-graph that should be pruned as a result of applying an override from
+    /// the outer graph. A package should be pruned if it's dominated by an overridden package.
+    fn find_pruned_pkgs(
+        &self,
+        pruned_pkgs: &mut BTreeSet<PM::PackageName>,
+        reachable_pkgs: &mut BTreeSet<PM::PackageName>,
+        root_pkg_name: PM::PackageName,
+        from_pkg_name: PM::PackageName,
+        mode: DependencyMode,
+        overrides: &BTreeMap<PM::PackageName, Package>,
+        dev_overrides: &BTreeMap<PM::PackageName, Package>,
+        overridden_path: bool,
+    ) -> Result<()> {
+        if overridden_path {
+            // we are on a path originating at the overridden package
+            if !reachable_pkgs.contains(&from_pkg_name) {
+                // not (yet) reached via regular (non-overridden) path
+                pruned_pkgs.insert(from_pkg_name);
+            }
+        }
+        let mut override_found = overridden_path;
+
+        if !override_found {
+            override_found = DependencyGraph::get_dep_override(
+                root_pkg_name,
+                from_pkg_name,
+                overrides,
+                dev_overrides,
+                mode == DependencyMode::DevOnly,
+            )?
+            .is_some();
+
+            if override_found {
+                // we also prune overridden package - we can do this safely as the outgoing edges
+                // from other package graph nodes to the overridden package will be preserved (see
+                // the nested_pruned_override test for additional explanation how nodes are removed
+                // from the package graph)
+                pruned_pkgs.insert(from_pkg_name);
+            } else {
+                // we are on a regular path, not involving an override (overridden_path == false)
+                // and we did not find an override
+                reachable_pkgs.insert(from_pkg_name);
+            }
+        }
+
+        for to_pkg_name in self
+            .package_graph
+            .neighbors_directed(from_pkg_name, Direction::Outgoing)
+        {
+            self.find_pruned_pkgs(
+                pruned_pkgs,
+                reachable_pkgs,
+                root_pkg_name,
+                to_pkg_name,
+                mode,
+                overrides,
+                dev_overrides,
+                override_found,
+            )?;
+        }
+        Ok(())
+    }
+
+    /// Prunes packages in a sub-graph based on the overrides information from the outer graph.
+    fn prune_overriden_pkgs(
+        &mut self,
+        root_pkg_name: PM::PackageName,
+        mode: DependencyMode,
+        overrides: &BTreeMap<PM::PackageName, Package>,
+        dev_overrides: &BTreeMap<PM::PackageName, Package>,
+    ) -> Result<()> {
+        let from_pkg_name = self.root_package;
+        let mut pruned_pkgs = BTreeSet::new();
+        let mut reachable_pkgs = BTreeSet::new();
+        self.find_pruned_pkgs(
+            &mut pruned_pkgs,
+            &mut reachable_pkgs,
+            root_pkg_name,
+            from_pkg_name,
+            mode,
+            overrides,
+            dev_overrides,
+            false,
+        )?;
+
+        // if there was a package candidate for pruning, it should be removed from the list if it
+        // can be reached via a regular path
+        pruned_pkgs.retain(|p| !reachable_pkgs.contains(p));
+        for pkg in pruned_pkgs {
+            self.package_graph.remove_node(pkg);
+            self.package_table.remove(&pkg);
+        }
+
+        Ok(())
+    }
+
+    /// Given all sub-graphs representing dependencies of the parent manifest file, combines all
+    /// subgraphs to form the parent dependency graph.
+    pub fn merge(
+        &mut self,
+        mut dep_graphs: BTreeMap<PM::PackageName, DependencyGraphInfo>,
+        parent: &PM::DependencyKind,
+        dependencies: &PM::Dependencies,
+        overrides: &BTreeMap<PM::PackageName, Package>,
+    ) -> Result<()> {
+        if !self.always_deps.is_empty() {
+            bail!("Merging dependencies into a graph after calculating its 'always' dependencies");
+        }
+
+        // insert direct dependency edges and (if necessary) packages for the remaining graph nodes
+        // (not present in package table)
+        for (dep_name, graph_info) in &dep_graphs {
+            let Some(dep) = dependencies.get(dep_name) else {
+                bail!(
+                    "Can't merge dependencies for '{}' because nothing depends on it",
+                    dep_name
+                );
+            };
+
+            let internally_resolved =
+                self.insert_direct_dep(dep, *dep_name, &graph_info.g, graph_info.mode, parent)?;
+
+            if internally_resolved {
+                // insert edges from the directly dependent package to its neighbors for
+                // internally resolved sub-graphs - due to how external graphs are constructed,
+                // edges between directly dependent packages and their neighbors are already in
+                // the sub-graph and would have been inserted in the first loop in this function
+                for (_, to_pkg_name, sub_dep) in graph_info.g.package_graph.edges(*dep_name) {
+                    self.package_graph
+                        .add_edge(*dep_name, to_pkg_name, sub_dep.clone());
+                }
+            }
+        }
+
+        // collect all package names in all graphs in package table
+        let mut all_packages: BTreeSet<PM::PackageName> =
+            BTreeSet::from_iter(self.package_table.keys().cloned());
+        for graph_info in dep_graphs.values() {
+            all_packages.extend(graph_info.g.package_table.keys());
+        }
+
+        dep_graphs.insert(
+            self.root_package,
+            DependencyGraphInfo::new(self.clone(), DependencyMode::Always, false, false),
+        );
+
+        // analyze all packages to determine if any of these packages represent a conflicting
+        // dependency; insert the packages and their respective edges into the combined graph along
+        // the way
+        for pkg_name in all_packages {
+            let mut existing_pkg_info: Option<(&DependencyGraph, &Package, bool)> = None;
+            for graph_info in dep_graphs.values() {
+                let Some(pkg) = graph_info.g.package_table.get(&pkg_name) else {
+                    continue;
+                };
+                // graph g has a package with name pkg_name
+                let Some((existing_graph, existing_pkg, existing_is_external)) = existing_pkg_info
+                else {
+                    // first time this package was encountered
+                    existing_pkg_info = Some((&graph_info.g, pkg, graph_info.is_external));
+                    continue;
+                };
+                // it's the subsequent time package with pkg_name has been encountered
+                if pkg != existing_pkg {
+                    bail!(
+                        "When resolving dependencies for package {0}, conflicting versions \
+                         of package {1} found:\nAt {4}\n\t{1} = {2}\nAt {5}\n\t{1} = {3}",
+                        self.root_package,
+                        pkg_name,
+                        PackageWithResolverTOML(existing_pkg),
+                        PackageWithResolverTOML(pkg),
+                        dep_path_from_root(
+                            self.root_package,
+                            existing_graph,
+                            pkg_name,
+                            existing_is_external
+                        )?,
+                        dep_path_from_root(
+                            self.root_package,
+                            &graph_info.g,
+                            pkg_name,
+                            graph_info.is_external
+                        )?
+                    );
+                }
+
+                // both packages are the same but we need to check if their dependencies
+                // are the same as well
+                match deps_equal(
+                    pkg_name,
+                    existing_graph,
+                    self.pkg_table_for_deps_compare(
+                        pkg_name,
+                        existing_graph,
+                        &dep_graphs,
+                        existing_is_external,
+                    ),
+                    &graph_info.g,
+                    self.pkg_table_for_deps_compare(
+                        pkg_name,
+                        &graph_info.g,
+                        &dep_graphs,
+                        graph_info.is_external,
+                    ),
+                    overrides,
+                ) {
+                    Ok(_) => continue,
+                    Err((existing_pkg_deps, pkg_deps)) => {
+                        bail!(
+                            "When resolving dependencies for package {}, \
+                             conflicting dependencies found:{}{}",
+                            self.root_package,
+                            format_deps(
+                                dep_path_from_root(
+                                    self.root_package,
+                                    existing_graph,
+                                    pkg_name,
+                                    existing_is_external
+                                )?,
+                                existing_pkg_deps
+                            ),
+                            format_deps(
+                                dep_path_from_root(
+                                    self.root_package,
+                                    &graph_info.g,
+                                    pkg_name,
+                                    graph_info.is_external,
+                                )?,
+                                pkg_deps,
+                            ),
+                        )
+                    }
+                }
+            }
+            if let Some((g, existing_pkg, _)) = existing_pkg_info {
+                // update combined graph with the new package and its dependencies
+                self.package_table.insert(pkg_name, existing_pkg.clone());
+                for (_, to_pkg_name, sub_dep) in g.package_graph.edges(pkg_name) {
+                    self.package_graph
+                        .add_edge(pkg_name, to_pkg_name, sub_dep.clone());
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// The merge algorithm relies on the combined graph to be pre-populated with direct
+    /// dependencies for internally resolved packages (in terms of both entries in the package table
+    /// and nodes/edges in the package graph). This means that if a conflict is detected between
+    /// pre-populated combined graph and one of the sub-graphs, the pre-populated graph does not
+    /// (yet) contains target packages for edges outgoing from direct dependencies, and these are
+    /// needed to verify that direct dependencies are the same. Fortunately, these packages are
+    /// available in a package tables of a respective (dependent) subgraph. This function return the
+    /// right package table, depending on whether conflict was detected between pre-populated
+    /// combined graph and another sub-graph or between two separate sub-graphs. If we tried to use
+    /// combined graphs's package table "as is" we would get an error in all cases similar to the one
+    /// in the direct_and_indirect_dep test where A is a direct dependency of Root (as C would be
+    /// missing from the combined graph's table):
+    ///
+    ///                 +----+
+    ///           +---->| B  |----+
+    ///           |     +----+    |
+    ///           |               |
+    /// +----+    |               +-->+----+     +----+
+    /// |Root|----+------------------>| A  |---->| C  |
+    /// +----+                        +----+     +----+
+    ///
+    fn pkg_table_for_deps_compare<'a>(
+        &self,
+        dep_name: Symbol,
+        g: &'a DependencyGraph,
+        dep_graphs: &'a BTreeMap<PM::PackageName, DependencyGraphInfo>,
+        external: bool,
+    ) -> &'a BTreeMap<PM::PackageName, Package> {
+        if !external && g.root_package == self.root_package {
+            // unwrap is safe since dep_graphs are actually built using information about
+            // dependencies (including their name, represented here by dep_name) from the root
+            // package
+            let g_with_nodes = &dep_graphs.get(&dep_name).unwrap().g;
+            &g_with_nodes.package_table
+        } else {
+            &g.package_table
+        }
+    }
+
+    /// Inserts a single direct dependency with given (package) name representing a sub-graph into
+    /// the combined graph. Returns true if the dependency was internally resolved and false if it
+    /// was externally resolved.
+    fn insert_direct_dep(
+        &mut self,
+        dep: &PM::Dependency,
+        dep_pkg_name: PM::PackageName,
+        sub_graph: &DependencyGraph,
+        mode: DependencyMode,
+        parent: &PM::DependencyKind,
+    ) -> Result<bool> {
+        match dep {
+            PM::Dependency::Internal(PM::InternalDependency {
+                kind,
+                version,
+                subst,
+                digest,
+                dep_override,
+            }) => {
+                if let Entry::Vacant(entry) = self.package_table.entry(dep_pkg_name) {
+                    let mut pkg = Package {
+                        kind: kind.clone(),
+                        version: *version,
+                        resolver: None,
+                    };
+                    pkg.kind.reroot(parent)?;
+                    entry.insert(pkg);
+                }
+                self.package_graph.add_edge(
+                    self.root_package,
+                    dep_pkg_name,
+                    Dependency {
+                        mode,
+                        subst: subst.clone(),
+                        digest: *digest,
+                        dep_override: *dep_override,
+                    },
+                );
+                Ok(true)
+            }
+            PM::Dependency::External(_) => {
+                // the way that external graphs are constructed, edges between the (root) package of
+                // the outer graph and dependencies in the sub-graph are already present in the
+                // sub-graph
+                let d = sub_graph
+                    .package_graph
+                    .edge_weight(self.root_package, dep_pkg_name)
+                    .unwrap();
+                self.package_graph
+                    .add_edge(self.root_package, dep_pkg_name, d.clone());
+                Ok(false)
+            }
+        }
+    }
+
+    /// Helper function to get overrides for "regular" dependencies (`dev_only` is false) or "dev"
+    /// dependencies (`dev_only` is true).
+    fn get_dep_override<'a>(
+        root_pkg_name: PM::PackageName,
+        pkg_name: PM::PackageName,
+        overrides: &'a BTreeMap<Symbol, Package>,
+        dev_overrides: &'a BTreeMap<Symbol, Package>,
+        dev_only: bool,
+    ) -> Result<Option<&'a Package>> {
+        // for "regular" dependencies override can come only from "regular" dependencies section,
+        // but for "dev" dependencies override can come from "regular" or "dev" dependencies section
+        if let Some(pkg) = overrides.get(&pkg_name) {
+            // "regular" dependencies section case
+            if let Some(dev_pkg) = dev_overrides.get(&pkg_name) {
+                bail!(
+                    "Conflicting \"regular\" and \"dev\" overrides found in {0}:\n{1} = {2}\n{1} = {3}",
+                    root_pkg_name,
+                    pkg_name,
+                    PackageWithResolverTOML(pkg),
+                    PackageWithResolverTOML(dev_pkg),
+                );
+            }
+            return Ok(Some(pkg));
+        } else if let Some(dev_pkg) = dev_overrides.get(&pkg_name) {
+            // "dev" dependencies section case
+            return Ok(dev_only.then_some(dev_pkg));
+        }
+        Ok(None)
+    }
+
+    /// Helper function to remove an override for a package with a given name for "regular"
+    /// dependencies (`dev_only` is false) or "dev" dependencies (`dev_only` is true).
+    fn remove_dep_override(
+        root_pkg_name: PM::PackageName,
+        pkg_name: PM::PackageName,
+        overrides: &mut BTreeMap<Symbol, Package>,
+        dev_overrides: &mut BTreeMap<Symbol, Package>,
+        dev_only: bool,
+    ) -> Result<()> {
+        // for "regular" dependencies override can come only from "regular" dependencies section,
+        // but for "dev" dependencies override can come from "regular" or "dev" dependencies section
+        if let Some(pkg) = overrides.remove(&pkg_name) {
+            // "regular" dependencies section case
+            if let Some(dev_pkg) = dev_overrides.get(&pkg_name) {
+                bail!(
+                    "Conflicting \"regular\" and \"dev\" overrides found in {0}:\n{1} = {2}\n{1} = {3}",
+                    root_pkg_name,
+                    pkg_name,
+                    PackageWithResolverTOML(&pkg),
+                    PackageWithResolverTOML(dev_pkg),
+                );
+            }
+        } else if dev_only {
+            // "dev" dependencies section case
+            dev_overrides.remove(&pkg_name);
+        }
+        Ok(())
+    }
+
+    /// Creates a dependency graph by reading a lock file.
+    ///
+    /// The lock file is expected to contain a complete picture of the package's transitive
+    /// dependency graph, which means it is not required to discover it through a recursive
+    /// traversal.
+    ///
+    /// Expects the lock file to conform to the schema expected by this version of the compiler (in
+    /// the `lock_file::schema` module).
+    pub fn read_from_lock(
+        root_path: PathBuf,
+        root_package: PM::PackageName,
+        lock: &mut impl Read,
+        resolver: Option<Symbol>,
+    ) -> Result<DependencyGraph> {
+        let mut package_graph = DiGraphMap::new();
+        let mut package_table = BTreeMap::new();
+
+        let (
+            packages,
+            schema::Header {
+                version: _,
+                manifest_digest,
+                deps_digest,
+            },
+        ) = schema::Packages::read(lock)?;
+
+        // Ensure there's always a root node, even if it has no edges.
+        package_graph.add_node(root_package);
+
+        for schema::Dependency {
+            name,
+            subst,
+            digest,
+        } in packages.root_dependencies.into_iter().flatten()
+        {
+            package_graph.add_edge(
+                root_package,
+                Symbol::from(name),
+                Dependency {
+                    mode: DependencyMode::Always,
+                    subst: subst.map(parse_substitution).transpose()?,
+                    digest: digest.map(Symbol::from),
+                    dep_override: false,
+                },
+            );
+        }
+
+        for schema::Dependency {
+            name,
+            subst,
+            digest,
+        } in packages.root_dev_dependencies.into_iter().flatten()
+        {
+            package_graph.add_edge(
+                root_package,
+                Symbol::from(name),
+                Dependency {
+                    mode: DependencyMode::DevOnly,
+                    subst: subst.map(parse_substitution).transpose()?,
+                    digest: digest.map(Symbol::from),
+                    dep_override: false,
+                },
+            );
+        }
+
+        // Fill in the remaining dependencies, and the package source information from the lock
+        // file.
+        for schema::Package {
+            name: pkg_name,
+            source,
+            dependencies,
+            dev_dependencies,
+        } in packages.packages.into_iter().flatten()
+        {
+            let pkg_name = PM::PackageName::from(pkg_name.as_str());
+            let source = parse_dependency(pkg_name.as_str(), source)
+                .with_context(|| format!("Deserializing dependency '{pkg_name}'"))?;
+
+            let source = match source {
+                PM::Dependency::Internal(source) => source,
+                PM::Dependency::External(resolver) => {
+                    bail!("Unexpected dependency '{pkg_name}' resolved externally by '{resolver}'");
+                }
+            };
+
+            if source.subst.is_some() {
+                bail!("Unexpected 'addr_subst' in source for '{pkg_name}'")
+            }
+
+            if source.digest.is_some() {
+                bail!("Unexpected 'digest' in source for '{pkg_name}'")
+            }
+
+            let pkg = Package {
+                kind: source.kind,
+                version: source.version,
+                resolver,
+            };
+
+            match package_table.entry(pkg_name) {
+                Entry::Vacant(entry) => {
+                    entry.insert(pkg);
+                }
+
+                // Seeing the same package twice in the same lock file: Not OK even if all their
+                // properties match as a properly created lock file should de-duplicate packages.
+                Entry::Occupied(entry) => {
+                    bail!(
+                        "Conflicting dependencies found:\n{0} = {1}\n{0} = {2}",
+                        pkg_name,
+                        PackageWithResolverTOML(entry.get()),
+                        PackageWithResolverTOML(&pkg),
+                    );
+                }
+            };
+
+            for schema::Dependency {
+                name: dep_name,
+                subst,
+                digest,
+            } in dependencies.into_iter().flatten()
+            {
+                package_graph.add_edge(
+                    pkg_name,
+                    PM::PackageName::from(dep_name.as_str()),
+                    Dependency {
+                        mode: DependencyMode::Always,
+                        subst: subst.map(parse_substitution).transpose()?,
+                        digest: digest.map(Symbol::from),
+                        dep_override: false,
+                    },
+                );
+            }
+
+            for schema::Dependency {
+                name: dep_name,
+                subst,
+                digest,
+            } in dev_dependencies.into_iter().flatten()
+            {
+                package_graph.add_edge(
+                    pkg_name,
+                    PM::PackageName::from(dep_name.as_str()),
+                    Dependency {
+                        mode: DependencyMode::DevOnly,
+                        subst: subst.map(parse_substitution).transpose()?,
+                        digest: digest.map(Symbol::from),
+                        dep_override: false,
+                    },
+                );
+            }
+        }
+
+        let mut graph = DependencyGraph {
+            root_path,
+            root_package,
+            package_graph,
+            package_table,
+            always_deps: BTreeSet::new(),
+            manifest_digest,
+            deps_digest,
+        };
+
+        graph.check_consistency()?;
+        graph.check_acyclic()?;
+        graph.discover_always_deps();
+        Ok(graph)
+    }
+
+    /// Serializes this dependency graph into a lock file and return it.
+    ///
+    /// This operation fails, writing nothing, if the graph contains a cycle, and can fail with an
+    /// undefined output if it cannot be represented in a TOML file.
+    pub fn write_to_lock(&self, install_dir: PathBuf) -> Result<LockFile> {
+        let lock = LockFile::new(
+            install_dir,
+            self.manifest_digest.clone(),
+            self.deps_digest.clone(),
+        )?;
+        let mut writer = BufWriter::new(&*lock);
+
+        self.write_dependencies_to_lock(self.root_package, &mut writer)?;
+
+        for (name, pkg) in &self.package_table {
+            writeln!(writer, "\n[[move.package]]")?;
+
+            writeln!(writer, "name = {}", str_escape(name.as_str())?)?;
+            writeln!(writer, "source = {}", PackageTOML(pkg))?;
+
+            self.write_dependencies_to_lock(*name, &mut writer)?;
+        }
+
+        writer.flush()?;
+        std::mem::drop(writer);
+
+        Ok(lock)
+    }
+
+    /// Helper function to output the dependencies and dev-dependencies of `name` from this
+    /// dependency graph, to the lock file under `writer`.
+    fn write_dependencies_to_lock<W: Write>(
+        &self,
+        name: PM::PackageName,
+        writer: &mut W,
+    ) -> Result<()> {
+        let mut deps: Vec<_> = self
+            .package_graph
+            .edges(name)
+            .map(|(_, pkg, dep)| (dep, pkg))
+            .collect();
+
+        // Sort by kind ("always" dependencies go first), and by name, to keep the output
+        // stable.
+        deps.sort_by_key(|(dep, pkg)| (dep.mode, *pkg));
+        let mut deps = deps.into_iter().peekable();
+
+        macro_rules! write_deps {
+            ($mode: pat, $label: literal) => {
+                if let Some((Dependency { mode: $mode, .. }, _)) = deps.peek() {
+                    writeln!(writer, "\n{} = [", $label)?;
+                    while let Some((dep @ Dependency { mode: $mode, .. }, pkg)) = deps.peek() {
+                        writeln!(writer, "  {},", DependencyTOML(*pkg, dep))?;
+                        deps.next();
+                    }
+                    writeln!(writer, "]")?;
+                }
+            };
+        }
+
+        write_deps!(DependencyMode::Always, "dependencies");
+        write_deps!(DependencyMode::DevOnly, "dev-dependencies");
+
+        Ok(())
+    }
+
+    /// Returns packages in the graph in topological order (a package is ordered before its
+    /// dependencies).
+    ///
+    /// The ordering is agnostic to dependency mode (dev-mode or not) and contains all packagesd
+    /// (including packages that are exclusively dev-mode-only).
+    ///
+    /// Guaranteed to succeed because `DependencyGraph` instances cannot contain cycles.
+    pub fn topological_order(&self) -> Vec<PM::PackageName> {
+        algo::toposort(&self.package_graph, None)
+            .expect("Graph is determined to be acyclic when created")
+    }
+
+    /// Returns an iterator over `pkg`'s immediate dependencies in the graph.  If `mode` is
+    /// `DependencyMode::Always`, only always dependencies are included, whereas if `mode` is
+    /// `DependencyMode::DevOnly`, both always and dev-only dependecies are included.
+    pub fn immediate_dependencies(
+        &'_ self,
+        pkg: PM::PackageName,
+        mode: DependencyMode,
+    ) -> impl Iterator<Item = (PM::PackageName, &'_ Dependency, &'_ Package)> {
+        self.package_graph
+            .edges(pkg)
+            .filter(move |(_, _, dep)| dep.mode <= mode)
+            .map(|(_, dep_name, dep)| (dep_name, dep, &self.package_table[&dep_name]))
+    }
+
+    /// Resolves the packages described at dependency `to` of package `from` with manifest at path
+    /// `package_path` by running the binary `resolver.  `mode` decides whether the resulting
+    /// packages are added to `self` as dependencies of `package_name` or dev-dependencies.
+    ///
+    /// Sends progress updates to `progress_output`, including stderr from the resolver, and
+    /// captures stdout, which is assumed to be a lock file containing the result of package
+    /// resolution.
+    fn get_external<Progress: Write>(
+        mode: DependencyMode,
+        from: PM::PackageName,
+        to: PM::PackageName,
+        resolver: Symbol,
+        package_path: &Path,
+        progress_output: &mut Progress,
+    ) -> Result<DependencyGraph> {
+        let mode_label = if mode == DependencyMode::DevOnly {
+            "dev-dependencies"
+        } else {
+            "dependencies"
+        };
+
+        let progress_label = format!("RESOLVING {} IN", mode_label.to_uppercase())
+            .bold()
+            .green();
+
+        writeln!(
+            progress_output,
+            "{progress_label} {to} {} {from} {} {resolver}",
+            "FROM".bold().green(),
+            "WITH".bold().green(),
+        )?;
+
+        // Call out to the external resolver
+        let output = Command::new(resolver.as_str())
+            .arg(format!("--resolve-move-{mode_label}"))
+            .arg(to.as_str())
+            .current_dir(package_path)
+            .output()
+            .with_context(|| format!("Running resolver: {resolver}"))?;
+
+        // Present the stderr from the resolver, whether the process succeeded or not.
+        if !output.stderr.is_empty() {
+            let stderr_label = format!("{resolver} stderr:").red();
+            writeln!(progress_output, "{stderr_label}")?;
+            progress_output.write_all(&output.stderr)?;
+        }
+
+        if !output.status.success() {
+            let err_msg = format!(
+                "'{resolver}' failed to resolve {mode_label} for dependency '{to}' of package \
+                 '{from}'"
+            );
+
+            if let Some(code) = output.status.code() {
+                bail!("{err_msg}. Exited with code: {code}");
+            } else {
+                bail!("{err_msg}. Terminated by signal");
+            }
+        }
+
+        let sub_graph = DependencyGraph::read_from_lock(
+            package_path.to_path_buf(),
+            from,
+            &mut output.stdout.as_slice(),
+            Some(resolver),
+        )
+        .with_context(|| {
+            format!("Parsing response from '{resolver}' for dependency '{to}' of package '{from}'")
+        })?;
+
+        Ok(sub_graph)
+    }
+
+    /// Checks that every dependency in the graph, excluding the root package, is present in the
+    /// package table.
+    fn check_consistency(&self) -> Result<()> {
+        for package in self.package_graph.nodes() {
+            if package == self.root_package {
+                continue;
+            }
+
+            if self.package_table.contains_key(&package) {
+                continue;
+            }
+
+            let dependees: Vec<_> = self
+                .package_graph
+                .neighbors_directed(package, Direction::Incoming)
+                .map(|pkg| String::from(pkg.as_str()))
+                .collect();
+
+            bail!(
+                "No source found for package {}, depended on by: {}",
+                package,
+                dependees.join(", "),
+            );
+        }
+
+        Ok(())
+    }
+
+    /// Checks that there isn't a cycle between packages in the dependency graph.  Returns `Ok(())`
+    /// if there is not, or an error describing the cycle if there is.
+    fn check_acyclic(&self) -> Result<()> {
+        let mut cyclic_components = algo::kosaraju_scc(&self.package_graph)
+            .into_iter()
+            .filter(|scc| scc.len() != 1 || self.package_graph.contains_edge(scc[0], scc[0]));
+
+        let Some(scc) = cyclic_components.next() else {
+            return Ok(());
+        };
+
+        // Duplicate start of the node at end for display
+        // SAFETY: Strongly connected components can't be empty
+        let mut cycle: Vec<_> = scc.iter().map(Symbol::as_str).collect();
+        cycle.push(cycle[0]);
+
+        bail!("Found cycle between packages: {}", cycle.join(" -> "));
+    }
+
+    /// Adds the transitive closure of `DependencyMode::Always` edges reachable from the root package
+    /// to the `always_deps` set.  Assumes that if a package is already in the graph's `always_deps`
+    /// set, then the sub-graph reachable from it has already been explored.
+    fn discover_always_deps(&mut self) {
+        let mut frontier = vec![self.root_package];
+        while let Some(package) = frontier.pop() {
+            let new_frontier = self.always_deps.insert(package);
+            if !new_frontier {
+                continue;
+            }
+
+            frontier.extend(
+                self.package_graph
+                    .edges(package)
+                    .filter(|(_, _, dep)| dep.mode == DependencyMode::Always)
+                    .map(|(_, pkg, _)| pkg),
+            );
+        }
+    }
+}
+
+impl fmt::Display for Package {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match &self.kind {
+            PM::DependencyKind::Local(local) => {
+                write!(f, "local = ")?;
+                f.write_str(&path_escape(local)?)?;
+            }
+
+            PM::DependencyKind::Git(PM::GitInfo {
+                git_url,
+                git_rev,
+                subdir,
+            }) => {
+                write!(f, "git = ")?;
+                f.write_str(&str_escape(git_url.as_str())?)?;
+
+                write!(f, ", rev = ")?;
+                f.write_str(&str_escape(git_rev.as_str())?)?;
+
+                write!(f, ", subdir = ")?;
+                f.write_str(&path_escape(subdir)?)?;
+            }
+
+            PM::DependencyKind::Custom(PM::CustomDepInfo {
+                node_url,
+                package_address,
+                subdir,
+                package_name: _,
+            }) => {
+                let custom_key = package_hooks::custom_dependency_key().ok_or(fmt::Error)?;
+
+                f.write_str(&custom_key)?;
+                write!(f, " = ")?;
+                f.write_str(&str_escape(node_url.as_str())?)?;
+
+                write!(f, ", address = ")?;
+                f.write_str(&str_escape(package_address.as_str())?)?;
+
+                write!(f, ", subdir = ")?;
+                f.write_str(&path_escape(subdir)?)?;
+            }
+        }
+
+        if let Some((major, minor, bugfix)) = self.version {
+            write!(f, ", version = \"{}.{}.{}\"", major, minor, bugfix)?;
+        }
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for PackageTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("{ ")?;
+        write!(f, "{}", self.0)?;
+        f.write_str(" }")?;
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for PackageWithResolverTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        PackageTOML(self.0).fmt(f)?;
+
+        if let Some(resolver) = self.0.resolver {
+            write!(f, " # Resolved by {resolver}")?;
+        }
+
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for DependencyTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let DependencyTOML(
+            name,
+            Dependency {
+                mode: _,
+                subst,
+                digest,
+                dep_override: _,
+            },
+        ) = self;
+
+        f.write_str("{ ")?;
+
+        write!(f, "name = ")?;
+        f.write_str(&str_escape(name.as_str())?)?;
+
+        if let Some(digest) = digest {
+            write!(f, ", digest = ")?;
+            f.write_str(&str_escape(digest.as_str())?)?;
+        }
+
+        if let Some(subst) = subst {
+            write!(f, ", addr_subst = {}", SubstTOML(subst))?;
+        }
+
+        f.write_str(" }")?;
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for SubstTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        /// Write an individual key value pair in the substitution.
+        fn write_subst(
+            f: &mut fmt::Formatter<'_>,
+            addr: &PM::NamedAddress,
+            subst: &PM::SubstOrRename,
+        ) -> fmt::Result {
+            f.write_str(&str_escape(addr.as_str())?)?;
+            write!(f, " = ")?;
+
+            match subst {
+                PM::SubstOrRename::RenameFrom(named) => {
+                    f.write_str(&str_escape(named.as_str())?)?;
+                }
+
+                PM::SubstOrRename::Assign(account) => {
+                    f.write_str(&str_escape(
+                        &account.to_canonical_string(/* with_prefix */ false),
+                    )?)?;
+                }
+            }
+
+            Ok(())
+        }
+
+        let mut substs = self.0.iter();
+
+        let Some((addr, subst)) = substs.next() else {
+            return f.write_str("{}");
+        };
+
+        f.write_str("{ ")?;
+
+        write_subst(f, addr, subst)?;
+        for (addr, subst) in substs {
+            write!(f, ", ")?;
+            write_subst(f, addr, subst)?;
+        }
+
+        f.write_str(" }")?;
+
+        Ok(())
+    }
+}
+
+/// Escape a string to output in a TOML file.
+fn str_escape(s: &str) -> Result<String, fmt::Error> {
+    toml::to_string(s).map_err(|_| fmt::Error)
+}
+
+/// Escape a path to output in a TOML file.
+fn path_escape(p: &Path) -> Result<String, fmt::Error> {
+    str_escape(p.to_str().ok_or(fmt::Error)?)
+}
+
+fn format_deps(
+    pkg_path: String,
+    dependencies: Vec<(&Dependency, PM::PackageName, &Package)>,
+) -> String {
+    let mut s = format!("\nAt {}", pkg_path);
+    if !dependencies.is_empty() {
+        for (dep, pkg_name, pkg) in dependencies {
+            s.push_str("\n\t");
+            s.push_str(&format!("{pkg_name} = "));
+            s.push_str("{ ");
+            s.push_str(&format!("{pkg}"));
+            if let Some(digest) = dep.digest {
+                s.push_str(&format!(", digest = {digest}"));
+            }
+            if let Some(subst) = &dep.subst {
+                s.push_str(&format!(", addr_subst = {}", SubstTOML(subst)));
+            }
+            s.push_str(" }");
+        }
+    } else {
+        s.push_str("\n\tno dependencies");
+    }
+    s
+}
+
+/// Checks if dependencies of a given package in two different dependency graph maps are the same,
+/// checking both the dependency in the graph and the destination package (both can be
+/// different). Returns Ok(()) if they are and the two parts of the symmetric different between
+/// dependencies inside Err if they aren't.
+fn deps_equal<'a>(
+    pkg_name: Symbol,
+    graph1: &'a DependencyGraph,
+    graph1_pkg_table: &'a BTreeMap<PM::PackageName, Package>,
+    graph2: &'a DependencyGraph,
+    graph2_pkg_table: &'a BTreeMap<PM::PackageName, Package>,
+    overrides: &'a BTreeMap<PM::PackageName, Package>,
+) -> std::result::Result<
+    (),
+    (
+        Vec<(&'a Dependency, PM::PackageName, &'a Package)>,
+        Vec<(&'a Dependency, PM::PackageName, &'a Package)>,
+    ),
+> {
+    // Unwraps in the code below are safe as these edges (and target nodes) must exist either in the
+    // sub-graph or in the pre-populated combined graph (see pkg_table_for_deps_compare's doc
+    // comment for a more detailed explanation). If these were to fail, it would indicate a bug in
+    // the algorithm so it's OK to panic here.
+    let graph1_edges: BTreeSet<_> = graph1
+        .package_graph
+        .edges(pkg_name)
+        .map(|(_, pkg, dep)| {
+            (
+                dep,
+                pkg,
+                graph1_pkg_table
+                    .get(&pkg)
+                    .or_else(|| overrides.get(&pkg))
+                    .unwrap(),
+            )
+        })
+        .collect();
+    let graph2_edges: BTreeSet<_> = graph2
+        .package_graph
+        .edges(pkg_name)
+        .map(|(_, pkg, dep)| {
+            (
+                dep,
+                pkg,
+                graph2_pkg_table
+                    .get(&pkg)
+                    .or_else(|| overrides.get(&pkg))
+                    .unwrap(),
+            )
+        })
+        .collect();
+
+    let (graph1_pkgs, graph2_pkgs): (Vec<_>, Vec<_>) = graph1_edges
+        .symmetric_difference(&graph2_edges)
+        .partition(|dep| graph1_edges.contains(dep));
+    if graph1_pkgs.is_empty() && graph2_pkgs.is_empty() {
+        Ok(())
+    } else {
+        Err((graph1_pkgs, graph2_pkgs))
+    }
+}
+
+/// Collects overridden dependencies.
+fn collect_overrides(
+    parent: &PM::DependencyKind,
+    dependencies: &PM::Dependencies,
+) -> Result<BTreeMap<Symbol, Package>> {
+    let mut overrides = BTreeMap::new();
+    for (dep_pkg_name, dep) in dependencies {
+        if let PM::Dependency::Internal(internal) = dep {
+            if internal.dep_override {
+                let mut dep_pkg = Package {
+                    kind: internal.kind.clone(),
+                    version: internal.version,
+                    resolver: None,
+                };
+                dep_pkg.kind.reroot(parent)?;
+                overrides.insert(*dep_pkg_name, dep_pkg);
+            }
+        }
+    }
+    Ok(overrides)
+}
+
+/// Cycle detection to avoid infinite recursion due to the way we construct internally resolved
+/// sub-graphs, expecting to end recursion at leaf packages that have no dependencies.
+fn check_for_dep_cycles(
+    dep: PM::InternalDependency,
+    dep_pkg_name: PM::PackageName,
+    internal_dependencies: &mut VecDeque<(PM::PackageName, PM::InternalDependency)>,
+) -> Result<()> {
+    if internal_dependencies.contains(&(dep_pkg_name, dep.clone())) {
+        let (mut processed_name, mut processed_dep) = internal_dependencies.pop_back().unwrap();
+        while processed_name != dep_pkg_name || processed_dep != dep {
+            (processed_name, processed_dep) = internal_dependencies.pop_back().unwrap();
+        }
+        // now the queue contains all intermediate dependencies
+        let mut msg = "Found cycle between packages: ".to_string();
+        msg.push_str(format!("{} -> ", dep_pkg_name).as_str());
+        while !internal_dependencies.is_empty() {
+            let (p, _) = internal_dependencies.pop_back().unwrap();
+            msg.push_str(format!("{} -> ", p).as_str());
+        }
+        msg.push_str(format!("{}", dep_pkg_name).as_str());
+        bail!(msg);
+    }
+    Ok(())
+}
+
+/// Find the shortest path from a root of the graph to a given dependency and return it in a string
+/// format.
+fn dep_path_from_root(
+    root_package: PM::PackageName,
+    graph: &DependencyGraph,
+    pkg_name: PM::PackageName,
+    is_external: bool,
+) -> Result<String> {
+    match algo::astar(
+        &graph.package_graph,
+        graph.root_package,
+        |dst| dst == pkg_name,
+        |_| 1,
+        |_| 0,
+    ) {
+        None => bail!(
+            "When resolving dependencies for package {}, \
+             expected a dependency path between {} and {} which does not exist",
+            root_package,
+            graph.root_package,
+            pkg_name
+        ),
+        Some((_, p)) => {
+            let mut i = p.iter();
+            if is_external || root_package == graph.root_package {
+                // Externally resolved graphs contain a path to the package in the enclosing graph.
+                // This package has to be removed from the path for the output to be consistent
+                // between internally and externally resolved graphs. We have a similar situation
+                // when computing a path in an already combined graph (which was pre-populated with
+                // direct dependencies).
+                i.next();
+            }
+            let p = i.map(|s| s.as_str()).collect::<Vec<_>>();
+            Ok(p.join(" -> "))
+        }
+    }
+}
diff --git a/vendors/move/crates/move-package/src/resolution/digest.rs b/vendors/move/crates/move-package/src/resolution/digest.rs
new file mode 100644
index 000000000..be1419da1
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/digest.rs
@@ -0,0 +1,60 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_command_line_common::files::MOVE_EXTENSION;
+use sha2::{Digest, Sha256};
+use std::path::{Path, PathBuf};
+
+use crate::source_package::{layout::SourcePackageLayout, parsed_manifest::PackageDigest};
+
+pub fn compute_digest(paths: &[PathBuf]) -> Result<PackageDigest> {
+    let mut hashed_files = Vec::new();
+    let mut hash = |path: &Path| {
+        let contents = std::fs::read(path)?;
+        hashed_files.push(digest_str(&contents));
+        Ok(())
+    };
+    let mut maybe_hash_file = |path: &Path| -> Result<()> {
+        match path.extension() {
+            Some(x) if MOVE_EXTENSION == x => hash(path),
+            _ if path.ends_with(SourcePackageLayout::Manifest.path()) => hash(path),
+            _ => Ok(()),
+        }
+    };
+
+    for path in paths {
+        if path.is_file() {
+            maybe_hash_file(path)?;
+        } else {
+            for entry in walkdir::WalkDir::new(path)
+                .follow_links(true)
+                .into_iter()
+                .filter_map(|e| e.ok())
+            {
+                if entry.file_type().is_file() {
+                    maybe_hash_file(entry.path())?
+                }
+            }
+        }
+    }
+
+    Ok(PackageDigest::from(hashed_files_digest(hashed_files)))
+}
+
+pub fn hashed_files_digest(mut hashed_files: Vec<String>) -> String {
+    // Sort the hashed files to ensure that the order of files is always stable
+    hashed_files.sort();
+
+    let mut hasher = Sha256::new();
+    for file_hash in hashed_files.into_iter() {
+        hasher.update(file_hash.as_bytes());
+    }
+
+    format!("{:X}", hasher.finalize())
+}
+
+pub fn digest_str(data: &[u8]) -> String {
+    format!("{:X}", Sha256::digest(data))
+}
diff --git a/vendors/move/crates/move-package/src/resolution/mod.rs b/vendors/move/crates/move-package/src/resolution/mod.rs
new file mode 100644
index 000000000..d858c52f1
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/mod.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_command_line_common::env::MOVE_HOME;
+use std::{
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    source_package::parsed_manifest::{CustomDepInfo, DependencyKind, GitInfo},
+    BuildConfig,
+};
+
+use self::dependency_graph::DependencyGraphBuilder;
+
+pub mod dependency_cache;
+pub mod dependency_graph;
+mod digest;
+pub mod resolution_graph;
+pub mod resolving_table;
+
+pub fn download_dependency_repos<Progress: Write>(
+    manifest_string: String,
+    lock_string: Option<String>,
+    build_options: &BuildConfig,
+    root_path: &Path,
+    progress_output: &mut Progress,
+) -> Result<()> {
+    let install_dir = build_options
+        .install_dir
+        .as_ref()
+        .unwrap_or(&root_path.to_path_buf())
+        .to_owned();
+    let mut dep_graph_builder = DependencyGraphBuilder::new(
+        build_options.skip_fetch_latest_git_deps,
+        progress_output,
+        install_dir,
+    );
+    let (graph, _) = dep_graph_builder.get_graph(
+        &DependencyKind::default(),
+        root_path.to_path_buf(),
+        manifest_string,
+        lock_string,
+    )?;
+
+    for pkg_name in graph.topological_order() {
+        if pkg_name == graph.root_package {
+            continue;
+        }
+
+        if !(build_options.dev_mode || graph.always_deps.contains(&pkg_name)) {
+            continue;
+        }
+
+        let package = graph
+            .package_table
+            .get(&pkg_name)
+            .expect("Metadata for package");
+
+        let DependencyGraphBuilder {
+            ref mut dependency_cache,
+            ref mut progress_output,
+            ..
+        } = dep_graph_builder;
+        dependency_cache.download_and_update_if_remote(pkg_name, &package.kind, progress_output)?;
+    }
+
+    Ok(())
+}
+
+/// The local location of the repository containing the dependency of kind `kind` (and potentially
+/// other, related dependencies).
+fn repository_path(kind: &DependencyKind) -> PathBuf {
+    match kind {
+        DependencyKind::Local(path) => path.clone(),
+
+        // Downloaded packages are of the form <sanitized_git_url>_<rev_name>
+        DependencyKind::Git(GitInfo {
+            git_url,
+            git_rev,
+            subdir: _,
+        }) => [
+            &*MOVE_HOME,
+            &format!(
+                "{}_{}",
+                url_to_file_name(git_url.as_str()),
+                git_rev.replace('/', "__"),
+            ),
+        ]
+        .iter()
+        .collect(),
+
+        // Downloaded packages are of the form <sanitized_node_url>_<address>_<package>
+        DependencyKind::Custom(CustomDepInfo {
+            node_url,
+            package_address,
+            package_name,
+            subdir: _,
+        }) => [
+            &*MOVE_HOME,
+            &format!(
+                "{}_{}_{}",
+                url_to_file_name(node_url.as_str()),
+                package_address.as_str(),
+                package_name.as_str(),
+            ),
+        ]
+        .iter()
+        .collect(),
+    }
+}
+
+/// The path that the dependency of kind `kind` is found at locally, after it is fetched.
+fn local_path(kind: &DependencyKind) -> PathBuf {
+    let mut repo_path = repository_path(kind);
+
+    if let DependencyKind::Git(GitInfo { subdir, .. })
+    | DependencyKind::Custom(CustomDepInfo { subdir, .. }) = kind
+    {
+        repo_path.push(subdir);
+    }
+
+    repo_path
+}
+
+fn url_to_file_name(url: &str) -> String {
+    regex::Regex::new(r"/|:|\.|@")
+        .unwrap()
+        .replace_all(url, "_")
+        .to_string()
+}
diff --git a/vendors/move/crates/move-package/src/resolution/resolution_graph.rs b/vendors/move/crates/move-package/src/resolution/resolution_graph.rs
new file mode 100644
index 000000000..cdaa18773
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/resolution_graph.rs
@@ -0,0 +1,493 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Context, Result};
+use move_command_line_common::files::{find_move_filenames, FileHash};
+use move_compiler::{diagnostics::WarningFilters, shared::PackageConfig};
+use move_core_types::account_address::AccountAddress;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+};
+use treeline::Tree;
+
+use crate::{
+    source_package::{
+        layout::SourcePackageLayout,
+        manifest_parser::parse_move_manifest_from_file,
+        parsed_manifest::{
+            FileName, NamedAddress, PackageDigest, PackageName, SourceManifest, SubstOrRename,
+        },
+    },
+    BuildConfig,
+};
+
+use super::{
+    dependency_cache::DependencyCache, dependency_graph as DG, digest::compute_digest, local_path,
+    resolving_table::ResolvingTable,
+};
+
+/// The graph after resolution in which all named addresses have been assigned a value.
+///
+/// Named addresses can be assigned values in a couple different ways:
+/// 1. They can be assigned a value in the declaring package. In this case the value of that
+///    named address will always be that value.
+/// 2. Can be left unassigned in the declaring package. In this case it can receive its value
+///    through unification across the package graph.
+///
+/// Named addresses can also be renamed in a package and will be re-exported under thes new names in
+/// this case.
+#[derive(Debug, Clone)]
+pub struct ResolvedGraph {
+    pub graph: DG::DependencyGraph,
+    /// Build options
+    pub build_options: BuildConfig,
+    /// A mapping of package name to its resolution
+    pub package_table: PackageTable,
+}
+
+// rename_to => (from_package_name, from_address_name)
+pub type Renaming = BTreeMap<NamedAddress, (PackageName, NamedAddress)>;
+pub type ResolvedTable = BTreeMap<NamedAddress, AccountAddress>;
+type PackageTable = BTreeMap<PackageName, Package>;
+
+#[derive(Debug, Clone)]
+pub struct Package {
+    /// Source manifest for this package
+    pub source_package: SourceManifest,
+    /// Where this package is located on the filesystem
+    pub package_path: PathBuf,
+    /// The renaming of addresses performed by this package
+    pub renaming: Renaming,
+    /// The mapping of addresses that are in scope for this package.
+    pub resolved_table: ResolvedTable,
+    /// The digest of the contents of all source files and manifest under the package root
+    pub source_digest: PackageDigest,
+}
+
+impl ResolvedGraph {
+    pub fn resolve<Progress: Write>(
+        graph: DG::DependencyGraph,
+        build_options: BuildConfig,
+        dependency_cache: &mut DependencyCache,
+        progress_output: &mut Progress,
+    ) -> Result<ResolvedGraph> {
+        let mut package_table = PackageTable::new();
+        let mut resolving_table = ResolvingTable::new();
+
+        let dep_mode = if build_options.dev_mode {
+            DG::DependencyMode::DevOnly
+        } else {
+            DG::DependencyMode::Always
+        };
+
+        // Resolve transitive dependencies in reverse topological order so that a package's
+        // dependencies get resolved before it does.
+        for pkg_name in graph.topological_order().into_iter().rev() {
+            // Skip dev-mode packages if not in dev-mode.
+            if !(build_options.dev_mode || graph.always_deps.contains(&pkg_name)) {
+                continue;
+            }
+
+            // Make sure the package is available locally.
+            let package_path = if pkg_name == graph.root_package {
+                graph.root_path.clone()
+            } else {
+                let pkg = &graph.package_table[&pkg_name];
+                dependency_cache
+                    .download_and_update_if_remote(pkg_name, &pkg.kind, progress_output)
+                    .with_context(|| format!("Fetching '{pkg_name}'"))?;
+                graph.root_path.join(local_path(&pkg.kind))
+            };
+
+            let mut resolved_pkg = Package::new(package_path, &build_options)
+                .with_context(|| format!("Resolving package '{pkg_name}'"))?;
+
+            if pkg_name != resolved_pkg.source_package.package.name {
+                bail!(
+                    "Name of dependency '{}' does not match dependency's package name '{}'",
+                    pkg_name,
+                    resolved_pkg.source_package.package.name
+                )
+            }
+
+            resolved_pkg
+                .define_addresses_in_package(&mut resolving_table)
+                .with_context(|| format!("Resolving addresses for '{pkg_name}'"))?;
+
+            for (dep_name, dep, _pkg) in graph.immediate_dependencies(pkg_name, dep_mode) {
+                resolved_pkg
+                    .process_dependency(dep_name, dep, &package_table, &mut resolving_table)
+                    .with_context(|| {
+                        format!("Processing dependency '{dep_name}' of '{pkg_name}'")
+                    })?;
+            }
+
+            package_table.insert(pkg_name, resolved_pkg);
+        }
+
+        // Add additional addresses to all package resolution tables.
+        for (name, addr) in &build_options.additional_named_addresses {
+            let name = NamedAddress::from(name.as_str());
+            for pkg in package_table.keys() {
+                resolving_table
+                    .define((*pkg, name), Some(*addr))
+                    .with_context(|| {
+                        format!("Adding additional address '{name}' to package '{pkg}'")
+                    })?;
+            }
+        }
+
+        let root_package = &package_table[&graph.root_package];
+
+        // Add dev addresses, but only for the root package
+        if build_options.dev_mode {
+            let mut addr_to_name_mapping = BTreeMap::new();
+            for (name, addr) in resolving_table.bindings(graph.root_package) {
+                if let Some(addr) = addr {
+                    addr_to_name_mapping
+                        .entry(*addr)
+                        .or_insert_with(Vec::new)
+                        .push(name);
+                };
+            }
+
+            for (name, addr) in root_package
+                .source_package
+                .dev_address_assignments
+                .iter()
+                .flatten()
+            {
+                let root_dev_addr = (graph.root_package, *name);
+                if !resolving_table.contains(root_dev_addr) {
+                    bail!(
+                        "Found unbound dev address assignment '{} = 0x{}' in root package '{}'. \
+                         Dev addresses cannot introduce new named addresses",
+                        name,
+                        addr.short_str_lossless(),
+                        graph.root_package,
+                    );
+                }
+
+                resolving_table
+                    .define(root_dev_addr, Some(*addr))
+                    .with_context(|| {
+                        format!(
+                            "Unable to resolve named address '{}' in package '{}' when resolving \
+                             dependencies in dev mode",
+                            name, graph.root_package,
+                        )
+                    })?;
+
+                if let Some(conflicts) = addr_to_name_mapping.insert(*addr, vec![*name]) {
+                    bail!(
+                        "Found non-unique dev address assignment '{name} = 0x{addr}' in root \
+                         package '{pkg}'. Dev address assignments must not conflict with any other \
+                         assignments in order to ensure that the package will compile with any \
+                         possible address assignment. \
+                         Assignment conflicts with previous assignments: {conflicts} = 0x{addr}",
+                        name = name,
+                        addr = addr.short_str_lossless(),
+                        pkg = graph.root_package,
+                        conflicts = conflicts
+                            .iter()
+                            .map(NamedAddress::as_str)
+                            .collect::<Vec<_>>()
+                            .join(", "),
+                    )
+                }
+            }
+        }
+
+        // Now that all address unification has happened, individual package resolution tables can
+        // be unified.
+        for pkg in package_table.values_mut() {
+            pkg.finalize_address_resolution(&resolving_table)
+                .with_context(|| {
+                    format!(
+                        "Unresolved addresses found. To fix this, add an entry for each unresolved \
+                         address to the [addresses] section of {}/Move.toml: e.g.,\n\n\
+                         \
+                         [addresses]\n\
+                         std = \"0x1\"\n\n\
+                         \
+                         Alternatively, you can also define [dev-addresses] and call with the -d \
+                         flag",
+                        graph.root_path.display()
+                    )
+                })?;
+        }
+
+        Ok(ResolvedGraph {
+            graph,
+            build_options,
+            package_table,
+        })
+    }
+
+    pub fn root_package(&self) -> PackageName {
+        self.graph.root_package
+    }
+
+    pub fn get_package(&self, name: PackageName) -> &Package {
+        self.package_table.get(&name).unwrap()
+    }
+
+    /// Return the names of packages in this resolution graph in topological order.
+    pub fn topological_order(&self) -> Vec<PackageName> {
+        let mut order = self.graph.topological_order();
+        if !self.build_options.dev_mode {
+            order.retain(|pkg| self.graph.always_deps.contains(pkg));
+        }
+        order
+    }
+
+    fn print_info_dfs(&self, current_node: &PackageName, tree: &mut Tree<String>) -> Result<()> {
+        let pkg = self.package_table.get(current_node).unwrap();
+
+        for (name, addr) in &pkg.resolved_table {
+            tree.push(Tree::root(format!(
+                "{}:0x{}",
+                name,
+                addr.short_str_lossless()
+            )));
+        }
+
+        for dep in pkg.immediate_dependencies(self) {
+            let mut child = Tree::root(dep.to_string());
+            self.print_info_dfs(&dep, &mut child)?;
+            tree.push(child);
+        }
+
+        Ok(())
+    }
+
+    pub fn print_info(&self) -> Result<()> {
+        let root = self.root_package();
+        let mut tree = Tree::root(root.to_string());
+        self.print_info_dfs(&root, &mut tree)?;
+        println!("{}", tree);
+        Ok(())
+    }
+
+    pub fn extract_named_address_mapping(
+        &self,
+    ) -> impl Iterator<Item = (NamedAddress, AccountAddress)> {
+        self.package_table
+            .get(&self.root_package())
+            .expect("Failed to find root package in package table -- this should never happen")
+            .resolved_table
+            .clone()
+            .into_iter()
+    }
+
+    pub fn file_sources(&self) -> BTreeMap<FileHash, (FileName, String)> {
+        self.package_table
+            .iter()
+            .flat_map(|(_, rpkg)| {
+                rpkg.get_sources(&self.build_options)
+                    .unwrap()
+                    .iter()
+                    .map(|fname| {
+                        let contents = fs::read_to_string(fname.as_str()).unwrap();
+                        let fhash = FileHash::new(&contents);
+                        (fhash, (*fname, contents))
+                    })
+                    .collect::<BTreeMap<_, _>>()
+            })
+            .collect()
+    }
+}
+
+impl Package {
+    fn new(package_path: PathBuf, config: &BuildConfig) -> Result<Package> {
+        Ok(Package {
+            source_package: parse_move_manifest_from_file(&package_path)?,
+            source_digest: package_digest_for_config(&package_path, config)?,
+            package_path,
+            renaming: Renaming::new(),
+            resolved_table: ResolvedTable::new(),
+        })
+    }
+
+    fn define_addresses_in_package(&self, resolving_table: &mut ResolvingTable) -> Result<()> {
+        let package = self.source_package.package.name;
+        for (name, addr) in self.source_package.addresses.iter().flatten() {
+            resolving_table.define((package, *name), *addr)?;
+        }
+        Ok(())
+    }
+
+    fn process_dependency(
+        &mut self,
+        dep_name: PackageName,
+        dep: &DG::Dependency,
+        package_table: &PackageTable,
+        resolving_table: &mut ResolvingTable,
+    ) -> Result<()> {
+        let pkg_name = self.source_package.package.name;
+        let mut dep_renaming = BTreeMap::new();
+
+        for (to, subst) in dep.subst.iter().flatten() {
+            match subst {
+                SubstOrRename::Assign(addr) => {
+                    resolving_table.define((pkg_name, *to), Some(*addr))?;
+                }
+
+                SubstOrRename::RenameFrom(from) => {
+                    if !resolving_table.contains((dep_name, *from)) {
+                        bail!(
+                            "Tried to rename named address {0} from package '{1}', \
+                             however {1} does not contain that address",
+                            from,
+                            dep_name,
+                        )
+                    }
+
+                    if let Some((prev_dep, prev_from)) =
+                        self.renaming.insert(*to, (dep_name, *from))
+                    {
+                        bail!(
+                            "Duplicate renaming of named address '{to}' in dependencies of \
+                             '{pkg_name}'. Substituted with '{from}' from dependency '{dep_name}' \
+                             and '{prev_from}' from dependency '{prev_dep}'.",
+                        )
+                    }
+
+                    dep_renaming.insert(*from, *to);
+                }
+            }
+        }
+
+        let bound_in_dep: Vec<_> = resolving_table
+            .bindings(dep_name)
+            .map(|(from, _)| from)
+            .collect();
+
+        for from in bound_in_dep {
+            let to = *dep_renaming.get(&from).unwrap_or(&from);
+            resolving_table.unify((pkg_name, to), (dep_name, from))?;
+        }
+
+        let Some(resolved_dep) = package_table.get(&dep_name) else {
+            bail!(
+                "Unable to find resolved information for dependency '{dep_name}' of \
+                 '{pkg_name}'",
+            );
+        };
+
+        if let Some(digest) = dep.digest {
+            if digest != resolved_dep.source_digest {
+                bail!(
+                    "Source digest mismatch in dependency '{dep_name}' of '{pkg_name}'. \
+                     Expected '{digest}' but got '{}'.",
+                    resolved_dep.source_digest
+                )
+            }
+        }
+
+        Ok(())
+    }
+
+    fn finalize_address_resolution(&mut self, resolving_table: &ResolvingTable) -> Result<()> {
+        let mut unresolved_addresses = Vec::new();
+
+        let pkg_name = self.source_package.package.name;
+        for (name, addr) in resolving_table.bindings(pkg_name) {
+            match *addr {
+                Some(addr) => {
+                    self.resolved_table.insert(name, addr);
+                }
+                None => {
+                    unresolved_addresses
+                        .push(format!("  Named address '{name}' in package '{pkg_name}'"));
+                }
+            }
+        }
+
+        if !unresolved_addresses.is_empty() {
+            bail!(
+                "Unresolved addresses: [\n{}\n]",
+                unresolved_addresses.join("\n"),
+            )
+        }
+
+        Ok(())
+    }
+
+    pub fn immediate_dependencies(&self, graph: &ResolvedGraph) -> BTreeSet<PackageName> {
+        graph
+            .graph
+            .immediate_dependencies(
+                self.source_package.package.name,
+                if graph.build_options.dev_mode {
+                    DG::DependencyMode::DevOnly
+                } else {
+                    DG::DependencyMode::Always
+                },
+            )
+            .map(|(name, _, _)| name)
+            .collect()
+    }
+
+    pub fn get_sources(&self, config: &BuildConfig) -> Result<Vec<FileName>> {
+        let places_to_look = source_paths_for_config(&self.package_path, config);
+        Ok(find_move_filenames(&places_to_look, false)?
+            .into_iter()
+            .map(FileName::from)
+            .collect())
+    }
+
+    pub(crate) fn compiler_config(
+        &self,
+        is_dependency: bool,
+        config: &BuildConfig,
+    ) -> PackageConfig {
+        PackageConfig {
+            is_dependency,
+            flavor: self
+                .source_package
+                .package
+                .flavor
+                .or(config.default_flavor)
+                .unwrap_or_default(),
+            edition: self
+                .source_package
+                .package
+                .edition
+                .or(config.default_edition)
+                .unwrap_or_default(),
+            warning_filter: WarningFilters::new_for_source(),
+        }
+    }
+}
+
+fn source_paths_for_config(package_path: &Path, config: &BuildConfig) -> Vec<PathBuf> {
+    let mut places_to_look = Vec::new();
+    let mut add_path = |layout_path: SourcePackageLayout| {
+        let path = package_path.join(layout_path.path());
+        if layout_path.is_optional() && !path.exists() {
+            return;
+        }
+        places_to_look.push(path)
+    };
+
+    add_path(SourcePackageLayout::Sources);
+    add_path(SourcePackageLayout::Scripts);
+
+    if config.dev_mode {
+        add_path(SourcePackageLayout::Examples);
+        add_path(SourcePackageLayout::Tests);
+    }
+
+    places_to_look
+}
+
+fn package_digest_for_config(package_path: &Path, config: &BuildConfig) -> Result<PackageDigest> {
+    let mut source_paths = source_paths_for_config(package_path, config);
+    source_paths.push(package_path.join(SourcePackageLayout::Manifest.path()));
+    compute_digest(&source_paths)
+}
diff --git a/vendors/move/crates/move-package/src/resolution/resolving_table.rs b/vendors/move/crates/move-package/src/resolution/resolving_table.rs
new file mode 100644
index 000000000..2b82f0450
--- /dev/null
+++ b/vendors/move/crates/move-package/src/resolution/resolving_table.rs
@@ -0,0 +1,174 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeMap;
+
+use anyhow::{anyhow, Result};
+use move_core_types::account_address::AccountAddress;
+
+use crate::source_package::parsed_manifest::{NamedAddress, PackageName};
+
+/// A named address qualified with the package name whose scope it belongs to.
+pub type QualifiedAddress = (PackageName, NamedAddress);
+
+/// A data structure for unifying named addresses across packages according to renamings and
+/// assigning them numerical addresses.
+#[derive(Debug)]
+pub struct ResolvingTable {
+    /// Disjoint set data structure for assignments which can either hold no value, a fixed value or
+    /// a forwarding reference to another element in the table.  Each entry in the `redirection`
+    /// table gets a slot in the `assignment` table.
+    assignments: Vec<Assignment>,
+
+    /// Mapping named addresses to an entry in the `assignments` table.
+    redirection: BTreeMap<QualifiedAddress, usize>,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum Assignment {
+    Assign(Option<AccountAddress>),
+    Linked(usize),
+}
+
+impl ResolvingTable {
+    /// A fresh `ResolvingTable` with no bindings.
+    pub fn new() -> ResolvingTable {
+        ResolvingTable {
+            assignments: Vec::new(),
+            redirection: BTreeMap::new(),
+        }
+    }
+
+    /// Iterates over the bindings in this table that are within `pkg`'s scope.
+    pub fn bindings(
+        &self,
+        pkg: PackageName,
+    ) -> impl Iterator<Item = (NamedAddress, &Option<AccountAddress>)> {
+        let start = (pkg, NamedAddress::from(""));
+        self.redirection
+            .range(start..)
+            .take_while(move |((scope, _), _)| *scope == pkg)
+            .map(|((_, name), ix)| (*name, self.parent(*ix)))
+    }
+
+    /// Return a reference to the address that `name` is currently bound to, if one exists, or
+    /// `None` otherwise.
+    pub fn get(&self, name: QualifiedAddress) -> Option<&AccountAddress> {
+        self.parent(*self.redirection.get(&name)?).as_ref()
+    }
+
+    /// Indicates whether there is a binding in this resolving table for `name`.  A table contains a
+    /// binding if it has previously been passed into a call to `define` or `unify` (even if it has
+    /// not been assigned a concrete numerical address).
+    pub fn contains(&self, name: QualifiedAddress) -> bool {
+        self.redirection.contains_key(&name)
+    }
+
+    /// Add the binding `name = addr` to the table and propagate it across all renamings that
+    /// transitively involve `name`.  Fails if this introduces a contradiction (A path through
+    /// bindings between two account addresses that are unequal to each other), and succeeds
+    /// otherwise.
+    pub fn define(&mut self, name: QualifiedAddress, addr: Option<AccountAddress>) -> Result<()> {
+        let ix = self.get_or_create_assignment(name);
+        let Assignment::Assign(slot) = &mut self.assignments[ix] else {
+            unreachable!("Non-root assignment");
+        };
+
+        match (slot, addr) {
+            (_, None) => { /* nop */ }
+            (slot @ None, addr) => *slot = addr,
+            (Some(existing), Some(new)) => {
+                if *existing != new {
+                    return Err(unification_error(name.1, *existing, new));
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Add the binding `a = b` to the table.  Fails if this introduces a contradiction (A path
+    /// through bindings between two account addresses that are unequal to each other), and succeeds
+    /// otherwise.
+    pub fn unify(&mut self, a: QualifiedAddress, b: QualifiedAddress) -> Result<()> {
+        let ix = self.get_or_create_assignment(a);
+        let jx = self.get_or_create_assignment(b);
+
+        if ix == jx {
+            return Ok(());
+        }
+
+        let Assignment::Assign(ia) = self.assignments[ix] else {
+            unreachable!("Non-root assignment");
+        };
+
+        let Assignment::Assign(ja) = self.assignments[jx] else {
+            unreachable!("Non-root assignment");
+        };
+
+        match (ia, ja) {
+            (None, Some(_)) => self.assignments[ix] = Assignment::Linked(jx),
+
+            (Some(_), None) | (None, None) => self.assignments[jx] = Assignment::Linked(ix),
+
+            (Some(ia), Some(ja)) => {
+                if ia != ja {
+                    return Err(unification_error(a.1, ia, ja));
+                }
+            }
+        };
+
+        Ok(())
+    }
+
+    /// Returns the index of the "root" assignment (i.e. not a link to another assignment) for
+    /// `name` in this table, creating an empty assignment if one does not already exist.
+    ///
+    /// Performs path compression on the internal links to speed up future look-ups.
+    fn get_or_create_assignment(&mut self, name: QualifiedAddress) -> usize {
+        let Some(mut c) = self.redirection.get(&name).copied() else {
+            self.assignments.push(Assignment::Assign(None));
+            self.redirection.insert(name, self.assignments.len() - 1);
+            return self.assignments.len() - 1;
+        };
+
+        let Assignment::Linked(mut p) = self.assignments[c] else {
+            return c;
+        };
+
+        let Assignment::Linked(mut gp) = self.assignments[p] else {
+            return p;
+        };
+
+        let mut chain = vec![c];
+        while let Assignment::Linked(ggp) = self.assignments[gp] {
+            (c, p, gp) = (p, gp, ggp);
+            chain.push(c);
+        }
+
+        for link in chain {
+            self.assignments[link] = Assignment::Linked(gp);
+        }
+
+        gp
+    }
+
+    /// Chase links from the assignent at index `ix` until a non-link `Assignment` is found, and
+    /// return a reference to that.
+    fn parent(&self, mut ix: usize) -> &Option<AccountAddress> {
+        loop {
+            match &self.assignments[ix] {
+                Assignment::Linked(p) => ix = *p,
+                Assignment::Assign(addr) => return addr,
+            }
+        }
+    }
+}
+
+fn unification_error(name: NamedAddress, a: AccountAddress, b: AccountAddress) -> anyhow::Error {
+    anyhow!(
+        "Conflicting assignments for address '{name}': '0x{}' and '0x{}'.",
+        a.short_str_lossless(),
+        b.short_str_lossless(),
+    )
+}
diff --git a/vendors/move/crates/move-package/src/source_package/layout.rs b/vendors/move/crates/move-package/src/source_package/layout.rs
new file mode 100644
index 000000000..992b312ea
--- /dev/null
+++ b/vendors/move/crates/move-package/src/source_package/layout.rs
@@ -0,0 +1,78 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::path::{Path, PathBuf};
+
+use anyhow::{bail, Result};
+
+/// References file for documentation generation
+pub const REFERENCE_TEMPLATE_FILENAME: &str = "references.md";
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum SourcePackageLayout {
+    Sources,
+    Specifications,
+    Tests,
+    Scripts,
+    Examples,
+    Manifest,
+    Lock,
+    DocTemplates,
+}
+
+impl SourcePackageLayout {
+    /// A Move source package is laid out on-disk as
+    /// a_move_package
+    /// ├── Move.toml      (required)
+    /// ├── Move.lock      (optional)
+    /// ├── sources        (required)
+    /// ├── examples       (optional, dev mode)
+    /// ├── scripts        (optional)
+    /// ├── specifications (optional)
+    /// ├── doc_templates      (optional)
+    /// └── tests          (optional, test mode)
+    pub fn path(&self) -> &Path {
+        Path::new(self.location_str())
+    }
+
+    pub fn try_find_root(starting_path: &Path) -> Result<PathBuf> {
+        let mut current_path = starting_path.to_path_buf();
+        loop {
+            if current_path.join(Self::Manifest.path()).is_file() {
+                break Ok(current_path);
+            }
+            if !current_path.pop() {
+                bail!(
+                    "Unable to find package manifest in '{}' or in its parents",
+                    starting_path.to_string_lossy()
+                )
+            }
+        }
+    }
+
+    pub fn location_str(&self) -> &'static str {
+        match self {
+            Self::Sources => "sources",
+            Self::Manifest => "Move.toml",
+            Self::Lock => "Move.lock",
+            Self::Tests => "tests",
+            Self::Scripts => "scripts",
+            Self::Examples => "examples",
+            Self::Specifications => "specifications",
+            Self::DocTemplates => "doc_templates",
+        }
+    }
+
+    pub fn is_optional(&self) -> bool {
+        match self {
+            Self::Sources | Self::Manifest => false,
+            Self::Tests
+            | Self::Scripts
+            | Self::Examples
+            | Self::Specifications
+            | Self::DocTemplates
+            | Self::Lock => true,
+        }
+    }
+}
diff --git a/vendors/move/crates/move-package/src/source_package/manifest_parser.rs b/vendors/move/crates/move-package/src/source_package/manifest_parser.rs
new file mode 100644
index 000000000..c15128678
--- /dev/null
+++ b/vendors/move/crates/move-package/src/source_package/manifest_parser.rs
@@ -0,0 +1,586 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{package_hooks, source_package::parsed_manifest as PM};
+use anyhow::{anyhow, bail, format_err, Context, Result};
+use move_compiler::editions::{Edition, Flavor};
+use move_core_types::account_address::{AccountAddress, AccountAddressParseError};
+use move_symbol_pool::symbol::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+use toml::Value as TV;
+
+use super::layout::SourcePackageLayout;
+
+const EMPTY_ADDR_STR: &str = "_";
+
+const PACKAGE_NAME: &str = "package";
+const BUILD_NAME: &str = "build";
+const ADDRESSES_NAME: &str = "addresses";
+const DEV_ADDRESSES_NAME: &str = "dev-addresses";
+const DEPENDENCY_NAME: &str = "dependencies";
+const DEV_DEPENDENCY_NAME: &str = "dev-dependencies";
+
+const KNOWN_NAMES: &[&str] = &[
+    PACKAGE_NAME,
+    BUILD_NAME,
+    ADDRESSES_NAME,
+    DEV_ADDRESSES_NAME,
+    DEPENDENCY_NAME,
+    DEV_DEPENDENCY_NAME,
+];
+
+const REQUIRED_FIELDS: &[&str] = &[PACKAGE_NAME];
+
+pub fn parse_move_manifest_from_file(path: &Path) -> Result<PM::SourceManifest> {
+    let file_contents = if path.is_file() {
+        std::fs::read_to_string(path)
+    } else {
+        std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))
+    }
+    .with_context(|| format!("Unable to find package manifest at {:?}", path))?;
+    parse_source_manifest(parse_move_manifest_string(file_contents)?)
+}
+
+pub fn parse_move_manifest_string(manifest_string: String) -> Result<TV> {
+    toml::from_str::<TV>(&manifest_string).context("Unable to parse Move package manifest")
+}
+
+pub fn parse_source_manifest(tval: TV) -> Result<PM::SourceManifest> {
+    match tval {
+        TV::Table(mut table) => {
+            check_for_required_field_names(&table, REQUIRED_FIELDS)
+                .context("Error parsing package manifest")?;
+            warn_if_unknown_field_names(&table, KNOWN_NAMES);
+            let addresses = table
+                .remove(ADDRESSES_NAME)
+                .map(parse_addresses)
+                .transpose()
+                .context("Error parsing '[addresses]' section of manifest")?;
+            let dev_address_assignments = table
+                .remove(DEV_ADDRESSES_NAME)
+                .map(parse_dev_addresses)
+                .transpose()
+                .context("Error parsing '[dev-addresses]' section of manifest")?;
+            let package = table
+                .remove(PACKAGE_NAME)
+                .map(parse_package_info)
+                .transpose()
+                .context("Error parsing '[package]' section of manifest")?
+                .unwrap();
+            let build = table
+                .remove(BUILD_NAME)
+                .map(parse_build_info)
+                .transpose()
+                .context("Error parsing '[build]' section of manifest")?;
+            let dependencies = table
+                .remove(DEPENDENCY_NAME)
+                .map(parse_dependencies)
+                .transpose()
+                .context("Error parsing '[dependencies]' section of manifest")?
+                .unwrap_or_default();
+            let dev_dependencies = table
+                .remove(DEV_DEPENDENCY_NAME)
+                .map(parse_dependencies)
+                .transpose()
+                .context("Error parsing '[dev-dependencies]' section of manifest")?
+                .unwrap_or_default();
+            Ok(PM::SourceManifest {
+                package,
+                addresses,
+                dev_address_assignments,
+                build,
+                dependencies,
+                dev_dependencies,
+            })
+        }
+        x => {
+            bail!(
+                "Malformed package manifest {}. Expected a table at top level, but encountered a {}",
+                x,
+                x.type_str()
+            )
+        }
+    }
+}
+
+pub fn parse_package_info(tval: TV) -> Result<PM::PackageInfo> {
+    match tval {
+        TV::Table(mut table) => {
+            check_for_required_field_names(&table, &["name", "version"])?;
+            let hook_names = package_hooks::custom_package_info_fields();
+            let known_names = ["name", "version", "authors", "license", "edition", "flavor"]
+                .into_iter()
+                .chain(hook_names.iter().map(|s| s.as_str()))
+                .collect::<Vec<_>>();
+            warn_if_unknown_field_names(&table, known_names.as_slice());
+            let name = table
+                .remove("name")
+                .ok_or_else(|| format_err!("'name' is a required field but was not found",))?;
+            let version = table
+                .remove("version")
+                .ok_or_else(|| format_err!("'version' is a required field but was not found",))?;
+            let name = name
+                .as_str()
+                .ok_or_else(|| format_err!("Package name must be a string"))?;
+            let name = PM::PackageName::from(name);
+            let version = parse_version(version)?;
+            let license = table.remove("license").map(|x| Symbol::from(x.to_string()));
+            let authors = match table.remove("authors") {
+                None => Vec::new(),
+                Some(arr) => {
+                    let unparsed_vec = arr
+                        .as_array()
+                        .ok_or_else(|| format_err!("Invalid author(s) list"))?;
+                    unparsed_vec
+                        .iter()
+                        .map(|tval| {
+                            tval.as_str()
+                                .map(|x| Symbol::from(x.to_string()))
+                                .ok_or_else(|| {
+                                    format_err!(
+                                        "Invalid author '{}' of type {} found. Expected a string.",
+                                        tval.to_string(),
+                                        tval.type_str()
+                                    )
+                                })
+                        })
+                        .collect::<Result<_>>()?
+                }
+            };
+            let edition = table
+                .remove("edition")
+                .map(|v| {
+                    let s = v
+                        .as_str()
+                        .ok_or_else(|| format_err!("'edition' must be a string"))?;
+                    Edition::from_str(s).map_err(|err| format_err!("Invalid 'edition'. {err}"))
+                })
+                .transpose()?;
+            let flavor = table
+                .remove("flavor")
+                .map(|v| {
+                    let s = v
+                        .as_str()
+                        .ok_or_else(|| format_err!("'flavor' must be a string"))?;
+                    Flavor::from_str(s).map_err(|err| format_err!("Invalid 'flavor'. {err}"))
+                })
+                .transpose()?;
+            // Turn the remaining entries into custom properties. For those which are not
+            // supported (also in the presence of hooks) we have warned above.
+            let mut custom_properties: BTreeMap<Symbol, String> = Default::default();
+            for (name, val) in table {
+                let val_str = val
+                    .as_str()
+                    .ok_or_else(|| format_err!("Field `{}` value must be a string", name))?;
+                custom_properties.insert(Symbol::from(name), val_str.to_owned());
+            }
+
+            Ok(PM::PackageInfo {
+                name,
+                version,
+                authors,
+                license,
+                custom_properties,
+                edition,
+                flavor,
+            })
+        }
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_dependencies(tval: TV) -> Result<PM::Dependencies> {
+    match tval {
+        TV::Table(table) => {
+            let mut deps = BTreeMap::new();
+            for (dep_name, dep) in table.into_iter() {
+                let dep_name_ident = PM::PackageName::from(dep_name.clone());
+                let dep = parse_dependency(&dep_name, dep)?;
+                deps.insert(dep_name_ident, dep);
+            }
+            Ok(deps)
+        }
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_build_info(tval: TV) -> Result<PM::BuildInfo> {
+    match tval {
+        TV::Table(mut table) => {
+            warn_if_unknown_field_names(&table, &["language_version", "arch"]);
+            Ok(PM::BuildInfo {
+                language_version: table
+                    .remove("language_version")
+                    .map(parse_version)
+                    .transpose()?,
+            })
+        }
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_addresses(tval: TV) -> Result<PM::AddressDeclarations> {
+    match tval {
+        TV::Table(table) => {
+            let mut addresses = BTreeMap::new();
+            for (addr_name, entry) in table.into_iter() {
+                let ident = PM::NamedAddress::from(addr_name);
+                match entry.as_str() {
+                    Some(entry_str) => {
+                        if entry_str == EMPTY_ADDR_STR {
+                            if addresses.insert(ident, None).is_some() {
+                                bail!("Duplicate address name '{}' found.", ident);
+                            }
+                        } else if addresses
+                            .insert(
+                                ident,
+                                Some(parse_address_literal(entry_str).context(format!(
+                                    "Invalid address '{}' encountered.",
+                                    entry_str
+                                ))?),
+                            )
+                            .is_some()
+                        {
+                            bail!("Duplicate address name '{}' found.", ident);
+                        }
+                    }
+                    None => bail!(
+                        "Invalid address name {} encountered. Expected a string but found a {}",
+                        entry,
+                        entry.type_str()
+                    ),
+                }
+            }
+            Ok(addresses)
+        }
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_dev_addresses(tval: TV) -> Result<PM::DevAddressDeclarations> {
+    match tval {
+        TV::Table(table) => {
+            let mut addresses = BTreeMap::new();
+            for (addr_name, entry) in table.into_iter() {
+                let ident = PM::NamedAddress::from(addr_name);
+                match entry.as_str() {
+                    Some(entry_str) => {
+                        if entry_str == EMPTY_ADDR_STR {
+                            bail!("Found uninstantiated named address '{}'. All addresses in the '{}' field must be instantiated.",
+                            ident, DEV_ADDRESSES_NAME);
+                        } else if addresses
+                            .insert(
+                                ident,
+                                parse_address_literal(entry_str).context(format!(
+                                    "Invalid address '{}' encountered.",
+                                    entry_str
+                                ))?,
+                            )
+                            .is_some()
+                        {
+                            bail!("Duplicate address name '{}' found.", ident);
+                        }
+                    }
+                    None => bail!(
+                        "Invalid address name {} encountered. Expected a string but found a {}",
+                        entry,
+                        entry.type_str()
+                    ),
+                }
+            }
+            Ok(addresses)
+        }
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+// Safely parses address for both the 0x and non prefixed hex format.
+fn parse_address_literal(address_str: &str) -> Result<AccountAddress, AccountAddressParseError> {
+    if !address_str.starts_with("0x") {
+        return AccountAddress::from_hex(address_str);
+    }
+    AccountAddress::from_hex_literal(address_str)
+}
+
+pub fn parse_dependency(dep_name: &str, mut tval: TV) -> Result<PM::Dependency> {
+    let Some(table) = tval.as_table_mut() else {
+        bail!("Malformed dependency {}", tval);
+    };
+
+    if let Some(resolver) = table.remove("resolver") {
+        let Some(resolver) = resolver.as_str().map(Symbol::from) else {
+            bail!("Resolver name is not a string")
+        };
+
+        // Not relevant except for the external resolver, but remove it to mark it as a
+        // recognised part of the manifest.
+        let _ = table.remove("packages");
+
+        // Any fields that are left are unknown
+        warn_if_unknown_field_names(table, &[]);
+
+        return Ok(PM::Dependency::External(resolver));
+    }
+
+    let custom_key_opt = &package_hooks::custom_dependency_key();
+
+    let subst = table
+        .remove("addr_subst")
+        .map(parse_substitution)
+        .transpose()?;
+    let version = table.remove("version").map(parse_version).transpose()?;
+    let digest = table.remove("digest").map(parse_digest).transpose()?;
+    let dep_override = table
+        .remove("override")
+        .map(parse_dep_override)
+        .transpose()?
+        .map_or(false, |o| o);
+
+    let kind = match (
+        table.remove("local"),
+        table.remove("subdir"),
+        table.remove("git"),
+        custom_key_opt.as_ref().and_then(|k| table.remove(k)),
+    ) {
+        (Some(local), subdir, None, None) => {
+            if subdir.is_some() {
+                bail!("'subdir' not supported for local dependencies");
+            }
+
+            let Some(local) = local.as_str().map(PathBuf::from) else {
+                bail!("Local source path not a string")
+            };
+
+            PM::DependencyKind::Local(
+                // with allow_cwd_parent set to true, it never fails
+                PM::normalize_path(local, true /* allow_cwd_parent */).unwrap(),
+            )
+        }
+
+        (None, subdir, Some(git_url), None) => {
+            let Some(git_rev) = table.remove("rev") else {
+                bail!("Git revision not supplied for dependency")
+            };
+
+            let Some(git_rev) = git_rev.as_str().map(Symbol::from) else {
+                bail!("Git revision not a string")
+            };
+
+            let Some(git_url) = git_url.as_str().map(Symbol::from) else {
+                bail!("Git URL not a string")
+            };
+
+            let subdir = match subdir {
+                None => PathBuf::new(),
+                Some(path) => path
+                    .as_str()
+                    .map(PathBuf::from)
+                    .ok_or_else(|| anyhow!("'subdir' not a string"))?,
+            };
+
+            PM::DependencyKind::Git(PM::GitInfo {
+                git_url,
+                git_rev,
+                subdir,
+            })
+        }
+
+        (None, subdir, None, Some(custom_key)) => {
+            let Some(package_address) = table.remove("address") else {
+                bail!("Address not supplied for 'node' dependency");
+            };
+
+            let Some(package_address) = package_address.as_str().map(Symbol::from) else {
+                bail!("Node address not a string")
+            };
+
+            let Some(node_url) = custom_key.as_str().map(Symbol::from) else {
+                bail!("Git URL not a string")
+            };
+
+            let subdir = match subdir {
+                None => PathBuf::new(),
+                Some(path) => path
+                    .as_str()
+                    .map(PathBuf::from)
+                    .ok_or_else(|| anyhow!("'subdir' not a string"))?,
+            };
+
+            let package_name = Symbol::from(dep_name);
+
+            PM::DependencyKind::Custom(PM::CustomDepInfo {
+                node_url,
+                package_address,
+                package_name,
+                subdir,
+            })
+        }
+
+        _ => {
+            let mut keys = vec!["'local'", "'git'", "'resolver'"];
+            let quoted_custom_key = custom_key_opt.as_ref().map(|k| format!("'{}'", k));
+            if let Some(k) = &quoted_custom_key {
+                keys.push(k.as_str())
+            }
+            bail!(
+                "must provide exactly one of {} for dependency.",
+                keys.join(" or ")
+            )
+        }
+    };
+
+    // Any fields that are left are unknown
+    warn_if_unknown_field_names(table, &[]);
+
+    Ok(PM::Dependency::Internal(PM::InternalDependency {
+        kind,
+        subst,
+        version,
+        digest,
+        dep_override,
+    }))
+}
+
+pub fn parse_substitution(tval: TV) -> Result<PM::Substitution> {
+    match tval {
+        TV::Table(table) => {
+            let mut subst = BTreeMap::new();
+            for (addr_name, tval) in table.into_iter() {
+                let addr_ident = PM::NamedAddress::from(addr_name.as_str());
+                match tval {
+                    TV::String(addr_or_name) => {
+                        if let Ok(addr) = AccountAddress::from_hex_literal(&addr_or_name) {
+                            subst.insert(addr_ident, PM::SubstOrRename::Assign(addr));
+                        } else {
+                            let rename_from = PM::NamedAddress::from(addr_or_name.as_str());
+                            subst.insert(addr_ident, PM::SubstOrRename::RenameFrom(rename_from));
+                        }
+                    }
+                    x => bail!(
+                        "Malformed dependency substitution {}. Expected a string, but encountered a {}",
+                        x,
+                        x.type_str()
+                    ),
+                }
+            }
+            Ok(subst)
+        }
+        x => bail!(
+            "Malformed dependency substitution {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+fn parse_version(tval: TV) -> Result<PM::Version> {
+    let version_str = tval.as_str().unwrap();
+    let version_parts = version_str.split('.').collect::<Vec<_>>();
+    if version_parts.len() != 3 {
+        bail!(
+            "Version is malformed. Versions must be of the form <u64>.<u64>.<u64>, but found '{}'",
+            version_str
+        );
+    }
+
+    Ok((
+        version_parts[0]
+            .parse::<u64>()
+            .context("Invalid major version")?,
+        version_parts[1]
+            .parse::<u64>()
+            .context("Invalid minor version")?,
+        version_parts[2]
+            .parse::<u64>()
+            .context("Invalid bugfix version")?,
+    ))
+}
+
+fn parse_digest(tval: TV) -> Result<PM::PackageDigest> {
+    let digest_str = tval
+        .as_str()
+        .ok_or_else(|| format_err!("Invalid package digest"))?;
+    Ok(PM::PackageDigest::from(digest_str))
+}
+
+fn parse_dep_override(tval: TV) -> Result<PM::DepOverride> {
+    if !tval.is_bool() {
+        bail!("Invalid dependency override value");
+    }
+    Ok(tval.as_bool().unwrap())
+}
+
+// check that only recognized names are provided at the top-level
+fn warn_if_unknown_field_names(table: &toml::map::Map<String, TV>, known_names: &[&str]) {
+    let mut unknown_names = BTreeSet::new();
+    for key in table.keys() {
+        if !known_names.contains(&key.as_str()) {
+            unknown_names.insert(key.to_string());
+        }
+    }
+
+    if !unknown_names.is_empty() {
+        eprintln!(
+            "Warning: unknown field name{} found. Expected one of [{}], but found {}",
+            if unknown_names.len() > 1 { "s" } else { "" },
+            known_names.join(", "),
+            unknown_names
+                .into_iter()
+                .map(|x| format!("'{}'", x))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+    }
+}
+
+fn check_for_required_field_names(
+    table: &toml::map::Map<String, TV>,
+    required_fields: &[&str],
+) -> Result<()> {
+    let mut missing_fields = BTreeSet::new();
+
+    for field_name in required_fields {
+        if !table.contains_key(*field_name) {
+            missing_fields.insert(field_name.to_string());
+        }
+    }
+
+    if !missing_fields.is_empty() {
+        bail!(
+            "Required field name{} {} not found",
+            if missing_fields.len() > 1 { "s" } else { "" },
+            missing_fields
+                .into_iter()
+                .map(|x| format!("'{}'", x))
+                .collect::<Vec<_>>()
+                .join(", "),
+        )
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/move-package/src/source_package/mod.rs b/vendors/move/crates/move-package/src/source_package/mod.rs
new file mode 100644
index 000000000..a3829eaea
--- /dev/null
+++ b/vendors/move/crates/move-package/src/source_package/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod layout;
+pub mod manifest_parser;
+pub mod parsed_manifest;
diff --git a/vendors/move/crates/move-package/src/source_package/parsed_manifest.rs b/vendors/move/crates/move-package/src/source_package/parsed_manifest.rs
new file mode 100644
index 000000000..fcd7c33a3
--- /dev/null
+++ b/vendors/move/crates/move-package/src/source_package/parsed_manifest.rs
@@ -0,0 +1,203 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+
+use move_compiler::editions::{Edition, Flavor};
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::symbol::Symbol;
+use std::{
+    collections::BTreeMap,
+    path::{Component, Path, PathBuf},
+};
+
+pub type NamedAddress = Symbol;
+pub type PackageName = Symbol;
+pub type FileName = Symbol;
+pub type PackageDigest = Symbol;
+pub type DepOverride = bool;
+
+pub type AddressDeclarations = BTreeMap<NamedAddress, Option<AccountAddress>>;
+pub type DevAddressDeclarations = BTreeMap<NamedAddress, AccountAddress>;
+pub type Version = (u64, u64, u64);
+pub type Dependencies = BTreeMap<PackageName, Dependency>;
+pub type Substitution = BTreeMap<NamedAddress, SubstOrRename>;
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct SourceManifest {
+    pub package: PackageInfo,
+    pub addresses: Option<AddressDeclarations>,
+    pub dev_address_assignments: Option<DevAddressDeclarations>,
+    pub build: Option<BuildInfo>,
+    pub dependencies: Dependencies,
+    pub dev_dependencies: Dependencies,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct PackageInfo {
+    pub name: PackageName,
+    pub version: Version,
+    pub authors: Vec<Symbol>,
+    pub license: Option<Symbol>,
+    pub edition: Option<Edition>,
+    pub flavor: Option<Flavor>,
+    pub custom_properties: BTreeMap<Symbol, String>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum Dependency {
+    /// Parametrised by the binary that will resolve packages for this dependency.
+    External(Symbol),
+    Internal(InternalDependency),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct InternalDependency {
+    pub kind: DependencyKind,
+    pub subst: Option<Substitution>,
+    pub version: Option<Version>,
+    pub digest: Option<PackageDigest>,
+    pub dep_override: DepOverride,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum DependencyKind {
+    Local(PathBuf),
+    Git(GitInfo),
+    Custom(CustomDepInfo),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct GitInfo {
+    /// The git clone url to download from
+    pub git_url: Symbol,
+    /// The git revision, AKA, a commit SHA
+    pub git_rev: Symbol,
+    /// The path under this repo where the move package can be found -- e.g.,
+    /// 'language/move-stdlib`
+    pub subdir: PathBuf,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct CustomDepInfo {
+    /// The url of the node to download from
+    pub node_url: Symbol,
+    /// The address where the package is published. The representation depends
+    /// on the registered node resolver.
+    pub package_address: Symbol,
+    /// The package's name (i.e. the dependency name).
+    pub package_name: Symbol,
+    /// The path under this repo where the move package can be found
+    pub subdir: PathBuf,
+}
+
+#[derive(Default, Debug, Clone, Eq, PartialEq)]
+pub struct BuildInfo {
+    pub language_version: Option<Version>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum SubstOrRename {
+    RenameFrom(NamedAddress),
+    Assign(AccountAddress),
+}
+
+impl DependencyKind {
+    /// Given a dependency `self` assumed to be defined relative to a `parent` dependency which can
+    /// itself be defined in terms of some grandparent dependency (not provided), update `self` to
+    /// be defined relative to its grandparent.
+    ///
+    /// Fails if the resulting dependency cannot be described relative to the grandparent, because
+    /// its path is not valid (does not point to a valid location in the filesystem for local
+    /// dependencies, or within the repository for remote dependencies).
+    pub fn reroot(&mut self, parent: &DependencyKind) -> Result<()> {
+        let mut parent = parent.clone();
+
+        match (&mut parent, &self) {
+            // If `self` is a git or custom dependency kind, it does not need to be re-rooted
+            // because its URI is already absolute. (i.e. the location of an absolute URI does not
+            // change if referenced relative to some other URI).
+            (_, DependencyKind::Git(_) | DependencyKind::Custom(_)) => return Ok(()),
+
+            (DependencyKind::Local(parent), DependencyKind::Local(subdir)) => {
+                parent.push(subdir);
+                *parent = normalize_path(&parent, /* allow_cwd_parent */ true)?;
+            }
+
+            (DependencyKind::Git(git), DependencyKind::Local(subdir)) => {
+                git.subdir.push(subdir);
+                git.subdir = normalize_path(&git.subdir, /* allow_cwd_parent */ false)?;
+            }
+
+            (DependencyKind::Custom(custom), DependencyKind::Local(subdir)) => {
+                custom.subdir.push(subdir);
+                custom.subdir = normalize_path(&custom.subdir, /* allow_cwd_parent */ false)?;
+            }
+        };
+
+        *self = parent;
+        Ok(())
+    }
+}
+
+/// Default `DependencyKind` is the one that acts as the left and right identity to
+/// `DependencyKind::rerooted` (modulo path normalization).
+impl Default for DependencyKind {
+    fn default() -> Self {
+        DependencyKind::Local(PathBuf::new())
+    }
+}
+
+/// Normalize the representation of `path` by eliminating redundant `.` components and applying `..`
+/// component.  Does not access the filesystem (e.g. to resolve symlinks or test for file
+/// existence), unlike `std::fs::canonicalize`.
+///
+/// Fails if the normalized path attempts to access the parent of a root directory or volume prefix,
+/// or is prefixed by accesses to parent directories when `allow_cwd_parent` is false.
+///
+/// Returns the normalized path on success.
+pub fn normalize_path(path: impl AsRef<Path>, allow_cwd_parent: bool) -> Result<PathBuf> {
+    use Component::*;
+
+    let mut stack = Vec::new();
+    for component in path.as_ref().components() {
+        match component {
+            // Components that contribute to the path as-is.
+            verbatim @ (Prefix(_) | RootDir | Normal(_)) => stack.push(verbatim),
+
+            // Equivalent of a `.` path component -- can be ignored.
+            CurDir => { /* nop */ }
+
+            // Going up in the directory hierarchy, which may fail if that's not possible.
+            ParentDir => match stack.last() {
+                None | Some(ParentDir) => {
+                    stack.push(ParentDir);
+                }
+
+                Some(Normal(_)) => {
+                    stack.pop();
+                }
+
+                Some(CurDir) => {
+                    unreachable!("Component::CurDir never added to the stack");
+                }
+
+                Some(RootDir | Prefix(_)) => bail!(
+                    "Invalid path accessing parent of root directory: {}",
+                    path.as_ref().to_string_lossy(),
+                ),
+            },
+        }
+    }
+
+    let normalized: PathBuf = stack.iter().collect();
+    if !allow_cwd_parent && stack.first() == Some(&ParentDir) {
+        bail!(
+            "Path cannot access parent of current directory: {}",
+            normalized.to_string_lossy()
+        );
+    }
+
+    Ok(normalized)
+}
diff --git a/vendors/move/crates/move-package/tests/.gitattributes b/vendors/move/crates/move-package/tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/move-package/tests/package_hash_skips_non_move_files.rs b/vendors/move/crates/move-package/tests/package_hash_skips_non_move_files.rs
new file mode 100644
index 000000000..384bb0cf5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/package_hash_skips_non_move_files.rs
@@ -0,0 +1,45 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_package::BuildConfig;
+use std::{io::Write, path::Path};
+use tempfile::tempdir;
+
+#[test]
+fn package_hash_skips_non_move_files() {
+    let path = Path::new("tests/test_sources/dep_good_digest");
+
+    // resolution graph diagnostics are only needed for CLI commands so ignore them in both cases by
+    // passing a vector as the writer
+
+    let pkg1 = BuildConfig {
+        install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+        ..Default::default()
+    }
+    .resolution_graph_for_package(path, &mut Vec::new())
+    .unwrap();
+
+    let dummy_path = path.join("deps_only/other_dep/sources/dummy_text");
+    std::fs::File::create(&dummy_path)
+        .unwrap()
+        .write_all("hello".as_bytes())
+        .unwrap();
+
+    let pkg2 = BuildConfig {
+        install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+        ..Default::default()
+    }
+    .resolution_graph_for_package(path, &mut Vec::new())
+    .unwrap();
+
+    std::fs::remove_file(&dummy_path).unwrap();
+    for (pkg, res_pkg) in pkg1.package_table {
+        let other_res_pkg = pkg2.get_package(pkg);
+        assert_eq!(
+            res_pkg.source_digest, other_res_pkg.source_digest,
+            "source digests differ for {}",
+            pkg
+        )
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_additional_addresses.rs b/vendors/move/crates/move-package/tests/test_additional_addresses.rs
new file mode 100644
index 000000000..7a611c956
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_additional_addresses.rs
@@ -0,0 +1,162 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::account_address::AccountAddress;
+use move_package::{
+    resolution::{dependency_graph as DG, resolution_graph as RG},
+    source_package::{layout::SourcePackageLayout, parsed_manifest as PM},
+    BuildConfig,
+};
+use std::{collections::BTreeMap, path::PathBuf};
+use tempfile::tempdir;
+
+#[test]
+fn test_additonal_addresses() {
+    let path: PathBuf = [
+        "tests",
+        "test_sources",
+        "basic_no_deps_address_not_assigned_with_dev_assignment",
+    ]
+    .into_iter()
+    .collect();
+
+    let manifest_string =
+        std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap();
+
+    let mut dep_graph_builder = DG::DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempdir().unwrap().path().to_path_buf(),
+    );
+    let (dg, _) = dep_graph_builder
+        .get_graph(
+            &PM::DependencyKind::default(),
+            path,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .unwrap();
+
+    let DG::DependencyGraphBuilder {
+        mut dependency_cache,
+        mut progress_output,
+        ..
+    } = dep_graph_builder;
+
+    assert!(RG::ResolvedGraph::resolve(
+        dg.clone(),
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses: BTreeMap::from([(
+                "A".to_string(),
+                AccountAddress::from_hex_literal("0x1").unwrap()
+            )]),
+            ..Default::default()
+        },
+        &mut dependency_cache,
+        &mut progress_output,
+    )
+    .is_ok());
+
+    assert!(RG::ResolvedGraph::resolve(
+        dg,
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            ..Default::default()
+        },
+        &mut dependency_cache,
+        &mut progress_output,
+    )
+    .is_err());
+}
+
+#[test]
+fn test_additonal_addresses_already_assigned_same_value() {
+    let path: PathBuf = ["tests", "test_sources", "basic_no_deps_address_assigned"]
+        .into_iter()
+        .collect();
+
+    let manifest_string =
+        std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap();
+
+    let mut dep_graph_builder = DG::DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempdir().unwrap().path().to_path_buf(),
+    );
+    let (dg, _) = dep_graph_builder
+        .get_graph(
+            &PM::DependencyKind::default(),
+            path,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .unwrap();
+
+    let DG::DependencyGraphBuilder {
+        mut dependency_cache,
+        mut progress_output,
+        ..
+    } = dep_graph_builder;
+
+    assert!(RG::ResolvedGraph::resolve(
+        dg,
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses: BTreeMap::from([(
+                "A".to_string(),
+                AccountAddress::from_hex_literal("0x0").unwrap()
+            )]),
+            ..Default::default()
+        },
+        &mut dependency_cache,
+        &mut progress_output,
+    )
+    .is_ok());
+}
+
+#[test]
+fn test_additonal_addresses_already_assigned_different_value() {
+    let path: PathBuf = ["tests", "test_sources", "basic_no_deps_address_assigned"]
+        .into_iter()
+        .collect();
+
+    let manifest_string =
+        std::fs::read_to_string(&path.join(SourcePackageLayout::Manifest.path())).unwrap();
+
+    let mut dep_graph_builder = DG::DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempdir().unwrap().path().to_path_buf(),
+    );
+    let (dg, _) = dep_graph_builder
+        .get_graph(
+            &PM::DependencyKind::default(),
+            path,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .unwrap();
+
+    let DG::DependencyGraphBuilder {
+        mut dependency_cache,
+        mut progress_output,
+        ..
+    } = dep_graph_builder;
+
+    assert!(RG::ResolvedGraph::resolve(
+        dg,
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses: BTreeMap::from([(
+                "A".to_string(),
+                AccountAddress::from_hex_literal("0x1").unwrap()
+            )]),
+            ..Default::default()
+        },
+        &mut dependency_cache,
+        &mut progress_output,
+    )
+    .is_err());
+}
diff --git a/vendors/move/crates/move-package/tests/test_dependency_graph.rs b/vendors/move/crates/move-package/tests/test_dependency_graph.rs
new file mode 100644
index 000000000..f17f4ed77
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_dependency_graph.rs
@@ -0,0 +1,649 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs::{self, File},
+    io::Write,
+    path::PathBuf,
+};
+
+use move_package::{
+    lock_file::LockFile,
+    resolution::dependency_graph::{
+        DependencyGraph, DependencyGraphBuilder, DependencyGraphInfo, DependencyMode,
+    },
+    source_package::{
+        layout::SourcePackageLayout,
+        parsed_manifest::{Dependency, DependencyKind, InternalDependency},
+    },
+};
+use move_symbol_pool::Symbol;
+
+macro_rules! assert_error_contains {
+    ($err:expr, $sub:expr) => {
+        let err = $err.to_string();
+        let sub = $sub;
+        assert!(err.contains(sub), "{}", err);
+    };
+}
+
+#[test]
+fn no_dep_graph() {
+    let pkg = no_dep_test_package();
+
+    let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path()))
+        .expect("Loading manifest");
+    let mut dep_graph_builder = DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempfile::tempdir().unwrap().path().to_path_buf(),
+    );
+    let (graph, _) = dep_graph_builder
+        .get_graph(
+            &DependencyKind::default(),
+            pkg,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .expect("Creating DependencyGraph");
+
+    assert!(
+        graph.package_graph.contains_node(graph.root_package),
+        "A graph for a package with no dependencies should still contain the root package",
+    );
+
+    assert_eq!(graph.topological_order(), vec![graph.root_package]);
+}
+
+#[test]
+fn no_dep_graph_from_lock() {
+    let pkg = no_dep_test_package();
+
+    let snapshot = pkg.join("Move.locked");
+    let graph = DependencyGraph::read_from_lock(
+        pkg,
+        Symbol::from("Root"),
+        &mut File::open(&snapshot).expect("Opening snapshot"),
+        None,
+    )
+    .expect("Reading DependencyGraph");
+
+    assert!(
+        graph.package_graph.contains_node(graph.root_package),
+        "A graph for a package with no dependencies should still contain the root package",
+    );
+
+    assert_eq!(graph.topological_order(), vec![graph.root_package]);
+}
+
+#[test]
+fn lock_file_roundtrip() {
+    let tmp = tempfile::tempdir().unwrap();
+    let pkg = one_dep_test_package();
+
+    let snapshot = pkg.join("Move.locked");
+    let commit = tmp.path().join("Move.lock");
+
+    let graph = DependencyGraph::read_from_lock(
+        pkg,
+        Symbol::from("Root"),
+        &mut File::open(&snapshot).expect("Opening snapshot"),
+        None,
+    )
+    .expect("Reading DependencyGraph");
+
+    let lock = graph
+        .write_to_lock(tmp.path().to_path_buf())
+        .expect("Writing DependencyGraph");
+
+    lock.commit(&commit).expect("Committing lock file");
+
+    let expect = fs::read_to_string(&snapshot).expect("Reading snapshot");
+    let actual = fs::read_to_string(commit).expect("Reading committed lock");
+
+    assert_eq!(
+        expect, actual,
+        "LockFile -> DependencyGraph -> LockFile roundtrip"
+    );
+}
+
+#[test]
+fn lock_file_missing_dependency() {
+    let tmp = tempfile::tempdir().unwrap();
+    let pkg = one_dep_test_package();
+
+    let commit = tmp.path().join("Move.lock");
+    let lock = LockFile::new(
+        pkg.clone(),
+        /* manifest_digest */ "42".to_string(),
+        /* deps_digest */ "7".to_string(),
+    )
+    .expect("Creating new lock file");
+
+    // Write a reference to a dependency that there isn't package information for.
+    writeln!(&*lock, r#"dependencies = [{{ name = "OtherDep" }}]"#).unwrap();
+    lock.commit(&commit).expect("Writing partial lock file");
+
+    let Err(err) = DependencyGraph::read_from_lock(
+        pkg,
+        Symbol::from("Root"),
+        &mut File::open(&commit).expect("Opening empty lock file"),
+        None,
+    ) else {
+        panic!("Expected reading dependencies to fail.");
+    };
+
+    let message = err.to_string();
+    assert!(
+        message.contains("No source found for package OtherDep, depended on by: Root"),
+        "{message}",
+    );
+}
+
+#[test]
+fn always_deps() {
+    let pkg = dev_dep_test_package();
+
+    let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path()))
+        .expect("Loading manifest");
+    let mut dep_graph_builder = DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempfile::tempdir().unwrap().path().to_path_buf(),
+    );
+    let (graph, _) = dep_graph_builder
+        .get_graph(
+            &DependencyKind::default(),
+            pkg,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .expect("Creating DependencyGraph");
+
+    assert_eq!(
+        graph.always_deps,
+        BTreeSet::from([
+            Symbol::from("Root"),
+            Symbol::from("A"),
+            Symbol::from("B"),
+            Symbol::from("C"),
+        ]),
+    );
+}
+
+#[test]
+fn always_deps_from_lock() {
+    let pkg = dev_dep_test_package();
+    let snapshot = pkg.join("Move.locked");
+
+    let graph = DependencyGraph::read_from_lock(
+        pkg,
+        Symbol::from("Root"),
+        &mut File::open(&snapshot).expect("Opening snapshot"),
+        None,
+    )
+    .expect("Creating DependencyGraph");
+
+    assert_eq!(
+        graph.always_deps,
+        BTreeSet::from([
+            Symbol::from("Root"),
+            Symbol::from("A"),
+            Symbol::from("B"),
+            Symbol::from("C"),
+        ]),
+    );
+}
+
+#[test]
+fn merge_simple() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut A_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    // Test only -- clear always deps because usually `merge` is used while the graph is being
+    // built, not after it has been entirely read.
+    outer.always_deps.clear();
+
+    let inner = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("A"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner");
+
+    let dep_graphs = BTreeMap::from([(
+        Symbol::from("A"),
+        DependencyGraphInfo::new(inner, DependencyMode::Always, false, false),
+    )]);
+    let dependencies = &BTreeMap::from([(
+        Symbol::from("A"),
+        Dependency::Internal(InternalDependency {
+            kind: DependencyKind::default(),
+            subst: None,
+            version: None,
+            digest: None,
+            dep_override: false,
+        }),
+    )]);
+    assert!(outer
+        .merge(
+            dep_graphs,
+            &DependencyKind::default(),
+            dependencies,
+            &BTreeMap::new()
+        )
+        .is_ok(),);
+    assert_eq!(
+        outer.topological_order(),
+        vec![Symbol::from("Root"), Symbol::from("A")],
+    );
+}
+#[test]
+fn merge_into_root() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    // Test only -- clear always deps because usually `merge` is used while the graph is being
+    // built, not after it has been entirely read.
+    outer.always_deps.clear();
+
+    // The `inner` graph describes more dependencies for `outer`'s root package.
+    let inner = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut A_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner");
+
+    let dep_graphs = BTreeMap::from([(
+        Symbol::from("A"),
+        DependencyGraphInfo::new(inner, DependencyMode::Always, false, false),
+    )]);
+    let dependencies = &BTreeMap::from([(
+        Symbol::from("A"),
+        Dependency::Internal(InternalDependency {
+            kind: DependencyKind::Local("A".into()),
+            subst: None,
+            version: None,
+            digest: None,
+            dep_override: false,
+        }),
+    )]);
+    assert!(outer
+        .merge(
+            dep_graphs,
+            &DependencyKind::default(),
+            dependencies,
+            &BTreeMap::new()
+        )
+        .is_ok());
+
+    assert_eq!(
+        outer.topological_order(),
+        vec![Symbol::from("Root"), Symbol::from("A")],
+    );
+}
+
+#[test]
+fn merge_detached() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    // Test only -- clear always deps because usually `merge` is used while the graph is being
+    // built, not after it has been entirely read.
+    outer.always_deps.clear();
+
+    let inner = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("OtherDep"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner");
+
+    let dep_graphs = BTreeMap::from([(
+        Symbol::from("OtherDep"),
+        DependencyGraphInfo::new(inner, DependencyMode::Always, false, false),
+    )]);
+    let Err(err) = outer.merge(
+        dep_graphs,
+        &DependencyKind::default(),
+        &BTreeMap::new(),
+        &BTreeMap::new(),
+    ) else {
+        panic!("Inner's root is not part of outer's graph, so this should fail");
+    };
+
+    assert_error_contains!(err, "Can't merge dependencies for 'OtherDep'");
+}
+
+#[test]
+fn merge_after_calculating_always_deps() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut A_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    let inner = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("A"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner");
+
+    let dep_graphs = BTreeMap::from([(
+        Symbol::from("A"),
+        DependencyGraphInfo::new(inner, DependencyMode::Always, false, false),
+    )]);
+    let Err(err) = outer.merge(
+        dep_graphs,
+        &DependencyKind::default(),
+        &BTreeMap::new(),
+        &BTreeMap::new(),
+    ) else {
+        panic!("Outer's always deps have already been calculated so this should fail");
+    };
+
+    assert_error_contains!(err, "after calculating its 'always' dependencies");
+}
+
+#[test]
+fn merge_overlapping() {
+    let tmp = tempfile::tempdir().unwrap();
+
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    // Test only -- clear always deps because usually `merge` is used while the graph is being
+    // built, not after it has been entirely read.
+    outer.always_deps.clear();
+
+    let inner1 = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("C"),
+        &mut AB_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner1");
+
+    let inner2 = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("C"),
+        &mut A_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner2");
+
+    let dep_graphs = BTreeMap::from([
+        (
+            Symbol::from("B"),
+            DependencyGraphInfo::new(inner1, DependencyMode::Always, false, false),
+        ),
+        (
+            Symbol::from("C"),
+            DependencyGraphInfo::new(inner2, DependencyMode::Always, false, false),
+        ),
+    ]);
+    let dependencies = &BTreeMap::from([
+        (
+            Symbol::from("B"),
+            Dependency::Internal(InternalDependency {
+                kind: DependencyKind::Local("B".into()),
+                subst: None,
+                version: None,
+                digest: None,
+                dep_override: false,
+            }),
+        ),
+        (
+            Symbol::from("C"),
+            Dependency::Internal(InternalDependency {
+                kind: DependencyKind::default(),
+                subst: None,
+                version: None,
+                digest: None,
+                dep_override: false,
+            }),
+        ),
+    ]);
+    assert!(outer
+        .merge(
+            dep_graphs,
+            &DependencyKind::default(),
+            dependencies,
+            &BTreeMap::new()
+        )
+        .is_ok());
+}
+
+#[test]
+fn merge_overlapping_different_deps() {
+    let tmp = tempfile::tempdir().unwrap();
+
+    let mut outer = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("Root"),
+        &mut EMPTY_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading outer");
+
+    // Test only -- clear always deps because usually `merge` is used while the graph is being
+    // built, not after it has been entirely read.
+    outer.always_deps.clear();
+
+    let inner1 = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("C"),
+        &mut A_DEP_B_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner1");
+
+    let inner2 = DependencyGraph::read_from_lock(
+        tmp.path().to_path_buf(),
+        Symbol::from("C"),
+        &mut A_LOCK.as_bytes(),
+        None,
+    )
+    .expect("Reading inner2");
+
+    let dep_graphs = BTreeMap::from([
+        (
+            Symbol::from("B"),
+            DependencyGraphInfo::new(inner1, DependencyMode::Always, false, false),
+        ),
+        (
+            Symbol::from("C"),
+            DependencyGraphInfo::new(inner2, DependencyMode::Always, false, false),
+        ),
+    ]);
+    let dependencies = &BTreeMap::from([
+        (
+            Symbol::from("B"),
+            Dependency::Internal(InternalDependency {
+                kind: DependencyKind::default(),
+                subst: None,
+                version: None,
+                digest: None,
+                dep_override: false,
+            }),
+        ),
+        (
+            Symbol::from("C"),
+            Dependency::Internal(InternalDependency {
+                kind: DependencyKind::default(),
+                subst: None,
+                version: None,
+                digest: None,
+                dep_override: false,
+            }),
+        ),
+    ]);
+    let Err(err) = outer.merge(
+        dep_graphs,
+        &DependencyKind::default(),
+        dependencies,
+        &BTreeMap::new(),
+    ) else {
+        panic!("Outer and inner mention package A which has different dependencies in both.");
+    };
+
+    assert_error_contains!(err, "conflicting dependencies found");
+}
+
+#[test]
+fn immediate_dependencies() {
+    let pkg = dev_dep_test_package();
+
+    let manifest_string = std::fs::read_to_string(&pkg.join(SourcePackageLayout::Manifest.path()))
+        .expect("Loading manifest");
+    let mut dep_graph_builder = DependencyGraphBuilder::new(
+        /* skip_fetch_latest_git_deps */ true,
+        std::io::sink(),
+        tempfile::tempdir().unwrap().path().to_path_buf(),
+    );
+    let (graph, _) = dep_graph_builder
+        .get_graph(
+            &DependencyKind::default(),
+            pkg,
+            manifest_string,
+            /* lock_string_opt */ None,
+        )
+        .expect("Creating DependencyGraph");
+
+    let r = Symbol::from("Root");
+    let a = Symbol::from("A");
+    let b = Symbol::from("B");
+    let c = Symbol::from("C");
+    let d = Symbol::from("D");
+
+    let deps = |pkg, mode| {
+        graph
+            .immediate_dependencies(pkg, mode)
+            .map(|(pkg, _, _)| pkg)
+            .collect::<BTreeSet<_>>()
+    };
+
+    assert_eq!(deps(r, DependencyMode::Always), BTreeSet::from([a, c]));
+    assert_eq!(deps(a, DependencyMode::Always), BTreeSet::from([b]));
+    assert_eq!(deps(b, DependencyMode::Always), BTreeSet::from([]));
+    assert_eq!(deps(c, DependencyMode::Always), BTreeSet::from([]));
+    assert_eq!(deps(d, DependencyMode::Always), BTreeSet::from([]));
+
+    assert_eq!(deps(r, DependencyMode::DevOnly), BTreeSet::from([a, b, c]));
+    assert_eq!(deps(a, DependencyMode::DevOnly), BTreeSet::from([b, d]));
+    assert_eq!(deps(b, DependencyMode::DevOnly), BTreeSet::from([c]));
+    assert_eq!(deps(c, DependencyMode::DevOnly), BTreeSet::from([]));
+    assert_eq!(deps(d, DependencyMode::DevOnly), BTreeSet::from([]));
+}
+
+fn no_dep_test_package() -> PathBuf {
+    [".", "tests", "test_sources", "basic_no_deps"]
+        .into_iter()
+        .collect()
+}
+
+fn one_dep_test_package() -> PathBuf {
+    [".", "tests", "test_sources", "one_dep"]
+        .into_iter()
+        .collect()
+}
+
+fn dev_dep_test_package() -> PathBuf {
+    [".", "tests", "test_sources", "dep_dev_dep_diamond"]
+        .into_iter()
+        .collect()
+}
+
+const EMPTY_LOCK: &str = r#"
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = ""
+"#;
+
+const A_LOCK: &str = r#"
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+dependencies = [
+    { name = "A" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "./A" }
+"#;
+
+const AB_LOCK: &str = r#"
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+dependencies = [
+    { name = "A" },
+    { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "./A" }
+
+[[move.package]]
+name = "B"
+source = { local = "./B" }
+"#;
+
+const A_DEP_B_LOCK: &str = r#"
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+dependencies = [
+    { name = "A" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "./A" }
+dependencies = [
+    { name = "B" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "./B" }
+"#;
diff --git a/vendors/move/crates/move-package/tests/test_lock_file.rs b/vendors/move/crates/move-package/tests/test_lock_file.rs
new file mode 100644
index 000000000..169371dc5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_lock_file.rs
@@ -0,0 +1,75 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    fs::{self, File},
+    io::{self, Read, Write},
+    path::PathBuf,
+};
+use tempfile::TempDir;
+
+use move_package::lock_file::LockFile;
+
+#[test]
+fn commit() {
+    let pkg = create_test_package().unwrap();
+    let lock_path = pkg.path().join("Move.lock");
+
+    {
+        let mut lock = LockFile::new(
+            pkg.path().to_path_buf(),
+            /* manifest_digest */ "42".to_string(),
+            /* deps_digest */ "7".to_string(),
+        )
+        .unwrap();
+        writeln!(lock, "# Write and commit").unwrap();
+        lock.commit(&lock_path).unwrap();
+    }
+
+    assert!(lock_path.is_file());
+
+    let lock_contents = {
+        let mut lock_file = File::open(lock_path).unwrap();
+        let mut buf = String::new();
+        lock_file.read_to_string(&mut buf).unwrap();
+        buf
+    };
+
+    // Check that the content written into the `LockFile` instance above can be found at the path
+    // that that lock file was committed to (indicating that the commit actually happened).
+    assert!(
+        lock_contents.ends_with("# Write and commit\n"),
+        "Lock file doesn't have expected content:\n{}",
+        lock_contents,
+    );
+}
+
+#[test]
+fn discard() {
+    let pkg = create_test_package().unwrap();
+
+    {
+        let mut lock = LockFile::new(
+            pkg.path().to_path_buf(),
+            /* manifest_digest */ "42".to_string(),
+            /* deps_digest */ "7".to_string(),
+        )
+        .unwrap();
+        writeln!(lock, "# Write but don't commit").unwrap();
+    }
+
+    assert!(!pkg.path().join("Move.lock").is_file());
+}
+
+/// Create a simple Move package with no sources (just a manifest and an output directory) in a
+/// temporary directory, and return it.
+fn create_test_package() -> io::Result<TempDir> {
+    let dir = tempfile::tempdir()?;
+
+    let toml_path: PathBuf = [".", "tests", "test_sources", "basic_no_deps", "Move.toml"]
+        .into_iter()
+        .collect();
+
+    fs::copy(toml_path, dir.path().join("Move.toml"))?;
+    Ok(dir)
+}
diff --git a/vendors/move/crates/move-package/tests/test_removal_second_compilation.rs b/vendors/move/crates/move-package/tests/test_removal_second_compilation.rs
new file mode 100644
index 000000000..5e6456151
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_removal_second_compilation.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_package::{compilation::package_layout::CompiledPackageLayout, BuildConfig};
+use std::path::Path;
+use tempfile::tempdir;
+
+#[test]
+fn test_that_second_build_artifacts_removed() {
+    let path = Path::new("tests/test_sources/basic_no_deps_test_mode");
+    let dir = tempdir().unwrap().path().to_path_buf();
+
+    BuildConfig {
+        dev_mode: true,
+        test_mode: true,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    let expected_stdlib_path = dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join(CompiledPackageLayout::Dependencies.path())
+        .join("MoveStdlib");
+    assert!(expected_stdlib_path.is_dir());
+
+    assert!(dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+
+    // Now make sure the MoveStdlib still exists, but that the test-only code is removed
+    BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    // The MoveStdlib dep should still exist, but the MTest module should go away
+    assert!(expected_stdlib_path.is_dir());
+    assert!(!dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+
+    BuildConfig {
+        dev_mode: false,
+        test_mode: false,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    // The MoveStdlib dep should no longer exist, and the MTest module shouldn't exist either
+    assert!(!expected_stdlib_path.is_dir());
+    assert!(!dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+}
diff --git a/vendors/move/crates/move-package/tests/test_resolving_table.rs b/vendors/move/crates/move-package/tests/test_resolving_table.rs
new file mode 100644
index 000000000..dbc943834
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_resolving_table.rs
@@ -0,0 +1,140 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashSet;
+
+use move_core_types::account_address::AccountAddress;
+use move_package::{
+    resolution::resolving_table::ResolvingTable,
+    source_package::parsed_manifest::{NamedAddress, PackageName},
+};
+
+#[test]
+fn definitions() {
+    let mut table = ResolvingTable::new();
+
+    let p0 = PackageName::from("p0");
+    let n0 = NamedAddress::from("n0");
+    let n1 = NamedAddress::from("n1");
+    let a0 = AccountAddress::random();
+    let a1 = AccountAddress::random();
+    assert_ne!(a0, a1);
+
+    table.define((p0, n0), Some(a0)).expect("Definition");
+    table.define((p0, n1), None).expect("Declaration");
+    table.define((p0, n0), Some(a0)).expect("Redefinition");
+    table.define((p0, n1), Some(a1)).expect("Prev declaration");
+
+    assert!(
+        table.define((p0, n0), Some(a1)).is_err(),
+        "Conflicting definition",
+    );
+
+    assert_eq!(Some(&a0), table.get((p0, n0)));
+    assert_eq!(Some(&a1), table.get((p0, n1)));
+}
+
+#[test]
+fn unification() {
+    let mut table = ResolvingTable::new();
+
+    let p0 = PackageName::from("p0");
+    let n0 = NamedAddress::from("n0");
+    let n1 = NamedAddress::from("n1");
+    let n2 = NamedAddress::from("n2");
+    let n3 = NamedAddress::from("n3");
+    let n4 = NamedAddress::from("n4");
+    let a0 = AccountAddress::random();
+    let a1 = AccountAddress::random();
+    assert_ne!(a0, a1);
+
+    table.define((p0, n0), Some(a0)).expect("Definition");
+    table.unify((p0, n0), (p0, n1)).expect("Unify fresh");
+
+    assert_eq!(Some(&a0), table.get((p0, n0)));
+    assert_eq!(Some(&a0), table.get((p0, n1)));
+
+    table.define((p0, n2), None).expect("Declaration");
+    table.unify((p0, n2), (p0, n3)).expect("Unify decl. 1");
+    table.unify((p0, n3), (p0, n4)).expect("Unify decl. 2");
+    table.define((p0, n4), Some(a1)).expect("Assign to chain");
+
+    assert_eq!(Some(&a1), table.get((p0, n2)));
+    assert_eq!(Some(&a1), table.get((p0, n3)));
+    assert_eq!(Some(&a1), table.get((p0, n4)));
+
+    table
+        .unify((p0, n2), (p0, n3))
+        .expect("Unify already unified");
+
+    assert!(
+        table.unify((p0, n3), (p0, n1)).is_err(),
+        "Conflicting definitions either side of unification",
+    );
+}
+
+#[test]
+fn bindings() {
+    let mut table = ResolvingTable::new();
+
+    let p0 = PackageName::from("p0");
+    let p1 = PackageName::from("p1");
+    let n0 = NamedAddress::from("n0");
+    let n1 = NamedAddress::from("n1");
+    let n2 = NamedAddress::from("n2");
+    let a0 = AccountAddress::random();
+    let a1 = AccountAddress::random();
+
+    table.define((p0, n0), Some(a0)).unwrap();
+    table.define((p0, n1), None).unwrap();
+    table.define((p1, n2), Some(a1)).unwrap();
+
+    assert_eq!(
+        table.bindings(p0).collect::<HashSet<_>>(),
+        HashSet::from([(n0, &Some(a0)), (n1, &None)]),
+        "Bindings include unassigned addresses",
+    );
+
+    assert_eq!(
+        table.bindings(p1).collect::<HashSet<_>>(),
+        HashSet::from([(n2, &Some(a1))]),
+    );
+
+    table.unify((p0, n1), (p1, n2)).unwrap();
+    table.unify((p0, n0), (p1, n0)).unwrap();
+
+    assert_eq!(
+        table.bindings(p0).collect::<HashSet<_>>(),
+        HashSet::from([(n0, &Some(a0)), (n1, &Some(a1))]),
+        "Bindings updated post unification",
+    );
+
+    assert_eq!(
+        table.bindings(p1).collect::<HashSet<_>>(),
+        HashSet::from([(n2, &Some(a1)), (n0, &Some(a0))]),
+        "Bindings updated post unification",
+    );
+}
+
+#[test]
+fn contains() {
+    let mut table = ResolvingTable::new();
+
+    let p0 = PackageName::from("p0");
+    let p1 = PackageName::from("p1");
+    let n0 = NamedAddress::from("n0");
+    let n1 = NamedAddress::from("n1");
+    let a0 = AccountAddress::random();
+
+    table.define((p0, p1), Some(a0)).unwrap();
+    table.define((p0, n0), None).unwrap();
+
+    // An assignment with a binding counts as contained.
+    assert!(table.contains((p0, p1)));
+
+    // So does an assignment without a binding.
+    assert!(table.contains((p0, n0)));
+
+    // But not a completely fresh address.
+    assert!(!table.contains((p0, n1)));
+}
diff --git a/vendors/move/crates/move-package/tests/test_runner.rs b/vendors/move/crates/move-package/tests/test_runner.rs
new file mode 100644
index 000000000..db3c30f51
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_runner.rs
@@ -0,0 +1,225 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, bail};
+use move_command_line_common::testing::{
+    add_update_baseline_fix, format_diff, read_env_update_baseline,
+};
+use move_package::{
+    compilation::{
+        build_plan::BuildPlan, compiled_package::CompiledPackageInfo, model_builder::ModelBuilder,
+    },
+    package_hooks,
+    package_hooks::PackageHooks,
+    resolution::resolution_graph::Package,
+    source_package::parsed_manifest::{CustomDepInfo, PackageDigest},
+    BuildConfig, ModelConfig,
+};
+use move_symbol_pool::Symbol;
+use std::{
+    ffi::OsStr,
+    fs,
+    path::{Path, PathBuf},
+};
+use tempfile::{tempdir, TempDir};
+
+const EXTENSIONS: &[&str] = &[
+    "progress",
+    "resolved",
+    "locked",
+    "notlocked",
+    "compiled",
+    "modeled",
+];
+
+pub fn run_test(path: &Path) -> datatest_stable::Result<()> {
+    if path.iter().any(|part| part == "deps_only") {
+        return Ok(());
+    }
+
+    let mut tests = EXTENSIONS
+        .iter()
+        .filter_map(|kind| Test::from_path_with_kind(path, kind).transpose())
+        .peekable();
+
+    if tests.peek().is_none() {
+        return Err(anyhow!(
+            "No snapshot file found for {:?}, please add a file with the same basename and one \
+             of the following extensions: {:#?}\n\n\
+             You probably want to re-run with `env UPDATE_BASELINE=1` after adding this file.",
+            path,
+            EXTENSIONS,
+        )
+        .into());
+    }
+
+    for test in tests {
+        test?.run()?
+    }
+
+    Ok(())
+}
+
+struct Test<'a> {
+    toml_path: &'a Path,
+    expected: PathBuf,
+    output_dir: TempDir,
+}
+
+impl Test<'_> {
+    fn from_path_with_kind<'p>(
+        toml_path: &'p Path,
+        kind: &str,
+    ) -> datatest_stable::Result<Option<Test<'p>>> {
+        let expected = toml_path.with_extension(kind);
+        if !expected.is_file() {
+            Ok(None)
+        } else {
+            Ok(Some(Test {
+                toml_path,
+                expected,
+                output_dir: tempdir()?,
+            }))
+        }
+    }
+
+    fn run(&self) -> datatest_stable::Result<()> {
+        package_hooks::register_package_hooks(Box::new(TestHooks()));
+        let update_baseline = read_env_update_baseline();
+
+        let output = self.output().unwrap_or_else(|err| format!("{:#}\n", err));
+
+        if update_baseline {
+            fs::write(&self.expected, &output)?;
+            return Ok(());
+        }
+
+        let expected = fs::read_to_string(&self.expected)?;
+        if expected != output {
+            return Err(anyhow!(add_update_baseline_fix(format!(
+                "Expected outputs differ for {:?}:\n{}",
+                self.expected,
+                format_diff(expected, output),
+            )))
+            .into());
+        }
+
+        Ok(())
+    }
+
+    fn output(&self) -> anyhow::Result<String> {
+        let Some(ext) = self.expected.extension().and_then(OsStr::to_str) else {
+            bail!(
+                "Unexpected snapshot file extension: {:?}",
+                self.expected.extension()
+            );
+        };
+
+        let out_path = self.output_dir.path().to_path_buf();
+        let lock_path = out_path.join("Move.lock");
+
+        let config = BuildConfig {
+            dev_mode: true,
+            test_mode: false,
+            generate_docs: false,
+            generate_abis: false,
+            install_dir: Some(out_path),
+            force_recompilation: false,
+            lock_file: ["locked", "notlocked"]
+                .contains(&ext)
+                .then(|| lock_path.clone()),
+            ..Default::default()
+        };
+
+        let mut progress = Vec::new();
+        let resolved_package = config.resolution_graph_for_package(self.toml_path, &mut progress);
+
+        Ok(match ext {
+            "progress" => String::from_utf8(progress)?,
+
+            "locked" => fs::read_to_string(&lock_path)?,
+
+            "notlocked" if lock_path.is_file() => {
+                bail!("Unexpected lock file");
+            }
+
+            "notlocked" => "Lock file uncommitted\n".to_string(),
+
+            "compiled" => {
+                let mut pkg = BuildPlan::create(resolved_package?)?.compile(&mut progress)?;
+                scrub_compiled_package(&mut pkg.compiled_package_info);
+                format!("{:#?}\n", pkg.compiled_package_info)
+            }
+
+            "modeled" => {
+                ModelBuilder::create(
+                    resolved_package?,
+                    ModelConfig {
+                        all_files_as_targets: false,
+                        target_filter: None,
+                    },
+                )
+                .build_model()?;
+                "Built model\n".to_string()
+            }
+
+            "resolved" => {
+                let mut resolved_package = resolved_package?;
+                for package in resolved_package.package_table.values_mut() {
+                    scrub_resolved_package(package)
+                }
+
+                scrub_build_config(&mut resolved_package.build_options);
+                format!("{:#?}\n", resolved_package)
+            }
+
+            ext => bail!("Unrecognised snapshot type: '{ext}'"),
+        })
+    }
+}
+
+fn scrub_build_config(config: &mut BuildConfig) {
+    config.install_dir = Some(PathBuf::from("ELIDED_FOR_TEST"));
+    config.lock_file = Some(PathBuf::from("ELIDED_FOR_TEST"));
+}
+
+fn scrub_compiled_package(pkg: &mut CompiledPackageInfo) {
+    pkg.source_digest = Some(PackageDigest::from("ELIDED_FOR_TEST"));
+    scrub_build_config(&mut pkg.build_flags);
+}
+
+fn scrub_resolved_package(pkg: &mut Package) {
+    pkg.package_path = PathBuf::from("ELIDED_FOR_TEST");
+    pkg.source_digest = PackageDigest::from("ELIDED_FOR_TEST");
+}
+
+/// Some dummy hooks for testing the hook mechanism
+struct TestHooks();
+
+impl PackageHooks for TestHooks {
+    fn custom_package_info_fields(&self) -> Vec<String> {
+        vec!["test_hooks_field".to_owned()]
+    }
+
+    fn custom_dependency_key(&self) -> Option<String> {
+        Some("custom".to_owned())
+    }
+
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()> {
+        bail!(
+            "TestHooks resolve dep {:?} = {:?} {:?} {:?} {:?}",
+            dep_name,
+            info.node_url,
+            info.package_name,
+            info.package_address,
+            info.subdir.to_string_lossy(),
+        )
+    }
+}
+
+datatest_stable::harness!(run_test, "tests/test_sources", r".*\.toml$");
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled
new file mode 100644
index 000000000..ec7bec457
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.compiled
@@ -0,0 +1,28 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {},
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked
new file mode 100644
index 000000000..96bb714fa
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.locked
@@ -0,0 +1,6 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "71862AF018A2EB97209CD67439419DF22D890282AF1B69A6D5D69FC18AB187EE"
+deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.modeled b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.modeled
new file mode 100644
index 000000000..e3452a497
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.modeled
@@ -0,0 +1 @@
+Built model
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved
new file mode 100644
index 000000000..d7a76e5ca
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.resolved
@@ -0,0 +1,64 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/basic_no_deps",
+        root_package: "test",
+        package_graph: {
+            "test": [],
+        },
+        package_table: {},
+        always_deps: {
+            "test",
+        },
+        manifest_digest: "71862AF018A2EB97209CD67439419DF22D890282AF1B69A6D5D69FC18AB187EE",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.toml
new file mode 100644
index 000000000..b5b93588f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "test"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/A.move
new file mode 100644
index 000000000..925cbe1fe
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/A.move
@@ -0,0 +1,3 @@
+module 0x1::M {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/a_script.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/a_script.move
new file mode 100644
index 000000000..8cc7a6c24
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled
new file mode 100644
index 000000000..a6b463628
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked
new file mode 100644
index 000000000..40aa349df
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked
@@ -0,0 +1,6 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "D9285F6EBE68E6BE673226856663965F2F1BBB3A371070418A89355F1CCC7EEE"
+deps_digest = "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved
new file mode 100644
index 000000000..162dec215
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved
@@ -0,0 +1,72 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/basic_no_deps_address_assigned",
+        root_package: "test",
+        package_graph: {
+            "test": [],
+        },
+        package_table: {},
+        always_deps: {
+            "test",
+        },
+        manifest_digest: "D9285F6EBE68E6BE673226856663965F2F1BBB3A371070418A89355F1CCC7EEE",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000000,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000000,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.toml
new file mode 100644
index 000000000..f36925b4d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/sources/M.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/sources/M.move
new file mode 100644
index 000000000..a291ea997
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_assigned/sources/M.move
@@ -0,0 +1,3 @@
+module A::M {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved
new file mode 100644
index 000000000..b712376e2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved
@@ -0,0 +1,8 @@
+Unresolved addresses found. To fix this, add an entry for each unresolved address to the [addresses] section of tests/test_sources/basic_no_deps_address_not_assigned/Move.toml: e.g.,
+
+[addresses]
+std = "0x1"
+
+Alternatively, you can also define [dev-addresses] and call with the -d flag: Unresolved addresses: [
+  Named address 'A' in package 'test'
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.toml
new file mode 100644
index 000000000..f4ad16526
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled
new file mode 100644
index 000000000..b0d18e405
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved
new file mode 100644
index 000000000..4b3ad297e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved
@@ -0,0 +1,74 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment",
+        root_package: "test",
+        package_graph: {
+            "test": [],
+        },
+        package_table: {},
+        always_deps: {
+            "test",
+        },
+        manifest_digest: "4D062BC9E2A7C54B0E372B368563BE56A371DE2855612B7AB7EF208CC6A0473C",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: Some(
+                    {
+                        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
new file mode 100644
index 000000000..982d4b55a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
new file mode 100644
index 000000000..a291ea997
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
@@ -0,0 +1,3 @@
+module A::M {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved
new file mode 100644
index 000000000..1cd54e611
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved
@@ -0,0 +1 @@
+Found unbound dev address assignment 'B = 0x1' in root package 'test'. Dev addresses cannot introduce new named addresses
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.toml
new file mode 100644
index 000000000..391efd1ba
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+B = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled
new file mode 100644
index 000000000..c150e3af9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml
new file mode 100644
index 000000000..75c6d940c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../move-stdlib", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/A.move
new file mode 100644
index 000000000..925cbe1fe
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/A.move
@@ -0,0 +1,3 @@
+module 0x1::M {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/ATest.move b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/ATest.move
new file mode 100644
index 000000000..63f212d0e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/basic_no_deps_test_mode/sources/ATest.move
@@ -0,0 +1,4 @@
+#[test_only]
+module 0x1::MTest {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled
new file mode 100644
index 000000000..83ad86767
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.compiled
@@ -0,0 +1,10 @@
+Module and/or script names found that would cause failures on case insensitive file systems when compiling package 'case_insensitive_check':
+The following modules and/or scripts would collide as 'a' on the file system:
+	Module 'A' at path 'tests/test_sources/case_insensitive_check/sources/a.move'
+	Script 'a' at path 'tests/test_sources/case_insensitive_check/sources/a_script.move'
+The following modules and/or scripts would collide as 'set' on the file system:
+	Module 'Set' at path 'tests/test_sources/case_insensitive_check/sources/Set.move'
+	Module 'set' at path 'tests/test_sources/case_insensitive_check/sources/foo.move'
+	Module 'seT' at path 'tests/test_sources/case_insensitive_check/sources/otherModule.move'
+	Script 'sEt' at path 'tests/test_sources/case_insensitive_check/sources/script.move'
+Please rename these scripts and/or modules to resolve these conflicts.
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.toml b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.toml
new file mode 100644
index 000000000..ca480b301
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "case_insensitive_check"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/Set.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/Set.move
new file mode 100644
index 000000000..be1b43445
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/Set.move
@@ -0,0 +1,3 @@
+module 0x1::Set {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a.move
new file mode 100644
index 000000000..da5a1b5ec
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a.move
@@ -0,0 +1 @@
+module 0x1::A { }
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a_script.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a_script.move
new file mode 100644
index 000000000..be3ada6da
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/foo.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/foo.move
new file mode 100644
index 000000000..e8c3657af
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/foo.move
@@ -0,0 +1,3 @@
+module 0x1::set {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/otherModule.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/otherModule.move
new file mode 100644
index 000000000..1e6c517d0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/otherModule.move
@@ -0,0 +1,2 @@
+module 0x2::seT {
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/script.move b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/script.move
new file mode 100644
index 000000000..d6103c7b5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/case_insensitive_check/sources/script.move
@@ -0,0 +1,3 @@
+script {
+    fun sEt() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved
new file mode 100644
index 000000000..c194bad02
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.resolved
@@ -0,0 +1 @@
+Unable to parse Move package manifest: duplicate key: `OtherDep` for key `dependencies` at line 5 column 1
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.toml
new file mode 100644
index 000000000..e63ba72e5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep" }
+OtherDep = { local = "./deps_only/different_dep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/different_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/different_dep/Move.toml
new file mode 100644
index 000000000..a0cd2f45f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/different_dep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..a0cd2f45f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dependencies/deps_only/other_dep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved
new file mode 100644
index 000000000..e921fef0a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved
@@ -0,0 +1 @@
+Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.toml
new file mode 100644
index 000000000..b2858a297
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.toml
@@ -0,0 +1,12 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "_"
+
+[dev-addresses]
+B = "0x1"
+
+[dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..9bdb074d9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved
new file mode 100644
index 000000000..e921fef0a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved
@@ -0,0 +1 @@
+Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.toml
new file mode 100644
index 000000000..280161f31
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "_"
+A = "0x1"
+
+[dev-addresses]
+B = "0x1"
+
+[dev-dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..bf071a290
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved
new file mode 100644
index 000000000..e921fef0a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved
@@ -0,0 +1 @@
+Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.toml
new file mode 100644
index 000000000..9908ce56c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_dev_addresses/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+B = "_"
+
+[dev-addresses]
+A = "0x1"
+B = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved
new file mode 100644
index 000000000..558a8d103
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package A found:
+At B -> A
+	A = { local = "deps_only/A", version = "2.0.0" }
+At A
+	A = { local = "deps_only/A", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.toml
new file mode 100644
index 000000000..ff558aec0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/Move.toml
@@ -0,0 +1,18 @@
+# Dependency graph to check if a different package version as direct and as indirect dependency
+# triggers an error.
+#
+#                 +----+ v2
+#           +---->| B  |----+
+#           |     +----+    |
+#           |               |
+# +----+    |      v1       +-->+----+
+# |Root|----+------------------>| A  |
+# +----+                        +----+
+#
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", version = "1.0.0" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/A/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/A/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/B/Move.toml
new file mode 100644
index 000000000..f7b460b95
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/conflicting_direct_and_indirect/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked
new file mode 100644
index 000000000..953730f24
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked
@@ -0,0 +1,43 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "3FFCC3493EF75DBA3C6232A841BC1FB786BCAFE6B3B799AF601C6EDCA342340C"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "C" },
+]
+
+dev-dependencies = [
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "B" },
+]
+
+dev-dependencies = [
+  { name = "D" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dev-dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+[[move.package]]
+name = "D"
+source = { local = "deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
new file mode 100644
index 000000000..2c68107e5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
@@ -0,0 +1,328 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/dep_dev_dep_diamond",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+            "C": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "3FFCC3493EF75DBA3C6232A841BC1FB786BCAFE6B3B799AF601C6EDCA342340C",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml
new file mode 100644
index 000000000..91407dfeb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+C = { local = "./deps_only/C" }
+
+[dev-dependencies]
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml
new file mode 100644
index 000000000..d88b3096d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+
+[dev-dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml
new file mode 100644
index 000000000..c55df1b1c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dev-dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked
new file mode 100644
index 000000000..cf89252b7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.locked
@@ -0,0 +1,14 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "54BEFE786504E00C25811696A09F9CB02DD4490BC4DC1B4908A02966B087656E"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "OtherDep", digest = "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8", addr_subst = { "A" = "B" } },
+]
+
+[[move.package]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved
new file mode 100644
index 000000000..6ab2e003e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.resolved
@@ -0,0 +1,149 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/dep_good_digest",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "54BEFE786504E00C25811696A09F9CB02DD4490BC4DC1B4908A02966B087656E",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: Some(
+                                "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8",
+                            ),
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.toml
new file mode 100644
index 000000000..adfaac538
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" }, digest = "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8"}
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/sources/A.move
new file mode 100644
index 000000000..e52668348
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/sources/A.move
@@ -0,0 +1 @@
+module B::A { }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled
new file mode 100644
index 000000000..243138612
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled
@@ -0,0 +1,31 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+        "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved
new file mode 100644
index 000000000..bd32fe185
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved
@@ -0,0 +1,294 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_backflow_resolution",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "E32AB53F4BEAAD4BD8FE9D0973DE7CB7040C542240DD032821EA30AEE5F8EC9B",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: Some(
+                                {
+                                    "AA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "AA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolved_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: Some(
+                                {
+                                    "BA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "BA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolved_table: {
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: Some(
+                                {
+                                    "BA": Assign(
+                                        0000000000000000000000000000000000000000000000000000000000000001,
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.toml
new file mode 100644
index 000000000..728105bc2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.toml
@@ -0,0 +1,24 @@
+# Tests that resolved addresses can backflow in the resolution graph
+#                    +---- 0x1  -----+
+#                    |               |
+#                    v               |
+#                 +----+            0x1
+#           +---->| A  |----+        |
+#           |     +----+    |        |
+#           ?               ?        |
+# +----+    |               |     +----+
+# |Root|----+               +---->| C  |
+# +----+    |               |     +----+
+#          0x1             0x1
+#           |     +----+    |
+#           +---->| B  +----+
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should be resolved to 0x1 by backflow from the BA instantiation
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
new file mode 100644
index 000000000..b17d57dbb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
@@ -0,0 +1,3 @@
+module AA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
new file mode 100644
index 000000000..411a75ce7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
@@ -0,0 +1,3 @@
+module 0x1::AAA {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
new file mode 100644
index 000000000..82c778259
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
@@ -0,0 +1,3 @@
+module BA::B {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/sources/C.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
new file mode 100644
index 000000000..77ce3af35
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
@@ -0,0 +1,3 @@
+module A::C {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/sources/Root.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/sources/Root.move
new file mode 100644
index 000000000..b3d738219
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_backflow_resolution/sources/Root.move
@@ -0,0 +1,11 @@
+module AA::Root {
+    use AA::A;
+    use BA::B;
+    use BA::C;
+
+    public fun foo() {
+        A::foo();
+        B::foo();
+        C::foo();
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved
new file mode 100644
index 000000000..5990a4e83
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved
@@ -0,0 +1 @@
+Processing dependency 'B' of 'Root': Conflicting assignments for address 'BA': '0x2' and '0x1'.
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.toml
new file mode 100644
index 000000000..bc483704f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x2" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved
new file mode 100644
index 000000000..5ce9efa2a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package C found:
+At A -> C
+	C = { local = "deps_only/C", version = "2.0.0" }
+At B -> C
+	C = { local = "deps_only/C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.toml
new file mode 100644
index 000000000..69cc1e8ca
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..b4bded6d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..1ee8a9c06
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflict/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved
new file mode 100644
index 000000000..165067ef3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.resolved
@@ -0,0 +1,3 @@
+Conflicting "regular" and "dev" overrides found in Root:
+C = { local = "deps_only/C", version = "1.0.0" }
+C = { local = "deps_only/C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.toml
new file mode 100644
index 000000000..cf60243f9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/Move.toml
@@ -0,0 +1,14 @@
+# A override should be specified only in either "regular" dependencies section or "dev" dependencies
+# section but not in both
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C", version = "1.0.0", override = true }
+
+[dev-dependencies]
+C = { local = "./deps_only/C", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/A/Move.toml
new file mode 100644
index 000000000..b4bded6d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/B/Move.toml
new file mode 100644
index 000000000..1ee8a9c06
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_conflicting_dep_reg_overrides/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked
new file mode 100644
index 000000000..303820a03
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.locked
@@ -0,0 +1,35 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "3DA4574008B62F8D9C7064EC085EB41A26AC3804B8B7FACFE25CA16971670BFD"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "C" },
+]
+
+dev-dependencies = [
+  { name = "A" },
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dev-dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dev-dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved
new file mode 100644
index 000000000..1098e5c9d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.resolved
@@ -0,0 +1,295 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_dev_override_with_reg",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "C",
+            "Root",
+        },
+        manifest_digest: "3DA4574008B62F8D9C7064EC085EB41A26AC3804B8B7FACFE25CA16971670BFD",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.toml
new file mode 100644
index 000000000..bf82ef5b8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/Move.toml
@@ -0,0 +1,12 @@
+# A "regular" override should work for "dev" dependencies
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "./deps_only/C", version = "1.0.0", override = true }
+
+[dev-dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/A/Move.toml
new file mode 100644
index 000000000..32f05b061
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dev-dependencies]
+C = { local = "../C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/B/Move.toml
new file mode 100644
index 000000000..9c5947e87
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dev-dependencies]
+C = { local = "../C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_dev_override_with_reg/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved
new file mode 100644
index 000000000..5e4504edf
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package ADep found:
+At A -> ADep
+	ADep = { local = "deps_only/ADep" } # Resolved by ../resolvers/successful.sh
+At B -> ADep
+	ADep = { local = "deps_only/ADep", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.toml
new file mode 100644
index 000000000..3a04d8d3e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..7b3d1f6cd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved
new file mode 100644
index 000000000..40e58fed9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At B -> A
+	ADep = { local = "deps_only/ADep", version = "1.0.0" }
+At C -> A
+	ADep = { local = "deps_only/ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.toml
new file mode 100644
index 000000000..183e02760
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/Move.toml
@@ -0,0 +1,22 @@
+# Dependency graph and and override (ov)
+# C's dependency on A and ADep is externally resolved (override is incorrect)
+#
+#                 +----+
+#           +---->| C  |----+
+#           |     +----+    |
+#           |               |
+# +----+    |               +---->+----+------>+-------+
+# |Root|----|                     | A  |       | ADep  |
+# +----+    |               +---->+----+   +-->+-------+
+#           |               |              |
+#           |     +----+----+    ov(1)     |
+#           +---->| B  |-------------------+
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/B/Move.toml
new file mode 100644
index 000000000..08d399ad8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/B/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A" }
+ADep = { local = "../ADep", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/C/Move.toml
new file mode 100644
index 000000000..88e670eb2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v1/deps_only/C/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../../../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved
new file mode 100644
index 000000000..5e4504edf
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package ADep found:
+At A -> ADep
+	ADep = { local = "deps_only/ADep" } # Resolved by ../resolvers/successful.sh
+At B -> ADep
+	ADep = { local = "deps_only/ADep", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.toml
new file mode 100644
index 000000000..49ff712b9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/Move.toml
@@ -0,0 +1,28 @@
+# Dependency graph and and override (ov)
+# Root's dependency on A and ADep is externally resolved (override is incorrect)
+#
+#                 +----+
+#           +---->| A  |------+
+#           |     +----+      |
+#           |                 |
+# +----+    |                 +---------------->+-------+
+# |Root|----|                 +---------------->| ADep  |
+# +----+    |                 |            +--->+-------+
+#           |           ov(1) |            |
+#           |     +----+------+   +----+   |
+#           +---->| B  |--------->| C  |---+
+#                 +----+          +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/B/Move.toml
new file mode 100644
index 000000000..bf53f3f30
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/B/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep", version = "1.0.0", override = true }
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/C/Move.toml
new file mode 100644
index 000000000..9c4cc80e0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_incorrect_override_v2/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked
new file mode 100644
index 000000000..acdef4935
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.locked
@@ -0,0 +1,31 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "040CD4930E480375D9C8607C2C075023ADA58D206AC7A6353641155B2C634E18"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "ADep" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved
new file mode 100644
index 000000000..d8a537925
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved
@@ -0,0 +1,249 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_external_no_conflict",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "ADep": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "B",
+            "Root",
+        },
+        manifest_digest: "040CD4930E480375D9C8607C2C075023ADA58D206AC7A6353641155B2C634E18",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../resolvers/successful.sh",
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.toml
new file mode 100644
index 000000000..3a04d8d3e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..9829975c1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked
new file mode 100644
index 000000000..5f9258761
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.locked
@@ -0,0 +1,32 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "CA54ADC8F29B445D5695695C3D9B59EC57B1D2702EFBDDEBAD849A19C46EA857"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "ADep" },
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep", version = "1.0.0" }
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "ADep" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved
new file mode 100644
index 000000000..fcaf144ad
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved
@@ -0,0 +1,284 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_external_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "ADep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "B",
+            "Root",
+        },
+        manifest_digest: "CA54ADC8F29B445D5695695C3D9B59EC57B1D2702EFBDDEBAD849A19C46EA857",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../resolvers/successful.sh",
+                    ),
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/ADep",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.toml
new file mode 100644
index 000000000..ec66c555a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.toml
@@ -0,0 +1,14 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+ADep = { local = "./deps_only/ADep", version = "1.0.0", override = true }
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..7b3d1f6cd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked
new file mode 100644
index 000000000..fb3c3b80a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.locked
@@ -0,0 +1,40 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "A2144C32B1220F15525DF8D7983CCBD60B5BFB0110FFFBA42C139E24997651D4"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+  { name = "C" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A", version = "1.0.0" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "A" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+dependencies = [
+  { name = "A" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved
new file mode 100644
index 000000000..b0e6ca65b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.resolved
@@ -0,0 +1,332 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_external_override_root",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+            ],
+            "ADep": [
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "A2144C32B1220F15525DF8D7983CCBD60B5BFB0110FFFBA42C139E24997651D4",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../../../resolvers/successful.sh",
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.toml
new file mode 100644
index 000000000..d67cc93e5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/Move.toml
@@ -0,0 +1,23 @@
+# Dependency graph and and override (ov)
+# C's dependency on A and ADep is externally resolved (override should kick in)
+#
+#                 +----+
+#           +---->| C  |----+
+#           |     +----+    |
+#           |               |
+# +----+    |     ov(1)     +---->+----+       +-------+
+# |Root|----+-------------------->| A  |------>| ADep  |
+# +----+    |               +---->+----+       +-------+
+#           |               |
+#           |     +----+    |
+#           +---->| B  |----+
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", version = "1.0.0", override = true }
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/B/Move.toml
new file mode 100644
index 000000000..45e755ee2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/C/Move.toml
new file mode 100644
index 000000000..88e670eb2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_external_override_root/deps_only/C/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../../../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved
new file mode 100644
index 000000000..4018e7767
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At A -> C
+	D = { local = "deps_only/D", version = "2.0.0" }
+At B -> C
+	D = { local = "deps_only/D", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.toml
new file mode 100644
index 000000000..780de5c60
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/Move.toml
@@ -0,0 +1,20 @@
+# Dependency graph and and override (ov) - incorrect conflicting overrides.
+#
+#                 +----+           ov(3)
+#           +---->| B  |----------------------+
+#           |     +----+----+                 |
+#           |               |                 |
+# +----+    |               |     +----+ v1   +--->+----+
+# |Root|----+               +---->| C  |---------->| D  |
+# +----+    |               |     +----+      +--->+----+
+#           |               |                 |
+#           |     +----+----+      ov(2)      |
+#           +---->| A  |----------------------+
+#                 +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/A/Move.toml
new file mode 100644
index 000000000..380fa3b66
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/B/Move.toml
new file mode 100644
index 000000000..d84c576b1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/B/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D", version = "3.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/C/Move.toml
new file mode 100644
index 000000000..af684071a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_conflicting_overrides/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved
new file mode 100644
index 000000000..5ce9efa2a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package C found:
+At A -> C
+	C = { local = "deps_only/C", version = "2.0.0" }
+At B -> C
+	C = { local = "deps_only/C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.toml
new file mode 100644
index 000000000..fef7231a0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/Move.toml
@@ -0,0 +1,12 @@
+# A "dev" override should not work for "regular" dependencies
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+
+[dev-dependencies]
+C = { local = "./deps_only/C", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..b4bded6d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..1ee8a9c06
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_dev_override/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved
new file mode 100644
index 000000000..2cca955a2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.resolved
@@ -0,0 +1,5 @@
+Failed to resolve dependencies for package 'Root': When resolving dependencies for package A, conflicting versions of package D found:
+At B -> D
+	D = { local = "deps_only/D", version = "1.0.0" }
+At C -> D
+	D = { local = "deps_only/D", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml
new file mode 100644
index 000000000..e7f3cb331
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml
@@ -0,0 +1,26 @@
+# Dependency graph and an override (ov) - technically, override in the root is capable of resolving
+# a conflict in the sub-graph for A but becase we expect sub-graphs to be correct as standalone
+# entities (and our algorithm proceeds by constructing sub-graphs independently), this will result
+# in a failure.
+#
+#                                 +----+ v1
+#                           +---->| B  |--------+
+#                           |     +----+        |
+#                 +----+    |                   +-------->+----+
+#           +---->| A  |----+               +------------>| D  |
+#           |     +----+    |               |       +---->+----+
+#           |               |     +----+ v2 |       |
+#           |               +---->| C  |----+       |
+#           |                     +----+            |
+# +----+----+                                       |
+# |Root|           ov(3)                            |
+# +----+--------------------------------------------+
+#
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+D = { local = "./deps_only/D", version = "3.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/A/Move.toml
new file mode 100644
index 000000000..9f1f867f4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/B/Move.toml
new file mode 100644
index 000000000..7f74134f7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/C/Move.toml
new file mode 100644
index 000000000..110f5ad95
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved
new file mode 100644
index 000000000..d8d65f39f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': Failed to resolve dependencies for package 'C': Failed to resolve dependencies for package 'D': Failed to resolve dependencies for package 'B': Found cycle between packages: C -> D -> B -> C
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.toml
new file mode 100644
index 000000000..8843aef53
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.toml
@@ -0,0 +1,26 @@
+# Dependency graph and override (ov) - when override is processed there is no entry in the graph
+# yet (override is incorrect). This part is the same as in the
+# diamond_problem_dep_incorrect_override_empty test. Additionally, a cycle introduced during graph
+# construction interferes with part of the algorithm and if not explicitly handled would
+# trigger infinite recursion.
+#
+#           +--------------------------------------------+
+#           |                                            |
+#           +---->+----+                                 |
+#           +---->| B  |----+                            |
+#           |     +----+    |                            |
+#           |               |                            |
+# +----+    |               |     +----+         +----+--+    v1 +----+
+# |Root|----+               +---->| C  |-------->| D  |--------->| E  |
+# +----+    |               |     +----+         +----+     +--->+----+
+#           |               |                               |
+#           |     +----+----+      ov(2)                    |
+#           +---->| A  |------------------------------------+
+#                 +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/A/Move.toml
new file mode 100644
index 000000000..d7457fe92
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+E = { local = "../E", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/B/Move.toml
new file mode 100644
index 000000000..f3a7a12b0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/C/Move.toml
new file mode 100644
index 000000000..af684071a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/D/Move.toml
new file mode 100644
index 000000000..70eceb166
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/D/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved
new file mode 100644
index 000000000..f49769d12
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At A -> C
+	D = { local = "deps_only/D", version = "2.0.0" }
+At B -> C
+	D = { local = "deps_only/D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.toml
new file mode 100644
index 000000000..24c3a4c93
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/Move.toml
@@ -0,0 +1,20 @@
+# Dependency graph and and override (ov) - when override is processed there is no entry in the graph
+# yet (override is incorrect).
+#                 +----+
+#           +---->| B  |----+
+#           |     +----+    |
+#           |               |
+# +----+    |               |     +----+ v1      +----+
+# |Root|----+               +---->| C  |-------->| D  |
+# +----+    |               |     +----+    +--->+----+
+#           |               |               |
+#           |     +----+----+      ov(2)    |
+#           +---->| A  |--------------------+
+#                 +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/A/Move.toml
new file mode 100644
index 000000000..380fa3b66
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/B/Move.toml
new file mode 100644
index 000000000..f3a7a12b0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/C/Move.toml
new file mode 100644
index 000000000..af684071a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_empty/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved
new file mode 100644
index 000000000..017636bf6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At A -> C
+	D = { local = "deps_only/D", version = "1.0.0" }
+At B -> C
+	D = { local = "deps_only/D", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.toml
new file mode 100644
index 000000000..a46cda483
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/Move.toml
@@ -0,0 +1,20 @@
+# Dependency graph and and override (ov) - when override is processed there is already an entry in
+# the graph (override is incorrect).
+#                 +----+           ov(2)
+#           +---->| B  |----------------------+
+#           |     +----+----+                 |
+#           |               |                 |
+# +----+    |               |     +----+ v1   +--->+----+
+# |Root|----+               +---->| C  |---------->| D  |
+# +----+    |               |     +----+           +----+
+#           |               |
+#           |     +----+----+
+#           +---->| A  |
+#                 +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/A/Move.toml
new file mode 100644
index 000000000..58bf5ee78
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/B/Move.toml
new file mode 100644
index 000000000..ae7378d6e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/B/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/C/Move.toml
new file mode 100644
index 000000000..af684071a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_occupied/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved
new file mode 100644
index 000000000..c89081a8d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.resolved
@@ -0,0 +1,5 @@
+Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': When resolving dependencies for package C, conflicting versions of package G found:
+At E -> G
+	G = { local = "../G", version = "1.0.0" }
+At F -> G
+	G = { local = "../G", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.toml
new file mode 100644
index 000000000..953ff7046
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/Move.toml
@@ -0,0 +1,24 @@
+# Dependency graph - conflicting dependencies.
+#
+#                                            +----+
+#                                      +---->| F  |--------------+
+#                                      |     +----+              |
+#                                      |                         |
+#                 +----+     +----+    |                         |
+#           +---->| A  |---->| C  |----+                         |
+#           |     +----+     +----+    |                         |
+#           |                          |                         |
+# +----+    |                          |     +----+              |
+# |Root|----+                          +---->| E  |------+       |
+# +----+    |                                +----+      |       |
+#           |                                        v1  |       |
+#           |     +----+     +----+    v3    +----+<-----+       |
+#           +---->| B  +---->| D  |--------->| G  |  v2          |
+#                 +----+     +----+          +----+<-------------+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..a606d0458
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..b35ffc1bc
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..02631391d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/C/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
+F = { local = "../F" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/D/Move.toml
new file mode 100644
index 000000000..f99eb1b32
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+G = { local = "../G", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/E/Move.toml
new file mode 100644
index 000000000..71ce2f276
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/E/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "E"
+version = "0.0.0"
+
+[dependencies]
+G = { local = "../G", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/F/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/F/Move.toml
new file mode 100644
index 000000000..b77155c25
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/F/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "F"
+version = "0.0.0"
+
+[dependencies]
+G = { local = "../G", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/G/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/G/Move.toml
new file mode 100644
index 000000000..16e8cb4ef
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict/deps_only/G/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "G"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved
new file mode 100644
index 000000000..d64db2c5b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.resolved
@@ -0,0 +1,5 @@
+Failed to resolve dependencies for package 'Root': When resolving dependencies for package A, conflicting versions of package F found:
+At B -> E -> F
+	F = { local = "deps_only/F", version = "1.0.0" }
+At C -> D -> F
+	F = { local = "deps_only/F", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.toml
new file mode 100644
index 000000000..24513325c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/Move.toml
@@ -0,0 +1,19 @@
+# Dependency graph - conflicting dependencies.
+#
+#                             +----+     +----+ v1
+#                       +---->| B  |---->| E  |----+
+#                       |     +----+     +----+    |
+#                       |                          |
+# +----+     +----+     |                          +-->+----+
+# |Root|---->| A  |-----+                              | F  |
+# +----+     +----+     |                          +-->+----+
+#                       |                          |
+#                       |     +----+     +----+ v2 |
+#                       +---->| C  |---->| D  |----+
+#                             +----+     +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/A/Move.toml
new file mode 100644
index 000000000..9f1f867f4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/B/Move.toml
new file mode 100644
index 000000000..0053de6d4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/C/Move.toml
new file mode 100644
index 000000000..ea1b3f755
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/D/Move.toml
new file mode 100644
index 000000000..d4b366422
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+F = { local = "../F", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/E/Move.toml
new file mode 100644
index 000000000..e0af881cb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/E/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "E"
+version = "0.0.0"
+
+[dependencies]
+F = { local = "../F", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/F/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/F/Move.toml
new file mode 100644
index 000000000..a56096f5f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_conflict_deep/deps_only/F/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "F"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved
new file mode 100644
index 000000000..d490bca18
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At B -> A
+	ADep = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000007" } }
+At C -> A
+	ADep = { local = "deps_only/ADep", addr_subst = { "A" = "0000000000000000000000000000000000000000000000000000000000000042" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.toml
new file mode 100644
index 000000000..ba7f0596e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/Move.toml
@@ -0,0 +1,24 @@
+# Dependency graph and an address substitution introduced by an external resolver (C's dependency on
+# A and ADep is externally resolved). Even thoughm both C and B rely on the same version of A, in
+# the externally resolved graph ADep is reached via a dependency with address substitution whereas
+# in internally resolved graph ADep is reached via a dependency without address substitution.
+#
+#                 +----+ s(A=42) 
+#           +---->| C  |----+
+#           |     +----+    |
+#           |               | 
+# +----+    |               +---->+----+       +-------+
+# |Root|----|                     | A  |------>| ADep  |
+# +----+    |               +---->+----+       +-------+
+#           |               |
+#           |     +----+----+
+#           +---->| B  |
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..17d9cbf89
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep", addr_subst = { "A" = "0x7" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..44b1dc927
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/ADep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "ADep"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
\ No newline at end of file
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..45e755ee2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..a675beb9f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_dep_conflict/deps_only/C/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../../../resolvers/successful_subst.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked
new file mode 100644
index 000000000..c86c43f1c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.locked
@@ -0,0 +1,49 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "8B86CBF4C453D3427CAB4E62E4D181D37005EF83A1BF77EE7A803F7898CB5578"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+  { name = "E" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "C" },
+  { name = "D" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "D"
+source = { local = "deps_only/D" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "E"
+source = { local = "deps_only/E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved
new file mode 100644
index 000000000..9c1fb3b57
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.resolved
@@ -0,0 +1,433 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_nested_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "8B86CBF4C453D3427CAB4E62E4D181D37005EF83A1BF77EE7A803F7898CB5578",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    3,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.toml
new file mode 100644
index 000000000..dae84db88
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/Move.toml
@@ -0,0 +1,24 @@
+# Dependency graph and an override (ov) - override should succeed.
+#                                 +----+
+#                           +---->| C  |--------------+
+#                           |     +----+              |
+#                           |                         |
+#                 +----+    |                         |
+#           +---->| A  |----+                         |
+#           |     +----+    |                         |
+#           |               |                         |
+# +----+    |      ov(1)    |     +----+              |
+# |Root|----+------------+  +---->| D  |------+       |
+# +----+    |            |        +----+      |       |
+#           |            |                v1  |       |
+#           |     +----+ +------->+----+<-----+       |
+#           +---->| B  |--------->| E  |  v2          |
+#                 +----+   v3     +----+<-------------+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+E = { local = "./deps_only/E", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..a606d0458
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..c4ad21933
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/C/Move.toml
new file mode 100644
index 000000000..9c1c69cb1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/D/Move.toml
new file mode 100644
index 000000000..5b594aae2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved
new file mode 100644
index 000000000..5c3be9246
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package E found:
+At A -> E
+	E = { local = "deps_only/E", version = "1.0.0" }
+At B -> E
+	E = { local = "deps_only/E", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.toml
new file mode 100644
index 000000000..e907ab76b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/Move.toml
@@ -0,0 +1,23 @@
+# Dependency graph and an (insufficient) override (ov) - override is incorrect.
+#                                 +----+
+#                           +---->| C  |--------------+
+#                           |     +----+              |
+#                           |                         |
+#                 +----+    |                         |
+#           +---->| A  |----+                         |
+#           |     +----+    |                         |
+#           |       |       |                         |
+# +----+    |       |       |     +----+              |
+# |Root|----+       |ov(1)  +---->| D  |------+       |
+# +----+    |       +----+        +----+      |       |
+#           |            |                v1  |       |
+#           |     +----+ +------->+----+<-----+       |
+#           +---->| B  |--------->| E  |  v2          |
+#                 +----+   v3     +----+<-------------+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/A/Move.toml
new file mode 100644
index 000000000..ab913a367
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/A/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C"}
+D = { local = "../D"}
+E = { local = "../E", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/B/Move.toml
new file mode 100644
index 000000000..c4ad21933
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/C/Move.toml
new file mode 100644
index 000000000..5aa35b1ac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/D/Move.toml
new file mode 100644
index 000000000..5b594aae2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_nested_override_insufficient_low/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked
new file mode 100644
index 000000000..bbc75507b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.locked
@@ -0,0 +1,32 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "FF5591B04075491B4A3E1F8758714AD147D4C1611F9DB9F4C4D6F9FD4D521DA9"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+  { name = "C" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved
new file mode 100644
index 000000000..eba51bdf0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.resolved
@@ -0,0 +1,296 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "FF5591B04075491B4A3E1F8758714AD147D4C1611F9DB9F4C4D6F9FD4D521DA9",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.toml
new file mode 100644
index 000000000..f624dd7f7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..b4bded6d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..1ee8a9c06
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_override/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked
new file mode 100644
index 000000000..a81ccef21
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.locked
@@ -0,0 +1,45 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "C8BA905B7DA7A1818B7B74ACD501041A2F3069F82B5CEAF117D4D5C8CB6F4593"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+  { name = "C" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "B" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B1", version = "2.0.0" }
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+dependencies = [
+  { name = "D" },
+  { name = "E" },
+]
+
+[[move.package]]
+name = "D"
+source = { local = "deps_only/D", version = "3.0.0" }
+
+[[move.package]]
+name = "E"
+source = { local = "deps_only/E" }
+
+dependencies = [
+  { name = "D" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved
new file mode 100644
index 000000000..dc6f36af3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.resolved
@@ -0,0 +1,419 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_transitive_nested_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+            "C": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Incoming,
+                ),
+            ],
+            "E": [
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B1",
+                ),
+                version: Some(
+                    (
+                        2,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: Some(
+                    (
+                        3,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "C8BA905B7DA7A1818B7B74ACD501041A2F3069F82B5CEAF117D4D5C8CB6F4593",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../B2",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    3,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B1",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.toml
new file mode 100644
index 000000000..ba57ab888
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/Move.toml
@@ -0,0 +1,27 @@
+# Dependency graph and and override (ov) - both overrides should succeed as after ov(2) kicks in, C
+# will dominate E and D (and this override will always kick in before any other dependencies are
+# processed as overrides are processed first).
+#
+#                   +----+    ov(3)                      +----+
+#           +------>| C  |------------------------------>| D  |
+#           |       +----+----------+               +--->+----+
+#           |                       |               | v1
+#           |       +----+          |               |
+#           +------>| A  |          |               |
+#           |       +----+          +---->+----+    |
+#           |       | v1   +----+         | E  |----+
+# +----+    |       +----->| B2 |-------->+----+
+# |Root|----+              +----+
+# +----+    |
+#           |
+#           | ov(2)        +----+
+#           +------------->| B1 |
+#                          +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B1", version = "2.0.0", override = true }
+C = { local = "./deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..e8d027ed1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B2", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B1/Move.toml
new file mode 100644
index 000000000..64596e5a3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "B"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B2/Move.toml
new file mode 100644
index 000000000..0053de6d4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/B2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/C/Move.toml
new file mode 100644
index 000000000..b29c9c869
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/C/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
+D = { local = "../D", version ="3.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/D/Move.toml
new file mode 100644
index 000000000..c9cc62946
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/D/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "D"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/E/Move.toml
new file mode 100644
index 000000000..32168607e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_transitive_nested_override/deps_only/E/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "E"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked
new file mode 100644
index 000000000..0fcc89971
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.locked
@@ -0,0 +1,50 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "50D230853475966B37D1B94D4CC975CAF6CFC98AB235A58FFC42ED5826CD1D41"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+  { name = "E" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "C" },
+  { name = "D" },
+  { name = "E" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "D"
+source = { local = "deps_only/D" }
+
+dependencies = [
+  { name = "E" },
+]
+
+[[move.package]]
+name = "E"
+source = { local = "deps_only/E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved
new file mode 100644
index 000000000..87af45f96
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.resolved
@@ -0,0 +1,458 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_two_nested_overrides",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "50D230853475966B37D1B94D4CC975CAF6CFC98AB235A58FFC42ED5826CD1D41",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    3,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    2,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.toml
new file mode 100644
index 000000000..6fafbb4d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/Move.toml
@@ -0,0 +1,25 @@
+# Dependency graph and and override (ov) - only ov(1) should succeed.
+#                                     +----+
+#                               +---->| C  |--------------+
+#                               |     +----+              |
+#                               |                         |
+#                 +----+        |                         |
+#           +---->| A  |--------+                         |
+#           |     +----+----+   |                         |
+#           |               |   |                         |
+# +----+    |      ov(1)    |   |     +----+              |
+# |Root|----+------------+  |   +---->| D  |------+       |
+# +----+    |            |  |         +----+      |       |
+#           |            |  |  ov2            v1  |       |
+#           |     +----+ |  +-------->+----+<-----+       |
+#           +---->| B  | +----------->| E  |  v2          |
+#                 +----+------------->+----+<-------------+
+#                          v3
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+E = { local = "./deps_only/E", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/A/Move.toml
new file mode 100644
index 000000000..f6105a6c1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/A/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
+D = { local = "../D" }
+E = { local = "../E", version = "2.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/B/Move.toml
new file mode 100644
index 000000000..c4ad21933
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "3.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/C/Move.toml
new file mode 100644
index 000000000..9c1c69cb1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/D/Move.toml
new file mode 100644
index 000000000..5b594aae2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_two_nested_overrides/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved
new file mode 100644
index 000000000..2ead2bab8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.resolved
@@ -0,0 +1,446 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dep_with_deps",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C2",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "B21BB5840BBEC6FAE6E54214639AD38EEB3D4B93BCA11A832654296C14DA0467",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C1",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.toml
new file mode 100644
index 000000000..40d7b75ce
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/Move.toml
@@ -0,0 +1,28 @@
+# Dependency graph and two overrides - one correct one (in Root) and the other one insufficient (in
+# A). The correct override eliminates C1's dependency on E's version 2 and the insufficient override
+# becomes unnecessary as the graph becomes consistent with all remaining dependencies on package E
+# are for version 1.
+#
+#                                  +----+  v2
+#                            +---->| C1 |-------+
+#                            |     +----+       |
+#                            |                  |
+#                 +----+     |       ov(1)      |
+#           +---->| A  |-----+--------------+   |
+#           |     +----+     |              |   |
+#           |                |              |   +->+----+
+# +----+    |     ov(2)      |   +----+ v1  +----->|    |
+# |Root|----+-------------+  +-->| D  |----------->| E  |
+# +----+    |             |      +----+            |    |
+#           |             |                 +----->+----+
+#           |     +----+  +->+----+    v1   |
+#           +---->| B  |---->| C2 |---------+
+#                 +----+     +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C2", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/A/Move.toml
new file mode 100644
index 000000000..ab5f1f86b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/A/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C1" }
+D = { local = "../D" }
+E = { local = "../E", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/B/Move.toml
new file mode 100644
index 000000000..50872e3a6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C1/Move.toml
new file mode 100644
index 000000000..9c1c69cb1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C2/Move.toml
new file mode 100644
index 000000000..5aa35b1ac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/C2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/D/Move.toml
new file mode 100644
index 000000000..390431116
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved
new file mode 100644
index 000000000..b521f8433
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting versions of package E found:
+At A -> E
+	E = { local = "deps_only/E", version = "3.0.0" }
+At C -> E
+	E = { local = "deps_only/E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.toml
new file mode 100644
index 000000000..8df8419ef
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/Move.toml
@@ -0,0 +1,27 @@
+# Dependency graph - conflicting dependencies. Even though override in Root eliminates C1's
+# dependency on E's version 2, we still have a conflicting dependency on E from A, which is an
+# override, but an insufficient one.
+#
+#                                  +----+  v2
+#                            +---->| C1 |-------+
+#                            |     +----+       |
+#                            |                  |
+#                 +----+     |       ov(3)      |
+#           +---->| A  |-----+--------------+   |
+#           |     +----+     |              |   |
+#           |                |              |   +->+----+
+# +----+    |     ov(2)      |   +----+ v1  +----->|    |
+# |Root|----+-------------+  +-->| D  |----------->| E  |
+# +----+    |             |      +----+            |    |
+#           |             |                 +----->+----+
+#           |     +----+  +->+----+    v1   |
+#           +---->| B  |---->| C2 |---------+
+#                 +----+     +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C2", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..5de29dc25
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/A/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C1" }
+D = { local = "../D" }
+E = { local = "../E", version = "3.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..50872e3a6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C1/Move.toml
new file mode 100644
index 000000000..9c1c69cb1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C2/Move.toml
new file mode 100644
index 000000000..5aa35b1ac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/C2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/D/Move.toml
new file mode 100644
index 000000000..390431116
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dep_with_deps_conflict/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved
new file mode 100644
index 000000000..6eaf2fdae
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.resolved
@@ -0,0 +1,446 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_dual_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C2",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: Some(
+                    (
+                        1,
+                        0,
+                        0,
+                    ),
+                ),
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "62F86211B60BE5FD68FC35A64C4B09D96612A1F253BB8798601A66A76CCFC78E",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C1",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: Some(
+                                (
+                                    1,
+                                    0,
+                                    0,
+                                ),
+                            ),
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.toml
new file mode 100644
index 000000000..e1ac8f2a6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/Move.toml
@@ -0,0 +1,29 @@
+# Dependency graph and two overrides. This example is very similar to diamond_problem_dep_with_deps
+# with the exception that in Root there is an override for C but also for A. The goal is to make
+# sure that the override's sub-graph is pruned but that we don't apply pruning for a sub-graph of an
+# overridden dependency using the same dependency (that is, for example, that we don't do pruning of
+# C when processing C as a dependency of Root)
+#
+#                                  +----+  v2
+#                            +---->| C1 |-------+
+#                            |     +----+       |
+#                            |                  |
+#                 +----+     |       ov(1)      |
+#           +---->| A  |-----+--------------+   |
+#           |     +----+     |              |   |
+#           |                |              |   +->+----+
+# +----+    |     ov(2)      |   +----+ v1  +----->|    |
+# |Root|----+-------------+  +-->| D  |----------->| E  |
+# +----+    |             |      +----+            |    |
+#           |             |                 +----->+----+
+#           |     +----+  +->+----+    v1   |
+#           +---->| B  |---->| C2 |---------+
+#                 +----+     +----+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" , override = true}
+B = { local = "./deps_only/B" }
+C = { local = "./deps_only/C2", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/A/Move.toml
new file mode 100644
index 000000000..ab5f1f86b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/A/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C1" }
+D = { local = "../D" }
+E = { local = "../E", version = "1.0.0", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..50872e3a6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C1/Move.toml
new file mode 100644
index 000000000..9c1c69cb1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "2.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C2/Move.toml
new file mode 100644
index 000000000..5aa35b1ac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/C2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/D/Move.toml
new file mode 100644
index 000000000..390431116
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E", version = "1.0.0" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_dual_override/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled
new file mode 100644
index 000000000..243138612
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled
@@ -0,0 +1,31 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+        "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked
new file mode 100644
index 000000000..7355241ea
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked
@@ -0,0 +1,31 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "E34EE93EB1C18B3B97CC2297679AE706FD805BBDCA9448CEDBD39C9C8BD5B1AA"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "A", addr_subst = { "AA" = "0000000000000000000000000000000000000000000000000000000000000001" } },
+  { name = "B", addr_subst = { "BA" = "0000000000000000000000000000000000000000000000000000000000000001" } },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "C", addr_subst = { "AA" = "A" } },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "C", addr_subst = { "BA" = "A" } },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved
new file mode 100644
index 000000000..8335fda5e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved
@@ -0,0 +1,300 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_no_conflict",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "E34EE93EB1C18B3B97CC2297679AE706FD805BBDCA9448CEDBD39C9C8BD5B1AA",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: Some(
+                                {
+                                    "AA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "AA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolved_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: Some(
+                                {
+                                    "BA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "BA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolved_table: {
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: Some(
+                                {
+                                    "AA": Assign(
+                                        0000000000000000000000000000000000000000000000000000000000000001,
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: Some(
+                                {
+                                    "BA": Assign(
+                                        0000000000000000000000000000000000000000000000000000000000000001,
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.toml
new file mode 100644
index 000000000..1b9714b18
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/sources/A.move
new file mode 100644
index 000000000..b17d57dbb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/sources/A.move
@@ -0,0 +1,3 @@
+module AA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/AA.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/AA.move
new file mode 100644
index 000000000..411a75ce7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/AA.move
@@ -0,0 +1,3 @@
+module 0x1::AAA {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/B.move
new file mode 100644
index 000000000..82c778259
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/B.move
@@ -0,0 +1,3 @@
+module BA::B {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/sources/C.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/sources/C.move
new file mode 100644
index 000000000..77ce3af35
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/sources/C.move
@@ -0,0 +1,3 @@
+module A::C {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/sources/Root.move b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/sources/Root.move
new file mode 100644
index 000000000..b3d738219
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_no_conflict/sources/Root.move
@@ -0,0 +1,11 @@
+module AA::Root {
+    use AA::A;
+    use BA::B;
+    use BA::C;
+
+    public fun foo() {
+        A::foo();
+        B::foo();
+        C::foo();
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved
new file mode 100644
index 000000000..6832de6cd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.resolved
@@ -0,0 +1,364 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_with_and_without_override_v1",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "D": [
+                (
+                    "C",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A1",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "97E9BC503F1174AC272326DA25D9EA119823079BB18AA7E528CAEEBA0E17E532",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../A2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A1",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.toml
new file mode 100644
index 000000000..374170e86
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/Move.toml
@@ -0,0 +1,27 @@
+# Dependency graph and an override. This tests if pruning correctly preserves links to D and E
+# despite these dependencies being first visited (during pruned package discovery) on the
+# overridden path (via A2)
+#
+#                                  +----+
+#                            +---->| A2 |-------+
+#                            |     +----+       |
+#                            |                  |
+#                 +----+     |                  |     +----+     +----+
+#           +---->| B  |-----+                  +---->| D  |---->| E  |
+#           |     +----+     |                  |     +----+     +----+
+#           |                |                  |
+# +----+    |                |     +----+       |
+# |Root|----|                +---->| C  |-------+
+# +----+    |                      +----+
+#           |
+#           | ov  +----+
+#           +---->| A1 |
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A1" , override = true }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A1/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A2/Move.toml
new file mode 100644
index 000000000..4664c4102
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/A2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/B/Move.toml
new file mode 100644
index 000000000..f3958c095
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/B/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A2" }
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/C/Move.toml
new file mode 100644
index 000000000..ea1b3f755
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/D/Move.toml
new file mode 100644
index 000000000..f733e6f25
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v1/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved
new file mode 100644
index 000000000..31501a780
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.resolved
@@ -0,0 +1,364 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/diamond_problem_with_and_without_override_v2",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+            "D": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "E",
+                    Outgoing,
+                ),
+            ],
+            "E": [
+                (
+                    "D",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C2",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "E": Package {
+                kind: Local(
+                    "deps_only/E",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "Root",
+        },
+        manifest_digest: "0706DACA94014A2ADD1A782C6FE1B29553ED6FFDD67464A5672B900E0038C61F",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C1",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "E": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../E",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "E": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "E",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.toml
new file mode 100644
index 000000000..69ebe99fd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/Move.toml
@@ -0,0 +1,27 @@
+# Dependency graph and an override. This tests if pruning correctly preserves links to D and E
+# despite these dependencies being first visited (during pruned package discovery) on the
+# non-overridden path (via B)
+#
+#                                  +----+
+#                            +---->| C1 |-------+
+#                            |     +----+       |
+#                            |                  |
+#                 +----+     |                  |     +----+     +----+
+#           +---->| A  |-----+                  +---->| D  |---->| E  |
+#           |     +----+     |                  |     +----+     +----+
+#           |                |                  |
+# +----+    |                |     +----+       |
+# |Root|----|                +---->| B  |-------+
+# +----+    |                      +----+
+#           |
+#           | ov  +----+
+#           +---->| C2 |
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+C = { local = "./deps_only/C2" , override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/A/Move.toml
new file mode 100644
index 000000000..c9ecd673b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/A/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+C = { local = "../C1" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/B/Move.toml
new file mode 100644
index 000000000..b35ffc1bc
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C1/Move.toml
new file mode 100644
index 000000000..ea1b3f755
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+D = { local = "../D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C2/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/C2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/D/Move.toml
new file mode 100644
index 000000000..f733e6f25
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[dependencies]
+E = { local = "../E" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/E/Move.toml
new file mode 100644
index 000000000..dc97c6690
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/diamond_problem_with_and_without_override_v2/deps_only/E/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "E"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked
new file mode 100644
index 000000000..09ff6d487
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.locked
@@ -0,0 +1,31 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "9668C1DAFA74BECBEB89FDCE86BDF4C1024020661B65DB41471BBB051EA6CE4D"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "A" },
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "C" },
+]
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "A" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved
new file mode 100644
index 000000000..f0e53a935
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.resolved
@@ -0,0 +1,253 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/direct_and_indirect_dep",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Incoming,
+                ),
+            ],
+            "C": [
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "9668C1DAFA74BECBEB89FDCE86BDF4C1024020661B65DB41471BBB051EA6CE4D",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.toml
new file mode 100644
index 000000000..50a1d019f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/Move.toml
@@ -0,0 +1,18 @@
+# Dependency graph to check if dependencies of a package being a direct dependency of root is
+# processed correctly.
+#
+#                 +----+
+#           +---->| B  |----+
+#           |     +----+    |
+#           |               |
+# +----+    |               +-->+----+     +----+
+# |Root|----+------------------>| A  |---->| C  |
+# +----+                        +----+     +----+
+#
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..58bf5ee78
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/B/Move.toml
new file mode 100644
index 000000000..45e755ee2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/C/Move.toml
new file mode 100644
index 000000000..73ed83696
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_and_indirect_dep/deps_only/C/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "C"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved
new file mode 100644
index 000000000..2fed73455
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'Other': Failed to resolve dependencies for package 'Root': Found cycle between packages: Other -> Root -> Other
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.toml
new file mode 100644
index 000000000..5d870c4f4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+Other = { local = "./deps_only/other" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/deps_only/other/Move.toml b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/deps_only/other/Move.toml
new file mode 100644
index 000000000..62227696e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/direct_cyclic_dep/deps_only/other/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Other"
+version = "0.0.0"
+
+[dependencies]
+Root = { local = "../.." }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/Move.locked b/vendors/move/crates/move-package/tests/test_sources/external/Move.locked
new file mode 100644
index 000000000..65e47dd03
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "0ABB58AD694B4D8B2FDA8F544B570B7BB6CFA84038FCCC4EA87236568A056D62"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "A" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/Move.progress b/vendors/move/crates/move-package/tests/test_sources/external/Move.progress
new file mode 100644
index 000000000..a8c4b2f93
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/Move.progress
@@ -0,0 +1,6 @@
+RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/successful.sh
+../resolvers/successful.sh stderr:
+Successful External Resolver
+PWD:     $ROOT/external-crates/move/crates/move-package/tests/test_sources/external
+Type:    dependencies
+Package: A
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external/Move.resolved
new file mode 100644
index 000000000..2d17d8c3b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/Move.resolved
@@ -0,0 +1,174 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/external",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "ADep": [
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "Root",
+        },
+        manifest_digest: "0ABB58AD694B4D8B2FDA8F544B570B7BB6CFA84038FCCC4EA87236568A056D62",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../resolvers/successful.sh",
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external/Move.toml
new file mode 100644
index 000000000..e2b460087
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked
new file mode 100644
index 000000000..5123e07f6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "F182A02077040B04D1B9A02821A0075528FDFB7AE692706D9EBE068AD5D35776"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "A" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved
new file mode 100644
index 000000000..d03823e28
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.resolved
@@ -0,0 +1 @@
+Resolving package 'ADep': Unable to find package manifest at "tests/test_sources/external_bad_dep/deps_only/ADep": No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.toml
new file mode 100644
index 000000000..5a6b1024f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+# The resolver will introduce Root -> A -> ADep into the dependency
+# graph, but ADep doesn't exist, so it will fail.
+resolver = "../resolvers/successful.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_bad_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.resolved
new file mode 100644
index 000000000..4851b9cdb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Parsing response from '../resolvers/broken.sh' for dependency 'A' of package 'Root': Deserializing packages: expected an equals, found an identifier at line 1 column 8
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.toml
new file mode 100644
index 000000000..18443257c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_broken/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+# This resolver exits with success but returns bad output (not a lock
+# file), so resolution fails.
+resolver = "../resolvers/broken.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked
new file mode 100644
index 000000000..e7b550d43
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.locked
@@ -0,0 +1,38 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "64CF52DCF661C2F1581935BC7AEA0424EE20B10997D1F183779443C8679727F1"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "A" },
+]
+
+dev-dependencies = [
+  { name = "B" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
+
+[[move.package]]
+name = "B"
+source = { local = "deps_only/B" }
+
+dependencies = [
+  { name = "BDep" },
+]
+
+[[move.package]]
+name = "BDep"
+source = { local = "deps_only/BDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress
new file mode 100644
index 000000000..1e8420d2b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.progress
@@ -0,0 +1,12 @@
+RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/successful.sh
+../resolvers/successful.sh stderr:
+Successful External Resolver
+PWD:     $ROOT/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep
+Type:    dependencies
+Package: A
+RESOLVING DEV-DEPENDENCIES IN B FROM Root WITH ../resolvers/successful.sh
+../resolvers/successful.sh stderr:
+Successful External Resolver
+PWD:     $ROOT/external-crates/move/crates/move-package/tests/test_sources/external_dev_dep
+Type:    dev-dependencies
+Package: B
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved
new file mode 100644
index 000000000..70c78ab72
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.resolved
@@ -0,0 +1,280 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/external_dev_dep",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "BDep",
+                    Outgoing,
+                ),
+            ],
+            "ADep": [
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+            "BDep": [
+                (
+                    "B",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "BDep": Package {
+                kind: Local(
+                    "deps_only/BDep",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "Root",
+        },
+        manifest_digest: "64CF52DCF661C2F1581935BC7AEA0424EE20B10997D1F183779443C8679727F1",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "BDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../BDep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "BDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "BDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../resolvers/successful.sh",
+                    ),
+                },
+                dev_dependencies: {
+                    "B": External(
+                        "../resolvers/successful.sh",
+                    ),
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.toml
new file mode 100644
index 000000000..2ee1b8a32
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dev-dependencies.B]
+# External resolvers can be used for dev dependencies as well as
+# regular dependencies
+resolver = "../resolvers/successful.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/B/Move.toml
new file mode 100644
index 000000000..c08b61cbf
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+BDep = { local = "../BDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/BDep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/BDep/Move.toml
new file mode 100644
index 000000000..9b6f59d90
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_dev_dep/deps_only/BDep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "BDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.progress b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.progress
new file mode 100644
index 000000000..305830813
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.progress
@@ -0,0 +1,3 @@
+RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/failing.sh
+../resolvers/failing.sh stderr:
+Failed to resolve dependencies for A
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.resolved
new file mode 100644
index 000000000..53fefbbf3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': '../resolvers/failing.sh' failed to resolve dependencies for dependency 'A' of package 'Root'. Exited with code: 1
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.toml
new file mode 100644
index 000000000..2bdde7033
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_failing/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+# This resolver returns a non-zero exit code, which should cause
+# resolution to fail.
+resolver = "../resolvers/failing.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved
new file mode 100644
index 000000000..98e5cb837
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Running resolver: ../resolvers/doesnt_exist.sh: No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.toml
new file mode 100644
index 000000000..e015433c9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_no_resolver/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+# This resolver doesn't exist, so calling out to it will fail.
+resolver = "../resolvers/doesnt_exist.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.locked b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.locked
new file mode 100644
index 000000000..2c3e487b8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.locked
@@ -0,0 +1,23 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "E1187C3104285580A1E8194F9C285C1A87D5732BACA176B8380028E5CE5C20F5"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "A" },
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved
new file mode 100644
index 000000000..65919647f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.resolved
@@ -0,0 +1,193 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/external_overlap",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "ADep",
+                    Outgoing,
+                ),
+            ],
+            "ADep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+            "ADep": Package {
+                kind: Local(
+                    "deps_only/ADep",
+                ),
+                version: None,
+                resolver: Some(
+                    "../resolvers/successful.sh",
+                ),
+            },
+        },
+        always_deps: {
+            "A",
+            "ADep",
+            "Root",
+        },
+        manifest_digest: "E1187C3104285580A1E8194F9C285C1A87D5732BACA176B8380028E5CE5C20F5",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "ADep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "ADep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": External(
+                        "../resolvers/successful.sh",
+                    ),
+                    "ADep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/ADep",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.toml
new file mode 100644
index 000000000..eff2b4309
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap/Move.toml
@@ -0,0 +1,15 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should succeed even though the external resolver will also return
+# `ADep` as a transitive dependency as `ADep` has the same dependencies in both cases.
+ADep = { local = "./deps_only/ADep"}
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved
new file mode 100644
index 000000000..a906f9460
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At A -> ADep
+	no dependencies
+At ADep
+	ADepDep = { local = "deps_only/ADepDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.toml
new file mode 100644
index 000000000..0d0d011cb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/Move.toml
@@ -0,0 +1,16 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should fail because the external resolver will also return `ADep` as a transitive dependency
+# and the set of `ADep`s own dependencies is empty in the "external" case and non-empty in the
+# "internal" one.
+ADep = { local = "./deps_only/ADep"}
+
+[dependencies.A]
+resolver = "../resolvers/successful.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..dc290153a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "ADep"
+version = "0.0.0"
+
+[dependencies]
+ADepDep = { local = "../ADepDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADepDep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADepDep/Move.toml
new file mode 100644
index 000000000..12e5b612f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail/deps_only/ADepDep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADepDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved
new file mode 100644
index 000000000..2b84c108d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.resolved
@@ -0,0 +1,5 @@
+When resolving dependencies for package Root, conflicting dependencies found:
+At A -> ADep
+	ADepOther = { local = "deps_only/ADepOther" }
+At ADep
+	ADepDep = { local = "deps_only/ADepDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.toml
new file mode 100644
index 000000000..2c31abb0c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/Move.toml
@@ -0,0 +1,16 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should fail because the external resolver will also return
+# `ADep` as a transitive dependency and the set of `ADep`s own
+# dependencies is different in both cases.
+ADep = { local = "./deps_only/ADep"}
+
+[dependencies.A]
+resolver = "../resolvers/successful_dep.sh"
+
+[dependencies.A.packages]
+Contains = "Anything"
+Has = { No = "Schema" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..dc290153a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "ADep"
+version = "0.0.0"
+
+[dependencies]
+ADepDep = { local = "../ADepDep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepDep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepDep/Move.toml
new file mode 100644
index 000000000..12e5b612f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepDep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADepDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepOtherDep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepOtherDep/Move.toml
new file mode 100644
index 000000000..d7a31d9d8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_overlap_fail_symmetric/deps_only/ADepOtherDep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADepOtherDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.locked b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.locked
new file mode 100644
index 000000000..9f3277648
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "6460CC1A3791A9D0D4E91E8E3CBCF45CB61891219AF412D58AB493246E98DF36"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "A" },
+]
+
+[[move.package]]
+name = "A"
+source = { local = "deps_only/A" }
+
+dependencies = [
+  { name = "ADep" },
+]
+
+[[move.package]]
+name = "ADep"
+source = { local = "deps_only/ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.progress b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.progress
new file mode 100644
index 000000000..03f9dfe80
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.progress
@@ -0,0 +1 @@
+RESOLVING DEPENDENCIES IN A FROM Root WITH ../resolvers/silent.sh
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.toml
new file mode 100644
index 000000000..22edb08e4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_silent/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies.A]
+resolver = "../resolvers/silent.sh"
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/A/Move.toml
new file mode 100644
index 000000000..74ba633d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+ADep = { local = "../ADep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/ADep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/ADep/Move.toml
new file mode 100644
index 000000000..27032db1a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/external_silent/deps_only/ADep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "ADep"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved
new file mode 100644
index 000000000..0cdfcb054
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Failed to resolve dependencies for package 'A': Failed to resolve dependencies for package 'B': Failed to resolve dependencies for package 'Root': Found cycle between packages: A -> B -> Root -> A
diff --git a/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.toml
new file mode 100644
index 000000000..486592f7a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/A/Move.toml b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..0c88016be
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/B/Move.toml
new file mode 100644
index 000000000..84328b4f2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/longer_cyclic_dep/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+Root = { local = "../.." }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved
new file mode 100644
index 000000000..533c4b43d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.resolved
@@ -0,0 +1,203 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/multiple_deps_from_lock",
+        root_package: "test",
+        package_graph: {
+            "test": [
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+            "D": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "C",
+            "D",
+            "test",
+        },
+        manifest_digest: "FE671355454D2C48E232FB7E8E32B2D48AB921C4993F4758705F3CD9BC52792F",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "CA": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "CA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "DA": Some(
+                            0000000000000000000000000000000000000000000000000000000000000002,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000003,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000003,
+                "CA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.toml
new file mode 100644
index 000000000..2af6c18a5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.toml
@@ -0,0 +1,14 @@
+# This tests proper generation of a dependency graph when lock files are present. The Move.locked
+# file is not generated due to how the test harness works but the graph is correctly included in the
+# Move.resolved file
+
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.unlocked b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/Move.unlocked
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/Move.toml
new file mode 100644
index 000000000..ab8189aad
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+CA = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/sources/A.move
new file mode 100644
index 000000000..49f9680bb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module CA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/Move.toml
new file mode 100644
index 000000000..a36956a76
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+DA = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/sources/A.move
new file mode 100644
index 000000000..bbe597ce8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module DA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/sources/A.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock/sources/A.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved
new file mode 100644
index 000000000..9093b7806
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.resolved
@@ -0,0 +1,203 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/multiple_deps_from_lock_no_manifest",
+        root_package: "test",
+        package_graph: {
+            "test": [
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+            "D": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "C",
+            "D",
+            "test",
+        },
+        manifest_digest: "67C70462706B452AD81EF229DD2416AB441309AD3DE961F35BB8BEBDF4FAF7CB",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "C": Some(
+                            0000000000000000000000000000000000000000000000000000000000000000,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "C": 0000000000000000000000000000000000000000000000000000000000000000,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "D": Some(
+                            0000000000000000000000000000000000000000000000000000000000000000,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "D": 0000000000000000000000000000000000000000000000000000000000000000,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000000,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/D",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000000,
+                "C": 0000000000000000000000000000000000000000000000000000000000000000,
+                "D": 0000000000000000000000000000000000000000000000000000000000000000,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.toml
new file mode 100644
index 000000000..6e3088596
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.toml
@@ -0,0 +1,23 @@
+# The purpose of this test is to make sure that the dependency graph is correctly read from lock
+# files (fast [path) without relying on the information in the manifest files. This is accomplished
+# by stripping dependency information from manifest files of packages C and D and expecting that
+# reading these dependencies will instead happen from C's and D's lock files. In order to only have
+# C's and D's files read and C's and D's manifest files skipped,, C's and D's lock files are updated
+# by-hand to contain a manifest digest reflecting the content of the respective stripped manifest
+# files.
+#
+# The Move.locked file is not generated due to how the test harness works but the graph is correctly
+# included in the Move.resolved file. Please note that while dependency graph is correct, the
+# resolved graph is missing some information as it includes data read from manifest files during
+# graph resolution (but NOT during dependency graph construction) that are now stripped.
+
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.unlocked b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/Move.unlocked
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/Move.toml
new file mode 100644
index 000000000..55111b854
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/Move.toml
@@ -0,0 +1,9 @@
+# This manifest file is largely empty on purpose to make sure that the main dependency graph (with actual
+# dependencies) can simply be read from the lock file.
+
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+C = "0x0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/sources/C.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/sources/C.move
new file mode 100644
index 000000000..180cd4fe3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/C/sources/C.move
@@ -0,0 +1,3 @@
+module C::C {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/Move.toml
new file mode 100644
index 000000000..e0cb1bb14
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/Move.toml
@@ -0,0 +1,9 @@
+# This manifest file is largely empty on purpose to make sure that the main dependency graph (with
+# actual dependencies) can simply be read from the lock file.
+
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+D = "0x0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/sources/D.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/sources/D.move
new file mode 100644
index 000000000..a55c083a5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/D/sources/D.move
@@ -0,0 +1,3 @@
+module D::D {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/Move.toml
new file mode 100644
index 000000000..e6622a6b0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "E"
+version = "0.0.0"
+
+[addresses]
+E = "0x0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/sources/E.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/sources/E.move
new file mode 100644
index 000000000..7baea7898
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/E/sources/E.move
@@ -0,0 +1,3 @@
+module E::E {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/Move.toml
new file mode 100644
index 000000000..a03258b6c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "F"
+version = "0.0.0"
+
+[addresses]
+F = "0x0"
+
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/sources/F.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/sources/F.move
new file mode 100644
index 000000000..99cc58c82
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/deps_only/F/sources/F.move
@@ -0,0 +1,3 @@
+module F::F {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/sources/A.move
new file mode 100644
index 000000000..45b1157ab
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_from_lock_no_manifest/sources/A.move
@@ -0,0 +1,9 @@
+module A::A {
+    use D::D as D;
+    use C::C as C;
+
+    public fun foo() {
+        D::foo();
+        C::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked
new file mode 100644
index 000000000..d153caca5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked
@@ -0,0 +1,19 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "12877D85A6540CC6483F5C5437FB4E086596015F632814B9E4AC6B6A6B94FF4F"
+deps_digest = "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600"
+
+dependencies = [
+  { name = "C" },
+  { name = "D" },
+]
+
+[[move.package]]
+name = "C"
+source = { local = "deps_only/C" }
+
+[[move.package]]
+name = "D"
+source = { local = "deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled
new file mode 100644
index 000000000..e3452a497
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled
@@ -0,0 +1 @@
+Built model
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.toml
new file mode 100644
index 000000000..23c00176a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..ab8189aad
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+CA = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/sources/A.move
new file mode 100644
index 000000000..49f9680bb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module CA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..a36956a76
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+DA = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/sources/A.move
new file mode 100644
index 000000000..bbe597ce8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module DA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/sources/A.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename/sources/A.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved
new file mode 100644
index 000000000..4167a7120
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved
@@ -0,0 +1 @@
+Processing dependency 'D' of 'test': Conflicting assignments for address 'A': '0x1' and '0x2'.
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.toml
new file mode 100644
index 000000000..a52d02b7b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.modeled b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.modeled
new file mode 100644
index 000000000..c0a70e4cc
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.modeled
@@ -0,0 +1 @@
+Found address renaming in package 'test' when building Move model -- this is currently not supported
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved
new file mode 100644
index 000000000..47b36f4cc
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.resolved
@@ -0,0 +1,224 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/multiple_deps_rename",
+        root_package: "test",
+        package_graph: {
+            "test": [
+                (
+                    "C",
+                    Outgoing,
+                ),
+                (
+                    "D",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+            "D": [
+                (
+                    "test",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "D": Package {
+                kind: Local(
+                    "deps_only/D",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "C",
+            "D",
+            "test",
+        },
+        manifest_digest: "2108F9760A5B783CE76062DC34B8D077F9EEC6D3422472558BE25966949EEC35",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000002,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "test": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000003,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/C",
+                            ),
+                            subst: Some(
+                                {
+                                    "CA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "D": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/D",
+                            ),
+                            subst: Some(
+                                {
+                                    "DA": RenameFrom(
+                                        "A",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "CA": (
+                    "C",
+                    "A",
+                ),
+                "DA": (
+                    "D",
+                    "A",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000003,
+                "CA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.toml
new file mode 100644
index 000000000..a13ae9d9e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/sources/Root.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/sources/Root.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename/sources/Root.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled
new file mode 100644
index 000000000..8e61b7ac7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled
@@ -0,0 +1,32 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+        "C": 0000000000000000000000000000000000000000000000000000000000000003,
+        "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.toml
new file mode 100644
index 000000000..423f3f880
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/Move.toml
@@ -0,0 +1,12 @@
+# Test that address stays in scope if you don't rename it away
+
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/Move.toml
new file mode 100644
index 000000000..d8942384f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+C = "0x3"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/sources/A.move
new file mode 100644
index 000000000..d66d01a88
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module C::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/Move.toml b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/sources/Root.move b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/sources/Root.move
new file mode 100644
index 000000000..aaa8560f6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/multiple_deps_rename_one/sources/Root.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use C::A as CA;
+
+    public fun foo() {
+        DAA::foo();
+        CA::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked
new file mode 100644
index 000000000..66b14c174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved
new file mode 100644
index 000000000..8096138d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'NestedDeps': Parsing manifest for 'Nested': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml
new file mode 100644
index 000000000..b4fd77254
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies.Nested]
+git = "../../.."
+rev = "ed613ee8e"
+subdir = "language/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml
new file mode 100644
index 000000000..2b714a0d8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+More = { local = "../../../../../../../../../out_of_repo" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked
new file mode 100644
index 000000000..eb28655ad
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "0C5D381E36019E1585333C288C833EF07C2E0AC0CD76B1326E88A6765714C247"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "MoveNursery" },
+]
+
+[[move.package]]
+name = "MoveNursery"
+source = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib/nursery" }
+
+dependencies = [
+  { name = "MoveStdlib" },
+]
+
+[[move.package]]
+name = "MoveStdlib"
+source = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
new file mode 100644
index 000000000..03764ace6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
@@ -0,0 +1,214 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/nested_deps_git_local",
+        root_package: "NestedDeps",
+        package_graph: {
+            "NestedDeps": [
+                (
+                    "MoveNursery",
+                    Outgoing,
+                ),
+            ],
+            "MoveNursery": [
+                (
+                    "NestedDeps",
+                    Incoming,
+                ),
+                (
+                    "MoveStdlib",
+                    Outgoing,
+                ),
+            ],
+            "MoveStdlib": [
+                (
+                    "MoveNursery",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "MoveNursery": Package {
+                kind: Git(
+                    GitInfo {
+                        git_url: "https://github.com/move-language/move",
+                        git_rev: "781c844",
+                        subdir: "language/move-stdlib/nursery",
+                    },
+                ),
+                version: None,
+                resolver: None,
+            },
+            "MoveStdlib": Package {
+                kind: Git(
+                    GitInfo {
+                        git_url: "https://github.com/move-language/move",
+                        git_rev: "781c844",
+                        subdir: "language/move-stdlib",
+                    },
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "MoveNursery",
+            "MoveStdlib",
+            "NestedDeps",
+        },
+        manifest_digest: "0C5D381E36019E1585333C288C833EF07C2E0AC0CD76B1326E88A6765714C247",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "MoveNursery": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveNursery",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: Some(
+                    {
+                        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {
+                    "MoveStdlib": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "..",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "std": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "MoveStdlib": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveStdlib",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": None,
+                    },
+                ),
+                dev_address_assignments: Some(
+                    {
+                        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "std": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "NestedDeps": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "NestedDeps",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "MoveNursery": Internal(
+                        InternalDependency {
+                            kind: Git(
+                                GitInfo {
+                                    git_url: "https://github.com/move-language/move",
+                                    git_rev: "781c844",
+                                    subdir: "language/move-stdlib/nursery",
+                                },
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "std": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml
new file mode 100644
index 000000000..219fcae28
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_git_local/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies]
+MoveNursery = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib/nursery" }
+
+[addresses]
+std = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked
new file mode 100644
index 000000000..8f2202bff
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "B3E0DD65821AEA6C343A1189D119E81DF00830A3E3B48C84D52B7018F47626F4"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "Nested" },
+]
+
+[[move.package]]
+name = "More"
+source = { local = "deps_only/nested/more" }
+
+[[move.package]]
+name = "Nested"
+source = { local = "deps_only/nested" }
+
+dependencies = [
+  { name = "More" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.toml
new file mode 100644
index 000000000..1cae9ebd2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies]
+Nested = { local = "./deps_only/nested" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml
new file mode 100644
index 000000000..1e6b34209
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+More = { local = "./more" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml
new file mode 100644
index 000000000..83a2b21fa
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "More"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked
new file mode 100644
index 000000000..8f2202bff
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "B3E0DD65821AEA6C343A1189D119E81DF00830A3E3B48C84D52B7018F47626F4"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "Nested" },
+]
+
+[[move.package]]
+name = "More"
+source = { local = "deps_only/nested/more" }
+
+[[move.package]]
+name = "Nested"
+source = { local = "deps_only/nested" }
+
+dependencies = [
+  { name = "More" },
+]
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.toml
new file mode 100644
index 000000000..1cae9ebd2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies]
+Nested = { local = "./deps_only/nested" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/Move.toml
new file mode 100644
index 000000000..920c7bf30
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+More = { local = "./more", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/more/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/more/Move.toml
new file mode 100644
index 000000000..83a2b21fa
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_override/deps_only/nested/more/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "More"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked
new file mode 100644
index 000000000..aa2f8c1d5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.locked
@@ -0,0 +1,33 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "D2FFFC63D2AF7BF7028F583317C7ACF0EBB9E6B9F0DFC6D8FB46732AF7B552E4"
+deps_digest = "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3"
+
+dependencies = [
+  { name = "More" },
+  { name = "Nested" },
+  { name = "Shared" },
+]
+
+[[move.package]]
+name = "More"
+source = { local = "deps_only/more" }
+
+dependencies = [
+  { name = "Shared" },
+]
+
+[[move.package]]
+name = "Nested"
+source = { local = "deps_only/nested" }
+
+dependencies = [
+  { name = "More" },
+  { name = "Shared" },
+]
+
+[[move.package]]
+name = "Shared"
+source = { local = "deps_only/shared" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved
new file mode 100644
index 000000000..951c4f486
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.resolved
@@ -0,0 +1,291 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/nested_deps_shared_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "More",
+                    Outgoing,
+                ),
+                (
+                    "Nested",
+                    Outgoing,
+                ),
+                (
+                    "Shared",
+                    Outgoing,
+                ),
+            ],
+            "More": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "Shared",
+                    Outgoing,
+                ),
+                (
+                    "Nested",
+                    Incoming,
+                ),
+            ],
+            "Shared": [
+                (
+                    "More",
+                    Incoming,
+                ),
+                (
+                    "Nested",
+                    Incoming,
+                ),
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+            "Nested": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "More",
+                    Outgoing,
+                ),
+                (
+                    "Shared",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "More": Package {
+                kind: Local(
+                    "deps_only/more",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "Nested": Package {
+                kind: Local(
+                    "deps_only/nested",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "Shared": Package {
+                kind: Local(
+                    "deps_only/shared",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "More",
+            "Nested",
+            "Root",
+            "Shared",
+        },
+        manifest_digest: "D2FFFC63D2AF7BF7028F583317C7ACF0EBB9E6B9F0DFC6D8FB46732AF7B552E4",
+        deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "More": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "More",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "Shared": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../shared",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Nested": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Nested",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "More": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../more",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "Shared": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../shared",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "More": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/more",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "Nested": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/nested",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                    "Shared": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/shared",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Shared": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Shared",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.toml
new file mode 100644
index 000000000..c5cd86e8d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+Shared = { local = "./deps_only/shared", override = true }
+Nested = { local = "./deps_only/nested" }
+More = { local = "./deps_only/more" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/more/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/more/Move.toml
new file mode 100644
index 000000000..0bd5f9511
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/more/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "More"
+version = "0.0.0"
+
+[dependencies]
+Shared = { local = "../shared", override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/nested/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/nested/Move.toml
new file mode 100644
index 000000000..172978bf4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/nested/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+Shared = { local = "../shared", override = true }
+More = { local = "../more" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/shared/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/shared/Move.toml
new file mode 100644
index 000000000..2cb6e6920
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_deps_shared_override/deps_only/shared/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Shared"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved
new file mode 100644
index 000000000..1c605b10d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.resolved
@@ -0,0 +1,253 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/nested_pruned_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "A",
+                    Outgoing,
+                ),
+                (
+                    "B",
+                    Outgoing,
+                ),
+            ],
+            "A": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Incoming,
+                ),
+            ],
+            "B": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+                (
+                    "C",
+                    Outgoing,
+                ),
+            ],
+            "C": [
+                (
+                    "B",
+                    Incoming,
+                ),
+                (
+                    "A",
+                    Outgoing,
+                ),
+            ],
+        },
+        package_table: {
+            "A": Package {
+                kind: Local(
+                    "deps_only/A1",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "B": Package {
+                kind: Local(
+                    "deps_only/B",
+                ),
+                version: None,
+                resolver: None,
+            },
+            "C": Package {
+                kind: Local(
+                    "deps_only/C",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "A",
+            "B",
+            "C",
+            "Root",
+        },
+        manifest_digest: "B0F678B9227387AF29ACA8CFA4EB437787A2FC7690E2627761402DE85C728E51",
+        deps_digest: "3C4103934B1E040BB6B23F1D610B4EF9F2F1166A50A104EADCF77467C004C600",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "A": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../C",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "../A2",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/A1",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                    "B": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/B",
+                            ),
+                            subst: None,
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.toml
new file mode 100644
index 000000000..63ecad481
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/Move.toml
@@ -0,0 +1,45 @@
+# Dependency graph and an override. This tests if pruning correctly preserves the D->A edge even if
+# A2 is pruned when processing the override in root. It is indeed the case due to how edge removal
+# works in petgraph - removing A2 from the package graph will not remove the outgoing edge from D to
+# A. A pruned package graph for sub-graph B looks as follows when it's beig merged to Root:
+#
+#    package_graph: {
+#        "B": [
+#            (
+#                "C",
+#                Outgoing,
+#            ),
+#        ],
+#        "C": [
+#            (
+#                "B",
+#                Incoming,
+#            ),
+#            (
+#                "A",
+#                Outgoing,
+#            ),
+#        ],
+#    },
+#
+#
+#
+#                 +----+     +----+     +----+
+#           +---->| B  |---->| C  |---->| A2 |
+#           |     +----+     +----+     +----+
+#           |
+# +----+    |
+# |Root|----|
+# +----+    |
+#           |
+#           | ov  +----+
+#           +---->| A1 |
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A1" , override = true }
+B = { local = "./deps_only/B" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A1/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A1/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A2/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A2/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/A2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/B/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/B/Move.toml
new file mode 100644
index 000000000..f3a7a12b0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/C/Move.toml b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/C/Move.toml
new file mode 100644
index 000000000..33c10454b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/nested_pruned_override/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "../A2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved
new file mode 100644
index 000000000..5d40ccafa
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Git revision not supplied for dependency
diff --git a/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.toml b/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.toml
new file mode 100644
index 000000000..247d3a3f0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { git = "url doesnt matter" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.compiled
new file mode 100644
index 000000000..8b22b6257
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.locked b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.locked
new file mode 100644
index 000000000..0ef21df31
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.locked
@@ -0,0 +1,14 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "OtherDep", addr_subst = { "A" = "B" } },
+]
+
+[[move.package]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.resolved
new file mode 100644
index 000000000..4fa537e4e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.resolved
@@ -0,0 +1,147 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep/sources/OneDep.move b/vendors/move/crates/move-package/tests/test_sources/one_dep/sources/OneDep.move
new file mode 100644
index 000000000..41fd77fec
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep/sources/OneDep.move
@@ -0,0 +1,6 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled
new file mode 100644
index 000000000..8b22b6257
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved
new file mode 100644
index 000000000..24a05c980
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved
@@ -0,0 +1,143 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep_assigned_address",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "4E7F1AB3DAE2E52F6D5C1C326BB270B2097D47C8964275046E002AB005B38E2B",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.toml
new file mode 100644
index 000000000..ac917b897
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..325b79ca1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/sources/OneDep.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/sources/OneDep.move
new file mode 100644
index 000000000..41fd77fec
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_assigned_address/sources/OneDep.move
@@ -0,0 +1,6 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked
new file mode 100644
index 000000000..1efdde28c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.locked
@@ -0,0 +1,14 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "A5456BB6D4506B75AF7F522F1B1F3AE429D1D23118875C79D1A8006EA28E4AD5"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "OtherDep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } },
+]
+
+[[move.package]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved
new file mode 100644
index 000000000..40d77916a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved
@@ -0,0 +1 @@
+Processing dependency 'OtherDep' of 'Root': Source digest mismatch in dependency 'OtherDep' of 'Root'. Expected 'BAD_DIGEST' but got '0B4B841390F30CACBA194AD650968D2A362349F65D8EB2BF354AA4F95ED0B909'.
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.toml
new file mode 100644
index 000000000..bb8f33a3b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" }, digest = "BAD_DIGEST"}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_bad_digest/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved
new file mode 100644
index 000000000..fd78ea747
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved
@@ -0,0 +1,147 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep_multiple_of_same_name",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled
new file mode 100644
index 000000000..8b22b6257
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked
new file mode 100644
index 000000000..cbaad4222
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.locked
@@ -0,0 +1,14 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+manifest_digest = "D302CF1372F684FE59216E574C32DDAAF97E6EB16A6224E21EA7E6ADD82EFEDF"
+deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
+
+dependencies = [
+  { name = "OtherDep", addr_subst = { "A" = "B" } },
+]
+
+[[move.package]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved
new file mode 100644
index 000000000..046897708
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.resolved
@@ -0,0 +1,147 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep_override",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "D302CF1372F684FE59216E574C32DDAAF97E6EB16A6224E21EA7E6ADD82EFEDF",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: true,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.toml
new file mode 100644
index 000000000..8b6a067ba
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" }, override = true }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_override/sources/OneDep.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/sources/OneDep.move
new file mode 100644
index 000000000..41fd77fec
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_override/sources/OneDep.move
@@ -0,0 +1,6 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved
new file mode 100644
index 000000000..468f76174
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved
@@ -0,0 +1,150 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep_reassigned_address",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "5D172B35863F3E290860CC7CD5D02FA7195D005ABC6668E1EC2EC84D7D096481",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000002,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+                "B": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.toml
new file mode 100644
index 000000000..9e3383e0e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..325b79ca1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_reassigned_address/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled
new file mode 100644
index 000000000..8b22b6257
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/sources/T.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/sources/T.move
new file mode 100644
index 000000000..876b71679
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/sources/T.move
@@ -0,0 +1,3 @@
+module B::T {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/sources/M.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/sources/M.move
new file mode 100644
index 000000000..5658f751c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_renamed/sources/M.move
@@ -0,0 +1,6 @@
+module A::M {
+    use A::T;
+    public fun foo() {
+        T::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved
new file mode 100644
index 000000000..f94630341
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved
@@ -0,0 +1,147 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/one_dep_unification_across_local_renamings",
+        root_package: "Root",
+        package_graph: {
+            "Root": [
+                (
+                    "OtherDep",
+                    Outgoing,
+                ),
+            ],
+            "OtherDep": [
+                (
+                    "Root",
+                    Incoming,
+                ),
+            ],
+        },
+        package_table: {
+            "OtherDep": Package {
+                kind: Local(
+                    "deps_only/other_dep",
+                ),
+                version: None,
+                resolver: None,
+            },
+        },
+        always_deps: {
+            "OtherDep",
+            "Root",
+        },
+        manifest_digest: "6DF52ED8DD301E9689CF4329C4765A048E0669FC794CE7DAC182AEE352FC099D",
+        deps_digest: "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "OtherDep": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Internal(
+                        InternalDependency {
+                            kind: Local(
+                                "deps_only/other_dep",
+                            ),
+                            subst: Some(
+                                {
+                                    "A": RenameFrom(
+                                        "B",
+                                    ),
+                                },
+                            ),
+                            version: None,
+                            digest: None,
+                            dep_override: false,
+                        },
+                    ),
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolved_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved
new file mode 100644
index 000000000..4359ec917
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved
@@ -0,0 +1 @@
+Processing dependency 'OtherDep' of 'Root': Conflicting assignments for address 'A': '0x1' and '0x2'.
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..1cf4e4c22
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled
new file mode 100644
index 000000000..8b22b6257
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.toml
new file mode 100644
index 000000000..a3d12e5cd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/Move.toml
@@ -0,0 +1,10 @@
+# Tests that renamed addresses are resolved at only one level
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
new file mode 100644
index 000000000..9ed665bc5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
@@ -0,0 +1,3 @@
+script {
+    fun b_script() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/B.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
new file mode 100644
index 000000000..08dde04e7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/doc_templates/script_template.md b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/doc_templates/script_template.md
new file mode 100644
index 000000000..a7cd0e705
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/doc_templates/script_template.md
@@ -0,0 +1,12 @@
+# Overview of Scripts
+
+> {{move-toc}}
+
+
+This is some documentation
+
+> {{move-include OneDep}}
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/examples/Example.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/examples/Example.move
new file mode 100644
index 000000000..b8d5093c3
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/examples/Example.move
@@ -0,0 +1,3 @@
+module A::Example {
+    public fun example_fun() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/OneDep.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/OneDep.move
new file mode 100644
index 000000000..38f7ffe2d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/OneDep.move
@@ -0,0 +1,7 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+    public entry fun aa() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/a_script.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/a_script.move
new file mode 100644
index 000000000..08dde04e7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() {}
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/b_script.move b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/b_script.move
new file mode 100644
index 000000000..9ed665bc5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_with_scripts/sources/b_script.move
@@ -0,0 +1,3 @@
+script {
+    fun b_script() { }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved
new file mode 100644
index 000000000..a424e36f2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved
@@ -0,0 +1 @@
+Name of dependency 'WrongNameForDep' does not match dependency's package name 'OtherDep'
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.toml
new file mode 100644
index 000000000..dd2c5d0c7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dependencies]
+WrongNameForDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/deps_only/other_dep/Move.toml b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/one_dep_wrong_name/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved
new file mode 100644
index 000000000..c94287498
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" ""
diff --git a/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.toml b/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.toml
new file mode 100644
index 000000000..589f8adcf
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/package_hooks/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { custom = "localhost:8080", address = "0x1" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.resolved
new file mode 100644
index 000000000..f855ef689
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "foo/bar"
diff --git a/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.toml b/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.toml
new file mode 100644
index 000000000..5529e018b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/package_hooks_subdir/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { custom = "localhost:8080", address = "0x1", subdir = "foo/bar" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved
new file mode 100644
index 000000000..946069e40
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved
@@ -0,0 +1 @@
+Unable to parse Move package manifest: duplicate key: `a` for key `addresses` at line 5 column 1
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.toml
new file mode 100644
index 000000000..c70531e81
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_address_names/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a = "0x1"
+a = "0x2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved
new file mode 100644
index 000000000..c74ce542f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved
@@ -0,0 +1 @@
+Unable to parse Move package manifest: redefinition of table `package` for key `package` at line 5 column 1
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.toml
new file mode 100644
index 000000000..962d02326
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.toml
@@ -0,0 +1,5 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[package]
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved
new file mode 100644
index 000000000..e134906b2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024". Current supported editions include: "legacy", "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.toml
new file mode 100644
index 000000000..7d2050bdf
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "2024"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved
new file mode 100644
index 000000000..4b1d53cac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.resolved
@@ -0,0 +1,75 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_edition_2024_alpha",
+        root_package: "name",
+        package_graph: {
+            "name": [],
+        },
+        package_table: {},
+        always_deps: {
+            "name",
+        },
+        manifest_digest: "63CD0B93C3CE9122732229F8C319D52AF78217456BF617FE9418F98550AE8345",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "name": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [
+                        "some author",
+                    ],
+                    license: Some(
+                        "\"license\"",
+                    ),
+                    edition: Some(
+                        Edition {
+                            edition: "2024",
+                            release: Some(
+                                "alpha",
+                            ),
+                        },
+                    ),
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.toml
new file mode 100644
index 000000000..4a3e4fc75
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_alpha/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved
new file mode 100644
index 000000000..724f9f6f4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024.beta". Current supported editions include: "legacy", "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.toml
new file mode 100644
index 000000000..c73519829
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_2024_beta/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "2024.beta"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved
new file mode 100644
index 000000000..d62bd6f88
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024;alpha". Current supported editions include: "legacy", "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.toml
new file mode 100644
index 000000000..a19c9b7e0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_invalid_suffix/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "2024;alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved
new file mode 100644
index 000000000..24caececa
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.resolved
@@ -0,0 +1,73 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_edition_legacy",
+        root_package: "name",
+        package_graph: {
+            "name": [],
+        },
+        package_table: {},
+        always_deps: {
+            "name",
+        },
+        manifest_digest: "2B505B7D6ED832ED552497073A9AA2F8A48244A0C41CDC6F4F7F22A05A471B18",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "name": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [
+                        "some author",
+                    ],
+                    license: Some(
+                        "\"license\"",
+                    ),
+                    edition: Some(
+                        Edition {
+                            edition: "legacy",
+                            release: None,
+                        },
+                    ),
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.toml
new file mode 100644
index 000000000..d441dc908
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_legacy/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "legacy"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved
new file mode 100644
index 000000000..f6c623f97
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "foobar". Current supported editions include: "legacy", "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.toml
new file mode 100644
index 000000000..46010c949
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "foobar"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved
new file mode 100644
index 000000000..31fa4c922
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'edition'. Unsupported edition "2024.final". Current supported editions include: "legacy", "2024.alpha"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.toml
new file mode 100644
index 000000000..06f39e5c7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_edition_unknown_suffix/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "2024.final"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved
new file mode 100644
index 000000000..9e8bbf712
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.resolved
@@ -0,0 +1,70 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_flavor_global_storage",
+        root_package: "name",
+        package_graph: {
+            "name": [],
+        },
+        package_table: {},
+        always_deps: {
+            "name",
+        },
+        manifest_digest: "FC0696A769A6ACA88ED23495C9051F1D8389D2A70675D9C35E54DC67C793DFC7",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "name": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [
+                        "some author",
+                    ],
+                    license: Some(
+                        "\"license\"",
+                    ),
+                    edition: None,
+                    flavor: Some(
+                        GlobalStorage,
+                    ),
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.toml
new file mode 100644
index 000000000..03953be4f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_global_storage/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+flavor = "global-storage"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved
new file mode 100644
index 000000000..ae4536e3b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.resolved
@@ -0,0 +1,70 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_flavor_sui",
+        root_package: "name",
+        package_graph: {
+            "name": [],
+        },
+        package_table: {},
+        always_deps: {
+            "name",
+        },
+        manifest_digest: "AC62FD89ADEA9C9E6795CE0CF0A809754CC517DA8C9E3D1A1A602636393187D6",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "name": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [
+                        "some author",
+                    ],
+                    license: Some(
+                        "\"license\"",
+                    ),
+                    edition: None,
+                    flavor: Some(
+                        Sui,
+                    ),
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.toml
new file mode 100644
index 000000000..5e270600f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_sui/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+flavor = "sui"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved
new file mode 100644
index 000000000..dae9940c9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid 'flavor'. Unknown flavor "vanilla". Expected one of: "global-storage", "sui"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.toml
new file mode 100644
index 000000000..d3dfdb5a2
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_flavor_unknown/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+flavor = "vanilla"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved
new file mode 100644
index 000000000..c5dbceda4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.toml
new file mode 100644
index 000000000..7c53e0204
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest/Move.toml
@@ -0,0 +1,30 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+edition = "legacy"
+flavor = "global-storage"
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", d = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved
new file mode 100644
index 000000000..c5dbceda4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.toml
new file mode 100644
index 000000000..9ad97675b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.toml
@@ -0,0 +1,29 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+extra_field = true
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "d" = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved
new file mode 100644
index 000000000..8be887f25
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Malformed dependency substitution 1. Expected a string, but encountered a integer
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.toml
new file mode 100644
index 000000000..25d271196
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "A" = 1 } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved
new file mode 100644
index 000000000..afbeab3fb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid author '1' of type integer found. Expected a string.
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.toml
new file mode 100644
index 000000000..f9753bd38
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_author/Move.toml
@@ -0,0 +1,4 @@
+[package]
+name = "name"
+version = "0.1.2"
+authors = [1]
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved
new file mode 100644
index 000000000..112af012e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid author(s) list
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.toml
new file mode 100644
index 000000000..17c0f62fb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_authors/Move.toml
@@ -0,0 +1,4 @@
+[package]
+name = "name"
+version = "0.1.2"
+authors = "nope"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved
new file mode 100644
index 000000000..c5dbceda4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.toml
new file mode 100644
index 000000000..042edca57
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "A" = "0xG" } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved
new file mode 100644
index 000000000..337b01523
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved
@@ -0,0 +1,64 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_invalid_identifier_package_name",
+        root_package: "®´∑œ",
+        package_graph: {
+            "®´∑œ": [],
+        },
+        package_table: {},
+        always_deps: {
+            "®´∑œ",
+        },
+        manifest_digest: "F85E4EDBC095AC28132481BE5C69A6D293D2B9FAA23DA828A6B6F6AF0F204E65",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "®´∑œ": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "®´∑œ",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.toml
new file mode 100644
index 000000000..e344c6440
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "®´∑œ"
+version = "0.1.2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved
new file mode 100644
index 000000000..9b401e06a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved
@@ -0,0 +1,64 @@
+ResolvedGraph {
+    graph: DependencyGraph {
+        root_path: "tests/test_sources/parsing_minimal_manifest",
+        root_package: "name",
+        package_graph: {
+            "name": [],
+        },
+        package_table: {},
+        always_deps: {
+            "name",
+        },
+        manifest_digest: "40ECD99EA24DDE388D25DBAB6EFAAF04543D55F0AD108BA6F489B0C71BB618AB",
+        deps_digest: "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+    },
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+    package_table: {
+        "name": Package {
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [],
+                    license: None,
+                    edition: None,
+                    flavor: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolved_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.toml
new file mode 100644
index 000000000..d3e2cae1b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_minimal_manifest/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "0.1.2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved
new file mode 100644
index 000000000..3cbdcf2fe
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Required field name 'version' not found
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.toml
new file mode 100644
index 000000000..24bc6aaf5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.toml
@@ -0,0 +1,2 @@
+[package]
+name = "name"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.resolved
new file mode 100644
index 000000000..69b3f28ad
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Required field name 'name' not found
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.toml
new file mode 100644
index 000000000..928558548
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.toml
@@ -0,0 +1,2 @@
+[package]
+version = "0.1.1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved
new file mode 100644
index 000000000..eebb49f8b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved
@@ -0,0 +1 @@
+Error parsing package manifest: Required field name 'package' not found
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.toml
new file mode 100644
index 000000000..cd253c74c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.toml
@@ -0,0 +1,27 @@
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", d = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved
new file mode 100644
index 000000000..173327fe8
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: must provide exactly one of 'local' or 'git' or 'resolver' or 'custom' for dependency.
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.toml
new file mode 100644
index 000000000..dbd552736
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved
new file mode 100644
index 000000000..c5dbceda4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.toml
new file mode 100644
index 000000000..8b78acf0a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "©" = "A"  } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved
new file mode 100644
index 000000000..d84d0e1a6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved
@@ -0,0 +1,2 @@
+Error parsing '[addresses]' section of manifest: Invalid address name b = "0x1"
+ encountered. Expected a string but found a table
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.toml
new file mode 100644
index 000000000..6f04f6bac
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_name/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a.b = "0x1"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved
new file mode 100644
index 000000000..9ee507408
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[addresses]' section of manifest: Invalid address name 1 encountered. Expected a string but found a integer
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.toml
new file mode 100644
index 000000000..c40353fb9
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_address_value/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a = 0x1
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved
new file mode 100644
index 000000000..8c0e1821e
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Local source path not a string
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.toml
new file mode 100644
index 000000000..cbe6cc5dd
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = 1 }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved
new file mode 100644
index 000000000..adaeaaa26
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Package name must be a string
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.toml
new file mode 100644
index 000000000..30f9e1b3b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_non_string_package_name/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = 1
+version = "0.1.2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved
new file mode 100644
index 000000000..b6a6cc50d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved
@@ -0,0 +1,3 @@
+Error parsing '[dependencies]' section of manifest: Malformed dependency substitution B = "0x1"
+R = "0x2"
+. Expected a string, but encountered a table
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.toml
new file mode 100644
index 000000000..84a3cd97c
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { A = { B = "0x1", R = "0x2" } } }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved
new file mode 100644
index 000000000..02abbcc82
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dev-addresses]' section of manifest: Found uninstantiated named address 'b'. All addresses in the 'dev-addresses' field must be instantiated.
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.toml
new file mode 100644
index 000000000..4652b00b1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dev-addresses]
+a = "0x1"
+b = "_"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved
new file mode 100644
index 000000000..c5dbceda4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': No such file or directory (os error 2)
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.toml
new file mode 100644
index 000000000..e53941506
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.toml
@@ -0,0 +1,30 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[unknown_field]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "d" = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.resolved
new file mode 100644
index 000000000..6a7795f55
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.resolved
@@ -0,0 +1 @@
+Unable to parse Move package manifest: expected newline, found a period at line 3 column 14
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.toml
new file mode 100644
index 000000000..79437fee0
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_string/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = 0.1.2
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.resolved
new file mode 100644
index 000000000..5f188067a
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Version is malformed. Versions must be of the form <u64>.<u64>.<u64>, but found '00.2'
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.toml
new file mode 100644
index 000000000..a335f687b
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "00.2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.resolved b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.resolved
new file mode 100644
index 000000000..c244801b5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid major version: invalid digit found in string
diff --git a/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.toml b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.toml
new file mode 100644
index 000000000..8419ede99
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "a.1.2"
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/broken.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/broken.sh
new file mode 100755
index 000000000..98b2fe009
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/broken.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+cat <<EOF
+Broken response (not a lock file) from resolver for $TYPE of $PACKAGE.
+EOF
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/failing.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/failing.sh
new file mode 100755
index 000000000..b2e473d4f
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/failing.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+echo "Failed to resolve $TYPE for $PACKAGE" >&2
+exit 1
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/silent.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/silent.sh
new file mode 100755
index 000000000..69616a2cb
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/silent.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+ROOT="$(git rev-parse --show-toplevel)"
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+# Print lock file
+cat <<EOF
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+$TYPE = [
+    { name = "$PACKAGE" },
+]
+
+[[move.package]]
+name = "$PACKAGE"
+source = { local = "./deps_only/$PACKAGE" }
+dependencies = [
+    { name = "${PACKAGE}Dep" },
+]
+
+[[move.package]]
+name = "${PACKAGE}Dep"
+source = { local = "./deps_only/${PACKAGE}Dep" }
+EOF
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/successful.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful.sh
new file mode 100755
index 000000000..0844f7bd6
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+ROOT="$(git rev-parse --show-toplevel)"
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+# Print Diagnostics for test output
+cat <<EOF >&2
+Successful External Resolver
+PWD:     $(pwd | sed "s,^$ROOT,\$ROOT,")
+Type:    $TYPE
+Package: $PACKAGE
+EOF
+
+# Print lock file
+cat <<EOF
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+$TYPE = [
+    { name = "$PACKAGE" },
+]
+
+[[move.package]]
+name = "$PACKAGE"
+source = { local = "./deps_only/$PACKAGE" }
+dependencies = [
+    { name = "${PACKAGE}Dep" },
+]
+
+[[move.package]]
+name = "${PACKAGE}Dep"
+source = { local = "./deps_only/${PACKAGE}Dep" }
+EOF
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_dep.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_dep.sh
new file mode 100755
index 000000000..a029f9199
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_dep.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+ROOT="$(git rev-parse --show-toplevel)"
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+# Print Diagnostics for test output
+cat <<EOF >&2
+Successful External Resolver
+PWD:     $(pwd | sed "s,^$ROOT,\$ROOT,")
+Type:    $TYPE
+Package: $PACKAGE
+EOF
+
+# Print lock file
+cat <<EOF
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+$TYPE = [
+    { name = "$PACKAGE" },
+]
+
+[[move.package]]
+name = "$PACKAGE"
+source = { local = "./deps_only/$PACKAGE" }
+dependencies = [
+    { name = "${PACKAGE}Dep" },
+]
+
+[[move.package]]
+name = "${PACKAGE}Dep"
+source = { local = "./deps_only/${PACKAGE}Dep" }
+dependencies = [
+    { name = "${PACKAGE}DepOther" },
+]
+
+[[move.package]]
+name = "${PACKAGE}DepOther"
+source = { local = "./deps_only/${PACKAGE}DepOther" }
+EOF
diff --git a/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_subst.sh b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_subst.sh
new file mode 100755
index 000000000..20b38cbbe
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/resolvers/successful_subst.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+ROOT="$(git rev-parse --show-toplevel)"
+TYPE="$(echo "$1" | sed s/^--resolve-move-//)"
+PACKAGE="$2"
+
+# Print Diagnostics for test output
+cat <<EOF >&2
+Successful External Resolver
+PWD:     $(pwd | sed "s,^$ROOT,\$ROOT,")
+Type:    $TYPE
+Package: $PACKAGE
+EOF
+
+# Print lock file
+cat <<EOF
+[move]
+version = 0
+manifest_digest = "42"
+deps_digest = "7"
+$TYPE = [
+    { name = "$PACKAGE" },
+]
+
+[[move.package]]
+name = "$PACKAGE"
+source = { local = "./deps_only/$PACKAGE" }
+dependencies = [
+    { name = "${PACKAGE}Dep", addr_subst = { "A" = "0x42" } },
+]
+
+[[move.package]]
+name = "${PACKAGE}Dep"
+source = { local = "./deps_only/${PACKAGE}Dep" }
+EOF
diff --git a/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled
new file mode 100644
index 000000000..a6b463628
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.compiled
@@ -0,0 +1,30 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        default_flavor: None,
+        default_edition: None,
+        deps_as_root: false,
+        silence_warnings: false,
+        warnings_are_errors: false,
+    },
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.toml b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.toml
new file mode 100644
index 000000000..f36925b4d
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
diff --git a/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/A.move b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/A.move
new file mode 100644
index 000000000..47880c2e1
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/A.move
@@ -0,0 +1,6 @@
+module A::A {
+    use A::M;
+    public fun foo() {
+        M::foo()
+    }
+}
diff --git a/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/M.move b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/M.move
new file mode 120000
index 000000000..5d8366740
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_sources/test_symlinks/sources/M.move
@@ -0,0 +1 @@
+../../basic_no_deps_address_assigned/sources/M.move
\ No newline at end of file
diff --git a/vendors/move/crates/move-package/tests/test_thread_safety.rs b/vendors/move/crates/move-package/tests/test_thread_safety.rs
new file mode 100644
index 000000000..24d67d7d4
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/test_thread_safety.rs
@@ -0,0 +1,28 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// TODO(tzakian) Fix the test by not pointing at diem
+
+// use move_package::BuildConfig;
+// use std::path::Path;
+
+// #[test]
+// fn cross_thread_synchronization() {
+//     let handle = std::thread::spawn(|| {
+//         BuildConfig::default()
+//             .compile_package(
+//                 Path::new("./tests/thread_safety_package_test_sources/Package1"),
+//                 &mut std::io::stdout(),
+//             )
+//             .unwrap()
+//     });
+
+//     BuildConfig::default()
+//         .compile_package(
+//             Path::new("./tests/thread_safety_package_test_sources/Package2"),
+//             &mut std::io::stdout(),
+//         )
+//         .unwrap();
+//     handle.join().unwrap();
+// }
diff --git a/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml
new file mode 100644
index 000000000..adb1224f7
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move
new file mode 100644
index 000000000..a62a377b5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy { }
diff --git a/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml
new file mode 100644
index 000000000..779b56687
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package2"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move
new file mode 100644
index 000000000..a62a377b5
--- /dev/null
+++ b/vendors/move/crates/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy { }
diff --git a/vendors/move/crates/move-proc-macros/Cargo.toml b/vendors/move/crates/move-proc-macros/Cargo.toml
new file mode 100644
index 000000000..6631331d6
--- /dev/null
+++ b/vendors/move/crates/move-proc-macros/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "move-proc-macros"
+version = "0.1.0"
+authors = ["Mysten Labs <build@mystenlabs.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote.workspace = true
+syn = { version = "2", features = ["full", "fold", "extra-traits"] }
+enum-compat-util.workspace = true
diff --git a/vendors/move/crates/move-proc-macros/src/lib.rs b/vendors/move/crates/move-proc-macros/src/lib.rs
new file mode 100644
index 000000000..333040a06
--- /dev/null
+++ b/vendors/move/crates/move-proc-macros/src/lib.rs
@@ -0,0 +1,83 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{parse_macro_input, Data, DataEnum, DeriveInput};
+
+/// This macro generates a function `order_to_variant_map` which returns a map
+/// of the position of each variant to the name of the variant.
+/// It is intended to catch changes in enum order when backward compat is required.
+/// A test is also generated which enforces the enum order.
+///
+/// ```rust,ignore
+///    /// Example for this enum
+///    #[test_variant_order(src/unit_tests/staged_enum_variant_order/my_enum.yaml)]
+///    pub enum MyEnum {
+///         A,
+///         B(u64),
+///         C{x: bool, y: i8},
+///     }
+///     let order_map = MyEnum::order_to_variant_map();
+///     assert!(order_map.get(0).unwrap() == "A");
+///     assert!(order_map.get(1).unwrap() == "B");
+///     assert!(order_map.get(2).unwrap() == "C");
+///
+///     // A test called `enforce_enum_order_test_MyEnum` is generated which enforces the enum order.
+///     // The snapshot file will be at `src/unit_tests/staged_enum_variant_order/my_enum.yaml`
+/// ```
+#[proc_macro_attribute]
+pub fn test_variant_order(attr: TokenStream, item: TokenStream) -> TokenStream {
+    // Remove whitespace between the slashes
+    let path = attr
+        .to_string()
+        .split('/')
+        .map(|x| x.trim().to_string())
+        .collect::<Vec<String>>()
+        .join("/");
+
+    let item_orig = item.clone();
+    let ast_orig = parse_macro_input!(item_orig as DeriveInput);
+
+    let ast = parse_macro_input!(item as DeriveInput);
+    let name = &ast.ident;
+    let test_fn_name = syn::Ident::new(&format!("enforce_enum_order_test_{}", name), name.span());
+    let Data::Enum(DataEnum { variants, .. }) = ast.data else {
+        panic!("`test_variant_order` macro can only be used with enums.");
+    };
+
+    let variant_entries = variants
+        .iter()
+        .enumerate()
+        .map(|(index, variant)| {
+            let variant_name = variant.ident.to_string();
+            quote! {
+                map.insert( #index as u64, (#variant_name).to_string());
+            }
+        })
+        .collect::<Vec<_>>();
+    let deriv = quote! {
+        #[cfg(test)]
+        impl enum_compat_util::EnumOrderMap for #name {
+            fn order_to_variant_map() -> std::collections::BTreeMap<u64, String> {
+                let mut map = std::collections::BTreeMap::new();
+                #(#variant_entries)*
+                map
+            }
+        }
+
+        #[allow(non_snake_case)]
+        #[test]
+        fn #test_fn_name() {
+            let mut base_path = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+            base_path.extend([
+                #path,
+            ]);
+            enum_compat_util::check_enum_compat_order::<#name>(base_path);
+        }
+
+        #ast_orig
+    };
+
+    deriv.into()
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/Cargo.toml b/vendors/move/crates/move-prover-boogie-backend/Cargo.toml
new file mode 100644
index 000000000..66396e223
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "move-prover-boogie-backend"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move prover Boogie backend"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+async-trait.workspace = true
+move-stackless-bytecode.workspace = true
+move-command-line-common.workspace = true
+move-model.workspace = true
+move-binary-format.workspace = true
+num.workspace = true
+itertools.workspace = true
+move-core-types.workspace = true
+log.workspace = true
+serde.workspace = true
+anyhow = "1.0.71"
+once_cell.workspace = true
+pretty.workspace = true
+regex.workspace = true
+rand.workspace = true
+futures.workspace = true
+tera.workspace = true
+tokio.workspace = true
+codespan.workspace = true
+codespan-reporting.workspace = true
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/boogie_helpers.rs b/vendors/move/crates/move-prover-boogie-backend/src/boogie_helpers.rs
new file mode 100644
index 000000000..638cab151
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/boogie_helpers.rs
@@ -0,0 +1,965 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Helpers for emitting Boogie code.
+
+// TODO(tengzhang): helpers specifically for bv types need to be refactored
+
+use itertools::Itertools;
+use num::BigUint;
+
+use move_binary_format::file_format::TypeParameterIndex;
+use move_model::{
+    ast::{MemoryLabel, TempIndex, Value},
+    model::{
+        FieldEnv, FunctionEnv, GlobalEnv, ModuleEnv, QualifiedInstId, SpecFunId, StructEnv,
+        StructId, SCRIPT_MODULE_NAME,
+    },
+    pragmas::INTRINSIC_TYPE_MAP,
+    symbol::Symbol,
+    ty::{PrimitiveType, Type},
+};
+use move_stackless_bytecode::{function_target::FunctionTarget, stackless_bytecode::Constant};
+
+use crate::options::BoogieOptions;
+
+pub const MAX_MAKE_VEC_ARGS: usize = 4;
+
+/// Return boogie name of given module.
+pub fn boogie_module_name(env: &ModuleEnv<'_>) -> String {
+    let mod_name = env.get_name();
+    let mod_sym = env.symbol_pool().string(mod_name.name());
+    if mod_sym.as_str() == SCRIPT_MODULE_NAME {
+        // <SELF> is not accepted by boogie as a symbol
+        "#SELF#".to_string()
+    } else {
+        // qualify module by address.
+        format!("{}_{}", mod_name.addr().to_str_radix(16), mod_sym)
+    }
+}
+
+/// Return boogie name of given structure.
+pub fn boogie_struct_name(struct_env: &StructEnv<'_>, inst: &[Type]) -> String {
+    boogie_struct_name_bv(struct_env, inst, false)
+}
+
+pub fn boogie_struct_name_bv(struct_env: &StructEnv<'_>, inst: &[Type], bv_flag: bool) -> String {
+    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+        // Map to the theory type representation, which is `Table int V`. The key
+        // is encoded as an integer to avoid extensionality problems, and to support
+        // $Mutation paths, which are sequences of ints.
+        let env = struct_env.module_env.env;
+        let type_fun = if bv_flag { boogie_bv_type } else { boogie_type };
+        format!("Table int ({})", type_fun(env, &inst[1]))
+    } else {
+        format!(
+            "${}_{}{}",
+            boogie_module_name(&struct_env.module_env),
+            struct_env.get_name().display(struct_env.symbol_pool()),
+            boogie_inst_suffix(struct_env.module_env.env, inst)
+        )
+    }
+}
+
+/// Return field selector for given field.
+pub fn boogie_field_sel(field_env: &FieldEnv<'_>, inst: &[Type]) -> String {
+    let struct_env = &field_env.struct_env;
+    format!(
+        "${}#{}",
+        field_env.get_name().display(struct_env.symbol_pool()),
+        boogie_struct_name(struct_env, inst)
+    )
+}
+
+/// Return field selector for given field.
+pub fn boogie_field_update(field_env: &FieldEnv<'_>, inst: &[Type]) -> String {
+    let struct_env = &field_env.struct_env;
+    let suffix = boogie_type_suffix_for_struct(struct_env, inst, false);
+    format!(
+        "$Update'{}'_{}",
+        suffix,
+        field_env.get_name().display(struct_env.symbol_pool()),
+    )
+}
+
+/// Return boogie name of given function.
+pub fn boogie_function_name(fun_env: &FunctionEnv<'_>, inst: &[Type]) -> String {
+    format!(
+        "${}_{}{}",
+        boogie_module_name(&fun_env.module_env),
+        fun_env.get_name().display(fun_env.symbol_pool()),
+        boogie_inst_suffix(fun_env.module_env.env, inst)
+    )
+}
+
+/// Return boogie name of given function
+/// Currently bv_flag is used when generating vector functions
+pub fn boogie_function_bv_name(
+    fun_env: &FunctionEnv<'_>,
+    inst: &[Type],
+    bv_flag: &[bool],
+) -> String {
+    format!(
+        "${}_{}{}",
+        boogie_module_name(&fun_env.module_env),
+        fun_env.get_name().display(fun_env.symbol_pool()),
+        boogie_inst_suffix_bv(fun_env.module_env.env, inst, bv_flag)
+    )
+}
+
+/// Return boogie name of given spec var.
+pub fn boogie_spec_var_name(
+    module_env: &ModuleEnv<'_>,
+    name: Symbol,
+    inst: &[Type],
+    memory_label: &Option<MemoryLabel>,
+) -> String {
+    format!(
+        "${}_{}{}{}",
+        boogie_module_name(module_env),
+        name.display(module_env.symbol_pool()),
+        boogie_inst_suffix(module_env.env, inst),
+        boogie_memory_label(memory_label)
+    )
+}
+
+/// Return boogie name of given spec function.
+pub fn boogie_spec_fun_name(
+    env: &ModuleEnv<'_>,
+    id: SpecFunId,
+    inst: &[Type],
+    bv_flag: bool,
+) -> String {
+    let decl = env.get_spec_fun(id);
+    let pos = env
+        .get_spec_funs_of_name(decl.name)
+        .position(|(overload_id, _)| &id == overload_id)
+        .expect("spec fun env inconsistent");
+    let overload_qualifier = if pos > 0 {
+        format!("_{}", pos)
+    } else {
+        "".to_string()
+    };
+    let mut suffix = boogie_inst_suffix_bv(env.env, inst, &[bv_flag]);
+    if env.is_table() {
+        assert_eq!(inst.len(), 2);
+        suffix = boogie_inst_suffix_bv_pair(env.env, inst, &[false, bv_flag]);
+    };
+    format!(
+        "${}_{}{}{}",
+        boogie_module_name(env),
+        decl.name.display(env.symbol_pool()),
+        overload_qualifier,
+        suffix
+    )
+}
+
+/// Return boogie name for function representing a lifted `some` expression.
+pub fn boogie_choice_fun_name(id: usize) -> String {
+    format!("$choice_{}", id)
+}
+
+/// Creates the name of the resource memory domain for any function for the given struct.
+/// This variable represents a local variable of the Boogie translation of this function.
+pub fn boogie_modifies_memory_name(env: &GlobalEnv, memory: &QualifiedInstId<StructId>) -> String {
+    let struct_env = &env.get_struct_qid(memory.to_qualified_id());
+    format!("{}_$modifies", boogie_struct_name(struct_env, &memory.inst))
+}
+
+/// Creates the name of the resource memory for the given struct.
+pub fn boogie_resource_memory_name(
+    env: &GlobalEnv,
+    memory: &QualifiedInstId<StructId>,
+    memory_label: &Option<MemoryLabel>,
+) -> String {
+    let struct_env = env.get_struct_qid(memory.to_qualified_id());
+    format!(
+        "{}_$memory{}",
+        boogie_struct_name(&struct_env, &memory.inst),
+        boogie_memory_label(memory_label)
+    )
+}
+
+/// Creates a string for a memory label.
+fn boogie_memory_label(memory_label: &Option<MemoryLabel>) -> String {
+    if let Some(l) = memory_label {
+        format!("#{}", l.as_usize())
+    } else {
+        "".to_string()
+    }
+}
+
+/// Creates a vector from the given list of arguments.
+pub fn boogie_make_vec_from_strings(args: &[String]) -> String {
+    if args.is_empty() {
+        "EmptyVec()".to_string()
+    } else {
+        let mut make = "".to_owned();
+        let mut at = 0;
+        loop {
+            let n = usize::min(args.len() - at, MAX_MAKE_VEC_ARGS);
+            let m = format!("MakeVec{}({})", n, args[at..at + n].iter().join(", "));
+            make = if make.is_empty() {
+                m
+            } else {
+                format!("ConcatVec({}, {})", make, m)
+            };
+            at += n;
+            if at >= args.len() {
+                break;
+            }
+        }
+        make
+    }
+}
+
+/// Return boogie type for a local with given signature token.
+pub fn boogie_type(env: &GlobalEnv, ty: &Type) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+    match ty {
+        Primitive(p) => match p {
+            U8 | U16 | U32 | U64 | U128 | U256 | Num | Address => "int".to_string(),
+            Signer => "$signer".to_string(),
+            Bool => "bool".to_string(),
+            Range | EventStore => panic!("unexpected type"),
+        },
+        Vector(et) => format!("Vec ({})", boogie_type(env, et)),
+        Struct(mid, sid, inst) => boogie_struct_name(&env.get_module(*mid).into_struct(*sid), inst),
+        Reference(_, bt) => format!("$Mutation ({})", boogie_type(env, bt)),
+        TypeParameter(idx) => boogie_type_param(env, *idx),
+        Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..) | Error | Var(..) => {
+            format!("<<unsupported: {:?}>>", ty)
+        }
+    }
+}
+
+/// Return boogie type for a local with given signature token.
+/// TODO(tengzhang): combine with boogie_type later
+pub fn boogie_bv_type(env: &GlobalEnv, ty: &Type) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+    match ty {
+        Primitive(p) => match p {
+            U8 => "bv8".to_string(),
+            U16 => "bv16".to_string(),
+            U32 => "bv32".to_string(),
+            U64 => "bv64".to_string(),
+            U128 => "bv128".to_string(),
+            U256 => "bv256".to_string(),
+            Address => "int".to_string(),
+            Signer => "$signer".to_string(),
+            Bool => "bool".to_string(),
+            Range | EventStore => panic!("unexpected type"),
+            Num => "<<num is not unsupported here>>".to_string(),
+        },
+        Vector(et) => format!("Vec ({})", boogie_bv_type(env, et)),
+        Struct(mid, sid, inst) => {
+            boogie_struct_name_bv(&env.get_module(*mid).into_struct(*sid), inst, true)
+        }
+        Reference(_, bt) => format!("$Mutation ({})", boogie_bv_type(env, bt)),
+        TypeParameter(idx) => boogie_type_param(env, *idx),
+        Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..) | Error | Var(..) => {
+            format!("<<unsupported: {:?}>>", ty)
+        }
+    }
+}
+
+pub fn boogie_type_param(_env: &GlobalEnv, idx: u16) -> String {
+    format!("#{}", idx)
+}
+
+pub fn boogie_temp(env: &GlobalEnv, ty: &Type, instance: usize, bv_flag: bool) -> String {
+    boogie_temp_from_suffix(env, &boogie_type_suffix_bv(env, ty, bv_flag), instance)
+}
+
+pub fn boogie_temp_from_suffix(_env: &GlobalEnv, suffix: &str, instance: usize) -> String {
+    format!("$temp_{}'{}'", instance, suffix)
+}
+
+/// Generate number literals that may comes with a bv suffix in the boogie code
+pub fn boogie_num_literal(num: &String, base: usize, bv_flag: bool) -> String {
+    if bv_flag {
+        format!("{}bv{}", num, base)
+    } else {
+        num.clone()
+    }
+}
+
+pub fn boogie_num_type_string(num: &str, bv_flag: bool) -> String {
+    let pre = if bv_flag { "bv" } else { "u" };
+    [pre, num].join("")
+}
+
+pub fn boogie_num_type_string_capital(num: &str, bv_flag: bool) -> String {
+    let pre = if bv_flag { "Bv" } else { "U" };
+    [pre, num].join("")
+}
+
+pub fn boogie_num_type_base(ty: &Type) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+    match ty {
+        Primitive(p) => match p {
+            U8 => "8".to_string(),
+            U16 => "16".to_string(),
+            U32 => "32".to_string(),
+            U64 => "64".to_string(),
+            U128 => "128".to_string(),
+            U256 => "256".to_string(),
+            Num => "<<num is not unsupported here>>".to_string(),
+            _ => format!("<<unsupported {:?}>>", ty),
+        },
+        _ => format!("<<unsupported {:?}>>", ty),
+    }
+}
+
+/// Returns the suffix to specialize a name for the given type instance.
+pub fn boogie_type_suffix_bv(env: &GlobalEnv, ty: &Type, bv_flag: bool) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+
+    match ty {
+        Primitive(p) => match p {
+            U8 => boogie_num_type_string("8", bv_flag),
+            U16 => boogie_num_type_string("16", bv_flag),
+            U32 => boogie_num_type_string("32", bv_flag),
+            U64 => boogie_num_type_string("64", bv_flag),
+            U128 => boogie_num_type_string("128", bv_flag),
+            U256 => boogie_num_type_string("256", bv_flag),
+            Num => {
+                if bv_flag {
+                    "<<num is not unsupported here>>".to_string()
+                } else {
+                    "num".to_string()
+                }
+            }
+            Address => "address".to_string(),
+            Signer => "signer".to_string(),
+            Bool => "bool".to_string(),
+            Range => "range".to_string(),
+            EventStore => format!("<<unsupported {:?}>>", ty),
+        },
+        Vector(et) => format!(
+            "vec{}",
+            boogie_inst_suffix_bv(env, &[et.as_ref().to_owned()], &[bv_flag])
+        ),
+        Struct(mid, sid, inst) => {
+            boogie_type_suffix_for_struct(&env.get_module(*mid).into_struct(*sid), inst, bv_flag)
+        }
+        TypeParameter(idx) => boogie_type_param(env, *idx),
+        Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..) | Error | Var(..)
+        | Reference(..) => format!("<<unsupported {:?}>>", ty),
+    }
+}
+
+/// Return the suffix to specialize a name for the given type instance.
+pub fn boogie_type_suffix(env: &GlobalEnv, ty: &Type) -> String {
+    boogie_type_suffix_bv(env, ty, false)
+}
+
+pub fn boogie_type_suffix_for_struct(
+    struct_env: &StructEnv<'_>,
+    inst: &[Type],
+    bv_flag: bool,
+) -> String {
+    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+        format!(
+            "${}_{}{}",
+            boogie_module_name(&struct_env.module_env),
+            struct_env.get_name().display(struct_env.symbol_pool()),
+            boogie_inst_suffix_bv_pair(struct_env.module_env.env, inst, &[false, bv_flag])
+        )
+    } else {
+        boogie_struct_name(struct_env, inst)
+    }
+}
+
+/// Generate suffix after instantiation of type parameters
+pub fn boogie_inst_suffix_bv(env: &GlobalEnv, inst: &[Type], bv_flag: &[bool]) -> String {
+    if inst.is_empty() {
+        "".to_owned()
+    } else {
+        let suffix = if bv_flag.len() == 1 {
+            inst.iter()
+                .map(|ty| boogie_type_suffix_bv(env, ty, bv_flag[0]))
+                .join("_")
+        } else {
+            assert_eq!(inst.len(), bv_flag.len());
+            inst.iter()
+                .zip(bv_flag.iter())
+                .map(|(ty, flag)| boogie_type_suffix_bv(env, ty, *flag))
+                .join("_")
+        };
+        format!("'{}'", suffix)
+    }
+}
+
+pub fn boogie_inst_suffix_bv_pair(env: &GlobalEnv, inst: &[Type], bv_flag: &[bool]) -> String {
+    if inst.is_empty() {
+        "".to_owned()
+    } else {
+        assert_eq!(inst.len(), bv_flag.len());
+        format!(
+            "'{}'",
+            inst.iter()
+                .zip(bv_flag.iter())
+                .map(|(ty, flag)| boogie_type_suffix_bv(env, ty, *flag))
+                .join("_")
+        )
+    }
+}
+
+pub fn boogie_inst_suffix(env: &GlobalEnv, inst: &[Type]) -> String {
+    if inst.is_empty() {
+        "".to_owned()
+    } else {
+        format!(
+            "'{}'",
+            inst.iter().map(|ty| boogie_type_suffix(env, ty)).join("_")
+        )
+    }
+}
+
+pub fn boogie_equality_for_type(env: &GlobalEnv, eq: bool, ty: &Type, bv_flag: bool) -> String {
+    format!(
+        "{}'{}'",
+        if eq { "$IsEqual" } else { "!$IsEqual" },
+        boogie_type_suffix_bv(env, ty, bv_flag)
+    )
+}
+
+/// Create boogie well-formed boolean expression
+/// TODO(tengzhang): combine with boogie_well_formed_expr
+pub fn boogie_well_formed_expr_bv(env: &GlobalEnv, name: &str, ty: &Type, bv_flag: bool) -> String {
+    let target = if ty.is_reference() {
+        format!("$Dereference({})", name)
+    } else {
+        name.to_owned()
+    };
+    let suffix = boogie_type_suffix_bv(env, ty.skip_reference(), bv_flag);
+    format!("$IsValid'{}'({})", suffix, target)
+}
+
+/// Create boogie well-formed boolean expression.
+pub fn boogie_well_formed_expr(env: &GlobalEnv, name: &str, ty: &Type) -> String {
+    let target = if ty.is_reference() {
+        format!("$Dereference({})", name)
+    } else {
+        name.to_owned()
+    };
+    let suffix = boogie_type_suffix(env, ty.skip_reference());
+    format!("$IsValid'{}'({})", suffix, target)
+}
+
+/// Create boogie well-formed check. The result will be either an empty string or a
+/// newline-terminated assume statement.
+pub fn boogie_well_formed_check(env: &GlobalEnv, name: &str, ty: &Type, bv_flag: bool) -> String {
+    let expr = boogie_well_formed_expr_bv(env, name, ty, bv_flag);
+    if !expr.is_empty() {
+        format!("assume {};", expr)
+    } else {
+        "".to_string()
+    }
+}
+
+/// Create boogie global variable with type constraint. No references allowed.
+pub fn boogie_declare_global(env: &GlobalEnv, name: &str, ty: &Type) -> String {
+    assert!(!ty.is_reference());
+    format!(
+        "var {} : {} where {};",
+        name,
+        boogie_type(env, ty),
+        // TODO: boogie crash boogie_well_formed_expr(env, name, ty)
+        // boogie_well_formed_expr(env, name, ty)"
+        "true"
+    )
+}
+
+pub fn boogie_byte_blob(_options: &BoogieOptions, val: &[u8], bv_flag: bool) -> String {
+    let val_suffix = if bv_flag { "bv8" } else { "" };
+    let suffix = if bv_flag { "bv8" } else { "u8" };
+    let args = val
+        .iter()
+        .map(|v| format!("{}{}", *v, val_suffix))
+        .collect_vec();
+    if args.is_empty() {
+        format!("$EmptyVec'{}'()", suffix)
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+pub fn boogie_address_blob(_options: &BoogieOptions, val: &[BigUint]) -> String {
+    let args = val.iter().map(|v| format!("{}", *v)).collect_vec();
+    if args.is_empty() {
+        "$EmptyVec'address'()".to_string()
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+/// Generate vectors for constant values
+/// TODO(tengzhang): add support for bv types
+pub fn boogie_constant_blob(_options: &BoogieOptions, val: &[Constant]) -> String {
+    let args = val
+        .iter()
+        .map(|v| boogie_constant(_options, v))
+        .collect_vec();
+    if args.is_empty() {
+        "EmptyVec()".to_string()
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+pub fn boogie_constant(_options: &BoogieOptions, val: &Constant) -> String {
+    match val {
+        Constant::Bool(true) => "true".to_string(),
+        Constant::Bool(false) => "false".to_string(),
+        Constant::U8(num) => num.to_string(),
+        Constant::U64(num) => num.to_string(),
+        Constant::U128(num) => num.to_string(),
+        Constant::U256(num) => num.to_string(),
+        Constant::Address(v) => v.to_string(),
+        Constant::ByteArray(v) => boogie_byte_blob(_options, v, false),
+        Constant::AddressArray(v) => boogie_address_blob(_options, v),
+        Constant::Vector(vec) => boogie_make_vec_from_strings(
+            &vec.iter()
+                .map(|v| boogie_constant(_options, v))
+                .collect_vec(),
+        ),
+        Constant::U16(num) => num.to_string(),
+        Constant::U32(num) => num.to_string(),
+    }
+}
+
+pub fn boogie_value_blob(_options: &BoogieOptions, val: &[Value]) -> String {
+    let args = val.iter().map(|v| boogie_value(_options, v)).collect_vec();
+    if args.is_empty() {
+        "EmptyVec()".to_string()
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+pub fn boogie_value(_options: &BoogieOptions, val: &Value) -> String {
+    match val {
+        Value::Bool(true) => "true".to_string(),
+        Value::Bool(false) => "false".to_string(),
+        Value::Number(num) => num.to_string(),
+        Value::Address(v) => v.to_string(),
+        Value::ByteArray(v) => boogie_byte_blob(_options, v, false),
+        Value::AddressArray(v) => boogie_address_blob(_options, v),
+        Value::Vector(vec) => boogie_make_vec_from_strings(
+            &vec.iter().map(|v| boogie_value(_options, v)).collect_vec(),
+        ),
+    }
+}
+
+/// Construct a statement to debug track a local based on the Boogie attribute approach.
+pub fn boogie_debug_track_local(
+    fun_target: &FunctionTarget<'_>,
+    origin_idx: TempIndex,
+    idx: TempIndex,
+    ty: &Type,
+    bv_flag: bool,
+) -> String {
+    boogie_debug_track(fun_target, "$track_local", origin_idx, idx, ty, bv_flag)
+}
+
+fn boogie_debug_track(
+    fun_target: &FunctionTarget<'_>,
+    track_tag: &str,
+    tracked_idx: usize,
+    idx: TempIndex,
+    ty: &Type,
+    bv_flag: bool,
+) -> String {
+    let fun_def_idx = fun_target.func_env.get_def_idx();
+    let value = format!("$t{}", idx);
+    if ty.is_reference() {
+        let temp_name = boogie_temp(fun_target.global_env(), ty.skip_reference(), 0, bv_flag);
+        format!(
+            "{} := $Dereference({});\n\
+             assume {{:print \"{}({},{},{}):\", {}}} {} == {};",
+            temp_name,
+            value,
+            track_tag,
+            fun_target.func_env.module_env.get_id().to_usize(),
+            fun_def_idx,
+            tracked_idx,
+            temp_name,
+            temp_name,
+            temp_name
+        )
+    } else {
+        format!(
+            "assume {{:print \"{}({},{},{}):\", {}}} {} == {};",
+            track_tag,
+            fun_target.func_env.module_env.get_id().to_usize(),
+            fun_def_idx,
+            tracked_idx,
+            value,
+            value,
+            value
+        )
+    }
+}
+
+/// Construct a statement to debug track an abort.
+pub fn boogie_debug_track_abort(fun_target: &FunctionTarget<'_>, abort_code: &str) -> String {
+    let fun_def_idx = fun_target.func_env.get_def_idx();
+    format!(
+        "assume {{:print \"$track_abort({},{}):\", {}}} {} == {};",
+        fun_target.func_env.module_env.get_id().to_usize(),
+        fun_def_idx,
+        abort_code,
+        abort_code,
+        abort_code,
+    )
+}
+
+/// Construct a statement to debug track a return value.
+pub fn boogie_debug_track_return(
+    fun_target: &FunctionTarget<'_>,
+    ret_idx: usize,
+    idx: TempIndex,
+    ty: &Type,
+    bv_flag: bool,
+) -> String {
+    boogie_debug_track(fun_target, "$track_return", ret_idx, idx, ty, bv_flag)
+}
+
+pub enum TypeIdentToken {
+    Char(u8),
+    Variable(String),
+}
+
+impl TypeIdentToken {
+    pub fn make(name: &str) -> Vec<TypeIdentToken> {
+        name.as_bytes()
+            .iter()
+            .map(|c| TypeIdentToken::Char(*c))
+            .collect()
+    }
+
+    pub fn join(sep: &str, mut pieces: Vec<Vec<TypeIdentToken>>) -> Vec<TypeIdentToken> {
+        if pieces.is_empty() {
+            return vec![];
+        }
+
+        pieces.reverse();
+        let mut tokens = pieces.pop().unwrap();
+        while !pieces.is_empty() {
+            tokens.extend(Self::make(sep));
+            tokens.extend(pieces.pop().unwrap());
+        }
+        tokens
+    }
+
+    pub fn convert_to_bytes(tokens: Vec<TypeIdentToken>) -> String {
+        fn get_char_array(tokens: &[TypeIdentToken], start: usize, end: usize) -> String {
+            let elements = (start..end)
+                .map(|k| {
+                    format!(
+                        "[{} := {}]",
+                        k - start,
+                        match &tokens[k] {
+                            TypeIdentToken::Char(c) => *c,
+                            TypeIdentToken::Variable(_) => unreachable!(),
+                        }
+                    )
+                })
+                .join("");
+            format!("Vec(DefaultVecMap(){}, {})", elements, end - start)
+        }
+
+        // construct all the segments
+        let mut segments = vec![];
+
+        let mut char_seq_start = None;
+        for (i, token) in tokens.iter().enumerate() {
+            match token {
+                TypeIdentToken::Char(_) => {
+                    if char_seq_start.is_none() {
+                        char_seq_start = Some(i);
+                    }
+                }
+                TypeIdentToken::Variable(name) => {
+                    if let Some(start) = &char_seq_start {
+                        segments.push(get_char_array(&tokens, *start, i));
+                    };
+                    char_seq_start = None;
+                    segments.push(name.clone());
+                }
+            }
+        }
+        if let Some(start) = char_seq_start {
+            segments.push(get_char_array(&tokens, start, tokens.len()));
+        }
+
+        // concat the segments
+        if segments.is_empty() {
+            return String::new();
+        }
+
+        segments.reverse();
+        let mut cursor = segments.pop().unwrap();
+        while let Some(next) = segments.pop() {
+            cursor = format!("ConcatVec({}, {})", cursor, next);
+        }
+        cursor
+    }
+}
+
+/// A formatter for address
+pub struct AddressFormatter {
+    /// whether the `0x` prefix is needed
+    pub prefix: bool,
+    /// whether to include leading zeros
+    pub full_length: bool,
+    /// whether to capitalize the hex repr
+    pub capitalized: bool,
+}
+
+impl AddressFormatter {
+    pub fn format(&self, addr: &BigUint) -> String {
+        let result = addr.to_str_radix(16);
+        // into correct length
+        let result = if self.full_length {
+            format!("{:0>32}", result)
+        } else {
+            result
+        };
+        // into correct case
+        let result = if self.capitalized {
+            result.to_uppercase()
+        } else {
+            result
+        };
+        // with or without prefix
+        if self.prefix {
+            format!("0x{}", result)
+        } else {
+            result
+        }
+    }
+}
+
+fn type_name_to_ident_tokens(
+    env: &GlobalEnv,
+    ty: &Type,
+    formatter: &AddressFormatter,
+) -> Vec<TypeIdentToken> {
+    match ty {
+        Type::Primitive(PrimitiveType::Bool) => TypeIdentToken::make("bool"),
+        Type::Primitive(PrimitiveType::U8) => TypeIdentToken::make("u8"),
+        Type::Primitive(PrimitiveType::U16) => TypeIdentToken::make("u16"),
+        Type::Primitive(PrimitiveType::U32) => TypeIdentToken::make("u32"),
+        Type::Primitive(PrimitiveType::U64) => TypeIdentToken::make("u64"),
+        Type::Primitive(PrimitiveType::U128) => TypeIdentToken::make("u128"),
+        Type::Primitive(PrimitiveType::U256) => TypeIdentToken::make("u256"),
+        Type::Primitive(PrimitiveType::Address) => TypeIdentToken::make("address"),
+        Type::Primitive(PrimitiveType::Signer) => TypeIdentToken::make("signer"),
+        Type::Vector(element) => {
+            let mut tokens = TypeIdentToken::make("vector<");
+            tokens.extend(type_name_to_ident_tokens(env, element, formatter));
+            tokens.extend(TypeIdentToken::make(">"));
+            tokens
+        }
+        Type::Struct(mid, sid, ty_args) => {
+            let module_env = env.get_module(*mid);
+            let struct_env = module_env.get_struct(*sid);
+            let type_name = format!(
+                "{}::{}::{}",
+                formatter.format(module_env.get_name().addr()),
+                module_env
+                    .get_name()
+                    .name()
+                    .display(module_env.symbol_pool()),
+                struct_env.get_name().display(module_env.symbol_pool())
+            );
+            let mut tokens = TypeIdentToken::make(&type_name);
+            if !ty_args.is_empty() {
+                tokens.extend(TypeIdentToken::make("<"));
+                let ty_args_tokens = ty_args
+                    .iter()
+                    .map(|t| type_name_to_ident_tokens(env, t, formatter))
+                    .collect();
+                tokens.extend(TypeIdentToken::join(", ", ty_args_tokens));
+                tokens.extend(TypeIdentToken::make(">"));
+            }
+            tokens
+        }
+        Type::TypeParameter(idx) => {
+            vec![TypeIdentToken::Variable(format!(
+                "$TypeName(#{}_info)",
+                *idx
+            ))]
+        }
+        // move types that are not allowed
+        Type::Reference(..) | Type::Tuple(..) => {
+            unreachable!("Prohibited move type in type_name call");
+        }
+        // spec only types
+        Type::Primitive(PrimitiveType::Num)
+        | Type::Primitive(PrimitiveType::Range)
+        | Type::Primitive(PrimitiveType::EventStore)
+        | Type::Fun(..)
+        | Type::TypeDomain(..)
+        | Type::ResourceDomain(..) => {
+            unreachable!("Unexpected spec-only type in type_name call");
+        }
+        // temporary types
+        Type::Error | Type::Var(..) => {
+            unreachable!("Unexpected temporary type in type_name call");
+        }
+    }
+}
+
+/// Convert a type name into a format that can be recognized by Boogie
+///
+/// The `stdlib` bool flag represents whether this type name is intended for
+/// - true  --> `std::type_name` and
+/// - false --> `ext::type_info`.
+/// TODO(mengxu): the above is a very hacky, we need a better way to differentiate
+pub fn boogie_reflection_type_name(env: &GlobalEnv, ty: &Type, stdlib: bool) -> String {
+    let formatter = if stdlib {
+        AddressFormatter {
+            prefix: false,
+            full_length: true,
+            capitalized: false,
+        }
+    } else {
+        AddressFormatter {
+            prefix: true,
+            full_length: false,
+            capitalized: false,
+        }
+    };
+    let bytes = TypeIdentToken::convert_to_bytes(type_name_to_ident_tokens(env, ty, &formatter));
+    if stdlib {
+        format!(
+            "${}_type_name_TypeName(${}_ascii_String({}))",
+            env.get_stdlib_address(),
+            env.get_stdlib_address(),
+            bytes
+        )
+    } else {
+        format!("${}_string_String({})", env.get_stdlib_address(), bytes)
+    }
+}
+
+enum TypeInfoPack {
+    Struct(BigUint, String, String),
+    Symbolic(TypeParameterIndex),
+}
+
+fn type_name_to_info_pack(env: &GlobalEnv, ty: &Type) -> Option<TypeInfoPack> {
+    match ty {
+        Type::Struct(mid, sid, _) => {
+            let module_env = env.get_module(*mid);
+            let struct_env = module_env.get_struct(*sid);
+            let module_name = module_env.get_name();
+            Some(TypeInfoPack::Struct(
+                module_name.addr().clone(),
+                module_name
+                    .name()
+                    .display(module_env.symbol_pool())
+                    .to_string(),
+                struct_env
+                    .get_name()
+                    .display(module_env.symbol_pool())
+                    .to_string(),
+            ))
+        }
+        Type::TypeParameter(idx) => Some(TypeInfoPack::Symbolic(*idx)),
+        // move types that will cause an error
+        Type::Primitive(PrimitiveType::Bool)
+        | Type::Primitive(PrimitiveType::U8)
+        | Type::Primitive(PrimitiveType::U16)
+        | Type::Primitive(PrimitiveType::U32)
+        | Type::Primitive(PrimitiveType::U64)
+        | Type::Primitive(PrimitiveType::U128)
+        | Type::Primitive(PrimitiveType::U256)
+        | Type::Primitive(PrimitiveType::Address)
+        | Type::Primitive(PrimitiveType::Signer)
+        | Type::Vector(_) => None,
+        // move types that are not allowed
+        Type::Reference(..) | Type::Tuple(..) => {
+            unreachable!("Prohibited move type in type_name call");
+        }
+        // spec only types
+        Type::Primitive(PrimitiveType::Num)
+        | Type::Primitive(PrimitiveType::Range)
+        | Type::Primitive(PrimitiveType::EventStore)
+        | Type::Fun(..)
+        | Type::TypeDomain(..)
+        | Type::ResourceDomain(..) => {
+            unreachable!("Unexpected spec-only type in type_name call");
+        }
+        // temporary types
+        Type::Error | Type::Var(..) => {
+            unreachable!("Unexpected temporary type in type_name call");
+        }
+    }
+}
+
+/// Convert a type info into a format that can be recognized by Boogie
+pub fn boogie_reflection_type_info(env: &GlobalEnv, ty: &Type) -> (String, String) {
+    fn get_symbol_is_struct(idx: TypeParameterIndex) -> String {
+        format!("is#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_account_address(idx: TypeParameterIndex) -> String {
+        format!("a#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_module_name(idx: TypeParameterIndex) -> String {
+        format!("m#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_struct_name(idx: TypeParameterIndex) -> String {
+        format!("s#$TypeParamStruct(#{}_info)", idx)
+    }
+
+    let extlib_address = env.get_extlib_address();
+    match type_name_to_info_pack(env, ty) {
+        None => (
+            "false".to_string(),
+            format!(
+                "${}_type_info_TypeInfo(0, EmptyVec(), EmptyVec())",
+                extlib_address
+            ),
+        ),
+        Some(TypeInfoPack::Struct(addr, module_name, struct_name)) => {
+            let module_repr = TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&module_name));
+            let struct_repr = TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&struct_name));
+            (
+                "true".to_string(),
+                format!(
+                    "${}_type_info_TypeInfo({}, {}, {})",
+                    extlib_address, addr, module_repr, struct_repr
+                ),
+            )
+        }
+        Some(TypeInfoPack::Symbolic(idx)) => (
+            get_symbol_is_struct(idx),
+            format!(
+                "${}_type_info_TypeInfo({}, {}, {})",
+                extlib_address,
+                get_symbol_account_address(idx),
+                get_symbol_module_name(idx),
+                get_symbol_struct_name(idx)
+            ),
+        ),
+    }
+}
+
+/// Encode the test on whether a type is a struct in a format that can be recognized by Boogie
+pub fn boogie_reflection_type_is_struct(env: &GlobalEnv, ty: &Type) -> String {
+    match type_name_to_info_pack(env, ty) {
+        None => "false".to_string(),
+        Some(TypeInfoPack::Struct(..)) => "true".to_string(),
+        Some(TypeInfoPack::Symbolic(idx)) => format!("is#$TypeParamStruct(#{}_info)", idx),
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/boogie_wrapper.rs b/vendors/move/crates/move-prover-boogie-backend/src/boogie_wrapper.rs
new file mode 100644
index 000000000..3a320ecb3
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/boogie_wrapper.rs
@@ -0,0 +1,1775 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Wrapper around the boogie program. Allows to call boogie and analyze the output.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs,
+    num::ParseIntError,
+    option::Option::None,
+};
+
+use anyhow::anyhow;
+use codespan::{ByteIndex, ColumnIndex, LineIndex, Location, Span};
+use codespan_reporting::diagnostic::{Diagnostic, Label};
+use itertools::Itertools;
+use log::{debug, info, warn};
+use num::BigInt;
+use once_cell::sync::Lazy;
+use pretty::RcDoc;
+use regex::Regex;
+
+use move_binary_format::file_format::FunctionDefinitionIndex;
+use move_model::{
+    ast::TempIndex,
+    code_writer::CodeWriter,
+    model::{FunId, GlobalEnv, Loc, ModuleId, NodeId, QualifiedId, StructEnv},
+    pragmas::INTRINSIC_TYPE_MAP,
+    ty::{PrimitiveType, Type},
+};
+use move_stackless_bytecode::function_target_pipeline::{FunctionTargetsHolder, FunctionVariant};
+
+// DEBUG
+// use backtrace::Backtrace;
+use crate::{
+    boogie_helpers::{boogie_inst_suffix, boogie_struct_name},
+    options::{BoogieOptions, VectorTheory},
+    prover_task_runner::{ProverTaskRunner, RunBoogieWithSeeds},
+};
+
+/// A type alias for the way how we use crate `pretty`'s document type. `pretty` is a
+/// Wadler-style pretty printer. Our simple usage doesn't require any lifetime management.
+type PrettyDoc = RcDoc<'static, ()>;
+
+// -----------------------------------------------
+// # Boogie Wrapper
+
+/// Represents the boogie wrapper.
+pub struct BoogieWrapper<'env> {
+    pub env: &'env GlobalEnv,
+    pub targets: &'env FunctionTargetsHolder,
+    pub writer: &'env CodeWriter,
+    pub options: &'env BoogieOptions,
+}
+
+/// Output of a boogie run.
+pub struct BoogieOutput {
+    /// All errors which could be parsed from the output.
+    pub errors: Vec<BoogieError>,
+
+    /// Full output as a string.
+    pub all_output: String,
+}
+
+/// Kind of boogie error.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum BoogieErrorKind {
+    Assertion,
+    Inconclusive,
+    Inconsistency,
+    Internal,
+}
+
+impl BoogieErrorKind {
+    fn is_from_verification(self) -> bool {
+        use BoogieErrorKind::*;
+        matches!(self, Assertion)
+    }
+}
+
+/// A boogie error.
+pub struct BoogieError {
+    pub kind: BoogieErrorKind,
+    pub loc: Loc,
+    pub message: String,
+    pub execution_trace: Vec<TraceEntry>,
+    pub model: Option<Model>,
+}
+
+/// A trace entry.
+pub enum TraceEntry {
+    AtLocation(Loc),
+    Temporary(QualifiedId<FunId>, TempIndex, ModelValue),
+    Result(QualifiedId<FunId>, usize, ModelValue),
+    Abort(QualifiedId<FunId>, ModelValue),
+    Exp(NodeId, ModelValue),
+    SubExp(NodeId, ModelValue),
+    GlobalMem(NodeId, ModelValue),
+    InfoLine(String),
+}
+
+// Error message matching
+static VERIFICATION_DIAG_STARTS: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"(?m)^assert_failed\((?P<args>[^)]*)\): (?P<msg>.*)$").unwrap());
+
+static INCONCLUSIVE_DIAG_STARTS: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"(?m)^.*\((?P<line>\d+),(?P<col>\d+)\).*Verification(?P<str>.*)(inconclusive|out of resource|timed out).*$")
+        .unwrap()
+});
+
+static INCONSISTENCY_DIAG_STARTS: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"(?m)^inconsistency_detected\((?P<args>[^)]*)\)").unwrap());
+
+impl<'env> BoogieWrapper<'env> {
+    /// Calls boogie on the given file. On success, returns a struct representing the analyzed
+    /// output of boogie.
+    pub fn call_boogie(&self, boogie_file: &str) -> anyhow::Result<BoogieOutput> {
+        let args = self.options.get_boogie_command(boogie_file)?;
+        info!("running solver");
+        debug!("command line: {}", args.iter().join(" "));
+        let task = RunBoogieWithSeeds {
+            options: self.options.clone(),
+            boogie_file: boogie_file.to_string(),
+        };
+        // When running on complicated formulas(especially those with quantifiers), SMT solvers
+        // can suffer from the so-called butterfly effect, where minor changes such as using
+        // different random seeds cause significant instabilities in verification times.
+        // Thus by running multiple instances of Boogie with different random seeds, we can
+        // potentially alleviate the instability.
+        let (seed, output_res) = ProverTaskRunner::run_tasks(
+            task,
+            self.options.num_instances,
+            self.options.sequential_task,
+            self.options.hard_timeout_secs,
+        );
+        let output = match output_res {
+            Err(err) => {
+                if err.kind() == std::io::ErrorKind::TimedOut {
+                    let err = BoogieError {
+                        kind: BoogieErrorKind::Internal,
+                        loc: self.env.unknown_loc(),
+                        message: format!(
+                            "Boogie execution exceeded hard timeout of {}s",
+                            self.options.hard_timeout_secs
+                        ),
+                        execution_trace: vec![],
+                        model: None,
+                    };
+                    return Ok(BoogieOutput {
+                        errors: vec![err],
+                        all_output: "".to_string(),
+                    });
+                } else {
+                    panic!("cannot execute boogie `{:?}`: {}", args, err)
+                }
+            }
+            Ok(out) => out,
+        };
+        if self.options.num_instances > 1 {
+            debug!("Boogie instance with seed {} finished first", seed);
+        }
+
+        debug!("analyzing boogie output");
+        let out = String::from_utf8_lossy(&output.stdout).to_string();
+        let err = String::from_utf8_lossy(&output.stderr).to_string();
+        // Boogie prints a few ad-hoc error messages (with exit code 0!), so we have
+        // no chance to catch an error until we recognize one of those patterns.
+        if out
+            .trim()
+            .starts_with("Fatal Error: ProverException: Cannot find specified prover")
+        {
+            return Err(anyhow!(
+                "The configured prover `{}` could not be found{}",
+                if self.options.use_cvc5 {
+                    &self.options.cvc5_exe
+                } else {
+                    &self.options.z3_exe
+                },
+                if self.options.use_cvc5 {
+                    " (--use-cvc5 is set)"
+                } else {
+                    ""
+                }
+            ));
+        }
+        if !output.status.success() {
+            // Exit here with raw output.
+            return Err(anyhow!(
+                "Boogie error ({}): {}\n\nstderr:\n{}",
+                output.status,
+                out,
+                err
+            ));
+        }
+        if out.trim().starts_with("Unable to monomorphize") {
+            return Err(anyhow!("Boogie error: {}\n\nstderr:\n{}", out, err));
+        }
+        // Boogie output contains the string "errors detected in" whenever parsing,
+        // resolution, or type checking errors are discovered.
+        if out.contains("errors detected in") {
+            return Err(anyhow!(
+                "[internal] boogie exited with compilation errors:\n{}",
+                out
+            ));
+        }
+        if out.contains("Prover error:") {
+            return Err(anyhow!(
+                "[internal] boogie exited with prover errors:\n{}",
+                out
+            ));
+        }
+        let mut errors = self.extract_verification_errors(&out);
+        errors.extend(self.extract_inconclusive_errors(&out));
+        errors.extend(self.extract_inconsistency_errors(&out));
+        Ok(BoogieOutput {
+            errors,
+            all_output: out,
+        })
+    }
+
+    /// Calls boogie and analyzes output.
+    pub fn call_boogie_and_verify_output(&self, boogie_file: &str) -> anyhow::Result<()> {
+        let BoogieOutput { errors, all_output } = self.call_boogie(boogie_file)?;
+        let boogie_log_file = self.options.get_boogie_log_file(boogie_file);
+        let log_file_existed = std::path::Path::new(&boogie_log_file).exists();
+        debug!("writing boogie log to {}", boogie_log_file);
+        fs::write(&boogie_log_file, &all_output)?;
+
+        for error in &errors {
+            self.add_error(error);
+        }
+
+        if !log_file_existed && !self.options.keep_artifacts {
+            std::fs::remove_file(boogie_log_file).unwrap_or_default();
+        }
+
+        Ok(())
+    }
+
+    /// Helper to add a boogie error as a codespan Diagnostic.
+    fn add_error(&self, error: &BoogieError) {
+        // Create the error
+        let label = Label::primary(error.loc.file_id(), error.loc.span());
+        let mut diag = Diagnostic::error()
+            .with_message(error.message.clone())
+            .with_labels(vec![label]);
+
+        // Now add trace diagnostics.
+        if error.kind.is_from_verification() && !error.execution_trace.is_empty() {
+            let mut display = vec![];
+            let mut last_loc = self.env.unknown_loc();
+            let mut abort_in_progress = None;
+            let print_loc = |loc: &Loc, last_loc: &mut Loc, display: &mut Vec<String>| {
+                let info = if let Some(fun) = self.env.get_enclosing_function(loc) {
+                    let spec_suffix = if let Some(spec_loc) = &fun.get_spec().loc {
+                        if spec_loc.is_enclosing(loc) {
+                            " (spec)"
+                        } else {
+                            ""
+                        }
+                    } else {
+                        ""
+                    };
+                    format!(
+                        ": {}{}",
+                        fun.get_name().display(self.env.symbol_pool()),
+                        spec_suffix
+                    )
+                } else {
+                    "".to_string()
+                };
+                // Brute-force filter out "at" entries which look alike. This is cheaper than
+                // avoiding producing them, because of the step of converting locations to line
+                // numbers.
+                let display_str = format!("    {}{}", loc.display_line_only(self.env), info);
+                if display.is_empty() || display[display.len() - 1] != display_str {
+                    display.push(display_str);
+                }
+                *last_loc = loc.clone();
+            };
+
+            let mut subexp_map = BTreeMap::new();
+            let mut global_mem_map = BTreeMap::new();
+            for entry in &error.execution_trace {
+                use TraceEntry::*;
+                if abort_in_progress.is_some() && !matches!(entry, Exp(..)) {
+                    // Once abort happened, only allow expression traces.
+                    continue;
+                }
+                match entry {
+                    AtLocation(loc) => {
+                        if loc != &last_loc {
+                            print_loc(loc, &mut last_loc, &mut display);
+                        }
+                    }
+                    Temporary(fun, idx, value) if error.model.is_some() => {
+                        let fun_env = self.env.get_function(*fun);
+                        let fun_target = self
+                            .targets
+                            .get_target(&fun_env, &FunctionVariant::Baseline);
+                        if *idx < fun_target.get_local_count() {
+                            let var_name = fun_target
+                                .get_local_name(*idx)
+                                .display(self.env.symbol_pool())
+                                .to_string();
+                            let var_name =
+                                if self.options.stable_test_output && var_name.contains('$') {
+                                    // Redact the name.
+                                    // TODO(wrwg): There is some non-determinism in how the Move compiler
+                                    //   generates temporaries resulting from if-expressions. They also
+                                    //   happen with the assert-builtin, which the compilers maps to an if.
+                                    //   We should fix those in the Move compiler instead of working around her.
+                                    "<redacted>".to_string()
+                                } else {
+                                    var_name
+                                };
+                            let ty = fun_target.get_local_type(*idx);
+                            let pretty =
+                                value.pretty_or_raw(self, error.model.as_ref().unwrap(), ty);
+                            display.extend(self.make_trace_entry(var_name, pretty));
+                        }
+                    }
+                    Result(fun, idx, value) if error.model.is_some() => {
+                        let fun_env = self.env.get_function(*fun);
+                        let fun_target = self
+                            .targets
+                            .get_target(&fun_env, &FunctionVariant::Baseline);
+                        let n = fun_target.get_return_count();
+                        if *idx < n {
+                            let var_name = if n > 1 {
+                                format!("result_{}", idx.saturating_add(1))
+                            } else {
+                                "result".to_string()
+                            };
+                            let ty = fun_target.get_return_type(*idx);
+                            let pretty =
+                                value.pretty_or_raw(self, error.model.as_ref().unwrap(), ty);
+                            display.extend(self.make_trace_entry(var_name, pretty));
+                        }
+                    }
+                    Abort(_, value) => {
+                        display.push("        ABORTED".to_string());
+                        abort_in_progress = Some((last_loc.clone(), value));
+                    }
+                    Exp(node_id, value) => {
+                        let loc = self.env.get_node_loc(*node_id);
+                        if loc != last_loc {
+                            print_loc(&loc, &mut last_loc, &mut display);
+                        }
+                        let ty = self.env.get_node_type(*node_id);
+                        let value = value.pretty_or_raw(self, error.model.as_ref().unwrap(), &ty);
+                        let exp_str = self.get_abbreviated_source(*node_id);
+                        display.extend(self.make_trace_entry(exp_str, value));
+                    }
+                    SubExp(node_id, value) => {
+                        let exp_loc = self.env.get_node_loc(*node_id);
+                        if error.loc.is_enclosing(&exp_loc) {
+                            // This sub-expression trace is related to the error, remember it.
+                            // Notice that if a sub-expression with the same denotation appears
+                            // twice we take the latest one. This treatment depends on that the
+                            // sub-exp instrumentation in model/spec_translator does not decent
+                            // in old expressions; rather it displays the old as an atomic value.
+                            // Hence we can assume denotational and semantic equivalence.
+                            let loc = self.env.get_node_loc(*node_id);
+                            let denotation = self.env.get_source(&loc).unwrap_or("??");
+                            subexp_map.insert(denotation.to_string(), (*node_id, value.clone()));
+                        }
+                    }
+                    GlobalMem(node_id, ModelValue::List(elems)) => {
+                        // The bytecode track_global_memory takes the form
+                        // "($Memory_107864 |T@[Int]Bool!val!2| |T@[Int]$1_DiemTimestamp_CurrentTimeMicroseconds!val!0|)"
+                        // so the extracted list has three values where elems[2] is the reference to the model
+                        // of the corresponding global memory array while elems[1] is the reference to the array to denote
+                        // whether the memory exists
+                        if elems.len() == 3 {
+                            if let ModelValue::Literal(s) = &elems[2] {
+                                // Extract the struct name from elems[2]
+                                // e.g., $1_DiemTimestamp_CurrentTimeMicroseconds
+                                let struct_name_str =
+                                    &s[s.find('_').unwrap() + 1..s.find('!').unwrap()];
+                                global_mem_map.insert(
+                                    struct_name_str.to_string(),
+                                    (*node_id, elems[1].clone(), elems[2].clone()),
+                                );
+                            }
+                        }
+                    }
+                    InfoLine(info_line) => {
+                        // information that should be displayed to the user
+                        display.push(format!("    {}", info_line));
+                    }
+                    _ => {}
+                }
+            }
+            if let Some((abort_loc, value)) = abort_in_progress {
+                let code = if let Some(c) = value.extract_i128() {
+                    if c == -1 {
+                        " with execution failure".to_string()
+                    } else {
+                        format!(" with code 0x{:X}", c)
+                    }
+                } else {
+                    "".to_string()
+                };
+                diag = diag.with_labels(vec![Label::secondary(
+                    abort_loc.file_id(),
+                    abort_loc.span(),
+                )
+                .with_message(&format!("abort happened here{}", code))]);
+            }
+
+            // Inject information about sub-expressions of this failure
+            if !subexp_map.is_empty() {
+                let mut trace_display = std::mem::take(&mut display);
+                display.push("Related Bindings: ".to_string());
+                for (denotation, (id, value)) in subexp_map {
+                    let ty = self.env.get_node_type(id);
+                    let pretty = value.pretty_or_raw(self, error.model.as_ref().unwrap(), &ty);
+                    display.extend(self.make_trace_entry(denotation, pretty));
+                }
+                display.push("Execution Trace:".to_string());
+                display.append(&mut trace_display)
+            }
+
+            // Inject information about the global memory of the function where this failure happens
+            if !global_mem_map.is_empty() {
+                let mut trace_display = std::mem::take(&mut display);
+                display.push("Related Global Memory: ".to_string());
+                // Extract the domain information from the model
+                // Each memory slot has a corresponding domain flag
+                // Print the slot when the flag is set to true
+                let domain_info = extract_domain(error.model.as_ref().unwrap());
+                for (struct_name_str, (id, domain_value, mem_value)) in global_mem_map {
+                    let ty = self.env.get_node_type(id);
+                    let pretty = mem_value
+                        .pretty_mem(
+                            self,
+                            &domain_value,
+                            &domain_info,
+                            error.model.as_ref().unwrap(),
+                            &ty,
+                        )
+                        .unwrap();
+                    display.extend(self.make_mem_entry(struct_name_str, pretty));
+                }
+                display.append(&mut trace_display)
+            }
+
+            diag = diag.with_notes(display);
+        }
+        self.env.add_diag(diag);
+    }
+
+    fn get_abbreviated_source(&self, node_id: NodeId) -> String {
+        let loc = self.env.get_node_loc(node_id);
+        let res = if let Ok(src) = self.env.get_source(&loc) {
+            let src = src.lines().map(|s| s.trim()).join(" ");
+            let l = src.len();
+            if l > 70 {
+                format!("{} ..", &src[0..67])
+            } else {
+                src
+            }
+        } else {
+            loc.display(self.env).to_string()
+        };
+        format!("`{}`", res)
+    }
+
+    fn make_trace_entry(&self, var_name: String, value: PrettyDoc) -> Vec<String> {
+        self.render(
+            PrettyDoc::text(var_name)
+                .append(PrettyDoc::space())
+                .append(PrettyDoc::text("="))
+                .append(PrettyDoc::line().append(value).nest(2).group()),
+        )
+        .lines()
+        .map(|s| "        ".to_string() + s)
+        .collect()
+    }
+
+    fn make_mem_entry(&self, var_name: String, value: PrettyDoc) -> Vec<String> {
+        self.render(
+            PrettyDoc::text("Resource name: ".to_string() + &var_name)
+                .append(PrettyDoc::space())
+                .append(PrettyDoc::line().append(PrettyDoc::text("Values: ")))
+                .append(PrettyDoc::line().append(value).nest(2).group()),
+        )
+        .lines()
+        .map(|s| "        ".to_string() + s)
+        .collect()
+    }
+
+    /// Renders the doc.
+    fn render(&self, doc: PrettyDoc) -> String {
+        let mut lines = vec![];
+        doc.render(70, &mut lines).unwrap();
+        String::from_utf8_lossy(&lines).to_string()
+    }
+
+    /// Extracts verification errors from Boogie output.
+    fn extract_verification_errors(&self, out: &str) -> Vec<BoogieError> {
+        let mut errors = vec![];
+        let mut at = 0;
+        while let Some(cap) = VERIFICATION_DIAG_STARTS.captures(&out[at..]) {
+            let inbetween = out[at..at + cap.get(0).unwrap().start()].trim();
+            at = usize::saturating_add(at, cap.get(0).unwrap().end());
+            let msg = cap.name("msg").unwrap().as_str();
+
+            // Filter diags that we know and will be processed later (e.g., inconclusive).
+            // Other unknown diags will be reported as unexpected boogie output.
+            if !inbetween.is_empty()
+                && !INCONCLUSIVE_DIAG_STARTS.is_match(inbetween)
+                && !INCONSISTENCY_DIAG_STARTS.is_match(inbetween)
+            {
+                // This is unexpected text and we report it as an internal error
+                errors.push(BoogieError {
+                    kind: BoogieErrorKind::Internal,
+                    loc: self.env.unknown_loc(),
+                    message: format!(
+                        "unexpected boogie output: `{} ..`",
+                        &inbetween[0..inbetween.len().min(70)]
+                    ),
+                    execution_trace: vec![],
+                    model: None,
+                })
+            }
+
+            let args = cap.name("args").unwrap().as_str();
+            let loc = self.report_error(self.extract_loc(args), self.env.unknown_loc());
+            let plain_trace = self.extract_execution_trace(out, &mut at);
+            let mut execution_trace = self.extract_augmented_trace(out, &mut at);
+            let mut model = Model::new(self);
+            if execution_trace.is_empty() {
+                execution_trace.push(TraceEntry::InfoLine(format!(
+                    "Boogie does not return any augmented executed trace. \
+                    See the plain trace below:\n{}",
+                    plain_trace.join("\n")
+                )))
+            } else {
+                self.extract_model(&mut model, out, &mut at);
+            }
+
+            if msg != "expected to fail" {
+                // Only add this if it is not a negative test. We still needed to parse it.
+                errors.push(BoogieError {
+                    kind: BoogieErrorKind::Assertion,
+                    loc,
+                    message: msg.to_string(),
+                    execution_trace,
+                    model: if model.is_empty() { None } else { Some(model) },
+                });
+            }
+        }
+        errors
+    }
+
+    fn report_error<A>(&self, res: Result<A, ModelParseError>, default: A) -> A {
+        match res {
+            Ok(a) => a,
+            Err(ModelParseError(s)) => {
+                warn!("[boogie model] {}", s);
+                default
+            }
+        }
+    }
+
+    /// Extracts the model.
+    fn extract_model(&self, model: &mut Model, out: &str, at: &mut usize) {
+        static MODEL_REGION: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"(?m)^\*\*\* MODEL$(?P<mod>(?s:.)*?^\*\*\* END_MODEL$)").unwrap()
+        });
+
+        if let Some(cap) = MODEL_REGION.captures(&out[*at..]) {
+            *at = usize::saturating_add(*at, cap.get(0).unwrap().end());
+
+            // Cuts out the state info block which is not used currently.
+            let re = Regex::new(r"(?m)\*\*\* STATE(?s:.)*?\*\*\* END_STATE\n").unwrap();
+            let remnant = re.replace(cap.name("mod").unwrap().as_str(), "");
+
+            match model.parse(self, remnant.as_ref()) {
+                Ok(_) => {}
+                Err(parse_error) => {
+                    let context_module = self
+                        .env
+                        .symbol_pool()
+                        .string(self.env.get_modules().last().unwrap().get_name().name());
+                    warn!(
+                        "[boogie model] failed to parse boogie model (module context `{}`): {}",
+                        context_module, parse_error.0
+                    );
+                }
+            }
+        }
+    }
+
+    /// Extracts the plain execution trace.
+    fn extract_execution_trace(&self, out: &str, at: &mut usize) -> Vec<String> {
+        static TRACE_START: Lazy<Regex> =
+            Lazy::new(|| Regex::new(r"(?m)^Execution trace:\s*$").unwrap());
+        static TRACE_ENTRY: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"^\s+(?P<name>[^(]+)\((?P<args>[^)]*)\): (?P<value>.*)\n").unwrap()
+        });
+        let mut result = vec![];
+        if let Some(m) = TRACE_START.find(&out[*at..]) {
+            *at = usize::saturating_add(*at, m.end());
+            while let Some(cap) = TRACE_ENTRY.captures(&out[*at..]) {
+                *at = usize::saturating_add(*at, cap.get(0).unwrap().end());
+                let name = cap.name("name").unwrap().as_str();
+                let args = cap.name("args").unwrap().as_str();
+                let value = cap.name("value").unwrap().as_str();
+                result.push(format!("{}({}): {}", name, args, value))
+            }
+        }
+        result
+    }
+
+    /// Extracts augmented execution trace.
+    fn extract_augmented_trace(&self, out: &str, at: &mut usize) -> Vec<TraceEntry> {
+        static TRACE_START: Lazy<Regex> =
+            Lazy::new(|| Regex::new(r"(?m)^Augmented execution trace:\s*$").unwrap());
+        static TRACE_ENTRY: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"^\s*\$(?P<name>[a-zA-Z_]+)\((?P<args>[^)]*)\)(:(?P<value>.*))?\n").unwrap()
+        });
+        let mut result = vec![];
+        if let Some(m) = TRACE_START.find(&out[*at..]) {
+            *at = usize::saturating_add(*at, m.end());
+            while let Some(cap) = TRACE_ENTRY.captures(&out[*at..]) {
+                *at = usize::saturating_add(*at, cap.get(0).unwrap().end());
+                let name = cap.name("name").unwrap().as_str();
+                let args = cap.name("args").unwrap().as_str();
+                let value = cap.name("value").map(|m| m.as_str());
+                match self.extract_augmented_entry(name, args, value) {
+                    Ok(entry) => {
+                        result.push(entry);
+                    }
+                    Err(parse_error) => {
+                        let context_module = self
+                            .env
+                            .symbol_pool()
+                            .string(self.env.get_modules().last().unwrap().get_name().name());
+                        warn!(
+                            "[boogie model] failed to parse augmented execution trace (module context `{}`): {}",
+                            context_module, parse_error.0
+                        );
+                    }
+                }
+            }
+        }
+        result
+    }
+
+    fn extract_augmented_entry(
+        &self,
+        name: &str,
+        args: &str,
+        value: Option<&str>,
+    ) -> Result<TraceEntry, ModelParseError> {
+        match name {
+            "at" => Ok(TraceEntry::AtLocation(self.extract_loc(args)?)),
+            "track_local" => {
+                let (fun, idx) = self.extract_fun_and_index(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::Temporary(fun, idx, value))
+            }
+            "track_return" => {
+                let (fun, idx) = self.extract_fun_and_index(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::Result(fun, idx, value))
+            }
+            "track_abort" => {
+                let fun = self.extract_fun(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::Abort(fun, value))
+            }
+            "track_exp" => {
+                let node_id = self.extract_node_id(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::Exp(node_id, value))
+            }
+            "track_exp_sub" => {
+                let node_id = self.extract_node_id(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::SubExp(node_id, value))
+            }
+            "track_global_mem" => {
+                let node_id = self.extract_node_id(args)?;
+                let value = self.extract_value(value)?;
+                Ok(TraceEntry::GlobalMem(node_id, value))
+            }
+            "info" => match value {
+                Some(info_line) => Ok(TraceEntry::InfoLine(info_line.trim().to_string())),
+                None => Ok(TraceEntry::InfoLine("".to_string())),
+            },
+            _ => Err(ModelParseError::new(&format!(
+                "unrecognized augmented trace entry `{}`",
+                name
+            ))),
+        }
+    }
+
+    fn extract_node_id(&self, args: &str) -> Result<NodeId, ModelParseError> {
+        let index = args.parse::<usize>()?;
+        self.env
+            .index_to_node_id(index)
+            .ok_or_else(|| ModelParseError::new("undefined node id"))
+    }
+
+    fn extract_loc(&self, args: &str) -> Result<Loc, ModelParseError> {
+        let elems = args.split(',').collect_vec();
+        if elems.len() == 3 {
+            let file_idx = elems[0].parse::<u16>()?;
+            let start = elems[1].parse::<u32>()?;
+            let end = elems[2].parse::<u32>()?;
+            let file_id = self.env.file_idx_to_id(file_idx);
+            let loc = Loc::new(file_id, Span::new(start, end));
+            Ok(loc)
+        } else {
+            Err(ModelParseError("invalid location triple".to_string()))
+        }
+    }
+
+    fn extract_fun(&self, args: &str) -> Result<QualifiedId<FunId>, ModelParseError> {
+        let elems = args.split(',').collect_vec();
+        if elems.len() == 2 {
+            let module_idx = elems[0].parse::<usize>()?;
+            index_range_check(self.env.get_module_count())(module_idx)?;
+            let module_env = self.env.get_module(ModuleId::new(module_idx));
+            let fun_idx = elems[1].parse::<u16>()?;
+            if let Some(fun_id) =
+                module_env.try_get_function_id(FunctionDefinitionIndex::new(fun_idx))
+            {
+                return Ok(module_env.get_id().qualified(fun_id));
+            }
+        }
+        Err(ModelParseError("invalid function id".to_string()))
+    }
+
+    fn extract_fun_and_index(
+        &self,
+        args: &str,
+    ) -> Result<(QualifiedId<FunId>, usize), ModelParseError> {
+        let elems = args.split(',').collect_vec();
+        if elems.len() == 3 {
+            let fun = self.extract_fun(&elems[0..2].join(","))?;
+            let idx = elems[2].parse::<usize>()?;
+            return Ok((fun, idx));
+        }
+        Err(ModelParseError("invalid function id and index".to_string()))
+    }
+
+    fn extract_value(&self, value: Option<&str>) -> Result<ModelValue, ModelParseError> {
+        let input = value.unwrap_or("");
+        if !input.is_empty() {
+            let mut parser = ModelParser { input, at: 0 };
+            parser.parse_value()
+        } else {
+            Ok(ModelValue::error())
+        }
+    }
+
+    /// Extracts inconclusive (timeout) errors.
+    fn extract_inconclusive_errors(&self, out: &str) -> Vec<BoogieError> {
+        INCONCLUSIVE_DIAG_STARTS
+            .captures_iter(out)
+            .filter_map(|cap| {
+                let str = cap.name("str").unwrap().as_str();
+                if str.contains("$verify_inconsistency") {
+                    // Masks the timeout from the negative test for the inconsistency checking, and
+                    // skips the error report of this instance.
+                    None
+                } else {
+                    let line = cap.name("line").unwrap().as_str();
+                    let col = cap.name("col").unwrap().as_str();
+                    let msg = cap.get(0).unwrap().as_str();
+                    let loc = self
+                        .get_loc_from_pos(make_position(line, col))
+                        .unwrap_or_else(|| self.env.unknown_loc());
+                    Some(BoogieError {
+                        kind: BoogieErrorKind::Inconclusive,
+                        loc,
+                        message: if msg.contains("out of resource") || msg.contains("timed out") {
+                            let timeout = self.options.adjust_timeout(self.options.vc_timeout);
+                            format!(
+                                "verification out of resources/timeout (global timeout set to {}s)",
+                                timeout
+                            )
+                        } else {
+                            "verification inconclusive".to_string()
+                        },
+                        execution_trace: vec![],
+                        model: None,
+                    })
+                }
+            })
+            .collect_vec()
+    }
+
+    /// Extracts inconsistency errors.
+    fn extract_inconsistency_errors(&self, out: &str) -> Vec<BoogieError> {
+        INCONSISTENCY_DIAG_STARTS
+            .captures_iter(out)
+            .map(|cap| {
+                let args = cap.name("args").unwrap().as_str();
+                let loc = self.report_error(self.extract_loc(args), self.env.unknown_loc());
+                BoogieError {
+                    kind: BoogieErrorKind::Inconsistency,
+                    loc,
+                    message: "there is an inconsistent assumption in the function, which may allow any post-condition (including false) to be proven".to_string(),
+                    execution_trace: vec![],
+                    model: None,
+                }
+            })
+            .collect_vec()
+    }
+
+    /// Gets the code byte index and source location (if available) from a target line/column
+    /// position.
+    fn get_loc_from_pos(&self, pos: Location) -> Option<Loc> {
+        let index = self
+            .writer
+            .get_output_byte_index(pos.line, pos.column)
+            .unwrap_or(ByteIndex(0));
+        self.writer.get_source_location(index)
+    }
+}
+
+/// Creates a position (line/column pair) from strings which are known to consist only of digits.
+fn make_position(line_str: &str, col_str: &str) -> Location {
+    // This will crash on overflow.
+    let mut line = line_str.parse::<u32>().unwrap();
+    let col = col_str.parse::<u32>().unwrap();
+    if line > 0 {
+        line = u32::saturating_sub(line, 1);
+    }
+    Location::new(LineIndex(line), ColumnIndex(col))
+}
+
+fn deduct_table_name(map_key: &str) -> Option<String> {
+    // The generic representation of map keys is `|T@[Int]<X>!val!0` where `<X>` is the
+    // vector element type.
+    let i = map_key.find(']')?;
+    let j = map_key.find('!')?;
+    let suffix = &map_key[i + 1..j];
+    Some(format!("Select__T@[Int]{}_", suffix))
+}
+
+fn deduct_update_table_name(map_key: &str) -> Option<String> {
+    let i = map_key.find(']')?;
+    let j = map_key.find('!')?;
+    let suffix = &map_key[i + 1..j];
+    Some(format!("Store__T@[Int]{}_", suffix))
+}
+
+/// Transpose the domain map in the model by aggregating values in it by the key into a standalone map
+fn create_domain_map(
+    model_map: &BTreeMap<ModelValue, ModelValue>,
+    update_map_opt: Option<&BTreeMap<ModelValue, ModelValue>>,
+) -> Option<(
+    BTreeMap<ModelValue, BTreeMap<usize, bool>>,
+    Option<ModelValue>,
+    bool,
+)> {
+    let mut map: BTreeMap<ModelValue, BTreeMap<usize, bool>> = BTreeMap::new();
+
+    let mut default_domain = None;
+
+    let mut insert_map = |elems: &Vec<ModelValue>, val: &ModelValue| -> Option<()> {
+        map.entry(elems[0].clone()).or_default();
+        map.get_mut(&elems[0])
+            .unwrap()
+            .insert(elems[1].extract_number()?, extract_bool(val)?);
+        Some(())
+    };
+
+    // Each entry in model_map takes the form:
+    // key: |T@[Int]Bool!val!3| 153
+    // value: true
+    // elems[1] is the index of the array
+    // value represents whether the memory indexed by elems[1] exists
+    let mut default = false;
+    for (key, value) in model_map {
+        if let ModelValue::List(elems) = key {
+            if elems.len() == 2 {
+                insert_map(elems, value);
+            }
+        } else if let ModelValue::Literal(_) = key {
+            default = extract_bool(value)?;
+        }
+    }
+
+    // Each entry in update_map takes the form:
+    // |T@[Int]Bool!val!2| 0 true -> |T@[Int]Bool!val!3|
+    // else -> |T@[Int]Bool!val!3|
+    if let Some(update_map) = update_map_opt {
+        for (key, value) in update_map {
+            if let ModelValue::List(elems) = key {
+                if elems.len() == 3 {
+                    insert_map(elems, &elems[2]);
+                }
+            } else {
+                default_domain = Some(value.clone());
+            }
+        }
+    }
+
+    // map: mapping from memory slot to the domain flag
+    // default_domain: used when the slot is not in the domain map, extracted from the update_map
+    // default: default value in the domain map
+    Some((map, default_domain, default))
+}
+
+/// Extract domain from the model
+fn extract_domain(
+    model: &Model,
+) -> Option<(
+    BTreeMap<ModelValue, BTreeMap<usize, bool>>,
+    Option<ModelValue>,
+    bool,
+)> {
+    let domain_table_name = "]Bool!".to_string();
+
+    // Retrieve the domain map in the model
+    let domain_map = model
+        .vars
+        .get(&ModelValue::literal(&deduct_table_name(
+            &domain_table_name,
+        )?))?
+        .extract_map()?;
+
+    // Retrieve update of the domain map in the model
+    let domain_update_map_opt = model
+        .vars
+        .get(&ModelValue::literal(&deduct_update_table_name(
+            &domain_table_name,
+        )?))
+        .and_then(|update_map| update_map.extract_map());
+
+    create_domain_map(domain_map, domain_update_map_opt)
+}
+
+/// extract boolean value from ModelValue
+fn extract_bool(value: &ModelValue) -> Option<bool> {
+    let bool_value = value.extract_literal()?;
+    if bool_value == "true" {
+        Some(true)
+    } else if bool_value == "false" {
+        Some(false)
+    } else {
+        None
+    }
+}
+
+// -----------------------------------------------
+// # Boogie Model Analysis
+
+/// Represents a boogie model.
+#[derive(Debug)]
+pub struct Model {
+    vars: BTreeMap<ModelValue, ModelValue>,
+    vector_theory: VectorTheory,
+}
+
+impl Model {
+    /// Create a new model.
+    fn new(wrapper: &BoogieWrapper<'_>) -> Self {
+        Model {
+            vars: Default::default(),
+            vector_theory: wrapper.options.vector_theory,
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        self.vars.is_empty()
+    }
+
+    /// Parses the given string into a model. The string is expected to end with MODULE_END_MARKER.
+    fn parse(&mut self, _wrapper: &BoogieWrapper<'_>, input: &str) -> Result<(), ModelParseError> {
+        let mut model_parser = ModelParser { input, at: 0 };
+        model_parser
+            .parse_map()
+            .and_then(|m| {
+                model_parser.expect(MODEL_END_MARKER)?;
+                Ok(m)
+            })
+            .and_then(|m| match m {
+                ModelValue::Map(vars) => {
+                    self.vars.extend(vars);
+                    Ok(())
+                }
+                _ => Err(ModelParseError("expected ModelValue::Map".to_string())),
+            })
+    }
+}
+
+/// Represents a model value.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub enum ModelValue {
+    Literal(String),
+    List(Vec<ModelValue>),
+    Map(BTreeMap<ModelValue, ModelValue>),
+}
+
+/// Represents a spare representation of a model value vector.
+#[derive(Debug)]
+pub struct ModelValueVector {
+    /// The size of the vector.
+    size: usize,
+    /// Those indices 0..size which have a value appear here.
+    values: BTreeMap<usize, ModelValue>,
+    /// Others in this range have assigned this value.
+    default: ModelValue,
+}
+
+#[derive(Debug)]
+pub struct ModelValueTable {
+    /// The known keys. This might be more than we know a value for.
+    keys: BTreeSet<usize>,
+    /// The known value assignments
+    values: BTreeMap<usize, ModelValue>,
+    /// Whether the table is open, i.e. has more entries than the model determined.
+    open: bool,
+}
+
+impl ModelValue {
+    /// Makes a literal from a str.
+    fn literal(s: &str) -> ModelValue {
+        ModelValue::Literal(s.to_string())
+    }
+
+    // Makes an error value.
+    fn error() -> ModelValue {
+        ModelValue::List(vec![ModelValue::literal("Error")])
+    }
+
+    /// Extracts a vector from its representation.
+    ///
+    /// If the representation uses arrays it is defined by `(Vec* map_key size)`. The function
+    /// follows indirections in the model. We find the array map at `Select_[$int]$Value`.
+    /// This has e.g. the form
+    /// ```model
+    ///   Select_[$int]$Value -> {
+    ///      |T@[Int]Value!val!1| 0 -> (Integer 2)
+    ///      |T@[Int]Value!val!1| 22 -> (Integer 2)
+    ///      else -> (Integer 0)
+    ///    }
+    /// ```
+    /// If the value array is represented by a sequence instead, there are no indirections.
+    /// It has the form
+    /// ```(seq.++ (seq.unit (Integer 0)) (seq.unit (Integer 1)))```
+    /// or
+    /// ```(as seq.empty (Seq T@$Value))```
+    /// depending on whether it is an empty or nonempty sequence, respectively.
+    fn extract_vector(&self, model: &Model, _elem_ty: &Type) -> Option<ModelValueVector> {
+        if matches!(model.vector_theory, VectorTheory::SmtSeq) {
+            // Implementation of vectors using sequences
+            let mut values = BTreeMap::new();
+            if let Some(elems) = self.extract_list("as") {
+                if elems.is_empty() {
+                    return None;
+                }
+            } else if let Some(elem) = self.extract_seq_unit() {
+                values.insert(0, elem);
+            } else if let Some(elems) = self.extract_list("seq.++") {
+                for (i, e) in elems.iter().enumerate() {
+                    values.insert(i, e.extract_seq_unit()?);
+                }
+            } else {
+                return None;
+            };
+            Some(ModelValueVector {
+                size: values.len(),
+                values,
+                default: ModelValue::error(),
+            })
+        } else {
+            // Implementation of vectors using arrays
+            let args = self.extract_list_ctor_prefix("Vec_")?;
+            if args.len() != 2 {
+                return None;
+            }
+            let size = args[1].extract_number()?;
+            let map_key = &args[0];
+            let value_array_map = model
+                .vars
+                .get(&ModelValue::literal(&deduct_table_name(
+                    map_key.extract_literal()?,
+                )?))?
+                .extract_map()?;
+            let mut values = BTreeMap::new();
+            let mut default = ModelValue::error();
+            for (key, value) in value_array_map {
+                if let ModelValue::List(elems) = key {
+                    if elems.len() == 2 && &elems[0] == map_key {
+                        if let Some(idx) = elems[1].extract_number() {
+                            values.insert(idx, value.clone());
+                        }
+                    }
+                } else if key == &ModelValue::literal("else") {
+                    default = value.clone();
+                }
+            }
+            Some(ModelValueVector {
+                size,
+                values,
+                default,
+            })
+        }
+    }
+
+    /// Extracts a table from a model value.
+    fn extract_table(
+        &self,
+        model: &Model,
+        _key_ty: &Type,
+        _val_ty: &Type,
+    ) -> Option<ModelValueTable> {
+        let args = self.extract_list_ctor_prefix("Table_")?;
+        if args.len() != 3 {
+            return None;
+        }
+        let (val_map, _val_default) = args[0].extract_select_int_map(model)?;
+        let (dom_map, dom_default) = args[1].extract_select_int_map(model)?;
+        let size = args[2].extract_number()?;
+        let key_exists_by_default = extract_bool(&dom_default).unwrap_or(false);
+        let mut keys = BTreeSet::new();
+        let mut values = BTreeMap::new();
+        for (key, exists) in dom_map {
+            if extract_bool(&exists).unwrap_or(false) {
+                keys.insert(key);
+            }
+        }
+        for (key, value) in val_map {
+            if key_exists_by_default {
+                keys.insert(key);
+            }
+            if keys.contains(&key) {
+                values.insert(key, value);
+            }
+        }
+        let open = values.len() < size;
+        Some(ModelValueTable { keys, values, open })
+    }
+
+    /// Extract memory content from the model
+    fn extract_mem_vector(
+        &self,
+        model: &Model,
+        domain: &ModelValue,
+        domain_info_opt: &Option<(
+            BTreeMap<ModelValue, BTreeMap<usize, bool>>,
+            Option<ModelValue>,
+            bool,
+        )>,
+    ) -> Option<ModelValueVector> {
+        let mut size = 0;
+        let domain_info = (*domain_info_opt).as_ref()?;
+        let domain_idx_map = &domain_info.0;
+        let default_domain_model_opt = &domain_info.1;
+        let default_domain_flag = domain_info.2;
+
+        let value_array_map = model
+            .vars
+            .get(&ModelValue::literal(&deduct_table_name(
+                self.extract_literal()?,
+            )?))?
+            .extract_map()?;
+
+        // In the model, the Store_ represents the update of that map
+        let value_update_map_opt = model
+            .vars
+            .get(&ModelValue::literal(&deduct_update_table_name(
+                self.extract_literal()?,
+            )?))
+            .and_then(|update_map| update_map.extract_map());
+
+        let mut domain_exists_map_opt = domain_idx_map.get(domain);
+        if domain_exists_map_opt.is_none() {
+            if let Some(default_domain_model) = default_domain_model_opt {
+                domain_exists_map_opt = domain_idx_map.get(default_domain_model);
+            }
+        }
+
+        let mut values = BTreeMap::new();
+        let mut default = ModelValue::error();
+
+        let mut insert_values = |elem_opt: &ModelValue, new_value: &ModelValue| {
+            if let Some(idx) = elem_opt.extract_number() {
+                if let Some(domain_exists_map) = domain_exists_map_opt {
+                    let mut flag = default_domain_flag;
+                    if let Some(domain_exists_value) = domain_exists_map.get(&idx) {
+                        flag = *domain_exists_value;
+                    }
+                    if flag {
+                        // Only print the memory locations in the domain
+                        values.insert(idx, new_value.clone());
+                        size += 1;
+                    }
+                }
+            }
+        };
+
+        // Each entry in value_array_map takes the form:
+        // key: |T@[Int]$1_Bug7_BallotCounter!val!0| 0
+        // value: ($1_Bug7_BallotCounter 18446744073709522257)
+        // elems[1] is index to represent the instance of the memory
+        for (key, value) in value_array_map {
+            if let ModelValue::List(elems) = key {
+                if elems.len() == 2 && &elems[0] == self {
+                    insert_values(&elems[1], value);
+                }
+            } else if key == &ModelValue::literal("else") {
+                // Currently, we assume existence of default memory locations print out the value.
+                if default_domain_flag {
+                    default = value.clone();
+                }
+            }
+        }
+
+        // Traverse the update map to obtain the updated value
+        if let Some(value_update_map) = value_update_map_opt {
+            for up_k in value_update_map.keys() {
+                if let ModelValue::List(elems) = up_k {
+                    // We only consider the case
+                    // Where elems has three elements: Array symbol, position, updated value
+                    if elems.len() == 3 && &elems[0] == self {
+                        insert_values(&elems[1], &elems[2]);
+                    }
+                }
+            }
+        }
+
+        Some(ModelValueVector {
+            size,
+            values,
+            default,
+        })
+    }
+
+    fn extract_seq_unit(&self) -> Option<ModelValue> {
+        self.extract_list("seq.unit").and_then(|elems| {
+            if elems.is_empty() {
+                None
+            } else {
+                Some(elems[0].clone())
+            }
+        })
+    }
+
+    /// Extracts a $Select map with self the variable in the model.
+    fn extract_select_int_map(
+        &self,
+        model: &Model,
+    ) -> Option<(BTreeMap<usize, ModelValue>, ModelValue)> {
+        let map = model
+            .vars
+            .get(&ModelValue::literal(&deduct_table_name(
+                self.extract_literal()?,
+            )?))?
+            .extract_map()?;
+        let mut values = BTreeMap::new();
+        let mut default = Self::error();
+        for (key, value) in map {
+            if let ModelValue::List(elems) = key {
+                if elems.len() == 2 && &elems[0] == self {
+                    if let Some(idx) = elems[1].extract_number() {
+                        values.insert(idx, value.clone());
+                    }
+                }
+            } else if key == &ModelValue::literal("else") {
+                default = value.clone();
+            }
+        }
+        Some((values, default))
+    }
+
+    /// Extract a reverse mapping of values encoded by integers.
+    fn extract_encoding_map(&self) -> Option<BTreeMap<usize, ModelValue>> {
+        let mut res = BTreeMap::new();
+        for (key, val) in self.extract_map()? {
+            if key != &ModelValue::literal("else") {
+                res.insert(val.extract_number()?, key.clone());
+            }
+        }
+        Some(res)
+    }
+
+    fn extract_map(&self) -> Option<&BTreeMap<ModelValue, ModelValue>> {
+        if let ModelValue::Map(map) = self {
+            Some(map)
+        } else {
+            None
+        }
+    }
+
+    /// Extract the arguments of a list of the form `(<ctor> element...)`.
+    fn extract_list(&self, ctor: &str) -> Option<&[ModelValue]> {
+        if let ModelValue::List(elems) = self {
+            if !elems.is_empty() && elems[0] == ModelValue::literal(ctor) {
+                return Some(&elems[1..]);
+            }
+        }
+        None
+    }
+
+    /// Extract the arguments of a list of the form `(<ctor> element...)`.
+    fn extract_list_ctor_prefix(&self, ctor_prefix: &str) -> Option<&[ModelValue]> {
+        if let ModelValue::List(elems) = self {
+            if !elems.is_empty() && elems[0].extract_literal()?.starts_with(ctor_prefix) {
+                return Some(&elems[1..]);
+            }
+        }
+        None
+    }
+
+    /// Extract a $Value box value.
+    fn extract_box(&self) -> &ModelValue {
+        if let ModelValue::List(elems) = self {
+            if elems.len() == 2 {
+                return &elems[1];
+            }
+        }
+        self
+    }
+
+    /// Extract a number from a literal.
+    fn extract_number(&self) -> Option<usize> {
+        if let Ok(n) = self.extract_literal()?.parse::<usize>() {
+            Some(n)
+        } else {
+            None
+        }
+    }
+
+    /// Extract a i128 from a literal.
+    fn extract_i128(&self) -> Option<i128> {
+        if let Some(value) = self.extract_list("-").and_then(|values| {
+            if values.len() == 1 {
+                values[0].extract_i128().map(i128::saturating_neg)
+            } else {
+                None
+            }
+        }) {
+            Some(value)
+        } else if let Ok(n) = self.extract_literal()?.parse::<i128>() {
+            Some(n)
+        } else {
+            None
+        }
+    }
+
+    /// Extract a literal.
+    fn extract_literal(&self) -> Option<&String> {
+        if let ModelValue::Literal(s) = self {
+            Some(s)
+        } else {
+            None
+        }
+    }
+
+    /// Pretty prints the given model value which has given type. If printing fails, falls
+    /// back to print the debug value.
+    pub fn pretty_or_raw(&self, wrapper: &BoogieWrapper, model: &Model, ty: &Type) -> PrettyDoc {
+        if wrapper.options.stable_test_output {
+            return PrettyDoc::text("<redacted>");
+        }
+        self.pretty(wrapper, model, ty).unwrap_or_else(|| {
+            // Print the raw debug value.
+            PrettyDoc::text(format!("<? {:?}>", self))
+        })
+    }
+
+    /// Pretty prints the given model value which has given type.
+    pub fn pretty(&self, wrapper: &BoogieWrapper, model: &Model, ty: &Type) -> Option<PrettyDoc> {
+        if self.extract_list("Error").is_some() {
+            // This is an undefined value
+            return Some(PrettyDoc::text("<undef>"));
+        }
+        match ty {
+            Type::Primitive(PrimitiveType::U8) => Some(PrettyDoc::text(format!(
+                "{}u8",
+                self.extract_literal().and_then(|s| s.parse::<u8>().ok())?
+            ))),
+            Type::Primitive(PrimitiveType::U64) => Some(PrettyDoc::text(
+                self.extract_literal()
+                    .and_then(|s| s.parse::<u64>().ok())?
+                    .to_string(),
+            )),
+            Type::Primitive(PrimitiveType::U128) => Some(PrettyDoc::text(format!(
+                "{}u128",
+                self.extract_literal()
+                    .and_then(|s| s.parse::<u128>().ok())?
+            ))),
+            Type::Primitive(PrimitiveType::Num) => Some(PrettyDoc::text(format!(
+                "{}num",
+                self.extract_literal()
+                    .and_then(|s| s.parse::<i128>().ok())?
+            ))),
+            Type::Primitive(PrimitiveType::Bool) => Some(PrettyDoc::text(
+                self.extract_literal()
+                    .and_then(|s| s.parse::<bool>().ok())?
+                    .to_string(),
+            )),
+            Type::Primitive(PrimitiveType::Address) => {
+                let addr = BigInt::parse_bytes(&self.extract_literal()?.clone().into_bytes(), 10)?;
+                Some(PrettyDoc::text(format!("0x{}", &addr.to_str_radix(16))))
+            }
+            Type::Primitive(PrimitiveType::Signer) => {
+                let l = self.extract_list("$signer")?;
+                let addr = BigInt::parse_bytes(&l[0].extract_literal()?.clone().into_bytes(), 10)?;
+                Some(PrettyDoc::text(format!(
+                    "signer{{0x{}}}",
+                    &addr.to_str_radix(16)
+                )))
+            }
+            Type::Vector(param) => self.pretty_vector(wrapper, model, param),
+            Type::Struct(module_id, struct_id, params) => {
+                let struct_env = wrapper.env.get_struct_qid(module_id.qualified(*struct_id));
+                if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                    self.pretty_table(wrapper, model, &params[0], &params[1])
+                } else {
+                    self.pretty_struct(wrapper, model, &struct_env, params)
+                }
+            }
+            Type::Reference(_, bt) => {
+                Some(PrettyDoc::text("&").append(self.pretty(wrapper, model, bt)?))
+            }
+            Type::TypeParameter(_) => {
+                // The value of a generic cannot be easily displayed because we do not know the
+                // actual type unless we parse it out from the model (via the type value parameter)
+                // and convert into a Type. However, since the value is parametric and cannot
+                // effect the verification outcome, we may not have much need for seeing it.
+                Some(PrettyDoc::text("<generic>"))
+            }
+            Type::Tuple(_)
+            | Type::Primitive(_)
+            | Type::Fun(_, _)
+            | Type::TypeDomain(_)
+            | Type::ResourceDomain(_, _, _)
+            | Type::Error
+            | Type::Var(_) => None,
+        }
+    }
+
+    /// Pretty prints the body of a struct or vector, enclosed in braces.
+    pub fn pretty_vec_or_struct_body(entries: Vec<PrettyDoc>) -> PrettyDoc {
+        PrettyDoc::text("{")
+            .append(
+                PrettyDoc::line_()
+                    .append(PrettyDoc::intersperse(
+                        entries,
+                        PrettyDoc::text(",").append(PrettyDoc::line()),
+                    ))
+                    .nest(2)
+                    .group(),
+            )
+            .append(PrettyDoc::text("}"))
+    }
+
+    /// Pretty prints a vector.
+    pub fn pretty_vector(
+        &self,
+        wrapper: &BoogieWrapper,
+        model: &Model,
+        param: &Type,
+    ) -> Option<PrettyDoc> {
+        let values = self.extract_vector(model, param)?;
+        let mut entries = vec![];
+        let mut next = 0;
+        let mut sparse = false;
+        for idx in values.values.keys().sorted() {
+            if *idx >= values.size {
+                // outside of domain, ignore.
+                continue;
+            }
+            let mut p = values
+                .values
+                .get(idx)?
+                .extract_box()
+                .pretty_or_raw(wrapper, model, param);
+            if *idx > next {
+                p = PrettyDoc::text(format!("{}: ", idx)).append(p);
+                sparse = true;
+            }
+            next = usize::saturating_add(*idx, 1);
+            entries.push(p);
+        }
+        if next < values.size || sparse {
+            let default = values
+                .default
+                .extract_box()
+                .pretty(wrapper, model, param)
+                .unwrap_or_else(|| PrettyDoc::text("undef"));
+            entries.insert(0, PrettyDoc::text(format!("(size): {}", values.size)));
+            entries.push(PrettyDoc::text("default: ").append(default));
+        }
+        Some(PrettyDoc::text("vector").append(Self::pretty_vec_or_struct_body(entries)))
+    }
+
+    /// Pretty prints a struct.
+    pub fn pretty_struct(
+        &self,
+        wrapper: &BoogieWrapper,
+        model: &Model,
+        struct_env: &StructEnv,
+        inst: &[Type],
+    ) -> Option<PrettyDoc> {
+        let entries = if struct_env.is_native_or_intrinsic() {
+            let mut rep = self.extract_literal()?.to_string();
+            if rep.starts_with("T@") {
+                if let Some(i) = rep.rfind('!') {
+                    rep = format!("#{}", &rep[i + 1..])
+                }
+            }
+            vec![PrettyDoc::text(rep)]
+        } else {
+            let struct_name = &boogie_struct_name(struct_env, inst);
+            let values = self
+                .extract_list(struct_name)
+                // It appears sometimes keys are represented witout, sometimes with enclosing
+                // bars?
+                .or_else(|| self.extract_list(&format!("|{}|", struct_name)))?;
+            struct_env
+                .get_fields()
+                .enumerate()
+                .map(|(i, f)| {
+                    let ty = f.get_type().instantiate(inst);
+                    let default = ModelValue::error();
+                    let v = values.get(i).unwrap_or(&default);
+                    let vp = v
+                        .pretty(wrapper, model, &ty)
+                        .unwrap_or_else(|| default.pretty_or_raw(wrapper, model, &ty));
+                    PrettyDoc::text(format!(
+                        "{}",
+                        f.get_name().display(struct_env.symbol_pool())
+                    ))
+                    .append(PrettyDoc::text(" ="))
+                    .append(PrettyDoc::line().append(vp).nest(2).group())
+                })
+                .collect_vec()
+        };
+        Some(
+            PrettyDoc::text(format!(
+                "{}.{}",
+                struct_env
+                    .module_env
+                    .get_name()
+                    .name()
+                    .display(struct_env.symbol_pool()),
+                struct_env.get_name().display(struct_env.symbol_pool())
+            ))
+            .append(Self::pretty_vec_or_struct_body(entries)),
+        )
+    }
+
+    /// Pretty prints a table.
+    pub fn pretty_table(
+        &self,
+        wrapper: &BoogieWrapper,
+        model: &Model,
+        key_ty: &Type,
+        val_ty: &Type,
+    ) -> Option<PrettyDoc> {
+        // Compute the encoding map. Table keys are encoded as ints, and this finds the
+        // function table of $EncodeKey and turns into a map from int to encoded ModelValue.
+        let encoding_key = format!(
+            "$EncodeKey{}",
+            boogie_inst_suffix(wrapper.env, &[key_ty.clone()])
+        );
+        let encoding_map = model
+            .vars
+            .get(&ModelValue::literal(&encoding_key))?
+            .extract_encoding_map()?;
+        // Build the entries to display
+        let ModelValueTable { keys, values, open } = self.extract_table(model, key_ty, val_ty)?;
+        let mut entries = vec![];
+        for key in keys {
+            let key_rep = if let Some(k) = encoding_map.get(&key) {
+                k.pretty_or_raw(wrapper, model, key_ty)
+            } else {
+                PrettyDoc::text("?")
+            };
+            let val_rep = if let Some(val) = values.get(&key) {
+                val.pretty_or_raw(wrapper, model, val_ty)
+            } else {
+                PrettyDoc::text("?")
+            };
+            entries.push(key_rep.append(PrettyDoc::text(": ")).append(val_rep))
+        }
+        if open {
+            // Append a marker to indicate this table is open ended.
+            entries.push(PrettyDoc::text(".."));
+        }
+        Some(PrettyDoc::text("Table").append(Self::pretty_vec_or_struct_body(entries)))
+    }
+
+    /// Pretty prints the global memory
+    pub fn pretty_mem(
+        &self,
+        wrapper: &BoogieWrapper,
+        domain: &ModelValue,
+        domain_info_opt: &Option<(
+            BTreeMap<ModelValue, BTreeMap<usize, bool>>,
+            Option<ModelValue>,
+            bool,
+        )>,
+        model: &Model,
+        param: &Type,
+    ) -> Option<PrettyDoc> {
+        let values = self.extract_mem_vector(model, domain, domain_info_opt)?;
+        let mut entries = vec![];
+        for idx in values.values.keys().sorted() {
+            let mut p = values.values.get(idx)?.pretty_or_raw(wrapper, model, param);
+            p = PrettyDoc::text(format!("Address({}): ", idx)).append(p);
+            entries.push(p);
+        }
+        let default = if values.default == ModelValue::error() {
+            PrettyDoc::text("empty")
+        } else {
+            values
+                .default
+                .pretty(wrapper, model, param)
+                .unwrap_or_else(|| PrettyDoc::text("undef"))
+        };
+        entries.push(PrettyDoc::text("Default: ").append(default));
+        Some(Self::pretty_vec_or_struct_body(entries))
+    }
+}
+
+/// Represents an expression descriptor.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+struct ExpDescriptor {
+    node_id: NodeId,
+}
+
+/// Represents parser for a boogie model.
+struct ModelParser<'s> {
+    input: &'s str,
+    at: usize,
+}
+
+/// Represents error resulting from model parsing.
+struct ModelParseError(String);
+
+impl ModelParseError {
+    fn new(s: &str) -> Self {
+        ModelParseError(s.to_string())
+    }
+}
+
+impl From<ParseIntError> for ModelParseError {
+    fn from(_: ParseIntError) -> Self {
+        Self::new("invalid integer")
+    }
+}
+
+const MODEL_END_MARKER: &str = "*** END_MODEL";
+
+impl<'s> ModelParser<'s> {
+    fn skip_space(&mut self) {
+        while self.input[self.at..].starts_with(|ch| [' ', '\r', '\n', '\t'].contains(&ch)) {
+            self.at = usize::saturating_add(self.at, 1);
+        }
+    }
+
+    fn looking_at(&mut self, s: &str) -> bool {
+        self.skip_space();
+        self.input[self.at..].starts_with(s)
+    }
+
+    fn looking_at_eol(&mut self) -> bool {
+        while self.input[self.at..].starts_with(|ch| [' ', '\r', '\t'].contains(&ch)) {
+            self.at = usize::saturating_add(self.at, 1);
+        }
+        self.input[self.at..].starts_with('\n')
+    }
+
+    fn looking_at_then_consume(&mut self, s: &str) -> bool {
+        if self.looking_at(s) {
+            self.at = usize::saturating_add(self.at, s.len());
+            true
+        } else {
+            false
+        }
+    }
+
+    fn expect(&mut self, s: &str) -> Result<(), ModelParseError> {
+        self.skip_space();
+        if self.input[self.at..].starts_with(s) {
+            self.at = usize::saturating_add(self.at, s.len());
+            Ok(())
+        } else {
+            let end = std::cmp::min(usize::saturating_add(self.at, 80), self.input.len());
+            Err(ModelParseError(format!(
+                "expected `{}` (at `{}...`)",
+                s,
+                &self.input[self.at..end]
+            )))
+        }
+    }
+
+    fn parse_map(&mut self) -> Result<ModelValue, ModelParseError> {
+        let mut map = BTreeMap::new();
+        while !self.looking_at("}") && !self.looking_at(MODEL_END_MARKER) {
+            let key = self.parse_key()?;
+            self.expect("->")?;
+            if self.looking_at_eol() {
+                // Entry without a value, skip
+                continue;
+            }
+            let value = if self.looking_at_then_consume("{") {
+                let value = self.parse_map()?;
+                self.expect("}")?;
+                value
+            } else {
+                self.parse_value()?
+            };
+            map.insert(key, value);
+        }
+        Ok(ModelValue::Map(map))
+    }
+
+    fn parse_key(&mut self) -> Result<ModelValue, ModelParseError> {
+        let mut comps = vec![];
+        while !self.looking_at("->") && self.at < self.input.len() {
+            let value = self.parse_value()?;
+            comps.push(value);
+        }
+        if comps.is_empty() {
+            Err(ModelParseError(
+                "expected at least one component of a key".to_string(),
+            ))
+        } else if comps.len() == 1 {
+            Ok(comps.pop().unwrap())
+        } else {
+            Ok(ModelValue::List(comps))
+        }
+    }
+
+    fn parse_value(&mut self) -> Result<ModelValue, ModelParseError> {
+        if self.looking_at_then_consume("(") {
+            let mut comps = vec![];
+            while !self.looking_at_then_consume(")") {
+                let value = self.parse_value()?;
+                comps.push(value);
+            }
+            Ok(ModelValue::List(comps))
+        } else {
+            // We do not know the exact lexis, so take everything until next space or ).
+            self.skip_space();
+            let start = self.at;
+            while self.at < self.input.len()
+                && !self.input[self.at..]
+                    .starts_with(|ch| [')', ' ', '\r', '\n', '\t'].contains(&ch))
+            {
+                self.at = usize::saturating_add(self.at, 1);
+            }
+            Ok(ModelValue::Literal(self.input[start..self.at].to_string()))
+        }
+    }
+}
+
+fn index_range_check(max: usize) -> impl FnOnce(usize) -> Result<usize, ModelParseError> {
+    move |idx: usize| -> Result<usize, ModelParseError> {
+        if idx < max {
+            Ok(idx)
+        } else {
+            Err(ModelParseError::new(&format!(
+                "invalid debug track info: index out of range (upper bound {}, got {})",
+                max, idx
+            )))
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/bytecode_translator.rs b/vendors/move/crates/move-prover-boogie-backend/src/bytecode_translator.rs
new file mode 100644
index 000000000..d6d06000c
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/bytecode_translator.rs
@@ -0,0 +1,2636 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module translates the bytecode of a module to Boogie code.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    str::FromStr,
+};
+
+use codespan::LineIndex;
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::{debug, info, log, warn, Level};
+
+use move_core_types::language_storage::StructTag;
+use move_model::{
+    ast::{TempIndex, TraceKind},
+    code_writer::CodeWriter,
+    emit, emitln,
+    model::{FieldId, GlobalEnv, Loc, NodeId, QualifiedInstId, StructEnv, StructId},
+    pragmas::{ADDITION_OVERFLOW_UNCHECKED_PRAGMA, SEED_PRAGMA, TIMEOUT_PRAGMA},
+    ty::{PrimitiveType, Type, TypeDisplayContext, BOOL_TYPE},
+    well_known::{TYPE_INFO_MOVE, TYPE_NAME_GET_MOVE, TYPE_NAME_MOVE},
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget,
+    function_target_pipeline::{FunctionTargetsHolder, FunctionVariant, VerificationFlavor},
+    mono_analysis,
+    number_operation::{
+        FuncOperationMap, GlobalNumberOperationState, NumOperation,
+        NumOperation::{Bitwise, Bottom},
+    },
+    options::ProverOptions,
+    stackless_bytecode::{
+        AbortAction, BorrowEdge, BorrowNode, Bytecode, Constant, HavocKind, IndexEdgeKind,
+        Operation, PropKind,
+    },
+};
+
+use crate::{
+    boogie_helpers::{
+        boogie_address_blob, boogie_bv_type, boogie_byte_blob, boogie_constant_blob,
+        boogie_debug_track_abort, boogie_debug_track_local, boogie_debug_track_return,
+        boogie_equality_for_type, boogie_field_sel, boogie_field_update, boogie_function_bv_name,
+        boogie_function_name, boogie_make_vec_from_strings, boogie_modifies_memory_name,
+        boogie_num_literal, boogie_num_type_base, boogie_num_type_string_capital,
+        boogie_reflection_type_info, boogie_reflection_type_name, boogie_resource_memory_name,
+        boogie_struct_name, boogie_temp, boogie_temp_from_suffix, boogie_type, boogie_type_param,
+        boogie_type_suffix, boogie_type_suffix_bv, boogie_type_suffix_for_struct,
+        boogie_well_formed_check, boogie_well_formed_expr_bv, TypeIdentToken,
+    },
+    options::BoogieOptions,
+    spec_translator::SpecTranslator,
+};
+
+pub struct BoogieTranslator<'env> {
+    env: &'env GlobalEnv,
+    options: &'env BoogieOptions,
+    writer: &'env CodeWriter,
+    spec_translator: SpecTranslator<'env>,
+    targets: &'env FunctionTargetsHolder,
+}
+
+pub struct FunctionTranslator<'env> {
+    parent: &'env BoogieTranslator<'env>,
+    fun_target: &'env FunctionTarget<'env>,
+    type_inst: &'env [Type],
+}
+
+pub struct StructTranslator<'env> {
+    parent: &'env BoogieTranslator<'env>,
+    struct_env: &'env StructEnv<'env>,
+    type_inst: &'env [Type],
+}
+
+impl<'env> BoogieTranslator<'env> {
+    pub fn new(
+        env: &'env GlobalEnv,
+        options: &'env BoogieOptions,
+        targets: &'env FunctionTargetsHolder,
+        writer: &'env CodeWriter,
+    ) -> Self {
+        Self {
+            env,
+            options,
+            targets,
+            writer,
+            spec_translator: SpecTranslator::new(writer, env, options),
+        }
+    }
+
+    pub fn translate(&mut self) {
+        let writer = self.writer;
+        let env = self.env;
+        let spec_translator = &self.spec_translator;
+
+        let mono_info = mono_analysis::get_info(self.env);
+        let empty = &BTreeSet::new();
+
+        emitln!(
+            writer,
+            "\n\n//==================================\n// Begin Translation\n"
+        );
+
+        // Add type reflection axioms
+        if !mono_info.type_params.is_empty() {
+            emitln!(writer, "function $TypeName(t: $TypeParamInfo): Vec int;");
+
+            // type name <-> type info: primitives
+            for name in [
+                "Bool", "U8", "U16", "U32", "U64", "U128", "U256", "Address", "Signer",
+            ]
+            .into_iter()
+            {
+                emitln!(
+                    writer,
+                    "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParam{}(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                    name,
+                    TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&name.to_lowercase()))
+                );
+                emitln!(
+                    writer,
+                    "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            $IsEqual'vec'u8''($TypeName(t), {}) ==> is#$TypeParam{}(t));",
+                    TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&name.to_lowercase())),
+                    name,
+                );
+            }
+
+            // type name <-> type info: vector
+            let mut tokens = TypeIdentToken::make("vector<");
+            tokens.push(TypeIdentToken::Variable(
+                "$TypeName(e#$TypeParamVector(t))".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make(">"));
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParamVector(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                TypeIdentToken::convert_to_bytes(tokens)
+            );
+            // TODO(mengxu): this will parse it to an uninterpreted vector element type
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            ($IsPrefix'vec'u8''($TypeName(t), {}) && $IsSuffix'vec'u8''($TypeName(t), {})) ==> is#$TypeParamVector(t));",
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make("vector<")),
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make(">")),
+            );
+
+            // type name <-> type info: struct
+            let mut tokens = TypeIdentToken::make("0x");
+            // TODO(mengxu): this is not a correct radix16 encoding of an integer
+            tokens.push(TypeIdentToken::Variable(
+                "MakeVec1(a#$TypeParamStruct(t))".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make("::"));
+            tokens.push(TypeIdentToken::Variable(
+                "m#$TypeParamStruct(t)".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make("::"));
+            tokens.push(TypeIdentToken::Variable(
+                "s#$TypeParamStruct(t)".to_string(),
+            ));
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParamStruct(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                TypeIdentToken::convert_to_bytes(tokens)
+            );
+            // TODO(mengxu): this will parse it to an uninterpreted struct
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            $IsPrefix'vec'u8''($TypeName(t), {}) ==> is#$TypeParamVector(t));",
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make("0x")),
+            );
+        }
+
+        // Add given type declarations for type parameters.
+        emitln!(writer, "\n\n// Given Types for Type Parameters\n");
+        for idx in &mono_info.type_params {
+            let param_type = boogie_type_param(env, *idx);
+            let suffix = boogie_type_suffix(env, &Type::TypeParameter(*idx));
+            let is_uid = self
+                .env
+                .find_struct_by_tag(&StructTag::from_str("0x2::object::UID").unwrap())
+                .is_some();
+            if is_uid {
+                // Sui-specific to allow "using" unresolved type params as Sui objects in Boogie
+                // (otherwise Boogie compilation errors may occur)
+                emitln!(writer, "type {{:datatype}} {};", param_type);
+                emitln!(
+                    writer,
+                    "function {{:constructor}} {}($id: $2_object_UID): {};",
+                    param_type,
+                    param_type
+                );
+            } else {
+                emitln!(writer, "type {};", param_type);
+            }
+            emitln!(
+                writer,
+                "function {{:inline}} $IsEqual'{}'(x1: {}, x2: {}): bool {{ x1 == x2 }}",
+                suffix,
+                param_type,
+                param_type
+            );
+            emitln!(
+                writer,
+                "function {{:inline}} $IsValid'{}'(x: {}): bool {{ true }}",
+                suffix,
+                param_type,
+            );
+
+            // declare free variables to represent the type info for this type
+            emitln!(writer, "var {}_info: $TypeParamInfo;", param_type);
+        }
+        emitln!(writer);
+
+        self.spec_translator
+            .translate_axioms(env, mono_info.as_ref());
+
+        let mut translated_types = BTreeSet::new();
+        let mut translated_funs = BTreeSet::new();
+        let mut verified_functions_count = 0;
+        info!("generating verification conditions");
+        for module_env in self.env.get_modules() {
+            self.writer.set_location(&module_env.env.internal_loc());
+
+            spec_translator.translate_spec_vars(&module_env, mono_info.as_ref());
+            spec_translator.translate_spec_funs(&module_env, mono_info.as_ref());
+
+            for ref struct_env in module_env.get_structs() {
+                if struct_env.is_native_or_intrinsic() {
+                    continue;
+                }
+                for type_inst in mono_info
+                    .structs
+                    .get(&struct_env.get_qualified_id())
+                    .unwrap_or(empty)
+                {
+                    let struct_name = boogie_struct_name(struct_env, type_inst);
+                    if !translated_types.insert(struct_name) {
+                        continue;
+                    }
+                    StructTranslator {
+                        parent: self,
+                        struct_env,
+                        type_inst: type_inst.as_slice(),
+                    }
+                    .translate();
+                }
+            }
+
+            for ref fun_env in module_env.get_functions() {
+                if fun_env.is_native_or_intrinsic() {
+                    continue;
+                }
+                for (variant, ref fun_target) in self.targets.get_targets(fun_env) {
+                    if variant.is_verified() {
+                        verified_functions_count += 1;
+                        // Always produce a verified functions with an empty instantiation such that
+                        // there is at least one top-level entry points for a VC.
+                        FunctionTranslator {
+                            parent: self,
+                            fun_target,
+                            type_inst: &[],
+                        }
+                        .translate();
+
+                        // There maybe more verification targets that needs to be produced as we
+                        // defer the instantiation of verified functions to this stage
+                        for type_inst in mono_info
+                            .funs
+                            .get(&(fun_target.func_env.get_qualified_id(), variant))
+                            .unwrap_or(empty)
+                        {
+                            // Skip the none instantiation (i.e., each type parameter is
+                            // instantiated to itself as a concrete type). This has the same
+                            // effect as `type_inst: &[]` and is already captured above.
+                            let is_none_inst = type_inst.iter().enumerate().all(
+                                |(i, t)| matches!(t, Type::TypeParameter(idx) if *idx == i as u16),
+                            );
+                            if is_none_inst {
+                                continue;
+                            }
+
+                            verified_functions_count += 1;
+                            FunctionTranslator {
+                                parent: self,
+                                fun_target,
+                                type_inst,
+                            }
+                            .translate();
+                        }
+                    } else {
+                        // This variant is inlined, so translate for all type instantiations.
+                        for type_inst in mono_info
+                            .funs
+                            .get(&(
+                                fun_target.func_env.get_qualified_id(),
+                                FunctionVariant::Baseline,
+                            ))
+                            .unwrap_or(empty)
+                        {
+                            let fun_name = boogie_function_name(fun_env, type_inst);
+                            if !translated_funs.insert(fun_name) {
+                                continue;
+                            }
+                            FunctionTranslator {
+                                parent: self,
+                                fun_target,
+                                type_inst,
+                            }
+                            .translate();
+                        }
+                    }
+                }
+            }
+        }
+        // Emit any finalization items required by spec translation.
+        self.spec_translator.finalize();
+        info!("{} verification conditions", verified_functions_count);
+    }
+}
+
+// =================================================================================================
+// Struct Translation
+
+impl<'env> StructTranslator<'env> {
+    fn inst(&self, ty: &Type) -> Type {
+        ty.instantiate(self.type_inst)
+    }
+
+    /// Return whether a field involves bitwise operations
+    pub fn field_bv_flag(&self, field_id: &FieldId) -> bool {
+        let global_state = &self
+            .parent
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let operation_map = &global_state.struct_operation_map;
+        let mid = self.struct_env.module_env.get_id();
+        let sid = self.struct_env.get_id();
+        let field_oper = operation_map.get(&(mid, sid)).unwrap().get(field_id);
+        matches!(field_oper, Some(&Bitwise))
+    }
+
+    /// Return boogie type for a struct
+    pub fn boogie_type_for_struct_field(
+        &self,
+        field_id: &FieldId,
+        env: &GlobalEnv,
+        ty: &Type,
+    ) -> String {
+        let bv_flag = self.field_bv_flag(field_id);
+        if bv_flag {
+            boogie_bv_type(env, ty)
+        } else {
+            boogie_type(env, ty)
+        }
+    }
+
+    /// Translates the given struct.
+    fn translate(&self) {
+        let writer = self.parent.writer;
+        let struct_env = self.struct_env;
+        let env = struct_env.module_env.env;
+
+        let qid = struct_env
+            .get_qualified_id()
+            .instantiate(self.type_inst.to_owned());
+        emitln!(
+            writer,
+            "// struct {} {}",
+            env.display(&qid),
+            struct_env.get_loc().display(env)
+        );
+
+        // Set the location to internal as default.
+        writer.set_location(&env.internal_loc());
+
+        // Emit data type
+        let struct_name = boogie_struct_name(struct_env, self.type_inst);
+        emitln!(writer, "type {{:datatype}} {};", struct_name);
+
+        // Emit constructor
+        let fields = struct_env
+            .get_fields()
+            .map(|field| {
+                format!(
+                    "${}: {}",
+                    field.get_name().display(env.symbol_pool()),
+                    self.boogie_type_for_struct_field(
+                        &field.get_id(),
+                        env,
+                        &self.inst(&field.get_type())
+                    )
+                )
+            })
+            .join(", ");
+        emitln!(
+            writer,
+            "function {{:constructor}} {}({}): {};",
+            struct_name,
+            fields,
+            struct_name
+        );
+
+        let suffix = boogie_type_suffix_for_struct(struct_env, self.type_inst, false);
+
+        // Emit $UpdateField functions.
+        let fields = struct_env.get_fields().collect_vec();
+        for (pos, field_env) in fields.iter().enumerate() {
+            let field_name = field_env.get_name().display(env.symbol_pool()).to_string();
+            self.emit_function(
+                &format!(
+                    "$Update'{}'_{}(s: {}, x: {}): {}",
+                    suffix,
+                    field_name,
+                    struct_name,
+                    self.boogie_type_for_struct_field(
+                        &field_env.get_id(),
+                        env,
+                        &self.inst(&field_env.get_type())
+                    ),
+                    struct_name
+                ),
+                || {
+                    let args = fields
+                        .iter()
+                        .enumerate()
+                        .map(|(p, f)| {
+                            if p == pos {
+                                "x".to_string()
+                            } else {
+                                format!("{}(s)", boogie_field_sel(f, self.type_inst))
+                            }
+                        })
+                        .join(", ");
+                    emitln!(writer, "{}({})", struct_name, args);
+                },
+            );
+        }
+
+        // Emit $IsValid function.
+        self.emit_function_with_attr(
+            "", // not inlined!
+            &format!("$IsValid'{}'(s: {}): bool", suffix, struct_name),
+            || {
+                if struct_env.is_native_or_intrinsic() {
+                    emitln!(writer, "true")
+                } else {
+                    let mut sep = "";
+                    for field in struct_env.get_fields() {
+                        let sel = format!("{}({})", boogie_field_sel(&field, self.type_inst), "s");
+                        let ty = &field.get_type().instantiate(self.type_inst);
+                        let bv_flag = self.field_bv_flag(&field.get_id());
+                        emitln!(
+                            writer,
+                            "{}{}",
+                            sep,
+                            boogie_well_formed_expr_bv(env, &sel, ty, bv_flag)
+                        );
+                        sep = "  && ";
+                    }
+                }
+            },
+        );
+
+        // Emit equality
+        self.emit_function(
+            &format!(
+                "$IsEqual'{}'(s1: {}, s2: {}): bool",
+                suffix, struct_name, struct_name
+            ),
+            || {
+                if struct_has_native_equality(struct_env, self.type_inst, self.parent.options) {
+                    emitln!(writer, "s1 == s2")
+                } else {
+                    let mut sep = "";
+                    for field in &fields {
+                        let sel_fun = boogie_field_sel(field, self.type_inst);
+                        let bv_flag = self.field_bv_flag(&field.get_id());
+                        let field_suffix =
+                            boogie_type_suffix_bv(env, &self.inst(&field.get_type()), bv_flag);
+                        emit!(
+                            writer,
+                            "{}$IsEqual'{}'({}(s1), {}(s2))",
+                            sep,
+                            field_suffix,
+                            sel_fun,
+                            sel_fun,
+                        );
+                        sep = "\n&& ";
+                    }
+                }
+            },
+        );
+
+        if struct_env.has_memory() {
+            // Emit memory variable.
+            let memory_name = boogie_resource_memory_name(
+                env,
+                &struct_env
+                    .get_qualified_id()
+                    .instantiate(self.type_inst.to_owned()),
+                &None,
+            );
+            emitln!(writer, "var {}: $Memory {};", memory_name, struct_name);
+        }
+
+        emitln!(writer);
+    }
+
+    fn emit_function(&self, signature: &str, body_fn: impl Fn()) {
+        self.emit_function_with_attr("{:inline} ", signature, body_fn)
+    }
+
+    fn emit_function_with_attr(&self, attr: &str, signature: &str, body_fn: impl Fn()) {
+        let writer = self.parent.writer;
+        emitln!(writer, "function {}{} {{", attr, signature);
+        writer.indent();
+        body_fn();
+        writer.unindent();
+        emitln!(writer, "}");
+    }
+}
+
+// =================================================================================================
+// Function Translation
+
+impl<'env> FunctionTranslator<'env> {
+    /// Return whether a specific TempIndex involves in bitwise operations
+    pub fn bv_flag_from_map(&self, i: &usize, operation_map: &FuncOperationMap) -> bool {
+        let mid = self.fun_target.module_env().get_id();
+        let sid = self.fun_target.func_env.get_id();
+        let param_oper = operation_map.get(&(mid, sid)).unwrap().get(i);
+        matches!(param_oper, Some(&Bitwise))
+    }
+
+    /// Return whether a specific TempIndex involves in bitwise operations
+    pub fn bv_flag(&self, num_oper: &NumOperation) -> bool {
+        *num_oper == Bitwise
+    }
+
+    /// Return whether a return value at position i involves in bitwise operation
+    pub fn ret_bv_flag(&self, i: &usize) -> bool {
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let operation_map = &global_state.get_ret_map();
+        self.bv_flag_from_map(i, operation_map)
+    }
+
+    /// Return boogie type for a local with given signature token.
+    pub fn boogie_type_for_fun(
+        &self,
+        env: &GlobalEnv,
+        ty: &Type,
+        num_oper: &NumOperation,
+    ) -> String {
+        let bv_flag = self.bv_flag(num_oper);
+        if bv_flag {
+            boogie_bv_type(env, ty)
+        } else {
+            boogie_type(env, ty)
+        }
+    }
+
+    fn inst(&self, ty: &Type) -> Type {
+        ty.instantiate(self.type_inst)
+    }
+
+    fn inst_slice(&self, tys: &[Type]) -> Vec<Type> {
+        tys.iter().map(|ty| self.inst(ty)).collect()
+    }
+
+    fn get_local_type(&self, idx: TempIndex) -> Type {
+        self.fun_target
+            .get_local_type(idx)
+            .instantiate(self.type_inst)
+    }
+
+    /// Translates the given function.
+    fn translate(self) {
+        let writer = self.parent.writer;
+        let fun_target = self.fun_target;
+        let env = fun_target.global_env();
+        let qid = fun_target
+            .func_env
+            .get_qualified_id()
+            .instantiate(self.type_inst.to_owned());
+        emitln!(
+            writer,
+            "// fun {} [{}] {}",
+            env.display(&qid),
+            fun_target.data.variant,
+            fun_target.get_loc().display(env)
+        );
+        self.generate_function_sig();
+        self.generate_function_body();
+        emitln!(self.parent.writer);
+    }
+
+    /// Return a string for a boogie procedure header. Use inline attribute and name
+    /// suffix as indicated by `entry_point`.
+    fn generate_function_sig(&self) {
+        let writer = self.parent.writer;
+        let options = self.parent.options;
+        let fun_target = self.fun_target;
+        let (args, rets) = self.generate_function_args_and_returns();
+
+        let (suffix, attribs) = match &fun_target.data.variant {
+            FunctionVariant::Baseline => ("".to_string(), "{:inline 1} ".to_string()),
+            FunctionVariant::Verification(flavor) => {
+                let timeout = fun_target
+                    .func_env
+                    .get_num_pragma(TIMEOUT_PRAGMA, || options.vc_timeout);
+
+                let mut attribs = vec![format!("{{:timeLimit {}}} ", timeout)];
+
+                if fun_target.func_env.is_num_pragma_set(SEED_PRAGMA) {
+                    let seed = fun_target
+                        .func_env
+                        .get_num_pragma(SEED_PRAGMA, || options.random_seed);
+                    attribs.push(format!("{{:random_seed {}}} ", seed));
+                };
+
+                let suffix = match flavor {
+                    VerificationFlavor::Regular => "$verify".to_string(),
+                    VerificationFlavor::Instantiated(_) => {
+                        format!("$verify_{}", flavor)
+                    }
+                    VerificationFlavor::Inconsistency(_) => {
+                        attribs.push(format!(
+                            "{{:msg_if_verifies \"inconsistency_detected{}\"}} ",
+                            self.loc_str(&fun_target.get_loc())
+                        ));
+                        format!("$verify_{}", flavor)
+                    }
+                };
+                (suffix, attribs.join(""))
+            }
+        };
+        writer.set_location(&fun_target.get_loc());
+        emitln!(
+            writer,
+            "procedure {}{}{}({}) returns ({})",
+            attribs,
+            boogie_function_name(fun_target.func_env, self.type_inst),
+            suffix,
+            args,
+            rets,
+        )
+    }
+
+    /// Generate boogie representation of function args and return args.
+    fn generate_function_args_and_returns(&self) -> (String, String) {
+        let fun_target = self.fun_target;
+        let env = fun_target.global_env();
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
+        let args = (0..fun_target.get_parameter_count())
+            .map(|i| {
+                let ty = self.get_local_type(i);
+                // Boogie does not allow to assign to parameters, so we need to proxy them.
+                let prefix = if self.parameter_needs_to_be_mutable(fun_target, i) {
+                    "_$"
+                } else {
+                    "$"
+                };
+                let num_oper = global_state
+                    .get_temp_index_oper(mid, fid, i, baseline_flag)
+                    .unwrap_or(&Bottom);
+                format!(
+                    "{}t{}: {}",
+                    prefix,
+                    i,
+                    self.boogie_type_for_fun(env, &ty, num_oper)
+                )
+            })
+            .join(", ");
+        let mut_ref_inputs = (0..fun_target.get_parameter_count())
+            .enumerate()
+            .filter_map(|(i, idx)| {
+                let ty = self.get_local_type(idx);
+                if ty.is_mutable_reference() {
+                    Some((i, ty))
+                } else {
+                    None
+                }
+            })
+            .collect_vec();
+        let rets = fun_target
+            .get_return_types()
+            .iter()
+            .enumerate()
+            .map(|(i, s)| {
+                let s = self.inst(s);
+                let operation_map = global_state.get_ret_map();
+                let num_oper = operation_map.get(&(mid, fid)).unwrap().get(&i).unwrap();
+                format!("$ret{}: {}", i, self.boogie_type_for_fun(env, &s, num_oper))
+            })
+            // Add implicit return parameters for &mut
+            .chain(mut_ref_inputs.into_iter().enumerate().map(|(i, (_, ty))| {
+                let num_oper = &global_state
+                    .get_temp_index_oper(mid, fid, i, baseline_flag)
+                    .unwrap();
+                format!(
+                    "$ret{}: {}",
+                    usize::saturating_add(fun_target.get_return_count(), i),
+                    self.boogie_type_for_fun(env, &ty, num_oper)
+                )
+            }))
+            .join(", ");
+        (args, rets)
+    }
+
+    /// Generates boogie implementation body.
+    fn generate_function_body(&self) {
+        let writer = self.parent.writer;
+        let fun_target = self.fun_target;
+        let variant = &fun_target.data.variant;
+        let instantiation = &fun_target.data.type_args;
+        let env = fun_target.global_env();
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+
+        // Be sure to set back location to the whole function definition as a default.
+        writer.set_location(&fun_target.get_loc().at_start());
+
+        emitln!(writer, "{");
+        writer.indent();
+
+        // Print instantiation information
+        if !instantiation.is_empty() {
+            let display_ctxt = TypeDisplayContext::WithEnv {
+                env,
+                type_param_names: None,
+            };
+            emitln!(
+                writer,
+                "// function instantiation <{}>",
+                instantiation
+                    .iter()
+                    .map(|ty| ty.display(&display_ctxt))
+                    .join(", ")
+            );
+            emitln!(writer, "");
+        }
+
+        // Generate local variable declarations. They need to appear first in boogie.
+        emitln!(writer, "// declare local variables");
+        let num_args = fun_target.get_parameter_count();
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
+        for i in num_args..fun_target.get_local_count() {
+            let num_oper = global_state
+                .get_temp_index_oper(mid, fid, i, baseline_flag)
+                .unwrap();
+            let local_type = &self.get_local_type(i);
+            emitln!(
+                writer,
+                "var $t{}: {};",
+                i,
+                self.boogie_type_for_fun(env, local_type, num_oper)
+            );
+        }
+        // Generate declarations for renamed parameters.
+        let proxied_parameters = self.get_mutable_parameters();
+        for (idx, ty) in &proxied_parameters {
+            let num_oper = &global_state
+                .get_temp_index_oper(mid, fid, *idx, baseline_flag)
+                .unwrap();
+            emitln!(
+                writer,
+                "var $t{}: {};",
+                idx,
+                self.boogie_type_for_fun(env, &ty.instantiate(self.type_inst), num_oper)
+            );
+        }
+        // Generate declarations for modifies condition.
+        let mut mem_inst_seen = BTreeSet::new();
+        for qid in fun_target.get_modify_ids() {
+            let memory = qid.instantiate(self.type_inst);
+            if !mem_inst_seen.contains(&memory) {
+                emitln!(
+                    writer,
+                    "var {}: {}",
+                    boogie_modifies_memory_name(fun_target.global_env(), &memory),
+                    "[int]bool;"
+                );
+                mem_inst_seen.insert(memory);
+            }
+        }
+        let mut dup: Vec<String> = vec![];
+        // Declare temporaries for debug tracing and other purposes.
+        for (_, (ty, ref bv_flag, cnt)) in self.compute_needed_temps() {
+            for i in 0..cnt {
+                let bv_type = if *bv_flag {
+                    boogie_bv_type
+                } else {
+                    boogie_type
+                };
+                let temp_name =
+                    boogie_temp_from_suffix(env, &boogie_type_suffix_bv(env, &ty, *bv_flag), i);
+                if !dup.contains(&temp_name) {
+                    emitln!(writer, "var {}: {};", temp_name.clone(), bv_type(env, &ty));
+                    dup.push(temp_name);
+                }
+            }
+        }
+
+        // Generate memory snapshot variable declarations.
+        let code = fun_target.get_bytecode();
+        let labels = code
+            .iter()
+            .filter_map(|bc| {
+                use Bytecode::*;
+                match bc {
+                    SaveMem(_, lab, mem) => Some((lab, mem)),
+                    SaveSpecVar(..) => panic!("spec var memory snapshots NYI"),
+                    _ => None,
+                }
+            })
+            .collect::<BTreeSet<_>>();
+        for (lab, mem) in labels {
+            let mem = &mem.to_owned().instantiate(self.type_inst);
+            let name = boogie_resource_memory_name(env, mem, &Some(*lab));
+            emitln!(
+                writer,
+                "var {}: $Memory {};",
+                name,
+                boogie_struct_name(&env.get_struct_qid(mem.to_qualified_id()), &mem.inst)
+            );
+        }
+
+        // Initialize renamed parameters.
+        for (idx, _) in proxied_parameters {
+            emitln!(writer, "$t{} := _$t{};", idx, idx);
+        }
+
+        // Initial assumptions
+        if variant.is_verified() {
+            self.translate_verify_entry_assumptions(fun_target);
+        }
+
+        // Generate bytecode
+        emitln!(writer, "\n// bytecode translation starts here");
+        let mut last_tracked_loc = None;
+        for bytecode in code.iter() {
+            self.translate_bytecode(&mut last_tracked_loc, bytecode);
+        }
+
+        writer.unindent();
+        emitln!(writer, "}");
+    }
+
+    fn get_mutable_parameters(&self) -> Vec<(TempIndex, Type)> {
+        let fun_target = self.fun_target;
+        (0..fun_target.get_parameter_count())
+            .filter_map(|i| {
+                if self.parameter_needs_to_be_mutable(fun_target, i) {
+                    Some((i, fun_target.get_local_type(i).clone()))
+                } else {
+                    None
+                }
+            })
+            .collect_vec()
+    }
+
+    /// Determines whether the parameter of a function needs to be mutable.
+    /// Boogie does not allow to assign to procedure parameters. In some cases
+    /// (e.g. for memory instrumentation, but also as a result of copy propagation),
+    /// we may need to assign to parameters.
+    fn parameter_needs_to_be_mutable(
+        &self,
+        _fun_target: &FunctionTarget<'_>,
+        _idx: TempIndex,
+    ) -> bool {
+        // For now, we just always say true. This could be optimized because the actual (known
+        // so far) sources for mutability are parameters which are used in WriteBack(LocalRoot(p))
+        // position.
+        true
+    }
+
+    fn translate_verify_entry_assumptions(&self, fun_target: &FunctionTarget<'_>) {
+        let writer = self.parent.writer;
+        emitln!(writer, "\n// verification entrypoint assumptions");
+
+        // Prelude initialization
+        emitln!(writer, "call $InitVerification();");
+
+        // Assume reference parameters to be based on the Param(i) Location, ensuring
+        // they are disjoint from all other references. This prevents aliasing and is justified as
+        // follows:
+        // - for mutual references, by their exclusive access in Move.
+        // - for immutable references because we have eliminated them
+        for i in 0..fun_target.get_parameter_count() {
+            let ty = fun_target.get_local_type(i);
+            if ty.is_reference() {
+                emitln!(writer, "assume l#$Mutation($t{}) == $Param({});", i, i);
+            }
+        }
+    }
+}
+
+// =================================================================================================
+// Bytecode Translation
+
+impl<'env> FunctionTranslator<'env> {
+    /// Translates one bytecode instruction.
+    fn translate_bytecode(
+        &self,
+        last_tracked_loc: &mut Option<(Loc, LineIndex)>,
+        bytecode: &Bytecode,
+    ) {
+        use Bytecode::*;
+
+        let writer = self.parent.writer;
+        let spec_translator = &self.parent.spec_translator;
+        let options = self.parent.options;
+        let fun_target = self.fun_target;
+        let env = fun_target.global_env();
+
+        // Set location of this code in the CodeWriter.
+        let attr_id = bytecode.get_attr_id();
+        let loc = fun_target.get_bytecode_loc(attr_id);
+        writer.set_location(&loc);
+
+        // Print location.
+        emitln!(
+            writer,
+            "// {} {}",
+            bytecode.display(fun_target, &BTreeMap::default()),
+            loc.display(env)
+        );
+
+        // Print debug comments.
+        if let Some(comment) = fun_target.get_debug_comment(attr_id) {
+            if comment.starts_with("info: ") {
+                // if the comment is annotated with "info: ", it should be displayed to the user
+                emitln!(
+                    writer,
+                    "assume {{:print \"${}(){}\"}} true;",
+                    &comment[..4],
+                    &comment[4..]
+                );
+            } else {
+                emitln!(writer, "// {}", comment);
+            }
+        }
+
+        // Track location for execution traces.
+        if matches!(bytecode, Call(_, _, Operation::TraceAbort, ..)) {
+            // Ensure that aborts always has the precise location instead of the
+            // line-approximated one
+            *last_tracked_loc = None;
+        }
+        self.track_loc(last_tracked_loc, &loc);
+        if matches!(bytecode, Label(_, _)) {
+            // For labels, retrack the location after the label itself, so
+            // the information will not be missing if we jump to this label
+            *last_tracked_loc = None;
+        }
+
+        // Helper function to get a a string for a local
+        let str_local = |idx: usize| format!("$t{}", idx);
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let mid = self.fun_target.func_env.module_env.get_id();
+        let fid = self.fun_target.func_env.get_id();
+
+        // Translate the bytecode instruction.
+        match bytecode {
+            SaveMem(_, label, mem) => {
+                let mem = &mem.to_owned().instantiate(self.type_inst);
+                let snapshot = boogie_resource_memory_name(env, mem, &Some(*label));
+                let current = boogie_resource_memory_name(env, mem, &None);
+                emitln!(writer, "{} := {};", snapshot, current);
+            }
+            SaveSpecVar(_, _label, _var) => {
+                panic!("spec var snapshot NYI")
+            }
+            Prop(id, kind, exp) => match kind {
+                PropKind::Assert => {
+                    emit!(writer, "assert ");
+                    let info = fun_target
+                        .get_vc_info(*id)
+                        .map(|s| s.as_str())
+                        .unwrap_or("unknown assertion failed");
+                    emit!(
+                        writer,
+                        "{{:msg \"assert_failed{}: {}\"}}\n  ",
+                        self.loc_str(&loc),
+                        info
+                    );
+                    spec_translator.translate(exp, self.type_inst);
+                    emitln!(writer, ";");
+                }
+                PropKind::Assume => {
+                    emit!(writer, "assume ");
+                    spec_translator.translate(exp, self.type_inst);
+                    emitln!(writer, ";");
+                }
+                PropKind::Modifies => {
+                    let ty = &self.inst(&env.get_node_type(exp.node_id()));
+                    let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
+                    let (mid, sid, inst) = ty.require_struct();
+                    let memory = boogie_resource_memory_name(
+                        env,
+                        &mid.qualified_inst(sid, inst.to_owned()),
+                        &None,
+                    );
+                    let exists_str = boogie_temp(env, &BOOL_TYPE, 0, false);
+                    emitln!(writer, "havoc {};", exists_str);
+                    emitln!(writer, "if ({}) {{", exists_str);
+                    writer.with_indent(|| {
+                        let val_str = boogie_temp(env, ty, 0, bv_flag);
+                        emitln!(writer, "havoc {};", val_str);
+                        emit!(writer, "{} := $ResourceUpdate({}, ", memory, memory);
+                        spec_translator.translate(&exp.call_args()[0], self.type_inst);
+                        emitln!(writer, ", {});", val_str);
+                    });
+                    emitln!(writer, "} else {");
+                    writer.with_indent(|| {
+                        emit!(writer, "{} := $ResourceRemove({}, ", memory, memory);
+                        spec_translator.translate(&exp.call_args()[0], self.type_inst);
+                        emitln!(writer, ");");
+                    });
+                    emitln!(writer, "}");
+                }
+            },
+            Label(_, label) => {
+                writer.unindent();
+                emitln!(writer, "L{}:", label.as_usize());
+                writer.indent();
+            }
+            Jump(_, target) => emitln!(writer, "goto L{};", target.as_usize()),
+            Branch(_, then_target, else_target, idx) => emitln!(
+                writer,
+                "if ({}) {{ goto L{}; }} else {{ goto L{}; }}",
+                str_local(*idx),
+                then_target.as_usize(),
+                else_target.as_usize(),
+            ),
+            Assign(_, dest, src, _) => {
+                emitln!(writer, "{} := {};", str_local(*dest), str_local(*src));
+            }
+            Ret(_, rets) => {
+                for (i, r) in rets.iter().enumerate() {
+                    emitln!(writer, "$ret{} := {};", i, str_local(*r));
+                }
+                // Also assign input to output $mut parameters
+                let mut ret_idx = rets.len();
+                for i in 0..fun_target.get_parameter_count() {
+                    if self.get_local_type(i).is_mutable_reference() {
+                        emitln!(writer, "$ret{} := {};", ret_idx, str_local(i));
+                        ret_idx = usize::saturating_add(ret_idx, 1);
+                    }
+                }
+                emitln!(writer, "return;");
+            }
+            Load(_, dest, c) => {
+                let num_oper = global_state
+                    .get_temp_index_oper(mid, fid, *dest, baseline_flag)
+                    .unwrap();
+                let bv_flag = self.bv_flag(num_oper);
+                let value = match c {
+                    Constant::Bool(true) => "true".to_string(),
+                    Constant::Bool(false) => "false".to_string(),
+                    Constant::U8(num) => boogie_num_literal(&num.to_string(), 8, bv_flag),
+                    Constant::U64(num) => boogie_num_literal(&num.to_string(), 64, bv_flag),
+                    Constant::U128(num) => boogie_num_literal(&num.to_string(), 128, bv_flag),
+                    Constant::U256(num) => boogie_num_literal(&num.to_string(), 256, bv_flag),
+                    Constant::Address(val) => val.to_string(),
+                    Constant::ByteArray(val) => boogie_byte_blob(options, val, bv_flag),
+                    Constant::AddressArray(val) => boogie_address_blob(options, val),
+                    Constant::Vector(val) => boogie_constant_blob(options, val),
+                    Constant::U16(num) => boogie_num_literal(&num.to_string(), 16, bv_flag),
+                    Constant::U32(num) => boogie_num_literal(&num.to_string(), 32, bv_flag),
+                };
+                let dest_str = str_local(*dest);
+                emitln!(writer, "{} := {};", dest_str, value);
+                // Insert a WellFormed assumption so the new value gets tagged as u8, ...
+                let ty = &self.get_local_type(*dest);
+                let check = boogie_well_formed_check(env, &dest_str, ty, bv_flag);
+                if !check.is_empty() {
+                    emitln!(writer, &check);
+                }
+            }
+            Call(_, dests, oper, srcs, aa) => {
+                use Operation::*;
+                match oper {
+                    FreezeRef => unreachable!(),
+                    UnpackRef | UnpackRefDeep | PackRef | PackRefDeep => {
+                        // No effect
+                    }
+                    OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
+                        // These are just markers.  There is no generated code.
+                    }
+                    WriteBack(node, edge) => {
+                        self.translate_write_back(node, edge, srcs[0]);
+                    }
+                    IsParent(node, edge) => {
+                        if let BorrowNode::Reference(parent) = node {
+                            let src_str = str_local(srcs[0]);
+                            let edge_pattern = edge
+                                .flatten()
+                                .into_iter()
+                                .filter_map(|e| match e {
+                                    BorrowEdge::Field(_, offset) => Some(format!("{}", offset)),
+                                    BorrowEdge::Index(_) => Some("-1".to_owned()),
+                                    BorrowEdge::Direct => None,
+                                    _ => unreachable!(),
+                                })
+                                .collect_vec();
+                            if edge_pattern.is_empty() {
+                                emitln!(
+                                    writer,
+                                    "{} := $IsSameMutation({}, {});",
+                                    str_local(dests[0]),
+                                    str_local(*parent),
+                                    src_str
+                                );
+                            } else if edge_pattern.len() == 1 {
+                                emitln!(
+                                    writer,
+                                    "{} := $IsParentMutation({}, {}, {});",
+                                    str_local(dests[0]),
+                                    str_local(*parent),
+                                    edge_pattern[0],
+                                    src_str
+                                );
+                            } else {
+                                emitln!(
+                                    writer,
+                                    "{} := $IsParentMutationHyper({}, {}, {});",
+                                    str_local(dests[0]),
+                                    str_local(*parent),
+                                    boogie_make_vec_from_strings(&edge_pattern),
+                                    src_str
+                                );
+                            }
+                        } else {
+                            panic!("inconsistent IsParent instruction: expected a reference node")
+                        }
+                    }
+                    BorrowLoc => {
+                        let src = srcs[0];
+                        let dest = dests[0];
+                        emitln!(
+                            writer,
+                            "{} := $Mutation($Local({}), EmptyVec(), {});",
+                            str_local(dest),
+                            src,
+                            str_local(src)
+                        );
+                    }
+                    ReadRef => {
+                        let src = srcs[0];
+                        let dest = dests[0];
+                        emitln!(
+                            writer,
+                            "{} := $Dereference({});",
+                            str_local(dest),
+                            str_local(src)
+                        );
+                    }
+                    WriteRef => {
+                        let reference = srcs[0];
+                        let value = srcs[1];
+                        emitln!(
+                            writer,
+                            "{} := $UpdateMutation({}, {});",
+                            str_local(reference),
+                            str_local(reference),
+                            str_local(value),
+                        );
+                    }
+                    Function(mid, fid, inst) => {
+                        let inst = &self.inst_slice(inst);
+                        let module_env = env.get_module(*mid);
+                        let callee_env = module_env.get_function(*fid);
+
+                        let mut args_str = srcs.iter().cloned().map(str_local).join(", ");
+                        let dest_str = dests
+                            .iter()
+                            .cloned()
+                            .map(str_local)
+                            // Add implict dest returns for &mut srcs:
+                            //  f(x) --> x := f(x)  if type(x) = &mut_
+                            .chain(
+                                srcs.iter()
+                                    .filter(|idx| self.get_local_type(**idx).is_mutable_reference())
+                                    .cloned()
+                                    .map(str_local),
+                            )
+                            .join(",");
+
+                        // special casing for type reflection
+                        let mut processed = false;
+
+                        // TODO(mengxu): change it to a better address name instead of extlib
+                        if env.get_extlib_address() == *module_env.get_name().addr() {
+                            let qualified_name = format!(
+                                "{}::{}",
+                                module_env.get_name().name().display(env.symbol_pool()),
+                                callee_env.get_name().display(env.symbol_pool()),
+                            );
+                            if qualified_name == TYPE_NAME_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                if dest_str.is_empty() {
+                                    emitln!(
+                                        writer,
+                                        "{}",
+                                        boogie_reflection_type_name(env, &inst[0], false)
+                                    );
+                                } else {
+                                    emitln!(
+                                        writer,
+                                        "{} := {};",
+                                        dest_str,
+                                        boogie_reflection_type_name(env, &inst[0], false)
+                                    );
+                                }
+                                processed = true;
+                            } else if qualified_name == TYPE_INFO_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                let (flag, info) = boogie_reflection_type_info(env, &inst[0]);
+                                emitln!(writer, "if (!{}) {{", flag);
+                                writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                                emitln!(writer, "}");
+                                if !dest_str.is_empty() {
+                                    emitln!(writer, "else {");
+                                    writer.with_indent(|| {
+                                        emitln!(writer, "{} := {};", dest_str, info)
+                                    });
+                                    emitln!(writer, "}");
+                                }
+                                processed = true;
+                            }
+                        }
+
+                        if env.get_stdlib_address() == *module_env.get_name().addr() {
+                            let qualified_name = format!(
+                                "{}::{}",
+                                module_env.get_name().name().display(env.symbol_pool()),
+                                callee_env.get_name().display(env.symbol_pool()),
+                            );
+                            if qualified_name == TYPE_NAME_GET_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                if dest_str.is_empty() {
+                                    emitln!(
+                                        writer,
+                                        "{}",
+                                        boogie_reflection_type_name(env, &inst[0], true)
+                                    );
+                                } else {
+                                    emitln!(
+                                        writer,
+                                        "{} := {};",
+                                        dest_str,
+                                        boogie_reflection_type_name(env, &inst[0], true)
+                                    );
+                                }
+                                processed = true;
+                            }
+                        }
+
+                        // regular path
+                        if !processed {
+                            let targeted = self.fun_target.module_env().is_target();
+                            let caller_mid = self.fun_target.module_env().get_id();
+                            let caller_fid = self.fun_target.get_id();
+                            let fun_verified =
+                                !self.fun_target.func_env.is_explicitly_not_verified(
+                                    &ProverOptions::get(self.fun_target.global_env()).verify_scope,
+                                );
+                            let mut fun_name = boogie_function_name(&callee_env, inst);
+                            // Helper function to check whether the idx corresponds to a bitwise operation
+                            let compute_flag = |idx: TempIndex| {
+                                targeted
+                                    && fun_verified
+                                    && *global_state
+                                        .get_temp_index_oper(
+                                            caller_mid,
+                                            caller_fid,
+                                            idx,
+                                            baseline_flag,
+                                        )
+                                        .unwrap()
+                                        == Bitwise
+                            };
+                            let instrument_bv2int =
+                                |idx: TempIndex, args_str_vec: &mut Vec<String>| {
+                                    let local_ty_srcs_1 = self.get_local_type(idx);
+                                    let srcs_1_bv_flag = compute_flag(idx);
+                                    let mut args_src_1_str = str_local(idx);
+                                    if srcs_1_bv_flag {
+                                        args_src_1_str = format!(
+                                            "$bv2int.{}({})",
+                                            boogie_num_type_base(&local_ty_srcs_1),
+                                            args_src_1_str
+                                        );
+                                    }
+                                    args_str_vec.push(args_src_1_str);
+                                };
+                            let callee_name = callee_env.get_name_str();
+                            if dest_str.is_empty() {
+                                let bv_flag = !srcs.is_empty() && compute_flag(srcs[0]);
+                                if module_env.is_std_vector() {
+                                    // Check the target vector contains bv values
+                                    if callee_name.contains("insert") {
+                                        let mut args_str_vec =
+                                            vec![str_local(srcs[0]), str_local(srcs[1])];
+                                        assert!(srcs.len() > 2);
+                                        instrument_bv2int(srcs[2], &mut args_str_vec);
+                                        args_str = args_str_vec.iter().cloned().join(", ");
+                                    }
+                                    fun_name =
+                                        boogie_function_bv_name(&callee_env, inst, &[bv_flag]);
+                                } else if module_env.is_table() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[false, bv_flag],
+                                    );
+                                }
+                                emitln!(writer, "call {}({});", fun_name, args_str);
+                            } else {
+                                let dest_bv_flag = !dests.is_empty() && compute_flag(dests[0]);
+                                let bv_flag = !srcs.is_empty() && compute_flag(srcs[0]);
+                                // Handle the case where the return value of length is assigned to a bv int because
+                                // length always returns a non-bv result
+                                if module_env.is_std_vector() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[bv_flag || dest_bv_flag],
+                                    );
+                                    // Handle the case where the return value of length is assigned to a bv int because
+                                    // length always returns a non-bv result
+                                    if callee_name.contains("length") && dest_bv_flag {
+                                        let local_ty = self.get_local_type(dests[0]);
+                                        // Insert '$' for calling function instead of procedure
+                                        // TODO(tengzhang): a hacky way to convert int to bv for return value
+                                        fun_name.insert(10, '$');
+                                        // first call len fun then convert its return value to a bv type
+                                        emitln!(
+                                            writer,
+                                            "call {} := $int2bv{}({}({}));",
+                                            dest_str,
+                                            boogie_num_type_base(&local_ty),
+                                            fun_name,
+                                            args_str
+                                        );
+                                    } else if callee_name.contains("borrow")
+                                        || callee_name.contains("remove")
+                                        || callee_name.contains("swap")
+                                    {
+                                        let mut args_str_vec = vec![str_local(srcs[0])];
+                                        instrument_bv2int(srcs[1], &mut args_str_vec);
+                                        // Handle swap with three parameters
+                                        if srcs.len() > 2 {
+                                            instrument_bv2int(srcs[2], &mut args_str_vec);
+                                        }
+                                        args_str = args_str_vec.iter().cloned().join(", ");
+                                    }
+                                } else if module_env.is_table() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[false, bv_flag || dest_bv_flag],
+                                    );
+                                    if dest_bv_flag && callee_name.contains("length") {
+                                        // Handle the case where the return value of length is assigned to a bv int because
+                                        // length always returns a non-bv result
+                                        let local_ty = self.get_local_type(dests[0]);
+                                        // Replace with "spec_len"
+                                        let length_idx_start = callee_name.find("length").unwrap();
+                                        let length_idx_end = length_idx_start + "length".len();
+                                        fun_name = [
+                                            callee_name[0..length_idx_start].to_string(),
+                                            "spec_len".to_string(),
+                                            callee_name[length_idx_end..].to_string(),
+                                        ]
+                                        .join("");
+                                        // first call len fun then convert its return value to a bv type
+                                        emitln!(
+                                            writer,
+                                            "call {} := $int2bv{}({}({}));",
+                                            dest_str,
+                                            boogie_num_type_base(&local_ty),
+                                            fun_name,
+                                            args_str
+                                        );
+                                    }
+                                }
+                                emitln!(writer, "call {} := {}({});", dest_str, fun_name, args_str);
+                            }
+                        }
+
+                        // Clear the last track location after function call, as the call inserted
+                        // location tracks before it returns.
+                        *last_tracked_loc = None;
+                    }
+                    Pack(mid, sid, inst) => {
+                        let inst = &self.inst_slice(inst);
+                        let struct_env = env.get_module(*mid).into_struct(*sid);
+                        let args = srcs.iter().cloned().map(str_local).join(", ");
+                        let dest_str = str_local(dests[0]);
+                        emitln!(
+                            writer,
+                            "{} := {}({});",
+                            dest_str,
+                            boogie_struct_name(&struct_env, inst),
+                            args
+                        );
+                    }
+                    Unpack(mid, sid, inst) => {
+                        let inst = &self.inst_slice(inst);
+                        let struct_env = env.get_module(*mid).into_struct(*sid);
+                        for (i, ref field_env) in struct_env.get_fields().enumerate() {
+                            let field_sel = format!(
+                                "{}({})",
+                                boogie_field_sel(field_env, inst),
+                                str_local(srcs[0])
+                            );
+                            emitln!(writer, "{} := {};", str_local(dests[i]), field_sel);
+                        }
+                    }
+                    BorrowField(mid, sid, inst, field_offset) => {
+                        let inst = &self.inst_slice(inst);
+                        let src_str = str_local(srcs[0]);
+                        let dest_str = str_local(dests[0]);
+                        let struct_env = env.get_module(*mid).into_struct(*sid);
+                        let field_env = &struct_env.get_field_by_offset(*field_offset);
+                        let sel_fun = boogie_field_sel(field_env, inst);
+                        emitln!(
+                            writer,
+                            "{} := $ChildMutation({}, {}, {}($Dereference({})));",
+                            dest_str,
+                            src_str,
+                            field_offset,
+                            sel_fun,
+                            src_str
+                        );
+                    }
+                    GetField(mid, sid, inst, field_offset) => {
+                        let inst = &self.inst_slice(inst);
+                        let src = srcs[0];
+                        let mut src_str = str_local(src);
+                        let dest_str = str_local(dests[0]);
+                        let struct_env = env.get_module(*mid).into_struct(*sid);
+                        let field_env = &struct_env.get_field_by_offset(*field_offset);
+                        let sel_fun = boogie_field_sel(field_env, inst);
+                        if self.get_local_type(src).is_reference() {
+                            src_str = format!("$Dereference({})", src_str);
+                        };
+                        emitln!(writer, "{} := {}({});", dest_str, sel_fun, src_str);
+                    }
+                    Exists(mid, sid, inst) => {
+                        let inst = self.inst_slice(inst);
+                        let addr_str = str_local(srcs[0]);
+                        let dest_str = str_local(dests[0]);
+                        let memory = boogie_resource_memory_name(
+                            env,
+                            &mid.qualified_inst(*sid, inst),
+                            &None,
+                        );
+                        emitln!(
+                            writer,
+                            "{} := $ResourceExists({}, {});",
+                            dest_str,
+                            memory,
+                            addr_str
+                        );
+                    }
+                    BorrowGlobal(mid, sid, inst) => {
+                        let inst = self.inst_slice(inst);
+                        let addr_str = str_local(srcs[0]);
+                        let dest_str = str_local(dests[0]);
+                        let memory = boogie_resource_memory_name(
+                            env,
+                            &mid.qualified_inst(*sid, inst),
+                            &None,
+                        );
+                        emitln!(writer, "if (!$ResourceExists({}, {})) {{", memory, addr_str);
+                        writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                        emitln!(writer, "} else {");
+                        writer.with_indent(|| {
+                            emitln!(
+                                writer,
+                                "{} := $Mutation($Global({}), EmptyVec(), $ResourceValue({}, {}));",
+                                dest_str,
+                                addr_str,
+                                memory,
+                                addr_str
+                            );
+                        });
+                        emitln!(writer, "}");
+                    }
+                    GetGlobal(mid, sid, inst) => {
+                        let inst = self.inst_slice(inst);
+                        let memory = boogie_resource_memory_name(
+                            env,
+                            &mid.qualified_inst(*sid, inst),
+                            &None,
+                        );
+                        let addr_str = str_local(srcs[0]);
+                        let dest_str = str_local(dests[0]);
+                        emitln!(writer, "if (!$ResourceExists({}, {})) {{", memory, addr_str);
+                        writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                        emitln!(writer, "} else {");
+                        writer.with_indent(|| {
+                            emitln!(
+                                writer,
+                                "{} := $ResourceValue({}, {});",
+                                dest_str,
+                                memory,
+                                addr_str
+                            );
+                        });
+                        emitln!(writer, "}");
+                    }
+                    MoveTo(mid, sid, inst) => {
+                        let inst = self.inst_slice(inst);
+                        let memory = boogie_resource_memory_name(
+                            env,
+                            &mid.qualified_inst(*sid, inst),
+                            &None,
+                        );
+                        let value_str = str_local(srcs[0]);
+                        let signer_str = str_local(srcs[1]);
+                        emitln!(
+                            writer,
+                            "if ($ResourceExists({}, $addr#$signer({}))) {{",
+                            memory,
+                            signer_str
+                        );
+                        writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                        emitln!(writer, "} else {");
+                        writer.with_indent(|| {
+                            emitln!(
+                                writer,
+                                "{} := $ResourceUpdate({}, $addr#$signer({}), {});",
+                                memory,
+                                memory,
+                                signer_str,
+                                value_str
+                            );
+                        });
+                        emitln!(writer, "}");
+                    }
+                    MoveFrom(mid, sid, inst) => {
+                        let inst = &self.inst_slice(inst);
+                        let memory = boogie_resource_memory_name(
+                            env,
+                            &mid.qualified_inst(*sid, inst.to_owned()),
+                            &None,
+                        );
+                        let addr_str = str_local(srcs[0]);
+                        let dest_str = str_local(dests[0]);
+                        emitln!(writer, "if (!$ResourceExists({}, {})) {{", memory, addr_str);
+                        writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                        emitln!(writer, "} else {");
+                        writer.with_indent(|| {
+                            emitln!(
+                                writer,
+                                "{} := $ResourceValue({}, {});",
+                                dest_str,
+                                memory,
+                                addr_str
+                            );
+                            emitln!(
+                                writer,
+                                "{} := $ResourceRemove({}, {});",
+                                memory,
+                                memory,
+                                addr_str
+                            );
+                        });
+                        emitln!(writer, "}");
+                    }
+                    Havoc(HavocKind::Value) | Havoc(HavocKind::MutationAll) => {
+                        let var_str = str_local(dests[0]);
+                        emitln!(writer, "havoc {};", var_str);
+                    }
+                    Havoc(HavocKind::MutationValue) => {
+                        let ty = &self.get_local_type(dests[0]);
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let var_str = str_local(dests[0]);
+                        let temp_str = boogie_temp(env, ty.skip_reference(), 0, bv_flag);
+                        emitln!(writer, "havoc {};", temp_str);
+                        emitln!(
+                            writer,
+                            "{} := $UpdateMutation({}, {});",
+                            var_str,
+                            var_str,
+                            temp_str
+                        );
+                    }
+                    Stop => {
+                        // the two statements combined terminate any execution trace that reaches it
+                        emitln!(writer, "assume false;");
+                        emitln!(writer, "return;");
+                    }
+                    CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 => {
+                        let src = srcs[0];
+                        let dest = dests[0];
+                        let make_cast = |target_base: &str, src: TempIndex, dest: TempIndex| {
+                            let num_oper = global_state
+                                .get_temp_index_oper(mid, fid, src, baseline_flag)
+                                .unwrap();
+                            let bv_flag = self.bv_flag(num_oper);
+                            if bv_flag {
+                                let src_type = self.get_local_type(src);
+                                let base = boogie_num_type_base(&src_type);
+                                emitln!(
+                                    writer,
+                                    "call {} := $CastBv{}to{}({});",
+                                    str_local(dest),
+                                    base,
+                                    target_base,
+                                    str_local(src)
+                                );
+                            } else {
+                                emitln!(
+                                    writer,
+                                    "call {} := $CastU{}({});",
+                                    str_local(dest),
+                                    target_base,
+                                    str_local(src)
+                                );
+                            }
+                        };
+                        let target_base = match oper {
+                            CastU8 => "8",
+                            CastU16 => "16",
+                            CastU32 => "32",
+                            CastU64 => "64",
+                            CastU128 => "128",
+                            CastU256 => "256",
+                            _ => unreachable!(),
+                        };
+                        make_cast(target_base, src, dest);
+                    }
+                    Not => {
+                        let src = srcs[0];
+                        let dest = dests[0];
+                        emitln!(
+                            writer,
+                            "call {} := $Not({});",
+                            str_local(dest),
+                            str_local(src)
+                        );
+                    }
+                    Add => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let unchecked = if fun_target
+                            .is_pragma_true(ADDITION_OVERFLOW_UNCHECKED_PRAGMA, || false)
+                        {
+                            "_unchecked"
+                        } else {
+                            ""
+                        };
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+
+                        let add_type = match &self.get_local_type(dest) {
+                            Type::Primitive(PrimitiveType::U8) => {
+                                boogie_num_type_string_capital("8", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U16) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("16", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U32) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("32", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U64) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("64", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U128) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("128", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U256) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("256", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(_)
+                            | Type::Tuple(_)
+                            | Type::Vector(_)
+                            | Type::Struct(_, _, _)
+                            | Type::TypeParameter(_)
+                            | Type::Reference(_, _)
+                            | Type::Fun(_, _)
+                            | Type::TypeDomain(_)
+                            | Type::ResourceDomain(_, _, _)
+                            | Type::Error
+                            | Type::Var(_) => unreachable!(),
+                        };
+                        emitln!(
+                            writer,
+                            "call {} := $Add{}({}, {});",
+                            str_local(dest),
+                            add_type,
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Sub => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        if bv_flag {
+                            let sub_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := $Sub{}({}, {});",
+                                str_local(dest),
+                                sub_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        } else {
+                            emitln!(
+                                writer,
+                                "call {} := $Sub({}, {});",
+                                str_local(dest),
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        }
+                    }
+                    Mul => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let mul_type = match &self.get_local_type(dest) {
+                            Type::Primitive(PrimitiveType::U8) => {
+                                boogie_num_type_string_capital("8", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U16) => {
+                                boogie_num_type_string_capital("16", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U32) => {
+                                boogie_num_type_string_capital("32", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U64) => {
+                                boogie_num_type_string_capital("64", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U128) => {
+                                boogie_num_type_string_capital("128", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U256) => {
+                                boogie_num_type_string_capital("256", bv_flag)
+                            }
+                            Type::Primitive(_)
+                            | Type::Tuple(_)
+                            | Type::Vector(_)
+                            | Type::Struct(_, _, _)
+                            | Type::TypeParameter(_)
+                            | Type::Reference(_, _)
+                            | Type::Fun(_, _)
+                            | Type::TypeDomain(_)
+                            | Type::ResourceDomain(_, _, _)
+                            | Type::Error
+                            | Type::Var(_) => unreachable!(),
+                        };
+                        emitln!(
+                            writer,
+                            "call {} := $Mul{}({}, {});",
+                            str_local(dest),
+                            mul_type,
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Div => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let div_type = if bv_flag {
+                            match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            }
+                        } else {
+                            "".to_string()
+                        };
+                        emitln!(
+                            writer,
+                            "call {} := $Div{}({}, {});",
+                            str_local(dest),
+                            div_type,
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Mod => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let mod_type = if bv_flag {
+                            match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            }
+                        } else {
+                            "".to_string()
+                        };
+                        emitln!(
+                            writer,
+                            "call {} := $Mod{}({}, {});",
+                            str_local(dest),
+                            mod_type,
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Shl | Shr => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let sh_oper_str = if oper == &Shl { "Shl" } else { "Shr" };
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        if bv_flag {
+                            let target_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            let src_type = boogie_num_type_base(&self.get_local_type(op2));
+                            emitln!(
+                                writer,
+                                "call {} := ${}Bv{}From{}({}, {});",
+                                str_local(dest),
+                                sh_oper_str,
+                                target_type,
+                                src_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        } else {
+                            let sh_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "U8",
+                                Type::Primitive(PrimitiveType::U16) => "U16",
+                                Type::Primitive(PrimitiveType::U32) => "U32",
+                                Type::Primitive(PrimitiveType::U64) => "U64",
+                                Type::Primitive(PrimitiveType::U128) => "U128",
+                                Type::Primitive(PrimitiveType::U256) => "U256",
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := ${}{}({}, {});",
+                                str_local(dest),
+                                sh_oper_str,
+                                sh_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        }
+                    }
+                    Lt | Le | Gt | Ge => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let make_comparison = |comp_oper: &str, op1, op2, dest| {
+                            let num_oper = global_state
+                                .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                                .unwrap();
+                            let bv_flag = self.bv_flag(num_oper);
+                            let lt_type = if bv_flag {
+                                match &self.get_local_type(op1) {
+                                    Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                    Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                    Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                    Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                    Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                    Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                    Type::Primitive(_)
+                                    | Type::Tuple(_)
+                                    | Type::Vector(_)
+                                    | Type::Struct(_, _, _)
+                                    | Type::TypeParameter(_)
+                                    | Type::Reference(_, _)
+                                    | Type::Fun(_, _)
+                                    | Type::TypeDomain(_)
+                                    | Type::ResourceDomain(_, _, _)
+                                    | Type::Error
+                                    | Type::Var(_) => unreachable!(),
+                                }
+                            } else {
+                                "".to_string()
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := {}{}({}, {});",
+                                str_local(dest),
+                                comp_oper,
+                                lt_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        };
+                        let comp_oper = match oper {
+                            Lt => "$Lt",
+                            Le => "$Le",
+                            Gt => "$Gt",
+                            Ge => "$Ge",
+                            _ => unreachable!(),
+                        };
+                        make_comparison(comp_oper, op1, op2, dest);
+                    }
+                    Or => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        emitln!(
+                            writer,
+                            "call {} := $Or({}, {});",
+                            str_local(dest),
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    And => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        emitln!(
+                            writer,
+                            "call {} := $And({}, {});",
+                            str_local(dest),
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Eq | Neq => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let oper = boogie_equality_for_type(
+                            env,
+                            oper == &Eq,
+                            &self.get_local_type(op1),
+                            bv_flag,
+                        );
+                        emitln!(
+                            writer,
+                            "{} := {}({}, {});",
+                            str_local(dest),
+                            oper,
+                            str_local(op1),
+                            str_local(op2)
+                        );
+                    }
+                    Xor | BitOr | BitAnd => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let make_bitwise =
+                            |bv_oper: &str, op1: TempIndex, op2: TempIndex, dest: TempIndex| {
+                                let base = match &self.get_local_type(dest) {
+                                    Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                    Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                    Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                    Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                    Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                    Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                    Type::Primitive(_)
+                                    | Type::Tuple(_)
+                                    | Type::Vector(_)
+                                    | Type::Struct(_, _, _)
+                                    | Type::TypeParameter(_)
+                                    | Type::Reference(_, _)
+                                    | Type::Fun(_, _)
+                                    | Type::TypeDomain(_)
+                                    | Type::ResourceDomain(_, _, _)
+                                    | Type::Error
+                                    | Type::Var(_) => unreachable!(),
+                                };
+                                let op1_ty = &self.get_local_type(op1);
+                                let op2_ty = &self.get_local_type(op2);
+                                let num_oper_1 = global_state
+                                    .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                                    .unwrap();
+                                let op1_bv_flag = self.bv_flag(num_oper_1);
+                                let num_oper_2 = global_state
+                                    .get_temp_index_oper(mid, fid, op2, baseline_flag)
+                                    .unwrap();
+                                let op2_bv_flag = self.bv_flag(num_oper_2);
+                                let op1_str = if !op1_bv_flag {
+                                    format!(
+                                        "$int2bv.{}({})",
+                                        boogie_num_type_base(op1_ty),
+                                        str_local(op1)
+                                    )
+                                } else {
+                                    str_local(op1)
+                                };
+                                let op2_str = if !op2_bv_flag {
+                                    format!(
+                                        "$int2bv.{}({})",
+                                        boogie_num_type_base(op2_ty),
+                                        str_local(op2)
+                                    )
+                                } else {
+                                    str_local(op2)
+                                };
+                                emitln!(
+                                    writer,
+                                    "call {} := {}{}({}, {});",
+                                    str_local(dest),
+                                    bv_oper,
+                                    base,
+                                    op1_str,
+                                    op2_str
+                                );
+                            };
+                        let bv_oper_str = match oper {
+                            Xor => "$Xor",
+                            BitOr => "$Or",
+                            BitAnd => "$And",
+                            _ => unreachable!(),
+                        };
+                        make_bitwise(bv_oper_str, op1, op2, dest);
+                    }
+                    Uninit => {
+                        emitln!(
+                            writer,
+                            "assume l#$Mutation($t{}) == $Uninitialized();",
+                            srcs[0]
+                        );
+                    }
+                    Destroy => {}
+                    TraceLocal(idx) => {
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        self.track_local(*idx, srcs[0], bv_flag);
+                    }
+                    TraceReturn(i) => {
+                        let oper_map = global_state.get_ret_map();
+                        let bv_flag = self.bv_flag_from_map(&srcs[0], oper_map);
+                        self.track_return(*i, srcs[0], bv_flag);
+                    }
+                    TraceAbort => self.track_abort(&str_local(srcs[0])),
+                    TraceExp(kind, node_id) => {
+                        let bv_flag = *global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap()
+                            == Bitwise;
+                        self.track_exp(*kind, *node_id, srcs[0], bv_flag)
+                    }
+                    EmitEvent => {
+                        let msg = srcs[0];
+                        let handle = srcs[1];
+                        let suffix = boogie_type_suffix(env, &self.get_local_type(msg));
+                        emit!(
+                            writer,
+                            "$es := ${}ExtendEventStore'{}'($es, ",
+                            if srcs.len() > 2 { "Cond" } else { "" },
+                            suffix
+                        );
+                        emit!(writer, "{}, {}", str_local(handle), str_local(msg));
+                        if srcs.len() > 2 {
+                            emit!(writer, ", {}", str_local(srcs[2]));
+                        }
+                        emitln!(writer, ");");
+                    }
+                    EventStoreDiverge => {
+                        emitln!(writer, "call $es := $EventStore__diverge($es);");
+                    }
+                    TraceGlobalMem(mem) => {
+                        let mem = &mem.to_owned().instantiate(self.type_inst);
+                        let node_id = env.new_node(env.unknown_loc(), mem.to_type());
+                        self.track_global_mem(mem, node_id);
+                    }
+                }
+                if let Some(AbortAction(target, code)) = aa {
+                    emitln!(writer, "if ($abort_flag) {");
+                    writer.indent();
+                    *last_tracked_loc = None;
+                    self.track_loc(last_tracked_loc, &loc);
+                    let code_str = str_local(*code);
+                    emitln!(writer, "{} := $abort_code;", code_str);
+                    self.track_abort(&code_str);
+                    emitln!(writer, "goto L{};", target.as_usize());
+                    writer.unindent();
+                    emitln!(writer, "}");
+                }
+            }
+            Abort(_, src) => {
+                emitln!(writer, "$abort_code := {};", str_local(*src));
+                emitln!(writer, "$abort_flag := true;");
+                emitln!(writer, "return;")
+            }
+            Nop(..) => {}
+        }
+        emitln!(writer);
+    }
+
+    fn translate_write_back(&self, dest: &BorrowNode, edge: &BorrowEdge, src: TempIndex) {
+        use BorrowNode::*;
+        let writer = self.parent.writer;
+        let env = self.parent.env;
+        let src_str = format!("$t{}", src);
+        match dest {
+            ReturnPlaceholder(_) => {
+                unreachable!("unexpected transient borrow node")
+            }
+            GlobalRoot(memory) => {
+                assert!(matches!(edge, BorrowEdge::Direct));
+                let memory = &memory.to_owned().instantiate(self.type_inst);
+                let memory_name = boogie_resource_memory_name(env, memory, &None);
+                emitln!(
+                    writer,
+                    "{} := $ResourceUpdate({}, $GlobalLocationAddress({}),\n    \
+                                     $Dereference({}));",
+                    memory_name,
+                    memory_name,
+                    src_str,
+                    src_str
+                );
+            }
+            LocalRoot(idx) => {
+                assert!(matches!(edge, BorrowEdge::Direct));
+                emitln!(writer, "$t{} := $Dereference({});", idx, src_str);
+            }
+            Reference(idx) => {
+                let dst_value = format!("$Dereference($t{})", idx);
+                let src_value = format!("$Dereference({})", src_str);
+                let get_path_index = |offset: usize| {
+                    if offset == 0 {
+                        format!(
+                            "ReadVec(p#$Mutation({}), LenVec(p#$Mutation($t{})))",
+                            src_str, idx
+                        )
+                    } else {
+                        format!(
+                            "ReadVec(p#$Mutation({}), LenVec(p#$Mutation($t{})) + {})",
+                            src_str, idx, offset
+                        )
+                    }
+                };
+                let update = if let BorrowEdge::Hyper(edges) = edge {
+                    self.translate_write_back_update(
+                        &mut || dst_value.clone(),
+                        &get_path_index,
+                        src_value,
+                        edges,
+                        0,
+                    )
+                } else {
+                    self.translate_write_back_update(
+                        &mut || dst_value.clone(),
+                        &get_path_index,
+                        src_value,
+                        &[edge.to_owned()],
+                        0,
+                    )
+                };
+                emitln!(
+                    writer,
+                    "$t{} := $UpdateMutation($t{}, {});",
+                    idx,
+                    idx,
+                    update
+                );
+            }
+        }
+    }
+
+    /// Returns read aggregate and write aggregate if fun_env matches one of the native functions
+    /// implementing custom mutable borrow.
+    fn get_borrow_native_aggregate_names(&self, fn_name: &String) -> Option<(String, String)> {
+        for f in &self.parent.options.borrow_aggregates {
+            if &f.name == fn_name {
+                return Some((f.read_aggregate.clone(), f.write_aggregate.clone()));
+            }
+        }
+        None
+    }
+
+    fn translate_write_back_update(
+        &self,
+        mk_dest: &mut dyn FnMut() -> String,
+        get_path_index: &dyn Fn(usize) -> String,
+        src: String,
+        edges: &[BorrowEdge],
+        at: usize,
+    ) -> String {
+        if at >= edges.len() {
+            src
+        } else {
+            match &edges[at] {
+                BorrowEdge::Direct => {
+                    self.translate_write_back_update(mk_dest, get_path_index, src, edges, at + 1)
+                }
+                BorrowEdge::Field(memory, offset) => {
+                    let memory = memory.to_owned().instantiate(self.type_inst);
+                    let struct_env = &self.parent.env.get_struct_qid(memory.to_qualified_id());
+                    let field_env = &struct_env.get_field_by_offset(*offset);
+                    let sel_fun = boogie_field_sel(field_env, &memory.inst);
+                    let new_dest = format!("{}({})", sel_fun, (*mk_dest)());
+                    let mut new_dest_needed = false;
+                    let new_src = self.translate_write_back_update(
+                        &mut || {
+                            new_dest_needed = true;
+                            format!("$$sel{}", at)
+                        },
+                        get_path_index,
+                        src,
+                        edges,
+                        at + 1,
+                    );
+                    let update_fun = boogie_field_update(field_env, &memory.inst);
+                    if new_dest_needed {
+                        format!(
+                            "(var $$sel{} := {}; {}({}, {}))",
+                            at,
+                            new_dest,
+                            update_fun,
+                            (*mk_dest)(),
+                            new_src
+                        )
+                    } else {
+                        format!("{}({}, {})", update_fun, (*mk_dest)(), new_src)
+                    }
+                }
+                BorrowEdge::Index(index_edge_kind) => {
+                    // Index edge is used for both vectors, tables, and custom native methods
+                    // implementing similar functionality (mutable borrow). Determine which
+                    // operations to use to read and update.
+                    let (read_aggregate, update_aggregate) = match index_edge_kind {
+                        IndexEdgeKind::Vector => ("ReadVec".to_string(), "UpdateVec".to_string()),
+                        IndexEdgeKind::Table => ("GetTable".to_string(), "UpdateTable".to_string()),
+                        IndexEdgeKind::Custom(name) => {
+                            // panic here means that custom borrow natives options were not specified properly
+                            self.get_borrow_native_aggregate_names(name).unwrap()
+                        }
+                    };
+
+                    // Compute the offset into the path where to retrieve the index.
+                    let offset = edges[0..at]
+                        .iter()
+                        .filter(|e| !matches!(e, BorrowEdge::Direct))
+                        .count();
+                    let index = (*get_path_index)(offset);
+                    let new_dest = format!("{}({}, {})", read_aggregate, (*mk_dest)(), index);
+                    let mut new_dest_needed = false;
+                    // Recursively perform write backs for next edges
+                    let new_src = self.translate_write_back_update(
+                        &mut || {
+                            new_dest_needed = true;
+                            format!("$$sel{}", at)
+                        },
+                        get_path_index,
+                        src,
+                        edges,
+                        at + 1,
+                    );
+                    if new_dest_needed {
+                        format!(
+                            "(var $$sel{} := {}; {}({}, {}, {}))",
+                            at,
+                            new_dest,
+                            update_aggregate,
+                            (*mk_dest)(),
+                            index,
+                            new_src
+                        )
+                    } else {
+                        format!(
+                            "{}({}, {}, {})",
+                            update_aggregate,
+                            (*mk_dest)(),
+                            index,
+                            new_src
+                        )
+                    }
+                }
+                BorrowEdge::Hyper(_) => unreachable!("unexpected borrow edge"),
+            }
+        }
+    }
+
+    /// Track location for execution trace, avoiding to track the same line multiple times.
+    fn track_loc(&self, last_tracked_loc: &mut Option<(Loc, LineIndex)>, loc: &Loc) {
+        let env = self.fun_target.global_env();
+        if let Some(l) = env.get_location(loc) {
+            if let Some((last_loc, last_line)) = last_tracked_loc {
+                if *last_line == l.line {
+                    // This line already tracked.
+                    return;
+                }
+                *last_loc = loc.clone();
+                *last_line = l.line;
+            } else {
+                *last_tracked_loc = Some((loc.clone(), l.line));
+            }
+            emitln!(
+                self.parent.writer,
+                "assume {{:print \"$at{}\"}} true;",
+                self.loc_str(loc)
+            );
+        }
+    }
+
+    fn track_abort(&self, code_var: &str) {
+        emitln!(
+            self.parent.writer,
+            &boogie_debug_track_abort(self.fun_target, code_var)
+        );
+    }
+
+    /// Generates an update of the debug information about temporary.
+    fn track_local(&self, origin_idx: TempIndex, idx: TempIndex, bv_flag: bool) {
+        emitln!(
+            self.parent.writer,
+            &boogie_debug_track_local(
+                self.fun_target,
+                origin_idx,
+                idx,
+                &self.get_local_type(idx),
+                bv_flag
+            )
+        );
+    }
+
+    /// Generates an update of the debug information about the return value at given location.
+    fn track_return(&self, return_idx: usize, idx: TempIndex, bv_flag: bool) {
+        emitln!(
+            self.parent.writer,
+            &boogie_debug_track_return(
+                self.fun_target,
+                return_idx,
+                idx,
+                &self.get_local_type(idx),
+                bv_flag
+            )
+        );
+    }
+
+    /// Generates the bytecode to print out the value of mem.
+    fn track_global_mem(&self, mem: &QualifiedInstId<StructId>, node_id: NodeId) {
+        let env = self.parent.env;
+        let temp_str = boogie_resource_memory_name(env, mem, &None);
+        emitln!(
+            self.parent.writer,
+            "assume {{:print \"$track_global_mem({}):\", {}}} true;",
+            node_id.as_usize(),
+            temp_str,
+        );
+    }
+
+    fn track_exp(&self, kind: TraceKind, node_id: NodeId, temp: TempIndex, bv_flag: bool) {
+        let env = self.parent.env;
+        let writer = self.parent.writer;
+        let ty = self.get_local_type(temp);
+        let temp_str = if ty.is_reference() {
+            let new_temp = boogie_temp(env, ty.skip_reference(), 0, bv_flag);
+            emitln!(writer, "{} := $Dereference($t{});", new_temp, temp);
+            new_temp
+        } else {
+            format!("$t{}", temp)
+        };
+        let suffix = if kind == TraceKind::SubAuto {
+            "_sub"
+        } else {
+            ""
+        };
+        emitln!(
+            self.parent.writer,
+            "assume {{:print \"$track_exp{}({}):\", {}}} true;",
+            suffix,
+            node_id.as_usize(),
+            temp_str,
+        );
+    }
+
+    fn loc_str(&self, loc: &Loc) -> String {
+        let file_idx = self.fun_target.global_env().file_id_to_idx(loc.file_id());
+        format!("({},{},{})", file_idx, loc.span().start(), loc.span().end())
+    }
+
+    fn compute_needed_temps(&self) -> BTreeMap<(String, bool), (Type, bool, usize)> {
+        use Bytecode::*;
+        use Operation::*;
+
+        let fun_target = self.fun_target;
+        let env = fun_target.global_env();
+
+        let mut res: BTreeMap<(String, bool), (Type, bool, usize)> = BTreeMap::new();
+        let mut need = |ty: &Type, bv_flag: bool, n: usize| {
+            // Index by type suffix, which is more coarse grained then type.
+            let ty = ty.skip_reference();
+            let suffix = boogie_type_suffix(env, ty);
+            let cnt = res
+                .entry((suffix, bv_flag))
+                .or_insert_with(|| (ty.to_owned(), bv_flag, 0));
+            cnt.2 = cnt.2.max(n);
+        };
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let ret_oper_map = &global_state.get_ret_map();
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
+
+        for bc in &fun_target.data.code {
+            match bc {
+                Call(_, dests, oper, srcs, ..) => match oper {
+                    TraceExp(_, id) => {
+                        let ty = &self.inst(&env.get_node_type(*id));
+                        let bv_flag = global_state.get_node_num_oper(*id) == Bitwise;
+                        need(ty, bv_flag, 1)
+                    }
+                    TraceReturn(idx) => {
+                        let ty = &self.inst(fun_target.get_return_type(*idx));
+                        let bv_flag = self.bv_flag_from_map(idx, ret_oper_map);
+                        need(ty, bv_flag, 1)
+                    }
+                    TraceLocal(_) => {
+                        let ty = &self.get_local_type(srcs[0]);
+                        let num_oper = &global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        need(ty, bv_flag, 1)
+                    }
+                    Havoc(HavocKind::MutationValue) => {
+                        let ty = &self.get_local_type(dests[0]);
+                        let num_oper = &global_state
+                            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        need(ty, bv_flag, 1)
+                    }
+                    _ => {}
+                },
+                Prop(_, PropKind::Modifies, exp) => {
+                    // global_state.exp_operation_map.get(exp.node_id()) == Bitwise;
+                    //let bv_flag = env.get_node_num_oper(exp.node_id()) == Bitwise;
+                    let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
+                    need(&BOOL_TYPE, false, 1);
+                    need(&self.inst(&env.get_node_type(exp.node_id())), bv_flag, 1)
+                }
+                _ => {}
+            }
+        }
+        res
+    }
+}
+
+fn struct_has_native_equality(
+    struct_env: &StructEnv<'_>,
+    inst: &[Type],
+    options: &BoogieOptions,
+) -> bool {
+    if options.native_equality {
+        // Everything has native equality
+        return true;
+    }
+    for field in struct_env.get_fields() {
+        if !has_native_equality(
+            struct_env.module_env.env,
+            options,
+            &field.get_type().instantiate(inst),
+        ) {
+            return false;
+        }
+    }
+    true
+}
+
+pub fn has_native_equality(env: &GlobalEnv, options: &BoogieOptions, ty: &Type) -> bool {
+    if options.native_equality {
+        // Everything has native equality
+        return true;
+    }
+    match ty {
+        Type::Vector(..) => false,
+        Type::Struct(mid, sid, sinst) => {
+            struct_has_native_equality(&env.get_struct_qid(mid.qualified(*sid)), sinst, options)
+        }
+        Type::Primitive(_)
+        | Type::Tuple(_)
+        | Type::TypeParameter(_)
+        | Type::Reference(_, _)
+        | Type::Fun(_, _)
+        | Type::TypeDomain(_)
+        | Type::ResourceDomain(_, _, _)
+        | Type::Error
+        | Type::Var(_) => true,
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/lib.rs b/vendors/move/crates/move-prover-boogie-backend/src/lib.rs
new file mode 100644
index 000000000..cd10d7b53
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/lib.rs
@@ -0,0 +1,417 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use std::collections::BTreeSet;
+
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+use num::BigUint;
+use serde::{Deserialize, Serialize};
+use tera::{Context, Tera};
+
+use move_model::{
+    code_writer::CodeWriter,
+    emit, emitln,
+    model::{GlobalEnv, QualifiedId, StructId},
+    pragmas::{
+        INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE, INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS,
+        INTRINSIC_FUN_MAP_BORROW, INTRINSIC_FUN_MAP_BORROW_MUT, INTRINSIC_FUN_MAP_DEL_MUST_EXIST,
+        INTRINSIC_FUN_MAP_DEL_RETURN_KEY, INTRINSIC_FUN_MAP_DESTROY_EMPTY,
+        INTRINSIC_FUN_MAP_HAS_KEY, INTRINSIC_FUN_MAP_IS_EMPTY, INTRINSIC_FUN_MAP_LEN,
+        INTRINSIC_FUN_MAP_NEW, INTRINSIC_FUN_MAP_SPEC_DEL, INTRINSIC_FUN_MAP_SPEC_GET,
+        INTRINSIC_FUN_MAP_SPEC_HAS_KEY, INTRINSIC_FUN_MAP_SPEC_IS_EMPTY,
+        INTRINSIC_FUN_MAP_SPEC_LEN, INTRINSIC_FUN_MAP_SPEC_NEW, INTRINSIC_FUN_MAP_SPEC_SET,
+    },
+    ty::{PrimitiveType, Type},
+};
+use move_stackless_bytecode::mono_analysis;
+
+use crate::{
+    boogie_helpers::{boogie_bv_type, boogie_module_name, boogie_type, boogie_type_suffix_bv},
+    bytecode_translator::has_native_equality,
+    options::{BoogieOptions, VectorTheory},
+};
+
+const PRELUDE_TEMPLATE: &[u8] = include_bytes!("prelude/prelude.bpl");
+const NATIVE_TEMPLATE: &[u8] = include_bytes!("prelude/native.bpl");
+const VECTOR_ARRAY_THEORY: &[u8] = include_bytes!("prelude/vector-array-theory.bpl");
+const VECTOR_ARRAY_INTERN_THEORY: &[u8] = include_bytes!("prelude/vector-array-intern-theory.bpl");
+const VECTOR_SMT_SEQ_THEORY: &[u8] = include_bytes!("prelude/vector-smt-seq-theory.bpl");
+const VECTOR_SMT_ARRAY_THEORY: &[u8] = include_bytes!("prelude/vector-smt-array-theory.bpl");
+const VECTOR_SMT_ARRAY_EXT_THEORY: &[u8] =
+    include_bytes!("prelude/vector-smt-array-ext-theory.bpl");
+const MULTISET_ARRAY_THEORY: &[u8] = include_bytes!("prelude/multiset-array-theory.bpl");
+const TABLE_ARRAY_THEORY: &[u8] = include_bytes!("prelude/table-array-theory.bpl");
+
+// TODO use named addresses
+const BCS_MODULE: &str = "0x1::bcs";
+const EVENT_MODULE: &str = "0x1::event";
+
+mod boogie_helpers;
+pub mod boogie_wrapper;
+pub mod bytecode_translator;
+pub mod options;
+mod prover_task_runner;
+mod spec_translator;
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
+struct TypeInfo {
+    name: String,
+    suffix: String,
+    has_native_equality: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
+struct BvInfo {
+    base: usize,
+    max: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
+struct MapImpl {
+    struct_name: String,
+    insts: Vec<(TypeInfo, TypeInfo)>,
+    // move functions
+    fun_new: String,
+    fun_destroy_empty: String,
+    fun_len: String,
+    fun_is_empty: String,
+    fun_has_key: String,
+    fun_add_no_override: String,
+    fun_add_override_if_exists: String,
+    fun_del_must_exist: String,
+    fun_del_return_key: String,
+    fun_borrow: String,
+    fun_borrow_mut: String,
+    // spec functions
+    fun_spec_new: String,
+    fun_spec_get: String,
+    fun_spec_set: String,
+    fun_spec_del: String,
+    fun_spec_len: String,
+    fun_spec_is_empty: String,
+    fun_spec_has_key: String,
+}
+
+/// Help generating vector functions for bv types
+fn bv_helper() -> Vec<BvInfo> {
+    let mut bv_info = vec![];
+    let bv_8 = BvInfo {
+        base: 8,
+        max: "255".to_string(),
+    };
+    bv_info.push(bv_8);
+    let bv_16 = BvInfo {
+        base: 16,
+        max: "65535".to_string(),
+    };
+    bv_info.push(bv_16);
+    let bv_32 = BvInfo {
+        base: 32,
+        max: "2147483647".to_string(),
+    };
+    bv_info.push(bv_32);
+    let bv_64 = BvInfo {
+        base: 64,
+        max: "18446744073709551615".to_string(),
+    };
+    bv_info.push(bv_64);
+    let bv_128 = BvInfo {
+        base: 128,
+        max: "340282366920938463463374607431768211455".to_string(),
+    };
+    bv_info.push(bv_128);
+    let bv_256 = BvInfo {
+        base: 256,
+        max: "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+            .to_string(),
+    };
+    bv_info.push(bv_256);
+    bv_info
+}
+
+/// Adds the prelude to the generated output.
+pub fn add_prelude(
+    env: &GlobalEnv,
+    options: &BoogieOptions,
+    writer: &CodeWriter,
+) -> anyhow::Result<()> {
+    emit!(writer, "\n// ** Expanded prelude\n\n");
+    let templ = |name: &'static str, cont: &[u8]| (name, String::from_utf8_lossy(cont).to_string());
+
+    // Add the prelude template.
+    let mut templates = vec![
+        templ("native", NATIVE_TEMPLATE),
+        templ("prelude", PRELUDE_TEMPLATE),
+        // Add the basic array theory to make it available for inclusion in other theories.
+        templ("vector-array-theory", VECTOR_ARRAY_THEORY),
+    ];
+
+    // Bind the chosen vector and multiset theory
+    let vector_theory = match options.vector_theory {
+        VectorTheory::BoogieArray => VECTOR_ARRAY_THEORY,
+        VectorTheory::BoogieArrayIntern => VECTOR_ARRAY_INTERN_THEORY,
+        VectorTheory::SmtArray => VECTOR_SMT_ARRAY_THEORY,
+        VectorTheory::SmtArrayExt => VECTOR_SMT_ARRAY_EXT_THEORY,
+        VectorTheory::SmtSeq => VECTOR_SMT_SEQ_THEORY,
+    };
+    templates.push(templ("vector-theory", vector_theory));
+    templates.push(templ("multiset-theory", MULTISET_ARRAY_THEORY));
+    templates.push(templ("table-theory", TABLE_ARRAY_THEORY));
+
+    let mut context = Context::new();
+    context.insert("options", options);
+
+    let mono_info = mono_analysis::get_info(env);
+    // Add vector instances implicitly used by the prelude.
+    let implicit_vec_inst = vec![TypeInfo::new(
+        env,
+        options,
+        &Type::Primitive(PrimitiveType::U8),
+        false,
+    )];
+    // Used for generating functions for bv types in prelude
+    let mut sh_instances = vec![8, 16, 32, 64, 128, 256];
+    let mut bv_instances = bv_helper();
+    // Skip bv for cvc5
+    if options.use_cvc5 {
+        sh_instances = vec![];
+        bv_instances = vec![];
+    }
+    context.insert("sh_instances", &sh_instances);
+    context.insert("bv_instances", &bv_instances);
+    let mut vec_instances = mono_info
+        .vec_inst
+        .iter()
+        .map(|ty| TypeInfo::new(env, options, ty, false))
+        .chain(implicit_vec_inst)
+        .collect::<BTreeSet<_>>()
+        .into_iter()
+        .collect_vec();
+    let mut table_instances = mono_info
+        .table_inst
+        .iter()
+        .map(|(qid, ty_args)| MapImpl::new(env, options, *qid, ty_args, false))
+        .collect_vec();
+    // If not using cvc5, generate vector functions for bv types
+    if !options.use_cvc5 {
+        let mut bv_vec_instances = mono_info
+            .vec_inst
+            .iter()
+            .map(|ty| TypeInfo::new(env, options, ty, true))
+            .filter(|ty_info| !vec_instances.contains(ty_info))
+            .collect::<BTreeSet<_>>()
+            .into_iter()
+            .collect_vec();
+        let mut bv_table_instances = mono_info
+            .table_inst
+            .iter()
+            .map(|(qid, ty_args)| {
+                let v_ty = ty_args.iter().map(|(_, vty)| vty).collect_vec();
+                let bv_flag = v_ty.iter().all(|ty| ty.skip_reference().is_number());
+                MapImpl::new(env, options, *qid, ty_args, bv_flag)
+            })
+            .filter(|map_impl| !table_instances.contains(map_impl))
+            .collect_vec();
+        vec_instances.append(&mut bv_vec_instances);
+        table_instances.append(&mut bv_table_instances);
+    }
+    context.insert("vec_instances", &vec_instances);
+    context.insert("table_instances", &table_instances);
+    let table_key_instances = mono_info
+        .table_inst
+        .iter()
+        .flat_map(|(_, ty_args)| ty_args.iter().map(|(kty, _)| kty))
+        .unique()
+        .map(|ty| TypeInfo::new(env, options, ty, false))
+        .collect_vec();
+    context.insert("table_key_instances", &table_key_instances);
+    let filter_native = |module: &str| {
+        mono_info
+            .native_inst
+            .iter()
+            .filter(|(id, _)| env.get_module(**id).get_full_name_str() == module)
+            .flat_map(|(_, insts)| {
+                insts.iter().map(|inst| {
+                    inst.iter()
+                        .map(|i| TypeInfo::new(env, options, i, false))
+                        .collect::<Vec<_>>()
+                })
+            })
+            .sorted()
+            .collect_vec()
+    };
+    // make sure that all natives have only one type instantiations
+    // because of this assertion, this function returns a `Vec<TypeInfo>`
+    let filter_native_ensure_one_inst = |module: &str| {
+        filter_native(module)
+            .into_iter()
+            .map(|mut insts| {
+                assert_eq!(insts.len(), 1);
+                insts.pop().unwrap()
+            })
+            .sorted()
+            .collect_vec()
+    };
+    // make sure that all natives have exactly the same number of type instantiations,
+    // this function returns a `Vec<Vec<TypeInfo>>`
+    let filter_native_check_consistency = |module: &str| {
+        let filtered = filter_native(module);
+        let size = match filtered.first() {
+            None => 0,
+            Some(insts) => insts.len(),
+        };
+        assert!(filtered.iter().all(|insts| insts.len() == size));
+        filtered
+    };
+
+    let bcs_instances = filter_native_ensure_one_inst(BCS_MODULE);
+    context.insert("bcs_instances", &bcs_instances);
+    let event_instances = filter_native_ensure_one_inst(EVENT_MODULE);
+    context.insert("event_instances", &event_instances);
+
+    // TODO: we have defined {{std}} for adaptable resolution of stdlib addresses but
+    //   not used it yet in the templates.
+    let std_addr = format!("${}", env.get_stdlib_address());
+    let ext_addr = format!("${}", env.get_extlib_address());
+    context.insert("std", &std_addr);
+    context.insert("Ext", &ext_addr);
+
+    // If a custom Boogie template is provided, add it as part of the templates and
+    // add all type instances that use generic functions in the provided modules to the context.
+    if let Some(custom_native_options) = options.custom_natives.clone() {
+        templates.push(templ(
+            "custom-natives",
+            &custom_native_options.template_bytes,
+        ));
+        for (module_name, instance_name, expect_single_type_inst) in
+            custom_native_options.module_instance_names
+        {
+            if expect_single_type_inst {
+                context.insert(instance_name, &filter_native_ensure_one_inst(&module_name));
+            } else {
+                context.insert(
+                    instance_name,
+                    &filter_native_check_consistency(&module_name),
+                );
+            }
+        }
+    }
+
+    let mut tera = Tera::default();
+    tera.add_raw_templates(templates)?;
+
+    let expanded_content = tera.render("prelude", &context)?;
+    emitln!(writer, &expanded_content);
+    Ok(())
+}
+
+impl TypeInfo {
+    fn new(env: &GlobalEnv, options: &BoogieOptions, ty: &Type, bv_flag: bool) -> Self {
+        let name_fun = if bv_flag { boogie_bv_type } else { boogie_type };
+        Self {
+            name: name_fun(env, ty),
+            suffix: boogie_type_suffix_bv(env, ty, bv_flag),
+            has_native_equality: has_native_equality(env, options, ty),
+        }
+    }
+}
+
+impl MapImpl {
+    fn new(
+        env: &GlobalEnv,
+        options: &BoogieOptions,
+        struct_qid: QualifiedId<StructId>,
+        ty_args: &BTreeSet<(Type, Type)>,
+        bv_flag: bool,
+    ) -> Self {
+        let insts = ty_args
+            .iter()
+            .map(|(kty, vty)| {
+                (
+                    TypeInfo::new(env, options, kty, false),
+                    TypeInfo::new(env, options, vty, bv_flag),
+                )
+            })
+            .collect();
+        let struct_env = env.get_struct(struct_qid);
+        let struct_name = format!(
+            "${}_{}",
+            boogie_module_name(&struct_env.module_env),
+            struct_env.get_name().display(struct_env.symbol_pool()),
+        );
+
+        let decl = env
+            .intrinsics
+            .get_decl_for_struct(&struct_qid)
+            .expect("intrinsic decl");
+
+        MapImpl {
+            struct_name,
+            insts,
+            fun_new: Self::triple_opt_to_name(decl.get_fun_triple(env, INTRINSIC_FUN_MAP_NEW)),
+            fun_destroy_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DESTROY_EMPTY),
+            ),
+            fun_len: Self::triple_opt_to_name(decl.get_fun_triple(env, INTRINSIC_FUN_MAP_LEN)),
+            fun_is_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_IS_EMPTY),
+            ),
+            fun_has_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_HAS_KEY),
+            ),
+            fun_add_no_override: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE),
+            ),
+            fun_add_override_if_exists: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS),
+            ),
+            fun_del_must_exist: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DEL_MUST_EXIST),
+            ),
+            fun_del_return_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DEL_RETURN_KEY),
+            ),
+            fun_borrow: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_BORROW),
+            ),
+            fun_borrow_mut: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_BORROW_MUT),
+            ),
+            fun_spec_new: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_NEW),
+            ),
+            fun_spec_get: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_GET),
+            ),
+            fun_spec_set: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_SET),
+            ),
+            fun_spec_del: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_DEL),
+            ),
+            fun_spec_len: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_LEN),
+            ),
+            fun_spec_is_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_IS_EMPTY),
+            ),
+            fun_spec_has_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_HAS_KEY),
+            ),
+        }
+    }
+
+    fn triple_opt_to_name(triple_opt: Option<(BigUint, String, String)>) -> String {
+        match triple_opt {
+            None => String::new(),
+            Some((addr, mod_name, fun_name)) => {
+                format!("${}_{}_{}", addr.to_str_radix(16), mod_name, fun_name)
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/options.rs b/vendors/move/crates/move-prover-boogie-backend/src/options.rs
new file mode 100644
index 000000000..f53aab12a
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/options.rs
@@ -0,0 +1,368 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::anyhow;
+use itertools::Itertools;
+use move_command_line_common::env::{read_bool_env_var, read_env_var};
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use std::process::Command;
+
+/// Default flags passed to boogie. Additional flags will be added to this via the -B option.
+const DEFAULT_BOOGIE_FLAGS: &[&str] = &[
+    "-doModSetAnalysis",
+    "-printVerifiedProceduresCount:0",
+    "-printModel:1",
+    "-enhancedErrorMessages:1",
+    "-monomorphize",
+    "-proverOpt:O:model_validate=true",
+];
+
+const MIN_BOOGIE_VERSION: &str = "2.15.8";
+const MIN_Z3_VERSION: &str = "4.11.0";
+const MIN_CVC5_VERSION: &str = "0.0.3";
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum VectorTheory {
+    BoogieArray,
+    BoogieArrayIntern,
+    SmtArray,
+    SmtArrayExt,
+    SmtSeq,
+}
+
+impl VectorTheory {
+    pub fn is_extensional(&self) -> bool {
+        matches!(
+            self,
+            VectorTheory::BoogieArrayIntern | VectorTheory::SmtArrayExt | VectorTheory::SmtSeq
+        )
+    }
+}
+
+/// Options to define custom native functions to include in generated Boogie file.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CustomNativeOptions {
+    /// Bytes of the custom template.
+    pub template_bytes: Vec<u8>,
+    /// List of (module name, module instance key, single_type_expected) tuples,
+    /// used to generate instantiated versions of generic native functions.
+    pub module_instance_names: Vec<(String, String, bool)>,
+}
+
+/// Contains information about a native method implementing mutable borrow semantics for a given
+/// type in an alternative storage model (returning &mut without taking appropriate &mut as a
+/// parameter, much like vector::borrow_mut)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BorrowAggregate {
+    /// Method's name (qualified with module name, e.g., m::foo)
+    pub name: String,
+    /// Name of the read aggregate
+    pub read_aggregate: String,
+    /// Name of the write aggregate
+    pub write_aggregate: String,
+}
+
+impl BorrowAggregate {
+    pub fn new(name: String, read_aggregate: String, write_aggregate: String) -> Self {
+        BorrowAggregate {
+            name,
+            read_aggregate,
+            write_aggregate,
+        }
+    }
+}
+
+/// Boogie options.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct BoogieOptions {
+    /// Path to the boogie executable.
+    pub boogie_exe: String,
+    /// Use experimental boogie exe found via env var EXP_BOOGIE_EXE.
+    pub use_exp_boogie: bool,
+    /// Path to the z3 executable.
+    pub z3_exe: String,
+    /// Whether to use cvc5.
+    pub use_cvc5: bool,
+    /// Path to the cvc5 executable.
+    pub cvc5_exe: String,
+    /// Whether to generate debug trace code.
+    pub debug_trace: bool,
+    /// List of flags to pass on to boogie.
+    pub boogie_flags: Vec<String>,
+    /// Whether to use native array theory.
+    pub use_array_theory: bool,
+    /// Whether to produce an SMT file for each verification problem.
+    pub generate_smt: bool,
+    /// Whether native instead of stratified equality should be used.
+    pub native_equality: bool,
+    /// A string determining the type of requires used for parameter type checks. Can be
+    /// `"requires"` or `"free requires`".
+    pub type_requires: String,
+    /// The depth until which stratified functions are expanded.
+    pub stratification_depth: usize,
+    /// A string to be used to inline a function of medium size. Can be empty or `{:inline}`.
+    pub aggressive_func_inline: String,
+    /// A string to be used to inline a function of small size. Can be empty or `{:inline}`.
+    pub func_inline: String,
+    /// A bound to apply to the length of serialization results.
+    pub serialize_bound: usize,
+    /// How many times to call the prover backend for the verification problem. This is used for
+    /// benchmarking.
+    pub bench_repeat: usize,
+    /// Whether to use the sequence theory as the internal representation for $Vector type.
+    pub vector_using_sequences: bool,
+    /// A seed for the prover.
+    pub random_seed: usize,
+    /// The number of cores to use for parallel processing of verification conditions.
+    pub proc_cores: usize,
+    /// A (soft) timeout for the solver, per verification condition, in seconds.
+    pub vc_timeout: usize,
+    /// Whether Boogie output and log should be saved.
+    pub keep_artifacts: bool,
+    /// Eager threshold for quantifier instantiation.
+    pub eager_threshold: usize,
+    /// Lazy threshold for quantifier instantiation.
+    pub lazy_threshold: usize,
+    /// Whether to use the new Boogie `{:debug ..}` attribute for tracking debug values.
+    pub stable_test_output: bool,
+    /// Number of Boogie instances to be run concurrently.
+    pub num_instances: usize,
+    /// Whether to run Boogie instances sequentially.
+    pub sequential_task: bool,
+    /// A hard timeout for boogie execution; if the process does not terminate within
+    /// this time frame, it will be killed. Zero for no timeout.
+    pub hard_timeout_secs: u64,
+    /// What vector theory to use.
+    pub vector_theory: VectorTheory,
+    /// Whether to generate a z3 trace file and where to put it.
+    pub z3_trace_file: Option<String>,
+    /// Options to define user-custom native funs.
+    pub custom_natives: Option<CustomNativeOptions>,
+    /// Number of iterations to unroll loops.
+    pub loop_unroll: Option<u64>,
+    /// Optional aggregate function names for native methods implementing mutable borrow semantics
+    pub borrow_aggregates: Vec<BorrowAggregate>,
+}
+
+impl Default for BoogieOptions {
+    fn default() -> Self {
+        Self {
+            bench_repeat: 1,
+            boogie_exe: read_env_var("BOOGIE_EXE"),
+            use_exp_boogie: false,
+            z3_exe: read_env_var("Z3_EXE"),
+            use_cvc5: false,
+            cvc5_exe: read_env_var("CVC5_EXE"),
+            boogie_flags: vec![],
+            debug_trace: false,
+            use_array_theory: false,
+            generate_smt: false,
+            native_equality: false,
+            type_requires: "free requires".to_owned(),
+            stratification_depth: 6,
+            aggressive_func_inline: "".to_owned(),
+            func_inline: "{:inline}".to_owned(),
+            serialize_bound: 0,
+            vector_using_sequences: false,
+            random_seed: 1,
+            proc_cores: 4,
+            vc_timeout: 40,
+            keep_artifacts: false,
+            eager_threshold: 100,
+            lazy_threshold: 100,
+            stable_test_output: false,
+            num_instances: 1,
+            sequential_task: false,
+            hard_timeout_secs: 0,
+            vector_theory: VectorTheory::BoogieArray,
+            z3_trace_file: None,
+            custom_natives: None,
+            loop_unroll: None,
+            borrow_aggregates: vec![],
+        }
+    }
+}
+
+impl BoogieOptions {
+    /// Derive options based on other set options.
+    pub fn derive_options(&mut self) {
+        use VectorTheory::*;
+        self.native_equality = self.vector_theory.is_extensional();
+        if matches!(self.vector_theory, SmtArray | SmtArrayExt) {
+            self.use_array_theory = true;
+        }
+    }
+
+    /// Returns command line to call boogie.
+    pub fn get_boogie_command(&self, boogie_file: &str) -> anyhow::Result<Vec<String>> {
+        let mut result = if self.use_exp_boogie {
+            // This should have a better ux...
+            vec![read_env_var("EXP_BOOGIE_EXE")]
+        } else {
+            vec![self.boogie_exe.clone()]
+        };
+
+        // If we don't have a boogie executable, nothing will work
+        if result.iter().all(|path| path.is_empty()) {
+            anyhow::bail!("No boogie executable set.  Please set BOOGIE_EXE");
+        }
+
+        let mut add = |sl: &[&str]| result.extend(sl.iter().map(|s| (*s).to_string()));
+        add(DEFAULT_BOOGIE_FLAGS);
+        if self.use_cvc5 {
+            add(&[
+                "-proverOpt:SOLVER=cvc5",
+                &format!("-proverOpt:PROVER_PATH={}", &self.cvc5_exe),
+            ]);
+        } else {
+            add(&[&format!("-proverOpt:PROVER_PATH={}", &self.z3_exe)]);
+        }
+        if self.use_array_theory {
+            add(&["-useArrayTheory"]);
+            if matches!(self.vector_theory, VectorTheory::SmtArray) {
+                add(&["/proverOpt:O:smt.array.extensional=false"])
+            }
+        } else {
+            add(&[&format!(
+                "-proverOpt:O:smt.QI.EAGER_THRESHOLD={}",
+                self.eager_threshold
+            )]);
+            add(&[&format!(
+                "-proverOpt:O:smt.QI.LAZY_THRESHOLD={}",
+                self.lazy_threshold
+            )]);
+        }
+        if let Some(iters) = self.loop_unroll {
+            add(&[&format!("-loopUnroll:{}", iters)]);
+        }
+        add(&[&format!(
+            "-vcsCores:{}",
+            if self.stable_test_output {
+                // Do not use multiple cores if stable test output is requested.
+                // Error messages may appear in non-deterministic order otherwise.
+                1
+            } else {
+                self.proc_cores
+            }
+        )]);
+
+        // TODO: see what we can make out of these flags.
+        //add(&["-proverOpt:O:smt.QI.PROFILE=true"]);
+        //add(&["-proverOpt:O:trace=true"]);
+        //add(&["-proverOpt:VERBOSITY=3"]);
+        //add(&["-proverOpt:C:-st"]);
+
+        if let Some(file) = &self.z3_trace_file {
+            add(&[
+                "-proverOpt:O:trace=true",
+                &format!("-proverOpt:O:trace_file_name={}", file),
+            ]);
+        }
+        if self.generate_smt {
+            add(&["-proverLog:@PROC@.smt"]);
+        }
+        for f in &self.boogie_flags {
+            add(&[f.as_str()]);
+        }
+        add(&[boogie_file]);
+        Ok(result)
+    }
+
+    /// Returns name of file where to log boogie output.
+    pub fn get_boogie_log_file(&self, boogie_file: &str) -> String {
+        format!("{}.log", boogie_file)
+    }
+
+    /// Adjust a timeout value, given in seconds, for the runtime environment.
+    pub fn adjust_timeout(&self, time: usize) -> usize {
+        // If env var MVP_TEST_ON_CI is set, add 100% to the timeout for added
+        // robustness against flakiness.
+        if read_bool_env_var("MVP_TEST_ON_CI") {
+            usize::saturating_add(time, time)
+        } else {
+            time
+        }
+    }
+
+    /// Checks whether the expected tool versions are installed in the environment.
+    pub fn check_tool_versions(&self) -> anyhow::Result<()> {
+        if !self.boogie_exe.is_empty() {
+            // On Mac, version arg is `/version`, not `-version`
+            let version_arg = if cfg!(target_os = "macos") {
+                &["/version"]
+            } else {
+                &["-version"]
+            };
+
+            let version = Self::get_version(
+                "boogie",
+                &self.boogie_exe,
+                version_arg,
+                r"version ([0-9.]*)",
+            )?;
+            Self::check_version_is_greater("boogie", &version, MIN_BOOGIE_VERSION)?;
+        }
+        if !self.z3_exe.is_empty() && !self.use_cvc5 {
+            let version =
+                Self::get_version("z3", &self.z3_exe, &["--version"], r"version ([0-9.]*)")?;
+            Self::check_version_is_greater("z3", &version, MIN_Z3_VERSION)?;
+        }
+        if !self.cvc5_exe.is_empty() && self.use_cvc5 {
+            let version =
+                Self::get_version("cvc5", &self.cvc5_exe, &["--version"], r"version ([0-9.]*)")?;
+            Self::check_version_is_greater("cvc5", &version, MIN_CVC5_VERSION)?;
+        }
+        Ok(())
+    }
+
+    fn get_version(tool: &str, prog: &str, args: &[&str], regex: &str) -> anyhow::Result<String> {
+        let out = match Command::new(prog).args(args).output() {
+            Ok(out) => String::from_utf8_lossy(&out.stdout).to_string(),
+            Err(msg) => {
+                return Err(anyhow!(
+                    "cannot execute `{}` to obtain version of `{}`: {}",
+                    prog,
+                    tool,
+                    msg.to_string()
+                ))
+            }
+        };
+        if let Some(cap) = Regex::new(regex).unwrap().captures(&out) {
+            Ok(cap[1].to_string())
+        } else {
+            Err(anyhow!("cannot extract version from `{}`", prog))
+        }
+    }
+
+    fn check_version_is_greater(tool: &str, given: &str, expected: &str) -> anyhow::Result<()> {
+        let given_parts = given.split('.').collect_vec();
+        let expected_parts = expected.split('.').collect_vec();
+        if given_parts.len() < expected_parts.len() {
+            return Err(anyhow!(
+                "version strings {} and {} for `{}` cannot be compared",
+                given,
+                expected,
+                tool,
+            ));
+        }
+        for (g, e) in given_parts.into_iter().zip(expected_parts.into_iter()) {
+            let gn = g.parse::<usize>()?;
+            let en = e.parse::<usize>()?;
+            if gn < en {
+                return Err(anyhow!(
+                    "expected at least version {} but found {} for `{}`",
+                    expected,
+                    given,
+                    tool
+                ));
+            }
+            if gn > en {
+                break;
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/multiset-array-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/multiset-array-theory.bpl
new file mode 100644
index 000000000..14d4d6bad
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/multiset-array-theory.bpl
@@ -0,0 +1,45 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Boogie model for multisets, based on Boogie arrays. This theory assumes extensional equality for element types.
+
+type {:datatype} Multiset _;
+function {:constructor} Multiset<T>(v: [T]int, l: int): Multiset T;
+
+function {:builtin "MapConst"} MapConstMultiset<T>(l: int): [T]int;
+
+function {:inline} EmptyMultiset<T>(): Multiset T {
+    Multiset(MapConstMultiset(0), 0)
+}
+
+function {:inline} LenMultiset<T>(s: Multiset T): int {
+    l#Multiset(s)
+}
+
+function {:inline} ExtendMultiset<T>(s: Multiset T, v: T): Multiset T {
+    (var len := l#Multiset(s);
+    (var cnt := v#Multiset(s)[v];
+    Multiset(v#Multiset(s)[v := (cnt + 1)], len + 1)))
+}
+
+// This function returns (s1 - s2). This function assumes that s2 is a subset of s1.
+function {:inline} SubtractMultiset<T>(s1: Multiset T, s2: Multiset T): Multiset T {
+    (var len1 := l#Multiset(s1);
+    (var len2 := l#Multiset(s2);
+    Multiset((lambda v:T :: v#Multiset(s1)[v]-v#Multiset(s2)[v]), len1-len2)))
+}
+
+function {:inline} IsEmptyMultiset<T>(s: Multiset T): bool {
+    (l#Multiset(s) == 0) &&
+    (forall v: T :: v#Multiset(s)[v] == 0)
+}
+
+function {:inline} IsSubsetMultiset<T>(s1: Multiset T, s2: Multiset T): bool {
+    (l#Multiset(s1) <= l#Multiset(s2)) &&
+    (forall v: T :: v#Multiset(s1)[v] <= v#Multiset(s2)[v])
+}
+
+function {:inline} ContainsMultiset<T>(s: Multiset T, v: T): bool {
+    v#Multiset(s)[v] > 0
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/native.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/native.bpl
new file mode 100644
index 000000000..85969bde4
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/native.bpl
@@ -0,0 +1,567 @@
+{# Copyright (c) The Diem Core Contributors
+   SPDX-License-Identifier: Apache-2.0
+#}
+
+{# Vectors
+   =======
+#}
+
+{% macro vector_module(instance) %}
+{%- set S = "'" ~ instance.suffix ~ "'" -%}
+{%- set T = instance.name -%}
+{%- if options.native_equality -%}
+{# Whole vector has native equality #}
+function {:inline} $IsEqual'vec{{S}}'(v1: Vec ({{T}}), v2: Vec ({{T}})): bool {
+    v1 == v2
+}
+{%- else -%}
+// Not inlined. It appears faster this way.
+function $IsEqual'vec{{S}}'(v1: Vec ({{T}}), v2: Vec ({{T}})): bool {
+    LenVec(v1) == LenVec(v2) &&
+    (forall i: int:: InRangeVec(v1, i) ==> $IsEqual{{S}}(ReadVec(v1, i), ReadVec(v2, i)))
+}
+{%- endif %}
+
+// Not inlined.
+function $IsPrefix'vec{{S}}'(v: Vec ({{T}}), prefix: Vec ({{T}})): bool {
+    LenVec(v) >= LenVec(prefix) &&
+    (forall i: int:: InRangeVec(prefix, i) ==> $IsEqual{{S}}(ReadVec(v, i), ReadVec(prefix, i)))
+}
+
+// Not inlined.
+function $IsSuffix'vec{{S}}'(v: Vec ({{T}}), suffix: Vec ({{T}})): bool {
+    LenVec(v) >= LenVec(suffix) &&
+    (forall i: int:: InRangeVec(suffix, i) ==> $IsEqual{{S}}(ReadVec(v, LenVec(v) - LenVec(suffix) + i), ReadVec(suffix, i)))
+}
+
+// Not inlined.
+function $IsValid'vec{{S}}'(v: Vec ({{T}})): bool {
+    $IsValid'u64'(LenVec(v)) &&
+    (forall i: int:: InRangeVec(v, i) ==> $IsValid{{S}}(ReadVec(v, i)))
+}
+
+{# TODO: there is an issue with existential quantifier instantiation if we use the native
+   functions here without the $IsValid'u64' tag.
+#}
+{%- if false and instance.has_native_equality -%}
+{# Vector elements have native equality #}
+function {:inline} $ContainsVec{{S}}(v: Vec ({{T}}), e: {{T}}): bool {
+    ContainsVec(v, e)
+}
+
+function {:inline} $IndexOfVec{{S}}(v: Vec ({{T}}), e: {{T}}): int {
+    IndexOfVec(v, e)
+}
+{% else %}
+function {:inline} $ContainsVec{{S}}(v: Vec ({{T}}), e: {{T}}): bool {
+    (exists i: int :: $IsValid'u64'(i) && InRangeVec(v, i) && $IsEqual{{S}}(ReadVec(v, i), e))
+}
+
+function $IndexOfVec{{S}}(v: Vec ({{T}}), e: {{T}}): int;
+axiom (forall v: Vec ({{T}}), e: {{T}}:: {$IndexOfVec{{S}}(v, e)}
+    (var i := $IndexOfVec{{S}}(v, e);
+     if (!$ContainsVec{{S}}(v, e)) then i == -1
+     else $IsValid'u64'(i) && InRangeVec(v, i) && $IsEqual{{S}}(ReadVec(v, i), e) &&
+        (forall j: int :: $IsValid'u64'(j) && j >= 0 && j < i ==> !$IsEqual{{S}}(ReadVec(v, j), e))));
+{% endif %}
+
+function {:inline} $RangeVec{{S}}(v: Vec ({{T}})): $Range {
+    $Range(0, LenVec(v))
+}
+
+
+function {:inline} $EmptyVec{{S}}(): Vec ({{T}}) {
+    EmptyVec()
+}
+
+procedure {:inline 1} $1_vector_empty{{S}}() returns (v: Vec ({{T}})) {
+    v := EmptyVec();
+}
+
+function {:inline} $1_vector_$empty{{S}}(): Vec ({{T}}) {
+    EmptyVec()
+}
+
+procedure {:inline 1} $1_vector_is_empty{{S}}(v: Vec ({{T}})) returns (b: bool) {
+    b := IsEmptyVec(v);
+}
+
+procedure {:inline 1} $1_vector_push_back{{S}}(m: $Mutation (Vec ({{T}})), val: {{T}}) returns (m': $Mutation (Vec ({{T}}))) {
+    m' := $UpdateMutation(m, ExtendVec($Dereference(m), val));
+}
+
+function {:inline} $1_vector_$push_back{{S}}(v: Vec ({{T}}), val: {{T}}): Vec ({{T}}) {
+    ExtendVec(v, val)
+}
+
+procedure {:inline 1} $1_vector_pop_back{{S}}(m: $Mutation (Vec ({{T}}))) returns (e: {{T}}, m': $Mutation (Vec ({{T}}))) {
+    var v: Vec ({{T}});
+    var len: int;
+    v := $Dereference(m);
+    len := LenVec(v);
+    if (len == 0) {
+        call $ExecFailureAbort();
+        return;
+    }
+    e := ReadVec(v, len-1);
+    m' := $UpdateMutation(m, RemoveVec(v));
+}
+
+procedure {:inline 1} $1_vector_append{{S}}(m: $Mutation (Vec ({{T}})), other: Vec ({{T}})) returns (m': $Mutation (Vec ({{T}}))) {
+    m' := $UpdateMutation(m, ConcatVec($Dereference(m), other));
+}
+
+procedure {:inline 1} $1_vector_reverse{{S}}(m: $Mutation (Vec ({{T}}))) returns (m': $Mutation (Vec ({{T}}))) {
+    m' := $UpdateMutation(m, ReverseVec($Dereference(m)));
+}
+
+procedure {:inline 1} $1_vector_length{{S}}(v: Vec ({{T}})) returns (l: int) {
+    l := LenVec(v);
+}
+
+function {:inline} $1_vector_$length{{S}}(v: Vec ({{T}})): int {
+    LenVec(v)
+}
+
+procedure {:inline 1} $1_vector_borrow{{S}}(v: Vec ({{T}}), i: int) returns (dst: {{T}}) {
+    if (!InRangeVec(v, i)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := ReadVec(v, i);
+}
+
+function {:inline} $1_vector_$borrow{{S}}(v: Vec ({{T}}), i: int): {{T}} {
+    ReadVec(v, i)
+}
+
+procedure {:inline 1} $1_vector_borrow_mut{{S}}(m: $Mutation (Vec ({{T}})), index: int)
+returns (dst: $Mutation ({{T}}), m': $Mutation (Vec ({{T}})))
+{
+    var v: Vec ({{T}});
+    v := $Dereference(m);
+    if (!InRangeVec(v, index)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Mutation(l#$Mutation(m), ExtendVec(p#$Mutation(m), index), ReadVec(v, index));
+    m' := m;
+}
+
+function {:inline} $1_vector_$borrow_mut{{S}}(v: Vec ({{T}}), i: int): {{T}} {
+    ReadVec(v, i)
+}
+
+procedure {:inline 1} $1_vector_destroy_empty{{S}}(v: Vec ({{T}})) {
+    if (!IsEmptyVec(v)) {
+      call $ExecFailureAbort();
+    }
+}
+
+procedure {:inline 1} $1_vector_swap{{S}}(m: $Mutation (Vec ({{T}})), i: int, j: int) returns (m': $Mutation (Vec ({{T}})))
+{
+    var v: Vec ({{T}});
+    v := $Dereference(m);
+    if (!InRangeVec(v, i) || !InRangeVec(v, j)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    m' := $UpdateMutation(m, SwapVec(v, i, j));
+}
+
+function {:inline} $1_vector_$swap{{S}}(v: Vec ({{T}}), i: int, j: int): Vec ({{T}}) {
+    SwapVec(v, i, j)
+}
+
+procedure {:inline 1} $1_vector_remove{{S}}(m: $Mutation (Vec ({{T}})), i: int) returns (e: {{T}}, m': $Mutation (Vec ({{T}})))
+{
+    var v: Vec ({{T}});
+
+    v := $Dereference(m);
+
+    if (!InRangeVec(v, i)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    e := ReadVec(v, i);
+    m' := $UpdateMutation(m, RemoveAtVec(v, i));
+}
+
+procedure {:inline 1} $1_vector_insert{{S}}(m: $Mutation (Vec ({{T}})), val: {{T}}, i: int) returns (m': $Mutation (Vec ({{T}}))) {
+
+    var len: int;
+    var v: Vec ({{T}});
+
+    v := $Dereference(m);
+
+    len := LenVec(v);
+    if (i < 0 || i > len) {
+        call $ExecFailureAbort();
+        return;
+    }
+    if (i == len) {
+        m' := $UpdateMutation(m, ExtendVec(v, val));
+    } else {
+        m' := $UpdateMutation(m, InsertAtVec(v, i, val));
+    }
+}
+
+procedure {:inline 1} $1_vector_swap_remove{{S}}(m: $Mutation (Vec ({{T}})), i: int) returns (e: {{T}}, m': $Mutation (Vec ({{T}})))
+{
+    var len: int;
+    var v: Vec ({{T}});
+
+    v := $Dereference(m);
+    len := LenVec(v);
+    if (!InRangeVec(v, i)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    e := ReadVec(v, i);
+    m' := $UpdateMutation(m, RemoveVec(SwapVec(v, i, len-1)));
+}
+
+procedure {:inline 1} $1_vector_contains{{S}}(v: Vec ({{T}}), e: {{T}}) returns (res: bool)  {
+    res := $ContainsVec{{S}}(v, e);
+}
+
+procedure {:inline 1}
+$1_vector_index_of{{S}}(v: Vec ({{T}}), e: {{T}}) returns (res1: bool, res2: int) {
+    res2 := $IndexOfVec{{S}}(v, e);
+    if (res2 >= 0) {
+        res1 := true;
+    } else {
+        res1 := false;
+        res2 := 0;
+    }
+}
+{% endmacro vector_module %}
+
+{# Tables
+   =======
+#}
+
+{% macro table_key_encoding(instance) %}
+{%- set K = instance.name -%}
+{%- set S = "'" ~ instance.suffix ~ "'" -%}
+
+function $EncodeKey{{S}}(k: {{K}}): int;
+axiom (
+  forall k1, k2: {{K}} :: {$EncodeKey{{S}}(k1), $EncodeKey{{S}}(k2)}
+    $IsEqual{{S}}(k1, k2) <==> $EncodeKey{{S}}(k1) == $EncodeKey{{S}}(k2)
+);
+{% endmacro table_key_encoding %}
+
+
+{% macro table_module(impl, instance) %}
+{%- set K = instance.0.name -%}
+{%- set V = instance.1.name -%}
+{%- set Type = impl.struct_name -%}
+{%- set Self = "Table int (" ~ V ~ ")" -%}
+{%- set S = "'" ~ instance.0.suffix ~ "_" ~ instance.1.suffix ~ "'" -%}
+{%- set SV = "'" ~ instance.1.suffix ~ "'" -%}
+{%- set ENC = "$EncodeKey'" ~ instance.0.suffix ~ "'" -%}
+
+{%- if options.native_equality -%}
+function $IsEqual'{{Type}}{{S}}'(t1: {{Self}}, t2: {{Self}}): bool {
+    t1 == t2
+}
+{%- else -%}
+function $IsEqual'{{Type}}{{S}}'(t1: {{Self}}, t2: {{Self}}): bool {
+    LenTable(t1) == LenTable(t2) &&
+    (forall k: int :: ContainsTable(t1, k) <==> ContainsTable(t2, k)) &&
+    (forall k: int :: ContainsTable(t1, k) ==> GetTable(t1, k) == GetTable(t2, k)) &&
+    (forall k: int :: ContainsTable(t2, k) ==> GetTable(t1, k) == GetTable(t2, k))
+}
+{%- endif %}
+
+// Not inlined.
+function $IsValid'{{Type}}{{S}}'(t: {{Self}}): bool {
+    $IsValid'u64'(LenTable(t)) &&
+    (forall i: int:: ContainsTable(t, i) ==> $IsValid{{SV}}(GetTable(t, i)))
+}
+
+{%- if impl.fun_new != "" %}
+procedure {:inline 2} {{impl.fun_new}}{{S}}() returns (v: {{Self}}) {
+    v := EmptyTable();
+}
+{%- endif %}
+
+{%- if impl.fun_destroy_empty != "" %}
+procedure {:inline 2} {{impl.fun_destroy_empty}}{{S}}(t: {{Self}}) {
+    if (LenTable(t) != 0) {
+        call $Abort($StdError(1/*INVALID_STATE*/, 102/*ENOT_EMPTY*/));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_len != "" %}
+procedure {:inline 2} {{impl.fun_len}}{{S}}(t: ({{Self}})) returns (l: int) {
+    l := LenTable(t);
+}
+{%- endif %}
+
+{%- if impl.fun_is_empty != "" %}
+procedure {:inline 2} {{impl.fun_is_empty}}{{S}}(t: ({{Self}})) returns (r: bool) {
+    r := LenTable(t) == 0;
+}
+{%- endif %}
+
+{%- if impl.fun_has_key != "" %}
+procedure {:inline 2} {{impl.fun_has_key}}{{S}}(t: ({{Self}}), k: {{K}}) returns (r: bool) {
+    r := ContainsTable(t, {{ENC}}(k));
+}
+{%- endif %}
+
+{%- if impl.fun_add_no_override != "" %}
+procedure {:inline 2} {{impl.fun_add_no_override}}{{S}}(m: $Mutation ({{Self}}), k: {{K}}, v: {{V}}) returns (m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 100/*EALREADY_EXISTS*/));
+    } else {
+        m' := $UpdateMutation(m, AddTable(t, enc_k, v));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_add_override_if_exists != "" %}
+procedure {:inline 2} {{impl.fun_add_override_if_exists}}{{S}}(m: $Mutation ({{Self}}), k: {{K}}, v: {{V}}) returns (m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (ContainsTable(t, enc_k)) {
+        m' := $UpdateMutation(m, UpdateTable(t, enc_k, v));
+    } else {
+        m' := $UpdateMutation(m, AddTable(t, enc_k, v));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_del_must_exist != "" %}
+procedure {:inline 2} {{impl.fun_del_must_exist}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+returns (v: {{V}}, m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (!ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 101/*ENOT_FOUND*/));
+    } else {
+        v := GetTable(t, enc_k);
+        m' := $UpdateMutation(m, RemoveTable(t, enc_k));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_del_return_key != "" %}
+procedure {:inline 2} {{impl.fun_del_return_key}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+returns (k': {{K}}, v: {{V}}, m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (!ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 101/*ENOT_FOUND*/));
+    } else {
+        k' := k;
+        v := GetTable(t, enc_k);
+        m' := $UpdateMutation(m, RemoveTable(t, enc_k));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_borrow != "" %}
+procedure {:inline 2} {{impl.fun_borrow}}{{S}}(t: {{Self}}, k: {{K}}) returns (v: {{V}}) {
+    var enc_k: int;
+    enc_k := {{ENC}}(k);
+    if (!ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 101/*ENOT_FOUND*/));
+    } else {
+        v := GetTable(t, {{ENC}}(k));
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_borrow_mut != "" %}
+procedure {:inline 2} {{impl.fun_borrow_mut}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+returns (dst: $Mutation ({{V}}), m': $Mutation ({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (!ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 101/*ENOT_FOUND*/));
+    } else {
+        dst := $Mutation(l#$Mutation(m), ExtendVec(p#$Mutation(m), enc_k), GetTable(t, enc_k));
+        m' := m;
+    }
+}
+{%- endif %}
+
+{%- if impl.fun_spec_len != "" %}
+function {:inline} {{impl.fun_spec_len}}{{S}}(t: ({{Self}})): int {
+    LenTable(t)
+}
+{%- endif %}
+
+{%- if impl.fun_spec_is_empty != "" %}
+function {:inline} {{impl.fun_spec_is_empty}}{{S}}(t: ({{Self}})): bool {
+    LenTable(t) == 0
+}
+{%- endif %}
+
+{%- if impl.fun_spec_has_key != "" %}
+function {:inline} {{impl.fun_spec_has_key}}{{S}}(t: ({{Self}}), k: {{K}}): bool {
+    ContainsTable(t, {{ENC}}(k))
+}
+{%- endif %}
+
+{%- if impl.fun_spec_set != "" %}
+function {:inline} {{impl.fun_spec_set}}{{S}}(t: {{Self}}, k: {{K}}, v: {{V}}): {{Self}} {
+    (var enc_k := {{ENC}}(k);
+    if (ContainsTable(t, enc_k)) then
+        UpdateTable(t, enc_k, v)
+    else
+        AddTable(t, enc_k, v))
+}
+{%- endif %}
+
+{%- if impl.fun_spec_del != "" %}
+function {:inline} {{impl.fun_spec_del}}{{S}}(t: {{Self}}, k: {{K}}): {{Self}} {
+    RemoveTable(t, {{ENC}}(k))
+}
+{%- endif %}
+
+{%- if impl.fun_spec_get != "" %}
+function {:inline} {{impl.fun_spec_get}}{{S}}(t: {{Self}}, k: {{K}}): {{V}} {
+    GetTable(t, {{ENC}}(k))
+}
+{%- endif %}
+
+{%- if impl.fun_spec_new != "" %}
+function {:inline} {{impl.fun_spec_new}}{{S}}(): {{Self}} {
+    EmptyTable()
+}
+{%- endif %}
+
+{% endmacro table_module %}
+
+
+{# BCS
+   ====
+#}
+
+{% macro bcs_module(instance) %}
+{%- set S = "'" ~ instance.suffix ~ "'" -%}
+{%- set T = instance.name -%}
+// Serialize is modeled as an uninterpreted function, with an additional
+// axiom to say it's an injection.
+
+function $1_bcs_serialize{{S}}(v: {{T}}): Vec int;
+
+axiom (forall v1, v2: {{T}} :: {$1_bcs_serialize{{S}}(v1), $1_bcs_serialize{{S}}(v2)}
+   $IsEqual{{S}}(v1, v2) <==> $IsEqual'vec'u8''($1_bcs_serialize{{S}}(v1), $1_bcs_serialize{{S}}(v2)));
+
+// This says that serialize returns a non-empty vec<u8>
+{% if options.serialize_bound == 0 %}
+axiom (forall v: {{T}} :: {$1_bcs_serialize{{S}}(v)}
+     ( var r := $1_bcs_serialize{{S}}(v); $IsValid'vec'u8''(r) && LenVec(r) > 0 ));
+{% else %}
+axiom (forall v: {{T}} :: {$1_bcs_serialize{{S}}(v)}
+     ( var r := $1_bcs_serialize{{S}}(v); $IsValid'vec'u8''(r) && LenVec(r) > 0 &&
+                            LenVec(r) <= {{options.serialize_bound}} ));
+{% endif %}
+
+procedure $1_bcs_to_bytes{{S}}(v: {{T}}) returns (res: Vec int);
+ensures res == $1_bcs_serialize{{S}}(v);
+
+function {:inline} $1_bcs_$to_bytes{{S}}(v: {{T}}): Vec int {
+    $1_bcs_serialize{{S}}(v)
+}
+
+{% if S == "'address'" -%}
+// Serialized addresses should have the same length.
+const $serialized_address_len: int;
+// Serialized addresses should have the same length
+axiom (forall v: int :: {$1_bcs_serialize'address'(v)}
+     ( var r := $1_bcs_serialize'address'(v); LenVec(r) == $serialized_address_len));
+{% endif %}
+{% endmacro hash_module %}
+
+
+{# Event Module
+   ============
+#}
+
+{% macro event_module(instance) %}
+{%- set S = "'" ~ instance.suffix ~ "'" -%}
+{%- set T = instance.name -%}
+
+// Map type specific handle to universal one.
+type $1_event_EventHandle{{S}} = $1_event_EventHandle;
+
+function {:inline} $IsEqual'$1_event_EventHandle{{S}}'(a: $1_event_EventHandle{{S}}, b: $1_event_EventHandle{{S}}): bool {
+    a == b
+}
+
+function $IsValid'$1_event_EventHandle{{S}}'(h: $1_event_EventHandle{{S}}): bool {
+    true
+}
+
+// Embed event `{{T}}` into universal $EventRep
+function {:constructor} $ToEventRep{{S}}(e: {{T}}): $EventRep;
+axiom (forall v1, v2: {{T}} :: {$ToEventRep{{S}}(v1), $ToEventRep{{S}}(v2)}
+    $IsEqual{{S}}(v1, v2) <==> $ToEventRep{{S}}(v1) == $ToEventRep{{S}}(v2));
+
+// Creates a new event handle. This ensures each time it is called that a unique new abstract event handler is
+// returned.
+// TODO: we should check (and abort with the right code) if no generator exists for the signer.
+procedure {:inline 1} $1_event_new_event_handle{{S}}(signer: $signer) returns (res: $1_event_EventHandle{{S}}) {
+    assume $1_event_EventHandles[res] == false;
+    $1_event_EventHandles := $1_event_EventHandles[res := true];
+}
+
+// This boogie procedure is the model of `emit_event`. This model abstracts away the `counter` behavior, thus not
+// mutating (or increasing) `counter`.
+procedure {:inline 1} $1_event_emit_event{{S}}(handle_mut: $Mutation $1_event_EventHandle{{S}}, msg: {{T}})
+returns (res: $Mutation $1_event_EventHandle{{S}}) {
+    var handle: $1_event_EventHandle{{S}};
+    handle := $Dereference(handle_mut);
+    $es := $ExtendEventStore{{S}}($es, handle, msg);
+    res := handle_mut;
+}
+
+procedure {:inline 1} $1_event_guid{{S}}(handle_ref: $1_event_EventHandle{{S}})
+returns (res: int) {
+    // TODO: temporarily mocked. The return type needs to be fixed.
+    res := 0;
+}
+
+procedure {:inline 1} $1_event_counter{{S}}(handle_ref: $1_event_EventHandle{{S}})
+returns (res: int) {
+    // TODO: temporarily mocked.
+    res := 0;
+}
+
+procedure {:inline 1} $1_event_destroy_handle{{S}}(handle: $1_event_EventHandle{{S}}) {
+}
+
+function {:inline} $ExtendEventStore{{S}}(
+        es: $EventStore, handle: $1_event_EventHandle{{S}}, msg: {{T}}): $EventStore {
+    (var stream := streams#$EventStore(es)[handle];
+    (var stream_new := ExtendMultiset(stream, $ToEventRep{{S}}(msg));
+    $EventStore(counter#$EventStore(es)+1, streams#$EventStore(es)[handle := stream_new])))
+}
+
+function {:inline} $CondExtendEventStore{{S}}(
+        es: $EventStore, handle: $1_event_EventHandle{{S}}, msg: {{T}}, cond: bool): $EventStore {
+    if cond then
+        $ExtendEventStore{{S}}(es, handle, msg)
+    else
+        es
+}
+{% endmacro event_module %}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/prelude.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/prelude.bpl
new file mode 100644
index 000000000..b0e66b8f8
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/prelude.bpl
@@ -0,0 +1,1253 @@
+{#
+Copyright (c) The Diem Core Contributors
+SPDX-License-Identifier: Apache-2.0
+
+This files contains a Tera Rust template for the prover's Boogie prelude.
+(See https://tera.netlify.app/docs).
+
+The following variables and filters are bound in the template context:
+
+- options: contains the crate::options::BoogieOptions structure
+- vec_instances: a list of crate::TypeInfo's for all vector instantiations
+
+Below we include macros and data type theories. Notice that Tera requires to
+include macros before any actual content in the template. Also note the implementation
+bound to included theories is determined by the function `crate::add_prelude`, based on
+options provided to the prover.
+#}
+
+{% import "native" as native %}
+{% include "vector-theory" %}
+{% include "multiset-theory" %}
+{% include "table-theory" %}
+{%- if options.custom_natives -%}
+{% include "custom-natives" %}
+{%- endif %}
+
+// ============================================================================================
+// Primitive Types
+
+const $MAX_U8: int;
+axiom $MAX_U8 == 255;
+const $MAX_U16: int;
+axiom $MAX_U16 == 65535;
+const $MAX_U32: int;
+axiom $MAX_U32 == 4294967295;
+const $MAX_U64: int;
+axiom $MAX_U64 == 18446744073709551615;
+const $MAX_U128: int;
+axiom $MAX_U128 == 340282366920938463463374607431768211455;
+const $MAX_U256: int;
+axiom $MAX_U256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+// Templates for bitvector operations
+
+{%- for impl in bv_instances %}
+
+function {:bvbuiltin "bvand"} $And'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvor"} $Or'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvxor"} $Xor'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvadd"} $Add'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvsub"} $Sub'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvmul"} $Mul'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvudiv"} $Div'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvurem"} $Mod'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvshl"} $Shl'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvlshr"} $Shr'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvult"} $Lt'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvule"} $Le'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvugt"} $Gt'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvuge"} $Ge'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+
+procedure {:inline 1} $AddBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'($Add'Bv{{impl.base}}'(src1, src2), src1)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Add'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $AddBv{{impl.base}}_unchecked(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Add'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $SubBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'(src1, src2)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Sub'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $MulBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'($Mul'Bv{{impl.base}}'(src1, src2), src1)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Mul'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $DivBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if (src2 == 0bv{{impl.base}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Div'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $ModBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if (src2 == 0bv{{impl.base}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Mod'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $AndBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $And'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $OrBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Or'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $XorBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Xor'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $LtBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Lt'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $LeBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Le'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $GtBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Gt'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $GeBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Ge'Bv{{impl.base}}'(src1,src2);
+}
+
+function $IsValid'bv{{impl.base}}'(v: bv{{impl.base}}): bool {
+  $Ge'Bv{{impl.base}}'(v,0bv{{impl.base}}) && $Le'Bv{{impl.base}}'(v,{{impl.max}}bv{{impl.base}})
+}
+
+function {:inline} $IsEqual'bv{{impl.base}}'(x: bv{{impl.base}}, y: bv{{impl.base}}): bool {
+    x == y
+}
+
+procedure {:inline 1} $int2bv{{impl.base}}(src: int) returns (dst: bv{{impl.base}})
+{
+    if (src > {{impl.max}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $int2bv.{{impl.base}}(src);
+}
+
+procedure {:inline 1} $bv2int{{impl.base}}(src: bv{{impl.base}}) returns (dst: int)
+{
+    dst := $bv2int.{{impl.base}}(src);
+}
+
+function {:builtin "(_ int2bv {{impl.base}})"} $int2bv.{{impl.base}}(i: int) returns (bv{{impl.base}});
+function {:builtin "bv2nat"} $bv2int.{{impl.base}}(i: bv{{impl.base}}) returns (int);
+
+{%- endfor %}
+
+type {:datatype} $Range;
+function {:constructor} $Range(lb: int, ub: int): $Range;
+
+function {:inline} $IsValid'bool'(v: bool): bool {
+  true
+}
+
+function $IsValid'u8'(v: int): bool {
+  v >= 0 && v <= $MAX_U8
+}
+
+function $IsValid'u16'(v: int): bool {
+  v >= 0 && v <= $MAX_U16
+}
+
+function $IsValid'u32'(v: int): bool {
+  v >= 0 && v <= $MAX_U32
+}
+
+function $IsValid'u64'(v: int): bool {
+  v >= 0 && v <= $MAX_U64
+}
+
+function $IsValid'u128'(v: int): bool {
+  v >= 0 && v <= $MAX_U128
+}
+
+function $IsValid'u256'(v: int): bool {
+  v >= 0 && v <= $MAX_U256
+}
+
+function $IsValid'num'(v: int): bool {
+  true
+}
+
+function $IsValid'address'(v: int): bool {
+  // TODO: restrict max to representable addresses?
+  v >= 0
+}
+
+function {:inline} $IsValidRange(r: $Range): bool {
+   $IsValid'u64'(lb#$Range(r)) &&  $IsValid'u64'(ub#$Range(r))
+}
+
+// Intentionally not inlined so it serves as a trigger in quantifiers.
+function $InRange(r: $Range, i: int): bool {
+   lb#$Range(r) <= i && i < ub#$Range(r)
+}
+
+
+function {:inline} $IsEqual'u8'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u16'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u32'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u64'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u128'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u256'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'num'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'address'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'bool'(x: bool, y: bool): bool {
+    x == y
+}
+
+// ============================================================================================
+// Memory
+
+type {:datatype} $Location;
+
+// A global resource location within the statically known resource type's memory,
+// where `a` is an address.
+function {:constructor} $Global(a: int): $Location;
+
+// A local location. `i` is the unique index of the local.
+function {:constructor} $Local(i: int): $Location;
+
+// The location of a reference outside of the verification scope, for example, a `&mut` parameter
+// of the function being verified. References with these locations don't need to be written back
+// when mutation ends.
+function {:constructor} $Param(i: int): $Location;
+
+// The location of an uninitialized mutation. Using this to make sure that the location
+// will not be equal to any valid mutation locations, i.e., $Local, $Global, or $Param.
+function {:constructor} $Uninitialized(): $Location;
+
+// A mutable reference which also carries its current value. Since mutable references
+// are single threaded in Move, we can keep them together and treat them as a value
+// during mutation until the point they are stored back to their original location.
+type {:datatype} $Mutation _;
+function {:constructor} $Mutation<T>(l: $Location, p: Vec int, v: T): $Mutation T;
+
+// Representation of memory for a given type.
+type {:datatype} $Memory _;
+function {:constructor} $Memory<T>(domain: [int]bool, contents: [int]T): $Memory T;
+
+function {:builtin "MapConst"} $ConstMemoryDomain(v: bool): [int]bool;
+function {:builtin "MapConst"} $ConstMemoryContent<T>(v: T): [int]T;
+axiom $ConstMemoryDomain(false) == (lambda i: int :: false);
+axiom $ConstMemoryDomain(true) == (lambda i: int :: true);
+
+
+// Dereferences a mutation.
+function {:inline} $Dereference<T>(ref: $Mutation T): T {
+    v#$Mutation(ref)
+}
+
+// Update the value of a mutation.
+function {:inline} $UpdateMutation<T>(m: $Mutation T, v: T): $Mutation T {
+    $Mutation(l#$Mutation(m), p#$Mutation(m), v)
+}
+
+function {:inline} $ChildMutation<T1, T2>(m: $Mutation T1, offset: int, v: T2): $Mutation T2 {
+    $Mutation(l#$Mutation(m), ExtendVec(p#$Mutation(m), offset), v)
+}
+
+// Return true if two mutations share the location and path
+function {:inline} $IsSameMutation<T1, T2>(parent: $Mutation T1, child: $Mutation T2 ): bool {
+    l#$Mutation(parent) == l#$Mutation(child) && p#$Mutation(parent) == p#$Mutation(child)
+}
+
+// Return true if the mutation is a parent of a child which was derived with the given edge offset. This
+// is used to implement write-back choices.
+function {:inline} $IsParentMutation<T1, T2>(parent: $Mutation T1, edge: int, child: $Mutation T2 ): bool {
+    l#$Mutation(parent) == l#$Mutation(child) &&
+    (var pp := p#$Mutation(parent);
+    (var cp := p#$Mutation(child);
+    (var pl := LenVec(pp);
+    (var cl := LenVec(cp);
+     cl == pl + 1 &&
+     (forall i: int:: i >= 0 && i < pl ==> ReadVec(pp, i) ==  ReadVec(cp, i)) &&
+     $EdgeMatches(ReadVec(cp, pl), edge)
+    ))))
+}
+
+// Return true if the mutation is a parent of a child, for hyper edge.
+function {:inline} $IsParentMutationHyper<T1, T2>(parent: $Mutation T1, hyper_edge: Vec int, child: $Mutation T2 ): bool {
+    l#$Mutation(parent) == l#$Mutation(child) &&
+    (var pp := p#$Mutation(parent);
+    (var cp := p#$Mutation(child);
+    (var pl := LenVec(pp);
+    (var cl := LenVec(cp);
+    (var el := LenVec(hyper_edge);
+     cl == pl + el &&
+     (forall i: int:: i >= 0 && i < pl ==> ReadVec(pp, i) == ReadVec(cp, i)) &&
+     (forall i: int:: i >= 0 && i < el ==> $EdgeMatches(ReadVec(cp, pl + i), ReadVec(hyper_edge, i)))
+    )))))
+}
+
+function {:inline} $EdgeMatches(edge: int, edge_pattern: int): bool {
+    edge_pattern == -1 // wildcard
+    || edge_pattern == edge
+}
+
+
+
+function {:inline} $SameLocation<T1, T2>(m1: $Mutation T1, m2: $Mutation T2): bool {
+    l#$Mutation(m1) == l#$Mutation(m2)
+}
+
+function {:inline} $HasGlobalLocation<T>(m: $Mutation T): bool {
+    is#$Global(l#$Mutation(m))
+}
+
+function {:inline} $HasLocalLocation<T>(m: $Mutation T, idx: int): bool {
+    l#$Mutation(m) == $Local(idx)
+}
+
+function {:inline} $GlobalLocationAddress<T>(m: $Mutation T): int {
+    a#$Global(l#$Mutation(m))
+}
+
+
+
+// Tests whether resource exists.
+function {:inline} $ResourceExists<T>(m: $Memory T, addr: int): bool {
+    domain#$Memory(m)[addr]
+}
+
+// Obtains Value of given resource.
+function {:inline} $ResourceValue<T>(m: $Memory T, addr: int): T {
+    contents#$Memory(m)[addr]
+}
+
+// Update resource.
+function {:inline} $ResourceUpdate<T>(m: $Memory T, a: int, v: T): $Memory T {
+    $Memory(domain#$Memory(m)[a := true], contents#$Memory(m)[a := v])
+}
+
+// Remove resource.
+function {:inline} $ResourceRemove<T>(m: $Memory T, a: int): $Memory T {
+    $Memory(domain#$Memory(m)[a := false], contents#$Memory(m))
+}
+
+// Copies resource from memory s to m.
+function {:inline} $ResourceCopy<T>(m: $Memory T, s: $Memory T, a: int): $Memory T {
+    $Memory(domain#$Memory(m)[a := domain#$Memory(s)[a]],
+            contents#$Memory(m)[a := contents#$Memory(s)[a]])
+}
+
+
+
+// ============================================================================================
+// Abort Handling
+
+var $abort_flag: bool;
+var $abort_code: int;
+
+function {:inline} $process_abort_code(code: int): int {
+    code
+}
+
+const $EXEC_FAILURE_CODE: int;
+axiom $EXEC_FAILURE_CODE == -1;
+
+// TODO(wrwg): currently we map aborts of native functions like those for vectors also to
+//   execution failure. This may need to be aligned with what the runtime actually does.
+
+procedure {:inline 1} $ExecFailureAbort() {
+    $abort_flag := true;
+    $abort_code := $EXEC_FAILURE_CODE;
+}
+
+procedure {:inline 1} $Abort(code: int) {
+    $abort_flag := true;
+    $abort_code := code;
+}
+
+function {:inline} $StdError(cat: int, reason: int): int {
+    reason * 256 + cat
+}
+
+procedure {:inline 1} $InitVerification() {
+    // Set abort_flag to false, and havoc abort_code
+    $abort_flag := false;
+    havoc $abort_code;
+    // Initialize event store
+    call $InitEventStore();
+}
+
+// ============================================================================================
+// Instructions
+
+
+procedure {:inline 1} $CastU8(src: int) returns (dst: int)
+{
+    if (src > $MAX_U8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU16(src: int) returns (dst: int)
+{
+    if (src > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU32(src: int) returns (dst: int)
+{
+    if (src > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU64(src: int) returns (dst: int)
+{
+    if (src > $MAX_U64) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU128(src: int) returns (dst: int)
+{
+    if (src > $MAX_U128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU256(src: int) returns (dst: int)
+{
+    if (src > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $AddU8(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU16(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU16_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU32(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU32_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU64(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U64) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU64_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU128(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU128_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU256(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU256_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $Sub(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 < src2) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 - src2;
+}
+
+// uninterpreted function to return an undefined value.
+function $undefined_int(): int;
+
+// Recursive exponentiation function
+// Undefined unless e >=0.  $pow(0,0) is also undefined.
+function $pow(n: int, e: int): int {
+    if n != 0 && e == 0 then 1
+    else if e > 0 then n * $pow(n, e - 1)
+    else $undefined_int()
+}
+
+function $shl(src1: int, p: int): int {
+    src1 * $pow(2, p)
+}
+
+function $shlU8(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 256
+}
+
+function $shlU16(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 65536
+}
+
+function $shlU32(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 4294967296
+}
+
+function $shlU64(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 18446744073709551616
+}
+
+function $shlU128(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 340282366920938463463374607431768211456
+}
+
+function $shlU256(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 115792089237316195423570985008687907853269984665640564039457584007913129639936
+}
+
+function $shr(src1: int, p: int): int {
+    src1 div $pow(2, p)
+}
+
+// We need to know the size of the destination in order to drop bits
+// that have been shifted left more than that, so we have $ShlU8/16/32/64/128/256
+procedure {:inline 1} $ShlU8(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU8(src1, src2);
+}
+
+// Template for cast and shift operations of bitvector types
+
+{%- for impl in bv_instances %}
+{%- for instance in sh_instances %}
+{%- set base_diff = impl.base - instance %}
+
+procedure {:inline 1} $CastBv{{instance}}to{{impl.base}}(src: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    {%- if base_diff < 0 %}
+    if ($Gt'Bv{{instance}}'(src, {{impl.max}}bv{{instance}})) {
+            call $ExecFailureAbort();
+            return;
+    }
+    {%- endif %}
+    {%- if base_diff < 0 %}
+    dst := src[{{impl.base}}:0];
+    {%- elif base_diff == 0 %}
+    dst := src;
+    {%- else %}
+    dst := 0bv{{base_diff}} ++ src;
+    {%- endif %}
+}
+
+
+function $shlBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (bv{{impl.base}})
+{
+    {%- if base_diff > 0 %}
+    $Shl'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2)
+    {%- elif base_diff == 0 %}
+    $Shl'Bv{{impl.base}}'(src1, src2)
+    {%- else %}
+    $Shl'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0])
+    {%- endif %}
+}
+
+procedure {:inline 1} $ShlBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    if ($Ge'Bv{{instance}}'(src2, {{impl.base}}bv{{instance}})) {
+        call $ExecFailureAbort();
+        return;
+    }
+    {%- if base_diff > 0 %}
+    dst := $Shl'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2);
+    {%- elif base_diff == 0 %}
+    dst := $Shl'Bv{{impl.base}}'(src1, src2);
+    {%- else %}
+    dst := $Shl'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0]);
+    {%- endif %}
+}
+
+function $shrBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (bv{{impl.base}})
+{
+    {%- if base_diff > 0 %}
+    $Shr'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2)
+    {%- elif base_diff == 0 %}
+    $Shr'Bv{{impl.base}}'(src1, src2)
+    {%- else %}
+    $Shr'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0])
+    {%- endif %}
+}
+
+procedure {:inline 1} $ShrBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    if ($Ge'Bv{{instance}}'(src2, {{impl.base}}bv{{instance}})) {
+        call $ExecFailureAbort();
+        return;
+    }
+    {%- if base_diff > 0 %}
+    dst := $Shr'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2);
+    {%- elif base_diff == 0 %}
+    dst := $Shr'Bv{{impl.base}}'(src1, src2);
+    {%- else %}
+    dst := $Shr'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0]);
+    {%- endif %}
+}
+
+{%- endfor %}
+{%- endfor %}
+
+procedure {:inline 1} $ShlU16(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU16(src1, src2);
+}
+
+procedure {:inline 1} $ShlU32(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU32(src1, src2);
+}
+
+procedure {:inline 1} $ShlU64(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 64) {
+       call $ExecFailureAbort();
+       return;
+    }
+    dst := $shlU64(src1, src2);
+}
+
+procedure {:inline 1} $ShlU128(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU128(src1, src2);
+}
+
+procedure {:inline 1} $ShlU256(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    dst := $shlU256(src1, src2);
+}
+
+procedure {:inline 1} $Shr(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU8(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU16(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU32(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU64(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 64) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU128(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU256(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $MulU8(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU16(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU32(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU64(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U64) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU128(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU256(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $Div(src1: int, src2: int) returns (dst: int)
+{
+    if (src2 == 0) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 div src2;
+}
+
+procedure {:inline 1} $Mod(src1: int, src2: int) returns (dst: int)
+{
+    if (src2 == 0) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 mod src2;
+}
+
+procedure {:inline 1} $ArithBinaryUnimplemented(src1: int, src2: int) returns (dst: int);
+
+procedure {:inline 1} $Lt(src1: int, src2: int) returns (dst: bool)
+{
+    dst := src1 < src2;
+}
+
+procedure {:inline 1} $Gt(src1: int, src2: int) returns (dst: bool)
+{
+    dst := src1 > src2;
+}
+
+procedure {:inline 1} $Le(src1: int, src2: int) returns (dst: bool)
+{
+    dst := src1 <= src2;
+}
+
+procedure {:inline 1} $Ge(src1: int, src2: int) returns (dst: bool)
+{
+    dst := src1 >= src2;
+}
+
+procedure {:inline 1} $And(src1: bool, src2: bool) returns (dst: bool)
+{
+    dst := src1 && src2;
+}
+
+procedure {:inline 1} $Or(src1: bool, src2: bool) returns (dst: bool)
+{
+    dst := src1 || src2;
+}
+
+procedure {:inline 1} $Not(src: bool) returns (dst: bool)
+{
+    dst := !src;
+}
+
+// Pack and Unpack are auto-generated for each type T
+
+
+// ==================================================================================
+// Native Vector
+
+function {:inline} $SliceVecByRange<T>(v: Vec T, r: $Range): Vec T {
+    SliceVec(v, lb#$Range(r), ub#$Range(r))
+}
+
+{%- for instance in vec_instances %}
+
+// ----------------------------------------------------------------------------------
+// Native Vector implementation for element type `{{instance.suffix}}`
+
+{{ native::vector_module(instance=instance) -}}
+{%- endfor %}
+
+// ==================================================================================
+// Native Table
+
+{%- for instance in table_key_instances %}
+
+// ----------------------------------------------------------------------------------
+// Native Table key encoding for type `{{instance.suffix}}`
+
+{{ native::table_key_encoding(instance=instance) -}}
+{%- endfor %}
+
+{%- for impl in table_instances %}
+{%- for instance in impl.insts %}
+
+// ----------------------------------------------------------------------------------
+// Native Table implementation for type `({{instance.0.suffix}},{{instance.1.suffix}})`
+
+{{ native::table_module(impl=impl, instance=instance) -}}
+{%- endfor %}
+{%- endfor %}
+
+// ==================================================================================
+// Native Hash
+
+// Hash is modeled as an otherwise uninterpreted injection.
+// In truth, it is not an injection since the domain has greater cardinality
+// (arbitrary length vectors) than the co-domain (vectors of length 32).  But it is
+// common to assume in code there are no hash collisions in practice.  Fortunately,
+// Boogie is not smart enough to recognized that there is an inconsistency.
+// FIXME: If we were using a reliable extensional theory of arrays, and if we could use ==
+// instead of $IsEqual, we might be able to avoid so many quantified formulas by
+// using a sha2_inverse function in the ensures conditions of Hash_sha2_256 to
+// assert that sha2/3 are injections without using global quantified axioms.
+
+
+function $1_hash_sha2(val: Vec int): Vec int;
+
+// This says that Hash_sha2 is bijective.
+axiom (forall v1,v2: Vec int :: {$1_hash_sha2(v1), $1_hash_sha2(v2)}
+       $IsEqual'vec'u8''(v1, v2) <==> $IsEqual'vec'u8''($1_hash_sha2(v1), $1_hash_sha2(v2)));
+
+procedure $1_hash_sha2_256(val: Vec int) returns (res: Vec int);
+ensures res == $1_hash_sha2(val);     // returns Hash_sha2 Value
+ensures $IsValid'vec'u8''(res);    // result is a legal vector of U8s.
+ensures LenVec(res) == 32;               // result is 32 bytes.
+
+// Spec version of Move native function.
+function {:inline} $1_hash_$sha2_256(val: Vec int): Vec int {
+    $1_hash_sha2(val)
+}
+
+// similarly for Hash_sha3
+function $1_hash_sha3(val: Vec int): Vec int;
+
+axiom (forall v1,v2: Vec int :: {$1_hash_sha3(v1), $1_hash_sha3(v2)}
+       $IsEqual'vec'u8''(v1, v2) <==> $IsEqual'vec'u8''($1_hash_sha3(v1), $1_hash_sha3(v2)));
+
+procedure $1_hash_sha3_256(val: Vec int) returns (res: Vec int);
+ensures res == $1_hash_sha3(val);     // returns Hash_sha3 Value
+ensures $IsValid'vec'u8''(res);    // result is a legal vector of U8s.
+ensures LenVec(res) == 32;               // result is 32 bytes.
+
+// Spec version of Move native function.
+function {:inline} $1_hash_$sha3_256(val: Vec int): Vec int {
+    $1_hash_sha3(val)
+}
+
+// ==================================================================================
+// Native string
+
+// TODO: correct implementation of strings
+
+procedure {:inline 1} $1_string_internal_check_utf8(x: Vec int) returns (r: bool) {
+}
+
+procedure {:inline 1} $1_string_internal_sub_string(x: Vec int, i: int, j: int) returns (r: Vec int) {
+}
+
+procedure {:inline 1} $1_string_internal_index_of(x: Vec int, y: Vec int) returns (r: int) {
+}
+
+procedure {:inline 1} $1_string_internal_is_char_boundary(x: Vec int, i: int) returns (r: bool) {
+}
+
+
+
+
+// ==================================================================================
+// Native diem_account
+
+procedure {:inline 1} $1_DiemAccount_create_signer(
+  addr: int
+) returns (signer: $signer) {
+    // A signer is currently identical to an address.
+    signer := $signer(addr);
+}
+
+procedure {:inline 1} $1_DiemAccount_destroy_signer(
+  signer: $signer
+) {
+  return;
+}
+
+// ==================================================================================
+// Native account
+
+procedure {:inline 1} $1_Account_create_signer(
+  addr: int
+) returns (signer: $signer) {
+    // A signer is currently identical to an address.
+    signer := $signer(addr);
+}
+
+// ==================================================================================
+// Native Signer
+
+type {:datatype} $signer;
+function {:constructor} $signer($addr: int): $signer;
+function {:inline} $IsValid'signer'(s: $signer): bool {
+    $IsValid'address'($addr#$signer(s))
+}
+function {:inline} $IsEqual'signer'(s1: $signer, s2: $signer): bool {
+    s1 == s2
+}
+
+procedure {:inline 1} $1_signer_borrow_address(signer: $signer) returns (res: int) {
+    res := $addr#$signer(signer);
+}
+
+function {:inline} $1_signer_$borrow_address(signer: $signer): int
+{
+    $addr#$signer(signer)
+}
+
+function $1_signer_is_txn_signer(s: $signer): bool;
+
+function $1_signer_is_txn_signer_addr(a: int): bool;
+
+
+// ==================================================================================
+// Native signature
+
+// Signature related functionality is handled via uninterpreted functions. This is sound
+// currently because we verify every code path based on signature verification with
+// an arbitrary interpretation.
+
+function $1_Signature_$ed25519_validate_pubkey(public_key: Vec int): bool;
+function $1_Signature_$ed25519_verify(signature: Vec int, public_key: Vec int, message: Vec int): bool;
+
+// Needed because we do not have extensional equality:
+axiom (forall k1, k2: Vec int ::
+    {$1_Signature_$ed25519_validate_pubkey(k1), $1_Signature_$ed25519_validate_pubkey(k2)}
+    $IsEqual'vec'u8''(k1, k2) ==> $1_Signature_$ed25519_validate_pubkey(k1) == $1_Signature_$ed25519_validate_pubkey(k2));
+axiom (forall s1, s2, k1, k2, m1, m2: Vec int ::
+    {$1_Signature_$ed25519_verify(s1, k1, m1), $1_Signature_$ed25519_verify(s2, k2, m2)}
+    $IsEqual'vec'u8''(s1, s2) && $IsEqual'vec'u8''(k1, k2) && $IsEqual'vec'u8''(m1, m2)
+    ==> $1_Signature_$ed25519_verify(s1, k1, m1) == $1_Signature_$ed25519_verify(s2, k2, m2));
+
+
+procedure {:inline 1} $1_Signature_ed25519_validate_pubkey(public_key: Vec int) returns (res: bool) {
+    res := $1_Signature_$ed25519_validate_pubkey(public_key);
+}
+
+procedure {:inline 1} $1_Signature_ed25519_verify(
+        signature: Vec int, public_key: Vec int, message: Vec int) returns (res: bool) {
+    res := $1_Signature_$ed25519_verify(signature, public_key, message);
+}
+
+
+// ==================================================================================
+// Native bcs::serialize
+
+{%- for instance in bcs_instances %}
+
+// ----------------------------------------------------------------------------------
+// Native BCS implementation for element type `{{instance.suffix}}`
+
+{{ native::bcs_module(instance=instance) -}}
+{%- endfor %}
+
+
+// ==================================================================================
+// Native Event module
+
+{% set emit_generic_event = true %}
+{%- for instance in event_instances %}
+{%- if emit_generic_event %}
+{% set_global emit_generic_event = false %}
+
+// Generic code for dealing with mutations (havoc) still requires type and memory declarations.
+type $1_event_EventHandleGenerator;
+var $1_event_EventHandleGenerator_$memory: $Memory $1_event_EventHandleGenerator;
+
+// Abstract type of event handles.
+type $1_event_EventHandle;
+
+// Global state to implement uniqueness of event handles.
+var $1_event_EventHandles: [$1_event_EventHandle]bool;
+
+// Universal representation of an an event. For each concrete event type, we generate a constructor.
+type {:datatype} $EventRep;
+
+// Representation of EventStore that consists of event streams.
+type {:datatype} $EventStore;
+function {:constructor} $EventStore(
+    counter: int, streams: [$1_event_EventHandle]Multiset $EventRep): $EventStore;
+
+// Global state holding EventStore.
+var $es: $EventStore;
+
+procedure {:inline 1} $InitEventStore() {
+    assume $EventStore__is_empty($es);
+}
+
+function {:inline} $EventStore__is_empty(es: $EventStore): bool {
+    (counter#$EventStore(es) == 0) &&
+    (forall handle: $1_event_EventHandle ::
+        (var stream := streams#$EventStore(es)[handle];
+        IsEmptyMultiset(stream)))
+}
+
+// This function returns (es1 - es2). This function assumes that es2 is a subset of es1.
+function {:inline} $EventStore__subtract(es1: $EventStore, es2: $EventStore): $EventStore {
+    $EventStore(counter#$EventStore(es1)-counter#$EventStore(es2),
+        (lambda handle: $1_event_EventHandle ::
+        SubtractMultiset(
+            streams#$EventStore(es1)[handle],
+            streams#$EventStore(es2)[handle])))
+}
+
+function {:inline} $EventStore__is_subset(es1: $EventStore, es2: $EventStore): bool {
+    (counter#$EventStore(es1) <= counter#$EventStore(es2)) &&
+    (forall handle: $1_event_EventHandle ::
+        IsSubsetMultiset(
+            streams#$EventStore(es1)[handle],
+            streams#$EventStore(es2)[handle]
+        )
+    )
+}
+
+procedure {:inline 1} $EventStore__diverge(es: $EventStore) returns (es': $EventStore) {
+    assume $EventStore__is_subset(es, es');
+}
+
+const $EmptyEventStore: $EventStore;
+axiom $EventStore__is_empty($EmptyEventStore);
+
+{%- endif %}
+
+// ----------------------------------------------------------------------------------
+// Native Event implementation for element type `{{instance.suffix}}`
+
+{{ native::event_module(instance=instance) }}
+
+{%- endfor %}
+
+{%- if emit_generic_event %}
+{# Need to at least define this procedure #}
+procedure {:inline 1} $InitEventStore() {
+}
+{%- endif %}
+
+// ============================================================================================
+// Type Reflection on Type Parameters
+
+type {:datatype} $TypeParamInfo;
+
+function {:constructor} $TypeParamBool(): $TypeParamInfo;
+function {:constructor} $TypeParamU8(): $TypeParamInfo;
+function {:constructor} $TypeParamU16(): $TypeParamInfo;
+function {:constructor} $TypeParamU32(): $TypeParamInfo;
+function {:constructor} $TypeParamU64(): $TypeParamInfo;
+function {:constructor} $TypeParamU128(): $TypeParamInfo;
+function {:constructor} $TypeParamU256(): $TypeParamInfo;
+function {:constructor} $TypeParamAddress(): $TypeParamInfo;
+function {:constructor} $TypeParamSigner(): $TypeParamInfo;
+function {:constructor} $TypeParamVector(e: $TypeParamInfo): $TypeParamInfo;
+function {:constructor} $TypeParamStruct(a: int, m: Vec int, s: Vec int): $TypeParamInfo;
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/table-array-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/table-array-theory.bpl
new file mode 100644
index 000000000..73b3ec1e4
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/table-array-theory.bpl
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Theory for tables.
+
+type {:datatype} Table _ _;
+
+// v is the SMT array holding the key-value assignment. e is an array which
+// independently determines whether a key is valid or not. l is the length.
+//
+// Note that even though the program cannot reflect over existence of a key,
+// we want the specification to be able to do this, so it can express
+// verification conditions like "key has been inserted".
+function {:constructor} Table<K, V>(v: [K]V, e: [K]bool, l: int): Table K V;
+
+// Functions for default SMT arrays. For the table values, we don't care and
+// use an uninterpreted function.
+function DefaultTableArray<K, V>(): [K]V;
+function DefaultTableKeyExistsArray<K>(): [K]bool;
+axiom DefaultTableKeyExistsArray() == (lambda i: int :: false);
+
+function {:inline} EmptyTable<K, V>(): Table K V {
+    Table(DefaultTableArray(), DefaultTableKeyExistsArray(), 0)
+}
+
+function {:inline} GetTable<K,V>(t: Table K V, k: K): V {
+    // Notice we do not check whether key is in the table. The result is undetermined if it is not.
+    v#Table(t)[k]
+}
+
+function {:inline} LenTable<K,V>(t: Table K V): int {
+    l#Table(t)
+}
+
+
+function {:inline} ContainsTable<K,V>(t: Table K V, k: K): bool {
+    e#Table(t)[k]
+}
+
+function {:inline} UpdateTable<K,V>(t: Table K V, k: K, v: V): Table K V {
+    Table(v#Table(t)[k := v], e#Table(t), l#Table(t))
+}
+
+function {:inline} AddTable<K,V>(t: Table K V, k: K, v: V): Table K V {
+    // This function has an undetermined result if the key is already in the table
+    // (all specification functions have this "partial definiteness" behavior). Thus we can
+    // just increment the length.
+    Table(v#Table(t)[k := v], e#Table(t)[k := true], l#Table(t) + 1)
+}
+
+function {:inline} RemoveTable<K,V>(t: Table K V, k: K): Table K V {
+    // Similar as above, we only need to consider the case where the key is in the table.
+    Table(v#Table(t), e#Table(t)[k := false], l#Table(t) - 1)
+}
+
+axiom {:ctor "Table"} (forall<K,V> t: Table K V :: {LenTable(t)}
+    (exists k: K :: {ContainsTable(t, k)} ContainsTable(t, k)) ==> LenTable(t) >= 1
+);
+// TODO: we might want to encoder a stronger property that the length of table
+// must be more than N given a set of N items. Currently we don't see a need here
+// and the above axiom seems to be sufficient.
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-intern-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-intern-theory.bpl
new file mode 100644
index 000000000..45ef7145c
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-intern-theory.bpl
@@ -0,0 +1,153 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Boogie model for vectors, based on Boogie arrays.
+
+// This version of vectors uses an encoding of an internalization function to
+// achieve extensional equality on vectors.
+
+type {:datatype} Vec _;
+
+function {:constructor} Vec<T>(v: [int]T, l: int): Vec T;
+
+function {:builtin "MapConst"} MapConstVec<T>(T): [int]T;
+function {:inline} DefaultVecElem<T>(): T;
+function {:inline} DefaultVecMap<T>(): [int]T { MapConstVec(DefaultVecElem()) }
+
+axiom {:ctor "Vec"} (forall<T> x: Vec T :: {l#Vec(x)} l#Vec(x) >= 0);
+
+function {:inline} VecIntern<T>(v: Vec T): Vec T;
+
+axiom {:ctor "Vec"} (forall<T> v: Vec T :: {VecIntern(v)} VecRepIsEqual(v, VecIntern(v)));
+
+axiom {:ctor "Vec"} (forall<T> v1, v2: Vec T ::
+    {VecRepIsEqual(v1, v2)}{VecIntern(v1), VecIntern(v2)}
+    VecRepIsEqual(v1, v2) <==> VecIntern(v1) == VecIntern(v2));
+
+function VecRepIsEqual<T>(v1: Vec T, v2: Vec T): bool {
+    v1 == v2 ||
+    (var l := l#Vec(v1);
+     l == l#Vec(v2) &&
+     (forall i: int :: //{v#Vec(v1)[i], v#Vec(v2)[i]}
+         i >= 0 && i < l ==> v#Vec(v1)[i] == v#Vec(v2)[i]))
+}
+
+
+
+function {:inline} EmptyVec<T>(): Vec T {
+    VecIntern(Vec(DefaultVecMap(), 0))
+}
+
+function {:inline} MakeVec1<T>(v: T): Vec T {
+    VecIntern(Vec(DefaultVecMap()[0 := v], 1))
+}
+
+function {:inline} MakeVec2<T>(v1: T, v2: T): Vec T {
+    VecIntern(Vec(DefaultVecMap()[0 := v1][1 := v2], 2))
+}
+
+function {:inline} MakeVec3<T>(v1: T, v2: T, v3: T): Vec T {
+    VecIntern(Vec(DefaultVecMap()[0 := v1][1 := v2][2 := v3], 3))
+}
+
+function {:inline} MakeVec4<T>(v1: T, v2: T, v3: T, v4: T): Vec T {
+    VecIntern(Vec(DefaultVecMap()[0 := v1][1 := v2][2 := v3][3 := v4], 4))
+}
+
+function {:inline} ExtendVec<T>(v: Vec T, elem: T): Vec T {
+    (var l := l#Vec(v);
+    VecIntern(Vec(v#Vec(v)[l := elem], l + 1)))
+}
+
+function {:inline} ReadVec<T>(v: Vec T, i: int): T {
+    v#Vec(v)[i]
+}
+
+function {:inline} LenVec<T>(v: Vec T): int {
+    l#Vec(v)
+}
+
+function {:inline} IsEmptyVec<T>(v: Vec T): bool {
+    l#Vec(v) == 0
+}
+
+function {:inline} RemoveVec<T>(v: Vec T): Vec T {
+    (var l := l#Vec(v) - 1;
+    VecIntern(Vec(v#Vec(v)[l := DefaultVecElem()], l)))
+}
+
+function {:inline} RemoveAtVec<T>(v: Vec T, i: int): Vec T {
+    (var l := l#Vec(v) - 1;
+    VecIntern(Vec(
+        (lambda j: int ::
+           if j >= 0 && j < l then
+               if j < i then v#Vec(v)[j] else v#Vec(v)[j+1]
+           else DefaultVecElem()),
+        l)))
+}
+
+function {:inline} InsertAtVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    (var l := l#Vec(v) + 1;
+    VecIntern(Vec(
+        (lambda j: int ::
+         if j >= 0 && j < l then
+           if j < i then v#Vec(v)[j]
+           else if j > i then v#Vec(v)[j-1] else elem
+         else DefaultVecElem()),
+        l)))
+}
+
+function {:inline} ConcatVec<T>(v1: Vec T, v2: Vec T): Vec T {
+    (var l1, m1, l2, m2 := l#Vec(v1), v#Vec(v1), l#Vec(v2), v#Vec(v2);
+    VecIntern(Vec(
+        (lambda i: int ::
+          if i >= 0 && i < l1 + l2 then
+            if i < l1 then m1[i] else m2[i - l1]
+          else DefaultVecElem()),
+        l1 + l2)))
+}
+
+function {:inline} ReverseVec<T>(v: Vec T): Vec T {
+    (var l := l#Vec(v);
+    VecIntern(Vec(
+        (lambda i: int :: if 0 <= i && i < l then v#Vec(v)[l - i - 1] else DefaultVecElem()),
+        l)))
+}
+
+function {:inline} SliceVec<T>(v: Vec T, i: int, j: int): Vec T {
+    (var m := v#Vec(v);
+    VecIntern(Vec(
+        (lambda k:int ::
+          if 0 <= k && k < j - i then
+            m[i + k]
+          else
+            DefaultVecElem()),
+        (if j - i < 0 then 0 else j - i))))
+}
+
+
+function {:inline} UpdateVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    VecIntern(Vec(v#Vec(v)[i := elem], l#Vec(v)))
+}
+
+function {:inline} SwapVec<T>(v: Vec T, i: int, j: int): Vec T {
+    (var m := v#Vec(v);
+    VecIntern(Vec(m[i := m[j]][j := m[i]], l#Vec(v))))
+}
+
+function {:inline} ContainsVec<T>(v: Vec T, e: T): bool {
+    (var l := l#Vec(v);
+    (exists i: int :: i >= 0 && i < l && v#Vec(v)[i] == e))
+}
+
+function IndexOfVec<T>(v: Vec T, e: T): int;
+axiom {:ctor "Vec"} (forall<T> v: Vec T, e: T :: {IndexOfVec(v, e)}
+    (var i := IndexOfVec(v,e);
+     if (!ContainsVec(v, e)) then i == -1
+     else InRangeVec(v, i) && ReadVec(v, i) == e &&
+        (forall j: int :: j >= 0 && j < i ==> ReadVec(v, j) != e)));
+
+function {:inline} InRangeVec<T>(v: Vec T, i: int): bool {
+    i >= 0 && i < LenVec(v)
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-theory.bpl
new file mode 100644
index 000000000..7df3995a9
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-array-theory.bpl
@@ -0,0 +1,133 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Basic theory for vectors using arrays. This version of vectors is not extensional.
+
+type {:datatype} Vec _;
+
+function {:constructor} Vec<T>(v: [int]T, l: int): Vec T;
+
+function {:builtin "MapConst"} MapConstVec<T>(T): [int]T;
+function DefaultVecElem<T>(): T;
+function {:inline} DefaultVecMap<T>(): [int]T { MapConstVec(DefaultVecElem()) }
+
+function {:inline} EmptyVec<T>(): Vec T {
+    Vec(DefaultVecMap(), 0)
+}
+
+function {:inline} MakeVec1<T>(v: T): Vec T {
+    Vec(DefaultVecMap()[0 := v], 1)
+}
+
+function {:inline} MakeVec2<T>(v1: T, v2: T): Vec T {
+    Vec(DefaultVecMap()[0 := v1][1 := v2], 2)
+}
+
+function {:inline} MakeVec3<T>(v1: T, v2: T, v3: T): Vec T {
+    Vec(DefaultVecMap()[0 := v1][1 := v2][2 := v3], 3)
+}
+
+function {:inline} MakeVec4<T>(v1: T, v2: T, v3: T, v4: T): Vec T {
+    Vec(DefaultVecMap()[0 := v1][1 := v2][2 := v3][3 := v4], 4)
+}
+
+function {:inline} ExtendVec<T>(v: Vec T, elem: T): Vec T {
+    (var l := l#Vec(v);
+    Vec(v#Vec(v)[l := elem], l + 1))
+}
+
+function {:inline} ReadVec<T>(v: Vec T, i: int): T {
+    v#Vec(v)[i]
+}
+
+function {:inline} LenVec<T>(v: Vec T): int {
+    l#Vec(v)
+}
+
+function {:inline} IsEmptyVec<T>(v: Vec T): bool {
+    l#Vec(v) == 0
+}
+
+function {:inline} RemoveVec<T>(v: Vec T): Vec T {
+    (var l := l#Vec(v) - 1;
+    Vec(v#Vec(v)[l := DefaultVecElem()], l))
+}
+
+function {:inline} RemoveAtVec<T>(v: Vec T, i: int): Vec T {
+    (var l := l#Vec(v) - 1;
+    Vec(
+        (lambda j: int ::
+           if j >= 0 && j < l then
+               if j < i then v#Vec(v)[j] else v#Vec(v)[j+1]
+           else DefaultVecElem()),
+        l))
+}
+
+function {:inline} InsertAtVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    (var l := l#Vec(v) + 1;
+    Vec(
+        (lambda j: int ::
+         if j >= 0 && j < l then
+           if j < i then v#Vec(v)[j]
+           else if j > i then v#Vec(v)[j-1] else elem
+         else DefaultVecElem()),
+        l))
+}
+
+function {:inline} ConcatVec<T>(v1: Vec T, v2: Vec T): Vec T {
+    (var l1, m1, l2, m2 := l#Vec(v1), v#Vec(v1), l#Vec(v2), v#Vec(v2);
+    Vec(
+        (lambda i: int ::
+          if i >= 0 && i < l1 + l2 then
+            if i < l1 then m1[i] else m2[i - l1]
+          else DefaultVecElem()),
+        l1 + l2))
+}
+
+function {:inline} ReverseVec<T>(v: Vec T): Vec T {
+    (var l := l#Vec(v);
+    Vec(
+        (lambda i: int :: if 0 <= i && i < l then v#Vec(v)[l - i - 1] else DefaultVecElem()),
+        l))
+}
+
+function {:inline} SliceVec<T>(v: Vec T, i: int, j: int): Vec T {
+    (var m := v#Vec(v);
+    Vec(
+        (lambda k:int ::
+          if 0 <= k && k < j - i then
+            m[i + k]
+          else
+            DefaultVecElem()),
+        (if j - i < 0 then 0 else j - i)))
+}
+
+
+function {:inline} UpdateVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    Vec(v#Vec(v)[i := elem], l#Vec(v))
+}
+
+function {:inline} SwapVec<T>(v: Vec T, i: int, j: int): Vec T {
+    (var m := v#Vec(v);
+    Vec(m[i := m[j]][j := m[i]], l#Vec(v)))
+}
+
+function {:inline} ContainsVec<T>(v: Vec T, e: T): bool {
+    (var l := l#Vec(v);
+    (exists i: int :: InRangeVec(v, i) && v#Vec(v)[i] == e))
+}
+
+function IndexOfVec<T>(v: Vec T, e: T): int;
+axiom {:ctor "Vec"} (forall<T> v: Vec T, e: T :: {IndexOfVec(v, e)}
+    (var i := IndexOfVec(v,e);
+     if (!ContainsVec(v, e)) then i == -1
+     else InRangeVec(v, i) && ReadVec(v, i) == e &&
+        (forall j: int :: j >= 0 && j < i ==> ReadVec(v, j) != e)));
+
+// This function should stay non-inlined as it guards many quantifiers
+// over vectors. It appears important to have this uninterpreted for
+// quantifier triggering.
+function InRangeVec<T>(v: Vec T, i: int): bool {
+    i >= 0 && i < LenVec(v)
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-ext-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-ext-theory.bpl
new file mode 100644
index 000000000..6bd0f26c3
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-ext-theory.bpl
@@ -0,0 +1,31 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Boogie model for vectors, based on smt arrays.
+
+// This extends the basic array theory by an axiom to make it extensional. Those axioms use
+// the Z3 builtins for map operations on arrays, so this theory requires native array theory.
+
+// TODO: this theory is currently not working well; reproduce
+// by `mvp --vnext --vector-theory=SmtArrayExt simple_vector_client.move`
+
+{% include "vector-array-theory" %}
+
+axiom {:ctor "Vec"} (forall<T> v: Vec T :: {l#Vec(v)} l#Vec(v) >= 0);
+
+axiom {:ctor "Vec"} (forall<T> v: Vec T :: {v#Vec(v)}{l#Vec(v)}
+    MapIte(MapRange(0, l#Vec(v)), MapConstVec(DefaultVecElem()), v#Vec(v))
+                == MapConstVec(DefaultVecElem()));
+
+function {:builtin "MapIte"} MapIte<T,U>([T]bool, [T]U, [T]U) : [T]U;
+function {:builtin "MapAnd"} MapAnd<T>([T]bool, [T]bool) : [T]bool;
+function {:builtin "MapNot"} MapNot<T>([T]bool) : [T]bool;
+function {:builtin "MapLe"} MapLe<T>([T]int, [T]int) : [T]bool;
+
+const Identity: [int]int;
+axiom (forall x: int :: Identity[x] == x);
+
+function {:inline} AtLeast(x: int): [int]bool { MapLe(MapConstVec(x), Identity) }
+function {:inline} MapDiff<T>(a: [T]bool, b: [T]bool) : [T]bool { MapAnd(a, MapNot(b)) }
+function {:inline} MapRange(from: int, n: int): [int]bool { MapDiff(AtLeast(from), AtLeast(from + n)) }
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-theory.bpl
new file mode 100644
index 000000000..11e436f75
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-array-theory.bpl
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Boogie model for vectors, based on smt arrays.
+
+// This version of vectors requires boogie to be called with `-useArrayTheory`.
+// It is not extensional.
+
+// Currently we just include the basic vector array theory.
+
+{% include "vector-array-theory" %}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-seq-theory.bpl b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-seq-theory.bpl
new file mode 100644
index 000000000..ec94a4f03
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prelude/vector-smt-seq-theory.bpl
@@ -0,0 +1,92 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Boogie model for vectors, based on Z3 sequences.
+//
+// This version of vectors has extensional equality.
+//
+// This implementation works to some extend but has been so far been much slower/times out compared to
+// non-extensional array versions, even though the later require stratified custom equality.
+//
+// Major issues seem to be:
+//
+// (a) UpdateVec, SwapVec etc. are slow. UpdateVec requires a ConcatVec of two SliceVec.
+// (b) ReverseVec needs to be fully axiomatized with quantifiers which makes it infeasible
+//     to work in practice.
+
+type {:builtin "Seq"} Vec _;
+
+function {:builtin "seq.empty"} EmptyVec<T>(): Vec T;
+
+function {:builtin "seq.unit"} MakeVec1<T>(v: T): Vec T;
+
+function {:inline} MakeVec2<T>(v1: T, v2: T): Vec T {
+    ConcatVec(MakeVec1(v1), MakeVec1(v2))
+}
+
+function {:inline} MakeVec3<T>(v1: T, v2: T, v3: T): Vec T {
+    ConcatVec(MakeVec2(v1, v2), MakeVec1(v3))
+}
+
+function {:inline} MakeVec4<T>(v1: T, v2: T, v3: T, v4: T): Vec T {
+    ConcatVec(MakeVec3(v1, v2, v3), MakeVec1(v4))
+}
+
+function {:inline} ExtendVec<T>(v: Vec T, elem: T): Vec T {
+    ConcatVec(v, MakeVec1(elem))
+}
+
+function {:builtin "seq.nth"} ReadVec<T>(v: Vec T, i: int): T;
+
+function {:builtin "seq.len"} LenVec<T>(v: Vec T): int;
+
+function {:inline} IsEmptyVec<T>(v: Vec T): bool {
+    LenVec(v) == 0
+}
+
+function {:inline} RemoveVec<T>(v: Vec T): Vec T {
+    SliceVec(v, 0, LenVec(v) - 1)
+}
+
+function {:inline} RemoveAtVec<T>(v: Vec T, i: int): Vec T {
+    ConcatVec(SliceVec(v, 0, i), SliceVec(v, i + 1, LenVec(v)))
+}
+
+function {:builtin "seq.++"} ConcatVec<T>(v1: Vec T, v2: Vec T): Vec T;
+/*private*/ function {:builtin "seq.++"} ConcatVec3<T>(v1: Vec T, v2: Vec T, v3: Vec T): Vec T;
+/*private*/ function {:builtin "seq.++"} ConcatVec4<T>(v1: Vec T, v2: Vec T, v3: Vec T, v4: Vec T): Vec T;
+/*private*/ function {:builtin "seq.++"} ConcatVec5<T>(v1: Vec T, v2: Vec T, v3: Vec T, v4: Vec T, v5: Vec T): Vec T;
+
+function {:inline} ReverseVec<T>(v: Vec T): Vec T;
+axiom {:ctor "Vec"} (forall<T> v: Vec T:: {ReverseVec(v)}
+        (var r := ReverseVec(v);
+         LenVec(r) == LenVec(v) &&
+         (forall i: int:: {ReadVec(r, i)} i >= 0 && i < LenVec(r) ==> ReadVec(r, i) == ReadVec(v, LenVec(v) - i - 1))));
+
+function {:inline} SliceVec<T>(v: Vec T, i: int, j: int): Vec T {
+    ExtractVec(v, i, j - i)
+}
+/*private*/ function {:builtin "seq.extract"} ExtractVec<T>(v: Vec T, start: int, len: int): Vec T;
+
+function {:inline} UpdateVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    ConcatVec3(SliceVec(v, 0, i), MakeVec1(elem), SliceVec(v, i + 1, LenVec(v)))
+}
+
+function {:inline} SwapVec<T>(v: Vec T, i: int, j: int): Vec T {
+    UpdateVec(UpdateVec(v, j, ReadVec(v, i)), i, ReadVec(v, j))
+}
+
+function {:inline} ContainsVec<T>(v: Vec T, e: T): bool {
+    ContainsSubVec(v, MakeVec1(e))
+}
+/*private*/ function {:builtin "seq.contains"} ContainsSubVec<T>(v: Vec T, sub: Vec T): bool;
+
+function {:inline} IndexOfVec<T>(v: Vec T, e: T): int {
+    IndexOfSubVec(v, MakeVec1(e))
+}
+/*private*/ function {:builtin "seq.indexof"} IndexOfSubVec<T>(v: Vec T, sub: Vec T): int;
+
+function {:inline} InRangeVec<T>(v: Vec T, i: int): bool {
+    i >= 0 && i < LenVec(v)
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/prover_task_runner.rs b/vendors/move/crates/move-prover-boogie-backend/src/prover_task_runner.rs
new file mode 100644
index 000000000..1227896fe
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/prover_task_runner.rs
@@ -0,0 +1,239 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Prover task runner that runs multiple instances of the prover task and returns
+//! as soon as the fastest instance finishes.
+
+use crate::options::BoogieOptions;
+use async_trait::async_trait;
+use futures::{future::FutureExt, pin_mut, select};
+use log::debug;
+use rand::Rng;
+use regex::Regex;
+use std::{
+    process::Output,
+    sync::{
+        mpsc::{channel, RecvTimeoutError, Sender},
+        Arc,
+    },
+    time::Duration,
+};
+use tokio::{
+    process::Command,
+    sync::{broadcast, broadcast::Receiver, Semaphore},
+};
+
+#[derive(Debug, Clone)]
+enum BroadcastMsg {
+    Stop,
+}
+
+const MAX_PERMITS: usize = usize::MAX >> 4;
+
+#[async_trait]
+pub trait ProverTask {
+    type TaskResult: Send + 'static;
+    type TaskId: Send + Copy + 'static;
+
+    /// Initialize the task runner given the number of instances.
+    fn init(&mut self, num_instances: usize) -> Vec<Self::TaskId>;
+
+    /// Run the task with task_id. This function will be called from one of the worker threads.
+    async fn run(&mut self, task_id: Self::TaskId, sem: Arc<Semaphore>) -> Self::TaskResult;
+
+    /// Returns whether the task result is considered successful.
+    fn is_success(&self, task_result: &Self::TaskResult) -> bool;
+
+    /// Returns a task result used for representing a hard timeout
+    fn make_timeout(&self) -> (Self::TaskId, Self::TaskResult);
+}
+
+pub struct ProverTaskRunner();
+
+impl ProverTaskRunner {
+    /// Run `num_instances` instances of the prover `task` and returns the task id
+    /// as well as the result of the fastest running instance.
+    pub fn run_tasks<T>(
+        mut task: T,
+        num_instances: usize,
+        sequential: bool,
+        hard_timeout_secs: u64,
+    ) -> (T::TaskId, T::TaskResult)
+    where
+        T: ProverTask + Clone + Send + 'static,
+    {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .unwrap();
+        let sem = if sequential {
+            Arc::new(Semaphore::new(1))
+        } else {
+            Arc::new(Semaphore::new(MAX_PERMITS))
+        };
+        // Create channels for communication.
+        let (worker_tx, master_rx) = channel();
+        let (master_tx, _): (
+            tokio::sync::broadcast::Sender<BroadcastMsg>,
+            Receiver<BroadcastMsg>,
+        ) = broadcast::channel(num_instances);
+
+        // Initialize the prover tasks.
+        let task_ids = task.init(num_instances);
+        for task_id in task_ids {
+            let s = sem.clone();
+            let send_n = worker_tx.clone();
+            let worker_rx = master_tx.subscribe();
+            let cloned_task = task.clone();
+            // Spawn a task worker for each task_id.
+            rt.spawn(async move {
+                Self::run_task_until_cancelled(cloned_task, task_id, send_n, worker_rx, s).await;
+            });
+        }
+        let mut num_working_instances = num_instances;
+        // Listens until one of the workers finishes.
+        loop {
+            // Result received from one worker.
+            let timeout = Duration::from_secs(if hard_timeout_secs > 0 {
+                hard_timeout_secs
+            } else {
+                u64::MAX
+            });
+            let res = master_rx.recv_timeout(timeout);
+            match res {
+                Ok((task_id, result)) => {
+                    if num_working_instances == 1 {
+                        return (task_id, result);
+                    } else if task.is_success(&result) {
+                        // Result is successful. Broadcast to other workers
+                        // so they can stop working.
+                        let _ = master_tx.send(BroadcastMsg::Stop);
+                        return (task_id, result);
+                    }
+                    debug!("previous instance failed, waiting for another worker to report...");
+                    num_working_instances = usize::saturating_add(num_working_instances, 1);
+                }
+                Err(RecvTimeoutError::Timeout) => {
+                    // recv timeout, i.e. boogie/underlying solver is hanging
+                    let _ = master_tx.send(BroadcastMsg::Stop);
+                    debug!(
+                        "prover task exceeded hard timeout of {}s",
+                        hard_timeout_secs
+                    );
+                    return task.make_timeout();
+                }
+                _ => {}
+            }
+        }
+    }
+
+    // Run two async tasks, listening on broadcast channel and running the task, until
+    // either the task finishes running, or a stop message is received.
+    async fn run_task_until_cancelled<T>(
+        mut task: T,
+        task_id: T::TaskId,
+        tx: Sender<(T::TaskId, T::TaskResult)>,
+        rx: Receiver<BroadcastMsg>,
+        sem: Arc<Semaphore>,
+    ) where
+        T: ProverTask,
+    {
+        let task_fut = task.run(task_id, sem).fuse();
+        let watchdog_fut = Self::watchdog(rx).fuse();
+        pin_mut!(task_fut, watchdog_fut);
+        select! {
+            _ = watchdog_fut => {
+                // A stop message is received.
+            }
+            res = task_fut => {
+                // Task finishes running, send the result to parent thread.
+                let _ = tx.send((task_id, res));
+            },
+        }
+    }
+
+    /// Waits for a stop message from the parent thread.
+    async fn watchdog(mut rx: Receiver<BroadcastMsg>) {
+        let _ = rx.recv().await;
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct RunBoogieWithSeeds {
+    pub options: BoogieOptions,
+    pub boogie_file: String,
+}
+
+#[async_trait]
+impl ProverTask for RunBoogieWithSeeds {
+    type TaskResult = std::io::Result<Output>;
+    type TaskId = usize;
+
+    fn init(&mut self, num_instances: usize) -> Vec<Self::TaskId> {
+        // If we are running only one Boogie instance, use the default random seed.
+        if num_instances == 1 {
+            return vec![self.options.random_seed];
+        }
+        let mut rng = rand::thread_rng();
+        // Otherwise generate a list of random numbers to use as seeds.
+        (0..num_instances)
+            .map(|_| rng.gen::<u8>() as usize)
+            .collect()
+    }
+
+    async fn run(&mut self, task_id: Self::TaskId, sem: Arc<Semaphore>) -> Self::TaskResult {
+        let _guard = sem.acquire().await;
+        let args = self
+            .get_boogie_command(task_id)
+            .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+        debug!("running Boogie command with seed {}", task_id);
+        Command::new(&args[0])
+            .args(&args[1..])
+            .kill_on_drop(true)
+            .output()
+            .await
+    }
+
+    fn is_success(&self, task_result: &Self::TaskResult) -> bool {
+        match task_result {
+            Ok(res) => {
+                if !res.status.success() {
+                    return false;
+                }
+                let output = String::from_utf8_lossy(&res.stdout);
+                self.contains_compilation_error(&output) || !self.contains_timeout(&output)
+            }
+            Err(_) => true, // Count this as success so we terminate everything else
+        }
+    }
+
+    fn make_timeout(&self) -> (Self::TaskId, Self::TaskResult) {
+        (0, Err(std::io::Error::from(std::io::ErrorKind::TimedOut)))
+    }
+}
+
+impl RunBoogieWithSeeds {
+    /// Returns command line to call boogie.
+    pub fn get_boogie_command(&mut self, seed: usize) -> anyhow::Result<Vec<String>> {
+        self.options
+            .boogie_flags
+            .push(format!("-proverOpt:O:smt.random_seed={}", seed));
+        self.options.get_boogie_command(&self.boogie_file)
+    }
+
+    /// Returns whether the output string contains any Boogie compilation errors.
+    fn contains_compilation_error(&self, output: &str) -> bool {
+        let regex =
+            Regex::new(r"(?m)^.*\((?P<line>\d+),(?P<col>\d+)\).*(Error:|error:).*$").unwrap();
+        regex.is_match(output)
+    }
+
+    /// Returns whether the output string contains any Boogie timeouts/inconclusiveness.
+    fn contains_timeout(&self, output: &str) -> bool {
+        let regex =
+            Regex::new(r"(?m)^.*\((?P<line>\d+),(?P<col>\d+)\).*Verification.*(inconclusive|out of resource|timed out).*$")
+                .unwrap();
+        regex.is_match(output)
+    }
+}
diff --git a/vendors/move/crates/move-prover-boogie-backend/src/spec_translator.rs b/vendors/move/crates/move-prover-boogie-backend/src/spec_translator.rs
new file mode 100644
index 000000000..527cfcfd9
--- /dev/null
+++ b/vendors/move/crates/move-prover-boogie-backend/src/spec_translator.rs
@@ -0,0 +1,1780 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module translates specification conditions to Boogie code.
+
+use std::{
+    cell::RefCell,
+    collections::{BTreeSet, HashMap},
+    rc::Rc,
+};
+
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+
+use move_model::{
+    ast::{
+        Exp, ExpData, LocalVarDecl, MemoryLabel, Operation, QuantKind, SpecFunDecl, SpecVarDecl,
+        TempIndex, Value,
+    },
+    code_writer::CodeWriter,
+    emit, emitln,
+    model::{
+        FieldId, GlobalEnv, Loc, ModuleEnv, ModuleId, NodeId, QualifiedInstId, SpecFunId,
+        SpecVarId, StructId,
+    },
+    pragmas::INTRINSIC_TYPE_MAP,
+    symbol::Symbol,
+    ty::{PrimitiveType, Type},
+    well_known::{TYPE_INFO_SPEC, TYPE_NAME_GET_SPEC, TYPE_NAME_SPEC, TYPE_SPEC_IS_STRUCT},
+};
+use move_stackless_bytecode::{
+    mono_analysis::MonoInfo,
+    number_operation::{GlobalNumberOperationState, NumOperation::Bitwise},
+};
+
+use crate::{
+    boogie_helpers::{
+        boogie_address_blob, boogie_bv_type, boogie_byte_blob, boogie_choice_fun_name,
+        boogie_declare_global, boogie_field_sel, boogie_inst_suffix, boogie_modifies_memory_name,
+        boogie_num_type_base, boogie_reflection_type_info, boogie_reflection_type_is_struct,
+        boogie_reflection_type_name, boogie_resource_memory_name, boogie_spec_fun_name,
+        boogie_spec_var_name, boogie_struct_name, boogie_type, boogie_type_suffix,
+        boogie_type_suffix_bv, boogie_value_blob, boogie_well_formed_expr,
+        boogie_well_formed_expr_bv,
+    },
+    options::BoogieOptions,
+};
+
+#[derive(Clone)]
+pub struct SpecTranslator<'env> {
+    /// The global environment.
+    env: &'env GlobalEnv,
+    /// Options passed into the translator.
+    options: &'env BoogieOptions,
+    /// The code writer.
+    writer: &'env CodeWriter,
+    /// If we are translating in the context of a type instantiation, the type arguments.
+    type_inst: Vec<Type>,
+    /// Counter for creating new variables.
+    fresh_var_count: RefCell<usize>,
+    /// Information about lifted choice expressions. Each choice expression in the
+    /// original program is uniquely identified by the choice expression AST (verbatim),
+    /// which includes the node id of the expression.
+    ///
+    /// This allows us to capture duplication of expressions and map them to the same uninterpreted
+    /// choice function. If an expression is duplicated and then later specialized by a type
+    /// instantiation, it will have a different node id, but again the same instantiations
+    /// map to the same node id, which is the desired semantics.
+    lifted_choice_infos: Rc<RefCell<HashMap<(ExpData, Vec<Type>), LiftedChoiceInfo>>>,
+}
+
+/// A struct which contains information about a lifted choice expression (like `some x:int: p(x)`).
+/// Those expressions are replaced by a call to an axiomatized function which is generated from
+/// this info at the end of translation.
+#[derive(Clone)]
+struct LiftedChoiceInfo {
+    id: usize,
+    node_id: NodeId,
+    kind: QuantKind,
+    free_vars: Vec<(Symbol, Type)>,
+    used_temps: Vec<(TempIndex, Type)>,
+    used_memory: Vec<(QualifiedInstId<StructId>, Option<MemoryLabel>)>,
+    var: Symbol,
+    range: Exp,
+    condition: Exp,
+}
+
+impl<'env> SpecTranslator<'env> {
+    /// Creates a translator.
+    pub fn new(
+        writer: &'env CodeWriter,
+        env: &'env GlobalEnv,
+        options: &'env BoogieOptions,
+    ) -> Self {
+        Self {
+            env,
+            options,
+            writer,
+            type_inst: vec![],
+            fresh_var_count: Default::default(),
+            lifted_choice_infos: Default::default(),
+        }
+    }
+
+    /// Emits a translation error.
+    pub fn error(&self, loc: &Loc, msg: &str) {
+        self.env.error(loc, &format!("[boogie translator] {}", msg));
+    }
+
+    /// Sets the location of the code writer from node id.
+    fn set_writer_location(&self, node_id: NodeId) {
+        self.writer.set_location(&self.env.get_node_loc(node_id));
+    }
+
+    /// Generates a fresh variable name.
+    fn fresh_var_name(&self, prefix: &str) -> String {
+        let mut fvc_ref = self.fresh_var_count.borrow_mut();
+        let name_str = format!("${}_{}", prefix, *fvc_ref);
+        *fvc_ref = usize::saturating_add(*fvc_ref, 1);
+        name_str
+    }
+
+    /// Translates a sequence of items separated by `sep`.
+    fn translate_seq<T, F>(&self, items: impl Iterator<Item = T>, sep: &str, f: F)
+    where
+        F: Fn(T),
+    {
+        let mut first = true;
+        for item in items {
+            if first {
+                first = false;
+            } else {
+                emit!(self.writer, sep);
+            }
+            f(item);
+        }
+    }
+}
+
+// Axioms
+// ======
+
+impl<'env> SpecTranslator<'env> {
+    pub fn translate_axioms(&self, env: &GlobalEnv, mono_info: &MonoInfo) {
+        let type_display_ctx = env.get_type_display_ctx();
+        for (axiom, type_insts) in &mono_info.axioms {
+            for type_inst in type_insts {
+                self.writer.set_location(&axiom.loc);
+                emit!(self.writer, "// axiom {}", axiom.loc.display(env));
+                if !type_inst.is_empty() {
+                    emitln!(
+                        self.writer,
+                        ", instance <{}>",
+                        type_inst
+                            .iter()
+                            .map(|t| t.display(&type_display_ctx).to_string())
+                            .join(", ")
+                    );
+                } else {
+                    emitln!(self.writer);
+                }
+                emit!(self.writer, "axiom ");
+                self.translate(&axiom.exp, type_inst);
+                emitln!(self.writer, ";\n");
+            }
+        }
+    }
+}
+
+// Specification Variables
+// =======================
+
+impl<'env> SpecTranslator<'env> {
+    pub fn translate_spec_vars(&self, module_env: &ModuleEnv<'_>, mono_info: &MonoInfo) {
+        let empty = &BTreeSet::new();
+        let mut translated = BTreeSet::new();
+        for (id, var) in module_env.get_spec_vars() {
+            for type_inst in mono_info
+                .spec_vars
+                .get(&module_env.get_id().qualified(*id))
+                .unwrap_or(empty)
+                .iter()
+                .cloned()
+            {
+                let name = boogie_spec_var_name(
+                    module_env,
+                    module_env.get_spec_var(*id).name,
+                    &type_inst,
+                    &None,
+                );
+                if !translated.insert(name) {
+                    continue;
+                }
+                if type_inst.is_empty() {
+                    self.translate_spec_var(module_env, *id, var);
+                } else {
+                    SpecTranslator {
+                        type_inst,
+                        ..self.clone()
+                    }
+                    .translate_spec_var(module_env, *id, var);
+                }
+            }
+        }
+    }
+
+    pub fn translate_spec_var(
+        &self,
+        module_env: &ModuleEnv<'_>,
+        _id: SpecVarId,
+        var: &SpecVarDecl,
+    ) {
+        emitln!(self.writer, "// spec var {}", var.loc.display(self.env));
+        let boogie_name = boogie_spec_var_name(module_env, var.name, &self.type_inst, &None);
+        emitln!(
+            self.writer,
+            &boogie_declare_global(self.env, &boogie_name, &self.inst(&var.type_))
+        );
+    }
+}
+
+// Specification Functions
+// =======================
+
+impl<'env> SpecTranslator<'env> {
+    pub fn translate_spec_funs(&self, module_env: &ModuleEnv<'_>, mono_info: &MonoInfo) {
+        let empty = &BTreeSet::new();
+        let mut translated = BTreeSet::new();
+        for (id, fun) in module_env.get_spec_funs() {
+            for type_inst in mono_info
+                .spec_funs
+                .get(&module_env.get_id().qualified(*id))
+                .unwrap_or(empty)
+                .iter()
+                .cloned()
+            {
+                let name = boogie_spec_fun_name(module_env, *id, &type_inst, false);
+                if !translated.insert(name) {
+                    continue;
+                }
+                if type_inst.is_empty() {
+                    self.translate_spec_fun(module_env, *id, fun);
+                } else {
+                    let new_spec_trans = SpecTranslator {
+                        type_inst,
+                        ..self.clone()
+                    };
+                    new_spec_trans.translate_spec_fun(module_env, *id, fun);
+                }
+            }
+        }
+    }
+
+    fn translate_spec_fun(&self, module_env: &ModuleEnv, id: SpecFunId, fun: &SpecFunDecl) {
+        if fun.body.is_none() && !fun.uninterpreted {
+            // This function is native and expected to be found in the prelude.
+            return;
+        }
+        if fun.is_move_fun && fun.is_native {
+            // This function is a native Move function and its spec version is
+            // expected to be found in the prelude.
+            return;
+        }
+        if fun.is_move_fun && !module_env.spec_fun_is_used(id) {
+            // This function is a pure Move function but is never used,
+            // so we don't need to translate it.
+            return;
+        }
+        if let Type::Tuple(..) | Type::Fun(..) = fun.result_type {
+            self.error(&fun.loc, "function or tuple result type not yet supported");
+            return;
+        }
+        let recursive = self
+            .env
+            .is_spec_fun_recursive(module_env.get_id().qualified(id));
+        emitln!(
+            self.writer,
+            "// {}spec fun {}",
+            if recursive { "recursive " } else { "" },
+            fun.loc.display(self.env)
+        );
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let bv_flag_result = if global_state
+            .spec_fun_operation_map
+            .contains_key(&(module_env.get_id(), id))
+        {
+            let ret_oper_map = &global_state
+                .spec_fun_operation_map
+                .get(&(module_env.get_id(), id))
+                .unwrap()
+                .1;
+            ret_oper_map[0] == Bitwise
+        } else {
+            false
+        };
+        let ty_str_fn = |bv_flag: bool| {
+            if bv_flag {
+                boogie_bv_type
+            } else {
+                boogie_type
+            }
+        };
+        let result_type = ty_str_fn(bv_flag_result)(self.env, &self.inst(&fun.result_type));
+        // it is possible that the spec fun may refer to the same memory after monomorphization,
+        // (e.g., one via concrete type and the other via type parameter being instantiated).
+        // In this case, we mark the other parameter as unused
+        let mut mem_inst_seen = BTreeSet::new();
+        let mem_params = fun.used_memory.iter().map(|memory| {
+            let memory = memory.to_owned().instantiate(&self.type_inst);
+            let struct_env = &self.env.get_struct_qid(memory.to_qualified_id());
+            let param_repr = format!(
+                "{}: $Memory {}",
+                boogie_resource_memory_name(self.env, &memory, &None),
+                boogie_struct_name(struct_env, &memory.inst)
+            );
+            if mem_inst_seen.insert(memory) {
+                param_repr
+            } else {
+                format!("__unused_{}", param_repr)
+            }
+        });
+        let params = fun.params.iter().enumerate().map(|(i, (name, ty))| {
+            let bv_flag = if global_state
+                .spec_fun_operation_map
+                .contains_key(&(module_env.get_id(), id))
+            {
+                global_state
+                    .spec_fun_operation_map
+                    .get(&(module_env.get_id(), id))
+                    .unwrap()
+                    .0[i]
+                    == Bitwise
+            } else {
+                false
+            };
+            format!(
+                "{}: {}",
+                name.display(module_env.symbol_pool()),
+                ty_str_fn(bv_flag)(self.env, &self.inst(ty))
+            )
+        });
+        self.writer.set_location(&fun.loc);
+        let boogie_name = boogie_spec_fun_name(module_env, id, &self.type_inst, bv_flag_result);
+        let param_list = mem_params.chain(params).join(", ");
+        let attrs = if fun.uninterpreted || recursive {
+            ""
+        } else {
+            "{:inline}"
+        };
+        emit!(
+            self.writer,
+            "function {} {}({}): {}",
+            attrs,
+            boogie_name,
+            param_list,
+            result_type
+        );
+        if fun.uninterpreted {
+            // Uninterpreted function has no body.
+            emitln!(self.writer, ";");
+            // Emit axiom about return type. Notice we don't need to process spec_var or memory
+            // parameters because an interpreted functions does not have those.
+            let call = format!(
+                "{}({})",
+                boogie_name,
+                fun.params
+                    .iter()
+                    .map(|(n, _)| { format!("{}", n.display(module_env.symbol_pool())) })
+                    .join(", ")
+            );
+            let type_check =
+                boogie_well_formed_expr(self.env, "$$res", &self.inst(&fun.result_type));
+            if !type_check.is_empty() {
+                if !param_list.is_empty() {
+                    emitln!(
+                        self.writer,
+                        "axiom (forall {} ::\n(var $$res := {};\n{}));",
+                        param_list,
+                        call,
+                        type_check
+                    );
+                } else {
+                    emitln!(
+                        self.writer,
+                        "axiom (var $$res := {};\n{});",
+                        call,
+                        type_check
+                    );
+                }
+            }
+        } else {
+            emitln!(self.writer, " {");
+            self.writer.indent();
+            self.translate_exp(fun.body.as_ref().unwrap());
+            emitln!(self.writer);
+            self.writer.unindent();
+            emitln!(self.writer, "}");
+        }
+
+        emitln!(self.writer);
+    }
+}
+
+// Emit any finalization items
+// ============================
+
+impl<'env> SpecTranslator<'env> {
+    pub(crate) fn finalize(&self) {
+        self.translate_choice_functions();
+    }
+
+    /// Translate lifted functions for choice expressions.
+    fn translate_choice_functions(&self) {
+        let env = self.env;
+        let infos_ref = self.lifted_choice_infos.borrow();
+        // need the sorting here because `lifted_choice_infos` is a hashmap while we want
+        // deterministic ordering of the output. Sorting uses the `.id` field, which represents the
+        // insertion order.
+        let infos_sorted_with_keys = infos_ref.iter().sorted_by(|v1, v2| v1.1.id.cmp(&v2.1.id));
+        assert!(self.type_inst.is_empty());
+        for (key, info) in infos_sorted_with_keys {
+            let fun_name = boogie_choice_fun_name(info.id);
+            let result_ty = &env.get_node_type(info.node_id);
+            let exp_loc = env.get_node_loc(info.node_id);
+            let var_name = info.var.display(env.symbol_pool()).to_string();
+            self.writer.set_location(&exp_loc);
+
+            let new_spec_trans = SpecTranslator {
+                type_inst: key.1.clone(),
+                ..self.clone()
+            };
+
+            // Pairs of context parameter names and boogie types
+            let param_decls = info
+                .free_vars
+                .iter()
+                .map(|(s, ty)| {
+                    (
+                        s.display(env.symbol_pool()).to_string(),
+                        boogie_type(env, ty.skip_reference()),
+                    )
+                })
+                .chain(
+                    info.used_temps
+                        .iter()
+                        .map(|(t, ty)| (format!("$t{}", t), boogie_type(env, ty.skip_reference()))),
+                )
+                .chain(info.used_memory.iter().map(|(m, l)| {
+                    let struct_env = &env.get_struct(m.to_qualified_id());
+                    (
+                        boogie_resource_memory_name(env, m, l),
+                        format!("$Memory {}", boogie_struct_name(struct_env, &m.inst)),
+                    )
+                }))
+                .collect_vec();
+            // Pair of choice variable name and type.
+            let var_decl = (var_name, boogie_type(env, result_ty));
+
+            // Helper functions
+            let mk_decl = |(n, t): &(String, String)| format!("{}: {}", n, t);
+            let mk_arg = |(n, _): &(String, String)| n.to_owned();
+            let emit_valid = |n: &str, ty: &Type| {
+                let suffix = boogie_type_suffix(env, ty.skip_reference());
+                emit!(new_spec_trans.writer, "$IsValid'{}'({})", suffix, n);
+            };
+            let mk_temp = |t: TempIndex| format!("$t{}", t);
+
+            emitln!(
+                new_spec_trans.writer,
+                "// choice expression {}",
+                exp_loc.display(new_spec_trans.env)
+            );
+
+            // Emit predicate function characterizing the choice.
+            emitln!(
+                new_spec_trans.writer,
+                "function {{:inline}} {}_pred({}): bool {{",
+                fun_name,
+                vec![&var_decl]
+                    .into_iter()
+                    .chain(param_decls.iter())
+                    .map(mk_decl)
+                    .join(", ")
+            );
+            new_spec_trans.writer.indent();
+            emit_valid(&var_decl.0, result_ty);
+            match env.get_node_type(info.range.node_id()) {
+                Type::Vector(..) => {
+                    emit!(new_spec_trans.writer, " && InRangeVec(");
+                    new_spec_trans.translate_exp(&info.range);
+                    emit!(new_spec_trans.writer, ", {})", &var_decl.0);
+                }
+                Type::Primitive(PrimitiveType::Range) => {
+                    emit!(new_spec_trans.writer, " && $InRange(");
+                    new_spec_trans.translate_exp(&info.range);
+                    emit!(new_spec_trans.writer, ", {})", &var_decl.0);
+                }
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::Struct(_, _, _)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::TypeDomain(_)
+                | Type::ResourceDomain(_, _, _)
+                | Type::Error
+                | Type::Var(_) => {}
+            }
+            emitln!(new_spec_trans.writer, " &&");
+            new_spec_trans.translate_exp(&info.condition);
+            new_spec_trans.writer.unindent();
+            emitln!(new_spec_trans.writer, "\n}");
+            // Create call to predicate
+            let predicate = format!(
+                "{}_pred({})",
+                fun_name,
+                vec![&var_decl]
+                    .into_iter()
+                    .chain(param_decls.iter())
+                    .map(mk_arg)
+                    .join(", ")
+            );
+
+            // Emit choice function
+            emitln!(
+                new_spec_trans.writer,
+                "function {}({}): {};",
+                fun_name,
+                param_decls.iter().map(mk_decl).join(", "),
+                boogie_type(env, result_ty)
+            );
+            // Create call to choice function
+            let choice = format!(
+                "{}({})",
+                fun_name,
+                param_decls.iter().map(mk_arg).join(", ")
+            );
+
+            // Emit choice axiom
+            if !param_decls.is_empty() {
+                emit!(
+                    new_spec_trans.writer,
+                    "axiom (forall {}:: ",
+                    param_decls.iter().map(mk_decl).join(", ")
+                );
+                if !info.free_vars.is_empty() || !info.used_temps.is_empty() {
+                    // TODO: IsValid for memory?
+                    let mut sep = "";
+                    for (s, ty) in &info.free_vars {
+                        emit!(new_spec_trans.writer, sep);
+                        emit_valid(env.symbol_pool().string(*s).as_ref(), ty);
+                        sep = " && ";
+                    }
+                    for (t, ty) in &info.used_temps {
+                        emit!(new_spec_trans.writer, sep);
+                        emit_valid(&mk_temp(*t), ty);
+                        sep = " && ";
+                    }
+                    emitln!(new_spec_trans.writer, " ==>");
+                }
+            } else {
+                emitln!(new_spec_trans.writer, "axiom");
+            }
+            new_spec_trans.writer.indent();
+            emitln!(
+                new_spec_trans.writer,
+                "(exists {}:: {}) ==> ",
+                mk_decl(&var_decl),
+                predicate
+            );
+            emitln!(
+                new_spec_trans.writer,
+                "(var {} := {}; {}",
+                &var_decl.0,
+                choice,
+                predicate
+            );
+
+            // Emit min constraint
+            if info.kind == QuantKind::ChooseMin {
+                // Check whether we support min on the range type.
+                if !result_ty.is_number() && !result_ty.is_signer_or_address() {
+                    env.error(
+                        &env.get_node_loc(info.node_id),
+                        "The min choice can only be applied to numbers, addresses, or signers",
+                    )
+                }
+                // Add the condition that there does not exist a smaller satisfying value.
+                emit!(new_spec_trans.writer, " && (var $$c := {}; ", &var_decl.0);
+                emit!(
+                    new_spec_trans.writer,
+                    "(forall {}:: {} < $$c ==> !{}))",
+                    mk_decl(&var_decl),
+                    &var_decl.0,
+                    predicate
+                );
+            }
+            new_spec_trans.writer.unindent();
+            if !param_decls.is_empty() {
+                emit!(new_spec_trans.writer, ")");
+            }
+            emitln!(new_spec_trans.writer, ");\n");
+        }
+    }
+}
+
+// Expressions
+// ===========
+
+impl<'env> SpecTranslator<'env> {
+    pub(crate) fn translate(&self, exp: &Exp, type_inst: &[Type]) {
+        *self.fresh_var_count.borrow_mut() = 0;
+        if type_inst.is_empty() {
+            self.translate_exp(exp)
+        } else {
+            // Use a clone with the given type instantiation.
+            let mut trans = self.clone();
+            trans.type_inst = type_inst.to_owned();
+            trans.translate_exp(exp)
+        }
+    }
+
+    fn inst(&self, ty: &Type) -> Type {
+        ty.instantiate(&self.type_inst)
+    }
+
+    fn inst_slice(&self, tys: &[Type]) -> Vec<Type> {
+        Type::instantiate_slice(tys, &self.type_inst)
+    }
+
+    fn get_node_type(&self, id: NodeId) -> Type {
+        self.inst(&self.env.get_node_type(id))
+    }
+
+    fn get_node_instantiation(&self, id: NodeId) -> Vec<Type> {
+        self.inst_slice(&self.env.get_node_instantiation(id))
+    }
+
+    fn translate_exp(&self, exp: &Exp) {
+        match exp.as_ref() {
+            ExpData::Value(node_id, val) => {
+                self.set_writer_location(*node_id);
+                self.translate_value(*node_id, val);
+            }
+            ExpData::LocalVar(node_id, name) => {
+                self.set_writer_location(*node_id);
+                self.translate_local_var(*node_id, *name);
+            }
+            ExpData::Temporary(node_id, idx) => {
+                self.set_writer_location(*node_id);
+                self.translate_temporary(*node_id, *idx);
+            }
+            ExpData::Call(node_id, oper, args) => {
+                self.set_writer_location(*node_id);
+                self.translate_call(*node_id, oper, args);
+            }
+            ExpData::Invoke(node_id, ..) => {
+                self.error(&self.env.get_node_loc(*node_id), "Invoke not yet supported")
+            }
+            ExpData::Lambda(node_id, ..) => self.error(
+                &self.env.get_node_loc(*node_id),
+                "`|x|e` (lambda) currently only supported as argument for `all` or `any`",
+            ),
+            ExpData::Quant(node_id, kind, ranges, _, _, exp) if kind.is_choice() => {
+                // The parser ensures that len(ranges) = 1 and triggers and condition are
+                // not present.
+                self.set_writer_location(*node_id);
+                self.translate_choice(*node_id, *kind, &ranges[0], exp)
+            }
+            ExpData::Quant(node_id, kind, ranges, triggers, condition, exp) => {
+                self.set_writer_location(*node_id);
+                self.translate_quant(*node_id, *kind, ranges, triggers, condition, exp)
+            }
+            ExpData::Block(node_id, vars, scope) => {
+                self.set_writer_location(*node_id);
+                self.translate_block(vars, scope)
+            }
+            ExpData::IfElse(node_id, cond, on_true, on_false) => {
+                self.set_writer_location(*node_id);
+                // The whole ITE is one expression so we wrap it with a parenthesis
+                emit!(self.writer, "(");
+                emit!(self.writer, "if ");
+                self.translate_exp_parenthesised(cond);
+                emit!(self.writer, " then ");
+                self.translate_exp_parenthesised(on_true);
+                emit!(self.writer, " else ");
+                self.translate_exp_parenthesised(on_false);
+                emit!(self.writer, ")");
+            }
+            ExpData::Invalid(_) => panic!("unexpected error expression"),
+        }
+    }
+
+    fn translate_exp_parenthesised(&self, exp: &Exp) {
+        emit!(self.writer, "(");
+        self.translate_exp(exp);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_value(&self, node_id: NodeId, val: &Value) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(node_id);
+        let mut suffix = "".to_string();
+        let bv_flag = num_oper == Bitwise;
+        if bv_flag {
+            suffix = boogie_bv_type(self.env, self.env.get_node_type(node_id).skip_reference());
+        }
+        match val {
+            Value::Address(addr) => emit!(self.writer, "{}", addr),
+            Value::Number(val) => emit!(self.writer, "{}{}", val, suffix),
+            Value::Bool(val) => emit!(self.writer, "{}", val),
+            Value::ByteArray(val) => {
+                emit!(self.writer, &boogie_byte_blob(self.options, val, bv_flag))
+            }
+            Value::AddressArray(val) => emit!(self.writer, &boogie_address_blob(self.options, val)),
+            Value::Vector(val) => emit!(self.writer, &boogie_value_blob(self.options, val)),
+        }
+    }
+
+    fn translate_local_var(&self, _node_id: NodeId, name: Symbol) {
+        emit!(self.writer, "{}", name.display(self.env.symbol_pool()));
+    }
+
+    fn translate_temporary(&self, node_id: NodeId, idx: TempIndex) {
+        let ty = self.get_node_type(node_id);
+        let mut_ref = ty.is_mutable_reference();
+        if mut_ref {
+            emit!(self.writer, "$Dereference(");
+        }
+        emit!(self.writer, "$t{}", idx);
+        if mut_ref {
+            emit!(self.writer, ")")
+        }
+    }
+
+    fn translate_block(&self, vars: &[LocalVarDecl], exp: &Exp) {
+        if vars.is_empty() {
+            return self.translate_exp(exp);
+        }
+        let mut bracket_num = 0;
+        for var in vars {
+            let name_str = self.env.symbol_pool().string(var.name);
+            emit!(self.writer, "(var {} := ", name_str);
+            self.translate_exp(var.binding.as_ref().expect("binding"));
+            emit!(self.writer, "; ");
+            bracket_num += 1;
+        }
+        self.translate_exp(exp);
+        for _n in 0..bracket_num {
+            emit!(self.writer, ")");
+        }
+    }
+
+    fn translate_call(&self, node_id: NodeId, oper: &Operation, args: &[Exp]) {
+        let loc = self.env.get_node_loc(node_id);
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        match oper {
+            // Operators we introduced in the top level public entry `SpecTranslator::translate`,
+            // mapping between Boogies single value domain and our typed world.
+            Operation::BoxValue | Operation::UnboxValue => panic!("unexpected box/unbox"),
+
+            // Internal operators for event stores.
+            Operation::EmptyEventStore => emit!(self.writer, "$EmptyEventStore"),
+            Operation::ExtendEventStore => self.translate_extend_event_store(args),
+            Operation::EventStoreIncludes => self.translate_event_store_includes(args),
+            Operation::EventStoreIncludedIn => self.translate_event_store_included_in(args),
+
+            // Regular expressions
+            Operation::Function(module_id, fun_id, memory_labels) => {
+                self.translate_spec_fun_call(node_id, *module_id, *fun_id, args, memory_labels)
+            }
+            Operation::Pack(mid, sid) => self.translate_pack(node_id, *mid, *sid, args),
+            Operation::Tuple => self.error(&loc, "Tuple not yet supported"),
+            Operation::Select(module_id, struct_id, field_id) => {
+                self.translate_select(node_id, *module_id, *struct_id, *field_id, args)
+            }
+            Operation::UpdateField(module_id, struct_id, field_id) => {
+                self.translate_update_field(node_id, *module_id, *struct_id, *field_id, args)
+            }
+            Operation::Result(pos) => {
+                emit!(self.writer, "$ret{}", pos);
+            }
+            Operation::Index => self.translate_primitive_call("ReadVec", args),
+            Operation::Slice => self.translate_primitive_call("$SliceVecByRange", args),
+            Operation::Range => self.translate_primitive_call("$Range", args),
+
+            // Binary operators
+            Operation::Add => self.translate_op("+", "Add", args),
+            Operation::Sub => self.translate_op("-", "Sub", args),
+            Operation::Mul => self.translate_op("*", "Mul", args),
+            Operation::Mod => self.translate_op("mod", "Mod", args),
+            Operation::Div => self.translate_op("div", "Div", args),
+            Operation::BitOr => self.translate_bit_op("$Or", args),
+            Operation::BitAnd => self.translate_bit_op("$And", args),
+            Operation::Xor => self.translate_bit_op("$Xor", args),
+            Operation::Shl => self.translate_primitive_call_shl("$shl", args),
+            Operation::Shr => self.translate_primitive_call_shr("$shr", args),
+            Operation::Implies => self.translate_logical_op("==>", args),
+            Operation::Iff => self.translate_logical_op("<==>", args),
+            Operation::And => self.translate_logical_op("&&", args),
+            Operation::Or => self.translate_logical_op("||", args),
+            Operation::Lt => self.translate_op("<", "Lt", args),
+            Operation::Le => self.translate_op("<=", "Le", args),
+            Operation::Gt => self.translate_op(">", "Gt", args),
+            Operation::Ge => self.translate_op(">=", "Ge", args),
+            Operation::Identical => self.translate_identical(args),
+            Operation::Eq => self.translate_eq_neq("$IsEqual", args),
+            Operation::Neq => self.translate_eq_neq("!$IsEqual", args),
+
+            // Unary operators
+            Operation::Not => self.translate_logical_unary_op("!", args),
+            Operation::Cast => self.translate_cast(node_id, args),
+            Operation::Int2Bv => {
+                let exp_arith_flag = global_state.get_node_num_oper(args[0].node_id()) != Bitwise;
+                if exp_arith_flag {
+                    let arg_node_type = self.env.get_node_type(args[0].node_id());
+                    let literal = boogie_num_type_base(&arg_node_type);
+                    emit!(self.writer, "$int2bv.{}(", literal);
+                }
+                self.translate_exp(&args[0]);
+                if exp_arith_flag {
+                    emit!(self.writer, ")");
+                }
+            }
+            Operation::Bv2Int => {
+                let exp_bv_flag = global_state.get_node_num_oper(args[0].node_id()) == Bitwise;
+                if exp_bv_flag {
+                    let arg_node_type = self.env.get_node_type(args[0].node_id());
+                    let literal = boogie_num_type_base(&arg_node_type);
+                    emit!(self.writer, "$bv2int.{}(", literal);
+                }
+                self.translate_exp(&args[0]);
+                if exp_bv_flag {
+                    emit!(self.writer, ")");
+                }
+            }
+            // Builtin functions
+            Operation::Global(memory_label) => {
+                self.translate_resource_access(node_id, args, memory_label)
+            }
+            Operation::Exists(memory_label) => {
+                self.translate_resource_exists(node_id, args, memory_label)
+            }
+            Operation::CanModify => self.translate_can_modify(node_id, args),
+            Operation::Len => self.translate_primitive_call("LenVec", args),
+            Operation::TypeValue => self.translate_type_value(node_id),
+            Operation::TypeDomain | Operation::ResourceDomain => self.error(
+                &loc,
+                "domain functions can only be used as the range of a quantifier",
+            ),
+            Operation::UpdateVec => self.translate_primitive_call("UpdateVec", args),
+            Operation::ConcatVec => self.translate_primitive_call("ConcatVec", args),
+            Operation::EmptyVec => self.translate_primitive_inst_call(node_id, "$EmptyVec", args),
+            Operation::SingleVec => self.translate_primitive_call("MakeVec1", args),
+            Operation::IndexOfVec => {
+                self.translate_primitive_inst_call(node_id, "$IndexOfVec", args)
+            }
+            Operation::ContainsVec => {
+                self.translate_primitive_inst_call(node_id, "$ContainsVec", args)
+            }
+            Operation::RangeVec => self.translate_primitive_inst_call(node_id, "$RangeVec", args),
+            Operation::InRangeVec => self.translate_primitive_call("InRangeVec", args),
+            Operation::InRangeRange => self.translate_primitive_call("$InRange", args),
+            Operation::MaxU8 => emit!(self.writer, "$MAX_U8"),
+            Operation::MaxU16 => emit!(self.writer, "$MAX_U16"),
+            Operation::MaxU32 => emit!(self.writer, "$MAX_U32"),
+            Operation::MaxU64 => emit!(self.writer, "$MAX_U64"),
+            Operation::MaxU128 => emit!(self.writer, "$MAX_U128"),
+            Operation::MaxU256 => emit!(self.writer, "$MAX_U256"),
+            Operation::WellFormed => self.translate_well_formed(&args[0]),
+            Operation::AbortCode => emit!(self.writer, "$abort_code"),
+            Operation::AbortFlag => emit!(self.writer, "$abort_flag"),
+            Operation::NoOp => { /* do nothing. */ }
+            Operation::Trace(_) => {
+                // An unreduced trace means it has been used in a spec fun or let.
+                // Create an error about this.
+                self.env.error(
+                    &loc,
+                    "currently `TRACE(..)` cannot be used in spec functions or in lets",
+                )
+            }
+            Operation::Old => panic!("operation unexpected: {:?}", oper),
+        }
+    }
+
+    fn translate_event_store_includes(&self, args: &[Exp]) {
+        emit!(
+            self.writer,
+            "(var actual := $EventStore__subtract($es, old($es)); "
+        );
+        emit!(self.writer, "(var expected := ");
+        self.translate_exp(&args[0]);
+        emit!(self.writer, "; $EventStore__is_subset(expected, actual)))");
+    }
+
+    fn translate_event_store_included_in(&self, args: &[Exp]) {
+        emit!(
+            self.writer,
+            "(var actual := $EventStore__subtract($es, old($es)); "
+        );
+        emit!(self.writer, "(var expected := ");
+        self.translate_exp(&args[0]);
+        emit!(self.writer, "; $EventStore__is_subset(actual, expected)))");
+    }
+
+    fn translate_extend_event_store(&self, args: &[Exp]) {
+        let suffix = boogie_type_suffix(self.env, &self.get_node_type(args[1].node_id()));
+        let with_cond = args.len() == 4;
+        if with_cond {
+            emit!(self.writer, "$CondExtendEventStore'{}'(", suffix)
+        } else {
+            emit!(self.writer, "$ExtendEventStore'{}'(", suffix)
+        }
+        self.translate_exp(&args[0]); // event store
+        emit!(self.writer, ", ");
+        // Next expected argument is the handle.
+        self.translate_exp(&args[2]);
+        emit!(self.writer, ", ");
+        // Next comes the event.
+        self.translate_exp(&args[1]);
+        // Next comes the optional condition
+        if with_cond {
+            emit!(self.writer, ", ");
+            self.translate_exp(&args[3]);
+        }
+        emit!(self.writer, ")");
+    }
+
+    fn translate_pack(&self, node_id: NodeId, mid: ModuleId, sid: StructId, args: &[Exp]) {
+        let struct_env = &self.env.get_module(mid).into_struct(sid);
+        let inst = &self.get_node_instantiation(node_id);
+        emit!(self.writer, "{}(", boogie_struct_name(struct_env, inst));
+        let mut sep = "";
+        for arg in args {
+            emit!(self.writer, sep);
+            self.translate_exp(arg);
+            sep = ", ";
+        }
+        emit!(self.writer, ")");
+    }
+
+    fn translate_spec_fun_call(
+        &self,
+        node_id: NodeId,
+        module_id: ModuleId,
+        fun_id: SpecFunId,
+        args: &[Exp],
+        memory_labels: &Option<Vec<MemoryLabel>>,
+    ) {
+        let inst = &self.get_node_instantiation(node_id);
+        let module_env = &self.env.get_module(module_id);
+        let fun_decl = module_env.get_spec_fun(fun_id);
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+
+        // special casing for type reflection
+        let mut processed = false;
+
+        // TODO(mengxu): change it to a better address name instead of extlib
+        if self.env.get_extlib_address() == *module_env.get_name().addr() {
+            let qualified_name = format!(
+                "{}::{}",
+                module_env.get_name().name().display(self.env.symbol_pool()),
+                fun_decl.name.display(self.env.symbol_pool()),
+            );
+            if qualified_name == TYPE_NAME_SPEC {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_name(self.env, &inst[0], false)
+                );
+                processed = true;
+            } else if qualified_name == TYPE_INFO_SPEC {
+                assert_eq!(inst.len(), 1);
+                // TODO(mengxu): by ignoring the first return value of this function, we are
+                // essentially ignoring the condition where this `type_info` call may abort, e.g.,
+                // invoking `type_info` on a primitive type like: `type_info<bool>`.
+                let (_, info) = boogie_reflection_type_info(self.env, &inst[0]);
+                emit!(self.writer, "{}", info);
+                processed = true;
+            } else if qualified_name == TYPE_SPEC_IS_STRUCT {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_is_struct(self.env, &inst[0])
+                );
+                processed = true;
+            }
+        }
+
+        if self.env.get_stdlib_address() == *module_env.get_name().addr() {
+            let qualified_name = format!(
+                "{}::{}",
+                module_env.get_name().name().display(self.env.symbol_pool()),
+                fun_decl.name.display(self.env.symbol_pool()),
+            );
+            if qualified_name == TYPE_NAME_GET_SPEC {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_name(self.env, &inst[0], true)
+                );
+                processed = true;
+            }
+        }
+
+        let is_vector_table_module = module_env.is_std_vector() || module_env.is_table();
+        // regular path
+        if !processed {
+            let bv_flag = if is_vector_table_module && !args.is_empty() {
+                global_state.get_node_num_oper(args[0].node_id()) == Bitwise
+            } else {
+                global_state.get_node_num_oper(node_id) == Bitwise
+            };
+            let name = boogie_spec_fun_name(module_env, fun_id, inst, bv_flag);
+            emit!(self.writer, "{}(", name);
+            let mut first = true;
+            let mut maybe_comma = || {
+                if first {
+                    first = false;
+                } else {
+                    emit!(self.writer, ", ");
+                }
+            };
+            let label_at = |i| memory_labels.as_ref().map(|labels| labels[i]);
+            let mut i = 0;
+            for memory in &fun_decl.used_memory {
+                let memory = &memory.to_owned().instantiate(inst);
+                maybe_comma();
+                let memory = boogie_resource_memory_name(self.env, memory, &label_at(i));
+                emit!(self.writer, &memory);
+                i = usize::saturating_add(i, 1);
+            }
+            for exp in args {
+                maybe_comma();
+                self.translate_exp(exp);
+            }
+            emit!(self.writer, ")");
+        }
+    }
+
+    fn translate_select(
+        &self,
+        node_id: NodeId,
+        module_id: ModuleId,
+        struct_id: StructId,
+        field_id: FieldId,
+        args: &[Exp],
+    ) {
+        let struct_env = self.env.get_module(module_id).into_struct(struct_id);
+        if struct_env.is_native_or_intrinsic() {
+            self.env.error(
+                &self.env.get_node_loc(node_id),
+                "cannot select field of intrinsic struct",
+            );
+        }
+        let struct_type = &self.get_node_type(args[0].node_id());
+        let (_, _, inst) = struct_type.skip_reference().require_struct();
+        let field_env = struct_env.get_field(field_id);
+        emit!(self.writer, "{}(", boogie_field_sel(&field_env, inst));
+        self.translate_exp(&args[0]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_update_field(
+        &self,
+        node_id: NodeId,
+        module_id: ModuleId,
+        struct_id: StructId,
+        field_id: FieldId,
+        args: &[Exp],
+    ) {
+        let struct_env = &self.env.get_module(module_id).into_struct(struct_id);
+        let field_env = struct_env.get_field(field_id);
+        let suffix = boogie_inst_suffix(self.env, &self.get_node_instantiation(node_id));
+        emit!(
+            self.writer,
+            "$Update{}_{}(",
+            suffix,
+            field_env.get_name().display(self.env.symbol_pool())
+        );
+        self.translate_exp(&args[0]);
+        emit!(self.writer, ", ");
+        self.translate_exp(&args[1]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_type_value(&self, node_id: NodeId) {
+        let loc = &self.env.get_node_loc(node_id);
+        self.env
+            .error(loc, "type values not supported by this backend");
+    }
+
+    fn translate_resource_access(
+        &self,
+        node_id: NodeId,
+        args: &[Exp],
+        memory_label: &Option<MemoryLabel>,
+    ) {
+        let memory = &self.get_memory_inst_from_node(node_id);
+        emit!(
+            self.writer,
+            "$ResourceValue({}, ",
+            boogie_resource_memory_name(self.env, memory, memory_label),
+        );
+        self.translate_exp(&args[0]);
+        emit!(self.writer, ")");
+    }
+
+    fn get_memory_inst_from_node(&self, node_id: NodeId) -> QualifiedInstId<StructId> {
+        let mem_ty = &self.get_node_instantiation(node_id)[0];
+        let (mid, sid, inst) = mem_ty.require_struct();
+        mid.qualified_inst(sid, inst.to_owned())
+    }
+
+    fn translate_resource_exists(
+        &self,
+        node_id: NodeId,
+        args: &[Exp],
+        memory_label: &Option<MemoryLabel>,
+    ) {
+        let memory = &self.get_memory_inst_from_node(node_id);
+        emit!(
+            self.writer,
+            "$ResourceExists({}, ",
+            boogie_resource_memory_name(self.env, memory, memory_label),
+        );
+        self.translate_exp(&args[0]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_can_modify(&self, node_id: NodeId, args: &[Exp]) {
+        let memory = &self.get_memory_inst_from_node(node_id);
+        let resource_name = boogie_modifies_memory_name(self.env, memory);
+        emit!(self.writer, "{}[", resource_name);
+
+        let is_signer = self.env.get_node_type(args[0].node_id()).is_signer();
+        if is_signer {
+            emit!(self.writer, "$addr#$signer(");
+        }
+        self.translate_exp(&args[0]);
+        if is_signer {
+            emit!(self.writer, ")");
+        }
+        emit!(self.writer, "]");
+    }
+
+    fn with_range_selector_assignments<F>(
+        &self,
+        ranges: &[(LocalVarDecl, Exp)],
+        range_tmps: &HashMap<Symbol, String>,
+        quant_vars: &HashMap<Symbol, String>,
+        resource_vars: &HashMap<Symbol, String>,
+        f: F,
+    ) where
+        F: Fn(),
+    {
+        // Translate range selectors.
+        for (var, range) in ranges {
+            let var_name = self.env.symbol_pool().string(var.name);
+            let quant_ty = self.get_node_type(range.node_id());
+            match quant_ty.skip_reference() {
+                Type::Vector(_) => {
+                    let range_tmp = range_tmps.get(&var.name).unwrap();
+                    let quant_var = quant_vars.get(&var.name).unwrap();
+                    emit!(
+                        self.writer,
+                        "(var {} := ReadVec({}, {});\n",
+                        var_name,
+                        range_tmp,
+                        quant_var,
+                    );
+                }
+                Type::Primitive(PrimitiveType::Range) => {
+                    let quant_var = quant_vars.get(&var.name).unwrap();
+                    emit!(self.writer, "(var {} := {};\n", var_name, quant_var);
+                }
+                Type::ResourceDomain(mid, sid, inst_opt) => {
+                    let memory = &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_default());
+                    let addr_var = resource_vars.get(&var.name).unwrap();
+                    let resource_name = boogie_resource_memory_name(self.env, memory, &None);
+                    emit!(
+                        self.writer,
+                        "(var {} := $ResourceValue({}, {});\n",
+                        var_name,
+                        resource_name,
+                        addr_var
+                    );
+                }
+                _ => (),
+            }
+        }
+        f();
+        emit!(
+            self.writer,
+            &")".repeat(usize::checked_add(range_tmps.len(), resource_vars.len()).unwrap())
+        );
+    }
+
+    fn translate_quant(
+        &self,
+        _node_id: NodeId,
+        kind: QuantKind,
+        ranges: &[(LocalVarDecl, Exp)],
+        triggers: &[Vec<Exp>],
+        condition: &Option<Exp>,
+        body: &Exp,
+    ) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        assert!(!kind.is_choice());
+        // Translate range expressions. While doing, check for currently unsupported
+        // type quantification
+        let mut range_tmps = HashMap::new();
+        for (var, range) in ranges {
+            let should_bind_range = match self.get_node_type(range.node_id()).skip_reference() {
+                Type::Vector(..) | Type::Primitive(PrimitiveType::Range) => true,
+                Type::Struct(mid, sid, ..) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP)
+                }
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::TypeDomain(_)
+                | Type::ResourceDomain(_, _, _)
+                | Type::Error
+                | Type::Var(_) => false,
+            };
+            if should_bind_range {
+                let range_tmp = self.fresh_var_name("range");
+                emit!(self.writer, "(var {} := ", range_tmp);
+                self.translate_exp(range);
+                emit!(self.writer, "; ");
+                range_tmps.insert(var.name, range_tmp);
+            }
+        }
+        // Translate quantified variables.
+        emit!(self.writer, "({} ", kind);
+        let mut quant_vars = HashMap::new();
+        let mut resource_vars = HashMap::new();
+        let mut comma = "";
+        for (var, range) in ranges {
+            let var_name = self.env.symbol_pool().string(var.name);
+            let quant_ty = self.get_node_type(range.node_id());
+            let num_oper = global_state.get_node_num_oper(range.node_id());
+            let ty_str = |ty: _| {
+                if num_oper == Bitwise {
+                    boogie_bv_type(self.env, ty)
+                } else {
+                    boogie_type(self.env, ty)
+                }
+            };
+            match quant_ty.skip_reference() {
+                Type::TypeDomain(ty) => {
+                    emit!(self.writer, "{}{}: {}", comma, var_name, ty_str(ty));
+                }
+                Type::Struct(mid, sid, targs) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                        emit!(self.writer, "{}{}: {}", comma, var_name, ty_str(&targs[0]));
+                    } else {
+                        panic!("unexpected type");
+                    }
+                }
+                Type::ResourceDomain(..) => {
+                    let addr_quant_var = self.fresh_var_name("a");
+                    emit!(self.writer, "{}{}: int", comma, addr_quant_var);
+                    resource_vars.insert(var.name, addr_quant_var);
+                }
+                _ => {
+                    let quant_var = self.fresh_var_name("i");
+                    emit!(self.writer, "{}{}: int", comma, quant_var);
+                    quant_vars.insert(var.name, quant_var);
+                }
+            }
+            comma = ", ";
+        }
+        emit!(self.writer, " :: ");
+        // Translate triggers.
+        if !triggers.is_empty() {
+            for trigger in triggers {
+                emit!(self.writer, "{");
+                let mut comma = "";
+                for p in trigger {
+                    emit!(self.writer, "{}", comma);
+                    self.with_range_selector_assignments(
+                        ranges,
+                        &range_tmps,
+                        &quant_vars,
+                        &resource_vars,
+                        || {
+                            self.translate_exp(p);
+                        },
+                    );
+                    comma = ",";
+                }
+                emit!(self.writer, "}");
+            }
+        } else {
+            // Implicit triggers from ResourceDomain range.
+            for (var, range) in ranges {
+                let quant_ty = self.get_node_type(range.node_id());
+                if let Type::ResourceDomain(mid, sid, inst_opt) = quant_ty.skip_reference() {
+                    let addr_var = resource_vars.get(&var.name).unwrap();
+                    let memory = &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_default());
+                    let resource_name = boogie_resource_memory_name(self.env, memory, &None);
+                    let resource_value = format!("$ResourceValue({}, {})", resource_name, addr_var);
+                    emit!(self.writer, "{{{}}}", resource_value);
+                }
+            }
+        }
+        // Translate range constraints.
+        let connective = match kind {
+            QuantKind::Forall => " ==> ",
+            QuantKind::Exists => " && ",
+            _ => unreachable!(),
+        };
+        let mut separator = "";
+        for (var, range) in ranges {
+            let var_name = self.env.symbol_pool().string(var.name);
+            let quant_ty = self.get_node_type(range.node_id());
+            let num_oper = global_state.get_node_num_oper(range.node_id());
+            match quant_ty.skip_reference() {
+                Type::TypeDomain(domain_ty) => {
+                    let mut type_check = boogie_well_formed_expr(self.env, &var_name, domain_ty);
+                    if type_check.is_empty() {
+                        type_check = "true".to_string();
+                    }
+                    emit!(self.writer, "{}{}", separator, type_check);
+                }
+                Type::ResourceDomain(..) => {
+                    // currently does not generate a constraint
+                    continue;
+                }
+                Type::Vector(..) => {
+                    let range_tmp = range_tmps.get(&var.name).unwrap();
+                    let quant_var = quant_vars.get(&var.name).unwrap();
+                    emit!(
+                        self.writer,
+                        "{}InRangeVec({}, {})",
+                        separator,
+                        range_tmp,
+                        quant_var,
+                    );
+                }
+                Type::Struct(mid, sid, targs) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                        emit!(
+                            self.writer,
+                            "{}ContainsTable({}, $EncodeKey'{}'({}))",
+                            separator,
+                            range_tmps.get(&var.name).unwrap(),
+                            boogie_type_suffix_bv(self.env, &targs[0], num_oper == Bitwise),
+                            var_name,
+                        );
+                    } else {
+                        panic!("unexpected type");
+                    }
+                }
+                Type::Primitive(PrimitiveType::Range) => {
+                    let range_tmp = range_tmps.get(&var.name).unwrap();
+                    let quant_var = quant_vars.get(&var.name).unwrap();
+                    emit!(
+                        self.writer,
+                        "{}$InRange({}, {})",
+                        separator,
+                        range_tmp,
+                        quant_var,
+                    );
+                }
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::Error
+                | Type::Var(_) => panic!("unexpected type"),
+            }
+            separator = connective;
+        }
+        emit!(self.writer, "{}", separator);
+        self.with_range_selector_assignments(
+            ranges,
+            &range_tmps,
+            &quant_vars,
+            &resource_vars,
+            || {
+                // Translate body and "where" condition.
+                if let Some(cond) = condition {
+                    emit!(self.writer, "(");
+                    self.translate_exp(cond);
+                    emit!(self.writer, ") {}", connective);
+                }
+                emit!(self.writer, "(");
+                self.translate_exp(body);
+                emit!(self.writer, ")");
+            },
+        );
+        emit!(
+            self.writer,
+            &")".repeat(quant_vars.len().checked_add(1).unwrap())
+        );
+    }
+
+    /// Translate a `some x: T: P[x]` expression. This saves information about the axiomatized
+    /// function representing this expression, to be generated later, and replaces the expression by
+    /// a call to this function.
+    fn translate_choice(
+        &self,
+        node_id: NodeId,
+        kind: QuantKind,
+        range: &(LocalVarDecl, Exp),
+        body: &Exp,
+    ) {
+        // Reconstruct the choice so we can easily determine used locals and temps.
+        let range_and_body = ExpData::Quant(
+            node_id,
+            kind,
+            vec![range.clone()],
+            vec![],
+            None,
+            body.clone(),
+        );
+        let some_var = range.0.name;
+        let free_vars = range_and_body
+            .free_vars(self.env)
+            .into_iter()
+            .filter(|(s, _)| *s != some_var)
+            .map(|(s, ty)| (s, self.inst(ty.skip_reference())))
+            .collect_vec();
+        let used_temps = range_and_body
+            .used_temporaries(self.env)
+            .into_iter()
+            .collect_vec();
+        let used_memory = range_and_body
+            .used_memory(self.env)
+            .into_iter()
+            .collect_vec();
+
+        // Create a new uninterpreted function and choice info only if it does not
+        // stem from the same original source than an existing one. This needs to be done to
+        // avoid non-determinism in reasoning with choices resulting from duplication
+        // of the same expressions. Consider a user has written `ensures choose i: ..`.
+        // This expression might be duplicated many times e.g. via opaque function caller
+        // sites. We want that the choice consistently returns the same value in each case;
+        // we can only guarantee this if we use the same uninterpreted function for each instance.
+        // We also need to consider the type instantiation.
+        // As a result, (ExpData, Vec<Type>) is used as the key
+        let choice_infos_key_pair = (range_and_body, self.type_inst.clone());
+        let mut choice_infos = self.lifted_choice_infos.borrow_mut();
+        let choice_count = choice_infos.len();
+        let info = choice_infos
+            .entry(choice_infos_key_pair)
+            .or_insert_with(|| LiftedChoiceInfo {
+                id: choice_count,
+                node_id,
+                kind,
+                free_vars: free_vars.clone(),
+                used_temps: used_temps.clone(),
+                used_memory: used_memory.clone(),
+                var: some_var,
+                range: range.1.clone(),
+                condition: body.clone(),
+            });
+        let fun_name = boogie_choice_fun_name(info.id);
+
+        // Construct the arguments. Notice that those might be different for each call of
+        // the choice function, resulting from the choice being injected into multiple contexts
+        // with different substitutions.
+        let args = free_vars
+            .iter()
+            .map(|(s, _)| s.display(self.env.symbol_pool()).to_string())
+            .chain(used_temps.iter().map(|(t, _)| format!("$t{}", t)))
+            .chain(
+                used_memory
+                    .iter()
+                    .map(|(m, l)| boogie_resource_memory_name(self.env, m, l)),
+            )
+            .join(", ");
+        emit!(self.writer, "{}({})", fun_name, args);
+    }
+
+    fn translate_eq_neq(&self, boogie_val_fun: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        let suffix = boogie_type_suffix_bv(
+            self.env,
+            self.get_node_type(args[0].node_id()).skip_reference(),
+            num_oper == Bitwise,
+        );
+        emit!(self.writer, "{}'{}'(", boogie_val_fun, suffix);
+        self.translate_exp(&args[0]);
+        emit!(self.writer, ", ");
+        self.translate_exp(&args[1]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_identical(&self, args: &[Exp]) {
+        use ExpData::*;
+        // If both arguments are &mut temporaries, we just directly make them equal. This allows
+        // a more efficient representation of equality between $Mutation objects. Otherwise
+        // we translate it the default way with automatic reference removal.
+        match (&args[0].as_ref(), &args[1].as_ref()) {
+            (Temporary(id1, idx1), Temporary(id2, idx2))
+                if self.get_node_type(*id1).is_reference()
+                    && self.get_node_type(*id2).is_reference() =>
+            {
+                emit!(self.writer, "$t{} == $t{}", idx1, idx2);
+            }
+            _ => self.translate_rel_op("==", args),
+        }
+    }
+
+    fn translate_op(&self, boogie_op: &str, bv_op: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            emit!(self.writer, "${}'{}'(", bv_op, oper_base);
+            self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+            emit!(self.writer, ")");
+        } else {
+            emit!(self.writer, "(");
+            self.translate_exp(&args[0]);
+            emit!(self.writer, " {} ", boogie_op);
+            self.translate_exp(&args[1]);
+            emit!(self.writer, ")");
+        }
+    }
+
+    fn translate_bit_op(&self, boogie_op: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let oper_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+            Type::Primitive(PrimitiveType::U8) => "Bv8",
+            Type::Primitive(PrimitiveType::U16) => "Bv16",
+            Type::Primitive(PrimitiveType::U32) => "Bv32",
+            Type::Primitive(PrimitiveType::U64) => "Bv64",
+            Type::Primitive(PrimitiveType::U128) => "Bv128",
+            Type::Primitive(PrimitiveType::U256) => "Bv256",
+            Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+            _ => unreachable!(),
+        };
+        emit!(self.writer, "{}'{}'(", boogie_op, oper_base);
+        self.translate_seq(args.iter(), ", ", |e| {
+            let num_oper_e = global_state.get_node_num_oper(e.node_id());
+            let ty_e = self.env.get_node_type(e.node_id());
+            if num_oper_e != Bitwise {
+                emit!(self.writer, "$int2bv.{}(", boogie_num_type_base(&ty_e));
+            }
+            self.translate_exp(e);
+            if num_oper_e != Bitwise {
+                emit!(self.writer, ")")
+            }
+        });
+        emit!(self.writer, ")");
+    }
+
+    fn translate_rel_op(&self, boogie_op: &str, args: &[Exp]) {
+        emit!(self.writer, "(");
+        self.translate_exp(&args[0]);
+        emit!(self.writer, " {} ", boogie_op);
+        self.translate_exp(&args[1]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_logical_op(&self, boogie_op: &str, args: &[Exp]) {
+        emit!(self.writer, "(");
+        self.translate_exp(&args[0]);
+        emit!(self.writer, " {} ", boogie_op);
+        self.translate_exp(&args[1]);
+        emit!(self.writer, ")");
+    }
+
+    fn translate_logical_unary_op(&self, boogie_op: &str, args: &[Exp]) {
+        emit!(self.writer, "{}", boogie_op);
+        self.translate_exp(&args[0]);
+    }
+
+    fn translate_cast(&self, node_id: NodeId, args: &[Exp]) {
+        let mut global_state = self
+            .env
+            .get_cloned_extension::<GlobalNumberOperationState>();
+        let arg = args[0].clone();
+        self.env
+            .update_node_type(arg.node_id(), self.env.get_node_type(node_id));
+        let cast_oper = global_state.get_node_num_oper(node_id);
+        global_state.update_node_oper(args[0].node_id(), cast_oper, true);
+        self.env.set_extension(global_state);
+        self.translate_exp(&arg);
+    }
+
+    fn translate_primitive_call(&self, fun: &str, args: &[Exp]) {
+        emit!(self.writer, "{}(", fun);
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
+    fn translate_primitive_call_shr(&self, fun: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_left_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            let oper_right_base = boogie_num_type_base(&self.env.get_node_type(args[1].node_id()));
+            emit!(
+                self.writer,
+                "{}{}From{}(",
+                fun,
+                oper_left_base,
+                oper_right_base
+            );
+        } else {
+            emit!(self.writer, "{}(", fun);
+        }
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
+    fn translate_primitive_call_shl(&self, fun: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_left_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            let oper_right_base = boogie_num_type_base(&self.env.get_node_type(args[1].node_id()));
+            emit!(
+                self.writer,
+                "{}{}From{}(",
+                fun,
+                oper_left_base,
+                oper_right_base
+            );
+        } else {
+            let ty = self.get_node_type(args[0].node_id());
+            let fun_num = match ty {
+                Type::Primitive(PrimitiveType::U8) => "U8",
+                Type::Primitive(PrimitiveType::U16) => "U16",
+                Type::Primitive(PrimitiveType::U32) => "U32",
+                Type::Primitive(PrimitiveType::U64) => "U64",
+                Type::Primitive(PrimitiveType::U128) => "U128",
+                Type::Primitive(PrimitiveType::U256) => "U256",
+                Type::Primitive(PrimitiveType::Num) => "",
+                _ => unreachable!(),
+            };
+            emit!(self.writer, "{}(", format!("{}{}", fun, fun_num).as_str());
+        }
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
+    fn translate_primitive_inst_call(&self, node_id: NodeId, fun: &str, args: &[Exp]) {
+        let suffix = boogie_inst_suffix(self.env, &self.get_node_instantiation(node_id));
+        emit!(self.writer, "{}{}(", fun, suffix);
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
+    fn translate_well_formed(&self, exp: &Exp) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number state");
+        let ty = self.get_node_type(exp.node_id());
+        let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
+        match exp.as_ref() {
+            ExpData::Temporary(_, idx) => {
+                // For the special case of a temporary which can represent a
+                // &mut, skip the normal translation of `exp` which would do automatic
+                // dereferencing. Instead let boogie_well_formed_expr handle the
+                // the dereferencing as part of its logic.
+                let check =
+                    boogie_well_formed_expr_bv(self.env, &format!("$t{}", idx), &ty, bv_flag);
+                if !check.is_empty() {
+                    emit!(self.writer, &check);
+                } else {
+                    emit!(self.writer, "true");
+                }
+
+                if let Type::Primitive(PrimitiveType::Signer) = ty {
+                    let name = &format!("$t{}", idx);
+                    let target = if ty.is_reference() {
+                        format!("$Dereference({})", name)
+                    } else {
+                        name.to_owned()
+                    };
+                    emit!(
+                        self.writer,
+                        &format!(" && $1_signer_is_txn_signer({})", target)
+                    );
+                    emit!(
+                        self.writer,
+                        &format!(
+                            " && $1_signer_is_txn_signer_addr($addr#$signer({}))",
+                            target
+                        )
+                    );
+                }
+            }
+            ExpData::LocalVar(_, sym) => {
+                // For specification locals (which never can be references) directly emit them.
+                let check = boogie_well_formed_expr_bv(
+                    self.env,
+                    self.env.symbol_pool().string(*sym).as_str(),
+                    &ty,
+                    bv_flag,
+                );
+                emit!(self.writer, &check);
+            }
+            _ => {
+                let check =
+                    boogie_well_formed_expr_bv(self.env, "$val", ty.skip_reference(), bv_flag);
+                emit!(self.writer, "(var $val := ");
+                self.translate_exp(exp);
+                emit!(self.writer, "; {})", check);
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover-test-utils/Cargo.toml b/vendors/move/crates/move-prover-test-utils/Cargo.toml
new file mode 100644
index 000000000..8260b0444
--- /dev/null
+++ b/vendors/move/crates/move-prover-test-utils/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "move-prover-test-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+edition = "2021"
+publish = false
+license = "Apache-2.0"
+
+[dependencies]
+prettydiff.workspace = true
+anyhow = "1.0.71"
+regex.workspace = true
+move-command-line-common.workspace = true
diff --git a/vendors/move/crates/move-prover-test-utils/src/baseline_test.rs b/vendors/move/crates/move-prover-test-utils/src/baseline_test.rs
new file mode 100644
index 000000000..7cb49a1c7
--- /dev/null
+++ b/vendors/move/crates/move-prover-test-utils/src/baseline_test.rs
@@ -0,0 +1,103 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! A module supporting baseline (golden) tests.
+
+use anyhow::anyhow;
+use move_command_line_common::testing::read_env_update_baseline;
+use prettydiff::{basic::DiffOp, diff_lines};
+use regex::Regex;
+use std::{fs, path::Path};
+
+/// Verifies or updates baseline file for the given generated text.
+pub fn verify_or_update_baseline(baseline_file_name: &Path, text: &str) -> anyhow::Result<()> {
+    let update_baseline = read_env_update_baseline();
+
+    if update_baseline {
+        if !text.is_empty() {
+            // Update the baseline file.
+            if let Some(parent) = baseline_file_name.parent() {
+                fs::create_dir_all(parent)?;
+            }
+            let clean_text = clean_for_baseline(text);
+            fs::write(baseline_file_name, clean_text)?;
+        } else if baseline_file_name.exists() {
+            fs::remove_file(baseline_file_name)?;
+        }
+
+        Ok(())
+    } else {
+        // Read the baseline and diff it.
+        let contents = if baseline_file_name.exists() {
+            fs::read_to_string(baseline_file_name)?
+        } else {
+            String::new()
+        };
+        diff(clean_for_baseline(text).as_ref(), &contents)
+    }
+}
+
+/// Clean a content to be usable as a baseline file. Currently, we ensure there are no
+/// trailing whitespaces and no empty last line, because this is required by git-checks.sh.
+/// We also try to detect and remove unstable file names.
+fn clean_for_baseline(content: &str) -> String {
+    // Regexp for matching unstable filenames in output. This is heuristic and may need refinement
+    // on a case-by-case basis.
+    let rex = Regex::new(r"(/var|/tmp)(/[^/]*)*/(?P<basename>[^.]*\.)").expect("regexp ok");
+    let mut res = String::new();
+    for line in content.lines() {
+        let line = line.trim_end();
+        let line = rex.replace_all(line, "$basename");
+        res.push_str(line.to_string().as_str());
+        res.push('\n');
+    }
+    res = res.trim_end().to_string(); // removes empty lines at end
+    res.push('\n'); // adds back a single newline
+    res
+}
+
+/// Diffs old and new content.
+fn diff(old_content: &str, new_content: &str) -> anyhow::Result<()> {
+    if old_content.trim() == new_content.trim() {
+        return Ok(());
+    }
+
+    let print_lines = |result: &mut Vec<String>, lines: &[&str], prefix: &str| {
+        for line in lines {
+            result.push(format!("{}{}", prefix, line));
+        }
+    };
+
+    let print_context = |result: &mut Vec<String>, lines: &[&str]| {
+        if lines.len() <= 3 {
+            print_lines(result, lines, "= ");
+        } else {
+            print_lines(result, &lines[..1], "= ");
+            result.push(format!("= ... ({} lines)", lines.len() - 2));
+            print_lines(result, &lines[lines.len() - 1..], "= ");
+        }
+    };
+
+    let diff = diff_lines(new_content, old_content);
+    let mut result = vec!["
+New output differs from baseline!
+Call this test with env variable UPBL=1 to regenerate or remove old baseline files.
+Then use your favorite changelist diff tool to verify you are good with the changes.
+
+Or check the rudimentary diff below:
+"
+    .to_string()];
+    for d in diff.diff() {
+        match d {
+            DiffOp::Equal(lines) => print_context(&mut result, lines),
+            DiffOp::Insert(lines) => print_lines(&mut result, lines, "+ "),
+            DiffOp::Remove(lines) => print_lines(&mut result, lines, "- "),
+            DiffOp::Replace(old, new) => {
+                print_lines(&mut result, old, "- ");
+                print_lines(&mut result, new, "+ ");
+            }
+        }
+    }
+    Err(anyhow!(result.join("\n")))
+}
diff --git a/vendors/move/crates/move-prover-test-utils/src/lib.rs b/vendors/move/crates/move-prover-test-utils/src/lib.rs
new file mode 100644
index 000000000..ddbdda523
--- /dev/null
+++ b/vendors/move/crates/move-prover-test-utils/src/lib.rs
@@ -0,0 +1,33 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use regex::Regex;
+use std::{fs::File, io::Read, path::Path};
+
+pub mod baseline_test;
+
+// =================================================================================================
+// Constants
+
+pub const DEFAULT_SENDER: &str = "0x8675309";
+
+// =================================================================================================
+// Extract test annotations out of sources
+
+// Extracts lines out of some text file where each line starts with `start` which can be a regular
+// expressions. Returns the list of such lines with `start` stripped. Use as in
+// `extract_test_directives(file, "// dep:")`.
+pub fn extract_test_directives(path: &Path, start: &str) -> anyhow::Result<Vec<String>> {
+    let rex = Regex::new(&format!("(?m)^{}(?P<ann>.*?)$", start)).unwrap();
+    let mut content = String::new();
+    let mut file = File::open(path)?;
+    file.read_to_string(&mut content)?;
+    let mut at = 0;
+    let mut res = vec![];
+    while let Some(cap) = rex.captures(&content[at..]) {
+        res.push(cap.name("ann").unwrap().as_str().trim().to_string());
+        at += cap.get(0).unwrap().end();
+    }
+    Ok(res)
+}
diff --git a/vendors/move/crates/move-prover/Cargo.toml b/vendors/move/crates/move-prover/Cargo.toml
new file mode 100644
index 000000000..091a88c4d
--- /dev/null
+++ b/vendors/move/crates/move-prover/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "move-prover"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# move dependencies
+move-prover-boogie-backend.workspace = true
+move-command-line-common.workspace = true
+move-compiler.workspace = true
+move-model.workspace = true
+move-docgen.workspace = true
+move-abigen.workspace = true
+move-errmapgen.workspace = true
+move-stackless-bytecode.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+clap.workspace = true
+codespan-reporting.workspace = true
+itertools.workspace = true
+log.workspace = true
+serde.workspace = true
+simplelog.workspace = true
+once_cell.workspace = true
+toml.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-prover-test-utils.workspace = true
+shell-words.workspace = true
+walkdir.workspace = true
+tempfile.workspace = true
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/move-prover/README.md b/vendors/move/crates/move-prover/README.md
new file mode 100644
index 000000000..ff4e00d84
--- /dev/null
+++ b/vendors/move/crates/move-prover/README.md
@@ -0,0 +1,30 @@
+---
+id: move-prover
+title: Formal verification code
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-prover/README.md
+---
+
+
+
+## Code under this subtree is experimental. It is out of scope for [the Diem Bug Bounty](https://hackerone.com/diem) until it is no longer marked experimental.
+
+# The Move Prover
+
+The Move Prover supports formal specification and verification of Move code. It can automatically prove
+logical properties of Move smart contracts, while providing a user experience similar to a type checker or linter.
+It's purpose is to make contracts more *trustworthy*, specifically:
+
+- Protect massive assets managed by the Diem blockchain from smart contract bugs
+- Protect against well-resourced adversaries
+- Anticipate justified regulator scrutiny and compliance requirements
+- Allow domain experts with mathematical background, but not necessarily software engineering background, to
+  understand what smart contracts do
+
+For more information, refer to the documentation:
+
+-  [To be done] Move Prover Whitepaper
+-  [Move Prover User Guide](./doc/user/prover-guide.md)
+-  [Move Specification Language](./doc/user/spec-lang.md)
+-  [Installation](./doc/user/install.md)
+-  [Testing](./tests/README.md)
+-  [To be done] Move Prover Developer Guide
diff --git a/vendors/move/crates/move-prover/doc/dev/cvc5.md b/vendors/move/crates/move-prover/doc/dev/cvc5.md
new file mode 100644
index 000000000..aa53eee9e
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/dev/cvc5.md
@@ -0,0 +1,122 @@
+# cvc5 Integration
+
+The [cvc5] integration is an experimental feature which is still evolving. This page documents,
+for tool developers, how to use cvc5 as a backend and extend the Move prover to use it right.
+
+## Selecting cvc5
+
+In the following we assume a command line for the move prover as in `mvp <arguments>`. See
+the [user documentation](../user/prover-guide.md) how to set this up. For development, it
+is recommended to use a `~/.mvprc` file for configuring the prover; the user documentation shows
+how. Specifically, this file can be used to point to the Move standard library and
+Diem framework as found in the local branch of the Diem repo.
+
+To choose cvc5 as a backend, call the prover as in:
+
+```shell
+# mvp --use-cvc5 source.move
+
+```
+
+## Testing with cvc5
+
+The provers testsuite supports multiple *feature groups* which constitute a particular
+set of tests which are run with a specific configuration. By default, when `cargo test`
+is executed in the prover crate, all groups are executed.
+
+There is one group called `cvc5` which contains the enabled tests for cvc5. This group
+is configured as follows at this point:
+
+- Only unit tests contained in `move-prover/tests` are included. Diem framework tests
+  are skipped.
+- Those tests are only run locally and nightly, but not in CI.
+- By default, cvc5 tests share the same baseline (`.exp` file) with the `default` test group
+  which uses [Z3].
+- Some cvc5 tests have their separate baseline, which is indicated by the
+  tag `// separate_baseline: cvc5` in the source. Those tests represent cases where
+  there is an issue (most of the time false positives); in some cases those are also legit
+  differences resulting from different choices in the model.
+
+For the configuration logic, see the [testsuite.rs](../../tests/testsuite.rs) code.
+
+During development, it is often useful to focus on only running a specific test group.
+This is done using `MVP_TEST_FEATURE=cvc5 cargo test`. For documentation of all test parameters, see
+[here](../../tests/README.md).
+
+## Obtaining the smtlib file
+
+In order to analyze a problem based on the smtlib file Boogie generates for it, use the following
+command line:
+
+```shell
+# mvp --generate-smt [ --verify-only <function-name> ] source.move
+
+```
+
+This will generate a file ending with `.smt` for each function in the Move source. The content
+of those files is hermetic and contains all the settings which have been passed from upstream
+to the solver.
+
+## Specializing the Encoding for cvc5
+
+There are multiple extension points which can be used to customize the prover. They are centered
+around the [Tera] template system which provides conditionals and macro expansion. Tera is
+quite similar to Django2 and is easy to understand while rather expressive.
+
+The root template the prover includes in every verification problem is found in
+[boogie-backend/src/prelude/prelude.bpl](../../boogie-backend/src/prelude/prelude.bpl). This
+is templatized [Boogie] source. This includes other templates, like theories for vectors and
+multisets, as well as implementations of native Move types found in
+[prelude/native.bpl](../../boogie-backend/src/prelude/native.bpl).
+
+### Accessing Backend Options
+
+Inside of templates one has access to the backend options of the prover (`[backend]` section
+in the toml config). To test in a template whether cvc5 is selected as a backend, use `{{options.
+use_cvc5}}`. New options can be also added to `BoogieOptions` in Rust and will be accessible
+this way.
+
+### Replacing Vector Theories
+
+The prover, in combination with Rust code and the templates, supports the concept of different
+vector theories. There are multiple theories selectable via the option `--vector-theory`.
+For a benchmark and description of the theories, see
+[here](../../lab/data/vector-theories/notebook.pdf).
+
+In order to add a new vector theory specific for cvc5, the following steps are needed:
+
+- Write the theory, starting e.g. from the
+  [vector_array_theory](../../boogie-backend/src/prelude/vector-array-theory.bpl). A new theory
+  need to implement the same set of functions as seen there.
+- Integrate the theory into the prover as follows:
+  1. Extend the enumeration [VectorTheory](../../boogie-backend/src/options.rs) by an item to
+     represent the new theory. Don't forget to implement the close-by `is_extensional` function
+     appropriately for the new theory. This tells the prover whether the theory supports extensional
+     equality provided the element values do.
+  2. Now go to [boogie-backend/src/lib.rs](../../boogie-backend/src/lib.rs) and follow the patterns
+     you find for other theories in order to connect the outcome of (1) to the prover. Once done,
+     all is set and the new theory should be ready to use via the option
+     `--vector-theory=MyEnumItemName`.
+
+Notice that the theories are using generic Boogie in *monomorphization* mode. For the type
+`Vec T`, the actual type reaching the smt backend will be `Vec_2923`, which is some instantiation
+of this type. In general, the VCs reaching the SMT backend are fully monomorphized, either
+via Boogies mechanism, or via explicit logic in the Move provers templates and codegen.
+
+## Analyzing Results
+
+The Move prover comes with tool support and conventions to systematically perform benchmarks
+and other data-driven experiments. The crate which contains this support is found
+at [move-prover/lab](../../lab).
+
+> TODO: we should create a `lab/data/z3-cvc5` for a comparison test once the cvc5 integration
+> passes unit tests. The existing `lab/data/new-boogie` can be used as a starting point.
+
+For testing new vector theories, the existing [vector theory lab](../../lab/data/vector-theories)
+can be extended, or a new lab created from it.
+
+
+[Boogie]: https://github.com/boogie-org/boogie
+[cvc5]: https://cvc5.github.io/
+[Z3]: https://github.com/Z3Prover/z3
+[Tera]: https://tera.netlify.app/docs
diff --git a/vendors/move/crates/move-prover/doc/paper21/analysis.tex b/vendors/move/crates/move-prover/doc/paper21/analysis.tex
new file mode 100644
index 000000000..a8c100e91
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/analysis.tex
@@ -0,0 +1,221 @@
+\Section{Analysis}
+
+\Paragraph{Reliability and Performance}
+
+The three improvements described above resulted in a major qualitative
+change in performance and reliability. In the version of \MVP released
+in September 2020, correct examples verified fairly quickly and
+reliably.  But that is because we needed speed and reliability, so we
+disabled some properties that always timed out and others that timed
+out unpredictably when there were small changes in the framework.  We
+learned that incorrect programs or specifications would time out
+predictably enough that it was a good bet that examples that timed out
+were erroneous.  However, localizing the error to fix it was
+\emph{very} hard, because debugging is based on a counterexample that
+violates the property, and getting a counterexample requires
+termination!
+
+With each of the transformations described, we witnessed significant speedups
+and, more importantly, reductions in timeouts.  Monomorphization was the last
+feature implemented, and, with it, timeouts almost disappeared. Although this
+was the most important improvement in practice, it is difficult to quantify
+because there have been many changes in Diem framework, its specifications,
+\MVP, and even the Move language over that time.
+
+It is simpler (but less important) to quantify the changes in run time of \MVP
+on one of our more challenging modules, the |DiemAccount| module, which is the
+biggest module in the Diem framework. This module implements basic functionality
+to create and maintain multiple types of accounts on the blockchain, as well as
+manage their coin balances. It was called |LibraAccount| in release 1.0 of \MVP,
+and is called |DiemAccount| today. The comparison requires various patches as
+described in~\cite{MVP_ARTIFACT}. The table below lists the consolidated numbers
+of lines, functions, invariants, conditions (requires, ensures, and aborts-if),
+as well as the verification times:
+
+{
+\setlength{\tabcolsep}{6pt}
+\vspace{2ex}
+\begin{tabular*}{0.9\textwidth}{cccccc}
+  \hline
+  \hline
+  Module & Lines & Functions & Invariants & Conditions & Timing \\
+  \hline
+  LibraAccount & 1975 & 72 & 10 & 113 & \textbf{9.899s} \\
+  DiemAccount & 2554 & 64 & 32 & 171 & \textbf{7.340s} \\
+  \hline
+\end{tabular*}
+\vspace{2ex}
+}
+
+\noindent Notice that |DiemAccount| has significantly grown in size compared to
+the older version. Specifically, additional specifications have been
+added. Moreover, in the original |LibraAccount|, some of the most complex
+functions had to be disabled for verification because the old version of \MVP
+would time out on them. In contrast, in |DiemAccount| and with the new version,
+all functions are verified. Verification time has been improved by roughly 20\%,
+\emph{in the presence of three times more global invariants, and 50\% more function
+conditions}.
+
+We were able to observe similar improvements for the remaining of the 40 modules
+of the Diem framework. All of the roughly half-dozen timeouts resolved after
+introduction of the transformations described in this paper.
+
+%%Also, specifications which were introduced after the new
+%%transformations did not introduce new timeouts.
+
+%% A further improvement is that
+%% often, in cases where specification and program disagree, a timeout occurred
+%% which went away only after fixing the spec or the code, making debugging of such
+%% verification failures rather hard. This problem also disappeared.
+
+
+\Paragraph{Causes for the Improvements}
+
+It's difficult to pin down and measure exactly why the three transformations
+described improved performance and reliability so dramatically.  We have
+explained some reasons in the subsections above: the alias-free memory model
+reduced search through combinatorial sharing arrangments, and the fine-grained
+invariant checking results in simpler formulas for the SMT solver.
+%We believe that one reason is just that the translated SMT formulas are simpler.
+
+We found that most timeouts in specifications stemmed from our liberal use of
+quantifiers.  To disprove a property $P_0$ after assuming a list of properties,
+$P_1, \ldots p_n$, the SMT solver must show that
+$\neg P_0 \wedge P_1 \wedge \ldots \wedge P_n$ is satisfiable.  The search
+usually involves instantiating universal quantifiers in $P_1, \ldots, P_n$.  The
+SMT solver can do this endlessly, resulting in a timeout. Indeed, we often found
+that proving a post-condition false would time out, because the SMT solver was
+instantiating quantifiers to find a satisfying assignment of
+$P_1 \wedge \ldots \wedge P_n$.  Simpler formulas result in fewer intermediate
+terms during solving, resulting in fewer opportunities to instantiate quantified
+formulas.
+
+We believe that one of the biggest impacts, specifically on
+removing timeouts and improving predictability, is monomorphization. The
+reason for this is that monomorphization allows a multi-sorted representation
+of values in Boogie (and eventually the SMT solver). In contrast, before
+monomorphization, we used a universal domain for values in order to represent
+values in generic functions, roughly as follows:
+
+\begin{Move}
+  type Value = Num(int) | Address(int) | Struct(Vector<Value>) | ...
+\end{Move}
+
+\noindent This creates a large overhead for the SMT solver, as we need to
+exhaustively inject type assumptions (e.g. that a |Value| is actually an
+|Address|), and pack/unpack values. Consider a quantifier like~%
+|forall a: address: P(x)| in Move. Before monomorphization, we have to represent
+this in Boogie as~%
+|forall a: Value: is#Address(a) => P(v#Address(a))|. This quantifier is
+triggered where ever |is#Address(a)| is present, independent of the structure of
+|P|. Over-triggering or inadequate triggering of quantifiers is one of the
+suspected sources of timeouts, as also discussed in~\cite{BUTTERFLY}.
+
+Moreover, before monomorphization, global memory was indexed in Boogie by an
+address and a type instantiation. That is, for |struct R<T>| we would
+have one Boogie array |[Type, int]Value|. With monomorphization, the type index
+is eliminated, as we create different memory variables for each type
+instantiation.  Quantification over memory content works now on a one-dimensional
+instead of an n-dimensional Boogie array.
+
+\Paragraph{Discussion and Related Work}
+
+Many approaches have been applied to the verification of smart contracts; see
+e.g. the
+surveys~\cite{liu2019survey,CONTRACT_VERIFICATION}. \cite{CONTRACT_VERIFICATION}
+refers to at least two dozen systems for smart contract verification. It
+distinguishes between \emph{contract} and \emph{program} level approaches. Our
+approach has aspects of both: we address program level properties via pre/post
+conditions, and contract (``blockchain state'') level properties via global
+invariants. To the best of our knowledge, among the existing approaches, the
+Move ecosystem is the first one where contract programming and specification
+language are fully integrated, and the language is designed from first
+principles influenced by verification. Methodologically, Move and the Move
+prover are thereby closer to systems like Dafny~\cite{DAFNY}, or the older
+Spec\# system~\cite{SPECSHARP}, where instead of adding a specification approach
+posterior to an existing language, it is part from the beginning. This allows us
+not only to deliver a more consistent user experience, but also to make
+verification technically easier by curating the programming language.
+% as reflected in Move's absence of
+% dynamic dispatching and the notorious re-entrance problem~\cite{REENTRANCE}, as
+% well as the borrow semantics which enables optimizations like reference
+% elimination (Sec.~\ref{sec:RefElim}).
+
+% Other related works on the
+% \solidity smart contract verification employ the theoretical foundations
+% including the \kay framework \cite{kay} (e.g., \cite{kevm}), \fstar
+% \cite{dm4all} (e.g., \cite{DBLP:conf/ccs/BhargavanDFGGKK16,post2018}), and proof
+% assistants such as Coq \cite{coqref} (e.g., \cite{fspvme,fether}).
+
+In contrast to other approaches that only focus on specific vulnerability
+patterns~\cite{mythril,oyente,maian,securify}, \MVP offers a universal
+specification language. To the best of our knowledge, no existing specification
+approach for smart contracts based on inductive Hoare logic has similar
+expressiveness. We support universal quantification over arbitrary memory
+content, a suspension mechanism of invariants to allow non-atomic construction
+of memory content, and generic invariants.  For comparison, the SMT Checker
+build into \solidity \cite{solidity,solcverify,DBLP:conf/esop/HajduJ20}
+does not support quantifiers, because it interprets programming language
+constructs (requires and assert statements) as specifications and has no
+dedicated specification language. While in Solidity one can simulate aspects of
+global invariants using modifiers by attaching pre/post conditions, this is not
+the same as our invariants, which are guaranteed to hold independent of whether
+a user may or (accidentally) may not attach a modifier, and which are optimized
+to be only evaluated as needed.
+
+While the expressiveness of Move specifications comes with the price of
+undecidability and the dependency from heuristics in SMT solvers, \MVP deals
+with this by its elaborated translation to SMT logic, as described in this
+paper. The result is a practical verification system that is fully integrated
+into the Diem blockchain production process, running in continuous integration,
+which is (to the best of our knowledge) a first in the industry.
+
+The individual techniques we described are novel each by
+themselves. \emph{Reference elimination} relies on borrow semantics, similar as
+in the Rust~\cite{rust} language.  We expect reference elimination to apply for
+the safe subset of Rust, though some extra work would be needed to deal with
+references aggregated by structs.  However, we are not aware of that something
+similar has been attempted in existing Rust verification work
+\cite{prusti,smack,nopanic,crust}. \emph{Global invariant injection} and the
+approach to minimize the number of assumptions and assertions is not applied in
+any existing verification approach we know of; however, we co-authored a while
+ago a similar line of work for \emph{runtime checking} of invariants in
+Spec\#~\cite{StateConstraintsPatent}, yet that work never left the conceptual
+state. \emph{Monomorphization} is well known as a technique for compiling
+languages like C++ or Rust, where it is called specialization; however, we are
+not aware of it being generalized for modular verification of generic code where
+full type erasure is not possible, as it is the case in Move.
+
+
+\Paragraph{Future Work}
+
+\MVP is conceived as a tool for achieving higher assurance systems, not as a bug
+hunting tool. Having at least temporarily achieved satisfactory performance and
+reliability, we are turning our attention to the question of the goal of higher
+assurance, which raises several issues.  If we're striving for high assurance,
+it would be great to be able to measure progress towards that goal.  Since
+system requirements often stem from external business and regulatory needs,
+lightweight processes for exposing those requirements so we know what needs to
+be formally specified would be highly desirable.
+
+As with many other systems, it is too hard to write high-quality specifications.
+Our current specifications are more verbose than they need to be, and we are
+working to require less detailed specifications, especially for individual
+functions.  We could expand the usefulness of \MVP for programmers if we could
+make it possible for them to derive value from simple reusable specifications.
+Finally, software tools for assessing the consistency and completeness of formal
+specifications would reduce the risk of missing bugs because of specification
+errors.
+
+However, as more complex smart contracts are written and as more people write
+specifications, we expect that the inherent computational difficulty of solving
+logic problems will reappear, and there will be more opportunities for improving
+performance and reliability.  In addition to translation techniques, it will be
+necessary to identify opportunities to improve SMT solvers for the particular
+kinds of problems we generate.
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/arch.png b/vendors/move/crates/move-prover/doc/paper21/arch.png
new file mode 100755
index 000000000..ca5a1c5cb
Binary files /dev/null and b/vendors/move/crates/move-prover/doc/paper21/arch.png differ
diff --git a/vendors/move/crates/move-prover/doc/paper21/biblio.bib b/vendors/move/crates/move-prover/doc/paper21/biblio.bib
new file mode 100644
index 000000000..dfa0a6116
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/biblio.bib
@@ -0,0 +1,1028 @@
+%% This BibTeX bibliography file was created using BibDesk.
+%% https://bibdesk.sourceforge.io/
+
+%% Created for jkpark at 2021-10-06 10:38:07 -0700
+
+
+%% Saved with string encoding Unicode (UTF-8)
+
+@article{FULL_VERSION,
+  author    = {David L. Dill and
+               Wolfgang Grieskamp and
+               Junkil Park and
+               Shaz Qadeer and
+               Meng Xu and
+               Jingyi Emma Zhong},
+  title     = {Fast and Reliable Formal Verification of Smart Contracts with the
+               Move Prover (extended version)},
+  journal   = {CoRR},
+  volume    = {abs/2110.08362},
+  year      = {2021},
+  url       = {https://arxiv.org/abs/2110.08362},
+  eprinttype = {arXiv},
+  eprint    = {2110.08362},
+  timestamp = {Fri, 22 Oct 2021 13:33:09 +0200},
+  biburl    = {https://dblp.org/rec/journals/corr/abs-2110-08362.bib},
+  bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
+
+@article{liu2019survey,
+	author = {Liu, Jing and Liu, Zhentian},
+	date-added = {2021-10-06 10:38:04 -0700},
+	date-modified = {2021-10-06 10:38:04 -0700},
+	journal = {IEEE Access},
+	pages = {77894--77904},
+	publisher = {IEEE},
+	title = {A survey on security verification of blockchain smart contracts},
+	volume = {7},
+	year = {2019}}
+
+@inproceedings{miller2018smart,
+	author = {Miller, Andrew and Cai, Zhicheng and Jha, Somesh},
+	booktitle = {International Symposium on Leveraging Applications of Formal Methods},
+	date-added = {2021-10-06 10:37:12 -0700},
+	date-modified = {2021-10-06 10:37:12 -0700},
+	organization = {Springer},
+	pages = {280--299},
+	title = {Smart contracts and opportunities for formal methods},
+	year = {2018}}
+
+@inproceedings{MOVE_PROVER,
+	author = {Zhong, Jingyi Emma and Cheang, Kevin and Qadeer, Shaz and Grieskamp, Wolfgang and Blackshear, Sam and Park, Junkil and Zohar, Yoni and Barrett, Clark and Dill, David L.},
+	booktitle = {Computer Aided Verification},
+	editor = {Lahiri, Shuvendu K. and Wang, Chao},
+	pages = {137--150},
+	publisher = {Springer International Publishing},
+	title = {{The Move Prover}},
+	year = {2020}}
+
+@misc{DIEM,
+	author = {{The Diem Association}},
+	title = {{An Introduction to Diem}},
+	url = {https://www.diem.com/en-us/},
+	bdsk-url-1 = {https://www.diem.com/en-us/},
+	year = {2019}}
+
+@incollection{BORROW_SEM,
+	author = {Dave Clarke and Johan {\"{O}}stlund and Ilya Sergey and Tobias Wrigstad},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/series/lncs/ClarkeOSW13.bib},
+	booktitle = {Aliasing in Object-Oriented Programming. Types, Analysis and Verification},
+	doi = {10.1007/978-3-642-36946-9\_3},
+	editor = {Dave Clarke and James Noble and Tobias Wrigstad},
+	pages = {15--58},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	timestamp = {Tue, 14 May 2019 10:00:55 +0200},
+	title = {Ownership Types: {A} Survey},
+	NOurl = {https://doi.org/10.1007/978-3-642-36946-9\_3},
+	volume = {7850},
+	year = {2013},
+	bdsk-url-1 = {https://doi.org/10.1007/978-3-642-36946-9%5C_3}}
+
+@misc{UNAVAILABLE_BORROW_CHECKER,
+	author = {Sam Blackshear and Todd Nowacki and Shaz Qadeer and John Mitchell},
+	title = {The Move Borrow Checker},
+	url = {TBD},
+	year = {2021},
+	bdsk-url-1 = {TBD}}
+
+@article{RUST_SECURE,
+	address = {New York, NY, USA},
+	articleno = {66},
+	author = {Jung, Ralf and Jourdan, Jacques-Henri and Krebbers, Robbert and Dreyer, Derek},
+	doi = {10.1145/3158154},
+	issue_date = {January 2018},
+	journal = {Proc. ACM Program. Lang.},
+	keywords = {logical relations, separation logic, type systems, Rust, concurrency},
+	month = dec,
+	number = {POPL},
+	numpages = {34},
+	publisher = {Association for Computing Machinery},
+	title = {RustBelt: Securing the Foundations of the Rust Programming Language},
+	url = {https://doi.org/10.1145/3158154},
+	volume = {2},
+	year = {2017},
+	bdsk-url-1 = {https://doi.org/10.1145/3158154}}
+
+@article{DESIGN_BY_CONTRACT,
+	address = {Washington, DC, USA},
+	author = {Meyer, Bertrand},
+	doi = {10.1109/2.161279},
+	issn = {0018-9162},
+	issue_date = {October 1992},
+	journal = {Computer},
+	month = oct,
+	number = {10},
+	numpages = {12},
+	pages = {40--51},
+	publisher = {IEEE Computer Society Press},
+	title = {Applying "Design by Contract"},
+	NOurl = {https://doi.org/10.1109/2.161279},
+	volume = {25},
+	year = {1992},
+	bdsk-url-1 = {https://doi.org/10.1109/2.161279}}
+
+@article{CONTRACT_VERIFICATION,
+	author = {Palina Tolmach and Yi Li and Shang{-}Wei Lin and Yang Liu and Zengxiang Li},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/journals/corr/abs-2008-02712.bib},
+	eprint = {2008.02712},
+	eprinttype = {arXiv},
+	journal = {CoRR},
+	timestamp = {Wed, 07 Jul 2021 10:04:24 +0200},
+	title = {A Survey of Smart Contract Formal Specification and Verification},
+	url = {https://arxiv.org/abs/2008.02712},
+	volume = {abs/2008.02712},
+	year = {2020},
+	bdsk-url-1 = {https://arxiv.org/abs/2008.02712}}
+
+@article{DAFNY,
+	address = {Los Alamitos, CA, USA},
+	author = {K. M. Leino},
+	doi = {10.1109/MS.2017.4121212},
+	issn = {1937-4194},
+	journal = {IEEE Software},
+	keywords = {formal verification;software reliability;software development;encoding;cognition},
+	month = {nov},
+	number = {06},
+	pages = {94-97},
+	publisher = {IEEE Computer Society},
+	title = {Accessible Software Verification with Dafny},
+	volume = {34},
+	year = {2017},
+	bdsk-url-1 = {https://doi.org/10.1109/MS.2017.4121212}}
+
+@inbook{SPECSHARP,
+	abstract = {The Spec{\#} programming system [4] is a new attempt to increase the quality of general purpose, industrial software. Using old wisdom, we propose the use of specifications to make programmer assumptions explicit. Using modern technology, we propose the use of tools to enforce the specifications. To increase its chances of having impact, we want to design the system so that it can be widely adopted.},
+	address = {Berlin, Heidelberg},
+	author = {Barnett, Mike and DeLine, Robert and F{\"a}hndrich, Manuel and Jacobs, Bart and Leino, K. Rustan M. and Schulte, Wolfram and Venter, Herman},
+	booktitle = {Verified Software: Theories, Tools, Experiments: First IFIP TC 2/WG 2.3 Conference, VSTTE 2005, Zurich, Switzerland, October 10-13, 2005, Revised Selected Papers and Discussions},
+	isbn = {978-3-540-69149-5},
+	pages = {144--152},
+	publisher = {Springer Berlin Heidelberg},
+	title = {The Spec{\#} Programming System: Challenges and Directions},
+	url = {https://doi.org/10.1007/978-3-540-69149-5_16},
+	year = {2008},
+	bdsk-url-1 = {https://doi.org/10.1007/978-3-540-69149-5_16}}
+
+@inproceedings{REENTRANCE,
+	author = {Fatima Samreen, Noama and Alalfi, Manar H.},
+	booktitle = {2020 IEEE International Workshop on Blockchain Oriented Software Engineering (IWBOSE)},
+	pages = {22-29},
+	title = {Reentrancy Vulnerability Identification in Ethereum Smart Contracts},
+	year = {2020}}
+
+@misc{SOLIDITY_EVENTS,
+	archiveprefix = {arXiv},
+	author = {{\'A}kos Hajdu and Dejan Jovanovi{\'c} and Gabriela Ciocarlie},
+	eprint = {2005.10382},
+	primaryclass = {cs.PL},
+	title = {Formal Specification and Verification of Solidity Contracts with Events},
+	year = {2020}}
+
+@misc{OLD_MOVE_LANG,
+	author = {Sam Blackshear and Evan Cheng and David L. Dill and Victor Gao and Ben Maurer and Todd Nowacki and Alistair Pott and Shaz Qadeer and Rain and Dario Russi and Stephane Sezer and Tim Zakian and Runtian Zho},
+	title = {{Move: A Language With Programmable Resources}},
+	url = {https://developers.libra.org/docs/move-paper},
+	year = {2019},
+	bdsk-url-1 = {https://developers.libra.org/docs/move-paper}}
+
+@misc{DIEM_FRAMEWORK,
+	author = {{The Diem Association}},
+	title = {{The Diem Framework}},
+	url = {https://github.com/diem/diem/tree/release-1.5/diem-move/diem-framework},
+	year = {2020},
+	bdsk-url-1 = {https://github.com/diem/diem/tree/release-1.5/diem-move/diem-framework}}
+
+@inproceedings{LINEAR_TYPES,
+	author = {Philip Wadler},
+	booktitle = {PROGRAMMING CONCEPTS AND METHODS},
+	publisher = {North},
+	title = {Linear Types Can Change the World!},
+	year = {1990}}
+
+@article{RUST_TYPES,
+	archiveprefix = {arXiv},
+	author = {Aaron Weiss and Daniel Patterson and Nicholas D. Matsakis and Amal Ahmed},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/journals/corr/abs-1903-00982.bib},
+	eprint = {1903.00982},
+	journal = {CoRR},
+	timestamp = {Sat, 30 Mar 2019 19:27:21 +0100},
+	title = {Oxide: The Essence of Rust},
+	url = {http://arxiv.org/abs/1903.00982},
+	volume = {abs/1903.00982},
+	year = {2019},
+	bdsk-url-1 = {http://arxiv.org/abs/1903.00982}}
+
+@misc{MOVE_LANG,
+	author = {{The Move Team}},
+	title = {{The Move Programming Language}},
+	url = {https://diem.github.io/move},
+	year = {2020},
+	bdsk-url-1 = {https://diem.github.io/move},
+}
+
+@misc{MOVE_SPEC_LANG_DEF,
+	author = {{The Move Team}},
+	title = {{The Move Specification Language}},
+	url = {https://github.com/diem/diem/blob/release-1.5/language/move-prover/doc/user/spec-lang.md},
+	year = 2020,
+	bdsk-url-1 = {https://github.com/diem/diem/blob/release-1.5/language/move-prover/doc/user/spec-lang.md}
+}
+
+@misc{CVC,
+	author = {{The CVC Team}},
+	title = {{CVC5}},
+	url = {https://github.com/cvc5/cvc5},
+	bdsk-url-1 = {https://github.com/cvc5/cvc5}}
+
+@inproceedings{BUTTERFLY,
+	author        = "K. Rustan M. Leino and Clément Pit-Claudel",
+	booktitle     = "{Proceedings of the 28th International Conference on Computer Aided Verification, Part I}",
+	doi           = {10.1007/978-3-319-41528-4\_20},
+	isbn          = "978-3-319-41527-7",
+	pages         = "361--381",
+	publisher     = "{Springer}",
+	title         = "{Trigger Selection Strategies to Stabilize Program Verifiers}",
+	year          = 2016,
+}
+
+
+@misc{blackshear2020resources,
+	archiveprefix = {arXiv},
+	author = {Sam Blackshear and David L. Dill and Shaz Qadeer and Clark W. Barrett and John C. Mitchell and Oded Padon and Yoni Zohar},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/journals/corr/abs-2004-05106.bib},
+	eprint = {2004.05106},
+	journal = {CoRR},
+	timestamp = {Tue, 14 Apr 2020 16:40:34 +0200},
+	title = {Resources: {A} Safe Language Abstraction for Money},
+	url = {https://arxiv.org/abs/2004.05106},
+	volume = {abs/2004.05106},
+	year = {2020},
+	bdsk-url-1 = {https://arxiv.org/abs/2004.05106}}
+
+@article{prusti,
+	author = {Vytautas Astrauskas and Peter M{\"{u}}ller and Federico Poli and Alexander J. Summers},
+	journal = {{PACMPL}},
+	number = {{OOPSLA}},
+	pages = {147:1--147:30},
+	title = {Leveraging rust types for modular specification and verification},
+	volume = {3},
+	year = {2019}}
+
+@inproceedings{SMTLib2010,
+	author = {Clark Barrett and Aaron Stump and Cesare Tinelli},
+	booktitle = {Proceedings of the 8th International Workshop on Satisfiability Modulo Theories (Edinburgh, UK)},
+	editor = {A.~Gupta and D.~Kroening},
+	title = {{The SMT-LIB Standard: Version 2.0}},
+	year = 2010}
+
+@misc{libra_blockchain_white,
+	author = {Zachary Amsden and Ramnik Arora and Shehar Bano and Mathieu Baudet and Sam Blackshear and Abhay Bothra and George Cabrera and Christian Catalini and Konstantinos Chalkias and Evan Cheng and Avery Ching and Andrey Chursin and George Danezis and Gerardo Di Giacomo and David L. Dill and Hui Ding and Nick Doudchenko and Victor Gao and Zhenhuan Gao and Fran{\c c}ois Garillot and Michael Gorven and Philip Hayes and J. Mark Hou and Yuxuan Hu and Kevin Hurley and Kevin Lewi and Chunqi Li and Zekun Li and Dahlia Malkhi and Sonia Margulis and Ben Maurer and Payman Mohassel and Ladi de Naurois and Valeria Nikolaenko and Todd Nowacki and Oleksandr Orlov and Dmitri Perelman and Alistair Pott and Brett Proctor and Shaz Qadeer and Rain and Dario Russi and Bryan Schwab and Stephane Sezer and Alberto Sonnino and Herman Venter and Lei Wei and Nils Wernerfelt and Brandon Williams and Qinfan Wu and Xifan Yan and Tim Zakian and Runtian Zhou},
+	howpublished = {\url{https://developers.libra.org/docs/the-libra-blockchain-paper}},
+	title = {The {L}ibra {B}lockchain},
+	year = {2019}}
+
+@inproceedings{smack,
+	author = {Marek S. Baranowski and Shaobo He and Zvonimir Rakamaric},
+	booktitle = {{ATVA}},
+	pages = {528--535},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {Verifying Rust Programs with {SMACK}},
+	volume = {11138},
+	year = {2018}}
+
+@inproceedings{nopanic,
+	author = {Marcus Lindner and Jorge Aparicius and Per Lindgren},
+	booktitle = {{INDIN}},
+	pages = {108--114},
+	publisher = {{IEEE}},
+	title = {No Panic! Verification of Rust Programs by Symbolic Execution},
+	year = {2018}}
+
+@inproceedings{crust,
+	author = {John Toman and Stuart Pernsteiner and Emina Torlak},
+	booktitle = {{ASE}},
+	pages = {75--80},
+	publisher = {{IEEE} Computer Society},
+	title = {Crust: {A} Bounded Verifier for Rust {(N)}},
+	year = {2015}}
+
+@incollection{viper,
+	author = {Peter M{\"{u}}ller and Malte Schwerhoff and Alexander J. Summers},
+	booktitle = {Dependable Software Systems Engineering},
+	pages = {104--125},
+	publisher = {{IOS} Press},
+	series = {{NATO} Science for Peace and Security Series - {D:} Information and Communication Security},
+	title = {Viper: {A} Verification Infrastructure for Permission-Based Reasoning},
+	volume = {50},
+	year = {2017}}
+
+@misc{libra_consensus_white,
+	author = {Mathieu Baudet and Avery Ching and Andrey Chursin and George Danezis and Fran{\c c}ois Garillot and Zekun Li and Dahlia Malkhi and Oded Naor and Dmitri Perelman and Alberto Sonnino},
+	howpublished = {\url{https://developers.libra.org/docs/state-machine-replication-paper}},
+	title = {State Machine Replication in the {L}ibra {B}lockchain},
+	year = {2019}}
+
+@misc{libra_whitepaper,
+	author = {{The Libra Association}},
+	howpublished = {\url{https://libra.org/en-us/whitepaper}},
+	title = {An {I}ntroduction to {L}ibra},
+	year = {2019}}
+
+@misc{libra_association,
+	author = {{The Libra Association}},
+	howpublished = {\url{https://libra.org/en-us/association-council-principles}},
+	title = {The {L}ibra {A}ssociation}}
+
+@misc{libra_transition,
+	author = {Shehar Bano and Christian Catalini and George Danezis and Nick Doudchenko and Ben Maurer and Alberto Sonnino and Nils Wernerfelt},
+	howpublished = {\url{https://libra.org/permissionless-blockchain}},
+	title = {Moving Toward Permissionless Consensus}}
+
+@article{Herlihy2019,
+	acmid = {3209623},
+	address = {New York, NY, USA},
+	author = {Herlihy, Maurice},
+	doi = {10.1145/3209623},
+	issn = {0001-0782},
+	issue_date = {February 2019},
+	journal = {Commun. ACM},
+	month = jan,
+	number = {2},
+	numpages = {8},
+	pages = {78--85},
+	publisher = {ACM},
+	title = {Blockchains from a Distributed Computing Perspective},
+	url = {http://doi.acm.org/10.1145/3209623},
+	volume = {62},
+	year = {2019},
+	bdsk-url-1 = {http://doi.acm.org/10.1145/3209623},
+	bdsk-url-2 = {https://doi.org/10.1145/3209623}}
+
+@misc{JPMcoin,
+	author = {R. Armstrong},
+	howpublished = {Financial Times},
+	month = {February},
+	title = {JPMorgan plan to coin it on the blockchain},
+	url = {https://www.ft.com/content/0bafd9d6-307e-11e9-8744-e7016697f225},
+	year = {2019},
+	bdsk-url-1 = {https://www.ft.com/content/0bafd9d6-307e-11e9-8744-e7016697f225}}
+
+@misc{HBR-global-supply-chain,
+	author = {M.J. Casey and P. Wong},
+	howpublished = {Harvard Business Review},
+	month = {March},
+	title = {Global Supply Chains Are About to Get Better, Thanks to Blockchain},
+	year = {2017}}
+
+@inproceedings{DBLP:conf/ccs/BhargavanDFGGKK16,
+	author = {Karthikeyan Bhargavan and Antoine Delignat{-}Lavaud and C{\'{e}}dric Fournet and Anitha Gollamudi and Georges Gonthier and Nadim Kobeissi and Natalia Kulatova and Aseem Rastogi and Thomas Sibut{-}Pinote and Nikhil Swamy and Santiago Zanella B{\'{e}}guelin},
+	booktitle = {PLAS@CCS},
+	pages = {91--96},
+	publisher = {{ACM}},
+	title = {Formal Verification of Smart Contracts: Short Paper},
+	year = {2016}}
+
+@misc{solidity,
+	author = {Ethereum Foundation},
+	title = {Solidity Documentation},
+	url = {http://solidity.readthedocs.io},
+	year = {2018},
+	bdsk-url-1 = {http://solidity.readthedocs.io}}
+
+@misc{mythril,
+	author = {{ConsenSys}},
+	title = {{Mythril Classic: Security analysis tool for Ethereum smart contracts}},
+	url = {https://github.com/skylightcyber/mythril-classic},
+	bdsk-url-1 = {https://github.com/skylightcyber/mythril-classic}}
+
+@inproceedings{post2018,
+	author = {Ilya Grishchenko and Matteo Maffei and Clara Schneidewind},
+	booktitle = {{POST}},
+	pages = {243--269},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {A Semantic Framework for the Security Analysis of Ethereum Smart Contracts},
+	volume = {10804},
+	year = {2018}}
+
+@article{concert,
+	author = {Danil Annenkov and Bas Spitters},
+	journal = {CoRR},
+	title = {Towards a Smart Contract Verification Framework in Coq},
+	volume = {abs/1907.10674},
+	year = {2019}}
+
+@article{fspvme,
+	author = {Zheng Yang and Hang Lei},
+	journal = {CoRR},
+	title = {Formal Process Virtual Machine for Smart Contracts Verification},
+	volume = {abs/1805.00808},
+	year = {2018}}
+
+@article{fether,
+	author = {Zheng Yang and Hang Lei},
+	journal = {{IEEE} Access},
+	pages = {37770--37791},
+	title = {FEther: An Extensible Definitional Interpreter for Smart-Contract Verifications in Coq},
+	volume = {7},
+	year = {2019}}
+
+@other{coqref,
+	author = {{The Coq development team}},
+	title = {The Coq Proof Assistant Reference Manual Version 8.9},
+	url = {https://coq.inria.fr/distrib/current/refman/},
+	year = {2019},
+	bdsk-url-1 = {https://coq.inria.fr/distrib/current/refman/}}
+
+@inproceedings{dm4all,
+	author = {Kenji Maillard and Danel Ahman and Robert Atkey and Guido Mart\'inez and Catalin Hritcu and Exequiel Rivas and \'Eric Tanter},
+	booktitle = {24th ACM SIGPLAN International Conference on Functional Programming (ICFP)},
+	title = {Dijkstra Monads for All},
+	url = {https://arxiv.org/abs/1903.01237},
+	year = {2019},
+	bdsk-url-1 = {https://arxiv.org/abs/1903.01237}}
+
+@article{reachabilitylogic,
+	author = {Andrei Stefanescu and \c{S}tefan Ciob\^ac\u{a} and Radu Mereuta and Brandon M. Moore and Traian{-}Florin Serbanuta and Grigore Rosu},
+	journal = {Logical Methods in Computer Science},
+	number = {2},
+	title = {All-Path Reachability Logic},
+	volume = {15},
+	year = {2019}}
+
+@article{kay,
+	author = {Grigore Rosu and Traian{-}Florin Serbanuta},
+	journal = {J. Log. Algebr. Program.},
+	number = {6},
+	pages = {397--434},
+	title = {An overview of the {K} semantic framework},
+	volume = {79},
+	year = {2010}}
+
+@inproceedings{kevm,
+	author = {Everett Hildenbrandt and Manasvi Saxena and Nishant Rodrigues and Xiaoran Zhu and Philip Daian and Dwight Guth and Brandon M. Moore and Daejun Park and Yi Zhang and Andrei Stefanescu and Grigore Rosu},
+	booktitle = {{CSF}},
+	pages = {204--217},
+	publisher = {{IEEE} Computer Society},
+	title = {{KEVM:} {A} Complete Formal Semantics of the Ethereum Virtual Machine},
+	year = {2018}}
+
+@inproceedings{securify,
+	author = {Petar Tsankov and Andrei Marian Dan and Dana Drachsler{-}Cohen and Arthur Gervais and Florian B{\"{u}}nzli and Martin T. Vechev},
+	booktitle = {{ACM} Conference on Computer and Communications Security},
+	pages = {67--82},
+	publisher = {{ACM}},
+	title = {Securify: Practical Security Analysis of Smart Contracts},
+	year = {2018}}
+
+@inproceedings{maian,
+	author = {Ivica Nikolic and Aashish Kolluri and Ilya Sergey and Prateek Saxena and Aquinas Hobor},
+	booktitle = {{ACSAC}},
+	pages = {653--663},
+	publisher = {{ACM}},
+	title = {Finding The Greedy, Prodigal, and Suicidal Contracts at Scale},
+	year = {2018}}
+
+@inproceedings{oyente,
+	author = {Loi Luu and Duc{-}Hiep Chu and Hrishi Olickel and Prateek Saxena and Aquinas Hobor},
+	booktitle = {{ACM} Conference on Computer and Communications Security},
+	pages = {254--269},
+	publisher = {{ACM}},
+	title = {Making Smart Contracts Smarter},
+	year = {2016}}
+
+@inproceedings{smtalt18,
+	author = {Leonardo Alt and Christian Reitwie{\ss}ner},
+	booktitle = {ISoLA {(4)}},
+	pages = {376--388},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {{SMT-Based Verification of Solidity Smart Contracts}},
+	volume = {11247},
+	year = {2018}}
+
+@article{solcverify,
+	author = {{\'{A}}kos Hajdu and Dejan Jovanovic},
+	journal = {CoRR},
+	title = {solc-verify: {A} Modular Verifier for Solidity Smart Contracts},
+	volume = {abs/1907.04262},
+	year = {2019}}
+
+@inproceedings{corral,
+	author = {Akash Lal and Shaz Qadeer and Shuvendu K. Lahiri},
+	booktitle = {{CAV}},
+	pages = {427--443},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {A Solver for Reachability Modulo Theories},
+	volume = {7358},
+	year = {2012}}
+
+@article{verisol,
+	author = {Shuvendu K. Lahiri and Shuo Chen and Yuepeng Wang and Isil Dillig},
+	journal = {CoRR},
+	title = {Formal Specification and Verification of Smart Contracts for Azure Blockchain},
+	volume = {abs/1812.08829},
+	year = {2018}}
+
+@article{scilla,
+	author = {Ilya Sergey and Vaivaswatha Nagaraj and Jacob Johannsen and Amrit Kumar and Anton Trunov and Ken Chan Guan Hao},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/journals/pacmpl/SergeyNJ0TH19},
+	doi = {10.1145/3360611},
+	journal = {{PACMPL}},
+	number = {{OOPSLA}},
+	pages = {185:1--185:30},
+	timestamp = {Mon, 21 Oct 2019 15:15:21 +0200},
+	title = {Safer smart contract programming with Scilla},
+	url = {https://doi.org/10.1145/3360611},
+	volume = {3},
+	year = {2019},
+	bdsk-url-1 = {https://doi.org/10.1145/3360611}}
+
+@misc{erc20,
+	author = {Vitalik Buterin and Fabian Vogelsteller},
+	title = {ERC20 Token Standard},
+	url = {https://theethereum.wiki/w/index.php/ERC20_Token_Standard},
+	year = {2015},
+	bdsk-url-1 = {https://theethereum.wiki/w/index.php/ERC20_Token_Standard}}
+
+@misc{re_dao,
+	author = {Vitalik Buterin},
+	title = {Critical update re {DAO}},
+	url = {https://ethereum.github.io/blog/2016/06/17/critical-update-re-dao-vulnerability},
+	year = {2016},
+	bdsk-url-1 = {https://ethereum.github.io/blog/2016/06/17/critical-update-re-dao-vulnerability}}
+
+@misc{sm,
+	author = {{Synthetic Minds Blog}},
+	title = {Verifying Smart Contracts in The Move Language},
+	url = {https://synthetic-minds.com/pages/blog/blog-2019-09-11.html},
+	year = {2019},
+	bdsk-url-1 = {https://synthetic-minds.com/pages/blog/blog-2019-09-11.html}}
+
+@inproceedings{DBLP:conf/esop/HajduJ20,
+	author = {{\'{A}}kos Hajdu and Dejan Jovanovic},
+	booktitle = {{ESOP}},
+	pages = {224--250},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {{SMT-Friendly Formalization of the Solidity Memory Model}},
+	volume = {12075},
+	year = {2020}}
+
+@misc{parity_hack,
+	author = {Palladino, Santiago},
+	title = {The {P}arity wallet hack explained},
+	url = {https://blog. zeppelin. solutions/on-the-parity-wallet-multisig-hack-405a8c12e8f7},
+	year = {2017},
+	bdsk-url-1 = {https://blog.%20zeppelin.%20solutions/on-the-parity-wallet-multisig-hack-405a8c12e8f7}}
+
+@article{nakamoto,
+	author = {Satoshi Nakamoto},
+	title = {Bitcoin: A peer-to-peer electronic cash system},
+	url = {http://bitcoin.org/bitcoin.pdf},
+	year = {2008},
+	bdsk-url-1 = {http://bitcoin.org/bitcoin.pdf}}
+
+@misc{bitcoin_script,
+	author = {Bitcoin Wiki},
+	title = {Bitcoin Script},
+	url = {https://en.bitcoin.it/wiki/Script},
+	year = {online},
+	bdsk-url-1 = {https://en.bitcoin.it/wiki/Script}}
+
+@misc{simplicity,
+	author = {Russell O'Connor},
+	title = {Simplicity: A New Language for Blockchains},
+	url = {https://blockstream.com/simplicity.pdf},
+	year = {2017},
+	bdsk-url-1 = {https://blockstream.com/simplicity.pdf}}
+
+@article{ethereum,
+	author = {Gavin Wood},
+	title = {Ethereum: A secure decentralised generalised transaction ledger},
+	url = {https://ethereum.github.io/yellowpaper/paper.pdf},
+	year = {2014},
+	bdsk-url-1 = {https://ethereum.github.io/yellowpaper/paper.pdf}}
+
+@incollection{substructural_type_systems,
+	author = {David Walker},
+	booktitle = {Advanced Topics in Types and Programming Languages},
+	chapter = {1},
+	isbn = {0262162288},
+	publisher = {The MIT Press},
+	title = {Substructural Type Systems},
+	year = {2004}}
+
+@article{tal,
+	author = {J. Gregory Morrisett and David Walker and Karl Crary and Neal Glew},
+	journal = {{ACM} Trans. Program. Lang. Syst.},
+	title = {From {S}ystem {F} to typed assembly language},
+	year = {1999}}
+
+@article{linear_logic,
+	author = {Jean{-}Yves Girard},
+	journal = {Theor. Comput. Sci.},
+	title = {Linear Logic},
+	year = {1987}}
+
+@article{using_time,
+	author = {Leslie Lamport},
+	journal = {{ACM} Trans. Program. Lang. Syst.},
+	title = {Using Time Instead of Timeout for Fault-Tolerant Distributed Systems},
+	year = {1984}}
+
+@book{jvm,
+	author = {Tim Lindholm and Frank Yellin},
+	publisher = {Addison-Wesley},
+	title = {The {J}ava Virtual Machine Specification},
+	year = {1997}}
+
+@misc{clr,
+	author = {Erik Meijer and Redmond Wa and John Gough},
+	title = {Technical Overview of the Common Language Runtime},
+	year = {2000}}
+
+@misc{michelson,
+	author = {Tezos Foundation},
+	howpublished = {\url{http://tezos.gitlab.io/mainnet/whitedoc/michelson.html}},
+	title = {Michelson: the language of Smart Contracts in Tezos},
+	year = {2018}}
+
+@misc{plutus,
+	author = {IOHK Foundation},
+	howpublished = {\url{https://testnet.iohkdev.io/plutus}},
+	title = {Plutus: A Functional Contract Platform},
+	year = {2019}}
+
+@misc{agoric,
+	author = {Agoric},
+	url = {https://github.com/Agoric/SES},
+	bdsk-url-1 = {https://github.com/Agoric/SES}}
+
+@misc{github-libra,
+	author = {Libra},
+	url = {https://github.com/libra/libra},
+	bdsk-url-1 = {https://github.com/libra/libra}}
+
+@inproceedings{boogieIVL,
+	address = {Berlin, Heidelberg},
+	author = {Leino, K. Rustan M. and R{\"u}mmer, Philipp},
+	booktitle = {TACAS},
+	editor = {Esparza, Javier and Majumdar, Rupak},
+	isbn = {978-3-642-12002-2},
+	pages = {312--327},
+	publisher = {Springer Berlin Heidelberg},
+	title = {A Polymorphic Intermediate Verification Language: Design and Logical Encoding},
+	year = {2010}}
+
+@misc{thisisboogie2,
+	author = {Leino, K. Rustan M.},
+	note = {Manuscript KRML 178},
+	title = {This is Boogie 2},
+	url = {{https://www.microsoft.com/en-us/research/publication/this-is-boogie-2-2/}},
+	year = {2008},
+	bdsk-url-1 = {%7Bhttps://www.microsoft.com/en-us/research/publication/this-is-boogie-2-2/%7D}}
+
+@inproceedings{BL05,
+	address = {New York, NY, USA},
+	author = {Barnett, Mike and Leino, K. Rustan M.},
+	booktitle = {Proceedings of the 6th ACM SIGPLAN-SIGSOFT Workshop on Program Analysis for Software Tools and Engineering},
+	doi = {10.1145/1108792.1108813},
+	isbn = {1595932399},
+	location = {Lisbon, Portugal},
+	numpages = {6},
+	pages = {82---87},
+	publisher = {Association for Computing Machinery},
+	title = {Weakest-Precondition of Unstructured Programs},
+	year = {2005},
+	bdsk-url-1 = {https://doi.org/10.1145/1108792.1108813}}
+
+@inproceedings{boogie,
+	author = {Barnett, Mike and Chang, Bor-Yuh Evan and DeLine, Robert and Jacobs, Bart and Leino, K Rustan M},
+	booktitle = {International Symposium on Formal Methods for Components and Objects},
+	organization = {Springer},
+	pages = {364--387},
+	title = {Boogie: A modular reusable verifier for object-oriented programs},
+	year = {2005}}
+
+@misc{boogie-github,
+	title = {Boogie},
+	url = {https://github.com/boogie-org/boogie},
+	bdsk-url-1 = {https://github.com/boogie-org/boogie}}
+
+@misc{pact,
+	author = {Stuart Popejoy},
+	howpublished = {\url{ http://kadena.io/docs/Kadena-PactWhitepaper.pdf}},
+	title = {The Pact Smart-Contract Language},
+	year = {2017}}
+
+@article{tx_replay,
+	author = {Muhammad Saad and Jeffrey Spaulding and Laurent Njilla and Charles A. Kamhoua and Sachin Shetty and DaeHun Nyang and Aziz Mohaisen},
+	journal = {CoRR},
+	title = {Exploring the Attack Surface of Blockchain: {A} Systematic Overview},
+	year = {2019}}
+
+@inproceedings{Jones-al:POPL79,
+	author = {Jones, Neil D. and Muchnick, Steven S.},
+	booktitle = {POPL},
+	title = {Flow Analysis and Optimization of {LISP}-like Structures},
+	year = {1979}}
+
+@inproceedings{standard_ml90,
+	author = {Robin Milner and Mads Tofte and Robert Harper},
+	publisher = {{MIT} Press},
+	title = {Definition of standard {ML}},
+	year = {1990}}
+
+@inproceedings{BartolettiZ18,
+	author = {Massimo Bartoletti and Roberto Zunino},
+	booktitle = {Proceedings of the {ACM} {SIGSAC} Conference on Computer and Communications Security},
+	title = {BitML: {A} Calculus for {B}itcoin Smart Contracts},
+	year = {2018}}
+
+@inproceedings{CraryS15,
+	author = {Karl Crary and Michael J. Sullivan},
+	booktitle = {Proceedings of the {ACM} {SIGPLAN} Conference on Programming Language Design and Implementation},
+	title = {Peer-to-peer affine commitment using bitcoin},
+	year = {2015}}
+
+@article{szabo_smart_contracts,
+	author = {Nick Szabo},
+	journal = {First Monday},
+	number = {9},
+	title = {Formalizing and Securing Relationships on Public Networks},
+	url = {https://ojphi.org/ojs/index.php/fm/article/view/548},
+	volume = {2},
+	year = {1997},
+	bdsk-url-1 = {https://ojphi.org/ojs/index.php/fm/article/view/548}}
+
+@inproceedings{MazurakZZ10,
+	author = {Karl Mazurak and Jianzhou Zhao and Steve Zdancewic},
+	booktitle = {Proceedings of the {ACM} {SIGPLAN} International Workshop on Types in Languages Design and Implementation},
+	title = {Lightweight Linear Types in {S}ystem {F}},
+	year = {2010}}
+
+@inproceedings{necula1997proof,
+	author = {George C. Necula},
+	booktitle = {Proceedings of the {ACM} {SIGPLAN} Symposium on Principles of Programming Languages},
+	title = {Proof-carrying code},
+	year = {1997}}
+
+@article{DBLP:journals/corr/abs-1908-04507,
+	author = {Huashan Chen and Marcus Pendleton and Laurent Njilla and Shouhuai Xu},
+	journal = {CoRR},
+	title = {A Survey on Ethereum Systems Security: Vulnerabilities, Attacks and Defenses},
+	volume = {abs/1908.04507},
+	year = {2019}}
+
+@inproceedings{eth_vulns,
+	author = {Nicola Atzei and Massimo Bartoletti and Tiziana Cimoli},
+	booktitle = {{POST}},
+	pages = {164--186},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {A Survey of Attacks on Ethereum Smart Contracts (SoK)},
+	volume = {10204},
+	year = {2017}}
+
+@techreport{capability-myths,
+	author = {Mark S. Miller and Ka-Ping Yee and Jonathan Shapiro},
+	title = {Capability Myths Demolished},
+	year = {2003}}
+
+@article{Hardy94theconfused,
+	author = {Norman Hardy},
+	journal = {ACM SIGOPS Operating Systems Review},
+	pages = {36--38},
+	title = {The Confused Deputy (or why capabilities might have been invented)},
+	volume = {22},
+	year = {1994}}
+
+@article{DBLP:journals/pacmpl/Swasey0D17,
+	author = {David Swasey and Deepak Garg and Derek Dreyer},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/journals/pacmpl/Swasey0D17},
+	doi = {10.1145/3133913},
+	journal = {{PACMPL}},
+	number = {{OOPSLA}},
+	pages = {89:1--89:26},
+	timestamp = {Tue, 06 Nov 2018 12:51:05 +0100},
+	title = {Robust and compositional verification of object capability patterns},
+	url = {https://doi.org/10.1145/3133913},
+	volume = {1},
+	year = {2017},
+	bdsk-url-1 = {https://doi.org/10.1145/3133913}}
+
+@inproceedings{DBLP:conf/fm/KasampalisGMSZF19,
+	author = {Theodoros Kasampalis and Dwight Guth and Brandon M. Moore and Traian{-}Florin Serbanuta and Yi Zhang and Daniele Filaretti and Virgil Nicolae Serbanuta and Ralph Johnson and Grigore Rosu},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/conf/fm/KasampalisGMSZF19},
+	booktitle = {Formal Methods - The Next 30 Years - Third World Congress, {FM} 2019, Porto, Portugal, October 7-11, 2019, Proceedings},
+	pages = {593--610},
+	timestamp = {Mon, 23 Sep 2019 13:52:37 +0200},
+	title = {{IELE:} {A} Rigorously Designed Language and Tool Ecosystem for the Blockchain},
+	year = {2019}}
+
+@article{DBLP:journals/corr/abs-1904-06534,
+	archiveprefix = {arXiv},
+	author = {Franklin Schrans and Daniel Hails and Alexander Harkness and Sophia Drossopoulou and Susan Eisenbach},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/journals/corr/abs-1904-06534},
+	eprint = {1904.06534},
+	journal = {CoRR},
+	timestamp = {Thu, 25 Apr 2019 13:55:01 +0200},
+	title = {Flint for Safer Smart Contracts},
+	url = {http://arxiv.org/abs/1904.06534},
+	volume = {abs/1904.06534},
+	year = {2019},
+	bdsk-url-1 = {http://arxiv.org/abs/1904.06534}}
+
+@inproceedings{DBLP:conf/icse/Coblenz17,
+	author = {Michael J. Coblenz},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/conf/icse/Coblenz17},
+	booktitle = {Proceedings of the 39th International Conference on Software Engineering, {ICSE} 2017, Buenos Aires, Argentina, May 20-28, 2017 - Companion Volume},
+	doi = {10.1109/ICSE-C.2017.150},
+	pages = {97--99},
+	timestamp = {Wed, 16 Oct 2019 14:14:49 +0200},
+	title = {Obsidian: a safer blockchain programming language},
+	url = {https://doi.org/10.1109/ICSE-C.2017.150},
+	year = {2017},
+	bdsk-url-1 = {https://doi.org/10.1109/ICSE-C.2017.150}}
+
+@article{DBLP:journals/corr/abs-1909-03523,
+	archiveprefix = {arXiv},
+	author = {Michael J. Coblenz and Reed Oei and Tyler Etzel and Paulette Koronkevich and Miles Baker and Yannick Bloem and Brad A. Myers and Joshua Sunshine and Jonathan Aldrich},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/journals/corr/abs-1909-03523},
+	eprint = {1909.03523},
+	journal = {CoRR},
+	timestamp = {Tue, 17 Sep 2019 11:23:44 +0200},
+	title = {Obsidian: Typestate and Assets for Safer Blockchain Programming},
+	url = {http://arxiv.org/abs/1909.03523},
+	volume = {abs/1909.03523},
+	year = {2019},
+	bdsk-url-1 = {http://arxiv.org/abs/1909.03523}}
+
+@misc{das2019resourceaware,
+	archiveprefix = {arXiv},
+	author = {Ankush Das and Stephanie Balzer and Jan Hoffmann and Frank Pfenning},
+	eprint = {1902.06056},
+	primaryclass = {cs.PL},
+	title = {Resource-Aware Session Types for Digital Contracts},
+	year = {2019}}
+
+@misc{hyperledger,
+	author = {The Linux Foundation},
+	howpublished = {\url{https://www.hyperledger.org/projects/fabric}},
+	title = {Hyperledger Fabric},
+	year = {2018}}
+
+@inproceedings{DBLP:conf/pldi/GrossmanMJHWC02,
+	author = {Dan Grossman and J. Gregory Morrisett and Trevor Jim and Michael W. Hicks and Yanling Wang and James Cheney},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/conf/pldi/GrossmanMJHWC02},
+	booktitle = {Proceedings of the 2002 {ACM} {SIGPLAN} Conference on Programming Language Design and Implementation (PLDI), Berlin, Germany, June 17-19, 2002},
+	doi = {10.1145/512529.512563},
+	pages = {282--293},
+	timestamp = {Tue, 06 Nov 2018 16:59:30 +0100},
+	title = {Region-Based Memory Management in Cyclone},
+	url = {https://doi.org/10.1145/512529.512563},
+	year = {2002},
+	bdsk-url-1 = {https://doi.org/10.1145/512529.512563}}
+
+@inproceedings{DBLP:conf/popl/TovP11,
+	author = {Jesse A. Tov and Riccardo Pucella},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/conf/popl/TovP11},
+	booktitle = {Proceedings of the 38th {ACM} {SIGPLAN-SIGACT} Symposium on Principles of Programming Languages, {POPL} 2011, Austin, TX, USA, January 26-28, 2011},
+	doi = {10.1145/1926385.1926436},
+	pages = {447--458},
+	timestamp = {Tue, 06 Nov 2018 11:07:43 +0100},
+	title = {Practical affine types},
+	url = {https://doi.org/10.1145/1926385.1926436},
+	year = {2011},
+	bdsk-url-1 = {https://doi.org/10.1145/1926385.1926436}}
+
+@inproceedings{DBLP:conf/agere/ClebschDBM15,
+	author = {Sylvan Clebsch and Sophia Drossopoulou and Sebastian Blessing and Andy McNeil},
+	bibsource = {dblp computer science bibliography, https://dblp.org},
+	biburl = {https://dblp.org/rec/bib/conf/agere/ClebschDBM15},
+	booktitle = {Proceedings of the 5th International Workshop on Programming Based on Actors, Agents, and Decentralized Control, AGERE! 2015, Pittsburgh, PA, USA, October 26, 2015},
+	doi = {10.1145/2824815.2824816},
+	pages = {1--12},
+	timestamp = {Sun, 02 Jun 2019 21:20:00 +0200},
+	title = {Deny capabilities for safe, fast actors},
+	url = {https://doi.org/10.1145/2824815.2824816},
+	year = {2015},
+	bdsk-url-1 = {https://doi.org/10.1145/2824815.2824816}}
+
+@inproceedings{Smetsers:1993:GSD:647364.725667,
+	acmid = {725667},
+	address = {Berlin, Heidelberg},
+	author = {Smetsers, Sjaak and Barendsen, Erik and Eekelen, Marko C. J. D. van and Plasmeijer, Marinus J.},
+	booktitle = {Proceedings of the International Workshop on Graph Transformations in Computer Science},
+	isbn = {3-540-57787-4},
+	numpages = {22},
+	pages = {358--379},
+	publisher = {Springer-Verlag},
+	title = {Guaranteeing Safe Destructive Updates Through a Type System with Uniqueness Information for Graphs},
+	url = {http://dl.acm.org/citation.cfm?id=647364.725667},
+	year = {1994},
+	bdsk-url-1 = {http://dl.acm.org/citation.cfm?id=647364.725667}}
+
+@book{Ethan:2017:BWS:3165061,
+	address = {USA},
+	author = {Ethan, Maynard},
+	isbn = {1548488062, 9781548488062},
+	publisher = {CreateSpace Independent Publishing Platform},
+	title = {Bitcoin Wallet Security: The Essential Guide to Bitcoin Wallet Security},
+	year = {2017}}
+
+@article{rust,
+	acmid = {2663188},
+	address = {New York, NY, USA},
+	author = {Matsakis, Nicholas D. and Klock,II, Felix S.},
+	doi = {10.1145/2692956.2663188},
+	issn = {1094-3641},
+	issue_date = {December 2014},
+	journal = {Ada Lett.},
+	keywords = {affine type systems, memory management, rust, systems programming},
+	month = oct,
+	number = {3},
+	numpages = {2},
+	pages = {103--104},
+	publisher = {ACM},
+	title = {{The Rust Language},
+	NOurl = {http://doi.acm.org/10.1145/2692956.2663188}},
+	volume = {34},
+	year = {2014},
+	bdsk-url-1 = {http://doi.acm.org/10.1145/2692956.2663188},
+	bdsk-url-2 = {https://doi.org/10.1145/2692956.2663188}}
+
+@book{c++,
+	author = {Stroustrup, Bjarne},
+	edition = {4th},
+	isbn = {0321563840, 9780321563842},
+	publisher = {Addison-Wesley Professional},
+	title = {The C++ Programming Language},
+	year = {2013}}
+
+@inproceedings{BCD+11,
+	author = {Clark Barrett and Christopher L. Conway and Morgan Deters and Liana Hadarean and Dejan Jovanovi\'c and Tim King and Andrew Reynolds and Cesare Tinelli},
+	booktitle = {Proceedings of the $23^{rd}$ International Conference on Computer Aided Verification (CAV '11)},
+	editor = {Ganesh Gopalakrishnan and Shaz Qadeer},
+	month = jul,
+	note = {{Snowbird, Utah}},
+	pages = {171--177},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {{CVC4}},
+	volume = 6806,
+	year = 2011}
+
+@inproceedings{z3,
+	author = {Leonardo Mendon{\c{c}}a de Moura and Nikolaj Bj{\o}rner},
+	booktitle = {{TACAS}},
+	pages = {337--340},
+	publisher = {Springer},
+	series = {Lecture Notes in Computer Science},
+	title = {{Z3:} An Efficient {SMT} Solver},
+	volume = {4963},
+	year = {2008}}
+
+@misc{hacks-on-smart-contracts,
+	author = {{Morisander}},
+	title = {{The Biggest Smart Contract Hacks in History Or How to Endanger up to US \$2.2 Billion}},
+	howpublished = {\url{https://medium.com/solidified/the-biggest-smart-contract-hacks-in-history-or-how-to-endanger-up-to-us-2-2-billion-d5a72961d15d}},
+	year = {2018}}
+
+@misc{hacks-on-compound,
+	author = {MacKenzie Sigalos},
+	title = {{Bug Puts \$162 Million up for Grabs, Says Founder of DeFi Platform Compound}},
+	howpublished = {\url{https://www.cnbc.com/2021/10/03/162-million-up-for-grabs-after-bug-in-defi-protocol-compound-.html}},
+	year = {2021}}
+
+@misc{StateConstraintsPatent,
+   author = {Nikolai Tillmann and Wolfgang Grieskamp and Wolfram Schulte},
+   title = {Efficient checking of state-dependent constraints},
+   year = {U.S. Patent 20050198621A1, 2004}
+}
+
+@misc{MVP_ARTIFACT,
+	author = {{Meng Xu}},
+	title = {{Artifact for Paper ``Fast and Reliable Formal Verification of Smart Contracts with the Move Prover''}},
+
+	url = {https://github.com/meng-xu-cs/mvp-artifact},
+	bdsk-url-1 = {https://github.com/meng-xu-cs/mvp-artifact},
+	year = 2020,
+}
diff --git a/vendors/move/crates/move-prover/doc/paper21/conclusion.tex b/vendors/move/crates/move-prover/doc/paper21/conclusion.tex
new file mode 100644
index 000000000..1872f7b90
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/conclusion.tex
@@ -0,0 +1,19 @@
+\Section{Conclusion}
+
+We described key aspects of the Move prover (\MVP), a tool for formal
+verification of smart contracts written in the Move language. \MVP has been
+successfully used to verify large parts of the Diem framework, and is used in
+continuous integration in production. The specification language is expressive,
+specifically by the powerful concept of global invariants.  We described key
+implementation techniques which (as confirmed by our benchmarks) contributed to
+the scalability of \MVP. One of the main areas of our future research is to
+improve specification productivity and reduce the effort of reading and writing
+specs, as well as to continue to improve speed and predictability of
+verification.
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/corrected_example-apx.tex b/vendors/move/crates/move-prover/doc/paper21/corrected_example-apx.tex
new file mode 100644
index 000000000..4f13a29af
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/corrected_example-apx.tex
@@ -0,0 +1,33 @@
+\Section{Corrected Account Example}
+\label{sec:CorrectedAccount}
+
+To fix the verification errors from the account example in  Fig.~\ref{fig:AccountDef}
+and Fig.~\ref{fig:AccountSpec}, the following changes would need to be made:
+
+\begin{MoveBox}
+module Account {
+  ...
+
+  fun withdraw(account: address, amount: u64) acquires Account {
+    assert(amount <= AccountLimits::max_decrease(), Errors::invalid_argument()); // MISSING
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert(*balance >= amount, Errors::limit_exceeded());
+    assert(*balance - amount >= AccountLimits::min_balance(), Errors::invalid_argument()); // MISSING
+    *balance = *balance - amount;
+  }
+
+  spec transfer {
+    ...
+    aborts_if !exists<Account>(from_addr); // MISSING
+    aborts_if !exists<Account>(to); // MISSING
+    aborts_if amount > AccountLimits::max_decrease(); // MISSING
+    aborts_if bal(from_addr) - amount < AccountLimits::min_balance(); // MISSING
+  }
+}
+\end{MoveBox}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/design.tex b/vendors/move/crates/move-prover/doc/paper21/design.tex
new file mode 100644
index 000000000..469b1e1cf
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/design.tex
@@ -0,0 +1,576 @@
+\Section{Move Prover Design}
+
+\begin{Figure}
+  \centering
+  \caption{Move Prover Architecture}
+  \label{fig:Arch}
+  \includegraphics[trim=0 250 0 0, width=\textwidth]{arch.png}
+\end{Figure}
+
+The architecture of \MVP is illustrated in Fig.~\ref{fig:Arch}. Move code
+(containing specifications) is given as input to the tool chain, which
+produces two artifacts: an abstract syntax tree (AST) of the specifications,
+and the generated bytecode.  The \emph{Move Model} merges both bytecode and
+specifications, as well as other metadata from the original code, into a
+unified object model which is input to the remaining tool chain.
+
+The next phase is the actual \emph{Prover Compiler}, which is a
+pipeline of bytecode transformations. We focus on the
+transformations shown (Reference Elimination, Specification Injection, and
+Monomorphization).
+%% These transformations will be conceptually described in more
+%% detail in subsequent sections.
+The Prover uses a modified version of the Move VM bytecode as an intermediate
+representation for these transformations, but, for clarity,
+we describe the transformations at the Move source level.
+
+The transformed bytecode is next compiled into the Boogie intermediate
+verification language \cite{BOOGIE}. Boogie supports an imperative programming
+model which is well suited for the encoding of the transformed Move code. Boogie
+in turn can translate to multiple SMT solver backends, namely Z3 \cite{Z3} and
+CVC5 \cite{CVC}; the default choice for the Move prover is currently Z3.
+
+% When the SMT solver produces a |sat| or |unknown| result (of the negation of the
+% verification condition Boogie generates), it produces a model witness. The Move
+% Prover attempts to translate this model back into a diagnostic which
+% a user can associate with the original Move code (as has been illustrated in
+% Sec.~\ref{sec:RunningProver}.) For example, execution traces leading to the
+% verification failure are shown, with assignments to variables used in this
+% trace, extracted from the model. Also the Move Model will be consulted to
+% retrieve the original source information and display it with the diagnosis.
+
+%% Subsequently, we will focus on the major bytecode transformations.
+
+\SubSection{Reference Elimination}
+\label{sec:RefElim}
+
+The reference elimination transformation is what enables the
+alias-free memory model in the Move Prover, which is one of the most
+important factors contributing to the speed and reliability of the
+system.  In most software verification and static analysis systems,
+the explosion in number of possible aliasing relationships between
+references leads either to high computational complexity or harsh
+approximations.
+
+In Move, the reference system is based on
+\emph{borrow semantics}~\cite{BORROW_SEM} as in the Rust programming language.
+%
+The initial borrow must come from either
+a global memory or
+a local variable on stack
+(both referred to as \emph{locations} from now on).
+%
+For local variables, one can create
+immutable references (with syntax |&x|) and
+mutable references (with syntax |&mut x|).
+%
+For global memories, the references can be created via the
+|borrow_global| and |borrow_global_mut| built-ins.
+%
+Given a reference to a whole struct,
+field borrowing can occur via |&mut x.f| and |&x.f|.
+%
+Similarly, with a reference to a vector,
+element borrowing occurs via native functions
+|Vector::borrow(v, i)| and |Vector::borrow_mut(v, i)|.
+%
+Move provides the following guarantees,
+which are enforced by the borrow checker:
+% ~\cite{BORROW_CHECKER}:
+
+\begin{itemize}
+\item For any location, there can be
+  either exactly one mutable reference,
+  or $n$ immutable references.
+  %
+  Enforcing this rule is similar to enforcing the borrow semantics
+  in Rust, except for global memories, which do not exist in Rust.
+  %
+  For global memories,
+  this rule is enforced via the |acquires| annotations.
+  %
+  Using Fig.~\ref{fig:AccountDef} as an example,
+  function |withdraw| |acquires| the |Account| global location,
+  therefore, |withdraw| is prohibited from calling any other function that might
+  also borrow or modify the |Account| global memory (e.g., |deposit|).
+\item The lifetime of references to data on the stack
+  cannot exceed the lifetime of the stack location.
+  %
+  This includes global memories borrowed inside a function as well---a
+  reference to a global memory cannot be returned from the function,
+  neither in whole nor in parts.
+\end{itemize}
+
+\noindent These properties effectively permit the \emph{elimination of
+  references} from a Move program, eliminating need to reason about aliasing.
+
+\Paragraph{Immutable References}
+
+Immutable references are replaced by values.
+An example of the applied transformation is shown below. We remove the reference
+type constructor and all reference-taking operations from the code:
+
+\begin{Move}
+  fun select_f(s: &S): &T { &s.f } @\transform@ fun select_f(s: S): T { s.f }
+\end{Move}
+
+\noindent
+When executing a Move program, immutable references are important to avoid copies
+for performance and to enforce ownership; however, for symbolic reasoning on
+correct Move programs, the distinction between immutable references and values
+is unimportant.
+
+\Paragraph{Mutable References}
+\label{sec:RefElimMut}
+
+Each mutation of a location |l| starts with an initial borrow for the whole data
+stored in this location. This borrow creates a reference |r|.
+%
+As long as |r| is alive, Move code can either update its value (|*r = v|),
+or derive a sub-reference (|r' = &mut r.f|).
+%
+The mutation ends when |r| (and the derived |r'|) go out of scope.
+
+The borrow checker guarantees that during the mutation
+of the data in |l|, no other reference can exist into the same data in |l|
+-- meaning that it is impossible for other Move code to test whether the
+value has mutated while the reference is held.
+
+%% The fact that |&mut| has exclusive access to the whole value in a location
+These semantics allow mutable references to be handled via
+\emph{read-update-write} cycles.
+%
+One can create a copy of the data in |l| and
+perform a sequence of mutation steps which are represented as purely functional
+data updates.
+%
+Once the last reference for the data in |l| goes out of scope, the updated value
+is written back to |l|.
+%
+This
+%% effectively turns
+converts an imperative program with references
+into an imperative program which only has state updates on global memory or
+variables on the stack,
+%% a class of programs which is known to have a significantly
+%% simpler semantics.
+with no aliasing.
+We illustrate the basics of this approach by an example:
+
+\begin{Move}
+  fun increment(x: &mut u64) { *x = *x + 1 }
+  fun increment_field(s: &mut S) { increment(&mut s.f) }
+  fun caller(): S { let s = S{f:0}; update(&mut s); s }
+  @\transform@
+  fun increment(x: u64): u64 { x + 1 }
+  fun increment_field(s: S): S { s[f = increment(s.f)] }
+  fun caller(): S { let s = S{f:0}; s = update(s); s }
+\end{Move}
+
+\Paragraph{Dynamic Mutable References}
+
+While the setup in above example covers a majority of the use cases in every day
+Move code,
+%% there are more complex ones to consider, namely that the value of a
+%% reference depends on runtime decisions.
+the general case is more complex, since the referenced location may not be known
+statically.
+Consider the following Move code:
+
+\begin{Move}
+  let r = if (p) &mut s1 else &mut s2;
+  increment_field(r);
+\end{Move}
+
+\noindent Additional information in the logical encoding is required to deal
+with such cases.
+%% At the execution point
+When a reference goes out of scope, we need to know
+from which location it was derived in order to write back the updated value.
+%
+Fig.~\ref{fig:MutElim} illustrates the approach for doing this.
+%
+Essentially, a new type |Mut<T>|, which is internal to \MVP, is introduced to
+track both the location from which |T| was derived and the value of |T|.
+%
+|Mut<T>| supports the following operations:
+
+\begin{itemize}
+\item |Mvp::mklocal(value, LOCAL_ID)| creates a new mutation value for a local
+  with the given local id.  A local id uniquely identifies a local variable
+  in the function.
+\item Similarly, |Mvp::mkglobal(value, TYPE_ID, addr)| creates a new
+  mutation for a global with given type and address.
+  %% DD: Guessing readers won't care about this detail. Or we can drop the address.
+  %% Notice that in the
+  %%   current Move type system, we would not need to represent the address, since
+  %%   there can be only one mutable reference into the entire type (via the
+  %%   acquires mechanism). However, we keep this more general here, as the Move
+  %%   type system might change.
+\item With |r' = Mvp::field(r, FIELD_ID)| a mutation value for a sub-reference is
+  created for the identified field.
+\item The value of a mutation is replaced with |r' = Mvp::set(r, v)| and
+  retrieved with |v = Mvp::get(r)|.
+\item With the predicate |Mvp::is_local(r, LOCAL_ID)| one can test whether |r|
+  was derived from the given local, and with |Mvp::is_global(r, TYPE_ID, addr)|
+  for a specific global location.~%
+  |Mvp::is_field(r, FIELD_ID)| tests whether |r| is derived from the given field.
+\end{itemize}
+
+\begin{figure}[t!]
+  \caption{Elimination of Mutable References}
+  \label{fig:MutElim}
+  \centering
+\begin{MoveBoxNumbered}
+  fun increment(x: &mut u64) { *x = *x + 1 }
+  fun increment_field(s: &mut S) {
+    let r = if (s.f > 0) &mut s.f else &mut s.g;
+    increment(r)
+  }
+  fun caller(p: bool): (S, S) {
+    let s1 = S{f:0, g:0}; let s2 = S{f:1, g:1};
+    let r = if (p) &mut s1 else &mut s2;
+    increment_field(r);
+    (s1, s2)
+  }
+  @\transform@
+  fun increment(x: Mut<u64>): Mut<u64> { Mvp::set(x, Mvp::get(x) + 1) }
+  fun increment_field(s: Mut<S>): Mut<S> {
+    let r = if (s.f > 0) Mvp::field(s.f, S_F) else Mvp::field(s.g, S_G);
+    r = increment(r);
+    if (Mvp::is_field(r, S_F))
+      s = Mvp::set(s, Mvp::get(s)[f = Mvp::get(r)]);
+    if (Mvp::is_field(r, S_G))
+      s = Mvp::set(s, Mvp::get(s)[g = Mvp::get(r)]);
+    s
+  }
+  fun caller(p: bool): S {
+    let s1 = S{f:0, g:0}; let s2 = S{f:1, g:1};
+    let r = if (p) Mvp::mklocal(s1, CALLER_s1)
+            else Mvp::mklocal(s2, CALLER_s2);
+    r = increment_field(r);
+    if (Mvp::is_local(r, CALLER_s1))
+      s1 = Mvp::get(r); @\label{line:WriteBack}@
+    if (Mvp::is_local(r, CALLER_s2))
+      s2 = Mvp::get(r);
+    (s1, s2)
+  }
+\end{MoveBoxNumbered}
+\end{figure}
+
+\MVP implements the illustrated transformation by construction a \emph{borrow
+  graph} from the program via data flow analysis.  This graph tracks both when
+references are released as well as how they relate to each other: e.g.~%
+|r' = &mut r.f| creates an edge from |r| to |r'| labeled with |f|, and~%
+|r' = &mut r.g| creates another also starting from |r|.  The borrow analysis is
+inter-procedural, requiring computed summaries for the borrow graph of called
+functions.
+
+The resulting borrow graph is then used to guide the transformation, inserting
+the operations of the |Mut<T>| type as illustrated in
+Fig~\ref{fig:MutElim}. Specifically, when the borrow on a reference ends, the
+associated mutation value must be written back to its parent mutation or the
+original location (e.g. line~\ref{line:WriteBack} in
+Fig.~\ref{fig:MutElim}). The presence of multiple possible origins leads to case
+distinctions via |Mvp::is_X| predicates; however, these cases are rare in actual
+Move programs.
+
+
+\SubSection{Global Invariant Injection}
+\label{sec:GlobalInvariants}
+
+Correctness of smart contracts is largely about the correctness of the
+blockchain state, so global invariants are particular important in the
+move specification language.  For example, in the Diem framework,
+global invariants can capture the requirement that an account be
+accompanied by various other types that are be stored at the same
+address and the requirement certain state changes are only permitted
+for certain accounts by the access control scheme.
+
+Most software verification tools prove that functions preserve
+invariants by assuming the invariant at the entry to each function and
+proving them at the exit.  In a module or class, it is only necessary
+to prove that invariants are preserved by public functions, since
+invariants are often violated internally in the implementation of a module or
+class. An earlier version of the Move Prover used exactly this approach.
+
+The current implementation of the Prover takes the opposite approach: it ensures
+that invariants hold after every instruction, unless explicitly directed to
+suspend some invariants by a user.  This \emph{fine-grained} approach has
+performance advantages, because, unless suspended, \emph{invariants are only
+  proven when an instruction is executed that could invalidate them}, and the
+proofs are often computationally simple because \emph{the change from a single
+  instruction is usually small}.  Relatively few invariants are suspended, and,
+when they are, it is over a relatively small span of instructions, preserving
+these advantages.  There is another important advantage, which is that
+invariants hold almost everywhere in the code, so they are available to approve
+other properties, such as abort conditions. For example, if a function accesses
+type |T1| and then type |T2|, the access to |T2| will never abort if the
+presence of |T1| implies the presence of |T2| at every state in the body of the
+function.  This situation occurs with some frequency in the Diem framework.
+
+
+\Paragraph{Invariant Types and Proof Methodology}
+
+\emph{Inductive} invariants are properties declared in Move modules that must
+(by default) hold for the global memory at all times. Those invariants often
+quantify over addresses (See Fig.~\ref{fig:AccountSpec} for example.) Based on
+Move's borrow semantics, inductive invariants don't need to hold while memory is
+mutated because the changes are not visible to other code until the change is written back.
+This is reflected by the reference elimination described in
+Sec.~\ref{sec:RefElim},
+
+\emph{Update} invariants are properties that relate two states, a previous state
+and the current state.  Typically they are enforced after an update of global
+memory. The |old| operator is used to evaluate specification expressions in the
+previous state.
+
+Verification of both kinds of invariants can be \emph{suspended}. That means,
+instead of being verified at the time a memory update happens, they are verified
+at the call site of the function which updates memory. This feature is
+necessitated by fine-grained invariant checking, because invariants sometimes do
+not hold in the midst of internal computations of a module. For example, a
+relationship between state variables may not hold when the variables are being
+updated sequentially.  Functions with external callers (public or script
+functions) cannot suspend invariant verification, since the invariants are
+assumed to hold at the beginning and end of each such function.
+
+
+Inductive invariants are proven by induction over the evolution of the global
+memory. The base case is that the invariant must hold in the empty state that
+precedes the genesis transaction.  For the induction step, we can assume that
+the invariant holds at each verified function entry point for which it is not
+suspended, and now must prove that it holds after program points which are
+either direct updates of global memory, or calls to functions which suspend
+invariants.
+
+For update invariants, no induction proof is needed, since they just relate two
+memories.  The pre-state is some memory captured before an update happens, and
+the post state the current state.
+
+\Paragraph{Modular Verification}
+
+We wish to support open systems to which untrusted modules can be added
+with no chance of violating invariants that have already been proven. For each
+invariant, there is a defined subset of Move modules (called a
+\textit{cluster}). If the invariant is proven for the modules in the cluster, it
+is guaranteed to hold in all other modules -- even those that were not yet
+defined when the invariant was proven.  The cluster must contain every function
+that can invalidate the invariant, and, in case of invariant suspension, all
+callers of such a function.  Importantly, functions outside the cluster can
+never invalidate an invariant. Those functions trivially preserve the
+invariant, so it is only necessary to verify functions defined in the cluster.
+
+% \TODO{Dave}{Is the next paragraph accurate? My original plan was that
+%   there would be one target module, we would verify its invariants,
+%   and would pull in dependencies, friends of dependencies, and
+%   dependencies of friends (I think we don't need the dependencies of
+%   friends).  Some subset of the functions in this set would be
+%   instrumented.  It isn't the SMALLEST set of functions or modules --
+%   but it includes (at least) all of the clusters for all of the invariants.}
+
+\MVP verifies a given set of modules at a time (typically one).  The modules
+being verified are called the \textit{target modules}, and the global invariants
+to be verified are called \textit{target invariants}, which are all invariants
+defined in the target modules. The cluster is then the smallest set as specified
+above such that all target modules are contained.
+
+\Paragraph{Basic Translation}
+
+\begin{Figure}
+  \caption{Basic Global Invariant Injection}
+  \label{fig:GlobalInvariants}
+  \centering
+\begin{MoveBox}
+  fun f(a: address) {
+    let r = borrow_global_mut<S>(a);
+    r.value = r.value + 1
+  }
+  invariant [I1] forall a: address: global<S>(a).value > 0;
+  invariant [I2] update forall a: address:
+      global<S>(a).value > old(global<S>(a).value);
+  @\transform@
+  fun f(a: address) {
+    spec assume I1;
+    Mvp::snapshot_state(I2_BEFORE);
+    r = <increment mutation>;
+    spec assert I1;
+    spec assert I2[old = I2_BEFORE];
+  }
+\end{MoveBox}
+\end{Figure}
+
+
+We first look at injection of global invariants in the absence of
+% memory and functions with
+type parameters. Fig.~\ref{fig:GlobalInvariants} contains an
+example for the supported invariant types and their injection into code. The
+first invariant, |I1|, is an inductive invariant. It is assumed on function
+entry, and asserted after the state update. The second, |I2|, is an update
+invariant, which relates pre and post states. For this a state snapshot is
+stored under some label |I2_BEFORE|, which is then used in an assertion.
+
+Global invariant injection is optimized by knowledge of the prover, obtained by
+static analysis, about accessed and modified memory.  Let |accessed(f)| be the
+memory accessed by a function, and |modified(f)| be the memory modified. Let
+|accessed(I)| by an invariant (including transitively by all functions it
+calls).
+
+\begin{itemize}
+\item Inject |assume I| at entry to |f| \emph{if} |accessed(f)| has overlap with
+  |accessed(I)|.
+\item Inject |assert I| after each program step if one of the following is true
+  (a) the step modifies a memory location |M in accessed(I)| or, (b) the step is
+  a call to function |f'| in which |I| is suspended and |modifies(f')|
+  intersects with |accessed(I)|.  Also, if |I| is an update invariant, inject a
+  save of a memory snaptshot before the update or call.
+\end{itemize}
+
+\vspace{-1ex}
+\Paragraph{Genericity}
+
+\begin{Figure}
+  \caption{Global Invariant Injection and Genericity}
+  \label{fig:Genericity}
+  \centering
+\begin{MoveBox}
+  invariant [I1] global<S<u64>>(0).value > 1;
+  invariant<T> [I2] global<S<T>>(0).value > 0;
+  fun f(a: address) { borrow_global_mut<S<u8>>(0).value = 2 }
+  fun g<R>(a: address) { borrow_global_mut<S<R>>(0).value = 3 }
+  @\transform@
+  fun f(a: address) {
+    spec assume I2[T = u8];
+    <<mutate>>
+    spec assert I2[T = u8];
+  }
+  fun g<R>(a: address) {
+    spec assume I1; spec assume I2[T = R];
+    <<mutate>>
+    spec assert I1; spec assert I2[T = R];
+  }
+\end{MoveBox}
+\end{Figure}
+
+Generic type parameters make the problem of determining whether a function can
+modify an invariant more difficult.  Consider the example in
+Fig.~\ref{fig:Genericity}. Invariant |I1| holds for a specific type
+instantiation |S<u64>|, whereas |I2| is generic over all type instantiations for
+|S<T>|.
+
+The non-generic function |f| which works on the instantiation |S<u8>| will have
+to inject the \emph{specialized} instance |I2[T = u8]|. The invariant |I1|,
+however, does not apply for this function, because there is no overlap with
+|S<u64>|.  In contrast, |g| is generic in type |R|, which could be instantiated
+to |u64|. So, |I1|, which applies to |S<u64>| needs to be injected
+in addition to |I2|.
+%% relevant for the specific case of |S<u64>|.
+
+The general solution depends on type unification.  Given the accessed memory of
+a function |f<R>| and an invariant |I<T>|, we compute the pairwise unification
+of memory types. Those types are parameterized over |R| resp. |T|. Successful
+unification results in a substitution for both type parameters, and we include
+the invariant with |T| specialized according to the substitution.
+
+\SubSection{Monomorphization}
+\label{sec:Mono}
+
+Monomorphization is a transformation which removes generic types from a Move
+program by \emph{specializing} the program for relevant type instantiations.  In
+the context of verification, the goal is that the specialized program verifies
+if and only if the generic program verifies in an encoding which supports types
+as first class values. We expect the specialized program to verify faster
+because it avoids the problem of generic representation of values, supporting
+a multi-sorted representation in the SMT logic.
+
+
+\begin{Figure}
+\caption{Basic Monomorphization}
+\label{fig:Mono}
+\centering
+\begin{MoveBox}
+  struct S<T> { .. }
+  fun f<T>(x: T) { g<S<T>>(S(x)) }
+  fun g<S:key>(s: S) { move_to<S>(.., s) }
+  @\transform@
+  struct T{}
+  struct S_T{ .. }
+  fun f_T(x: T) { g_S_T(S_T(x)) }
+  fun g_S_T(s: S_T) { move_to<S_T>(.., s) }
+\end{MoveBox}
+\end{Figure}
+
+To verify a generic function for all possible instantiations, monomorphization
+skolemizes the type parameter, i.e.~the function is verified for a new type
+with no special properties that represents an arbitrary type.  It then
+specializes all called functions and used data types with this new type and any
+other concrete types they may use.  Fig.~\ref{fig:Mono} sketches this approach.
+
+However, this approach has one issue: the type of genericity Move provides does
+not allow for full type erasure (unlike many programming languages) because
+types are used to \emph{index} global memory (e.g. |global<S<T>>(addr)| where
+|T| is a generic type). Consider the following Move function:
+
+\begin{Move}
+  fun f<T>(..) { move_to<S<T>>(s, ..); move_to<S<u64>>(s, ..) }
+\end{Move}
+
+\noindent Depending on how |T| is instantiated, this function behaves
+differently.  Specifically, if |T| is instantiated with |u64| the function will
+always abort at the second |move_to|, since the target location is already
+occupied.
+
+The important property enabling monomorphization in the presence of such type
+dependent code is that one can identify the situation by looking at the memory
+accessed by code and injected specifications. From this one can derive
+\emph{additional instantiations of the function} which need to be verified. In
+the example above, verifying both |f_T| and an instantiation |f_u64| will cover
+all relevant cases of the function behavior.
+
+The algorithm for computing the instances that require verification works as
+follows. Let |f<T1,..,Tn>| be a verified target function which has all
+specifications injected and inlined function calls expanded.
+\begin{itemize}
+\item For each memory~~|M in modified(f)|, if there is a memory~%
+  |M' in modified(f) + accessed(f)| such that |M| and |M'| can unify via
+  |T1,..,Tn|, collect an instantiation of the type parameters |Ti| from the
+  resulting substitution. This instantiation may not assign values to all type
+  parameters, and those unassigned parameters stay as is. For instance,~%
+  |f<T1, T2>| might have a partial instantiation |f<T1, u8>|.
+\item Once all partial instantiations are computed, the set is
+  extended by unifying the instantiations against each other. If |<T>| and
+  |<T'>| are in the set, and they unify under the substitution |s|, then
+  |<s(T)>| will also be part of the set.  For example, consider |f<T1, T2>|
+  which modifies |M<T1>| and |R<T2>|, as well as accesses |M<u64>| and
+  |R<u8>|. From this the instantiations |<u64, T2>| and |<T1, u8>| are computed,
+  and the additional instantiation |<u64, u8>| will be added to the set.
+\item If after computing and extending instantiations any type parameters
+  remain, they are skolemized into a given type as described earlier.
+\end{itemize}
+
+\noindent To understand the correctness of this procedure, consider the
+following arguments (a full formal proof is outstanding):
+
+\begin{itemize}
+\item \emph{Direct interaction} Whenever a modified memory |M<t>| can influence
+  the interpretation of |M<t'>|, a unifier must exist for the types |t| and |t'|,
+  and an instantiation will be verified which covers the overlap of |t| and
+  |t'|.
+\item \emph{Indirect interaction} If there is an overlap between two types
+  which influences whether another overlap is semantically relevant, the
+  combination of both overlaps will be verified via the extension step.
+\end{itemize}
+
+Notice that even though it is not common in regular Move code to work with both
+memory |S<T>| and, say, |S<u64>| in one function, there is a scenario where such
+code is implicitly created by injection of global invariants. Consider the
+example in Fig.~\ref{fig:Genericity}. The invariant |I1| which works on |S<u64>|
+is injected into the function |g<R>| which works on |S<R>|. When monomorphizing
+|g|, we need to verify an instance |g_u64| in order to ensure that |I1| holds.
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/examples/account.move b/vendors/move/crates/move-prover/doc/paper21/examples/account.move
new file mode 100644
index 000000000..4829d07da
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/examples/account.move
@@ -0,0 +1,67 @@
+// To fix all verification errors, activate lines with MISSING tag
+module 0x42::Account {
+  struct Account has key {
+    balance: u64,
+  }
+
+  fun withdraw(account: address, amount: u64) acquires Account {
+    // assert!(amount <= AccountLimits::max_decrease(), Errors::invalid_argument()); // MISSING
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert!(*balance >= amount, errors::limit_exceeded());
+    // assert!(*balance - amount >= AccountLimits::min_balance(), Errors::invalid_argument()); // MISSING
+    *balance = *balance - amount;
+  }
+
+  fun deposit(account: address, amount: u64) acquires Account {
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert!(*balance <= Limits::max_u64() - amount, errors::limit_exceeded());
+    *balance = *balance + amount;
+  }
+
+  public(script) fun transfer(from: &signer, to: address, amount: u64) acquires Account {
+    assert!(signer::address_of(from) != to, errors::invalid_argument());
+    withdraw(signer::address_of(from), amount);
+    deposit(to, amount);
+  }
+
+  spec transfer {
+    let from_addr = signer::address_of(from);
+    aborts_if from_addr == to;
+    aborts_if bal(from_addr) < amount;
+    aborts_if bal(to) + amount > Limits::max_u64();
+    ensures bal(from_addr) == old(bal(from_addr)) - amount;
+    ensures bal(to) == old(bal(to)) + amount;
+    // aborts_if !exists<Account>(from_addr); // MISSING
+    // aborts_if !exists<Account>(to); // MISSING
+    // aborts_if amount > AccountLimits::max_decrease(); // MISSING
+    // aborts_if bal(from_addr) - amount < AccountLimits::min_balance(); // MISSING
+  }
+
+  spec fun bal(acc: address): u64 {
+    global<Account>(acc).balance
+  }
+
+  invariant forall acc: address where exists<Account>(acc):
+    bal(acc) >= AccountLimits::min_balance();
+
+  invariant update forall acc: address where exists<Account>(acc):
+    old(bal(acc)) - bal(acc) <= AccountLimits::max_decrease();
+
+  use 0x42::Errors;
+  use 0x42::Limits;
+  use 0x42::AccountLimits;
+  use std::signer;
+}
+
+module 0x42::Errors {
+    public fun limit_exceeded(): u64 { 1 }
+    public fun invalid_argument(): u64 { 2 }
+}
+
+module 0x42::Limits {
+    public fun max_u64(): u64 { 18446744073709551615 }
+}
+module 0x42::AccountLimits {
+    public fun min_balance(): u64 { 5 }
+    public fun max_decrease(): u64 { 10 }
+}
diff --git a/vendors/move/crates/move-prover/doc/paper21/function-injection-apx.tex b/vendors/move/crates/move-prover/doc/paper21/function-injection-apx.tex
new file mode 100644
index 000000000..e26a27e6c
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/function-injection-apx.tex
@@ -0,0 +1,281 @@
+\Section{Injection of Function and Data Specifications}
+
+In this appendix we describe, for the interested reader, the design of function
+and data specification injection (requires, ensures, aborts\_if, modifies,
+emits, and data invariants).  While the impact on speed and reliability of
+verification might have been not that significant, these designs were fine tuned
+over time as well. With this, a comprehensive coverage of the translation of all
+specification constructs in \MVP is provided.
+
+\SubSection{Function Specifications}
+
+The injection of basic function specifications is illustrated in
+Fig.~\ref{fig:RequiresEnsuresAbortsIf}.  An extension of the Move source
+language is used to specify abort behavior. With~%
+|fun f() { .. } onabort { conditions }| a Move function is defined where
+|conditions| are assume or assert statements that are evaluated at every program
+point the function aborts (either implicitly or with an |abort| statement). This
+construct simplifies the presentation and corresponds to a per-function abort
+block on bytecode level which is target of branching.
+
+\begin{Figure}
+  \caption{Requires, Ensures, and AbortsIf Injection}
+  \label{fig:RequiresEnsuresAbortsIf}
+  \centering
+\begin{MoveBoxNumbered}
+  fun f(x: u64, y: u64): u64 { x + y }
+  spec f {
+    requires x < y;
+    aborts_if x + y > MAX_U64;
+    ensures result == x + y;
+  }
+  fun g(x: u64): u64 { f(x, x + 1) }
+  spec g {
+    ensures result > x;
+  }
+  @\transform@
+  fun f(x: u64, y: u64): u64 {
+    spec assume x < y;
+    let result = x + y;
+    spec assert result == x + y;     // ensures of f
+    spec assert                      // negated abort_if of f
+      !(x + y > MAX_U64); @\label{line:aborts_holds_not}@
+    result
+  } onabort {
+    spec assert                      // abort_if of f
+      x + y > MAX_U64; @\label{line:aborts_holds}@
+  }
+  fun g(x: u64): u64 {
+    spec assert x < x + 1;           // requires of f
+@$\textrm{\it if inlined}$\label{line:inline}@
+    let result = inline f(x, x + 1);
+@$\textrm{\it elif opaque}$\label{line:opaque}@
+    if (x + x + 1 > MAX_U64) abort;  // aborts_if of f
+    spec assume result == x + x + 1; // ensures of f
+@$\textrm{\it endif}$@
+    spec assert result > x;          // ensures of g
+    result
+  }
+\end{MoveBoxNumbered}
+\end{Figure}
+
+An aborts condition is translated into two different asserts: one where the
+function aborts and the condition must hold (line~\ref{line:aborts_holds}), and
+one where it returns and the condition must \emph{not} hold
+(line~\ref{line:aborts_holds_not}). If there are multiple |aborts_if|, they are
+or-ed. If there is no abort condition, no asserts are generated. This means
+that once a user specifies aborts conditions, they must completely cover the
+abort behavior of the code. (The prover also provides an option to relax this
+behavior, where aborts conditions can be partial and are only enforced on
+function return.)
+
+For a function call site we distinguish two variants: the call is \emph{inlined}
+(line~\ref{line:inline}) or it is \emph{opaque} (line~\ref{line:opaque}).  For
+inlined calls, the function definition, with all injected assumptions and
+assertions turned into assumptions (as those are considered proven) is
+substituted. For opaque functions the specification conditions are inserted as
+assumptions. Methodologically, opaque functions need precise specifications
+relative to a particular objective, where as in the case of inlined functions
+the code is still the source of truth and specifications can be partial or
+omitted. However, inlining does not scale arbitrarily, and can be only used for
+small function systems.
+
+Notice we have not discussed the way how to deal with relating pre and post
+states yet, which requires taking snapshots of state (e.g.~%
+|ensures x == old(x) + 1|); the example in
+Fig.~\ref{fig:RequiresEnsuresAbortsIf} does not need it. Snapshots of state
+are discussed for global update invariants in Sec.~\ref{sec:GlobalInvariants}.
+
+\Paragraph{Modifies}
+
+\begin{Figure}
+  \caption{Modifies Injection}
+  \label{fig:Modifies}
+  \centering
+\begin{MoveBoxNumbered}
+  fun f(addr: address) { move_to<T>(addr, T{}) }
+  spec f {
+    pragma opaque;
+    ensures exists<T>(addr);
+    modifies global<T>(addr);
+  }
+  fun g() { f(0x1) }
+  spec g {
+    modifies global<T>(0x1); modifies global<T>(0x2);
+  }
+  @\transform@
+  fun f(addr: address) {
+    let can_modify_T = {addr};      // modifies of f
+    spec assert addr in can_modify; // permission check @%
+                                            \label{line:modifies_permission}@
+    move_to<T>(addr, T{});
+  }
+  fun g() {
+    let can_modify_T = {0x1, 0x2};  // modifies of g
+    spec assert {0x1} <= can_modify_T; // permission check @%
+                                            \label{line:modifies_call_permission}@
+    spec havoc global<T>(0x1);      // havoc modified memory @%
+                                            \label{line:modifies_havoc}@
+    spec assume exists<T>(0x1);     // ensures of f
+  }
+\end{MoveBoxNumbered}
+\end{Figure}
+
+
+The |modifies| condition specifies that a function only changes specific memory.
+It comes in the form |modifies global<T>(addr)|, and its injection is
+illustrated in Fig.~\ref{fig:Modifies}.
+
+A type check is used to ensure that if a function has one or more~%
+|modifies| conditions all called functions which are \emph{opaque} have a
+matching modifies declaration. This is important so we can relate the callees
+memory modifications to that what is allowed at caller side.
+
+At verification time, when an operation is performed which modifies memory, an
+assertion is emitted that modification is allowed
+(e.g. line~\ref{line:modifies_permission}). The permitted addresses derived from
+the modifies clause are stored in a set |can_modify_T| generated by the
+transformation. Instructions which modify memory are either primitives (like
+|move_to| in the example) or function calls. If the function call is inlined,
+modifies injection proceeds (conceptually) with the inlined body. For opaque
+function calls, the static analysis has ensured that the target has a modifies
+clause.  This clause is used to derive the modified memory, which must be a
+subset of the modified memory of the caller
+(line~\ref{line:modifies_call_permission}).
+
+For opaque calls, we also need to \emph{havoc} the memory they modify
+(line~\ref{line:modifies_havoc}), by which is meant assigning an unconstrained
+value to it. If present, |ensures| from the called function, injected as
+subsequent assumptions, are further constraining the modified memory.
+
+
+\Paragraph{Emits}
+
+\begin{Figure}
+  \caption{Emits Injection}
+  \label{fig:Emits}
+  \centering
+\begin{MoveBoxNumbered}
+  use Std::Event;
+  struct E has drop, store { m: u64 }
+  fun f(h: &mut Event::EventHandle<E>, x: u64) {
+    Event::emit_event(h, E{m:0}); @\label{line:emit_event}@
+    if (x > 0) {
+      Event::emit_event(h, E{m:x});
+    }
+  }
+  spec f {
+    emits E{m:0} to h; @\label{line:emits}@
+    emits E{m:x} to h if x > 0; @\label{line:emits_if}@
+  }
+  @\transform@
+  fun f(h: &mut Event::EventHandle<E>, x: u64) {
+    es = Mvp::ExtendEventStore(es, h, E{m:0}); // emitting event @\label{line:extend_es}@
+    if (x > 0) {
+      es = Mvp::ExtendEventStore(es, h, E{m:x}); // emitting event
+    }
+    let actual_es = Mvp::subtract(es, old(es)); // events emitted by f @\label{line:actual_es}@
+    let expected_es = Mvp::CondExtendEventStore( // specified events @\label{line:expected_es}@
+      Mvp::ExtendEventStore(Mvp::EmptyEventStore, E{m:x}, h),
+      E{m:x}, h, x>0);
+    spec assert Mvp::includes(expected_es, actual_es); // spec completeness @\label{line:emits_completeness}@
+    spec assert Mvp::includes(actual_es, expected_es); // spec relevance @\label{line:emits_relevance}@
+  }
+\end{MoveBoxNumbered}
+\end{Figure}
+
+The injection for the |emits| clause is illustrated in Fig.~\ref{fig:Emits}. The
+|emits| clause specifies the events that a function is expected to emit. It
+comes in the form |emits message to handle if condition| (e.g.,
+line~\ref{line:emits_if}). The condition part (i.e., |if condition|) can be
+omitted if the event is expected to be emitted unconditionally (e.g.,
+line~\ref{line:emits}).
+
+The function call to |Event::emit_event| (e.g., line~\ref{line:emit_event}) is
+transformed into the statement to extend |es| with the event to emit (e.g.,
+line~\ref{line:extend_es}). |es| is a global variable of type |EventStore| which
+is a map where the key is an event handle and the value is the event stream of
+the handle (modeled as a bag of messages).
+
+In line~\ref{line:actual_es}, |actual_es| represents the portion of the
+EventStore that only comprises the events that the program (i.e., |f|) actually
+emits. In line~\ref{line:expected_es}, |expected_es| is constructed from the
+|emits| specification which contains all of the expected events specified by the
+|emits| clauses. Having these, two assertions using |Mvp::includes| (multiset
+inclusion relation per event handle) are injected.
+
+\begin{itemize}
+\item One asserts that |expected_es| includes |actual_es|, meaning that the
+  function only emits the events that are expected (e.g.,
+  line~\ref{line:emits_completeness}). This would be violated if there is any
+  event emitted by |f| that is not covered by some |emits| clause.
+\item The other asserts that |actual_es| includes |expected_es|, meaning that
+  the function emits all of the events that are expected (e.g.,
+  line~\ref{line:emits_relevance}). This would be violated if |f| does not emit
+  the expected event which a |emits| clause specifies.
+\end{itemize}
+
+We also handle opaque calls properly although it is not illustrated in
+Fig.~\ref{fig:Emits}. Suppose |f| is an opaque function, and another function
+|g| calls |f|. In the transformation of |g|, the event store |es| extends with
+the expected events of |f| (i.e., the events specified by the |emits| clauses of
+|f|) in a similar way to how |expected_es| is constructed in
+line~\ref{line:expected_es}.
+
+\vspace{-2ex}
+\SubSection{Data Invariants}
+
+\begin{Figure}
+  \caption{Data Invariant Injection}
+  \label{fig:DataInvariants}
+  \centering
+\begin{MoveBoxNumbered}
+  struct S { a: u64, b: u64 }
+  spec S { invariant a < b }
+  fun f(s: S): S {
+    let r = &mut s;
+    r.a = r.a + 1;
+    r.b = r.b + 1;
+    s
+  }
+  @\transform@
+  fun f(s: S): S {
+    spec assume s.a < s.b;      // assume invariant for s
+    let r = Mvp::local(s, F_s); // begin mutation of s
+    r = Mvp::set(r, Mvp::get(r)[a = Mvp::get(r).a + 1]);
+    r = Mvp::set(r, Mvp::get(r)[b = Mvp::get(r).b + 1]);
+    spec assert                 // invariant enforced
+      Mvp::get(r).a < Mvp::get(r).b;
+    s = Mvp::get(r);            // write back to s
+    s
+  }
+\end{MoveBoxNumbered}
+\end{Figure}
+
+A data invariant specifies a constraint over a struct value. The value is
+guaranteed to satisfy this constraint at any time. Thus, when a value is
+constructed, the data invariant needs to be verified, and when it is consumed,
+it can be assumed to hold.
+
+In Move's reference semantics, construction of struct values is often done via a
+sequence of mutations via mutable references. It is desirable that \emph{during}
+such mutations, assertion of the data invariant is suspended. This allows to
+state invariants which reference multiple fields, where the fields are updated
+step-by-step.  Move's borrow semantics and concept of mutations provides a
+natural way how to defer invariant evaluation: at the point a mutable reference
+is released, mutation ends, and the data invariant can be enforced.  In other
+specification formalisms, we would need a special language construct for
+invariant suspension. Fig.~\ref{fig:DataInvariants} gives an example, and shows
+how data invariants are reduced to assert/assume statements.
+
+The implementation of data invariants hooks into reference elimination,
+described in Sec.~\ref{sec:RefElim}. As part of this the lifetime of references
+is computed. Whenever a reference is released and the mutated value is written
+back, we also assert the data invariant. In addition, the data invariant is
+asserted when a struct value is directly constructed.
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/intro.tex b/vendors/move/crates/move-prover/doc/paper21/intro.tex
new file mode 100644
index 000000000..06d64b3f5
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/intro.tex
@@ -0,0 +1,74 @@
+\Section{Introduction}
+
+The Move Prover (\MVP) is a formal verification tool for smart contracts that
+intends to be used routinely during code development.  The verification finishes
+fast and predictably, making the experience of running \MVP similar to the
+experience of running compilers, linters, type checkers, and other development
+tools.  Building a fast verifier is non-trivial, and in this paper, we would
+like to share the most important engineering and architectural decisions that
+have made this possible.
+
+One factor that makes verification easier is applying it to smart contracts.
+Smart contracts are easier to verify than conventional software for at least
+three reasons: 1) they are small in code size, 2) they execute in a
+well-defined, isolated environment, and 3) their computations are typically
+sequential, deterministic, and have minimal interactions with the environment
+(e.g., no explicit I/O operations).  At the same time, formal verification is
+more appealing to the advocates for smart contracts because of the large
+financial and regulatory risks that smart contracts may entail if misbehaved, as
+evidenced by large losses that have occurred
+already~\cite{CONTRACT_VERIFICATION,hacks-on-smart-contracts,hacks-on-compound}.
+
+The other crucial factor to the success of \MVP is a tight coupling with the
+\emph{Move} programming language~\cite{MOVE_LANG}.  Move is developed as part of
+the Diem blockchain~\cite{DIEM} and is designed to be used with formal
+verification from day one.  Move is currently co-evolving with \MVP.  The
+language supports specifying pre-, post-, and aborts conditions of functions, as
+well as invariants over data structures and over the content of the global
+persistent memory (i.e., the state of the blockchain).  One feature that makes
+verification harder is that quantification can be used
+freely in specifications.
+
+Despite this specification richness, \MVP is capable of verifying the full Move
+implementation of the Diem blockchain (called the Diem
+framework~\cite{DIEM_FRAMEWORK}) in a few minutes.  The framework provides
+functionality for managing accounts and their interactions, including multiple
+currencies, account roles, and rules for transactions.  It consists of about
+8,800 lines of Move code and 6,500 lines of specifications (including comments
+for both), which shows that the framework is extensively specified.  More
+importantly, \emph{verification is fully automated and runs continuously with
+  unit and integration tests}, which we consider a testament to the practicality
+of the approach.  Running the prover in integration tests requires more than
+speed: it requires reliability, because tests that work sometimes and fail or
+time out other times are unacceptable in that context.
+
+\MVP is a substantial and evolving piece of software that has been tuned and
+optimized in many ways.  As a result, it is not easy to define exactly what
+implementation decisions lead to fast and reliable performance.  However, we can
+at least identify three major ideas that resulted in dramatic improvements in
+speed and reliability since the description of an early prototype of
+\MVP~\cite{MOVE_PROVER}:
+\begin{itemize}
+\item an \emph{alias-free memory model} based on Move's semantics, which are
+  similar to the Rust programming language;
+\item \emph{fine-grained invariant checking}, which ensures that invariants hold
+  at every state, except when developer explicitly suspends them; and
+\item monomorphization, which instantiates type parameters in Move's generic
+  structures, functions, and specification properties.
+\end{itemize}
+The combined effect of all these improvements transformed a tool that worked,
+but often exhibited frustrating, sometimes random~\cite{BUTTERFLY}, timeouts on
+complex and especially on erroneous specifications, to a tool that almost always
+completes in less than 30 seconds.  In addition, there have been many other
+improvements, including a more expressive specification language, reducing false
+positives, and error reporting.
+
+The remainder of the paper first introduces the Move language and how \MVP is
+used with it, then discusses the design of \MVP and the three main optimizations
+above.  There is also an appendix that describes injection of function
+specifications.
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/llncs.cls b/vendors/move/crates/move-prover/doc/paper21/llncs.cls
new file mode 100644
index 000000000..886bf7264
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/llncs.cls
@@ -0,0 +1,1218 @@
+% LLNCS DOCUMENT CLASS -- version 2.20 (10-Mar-2018)
+% Springer Verlag LaTeX2e support for Lecture Notes in Computer Science
+%
+%%
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%%
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{llncs}[2018/03/10 v2.20
+^^J LaTeX document class for Lecture Notes in Computer Science]
+% Options
+\let\if@envcntreset\iffalse
+\DeclareOption{envcountreset}{\let\if@envcntreset\iftrue}
+\DeclareOption{citeauthoryear}{\let\citeauthoryear=Y}
+\DeclareOption{oribibl}{\let\oribibl=Y}
+\let\if@custvec\iftrue
+\DeclareOption{orivec}{\let\if@custvec\iffalse}
+\let\if@envcntsame\iffalse
+\DeclareOption{envcountsame}{\let\if@envcntsame\iftrue}
+\let\if@envcntsect\iffalse
+\DeclareOption{envcountsect}{\let\if@envcntsect\iftrue}
+\let\if@runhead\iffalse
+\DeclareOption{runningheads}{\let\if@runhead\iftrue}
+
+\let\if@openright\iftrue
+\let\if@openbib\iffalse
+\DeclareOption{openbib}{\let\if@openbib\iftrue}
+
+% languages
+\let\switcht@@therlang\relax
+\def\ds@deutsch{\def\switcht@@therlang{\switcht@deutsch}}
+\def\ds@francais{\def\switcht@@therlang{\switcht@francais}}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+
+\ProcessOptions
+
+\LoadClass[twoside]{article}
+\RequirePackage{multicol} % needed for the list of participants, index
+\RequirePackage{aliascnt}
+
+\setlength{\textwidth}{12.2cm}
+\setlength{\textheight}{19.3cm}
+\renewcommand\@pnumwidth{2em}
+\renewcommand\@tocrmarg{3.5em}
+%
+\def\@dottedtocline#1#2#3#4#5{%
+  \ifnum #1>\c@tocdepth \else
+    \vskip \z@ \@plus.2\p@
+    {\leftskip #2\relax \rightskip \@tocrmarg \advance\rightskip by 0pt plus 2cm
+               \parfillskip -\rightskip \pretolerance=10000
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #3\relax
+     \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+     {#4}\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+     \par}%
+  \fi}
+%
+\def\switcht@albion{%
+\def\abstractname{Abstract.}
+\def\ackname{Acknowledgement.}
+\def\andname{and}
+\def\lastandname{\unskip, and}
+\def\appendixname{Appendix}
+\def\chaptername{Chapter}
+\def\claimname{Claim}
+\def\conjecturename{Conjecture}
+\def\contentsname{Table of Contents}
+\def\corollaryname{Corollary}
+\def\definitionname{Definition}
+\def\examplename{Example}
+\def\exercisename{Exercise}
+\def\figurename{Fig.}
+\def\keywordname{{\bf Keywords:}}
+\def\indexname{Index}
+\def\lemmaname{Lemma}
+\def\contriblistname{List of Contributors}
+\def\listfigurename{List of Figures}
+\def\listtablename{List of Tables}
+\def\mailname{{\it Correspondence to\/}:}
+\def\noteaddname{Note added in proof}
+\def\notename{Note}
+\def\partname{Part}
+\def\problemname{Problem}
+\def\proofname{Proof}
+\def\propertyname{Property}
+\def\propositionname{Proposition}
+\def\questionname{Question}
+\def\remarkname{Remark}
+\def\seename{see}
+\def\solutionname{Solution}
+\def\subclassname{{\it Subject Classifications\/}:}
+\def\tablename{Table}
+\def\theoremname{Theorem}}
+\switcht@albion
+% Names of theorem like environments are already defined
+% but must be translated if another language is chosen
+%
+% French section
+\def\switcht@francais{%\typeout{On parle francais.}%
+ \def\abstractname{R\'esum\'e.}%
+ \def\ackname{Remerciements.}%
+ \def\andname{et}%
+ \def\lastandname{ et}%
+ \def\appendixname{Appendice}
+ \def\chaptername{Chapitre}%
+ \def\claimname{Pr\'etention}%
+ \def\conjecturename{Hypoth\`ese}%
+ \def\contentsname{Table des mati\`eres}%
+ \def\corollaryname{Corollaire}%
+ \def\definitionname{D\'efinition}%
+ \def\examplename{Exemple}%
+ \def\exercisename{Exercice}%
+ \def\figurename{Fig.}%
+ \def\keywordname{{\bf Mots-cl\'e:}}
+ \def\indexname{Index}
+ \def\lemmaname{Lemme}%
+ \def\contriblistname{Liste des contributeurs}
+ \def\listfigurename{Liste des figures}%
+ \def\listtablename{Liste des tables}%
+ \def\mailname{{\it Correspondence to\/}:}
+ \def\noteaddname{Note ajout\'ee \`a l'\'epreuve}%
+ \def\notename{Remarque}%
+ \def\partname{Partie}%
+ \def\problemname{Probl\`eme}%
+ \def\proofname{Preuve}%
+ \def\propertyname{Caract\'eristique}%
+%\def\propositionname{Proposition}%
+ \def\questionname{Question}%
+ \def\remarkname{Remarque}%
+ \def\seename{voir}
+ \def\solutionname{Solution}%
+ \def\subclassname{{\it Subject Classifications\/}:}
+ \def\tablename{Tableau}%
+ \def\theoremname{Th\'eor\`eme}%
+}
+%
+% German section
+\def\switcht@deutsch{%\typeout{Man spricht deutsch.}%
+ \def\abstractname{Zusammenfassung.}%
+ \def\ackname{Danksagung.}%
+ \def\andname{und}%
+ \def\lastandname{ und}%
+ \def\appendixname{Anhang}%
+ \def\chaptername{Kapitel}%
+ \def\claimname{Behauptung}%
+ \def\conjecturename{Hypothese}%
+ \def\contentsname{Inhaltsverzeichnis}%
+ \def\corollaryname{Korollar}%
+%\def\definitionname{Definition}%
+ \def\examplename{Beispiel}%
+ \def\exercisename{\"Ubung}%
+ \def\figurename{Abb.}%
+ \def\keywordname{{\bf Schl\"usselw\"orter:}}
+ \def\indexname{Index}
+%\def\lemmaname{Lemma}%
+ \def\contriblistname{Mitarbeiter}
+ \def\listfigurename{Abbildungsverzeichnis}%
+ \def\listtablename{Tabellenverzeichnis}%
+ \def\mailname{{\it Correspondence to\/}:}
+ \def\noteaddname{Nachtrag}%
+ \def\notename{Anmerkung}%
+ \def\partname{Teil}%
+%\def\problemname{Problem}%
+ \def\proofname{Beweis}%
+ \def\propertyname{Eigenschaft}%
+%\def\propositionname{Proposition}%
+ \def\questionname{Frage}%
+ \def\remarkname{Anmerkung}%
+ \def\seename{siehe}
+ \def\solutionname{L\"osung}%
+ \def\subclassname{{\it Subject Classifications\/}:}
+ \def\tablename{Tabelle}%
+%\def\theoremname{Theorem}%
+}
+
+% Ragged bottom for the actual page
+\def\thisbottomragged{\def\@textbottom{\vskip\z@ plus.0001fil
+\global\let\@textbottom\relax}}
+
+\renewcommand\small{%
+   \@setfontsize\small\@ixpt{11}%
+   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
+   \abovedisplayshortskip \z@ \@plus2\p@
+   \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
+   \def\@listi{\leftmargin\leftmargini
+               \parsep 0\p@ \@plus1\p@ \@minus\p@
+               \topsep 8\p@ \@plus2\p@ \@minus4\p@
+               \itemsep0\p@}%
+   \belowdisplayskip \abovedisplayskip
+}
+
+\frenchspacing
+\widowpenalty=10000
+\clubpenalty=10000
+
+\setlength\oddsidemargin   {63\p@}
+\setlength\evensidemargin  {63\p@}
+\setlength\marginparwidth  {90\p@}
+
+\setlength\headsep   {16\p@}
+
+\setlength\footnotesep{7.7\p@}
+\setlength\textfloatsep{8mm\@plus 2\p@ \@minus 4\p@}
+\setlength\intextsep   {8mm\@plus 2\p@ \@minus 2\p@}
+
+\setcounter{secnumdepth}{2}
+
+\newcounter {chapter}
+\renewcommand\thechapter      {\@arabic\c@chapter}
+
+\newif\if@mainmatter \@mainmattertrue
+\newcommand\frontmatter{\cleardoublepage
+            \@mainmatterfalse\pagenumbering{Roman}}
+\newcommand\mainmatter{\cleardoublepage
+       \@mainmattertrue\pagenumbering{arabic}}
+\newcommand\backmatter{\if@openright\cleardoublepage\else\clearpage\fi
+      \@mainmatterfalse}
+
+\renewcommand\part{\cleardoublepage
+                 \thispagestyle{empty}%
+                 \if@twocolumn
+                     \onecolumn
+                     \@tempswatrue
+                   \else
+                     \@tempswafalse
+                 \fi
+                 \null\vfil
+                 \secdef\@part\@spart}
+
+\def\@part[#1]#2{%
+    \ifnum \c@secnumdepth >-2\relax
+      \refstepcounter{part}%
+      \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+    \else
+      \addcontentsline{toc}{part}{#1}%
+    \fi
+    \markboth{}{}%
+    {\centering
+     \interlinepenalty \@M
+     \normalfont
+     \ifnum \c@secnumdepth >-2\relax
+       \huge\bfseries \partname~\thepart
+       \par
+       \vskip 20\p@
+     \fi
+     \Huge \bfseries #2\par}%
+    \@endpart}
+\def\@spart#1{%
+    {\centering
+     \interlinepenalty \@M
+     \normalfont
+     \Huge \bfseries #1\par}%
+    \@endpart}
+\def\@endpart{\vfil\newpage
+              \if@twoside
+                \null
+                \thispagestyle{empty}%
+                \newpage
+              \fi
+              \if@tempswa
+                \twocolumn
+              \fi}
+
+\newcommand\chapter{\clearpage
+                    \thispagestyle{empty}%
+                    \global\@topnum\z@
+                    \@afterindentfalse
+                    \secdef\@chapter\@schapter}
+\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+                       \if@mainmatter
+                         \refstepcounter{chapter}%
+                         \typeout{\@chapapp\space\thechapter.}%
+                         \addcontentsline{toc}{chapter}%
+                                  {\protect\numberline{\thechapter}#1}%
+                       \else
+                         \addcontentsline{toc}{chapter}{#1}%
+                       \fi
+                    \else
+                      \addcontentsline{toc}{chapter}{#1}%
+                    \fi
+                    \chaptermark{#1}%
+                    \addtocontents{lof}{\protect\addvspace{10\p@}}%
+                    \addtocontents{lot}{\protect\addvspace{10\p@}}%
+                    \if@twocolumn
+                      \@topnewpage[\@makechapterhead{#2}]%
+                    \else
+                      \@makechapterhead{#2}%
+                      \@afterheading
+                    \fi}
+\def\@makechapterhead#1{%
+% \vspace*{50\p@}%
+  {\centering
+    \ifnum \c@secnumdepth >\m@ne
+      \if@mainmatter
+        \large\bfseries \@chapapp{} \thechapter
+        \par\nobreak
+        \vskip 20\p@
+      \fi
+    \fi
+    \interlinepenalty\@M
+    \Large \bfseries #1\par\nobreak
+    \vskip 40\p@
+  }}
+\def\@schapter#1{\if@twocolumn
+                   \@topnewpage[\@makeschapterhead{#1}]%
+                 \else
+                   \@makeschapterhead{#1}%
+                   \@afterheading
+                 \fi}
+\def\@makeschapterhead#1{%
+% \vspace*{50\p@}%
+  {\centering
+    \normalfont
+    \interlinepenalty\@M
+    \Large \bfseries  #1\par\nobreak
+    \vskip 40\p@
+  }}
+
+\renewcommand\section{\@startsection{section}{1}{\z@}%
+                       {-18\p@ \@plus -4\p@ \@minus -4\p@}%
+                       {12\p@ \@plus 4\p@ \@minus 4\p@}%
+                       {\normalfont\large\bfseries\boldmath
+                        \rightskip=\z@ \@plus 8em\pretolerance=10000 }}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+                       {-18\p@ \@plus -4\p@ \@minus -4\p@}%
+                       {8\p@ \@plus 4\p@ \@minus 4\p@}%
+                       {\normalfont\normalsize\bfseries\boldmath
+                        \rightskip=\z@ \@plus 8em\pretolerance=10000 }}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+                       {-18\p@ \@plus -4\p@ \@minus -4\p@}%
+                       {-0.5em \@plus -0.22em \@minus -0.1em}%
+                       {\normalfont\normalsize\bfseries\boldmath}}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+                       {-12\p@ \@plus -4\p@ \@minus -4\p@}%
+                       {-0.5em \@plus -0.22em \@minus -0.1em}%
+                       {\normalfont\normalsize\itshape}}
+\renewcommand\subparagraph[1]{\typeout{LLNCS warning: You should not use
+                  \string\subparagraph\space with this class}\vskip0.5cm
+You should not use \verb|\subparagraph| with this class.\vskip0.5cm}
+
+\DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{"00}
+\DeclareMathSymbol{\Delta}{\mathalpha}{letters}{"01}
+\DeclareMathSymbol{\Theta}{\mathalpha}{letters}{"02}
+\DeclareMathSymbol{\Lambda}{\mathalpha}{letters}{"03}
+\DeclareMathSymbol{\Xi}{\mathalpha}{letters}{"04}
+\DeclareMathSymbol{\Pi}{\mathalpha}{letters}{"05}
+\DeclareMathSymbol{\Sigma}{\mathalpha}{letters}{"06}
+\DeclareMathSymbol{\Upsilon}{\mathalpha}{letters}{"07}
+\DeclareMathSymbol{\Phi}{\mathalpha}{letters}{"08}
+\DeclareMathSymbol{\Psi}{\mathalpha}{letters}{"09}
+\DeclareMathSymbol{\Omega}{\mathalpha}{letters}{"0A}
+
+\let\footnotesize\small
+
+\if@custvec
+\def\vec#1{\mathchoice{\mbox{\boldmath$\displaystyle#1$}}
+{\mbox{\boldmath$\textstyle#1$}}
+{\mbox{\boldmath$\scriptstyle#1$}}
+{\mbox{\boldmath$\scriptscriptstyle#1$}}}
+\fi
+
+\def\squareforqed{\hbox{\rlap{$\sqcap$}$\sqcup$}}
+\def\qed{\ifmmode\squareforqed\else{\unskip\nobreak\hfil
+\penalty50\hskip1em\null\nobreak\hfil\squareforqed
+\parfillskip=0pt\finalhyphendemerits=0\endgraf}\fi}
+
+\def\getsto{\mathrel{\mathchoice {\vcenter{\offinterlineskip
+\halign{\hfil
+$\displaystyle##$\hfil\cr\gets\cr\to\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\textstyle##$\hfil\cr\gets
+\cr\to\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptstyle##$\hfil\cr\gets
+\cr\to\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptscriptstyle##$\hfil\cr
+\gets\cr\to\cr}}}}}
+\def\lid{\mathrel{\mathchoice {\vcenter{\offinterlineskip\halign{\hfil
+$\displaystyle##$\hfil\cr<\cr\noalign{\vskip1.2pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\textstyle##$\hfil\cr<\cr
+\noalign{\vskip1.2pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptstyle##$\hfil\cr<\cr
+\noalign{\vskip1pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptscriptstyle##$\hfil\cr
+<\cr
+\noalign{\vskip0.9pt}=\cr}}}}}
+\def\gid{\mathrel{\mathchoice {\vcenter{\offinterlineskip\halign{\hfil
+$\displaystyle##$\hfil\cr>\cr\noalign{\vskip1.2pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\textstyle##$\hfil\cr>\cr
+\noalign{\vskip1.2pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptstyle##$\hfil\cr>\cr
+\noalign{\vskip1pt}=\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptscriptstyle##$\hfil\cr
+>\cr
+\noalign{\vskip0.9pt}=\cr}}}}}
+\def\grole{\mathrel{\mathchoice {\vcenter{\offinterlineskip
+\halign{\hfil
+$\displaystyle##$\hfil\cr>\cr\noalign{\vskip-1pt}<\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\textstyle##$\hfil\cr
+>\cr\noalign{\vskip-1pt}<\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptstyle##$\hfil\cr
+>\cr\noalign{\vskip-0.8pt}<\cr}}}
+{\vcenter{\offinterlineskip\halign{\hfil$\scriptscriptstyle##$\hfil\cr
+>\cr\noalign{\vskip-0.3pt}<\cr}}}}}
+\def\bbbr{{\rm I\!R}} %reelle Zahlen
+\def\bbbm{{\rm I\!M}}
+\def\bbbn{{\rm I\!N}} %natuerliche Zahlen
+\def\bbbf{{\rm I\!F}}
+\def\bbbh{{\rm I\!H}}
+\def\bbbk{{\rm I\!K}}
+\def\bbbp{{\rm I\!P}}
+\def\bbbone{{\mathchoice {\rm 1\mskip-4mu l} {\rm 1\mskip-4mu l}
+{\rm 1\mskip-4.5mu l} {\rm 1\mskip-5mu l}}}
+\def\bbbc{{\mathchoice {\setbox0=\hbox{$\displaystyle\rm C$}\hbox{\hbox
+to0pt{\kern0.4\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\textstyle\rm C$}\hbox{\hbox
+to0pt{\kern0.4\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptstyle\rm C$}\hbox{\hbox
+to0pt{\kern0.4\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptscriptstyle\rm C$}\hbox{\hbox
+to0pt{\kern0.4\wd0\vrule height0.9\ht0\hss}\box0}}}}
+\def\bbbq{{\mathchoice {\setbox0=\hbox{$\displaystyle\rm
+Q$}\hbox{\raise
+0.15\ht0\hbox to0pt{\kern0.4\wd0\vrule height0.8\ht0\hss}\box0}}
+{\setbox0=\hbox{$\textstyle\rm Q$}\hbox{\raise
+0.15\ht0\hbox to0pt{\kern0.4\wd0\vrule height0.8\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptstyle\rm Q$}\hbox{\raise
+0.15\ht0\hbox to0pt{\kern0.4\wd0\vrule height0.7\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptscriptstyle\rm Q$}\hbox{\raise
+0.15\ht0\hbox to0pt{\kern0.4\wd0\vrule height0.7\ht0\hss}\box0}}}}
+\def\bbbt{{\mathchoice {\setbox0=\hbox{$\displaystyle\rm
+T$}\hbox{\hbox to0pt{\kern0.3\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\textstyle\rm T$}\hbox{\hbox
+to0pt{\kern0.3\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptstyle\rm T$}\hbox{\hbox
+to0pt{\kern0.3\wd0\vrule height0.9\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptscriptstyle\rm T$}\hbox{\hbox
+to0pt{\kern0.3\wd0\vrule height0.9\ht0\hss}\box0}}}}
+\def\bbbs{{\mathchoice
+{\setbox0=\hbox{$\displaystyle     \rm S$}\hbox{\raise0.5\ht0\hbox
+to0pt{\kern0.35\wd0\vrule height0.45\ht0\hss}\hbox
+to0pt{\kern0.55\wd0\vrule height0.5\ht0\hss}\box0}}
+{\setbox0=\hbox{$\textstyle        \rm S$}\hbox{\raise0.5\ht0\hbox
+to0pt{\kern0.35\wd0\vrule height0.45\ht0\hss}\hbox
+to0pt{\kern0.55\wd0\vrule height0.5\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptstyle      \rm S$}\hbox{\raise0.5\ht0\hbox
+to0pt{\kern0.35\wd0\vrule height0.45\ht0\hss}\raise0.05\ht0\hbox
+to0pt{\kern0.5\wd0\vrule height0.45\ht0\hss}\box0}}
+{\setbox0=\hbox{$\scriptscriptstyle\rm S$}\hbox{\raise0.5\ht0\hbox
+to0pt{\kern0.4\wd0\vrule height0.45\ht0\hss}\raise0.05\ht0\hbox
+to0pt{\kern0.55\wd0\vrule height0.45\ht0\hss}\box0}}}}
+\def\bbbz{{\mathchoice {\hbox{$\mathsf\textstyle Z\kern-0.4em Z$}}
+{\hbox{$\mathsf\textstyle Z\kern-0.4em Z$}}
+{\hbox{$\mathsf\scriptstyle Z\kern-0.3em Z$}}
+{\hbox{$\mathsf\scriptscriptstyle Z\kern-0.2em Z$}}}}
+
+\let\ts\,
+
+\setlength\leftmargini  {17\p@}
+\setlength\leftmargin    {\leftmargini}
+\setlength\leftmarginii  {\leftmargini}
+\setlength\leftmarginiii {\leftmargini}
+\setlength\leftmarginiv  {\leftmargini}
+\setlength  \labelsep  {.5em}
+\setlength  \labelwidth{\leftmargini}
+\addtolength\labelwidth{-\labelsep}
+
+\def\@listI{\leftmargin\leftmargini
+            \parsep 0\p@ \@plus1\p@ \@minus\p@
+            \topsep 8\p@ \@plus2\p@ \@minus4\p@
+            \itemsep0\p@}
+\let\@listi\@listI
+\@listi
+\def\@listii {\leftmargin\leftmarginii
+              \labelwidth\leftmarginii
+              \advance\labelwidth-\labelsep
+              \topsep    0\p@ \@plus2\p@ \@minus\p@}
+\def\@listiii{\leftmargin\leftmarginiii
+              \labelwidth\leftmarginiii
+              \advance\labelwidth-\labelsep
+              \topsep    0\p@ \@plus\p@\@minus\p@
+              \parsep    \z@
+              \partopsep \p@ \@plus\z@ \@minus\p@}
+
+\renewcommand\labelitemi{\normalfont\bfseries --}
+\renewcommand\labelitemii{$\m@th\bullet$}
+
+\setlength\arraycolsep{1.4\p@}
+\setlength\tabcolsep{1.4\p@}
+
+\def\tableofcontents{\chapter*{\contentsname\@mkboth{{\contentsname}}%
+                                                    {{\contentsname}}}
+ \def\authcount##1{\setcounter{auco}{##1}\setcounter{@auth}{1}}
+ \def\lastand{\ifnum\value{auco}=2\relax
+                 \unskip{} \andname\
+              \else
+                 \unskip \lastandname\
+              \fi}%
+ \def\and{\stepcounter{@auth}\relax
+          \ifnum\value{@auth}=\value{auco}%
+             \lastand
+          \else
+             \unskip,
+          \fi}%
+ \@starttoc{toc}\if@restonecol\twocolumn\fi}
+
+\def\l@part#1#2{\addpenalty{\@secpenalty}%
+   \addvspace{2em plus\p@}%  % space above part line
+   \begingroup
+     \parindent \z@
+     \rightskip \z@ plus 5em
+     \hrule\vskip5pt
+     \large               % same size as for a contribution heading
+     \bfseries\boldmath   % set line in boldface
+     \leavevmode          % TeX command to enter horizontal mode.
+     #1\par
+     \vskip5pt
+     \hrule
+     \vskip1pt
+     \nobreak             % Never break after part entry
+   \endgroup}
+
+\def\@dotsep{2}
+
+\let\phantomsection=\relax
+
+\def\hyperhrefextend{\ifx\hyper@anchor\@undefined\else
+{}\fi}
+
+\def\addnumcontentsmark#1#2#3{%
+\addtocontents{#1}{\protect\contentsline{#2}{\protect\numberline
+                     {\thechapter}#3}{\thepage}\hyperhrefextend}}%
+\def\addcontentsmark#1#2#3{%
+\addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}\hyperhrefextend}}%
+\def\addcontentsmarkwop#1#2#3{%
+\addtocontents{#1}{\protect\contentsline{#2}{#3}{0}\hyperhrefextend}}%
+
+\def\@adcmk[#1]{\ifcase #1 \or
+\def\@gtempa{\addnumcontentsmark}%
+  \or    \def\@gtempa{\addcontentsmark}%
+  \or    \def\@gtempa{\addcontentsmarkwop}%
+  \fi\@gtempa{toc}{chapter}%
+}
+\def\addtocmark{%
+\phantomsection
+\@ifnextchar[{\@adcmk}{\@adcmk[3]}%
+}
+
+\def\l@chapter#1#2{\addpenalty{-\@highpenalty}
+ \vskip 1.0em plus 1pt \@tempdima 1.5em \begingroup
+ \parindent \z@ \rightskip \@tocrmarg
+ \advance\rightskip by 0pt plus 2cm
+ \parfillskip -\rightskip \pretolerance=10000
+ \leavevmode \advance\leftskip\@tempdima \hskip -\leftskip
+ {\large\bfseries\boldmath#1}\ifx0#2\hfil\null
+ \else
+      \nobreak
+      \leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern
+      \@dotsep mu$}\hfill
+      \nobreak\hbox to\@pnumwidth{\hss #2}%
+ \fi\par
+ \penalty\@highpenalty \endgroup}
+
+\def\l@title#1#2{\addpenalty{-\@highpenalty}
+ \addvspace{8pt plus 1pt}
+ \@tempdima \z@
+ \begingroup
+ \parindent \z@ \rightskip \@tocrmarg
+ \advance\rightskip by 0pt plus 2cm
+ \parfillskip -\rightskip \pretolerance=10000
+ \leavevmode \advance\leftskip\@tempdima \hskip -\leftskip
+ #1\nobreak
+ \leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern
+ \@dotsep mu$}\hfill
+ \nobreak\hbox to\@pnumwidth{\hss #2}\par
+ \penalty\@highpenalty \endgroup}
+
+\def\l@author#1#2{\addpenalty{\@highpenalty}
+ \@tempdima=15\p@ %\z@
+ \begingroup
+ \parindent \z@ \rightskip \@tocrmarg
+ \advance\rightskip by 0pt plus 2cm
+ \pretolerance=10000
+ \leavevmode \advance\leftskip\@tempdima %\hskip -\leftskip
+ \textit{#1}\par
+ \penalty\@highpenalty \endgroup}
+
+\setcounter{tocdepth}{0}
+\newdimen\tocchpnum
+\newdimen\tocsecnum
+\newdimen\tocsectotal
+\newdimen\tocsubsecnum
+\newdimen\tocsubsectotal
+\newdimen\tocsubsubsecnum
+\newdimen\tocsubsubsectotal
+\newdimen\tocparanum
+\newdimen\tocparatotal
+\newdimen\tocsubparanum
+\tocchpnum=\z@            % no chapter numbers
+\tocsecnum=15\p@          % section 88. plus 2.222pt
+\tocsubsecnum=23\p@       % subsection 88.8 plus 2.222pt
+\tocsubsubsecnum=27\p@    % subsubsection 88.8.8 plus 1.444pt
+\tocparanum=35\p@         % paragraph 88.8.8.8 plus 1.666pt
+\tocsubparanum=43\p@      % subparagraph 88.8.8.8.8 plus 1.888pt
+\def\calctocindent{%
+\tocsectotal=\tocchpnum
+\advance\tocsectotal by\tocsecnum
+\tocsubsectotal=\tocsectotal
+\advance\tocsubsectotal by\tocsubsecnum
+\tocsubsubsectotal=\tocsubsectotal
+\advance\tocsubsubsectotal by\tocsubsubsecnum
+\tocparatotal=\tocsubsubsectotal
+\advance\tocparatotal by\tocparanum}
+\calctocindent
+
+\def\l@section{\@dottedtocline{1}{\tocchpnum}{\tocsecnum}}
+\def\l@subsection{\@dottedtocline{2}{\tocsectotal}{\tocsubsecnum}}
+\def\l@subsubsection{\@dottedtocline{3}{\tocsubsectotal}{\tocsubsubsecnum}}
+\def\l@paragraph{\@dottedtocline{4}{\tocsubsubsectotal}{\tocparanum}}
+\def\l@subparagraph{\@dottedtocline{5}{\tocparatotal}{\tocsubparanum}}
+
+\def\listoffigures{\@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn
+ \fi\section*{\listfigurename\@mkboth{{\listfigurename}}{{\listfigurename}}}
+ \@starttoc{lof}\if@restonecol\twocolumn\fi}
+\def\l@figure{\@dottedtocline{1}{0em}{1.5em}}
+
+\def\listoftables{\@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn
+ \fi\section*{\listtablename\@mkboth{{\listtablename}}{{\listtablename}}}
+ \@starttoc{lot}\if@restonecol\twocolumn\fi}
+\let\l@table\l@figure
+
+\renewcommand\listoffigures{%
+    \section*{\listfigurename
+      \@mkboth{\listfigurename}{\listfigurename}}%
+    \@starttoc{lof}%
+    }
+
+\renewcommand\listoftables{%
+    \section*{\listtablename
+      \@mkboth{\listtablename}{\listtablename}}%
+    \@starttoc{lot}%
+    }
+
+\ifx\oribibl\undefined
+\ifx\citeauthoryear\undefined
+\renewenvironment{thebibliography}[1]
+     {\section*{\refname}
+      \def\@biblabel##1{##1.}
+      \small
+      \list{\@biblabel{\@arabic\c@enumiv}}%
+           {\settowidth\labelwidth{\@biblabel{#1}}%
+            \leftmargin\labelwidth
+            \advance\leftmargin\labelsep
+            \if@openbib
+              \advance\leftmargin\bibindent
+              \itemindent -\bibindent
+              \listparindent \itemindent
+              \parsep \z@
+            \fi
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+      \if@openbib
+        \renewcommand\newblock{\par}%
+      \else
+        \renewcommand\newblock{\hskip .11em \@plus.33em \@minus.07em}%
+      \fi
+      \sloppy\clubpenalty4000\widowpenalty4000%
+      \sfcode`\.=\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
+\def\@lbibitem[#1]#2{\item[{[#1]}\hfill]\if@filesw
+     {\let\protect\noexpand\immediate
+     \write\@auxout{\string\bibcite{#2}{#1}}}\fi\ignorespaces}
+\newcount\@tempcntc
+\def\@citex[#1]#2{\if@filesw\immediate\write\@auxout{\string\citation{#2}}\fi
+  \@tempcnta\z@\@tempcntb\m@ne\def\@citea{}\@cite{\@for\@citeb:=#2\do
+    {\@ifundefined
+       {b@\@citeb}{\@citeo\@tempcntb\m@ne\@citea\def\@citea{,}{\bfseries
+        ?}\@warning
+       {Citation `\@citeb' on page \thepage \space undefined}}%
+    {\setbox\z@\hbox{\global\@tempcntc0\csname b@\@citeb\endcsname\relax}%
+     \ifnum\@tempcntc=\z@ \@citeo\@tempcntb\m@ne
+       \@citea\def\@citea{,}\hbox{\csname b@\@citeb\endcsname}%
+     \else
+      \advance\@tempcntb\@ne
+      \ifnum\@tempcntb=\@tempcntc
+      \else\advance\@tempcntb\m@ne\@citeo
+      \@tempcnta\@tempcntc\@tempcntb\@tempcntc\fi\fi}}\@citeo}{#1}}
+\def\@citeo{\ifnum\@tempcnta>\@tempcntb\else
+               \@citea\def\@citea{,\,\hskip\z@skip}%
+               \ifnum\@tempcnta=\@tempcntb\the\@tempcnta\else
+               {\advance\@tempcnta\@ne\ifnum\@tempcnta=\@tempcntb \else
+                \def\@citea{--}\fi
+      \advance\@tempcnta\m@ne\the\@tempcnta\@citea\the\@tempcntb}\fi\fi}
+\else
+\renewenvironment{thebibliography}[1]
+     {\section*{\refname}
+      \small
+      \list{}%
+           {\settowidth\labelwidth{}%
+            \leftmargin\parindent
+            \itemindent=-\parindent
+            \labelsep=\z@
+            \if@openbib
+              \advance\leftmargin\bibindent
+              \itemindent -\bibindent
+              \listparindent \itemindent
+              \parsep \z@
+            \fi
+            \usecounter{enumiv}%
+            \let\p@enumiv\@empty
+            \renewcommand\theenumiv{}}%
+      \if@openbib
+        \renewcommand\newblock{\par}%
+      \else
+        \renewcommand\newblock{\hskip .11em \@plus.33em \@minus.07em}%
+      \fi
+      \sloppy\clubpenalty4000\widowpenalty4000%
+      \sfcode`\.=\@m}
+     {\def\@noitemerr
+       {\@latex@warning{Empty `thebibliography' environment}}%
+      \endlist}
+      \def\@cite#1{#1}%
+      \def\@lbibitem[#1]#2{\item[]\if@filesw
+        {\def\protect##1{\string ##1\space}\immediate
+      \write\@auxout{\string\bibcite{#2}{#1}}}\fi\ignorespaces}
+   \fi
+\else
+\@cons\@openbib@code{\noexpand\small}
+\fi
+
+\def\idxquad{\hskip 10\p@}% space that divides entry from number
+
+\def\@idxitem{\par\hangindent 10\p@}
+
+\def\subitem{\par\setbox0=\hbox{--\enspace}% second order
+                \noindent\hangindent\wd0\box0}% index entry
+
+\def\subsubitem{\par\setbox0=\hbox{--\,--\enspace}% third
+                \noindent\hangindent\wd0\box0}% order index entry
+
+\def\indexspace{\par \vskip 10\p@ plus5\p@ minus3\p@\relax}
+
+\renewenvironment{theindex}
+               {\@mkboth{\indexname}{\indexname}%
+                \thispagestyle{empty}\parindent\z@
+                \parskip\z@ \@plus .3\p@\relax
+                \let\item\par
+                \def\,{\relax\ifmmode\mskip\thinmuskip
+                             \else\hskip0.2em\ignorespaces\fi}%
+                \normalfont\small
+                \begin{multicols}{2}[\@makeschapterhead{\indexname}]%
+                }
+                {\end{multicols}}
+
+\renewcommand\footnoterule{%
+  \kern-3\p@
+  \hrule\@width 2truecm
+  \kern2.6\p@}
+  \newdimen\fnindent
+  \fnindent1em
+\long\def\@makefntext#1{%
+    \parindent \fnindent%
+    \leftskip \fnindent%
+    \noindent
+    \llap{\hb@xt@1em{\hss\@makefnmark\ }}\ignorespaces#1}
+
+\long\def\@makecaption#1#2{%
+  \small
+  \vskip\abovecaptionskip
+  \sbox\@tempboxa{{\bfseries #1.} #2}%
+  \ifdim \wd\@tempboxa >\hsize
+    {\bfseries #1.} #2\par
+  \else
+    \global \@minipagefalse
+    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+  \fi
+  \vskip\belowcaptionskip}
+
+\def\fps@figure{htbp}
+\def\fnum@figure{\figurename\thinspace\thefigure}
+\def \@floatboxreset {%
+        \reset@font
+        \small
+        \@setnobreak
+        \@setminipage
+}
+\def\fps@table{htbp}
+\def\fnum@table{\tablename~\thetable}
+\renewenvironment{table}
+               {\setlength\abovecaptionskip{0\p@}%
+                \setlength\belowcaptionskip{10\p@}%
+                \@float{table}}
+               {\end@float}
+\renewenvironment{table*}
+               {\setlength\abovecaptionskip{0\p@}%
+                \setlength\belowcaptionskip{10\p@}%
+                \@dblfloat{table}}
+               {\end@dblfloat}
+
+\long\def\@caption#1[#2]#3{\par\addcontentsline{\csname
+  ext@#1\endcsname}{#1}{\protect\numberline{\csname
+  the#1\endcsname}{\ignorespaces #2}}\begingroup
+    \@parboxrestore
+    \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+  \endgroup}
+
+% LaTeX does not provide a command to enter the authors institute
+% addresses. The \institute command is defined here.
+
+\newcounter{@inst}
+\newcounter{@auth}
+\newcounter{auco}
+\newdimen\instindent
+\newbox\authrun
+\newtoks\authorrunning
+\newtoks\tocauthor
+\newbox\titrun
+\newtoks\titlerunning
+\newtoks\toctitle
+
+\def\clearheadinfo{\gdef\@author{No Author Given}%
+                   \gdef\@title{No Title Given}%
+                   \gdef\@subtitle{}%
+                   \gdef\@institute{No Institute Given}%
+                   \gdef\@thanks{}%
+                   \global\titlerunning={}\global\authorrunning={}%
+                   \global\toctitle={}\global\tocauthor={}}
+
+\def\institute#1{\gdef\@institute{#1}}
+
+\def\institutename{\par
+ \begingroup
+ \parskip=\z@
+ \parindent=\z@
+ \setcounter{@inst}{1}%
+ \def\and{\par\stepcounter{@inst}%
+ \noindent$^{\the@inst}$\enspace\ignorespaces}%
+ \setbox0=\vbox{\def\thanks##1{}\@institute}%
+ \ifnum\c@@inst=1\relax
+   \gdef\fnnstart{0}%
+ \else
+   \xdef\fnnstart{\c@@inst}%
+   \setcounter{@inst}{1}%
+   \noindent$^{\the@inst}$\enspace
+ \fi
+ \ignorespaces
+ \@institute\par
+ \endgroup}
+
+\def\@fnsymbol#1{\ensuremath{\ifcase#1\or\star\or{\star\star}\or
+   {\star\star\star}\or \dagger\or \ddagger\or
+   \mathchar "278\or \mathchar "27B\or \|\or **\or \dagger\dagger
+   \or \ddagger\ddagger \else\@ctrerr\fi}}
+
+\def\inst#1{\unskip$^{#1}$}
+\def\orcidID#1{\unskip$^{[#1]}$} % added MR 2018-03-10
+\def\fnmsep{\unskip$^,$}
+\def\email#1{{\tt#1}}
+
+\AtBeginDocument{\@ifundefined{url}{\def\url#1{#1}}{}%
+\@ifpackageloaded{babel}{%
+\@ifundefined{extrasenglish}{}{\addto\extrasenglish{\switcht@albion}}%
+\@ifundefined{extrasfrenchb}{}{\addto\extrasfrenchb{\switcht@francais}}%
+\@ifundefined{extrasgerman}{}{\addto\extrasgerman{\switcht@deutsch}}%
+\@ifundefined{extrasngerman}{}{\addto\extrasngerman{\switcht@deutsch}}%
+}{\switcht@@therlang}%
+\providecommand{\keywords}[1]{\def\and{{\textperiodcentered} }%
+\par\addvspace\baselineskip
+\noindent\keywordname\enspace\ignorespaces#1}%
+\@ifpackageloaded{hyperref}{%
+\def\doi#1{\href{https://doi.org/#1}{https://doi.org/#1}}}{
+\def\doi#1{https://doi.org/#1}}
+}
+\def\homedir{\~{ }}
+
+\def\subtitle#1{\gdef\@subtitle{#1}}
+\clearheadinfo
+%
+%%% to avoid hyperref warnings
+\providecommand*{\toclevel@author}{999}
+%%% to make title-entry parent of section-entries
+\providecommand*{\toclevel@title}{0}
+%
+\renewcommand\maketitle{\newpage
+\phantomsection
+  \refstepcounter{chapter}%
+  \stepcounter{section}%
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \setcounter{figure}{0}
+  \setcounter{table}{0}
+  \setcounter{equation}{0}
+  \setcounter{footnote}{0}%
+  \begingroup
+    \parindent=\z@
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+    \if@twocolumn
+      \ifnum \col@number=\@ne
+        \@maketitle
+      \else
+        \twocolumn[\@maketitle]%
+      \fi
+    \else
+      \newpage
+      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \@maketitle
+    \fi
+    \thispagestyle{empty}\@thanks
+%
+    \def\\{\unskip\ \ignorespaces}\def\inst##1{\unskip{}}%
+    \def\thanks##1{\unskip{}}\def\fnmsep{\unskip}%
+    \instindent=\hsize
+    \advance\instindent by-\headlineindent
+    \if!\the\toctitle!\addcontentsline{toc}{title}{\@title}\else
+       \addcontentsline{toc}{title}{\the\toctitle}\fi
+    \if@runhead
+       \if!\the\titlerunning!\else
+         \edef\@title{\the\titlerunning}%
+       \fi
+       \global\setbox\titrun=\hbox{\small\rm\unboldmath\ignorespaces\@title}%
+       \ifdim\wd\titrun>\instindent
+          \typeout{Title too long for running head. Please supply}%
+          \typeout{a shorter form with \string\titlerunning\space prior to
+                   \string\maketitle}%
+          \global\setbox\titrun=\hbox{\small\rm
+          Title Suppressed Due to Excessive Length}%
+       \fi
+       \xdef\@title{\copy\titrun}%
+    \fi
+%
+    \if!\the\tocauthor!\relax
+      {\def\and{\noexpand\protect\noexpand\and}%
+       \def\inst##1{}%    added MR 2017-09-20 to remove inst numbers from the TOC
+       \def\orcidID##1{}% added MR 2017-09-20 to remove ORCID ids from the TOC
+      \protected@xdef\toc@uthor{\@author}}%
+    \else
+      \def\\{\noexpand\protect\noexpand\newline}%
+      \protected@xdef\scratch{\the\tocauthor}%
+      \protected@xdef\toc@uthor{\scratch}%
+    \fi
+    \addtocontents{toc}{\noexpand\protect\noexpand\authcount{\the\c@auco}}%
+    \addcontentsline{toc}{author}{\toc@uthor}%
+    \if@runhead
+       \if!\the\authorrunning!
+         \value{@inst}=\value{@auth}%
+         \setcounter{@auth}{1}%
+       \else
+         \edef\@author{\the\authorrunning}%
+       \fi
+       \global\setbox\authrun=\hbox{\def\inst##1{}%    added MR 2017-09-20 to remove inst numbers from the runninghead
+                                    \def\orcidID##1{}% added MR 2017-09-20 to remove ORCID ids from the runninghead
+                                    \small\unboldmath\@author\unskip}%
+       \ifdim\wd\authrun>\instindent
+          \typeout{Names of authors too long for running head. Please supply}%
+          \typeout{a shorter form with \string\authorrunning\space prior to
+                   \string\maketitle}%
+          \global\setbox\authrun=\hbox{\small\rm
+          Authors Suppressed Due to Excessive Length}%
+       \fi
+       \xdef\@author{\copy\authrun}%
+       \markboth{\@author}{\@title}%
+     \fi
+  \endgroup
+  \setcounter{footnote}{\fnnstart}%
+  \clearheadinfo}
+%
+\def\@maketitle{\newpage
+ \markboth{}{}%
+ \def\lastand{\ifnum\value{@inst}=2\relax
+                 \unskip{} \andname\
+              \else
+                 \unskip \lastandname\
+              \fi}%
+ \def\and{\stepcounter{@auth}\relax
+          \ifnum\value{@auth}=\value{@inst}%
+             \lastand
+          \else
+             \unskip,
+          \fi}%
+ \begin{center}%
+ \let\newline\\
+ {\Large \bfseries\boldmath
+  \pretolerance=10000
+  \@title \par}\vskip .8cm
+\if!\@subtitle!\else {\large \bfseries\boldmath
+  \vskip -.65cm
+  \pretolerance=10000
+  \@subtitle \par}\vskip .8cm\fi
+ \setbox0=\vbox{\setcounter{@auth}{1}\def\and{\stepcounter{@auth}}%
+ \def\thanks##1{}\@author}%
+ \global\value{@inst}=\value{@auth}%
+ \global\value{auco}=\value{@auth}%
+ \setcounter{@auth}{1}%
+{\lineskip .5em
+\noindent\ignorespaces
+\@author\vskip.35cm}
+ {\small\institutename}
+ \end{center}%
+ }
+
+% definition of the "\spnewtheorem" command.
+%
+% Usage:
+%
+%     \spnewtheorem{env_nam}{caption}[within]{cap_font}{body_font}
+% or  \spnewtheorem{env_nam}[numbered_like]{caption}{cap_font}{body_font}
+% or  \spnewtheorem*{env_nam}{caption}{cap_font}{body_font}
+%
+% New is "cap_font" and "body_font". It stands for
+% fontdefinition of the caption and the text itself.
+%
+% "\spnewtheorem*" gives a theorem without number.
+%
+% A defined spnewthoerem environment is used as described
+% by Lamport.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\@thmcountersep{}
+\def\@thmcounterend{.}
+
+\def\spnewtheorem{\@ifstar{\@sthm}{\@Sthm}}
+
+% definition of \spnewtheorem with number
+
+\def\@spnthm#1#2{%
+  \@ifnextchar[{\@spxnthm{#1}{#2}}{\@spynthm{#1}{#2}}}
+\def\@Sthm#1{\@ifnextchar[{\@spothm{#1}}{\@spnthm{#1}}}
+
+\def\@spxnthm#1#2[#3]#4#5{\expandafter\@ifdefinable\csname #1\endcsname
+   {\@definecounter{#1}\@addtoreset{#1}{#3}%
+   \expandafter\xdef\csname the#1\endcsname{\expandafter\noexpand
+     \csname the#3\endcsname \noexpand\@thmcountersep \@thmcounter{#1}}%
+   \expandafter\xdef\csname #1name\endcsname{#2}%
+   \global\@namedef{#1}{\@spthm{#1}{\csname #1name\endcsname}{#4}{#5}}%
+                              \global\@namedef{end#1}{\@endtheorem}}}
+
+\def\@spynthm#1#2#3#4{\expandafter\@ifdefinable\csname #1\endcsname
+   {\@definecounter{#1}%
+   \expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}%
+   \expandafter\xdef\csname #1name\endcsname{#2}%
+   \global\@namedef{#1}{\@spthm{#1}{\csname #1name\endcsname}{#3}{#4}}%
+                               \global\@namedef{end#1}{\@endtheorem}}}
+
+\def\@spothm#1[#2]#3#4#5{%
+  \@ifundefined{c@#2}{\@latexerr{No theorem environment `#2' defined}\@eha}%
+  {\expandafter\@ifdefinable\csname #1\endcsname
+  {\newaliascnt{#1}{#2}%
+  \expandafter\xdef\csname #1name\endcsname{#3}%
+  \global\@namedef{#1}{\@spthm{#1}{\csname #1name\endcsname}{#4}{#5}}%
+  \global\@namedef{end#1}{\@endtheorem}}}}
+
+\def\@spthm#1#2#3#4{\topsep 7\p@ \@plus2\p@ \@minus4\p@
+\refstepcounter{#1}%
+\@ifnextchar[{\@spythm{#1}{#2}{#3}{#4}}{\@spxthm{#1}{#2}{#3}{#4}}}
+
+\def\@spxthm#1#2#3#4{\@spbegintheorem{#2}{\csname the#1\endcsname}{#3}{#4}%
+                    \ignorespaces}
+
+\def\@spythm#1#2#3#4[#5]{\@spopargbegintheorem{#2}{\csname
+       the#1\endcsname}{#5}{#3}{#4}\ignorespaces}
+
+\def\@spbegintheorem#1#2#3#4{\trivlist
+                 \item[\hskip\labelsep{#3#1\ #2\@thmcounterend}]#4}
+
+\def\@spopargbegintheorem#1#2#3#4#5{\trivlist
+      \item[\hskip\labelsep{#4#1\ #2}]{#4(#3)\@thmcounterend\ }#5}
+
+% definition of \spnewtheorem* without number
+
+\def\@sthm#1#2{\@Ynthm{#1}{#2}}
+
+\def\@Ynthm#1#2#3#4{\expandafter\@ifdefinable\csname #1\endcsname
+   {\global\@namedef{#1}{\@Thm{\csname #1name\endcsname}{#3}{#4}}%
+    \expandafter\xdef\csname #1name\endcsname{#2}%
+    \global\@namedef{end#1}{\@endtheorem}}}
+
+\def\@Thm#1#2#3{\topsep 7\p@ \@plus2\p@ \@minus4\p@
+\@ifnextchar[{\@Ythm{#1}{#2}{#3}}{\@Xthm{#1}{#2}{#3}}}
+
+\def\@Xthm#1#2#3{\@Begintheorem{#1}{#2}{#3}\ignorespaces}
+
+\def\@Ythm#1#2#3[#4]{\@Opargbegintheorem{#1}
+       {#4}{#2}{#3}\ignorespaces}
+
+\def\@Begintheorem#1#2#3{#3\trivlist
+                           \item[\hskip\labelsep{#2#1\@thmcounterend}]}
+
+\def\@Opargbegintheorem#1#2#3#4{#4\trivlist
+      \item[\hskip\labelsep{#3#1}]{#3(#2)\@thmcounterend\ }}
+
+\if@envcntsect
+   \def\@thmcountersep{.}
+   \spnewtheorem{theorem}{Theorem}[section]{\bfseries}{\itshape}
+\else
+   \spnewtheorem{theorem}{Theorem}{\bfseries}{\itshape}
+   \if@envcntreset
+      \@addtoreset{theorem}{section}
+   \else
+      \@addtoreset{theorem}{chapter}
+   \fi
+\fi
+
+%definition of divers theorem environments
+\spnewtheorem*{claim}{Claim}{\itshape}{\rmfamily}
+\spnewtheorem*{proof}{Proof}{\itshape}{\rmfamily}
+\if@envcntsame % alle Umgebungen wie Theorem.
+   \def\spn@wtheorem#1#2#3#4{\@spothm{#1}[theorem]{#2}{#3}{#4}}
+\else % alle Umgebungen mit eigenem Zaehler
+   \if@envcntsect % mit section numeriert
+      \def\spn@wtheorem#1#2#3#4{\@spxnthm{#1}{#2}[section]{#3}{#4}}
+   \else % nicht mit section numeriert
+      \if@envcntreset
+         \def\spn@wtheorem#1#2#3#4{\@spynthm{#1}{#2}{#3}{#4}
+                                   \@addtoreset{#1}{section}}
+      \else
+         \def\spn@wtheorem#1#2#3#4{\@spynthm{#1}{#2}{#3}{#4}
+                                   \@addtoreset{#1}{chapter}}%
+      \fi
+   \fi
+\fi
+\spn@wtheorem{case}{Case}{\itshape}{\rmfamily}
+\spn@wtheorem{conjecture}{Conjecture}{\itshape}{\rmfamily}
+\spn@wtheorem{corollary}{Corollary}{\bfseries}{\itshape}
+\spn@wtheorem{definition}{Definition}{\bfseries}{\itshape}
+\spn@wtheorem{example}{Example}{\itshape}{\rmfamily}
+\spn@wtheorem{exercise}{Exercise}{\itshape}{\rmfamily}
+\spn@wtheorem{lemma}{Lemma}{\bfseries}{\itshape}
+\spn@wtheorem{note}{Note}{\itshape}{\rmfamily}
+\spn@wtheorem{problem}{Problem}{\itshape}{\rmfamily}
+\spn@wtheorem{property}{Property}{\itshape}{\rmfamily}
+\spn@wtheorem{proposition}{Proposition}{\bfseries}{\itshape}
+\spn@wtheorem{question}{Question}{\itshape}{\rmfamily}
+\spn@wtheorem{solution}{Solution}{\itshape}{\rmfamily}
+\spn@wtheorem{remark}{Remark}{\itshape}{\rmfamily}
+
+\def\@takefromreset#1#2{%
+    \def\@tempa{#1}%
+    \let\@tempd\@elt
+    \def\@elt##1{%
+        \def\@tempb{##1}%
+        \ifx\@tempa\@tempb\else
+            \@addtoreset{##1}{#2}%
+        \fi}%
+    \expandafter\expandafter\let\expandafter\@tempc\csname cl@#2\endcsname
+    \expandafter\def\csname cl@#2\endcsname{}%
+    \@tempc
+    \let\@elt\@tempd}
+
+\def\theopargself{\def\@spopargbegintheorem##1##2##3##4##5{\trivlist
+      \item[\hskip\labelsep{##4##1\ ##2}]{##4##3\@thmcounterend\ }##5}
+                  \def\@Opargbegintheorem##1##2##3##4{##4\trivlist
+      \item[\hskip\labelsep{##3##1}]{##3##2\@thmcounterend\ }}
+      }
+
+\renewenvironment{abstract}{%
+      \list{}{\advance\topsep by0.35cm\relax\small
+      \leftmargin=1cm
+      \labelwidth=\z@
+      \listparindent=\z@
+      \itemindent\listparindent
+      \rightmargin\leftmargin}\item[\hskip\labelsep
+                                    \bfseries\abstractname]}
+    {\endlist}
+
+\newdimen\headlineindent             % dimension for space between
+\headlineindent=1.166cm              % number and text of headings.
+
+\def\ps@headings{\let\@mkboth\@gobbletwo
+   \let\@oddfoot\@empty\let\@evenfoot\@empty
+   \def\@evenhead{\normalfont\small\rlap{\thepage}\hspace{\headlineindent}%
+                  \leftmark\hfil}
+   \def\@oddhead{\normalfont\small\hfil\rightmark\hspace{\headlineindent}%
+                 \llap{\thepage}}
+   \def\chaptermark##1{}%
+   \def\sectionmark##1{}%
+   \def\subsectionmark##1{}}
+
+\def\ps@titlepage{\let\@mkboth\@gobbletwo
+   \let\@oddfoot\@empty\let\@evenfoot\@empty
+   \def\@evenhead{\normalfont\small\rlap{\thepage}\hspace{\headlineindent}%
+                  \hfil}
+   \def\@oddhead{\normalfont\small\hfil\hspace{\headlineindent}%
+                 \llap{\thepage}}
+   \def\chaptermark##1{}%
+   \def\sectionmark##1{}%
+   \def\subsectionmark##1{}}
+
+\if@runhead\ps@headings\else
+\ps@empty\fi
+
+\setlength\arraycolsep{1.4\p@}
+\setlength\tabcolsep{1.4\p@}
+
+\endinput
+%end of file llncs.cls
diff --git a/vendors/move/crates/move-prover/doc/paper21/main.tex b/vendors/move/crates/move-prover/doc/paper21/main.tex
new file mode 100644
index 000000000..badb85b28
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/main.tex
@@ -0,0 +1,79 @@
+\UseRawInputEncoding
+\documentclass[runningheads,openbib]{llncs}
+
+\input{prelude.tex}
+
+%\renewcommand\UrlFont{\color{blue}\rmfamily}
+
+\begin{document}
+
+\author{
+  David Dill \and Wolfgang Grieskamp(\Envelope)\thanks{\mailname~\email{wgrieskamp@gmail.com}} \and \\ Junkil
+  Park \and Shaz Qadeer \and Meng Xu \and Emma Zhong
+}
+
+\institute{Novi Research, Meta Platforms, Menlo Park, USA}
+  %\\\email{\{dill,wrwg,jkpark,shaz,mengxu,emmazjy\}@fb.com}}
+\authorrunning{D. Dill, W. Grieskamp et. al.}
+
+\title{Fast and Reliable Formal Verification of Smart Contracts with the Move
+  Prover\thanks{To appear in TACAS'22. This is the extended version with
+    appendices.}}
+
+\maketitle
+\begin{abstract}
+  The Move Prover (\MVP) is a formal verifier for smart contracts written in the
+  Move programming language. \MVP has an expressive specification language, and
+  is fast and reliable enough that it can be run routinely by developers and in
+  integration testing.  Besides the simplicity of smart contracts and the Move
+  language, three implementation approaches are responsible for the practicality
+  of \MVP: (1) an alias-free memory model, (2) fine-grained invariant checking,
+  and (3) monomorphization.  The entirety of the Move code for the Diem
+  blockchain has been extensively specified and can be completely verified by
+  \MVP in a few minutes. Changes in the Diem framework must be successfully
+  verified before being integrated into the open source repository on GitHub.
+  \keywords{Smart contracts \and formal verification \and Move language \and
+    Diem blockchain}
+\end{abstract}
+
+
+\input{intro.tex}
+\input{move.tex}
+\input{design.tex}
+\input{analysis.tex}
+\input{conclusion.tex}
+
+%\vspace{-0.5ex}
+\Paragraph{Acknowledgements}
+
+This work would not have been possible without the many contributions of the
+Move platform team and collaborators.  We specifically like to thank Bob Wilson,
+Clark Barrett, Dario Russi, Jack Moffitt, Jake Silverman, Mathieu Baudet,
+Runtian Zhou, Sam Blackshear, Tim Zakian, Todd Nowacki, Victor Gao, and Kevin
+Cheang.
+
+\appendix
+\newpage
+\input{function-injection-apx.tex}
+\input{corrected_example-apx.tex}
+
+\newpage
+\bibliographystyle{splncs04}
+\bibliography{biblio}
+
+\vfill
+
+{\small\medskip\noindent{\bf Open Access} This chapter is licensed under the terms of the Creative Commons\break Attribution 4.0 International License (\url{http://creativecommons.org/licenses/by/4.0/}), which permits use, sharing, adaptation, distribution and reproduction in any medium or format, as long as you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license and indicate if changes were made.}
+
+{\small \spaceskip .28em plus .1em minus .1em The images or other third party material in this chapter are included in the chapter's Creative Commons license, unless indicated otherwise in a credit line to the material.~If material is not included in the chapter's Creative Commons license and your intended\break use is not permitted by statutory regulation or exceeds the permitted use, you will need to obtain permission directly from the copyright holder.}
+
+\medskip\noindent\includegraphics{cc_by_4-0.eps}
+
+
+\end{document}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/move.tex b/vendors/move/crates/move-prover/doc/paper21/move.tex
new file mode 100644
index 000000000..7d1577130
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/move.tex
@@ -0,0 +1,204 @@
+
+\Section{Move and the Prover}
+
+Move was developed for the Diem blockchain \cite{DIEM}, but its design is not
+specific to blockchains.  A Move execution consists of a sequence of updates
+evolving a \emph{global persistent memory state}, which we just call the
+\emph{(global) memory}.  Similar to other blockchains, updates are a series of
+atomic transactions.  All runtime errors result in a transaction abort, which
+does not change the blockchain state except to transfer some currency (``gas'')
+from the account that sent the transaction to pay for cost of executing the
+transaction.
+
+The global memory is organized as a collection of resources, described by Move
+structures (data types). A resource in memory is indexed by a pair of a type and
+an address (for example the address of a user account). For instance, the
+expression |exists<Coin<USD>>(addr)| will be true if there is a value of type
+|Coin<USD>| stored at |addr|. As seen in this example, Move uses type generics,
+and working with generic functions and types is rather idiomatic for Move.
+%Notice that account addresses are not just arbitrary values but have a specific
+%role in Move's programming methodology related to access control via the builtin
+%type of \emph{signers}, as will be discussed later.
+
+A Move application consists of a set of \emph{transaction scripts}. Each
+script defines a Move function with input parameters but no output
+parameters.  This function updates the global memory and may emit
+events. The execution of this function can abort because of an abort
+instruction or implicitly because of a runtime error such as an out-of-bounds
+vector index.
+
+\Paragraph{Programming in Move}
+
+\begin{Figure}
+\caption{\label{fig:AccountDef} Account Example Program}
+\begin{MoveBox}
+module Account {
+  struct Account has key {
+    balance: u64,
+  }
+
+  fun withdraw(account: address, amount: u64) acquires Account {
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert(*balance >= amount, Errors::limit_exceeded());
+    *balance = *balance - amount;
+  }
+
+  fun deposit(account: address, amount: u64) acquires Account {
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert(*balance <= Limits::max_u64() - amount, Errors::limit_exceeded());
+    *balance = *balance + amount;
+  }
+
+  public(script) fun transfer(from: &signer, to: address, amount: u64)
+  acquires Account {
+    assert(Signer::address_of(from) != to, Errors::invalid_argument());
+    withdraw(Signer::address_of(from), amount);
+    deposit(to, amount);
+  }
+}
+\end{MoveBox}
+\end{Figure}
+
+\noindent In Move, one defines transactions via \emph{script functions} which
+take a set of parameters.  Those functions can call other functions. Script and
+regular functions are encapsulated in \emph{modules}. Move modules are also the
+place where structs are defined. An illustration of a Move contract is given in
+Fig.~\ref{fig:AccountDef} (for a more complete description see the Move
+Book~\cite{MOVE_LANG}). The example is a simple account which holds a balance in
+the struct |Account|, and offers the script function |transfer| to manipulate
+this resource.  Scripts generally have \emph{signer} arguments, which are tokens
+which represent an account address that has been authenticated by a
+cryptographic signature.  The |assert| statement in the example causes a Move
+transaction to abort execution if the condition is not met. Notice that Move,
+similar as Rust, supports references (as in |&signer|) and mutable references
+(as in |&mut T|).  However, references cannot be part of structs stored in
+global memory.
+
+%Abortion can also happen implicitly; for example, the
+%expression |borrow_global_mut<T>(addr)| will abort if no resource |T| exists at
+%|addr|.
+
+\Paragraph{Specifying in Move}
+
+\begin{Figure}
+\caption{\label{fig:AccountSpec} Account Example Specification}
+\begin{MoveBox}
+module Account {
+  spec transfer {
+    let from_addr = Signer::address_of(from);
+    aborts_if from_addr == to;
+    aborts_if bal(from_addr) < amount;
+    aborts_if bal(to) + amount > Limits::max_u64();
+    ensures bal(from_addr) == old(bal(from_addr)) - amount;
+    ensures bal(to) == old(bal(to)) + amount;
+  }
+
+  spec fun bal(acc: address): u64 {
+    global<Account>(acc).balance
+  }
+
+  invariant forall acc: address where exists<Account>(acc):
+    bal(acc) >= AccountLimits::min_balance();
+
+  invariant update forall acc: address where exists<Account>(acc):
+    old(bal(acc)) - bal(acc) <= AccountLimits::max_decrease();
+}
+\end{MoveBox}
+\end{Figure}
+
+\noindent The specification language supports {\em Design By Contract}
+\cite{DESIGN_BY_CONTRACT}. Developers can provide pre and post conditions for
+functions, which include conditions over parameters and global
+memory. Developers can also provide invariants over data structures, as well as
+the contents of the global memory.  Universal and existential quantification
+over bounded domains, such as like the indices of a vector, as well as
+effectively unbounded domains, such as memory addresses and integers, are
+supported.  Quantifiers make the verification problem undecidable and cause
+difficulties with timeouts.  However, in practice, we notice that quantifiers
+have the advantage of allowing more direct formalization of many properties,
+which increases the clarity of specifications.
+%% The latter makes the specification language very expressive, but also
+%% renders the verification problem in theory undecidable (and in practice
+%% dependent on heuristic decision procedures).
+
+Fig.~\ref{fig:AccountSpec} illustrates the specification language by extending
+the account example in Fig.~\ref{fig:AccountDef} (for the definition of the
+specification language see \cite{MOVE_SPEC_LANG_DEF}). This adds the
+specification of the |transfer| function, a helper function |bal| for use in
+specs, and two global memory invariants. The first invariant states that a
+balance can never drop underneath a certain minimum. The second invariant refers
+to an update of global memory with pre and post state: the balance on an account
+can never decrease in one step more than a certain amount.  Note that while the
+Move programming language has only unsigned integers, the specification language
+uses arbitrary precision signed integers, making it convenient to specify
+something like |x + y <= limit|, without the complication of arithmetic
+overflow.
+
+Specifications for the |withdraw| and |deposit| functions have been omitted in
+this example.  \MVP supports omitting specs for non-recursive functions, in
+which case they are treated as being inlined at caller site.
+
+%% A discerning reader may have noted that the program in Fig.~\ref{fig:AccountDef}
+%% does not actually satisfy the specification in Fig.~\ref{fig:AccountSpec}. This
+%% will be discussed in the next section.
+
+% The constructs we have seen so far are only a subset of the available features
+% of the Move specification language. Notably, the language supports the following
+% additional features:
+
+% \begin{itemize}
+% \item Function preconditions via the |requires|-clause.
+% \item Data invariants for |struct| types, as a predicate over the field values.
+% \item Means to abstract commonly used specification fragments in so-called
+%   \emph{specification schemas} which can then be included in other specification
+%   blocks.
+% \end{itemize}
+
+\Paragraph{Running the Prover}
+\label{sec:RunningProver}
+
+\MVP is fully automatic, like a type checker or linter, and is
+expected to finish in a reasonable time, so it can be integrated in
+the regular development workflow. Running \MVP on the |module Account| produces
+multiple errors. The first is this one:
+
+\begin{MoveDiag}
+error: abort not covered by any of the `aborts_if` clauses
+   -- account.move:24:3
+   |
+13 |       let balance = &mut borrow_global_mut<Account>(account).balance;
+   |                          ----------------- abort happened here
+   |
+   =     at account.move:18: transfer
+   =         from = signer{0x18be}
+   =         to = 0x18bf
+   =         amount = 147u8
+   =     at ...
+\end{MoveDiag}
+
+\noindent \MVP detected that an implicit abort condition is missing in the
+specification of the |withdraw| function. It prints the context of the error, as
+well as an \emph{execution trace} which leads to the error. Values of variable
+assignments from the counterexample found by the SMT solver are printed together
+with the execution trace. Logically, the counterexample presents an
+assignment to variables where the program fails to meet the specification. In
+general, \MVP attempts to produce readable diagnostics for Move developers
+without the need of understanding any internals of the prover.
+
+There are more verification errors in this example, related to the global
+invariants: the code makes no attempt to respect the limits in |min_balance()|
+and |max_decrease()|.  The problem can be fixed by adding more |assert|
+statements to check that the limits are met (see Appendix~\ref{sec:CorrectedAccount}).
+
+
+The programs and specifications \MVP deals with are much larger than
+this example. The conditions under which a transaction
+in the Diem framework can abort typically involve dozens of individual predicates,
+stemming from other functions called by this transaction. Moreover, there are
+hundreds of memory invariants specified, encoding access control and other
+requirements for the Diem blockchain.
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/prelude.tex b/vendors/move/crates/move-prover/doc/paper21/prelude.tex
new file mode 100644
index 000000000..27270e196
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/prelude.tex
@@ -0,0 +1,200 @@
+
+\usepackage{xcolor}
+\usepackage{listings}
+\usepackage{inconsolata}
+\usepackage{relsize}
+%\usepackage{amsmath,amssymb,array}
+\usepackage{mathpartir}
+\usepackage{graphicx}
+\usepackage{xspace}
+\usepackage{xurl}
+%\usepackage{breakurl}
+%\def\UrlBreaks{\do\/\do-}
+\usepackage{caption}
+\usepackage{bbding}
+\usepackage[paperheight=235mm, paperwidth=155mm,textwidth=12.2cm,textheight=19.3cm]{geometry}
+
+\usepackage[bookmarks,unicode,colorlinks=true,linkcolor=blue,citecolor=blue,urlcolor=blue]{hyperref}
+%\makeatletter
+%\RequirePackage[bookmarks,unicode,colorlinks=true]{hyperref}%
+%   \def\@citecolor{blue}%
+%   \def\@urlcolor{blue}%
+%   \def\@linkcolor{blue}%
+\def\UrlFont{\rmfamily}
+%\def\orcidID#1{\smash{\href{http://orcid.org/#1}{\protect\raisebox{-1.25pt}{\protect\includegraphics{orcid_color.eps}}}}}
+%\makeatother
+
+
+
+\newcommand{\Section}[1]{\vspace{-0.5ex}\section{#1}}
+\newcommand{\SubSection}[1]{\vspace{-1.0ex}\subsection{#1}}
+\newcommand{\Paragraph}[1]{\vspace{-1.0ex}\subsubsection{#1}} % lncs
+
+\newcommand{\TODO}[2]{%
+  \noindent\textcolor{gray}{%
+      {\scriptsize\textbf{TODO(#1)}: #2}
+  }
+}
+
+\setlength{\belowcaptionskip}{-1ex}
+\setlength{\textfloatsep}{0.2ex}
+\newenvironment{Figure}{
+  \begin{figure}[tb]
+} {
+  \end{figure}
+}
+
+\newcommand{\MVP}[0]{\textsf{MVP}\xspace}
+\newcommand{\solidity}[0]{\textsf{Solidity}\xspace}
+\newcommand{\kay}[0]{\textsf{K}\xspace}
+\newcommand{\fstar}[0]{\textsf{f*}\xspace}
+
+
+
+% Source Transformation
+
+\newcommand{\transform}[0]{\Large{$\leadsto$}}
+
+
+%%%% Code
+
+\usepackage[charter]{mathdesign}
+%\def\rmdefault{bch}
+%\def\ttdefault{blg}
+
+\lstdefinestyle{MoveStyle}{
+  basicstyle=\ttfamily,
+  keywordstyle=\color{black}, % don't bold keywords which is the default
+  escapechar=@, % use to embed LaTeX into code
+  breaklines=true,
+}
+
+
+\lstdefinelanguage{Move}{
+  morekeywords={
+    abort,
+    aborts_if,
+    acquires,
+    address,
+    as,
+    assert,
+    assume,
+    borrow_global,
+    borrow_global_mut,
+    break,
+    const,
+    continue,
+    copy,
+    copyable,
+    define,
+    drop,
+    else,
+    ensures,
+    exists,
+    false,
+    forall,
+    friend,
+    fun,
+    global,
+    has,
+    havoc,
+    if,
+    include,
+    invariant,
+    key,
+    let,
+    loop,
+    modifies,
+    module,
+    move,
+    move_from,
+    move_to,
+    mut,
+    native,
+    num,
+    old,
+    onabort,
+    pragma,
+    public,
+    requires,
+    resource,
+    return,
+    schema,
+    script,
+    signer,
+    spec,
+    store,
+    struct,
+    true,
+    u8,
+    u64,
+    u128,
+    update,
+    use,
+    with,
+    where,
+    while},
+  sensitive=true,
+  morecomment=[l]{//},
+  morecomment=[s]{/*}{*/},
+}
+
+% This allows us to use |<move code>| for inline code.
+\lstMakeShortInline[language=Move,style=MoveStyle]|
+
+
+% This defines a new environment for Move code.
+\lstnewenvironment{Move}{
+  \lstset{
+    language=Move,
+    style=MoveStyle,
+    basicstyle=\relsize{-1}\ttfamily,
+    keywordstyle=\color{blue},
+  }
+}{
+}
+
+% This defines a new environment for Move code in a box, without line numbers.
+\lstnewenvironment{MoveBox}{
+  \lstset{
+    language=Move,
+    style=MoveStyle,
+    basicstyle=\relsize{-1}\ttfamily,
+    keywordstyle=\color{blue},
+    %numbers=left,
+    %numberstyle=\scriptsize\color{gray},
+    %frame=single,
+  }
+}{
+}
+
+% This defines a new environment for Move code in a box, with line numbers.
+\lstnewenvironment{MoveBoxNumbered}{
+  \lstset{
+    language=Move,
+    style=MoveStyle,
+    basicstyle=\relsize{-1}\ttfamily,
+    keywordstyle=\color{blue},
+    numbers=left,
+    numberstyle=\scriptsize\color{gray},
+    %frame=single,
+  }
+}{
+}
+
+% This defines a new environment for diagnostics as produced by the prover.
+\lstnewenvironment{MoveDiag}{
+  \lstset{
+    style=MoveStyle,
+    basicstyle=\relsize{-2}\ttfamily,
+  }
+}{
+}
+
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/paper21/splncs04.bst b/vendors/move/crates/move-prover/doc/paper21/splncs04.bst
new file mode 100644
index 000000000..3be8de3ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/paper21/splncs04.bst
@@ -0,0 +1,1548 @@
+%% BibTeX bibliography style `splncs03'
+%%
+%% BibTeX bibliography style for use with numbered references in
+%% Springer Verlag's "Lecture Notes in Computer Science" series.
+%% (See Springer's documentation for llncs.cls for
+%% more details of the suggested reference format.)  Note that this
+%% file will not work for author-year style citations.
+%%
+%% Use \documentclass{llncs} and \bibliographystyle{splncs03}, and cite
+%% a reference with (e.g.) \cite{smith77} to get a "[1]" in the text.
+%%
+%% This file comes to you courtesy of Maurizio "Titto" Patrignani of
+%% Dipartimento di Informatica e Automazione Universita' Roma Tre
+%%
+%% ================================================================================================
+%% This was file `titto-lncs-02.bst' produced on Wed Apr 1, 2009
+%% Edited by hand by titto based on `titto-lncs-01.bst' (see below)
+%%
+%% CHANGES (with respect to titto-lncs-01.bst):
+%% - Removed the call to \urlprefix (thus no "URL" string is added to the output)
+%% ================================================================================================
+%% This was file `titto-lncs-01.bst' produced on Fri Aug 22, 2008
+%% Edited by hand by titto based on `titto.bst' (see below)
+%%
+%% CHANGES (with respect to titto.bst):
+%% - Removed the "capitalize" command for editors string "(eds.)" and "(ed.)"
+%% - Introduced the functions titto.bbl.pages and titto.bbl.page for journal pages (without "pp.")
+%% - Added a new.sentence command to separate with a dot booktitle and series in the inproceedings
+%% - Commented all new.block commands before urls and notes (to separate them with a comma)
+%% - Introduced the functions titto.bbl.volume for handling journal volumes (without "vol." label)
+%% - Used for editors the same name conventions used for authors (see function format.in.ed.booktitle)
+%% - Removed a \newblock to avoid long spaces between title and "In: ..."
+%% - Added function titto.space.prefix to add a space instead of "~" after the (removed) "vol." label
+%% - Added doi
+%% ================================================================================================
+%% This was file `titto.bst',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% merlin.mbs  (with options: `vonx,nm-rvvc,yr-par,jttl-rm,volp-com,jwdpg,jwdvol,numser,ser-vol,jnm-x,btit-rm,bt-rm,edparxc,bkedcap,au-col,in-col,fin-bare,pp,ed,abr,mth-bare,xedn,jabr,and-com,and-com-ed,xand,url,url-blk,em-x,nfss,')
+%% ----------------------------------------
+%% *** Tentative .bst file for Springer LNCS ***
+%%
+%% Copyright 1994-2007 Patrick W Daly
+ % ===============================================================
+ % IMPORTANT NOTICE:
+ % This bibliographic style (bst) file has been generated from one or
+ % more master bibliographic style (mbs) files, listed above.
+ %
+ % This generated file can be redistributed and/or modified under the terms
+ % of the LaTeX Project Public License Distributed from CTAN
+ % archives in directory macros/latex/base/lppl.txt; either
+ % version 1 of the License, or any later version.
+ % ===============================================================
+ % Name and version information of the main mbs file:
+ % \ProvidesFile{merlin.mbs}[2007/04/24 4.20 (PWD, AO, DPC)]
+ %   For use with BibTeX version 0.99a or later
+ %-------------------------------------------------------------------
+ % This bibliography style file is intended for texts in ENGLISH
+ % This is a numerical citation style, and as such is standard LaTeX.
+ % It requires no extra package to interface to the main text.
+ % The form of the \bibitem entries is
+ %   \bibitem{key}...
+ % Usage of \cite is as follows:
+ %   \cite{key} ==>>          [#]
+ %   \cite[chap. 2]{key} ==>> [#, chap. 2]
+ % where # is a number determined by the ordering in the reference list.
+ % The order in the reference list is alphabetical by authors.
+ %---------------------------------------------------------------------
+
+ENTRY
+  { address
+    author
+    booktitle
+    chapter
+    doi
+    edition
+    editor
+    eid
+    howpublished
+    institution
+    journal
+    key
+    month
+    note
+    number
+    organization
+    pages
+    publisher
+    school
+    series
+    title
+    type
+    url
+    volume
+    year
+  }
+  {}
+  { label }
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+  #1 'mid.sentence :=
+  #2 'after.sentence :=
+  #3 'after.block :=
+}
+STRINGS { s t}
+FUNCTION {output.nonnull}
+{ 's :=
+  output.state mid.sentence =
+    { ", " * write$ }
+    { output.state after.block =
+        { add.period$ write$
+%          newline$
+%          "\newblock " write$  % removed for titto-lncs-01
+          " " write$            % to avoid long spaces between title and "In: ..."
+        }
+        { output.state before.all =
+            'write$
+            { add.period$ " " * write$ }
+          if$
+        }
+      if$
+      mid.sentence 'output.state :=
+    }
+  if$
+  s
+}
+FUNCTION {output}
+{ duplicate$ empty$
+    'pop$
+    'output.nonnull
+  if$
+}
+FUNCTION {output.check}
+{ 't :=
+  duplicate$ empty$
+    { pop$ "empty " t * " in " * cite$ * warning$ }
+    'output.nonnull
+  if$
+}
+FUNCTION {fin.entry}
+{ duplicate$ empty$
+    'pop$
+    'write$
+  if$
+  newline$
+}
+
+FUNCTION {new.block}
+{ output.state before.all =
+    'skip$
+    { after.block 'output.state := }
+  if$
+}
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
+FUNCTION {add.blank}
+{  " " * before.all 'output.state :=
+}
+
+
+FUNCTION {add.colon}
+{ duplicate$ empty$
+    'skip$
+    { ":" * add.blank }
+  if$
+}
+
+FUNCTION {date.block}
+{
+  new.block
+}
+
+FUNCTION {not}
+{   { #0 }
+    { #1 }
+  if$
+}
+FUNCTION {and}
+{   'skip$
+    { pop$ #0 }
+  if$
+}
+FUNCTION {or}
+{   { pop$ #1 }
+    'skip$
+  if$
+}
+STRINGS {z}
+FUNCTION {remove.dots}
+{ 'z :=
+  ""
+  { z empty$ not }
+  { z #1 #1 substring$
+    z #2 global.max$ substring$ 'z :=
+    duplicate$ "." = 'pop$
+      { * }
+    if$
+  }
+  while$
+}
+FUNCTION {new.block.checka}
+{ empty$
+    'skip$
+    'new.block
+  if$
+}
+FUNCTION {new.block.checkb}
+{ empty$
+  swap$ empty$
+  and
+    'skip$
+    'new.block
+  if$
+}
+FUNCTION {new.sentence.checka}
+{ empty$
+    'skip$
+    'new.sentence
+  if$
+}
+FUNCTION {new.sentence.checkb}
+{ empty$
+  swap$ empty$
+  and
+    'skip$
+    'new.sentence
+  if$
+}
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+    { pop$ "" }
+    'skip$
+  if$
+}
+FUNCTION {emphasize}
+{ skip$ }
+
+FUNCTION {embolden}
+{ duplicate$ empty$
+{ pop$ "" }
+{ "\textbf{" swap$ * "}" * }
+if$
+}
+FUNCTION {tie.or.space.prefix}
+{ duplicate$ text.length$ #5 <
+    { "~" }
+    { " " }
+  if$
+  swap$
+}
+FUNCTION {titto.space.prefix} %  always introduce a space
+{ duplicate$ text.length$ #3 <
+    { " " }
+    { " " }
+  if$
+  swap$
+}
+
+
+FUNCTION {capitalize}
+{ "u" change.case$ "t" change.case$ }
+
+FUNCTION {space.word}
+{ " " swap$ * " " * }
+ % Here are the language-specific definitions for explicit words.
+ % Each function has a name bbl.xxx where xxx is the English word.
+ % The language selected here is ENGLISH
+FUNCTION {bbl.and}
+{ "and"}
+
+FUNCTION {bbl.etal}
+{ "et~al." }
+
+FUNCTION {bbl.editors}
+{ "eds." }
+
+FUNCTION {bbl.editor}
+{ "ed." }
+
+FUNCTION {bbl.edby}
+{ "edited by" }
+
+FUNCTION {bbl.edition}
+{ "edn." }
+
+FUNCTION {bbl.volume}
+{ "vol." }
+
+FUNCTION {titto.bbl.volume} % for handling journals
+{ "" }
+
+FUNCTION {bbl.of}
+{ "of" }
+
+FUNCTION {bbl.number}
+{ "no." }
+
+FUNCTION {bbl.nr}
+{ "no." }
+
+FUNCTION {bbl.in}
+{ "in" }
+
+FUNCTION {bbl.pages}
+{ "pp." }
+
+FUNCTION {bbl.page}
+{ "p." }
+
+FUNCTION {titto.bbl.pages} % for journals
+{ "" }
+
+FUNCTION {titto.bbl.page}  % for journals
+{ "" }
+
+FUNCTION {bbl.chapter}
+{ "chap." }
+
+FUNCTION {bbl.techrep}
+{ "Tech. Rep." }
+
+FUNCTION {bbl.mthesis}
+{ "Master's thesis" }
+
+FUNCTION {bbl.phdthesis}
+{ "Ph.D. thesis" }
+
+MACRO {jan} {"Jan."}
+
+MACRO {feb} {"Feb."}
+
+MACRO {mar} {"Mar."}
+
+MACRO {apr} {"Apr."}
+
+MACRO {may} {"May"}
+
+MACRO {jun} {"Jun."}
+
+MACRO {jul} {"Jul."}
+
+MACRO {aug} {"Aug."}
+
+MACRO {sep} {"Sep."}
+
+MACRO {oct} {"Oct."}
+
+MACRO {nov} {"Nov."}
+
+MACRO {dec} {"Dec."}
+
+MACRO {acmcs} {"ACM Comput. Surv."}
+
+MACRO {acta} {"Acta Inf."}
+
+MACRO {cacm} {"Commun. ACM"}
+
+MACRO {ibmjrd} {"IBM J. Res. Dev."}
+
+MACRO {ibmsj} {"IBM Syst.~J."}
+
+MACRO {ieeese} {"IEEE Trans. Software Eng."}
+
+MACRO {ieeetc} {"IEEE Trans. Comput."}
+
+MACRO {ieeetcad}
+ {"IEEE Trans. Comput. Aid. Des."}
+
+MACRO {ipl} {"Inf. Process. Lett."}
+
+MACRO {jacm} {"J.~ACM"}
+
+MACRO {jcss} {"J.~Comput. Syst. Sci."}
+
+MACRO {scp} {"Sci. Comput. Program."}
+
+MACRO {sicomp} {"SIAM J. Comput."}
+
+MACRO {tocs} {"ACM Trans. Comput. Syst."}
+
+MACRO {tods} {"ACM Trans. Database Syst."}
+
+MACRO {tog} {"ACM Trans. Graphic."}
+
+MACRO {toms} {"ACM Trans. Math. Software"}
+
+MACRO {toois} {"ACM Trans. Office Inf. Syst."}
+
+MACRO {toplas} {"ACM Trans. Progr. Lang. Syst."}
+
+MACRO {tcs} {"Theor. Comput. Sci."}
+
+FUNCTION {bibinfo.check}
+{ swap$
+  duplicate$ missing$
+    {
+      pop$ pop$
+      ""
+    }
+    { duplicate$ empty$
+        {
+          swap$ pop$
+        }
+        { swap$
+          pop$
+        }
+      if$
+    }
+  if$
+}
+FUNCTION {bibinfo.warn}
+{ swap$
+  duplicate$ missing$
+    {
+      swap$ "missing " swap$ * " in " * cite$ * warning$ pop$
+      ""
+    }
+    { duplicate$ empty$
+        {
+          swap$ "empty " swap$ * " in " * cite$ * warning$
+        }
+        { swap$
+          pop$
+        }
+      if$
+    }
+  if$
+}
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+%    { "\urlprefix\url{" url * "}" * }
+    { "\url{" url * "}" * }  % changed in titto-lncs-02.bst
+  if$
+}
+
+FUNCTION {format.doi} % added in splncs04.bst
+{ doi empty$
+     { "" }
+     { after.block 'output.state :=
+       "\doi{" doi * "}" * }
+  if$
+}
+
+INTEGERS { nameptr namesleft numnames }
+
+
+STRINGS  { bibinfo}
+
+FUNCTION {format.names}
+{ 'bibinfo :=
+  duplicate$ empty$ 'skip$ {
+  's :=
+  "" 't :=
+  #1 'nameptr :=
+  s num.names$ 'numnames :=
+  numnames 'namesleft :=
+    { namesleft #0 > }
+    { s nameptr
+      "{vv~}{ll}{, jj}{, f{.}.}"
+      format.name$
+      bibinfo bibinfo.check
+      't :=
+      nameptr #1 >
+        {
+          namesleft #1 >
+            { ", " * t * }
+            {
+              s nameptr "{ll}" format.name$ duplicate$ "others" =
+                { 't := }
+                { pop$ }
+              if$
+              "," *
+              t "others" =
+                {
+                  " " * bbl.etal *
+                }
+                { " " * t * }
+              if$
+            }
+          if$
+        }
+        't
+      if$
+      nameptr #1 + 'nameptr :=
+      namesleft #1 - 'namesleft :=
+    }
+  while$
+  } if$
+}
+FUNCTION {format.names.ed}
+{
+  'bibinfo :=
+  duplicate$ empty$ 'skip$ {
+  's :=
+  "" 't :=
+  #1 'nameptr :=
+  s num.names$ 'numnames :=
+  numnames 'namesleft :=
+    { namesleft #0 > }
+    { s nameptr
+      "{f{.}.~}{vv~}{ll}{ jj}"
+      format.name$
+      bibinfo bibinfo.check
+      't :=
+      nameptr #1 >
+        {
+          namesleft #1 >
+            { ", " * t * }
+            {
+              s nameptr "{ll}" format.name$ duplicate$ "others" =
+                { 't := }
+                { pop$ }
+              if$
+              "," *
+              t "others" =
+                {
+
+                  " " * bbl.etal *
+                }
+                { " " * t * }
+              if$
+            }
+          if$
+        }
+        't
+      if$
+      nameptr #1 + 'nameptr :=
+      namesleft #1 - 'namesleft :=
+    }
+  while$
+  } if$
+}
+FUNCTION {format.authors}
+{ author "author" format.names
+}
+FUNCTION {get.bbl.editor}
+{ editor num.names$ #1 > 'bbl.editors 'bbl.editor if$ }
+
+FUNCTION {format.editors}
+{ editor "editor" format.names duplicate$ empty$ 'skip$
+    {
+      " " *
+      get.bbl.editor
+%      capitalize
+   "(" swap$ * ")" *
+      *
+    }
+  if$
+}
+FUNCTION {format.note}
+{
+ note empty$
+    { "" }
+    { note #1 #1 substring$
+      duplicate$ "{" =
+        'skip$
+        { output.state mid.sentence =
+          { "l" }
+          { "u" }
+        if$
+        change.case$
+        }
+      if$
+      note #2 global.max$ substring$ * "note" bibinfo.check
+    }
+  if$
+}
+
+FUNCTION {format.title}
+{ title
+  duplicate$ empty$ 'skip$
+    { "t" change.case$ }
+  if$
+  "title" bibinfo.check
+}
+FUNCTION {output.bibitem}
+{ newline$
+  "\bibitem{" write$
+  cite$ write$
+  "}" write$
+  newline$
+  ""
+  before.all 'output.state :=
+}
+
+FUNCTION {n.dashify}
+{
+  't :=
+  ""
+    { t empty$ not }
+    { t #1 #1 substring$ "-" =
+        { t #1 #2 substring$ "--" = not
+            { "--" *
+              t #2 global.max$ substring$ 't :=
+            }
+            {   { t #1 #1 substring$ "-" = }
+                { "-" *
+                  t #2 global.max$ substring$ 't :=
+                }
+              while$
+            }
+          if$
+        }
+        { t #1 #1 substring$ *
+          t #2 global.max$ substring$ 't :=
+        }
+      if$
+    }
+  while$
+}
+
+FUNCTION {word.in}
+{ bbl.in capitalize
+  ":" *
+  " " * }
+
+FUNCTION {format.date}
+{
+  month "month" bibinfo.check
+  duplicate$ empty$
+  year  "year"  bibinfo.check duplicate$ empty$
+    { swap$ 'skip$
+        { "there's a month but no year in " cite$ * warning$ }
+      if$
+      *
+    }
+    { swap$ 'skip$
+        {
+          swap$
+          " " * swap$
+        }
+      if$
+      *
+      remove.dots
+    }
+  if$
+  duplicate$ empty$
+    'skip$
+    {
+      before.all 'output.state :=
+    " (" swap$ * ")" *
+    }
+  if$
+}
+FUNCTION {format.btitle}
+{ title "title" bibinfo.check
+  duplicate$ empty$ 'skip$
+    {
+    }
+  if$
+}
+FUNCTION {either.or.check}
+{ empty$
+    'pop$
+    { "can't use both " swap$ * " fields in " * cite$ * warning$ }
+  if$
+}
+FUNCTION {format.bvolume}
+{ volume empty$
+    { "" }
+    { bbl.volume volume tie.or.space.prefix
+      "volume" bibinfo.check * *
+      series "series" bibinfo.check
+      duplicate$ empty$ 'pop$
+        { emphasize ", " * swap$ * }
+      if$
+      "volume and number" number either.or.check
+    }
+  if$
+}
+FUNCTION {format.number.series}
+{ volume empty$
+    { number empty$
+        { series field.or.null }
+        { output.state mid.sentence =
+            { bbl.number }
+            { bbl.number capitalize }
+          if$
+          number tie.or.space.prefix "number" bibinfo.check * *
+          series empty$
+            { "there's a number but no series in " cite$ * warning$ }
+            { bbl.in space.word *
+              series "series" bibinfo.check *
+            }
+          if$
+        }
+      if$
+    }
+    { "" }
+  if$
+}
+
+FUNCTION {format.edition}
+{ edition duplicate$ empty$ 'skip$
+    {
+      output.state mid.sentence =
+        { "l" }
+        { "t" }
+      if$ change.case$
+      "edition" bibinfo.check
+      " " * bbl.edition *
+    }
+  if$
+}
+INTEGERS { multiresult }
+FUNCTION {multi.page.check}
+{ 't :=
+  #0 'multiresult :=
+    { multiresult not
+      t empty$ not
+      and
+    }
+    { t #1 #1 substring$
+      duplicate$ "-" =
+      swap$ duplicate$ "," =
+      swap$ "+" =
+      or or
+        { #1 'multiresult := }
+        { t #2 global.max$ substring$ 't := }
+      if$
+    }
+  while$
+  multiresult
+}
+FUNCTION {format.pages}
+{ pages duplicate$ empty$ 'skip$
+    { duplicate$ multi.page.check
+        {
+          bbl.pages swap$
+          n.dashify
+        }
+        {
+          bbl.page swap$
+        }
+      if$
+      tie.or.space.prefix
+      "pages" bibinfo.check
+      * *
+    }
+  if$
+}
+FUNCTION {format.journal.pages}
+{ pages duplicate$ empty$ 'pop$
+    { swap$ duplicate$ empty$
+        { pop$ pop$ format.pages }
+        {
+          ", " *
+          swap$
+          n.dashify
+          pages multi.page.check
+            'titto.bbl.pages
+            'titto.bbl.page
+          if$
+          swap$ tie.or.space.prefix
+          "pages" bibinfo.check
+          * *
+          *
+        }
+      if$
+    }
+  if$
+}
+FUNCTION {format.journal.eid}
+{ eid "eid" bibinfo.check
+  duplicate$ empty$ 'pop$
+    { swap$ duplicate$ empty$ 'skip$
+      {
+          ", " *
+      }
+      if$
+      swap$ *
+    }
+  if$
+}
+FUNCTION {format.vol.num.pages} % this function is used only for journal entries
+{ volume field.or.null embolden
+  duplicate$ empty$ 'skip$
+    {
+%    bbl.volume swap$ tie.or.space.prefix
+     titto.bbl.volume swap$ titto.space.prefix
+%            rationale for the change above: for journals you don't want "vol." label
+%            hence it does not make sense to attach the journal number to the label when
+%            it is short
+      "volume" bibinfo.check
+      * *
+      }
+  if$
+  number "number" bibinfo.check duplicate$ empty$ 'skip$
+    {
+      swap$ duplicate$ empty$
+        { "there's a number but no volume in " cite$ * warning$ }
+        'skip$
+      if$
+      swap$
+      "(" swap$ * ")" *
+    }
+  if$ *
+  eid empty$
+    { format.journal.pages }
+    { format.journal.eid }
+  if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+    'format.pages
+    { type empty$
+        { bbl.chapter }
+        { type "l" change.case$
+          "type" bibinfo.check
+        }
+      if$
+      chapter tie.or.space.prefix
+      "chapter" bibinfo.check
+      * *
+      pages empty$
+        'skip$
+        { ", " * format.pages * }
+      if$
+    }
+  if$
+}
+
+FUNCTION {format.booktitle}
+{
+  booktitle "booktitle" bibinfo.check
+}
+FUNCTION {format.in.ed.booktitle}
+{ format.booktitle duplicate$ empty$ 'skip$
+    {
+%     editor "editor" format.names.ed duplicate$ empty$ 'pop$ % changed by titto
+      editor "editor" format.names duplicate$ empty$ 'pop$
+        {
+          " " *
+          get.bbl.editor
+%          capitalize
+          "(" swap$ * ") " *
+          * swap$
+          * }
+      if$
+      word.in swap$ *
+    }
+  if$
+}
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+  month empty$ year empty$ note empty$
+  and and and and and
+  key empty$ not and
+    { "all relevant fields are empty in " cite$ * warning$ }
+    'skip$
+  if$
+}
+FUNCTION {format.thesis.type}
+{ type duplicate$ empty$
+    'pop$
+    { swap$ pop$
+      "t" change.case$ "type" bibinfo.check
+    }
+  if$
+}
+FUNCTION {format.tr.number}
+{ number "number" bibinfo.check
+  type duplicate$ empty$
+    { pop$ bbl.techrep }
+    'skip$
+  if$
+  "type" bibinfo.check
+  swap$ duplicate$ empty$
+    { pop$ "t" change.case$ }
+    { tie.or.space.prefix * * }
+  if$
+}
+FUNCTION {format.article.crossref}
+{
+  key duplicate$ empty$
+    { pop$
+      journal duplicate$ empty$
+        { "need key or journal for " cite$ * " to crossref " * crossref * warning$ }
+        { "journal" bibinfo.check emphasize word.in swap$ * }
+      if$
+    }
+    { word.in swap$ * " " *}
+  if$
+  " \cite{" * crossref * "}" *
+}
+FUNCTION {format.crossref.editor}
+{ editor #1 "{vv~}{ll}" format.name$
+  "editor" bibinfo.check
+  editor num.names$ duplicate$
+  #2 >
+    { pop$
+      "editor" bibinfo.check
+      " " * bbl.etal
+      *
+    }
+    { #2 <
+        'skip$
+        { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+            {
+              "editor" bibinfo.check
+              " " * bbl.etal
+              *
+            }
+            {
+             bbl.and space.word
+              * editor #2 "{vv~}{ll}" format.name$
+              "editor" bibinfo.check
+              *
+            }
+          if$
+        }
+      if$
+    }
+  if$
+}
+FUNCTION {format.book.crossref}
+{ volume duplicate$ empty$
+    { "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+      pop$ word.in
+    }
+    { bbl.volume
+      capitalize
+      swap$ tie.or.space.prefix "volume" bibinfo.check * * bbl.of space.word *
+    }
+  if$
+  editor empty$
+  editor field.or.null author field.or.null =
+  or
+    { key empty$
+        { series empty$
+            { "need editor, key, or series for " cite$ * " to crossref " *
+              crossref * warning$
+              "" *
+            }
+            { series emphasize * }
+          if$
+        }
+        { key * }
+      if$
+    }
+    { format.crossref.editor * }
+  if$
+  " \cite{" * crossref * "}" *
+}
+FUNCTION {format.incoll.inproc.crossref}
+{
+  editor empty$
+  editor field.or.null author field.or.null =
+  or
+    { key empty$
+        { format.booktitle duplicate$ empty$
+            { "need editor, key, or booktitle for " cite$ * " to crossref " *
+              crossref * warning$
+            }
+            { word.in swap$ * }
+          if$
+        }
+        { word.in key * " " *}
+      if$
+    }
+    { word.in format.crossref.editor * " " *}
+  if$
+  " \cite{" * crossref * "}" *
+}
+FUNCTION {format.org.or.pub}
+{ 't :=
+  ""
+  address empty$ t empty$ and
+    'skip$
+    {
+      t empty$
+        { address "address" bibinfo.check *
+        }
+        { t *
+          address empty$
+            'skip$
+            { ", " * address "address" bibinfo.check * }
+          if$
+        }
+      if$
+    }
+  if$
+}
+FUNCTION {format.publisher.address}
+{ publisher "publisher" bibinfo.warn format.org.or.pub
+}
+
+FUNCTION {format.organization.address}
+{ organization "organization" bibinfo.check format.org.or.pub
+}
+
+FUNCTION {article}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.title "title" output.check
+  new.block
+  crossref missing$
+    {
+      journal
+      "journal" bibinfo.check
+      "journal" output.check
+      add.blank
+      format.vol.num.pages output
+      format.date "year" output.check
+    }
+    { format.article.crossref output.nonnull
+      format.pages output
+    }
+  if$
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+FUNCTION {book}
+{ output.bibitem
+  author empty$
+    { format.editors "author and editor" output.check
+      add.colon
+    }
+    { format.authors output.nonnull
+      add.colon
+      crossref missing$
+        { "author and editor" editor either.or.check }
+        'skip$
+      if$
+    }
+  if$
+  new.block
+  format.btitle "title" output.check
+  crossref missing$
+    { format.bvolume output
+      new.block
+      new.sentence
+      format.number.series output
+      format.publisher.address output
+    }
+    {
+      new.block
+      format.book.crossref output.nonnull
+    }
+  if$
+  format.edition output
+  format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+FUNCTION {booklet}
+{ output.bibitem
+  format.authors output
+  add.colon
+  new.block
+  format.title "title" output.check
+  new.block
+  howpublished "howpublished" bibinfo.check output
+  address "address" bibinfo.check output
+  format.date output
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+  author empty$
+    { format.editors "author and editor" output.check
+      add.colon
+    }
+    { format.authors output.nonnull
+      add.colon
+      crossref missing$
+        { "author and editor" editor either.or.check }
+        'skip$
+      if$
+    }
+  if$
+  new.block
+  format.btitle "title" output.check
+  crossref missing$
+    {
+      format.bvolume output
+      format.chapter.pages "chapter and pages" output.check
+      new.block
+      new.sentence
+      format.number.series output
+      format.publisher.address output
+    }
+    {
+      format.chapter.pages "chapter and pages" output.check
+      new.block
+      format.book.crossref output.nonnull
+    }
+  if$
+  format.edition output
+  format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.title "title" output.check
+  new.block
+  crossref missing$
+    { format.in.ed.booktitle "booktitle" output.check
+      format.bvolume output
+      format.chapter.pages output
+      new.sentence
+      format.number.series output
+      format.publisher.address output
+      format.edition output
+      format.date "year" output.check
+    }
+    { format.incoll.inproc.crossref output.nonnull
+      format.chapter.pages output
+    }
+  if$
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+FUNCTION {inproceedings}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.title "title" output.check
+  new.block
+  crossref missing$
+    { format.in.ed.booktitle "booktitle" output.check
+      new.sentence % added by titto
+      format.bvolume output
+      format.pages output
+      new.sentence
+      format.number.series output
+      publisher empty$
+        { format.organization.address output }
+        { organization "organization" bibinfo.check output
+          format.publisher.address output
+        }
+      if$
+      format.date "year" output.check
+    }
+    { format.incoll.inproc.crossref output.nonnull
+      format.pages output
+    }
+  if$
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+FUNCTION {conference} { inproceedings }
+FUNCTION {manual}
+{ output.bibitem
+  author empty$
+    { organization "organization" bibinfo.check
+      duplicate$ empty$ 'pop$
+        { output
+          address "address" bibinfo.check output
+        }
+      if$
+    }
+    { format.authors output.nonnull }
+  if$
+  add.colon
+  new.block
+  format.btitle "title" output.check
+  author empty$
+    { organization empty$
+        {
+          address new.block.checka
+          address "address" bibinfo.check output
+        }
+        'skip$
+      if$
+    }
+    {
+      organization address new.block.checkb
+      organization "organization" bibinfo.check output
+      address "address" bibinfo.check output
+    }
+  if$
+  format.edition output
+  format.date output
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.btitle
+  "title" output.check
+  new.block
+  bbl.mthesis format.thesis.type output.nonnull
+  school "school" bibinfo.warn output
+  address "address" bibinfo.check output
+  format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+  format.authors output
+  add.colon
+  title howpublished new.block.checkb
+  format.title output
+  howpublished new.block.checka
+  howpublished "howpublished" bibinfo.check output
+  format.date output
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+  empty.misc.check
+}
+FUNCTION {phdthesis}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.btitle
+  "title" output.check
+  new.block
+  bbl.phdthesis format.thesis.type output.nonnull
+  school "school" bibinfo.warn output
+  address "address" bibinfo.check output
+  format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+  editor empty$
+    { organization "organization" bibinfo.check output
+    }
+    { format.editors output.nonnull }
+  if$
+  add.colon
+  new.block
+  format.btitle "title" output.check
+  format.bvolume output
+  editor empty$
+    { publisher empty$
+        {  format.number.series output }
+        {
+          new.sentence
+          format.number.series output
+          format.publisher.address output
+        }
+      if$
+    }
+    { publisher empty$
+        {
+          new.sentence
+          format.number.series output
+          format.organization.address output }
+        {
+          new.sentence
+          format.number.series output
+          organization "organization" bibinfo.check output
+          format.publisher.address output
+        }
+      if$
+     }
+  if$
+      format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.title
+  "title" output.check
+  new.block
+  format.tr.number output.nonnull
+  institution "institution" bibinfo.warn output
+  address "address" bibinfo.check output
+  format.date "year" output.check
+%  new.block
+  format.doi output
+  format.url output
+%  new.block
+  format.note output
+  fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+  format.authors "author" output.check
+  add.colon
+  new.block
+  format.title "title" output.check
+  format.date output
+%  new.block
+  format.url output
+%  new.block
+  format.note "note" output.check
+  fin.entry
+}
+
+FUNCTION {default.type} { misc }
+READ
+FUNCTION {sortify}
+{ purify$
+  "l" change.case$
+}
+INTEGERS { len }
+FUNCTION {chop.word}
+{ 's :=
+  'len :=
+  s #1 len substring$ =
+    { s len #1 + global.max$ substring$ }
+    's
+  if$
+}
+FUNCTION {sort.format.names}
+{ 's :=
+  #1 'nameptr :=
+  ""
+  s num.names$ 'numnames :=
+  numnames 'namesleft :=
+    { namesleft #0 > }
+    { s nameptr
+      "{ll{ }}{  ff{ }}{  jj{ }}"
+      format.name$ 't :=
+      nameptr #1 >
+        {
+          "   "  *
+          namesleft #1 = t "others" = and
+            { "zzzzz" * }
+            { t sortify * }
+          if$
+        }
+        { t sortify * }
+      if$
+      nameptr #1 + 'nameptr :=
+      namesleft #1 - 'namesleft :=
+    }
+  while$
+}
+
+FUNCTION {sort.format.title}
+{ 't :=
+  "A " #2
+    "An " #3
+      "The " #4 t chop.word
+    chop.word
+  chop.word
+  sortify
+  #1 global.max$ substring$
+}
+FUNCTION {author.sort}
+{ author empty$
+    { key empty$
+        { "to sort, need author or key in " cite$ * warning$
+          ""
+        }
+        { key sortify }
+      if$
+    }
+    { author sort.format.names }
+  if$
+}
+FUNCTION {author.editor.sort}
+{ author empty$
+    { editor empty$
+        { key empty$
+            { "to sort, need author, editor, or key in " cite$ * warning$
+              ""
+            }
+            { key sortify }
+          if$
+        }
+        { editor sort.format.names }
+      if$
+    }
+    { author sort.format.names }
+  if$
+}
+FUNCTION {author.organization.sort}
+{ author empty$
+    { organization empty$
+        { key empty$
+            { "to sort, need author, organization, or key in " cite$ * warning$
+              ""
+            }
+            { key sortify }
+          if$
+        }
+        { "The " #4 organization chop.word sortify }
+      if$
+    }
+    { author sort.format.names }
+  if$
+}
+FUNCTION {editor.organization.sort}
+{ editor empty$
+    { organization empty$
+        { key empty$
+            { "to sort, need editor, organization, or key in " cite$ * warning$
+              ""
+            }
+            { key sortify }
+          if$
+        }
+        { "The " #4 organization chop.word sortify }
+      if$
+    }
+    { editor sort.format.names }
+  if$
+}
+FUNCTION {presort}
+{ type$ "book" =
+  type$ "inbook" =
+  or
+    'author.editor.sort
+    { type$ "proceedings" =
+        'editor.organization.sort
+        { type$ "manual" =
+            'author.organization.sort
+            'author.sort
+          if$
+        }
+      if$
+    }
+  if$
+  "    "
+  *
+  year field.or.null sortify
+  *
+  "    "
+  *
+  title field.or.null
+  sort.format.title
+  *
+  #1 entry.max$ substring$
+  'sort.key$ :=
+}
+ITERATE {presort}
+SORT
+STRINGS { longest.label }
+INTEGERS { number.label longest.label.width }
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+  #1 'number.label :=
+  #0 'longest.label.width :=
+}
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+  number.label #1 + 'number.label :=
+  label width$ longest.label.width >
+    { label 'longest.label :=
+      label width$ 'longest.label.width :=
+    }
+    'skip$
+  if$
+}
+EXECUTE {initialize.longest.label}
+ITERATE {longest.label.pass}
+FUNCTION {begin.bib}
+{ preamble$ empty$
+    'skip$
+    { preamble$ write$ newline$ }
+  if$
+  "\begin{thebibliography}{"  longest.label  * "}" *
+  write$ newline$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
+  "\providecommand{\urlprefix}{URL }"
+  write$ newline$
+  "\providecommand{\doi}[1]{https://doi.org/#1}"
+  write$ newline$
+}
+EXECUTE {begin.bib}
+EXECUTE {init.state.consts}
+ITERATE {call.type$}
+FUNCTION {end.bib}
+{ newline$
+  "\end{thebibliography}" write$ newline$
+}
+EXECUTE {end.bib}
+%% End of customized bst file
+%%
+%% End of file `titto.bst'.
diff --git a/vendors/move/crates/move-prover/doc/report/arch.png b/vendors/move/crates/move-prover/doc/report/arch.png
new file mode 100755
index 000000000..739bc29c9
Binary files /dev/null and b/vendors/move/crates/move-prover/doc/report/arch.png differ
diff --git a/vendors/move/crates/move-prover/doc/report/arch.tex b/vendors/move/crates/move-prover/doc/report/arch.tex
new file mode 100644
index 000000000..a81fa3389
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/arch.tex
@@ -0,0 +1,51 @@
+\SubSection{Basic Architecture}
+
+\begin{figure}[t!]
+  \centering
+  \includegraphics[trim=0 250 0 0, width=\textwidth]{arch.png}
+  \caption{Move Prover Architecture}
+  \label{fig:Arch}
+\end{figure}
+
+The architecture of the Move Prover is illustrated in Fig.~\ref{fig:Arch}. Move
+code (consisting of Move programs and specifications) is given as input to the
+Move tool chain, which produces two artifacts: the abstract syntax tree (AST) of
+the specifications in the code, as well as the translated Move bytecode for the
+program part. It is essential that the Prover interprets the Move program on
+bytecode level, not on the intermediate AST: this way we verify the ``source of
+truth'' which is also executed in the Move VM. Only the specification parts are
+passed on as AST. The \emph{Move Model} is a component which merges both
+bytecode and specifications, as well as other metdata from the original code,
+into a unique object model which is input to the remaining tool chain.
+
+The next phase is the actual \emph{Prover Compiler}, which is implemented as a
+pipeline of bytecode transformations. Only an excerpt of the most important
+transformations is shown (Reference Elimination, Specification Injection, and
+Monomorphization). These transformations will be conceptually described in more
+detail in subsequent sections. While they happen in reality on an extended
+version of the Move bytecode, we will illustrate them on a higher level of
+abstraction, as Move source level transformations.
+
+The transformed bytecode is next compiled into the Boogie intermediate
+verification language \cite{BOOGIE}. Boogie supports an imperative programming
+model which is well suited for the encoding of the transformed Move code. Boogie
+in turn can translate to multiple SMT solver backends, namely Z3 \cite{Z3} and
+CVC5 \cite{CVC}; the default choice for the Move prover is currently Z3.
+
+When the SMT solver produces a |sat| or |unknown| result (of the negation of the
+verification condition Boogie generates), it produces a model witness. The Move
+Prover attempts to translate this model back into a diagnostic which
+a user can associate with the original Move code (as has been illustrated in
+Sec.~\ref{sec:RunningProver}.) For example, execution traces leading to the
+verification failure are shown, with assignments to variables used in this
+trace, extracted from the model. Also the Move Model will be consulted to
+retrieve the original source information and display it with the diagnosis.
+
+Subsequently, we will focus on the major bytecode transformations as well as the
+encoding and translation to Boogie.
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/biblio.bib b/vendors/move/crates/move-prover/doc/report/biblio.bib
new file mode 100644
index 000000000..ef5fdf499
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/biblio.bib
@@ -0,0 +1,165 @@
+@Misc{MOVE_LANG,
+  author = {Sam Blackshear and Evan Cheng and David L. Dill and Victor Gao and
+                  Ben Maurer and Todd Nowacki and Alistair Pott and Shaz Qadeer
+                  and Rain and Dario Russi and Stephane Sezer and Tim Zakian and
+                  Runtian Zho},
+  title = {{Move: A Language With Programmable Resources}},
+  institution = {},
+  year = {2019},
+  url = {https://developers.libra.org/docs/move-paper}
+}
+
+@InProceedings{MOVE_PROVER,
+  author =	 "Zhong, Jingyi Emma and Cheang, Kevin and Qadeer, Shaz and
+                  Grieskamp, Wolfgang and Blackshear, Sam and Park, Junkil and
+                  Zohar, Yoni and Barrett, Clark and Dill, David L.",
+  editor = "Lahiri, Shuvendu K.  and Wang, Chao",
+  title = {{The Move Prover}},
+  booktitle="Computer Aided Verification",
+  year="2020",
+  publisher="Springer International Publishing",
+  pages="137--150",
+}
+
+@Misc{DIEM_FRAMEWORK,
+  author = 	 {{The Diem Association}},
+  title = 	 {{The Diem Framework}},
+  year = 	 {2020},
+  url = {https://github.com/libra/libra/tree/master/language/stdlib}
+}
+
+@Misc{DIEM,
+  author = 	 {{The Diem Association}},
+  title = 	 {{An Introduction to Diem}},
+  url = {https://libra.org/en-US/white-paper/},
+  year = 	 {2019},
+}
+
+@INPROCEEDINGS{LINEAR_TYPES,
+    author = {Philip Wadler},
+    title = {Linear Types Can Change the World!},
+    booktitle = {PROGRAMMING CONCEPTS AND METHODS},
+    year = {1990},
+    publisher = {North}
+}
+
+@incollection{BORROW_SEM,
+  author    = {Dave Clarke and
+               Johan {\"{O}}stlund and
+               Ilya Sergey and
+               Tobias Wrigstad},
+  editor    = {Dave Clarke and
+               James Noble and
+               Tobias Wrigstad},
+  title     = {Ownership Types: {A} Survey},
+  booktitle = {Aliasing in Object-Oriented Programming. Types, Analysis and Verification},
+  series    = {Lecture Notes in Computer Science},
+  volume    = {7850},
+  pages     = {15--58},
+  publisher = {Springer},
+  year      = {2013},
+  url       = {https://doi.org/10.1007/978-3-642-36946-9\_3},
+  doi       = {10.1007/978-3-642-36946-9\_3},
+  timestamp = {Tue, 14 May 2019 10:00:55 +0200},
+  biburl    = {https://dblp.org/rec/series/lncs/ClarkeOSW13.bib},
+  bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
+@Misc{BORROW_CHECKER,
+  author = 	 {Sam Blackshear and Todd Nowacki and Shaz Qadeer and John Mitchell},
+  title = 	 {The Move Borrow Checker},
+  url = {TBD},
+  year = 	 {2021},
+}
+
+@article{RUST_TYPES,
+  author    = {Aaron Weiss and
+               Daniel Patterson and
+               Nicholas D. Matsakis and
+               Amal Ahmed},
+  title     = {Oxide: The Essence of Rust},
+  journal   = {CoRR},
+  volume    = {abs/1903.00982},
+  year      = {2019},
+  url       = {http://arxiv.org/abs/1903.00982},
+  archivePrefix = {arXiv},
+  eprint    = {1903.00982},
+  timestamp = {Sat, 30 Mar 2019 19:27:21 +0100},
+  biburl    = {https://dblp.org/rec/journals/corr/abs-1903-00982.bib},
+  bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
+@article{RUST_SECURE,
+author = {Jung, Ralf and Jourdan, Jacques-Henri and Krebbers, Robbert and Dreyer, Derek},
+title = {RustBelt: Securing the Foundations of the Rust Programming Language},
+year = {2017},
+issue_date = {January 2018},
+publisher = {Association for Computing Machinery},
+address = {New York, NY, USA},
+volume = {2},
+number = {POPL},
+url = {https://doi.org/10.1145/3158154},
+doi = {10.1145/3158154},
+journal = {Proc. ACM Program. Lang.},
+month = dec,
+articleno = {66},
+numpages = {34},
+keywords = {logical relations, separation logic, type systems, Rust, concurrency}
+}
+
+@article{DESIGN_BY_CONTRACT,
+author = {Meyer, Bertrand},
+title = {Applying "Design by Contract"},
+year = {1992},
+issue_date = {October 1992},
+publisher = {IEEE Computer Society Press},
+address = {Washington, DC, USA},
+volume = {25},
+number = {10},
+issn = {0018-9162},
+url = {https://doi.org/10.1109/2.161279},
+doi = {10.1109/2.161279},
+journal = {Computer},
+month = oct,
+pages = {40–51},
+numpages = {12}
+}
+
+@Misc{MOVE_LANG_DEF,
+  author = 	 {{The Move Team}},
+  title = 	 {{The Move Language Definition}},
+  year = 	 {2020},
+  url = {TBD},
+}
+
+@Misc{MOVE_SPEC_LANG_DEF,
+  author = 	 {{The Move Team}},
+  title = 	 {{The Move Specification Language}},
+  year = 	 {2020},
+  url = {TBD},
+}
+
+@Misc{BOOGIE,
+   author = {{The Boogie Team}},
+   title = {{Boogie Intermediate Verification Language}},
+   url = {https://github.com/boogie-org/boogie}
+}
+
+@Misc{Z3,
+   author = {{The Z3 Team}},
+   title = {{Z3 Prover}},
+   url = {https://github.com/Z3Prover/z3}
+}
+
+@Misc{CVC,
+   author = {{The CVC Team}},
+   title = {{CVC5}},
+   url = {https://github.com/cvc5/cvc5}
+}
+
+
+@Misc{RUST,
+   author = {{Steve Klabnik and Carol Nichols}},
+   title = {{The Rust Programming Language}},
+   url = {https://doc.rust-lang.org/book/}
+}
diff --git a/vendors/move/crates/move-prover/doc/report/formal.tex b/vendors/move/crates/move-prover/doc/report/formal.tex
new file mode 100644
index 000000000..cb94ebe4a
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/formal.tex
@@ -0,0 +1,581 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{Program Representation}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\TODO{wrwg}{Bring this up-to-date}
+
+The Move Prover works on an extensible \emph{bytecode} representation of Move,
+which includes special operations related to verification problems. Much of the
+logic of the prover is defined as a \emph{transformation pipeline} for this
+bytecode. For example, calls to functions which are defined solely by pre/post
+conditions are replaced by assumptions and assertions in the bytecode.  Memory
+and data invariants are woven as well into assume/assert statements.  The Move
+Prover's bytecode representation is therefore a central conduit on which we
+describe and implement the Move Prover.
+
+While the original Move bytecode is stackbased, the one on which the prover works
+uses locals (``registers'') exclusively, and is therefore similar than a register
+transfer language (RTL).
+
+
+
+
+\SubSection{Notation}
+
+A few notational conventions are introduced. We use $\sseq{x}$ to denote a
+sequence of items. We write $\sseq{f(x)}$ to apply a function $f$ pointwise to
+the sequence $\sseq{x}$. Two sequences are concatenated using
+$\sseq{x} \scat \sseq{y}$. If $f$ is a function, then $\supdate{f}{x}{y}$
+denotes the function which delivers $y$ at point $x$ and is the same as $f$
+everywhere else. We heavily use exemplary declarations. For example, given
+$x \in T$, with $f(x) \in S$ we declare that $f \in T \rightarrow S$. The
+notation $e \in E ::= x \mid \ldots \mid \mathtt{op}(e, e')$ is used for
+recursive domain definitions, and denotes the smallest set $E$ s.t.~$x \in E$
+and $op(e, e') \in E$.
+
+
+
+
+\SubSection{Bytecode}
+
+\begin{figure}[t!]
+  \[
+    \begin{array}{lcclr}
+      c & \in \sconst & & \swith \tau(c) \in \stype & \mathit{constants}  \\
+      l & \in \slocal & & \swith \tau(l) \in \stype & \mathit{locals}  \\
+      f & \in \sfield & & \swith \tau(f) \in \stype & \mathit{fields} \\
+      R & \in \sresource & & & \mathit{resource~names} \\
+      m & & ::= & \smut \mid \simut & \mathit{mutability} \\
+      \tau & \in \stype & ::= & \stbool \mid
+                                \stnum \mid
+                                \staddress \mid
+                                R\sgen{\sseq{\tau}} \mid
+                                \&\tau \mid
+                                \&\smut~\tau & \mathit{types} \\
+      o & \in \sop & ::= & + \mid - \mid * \mid / \mid \ldots  & \mathit{operations} \\
+      b & \in \sbytecode & ::= & \sbload(l, c) \mid
+              \sbassign(l, l') \mid
+              \sbop_o(l, \sseq{l}) & \mathit{bytecodes} \\
+      && \mid & \sbpack_\tau(l, \sseq{l'}) \mid
+              \sbunpack_\tau(\sseq{l}, l') \\
+      && \mid & \sbmoveto_\tau(l, l') \mid
+              \sbmovefrom_\tau(l, l') \mid
+              \sbexists_\tau(l, l')  \\
+      && \mid & \sbborrowl_m(l, l') \mid
+                \sbborrowg_{m,\tau}(l, l') \\
+      && \mid & \sbborrowf_{m, f}(l, l') \\
+      && \mid & \sbwriteref(l, l') \mid
+                \sbreadref(l, l') \\
+      && \mid & \sbcall_d(\sseq{l}, \sseq{l'}) \mid
+              \sbabort(l) \mid
+              \sbreturn \\
+      && \mid & \sbif(l, \sseq{b}, \sseq{b'}) \mid
+                \sbwhile(l, \sseq{b}) \\
+      d & \in \sdef & ::= & \sdfun{\sseq{l}}{\sseq{l'}}{\sseq{b}} & \mathit{function~definitions}
+    \end{array}
+  \]
+  \caption{Structured Bytecode}
+  \label{fig:Bytecode}
+\end{figure}
+
+We use a minimized bytecode instruction set shown in Fig.~\ref{fig:Bytecode} to
+illustrate semantics and translation of Move programs. In difference to the
+actual bytcode used by the Move virtual machine, this instruction set does not
+use an operand stack but locals for storing input parameters, output parameters,
+and temporary results. Also, the type system has been simplified by merging all
+available Move integer types into $\stnum$. Moreover, instead of a general
+branch instruction, we have $\sbif$ and $\sbwhile$ instructions with embedded
+instruction sequences (therefore we call this representation \emph{structured}
+bytecode). The translation of the original bytecode into this representation is
+conceptual straightforward and left open here. We also assume the code to be
+\emph{type checked} and have passed the Move borrow
+checker~\cite{BORROW_CHECKER}. Notice that the VM runs the borrow checker at
+code loading time, so our verification of code is not dependent on any
+compilation stages (apart of those the prover introduces by itself).
+
+To illustrate the meaning we compare Move code fragments with their associated
+bytecode side-by-side. The first example shows how construction of structures
+and field selection is represented. In order to access the field of a struct, we
+construct an immutable reference for it, and then use the $\sbreadref$
+instruction to read the fields value.
+
+\vspace{1ex}
+\begin{minipage}{.35\linewidth}
+\begin{Move}
+let x = R{f:1};
+let y = x.f + 1
+\end{Move}
+\end{minipage}%
+\begin{minipage}{.65\linewidth}
+  \begin{leftgather}
+    x: R, t_1, t_4, y: \stnum, t_2: \&R, t_3: \&\stnum \\
+    \sbload(t_1, 1);
+    \sbpack_R(x, t_1) \\
+    \sbborrowl_\simut(t_2, x);
+    \sbborrowf_f(t_3, t_2) \\
+    \sbreadref(t_4, t_3);
+    \sbop_{+}(y, t_4, t_1);
+  \end{leftgather}
+\end{minipage}
+\vspace{1ex}
+
+The second example illustrates how a resource is stored in global memory using
+$\sbmoveto$, and then updated:
+
+\vspace{1ex}
+\begin{minipage}{.35\linewidth}
+\begin{Move}
+move_to(a, R{f:1});
+let r =
+  borrow_global_mut
+    <R>(a);
+r.x = 2;
+\end{Move}
+\end{minipage}%
+\begin{minipage}{.65\linewidth}
+  \begin{leftgather}
+    a: \staddress, t_1,t_5: \stnum, t_2: R \\ r: \&\smut~R, t_3: \&\smut~\stnum \\
+    \sbload(t_1, 1);
+    \sbpack_R(t_2, t_1);
+    \sbmoveto_R(a, t_2) \\
+    \sbborrowg_{\smut,R}(r, a);
+    \sbborrowf_f(t_3, r) \\
+    \sbload(t_5, 2);
+    \sbwriteref(t_3, t_5) \\
+  \end{leftgather}
+\end{minipage}
+\vspace{1ex}
+
+\begin{figure}[t!]
+  \begin{mathpar}
+    \inferrule{
+      \slocal' = \supdate{\slocal}{l}{\seval(c)}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbload(l, c)
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule{
+      \slocal' = \supdate{\slocal}{l}{\slocal(l')}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbassign(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule{
+      v = \seval_o(\sseq{\slocal(l')})  \\
+      \slocal' = \supdate{\slocal}{l}{v}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbop_o(l, \sseq{l'})
+      }{
+        \seabort{(\smem, \slocal')}{v = \bot}{\svmerror}
+      }
+    }
+    \and
+    \inferrule{
+      \slocal' = \supdate{\slocal}{l}{R(\sseq{\slocal(l')})}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbpack_R(l, \sseq{l'})
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule{
+      R(\sseq{v'}) = \slocal(l') \\
+      \slocal' = \sseq{\supdate{\slocal}{l}{v'}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbunpack_R(\sseq{l}, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule{
+      \slocal' = \supdate{\slocal}{l}{\smem_R(\sseq{\tau}, l) \neq \bot}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbexists_{R\sgen{\sseq{\tau}}}(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      r = (\sseq{\tau}, \slocal(l)) \\
+      \smem_R' = \supdate{\smem_R}{r}{\slocal(l')}
+    }{
+      \sereltwo{
+        (\smem, \slocal)
+      }{
+        \sbmoveto_{R\sgen{\sseq{\tau}}}(l, l')
+      }{
+        \seabort{(\smem', \slocal)}{\smem_R(r) \neq \bot}{\svmerror}
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      r = (\sseq{\tau}, \slocal(l')) \\
+      \smem_R' = \supdate{\smem_R}{r}{\bot} \\
+      \slocal' = \supdate{\slocal}{l}{\smem_R(r)}
+    }{
+      \sereltwo{(\smem, \slocal)}{
+        \sbmovefrom_{R\sgen{\sseq{\tau}}}(l, l')
+      }{
+        \seabort{(\smem', \slocal')}{\smem_R(r) = \bot}{\svmerror}
+      }
+    }
+    \and
+    \inferrule{
+      \slocal' = \supdate{\slocal}{l}{\sref{l'}{\epsilon}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbborrowl(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule{
+      r = (\sseq{\tau}, \slocal(l')) \\
+      \slocal' = \supdate{\slocal}{l}{\sref{\srootg{R}{r}}{\epsilon}}
+    }{
+      \sereltwo{
+        (\smem, \slocal)
+      }{
+        \sbborrowg_{R\sgen{\sseq{\tau}}}(l, l')
+      }{
+        \seabort{(\smem, \slocal')}{\smem_R(r) = \bot}{\svmerror}
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \sref{r}{p} = \slocal(l') \\
+      \slocal' = \supdate{\slocal}{l}{\sref{r}{p \scat f}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbborrowf_f(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \sref{r}{p} = \slocal(l') \\
+      v = (\smem \oplus \slocal)(r) \\
+      \slocal' = \supdate{\slocal}{l}{\sget{v}{p}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbreadref(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \sref{r}{p} = \slocal(l) \\
+      v = (\smem \oplus \slocal)(r) \\
+      (\smem', \slocal') = \supdate{(\smem \oplus \slocal)}{r}{\sset{v}{p}{\slocal(l')}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbwriteref(l, l')
+      }{
+        (\smem', \slocal')
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \sseq{b} = \mathtt{rename}(d, \sseq{l}, \sseq{l'}) \\
+      \serel{\sestate}{\sseq{b}}{\sestate'}
+    }{
+      \serel{
+        \sestate
+      }{
+        \sbcall_d(\sseq{l}, \sseq{l'})
+      }{
+        \sestate'
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \serel{(\smem, \slocal)}{(\sseq{b} \sif \slocal(l) \selse \sseq{b'})}{\sestate'}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbif(l, \sseq{b}, \sseq{b'})
+      }{
+        \sestate'
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \sereltwo{
+        (\smem, \slocal)
+      }{
+        (\sseq{b} \scat \sbwhile(l, \sseq{b}) \sif \slocal(l) \selse \epsilon)
+      }{
+        \sestate'
+      }
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbwhile(l, \sseq{b})
+      }{
+        \sestate'
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+    }{
+      \serel{
+        \sestate
+      }{
+        \sbreturn \scat \sseq{b}
+      }{
+        \sestate
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbabort(l) \scat \sseq{b}
+      }{
+        \seabort{(\smem, \slocal)}{\mathit{true}}{\slocal(l)}
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \serel{\sestate}{b}{\sestate'} \\
+      \serel{\sestate'}{\sseq{b'}}{\sestate''} \\
+    }{
+      \serel{
+        \sestate
+      }{
+        b \scat \sseq{b'}
+      }{
+        \sestate''
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+    }{
+      \serel{
+        \sestate
+      }{
+        \epsilon
+      }{
+        \sestate
+      }
+    }
+  \end{mathpar}
+  \caption{Operational Semantics of Bytecode}
+  \label{fig:Semantics}
+\end{figure}
+
+
+\SubSection{Operational Semantics}
+
+We next define the operational semantics. The domain of \emph{values} is written
+as $\sval$ (defined below).  Let $\smem_R(\sseq{\tau}, a) \in \swbot{\sval}$
+represent global memory, and $\slocal(l) \in \swbot{\sval}$ local
+memory. Let $a \in \saddr$ be an address, $n \in \mathbb{N}$ a natural number,
+and $p \in \sseq{\sfield}$ a field path.  The domain of values is recursively
+defined as follows:
+\begin{mathpar}
+  v \in \sval ::= a \mid n \mid R(\sseq{v}) \mid \sref{r}{p}
+  \and
+  r ::= l \mid \srootg{R}{(\sseq{\tau},a)}
+\end{mathpar}
+Here, $\sref{r}{p}$ denotes a \emph{reference} into a tree starting from a
+\emph{root} $r$ which can either be a local $l$ or a resource $R$ stored at
+$(\sseq{\tau},a)$. To conveniently work with references $\sref{r}{p}$, we define
+$(\smem \oplus \slocal)(r)$ to read a root value either in global or local
+memory, and similarly, $\supdate{(\smem \oplus \slocal)}{r}{v}$ to update a
+value.
+
+With $\sget{v}{p} \in \swbot{\sval}$ and $\sset{v}{p}{v'} \in \swbot{\sval}$ we
+denote getting or updating a nested resource value $v$ at field path $p$. These
+functions will deliver $\bot$ if $v$ is not a matching resource tree, where some
+underlying mapping from field names $\sfield$ to indices for accessing an
+$R(\sseq{v'})$ value is assumed.
+
+The \emph{execution state} is a pair $\sestate = (\smem, \slocal)$. The
+semantics of bytecode instructions is defined by the relation
+$\serel{\sestate}{b}{\sestate'}$, defined in Fig.~\ref{fig:Semantics}. For the
+case the instruction can abort, we write
+$\serel{\sestate}{b}{\seabort{\sestate}{p}{c}}$ with $p$ the condition under
+which the abort happens, and $c$ the abort code. For implicit aborts caused by
+instructions, we use the the well-known code $\svmerror$.
+
+In the rules in Fig.~\ref{fig:Semantics} we use the function
+$\mathtt{rename}(d, \sseq{l}, \sseq{l'}) \in \sseq{\sbytecode}$, with $d$ a
+function definition, to return a sequence of bytecodes such that all occurrences
+of parameter locals are substituted by $\sseq{l}$, and of result locals by
+$\sseq{l'}$. We assume that all other locals are renamed away so they do not
+conflict with any existing locals.
+
+\TODO{wrwg}{There is a problem with the current handling of $\sbreturn$, as it
+  only returns from the current block, but not any outer blocks}
+
+
+
+\Section{Reference Elimination}
+
+Before a Move program is translated into Boogie, it is subject to multiple
+transformations. This includes standard optimizations like copy propagation and
+dead code elimination, and most importantly, \emph{reference elimination}.
+
+Eliminating references makes it easier for the underlying tools to reason,
+because it removes the indirection over global or local memory, increasing
+referential transparency.  In effect, it makes imperative code less imperative
+and more functional, which is better amenable to formal verification.
+
+Reference elimination is based on the following property which has been
+established by the Move borrow checker~\cite{BORROW_CHECKER}:
+\begin{quote}
+  \emph{Whenever there is a live local $l$ such that $\slocal(l) = \sref{r}{p}$
+    and $\tau(l) = \&\smut~R$, there can be no other live local $l' \neq l$ such
+    that $\slocal(l') = \sref{r}{p'}$, whether mutable or immutable}.
+\end{quote}
+Hereby, the notion of \emph{liveness} is well established in program analysis,
+and carries over to our code representation.
+
+Effectively, whenever a program is working with immutable references, the
+underlying value cannot change, until all those immutable references have
+died. And once a mutable reference is alive, no other reference for the same
+root can be created. The mutable reference can only be moved, or narrowed by
+traversing down in the resource tree using $\sbborrowf$.
+
+\SubSection{Eliminating Immutable References}
+
+\begin{figure}[t!]
+  \[
+    b \in \sbytecode ::= \ldots \mid \sbreadg_{R\sgen{\sseq{\tau}}}(l, l')
+    \mid \sbselectf_f(l, l')
+  \]
+  \begin{mathpar}
+    \inferrule*[width=.33\linewidth]{}{
+      \sitrafotwo{
+        \sbborrowl_\simut(l, l')
+      }{
+        \sbassign(l, l')
+      }
+    }
+    \quad
+    \inferrule*[width=.33\linewidth]{}{
+      \sitrafotwo{
+        \sbborrowg_{\simut,\tau}(l, l')
+      }{
+        \sbreadg_{\tau}(l, l')
+      }
+    }
+    \and
+    \inferrule*[width=.33\linewidth]{
+      \tau(l') = \&\tau'
+    }{
+      \sitrafotwo{
+        \sbborrowf_f(l, l')
+      }{
+        \sbselectf_f(l, l')
+      }
+    }
+  \end{mathpar}
+  \vspace*{2ex}
+  \begin{mathpar}
+    \inferrule*[width=.5\linewidth]{
+      v = \smem_R(\sseq{\tau}, \slocal(l')) \\
+      \slocal' = \supdate{\slocal}{l}{v}
+    }{
+      \sereltwo{
+        (\smem, \slocal)
+      }{
+        \sbreadg_{R\sgen{\sseq{\tau}}}(l, l')
+      }{
+        \seabort{(\smem, \slocal')}{v = \bot}{\svmerror}
+      }
+    }
+    \and
+    \inferrule*[width=.5\linewidth]{
+      \slocal' = \supdate{\slocal}{l}{\sget{\slocal(l')}{f}}
+    }{
+      \serel{
+        (\smem, \slocal)
+      }{
+        \sbselectf_f(l, l')
+      }{
+        (\smem, \slocal')
+      }
+    }
+  \end{mathpar}
+  \caption{Eliminating Immutable References}
+  \label{fig:EliminateImmutable}
+\end{figure}
+
+During Move runtime, immutable references are useful to manage memory ownership
+and avoid unnecessary copying of data.  However, a solver uses a more abstract, term-like
+representation of values, which may already support structure sharing. It is
+more efficient to just resolve immutable references to the values they are referring to.
+This is possible because the underlying value is immutable as well, as discussed above.
+
+Fig.~\ref{fig:EliminateImmutable} describes the bytecode transformation for
+eliminating immutable references. In addition to the transformation described
+there, we also assume that the type mapping $\tau(l)$ is rewritten such that
+$\& \tau$ is replaced by $\tau$.
+
+\SubSection{Eliminating Mutable References}
+
+\TODO{all}{Introduce new instructions and describe their semantics}
+
+\Section{Compiling Specifications into Bytecode}
+
+\begin{figure}[t!]
+  \[
+    \begin{array}{lcclr}
+      e & \in \sexp & ::= & \ldots & \mathit{specification~expressions} \\
+      s & \in \sstatelabel & := & \mathrm{entry} \mid \ldots  & \mathit{state~labels} \\
+      b & \in \sbytecode & ::= & \ldots \mid
+                                 \sbassert(e) \mid \sbassume(e) \mid \sbensures_s(e)
+
+    \end{array}
+  \]
+  \caption{Specification Bytecodes}
+  \label{fig:SpecCodes}
+\end{figure}
+
+Move specifications are compiled into bytecode in form of program assertions and
+assumptions over the current execution state $\sestate$. The related new
+constructs are declared in Fig.~\ref{fig:SpecCodes}.
diff --git a/vendors/move/crates/move-prover/doc/report/injection.tex b/vendors/move/crates/move-prover/doc/report/injection.tex
new file mode 100644
index 000000000..b96292e41
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/injection.tex
@@ -0,0 +1,638 @@
+\SubSection{Function Condition Injection}
+
+During specification injection, move specifications are reduced to basic
+assume/assert statements added to the Move code.  Those statements represent
+instructions to the solver backend about what propositions can be assumed and
+which need to be asserted (verified) at a given program point.  In this section,
+we cover how \emph{function specification conditions} are injected.
+
+
+\SubSubSection{Modular Verification}
+\label{sec:ModularVerification}
+
+
+%% Dave comment: I don't think we need to assume that used modules are verified before
+%%  the modules that use them.  For inductive invariants, we just assume that every
+%%  invariant holds at time t, then prove that that implies that each invariant holds at time t+1.
+%%  So, it's induction on time, not the module dependency structure.}
+
+Modular verification applies to all types of injections, and its principles are
+therefore described first. When the Move prover is run, it takes as input a set
+of Move modules which is closed under the transitive dependency relation (module
+imports). However, only a subset of those modules are \emph{verification target}
+(typically just one module). It is assumed that the tool environment ensures
+that modules in the dependency relation which are not a target of verification
+have already successfully verified. This is possible since Move has an acyclic
+import relation.
+
+From the set of target modules, the set of \emph{target functions} is
+derived. This set might be enriched by additional functions which need
+verification because of global invariants, as discussed in
+Sec.~\ref{sec:GlobalInvariants}. The resulting set of target functions will then
+be verified one-by-one, assuming that any called functions have successfully
+verified. If a called function is among the target functions, it might in fact
+not verify; however, in this case a verification error will be reported at the
+called function, and the verification result at the caller side can be ignored.
+
+\SubSubSection{Pre- and Post conditions}
+
+The injection of basic function specifications is illustrated in
+Fig.~\ref{fig:RequiresEnsuresAbortsIf}.  An extension of the Move source
+language is used to specify abort behavior. With~%
+|fun f() { .. } onabort { conditions }| a Move function is defined where
+|conditions| are assume or assert statements that are evaluated at every program
+point the function aborts (either implicitly or with an |abort| statement). This
+construct simplifies the presentation and corresponds to a per-function abort
+block on bytecode level which is target of branching.
+
+\begin{Figure}
+  \caption{Requires, Ensures, and AbortsIf Injection}
+  \label{fig:RequiresEnsuresAbortsIf}
+  \centering
+\begin{MoveBox}
+  fun f(x: u64, y: u64): u64 { x + y }
+  spec f {
+    requires x < y;
+    aborts_if x + y > MAX_U64;
+    ensures result == x + y;
+  }
+  fun g(x: u64): u64 { f(x, x + 1) }
+  spec g {
+    ensures result > x;
+  }
+  @\transform@
+  fun f(x: u64, y: u64): u64 {
+    spec assume x < y;
+    let result = x + y;
+    spec assert result == x + y;     // ensures of of
+    spec assert                      // negated abort_if of f
+      !(x + y > MAX_U64); @\label{line:aborts_holds_not}@
+    result
+  } onabort {
+    spec assert                      // abort_if of f
+      x + y > MAX_U64; @\label{line:aborts_holds}@
+  }
+  fun g(x: u64): u64 {
+    spec assert x < x + 1;           // requires of f
+@$\textrm{\it if inlined}$\label{line:inline}@
+    let result = inline f(x, x + 1);
+@$\textrm{\it elif opaque}$\label{line:opaque}@
+    if (x + x + 1 > MAX_U64) abort;  // aborts_if of f
+    spec assume result == x + x + 1; // ensures of f
+@$\textrm{\it endif}$@
+    spec assert result > x;          // ensures of g
+    result
+  }
+\end{MoveBox}
+\end{Figure}
+
+An aborts condition is translated into two different asserts: one where the
+function aborts and the condition must hold (line~\ref{line:aborts_holds}), and
+one where it returns and the condition must \emph{not} hold
+(line~\ref{line:aborts_holds_not}). If there are multiple |aborts_if|, they are
+or-ed. If there is no abort condition, no asserts are generated. This means
+that once a user specifies aborts conditions, they must completely cover the
+abort behavior of the code. (The prover also provides an option to relax this
+behavior, where aborts conditions can be partial and are only enforced on
+function return.)
+
+For a function call site we distinguish two variants: the call is \emph{inlined}
+(line~\ref{line:inline}) or it is \emph{opaque} (line~\ref{line:opaque}). In
+both cases, it is assumed that the called function is verified (see Modular
+Verification, Sec.~\ref{sec:ModularVerification}). For inlined calls, the
+function definition, with all injected assumptions and assertions turned into
+assumptions (as those are considered proven) is substituted. For opaque
+functions the specification conditions are inserted as
+assumptions. Methodologically, opaque functions need precise specifications
+relative to a particular objective, where as in the case of inlined functions
+the code is still the source of truth and specifications can be partial or
+omitted. However, inlining does not scale arbitrarily, and can be only used for
+small function systems.
+
+Notice we have not discussed the way how to deal with relating pre and post
+states yet, which requires taking snapshots of state (e.g.~%
+|ensures x == old(x) + 1|); the example in
+Fig.~\ref{fig:RequiresEnsuresAbortsIf} does not need it. Snapshots of state
+will be discussed for global update invariants in Sec.~\ref{sec:GlobalInvariants}.
+
+\SubSubSection{Modifies}
+
+\begin{Figure}
+  \caption{Modifies Injection}
+  \label{fig:Modifies}
+  \centering
+\begin{MoveBox}
+  fun f(addr: address) { move_to<T>(addr, T{}) }
+  spec f {
+    pragma opaque;
+    ensures exists<T>(addr);
+    modifies global<T>(addr);
+  }
+  fun g() { f(0x1) }
+  spec g {
+    modifies global<T>(0x1); modifies global<T>(0x2);
+  }
+  @\transform@
+  fun f(addr: address) {
+    let can_modify_T = {addr};      // modifies of f
+    spec assert addr in can_modify; // permission check @%
+                                            \label{line:modifies_permission}@
+    move_to<T>(addr, T{});
+  }
+  fun g() {
+    let can_modify_T = {0x1, 0x2};  // modifies of g
+    spec assert {0x1} <= can_modify_T; // permission check @%
+                                            \label{line:modifies_call_permission}@
+    spec havoc global<T>(0x1);      // havoc modified memory @%
+                                            \label{line:modifies_havoc}@
+    spec assume exists<T>(0x1);     // ensures of f
+  }
+\end{MoveBox}
+\end{Figure}
+
+
+The |modifies| condition specifies that a function only changes specific memory.
+It comes in the form |modifies global<T>(addr)|, and its injection is
+illustrated in Fig.~\ref{fig:Modifies}.
+
+A type check is used to ensure that if a function has one or more~%
+|modifies| conditions all called functions which are \emph{opaque} have a matching
+modifies declaration. This is important so we can relate the callees
+memory modifications to that what is allowed at caller side.
+
+At verification time, when an operation is performed which modifies memory, an
+assertion is emitted that modification is allowed
+(e.g. line~\ref{line:modifies_permission}). The permitted addresses derived from
+the modifies clause are stored in a set |can_modify_T| generated by the
+transformation. Instructions which modify memory are either primitives (like
+|move_to| in the example) or function calls. If the function call is inlined,
+modifies injection proceeds (conceptually) with the inlined body. For opaque
+function calls, the static analysis has ensured that the target has a modifies
+clause.  This clause is used to derive the modified memory, which must be a
+subset of the modified memory of the caller
+(line~\ref{line:modifies_call_permission}).
+
+For opaque calls, we also need to \emph{havoc} the memory they modify
+(line~\ref{line:modifies_havoc}), by which is meant assigning an unconstrained
+value to it. If present, |ensures| from the called function, injected as
+subsequent assumptions, are further constraining the modified memory.
+
+
+\SubSubSection{Data Invariants}
+
+\begin{Figure}
+  \caption{Data Invariant Injection}
+  \label{fig:DataInvariants}
+  \centering
+\begin{MoveBox}
+  struct S { a: u64, b: u64 }
+  spec S { invariant a < b }
+  fun f(s: S): S {
+    let r = &mut s;
+    r.a = r.a + 1;
+    r.b = r.b + 1;
+    s
+  }
+  @\transform@
+  fun f(s: S): S {
+    spec assume s.a < s.b;      // assume invariant for s
+    let r = Mvp::local(s, F_s); // begin mutation of s
+    r = Mvp::set(r, Mvp::get(r)[a = Mvp::get(r).a + 1]);
+    r = Mvp::set(r, Mvp::get(r)[b = Mvp::get(r).b + 1]);
+    spec assert                 // invariant enforced
+      Mvp::get(r).a < Mvp::get(r).b;
+    s = Mvp::get(r);            // write back to s
+    s
+  }
+\end{MoveBox}
+\end{Figure}
+
+A data invariant specifies a constraint over a struct value. The value is
+guaranteed to satisfy this constraint at any time. Thus, when a value is
+constructed, the data invariant needs to be verified, and when it is consumed,
+it can be assumed to hold.
+
+In Move's reference semantics, construction of struct values is often done via a
+sequence of mutations via mutable references. It is desirable that \emph{during}
+such mutations, assertion of the data invariant is suspended. This allows to
+state invariants which reference multiple fields, where the fields are updated
+step-by-step.  Move's borrow semantics and concept of mutations provides a
+natural way how to defer invariant evaluation: at the point a mutable reference
+is released, mutation ends, and the data invariant can be enforced.  In other
+specification formalisms, we would need a special language construct for
+invariant suspension. Fig.~\ref{fig:DataInvariants} gives an example, and shows
+how data invariants are reduced to assert/assume statements.
+
+\Paragraph{Implementation}
+
+The implementation hooks into the reference elimination
+(Sec.~\ref{sec:RefElim}). As part of this the lifetime of references is
+computed. Whenever a reference is released and the mutated value is written
+back, we also enforce the data invariant. In addition, the data invariant is
+enforced when a struct value is directly constructed.
+
+
+
+\SubSection{Global Invariant Injection}
+\label{sec:GlobalInvariants}
+
+%% Dave comment: We discussed requiring update invariants to be transitive, but I don't think that's
+%% a great idea after thinking about it more.  Too long to write here
+
+
+Global invariants are properties declared in Move modules
+that must hold on all global states
+in which a transaction is not being executed.
+\textit{Inductive invariants} are properties that don't have the
+``old'' operator, so their truth can be evaluated in a single state.
+\textit{update invariants} contain the ``old'' operator, so they
+must be evaluated in two consecutive states: the current state (where
+the two-state invariant holds) and the immediately previous state
+(for simplicity, we define a two-state invariant to hold in the initial state).
+Regular invariants are proved by induction over time, while update
+invariants can be proved without induction.
+
+In some situations (such as blockchains), we would like
+users to be able to write transactions ``on-the-fly'' and submit
+them to the system, which does not allow time to run the Prover
+on individual transactions. The coarsest granularity we can
+practically achieve is to verify that each public and script function preserves
+inductive invariants.
+
+In the simplest case, the
+prover proves the much stronger condition that an invariant holds
+before and after every single instruction during transaction
+execution.  It is also possible a user to suspend checking of an
+invariant during intervals of execution of a transaction. We first
+discuss the basic model, then deal with additional issues from generics
+and invariant suspension.
+
+We wish to support open systems to which untrusted modules can be
+added to without invalidating invariants that have already been
+proved.  For each invariant, there is a defined subset of Move modules
+(called a \textit{cluster}).  If the invariant is proved for the
+modules in the cluster, it is guaranteed to hold in all other modules
+-- even those that were not yet defined when the invariant was proved.
+The cluster must contain every function that can invalidate the invariant,
+and, in some cases (explained in more detail below) callers to those
+functions.
+
+
+\TODO{dld}{We need consistent terminology for ``public'' functions that does
+not include public(friend) functions.}
+
+The soundness of the invariant proof method holds by an inductive
+argument over sequences of public and script function calls.  The base
+case is that the invariant must hold in the empty state that preceeds
+the genesis transaction, and the induction is that, if the invariant
+holds immediately before each public or script function, it continues
+to hold immediately after that function.  Note that the induction
+proof allows the assumption of \textit{all} invariants at the
+beginning of each public or script function to prove that an invariant
+holds after the function.  In practice, a subset of the available
+invariants are actually assumed on entry to a function. Some are not
+visible to the prover because they are specified outside of the
+cluster being verified, and others are excluded heuristically to
+reduce computational cost.
+
+% "modifies a type" is not defined precisely.
+
+The Prover verifies one module at a time.  The module being verified
+is called the \textit{target module}, and the global invariants to be
+verified are called \textit{target invariants}. The cluster of modules
+to be verified is computed from the target module.  it is necessary
+that every occurrence of an instruction that can potentially
+invalidate a target invariant be contained in some function in the
+cluster of modules for that invariant.  In the basic case in which
+invariants are not suspended, the cluster is the target module and all
+the modules it directly or indirectly uses, since the invariant can
+sonly refer to types defined in these modules, and the semantics of the
+Move language forbid a function from containing an instruction that
+modifies a type not appearing in the same module. Importantly,
+functions outside the cluster can never invalidate an invariant, so
+those functions trivially preserve the invariant, so it is only
+necessary to verify functions defined in the cluster.
+
+To ensure that invariants continue to hold after a public or script
+function returns, it is necessary to inject an assertion of the invariant at some
+point between each instruction that could invalidate it and the return
+points from the procedure.  In the simple case where invariants are
+not suspended, each target invariant is asserted after
+every instruction that could invalidate the invariant. So, by an
+obvious inductive argument, if the invariant holds in the initialy
+empty state, it holds after every instruction that is executed by
+every function.
+
+Update invariants are processed differently from inductive invariants.
+The value of an update invariant depends on two consecutive states, where
+``old'' expressions are evaluated in the first state, and expressions
+not in the context of an ``old'' operator are evaluated in the second
+state.
+To check an update invariant, the Prover first finds every
+instruction that can modify the truth of the invariant. A temporary
+value is generated to name the contents of the state before the
+instruction, and expressions involving this temporary are substituted
+for ``old'' expressions in the update invariant.
+Then, the prover injects an instruction to save the state in the
+temporary before the instruction, and injects an assert of
+the translated update after the instruction.
+
+%% Dave comment: I just noticed the next issue after writing the above paragraph.
+%% If we only want to instrument instructions that change the types in invariant,
+%% we need to make sure the invariant is valid when there are no changes.}
+
+We assume that an instruction that doesn't modify any of the types
+mentioned in an update invariant also does alter the validity of the invariant.
+Hence, an update invariant, regarded as a binary relation, must be reflexive.
+This property is not currently enforced by the prover.
+
+\SubSubSection{Basic Translation}
+
+\begin{Figure}
+  \caption{Basic Global Invariant Injection}
+  \label{fig:GlobalInvariants}
+  \centering
+\begin{MoveBox}
+  fun f(a: address) {
+    let r = borrow_global_mut<S>(a);
+    r.value = r.value + 1
+  }
+  invariant [I1] forall a: address: global<S>(a).value > 0;
+  invariant [I2] update forall a: address:
+      global<S>(a).value > old(global<S>(a).value);
+  @\transform@
+  fun f(a: address) {
+    spec assume I1;
+    Mvp::snapshot_state(I2_BEFORE);
+    r = <increment mutation>;
+    spec assert I1;
+    spec assert I2[old = I2_BEFORE];
+  }
+\end{MoveBox}
+\end{Figure}
+
+
+%% Dave comment: Do we have standard terminology for the state
+%%  variables upon which an invariant depends and that a function can
+%%  access or modify? We should explain the concepts and terminology
+%%  earlier and use them consistently throughout.
+
+The injection of assumes and asserts of global invariants into
+functions requires knowing whether a function reads or modifies types
+that are mentioned in the invariant.  Without generic type parameters,
+this is a relatively simple analysis. First, the prover collects the
+set of types mentioned in the invariant.
+For choosing the invariants to
+assume on entry to a function, the Prover collects all the types that
+are read or modified by the function or indirectly by functions that it
+calls, and intersects this set with the set of types in the invariant.
+For choosing the invariants to assert, the Prover collects types that
+are modified by the function or by an individual instruction or function
+call and intersects that set with the set of types in the invariant.
+
+Fig.~\ref{fig:GlobalInvariants} contains an example for the supported invariant
+types and their injection into code. The first invariant, |I1|, is an inductive
+invariant. It is assumed on function entry, and asserted after the state
+update. The second, |I2|, is an update invariant, which relates pre and
+post states. For this a state snapshot is stored under some label |I2_BEFORE|,
+which is then used in an assertion.
+
+\TODO{dld}{Note that ``modifies'' won't help with reads in opaque functions.}
+
+Global invariant injection is optimized by knowledge of the prover, obtained
+by static analysis, about (transitively) accessed memory. For opaque functions
+(including also builtin functions) this information is obtained via the modifies
+clause. For other functions it is determined from the code.  Assuming that the
+prover has precise knowledge (up to symbolic address representation) of memory
+usage, it can determine which invariants to inject. Let |f| be a target function:
+
+\begin{itemize}
+\item Inject |assume I| at entry to |f| \emph{if} |read*(f)| has overlap with
+  |read*(I)|.
+\item At every point in |f| where a memory location |M| is updated inject
+  |assert I| after the update \emph{if} |M in read*(I)|. Also, if |I| is an
+  update invariant, before the update inject a memory snapshot save.
+\end{itemize}
+
+Notice that we do not inject any invariants in functions that are not
+verification targets. However, the set of target functions may need to be
+extended because of invariants, as described later.
+
+
+\SubSubSection{Genericity}
+
+\begin{Figure}
+  \caption{Genericity}
+  \label{fig:Genericity}
+  \centering
+\begin{MoveBox}
+  invariant [I1] global<S<u64>>(0).value > 1;
+  invariant<T> [I2] global<S<T>>(0).value > 0;
+  fun f(a: address) { borrow_global_mut<S<u8>>(0).value = 2 }
+  fun g<R>(a: address) { borrow_global_mut<S<R>>(0).value = 3 }
+  @\transform@
+  fun f(a: address) {
+    spec assume I2[T = u8];
+    <<mutate>>
+    spec assert I2[T = u8];
+  }
+  fun g<R>(a: address) {
+    spec assume I1;
+    spec assume I2[T = R];
+    <<mutate>>
+    spec assert I1;
+    spec assert I2[T = R];
+  }
+\end{MoveBox}
+\end{Figure}
+
+Generic type parameters make the problem of determining whether a
+function can modify an invariant more difficult.
+For soundness, a property must hold for every possible instantiation
+of type parameters.
+So, rather than checking
+whether some of the types mentioned in the invariant are equal to some
+of the types accessed or modified by a function
+the Prover needs to
+discover whether there is any possible instantiation of type parameters
+that might allow the instantiated function to invalidate an instantiated invariant.
+In other words, it needs to know whether the
+each type in the invariant can be unified with a type accessed or modified by
+the function.
+Consider the example
+in Fig.~\ref{fig:Genericity}. Invariant |I1| holds for a specific type
+instantiation |S<u64>|, whereas |I2| is generic over all type instantiations for
+|S<T>|.
+
+The non-generic function |f| which works on the instantiation |S<u8>| will have
+to inject the \emph{specialized} instance |I2[T = u8]|. The invariant |I1|,
+however, does not apply for this function, because there is no overlap with
+|S<u64>|.  In contrast, in the generic function |g| we have to inject both
+invariants. Because this function works on arbitrary instances, it is also
+relevant for the specific case of |S<u64>|.
+
+In the general case, we are looking at a unification problem of the following
+kind. Given the accessed memory of a function |f<R>| and an invariant |I<T>|, we
+compute the pairwise unification of memory types. Those types are parameterized
+over |R| resp. |T|, and successful unification will result in a substitution
+for both. On successful unification, we include the invariant with |T| specialized
+according to the substitution.
+
+Notice that there are implications related to monomorphization coming from the
+injection of global invariants; those are discussed in Sec.~\ref{sec:Mono}.
+
+
+\SubSubSection{Modularity}
+
+\begin{Figure}
+  \caption{Modular Verification and Invariants}
+  \label{fig:ModularVerificationInv}
+  \centering
+\begin{MoveBox}
+  module Store {
+    struct T has key { x: u64 }
+    public fun read(): u64 { borrow_global<S>(0).x }
+    public fun write(x: u64) { borrow_global_mut_<S>(0).x = x }
+  }
+  module Actor {
+    use Store;
+    invariant global<S>(0).x > 0;
+    public fun set(x: u64) {
+      if (x == 0) then abort 1;
+      Store::set(x);
+    }
+  }
+\end{MoveBox}
+\end{Figure}
+
+In Sec.~\ref{sec:ModularVerification}, the general mechanism of modular
+verification was described, deriving the set of verified \emph{target
+  functions} from the set of \emph{target modules}, provided by the user on the
+command line. Global invariants add additional functions by possibly requiring
+re-verification of non-target functions which can influence the invariant.
+
+Consider the example in Fig.~\ref{fig:ModularVerificationInv}. The module
+|Store| provides an API for some storage location which is shared between a set
+of modules. The module |Actor|, one of those modules, establishes an
+invariant on the content of the store. When |Actor| is verified, one must
+also verify the function |Store::write|, because this invariant is verification
+target.  (In this example, verification cannot succeed, because the function
+|Store::write| is not restricting the values for the parameter |x|; we see in
+the next section how to fix this.)
+
+In general, the set of additional functions to verify is computed as
+follows. Let |I| be a target invariant which appears in some target module, and
+|f| some function in the dependency relation. If |modify(f)| has an overlap
+with |read*(I)| then |f| needs to be added to the target functions. Notice it is
+not |modify*(f)|; only direct modifications make a function to a verification
+target (with exceptions as discussed in the next section).
+
+
+\SubSubSection{Suspending Invariants}
+
+\begin{Figure}
+  \caption{Suspension of Invariants}
+  \label{fig:SuspensionInv}
+  \centering
+\begin{MoveBox}
+  module Store {
+    friend Actor;
+    ...
+    public(friend) fun write(x: u64) {
+      borrow_global_mut_<S>(0).x = x
+    }
+    spec write { pragma suspend_invariants; }
+  }
+  module Actor {
+    ...
+    invariant [suspendable] global<S>(0).x > 0;
+  }
+\end{MoveBox}
+\end{Figure}
+
+The example in Fig.~\ref{fig:ModularVerificationInv} is not quite right from a
+design viewpoint, since a global store accessible to everybody is constrained by
+a specific module. Consequently, it cannot be successfully
+verified. Fig.~\ref{fig:SuspensionInv} modifies the example to fix this. First,
+Move's |friend| mechanism is used to restrict visibility of |Store::write| to
+the |Actor| module. Note one could add other modules to the friends list as
+needed.  Second, the |Store::write| function is declared to \emph{suspend
+  invariant evaluation to callers}. Only private and friend functions can have
+such a declaration, ensuring the all call sites are known and the suspended
+invariants are actually verified in all call contexts.  An invariant needs to be
+explicitly marked via |[suspendable]| do be eligible for suspension.
+
+When an invariant |I| is suspended for a function |f|, the injection scheme changes
+as follows:
+
+\begin{itemize}
+\item At the definition side of |f|, |I| is neither assumed nor asserted.
+\item At every call side of |f| (whether opaque or inlined), the invariant
+  is asserted right after the call. It will also be assumed at the entry point
+  of the caller.
+\item Instead of |f| becoming a target function because it modifies the memory
+  read in |I| (see above paragraph about modular verification), all callers will
+  become target functions.
+\item If the caller is itself suspended, the process is instead continued with
+  the parent callers.
+\end{itemize}
+
+A function that is called from a suspended function cannot rely on a
+suspended invariants holding.  It would be unsound to assume those invariants
+in the function, and, since the invariants may not hold, asserting them would
+often yield failed proofs.  Therefore, the prover implicitly suspends all
+functions that are called from a suspended function.
+% *** error condition when the suspended function is public.
+
+Suspending an update invariant may change its meaning,
+meaning, depending on the form of the predicate. Without suspension, an update
+invariant is implemented by snapshotting the memory before the update and then
+asserting a predicate after the update which refers to the previous state and
+the current one. For suspended update invariants, the snapshot is taken
+\emph{before} the suspended function is called, and the assertion injected
+\emph{after} it returns, which might be earlier resp.~later states. An example
+of an update invariant which works well for suspension is e.g. a requirement for
+a monotonically increasing value, as in~%
+|invariant [suspendable] old(value()) <= value()|.
+
+Methodologically, the suspension mechanism should be used with care, because it
+may complicate the verification problem by propagating verification errors to
+more complex application contexts. The Move prover supports a further pragma to
+suspend invariant verification which draws a clear boundary to function systems
+with suspension. With |pragma suspend_invariants_in_body| a function can be
+marked to suspend invariants only in its body but ensure they hold at caller
+side. This is conceptually syntactic sugar for introducing a helper function:
+
+\begin{Move}
+  public fun f(P) { S }
+  spec f { pragma suspend_invariants_in_body; }
+  @\transform@
+  public fun f(P) { f'(P) }
+  fun f'(P) { S } spec f' { pragma suspend_invariants; }
+\end{Move}
+
+
+
+\SubSubSection{Invariant Consistency}
+
+\TODO{wrwg}{Describe solution to the below problem via induction}
+
+Notice that invariant injection can lead to inconsistencies. Consider the following
+code fragment:
+
+\begin{Move}
+  invariant [I] forall a: address: global<S>(a).value > 0;
+  @\transform@
+  spec assume global<S>(0).value == 0;  // context, e.g. from a requires
+  spec assume I;                        // injected
+\end{Move}
+
+\noindent We currently do not check whether an invariant is satisfiable
+before we assume it, but rather rely on a generic consistency checker for
+specifications.
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/intro.tex b/vendors/move/crates/move-prover/doc/report/intro.tex
new file mode 100644
index 000000000..a11636821
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/intro.tex
@@ -0,0 +1,65 @@
+\Section{Introduction}
+
+In this paper, we describe methodology and design of \emph{formal verification}
+for the \emph{Move} language.  Move \cite{MOVE_LANG} is a new high-level
+programming language for writing smart contracts, which has been been designed
+from the ground up with formal verification in mind. Specification related
+language support is integrated into Move, and the \emph{Move Prover}
+\cite{MOVE_PROVER} (abbreviated \MVP) has been developed, enabling practical
+formal verification integrated into the regular development process.
+
+Since the earlier tools paper in \cite{MOVE_PROVER}, many changes have been made
+to the Move specification language and \MVP. Those changes went hand-in-hand
+with the evolution of the \emph{Diem framework}~\cite{DIEM_FRAMEWORK}, which is
+a Move library for smart contracts running on the Diem
+blockchain~\cite{DIEM}. The framework provides functionality for managing
+accounts and their interaction, including multiple currencies, account roles,
+and rules for transactions.  It consists of approximately 12,000 lines of Move
+program code and specifications.  The framework is exhaustively specified, and
+\emph{verification runs fully automated alongside with unit and integration
+  tests}, and as such can be seen as one of the larger recent success stories of
+formal methods in industry.
+
+In this report, we aim to describe both the Move specification language as well
+as the implementation design of \MVP. The specification language comes with a
+number of novel features, among them a powerful concept of invariants which
+leverages Move's borrow semantics. The implementation is described by means of
+transforming high-level Move code with specifications into lower-level Move code
+which only contains simple assume and assert statements. This tranformation
+utilizes a number of novel ideas, among them the elimination of references from
+the original Move program and the injection of invariants into the code. The
+lower-level Move code is translated via Boogie~\cite{BOOGIE} to an SMT solver
+like Z3~\cite{Z3}, and the counter-examples resulting from SMT runs are mapped
+back in full fidelity to the source level of Move.
+
+While performed in the context of Move and the Diem blockchain project, we
+believe this work has wider implications. The Move language uses a model of
+references and borrow semantics very similar to the safe subset of Rust
+\cite{RUST}, for which the same ideas could be applied as described here.  The
+Move language can be also used for other domains than blockchains: the major
+aspects of Move are that it has persistent global memory which can be directly
+accessed from the language and that it supports deterministic, transactional
+semantics to update this memory -- properties which are relevant for other
+domains as well. Nevertheless, one major factor for the success of this work are
+specific to one aspect of the blockchain context: Move code is fully sandboxed,
+and we do not need to deal with a myriad of unspecified, unsafe external code.
+
+While our results look promising for the application of formal methods in the
+domain, there are a number of open problems as well.  A major classical obstacle
+of SMT-based verification remains: as we are dealing with undecidable problems,
+heuristics in the solver can fail, leading to occasional false positives and
+verification timeouts, which require support of specialized engineers to
+solve. Also, specifications are arguably harder to write than code, and require
+significant effort.  We describe the obstacles for mainstream usability, and our
+ideas how they might be overcome in the conclusion of this report.
+
+\Paragraph{Acknowledgement} Many more people have contributed to the Move
+Prover: Sam Blackshear, Mathieu Baudet, Todd Nowacki, Bob Wilson, Tim Zaikan,
+\ldots (list interns and other Move team members)
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/macros.tex b/vendors/move/crates/move-prover/doc/report/macros.tex
new file mode 100644
index 000000000..e53b77dd7
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/macros.tex
@@ -0,0 +1,257 @@
+
+\usepackage{xcolor}
+\usepackage{listings}
+\usepackage{inconsolata}
+\usepackage{amsmath,amssymb,array}
+\usepackage{mathpartir}
+\usepackage{graphicx}
+
+\newcommand{\Section}[1]{\section{#1}}
+\newcommand{\SubSection}[1]{\subsection{#1}}
+\newcommand{\SubSubSection}[1]{\subsubsection{#1}}
+\newcommand{\Paragraph}[1]{\paragraph{#1}}
+
+\newcommand{\TODO}[2]{%
+  \noindent\textcolor{gray}{%
+      {\scriptsize\textbf{TODO(#1)}: #2}
+  }
+}
+
+\newenvironment{Figure}{
+  \begin{figure}[ht!b!]
+} {
+  \end{figure}
+}
+
+\newcommand{\MVP}[0]{\textsf{MVP}}
+
+
+
+
+% Source Transformation
+
+\newcommand{\transform}[0]{\Large{$\leadsto$}}
+
+
+%%%% Code
+
+%\usepackage[charter]{mathdesign}
+%\def\rmdefault{bch}
+%\def\ttdefault{blg}
+
+\lstdefinestyle{MoveStyle}{
+  basicstyle=\ttfamily,
+  keywordstyle=\bf,
+  escapechar=@, % use to embed LaTeX into code
+}
+
+
+\lstdefinelanguage{Move}{
+  morekeywords={
+    abort,
+    aborts_if,
+    acquires,
+    address,
+    as,
+    assert,
+    assume,
+    borrow_global,
+    borrow_global_mut,
+    break,
+    const,
+    continue,
+    copy,
+    copyable,
+    define,
+    drop,
+    else,
+    ensures,
+    exists,
+    false,
+    forall,
+    friend,
+    fun,
+    global,
+    has,
+    havoc,
+    if,
+    include,
+    invariant,
+    key,
+    let,
+    loop,
+    modifies,
+    module,
+    move,
+    move_from,
+    move_to,
+    mut,
+    native,
+    num,
+    old,
+    onabort,
+    pragma,
+    public,
+    requires,
+    resource,
+    return,
+    schema,
+    script,
+    signer,
+    spec,
+    store,
+    struct,
+    true,
+    update,
+    use,
+    with,
+    where,
+    while},
+  sensitive=true,
+  morecomment=[l]{//},
+  morecomment=[s]{/*}{*/},
+}
+
+% This allows us to use |<move code>| for inline code.
+\lstMakeShortInline[language=Move,style=MoveStyle]|
+
+
+% This defines a new environment for Move code.
+\lstnewenvironment{Move}{
+  \lstset{
+    language=Move,
+    style=MoveStyle,
+    basicstyle=\small\ttfamily,
+  }
+}{
+}
+
+% This defines a new environment for Move code in a box, with line numbers.
+% TODO: this is intended for figures, but there are some weird problems
+% with how lstlisting does things which are not fully understood. So figure
+% needs to be done manually around this.
+\lstnewenvironment{MoveBox}{
+  \lstset{
+    language=Move,
+    style=MoveStyle,
+    basicstyle=\small\ttfamily,
+    numbers=left,
+    numberstyle=\scriptsize\color{gray},
+    frame=single,
+  }
+}{
+}
+
+% This defines a new environment for diagnostics as produced by the prover.
+\lstnewenvironment{MoveDiag}{
+  \lstset{
+    style=MoveStyle,
+    basicstyle=\scriptsize\ttfamily,
+  }
+}{
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Operational Semantics
+% (older stuff, needed for formal.tex)
+
+\newcommand{\smem}{\mathcal{M}}
+\newcommand{\saddr}{\mathcal{A}}
+\newcommand{\sval}{\mathcal{V}}
+\newcommand{\sresource}{\mathcal{R}}
+\newcommand{\slocal}{\mathcal{L}}
+\newcommand{\sconst}{\mathcal{C}}
+\newcommand{\sfield}{\mathcal{F}}
+\newcommand{\sop}{\mathcal{O}}
+\newcommand{\sexp}{\mathcal{E}}
+\newcommand{\sstatelabel}{\mathcal{S}}
+
+\newcommand{\svmerror}{\kappa}
+
+\newcommand{\sestate}{\Theta}
+\newcommand{\serel}[3]{#1 \vdash #2 \Rightarrow #3}
+\newcommand{\sereltwo}[3]{\begin{array}{r}#1 \vdash #2 \\ \Rightarrow #3\end{array}}
+\newcommand{\seabort}[3]{{#1}_{\mathrm{abort}(#3)~\mathrm{if}~#2}}
+\newcommand{\seval}{\mathrm{eval}}
+\newcommand{\sref}[2]{\mathrm{ref}(#1, #2)}
+\newcommand{\srootg}[2]{#1_{#2}}
+
+
+% Types
+\newcommand{\stype}{\mathcal{T}}
+\newcommand{\stctor}[1]{\mathrm{#1}}
+\newcommand{\stbool}{\stctor{bool}}
+\newcommand{\stnum}{\stctor{num}}
+\newcommand{\stresource}{\stctor{resource}}
+\newcommand{\staddress}{\stctor{address}}
+\newcommand{\stref}{\sbctr{ref}}
+
+\newcommand{\stmut}{\mathcal{M}}
+\newcommand{\smut}{\stctor{mut}}
+\newcommand{\simut}{\stctor{imu}}
+
+% Definitions
+\newcommand{\sdef}{\mathcal{D}}
+\newcommand{\sdfun}[3]{\sbinstr{fun}(#1)#2 \{ #3 \}}
+
+% Basic Bytecodes
+\newcommand{\sbinstr}[1]{\mathtt{#1}}
+\newcommand{\sbytecode}{\mathcal{B}}
+\newcommand{\sbload}{\sbinstr{load}}
+\newcommand{\sbassign}{\sbinstr{assign}}
+\newcommand{\sbpack}{\sbinstr{pack}}
+\newcommand{\sbunpack}{\sbinstr{unpack}}
+\newcommand{\sbop}{\sbinstr{op}}
+\newcommand{\sbmoveto}{\sbinstr{move\_to}}
+\newcommand{\sbmovefrom}{\sbinstr{move\_from}}
+\newcommand{\sbexists}{\sbinstr{exists}}
+\newcommand{\sbborrowl}{\sbinstr{borrow\_local}}
+\newcommand{\sbborrowg}{\sbinstr{borrow\_global}}
+\newcommand{\sbborrowf}{\sbinstr{borrow\_field}}
+\newcommand{\sbwriteref}{\sbinstr{write\_ref}}
+\newcommand{\sbreadref}{\sbinstr{read\_ref}}
+\newcommand{\sbcall}{\sbinstr{call}}
+\newcommand{\sbabort}{\sbinstr{abort}}
+\newcommand{\sbreturn}{\sbinstr{return}}
+\newcommand{\sbrelease}{\sbinstr{release}}
+\newcommand{\sbif}{\sbinstr{if}}
+\newcommand{\sbwhile}{\sbinstr{while}}
+
+
+% Imutable References Elimination
+\newcommand{\sbreadl}{\sbinstr{read\_local}}
+\newcommand{\sbreadg}{\sbinstr{read\_global}}
+\newcommand{\sbselectf}{\sbinstr{select\_field}}
+\newcommand{\sitrafo}[2]{#1 \leadsto #2}
+\newcommand{\sitrafotwo}[2]{\begin{array}{r}#1 \\ \leadsto #2\end{array}}
+
+% Specification constructs
+\newcommand{\sbassume}{\sbinstr{assume}}
+\newcommand{\sbassert}{\sbinstr{assert}}
+\newcommand{\sbensures}{\sbinstr{ensures}}
+
+
+
+
+% General Math
+\newcommand{\sseq}[1]{\overline{#1}}
+\newcommand{\sgen}[1]{\langle#1\rangle}
+\newcommand{\scross}[0]{\times}
+\newcommand{\swbot}[1]{#1_\bot}
+\newcommand{\sinto}[0]{\rightarrow}
+\newcommand{\swith}[0]{\mathit{with~}}
+\newcommand{\supdate}[3]{#1[#2 \triangleleft #3]}
+\newcommand{\scat}{\cdot}
+\newcommand{\sif}{~\mathrm{if}~}
+\newcommand{\selse}{~\mathrm{else}~}
+\newcommand{\sget}[2]{#1_#2}
+\newcommand{\sset}[3]{#1[#2 \triangleleft #3]}
+
+
+\newenvironment{leftgather}{\begin{math}\begin{array}{l}}{\end{array}\end{math}}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/main-impl.tex b/vendors/move/crates/move-prover/doc/report/main-impl.tex
new file mode 100644
index 000000000..e3c621328
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/main-impl.tex
@@ -0,0 +1,69 @@
+\UseRawInputEncoding
+\documentclass[runningheads]{article}
+
+\sloppy
+
+\input{macros}
+
+\begin{document}
+
+\title{Towards Practical Formal Verification \\ of Smart Contracts \\
+  \small -- Technical Report -- \\
+  \textbf{DRAFT -- Implementation Only View}
+}
+
+
+\author{
+  David Dill \and Wolfgang Grieskamp \and Junkil
+  Park \and Shaz Qadeer \and Meng Xu \and Emma Zhong
+}
+
+
+\maketitle
+
+\tableofcontents
+
+
+
+
+%%% currently excluded
+%\input{intro.tex}
+%\input{move.tex}
+%%%
+
+\setcounter{section}{2}
+
+\Section{Move Prover Implementation}
+
+In this section, an overview of the Move Prover implementation will be provided.
+The formal content of the discussion is kept lightweight; a formalization of some
+aspects is given in appendices.
+
+\input{arch.tex}
+\input{references.tex}
+\input{injection.tex}
+\input{mono.tex}
+\input{translation.tex}
+
+%\Section{Application}
+%\TODO{wrwg}{\ldots}
+
+%\Section{Related Work}
+%\TODO{wrwg}{\ldots}
+
+%\Section{Conclusion}
+%\TODO{wrwg}{\ldots}
+
+
+
+
+\bibliographystyle{plain}
+\bibliography{biblio}
+
+\end{document}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/main.tex b/vendors/move/crates/move-prover/doc/report/main.tex
new file mode 100644
index 000000000..c6a24b1d6
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/main.tex
@@ -0,0 +1,63 @@
+\UseRawInputEncoding
+\documentclass[runningheads]{article}
+
+\sloppy
+
+\input{macros}
+
+\begin{document}
+
+\title{Towards Practical Formal Verification \\ of Smart Contracts \\
+  \small -- Technical Report -- \\
+  \textbf{DRAFT}
+}
+
+
+\author{
+  David Dill \and Wolfgang Grieskamp \and Junkil
+  Park \and Shaz Qadeer \and Meng Xu \and Emma Zhong
+}
+
+
+\maketitle
+
+\tableofcontents
+
+
+\input{intro.tex}
+\input{move.tex}
+
+\Section{Move Prover Implementation}
+
+In this section, an overview of the Move Prover implementation will be provided.
+The formal content of the discussion is kept lightweight; a formalization of some
+aspects is given in appendices.
+
+\input{arch.tex}
+\input{references.tex}
+\input{injection.tex}
+\input{mono.tex}
+\input{translation.tex}
+
+\Section{Application}
+\TODO{wrwg}{\ldots}
+
+\Section{Related Work}
+\TODO{wrwg}{\ldots}
+
+\Section{Conclusion}
+\TODO{wrwg}{\ldots}
+
+
+
+
+\bibliographystyle{plain}
+\bibliography{biblio}
+
+\end{document}
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/mono.tex b/vendors/move/crates/move-prover/doc/report/mono.tex
new file mode 100644
index 000000000..a858a9cee
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/mono.tex
@@ -0,0 +1,111 @@
+\SubSection{Monomorphization}
+\label{sec:Mono}
+
+Monomorphization is the process of removing all generic types from a Move
+program by \emph{specializing the program for all relevant type instantiations}.
+Like with genericity in most modern program languages, this is possible in Move
+because the number of instantiations is statically known for a given program
+fragment. For verification of Move, monomorphization greatly improves the
+performance of the backend solvers (see~\ref{sec:MonoBenchmarks}).
+
+
+\SubSubSection{Basic Monomorphization}
+
+\begin{Figure}
+\caption{Basic Monomorphization}
+\label{fig:Mono}
+\centering
+\begin{MoveBox}
+  struct S<T> { .. }
+  fun f<T>(x: T) { g<S<T>>(S(x)) }
+  fun g<S:key>(s: S) { move_to<S>(.., s) }
+  @\transform@
+  struct T{}
+  struct S_T{ .. }
+  fun f_T(x: T) { g_S_T(S_T(x)) }
+  fun g_S_T(s: S_T) { move_to<S_T>(.., s) }
+\end{MoveBox}
+\end{Figure}
+
+To verify a generic function, monomorphization skolemizes the type parameter
+into a given type. It then, for all functions which are inlined, inserts their
+code specializing it for the given type instantiation, including specialization
+of all used types. Fig.~\ref{fig:Mono} sketches this approach.
+
+The underlying conjecture is that if we verify |f_T|, we have also
+verified it for all possible instantiations. However, this statement is
+only correct for code which does not depend on runtime type information.
+
+\SubSubSection{Type Dependent Code}
+
+The type of genericity Move provides does not allow for full type erasure as
+often found in programming languages. That is because types are used to
+\emph{index} global memory (e.g. |global<S<T>>(addr)| where |T| is a generic
+type). Consider the following Move function:
+
+\begin{Move}
+  fun f<T>(..) { move_to<S<T>>(s, ..); move_to<S<u64>>(s, ..) }
+\end{Move}
+
+\noindent Depending on how |T| is instantiated, this function behaves
+differently.  Specifically, if |T| is instantiated with |u64| the function will
+always abort at the second |move_to|, since the target location is already
+occupied.
+
+The important property enabling monomorphization in the presence of type
+dependent code is that one can identify the situation by looking at the memory
+accessed by code and injected specifications. From this one can derive
+\emph{additional instantiations of the function} which need to be verified. For
+the example above, verifying both |f_T| and an instantiation |f_u64| will cover
+all relevant cases of the function behavior. Notice that this treatment of type
+dependent code is specific to the problem of verification, and cannot directly
+be applied to execution.
+
+The algorithm for computing the instances which require verification works as
+follows. Let |f<T1,..,Tn>| be a verified target function which has all
+specifications injected and inlined function calls expanded.
+\begin{itemize}
+\item Foreach memory |M in modify(f)|, if there is a memory~%
+  |M' in modify(f)+read(f)| such that |M| and |M'| can unify via |T1,..,Tn|,
+  collect an instaniation of the type parameters |Ti| from the resulting
+  substitution. This instantiation may not assign values to all type parameters,
+  and those unassigned parameters stay as is. For instance, |f<T1, T2>| might
+  have a partial instantiation |f<T1, u8>|.
+\item Once the set of all those partial instantiations is computed, it is
+  extended by unifying the instantiations against each other. If |<t>| and
+  |<t'>| are in the set, and they unify under the substitution |s|, then
+  |<s(t)>| will also be part of the set.  For example, consider |f<T1, T2>|
+  which modifies |M<T1>| and |R<T2>|, as well as accesses |M<u64>| and
+  |R<u8>|. From this the instantiations |<u64, T2>| and |<T1, u8>| are computed,
+  and the additional instantiation |<u64, u8>| will be added to the set.
+\item If after computing and extending instantiations any type parameters
+  remain, they are skolemized into a given type as described in the previous
+  section.
+\end{itemize}
+
+To understand the correctness of this procedure, consider the following arguments:
+
+\begin{itemize}
+\item \emph{Direct interaction} Whenever a modified memory |M<t>| can influence
+  the interpretation of |M<t'>|, a unifier must exist for the types |t| and |t'|,
+  and an instantiation will be verified which covers the overlap of |t| and
+  |t'|.
+\item \emph{Indirect interaction} If there is an overlap between two types
+  which influences whether another overlap is semantically relevant, the
+  combination of both overlaps will be verified via the extension step.
+\end{itemize}
+
+
+Notice that even though it is not common in regular Move code to work with both
+memory |S<T>| and, say, |S<u64>| in one function, there is a scenario where such
+code is implicitly created by injection of global invariants. Consider the
+example in Fig.~\ref{fig:Genericity}. The invariant |I1| which works on |S<u64>|
+is injected into the function |g<R>| which works on |S<R>|. When monomorphizing
+|g|, we need to verify an instance |g_u64| in order to ensure that |I1| holds.
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/move.tex b/vendors/move/crates/move-prover/doc/report/move.tex
new file mode 100644
index 000000000..1b857e963
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/move.tex
@@ -0,0 +1,311 @@
+\Section{Overview of Move}
+
+Move was developed for the Diem blockchain \cite{DIEM}, but its design is not
+specific to blockchains.  A Move execution consists of a sequence of updates
+evolving a \emph{global persistent memory state}, which we just call the
+\emph{(global) memory}.  Updates are executed in a \emph{transactional} style:
+the next memory state they compute will only be committed if their computation
+has finished successfully and the result can be merged back without conflict
+into the current memory state. Semantically, a Move execution can therefore be
+interpreted as a labelled transition system (i.e. interleaved execution
+steps). Any state evolving system which is adequately modeled by this semantics,
+not just blockchains, can be programmed in Move (for example, transactions on a
+concurrent data base, or training steps in an iterative ML algorithm).
+
+The Move language allows to define memory in terms of so-called
+\emph{resources}.  Resources are data structures which are stored in memory
+indexed by \emph{account addresses}. For example, the Move expression
+|exists<Balance>(account)| determines whether the resource |Balance| exists at
+address |account|. As resource types can be generic (for example,
+|Balance<Currency>|), an index for a resource is a tuple of types and the
+account address: semantically, for each resource type $R$ there is a partial
+memory function $\smem_R \in \sseq{\stype} \scross \saddr \sinto \swbot{R}$,
+with $\sseq{\stype}$ a sequence of types use to instantiate
+$R\sgen{\sseq{\stype}}$, and $\saddr$ the domain of addresses. Notice that
+account addresses are not just arbitrary values but have a specific role in
+Move's programming methodology related to access control via the builtin type of
+\emph{signers}, as will be discussed later.
+
+A Move application consists of a set of \emph{transaction scripts}. Each of
+those script defines a Move function with input parameters but no output
+parameters.  This function updates the memory $\smem$. The execution of this
+function can fail via a well-defined abort mechanism, in which case $\smem$
+stays unmodified. An environment emits a sequence of calls to such scripts,
+thereby evolving $\smem$. To understand this execution as an LTS, consider the
+set of states to be $\smem$, the labels the names of transaction scripts
+combined with a set of concrete parameters, and the transition relation defined
+by the transaction scripts. Abortion of the transaction function creates a label
+with the script name, the parameters, and information about the abort reason,
+which cycles on the current state.
+
+A transaction script is written in Move as an imperative function which can read
+and write the global memory $\smem$. Move uses a specific style of
+imperative programming based on \emph{borrow semantics} \cite{BORROW_SEM}, as
+popularized in the programming language Rust \cite{RUST,RUST_TYPES}. For the
+verification problem borrow semantics is very important.  While allowing
+references into structured data, those are guaranteed to be safe by the
+\emph{borrow checker} \cite{BORROW_CHECKER}, which is run during bytecode
+loading time, and which verification can assume. Furthermore, the notorious hard
+verification problem of aliasing of references in the presence of mutation is
+eliminated.  Mutation always starts from a root location either in global memory
+or on the execution stack, and while a tree starting from this root is mutated,
+no other access can happen anywhere in the tree. Intuitively, borrow semantics
+allows to move a mutation 'cursor' down the tree, which follows linear typing
+discipline. Because of this property, mutable reference parameters to functions
+can be converted to input/output parameters, and verification of Move can avoid
+the traditionally hard problems caused by aliasing of mutable references.
+
+
+\SubSection{Programming in Move}
+
+In Move, one defines transactions via so-called \emph{script
+  functions} which take a set of parameters.  Those functions can call other
+functions. Script and regular functions are encapsulated in \emph{modules}. Move
+modules are also the place where resource types and other structured data is
+defined.
+
+
+We illustrate the language by example (for a more complete description of Move,
+see the online documentation~\cite{MOVE_LANG_DEF}). The example is a simple
+account which holds a balance of coins and is given in
+Fig.~\ref{fig:AccountDef}. The transaction is to transfer coins from one to
+another account~\footnote{Indeed, for a complete system, transactions like
+  creating an account and funding it would be needed, but we leave this aspect
+  out here.}.
+
+
+\begin{figure}[t!]
+\caption{\label{fig:AccountDef} Account Example Program}
+\begin{MoveBox}
+module Account {
+  struct Coin has store {
+    value: u64
+  }
+  struct Account has key {
+    balance: Coin,
+  }
+
+  public fun withdraw(account: address, amount: u64): Coin
+  acquires Account {
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert(balance.value >= amount, Errors::limit_exceeded());
+    balance.value = balance.value - amount;
+    Coin{value: amount}
+  }
+
+  public fun deposit(account: address, check: Coin)
+  acquires Account {
+    let Coin{value: amount} = check; // Consume coin   @\label{line:DropCoin}@
+    let balance = &mut borrow_global_mut<Account>(account).balance;
+    assert(balance.value <= Limits::max_u64() - amount,
+           Errors::limit_exceeded());
+    balance.value = balance.value + amount;
+  }
+
+  public(script) fun transfer(from: &signer, to: address, amount: u64) {
+    let coin = Account::withdraw(Signer::address_of(from), amount);
+    Account::deposit(to, move(coin)) @\label{line:CoinMove}@
+  }
+}
+\end{MoveBox}
+\end{figure}
+
+
+\begin{itemize}
+\item The struct |Account::Coin| represents units of currency. The |has store|
+  ability of the |Coin| struct indicates that it can be stored as a field in
+  another struct. Notice that by default, in Move, structs have \emph{linear}
+  semantics: a |Coin| cannot be copied and dropped without explict destruction
+  (as on line~\ref{line:DropCoin}). This is useful to prevent accidental
+  duplication or lost of coins. To indicate that the struct can be copied and
+  dropped, one would need to add the abilities |has copy, drop|.
+\item |Coin| is aggregated in the struct |Account| for representing a
+  \emph{balance}; the ability |has key| indicates that this struct can be stored
+  as a resource in global memory.
+\item The |Account::withdraw| function subtracts a value from the balance,
+  returning a new |Coin| for the withdrawn amount.  It uses the builtin function
+  |borrow_global_mut<T>(address)| which returns a mutable reference to the
+  |Account| resource.  Similarily, |Account::deposit| takes a coin which is
+  destructed and its amount added to the account.
+\item The |acquire Account| modifier on a function declaration indicates that
+  the function will borrow the |Account| global memory as a whole -- i.e. for
+  every account address. The Move borrow checker will reject a call to such
+  functions if any account resources are already borrowed, implementing memory
+  safety for Move~\cite{BORROW_CHECKER}.
+\item The |assert| statement causes a Move transaction to abort execution if the
+  condition is not met, with the specified error code. No effects on the memory
+  occur on abort. Abortion can also happen implicitly; for example, the
+  expression |borrow_global_mut<T>(addr)| will abort if no resource |T| exists
+  at |addr|.
+\item The script |Account::transfer| is a top-level entry point into this Move
+  program, calling |Account::withdraw| and |Account::deposit|. The call to the
+  builtin function |move| at line~\ref{line:CoinMove} illustrates how the linear
+  coin value travels from one call to another.
+\item Scripts get passed in so called \emph{signers} which are tokens which
+  represent an authorized account address. The caller of the script -- an
+  external program -- has ensured that the owner of the signer account address has
+  agreed to execute this transaction.
+\end{itemize}
+
+\SubSection{Specifying in Move}
+
+The specification language supports {\em Design By Contract}
+\cite{DESIGN_BY_CONTRACT}. Developers can provide pre and post conditions for
+functions, which include conditions over (mutable) parameters and global
+memory. Developers can also provide invariants over data structures, as well as
+the (state-dependent) content of the global memory. Universal and
+existential quantification both over bounded domains (like the indices of a
+vector) as well of unbounded domains (like all memory addresses, all integers,
+etc.)  are supported. The latter makes the specification language very
+expressive, but also renders the verification problem in theory undecidable (and
+in practice dependent on heuristic decision procedures).
+
+\begin{figure}[t!]
+\caption{\label{fig:AccountSpec} Account Example Specification}
+\begin{MoveBox}
+module Account {
+  spec withdraw {
+    aborts_if bal(account) < amount;
+    ensures bal(account) == old(bal(account)) - amount;
+    ensures result == Coin{value: amount};
+    modifies global<Account>(acc); @\label{line:AccountModifies}@
+  }
+
+  spec deposit {
+    aborts_if bal(account) + check.value > Limits::max_u64();
+    ensures bal(account) == old(bal(account)) + check.value;
+    modifies global<Account>(acc);
+  }
+
+  spec fun bal(acc: address): num { @\label{line:BalDef}@
+    global<Account>(acc).balance.value
+  }
+
+  invariant forall acc: address where exists<Account>(acc): @\label{line:BalanceInvariant}@
+    bal(acc) >= AccountLimits::MIN_BALANCE;
+
+  invariant update forall acc: address where exists<Account>(acc): @\label{line:DecreaseInvariant}@
+    old(bal(acc)) - bal(acc) <= AccountLimits::MAX_DECREASE;
+}
+\end{MoveBox}
+\end{figure}
+
+Fig.~\ref{fig:AccountSpec} illustrates the specification language by extending
+the account example in Fig.~\ref{fig:AccountDef} (for the definition of the
+specification language see \cite{MOVE_SPEC_LANG_DEF}).
+\begin{itemize}
+\item The function specification blocks |spec withdraw| and |spec deposit|
+  specify when those functions abort, the expected effect on the global memory,
+  and its return value (the return value is represented by the well-known name
+  |result|).
+\item As common in this style of specifications, in the |ensures| statement, by
+  default the post-state of the function is referred to, whereas the form
+  |old(..)| can be used to access the pre-state.
+\item We are using the helper function |bal(address)| defined on
+  line~\ref{line:BalDef} to access the value of the account balance. Helper
+  functions can access state and can be transparently used within |old(..)|; the
+  function is then evaluated in the pre-state.
+\item The |modifies| statement on line~\ref{line:AccountModifies} specifies that
+  this function only changes the indicated memory but no other memory.
+\item The specification contains two invariants over global memory. The first
+  invariant on line~\ref{line:BalanceInvariant} states that a balance can never
+  drop underneath a certain minimum. The second invariant on
+  line~\ref{line:DecreaseInvariant} refers to an update of global memory with
+  pre and post state: the balance on an account can never decrease in one step
+  more than a certain amount.
+\item Note that while the Move programming language has only unsigned integers,
+  the specification language uses arbitrary precision signed integers, making it
+  convenient to specify something like |x - y <= limit|, without need to worry
+  about underflow or overflow.
+\end{itemize}
+
+A discerning reader may have noted that the program in Fig.~\ref{fig:AccountDef}
+does not actually satisfy the specification in Fig.~\ref{fig:AccountSpec}. This
+will be discussed in the next section.
+
+The constructs we have seen so far are only a subset of the available features
+of the Move specification language. Notably, the language supports the following
+additional features:
+
+\begin{itemize}
+\item Function preconditions via the |requires|-clause.
+\item Data invariants for |struct| types, as a predicate over the field values.
+\item Means to abstract commonly used specification fragments in so-called
+  \emph{specification schemas} which can then be included in other specification
+  blocks.
+\end{itemize}
+
+\SubSection{Running the Prover}
+\label{sec:RunningProver}
+
+The Move prover is a tool which supports verification of specifications as shown
+above. The prover operates fully automated, quite similar as a type checker or
+linter, and is expected to conclude in reasonable execution time, so it can be
+integrated in the regular development workflow.
+
+Running the prover on the program and specification of |module Account| produces
+multiple errors, as mentioned. The first is this one:
+
+\TODO{wrwg}{make line number symbolic so they align with figures}
+
+\begin{MoveDiag}
+error: abort not covered by any of the `aborts_if` clauses
+
+    --- account.move:15:3 ---
+    |
+ 15 |  public fun withdraw(account: address, amount: u64): Coin
+    .
+ 18 |         &mut borrow_global_mut<Account>(account).balance;
+    .              ----------------- abort happened here
+    |
+    =     at account.move:15:3: withdraw
+    =         account = 0x19, amount = 15724
+    =     at account.move:18:14: withdraw (ABORTED)
+\end{MoveDiag}
+
+\noindent The prover has detected that an implicit aborts condition is missing
+in the specification of the |withdraw| function. It prints the context of the
+error, as well as an \emph{execution trace} which lead to the error. Values of
+variable assignments from the counterexample found by the prover are printed
+together with the execution trace. Logically, the counter example presents an
+instance of assignments to variables such that program and specification
+disagree. In general, the Move prover attempts to produce diagnostics readable
+for Move developers without the need of understanding any internals of the
+prover.
+
+
+The next errors produced are about the memory invariants in
+Fig.~\ref{fig:AccountSpec}. Both of them do not hold:
+
+\begin{MoveDiag}
+error: global memory invariant does not hold
+
+    --- account.move:43:5 ---
+    |
+ 43 | invariant forall acc: address where exists<Account>(acc):
+ 44 |     bal(acc) >= AccountLimits::MIN_BALANCE;
+    |
+    .
+    =     at account.move:21:35: withdraw
+
+error: global memory invariant does not hold
+
+    --- account.move:45:5 ---
+    |
+ 45 | invariant update
+ 46 |   forall acc: address where exists<Account>(acc):
+ 47 |     old(bal(acc)) - bal(acc) <= AccountLimits::MAX_DECREASE;
+    .
+    =     at account.move:21:35: withdraw
+\end{MoveDiag}
+
+\noindent This happens because in the program in Fig.~\ref{fig:AccountDef}, we
+did not made any attempt to respect the limits in |MIN_BALANCE| and
+|MAX_DECREASE|. We leave it open here how to fix this problem, which would
+require to add some more |assert| statements to the code and abort if the limits
+are not met.
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/references.tex b/vendors/move/crates/move-prover/doc/report/references.tex
new file mode 100644
index 000000000..89ef5ee82
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/references.tex
@@ -0,0 +1,197 @@
+\SubSection{Reference Elimination}
+\label{sec:RefElim}
+
+The Move language supports references to data stored in global memory and on the
+stack. Those references can point to interior parts of the data. The reference
+system is based on \emph{borrow semantics} \cite{BORROW_SEM} as it is also found
+in the Rust programming language.  One can create (immutable) references |&x|
+and mutable references |&mut x|, and derive new references by field selection
+(|&mut x.f| and |&x.f|). The borrow semantics of Move provides the following
+guarantees (ensured by the borrow checker~\cite{BORROW_CHECKER}):
+
+\begin{itemize}
+\item For any given location in global memory or on the stack, there can be
+  either exactly one mutable reference, or $n$ immutable references. Hereby,
+  it does not matter to what interior part of the data is referred to.
+\item Dangling references to locations on the stack cannot exist; that is, the
+  lifetime of references to data on the stack is restricted to the lifetime of the
+  stack location.
+\end{itemize}
+
+\noindent These properties enable us to \emph{effectively eliminate} references from the Move
+program, reducing the verification complexity significantly, as we do not need to
+reason about sharing. It comes as no surprise that the same discipline of borrowing
+which makes Move (and Rust) programs safer by design also makes verification simpler.
+
+\SubSubSection{Immutable References}
+
+Since during the existance of an immutable reference no mutation on the
+referenced data can occur, we can simply replace references by the referred
+value.
+
+An example of the applied transformation is shown below. We remove the reference
+type constructor and all reference-taking operations from the code:
+
+\begin{Move}
+  fun select_f(s: &S): &T { &s.f } @\transform@ fun select_f(s: S): T { s.f }
+\end{Move}
+
+
+\noindent Notice that at Move execution time, immutable references serve
+performance objectives (avoid copies); however, the symbolic reasoning engines
+we use have a different representation of values, in which structure sharing is
+common and copying is cheap.
+
+\SubSubSection{Mutable References}
+
+Each mutation of a location |l| starts with an initial borrow for the whole data
+stored in this location (in Move, |borrow_global_mut<T>(addr)| for global
+memory, and |&mut x| for a local on the stack). Let's call the reference
+resulting from such a borrow |r|. As long as this reference is alive, Move code
+can either update its value (|*r = v|), or replace it with a sub-reference~%
+(|r' = &mut r.f|). The mutation ends when |r| (or the derived |r'|) go out of
+scope.  Because of the guarantees of the borrow semantics, during the mutation
+of the data in |l| no other reference can exist into data in |l|.
+
+The fact that |&mut| has exclusive access to the whole value in a location
+allows to reduce mutable references to a \emph{read-update-write} cycle. One can
+create a copy of the data in |l| and single-thread it to a sequence of
+mutation steps which are represented as purely functional data updates.  Once
+the last reference for the data in |l| goes out of scope, the updated value is
+written back to |l|. This effectively turns an imperative program with references
+into an imperative program which only has state updates on global memory or
+variables on the stack, a class of programs which is known to have a significantly
+simpler semantics. We illustrate the basics of this approach by an example:
+
+\begin{Move}
+  fun increment(x: &mut u64) { *x = *x + 1 }
+  fun increment_field(s: &mut S) { increment(&mut s.f) }
+  fun caller(): S { let s = S{f:0}; update(&mut s); s }
+  @\transform@
+  fun increment(x: u64): u64 { x + 1 }
+  fun increment_field(s: S): S { s[f = increment(s.f)] }
+  fun caller(): S { let s = S{f:0}; s = update(s); s }
+\end{Move}
+
+While the setup in this example covers a majority of the use cases in every day
+Move code, there are more complex ones to consider, namely that the value of a
+reference depends on runtime decisions:
+
+\begin{Move}
+  let r = if (p) &mut s1 else &mut s2;
+  increment_field(r);
+\end{Move}
+
+%% Dave comment: It may be a bit confusing to talk about runtime information when we're talking
+%%  about a static prover?  Maybe we need to make clear that this is runtime information
+%%  in the Boogie model?  I'm not sure how to write it.
+
+\noindent Additional runtime information is required to deal with such cases. At
+the execution point a reference goes out of scope, we need to know from which
+location it was derived, so we can write back the updated value
+correctly. Fig.~\ref{fig:MutElim} illustrates the approach for doing this. A new
+Move prover internal type |Mut<T>| is introduced which carries the location from
+which |T| was derived together with the value. It supports the following
+operations:
+
+\begin{itemize}
+\item |Mvp::mklocal(value, LOCAL_ID)| creates a new mutation value for a local
+  with the given local id.  Local ids are transformation generated constants
+  kept opaque here.
+\item Similarily, |Mvp::mkglobal(value, TYPE_ID, addr)| creates a new
+  mutation for a global with given type and address. Notice that in the
+    current Move type system, we would not need to represent the address, since
+    there can be only one mutable reference into the entire type (via the
+    acquires mechanism). However, we keep this more general here, as the Move
+    type system might change.
+\item With |r' = Mvp::field(r, FIELD_ID)| a mutation value for a subreference is
+  created for the identified field.
+\item The value of a mutation is replaced with |r' = Mvp::set(r, v)| and
+  retrieved with |v = Mvp::get(r)|.
+\item With the predicate |Mvp::is_local(r, LOCAL_ID)| one can test whether |r|
+  was derived from the given local, and with |Mvp::is_global(r, TYPE_ID, addr)|
+  whether it was derived from the specified global. The predicate
+  |Mvp::is_field(r, FIELD_ID)| tests whether it is derived from the given field.
+\end{itemize}
+
+\begin{figure}[t!]
+  \label{fig:MutElim}
+  \caption{Elimination of Mutable References}
+  \centering
+\begin{MoveBox}
+  fun increment(x: &mut u64) { *x = *x + 1 }
+  fun increment_field(s: &mut S) {
+    let r = if (s.f > 0) &mut s.f else &mut s.g;
+    increment(r)
+  }
+  fun caller(p: bool): (S, S) {
+    let s1 = S{f:0, g:0}; let s2 = S{f:1, g:1};
+    let r = if (p) &mut s1 else &mut s2;
+    increment_field(r);
+    (s1, s2)
+  }
+  @\transform@
+  fun increment(x: Mut<u64>): Mut<u64> { Mvp::set(x, Mvp::get(x) + 1) }
+  fun increment_field(s: Mut<S>): Mut<S> {
+    let r = if (s.f > 0) Mvp::field(s.f, S_F) else Mvp::field(s.g, S_G);
+    r = increment(r);
+    if (Mvp::is_field(r, S_F))
+      s = Mvp::set(s, Mvp::get(s)[f = Mvp::get(r)]);
+    if (Mvp::is_field(r, S_G))
+      s = Mvp::set(s, Mvp::get(s)[g = Mvp::get(r)]);
+    s
+  }
+  fun caller(p: bool): S {
+    let s1 = S{f:0, g:0}; let s2 = S{f:1, g:1};
+    let r = if (p) Mvp::mklocal(s1, CALLER_s1)
+            else Mvp::mklocal(s2, CALLER_s2);
+    r = increment_field(r);
+    if (Mvp::is_local(r, CALLER_s1))
+      s1 = Mvp::get(r); @\label{line:WriteBack}@
+    if (Mvp::is_local(r, CALLER_s2))
+      s2 = Mvp::get(r);
+    (s1, s2)
+  }
+\end{MoveBox}
+\end{figure}
+
+\Paragraph{Implementation} The Move Prover has a partial implementation of the
+illustrated transformation.  The completeness of this implementation has not yet
+been formally investigated, but we believe that it covers all of Move, with the
+language's simplification that we do not need to distinguish addresses in global
+memory locations.\footnote{\TODO{wrwg}{Need to investigate loops!}} (See
+discussion of |Mvp::mkglobal| above.) The transformation also relies on that in
+Move there are no recursive data types, so field selection paths are statically
+known. While those things can be potentially generalized, we have not yet
+investigated this direction.
+
+The transformation constructs a \emph{borrow graph} from the program via a data
+flow analysis. The borrow graph tracks both when references are released as well
+as how they relate to each other: e.g. |r' = &mut r.f| creates a edge from |r|
+to |r'| labelled with |f|, and |r' = &mut r.g| creates another also starting
+from |r|. For the matter of this problem, a reference is not released until a
+direct or indirect borrow on it goes out of scope; notice that its lifetimes in
+terms of borrowing is larger than the scope of its usage. The borrow analysis is
+\emph{inter-procedural} requiring computed summaries for the borrow graph of
+called functions.
+
+The resulting borrow graph is then used to guide the transformation, inserting
+the operations of the |Mut<T>| type as illustrated in
+Fig~\ref{fig:MutElim}. Specifically, when the borrow on a reference ends, the
+associated mutation value must be written back to its parent mutation or the
+original location (e.g. line~\ref{line:WriteBack} in
+Fig.~\ref{fig:MutElim}). The presence of multiple possible origins leads to case
+distinctions via |Mvp::is_X| predicates; however, these cases are rare in actual
+Move programs.
+
+\paragraph{Performance}
+
+\TODO{wrwg}{We may want to identify some historical benchmarks before
+  memory model.}
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/report/translation.tex b/vendors/move/crates/move-prover/doc/report/translation.tex
new file mode 100644
index 000000000..267acf0ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/report/translation.tex
@@ -0,0 +1,15 @@
+\SubSection{Translation to Boogie and Z3}
+
+
+\SubSubSection{Vectors and Extensionality}
+\SubSubSection{Encoding}
+\SubSubSection{Butterflies}
+
+
+
+
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/vendors/move/crates/move-prover/doc/user/docgen.md b/vendors/move/crates/move-prover/doc/user/docgen.md
new file mode 100644
index 000000000..337849e94
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/user/docgen.md
@@ -0,0 +1,195 @@
+
+# Documentation Generator
+
+This is the description of the documentation generator which is part of the Move prover project.
+
+The generator provides a simple documentation generator for Move including Move specifications. The documentation
+generator is embedded in the Move Prover. This is not only for technical reasons but also because eventually,
+we want to use the Prover to derive information for docs using formal reasoning, as well as mark verification
+results in the generated docs.
+
+## Calling the Generator
+
+The generator is called from within the Diem tree as such:
+
+```shell script
+> cargo run -p move-prover -- --docgen <flags> .. <sources>
+```
+
+... where most commonly used flags are:
+
+-  `-d=<path>`: search path for Move dependencies. For Move compilation.
+-  `--doc-path=<path>`: search path for already generated documentation of Move code; for cross-references.
+-  `--doc-spec-inline=true|false`: whether specs should be included together with function declarations or in
+    a separate section at the end of the document. Default is true.
+-  `--doc-include-impl=true|false`: whether function implementation bodies shall be included. Default is true.
+-  `--doc-include-private=true|false`: whether private functions shall be included. Default is false.
+-  `--output=<path>`: file where to store generated markdown.
+
+For full command line help, use `cargo run -p move-prover -- --help`.
+
+## Guide for Documentation Writers
+
+### Documentation Comments
+
+Documentation comments in the Move source start either with `///` or `/**`. Like in many similar other tools,
+documentation comments must be placed before the item being documented. Currently, the following items in the
+Move source can have documentation comments:
+
+-  Modules
+-  Structs
+-  Struct fields
+-  Functions
+-  Spec blocks
+-  Individual spec block members
+
+A series of comments in front of one item is collapsed into on documentation block. For example, the following
+fragments are all equivalent and associate documentation with function `f`:
+
+```move
+struct T {}
+/// This is a documentation comment for `f`.
+
+/// This is another documentation comment for `f`.
+fun f() { ... }
+```
+
+```move
+struct T {}
+/// This is a documentation comment for `f`.
+/// This is another documentation comment for `f`.
+fun f() { ... }
+```
+
+```move
+struct T {}
+/// This is a documentation comment for `f`.
+/** This is another documentation comment for `f`. */
+fun f() { ... }
+```
+
+```move
+struct T {}
+/**
+This is a documentation comment for `f`.
+This is another documentation comment for `f`.
+*/
+fun f() { ... }
+```
+
+### Markdown in Comments
+
+Documentation comments can use arbitrary markdown (we recommend to use a Markdown flavor which is compatible with
+Github). One can also use section headers in documentation comments; those headers are placed one level underneath
+the context in which they are included in the overall doc. For example:
+
+```move
+/// This is the Diem account module
+///
+/// # Overview
+///
+/// This module does fancy things!
+///
+/// # Details
+///
+/// The following details need to be considered:
+/// ...
+module DiemAccount {
+   ...
+}
+```
+
+If the module documentation is included in a larger context, the section tags will be adjusted in the generated
+doc:
+
+```move
+# Module `0x1::DiemAccount`
+
+This is the Diem account module.
+
+## Overview
+...
+
+## Details
+...
+```
+
+### Code Decoration
+
+Code (either in single back-quotes inline of the markdown text, or code which is produced by the generator itself) is
+decorated as follows:
+
+-  Keywords are highlighted. Note since specifically the Move spec language has a number of "weak" keywords (identifiers
+   which play a special role in a particular syntactic context but are not reserved), highlighting may have some false
+   positives, as the generator does not analyze the syntax right now.
+
+-  Identifiers are attempted to resolve against the documented code and on success, hyperlinked to the declaration.
+   For example, within the `DiemAccount` module, all occurences of `T`, `Self::T`, `DiemAccount::T`, and
+   `0x1::DiemAccount:T` will resolve into a link to the declaration. This resolution is heuristic and may have
+   positive and negative false positives. Specifically, it currently does not consider aliases and use-declarations.
+
+   If you use a simple name in code comments. like `foo`, it will not resolve against a function `foo` in the current
+   module unless it is either followed by `(` or `<`. This to avoid false positives of matching functions. You can
+   use `foo()` or `Self::foo` instead.
+
+### Organization of Specification Blocks
+
+Specification blocks can be placed anywhere in the Move source, which creates a certain challenge to place them
+in the appropriate place in the documentation. This specifically applies to schema and module spec blocks, which
+have no specified target like a function or struct spec block.
+
+The documentation generator associates all schema and module spec blocks with any **preceding** function or struct
+spec block, or, if no previous one exists, with the module. Example:
+
+```move
+module M {
+    spec module {
+        // Associated with the module.
+    }
+    spec schema Some {
+        // Associated with module.
+    }
+    struct S { .. }
+    spec schema Other {
+        // Gotcha! Still associated with module, as there is no struct spec block before.
+    }
+    spec S {
+        // Associated with S because of named spec block target. Notice that this can be in fact anywhere in
+        // the file (before declaration of S, at the end of the file, etc.).
+    }
+    spec schema YetAnother {
+        // Associated with S because of preceding spec block.
+    }
+    spec module {
+        // Associated with S because of preceding spec block.
+    }
+    fun f() { ... }
+    spec schema FAbortsIf {
+        // Gotcha! The last explicitly targeted spec block was for S, not for f, so this will go with S.
+    }
+    spec f {
+        // Associated with f because of named spec block target.
+    }
+    spec schema FEnsures {
+        // Associated with f because of preceding spec block.
+    }
+}
+```
+
+Notice that one can enforce an association of subsequent spec block to the module level by introducing a dummy, empty
+`spec module` block. Because such blocks don't declare properties, they do not appear in the generated docs:
+
+```move
+module M {
+    fun f(): T { ... }
+    spec f {
+       aborts_if f_aborts();
+       ensures result == f_result();
+    }
+    // This goes with the documentation of function f
+    spec fun f_aborts() { .. }
+    spec module {}
+    // This goes with the documentation of the module
+    spec fun f_result(): T { .. }
+}
+```
diff --git a/vendors/move/crates/move-prover/doc/user/install.md b/vendors/move/crates/move-prover/doc/user/install.md
new file mode 100644
index 000000000..2a1b721aa
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/user/install.md
@@ -0,0 +1,41 @@
+# Installation Steps
+
+If you have used one of the older installation methods for the prover tools, read the next section first, then
+continue here.
+
+If you already have a Diem development environment running, and just want to add prover tools,
+run (in the Diem root directory):
+
+```shell script
+./scripts/dev_setup.sh -yp
+. ~/.profile
+```
+
+This command should work on MacOS and Linux flavors like Ubuntu or CentOS. (Windows is currently not supported).
+
+Notice that you have to include environment variable definitions in `~/.profile` into your shell. Depending on your
+setup, the  `~/.profile` may be already automatically loaded for each login shell, or it may not. If not, you may
+need to add `. ~/.profile` to your `~/.bash_profile` or other shell configuration manually.
+
+The `dev-setup.sh` command can be used to set up other parts of the Diem tool chain; use `-h` for more information.
+Specifically, if you have a fresh Diem enlistment and machine, you can use the following to install basic build
+tools like Rust together with prover tools:
+
+```shell script
+./scripts/dev_setup.sh -typ
+. ~/.profile
+```
+
+
+# Older Installations
+
+Older installation methods of the prover tools stored z3, dotnet, and boogie at `/usr/local/bin` and
+`/usr/local/share/dotnet`, which required root access. The new method described above stores all needed
+tools in the user's `$HOME` directory. This is the preferred way since it avoids messing with root access.
+
+If you still have the tools at the public location, and/or have a custom installation of .Net, you may want
+to consider to remove those to avoid any version mismatch, specifically if you plan on calling `boogie` and `z3`
+directly from the command line.
+
+Also **remove any definitions of environment variables `Z3_EXE` and `BOOGIE_EXE`** from your `.bashrc` or elsewhere.
+The correct variable definitions have been automatically added to your `.profile` when calling `dev-setup.sh`.
diff --git a/vendors/move/crates/move-prover/doc/user/prover-guide.md b/vendors/move/crates/move-prover/doc/user/prover-guide.md
new file mode 100644
index 000000000..250fa9fab
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/user/prover-guide.md
@@ -0,0 +1,259 @@
+# Move Prover User Guide
+
+This is the user guide for the Move prover. This document does not describe the
+[Move specification language](spec-lang.md), but accompanies it.
+
+- [Running the Prover](#running-the-prover)
+    - [Target Filtering](#target-filtering)
+    - [Prover Options](#prover-options)
+    - [Prover Configuration File](#prover-configuration-file)
+    - [Prover Tests](#prover-tests)
+- [Prover Diagnosis](#prover-diagnosis)
+    - [Unexpected Abort](#unexpected-abort)
+    - [Postcondition Failure](#postcondition-failure)
+- [Debugging the Prover](#debugging-the-prover)
+
+## Running the Prover
+
+The prover is invoked via the Move CLI. When working in a repo which contains the CLI, you can make it available via an
+alias as below:
+
+```shell script
+alias move="cargo run --release --quiet --package move-cli --"
+```
+
+> NOTE: The `--release` flag can also be omitted if you prefer faster compilation over faster execution. Note, however,
+> that the Rust code part of the prover (and the underlying Move compiler) is by an order of magnitude faster
+> in release mode than in debug mode.
+
+We assume in the sequel that the Move CLI is reachable from the command line via the `move` command
+(defined by an alias as above or by other means).
+
+In order to call the CLI, you must have a [*move *](https://move-language.github.io/move/packages.html). In the simplest
+case, a Move package is defined by a directory with a set of `.move` files in it and a manifest of the name `Move.toml`.
+You can create a package `<name>` in a sub-directory by calling `move new <name>`.
+
+Now, to call the prover simply use one of the following commands:
+
+```shell script
+move -p <path> prove  # Prove the sources of the package at <path>
+move prove            # Equivalent to `move -p . prove`
+```
+
+### Target Filtering
+
+By default, the `prove` command verifies all files of a package. During iterative development of larger packages, it is
+often more effective to focus verification on particular files. You do this with the
+`-t` (`--target`) option:
+
+```shell script
+move prove -t DiemConfig
+```
+
+In general, if the string provided via the `-t` option is contained somewhere in the file name of a source, that source
+will be included for verification.
+
+> NOTE: the Move prover ensures that there is no semantic difference between verifying modules one-by-one
+> or all at once. However, if your goal is to verify all modules, verifying them in a single
+> `move prove` run will be significantly faster then sequentially.
+
+### Prover Options
+
+The prover has a number of options which are not directly handled by the CLI but rather passed through. You pass options
+through with an invocation like `move prove -- <options>`. The most commonly used option is the `-t` (`--trace`)
+option which lets the prover produce richer diagnosis when it encounters errors:
+
+```shell script
+move prove -t DiemConfig -- -t
+```
+
+To see the list of all command line options, use `move prove -- --help`.
+
+### Prover Configuration File
+
+You can also create a prover configuration file, named `Prover.toml` which lives side-by-side with the `Move.toml`
+file. For example, to enable tracing by default for a package, you use a `Prover.toml` with the following content:
+- [Move Specification Language](#move-specification-language)
+
+```toml
+[prover]
+auto_trace_level = "VerifiedFunction"
+```
+
+The most commonly used options are documented by the example toml below, which you can cut and paste and adopt for your
+needs (the displayed values are the defaults):
+
+```toml
+# Verbosity level
+# Possible values: "ERROR", "WARN", "INFO", "DEBUG". Each level subsumes the output of the previous one.
+verbosity_level = "INFO"
+
+[prover]
+# Set auto-tracing level, which enhances the diagnosis the prover produces on verification errors.
+# Possible values: "Off", "VerifiedFunction", "AllFunctions"
+auto_trace_level = "Off"
+
+# Minimal severity level for diagnosis to be reported.
+# Possible values: "Error", "Warning", "Note"
+report_severity = "Warning"
+
+[backend]
+# Timeout in seconds for the solver backend. Note that this is a soft timeout and may not always
+# be respected.
+vc_timeout = 40
+
+# Random seed for the solver backend. Different seeds can result in different verification run times,
+# as the solver uses heuristics.
+random_seed = 1
+
+# The number of processors cores to assume for concurrent check of verification conditions.
+proc_cores = 4
+```
+
+> HINT: for local verification, you may want to set proc_cores to an aggressive number
+> (your actual cores) to speed up the turn-around cycle.
+
+> NOTE: To let the prover dump all the available toml options, use `move prove -- --print-config`. This
+> will, however, contain many more unrelated and potentially defunct experimental options.
+
+## Prover Tests
+
+The prover can be run from a Rust testsuite, for example to use verification as a submit blocker. To do so, add a Rust
+file to the Rust testsuite (e.g. `<crate>/tests/move_verification_test.rs`). Assume the Rust crate contains two Move
+packages at relative paths, from the crate root,`foo` and `bar`, then your Rust source would contain:
+
+```rust
+use move_cli::package::prover::ProverTest;
+
+#[test]
+fn prove_foo() {
+    ProverTest::create("foo").run()
+}
+
+#[test]
+fn prove_bar() {
+    ProverTest::create("bar").run()
+}
+```
+
+There are multiple ways how you can configure tests, for example, setting specific options for the prover to use. See
+the `ProverTest` type for details.
+
+## Prover Diagnosis
+
+When the prover finds a verification error it prints out diagnosis in a style similar to a compiler or a debugger. We
+explain the different types of diagnoses below, based on the following evolving example:
+
+```move
+module M {
+    resource struct Counter {
+        value: u8,
+    }
+
+    public fun increment(a: address) acquires Counter {
+        let r = borrow_global_mut<Counter>(a);
+        r.value = r.value + 1;
+    }
+
+    spec increment {
+        aborts_if aborts_if !exists<Counter>(a);
+        ensures global<Counter>(a).value == old(global<Counter>(a)).value + 1;
+    }
+}
+```
+
+We will modify this example as we demonstrate different types of diagnoses.
+
+### Unexpected Abort
+
+If we run the Move prover on the above example, we get the following error:
+
+```
+error: abort not covered by any of the `aborts_if` clauses
+
+   ┌── tutorial.move:6:3 ───
+   │
+ 6 │ ╭   public fun increment(a: address) acquires Counter {
+ 7 │ │       let r = borrow_global_mut<Counter>(a);
+ 8 │ │       r.value = r.value + 1;
+ 9 │ │   }
+   │ ╰───^
+   ·
+ 8 │       r.value = r.value + 1;
+   │                         - abort happened here
+   │
+   =     at tutorial.move:6:3: increment (entry)
+   =     at tutorial.move:7:15: increment
+   =         a = 0x5,
+   =         r = &M.Counter{value = 255u8}
+   =     at tutorial.move:8:17: increment (ABORTED)
+```
+
+The prover has generated a counter example which leads to an overflow when adding 1 the value of 255 for an `u8`. This
+happens if the function specification states something abort behavior, but the condition under which the function
+is aborting is not covered by the specification. And in fact, with `aborts_if !exists<Counter>(a)` we only cover the
+abort if the resource does not exists, but not the overflow.
+
+Let's fix the above and add the following condition:
+
+```move
+spec increment {
+    aborts_if global<Counter>(a).value == 255;
+}
+```
+
+With this, the prover will succeed without any errors.
+
+### Postcondition Failure
+
+Let us inject an error into the `ensures` condition of the above example:
+
+```move
+spec increment {
+    ensures global<Counter>(a).value == /*old*/(global<Counter>(a).value) + 1;
+}
+```
+
+With this, the prover will produce the following diagnosis:
+
+```
+error:  A postcondition might not hold on this return path.
+
+    ┌── tutorial.move:14:7 ───
+    │
+ 14 │       ensures global<Counter>(a).value == global<Counter>(a).value + 1;
+    │       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tutorial.move:6:3: increment (entry)
+    =     at tutorial.move:7:15: increment
+    =         a = 0x5,
+    =         r = &M.Counter{value = 50u8}
+    =     at tutorial.move:8:17: increment
+    =         r = &M.Counter{value = 50u8}
+    =     at tutorial.move:6:3: increment
+    =     at tutorial.move:6:3: increment (exit)
+```
+
+While we know what the error is (we just injected it), looking at the printed information makes it not particular
+obvious. This is because we don't directly see on which values the `ensures` condition was actually evaluated. To see
+this, use the `-t` (`--trace`) option; this is not enabled by default because it makes the verification problem slightly
+harder for the solver.
+
+Instead or in addition to the `--trace` option, one can also use the builtin function `TRACE(exp)` in conditions to
+explicitly mark expressions whose value should be printed on verification failures.
+
+> NOTE: expressions which depend on quantified symbols cannot be traced. Also, expressions appearing in
+> specification functions can currently not be traced.
+
+## Debugging the Prover
+
+The Move prover is an evolving tool with bugs and deficiencies. Sometimes it might be necessary to debug a problem based
+on the output it passes to the underlying backends. There are the following options to this end:
+
+- If you prove the option `-k` (`--keep`), the prover will place the generated Boogie code in a file `output.bpl`, and
+  the errors Boogie reported in a file `output.bpl.log`.
+- If you prove the option `--dump-bytecode`, the prover will dump the original Move bytecode as well as the Prover
+  bytecode as it is transformed during compilation.
+- With the option `-C backend.generate_smt=true` the prover will generate, for each verification problem, a file in the
+  smtlib format. The file is named after the verified function. This file contains the output Boogie passes on to Z3 or
+  other connected SMT solvers.
diff --git a/vendors/move/crates/move-prover/doc/user/spec-lang.md b/vendors/move/crates/move-prover/doc/user/spec-lang.md
new file mode 100644
index 000000000..8a90c1579
--- /dev/null
+++ b/vendors/move/crates/move-prover/doc/user/spec-lang.md
@@ -0,0 +1,1432 @@
+[PROVER]: prover-guide.md
+
+[PROVER_USAGE]: prover-guide.md
+
+[PRE_POST_REFERENCE]: https://en.wikipedia.org/wiki/Design_by_contract
+
+# Move Specification Language
+
+**version 1.4**
+
+This document describes the *Move specification language*, a subset of the Move language which
+supports specification of the behavior of Move programs. Throughout this document, we abbreviate
+this subset of Move
+*MSL*.
+
+MSL plays together with the [Move Prover][PROVER], a tool which can statically verify the
+correctness of MSL specifications against Move programs. In contrast to traditional testing,
+verification of MSL is exhaustive and holds for all possible inputs and global states of a Move
+module or transaction script. At the same time, it is fast and automated enough that it can be used
+at a similar place in the developer workflow where tests are (for example, for qualification of pull
+requests in continuous integration).
+
+While the Move programming language at this point is stable, the subset represented by MSL should be
+considered evolving. This has no impact on platform stability, since MSL is not running in
+production, but is used for offline quality assurance, where it is continuously improved for
+evolving objectives.
+
+This document describes the language only; see [here][PROVER_USAGE] for how to use the Move prover
+tool. The reader is expected to have basic knowledge of the Move language, as well as basic
+principles of pre/post condition specifications
+(see e.g. [this article][PRE_POST_REFERENCE]). For examples of specifications, we refer to
+the [Diem framework documentation][FRAMEWORK] which has specifications embedded.
+
+---
+
+- [Expressions](#expressions)
+    - [Type System](#type-system)
+    - [Naming](#naming)
+    - [Operators](#operators)
+    - [Function Calls](#function-calls)
+    - [Statements](#statements)
+    - [Pack and Unpack](#pack-and-unpack)
+    - [Quantifiers](#quantifiers)
+    - [Choice Operator](#choice-operator)
+    - [Builtin Functions](#builtin-functions)
+    - [Partial Semantics](#partial-semantics)
+- [Specifications](#specifications)
+    - [Separating Specifications](#separating-specifications)
+    - [Pragmas and Properties](#pragmas-and-properties)
+        - [Pragma Inheritance](#pragma-inheritance)
+        - [General Pragmas and Properties](#general-pragmas-and-properties)
+    - [Pre and Post State](#pre-and-post-state)
+    - [Helper Functions](#helper-functions)
+        - [Uninterpreted Functions](#uninterpreted-functions)
+        - [Axioms](#axioms)
+    - [Let Bindings](#let-bindings)
+        - [Aborts-If Condition](#aborts-if-condition)
+            - [Aborts-If Condition With Code](#aborts-if-condition-with-code)
+        - [Aborts-With Condition](#aborts-with-condition)
+        - [Requires Condition](#requires-condition)
+        - [Ensures Condition](#ensures-condition)
+        - [Modifies Condition](#modifies-condition)
+        - [Invariant Condition](#invariant-condition)
+            - [Function Invariants](#function-invariants)
+            - [Struct Invariants](#struct-invariants)
+            - [Global Invariants](#global-invariants)
+                - [Disabling Invariants](#disabling-invariants)
+                - [Update Invariants](#update-invariants)
+                - [Isolated Global Invariants](#isolated-global-invariants)
+                - [Modular Verification and Global Invariants](#modular-verification-and-global-invariants)
+        - [Assume and Assert Conditions in Code](#assume-and-assert-conditions-in-code)
+            - [Loop Invariants](#loop-invariants)
+            - [Referring to Pre State](#referring-to-pre-state)
+        - [Specification Variables](#specification-variables)
+        - [Schemas](#schemas)
+            - [Basic Schema Usage](#basic-schema-usage)
+            - [Schema Expressions](#schema-expressions)
+            - [Schema Apply Operation](#schema-apply-operation)
+        - [Opaque Specifications](#opaque-specifications)
+        - [Abstract Specifications](#abstract-specifications)
+        - [Documentation Generation](#documentation-generation)
+- [Expressiveness](#expressiveness)
+
+---
+
+# Expressions
+
+Expressions in MSL are a subset of Move program expressions plus a set of additional constructs, as
+discussed in the following sections.
+
+## Type System
+
+The type system of MSL is similar to that of Move, with the following differences:
+
+- There are two types of encodings for integer types: `num` and `bv` (bit vector).
+  If an integer (either a constant or a variable) does not involve in any bitwise operations directly or indirectly,
+  regardless of its type in Move (`u8`, `u16`, `u32`, `u64`, `u128` and `u256`), it is treated as the same type. In
+  specifications, this type is called `num`, which is an arbitrary precision *signed* integer type.
+  When MSL refers to a Move name which represents an `u8` or such, it will be automatically widened
+  to `num`. This allows writing MSL expressions like `x + 1 <= MAX_U128` or `x - y >= 0` without
+  needing to worry about overflow or underflow.
+  Different from `num`, `bv` cannot and does not need to be explicitly used in specifications: if an integer involves in bitwise operations such as `&`, `|` or `^`, it will be automatically encoded as `bv`at the backend.
+  Moreover, a `bv` integer has a fixed precision, which is consistent with its precision in Move (`bv8`, `bv16`, `bv32`, `bv64`, `bv128` and `bv256`).
+  Note that, in general using `bv` is not so efficient as `num` in the SMT solver. Consequently,
+  the prover has some restrictions when using bitwise operations, which will stated in detail below.
+- The Move types `&T`, `&mut T`, and `T` are considered equivalent for MSL. Equality is interpreted
+  as value equality. There is no need to worry about dereferencing a reference from the Move
+  program: these are automatically dereferenced as needed. This simplification is possible because
+  MSL cannot modify values from a Move program and the program cannot directly reason about
+  reference equality (which eliminates the need for doing so in MSL). (Note there is also a
+  restriction in expressiveness coming with this, namely
+  for [functions which return `&mut T`](#expressiveness), however, this is rarely hit in practice,
+  and there are workarounds.)
+- There is the additional type `type` which is the type of all types. It can only be used in
+  quantifiers.
+- There is the additional type `range` which represents an integer range (and the notation `n..m` to
+  denote a value).
+
+## Naming
+
+Name resolution works similar to the Move language. `use` declarations can introduce aliases for
+imported names. MSL functions and variable names must start with a lower case letter. Schema names
+are treated like types and must start with a capital letter (schemas are a new named construct
+discussed [later](#schemas)).
+
+Move functions, MSL functions, Move types, and schemas all share the same namespace, and are
+therefore unambiguous if aliased via a Move `use` clause. Because of the common name space, an MSL
+function cannot have the same name than a Move function. This is often handled via the convention to
+prefix MSL function as in
+`spec_has_access` when the related Move function is called `has_access`.
+
+## Operators
+
+All Move operators are supported in MSL, except `&`, `&mut`, and `*` (dereference).
+
+In addition to the existing operators, vector subscript `v[i]`, slicing `v[i..j]`, and range
+construction
+`i..j` are supported (the type of integer ranges is a new builtin type called `range`). Moreover,
+boolean implication `p ==> q` is supported as a more intuitive form than `!p || q`.
+
+## Function Calls
+
+In MSL expressions, functions can be called like in Move. However, the callee must either be
+a [MSL function](#helper-functions), or a **pure** Move function.
+
+Move functions are considered pure if they do not modify global state and do not use Move expression
+features which are not supported in MSL expressions (as defined here).
+
+There is one extension. If a Move function definition contains a direct `assert`, this will be
+ignored when it is called from an MSL expression, and the function will be considered pure. For
+example:
+
+```move
+fun get(addr: address): &T { assert(exists<T>(addr), ERROR_CODE); borrow_global<T>(addr) }
+```
+
+This function is pure and can be called from an MSL expression. The assertion will be ignored, and
+the function will be interpreted as:
+
+```move
+spec fun get(addr: address): T { global<T>(addr) }
+```
+
+This is justified by that MSL has [*partial semantics*](#partial-semantics).
+
+## Statements
+
+Limited sequencing of the form `{ let x = foo(); x + x }` is supported, as well as if-then-else.
+Other statement forms of the Move language are not supported.
+
+## Pack and Unpack
+
+Pack expressions are supported. Unpack expressions are currently *not* supported.
+
+## Quantifiers
+
+Universal and existential quantification are supported. The general form is
+
+```
+forall <binding>, ..., <binding> [ where <exp> ] : <exp>
+exists <binding>, ..., <binding> [ where <exp> ] : <exp>
+```
+
+- Bindings can either be of the form `name: <type>` or `name in <exp>`. For the second form, the
+  expression currently must either be a `range` or a vector.
+- The optional constraint `where <exp>` allows to restrict the quantified
+  range. `forall x: T where p: q`
+  is equivalent to `forall x: T : p ==> q` and `exists x: T where p: q` is equivalent to
+  `exists x: T : p && q`.
+
+Notice that it is possible to quantify over types. For example:
+
+```
+forall t: type, addr: address where exists<R<t>>(addr): exists<T<t>>(addr)
+```
+
+## Choice Operator
+
+The choice operator allows to select a value which satisfies a predicate:
+
+```
+choose a: address where exists<R>(a) && global<R>(a).value > 0
+```
+
+If the predicate is not satisfiable, the result of the choice will be undetermined (see discussion
+of
+[partial semantics](#partial-semantics)).
+
+The choice also comes in a form to select the *minimal* value from a set of integers, as in:
+
+```
+choose min i: num where in_range(v, i) && v[i] == 2
+```
+
+## Cast Operator
+
+In the specification language, we can use the same syntax `(e as T)` to cast an expression `e` with one integer type to
+`T`, an integer type of another size.
+
+
+## Shift Operator
+
+Shift operators `<<` and `>>` are supported in the specification language and both of them have the same semantics with the Move language.
+As for abort, if a value `v` has width `n`, then `v << m` or `v >> m` will abort if `m >= n`.
+
+## Bitwise Operators
+
+Move programs using bitwise operators `&`, `|` and `^` can be verified in the prover and these operators are also supported in the specification language.
+Due to encoding and efficiency issues, using bitwise operators has more caveats:
+
+- Integers involved in bitwise operations are encoded as `bv` types at the backend and two encodings of integers are not compatible. For instance,
+if a variable `v` involves in a bitwise operation such as `v & 2` or `v = a ^ b`, then when it is used in an arithmetic operation `v * w` or a shift operation `v << w`, `w` will be implicitly cast to a `bv` type in the Move program.
+However, the specification language does not support implicit type cast so users must explicitly use the builtin function `int2bv` in the specification: `v << int2bv(w)`.
+Not that since each `bv` type has a fixed length (from 8 to 256), values with type `num` cannot be converted into `bv`.
+
+
+- Verification of `bv` types is not efficient and may lead to timeout. As a result, users may prefer isolating bitwise operations from other operations and not using `int2bv`
+  if possible. Moreover, users need to use pragmas to explicitly specify which integer-typed function arguments or struct fields will be used in bitwise computations:
+
+```move
+    struct C has drop {
+        a: u64,
+        b: u64
+    }
+    spec C {
+        // b, the second field of C, will be of bv type
+        pragma bv=b"1";
+    }
+    public fun foo_generic<T>(i: T): T {
+      i
+    }
+
+    spec foo_generic {
+     // The first parameter will be of bv type if T is instantiated as a number type
+      pragma bv=b"0";
+     // The first return value will be of bv type if T is instantiated as a number type
+      pragma bv_ret=b"0";
+    }
+
+    public fun test(i: C): u64 {
+      let x1 = foo_generic(C.b);
+      x1 ^ x1
+    }
+
+    spec test {
+      // Explicit type cast is mandatory for generating correct boogie program
+      ensures result == (0 as u64);
+    }
+```
+
+Note that if arguments or fields of a generic function or struct are specified with `bv` types,
+they will be of `bv` types in all instances of the function or the struct when the instantiated type is an integer type.
+
+
+- Values with integer types in vectors and tables can be encoded as `bv` types; indices and keys in tables cannot be `bv` types for now. Using other types will lead to internal errors.
+
+## Builtin Functions
+
+MSL supports a number of builtin constants and functions. Most of them are not available in the Move
+language:
+
+- `MAX_U8: num`, `MAX_U64: num`, `MAX_U128: num` returns the maximum value of the corresponding
+  type.
+- `exists<T>(address): bool` returns true if the resource T exists at address.
+- `global<T>(address): T` returns the resource value at address.
+- `len<T>(vector<T>): num` returns the length of the vector.
+- `update<T>(vector<T>, num, T>): vector<T>` returns a new vector with the element replaced at the
+  given index.
+- `vec<T>(): vector<T>` returns an empty vector.
+- `vec<T>(x): vector<T>` returns a singleton vector.
+- `concat<T>(vector<T>, vector<T>): vector<T>` returns the concatenation of the parameters.
+- `contains<T>(vector<T>, T): bool` returns true if element is in vector.
+- `index_of<T>(vector<T>, T): num` returns the index of the element in the vector, or the length of
+  the vector if it does not contain it.
+- `range<T>(vector<T>): range` returns the index range of the vector.
+- `in_range<T>(vector<T>, num): bool` returns true if the number is in the index range of the
+  vector.
+- `in_range<T>(range, num): bool` returns true if the number is in the range.
+- `update_field(S, F, T): S` updates a field in a struct, preserving the values of other fields,
+  where `S` is some struct, `F` the name of a field in `S`, and `T` a value for this field.
+- `old(T): T` delivers the value of the passed argument at point of entry into a Move function. This
+  is allowed in
+  `ensures` post-conditions,
+  inline spec blocks (with additional restrictions), and
+  certain forms of invariants, as discussed later.
+- `TRACE(T): T` is semantically the identity function and causes visualization of the argument's
+  value in error messages created by the prover.
+- `int2bv(v)` explicitly converts an integer `v` into its `bv` representation.
+- `bv2int(b)` explicitly converts a 'bv' integer 'b' into the `num` representation. However it is not encouraged to use it due to efficiency issue.
+
+Builtin functions live in an unnamed outer scope of a module. If the module defines a function `len`
+then this definition will shadow that of the according builtin function. To access the builtin
+function in such a situation, one can use the notation `::len(v)`.
+
+## Partial Semantics
+
+In MSL, expressions have a partial semantics. This is in contrast to Move program expressions, which
+have a total semantics, since they either deliver a value or abort.
+
+An expression `e[X]` which depends on some some variables `X` may have a known interpretation for
+some assignments to variables in `X`, but unknown for others. An unknown interpretation for a
+sub-expression causes no issue if its value is not needed for the overall expression result.
+Therefore it does not matter if we say `y != 0 && x / y > 0`
+or `x / y > 0 && y != 0`: boolean operators are commutative.
+
+This basic principle inherits to higher-level language constructs. For example, in specifications,
+it does not matter in which order conditions are
+supplied: `aborts_if y != 0; ensures result == x / y;` is the same as
+`ensures result == x / y; aborts_if y != 0;`. Also, `aborts_if P; aborts_if Q;` is the same
+as `aborts_if Q || P`
+.
+
+Moreover, the principle of partial semantics is inherited
+to [specification helper functions](#helper-functions)
+, which behave transparently. Specifically, inlining those functions is equivalent to calling them (
+call-by-expression parameter passing semantics).
+
+# Specifications
+
+Specifications are contained in so-called *specification blocks* (abbreviated **spec block**) that
+can appear as module members and inside Move functions. The various types of spec blocks are shown
+below, and will be discussed in subsequent sections.
+
+```move
+module M {
+    resource struct Counter {
+        value: u8,
+    }
+
+    public fun increment(a: address) acquires Counter {
+        let r = borrow_global_mut<Counter>(a);
+        spec {
+            // spec block targeting this code position
+            ...
+        };
+        r.value = r.value + 1;
+    }
+
+    spec increment {
+        // spec block targeting function increment
+        ...
+    }
+
+    spec Counter {
+        // spec block targeting struct Counter
+        ...
+    }
+
+    spec schema Schema {
+        // spec block declaring a schema
+        ...
+    }
+
+    spec fun f(x: num): num {
+        // spec block declaring a helper function
+        ...
+    }
+
+    spec module {
+        // spec block targeting the whole module
+        ...
+    }
+}
+```
+
+Apart of spec blocks inside Move functions, the textual position of spec block is irrelevant. Also,
+a spec block for a struct, function, or module can be repeated multiple times, accumulating the
+content.
+
+## Separating Specifications
+
+Instead of putting specifications into the same module as the regular Move definitions, one can also
+put them into a separate "specification" module, which can live in the same or a different file:
+
+```move
+module M {
+    ...
+}
+spec M {
+    spec increment { .. }
+}
+```
+
+The syntax of a specification module is the same as for a regular module, however, Move functions
+and structures are not allowed.
+
+A specification module must be compiled together with the Move module it is targeting, and cannot be
+compiled and verified standalone.
+
+In case Move definitions are far apart (e.g. in different files), it is possible to augment the
+specification of a Move function with a signature of this function, to give sufficient context to
+understand the specification. This syntax is optionally enabled in regular and in specification
+modules:
+
+```move
+public fun increment(a: address) acquires Counter { .. }
+...
+spec increment(a: address) { .. }
+```
+
+## Pragmas and Properties
+
+Pragmas and properties are a generic mechanism to influence interpretation of specifications. They
+are also an extension point to experiment with new concepts before they come part of the mainstream
+syntax. Here we give a brief introduction into their general syntax; individual instances are
+discussed later.
+
+The general form of a pragma is:
+
+```move
+spec .. {
+    pragma <name> = <literal>;
+}
+```
+
+The general form of a property is:
+
+```move
+spec .. {
+    <directive> [<name> = <literal>] <content>; // ensures, aborts_if, include, etc..
+}
+```
+
+The `<literal>` can be any value supported by MSL (or the Move language). A value assignment can
+also be omitted, in which case a default is used. For example, it is common to use `pragma option;`
+as a shortcut for
+`pragma option = true;`.
+
+Instead of a single pragma or property, a list can also be provided, as
+in `invariant [global, isolated] P`.
+
+### Pragma Inheritance
+
+A pragma in a module spec block sets a value which applies to all other spec blocks in the module. A
+pragma in a function or struct spec block can override this value for the function or struct.
+Furthermore, the default value of some pragmas can be defined via the prover configuration.
+
+As an example, we look at the `verify` pragma. This pragma is used to turn verification on or off.
+
+```move
+spec module {
+    pragma verify = false; // By default, do not verify specs in this module ...
+}
+
+spec increment {
+    pragma verify = true; // ... but do verify this function.
+    ...
+}
+```
+
+### General Pragmas and Properties
+
+A number of pragmas control general behavior of verification. Those are listed in the table below.
+
+| Name                             | Description |
+|----------------------------------|--------------
+| `verify`     | Turns on or off verification.
+| `intrinsic`  | Marks a function to skip the Move implementation and use a prover native implementation. This makes a function behave like a native function even if it not so in Move.
+| `timeout` | Sets a timeout (in seconds) for function or module. Overrides the timeout provided by command line flags.
+| `verify_duration_estimate`     | Sets an estimate (in seconds) for how long the verification of function takes. If the configured `timeout` is less than this value, verification will be skipped.
+| `seed` | Sets a random seed for function or module. Overrides the seed provided by command line flags.
+
+The following properties control general behavior of verification:
+
+| Name       | Description |
+|------------|--------------
+| `[deactivated]` | Excludes the associated condition from verification.
+
+## Pre and Post State
+
+Multiple conditions in spec blocks work with a *pre* and *post* state, relating them to each other.
+Function specifications are one example of this: in the `ensures P` condition, the pre-state (at
+function entry) and the post-state (at function exit) are related via the predicate `P`. However,
+the concept is more general and also applied for invariants, where the pre-state is before and
+post-state after a global update.
+
+In contexts where a pre/post state is active, expressions are evaluated implicitly in the
+post-state. To evaluate an expression in a pre-state, one uses the builtin function `old(exp)`,
+which evaluates its parameter in the pre-state and returns its value. It is important to understand
+that every sub-expression in `exp` is computed in the pre-state as well, including calls to helper
+functions.
+
+The 'state' in question here consists of assignments to global resource memory, as well as to any
+parameters of the function of type `&mut T`. Examples:
+
+```move
+fun increment(counter: &mut u64) { *counter = *counter + 1 }
+spec increment {
+   ensures counter == old(counter) + 1;
+}
+
+fun increment_R(addr: address) {
+    let r =  borrow_global_mut<R>(addr);
+    r.value = r.value + 1;
+}
+spec increment_R {
+    ensures global<R>(addr).value == old(global<R>(addr).value) + 1;
+}
+```
+
+## Helper Functions
+
+MSL allows defining helper functions. Those functions can then be used in expressions.
+
+Helper functions are defined using the following syntax:
+
+```move
+spec fun exists_balance<Currency>(a: address): bool { exists<Balance<Currency>>(a) }
+```
+
+As seen in the example, helper functions can be generic. Moreover, they can access global state.
+
+Definitions of helper functions are neutral regards whether they apply to
+a [pre- or post-state](#pre-and-post-state). They are evaluated in the currently active state. For
+instance, in order to see whether a balance existed in the pre-state, one
+uses `old(exists_balance<Currency>(a))`. Consequently, the expression `old(..)` is not allowed
+within the definition of a helper function.
+
+Helper functions are partial functions; see discussion of [partial semantics](#partial-semantics).
+
+### Uninterpreted Functions
+
+A helper function can be defined as **uninterpreted** by simply omitting its body:
+
+```move
+spec fun something(x: num): num;
+```
+
+An uninterpreted function is one the prover is allowed to assign some arbitrary meaning to, as long
+as it is consistent within a given verification context. Uninterpreted functions are a useful tool
+for abstraction in specifications (see also [here](#abstract-specifications)).
+
+### Axioms
+
+The meaning of helper functions can be further constraint by using **axioms**. Currently, axioms
+must be contained in module spec blocks:
+
+```move
+spec module {
+    axiom forall x: num: something(x) == x + 1;
+}
+```
+
+Axiom should be used with care as they can introduce unsoundness in the specification logic via
+contradicting assumptions. The Move prover supports a smoke test for detecting unsoundness via
+the `--check-inconsistency`
+flag.
+
+## Let Bindings
+
+A spec block can contain let bindings which introduce names for expressions:
+
+```move
+fun get_R(account: signer): R { ... }
+spec get_R {
+    let addr = signer::spec_address_of(account);
+    aborts_if addr != ROOT;
+    ensures result == global<R>(addr);
+}
+```
+
+In a spec block which has a pre and post state (like a function specification), the `let name = e`
+form will evaluate `e` in the pre-state. In order to evaluate an expression in the post state, one
+uses `let post name = e`. In the rhs expression of this form, one can use `old(..)` to refer to the
+pre-state.
+
+## Aborts-If Condition
+
+The `aborts_if` condition is a spec block member which can appear only in a function context. It
+specifies conditions under which the function aborts.
+
+In the following example, we specify that the function `increment` aborts if the `Counter` resource
+does not exist at address `a` (recall that `a` is the name of the parameter of `increment`).
+
+```move
+spec increment {
+    aborts_if !exists<Counter>(a);
+}
+```
+
+If a function has more than one `aborts_if` condition, those conditions are or-ed with each other.
+The evaluation of the combined aborts condition (or-ed from each individual condition) depends on
+the value of the pragma `aborts_if_is_partial`. If this value is false (the default), the function
+aborts *if and only if* the combined aborts condition is true. In this case, the above aborts
+specification for `increment` will lead to a verification error, since there are additional
+situations where `increment` can abort, namely if incrementing `Counter.value` would lead to an
+overflow. To fix this, the specification can be completed like this:
+
+```move
+spec increment {
+    pragma aborts_if_is_partial = false; // This is the default, but added here for illustration.
+    aborts_if !exists<Counter>(a);
+    aborts_if global<Counter>(a).value == 255;
+}
+```
+
+If the value of `aborts_if_is_partial` is true, the combined aborts condition (the or-ed individual
+conditions)
+only *
+imply* that the function aborts. Formally, if `A` is the combined aborts condition, then
+with `aborts_if_is_partial = true`, we have `A ==> function_aborts`, otherwise we have
+`A <==> function_aborts`. Therefore, the following does verify:
+
+```move
+spec increment {
+    pragma aborts_if_is_partial = true;
+    aborts_if !exists<Counter>(a);
+}
+```
+
+<a name="risk-aborts-if-is-partial"></a>
+> Note that there is a certain risk in setting `aborts_if_is_partial` to true, and best practice is to avoid it in specifications of public functions and transaction scripts once those are considered finalized. This is because changing the code after finalization of the spec can add new (non-trivial, undesired) abort situations which the original specification did not anticipate, but which will nevertheless silently pass verification.
+
+If no aborts condition is specified for a function, abort behavior is unspecified. The function may
+or may not abort, and verification will not raise any errors, whether `aborts_if_is_partial` is set
+or not. In order to state that a function never aborts, use `aborts_if false`. One can use the
+pragma `aborts_if_is_strict`
+to change this behavior; this is equivalent to as if an `aborts_if false` has been added to each
+function which does not have an explicit `aborts_if` clause.
+
+### Aborts-If Condition with Code
+
+The `aborts_if` condition can be augmented with a code:
+
+```
+fun get_value(addr: address): u64 {
+    aborts(exists<Counter>(addr), 3);
+    borrow_global<Counter>(addr).value
+}
+spec get_value {
+    aborts_if !exists<Counter>(addr) with 3;
+}
+```
+
+It is a verification error if the above function does not abort with code `3` under the given
+condition.
+
+In order to specify a direct VM abort, one can use the special constant `EXECUTION_FAILURE`:
+
+```
+fun get(addr: address): &Counter acquires Counter {
+    borrow_global<Counter>(addr)
+}
+spec get {
+    aborts_if !exists<Counter>(addr) with EXECUTION_FAILURE;
+}
+```
+
+This same constant can be used for all other VM failures (division by zero, overflow, etc.)
+
+## Aborts-With Condition
+
+The `aborts_with` condition allows specifying with which codes a function can abort, independent
+under which condition. It is similar to a 'throws' clause in languages like Java.
+
+```move
+fun get_one_off(addr: address): u64 {
+    aborts(exists<Counter>(addr), 3);
+    borrow_global<Counter>(addr).value - 1
+}
+spec get_one_off {
+    aborts_with 3, EXECUTION_FAILURE;
+}
+```
+
+If the function aborts with any other or none of the specified codes, a verification error will be
+produced.
+
+The `aborts_with` condition can be combined with `aborts_if` conditions. In this case,
+the `aborts_with`
+specifies any other codes with which the function may abort, in addition to the ones given in
+the `aborts_if`:
+
+```move
+spec get_one_off {
+    aborts_if !exists<Counter>(addr) with 3;
+    aborts_with EXECUTION_FAILURE;
+}
+```
+
+If this is not wanted, and the `aborts_with` should be independent of `aborts_if`, one can use the
+property
+`[check]`:
+
+```move
+spec get_one_off {
+    aborts_if !exists<Counter>(addr) with 3;
+    aborts_if global<Counter>(addr) == 0 with EXECUTION_FAILURE;
+
+    aborts_with [check] 3, EXECUTION_FAILURE;
+}
+```
+
+> TODO: `[check]` property is currently not longer implemented
+
+## Requires Condition
+
+The `requires` condition is a spec block member which postulates a pre-condition for a function. The
+prover will produce verification errors for functions which are called with violating
+pre-conditions.
+
+A `requires` is different from an `aborts_if`: in the latter case, the function can be called, and
+any aborts it produces will be propagated to the caller context. In the `requires` case, the prover
+will not allow the function to be called in the first place. Nevertheless, the function can *still
+be called at runtime* if verification is skipped. Because of this, `requires` are rare in Move
+specifications, and
+`aborts_if` are more common. Specifically, `requires` should be avoided for public APIs.
+
+An example of `requires` is the following:
+
+```move
+spec increment {
+    requires global<Counter>(a).value < 255;
+}
+```
+
+## Ensures Condition
+
+The `ensures` condition postulates a post-condition for a function which must be satisfied when the
+function terminates successfully (i.e. does not abort). The prover will verify each `ensures` to
+this end.
+
+An example for the `ensures` condition is the following:
+
+```move
+spec increment {
+    ensures global<Counter>(a) == old(global<Counter>(a)) + 1;
+}
+```
+
+Within the expression for the `ensures` condition, one can use the `old` function,
+[as discussed here](#pre-and-post-state).
+
+## Modifies Condition
+
+The `modifies` condition is used to provide permissions to a function to modify global storage. The
+annotation itself comprises a list of global access expressions. It is specifically used together
+with [opaque function specifications](#opaque-specifications).
+
+```move
+resource struct S {
+    x: u64
+}
+
+fun mutate_at(addr: address) acquires S {
+    let s = borrow_global_mut<S>(addr);
+    s.x = 2;
+}
+spec mutate_at {
+    pragma opaque;
+    modifies global<S>(addr);
+}
+```
+
+In general, a global access expression has the form `global<type_expr>(address_expr)`. The
+address-valued expression is evaluated in the pre-state of the annotated function.
+
+```move
+fun read_at(addr: address): u64 acquires S {
+    let s = borrow_global<S>(addr);
+    s.x
+}
+
+fun mutate_S_test(addr1: address, addr2: address): bool acquires T {
+    assert(addr1 != addr2, 43);
+    let x = read_at(addr2);
+    mutate_at(addr1); // Note we are mutating a different address than the one read before and after
+    x == read_at(addr2)
+}
+spec mutate_S_test {
+    aborts_if addr1 == addr2;
+    ensures result == true;
+}
+```
+
+In the function `mutate_S_test`, the assertion in the spec block is expected to hold. A benefit of
+the modifies specification on `mutate_at` is that this assertion can be proved whether or
+not `mutate_at` is inlined.
+
+If the modifies annotation is omitted on a function, then that function is deemed to have all
+possible permissions for those resources it may modify during its execution. The set of all
+resources that may be modified by a function is obtained via an interprocedural analysis of the
+code. In the example above, `mutate_S_test` does not have a modifies specification and modifies
+resource `S` via the call to `mutate_at`. Therefore, it is considered to have modified `S` at any
+possible address. Instead, if the programmer adds `modifies global<S>(addr1)`
+to the specification of `mutate_S_test`, then the call to `mutate_at` is checked to make sure that
+modify permissions granted to `mutate_S_test` cover the permissions it grants to `mutate_at`.
+
+## Invariant Condition
+
+The invariant condition can be applied on structs and on global level.
+
+### Function Invariants
+
+The `invariant` condition on a function is simply a shortcut for a `requires` and `ensures` with the
+same predicate.
+
+Thus the following spec block:
+
+```move
+spec increment {
+    invariant global<Counter>(a).value < 128;
+}
+```
+
+... is equivalent to:
+
+```move
+spec increment {
+    requires global<Counter>(a).value < 128;
+    ensures global<Counter>(a).value < 128;
+}
+```
+
+### Struct Invariants
+
+When the `invariant` condition is applied to a struct, it expresses a well-formedness property of
+the struct data. Any instance of this struct which is currently not mutated will satisfy this
+property (with exceptions as outlined below).
+
+For example, we can postulate an invariant on our counter that it never must exceed the value of
+127:
+
+```move
+spec Counter {
+    invariant value < 128;
+}
+```
+
+A struct invariant is checked by the prover whenever the struct value is constructed (packed). While
+the struct is mutated (e.g. via a `&mut Counter`) the invariant does *not* hold (but see exception
+below). In general, we consider mutation as an implicit unpack, and end of mutation as a pack.
+
+The Move language semantics unambiguously identifies the point when mutation ends and starts. This
+follows from the borrow semantics of Move, and includes mutation via an enclosing struct.
+(The mutation of an inner struct ends when the mutation of the root struct where mutation started
+ends.)
+
+There is one exception to this rule. When a mutable reference to a struct declared in module M is
+passed into a *
+public*
+function of M which does by itself *not* return any other mutable reference (which could be borrowed
+from the input parameter), we treat this parameter as "packed". That means, on function entry, we
+will unpack it and on function exit we will pack again, enforcing the invariant. This reflects that
+in Move, struct data can only be mutated within the module which declares the struct, so for an
+outside caller of the public function, the mutable reference can actually not be mutated unless by
+calling public functions of module M again. It is a significant simplification of the verification
+problem to exploit this in the semantics.
+
+### Global Invariants
+
+A global invariant appears as a member of module. It can express a condition over the global state
+of the Move program, as represented by resources stored in memory. For example, the below invariant
+states that a `Counter`
+resource stored at any given address can never be zero:
+
+```move
+module M {
+    invariant forall a: addr where exists<Counter>(a): global<Counter>(a).value > 0;
+}
+```
+
+A global invariant is assumed to hold when data is read from the global state, and is asserted (and
+may fail to verify)
+at the moment the state is updated. For example, the below function will never abort with arithmetic
+underflow because the counter value is always greater zero; however, it will create a verification
+error since the counter can drop to zero:
+
+```
+fun decrement_ad(addr: address) acquires Counter {
+    let counter = borrow_global_mut<Counter>(addr);
+    let new_value = counter.value - 1;   // Will not abort because counter.value > 0
+    *counter.value = new_value;          // Fails verification since value can drop to zero
+}
+```
+
+#### Disabling Invariants
+
+There are times when a global invariant holds almost everywhere,
+except for a brief interval inside a function. In current move code,
+this often occurs when something (e.g. an account) is being setup and
+several structs are published together. Almost everywhere, an
+invariant holds that all of the structs are published or none of them
+are. But the code that publishes the structs must do so sequentially.
+While they are being published, there will be a point where some are
+published and others are not.
+
+In order to verify invariants that hold except during small regions, there
+is a feature to allow users to disable invariants temporarily.
+Consider the following code fragment:
+
+```move
+fn setup() {
+    publish1();
+    publish2();
+    }
+}
+```
+where `publish1` and `publish2` publish two different structs, `T1` and `T2` at address `a`.
+
+```move
+module M {
+    invariant [global] exists<T1>(a) == exists<T2>(a)
+}
+```
+
+As written, the prover will report that the invariant is violated
+after the call to `publish1` and before the call to `publish2`.
+If either of `publish1` or `publish2` is without the other, the prover
+will also report a violation of the invariant.
+
+By default, a global invariant is checked immediately after the instruction `I` that touches the resources mentioned in the global invariant.
+The `[suspendable]` attribute (at the invariant side) together with two pragmas
+(specified in function spec block) provides fine-grained control on where we hope this invariant to be checked:
+
+- `disable_invariants_in_body`: the invariant will be checked at the end of the function where `I` resides.
+- `delegate_invariants_to_caller`: the invariant will be checked by all callers of the function where `I` resides.
+
+For the example above, we can add the pragma `disable_invariants_in_body`:
+```move
+spec setup {
+    pragma disable_invariants_in_body;
+}
+```
+which says that invariants not required to hold while `setup` is executing,
+but are assumed to hold on entry to and exit from `setup`.
+
+This pragma changes the Prover's behavior. The invariants are assumed on
+entry to `setup`, but not proved during or after `publish1` and
+`publish2`.  Instead, all invariants that could be invalidated in the
+body of `setup` are asserted and proved at the point of return from
+`setup`.  A consequence of this processing is that the user may need
+to provide stronger post-conditions on `publish1` and `publish2` to
+make it possible to prove the invariants on exit from `setup`.
+
+Another consequence of this processing is that invariants cannot
+safely be assumed to hold during the execution of `publish1` and
+`publish2` (unless nothing in the body of `setup` changes state
+mentioned in the invariant). Therefore, if proving a post-condition
+requires the invariant to be assumed, the post-condition will fail.
+
+In the example, invariants hold at the call sites of `setup`, but not
+in the body. For `publish1`, invariants don't necessarily hold at the
+call site *or* in the body of the function.  In the example, that
+behavior is implied because `publish1` is called in a context where
+invariants are disabled.
+
+When invariants are disabled in `setup` in the above example, the
+prover cannot assume them on entry to `publish1` and `publish2`, and
+should not try to prove them on exit from those functions. The Prover
+would have the same behavior for any functions called by `publish1` or
+`publish2`.  The Prover *automatically* adopts this behavior when
+invariants are disabled in a calling function, but it is possible for
+the user to declare that a function be treated like `publish1`.
+
+For example, if `publish2` is *only* called from the setup function above,
+and we did *not* disable invariants in `setup`, we could achieve a similar
+effect by using the pragma `delegate_invariants_to_caller`, instead.
+
+```move
+spec setup {
+    pragma delegate_invariants_to_caller;
+}
+```
+This would only be legal if `setup` is a private or `public (friend)` function.
+The difference between this and disabling invariants in `setup` is that the
+invariants would not be assumed at the beginning of `setup` and would be proved
+after `setup` returns at each site where it is called.
+
+While both pragmas disable invariants in the body of a function, the
+difference is that `disable_invariants_in_body` assumes invariants on
+entry and proves them on exist, while `delegate_invariants_to_caller`
+does neither.
+
+There are some limitations on how these pragmas can be used.
+`disable_invariants_in_body` cannot be declared for functions where
+invariants are delegated to a caller, either explicitly via the pragma
+or implicitly because the function is called in a context where
+invariants have been disabled. (This restriction is to ensure
+consistent processing, because on pragma assumes that invariants hold
+in the calling context and the other does not).  Second, it is illegal
+for a public or script function to delegate invariant checking to its
+callers (since the Prover does not know all the call sites), *unless*
+the function cannot possibly invalidate an invariant because it
+doesn't change any of the state mentioned in `exists` and `global`
+expressions appearing in the invariant.
+
+#### Update Invariants
+
+The `update` form of a global invariant allows to express a relation
+between [pre-state and post-state](#pre-and-post-state) of a global state update. For example, the
+following invariant states that the counter must decrease monotonically whenever it is updated:
+
+```move
+module M {
+    invariant update [global] forall a: addr where old(exists<Counter>(a)) && exists<Counter>(addr):
+        global<Counter>(a).value <= old(global<Counter>(a));
+}
+```
+
+#### Isolated Global Invariants
+
+A global invariant can be marked as `[isolated]` to indicate that it is not relevant for proving
+other properties of the program. An isolated global invariant will not be assumed when the related
+global state is read. It will only be assumed before the state is updated, to help prove that the
+invariant still holds after the update. This feature is for improving performance in situations
+where there are many global invariants but there have no direct influence on verification.
+
+#### Modular Verification and Global Invariants
+
+Certain usage of global invariants leads to verification problems which cannot be checked in a
+modular fashion.
+"Modular" here means that a module can be verified standalone and proven to be universally correct
+in all usage contexts (if preconditions are met).
+
+A non-modular verification problem may arise if a global invariant refers to state from multiple
+modules. Consider a situation where module `M1` uses module `M2`, and `M1` contains the following
+invariant, with the helper function `condition` referring to global state of each respective module:
+
+```move
+module M1 {
+    invariant M1::condition() ==> M2::condition();
+}
+```
+
+When we verify `M1` standalone, the Move prover will determine that it also needs to verify
+functions in `M2`, namely those which update the M2 memory such that the invariant in M1 can fail.
+
+> TODO: document mechanism and pragmas to defer invariant verification for code sections
+
+## Assume and Assert Conditions in Code
+
+A spec block might also occur anywhere an ordinary Move statement block can occur.
+Here is an example:
+
+```
+fun simple1(x: u64, y: u64) {
+    let z;
+    y = x;
+    z = x + y;
+    spec {
+        assert x == y;
+        assert z == 2*x;
+    }
+}
+```
+
+In such inline spec blocks, only a subset of conditions are permitted:
+- `assume` and `assert` statements are allowed in any code locations
+- loop `invariant` statements are allowed only in code locations that represent loop headers.
+
+An assert statement inside a spec block indicates a condition that must hold when control reaches
+that block. If the condition does not hold, an error is reported by the Move Prover. An assume
+statement, on the other hand, blocks executions violating the condition in the statement. The
+function `simple2` shown below is verified by the Move Prover. However, if the first spec block
+containing the assume statement is removed, Move Prover will show a violating to the assert
+statement in the second spec block.
+
+```
+fun simple2(x: u64, y: u64) {
+    let z: u64;
+    spec {
+        assume x > y;
+    };
+    z = x + y;
+    spec {
+        assert z > 2*y;
+    }
+}
+```
+
+### Loop Invariants
+
+An `invariant` statement encodes a loop invariant and must beplaced at a loop head, as in the
+following example.
+
+```
+fun simple3(n: u64) {
+    let x = 0
+    loop {
+        spec {
+            invariant x <= n;
+        };
+        if (x < n) {
+            x = x + 1
+        } else {
+            break
+        }
+    };
+    spec {
+        assert x == n;
+    }
+}
+```
+
+A loop invariant is translated into two `assert` statements and one `assume` statement to
+facilitate  the inductive reasoning of properties about the loop.
+In break down, a loop invariant is translated to:
+- An `assert` statement that checks the invariant holds when the loop is first encountered in the
+  execution -- establishing the base case.
+- An `assume` statement that encodes the property that the invariant holds at loop iteration `I`.
+- An `assert` statement that checks whether the invariant continues to hold at loop iteration `I+1`.
+
+### Referring to Pre State
+
+Occasionally, we would like to refer to the pre state of a mutable function argument in inline spec
+blocks. In MSL, this can be done with the `old(T)` expression. Similar to the semantics of `old(..)`
+in post conditions, an `old(T)` expression in an `assume` or `assert` statement always yields the
+value of `T` at the function entry point. Following is an example that illustrate the use of
+`old(..)` in an inline spec block.
+
+```
+fun swap(x: &mut u64, y: &mut u64) {
+    let t = *x;
+    *x = *y;
+    *y = t;
+    spec {
+        assert x == old(y);
+        assert y == old(x);
+    };
+}
+```
+
+The above example is trivial as the same property can be expressed with post conditions
+(i.e., `ensures`) too. But there are cases where we must use `old(..)` to refer to the pre
+state, especially in the specification of loop invariants. Consider the following example
+where we verify that the `vector_reverse` function properly reverse the order of all elements
+in a vector:
+
+```
+fun verify_reverse<Element>(v: &mut vector<Element>) {
+    let vlen = vector::length(v);
+    if (vlen == 0) return ();
+
+    let front_index = 0;
+    let back_index = vlen -1;
+    while ({
+        spec {
+            assert front_index + back_index == vlen - 1;
+            assert forall i in 0..front_index: v[i] == old(v)[vlen-1-i];
+            assert forall i in 0..front_index: v[vlen-1-i] == old(v)[i];
+            assert forall j in front_index..back_index+1: v[j] == old(v)[j];
+            assert len(v) == vlen;
+        };
+        (front_index < back_index)
+    }) {
+        vector::swap(v, front_index, back_index);
+        front_index = front_index + 1;
+        back_index = back_index - 1;
+    };
+}
+spec verify_reverse {
+    aborts_if false;
+    ensures forall i in 0..len(v): v[i] == old(v)[len(v)-1-i];
+}
+```
+
+Note the usage of `old(v)` in the loop invariants. Without them, it is hard to express the
+invariant that the vector is partially reversed while the loop is iterating and the rest
+remain unchanged.
+
+However, unlike the `old(T)` expressions in `ensures` conditions where `T` can be any valid
+expression (e.g., `old(v[i])` is allowed), the `old(T)` expressions in `assert` and `assumes`
+statements only accept a single variable as `T` and that variable must be a function argument of
+a mutable reference type. In the above example, `old(v[i])` is not allowed, and we should use
+`old(v)[i]` instead.
+
+## Specification Variables
+
+MSL supports *spec variables*, also called *ghost variables* in the verification community. These
+variables are used only in specifications and represent information derived from the global state of
+resources. An example use case is to compute the sum of all coins available in the system and
+specify that the sum can be changed only in certain scenarios.
+
+We illustrate this feature by introducing a spec variable which maintains the sum of all `Counter`
+resources from our running example. First, a spec variable is introduced via spec module block as
+follows:
+
+```move
+spec module {
+    global sum_of_counters: num;
+}
+```
+
+This value is going to be updated whenever a `Counter` is packed or unpacked. (Recall that mutation
+is interpreted as an implicit unpack and pack):
+
+```move
+spec Counter {
+    invariant pack sum_of_counters = sum_of_counters + value;
+    invariant unpack sum_of_counters = sum_of_counters - value;
+}
+```
+> TODO: `invariant pack` and `invariant unpack` are currently not implemented
+
+Now we may for example want to specify that the sum of all Counter instances in the global state
+should never exceed a particular value. We can do this as follows:
+
+```move
+spec module {
+    invariant [global] sum_of_counters < 4711;
+}
+```
+
+Note that spec variables can be referenced also from helper functions. Moreover, spec variables can
+be generic:
+
+```move
+spec module {
+    global some_generic_var<T>: num;
+}
+```
+
+When using such a spec variable, a type parameter need to be provided, as in `some_generic_var<u64>`
+. Effectively, a generic spec variable is like a family of variables indexed by types.
+
+## Schemas
+
+Schemas are a means for structuring specifications by grouping properties together. Semantically,
+they are just syntactic sugar which expand to conditions on functions, structs, or modules.
+
+### Basic Schema Usage
+
+Schemas are used as such:
+
+```move
+spec schema IncrementAborts {
+    a: address;
+    aborts_if !exists<Counter>(a);
+    aborts_if global<Counter>(a).value == 255;
+}
+
+spec increment {
+    include IncrementAborts;
+}
+```
+
+Each schema may declare a number of typed variable names and a list of conditions over those
+variables. All supported condition types can be used in schemas. The schema can then be included in
+another spec block:
+
+- If that spec block is for a function or a struct, all variable names the schema declares must be
+  matched against existing names of compatible type in the context.
+- If a schema is included in another schema, existing names are matched and must have the same type,
+  but non-existing names will be added as new declarations to the inclusion context.
+
+When a schema is included in another spec block, it will be checked whether the conditions it
+contains are allowed in this block. For example, including the schema `IncrementAborts` into a
+struct spec block will lead to a compile time error.
+
+When a schema is included the names it declares can also bound by expressions. For example, one can
+write `include IncrementAborts{a: some_helper_address()}`. Effectively, not providing a binding is
+equivalent to writing `IncrementAborts{a: a}` if `a` is an existing name in scope.
+
+Schemas can be generic. Generic schemas must be fully instantiated where they are included; type
+inference is not available for schemas.
+
+### Schema Expressions
+
+When a schema is included, one can use a limited set of Boolean operators as follows:
+
+- `P ==> SchemaExp`: all conditions in the schema will be prefixed with `P ==> ..`. Conditions which
+  are not based on boolean expressions will be rejected.
+- `if (P) SchemaExp1 else SchemaExp2`: this is treated similar as including both
+  `P ==> SchemaExp1` and `!P ==> SchemaExp2`.
+- `SchemaExp1 && SchemaExp2`: this is treated as two includes for the both schema expressions.
+
+### Schema Apply Operation
+
+One of the main uses cases for schemas is to be able to name a group of properties and then apply
+those to a set of functions. This is achieved by the `apply` operator. The `apply` spec block member
+can only appear in module spec blocks.
+
+The general form of the apply operator
+is `apply Schema to FunctionPattern, .. except FunctionPattern, ..`. Here,
+`Schema` can be a schema name or a schema name plus formal type arguments.
+`FunctionPatterns` consists of an optional visibility modifier `public` or `internal` (if not
+provided, both visibilities will match), a name pattern in the style of a shell file pattern (
+e.g. `*`, `foo*`, `foo*bar`, etc.)
+, and finally an optional type argument list. All type arguments provided to `Schema` must be bound
+in this list and vice versa.
+
+The apply operator includes the given schema in all function spec blocks which match the patterns,
+except those which are excluded via the `except` patterns.
+
+A typical use of the apply operator is to provide common pre and post conditions to all functions in
+a module with some exceptions. Example:
+
+```move
+spec schema Unchanged {
+    let resource = global<R>(ADDR):
+    ensures resource == old(resource);
+}
+
+spec module {
+    // Enforce Unchanged for all functions except the initialize function.
+    apply Unchanged to * except initialize;
+}
+```
+
+Notice that while with [global invariants](#global-invariants) we can express similar things, we *
+cannot*
+express the restriction of the invariant to only specific functions.
+
+## Opaque Specifications
+
+With the pragma `opaque`, a function is declared to be solely defined by its specification at caller
+sides. In contrast, if this pragma is not provided, then the function's implementation will be used
+as the basis to verify the caller.
+
+Using `opaque` requires the specification to be sufficiently complete for the verification problem
+at hand. Without opaque, the Move prover will use the implementation as the source of truth of the
+definition of the function. But with opaque, if there is an aspect of the function definition
+unspecified, an arbitrary meaning will be assumed. For example, with the specification below,
+the `increment` function can abort under arbitrary conditions:
+
+```move
+spec increment {
+    pragma opaque;
+    // aborts_if !exists<Counter>(a);  // We need to add this to make the function not abort arbitrarily
+    ensures global<Counter>(a) == old(global<Counter>(a)) + 1;
+}
+```
+
+In general, opaque functions enable modular verification, as they abstract from the implementation
+of functions, resulting in much faster verification.
+
+If an opaque function modifies state, it is advised to use
+the [`modifies` condition](#modifies-condition) in its specification. If this is omitted,
+verification of the state changes will fail.
+
+## Abstract Specifications
+
+The `[abstract]` property allow to specify a function such that an abstract semantics is used at the
+caller side which is different from the actual implementation. This is useful if the implementation
+is too complex for verification, and an abstract semantics is sufficient for verification goals.
+The `[concrete]` property, in turn, allows to still specify conditions which are verified against
+the implementation, but not used at the caller side.
+
+Consider the following example of a hash function. The actual value of the hash is not relevant for
+verification of callers, and we use an [uninterpreted helper function](#uninterpreted-functions)
+delivering an arbitrary value chosen by the prover. We can still specify the concrete implementation
+and verify its correctness:
+
+```move
+fun hash(v: vector<u8>): u64 {
+    <<sum up values>>(v)
+}
+spec hash {
+    pragma opaque;
+    aborts_if false;
+    ensures [concrete] result == <<sum up values>>(v);
+    ensures [abstract] result == spec_hash_abstract(v);
+}
+spec fun abstract_hash(v: vector<u8>): u64; // uninterpreted function
+```
+
+The soundness of the abstraction is the responsibility of the specifier, and not verified by the
+prover.
+
+> NOTE: the abstract/concrete properties should only be used with opaque specifications, but the prover will
+> currently not generate an error if not.
+
+> NOTE: the `modifies` clause does currently not support abstract/concrete. Also, if no modifies is given, the
+> modified state will be computed from the implementation anyway, possibly conflicting with `[abstract]` properties.
+
+## Documentation Generation
+
+The organization of specification blocks in a file is relevant for documentation generation -- even
+though it is not for the semantics. See discussion
+of [organization of specification blocks](docgen.md#organization-of-specification-blocks).
+
+# Expressiveness
+
+The Move Specification language is expressive enough to represent the full Move language semantics (
+formal argument outstanding) with one exception: functions which return a `&mut T` type.
+
+Consider the following code:
+
+```move
+struct S { x: u64, y: u64 }
+
+fun x_or_y(b: bool, s: &mut S): &mut u64 {
+    if (b) &mut s.x else &mut s.y
+}
+spec x_or_y {
+    ensures b ==> result == s.x;
+    ensures !b ==> result == s.y;
+}
+```
+
+We are not able to specify the *full* semantics of `x_or_y` in MSL, because we cannot capture the
+semantics of mutable references. While we can say something about the value behind the reference at
+function exit, subsequent effects as in `*x_or_y(b, &mut s) = 2` cannot be specified.
+
+However, the Move prover *does* understand the meaning of such functions -- the restriction is only
+in what we can specify. Practically this means we cannot make the function `x_or_y` opaque, and must
+let verification rely on that the prover directly works with the implementation. Specifically, we
+can verify the following
+(which can then be opaque):
+
+```move
+fun x_or_y_test(s: S): S {
+    *x_or_y(true, &mut s) = 2;
+    s
+}
+spec x_or_y_test {
+    pragma opaque;
+    ensures result.x == 2;
+    ensures result.y == s.y;
+}
+```
diff --git a/vendors/move/crates/move-prover/src/cli.rs b/vendors/move/crates/move-prover/src/cli.rs
new file mode 100644
index 000000000..e2a1f45b5
--- /dev/null
+++ b/vendors/move/crates/move-prover/src/cli.rs
@@ -0,0 +1,894 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! Functionality related to the command line interface of the Move prover.
+
+use std::{
+    collections::BTreeMap,
+    io::IsTerminal,
+    str::FromStr,
+    sync::atomic::{AtomicBool, Ordering},
+};
+
+use anyhow::anyhow;
+use clap::{Arg, Command};
+use log::LevelFilter;
+use move_compiler::shared::NumericalAddress;
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use simplelog::{
+    CombinedLogger, Config, ConfigBuilder, LevelPadding, SimpleLogger, TermLogger, TerminalMode,
+};
+
+use codespan_reporting::diagnostic::Severity;
+use move_abigen::AbigenOptions;
+use move_docgen::DocgenOptions;
+use move_errmapgen::ErrmapOptions;
+use move_model::{
+    model::VerificationScope, options::ModelBuilderOptions, simplifier::SimplificationPass,
+};
+use move_prover_boogie_backend::options::{BoogieOptions, VectorTheory};
+use move_stackless_bytecode::options::{AutoTraceLevel, ProverOptions};
+
+/// Atomic used to prevent re-initialization of logging.
+static LOGGER_CONFIGURED: AtomicBool = AtomicBool::new(false);
+
+/// Atomic used to detect whether we are running in test mode.
+static TEST_MODE: AtomicBool = AtomicBool::new(false);
+
+/// Represents options provided to the tool. Most of those options are configured via a toml
+/// source; some over the command line flags.
+///
+/// NOTE: any fields carrying structured data must appear at the end for making
+/// toml printing work. When changing this config, use `mvp --print-config` to
+/// verify this works.
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct Options {
+    /// The path to the boogie output which represents the verification problem.
+    pub output_path: String,
+    /// Verbosity level for logging.
+    pub verbosity_level: LevelFilter,
+    /// Whether to run the documentation generator instead of the prover.
+    pub run_docgen: bool,
+    /// Whether to run the ABI generator instead of the prover.
+    pub run_abigen: bool,
+    /// Whether to run the error map generator instead of the prover.
+    pub run_errmapgen: bool,
+    /// Whether to run the read write set analysis instead of the prover
+    pub run_read_write_set: bool,
+    /// Whether to run the internal reference escape analysis instead of the prover
+    pub run_escape: bool,
+    /// The paths to the Move sources.
+    pub move_sources: Vec<String>,
+    /// The paths to any dependencies for the Move sources. Those will not be verified but
+    /// can be used by `move_sources`.
+    pub move_deps: Vec<String>,
+    /// The values assigned to named addresses in the Move code being verified.
+    pub move_named_address_values: Vec<String>,
+    /// Whether to run experimental pipeline
+    pub experimental_pipeline: bool,
+    /// Options for printing out modules and functions reachable by script functions
+    pub script_reach: bool,
+
+    /// BEGIN OF STRUCTURED OPTIONS. DO NOT ADD VALUE FIELDS AFTER THIS
+    /// Options for the model builder.
+    pub model_builder: ModelBuilderOptions,
+    /// Options for the documentation generator.
+    pub docgen: DocgenOptions,
+    /// Options for the prover.
+    pub prover: ProverOptions,
+    /// Options for the prover backend.
+    pub backend: BoogieOptions,
+    /// Options for the ABI generator.
+    pub abigen: AbigenOptions,
+    /// Options for the error map generator.
+    /// TODO: this currently create errors during deserialization, so skip them for this.
+    #[serde(skip_serializing)]
+    pub errmapgen: ErrmapOptions,
+}
+
+impl Default for Options {
+    fn default() -> Self {
+        Self {
+            output_path: "output.bpl".to_string(),
+            run_docgen: false,
+            run_abigen: false,
+            run_errmapgen: false,
+            run_read_write_set: false,
+            run_escape: false,
+            verbosity_level: LevelFilter::Info,
+            move_sources: vec![],
+            move_deps: vec![],
+            move_named_address_values: vec![],
+            model_builder: ModelBuilderOptions::default(),
+            prover: ProverOptions::default(),
+            backend: BoogieOptions::default(),
+            docgen: DocgenOptions::default(),
+            abigen: AbigenOptions::default(),
+            errmapgen: ErrmapOptions::default(),
+            experimental_pipeline: false,
+            script_reach: false,
+        }
+    }
+}
+
+pub static DEFAULT_OPTIONS: Lazy<Options> = Lazy::new(Options::default);
+
+impl Options {
+    /// Creates options from toml configuration source.
+    pub fn create_from_toml(toml_source: &str) -> anyhow::Result<Options> {
+        Ok(toml::from_str(toml_source)?)
+    }
+
+    /// Creates options from toml configuration file.
+    pub fn create_from_toml_file(toml_file: &str) -> anyhow::Result<Options> {
+        Self::create_from_toml(&std::fs::read_to_string(toml_file)?)
+    }
+
+    // Creates options from command line arguments. This parses the arguments and terminates
+    // the program on errors, printing usage information. The first argument is expected to be
+    // the program name.
+    pub fn create_from_args(args: &[String]) -> anyhow::Result<Options> {
+        // Clap definition of the command line interface.
+        let is_number = |s: &str| {
+            s.parse::<usize>()
+                .map(|_| ())
+                .map_err(|_| "expected number".to_string())
+        };
+        let cli = Command::new("mvp")
+            .version("0.1.0")
+            .about("The Move Prover")
+            .author("The Diem Core Contributors")
+            .arg(
+                Arg::new("config")
+                    .short('c')
+                    .long("config")
+                    .num_args(1)
+                    .value_name("TOML_FILE")
+                    .help("path to a configuration file. \
+                     Values in this file will be overridden by command line flags"),
+            )
+            .arg(
+                Arg::new("config-str")
+                    .conflicts_with("config")
+                    .short('C')
+                    .long("config-str")
+                    .num_args(1)
+                    .action(clap::ArgAction::Append)
+                    .number_of_values(1)
+                    .value_name("TOML_STRING")
+                    .help("inlines configuration string in toml syntax. Can be repeated. \
+                     Use as in `-C=prover.opt=value -C=backend.opt=value`"),
+            )
+            .arg(
+                Arg::new("print-config")
+                    .long("print-config")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("prints the effective toml configuration, then exits")
+            )
+            .arg(
+                Arg::new("output")
+                    .short('o')
+                    .long("output")
+                    .num_args(1)
+                    .value_name("BOOGIE_FILE")
+                    .help("path to the boogie output which represents the verification problem"),
+            )
+            .arg(
+                Arg::new("verbosity")
+                    .short('v')
+                    .long("verbose")
+                    .num_args(1)
+                    .value_parser(["error", "warn", "info", "debug"])
+                    .help("verbosity level"),
+            )
+            .arg(
+                Arg::new("vector-theory")
+                    .long("vector-theory")
+                    .num_args(1)
+                    .value_parser(["BoogieArray", "BoogieArrayIntern",
+                                              "SmtArray", "SmtArrayExt", "SmtSeq"])
+                    .help("vector theory to use"),
+            )
+            .arg(
+                Arg::new("generate-only")
+                    .long("generate-only")
+                    .short('g')
+                    .action(clap::ArgAction::SetTrue)
+                    .help("only generates boogie file but does not call boogie"),
+            )
+            .arg(
+                Arg::new("severity")
+                    .long("severity")
+                    .short('s')
+                    .num_args(1)
+                    .value_parser(["bug", "error", "warn", "note"])
+                    .help("The minimall level on which diagnostics are reported")
+            )
+            .arg(
+                Arg::new("trace")
+                    .long("trace")
+                    .short('t')
+                    .action(clap::ArgAction::SetTrue)
+                    .help("enables automatic tracing of expressions in prover errors")
+            )
+            .arg(
+                Arg::new("keep")
+                    .long("keep")
+                    .short('k')
+                    .action(clap::ArgAction::SetTrue)
+                    .help("keeps intermediate artifacts of the backend around")
+            )
+            .arg(
+                Arg::new("boogie-poly")
+                    .long("boogie-poly")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to use the old polymorphic Boogie backend")
+            )
+            .arg(
+                Arg::new("inv-v1")
+                    .long("inv-v1")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to use the old v1 invariant processing (without disabled invariants)")
+            )
+            .arg(
+                Arg::new("negative")
+                    .long("negative")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs negative verification checks")
+            ).arg(
+                Arg::new("seed")
+                    .long("seed")
+                    .short('S')
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets a random seed for the prover (default 0)")
+            )
+            .arg(
+                Arg::new("cores")
+                    .long("cores")
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets the number of cores to use. \
+                     NOTE: multiple cores may currently lead to scrambled model \
+                     output from boogie (default 4)")
+            )
+            .arg(
+                Arg::new("timeout")
+                    .long("timeout")
+                    .short('T')
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets a timeout (in seconds) for each \
+                             individual verification condition (default 40)")
+            )
+            .arg(
+                Arg::new("ignore-pragma-opaque-when-possible")
+                    .long("ignore-pragma-opaque-when-possible")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("Ignore the \"opaque\" pragma on specs of \
+                    all functions when possible"),
+            )
+            .arg(
+                Arg::new("ignore-pragma-opaque-internal-only")
+                    .long("ignore-pragma-opaque-internal-only")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("Ignore the \"opaque\" pragma on specs of \
+                    internal functions when possible"),
+            )
+            .arg(
+                Arg::new("simplification-pipeline")
+                    .long("simplify")
+                    .num_args(1)
+                    .action(clap::ArgAction::Append)
+                    .number_of_values(1)
+                    .help("Specify one simplification pass to run on the specifications. \
+                    This option May be specified multiple times to compose a pipeline")
+            )
+            .arg(
+                Arg::new("docgen")
+                    .long("docgen")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the documentation generator instead of the prover. \
+                    Generated docs will be written into the directory `./doc` unless configured otherwise via toml"),
+            )
+            .arg(
+                Arg::new("docgen-template")
+                    .long("docgen-template")
+                    .num_args(1)
+                    .value_name("FILE")
+                    .help("a template for documentation generation."),
+            )
+            .arg(
+                Arg::new("abigen")
+                    .long("abigen")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the ABI generator instead of the prover. \
+                    Generated ABIs will be written into the directory `./abi` unless configured otherwise via toml"),
+            )
+            .arg(
+                Arg::new("errmapgen")
+                    .long("errmapgen")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the error map generator instead of the prover. \
+                    The generated error map will be written to `errmap` unless configured otherwise"),
+            )
+            .arg(
+                Arg::new("packedtypesgen")
+                    .long("packedtypesgen")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the packed types generator instead of the prover.")
+            )
+            .arg(
+                Arg::new("escape")
+                    .long("escape")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the escape analysis instead of the prover.")
+            )
+            .arg(
+                Arg::new("read-write-set")
+                    .long("read-write-set")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("runs the read/write set analysis instead of the prover.")
+            )
+            .arg(
+                Arg::new("verify")
+                    .long("verify")
+                    .num_args(1)
+                    .value_parser(["public", "all", "none"])
+                    .value_name("SCOPE")
+                    .help("default scope of verification \
+                    (can be overridden by `pragma verify=true|false`)"),
+            )
+            .arg(
+                Arg::new("bench-repeat")
+                    .long("bench-repeat")
+                    .num_args(1)
+                    .value_name("COUNT")
+                    .value_parser(is_number)
+                    .help(
+                        "for benchmarking: how many times to call the backend on the verification problem",
+                    ),
+            )
+            .arg(
+                Arg::new("mutation")
+                    .long("mutation")
+                    .action(clap::ArgAction::SetTrue)
+                    .help(
+                        "Specifies to use the mutation pass",
+                    ),
+            )
+            .arg(
+                Arg::new("mutation-add-sub")
+                    .long("mutation-add-sub")
+                    .num_args(1)
+                    .value_name("COUNT")
+                    .value_parser(is_number)
+                    .help(
+                        "indicates that this program should mutate the indicated plus operation to a minus\
+                        specifically by modifyig the \"nth\" such operation",
+                    ),
+            )
+            .arg(
+                Arg::new("mutation-sub-add")
+                    .long("mutation-sub-add")
+                    .num_args(1)
+                    .value_name("COUNT")
+                    .value_parser(is_number)
+                    .help(
+                        "indicates that this program should mutate the indicated minus operation to a plus\
+                        specifically by modifyig the \"nth\" such operation",
+                    ),
+            )
+            .arg(
+                Arg::new("mutation-mul-div")
+                    .long("mutation-mul-div")
+                    .num_args(1)
+                    .value_name("COUNT")
+                    .value_parser(is_number)
+                    .help(
+                        "indicates that this program should mutate the indicated multiplication operation to a divide\
+                        specifically by modifyig the \"nth\" such operation",
+                    ),
+            )
+            .arg(
+                Arg::new("mutation-div-mul")
+                    .long("mutation-div-mul")
+                    .num_args(1)
+                    .value_name("COUNT")
+                    .value_parser(is_number)
+                    .help(
+                        "indicates that this program should mutate the indicated divide operation to a multiplication\
+                        specifically by modifyig the \"nth\" such operation",
+                    ),
+            )
+            .arg(
+                Arg::new("dependencies")
+                    .long("dependency")
+                    .short('d')
+                    .action(clap::ArgAction::Append)
+                    .number_of_values(1)
+                    .num_args(1)
+                    .value_name("PATH_TO_DEPENDENCY")
+                    .help("path to a Move file, or a directory which will be searched for \
+                    Move files, containing dependencies which will not be verified")
+            )
+            .arg(
+                Arg::new("named-addresses")
+                .long("named-addresses")
+                .short('a')
+                .action(clap::ArgAction::Append)
+                .num_args(1)
+                .help("specifies the value(s) of named addresses used in Move files")
+            )
+            .arg(
+                Arg::new("sources")
+                    .action(clap::ArgAction::Append)
+                    .value_name("PATH_TO_SOURCE_FILE")
+                    .num_args(1..)
+                    .help("the source files to verify"),
+            )
+            .arg(
+                Arg::new("eager-threshold")
+                    .long("eager-threshold")
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets the eager threshold for quantifier instantiation (default 100)")
+            )
+            .arg(
+                Arg::new("lazy-threshold")
+                    .long("lazy-threshold")
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets the lazy threshold for quantifier instantiation (default 100)")
+            )
+            .arg(
+                Arg::new("dump-bytecode")
+                    .long("dump-bytecode")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to dump the transformed bytecode to a file")
+            )
+            .arg(
+                Arg::new("dump-cfg")
+                    .long("dump-cfg")
+                    .action(clap::ArgAction::SetTrue)
+                    .requires("dump-bytecode")
+                    .help("whether to dump the per-function control-flow graphs (in dot format) to files")
+            )
+            .arg(
+                Arg::new("num-instances")
+                    .long("num-instances")
+                    .num_args(1)
+                    .value_name("NUMBER")
+                    .value_parser(is_number)
+                    .help("sets the number of Boogie instances to run concurrently (default 1)")
+            )
+            .arg(
+                Arg::new("sequential")
+                    .long("sequential")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to run the Boogie instances sequentially")
+            )
+            .arg(
+                Arg::new("stable-test-output")
+                    .long("stable-test-output")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("instruct the prover to produce output in diagnosis which is stable \
+                     and suitable for baseline tests. This redacts values in diagnosis which might\
+                     be non-deterministic, and may do other things to keep output stable.")
+            )
+            .arg(
+                Arg::new("use-cvc5")
+                    .long("use-cvc5")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("uses cvc5 solver instead of z3")
+            )
+            .arg(
+                Arg::new("use-exp-boogie")
+                    .long("use-exp-boogie")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("uses experimental boogie expected in EXP_BOOGIE_EXE")
+            )
+            .arg(
+                Arg::new("generate-smt")
+                    .long("generate-smt")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("instructs boogie to log smtlib files for verified functions")
+            )
+            .arg(
+                Arg::new("experimental-pipeline")
+                    .long("experimental-pipeline")
+                    .short('e')
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to run experimental pipeline")
+            )
+            .arg(
+                Arg::new("weak-edges")
+                    .long("weak-edges")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("whether to use exclusively weak edges in borrow analysis")
+            )
+            .arg(
+                Arg::new("exp_mut_param")
+                    .long("exp-mut-param")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("exp_mut_param experiment")
+            )
+            .arg(
+                Arg::new("check-inconsistency")
+                    .long("check-inconsistency")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("checks whether there is any inconsistency")
+            )
+            .arg(
+                Arg::new("unconditional-abort-as-inconsistency")
+                    .long("unconditional-abort-as-inconsistency")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("treat functions that do not return (i.e., abort unconditionally) \
+                    as inconsistency violations")
+            )
+            .arg(
+                Arg::new("verify-only")
+                    .long("verify-only")
+                    .num_args(1)
+                    .value_name("FUNCTION_NAME")
+                    .help("only generate verification condition for one function. \
+                    This overrides verification scope and can be overridden by the pragma verify=false")
+            )
+            .arg(
+                Arg::new("z3-trace")
+                    .long("z3-trace")
+                    .num_args(1)
+                    .value_name("FUNCTION_NAME")
+                    .help("only generate verification condition for given function, \
+                    and generate a z3 trace file for analysis. The file will be stored \
+                    at FUNCTION_NAME.z3log.")
+            )
+            .arg(
+                Arg::new("script-reach")
+                    .long("script-reach")
+                    .action(clap::ArgAction::SetTrue)
+                    .help("For each script function which is verification target, \
+                    print out the names of all called functions, directly or indirectly.")
+            )
+            .arg(
+                Arg::new("ban-int-2-bv")
+                    .long("ban-int-2-bv")
+                    .action(clap::ArgAction::SetTrue)
+                    .long("whether allow converting int to bit vector when generating the boogie file")
+            )
+            .after_help("More options available via `--config file` or `--config-str str`. \
+            Use `--print-config` to see format and current values. \
+            See `move-prover/src/cli.rs::Option` for documentation.");
+
+        // Parse the arguments. This will abort the program on parsing errors and print help.
+        // It will also accept options like --help.
+        let matches = cli.get_matches_from(args);
+
+        // Initialize options.
+        let mut options = if matches.contains_id("config") {
+            if matches.contains_id("config-str") {
+                return Err(anyhow!(
+                    "currently, if `--config` (including via $MOVE_PROVER_CONFIG) is given \
+                       `--config-str` cannot be used. Consider editing your \
+                       configuration file instead."
+                ));
+            }
+            let value = matches.get_one::<String>("config").unwrap();
+            if value.is_empty() {
+                Self::default()
+            } else {
+                Self::create_from_toml_file(matches.get_one::<String>("config").unwrap())?
+            }
+        } else if matches.contains_id("config-str") {
+            Self::create_from_toml(matches.get_one::<String>("config-str").unwrap())?
+        } else {
+            Options::default()
+        };
+
+        // Analyze arguments.
+        if matches.contains_id("output") {
+            options.output_path = matches.get_one::<String>("output").unwrap().to_string();
+        }
+        if matches.contains_id("verbosity") {
+            options.verbosity_level = match matches.get_one::<String>("verbosity").unwrap().as_str()
+            {
+                "error" => LevelFilter::Error,
+                "warn" => LevelFilter::Warn,
+                "info" => LevelFilter::Info,
+                "debug" => LevelFilter::Debug,
+                _ => unreachable!("should not happen"),
+            }
+        }
+        if matches.contains_id("vector-theory") {
+            options.backend.vector_theory =
+                match matches.get_one::<String>("vector-theory").unwrap().as_str() {
+                    "BoogieArray" => VectorTheory::BoogieArray,
+                    "BoogieArrayIntern" => VectorTheory::BoogieArrayIntern,
+                    "SmtArray" => VectorTheory::SmtArray,
+                    "SmtArrayExt" => VectorTheory::SmtArrayExt,
+                    "SmtSeq" => VectorTheory::SmtSeq,
+                    _ => unreachable!("should not happen"),
+                }
+        }
+
+        if matches.contains_id("severity") {
+            options.prover.report_severity =
+                match matches.get_one::<String>("severity").unwrap().as_str() {
+                    "bug" => Severity::Bug,
+                    "error" => Severity::Error,
+                    "warn" => Severity::Warning,
+                    "note" => Severity::Note,
+                    _ => unreachable!("should not happen"),
+                }
+        }
+
+        if matches.get_flag("generate-only") {
+            options.prover.generate_only = true;
+        }
+        if let Some(m) = matches.get_many::<String>("sources") {
+            options.move_sources = m.cloned().collect();
+        }
+        if let Some(m) = matches.get_many::<String>("dependencies") {
+            options.move_deps = m.cloned().collect();
+        }
+        if let Some(m) = matches.get_many::<String>("named-addresses") {
+            options.move_named_address_values = m.cloned().collect();
+        }
+        if matches.get_flag("mutation") {
+            options.prover.mutation = true;
+        }
+        if matches.contains_id("mutation-add-sub") {
+            options.prover.mutation_add_sub = matches
+                .get_one::<String>("mutation-add-sub")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("mutation-sub-add") {
+            options.prover.mutation_sub_add = matches
+                .get_one::<String>("mutation-sub-add")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("mutation-mul-div") {
+            options.prover.mutation_mul_div = matches
+                .get_one::<String>("mutation-mul-div")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("mutation-div-mul") {
+            options.prover.mutation_div_mul = matches
+                .get_one::<String>("mutation-div-mul")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("verify") {
+            options.prover.verify_scope =
+                match matches.get_one::<String>("verify").unwrap().as_str() {
+                    "public" => VerificationScope::Public,
+                    "all" => VerificationScope::All,
+                    "none" => VerificationScope::None,
+                    _ => unreachable!("should not happen"),
+                }
+        }
+        if matches.contains_id("bench-repeat") {
+            options.backend.bench_repeat = matches
+                .get_one::<String>("bench-repeat")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.get_flag("ignore-pragma-opaque-when-possible") {
+            options.model_builder.ignore_pragma_opaque_when_possible = true;
+        }
+        if matches.get_flag("ignore-pragma-opaque-internal-only") {
+            options.model_builder.ignore_pragma_opaque_internal_only = true;
+        }
+        if let Some(m) = matches.get_many::<String>("simplification-pipeline") {
+            for name in m {
+                let pass = SimplificationPass::from_str(name)
+                    .map_err(|e| anyhow!("Unknown simplification pass: {}", e))?;
+                options.model_builder.simplification_pipeline.push(pass);
+            }
+        }
+        if matches.get_flag("docgen") {
+            options.run_docgen = true;
+        }
+        if matches.contains_id("docgen-template") {
+            options.run_docgen = true;
+            options.docgen.root_doc_templates = vec![matches
+                .get_one::<String>("docgen-template")
+                .map(|s| s.to_string())
+                .unwrap()]
+        }
+        if matches.get_flag("abigen") {
+            options.run_abigen = true;
+        }
+        if matches.get_flag("errmapgen") {
+            options.run_errmapgen = true;
+        }
+        if matches.get_flag("read-write-set") {
+            options.run_read_write_set = true;
+        }
+        if matches.get_flag("escape") {
+            options.run_escape = true;
+        }
+        if matches.get_flag("trace") {
+            options.prover.auto_trace_level = AutoTraceLevel::VerifiedFunction;
+        }
+        if matches.get_flag("dump-bytecode") {
+            options.prover.dump_bytecode = true;
+        }
+        if matches.get_flag("dump-cfg") {
+            options.prover.dump_cfg = true;
+        }
+        if matches.contains_id("num-instances") {
+            let num_instances = matches
+                .get_one::<String>("num-instances")
+                .unwrap()
+                .parse::<usize>()?;
+            options.backend.num_instances = std::cmp::max(num_instances, 1); // at least one instance
+        }
+        if matches.get_flag("sequential") {
+            options.prover.sequential_task = true;
+        }
+        if matches.get_flag("stable-test-output") {
+            //options.prover.stable_test_output = true;
+            options.backend.stable_test_output = true;
+        }
+        if matches.get_flag("keep") {
+            options.backend.keep_artifacts = true;
+        }
+        if matches.get_flag("boogie-poly") {
+            options.prover.boogie_poly = true;
+        }
+        if matches.contains_id("seed") {
+            options.backend.random_seed = matches
+                .get_one::<String>("seed")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.get_flag("experimental-pipeline") {
+            options.experimental_pipeline = true;
+        }
+        if matches.contains_id("timeout") {
+            options.backend.vc_timeout = matches
+                .get_one::<String>("timeout")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("cores") {
+            options.backend.proc_cores = matches
+                .get_one::<String>("cores")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("eager-threshold") {
+            options.backend.eager_threshold = matches
+                .get_one::<String>("eager-threshold")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.contains_id("lazy-threshold") {
+            options.backend.lazy_threshold = matches
+                .get_one::<String>("lazy-threshold")
+                .unwrap()
+                .parse::<usize>()?;
+        }
+        if matches.get_flag("use-cvc5") {
+            options.backend.use_cvc5 = true;
+        }
+        if matches.get_flag("use-exp-boogie") {
+            options.backend.use_exp_boogie = true;
+        }
+        if matches.get_flag("generate-smt") {
+            options.backend.generate_smt = true;
+        }
+
+        if matches.get_flag("check-inconsistency") {
+            options.prover.check_inconsistency = true;
+        }
+        if matches.get_flag("unconditional-abort-as-inconsistency") {
+            options.prover.unconditional_abort_as_inconsistency = true;
+        }
+
+        if matches.contains_id("verify-only") {
+            options.prover.verify_scope = VerificationScope::Only(
+                matches
+                    .get_one::<String>("verify-only")
+                    .unwrap()
+                    .to_string(),
+            );
+        }
+
+        if matches.contains_id("z3-trace") {
+            let mut fun_name = matches.get_one::<String>("z3-trace").unwrap().as_str();
+            options.prover.verify_scope = VerificationScope::Only(fun_name.to_string());
+            if let Some(i) = fun_name.find("::") {
+                fun_name = &fun_name[i + 2..];
+            }
+            options.backend.z3_trace_file = Some(format!("{}.z3log", fun_name));
+        }
+
+        if matches.get_flag("script-reach") {
+            options.script_reach = true;
+        }
+
+        if matches.get_flag("ban-int-2-bv") {
+            options.prover.ban_int_2_bv = true;
+        }
+
+        options.backend.derive_options();
+
+        if matches.get_flag("print-config") {
+            println!("{}", toml::to_string(&options).unwrap());
+            Err(anyhow!("exiting"))
+        } else {
+            Ok(options)
+        }
+    }
+
+    /// Sets up logging based on provided options. This should be called as early as possible
+    /// and before any use of info!, warn! etc.
+    pub fn setup_logging(&self) {
+        if LOGGER_CONFIGURED
+            .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
+            .is_err()
+        {
+            return;
+        }
+        let config = ConfigBuilder::new()
+            .set_time_level(LevelFilter::Debug)
+            .set_level_padding(LevelPadding::Off)
+            .build();
+        let logger = if std::io::stderr().is_terminal() && std::io::stdout().is_terminal() {
+            CombinedLogger::init(vec![TermLogger::new(
+                self.verbosity_level,
+                config,
+                TerminalMode::Mixed,
+            )])
+        } else {
+            CombinedLogger::init(vec![SimpleLogger::new(self.verbosity_level, config)])
+        };
+        logger.expect("Unexpected CombinedLogger init failure");
+    }
+
+    pub fn setup_logging_for_test(&self) {
+        if LOGGER_CONFIGURED
+            .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
+            .is_err()
+        {
+            return;
+        }
+        TEST_MODE.store(true, Ordering::Relaxed);
+        SimpleLogger::init(self.verbosity_level, Config::default())
+            .expect("UnexpectedSimpleLogger failure");
+    }
+
+    /// Convenience function to enable debugging (like high verbosity) on this instance.
+    pub fn enable_debug(&mut self) {
+        self.verbosity_level = LevelFilter::Debug;
+    }
+
+    /// Convenience function to set verbosity level to only show errors and warnings.
+    pub fn set_quiet(&mut self) {
+        self.verbosity_level = LevelFilter::Warn
+    }
+}
+
+pub fn named_addresses_for_options(
+    named_address_values: &BTreeMap<String, NumericalAddress>,
+) -> Vec<String> {
+    named_address_values
+        .iter()
+        .map(|(name, addr)| format!("{}={}", name, addr))
+        .collect()
+}
diff --git a/vendors/move/crates/move-prover/src/lib.rs b/vendors/move/crates/move-prover/src/lib.rs
new file mode 100644
index 000000000..f9e0bdfd8
--- /dev/null
+++ b/vendors/move/crates/move-prover/src/lib.rs
@@ -0,0 +1,445 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::cli::Options;
+use anyhow::anyhow;
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{Buffer, ColorChoice, StandardStream, WriteColor},
+};
+#[allow(unused_imports)]
+use log::{debug, info, warn};
+use move_abigen::Abigen;
+use move_compiler::shared::PackagePaths;
+use move_docgen::Docgen;
+use move_errmapgen::ErrmapGen;
+use move_model::{
+    code_writer::CodeWriter, model::GlobalEnv, parse_addresses_from_options,
+    run_model_builder_with_options,
+};
+use move_prover_boogie_backend::{
+    add_prelude, boogie_wrapper::BoogieWrapper, bytecode_translator::BoogieTranslator,
+};
+use move_stackless_bytecode::{
+    escape_analysis::EscapeAnalysisProcessor,
+    function_target_pipeline::{FunctionTargetPipeline, FunctionTargetsHolder},
+    number_operation::GlobalNumberOperationState,
+    pipeline_factory,
+    read_write_set_analysis::{self, ReadWriteSetProcessor},
+};
+use std::{
+    collections::BTreeSet,
+    fs,
+    path::{Path, PathBuf},
+    time::Instant,
+};
+
+pub mod cli;
+
+// =================================================================================================
+// Prover API
+
+pub fn run_move_prover_errors_to_stderr(options: Options) -> anyhow::Result<()> {
+    let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+    run_move_prover(&mut error_writer, options)
+}
+
+pub fn run_move_prover<W: WriteColor>(
+    error_writer: &mut W,
+    options: Options,
+) -> anyhow::Result<()> {
+    let now = Instant::now();
+    // Run the model builder.
+    let addrs = parse_addresses_from_options(options.move_named_address_values.clone())?;
+    let env = run_model_builder_with_options(
+        vec![PackagePaths {
+            name: None,
+            paths: options.move_sources.clone(),
+            named_address_map: addrs.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: options.move_deps.clone(),
+            named_address_map: addrs,
+        }],
+        options.model_builder.clone(),
+        None,
+    )?;
+    run_move_prover_with_model(&env, error_writer, options, Some(now))
+}
+
+/// Create the initial number operation state for each function and struct
+pub fn create_init_num_operation_state(env: &GlobalEnv) {
+    let mut global_state: GlobalNumberOperationState = Default::default();
+    for module_env in env.get_modules() {
+        for struct_env in module_env.get_structs() {
+            global_state.create_initial_struct_oper_state(&struct_env);
+        }
+        for fun_env in module_env.get_functions() {
+            global_state.create_initial_func_oper_state(&fun_env);
+        }
+    }
+    //global_state.create_initial_exp_oper_state(env);
+    env.set_extension(global_state);
+}
+
+pub fn run_move_prover_with_model<W: WriteColor>(
+    env: &GlobalEnv,
+    error_writer: &mut W,
+    options: Options,
+    timer: Option<Instant>,
+) -> anyhow::Result<()> {
+    let now = timer.unwrap_or_else(Instant::now);
+
+    let build_duration = now.elapsed();
+    check_errors(
+        env,
+        &options,
+        error_writer,
+        "exiting with model building errors",
+    )?;
+    env.report_diag(error_writer, options.prover.report_severity);
+
+    // Add the prover options as an extension to the environment, so they can be accessed
+    // from there.
+    env.set_extension(options.prover.clone());
+
+    // Populate initial number operation state for each function and struct based on the pragma
+    create_init_num_operation_state(env);
+
+    // Until this point, prover and docgen have same code. Here we part ways.
+    if options.run_docgen {
+        return run_docgen(env, &options, error_writer, now);
+    }
+    // Same for ABI generator.
+    if options.run_abigen {
+        return run_abigen(env, &options, now);
+    }
+    // Same for the error map generator
+    if options.run_errmapgen {
+        return {
+            run_errmapgen(env, &options, now);
+            Ok(())
+        };
+    }
+    // Same for read/write set analysis
+    if options.run_read_write_set {
+        return {
+            run_read_write_set(env, &options, now);
+            Ok(())
+        };
+    }
+    // Same for escape analysis
+    if options.run_escape {
+        return {
+            run_escape(env, &options, now);
+            Ok(())
+        };
+    }
+
+    // Check correct backend versions.
+    options.backend.check_tool_versions()?;
+
+    // Print functions that are reachable from the script function if the flag is set
+    if options.script_reach {
+        print_script_reach(env);
+    }
+
+    // Create and process bytecode
+    let now = Instant::now();
+    let targets = create_and_process_bytecode(&options, env);
+    let trafo_duration = now.elapsed();
+    check_errors(
+        env,
+        &options,
+        error_writer,
+        "exiting with bytecode transformation errors",
+    )?;
+
+    // Generate boogie code
+    let now = Instant::now();
+    let code_writer = generate_boogie(env, &options, &targets)?;
+    let gen_duration = now.elapsed();
+    check_errors(
+        env,
+        &options,
+        error_writer,
+        "exiting with condition generation errors",
+    )?;
+
+    // Verify boogie code.
+    let now = Instant::now();
+    verify_boogie(env, &options, &targets, code_writer)?;
+    let verify_duration = now.elapsed();
+
+    // Report durations.
+    info!(
+        "{:.3}s build, {:.3}s trafo, {:.3}s gen, {:.3}s verify, total {:.3}s",
+        build_duration.as_secs_f64(),
+        trafo_duration.as_secs_f64(),
+        gen_duration.as_secs_f64(),
+        verify_duration.as_secs_f64(),
+        build_duration.as_secs_f64()
+            + trafo_duration.as_secs_f64()
+            + gen_duration.as_secs_f64()
+            + verify_duration.as_secs_f64()
+    );
+    check_errors(
+        env,
+        &options,
+        error_writer,
+        "exiting with verification errors",
+    )
+}
+
+pub fn check_errors<W: WriteColor>(
+    env: &GlobalEnv,
+    options: &Options,
+    error_writer: &mut W,
+    msg: &'static str,
+) -> anyhow::Result<()> {
+    env.report_diag(error_writer, options.prover.report_severity);
+    if env.has_errors() {
+        Err(anyhow!(msg))
+    } else {
+        Ok(())
+    }
+}
+
+pub fn generate_boogie(
+    env: &GlobalEnv,
+    options: &Options,
+    targets: &FunctionTargetsHolder,
+) -> anyhow::Result<CodeWriter> {
+    let writer = CodeWriter::new(env.internal_loc());
+    add_prelude(env, &options.backend, &writer)?;
+    let mut translator = BoogieTranslator::new(env, &options.backend, targets, &writer);
+    translator.translate();
+    Ok(writer)
+}
+
+pub fn verify_boogie(
+    env: &GlobalEnv,
+    options: &Options,
+    targets: &FunctionTargetsHolder,
+    writer: CodeWriter,
+) -> anyhow::Result<()> {
+    let output_existed = std::path::Path::new(&options.output_path).exists();
+    debug!("writing boogie to `{}`", &options.output_path);
+    writer.process_result(|result| fs::write(&options.output_path, result))?;
+    if !options.prover.generate_only {
+        let boogie = BoogieWrapper {
+            env,
+            targets,
+            writer: &writer,
+            options: &options.backend,
+        };
+        boogie.call_boogie_and_verify_output(&options.output_path)?;
+        if !output_existed && !options.backend.keep_artifacts {
+            std::fs::remove_file(&options.output_path).unwrap_or_default();
+        }
+    }
+    Ok(())
+}
+
+/// Create bytecode and process it.
+pub fn create_and_process_bytecode(options: &Options, env: &GlobalEnv) -> FunctionTargetsHolder {
+    let mut targets = FunctionTargetsHolder::default();
+    let output_dir = Path::new(&options.output_path)
+        .parent()
+        .expect("expect the parent directory of the output path to exist");
+    let output_prefix = options.move_sources.get(0).map_or("bytecode", |s| {
+        Path::new(s).file_name().unwrap().to_str().unwrap()
+    });
+
+    // Add function targets for all functions in the environment.
+    for module_env in env.get_modules() {
+        if module_env.is_target() {
+            info!("preparing module {}", module_env.get_full_name_str());
+        }
+        if options.prover.dump_bytecode {
+            let dump_file = output_dir.join(format!("{}.mv.disas", output_prefix));
+            fs::write(&dump_file, &module_env.disassemble()).expect("dumping disassembled module");
+        }
+        for func_env in module_env.get_functions() {
+            targets.add_target(&func_env)
+        }
+    }
+
+    // Create processing pipeline and run it.
+    let pipeline = if options.experimental_pipeline {
+        pipeline_factory::experimental_pipeline()
+    } else {
+        pipeline_factory::default_pipeline_with_options(&options.prover)
+    };
+
+    if options.prover.dump_bytecode {
+        let dump_file_base = output_dir
+            .join(output_prefix)
+            .into_os_string()
+            .into_string()
+            .unwrap();
+        pipeline.run_with_dump(env, &mut targets, &dump_file_base, options.prover.dump_cfg)
+    } else {
+        pipeline.run(env, &mut targets);
+    }
+
+    targets
+}
+
+// Tools using the Move prover top-level driver
+// ============================================
+
+// TODO: make those tools independent. Need to first address the todo to
+// move the model builder into the move-model crate.
+
+// Print functions that are reachable from script functions available in the `GlobalEnv`
+fn print_script_reach(env: &GlobalEnv) {
+    let target_modules = env.get_target_modules();
+    let mut func_ids = BTreeSet::new();
+
+    for m in &target_modules {
+        for f in m.get_functions() {
+            if f.is_entry() {
+                let qualified_id = f.get_qualified_id();
+                func_ids.insert(qualified_id);
+                let trans_funcs = f.get_transitive_closure_of_called_functions();
+                for trans_func in trans_funcs {
+                    func_ids.insert(trans_func);
+                }
+            }
+        }
+    }
+
+    if func_ids.is_empty() {
+        println!("no function is reached from the script functions in the target module");
+    } else {
+        for func_id in func_ids {
+            let func_env = env.get_function(func_id);
+            println!("{}", func_env.get_full_name_str());
+        }
+    }
+}
+
+fn run_docgen<W: WriteColor>(
+    env: &GlobalEnv,
+    options: &Options,
+    error_writer: &mut W,
+    now: Instant,
+) -> anyhow::Result<()> {
+    let generator = Docgen::new(env, &options.docgen);
+    let checking_elapsed = now.elapsed();
+    info!("generating documentation");
+    for (file, content) in generator.gen() {
+        let path = PathBuf::from(&file);
+        fs::create_dir_all(path.parent().unwrap())?;
+        fs::write(path.as_path(), content)?;
+    }
+    let generating_elapsed = now.elapsed();
+    info!(
+        "{:.3}s checking, {:.3}s generating",
+        checking_elapsed.as_secs_f64(),
+        (generating_elapsed - checking_elapsed).as_secs_f64()
+    );
+    if env.has_errors() {
+        env.report_diag(error_writer, options.prover.report_severity);
+        Err(anyhow!("exiting with documentation generation errors"))
+    } else {
+        Ok(())
+    }
+}
+
+fn run_abigen(env: &GlobalEnv, options: &Options, now: Instant) -> anyhow::Result<()> {
+    let mut generator = Abigen::new(env, &options.abigen);
+    let checking_elapsed = now.elapsed();
+    info!("generating ABI files");
+    generator.gen();
+    for (file, content) in generator.into_result() {
+        let path = PathBuf::from(&file);
+        fs::create_dir_all(path.parent().unwrap())?;
+        fs::write(path.as_path(), content)?;
+    }
+    let generating_elapsed = now.elapsed();
+    info!(
+        "{:.3}s checking, {:.3}s generating",
+        checking_elapsed.as_secs_f64(),
+        (generating_elapsed - checking_elapsed).as_secs_f64()
+    );
+    Ok(())
+}
+
+fn run_errmapgen(env: &GlobalEnv, options: &Options, now: Instant) {
+    let mut generator = ErrmapGen::new(env, &options.errmapgen);
+    let checking_elapsed = now.elapsed();
+    info!("generating error map");
+    generator.gen();
+    generator.save_result();
+    let generating_elapsed = now.elapsed();
+    info!(
+        "{:.3}s checking, {:.3}s generating",
+        checking_elapsed.as_secs_f64(),
+        (generating_elapsed - checking_elapsed).as_secs_f64()
+    );
+}
+
+fn run_read_write_set(env: &GlobalEnv, options: &Options, now: Instant) {
+    let mut targets = FunctionTargetsHolder::default();
+
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            targets.add_target(&func_env)
+        }
+    }
+    let mut pipeline = FunctionTargetPipeline::default();
+    pipeline.add_processor(ReadWriteSetProcessor::new());
+
+    let start = now.elapsed();
+    info!("generating read/write set");
+    pipeline.run(env, &mut targets);
+    read_write_set_analysis::get_read_write_set(env, &targets);
+    println!("generated for {:?}", options.move_sources);
+
+    let end = now.elapsed();
+    info!("{:.3}s analyzing", (end - start).as_secs_f64());
+}
+
+fn run_escape(env: &GlobalEnv, options: &Options, now: Instant) {
+    let mut targets = FunctionTargetsHolder::default();
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            targets.add_target(&func_env)
+        }
+    }
+    println!(
+        "Analyzing {} modules, {} declared functions, {} declared structs, {} total bytecodes",
+        env.get_module_count(),
+        env.get_declared_function_count(),
+        env.get_declared_struct_count(),
+        env.get_move_bytecode_instruction_count(),
+    );
+    let mut pipeline = FunctionTargetPipeline::default();
+    pipeline.add_processor(EscapeAnalysisProcessor::new());
+
+    let start = now.elapsed();
+    pipeline.run(env, &mut targets);
+    let end = now.elapsed();
+
+    // print escaped internal refs flagged by analysis. do not report errors in dependencies
+    let mut error_writer = Buffer::no_color();
+    env.report_diag_with_filter(&mut error_writer, |d| {
+        let fname = env.get_file(d.labels[0].file_id).to_str().unwrap();
+        options.move_sources.iter().any(|d| {
+            let p = Path::new(d);
+            if p.is_file() {
+                d == fname
+            } else {
+                Path::new(fname).parent().unwrap() == p
+            }
+        }) && d.severity >= Severity::Error
+    });
+    println!("{}", String::from_utf8_lossy(&error_writer.into_inner()));
+    info!("in ms, analysis took {:.3}", (end - start).as_millis())
+}
diff --git a/vendors/move/crates/move-prover/src/main.rs b/vendors/move/crates/move-prover/src/main.rs
new file mode 100644
index 000000000..57184b5ae
--- /dev/null
+++ b/vendors/move/crates/move-prover/src/main.rs
@@ -0,0 +1,36 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+
+use move_prover::{cli::Options, run_move_prover};
+use std::env;
+use std::io::IsTerminal;
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        let mut c = e.source();
+        while let Some(s) = c {
+            eprintln!("caused by: {}", s);
+            c = s.source();
+        }
+        std::process::exit(1)
+    }
+}
+
+fn run() -> anyhow::Result<()> {
+    let args: Vec<String> = env::args().collect();
+    let options = Options::create_from_args(&args)?;
+    let color = if std::io::stderr().is_terminal() && std::io::stdout().is_terminal() {
+        ColorChoice::Auto
+    } else {
+        ColorChoice::Never
+    };
+    options.setup_logging();
+    let mut error_writer = StandardStream::stderr(color);
+    run_move_prover(&mut error_writer, options)
+}
diff --git a/vendors/move/crates/move-prover/tests/README.md b/vendors/move/crates/move-prover/tests/README.md
new file mode 100644
index 000000000..b3b4acbea
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/README.md
@@ -0,0 +1,95 @@
+# Tests for the Move Prover
+
+This directory contains the unit tests for the Move Prover. Those tests are using baseline expectations of produced
+prover output (no output on success, specific diagnosis on failure). In addition to the tests here, the prover's
+stability also depends on verification tests of the Move standard library and the Diem framework, which are run via the
+prover's integration into the Move CLI and configured outside this tree.
+
+> NOTE: in order to run these tests locally, you must have installed tools and setup a few
+> environment variables. See [`../doc/user/install.md`](../doc/user/install.md) for details. If the
+> environment variables for configuring the prover are not set as described there, **all tests and this
+> directory will trivially pass**.
+
+> NOTE: these are baseline tests, with expectations of prover output stored in files ending in
+> `.exp`. To update those files, use `UPBL=1 cargo test`. To update or test a single file, you can
+> also provide a fragment of the Move source path.
+
+## Running the Prover on Sources in this Tree
+
+> NOTE: in contrast to older versions, the prover does not longer automatically pick a configuration file via the MOVE_PROVER_CONFIG variable.
+
+The sources in this tree can currently not be integrated with the Move package system, since some of them don't compile
+in combination. To call the prover directly, skipping the package system, use a command as below:
+
+```shell
+alias mvp=cargo run -p move-prover -- --config=<my_config.toml>
+```
+
+The file at the path to `<my_config.toml>` should contain (at least) the following content:
+
+```toml
+move_deps = [
+    "<your-path-to>/diem/language/move-stdlib/sources"
+]
+move_named_address_values = [
+    "Std=0x1",
+]
+```
+
+## Running Tests: Quick Guide
+
+- In order to regenerate baseline files, use `UPBL=1 cargo test <optional test filter>`
+- In order to narrow tests to a particular feature, use `MVP_TEST_FEATURE=<feature> cargo test`. If not set, all
+  features will be tested for each test they are enabled for. (See discussion below about feature enabling).
+- In order to run tests with consistency checking enabled, use `MVP_TEST_INCONSISTENCY=1 cargo test`.
+- In order to run tests with a specific flag combination, use `MVP_TEST_FLAGS=<flags> cargo test`.
+- In order to run the tests in the `tests/xsources` tree instead of the default locations, use
+  `MVP_TEST_X=1 cargo test`.
+
+Certain comments in the test sources are interpreted by the test driver as test directives. A directive is a single line
+comment in the source of the form `// <directive>: <value>`. Directives can be repeated. The following directives are
+supported:
+
+- `// flag: <flags>` to run the test with the given flags in addition to the default flags.
+- `// no_ci:` exclude this test from running in CI.
+- `// exclude_for: <feature>` to exclude a test for a feature configured as "inclusive" (see below).
+- `// also_include_for: <feature>` to include a test for a feature configured as
+  "exclusive".
+
+Features can be either inclusive or exclusive. For an inclusive feature all tests are run unless explicitly excluded
+with `// exclude_for`. For an exclusive feature only those tests are run which have the directive `// also_include_for`.
+
+Currently, the following features are available:
+
+- `default`: runs tests with all default flags.
+- `no_opaque`: runs tests in a special mode where the `opaque` pragma is ignored. This increases the load on the prover,
+  and functions as a stress test.
+- `cvc5`: runs tests configured to use the cvc5 solver as a backend.
+
+## Conventions
+
+There is a convention for test cases under this directory. In general, there are two kinds of test cases, which can be
+mixed in a file. The first type of test cases are "correct" Move functions which are expected to be proven so. Another
+type of test cases are incorrect Move functions which are expected to be disproven, with the created errors stored in
+so-called 'expectation baseline files' (`.exp`). The incorrect functions have suffix `_incorrect` in their names, by
+convention. It is expected that only errors for functions with this suffix appear in `.exp` files.
+
+## Debugging Long Running Tests
+
+By default, the prover uses a timeout of 40 seconds, which can be changed by the `-T=<seconds>`
+flag. Healthy tests should never take that long to finish. To avoid flakes in continuous integration, you should test
+your tests to be able to pass at least with `-T=20`. To do so use
+
+```shell script
+MVP_TEST_FLAGS="-T=20" cargo test -p move-prover
+```
+
+## Inconsistency Check
+
+If the flag `--check-inconsistency` is given, the prover not only verifies a target, but also checks if there is any
+inconsistent assumption in the verification. If the environment variable `MVP_TEST_INCONSISTENCY=1` is set, `cargo test`
+will perform the inconsistency check while running the tests in `sources` (i.e., the prover will run those tests with the flag `--check-inconsistency`).
+
+```shell script
+MVP_TEST_INCONSISTENCY=1 cargo test -p move-prover
+```
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesErrorTest.exp b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesErrorTest.exp
new file mode 100644
index 000000000..4fe9309ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesErrorTest.exp
@@ -0,0 +1,78 @@
+Move prover returns: exiting with verification errors
+error: caller does not have permission to modify `B::T` at given address
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:65:17
+   │
+65 │         let v = move_from<T>(addr1);
+   │                 ^^^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesErrorTest.move:63: move_from_test_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:74: move_from_test_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:63: move_from_test_incorrect
+   =         addr1 = <redacted>
+   =         addr2 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:64: move_from_test_incorrect
+   =         x0#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:65: move_from_test_incorrect
+
+error: caller does not have permission to modify `B::T` at given address
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:52:9
+   │
+52 │         move_to<T>(account, T{x: 2});
+   │         ^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesErrorTest.move:50: move_to_test_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:60: move_to_test_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:50: move_to_test_incorrect
+   =         account = <redacted>
+   =         addr2 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:51: move_to_test_incorrect
+   =         x0#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:52: move_to_test_incorrect
+
+error: caller does not have permission to modify `A::S` at given address
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:79:9
+   │
+79 │         A::mutate_at(addr1);
+   │         ^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesErrorTest.move:77: mutate_S_test1_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:86: mutate_S_test1_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:87: mutate_S_test1_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:77: mutate_S_test1_incorrect
+   =         addr1 = <redacted>
+   =         addr2 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:78: mutate_S_test1_incorrect
+   =         x0#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:79: mutate_S_test1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:95:13
+   │
+95 │             assert x0 == x1;
+   │             ^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesErrorTest.move:90: mutate_S_test2_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:99: mutate_S_test2_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:90: mutate_S_test2_incorrect
+   =         addr = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:91: mutate_S_test2_incorrect
+   =         x0#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:92: mutate_S_test2_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:93: mutate_S_test2_incorrect
+   =         x1#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:95: mutate_S_test2_incorrect
+
+error: caller does not have permission to modify `B::T` at given address
+   ┌─ tests/sources/functional/ModifiesErrorTest.move:38:17
+   │
+38 │         let t = borrow_global_mut<T>(addr1);
+   │                 ^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesErrorTest.move:36: mutate_at_test_incorrect
+   =     at tests/sources/functional/ModifiesErrorTest.move:47: mutate_at_test_incorrect (spec)
+   =     at tests/sources/functional/ModifiesErrorTest.move:36: mutate_at_test_incorrect
+   =         addr1 = <redacted>
+   =         addr2 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:37: mutate_at_test_incorrect
+   =         x0#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesErrorTest.move:38: mutate_at_test_incorrect
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.exp b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.exp
new file mode 100644
index 000000000..8d574f0a4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.exp
@@ -0,0 +1,20 @@
+Move prover returns: exiting with verification errors
+error: caller does not have permission to modify `A::S` at given address
+   ┌─ tests/sources/functional/ModifiesSchemaTest.move:31:9
+   │
+31 │         mutate_at(addr2)
+   │         ^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/ModifiesSchemaTest.move:29: mutate_at_wrapper2
+   =     at tests/sources/functional/ModifiesSchemaTest.move:9
+   =     at tests/sources/functional/ModifiesSchemaTest.move:29: mutate_at_wrapper2
+   =         addr1 = <redacted>
+   =         addr2 = <redacted>
+   =     at tests/sources/functional/ModifiesSchemaTest.move:30: mutate_at_wrapper2
+   =     at tests/sources/functional/ModifiesSchemaTest.move:12: mutate_at
+   =         addr = <redacted>
+   =     at tests/sources/functional/ModifiesSchemaTest.move:13: mutate_at
+   =         s#1#0 = <redacted>
+   =     at tests/sources/functional/ModifiesSchemaTest.move:14: mutate_at
+   =     at tests/sources/functional/ModifiesSchemaTest.move:15: mutate_at
+   =     at tests/sources/functional/ModifiesSchemaTest.move:31: mutate_at_wrapper2
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.move b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.move
new file mode 100644
index 000000000..726e7b983
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesSchemaTest.move
@@ -0,0 +1,38 @@
+address 0x0 {
+module A {
+
+    struct S has key {
+        x: u64
+    }
+    spec schema ModifiesSchema {
+        addr: address;
+        modifies global<S>(addr);
+    }
+
+    public fun mutate_at(addr: address) acquires S {
+        let s = borrow_global_mut<S>(addr);
+        s.x = 2;
+    }
+    spec mutate_at {
+        //pragma opaque = true;
+        include ModifiesSchema;
+    }
+
+    public fun mutate_at_wrapper1(addr: address) acquires S {
+        mutate_at(addr)
+    }
+    spec mutate_at_wrapper1 {
+        pragma opaque = true;
+        include ModifiesSchema;
+    }
+
+    public fun mutate_at_wrapper2(addr1: address, addr2: address) acquires S {
+        mutate_at(addr1);
+        mutate_at(addr2)
+    }
+    spec mutate_at_wrapper2 {
+        pragma opaque = true;
+        include ModifiesSchema{addr: addr1};
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTest.move b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTest.move
new file mode 100644
index 000000000..50ec5f13d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTest.move
@@ -0,0 +1,83 @@
+address 0x0 {
+module A {
+
+    struct S has key {
+        x: u64
+    }
+    public fun read_at(addr: address): u64 acquires S {
+        let s = borrow_global<S>(addr);
+        s.x
+    }
+    spec read_at {
+        pragma opaque = true;
+        aborts_if !exists<S>(addr);
+        ensures result == global<S>(addr).x;
+    }
+
+    public fun mutate_at(addr: address) acquires S {
+        let s = borrow_global_mut<S>(addr);
+        s.x = 2;
+    }
+    spec mutate_at {
+        pragma opaque = true;
+        ensures global<S>(addr).x == 2;
+        aborts_if !exists<S>(addr);
+        modifies global<S>(addr);
+    }
+}
+
+module B {
+    use 0x0::A;
+    use std::signer;
+
+    struct T has key {
+        x: u64
+    }
+
+    public fun mutate_at_test(addr: address) acquires T {
+        let t = borrow_global_mut<T>(addr);
+        t.x = 2;
+    }
+    spec mutate_at_test {
+        pragma opaque = true;
+        ensures global<T>(addr).x == 2;
+        modifies global<T>(addr);
+    }
+
+    public fun move_to_test(account: &signer) {
+        move_to<T>(account, T{x: 2});
+    }
+    spec move_to_test {
+        pragma opaque = true;
+        ensures global<T>(signer::address_of(account)).x == 2;
+        modifies global<T>(signer::address_of(account));
+    }
+
+    public fun move_from_test(addr: address): T acquires T {
+        move_from<T>(addr)
+    }
+    spec move_from_test {
+        pragma opaque = true;
+        requires global<T>(addr).x == 2;
+        ensures result.x == 2;
+        modifies global<T>(addr);
+    }
+
+    public fun mutate_S_test(addr1: address, addr2: address) acquires T {
+        let x0 = A::read_at(addr2);
+        A::mutate_at(addr1);
+        let x1 = A::read_at(addr2);
+        spec {
+            assert x0 == x1;
+        };
+        mutate_at_test(addr2)
+    }
+    spec mutate_S_test {
+        requires addr1 != addr2;
+        ensures global<A::S>(addr2) == old(global<A::S>(addr2));
+        ensures global<A::S>(addr1).x == 2;
+        ensures global<T>(addr2).x == 2;
+        modifies global<A::S>(addr1), global<T>(addr2);
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.exp b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.exp
new file mode 100644
index 000000000..4c7ef5eaf
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.exp
@@ -0,0 +1,16 @@
+Move prover returns: exiting with bytecode transformation errors
+error: function `A::mutate_at` is opaque but its specification does not have a modifies clause for `A::S`
+   ┌─ tests/sources/functional/ModifiesTypeTest.move:21:5
+   │
+21 │ ╭     spec mutate_at {
+22 │ │         pragma opaque = true;
+23 │ │     }
+   │ ╰─────^
+
+error: caller `B::mutate_S_test1_incorrect` specifies modify targets for `A::S` but callee `A::mutate_at` does not
+   ┌─ tests/sources/functional/ModifiesTypeTest.move:29:5
+   │
+29 │ ╭     public fun mutate_S_test1_incorrect(addr: address) {
+30 │ │         A::mutate_at(addr);
+31 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.move b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.move
new file mode 100644
index 000000000..d92fdd847
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/ModifiesTypeTest.move
@@ -0,0 +1,52 @@
+address 0x0 {
+module A {
+
+    struct S has key {
+        x: u64
+    }
+    public fun read_at(addr: address): u64 acquires S {
+        let s = borrow_global<S>(addr);
+        s.x
+    }
+    spec read_at {
+        pragma opaque = true;
+        aborts_if !exists<S>(addr);
+        ensures result == global<S>(addr).x;
+    }
+
+    public fun mutate_at(addr: address) acquires S {
+        let s = borrow_global_mut<S>(addr);
+        s.x = 2;
+    }
+    spec mutate_at {
+        pragma opaque = true;
+    }
+}
+
+module B {
+    use 0x0::A;
+
+    public fun mutate_S_test1_incorrect(addr: address) {
+        A::mutate_at(addr);
+    }
+    spec mutate_S_test1_incorrect {
+        pragma opaque = true;
+        modifies global<A::S>(addr);
+    }
+
+    public fun read_S_test1(addr: address): u64 {
+        A::read_at(addr)
+    }
+    spec read_S_test1 {
+        pragma opaque = true;
+        modifies global<A::S>(addr);
+    }
+
+    public fun read_S_test2(addr: address): u64 {
+        A::read_at(addr)
+    }
+    spec read_S_test1 {
+        pragma opaque = true;
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.exp b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.exp
new file mode 100644
index 000000000..093ba2796
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.exp
@@ -0,0 +1,146 @@
+Move prover returns: exiting with verification errors
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/aborts_if.move:35:9
+   │
+35 │         aborts_if _x <= _y;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/aborts_if.move:32: abort2_incorrect
+   =         _x = <redacted>
+   =         _y = <redacted>
+   =     at tests/sources/functional/aborts_if.move:33: abort2_incorrect
+   =     at tests/sources/functional/aborts_if.move:35: abort2_incorrect (spec)
+
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/aborts_if.move:52:9
+   │
+52 │         aborts_if x <= y;
+   │         ^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/aborts_if.move:47: abort4_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/aborts_if.move:48: abort4_incorrect
+   =     at tests/sources/functional/aborts_if.move:49: abort4_incorrect
+   =     at tests/sources/functional/aborts_if.move:52: abort4_incorrect (spec)
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/aborts_if.move:59:5
+   │
+57 │           if (x <= y) abort 1
+   │                       ------- abort happened here with code 0x1
+58 │       }
+59 │ ╭     spec abort5_incorrect {
+60 │ │         aborts_if x < y;
+61 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/aborts_if.move:56: abort5_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/aborts_if.move:57: abort5_incorrect
+   =         ABORTED
+
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/aborts_if.move:68:9
+   │
+68 │         aborts_if x <= y;
+   │         ^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/aborts_if.move:64: abort6_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/aborts_if.move:65: abort6_incorrect
+   =     at tests/sources/functional/aborts_if.move:66: abort6_incorrect
+   =     at tests/sources/functional/aborts_if.move:68: abort6_incorrect (spec)
+
+error: function does not abort under this condition
+    ┌─ tests/sources/functional/aborts_if.move:151:9
+    │
+151 │         aborts_if x == 4;
+    │         ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/aborts_if.move:145: abort_at_2_or_3_spec_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if.move:146: abort_at_2_or_3_spec_incorrect
+    =     at tests/sources/functional/aborts_if.move:147: abort_at_2_or_3_spec_incorrect
+    =     at tests/sources/functional/aborts_if.move:151: abort_at_2_or_3_spec_incorrect (spec)
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/aborts_if.move:157:5
+    │
+155 │           if (x == 2 || x == 3) abort 1;
+    │                                 ------- abort happened here with code 0x1
+156 │       }
+157 │ ╭     spec abort_at_2_or_3_strict_incorrect {
+158 │ │         // When the strict mode is enabled, no aborts_if clause means aborts_if false.
+159 │ │         pragma aborts_if_is_strict = true;
+160 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/aborts_if.move:154: abort_at_2_or_3_strict_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/aborts_if.move:139:5
+    │
+137 │           if (x == 2 || x == 3) abort 1;
+    │                                 ------- abort happened here with code 0x1
+138 │       }
+139 │ ╭     spec abort_at_2_or_3_total_incorrect {
+140 │ │         // Counter check that we get an error message without the pragma.
+141 │ │         // pragma aborts_if_is_partial = false;  // default
+142 │ │         aborts_if x == 2;
+143 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/aborts_if.move:136: abort_at_2_or_3_total_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
+    =         ABORTED
+
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/aborts_if.move:91:9
+   │
+91 │         aborts_if x == y;
+   │         ^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/aborts_if.move:86: multi_abort2_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/aborts_if.move:87: multi_abort2_incorrect
+   =     at tests/sources/functional/aborts_if.move:88: multi_abort2_incorrect
+   =     at tests/sources/functional/aborts_if.move:90: multi_abort2_incorrect (spec)
+   =     at tests/sources/functional/aborts_if.move:91: multi_abort2_incorrect (spec)
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/aborts_if.move:98:5
+    │
+ 96 │           abort 1
+    │           ------- abort happened here with code 0x1
+ 97 │       }
+ 98 │ ╭     spec multi_abort3_incorrect {
+ 99 │ │         aborts_if _x < _y;
+100 │ │         aborts_if _x == _y;
+101 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/aborts_if.move:95: multi_abort3_incorrect
+    =         _x = <redacted>
+    =         _y = <redacted>
+    =     at tests/sources/functional/aborts_if.move:96: multi_abort3_incorrect
+    =         ABORTED
+
+error: function does not abort under this condition
+    ┌─ tests/sources/functional/aborts_if.move:119:9
+    │
+119 │         aborts_if true;
+    │         ^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/aborts_if.move:113: multi_abort5_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if.move:114: multi_abort5_incorrect
+    =     at tests/sources/functional/aborts_if.move:117: multi_abort5_incorrect
+    =     at tests/sources/functional/aborts_if.move:119: multi_abort5_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.move b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.move
new file mode 100644
index 000000000..70f190bb6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if.move
@@ -0,0 +1,179 @@
+module 0x42::TestAbortsIf {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // -------------------------
+    // No `aborts_if` statements
+    // -------------------------
+
+    // succeeds, because the specification claims no 'aborts_if' condition.
+    fun no_aborts_if(_x: u64, _y: u64) {
+        abort 1
+    }
+    spec no_aborts_if {
+    }
+
+
+    // ----------------------------
+    // Single `aborts_if` statement
+    // ----------------------------
+
+    // succeeds. Very basic test.
+    fun abort1(x: u64, y: u64) {
+        if (!(x > y)) abort 1
+    }
+    spec abort1 {
+        aborts_if x <= y;
+    }
+
+    // fails, because it does not abort when x <= y.
+    fun abort2_incorrect(_x: u64, _y: u64) {
+    }
+    spec abort2_incorrect {
+        aborts_if _x <= _y;
+    }
+
+    // succeeds.
+    fun abort3(_x: u64, _y: u64) {
+        abort 1
+    }
+    spec abort3 {
+        aborts_if true;
+    }
+
+    // fails, because it does not abort when x <= y.
+    fun abort4_incorrect(x: u64, y: u64) {
+        if (x > y) abort 1
+    }
+    spec abort4_incorrect {
+        pragma aborts_if_is_partial = true;
+        aborts_if x <= y;
+    }
+
+    // fails, because it also aborts when x == y which condition has not been specified.
+    fun abort5_incorrect(x: u64, y: u64) {
+        if (x <= y) abort 1
+    }
+    spec abort5_incorrect {
+        aborts_if x < y;
+    }
+
+    // fails, because it does not abort when x == y.
+    fun abort6_incorrect(x: u64, y: u64) {
+        if (x < y) abort 1
+    }
+    spec abort6_incorrect {
+        aborts_if x <= y;
+    }
+
+
+    // -------------------------------
+    // Multiple `aborts_if` statements
+    // -------------------------------
+
+    // succeeds. Multiple 'aborts_if' conditions are 'or'ed.
+    fun multi_abort1(x: u64, y: u64) {
+        if (x <= y) abort 1
+    }
+    spec multi_abort1 {
+        aborts_if x < y;
+        aborts_if x == y;
+    }
+
+    // fails, because it does not abort when x == y.
+    fun multi_abort2_incorrect(x: u64, y: u64) {
+        if (x < y) abort 1
+    }
+    spec multi_abort2_incorrect {
+        aborts_if x < y;
+        aborts_if x == y;
+    }
+
+    // fails, because it also abort when x > y which condition has not been specified.
+    fun multi_abort3_incorrect(_x: u64, _y: u64) {
+        abort 1
+    }
+    spec multi_abort3_incorrect {
+        aborts_if _x < _y;
+        aborts_if _x == _y;
+    }
+
+    // succeeds. Aborts all the time.
+    fun multi_abort4(_x: u64, _y: u64) {
+        abort 1
+    }
+    spec multi_abort4 {
+        aborts_if _x < _y;
+        aborts_if _x == _y;
+        aborts_if _x > _y;
+    }
+
+    fun multi_abort5_incorrect(x: u64) {
+        if (x == 0) {
+            abort 1
+        };
+    }
+    spec multi_abort5_incorrect {
+        aborts_if true;
+        aborts_if x > 0;
+    }
+
+    // -------------------------------
+    // `aborts_if` pragmas
+    // -------------------------------
+
+    fun abort_at_2_or_3(x: u64) {
+        if (x == 2 || x == 3) abort 1;
+    }
+    spec abort_at_2_or_3 {
+        // It is ok to specify only one abort condition of we set partial to true.
+        pragma aborts_if_is_partial = true;
+        aborts_if x == 2;
+    }
+
+    fun abort_at_2_or_3_total_incorrect(x: u64) {
+        if (x == 2 || x == 3) abort 1;
+    }
+    spec abort_at_2_or_3_total_incorrect {
+        // Counter check that we get an error message without the pragma.
+        // pragma aborts_if_is_partial = false;  // default
+        aborts_if x == 2;
+    }
+
+    fun abort_at_2_or_3_spec_incorrect(x: u64) {
+        if (x == 2 || x == 3) abort 1;
+    }
+    spec abort_at_2_or_3_spec_incorrect {
+        // Even with the pragma, wrong aborts_if will be flagged.
+        pragma aborts_if_is_partial = true;
+        aborts_if x == 4;
+    }
+
+    fun abort_at_2_or_3_strict_incorrect(x: u64) {
+        if (x == 2 || x == 3) abort 1;
+    }
+    spec abort_at_2_or_3_strict_incorrect {
+        // When the strict mode is enabled, no aborts_if clause means aborts_if false.
+        pragma aborts_if_is_strict = true;
+    }
+
+    fun abort_1() {
+        abort 1
+    }
+    spec abort_1 {
+        pragma opaque;
+        aborts_if true with 1;
+    }
+
+    fun aborts_if_with_code(x: u64) {
+        if (x == 2 || x == 3) abort_1();
+    }
+    spec aborts_if_with_code {
+        // It is ok to specify only one abort condition of we set partial to true.
+        pragma aborts_if_is_partial = true;
+        aborts_if x == 2 with 1;
+        aborts_with 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.exp b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.exp
new file mode 100644
index 000000000..a0a440d95
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.exp
@@ -0,0 +1,94 @@
+Move prover returns: exiting with verification errors
+error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
+   ┌─ tests/sources/functional/aborts_if_with_code.move:77:5
+   │
+74 │               abort(2)
+   │               -------- abort happened here with code 0x2
+   ·
+77 │ ╭     spec aborts_if_with_code_mixed_invalid {
+78 │ │         aborts_if x == 1;
+79 │ │         aborts_if x == 2 with 1;
+80 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/aborts_if_with_code.move:69: aborts_if_with_code_mixed_invalid
+   =         x = <redacted>
+   =     at tests/sources/functional/aborts_if_with_code.move:70: aborts_if_with_code_mixed_invalid
+   =     at tests/sources/functional/aborts_if_with_code.move:73: aborts_if_with_code_mixed_invalid
+   =     at tests/sources/functional/aborts_if_with_code.move:74: aborts_if_with_code_mixed_invalid
+   =         ABORTED
+
+error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
+    ┌─ tests/sources/functional/aborts_if_with_code.move:105:5
+    │
+102 │               abort(2)
+    │               -------- abort happened here with code 0x2
+    ·
+105 │ ╭     spec aborts_with_invalid {
+106 │ │         aborts_with 1,3;
+107 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/aborts_if_with_code.move:97: aborts_with_invalid
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if_with_code.move:98: aborts_with_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:101: aborts_with_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:102: aborts_with_invalid
+    =         ABORTED
+
+error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
+    ┌─ tests/sources/functional/aborts_if_with_code.move:131:5
+    │
+128 │               abort(1)
+    │               -------- abort happened here with code 0x1
+    ·
+131 │ ╭     spec aborts_with_mixed_invalid {
+132 │ │         pragma aborts_if_is_partial = true;
+133 │ │         aborts_if x == 1 with 1;
+134 │ │         aborts_with 2;
+135 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/aborts_if_with_code.move:123: aborts_with_mixed_invalid
+    =         x = <redacted>
+    =     at tests/sources/functional/aborts_if_with_code.move:124: aborts_with_mixed_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:127: aborts_with_mixed_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:128: aborts_with_mixed_invalid
+    =         ABORTED
+
+error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
+   ┌─ tests/sources/functional/aborts_if_with_code.move:38:5
+   │
+31 │               abort 2
+   │               ------- abort happened here with code 0x2
+   ·
+38 │ ╭     spec conditional_abort_invalid {
+39 │ │         aborts_if x == 1 with 1; // wrong code
+40 │ │         aborts_if y == 2 with 3;
+41 │ │         ensures result == x;
+42 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/aborts_if_with_code.move:29: conditional_abort_invalid
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/aborts_if_with_code.move:30: conditional_abort_invalid
+   =     at tests/sources/functional/aborts_if_with_code.move:31: conditional_abort_invalid
+   =         ABORTED
+
+error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
+   ┌─ tests/sources/functional/aborts_if_with_code.move:48:5
+   │
+46 │           10 / x
+   │              - abort happened here with execution failure
+47 │       }
+48 │ ╭     spec exec_failure_invalid {
+49 │ │         aborts_if x == 0 with 1; // wrong code
+50 │ │         ensures result == 10 / x;
+51 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/aborts_if_with_code.move:45: exec_failure_invalid
+   =         x = <redacted>
+   =     at tests/sources/functional/aborts_if_with_code.move:46: exec_failure_invalid
+   =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.move b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.move
new file mode 100644
index 000000000..f65d5f0cb
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_if_with_code.move
@@ -0,0 +1,138 @@
+module 0x42::TestAbortsIfWithCode {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // AbortsIf With Code
+    // ==================
+
+    // Basic tests for error codes.
+    fun conditional_abort(x: u64, y: u64): u64 {
+        if (x == 1) {
+            abort 2
+        };
+        if (y == 2) {
+            abort 3
+        };
+        // This one can also abort on overflow, with execution failure (code = -1).
+        x + y
+    }
+    spec conditional_abort {
+        aborts_if x == 1 with 2;
+        aborts_if y == 2 with 3;
+        aborts_if x + y > MAX_U64 with EXECUTION_FAILURE;
+        ensures result == x + y;
+    }
+
+    // Basic test of wrong codes, failing verification.
+    fun conditional_abort_invalid(x: u64, y: u64): u64 {
+        if (x == 1) {
+            abort 2
+        };
+        if (y == 2) {
+            abort 3
+        };
+        x
+    }
+    spec conditional_abort_invalid {
+        aborts_if x == 1 with 1; // wrong code
+        aborts_if y == 2 with 3;
+        ensures result == x;
+    }
+
+    // Test for wrong code w/ EXECUTION_FAILURE
+    fun exec_failure_invalid(x: u64): u64 {
+        10 / x
+    }
+    spec exec_failure_invalid {
+        aborts_if x == 0 with 1; // wrong code
+        ensures result == 10 / x;
+    }
+
+    // AbortsIf With Code Mixed with Without Code
+    // ==========================================
+
+    fun aborts_if_with_code_mixed(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(2)
+        };
+    }
+    spec aborts_if_with_code_mixed {
+        aborts_if x == 1;
+        aborts_if x == 2 with 2;
+    }
+
+    fun aborts_if_with_code_mixed_invalid(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(2)
+        };
+    }
+    spec aborts_if_with_code_mixed_invalid {
+        aborts_if x == 1;
+        aborts_if x == 2 with 1;
+    }
+
+    // AbortsWith
+    // ==========
+
+    fun aborts_with(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(2)
+        };
+    }
+    spec aborts_with {
+        aborts_with 1,2;
+    }
+
+    fun aborts_with_invalid(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(2)
+        };
+    }
+    spec aborts_with_invalid {
+        aborts_with 1,3;
+    }
+
+    fun aborts_with_mixed(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(2)
+        };
+    }
+    spec aborts_with_mixed {
+        pragma aborts_if_is_partial = true;
+        aborts_if x == 1 with 1;
+        aborts_with 2;
+    }
+
+    fun aborts_with_mixed_invalid(x: u64) {
+        if (x == 1) {
+            abort(1)
+        };
+        if (x == 2) {
+            abort(1)
+        };
+    }
+    spec aborts_with_mixed_invalid {
+        pragma aborts_if_is_partial = true;
+        aborts_if x == 1 with 1;
+        aborts_with 2;
+    }
+
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_check.move b/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_check.move
new file mode 100644
index 000000000..32ea10735
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_check.move
@@ -0,0 +1,39 @@
+module 0x42::TestAbortsWithCheck {
+
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed.
+
+    fun aborts_with_check(x: u64, y: u64): u64 {
+        if (x == 1) {
+            abort 2
+        };
+        if (y == 2) {
+            abort 3
+        };
+        x
+    }
+    spec aborts_with_check {
+        aborts_if x == 1 with 2;
+        aborts_if y == 2 with 3;
+        aborts_with [check] 2, 3;
+        ensures result == x;
+    }
+
+   fun aborts_with_check_missing_incorrect(x: u64, y: u64): u64 {
+        if (x == 1) {
+            abort 2
+        };
+        if (y == 2) {
+            abort 3
+        };
+        x
+    }
+    spec aborts_with_check_missing_incorrect {
+        aborts_if x == 1 with 2;
+        aborts_if y == 2 with 3;
+        aborts_with [check] 2;
+        ensures result == x;
+    }
+    */
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_negative_check.move b/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_negative_check.move
new file mode 100644
index 000000000..b6b0d31c0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/aborts_with_negative_check.move
@@ -0,0 +1,22 @@
+module 0x42::TestAbortsWithCheck {
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed.
+
+    fun aborts_with_check_too_many_incorrect(x: u64, y: u64): u64 {
+        if (x == 1) {
+            abort 2
+        };
+        if (y == 2) {
+            abort 3
+        };
+        x
+    }
+    spec aborts_with_check_too_many_incorrect {
+        aborts_if x == 1 with 2;
+        aborts_if y == 2 with 3;
+        aborts_with [check] 2, 3, 4;
+        ensures result == x;
+    }
+    */
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/address_quant.exp b/vendors/move/crates/move-prover/tests/sources/functional/address_quant.exp
new file mode 100644
index 000000000..427ee8258
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/address_quant.exp
@@ -0,0 +1,15 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/address_quant.move:53:10
+   │
+53 │          invariant atMostOne();
+   │          ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/address_quant.move:46: multiple_copy_incorrect
+   =     at tests/sources/functional/address_quant.move:53
+   =     at tests/sources/functional/address_quant.move:54
+   =     at tests/sources/functional/address_quant.move:46: multiple_copy_incorrect
+   =         sndr = <redacted>
+   =     at tests/sources/functional/address_quant.move:47: multiple_copy_incorrect
+   =     at tests/sources/functional/address_quant.move:48: multiple_copy_incorrect
+   =     at tests/sources/functional/address_quant.move:53
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/address_quant.move b/vendors/move/crates/move-prover/tests/sources/functional/address_quant.move
new file mode 100644
index 000000000..0aa18447d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/address_quant.move
@@ -0,0 +1,61 @@
+// Tests of quantification over addresses.
+module 0x42::AddressQuant {
+
+    use std::signer;
+    struct R has key {
+        x: u64
+    }
+
+    spec module {
+        pragma verify = true;
+    }
+
+    spec module {
+       // helper functions
+        fun atMostOne(): bool {
+            forall a: address, b: address where exists<R>(a) && exists<R>(b) : a == b
+        }
+        fun atLeastOne(): bool {
+            exists a: address : exists<R>(a)
+        }
+    }
+
+    public fun initialize(sndr: &signer, special_addr: address) {
+        assert!(signer::address_of(sndr) == special_addr, 0);
+        move_to<R>(sndr, R{x:1});
+    }
+    spec initialize {
+        requires forall a: address : !exists<R>(a);
+        ensures forall a: address where exists<R>(a) : a == special_addr;
+        ensures atMostOne();
+        ensures atLeastOne();
+    }
+
+    // This is tricky. If it doesn't abort on the borrow_global,
+    // or on overflow, it will successfully increment a.x
+    public fun f(addr: address) acquires R {
+        let x_ref = borrow_global_mut<R>(addr);
+        x_ref.x = x_ref.x + 1;
+    }
+    spec f {
+        ensures global<R>(addr).x == old(global<R>(addr).x) + 1;
+    }
+
+    // sender() might be different from special_addr,
+    // so this should violate the invariant.
+    public fun multiple_copy_incorrect(sndr: &signer) {
+        move_to<R>(sndr, R{x:1});
+    }
+
+    // This asserts that there is at must one address with an R.
+    // Literally, if addresses a and b have an R, then a and b are the same.
+    spec schema ExactlyOne{
+         invariant atMostOne();
+         invariant atLeastOne();
+    }
+
+    spec module {
+        apply ExactlyOne to * except initialize;
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.exp b/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.exp
new file mode 100644
index 000000000..f6cdbed85
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.exp
@@ -0,0 +1,15 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/address_serialization_constant_size.move:19:9
+   │
+19 │         ensures len(bcs::serialize(mv1)) == len(bcs::serialize(mv2));
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/address_serialization_constant_size.move:15: serialized_move_values_diff_len_incorrect
+   =         mv1 = <redacted>
+   =         mv2 = <redacted>
+   =     at tests/sources/functional/address_serialization_constant_size.move:16: serialized_move_values_diff_len_incorrect
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/address_serialization_constant_size.move:17: serialized_move_values_diff_len_incorrect
+   =     at tests/sources/functional/address_serialization_constant_size.move:19: serialized_move_values_diff_len_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.move b/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.move
new file mode 100644
index 000000000..a0a9eae9b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/address_serialization_constant_size.move
@@ -0,0 +1,23 @@
+// Tests the additional axiom that constrains address serialization to have the same size.
+module 0x42::AddressSerialization {
+    use std::bcs;
+
+    /// Serialized representation of address typed Move values have the same vector length.
+    public fun serialized_addresses_same_len(addr1: &address, addr2: &address): (vector<u8>, vector<u8>) {
+        (bcs::to_bytes(addr1), bcs::to_bytes(addr2))
+    }
+    spec serialized_addresses_same_len {
+        ensures len(bcs::serialize(addr1)) == len(bcs::serialize(addr2));
+        ensures len(result_1) == len(result_2);
+    }
+
+    /// Serialized representation of Move values do not have the same length in general.
+    public fun serialized_move_values_diff_len_incorrect<MoveValue>(mv1: &MoveValue, mv2: &MoveValue): (vector<u8>, vector<u8>) {
+        (bcs::to_bytes(mv1), bcs::to_bytes(mv2))
+    }
+    spec serialized_move_values_diff_len_incorrect {
+        ensures len(bcs::serialize(mv1)) == len(bcs::serialize(mv2));
+        ensures len(result_1) == len(result_2);
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/arithm.exp b/vendors/move/crates/move-prover/tests/sources/functional/arithm.exp
new file mode 100644
index 000000000..9b13379e1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/arithm.exp
@@ -0,0 +1,221 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:128:5
+    │
+126 │           x / y
+    │             - abort happened here with execution failure
+127 │       }
+128 │ ╭     spec div_by_zero_u64_incorrect {
+129 │ │         aborts_if false;
+130 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:125: div_by_zero_u64_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:126: div_by_zero_u64_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:212:5
+    │
+210 │           x + y
+    │             - abort happened here with execution failure
+211 │       }
+212 │ ╭     spec overflow_u128_add_incorrect {
+213 │ │         aborts_if false;
+214 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:209: overflow_u128_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:210: overflow_u128_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:312:5
+    │
+310 │           x * y
+    │             - abort happened here with execution failure
+311 │       }
+312 │ ╭     spec overflow_u128_mul_incorrect {
+313 │ │         aborts_if false;
+314 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:309: overflow_u128_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:310: overflow_u128_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:164:5
+    │
+162 │           x + y
+    │             - abort happened here with execution failure
+163 │       }
+164 │ ╭     spec overflow_u16_add_incorrect {
+165 │ │         aborts_if false;
+166 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:161: overflow_u16_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:162: overflow_u16_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:265:5
+    │
+263 │           x * y
+    │             - abort happened here with execution failure
+264 │       }
+265 │ ╭     spec overflow_u16_mul_incorrect {
+266 │ │         aborts_if false;
+267 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:262: overflow_u16_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:263: overflow_u16_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:228:5
+    │
+226 │           x + y
+    │             - abort happened here with execution failure
+227 │       }
+228 │ ╭     spec overflow_u256_add_incorrect {
+229 │ │         aborts_if false;
+230 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:225: overflow_u256_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:226: overflow_u256_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:327:5
+    │
+325 │           x * y
+    │             - abort happened here with execution failure
+326 │       }
+327 │ ╭     spec overflow_u256_mul_incorrect {
+328 │ │         aborts_if false;
+329 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:324: overflow_u256_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:325: overflow_u256_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:180:5
+    │
+178 │           x + y
+    │             - abort happened here with execution failure
+179 │       }
+180 │ ╭     spec overflow_u32_add_incorrect {
+181 │ │         aborts_if false;
+182 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:177: overflow_u32_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:178: overflow_u32_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:281:5
+    │
+279 │           x * y
+    │             - abort happened here with execution failure
+280 │       }
+281 │ ╭     spec overflow_u32_mul_incorrect {
+282 │ │         aborts_if false;
+283 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:278: overflow_u32_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:279: overflow_u32_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:196:5
+    │
+194 │           x + y
+    │             - abort happened here with execution failure
+195 │       }
+196 │ ╭     spec overflow_u64_add_incorrect {
+197 │ │         aborts_if false;
+198 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:193: overflow_u64_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:194: overflow_u64_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:297:5
+    │
+295 │           x * y
+    │             - abort happened here with execution failure
+296 │       }
+297 │ ╭     spec overflow_u64_mul_incorrect {
+298 │ │         aborts_if false;
+299 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:294: overflow_u64_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:295: overflow_u64_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:148:5
+    │
+146 │           x + y
+    │             - abort happened here with execution failure
+147 │       }
+148 │ ╭     spec overflow_u8_add_incorrect {
+149 │ │         aborts_if false;
+150 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:145: overflow_u8_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:146: overflow_u8_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:249:5
+    │
+247 │           x * y
+    │             - abort happened here with execution failure
+248 │       }
+249 │ ╭     spec overflow_u8_mul_incorrect {
+250 │ │         aborts_if false;
+251 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:246: overflow_u8_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:247: overflow_u8_mul_incorrect
+    =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/arithm.move b/vendors/move/crates/move-prover/tests/sources/functional/arithm.move
new file mode 100644
index 000000000..f146fd411
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/arithm.move
@@ -0,0 +1,338 @@
+module 0x42::TestArithmetic {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // --------------------------
+    // Basic arithmetic operation
+    // --------------------------
+
+    // Most of the tests here just ensure that what the bytecode operation does
+    // is the same as the spec expressions.
+
+    // succeeds.
+	fun add_two_number(x: u64, y: u64): (u64, u64) {
+		let res: u64 = x + y;
+		let z: u64 = 3;
+		(z, res)
+	}
+	spec add_two_number {
+	    aborts_if x + y > max_u64();
+	    ensures result_1 == 3;
+	    ensures result_2 == x + y;
+	}
+
+    fun div(x: u64, y: u64): (u64, u64) {
+        (x / y, x % y)
+    }
+    spec div {
+        aborts_if y == 0;
+        ensures result_1 == x / y;
+        ensures result_2 == x % y;
+    }
+
+    // succeeds.
+	fun multiple_ops(x: u64, y: u64, z: u64): u64 {
+		x + y * z
+	}
+	spec multiple_ops {
+        ensures result == x + y * z;
+    }
+
+    // succeeds.
+	fun bool_ops(a: u64, b: u64): (bool, bool) {
+        let c: bool;
+        let d: bool;
+        c = a > b && a >= b;
+        d = a < b || a <= b;
+        if (!(c != d)) abort 42;
+        (c, d)
+    }
+    spec bool_ops {
+        ensures result_1 <==> (a > b && a >= b);
+        ensures result_2 <==> (a < b || a <= b);
+    }
+
+    // succeeds.
+	fun arithmetic_ops(a: u64): (u64, u64) {
+        let c: u64;
+        c = (6 + 4 - 1) * 2 / 3 % 4;
+        if (c != 2) abort 42;
+        (c, a)
+    }
+    spec arithmetic_ops {
+        ensures result_1 == (6 + 4 - 1) * 2 / 3 % 4;
+        ensures result_2 == a;
+    }
+
+    fun f(x: u64) : u64 {
+        x+1
+    }
+    spec f {
+        aborts_if x+1 > max_u64();
+        ensures result == x+1;
+    }
+
+    fun g(x: u64) : u64 {
+        x+2
+    }
+    spec g {
+        aborts_if x+2 > max_u64();
+        ensures result == x+2;
+    }
+
+    fun h(b: bool): u64 {
+        let x: u64 = 3;
+        let y: u64;
+        if (b) y=f(x) else y=g(x);
+        if (b && y != 4) abort 4;
+        if (!b && y != 5) abort 5;
+        y
+    }
+    spec h {
+        aborts_if false;
+    }
+
+
+    // ---------
+    // Underflow
+    // ---------
+
+    // succeeds.
+    fun underflow(): u64 {
+        let x = 0;
+        x - 1
+    }
+	spec underflow {
+	    aborts_if true;
+	}
+
+
+    // ----------------
+    // Division by zero
+    // ----------------
+
+    // succeeds.
+    fun div_by_zero(): u64 {
+        let x = 0;
+        1 / x
+    }
+	spec div_by_zero {
+	    aborts_if true;
+	}
+
+    fun div_by_zero_u64_incorrect(x: u64, y: u64): u64 {
+        x / y
+    }
+    spec div_by_zero_u64_incorrect {
+        aborts_if false;
+    }
+
+    fun div_by_zero_u64(x: u64, y: u64): u64 {
+        x / y
+    }
+    spec div_by_zero_u64 {
+        aborts_if y == 0;
+    }
+
+
+    // --------------------
+    // Overflow by addition
+    // --------------------
+
+    // fails.
+    fun overflow_u8_add_incorrect(x: u8, y: u8): u8 {
+        x + y
+    }
+    spec overflow_u8_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u8_add(x: u8, y: u8): u8 {
+        x + y
+    }
+    spec overflow_u8_add {
+        aborts_if x + y > max_u8();
+    }
+
+    // fails.
+    fun overflow_u16_add_incorrect(x: u16, y: u16): u16 {
+        x + y
+    }
+    spec overflow_u16_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u16_add(x: u16, y: u16): u16 {
+        x + y
+    }
+    spec overflow_u16_add {
+        aborts_if x + y > max_u16();
+    }
+
+    // fails.
+    fun overflow_u32_add_incorrect(x: u32, y: u32): u32 {
+        x + y
+    }
+    spec overflow_u32_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u32_add(x: u32, y: u32): u32 {
+        x + y
+    }
+    spec overflow_u32_add {
+        aborts_if x + y > max_u32();
+    }
+
+    // fails.
+    fun overflow_u64_add_incorrect(x: u64, y: u64): u64 {
+        x + y
+    }
+    spec overflow_u64_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u64_add(x: u64, y: u64): u64 {
+        x + y
+    }
+    spec overflow_u64_add {
+        aborts_if x + y > max_u64();
+    }
+
+    // fails.
+    fun overflow_u128_add_incorrect(x: u128, y: u128): u128 {
+        x + y
+    }
+    spec overflow_u128_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u128_add(x: u128, y: u128): u128 {
+        x + y
+    }
+    spec overflow_u128_add {
+        aborts_if x + y > max_u128();
+    }
+
+    // fails.
+    fun overflow_u256_add_incorrect(x: u256, y: u256): u256 {
+        x + y
+    }
+    spec overflow_u256_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u256_add(x: u256, y: u256): u256 {
+        x + y
+    }
+    spec overflow_u256_add {
+        aborts_if x + y > max_u256();
+    }
+
+
+    // --------------------------
+    // Overflow by multiplication
+    // --------------------------
+
+    // fails.
+    fun overflow_u8_mul_incorrect(x: u8, y: u8): u8 {
+        x * y
+    }
+    spec overflow_u8_mul_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u8_mul(x: u8, y: u8): u8 {
+        x * y
+    }
+    spec overflow_u8_mul {
+        aborts_if x * y > max_u8();
+    }
+
+    // fails.
+    fun overflow_u16_mul_incorrect(x: u16, y: u16): u16 {
+        x * y
+    }
+    spec overflow_u16_mul_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u16_mul(x: u16, y: u16): u16 {
+        x * y
+    }
+    spec overflow_u16_mul {
+        aborts_if x * y > max_u16();
+    }
+
+    // fails.
+    fun overflow_u32_mul_incorrect(x: u32, y: u32): u32 {
+        x * y
+    }
+    spec overflow_u32_mul_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u32_mul(x: u32, y: u32): u32 {
+        x * y
+    }
+    spec overflow_u32_mul {
+        aborts_if x * y > max_u32();
+    }
+
+    // fails.
+    fun overflow_u64_mul_incorrect(x: u64, y: u64): u64 {
+        x * y
+    }
+    spec overflow_u64_mul_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u64_mul(x: u64, y: u64): u64 {
+        x * y
+    }
+    spec overflow_u64_mul {
+        aborts_if x * y > max_u64();
+    }
+
+    // fails.
+    fun overflow_u128_mul_incorrect(x: u128, y: u128): u128 {
+        x * y
+    }
+    spec overflow_u128_mul_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u128_mul(x: u128, y: u128): u128 {
+        x * y
+    }
+    spec overflow_u128_mul {
+        aborts_if x * y > max_u128(); // U128_MAX
+    }
+
+    // fails.
+    fun overflow_u256_mul_incorrect(x: u256, y: u256): u256 {
+        x * y
+    }
+    spec overflow_u256_mul_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u256_mul(x: u256, y: u256): u256 {
+        x * y
+    }
+    spec overflow_u256_mul {
+        aborts_if x * y > max_u256(); // U256_MAX
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/axiom_generic.move b/vendors/move/crates/move-prover/tests/sources/functional/axiom_generic.move
new file mode 100644
index 000000000..0ca83ffae
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/axiom_generic.move
@@ -0,0 +1,13 @@
+module 0x1::Test {
+    struct S<phantom K, phantom V> {
+    }
+
+    public fun f<K, V>(): S<K, V> {
+        S {
+        }
+    }
+
+    spec module {
+        axiom<T> forall v1: T: true;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/axioms.move b/vendors/move/crates/move-prover/tests/sources/functional/axioms.move
new file mode 100644
index 000000000..21c517340
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/axioms.move
@@ -0,0 +1,53 @@
+module 0x42::TestAxioms {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // ----------------------------------------------------
+    // Non-generic axiom
+
+    spec module {
+        fun spec_incr(x: num): num;
+        axiom forall x: num: spec_incr(x) == x + 1;
+    }
+
+    fun incr(x: u64): u64 {
+        x + 1
+    }
+    spec incr {
+        ensures result == TRACE(spec_incr(x));
+    }
+
+    // ----------------------------------------------------
+    // Generic axiom
+
+    spec module {
+        fun spec_id<T>(x: T): T;
+        axiom<T> forall x: T: spec_id(x) == x;
+    }
+
+    fun id_T<T>(x: T): T {
+        x
+    }
+    spec id_T {
+        ensures result == spec_id(x);
+    }
+
+    fun id_u64<T>(x: u64): u64 {
+        x
+    }
+    spec id_u64 {
+        ensures result == spec_id(x);
+    }
+
+    // ----------------------------------------------------
+    // Generic axiom calling spec function
+
+    spec module {
+        use std::bcs::serialize;
+        fun deserialize<T>(bytes: vector<u8>): T;
+        // We need the trigger annotation below, otherwise timeout
+        axiom<T> forall v: T {serialize(v)}: deserialize<T>(serialize(v)) == v;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/bitset.move b/vendors/move/crates/move-prover/tests/sources/functional/bitset.move
new file mode 100644
index 000000000..2d2c198bf
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/bitset.move
@@ -0,0 +1,91 @@
+module 0x42::bitset128 {
+    struct BitSet128 has drop {
+        s: u128
+    }
+
+    spec BitSet128 {
+        pragma bv=b"0";
+    }
+
+    public fun empty(): BitSet128 {
+        BitSet128 {
+            s: 0
+        }
+    }
+
+    public fun insert(s: &mut BitSet128, i: u64) {
+        assert!(i < 128, 0);
+        s.s = s.s | (1 << (i as u8));
+    }
+
+
+    public fun remove(s: &mut BitSet128, i: u64) {
+        assert!(i < 128, 0);
+        s.s = s.s & (0xffff ^ (1 << (i as u8)));
+    }
+
+    public fun contains(s: &BitSet128, i: u64): bool {
+        assert!(i < 128, 0);
+        (s.s & (1 << (i as u8))) > 0
+    }
+
+    public fun union(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s | s2.s
+        }
+    }
+
+    public fun intersect(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s & s2.s
+        }
+    }
+
+
+    public fun complement(s: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: (0xffffffffffffffffffffffffffffffff ^ s.s)
+        }
+    }
+
+    public fun difference(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s & complement(s2).s
+        }
+    }
+
+    #[verify_only]
+    fun ident(s: &BitSet128) {
+        let s2 = intersect(s, s);
+        let s3 = union(s, s);
+        //let s4 = complement(&complement(s));
+
+        spec {
+            assert s == s2;
+            assert s == s3;
+            //assert s == s4; // timeout
+        };
+    }
+
+    /*
+    // timeout
+    #[verify_only]
+    fun de_morgan_1(s1: &BitSet128, s2: &BitSet128) {
+        let s3 = complement(&intersect(s1, s2));
+        let s4 = union(&complement(s1), &complement(s2));
+        spec {
+            assert s3 == s4;
+        };
+    }
+    */
+
+    #[verify_only]
+    fun de_morgan_2(s1: &BitSet128, s2: &BitSet128) {
+        let s3 = complement(&union(s1, s2));
+        let s4 = intersect(&complement(s1), &complement(s2));
+        spec {
+            assert s3 == s4;
+        };
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/bitwise_features.move b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_features.move
new file mode 100644
index 000000000..f3f2d2274
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_features.move
@@ -0,0 +1,181 @@
+// exclude_for: cvc5
+address 0x123 {
+
+module TestFeatures {
+    use std::vector;
+    use std::error;
+    use std::signer;
+
+    /// The enabled features, represented by a bitset stored on chain.
+    struct Features has key {
+        features: vector<u8>,
+    }
+
+    spec Features {
+        pragma bv=b"0";
+    }
+
+    /// Helper to check whether a feature flag is enabled.
+    fun contains(features: &vector<u8>, feature: u64): bool {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        byte_index < vector::length(features) && ((*vector::borrow(features, byte_index))) & bit_mask != 0
+    }
+
+    spec contains {
+        pragma bv=b"0";
+        pragma opaque;
+        aborts_if false;
+        ensures result == ((feature / 8) < len(features) && spec_contains(features, feature));
+    }
+
+    fun is_enabled(feature: u64): bool acquires Features {
+        exists<Features>(@std) &&
+            contains(&borrow_global<Features>(@std).features, feature)
+    }
+
+    spec is_enabled {
+        aborts_if false;
+        pragma timeout = 120;
+        ensures result == (
+            exists<Features>(@std) // this one does not verify
+                && (((feature / 8) < len(global<Features>(@std).features)
+                && spec_contains(global<Features>(@std).features, feature)))
+        );
+    }
+
+    fun set(features: &mut vector<u8>, feature: u64, include: bool) {
+        let old_n = vector::length(features); // ghost var
+        let old_features = *features; // ghost var
+        let n = old_n; // ghost var
+
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        while({
+            spec {
+                invariant n == len(features);
+                invariant n >= old_n;
+                invariant byte_index < old_n ==> len(features) == old_n;
+                invariant byte_index >= old_n ==> len(features) <= byte_index + 1;
+                invariant forall i in 0..old_n: features[i] == old_features[i];
+                invariant forall i in old_n..n: (features[i] as u8) == (0 as u8);
+            };
+            vector::length(features) <= byte_index
+        }) {
+            vector::push_back(features, 0);
+            n = n + 1;
+        };
+        let entry = vector::borrow_mut(features, byte_index);
+        if (include)
+            *entry = *entry | bit_mask
+        else
+            *entry = *entry & (0xff ^ bit_mask)
+    }
+
+    spec set {
+        pragma bv=b"0";
+        pragma timeout = 120;
+        aborts_if false;
+        ensures feature / 8 < len(features);
+        ensures include == spec_contains(features, feature);
+    }
+
+    const EFRAMEWORK_SIGNER_NEEDED: u64 = 1;
+
+    /// Function to enable and disable features. Can only be called by a signer of @std.
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>)
+    acquires Features {
+        assert!(signer::address_of(framework) == @std, error::permission_denied(EFRAMEWORK_SIGNER_NEEDED));
+        if (!exists<Features>(@std)) {
+            move_to<Features>(framework, Features{features: vector[]})
+        };
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while (i < n) {
+            set(features, *vector::borrow(&enable, i), true);
+            spec {
+                assert spec_contains(features, enable[i]);
+            };
+            i = i + 1
+        };
+        let i = 0;
+        let n = vector::length(&disable);
+        while (i < n) {
+            set(features, *vector::borrow(&disable, i), false);
+            spec {
+                assert spec_compute_feature_flag(features, disable[i]) == (0 as u8);
+            };
+            i = i + 1
+        };
+    }
+
+    spec fun spec_compute_feature_flag(features: vector<u8>, feature: u64): u8 {
+        ((int2bv((((1 as u8) << ((feature % (8 as u64)) as u64)) as u8)) as u8)
+            & features[feature/8] as u8)
+    }
+
+    spec fun spec_contains(features: vector<u8>, feature: u64): bool {
+        spec_compute_feature_flag(features, feature) > (0 as u8)
+    }
+
+    spec change_feature_flags {
+        aborts_if signer::address_of(framework) != @std;
+    }
+
+    public fun disable_feature_flags(disable: vector<u64>) acquires Features {
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&disable);
+        while ({
+            spec {
+                invariant i <= n;
+                invariant forall j in 0..i: disable[j] / 8 < len(features) && !spec_contains(features, disable[j]);
+            };
+            i < n
+        }) {
+            set(features, *vector::borrow(&disable, i), false);
+            spec {
+                assert (disable[i] / 8 < len(features) && !spec_contains(features, disable[i]));
+            };
+            i = i + 1;
+        };
+    }
+
+    spec disable_feature_flags {
+        pragma opaque;
+        pragma timeout = 120;
+        modifies global<Features>(@std);
+        let post features = global<Features>(@std).features;
+        ensures forall i in 0..len(disable): (disable[i] / 8 < len(features) && !spec_contains(features, disable[i]));
+    }
+
+    public fun enable_feature_flags(enable: vector<u64>) acquires Features {
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while ({
+            spec {
+                invariant i <= n;
+                invariant forall j in 0..i: enable[j] / 8 < len(features) && spec_contains(features, enable[j]);
+            };
+            i < n
+        }) {
+            set(features, *vector::borrow(&enable, i), true);
+            spec {
+                assert (enable[i] / 8 < len(features) && spec_contains(features, enable[i]));
+            };
+            i = i + 1;
+        };
+    }
+
+    spec enable_feature_flags {
+        pragma opaque;
+        pragma timeout = 120;
+        modifies global<Features>(@std);
+        let post features = global<Features>(@std).features;
+        ensures forall i in 0..len(enable): (enable[i] / 8 < len(features) && spec_contains(features, enable[i]));
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/bitwise_operators.move b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_operators.move
new file mode 100644
index 000000000..ffb4c96aa
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_operators.move
@@ -0,0 +1,82 @@
+// exclude_for: cvc5
+address 0x123 {
+
+  module M {
+
+    public fun foo(): u64 {
+      let a = A {
+        f1: 1
+      };
+      let b = B {
+        a: a
+      };
+      let c = C {
+        a: 1,
+        b: b.a.f1
+      };
+      (a.f1 & 0) | (b.a.f1 & 1) | (c.b ^ 2)
+    }
+
+    spec foo {
+      pragma bv_ret=b"0";
+      ensures result == (((((1 as u64) & (0 as u64)) as u64) | (((1 as u64) & (1 as u64)) as u64) as u64) | (((1 as u64) ^ (2 as u64)) as u64) as u64);
+    }
+
+    struct A<T> has copy, drop {
+      f1: T
+    }
+    spec A{
+      pragma bv=b"0";
+    }
+
+    struct B<T> has drop {
+      a: A<T>
+    }
+
+    struct C has drop {
+      a: u64,
+      b: u64
+    }
+    spec C {
+      pragma bv=b"1";
+    }
+
+    public fun foo_generic<T>(i: T): T {
+      i
+    }
+
+    spec foo_generic {
+      pragma bv=b"0"; // This is necessary because the calling function may not infer the number operation
+      pragma bv_ret=b"0"; // This is necessary because the calling function may not infer the number operation
+    }
+
+    public fun test(i: u8): u8 {
+      let x1 = foo_generic(i);
+      x1 ^ x1
+    }
+
+    spec test {
+      ensures result == (0 as u8);
+    }
+
+    public fun bv_and(n: u64, e: u64): u64 {
+      if (e == 0) {
+        1
+      } else {
+        n & bv_and(n, e - 1)
+      }
+    }
+    spec bv_and {
+      pragma opaque;
+      pragma bv=b"0,1";
+      pragma bv_ret=b"0";
+      ensures result == spec_bv_and(n, e);
+    }
+
+    spec fun spec_bv_and(n: u64, e: u64): u64 {
+      if (e == (0 as u64)) { int2bv((1 as u64)) } else { n & spec_bv_and(n, e - int2bv((1 as u64))) }
+    }
+
+  }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/bitwise_table.move b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_table.move
new file mode 100644
index 000000000..4388c2516
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/bitwise_table.move
@@ -0,0 +1,130 @@
+module 0x42::VerifyBitwiseTable {
+    use extensions::table::{Self, Table};
+    use extensions::table::{spec_get, spec_len, spec_contains};
+
+    fun add(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add {
+        pragma bv_ret=b"0";
+        ensures spec_contains(result, 1) && spec_contains(result, 2) && spec_contains(result, 3);
+        ensures spec_len(result) == 3;
+        ensures spec_get(result, 1) == (2 as u64);
+        ensures spec_get(result, 2) == (3 as u64);
+        ensures spec_get(result, 3) == (4 as u64);
+    }
+
+    fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
+        t
+    }
+    spec add_fail_exists {
+        pragma bv_ret=b"0";
+        aborts_if k1 == k2;
+    }
+
+    fun remove(): Table<u8, u64> {
+        let t = add();
+        table::remove(&mut t, 2);
+        t
+    }
+    spec remove {
+        pragma bv_ret=b"0";
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == (2 as u64);
+        ensures spec_get(result, 3) == (4 as u64);
+    }
+
+    fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
+    }
+    spec contains_and_length {
+        pragma bv_ret=b"3";
+        ensures result_1 == true;
+        ensures result_2 == false;
+        ensures result_3 == 2;
+    }
+
+    fun borrow(): (u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
+        (*r, t)
+    }
+    spec borrow {
+        pragma bv_ret=b"1";
+        ensures result_1 == (2 as u64);
+        ensures spec_len(result_2) == 1;
+        ensures spec_get(result_2, 1) == (2 as u64);
+    }
+
+    fun borrow_mut(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
+        *r = 4;
+        t
+    }
+    spec borrow_mut {
+        pragma bv_ret=b"1";
+        ensures spec_contains(result, 1) && spec_contains(result, 2);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == (4 as u64);
+        ensures spec_get(result, 2) == (3 as u64);
+    }
+
+
+    // ====================================================================================================
+    // Tables with structured keys
+
+
+    struct Key has copy, drop {
+        v: vector<u8>       // Use a vector so we do not have extensional equality
+    }
+
+    struct R {
+        t: Table<Key, u64>
+    }
+
+
+    spec R {
+        pragma bv=b"0";
+    }
+
+
+    fun make_R(): R {
+        let t = table::new<Key, u64>();
+        // let t = table::new<u8, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        let x = table::borrow_mut(&mut t, Key{v: vector[1, 2]});
+        *x = *x & 1;
+        let r = R{t};
+        r
+    }
+
+
+    fun add_R(): R {
+        make_R()
+    }
+    spec add_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == (0 as u64);
+        ensures spec_get(result.t, k2) == (23 as u64);
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/cast.exp b/vendors/move/crates/move-prover/tests/sources/functional/cast.exp
new file mode 100644
index 000000000..d043243ad
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/cast.exp
@@ -0,0 +1,64 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/cast.move:67:5
+   │
+65 │           (x as u16)
+   │           ---------- abort happened here with execution failure
+66 │       }
+67 │ ╭     spec aborting_u16_cast_incorrect {
+68 │ │         aborts_if false;
+69 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/cast.move:64: aborting_u16_cast_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/cast.move:65: aborting_u16_cast_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/cast.move:81:5
+   │
+79 │           (x as u32)
+   │           ---------- abort happened here with execution failure
+80 │       }
+81 │ ╭     spec aborting_u32_cast_incorrect {
+82 │ │         aborts_if false;
+83 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/cast.move:78: aborting_u32_cast_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/cast.move:79: aborting_u32_cast_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/cast.move:109:5
+    │
+ 93 │           (x as u64)
+    │           ---------- abort happened here with execution failure
+    ·
+109 │ ╭     spec aborting_u64_cast_incorrect {
+110 │ │         aborts_if false;
+111 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/cast.move:92: aborting_u64_cast_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/cast.move:93: aborting_u64_cast_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/cast.move:53:5
+   │
+51 │           (x as u8)
+   │           --------- abort happened here with execution failure
+52 │       }
+53 │ ╭     spec aborting_u8_cast_incorrect {
+54 │ │         aborts_if false;
+55 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/cast.move:50: aborting_u8_cast_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/cast.move:51: aborting_u8_cast_incorrect
+   =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/cast.move b/vendors/move/crates/move-prover/tests/sources/functional/cast.move
new file mode 100644
index 000000000..076e4ab54
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/cast.move
@@ -0,0 +1,120 @@
+module 0x42::TestCast {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // --------------
+    // Type promotion
+    // --------------
+
+    fun u8_cast_incorrect(x: u8): u64 {
+        (x as u64)
+    }
+    spec u8_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun u16_cast_incorrect(x: u16): u64 {
+        (x as u64)
+    }
+    spec u16_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun u32_cast_incorrect(x: u32): u64 {
+        (x as u64)
+    }
+    spec u8_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun u64_cast(x: u64): u128 {
+        (x as u128)
+    }
+    spec aborting_u64_cast {
+        aborts_if false;
+    }
+
+    fun u128_cast(x: u128): u256 {
+        (x as u256)
+    }
+    spec aborting_u128_cast {
+        aborts_if false;
+    }
+
+    // -------------
+    // Type demotion
+    // -------------
+
+    fun aborting_u8_cast_incorrect(x: u64): u8 {
+        (x as u8)
+    }
+    spec aborting_u8_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u8_cast(x: u64): u8 {
+        (x as u8)
+    }
+    spec aborting_u8_cast {
+        aborts_if x > 255;
+    }
+
+    fun aborting_u16_cast_incorrect(x: u64): u16 {
+        (x as u16)
+    }
+    spec aborting_u16_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u16_cast(x: u64): u16 {
+        (x as u16)
+    }
+    spec aborting_u16_cast {
+        aborts_if x > 65535;
+    }
+
+    fun aborting_u32_cast_incorrect(x: u64): u32 {
+        (x as u32)
+    }
+    spec aborting_u32_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u32_cast(x: u64): u32 {
+        (x as u32)
+    }
+    spec aborting_u16_cast {
+        aborts_if x > 4294967295;
+    }
+
+    fun aborting_u64_cast_incorrect(x: u128): u64 {
+        (x as u64)
+    }
+    spec aborting_u64_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u64_cast(x: u128): u64 {
+        (x as u64)
+    }
+    spec aborting_u64_cast {
+        aborts_if x > 18446744073709551615;
+    }
+
+    fun aborting_u128_cast_incorrect(x: u256): u128 {
+        (x as u128)
+    }
+    spec aborting_u64_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u128_cast(x: u256): u128 {
+        (x as u128)
+    }
+    spec aborting_u128_cast {
+        aborts_if x > 340282366920938463463374607431768211455;
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/choice.cvc5_exp b/vendors/move/crates/move-prover/tests/sources/functional/choice.cvc5_exp
new file mode 100644
index 000000000..31e7d2c92
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/choice.cvc5_exp
@@ -0,0 +1,159 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:301:9
+    │
+301 │ ╭         ensures !(get_ballot<Proposal>(signer::address_of(ballot_account), result).expiration_timestamp_secs
+302 │ │             <= 0);
+    │ ╰──────────────────^
+    │
+    =     at tests/sources/functional/choice.move:279: create_ballot
+    =         ballot_account = <redacted>
+    =     at tests/sources/functional/choice.move:283: create_ballot
+    =     at tests/sources/functional/choice.move:282: create_ballot
+    =     at tests/sources/functional/choice.move:290
+    =     at tests/sources/functional/choice.move:285: create_ballot
+    =     at tests/sources/functional/choice.move:271: new_ballot_id
+    =         counter = <redacted>
+    =     at tests/sources/functional/choice.move:274: new_ballot_id
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:277: new_ballot_id
+    =         ballot_id = <redacted>
+    =     at tests/sources/functional/choice.move:286: create_ballot
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:287: create_ballot
+    =     at tests/sources/functional/choice.move:301: create_ballot (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:55:9
+   │
+55 │         ensures choice == signer::address_of(s2);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:45: populate_R
+   =     at tests/sources/functional/choice.move:50: populate_R (spec)
+   =     at tests/sources/functional/choice.move:51: populate_R (spec)
+   =     at tests/sources/functional/choice.move:54: populate_R (spec)
+   =     at tests/sources/functional/choice.move:53: populate_R (spec)
+   =     at tests/sources/functional/choice.move:45: populate_R
+   =         s1 = <redacted>
+   =         s2 = <redacted>
+   =     at tests/sources/functional/choice.move:46: populate_R
+   =     at tests/sources/functional/choice.move:47: populate_R
+   =     at tests/sources/functional/choice.move:48: populate_R
+   =     at tests/sources/functional/choice.move:55: populate_R (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:22:9
+   │
+22 │         ensures result == TRACE(choose x: u64 where x >= 4 && x <= 5);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:16: simple_incorrect
+   =         b = <redacted>
+   =     at tests/sources/functional/choice.move:17: simple_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:18: simple_incorrect
+   =     at tests/sources/functional/choice.move:22: simple_incorrect (spec)
+   =         `TRACE(choose x: u64 where x >= 4 && x <= 5)` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:99:9
+   │
+99 │         ensures result == TRACE(choose y: u64 where y > x);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:94: test_choice_dup_expected_fail
+   =         x = <redacted>
+   =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
+   =     at tests/sources/functional/choice.move:99: test_choice_dup_expected_fail (spec)
+   =         `TRACE(choose y: u64 where y > x)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:157:9
+    │
+157 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:155: test_different_choice_via_let (spec)
+    =     at tests/sources/functional/choice.move:156: test_different_choice_via_let (spec)
+    =     at tests/sources/functional/choice.move:153: test_different_choice_via_let
+    =     at tests/sources/functional/choice.move:157: test_different_choice_via_let (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:181:9
+    │
+181 │         ensures choose_some_positive_u64() == choose_another_positive_u64();
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:179: test_different_choice_via_spec_fun
+    =     at tests/sources/functional/choice.move:181: test_different_choice_via_spec_fun (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:71:9
+   │
+71 │         ensures (choose min i in 0..len(result) where result[i] == 2) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:62: test_min
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:63: test_min
+   =         v_ref = <redacted>
+   =     at tests/sources/functional/choice.move:64: test_min
+   =     at tests/sources/functional/choice.move:65: test_min
+   =     at tests/sources/functional/choice.move:66: test_min
+   =     at tests/sources/functional/choice.move:67: test_min
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:68: test_min
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:69: test_min
+   =     at tests/sources/functional/choice.move:71: test_min (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:86:9
+   │
+86 │         ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:75: test_not_using_min_incorrect
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:76: test_not_using_min_incorrect
+   =         v_ref = <redacted>
+   =     at tests/sources/functional/choice.move:77: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:78: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:79: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:80: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:81: test_not_using_min_incorrect
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:82: test_not_using_min_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:83: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:86: test_not_using_min_incorrect (spec)
+   =         `TRACE(choose i in 0..len(result) where result[i] == 2)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:218:9
+    │
+218 │         ensures result != (choose i: u64 where i >= k);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:235: test_same_choice_different_args_via_schema_2
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:236: test_same_choice_different_args_via_schema_2
+    =     at tests/sources/functional/choice.move:218
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:209:9
+    │
+209 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:205: test_same_choice_different_args_via_spec_fun
+    =     at tests/sources/functional/choice.move:207: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:208: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:205: test_same_choice_different_args_via_spec_fun
+    =         x = <redacted>
+    =         y = <redacted>
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:209: test_same_choice_different_args_via_spec_fun (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/choice.exp b/vendors/move/crates/move-prover/tests/sources/functional/choice.exp
new file mode 100644
index 000000000..f5960009d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/choice.exp
@@ -0,0 +1,138 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:302:9
+    │
+302 │ ╭         ensures !(get_ballot<Proposal>(signer::address_of(ballot_account), result).expiration_timestamp_secs
+303 │ │             <= 0);
+    │ ╰──────────────────^
+    │
+    =     at tests/sources/functional/choice.move:280: create_ballot
+    =         ballot_account = <redacted>
+    =     at tests/sources/functional/choice.move:284: create_ballot
+    =     at tests/sources/functional/choice.move:283: create_ballot
+    =     at tests/sources/functional/choice.move:291
+    =     at tests/sources/functional/choice.move:286: create_ballot
+    =     at tests/sources/functional/choice.move:272: new_ballot_id
+    =         counter = <redacted>
+    =     at tests/sources/functional/choice.move:275: new_ballot_id
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:278: new_ballot_id
+    =     at tests/sources/functional/choice.move:287: create_ballot
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:288: create_ballot
+    =     at tests/sources/functional/choice.move:302: create_ballot (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:56:9
+   │
+56 │         ensures choice == signer::address_of(s2);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:46: populate_R
+   =     at tests/sources/functional/choice.move:51: populate_R (spec)
+   =     at tests/sources/functional/choice.move:52: populate_R (spec)
+   =     at tests/sources/functional/choice.move:55: populate_R (spec)
+   =     at tests/sources/functional/choice.move:54: populate_R (spec)
+   =     at tests/sources/functional/choice.move:46: populate_R
+   =         s1 = <redacted>
+   =         s2 = <redacted>
+   =     at tests/sources/functional/choice.move:47: populate_R
+   =     at tests/sources/functional/choice.move:48: populate_R
+   =     at tests/sources/functional/choice.move:49: populate_R
+   =     at tests/sources/functional/choice.move:56: populate_R (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:22:9
+   │
+22 │         ensures result == TRACE(choose x: u64 where x >= 4 && x <= 5);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:16: simple_incorrect
+   =         b = <redacted>
+   =     at tests/sources/functional/choice.move:17: simple_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:18: simple_incorrect
+   =     at tests/sources/functional/choice.move:22: simple_incorrect (spec)
+   =         `TRACE(choose x: u64 where x >= 4 && x <= 5)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:100:9
+    │
+100 │         ensures result == TRACE(choose y: u64 where y > x);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
+    =         x = <redacted>
+    =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:97: test_choice_dup_expected_fail
+    =     at tests/sources/functional/choice.move:100: test_choice_dup_expected_fail (spec)
+    =         `TRACE(choose y: u64 where y > x)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:158:9
+    │
+158 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:156: test_different_choice_via_let (spec)
+    =     at tests/sources/functional/choice.move:157: test_different_choice_via_let (spec)
+    =     at tests/sources/functional/choice.move:154: test_different_choice_via_let
+    =     at tests/sources/functional/choice.move:158: test_different_choice_via_let (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:182:9
+    │
+182 │         ensures choose_some_positive_u64() == choose_another_positive_u64();
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:180: test_different_choice_via_spec_fun
+    =     at tests/sources/functional/choice.move:182: test_different_choice_via_spec_fun (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:87:9
+   │
+87 │         ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:76: test_not_using_min_incorrect
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/choice.move:77: test_not_using_min_incorrect
+   =         v_ref#1#0 = <redacted>
+   =     at tests/sources/functional/choice.move:78: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:79: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:80: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:81: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:82: test_not_using_min_incorrect
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/choice.move:83: test_not_using_min_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:84: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:87: test_not_using_min_incorrect (spec)
+   =         `TRACE(choose i in 0..len(result) where result[i] == 2)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:219:9
+    │
+219 │         ensures result != (choose i: u64 where i >= k);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:236: test_same_choice_different_args_via_schema_2
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:237: test_same_choice_different_args_via_schema_2
+    =     at tests/sources/functional/choice.move:219
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:210:9
+    │
+210 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:206: test_same_choice_different_args_via_spec_fun
+    =     at tests/sources/functional/choice.move:208: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:209: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:206: test_same_choice_different_args_via_spec_fun
+    =         x = <redacted>
+    =         y = <redacted>
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:210: test_same_choice_different_args_via_spec_fun (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/choice.move b/vendors/move/crates/move-prover/tests/sources/functional/choice.move
new file mode 100644
index 000000000..b47faa814
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/choice.move
@@ -0,0 +1,306 @@
+// separate_baseline: cvc5
+// TODO(cvc5): this test requires a separate baseline because cvc5 produces false positives for some of choices
+// separate_baseline: simplify
+module 0x42::TestSome {
+    use std::signer;
+    use std::vector;
+
+    // Basic tests
+    // ===========
+
+    fun simple(): u64 { 4 }
+    spec simple {
+        ensures result <= (choose x: u64 where x >= 4);
+    }
+
+    fun simple_incorrect(b: bool): u64 {
+        if (b) 4 else 5
+    }
+    spec simple_incorrect {
+        // This fails because the interpretation is not influenced by an assertion.
+        // The choice freely selects a value and not a 'fitting' one.
+        ensures result == TRACE(choose x: u64 where x >= 4 && x <= 5);
+    }
+
+    // Testing choices in spec funs
+    // =============================
+
+    spec fun spec_fun_choice(x: u64): u64 {
+        choose y: u64 where y >= x
+    }
+    fun with_spec_fun_choice(x: u64): u64 {
+        x + 42
+    }
+    spec with_spec_fun_choice {
+        //ensures result <= TRACE(spec_fun_choice(x + 42)); // TODO(tengzhang): the prover will fail with TRACE
+        ensures result <= spec_fun_choice(x + 42);
+    }
+
+    // Testing choices using memory
+    // ============================
+
+    struct R has key {
+        x: u64
+    }
+
+    fun populate_R(s1: &signer, s2: &signer) {
+        move_to<R>(s1, R{x: 1});
+        move_to<R>(s2, R{x: 2});
+    }
+    spec populate_R {
+        let a1 = signer::address_of(s1);
+        let a2 = signer::address_of(s2);
+        /// The requires guarantees that there is no other address which can satisfy the choice below.
+        requires forall a: address: !exists<R>(a);
+        let choice = choose a: address where exists<R>(a) && global<R>(a).x == 2;
+        ensures choice == signer::address_of(s2);
+    }
+
+    // Testing min choice
+    // ==================
+
+    fun test_min(): vector<u64> {
+        let v = vector::empty<u64>();
+        let v_ref = &mut v;
+        vector::push_back(v_ref, 1);
+        vector::push_back(v_ref, 2);
+        vector::push_back(v_ref, 3);
+        vector::push_back(v_ref, 2);
+        v
+    }
+    spec test_min {
+        ensures (choose min i in 0..len(result) where result[i] == 2) == 1;
+    }
+
+    fun test_not_using_min_incorrect(): vector<u64> {
+        let v = vector::empty<u64>();
+        let v_ref = &mut v;
+        vector::push_back(v_ref, 1);
+        vector::push_back(v_ref, 2);
+        vector::push_back(v_ref, 3);
+        vector::push_back(v_ref, 2);
+        vector::push_back(v_ref, 2);
+        v
+    }
+    spec test_not_using_min_incorrect {
+        // This fails because we do not necessary select the smallest i
+        ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
+    }
+
+    // Testing choice duplication
+    // ==========================
+
+    // This is only a compilation test. It fails verification.
+
+    fun test_choice_dup_expected_fail(x: u64): u64 {
+        x + 1
+    }
+    spec test_choice_dup_expected_fail {
+        pragma opaque; // making this opaque lets the choice be injected at each call
+        ensures result == TRACE(choose y: u64 where y > x);
+    }
+
+    fun test_choice_use1(a: u64): u64 {
+        test_choice_dup_expected_fail(a)
+    }
+
+    fun test_choice_use2(_a: vector<u64>, b: u64): u64 {
+        // with incorrect use of parameters, this would use $t0 as a parameter to the choice
+        // function, which leads to a type error in boogie.
+        test_choice_dup_expected_fail(b)
+    }
+
+    // Testing using the same choice in multiple verification targets
+    // ==============================================================
+
+    struct S has drop {
+        x: u64
+    }
+
+    fun test_less_than_1(x: u64): u64 {
+        x - 1
+    }
+
+    fun test_less_than_2(s: S): u64 {
+        s.x - 1
+    }
+
+    spec test_less_than_1 {
+        include EnsuresLessThan;
+    }
+
+    spec test_less_than_2 {
+        include EnsuresLessThan { x: s.x };
+    }
+
+    spec schema EnsuresLessThan {
+        x: u64;
+        result: u64;
+        ensures result != (choose i: u64 where i >= x);
+    }
+
+    // Semantics when the same-choice operator is referred
+    // ===================================================
+
+    // Refer to choice operators via let
+
+    fun test_same_choice_via_let() {}
+    spec test_same_choice_via_let {
+        let evidence = (choose i: u64 where i > 0);
+        ensures evidence == evidence;
+        // expect to pass
+    }
+
+    fun test_different_choice_via_let() {}
+    spec test_different_choice_via_let {
+        let evidence1 = (choose i: u64 where i > 0);
+        let evidence2 = (choose i: u64 where i > 0);
+        ensures evidence1 == evidence2;
+        // expect to fail, even though the choices are the same text-wise
+    }
+
+    // Refer to choice operators via spec fun
+
+    spec fun choose_some_positive_u64(): u64 {
+        choose i: u64 where i > 0
+    }
+    spec fun choose_another_positive_u64(): u64 {
+        choose i: u64 where i > 0
+    }
+    spec fun choose_some_positive_u64_indirect(): u64 {
+        choose_some_positive_u64()
+    }
+
+    fun test_same_choice_via_spec_fun() {}
+    spec test_same_choice_via_spec_fun {
+        ensures choose_some_positive_u64() == choose_some_positive_u64();
+        // expect to pass
+    }
+
+    fun test_different_choice_via_spec_fun() {}
+    spec test_different_choice_via_spec_fun {
+        ensures choose_some_positive_u64() == choose_another_positive_u64();
+        // expect to fail
+    }
+
+    fun test_same_choice_via_spec_fun_indirect() {}
+    spec test_same_choice_via_spec_fun_indirect {
+        ensures choose_some_positive_u64() == choose_some_positive_u64_indirect();
+        // expect to pass
+    }
+
+    // Refer to choice operators w/ arguments via spec fun
+
+    spec fun choose_a_larger_num(n: u64): u64 {
+        choose i: u64 where i > n
+    }
+
+    fun test_same_choice_same_args_via_spec_fun(n: u64): bool { n == 0 }
+    spec test_same_choice_same_args_via_spec_fun {
+        let evidence1 = choose_a_larger_num(n);
+        let evidence2 = choose_a_larger_num(n);
+        ensures evidence1 == evidence2;
+        // expect to pass
+    }
+
+    fun test_same_choice_different_args_via_spec_fun(x: u64, y: u64): bool { x == y }
+    spec test_same_choice_different_args_via_spec_fun {
+        let evidence1 = choose_a_larger_num(x);
+        let evidence2 = choose_a_larger_num(y);
+        ensures evidence1 == evidence2;
+        // expect to fail
+    }
+
+    // Refer to choice operators w/ arguments via schema
+
+    spec schema ResultLessThanK {
+        k: u64;
+        result: u64;
+        ensures result != (choose i: u64 where i >= k);
+    }
+
+    fun test_same_choice_different_args_via_schema(x: u64, y: u64): u64 {
+        if (x >= y) {
+            y - 1
+        } else {
+            x - 1
+        }
+    }
+    spec test_same_choice_different_args_via_schema {
+        include ResultLessThanK {k: x};
+        include ResultLessThanK {k: y};
+        // expect to pass
+    }
+
+    fun test_same_choice_different_args_via_schema_2(): u64 {
+        42
+    }
+    spec test_same_choice_different_args_via_schema_2 {
+        include ResultLessThanK { k: 100 };
+        include ResultLessThanK { k: 10 };
+        // expect to fail
+    }
+
+    // A simple test for checking whether the reference has been removed in generated boogie code
+    fun remove_ref<TokenType: store>(_id: &u64) {}
+
+    spec remove_ref {
+        let min_token_id = choose min i: u64 where _id == _id;
+    }
+
+    // Testing using the same choice in verification targets with multiple type instantiations
+    // =======================================================================================
+
+    struct BallotID has store, copy, drop {
+        counter: u64,
+    }
+
+    struct Ballot<Proposal: store + drop> has store, copy, drop {
+        proposal: Proposal,
+        ballot_id: BallotID,
+        expiration_timestamp_secs: u64,
+    }
+
+    struct Ballots<Proposal: store + drop> has key {
+        ballots: vector<Ballot<Proposal>>,
+    }
+
+    struct BallotCounter has key {
+        counter: u64,
+    }
+
+    public fun new_ballot_id(
+        counter: u64,
+    ): BallotID {
+        BallotID {
+            counter,
+        }
+    }
+
+    public fun create_ballot<Proposal: store + copy + drop>(
+        ballot_account: &signer
+    ): BallotID {
+        move_to(ballot_account, BallotCounter {
+                counter: 0,
+            });
+        let ballot_id = new_ballot_id(0);
+        ballot_id
+    }
+
+    spec module {
+        invariant<Proposal> forall ballot_address: address
+            where exists<Ballots<Proposal>>(ballot_address):
+                exists<BallotCounter>(ballot_address);
+    }
+
+    spec fun get_ballot<Proposal>(ballot_address: address, ballot_id: BallotID): Ballot<Proposal> {
+         let ballots = global<Ballots<Proposal>>(ballot_address).ballots;
+         global<Ballots<Proposal>>(ballot_address).ballots[choose min i in 0..len(ballots) where ballots[i].ballot_id == ballot_id]
+    }
+
+    spec create_ballot {
+        ensures !(get_ballot<Proposal>(signer::address_of(ballot_account), result).expiration_timestamp_secs
+            <= 0);
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/choice.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/choice.simplify_exp
new file mode 100644
index 000000000..b0bc50246
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/choice.simplify_exp
@@ -0,0 +1,132 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:301:9
+    │
+301 │ ╭         ensures !(get_ballot<Proposal>(Signer::address_of(ballot_account), result).expiration_timestamp_secs
+302 │ │             <= 0);
+    │ ╰──────────────────^
+    │
+    =     at tests/sources/functional/choice.move:279: create_ballot
+    =         ballot_account = <redacted>
+    =     at tests/sources/functional/choice.move:283: create_ballot
+    =     at tests/sources/functional/choice.move:282: create_ballot
+    =     at tests/sources/functional/choice.move:290
+    =     at tests/sources/functional/choice.move:285: create_ballot
+    =     at tests/sources/functional/choice.move:271: new_ballot_id
+    =         counter = <redacted>
+    =     at tests/sources/functional/choice.move:274: new_ballot_id
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:277: new_ballot_id
+    =         ballot_id = <redacted>
+    =     at tests/sources/functional/choice.move:286: create_ballot
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:287: create_ballot
+    =     at tests/sources/functional/choice.move:301: create_ballot (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:55:9
+   │
+55 │         ensures choice == Signer::address_of(s2);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:45: populate_R
+   =     at tests/sources/functional/choice.move:53: populate_R (spec)
+   =     at tests/sources/functional/choice.move:45: populate_R
+   =         s1 = <redacted>
+   =         s2 = <redacted>
+   =     at tests/sources/functional/choice.move:46: populate_R
+   =     at tests/sources/functional/choice.move:47: populate_R
+   =     at tests/sources/functional/choice.move:48: populate_R
+   =     at tests/sources/functional/choice.move:55: populate_R (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:22:9
+   │
+22 │         ensures result == TRACE(choose x: u64 where x >= 4 && x <= 5);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:16: simple_incorrect
+   =         b = <redacted>
+   =     at tests/sources/functional/choice.move:17: simple_incorrect
+   =         <redacted> = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:18: simple_incorrect
+   =     at tests/sources/functional/choice.move:22: simple_incorrect (spec)
+   =         `TRACE(choose x: u64 where x >= 4 && x <= 5)` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:99:9
+   │
+99 │         ensures result == TRACE(choose y: u64 where y > x);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:94: test_choice_dup_expected_fail
+   =         x = <redacted>
+   =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
+   =     at tests/sources/functional/choice.move:99: test_choice_dup_expected_fail (spec)
+   =         `TRACE(choose y: u64 where y > x)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:157:9
+    │
+157 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:153: test_different_choice_via_let
+    =     at tests/sources/functional/choice.move:157: test_different_choice_via_let (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:181:9
+    │
+181 │         ensures choose_some_positive_u64() == choose_another_positive_u64();
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:179: test_different_choice_via_spec_fun
+    =     at tests/sources/functional/choice.move:181: test_different_choice_via_spec_fun (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/choice.move:86:9
+   │
+86 │         ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/choice.move:75: test_not_using_min_incorrect
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:76: test_not_using_min_incorrect
+   =         v_ref = <redacted>
+   =     at tests/sources/functional/choice.move:77: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:78: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:79: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:80: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:81: test_not_using_min_incorrect
+   =         v = <redacted>
+   =     at tests/sources/functional/choice.move:82: test_not_using_min_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:83: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:86: test_not_using_min_incorrect (spec)
+   =         `TRACE(choose i in 0..len(result) where result[i] == 2)` = <redacted>
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:218:9
+    │
+218 │         ensures result != (choose i: u64 where i >= k);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:235: test_same_choice_different_args_via_schema_2
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:236: test_same_choice_different_args_via_schema_2
+    =     at tests/sources/functional/choice.move:218
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/choice.move:209:9
+    │
+209 │         ensures evidence1 == evidence2;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:205: test_same_choice_different_args_via_spec_fun
+    =         x = <redacted>
+    =         y = <redacted>
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:209: test_same_choice_different_args_via_spec_fun (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/conditional_write_back.move b/vendors/move/crates/move-prover/tests/sources/functional/conditional_write_back.move
new file mode 100644
index 000000000..77e6b7a8e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/conditional_write_back.move
@@ -0,0 +1,130 @@
+module 0x42::Test {
+    struct S {
+        x: u64,
+        y: u64,
+    }
+
+    struct T has key {
+        x: u64,
+    }
+
+    struct R has key {
+        x: u64,
+    }
+
+    public fun diff_field(cond: bool): S {
+        let s = S { x: 0, y: 0  };
+
+        let f = if (cond) {
+            &mut s.x
+        } else {
+            &mut s.y
+        };
+        *f = 1;
+
+        s
+    }
+    spec diff_field {
+        ensures cond ==> (result.x == 1 && result.y == 0);
+        ensures (!cond) ==> (result.x == 0 && result.y == 1);
+    }
+
+    public fun diff_address(cond: bool, a1: address, a2: address) acquires T {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a1);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<T>(a2);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_address {
+        aborts_if cond && !exists<T>(a1);
+        aborts_if !cond && !exists<T>(a2);
+        ensures if (cond) global<T>(a1).x == 0 else global<T>(a2).x == 0;
+    }
+
+    public fun diff_location(cond: bool, a: address, l: &mut T) acquires T {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a);
+            &mut t1.x
+        } else {
+            let t2 = l;
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_location {
+        aborts_if cond && !exists<T>(a);
+        ensures if (cond) global<T>(a).x == 0 else l.x == 0;
+    }
+
+    public fun diff_resource(cond: bool, a: address) acquires T, R {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<R>(a);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_resource {
+        aborts_if cond && !exists<T>(a);
+        aborts_if !cond && !exists<R>(a);
+        ensures if (cond) global<T>(a).x == 0 else global<R>(a).x == 0;
+    }
+
+    struct V<T: store> has key {
+        x: u64,
+        y: T,
+    }
+
+    public fun diff_resource_generic<A: store, B: store>(cond: bool, a: address) acquires V {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<V<A>>(a);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<V<B>>(a);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_resource_generic {
+        aborts_if cond && !exists<V<A>>(a);
+        aborts_if !cond && !exists<V<B>>(a);
+        ensures if (cond) global<V<A>>(a).x == 0 else global<V<B>>(a).x == 0;
+    }
+
+    public fun diff_local_simple(cond: bool) {
+        let v1 = 0;
+        let v2 = 0;
+
+        let r = if (cond) { &mut v1  } else { &mut v2  };
+        *r = 1;
+
+        spec {
+            assert (cond)  ==> (v1 == 1 && v2 == 0);
+            assert (!cond) ==> (v1 == 0 && v2 == 1);
+        }
+    }
+
+    public fun diff_local_global_mix_simple(cond: bool) acquires T {
+        let t = T { x : 0  };
+        let r = if (cond) { borrow_global_mut<T>(@0x1) } else { &mut t  };
+        r.x = 1;
+
+        spec {
+            assert (cond)  ==> t.x == 0;
+            assert (!cond) ==> t.x == 1;
+        };
+
+        let T { x : _ } = t;
+    }
+    spec diff_local_global_mix_simple {
+        aborts_if cond && !exists<T>(@0x1);
+        ensures (cond)  ==> global<T>(@0x1).x == 1;
+        ensures (!cond) ==> global<T>(@0x1).x == old(global<T>(@0x1).x);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/consts.exp b/vendors/move/crates/move-prover/tests/sources/functional/consts.exp
new file mode 100644
index 000000000..37e1c6f37
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/consts.exp
@@ -0,0 +1,48 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:45:13
+   │
+45 │             assert BYTE_ARRAY[0] == 22;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:45: array_1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:51:13
+   │
+51 │             assert ADDRESS_ARRAY[0] == @0x222;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:51: array_2_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:67:13
+   │
+67 │             assert v1[0] == @0x111 && v1[1] == @0x222 && v1[2] == @0x333;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:65: array_in_fun_incorrect
+   =         v1#1#0 = <redacted>
+   =     at tests/sources/functional/consts.move:67: array_in_fun_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:74:13
+   │
+74 │             assert v1[0] == false && v1[1] == false && v1[2] == false;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:72: array_in_fun_incorrect_bool
+   =         v1#1#0 = <redacted>
+   =     at tests/sources/functional/consts.move:74: array_in_fun_incorrect_bool
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/consts.move:32:9
+   │
+32 │         ensures !result.b;
+   │         ^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:27: init_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/consts.move:28: init_incorrect
+   =     at tests/sources/functional/consts.move:31: init_incorrect (spec)
+   =     at tests/sources/functional/consts.move:32: init_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/consts.move b/vendors/move/crates/move-prover/tests/sources/functional/consts.move
new file mode 100644
index 000000000..696fcb382
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/consts.move
@@ -0,0 +1,77 @@
+module 0x42::TestConst {
+
+    struct T {
+        x: u64,
+        b: bool,
+        a: address,
+    }
+    const INIT_VAL_U64: u64 = 40 + 2;
+    const FORTY_TWO: u64 = 42;
+    const INIT_VAL_BOOL: bool = true;
+    const ONE: u64 = 1;
+    const ADDR: address = @0x2;
+    const BYTE_ARRAY: vector<u8> = vector<u8>[11, 22, 33];
+    const ADDRESS_ARRAY: vector<address> = vector<address>[@0x111, @0x222, @0x333];
+    const BOOL_ARRAY: vector<bool> = vector<bool>[true, false, true];
+
+    public fun init(): T {
+        T { x: 43, b: !INIT_VAL_BOOL, a: ADDR }
+    }
+
+    spec init {
+        ensures result.x == INIT_VAL_U64 + 1;
+        ensures !result.b;
+    }
+
+    public fun init_incorrect(): T {
+        T { x: 43, b: INIT_VAL_BOOL, a: @0x1 }
+    }
+
+    spec init_incorrect {
+        ensures result.x == FORTY_TWO + ONE;
+        ensures !result.b;
+    }
+
+    public fun array_correct() {
+        spec {
+            assert BYTE_ARRAY[0] == 11 && BYTE_ARRAY[1] == 22 && BYTE_ARRAY[2] == 33;
+            assert ADDRESS_ARRAY[0] == @0x111 && ADDRESS_ARRAY[1] == @0x222 && ADDRESS_ARRAY[2] == @0x333;
+            assert BOOL_ARRAY[0] == true && BOOL_ARRAY[1] == false && BOOL_ARRAY[2] == true;
+        };
+    }
+
+    public fun array_1_incorrect() {
+        spec {
+            assert BYTE_ARRAY[0] == 22;
+        };
+    }
+
+    public fun array_2_incorrect() {
+        spec {
+            assert ADDRESS_ARRAY[0] == @0x222;
+        };
+    }
+
+    public fun array_in_fun() {
+        let v1 = vector<address> [@0x1, @0x2, @0x3];
+        let v2 = vector<bool> [false, true, false];
+        spec {
+            assert v2[0] == false && v2[1] == true && v2[2] == false;
+            assert v1[0] == @0x1 && v1[1] == @0x2 && v1[2] == @0x3;
+        };
+    }
+
+    public fun array_in_fun_incorrect() {
+        let v1 = vector<address> [@0x1, @0x2, @0x3];
+        spec {
+            assert v1[0] == @0x111 && v1[1] == @0x222 && v1[2] == @0x333;
+        };
+    }
+
+    public fun array_in_fun_incorrect_bool() {
+        let v1 = vector<bool> [false, true, false];
+        spec {
+            assert v1[0] == false && v1[1] == false && v1[2] == false;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp
new file mode 100644
index 000000000..aec50869e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp
@@ -0,0 +1,46 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:15: push_1
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:17: push_1
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:19: push_1
+  =         s = <redacted>
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
+
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:22: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:24: push_2
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:26: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:27: push_2
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:28: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
+
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:31: push_3
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:33: push_3
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:35: push_3
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:36: push_3
+  =         result = <redacted>
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move
new file mode 100644
index 000000000..7541d6c73
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move
@@ -0,0 +1,78 @@
+module 0x42::struct_invariant_mut_ref_param {
+    use std::vector;
+
+    struct S {
+        v: vector<u64>,
+    }
+    spec S {
+        invariant len(v) == 0;
+    }
+
+    public fun empty(): S {
+        S { v: vector::empty<u64>() }
+    }
+
+    public fun push_1(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 1);
+    }
+
+    public fun push_2(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 2);
+        let t = freeze(s);
+        let _ = vector::length(&t.v);
+    }
+
+    public fun push_3(s: &mut S): &mut S {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 3);
+        s
+    }
+
+    public fun push_and_pop_correct_1(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 0);
+
+        // NOTE: data invariant violation for `&mut` param is allowed within
+        // function body (in this example, the data invariant does not hold
+        // in the time window between push and pop).
+        //
+        // Implementation-wise, a data invariant is enforced when a `&mut` param
+        // gets destroyed instead of when a `&mut` param is written-back to.
+
+        vector::pop_back(&mut s.v);
+    }
+
+    public fun push_and_pop_correct_2(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        let v = &mut s.v;
+        vector::push_back(v, 0);
+        vector::pop_back(v);
+    }
+
+    struct A {
+        v1: vector<u64>,
+        v2: vector<u64>,
+    }
+    spec A {
+        invariant len(v1) == len(v2);
+    }
+
+    public fun push_A_in_sync(a: &mut A) {
+        let v1 = &mut a.v1;
+        let v2 = &mut a.v2;
+        vector::push_back(v1, 42);
+        vector::push_back(v2, 42);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_loop.move b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_loop.move
new file mode 100644
index 000000000..ed8a65821
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_loop.move
@@ -0,0 +1,13 @@
+module 0x42::data_inv_in_loop {
+    use std::option::{Self, Option};
+    use std::vector;
+
+    public fun test() {
+        let i = 0;
+        let r = vector::empty<Option<u64>>();
+        while(i < 10) {
+            vector::push_back(&mut r, option::none());
+            i = i + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.exp b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.exp
new file mode 100644
index 000000000..bb15aa4d2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.exp
@@ -0,0 +1,13 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_in_map.move:8:9
+  │
+8 │         invariant value != 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_in_map.move:20: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:21: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:22: violation_1
+  =         s#1#0 = <redacted>
+  =     at tests/sources/functional/data_invariant_in_map.move:23: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:8
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.move b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.move
new file mode 100644
index 000000000..7d43487a5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/data_invariant_in_map.move
@@ -0,0 +1,25 @@
+module 0x42::data_inv_in_map {
+    use extensions::table;
+
+    struct S has store {
+        value: u64
+    }
+    spec S {
+        invariant value != 0;
+    }
+
+    struct R has key {
+        map: table::Table<address, S>
+    }
+
+    fun no_violation() acquires R {
+        let t = &mut borrow_global_mut<R>(@0x42).map;
+        table::add(t, @0x43, S { value: 1 });
+    }
+
+    fun violation_1() acquires R {
+        let t = &mut borrow_global_mut<R>(@0x42).map;
+        let s = table::borrow_mut(t, @0x43);
+        *&mut s.value = 0;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/defines.move b/vendors/move/crates/move-prover/tests/sources/functional/defines.move
new file mode 100644
index 000000000..9cf90e3ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/defines.move
@@ -0,0 +1,62 @@
+module 0x42::TestDefines {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    spec module {
+        fun in_range(x: num, min: num, max: num): bool {
+            x >= min && x <= max
+        }
+
+        fun eq<T>(x: T, y: T): bool {
+            x == y
+        }
+    }
+
+    fun add(x: u64, y: u64): u64 { x + y }
+
+    spec add {
+        aborts_if !in_range(x + y, 0, 18446744073709551615);
+        ensures eq(result, x + y);
+    }
+
+    // --------------------------------------
+    // Spec functions accessing global state.
+    // --------------------------------------
+
+    struct R has key { x: u64 }
+
+    spec module {
+        fun exists_both(addr1: address, addr2: address): bool {
+            exists<R>(addr1) && exists<R>(addr2)
+        }
+        fun get(addr: address): u64 {
+            global<R>(addr).x
+        }
+    }
+
+    fun equal_R(addr1: address, addr2: address): bool acquires R {
+        let r1 = borrow_global<R>(addr1);
+        let r2 = borrow_global<R>(addr2);
+        r1.x == r2.x
+    }
+    spec equal_R {
+        aborts_if !exists_both(addr1, addr2);
+        ensures result == (get(addr1) == get(addr2));
+    }
+
+    // ------------------------------------------
+    // Spec functions derived from Move functions
+    // ------------------------------------------
+
+    fun add_as_spec_fun(x: u64, y: u64): u64 { x + y }
+    fun add_fun(x: u64, y: u64): u64 { x + y }
+    spec add_fun {
+        include AddOk;
+    }
+    spec schema AddOk {
+        x: num; y: num; result: num;
+        ensures result == add_as_spec_fun(x, y);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.exp b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.exp
new file mode 100644
index 000000000..c2ab669ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.exp
@@ -0,0 +1,29 @@
+Move prover returns: exiting with bytecode transformation errors
+error: Public or script functions cannot delegate invariants
+   ┌─ tests/sources/functional/disable_inv.move:13:5
+   │
+13 │ ╭     public fun f1_incorrect(s: &signer) {
+14 │ │         move_to(s, R1 {});
+15 │ │         move_to(s, R2 {});
+16 │ │     }
+   │ ╰─────^
+
+error: Functions must not have `pragma disable_invariants_in_body` when invariant checking is turned-off on this function
+   ┌─ tests/sources/functional/disable_inv.move:34:5
+   │
+34 │ ╭     fun f3_incorrect(s: &signer) {
+35 │ │         move_to(s, R1 {});
+36 │ │     }
+   │ ╰─────^
+   │
+   = disabled by DisableInv::f3_incorrect <- DisableInv::f2
+
+error: Functions must not have `pragma disable_invariants_in_body` when invariant checking is turned-off on this function
+   ┌─ tests/sources/functional/disable_inv.move:50:5
+   │
+50 │ ╭     fun f5_incorrect(s: &signer) {
+51 │ │         move_to(s, R2 {});
+52 │ │     }
+   │ ╰─────^
+   │
+   = disabled by DisableInv::f5_incorrect <- DisableInv::f4 <- DisableInv::f2
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.move b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.move
new file mode 100644
index 000000000..9842bb0c8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv.move
@@ -0,0 +1,66 @@
+module 0x1::DisableInv {
+
+    struct R1 has key { }
+
+    struct R2 has key { }
+
+    struct R3 has key { }
+
+    // Error here because
+    // - the function is public,
+    // - it modifies the suspendable invariant, and
+    // - has a pragma delegate_invariants_to_caller
+    public fun f1_incorrect(s: &signer) {
+        move_to(s, R1 {});
+        move_to(s, R2 {});
+    }
+
+    spec f1_incorrect {
+         pragma delegate_invariants_to_caller;
+    }
+
+    public fun f2(s: &signer) {
+        f3_incorrect(s);
+        f4(s);
+    }
+
+    spec f2 {
+        pragma disable_invariants_in_body;
+    }
+
+    // Error because
+    // - it is called from a site (f2) where invariants are disabled,
+    // - but it has a pragma to defer invariants checking on return.
+    fun f3_incorrect(s: &signer) {
+        move_to(s, R1 {});
+    }
+
+    spec f3_incorrect {
+        pragma disable_invariants_in_body;
+    }
+
+    fun f4(s: &signer) {
+        f5_incorrect(s);
+    }
+
+    // Error because
+    // - it is called from a site (f2) where invariants are disabled,
+    // - but it has a pragma to defer invariant checking on return.
+    // Different from f3 because it's called indirectly through f4.
+    fun f5_incorrect(s: &signer) {
+        move_to(s, R2 {});
+    }
+
+    spec f5_incorrect {
+        pragma disable_invariants_in_body;
+    }
+
+    // Like f1_incorrect, but ok because it does not modify the invariant.
+    public fun f6(s: &signer) {
+        move_to(s, R3 {});
+    }
+
+    spec module {
+        invariant [suspendable] forall a: address where exists<R1>(a): exists<R2>(a);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.exp b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.exp
new file mode 100644
index 000000000..95e7ee12d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.exp
@@ -0,0 +1,14 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/disable_inv_friends.move:25:10
+   │
+25 │          invariant [global, suspendable] forall addr: address: exists<M3::R3>(addr) <==> exists<M2::R2>(addr);
+   │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/disable_inv_friends.move:85: f5_incorrect
+   =     at tests/sources/functional/disable_inv_friends.move:91: f5_incorrect (spec)
+   =     at tests/sources/functional/disable_inv_friends.move:92: f5_incorrect (spec)
+   =     at tests/sources/functional/disable_inv_friends.move:85: f5_incorrect
+   =         s = <redacted>
+   =     at tests/sources/functional/disable_inv_friends.move:86: f5_incorrect
+   =     at tests/sources/functional/disable_inv_friends.move:25
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.move b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.move
new file mode 100644
index 000000000..35e9e72ac
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.move
@@ -0,0 +1,97 @@
+// separate_baseline: simplify
+address 0x1 {
+
+module M1 {
+    use std::signer;
+    use 0x1::M2;
+    use 0x1::M3;
+
+    public fun f1(s: &signer) {
+        M2::f2(s);
+        M3::f3(s);
+    }
+
+    spec f1 {
+        pragma opaque;
+        modifies global<M2::R2>(signer::address_of(s));
+        modifies global<M3::R3>(signer::address_of(s));
+    }
+
+    spec f1 {
+        pragma disable_invariants_in_body;
+    }
+
+    spec module {
+         invariant [global, suspendable] forall addr: address: exists<M3::R3>(addr) <==> exists<M2::R2>(addr);
+    }
+
+}
+
+module M2 {
+    use std::signer;
+    friend 0x1::M1;
+    friend 0x1::M4;
+
+    struct R2 has key {}
+
+    public (friend) fun f2(s: &signer) {
+        move_to(s, R2 {});
+    }
+
+    spec f2 {
+        pragma opaque;
+        modifies global<R2>(signer::address_of(s));
+        ensures exists<R2>(signer::address_of(s));
+    }
+}
+
+module M3 {
+    use std::signer;
+    friend 0x1::M1;
+    friend 0x1::M4;
+
+    struct R3 has key {}
+
+    public(friend) fun f3(s: &signer) {
+        move_to(s, R3 {});
+    }
+
+    spec f3 {
+        pragma opaque;
+        modifies global<R3>(signer::address_of(s));
+        ensures exists<R3>(signer::address_of(s));
+    }
+}
+
+module M4 {
+    use std::signer;
+    use 0x1::M2;
+    use 0x1::M3;
+
+    public fun f4(s: &signer) {
+        M3::f3(s);
+        M2::f2(s);
+    }
+    spec f4 {
+        pragma opaque;
+        modifies global<M2::R2>(signer::address_of(s));
+        modifies global<M3::R3>(signer::address_of(s));
+    }
+
+    spec f4 {
+        pragma disable_invariants_in_body;
+    }
+
+    public fun f5_incorrect(s: &signer) {
+        M3::f3(s);
+        M2::f2(s);
+    }
+    spec f5_incorrect {
+        pragma opaque;
+        modifies global<M2::R2>(signer::address_of(s));
+        modifies global<M3::R3>(signer::address_of(s));
+    }
+
+
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.simplify_exp
new file mode 100644
index 000000000..df10428e4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_friends.simplify_exp
@@ -0,0 +1,18 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/disable_inv_friends.move:25:10
+   │
+25 │          invariant [global, suspendable] forall addr: address: exists<M3::R3>(addr) <==> exists<M2::R2>(addr);
+   │          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/disable_inv_friends.move:85: f5_incorrect
+   =     at tests/sources/functional/disable_inv_friends.move:91: f5_incorrect (spec)
+   =     at tests/sources/functional/disable_inv_friends.move:92: f5_incorrect (spec)
+   =     at tests/sources/functional/disable_inv_friends.move:85: f5_incorrect
+   =         s = <redacted>
+   =     at tests/sources/functional/disable_inv_friends.move:86: f5_incorrect
+   =     at tests/sources/functional/disable_inv_friends.move:55: f3
+   =         s = <redacted>
+   =     at tests/sources/functional/disable_inv_friends.move:56: f3
+   =     at tests/sources/functional/disable_inv_friends.move:57: f3
+   =     at tests/sources/functional/disable_inv_friends.move:25
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.exp b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.exp
new file mode 100644
index 000000000..ec9176faa
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.exp
@@ -0,0 +1,20 @@
+Move prover returns: exiting with bytecode transformation errors
+error: Public or script functions cannot be transitively called by functions disabling or delegating invariants
+  ┌─ tests/sources/functional/disable_inv_indirect.move:6:5
+  │
+6 │ ╭     public fun f1(s: &signer) {
+7 │ │         move_to(s, R {v: 1});
+8 │ │     }
+  │ ╰─────^
+  │
+  = disabled by M1::f1 <- M1::f2 <- M1::f_disabled
+
+error: Public or script functions cannot be transitively called by functions disabling or delegating invariants
+   ┌─ tests/sources/functional/disable_inv_indirect.move:10:5
+   │
+10 │ ╭     public fun f2(s: &signer) {
+11 │ │         f1(s);
+12 │ │     }
+   │ ╰─────^
+   │
+   = disabled by M1::f2 <- M1::f_disabled
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.move b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.move
new file mode 100644
index 000000000..a4b34f9ff
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/disable_inv_indirect.move
@@ -0,0 +1,22 @@
+module 0x1::M1 {
+    //use std::signer;
+
+    struct R has key { v: u64 }
+
+    public fun f1(s: &signer) {
+        move_to(s, R {v: 1});
+    }
+
+    public fun f2(s: &signer) {
+        f1(s);
+    }
+
+    fun f_disabled(s: &signer) {
+        f2(s);
+    }
+    spec f_disabled {
+        pragma disable_invariants_in_body;
+    }
+
+    invariant [suspendable] forall addr: address: exists<R>(addr) ==> global<R>(addr).v > 0;
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/emits.exp b/vendors/move/crates/move-prover/tests/sources/functional/emits.exp
new file mode 100644
index 000000000..fe1adde36
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/emits.exp
@@ -0,0 +1,221 @@
+Move prover returns: exiting with verification errors
+error: function does not emit the expected event
+    ┌─ tests/sources/functional/emits.move:120:9
+    │
+120 │         emits DummyEvent{msg: 0} to handle;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/emits.move:114: conditional_missing_condition_incorrect
+    =         x = <redacted>
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:115: conditional_missing_condition_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:118: conditional_missing_condition_incorrect
+    =     at tests/sources/functional/emits.move:120: conditional_missing_condition_incorrect (spec)
+
+error: function does not emit the expected event
+    ┌─ tests/sources/functional/emits.move:159:9
+    │
+159 │         emits DummyEvent{msg: 2} to handle;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/emits.move:149: conditional_multiple_incorrect
+    =         b = <redacted>
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:150: conditional_multiple_incorrect
+    =     at tests/sources/functional/emits.move:151: conditional_multiple_incorrect
+    =     at tests/sources/functional/emits.move:152: conditional_multiple_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:155: conditional_multiple_incorrect
+    =     at tests/sources/functional/emits.move:157: conditional_multiple_incorrect (spec)
+    =     at tests/sources/functional/emits.move:158: conditional_multiple_incorrect (spec)
+    =     at tests/sources/functional/emits.move:159: conditional_multiple_incorrect (spec)
+
+error: function does not emit the expected event
+    ┌─ tests/sources/functional/emits.move:189:9
+    │
+189 │         emits DummyEvent{msg: 0} to handle;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/emits.move:179: conditional_multiple_same_incorrect
+    =         b = <redacted>
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:180: conditional_multiple_same_incorrect
+    =     at tests/sources/functional/emits.move:181: conditional_multiple_same_incorrect
+    =     at tests/sources/functional/emits.move:182: conditional_multiple_same_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:185: conditional_multiple_same_incorrect
+    =     at tests/sources/functional/emits.move:187: conditional_multiple_same_incorrect (spec)
+    =     at tests/sources/functional/emits.move:188: conditional_multiple_same_incorrect (spec)
+    =     at tests/sources/functional/emits.move:189: conditional_multiple_same_incorrect (spec)
+
+error: function does not emit the expected event
+    ┌─ tests/sources/functional/emits.move:111:9
+    │
+111 │         emits DummyEvent{msg: 0} to handle if x > 0;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/emits.move:105: conditional_wrong_condition_incorrect
+    =         x = <redacted>
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:106: conditional_wrong_condition_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:109: conditional_wrong_condition_incorrect
+    =     at tests/sources/functional/emits.move:111: conditional_wrong_condition_incorrect (spec)
+
+error: function does not emit the expected event
+   ┌─ tests/sources/functional/emits.move:54:9
+   │
+54 │         emits DummyEvent{msg: 2} to handle;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/emits.move:47: multiple_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:48: multiple_incorrect
+   =     at tests/sources/functional/emits.move:49: multiple_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:50: multiple_incorrect
+   =     at tests/sources/functional/emits.move:52: multiple_incorrect (spec)
+   =     at tests/sources/functional/emits.move:53: multiple_incorrect (spec)
+   =     at tests/sources/functional/emits.move:54: multiple_incorrect (spec)
+
+error: function does not emit the expected event
+   ┌─ tests/sources/functional/emits.move:71:9
+   │
+71 │         emits DummyEvent{msg: 0} to handle;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/emits.move:66: multiple_same_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:67: multiple_same_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:68: multiple_same_incorrect
+   =     at tests/sources/functional/emits.move:70: multiple_same_incorrect (spec)
+   =     at tests/sources/functional/emits.move:71: multiple_same_incorrect (spec)
+
+error: emitted event not covered by any of the `emits` clauses
+    ┌─ tests/sources/functional/emits.move:314:5
+    │
+314 │ ╭     spec opaque_completeness_incorrect {
+315 │ │         emits DummyEvent{msg: 0} to handle;
+316 │ │         emits DummyEvent{msg: 7} to handle;
+317 │ │         emits DummyEvent{msg: 1} to handle;
+318 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/emits.move:309: opaque_completeness_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:310: opaque_completeness_incorrect
+    =     at tests/sources/functional/emits.move:311: opaque_completeness_incorrect
+    =     at tests/sources/functional/emits.move:312: opaque_completeness_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:313: opaque_completeness_incorrect
+    =     at tests/sources/functional/emits.move:315: opaque_completeness_incorrect (spec)
+    =     at tests/sources/functional/emits.move:316: opaque_completeness_incorrect (spec)
+    =     at tests/sources/functional/emits.move:317: opaque_completeness_incorrect (spec)
+    =     at tests/sources/functional/emits.move:314: opaque_completeness_incorrect (spec)
+
+error: function does not emit the expected event
+    ┌─ tests/sources/functional/emits.move:296:9
+    │
+296 │         emits DummyEvent{msg: 2} to handle;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/emits.move:286: opaque_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:287: opaque_incorrect
+    =     at tests/sources/functional/emits.move:288: opaque_incorrect
+    =     at tests/sources/functional/emits.move:289: opaque_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:290: opaque_incorrect
+    =     at tests/sources/functional/emits.move:292: opaque_incorrect (spec)
+    =     at tests/sources/functional/emits.move:293: opaque_incorrect (spec)
+    =     at tests/sources/functional/emits.move:294: opaque_incorrect (spec)
+    =     at tests/sources/functional/emits.move:295: opaque_incorrect (spec)
+    =     at tests/sources/functional/emits.move:296: opaque_incorrect (spec)
+
+error: emitted event not covered by any of the `emits` clauses
+    ┌─ tests/sources/functional/emits.move:355:5
+    │
+355 │ ╭     spec opaque_partial_incorrect {
+356 │ │         emits DummyEvent{msg: 0} to handle;
+357 │ │         emits DummyEvent{msg: 7} to handle;
+358 │ │         emits DummyEvent{msg: 77} to handle;
+359 │ │         emits DummyEvent{msg: 1} to handle;
+360 │ │         // The completeness check of the `emits` spec of this function should fail.
+361 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/emits.move:350: opaque_partial_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:351: opaque_partial_incorrect
+    =     at tests/sources/functional/emits.move:352: opaque_partial_incorrect
+    =     at tests/sources/functional/emits.move:353: opaque_partial_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:354: opaque_partial_incorrect
+    =     at tests/sources/functional/emits.move:356: opaque_partial_incorrect (spec)
+    =     at tests/sources/functional/emits.move:357: opaque_partial_incorrect (spec)
+    =     at tests/sources/functional/emits.move:358: opaque_partial_incorrect (spec)
+    =     at tests/sources/functional/emits.move:359: opaque_partial_incorrect (spec)
+    =     at tests/sources/functional/emits.move:355: opaque_partial_incorrect (spec)
+
+error: emitted event not covered by any of the `emits` clauses
+    ┌─ tests/sources/functional/emits.move:235:5
+    │
+235 │ ╭     spec partial_incorrect {
+236 │ │         emits DummyEvent{msg: 0} to handle;
+237 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/emits.move:231: partial_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:232: partial_incorrect
+    =     at tests/sources/functional/emits.move:233: partial_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:234: partial_incorrect
+    =     at tests/sources/functional/emits.move:236: partial_incorrect (spec)
+    =     at tests/sources/functional/emits.move:235: partial_incorrect (spec)
+
+error: function does not emit the expected event
+   ┌─ tests/sources/functional/emits.move:30:9
+   │
+30 │         emits DummyEvent{msg: 0} to _handle2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/emits.move:26: simple_wrong_handle_incorrect
+   =         handle = <redacted>
+   =         _handle2 = <redacted>
+   =     at tests/sources/functional/emits.move:27: simple_wrong_handle_incorrect
+   =         handle = <redacted>
+   =         _handle2 = <redacted>
+   =     at tests/sources/functional/emits.move:28: simple_wrong_handle_incorrect
+   =     at tests/sources/functional/emits.move:30: simple_wrong_handle_incorrect (spec)
+
+error: function does not emit the expected event
+   ┌─ tests/sources/functional/emits.move:23:9
+   │
+23 │         emits DummyEvent{msg: 1} to handle;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/emits.move:19: simple_wrong_msg_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:20: simple_wrong_msg_incorrect
+   =         handle = <redacted>
+   =     at tests/sources/functional/emits.move:21: simple_wrong_msg_incorrect
+   =     at tests/sources/functional/emits.move:23: simple_wrong_msg_incorrect (spec)
+
+error: emitted event not covered by any of the `emits` clauses
+    ┌─ tests/sources/functional/emits.move:255:5
+    │
+255 │ ╭     spec strict_incorrect {
+256 │ │         pragma emits_is_strict;
+257 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/emits.move:251: strict_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:252: strict_incorrect
+    =     at tests/sources/functional/emits.move:253: strict_incorrect
+    =         handle = <redacted>
+    =     at tests/sources/functional/emits.move:254: strict_incorrect
+    =     at tests/sources/functional/emits.move:255: strict_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/emits.move b/vendors/move/crates/move-prover/tests/sources/functional/emits.move
new file mode 100644
index 000000000..27708458e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/emits.move
@@ -0,0 +1,362 @@
+// CVC5 does take excessively long on this:
+// exclude_for: cvc5
+module 0x42::TestEmits {
+    use std::event::{Self, EventHandle};
+
+    struct DummyEvent has copy, drop, store { msg: u64 }
+
+    // -------------------------
+    // simple `emits` statements
+    // -------------------------
+
+    public fun simple(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec simple {
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun simple_wrong_msg_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec simple_wrong_msg_incorrect {
+        emits DummyEvent{msg: 1} to handle;
+    }
+
+    public fun simple_wrong_handle_incorrect(handle: &mut EventHandle<DummyEvent>, _handle2: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec simple_wrong_handle_incorrect {
+        emits DummyEvent{msg: 0} to _handle2;
+    }
+
+
+    // ---------------
+    // multiple events
+    // ---------------
+
+    public fun multiple(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec multiple {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 1} to handle;
+    }
+
+    public fun multiple_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec multiple_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        emits DummyEvent{msg: 2} to handle;
+    }
+
+    public fun multiple_same(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec multiple_same {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun multiple_same_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec multiple_same_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun multiple_different_handle(handle: &mut EventHandle<DummyEvent>, handle2: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+        event::emit_event(handle2, DummyEvent{msg: 0});
+        event::emit_event(handle2, DummyEvent{msg: 0});
+        event::emit_event(handle2, DummyEvent{msg: 1});
+    }
+    spec multiple_different_handle {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        emits DummyEvent{msg: 0} to handle2;
+        emits DummyEvent{msg: 0} to handle2;
+        emits DummyEvent{msg: 1} to handle2;
+    }
+
+
+    // ------------------------------
+    // conditional `emits` statements
+    // ------------------------------
+
+    public fun conditional(x: u64, handle: &mut EventHandle<DummyEvent>) {
+        if (x > 7) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional {
+        emits DummyEvent{msg: 0} to handle if x > 7;
+    }
+
+    public fun conditional_wrong_condition_incorrect(x: u64, handle: &mut EventHandle<DummyEvent>) {
+        if (x > 7) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional_wrong_condition_incorrect {
+        emits DummyEvent{msg: 0} to handle if x > 0;
+    }
+
+    public fun conditional_missing_condition_incorrect(x: u64, handle: &mut EventHandle<DummyEvent>) {
+        if (x > 7) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional_missing_condition_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun conditional_bool(b: bool, handle: &mut EventHandle<DummyEvent>) {
+        if (b) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional_bool {
+        emits DummyEvent{msg: 0} to handle if b;
+    }
+
+    public fun conditional_multiple(b0: bool, b1: bool, b2: bool, handle: &mut EventHandle<DummyEvent>) {
+        if (b0) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        };
+        if (b1) {
+            event::emit_event(handle, DummyEvent{msg: 1});
+        };
+        if (b2) {
+            event::emit_event(handle, DummyEvent{msg: 2});
+        }
+    }
+    spec conditional_multiple {
+        emits DummyEvent{msg: 0} to handle if b0;
+        emits DummyEvent{msg: 1} to handle if b1;
+        emits DummyEvent{msg: 2} to handle if b2;
+    }
+
+    public fun conditional_multiple_incorrect(b: bool, handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+        if (b) {
+            event::emit_event(handle, DummyEvent{msg: 2});
+        }
+    }
+    spec conditional_multiple_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        emits DummyEvent{msg: 2} to handle;
+    }
+
+    public fun conditional_multiple_same(b0: bool, b1: bool, b2: bool, handle: &mut EventHandle<DummyEvent>) {
+        if (b0) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        };
+        if (b1) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        };
+        if (b2) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional_multiple_same {
+        emits DummyEvent{msg: 0} to handle if b0;
+        emits DummyEvent{msg: 0} to handle if b1;
+        emits DummyEvent{msg: 0} to handle if b2;
+    }
+
+    public fun conditional_multiple_same_incorrect(b: bool, handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 0});
+        if (b) {
+            event::emit_event(handle, DummyEvent{msg: 0});
+        }
+    }
+    spec conditional_multiple_same_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+
+    // ----------------------------
+    // `emits` statements in schema
+    // ----------------------------
+
+    public fun emits_in_schema(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+    }
+    spec emits_in_schema {
+        include EmitsInSchemaEmits;
+    }
+    spec schema EmitsInSchemaEmits {
+        handle: EventHandle<DummyEvent>;
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun emits_in_schema_condition(handle: &mut EventHandle<DummyEvent>, x: u64) {
+        if (x > 7) {
+            emits_in_schema(handle)
+        };
+    }
+    spec emits_in_schema_condition {
+        include x > 7 ==> EmitsInSchemaEmits;
+    }
+
+
+    // ----------------------------
+    // pragma emits_is_partial
+    // ----------------------------
+
+    public fun partial(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec partial {
+        pragma emits_is_partial;
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+    public fun partial_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec partial_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+    }
+
+
+    // ----------------------------
+    // pragma emits_is_strict
+    // ----------------------------
+
+    public fun strict(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec strict {
+    }
+
+    public fun strict_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec strict_incorrect {
+        pragma emits_is_strict;
+    }
+
+    // ------------------------
+    // calling opaque functions
+    // ------------------------
+
+    public fun callee(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 7});
+        event::emit_event(handle, DummyEvent{msg: 77});
+    }
+    spec callee {
+        pragma opaque;
+        aborts_if false;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+    }
+
+    public fun opaque(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        callee(handle);
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec opaque {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        emits DummyEvent{msg: 1} to handle;
+    }
+
+    public fun opaque_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        callee(handle);
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec opaque_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        emits DummyEvent{msg: 2} to handle;
+    }
+
+    public fun opaque_in_call_chain(handle: &mut EventHandle<DummyEvent>) {
+        opaque(handle);
+    }
+    spec opaque_in_call_chain {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        emits DummyEvent{msg: 1} to handle;
+    }
+
+    public fun opaque_completeness_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        callee(handle);
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec opaque_completeness_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 1} to handle;
+    }
+
+
+    // -------------------------------------------------
+    // calling opaque functions with partial emits specs
+    // -------------------------------------------------
+
+    public fun callee_partial(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 7});
+        event::emit_event(handle, DummyEvent{msg: 77});
+    }
+    spec callee_partial {
+        pragma opaque;
+        aborts_if false;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        pragma emits_is_partial;
+    }
+
+    public fun opaque_partial(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        callee_partial(handle);
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec opaque_partial {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        pragma emits_is_partial;
+    }
+
+    public fun opaque_partial_incorrect(handle: &mut EventHandle<DummyEvent>) {
+        event::emit_event(handle, DummyEvent{msg: 0});
+        callee_partial(handle);
+        event::emit_event(handle, DummyEvent{msg: 1});
+    }
+    spec opaque_partial_incorrect {
+        emits DummyEvent{msg: 0} to handle;
+        emits DummyEvent{msg: 7} to handle;
+        emits DummyEvent{msg: 77} to handle;
+        emits DummyEvent{msg: 1} to handle;
+        // The completeness check of the `emits` spec of this function should fail.
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/exists_in_vector.move b/vendors/move/crates/move-prover/tests/sources/functional/exists_in_vector.move
new file mode 100644
index 000000000..bef0cb4c5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/exists_in_vector.move
@@ -0,0 +1,75 @@
+// This file contain various test cases for existentially quantifying vectors.
+module 0x42::VectorExists {
+
+    use std::vector;
+    spec module {
+        fun e_in_v_vec(e: u64, v: vector<u64>): bool {
+            exists x in v: x == e
+        }
+        fun e_in_v_range(e: u64, v: vector<u64>): bool {
+            exists i in 0..len(v): v[i] == e
+        }
+        fun e_in_v_u64(e: u64, v: vector<u64>): bool {
+            exists i: u64 where 0 <= i && i < len(v): v[i] == e
+        }
+    }
+
+    public fun do_nothing_ref(_v: &vector<u64>) {
+    }
+    spec do_nothing_ref {
+        aborts_if false;
+
+        ensures _v == _v;
+        ensures exists l: u64: l == len(_v);
+        ensures exists l: u64 where l == len(_v): l == len(_v);
+
+        ensures e_in_v_vec(0, _v) ==> e_in_v_vec(0, _v);
+        ensures e_in_v_range(0, _v) ==> e_in_v_range(0, _v);
+        ensures e_in_v_u64(0, _v) ==> e_in_v_u64(0, _v);
+
+        ensures forall e: u64: (e_in_v_vec(e, _v) ==> e_in_v_vec(e, _v));
+        ensures forall e: u64: (e_in_v_range(e, _v) ==> e_in_v_range(e, _v));
+        ensures forall e: u64: (e_in_v_u64(e, _v) ==> e_in_v_u64(e, _v));
+    }
+
+    public fun do_nothing_ref_mut(_v: &mut vector<u64>) {
+    }
+    spec do_nothing_ref_mut {
+        aborts_if false;
+
+        ensures old(_v) == _v;
+        ensures exists l: u64: l == len(old(_v));
+        ensures exists l: u64: l == len(_v);
+        ensures exists l: u64 where l == len(old(_v)): l == len(_v);
+
+        ensures old(e_in_v_vec(0, _v)) ==> e_in_v_vec(0, _v);
+        ensures old(e_in_v_range(0, _v)) ==> e_in_v_range(0, _v);
+        ensures old(e_in_v_u64(0, _v)) ==> e_in_v_u64(0, _v);
+
+        ensures forall e: u64: (old(e_in_v_vec(e, _v)) ==> e_in_v_vec(e, _v));
+        ensures forall e: u64: (old(e_in_v_range(e, _v)) ==> e_in_v_range(e, _v));
+        ensures forall e: u64: (old(e_in_v_u64(e, _v)) ==> e_in_v_u64(e, _v));
+    }
+
+    public fun push_one(v: &mut vector<u64>) {
+        vector::push_back(v, 1);
+    }
+    spec push_one {
+        pragma verify=false;
+        aborts_if false;
+        ensures v[len(v)-1] == 1;
+
+        ensures e_in_v_vec(1, v);
+        ensures e_in_v_range(1, v);
+        ensures exists i in 0..len(v): v[i] == 1;
+
+        ensures exists i: u64 where (i == len(v)-1): v[i] == 1;
+
+        ensures exists i: u64 : v[i] == 1; // FIXME: not verified, but should be.
+        ensures e_in_v_u64(1, v); // FIXME: not verified, but should be.
+
+        ensures old(e_in_v_vec(0, v)) ==> e_in_v_vec(0, v);
+        ensures old(e_in_v_range(0, v)) ==> e_in_v_range(0, v);
+        ensures old(e_in_v_u64(0, v)) ==> e_in_v_u64(0, v);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.cvc4_exp b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.cvc4_exp
new file mode 100644
index 000000000..bb3eee94b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.cvc4_exp
@@ -0,0 +1,157 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:141:9
+    │
+141 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:136: mul_2_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:137: mul_2_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:138: mul_2_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:141: mul_2_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:149:9
+    │
+149 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:144: mul_3_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:145: mul_3_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:146: mul_3_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:149: mul_3_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:107:9
+    │
+107 │         ensures result >= x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:101: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:102: mul_div_incorrect
+    =     at ../move-stdlib/sources/FixedPoint32.move:150: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:151: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:152: get_raw_value
+    =         y_raw_val = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:103: mul_div_incorrect
+    =         z = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:109:9
+    │
+109 │         ensures result < x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:101: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:102: mul_div_incorrect
+    =     at ../move-stdlib/sources/FixedPoint32.move:150: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:151: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:152: get_raw_value
+    =         y_raw_val = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:103: mul_div_incorrect
+    =         z = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect (spec)
+    =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect (spec)
+    =     at tests/sources/functional/fixed_point_arithm.move:109: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:28:9
+   │
+28 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:23: multiply_0_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:24: multiply_0_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:25: multiply_0_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:27: multiply_0_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:28: multiply_0_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:67:9
+   │
+67 │         ensures result != (x.value >> 32); // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:61: multiply_1_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:62: multiply_1_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:63: multiply_1_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:65: multiply_1_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:67: multiply_1_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:44:9
+   │
+44 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:39: multiply_x_0_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:40: multiply_x_0_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:41: multiply_x_0_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:43: multiply_x_0_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:44: multiply_x_0_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:75:9
+   │
+75 │         ensures result == x; // proved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:70: multiply_x_1
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:71: multiply_x_1
+   =     at ../move-stdlib/sources/FixedPoint32.move:126
+   =     at ../move-stdlib/sources/FixedPoint32.move:127
+   =     at ../move-stdlib/sources/FixedPoint32.move:128
+   =     at tests/sources/functional/fixed_point_arithm.move:71: multiply_x_1
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:72: multiply_x_1
+   =     at tests/sources/functional/fixed_point_arithm.move:74: multiply_x_1 (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:75: multiply_x_1 (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:83:9
+   │
+83 │         ensures result != x; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:78: multiply_x_1_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:79: multiply_x_1_incorrect
+   =     at ../move-stdlib/sources/FixedPoint32.move:126
+   =     at ../move-stdlib/sources/FixedPoint32.move:127
+   =     at ../move-stdlib/sources/FixedPoint32.move:128
+   =     at tests/sources/functional/fixed_point_arithm.move:79: multiply_x_1_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:80: multiply_x_1_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:82: multiply_x_1_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:83: multiply_x_1_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.exp b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.exp
new file mode 100644
index 000000000..ee2233f22
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.exp
@@ -0,0 +1,136 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:144:9
+    │
+144 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:139: mul_2_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:140: mul_2_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:141: mul_2_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:144: mul_2_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:152:9
+    │
+152 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:147: mul_3_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:148: mul_3_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:149: mul_3_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:152: mul_3_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:110:9
+    │
+110 │         ensures result >= x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at ../move-stdlib/sources/fixed_point32.move:148: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/fixed_point32.move:149: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/fixed_point32.move:150: get_raw_value
+    =         y_raw_val#1#0 = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:110: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:112:9
+    │
+112 │         ensures result < x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at ../move-stdlib/sources/fixed_point32.move:148: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/fixed_point32.move:149: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/fixed_point32.move:150: get_raw_value
+    =         y_raw_val#1#0 = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:110: mul_div_incorrect (spec)
+    =     at tests/sources/functional/fixed_point_arithm.move:112: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:31:9
+   │
+31 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:26: multiply_0_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:27: multiply_0_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:28: multiply_0_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:30: multiply_0_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:31: multiply_0_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:70:9
+   │
+70 │         ensures result != (x.value >> 32); // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:64: multiply_1_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:65: multiply_1_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:66: multiply_1_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:68: multiply_1_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:70: multiply_1_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:47:9
+   │
+47 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:42: multiply_x_0_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:43: multiply_x_0_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:44: multiply_x_0_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:46: multiply_x_0_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:47: multiply_x_0_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:86:9
+   │
+86 │         ensures result != x; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:81: multiply_x_1_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:82: multiply_x_1_incorrect
+   =     at ../move-stdlib/sources/fixed_point32.move:124
+   =     at ../move-stdlib/sources/fixed_point32.move:125
+   =     at ../move-stdlib/sources/fixed_point32.move:126
+   =     at tests/sources/functional/fixed_point_arithm.move:82: multiply_x_1_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:83: multiply_x_1_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:85: multiply_x_1_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:86: multiply_x_1_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.move b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.move
new file mode 100644
index 000000000..a2216227f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.move
@@ -0,0 +1,154 @@
+// exclude_for: cvc5
+// separate_baseline: simplify
+// (There used to be a separate baseline: cvc5, but now it's excluded)
+// TODO(cvc5): cvc5 goes into infinite loop because of recursive function
+// $pow (used in shifts) in prelude.bpl.
+// TODO(cvc4): cvc4 currently produces false positives.
+module 0x42::FixedPointArithmetic {
+
+    use std::fixed_point32::{Self, FixedPoint32};
+    spec module {
+       pragma verify = true;
+    }
+
+    // -------------------------------
+    // Multiplicative Property of Zero
+    // -------------------------------
+
+    fun multiply_0_x(x: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(0, x)
+    }
+    spec multiply_0_x {
+        aborts_if false; // proved
+        ensures result == 0; // proved
+    }
+
+    fun multiply_0_x_incorrect(x: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(0, x)
+    }
+    spec multiply_0_x_incorrect {
+        aborts_if false; // proved
+        ensures result == 1; // disproved
+    }
+
+    fun multiply_x_0(x: u64): u64 {
+        fixed_point32::multiply_u64(x, fixed_point32::create_from_raw_value(0))
+    }
+    spec multiply_x_0 {
+        aborts_if false; // proved
+        ensures result == 0; // proved
+    }
+
+    fun multiply_x_0_incorrect(x: u64): u64 {
+        fixed_point32::multiply_u64(x, fixed_point32::create_from_raw_value(0))
+    }
+    spec multiply_x_0_incorrect {
+        aborts_if false; // proved
+        ensures result == 1; // disproved
+    }
+
+
+    // -----------------------------------
+    // Identity Property of Multiplication
+    // -----------------------------------
+
+    fun multiply_1_x(x: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(1, x)
+    }
+    spec multiply_1_x {
+        aborts_if false; // proved
+        // (x.value >> 32) is the integer part of x.
+        ensures result == (x.value >> 32); // proved
+    }
+
+    fun multiply_1_x_incorrect(x: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(1, x)
+    }
+    spec multiply_1_x_incorrect {
+        aborts_if false; // proved
+        // (x.value >> 32) is the integer part of x.
+        ensures result != (x.value >> 32); // disproved
+    }
+
+    fun multiply_x_1(x: u64): u64 {
+        fixed_point32::multiply_u64(x, fixed_point32::create_from_rational(1,1))
+    }
+    spec multiply_x_1 {
+        aborts_if false; // proved
+        ensures result == x; // proved
+    }
+
+    fun multiply_x_1_incorrect(x: u64): u64 {
+        fixed_point32::multiply_u64(x, fixed_point32::create_from_rational(1,1))
+    }
+    spec multiply_x_1_incorrect {
+        aborts_if false; // proved
+        ensures result != x; // disproved
+    }
+
+
+    // ---------------------------
+    // Multiplication and Division
+    // ---------------------------
+
+    // Returns the evaluation of ((x * y) / y) in the fixed-point arithmetic
+    fun mul_div(x: u64, y: FixedPoint32): u64 {
+        let y_raw_val = fixed_point32::get_raw_value(y);
+        let z = fixed_point32::multiply_u64(x, fixed_point32::create_from_raw_value(y_raw_val));
+        fixed_point32::divide_u64(z, fixed_point32::create_from_raw_value(y_raw_val))
+    }
+    spec mul_div {
+        ensures result <= x; // proved
+    }
+
+    fun mul_div_incorrect(x: u64, y: FixedPoint32): u64 {
+        let y_raw_val = fixed_point32::get_raw_value(y);
+        let z = fixed_point32::multiply_u64(x, fixed_point32::create_from_raw_value(y_raw_val));
+        fixed_point32::divide_u64(z, fixed_point32::create_from_raw_value(y_raw_val))
+    }
+    spec mul_div_incorrect {
+        ensures result >= x; // disproved
+        //ensures result == x; // TODO: this can be disproved when given enought time, commented out because of timeout
+        ensures result < x; // disproved
+        ensures result > x; // disproved
+    }
+
+    // Returns the evaluation of ((x / y) * y) in the fixed-point arithmetic
+    fun div_mul(x: u64, y: FixedPoint32): u64 {
+        let y_raw_val = fixed_point32::get_raw_value(y);
+        let z = fixed_point32::divide_u64(x, fixed_point32::create_from_raw_value(y_raw_val));
+        fixed_point32::multiply_u64(z, fixed_point32::create_from_raw_value(y_raw_val))
+    }
+    spec div_mul {
+        ensures result <= x; // proved
+    }
+
+    fun div_mul_incorrect(x: u64, y: FixedPoint32): u64 {
+        let y_raw_val = fixed_point32::get_raw_value(y);
+        let z = fixed_point32::divide_u64(x, fixed_point32::create_from_raw_value(y_raw_val));
+        fixed_point32::multiply_u64(z, fixed_point32::create_from_raw_value(y_raw_val))
+    }
+    spec div_mul_incorrect {
+        pragma verify=false; // TODO: disabled due to the CVC4 timeout
+        ensures result >= x; // disproved
+        ensures result == x; // disproved
+        ensures result < x; // disproved
+        ensures result > x; // disproved
+    }
+
+    fun mul_2_times_incorrect(a: u64, b: FixedPoint32, c: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(fixed_point32::multiply_u64(a, b), c)
+    }
+    spec mul_2_times_incorrect {
+        // there exists a, b and c such that their product is equal to 10.
+        ensures result != 10;
+    }
+
+    fun mul_3_times_incorrect(a: u64, b: FixedPoint32, c: FixedPoint32, d: FixedPoint32): u64 {
+        fixed_point32::multiply_u64(fixed_point32::multiply_u64(fixed_point32::multiply_u64(a, b), c), d)
+    }
+    spec mul_3_times_incorrect {
+        // there exists a, b, c and d such that their product is equal to 10.
+        ensures result != 10;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.simplify_exp
new file mode 100644
index 000000000..ef5c6de78
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/fixed_point_arithm.simplify_exp
@@ -0,0 +1,135 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:144:9
+    │
+144 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:139: mul_2_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:140: mul_2_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:141: mul_2_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:144: mul_2_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:152:9
+    │
+152 │         ensures result != 10;
+    │         ^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:147: mul_3_times_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:148: mul_3_times_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:149: mul_3_times_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:152: mul_3_times_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:110:9
+    │
+110 │         ensures result >= x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at ../move-stdlib/sources/FixedPoint32.move:150: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:151: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:152: get_raw_value
+    =         y_raw_val = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
+    =         z = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:110: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/fixed_point_arithm.move:112:9
+    │
+112 │         ensures result < x; // disproved
+    │         ^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/fixed_point_arithm.move:104: mul_div_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:105: mul_div_incorrect
+    =     at ../move-stdlib/sources/FixedPoint32.move:150: get_raw_value
+    =         num = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:151: get_raw_value
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/FixedPoint32.move:152: get_raw_value
+    =         y_raw_val = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
+    =         z = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
+    =     at tests/sources/functional/fixed_point_arithm.move:110: mul_div_incorrect (spec)
+    =     at tests/sources/functional/fixed_point_arithm.move:111: mul_div_incorrect (spec)
+    =     at tests/sources/functional/fixed_point_arithm.move:112: mul_div_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:31:9
+   │
+31 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:26: multiply_0_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:27: multiply_0_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:28: multiply_0_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:30: multiply_0_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:31: multiply_0_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:70:9
+   │
+70 │         ensures result != (x.value >> 32); // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:64: multiply_1_x_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:65: multiply_1_x_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:66: multiply_1_x_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:68: multiply_1_x_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:70: multiply_1_x_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:47:9
+   │
+47 │         ensures result == 1; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:42: multiply_x_0_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:43: multiply_x_0_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:44: multiply_x_0_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:46: multiply_x_0_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:47: multiply_x_0_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/fixed_point_arithm.move:86:9
+   │
+86 │         ensures result != x; // disproved
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/fixed_point_arithm.move:81: multiply_x_1_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:82: multiply_x_1_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/fixed_point_arithm.move:83: multiply_x_1_incorrect
+   =     at tests/sources/functional/fixed_point_arithm.move:85: multiply_x_1_incorrect (spec)
+   =     at tests/sources/functional/fixed_point_arithm.move:86: multiply_x_1_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/friend.move b/vendors/move/crates/move-prover/tests/sources/functional/friend.move
new file mode 100644
index 000000000..5b04900d0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/friend.move
@@ -0,0 +1,32 @@
+module 0x42::TestFriend {
+
+    struct R has key {
+        x: u64,
+    }
+
+
+    fun f(account: &signer, val: u64) {
+        move_to(account, R{x: val});
+    }
+    spec f {
+        pragma delegate_invariants_to_caller;
+    }
+
+    fun g(account: &signer, val: u64) {
+        f(account, val);
+    }
+    spec g {
+        pragma delegate_invariants_to_caller;
+    }
+
+    public fun h(account: &signer) {
+        g(account, 42);
+    }
+
+    spec module {
+        /// Function f and g both violate this invariant on their own.
+        /// However, since they can only be called from h's context, the following
+        /// invariant can't be violated and the prover verifies with no errors.
+        invariant [suspendable] forall addr: address where exists<R>(addr): global<R>(addr).x == 42;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/friend_error.move b/vendors/move/crates/move-prover/tests/sources/functional/friend_error.move
new file mode 100644
index 000000000..20b7416ff
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/friend_error.move
@@ -0,0 +1,32 @@
+module 0x42::TestFriendError {
+
+    struct R {
+        x: u64,
+    }
+
+    public fun f() {}
+
+    spec f {
+        pragma friend = 0x1::M::some_other_fun;
+    }
+
+    public fun g() {}
+
+    spec g {
+        pragma friend = h;
+        pragma opaque; // Errors here since g can't be opaque with a friend
+    }
+
+    public fun h() {
+        f(); // Errors here since f can only be called from M::some_other_fun
+        g();
+    }
+
+    spec h {
+        pragma friend = i;
+    }
+
+    public fun i() {
+        g(); // Errors here since g can only be called from h
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.exp b/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.exp
new file mode 100644
index 000000000..d09337255
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.exp
@@ -0,0 +1,264 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:34:5
+   │
+34 │ ╭     invariant
+35 │ │         exists<S::Storage<u64, bool>>(@0x22)
+36 │ │             ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:10: publish_u64_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:11: publish_u64_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:39:5
+   │
+39 │ ╭     invariant<Y>
+40 │ │         exists<S::Storage<u64, Y>>(@0x23)
+41 │ │             ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+   │ ╰────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:10: publish_u64_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:11: publish_u64_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:44:5
+   │
+44 │ ╭     invariant<X>
+45 │ │         exists<S::Storage<X, bool>>(@0x24)
+46 │ │             ==> global<S::Storage<X, bool>>(@0x24).y;
+   │ ╰─────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:10: publish_u64_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:11: publish_u64_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:49:5
+   │
+49 │ ╭     invariant<X, Y>
+50 │ │         (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+51 │ │             ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
+   │ ╰───────────────────────────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:10: publish_u64_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:11: publish_u64_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+   =     at tests/sources/functional/generic_invariants.move:49
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:39:5
+   │
+39 │ ╭     invariant<Y>
+40 │ │         exists<S::Storage<u64, Y>>(@0x23)
+41 │ │             ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+   │ ╰────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:15: publish_u64_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:16: publish_u64_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:49:5
+   │
+49 │ ╭     invariant<X, Y>
+50 │ │         (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+51 │ │             ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
+   │ ╰───────────────────────────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:15: publish_u64_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:16: publish_u64_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+   =     at tests/sources/functional/generic_invariants.move:49
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:34:5
+   │
+34 │ ╭     invariant
+35 │ │         exists<S::Storage<u64, bool>>(@0x22)
+36 │ │             ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:15: publish_u64_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:16: publish_u64_y
+   =     at tests/sources/functional/generic_invariants.move:34
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:44:5
+   │
+44 │ ╭     invariant<X>
+45 │ │         exists<S::Storage<X, bool>>(@0x24)
+46 │ │             ==> global<S::Storage<X, bool>>(@0x24).y;
+   │ ╰─────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:15: publish_u64_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:16: publish_u64_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:44:5
+   │
+44 │ ╭     invariant<X>
+45 │ │         exists<S::Storage<X, bool>>(@0x24)
+46 │ │             ==> global<S::Storage<X, bool>>(@0x24).y;
+   │ ╰─────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:20: publish_x_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:21: publish_x_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:49:5
+   │
+49 │ ╭     invariant<X, Y>
+50 │ │         (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+51 │ │             ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
+   │ ╰───────────────────────────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:20: publish_x_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:21: publish_x_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+   =     at tests/sources/functional/generic_invariants.move:49
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:34:5
+   │
+34 │ ╭     invariant
+35 │ │         exists<S::Storage<u64, bool>>(@0x22)
+36 │ │             ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:20: publish_x_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:21: publish_x_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:39:5
+   │
+39 │ ╭     invariant<Y>
+40 │ │         exists<S::Storage<u64, Y>>(@0x23)
+41 │ │             ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+   │ ╰────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:20: publish_x_bool
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:21: publish_x_bool
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:49:5
+   │
+49 │ ╭     invariant<X, Y>
+50 │ │         (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+51 │ │             ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
+   │ ╰───────────────────────────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:25: publish_x_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:26: publish_x_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
+   =     at tests/sources/functional/generic_invariants.move:49
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:34:5
+   │
+34 │ ╭     invariant
+35 │ │         exists<S::Storage<u64, bool>>(@0x22)
+36 │ │             ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:25: publish_x_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:26: publish_x_y
+   =     at tests/sources/functional/generic_invariants.move:34
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:39:5
+   │
+39 │ ╭     invariant<Y>
+40 │ │         exists<S::Storage<u64, Y>>(@0x23)
+41 │ │             ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+   │ ╰────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:25: publish_x_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:26: publish_x_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/generic_invariants.move:44:5
+   │
+44 │ ╭     invariant<X>
+45 │ │         exists<S::Storage<X, bool>>(@0x24)
+46 │ │             ==> global<S::Storage<X, bool>>(@0x24).y;
+   │ ╰─────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/generic_invariants.move:25: publish_x_y
+   =         account = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/generic_invariants.move:26: publish_x_y
+   =     at tests/sources/functional/generic_invariants.move:34
+   =     at tests/sources/functional/generic_invariants.move:39
+   =     at tests/sources/functional/generic_invariants.move:44
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.move b/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.move
new file mode 100644
index 000000000..ecf351852
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/generic_invariants.move
@@ -0,0 +1,60 @@
+address 0x2 {
+module S {
+    struct Storage<X: store, Y: store> has key {
+        x: X,
+        y: Y,
+        v: u8,
+    }
+
+    // F1: <concrete, concrete>
+	public fun publish_u64_bool(account: signer, x: u64, y: bool) {
+	    move_to(&account, Storage { x, y, v: 0 })
+	}
+
+    // F2: <concrete, generic>
+	public fun publish_u64_y<Y: store>(account: signer, x: u64, y: Y) {
+	    move_to(&account, Storage { x, y, v: 1 })
+	}
+
+    // F3: <generic, concrete>
+	public fun publish_x_bool<X: store>(account: signer, x: X, y: bool) {
+	    move_to(&account, Storage { x, y, v: 2 })
+	}
+
+    // F4: <generic, generic>
+	public fun publish_x_y<X: store, Y: store>(account: signer, x: X, y: Y) {
+	    move_to(&account, Storage { x, y, v: 3 })
+	}
+}
+
+module A {
+    use 0x2::S;
+
+    // I1: <concrete, concrete>
+    invariant
+        exists<S::Storage<u64, bool>>(@0x22)
+            ==> global<S::Storage<u64, bool>>(@0x22).x == 1;
+
+    // I2: <concrete, generic>
+    invariant<Y>
+        exists<S::Storage<u64, Y>>(@0x23)
+            ==> global<S::Storage<u64, Y>>(@0x23).x > 0;
+
+    // I3: <generic, concrete>
+    invariant<X>
+        exists<S::Storage<X, bool>>(@0x24)
+            ==> global<S::Storage<X, bool>>(@0x24).y;
+
+    // I4: <generic, generic>
+    invariant<X, Y>
+        (exists<S::Storage<X, Y>>(@0x25) && exists<S::Storage<X, Y>>(@0x26))
+            ==> global<S::Storage<X, Y>>(@0x25) == global<S::Storage<X, Y>>(@0x26);
+
+    public fun good(account1: signer, account2: signer) {
+        S::publish_x_y<u64, bool>(account1, 1, true);
+        S::publish_x_y<u64, bool>(account2, 1, true);
+    }
+
+    // all invariants (I1-I4) should be disproved in all functions (F1-F4)
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/global_invariants.exp b/vendors/move/crates/move-prover/tests/sources/functional/global_invariants.exp
new file mode 100644
index 000000000..a8ab0fa7e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/global_invariants.exp
@@ -0,0 +1,62 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/global_invariants.move:18:9
+   │
+18 │         invariant [global] forall a: address where exists<R>(a): exists<S>(a);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_invariants.move:38: create_R_invalid
+   =         account = <redacted>
+   =     at tests/sources/functional/global_invariants.move:40: create_R_invalid
+   =     at tests/sources/functional/global_invariants.move:38: create_R_invalid
+   =     at tests/sources/functional/global_invariants.move:40: create_R_invalid
+   =     at tests/sources/functional/global_invariants.move:18
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/global_invariants.move:20:9
+   │
+20 │         invariant update [global] forall a: address where old(exists_R(a)): exists<R>(a);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_invariants.move:62: remove_R_invalid
+   =         account = <redacted>
+   =     at tests/sources/functional/global_invariants.move:64: remove_R_invalid
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:64: remove_R_invalid
+   =     at tests/sources/functional/global_invariants.move:65: remove_R_invalid
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:62: remove_R_invalid
+   =     at tests/sources/functional/global_invariants.move:65: remove_R_invalid
+   =     at tests/sources/functional/global_invariants.move:18
+   =     at tests/sources/functional/global_invariants.move:20
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/global_invariants.move:18:9
+   │
+18 │         invariant [global] forall a: address where exists<R>(a): exists<S>(a);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_invariants.move:53: remove_S_invalid
+   =         account = <redacted>
+   =     at tests/sources/functional/global_invariants.move:55: remove_S_invalid
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:55: remove_S_invalid
+   =     at tests/sources/functional/global_invariants.move:56: remove_S_invalid
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:18
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/global_vars.exp b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.exp
new file mode 100644
index 000000000..2d0a0d8a3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.exp
@@ -0,0 +1,98 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/global_vars.move:41:9
+   │
+41 │         ensures sum_of_T == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_vars.move:37: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:38: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:17: add
+   =     at tests/sources/functional/global_vars.move:19: add
+   =     at tests/sources/functional/global_vars.move:21: add
+   =     at tests/sources/functional/global_vars.move:24: sub
+   =     at tests/sources/functional/global_vars.move:26: sub
+   =     at tests/sources/functional/global_vars.move:28: sub
+   =     at tests/sources/functional/global_vars.move:17: add
+   =     at tests/sources/functional/global_vars.move:19: add
+   =     at tests/sources/functional/global_vars.move:21: add
+   =     at tests/sources/functional/global_vars.move:39: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:41: call_add_sub_invalid (spec)
+
+error: precondition does not hold at this call
+    ┌─ tests/sources/functional/global_vars.move:101:9
+    │
+101 │         requires access_verified;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:109: do_privileged_invalid
+    =         _s = <redacted>
+    =     at tests/sources/functional/global_vars.move:101: requires_access (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/global_vars.move:137:9
+    │
+137 │         ensures type_has_property<u64>;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:133: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:134: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:121: give_property_to
+    =     at tests/sources/functional/global_vars.move:123: give_property_to (spec)
+    =     at tests/sources/functional/global_vars.move:135: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:137: expect_property_of_u64_invalid (spec)
+
+error: global memory invariant does not hold
+    ┌─ tests/sources/functional/global_vars.move:174:5
+    │
+174 │     invariant global<R>(@0).v <= limit;
+    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:184: limit_change_invalid
+    =         s = <redacted>
+    =     at tests/sources/functional/global_vars.move:185: limit_change_invalid
+    =     at tests/sources/functional/global_vars.move:176: publish
+    =         s = <redacted>
+    =     at tests/sources/functional/global_vars.move:177: publish
+    =     at tests/sources/functional/global_vars.move:178: publish
+    =     at tests/sources/functional/global_vars.move:186: limit_change_invalid
+    =     at tests/sources/functional/global_vars.move:188: limit_change_invalid (spec)
+    =     at tests/sources/functional/global_vars.move:174
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/global_vars.move:76:9
+   │
+76 │         ensures sum_of_T == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_vars.move:72: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:73: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:53: opaque_add (spec)
+   =     at tests/sources/functional/global_vars.move:73: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:62: opaque_sub (spec)
+   =     at tests/sources/functional/global_vars.move:73: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:53: opaque_add (spec)
+   =     at tests/sources/functional/global_vars.move:74: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:76: opaque_call_add_sub_invalid (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/global_vars.move:161:9
+    │
+161 │         ensures type_has_property<u64>;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:157: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:158: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:147: opaque_give_property_to (spec)
+    =     at tests/sources/functional/global_vars.move:159: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:161: opaque_expect_property_of_u64_invalid (spec)
+
+error: global memory invariant does not hold
+    ┌─ tests/sources/functional/global_vars.move:174:5
+    │
+174 │     invariant global<R>(@0).v <= limit;
+    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:180: update_invalid
+    =     at tests/sources/functional/global_vars.move:181: update_invalid
+    =     at tests/sources/functional/global_vars.move:174
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/global_vars.move b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.move
new file mode 100644
index 000000000..27413b1a6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.move
@@ -0,0 +1,190 @@
+// separate_baseline: simplify
+module 0x42::TestGlobalVars {
+    use std::signer;
+
+    // ================================================================================
+    // Counting
+
+    spec module {
+        global sum_of_T: u64 = 0;
+    }
+
+    struct T has key {
+      i: u64,
+    }
+
+    fun add() acquires T {
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i + 1;
+        spec {
+            update sum_of_T = sum_of_T + 1;
+        };
+    }
+
+    fun sub() acquires T {
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i - 1;
+        spec {
+            update sum_of_T = sum_of_T - 1;
+        };
+    }
+
+    fun call_add_sub() acquires T {
+        add(); add(); sub();
+    }
+    spec call_add_sub {
+        ensures sum_of_T == 1;
+    }
+
+    fun call_add_sub_invalid() acquires T {
+        add(); sub(); add();
+    }
+    spec call_add_sub_invalid {
+        ensures sum_of_T == 2;
+    }
+
+    // ================================================================================
+    // Counting (opaque)
+
+    fun opaque_add() acquires T {
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i + 1
+    }
+    spec opaque_add {
+        pragma opaque;
+        modifies global<T>(@0);
+        update sum_of_T = sum_of_T + 1;
+    }
+
+    fun opaque_sub() acquires T {
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i - 1
+    }
+    spec opaque_sub {
+        pragma opaque;
+        modifies global<T>(@0);
+        update sum_of_T = sum_of_T - 1;
+    }
+
+    fun opaque_call_add_sub() acquires T {
+        opaque_add(); opaque_add(); opaque_sub();
+    }
+    spec opaque_call_add_sub {
+        ensures sum_of_T == 1;
+    }
+
+    fun opaque_call_add_sub_invalid() acquires T {
+        opaque_add(); opaque_sub(); opaque_add();
+    }
+    spec opaque_call_add_sub_invalid {
+        ensures sum_of_T == 2;
+    }
+
+    // ================================================================================
+    // Access Control
+
+    spec module {
+        // Indicates whether a specific access has been verified. This is kept intentionally
+        // uninitialized so the prover will find situations where this is false but access is required.
+        global access_verified: bool;
+    }
+
+    fun assert_access(s: &signer) {
+        // Do some assertions which validate access
+        assert!(signer::address_of(s) == @0, 1);
+    }
+    spec assert_access {
+        aborts_if signer::address_of(s) != @0;
+        update access_verified = true;
+    }
+
+    fun requires_access() {
+        // Do some things which require access to be validated.
+    }
+    spec requires_access {
+        requires access_verified;
+    }
+
+    fun do_privileged(s: &signer) {
+        assert_access(s);
+        requires_access();
+    }
+
+    fun do_privileged_invalid(_s: &signer) {
+        requires_access();
+    }
+
+    // ================================================================================
+    // Generic spec vars
+
+    spec module {
+        global type_has_property<X>: bool;
+    }
+
+    fun give_property_to<X>() {
+    }
+    spec give_property_to {
+        update type_has_property<X> = true;
+    }
+
+    fun expect_property_of_bool() {
+        give_property_to<bool>();
+    }
+    spec expect_property_of_bool {
+        ensures type_has_property<bool>;
+    }
+
+    fun expect_property_of_u64_invalid() {
+        give_property_to<bool>();
+    }
+    spec expect_property_of_u64_invalid {
+        ensures type_has_property<u64>;
+    }
+
+    // ================================================================================
+    // Generic spec vars (opaque)
+
+    fun opaque_give_property_to<X>() {
+    }
+    spec opaque_give_property_to {
+        pragma opaque;
+        update type_has_property<X> = true;
+    }
+
+    fun opaque_expect_property_of_bool() {
+        opaque_give_property_to<bool>();
+    }
+    spec opaque_expect_property_of_bool {
+        ensures type_has_property<bool>;
+    }
+
+    fun opaque_expect_property_of_u64_invalid() {
+        opaque_give_property_to<bool>();
+    }
+    spec opaque_expect_property_of_u64_invalid {
+        ensures type_has_property<u64>;
+    }
+
+
+    // ================================================================================
+    // Invariants and spec vars
+
+    spec module {
+        global limit: num = 2;
+    }
+
+    struct R has key { v: u64 }
+
+    invariant global<R>(@0).v <= limit;
+
+    fun publish(s: &signer) {
+        move_to<R>(s, R{v: 2});
+    }
+
+    fun update_invalid() acquires R {
+        borrow_global_mut<R>(@0).v = 3;
+    }
+
+    fun limit_change_invalid(s: &signer) {
+        publish(s);
+    }
+    spec limit_change_invalid {
+        update limit = 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/global_vars.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.simplify_exp
new file mode 100644
index 000000000..f262e6c36
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/global_vars.simplify_exp
@@ -0,0 +1,103 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/global_vars.move:41:9
+   │
+41 │         ensures sum_of_T == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_vars.move:37: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:38: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:17: add
+   =     at tests/sources/functional/global_vars.move:18: add
+   =     at tests/sources/functional/global_vars.move:20: add (spec)
+   =     at tests/sources/functional/global_vars.move:24: sub
+   =     at tests/sources/functional/global_vars.move:25: sub
+   =     at tests/sources/functional/global_vars.move:27: sub (spec)
+   =     at tests/sources/functional/global_vars.move:17: add
+   =     at tests/sources/functional/global_vars.move:18: add
+   =     at tests/sources/functional/global_vars.move:20: add (spec)
+   =     at tests/sources/functional/global_vars.move:39: call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:41: call_add_sub_invalid (spec)
+
+error: precondition does not hold at this call
+    ┌─ tests/sources/functional/global_vars.move:101:9
+    │
+101 │         requires access_verified;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:109: do_privileged_invalid
+    =         _s = <redacted>
+    =     at tests/sources/functional/global_vars.move:101: requires_access (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/global_vars.move:137:9
+    │
+137 │         ensures type_has_property<u64>;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:133: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:134: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:121: give_property_to
+    =     at tests/sources/functional/global_vars.move:123: give_property_to (spec)
+    =     at tests/sources/functional/global_vars.move:135: expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:137: expect_property_of_u64_invalid (spec)
+
+error: global memory invariant does not hold
+    ┌─ tests/sources/functional/global_vars.move:174:5
+    │
+174 │     invariant global<R>(@0).v <= limit;
+    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:184: limit_change_invalid
+    =         s = <redacted>
+    =     at tests/sources/functional/global_vars.move:185: limit_change_invalid
+    =     at tests/sources/functional/global_vars.move:176: publish
+    =         s = <redacted>
+    =     at tests/sources/functional/global_vars.move:177: publish
+    =     at tests/sources/functional/global_vars.move:178: publish
+    =     at tests/sources/functional/global_vars.move:186: limit_change_invalid
+    =     at tests/sources/functional/global_vars.move:188: limit_change_invalid (spec)
+    =     at tests/sources/functional/global_vars.move:174
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/global_vars.move:76:9
+   │
+76 │         ensures sum_of_T == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/global_vars.move:72: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:73: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:48: opaque_add
+   =     at tests/sources/functional/global_vars.move:49: opaque_add
+   =     at tests/sources/functional/global_vars.move:53: opaque_add (spec)
+   =     at tests/sources/functional/global_vars.move:57: opaque_sub
+   =     at tests/sources/functional/global_vars.move:58: opaque_sub
+   =     at tests/sources/functional/global_vars.move:62: opaque_sub (spec)
+   =     at tests/sources/functional/global_vars.move:48: opaque_add
+   =     at tests/sources/functional/global_vars.move:49: opaque_add
+   =     at tests/sources/functional/global_vars.move:53: opaque_add (spec)
+   =     at tests/sources/functional/global_vars.move:74: opaque_call_add_sub_invalid
+   =     at tests/sources/functional/global_vars.move:76: opaque_call_add_sub_invalid (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/global_vars.move:161:9
+    │
+161 │         ensures type_has_property<u64>;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:157: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:158: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:144: opaque_give_property_to
+    =     at tests/sources/functional/global_vars.move:147: opaque_give_property_to (spec)
+    =     at tests/sources/functional/global_vars.move:159: opaque_expect_property_of_u64_invalid
+    =     at tests/sources/functional/global_vars.move:161: opaque_expect_property_of_u64_invalid (spec)
+
+error: global memory invariant does not hold
+    ┌─ tests/sources/functional/global_vars.move:174:5
+    │
+174 │     invariant global<R>(@0).v <= limit;
+    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/global_vars.move:180: update_invalid
+    =     at tests/sources/functional/global_vars.move:181: update_invalid
+    =     at tests/sources/functional/global_vars.move:174
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/hash_model.exp b/vendors/move/crates/move-prover/tests/sources/functional/hash_model.exp
new file mode 100644
index 000000000..bfd4cb48c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/hash_model.exp
@@ -0,0 +1,40 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/hash_model.move:48:9
+   │
+48 │         ensures len(result_1) > 0 ==> result_1[0] < max_u8(); // should be <=
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/hash_model.move:39: hash_test1_incorrect
+   =         v1 = <redacted>
+   =         v2 = <redacted>
+   =     at tests/sources/functional/hash_model.move:41: hash_test1_incorrect
+   =         h1#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model.move:42: hash_test1_incorrect
+   =         h2#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model.move:43: hash_test1_incorrect
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/hash_model.move:44: hash_test1_incorrect
+   =     at tests/sources/functional/hash_model.move:46: hash_test1_incorrect (spec)
+   =     at tests/sources/functional/hash_model.move:48: hash_test1_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/hash_model.move:91:9
+   │
+91 │         ensures len(result_1) > 0 ==> result_1[0] < max_u8();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/hash_model.move:82: hash_test2_incorrect
+   =         v1 = <redacted>
+   =         v2 = <redacted>
+   =     at tests/sources/functional/hash_model.move:84: hash_test2_incorrect
+   =         h1#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model.move:85: hash_test2_incorrect
+   =         h2#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model.move:86: hash_test2_incorrect
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/hash_model.move:87: hash_test2_incorrect
+   =     at tests/sources/functional/hash_model.move:89: hash_test2_incorrect (spec)
+   =     at tests/sources/functional/hash_model.move:91: hash_test2_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/hash_model.move b/vendors/move/crates/move-prover/tests/sources/functional/hash_model.move
new file mode 100644
index 000000000..56b866057
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/hash_model.move
@@ -0,0 +1,93 @@
+
+
+module 0x42::TestHash {
+    use std::hash;
+    spec module {
+        pragma verify = true;
+    }
+
+    // -----------
+    // SHA-2 Tests
+    // -----------
+
+    fun hash_test1(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha2_256(v1);
+        let h2 = hash::sha2_256(v2);
+        (h1, h2)
+    }
+    spec hash_test1 {
+        aborts_if false;
+        ensures result_1 == result_2 ==> v1 == v2;
+        ensures v1 == v2 ==> result_1 == result_2;
+        ensures len(result_1) == 32;
+        // it knows result is vector<u8>
+        ensures len(result_1) > 0 ==> result_1[0] <= max_u8();
+    }
+
+    fun hash_test2(v1: vector<u8>, v2: vector<u8>): bool
+    {
+        let h1 = hash::sha2_256(v1);
+        let h2 = hash::sha2_256(v2);
+        h1 == h2
+    }
+    spec hash_test2 {
+        aborts_if false;
+        ensures result == (v1 == v2);
+    }
+
+    fun hash_test1_incorrect(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha2_256(v1);
+        let h2 = hash::sha2_256(v2);
+        (h1, h2)
+    }
+    spec hash_test1_incorrect {
+        aborts_if false;
+        // ensures result_1 == result_2; // TODO: uncomment this after fixing the non-determinism issue of Boogie
+        ensures len(result_1) > 0 ==> result_1[0] < max_u8(); // should be <=
+    }
+
+
+    // -----------
+    // SHA-3 Tests
+    // -----------
+
+    fun hash_test3(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha3_256(v1);
+        let h2 = hash::sha3_256(v2);
+        (h1, h2)
+    }
+    spec hash_test3 {
+        aborts_if false;
+        ensures result_1 == result_2 ==> v1 == v2;
+        ensures v1 == v2 ==> result_1 == result_2;
+        ensures len(result_1) == 32;
+        // it knows result is vector<u8>
+        ensures len(result_1) > 0 ==> result_1[0] <= max_u8();
+    }
+
+    fun hash_test4(v1: vector<u8>, v2: vector<u8>): bool
+    {
+        let h1 = hash::sha3_256(v1);
+        let h2 = hash::sha3_256(v2);
+        h1 == h2
+    }
+    spec hash_test4 {
+        aborts_if false;
+        ensures result == (v1 == v2);
+    }
+
+    fun hash_test2_incorrect(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha2_256(v1);
+        let h2 = hash::sha2_256(v2);
+        (h1, h2)
+    }
+    spec hash_test2_incorrect {
+        aborts_if false;
+        // ensures result_1 == result_2; // TODO: uncomment this after fixing the non-determinism issue of Boogie
+        ensures len(result_1) > 0 ==> result_1[0] < max_u8();
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.exp b/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.exp
new file mode 100644
index 000000000..b87fcb6dd
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.exp
@@ -0,0 +1,40 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/hash_model_invalid.move:22:9
+   │
+22 │         ensures len(result_1) > 0 ==> result_1[0] < max_u8(); // should be <=
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/hash_model_invalid.move:11: hash_test1
+   =         v1 = <redacted>
+   =         v2 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:13: hash_test1
+   =         h1#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:14: hash_test1
+   =         h2#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:15: hash_test1
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:16: hash_test1
+   =     at tests/sources/functional/hash_model_invalid.move:18: hash_test1 (spec)
+   =     at tests/sources/functional/hash_model_invalid.move:22: hash_test1 (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/hash_model_invalid.move:35:9
+   │
+35 │         ensures len(result_1) > 0 ==> result_1[0] < max_u8();
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/hash_model_invalid.move:26: hash_test2
+   =         v1 = <redacted>
+   =         v2 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:28: hash_test2
+   =         h1#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:29: hash_test2
+   =         h2#1#0 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:30: hash_test2
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/hash_model_invalid.move:31: hash_test2
+   =     at tests/sources/functional/hash_model_invalid.move:33: hash_test2 (spec)
+   =     at tests/sources/functional/hash_model_invalid.move:35: hash_test2 (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.move b/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.move
new file mode 100644
index 000000000..f850bb47d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/hash_model_invalid.move
@@ -0,0 +1,37 @@
+module 0x42::TestHash {
+
+    use std::hash;
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    // sha2 test
+    fun hash_test1(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha2_256(v1);
+        let h2 = hash::sha2_256(v2);
+        (h1, h2)
+    }
+    spec hash_test1 {
+        aborts_if false;
+        // TODO: two failing ensures seem to create non-determinism; one time the first, the next the
+        // second is reported. Investigate whether this is caused by boogie_wrapper or by inherent to boogie.
+        // ensures result_1 == result_2;
+        ensures len(result_1) > 0 ==> result_1[0] < max_u8(); // should be <=
+    }
+
+    // sha3 test
+    fun hash_test2(v1: vector<u8>, v2: vector<u8>): (vector<u8>, vector<u8>)
+    {
+        let h1 = hash::sha3_256(v1);
+        let h2 = hash::sha3_256(v2);
+        (h1, h2)
+    }
+    spec hash_test2 {
+        aborts_if false;
+        // ensures result_1 == result_2;
+        ensures len(result_1) > 0 ==> result_1[0] < max_u8();
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.exp b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.exp
new file mode 100644
index 000000000..ec1727a9c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.exp
@@ -0,0 +1,11 @@
+Move prover returns: exiting with verification errors
+error: there is an inconsistent assumption in the function, which may allow any post-condition (including false) to be proven
+   ┌─ tests/sources/functional/inconsistency.move:17:5
+   │
+17 │ ╭     fun assume_false(x: u64): u64 {
+18 │ │         spec {
+19 │ │             assume false;
+20 │ │         };
+21 │ │         dec(x)
+22 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.move b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.move
new file mode 100644
index 000000000..9bca4ea85
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.move
@@ -0,0 +1,46 @@
+// flag: --check-inconsistency
+// separate_baseline: simplify
+module 0x42::Inconsistency {
+
+
+    // There is no inconsistency in this function.
+    fun dec(x: u64): u64 {
+        x - 1
+    }
+    spec dec {
+        aborts_if x == 0;
+        ensures result == x - 1;
+    }
+
+    // There is an inconsistent assumption in the verification of this function
+    // because it assumes false.
+    fun assume_false(x: u64): u64 {
+        spec {
+            assume false;
+        };
+        dec(x)
+    }
+    spec assume_false {
+        aborts_if x == 0;
+        ensures result == x - 1;
+        ensures false;
+    }
+
+    // This opaque function has the false post-condition, so introduces an inconsistency.
+    fun inconsistent_opaque() {
+    }
+    spec inconsistent_opaque {
+        pragma verify=false;
+        pragma opaque;
+        ensures false;
+    }
+
+    // There is an inconsistent assumption in the verification of this function
+    // because it calls an inconsistent opaque function.
+    fun call_inconsistent_opaque() {
+        inconsistent_opaque();
+    }
+    spec call_inconsistent_opaque {
+        ensures false;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.simplify_exp
new file mode 100644
index 000000000..ec1727a9c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency.simplify_exp
@@ -0,0 +1,11 @@
+Move prover returns: exiting with verification errors
+error: there is an inconsistent assumption in the function, which may allow any post-condition (including false) to be proven
+   ┌─ tests/sources/functional/inconsistency.move:17:5
+   │
+17 │ ╭     fun assume_false(x: u64): u64 {
+18 │ │         spec {
+19 │ │             assume false;
+20 │ │         };
+21 │ │         dec(x)
+22 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.exp b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.exp
new file mode 100644
index 000000000..87bd17bdc
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.exp
@@ -0,0 +1,20 @@
+Move prover returns: exiting with verification errors
+error: there is an inconsistent assumption in the function, which may allow any post-condition (including false) to be proven
+  ┌─ tests/sources/functional/inconsistency_always_abort.move:6:5
+  │
+6 │ ╭     fun always_abort() {
+7 │ │         abort 0
+8 │ │     }
+  │ ╰─────^
+
+error: there is an inconsistent assumption in the function, which may allow any post-condition (including false) to be proven
+   ┌─ tests/sources/functional/inconsistency_always_abort.move:14:5
+   │
+14 │ ╭     fun always_abort_if_else(x: u64): bool {
+15 │ │         if (x == x) {
+16 │ │             abort 0
+17 │ │         } else {
+18 │ │             return true
+19 │ │         }
+20 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.move b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.move
new file mode 100644
index 000000000..e978b0adb
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/inconsistency_always_abort.move
@@ -0,0 +1,24 @@
+// flag: --check-inconsistency
+// flag: --unconditional-abort-as-inconsistency
+module 0x42::Inconsistency {
+    // There is an inconsistent assumption in the verification of this function
+    // because it always aborts.
+    fun always_abort() {
+        abort 0
+    }
+    spec always_abort {
+        ensures false;
+    }
+
+    // Hiding the function behind some trivial if-else branch does not work
+    fun always_abort_if_else(x: u64): bool {
+        if (x == x) {
+            abort 0
+        } else {
+            return true
+        }
+    }
+    spec always_abort_if_else {
+        ensures result == false;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/invariants.exp b/vendors/move/crates/move-prover/tests/sources/functional/invariants.exp
new file mode 100644
index 000000000..9b3360581
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/invariants.exp
@@ -0,0 +1,57 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+   ┌─ tests/sources/functional/invariants.move:16:9
+   │
+16 │         invariant greater_one(x);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/invariants.move:43: invalid_R_pack
+   =     at tests/sources/functional/invariants.move:16
+
+error: data invariant does not hold
+   ┌─ tests/sources/functional/invariants.move:16:9
+   │
+16 │         invariant greater_one(x);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/invariants.move:113: lifetime_invalid_R
+   =     at tests/sources/functional/invariants.move:16
+   =     at tests/sources/functional/invariants.move:113: lifetime_invalid_R
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/invariants.move:114: lifetime_invalid_R
+   =     at tests/sources/functional/invariants.move:115: lifetime_invalid_R
+   =         x_ref#1#0 = <redacted>
+   =     at tests/sources/functional/invariants.move:116: lifetime_invalid_R
+   =     at tests/sources/functional/invariants.move:16
+
+error: data invariant does not hold
+    ┌─ tests/sources/functional/invariants.move:150:9
+    │
+150 │         invariant y > 1;
+    │         ^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/invariants.move:153: lifetime_invalid_S_branching
+    =         cond = <redacted>
+    =     at tests/sources/functional/invariants.move:154: lifetime_invalid_S_branching
+    =     at tests/sources/functional/invariants.move:143
+    =     at tests/sources/functional/invariants.move:154: lifetime_invalid_S_branching
+    =         a#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:155: lifetime_invalid_S_branching
+    =     at tests/sources/functional/invariants.move:150
+    =     at tests/sources/functional/invariants.move:155: lifetime_invalid_S_branching
+    =         b#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:156: lifetime_invalid_S_branching
+    =         a_ref#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:157: lifetime_invalid_S_branching
+    =         b_ref#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:158: lifetime_invalid_S_branching
+    =     at tests/sources/functional/invariants.move:143
+    =     at tests/sources/functional/invariants.move:158: lifetime_invalid_S_branching
+    =         a#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:158: lifetime_invalid_S_branching
+    =         x_ref#1#0 = <redacted>
+    =     at tests/sources/functional/invariants.move:160: lifetime_invalid_S_branching
+    =     at tests/sources/functional/invariants.move:163: lifetime_invalid_S_branching
+    =     at <internal>:1
+    =     at tests/sources/functional/invariants.move:163: lifetime_invalid_S_branching
+    =     at tests/sources/functional/invariants.move:150
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/invariants.move b/vendors/move/crates/move-prover/tests/sources/functional/invariants.move
new file mode 100644
index 000000000..15737b2b2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/invariants.move
@@ -0,0 +1,168 @@
+module 0x42::TestInvariants {
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    // General invariant checking.
+
+    struct R has copy, drop {
+        x: u64
+    }
+
+    spec R {
+        // We must always have a value greater one.
+        invariant greater_one(x);
+
+        // When we update via a reference, the new value must be smaller or equal the old one.
+        // invariant update x <= old(x) && tautology();
+    }
+
+    spec module {
+        // Pure function to be used in data invariants.
+        fun greater_one(x: num): bool { x > 1 }
+
+        // Impure function to be used in update invariants.
+        fun tautology() : bool { global<R>(@0x5551212) == R {x: 2} || global<R>(@0x5551212) != R {x: 2} }
+    }
+
+
+    // ----------
+    // Pack tests
+    // ----------
+
+    fun valid_R_pack(): R {
+        R {x: 2}
+    }
+    spec valid_R_pack {
+        ensures result.x == 2;
+    }
+
+    fun invalid_R_pack(): R {
+        R {x: 1}
+    }
+    spec invalid_R_pack {
+        ensures result.x == 1;
+    }
+
+
+    // ------------
+    // Update tests
+    // ------------
+
+    fun valid_R_update(): R {
+        let t = R {x: 3};
+        let r = &mut t;
+        *r = R {x: 2};
+        t
+    }
+    spec valid_R_update {
+        ensures result.x == 2;
+    }
+
+    fun invalid_R_update(): R {
+        let t = R {x: 3};
+        let r = &mut t;
+        *r = R {x: 4};
+        t
+    }
+    spec invalid_R_update {
+        ensures result.x == 4;
+    }
+
+    fun invalid_R_update_ref(): R {
+        let t = R{x:3};
+        let r = &mut t.x;
+        *r = 4;
+        t
+    }
+    spec invalid_R_update_ref {
+        ensures result.x == 4;
+    }
+
+    fun invalid_R_update_indirectly(): R {
+        let t = R{x:3};
+        update_helper(&mut t.x);
+        t
+    }
+    fun update_helper(r: &mut u64) {
+        *r = 4;
+    }
+
+    fun invalid_R_update_branching(b: bool): R {
+        let t1 = R {x: 5};
+        let t2 = R {x: 3};
+        let r: &mut R;
+        if (b) {
+            // this branch is fine because we can go from x = 5 to x = 4
+            r = &mut t1
+        } else {
+            // this branch leads to update invariant violation as we cannot go from x = 3 to x = 4
+            r = &mut t2
+        };
+        *r = R {x: 4};
+        *r
+    }
+
+    // -----------------------
+    // Lifetime analysis tests
+    // -----------------------
+
+    fun lifetime_invalid_R() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0; // r_ref goes out of scope here
+
+        r_ref = &mut r;
+        x_ref = &mut r_ref.x;
+        *x_ref = 2;
+
+        r
+    }
+
+    fun lifetime_invalid_R_2() : R {
+        let r = R {x: 4};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        *x_ref = 2; // r_ref goes out of scope here
+
+        r_ref = &mut r;
+        x_ref = &mut r_ref.x;
+        *x_ref = 3;
+
+        r
+    }
+
+    struct T {
+        x: u64
+    }
+    spec T {
+        invariant x > 1;
+    }
+
+    struct S {
+        y: u64
+    }
+    spec S {
+        invariant y > 1;
+    }
+
+    fun lifetime_invalid_S_branching(cond: bool): (T, S) {
+      let a = T {x: 3};
+      let b = S {y: 4};
+      let a_ref = &mut a;
+      let b_ref = &mut b;
+      let x_ref = if (cond) { &mut a_ref.x } else { &mut b_ref.y };
+
+      if (cond) {
+          *x_ref = 2;
+      } else {
+          *x_ref = 0;  // only S's invariant should fail
+      };
+
+      (a, b)
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.exp b/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.exp
new file mode 100644
index 000000000..d6a6eae2a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.exp
@@ -0,0 +1,13 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/invariants_resources.move:31:9
+   │
+31 │         ensures result < 1;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/invariants_resources.move:27: get_invalid
+   =         a = <redacted>
+   =     at tests/sources/functional/invariants_resources.move:28: get_invalid
+   =         result = <redacted>
+   =     at tests/sources/functional/invariants_resources.move:29: get_invalid
+   =     at tests/sources/functional/invariants_resources.move:31: get_invalid (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.move b/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.move
new file mode 100644
index 000000000..e5c30ae14
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/invariants_resources.move
@@ -0,0 +1,33 @@
+
+
+module 0x42::TestInvariants {
+    spec module {
+        pragma verify = true;
+    }
+    struct R<T> has key {
+        x: u64,
+        t: T
+    }
+
+    spec R {
+        invariant greater_one(x);
+    }
+
+    spec fun greater_one(x: num): bool { x > 1 }
+
+    // Tests whether the invariant of resources in memory holds.
+    public fun get<T: store>(a: address): u64 acquires R {
+        borrow_global<R<T>>(a).x
+    }
+    spec get {
+        ensures result > 0;
+    }
+
+    // Negative test of the above.
+    public fun get_invalid<T: store>(a: address): u64 acquires R {
+        borrow_global<R<T>>(a).x
+    }
+    spec get_invalid {
+        ensures result < 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/invariants_with_quant.move b/vendors/move/crates/move-prover/tests/sources/functional/invariants_with_quant.move
new file mode 100644
index 000000000..9e0463a6b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/invariants_with_quant.move
@@ -0,0 +1,22 @@
+module 0x42::TestQuantInvariant {
+    use std::vector;
+    spec module {
+        pragma verify = true;
+    }
+
+    fun vector_of_proper_positives(): vector<u64> {
+        let v = vector::empty();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 3);
+        v
+    }
+    spec vector_of_proper_positives {
+        aborts_if false;
+        ensures forall n in result: n > 0;
+        ensures forall i in 0..len(result), j in 0..len(result) where result[i] == result[j] : i == j;
+        ensures forall i : u64, j : u64 { result[i], result[j] }
+            where result[i] == result[j] && i >= 0 && i < len(result) && j >= 0 && j < len(result) : i == j;
+        ensures forall i in 0..len(result) { result[i] }: {let i = result[i]; i > 0};
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.exp b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.exp
new file mode 100644
index 000000000..e0294d804
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.exp
@@ -0,0 +1,62 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:17:16
+   │
+17 │         spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:17: f1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:21:16
+   │
+21 │         spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:20: f2_incorrect
+   =         _account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:21: f2_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:31:16
+   │
+31 │         spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:29: f4_incorrect
+   =         account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:30: f4_incorrect
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/is_txn_signer.move:30: f4_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:31: f4_incorrect
+
+error: precondition does not hold at this call
+   ┌─ tests/sources/functional/is_txn_signer.move:38:9
+   │
+38 │         requires signer::is_txn_signer_addr(@0x7); // f5 requires this to be true at its callers' sites
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:38: f5 (spec)
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/is_txn_signer.move:90:9
+   │
+90 │ ╭         invariant update (old(exists<Counter>(ADMIN_ADDRESS())) && global<Counter>(ADMIN_ADDRESS()).i != old(global<Counter>(ADMIN_ADDRESS()).i))
+91 │ │             ==> signer::is_txn_signer_addr(ADMIN_ADDRESS());
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:83: increment_incorrect
+   =         _account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:84: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:60: ADMIN_ADDRESS
+   =         result = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:61: ADMIN_ADDRESS
+   =         c_ref#1#0 = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:85: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:83: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:85: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:90
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.move b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.move
new file mode 100644
index 000000000..2f637d20b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.move
@@ -0,0 +1,93 @@
+
+// separate_baseline: simplify
+// The separate baseline is legit and caused by a different choice in the generated model.
+module 0x42::SimpleIsTxnSigner {
+    use std::signer;
+
+    // ----------------------------------------
+    // Simple examples for `is_txn_signer`
+    // ----------------------------------------
+
+
+    // ----------------------------------------
+    // Simple examples for `is_txn_signer_addr`
+    // ----------------------------------------
+
+    public fun f1_incorrect() {
+        spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+    }
+
+    public fun f2_incorrect(_account: &signer) {
+        spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+    }
+
+    public fun f3(account: &signer) {
+        assert!(signer::address_of(account) == @0x7, 1);
+        spec { assert signer::is_txn_signer_addr(@0x7); } // It's true in general.
+    }
+
+    public fun f4_incorrect(account: &signer) {
+        assert!(signer::address_of(account) == @0x3, 1);
+        spec { assert signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+    }
+
+    fun f5() {
+        spec { assert signer::is_txn_signer_addr(@0x7); } // This is provable because of the "requires" condition.
+    }
+    spec f5 {
+        requires signer::is_txn_signer_addr(@0x7); // f5 requires this to be true at its callers' sites
+    }
+
+    public fun f6(account: &signer) { // This function produces no error because it satisfies f5's requires condition.
+        assert!(signer::address_of(account) == @0x7, 1);
+        f5();
+    }
+
+    public fun f7_incorrect() {
+        // This function does not satisfy f5's requires condition.
+        f5();
+    }
+
+
+
+    // -----------------------------------
+    // Access control for Counter resource
+    // -----------------------------------
+
+    struct Counter has key { i: u64 }
+
+    public fun ADMIN_ADDRESS(): address {
+        @0x7
+    }
+
+    const AUTH_FAILED: u64 = 1;
+
+    public fun publish(account: &signer) {
+        spec { assume signer::is_txn_signer_addr(signer::address_of(account)); };
+
+        assert!(signer::address_of(account) == ADMIN_ADDRESS(), AUTH_FAILED);
+        move_to(account, Counter { i: 0 });
+    }
+
+    public fun get_counter(): u64 acquires Counter {
+        borrow_global<Counter>(ADMIN_ADDRESS()).i
+    }
+
+    public fun increment(account: &signer) acquires Counter {
+        assert!(signer::address_of(account) == ADMIN_ADDRESS(), AUTH_FAILED); // permission check
+        let c_ref = &mut borrow_global_mut<Counter>(ADMIN_ADDRESS()).i;
+        *c_ref = *c_ref + 1;
+    }
+
+    // This function is incorrect because it omits the permission check.
+    public fun increment_incorrect(_account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(ADMIN_ADDRESS()).i;
+        *c_ref = *c_ref + 1;
+    }
+
+    spec module {
+        // Access control spec: Only the admin is allowed to increment the counter value.
+        invariant update (old(exists<Counter>(ADMIN_ADDRESS())) && global<Counter>(ADMIN_ADDRESS()).i != old(global<Counter>(ADMIN_ADDRESS()).i))
+            ==> signer::is_txn_signer_addr(ADMIN_ADDRESS());
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.simplify_exp
new file mode 100644
index 000000000..9cd286712
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/is_txn_signer.simplify_exp
@@ -0,0 +1,60 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:17:16
+   │
+17 │         spec { assert Signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:17: f1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:21:16
+   │
+21 │         spec { assert Signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:20: f2_incorrect
+   =         _account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:21: f2_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/is_txn_signer.move:31:16
+   │
+31 │         spec { assert Signer::is_txn_signer_addr(@0x7); } // This is unprovable because it is not true in general.
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:29: f4_incorrect
+   =         account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:30: f4_incorrect
+   =     at ../move-stdlib/sources/Signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/Signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/Signer.move:14: address_of
+
+error: precondition does not hold at this call
+   ┌─ tests/sources/functional/is_txn_signer.move:38:9
+   │
+38 │         requires Signer::is_txn_signer_addr(@0x7); // f5 requires this to be true at its callers' sites
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:38: f5 (spec)
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/is_txn_signer.move:90:9
+   │
+90 │ ╭         invariant update (old(exists<Counter>(ADMIN_ADDRESS())) && global<Counter>(ADMIN_ADDRESS()).i != old(global<Counter>(ADMIN_ADDRESS()).i))
+91 │ │             ==> Signer::is_txn_signer_addr(ADMIN_ADDRESS());
+   │ ╰────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/functional/is_txn_signer.move:83: increment_incorrect
+   =         _account = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:84: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:60: ADMIN_ADDRESS
+   =         result = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:61: ADMIN_ADDRESS
+   =         c_ref = <redacted>
+   =     at tests/sources/functional/is_txn_signer.move:85: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:83: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:85: increment_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:90
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/let.exp b/vendors/move/crates/move-prover/tests/sources/functional/let.exp
new file mode 100644
index 000000000..6394bfe4c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/let.exp
@@ -0,0 +1,67 @@
+Move prover returns: exiting with verification errors
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/let.move:77:9
+   │
+77 │         aborts_if sum != 0;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         sum = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:75: spec_let_with_abort_incorrect (spec)
+   =         `let sum = a + b;` = <redacted>
+   =     at tests/sources/functional/let.move:76: spec_let_with_abort_incorrect (spec)
+   =         `let product = a * b;` = <redacted>
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:70: spec_let_with_abort_incorrect
+   =         saved_a#1#0 = <redacted>
+   =     at tests/sources/functional/let.move:71: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:72: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:73: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:80: spec_let_with_abort_incorrect (spec)
+   =         `let post new_a = old(a) / sum;` = <redacted>
+   =     at tests/sources/functional/let.move:77: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum != 0;` = <redacted>
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/let.move:74:5
+   │
+71 │           *a = *a / (*a + *b);
+   │                   - abort happened here with execution failure
+   ·
+74 │ ╭     spec spec_let_with_abort_incorrect {
+75 │ │         let sum = a + b;
+76 │ │         let product = a * b;
+77 │ │         aborts_if sum != 0;
+   · │
+82 │ │         ensures b == product;
+83 │ │     }
+   │ ╰─────^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:75: spec_let_with_abort_incorrect (spec)
+   =         `let sum = a + b;` = <redacted>
+   =     at tests/sources/functional/let.move:76: spec_let_with_abort_incorrect (spec)
+   =         `let product = a * b;` = <redacted>
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:70: spec_let_with_abort_incorrect
+   =         saved_a#1#0 = <redacted>
+   =     at tests/sources/functional/let.move:71: spec_let_with_abort_incorrect
+   =         ABORTED
+   =     at tests/sources/functional/let.move:77: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum != 0;` = <redacted>
+   =     at tests/sources/functional/let.move:78: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum >= MAX_U64;` = <redacted>
+   =     at tests/sources/functional/let.move:79: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if product >= MAX_U64;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/let.move b/vendors/move/crates/move-prover/tests/sources/functional/let.move
new file mode 100644
index 000000000..baf4fd81a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/let.move
@@ -0,0 +1,146 @@
+// flag: --trace
+// separate_baseline: simplify
+module 0x42::TestLet {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    struct R has key {
+        x: u64
+    }
+
+    // Spec Block Let
+    // ==============
+
+    fun spec_let(a: u64, b: u64): (u64, u64) {
+        (a + 1 + b, a + b)
+    }
+    spec spec_let {
+        let x = a + 1;
+        let y = x + b;
+        ensures result_1 == y;
+        ensures result_2 == result_1 - 1;
+    }
+
+    fun spec_let_with_old(a: &mut u64, b: &mut u64) {
+        *a = *a + 1 + *b;
+        *b = *a + *b;
+    }
+    spec spec_let_with_old {
+       let post new_a = old(a) + 1 + old(b);
+       let post new_b = a + old(b);
+       ensures a == new_a;
+       ensures b == new_b;
+    }
+
+    fun spec_let_with_abort(a: &mut u64, b: &mut u64) {
+        let saved_a = *a;
+        *a = *a / (*a + *b);
+        *b = saved_a * *b;
+    }
+    spec spec_let_with_abort {
+        pragma opaque;
+        let sum = a + b;
+        let product = a * b;
+        aborts_if sum == 0;
+        aborts_if sum > MAX_U64;
+        aborts_if product > MAX_U64;
+        let post new_a = old(a) / sum;
+        ensures a == new_a + sum - sum;
+        ensures b == product;
+    }
+
+    fun spec_let_with_abort_opaque_caller(a: &mut u64, b: &mut u64) {
+        spec_let_with_abort(a, b)
+    }
+    spec spec_let_with_abort_opaque_caller {
+        // Same as the callee
+        let sum = a + b;
+        let product = a * b;
+        aborts_if sum == 0;
+        aborts_if sum > MAX_U64;
+        aborts_if product > MAX_U64;
+        let post new_a = old(a) / sum;
+        ensures a == new_a + sum - sum;
+        ensures b == product;
+    }
+
+    fun spec_let_with_abort_incorrect(a: &mut u64, b: &mut u64) {
+        let saved_a = *a;
+        *a = *a / (*a + *b);
+        *b = saved_a * *b;
+    }
+    spec spec_let_with_abort_incorrect {
+        let sum = a + b;
+        let product = a * b;
+        aborts_if sum != 0;
+        aborts_if sum >= MAX_U64;
+        aborts_if product >= MAX_U64;
+        let post new_a = old(a) / sum;
+        ensures a == new_a;
+        ensures b == product;
+    }
+
+    fun spec_let_with_schema(a: &mut u64, b: &mut u64) {
+        let saved_a = *a;
+        *a = *a / (*a + *b);
+        *b = saved_a * *b;
+    }
+    spec spec_let_with_schema {
+        let sum = a + b;
+        let product = a * b;
+        aborts_if sum == 0;
+        aborts_if sum > MAX_U64;
+        aborts_if product > MAX_U64;
+        let post new_a = old(a) / sum;
+        include Ensures{actual: a, expected: new_a + sum - sum};
+        include Ensures{actual: b, expected: product};
+    }
+    spec schema Ensures {
+        actual: u64;
+        expected: u64;
+        let post a = expected;
+        let post b = actual;
+        include Ensures2{a: a, b: b};
+    }
+    spec schema Ensures2 {
+        a: u64;
+        b: u64;
+        ensures a == b;
+    }
+
+    // Local Let
+    // =========
+
+    fun local_let_with_memory_access(a1: address, a2: address): bool {
+        exists<R>(a1) || exists<R>(a2)
+    }
+    spec local_let_with_memory_access {
+        ensures result == exists_R(a1, a2);
+    }
+    spec fun exists_R(a1: address, a2: address): bool {
+        let e = exists<R>(a1) || exists<R>(a2);
+        e && e || e
+    }
+
+    // Let Shadowing
+    // =============
+
+    fun shadowed(v: u64): u64 {
+        v
+    }
+    spec shadowed {
+        include Shadowed1;
+    }
+
+    spec schema Shadowed1 {
+        v: u64;
+        include Shadowed2;
+    }
+
+    spec schema Shadowed2 {
+        let v = true;
+        ensures v == true;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/let.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/let.simplify_exp
new file mode 100644
index 000000000..f8612fd1e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/let.simplify_exp
@@ -0,0 +1,51 @@
+Move prover returns: exiting with verification errors
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/let.move:77:9
+   │
+77 │         aborts_if sum != 0;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:70: spec_let_with_abort_incorrect
+   =         saved_a = <redacted>
+   =     at tests/sources/functional/let.move:71: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:72: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:73: spec_let_with_abort_incorrect
+   =     at tests/sources/functional/let.move:75: spec_let_with_abort_incorrect (spec)
+   =     at tests/sources/functional/let.move:77: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum != 0;` = <redacted>
+   =     at tests/sources/functional/let.move:75: spec_let_with_abort_incorrect (spec)
+   =     at tests/sources/functional/let.move:77: spec_let_with_abort_incorrect (spec)
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/let.move:74:5
+   │
+71 │           *a = *a / (*a + *b);
+   │                   - abort happened here with execution failure
+   ·
+74 │ ╭     spec spec_let_with_abort_incorrect {
+75 │ │         let sum = a + b;
+76 │ │         let product = a * b;
+77 │ │         aborts_if sum != 0;
+   · │
+82 │ │         ensures b == product;
+83 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/let.move:69: spec_let_with_abort_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/let.move:70: spec_let_with_abort_incorrect
+   =         saved_a = <redacted>
+   =     at tests/sources/functional/let.move:71: spec_let_with_abort_incorrect
+   =         ABORTED
+   =     at tests/sources/functional/let.move:77: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum != 0;` = <redacted>
+   =     at tests/sources/functional/let.move:78: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if sum >= MAX_U64;` = <redacted>
+   =     at tests/sources/functional/let.move:79: spec_let_with_abort_incorrect (spec)
+   =         `aborts_if product >= MAX_U64;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loop_inv.move b/vendors/move/crates/move-prover/tests/sources/functional/loop_inv.move
new file mode 100644
index 000000000..5a084fe0e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loop_inv.move
@@ -0,0 +1,14 @@
+module 0x42::loop_inv {
+    use std::vector;
+
+    fun g() {
+        let v = vector::empty<u64>();
+        let i = 0;
+        while (i < 5) {
+            vector::push_back(&mut v, 0);
+        };
+        spec {
+            assert true;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.exp b/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.exp
new file mode 100644
index 000000000..febfe6e11
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.exp
@@ -0,0 +1,24 @@
+Move prover returns: exiting with bytecode transformation errors
+error: Loop invariants must be declared at the beginning of the loop header in a consecutive sequence
+   ┌─ tests/sources/functional/loop_invariant_invalid.move:21:17
+   │
+21 │                 invariant k == j; // invalid - not consecutive
+   │                 ^^^^^^^^^^^^^^^^^
+
+error: Loop invariants must be declared at the beginning of the loop header in a consecutive sequence
+  ┌─ tests/sources/functional/loop_invariant_invalid.move:6:17
+  │
+6 │                 invariant i <= 10; // invalid - not in header block
+  │                 ^^^^^^^^^^^^^^^^^^
+
+error: Loop invariants must be declared at the beginning of the loop header in a consecutive sequence
+   ┌─ tests/sources/functional/loop_invariant_invalid.move:51:17
+   │
+51 │                 invariant i <= 11; // invalid - not at top
+   │                 ^^^^^^^^^^^^^^^^^^
+
+error: Loop invariants must be declared at the beginning of the loop header in a consecutive sequence
+   ┌─ tests/sources/functional/loop_invariant_invalid.move:36:17
+   │
+36 │                 invariant i <= 11; // invalid - not at top
+   │                 ^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.move b/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.move
new file mode 100644
index 000000000..1439fa2cc
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loop_invariant_invalid.move
@@ -0,0 +1,59 @@
+module 0x42::InvalidLoopInvariants {
+    public fun invariant_declared_in_body() {
+        let i = 0;
+        while (i <= 10) {
+            spec {
+                invariant i <= 10; // invalid - not in header block
+            };
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+
+    public fun non_consecutive_invariant_decl() {
+        let i = 0;
+        let j = 42;
+        let k = j;
+        while ({
+            spec {
+                invariant i <= 11;
+                assert j == 42;
+                invariant k == j; // invalid - not consecutive
+            };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+
+    public fun assert_before_invariants() {
+        let i = 0;
+        let j = 42;
+        while ({
+            spec {
+                assert j == 42;
+                invariant i <= 11; // invalid - not at top
+            };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+
+    public fun assume_before_invariants() {
+        let i = 0;
+        let j = 42;
+        while ({
+            spec {
+                assume j == 42;
+                invariant i <= 11; // invalid - not at top
+            };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loop_with_two_back_edges.move b/vendors/move/crates/move-prover/tests/sources/functional/loop_with_two_back_edges.move
new file mode 100644
index 000000000..cbd4492b0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loop_with_two_back_edges.move
@@ -0,0 +1,30 @@
+module 0x42::loop_inv {
+    use std::vector;
+
+    fun f() {
+        let v1 = vector::empty<u64>();
+        let v2 = vector::empty<u64>();
+        let index = 0;
+        let i = 0;
+
+        while ({
+            spec {
+                invariant index == len(v1);
+            };
+            i < 10000
+        }) {
+            i = i + 1;
+            if (i == 100) {
+                continue
+            };
+            vector::push_back(&mut v1, index);
+            vector::push_back(&mut v2, index);
+            index = index + 1;
+        };
+
+
+        spec {
+            assert index == len(v1);
+        };
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loops.exp b/vendors/move/crates/move-prover/tests/sources/functional/loops.exp
new file mode 100644
index 000000000..ad635752f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loops.exp
@@ -0,0 +1,174 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/loops.move:86:5
+   │
+82 │               if (i == 7) abort 7;
+   │                           ------- abort happened here with code 0x7
+   ·
+86 │ ╭     spec iter10_abort_incorrect { // Disproved. Abort always happens.
+87 │ │         pragma verify=true;
+88 │ │         aborts_if false;
+89 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/loops.move:77: iter10_abort_incorrect
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops.move:79: iter10_abort_incorrect
+   =     enter loop, variable(s) i#1#0 havocked and reassigned
+   =         i#1#0 = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops.move:80: iter10_abort_incorrect
+   =     at tests/sources/functional/loops.move:78: iter10_abort_incorrect
+   =     at tests/sources/functional/loops.move:82: iter10_abort_incorrect
+   =         ABORTED
+
+error: unknown assertion failed
+    ┌─ tests/sources/functional/loops.move:235:20
+    │
+235 │             spec { assert i <= 11; }; // expect to fail, `i` is havoc-ed
+    │                    ^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:233: iter10_assert_instead_of_invariant
+    =         i#1#0 = <redacted>
+    =     at tests/sources/functional/loops.move:235: iter10_assert_instead_of_invariant
+    =     enter loop, variable(s) i#1#0 havocked and reassigned
+    =         i#1#0 = <redacted>
+
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/loops.move:58:9
+   │
+58 │         aborts_if true;
+   │         ^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops.move:48: iter10_no_abort_incorrect
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops.move:50: iter10_no_abort_incorrect
+   =     enter loop, variable(s) i#1#0 havocked and reassigned
+   =         i#1#0 = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops.move:51: iter10_no_abort_incorrect
+   =     at tests/sources/functional/loops.move:49: iter10_no_abort_incorrect
+   =     at tests/sources/functional/loops.move:58: iter10_no_abort_incorrect (spec)
+
+error: base case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:210:17
+    │
+210 │                 invariant x != 0;
+    │                 ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:206: loop_invariant_base_invalid
+    =         n = <redacted>
+    =     at tests/sources/functional/loops.move:207: loop_invariant_base_invalid
+    =         x#1#0 = <redacted>
+    =     at tests/sources/functional/loops.move:209: loop_invariant_base_invalid
+    =     at tests/sources/functional/loops.move:210: loop_invariant_base_invalid
+
+error: induction case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:223:17
+    │
+223 │                 invariant x == 0;
+    │                 ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:219: loop_invariant_induction_invalid
+    =         n = <redacted>
+    =     at tests/sources/functional/loops.move:220: loop_invariant_induction_invalid
+    =         x#1#0 = <redacted>
+    =     at tests/sources/functional/loops.move:222: loop_invariant_induction_invalid
+    =     at tests/sources/functional/loops.move:223: loop_invariant_induction_invalid
+    =     enter loop, variable(s) x#1#0 havocked and reassigned
+    =         x#1#0 = <redacted>
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:225: loop_invariant_induction_invalid
+    =     at tests/sources/functional/loops.move:221: loop_invariant_induction_invalid
+    =     at tests/sources/functional/loops.move:227: loop_invariant_induction_invalid
+    =         x#1#0 = <redacted>
+    =     at tests/sources/functional/loops.move:223: loop_invariant_induction_invalid
+
+error: induction case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:189:17
+    │
+189 │                 invariant x < y;
+    │                 ^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:183: loop_with_two_back_edges_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:185: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:188: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:189: loop_with_two_back_edges_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:191: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:195: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:196: loop_with_two_back_edges_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/loops.move:197: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:189: loop_with_two_back_edges_incorrect
+
+error: base case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:145:21
+    │
+145 │                     invariant x != y;
+    │                     ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:138: nested_loop_inner_invariant_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:140: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:143: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:144: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
+
+error: induction case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:145:21
+    │
+145 │                     invariant x != y;
+    │                     ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:138: nested_loop_inner_invariant_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:140: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:143: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:144: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) y havocked and reassigned
+    =         y = <redacted>
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:147: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:150: nested_loop_inner_invariant_incorrect
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
+
+error: induction case of the loop invariant does not hold
+    ┌─ tests/sources/functional/loops.move:119:17
+    │
+119 │                 invariant x != y;
+    │                 ^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/loops.move:113: nested_loop_outer_invariant_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:115: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:118: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:119: nested_loop_outer_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:122: nested_loop_outer_invariant_incorrect
+    =     enter loop, variable(s) y havocked and reassigned
+    =         y = <redacted>
+    =     at tests/sources/functional/loops.move:122: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:128: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:131: nested_loop_outer_invariant_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/loops.move:119: nested_loop_outer_invariant_incorrect
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loops.move b/vendors/move/crates/move-prover/tests/sources/functional/loops.move
new file mode 100644
index 000000000..9006d06d5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loops.move
@@ -0,0 +1,262 @@
+
+
+module 0x42::VerifyLoops {
+
+
+    // ----------------------
+    // `aborts_if` statements
+    // ----------------------
+
+    public fun iter10_missing_inc_spec1() {
+        let i = 0;
+        while (i <= 10) { // an infinite loop
+            if (i > 10) abort 10;
+        }
+    }
+    spec iter10_missing_inc_spec1 { // Verified. This is expected because Prover checks the partial correctness of this function which contains an infinite loop.
+        aborts_if false;
+        ensures false;
+    }
+
+    public fun iter10_missing_inc_spec2() {
+        let i = 0;
+        while (i <= 10) { // an infinite loop
+            if (i > 10) abort 10;
+        }
+    }
+    spec iter10_missing_inc_spec2 { // Verified. This is expected because Prover checks the partial correctness of this function which contains an infinite loop.
+        aborts_if true;
+        ensures false;
+    }
+
+    public fun iter10_no_abort() {
+        let i = 0;
+        while ({
+            spec { invariant i <= 11; };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+    spec iter10_no_abort { // Verified. Abort cannot happen.
+        pragma verify=true;
+        aborts_if false;
+    }
+
+    public fun iter10_no_abort_incorrect() {
+        let i = 0;
+        while ({
+            spec { invariant i <= 11; };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+    spec iter10_no_abort_incorrect { // Disproved. Abort cannot happen.
+        aborts_if true;
+    }
+
+    public fun iter10_abort() {
+        let i = 0;
+        while ({
+            spec { invariant i <= 7; };
+            (i <= 10)
+        }) {
+            if (i == 7) abort 7;
+            i = i + 1;
+        }
+    }
+    spec iter10_abort { // Verified. Abort always happens.
+        pragma verify=true;
+        aborts_if true;
+    }
+
+    public fun iter10_abort_incorrect() {
+        let i = 0;
+        while ({
+            spec { invariant i <= 7; };
+            (i <= 10)
+        }) {
+            if (i == 7) abort 7;
+            i = i + 1;
+        }
+    }
+    spec iter10_abort_incorrect { // Disproved. Abort always happens.
+        pragma verify=true;
+        aborts_if false;
+    }
+
+    public fun nested_loop_correct(x: u64, y: u64) {
+        loop {
+            loop {
+                if (x <= y) {
+                    break
+                };
+                y = y + 1;
+            };
+
+            if (y <= x) {
+                break
+            };
+            x = x + 1;
+        };
+        spec {
+            assert x == y;
+        };
+    }
+    spec nested_loop_correct {
+        aborts_if false;
+    }
+
+    public fun nested_loop_outer_invariant_incorrect(x: u64, y: u64) {
+        spec {
+            assume x != y;
+        };
+        loop {
+            spec {
+                invariant x != y;
+            };
+            loop {
+                if (x <= y) {
+                    break
+                };
+                y = y + 1;
+            };
+
+            if (y <= x) {
+                break
+            };
+            x = x + 1;
+        };
+    }
+    spec nested_loop_outer_invariant_incorrect {
+        aborts_if false;
+    }
+
+    public fun nested_loop_inner_invariant_incorrect(x: u64, y: u64) {
+        spec {
+            assume x != y;
+        };
+        loop {
+            loop {
+                spec {
+                    invariant x != y;
+                };
+                if (x <= y) {
+                    break
+                };
+                y = y + 1;
+            };
+
+            if (y <= x) {
+                break
+            };
+            x = x + 1;
+        };
+    }
+    spec nested_loop_inner_invariant_incorrect {
+        aborts_if false;
+    }
+
+    public fun loop_with_two_back_edges_correct(x: u64, y: u64) {
+        loop {
+            if (x > y) {
+                y = y + 1;
+                continue
+            };
+            if (y > x) {
+                x = x + 1;
+                continue
+            };
+            break
+        };
+        spec {
+            assert x == y;
+        };
+    }
+    spec loop_with_two_back_edges_correct {
+        aborts_if false;
+    }
+
+    public fun loop_with_two_back_edges_incorrect(x: u64, y: u64) {
+        spec {
+            assume x < y;
+        };
+        loop {
+            spec {
+                invariant x < y;
+            };
+            if (x > y) {
+                y = y + 1;
+                continue
+            };
+            if (y > x) {
+                x = x + 1;
+                continue
+            };
+            break
+        };
+    }
+    spec loop_with_two_back_edges_incorrect {
+        aborts_if false;
+    }
+
+    public fun loop_invariant_base_invalid(n: u64): u64 {
+        let x = 0;
+        while ({
+            spec {
+                invariant x != 0;
+            };
+            (x < n)
+        }) {
+            x = x + 1;
+        };
+        x
+    }
+
+    public fun loop_invariant_induction_invalid(n: u64): u64 {
+        let x = 0;
+        while ({
+            spec {
+                invariant x == 0;
+            };
+            (x < n)
+        }) {
+            x = x + 1;
+        };
+        x
+    }
+
+    public fun iter10_assert_instead_of_invariant() {
+        let i = 0;
+        while ({
+            spec { assert i <= 11; }; // expect to fail, `i` is havoc-ed
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+    spec iter10_assert_instead_of_invariant {
+        aborts_if false;
+    }
+
+    public fun iter10_assume_assert_instead_of_invariant() {
+        let i = 0;
+        while ({
+            spec {
+                assume i <= 1; // assume arbitrary property about `i`
+                assert i <= 1; // now this can be verified
+            };
+            (i <= 10)
+        }) {
+            if (i > 10) abort 10;
+            i = i + 1;
+        }
+    }
+    spec iter10_assume_assert_instead_of_invariant {
+        aborts_if false;  // this can be verified because of `assume i <= 1;`
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp
new file mode 100644
index 000000000..c121682ed
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp
@@ -0,0 +1,115 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:93:13
+   │
+93 │             assert forall m in 0..length: a[m] == b[m];
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:93: nested_loop2
+
+error: induction case of the loop invariant does not hold
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:70:17
+   │
+70 │                 invariant forall n in 0..i: a[n] == b[n];
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:89: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:90: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.exp b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.exp
new file mode 100644
index 000000000..3a0ad08e5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.exp
@@ -0,0 +1,116 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:93:13
+   │
+93 │             assert forall m in 0..length: a[m] == b[m];
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i#1#0, x#1#0, y#1#0 havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i#1#0 = <redacted>
+   =         x#1#0 = <redacted>
+   =         y#1#0 = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x#1#0, y#1#0 havocked and reassigned
+   =         x#1#0 = <redacted>
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y#1#0 havocked and reassigned
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =     at <internal>:1
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:93: nested_loop2
+
+error: induction case of the loop invariant does not hold
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:70:17
+   │
+70 │                 invariant forall n in 0..i: a[n] == b[n];
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i#1#0, x#1#0, y#1#0 havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i#1#0 = <redacted>
+   =         x#1#0 = <redacted>
+   =         y#1#0 = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x#1#0, y#1#0 havocked and reassigned
+   =         x#1#0 = <redacted>
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y#1#0 havocked and reassigned
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:89: nested_loop2
+   =         x#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:90: nested_loop2
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.move b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.move
new file mode 100644
index 000000000..9badb3764
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/loops_with_memory_ops.move
@@ -0,0 +1,99 @@
+// separate_baseline: cvc5
+module 0x42::VerifyLoopsWithMemoryOps {
+    use std::vector;
+    spec module {
+        pragma verify=true;
+    }
+
+    public fun nested_loop1(a: &mut vector<u64>, b: &mut vector<u64>) {
+        let length = vector::length(a);
+        spec {
+            assume length > 0;
+            assume length == len(b);
+        };
+        let i = 0;
+        while ({
+            spec {
+                invariant length == len(a);
+                invariant length == len(b);
+                invariant i <= length;
+                invariant forall n in 0..i: a[n] == b[n];
+            };
+            (i < length)
+        }) {
+            let x = vector::borrow_mut(a, i);
+            let y = vector::borrow_mut(b, i);
+            loop {
+                loop {
+                    if (*x <= *y) {
+                        break
+                    };
+                    *y = *y + 1;
+                };
+                if (*y <= *x) {
+                    break
+                };
+                *x = *x + 1;
+            };
+        };
+        spec {
+            assert forall m in 0..length: a[m] == b[m];
+        };
+    }
+    spec nested_loop1 {
+        aborts_if false;
+    }
+
+    // This is equivalent to nested_loop1, but is much harder to verify, as we
+    // don't have a way to specify the following loop invariants after havocing
+    // - x points to a[i];
+    // - y points to b[i];
+    // The points-to relation of x and y is totally distorted after havoc.
+    //
+    // TODO (mengxu) find a way to specify the points-to relation, possibly
+    // via introducing a new bytecode / call-operation named "PointerOf", which
+    // takes a mutable reference and returns its "location" and "path".
+    public fun nested_loop2(a: &mut vector<u64>, b: &mut vector<u64>) {
+        let length = vector::length(a);
+        spec {
+            assume length > 0;
+            assume length == len(b);
+        };
+        let i = 0;
+        let x = vector::borrow_mut(a, i);
+        let y = vector::borrow_mut(b, i);
+        loop {
+            spec {
+                invariant length == len(a);
+                invariant length == len(b);
+                invariant i < length;
+                invariant forall n in 0..i: a[n] == b[n];
+            };
+            loop {
+                loop {
+                    if (*x <= *y) {
+                        break
+                    };
+                    *y = *y + 1;
+                };
+
+                if (*y <= *x) {
+                    break
+                };
+                *x = *x + 1;
+            };
+            i = i + 1;
+            if (i == length) {
+                break
+            };
+            x = vector::borrow_mut(a, i);
+            y = vector::borrow_mut(b, i);
+        };
+        spec {
+            assert forall m in 0..length: a[m] == b[m];
+        };
+    }
+    spec nested_loop2 {
+        aborts_if false;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.exp b/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.exp
new file mode 100644
index 000000000..83bb6d6be
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.exp
@@ -0,0 +1,155 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/macro_verification.move:32:9
+   │
+32 │         ensures forall i in range(v): v[i] == old(v)[i] + 2; // fails
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         old(v) = <redacted>
+   =         v = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/macro_verification.move:15: foreach
+   =         v = <redacted>
+   =     at tests/sources/functional/macro_verification.move:16: foreach
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:22: foreach
+   =     at tests/sources/functional/macro_verification.move:23: foreach
+   =         `invariant i >= 0 && i <= len(v);` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:24: foreach
+   =         `invariant len(v) == len(old(v));` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:25: foreach
+   =         `invariant forall j in 0..i: v[j] == old(v)[j] + 1;` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:26: foreach
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =     enter loop, variable(s) v, i#1#0 havocked and reassigned
+   =         v = <redacted>
+   =         i#1#0 = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/macro_verification.move:23: foreach
+   =         `invariant i >= 0 && i <= len(v);` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:24: foreach
+   =         `invariant len(v) == len(old(v));` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:25: foreach
+   =         `invariant forall j in 0..i: v[j] == old(v)[j] + 1;` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:26: foreach
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:17: foreach
+   =     at tests/sources/functional/macro_verification.move:27: foreach
+   =         v = <redacted>
+   =     at tests/sources/functional/macro_verification.move:30: foreach (spec)
+   =         `ensures len(v) == len(old(v));` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:31: foreach (spec)
+   =         `ensures forall i in range(v): v[i] == old(v)[i] + 1;` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:32: foreach (spec)
+   =         `ensures forall i in range(v): v[i] == old(v)[i] + 2;` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/macro_verification.move:57:9
+   │
+57 │         ensures len(v) <= 4 ==> result == spec_sum(v, len(v)) + 1; // fails
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         result = <redacted>
+   =         spec_sum(v, len(v)) = <redacted>
+   =         v = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/macro_verification.move:40: reduce
+   =         v = <redacted>
+   =     at tests/sources/functional/macro_verification.move:41: reduce
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:42: reduce
+   =         sum#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:48: reduce
+   =     at tests/sources/functional/macro_verification.move:49: reduce
+   =         `invariant i >= 0 && i <= len(v);` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:50: reduce
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =     enter loop, variable(s) i#1#0, sum#1#0 havocked and reassigned
+   =         i#1#0 = <redacted>
+   =         sum#1#0 = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/macro_verification.move:49: reduce
+   =         `invariant i >= 0 && i <= len(v);` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:50: reduce
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:43: reduce
+   =     at tests/sources/functional/macro_verification.move:52: reduce
+   =         result = <redacted>
+   =     at tests/sources/functional/macro_verification.move:55: reduce (spec)
+   =         `ensures result == spec_sum(v, len(v));` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:57: reduce (spec)
+   =         `ensures len(v) <= 4 ==> result == spec_sum(v, len(v)) + 1;` =
+   =           <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/macro_verification.move:76:9
+   │
+76 │         ensures result == x + y + y; // fails
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         result = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/macro_verification.move:67: reduce_test
+   =         x = <redacted>
+   =         y = <redacted>
+   =         z = <redacted>
+   =     at tests/sources/functional/macro_verification.move:68: reduce_test
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:69: reduce_test
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:70: reduce_test
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:71: reduce_test
+   =         v#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:72: reduce_test
+   =     at tests/sources/functional/macro_verification.move:40: reduce
+   =         v = <redacted>
+   =     at tests/sources/functional/macro_verification.move:41: reduce
+   =         i#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:42: reduce
+   =         sum#1#0 = <redacted>
+   =     at tests/sources/functional/macro_verification.move:48: reduce
+   =     at tests/sources/functional/macro_verification.move:49: reduce
+   =     at tests/sources/functional/macro_verification.move:50: reduce
+   =     enter loop, variable(s) i#1#0, sum#1#0 havocked and reassigned
+   =         i#1#0 = <redacted>
+   =         sum#1#0 = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/macro_verification.move:49: reduce
+   =     at tests/sources/functional/macro_verification.move:50: reduce
+   =     at tests/sources/functional/macro_verification.move:43: reduce
+   =     at tests/sources/functional/macro_verification.move:52: reduce
+   =         result = <redacted>
+   =     at tests/sources/functional/macro_verification.move:53: reduce
+   =         result = <redacted>
+   =     at tests/sources/functional/macro_verification.move:73: reduce_test
+   =     at tests/sources/functional/macro_verification.move:75: reduce_test (spec)
+   =         `ensures result == x + y + z;` = <redacted>
+   =     at tests/sources/functional/macro_verification.move:76: reduce_test (spec)
+   =         `ensures result == x + y + y;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.move b/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.move
new file mode 100644
index 000000000..afd8c2574
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/macro_verification.move
@@ -0,0 +1,100 @@
+// flag: --trace
+
+// CVC5 does currently not terminate on this:
+// exclude_for: cvc5
+
+/// This file contains some simulated expansions of functional macros and sketches how they can be verified.
+module 0x42::FunMacros {
+    use std::vector;
+
+    /// Simulates `foreach!(v, |x| *x = *x + 1 spec  { ensures x == old(x) + 1; })`
+    /// where `macro foreach!<T>(v: &mut vector<T>, action: |&mut T|)`
+    ///
+    /// For the foreach macro the loop invariant can be synthesized from a post condition associated
+    /// with the lambda.
+    fun foreach(v: &mut vector<u64>) {
+        let i = 0;
+        while (i < vector::length(v)) {
+            let x = vector::borrow_mut(v, i);
+            *x = *x + 1;
+            i = i + 1;
+        }
+        spec {
+            invariant i >= 0 && i <= len(v);
+            invariant len(v) == len(old(v));
+            invariant forall j in 0..i: v[j] == old(v)[j] + 1; // lambda substituted
+            invariant forall j in i..len(v): v[j] == old(v)[j];
+        };
+    }
+    spec foreach {
+        ensures len(v) == len(old(v));
+        ensures forall i in range(v): v[i] == old(v)[i] + 1; // succeeds
+        ensures forall i in range(v): v[i] == old(v)[i] + 2; // fails
+    }
+
+    /// Simulates `reduce!(v, 0, |sum, x| *sum = *sum + *x ) spec { invariant sum == old(sum) + x; })`
+    /// where `macro reduce!<T, R>(v: &vector<T>, neutral: R, reducer: |&mut R, &T|): R`.
+    ///
+    /// Because the elements of the vector are combined via the reducer, we cannot specify this with
+    /// a quantifier, however, we can use a recursive helper function.
+    fun reduce(v: &vector<u64>) : u64 {
+        let i = 0;
+        let sum = 0;
+        while (i < vector::length(v)) {
+            let x = vector::borrow(v, i);
+            sum = sum + *x;
+            i = i + 1;
+        }
+        spec {
+            invariant i >= 0 && i <= len(v);
+            invariant sum == spec_sum(v, i);
+        };
+        sum
+    }
+    spec reduce {
+        ensures result == spec_sum(v, len(v));     // succeeds
+        // Below we use a premise for the failure case to constraint model size.
+        ensures len(v) <= 4 ==> result == spec_sum(v, len(v)) + 1; // fails
+    }
+    spec fun spec_sum(v: vector<u64>, end: num): num {
+        if (end <= 0 || end > len(v))
+            0
+        else
+            // lambda substituted, where old(sum) == spec_sum(v, end - 1)
+            spec_sum(v, end - 1) + v[end - 1]
+    }
+
+    fun reduce_test(x: u64, y: u64, z: u64): u64 {
+        let v = vector::empty();
+        vector::push_back(&mut v, x);
+        vector::push_back(&mut v, y);
+        vector::push_back(&mut v, z);
+        reduce(&v)
+    }
+    spec reduce_test {
+        ensures result == x + y + z; // succeeds
+        ensures result == x + y + y; // fails
+    }
+
+    /// Simulates `index_of!(v, |x| x > 2)`
+    /// where `macro index_of!<T>(v: &vector<T>, pred: |&T|bool): u64`.
+    ///
+    /// For index_of, we do not need any invariant at the lambda, as it's spec can be fully derived.
+    fun index_of(v: &vector<u64>): u64 {
+        let i = 0;
+        while (i < vector::length(v)) {
+            let x = vector::borrow(v, i);
+            if (*x > 2) return i;
+            i = i + 1;
+        }
+        spec {
+            invariant i >= 0 && i <= len(v);
+            invariant forall j in 0..i: !(v[j] > 2);
+        };
+        i
+    }
+    spec index_of {
+        ensures result >= 0 && result <= len(v);
+        ensures forall j in 0..result: !(v[j] > 2);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/module_invariants.move b/vendors/move/crates/move-prover/tests/sources/functional/module_invariants.move
new file mode 100644
index 000000000..845c2fab6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/module_invariants.move
@@ -0,0 +1,94 @@
+address 0x1 {
+module TestModuleInvariants {
+
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed.
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    // Some structure.
+    resource struct S {}
+
+    // A resource tracking how many instances of S exist.
+    resource struct SCounter {
+        n: u64
+    }
+
+    // Resource invariants counting the number of S instances.
+    spec S {
+        // A counter for the # of alive instances of R
+        global spec_count: u64;
+
+        invariant pack spec_count = spec_count + 1;
+        invariant unpack spec_count = spec_count - 1;
+    }
+
+
+    // A module invariant asserting that the resource SCounter correctly tracks what the specification expects.
+    spec module {
+        invariant global<SCounter>(0x0).n == spec_count;
+    }
+
+    // Creating and Deleting Resource
+    // -------------------------------
+
+    // Function creating an S instance. Since its public, we expect the module invariant to be satisfied.
+    public fun new_S(): S acquires SCounter {
+        let counter = borrow_global_mut<SCounter>(0x0);
+        counter.n = counter.n + 1;
+        S{}
+    }
+
+    // Function destroying an S instance. Since its public, we expect the module invariant to be satisfied.
+    public fun delete_S(x: S) acquires SCounter {
+        let S{} = x;
+        let counter = borrow_global_mut<SCounter>(0x0);
+        counter.n = counter.n - 1;
+    }
+
+    // Function destroying an S instance but not tracking it. The module invariant will catch this when the function
+    // exits.
+    public fun delete_S_incorrect(x: S) {
+        let S{} = x;
+    }
+
+    // Private Calling Public
+    // -----------------------
+
+    // Private function calling a public function and failing because the pre-condition of the public function
+    // does not hold.
+    fun private_calls_public_incorrect(): S acquires SCounter {
+       let x = new_S();
+       x
+    }
+
+    // Private function calling a public function with correct precondition.
+    fun private_calls_public(): S acquires SCounter {
+        let x = new_S();
+        x
+    }
+    spec private_calls_public {
+        requires global<SCounter>(0x0).n == spec_count;
+    }
+
+*/
+}
+
+
+/*
+module 0x42::TestModuleInvariantsExternal {
+    use 0x1::TestModuleInvariants;
+
+    public fun call_other() {
+        // Module invariant satisfied because we call from other module.
+        let x = TestModuleInvariants::new_S();
+        TestModuleInvariants::delete_S(x);
+    }
+}
+*/
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.exp b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.exp
new file mode 100644
index 000000000..15fa6af97
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.exp
@@ -0,0 +1,14 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/module_level_spec.move:18:5
+   │
+18 │     invariant forall addr: address where exists<R>(addr): global<R>(addr).value > 0;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/module_level_spec.move:10: store_incorrect
+   =     at tests/sources/functional/module_level_spec.move:32
+   =     at tests/sources/functional/module_level_spec.move:10: store_incorrect
+   =         s = <redacted>
+   =         value = <redacted>
+   =     at tests/sources/functional/module_level_spec.move:11: store_incorrect
+   =     at tests/sources/functional/module_level_spec.move:18
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.move b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.move
new file mode 100644
index 000000000..0d3b1943e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.move
@@ -0,0 +1,36 @@
+// separate_baseline: simplify
+module 0x42::TestModule {
+
+    struct R has key { value: u64 }
+
+    fun store(s: &signer, value: u64) {
+       move_to<R>(s, R{value})
+    }
+
+    fun store_incorrect(s: &signer, value: u64) {
+        move_to<R>(s, R{value})
+    }
+}
+
+spec 0x42::TestModule {
+    use std::signer;
+
+    invariant forall addr: address where exists<R>(addr): global<R>(addr).value > 0;
+
+    spec store(s: &signer, value: u64) {
+        requires value > 0;
+        include Store;
+    }
+
+    spec store_incorrect(s: &signer, value: u64) {
+        include Store;
+    }
+
+    spec schema Store {
+        s: signer;
+        value: u64;
+        let addr = signer::address_of(s);
+        ensures exists<R>(addr);
+        ensures global<R>(addr).value == value;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.simplify_exp
new file mode 100644
index 000000000..ddba936d1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/module_level_spec.simplify_exp
@@ -0,0 +1,12 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/module_level_spec.move:18:5
+   │
+18 │     invariant forall addr: address where exists<R>(addr): global<R>(addr).value > 0;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/module_level_spec.move:10: store_incorrect
+   =         s = <redacted>
+   =         value = <redacted>
+   =     at tests/sources/functional/module_level_spec.move:11: store_incorrect
+   =     at tests/sources/functional/module_level_spec.move:18
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mono.exp b/vendors/move/crates/move-prover/tests/sources/functional/mono.exp
new file mode 100644
index 000000000..05f061200
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mono.exp
@@ -0,0 +1,74 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:71:21
+   │
+71 │     spec vec_addr { ensures result[0] != @0x1; }
+   │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:70: vec_addr
+   =         x = <redacted>
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:71: vec_addr (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:73:21
+   │
+73 │     spec vec_bool { ensures result[0] != true; }
+   │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:72: vec_bool
+   =         x = <redacted>
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:73: vec_bool (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:69:20
+   │
+69 │     spec vec_int { ensures result[0] != 1; }
+   │                    ^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:68: vec_int
+   =         x = <redacted>
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:69: vec_int (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:77:28
+   │
+77 │     spec vec_struct_addr { ensures result[0].x != @0x1; }
+   │                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:76: vec_struct_addr
+   =         x = <redacted>
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:77: vec_struct_addr (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:75:27
+   │
+75 │     spec vec_struct_int { ensures result[0].x != 1; }
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:74: vec_struct_int
+   =         x = <redacted>
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:75: vec_struct_int (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/mono.move:82:20
+   │
+82 │     spec vec_vec { ensures len(result[0]) != 0; }
+   │                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/mono.move:79: vec_vec
+   =         x = <redacted>
+   =     at tests/sources/functional/mono.move:80: vec_vec
+   =         x = <redacted>
+   =         result = <redacted>
+   =     at tests/sources/functional/mono.move:81: vec_vec
+   =     at tests/sources/functional/mono.move:82: vec_vec (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mono.move b/vendors/move/crates/move-prover/tests/sources/functional/mono.move
new file mode 100644
index 000000000..73f5b3316
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mono.move
@@ -0,0 +1,83 @@
+
+
+module 0x42::TestMonomorphization {
+    use std::signer;
+    use std::bcs;
+    use std::event;
+    use std::vector;
+
+    struct R<T: store> has key { x: T, y: T }
+
+
+    public fun pack_R(): R<u64> {
+        R{x: 1, y: 2}
+    }
+    spec pack_R {
+        ensures result == spec_pack_R();
+    }
+    spec fun spec_pack_R(): R<u64> { R{x: 1u64, y: 2}}
+
+    public fun create_R(account: &signer) {
+        move_to<R<u64>>(account, R{x:1, y:2} );
+    }
+    spec create_R {
+        aborts_if exists<R<u64>>(signer::address_of(account));
+        ensures exists<R<u64>>(signer::address_of(account));
+    }
+
+    public fun mutate_R(addr: address) acquires R {
+        borrow_global_mut<R<bool>>(addr).y = false;
+    }
+    spec mutate_R {
+        ensures global<R<bool>>(addr) == update_field(old(global<R<bool>>(addr)), y, false);
+    }
+
+    public fun create_R_generic<T: store>(account: &signer, x: T, y: T) {
+        move_to<R<T>>(account, R{x, y});
+    }
+    spec create_R_generic {
+        aborts_if exists<R<T>>(signer::address_of(account));
+        ensures exists<R<T>>(signer::address_of(account));
+    }
+
+    public fun use_vec(_x: vector<u64>) {
+    }
+
+    public fun use_bcs<T>(x: &T): (vector<u8>, vector<u8>) {
+        (bcs::to_bytes(x), bcs::to_bytes(&@0x2))
+    }
+    spec use_bcs {
+        ensures result_1 == bcs::serialize(x);
+        ensures result_2 == bcs::serialize(@0x2);
+    }
+
+    struct E has copy, drop, store {
+        msg: u64
+    }
+
+    public fun use_event(handle: &mut event::EventHandle<E>) {
+        event::emit_event(handle, E{msg: 0});
+    }
+    spec use_event {
+        emits E{msg: 0} to handle;
+    }
+
+    // The following set of functions exercise different style of vector instantiations each with an error which
+    // should print the vector. Running outside of the test environment (without value redaction) allow to manually
+    // inspect printing.
+    public fun vec_int(x: vector<u64>): vector<u64> { vector::push_back(&mut x, 1); x }
+    spec vec_int { ensures result[0] != 1; }
+    public fun vec_addr(x: vector<address>): vector<address> { vector::push_back(&mut x, @0x1); x }
+    spec vec_addr { ensures result[0] != @0x1; }
+    public fun vec_bool(x: vector<bool>): vector<bool> { vector::push_back(&mut x, true); x }
+    spec vec_bool { ensures result[0] != true; }
+    public fun vec_struct_int(x: vector<R<u64>>): vector<R<u64>> { vector::push_back(&mut x, R{x: 1u64, y: 1}); x }
+    spec vec_struct_int { ensures result[0].x != 1; }
+    public fun vec_struct_addr(x: vector<R<address>>): vector<R<address>> { vector::push_back(&mut x, R{x: @0x1, y: @0x2}); x }
+    spec vec_struct_addr { ensures result[0].x != @0x1; }
+
+    public fun vec_vec(x: vector<vector<u64>>): vector<vector<u64>> {
+        vector::push_back(&mut x, vector::empty<u64>()); x
+    }
+    spec vec_vec { ensures len(result[0]) != 0; }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.exp b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.exp
new file mode 100644
index 000000000..8680021d1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.exp
@@ -0,0 +1,42 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+  ┌─ tests/sources/functional/mut_ref.move:8:14
+  │
+8 │     spec T { invariant value > 0; }
+  │              ^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/mut_ref.move:113: call_return_ref_different_path_vec2_incorrect
+  =         b = <redacted>
+  =     at tests/sources/functional/mut_ref.move:114: call_return_ref_different_path_vec2_incorrect
+  =         is#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:115: call_return_ref_different_path_vec2_incorrect
+  =         ts#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:116: call_return_ref_different_path_vec2_incorrect
+  =         is#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:117: call_return_ref_different_path_vec2_incorrect
+  =         is#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:118: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:8
+  =     at tests/sources/functional/mut_ref.move:118: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:8
+  =     at tests/sources/functional/mut_ref.move:118: call_return_ref_different_path_vec2_incorrect
+  =         ts#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:119: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:8
+  =     at tests/sources/functional/mut_ref.move:119: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:8
+  =     at tests/sources/functional/mut_ref.move:119: call_return_ref_different_path_vec2_incorrect
+  =         ts#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:120: call_return_ref_different_path_vec2_incorrect
+  =         x#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:121: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:90: return_ref_different_path_vec2
+  =         b = <redacted>
+  =         x = <redacted>
+  =     at tests/sources/functional/mut_ref.move:91: return_ref_different_path_vec2
+  =         result = <redacted>
+  =         x = <redacted>
+  =     at tests/sources/functional/mut_ref.move:92: return_ref_different_path_vec2
+  =         r#1#0 = <redacted>
+  =     at tests/sources/functional/mut_ref.move:122: call_return_ref_different_path_vec2_incorrect
+  =     at tests/sources/functional/mut_ref.move:8
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.move b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.move
new file mode 100644
index 000000000..9e0118c78
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref.move
@@ -0,0 +1,130 @@
+module 0x1::TestMutRef {
+    use std::vector;
+
+    struct T has copy, drop { value: u64 }
+    struct R has copy, drop { value: u64 }
+    struct N has copy, drop { value: u64, t: T }
+
+    spec T { invariant value > 0; }
+
+    // Identity
+    // ========
+
+    fun identity(x: &mut u64): &mut u64 { x }
+
+    fun call_identity(): u64 {
+        let x = 1u64;
+        let r = identity(&mut x);
+        *r = 2;
+        x
+    }
+    spec call_identity {
+        ensures result == 2;
+    }
+
+    // Return reference with different root
+    // ====================================
+
+    fun return_ref_different_root(b: bool, x: &mut T, y: &mut R): &mut u64 {
+        if (b) &mut x.value else &mut y.value
+    }
+
+    fun call_return_ref_different_root(b: bool): (T, R) {
+        let x = T{value: 1};
+        let y = R{value: 10};
+        let r = return_ref_different_root(b, &mut x, &mut y);
+        *r = 5;
+        (x, y)
+    }
+    spec call_return_ref_different_root {
+        ensures b ==> result_1 == T{value: 5} && result_2 == R{value: 10};
+        ensures !b ==> result_1 == T{value: 1} && result_2 == R{value: 5};
+    }
+
+    // Return reference with different path
+    // ====================================
+
+    fun return_ref_different_path(b: bool, x: &mut N): &mut u64 {
+        if (b) &mut x.value else &mut x.t.value
+    }
+
+    fun call_return_ref_different_path(b: bool): N {
+        let x = N{value: 1, t: T{value: 2}};
+        let r = return_ref_different_path(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path {
+        ensures b ==> result == N{value: 5, t: T{value: 2}};
+        ensures !b ==> result == N{value: 1, t: T{value: 5}};
+    }
+
+    // Return reference with different path, vector
+    // ============================================
+
+    struct V has copy, drop { is: vector<u64>, ts: vector<T> }
+
+    // Different path into one vector
+
+    fun return_ref_different_path_vec(b: bool, x: &mut V): &mut u64 {
+        if (b) vector::borrow_mut(&mut x.is, 1)  else vector::borrow_mut(&mut x.is, 0)
+    }
+
+    fun call_return_ref_different_path_vec(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path_vec {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(5u64)), ts: vec()};
+        ensures !b ==> result == V{is: concat(vec(5u64), vec(2u64)), ts: vec()};
+    }
+
+    // Different path into a vector or a vector of structs subfield
+
+    fun return_ref_different_path_vec2(b: bool, x: &mut V): &mut u64 {
+        if (b) vector::borrow_mut(&mut x.is, 1) else &mut (vector::borrow_mut(&mut x.ts, 0)).value
+    }
+
+    fun call_return_ref_different_path_vec2(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        vector::push_back(&mut ts, T{value: 3});
+        vector::push_back(&mut ts, T{value: 4});
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec2(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path_vec2 {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(5u64)), ts: concat(vec(T{value: 3}), vec(T{value: 4}))};
+        ensures !b ==> result == V{is: concat(vec(1u64), vec(2u64)), ts: concat(vec(T{value: 5}), vec(T{value: 4}))};
+    }
+
+    // Some as above but with invariant violation.
+
+    fun call_return_ref_different_path_vec2_incorrect(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        vector::push_back(&mut ts, T{value: 3});
+        vector::push_back(&mut ts, T{value: 4});
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec2(b, &mut x);
+        *r = 0;
+        x
+    }
+    spec call_return_ref_different_path_vec2_incorrect {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(0u64)), ts: concat(vec(T{value: 3}), vec(T{value: 4}))};
+        ensures !b ==> result == V{is: concat(vec(1u64), vec(2u64)), ts: concat(vec(T{value: 0}), vec(T{value: 4}))};
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_accross_modules.move b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_accross_modules.move
new file mode 100644
index 000000000..db2620d12
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_accross_modules.move
@@ -0,0 +1,145 @@
+address 0x1 {
+module TestMutRefsAccrossModule {
+
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed.
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    resource struct T { value: u64 }
+
+    // Resource to track the sum of values in T
+    resource struct TSum {
+        sum: u64
+    }
+
+    spec T {
+        // global specification variable tracking sum of values.
+        global spec_sum: u64;
+
+        // Data invariant.
+        invariant value > 0;
+
+        // Pack/unpack invariants updating spec var
+        invariant pack spec_sum = spec_sum + value;
+        invariant unpack spec_sum = spec_sum - value;
+    }
+
+    spec module {
+        // Module invariant that the tracked resource sum equals the spec sum
+        invariant global<TSum>(0x0).sum == spec_sum;
+    }
+
+    // This succeeds because module invariant can be assumed on entry (public function) and is maintained on exit.
+    public fun new(x: u64): T acquires TSum {
+        let r = borrow_global_mut<TSum>(0x0);
+        r.sum = r.sum + x;
+        T{value: x}
+    }
+    spec new {
+        requires x > 0;
+    }
+
+    // This succeeds because module invariant can be assumed on entry (public function) and is maintained on exit.
+    public fun delete(x: T) acquires TSum {
+        let r = borrow_global_mut<TSum>(0x0);
+        let T{value: v} = x;
+        r.sum = r.sum - v;
+    }
+
+    // This succeeds because module invariant can be assumed on entry (public function) and is maintained on exit.
+    public fun increment(x: &mut T) acquires TSum {
+        x.value = x.value + 1;
+        let r = borrow_global_mut<TSum>(0x0);
+        r.sum = r.sum + 1;
+    }
+
+    // This should fail because we do not update the TSum resource.
+    public fun increment_invalid(x: &mut T) {
+        x.value = x.value + 1;
+    }
+
+    // This should fail because we violate the data invariant (value always > 0). The data invariant is enforced
+    // on exit even though it works on a mut ref since this is a public method.
+    public fun decrement_invalid(x: &mut T) acquires TSum {
+        x.value = x.value - 1;
+        let r = borrow_global_mut<TSum>(0x0);
+        r.sum = r.sum - 1;
+    }
+
+    // This one is exactly the same as the previous but succeeds since it is private. The data invariant is not
+    // enforced because the mut ref is manipulated privately.
+    fun private_decrement(x: &mut T) acquires TSum {
+        x.value = x.value - 1;
+        let r = borrow_global_mut<TSum>(0x0);
+        r.sum = r.sum - 1;
+    }
+
+    // This one should succeed.
+    public fun data_invariant(x: &mut T) {
+        spec {
+            assert x.value > 0;
+        }
+    }
+
+    // This one should fail because the invariant is not valid for private &mut.
+    fun private_data_invariant_invalid(x: &mut T) {
+        spec {
+            assert x.value > 0;
+        }
+    }
+
+    // The next function should succeed because calling a public function from a private one maintains module invariants.
+    fun private_to_public_caller(r: &mut T) acquires TSum {
+        // Before call to public increment, data invariants and module invariant must hold.
+        // Here we assume them, and force spec_sum to start with a zero value.
+        spec {
+            assume spec_sum == 0;
+            assume r.value > 0;
+            // r is unpacked at this point, so mimic this below, as we pack before
+            // we call the public function.
+            assume global<TSum>(0x0).sum == spec_sum - r.value;
+        };
+        increment(r);
+        // After call to increment, we expect spec_sum to be incremented.
+        spec {
+            assert spec_sum == 1;
+        };
+    }
+
+
+     fun private_to_public_caller_invalid_data_invariant(): T acquires TSum {
+         // Before call to public new(), assume module invariant.
+         spec {
+            assume global<TSum>(0x0).sum == spec_sum;
+         };
+         let x = new(1);
+         let r = &mut x;
+         // The next call will lead to violation of data invariant. However, because it is private, no
+         // problem reported yet.
+         private_decrement(r);
+         // The next call enforces both module and data invariants.
+         increment(r);
+         x
+     }
+
+     */
+}
+
+/*
+module 0x42::TestMutRefsUser {
+    use 0x1::TestMutRefsAccrossModule;
+
+    public fun valid() {
+        let x = TestMutRefsAccrossModule::new(4);
+        TestMutRefsAccrossModule::increment(&mut x);
+        TestMutRefsAccrossModule::delete(x);
+    }
+}
+*/
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_arg_return.move b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_arg_return.move
new file mode 100644
index 000000000..70bc9f80b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_arg_return.move
@@ -0,0 +1,36 @@
+module 0x42::Test {
+    // test case 1
+    fun one_of_two(cond: bool, r1: &mut u64, r2: &mut u64): &mut u64 {
+        if (cond) {r1} else {r2}
+    }
+
+    fun test1(cond: bool, v1: u64, v2: u64) {
+        let r = one_of_two(cond, &mut v1, &mut v2);
+        *r = 0;
+
+        spec {
+            assert cond ==> v1 == 0;
+            assert !cond ==> v2 == 0;
+        }
+    }
+
+    // test case 2
+    fun max_mut(ma: &mut u64, mb: &mut u64): &mut u64 {
+        if (*ma >= *mb) {
+            ma
+        } else {
+            mb
+        }
+    }
+
+    fun test2(a: u64, b: u64) {
+        let mc = max_mut(&mut a, &mut b);
+        *mc = *mc + 7;
+
+        spec {
+            assert a != b;
+            assert (a > b) ==> (a - b >= 7);
+            assert (a < b) ==> (b - a >= 7);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_unpack.move b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_unpack.move
new file mode 100644
index 000000000..cf927586e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/mut_ref_unpack.move
@@ -0,0 +1,55 @@
+address 0x1 {
+module TestMutRefs {
+
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed.
+
+    spec module {
+        pragma verify = true;
+    }
+
+    resource struct R {
+        value: u64
+    }
+
+    spec R {
+        global sum: num;
+        invariant pack sum = sum + value;
+        invariant unpack sum = sum - value;
+    }
+
+    public fun unpack(r: &mut R): u64 {
+        let R{value} = r;
+        let result = *value;
+         // We need to reset the value because we are only borrowing the `r: &mut R`, not consuming. Otherwise
+         // we get an error regards the `sum` variable.
+        *value = 0;
+        result
+    }
+    spec unpack {
+        ensures r.value == 0;
+        ensures sum == old(sum) - old(r.value);
+    }
+
+    public fun unpack_incorrect(r: &mut R): u64 {
+         let R{value} = r;
+         let result = *value;
+         // Here we get the error described above.
+         // *value = 0;
+         result
+     }
+     spec unpack_incorrect {
+         ensures sum == old(sum) - old(r.value);
+     }
+
+     public fun unpack_caller(r: &mut R): u64 {
+        unpack(r)
+     }
+     spec unpack_caller {
+        ensures r.value == 0;
+     }
+
+     */
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.exp b/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.exp
new file mode 100644
index 000000000..488f02a34
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.exp
@@ -0,0 +1,60 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+   ┌─ tests/sources/functional/nested_invariants.move:16:9
+   │
+16 │         invariant x > 0;
+   │         ^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/nested_invariants.move:64: mutate_inner_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:16
+   =     at tests/sources/functional/nested_invariants.move:64: mutate_inner_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:29
+   =     at tests/sources/functional/nested_invariants.move:32
+   =     at tests/sources/functional/nested_invariants.move:64: mutate_inner_data_invariant_invalid
+   =         o#1#0 = <redacted>
+   =     at tests/sources/functional/nested_invariants.move:65: mutate_inner_data_invariant_invalid
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/nested_invariants.move:66: mutate_inner_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:29
+   =     at tests/sources/functional/nested_invariants.move:32
+   =     at tests/sources/functional/nested_invariants.move:16
+
+error: data invariant does not hold
+   ┌─ tests/sources/functional/nested_invariants.move:32:9
+   │
+32 │         invariant n.x < y;
+   │         ^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/nested_invariants.move:58: mutate_outer_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:16
+   =     at tests/sources/functional/nested_invariants.move:58: mutate_outer_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:29
+   =     at tests/sources/functional/nested_invariants.move:32
+   =     at tests/sources/functional/nested_invariants.move:58: mutate_outer_data_invariant_invalid
+   =         o#1#0 = <redacted>
+   =     at tests/sources/functional/nested_invariants.move:59: mutate_outer_data_invariant_invalid
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/nested_invariants.move:60: mutate_outer_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:29
+   =     at tests/sources/functional/nested_invariants.move:32
+
+error: data invariant does not hold
+   ┌─ tests/sources/functional/nested_invariants.move:16:9
+   │
+16 │         invariant x > 0;
+   │         ^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/nested_invariants.move:47: new_inner_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:16
+
+error: data invariant does not hold
+   ┌─ tests/sources/functional/nested_invariants.move:32:9
+   │
+32 │         invariant n.x < y;
+   │         ^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/nested_invariants.move:43: new_outer_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:16
+   =     at tests/sources/functional/nested_invariants.move:43: new_outer_data_invariant_invalid
+   =     at tests/sources/functional/nested_invariants.move:29
+   =     at tests/sources/functional/nested_invariants.move:32
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.move b/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.move
new file mode 100644
index 000000000..db501c043
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/nested_invariants.move
@@ -0,0 +1,68 @@
+module 0x42::TestNestedInvariants {
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    // Tests scenarios for invariants with nested structs
+
+    struct Nested has copy, drop {
+        x: u64
+    }
+
+    spec Nested {
+        // We must always have a value greater one.
+        invariant x > 0;
+
+        // When we update via a reference, the new value must be smaller or equal the old one.
+        // invariant update x <= old(x);
+    }
+
+    struct Outer has copy, drop  {
+        y: u64,
+        n: Nested
+    }
+
+    spec Outer {
+        // Invariant for own field.
+        invariant y < 4;
+
+        // Invariant for field of aggregated struct in relation to own field.
+        invariant n.x < y;
+
+        // Update invariant for own field.
+        // invariant update y <= old(y);
+    }
+
+    fun new(): Outer {
+        Outer{y: 3, n: Nested{x: 2}}
+    }
+
+    fun new_outer_data_invariant_invalid(): Outer {
+        Outer{y: 2, n: Nested{x: 2}}
+    }
+
+    fun new_inner_data_invariant_invalid(): Outer {
+        Outer{y: 2, n: Nested{x: 0}}
+    }
+
+    fun mutate() {
+        let o = Outer{y: 3, n: Nested{x: 2}};
+        let r = &mut o;
+        r.y = 2;
+        r.n.x = 1;
+    }
+
+    fun mutate_outer_data_invariant_invalid() {
+        let o = Outer{y: 3, n: Nested{x: 2}};
+        let r = &mut o;
+        r.y = 2;
+    }
+
+    fun mutate_inner_data_invariant_invalid() {
+        let o = Outer{y: 3, n: Nested{x: 2}};
+        let r = &mut o;
+        r.n.x = 0;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.exp b/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.exp
new file mode 100644
index 000000000..7eba875c3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.exp
@@ -0,0 +1,169 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/nonlinear_arithm.move:228:9
+    │
+228 │         ensures result == a*b*c + a*b*d + a*b;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/nonlinear_arithm.move:224: distribution_law_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:225: distribution_law_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:226: distribution_law_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:228: distribution_law_incorrect (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/nonlinear_arithm.move:214:9
+    │
+214 │         ensures result != 720;
+    │         ^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/nonlinear_arithm.move:203: mul5_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =         e = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:205: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:206: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:207: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:208: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:210: mul5_incorrect
+    =         result = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:211: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:214: mul5_incorrect (spec)
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/nonlinear_arithm.move:51:5
+   │
+49 │           a * b * c
+   │             - abort happened here with execution failure
+50 │       }
+51 │ ╭     spec overflow_u128_mul_3_incorrect {
+52 │ │         aborts_if false;
+53 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/nonlinear_arithm.move:48: overflow_u128_mul_3_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =         c = <redacted>
+   =     at tests/sources/functional/nonlinear_arithm.move:49: overflow_u128_mul_3_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/nonlinear_arithm.move:35:5
+   │
+33 │           a * b * c
+   │             - abort happened here with execution failure
+34 │       }
+35 │ ╭     spec overflow_u64_mul_3_incorrect {
+36 │ │         aborts_if false;
+37 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/nonlinear_arithm.move:32: overflow_u64_mul_3_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =         c = <redacted>
+   =     at tests/sources/functional/nonlinear_arithm.move:33: overflow_u64_mul_3_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/nonlinear_arithm.move:90:5
+   │
+88 │           a * b * c * d
+   │             - abort happened here with execution failure
+89 │       }
+90 │ ╭     spec overflow_u64_mul_4_incorrect {
+91 │ │         aborts_if false;
+92 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/nonlinear_arithm.move:87: overflow_u64_mul_4_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =         c = <redacted>
+   =         d = <redacted>
+   =     at tests/sources/functional/nonlinear_arithm.move:88: overflow_u64_mul_4_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/nonlinear_arithm.move:150:5
+    │
+148 │           a * b * c * d * e
+    │             - abort happened here with execution failure
+149 │       }
+150 │ ╭     spec overflow_u64_mul_5_incorrect {
+151 │ │         aborts_if false;
+152 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/nonlinear_arithm.move:147: overflow_u64_mul_5_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =         e = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:148: overflow_u64_mul_5_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/nonlinear_arithm.move:18:5
+   │
+16 │           a * b * c
+   │             - abort happened here with execution failure
+17 │       }
+18 │ ╭     spec overflow_u8_mul_3_incorrect {
+19 │ │         aborts_if false;
+20 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/nonlinear_arithm.move:15: overflow_u8_mul_3_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =         c = <redacted>
+   =     at tests/sources/functional/nonlinear_arithm.move:16: overflow_u8_mul_3_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/nonlinear_arithm.move:72:5
+   │
+70 │           a * b * c * d
+   │             - abort happened here with execution failure
+71 │       }
+72 │ ╭     spec overflow_u8_mul_4_incorrect {
+73 │ │         aborts_if false;
+74 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/nonlinear_arithm.move:69: overflow_u8_mul_4_incorrect
+   =         a = <redacted>
+   =         b = <redacted>
+   =         c = <redacted>
+   =         d = <redacted>
+   =     at tests/sources/functional/nonlinear_arithm.move:70: overflow_u8_mul_4_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/nonlinear_arithm.move:131:5
+    │
+129 │           a * b * c * d * e
+    │             - abort happened here with execution failure
+130 │       }
+131 │ ╭     spec overflow_u8_mul_5_incorrect {
+132 │ │         aborts_if false;
+133 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/nonlinear_arithm.move:128: overflow_u8_mul_5_incorrect
+    =         a = <redacted>
+    =         b = <redacted>
+    =         c = <redacted>
+    =         d = <redacted>
+    =         e = <redacted>
+    =     at tests/sources/functional/nonlinear_arithm.move:129: overflow_u8_mul_5_incorrect
+    =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.move b/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.move
new file mode 100644
index 000000000..3551ddf3b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/nonlinear_arithm.move
@@ -0,0 +1,230 @@
+// exclude_for: simplify
+// exclude_for: cvc5
+// flag: --timeout=160
+module 0x42::TestNonlinearArithmetic {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // -----------------------------------------
+    // Overflow by multiplication of 3 variables
+    // -----------------------------------------
+
+    // fails.
+    fun overflow_u8_mul_3_incorrect(a: u8, b: u8, c: u8): u8 {
+        a * b * c
+    }
+    spec overflow_u8_mul_3_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u8_mul_3(a: u8, b: u8, c: u8): u8 {
+        a * b * c
+    }
+    spec overflow_u8_mul_3 {
+        aborts_if a * b > max_u8();
+        aborts_if a * b * c > max_u8();
+    }
+
+    // fails.
+    fun overflow_u64_mul_3_incorrect(a: u64, b: u64, c: u64): u64 {
+        a * b * c
+    }
+    spec overflow_u64_mul_3_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u64_mul_3(a: u64, b: u64, c: u64): u64 {
+        a * b * c
+    }
+    spec overflow_u64_mul_3 {
+        aborts_if a * b > max_u64();
+        aborts_if a * b * c > max_u64();
+    }
+
+    // fails.
+    fun overflow_u128_mul_3_incorrect(a: u128, b: u128, c: u128): u128 {
+        a * b * c
+    }
+    spec overflow_u128_mul_3_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u128_mul_3(a: u128, b: u128, c: u128): u128 {
+        a * b * c
+    }
+    spec overflow_u128_mul_3 {
+        aborts_if a * b > max_u128();
+        aborts_if a * b * c > max_u128();
+    }
+
+
+    // -----------------------------------------
+    // Overflow by multiplication of 4 variables
+    // -----------------------------------------
+
+    // fails.
+    fun overflow_u8_mul_4_incorrect(a: u8, b: u8, c: u8, d: u8): u8 {
+        a * b * c * d
+    }
+    spec overflow_u8_mul_4_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u8_mul_4(a: u8, b: u8, c: u8, d: u8): u8 {
+        a * b * c * d
+    }
+    spec overflow_u8_mul_4 {
+        aborts_if a * b > max_u8();
+        aborts_if a * b * c > max_u8();
+        aborts_if a * b * c * d > max_u8();
+    }
+
+    // fails.
+    fun overflow_u64_mul_4_incorrect(a: u64, b: u64, c: u64, d: u64): u64 {
+        a * b * c * d
+    }
+    spec overflow_u64_mul_4_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u64_mul_4(a: u64, b: u64, c: u64, d: u64): u64 {
+        a * b * c * d
+    }
+    spec overflow_u64_mul_4 {
+        aborts_if a * b > max_u64();
+        aborts_if a * b * c > max_u64();
+        aborts_if a * b * c * d > max_u64();
+    }
+
+    // fails.
+    fun overflow_u128_mul_4_incorrect(a: u128, b: u128, c: u128, d: u128): u128 {
+        a * b * c * d
+    }
+    spec overflow_u128_mul_4_incorrect {
+        pragma verify = false; // times out on smaller machines
+        aborts_if false;
+    }
+
+    fun overflow_u128_mul_4(a: u128, b: u128, c: u128, d: u128): u128 {
+        a * b * c * d
+    }
+    spec overflow_u128_mul_4 {
+        pragma verify = false; // times out on smaller machines
+        aborts_if a * b > max_u128();
+        aborts_if a * b * c > max_u128();
+        aborts_if a * b * c * d > max_u128();
+    }
+
+
+    // -----------------------------------------
+    // Overflow by multiplication of 5 variables
+    // -----------------------------------------
+
+    // fails.
+    fun overflow_u8_mul_5_incorrect(a: u8, b: u8, c: u8, d: u8, e: u8): u8 {
+        a * b * c * d * e
+    }
+    spec overflow_u8_mul_5_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u8_mul_5(a: u8, b: u8, c: u8, d: u8, e: u8): u8 {
+        a * b * c * d * e
+    }
+    spec overflow_u8_mul_5 {
+        aborts_if a * b > max_u8();
+        aborts_if a * b * c > max_u8();
+        aborts_if a * b * c * d > max_u8();
+        aborts_if a * b * c * d * e > max_u8();
+    }
+
+    // fails.
+    fun overflow_u64_mul_5_incorrect(a: u64, b: u64, c: u64, d: u64, e: u64): u64 {
+        a * b * c * d * e
+    }
+    spec overflow_u64_mul_5_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u64_mul_5(a: u64, b: u64, c: u64, d: u64, e: u64): u64 {
+        a * b * c * d * e
+    }
+    spec overflow_u64_mul_5 {
+        aborts_if a * b > max_u64();
+        aborts_if a * b * c > max_u64();
+        aborts_if a * b * c * d > max_u64();
+        aborts_if a * b * c * d * e > max_u64();
+    }
+
+    // fails.
+    fun overflow_u128_mul_5_incorrect(a: u128, b: u128, c: u128, d: u128, e: u128): u128 {
+        a * b * c * d * e
+    }
+    spec overflow_u128_mul_5_incorrect {
+        pragma verify = false; // times out on smaller machines
+        aborts_if false;
+    }
+
+    fun overflow_u128_mul_5(a: u128, b: u128, c: u128, d: u128, e: u128): u128 {
+        a * b * c * d * e
+    }
+    spec overflow_u128_mul_5 {
+        pragma verify = false; // times out on smaller machines
+        aborts_if a * b > max_u128();
+        aborts_if a * b * c > max_u128();
+        aborts_if a * b * c * d > max_u128();
+        aborts_if a * b * c * d * e > max_u128();
+    }
+
+
+    // -------------
+    // miscellaneous
+    // -------------
+
+    fun mul5(a: u64, b: u64, c: u64, d: u64, e: u64): u64 {
+        spec {
+            assume a < b;
+            assume b < c;
+            assume c < d;
+            assume d < e;
+        };
+        a * b * c * d * e
+    }
+    spec mul5 {
+        // a, b, c, d and e do not exist such that a<b<c<d<e and a*b*c*d*e==72.
+        ensures result != 72;
+    }
+
+    fun mul5_incorrect(a: u64, b: u64, c: u64, d: u64, e: u64): u64 {
+        spec {
+            assume a < b;
+            assume b < c;
+            assume c < d;
+            assume d < e;
+        };
+        a * b * c * d * e
+    }
+    spec mul5_incorrect {
+        // a=1, b=2, c=3, d=4, e=30, a*b*c*d*e==720
+        ensures result != 720;
+    }
+
+    fun distribution_law(a: u64, b: u64, c: u64 , d: u64): u64 {
+        a * b * (c + d)
+    }
+    spec distribution_law {
+        ensures result == a*b*c + a*b*d;
+    }
+
+    fun distribution_law_incorrect(a: u64, b: u64, c: u64 , d: u64): u64 {
+        a * b * (c + d)
+    }
+    spec distribution_law_incorrect {
+        ensures result == a*b*c + a*b*d + a*b;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/old_in_inlined.move b/vendors/move/crates/move-prover/tests/sources/functional/old_in_inlined.move
new file mode 100644
index 000000000..75a531d66
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/old_in_inlined.move
@@ -0,0 +1,19 @@
+module 0x42::OldInInlined {
+
+    // tests the case when an inlined spec uses "old" and a function containing it (bar in this
+    // case) is itself called from another function (foo in this case) - "old" value must be
+    // recorded not only in the "verified" (bar) function variant but also in the baseline variant
+    // if it's called from another function
+
+    fun foo() {
+        let x = 0;
+        bar(&mut x);
+    }
+
+    fun bar(y: &mut u64) {
+        *y = *y + 2;
+        spec {
+            assert y > old(y) + 1;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.exp b/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.exp
new file mode 100644
index 000000000..04ddd2998
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.exp
@@ -0,0 +1,6 @@
+Move prover returns: exiting with bytecode transformation errors
+error: `old(..)` applied to expression which does not depend on state
+   ┌─ tests/sources/functional/old_param_err.move:16:17
+   │
+16 │         ensures old(token.value) == result_1.value + result_2.value;
+   │                 ^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.move b/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.move
new file mode 100644
index 000000000..7686d35e8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/old_param_err.move
@@ -0,0 +1,18 @@
+module 0x2::Token {
+    struct Token<phantom T> has store { value: u64 }
+
+    fun withdraw<T>(token: &mut Token<T>, value: u64): Token<T> {
+        assert!(token.value >= value, 42);
+        token.value = token.value - value;
+        Token { value }
+    }
+
+    public fun split<T>(token: Token<T>, value: u64): (Token<T>, Token<T>) {
+        let other = withdraw(&mut token, value);
+        (token, other)
+    }
+    spec split {
+        aborts_if token.value < value;
+        ensures old(token.value) == result_1.value + result_2.value;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/old_param_ok.move b/vendors/move/crates/move-prover/tests/sources/functional/old_param_ok.move
new file mode 100644
index 000000000..231843280
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/old_param_ok.move
@@ -0,0 +1,18 @@
+module 0x2::Token {
+    struct Token<phantom T> has store { value: u64 }
+
+    fun withdraw<T>(token: &mut Token<T>, value: u64): Token<T> {
+        assert!(token.value >= value, 42);
+        token.value = token.value - value;
+        Token { value }
+    }
+
+    public fun split<T>(token: Token<T>, value: u64): (Token<T>, Token<T>) {
+        let other = withdraw(&mut token, value);
+        (token, other)
+    }
+    spec split {
+        aborts_if token.value < value;
+        ensures token.value == result_1.value + result_2.value;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/opaque.exp b/vendors/move/crates/move-prover/tests/sources/functional/opaque.exp
new file mode 100644
index 000000000..45066fc0a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/opaque.exp
@@ -0,0 +1,11 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/opaque.move:14:9
+   │
+14 │         ensures result == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/opaque.move:10: opaque_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/opaque.move:11: opaque_incorrect
+   =     at tests/sources/functional/opaque.move:14: opaque_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/opaque.move b/vendors/move/crates/move-prover/tests/sources/functional/opaque.move
new file mode 100644
index 000000000..291e7edb1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/opaque.move
@@ -0,0 +1,24 @@
+// separate_baseline: simplify
+module 0x42::TestOpaque {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // Function which has a wrong post condition, so verification fails.
+    fun opaque_incorrect(): u64 {
+        1
+    }
+    spec opaque_incorrect {
+        pragma opaque = true;
+        ensures result == 2;
+    }
+
+    fun opaque_caller(): u64 {
+        opaque_incorrect()
+    }
+    spec opaque_caller {
+        // because we only use the post condition but not the definition, this should verify
+        ensures result == 2;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/opaque.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/opaque.simplify_exp
new file mode 100644
index 000000000..c72aabd51
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/opaque.simplify_exp
@@ -0,0 +1,25 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/opaque.move:22:9
+   │
+22 │         ensures result == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/opaque.move:18: opaque_caller
+   =     at tests/sources/functional/opaque.move:10: opaque_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/opaque.move:11: opaque_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/opaque.move:19: opaque_caller
+   =     at tests/sources/functional/opaque.move:22: opaque_caller (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/opaque.move:14:9
+   │
+14 │         ensures result == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/opaque.move:10: opaque_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/opaque.move:11: opaque_incorrect
+   =     at tests/sources/functional/opaque.move:14: opaque_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/opaque_native.move b/vendors/move/crates/move-prover/tests/sources/functional/opaque_native.move
new file mode 100644
index 000000000..347c56342
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/opaque_native.move
@@ -0,0 +1,56 @@
+module 0x42::OpaqueNative {
+
+    spec module {
+        pragma aborts_if_is_strict = true;
+
+        // Uninterpreted spec function with axiom.
+        fun injection(v: vector<u8>): u64;
+        axiom forall v1: vector<u8>, v2: vector<u8>: v1 == v2 <==> injection(v1) == injection(v2);
+
+        // Uninterpreted generic spec function with axiom.
+        fun generic_injection<T>(x: T): u64;
+        axiom<T> forall v1: T, v2: T: v1 == v2 <==> generic_injection(v1) == generic_injection(v2);
+
+    }
+
+    // Axiomatized native function
+    native fun hash(v: vector<u8>): u64;
+    spec hash {
+        pragma opaque;
+        ensures result == injection(v);
+    }
+
+    // Positive Test.
+    fun test(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash(v1) == hash(v1), 1);
+        assert!(v1 == v2 || hash(v1) != hash(v2), 2);
+    }
+
+    // Negative Test.
+    fun negative_test(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash(v1) != hash(v2), 1);
+    }
+    spec negative_test {
+        aborts_if v1 == v2 with 1;
+    }
+
+    native fun hash_generic<T>(x: T): u64;
+    spec hash_generic {
+        pragma opaque;
+        ensures result == generic_injection(x);
+    }
+
+    // Positive Test.
+    fun test_generic(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash_generic(v1) == hash_generic(v1), 1);
+        assert!(v1 == v2 || hash(v1) != hash(v2), 2);
+    }
+
+    // Negative Test.
+    fun negative_test_generic(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash_generic(v1) != hash_generic(v2), 1);
+    }
+    spec negative_test_generic {
+        aborts_if v1 == v2 with 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pack_unpack.move b/vendors/move/crates/move-prover/tests/sources/functional/pack_unpack.move
new file mode 100644
index 000000000..aeec87427
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pack_unpack.move
@@ -0,0 +1,221 @@
+address 0x1 {
+module TestPackUnpack {
+
+    /*
+    TODO(refactoring): this test is deactivated until we have ported this (or a similar) feature, or decided to
+      drop it in which case the test should be removed
+
+    spec module {
+        pragma verify = true;
+    }
+
+    resource struct R { nested: S  }
+    spec R {
+        global r_count: num;
+        invariant pack r_count = r_count + 1;
+        invariant unpack r_count = r_count - 1;
+    }
+
+    resource struct S { value: u64 }
+    spec S {
+        global s_sum: num;
+        invariant value > 0;
+        invariant pack s_sum = s_sum + value;
+        invariant unpack s_sum = s_sum - value;
+
+    }
+
+    // Working with values
+    // ===================
+
+    /// Test that global vars are updated on creation.
+    public fun create(): R {
+        R{nested: S{value: 3}}
+    }
+    spec create {
+        ensures result == R{nested: S{value: 3}};
+        ensures r_count == old(r_count) + 1;
+        ensures s_sum == old(s_sum) + 3;
+    }
+
+    /// Test that global vars are updated on destroy.
+    public fun destroy(r: R): u64 {
+        let R{nested} = r;
+        let S{value} = nested;
+        value
+    }
+    spec destroy {
+        ensures result == old(r.nested.value);
+        ensures r_count == old(r_count) - 1;
+        ensures s_sum == old(s_sum) - old(r.nested.value);
+    }
+
+    /// Test that global vars do change if R is destroyed and S updated.
+    public fun extract_and_update(r: R): S {
+        let R{nested} = r;
+        nested.value = nested.value + 3;
+        nested
+    }
+    spec extract_and_update {
+        ensures result == S{value: old(r.nested.value) + 3};
+        ensures r_count == old(r_count) - 1;
+        ensures s_sum == old(s_sum) + 3;
+    }
+
+    // Working with references
+    // =======================
+
+    /// Test that global vars do not change for a public function taking a `&mut R`
+    public fun read_ref_unchanged(r: &mut R): u64 {
+        let R{nested} = r;
+        nested.value
+    }
+    spec read_ref_unchanged {
+        ensures result == r.nested.value;
+        ensures r_count == old(r_count);
+        ensures s_sum == old(s_sum);
+    }
+
+    /// Test that global vars do change if nested is updated.
+    public fun update_ref_changed(r: &mut R): u64 {
+        let R{nested} = r;
+        nested.value = nested.value + 2;
+        nested.value
+    }
+    spec update_ref_changed {
+        ensures result == r.nested.value;
+        ensures r.nested.value == old(r.nested.value) + 2;
+        ensures r_count == old(r_count);
+        ensures s_sum == old(s_sum) + 2;
+    }
+
+    /// Test that moving a value from one to another does not change global balance.
+    public fun move_ref_unchanged(r1: &mut R, r2: &mut R) {
+        r2.nested.value = r2.nested.value + r1.nested.value - 1;
+        r1.nested.value = 1; // We can't reset this to 0 because then invariant fails
+    }
+    spec move_ref_unchanged {
+        ensures r2.nested.value == old(r2.nested.value) + old(r1.nested.value) - 1;
+        ensures r1.nested.value == 1;
+        ensures r_count == old(r_count);
+        ensures s_sum == old(s_sum);
+    }
+
+    /// Test that moving a value from one to another does not change global balance,
+    /// but fails invariant if value is set to 0.
+    public fun move_ref_unchanged_invariant_incorrect(r1: &mut R, r2: &mut R) {
+        r2.nested.value = r2.nested.value + r1.nested.value;
+        r1.nested.value = 0;
+    }
+    spec move_ref_unchanged_invariant_incorrect {
+        ensures r2.nested.value == old(r2.nested.value) + old(r1.nested.value);
+        ensures r1.nested.value == 0;
+        ensures r_count == old(r_count);
+        ensures s_sum == old(s_sum);
+    }
+
+    /// Test that calling a private function with a reference violating the invariant
+    /// temporarily succeeds.
+    public fun call_private_violating_invariant(r: &mut R) {
+        let s = &mut r.nested;
+        private_update_value(s, 0);
+        s.value = 1; // restore invariant.
+    }
+    fun private_update_value(s: &mut S, v: u64) {
+        s.value = v;
+    }
+    spec call_private_violating_invariant {
+        ensures r.nested.value == 1;
+    }
+
+    /// Test that calling a public function with a reference violating the invariant
+    /// fails.
+    public fun call_public_violating_invariant_incorrect(r: &mut R) {
+        let s = &mut r.nested;
+        public_update_value(s, 0);
+        s.value = 1; // restore invariant.
+    }
+    public fun public_update_value(s: &mut S, v: u64) {
+        s.value = v;
+    }
+    spec call_public_violating_invariant_incorrect {
+        ensures r.nested.value == 1;
+    }
+    spec public_update_value {
+        pragma verify = false; // turn noise off for this one, we are interested in the caller
+    }
+
+    /// Test that selecting a value from a reference currently no satisfying the invariant fails.
+    public fun select_value_violating_invariant_incorrect(r: &mut R): u64 {
+        let s = &mut r.nested;
+        s.value = 0; // invariant violated
+        read_S_from_immutable(s)
+    }
+    fun read_S_from_immutable(s: &S): u64 {
+        s.value
+    }
+    spec select_value_violating_invariant_incorrect {
+        ensures result == 0;
+    }
+
+    /// Test that selecting a value from a reference passed in as a parameter to a private
+    /// function, and therefore, currently no satisfying the invariant, fails.
+    fun private_select_value_violating_invariant_incorrect(r: &mut R): u64 {
+        // Because this is a private function, invariant for r may not hold.
+        read_S_from_immutable(&r.nested)
+    }
+    spec private_select_value_violating_invariant_incorrect {
+        ensures result == r.nested.value;
+    }
+
+    /// Test that selecting a value from a reference passed in as a parameter to a private
+    /// function, and therefore, currently no satisfying the invariant, fails.
+    fun private_pass_value_violating_invariant_incorrect(s: &mut S): u64 {
+        // Because this is a private function, invariant for s may not hold.
+        read_S_from_immutable(s)
+    }
+    spec private_pass_value_violating_invariant_incorrect {
+        ensures result == s.value;
+    }
+
+    // Working with references returned by functions
+    // =============================================
+
+    public fun update_via_returned_ref(): R {
+        let r = R{nested: S{value: 1}};
+        let v_ref = get_value_ref(&mut r);
+        *v_ref = 2;
+        r
+    }
+    fun get_value_ref(r: &mut R): &mut u64 {
+        &mut r.nested.value
+    }
+    spec update_via_returned_ref {
+        ensures result.nested.value == 2;
+        ensures r_count == old(r_count) + 1;
+        ensures s_sum == old(s_sum) + 2;
+    }
+
+    public fun update_via_returned_ref_invariant_incorrect(): R {
+        let r = R{nested: S{value: 1}};
+        let v_ref = get_value_ref(&mut r);
+        *v_ref = 0;
+        r
+    }
+
+    public fun update_via_returned_ref_var_incorrect(): R {
+        let r = R{nested: S{value: 1}};
+        let v_ref = get_value_ref(&mut r);
+        *v_ref = 1;
+        r
+    }
+    spec update_via_returned_ref_var_incorrect {
+        ensures result.nested.value == 1;
+        ensures r_count == old(r_count) + 1;
+        ensures s_sum == old(s_sum) + 2;
+    }
+
+    */
+
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pragma.exp b/vendors/move/crates/move-prover/tests/sources/functional/pragma.exp
new file mode 100644
index 000000000..6f1d2f49a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pragma.exp
@@ -0,0 +1,17 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/pragma.move:13:5
+   │
+11 │           abort(1)
+   │           -------- abort happened here with code 0x1
+12 │       }
+13 │ ╭     spec always_aborts_with_verify_incorrect {
+14 │ │         pragma verify=true;
+15 │ │         aborts_if _c;
+16 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/pragma.move:10: always_aborts_with_verify_incorrect
+   =         _c = <redacted>
+   =     at tests/sources/functional/pragma.move:11: always_aborts_with_verify_incorrect
+   =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pragma.move b/vendors/move/crates/move-prover/tests/sources/functional/pragma.move
new file mode 100644
index 000000000..476da0499
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pragma.move
@@ -0,0 +1,25 @@
+// Tests pragmas.
+module 0x42::TestPragma {
+
+
+    spec module {
+        // if not specified otherwise, verification is off.
+        pragma verify=false;
+    }
+
+    fun always_aborts_with_verify_incorrect(_c: bool) {
+        abort(1)
+    }
+    spec always_aborts_with_verify_incorrect {
+        pragma verify=true;
+        aborts_if _c;
+    }
+
+    fun always_aborts_without_verify(_c: bool) {
+        abort(1)
+    }
+    spec always_aborts_without_verify {
+        // Will not be flagged because we have verify=false on module level
+        aborts_if _c;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call.move b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call.move
new file mode 100644
index 000000000..81dd150e3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call.move
@@ -0,0 +1,68 @@
+module 0x42::TestPureFun {
+
+    use std::signer;
+    use std::vector;
+    struct T has key {
+        x: u64,
+    }
+
+    public fun init(dr_account: &signer): bool {
+        assert!(signer::address_of(dr_account) == @0xA550C18, 0);
+        move_to(dr_account, T { x: 2 });
+        false
+    }
+
+    spec init {
+        aborts_if signer::address_of(dr_account) != @0xA550C18;
+        aborts_if exists<T>(signer::address_of(dr_account));
+        ensures dr_x() == pure_f_2();
+    }
+
+    public fun get_x(addr: address): u64 acquires T {
+        assert!(exists<T>(addr), 10);
+        assert!(true, 0); // assertions are ignored when translating Move funs to specs.
+        *&borrow_global<T>(addr).x
+    }
+
+
+    public fun get_x_plus_one(addr: address): u64 acquires T {
+        get_x(addr) + 1
+    }
+
+    public fun increment_x(addr: address) acquires T {
+        let t = borrow_global_mut<T>(addr);
+        t.x = t.x + 1;
+    }
+
+    spec increment_x {
+        ensures get_x(addr) == old(get_x(addr)) + 1;
+        ensures get_x(addr) == old(get_x_plus_one(addr));
+    }
+
+    public fun pure_f_2(): u64 {
+        pure_f_1() + 1
+    }
+
+    public fun pure_f_1(): u64 {
+        pure_f_0() + 1
+    }
+
+    public fun pure_f_0(): u64 {
+        0
+    }
+
+    public fun get_elem(v: &vector<T>): u64 {
+        vector::borrow(v, 0).x
+    }
+
+    spec get_elem {
+        aborts_if vector::is_empty(v);
+    }
+
+    spec module {
+        fun dr_x(): u64 {
+            get_x(@0xA550C18)
+        }
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.exp b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.exp
new file mode 100644
index 000000000..b8b9c7cb4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.exp
@@ -0,0 +1,24 @@
+Move prover returns: exiting with model building errors
+error: calling impure function `TestPureFun::init` is not allowed
+   ┌─ tests/sources/functional/pure_function_call_incorrect.move:32:20
+   │
+32 │         aborts_if !init(account);
+   │                    ^^^^^^^^^^^^^
+   │
+   = impure function `TestPureFun::init(&signer): bool`
+
+error: calling impure function `vector::pop_back` is not allowed
+   ┌─ tests/sources/functional/pure_function_call_incorrect.move:56:27
+   │
+56 │         ensures result == vector::pop_back(old(v));
+   │                           ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = impure function `vector::pop_back(&mut vector<#0>): #0`
+
+error: calling impure function `TestPureFun::impure_f_2` is not allowed
+   ┌─ tests/sources/functional/pure_function_call_incorrect.move:62:13
+   │
+62 │             impure_f_2()
+   │             ^^^^^^^^^^^^
+   │
+   = impure function `TestPureFun::impure_f_2(): u64`
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.move b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.move
new file mode 100644
index 000000000..fa61e8dcf
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/pure_function_call_incorrect.move
@@ -0,0 +1,70 @@
+module 0x42::TestPureFun {
+
+    use std::signer;
+    use std::vector;
+    struct T has key {
+        x: u64,
+    }
+
+    public fun init(account: &signer): bool {
+        if (exists<T>(signer::address_of(account))) {
+            return true
+        };
+        move_to(account, T { x: 0 });
+        false
+    }
+
+    spec init {
+        ensures get_x(signer::address_of(account)) == 0;
+    }
+
+    public fun get_x(addr: address): u64 acquires T {
+        *&borrow_global<T>(addr).x
+    }
+
+    public fun increment_x_incorrect(account: &signer) acquires T {
+        let t = borrow_global_mut<T>(signer::address_of(account));
+        t.x = t.x + 1;
+    }
+
+    spec increment_x_incorrect {
+        // error: calling impure function `init` is not allowed.
+        aborts_if !init(account);
+    }
+
+    /// impure function
+    public fun impure_f_0(): u64 {
+        if (true) { abort 42 };
+        0
+    }
+
+    public fun impure_f_1(): u64 {
+        impure_f_0() + 1
+    }
+
+    /// pure-looking function which indirectly calls an impure function
+    public fun impure_f_2(): u64 {
+        impure_f_1() + 1
+    }
+
+    public fun remove_elem(v: &mut vector<T>): T {
+        vector::pop_back(v)
+    }
+
+    spec remove_elem {
+        // error: calling impure function `pop_back` is not allowed.
+        ensures result == vector::pop_back(old(v));
+    }
+
+    spec module {
+        fun two(): u64 {
+            // error: calling impure function `impure_f_2` is not allowed.
+            impure_f_2()
+        }
+
+        fun dr_x(): u64 {
+            get_x(@0xA550C18)
+        }
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_fun.move b/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_fun.move
new file mode 100644
index 000000000..1e4db05b8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_fun.move
@@ -0,0 +1,34 @@
+module 0x1::test {
+    public fun pow(n: u64, e: u64): u64 {
+        if (e == 0) {
+            1
+        } else {
+            n * pow(n, e - 1)
+        }
+    }
+    spec pow {
+        // NOTE: opaque declaration is necessary for a recursive move function
+        pragma opaque;
+        ensures result == spec_pow(n, e);
+    }
+
+    spec fun spec_pow(n: num, e: num): num {
+        if (e == 0) { 1 } else { n * spec_pow(n, e - 1) }
+    }
+
+    public fun foo_1() {
+        foo_2();
+    }
+
+    fun foo_2() {
+        foo_3();
+        foo_2();
+    }
+    spec foo_2 {
+        pragma opaque;
+    }
+
+    fun foo_3() {
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move b/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move
new file mode 100644
index 000000000..11db9b0e9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move
@@ -0,0 +1,31 @@
+module 0x42::m {
+    fun foo_1() {
+        foo_2();
+    }
+
+    fun foo_2() {
+        foo_3();
+    }
+
+    fun foo_3() {
+        foo_1();
+    }
+    spec foo_3 {
+        // NOTE: our current verification setup
+        // requires at least one function in a
+        // recursive function group to be marked
+        // as opaque (with preferably a complete
+        // set of aborts and ensures conditions).
+        //
+        // In this case, at least one of
+        // - foo_1()
+        // - foo_2()
+        // - foo_3()
+        // must be marked as opaque
+        //
+        // This is simiar to requiring annotations
+        // of loop invariants to break the cycles.
+
+        pragma opaque;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/references.exp b/vendors/move/crates/move-prover/tests/sources/functional/references.exp
new file mode 100644
index 000000000..e575311c6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/references.exp
@@ -0,0 +1,22 @@
+Move prover returns: exiting with verification errors
+error: function does not abort under this condition
+   ┌─ tests/sources/functional/references.move:76:9
+   │
+76 │         aborts_if true;
+   │         ^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/references.move:69: mut_ref_incorrect
+   =         b#1#0 = <redacted>
+   =     at tests/sources/functional/references.move:70: mut_ref_incorrect
+   =         b_ref#1#0 = <redacted>
+   =     at tests/sources/functional/references.move:71: mut_ref_incorrect
+   =     at tests/sources/functional/references.move:50: mut_b
+   =         b = <redacted>
+   =     at tests/sources/functional/references.move:51: mut_b
+   =         b = <redacted>
+   =     at tests/sources/functional/references.move:52: mut_b
+   =     at tests/sources/functional/references.move:72: mut_ref_incorrect
+   =         b#1#0 = <redacted>
+   =     at tests/sources/functional/references.move:73: mut_ref_incorrect
+   =     at tests/sources/functional/references.move:74: mut_ref_incorrect
+   =     at tests/sources/functional/references.move:76: mut_ref_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/references.move b/vendors/move/crates/move-prover/tests/sources/functional/references.move
new file mode 100644
index 000000000..cd1976da0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/references.move
@@ -0,0 +1,117 @@
+module 0x42::TestReferences {
+
+    use std::vector;
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // ------------------------
+    // References as parameters
+    // ------------------------
+
+    struct T has copy, drop {
+        a: u64
+    }
+
+    fun ref_param(r: &T): u64 {
+        r.a
+    }
+    spec ref_param {
+        ensures result == r.a;
+    }
+
+    fun ref_param_vec(r: &vector<T>): u64 {
+        vector::length(r)
+    }
+    spec ref_param_vec {
+        ensures result == len(r);
+    }
+
+    fun ref_return(r: &vector<T>, i: u64): &T {
+        vector::borrow(r, i)
+    }
+    spec ref_return {
+        ensures result == r[i];
+    }
+
+    fun increment(r: &mut u64) {
+        *r = *r + 1
+    }
+    spec increment {
+        ensures r == old(r) + 1;
+    }
+
+
+    // -----------------------------
+    // References as local variables
+    // -----------------------------
+
+    fun mut_b(b: &mut u64) {
+        *b = 10;
+    }
+    spec mut_b {
+        ensures b == 10;
+    }
+
+    fun mut_ref() {
+        let b: u64 = 20;
+        let b_ref: &mut u64 = &mut b;
+        mut_b(b_ref);
+        b = *b_ref;
+        if (b != 10) abort 1;
+    }
+    spec mut_ref {
+        aborts_if false;
+    }
+
+    fun mut_ref_incorrect() {
+        let b: u64 = 20;
+        let b_ref: &mut u64 = &mut b;
+        mut_b(b_ref);
+        b = *b_ref;
+        if (b != 10) abort 1;
+    }
+    spec mut_ref_incorrect {
+        aborts_if true;
+    }
+
+
+    // ---------------------------
+    // References as return values
+    // ---------------------------
+
+    struct WithdrawalCapability has key {
+        account_address: address,
+    }
+
+    fun withdrawal_capability_address(cap: &WithdrawalCapability): &address {
+        &cap.account_address
+    }
+    spec withdrawal_capability_address {
+        ensures result == cap.account_address;
+    }
+
+    // ---------------------------
+    // References of vector elements
+    // ---------------------------
+
+    fun mutate_vector(): vector<u64> {
+        let v = vector::empty();
+        vector::push_back(&mut v, 1);
+        let r = vector::borrow_mut(&mut v, 0);
+        *r = 0;
+        v
+    }
+    spec mutate_vector {
+        ensures result[0] == 0;
+    }
+
+    fun mutate_vector_param(v: &mut vector<u64>) {
+        let r = vector::borrow_mut(v, 0);
+        *r = *r + 1;
+    }
+    spec mutate_vector_param {
+        ensures v[0] == old(v[0]) + 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/resources.exp b/vendors/move/crates/move-prover/tests/sources/functional/resources.exp
new file mode 100644
index 000000000..9b6c9c6f3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/resources.exp
@@ -0,0 +1,18 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/resources.move:39:6
+   │
+39 │      ensures exists<R>(signer::address_of(account));
+   │      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/resources.move:32: create_resource_incorrect
+   =         account = <redacted>
+   =     at tests/sources/functional/resources.move:33: create_resource_incorrect
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/resources.move:36: create_resource_incorrect
+   =     at tests/sources/functional/resources.move:38: create_resource_incorrect (spec)
+   =     at tests/sources/functional/resources.move:39: create_resource_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/restrictions.exp b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.exp
new file mode 100644
index 000000000..947924207
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.exp
@@ -0,0 +1,36 @@
+Move prover returns: exiting with condition generation errors
+error: [boogie translator] function or tuple result type not yet supported
+  ┌─ tests/sources/functional/restrictions.move:9:9
+  │
+9 │         fun f1(): (u64, u64) { (1u64, 2u64) }
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: [boogie translator] function or tuple result type not yet supported
+   ┌─ tests/sources/functional/restrictions.move:12:9
+   │
+12 │         fun f2(): | |num { | | 1 }
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: [boogie translator] Invoke not yet supported
+   ┌─ tests/sources/functional/restrictions.move:16:13
+   │
+16 │             f(1u64)
+   │             ^^^^^^^
+
+error: [boogie translator] `|x|e` (lambda) currently only supported as argument for `all` or `any`
+   ┌─ tests/sources/functional/restrictions.move:21:21
+   │
+21 │             let f = |x| x + 1;
+   │                     ^^^^^^^^^
+
+error: [boogie translator] `|x|e` (lambda) currently only supported as argument for `all` or `any`
+   ┌─ tests/sources/functional/restrictions.move:50:20
+   │
+50 │         ensures f3(|x|x) == f3(|x|x);
+   │                    ^^^^
+
+error: [boogie translator] `|x|e` (lambda) currently only supported as argument for `all` or `any`
+   ┌─ tests/sources/functional/restrictions.move:50:32
+   │
+50 │         ensures f3(|x|x) == f3(|x|x);
+   │                                ^^^^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/restrictions.move b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.move
new file mode 100644
index 000000000..31cce7bf0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.move
@@ -0,0 +1,54 @@
+// no-boogie-test
+// separate_baseline: simplify
+module 0x42::M {
+    struct S {
+        f: u64
+    }
+    spec module {
+        // Tuples as result type.
+        fun f1(): (u64, u64) { (1u64, 2u64) }
+
+        // Functions as result type.
+        fun f2(): | |num { | | 1 }
+
+        // Invoke
+        fun f3(f: |u64|u64): u64 {
+            f(1u64)
+        }
+
+        // Lambda outside of all/any
+        fun f4(): u64 {
+            let f = |x| x + 1;
+            1
+        }
+
+        // Pack
+        fun f5(): S {
+            S{f: 1}
+        }
+
+        // Multiple variable bindings
+        // Those aren't supported even in the checker, so commented out to see the other issues.
+        // fun f9(): (num, num) {
+        //    let (x, y) = (1, 2);
+        //    (x, y)
+        //}
+
+        // Unpack
+        // This isn't supported even in the checker, so commented out to see the other issues.
+        // fun f10(s: S): num {
+        //    let S{f:x} = s;
+        //    x
+        //}
+    }
+
+    /// Need to use the specctions, otherwise the monomorphizer will eliminate them.
+    fun use_them(): bool { true }
+    spec use_them {
+        ensures f1() == f1();
+        ensures f2() == f2();
+        ensures f3(|x|x) == f3(|x|x);
+        ensures f4() == f4();
+        ensures f5() == f5();
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/restrictions.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.simplify_exp
new file mode 100644
index 000000000..20b6321ab
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/restrictions.simplify_exp
@@ -0,0 +1,18 @@
+Move prover returns: exiting with condition generation errors
+error: [boogie translator] Tuple not yet supported
+  ┌─ tests/sources/functional/restrictions.move:9:32
+  │
+9 │         fun f1(): (u64, u64) { (1u64, 2u64) }
+  │                                ^^^^^^^^^^^^
+
+error: [boogie translator] `|x|e` (lambda) currently only supported as argument for `all` or `any`
+   ┌─ tests/sources/functional/restrictions.move:12:28
+   │
+12 │         fun f2(): | |num { | | 1 }
+   │                            ^^^^^
+
+error: [boogie translator] Invoke not yet supported
+   ┌─ tests/sources/functional/restrictions.move:16:13
+   │
+16 │             f(1u64)
+   │             ^^^^^^^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/return_values.exp b/vendors/move/crates/move-prover/tests/sources/functional/return_values.exp
new file mode 100644
index 000000000..c0397c319
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/return_values.exp
@@ -0,0 +1,34 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/return_values.move:17:9
+   │
+17 │         ensures result_1 == 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/return_values.move:31: one_two_wrapper_incorrect
+   =     at tests/sources/functional/return_values.move:4: one_two
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/return_values.move:5: one_two
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/return_values.move:32: one_two_wrapper_incorrect
+   =     at tests/sources/functional/return_values.move:16
+   =     at tests/sources/functional/return_values.move:34: one_two_wrapper_incorrect (spec)
+   =     at tests/sources/functional/return_values.move:17
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/return_values.move:60:9
+   │
+60 │         ensures false;
+   │         ^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/return_values.move:57: true_one_wrapper_incorrect
+   =     at tests/sources/functional/return_values.move:40: true_one
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/return_values.move:41: true_one
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/return_values.move:58: true_one_wrapper_incorrect
+   =     at tests/sources/functional/return_values.move:60: true_one_wrapper_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/return_values.move b/vendors/move/crates/move-prover/tests/sources/functional/return_values.move
new file mode 100644
index 000000000..6e0baa03b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/return_values.move
@@ -0,0 +1,66 @@
+module 0x42::TestReturnValue {
+
+    public fun one_two(): (u64, u64) {
+        (1, 2)
+    }
+    spec one_two {
+        aborts_if false;
+        ensures result_1 == 1;
+        ensures result_2 == 2;
+    }
+
+    public fun one_two_incorrect(): (u64, u64) {
+        (1, 2)
+    }
+    spec one_two_wrapper_incorrect {
+        aborts_if false;
+        ensures result_1 == 2;
+        ensures result_2 == 1;
+    }
+
+    public fun one_two_wrapper(): (u64, u64) {
+        one_two()
+    }
+    spec one_two_wrapper {
+        aborts_if false;
+        ensures result_1 == 1;
+        ensures result_2 == 2;
+    }
+
+    public fun one_two_wrapper_incorrect(): (u64, u64) {
+        one_two()
+    }
+    spec one_two_wrapper_incorrect {
+        aborts_if false;
+        ensures result_1 == 2;
+        ensures result_2 == 1;
+    }
+
+    public fun true_one(): (bool, u64) {
+        (true, 1)
+    }
+    spec true_one {
+        aborts_if false;
+        ensures result_1 == true;
+        ensures result_2 == 1;
+    }
+
+    public fun true_one_wrapper(): (bool, u64) {
+        true_one()
+    }
+    spec true_one_wrapper {
+        ensures result_1 == true;
+        ensures result_2 == 1;
+    }
+
+    public fun true_one_wrapper_incorrect(): (bool, u64) {
+        true_one()
+    }
+    spec true_one_wrapper_incorrect {
+        ensures false;
+        ensures result_1 == true;
+        ensures result_1 == false;
+        ensures result_2 == 0;
+        ensures result_2 == 1;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.exp b/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.exp
new file mode 100644
index 000000000..b96c99a66
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.exp
@@ -0,0 +1,32 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/schema_exp.move:29:5
+   │
+26 │           if (!c) abort(1);
+   │                   -------- abort happened here with code 0x1
+   ·
+29 │ ╭     spec bar_incorrect {
+30 │ │         // Once we include a schema with aborts, even conditionally, we need to provide a full spec of the aborts
+31 │ │         // behavior. This is because the below translates to `aborts_if c && false`, which reduces
+32 │ │         // to `aborts_if false`.
+33 │ │         include c ==> DontAborts;
+34 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/schema_exp.move:25: bar_incorrect
+   =         c = <redacted>
+   =     at tests/sources/functional/schema_exp.move:26: bar_incorrect
+   =         ABORTED
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/schema_exp.move:47:9
+   │
+47 │         ensures result == i + 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/schema_exp.move:53: baz_incorrect
+   =         i = <redacted>
+   =     at tests/sources/functional/schema_exp.move:54: baz_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/schema_exp.move:55: baz_incorrect
+   =     at tests/sources/functional/schema_exp.move:47
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.move b/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.move
new file mode 100644
index 000000000..d4de6f2b7
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/schema_exp.move
@@ -0,0 +1,61 @@
+module 0x42::TestSchemaExp {
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    spec schema Aborts {
+        aborts_if true;
+    }
+
+    spec schema DontAborts {
+        aborts_if false;
+    }
+
+    fun foo(c: bool) {
+        if (!c) abort(1);
+    }
+
+    spec foo {
+        include c ==> DontAborts;
+        include !c ==> Aborts;
+    }
+
+    fun bar_incorrect(c: bool) {
+        if (!c) abort(1);
+    }
+
+    spec bar_incorrect {
+        // Once we include a schema with aborts, even conditionally, we need to provide a full spec of the aborts
+        // behavior. This is because the below translates to `aborts_if c && false`, which reduces
+        // to `aborts_if false`.
+        include c ==> DontAborts;
+    }
+
+    fun baz(i: u64): u64 {
+        if (i > 10) { i + 2 } else { i + 1 }
+    }
+    spec schema AddsOne {
+        i: num;
+        result: num;
+        ensures result == i + 1;
+    }
+    spec schema AddsTwo {
+        i: num;
+        result: num;
+        ensures result == i + 2;
+    }
+    spec baz {
+        include if (i > 10) AddsTwo else AddsOne;
+    }
+
+    fun baz_incorrect(i: u64): u64 {
+        i + 1
+    }
+    spec baz_incorrect {
+        include i > 10 ==> AddsTwo;
+        include i <= 10 ==> AddsOne;
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/script.move b/vendors/move/crates/move-prover/tests/sources/functional/script.move
new file mode 100644
index 000000000..d4a53ba22
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/script.move
@@ -0,0 +1,13 @@
+// flag: --dependency=tests/sources/functional/script_provider.move
+script {
+use 0x1::ScriptProvider;
+
+
+fun main<Token: store>(account: signer) {
+    ScriptProvider::register<Token>(&account);
+}
+
+spec main {
+    include ScriptProvider::RegisterConditions<Token>;
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.exp b/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.exp
new file mode 100644
index 000000000..518b136ed
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.exp
@@ -0,0 +1,29 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/script_incorrect.move:12:5
+   │
+12 │ ╭     spec main {
+13 │ │         aborts_if false;
+14 │ │     }
+   │ ╰─────^
+   │
+   ┌─ tests/sources/functional/script_provider.move:10:9
+   │
+10 │         move_to(account, Info<T>{})
+   │         ------- abort happened here with execution failure
+   │
+   =     at tests/sources/functional/script_incorrect.move:6: main
+   =         account = <redacted>
+   =     at tests/sources/functional/script_incorrect.move:8: main
+   =     at tests/sources/functional/script_incorrect.move:10: main
+   =     at tests/sources/functional/script_provider.move:8: register
+   =         account = <redacted>
+   =     at tests/sources/functional/script_provider.move:9: register
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/script_provider.move:9: register
+   =     at tests/sources/functional/script_provider.move:10: register
+   =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.move b/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.move
new file mode 100644
index 000000000..d04884e8b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/script_incorrect.move
@@ -0,0 +1,15 @@
+// flag: --dependency=tests/sources/functional/script_provider.move
+script {
+    use 0x1::ScriptProvider;
+    use std::signer;
+
+    fun main<Token: store>(account: signer) {
+        spec {
+            assume signer::address_of(account) == @0x1;
+        };
+        ScriptProvider::register<Token>(&account);
+    }
+    spec main {
+        aborts_if false;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/script_provider.move b/vendors/move/crates/move-prover/tests/sources/functional/script_provider.move
new file mode 100644
index 000000000..8f529fbed
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/script_provider.move
@@ -0,0 +1,22 @@
+// A module providing functionality to the script*.move tests
+address 0x1 {
+module ScriptProvider {
+    use std::signer;
+
+    struct Info<phantom T> has key {}
+
+    public fun register<T: store>(account: &signer) {
+        assert!(signer::address_of(account) == @0x1, 1);
+        move_to(account, Info<T>{})
+    }
+    spec schema RegisterConditions<T> {
+        account: signer;
+        aborts_if signer::address_of(account) != @0x1;
+        aborts_if exists<Info<T>>(@0x1);
+        ensures exists<Info<T>>(@0x1);
+    }
+    spec register {
+        include RegisterConditions<T>;
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.exp b/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.exp
new file mode 100644
index 000000000..04772dc61
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.exp
@@ -0,0 +1,20 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/serialize_model.move:34:9
+   │
+34 │         ensures result_1 == result_2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/serialize_model.move:26: bcs_test1_incorrect
+   =         v1 = <redacted>
+   =         v2 = <redacted>
+   =     at tests/sources/functional/serialize_model.move:28: bcs_test1_incorrect
+   =         s1#1#0 = <redacted>
+   =     at tests/sources/functional/serialize_model.move:29: bcs_test1_incorrect
+   =         s2#1#0 = <redacted>
+   =     at tests/sources/functional/serialize_model.move:30: bcs_test1_incorrect
+   =         result_1 = <redacted>
+   =         result_2 = <redacted>
+   =     at tests/sources/functional/serialize_model.move:31: bcs_test1_incorrect
+   =     at tests/sources/functional/serialize_model.move:33: bcs_test1_incorrect (spec)
+   =     at tests/sources/functional/serialize_model.move:34: bcs_test1_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.move b/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.move
new file mode 100644
index 000000000..e2eaa899e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/serialize_model.move
@@ -0,0 +1,41 @@
+
+
+module 0x42::TestBCS {
+    use std::bcs;
+
+    spec module {
+        pragma verify = true;
+    }
+
+    fun bcs_test1<Thing>(v1: &Thing, v2: &Thing): (vector<u8>, vector<u8>)
+    {
+        let s1 = bcs::to_bytes(v1);
+        let s2 = bcs::to_bytes(v2);
+        (s1, s2)
+    }
+    spec bcs_test1 {
+        aborts_if false;
+        ensures result_1 == result_2 ==> v1 == v2;
+        ensures v1 == v2 ==> result_1 == result_2;
+        // it knows result is vector<u8>
+        ensures len(result_1) > 0 ==> result_1[0] <= max_u8();
+    }
+
+    // serialize tests
+
+    fun bcs_test1_incorrect<Thing>(v1: &Thing, v2: &Thing): (vector<u8>, vector<u8>)
+    {
+        let s1 = bcs::to_bytes(v1);
+        let s2 = bcs::to_bytes(v2);
+        (s1, s2)
+    }
+    spec bcs_test1_incorrect {
+        aborts_if false;
+        ensures result_1 == result_2;
+        ensures len(result_1) > 0;
+        // it knows result is vector<u8>
+        // TODO: the below introduces non-determinism so commented out for now
+        // ensures result_1[0] < max_u8();
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/shift.exp b/vendors/move/crates/move-prover/tests/sources/functional/shift.exp
new file mode 100644
index 000000000..daaab9068
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/shift.exp
@@ -0,0 +1,39 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/shift.move:95:9
+   │
+95 │         ensures result == x << 10u8;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/shift.move:65: shift_l_11_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/shift.move:66: shift_l_11_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/shift.move:67: shift_l_11_incorrect
+   =     at tests/sources/functional/shift.move:95: shift_l_11_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/shift.move:38:9
+   │
+38 │         ensures result == x * 128 + 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/shift.move:33: shiftl_7_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/shift.move:34: shiftl_7_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/shift.move:35: shiftl_7_incorrect
+   =     at tests/sources/functional/shift.move:38: shiftl_7_incorrect (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/shift.move:54:9
+   │
+54 │         ensures result == x / 128 + 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/shift.move:49: shiftr_7_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/shift.move:50: shiftr_7_incorrect
+   =         result = <redacted>
+   =     at tests/sources/functional/shift.move:51: shiftr_7_incorrect
+   =     at tests/sources/functional/shift.move:54: shiftr_7_incorrect (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/shift.move b/vendors/move/crates/move-prover/tests/sources/functional/shift.move
new file mode 100644
index 000000000..a7610b324
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/shift.move
@@ -0,0 +1,188 @@
+// exclude_for: cvc5
+
+// cvc5 seems to go into an infinite loop because of the recursive $pow function.
+// For some reason, it does not time out in a reasonable time.
+module 0x42::TestShift {
+
+    fun shiftl_1_correct(x: u64): u64 {
+        x << 1
+    }
+
+    spec shiftl_1_correct {
+        ensures result == 2*x % (1 << 64);
+        ensures x < (1 << 63) ==> result == 2*x;
+    }
+
+    fun shiftr_1_correct(x: u64): u64 {
+        x >> 1
+    }
+
+    spec shiftr_1_correct {
+        ensures result == x / 2;
+    }
+
+
+    fun shiftl_64_incorrect(x: u64): u64 {
+        x << 64u8
+    }
+
+    spec shiftl_64_incorrect {
+        aborts_if true;
+    }
+
+    fun shiftl_7_incorrect(x: u64): u64 {
+        x << 7u8
+    }
+
+    spec shiftl_7_incorrect {
+        ensures result == x * 128 + 1;
+    }
+
+    fun shiftr_64_incorrect(x: u64): u64 {
+        x >> 64u8
+    }
+
+    spec shiftr_64_incorrect {
+        aborts_if true;
+    }
+
+    fun shiftr_7_incorrect(x: u64): u64 {
+        x >> 7u8
+    }
+
+    spec shiftr_7_incorrect {
+        ensures result == x / 128 + 1;
+    }
+
+    fun shift_l_11_correct(x: u64): u64 {
+        x << 11u8
+    }
+
+    spec shift_l_11_correct {
+        ensures result == (x << 11u8) % (1 << 64);
+    }
+
+    fun shift_l_11_incorrect(x: u64): u64 {
+        x << 11u8
+    }
+
+    fun shift_r_11_correct_u32(x: u32): u32 {
+        x >> 11u8
+    }
+
+    spec shift_r_11_correct_u32 {
+        ensures result == x / (1 << 11);
+    }
+
+    fun shift_r_11_correct_u256(x: u256): u256 {
+        x >> 11u8
+    }
+
+    spec shift_r_11_correct_u256 {
+        ensures result == x / (1 << 11);
+    }
+
+    fun shift_r_11_correct(x: u64): u64 {
+        x >> 11u8
+    }
+
+    spec shift_r_11_correct {
+        ensures result == x / (1 << 11);
+    }
+
+
+    spec shift_l_11_incorrect {
+        ensures result == x << 10u8;
+    }
+
+    fun var_shift_l_correct_1(x: u64, a: u8): u64 {
+        x << a
+    }
+
+    spec var_shift_l_correct_1 {
+        ensures result == x << a;
+    }
+
+    fun var_shift_l_correct(x: u64, a: u8): u64 {
+        x << a
+    }
+
+    spec var_shift_l_correct {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 64;
+        ensures result == (x << a) % (1 << 64);
+    }
+
+    fun var_shift_l_incorrect_u32_1(x: u32, a: u8): u32 {
+        x << a
+    }
+
+    spec var_shift_l_incorrect_u32_1 {
+        ensures result == x << a;
+    }
+
+    fun var_shift_l_correct_u32(x: u32, a: u8): u32 {
+        x << a
+    }
+
+    spec var_shift_l_correct_u32 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 32;
+        ensures result == (x << a) % (1 << 32);
+    }
+
+    fun var_shift_l_incorrect_u256_1(x: u256, a: u8): u256 {
+        x << a
+    }
+
+    spec var_shift_l_incorrect_u256_1 {
+        ensures result == x << a;
+    }
+
+    fun var_shift_l_correct_u256(x: u256, a: u8): u256 {
+        x << a
+    }
+
+    spec var_shift_l_correct_u256 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if false;
+        ensures result == (x << a) % (max_u256() + 1);
+    }
+
+    fun var_shift_r_correct(x: u64, a: u8): u64 {
+        x >> a
+    }
+
+    spec var_shift_r_correct {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 64;
+        ensures result == (x >> a);
+    }
+
+    fun var_shift_r_correct_u32(x: u32, a: u8): u32 {
+        x >> a
+    }
+
+    spec var_shift_r_correct_u32 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 32;
+        ensures result == (x >> a);
+    }
+
+    fun var_shift_r_correct_u256(x: u256, a: u8): u256 {
+        x >> a
+    }
+
+    spec var_shift_r_correct_u256 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if false;
+        ensures result == (x >> a);
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/signer_display.exp b/vendors/move/crates/move-prover/tests/sources/functional/signer_display.exp
new file mode 100644
index 000000000..b0522f52e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/signer_display.exp
@@ -0,0 +1,10 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+  ┌─ tests/sources/functional/signer_display.move:7:13
+  │
+7 │             assert signer::address_of(account) == @0x1;
+  │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/signer_display.move:5: f_incorrect
+  =         account = <redacted>
+  =     at tests/sources/functional/signer_display.move:7: f_incorrect
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/signer_display.move b/vendors/move/crates/move-prover/tests/sources/functional/signer_display.move
new file mode 100644
index 000000000..078f8820c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/signer_display.move
@@ -0,0 +1,10 @@
+module 0x42::SignerDisplay {
+    use std::signer;
+
+    // Test the signer value display in the error trace
+    fun f_incorrect(account: &signer) {
+        spec {
+            assert signer::address_of(account) == @0x1;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/simple_vector_client.move b/vendors/move/crates/move-prover/tests/sources/functional/simple_vector_client.move
new file mode 100644
index 000000000..81fcd71d4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/simple_vector_client.move
@@ -0,0 +1,473 @@
+// This file consists of a series of test cases which are client functions
+// using the standard vector module.
+module 0x42::TestVector {
+    use std::vector;
+
+    spec module {
+        pragma verify = true;
+    }
+
+    // -----------------------------
+    // Testing with concrete vectors
+    // -----------------------------
+
+    fun test_vector_equal(_v: vector<u64>, _w: &mut vector<u64>) {
+    }
+    spec test_vector_equal {
+        aborts_if false;
+        ensures _v == _v;
+        ensures _v == _v[0..len(_v)];
+        ensures _w == _w;
+        ensures old(_w) == old(_w);
+        ensures _w == _w[0..len(_w)];
+        ensures old(_w) == old(_w[0..len(_w)]);
+    }
+
+    // succeeds. [] == [].
+    fun test_empty() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        (ev1, ev2)
+    }
+    spec test_empty {
+        ensures result_1 == result_2;
+        ensures len(result_1) == 0;
+        ensures len(result_2) == 0;
+    }
+
+    // succeeds. [1] == [1]
+    fun test_push() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev2, 1);
+        (ev1, ev2)
+    }
+    spec test_push {
+        ensures result_1 == result_2;
+        ensures len(result_1) == 1;
+        ensures len(result_2) == 1;
+    }
+
+    //succeeds. [] == [].
+    fun test_push_pop() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::pop_back(&mut ev1);
+        (ev1, ev2)
+    }
+    spec test_push_pop {
+        ensures result_1 == result_2;
+    }
+
+    //succeeds. [1,2] != [1].
+    fun test_neq1() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev2, 1);
+        (ev1, ev2)
+    }
+    spec test_neq1 {
+        ensures result_1 != result_2;
+    }
+
+    // succeeds. [1] == [0]
+    fun test_neq2() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev2, 0);
+        (ev1, ev2)
+    }
+    spec test_neq2 {
+        ensures result_1 != result_2;
+    }
+
+    // succeeds. reverse([]) == [].
+    fun test_reverse1() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::reverse(&mut ev1);
+        (ev1, ev2)
+    }
+    spec test_reverse1 {
+        ensures result_1 == result_2;
+    }
+
+    // succeeds. reverse([1,2]) == [2,1].
+    fun test_reverse2() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev2, 2);
+        vector::push_back(&mut ev2, 1);
+        vector::reverse(&mut ev1);
+        (ev1, ev2)
+    }
+    spec test_reverse2 {
+        ensures result_1 == result_2;
+    }
+
+    // succeeds. reverse([1,2]) != [1,2].
+    fun test_reverse3() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev2, 1);
+        vector::push_back(&mut ev2, 2);
+        vector::reverse(&mut ev1);
+        (ev1, ev2)
+    }
+    spec test_reverse3 {
+        ensures result_1 != result_2;
+    }
+
+    // succeeds. swap([1,2],0,1) == [2,1].
+    fun test_swap() : (vector<u64>, vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev2, 2);
+        vector::push_back(&mut ev2, 1);
+        vector::swap(&mut ev1, 0, 0);
+        vector::swap(&mut ev1, 0, 1);
+        (ev1, ev2)
+    }
+    spec test_swap {
+        ensures result_1 == result_2;
+    }
+
+    // succeeds. Always aborts because the first index argument of `swap` is out-of-bounds.
+    fun test_swap_abort1()
+    {
+        let ev1 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::swap(&mut ev1, 1, 0);
+    }
+    spec test_swap_abort1 {
+        aborts_if true;
+    }
+
+    // succeeds. Always aborts because the second index argument of `swap` is out-of-bounds.
+    fun test_swap_abort2()
+    {
+        let ev1 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::swap(&mut ev1, 0, 1);
+    }
+    spec test_swap_abort2 {
+        aborts_if true;
+    }
+
+    // succeeds. len([1]) = len([]) + 1.
+    fun test_length1() : (u64, u64)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        (vector::length(&ev1), vector::length(&ev2))
+    }
+    spec test_length1 {
+        ensures result_1 == result_2 + 1;
+    }
+
+    fun vector_of_proper_positives(): vector<u64> {
+        let v = vector::empty();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 3);
+        v
+    }
+    spec vector_of_proper_positives {
+      ensures forall n in result: n > 0;
+      ensures forall i in 0..len(result), j in 0..len(result) where result[i] == result[j] : i == j;
+    }
+
+    // succeeds. 7 == 7.
+    fun test_borrow1() : u64
+    {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 7);
+        *vector::borrow(&v, 0)
+    }
+    spec test_borrow1 {
+        ensures result == 7;
+    }
+
+    // succeeds. 7 != 7.
+    fun test_borrow2() : u64
+    {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 0);
+        *vector::borrow(&v, 0)
+    }
+    spec test_borrow2 {
+        ensures result != 7;
+    }
+
+    // succeeds. Always aborts due to the out-of-bounds index used.
+    fun test_borrow3() : u64
+    {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 7);
+        *vector::borrow(&v, 1)
+    }
+    spec test_borrow3 {
+        aborts_if true;
+    }
+
+    fun test_slice() : (vector<u64>,vector<u64>)
+    {
+        let ev1 = vector::empty<u64>();
+        let ev2 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev2, 0);
+        vector::push_back(&mut ev2, 1);
+        vector::push_back(&mut ev2, 2);
+        vector::push_back(&mut ev2, 3);
+        vector::push_back(&mut ev2, 1);
+        vector::push_back(&mut ev2, 2);
+        (ev1, ev2)
+    }
+    spec test_slice {
+        ensures result_1 == result_2[1..3];
+        ensures result_1 != result_2[0..2];
+        ensures result_1 == result_2[4..6];
+        ensures result_1[0..2] == result_2[4..6];
+        ensures result_1[1..2] == result_2[2..3];
+        ensures result_2[1..3] == result_2[4..6];
+    }
+
+    fun test_contains() : (vector<u64>, bool, bool)
+    {
+        let b1: bool;
+        let b2: bool;
+        let ev1 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev1, 3);
+        vector::push_back(&mut ev1, 5);
+        b1 = vector::contains(&ev1, &3);
+        b2 = vector::contains(&ev1, &4);
+        (ev1, b1, b2)
+    }
+    spec test_contains {
+        aborts_if false;
+        ensures result_2 == true;
+        ensures result_3 == false;
+        ensures len(result_1) == 4;
+        ensures result_1[0] == 1; // FIXME: Comment this line out to reveal the bug. This function is not verified without this line, but should be.
+        ensures result_1[1] == 2;
+        ensures result_1[2] == 3;
+        ensures result_1[3] == 5;
+        ensures exists x in result_1: x == 1;
+        ensures exists x in result_1: x == 2;
+        ensures exists x in result_1: x == 3;
+        ensures !(exists x in result_1: x == 4);
+        ensures exists x in result_1: x == 5;
+    }
+
+    fun test_index_of(): (vector<u64>, bool, u64, bool, u64) {
+        let b1: bool;
+        let b2: bool;
+        let i1: u64;
+        let i2: u64;
+        let ev1 = vector::empty<u64>();
+        vector::push_back(&mut ev1, 1);
+        vector::push_back(&mut ev1, 2);
+        vector::push_back(&mut ev1, 3);
+        vector::push_back(&mut ev1, 7);
+        vector::push_back(&mut ev1, 7);
+        vector::push_back(&mut ev1, 1);
+        vector::reverse(&mut ev1);
+        (b1, i1) = vector::index_of<u64>(&ev1, &4);
+        (b2, i2) = vector::index_of<u64>(&ev1, &7);
+        (ev1, b1, i1, b2, i2)
+    }
+    spec test_index_of {
+        aborts_if false;
+        ensures result_2 == false;
+        ensures result_3 == 0;
+        ensures result_4 == true;
+        ensures result_1[1] == 7; // FIXME: Comment this line out to reveal the bug. This function is not verified without this line, but should be.
+        ensures result_1[2] == 7;
+        ensures result_5 == 1;
+    }
+
+
+    // ---------------------------
+    // Testing functions with args
+    // ---------------------------
+
+    fun test_length2(v: vector<u64>) : (u64, u64)
+    {
+        let x: u64;
+        let y: u64;
+        x = vector::length(&v);
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 3);
+        y = vector::length(&v);
+        (x, y)
+    }
+    spec test_length2 {
+        ensures result_1 + 3 == result_2;
+    }
+
+    fun test_length3(v: vector<u64>) : (u64, u64)
+    {
+        let l = vector::length(&v);
+        vector::push_back(&mut v, 1);
+        (l, vector::length(&v))
+    }
+    spec test_length3 {
+        ensures len(v) == result_1;
+        ensures result_1 + 1 == result_2;
+    }
+
+    fun test_length4(v: &mut vector<u64>) : (u64, u64)
+    {
+        let l = vector::length(v);
+        vector::push_back(v, 1);
+        (l, vector::length(v))
+    }
+    spec test_length4 {
+        ensures len(old(v)) == result_1;
+        ensures result_1 + 1 == result_2;
+        ensures v != old(v);
+        ensures len(v) == result_2;
+    }
+
+    // succeeds. v == v.
+    fun test_id1(v: vector<u64>) : vector<u64>
+    {
+        v
+    }
+    spec test_id1 {
+        ensures result == v;
+    }
+
+    // succeeds. reverse(reverse(v)) == v.
+    fun test_id2(v: vector<u64>) : vector<u64>
+    {
+        vector::reverse(&mut v);
+        vector::reverse(&mut v);
+        v
+    }
+    spec test_id2 {
+        ensures result == v;
+    }
+
+    // succeeds. reverse(some_obscure_reverse_routine(v)) == v.
+    fun test_id3(v: vector<u64>) : vector<u64>
+    {
+        let l: u64 = vector::length(&v);
+        if(l <= 1) {
+        }
+        else {
+            if(l <= 3) {
+                vector::swap(&mut v, 0, l-1);
+            }
+            else {
+                vector::reverse(&mut v);
+            }
+        };
+        vector::reverse(&mut v);
+        v
+    }
+    spec test_id3 {
+        ensures result == v;
+    }
+
+    // succeeds. If the input vector is empty, destroy it, and return a new empty vector.
+    fun test_destroy_empty1(v: vector<u64>) : vector<u64>
+    {
+        if(vector::is_empty(&v)) {
+            vector::destroy_empty(v);
+            vector::empty<u64>()
+        }
+        else {
+            v
+        }
+    }
+    spec test_destroy_empty1 {
+        ensures result == v;
+    }
+
+    // succeeds. If the input vector is empty, destroy it, and return a new empty vector.
+    fun test_destroy_empty2(v: vector<u64>)
+    {
+        if(vector::is_empty(&v)) {
+            vector::swap(&mut v, 0, 0);
+        }
+        else {
+            vector::destroy_empty(v);
+        }
+    }
+    spec test_destroy_empty2 {
+        aborts_if true;
+    }
+
+    fun test_borrow_mut(v: &mut vector<u64>) : u64
+    {
+        let x = *vector::borrow(v, 0);
+        *vector::borrow_mut(v, 0) = 7;
+        x
+    }
+    spec test_borrow_mut {
+        aborts_if len(v) == 0;
+    }
+
+
+    // --------------------------------------------
+    // Custom Option type using vector as container
+    // --------------------------------------------
+
+    struct T<E> has copy, drop {
+        v: vector<E>
+    }
+
+    fun none<E>(): T<E> {
+        T<E> {v: vector::empty<E>()}
+    }
+
+    fun some<E>(e: E): T<E> {
+        let v = vector::empty<E>();
+        vector::push_back(&mut v, e);
+        T<E> {v: v}
+    }
+
+    fun unwrap_or<E: copy + drop>(x: T<E>, e: E): E {
+        let T<E> {v : v} = x;
+        if (vector::is_empty<E>(&v))
+            e
+        else
+            vector::pop_back<E>(&mut v)
+    }
+
+    fun option_type(): (u64, u64) {
+        let n = none<u64>();
+        let s = some<u64>(42);
+        (unwrap_or<u64>(n, 0), unwrap_or<u64>(s, 0))
+    }
+    spec option_type {
+        ensures result_1 == 0;
+        ensures result_2 == 42;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.exp b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.exp
new file mode 100644
index 000000000..9f0540944
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.exp
@@ -0,0 +1,50 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/specs_in_fun.move:45:13
+   │
+45 │             assert x == y;
+   │             ^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/specs_in_fun.move:42: simple1_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:43: simple1_incorrect
+   =     at tests/sources/functional/specs_in_fun.move:45: simple1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/specs_in_fun.move:53:13
+   │
+53 │             assert x == y;
+   │             ^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/specs_in_fun.move:49: simple2_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:51: simple2_incorrect
+   =         y#1#0 = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:53: simple2_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/specs_in_fun.move:60:13
+   │
+60 │             assert x > y;
+   │             ^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/specs_in_fun.move:57: simple3_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:59: simple3_incorrect
+   =     at tests/sources/functional/specs_in_fun.move:60: simple3_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/specs_in_fun.move:69:13
+   │
+69 │             assert z > 2*x;
+   │             ^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/specs_in_fun.move:64: simple4_incorrect
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:66: simple4_incorrect
+   =         z#1#0 = <redacted>
+   =     at tests/sources/functional/specs_in_fun.move:68: simple4_incorrect
+   =     at tests/sources/functional/specs_in_fun.move:69: simple4_incorrect
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.move b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.move
new file mode 100644
index 000000000..38cc71b53
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun.move
@@ -0,0 +1,72 @@
+module 0x42::TestAssertAndAssume {
+    // Tests that should verify
+
+    spec module {
+        pragma verify = true;
+    }
+
+
+    fun simple1(x: u64, y: u64) {
+        if (!(x > y)) abort 1;
+        spec {
+            assert x > y;
+        }
+    }
+
+    fun simple2(x: u64) {
+        let y: u64;
+        y = x + 1;
+        spec {
+            assert x == y - 1;
+        }
+    }
+
+    fun simple3(x: u64, y: u64) {
+        spec {
+            assume x > y;
+            assert x >= y;
+        }
+    }
+
+    fun simple4(x: u64, y: u64) {
+        let z: u64;
+        z = x + y;
+        spec {
+            assume x > y;
+            assert z > 2*y;
+        }
+    }
+
+    // Tests that should not verify
+
+    fun simple1_incorrect(x: u64, y: u64) {
+        if (!(x > y)) abort 1;
+        spec {
+            assert x == y;
+        }
+    }
+
+    fun simple2_incorrect(x: u64) {
+        let y: u64;
+        y = x + 1;
+        spec {
+            assert x == y;
+        }
+    }
+
+    fun simple3_incorrect(x: u64, y: u64) {
+        spec {
+            assume x >= y;
+            assert x > y;
+        }
+    }
+
+    fun simple4_incorrect(x: u64, y: u64) {
+        let z: u64;
+        z = x + y;
+        spec {
+            assume x > y;
+            assert z > 2*x;
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun_ref.move b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun_ref.move
new file mode 100644
index 000000000..40886f09d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/specs_in_fun_ref.move
@@ -0,0 +1,123 @@
+module 0x42::TestAssertWithReferences {
+
+    spec module {
+        pragma verify = true;
+    }
+    // This function verifies.
+    // Feature: An input parameter is mutated
+    fun simple1(x: u64, y: u64) {
+        let z;
+        y = x;
+        z = x + y;
+        spec {
+            assert x == y;
+            assert z == 2*x;
+            assert z == 2*y;
+        }
+    }
+
+    // This function verifies.
+    // Feature: An input reference parameter is mutated
+    fun simple2(x: &mut u64, y: &mut u64) {
+        *y = *x;
+        spec {
+            assert x == y;
+        };
+    }
+
+    // This function verifies.
+    fun simple3(x: &mut u64, y: &mut u64) {
+        *y = *x;
+        spec {
+            assert x == y;
+        };
+        *y = *y + 1;
+        spec {
+            assert x + 1 == y;
+        }
+    }
+
+    // This function verifies.
+    fun simple4(x: &mut u64, y: &mut u64) {
+        let z;
+        *y = *x;
+        z = *x + *y;
+        let vx = *x;
+        let vy = *y;
+        let fx = freeze(x);
+        let fy = freeze(y);
+        spec {
+            assert fx == fy;
+            assert vx == vy;
+            assert z == 2*x;
+        };
+        _ = fy; // release fy
+        *y = *y + 1;
+        spec {
+            assert x + 1 == y;
+            assert z + 1 == x + y;
+        }
+    }
+
+    // This function verifies.
+    fun simple5(n: u64): u64 {
+        let x = 0;
+
+        loop {
+            spec {
+                invariant x <= n;
+            };
+            if (!(x < n)) break;
+            x = x + 1;
+        };
+        spec {
+            assert x == n;
+        };
+        x
+    }
+    spec simple5 {
+        ensures result == n;
+    }
+
+    // This function verifies.
+    fun simple6(n: u64): u64 {
+        let x = 0;
+
+        while ({
+            spec {
+                invariant x <= n;
+            };
+            (x < n)
+        }) {
+            x = x + 1;
+        };
+        spec {
+            assert x == n;
+        };
+        x
+    }
+    spec simple6 {
+        ensures result == n;
+    }
+
+    // This function verifies.
+    fun simple7(x: &mut u64, y: u64): u64 {
+        let a = x;
+        let b = y;
+        let c = &mut b;
+        *c = *a;
+        *a = y;
+        spec {
+            assert a == y;
+            assert x == y;
+            assert c == old(x);
+            // NOTE: cannot verify the following, write-back not propagated yet
+            // assert b == old(x);
+        };
+        let _ = c;
+        b
+    }
+    spec simple7 {
+        ensures x == y && result == old(x);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.exp b/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.exp
new file mode 100644
index 000000000..d1ef04443
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.exp
@@ -0,0 +1,31 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/strong_edges.move:54:9
+   │
+54 │         ensures global<S>(addr).x == 3;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/strong_edges.move:47: glob_and_field_edges_incorrect
+   =     at tests/sources/functional/strong_edges.move:56: glob_and_field_edges_incorrect (spec)
+   =     at tests/sources/functional/strong_edges.move:47: glob_and_field_edges_incorrect
+   =         addr = <redacted>
+   =     at tests/sources/functional/strong_edges.move:48: glob_and_field_edges_incorrect
+   =         s#1#0 = <redacted>
+   =     at tests/sources/functional/strong_edges.move:49: glob_and_field_edges_incorrect
+   =     at tests/sources/functional/strong_edges.move:50: glob_and_field_edges_incorrect
+   =     at tests/sources/functional/strong_edges.move:55: glob_and_field_edges_incorrect (spec)
+   =     at tests/sources/functional/strong_edges.move:54: glob_and_field_edges_incorrect (spec)
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/strong_edges.move:64:13
+   │
+64 │             assert r == 5;
+   │             ^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/strong_edges.move:60: loc__edge_incorrect
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/strong_edges.move:61: loc__edge_incorrect
+   =         r_ref#1#0 = <redacted>
+   =     at tests/sources/functional/strong_edges.move:62: loc__edge_incorrect
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/strong_edges.move:64: loc__edge_incorrect
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.move b/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.move
new file mode 100644
index 000000000..25697b806
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/strong_edges.move
@@ -0,0 +1,67 @@
+// This file consists of a series of test cases which are client functions
+// using the standard vector module.
+module 0x42::TestStrongEdges {
+    use std::vector;
+
+    spec module {
+        pragma verify = true;
+    }
+
+    struct S has key {
+        x: u64
+    }
+
+    public fun glob_and_field_edges(addr: address) acquires S {
+        let s = borrow_global_mut<S>(addr);
+        s.x = 2;
+    }
+
+    spec glob_and_field_edges{
+        pragma opaque = true;
+        ensures global<S>(addr).x == 2;
+        aborts_if !exists<S>(addr);
+        modifies global<S>(addr);
+    }
+
+    fun loc_edge() {
+        let r = 5;
+        let r_ref = &mut r;
+        *r_ref = 6;
+        spec {
+            assert r == 6;
+        };
+    }
+
+    fun vec_edge(v: &mut vector<u64>) : u64
+    {
+        let x = *vector::borrow(v, 0);
+        *vector::borrow_mut(v, 0) = 7;
+        x
+    }
+    spec vec_edge {
+        aborts_if len(v) == 0;
+        ensures v[0] == 7;
+        ensures v[1] == old(v[1]);
+    }
+
+    public fun glob_and_field_edges_incorrect(addr: address) acquires S {
+        let s = borrow_global_mut<S>(addr);
+        s.x = 2;
+    }
+
+    spec glob_and_field_edges_incorrect{
+        pragma opaque = true;
+        ensures global<S>(addr).x == 3;
+        aborts_if !exists<S>(addr);
+        modifies global<S>(addr);
+    }
+
+    fun loc__edge_incorrect() {
+        let r = 5;
+        let r_ref = &mut r;
+        *r_ref = 6;
+        spec {
+            assert r == 5;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/table_contais_to_length.move b/vendors/move/crates/move-prover/tests/sources/functional/table_contais_to_length.move
new file mode 100644
index 000000000..9373cfe2a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/table_contais_to_length.move
@@ -0,0 +1,9 @@
+module 0x42::table_contains_to_length {
+    use extensions::table;
+
+    fun test(_t: &mut table::Table<address, u64>, _k: address) {}
+    spec test {
+        ensures table::spec_contains(old(_t), _k) ==> table::spec_len(old(_t)) > 0;
+        ensures table::spec_contains(old(_t), _k) ==> table::spec_len(_t) > 0;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/test_multi_let_bindings_in_spec.move b/vendors/move/crates/move-prover/tests/sources/functional/test_multi_let_bindings_in_spec.move
new file mode 100644
index 000000000..f94f417c4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/test_multi_let_bindings_in_spec.move
@@ -0,0 +1,22 @@
+module 0x2::Test {
+    fun do_nothing(): bool {
+        false
+    }
+
+    spec do_nothing {
+        ensures result == multi_foo(true, false);
+        ensures result == single_foo(false);
+    }
+
+    spec fun multi_foo(x: bool, y: bool): bool {
+        let a = x;
+        let b = y;
+        a && b
+    }
+
+    spec fun single_foo(x: bool): bool {
+        let a = x;
+        a
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/trace.cvc5_exp b/vendors/move/crates/move-prover/tests/sources/functional/trace.cvc5_exp
new file mode 100644
index 000000000..a4c6a0d74
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/trace.cvc5_exp
@@ -0,0 +1,85 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:19:9
+   │
+19 │         ensures result == a + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         result = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:15: add_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:16: add_invalid
+   =         result = <redacted>
+   =     at tests/sources/functional/trace.move:17: add_invalid
+   =     at tests/sources/functional/trace.move:19: add_invalid (spec)
+   =         `ensures result == a + b;` = <redacted>
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/trace.move:38:5
+   │
+38 │     invariant forall addr: address: exists<R>(addr) ==> global<R>(addr).x < 5;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Global Memory:
+   =         Resource name: TestTracing_R
+   =         Values:  {Address(0): <redacted>, Default: empty}
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =         `let addr = signer::address_of(s);` = <redacted>
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:34:9
+   │
+34 │         ensures exists<R>(addr) ==> global<R>(addr).x == x;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Global Memory:
+   =         Resource name: TestTracing_R
+   =         Values:  {Address(0): <redacted>, Default: empty}
+   = Related Bindings:
+   =         addr = <redacted>
+   =         exists<R>(addr) = <redacted>
+   =         global<R>(addr) = <redacted>
+   =         x = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =         `let addr = signer::address_of(s);` = <redacted>
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+   =     at tests/sources/functional/trace.move:31: publish_invalid
+   =     at tests/sources/functional/trace.move:34: publish_invalid (spec)
+   =         `ensures exists<R>(addr) ==> global<R>(addr).x == x;` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:26:9
+   │
+26 │         ensures a == old(a) + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         old(a) = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:22: update_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:23: update_invalid
+   =         a = <redacted>
+   =     at tests/sources/functional/trace.move:24: update_invalid
+   =     at tests/sources/functional/trace.move:26: update_invalid (spec)
+   =         `ensures a == old(a) + b;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/trace.exp b/vendors/move/crates/move-prover/tests/sources/functional/trace.exp
new file mode 100644
index 000000000..8e1a738de
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/trace.exp
@@ -0,0 +1,85 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:19:9
+   │
+19 │         ensures result == a + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         result = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:15: add_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:16: add_invalid
+   =         result = <redacted>
+   =     at tests/sources/functional/trace.move:17: add_invalid
+   =     at tests/sources/functional/trace.move:19: add_invalid (spec)
+   =         `ensures result == a + b;` = <redacted>
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/trace.move:38:5
+   │
+38 │     invariant forall addr: address: exists<R>(addr) ==> global<R>(addr).x < 5;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Global Memory:
+   =         Resource name: TestTracing_R
+   =         Values:  {Address(0): <redacted>, Default: empty}
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =         `let addr = signer::address_of(s);` = <redacted>
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:34:9
+   │
+34 │         ensures exists<R>(addr) ==> global<R>(addr).x == x;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Global Memory:
+   =         Resource name: TestTracing_R
+   =         Values:  {Address(18467): <redacted>, Default: empty}
+   = Related Bindings:
+   =         addr = <redacted>
+   =         exists<R>(addr) = <redacted>
+   =         global<R>(addr) = <redacted>
+   =         x = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =         `let addr = signer::address_of(s);` = <redacted>
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+   =     at tests/sources/functional/trace.move:31: publish_invalid
+   =     at tests/sources/functional/trace.move:34: publish_invalid (spec)
+   =         `ensures exists<R>(addr) ==> global<R>(addr).x == x;` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:26:9
+   │
+26 │         ensures a == old(a) + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         old(a) = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:22: update_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:23: update_invalid
+   =         a = <redacted>
+   =     at tests/sources/functional/trace.move:24: update_invalid
+   =     at tests/sources/functional/trace.move:26: update_invalid (spec)
+   =         `ensures a == old(a) + b;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/trace.move b/vendors/move/crates/move-prover/tests/sources/functional/trace.move
new file mode 100644
index 000000000..f34874d3a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/trace.move
@@ -0,0 +1,39 @@
+// flag: --trace
+// separate_baseline: cvc5
+// separate_baseline: simplify
+module 0x42::TestTracing {
+    use std::signer;
+
+    spec module {
+        pragma verify = true;
+    }
+
+    struct R has key {
+        x: u64
+    }
+
+    fun add_invalid(a: u64, b: u64): u64 {
+        a + b -1
+    }
+    spec add_invalid {
+        ensures result == a + b;
+    }
+
+    fun update_invalid(a: &mut u64, b: u64) {
+        *a = *a + b - 1
+    }
+    spec update_invalid {
+        ensures a == old(a) + b;
+    }
+
+    fun publish_invalid(s: &signer, x: u64) {
+        move_to<R>(s, R{x: x - 1})
+    }
+    spec publish_invalid {
+        let addr = signer::address_of(s);
+        ensures exists<R>(addr) ==> global<R>(addr).x == x;
+    }
+
+    // Test whether auto trace on expressions in quantifiers does not trigger error
+    invariant forall addr: address: exists<R>(addr) ==> global<R>(addr).x < 5;
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/trace.simplify_exp b/vendors/move/crates/move-prover/tests/sources/functional/trace.simplify_exp
new file mode 100644
index 000000000..0751f6c16
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/trace.simplify_exp
@@ -0,0 +1,80 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:19:9
+   │
+19 │         ensures result == a + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         result = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:15: add_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:16: add_invalid
+   =         result = <redacted>
+   =     at tests/sources/functional/trace.move:17: add_invalid
+   =     at tests/sources/functional/trace.move:19: add_invalid (spec)
+   =         `ensures result == a + b;` = <redacted>
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/trace.move:38:5
+   │
+38 │     invariant forall addr: address: exists<R>(addr) ==> global<R>(addr).x < 5;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:34:9
+   │
+34 │         ensures exists<R>(addr) ==> global<R>(addr).x == x;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Global Memory:
+   =         Resource name: TestTracing_R
+   =         Values:  {Address(6334): <redacted>, Default: empty}
+   = Related Bindings:
+   =         exists<R>(addr) = <redacted>
+   =         global<R>(addr) = <redacted>
+   =         x = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:29: publish_invalid
+   =         s = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/trace.move:30: publish_invalid
+   =     at tests/sources/functional/trace.move:38
+   =     at tests/sources/functional/trace.move:31: publish_invalid
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =     at ../move-stdlib/sources/Signer.move:13: address_of
+   =     at tests/sources/functional/trace.move:34: publish_invalid (spec)
+   =     at tests/sources/functional/trace.move:33: publish_invalid (spec)
+   =     at ../move-stdlib/sources/Signer.move:13: address_of
+   =     at tests/sources/functional/trace.move:34: publish_invalid (spec)
+   =         `ensures exists<R>(addr) ==> global<R>(addr).x == x;` = <redacted>
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/trace.move:26:9
+   │
+26 │         ensures a == old(a) + b;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   = Related Bindings:
+   =         a = <redacted>
+   =         b = <redacted>
+   =         old(a) = <redacted>
+   = Execution Trace:
+   =     at tests/sources/functional/trace.move:22: update_invalid
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/trace.move:23: update_invalid
+   =         a = <redacted>
+   =     at tests/sources/functional/trace.move:24: update_invalid
+   =     at tests/sources/functional/trace.move:26: update_invalid (spec)
+   =         `ensures a == old(a) + b;` = <redacted>
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.exp b/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.exp
new file mode 100644
index 000000000..61a2d14c1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.exp
@@ -0,0 +1,88 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/type_dependent_code.move:10:5
+   │
+ 8 │           move_to<S<u8>>(&account, S { x: 0 });
+   │           ------- abort happened here with execution failure
+ 9 │       }
+10 │ ╭     spec test1 {
+11 │ │         aborts_if exists<S<X>>(signer::address_of(account));
+12 │ │         aborts_if exists<S<u8>>(signer::address_of(account));
+13 │ │
+   · │
+19 │ │         // abort condition.
+20 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/type_dependent_code.move:6: test1
+   =         account = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:7: test1
+   =     at tests/sources/functional/type_dependent_code.move:8: test1
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/type_dependent_code.move:26:5
+   │
+24 │           move_to<S<T2>>(&account, S { x: t2 });
+   │           ------- abort happened here with execution failure
+25 │       }
+26 │ ╭     spec test2 {
+27 │ │         aborts_if exists<S<T1>>(signer::address_of(account));
+28 │ │         aborts_if exists<S<T2>>(signer::address_of(account));
+29 │ │
+   · │
+35 │ │         // abort condition.
+36 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/type_dependent_code.move:22: test2
+   =         account = <redacted>
+   =         t1 = <redacted>
+   =         t2 = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:23: test2
+   =     at tests/sources/functional/type_dependent_code.move:24: test2
+   =         ABORTED
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/type_dependent_code.move:50:9
+   │
+50 │         ensures global<S<u8>>(signer::address_of(account)).x == 0;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/type_dependent_code.move:44: test1
+   =         account = <redacted>
+   =         x = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:45: test1
+   =     at tests/sources/functional/type_dependent_code.move:46: test1
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:47: test1
+   =     at tests/sources/functional/type_dependent_code.move:48: test1
+   =     at tests/sources/functional/type_dependent_code.move:50: test1 (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/type_dependent_code.move:66:9
+   │
+66 │         ensures global<S<T1>>(signer::address_of(account)).x == t1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/type_dependent_code.move:58: test2
+   =         account = <redacted>
+   =         t1 = <redacted>
+   =         t2 = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:61: test2
+   =     at tests/sources/functional/type_dependent_code.move:62: test2
+   =     at ../move-stdlib/sources/signer.move:12: address_of
+   =         s = <redacted>
+   =     at ../move-stdlib/sources/signer.move:13: address_of
+   =         result = <redacted>
+   =     at ../move-stdlib/sources/signer.move:14: address_of
+   =         r#1#0 = <redacted>
+   =     at tests/sources/functional/type_dependent_code.move:63: test2
+   =     at tests/sources/functional/type_dependent_code.move:64: test2
+   =     at tests/sources/functional/type_dependent_code.move:66: test2 (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.move b/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.move
new file mode 100644
index 000000000..412dc3f4b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/type_dependent_code.move
@@ -0,0 +1,82 @@
+module 0x42::M {
+    use std::signer;
+
+    struct S<X: store> has key { x: X }
+
+    public fun test1<X: store>(account: signer, x: X) {
+        move_to<S<X>>(&account, S { x });
+        move_to<S<u8>>(&account, S { x: 0 });
+    }
+    spec test1 {
+        aborts_if exists<S<X>>(signer::address_of(account));
+        aborts_if exists<S<u8>>(signer::address_of(account));
+
+        // NOTE: besides the above aborts_if conditions, this function
+        // also aborts if the type parameter `X` is instantiated with `u8`.
+        // This additional abort condition is not captured by the spec.
+        //
+        // TODO: currently we don't even have a way to specify this additional
+        // abort condition.
+    }
+
+    public fun test2<T1: store, T2: store>(account: signer, t1: T1, t2: T2) {
+        move_to<S<T1>>(&account, S { x: t1 });
+        move_to<S<T2>>(&account, S { x: t2 });
+    }
+    spec test2 {
+        aborts_if exists<S<T1>>(signer::address_of(account));
+        aborts_if exists<S<T2>>(signer::address_of(account));
+
+        // NOTE: besides the above aborts_if conditions, this function
+        // also aborts if type parameters `T1` and `T2` are the same.`
+        // This additional abort condition is not captured by the spec.
+        //
+        // TODO: currently we don't even have a way to specify this additional
+        // abort condition.
+    }
+}
+
+module 0x42::N {
+    use std::signer;
+
+    struct S<X: store + drop> has key { x: X }
+
+    public fun test1<X: store + drop>(account: signer, x: X) acquires S {
+        move_to<S<u8>>(&account, S { x: 0 });
+        let r = borrow_global_mut<S<X>>(signer::address_of(&account));
+        *&mut r.x = x;
+    }
+    spec test1 {
+        ensures global<S<u8>>(signer::address_of(account)).x == 0;
+
+        // NOTE: the `ensures` condition might not hold when `X == u8`.
+        //
+        // Similar to the test cases above, we also don't have a
+        // good way to specify these type equality conditions in spec.
+    }
+
+    public fun test2<T1: store + drop, T2: store + drop>(
+        account: signer, t1: T1, t2: T2
+    ) acquires S {
+        move_to<S<T1>>(&account, S { x: t1 });
+        let r = borrow_global_mut<S<T2>>(signer::address_of(&account));
+        *&mut r.x = t2;
+    }
+    spec test2 {
+        ensures global<S<T1>>(signer::address_of(account)).x == t1;
+
+        // NOTE: the `ensures` condition might not hold when `T1 == T2`.
+        //
+        // Similar to the test cases above, we also don't have a
+        // good way to specify these type equality conditions in spec.
+        //
+        // Further note that in the exp files, we see two error messages
+        // on that this `ensures` condition is violated. This is expected.
+        // If we take a look at the Boogie output, we will notice three
+        // verification targets generated:
+        // - test2<#0, #1>
+        // - test2<#0, #0>
+        // - test2<#1. #1>
+        // The `ensures` condition does not hold in the later two cases.
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.exp b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.exp
new file mode 100644
index 000000000..ecd371394
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.exp
@@ -0,0 +1,15 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/type_reflection.move:86:5
+   │
+84 │           type_info::type_of<T>()
+   │           ----------------------- abort happened here with execution failure
+85 │       }
+86 │ ╭     spec test_type_info_can_abort {
+87 │ │         // this should not pass
+88 │ │         aborts_if false;
+89 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/type_reflection.move:84: test_type_info_can_abort
+   =         ABORTED
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.move b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.move
new file mode 100644
index 000000000..2e0ba200d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection.move
@@ -0,0 +1,136 @@
+module extensions::type_info {
+    use std::string;
+
+    struct TypeInfo has copy, drop, store {
+        account_address: address,
+        module_name: vector<u8>,
+        struct_name: vector<u8>,
+    }
+
+    // these are mocks of the type reflection scheme
+    public native fun type_of<T>(): TypeInfo;
+    public native fun type_name<T>(): string::String;
+    spec native fun spec_is_struct<T>(): bool;
+
+    public fun account_address(type_info: &TypeInfo): address {
+        type_info.account_address
+    }
+
+    public fun module_name(type_info: &TypeInfo): vector<u8> {
+        type_info.module_name
+    }
+
+    public fun struct_name(type_info: &TypeInfo): vector<u8> {
+        type_info.struct_name
+    }
+}
+
+module 0x42::test {
+    use extensions::type_info;
+    use std::string;
+
+    struct MyTable<phantom K, phantom V> {}
+
+    fun test_type_name_concrete(): string::String {
+        spec {
+            assert type_info::type_name<bool>().bytes == b"bool";
+        };
+        type_info::type_name<MyTable<vector<bool>, address>>()
+    }
+    spec test_type_name_concrete {
+        ensures result.bytes == b"0x42::test::MyTable<vector<bool>, address>";
+    }
+
+    fun test_type_info_concrete(): type_info::TypeInfo {
+        spec {
+            assert type_info::type_of<MyTable<address, u128>>().account_address == @0x42;
+            assert type_info::type_of<MyTable<address, u128>>().module_name == b"test";
+            assert type_info::type_of<MyTable<address, u128>>().struct_name == b"MyTable";
+        };
+        type_info::type_of<MyTable<vector<bool>, address>>()
+    }
+    spec test_type_info_concrete {
+        ensures result.account_address == @0x42;
+        ensures result.module_name == b"test";
+        ensures result.struct_name == b"MyTable";
+    }
+
+    fun test_type_info_symbolic<T>(): type_info::TypeInfo {
+        spec {
+            assert type_info::type_of<T>().account_address == type_info::type_of<T>().account_address;
+            assert type_info::type_of<T>().module_name == type_info::type_of<T>().module_name;
+            assert type_info::type_of<T>().struct_name == type_info::type_of<T>().struct_name;
+        };
+        let info = type_info::type_of<T>();
+        assert!(type_info::account_address(&info) == @0x42, 1);
+        assert!(type_info::module_name(&info) == b"test", 2);
+        assert!(type_info::struct_name(&info) == b"MyTable", 2);
+        info
+    }
+    spec test_type_info_symbolic {
+        ensures result.account_address == @0x42;
+        ensures result.module_name == b"test";
+        ensures result.struct_name == b"MyTable";
+    }
+
+    fun test_type_info_ignores_type_param<T>(): type_info::TypeInfo {
+        type_info::type_of<MyTable<T, address>>()
+    }
+    spec test_type_info_ignores_type_param {
+        ensures result == type_info::type_of<MyTable<address, T>>();
+    }
+
+    fun test_type_info_can_abort<T>(): type_info::TypeInfo {
+        type_info::type_of<T>()
+    }
+    spec test_type_info_can_abort {
+        // this should not pass
+        aborts_if false;
+    }
+
+    fun test_type_info_aborts_if_partial<T>(): (type_info::TypeInfo, string::String) {
+        (type_info::type_of<T>(), type_info::type_name<T>())
+    }
+    spec test_type_info_aborts_if_partial {
+        pragma aborts_if_is_partial = true;
+        aborts_if type_info::type_name<T>().bytes == b"bool";
+        aborts_if type_info::type_name<T>().bytes == b"u64";
+        aborts_if type_info::type_name<T>().bytes == b"signer";
+        aborts_if type_info::type_name<T>().bytes == b"vector<address>";
+    }
+
+    fun test_type_info_aborts_if_full<T>(): (type_info::TypeInfo, string::String) {
+        (type_info::type_of<T>(), type_info::type_name<T>())
+    }
+    spec test_type_info_aborts_if_full {
+        aborts_if !type_info::spec_is_struct<T>();
+    }
+}
+
+module 0x43::test {
+    use std::ascii;
+    use std::type_name;
+
+    struct Pair<phantom K, phantom V> {}
+
+    fun test_type_name_concrete_simple(): ascii::String {
+        type_name::into_string(type_name::get<bool>())
+    }
+    spec test_type_name_concrete_simple {
+        ensures result.bytes == b"bool";
+    }
+
+    fun test_type_name_concrete_vector(): ascii::String {
+        type_name::into_string(type_name::get<vector<vector<u8>>>())
+    }
+    spec test_type_name_concrete_vector {
+        ensures result.bytes == b"vector<vector<u8>>";
+    }
+
+    fun test_type_name_concrete_struct(): ascii::String {
+        type_name::into_string(type_name::get<Pair<address, bool>>())
+    }
+    spec test_type_name_concrete_struct {
+        ensures result.bytes == b"00000000000000000000000000000043::test::Pair<address, bool>";
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/type_reflection_ext.move b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection_ext.move
new file mode 100644
index 000000000..8250f8ed6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/type_reflection_ext.move
@@ -0,0 +1,36 @@
+// flag: --vector-theory=SmtArrayExt
+module extensions::type_info {
+    use std::string;
+
+    // these are mocks of the type reflection scheme
+    public native fun type_name<T>(): string::String;
+}
+
+module 0x42::test {
+    use extensions::type_info;
+    use std::string;
+
+    struct MyTable<phantom K, phantom V> {}
+
+    fun test_type_name_symbolic<T>(): string::String {
+        type_info::type_name<MyTable<T, T>>()
+    }
+    spec test_type_name_symbolic {
+        ensures result.bytes != b"vector<bool>";
+        ensures result != type_info::type_name<vector<T>>();
+    }
+}
+
+module 0x43::test {
+    use std::type_name;
+
+    struct Pair<phantom K, phantom V> {}
+
+    fun test_type_name_symbolic<T>(): type_name::TypeName {
+        type_name::get<Pair<T, T>>()
+    }
+    spec test_type_name_symbolic {
+        ensures result.name.bytes != b"vector<bool>";
+        ensures result != type_name::get<vector<T>>();
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/uninst_global_invariant.exp b/vendors/move/crates/move-prover/tests/sources/functional/uninst_global_invariant.exp
new file mode 100644
index 000000000..2c7ed9979
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/uninst_global_invariant.exp
@@ -0,0 +1,11 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/functional/uninst_global_invariant.move:33:9
+   │
+33 │         invariant<T> exists<S2<T>>(@0x42) ==> exists<S1>(@0x42);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/uninst_global_invariant.move:11: test2
+   =         account = <redacted>
+   =     at tests/sources/functional/uninst_global_invariant.move:12: test2
+   =     at tests/sources/functional/uninst_global_invariant.move:33
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.exp b/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.exp
new file mode 100644
index 000000000..30951e414
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.exp
@@ -0,0 +1,29 @@
+warning: Global invariant is not checked anywhere in the code
+   ┌─ tests/sources/functional/unused_global_invariant.move:41:9
+   │
+41 │         invariant exists<R0>(@0x2) ==> exists<R0>(@0x3);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Global invariant is not checked anywhere in the code
+   ┌─ tests/sources/functional/unused_global_invariant.move:46:9
+   │
+46 │         invariant exists<R1<u64>>(@0x2) ==> exists<R1<u64>>(@0x3);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Global invariant is not checked anywhere in the code
+   ┌─ tests/sources/functional/unused_global_invariant.move:51:9
+   │
+51 │         invariant [suspendable] exists<R2>(@0x2) ==> exists<R2>(@0x3);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Global invariant is not checked anywhere in the code
+   ┌─ tests/sources/functional/unused_global_invariant.move:57:9
+   │
+57 │         invariant [suspendable] exists<R3<u64>>(@0x2) ==> exists<R3<u64>>(@0x3);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+warning: Global invariant is not checked anywhere in the code
+   ┌─ tests/sources/functional/unused_global_invariant.move:63:9
+   │
+63 │         invariant exists<R4>(@0x2) ==> exists<R4>(@0x3);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.move b/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.move
new file mode 100644
index 000000000..2df2d7726
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/unused_global_invariant.move
@@ -0,0 +1,65 @@
+module 0x42::UnusedGlobalInvariant {
+    struct R0 has key {}
+    struct R1<T: store> has key { t: T }
+    struct R2 has key {}
+    struct R3<T: store> has key { t: T }
+    struct R4 has key {}
+
+    fun publish_r1_bool(s: signer) {
+        let r = R1 { t: true };
+        move_to(&s, r);
+    }
+
+    fun publish_r2(s: signer) {
+        let r = R2 {};
+        move_to(&s, r);
+    }
+    spec publish_r2 {
+        pragma delegate_invariants_to_caller;
+    }
+
+    fun publish_r3<T: store>(s: signer, t: T) {
+        let r = R3 { t };
+        move_to(&s, r);
+    }
+    spec publish_r3 {
+        pragma delegate_invariants_to_caller;
+    }
+    fun call_publish_r3(s: signer) {
+        publish_r3(s, true);
+    }
+
+    fun check_r4() {
+        if (exists<R4>(@0x2)) {
+            abort 42
+        }
+    }
+
+    spec module {
+        // This invariant is not checked anywhere in the code.
+        // Because no function talks about R0
+        invariant exists<R0>(@0x2) ==> exists<R0>(@0x3);
+
+        // This invariant is not checked anywhere in the code.
+        // Although publish_r1_bool modifies R1, it modifies R1<bool> and this
+        // invariant is about R1<u64>
+        invariant exists<R1<u64>>(@0x2) ==> exists<R1<u64>>(@0x3);
+
+        // This invariant is not checked anywhere in the code.
+        // Although publish_r2 modifies R2, it delegates the invariant to caller
+        // and there is no caller to accept this invariant.
+        invariant [suspendable] exists<R2>(@0x2) ==> exists<R2>(@0x3);
+
+        // This invariant is not checked anywhere in the code.
+        // Although publish_r3 modifies R3<T> it delegates the invariant to
+        // caller, which is call_publish_r3, but call_publish_r3 modifies
+        // R3<bool> and this invariant is about R3<u64>.
+        invariant [suspendable] exists<R3<u64>>(@0x2) ==> exists<R3<u64>>(@0x3);
+
+        // This invariant is not checked anywhere in the code.
+        // Although check_r4 mentioned R4, there is no write operation that is
+        // associated with R4. This invariant can be assumed in the beginning
+        // of the function, but is never checked.
+        invariant exists<R4>(@0x2) ==> exists<R4>(@0x3);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.exp b/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.exp
new file mode 100644
index 000000000..ad59d3ec6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.exp
@@ -0,0 +1,9 @@
+note: unused schema TestUnusedSchema::AddsThree
+   ┌─ tests/sources/functional/unused_schema.move:22:5
+   │
+22 │ ╭     spec schema AddsThree {
+23 │ │         i: num;
+24 │ │         result: num;
+25 │ │         ensures result == i + 3;
+26 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.move b/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.move
new file mode 100644
index 000000000..f4173183a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/unused_schema.move
@@ -0,0 +1,41 @@
+// flag: --severity=note
+module 0x42::TestUnusedSchema {
+
+    spec module {
+        pragma verify = true;
+    }
+
+    spec schema AddsOne {
+        i: num;
+        result: num;
+        ensures result >= i + 1;
+    }
+
+    spec schema AddsTwo {
+        i: num;
+        result: num;
+        ensures result == i + 2;
+        include AddsOne;
+    }
+
+    // AddsThree is the only unused schema
+    spec schema AddsThree {
+        i: num;
+        result: num;
+        ensures result == i + 3;
+    }
+
+    spec schema UNUSED_AddsFour {
+        i: num;
+        result: num;
+        ensures result == i + 4;
+    }
+
+    fun foo(i: u64): u64 {
+        if (i > 10) { i + 2 } else { i + 1 }
+    }
+
+    spec foo {
+        include i > 10 ==> AddsTwo;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_bcs.move b/vendors/move/crates/move-prover/tests/sources/functional/verify_bcs.move
new file mode 100644
index 000000000..ae5d7985c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_bcs.move
@@ -0,0 +1,13 @@
+// This file is created to verify the native function in the standard BCS module.
+module 0x42::VerifyBCS {
+    use std::bcs;
+
+
+    public fun verify_to_bytes<MoveValue>(v: &MoveValue): vector<u8>
+    {
+        bcs::to_bytes(v)
+    }
+    spec verify_to_bytes {
+        ensures result == bcs::serialize(v);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.exp b/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.exp
new file mode 100644
index 000000000..43206e4b1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.exp
@@ -0,0 +1,88 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:249:9
+    │
+249 │         ensures spec_get(result.t, k1) == 23;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:245: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:246: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:242: add_R_fail
+    =     at tests/sources/functional/verify_custom_table.move:223: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:224: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:225: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:226: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:227: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:243: add_R_fail
+    =     at tests/sources/functional/verify_custom_table.move:247: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:248: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:249: add_R_fail (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/verify_custom_table.move:74:9
+   │
+74 │         ensures spec_get(result, 1) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/verify_custom_table.move:67: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:68: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:69: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:70: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:71: add_fail
+   =         result = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:72: add_fail
+   =     at tests/sources/functional/verify_custom_table.move:74: add_fail (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:199:9
+    │
+199 │         ensures result == spec_new();
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:194: create_and_insert_fail1
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:195: create_and_insert_fail1
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:196: create_and_insert_fail1
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:197: create_and_insert_fail1
+    =     at tests/sources/functional/verify_custom_table.move:199: create_and_insert_fail1 (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:208:9
+    │
+208 │         ensures result == spec_set(spec_new(), 1, 2);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:203: create_and_insert_fail2
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:204: create_and_insert_fail2
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:205: create_and_insert_fail2
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:206: create_and_insert_fail2
+    =     at tests/sources/functional/verify_custom_table.move:208: create_and_insert_fail2 (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:190:9
+    │
+190 │         ensures result == spec_set(spec_new(), 1, 2);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:182: create_and_insert_fail_due_to_typed_key_encoding
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:183: create_and_insert_fail_due_to_typed_key_encoding
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:184: create_and_insert_fail_due_to_typed_key_encoding
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:185: create_and_insert_fail_due_to_typed_key_encoding
+    =     at tests/sources/functional/verify_custom_table.move:190: create_and_insert_fail_due_to_typed_key_encoding (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.move b/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.move
new file mode 100644
index 000000000..324e3fddc
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_custom_table.move
@@ -0,0 +1,266 @@
+// Similar to `verify_table.move`, but against a custom implementation.
+module 0x42::table {
+    struct Table<phantom K: copy + drop, phantom V> has store {}
+    spec Table {
+        pragma intrinsic = map,
+        map_new = new,
+        map_destroy_empty = destroy_empty,
+        map_len = length,
+        map_is_empty = empty,
+        map_has_key = contains,
+        map_add_no_override = add,
+        map_add_override_if_exists = upsert,
+        map_del_must_exist = remove,
+        map_del_return_key = remove_return_key,
+        map_borrow = borrow,
+        map_borrow_mut = borrow_mut,
+        map_spec_new = spec_new,
+        map_spec_get = spec_get,
+        map_spec_set = spec_set,
+        map_spec_del = spec_remove,
+        map_spec_len = spec_len,
+        map_spec_has_key = spec_contains;
+    }
+
+    public native fun new<K: copy + drop, V: store>(): Table<K, V>;
+    public native fun destroy_empty<K: copy + drop, V>(table: Table<K, V>);
+    public native fun add<K: copy + drop, V>(table: &mut Table<K, V>, key: K, val: V);
+    public native fun upsert<K: copy + drop, V>(table: &mut Table<K, V>, key: K, val: V);
+    public native fun borrow<K: copy + drop, V>(table: &Table<K, V>, key: K): &V;
+    public native fun borrow_mut<K: copy + drop, V>(table: &mut Table<K, V>, key: K): &mut V;
+    public native fun length<K: copy + drop, V>(table: &Table<K, V>): u64;
+    public native fun empty<K: copy + drop, V>(table: &Table<K, V>): bool;
+    public native fun remove<K: copy + drop, V>(table: &mut Table<K, V>, key: K): V;
+    public native fun remove_return_key<K: copy + drop, V>(table: &mut Table<K, V>, key: K): (K, V);
+    public native fun contains<K: copy + drop, V>(table: &Table<K, V>, key: K): bool;
+
+    spec native fun spec_new<K, V>(): Table<K, V>;
+    spec native fun spec_len<K, V>(t: Table<K, V>): num;
+    spec native fun spec_contains<K, V>(t: Table<K, V>, k: K): bool;
+    spec native fun spec_set<K, V>(t: Table<K, V>, k: K, v: V): Table<K, V>;
+    spec native fun spec_remove<K, V>(t: Table<K, V>, k: K): Table<K, V>;
+    spec native fun spec_get<K, V>(t: Table<K, V>, k: K): V;
+}
+
+module 0x42::VerifyTable {
+    use 0x42::table::{Self, Table};
+    use 0x42::table::{spec_new, spec_get, spec_set, spec_len, spec_contains};
+
+    // TODO: test precise aborts behavior of all table functions
+
+    fun add(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add {
+        ensures spec_contains(result, 1) && spec_contains(result, 2) && spec_contains(result, 3);
+        ensures spec_len(result) == 3;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 2) == 3;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun add_fail(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add_fail {
+        ensures spec_get(result, 1) == 1;
+    }
+
+    fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
+        t
+    }
+    spec add_fail_exists {
+        aborts_if k1 == k2;
+    }
+
+    fun add_override_if_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::upsert(&mut t, k2, 3);
+        t
+    }
+    spec add_override_if_exists {
+        aborts_if false;
+        ensures spec_get(result, k2) == 3;
+        ensures (k1 != k2) ==> spec_get(result, k1) == 2;
+    }
+
+    fun remove(): Table<u8, u64> {
+        let t = add();
+        table::remove(&mut t, 2);
+        t
+    }
+    spec remove {
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun remove_return_key(): Table<u8, u64> {
+        let t = add();
+        let (k, v) = table::remove_return_key(&mut t, 2);
+        spec {
+            assert (k == 2) && (v == 3);
+        };
+        t
+    }
+    spec remove_return_key {
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
+    }
+    spec contains_and_length {
+        ensures result_1 == true;
+        ensures result_2 == false;
+        ensures result_3 == 2;
+    }
+
+    fun borrow(): (u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
+        (*r, t)
+    }
+    spec borrow {
+        ensures result_1 == 2;
+        ensures spec_len(result_2) == 1;
+        ensures spec_get(result_2, 1) == 2;
+    }
+
+    fun borrow_mut(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
+        *r = 4;
+        t
+    }
+    spec borrow_mut {
+        ensures spec_contains(result, 1) && spec_contains(result, 2);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 4;
+        ensures spec_get(result, 2) == 3;
+    }
+
+    fun create_empty(): Table<u8, u64> {
+        table::new()
+    }
+    spec create_empty {
+        ensures result == spec_new();
+    }
+
+    fun create_and_insert(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        t
+    }
+    spec create_and_insert {
+        ensures result == spec_set<u8, u64>(spec_new(), 1, 2);
+    }
+
+    fun create_and_insert_fail_due_to_typed_key_encoding(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        t
+    }
+    spec create_and_insert_fail_due_to_typed_key_encoding {
+        // TODO: this will fail potentially due to an error in type inference.
+        // `spec_set` should receive a type parameter of `<u8, u64>`, (see the
+        // example above) but the derived type is `<u256, u256>`.
+        ensures result == spec_set(spec_new(), 1, 2);
+    }
+
+    fun create_and_insert_fail1(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 1);
+        t
+    }
+    spec create_and_insert_fail1 {
+        ensures result == spec_new();
+    }
+
+    fun create_and_insert_fail2(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 1);
+        t
+    }
+    spec create_and_insert_fail2 {
+        ensures result == spec_set(spec_new(), 1, 2);
+    }
+
+    // ====================================================================================================
+    // Tables with structured keys
+
+    struct Key has copy, drop {
+        v: vector<u8>       // Use a vector so we do not have extensional equality
+    }
+
+    struct R {
+        t: Table<Key, u64>
+    }
+
+    fun make_R(): R {
+        let t = table::new<Key, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        R{t}
+    }
+
+    fun add_R(): R {
+        make_R()
+    }
+    spec add_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 22;
+        ensures spec_get(result.t, k2) == 23;
+    }
+
+    fun add_R_fail(): R {
+        make_R()
+    }
+    spec add_R_fail {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 23;
+        ensures spec_get(result.t, k2) == 22;
+    }
+
+    fun borrow_mut_R(): R {
+        let r = make_R();
+        let x = table::borrow_mut(&mut r.t, Key{v: vector[1, 2]});
+        *x = *x * 2;
+        r
+    }
+    spec borrow_mut_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_get(result.t, k1) == 44;
+        ensures spec_get(result.t, k2) == 23;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_sort.move b/vendors/move/crates/move-prover/tests/sources/functional/verify_sort.move
new file mode 100644
index 000000000..39f63c9be
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_sort.move
@@ -0,0 +1,80 @@
+// exclude_for: cvc5
+module 0x42::VerifySort {
+	use 0x1::vector;
+
+	public fun verify_sort(v: &mut vector<u64>) {
+		let vlen = vector::length(v);
+		spec {
+			assume vlen == 45;
+		};
+		if (vlen <= 1) return ();
+
+		let i = 0;
+		let j = 1;
+		while
+		({
+			spec {
+				invariant vlen == len(v);
+				invariant i < j;
+				invariant j <= vlen;
+				invariant forall k in 0..i: v[k] <= v[k + 1];
+				// Invariant depends on whether i was just incremented or not
+				// v[i] is still in process, but previous indices are the minimum
+				// elements of the vector (they've already been compared with everything)
+				invariant i > 0 ==> (forall k in i..vlen: v[i-1] <= v[k]);
+				// v[i] has been swapped with everything up to v[j]
+				invariant forall k in i+1..j: v[i] <= v[k];
+				// j stays in bounds until loop exit
+				invariant i < vlen - 1 ==> j < vlen;
+			};
+			(i < vlen - 1)
+		})
+		{
+			if (*vector::borrow(v, i) > *vector::borrow(v, j)) {
+				vector::swap(v, i, j);
+			};
+
+			if (j < vlen - 1 ) {
+				j = j + 1;
+			} else {
+				i = i + 1;
+				j = i + 1;
+			};
+			// spec {
+			//     TRACE(i);
+			//     TRACE(j);
+			//     TRACE(v);
+			// }
+		};
+		spec {
+			assert len(v) == vlen;
+			assert i == vlen - 1;
+			assert j == vlen;
+			assert v[0] <= v[1];
+			assert v[vlen - 2] <= v[vlen - 1];
+		};
+	}
+	spec verify_sort {
+		pragma verify=false; // TODO: Disabled due to timeout in CI. It verifies in a local machine.
+		aborts_if false;
+		ensures forall i in 0..len(v)-1: v[i] <= v[i+1];
+	}
+
+	// Assume that `v` only contains 0 or 1.
+	public fun two_way_sort(v: &mut vector<u64>) {
+		let _vlen = vector::length(v);
+		// TODO: complete the function.
+	}
+	spec two_way_sort {
+		// TODO: complete the spec.
+	}
+
+	// Assume that `v` only contains 0, 1 or 2.
+	public fun three_way_sort(v: &mut vector<u64>) {
+		let _vlen = vector::length(v);
+		// TODO: complete the function.
+	}
+	spec three_way_sort {
+		// TODO: complete the spec.
+	}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_table.exp b/vendors/move/crates/move-prover/tests/sources/functional/verify_table.exp
new file mode 100644
index 000000000..a5e42e8ec
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_table.exp
@@ -0,0 +1,43 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_table.move:133:9
+    │
+133 │         ensures spec_get(result.t, k1) == 23;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_table.move:129: add_R_fail (spec)
+    =     at tests/sources/functional/verify_table.move:130: add_R_fail (spec)
+    =     at tests/sources/functional/verify_table.move:126: add_R_fail
+    =     at tests/sources/functional/verify_table.move:107: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_table.move:108: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_table.move:109: make_R
+    =         t#1#0 = <redacted>
+    =     at tests/sources/functional/verify_table.move:110: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_table.move:111: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_table.move:127: add_R_fail
+    =     at tests/sources/functional/verify_table.move:131: add_R_fail (spec)
+    =     at tests/sources/functional/verify_table.move:132: add_R_fail (spec)
+    =     at tests/sources/functional/verify_table.move:133: add_R_fail (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/verify_table.move:31:9
+   │
+31 │         ensures spec_get(result, 1) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/verify_table.move:24: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_table.move:25: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_table.move:26: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_table.move:27: add_fail
+   =         t#1#0 = <redacted>
+   =     at tests/sources/functional/verify_table.move:28: add_fail
+   =         result = <redacted>
+   =     at tests/sources/functional/verify_table.move:29: add_fail
+   =     at tests/sources/functional/verify_table.move:31: add_fail (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_table.move b/vendors/move/crates/move-prover/tests/sources/functional/verify_table.move
new file mode 100644
index 000000000..d7df2106f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_table.move
@@ -0,0 +1,150 @@
+// This file verifies the intrinsic Table implementation.
+module 0x42::VerifyTable {
+    use extensions::table::{Self, Table};
+    use extensions::table::{spec_get, spec_len, spec_contains};
+
+    // TODO: test precise aborts behavior of all table functions
+
+    fun add(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add {
+        ensures spec_contains(result, 1) && spec_contains(result, 2) && spec_contains(result, 3);
+        ensures spec_len(result) == 3;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 2) == 3;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun add_fail(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add_fail {
+        ensures spec_get(result, 1) == 1;
+    }
+
+    fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
+        t
+    }
+    spec add_fail_exists {
+        aborts_if k1 == k2;
+    }
+
+    fun remove(): Table<u8, u64> {
+        let t = add();
+        table::remove(&mut t, 2);
+        t
+    }
+    spec remove {
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
+    }
+    spec contains_and_length {
+        ensures result_1 == true;
+        ensures result_2 == false;
+        ensures result_3 == 2;
+    }
+
+    fun borrow(): (u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
+        (*r, t)
+    }
+    spec borrow {
+        ensures result_1 == 2;
+        ensures spec_len(result_2) == 1;
+        ensures spec_get(result_2, 1) == 2;
+    }
+
+    fun borrow_mut(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
+        *r = 4;
+        t
+    }
+    spec borrow_mut {
+        ensures spec_contains(result, 1) && spec_contains(result, 2);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 4;
+        ensures spec_get(result, 2) == 3;
+    }
+
+    // ====================================================================================================
+    // Tables with structured keys
+
+    struct Key has copy, drop {
+        v: vector<u8>       // Use a vector so we do not have extensional equality
+    }
+
+    struct R {
+        t: Table<Key, u64>
+    }
+
+    fun make_R(): R {
+        let t = table::new<Key, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        R{t}
+    }
+
+    fun add_R(): R {
+        make_R()
+    }
+    spec add_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 22;
+        ensures spec_get(result.t, k2) == 23;
+    }
+
+    fun add_R_fail(): R {
+        make_R()
+    }
+    spec add_R_fail {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 23;
+        ensures spec_get(result.t, k2) == 22;
+    }
+
+    fun borrow_mut_R(): R {
+        let r = make_R();
+        let x = table::borrow_mut(&mut r.t, Key{v: vector[1, 2]});
+        *x = *x * 2;
+        r
+    }
+    spec borrow_mut_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_get(result.t, k1) == 44;
+        ensures spec_get(result.t, k2) == 23;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/functional/verify_vector.move b/vendors/move/crates/move-prover/tests/sources/functional/verify_vector.move
new file mode 100644
index 000000000..ce18e656c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/functional/verify_vector.move
@@ -0,0 +1,333 @@
+// This file is created to verify the vector module in the standard library.
+// This file is basically a clone of `stdlib/modules/vector.move` with renaming the module and function names.
+// In this file, the functions with prefix of `verify_model` are verifying the corresponding built-in Boogie
+// procedures that they inline (e.g., `verify_model_remove`).
+// This file also verifies the actual Move implementations of non-native functions (e.g., `verify_remove`).
+module 0x42::VerifyVector {
+    use std::vector;
+
+    fun verify_model_empty<Element>() : vector<Element> {
+        vector::empty<Element>() // inlining the built-in Boogie procedure
+    }
+    spec verify_model_empty {
+        ensures len(result) == 0;
+    }
+
+    // Return the length of the vector.
+    fun verify_model_length<Element>(v: &vector<Element>): u64 {
+        vector::length(v) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_length {
+        ensures result == len(v);
+    }
+
+    // Acquire an immutable reference to the ith element of the vector.
+    fun verify_model_borrow<Element>(v: &vector<Element>, i: u64): &Element {
+        vector::borrow(v, i) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_borrow {
+        aborts_if i >= len(v);
+        ensures result == v[i]; // TODO: enough?
+    }
+
+    // Add an element to the end of the vector.
+    fun verify_model_push_back<Element>(v: &mut vector<Element>, e: Element) {
+        vector::push_back(v, e); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_push_back {
+        ensures len(v) == len(old(v)) + 1;
+        ensures v[len(v)-1] == e;
+        ensures old(v) == v[0..len(v)-1];
+    }
+
+    // Get mutable reference to the ith element in the vector, abort if out of bound.
+    fun verify_model_borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element {
+        vector::borrow_mut(v, i) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_borrow_mut {
+        aborts_if i >= len(v);
+        ensures result == v[i]; // TODO: enough?
+    }
+
+    // Pop an element from the end of vector, abort if the vector is empty.
+    fun verify_model_pop_back<Element>(v: &mut vector<Element>): Element {
+        vector::pop_back(v) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_pop_back {
+        aborts_if len(v) == 0;
+        ensures len(v) == len(old(v)) - 1;
+        ensures result == old(v[len(v)-1]);
+        ensures v == old(v[0..(len(v)-1)]);
+    }
+
+    // Destroy the vector, abort if not empty.
+    fun verify_model_destroy_empty<Element>(v: vector<Element>) {
+        vector::destroy_empty(v); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_destroy_empty {
+        aborts_if len(v) > 0;
+        // TODO: anything else?
+    }
+
+    // Swaps the elements at the i'th and j'th indices in the vector.
+    fun verify_model_swap<Element>(v: &mut vector<Element>, i: u64, j: u64) {
+        vector::swap(v, i, j); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_swap {
+        aborts_if i >= len(v);
+        aborts_if j >= len(v);
+        ensures v == old(update(update(v,i,v[j]),j,v[i]));
+    }
+
+    // Return an vector of size one containing `e`
+    fun verify_singleton<Element>(e: Element): vector<Element> {
+        let v = vector::empty();
+        vector::push_back(&mut v, e);
+        v
+    }
+    spec verify_singleton {
+        aborts_if false;
+        ensures len(result) == 1;
+        ensures result[0] == e;
+    }
+
+    // Reverses the order of the elements in the vector in place.
+    fun verify_reverse<Element>(v: &mut vector<Element>) {
+        let vlen = vector::length(v);
+        if (vlen == 0) return ();
+
+        let front_index = 0;
+        let back_index = vlen -1;
+        while ({
+            spec {
+                invariant front_index + back_index == vlen - 1;
+                invariant forall i in 0..front_index: v[i] == old(v)[vlen-1-i];
+                invariant forall i in 0..front_index: v[vlen-1-i] == old(v)[i];
+                invariant forall j in front_index..back_index+1: v[j] == old(v)[j];
+                invariant len(v) == vlen;
+            };
+            (front_index < back_index)
+        }) {
+            vector::swap(v, front_index, back_index);
+            front_index = front_index + 1;
+            back_index = back_index - 1;
+        };
+    }
+    spec verify_reverse {
+        aborts_if false;
+        ensures forall i in 0..len(v): v[i] == old(v)[len(v)-1-i];
+    }
+
+    // Reverses the order of the elements in the vector in place.
+    fun verify_model_reverse<Element>(v: &mut vector<Element>) {
+        vector::reverse(v); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_reverse {
+        aborts_if false;
+        ensures forall i in 0..len(v): old(v[i]) == v[len(v)-1-i];
+    }
+
+    // Moves all of the elements of the `other` vector into the `v` vector.
+    fun verify_append<Element>(v: &mut vector<Element>, other: vector<Element>) {
+        let o = &mut other;
+        vector::reverse(o);
+        while ({
+            spec {
+                invariant len(v) >= len(old(v));
+                invariant len(o) <= len(other);
+                invariant len(v) + len(o) == len(old(v)) + len(other);
+                invariant forall k in 0..len(old(v)): v[k] == old(v)[k];
+                invariant forall k in 0..len(o): o[k] == other[len(other)-1-k];
+                invariant forall k in len(old(v))..len(v): v[k] == other[k-len(old(v))];
+            };
+            !vector::is_empty(o)
+        }) {
+            vector::push_back(v, vector::pop_back(o))
+        };
+        vector::destroy_empty(other);
+    }
+    spec verify_append {
+        ensures len(v) == old(len(v)) + len(other);
+        ensures v[0..len(old(v))] == old(v);
+        ensures v[len(old(v))..len(v)] == other;
+    }
+
+    // Moves all of the elements of the `other` vector into the `lhs` vector.
+    fun verify_model_append<Element>(lhs: &mut vector<Element>, other: vector<Element>) {
+        vector::append(lhs, other) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_append {
+        ensures len(lhs) == old(len(lhs) + len(other));
+        ensures lhs[0..len(old(lhs))] == old(lhs);
+        ensures lhs[len(old(lhs))..len(lhs)] == other;
+    }
+
+    // Return true if the vector has no elements
+    fun verify_is_empty<Element>(v: &vector<Element>): bool {
+        vector::length(v) == 0
+    }
+    spec verify_is_empty {
+        ensures result == (len(v) == 0);
+    }
+
+    // Return true if the vector has no elements
+    fun verify_model_is_empty<Element>(v: &vector<Element>): bool {
+        vector::is_empty(v) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_is_empty {
+        ensures result == (len(v) == 0);
+    }
+
+    // Return (true, i) if `e` is in the vector `v` at index `i`.
+    // Otherwise returns (false, 0).
+    fun verify_index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64) {
+        let i = 0;
+        let len = vector::length(v);
+        while ({
+            spec {
+                invariant !(exists j in 0..i: v[j]==e);
+            };
+            i < len
+        }) {
+            if (vector::borrow(v, i) == e) return (true, i);
+            i = i + 1;
+        };
+        (false, 0)
+    }
+    spec verify_index_of {
+        aborts_if false;
+        ensures result_1 == (exists x in v: x==e); // whether v contains e or not
+        ensures result_1 ==> v[result_2] == e; // if true, return the index where v contains e
+        ensures result_1 ==> (forall i in 0..result_2: v[i]!=e); // ensure the smallest index
+        ensures !result_1 ==> result_2 == 0; // return 0 if v does not contain e
+    }
+
+    fun verify_model_index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64) {
+        vector::index_of(v, e) // inlining the built-in Boogie procedure
+    }
+    spec verify_model_index_of {
+        aborts_if false;
+        ensures result_1 == (exists x in v: x==e); // whether v contains e or not
+        ensures result_1 ==> v[result_2] == e; // if true, return the index where v contains e
+        ensures result_1 ==> (forall i in 0..result_2: v[i]!=e); // ensure the smallest index
+        ensures !result_1 ==> result_2 == 0; // return 0 if v does not contain e
+    }
+
+    // Return true if `e` is in the vector `v`
+    fun verify_contains<Element>(v: &vector<Element>, e: &Element): bool {
+        let i = 0;
+        let len = vector::length(v);
+        while ({
+            spec {
+               invariant !(exists j in 0..i: v[j]==e);
+            };
+            i < len
+        }) {
+            if (vector::borrow(v, i) == e) return true;
+            i = i + 1;
+        };
+        spec {
+           assert !(exists x in v: x==e);
+        };
+        false
+    }
+    spec verify_contains {
+        aborts_if false;
+        ensures result == (exists x in v: x==e);
+    }
+
+    // Return true if `e` is in the vector `v`
+    fun verify_model_contains<Element>(v: &vector<Element>, e: &Element): bool {
+        vector::contains(v, e) // inlining the built-in Boogie procedure.
+    }
+    spec verify_model_contains {
+        aborts_if false;
+        ensures result == (exists x in v: x==e);
+    }
+
+    // Remove the `i`th element E of the vector, shifting all subsequent elements
+    // It is O(n) and preserves ordering
+    fun verify_remove<Element>(v: &mut vector<Element>, j: u64): Element {
+        let vlen = vector::length(v);
+        let i = j;
+        // i out of bounds; abort
+        if (i >= vlen) abort 10;
+
+        vlen = vlen - 1;
+        while ({
+            spec {
+                invariant j <= i && i <= vlen;
+                invariant vlen + 1 == len(v);
+                invariant v[0..j] == old(v)[0..j];
+                invariant forall k in j..i: v[k] == old(v)[k+1];
+                invariant forall k in i+1..len(v): v[k] == old(v)[k];
+                invariant v[i] == old(v)[j];
+            };
+            i < vlen
+            }) {
+            vector::swap(v, i, i + 1);
+            i = i + 1;
+        };
+        vector::pop_back(v)
+    }
+    spec verify_remove {
+        aborts_if j >= len(v);
+        ensures len(v) == len(old(v)) - 1;
+        ensures v[0..j] == old(v[0..j]);
+        ensures v[j..len(v)] == old(v[j+1..len(v)]);
+        ensures old(v[j]) == result;
+    }
+
+    // Remove the `i`th element E of the vector, shifting all subsequent elements
+    // It is O(n) and preserves ordering
+    fun verify_model_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        vector::remove(v, i) // inlining the built-in Boogie procedure.
+    }
+    spec verify_model_remove {
+        aborts_if i >= len(v);
+        ensures len(v) == len(old(v)) - 1;
+        ensures v[0..i] == old(v[0..i]);
+        ensures v[i..len(v)] == old(v[i+1..len(v)]);
+        ensures old(v[i]) == result;
+    }
+
+    // Add an element to the vector at index.
+    fun verify_model_insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        vector::insert(v, e, i); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_insert {
+        aborts_if i > len(v);
+        ensures len(v) == len(old(v)) + 1;
+        ensures v[i] == e;
+        ensures old(v[0..i]) == v[0..i];
+        ensures old(v)[i..len(old(v))] == v[i+1..len(v)];
+    }
+
+    // Remove the `i`th element E of the vector by swapping it with the last element,
+    // and then popping it off
+    // It is O(1), but does not preserve ordering
+    fun verify_swap_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        let last_idx = vector::length(v) - 1;
+        vector::swap(v, i, last_idx);
+        vector::pop_back(v)
+    }
+    spec verify_swap_remove {
+        aborts_if i >= len(v);
+        ensures len(v) == len(old(v)) - 1;
+        ensures v == old(update(v,i,v[len(v)-1])[0..len(v)-1]);
+        ensures old(v[i]) == result;
+    }
+
+    // Remove the `i`th element E of the vector by swapping it with the last element,
+    // and then popping it off
+    // It is O(1), but does not preserve ordering
+    fun verify_model_swap_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        vector::swap_remove(v, i) // inlining the built-in Boogie procedure.
+    }
+    spec verify_model_swap_remove {
+        aborts_if i >= len(v);
+        ensures len(v) == len(old(v)) - 1;
+        ensures v == old(update(v,i,v[len(v)-1])[0..len(v)-1]);
+        ensures old(v[i]) == result;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/Escape.exp b/vendors/move/crates/move-prover/tests/sources/regression/Escape.exp
new file mode 100644
index 000000000..6c00121c9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/Escape.exp
@@ -0,0 +1,25 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/regression/Escape.move:36:5
+   │
+36 │     invariant forall addr: address where exists<Wrapper<IndoorThing>>(addr): addr == @0x123;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/regression/Escape.move:24: install
+   =         account = <redacted>
+   =         thing = <redacted>
+   =     at tests/sources/regression/Escape.move:25: install
+   =     at tests/sources/regression/Escape.move:36
+
+error: global memory invariant does not hold
+   ┌─ tests/sources/regression/Escape.move:37:5
+   │
+37 │     invariant forall addr: address where exists<Wrapper<OutdoorThing>>(addr): addr == @0x123;
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/regression/Escape.move:24: install
+   =         account = <redacted>
+   =         thing = <redacted>
+   =     at tests/sources/regression/Escape.move:25: install
+   =     at tests/sources/regression/Escape.move:36
+   =     at tests/sources/regression/Escape.move:37
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/Escape.move b/vendors/move/crates/move-prover/tests/sources/regression/Escape.move
new file mode 100644
index 000000000..9db7573a6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/Escape.move
@@ -0,0 +1,39 @@
+address 0x1 {
+
+module Escape {
+    use std::signer;
+
+    struct IndoorThing has key, store { }
+
+    struct OutdoorThing has key, store { }
+
+    struct Wrapper<Thing: key + store> has key { thing: Thing }
+
+    public fun initialize(account: &signer) {
+        let owner = signer::address_of(account);
+        assert!(owner == @0x123, 0);
+        move_to<Wrapper<IndoorThing>>(account, Wrapper{ thing: IndoorThing {} });
+        move_to<Wrapper<OutdoorThing>>(account, Wrapper { thing: OutdoorThing {}});
+    }
+
+   public fun new_outdoor_thing(): OutdoorThing {
+        OutdoorThing { }
+    }
+
+    /// Calling module can install whatever object.
+    public fun install<Thing: key + store>(account: &signer, thing: Thing) {
+        move_to<Wrapper<Thing>>(account, Wrapper{ thing });
+    }
+
+    // TODO: Currently both invariants do not verify, which is expected.
+    //
+    // But the first invariant could be verified because an `IndoorThing` can
+    // never escape from the current modul. By escape, we mean, holding an
+    // object of type `IndoorThing`. This is a fact given by the type system.
+    //
+    // In comparision, an `OutdoorThing` can escape because that the
+    // `new_outdoor_thing` function returns an object of the `OutdoorThing` type
+    invariant forall addr: address where exists<Wrapper<IndoorThing>>(addr): addr == @0x123;
+    invariant forall addr: address where exists<Wrapper<OutdoorThing>>(addr): addr == @0x123;
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/bug_828.move b/vendors/move/crates/move-prover/tests/sources/regression/bug_828.move
new file mode 100644
index 000000000..72235dcc8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/bug_828.move
@@ -0,0 +1,24 @@
+module 0x42::test {
+    fun foo(i: u64) {
+        assert!(i == 50, 0);
+        let old_i = i;
+        spec {
+            assert old_i == 50;
+        };
+        while ({
+            spec {
+                invariant old_i <= i && i <= 100;
+            };
+            i < 100
+        }) {
+            spec {
+                // fail to prove before the fix
+                assert old_i == 50;
+            };
+            i = i + 1;
+        };
+        spec {
+            assert i == 100;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/let_rewrite.move b/vendors/move/crates/move-prover/tests/sources/regression/let_rewrite.move
new file mode 100644
index 000000000..6982c11e8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/let_rewrite.move
@@ -0,0 +1,22 @@
+module 0x2::Token {
+    struct Token<phantom T> has store { value: u64 }
+
+    public fun burn<T>(_unused: bool, token: Token<T>) {
+        let Token { value } = token;
+        assert!(value != 0, 42);
+    }
+    spec burn {
+        let token_value = token.value;
+        aborts_if token_value == 0;
+    }
+}
+
+module 0x2::Liquid {
+    use 0x2::Token;
+
+    struct Liquid<phantom X, phantom Y> has key, store {}
+
+    fun l_burn<X, Y>(token: Token::Token<Liquid<X, Y>>) {
+        Token::burn(false, token);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/map_equality_encoding.move b/vendors/move/crates/move-prover/tests/sources/regression/map_equality_encoding.move
new file mode 100644
index 000000000..ebd4f1021
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/map_equality_encoding.move
@@ -0,0 +1,9 @@
+module 0x42::map_equality {
+    use extensions::table;
+
+    fun test(_t: &mut table::Table<address, u64>, _k: address) {}
+    spec test {
+        let old_v = table::spec_get(_t, _k);
+        ensures table::spec_contains(old(_t), _k) ==> _t == table::spec_set(old(_t), _k, old_v + 0);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.exp b/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.exp
new file mode 100644
index 000000000..a6a667d21
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.exp
@@ -0,0 +1,20 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+   ┌─ tests/sources/regression/mono_after_global_invariant.move:44:9
+   │
+44 │ ╭         invariant<T> update
+45 │ │             Base::has_b() ==> (has_r<T>() ==> old(has_r<T>()));
+   │ ╰───────────────────────────────────────────────────────────────^
+   │
+   =     at tests/sources/regression/mono_after_global_invariant.move:30: put_r
+   =         s = <redacted>
+   =         v = <redacted>
+   =     at tests/sources/regression/mono_after_global_invariant.move:31: put_r
+   =     at tests/sources/regression/mono_after_global_invariant.move:9: put_b
+   =         s = <redacted>
+   =     at tests/sources/regression/mono_after_global_invariant.move:10: put_b
+   =     at tests/sources/regression/mono_after_global_invariant.move:14: put_b
+   =     at tests/sources/regression/mono_after_global_invariant.move:32: put_r
+   =     at tests/sources/regression/mono_after_global_invariant.move:30: put_r
+   =     at tests/sources/regression/mono_after_global_invariant.move:32: put_r
+   =     at tests/sources/regression/mono_after_global_invariant.move:44
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.move b/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.move
new file mode 100644
index 000000000..c88fb9539
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/mono_after_global_invariant.move
@@ -0,0 +1,56 @@
+address 0x2 {
+module Base {
+    struct B has key {}
+
+    public fun BASE_ADDR(): address {
+        @0x2
+    }
+
+    public fun put_b(s: &signer) {
+        move_to(s, B {});
+        // the global invariants in 0x2::Test is instrumented here
+        // but this instrumentation causes a warning becaues we do
+        // not know how to instantiate the parameter T
+    }
+
+    spec module {
+        fun has_b(): bool {
+            exists<B>(BASE_ADDR())
+        }
+    }
+}
+
+module Test {
+    use 0x2::Base;
+
+    struct R<T: store> has key {
+         f: T,
+    }
+
+    public fun put_r<T: store>(s: &signer, v: T) {
+        Base::put_b(s);
+        move_to(s, R { f: v });
+        // the global invariants in 0x2::Test is instrumented here
+        // as well, not causing a warning and not verified.
+    }
+
+    spec module {
+        fun has_r<T>(): bool {
+            exists<R<T>>(Base::BASE_ADDR())
+        }
+    }
+
+    spec module {
+        invariant<T> update
+            Base::has_b() ==> (has_r<T>() ==> old(has_r<T>()));
+
+        // The above invariant should not verify, here is a counterexample:
+        //
+        // suppose we starts with an empty state,
+        // put_r(@0x2, false) will violate the invariant, because
+        // - Base::has_b() is true,
+        // - has_r<bool>() is true, but
+        // - old(has_r<bool>()) is false
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move b/vendors/move/crates/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move
new file mode 100644
index 000000000..c43b2d976
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move
@@ -0,0 +1,22 @@
+module 0x42::mono_on_axiom_spec_type {
+    struct SetByVec {
+        elems: vector<u8>,
+    }
+    spec SetByVec {
+        invariant forall i in 0..len(elems), j in 0..len(elems):
+            elems[i] == elems[j] ==> i == j;
+    }
+
+    fun new_set(): SetByVec {
+        SetByVec {
+            elems: std::vector::empty(),
+        }
+    }
+
+    spec module {
+        fun deserialize<T>(bytes: vector<u8>): T;
+
+        axiom<T> forall b1: vector<u8>, b2: vector<u8>:
+            (deserialize<T>(b1) == deserialize<T>(b2) ==> b1 == b2);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/moved_local_with_refs.move b/vendors/move/crates/move-prover/tests/sources/regression/moved_local_with_refs.move
new file mode 100644
index 000000000..2bc16f061
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/moved_local_with_refs.move
@@ -0,0 +1,33 @@
+module 0x42::MovedLocalWithRefs {
+    use std::vector;
+
+    struct S has drop {
+        x: u64,
+    }
+
+    fun moved_local_in_loop(length: u64, limit: u64): vector<S> {
+        let v = vector::empty();
+        let i = 0;
+        while ({
+            spec {
+                invariant i <= length;
+                invariant len(v) == i;
+                invariant forall k in 0..i: v[k].x <= limit;
+            };
+            (i < length)
+        }) {
+            let s = S { x : 100 };
+            if (s.x >= limit) {
+                s.x = limit;
+            };
+            vector::push_back(&mut v, s);
+            i = i + 1;
+        };
+        v
+    }
+
+    spec moved_local_in_loop {
+        ensures len(result) == length;
+        ensures forall e in result: e.x <= limit;
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/mutrefbug030521.move b/vendors/move/crates/move-prover/tests/sources/regression/mutrefbug030521.move
new file mode 100644
index 000000000..2598ff08f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/mutrefbug030521.move
@@ -0,0 +1,35 @@
+module 0x42::Bug {
+
+    struct Diem<phantom CoinType> {
+        /// The value of this coin in the base units for `CoinType`
+        value: u64
+    }
+
+
+    public fun withdraw<CoinType>(coin: &mut Diem<CoinType>, amount: u64): Diem<CoinType> {
+        coin.value = coin.value - amount;
+        Diem { value: amount }
+    }
+    spec withdraw {
+        pragma opaque;
+        include WithdrawAbortsIf<CoinType>;
+        ensures coin.value == old(coin.value) - amount;
+        ensures result.value == amount;
+    }
+    spec schema WithdrawAbortsIf<CoinType> {
+        coin: Diem<CoinType>;
+        amount: u64;
+        aborts_if coin.value < amount;
+    }
+
+    public fun split<CoinType>(coin: Diem<CoinType>, amount: u64): (Diem<CoinType>, Diem<CoinType>) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+    spec split {
+        aborts_if coin.value < amount;
+        ensures result_1.value == coin.value - amount;
+        ensures result_2.value == amount;
+    }
+
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/performance_200511.move b/vendors/move/crates/move-prover/tests/sources/regression/performance_200511.move
new file mode 100644
index 000000000..e1dcba88b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/performance_200511.move
@@ -0,0 +1,92 @@
+// A test case which reproduces a performance/non-termination problem. See the spec of fun create for details.
+
+module 0x42::Test {
+    use std::bcs;
+    use std::signer;
+    use std::vector;
+
+    spec module {
+        fun eq_append<Element>(v: vector<Element>, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v) == len(v1) + len(v2) &&
+            v[0..len(v1)] == v1 &&
+            v[len(v1)..len(v)] == v2
+        }
+    }
+
+    struct EventHandle<phantom T: copy + drop + store> has copy, drop, store {
+        // Total number of events emitted to this event stream.
+        counter: u64,
+        // A globally unique ID for this event stream.
+        guid: vector<u8>,
+    }
+
+    struct Event1 has copy, drop, store {}
+    struct Event2 has copy, drop, store {}
+
+    struct T has key {
+        received_events: EventHandle<Event1>,
+        sent_events: EventHandle<Event2>,
+    }
+
+    struct EventHandleGenerator has copy, drop, store {
+        // A monotonically increasing counter
+        counter: u64,
+    }
+
+    fun fresh_guid(counter: &mut EventHandleGenerator, sender: address): vector<u8> {
+        let sender_bytes = bcs::to_bytes(&sender);
+        let count_bytes = bcs::to_bytes(&counter.counter);
+        counter.counter = counter.counter + 1;
+
+        vector::append(&mut count_bytes, sender_bytes);
+
+        count_bytes
+    }
+    spec fresh_guid {
+        aborts_if counter.counter + 1 > max_u64();
+        ensures eq_append(result, bcs::serialize(old(counter.counter)), bcs::serialize(sender));
+    }
+
+    fun new_event_handle_impl<T: copy + drop + store>(counter: &mut EventHandleGenerator, sender: address): EventHandle<T> {
+        EventHandle<T> {counter: 0, guid: fresh_guid(counter, sender)}
+    }
+    spec new_event_handle_impl {
+        aborts_if counter.counter + 1 > max_u64();
+        ensures eq_append(result.guid, bcs::serialize(old(counter.counter)), bcs::serialize(sender));
+        ensures result.counter == 0;
+    }
+
+    public fun create(sender: &signer, fresh_address: address, auth_key_prefix: vector<u8>) : vector<u8> {
+        let generator = EventHandleGenerator{counter: 0};
+        let authentication_key = auth_key_prefix;
+        vector::append(&mut authentication_key, bcs::to_bytes(&fresh_address));
+        assert!(vector::length(&authentication_key) == 32, 12);
+
+
+        move_to<T>(sender, T{
+            received_events: new_event_handle_impl<Event1>(&mut generator, fresh_address),
+            sent_events: new_event_handle_impl<Event2>(&mut generator, fresh_address)
+        });
+
+        authentication_key
+    }
+    spec create {
+        // To reproduce, put this to true.
+        pragma verify=false;
+
+        // The next two aborts_if and ensures are correct. However, if they are removed, verification terminates
+        // with the expected result.
+        aborts_if len(bcs::serialize(fresh_address)) + len(auth_key_prefix) != 32;
+        aborts_if exists<T>(signer::address_of(sender));
+        ensures eq_append(result, auth_key_prefix, bcs::serialize(fresh_address));
+
+        // These two ensures are wrong and should produce an error. Instead, the solver hangs without bounding
+        // serialization result size. To reproduce, set --serialize-bound=0 to remove any bound.
+        ensures eq_append(global<T>(signer::address_of(sender)).received_events.guid, bcs::serialize(2), bcs::serialize(fresh_address));
+        ensures eq_append(global<T>(signer::address_of(sender)).sent_events.guid, bcs::serialize(3), bcs::serialize(fresh_address));
+
+        // Correct version of the above ensures:
+        //ensures eq_append(global<T>(signer::address_of(sender)).received_events.guid, BCS::serialize(0), BCS::serialize(fresh_address));
+        //ensures eq_append(global<T>(signer::address_of(sender)).sent_events.guid, BCS::serialize(1), BCS::serialize(fresh_address));
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/set_200701.move b/vendors/move/crates/move-prover/tests/sources/regression/set_200701.move
new file mode 100644
index 000000000..03b948d42
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/set_200701.move
@@ -0,0 +1,38 @@
+module 0x42::TestSet {
+    use std::vector;
+
+    // Issue #4872.
+    public fun remove_everything(v: &mut vector<u64>) {
+        let i = vector::length(v);
+        while ({
+            spec {
+                // The following doesn't work
+                // assert 0 <= i && i <= len(v);
+                // The following works
+                assert i == len(v);
+                assert is_set(v);
+            };
+            (i > 0)
+        })
+        {
+            i = i - 1;
+            _  = vector::swap_remove(v, i);
+        }
+    }
+
+    spec remove_everything {
+        // TODO(refactoring): reactivate once loop invariants are implemented.
+        pragma verify = false;
+        requires is_set(v);
+        aborts_if false;
+    }
+
+    spec module {
+        fun is_set(v: vector<u64>): bool {
+            forall ii: u64, jj: u64 where
+                0 <= ii && ii < len(v) &&
+                0 <= jj && jj < len(v):
+                    v[ii] == v[jj] ==> ii == jj
+        }
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/spec_fun_same_mem_param.move b/vendors/move/crates/move-prover/tests/sources/regression/spec_fun_same_mem_param.move
new file mode 100644
index 000000000..a6788ec53
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/spec_fun_same_mem_param.move
@@ -0,0 +1,49 @@
+address 0x2 {
+module Coin {
+    struct Coin<T: store> has key { f: T, v: u64 }
+
+    public fun coin_exists<T: store>(): bool {
+        exists<Coin<T>>(@0x2)
+    }
+
+    public fun coin_info<T: store>(): u64 acquires Coin {
+        *&borrow_global<Coin<T>>(@0x2).v
+    }
+}
+
+module XUS {
+    struct XUS has store {}
+}
+
+module XDX {
+    use 0x2::Coin::Coin;
+    use 0x2::Coin::coin_exists;
+    use 0x2::Coin::coin_info;
+
+    struct XDX has store {}
+
+    spec fun spec_is_xdx<T: store>(): bool {
+        exists<Coin<T>>(@0x2) && exists<Coin<XDX>>(@0x2) &&
+            global<Coin<T>>(@0x2).v == global<Coin<XDX>>(@0x2).v
+    }
+
+    public fun is_xdx<T: store>(): bool {
+        coin_exists<T>() && coin_exists<XDX>() &&
+            coin_info<T>() == coin_info<XDX>()
+    }
+    spec is_xdx {
+        pragma opaque;
+        ensures result == spec_is_xdx<T>();
+    }
+}
+
+module Check {
+    use 0x2::XUS::XUS;
+    use 0x2::XDX::XDX;
+    use 0x2::XDX::is_xdx;
+
+    public fun check(): bool {
+        is_xdx<XUS>() && is_xdx<XDX>()
+    }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/temporary_rewrite.move b/vendors/move/crates/move-prover/tests/sources/regression/temporary_rewrite.move
new file mode 100644
index 000000000..ab70c90bf
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/temporary_rewrite.move
@@ -0,0 +1,21 @@
+module 0x2::Token {
+    struct Token<phantom T> has store { value: u64 }
+
+    public fun burn<T>(_unused: bool, token: Token<T>) {
+        let Token { value } = token;
+        assert!(value != 0, 42);
+    }
+    spec burn {
+        aborts_if token.value == 0;
+    }
+}
+
+module 0x2::Liquid {
+    use 0x2::Token;
+
+    struct Liquid<phantom X, phantom Y> has key, store {}
+
+    fun l_burn<X, Y>(token: Token::Token<Liquid<X, Y>>) {
+        Token::burn(false, token);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.exp b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.exp
new file mode 100644
index 000000000..0a7d9d53a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.exp
@@ -0,0 +1,22 @@
+Move prover returns: exiting with verification errors
+error: global memory invariant does not hold
+    ┌─ tests/sources/regression/type_param_bug_121721.move:173:9
+    │
+173 │         invariant<Proposal> forall addr: address: existing_ballots_have_small_counters<Proposal>(addr);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/regression/type_param_bug_121721.move:80: create_ballot
+    =         ballot_account = <redacted>
+    =         proposal = <redacted>
+    =     at tests/sources/regression/type_param_bug_121721.move:84: create_ballot
+    =     at ../move-stdlib/sources/signer.move:12: address_of
+    =         s = <redacted>
+    =     at ../move-stdlib/sources/signer.move:13: address_of
+    =         result = <redacted>
+    =     at ../move-stdlib/sources/signer.move:14: address_of
+    =         ballot_address#1#0 = <redacted>
+    =     at tests/sources/regression/type_param_bug_121721.move:86: create_ballot
+    =     at tests/sources/regression/type_param_bug_121721.move:88: create_ballot
+    =     at tests/sources/regression/type_param_bug_121721.move:87: create_ballot
+    =     at tests/sources/regression/type_param_bug_121721.move:167
+    =     at tests/sources/regression/type_param_bug_121721.move:173
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.move b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.move
new file mode 100644
index 000000000..b5a474fd8
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_121721.move
@@ -0,0 +1,175 @@
+// This is a reduced example of Vote.move that seems to have a bug.
+
+// There are two invariants involved.
+
+// 1. (at line 167:) Whenever Ballots<Proposal> is published at a given
+//    address, BallotCounter is published at the same address.
+
+// 2. (att line 173:) Every Ballot in the vector in the ballots field of
+//    the Ballots struct published at some address has a ballot_id with a
+//    counter that is less than the couner in the BallotCounter struct
+//    published at the same address.
+
+// The first invariant proves.  The second fails in create_ballot at
+// line 87, at a move_to that publishes a BallotCounter with
+// count 0.
+
+// By the first invariant, there should be no Ballots structs published
+// if BallotCounter is not published, so there is no way that invariant 2
+// could be violated at that point (the invariant is an implication that
+// checks exists<Ballots<Proposal>>(proposer_address) in the antecedant,
+// so it should trivially hold).
+
+// The bytecode after monomorphisation may show the problem.  There are 5
+// instances of create_ballot in the generated boogie file.  The type
+// parameter "Proposal" is instantiated in different places with #0, #1,
+// and #2 (I don't know why).
+
+// Current theory:
+// Invariant 1 is assumed for #0 and #1 (but the code has #0, see below),
+// and invariant 2 is assumed for #0 and #2.  But invariant 1 was never
+// assumed for #2, so the Prover thinks there can be a Ballots<#2> struct
+// with a vector with at least one Ballot struct.
+
+// Before the move_to, there must have been a Ballots<#2> struct
+// published with a non-empty ballots vector. Invariant 2 accesses
+// globsal<BallotCounter>(addr).counter, which is undefined, so the
+// assumption just forces that to be some number greater than the
+// counters in the ballot ids in the vector.  When the BallotCounter is
+// finally published with counter = 0, it violates the invariant.
+
+// Maybe.
+
+// #0, #1, #2 first show up in the bytecode dump 13 (global_invariant_analysis),
+// but I'm not sure how to interpret the entrypoint info printed. It does seem to
+// be instantiating @0 (first invariant?) for #0 and #1 and @1 for #0 and #2, though.
+
+// There are some other discrepancies in the output.bpl file.  Sometimes, there
+// are comments about invariants where the # parameter is different in the comment
+// and in the generated code.  This makes me worry that the generated code may be
+// wrong (maybe related to this error, or maybe not).
+
+module 0x2::Bug7 {
+
+    use std::signer;
+    use std::vector;
+
+    struct BallotID has store, copy, drop {
+        counter: u64,
+        proposer: address,
+    }
+
+    struct Ballot has store, copy, drop {
+        // A globally unique ballot id that is created for every proposal
+        ballot_id: BallotID,
+    }
+
+    struct Ballots<Proposal: store + drop> has key {
+        proposal: Proposal,
+        ballots: vector<Ballot>,
+    }
+
+    /// A counter which is stored under the proposers address and gets incremented
+    /// everytime they create a new ballot. This is used for creating unique
+    /// global identifiers for Ballots
+    struct BallotCounter has key {
+        counter: u64,
+    }
+
+    /// Create a ballot under the signer's address and return the `BallotID`
+    public fun create_ballot<Proposal: store + copy + drop>(
+        ballot_account: &signer,
+        proposal: Proposal,
+    ): BallotID acquires Ballots, BallotCounter {
+        let ballot_address = signer::address_of(ballot_account);
+
+        if (!exists<BallotCounter>(ballot_address)) {
+            move_to(ballot_account, BallotCounter {
+                counter: 0,
+            });
+            // DD Debug
+            spec { assert !exists<Ballots<Proposal>>(ballot_address); };
+        };
+        if (!exists<Ballots<Proposal>>(ballot_address)) {
+            move_to(ballot_account, Ballots<Proposal> {
+                proposal,
+                ballots: vector::empty(),
+            });
+        };
+
+        let ballot_data = borrow_global_mut<Ballots<Proposal>>(ballot_address);
+
+        let ballots = &mut ballot_data.ballots;
+
+        let ballot_id = new_ballot_id(incr_counter(ballot_account), ballot_address);
+        let ballot = Ballot {
+            ballot_id: *&ballot_id,
+        };
+        vector::push_back(ballots, *&ballot);
+        ballot_id
+    }
+
+    /// A constructor for BallotID
+    public fun new_ballot_id(
+        counter: u64,
+        proposer: address,
+    ): BallotID {
+        BallotID {
+            counter,
+            proposer,
+        }
+    }
+
+    /// incr_counter increments the counter stored under the signer's
+    /// account
+    fun incr_counter(account: &signer): u64 acquires BallotCounter {
+        let addr = signer::address_of(account);
+        let counter = &mut borrow_global_mut<BallotCounter>(addr).counter;
+        let count = *counter;
+        *counter = *counter + 1;
+        count
+    }
+
+
+    ///****************************************************************
+    /// Specs
+    ///****************************************************************
+
+    /// Get the ballots vector from published Ballots<Proposal>
+    /// CAUTION: Returns an arbitrary value if no Ballots<Proposal> is publised at ballot_address.
+    spec fun get_ballots<Proposal>(ballot_address: address): vector<Ballot> {
+       global<Ballots<Proposal>>(ballot_address).ballots
+    }
+
+    /// Get the ballot matching ballot_id out of the ballots vector, if it is there.
+    /// CAUTION: Returns a arbitrary value if it's not there.
+    spec fun get_ballot<Proposal>(ballot_address: address, ballot_id: BallotID): Ballot {
+         let ballots = global<Ballots<Proposal>>(ballot_address).ballots;
+         get_ballots<Proposal>(ballot_address)[choose min i in 0..len(ballots) where ballots[i].ballot_id == ballot_id]
+     }
+
+    // Lower-level invariants
+
+    // helper functions
+
+    spec fun existing_ballots_have_small_counters<Proposal>(proposer_address: address): bool {
+        // Just return true if there is no Ballots<Proposal> published at proposer_address
+        // DD: Is it hinky to be doing this let when we don't know if it exists?
+        let ballots = get_ballots<Proposal>(proposer_address);
+        exists<Ballots<Proposal>>(proposer_address)
+        ==> (forall i in 0..len(ballots):
+                ballots[i].ballot_id.counter < global<BallotCounter>(proposer_address).counter)
+    }
+
+    spec module {
+        /// Whenever there is a Ballots<Proposal> at ballot_address, there is
+        /// a BallotCounter there.
+        invariant<Proposal> forall ballot_address: address
+            where exists<Ballots<Proposal>>(ballot_address):
+                exists<BallotCounter>(ballot_address);
+
+        /// counter values in ballots are all less than the value of the BallotCounter
+        /// See note on spec fun existing_ballots_have_small_counters
+        invariant<Proposal> forall addr: address: existing_ballots_have_small_counters<Proposal>(addr);
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.exp b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.exp
new file mode 100644
index 000000000..caa0f5b26
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.exp
@@ -0,0 +1,14 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+   ┌─ tests/sources/regression/type_param_bug_200228.move:12:5
+   │
+12 │     ensures old(exists<Balance<Tok_1>>(addr)) ==> old(exists<Balance<Tok_2>>(addr)); // original bug: proved by Prover, but should not be.
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/regression/type_param_bug_200228.move:6: type_param_bug
+   =         addr = <redacted>
+   =     at tests/sources/regression/type_param_bug_200228.move:7: type_param_bug
+   =         result = <redacted>
+   =     at tests/sources/regression/type_param_bug_200228.move:8: type_param_bug
+   =     at tests/sources/regression/type_param_bug_200228.move:11: type_param_bug (spec)
+   =     at tests/sources/regression/type_param_bug_200228.move:12: type_param_bug (spec)
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.move b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.move
new file mode 100644
index 000000000..861f9dbf9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/type_param_bug_200228.move
@@ -0,0 +1,14 @@
+module 0x42::Test {
+
+  struct Balance<phantom Token> has key {}
+  struct EventHandle<phantom Token> has key {}
+
+  fun type_param_bug<Tok_1: store, Tok_2: store>(addr: address): address {
+    addr
+  }
+  spec type_param_bug {
+    pragma verify=true;
+    aborts_if false;
+    ensures old(exists<Balance<Tok_1>>(addr)) ==> old(exists<Balance<Tok_2>>(addr)); // original bug: proved by Prover, but should not be.
+  }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/vector_200630.move b/vendors/move/crates/move-prover/tests/sources/regression/vector_200630.move
new file mode 100644
index 000000000..1e6968ec5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/vector_200630.move
@@ -0,0 +1,22 @@
+module 0x42::TestVector {
+    use std::vector;
+    struct T {
+        x: u64,
+    }
+
+    // PR #4856 fixes the issue
+    public fun update_ith_elem(v: &mut vector<T>, i: u64): bool {
+        let size = vector::length(v);
+        if (i >= size) {
+            return false
+        };
+        let elem = vector::borrow_mut(v, i);
+        let int_ref = &mut elem.x;
+
+        *int_ref = 42;
+        spec {
+            assert 42u64 == v[i].x;
+        };
+        true
+    }
+}
diff --git a/vendors/move/crates/move-prover/tests/sources/regression/z3/z3_termination_problem.smt b/vendors/move/crates/move-prover/tests/sources/regression/z3/z3_termination_problem.smt
new file mode 100644
index 000000000..850908d05
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/sources/regression/z3/z3_termination_problem.smt
@@ -0,0 +1,1232 @@
+; This is created from  the performance_200511.move problem, verification of the create function.
+; After changes to prelude and other code, its not directly reproducible any longer from Move,
+; therefore saved here.
+;
+; To reproduce, run:
+;   z3 -st -memory:1000 verbose=3 dump_models=true smt.qi.profile=true create_verify.smt
+;
+(set-option :print-success false)
+(set-info :smt-lib-version 2.0)
+(set-option :produce-models true)
+(set-option :smt.QI.EAGER_THRESHOLD 100)
+(set-option :smt.QI.LAZY_THRESHOLD 100)
+(set-option :trace true)
+(set-option :smt.mbqi false)
+(set-option :model.compact false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+; done setting options
+
+
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-datatypes ((T@Transaction 0)) (((Transaction (|sender#Transaction| Int) ) ) ))
+(declare-sort |T@[Int]Value| 0)
+(declare-datatypes ((T@Value 0)(T@ValueArray 0)) (((Boolean (|b#Boolean| Bool) ) (Integer (|i#Integer| Int) ) (Address (|a#Address| Int) ) (Vector (|v#Vector| T@ValueArray) ) ($Range (|lb#$Range| T@Value) (|ub#$Range| T@Value) ) (Error ) ) ((ValueArray (|v#ValueArray| |T@[Int]Value|) (|l#ValueArray| Int) ) ) ))
+(declare-sort T@TypeName 0)
+(declare-sort |T@[Int]TypeValue| 0)
+(declare-datatypes ((T@TypeValue 0)(T@TypeValueArray 0)) (((BooleanType ) (IntegerType ) (AddressType ) (StrType ) (VectorType (|t#VectorType| T@TypeValue) ) (StructType (|name#StructType| T@TypeName) (|ps#StructType| T@TypeValueArray) (|ts#StructType| T@TypeValueArray) ) (AbstractType (|num#AbstractType| Int) ) (ErrorType ) ) ((TypeValueArray (|v#TypeValueArray| |T@[Int]TypeValue|) (|l#TypeValueArray| Int) ) ) ))
+(declare-datatypes ((T@Location 0)) (((Global (|t#Global| T@TypeValue) (|a#Global| Int) ) (Local (|i#Local| Int) ) (Param (|i#Param| Int) ) ) ))
+(declare-sort |T@[Location]Bool| 0)
+(declare-sort |T@[Location]Value| 0)
+(declare-datatypes ((T@Memory 0)) (((Memory (|domain#Memory| |T@[Location]Bool|) (|contents#Memory| |T@[Location]Value|) ) ) ))
+(declare-sort |T@[Int]Int| 0)
+(declare-datatypes ((T@Path 0)) (((Path (|p#Path| |T@[Int]Int|) (|size#Path| Int) ) ) ))
+(declare-datatypes ((T@Reference 0)) (((Reference (|l#Reference| T@Location) (|p#Reference| T@Path) ) ) ))
+(declare-fun $Test_Event1 () T@TypeName)
+(declare-fun $Test_Event2 () T@TypeName)
+(declare-fun $Test_EventHandle () T@TypeName)
+(declare-fun $Test_T () T@TypeName)
+(declare-fun $Test_EventHandleGenerator () T@TypeName)
+(declare-fun $DebugTrackLocal (Int Int Int T@Value) Bool)
+(declare-fun $DebugTrackAbort (Int Int) Bool)
+(declare-fun EmptyPath () T@Path)
+(declare-fun DefaultTypeValue () T@TypeValue)
+(declare-fun EmptyTypeValueArray () T@TypeValueArray)
+(declare-fun MapConstTypeValue (T@TypeValue) |T@[Int]TypeValue|)
+(declare-fun MAX_U8 () Int)
+(declare-fun MAX_U64 () Int)
+(declare-fun MAX_U128 () Int)
+(declare-fun DefaultValue () T@Value)
+(declare-fun EmptyValueArray () T@ValueArray)
+(declare-fun MapConstValue (T@Value) |T@[Int]Value|)
+(declare-fun StratificationDepth () Int)
+(declare-fun IsEqual_stratified (T@Value T@Value) Bool)
+(declare-fun IsEqual_level1 (T@Value T@Value) Bool)
+(declare-fun |Select_[$int]Value| (|T@[Int]Value| Int) T@Value)
+(declare-fun IsEqual_level2 (T@Value T@Value) Bool)
+(declare-fun $ReadValue_stratified (T@Path T@Value) T@Value)
+(declare-fun $ReadValue_level1 (T@Path T@Value) T@Value)
+(declare-fun |Select_[$int]$int| (|T@[Int]Int| Int) Int)
+(declare-fun $ReadValue_level2 (T@Path T@Value) T@Value)
+(declare-fun $UpdateValue_stratified (T@Path T@Value T@Value) T@Value)
+(declare-fun |Store_[$int]Value| (|T@[Int]Value| Int T@Value) |T@[Int]Value|)
+(assert (forall ( ( ?x0 |T@[Int]Value|) ( ?x1 Int) ( ?x2 T@Value)) (= (|Select_[$int]Value| (|Store_[$int]Value| ?x0 ?x1 ?x2) ?x1)  ?x2)))
+(assert (forall ( ( ?x0 |T@[Int]Value|) ( ?x1 Int) ( ?y1 Int) ( ?x2 T@Value)) (=>  (not (= ?x1 ?y1)) (= (|Select_[$int]Value| (|Store_[$int]Value| ?x0 ?x1 ?x2) ?y1) (|Select_[$int]Value| ?x0 ?y1)))))
+(declare-fun $UpdateValue_level1 (T@Path T@Value T@Value) T@Value)
+(declare-fun $UpdateValue_level2 (T@Path T@Value T@Value) T@Value)
+(declare-fun EmptyMemory () T@Memory)
+(declare-fun ConstMemoryDomain (Bool) |T@[Location]Bool|)
+(declare-fun ConstMemoryContent (T@Value) |T@[Location]Value|)
+(declare-fun $Hash_sha2_core (T@Value) T@Value)
+(declare-fun $Hash_sha3_core (T@Value) T@Value)
+(declare-fun $BCS_serialize_core (T@Value) T@Value)
+(declare-fun $Test_Event1_dummy_field () Int)
+(declare-fun $Test_Event1_type_value () T@TypeValue)
+(declare-fun |Store_[$int]TypeValue| (|T@[Int]TypeValue| Int T@TypeValue) |T@[Int]TypeValue|)
+(declare-fun |Select_[$int]TypeValue| (|T@[Int]TypeValue| Int) T@TypeValue)
+(assert (forall ( ( ?x0 |T@[Int]TypeValue|) ( ?x1 Int) ( ?x2 T@TypeValue)) (= (|Select_[$int]TypeValue| (|Store_[$int]TypeValue| ?x0 ?x1 ?x2) ?x1)  ?x2)))
+(assert (forall ( ( ?x0 |T@[Int]TypeValue|) ( ?x1 Int) ( ?y1 Int) ( ?x2 T@TypeValue)) (=>  (not (= ?x1 ?y1)) (= (|Select_[$int]TypeValue| (|Store_[$int]TypeValue| ?x0 ?x1 ?x2) ?y1) (|Select_[$int]TypeValue| ?x0 ?y1)))))
+(declare-fun $Test_Event2_dummy_field () Int)
+(declare-fun $Test_Event2_type_value () T@TypeValue)
+(declare-fun $Test_EventHandle_counter () Int)
+(declare-fun $Test_EventHandle_guid () Int)
+(declare-fun $Test_EventHandle_type_value (T@TypeValue) T@TypeValue)
+(declare-fun $Test_T_received_events () Int)
+(declare-fun $Test_T_sent_events () Int)
+(declare-fun $Test_T_type_value () T@TypeValue)
+(declare-fun $Test_EventHandleGenerator_counter () Int)
+(declare-fun $Test_EventHandleGenerator_type_value () T@TypeValue)
+(declare-fun |lambda#0| (Int Int |T@[Int]Value| T@Value) |T@[Int]Value|)
+(declare-fun |lambda#1| (Int Int Int |T@[Int]Value| |T@[Int]Value| Int T@Value) |T@[Int]Value|)
+(declare-fun |lambda#2| (Int Int Int |T@[Int]Value| |T@[Int]Value| Int T@Value) |T@[Int]Value|)
+(declare-fun |lambda#3| (Int Int |T@[Int]Value| Int Int T@Value) |T@[Int]Value|)
+(declare-fun |lambda#4| (Int Int |T@[Int]Value| Int T@Value) |T@[Int]Value|)
+(assert (distinct $Test_Event1 $Test_Event2 $Test_EventHandle $Test_T $Test_EventHandleGenerator)
+)
+(assert (forall ((file_id Int) (byte_index Int) (var_idx Int) (value T@Value) ) (! (= ($DebugTrackLocal file_id byte_index var_idx value) true)
+ :qid |outputbp.54:27|
+ :skolemid |0|
+ :pattern ( ($DebugTrackLocal file_id byte_index var_idx value))
+)))
+(assert (forall ((file_id@@0 Int) (byte_index@@0 Int) ) (! (= ($DebugTrackAbort file_id@@0 byte_index@@0) true)
+ :qid |outputbp.59:27|
+ :skolemid |1|
+ :pattern ( ($DebugTrackAbort file_id@@0 byte_index@@0))
+)))
+(assert (= (|size#Path| EmptyPath) 0))
+(assert (= DefaultTypeValue ErrorType))
+(assert (= (|l#TypeValueArray| EmptyTypeValueArray) 0))
+(assert (= (|v#TypeValueArray| EmptyTypeValueArray) (MapConstTypeValue DefaultTypeValue)))
+(assert (= MAX_U8 255))
+(assert (= MAX_U64 18446744073709551615))
+(assert (= MAX_U128 340282366920938463463374607431768211455))
+(assert (= DefaultValue Error))
+(assert (= (|l#ValueArray| EmptyValueArray) 0))
+(assert (= (|v#ValueArray| EmptyValueArray) (MapConstValue DefaultValue)))
+(assert (= StratificationDepth 4))
+(assert (forall ((v1 T@Value) (v2 T@Value) ) (! (= (IsEqual_stratified v1 v2)  (or (= v1 v2) (and (and (and (is-Vector v1) (is-Vector v2)) (= (|l#ValueArray| (|v#Vector| v1)) (|l#ValueArray| (|v#Vector| v2)))) (forall ((i Int) ) (!  (=> (and (<= 0 i) (< i (|l#ValueArray| (|v#Vector| v1)))) (IsEqual_level1 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v1)) i) (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v2)) i)))
+ :qid |outputbp.237:14|
+ :skolemid |3|
+)))))
+ :qid |outputbp.232:30|
+ :skolemid |4|
+ :pattern ( (IsEqual_stratified v1 v2))
+)))
+(assert (forall ((v1@@0 T@Value) (v2@@0 T@Value) ) (! (= (IsEqual_level1 v1@@0 v2@@0)  (or (= v1@@0 v2@@0) (and (and (and (is-Vector v1@@0) (is-Vector v2@@0)) (= (|l#ValueArray| (|v#Vector| v1@@0)) (|l#ValueArray| (|v#Vector| v2@@0)))) (forall ((i@@0 Int) ) (!  (=> (and (<= 0 i@@0) (< i@@0 (|l#ValueArray| (|v#Vector| v1@@0)))) (IsEqual_level2 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v1@@0)) i@@0) (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v2@@0)) i@@0)))
+ :qid |outputbp.245:14|
+ :skolemid |5|
+)))))
+ :qid |outputbp.240:26|
+ :skolemid |6|
+ :pattern ( (IsEqual_level1 v1@@0 v2@@0))
+)))
+(assert (forall ((v1@@1 T@Value) (v2@@1 T@Value) ) (! (= (IsEqual_level2 v1@@1 v2@@1)  (or (= v1@@1 v2@@1) (and (and (and (is-Vector v1@@1) (is-Vector v2@@1)) (= (|l#ValueArray| (|v#Vector| v1@@1)) (|l#ValueArray| (|v#Vector| v2@@1)))) (forall ((i@@1 Int) ) (!  (=> (and (<= 0 i@@1) (< i@@1 (|l#ValueArray| (|v#Vector| v1@@1)))) (= (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v1@@1)) i@@1) (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v2@@1)) i@@1)))
+ :qid |outputbp.253:14|
+ :skolemid |7|
+)))))
+ :qid |outputbp.248:26|
+ :skolemid |8|
+ :pattern ( (IsEqual_level2 v1@@1 v2@@1))
+)))
+(assert (forall ((p T@Path) (v T@Value) ) (! (= ($ReadValue_stratified p v) (ite (= 0 (|size#Path| p)) v ($ReadValue_level1 p (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v)) (|Select_[$int]$int| (|p#Path| p) 0)))))
+ :qid |outputbp.270:33|
+ :skolemid |9|
+ :pattern ( ($ReadValue_stratified p v))
+)))
+(assert (forall ((p@@0 T@Path) (v@@0 T@Value) ) (! (= ($ReadValue_level1 p@@0 v@@0) (ite (= 1 (|size#Path| p@@0)) v@@0 ($ReadValue_level2 p@@0 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v@@0)) (|Select_[$int]$int| (|p#Path| p@@0) 1)))))
+ :qid |outputbp.277:29|
+ :skolemid |10|
+ :pattern ( ($ReadValue_level1 p@@0 v@@0))
+)))
+(assert (forall ((p@@1 T@Path) (v@@1 T@Value) ) (! (= ($ReadValue_level2 p@@1 v@@1) (ite (= 2 (|size#Path| p@@1)) v@@1 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v@@1)) (|Select_[$int]$int| (|p#Path| p@@1) 2))))
+ :qid |outputbp.284:29|
+ :skolemid |11|
+ :pattern ( ($ReadValue_level2 p@@1 v@@1))
+)))
+(assert (forall ((p@@2 T@Path) (v@@2 T@Value) (new_v T@Value) ) (! (= ($UpdateValue_stratified p@@2 v@@2 new_v) (ite (= 0 (|size#Path| p@@2)) new_v (Vector (ValueArray (|Store_[$int]Value| (|v#ValueArray| (|v#Vector| v@@2)) (|Select_[$int]$int| (|p#Path| p@@2) 0) ($UpdateValue_level1 p@@2 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v@@2)) (|Select_[$int]$int| (|p#Path| p@@2) 0)) new_v)) (|l#ValueArray| (|v#Vector| v@@2))))))
+ :qid |outputbp.303:35|
+ :skolemid |12|
+ :pattern ( ($UpdateValue_stratified p@@2 v@@2 new_v))
+)))
+(assert (forall ((p@@3 T@Path) (v@@3 T@Value) (new_v@@0 T@Value) ) (! (= ($UpdateValue_level1 p@@3 v@@3 new_v@@0) (ite (= 1 (|size#Path| p@@3)) new_v@@0 (Vector (ValueArray (|Store_[$int]Value| (|v#ValueArray| (|v#Vector| v@@3)) (|Select_[$int]$int| (|p#Path| p@@3) 1) ($UpdateValue_level2 p@@3 (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| v@@3)) (|Select_[$int]$int| (|p#Path| p@@3) 1)) new_v@@0)) (|l#ValueArray| (|v#Vector| v@@3))))))
+ :qid |outputbp.311:31|
+ :skolemid |13|
+ :pattern ( ($UpdateValue_level1 p@@3 v@@3 new_v@@0))
+)))
+(assert (forall ((p@@4 T@Path) (v@@4 T@Value) (new_v@@1 T@Value) ) (! (= ($UpdateValue_level2 p@@4 v@@4 new_v@@1) (ite (= 2 (|size#Path| p@@4)) new_v@@1 (Vector (ValueArray (|Store_[$int]Value| (|v#ValueArray| (|v#Vector| v@@4)) (|Select_[$int]$int| (|p#Path| p@@4) 2) new_v@@1) (|l#ValueArray| (|v#Vector| v@@4))))))
+ :qid |outputbp.319:31|
+ :skolemid |14|
+ :pattern ( ($UpdateValue_level2 p@@4 v@@4 new_v@@1))
+)))
+(assert (= (|domain#Memory| EmptyMemory) (ConstMemoryDomain false)))
+(assert (= (|contents#Memory| EmptyMemory) (ConstMemoryContent DefaultValue)))
+(assert (forall ((v1@@2 T@Value) (v2@@2 T@Value) ) (!  (=> (and (and (and (is-Vector v1@@2) (let ((va (|v#Vector| v1@@2)))
+(let ((l (|l#ValueArray| va)))
+ (and (<= 0 l) (forall ((x Int) ) (!  (=> (or (< x 0) (>= x l)) (= (|Select_[$int]Value| (|v#ValueArray| va) x) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va) x))
+)))))) (and (is-Vector v2@@2) (let ((va@@0 (|v#Vector| v2@@2)))
+(let ((l@@0 (|l#ValueArray| va@@0)))
+ (and (<= 0 l@@0) (forall ((x@@0 Int) ) (!  (=> (or (< x@@0 0) (>= x@@0 l@@0)) (= (|Select_[$int]Value| (|v#ValueArray| va@@0) x@@0) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@0) x@@0))
+))))))) (IsEqual_stratified v1@@2 v2@@2)) (IsEqual_stratified ($Hash_sha2_core v1@@2) ($Hash_sha2_core v2@@2)))
+ :qid |outputbp.1012:15|
+ :skolemid |18|
+)))
+(assert (forall ((v1@@3 T@Value) (v2@@3 T@Value) ) (!  (=> (and (and (and (is-Vector v1@@3) (let ((va@@1 (|v#Vector| v1@@3)))
+(let ((l@@1 (|l#ValueArray| va@@1)))
+ (and (<= 0 l@@1) (forall ((x@@1 Int) ) (!  (=> (or (< x@@1 0) (>= x@@1 l@@1)) (= (|Select_[$int]Value| (|v#ValueArray| va@@1) x@@1) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@1) x@@1))
+)))))) (and (is-Vector v2@@3) (let ((va@@2 (|v#Vector| v2@@3)))
+(let ((l@@2 (|l#ValueArray| va@@2)))
+ (and (<= 0 l@@2) (forall ((x@@2 Int) ) (!  (=> (or (< x@@2 0) (>= x@@2 l@@2)) (= (|Select_[$int]Value| (|v#ValueArray| va@@2) x@@2) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@2) x@@2))
+))))))) (IsEqual_stratified ($Hash_sha2_core v1@@3) ($Hash_sha2_core v2@@3))) (IsEqual_stratified v1@@3 v2@@3))
+ :qid |outputbp.1016:15|
+ :skolemid |19|
+)))
+(assert (forall ((v1@@4 T@Value) (v2@@4 T@Value) ) (!  (=> (and (and (and (is-Vector v1@@4) (let ((va@@3 (|v#Vector| v1@@4)))
+(let ((l@@3 (|l#ValueArray| va@@3)))
+ (and (<= 0 l@@3) (forall ((x@@3 Int) ) (!  (=> (or (< x@@3 0) (>= x@@3 l@@3)) (= (|Select_[$int]Value| (|v#ValueArray| va@@3) x@@3) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@3) x@@3))
+)))))) (and (is-Vector v2@@4) (let ((va@@4 (|v#Vector| v2@@4)))
+(let ((l@@4 (|l#ValueArray| va@@4)))
+ (and (<= 0 l@@4) (forall ((x@@4 Int) ) (!  (=> (or (< x@@4 0) (>= x@@4 l@@4)) (= (|Select_[$int]Value| (|v#ValueArray| va@@4) x@@4) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@4) x@@4))
+))))))) (IsEqual_stratified v1@@4 v2@@4)) (IsEqual_stratified ($Hash_sha3_core v1@@4) ($Hash_sha3_core v2@@4)))
+ :qid |outputbp.1034:15|
+ :skolemid |20|
+)))
+(assert (forall ((v1@@5 T@Value) (v2@@5 T@Value) ) (!  (=> (and (and (and (is-Vector v1@@5) (let ((va@@5 (|v#Vector| v1@@5)))
+(let ((l@@5 (|l#ValueArray| va@@5)))
+ (and (<= 0 l@@5) (forall ((x@@5 Int) ) (!  (=> (or (< x@@5 0) (>= x@@5 l@@5)) (= (|Select_[$int]Value| (|v#ValueArray| va@@5) x@@5) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@5) x@@5))
+)))))) (and (is-Vector v2@@5) (let ((va@@6 (|v#Vector| v2@@5)))
+(let ((l@@6 (|l#ValueArray| va@@6)))
+ (and (<= 0 l@@6) (forall ((x@@6 Int) ) (!  (=> (or (< x@@6 0) (>= x@@6 l@@6)) (= (|Select_[$int]Value| (|v#ValueArray| va@@6) x@@6) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@6) x@@6))
+))))))) (IsEqual_stratified ($Hash_sha3_core v1@@5) ($Hash_sha3_core v2@@5))) (IsEqual_stratified v1@@5 v2@@5))
+ :qid |outputbp.1037:15|
+ :skolemid |21|
+)))
+(assert (forall ((v1@@6 T@Value) (v2@@6 T@Value) ) (!  (=> (IsEqual_stratified v1@@6 v2@@6) (IsEqual_stratified ($BCS_serialize_core v1@@6) ($BCS_serialize_core v2@@6)))
+ :qid |outputbp.1122:15|
+ :skolemid |22|
+)))
+(assert (forall ((v1@@7 T@Value) (v2@@7 T@Value) ) (!  (=> (IsEqual_stratified ($BCS_serialize_core v1@@7) ($BCS_serialize_core v2@@7)) (IsEqual_stratified v1@@7 v2@@7))
+ :qid |outputbp.1126:15|
+ :skolemid |23|
+)))
+(assert (forall ((v@@5 T@Value) ) (! (let ((r ($BCS_serialize_core v@@5)))
+ (and (and (and (is-Vector r) (let ((va@@7 (|v#Vector| r)))
+(let ((l@@7 (|l#ValueArray| va@@7)))
+ (and (<= 0 l@@7) (forall ((x@@7 Int) ) (!  (=> (or (< x@@7 0) (>= x@@7 l@@7)) (= (|Select_[$int]Value| (|v#ValueArray| va@@7) x@@7) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@7) x@@7))
+)))))) (forall ((i@@2 Int) ) (!  (=> (and (<= 0 i@@2) (< i@@2 (|l#ValueArray| (|v#Vector| r)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| r)) i@@2)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| r)) i@@2)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| r)) i@@2)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| r)) i@@2))
+))) (> (|l#ValueArray| (|v#Vector| r)) 0)))
+ :qid |outputbp.1130:15|
+ :skolemid |24|
+)))
+(assert (= $Test_Event1_dummy_field 0))
+(assert (= $Test_Event1_type_value (StructType $Test_Event1 (TypeValueArray (MapConstTypeValue DefaultTypeValue) 0) (TypeValueArray (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 BooleanType) 1))))
+(assert (= $Test_Event2_dummy_field 0))
+(assert (= $Test_Event2_type_value (StructType $Test_Event2 (TypeValueArray (MapConstTypeValue DefaultTypeValue) 0) (TypeValueArray (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 BooleanType) 1))))
+(assert (= $Test_EventHandle_counter 0))
+(assert (= $Test_EventHandle_guid 1))
+(assert (forall (($tv0 T@TypeValue) ) (! (= ($Test_EventHandle_type_value $tv0) (StructType $Test_EventHandle (TypeValueArray (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 $tv0) 1) (TypeValueArray (|Store_[$int]TypeValue| (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 IntegerType) 1 (VectorType IntegerType)) 2)))
+ :qid |outputbp.1326:39|
+ :skolemid |25|
+ :pattern ( ($Test_EventHandle_type_value $tv0))
+)))
+(assert (= $Test_T_received_events 0))
+(assert (= $Test_T_sent_events 1))
+(assert (= $Test_T_type_value (StructType $Test_T (TypeValueArray (MapConstTypeValue DefaultTypeValue) 0) (TypeValueArray (|Store_[$int]TypeValue| (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 ($Test_EventHandle_type_value $Test_Event1_type_value)) 1 ($Test_EventHandle_type_value $Test_Event2_type_value)) 2))))
+(assert (= $Test_EventHandleGenerator_counter 0))
+(assert (= $Test_EventHandleGenerator_type_value (StructType $Test_EventHandleGenerator (TypeValueArray (MapConstTypeValue DefaultTypeValue) 0) (TypeValueArray (|Store_[$int]TypeValue| (MapConstTypeValue DefaultTypeValue) 0 IntegerType) 1))))
+(assert (forall ((i@@3 Int) (|l#0| Int) (|l#1| Int) (|l#2| |T@[Int]Value|) (|l#3| T@Value) ) (! (= (|Select_[$int]Value| (|lambda#0| |l#0| |l#1| |l#2| |l#3|) i@@3) (ite  (and (>= i@@3 |l#0|) (< i@@3 |l#1|)) (|Select_[$int]Value| |l#2| i@@3) |l#3|))
+ :qid |outputbp.162:21|
+ :skolemid |45|
+ :pattern ( (|Select_[$int]Value| (|lambda#0| |l#0| |l#1| |l#2| |l#3|) i@@3))
+)))
+(assert (forall ((j Int) (|l#0@@0| Int) (|l#1@@0| Int) (|l#2@@0| Int) (|l#3@@0| |T@[Int]Value|) (|l#4| |T@[Int]Value|) (|l#5| Int) (|l#6| T@Value) ) (! (= (|Select_[$int]Value| (|lambda#1| |l#0@@0| |l#1@@0| |l#2@@0| |l#3@@0| |l#4| |l#5| |l#6|) j) (ite  (and (>= j |l#0@@0|) (< j |l#1@@0|)) (ite (< j |l#2@@0|) (|Select_[$int]Value| |l#3@@0| j) (|Select_[$int]Value| |l#4| (+ j |l#5|))) |l#6|))
+ :qid |outputbp.172:21|
+ :skolemid |46|
+ :pattern ( (|Select_[$int]Value| (|lambda#1| |l#0@@0| |l#1@@0| |l#2@@0| |l#3@@0| |l#4| |l#5| |l#6|) j))
+)))
+(assert (forall ((i@@4 Int) (|l#0@@1| Int) (|l#1@@1| Int) (|l#2@@1| Int) (|l#3@@1| |T@[Int]Value|) (|l#4@@0| |T@[Int]Value|) (|l#5@@0| Int) (|l#6@@0| T@Value) ) (! (= (|Select_[$int]Value| (|lambda#2| |l#0@@1| |l#1@@1| |l#2@@1| |l#3@@1| |l#4@@0| |l#5@@0| |l#6@@0|) i@@4) (ite  (and (>= i@@4 |l#0@@1|) (< i@@4 |l#1@@1|)) (ite (< i@@4 |l#2@@1|) (|Select_[$int]Value| |l#3@@1| i@@4) (|Select_[$int]Value| |l#4@@0| (- i@@4 |l#5@@0|))) |l#6@@0|))
+ :qid |outputbp.184:21|
+ :skolemid |47|
+ :pattern ( (|Select_[$int]Value| (|lambda#2| |l#0@@1| |l#1@@1| |l#2@@1| |l#3@@1| |l#4@@0| |l#5@@0| |l#6@@0|) i@@4))
+)))
+(assert (forall ((i@@5 Int) (|l#0@@2| Int) (|l#1@@2| Int) (|l#2@@2| |T@[Int]Value|) (|l#3@@2| Int) (|l#4@@1| Int) (|l#5@@1| T@Value) ) (! (= (|Select_[$int]Value| (|lambda#3| |l#0@@2| |l#1@@2| |l#2@@2| |l#3@@2| |l#4@@1| |l#5@@1|) i@@5) (ite  (and (<= |l#0@@2| i@@5) (< i@@5 |l#1@@2|)) (|Select_[$int]Value| |l#2@@2| (- (- |l#3@@2| i@@5) |l#4@@1|)) |l#5@@1|))
+ :qid |outputbp.196:21|
+ :skolemid |48|
+ :pattern ( (|Select_[$int]Value| (|lambda#3| |l#0@@2| |l#1@@2| |l#2@@2| |l#3@@2| |l#4@@1| |l#5@@1|) i@@5))
+)))
+(assert (forall ((k Int) (|l#0@@3| Int) (|l#1@@3| Int) (|l#2@@3| |T@[Int]Value|) (|l#3@@3| Int) (|l#4@@2| T@Value) ) (! (= (|Select_[$int]Value| (|lambda#4| |l#0@@3| |l#1@@3| |l#2@@3| |l#3@@3| |l#4@@2|) k) (ite  (and (<= |l#0@@3| k) (< k |l#1@@3|)) (|Select_[$int]Value| |l#2@@3| (+ |l#3@@3| k)) |l#4@@2|))
+ :qid |outputbp.202:24|
+ :skolemid |49|
+ :pattern ( (|Select_[$int]Value| (|lambda#4| |l#0@@3| |l#1@@3| |l#2@@3| |l#3@@3| |l#4@@2|) k))
+)))
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun fresh_address () T@Value)
+(declare-fun auth_key_prefix () T@Value)
+(declare-fun $abort_flag@7 () Bool)
+(declare-fun |Select_[Location]$bool| (|T@[Location]Bool| T@Location) Bool)
+(declare-fun $m () T@Memory)
+(declare-fun $txn () T@Transaction)
+(declare-fun inline$$Test_create$0$$ret0@2 () T@Value)
+(declare-fun |Select_[Location]Value| (|T@[Location]Value| T@Location) T@Value)
+(declare-fun $m@69 () T@Memory)
+(declare-fun inline$$Test_create$0$$ret0@1 () T@Value)
+(declare-fun $m@68 () T@Memory)
+(declare-fun $abort_flag@6 () Bool)
+(declare-fun inline$$CopyOrMoveValue$23$local@0 () T@Value)
+(declare-fun |Store_[Location]$bool| (|T@[Location]Bool| T@Location Bool) |T@[Location]Bool|)
+(assert (forall ( ( ?x0 |T@[Location]Bool|) ( ?x1 T@Location) ( ?x2 Bool)) (= (|Select_[Location]$bool| (|Store_[Location]$bool| ?x0 ?x1 ?x2) ?x1)  ?x2)))
+(assert (forall ( ( ?x0 |T@[Location]Bool|) ( ?x1 T@Location) ( ?y1 T@Location) ( ?x2 Bool)) (=>  (not (= ?x1 ?y1)) (= (|Select_[Location]$bool| (|Store_[Location]$bool| ?x0 ?x1 ?x2) ?y1) (|Select_[Location]$bool| ?x0 ?y1)))))
+(declare-fun $m@67 () T@Memory)
+(declare-fun |Store_[Location]Value| (|T@[Location]Value| T@Location T@Value) |T@[Location]Value|)
+(assert (forall ( ( ?x0 |T@[Location]Value|) ( ?x1 T@Location) ( ?x2 T@Value)) (= (|Select_[Location]Value| (|Store_[Location]Value| ?x0 ?x1 ?x2) ?x1)  ?x2)))
+(assert (forall ( ( ?x0 |T@[Location]Value|) ( ?x1 T@Location) ( ?y1 T@Location) ( ?x2 T@Value)) (=>  (not (= ?x1 ?y1)) (= (|Select_[Location]Value| (|Store_[Location]Value| ?x0 ?x1 ?x2) ?y1) (|Select_[Location]Value| ?x0 ?y1)))))
+(declare-fun $m@65 () T@Memory)
+(declare-fun inline$$MoveToSender$0$ta@0 () T@TypeValue)
+(declare-fun inline$$MoveToSender$0$a@1 () Int)
+(declare-fun $m@66 () T@Memory)
+(declare-fun inline$$MoveToSender$0$l@1 () T@Location)
+(declare-fun inline$$MoveToSender$0$v@0 () T@Value)
+(declare-fun $abort_flag@5 () Bool)
+(declare-fun $m@64 () T@Memory)
+(declare-fun inline$$Test_T_pack$0$$struct@1 () T@Value)
+(declare-fun inline$$Test_T_pack$0$received_events@0 () T@Value)
+(declare-fun inline$$Test_T_pack$0$sent_events@0 () T@Value)
+(declare-fun inline$$Test_new_event_handle_impl$1$$ret0@2 () T@Value)
+(declare-fun $m@63 () T@Memory)
+(declare-fun inline$$BorrowLoc$3$dst@1 () T@Reference)
+(declare-fun $m@41 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$1$sender@0 () T@Value)
+(declare-fun inline$$Test_new_event_handle_impl$1$$ret0@1 () T@Value)
+(declare-fun $m@62 () T@Memory)
+(declare-fun $abort_flag@4 () Bool)
+(declare-fun $m@61 () T@Memory)
+(declare-fun $local_counter@2 () Int)
+(declare-fun inline$$Test_EventHandle_pack$1$$struct@1 () T@Value)
+(declare-fun inline$$Test_EventHandle_pack$1$counter@0 () T@Value)
+(declare-fun inline$$Test_EventHandle_pack$1$guid@0 () T@Value)
+(declare-fun inline$$Test_fresh_guid$1$$ret0@2 () T@Value)
+(declare-fun $m@60 () T@Memory)
+(declare-fun $m@44 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$1$sender@0 () T@Value)
+(declare-fun $abort_flag@3 () Bool)
+(declare-fun $abort_flag@2 () Bool)
+(declare-fun $m@59 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$1$$ret0@1 () T@Value)
+(declare-fun inline$$CopyOrMoveValue$22$local@0 () T@Value)
+(declare-fun $m@58 () T@Memory)
+(declare-fun $local_counter@3 () Int)
+(declare-fun inline$$WriteRef$4$l@1 () T@Location)
+(declare-fun inline$$BorrowLoc$4$dst@1 () T@Reference)
+(declare-fun inline$$WriteRef$4$v@1 () T@Value)
+(declare-fun $m@57 () T@Memory)
+(declare-fun inline$$WriteRef$4$v@2 () T@Value)
+(declare-fun inline$$WriteRef$4$new_v@0 () T@Value)
+(declare-fun inline$$Vector_append$2$other@0 () T@Value)
+(declare-fun inline$$Vector_append$2$v@1 () T@Value)
+(declare-fun inline$$Vector_append$2$ta@0 () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$21$local@0 () T@Value)
+(declare-fun $m@56 () T@Memory)
+(declare-fun inline$$BorrowLoc$4$l@0 () Int)
+(declare-fun inline$$WriteRef$3$l@1 () T@Location)
+(declare-fun inline$$BorrowField$5$dst@1 () T@Reference)
+(declare-fun inline$$WriteRef$3$v@1 () T@Value)
+(declare-fun $m@55 () T@Memory)
+(declare-fun inline$$WriteRef$3$v@2 () T@Value)
+(declare-fun inline$$WriteRef$3$new_v@0 () T@Value)
+(declare-fun inline$$BorrowField$5$p@1 () T@Path)
+(declare-fun inline$$BorrowField$5$size@1 () Int)
+(declare-fun inline$$BorrowField$5$p@2 () T@Path)
+(declare-fun |Store_[$int]$int| (|T@[Int]Int| Int Int) |T@[Int]Int|)
+(assert (forall ( ( ?x0 |T@[Int]Int|) ( ?x1 Int) ( ?x2 Int)) (= (|Select_[$int]$int| (|Store_[$int]$int| ?x0 ?x1 ?x2) ?x1)  ?x2)))
+(assert (forall ( ( ?x0 |T@[Int]Int|) ( ?x1 Int) ( ?y1 Int) ( ?x2 Int)) (=>  (not (= ?x1 ?y1)) (= (|Select_[$int]$int| (|Store_[$int]$int| ?x0 ?x1 ?x2) ?y1) (|Select_[$int]$int| ?x0 ?y1)))))
+(declare-fun $m@54 () T@Memory)
+(declare-fun inline$$AddU64$1$dst@2 () T@Value)
+(declare-fun inline$$AddU64$1$src1@0 () T@Value)
+(declare-fun inline$$AddU64$1$src2@0 () T@Value)
+(declare-fun inline$$AddU64$1$dst@1 () T@Value)
+(declare-fun inline$$AddU64$1$dst@0 () T@Value)
+(declare-fun inline$$CopyOrMoveValue$20$local@0 () T@Value)
+(declare-fun $m@53 () T@Memory)
+(declare-fun $m@52 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$1$$tmp@1 () T@Value)
+(declare-fun inline$$ReadRef$3$v@1 () T@Value)
+(declare-fun $m@51 () T@Memory)
+(declare-fun inline$$BorrowField$4$dst@1 () T@Reference)
+(declare-fun inline$$BorrowField$4$p@1 () T@Path)
+(declare-fun inline$$BorrowField$4$size@1 () Int)
+(declare-fun inline$$BorrowField$4$p@2 () T@Path)
+(declare-fun inline$$CopyOrMoveValue$19$local@0 () T@Value)
+(declare-fun $m@50 () T@Memory)
+(declare-fun call2formal@res@0 () T@Value)
+(declare-fun $m@49 () T@Memory)
+(declare-fun inline$$ReadRef$2$v@1 () T@Value)
+(declare-fun $m@48 () T@Memory)
+(declare-fun call0formal@ta@0 () T@TypeValue)
+(declare-fun call1formal@v@0 () T@Value)
+(declare-fun inline$$BorrowField$3$dst@1 () T@Reference)
+(declare-fun inline$$BorrowField$3$p@1 () T@Path)
+(declare-fun inline$$BorrowField$3$size@1 () Int)
+(declare-fun inline$$BorrowField$3$p@2 () T@Path)
+(declare-fun inline$$CopyOrMoveValue$18$local@0 () T@Value)
+(declare-fun $m@47 () T@Memory)
+(declare-fun call2formal@res@0@@0 () T@Value)
+(declare-fun $m@46 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$17$local@0 () T@Value)
+(declare-fun $m@45 () T@Memory)
+(declare-fun call0formal@ta@0@@0 () T@TypeValue)
+(declare-fun call1formal@v@0@@0 () T@Value)
+(declare-fun $local_counter@4 () Int)
+(declare-fun $DiemAccount_T_type_value () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$16$local@0 () T@Value)
+(declare-fun $m@43 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$1$$tmp@1 () T@Value)
+(declare-fun $m@42 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$1$$tv0@0 () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$15$local@0 () T@Value)
+(declare-fun $m@40 () T@Memory)
+(declare-fun inline$$BorrowLoc$3$l@0 () Int)
+(declare-fun inline$$Test_new_event_handle_impl$0$$ret0@2 () T@Value)
+(declare-fun $m@39 () T@Memory)
+(declare-fun inline$$BorrowLoc$1$dst@1 () T@Reference)
+(declare-fun $m@17 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$0$sender@0 () T@Value)
+(declare-fun inline$$Test_new_event_handle_impl$0$$ret0@1 () T@Value)
+(declare-fun $m@38 () T@Memory)
+(declare-fun $abort_flag@1 () Bool)
+(declare-fun $m@37 () T@Memory)
+(declare-fun $local_counter@0 () Int)
+(declare-fun inline$$Test_EventHandle_pack$0$$struct@1 () T@Value)
+(declare-fun inline$$Test_EventHandle_pack$0$counter@0 () T@Value)
+(declare-fun inline$$Test_EventHandle_pack$0$guid@0 () T@Value)
+(declare-fun inline$$Test_fresh_guid$0$$ret0@2 () T@Value)
+(declare-fun $m@36 () T@Memory)
+(declare-fun $m@20 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$0$sender@0 () T@Value)
+(declare-fun $abort_flag@0 () Bool)
+(declare-fun $m@35 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$0$$ret0@1 () T@Value)
+(declare-fun inline$$CopyOrMoveValue$14$local@0 () T@Value)
+(declare-fun $m@34 () T@Memory)
+(declare-fun $local_counter@1 () Int)
+(declare-fun inline$$WriteRef$2$l@1 () T@Location)
+(declare-fun inline$$BorrowLoc$2$dst@1 () T@Reference)
+(declare-fun inline$$WriteRef$2$v@1 () T@Value)
+(declare-fun $m@33 () T@Memory)
+(declare-fun inline$$WriteRef$2$v@2 () T@Value)
+(declare-fun inline$$WriteRef$2$new_v@0 () T@Value)
+(declare-fun inline$$Vector_append$1$other@0 () T@Value)
+(declare-fun inline$$Vector_append$1$v@1 () T@Value)
+(declare-fun inline$$Vector_append$1$ta@0 () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$13$local@0 () T@Value)
+(declare-fun $m@32 () T@Memory)
+(declare-fun inline$$BorrowLoc$2$l@0 () Int)
+(declare-fun inline$$WriteRef$1$l@1 () T@Location)
+(declare-fun inline$$BorrowField$2$dst@1 () T@Reference)
+(declare-fun inline$$WriteRef$1$v@1 () T@Value)
+(declare-fun $m@31 () T@Memory)
+(declare-fun inline$$WriteRef$1$v@2 () T@Value)
+(declare-fun inline$$WriteRef$1$new_v@0 () T@Value)
+(declare-fun inline$$BorrowField$2$p@1 () T@Path)
+(declare-fun inline$$BorrowField$2$size@1 () Int)
+(declare-fun inline$$BorrowField$2$p@2 () T@Path)
+(declare-fun $m@30 () T@Memory)
+(declare-fun inline$$AddU64$0$dst@2 () T@Value)
+(declare-fun inline$$AddU64$0$src1@0 () T@Value)
+(declare-fun inline$$AddU64$0$src2@0 () T@Value)
+(declare-fun inline$$AddU64$0$dst@1 () T@Value)
+(declare-fun inline$$AddU64$0$dst@0 () T@Value)
+(declare-fun inline$$CopyOrMoveValue$12$local@0 () T@Value)
+(declare-fun $m@29 () T@Memory)
+(declare-fun $m@28 () T@Memory)
+(declare-fun inline$$Test_fresh_guid$0$$tmp@1 () T@Value)
+(declare-fun inline$$ReadRef$1$v@1 () T@Value)
+(declare-fun $m@27 () T@Memory)
+(declare-fun inline$$BorrowField$1$dst@1 () T@Reference)
+(declare-fun inline$$BorrowField$1$p@1 () T@Path)
+(declare-fun inline$$BorrowField$1$size@1 () Int)
+(declare-fun inline$$BorrowField$1$p@2 () T@Path)
+(declare-fun inline$$CopyOrMoveValue$11$local@0 () T@Value)
+(declare-fun $m@26 () T@Memory)
+(declare-fun call2formal@res@0@@1 () T@Value)
+(declare-fun $m@25 () T@Memory)
+(declare-fun inline$$ReadRef$0$v@1 () T@Value)
+(declare-fun $m@24 () T@Memory)
+(declare-fun call0formal@ta@0@@1 () T@TypeValue)
+(declare-fun call1formal@v@0@@1 () T@Value)
+(declare-fun inline$$BorrowField$0$dst@1 () T@Reference)
+(declare-fun inline$$BorrowField$0$p@1 () T@Path)
+(declare-fun inline$$BorrowField$0$size@1 () Int)
+(declare-fun inline$$BorrowField$0$p@2 () T@Path)
+(declare-fun inline$$CopyOrMoveValue$10$local@0 () T@Value)
+(declare-fun $m@23 () T@Memory)
+(declare-fun call2formal@res@0@@2 () T@Value)
+(declare-fun $m@22 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$9$local@0 () T@Value)
+(declare-fun $m@21 () T@Memory)
+(declare-fun call0formal@ta@0@@2 () T@TypeValue)
+(declare-fun call1formal@v@0@@2 () T@Value)
+(declare-fun inline$$CopyOrMoveValue$8$local@0 () T@Value)
+(declare-fun $m@19 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$0$$tmp@1 () T@Value)
+(declare-fun $m@18 () T@Memory)
+(declare-fun inline$$Test_new_event_handle_impl$0$$tv0@0 () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$7$local@0 () T@Value)
+(declare-fun $m@15 () T@Memory)
+(declare-fun inline$$BorrowLoc$1$l@0 () Int)
+(declare-fun inline$$Test_create$0$$tmp@4 () T@Value)
+(declare-fun inline$$Test_create$0$$tmp@5 () T@Value)
+(declare-fun $m@16 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$6$local@0 () T@Value)
+(declare-fun $m@14 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$5$local@0 () T@Value)
+(declare-fun $m@13 () T@Memory)
+(declare-fun inline$$Vector_length$0$l@1 () T@Value)
+(declare-fun $m@11 () T@Memory)
+(declare-fun $m@10 () T@Memory)
+(declare-fun inline$$Test_create$0$$tmp@2 () T@Value)
+(declare-fun $m@12 () T@Memory)
+(declare-fun inline$$Test_create$0$$tmp@3 () T@Value)
+(declare-fun inline$$Vector_length$0$v@0 () T@Value)
+(declare-fun inline$$Vector_length$0$ta@0 () T@TypeValue)
+(declare-fun inline$$CopyOrMoveValue$4$local@0 () T@Value)
+(declare-fun $m@9 () T@Memory)
+(declare-fun inline$$WriteRef$0$l@1 () T@Location)
+(declare-fun inline$$BorrowLoc$0$dst@1 () T@Reference)
+(declare-fun inline$$WriteRef$0$v@1 () T@Value)
+(declare-fun $m@8 () T@Memory)
+(declare-fun inline$$WriteRef$0$v@2 () T@Value)
+(declare-fun inline$$WriteRef$0$new_v@0 () T@Value)
+(declare-fun inline$$Vector_append$0$other@0 () T@Value)
+(declare-fun inline$$Vector_append$0$v@1 () T@Value)
+(declare-fun inline$$Vector_append$0$ta@0 () T@TypeValue)
+(declare-fun call2formal@res@0@@3 () T@Value)
+(declare-fun $m@7 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$3$local@0 () T@Value)
+(declare-fun $m@6 () T@Memory)
+(declare-fun call0formal@ta@0@@3 () T@TypeValue)
+(declare-fun call1formal@v@0@@3 () T@Value)
+(declare-fun inline$$BorrowLoc$0$l@0 () Int)
+(declare-fun inline$$CopyOrMoveValue$2$local@0 () T@Value)
+(declare-fun $m@5 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$1$local@0 () T@Value)
+(declare-fun $m@4 () T@Memory)
+(declare-fun inline$$CopyOrMoveValue$0$local@0 () T@Value)
+(declare-fun $m@3 () T@Memory)
+(declare-fun $m@2 () T@Memory)
+(declare-fun inline$$Test_EventHandleGenerator_pack$0$$struct@1 () T@Value)
+(declare-fun inline$$Test_EventHandleGenerator_pack$0$counter@0 () T@Value)
+(declare-fun inline$$Test_create$0$$tmp@1 () T@Value)
+(declare-fun $m@1 () T@Memory)
+(declare-fun $m@0 () T@Memory)
+(push 1)
+(set-info :boogie-vc-id $Test_create_verify)
+(assert (not
+ (=> (= (ControlFlow 0 0) 27784) (let ((inline$$Test_fresh_guid$0$anon27_Then_correct true))
+(let ((inline$$Test_fresh_guid$0$anon25_Then_correct true))
+(let ((inline$$Test_create$0$Return_correct  (and (=> (= (ControlFlow 0 25440) (- 0 35440)) (=> (|b#Boolean| (Boolean  (not (IsEqual_stratified (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (Integer 32))))) $abort_flag@7)) (=> (=> (|b#Boolean| (Boolean  (not (IsEqual_stratified (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (Integer 32))))) $abort_flag@7) (and (=> (= (ControlFlow 0 25440) (- 0 35476)) (=> (|b#Boolean| (Boolean (|Select_[Location]$bool| (|domain#Memory| $m) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $abort_flag@7)) (=> (=> (|b#Boolean| (Boolean (|Select_[Location]$bool| (|domain#Memory| $m) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $abort_flag@7) (and (=> (= (ControlFlow 0 25440) (- 0 35490)) (=> $abort_flag@7 (or (|b#Boolean| (Boolean  (not (IsEqual_stratified (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (Integer 32))))) (|b#Boolean| (Boolean (|Select_[Location]$bool| (|domain#Memory| $m) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn)))))))))) (=> (=> $abort_flag@7 (or (|b#Boolean| (Boolean  (not (IsEqual_stratified (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (Integer 32))))) (|b#Boolean| (Boolean (|Select_[Location]$bool| (|domain#Memory| $m) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))))) (and (=> (= (ControlFlow 0 25440) (- 0 35539)) (=> (not $abort_flag@7) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))))))) (|v#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))))))) auth_key_prefix)))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))))))) ($BCS_serialize_core fresh_address))))))))) (=> (=> (not $abort_flag@7) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))))))) (|v#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix)))))))))) auth_key_prefix)))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| auth_key_prefix))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_create$0$$ret0@2)))))))))) ($BCS_serialize_core fresh_address)))))))) (and (=> (= (ControlFlow 0 25440) (- 0 35560)) (=> (not $abort_flag@7) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))))))) ($BCS_serialize_core (Integer 2)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core fresh_address))))))))) (=> (=> (not $abort_flag@7) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2)))))))))))) ($BCS_serialize_core (Integer 2)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 2))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_received_events))) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core fresh_address)))))))) (=> (= (ControlFlow 0 25440) (- 0 35607)) (=> (not $abort_flag@7) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core fresh_address)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3)))))))))))) ($BCS_serialize_core (Integer 3)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (Integer 3))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[Location]Value| (|contents#Memory| $m@69) (Global $Test_T_type_value (|a#Address| (Address (|sender#Transaction| $txn))))))) $Test_T_sent_events))) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core fresh_address)))))))))))))))))))))
+(let ((inline$$Test_create$0$anon28_correct  (=> (and (and (= inline$$Test_create$0$$ret0@2 inline$$Test_create$0$$ret0@1) (= $m@69 $m@68)) (and (= $abort_flag@7 $abort_flag@6) (= (ControlFlow 0 25052) 25440))) inline$$Test_create$0$Return_correct)))
+(let ((inline$$Test_create$0$anon42_Else_correct  (=> (and (not true) (= (ControlFlow 0 25050) 25052)) inline$$Test_create$0$anon28_correct)))
+(let ((inline$$Test_create$0$anon42_Then_correct  (=> (and ($DebugTrackLocal 3 2445 26 inline$$Test_create$0$$ret0@1) (= (ControlFlow 0 25066) 25052)) inline$$Test_create$0$anon28_correct)))
+(let ((inline$$Test_create$0$anon41_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$23$local@0) (let ((va@@8 (|v#Vector| inline$$CopyOrMoveValue$23$local@0)))
+(let ((l@@8 (|l#ValueArray| va@@8)))
+ (and (<= 0 l@@8) (forall ((x@@8 Int) ) (!  (=> (or (< x@@8 0) (>= x@@8 l@@8)) (= (|Select_[$int]Value| (|v#ValueArray| va@@8) x@@8) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@8) x@@8))
+)))))) (forall (($$0 Int) ) (!  (=> (and (>= $$0 0) (< $$0 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$23$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$23$local@0)) $$0)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$23$local@0)) $$0)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$23$local@0)) $$0)) MAX_U8)))
+ :qid |outputbp.1657:52|
+ :skolemid |36|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$23$local@0)) $$0))
+))) (and (= $m@68 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@67) (Local (+ 0 25)) true) (|Store_[Location]Value| (|contents#Memory| $m@67) (Local (+ 0 25)) inline$$CopyOrMoveValue$23$local@0))) (= inline$$Test_create$0$$ret0@1 (|Select_[Location]Value| (|contents#Memory| $m@68) (Local (+ 0 25)))))) (and (=> (= (ControlFlow 0 25044) 25066) inline$$Test_create$0$anon42_Then_correct) (=> (= (ControlFlow 0 25044) 25050) inline$$Test_create$0$anon42_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$23$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$23$local@0 (|Select_[Location]Value| (|contents#Memory| $m@67) (Local (+ 0 2)))) (= (ControlFlow 0 24964) 25044)) inline$$Test_create$0$anon41_Else$1_correct)))
+(let ((inline$$Test_create$0$anon41_Else_correct  (=> (and (not $abort_flag@6) (= (ControlFlow 0 24974) 24964)) inline$$CopyOrMoveValue$23$Entry_correct)))
+(let ((inline$$Test_create$0$Abort_correct  (=> (and (and (= inline$$Test_create$0$$ret0@2 DefaultValue) (= $m@69 $m)) (and (= $abort_flag@7 true) (= (ControlFlow 0 14584) 25440))) inline$$Test_create$0$Return_correct)))
+(let ((inline$$Test_create$0$anon41_Then_correct  (=> $abort_flag@6 (=> (and ($DebugTrackAbort 3 2226) (= (ControlFlow 0 25076) 14584)) inline$$Test_create$0$Abort_correct))))
+(let ((inline$$MoveToSender$0$anon3_Else_correct  (=> (and (and (not (|Select_[Location]$bool| (|domain#Memory| $m@65) (Global inline$$MoveToSender$0$ta@0 inline$$MoveToSender$0$a@1))) (= $m@66 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@65) inline$$MoveToSender$0$l@1 true) (|Store_[Location]Value| (|contents#Memory| $m@65) inline$$MoveToSender$0$l@1 inline$$MoveToSender$0$v@0)))) (and (= $abort_flag@6 $abort_flag@5) (= $m@67 $m@66))) (and (=> (= (ControlFlow 0 24911) 25076) inline$$Test_create$0$anon41_Then_correct) (=> (= (ControlFlow 0 24911) 24974) inline$$Test_create$0$anon41_Else_correct)))))
+(let ((inline$$MoveToSender$0$anon3_Then_correct  (=> (|Select_[Location]$bool| (|domain#Memory| $m@65) (Global inline$$MoveToSender$0$ta@0 inline$$MoveToSender$0$a@1)) (=> (and (= $abort_flag@6 true) (= $m@67 $m@65)) (and (=> (= (ControlFlow 0 24923) 25076) inline$$Test_create$0$anon41_Then_correct) (=> (= (ControlFlow 0 24923) 24974) inline$$Test_create$0$anon41_Else_correct))))))
+(let ((inline$$MoveToSender$0$anon0_correct  (=> (and (= inline$$MoveToSender$0$a@1 (|sender#Transaction| $txn)) (= inline$$MoveToSender$0$l@1 (Global inline$$MoveToSender$0$ta@0 inline$$MoveToSender$0$a@1))) (and (=> (= (ControlFlow 0 24877) 24923) inline$$MoveToSender$0$anon3_Then_correct) (=> (= (ControlFlow 0 24877) 24911) inline$$MoveToSender$0$anon3_Else_correct)))))
+(let ((inline$$MoveToSender$0$Entry_correct  (=> (= inline$$MoveToSender$0$ta@0 $Test_T_type_value) (=> (and (= inline$$MoveToSender$0$v@0 (|Select_[Location]Value| (|contents#Memory| $m@65) (Local (+ 0 24)))) (= (ControlFlow 0 24865) 24877)) inline$$MoveToSender$0$anon0_correct))))
+(let ((inline$$Test_create$0$anon40_Else$1_correct  (=> (and (= $m@65 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@64) (Local (+ 0 24)) true) (|Store_[Location]Value| (|contents#Memory| $m@64) (Local (+ 0 24)) inline$$Test_T_pack$0$$struct@1))) (= (ControlFlow 0 24927) 24865)) inline$$MoveToSender$0$Entry_correct)))
+(let ((inline$$Test_T_pack$0$anon2_Else_correct  (=> (and (>= 0 0) (= (ControlFlow 0 24723) 24927)) inline$$Test_create$0$anon40_Else$1_correct)))
+(let ((inline$$Test_T_pack$0$anon2_Then_correct  (=> (> 0 0) (=> (and ($DebugTrackLocal 0 0 0 inline$$Test_T_pack$0$$struct@1) (= (ControlFlow 0 24741) 24927)) inline$$Test_create$0$anon40_Else$1_correct))))
+(let ((inline$$Test_T_pack$0$anon0_correct  (=> (and (and (and (and (and (is-Vector inline$$Test_T_pack$0$received_events@0) (let ((va@@9 (|v#Vector| inline$$Test_T_pack$0$received_events@0)))
+(let ((l@@9 (|l#ValueArray| va@@9)))
+ (and (<= 0 l@@9) (forall ((x@@9 Int) ) (!  (=> (or (< x@@9 0) (>= x@@9 l@@9)) (= (|Select_[$int]Value| (|v#ValueArray| va@@9) x@@9) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@9) x@@9))
+)))))) (= (|l#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) 2)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_counter)) MAX_U64))) (and (is-Vector (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid)) (let ((va@@10 (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))))
+(let ((l@@10 (|l#ValueArray| va@@10)))
+ (and (<= 0 l@@10) (forall ((x@@10 Int) ) (!  (=> (or (< x@@10 0) (>= x@@10 l@@10)) (= (|Select_[$int]Value| (|v#ValueArray| va@@10) x@@10) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@10) x@@10))
+))))))) (forall (($$0@@0 Int) ) (!  (=> (and (>= $$0@@0 0) (< $$0@@0 (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))) $$0@@0)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))) $$0@@0)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))) $$0@@0)) MAX_U8)))
+ :qid |outputbp.1339:89|
+ :skolemid |27|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$received_events@0)) $Test_EventHandle_guid))) $$0@@0))
+))) (=> (and (and (and (and (and (and (is-Vector inline$$Test_T_pack$0$sent_events@0) (let ((va@@11 (|v#Vector| inline$$Test_T_pack$0$sent_events@0)))
+(let ((l@@11 (|l#ValueArray| va@@11)))
+ (and (<= 0 l@@11) (forall ((x@@11 Int) ) (!  (=> (or (< x@@11 0) (>= x@@11 l@@11)) (= (|Select_[$int]Value| (|v#ValueArray| va@@11) x@@11) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@11) x@@11))
+)))))) (= (|l#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) 2)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_counter)) MAX_U64))) (and (is-Vector (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid)) (let ((va@@12 (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))))
+(let ((l@@12 (|l#ValueArray| va@@12)))
+ (and (<= 0 l@@12) (forall ((x@@12 Int) ) (!  (=> (or (< x@@12 0) (>= x@@12 l@@12)) (= (|Select_[$int]Value| (|v#ValueArray| va@@12) x@@12) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@12) x@@12))
+))))))) (forall (($$0@@1 Int) ) (!  (=> (and (>= $$0@@1 0) (< $$0@@1 (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))) $$0@@1)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))) $$0@@1)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))) $$0@@1)) MAX_U8)))
+ :qid |outputbp.1339:89|
+ :skolemid |27|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_T_pack$0$sent_events@0)) $Test_EventHandle_guid))) $$0@@1))
+))) (= inline$$Test_T_pack$0$$struct@1 (Vector (ValueArray (|Store_[$int]Value| (|Store_[$int]Value| (MapConstValue DefaultValue) 0 inline$$Test_T_pack$0$received_events@0) 1 inline$$Test_T_pack$0$sent_events@0) 2)))) (and (=> (= (ControlFlow 0 24715) 24741) inline$$Test_T_pack$0$anon2_Then_correct) (=> (= (ControlFlow 0 24715) 24723) inline$$Test_T_pack$0$anon2_Else_correct))))))
+(let ((inline$$Test_T_pack$0$Entry_correct  (=> (= inline$$Test_T_pack$0$received_events@0 (|Select_[Location]Value| (|contents#Memory| $m@64) (Local (+ 0 20)))) (=> (and (= inline$$Test_T_pack$0$sent_events@0 (|Select_[Location]Value| (|contents#Memory| $m@64) (Local (+ 0 23)))) (= (ControlFlow 0 24683) 24715)) inline$$Test_T_pack$0$anon0_correct))))
+(let ((inline$$Test_create$0$anon40_Else_correct  (=> (not $abort_flag@5) (=> (and (and (and (and (and (and (is-Vector inline$$Test_new_event_handle_impl$1$$ret0@2) (let ((va@@13 (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)))
+(let ((l@@13 (|l#ValueArray| va@@13)))
+ (and (<= 0 l@@13) (forall ((x@@13 Int) ) (!  (=> (or (< x@@13 0) (>= x@@13 l@@13)) (= (|Select_[$int]Value| (|v#ValueArray| va@@13) x@@13) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@13) x@@13))
+)))))) (= (|l#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) 2)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_counter)) MAX_U64))) (and (is-Vector (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)) (let ((va@@14 (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))
+(let ((l@@14 (|l#ValueArray| va@@14)))
+ (and (<= 0 l@@14) (forall ((x@@14 Int) ) (!  (=> (or (< x@@14 0) (>= x@@14 l@@14)) (= (|Select_[$int]Value| (|v#ValueArray| va@@14) x@@14) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@14) x@@14))
+))))))) (forall (($$0@@2 Int) ) (!  (=> (and (>= $$0@@2 0) (< $$0@@2 (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) $$0@@2)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) $$0@@2)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) $$0@@2)) MAX_U8)))
+ :qid |outputbp.1339:89|
+ :skolemid |27|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) $$0@@2))
+))) (and (= $m@64 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@63) (Local (+ 0 23)) true) (|Store_[Location]Value| (|contents#Memory| $m@63) (Local (+ 0 23)) inline$$Test_new_event_handle_impl$1$$ret0@2))) (= (ControlFlow 0 24747) 24683))) inline$$Test_T_pack$0$Entry_correct))))
+(let ((inline$$Test_create$0$anon40_Then_correct  (=> $abort_flag@5 (=> (and ($DebugTrackAbort 3 2363) (= (ControlFlow 0 25086) 14584)) inline$$Test_create$0$Abort_correct))))
+(let ((inline$$Test_new_event_handle_impl$1$Return_correct  (and (=> (= (ControlFlow 0 24542) (- 0 34912)) (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@5)) (=> (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@5) (and (=> (= (ControlFlow 0 24542) (- 0 34949)) (=> $abort_flag@5 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))))) (=> (=> $abort_flag@5 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64)))))) (and (=> (= (ControlFlow 0 24542) (- 0 34986)) (=> (not $abort_flag@5) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_new_event_handle_impl$1$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core inline$$Test_new_event_handle_impl$1$sender@0))))))))) (=> (=> (not $abort_flag@5) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_new_event_handle_impl$1$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core inline$$Test_new_event_handle_impl$1$sender@0)))))))) (and (=> (= (ControlFlow 0 24542) (- 0 35025)) (=> (not $abort_flag@5) (|b#Boolean| (Boolean (IsEqual_stratified (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_counter) (Integer 0)))))) (=> (=> (not $abort_flag@5) (|b#Boolean| (Boolean (IsEqual_stratified (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$1$$ret0@2)) $Test_EventHandle_counter) (Integer 0))))) (and (=> (= (ControlFlow 0 24542) 25086) inline$$Test_create$0$anon40_Then_correct) (=> (= (ControlFlow 0 24542) 24747) inline$$Test_create$0$anon40_Else_correct))))))))))))
+(let ((inline$$Test_new_event_handle_impl$1$anon10_correct  (=> (and (and (= inline$$Test_new_event_handle_impl$1$$ret0@2 inline$$Test_new_event_handle_impl$1$$ret0@1) (= $m@63 $m@62)) (and (= $abort_flag@5 $abort_flag@4) (= (ControlFlow 0 24310) 24542))) inline$$Test_new_event_handle_impl$1$Return_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon15_Else_correct  (=> (and (not true) (= (ControlFlow 0 24308) 24310)) inline$$Test_new_event_handle_impl$1$anon10_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon15_Then_correct  (=> (and ($DebugTrackLocal 3 1559 7 inline$$Test_new_event_handle_impl$1$$ret0@1) (= (ControlFlow 0 24324) 24310)) inline$$Test_new_event_handle_impl$1$anon10_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon8$1_correct  (=> (and (= $m@62 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@61) (Local (+ $local_counter@2 6)) true) (|Store_[Location]Value| (|contents#Memory| $m@61) (Local (+ $local_counter@2 6)) inline$$Test_EventHandle_pack$1$$struct@1))) (= inline$$Test_new_event_handle_impl$1$$ret0@1 (|Select_[Location]Value| (|contents#Memory| $m@62) (Local (+ $local_counter@2 6))))) (and (=> (= (ControlFlow 0 24302) 24324) inline$$Test_new_event_handle_impl$1$anon15_Then_correct) (=> (= (ControlFlow 0 24302) 24308) inline$$Test_new_event_handle_impl$1$anon15_Else_correct)))))
+(let ((inline$$Test_EventHandle_pack$1$anon2_Else_correct  (=> (and (>= 0 0) (= (ControlFlow 0 24254) 24302)) inline$$Test_new_event_handle_impl$1$anon8$1_correct)))
+(let ((inline$$Test_EventHandle_pack$1$anon2_Then_correct  (=> (> 0 0) (=> (and ($DebugTrackLocal 0 0 0 inline$$Test_EventHandle_pack$1$$struct@1) (= (ControlFlow 0 24272) 24302)) inline$$Test_new_event_handle_impl$1$anon8$1_correct))))
+(let ((inline$$Test_EventHandle_pack$1$anon0_correct  (=> (and (and (is-Integer inline$$Test_EventHandle_pack$1$counter@0) (>= (|i#Integer| inline$$Test_EventHandle_pack$1$counter@0) 0)) (<= (|i#Integer| inline$$Test_EventHandle_pack$1$counter@0) MAX_U64)) (=> (and (and (and (is-Vector inline$$Test_EventHandle_pack$1$guid@0) (let ((va@@15 (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)))
+(let ((l@@15 (|l#ValueArray| va@@15)))
+ (and (<= 0 l@@15) (forall ((x@@15 Int) ) (!  (=> (or (< x@@15 0) (>= x@@15 l@@15)) (= (|Select_[$int]Value| (|v#ValueArray| va@@15) x@@15) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@15) x@@15))
+)))))) (forall (($$0@@3 Int) ) (!  (=> (and (>= $$0@@3 0) (< $$0@@3 (|l#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)) $$0@@3)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)) $$0@@3)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)) $$0@@3)) MAX_U8)))
+ :qid |outputbp.1345:52|
+ :skolemid |28|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$1$guid@0)) $$0@@3))
+))) (= inline$$Test_EventHandle_pack$1$$struct@1 (Vector (ValueArray (|Store_[$int]Value| (|Store_[$int]Value| (MapConstValue DefaultValue) 0 inline$$Test_EventHandle_pack$1$counter@0) 1 inline$$Test_EventHandle_pack$1$guid@0) 2)))) (and (=> (= (ControlFlow 0 24246) 24272) inline$$Test_EventHandle_pack$1$anon2_Then_correct) (=> (= (ControlFlow 0 24246) 24254) inline$$Test_EventHandle_pack$1$anon2_Else_correct))))))
+(let ((inline$$Test_EventHandle_pack$1$Entry_correct  (=> (= inline$$Test_EventHandle_pack$1$counter@0 (|Select_[Location]Value| (|contents#Memory| $m@61) (Local (+ $local_counter@2 2)))) (=> (and (= inline$$Test_EventHandle_pack$1$guid@0 (|Select_[Location]Value| (|contents#Memory| $m@61) (Local (+ $local_counter@2 5)))) (= (ControlFlow 0 24172) 24246)) inline$$Test_EventHandle_pack$1$anon0_correct))))
+(let ((inline$$Test_new_event_handle_impl$1$anon14_Else_correct  (=> (and (not true) (= (ControlFlow 0 24009) 24172)) inline$$Test_EventHandle_pack$1$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon14_Then_correct  (=> (and ($DebugTrackLocal 3 1593 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@61) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (= (ControlFlow 0 24342) 24172)) inline$$Test_EventHandle_pack$1$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon13_Else_correct  (=> (not $abort_flag@4) (=> (and (and (and (is-Vector inline$$Test_fresh_guid$1$$ret0@2) (let ((va@@16 (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))
+(let ((l@@16 (|l#ValueArray| va@@16)))
+ (and (<= 0 l@@16) (forall ((x@@16 Int) ) (!  (=> (or (< x@@16 0) (>= x@@16 l@@16)) (= (|Select_[$int]Value| (|v#ValueArray| va@@16) x@@16) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@16) x@@16))
+)))))) (forall (($$0@@4 Int) ) (!  (=> (and (>= $$0@@4 0) (< $$0@@4 (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) $$0@@4)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) $$0@@4)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) $$0@@4)) MAX_U8)))
+ :qid |outputbp.1888:51|
+ :skolemid |44|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) $$0@@4))
+))) (= $m@61 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@60) (Local (+ $local_counter@2 5)) true) (|Store_[Location]Value| (|contents#Memory| $m@60) (Local (+ $local_counter@2 5)) inline$$Test_fresh_guid$1$$ret0@2)))) (and (=> (= (ControlFlow 0 24003) 24342) inline$$Test_new_event_handle_impl$1$anon14_Then_correct) (=> (= (ControlFlow 0 24003) 24009) inline$$Test_new_event_handle_impl$1$anon14_Else_correct))))))
+(let ((inline$$Test_new_event_handle_impl$1$anon13_Then_correct  (=> (and $abort_flag@4 ($DebugTrackAbort 3 1593)) (=> (and (and (= inline$$Test_new_event_handle_impl$1$$ret0@2 DefaultValue) (= $m@63 $m@41)) (and (= $abort_flag@5 true) (= (ControlFlow 0 24358) 24542))) inline$$Test_new_event_handle_impl$1$Return_correct))))
+(let ((inline$$Test_fresh_guid$1$Return_correct  (and (=> (= (ControlFlow 0 23935) (- 0 34506)) (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@4)) (=> (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@4) (and (=> (= (ControlFlow 0 23935) (- 0 34543)) (=> $abort_flag@4 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))))) (=> (=> $abort_flag@4 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64)))))) (and (=> (= (ControlFlow 0 23935) (- 0 34580)) (=> (not $abort_flag@4) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_fresh_guid$1$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))))))) ($BCS_serialize_core inline$$Test_fresh_guid$1$sender@0))))))))) (=> (=> (not $abort_flag@4) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_fresh_guid$1$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$1$$ret0@2)))))))))) ($BCS_serialize_core inline$$Test_fresh_guid$1$sender@0)))))))) (and (=> (= (ControlFlow 0 23935) 24358) inline$$Test_new_event_handle_impl$1$anon13_Then_correct) (=> (= (ControlFlow 0 23935) 24003) inline$$Test_new_event_handle_impl$1$anon13_Else_correct))))))))))
+(let ((inline$$Test_fresh_guid$1$Abort_correct  (=> (and (and (= $m@60 $m@44) (= $abort_flag@4 true)) (and (= inline$$Test_fresh_guid$1$$ret0@2 DefaultValue) (= (ControlFlow 0 23701) 23935))) inline$$Test_fresh_guid$1$Return_correct)))
+(let ((inline$$Test_fresh_guid$1$anon31_Then_correct  (=> $abort_flag@3 (=> (and ($DebugTrackAbort 3 1189) (= (ControlFlow 0 23693) 23701)) inline$$Test_fresh_guid$1$Abort_correct))))
+(let ((inline$$Test_fresh_guid$1$anon29_Then_correct  (=> $abort_flag@3 (=> (and ($DebugTrackAbort 3 1167) (= (ControlFlow 0 23729) 23701)) inline$$Test_fresh_guid$1$Abort_correct))))
+(let ((inline$$Test_fresh_guid$1$anon27_Then_correct  (=> $abort_flag@2 (=> (and ($DebugTrackAbort 3 1097) (= (ControlFlow 0 23753) 23701)) inline$$Test_fresh_guid$1$Abort_correct))))
+(let ((inline$$Test_fresh_guid$1$anon25_Then_correct  (=> $abort_flag@2 (=> (and ($DebugTrackAbort 3 1047) (= (ControlFlow 0 23777) 23701)) inline$$Test_fresh_guid$1$Abort_correct))))
+(let ((inline$$Test_fresh_guid$1$anon22_correct  (=> (and (and (= $m@60 $m@59) (= $abort_flag@4 $abort_flag@3)) (and (= inline$$Test_fresh_guid$1$$ret0@2 inline$$Test_fresh_guid$1$$ret0@1) (= (ControlFlow 0 23651) 23935))) inline$$Test_fresh_guid$1$Return_correct)))
+(let ((inline$$Test_fresh_guid$1$anon33_Else_correct  (=> (and (not true) (= (ControlFlow 0 23649) 23651)) inline$$Test_fresh_guid$1$anon22_correct)))
+(let ((inline$$Test_fresh_guid$1$anon33_Then_correct  (=> (and ($DebugTrackLocal 3 1238 19 inline$$Test_fresh_guid$1$$ret0@1) (= (ControlFlow 0 23665) 23651)) inline$$Test_fresh_guid$1$anon22_correct)))
+(let ((inline$$Test_fresh_guid$1$anon20$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$22$local@0) (let ((va@@17 (|v#Vector| inline$$CopyOrMoveValue$22$local@0)))
+(let ((l@@17 (|l#ValueArray| va@@17)))
+ (and (<= 0 l@@17) (forall ((x@@17 Int) ) (!  (=> (or (< x@@17 0) (>= x@@17 l@@17)) (= (|Select_[$int]Value| (|v#ValueArray| va@@17) x@@17) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@17) x@@17))
+)))))) (forall (($$0@@5 Int) ) (!  (=> (and (>= $$0@@5 0) (< $$0@@5 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$22$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$22$local@0)) $$0@@5)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$22$local@0)) $$0@@5)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$22$local@0)) $$0@@5)) MAX_U8)))
+ :qid |outputbp.1823:52|
+ :skolemid |43|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$22$local@0)) $$0@@5))
+))) (and (= $m@59 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@58) (Local (+ $local_counter@3 18)) true) (|Store_[Location]Value| (|contents#Memory| $m@58) (Local (+ $local_counter@3 18)) inline$$CopyOrMoveValue$22$local@0))) (= inline$$Test_fresh_guid$1$$ret0@1 (|Select_[Location]Value| (|contents#Memory| $m@59) (Local (+ $local_counter@3 18)))))) (and (=> (= (ControlFlow 0 23643) 23665) inline$$Test_fresh_guid$1$anon33_Then_correct) (=> (= (ControlFlow 0 23643) 23649) inline$$Test_fresh_guid$1$anon33_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$22$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$22$local@0 (|Select_[Location]Value| (|contents#Memory| $m@58) (Local (+ $local_counter@3 2)))) (= (ControlFlow 0 23563) 23643)) inline$$Test_fresh_guid$1$anon20$1_correct)))
+(let ((inline$$Test_fresh_guid$1$anon32_Else_correct  (=> (and (not true) (= (ControlFlow 0 23532) 23563)) inline$$CopyOrMoveValue$22$Entry_correct)))
+(let ((inline$$Test_fresh_guid$1$anon32_Then_correct  (=> (and ($DebugTrackLocal 3 1189 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@58) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (= (ControlFlow 0 23683) 23563)) inline$$CopyOrMoveValue$22$Entry_correct)))
+(let ((inline$$Test_fresh_guid$1$anon31_Else_correct  (=> (not $abort_flag@3) (and (=> (= (ControlFlow 0 23526) 23683) inline$$Test_fresh_guid$1$anon32_Then_correct) (=> (= (ControlFlow 0 23526) 23532) inline$$Test_fresh_guid$1$anon32_Else_correct)))))
+(let ((inline$$WriteRef$4$anon0_correct  (=> (and (and (= inline$$WriteRef$4$l@1 (|l#Reference| inline$$BorrowLoc$4$dst@1)) (= inline$$WriteRef$4$v@1 (|Select_[Location]Value| (|contents#Memory| $m@57) inline$$WriteRef$4$l@1))) (and (= inline$$WriteRef$4$v@2 ($UpdateValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) inline$$WriteRef$4$v@1 inline$$WriteRef$4$new_v@0)) (= $m@58 (Memory (|domain#Memory| $m@57) (|Store_[Location]Value| (|contents#Memory| $m@57) inline$$WriteRef$4$l@1 inline$$WriteRef$4$v@2))))) (and (=> (= (ControlFlow 0 23508) 23693) inline$$Test_fresh_guid$1$anon31_Then_correct) (=> (= (ControlFlow 0 23508) 23526) inline$$Test_fresh_guid$1$anon31_Else_correct)))))
+(let ((inline$$WriteRef$4$Entry_correct  (=> (and (= inline$$WriteRef$4$new_v@0 (Vector (let ((l2 (|l#ValueArray| (|v#Vector| inline$$Vector_append$2$other@0))))
+(let ((l1 (|l#ValueArray| (|v#Vector| inline$$Vector_append$2$v@1))))
+(ValueArray (|lambda#2| 0 (+ l1 l2) l1 (|v#ValueArray| (|v#Vector| inline$$Vector_append$2$v@1)) (|v#ValueArray| (|v#Vector| inline$$Vector_append$2$other@0)) l1 DefaultValue) (+ l1 l2)))))) (= (ControlFlow 0 23468) 23508)) inline$$WriteRef$4$anon0_correct)))
+(let ((inline$$Vector_append$2$anon0_correct  (=> (and (and (= inline$$Vector_append$2$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@57) (|l#Reference| inline$$BorrowLoc$4$dst@1)))) (is-Vector inline$$Vector_append$2$v@1)) (and (is-Vector inline$$Vector_append$2$other@0) (= (ControlFlow 0 23512) 23468))) inline$$WriteRef$4$Entry_correct)))
+(let ((inline$$Vector_append$2$Entry_correct  (=> (= inline$$Vector_append$2$ta@0 IntegerType) (=> (and (= inline$$Vector_append$2$other@0 (|Select_[Location]Value| (|contents#Memory| $m@57) (Local (+ $local_counter@3 17)))) (= (ControlFlow 0 23378) 23512)) inline$$Vector_append$2$anon0_correct))))
+(let ((inline$$Test_fresh_guid$1$anon16$2_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$21$local@0) (let ((va@@18 (|v#Vector| inline$$CopyOrMoveValue$21$local@0)))
+(let ((l@@18 (|l#ValueArray| va@@18)))
+ (and (<= 0 l@@18) (forall ((x@@18 Int) ) (!  (=> (or (< x@@18 0) (>= x@@18 l@@18)) (= (|Select_[$int]Value| (|v#ValueArray| va@@18) x@@18) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@18) x@@18))
+)))))) (forall (($$0@@6 Int) ) (!  (=> (and (>= $$0@@6 0) (< $$0@@6 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$21$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$21$local@0)) $$0@@6)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$21$local@0)) $$0@@6)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$21$local@0)) $$0@@6)) MAX_U8)))
+ :qid |outputbp.1809:52|
+ :skolemid |42|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$21$local@0)) $$0@@6))
+))) (and (= $m@57 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@56) (Local (+ $local_counter@3 17)) true) (|Store_[Location]Value| (|contents#Memory| $m@56) (Local (+ $local_counter@3 17)) inline$$CopyOrMoveValue$21$local@0))) (= (ControlFlow 0 23518) 23378))) inline$$Vector_append$2$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$21$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$21$local@0 (|Select_[Location]Value| (|contents#Memory| $m@56) (Local (+ $local_counter@3 3)))) (= (ControlFlow 0 23242) 23518)) inline$$Test_fresh_guid$1$anon16$2_correct)))
+(let ((inline$$Test_fresh_guid$1$anon16$1_correct  (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1)))) (let ((va@@19 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))))
+(let ((l@@19 (|l#ValueArray| va@@19)))
+ (and (<= 0 l@@19) (forall ((x@@19 Int) ) (!  (=> (or (< x@@19 0) (>= x@@19 l@@19)) (= (|Select_[$int]Value| (|v#ValueArray| va@@19) x@@19) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@19) x@@19))
+)))))) (forall (($$1 Int) ) (!  (=> (and (>= $$1 0) (< $$1 (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))) $$1)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))) $$1)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))) $$1)) MAX_U8)))
+ :qid |outputbp.1805:70|
+ :skolemid |41|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$4$dst@1))))) $$1))
+))) (= (ControlFlow 0 23252) 23242)) inline$$CopyOrMoveValue$21$Entry_correct)))
+(let ((inline$$BorrowLoc$4$anon0_correct  (=> (and (= inline$$BorrowLoc$4$dst@1 (Reference (Local inline$$BorrowLoc$4$l@0) EmptyPath)) (= (ControlFlow 0 23143) 23252)) inline$$Test_fresh_guid$1$anon16$1_correct)))
+(let ((inline$$BorrowLoc$4$Entry_correct  (=> (and (= inline$$BorrowLoc$4$l@0 (+ $local_counter@3 2)) (= (ControlFlow 0 23133) 23143)) inline$$BorrowLoc$4$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon30_Else_correct  (=> (and (not true) (= (ControlFlow 0 23100) 23133)) inline$$BorrowLoc$4$Entry_correct)))
+(let ((inline$$Test_fresh_guid$1$anon30_Then_correct  (=> (and ($DebugTrackLocal 3 1133 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@56) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (= (ControlFlow 0 23719) 23133)) inline$$BorrowLoc$4$Entry_correct)))
+(let ((inline$$WriteRef$3$anon0_correct  (=> (and (and (= inline$$WriteRef$3$l@1 (|l#Reference| inline$$BorrowField$5$dst@1)) (= inline$$WriteRef$3$v@1 (|Select_[Location]Value| (|contents#Memory| $m@55) inline$$WriteRef$3$l@1))) (and (= inline$$WriteRef$3$v@2 ($UpdateValue_stratified (|p#Reference| inline$$BorrowField$5$dst@1) inline$$WriteRef$3$v@1 inline$$WriteRef$3$new_v@0)) (= $m@56 (Memory (|domain#Memory| $m@55) (|Store_[Location]Value| (|contents#Memory| $m@55) inline$$WriteRef$3$l@1 inline$$WriteRef$3$v@2))))) (and (=> (= (ControlFlow 0 23088) 23719) inline$$Test_fresh_guid$1$anon30_Then_correct) (=> (= (ControlFlow 0 23088) 23100) inline$$Test_fresh_guid$1$anon30_Else_correct)))))
+(let ((inline$$WriteRef$3$Entry_correct  (=> (and (= inline$$WriteRef$3$new_v@0 (|Select_[Location]Value| (|contents#Memory| $m@55) (Local (+ $local_counter@3 13)))) (= (ControlFlow 0 23048) 23088)) inline$$WriteRef$3$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon29_Else$2_correct  (=> (and (and (and (is-Integer ($ReadValue_stratified (|p#Reference| inline$$BorrowField$5$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@55) (|l#Reference| inline$$BorrowField$5$dst@1)))) (>= (|i#Integer| ($ReadValue_stratified (|p#Reference| inline$$BorrowField$5$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@55) (|l#Reference| inline$$BorrowField$5$dst@1)))) 0)) (<= (|i#Integer| ($ReadValue_stratified (|p#Reference| inline$$BorrowField$5$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@55) (|l#Reference| inline$$BorrowField$5$dst@1)))) MAX_U64)) (= (ControlFlow 0 23092) 23048)) inline$$WriteRef$3$Entry_correct)))
+(let ((inline$$BorrowField$5$anon0_correct  (=> (= inline$$BorrowField$5$p@1 (|p#Reference| inline$$BorrowLoc$3$dst@1)) (=> (and (and (= inline$$BorrowField$5$size@1 (|size#Path| inline$$BorrowField$5$p@1)) (= inline$$BorrowField$5$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$5$p@1) inline$$BorrowField$5$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$5$size@1 1)))) (and (= inline$$BorrowField$5$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$3$dst@1) inline$$BorrowField$5$p@2)) (= (ControlFlow 0 22954) 23092))) inline$$Test_fresh_guid$1$anon29_Else$2_correct))))
+(let ((inline$$Test_fresh_guid$1$anon29_Else_correct  (=> (not $abort_flag@3) (=> (and (= $m@55 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@54) (Local (+ $local_counter@3 13)) true) (|Store_[Location]Value| (|contents#Memory| $m@54) (Local (+ $local_counter@3 13)) inline$$AddU64$1$dst@2))) (= (ControlFlow 0 22854) 22954)) inline$$BorrowField$5$anon0_correct))))
+(let ((inline$$AddU64$1$anon3_Else_correct  (=> (and (and (>= MAX_U64 (+ (|i#Integer| inline$$AddU64$1$src1@0) (|i#Integer| inline$$AddU64$1$src2@0))) (= inline$$AddU64$1$dst@1 (Integer (+ (|i#Integer| inline$$AddU64$1$src1@0) (|i#Integer| inline$$AddU64$1$src2@0))))) (and (= $abort_flag@3 $abort_flag@2) (= inline$$AddU64$1$dst@2 inline$$AddU64$1$dst@1))) (and (=> (= (ControlFlow 0 22779) 23729) inline$$Test_fresh_guid$1$anon29_Then_correct) (=> (= (ControlFlow 0 22779) 22854) inline$$Test_fresh_guid$1$anon29_Else_correct)))))
+(let ((inline$$AddU64$1$anon3_Then_correct  (=> (> (+ (|i#Integer| inline$$AddU64$1$src1@0) (|i#Integer| inline$$AddU64$1$src2@0)) MAX_U64) (=> (and (= $abort_flag@3 true) (= inline$$AddU64$1$dst@2 inline$$AddU64$1$dst@0)) (and (=> (= (ControlFlow 0 22797) 23729) inline$$Test_fresh_guid$1$anon29_Then_correct) (=> (= (ControlFlow 0 22797) 22854) inline$$Test_fresh_guid$1$anon29_Else_correct))))))
+(let ((inline$$AddU64$1$Entry_correct  (=> (and (= inline$$AddU64$1$src1@0 (|Select_[Location]Value| (|contents#Memory| $m@54) (Local (+ $local_counter@3 11)))) (= inline$$AddU64$1$src2@0 (|Select_[Location]Value| (|contents#Memory| $m@54) (Local (+ $local_counter@3 12))))) (and (=> (= (ControlFlow 0 22749) (- 0 33788)) true) (and (=> (= (ControlFlow 0 22749) 22797) inline$$AddU64$1$anon3_Then_correct) (=> (= (ControlFlow 0 22749) 22779) inline$$AddU64$1$anon3_Else_correct))))))
+(let ((inline$$Test_fresh_guid$1$anon12$3_correct  (=> (and (and (and (is-Integer inline$$CopyOrMoveValue$20$local@0) (>= (|i#Integer| inline$$CopyOrMoveValue$20$local@0) 0)) (<= (|i#Integer| inline$$CopyOrMoveValue$20$local@0) MAX_U64)) (and (and (= $m@53 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@52) (Local (+ $local_counter@3 11)) true) (|Store_[Location]Value| (|contents#Memory| $m@52) (Local (+ $local_counter@3 11)) inline$$CopyOrMoveValue$20$local@0))) (= inline$$Test_fresh_guid$1$$tmp@1 (Integer 1))) (and (= $m@54 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@53) (Local (+ $local_counter@3 12)) true) (|Store_[Location]Value| (|contents#Memory| $m@53) (Local (+ $local_counter@3 12)) inline$$Test_fresh_guid$1$$tmp@1))) (= (ControlFlow 0 22803) 22749)))) inline$$AddU64$1$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$20$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$20$local@0 (|Select_[Location]Value| (|contents#Memory| $m@52) (Local (+ $local_counter@3 10)))) (= (ControlFlow 0 22607) 22803)) inline$$Test_fresh_guid$1$anon12$3_correct)))
+(let ((inline$$Test_fresh_guid$1$anon12$2_correct  (=> (and (and (and (is-Integer inline$$ReadRef$3$v@1) (>= (|i#Integer| inline$$ReadRef$3$v@1) 0)) (<= (|i#Integer| inline$$ReadRef$3$v@1) MAX_U64)) (and (= $m@52 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@51) (Local (+ $local_counter@3 10)) true) (|Store_[Location]Value| (|contents#Memory| $m@51) (Local (+ $local_counter@3 10)) inline$$ReadRef$3$v@1))) (= (ControlFlow 0 22617) 22607))) inline$$CopyOrMoveValue$20$Entry_correct)))
+(let ((inline$$ReadRef$3$anon0_correct  (=> (and (= inline$$ReadRef$3$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowField$4$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@51) (|l#Reference| inline$$BorrowField$4$dst@1)))) (= (ControlFlow 0 22546) 22617)) inline$$Test_fresh_guid$1$anon12$2_correct)))
+(let ((inline$$BorrowField$4$anon0_correct  (=> (= inline$$BorrowField$4$p@1 (|p#Reference| inline$$BorrowLoc$3$dst@1)) (=> (and (and (= inline$$BorrowField$4$size@1 (|size#Path| inline$$BorrowField$4$p@1)) (= inline$$BorrowField$4$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$4$p@1) inline$$BorrowField$4$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$4$size@1 1)))) (and (= inline$$BorrowField$4$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$3$dst@1) inline$$BorrowField$4$p@2)) (= (ControlFlow 0 22486) 22546))) inline$$ReadRef$3$anon0_correct))))
+(let ((inline$$Test_fresh_guid$1$anon28_Else_correct  (=> (and (not true) (= (ControlFlow 0 22317) 22486)) inline$$BorrowField$4$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon28_Then_correct  (=> (and ($DebugTrackLocal 3 1078 2 inline$$CopyOrMoveValue$19$local@0) (= (ControlFlow 0 23743) 22486)) inline$$BorrowField$4$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon27_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$19$local@0) (let ((va@@20 (|v#Vector| inline$$CopyOrMoveValue$19$local@0)))
+(let ((l@@20 (|l#ValueArray| va@@20)))
+ (and (<= 0 l@@20) (forall ((x@@20 Int) ) (!  (=> (or (< x@@20 0) (>= x@@20 l@@20)) (= (|Select_[$int]Value| (|v#ValueArray| va@@20) x@@20) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@20) x@@20))
+)))))) (forall (($$0@@7 Int) ) (!  (=> (and (>= $$0@@7 0) (< $$0@@7 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$19$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$19$local@0)) $$0@@7)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$19$local@0)) $$0@@7)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$19$local@0)) $$0@@7)) MAX_U8)))
+ :qid |outputbp.1762:52|
+ :skolemid |40|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$19$local@0)) $$0@@7))
+))) (= $m@51 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@50) (Local (+ $local_counter@3 2)) true) (|Store_[Location]Value| (|contents#Memory| $m@50) (Local (+ $local_counter@3 2)) inline$$CopyOrMoveValue$19$local@0)))) (and (=> (= (ControlFlow 0 22311) 23743) inline$$Test_fresh_guid$1$anon28_Then_correct) (=> (= (ControlFlow 0 22311) 22317) inline$$Test_fresh_guid$1$anon28_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$19$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$19$local@0 (|Select_[Location]Value| (|contents#Memory| $m@50) (Local (+ $local_counter@3 8)))) (= (ControlFlow 0 22241) 22311)) inline$$Test_fresh_guid$1$anon27_Else$1_correct)))
+(let ((inline$$Test_fresh_guid$1$anon27_Else_correct  (=> (not $abort_flag@2) (=> (and (and (and (is-Vector call2formal@res@0) (let ((va@@21 (|v#Vector| call2formal@res@0)))
+(let ((l@@21 (|l#ValueArray| va@@21)))
+ (and (<= 0 l@@21) (forall ((x@@21 Int) ) (!  (=> (or (< x@@21 0) (>= x@@21 l@@21)) (= (|Select_[$int]Value| (|v#ValueArray| va@@21) x@@21) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@21) x@@21))
+)))))) (forall (($$0@@8 Int) ) (!  (=> (and (>= $$0@@8 0) (< $$0@@8 (|l#ValueArray| (|v#Vector| call2formal@res@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) $$0@@8)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) $$0@@8)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) $$0@@8)) MAX_U8)))
+ :qid |outputbp.1756:51|
+ :skolemid |39|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) $$0@@8))
+))) (and (= $m@50 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@49) (Local (+ $local_counter@3 8)) true) (|Store_[Location]Value| (|contents#Memory| $m@49) (Local (+ $local_counter@3 8)) call2formal@res@0))) (= (ControlFlow 0 22251) 22241))) inline$$CopyOrMoveValue$19$Entry_correct))))
+(let ((inline$$Test_fresh_guid$1$anon8$2_correct  (=> (and (and (and (and (is-Integer inline$$ReadRef$2$v@1) (>= (|i#Integer| inline$$ReadRef$2$v@1) 0)) (<= (|i#Integer| inline$$ReadRef$2$v@1) MAX_U64)) (and (and (= $m@49 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@48) (Local (+ $local_counter@3 7)) true) (|Store_[Location]Value| (|contents#Memory| $m@48) (Local (+ $local_counter@3 7)) inline$$ReadRef$2$v@1))) (= call0formal@ta@0 IntegerType)) (and (= call1formal@v@0 (|Select_[Location]Value| (|contents#Memory| $m@49) (Local (+ $local_counter@3 7)))) (= call2formal@res@0 ($BCS_serialize_core call1formal@v@0))))) (and (and (and (is-Vector call2formal@res@0) (let ((va@@22 (|v#Vector| call2formal@res@0)))
+(let ((l@@22 (|l#ValueArray| va@@22)))
+ (and (<= 0 l@@22) (forall ((x@@22 Int) ) (!  (=> (or (< x@@22 0) (>= x@@22 l@@22)) (= (|Select_[$int]Value| (|v#ValueArray| va@@22) x@@22) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@22) x@@22))
+)))))) (forall ((i@@6 Int) ) (!  (=> (and (<= 0 i@@6) (< i@@6 (|l#ValueArray| (|v#Vector| call2formal@res@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) i@@6)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) i@@6)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) i@@6)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0)) i@@6))
+))) (> (|l#ValueArray| (|v#Vector| call2formal@res@0)) 0))) (and (=> (= (ControlFlow 0 22148) 23753) inline$$Test_fresh_guid$1$anon27_Then_correct) (=> (= (ControlFlow 0 22148) 22251) inline$$Test_fresh_guid$1$anon27_Else_correct)))))
+(let ((inline$$ReadRef$2$anon0_correct  (=> (and (= inline$$ReadRef$2$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowField$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@48) (|l#Reference| inline$$BorrowField$3$dst@1)))) (= (ControlFlow 0 22116) 22148)) inline$$Test_fresh_guid$1$anon8$2_correct)))
+(let ((inline$$BorrowField$3$anon0_correct  (=> (= inline$$BorrowField$3$p@1 (|p#Reference| inline$$BorrowLoc$3$dst@1)) (=> (and (and (= inline$$BorrowField$3$size@1 (|size#Path| inline$$BorrowField$3$p@1)) (= inline$$BorrowField$3$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$3$p@1) inline$$BorrowField$3$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$3$size@1 1)))) (and (= inline$$BorrowField$3$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$3$dst@1) inline$$BorrowField$3$p@2)) (= (ControlFlow 0 22056) 22116))) inline$$ReadRef$2$anon0_correct))))
+(let ((inline$$Test_fresh_guid$1$anon26_Else_correct  (=> (and (not true) (= (ControlFlow 0 21887) 22056)) inline$$BorrowField$3$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon26_Then_correct  (=> (and ($DebugTrackLocal 3 1027 3 inline$$CopyOrMoveValue$18$local@0) (= (ControlFlow 0 23767) 22056)) inline$$BorrowField$3$anon0_correct)))
+(let ((inline$$Test_fresh_guid$1$anon25_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$18$local@0) (let ((va@@23 (|v#Vector| inline$$CopyOrMoveValue$18$local@0)))
+(let ((l@@23 (|l#ValueArray| va@@23)))
+ (and (<= 0 l@@23) (forall ((x@@23 Int) ) (!  (=> (or (< x@@23 0) (>= x@@23 l@@23)) (= (|Select_[$int]Value| (|v#ValueArray| va@@23) x@@23) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@23) x@@23))
+)))))) (forall (($$0@@9 Int) ) (!  (=> (and (>= $$0@@9 0) (< $$0@@9 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$18$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$18$local@0)) $$0@@9)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$18$local@0)) $$0@@9)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$18$local@0)) $$0@@9)) MAX_U8)))
+ :qid |outputbp.1738:52|
+ :skolemid |38|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$18$local@0)) $$0@@9))
+))) (= $m@48 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@47) (Local (+ $local_counter@3 3)) true) (|Store_[Location]Value| (|contents#Memory| $m@47) (Local (+ $local_counter@3 3)) inline$$CopyOrMoveValue$18$local@0)))) (and (=> (= (ControlFlow 0 21881) 23767) inline$$Test_fresh_guid$1$anon26_Then_correct) (=> (= (ControlFlow 0 21881) 21887) inline$$Test_fresh_guid$1$anon26_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$18$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$18$local@0 (|Select_[Location]Value| (|contents#Memory| $m@47) (Local (+ $local_counter@3 5)))) (= (ControlFlow 0 21811) 21881)) inline$$Test_fresh_guid$1$anon25_Else$1_correct)))
+(let ((inline$$Test_fresh_guid$1$anon25_Else_correct  (=> (not $abort_flag@2) (=> (and (and (and (is-Vector call2formal@res@0@@0) (let ((va@@24 (|v#Vector| call2formal@res@0@@0)))
+(let ((l@@24 (|l#ValueArray| va@@24)))
+ (and (<= 0 l@@24) (forall ((x@@24 Int) ) (!  (=> (or (< x@@24 0) (>= x@@24 l@@24)) (= (|Select_[$int]Value| (|v#ValueArray| va@@24) x@@24) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@24) x@@24))
+)))))) (forall (($$0@@10 Int) ) (!  (=> (and (>= $$0@@10 0) (< $$0@@10 (|l#ValueArray| (|v#Vector| call2formal@res@0@@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) $$0@@10)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) $$0@@10)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) $$0@@10)) MAX_U8)))
+ :qid |outputbp.1732:51|
+ :skolemid |37|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) $$0@@10))
+))) (and (= $m@47 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@46) (Local (+ $local_counter@3 5)) true) (|Store_[Location]Value| (|contents#Memory| $m@46) (Local (+ $local_counter@3 5)) call2formal@res@0@@0))) (= (ControlFlow 0 21821) 21811))) inline$$CopyOrMoveValue$18$Entry_correct))))
+(let ((inline$$Test_fresh_guid$1$anon4$1_correct  (=> (is-Address inline$$CopyOrMoveValue$17$local@0) (=> (and (and (= $m@46 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@45) (Local (+ $local_counter@3 4)) true) (|Store_[Location]Value| (|contents#Memory| $m@45) (Local (+ $local_counter@3 4)) inline$$CopyOrMoveValue$17$local@0))) (= call0formal@ta@0@@0 AddressType)) (and (= call1formal@v@0@@0 (|Select_[Location]Value| (|contents#Memory| $m@46) (Local (+ $local_counter@3 4)))) (= call2formal@res@0@@0 ($BCS_serialize_core call1formal@v@0@@0)))) (=> (and (and (and (is-Vector call2formal@res@0@@0) (let ((va@@25 (|v#Vector| call2formal@res@0@@0)))
+(let ((l@@25 (|l#ValueArray| va@@25)))
+ (and (<= 0 l@@25) (forall ((x@@25 Int) ) (!  (=> (or (< x@@25 0) (>= x@@25 l@@25)) (= (|Select_[$int]Value| (|v#ValueArray| va@@25) x@@25) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@25) x@@25))
+)))))) (forall ((i@@7 Int) ) (!  (=> (and (<= 0 i@@7) (< i@@7 (|l#ValueArray| (|v#Vector| call2formal@res@0@@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) i@@7)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) i@@7)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) i@@7)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@0)) i@@7))
+))) (> (|l#ValueArray| (|v#Vector| call2formal@res@0@@0)) 0)) (and (=> (= (ControlFlow 0 21718) 23777) inline$$Test_fresh_guid$1$anon25_Then_correct) (=> (= (ControlFlow 0 21718) 21821) inline$$Test_fresh_guid$1$anon25_Else_correct)))))))
+(let ((inline$$CopyOrMoveValue$17$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$17$local@0 (|Select_[Location]Value| (|contents#Memory| $m@45) (Local (+ $local_counter@3 1)))) (= (ControlFlow 0 21690) 21718)) inline$$Test_fresh_guid$1$anon4$1_correct)))
+(let ((inline$$Test_fresh_guid$1$anon4_correct  (=> (and (= $local_counter@4 (+ $local_counter@3 19)) (= (ControlFlow 0 21700) 21690)) inline$$CopyOrMoveValue$17$Entry_correct)))
+(let ((inline$$Test_fresh_guid$1$anon24_Else_correct  (=> (and (not true) (= (ControlFlow 0 21653) 21700)) inline$$Test_fresh_guid$1$anon4_correct)))
+(let ((inline$$Test_fresh_guid$1$anon24_Then_correct  (=> (and ($DebugTrackLocal 3 933 1 inline$$Test_fresh_guid$1$sender@0) (= (ControlFlow 0 23791) 21700)) inline$$Test_fresh_guid$1$anon4_correct)))
+(let ((inline$$Test_fresh_guid$1$anon2_correct  (=> (and (is-Address inline$$Test_fresh_guid$1$sender@0) (= $m@45 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@44) (Local (+ $local_counter@3 1)) true) (|Store_[Location]Value| (|contents#Memory| $m@44) (Local (+ $local_counter@3 1)) inline$$Test_fresh_guid$1$sender@0)))) (and (=> (= (ControlFlow 0 21647) 23791) inline$$Test_fresh_guid$1$anon24_Then_correct) (=> (= (ControlFlow 0 21647) 21653) inline$$Test_fresh_guid$1$anon24_Else_correct)))))
+(let ((inline$$Test_fresh_guid$1$anon23_Else_correct  (=> (and (not true) (= (ControlFlow 0 21629) 21647)) inline$$Test_fresh_guid$1$anon2_correct)))
+(let ((inline$$Test_fresh_guid$1$anon23_Then_correct  (=> (and ($DebugTrackLocal 3 933 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (= (ControlFlow 0 23809) 21647)) inline$$Test_fresh_guid$1$anon2_correct)))
+(let ((inline$$Test_fresh_guid$1$anon0_correct  (and (=> (= (ControlFlow 0 21623) (- 0 32914)) (not $abort_flag@2)) (=> (not $abort_flag@2) (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (let ((va@@26 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))))
+(let ((l@@26 (|l#ValueArray| va@@26)))
+ (and (<= 0 l@@26) (forall ((x@@26 Int) ) (!  (=> (or (< x@@26 0) (>= x@@26 l@@26)) (= (|Select_[$int]Value| (|v#ValueArray| va@@26) x@@26) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@26) x@@26))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@44) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (and (=> (= (ControlFlow 0 21623) 23809) inline$$Test_fresh_guid$1$anon23_Then_correct) (=> (= (ControlFlow 0 21623) 21629) inline$$Test_fresh_guid$1$anon23_Else_correct)))))))
+(let ((inline$$Test_fresh_guid$1$Entry_correct  (=> (= inline$$Test_fresh_guid$1$sender@0 (|Select_[Location]Value| (|contents#Memory| $m@44) (Local (+ $local_counter@2 4)))) (and (=> (= (ControlFlow 0 21605) (- 0 32870)) (|Select_[Location]$bool| (|domain#Memory| $m@44) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn)))) (=> (|Select_[Location]$bool| (|domain#Memory| $m@44) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (=> (= (ControlFlow 0 21605) 21623) inline$$Test_fresh_guid$1$anon0_correct))))))
+(let ((inline$$Test_new_event_handle_impl$1$anon4$2_correct  (=> (is-Address inline$$CopyOrMoveValue$16$local@0) (=> (and (= $m@44 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@43) (Local (+ $local_counter@2 4)) true) (|Store_[Location]Value| (|contents#Memory| $m@43) (Local (+ $local_counter@2 4)) inline$$CopyOrMoveValue$16$local@0))) (= (ControlFlow 0 23937) 21605)) inline$$Test_fresh_guid$1$Entry_correct))))
+(let ((inline$$CopyOrMoveValue$16$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$16$local@0 (|Select_[Location]Value| (|contents#Memory| $m@43) (Local (+ $local_counter@2 1)))) (= (ControlFlow 0 20400) 23937)) inline$$Test_new_event_handle_impl$1$anon4$2_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon4_correct  (=> (and (and (= $local_counter@3 (+ $local_counter@2 7)) (= inline$$Test_new_event_handle_impl$1$$tmp@1 (Integer 0))) (and (= $m@43 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@42) (Local (+ $local_counter@2 2)) true) (|Store_[Location]Value| (|contents#Memory| $m@42) (Local (+ $local_counter@2 2)) inline$$Test_new_event_handle_impl$1$$tmp@1))) (= (ControlFlow 0 20369) 20400))) inline$$CopyOrMoveValue$16$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon12_Else_correct  (=> (and (not true) (= (ControlFlow 0 20314) 20369)) inline$$Test_new_event_handle_impl$1$anon4_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon12_Then_correct  (=> (and ($DebugTrackLocal 3 1441 1 inline$$Test_new_event_handle_impl$1$sender@0) (= (ControlFlow 0 24372) 20369)) inline$$Test_new_event_handle_impl$1$anon4_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon2_correct  (=> (and (is-Address inline$$Test_new_event_handle_impl$1$sender@0) (= $m@42 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@41) (Local (+ $local_counter@2 1)) true) (|Store_[Location]Value| (|contents#Memory| $m@41) (Local (+ $local_counter@2 1)) inline$$Test_new_event_handle_impl$1$sender@0)))) (and (=> (= (ControlFlow 0 20308) 24372) inline$$Test_new_event_handle_impl$1$anon12_Then_correct) (=> (= (ControlFlow 0 20308) 20314) inline$$Test_new_event_handle_impl$1$anon12_Else_correct)))))
+(let ((inline$$Test_new_event_handle_impl$1$anon11_Else_correct  (=> (and (not true) (= (ControlFlow 0 20290) 20308)) inline$$Test_new_event_handle_impl$1$anon2_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon11_Then_correct  (=> (and ($DebugTrackLocal 3 1441 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (= (ControlFlow 0 24390) 20308)) inline$$Test_new_event_handle_impl$1$anon2_correct)))
+(let ((inline$$Test_new_event_handle_impl$1$anon0_correct  (and (=> (= (ControlFlow 0 20284) (- 0 32706)) (not $abort_flag@2)) (=> (not $abort_flag@2) (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (let ((va@@27 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))))
+(let ((l@@27 (|l#ValueArray| va@@27)))
+ (and (<= 0 l@@27) (forall ((x@@27 Int) ) (!  (=> (or (< x@@27 0) (>= x@@27 l@@27)) (= (|Select_[$int]Value| (|v#ValueArray| va@@27) x@@27) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@27) x@@27))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@41) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (and (=> (= (ControlFlow 0 20284) 24390) inline$$Test_new_event_handle_impl$1$anon11_Then_correct) (=> (= (ControlFlow 0 20284) 20290) inline$$Test_new_event_handle_impl$1$anon11_Else_correct)))))))
+(let ((inline$$Test_new_event_handle_impl$1$Entry_correct  (=> (and (= inline$$Test_new_event_handle_impl$1$$tv0@0 $Test_Event2_type_value) (= inline$$Test_new_event_handle_impl$1$sender@0 (|Select_[Location]Value| (|contents#Memory| $m@41) (Local (+ 0 22))))) (and (=> (= (ControlFlow 0 20266) (- 0 32677)) (|Select_[Location]$bool| (|domain#Memory| $m@41) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn)))) (=> (|Select_[Location]$bool| (|domain#Memory| $m@41) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (=> (= (ControlFlow 0 20266) 20284) inline$$Test_new_event_handle_impl$1$anon0_correct))))))
+(let ((inline$$Test_create$0$anon39_Else$2_correct  (=> (is-Address inline$$CopyOrMoveValue$15$local@0) (=> (and (= $m@41 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@40) (Local (+ 0 22)) true) (|Store_[Location]Value| (|contents#Memory| $m@40) (Local (+ 0 22)) inline$$CopyOrMoveValue$15$local@0))) (= (ControlFlow 0 24544) 20266)) inline$$Test_new_event_handle_impl$1$Entry_correct))))
+(let ((inline$$CopyOrMoveValue$15$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$15$local@0 (|Select_[Location]Value| (|contents#Memory| $m@40) (Local (+ 0 0)))) (= (ControlFlow 0 19670) 24544)) inline$$Test_create$0$anon39_Else$2_correct)))
+(let ((inline$$Test_create$0$anon39_Else$1_correct  (=> (and (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1)))) (let ((va@@28 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1))))))
+(let ((l@@28 (|l#ValueArray| va@@28)))
+ (and (<= 0 l@@28) (forall ((x@@28 Int) ) (!  (=> (or (< x@@28 0) (>= x@@28 l@@28)) (= (|Select_[$int]Value| (|v#ValueArray| va@@28) x@@28) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@28) x@@28))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$3$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@40) (|l#Reference| inline$$BorrowLoc$3$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (= (ControlFlow 0 19680) 19670)) inline$$CopyOrMoveValue$15$Entry_correct)))
+(let ((inline$$BorrowLoc$3$anon0_correct  (=> (and (= inline$$BorrowLoc$3$dst@1 (Reference (Local inline$$BorrowLoc$3$l@0) EmptyPath)) (= (ControlFlow 0 19625) 19680)) inline$$Test_create$0$anon39_Else$1_correct)))
+(let ((inline$$BorrowLoc$3$Entry_correct  (=> (and (= inline$$BorrowLoc$3$l@0 (+ 0 3)) (= (ControlFlow 0 19615) 19625)) inline$$BorrowLoc$3$anon0_correct)))
+(let ((inline$$Test_create$0$anon39_Else_correct  (=> (not $abort_flag@2) (=> (and (and (and (and (and (and (is-Vector inline$$Test_new_event_handle_impl$0$$ret0@2) (let ((va@@29 (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)))
+(let ((l@@29 (|l#ValueArray| va@@29)))
+ (and (<= 0 l@@29) (forall ((x@@29 Int) ) (!  (=> (or (< x@@29 0) (>= x@@29 l@@29)) (= (|Select_[$int]Value| (|v#ValueArray| va@@29) x@@29) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@29) x@@29))
+)))))) (= (|l#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) 2)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_counter)) MAX_U64))) (and (is-Vector (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)) (let ((va@@30 (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))
+(let ((l@@30 (|l#ValueArray| va@@30)))
+ (and (<= 0 l@@30) (forall ((x@@30 Int) ) (!  (=> (or (< x@@30 0) (>= x@@30 l@@30)) (= (|Select_[$int]Value| (|v#ValueArray| va@@30) x@@30) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@30) x@@30))
+))))))) (forall (($$0@@11 Int) ) (!  (=> (and (>= $$0@@11 0) (< $$0@@11 (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) $$0@@11)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) $$0@@11)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) $$0@@11)) MAX_U8)))
+ :qid |outputbp.1339:89|
+ :skolemid |27|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) $$0@@11))
+))) (and (= $m@40 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@39) (Local (+ 0 20)) true) (|Store_[Location]Value| (|contents#Memory| $m@39) (Local (+ 0 20)) inline$$Test_new_event_handle_impl$0$$ret0@2))) (= (ControlFlow 0 19631) 19615))) inline$$BorrowLoc$3$Entry_correct))))
+(let ((inline$$Test_create$0$anon39_Then_correct  (=> $abort_flag@2 (=> (and ($DebugTrackAbort 3 2276) (= (ControlFlow 0 25096) 14584)) inline$$Test_create$0$Abort_correct))))
+(let ((inline$$Test_new_event_handle_impl$0$Return_correct  (and (=> (= (ControlFlow 0 19558) (- 0 32416)) (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@2)) (=> (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@2) (and (=> (= (ControlFlow 0 19558) (- 0 32453)) (=> $abort_flag@2 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))))) (=> (=> $abort_flag@2 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64)))))) (and (=> (= (ControlFlow 0 19558) (- 0 32490)) (=> (not $abort_flag@2) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_new_event_handle_impl$0$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core inline$$Test_new_event_handle_impl$0$sender@0))))))))) (=> (=> (not $abort_flag@2) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_new_event_handle_impl$0$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))))))) (|v#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid)))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_guid))))))))))) ($BCS_serialize_core inline$$Test_new_event_handle_impl$0$sender@0)))))))) (and (=> (= (ControlFlow 0 19558) (- 0 32529)) (=> (not $abort_flag@2) (|b#Boolean| (Boolean (IsEqual_stratified (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_counter) (Integer 0)))))) (=> (=> (not $abort_flag@2) (|b#Boolean| (Boolean (IsEqual_stratified (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_new_event_handle_impl$0$$ret0@2)) $Test_EventHandle_counter) (Integer 0))))) (and (=> (= (ControlFlow 0 19558) 25096) inline$$Test_create$0$anon39_Then_correct) (=> (= (ControlFlow 0 19558) 19631) inline$$Test_create$0$anon39_Else_correct))))))))))))
+(let ((inline$$Test_new_event_handle_impl$0$anon10_correct  (=> (and (and (= inline$$Test_new_event_handle_impl$0$$ret0@2 inline$$Test_new_event_handle_impl$0$$ret0@1) (= $m@39 $m@38)) (and (= $abort_flag@2 $abort_flag@1) (= (ControlFlow 0 19326) 19558))) inline$$Test_new_event_handle_impl$0$Return_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon15_Else_correct  (=> (and (not true) (= (ControlFlow 0 19324) 19326)) inline$$Test_new_event_handle_impl$0$anon10_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon15_Then_correct  (=> (and ($DebugTrackLocal 3 1559 7 inline$$Test_new_event_handle_impl$0$$ret0@1) (= (ControlFlow 0 19340) 19326)) inline$$Test_new_event_handle_impl$0$anon10_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon8$1_correct  (=> (and (= $m@38 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@37) (Local (+ $local_counter@0 6)) true) (|Store_[Location]Value| (|contents#Memory| $m@37) (Local (+ $local_counter@0 6)) inline$$Test_EventHandle_pack$0$$struct@1))) (= inline$$Test_new_event_handle_impl$0$$ret0@1 (|Select_[Location]Value| (|contents#Memory| $m@38) (Local (+ $local_counter@0 6))))) (and (=> (= (ControlFlow 0 19318) 19340) inline$$Test_new_event_handle_impl$0$anon15_Then_correct) (=> (= (ControlFlow 0 19318) 19324) inline$$Test_new_event_handle_impl$0$anon15_Else_correct)))))
+(let ((inline$$Test_EventHandle_pack$0$anon2_Else_correct  (=> (and (>= 0 0) (= (ControlFlow 0 19270) 19318)) inline$$Test_new_event_handle_impl$0$anon8$1_correct)))
+(let ((inline$$Test_EventHandle_pack$0$anon2_Then_correct  (=> (> 0 0) (=> (and ($DebugTrackLocal 0 0 0 inline$$Test_EventHandle_pack$0$$struct@1) (= (ControlFlow 0 19288) 19318)) inline$$Test_new_event_handle_impl$0$anon8$1_correct))))
+(let ((inline$$Test_EventHandle_pack$0$anon0_correct  (=> (and (and (is-Integer inline$$Test_EventHandle_pack$0$counter@0) (>= (|i#Integer| inline$$Test_EventHandle_pack$0$counter@0) 0)) (<= (|i#Integer| inline$$Test_EventHandle_pack$0$counter@0) MAX_U64)) (=> (and (and (and (is-Vector inline$$Test_EventHandle_pack$0$guid@0) (let ((va@@31 (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)))
+(let ((l@@31 (|l#ValueArray| va@@31)))
+ (and (<= 0 l@@31) (forall ((x@@31 Int) ) (!  (=> (or (< x@@31 0) (>= x@@31 l@@31)) (= (|Select_[$int]Value| (|v#ValueArray| va@@31) x@@31) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@31) x@@31))
+)))))) (forall (($$0@@12 Int) ) (!  (=> (and (>= $$0@@12 0) (< $$0@@12 (|l#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)) $$0@@12)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)) $$0@@12)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)) $$0@@12)) MAX_U8)))
+ :qid |outputbp.1345:52|
+ :skolemid |28|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_EventHandle_pack$0$guid@0)) $$0@@12))
+))) (= inline$$Test_EventHandle_pack$0$$struct@1 (Vector (ValueArray (|Store_[$int]Value| (|Store_[$int]Value| (MapConstValue DefaultValue) 0 inline$$Test_EventHandle_pack$0$counter@0) 1 inline$$Test_EventHandle_pack$0$guid@0) 2)))) (and (=> (= (ControlFlow 0 19262) 19288) inline$$Test_EventHandle_pack$0$anon2_Then_correct) (=> (= (ControlFlow 0 19262) 19270) inline$$Test_EventHandle_pack$0$anon2_Else_correct))))))
+(let ((inline$$Test_EventHandle_pack$0$Entry_correct  (=> (= inline$$Test_EventHandle_pack$0$counter@0 (|Select_[Location]Value| (|contents#Memory| $m@37) (Local (+ $local_counter@0 2)))) (=> (and (= inline$$Test_EventHandle_pack$0$guid@0 (|Select_[Location]Value| (|contents#Memory| $m@37) (Local (+ $local_counter@0 5)))) (= (ControlFlow 0 19188) 19262)) inline$$Test_EventHandle_pack$0$anon0_correct))))
+(let ((inline$$Test_new_event_handle_impl$0$anon14_Else_correct  (=> (and (not true) (= (ControlFlow 0 19025) 19188)) inline$$Test_EventHandle_pack$0$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon14_Then_correct  (=> (and ($DebugTrackLocal 3 1593 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@37) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (= (ControlFlow 0 19358) 19188)) inline$$Test_EventHandle_pack$0$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon13_Else_correct  (=> (not $abort_flag@1) (=> (and (and (and (is-Vector inline$$Test_fresh_guid$0$$ret0@2) (let ((va@@32 (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))
+(let ((l@@32 (|l#ValueArray| va@@32)))
+ (and (<= 0 l@@32) (forall ((x@@32 Int) ) (!  (=> (or (< x@@32 0) (>= x@@32 l@@32)) (= (|Select_[$int]Value| (|v#ValueArray| va@@32) x@@32) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@32) x@@32))
+)))))) (forall (($$0@@13 Int) ) (!  (=> (and (>= $$0@@13 0) (< $$0@@13 (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) $$0@@13)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) $$0@@13)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) $$0@@13)) MAX_U8)))
+ :qid |outputbp.1888:51|
+ :skolemid |44|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) $$0@@13))
+))) (= $m@37 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@36) (Local (+ $local_counter@0 5)) true) (|Store_[Location]Value| (|contents#Memory| $m@36) (Local (+ $local_counter@0 5)) inline$$Test_fresh_guid$0$$ret0@2)))) (and (=> (= (ControlFlow 0 19019) 19358) inline$$Test_new_event_handle_impl$0$anon14_Then_correct) (=> (= (ControlFlow 0 19019) 19025) inline$$Test_new_event_handle_impl$0$anon14_Else_correct))))))
+(let ((inline$$Test_new_event_handle_impl$0$anon13_Then_correct  (=> (and $abort_flag@1 ($DebugTrackAbort 3 1593)) (=> (and (and (= inline$$Test_new_event_handle_impl$0$$ret0@2 DefaultValue) (= $m@39 $m@17)) (and (= $abort_flag@2 true) (= (ControlFlow 0 19374) 19558))) inline$$Test_new_event_handle_impl$0$Return_correct))))
+(let ((inline$$Test_fresh_guid$0$Return_correct  (and (=> (= (ControlFlow 0 18951) (- 0 32010)) (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@1)) (=> (=> (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))) $abort_flag@1) (and (=> (= (ControlFlow 0 18951) (- 0 32047)) (=> $abort_flag@1 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64))))))) (=> (=> $abort_flag@1 (|b#Boolean| (Boolean (> (|i#Integer| (Integer (+ (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (|i#Integer| (Integer 1))))) (|i#Integer| (Integer MAX_U64)))))) (and (=> (= (ControlFlow 0 18951) (- 0 32084)) (=> (not $abort_flag@1) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_fresh_guid$0$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))))))) ($BCS_serialize_core inline$$Test_fresh_guid$0$sender@0))))))))) (=> (=> (not $abort_flag@1) (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean  (and (|b#Boolean| (Boolean (IsEqual_stratified (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))) (Integer (+ (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))) (|i#Integer| (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core inline$$Test_fresh_guid$0$sender@0)))))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|i#Integer| (|lb#$Range| ($Range (Integer 0) (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))))))) ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)))))))) (|b#Boolean| (Boolean (IsEqual_stratified (Vector (ValueArray (|lambda#4| 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))))))) (|v#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) DefaultValue) (ite (< (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2))))))) 0) 0 (- (|i#Integer| (|ub#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))) (|i#Integer| (|lb#$Range| ($Range (Integer (|l#ValueArray| (|v#Vector| ($BCS_serialize_core (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter))))) (Integer (|l#ValueArray| (|v#Vector| inline$$Test_fresh_guid$0$$ret0@2)))))))))) ($BCS_serialize_core inline$$Test_fresh_guid$0$sender@0)))))))) (and (=> (= (ControlFlow 0 18951) 19374) inline$$Test_new_event_handle_impl$0$anon13_Then_correct) (=> (= (ControlFlow 0 18951) 19019) inline$$Test_new_event_handle_impl$0$anon13_Else_correct))))))))))
+(let ((inline$$Test_fresh_guid$0$Abort_correct  (=> (and (and (= $m@36 $m@20) (= $abort_flag@1 true)) (and (= inline$$Test_fresh_guid$0$$ret0@2 DefaultValue) (= (ControlFlow 0 18717) 18951))) inline$$Test_fresh_guid$0$Return_correct)))
+(let ((inline$$Test_fresh_guid$0$anon31_Then_correct  (=> $abort_flag@0 (=> (and ($DebugTrackAbort 3 1189) (= (ControlFlow 0 18709) 18717)) inline$$Test_fresh_guid$0$Abort_correct))))
+(let ((inline$$Test_fresh_guid$0$anon29_Then_correct  (=> $abort_flag@0 (=> (and ($DebugTrackAbort 3 1167) (= (ControlFlow 0 18745) 18717)) inline$$Test_fresh_guid$0$Abort_correct))))
+(let ((inline$$Test_fresh_guid$0$anon22_correct  (=> (and (and (= $m@36 $m@35) (= $abort_flag@1 $abort_flag@0)) (and (= inline$$Test_fresh_guid$0$$ret0@2 inline$$Test_fresh_guid$0$$ret0@1) (= (ControlFlow 0 18667) 18951))) inline$$Test_fresh_guid$0$Return_correct)))
+(let ((inline$$Test_fresh_guid$0$anon33_Else_correct  (=> (and (not true) (= (ControlFlow 0 18665) 18667)) inline$$Test_fresh_guid$0$anon22_correct)))
+(let ((inline$$Test_fresh_guid$0$anon33_Then_correct  (=> (and ($DebugTrackLocal 3 1238 19 inline$$Test_fresh_guid$0$$ret0@1) (= (ControlFlow 0 18681) 18667)) inline$$Test_fresh_guid$0$anon22_correct)))
+(let ((inline$$Test_fresh_guid$0$anon20$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$14$local@0) (let ((va@@33 (|v#Vector| inline$$CopyOrMoveValue$14$local@0)))
+(let ((l@@33 (|l#ValueArray| va@@33)))
+ (and (<= 0 l@@33) (forall ((x@@33 Int) ) (!  (=> (or (< x@@33 0) (>= x@@33 l@@33)) (= (|Select_[$int]Value| (|v#ValueArray| va@@33) x@@33) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@33) x@@33))
+)))))) (forall (($$0@@14 Int) ) (!  (=> (and (>= $$0@@14 0) (< $$0@@14 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$14$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$14$local@0)) $$0@@14)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$14$local@0)) $$0@@14)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$14$local@0)) $$0@@14)) MAX_U8)))
+ :qid |outputbp.1823:52|
+ :skolemid |43|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$14$local@0)) $$0@@14))
+))) (and (= $m@35 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@34) (Local (+ $local_counter@1 18)) true) (|Store_[Location]Value| (|contents#Memory| $m@34) (Local (+ $local_counter@1 18)) inline$$CopyOrMoveValue$14$local@0))) (= inline$$Test_fresh_guid$0$$ret0@1 (|Select_[Location]Value| (|contents#Memory| $m@35) (Local (+ $local_counter@1 18)))))) (and (=> (= (ControlFlow 0 18659) 18681) inline$$Test_fresh_guid$0$anon33_Then_correct) (=> (= (ControlFlow 0 18659) 18665) inline$$Test_fresh_guid$0$anon33_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$14$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$14$local@0 (|Select_[Location]Value| (|contents#Memory| $m@34) (Local (+ $local_counter@1 2)))) (= (ControlFlow 0 18579) 18659)) inline$$Test_fresh_guid$0$anon20$1_correct)))
+(let ((inline$$Test_fresh_guid$0$anon32_Else_correct  (=> (and (not true) (= (ControlFlow 0 18548) 18579)) inline$$CopyOrMoveValue$14$Entry_correct)))
+(let ((inline$$Test_fresh_guid$0$anon32_Then_correct  (=> (and ($DebugTrackLocal 3 1189 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@34) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (= (ControlFlow 0 18699) 18579)) inline$$CopyOrMoveValue$14$Entry_correct)))
+(let ((inline$$Test_fresh_guid$0$anon31_Else_correct  (=> (not $abort_flag@0) (and (=> (= (ControlFlow 0 18542) 18699) inline$$Test_fresh_guid$0$anon32_Then_correct) (=> (= (ControlFlow 0 18542) 18548) inline$$Test_fresh_guid$0$anon32_Else_correct)))))
+(let ((inline$$WriteRef$2$anon0_correct  (=> (and (and (= inline$$WriteRef$2$l@1 (|l#Reference| inline$$BorrowLoc$2$dst@1)) (= inline$$WriteRef$2$v@1 (|Select_[Location]Value| (|contents#Memory| $m@33) inline$$WriteRef$2$l@1))) (and (= inline$$WriteRef$2$v@2 ($UpdateValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) inline$$WriteRef$2$v@1 inline$$WriteRef$2$new_v@0)) (= $m@34 (Memory (|domain#Memory| $m@33) (|Store_[Location]Value| (|contents#Memory| $m@33) inline$$WriteRef$2$l@1 inline$$WriteRef$2$v@2))))) (and (=> (= (ControlFlow 0 18524) 18709) inline$$Test_fresh_guid$0$anon31_Then_correct) (=> (= (ControlFlow 0 18524) 18542) inline$$Test_fresh_guid$0$anon31_Else_correct)))))
+(let ((inline$$WriteRef$2$Entry_correct  (=> (and (= inline$$WriteRef$2$new_v@0 (Vector (let ((l2@@0 (|l#ValueArray| (|v#Vector| inline$$Vector_append$1$other@0))))
+(let ((l1@@0 (|l#ValueArray| (|v#Vector| inline$$Vector_append$1$v@1))))
+(ValueArray (|lambda#2| 0 (+ l1@@0 l2@@0) l1@@0 (|v#ValueArray| (|v#Vector| inline$$Vector_append$1$v@1)) (|v#ValueArray| (|v#Vector| inline$$Vector_append$1$other@0)) l1@@0 DefaultValue) (+ l1@@0 l2@@0)))))) (= (ControlFlow 0 18484) 18524)) inline$$WriteRef$2$anon0_correct)))
+(let ((inline$$Vector_append$1$anon0_correct  (=> (and (and (= inline$$Vector_append$1$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@33) (|l#Reference| inline$$BorrowLoc$2$dst@1)))) (is-Vector inline$$Vector_append$1$v@1)) (and (is-Vector inline$$Vector_append$1$other@0) (= (ControlFlow 0 18528) 18484))) inline$$WriteRef$2$Entry_correct)))
+(let ((inline$$Vector_append$1$Entry_correct  (=> (= inline$$Vector_append$1$ta@0 IntegerType) (=> (and (= inline$$Vector_append$1$other@0 (|Select_[Location]Value| (|contents#Memory| $m@33) (Local (+ $local_counter@1 17)))) (= (ControlFlow 0 18394) 18528)) inline$$Vector_append$1$anon0_correct))))
+(let ((inline$$Test_fresh_guid$0$anon16$2_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$13$local@0) (let ((va@@34 (|v#Vector| inline$$CopyOrMoveValue$13$local@0)))
+(let ((l@@34 (|l#ValueArray| va@@34)))
+ (and (<= 0 l@@34) (forall ((x@@34 Int) ) (!  (=> (or (< x@@34 0) (>= x@@34 l@@34)) (= (|Select_[$int]Value| (|v#ValueArray| va@@34) x@@34) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@34) x@@34))
+)))))) (forall (($$0@@15 Int) ) (!  (=> (and (>= $$0@@15 0) (< $$0@@15 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$13$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$13$local@0)) $$0@@15)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$13$local@0)) $$0@@15)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$13$local@0)) $$0@@15)) MAX_U8)))
+ :qid |outputbp.1809:52|
+ :skolemid |42|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$13$local@0)) $$0@@15))
+))) (and (= $m@33 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@32) (Local (+ $local_counter@1 17)) true) (|Store_[Location]Value| (|contents#Memory| $m@32) (Local (+ $local_counter@1 17)) inline$$CopyOrMoveValue$13$local@0))) (= (ControlFlow 0 18534) 18394))) inline$$Vector_append$1$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$13$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$13$local@0 (|Select_[Location]Value| (|contents#Memory| $m@32) (Local (+ $local_counter@1 3)))) (= (ControlFlow 0 18258) 18534)) inline$$Test_fresh_guid$0$anon16$2_correct)))
+(let ((inline$$Test_fresh_guid$0$anon16$1_correct  (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1)))) (let ((va@@35 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))))
+(let ((l@@35 (|l#ValueArray| va@@35)))
+ (and (<= 0 l@@35) (forall ((x@@35 Int) ) (!  (=> (or (< x@@35 0) (>= x@@35 l@@35)) (= (|Select_[$int]Value| (|v#ValueArray| va@@35) x@@35) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@35) x@@35))
+)))))) (forall (($$1@@0 Int) ) (!  (=> (and (>= $$1@@0 0) (< $$1@@0 (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))) $$1@@0)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))) $$1@@0)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))) $$1@@0)) MAX_U8)))
+ :qid |outputbp.1805:70|
+ :skolemid |41|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$2$dst@1))))) $$1@@0))
+))) (= (ControlFlow 0 18268) 18258)) inline$$CopyOrMoveValue$13$Entry_correct)))
+(let ((inline$$BorrowLoc$2$anon0_correct  (=> (and (= inline$$BorrowLoc$2$dst@1 (Reference (Local inline$$BorrowLoc$2$l@0) EmptyPath)) (= (ControlFlow 0 18159) 18268)) inline$$Test_fresh_guid$0$anon16$1_correct)))
+(let ((inline$$BorrowLoc$2$Entry_correct  (=> (and (= inline$$BorrowLoc$2$l@0 (+ $local_counter@1 2)) (= (ControlFlow 0 18149) 18159)) inline$$BorrowLoc$2$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon30_Else_correct  (=> (and (not true) (= (ControlFlow 0 18116) 18149)) inline$$BorrowLoc$2$Entry_correct)))
+(let ((inline$$Test_fresh_guid$0$anon30_Then_correct  (=> (and ($DebugTrackLocal 3 1133 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@32) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (= (ControlFlow 0 18735) 18149)) inline$$BorrowLoc$2$Entry_correct)))
+(let ((inline$$WriteRef$1$anon0_correct  (=> (and (and (= inline$$WriteRef$1$l@1 (|l#Reference| inline$$BorrowField$2$dst@1)) (= inline$$WriteRef$1$v@1 (|Select_[Location]Value| (|contents#Memory| $m@31) inline$$WriteRef$1$l@1))) (and (= inline$$WriteRef$1$v@2 ($UpdateValue_stratified (|p#Reference| inline$$BorrowField$2$dst@1) inline$$WriteRef$1$v@1 inline$$WriteRef$1$new_v@0)) (= $m@32 (Memory (|domain#Memory| $m@31) (|Store_[Location]Value| (|contents#Memory| $m@31) inline$$WriteRef$1$l@1 inline$$WriteRef$1$v@2))))) (and (=> (= (ControlFlow 0 18104) 18735) inline$$Test_fresh_guid$0$anon30_Then_correct) (=> (= (ControlFlow 0 18104) 18116) inline$$Test_fresh_guid$0$anon30_Else_correct)))))
+(let ((inline$$WriteRef$1$Entry_correct  (=> (and (= inline$$WriteRef$1$new_v@0 (|Select_[Location]Value| (|contents#Memory| $m@31) (Local (+ $local_counter@1 13)))) (= (ControlFlow 0 18064) 18104)) inline$$WriteRef$1$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon29_Else$2_correct  (=> (and (and (and (is-Integer ($ReadValue_stratified (|p#Reference| inline$$BorrowField$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@31) (|l#Reference| inline$$BorrowField$2$dst@1)))) (>= (|i#Integer| ($ReadValue_stratified (|p#Reference| inline$$BorrowField$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@31) (|l#Reference| inline$$BorrowField$2$dst@1)))) 0)) (<= (|i#Integer| ($ReadValue_stratified (|p#Reference| inline$$BorrowField$2$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@31) (|l#Reference| inline$$BorrowField$2$dst@1)))) MAX_U64)) (= (ControlFlow 0 18108) 18064)) inline$$WriteRef$1$Entry_correct)))
+(let ((inline$$BorrowField$2$anon0_correct  (=> (= inline$$BorrowField$2$p@1 (|p#Reference| inline$$BorrowLoc$1$dst@1)) (=> (and (and (= inline$$BorrowField$2$size@1 (|size#Path| inline$$BorrowField$2$p@1)) (= inline$$BorrowField$2$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$2$p@1) inline$$BorrowField$2$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$2$size@1 1)))) (and (= inline$$BorrowField$2$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$1$dst@1) inline$$BorrowField$2$p@2)) (= (ControlFlow 0 17970) 18108))) inline$$Test_fresh_guid$0$anon29_Else$2_correct))))
+(let ((inline$$Test_fresh_guid$0$anon29_Else_correct  (=> (not $abort_flag@0) (=> (and (= $m@31 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@30) (Local (+ $local_counter@1 13)) true) (|Store_[Location]Value| (|contents#Memory| $m@30) (Local (+ $local_counter@1 13)) inline$$AddU64$0$dst@2))) (= (ControlFlow 0 17870) 17970)) inline$$BorrowField$2$anon0_correct))))
+(let ((inline$$AddU64$0$anon3_Else_correct  (=> (and (and (>= MAX_U64 (+ (|i#Integer| inline$$AddU64$0$src1@0) (|i#Integer| inline$$AddU64$0$src2@0))) (= inline$$AddU64$0$dst@1 (Integer (+ (|i#Integer| inline$$AddU64$0$src1@0) (|i#Integer| inline$$AddU64$0$src2@0))))) (and (= $abort_flag@0 false) (= inline$$AddU64$0$dst@2 inline$$AddU64$0$dst@1))) (and (=> (= (ControlFlow 0 17795) 18745) inline$$Test_fresh_guid$0$anon29_Then_correct) (=> (= (ControlFlow 0 17795) 17870) inline$$Test_fresh_guid$0$anon29_Else_correct)))))
+(let ((inline$$AddU64$0$anon3_Then_correct  (=> (> (+ (|i#Integer| inline$$AddU64$0$src1@0) (|i#Integer| inline$$AddU64$0$src2@0)) MAX_U64) (=> (and (= $abort_flag@0 true) (= inline$$AddU64$0$dst@2 inline$$AddU64$0$dst@0)) (and (=> (= (ControlFlow 0 17813) 18745) inline$$Test_fresh_guid$0$anon29_Then_correct) (=> (= (ControlFlow 0 17813) 17870) inline$$Test_fresh_guid$0$anon29_Else_correct))))))
+(let ((inline$$AddU64$0$Entry_correct  (=> (and (= inline$$AddU64$0$src1@0 (|Select_[Location]Value| (|contents#Memory| $m@30) (Local (+ $local_counter@1 11)))) (= inline$$AddU64$0$src2@0 (|Select_[Location]Value| (|contents#Memory| $m@30) (Local (+ $local_counter@1 12))))) (and (=> (= (ControlFlow 0 17765) (- 0 31292)) true) (and (=> (= (ControlFlow 0 17765) 17813) inline$$AddU64$0$anon3_Then_correct) (=> (= (ControlFlow 0 17765) 17795) inline$$AddU64$0$anon3_Else_correct))))))
+(let ((inline$$Test_fresh_guid$0$anon12$3_correct  (=> (and (and (and (is-Integer inline$$CopyOrMoveValue$12$local@0) (>= (|i#Integer| inline$$CopyOrMoveValue$12$local@0) 0)) (<= (|i#Integer| inline$$CopyOrMoveValue$12$local@0) MAX_U64)) (and (and (= $m@29 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@28) (Local (+ $local_counter@1 11)) true) (|Store_[Location]Value| (|contents#Memory| $m@28) (Local (+ $local_counter@1 11)) inline$$CopyOrMoveValue$12$local@0))) (= inline$$Test_fresh_guid$0$$tmp@1 (Integer 1))) (and (= $m@30 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@29) (Local (+ $local_counter@1 12)) true) (|Store_[Location]Value| (|contents#Memory| $m@29) (Local (+ $local_counter@1 12)) inline$$Test_fresh_guid$0$$tmp@1))) (= (ControlFlow 0 17819) 17765)))) inline$$AddU64$0$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$12$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$12$local@0 (|Select_[Location]Value| (|contents#Memory| $m@28) (Local (+ $local_counter@1 10)))) (= (ControlFlow 0 17623) 17819)) inline$$Test_fresh_guid$0$anon12$3_correct)))
+(let ((inline$$Test_fresh_guid$0$anon12$2_correct  (=> (and (and (and (is-Integer inline$$ReadRef$1$v@1) (>= (|i#Integer| inline$$ReadRef$1$v@1) 0)) (<= (|i#Integer| inline$$ReadRef$1$v@1) MAX_U64)) (and (= $m@28 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@27) (Local (+ $local_counter@1 10)) true) (|Store_[Location]Value| (|contents#Memory| $m@27) (Local (+ $local_counter@1 10)) inline$$ReadRef$1$v@1))) (= (ControlFlow 0 17633) 17623))) inline$$CopyOrMoveValue$12$Entry_correct)))
+(let ((inline$$ReadRef$1$anon0_correct  (=> (and (= inline$$ReadRef$1$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowField$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@27) (|l#Reference| inline$$BorrowField$1$dst@1)))) (= (ControlFlow 0 17562) 17633)) inline$$Test_fresh_guid$0$anon12$2_correct)))
+(let ((inline$$BorrowField$1$anon0_correct  (=> (= inline$$BorrowField$1$p@1 (|p#Reference| inline$$BorrowLoc$1$dst@1)) (=> (and (and (= inline$$BorrowField$1$size@1 (|size#Path| inline$$BorrowField$1$p@1)) (= inline$$BorrowField$1$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$1$p@1) inline$$BorrowField$1$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$1$size@1 1)))) (and (= inline$$BorrowField$1$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$1$dst@1) inline$$BorrowField$1$p@2)) (= (ControlFlow 0 17502) 17562))) inline$$ReadRef$1$anon0_correct))))
+(let ((inline$$Test_fresh_guid$0$anon28_Else_correct  (=> (and (not true) (= (ControlFlow 0 17333) 17502)) inline$$BorrowField$1$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon28_Then_correct  (=> (and ($DebugTrackLocal 3 1078 2 inline$$CopyOrMoveValue$11$local@0) (= (ControlFlow 0 18759) 17502)) inline$$BorrowField$1$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon27_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$11$local@0) (let ((va@@36 (|v#Vector| inline$$CopyOrMoveValue$11$local@0)))
+(let ((l@@36 (|l#ValueArray| va@@36)))
+ (and (<= 0 l@@36) (forall ((x@@36 Int) ) (!  (=> (or (< x@@36 0) (>= x@@36 l@@36)) (= (|Select_[$int]Value| (|v#ValueArray| va@@36) x@@36) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@36) x@@36))
+)))))) (forall (($$0@@16 Int) ) (!  (=> (and (>= $$0@@16 0) (< $$0@@16 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$11$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$11$local@0)) $$0@@16)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$11$local@0)) $$0@@16)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$11$local@0)) $$0@@16)) MAX_U8)))
+ :qid |outputbp.1762:52|
+ :skolemid |40|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$11$local@0)) $$0@@16))
+))) (= $m@27 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@26) (Local (+ $local_counter@1 2)) true) (|Store_[Location]Value| (|contents#Memory| $m@26) (Local (+ $local_counter@1 2)) inline$$CopyOrMoveValue$11$local@0)))) (and (=> (= (ControlFlow 0 17327) 18759) inline$$Test_fresh_guid$0$anon28_Then_correct) (=> (= (ControlFlow 0 17327) 17333) inline$$Test_fresh_guid$0$anon28_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$11$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$11$local@0 (|Select_[Location]Value| (|contents#Memory| $m@26) (Local (+ $local_counter@1 8)))) (= (ControlFlow 0 17257) 17327)) inline$$Test_fresh_guid$0$anon27_Else$1_correct)))
+(let ((inline$$Test_fresh_guid$0$anon27_Else_correct  (=> (not false) (=> (and (and (and (is-Vector call2formal@res@0@@1) (let ((va@@37 (|v#Vector| call2formal@res@0@@1)))
+(let ((l@@37 (|l#ValueArray| va@@37)))
+ (and (<= 0 l@@37) (forall ((x@@37 Int) ) (!  (=> (or (< x@@37 0) (>= x@@37 l@@37)) (= (|Select_[$int]Value| (|v#ValueArray| va@@37) x@@37) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@37) x@@37))
+)))))) (forall (($$0@@17 Int) ) (!  (=> (and (>= $$0@@17 0) (< $$0@@17 (|l#ValueArray| (|v#Vector| call2formal@res@0@@1)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) $$0@@17)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) $$0@@17)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) $$0@@17)) MAX_U8)))
+ :qid |outputbp.1756:51|
+ :skolemid |39|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) $$0@@17))
+))) (and (= $m@26 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@25) (Local (+ $local_counter@1 8)) true) (|Store_[Location]Value| (|contents#Memory| $m@25) (Local (+ $local_counter@1 8)) call2formal@res@0@@1))) (= (ControlFlow 0 17267) 17257))) inline$$CopyOrMoveValue$11$Entry_correct))))
+(let ((inline$$Test_fresh_guid$0$anon8$2_correct  (=> (and (and (and (and (is-Integer inline$$ReadRef$0$v@1) (>= (|i#Integer| inline$$ReadRef$0$v@1) 0)) (<= (|i#Integer| inline$$ReadRef$0$v@1) MAX_U64)) (and (and (= $m@25 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@24) (Local (+ $local_counter@1 7)) true) (|Store_[Location]Value| (|contents#Memory| $m@24) (Local (+ $local_counter@1 7)) inline$$ReadRef$0$v@1))) (= call0formal@ta@0@@1 IntegerType)) (and (= call1formal@v@0@@1 (|Select_[Location]Value| (|contents#Memory| $m@25) (Local (+ $local_counter@1 7)))) (= call2formal@res@0@@1 ($BCS_serialize_core call1formal@v@0@@1))))) (and (and (and (is-Vector call2formal@res@0@@1) (let ((va@@38 (|v#Vector| call2formal@res@0@@1)))
+(let ((l@@38 (|l#ValueArray| va@@38)))
+ (and (<= 0 l@@38) (forall ((x@@38 Int) ) (!  (=> (or (< x@@38 0) (>= x@@38 l@@38)) (= (|Select_[$int]Value| (|v#ValueArray| va@@38) x@@38) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@38) x@@38))
+)))))) (forall ((i@@8 Int) ) (!  (=> (and (<= 0 i@@8) (< i@@8 (|l#ValueArray| (|v#Vector| call2formal@res@0@@1)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) i@@8)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) i@@8)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) i@@8)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@1)) i@@8))
+))) (> (|l#ValueArray| (|v#Vector| call2formal@res@0@@1)) 0))) (and (=> (= (ControlFlow 0 17164) 18769) inline$$Test_fresh_guid$0$anon27_Then_correct) (=> (= (ControlFlow 0 17164) 17267) inline$$Test_fresh_guid$0$anon27_Else_correct)))))
+(let ((inline$$ReadRef$0$anon0_correct  (=> (and (= inline$$ReadRef$0$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowField$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@24) (|l#Reference| inline$$BorrowField$0$dst@1)))) (= (ControlFlow 0 17132) 17164)) inline$$Test_fresh_guid$0$anon8$2_correct)))
+(let ((inline$$BorrowField$0$anon0_correct  (=> (= inline$$BorrowField$0$p@1 (|p#Reference| inline$$BorrowLoc$1$dst@1)) (=> (and (and (= inline$$BorrowField$0$size@1 (|size#Path| inline$$BorrowField$0$p@1)) (= inline$$BorrowField$0$p@2 (Path (|Store_[$int]$int| (|p#Path| inline$$BorrowField$0$p@1) inline$$BorrowField$0$size@1 $Test_EventHandleGenerator_counter) (+ inline$$BorrowField$0$size@1 1)))) (and (= inline$$BorrowField$0$dst@1 (Reference (|l#Reference| inline$$BorrowLoc$1$dst@1) inline$$BorrowField$0$p@2)) (= (ControlFlow 0 17072) 17132))) inline$$ReadRef$0$anon0_correct))))
+(let ((inline$$Test_fresh_guid$0$anon26_Else_correct  (=> (and (not true) (= (ControlFlow 0 16903) 17072)) inline$$BorrowField$0$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon26_Then_correct  (=> (and ($DebugTrackLocal 3 1027 3 inline$$CopyOrMoveValue$10$local@0) (= (ControlFlow 0 18783) 17072)) inline$$BorrowField$0$anon0_correct)))
+(let ((inline$$Test_fresh_guid$0$anon25_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$10$local@0) (let ((va@@39 (|v#Vector| inline$$CopyOrMoveValue$10$local@0)))
+(let ((l@@39 (|l#ValueArray| va@@39)))
+ (and (<= 0 l@@39) (forall ((x@@39 Int) ) (!  (=> (or (< x@@39 0) (>= x@@39 l@@39)) (= (|Select_[$int]Value| (|v#ValueArray| va@@39) x@@39) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@39) x@@39))
+)))))) (forall (($$0@@18 Int) ) (!  (=> (and (>= $$0@@18 0) (< $$0@@18 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$10$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$10$local@0)) $$0@@18)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$10$local@0)) $$0@@18)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$10$local@0)) $$0@@18)) MAX_U8)))
+ :qid |outputbp.1738:52|
+ :skolemid |38|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$10$local@0)) $$0@@18))
+))) (= $m@24 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@23) (Local (+ $local_counter@1 3)) true) (|Store_[Location]Value| (|contents#Memory| $m@23) (Local (+ $local_counter@1 3)) inline$$CopyOrMoveValue$10$local@0)))) (and (=> (= (ControlFlow 0 16897) 18783) inline$$Test_fresh_guid$0$anon26_Then_correct) (=> (= (ControlFlow 0 16897) 16903) inline$$Test_fresh_guid$0$anon26_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$10$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$10$local@0 (|Select_[Location]Value| (|contents#Memory| $m@23) (Local (+ $local_counter@1 5)))) (= (ControlFlow 0 16827) 16897)) inline$$Test_fresh_guid$0$anon25_Else$1_correct)))
+(let ((inline$$Test_fresh_guid$0$anon25_Else_correct  (=> (not false) (=> (and (and (and (is-Vector call2formal@res@0@@2) (let ((va@@40 (|v#Vector| call2formal@res@0@@2)))
+(let ((l@@40 (|l#ValueArray| va@@40)))
+ (and (<= 0 l@@40) (forall ((x@@40 Int) ) (!  (=> (or (< x@@40 0) (>= x@@40 l@@40)) (= (|Select_[$int]Value| (|v#ValueArray| va@@40) x@@40) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@40) x@@40))
+)))))) (forall (($$0@@19 Int) ) (!  (=> (and (>= $$0@@19 0) (< $$0@@19 (|l#ValueArray| (|v#Vector| call2formal@res@0@@2)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) $$0@@19)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) $$0@@19)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) $$0@@19)) MAX_U8)))
+ :qid |outputbp.1732:51|
+ :skolemid |37|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) $$0@@19))
+))) (and (= $m@23 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@22) (Local (+ $local_counter@1 5)) true) (|Store_[Location]Value| (|contents#Memory| $m@22) (Local (+ $local_counter@1 5)) call2formal@res@0@@2))) (= (ControlFlow 0 16837) 16827))) inline$$CopyOrMoveValue$10$Entry_correct))))
+(let ((inline$$Test_fresh_guid$0$anon4$1_correct  (=> (is-Address inline$$CopyOrMoveValue$9$local@0) (=> (and (and (= $m@22 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@21) (Local (+ $local_counter@1 4)) true) (|Store_[Location]Value| (|contents#Memory| $m@21) (Local (+ $local_counter@1 4)) inline$$CopyOrMoveValue$9$local@0))) (= call0formal@ta@0@@2 AddressType)) (and (= call1formal@v@0@@2 (|Select_[Location]Value| (|contents#Memory| $m@22) (Local (+ $local_counter@1 4)))) (= call2formal@res@0@@2 ($BCS_serialize_core call1formal@v@0@@2)))) (=> (and (and (and (is-Vector call2formal@res@0@@2) (let ((va@@41 (|v#Vector| call2formal@res@0@@2)))
+(let ((l@@41 (|l#ValueArray| va@@41)))
+ (and (<= 0 l@@41) (forall ((x@@41 Int) ) (!  (=> (or (< x@@41 0) (>= x@@41 l@@41)) (= (|Select_[$int]Value| (|v#ValueArray| va@@41) x@@41) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@41) x@@41))
+)))))) (forall ((i@@9 Int) ) (!  (=> (and (<= 0 i@@9) (< i@@9 (|l#ValueArray| (|v#Vector| call2formal@res@0@@2)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) i@@9)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) i@@9)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) i@@9)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@2)) i@@9))
+))) (> (|l#ValueArray| (|v#Vector| call2formal@res@0@@2)) 0)) (and (=> (= (ControlFlow 0 16734) 18793) inline$$Test_fresh_guid$0$anon25_Then_correct) (=> (= (ControlFlow 0 16734) 16837) inline$$Test_fresh_guid$0$anon25_Else_correct)))))))
+(let ((inline$$CopyOrMoveValue$9$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$9$local@0 (|Select_[Location]Value| (|contents#Memory| $m@21) (Local (+ $local_counter@1 1)))) (= (ControlFlow 0 16706) 16734)) inline$$Test_fresh_guid$0$anon4$1_correct)))
+(let ((inline$$Test_fresh_guid$0$anon4_correct  (=> (and (= $local_counter@2 (+ $local_counter@1 19)) (= (ControlFlow 0 16716) 16706)) inline$$CopyOrMoveValue$9$Entry_correct)))
+(let ((inline$$Test_fresh_guid$0$anon24_Else_correct  (=> (and (not true) (= (ControlFlow 0 16669) 16716)) inline$$Test_fresh_guid$0$anon4_correct)))
+(let ((inline$$Test_fresh_guid$0$anon24_Then_correct  (=> (and ($DebugTrackLocal 3 933 1 inline$$Test_fresh_guid$0$sender@0) (= (ControlFlow 0 18807) 16716)) inline$$Test_fresh_guid$0$anon4_correct)))
+(let ((inline$$Test_fresh_guid$0$anon2_correct  (=> (and (is-Address inline$$Test_fresh_guid$0$sender@0) (= $m@21 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@20) (Local (+ $local_counter@1 1)) true) (|Store_[Location]Value| (|contents#Memory| $m@20) (Local (+ $local_counter@1 1)) inline$$Test_fresh_guid$0$sender@0)))) (and (=> (= (ControlFlow 0 16663) 18807) inline$$Test_fresh_guid$0$anon24_Then_correct) (=> (= (ControlFlow 0 16663) 16669) inline$$Test_fresh_guid$0$anon24_Else_correct)))))
+(let ((inline$$Test_fresh_guid$0$anon23_Else_correct  (=> (and (not true) (= (ControlFlow 0 16645) 16663)) inline$$Test_fresh_guid$0$anon2_correct)))
+(let ((inline$$Test_fresh_guid$0$anon23_Then_correct  (=> (and ($DebugTrackLocal 3 933 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (= (ControlFlow 0 18825) 16663)) inline$$Test_fresh_guid$0$anon2_correct)))
+(let ((inline$$Test_fresh_guid$0$anon0_correct  (and (=> (= (ControlFlow 0 16639) (- 0 30418)) (not false)) (=> (not false) (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (let ((va@@42 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))))
+(let ((l@@42 (|l#ValueArray| va@@42)))
+ (and (<= 0 l@@42) (forall ((x@@42 Int) ) (!  (=> (or (< x@@42 0) (>= x@@42 l@@42)) (= (|Select_[$int]Value| (|v#ValueArray| va@@42) x@@42) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@42) x@@42))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@20) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (and (=> (= (ControlFlow 0 16639) 18825) inline$$Test_fresh_guid$0$anon23_Then_correct) (=> (= (ControlFlow 0 16639) 16645) inline$$Test_fresh_guid$0$anon23_Else_correct)))))))
+(let ((inline$$Test_fresh_guid$0$Entry_correct  (=> (= inline$$Test_fresh_guid$0$sender@0 (|Select_[Location]Value| (|contents#Memory| $m@20) (Local (+ $local_counter@0 4)))) (and (=> (= (ControlFlow 0 16621) (- 0 30374)) (|Select_[Location]$bool| (|domain#Memory| $m@20) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn)))) (=> (|Select_[Location]$bool| (|domain#Memory| $m@20) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (=> (= (ControlFlow 0 16621) 16639) inline$$Test_fresh_guid$0$anon0_correct))))))
+(let ((inline$$Test_new_event_handle_impl$0$anon4$2_correct  (=> (is-Address inline$$CopyOrMoveValue$8$local@0) (=> (and (= $m@20 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@19) (Local (+ $local_counter@0 4)) true) (|Store_[Location]Value| (|contents#Memory| $m@19) (Local (+ $local_counter@0 4)) inline$$CopyOrMoveValue$8$local@0))) (= (ControlFlow 0 18953) 16621)) inline$$Test_fresh_guid$0$Entry_correct))))
+(let ((inline$$CopyOrMoveValue$8$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$8$local@0 (|Select_[Location]Value| (|contents#Memory| $m@19) (Local (+ $local_counter@0 1)))) (= (ControlFlow 0 15416) 18953)) inline$$Test_new_event_handle_impl$0$anon4$2_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon4_correct  (=> (and (and (= $local_counter@1 (+ $local_counter@0 7)) (= inline$$Test_new_event_handle_impl$0$$tmp@1 (Integer 0))) (and (= $m@19 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@18) (Local (+ $local_counter@0 2)) true) (|Store_[Location]Value| (|contents#Memory| $m@18) (Local (+ $local_counter@0 2)) inline$$Test_new_event_handle_impl$0$$tmp@1))) (= (ControlFlow 0 15385) 15416))) inline$$CopyOrMoveValue$8$Entry_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon12_Else_correct  (=> (and (not true) (= (ControlFlow 0 15330) 15385)) inline$$Test_new_event_handle_impl$0$anon4_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon12_Then_correct  (=> (and ($DebugTrackLocal 3 1441 1 inline$$Test_new_event_handle_impl$0$sender@0) (= (ControlFlow 0 19388) 15385)) inline$$Test_new_event_handle_impl$0$anon4_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon2_correct  (=> (and (is-Address inline$$Test_new_event_handle_impl$0$sender@0) (= $m@18 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@17) (Local (+ $local_counter@0 1)) true) (|Store_[Location]Value| (|contents#Memory| $m@17) (Local (+ $local_counter@0 1)) inline$$Test_new_event_handle_impl$0$sender@0)))) (and (=> (= (ControlFlow 0 15324) 19388) inline$$Test_new_event_handle_impl$0$anon12_Then_correct) (=> (= (ControlFlow 0 15324) 15330) inline$$Test_new_event_handle_impl$0$anon12_Else_correct)))))
+(let ((inline$$Test_new_event_handle_impl$0$anon11_Else_correct  (=> (and (not true) (= (ControlFlow 0 15306) 15324)) inline$$Test_new_event_handle_impl$0$anon2_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon11_Then_correct  (=> (and ($DebugTrackLocal 3 1441 0 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (= (ControlFlow 0 19406) 15324)) inline$$Test_new_event_handle_impl$0$anon2_correct)))
+(let ((inline$$Test_new_event_handle_impl$0$anon0_correct  (and (=> (= (ControlFlow 0 15300) (- 0 30210)) (not false)) (=> (not false) (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (let ((va@@43 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))))
+(let ((l@@43 (|l#ValueArray| va@@43)))
+ (and (<= 0 l@@43) (forall ((x@@43 Int) ) (!  (=> (or (< x@@43 0) (>= x@@43 l@@43)) (= (|Select_[$int]Value| (|v#ValueArray| va@@43) x@@43) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@43) x@@43))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@17) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (and (=> (= (ControlFlow 0 15300) 19406) inline$$Test_new_event_handle_impl$0$anon11_Then_correct) (=> (= (ControlFlow 0 15300) 15306) inline$$Test_new_event_handle_impl$0$anon11_Else_correct)))))))
+(let ((inline$$Test_new_event_handle_impl$0$Entry_correct  (=> (and (= inline$$Test_new_event_handle_impl$0$$tv0@0 $Test_Event1_type_value) (= inline$$Test_new_event_handle_impl$0$sender@0 (|Select_[Location]Value| (|contents#Memory| $m@17) (Local (+ 0 19))))) (and (=> (= (ControlFlow 0 15282) (- 0 30181)) (|Select_[Location]$bool| (|domain#Memory| $m@17) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn)))) (=> (|Select_[Location]$bool| (|domain#Memory| $m@17) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (=> (= (ControlFlow 0 15282) 15300) inline$$Test_new_event_handle_impl$0$anon0_correct))))))
+(let ((inline$$Test_create$0$anon37_Then$2_correct  (=> (is-Address inline$$CopyOrMoveValue$7$local@0) (=> (and (= $m@17 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@15) (Local (+ 0 19)) true) (|Store_[Location]Value| (|contents#Memory| $m@15) (Local (+ 0 19)) inline$$CopyOrMoveValue$7$local@0))) (= (ControlFlow 0 19560) 15282)) inline$$Test_new_event_handle_impl$0$Entry_correct))))
+(let ((inline$$CopyOrMoveValue$7$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$7$local@0 (|Select_[Location]Value| (|contents#Memory| $m@15) (Local (+ 0 0)))) (= (ControlFlow 0 14686) 19560)) inline$$Test_create$0$anon37_Then$2_correct)))
+(let ((inline$$Test_create$0$anon37_Then$1_correct  (=> (and (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1)))) (let ((va@@44 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1))))))
+(let ((l@@44 (|l#ValueArray| va@@44)))
+ (and (<= 0 l@@44) (forall ((x@@44 Int) ) (!  (=> (or (< x@@44 0) (>= x@@44 l@@44)) (= (|Select_[$int]Value| (|v#ValueArray| va@@44) x@@44) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@44) x@@44))
+)))))) (= (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$1$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@15) (|l#Reference| inline$$BorrowLoc$1$dst@1))))) $Test_EventHandleGenerator_counter)) MAX_U64))) (= (ControlFlow 0 14696) 14686)) inline$$CopyOrMoveValue$7$Entry_correct)))
+(let ((inline$$BorrowLoc$1$anon0_correct  (=> (and (= inline$$BorrowLoc$1$dst@1 (Reference (Local inline$$BorrowLoc$1$l@0) EmptyPath)) (= (ControlFlow 0 14641) 14696)) inline$$Test_create$0$anon37_Then$1_correct)))
+(let ((inline$$BorrowLoc$1$Entry_correct  (=> (and (= inline$$BorrowLoc$1$l@0 (+ 0 3)) (= (ControlFlow 0 14631) 14641)) inline$$BorrowLoc$1$anon0_correct)))
+(let ((inline$$Test_create$0$anon37_Then_correct  (=> (and (|b#Boolean| inline$$Test_create$0$$tmp@4) (= (ControlFlow 0 14647) 14631)) inline$$BorrowLoc$1$Entry_correct)))
+(let ((inline$$Test_create$0$anon38_Else_correct  (=> (and (not true) (= (ControlFlow 0 14574) 14584)) inline$$Test_create$0$Abort_correct)))
+(let ((inline$$Test_create$0$anon38_Then_correct  (=> (and ($DebugTrackAbort 3 2148) (= (ControlFlow 0 14594) 14584)) inline$$Test_create$0$Abort_correct)))
+(let ((inline$$Test_create$0$anon37_Else_correct  (=> (not (|b#Boolean| inline$$Test_create$0$$tmp@4)) (=> (and (= inline$$Test_create$0$$tmp@5 (Integer 12)) (= $m@16 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@15) (Local (+ 0 17)) true) (|Store_[Location]Value| (|contents#Memory| $m@15) (Local (+ 0 17)) inline$$Test_create$0$$tmp@5)))) (and (=> (= (ControlFlow 0 14568) 14594) inline$$Test_create$0$anon38_Then_correct) (=> (= (ControlFlow 0 14568) 14574) inline$$Test_create$0$anon38_Else_correct))))))
+(let ((inline$$Test_create$0$anon16$1_correct  (=> (is-Boolean inline$$CopyOrMoveValue$6$local@0) (=> (and (= $m@15 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@14) (Local (+ 0 16)) true) (|Store_[Location]Value| (|contents#Memory| $m@14) (Local (+ 0 16)) inline$$CopyOrMoveValue$6$local@0))) (= inline$$Test_create$0$$tmp@4 (|Select_[Location]Value| (|contents#Memory| $m@15) (Local (+ 0 16))))) (and (=> (= (ControlFlow 0 14544) 14647) inline$$Test_create$0$anon37_Then_correct) (=> (= (ControlFlow 0 14544) 14568) inline$$Test_create$0$anon37_Else_correct))))))
+(let ((inline$$CopyOrMoveValue$6$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$6$local@0 (|Select_[Location]Value| (|contents#Memory| $m@14) (Local (+ 0 4)))) (= (ControlFlow 0 14506) 14544)) inline$$Test_create$0$anon16$1_correct)))
+(let ((inline$$Test_create$0$anon36_Else_correct  (=> (and (not true) (= (ControlFlow 0 14475) 14506)) inline$$CopyOrMoveValue$6$Entry_correct)))
+(let ((inline$$Test_create$0$anon36_Then_correct  (=> (and ($DebugTrackLocal 3 2148 4 inline$$CopyOrMoveValue$5$local@0) (= (ControlFlow 0 25110) 14506)) inline$$CopyOrMoveValue$6$Entry_correct)))
+(let ((inline$$Test_create$0$anon35_Else$1_correct  (=> (and (is-Boolean inline$$CopyOrMoveValue$5$local@0) (= $m@14 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@13) (Local (+ 0 4)) true) (|Store_[Location]Value| (|contents#Memory| $m@13) (Local (+ 0 4)) inline$$CopyOrMoveValue$5$local@0)))) (and (=> (= (ControlFlow 0 14469) 25110) inline$$Test_create$0$anon36_Then_correct) (=> (= (ControlFlow 0 14469) 14475) inline$$Test_create$0$anon36_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$5$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$5$local@0 (|Select_[Location]Value| (|contents#Memory| $m@13) (Local (+ 0 15)))) (= (ControlFlow 0 14441) 14469)) inline$$Test_create$0$anon35_Else$1_correct)))
+(let ((inline$$Test_create$0$anon35_Else_correct  (=> (not false) (=> (and (and (and (and (is-Integer inline$$Vector_length$0$l@1) (>= (|i#Integer| inline$$Vector_length$0$l@1) 0)) (<= (|i#Integer| inline$$Vector_length$0$l@1) MAX_U64)) (and (= $m@11 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@10) (Local (+ 0 13)) true) (|Store_[Location]Value| (|contents#Memory| $m@10) (Local (+ 0 13)) inline$$Vector_length$0$l@1))) (= inline$$Test_create$0$$tmp@2 (Integer 32)))) (and (and (= $m@12 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@11) (Local (+ 0 14)) true) (|Store_[Location]Value| (|contents#Memory| $m@11) (Local (+ 0 14)) inline$$Test_create$0$$tmp@2))) (= inline$$Test_create$0$$tmp@3 (Boolean (IsEqual_stratified (|Select_[Location]Value| (|contents#Memory| $m@12) (Local (+ 0 13))) (|Select_[Location]Value| (|contents#Memory| $m@12) (Local (+ 0 14))))))) (and (= $m@13 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@12) (Local (+ 0 15)) true) (|Store_[Location]Value| (|contents#Memory| $m@12) (Local (+ 0 15)) inline$$Test_create$0$$tmp@3))) (= (ControlFlow 0 14451) 14441)))) inline$$CopyOrMoveValue$5$Entry_correct))))
+(let ((inline$$Test_create$0$anon35_Then_correct true))
+(let ((inline$$Vector_length$0$anon0_correct  (=> (and (is-Vector inline$$Vector_length$0$v@0) (= inline$$Vector_length$0$l@1 (Integer (|l#ValueArray| (|v#Vector| inline$$Vector_length$0$v@0))))) (and (=> (= (ControlFlow 0 14330) 25120) inline$$Test_create$0$anon35_Then_correct) (=> (= (ControlFlow 0 14330) 14451) inline$$Test_create$0$anon35_Else_correct)))))
+(let ((inline$$Vector_length$0$Entry_correct  (=> (= inline$$Vector_length$0$ta@0 IntegerType) (=> (and (= inline$$Vector_length$0$v@0 (|Select_[Location]Value| (|contents#Memory| $m@10) (Local (+ 0 12)))) (= (ControlFlow 0 14318) 14330)) inline$$Vector_length$0$anon0_correct))))
+(let ((inline$$Test_create$0$anon34_Else$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$4$local@0) (let ((va@@45 (|v#Vector| inline$$CopyOrMoveValue$4$local@0)))
+(let ((l@@45 (|l#ValueArray| va@@45)))
+ (and (<= 0 l@@45) (forall ((x@@45 Int) ) (!  (=> (or (< x@@45 0) (>= x@@45 l@@45)) (= (|Select_[$int]Value| (|v#ValueArray| va@@45) x@@45) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@45) x@@45))
+)))))) (forall (($$0@@20 Int) ) (!  (=> (and (>= $$0@@20 0) (< $$0@@20 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$4$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$4$local@0)) $$0@@20)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$4$local@0)) $$0@@20)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$4$local@0)) $$0@@20)) MAX_U8)))
+ :qid |outputbp.1542:52|
+ :skolemid |35|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$4$local@0)) $$0@@20))
+))) (and (= $m@10 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@9) (Local (+ 0 12)) true) (|Store_[Location]Value| (|contents#Memory| $m@9) (Local (+ 0 12)) inline$$CopyOrMoveValue$4$local@0))) (= (ControlFlow 0 14336) 14318))) inline$$Vector_length$0$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$4$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$4$local@0 (|Select_[Location]Value| (|contents#Memory| $m@9) (Local (+ 0 2)))) (= (ControlFlow 0 14204) 14336)) inline$$Test_create$0$anon34_Else$1_correct)))
+(let ((inline$$Test_create$0$anon34_Else_correct  (=> (and (not false) (= (ControlFlow 0 14214) 14204)) inline$$CopyOrMoveValue$4$Entry_correct)))
+(let ((inline$$Test_create$0$anon34_Then_correct true))
+(let ((inline$$WriteRef$0$anon0_correct  (=> (and (and (= inline$$WriteRef$0$l@1 (|l#Reference| inline$$BorrowLoc$0$dst@1)) (= inline$$WriteRef$0$v@1 (|Select_[Location]Value| (|contents#Memory| $m@8) inline$$WriteRef$0$l@1))) (and (= inline$$WriteRef$0$v@2 ($UpdateValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) inline$$WriteRef$0$v@1 inline$$WriteRef$0$new_v@0)) (= $m@9 (Memory (|domain#Memory| $m@8) (|Store_[Location]Value| (|contents#Memory| $m@8) inline$$WriteRef$0$l@1 inline$$WriteRef$0$v@2))))) (and (=> (= (ControlFlow 0 14157) 25130) inline$$Test_create$0$anon34_Then_correct) (=> (= (ControlFlow 0 14157) 14214) inline$$Test_create$0$anon34_Else_correct)))))
+(let ((inline$$WriteRef$0$Entry_correct  (=> (and (= inline$$WriteRef$0$new_v@0 (Vector (let ((l2@@1 (|l#ValueArray| (|v#Vector| inline$$Vector_append$0$other@0))))
+(let ((l1@@1 (|l#ValueArray| (|v#Vector| inline$$Vector_append$0$v@1))))
+(ValueArray (|lambda#2| 0 (+ l1@@1 l2@@1) l1@@1 (|v#ValueArray| (|v#Vector| inline$$Vector_append$0$v@1)) (|v#ValueArray| (|v#Vector| inline$$Vector_append$0$other@0)) l1@@1 DefaultValue) (+ l1@@1 l2@@1)))))) (= (ControlFlow 0 14117) 14157)) inline$$WriteRef$0$anon0_correct)))
+(let ((inline$$Vector_append$0$anon0_correct  (=> (and (and (= inline$$Vector_append$0$v@1 ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@8) (|l#Reference| inline$$BorrowLoc$0$dst@1)))) (is-Vector inline$$Vector_append$0$v@1)) (and (is-Vector inline$$Vector_append$0$other@0) (= (ControlFlow 0 14161) 14117))) inline$$WriteRef$0$Entry_correct)))
+(let ((inline$$Vector_append$0$Entry_correct  (=> (= inline$$Vector_append$0$ta@0 IntegerType) (=> (and (= inline$$Vector_append$0$other@0 (|Select_[Location]Value| (|contents#Memory| $m@8) (Local (+ 0 11)))) (= (ControlFlow 0 14027) 14161)) inline$$Vector_append$0$anon0_correct))))
+(let ((inline$$Test_create$0$anon33_Else_correct  (=> (not false) (=> (and (and (and (is-Vector call2formal@res@0@@3) (let ((va@@46 (|v#Vector| call2formal@res@0@@3)))
+(let ((l@@46 (|l#ValueArray| va@@46)))
+ (and (<= 0 l@@46) (forall ((x@@46 Int) ) (!  (=> (or (< x@@46 0) (>= x@@46 l@@46)) (= (|Select_[$int]Value| (|v#ValueArray| va@@46) x@@46) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@46) x@@46))
+)))))) (forall (($$0@@21 Int) ) (!  (=> (and (>= $$0@@21 0) (< $$0@@21 (|l#ValueArray| (|v#Vector| call2formal@res@0@@3)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) $$0@@21)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) $$0@@21)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) $$0@@21)) MAX_U8)))
+ :qid |outputbp.1528:52|
+ :skolemid |34|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) $$0@@21))
+))) (and (= $m@8 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@7) (Local (+ 0 11)) true) (|Store_[Location]Value| (|contents#Memory| $m@7) (Local (+ 0 11)) call2formal@res@0@@3))) (= (ControlFlow 0 14167) 14027))) inline$$Vector_append$0$Entry_correct))))
+(let ((inline$$Test_create$0$anon33_Then_correct true))
+(let ((inline$$Test_create$0$anon8$2_correct  (=> (is-Address inline$$CopyOrMoveValue$3$local@0) (=> (and (and (= $m@7 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@6) (Local (+ 0 10)) true) (|Store_[Location]Value| (|contents#Memory| $m@6) (Local (+ 0 10)) inline$$CopyOrMoveValue$3$local@0))) (= call0formal@ta@0@@3 AddressType)) (and (= call1formal@v@0@@3 (|Select_[Location]Value| (|contents#Memory| $m@7) (Local (+ 0 10)))) (= call2formal@res@0@@3 ($BCS_serialize_core call1formal@v@0@@3)))) (=> (and (and (and (is-Vector call2formal@res@0@@3) (let ((va@@47 (|v#Vector| call2formal@res@0@@3)))
+(let ((l@@47 (|l#ValueArray| va@@47)))
+ (and (<= 0 l@@47) (forall ((x@@47 Int) ) (!  (=> (or (< x@@47 0) (>= x@@47 l@@47)) (= (|Select_[$int]Value| (|v#ValueArray| va@@47) x@@47) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@47) x@@47))
+)))))) (forall ((i@@10 Int) ) (!  (=> (and (<= 0 i@@10) (< i@@10 (|l#ValueArray| (|v#Vector| call2formal@res@0@@3)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) i@@10)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) i@@10)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) i@@10)) MAX_U8)))
+ :qid |outputbp.131:14|
+ :skolemid |2|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| call2formal@res@0@@3)) i@@10))
+))) (> (|l#ValueArray| (|v#Vector| call2formal@res@0@@3)) 0)) (and (=> (= (ControlFlow 0 13897) 25140) inline$$Test_create$0$anon33_Then_correct) (=> (= (ControlFlow 0 13897) 14167) inline$$Test_create$0$anon33_Else_correct)))))))
+(let ((inline$$CopyOrMoveValue$3$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$3$local@0 (|Select_[Location]Value| (|contents#Memory| $m@6) (Local (+ 0 0)))) (= (ControlFlow 0 13869) 13897)) inline$$Test_create$0$anon8$2_correct)))
+(let ((inline$$Test_create$0$anon8$1_correct  (=> (and (and (and (is-Vector ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1)))) (let ((va@@48 (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))))
+(let ((l@@48 (|l#ValueArray| va@@48)))
+ (and (<= 0 l@@48) (forall ((x@@48 Int) ) (!  (=> (or (< x@@48 0) (>= x@@48 l@@48)) (= (|Select_[$int]Value| (|v#ValueArray| va@@48) x@@48) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@48) x@@48))
+)))))) (forall (($$1@@1 Int) ) (!  (=> (and (>= $$1@@1 0) (< $$1@@1 (|l#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))) $$1@@1)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))) $$1@@1)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))) $$1@@1)) MAX_U8)))
+ :qid |outputbp.1515:69|
+ :skolemid |33|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| ($ReadValue_stratified (|p#Reference| inline$$BorrowLoc$0$dst@1) (|Select_[Location]Value| (|contents#Memory| $m@6) (|l#Reference| inline$$BorrowLoc$0$dst@1))))) $$1@@1))
+))) (= (ControlFlow 0 13879) 13869)) inline$$CopyOrMoveValue$3$Entry_correct)))
+(let ((inline$$BorrowLoc$0$anon0_correct  (=> (and (= inline$$BorrowLoc$0$dst@1 (Reference (Local inline$$BorrowLoc$0$l@0) EmptyPath)) (= (ControlFlow 0 13770) 13879)) inline$$Test_create$0$anon8$1_correct)))
+(let ((inline$$BorrowLoc$0$Entry_correct  (=> (and (= inline$$BorrowLoc$0$l@0 (+ 0 2)) (= (ControlFlow 0 13760) 13770)) inline$$BorrowLoc$0$anon0_correct)))
+(let ((inline$$Test_create$0$anon32_Else_correct  (=> (and (not true) (= (ControlFlow 0 13727) 13760)) inline$$BorrowLoc$0$Entry_correct)))
+(let ((inline$$Test_create$0$anon32_Then_correct  (=> (and ($DebugTrackLocal 3 2022 2 inline$$CopyOrMoveValue$2$local@0) (= (ControlFlow 0 25154) 13760)) inline$$BorrowLoc$0$Entry_correct)))
+(let ((inline$$Test_create$0$anon6$2_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$2$local@0) (let ((va@@49 (|v#Vector| inline$$CopyOrMoveValue$2$local@0)))
+(let ((l@@49 (|l#ValueArray| va@@49)))
+ (and (<= 0 l@@49) (forall ((x@@49 Int) ) (!  (=> (or (< x@@49 0) (>= x@@49 l@@49)) (= (|Select_[$int]Value| (|v#ValueArray| va@@49) x@@49) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@49) x@@49))
+)))))) (forall (($$0@@22 Int) ) (!  (=> (and (>= $$0@@22 0) (< $$0@@22 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$2$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$2$local@0)) $$0@@22)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$2$local@0)) $$0@@22)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$2$local@0)) $$0@@22)) MAX_U8)))
+ :qid |outputbp.1509:52|
+ :skolemid |32|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$2$local@0)) $$0@@22))
+))) (= $m@6 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@5) (Local (+ 0 2)) true) (|Store_[Location]Value| (|contents#Memory| $m@5) (Local (+ 0 2)) inline$$CopyOrMoveValue$2$local@0)))) (and (=> (= (ControlFlow 0 13721) 25154) inline$$Test_create$0$anon32_Then_correct) (=> (= (ControlFlow 0 13721) 13727) inline$$Test_create$0$anon32_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$2$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$2$local@0 (|Select_[Location]Value| (|contents#Memory| $m@5) (Local (+ 0 8)))) (= (ControlFlow 0 13651) 13721)) inline$$Test_create$0$anon6$2_correct)))
+(let ((inline$$Test_create$0$anon6$1_correct  (=> (and (and (and (is-Vector inline$$CopyOrMoveValue$1$local@0) (let ((va@@50 (|v#Vector| inline$$CopyOrMoveValue$1$local@0)))
+(let ((l@@50 (|l#ValueArray| va@@50)))
+ (and (<= 0 l@@50) (forall ((x@@50 Int) ) (!  (=> (or (< x@@50 0) (>= x@@50 l@@50)) (= (|Select_[$int]Value| (|v#ValueArray| va@@50) x@@50) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@50) x@@50))
+)))))) (forall (($$0@@23 Int) ) (!  (=> (and (>= $$0@@23 0) (< $$0@@23 (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$1$local@0)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$1$local@0)) $$0@@23)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$1$local@0)) $$0@@23)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$1$local@0)) $$0@@23)) MAX_U8)))
+ :qid |outputbp.1504:52|
+ :skolemid |31|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$1$local@0)) $$0@@23))
+))) (and (= $m@5 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@4) (Local (+ 0 8)) true) (|Store_[Location]Value| (|contents#Memory| $m@4) (Local (+ 0 8)) inline$$CopyOrMoveValue$1$local@0))) (= (ControlFlow 0 13661) 13651))) inline$$CopyOrMoveValue$2$Entry_correct)))
+(let ((inline$$CopyOrMoveValue$1$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$1$local@0 (|Select_[Location]Value| (|contents#Memory| $m@4) (Local (+ 0 1)))) (= (ControlFlow 0 13552) 13661)) inline$$Test_create$0$anon6$1_correct)))
+(let ((inline$$Test_create$0$anon31_Else_correct  (=> (and (not true) (= (ControlFlow 0 13521) 13552)) inline$$CopyOrMoveValue$1$Entry_correct)))
+(let ((inline$$Test_create$0$anon31_Then_correct  (=> (and ($DebugTrackLocal 3 1964 3 inline$$CopyOrMoveValue$0$local@0) (= (ControlFlow 0 25168) 13552)) inline$$CopyOrMoveValue$1$Entry_correct)))
+(let ((inline$$Test_create$0$anon4$2_correct  (=> (and (and (and (and (is-Vector inline$$CopyOrMoveValue$0$local@0) (let ((va@@51 (|v#Vector| inline$$CopyOrMoveValue$0$local@0)))
+(let ((l@@51 (|l#ValueArray| va@@51)))
+ (and (<= 0 l@@51) (forall ((x@@51 Int) ) (!  (=> (or (< x@@51 0) (>= x@@51 l@@51)) (= (|Select_[$int]Value| (|v#ValueArray| va@@51) x@@51) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@51) x@@51))
+)))))) (= (|l#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$0$local@0)) 1)) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$0$local@0)) $Test_EventHandleGenerator_counter)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$0$local@0)) $Test_EventHandleGenerator_counter)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| inline$$CopyOrMoveValue$0$local@0)) $Test_EventHandleGenerator_counter)) MAX_U64))) (= $m@4 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@3) (Local (+ 0 3)) true) (|Store_[Location]Value| (|contents#Memory| $m@3) (Local (+ 0 3)) inline$$CopyOrMoveValue$0$local@0)))) (and (=> (= (ControlFlow 0 13515) 25168) inline$$Test_create$0$anon31_Then_correct) (=> (= (ControlFlow 0 13515) 13521) inline$$Test_create$0$anon31_Else_correct)))))
+(let ((inline$$CopyOrMoveValue$0$Entry_correct  (=> (and (= inline$$CopyOrMoveValue$0$local@0 (|Select_[Location]Value| (|contents#Memory| $m@3) (Local (+ 0 7)))) (= (ControlFlow 0 13487) 13515)) inline$$Test_create$0$anon4$2_correct)))
+(let ((inline$$Test_create$0$anon4$1_correct  (=> (and (= $m@3 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@2) (Local (+ 0 7)) true) (|Store_[Location]Value| (|contents#Memory| $m@2) (Local (+ 0 7)) inline$$Test_EventHandleGenerator_pack$0$$struct@1))) (= (ControlFlow 0 13497) 13487)) inline$$CopyOrMoveValue$0$Entry_correct)))
+(let ((inline$$Test_EventHandleGenerator_pack$0$anon2_Else_correct  (=> (and (>= 0 0) (= (ControlFlow 0 13420) 13497)) inline$$Test_create$0$anon4$1_correct)))
+(let ((inline$$Test_EventHandleGenerator_pack$0$anon2_Then_correct  (=> (> 0 0) (=> (and ($DebugTrackLocal 0 0 0 inline$$Test_EventHandleGenerator_pack$0$$struct@1) (= (ControlFlow 0 13438) 13497)) inline$$Test_create$0$anon4$1_correct))))
+(let ((inline$$Test_EventHandleGenerator_pack$0$anon0_correct  (=> (and (and (and (is-Integer inline$$Test_EventHandleGenerator_pack$0$counter@0) (>= (|i#Integer| inline$$Test_EventHandleGenerator_pack$0$counter@0) 0)) (<= (|i#Integer| inline$$Test_EventHandleGenerator_pack$0$counter@0) MAX_U64)) (= inline$$Test_EventHandleGenerator_pack$0$$struct@1 (Vector (ValueArray (|Store_[$int]Value| (MapConstValue DefaultValue) 0 inline$$Test_EventHandleGenerator_pack$0$counter@0) 1)))) (and (=> (= (ControlFlow 0 13412) 13438) inline$$Test_EventHandleGenerator_pack$0$anon2_Then_correct) (=> (= (ControlFlow 0 13412) 13420) inline$$Test_EventHandleGenerator_pack$0$anon2_Else_correct)))))
+(let ((inline$$Test_EventHandleGenerator_pack$0$Entry_correct  (=> (and (= inline$$Test_EventHandleGenerator_pack$0$counter@0 (|Select_[Location]Value| (|contents#Memory| $m@2) (Local (+ 0 6)))) (= (ControlFlow 0 13390) 13412)) inline$$Test_EventHandleGenerator_pack$0$anon0_correct)))
+(let ((inline$$Test_create$0$anon4_correct  (=> (and (and (= $local_counter@0 (+ 0 26)) (= inline$$Test_create$0$$tmp@1 (Integer 0))) (and (= $m@2 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@1) (Local (+ 0 6)) true) (|Store_[Location]Value| (|contents#Memory| $m@1) (Local (+ 0 6)) inline$$Test_create$0$$tmp@1))) (= (ControlFlow 0 13444) 13390))) inline$$Test_EventHandleGenerator_pack$0$Entry_correct)))
+(let ((inline$$Test_create$0$anon30_Else_correct  (=> (and (not true) (= (ControlFlow 0 13275) 13444)) inline$$Test_create$0$anon4_correct)))
+(let ((inline$$Test_create$0$anon30_Then_correct  (=> (and ($DebugTrackLocal 3 1866 1 auth_key_prefix) (= (ControlFlow 0 25182) 13444)) inline$$Test_create$0$anon4_correct)))
+(let ((inline$$Test_create$0$anon2_correct  (=> (and (and (and (is-Vector auth_key_prefix) (let ((va@@52 (|v#Vector| auth_key_prefix)))
+(let ((l@@52 (|l#ValueArray| va@@52)))
+ (and (<= 0 l@@52) (forall ((x@@52 Int) ) (!  (=> (or (< x@@52 0) (>= x@@52 l@@52)) (= (|Select_[$int]Value| (|v#ValueArray| va@@52) x@@52) DefaultValue))
+ :qid |outputbp.826:21|
+ :skolemid |17|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| va@@52) x@@52))
+)))))) (forall (($$0@@24 Int) ) (!  (=> (and (>= $$0@@24 0) (< $$0@@24 (|l#ValueArray| (|v#Vector| auth_key_prefix)))) (and (and (is-Integer (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| auth_key_prefix)) $$0@@24)) (>= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| auth_key_prefix)) $$0@@24)) 0)) (<= (|i#Integer| (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| auth_key_prefix)) $$0@@24)) MAX_U8)))
+ :qid |outputbp.1480:63|
+ :skolemid |30|
+ :pattern ( (|Select_[$int]Value| (|v#ValueArray| (|v#Vector| auth_key_prefix)) $$0@@24))
+))) (= $m@1 (Memory (|Store_[Location]$bool| (|domain#Memory| $m@0) (Local (+ 0 1)) true) (|Store_[Location]Value| (|contents#Memory| $m@0) (Local (+ 0 1)) auth_key_prefix)))) (and (=> (= (ControlFlow 0 13269) 25182) inline$$Test_create$0$anon30_Then_correct) (=> (= (ControlFlow 0 13269) 13275) inline$$Test_create$0$anon30_Else_correct)))))
+(let ((inline$$Test_create$0$anon29_Else_correct  (=> (and (not true) (= (ControlFlow 0 13209) 13269)) inline$$Test_create$0$anon2_correct)))
+(let ((inline$$Test_create$0$anon29_Then_correct  (=> (and ($DebugTrackLocal 3 1866 0 fresh_address) (= (ControlFlow 0 25196) 13269)) inline$$Test_create$0$anon2_correct)))
+(let ((inline$$Test_create$0$anon0_correct  (and (=> (= (ControlFlow 0 13203) (- 0 28901)) (not false)) (=> (not false) (=> (and (is-Address fresh_address) (= $m@0 (Memory (|Store_[Location]$bool| (|domain#Memory| $m) (Local (+ 0 0)) true) (|Store_[Location]Value| (|contents#Memory| $m) (Local (+ 0 0)) fresh_address)))) (and (=> (= (ControlFlow 0 13203) 25196) inline$$Test_create$0$anon29_Then_correct) (=> (= (ControlFlow 0 13203) 13209) inline$$Test_create$0$anon29_Else_correct)))))))
+(let ((inline$$Test_create$0$Entry_correct  (and (=> (= (ControlFlow 0 13177) (- 0 28855)) (|Select_[Location]$bool| (|domain#Memory| $m) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn)))) (=> (|Select_[Location]$bool| (|domain#Memory| $m) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (=> (= (ControlFlow 0 13177) 13203) inline$$Test_create$0$anon0_correct)))))
+(let ((anon0$1_correct  (=> (and (|Select_[Location]$bool| (|domain#Memory| $m) (Global $DiemAccount_T_type_value (|sender#Transaction| $txn))) (= (ControlFlow 0 25442) 13177)) inline$$Test_create$0$Entry_correct)))
+(let ((anon0_correct  (=> (= (ControlFlow 0 27784) 25442) anon0$1_correct)))
+anon0_correct)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+))
+(check-sat)
diff --git a/vendors/move/crates/move-prover/tests/testsuite.rs b/vendors/move/crates/move-prover/tests/testsuite.rs
new file mode 100644
index 000000000..aee5592f9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/testsuite.rs
@@ -0,0 +1,303 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    path::{Path, PathBuf},
+    sync::atomic::{AtomicBool, Ordering},
+};
+
+use anyhow::anyhow;
+use codespan_reporting::term::termcolor::Buffer;
+use datatest_stable::Requirements;
+use itertools::Itertools;
+use log::{info, warn};
+use once_cell::sync::OnceCell;
+use tempfile::TempDir;
+use walkdir::WalkDir;
+
+use move_command_line_common::{env::read_env_var, testing::EXP_EXT};
+use move_prover::{cli::Options, run_move_prover};
+use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
+
+const ENV_FLAGS: &str = "MVP_TEST_FLAGS";
+const ENV_TEST_EXTENDED: &str = "MVP_TEST_X";
+const ENV_TEST_FEATURE: &str = "MVP_TEST_FEATURE";
+const ENV_TEST_ON_CI: &str = "MVP_TEST_ON_CI";
+
+static NOT_CONFIGURED_WARNED: AtomicBool = AtomicBool::new(false);
+
+/// A struct to describe a feature to test.
+struct Feature {
+    /// Name of this feature.
+    name: &'static str,
+    /// Flags specific to this feature.
+    flags: &'static [&'static str],
+    /// Inclusion mode.
+    inclusion_mode: InclusionMode,
+    /// True if the tests should only be run if requested by MVP_TEST_FEATURE
+    only_if_requested: bool,
+    /// Whether this feature will be tested in CI.
+    enable_in_ci: bool,
+    /// Whether this feature has as a separate baseline file.
+    separate_baseline: bool,
+    /// A static function pointer to the runner to be used for datatest. Since datatest
+    /// does not support function values and closures, we need to have a different runner for
+    /// each feature
+    runner: fn(&Path) -> datatest_stable::Result<()>,
+    /// A predicate to be called on the path determining whether the feature is enabled.
+    /// The first name is the name of the test group, the second the path to the test
+    /// source.
+    enabling_condition: fn(&str, &str) -> bool,
+}
+
+/// An inclusion mode. A feature may be run in one of these modes.
+#[derive(Clone, Copy)]
+enum InclusionMode {
+    /// Only a test which has the comment `// also_include_for: <feature>` will be included.
+    #[allow(dead_code)]
+    Explicit,
+    /// Every test will be included unless it has the comment `// exclude_for: <feature>`.
+    Implicit,
+}
+
+fn get_features() -> &'static [Feature] {
+    static TESTED_FEATURES: OnceCell<Vec<Feature>> = OnceCell::new();
+    TESTED_FEATURES.get_or_init(|| {
+        vec![
+            // Tests the default configuration.
+            Feature {
+                name: "default",
+                flags: &[],
+                inclusion_mode: InclusionMode::Implicit,
+                enable_in_ci: true,
+                only_if_requested: false,
+                separate_baseline: false,
+                runner: |p| test_runner_for_feature(p, get_feature_by_name("default")),
+                enabling_condition: |_, _| true,
+            },
+            // Tests with cvc5 as a backend for boogie.
+            Feature {
+                name: "cvc5",
+                flags: &["--use-cvc5"],
+                inclusion_mode: InclusionMode::Implicit,
+                enable_in_ci: false, // Do not enable in CI until we have more data about stability
+                only_if_requested: false,
+                separate_baseline: false,
+                runner: |p| test_runner_for_feature(p, get_feature_by_name("cvc5")),
+                enabling_condition: |group, _| group == "unit",
+            },
+        ]
+    })
+}
+
+fn get_feature_by_name(name: &str) -> &'static Feature {
+    for feature in get_features() {
+        if feature.name == name {
+            return feature;
+        }
+    }
+    panic!("feature not found")
+}
+
+/// Test runner for a given feature.
+fn test_runner_for_feature(path: &Path, feature: &Feature) -> datatest_stable::Result<()> {
+    // Use the below + `cargo test -- --test-threads=1` to identify a long running test
+    // println!(">>> testing {}", path.to_string_lossy().to_string());
+
+    info!(
+        "testing {} with feature `{}` (flags = `{}`)",
+        path.display(),
+        feature.name,
+        feature.flags.iter().map(|s| s.to_string()).join(" ")
+    );
+
+    let temp_dir = TempDir::new()?;
+    std::fs::create_dir_all(temp_dir.path())?;
+    let (mut args, baseline_path) = get_flags_and_baseline(temp_dir.path(), path, feature)?;
+
+    args.insert(0, "mvp_test".to_owned());
+    args.push("--verbose=warn".to_owned());
+    // TODO: timeouts aren't handled correctly by the boogie wrapper but lead to hang. Determine
+    //   reasons and reactivate.
+    // args.push("--num-instances=2".to_owned()); // run two Boogie instances with different seeds
+    // args.push("--sequential".to_owned());
+
+    // Move source.
+    args.push(path.to_string_lossy().to_string());
+
+    let mut options = Options::create_from_args(&args)?;
+    options.setup_logging_for_test();
+    let no_tools = read_env_var("BOOGIE_EXE").is_empty()
+        || !options.backend.use_cvc5 && read_env_var("Z3_EXE").is_empty()
+        || options.backend.use_cvc5 && read_env_var("CVC5_EXE").is_empty();
+    let baseline_valid =
+        !no_tools || !extract_test_directives(path, "// no-boogie-test")?.is_empty();
+
+    if no_tools {
+        options.prover.generate_only = true;
+        if NOT_CONFIGURED_WARNED
+            .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
+            .is_ok()
+        {
+            warn!(
+                "Prover tools are not configured, verification tests will be skipped. \
+        See https://github.com/move-language/move/tree/main/language/move-prover/doc/user/install.md \
+        for instructions."
+            );
+        }
+    }
+    options.backend.check_tool_versions()?;
+    options.prover.stable_test_output = true;
+    options.backend.stable_test_output = true;
+
+    let mut error_writer = Buffer::no_color();
+    let mut diags = match run_move_prover(&mut error_writer, options) {
+        Ok(()) => "".to_string(),
+        Err(err) => format!("Move prover returns: {}\n", err),
+    };
+    if baseline_valid {
+        diags += &String::from_utf8_lossy(&error_writer.into_inner());
+        if let Some(ref path) = baseline_path {
+            verify_or_update_baseline(path.as_path(), &diags)?
+        } else if !diags.is_empty() {
+            return Err(anyhow!("Unexpected prover output (expected none): {}", diags).into());
+        }
+    }
+
+    Ok(())
+}
+
+/// Returns flags and baseline file for this test run
+fn get_flags_and_baseline(
+    temp_dir: &Path,
+    path: &Path,
+    feature: &Feature,
+) -> anyhow::Result<(Vec<String>, Option<PathBuf>)> {
+    // Determine the way how to configure tests based on directory of the path.
+    let path_str = path.to_string_lossy();
+
+    let dep_flags = vec![
+        // stdlib is commonly required
+        "--dependency=../move-stdlib/sources",
+        "--dependency=../move-stdlib/nursery/sources",
+        // table extension is required
+        // "--dependency=../extensions/move-table-extension/sources",
+    ];
+
+    let (base_flags, baseline_path) =
+        if path_str.contains("diem-framework/") || path_str.contains("move-stdlib/") {
+            (dep_flags, None)
+        } else {
+            let feature_name = feature.name.to_string();
+            let separate_baseline = feature.separate_baseline
+                || extract_test_directives(path, "// separate_baseline: ")?.contains(&feature_name);
+            (
+                dep_flags,
+                Some(path.with_extension(if separate_baseline {
+                    format!("{}_exp", feature.name)
+                } else {
+                    EXP_EXT.to_string()
+                })),
+            )
+        };
+    let mut flags = base_flags.iter().map(|s| (*s).to_string()).collect_vec();
+
+    // Add flag assigning an address to the stdlib.
+    flags.push("--named-addresses=std=0x1".to_string());
+
+    // Add flag assigning an address to stdlib extensions.
+    flags.push("--named-addresses=extensions=0x2".to_string());
+
+    // Add flags specific to the feature.
+    flags.extend(feature.flags.iter().map(|f| f.to_string()));
+
+    // Add flags specified in the source.
+    flags.extend(extract_test_directives(path, "// flag:")?);
+
+    // Add flags specified via environment variable.
+    flags.extend(shell_words::split(&read_env_var(ENV_FLAGS))?);
+
+    // Create a temporary file for output. We inject the modifier to potentially prevent
+    // any races between similar named files in different directories, as it appears TempPath
+    // isn't working always.
+    let base_name = format!("{}.bpl", path.file_stem().unwrap().to_str().unwrap());
+    let output = temp_dir.join(base_name).to_str().unwrap().to_string();
+    flags.push(format!("--output={}", output));
+    Ok((flags, baseline_path))
+}
+
+/// Collects the enabled tests, accumulating them as datatest requirements.
+/// We collect the test data sources ourselves instead of letting datatest
+/// do it because we want to select them based on enabled feature as indicated
+/// in the source. We still use datatest to finally run the tests to utilize its
+/// execution engine.
+fn collect_enabled_tests(reqs: &mut Vec<Requirements>, group: &str, feature: &Feature, path: &str) {
+    let mut p = PathBuf::new();
+    p.push(path);
+    for entry in WalkDir::new(p.clone())
+        .follow_links(false)
+        .min_depth(1)
+        .into_iter()
+        .flatten()
+    {
+        if !entry.file_name().to_string_lossy().ends_with(".move") {
+            continue;
+        }
+
+        let path = entry.path();
+        let mut included = match feature.inclusion_mode {
+            InclusionMode::Implicit => !extract_test_directives(path, "// exclude_for: ")
+                .unwrap_or_default()
+                .iter()
+                .any(|s| s.as_str() == feature.name),
+            InclusionMode::Explicit => extract_test_directives(path, "// also_include_for: ")
+                .unwrap_or_default()
+                .iter()
+                .any(|s| s.as_str() == feature.name),
+        };
+        if included && read_env_var(ENV_TEST_ON_CI) == "1" {
+            included = feature.enable_in_ci
+                && extract_test_directives(path, "// no_ci:")
+                    .unwrap_or_default()
+                    .is_empty();
+        }
+        let root_str = p.to_string_lossy().to_string();
+        let path_str = path.to_string_lossy().to_string();
+        if included {
+            included = (feature.enabling_condition)(group, &path_str);
+        }
+        if included {
+            reqs.push(Requirements::new(
+                feature.runner,
+                format!("prover {}[{}]", group, feature.name),
+                root_str,
+                path_str,
+            ));
+        }
+    }
+}
+
+// Test entry point based on datatest runner.
+fn main() {
+    let mut reqs = vec![];
+    for feature in get_features() {
+        // Evaluate whether the user narrowed which feature to test.
+        let feature_narrow = read_env_var(ENV_TEST_FEATURE);
+        if !feature_narrow.is_empty() && feature.name != feature_narrow {
+            continue;
+        }
+        if feature_narrow.is_empty() && feature.only_if_requested {
+            continue;
+        }
+        // Check whether we are running extended tests
+        if read_env_var(ENV_TEST_EXTENDED) == "1" {
+            collect_enabled_tests(&mut reqs, "extended", feature, "tests/xsources");
+        } else {
+            collect_enabled_tests(&mut reqs, "unit", feature, "tests/sources");
+        }
+    }
+    // TODO don't clear vec once prover tests work again
+    reqs.clear();
+    datatest_stable::runner(&reqs);
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/README.md b/vendors/move/crates/move-prover/tests/xsources/design/README.md
new file mode 100644
index 000000000..c9f692d6a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/README.md
@@ -0,0 +1,11 @@
+A set of examples for illustrating how the bytecode transformation pipeline works.
+
+This directory contains the bytecode dump of each of the Move
+examples. You can run an individual example as in:
+
+```
+mvp -k --v2 --dump-bytecode <example>.move
+```
+
+The `-k` option will also let the Move prover leave the generated Boogie output
+in `output.bpl`.
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies.move b/vendors/move/crates/move-prover/tests/xsources/design/modifies.move
new file mode 100644
index 000000000..2b106839f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies.move
@@ -0,0 +1,32 @@
+// flag: --v2
+address 0x0 {
+/// Example for opaque function calls with `modifies` clause.
+module Trafo {
+
+  resource struct R { x: u64 }
+
+  public fun opaque_decr(addr: address) acquires R {
+      let r = borrow_global_mut<R>(addr);
+      r.x = r.x - 1;
+  }
+  spec fun opaque_decr {
+      pragma opaque;
+      modifies global<R>(addr);
+      aborts_if !exists<R>(addr);
+      aborts_if global<R>(addr).x == 0;
+      ensures exists<R>(addr);
+      ensures global<R>(addr).x == old(global<R>(addr).x) - 1;
+  }
+
+  public fun opaque_caller(addr: address) acquires R {
+      opaque_decr(addr);
+      opaque_decr(addr);
+  }
+  spec fun opaque_caller {
+      modifies global<R>(addr);
+      aborts_if !exists<R>(addr);
+      aborts_if global<R>(addr).x < 2;
+      ensures global<R>(addr).x == old(global<R>(addr).x) - 2;
+  }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_0_stackless.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_0_stackless.bytecode
new file mode 100644
index 000000000..469af0d5b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_0_stackless.bytecode
@@ -0,0 +1,39 @@
+============ after processor `stackless` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: address
+     var $t2: address
+  0: $t1 := copy($t0)
+  1: Trafo::opaque_decr($t1)
+  2: $t2 := copy($t0)
+  3: Trafo::opaque_decr($t2)
+  4: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: address
+     var $t3: &mut Trafo::R
+     var $t4: &mut Trafo::R
+     var $t5: &u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Trafo::R
+     var $t10: &mut u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_global<Trafo::R>($t2)
+  2: $t1 := $t3
+  3: $t4 := copy($t1)
+  4: $t5 := borrow_field<Trafo::R>.x($t4)
+  5: $t6 := read_ref($t5)
+  6: $t7 := 1
+  7: $t8 := -($t6, $t7)
+  8: $t9 := move($t1)
+  9: $t10 := borrow_field<Trafo::R>.x($t9)
+ 10: write_ref($t10, $t8)
+ 11: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_10_verification_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_10_verification_analysis.bytecode
new file mode 100644
index 000000000..2c1a7cfba
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_10_verification_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `verification_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+  0: trace_local[addr]($t0)
+  1: Trafo::opaque_decr($t0)
+  2: Trafo::opaque_decr($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+  2: trace_local[r]($t2)
+  3: $t3 := get_field<Trafo::R>.x($t2)
+  4: $t4 := 1
+  5: $t5 := -($t3, $t4)
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+  7: write_ref($t6, $t5)
+  8: write_back[Reference($t2)]($t6)
+  9: write_back[Trafo::R]($t2)
+ 10: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_11_loop_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_11_loop_analysis.bytecode
new file mode 100644
index 000000000..70573f1a9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_11_loop_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `loop_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+  0: trace_local[addr]($t0)
+  1: Trafo::opaque_decr($t0)
+  2: Trafo::opaque_decr($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+  2: trace_local[r]($t2)
+  3: $t3 := get_field<Trafo::R>.x($t2)
+  4: $t4 := 1
+  5: $t5 := -($t3, $t4)
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+  7: write_ref($t6, $t5)
+  8: write_back[Reference($t2)]($t6)
+  9: write_back[Trafo::R]($t2)
+ 10: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_12_spec_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_12_spec_instrumenter.bytecode
new file mode 100644
index 000000000..53528c0b3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_12_spec_instrumenter.bytecode
@@ -0,0 +1,97 @@
+============ after processor `spec_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: bool
+     var $t2: num
+     var $t3: bool
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @1 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # >> opaque call: Trafo::opaque_decr($t0)
+  4: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:22:7+17
+  5: assert CanModify<Trafo::R>($t0)
+  6: assume Eq($t1, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+  7: if ($t1) goto 8 else goto 11
+  8: label L4
+  9: trace_abort($t2)
+ 10: goto 35
+ 11: label L3
+ 12: @2 := save_mem(Trafo::R)
+ 13: modifies global<Trafo::R>($t0)
+ 14: assume exists<Trafo::R>($t0)
+ 15: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@2]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 16: nop
+     # >> opaque call: Trafo::opaque_decr($t0)
+ 17: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:23:7+17
+ 18: assert CanModify<Trafo::R>($t0)
+ 19: assume Eq($t3, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+ 20: if ($t3) goto 21 else goto 24
+ 21: label L6
+ 22: trace_abort($t2)
+ 23: goto 35
+ 24: label L5
+ 25: @3 := save_mem(Trafo::R)
+ 26: modifies global<Trafo::R>($t0)
+ 27: assume exists<Trafo::R>($t0)
+ 28: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@3]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 29: nop
+ 30: label L1
+     # VC: function does not abort under this condition at modifies.move:27:7+27
+ 31: assert Not(Not(exists[@1]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:28:7+32
+ 32: assert Not(Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+     # VC: post-condition does not hold at modifies.move:29:7+56
+ 33: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 34: return ()
+ 35: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:25:3+196
+ 36: assert Or(Not(exists[@1]<Trafo::R>($t0)), Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 37: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: num
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut u64
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @0 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:9:15+17
+  4: assert CanModify<Trafo::R>($t0)
+  5: $t2 := borrow_global<Trafo::R>($t0) on_abort goto 20 with $t3
+  6: trace_local[r]($t2)
+  7: $t4 := get_field<Trafo::R>.x($t2)
+  8: $t5 := 1
+  9: $t6 := -($t4, $t5) on_abort goto 20 with $t3
+ 10: $t7 := borrow_field<Trafo::R>.x($t2)
+ 11: write_ref($t7, $t6)
+ 12: write_back[Reference($t2)]($t7)
+ 13: write_back[Trafo::R]($t2)
+ 14: label L1
+     # VC: function does not abort under this condition at modifies.move:15:7+27
+ 15: assert Not(Not(exists[@0]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:16:7+33
+ 16: assert Not(Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+     # VC: post-condition does not hold at modifies.move:17:7+24
+ 17: assert exists<Trafo::R>($t0)
+     # VC: post-condition does not hold at modifies.move:18:7+56
+ 18: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 1))
+ 19: return ()
+ 20: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:12:3+247
+ 21: assert Or(Not(exists[@0]<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+ 22: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_13_data_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_13_data_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..84a42f34a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_13_data_invariant_instrumenter.bytecode
@@ -0,0 +1,97 @@
+============ after processor `data_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: bool
+     var $t2: num
+     var $t3: bool
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @1 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # >> opaque call: Trafo::opaque_decr($t0)
+  4: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:22:7+17
+  5: assert CanModify<Trafo::R>($t0)
+  6: assume Eq($t1, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+  7: if ($t1) goto 8 else goto 11
+  8: label L4
+  9: trace_abort($t2)
+ 10: goto 35
+ 11: label L3
+ 12: @2 := save_mem(Trafo::R)
+ 13: modifies global<Trafo::R>($t0)
+ 14: assume exists<Trafo::R>($t0)
+ 15: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@2]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 16: nop
+     # >> opaque call: Trafo::opaque_decr($t0)
+ 17: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:23:7+17
+ 18: assert CanModify<Trafo::R>($t0)
+ 19: assume Eq($t3, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+ 20: if ($t3) goto 21 else goto 24
+ 21: label L6
+ 22: trace_abort($t2)
+ 23: goto 35
+ 24: label L5
+ 25: @3 := save_mem(Trafo::R)
+ 26: modifies global<Trafo::R>($t0)
+ 27: assume exists<Trafo::R>($t0)
+ 28: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@3]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 29: nop
+ 30: label L1
+     # VC: function does not abort under this condition at modifies.move:27:7+27
+ 31: assert Not(Not(exists[@1]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:28:7+32
+ 32: assert Not(Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+     # VC: post-condition does not hold at modifies.move:29:7+56
+ 33: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 34: return ()
+ 35: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:25:3+196
+ 36: assert Or(Not(exists[@1]<Trafo::R>($t0)), Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 37: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: num
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut u64
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @0 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:9:15+17
+  4: assert CanModify<Trafo::R>($t0)
+  5: $t2 := borrow_global<Trafo::R>($t0) on_abort goto 20 with $t3
+  6: trace_local[r]($t2)
+  7: $t4 := get_field<Trafo::R>.x($t2)
+  8: $t5 := 1
+  9: $t6 := -($t4, $t5) on_abort goto 20 with $t3
+ 10: $t7 := borrow_field<Trafo::R>.x($t2)
+ 11: write_ref($t7, $t6)
+ 12: write_back[Reference($t2)]($t7)
+ 13: write_back[Trafo::R]($t2)
+ 14: label L1
+     # VC: function does not abort under this condition at modifies.move:15:7+27
+ 15: assert Not(Not(exists[@0]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:16:7+33
+ 16: assert Not(Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+     # VC: post-condition does not hold at modifies.move:17:7+24
+ 17: assert exists<Trafo::R>($t0)
+     # VC: post-condition does not hold at modifies.move:18:7+56
+ 18: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 1))
+ 19: return ()
+ 20: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:12:3+247
+ 21: assert Or(Not(exists[@0]<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+ 22: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_14_global_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_14_global_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..e77dfb98e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_14_global_invariant_instrumenter.bytecode
@@ -0,0 +1,97 @@
+============ after processor `global_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: bool
+     var $t2: num
+     var $t3: bool
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @1 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # >> opaque call: Trafo::opaque_decr($t0)
+  4: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:22:7+17
+  5: assert CanModify<Trafo::R>($t0)
+  6: assume Eq($t1, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+  7: if ($t1) goto 8 else goto 11
+  8: label L4
+  9: trace_abort($t2)
+ 10: goto 35
+ 11: label L3
+ 12: @2 := save_mem(Trafo::R)
+ 13: modifies global<Trafo::R>($t0)
+ 14: assume exists<Trafo::R>($t0)
+ 15: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@2]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 16: nop
+     # >> opaque call: Trafo::opaque_decr($t0)
+ 17: nop
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:23:7+17
+ 18: assert CanModify<Trafo::R>($t0)
+ 19: assume Eq($t3, Or(Not(exists<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), 0)))
+ 20: if ($t3) goto 21 else goto 24
+ 21: label L6
+ 22: trace_abort($t2)
+ 23: goto 35
+ 24: label L5
+ 25: @3 := save_mem(Trafo::R)
+ 26: modifies global<Trafo::R>($t0)
+ 27: assume exists<Trafo::R>($t0)
+ 28: assume Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@3]<Trafo::R>($t0)), 1))
+     # << opaque call: Trafo::opaque_decr($t0)
+ 29: nop
+ 30: label L1
+     # VC: function does not abort under this condition at modifies.move:27:7+27
+ 31: assert Not(Not(exists[@1]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:28:7+32
+ 32: assert Not(Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+     # VC: post-condition does not hold at modifies.move:29:7+56
+ 33: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 34: return ()
+ 35: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:25:3+196
+ 36: assert Or(Not(exists[@1]<Trafo::R>($t0)), Lt(select Trafo::R.x(global[@1]<Trafo::R>($t0)), 2))
+ 37: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: num
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut u64
+  0: assume WellFormed($t0)
+  1: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  2: @0 := save_mem(Trafo::R)
+  3: trace_local[addr]($t0)
+     # VC: caller does not have permission to modify `Trafo::R` at given address at modifies.move:9:15+17
+  4: assert CanModify<Trafo::R>($t0)
+  5: $t2 := borrow_global<Trafo::R>($t0) on_abort goto 20 with $t3
+  6: trace_local[r]($t2)
+  7: $t4 := get_field<Trafo::R>.x($t2)
+  8: $t5 := 1
+  9: $t6 := -($t4, $t5) on_abort goto 20 with $t3
+ 10: $t7 := borrow_field<Trafo::R>.x($t2)
+ 11: write_ref($t7, $t6)
+ 12: write_back[Reference($t2)]($t7)
+ 13: write_back[Trafo::R]($t2)
+ 14: label L1
+     # VC: function does not abort under this condition at modifies.move:15:7+27
+ 15: assert Not(Not(exists[@0]<Trafo::R>($t0)))
+     # VC: function does not abort under this condition at modifies.move:16:7+33
+ 16: assert Not(Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+     # VC: post-condition does not hold at modifies.move:17:7+24
+ 17: assert exists<Trafo::R>($t0)
+     # VC: post-condition does not hold at modifies.move:18:7+56
+ 18: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>($t0)), Sub(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 1))
+ 19: return ()
+ 20: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at modifies.move:12:3+247
+ 21: assert Or(Not(exists[@0]<Trafo::R>($t0)), Eq<u64>(select Trafo::R.x(global[@0]<Trafo::R>($t0)), 0))
+ 22: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_1_debug_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_1_debug_instrumenter.bytecode
new file mode 100644
index 000000000..05651faa4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_1_debug_instrumenter.bytecode
@@ -0,0 +1,42 @@
+============ after processor `debug_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: address
+     var $t2: address
+  0: trace_local[addr]($t0)
+  1: $t1 := copy($t0)
+  2: Trafo::opaque_decr($t1)
+  3: $t2 := copy($t0)
+  4: Trafo::opaque_decr($t2)
+  5: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: address
+     var $t3: &mut Trafo::R
+     var $t4: &mut Trafo::R
+     var $t5: &u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Trafo::R
+     var $t10: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := copy($t0)
+  2: $t3 := borrow_global<Trafo::R>($t2)
+  3: $t1 := $t3
+  4: trace_local[r]($t1)
+  5: $t4 := copy($t1)
+  6: $t5 := borrow_field<Trafo::R>.x($t4)
+  7: $t6 := read_ref($t5)
+  8: $t7 := 1
+  9: $t8 := -($t6, $t7)
+ 10: $t9 := move($t1)
+ 11: $t10 := borrow_field<Trafo::R>.x($t9)
+ 12: write_ref($t10, $t8)
+ 13: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_2_eliminate_imm_refs.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_2_eliminate_imm_refs.bytecode
new file mode 100644
index 000000000..a3e63d301
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_2_eliminate_imm_refs.bytecode
@@ -0,0 +1,42 @@
+============ after processor `eliminate_imm_refs` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: address
+     var $t2: address
+  0: trace_local[addr]($t0)
+  1: $t1 := copy($t0)
+  2: Trafo::opaque_decr($t1)
+  3: $t2 := copy($t0)
+  4: Trafo::opaque_decr($t2)
+  5: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: address
+     var $t3: &mut Trafo::R
+     var $t4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Trafo::R
+     var $t10: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := copy($t0)
+  2: $t3 := borrow_global<Trafo::R>($t2)
+  3: $t1 := $t3
+  4: trace_local[r]($t1)
+  5: $t4 := copy($t1)
+  6: $t5 := get_field<Trafo::R>.x($t4)
+  7: $t6 := move($t5)
+  8: $t7 := 1
+  9: $t8 := -($t6, $t7)
+ 10: $t9 := move($t1)
+ 11: $t10 := borrow_field<Trafo::R>.x($t9)
+ 12: write_ref($t10, $t8)
+ 13: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_3_mut_ref_instrumentation.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_3_mut_ref_instrumentation.bytecode
new file mode 100644
index 000000000..3b39a373a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_3_mut_ref_instrumentation.bytecode
@@ -0,0 +1,42 @@
+============ after processor `mut_ref_instrumentation` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: address
+     var $t2: address
+  0: trace_local[addr]($t0)
+  1: $t1 := copy($t0)
+  2: Trafo::opaque_decr($t1)
+  3: $t2 := copy($t0)
+  4: Trafo::opaque_decr($t2)
+  5: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: address
+     var $t3: &mut Trafo::R
+     var $t4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Trafo::R
+     var $t10: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := copy($t0)
+  2: $t3 := borrow_global<Trafo::R>($t2)
+  3: $t1 := $t3
+  4: trace_local[r]($t1)
+  5: $t4 := copy($t1)
+  6: $t5 := get_field<Trafo::R>.x($t4)
+  7: $t6 := move($t5)
+  8: $t7 := 1
+  9: $t8 := -($t6, $t7)
+ 10: $t9 := move($t1)
+ 11: $t10 := borrow_field<Trafo::R>.x($t9)
+ 12: write_ref($t10, $t8)
+ 13: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_4_reaching_def_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_4_reaching_def_analysis.bytecode
new file mode 100644
index 000000000..132a45b3a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_4_reaching_def_analysis.bytecode
@@ -0,0 +1,42 @@
+============ after processor `reaching_def_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     var $t1: address
+     var $t2: address
+  0: trace_local[addr]($t0)
+  1: $t1 := copy($t0)
+  2: Trafo::opaque_decr($t0)
+  3: $t2 := copy($t0)
+  4: Trafo::opaque_decr($t0)
+  5: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: address
+     var $t3: &mut Trafo::R
+     var $t4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: &mut Trafo::R
+     var $t10: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := copy($t0)
+  2: $t3 := borrow_global<Trafo::R>($t0)
+  3: $t1 := $t3
+  4: trace_local[r]($t3)
+  5: $t4 := copy($t3)
+  6: $t5 := get_field<Trafo::R>.x($t3)
+  7: $t6 := move($t5)
+  8: $t7 := 1
+  9: $t8 := -($t5, $t7)
+ 10: $t9 := move($t3)
+ 11: $t10 := borrow_field<Trafo::R>.x($t3)
+ 12: write_ref($t10, $t8)
+ 13: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_5_livevar_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_5_livevar_analysis.bytecode
new file mode 100644
index 000000000..3cd8e515a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_5_livevar_analysis.bytecode
@@ -0,0 +1,42 @@
+============ after processor `livevar_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     # live vars: addr
+  0: trace_local[addr]($t0)
+     # live vars: addr
+  1: Trafo::opaque_decr($t0)
+     # live vars: addr
+  2: Trafo::opaque_decr($t0)
+     # live vars:
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+     # live vars: addr
+  0: trace_local[addr]($t0)
+     # live vars: addr
+  1: $t2 := borrow_global<Trafo::R>($t0)
+     # live vars: $t2
+  2: trace_local[r]($t2)
+     # live vars: $t2
+  3: $t3 := get_field<Trafo::R>.x($t2)
+     # live vars: $t2, $t3
+  4: $t4 := 1
+     # live vars: $t2, $t3, $t4
+  5: $t5 := -($t3, $t4)
+     # live vars: $t2, $t5
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+     # live vars: $t5, $t6
+  7: write_ref($t6, $t5)
+     # live vars:
+  8: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_6_borrow_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_6_borrow_analysis.bytecode
new file mode 100644
index 000000000..556590df1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_6_borrow_analysis.bytecode
@@ -0,0 +1,56 @@
+============ after processor `borrow_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[addr]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: Trafo::opaque_decr($t0)
+     # live_nodes: LocalRoot($t0)
+  2: Trafo::opaque_decr($t0)
+     # live_nodes: LocalRoot($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[addr]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}
+  2: trace_local[r]($t2)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}
+  3: $t3 := get_field<Trafo::R>.x($t2)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}
+  4: $t4 := 1
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}
+  5: $t5 := -($t3, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}, Reference($t2) -> {(*, Reference($t6))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}, Reference($t6) -> {(*, Reference($t2))}
+  7: write_ref($t6, $t5)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: Trafo::R -> {(*, Reference($t2))}, Reference($t2) -> {(*, Reference($t6))}
+     # borrows_from: Reference($t2) -> {(*, Trafo::R)}, Reference($t6) -> {(*, Reference($t2))}
+  8: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_7_memory_instr.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_7_memory_instr.bytecode
new file mode 100644
index 000000000..f633adff2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_7_memory_instr.bytecode
@@ -0,0 +1,31 @@
+============ after processor `memory_instr` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+  0: trace_local[addr]($t0)
+  1: Trafo::opaque_decr($t0)
+  2: Trafo::opaque_decr($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+  2: trace_local[r]($t2)
+  3: $t3 := get_field<Trafo::R>.x($t2)
+  4: $t4 := 1
+  5: $t5 := -($t3, $t4)
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+  7: write_ref($t6, $t5)
+  8: write_back[Reference($t2)]($t6)
+  9: write_back[Trafo::R]($t2)
+ 10: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_8_clean_and_optimize.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_8_clean_and_optimize.bytecode
new file mode 100644
index 000000000..5a2e7cbbc
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_8_clean_and_optimize.bytecode
@@ -0,0 +1,31 @@
+============ after processor `clean_and_optimize` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+  0: trace_local[addr]($t0)
+  1: Trafo::opaque_decr($t0)
+  2: Trafo::opaque_decr($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+  2: trace_local[r]($t2)
+  3: $t3 := get_field<Trafo::R>.x($t2)
+  4: $t4 := 1
+  5: $t5 := -($t3, $t4)
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+  7: write_ref($t6, $t5)
+  8: write_back[Reference($t2)]($t6)
+  9: write_back[Trafo::R]($t2)
+ 10: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/modifies_9_usage_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/modifies_9_usage_analysis.bytecode
new file mode 100644
index 000000000..313e5349c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/modifies_9_usage_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `usage_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|addr: address) {
+  0: trace_local[addr]($t0)
+  1: Trafo::opaque_decr($t0)
+  2: Trafo::opaque_decr($t0)
+  3: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|addr: address) {
+     var $t1|r: &mut Trafo::R
+     var $t2: &mut Trafo::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut u64
+  0: trace_local[addr]($t0)
+  1: $t2 := borrow_global<Trafo::R>($t0)
+  2: trace_local[r]($t2)
+  3: $t3 := get_field<Trafo::R>.x($t2)
+  4: $t4 := 1
+  5: $t5 := -($t3, $t4)
+  6: $t6 := borrow_field<Trafo::R>.x($t2)
+  7: write_ref($t6, $t5)
+  8: write_back[Reference($t2)]($t6)
+  9: write_back[Trafo::R]($t2)
+ 10: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque.move b/vendors/move/crates/move-prover/tests/xsources/design/opaque.move
new file mode 100644
index 000000000..96a02f515
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque.move
@@ -0,0 +1,22 @@
+// flag: --v2
+address 0x0 {
+/// Example for opaque function calls.
+module Trafo {
+  public fun opaque_decr(x: u64): u64 {
+      x - 1
+  }
+  spec fun opaque_decr {
+      pragma opaque;
+      aborts_if x == 0;
+      ensures result == x - 1;
+  }
+
+  public fun opaque_caller(x: u64): u64 {
+      opaque_decr(opaque_decr(x))
+  }
+  spec fun opaque_caller {
+      aborts_if x < 2;
+      ensures result == x - 2;
+  }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_0_stackless.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_0_stackless.bytecode
new file mode 100644
index 000000000..460dd340c
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_0_stackless.bytecode
@@ -0,0 +1,24 @@
+============ after processor `stackless` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: $t1 := copy($t0)
+  1: $t2 := Trafo::opaque_decr($t1)
+  2: $t3 := Trafo::opaque_decr($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: $t1 := copy($t0)
+  1: $t2 := 1
+  2: $t3 := -($t1, $t2)
+  3: return $t3
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_10_verification_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_10_verification_analysis.bytecode
new file mode 100644
index 000000000..13609b78e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_10_verification_analysis.bytecode
@@ -0,0 +1,24 @@
+============ after processor `verification_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := 1
+  2: $t2 := -($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_11_loop_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_11_loop_analysis.bytecode
new file mode 100644
index 000000000..23547d23f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_11_loop_analysis.bytecode
@@ -0,0 +1,24 @@
+============ after processor `loop_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := 1
+  2: $t2 := -($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_12_spec_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_12_spec_instrumenter.bytecode
new file mode 100644
index 000000000..9fbc45f30
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_12_spec_instrumenter.bytecode
@@ -0,0 +1,70 @@
+============ after processor `spec_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: bool
+     var $t2: num
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+     # >> opaque call: $t1 := Trafo::opaque_decr($t0)
+  2: nop
+  3: assume Eq($t1, Eq<u64>($t0, 0))
+  4: if ($t1) goto 5 else goto 8
+  5: label L4
+  6: trace_abort($t2)
+  7: goto 27
+  8: label L3
+  9: assume Eq<u64>($t3, Sub($t0, 1))
+ 10: assume WellFormed($t3)
+     # << opaque call: $t1 := Trafo::opaque_decr($t0)
+ 11: nop
+     # >> opaque call: $t2 := Trafo::opaque_decr($t1)
+ 12: nop
+ 13: assume Eq($t4, Eq<u64>($t3, 0))
+ 14: if ($t4) goto 15 else goto 18
+ 15: label L6
+ 16: trace_abort($t2)
+ 17: goto 27
+ 18: label L5
+ 19: assume Eq<u64>($t5, Sub($t3, 1))
+ 20: assume WellFormed($t5)
+     # << opaque call: $t2 := Trafo::opaque_decr($t1)
+ 21: nop
+ 22: trace_return[0]($t5)
+ 23: label L1
+     # VC: function does not abort under this condition at opaque.move:18:7+16
+ 24: assert Not(Lt($t0, 2))
+     # VC: post-condition does not hold at opaque.move:19:7+24
+ 25: assert Eq<u64>($t5, Sub($t0, 2))
+ 26: return $t5
+ 27: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:17:3+82
+ 28: assert Lt($t0, 2)
+ 29: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+  2: $t1 := 1
+  3: $t2 := -($t0, $t1) on_abort goto 9 with $t3
+  4: trace_return[0]($t2)
+  5: label L1
+     # VC: function does not abort under this condition at opaque.move:10:7+17
+  6: assert Not(Eq<u64>($t0, 0))
+     # VC: post-condition does not hold at opaque.move:11:7+24
+  7: assert Eq<u64>($t2, Sub($t0, 1))
+  8: return $t2
+  9: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:8:3+102
+ 10: assert Eq<u64>($t0, 0)
+ 11: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_13_data_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_13_data_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..e9ba9f440
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_13_data_invariant_instrumenter.bytecode
@@ -0,0 +1,70 @@
+============ after processor `data_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: bool
+     var $t2: num
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+     # >> opaque call: $t1 := Trafo::opaque_decr($t0)
+  2: nop
+  3: assume Eq($t1, Eq<u64>($t0, 0))
+  4: if ($t1) goto 5 else goto 8
+  5: label L4
+  6: trace_abort($t2)
+  7: goto 27
+  8: label L3
+  9: assume Eq<u64>($t3, Sub($t0, 1))
+ 10: assume WellFormed($t3)
+     # << opaque call: $t1 := Trafo::opaque_decr($t0)
+ 11: nop
+     # >> opaque call: $t2 := Trafo::opaque_decr($t1)
+ 12: nop
+ 13: assume Eq($t4, Eq<u64>($t3, 0))
+ 14: if ($t4) goto 15 else goto 18
+ 15: label L6
+ 16: trace_abort($t2)
+ 17: goto 27
+ 18: label L5
+ 19: assume Eq<u64>($t5, Sub($t3, 1))
+ 20: assume WellFormed($t5)
+     # << opaque call: $t2 := Trafo::opaque_decr($t1)
+ 21: nop
+ 22: trace_return[0]($t5)
+ 23: label L1
+     # VC: function does not abort under this condition at opaque.move:18:7+16
+ 24: assert Not(Lt($t0, 2))
+     # VC: post-condition does not hold at opaque.move:19:7+24
+ 25: assert Eq<u64>($t5, Sub($t0, 2))
+ 26: return $t5
+ 27: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:17:3+82
+ 28: assert Lt($t0, 2)
+ 29: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+  2: $t1 := 1
+  3: $t2 := -($t0, $t1) on_abort goto 9 with $t3
+  4: trace_return[0]($t2)
+  5: label L1
+     # VC: function does not abort under this condition at opaque.move:10:7+17
+  6: assert Not(Eq<u64>($t0, 0))
+     # VC: post-condition does not hold at opaque.move:11:7+24
+  7: assert Eq<u64>($t2, Sub($t0, 1))
+  8: return $t2
+  9: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:8:3+102
+ 10: assert Eq<u64>($t0, 0)
+ 11: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_14_global_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_14_global_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..ba2a98043
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_14_global_invariant_instrumenter.bytecode
@@ -0,0 +1,70 @@
+============ after processor `global_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: bool
+     var $t2: num
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+     # >> opaque call: $t1 := Trafo::opaque_decr($t0)
+  2: nop
+  3: assume Eq($t1, Eq<u64>($t0, 0))
+  4: if ($t1) goto 5 else goto 8
+  5: label L4
+  6: trace_abort($t2)
+  7: goto 27
+  8: label L3
+  9: assume Eq<u64>($t3, Sub($t0, 1))
+ 10: assume WellFormed($t3)
+     # << opaque call: $t1 := Trafo::opaque_decr($t0)
+ 11: nop
+     # >> opaque call: $t2 := Trafo::opaque_decr($t1)
+ 12: nop
+ 13: assume Eq($t4, Eq<u64>($t3, 0))
+ 14: if ($t4) goto 15 else goto 18
+ 15: label L6
+ 16: trace_abort($t2)
+ 17: goto 27
+ 18: label L5
+ 19: assume Eq<u64>($t5, Sub($t3, 1))
+ 20: assume WellFormed($t5)
+     # << opaque call: $t2 := Trafo::opaque_decr($t1)
+ 21: nop
+ 22: trace_return[0]($t5)
+ 23: label L1
+     # VC: function does not abort under this condition at opaque.move:18:7+16
+ 24: assert Not(Lt($t0, 2))
+     # VC: post-condition does not hold at opaque.move:19:7+24
+ 25: assert Eq<u64>($t5, Sub($t0, 2))
+ 26: return $t5
+ 27: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:17:3+82
+ 28: assert Lt($t0, 2)
+ 29: abort($t2)
+}
+
+
+[variant verification]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: trace_local[x]($t0)
+  2: $t1 := 1
+  3: $t2 := -($t0, $t1) on_abort goto 9 with $t3
+  4: trace_return[0]($t2)
+  5: label L1
+     # VC: function does not abort under this condition at opaque.move:10:7+17
+  6: assert Not(Eq<u64>($t0, 0))
+     # VC: post-condition does not hold at opaque.move:11:7+24
+  7: assert Eq<u64>($t2, Sub($t0, 1))
+  8: return $t2
+  9: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at opaque.move:8:3+102
+ 10: assert Eq<u64>($t0, 0)
+ 11: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_1_debug_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_1_debug_instrumenter.bytecode
new file mode 100644
index 000000000..bdb6d484e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_1_debug_instrumenter.bytecode
@@ -0,0 +1,28 @@
+============ after processor `debug_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: $t3 := Trafo::opaque_decr($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := 1
+  3: $t3 := -($t1, $t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_2_eliminate_imm_refs.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_2_eliminate_imm_refs.bytecode
new file mode 100644
index 000000000..c3f845ab2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_2_eliminate_imm_refs.bytecode
@@ -0,0 +1,28 @@
+============ after processor `eliminate_imm_refs` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: $t3 := Trafo::opaque_decr($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := 1
+  3: $t3 := -($t1, $t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_3_mut_ref_instrumentation.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_3_mut_ref_instrumentation.bytecode
new file mode 100644
index 000000000..51f166939
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_3_mut_ref_instrumentation.bytecode
@@ -0,0 +1,28 @@
+============ after processor `mut_ref_instrumentation` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: $t3 := Trafo::opaque_decr($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := 1
+  3: $t3 := -($t1, $t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_4_reaching_def_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_4_reaching_def_analysis.bytecode
new file mode 100644
index 000000000..4ad78cd28
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_4_reaching_def_analysis.bytecode
@@ -0,0 +1,28 @@
+============ after processor `reaching_def_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := Trafo::opaque_decr($t0)
+  3: $t3 := Trafo::opaque_decr($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[x]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := 1
+  3: $t3 := -($t0, $t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_5_livevar_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_5_livevar_analysis.bytecode
new file mode 100644
index 000000000..45b1dcbbe
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_5_livevar_analysis.bytecode
@@ -0,0 +1,34 @@
+============ after processor `livevar_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     # live vars: x
+  0: trace_local[x]($t0)
+     # live vars: x
+  1: $t1 := Trafo::opaque_decr($t0)
+     # live vars: $t1
+  2: $t2 := Trafo::opaque_decr($t1)
+     # live vars: $t2
+  3: trace_return[0]($t2)
+     # live vars: $t2
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     # live vars: x
+  0: trace_local[x]($t0)
+     # live vars: x
+  1: $t1 := 1
+     # live vars: x, $t1
+  2: $t2 := -($t0, $t1)
+     # live vars: $t2
+  3: trace_return[0]($t2)
+     # live vars: $t2
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_6_borrow_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_6_borrow_analysis.bytecode
new file mode 100644
index 000000000..f122d45ca
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_6_borrow_analysis.bytecode
@@ -0,0 +1,34 @@
+============ after processor `borrow_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[x]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+     # live_nodes: LocalRoot($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+     # live_nodes: LocalRoot($t0)
+  3: trace_return[0]($t2)
+     # live_nodes: LocalRoot($t0)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[x]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := 1
+     # live_nodes: LocalRoot($t0)
+  2: $t2 := -($t0, $t1)
+     # live_nodes: LocalRoot($t0)
+  3: trace_return[0]($t2)
+     # live_nodes: LocalRoot($t0)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_7_memory_instr.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_7_memory_instr.bytecode
new file mode 100644
index 000000000..4e92b7bb9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_7_memory_instr.bytecode
@@ -0,0 +1,24 @@
+============ after processor `memory_instr` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := 1
+  2: $t2 := -($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_8_clean_and_optimize.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_8_clean_and_optimize.bytecode
new file mode 100644
index 000000000..3193dfc39
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_8_clean_and_optimize.bytecode
@@ -0,0 +1,24 @@
+============ after processor `clean_and_optimize` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := 1
+  2: $t2 := -($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/opaque_9_usage_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/opaque_9_usage_analysis.bytecode
new file mode 100644
index 000000000..c87c196b5
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/opaque_9_usage_analysis.bytecode
@@ -0,0 +1,24 @@
+============ after processor `usage_analysis` ================
+
+[variant baseline]
+pub fun Trafo::opaque_caller($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := Trafo::opaque_decr($t0)
+  2: $t2 := Trafo::opaque_decr($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::opaque_decr($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: $t1 := 1
+  2: $t2 := -($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references.move b/vendors/move/crates/move-prover/tests/xsources/design/references.move
new file mode 100644
index 000000000..9ec911c39
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references.move
@@ -0,0 +1,28 @@
+// flag: --v2
+address 0x0 {
+/// Example for reference elimination.
+module Trafo {
+
+  struct R { x: u64 }
+
+  public fun incr_ref(r: &mut u64) {
+      *r = *r + 1;
+  }
+  spec fun incr_ref {
+    ensures r == old(r) + 1;
+  }
+
+  public fun use_incr_ref(b: bool): R {
+      let r1 = R{x:1};
+      let r2 = R{x:2};
+      let r_ref = if (b) &mut r1 else &mut r2;
+      incr_ref(&mut r_ref.x);
+      r2
+  }
+  spec fun use_incr_ref {
+      ensures b ==> result == R{x:2};
+      ensures !b ==> result == R{x:3};
+  }
+
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_0_stackless.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_0_stackless.bytecode
new file mode 100644
index 000000000..73720a247
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_0_stackless.bytecode
@@ -0,0 +1,63 @@
+============ after processor `stackless` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := read_ref($t1)
+  2: $t3 := 1
+  3: $t4 := +($t2, $t3)
+  4: $t5 := move($t0)
+  5: write_ref($t5, $t4)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: Trafo::R
+     var $t7: u64
+     var $t8: Trafo::R
+     var $t9: bool
+     var $t10: &mut Trafo::R
+     var $t11: &mut Trafo::R
+     var $t12: &mut Trafo::R
+     var $t13: &mut Trafo::R
+     var $t14: &mut u64
+     var $t15: Trafo::R
+  0: $t5 := 1
+  1: $t6 := pack Trafo::R($t5)
+  2: $t1 := $t6
+  3: $t7 := 2
+  4: $t8 := pack Trafo::R($t7)
+  5: $t2 := $t8
+  6: $t9 := copy($t0)
+  7: if ($t9) goto 10 else goto 8
+  8: label L1
+  9: goto 14
+ 10: label L0
+ 11: $t10 := borrow_local($t1)
+ 12: $t4 := $t10
+ 13: goto 18
+ 14: label L2
+ 15: $t11 := borrow_local($t2)
+ 16: $t4 := $t11
+ 17: goto 18
+ 18: label L3
+ 19: $t12 := move($t4)
+ 20: $t3 := $t12
+ 21: $t13 := move($t3)
+ 22: $t14 := borrow_field<Trafo::R>.x($t13)
+ 23: Trafo::incr_ref($t14)
+ 24: $t15 := move($t2)
+ 25: return $t15
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_10_verification_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_10_verification_analysis.bytecode
new file mode 100644
index 000000000..cc8790d5e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_10_verification_analysis.bytecode
@@ -0,0 +1,59 @@
+============ after processor `verification_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2)
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t1 := pack Trafo::R($t5)
+  3: trace_local[r1]($t1)
+  4: $t6 := 2
+  5: $t2 := pack Trafo::R($t6)
+  6: trace_local[r2]($t2)
+  7: if ($t0) goto 10 else goto 8
+  8: label L1
+  9: goto 15
+ 10: label L0
+ 11: $t7 := borrow_local($t1)
+ 12: $t4 := $t7
+ 13: trace_local[tmp#$4]($t7)
+ 14: goto 19
+ 15: label L2
+ 16: $t8 := borrow_local($t2)
+ 17: $t4 := $t8
+ 18: trace_local[tmp#$4]($t8)
+ 19: label L3
+ 20: trace_local[r_ref]($t4)
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+ 22: Trafo::incr_ref($t9)
+ 23: write_back[Reference($t4)]($t9)
+ 24: write_back[LocalRoot($t1)]($t4)
+ 25: write_back[LocalRoot($t2)]($t4)
+ 26: $t10 := move($t2)
+ 27: trace_return[0]($t10)
+ 28: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_11_loop_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_11_loop_analysis.bytecode
new file mode 100644
index 000000000..241b5ba59
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_11_loop_analysis.bytecode
@@ -0,0 +1,59 @@
+============ after processor `loop_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2)
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t1 := pack Trafo::R($t5)
+  3: trace_local[r1]($t1)
+  4: $t6 := 2
+  5: $t2 := pack Trafo::R($t6)
+  6: trace_local[r2]($t2)
+  7: if ($t0) goto 10 else goto 8
+  8: label L1
+  9: goto 15
+ 10: label L0
+ 11: $t7 := borrow_local($t1)
+ 12: $t4 := $t7
+ 13: trace_local[tmp#$4]($t7)
+ 14: goto 19
+ 15: label L2
+ 16: $t8 := borrow_local($t2)
+ 17: $t4 := $t8
+ 18: trace_local[tmp#$4]($t8)
+ 19: label L3
+ 20: trace_local[r_ref]($t4)
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+ 22: Trafo::incr_ref($t9)
+ 23: write_back[Reference($t4)]($t9)
+ 24: write_back[LocalRoot($t1)]($t4)
+ 25: write_back[LocalRoot($t2)]($t4)
+ 26: $t10 := move($t2)
+ 27: trace_return[0]($t10)
+ 28: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_12_spec_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_12_spec_instrumenter.bytecode
new file mode 100644
index 000000000..251c59acc
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_12_spec_instrumenter.bytecode
@@ -0,0 +1,96 @@
+============ after processor `spec_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: num
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2) on_abort goto 8 with $t4
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: label L1
+  7: return ()
+  8: label L2
+  9: abort($t4)
+}
+
+
+[variant verification]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: num
+  0: assume WellFormed($t0)
+  1: $t1 := read_ref($t0)
+  2: trace_local[r]($t0)
+  3: $t2 := read_ref($t0)
+  4: $t3 := 1
+  5: $t4 := +($t2, $t3) on_abort goto 11 with $t5
+  6: write_ref($t0, $t4)
+  7: trace_local[r]($t0)
+  8: label L1
+     # VC: post-condition does not hold at references.move:12:5+24
+  9: assert Eq<u64>($t0, Add($t1, 1))
+ 10: return ()
+ 11: label L2
+ 12: abort($t5)
+}
+
+
+[variant verification]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: num
+     var $t11: Trafo::R
+  0: assume WellFormed($t0)
+  1: trace_local[b]($t0)
+  2: $t5 := 1
+  3: $t1 := pack Trafo::R($t5)
+  4: trace_local[r1]($t1)
+  5: $t6 := 2
+  6: $t2 := pack Trafo::R($t6)
+  7: trace_local[r2]($t2)
+  8: if ($t0) goto 11 else goto 9
+  9: label L1
+ 10: goto 16
+ 11: label L0
+ 12: $t7 := borrow_local($t1)
+ 13: $t4 := $t7
+ 14: trace_local[tmp#$4]($t7)
+ 15: goto 20
+ 16: label L2
+ 17: $t8 := borrow_local($t2)
+ 18: $t4 := $t8
+ 19: trace_local[tmp#$4]($t8)
+ 20: label L3
+ 21: trace_local[r_ref]($t4)
+ 22: $t9 := borrow_field<Trafo::R>.x($t4)
+ 23: Trafo::incr_ref($t9) on_abort goto 33 with $t10
+ 24: write_back[Reference($t4)]($t9)
+ 25: write_back[LocalRoot($t1)]($t4)
+ 26: write_back[LocalRoot($t2)]($t4)
+ 27: $t11 := move($t2)
+ 28: trace_return[0]($t11)
+ 29: label L4
+     # VC: post-condition does not hold at references.move:23:7+31
+ 30: assert Implies($t0, Eq<Trafo::R>($t11, pack Trafo::R(2)))
+     # VC: post-condition does not hold at references.move:24:7+32
+ 31: assert Implies(Not($t0), Eq<Trafo::R>($t11, pack Trafo::R(3)))
+ 32: return $t11
+ 33: label L5
+ 34: abort($t10)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_13_data_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_13_data_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..97ab2eb83
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_13_data_invariant_instrumenter.bytecode
@@ -0,0 +1,96 @@
+============ after processor `data_invariant_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: num
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2) on_abort goto 8 with $t4
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: label L1
+  7: return ()
+  8: label L2
+  9: abort($t4)
+}
+
+
+[variant verification]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: num
+  0: assume WellFormed($t0)
+  1: $t1 := read_ref($t0)
+  2: trace_local[r]($t0)
+  3: $t2 := read_ref($t0)
+  4: $t3 := 1
+  5: $t4 := +($t2, $t3) on_abort goto 11 with $t5
+  6: write_ref($t0, $t4)
+  7: trace_local[r]($t0)
+  8: label L1
+     # VC: post-condition does not hold at references.move:12:5+24
+  9: assert Eq<u64>($t0, Add($t1, 1))
+ 10: return ()
+ 11: label L2
+ 12: abort($t5)
+}
+
+
+[variant verification]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: num
+     var $t11: Trafo::R
+  0: assume WellFormed($t0)
+  1: trace_local[b]($t0)
+  2: $t5 := 1
+  3: $t1 := pack Trafo::R($t5)
+  4: trace_local[r1]($t1)
+  5: $t6 := 2
+  6: $t2 := pack Trafo::R($t6)
+  7: trace_local[r2]($t2)
+  8: if ($t0) goto 11 else goto 9
+  9: label L1
+ 10: goto 16
+ 11: label L0
+ 12: $t7 := borrow_local($t1)
+ 13: $t4 := $t7
+ 14: trace_local[tmp#$4]($t7)
+ 15: goto 20
+ 16: label L2
+ 17: $t8 := borrow_local($t2)
+ 18: $t4 := $t8
+ 19: trace_local[tmp#$4]($t8)
+ 20: label L3
+ 21: trace_local[r_ref]($t4)
+ 22: $t9 := borrow_field<Trafo::R>.x($t4)
+ 23: Trafo::incr_ref($t9) on_abort goto 33 with $t10
+ 24: write_back[Reference($t4)]($t9)
+ 25: write_back[LocalRoot($t1)]($t4)
+ 26: write_back[LocalRoot($t2)]($t4)
+ 27: $t11 := move($t2)
+ 28: trace_return[0]($t11)
+ 29: label L4
+     # VC: post-condition does not hold at references.move:23:7+31
+ 30: assert Implies($t0, Eq<Trafo::R>($t11, pack Trafo::R(2)))
+     # VC: post-condition does not hold at references.move:24:7+32
+ 31: assert Implies(Not($t0), Eq<Trafo::R>($t11, pack Trafo::R(3)))
+ 32: return $t11
+ 33: label L5
+ 34: abort($t10)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_14_global_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_14_global_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..a9b11708e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_14_global_invariant_instrumenter.bytecode
@@ -0,0 +1,96 @@
+============ after processor `global_invariant_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: num
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2) on_abort goto 8 with $t4
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: label L1
+  7: return ()
+  8: label L2
+  9: abort($t4)
+}
+
+
+[variant verification]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: num
+  0: assume WellFormed($t0)
+  1: $t1 := read_ref($t0)
+  2: trace_local[r]($t0)
+  3: $t2 := read_ref($t0)
+  4: $t3 := 1
+  5: $t4 := +($t2, $t3) on_abort goto 11 with $t5
+  6: write_ref($t0, $t4)
+  7: trace_local[r]($t0)
+  8: label L1
+     # VC: post-condition does not hold at references.move:12:5+24
+  9: assert Eq<u64>($t0, Add($t1, 1))
+ 10: return ()
+ 11: label L2
+ 12: abort($t5)
+}
+
+
+[variant verification]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: num
+     var $t11: Trafo::R
+  0: assume WellFormed($t0)
+  1: trace_local[b]($t0)
+  2: $t5 := 1
+  3: $t1 := pack Trafo::R($t5)
+  4: trace_local[r1]($t1)
+  5: $t6 := 2
+  6: $t2 := pack Trafo::R($t6)
+  7: trace_local[r2]($t2)
+  8: if ($t0) goto 11 else goto 9
+  9: label L1
+ 10: goto 16
+ 11: label L0
+ 12: $t7 := borrow_local($t1)
+ 13: $t4 := $t7
+ 14: trace_local[tmp#$4]($t7)
+ 15: goto 20
+ 16: label L2
+ 17: $t8 := borrow_local($t2)
+ 18: $t4 := $t8
+ 19: trace_local[tmp#$4]($t8)
+ 20: label L3
+ 21: trace_local[r_ref]($t4)
+ 22: $t9 := borrow_field<Trafo::R>.x($t4)
+ 23: Trafo::incr_ref($t9) on_abort goto 33 with $t10
+ 24: write_back[Reference($t4)]($t9)
+ 25: write_back[LocalRoot($t1)]($t4)
+ 26: write_back[LocalRoot($t2)]($t4)
+ 27: $t11 := move($t2)
+ 28: trace_return[0]($t11)
+ 29: label L4
+     # VC: post-condition does not hold at references.move:23:7+31
+ 30: assert Implies($t0, Eq<Trafo::R>($t11, pack Trafo::R(2)))
+     # VC: post-condition does not hold at references.move:24:7+32
+ 31: assert Implies(Not($t0), Eq<Trafo::R>($t11, pack Trafo::R(3)))
+ 32: return $t11
+ 33: label L5
+ 34: abort($t10)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_1_debug_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_1_debug_instrumenter.bytecode
new file mode 100644
index 000000000..55a1b0f4d
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_1_debug_instrumenter.bytecode
@@ -0,0 +1,70 @@
+============ after processor `debug_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+  0: trace_local[r]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := read_ref($t1)
+  3: $t3 := 1
+  4: $t4 := +($t2, $t3)
+  5: $t5 := move($t0)
+  6: write_ref($t5, $t4)
+  7: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: Trafo::R
+     var $t7: u64
+     var $t8: Trafo::R
+     var $t9: bool
+     var $t10: &mut Trafo::R
+     var $t11: &mut Trafo::R
+     var $t12: &mut Trafo::R
+     var $t13: &mut Trafo::R
+     var $t14: &mut u64
+     var $t15: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t6 := pack Trafo::R($t5)
+  3: $t1 := $t6
+  4: trace_local[r1]($t1)
+  5: $t7 := 2
+  6: $t8 := pack Trafo::R($t7)
+  7: $t2 := $t8
+  8: trace_local[r2]($t2)
+  9: $t9 := copy($t0)
+ 10: if ($t9) goto 13 else goto 11
+ 11: label L1
+ 12: goto 18
+ 13: label L0
+ 14: $t10 := borrow_local($t1)
+ 15: $t4 := $t10
+ 16: trace_local[tmp#$4]($t4)
+ 17: goto 22
+ 18: label L2
+ 19: $t11 := borrow_local($t2)
+ 20: $t4 := $t11
+ 21: trace_local[tmp#$4]($t4)
+ 22: label L3
+ 23: $t12 := move($t4)
+ 24: $t3 := $t12
+ 25: trace_local[r_ref]($t3)
+ 26: $t13 := move($t3)
+ 27: $t14 := borrow_field<Trafo::R>.x($t13)
+ 28: Trafo::incr_ref($t14)
+ 29: $t15 := move($t2)
+ 30: trace_return[0]($t15)
+ 31: return $t15
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_2_eliminate_imm_refs.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_2_eliminate_imm_refs.bytecode
new file mode 100644
index 000000000..e8242006b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_2_eliminate_imm_refs.bytecode
@@ -0,0 +1,70 @@
+============ after processor `eliminate_imm_refs` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+  0: trace_local[r]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := read_ref($t1)
+  3: $t3 := 1
+  4: $t4 := +($t2, $t3)
+  5: $t5 := move($t0)
+  6: write_ref($t5, $t4)
+  7: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: Trafo::R
+     var $t7: u64
+     var $t8: Trafo::R
+     var $t9: bool
+     var $t10: &mut Trafo::R
+     var $t11: &mut Trafo::R
+     var $t12: &mut Trafo::R
+     var $t13: &mut Trafo::R
+     var $t14: &mut u64
+     var $t15: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t6 := pack Trafo::R($t5)
+  3: $t1 := $t6
+  4: trace_local[r1]($t1)
+  5: $t7 := 2
+  6: $t8 := pack Trafo::R($t7)
+  7: $t2 := $t8
+  8: trace_local[r2]($t2)
+  9: $t9 := copy($t0)
+ 10: if ($t9) goto 13 else goto 11
+ 11: label L1
+ 12: goto 18
+ 13: label L0
+ 14: $t10 := borrow_local($t1)
+ 15: $t4 := $t10
+ 16: trace_local[tmp#$4]($t4)
+ 17: goto 22
+ 18: label L2
+ 19: $t11 := borrow_local($t2)
+ 20: $t4 := $t11
+ 21: trace_local[tmp#$4]($t4)
+ 22: label L3
+ 23: $t12 := move($t4)
+ 24: $t3 := $t12
+ 25: trace_local[r_ref]($t3)
+ 26: $t13 := move($t3)
+ 27: $t14 := borrow_field<Trafo::R>.x($t13)
+ 28: Trafo::incr_ref($t14)
+ 29: $t15 := move($t2)
+ 30: trace_return[0]($t15)
+ 31: return $t15
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_3_mut_ref_instrumentation.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_3_mut_ref_instrumentation.bytecode
new file mode 100644
index 000000000..e5ff13f50
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_3_mut_ref_instrumentation.bytecode
@@ -0,0 +1,71 @@
+============ after processor `mut_ref_instrumentation` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+  0: trace_local[r]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := read_ref($t1)
+  3: $t3 := 1
+  4: $t4 := +($t2, $t3)
+  5: $t5 := copy($t0)
+  6: write_ref($t5, $t4)
+  7: trace_local[r]($t0)
+  8: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: Trafo::R
+     var $t7: u64
+     var $t8: Trafo::R
+     var $t9: bool
+     var $t10: &mut Trafo::R
+     var $t11: &mut Trafo::R
+     var $t12: &mut Trafo::R
+     var $t13: &mut Trafo::R
+     var $t14: &mut u64
+     var $t15: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t6 := pack Trafo::R($t5)
+  3: $t1 := $t6
+  4: trace_local[r1]($t1)
+  5: $t7 := 2
+  6: $t8 := pack Trafo::R($t7)
+  7: $t2 := $t8
+  8: trace_local[r2]($t2)
+  9: $t9 := copy($t0)
+ 10: if ($t9) goto 13 else goto 11
+ 11: label L1
+ 12: goto 18
+ 13: label L0
+ 14: $t10 := borrow_local($t1)
+ 15: $t4 := $t10
+ 16: trace_local[tmp#$4]($t4)
+ 17: goto 22
+ 18: label L2
+ 19: $t11 := borrow_local($t2)
+ 20: $t4 := $t11
+ 21: trace_local[tmp#$4]($t4)
+ 22: label L3
+ 23: $t12 := move($t4)
+ 24: $t3 := $t12
+ 25: trace_local[r_ref]($t3)
+ 26: $t13 := move($t3)
+ 27: $t14 := borrow_field<Trafo::R>.x($t13)
+ 28: Trafo::incr_ref($t14)
+ 29: $t15 := move($t2)
+ 30: trace_return[0]($t15)
+ 31: return $t15
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_4_reaching_def_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_4_reaching_def_analysis.bytecode
new file mode 100644
index 000000000..f06f4231e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_4_reaching_def_analysis.bytecode
@@ -0,0 +1,71 @@
+============ after processor `reaching_def_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: &mut u64
+  0: trace_local[r]($t0)
+  1: $t1 := copy($t0)
+  2: $t2 := read_ref($t0)
+  3: $t3 := 1
+  4: $t4 := +($t2, $t3)
+  5: $t5 := copy($t0)
+  6: write_ref($t0, $t4)
+  7: trace_local[r]($t0)
+  8: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: Trafo::R
+     var $t7: u64
+     var $t8: Trafo::R
+     var $t9: bool
+     var $t10: &mut Trafo::R
+     var $t11: &mut Trafo::R
+     var $t12: &mut Trafo::R
+     var $t13: &mut Trafo::R
+     var $t14: &mut u64
+     var $t15: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t6 := pack Trafo::R($t5)
+  3: $t1 := $t6
+  4: trace_local[r1]($t1)
+  5: $t7 := 2
+  6: $t8 := pack Trafo::R($t7)
+  7: $t2 := $t8
+  8: trace_local[r2]($t2)
+  9: $t9 := copy($t0)
+ 10: if ($t0) goto 13 else goto 11
+ 11: label L1
+ 12: goto 18
+ 13: label L0
+ 14: $t10 := borrow_local($t1)
+ 15: $t4 := $t10
+ 16: trace_local[tmp#$4]($t10)
+ 17: goto 22
+ 18: label L2
+ 19: $t11 := borrow_local($t2)
+ 20: $t4 := $t11
+ 21: trace_local[tmp#$4]($t11)
+ 22: label L3
+ 23: $t12 := move($t4)
+ 24: $t3 := $t4
+ 25: trace_local[r_ref]($t4)
+ 26: $t13 := move($t4)
+ 27: $t14 := borrow_field<Trafo::R>.x($t4)
+ 28: Trafo::incr_ref($t14)
+ 29: $t15 := move($t2)
+ 30: trace_return[0]($t15)
+ 31: return $t15
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_5_livevar_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_5_livevar_analysis.bytecode
new file mode 100644
index 000000000..f474cec88
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_5_livevar_analysis.bytecode
@@ -0,0 +1,89 @@
+============ after processor `livevar_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     # live vars: r
+  0: trace_local[r]($t0)
+     # live vars: r
+  1: $t1 := read_ref($t0)
+     # live vars: r, $t1
+  2: $t2 := 1
+     # live vars: r, $t1, $t2
+  3: $t3 := +($t1, $t2)
+     # live vars: r, $t3
+  4: write_ref($t0, $t3)
+     # live vars: r
+  5: trace_local[r]($t0)
+     # live vars:
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+     # live vars: b
+  0: trace_local[b]($t0)
+     # live vars: b
+  1: $t5 := 1
+     # live vars: b, $t5
+  2: $t1 := pack Trafo::R($t5)
+     # live vars: b, r1
+  3: trace_local[r1]($t1)
+     # live vars: b, r1
+  4: $t6 := 2
+     # live vars: b, r1, $t6
+  5: $t2 := pack Trafo::R($t6)
+     # live vars: b, r1, r2
+  6: trace_local[r2]($t2)
+     # live vars: b, r1, r2
+  7: if ($t0) goto 10 else goto 8
+     # live vars: r2
+  8: label L1
+     # live vars: r2
+  9: goto 15
+     # live vars: r1, r2
+ 10: label L0
+     # live vars: r1, r2
+ 11: $t7 := borrow_local($t1)
+     # live vars: r2, $t7
+ 12: $t4 := $t7
+     # live vars: r2, tmp#$4, $t7
+ 13: trace_local[tmp#$4]($t7)
+     # live vars: r2, tmp#$4
+ 14: goto 19
+     # live vars: r2
+ 15: label L2
+     # live vars: r2
+ 16: $t8 := borrow_local($t2)
+     # live vars: r2, $t8
+ 17: $t4 := $t8
+     # live vars: r2, tmp#$4, $t8
+ 18: trace_local[tmp#$4]($t8)
+     # live vars: r2, tmp#$4
+ 19: label L3
+     # live vars: r2, tmp#$4
+ 20: trace_local[r_ref]($t4)
+     # live vars: r2, tmp#$4
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+     # live vars: r2, $t9
+ 22: Trafo::incr_ref($t9)
+     # live vars: r2
+ 23: $t10 := move($t2)
+     # live vars: $t10
+ 24: trace_return[0]($t10)
+     # live vars: $t10
+ 25: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_6_borrow_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_6_borrow_analysis.bytecode
new file mode 100644
index 000000000..8cc7b51a7
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_6_borrow_analysis.bytecode
@@ -0,0 +1,122 @@
+============ after processor `borrow_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+     # live_nodes: Reference($t0)
+  0: trace_local[r]($t0)
+     # live_nodes: Reference($t0)
+  1: $t1 := read_ref($t0)
+     # live_nodes: Reference($t0)
+  2: $t2 := 1
+     # live_nodes: Reference($t0)
+  3: $t3 := +($t1, $t2)
+     # live_nodes: Reference($t0)
+  4: write_ref($t0, $t3)
+     # live_nodes: Reference($t0)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[b]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := 1
+     # live_nodes: LocalRoot($t0)
+  2: $t1 := pack Trafo::R($t5)
+     # live_nodes: LocalRoot($t0)
+  3: trace_local[r1]($t1)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := 2
+     # live_nodes: LocalRoot($t0)
+  5: $t2 := pack Trafo::R($t6)
+     # live_nodes: LocalRoot($t0)
+  6: trace_local[r2]($t2)
+     # live_nodes: LocalRoot($t0)
+  7: if ($t0) goto 10 else goto 8
+     # live_nodes: LocalRoot($t0)
+  8: label L1
+     # live_nodes: LocalRoot($t0)
+  9: goto 15
+     # live_nodes: LocalRoot($t0)
+ 10: label L0
+     # live_nodes: LocalRoot($t0)
+ 11: $t7 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t7))}
+     # borrows_from: Reference($t7) -> {(*, LocalRoot($t1))}
+ 12: $t4 := $t7
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1))}
+ 13: trace_local[tmp#$4]($t7)
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1))}
+ 14: goto 19
+     # live_nodes: LocalRoot($t0)
+ 15: label L2
+     # live_nodes: LocalRoot($t0)
+ 16: $t8 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(*, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(*, LocalRoot($t2))}
+ 17: $t4 := $t8
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t2))}
+ 18: trace_local[tmp#$4]($t8)
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t2) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t2))}
+ 19: label L3
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t2) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t2))}
+ 20: trace_local[r_ref]($t4)
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # moved_nodes: Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t2) -> {(*, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t2))}
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # moved_nodes: Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t2) -> {(*, Reference($t4))}, Reference($t4) -> {(*, Reference($t9))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t2))}, Reference($t9) -> {(*, Reference($t4))}
+ 22: Trafo::incr_ref($t9)
+     # live_nodes: LocalRoot($t0)
+     # moved_nodes: Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t2) -> {(*, Reference($t4))}, Reference($t4) -> {(*, Reference($t9))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t2))}, Reference($t9) -> {(*, Reference($t4))}
+ 23: $t10 := move($t2)
+     # live_nodes: LocalRoot($t0)
+     # moved_nodes: LocalRoot($t2), Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t10) -> {(*, Reference($t4))}, Reference($t4) -> {(*, Reference($t9))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t10))}, Reference($t9) -> {(*, Reference($t4))}
+ 24: trace_return[0]($t10)
+     # live_nodes: LocalRoot($t0)
+     # moved_nodes: LocalRoot($t2), Reference($t7), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(*, Reference($t4))}, LocalRoot($t10) -> {(*, Reference($t4))}, Reference($t4) -> {(*, Reference($t9))}
+     # borrows_from: Reference($t4) -> {(*, LocalRoot($t1)), (*, LocalRoot($t10))}, Reference($t9) -> {(*, Reference($t4))}
+ 25: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_7_memory_instr.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_7_memory_instr.bytecode
new file mode 100644
index 000000000..919d0c1e6
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_7_memory_instr.bytecode
@@ -0,0 +1,61 @@
+============ after processor `memory_instr` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2)
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t1 := pack Trafo::R($t5)
+  3: trace_local[r1]($t1)
+  4: $t6 := 2
+  5: $t2 := pack Trafo::R($t6)
+  6: trace_local[r2]($t2)
+  7: if ($t0) goto 10 else goto 8
+  8: label L1
+  9: goto 16
+ 10: label L0
+ 11: $t7 := borrow_local($t1)
+ 12: $t4 := $t7
+ 13: write_back[LocalRoot($t1)]($t7)
+ 14: trace_local[tmp#$4]($t7)
+ 15: goto 21
+ 16: label L2
+ 17: $t8 := borrow_local($t2)
+ 18: $t4 := $t8
+ 19: write_back[LocalRoot($t2)]($t8)
+ 20: trace_local[tmp#$4]($t8)
+ 21: label L3
+ 22: trace_local[r_ref]($t4)
+ 23: $t9 := borrow_field<Trafo::R>.x($t4)
+ 24: Trafo::incr_ref($t9)
+ 25: write_back[Reference($t4)]($t9)
+ 26: write_back[LocalRoot($t1)]($t4)
+ 27: write_back[LocalRoot($t2)]($t4)
+ 28: $t10 := move($t2)
+ 29: trace_return[0]($t10)
+ 30: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_8_clean_and_optimize.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_8_clean_and_optimize.bytecode
new file mode 100644
index 000000000..bc415c2ba
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_8_clean_and_optimize.bytecode
@@ -0,0 +1,59 @@
+============ after processor `clean_and_optimize` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2)
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t1 := pack Trafo::R($t5)
+  3: trace_local[r1]($t1)
+  4: $t6 := 2
+  5: $t2 := pack Trafo::R($t6)
+  6: trace_local[r2]($t2)
+  7: if ($t0) goto 10 else goto 8
+  8: label L1
+  9: goto 15
+ 10: label L0
+ 11: $t7 := borrow_local($t1)
+ 12: $t4 := $t7
+ 13: trace_local[tmp#$4]($t7)
+ 14: goto 19
+ 15: label L2
+ 16: $t8 := borrow_local($t2)
+ 17: $t4 := $t8
+ 18: trace_local[tmp#$4]($t8)
+ 19: label L3
+ 20: trace_local[r_ref]($t4)
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+ 22: Trafo::incr_ref($t9)
+ 23: write_back[Reference($t4)]($t9)
+ 24: write_back[LocalRoot($t1)]($t4)
+ 25: write_back[LocalRoot($t2)]($t4)
+ 26: $t10 := move($t2)
+ 27: trace_return[0]($t10)
+ 28: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/references_9_usage_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/references_9_usage_analysis.bytecode
new file mode 100644
index 000000000..146a78d30
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/references_9_usage_analysis.bytecode
@@ -0,0 +1,59 @@
+============ after processor `usage_analysis` ================
+
+[variant baseline]
+pub fun Trafo::incr_ref($t0|r: &mut u64) {
+     var $t1: u64
+     var $t2: u64
+     var $t3: u64
+  0: trace_local[r]($t0)
+  1: $t1 := read_ref($t0)
+  2: $t2 := 1
+  3: $t3 := +($t1, $t2)
+  4: write_ref($t0, $t3)
+  5: trace_local[r]($t0)
+  6: return ()
+}
+
+
+[variant baseline]
+pub fun Trafo::use_incr_ref($t0|b: bool): Trafo::R {
+     var $t1|r1: Trafo::R
+     var $t2|r2: Trafo::R
+     var $t3|r_ref: &mut Trafo::R
+     var $t4|tmp#$4: &mut Trafo::R
+     var $t5: u64
+     var $t6: u64
+     var $t7: &mut Trafo::R
+     var $t8: &mut Trafo::R
+     var $t9: &mut u64
+     var $t10: Trafo::R
+  0: trace_local[b]($t0)
+  1: $t5 := 1
+  2: $t1 := pack Trafo::R($t5)
+  3: trace_local[r1]($t1)
+  4: $t6 := 2
+  5: $t2 := pack Trafo::R($t6)
+  6: trace_local[r2]($t2)
+  7: if ($t0) goto 10 else goto 8
+  8: label L1
+  9: goto 15
+ 10: label L0
+ 11: $t7 := borrow_local($t1)
+ 12: $t4 := $t7
+ 13: trace_local[tmp#$4]($t7)
+ 14: goto 19
+ 15: label L2
+ 16: $t8 := borrow_local($t2)
+ 17: $t4 := $t8
+ 18: trace_local[tmp#$4]($t8)
+ 19: label L3
+ 20: trace_local[r_ref]($t4)
+ 21: $t9 := borrow_field<Trafo::R>.x($t4)
+ 22: Trafo::incr_ref($t9)
+ 23: write_back[Reference($t4)]($t9)
+ 24: write_back[LocalRoot($t1)]($t4)
+ 25: write_back[LocalRoot($t2)]($t4)
+ 26: $t10 := move($t2)
+ 27: trace_return[0]($t10)
+ 28: return $t10
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/regen.sh b/vendors/move/crates/move-prover/tests/xsources/design/regen.sh
new file mode 100755
index 000000000..4d0ff0284
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/regen.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+
+# Regenerate bytecode dumps for all examples
+EXAMPLES="
+ modifies.move\
+ opaque.move\
+ references.move\
+ resource.move\
+ simple.move\
+ "
+
+for example in ${EXAMPLES}; do
+  cargo run -- -k --dump-bytecode ${example}
+done
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource.move b/vendors/move/crates/move-prover/tests/xsources/design/resource.move
new file mode 100644
index 000000000..1cd1986c2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource.move
@@ -0,0 +1,24 @@
+// flag: --v2
+address 0x0 {
+/// Example for resources.
+module Trafo {
+  use std::signer;
+
+  resource struct R { x: u64 }
+
+  public fun publish(account: &signer, x: u64) {
+      move_to<R>(account, R{x: x})
+  }
+  spec fun publish {
+      let addr = signer::address_of(account);
+      aborts_if exists<R>(addr);
+      ensures exists<R>(addr);
+      ensures global<R>(addr).x == x;
+  }
+
+  public fun dummy_need_signer_use_in_move(account: &signer): address {
+      // Move bug: we can't use signer in specs if not also used in code.
+      signer::address_of(account)
+  }
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_0_stackless.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_0_stackless.bytecode
new file mode 100644
index 000000000..e3c64992f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_0_stackless.bytecode
@@ -0,0 +1,35 @@
+============ after processor `stackless` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: &signer): address {
+     var $t1: &signer
+     var $t2: &address
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := Signer::borrow_address($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: &signer): address {
+     var $t1: &signer
+     var $t2: address
+  0: $t1 := move($t0)
+  1: $t2 := Signer::address_of($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: &signer, $t1|x: u64) {
+     var $t2: &signer
+     var $t3: u64
+     var $t4: Trafo::R
+  0: $t2 := move($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := pack Trafo::R($t3)
+  3: move_to<Trafo::R>($t4, $t2)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_10_verification_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_10_verification_analysis.bytecode
new file mode 100644
index 000000000..fac2e793f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_10_verification_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `verification_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+  0: trace_local[s]($t0)
+  1: $t1 := Signer::borrow_address($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: trace_local[account]($t0)
+  1: $t1 := Signer::address_of($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := pack Trafo::R($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_11_loop_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_11_loop_analysis.bytecode
new file mode 100644
index 000000000..b45a83dea
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_11_loop_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `loop_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+  0: trace_local[s]($t0)
+  1: $t1 := Signer::borrow_address($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: trace_local[account]($t0)
+  1: $t1 := Signer::address_of($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := pack Trafo::R($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_12_spec_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_12_spec_instrumenter.bytecode
new file mode 100644
index 000000000..3eedbaa75
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_12_spec_instrumenter.bytecode
@@ -0,0 +1,44 @@
+============ after processor `spec_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: assume WellFormed($t0)
+  1: trace_local[account]($t0)
+     # >> opaque call: $t1 := Signer::address_of($t0)
+  2: nop
+  3: assume Eq<address>($t1, Signer::spec_address_of($t0))
+  4: assume WellFormed($t1)
+     # << opaque call: $t1 := Signer::address_of($t0)
+  5: nop
+  6: trace_return[0]($t1)
+  7: label L1
+  8: return $t1
+}
+
+
+[variant verification]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  3: @0 := save_mem(Trafo::R)
+  4: trace_local[account]($t0)
+  5: trace_local[x]($t1)
+  6: $t2 := pack Trafo::R($t1)
+  7: move_to<Trafo::R>($t2, $t0) on_abort goto 13 with $t3
+  8: label L1
+     # VC: function does not abort under this condition at resource.move:14:7+26
+  9: assert Not(exists[@0]<Trafo::R>(Trafo::addr$2[]($t0)))
+     # VC: post-condition does not hold at resource.move:15:7+24
+ 10: assert exists<Trafo::R>(Trafo::addr$2($t0))
+     # VC: post-condition does not hold at resource.move:16:7+31
+ 11: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>(Trafo::addr$2($t0))), $t1)
+ 12: return ()
+ 13: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at resource.move:12:3+175
+ 14: assert exists[@0]<Trafo::R>(Trafo::addr$2[]($t0))
+ 15: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_13_data_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_13_data_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..ecaeeb3b0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_13_data_invariant_instrumenter.bytecode
@@ -0,0 +1,44 @@
+============ after processor `data_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: assume WellFormed($t0)
+  1: trace_local[account]($t0)
+     # >> opaque call: $t1 := Signer::address_of($t0)
+  2: nop
+  3: assume Eq<address>($t1, Signer::spec_address_of($t0))
+  4: assume WellFormed($t1)
+     # << opaque call: $t1 := Signer::address_of($t0)
+  5: nop
+  6: trace_return[0]($t1)
+  7: label L1
+  8: return $t1
+}
+
+
+[variant verification]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  3: @0 := save_mem(Trafo::R)
+  4: trace_local[account]($t0)
+  5: trace_local[x]($t1)
+  6: $t2 := pack Trafo::R($t1)
+  7: move_to<Trafo::R>($t2, $t0) on_abort goto 13 with $t3
+  8: label L1
+     # VC: function does not abort under this condition at resource.move:14:7+26
+  9: assert Not(exists[@0]<Trafo::R>(Trafo::addr$2[]($t0)))
+     # VC: post-condition does not hold at resource.move:15:7+24
+ 10: assert exists<Trafo::R>(Trafo::addr$2($t0))
+     # VC: post-condition does not hold at resource.move:16:7+31
+ 11: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>(Trafo::addr$2($t0))), $t1)
+ 12: return ()
+ 13: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at resource.move:12:3+175
+ 14: assert exists[@0]<Trafo::R>(Trafo::addr$2[]($t0))
+ 15: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_14_global_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_14_global_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..406f94b06
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_14_global_invariant_instrumenter.bytecode
@@ -0,0 +1,44 @@
+============ after processor `global_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: assume WellFormed($t0)
+  1: trace_local[account]($t0)
+     # >> opaque call: $t1 := Signer::address_of($t0)
+  2: nop
+  3: assume Eq<address>($t1, Signer::spec_address_of($t0))
+  4: assume WellFormed($t1)
+     # << opaque call: $t1 := Signer::address_of($t0)
+  5: nop
+  6: trace_return[0]($t1)
+  7: label L1
+  8: return $t1
+}
+
+
+[variant verification]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: assume forall $rsc: ResourceDomain<Trafo::R>(): WellFormed($rsc)
+  3: @0 := save_mem(Trafo::R)
+  4: trace_local[account]($t0)
+  5: trace_local[x]($t1)
+  6: $t2 := pack Trafo::R($t1)
+  7: move_to<Trafo::R>($t2, $t0) on_abort goto 13 with $t3
+  8: label L1
+     # VC: function does not abort under this condition at resource.move:14:7+26
+  9: assert Not(exists[@0]<Trafo::R>(Trafo::addr$2[]($t0)))
+     # VC: post-condition does not hold at resource.move:15:7+24
+ 10: assert exists<Trafo::R>(Trafo::addr$2($t0))
+     # VC: post-condition does not hold at resource.move:16:7+31
+ 11: assert Eq<u64>(select Trafo::R.x(global<Trafo::R>(Trafo::addr$2($t0))), $t1)
+ 12: return ()
+ 13: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at resource.move:12:3+175
+ 14: assert exists[@0]<Trafo::R>(Trafo::addr$2[]($t0))
+ 15: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_1_debug_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_1_debug_instrumenter.bytecode
new file mode 100644
index 000000000..e7f53b87e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_1_debug_instrumenter.bytecode
@@ -0,0 +1,41 @@
+============ after processor `debug_instrumenter` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: &signer): address {
+     var $t1: &signer
+     var $t2: &address
+     var $t3: address
+  0: trace_local[s]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::borrow_address($t1)
+  3: $t3 := read_ref($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: &signer): address {
+     var $t1: &signer
+     var $t2: address
+  0: trace_local[account]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::address_of($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: &signer, $t1|x: u64) {
+     var $t2: &signer
+     var $t3: u64
+     var $t4: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := move($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := pack Trafo::R($t3)
+  5: move_to<Trafo::R>($t4, $t2)
+  6: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_2_eliminate_imm_refs.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_2_eliminate_imm_refs.bytecode
new file mode 100644
index 000000000..dd83f5fe4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_2_eliminate_imm_refs.bytecode
@@ -0,0 +1,41 @@
+============ after processor `eliminate_imm_refs` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: signer
+     var $t2: address
+     var $t3: address
+  0: trace_local[s]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::borrow_address($t1)
+  3: $t3 := move($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: signer
+     var $t2: address
+  0: trace_local[account]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::address_of($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: signer
+     var $t3: u64
+     var $t4: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := move($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := pack Trafo::R($t3)
+  5: move_to<Trafo::R>($t4, $t2)
+  6: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_3_mut_ref_instrumentation.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_3_mut_ref_instrumentation.bytecode
new file mode 100644
index 000000000..54d30c46b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_3_mut_ref_instrumentation.bytecode
@@ -0,0 +1,41 @@
+============ after processor `mut_ref_instrumentation` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: signer
+     var $t2: address
+     var $t3: address
+  0: trace_local[s]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::borrow_address($t1)
+  3: $t3 := move($t2)
+  4: trace_return[0]($t3)
+  5: return $t3
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: signer
+     var $t2: address
+  0: trace_local[account]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::address_of($t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: signer
+     var $t3: u64
+     var $t4: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := move($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := pack Trafo::R($t3)
+  5: move_to<Trafo::R>($t4, $t2)
+  6: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_4_reaching_def_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_4_reaching_def_analysis.bytecode
new file mode 100644
index 000000000..63d61cb18
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_4_reaching_def_analysis.bytecode
@@ -0,0 +1,41 @@
+============ after processor `reaching_def_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: signer
+     var $t2: address
+     var $t3: address
+  0: trace_local[s]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::borrow_address($t0)
+  3: $t3 := move($t2)
+  4: trace_return[0]($t2)
+  5: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: signer
+     var $t2: address
+  0: trace_local[account]($t0)
+  1: $t1 := move($t0)
+  2: $t2 := Signer::address_of($t0)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: signer
+     var $t3: u64
+     var $t4: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := move($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := pack Trafo::R($t1)
+  5: move_to<Trafo::R>($t4, $t0)
+  6: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_5_livevar_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_5_livevar_analysis.bytecode
new file mode 100644
index 000000000..dadd20329
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_5_livevar_analysis.bytecode
@@ -0,0 +1,44 @@
+============ after processor `livevar_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+     # live vars: s
+  0: trace_local[s]($t0)
+     # live vars: s
+  1: $t1 := Signer::borrow_address($t0)
+     # live vars: $t1
+  2: trace_return[0]($t1)
+     # live vars: $t1
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+     # live vars: account
+  0: trace_local[account]($t0)
+     # live vars: account
+  1: $t1 := Signer::address_of($t0)
+     # live vars: $t1
+  2: trace_return[0]($t1)
+     # live vars: $t1
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+     # live vars: account, x
+  0: trace_local[account]($t0)
+     # live vars: account, x
+  1: trace_local[x]($t1)
+     # live vars: account, x
+  2: $t2 := pack Trafo::R($t1)
+     # live vars: account, $t2
+  3: move_to<Trafo::R>($t2, $t0)
+     # live vars:
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_6_borrow_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_6_borrow_analysis.bytecode
new file mode 100644
index 000000000..878aae1f0
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_6_borrow_analysis.bytecode
@@ -0,0 +1,44 @@
+============ after processor `borrow_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[s]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := Signer::borrow_address($t0)
+     # live_nodes: LocalRoot($t0)
+  2: trace_return[0]($t1)
+     # live_nodes: LocalRoot($t0)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+     # live_nodes: LocalRoot($t0)
+  0: trace_local[account]($t0)
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := Signer::address_of($t0)
+     # live_nodes: LocalRoot($t0)
+  2: trace_return[0]($t1)
+     # live_nodes: LocalRoot($t0)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  0: trace_local[account]($t0)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  1: trace_local[x]($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  2: $t2 := pack Trafo::R($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_7_memory_instr.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_7_memory_instr.bytecode
new file mode 100644
index 000000000..dc2dba129
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_7_memory_instr.bytecode
@@ -0,0 +1,31 @@
+============ after processor `memory_instr` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+  0: trace_local[s]($t0)
+  1: $t1 := Signer::borrow_address($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: trace_local[account]($t0)
+  1: $t1 := Signer::address_of($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := pack Trafo::R($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_8_clean_and_optimize.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_8_clean_and_optimize.bytecode
new file mode 100644
index 000000000..8e5f56cc3
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_8_clean_and_optimize.bytecode
@@ -0,0 +1,31 @@
+============ after processor `clean_and_optimize` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+  0: trace_local[s]($t0)
+  1: $t1 := Signer::borrow_address($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: trace_local[account]($t0)
+  1: $t1 := Signer::address_of($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := pack Trafo::R($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/resource_9_usage_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/resource_9_usage_analysis.bytecode
new file mode 100644
index 000000000..8073513a7
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/resource_9_usage_analysis.bytecode
@@ -0,0 +1,31 @@
+============ after processor `usage_analysis` ================
+
+[variant baseline]
+pub fun Signer::address_of($t0|s: signer): address {
+     var $t1: address
+  0: trace_local[s]($t0)
+  1: $t1 := Signer::borrow_address($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::dummy_need_signer_use_in_move($t0|account: signer): address {
+     var $t1: address
+  0: trace_local[account]($t0)
+  1: $t1 := Signer::address_of($t0)
+  2: trace_return[0]($t1)
+  3: return $t1
+}
+
+
+[variant baseline]
+pub fun Trafo::publish($t0|account: signer, $t1|x: u64) {
+     var $t2: Trafo::R
+  0: trace_local[account]($t0)
+  1: trace_local[x]($t1)
+  2: $t2 := pack Trafo::R($t1)
+  3: move_to<Trafo::R>($t2, $t0)
+  4: return ()
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple.move b/vendors/move/crates/move-prover/tests/xsources/design/simple.move
new file mode 100644
index 000000000..a8634f93e
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple.move
@@ -0,0 +1,15 @@
+// flag: --v2
+address 0x0 {
+/// Example for simple pre/post conditions.
+module Trafo {
+
+  public fun div(x: u64, y: u64): u64 {
+      x / y
+  }
+  spec fun div {
+      aborts_if y == 0;
+      ensures result == x / y;
+  }
+
+}
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_0_stackless.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_0_stackless.bytecode
new file mode 100644
index 000000000..c3cf23bf7
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_0_stackless.bytecode
@@ -0,0 +1,12 @@
+============ after processor `stackless` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := /($t2, $t3)
+  3: return $t4
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_10_verification_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_10_verification_analysis.bytecode
new file mode 100644
index 000000000..f7884e038
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_10_verification_analysis.bytecode
@@ -0,0 +1,11 @@
+============ after processor `verification_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := /($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_11_loop_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_11_loop_analysis.bytecode
new file mode 100644
index 000000000..0e612d69a
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_11_loop_analysis.bytecode
@@ -0,0 +1,11 @@
+============ after processor `loop_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := /($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_12_spec_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_12_spec_instrumenter.bytecode
new file mode 100644
index 000000000..d5c9f9ad4
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_12_spec_instrumenter.bytecode
@@ -0,0 +1,23 @@
+============ after processor `spec_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: trace_local[x]($t0)
+  3: trace_local[y]($t1)
+  4: $t2 := /($t0, $t1) on_abort goto 10 with $t3
+  5: trace_return[0]($t2)
+  6: label L1
+     # VC: function does not abort under this condition at simple.move:10:7+17
+  7: assert Not(Eq<u64>($t1, 0))
+     # VC: post-condition does not hold at simple.move:11:7+24
+  8: assert Eq<u64>($t2, Div($t0, $t1))
+  9: return $t2
+ 10: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at simple.move:9:3+73
+ 11: assert Eq<u64>($t1, 0)
+ 12: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_13_data_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_13_data_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..fe9708cf9
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_13_data_invariant_instrumenter.bytecode
@@ -0,0 +1,23 @@
+============ after processor `data_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: trace_local[x]($t0)
+  3: trace_local[y]($t1)
+  4: $t2 := /($t0, $t1) on_abort goto 10 with $t3
+  5: trace_return[0]($t2)
+  6: label L1
+     # VC: function does not abort under this condition at simple.move:10:7+17
+  7: assert Not(Eq<u64>($t1, 0))
+     # VC: post-condition does not hold at simple.move:11:7+24
+  8: assert Eq<u64>($t2, Div($t0, $t1))
+  9: return $t2
+ 10: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at simple.move:9:3+73
+ 11: assert Eq<u64>($t1, 0)
+ 12: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_14_global_invariant_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_14_global_invariant_instrumenter.bytecode
new file mode 100644
index 000000000..6a0deae9b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_14_global_invariant_instrumenter.bytecode
@@ -0,0 +1,23 @@
+============ after processor `global_invariant_instrumenter` ================
+
+[variant verification]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: num
+  0: assume WellFormed($t0)
+  1: assume WellFormed($t1)
+  2: trace_local[x]($t0)
+  3: trace_local[y]($t1)
+  4: $t2 := /($t0, $t1) on_abort goto 10 with $t3
+  5: trace_return[0]($t2)
+  6: label L1
+     # VC: function does not abort under this condition at simple.move:10:7+17
+  7: assert Not(Eq<u64>($t1, 0))
+     # VC: post-condition does not hold at simple.move:11:7+24
+  8: assert Eq<u64>($t2, Div($t0, $t1))
+  9: return $t2
+ 10: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at simple.move:9:3+73
+ 11: assert Eq<u64>($t1, 0)
+ 12: abort($t3)
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_1_debug_instrumenter.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_1_debug_instrumenter.bytecode
new file mode 100644
index 000000000..c2546cf3f
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_1_debug_instrumenter.bytecode
@@ -0,0 +1,15 @@
+============ after processor `debug_instrumenter` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := copy($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := /($t2, $t3)
+  5: trace_return[0]($t4)
+  6: return $t4
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_2_eliminate_imm_refs.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_2_eliminate_imm_refs.bytecode
new file mode 100644
index 000000000..43b2e8911
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_2_eliminate_imm_refs.bytecode
@@ -0,0 +1,15 @@
+============ after processor `eliminate_imm_refs` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := copy($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := /($t2, $t3)
+  5: trace_return[0]($t4)
+  6: return $t4
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_3_mut_ref_instrumentation.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_3_mut_ref_instrumentation.bytecode
new file mode 100644
index 000000000..bcf8a7d05
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_3_mut_ref_instrumentation.bytecode
@@ -0,0 +1,15 @@
+============ after processor `mut_ref_instrumentation` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := copy($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := /($t2, $t3)
+  5: trace_return[0]($t4)
+  6: return $t4
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_4_reaching_def_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_4_reaching_def_analysis.bytecode
new file mode 100644
index 000000000..4fa8f2424
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_4_reaching_def_analysis.bytecode
@@ -0,0 +1,15 @@
+============ after processor `reaching_def_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := copy($t0)
+  3: $t3 := copy($t1)
+  4: $t4 := /($t0, $t1)
+  5: trace_return[0]($t4)
+  6: return $t4
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_5_livevar_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_5_livevar_analysis.bytecode
new file mode 100644
index 000000000..54d9470e1
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_5_livevar_analysis.bytecode
@@ -0,0 +1,16 @@
+============ after processor `livevar_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     # live vars: x, y
+  0: trace_local[x]($t0)
+     # live vars: x, y
+  1: trace_local[y]($t1)
+     # live vars: x, y
+  2: $t2 := /($t0, $t1)
+     # live vars: $t2
+  3: trace_return[0]($t2)
+     # live vars: $t2
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_6_borrow_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_6_borrow_analysis.bytecode
new file mode 100644
index 000000000..167ef1e4b
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_6_borrow_analysis.bytecode
@@ -0,0 +1,16 @@
+============ after processor `borrow_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  0: trace_local[x]($t0)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  1: trace_local[y]($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  2: $t2 := /($t0, $t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  3: trace_return[0]($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_7_memory_instr.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_7_memory_instr.bytecode
new file mode 100644
index 000000000..7a8ce8eae
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_7_memory_instr.bytecode
@@ -0,0 +1,11 @@
+============ after processor `memory_instr` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := /($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_8_clean_and_optimize.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_8_clean_and_optimize.bytecode
new file mode 100644
index 000000000..369147d57
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_8_clean_and_optimize.bytecode
@@ -0,0 +1,11 @@
+============ after processor `clean_and_optimize` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := /($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/design/simple_9_usage_analysis.bytecode b/vendors/move/crates/move-prover/tests/xsources/design/simple_9_usage_analysis.bytecode
new file mode 100644
index 000000000..4f0fa1a91
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/design/simple_9_usage_analysis.bytecode
@@ -0,0 +1,11 @@
+============ after processor `usage_analysis` ================
+
+[variant baseline]
+pub fun Trafo::div($t0|x: u64, $t1|y: u64): u64 {
+     var $t2: u64
+  0: trace_local[x]($t0)
+  1: trace_local[y]($t1)
+  2: $t2 := /($t0, $t1)
+  3: trace_return[0]($t2)
+  4: return $t2
+}
diff --git a/vendors/move/crates/move-prover/tests/xsources/timeout/empty.move b/vendors/move/crates/move-prover/tests/xsources/timeout/empty.move
new file mode 100644
index 000000000..e37947f73
--- /dev/null
+++ b/vendors/move/crates/move-prover/tests/xsources/timeout/empty.move
@@ -0,0 +1 @@
+// Need at least one source in this tree
diff --git a/vendors/move/crates/move-prover/tools/check_pr.sh b/vendors/move/crates/move-prover/tools/check_pr.sh
new file mode 100755
index 000000000..ec57f7370
--- /dev/null
+++ b/vendors/move/crates/move-prover/tools/check_pr.sh
@@ -0,0 +1,175 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# A script to check whether a local commit related to Move repo is ready for a PR.
+
+set -e
+
+BUILD_MODE=--release
+
+BASE=$(git rev-parse --show-toplevel)
+echo "*************** [check-pr] Assuming move root at $BASE"
+
+# Run only tests which would also be run on CI
+export ENV_TEST_ON_CI=1
+
+while getopts "hcxtdgmea" opt; do
+  case $opt in
+    h)
+      cat <<EOF
+Usage:
+    check_pr <flags>
+Flags:
+    -h   Print this help
+    -c   Check the core prover crates using cargo xfmt/xclippy.
+         This is the default if no flags are provided.
+    -x   Like -c, but adds more crates (specifically all which depend
+         on move-model)
+    -t   In addition to xfmt/xclippy, run cargo test
+    -d   Run documentation generation, abi generation, etc. for move-stdlib
+         and other tested frameworks.
+    -g   Run the Move git checks script (whitespace check). This works
+         only for committed clients.
+    -m   Run the Move unit and verification tests.
+    -e   Run the Move e2e tests
+    -a   Run all of the above
+EOF
+      exit 1
+      ;;
+    c)
+      CHECK=1
+      ;;
+    x)
+      CHECK=1
+      CHECK_MORE=1
+      ;;
+    d)
+      GEN_ARTIFACTS=1
+      ;;
+    g)
+      GIT_CHECKS=1
+      ;;
+    t)
+      ALSO_TEST=1
+      ;;
+    m)
+      MOVE_TESTS=1
+      ;;
+    e)
+      MOVE_E2E_TESTS=1
+      ;;
+    a)
+      CHECK=1
+      CHECK_MORE=1
+      GEN_ARTIFACTS=1
+      GIT_CHECKS=1
+      ALSO_TEST=1
+      MOVE_TESTS=1
+      MOVE_E2E_TESTS=1
+      ;;
+  esac
+done
+
+if [ "$OPTIND" -eq 1 ]; then
+  CHECK=1
+fi
+
+
+CRATES="\
+  $BASE/language/move-prover/bytecode \
+  $BASE/language/move-prover/boogie-backend \
+  $BASE/language/move-prover\
+  $BASE/language/move-model\
+"
+
+if [ ! -z "$CHECKMORE" ]; then
+  CRATES="$CRATES \
+    $BASE/language/move-prover/move-abigen\
+    $BASE/language/move-prover/move-docgen\
+    $BASE/language/move-prover/errmapgen\
+    $BASE/language/move-prover/interpreter\
+    $BASE/language/move-prover/interpreter-testsuite\
+    $BASE/language/move-prover/lab\
+    $BASE/language/move-prover/test-utils\
+    $BASE/language/tools/move-package\
+    $BASE/language/tools/move-cli\
+    $BASE/language/tools/move-unit-test\
+  "
+fi
+
+ARTIFACT_CRATES="\
+  $BASE/language/move-stdlib\
+"
+
+BUILD_EXPERIMENTAL=""
+
+MOVE_TEST_CRATES="\
+  $BASE/language/move-stdlib\
+"
+
+MOVE_E2E_TEST_CRATES="\
+  $BASE/language/move-compiler\
+  $BASE/language/move-compiler/transactional-tests\
+  $BASE/language/move-stdlib\
+"
+# test failure?  $BASE/language/tools/move-cli\
+
+
+if [ ! -z "$CHECK" ]; then
+  for dir in $CRATES; do
+    echo "*************** [check-pr] Checking crate $dir"
+    (
+      cd $dir
+      if [ ! -z "$ALSO_TEST" ]; then
+        cargo test $BUILD_MODE
+      fi
+      cargo xfmt
+      cargo xclippy
+      cargo xlint
+    )
+  done
+fi
+
+if [ ! -z "$GEN_ARTIFACTS" ]; then
+  for dir in $ARTIFACT_CRATES; do
+    echo "*************** [check-pr] Generating artifacts for crate $dir"
+    (
+      cd $dir
+      cargo run $BUILD_MODE
+    )
+    if [[  "$BUILD_EXPERIMENTAL" == "$dir"  ]]; then
+        echo "Building additional experimental artifact in $dir"
+        (
+            cd $dir
+            cargo run -- --package experimental
+        )
+    fi
+  done
+fi
+
+if [ ! -z "$GIT_CHECKS" ]; then
+   echo "*************** [check-pr] Move git checks"
+   $BASE/scripts/git-checks.sh
+fi
+
+if [ ! -z "$MOVE_TESTS" ]; then
+  for dir in $MOVE_TEST_CRATES; do
+    echo "*************** [check-pr] Move tests $dir"
+    (
+      cd $dir
+      cargo test $BUILD_MODE
+    )
+  done
+fi
+
+if [ ! -z "$MOVE_E2E_TESTS" ]; then
+  for dir in $MOVE_E2E_TEST_CRATES; do
+    echo "*************** [check-pr] Move e2e tests $dir"
+    (
+      cd $dir
+      cargo test $BUILD_MODE
+    )
+  done
+fi
diff --git a/vendors/move/crates/move-prover/tools/check_stability.sh b/vendors/move/crates/move-prover/tools/check_stability.sh
new file mode 100755
index 000000000..032cc9af2
--- /dev/null
+++ b/vendors/move/crates/move-prover/tools/check_stability.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# A script to check stability of a verification outcome. This runs the same prover
+# task N times with different random seeds and checks whether the produced output
+# (diagnosis or success) stays stable. Use as in
+#
+#     check_stability.sh <move-source> N
+#
+# TODO: we should add here some logic to measure and compare verification timing.
+
+set -e
+
+PROVER="cargo run -q -p move-prover --release -- -v=error --stable-test-output"
+BASELINE="check_stability.out"
+
+$PROVER $1 > $BASELINE 2>&1 || true
+for n in $(seq 1 $2); do
+  rand=$RANDOM
+  echo "experiment #$n with seed $rand"
+  mv $BASELINE $BASELINE.last
+  $PROVER --seed=$rand $1 > $BASELINE 2>&1 || true
+  if [[ $(diff $BASELINE.last $BASELINE) ]]; then
+    echo "not stable"
+    exit 1
+  fi
+done
diff --git a/vendors/move/crates/move-prover/tools/migrate_spec_fun_syntax.sh b/vendors/move/crates/move-prover/tools/migrate_spec_fun_syntax.sh
new file mode 100755
index 000000000..dd4fc95ff
--- /dev/null
+++ b/vendors/move/crates/move-prover/tools/migrate_spec_fun_syntax.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# A script to upgrade from `spec fun name` style syntax and related changes to `spec name`. This can create
+# errors, specifically the last replacement for `define ` might be critical, so to be used with care.
+
+# NOTE: this script is not idempotent. Running it twice will result in invalid syntax.
+
+for file in "$@"; do
+  echo "migrating $file"
+  sed -i 's/spec fun/spec/' $file
+  sed -i 's/spec struct/spec/' $file
+  sed -i 's/spec define/spec fun/' $file
+  sed -i 's/define /fun /' $file
+  sed -i 's/ \[global\]//' $file
+done
diff --git a/vendors/move/crates/move-read-write-set-types/Cargo.toml b/vendors/move/crates/move-read-write-set-types/Cargo.toml
new file mode 100644
index 000000000..022599391
--- /dev/null
+++ b/vendors/move/crates/move-read-write-set-types/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "move-read-write-set-types"
+version = "0.0.3"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Type definition for read/write set inference for Move bytecode programs"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = ["crates-io"]
+edition = "2021"
+
+[dependencies]
+move-binary-format.workspace = true
+move-core-types.workspace = true
+serde.workspace = true
diff --git a/vendors/move/crates/move-read-write-set-types/src/access.rs b/vendors/move/crates/move-read-write-set-types/src/access.rs
new file mode 100644
index 000000000..69624e390
--- /dev/null
+++ b/vendors/move/crates/move-read-write-set-types/src/access.rs
@@ -0,0 +1,46 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+
+/// An access to local or global state
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+pub enum Access {
+    /// Read via RHS * or exists
+    Read,
+    /// Written via LHS *, move_to, or move_from
+    Write,
+    /// Could be read or written
+    ReadWrite,
+}
+
+impl Access {
+    pub fn is_read(&self) -> bool {
+        match self {
+            Access::Read | Access::ReadWrite => true,
+            Access::Write => false,
+        }
+    }
+
+    pub fn is_write(&self) -> bool {
+        match self {
+            Access::Write | Access::ReadWrite => true,
+            Access::Read => false,
+        }
+    }
+}
+
+impl PartialOrd for Access {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self == other {
+            return Some(Ordering::Equal);
+        }
+        match (self, other) {
+            (Access::ReadWrite, _) => Some(Ordering::Greater),
+            (_, Access::ReadWrite) => Some(Ordering::Less),
+            _ => None,
+        }
+    }
+}
diff --git a/vendors/move/crates/move-read-write-set-types/src/lib.rs b/vendors/move/crates/move-read-write-set-types/src/lib.rs
new file mode 100644
index 000000000..1e49b4558
--- /dev/null
+++ b/vendors/move/crates/move-read-write-set-types/src/lib.rs
@@ -0,0 +1,323 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod access;
+
+pub use access::Access;
+
+use move_binary_format::normalized::Type;
+use move_core_types::{
+    account_address::AccountAddress,
+    language_storage::{ResourceKey, TypeTag},
+};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::btree_map::BTreeMap,
+    fmt::{self, Formatter},
+};
+
+/// Offset of an access path: either a field, vector index, or global key
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum Offset {
+    /// Index into contents of a struct by field offset
+    Field(usize),
+    /// Unknown index into a vector
+    VectorIndex,
+    /// A type index into global storage. Only follows a field or vector index of type address
+    Global(Type),
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct TrieNode {
+    /// Optional data associated with the parent in the trie
+    data: Option<Access>,
+    /// Child pointers labeled by offsets
+    children: BTreeMap<Offset, TrieNode>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum RootAddress {
+    Const(AccountAddress),
+    Formal(usize),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Root {
+    pub root: RootAddress,
+    pub type_: Type,
+}
+
+#[derive(Debug, Clone)]
+pub struct AccessPath {
+    pub root: Root,
+    pub offsets: Vec<Offset>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct ReadWriteSet(BTreeMap<Root, TrieNode>);
+
+impl Root {
+    fn subst_actuals(&self, type_actuals: &[Type], actuals: &[Option<AccountAddress>]) -> Self {
+        let root_address = match &self.root {
+            RootAddress::Const(addr) => RootAddress::Const(*addr),
+            RootAddress::Formal(i) => {
+                if let Some(addr) = actuals.get(*i).and_then(|v| *v) {
+                    RootAddress::Const(addr)
+                } else {
+                    panic!("Type parameter index out of bound")
+                }
+            }
+        };
+        Self {
+            root: root_address,
+            type_: self.type_.subst(type_actuals),
+        }
+    }
+}
+
+impl AccessPath {
+    pub fn offset(&self) -> &[Offset] {
+        self.offsets.as_slice()
+    }
+    pub fn root(&self) -> &Root {
+        &self.root
+    }
+    pub fn add_offset(&mut self, offset: Offset) {
+        self.offsets.push(offset)
+    }
+    pub fn new_global_constant(addr: AccountAddress, ty: Type) -> Self {
+        Self {
+            root: Root {
+                root: RootAddress::Const(addr),
+                type_: ty,
+            },
+            offsets: vec![],
+        }
+    }
+    pub fn has_secondary_index(&self) -> bool {
+        self.offsets.iter().any(|offset| match offset {
+            Offset::Global(_) => true,
+            Offset::Field(_) | Offset::VectorIndex => false,
+        })
+    }
+}
+
+impl Offset {
+    fn sub_type_actuals(&self, type_actuals: &[Type]) -> Self {
+        match self {
+            Offset::Global(s) => Offset::Global(s.subst(type_actuals)),
+            Offset::Field(_) | Offset::VectorIndex => self.clone(),
+        }
+    }
+}
+
+impl TrieNode {
+    pub fn new() -> Self {
+        Self {
+            data: None,
+            children: BTreeMap::new(),
+        }
+    }
+
+    fn iter_paths_opt<F>(&self, access_path: &AccessPath, f: &mut F)
+    where
+        F: FnMut(&AccessPath, &Access),
+    {
+        if let Some(access) = &self.data {
+            f(access_path, access);
+        }
+        for (k, v) in self.children.iter() {
+            let mut new_ap = access_path.clone();
+            new_ap.offsets.push(k.clone());
+            v.iter_paths_opt(&new_ap, f)
+        }
+    }
+
+    fn sub_type_actuals(&self, type_actuals: &[Type]) -> Self {
+        Self {
+            data: self.data,
+            children: self
+                .children
+                .iter()
+                .map(|(offset, node)| {
+                    (
+                        offset.sub_type_actuals(type_actuals),
+                        node.sub_type_actuals(type_actuals),
+                    )
+                })
+                .collect::<BTreeMap<_, _>>(),
+        }
+    }
+
+    fn get_access(&self) -> Option<Access> {
+        self.get_access_impl(None)
+    }
+
+    fn get_access_impl(&self, mut acc: Option<Access>) -> Option<Access> {
+        acc = match (self.data, acc) {
+            (Some(lhs), Some(rhs)) => {
+                if lhs != rhs {
+                    Some(Access::ReadWrite)
+                } else {
+                    Some(lhs)
+                }
+            }
+            (Some(_), None) => self.data,
+            (None, _) => acc,
+        };
+        for (_, children) in self.children.iter() {
+            acc = children.get_access_impl(acc)
+        }
+        acc
+    }
+}
+
+impl ReadWriteSet {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    pub fn trim(&self) -> Self {
+        Self(
+            self.0
+                .iter()
+                .map(|(root, node)| {
+                    (
+                        root.clone(),
+                        TrieNode {
+                            data: node.get_access(),
+                            children: BTreeMap::new(),
+                        },
+                    )
+                })
+                .collect(),
+        )
+    }
+
+    pub fn add_access_path(&mut self, access_path: AccessPath, access: Access) {
+        let mut node = self.0.entry(access_path.root).or_insert_with(TrieNode::new);
+        for offset in access_path.offsets {
+            node = node.children.entry(offset).or_insert_with(TrieNode::new);
+        }
+        node.data = Some(access);
+    }
+
+    fn iter_paths_impl<F>(&self, mut f: F) -> Option<()>
+    where
+        F: FnMut(&AccessPath, &Access) -> Option<()>,
+    {
+        let mut result = Some(());
+        for (key, node) in self.0.iter() {
+            let access_path = AccessPath {
+                root: key.clone(),
+                offsets: vec![],
+            };
+            node.iter_paths_opt(&access_path, &mut |access_path, access| {
+                if result.is_none() {
+                    return;
+                }
+                result = f(access_path, access);
+            });
+        }
+        result
+    }
+
+    pub fn iter_paths<F>(&self, f: F) -> Option<()>
+    where
+        F: FnMut(&AccessPath, &Access) -> Option<()>,
+    {
+        self.iter_paths_impl(f)
+    }
+
+    fn get_keys_(&self, is_write: bool) -> Option<Vec<ResourceKey>> {
+        let mut results = vec![];
+        for (key, node) in self.0.iter() {
+            let keep = match node.get_access() {
+                Some(access) => {
+                    if is_write {
+                        access.is_write()
+                    } else {
+                        access.is_read()
+                    }
+                }
+                None => false,
+            };
+            if keep {
+                match key.root {
+                    RootAddress::Const(addr) => {
+                        results.push(ResourceKey::new(addr, key.type_.clone().into_struct_tag()?))
+                    }
+                    RootAddress::Formal(_) => return None,
+                }
+            }
+        }
+        Some(results)
+    }
+
+    pub fn get_keys_written(&self) -> Option<Vec<ResourceKey>> {
+        self.get_keys_(true)
+    }
+
+    pub fn get_keys_read(&self) -> Option<Vec<ResourceKey>> {
+        self.get_keys_(false)
+    }
+
+    pub fn sub_actuals(
+        &self,
+        actuals: &[Option<AccountAddress>],
+        type_actuals: &[TypeTag],
+    ) -> Self {
+        let types: Vec<_> = type_actuals
+            .iter()
+            .map(|ty| Type::from(ty.clone()))
+            .collect();
+        Self(
+            self.0
+                .iter()
+                .map(|(root, node)| {
+                    (
+                        root.subst_actuals(&types, actuals),
+                        node.sub_type_actuals(&types),
+                    )
+                })
+                .collect::<BTreeMap<_, _>>(),
+        )
+    }
+}
+
+impl fmt::Display for Root {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.root {
+            RootAddress::Const(addr) => write!(f, "0x{}", addr.short_str_lossless())?,
+            RootAddress::Formal(i) => write!(f, "Formal({})", i)?,
+        };
+        write!(f, "/{}", self.type_)
+    }
+}
+impl fmt::Display for Offset {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            Offset::Global(ty) => write!(f, "{}", ty),
+            Offset::VectorIndex => write!(f, "[_]"),
+            Offset::Field(i) => write!(f, "{:?}", i),
+        }
+    }
+}
+impl fmt::Display for AccessPath {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.root)?;
+        for offset in &self.offsets {
+            f.write_str("/")?;
+            write!(f, "{}", offset)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Display for ReadWriteSet {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        self.iter_paths(|path, v| writeln!(f, "{}: {:?}", path, v).ok());
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/Cargo.toml b/vendors/move/crates/move-stackless-bytecode-interpreter/Cargo.toml
new file mode 100644
index 000000000..06a66799e
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-stackless-bytecode-interpreter"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# diem dependencies
+move-stackless-bytecode.workspace = true
+bytecode-interpreter-crypto.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-model.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+codespan-reporting.workspace = true
+itertools.workspace = true
+num.workspace = true
+clap.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-prover-test-utils.workspace = true
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/evaluator.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/evaluator.rs
new file mode 100644
index 000000000..bee5a2764
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/evaluator.rs
@@ -0,0 +1,1375 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file implements the expression evaluation part of the stackless bytecode interpreter.
+
+use itertools::Itertools;
+use num::{BigInt, ToPrimitive, Zero};
+use std::{cell::Cell, collections::BTreeMap, rc::Rc};
+
+use move_core_types::{account_address::AccountAddress, u256};
+use move_model::{
+    ast::{
+        Exp, ExpData, LocalVarDecl, MemoryLabel, Operation, QuantKind, SpecFunDecl, TempIndex,
+        Value,
+    },
+    model::{FieldId, ModuleEnv, ModuleId, NodeId, SpecFunId, StructId},
+    ty as MTy,
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget, function_target_pipeline::FunctionTargetsHolder,
+};
+
+use crate::{
+    concrete::{
+        local_state::LocalState,
+        player,
+        settings::InterpreterSettings,
+        ty::{convert_model_base_type, convert_model_struct_type, BaseType, StructInstantiation},
+        value::{BaseValue, EvalState, GlobalState, TypedValue},
+    },
+    shared::{ident::StructIdent, variant::choose_variant},
+};
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+pub type EvalResult<T> = ::std::result::Result<T, BigInt>;
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+const DIEM_CORE_ADDR: AccountAddress = AccountAddress::ONE;
+
+//**************************************************************************************************
+// Evaluation context
+//**************************************************************************************************
+
+#[derive(Debug, Clone, Eq, PartialEq, Default)]
+pub struct ExpState {
+    // bindings for the local variables
+    local_vars: BTreeMap<String, BaseValue>,
+    // bindings for lambda functions
+    local_lambdas: BTreeMap<String, (Vec<LocalVarDecl>, Exp)>,
+}
+
+impl ExpState {
+    pub fn add_var(&mut self, name: String, val: BaseValue) {
+        let exists = self.local_vars.insert(name, val);
+        if cfg!(debug_assertions) {
+            assert!(exists.is_none());
+        }
+    }
+
+    pub fn get_var(&self, name: &str) -> BaseValue {
+        self.local_vars.get(name).unwrap().clone()
+    }
+
+    pub fn add_lambda(&mut self, name: String, vars: Vec<LocalVarDecl>, stmt: Exp) {
+        let exists = self.local_lambdas.insert(name, (vars, stmt));
+        if cfg!(debug_assertions) {
+            assert!(exists.is_none());
+        }
+    }
+
+    pub fn get_lambda(&self, name: &str) -> &(Vec<LocalVarDecl>, Exp) {
+        self.local_lambdas.get(name).unwrap()
+    }
+}
+
+pub struct Evaluator<'env> {
+    // context
+    holder: &'env FunctionTargetsHolder,
+    target: &'env FunctionTarget<'env>,
+    ty_args: &'env [BaseType],
+    // debug
+    level: Cell<usize>,
+    // states
+    exp_state: ExpState,
+    eval_state: &'env EvalState,
+    local_state: &'env LocalState,
+    global_state: &'env GlobalState,
+}
+
+impl<'env> Evaluator<'env> {
+    pub fn new(
+        holder: &'env FunctionTargetsHolder,
+        target: &'env FunctionTarget<'env>,
+        ty_args: &'env [BaseType],
+        level: usize,
+        exp_state: ExpState,
+        eval_state: &'env EvalState,
+        local_state: &'env LocalState,
+        global_state: &'env GlobalState,
+    ) -> Self {
+        Self {
+            holder,
+            target,
+            ty_args,
+            level: Cell::new(level),
+            exp_state,
+            eval_state,
+            local_state,
+            global_state,
+        }
+    }
+
+    //
+    // entry points
+    //
+
+    /// Check whether an assert expression holds
+    pub fn check_assert(&self, exp: &Exp) {
+        match self.evaluate(exp) {
+            Ok(val) => {
+                if !val.into_bool() {
+                    self.record_checking_failure(exp);
+                }
+            }
+            Err(err) => {
+                // TODO (mengxu) this is just to keep tests happy, to be removed once completed
+                if err == BigInt::zero() {
+                    return;
+                }
+                self.record_evaluation_failure(exp, "unexpected error code");
+            }
+        }
+    }
+
+    /// Check whether an assume expression holds, unless the assume expression represents a `let`
+    /// binding. In that case, return the `TypedValue` of the let-binding as well as the local
+    /// variable (index) the value should bind to.
+    pub fn check_assume(&self, exp: &Exp) -> Option<EvalResult<(TempIndex, TypedValue)>> {
+        // NOTE: `let` bindings are translated to `Assume(Identical($t, <exp>));`. This should be
+        // treated as an assignment.
+        if let ExpData::Call(_, Operation::Identical, args) = exp.as_ref() {
+            if cfg!(debug_assertions) {
+                assert_eq!(args.len(), 2);
+            }
+            let env = self.target.global_env();
+            let (local_idx, local_ty) = match args[0].as_ref() {
+                ExpData::Temporary(node_id, idx) => {
+                    let node_ty = env.get_node_type(*node_id);
+                    let local_ty = convert_model_base_type(env, &node_ty, self.ty_args);
+                    (*idx, local_ty)
+                }
+                _ => unreachable!(),
+            };
+            if cfg!(debug_assertions) {
+                assert_eq!(
+                    &local_ty,
+                    self.local_state.get_type(local_idx).get_base_type()
+                );
+            }
+            match self.evaluate(&args[1]) {
+                Ok(val) => Some(Ok((local_idx, TypedValue::fuse_base(local_ty, val)))),
+                Err(err) => Some(Err(err)),
+            }
+        } else {
+            // for all other cases, treat with as an assertion
+            self.check_assert(exp);
+            None
+        }
+    }
+
+    //
+    // dispatcher
+    //
+
+    /// The entrypoint to the main evaluation logic. Expression evaluation is done recursively in
+    /// a bottom-up manner, i.e., for an expression `e`, all its sub-expressions are evaluated first
+    /// before `e` is evaluated. An expression will be evaluated to to a `BaseValue` (if the process
+    /// is successful) or an error code (if the process fails, for example, due to arithmetic errors
+    /// or referring to a non-existent global resource).
+    fn evaluate(&self, exp: &Exp) -> EvalResult<BaseValue> {
+        let exp_level = self.level.get();
+        self.level.set(exp_level + 1);
+
+        let debug_expression = self.get_settings().verbose_expression;
+        if debug_expression {
+            println!(
+                "{} {}[>]: {}",
+                "-".repeat(self.level.get()),
+                self.target.func_env.get_full_name_str(),
+                exp.display(self.target.global_env())
+            );
+        }
+
+        let result = match exp.as_ref() {
+            ExpData::Value(_, val) => self.evaluate_constant(val),
+            ExpData::Temporary(_, idx) => self.local_state.get_value(*idx).decompose().1,
+            ExpData::LocalVar(_, name) => {
+                let env = self.target.global_env();
+                self.exp_state
+                    .get_var(env.symbol_pool().string(*name).as_str())
+            }
+            ExpData::Call(node_id, op, args) => self.evaluate_operation(*node_id, op, args)?,
+            ExpData::IfElse(_, cond, t_exp, f_exp) => {
+                self.evaluate_if_then_else(cond, t_exp, f_exp)?
+            }
+            ExpData::Invoke(_, def, args) => self.evaluate_invocation(def, args)?,
+            ExpData::Quant(_, kind, ranges, _triggers, constraint, body) => {
+                self.evaluate_quantifier(*kind, ranges, constraint.as_ref(), body)?
+            }
+            ExpData::Invalid(_) => unreachable!(),
+            // should not appear in this context
+            ExpData::Lambda(..) | ExpData::Block(..) => unreachable!(),
+        };
+
+        if debug_expression {
+            println!(
+                "{} {}[<]: {}",
+                "-".repeat(self.level.get()),
+                self.target.func_env.get_full_name_str(),
+                exp.display(self.target.global_env())
+            );
+        }
+
+        self.level.set(exp_level);
+        Ok(result)
+    }
+
+    //
+    // concrete cases
+    //
+
+    fn evaluate_constant(&self, val: &Value) -> BaseValue {
+        match val {
+            Value::Address(v) => BaseValue::mk_address(
+                AccountAddress::from_hex_literal(&format!("{:#x}", v)).unwrap(),
+            ),
+            Value::Number(v) => BaseValue::mk_num(v.clone()),
+            Value::Bool(v) => BaseValue::mk_bool(*v),
+            Value::ByteArray(v) => {
+                BaseValue::mk_vector(v.iter().map(|e| BaseValue::mk_u8(*e)).collect())
+            }
+            Value::AddressArray(v) => BaseValue::mk_vector(
+                v.iter()
+                    .map(|e| {
+                        BaseValue::mk_address(
+                            AccountAddress::from_hex_literal(&format!("{:#x}", e)).unwrap(),
+                        )
+                    })
+                    .collect(),
+            ),
+            _ => unimplemented!(),
+        }
+    }
+
+    fn evaluate_operation(
+        &self,
+        node_id: NodeId,
+        op: &Operation,
+        args: &[Exp],
+    ) -> EvalResult<BaseValue> {
+        let result = match op {
+            Operation::Slice => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(args.len(), 2);
+                }
+                let arg_vec = self.evaluate(&args[0])?;
+                self.handle_vector_slice(arg_vec, &args[1])?
+            }
+            Operation::InRangeRange => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(args.len(), 2);
+                }
+                let arg_idx = self.evaluate(&args[1])?;
+                self.handle_in_range(&args[0], arg_idx)?
+            }
+            Operation::Function(module_id, spec_fun_id, mem_labels_opt) => self.handle_call(
+                node_id,
+                *module_id,
+                *spec_fun_id,
+                mem_labels_opt.as_ref(),
+                args,
+            )?,
+            _ => self.evaluate_operation_with_values(node_id, op, args)?,
+        };
+        Ok(result)
+    }
+
+    fn evaluate_operation_with_values(
+        &self,
+        node_id: NodeId,
+        op: &Operation,
+        args: &[Exp],
+    ) -> EvalResult<BaseValue> {
+        let mut arg_vals = args
+            .iter()
+            .map(|arg_exp| self.evaluate(arg_exp))
+            .collect::<EvalResult<Vec<_>>>()?;
+        let result = match op {
+            // binary arithmetic
+            Operation::Add | Operation::Sub | Operation::Mul | Operation::Div | Operation::Mod => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_arithmetic(op, lhs, rhs)?
+            }
+            // binary bitwise
+            Operation::BitAnd | Operation::BitOr | Operation::Xor => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_bitwise(op, lhs, rhs)
+            }
+            // binary bitshift
+            Operation::Shl | Operation::Shr => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_bitshift(op, lhs, rhs)
+            }
+            // binary comparison
+            Operation::Lt | Operation::Le | Operation::Ge | Operation::Gt => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_comparison(op, lhs, rhs)
+            }
+            // binary equality
+            Operation::Eq | Operation::Neq => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_equality(op, lhs, rhs)
+            }
+            // unary boolean
+            Operation::Not => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                let opv = arg_vals.remove(0);
+                self.handle_unary_boolean(op, opv)
+            }
+            // binary boolean
+            Operation::And | Operation::Or | Operation::Implies | Operation::Iff => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_binary_boolean(op, lhs, rhs)
+            }
+            // vector operation
+            Operation::Len => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                let opv = arg_vals.remove(0);
+                BaseValue::mk_num(BigInt::from(opv.into_vector().len()))
+            }
+            Operation::EmptyVec => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_vector(vec![])
+            }
+            Operation::SingleVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                BaseValue::mk_vector(arg_vals)
+            }
+            Operation::Index => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let idx = arg_vals.remove(1);
+                let vec = arg_vals.remove(0);
+                self.handle_vector_get(vec, idx)?
+            }
+            Operation::UpdateVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 3);
+                }
+                let elem = arg_vals.remove(2);
+                let idx = arg_vals.remove(1);
+                let vec = arg_vals.remove(0);
+                self.handle_vector_update(vec, idx, elem)?
+            }
+            Operation::ConcatVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let rhs = arg_vals.remove(1);
+                let lhs = arg_vals.remove(0);
+                self.handle_vector_concat(lhs, rhs)
+            }
+            Operation::IndexOfVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let elem = arg_vals.remove(1);
+                let vec = arg_vals.remove(0);
+                self.handle_vector_index_of(vec, elem)
+            }
+            Operation::ContainsVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let elem = arg_vals.remove(1);
+                let vec = arg_vals.remove(0);
+                self.handle_vector_contains(vec, elem)
+            }
+            Operation::InRangeVec => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(args.len(), 2);
+                }
+                let idx = arg_vals.remove(1);
+                let vec = arg_vals.remove(0);
+                self.handle_vector_in_range(vec, idx)
+            }
+            // struct
+            Operation::Pack(module_id, struct_id) => {
+                self.handle_struct_pack(*module_id, *struct_id, arg_vals)
+            }
+            Operation::Select(module_id, struct_id, field_id) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                let struct_val = arg_vals.remove(0);
+                self.handle_struct_get_field(*module_id, *struct_id, *field_id, struct_val)
+            }
+            Operation::UpdateField(module_id, struct_id, field_id) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 2);
+                }
+                let field_val = arg_vals.remove(1);
+                let struct_val = arg_vals.remove(0);
+                self.handle_struct_update_field(
+                    *module_id, *struct_id, *field_id, struct_val, field_val,
+                )
+            }
+            // globals
+            Operation::Exists(mem_opt) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                let addr = arg_vals.remove(0);
+                self.handle_global_exists(node_id, mem_opt.as_ref().copied(), addr)
+            }
+            Operation::Global(mem_opt) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                let addr = arg_vals.remove(0);
+                self.handle_global_get(node_id, mem_opt.as_ref().copied(), addr)?
+            }
+            // constant values
+            Operation::MaxU8 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u8::MAX))
+            }
+            Operation::MaxU16 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u16::MAX))
+            }
+            Operation::MaxU32 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u32::MAX))
+            }
+            Operation::MaxU64 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u64::MAX))
+            }
+            Operation::MaxU128 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u128::MAX))
+            }
+            Operation::MaxU256 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(&u256::U256::max_value()))
+            }
+            Operation::AbortFlag => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_bool(self.local_state.is_post_abort())
+            }
+            // type checking
+            Operation::WellFormed => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                // TODO (mengxu) implement the type checking logic
+                // if we don't, and the value is not actually well-formed, it should panic the
+                // stackless VM later in the execution.
+                BaseValue::mk_bool(true)
+            }
+            // TODO (mengxu) modifies check is not supported now
+            Operation::CanModify => {
+                // TODO (to avoid test case failure)
+                return Err(BigInt::zero());
+            }
+            // TODO (mengxu) events are not handled now
+            Operation::EmptyEventStore
+            | Operation::ExtendEventStore
+            | Operation::EventStoreIncludes
+            | Operation::EventStoreIncludedIn => {
+                // TODO (to avoid test case failure)
+                return Err(BigInt::zero());
+            }
+            // unexpected operations in this context
+            Operation::NoOp
+            | Operation::Identical
+            | Operation::Old
+            | Operation::Trace(_)
+            | Operation::Tuple
+            | Operation::Result(_)
+            | Operation::AbortCode
+            | Operation::TypeValue
+            | Operation::TypeDomain
+            | Operation::ResourceDomain
+            | Operation::BoxValue
+            | Operation::UnboxValue => {
+                unreachable!()
+            }
+            // handled elsewhere, should not be here
+            Operation::Function(..)
+            | Operation::Slice
+            | Operation::Range
+            | Operation::RangeVec
+            | Operation::InRangeRange => {
+                unreachable!()
+            }
+
+            Operation::Cast | Operation::Bv2Int | Operation::Int2Bv => {
+                unreachable!()
+            }
+        };
+        Ok(result)
+    }
+
+    fn evaluate_if_then_else(&self, cond: &Exp, t_exp: &Exp, f_exp: &Exp) -> EvalResult<BaseValue> {
+        let cond_val = self.evaluate(cond)?;
+        // NOTE: do not short-circuit the other path. For ITE expressions, we want to evaluate both
+        // expressions instead of short-circuiting the path that is not going to be taken.
+        let t_val = self.evaluate(t_exp)?;
+        let f_val = self.evaluate(f_exp)?;
+        let result = if cond_val.into_bool() { t_val } else { f_val };
+        Ok(result)
+    }
+
+    fn evaluate_invocation(&self, def: &Exp, args: &[Exp]) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+
+        let (vars, stmt) = match def.as_ref() {
+            // TODO (mengxu): the assumption here is that the only way to invoke a lambda is to pass
+            // the lambda to a spec function as a function argument and then invoke the lambda
+            // within the spec function.
+            ExpData::LocalVar(_, symbol) => self
+                .exp_state
+                .get_lambda(env.symbol_pool().string(*symbol).as_str()),
+            _ => unreachable!(),
+        };
+
+        let arg_vals = args
+            .iter()
+            .map(|arg_exp| self.evaluate(arg_exp))
+            .collect::<EvalResult<Vec<_>>>()?;
+
+        let mut exp_state = ExpState::default();
+        for (var, val) in vars.iter().zip(arg_vals.into_iter()) {
+            if cfg!(debug_assertions) {
+                assert!(var.binding.is_none());
+            }
+            let name = env.symbol_pool().string(var.name).to_string();
+            exp_state.add_var(name, val);
+        }
+
+        let evaluator = Evaluator::new(
+            self.holder,
+            self.target,
+            self.ty_args,
+            self.level.get(),
+            exp_state,
+            self.eval_state,
+            self.local_state,
+            self.global_state,
+        );
+        evaluator.evaluate(stmt)
+    }
+
+    fn prepare_range(&self, exp: &Exp) -> EvalResult<Vec<BaseValue>> {
+        let env = self.target.global_env();
+        let vals = match exp.as_ref() {
+            // case: range
+            ExpData::Call(_, Operation::Range, _) | ExpData::Call(_, Operation::RangeVec, _) => {
+                let (lower, upper) = self.unroll_range(exp)?;
+                let mut vals = vec![];
+                let mut i = lower;
+                while i < upper {
+                    vals.push(BaseValue::Int(i.clone()));
+                    i += 1;
+                }
+                vals
+            }
+            // case: type domain
+            ExpData::Call(node_id, Operation::TypeDomain, _) => match env.get_node_type(*node_id) {
+                MTy::Type::TypeDomain(ty) => self.unroll_type_domain(&ty, exp)?,
+                _ => unreachable!(),
+            },
+            // case: resource domain
+            ExpData::Call(node_id, Operation::ResourceDomain, _) => {
+                match env.get_node_type(*node_id) {
+                    MTy::Type::ResourceDomain(module_id, struct_id, inst_opt) => match inst_opt {
+                        None => {
+                            let struct_env = env.get_struct(module_id.qualified(struct_id));
+                            let struct_ident = StructIdent::new(&struct_env);
+                            self.unroll_resource_domain_by_ident(&struct_ident)
+                        }
+                        Some(ty_args) => {
+                            let struct_inst = convert_model_struct_type(
+                                env,
+                                module_id,
+                                struct_id,
+                                &ty_args,
+                                self.ty_args,
+                            );
+                            self.unroll_resource_domain_by_inst(&struct_inst)
+                        }
+                    },
+                    _ => unreachable!(),
+                }
+            }
+            // cont.
+            _ => match env.get_node_type(exp.node_id()) {
+                // case: vector
+                MTy::Type::Vector(_) => self.evaluate(exp)?.into_vector(),
+                _ => unreachable!(),
+            },
+        };
+        Ok(vals)
+    }
+
+    fn evaluate_quantifier(
+        &self,
+        kind: QuantKind,
+        ranges: &[(LocalVarDecl, Exp)],
+        constraint: Option<&Exp>,
+        body: &Exp,
+    ) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+
+        let mut var_vec = vec![];
+        let mut vals_vec = vec![];
+        for (r_var, r_exp) in ranges {
+            var_vec.push(r_var);
+            let r_vals = self.prepare_range(r_exp)?;
+            vals_vec.push(r_vals);
+        }
+        let choose_val_range = match kind {
+            QuantKind::Forall | QuantKind::Exists => None,
+            QuantKind::Choose | QuantKind::ChooseMin => {
+                assert_eq!(vals_vec.len(), 1);
+                Some(vals_vec[0].clone())
+            }
+        };
+
+        let mut loop_results = vec![];
+        for val_vec in vals_vec.into_iter().multi_cartesian_product() {
+            let mut exp_state = ExpState::default();
+            for (var, val) in var_vec.iter().zip(val_vec.into_iter()) {
+                if cfg!(debug_assertions) {
+                    assert!(var.binding.is_none());
+                }
+                let name = env.symbol_pool().string(var.name).to_string();
+                exp_state.add_var(name, val);
+            }
+
+            let evaluator = Evaluator::new(
+                self.holder,
+                self.target,
+                self.ty_args,
+                self.level.get(),
+                exp_state,
+                self.eval_state,
+                self.local_state,
+                self.global_state,
+            );
+            let run_body = match constraint {
+                None => true,
+                Some(c_exp) => evaluator.evaluate(c_exp)?.into_bool(),
+            };
+            if run_body {
+                loop_results.push(evaluator.evaluate(body)?);
+            }
+        }
+
+        match kind {
+            QuantKind::Forall => {
+                let v = loop_results.into_iter().all(|r| r.into_bool());
+                let quant_result = BaseValue::mk_bool(v);
+                Ok(quant_result)
+            }
+            QuantKind::Exists => {
+                let v = loop_results.into_iter().any(|r| r.into_bool());
+                let quant_result = BaseValue::mk_bool(v);
+                Ok(quant_result)
+            }
+            QuantKind::Choose => {
+                let choose_val_range_vec = choose_val_range.unwrap();
+                let mut v_results: Vec<_> = choose_val_range_vec
+                    .into_iter()
+                    .zip(loop_results)
+                    .filter_map(|(val, r)| if r.into_bool() { Some(val) } else { None })
+                    .collect();
+
+                match v_results.pop() {
+                    None => {
+                        self.record_evaluation_failure(body, "choose fails to satisfy a predicate");
+                        Err(Self::eval_failure_code())
+                    }
+                    Some(v) => Ok(v),
+                }
+            }
+            QuantKind::ChooseMin => {
+                let choose_val_range_vec = choose_val_range.unwrap();
+                let mut v_results: Vec<_> = choose_val_range_vec
+                    .into_iter()
+                    .zip(loop_results)
+                    .filter_map(|(val, r)| if r.into_bool() { Some(val) } else { None })
+                    .collect();
+
+                if v_results.is_empty() {
+                    self.record_evaluation_failure(body, "choose min fails to satisfy a predicate");
+                    Err(Self::eval_failure_code())
+                } else {
+                    Ok(v_results.remove(0))
+                }
+            }
+        }
+    }
+
+    //
+    // handlers
+    //
+
+    fn handle_call(
+        &self,
+        node_id: NodeId,
+        module_id: ModuleId,
+        spec_fun_id: SpecFunId,
+        mem_labels_opt: Option<&Vec<MemoryLabel>>,
+        args: &[Exp],
+    ) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+        let module_env = env.get_module(module_id);
+        let decl = module_env.get_spec_fun(spec_fun_id);
+        if cfg!(debug_assertions) {
+            assert_eq!(decl.params.len(), args.len());
+        }
+
+        let mut global_state = match mem_labels_opt {
+            None => self.global_state.clone(),
+            Some(labels) => {
+                let mut state = GlobalState::default();
+                for label in labels {
+                    self.eval_state.register_memory(label, &mut state);
+                }
+                state
+            }
+        };
+
+        let result = if decl.is_move_fun {
+            // TODO (mengxu) the decl for calling a move function might also have a body, maybe
+            // we could just interpret that?
+            self.handle_call_move_function(node_id, &module_env, decl, args, &mut global_state)?
+        } else if decl.body.is_none() {
+            self.handle_call_native_or_uninterpreted(&module_env, decl, args, &mut global_state)?
+        } else {
+            self.handle_call_spec_function(node_id, decl, args, &mut global_state)?
+        };
+        Ok(result)
+    }
+
+    fn handle_call_native_or_uninterpreted(
+        &self,
+        module_env: &ModuleEnv,
+        decl: &SpecFunDecl,
+        args: &[Exp],
+        _global_state: &mut GlobalState,
+    ) -> EvalResult<BaseValue> {
+        // convert args
+        let mut arg_vals = args
+            .iter()
+            .map(|arg_exp| self.evaluate(arg_exp))
+            .collect::<EvalResult<Vec<_>>>()?;
+
+        let env = self.target.global_env();
+        let addr = *module_env.self_address();
+        let module_name = env.symbol_pool().string(module_env.get_name().name());
+        let function_name = env.symbol_pool().string(decl.name);
+
+        // dispatch
+        let result = match (addr, module_name.as_str(), function_name.as_str()) {
+            (DIEM_CORE_ADDR, "signer", "spec_address_of") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(arg_vals.len(), 1);
+                }
+                self.native_spec_signer_of(arg_vals.remove(0))
+            }
+            _ => unreachable!(),
+        };
+        Ok(result)
+    }
+
+    fn handle_call_spec_function(
+        &self,
+        node_id: NodeId,
+        decl: &SpecFunDecl,
+        args: &[Exp],
+        global_state: &mut GlobalState,
+    ) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+
+        // convert type args
+        let callee_inst = env.get_node_instantiation(node_id);
+        if cfg!(debug_assertions) {
+            assert_eq!(decl.type_params.len(), callee_inst.len());
+        }
+        let ty_args: Vec<_> = callee_inst
+            .into_iter()
+            .map(|inst_ty| convert_model_base_type(env, &inst_ty, self.ty_args))
+            .collect();
+
+        // interpret
+        self.interpret_spec_function(decl, &ty_args, args, global_state)
+    }
+
+    fn handle_call_move_function(
+        &self,
+        node_id: NodeId,
+        module_env: &ModuleEnv,
+        decl: &SpecFunDecl,
+        args: &[Exp],
+        global_state: &mut GlobalState,
+    ) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+        let decl_fun_name = env.symbol_pool().string(decl.name);
+        let fun_name_tokens: Vec<_> = decl_fun_name.split('$').collect();
+        if cfg!(debug_assertions) {
+            assert_eq!(fun_name_tokens.len(), 2);
+            assert_eq!(fun_name_tokens[0], "");
+        }
+        let fun_name = fun_name_tokens[1];
+
+        // find callee
+        let callee_env = module_env
+            .get_functions()
+            .find(|fun_env| env.symbol_pool().string(fun_env.get_name()).as_str() == fun_name)
+            .unwrap();
+        let callee_target = choose_variant(self.holder, &callee_env);
+
+        // convert type args
+        let callee_inst = env.get_node_instantiation(node_id);
+        if cfg!(debug_assertions) {
+            let callee_ty_params = callee_target.func_env.get_type_parameters();
+            assert_eq!(decl.type_params.len(), callee_ty_params.len());
+            assert_eq!(decl.type_params.len(), callee_inst.len());
+        }
+        let ty_args: Vec<_> = callee_inst
+            .into_iter()
+            .map(|inst_ty| convert_model_base_type(env, &inst_ty, self.ty_args))
+            .collect();
+
+        // convert args
+        if cfg!(debug_assertions) {
+            assert_eq!(decl.params.len(), callee_target.get_parameter_count());
+        }
+        let arg_vals = args
+            .iter()
+            .map(|arg_exp| self.evaluate(arg_exp))
+            .collect::<EvalResult<Vec<_>>>()?;
+
+        let typed_args = decl
+            .params
+            .iter()
+            .zip(arg_vals)
+            .map(|((_, arg_ty), arg_val)| {
+                let converted = convert_model_base_type(env, arg_ty, &ty_args);
+                TypedValue::fuse_base(converted, arg_val)
+            })
+            .collect();
+
+        // execute the function
+        let callee_result = player::entrypoint(
+            self.holder,
+            callee_target,
+            &ty_args,
+            typed_args,
+            /* skip_specs */ true,
+            self.level.get(),
+            global_state,
+        );
+
+        // analyze the result
+        let return_val = match callee_result {
+            Ok(rets) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(rets.len(), 1);
+                }
+                rets.into_iter().next().unwrap().decompose().1
+            }
+            Err(_) => {
+                return Err(Self::eval_failure_code());
+            }
+        };
+        Ok(return_val)
+    }
+
+    fn handle_binary_arithmetic(
+        &self,
+        op: &Operation,
+        lhs: BaseValue,
+        rhs: BaseValue,
+    ) -> EvalResult<BaseValue> {
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::Add => lval + rval,
+            Operation::Sub => lval - rval,
+            Operation::Mul => lval * rval,
+            Operation::Div => {
+                if rval.is_zero() {
+                    return Err(Self::eval_failure_code());
+                }
+                lval / rval
+            }
+            Operation::Mod => {
+                if rval.is_zero() {
+                    return Err(Self::eval_failure_code());
+                }
+                lval % rval
+            }
+            _ => unreachable!(),
+        };
+
+        Ok(BaseValue::mk_num(result))
+    }
+
+    fn handle_binary_bitwise(&self, op: &Operation, lhs: BaseValue, rhs: BaseValue) -> BaseValue {
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::BitAnd => lval & rval,
+            Operation::BitOr => lval | rval,
+            Operation::Xor => lval ^ rval,
+            _ => unreachable!(),
+        };
+        BaseValue::mk_num(result)
+    }
+
+    fn handle_binary_bitshift(&self, op: &Operation, lhs: BaseValue, rhs: BaseValue) -> BaseValue {
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::Shl => lval << rval.to_usize().unwrap(),
+            Operation::Shr => lval >> rval.to_usize().unwrap(),
+            _ => unreachable!(),
+        };
+        BaseValue::mk_num(result)
+    }
+
+    fn handle_binary_comparison(
+        &self,
+        op: &Operation,
+        lhs: BaseValue,
+        rhs: BaseValue,
+    ) -> BaseValue {
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::Lt => lval < rval,
+            Operation::Le => lval <= rval,
+            Operation::Ge => lval >= rval,
+            Operation::Gt => lval > rval,
+            _ => unreachable!(),
+        };
+        BaseValue::mk_bool(result)
+    }
+
+    fn handle_binary_equality(&self, op: &Operation, lhs: BaseValue, rhs: BaseValue) -> BaseValue {
+        let result = match op {
+            Operation::Eq => lhs == rhs,
+            Operation::Neq => lhs != rhs,
+            _ => unreachable!(),
+        };
+        BaseValue::mk_bool(result)
+    }
+
+    fn handle_unary_boolean(&self, op: &Operation, opv: BaseValue) -> BaseValue {
+        let opval = opv.into_bool();
+        let result = match op {
+            Operation::Not => !opval,
+            _ => unreachable!(),
+        };
+        BaseValue::mk_bool(result)
+    }
+
+    fn handle_binary_boolean(&self, op: &Operation, lhs: BaseValue, rhs: BaseValue) -> BaseValue {
+        let lval = lhs.into_bool();
+        let rval = rhs.into_bool();
+        let result = match op {
+            Operation::And => lval && rval,
+            Operation::Or => lval || rval,
+            Operation::Implies => !lval || rval,
+            Operation::Iff => lval == rval,
+            _ => unreachable!(),
+        };
+        BaseValue::mk_bool(result)
+    }
+
+    fn handle_in_range(&self, range: &Exp, idx: BaseValue) -> EvalResult<BaseValue> {
+        let (lhs, rhs) = self.unroll_range(range)?;
+        let i = idx.into_int();
+        let r = i >= lhs && i < rhs;
+        Ok(BaseValue::mk_bool(r))
+    }
+
+    fn handle_vector_get(&self, vec: BaseValue, idx: BaseValue) -> EvalResult<BaseValue> {
+        let mut v = vec.into_vector();
+        let i = idx.into_int().to_usize().unwrap();
+        if i >= v.len() {
+            return Err(Self::eval_failure_code());
+        }
+        Ok(v.remove(i))
+    }
+
+    fn handle_vector_update(
+        &self,
+        vec: BaseValue,
+        idx: BaseValue,
+        elem: BaseValue,
+    ) -> EvalResult<BaseValue> {
+        let mut v = vec.into_vector();
+        let i = idx.into_int().to_usize().unwrap();
+        if i >= v.len() {
+            return Err(Self::eval_failure_code());
+        }
+        *v.get_mut(i).unwrap() = elem;
+        Ok(BaseValue::mk_vector(v))
+    }
+
+    fn handle_vector_slice(&self, vec: BaseValue, range: &Exp) -> EvalResult<BaseValue> {
+        let mut v = vec.into_vector();
+        let (lhs, rhs) = self.unroll_range(range)?;
+        if lhs > rhs || lhs < BigInt::zero() || rhs > BigInt::from(v.len()) {
+            return Err(Self::eval_failure_code());
+        }
+        let mut slice = v.split_off(lhs.to_usize().unwrap());
+        let _ = slice.split_off(rhs.to_usize().unwrap());
+        Ok(BaseValue::mk_vector(slice))
+    }
+
+    fn handle_vector_concat(&self, lhs: BaseValue, rhs: BaseValue) -> BaseValue {
+        let mut concat = lhs.into_vector();
+        concat.append(&mut rhs.into_vector());
+        BaseValue::mk_vector(concat)
+    }
+
+    fn handle_vector_index_of(&self, vec: BaseValue, elem: BaseValue) -> BaseValue {
+        let v = vec.into_vector();
+        let idx = match v.into_iter().position(|e| e == elem) {
+            None => BigInt::from(-1),
+            Some(i) => BigInt::from(i),
+        };
+        BaseValue::mk_num(idx)
+    }
+
+    fn handle_vector_contains(&self, vec: BaseValue, elem: BaseValue) -> BaseValue {
+        let v = vec.into_vector();
+        BaseValue::mk_bool(v.contains(&elem))
+    }
+
+    fn handle_vector_in_range(&self, vec: BaseValue, idx: BaseValue) -> BaseValue {
+        let v = vec.into_vector();
+        let i = idx.into_int();
+        let r = i >= BigInt::zero() && i < BigInt::from(v.len());
+        BaseValue::mk_bool(r)
+    }
+
+    fn handle_struct_pack(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        fields: Vec<BaseValue>,
+    ) -> BaseValue {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let struct_env = env.get_struct(module_id.qualified(struct_id));
+            assert_eq!(struct_env.get_field_count(), fields.len());
+        }
+        BaseValue::mk_struct(fields)
+    }
+
+    fn handle_struct_get_field(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        field_id: FieldId,
+        struct_val: BaseValue,
+    ) -> BaseValue {
+        let mut fields = struct_val.into_struct();
+
+        let env = self.target.global_env();
+        let struct_env = env.get_struct(module_id.qualified(struct_id));
+        if cfg!(debug_assertions) {
+            assert_eq!(struct_env.get_field_count(), fields.len());
+        }
+
+        let offset = struct_env.get_field(field_id).get_offset();
+        fields.remove(offset)
+    }
+
+    fn handle_struct_update_field(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        field_id: FieldId,
+        struct_val: BaseValue,
+        field_val: BaseValue,
+    ) -> BaseValue {
+        let mut fields = struct_val.into_struct();
+
+        let env = self.target.global_env();
+        let struct_env = env.get_struct(module_id.qualified(struct_id));
+        if cfg!(debug_assertions) {
+            assert_eq!(struct_env.get_field_count(), fields.len());
+        }
+
+        let offset = struct_env.get_field(field_id).get_offset();
+        *fields.get_mut(offset).unwrap() = field_val;
+        BaseValue::mk_struct(fields)
+    }
+
+    fn handle_global_exists(
+        &self,
+        node_id: NodeId,
+        mem_opt: Option<MemoryLabel>,
+        addr_val: BaseValue,
+    ) -> BaseValue {
+        let env = self.target.global_env();
+        let node_ty = env
+            .get_node_instantiation(node_id)
+            .into_iter()
+            .next()
+            .unwrap();
+        let struct_ty = convert_model_base_type(env, &node_ty, self.ty_args);
+        let struct_inst = struct_ty.into_struct_inst();
+        let addr = addr_val.into_address();
+        let result = match mem_opt {
+            None => self.global_state.has_resource(&addr, &struct_inst),
+            Some(mem_label) => self
+                .eval_state
+                .load_memory(&mem_label, &struct_inst, &addr)
+                .is_some(),
+        };
+        BaseValue::mk_bool(result)
+    }
+
+    fn handle_global_get(
+        &self,
+        node_id: NodeId,
+        mem_opt: Option<MemoryLabel>,
+        addr_val: BaseValue,
+    ) -> EvalResult<BaseValue> {
+        let env = self.target.global_env();
+        let node_ty = env
+            .get_node_instantiation(node_id)
+            .into_iter()
+            .next()
+            .unwrap();
+        let struct_ty = convert_model_base_type(env, &node_ty, self.ty_args);
+        let struct_inst = struct_ty.into_struct_inst();
+        let addr = addr_val.into_address();
+        let resource = match mem_opt {
+            None => {
+                match self
+                    .global_state
+                    .get_resource_for_spec(Some(true), addr, struct_inst)
+                {
+                    None => {
+                        return Err(Self::eval_failure_code());
+                    }
+                    Some(val) => val.decompose().1,
+                }
+            }
+            Some(mem_label) => match self.eval_state.load_memory(&mem_label, &struct_inst, &addr) {
+                None => {
+                    return Err(Self::eval_failure_code());
+                }
+                Some(val) => val,
+            },
+        };
+        Ok(resource)
+    }
+
+    //
+    // natives
+    //
+
+    fn native_spec_signer_of(&self, arg: BaseValue) -> BaseValue {
+        BaseValue::mk_address(arg.into_signer())
+    }
+
+    //
+    // spec function interpretation
+    //
+
+    fn interpret_spec_function(
+        &self,
+        decl: &SpecFunDecl,
+        ty_args: &[BaseType],
+        args: &[Exp],
+        global_state: &mut GlobalState,
+    ) -> EvalResult<BaseValue> {
+        let (vars, stmt) = match decl.body.as_ref().unwrap().as_ref() {
+            ExpData::Block(_, vars, stmt) => (vars, stmt),
+            _ => unreachable!(),
+        };
+
+        let env = self.target.global_env();
+        let mut exp_state = ExpState::default();
+        for ((param_name, _), arg_exp) in decl.params.iter().zip(args.iter()) {
+            let name = env.symbol_pool().string(*param_name).to_string();
+            match arg_exp.as_ref() {
+                ExpData::Lambda(_, vars, stmt) => {
+                    exp_state.add_lambda(name, vars.to_vec(), stmt.clone())
+                }
+                _ => {
+                    let arg_val = self.evaluate(arg_exp)?;
+                    exp_state.add_var(name, arg_val);
+                }
+            }
+        }
+        for var in vars {
+            let name = env.symbol_pool().string(var.name).to_string();
+            let val = self.evaluate(var.binding.as_ref().unwrap())?;
+            exp_state.add_var(name, val);
+        }
+
+        let evaluator = Evaluator::new(
+            self.holder,
+            self.target,
+            ty_args,
+            self.level.get(),
+            exp_state,
+            self.eval_state,
+            self.local_state,
+            global_state,
+        );
+        evaluator.evaluate(stmt)
+    }
+
+    //
+    // operators that gives other types
+    //
+
+    fn unroll_range(&self, exp: &Exp) -> EvalResult<(BigInt, BigInt)> {
+        let range = match exp.as_ref() {
+            ExpData::Call(_, Operation::Range, args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(args.len(), 2);
+                }
+                let lhs = self.evaluate(&args[0])?.into_int();
+                let rhs = self.evaluate(&args[1])?.into_int();
+                (lhs, rhs)
+            }
+            ExpData::Call(_, Operation::RangeVec, args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(args.len(), 1);
+                }
+                let opv = self.evaluate(&args[0])?.into_vector();
+                (BigInt::zero(), BigInt::from(opv.len()))
+            }
+            _ => unreachable!(),
+        };
+        Ok(range)
+    }
+
+    fn unroll_type_domain(&self, ty: &MTy::Type, exp: &Exp) -> EvalResult<Vec<BaseValue>> {
+        match ty {
+            MTy::Type::Primitive(MTy::PrimitiveType::Address) => Ok(self
+                .eval_state
+                .all_addresses()
+                .into_iter()
+                .chain(self.global_state.get_touched_addresses().iter().copied())
+                .map(BaseValue::Address)
+                .collect()),
+            _ => {
+                self.record_evaluation_failure(
+                    exp,
+                    "enumeration of a non-address type domain is not supported",
+                );
+                Err(Self::eval_failure_code())
+            }
+        }
+    }
+
+    fn unroll_resource_domain_by_inst(&self, inst: &StructInstantiation) -> Vec<BaseValue> {
+        self.eval_state.all_resources_by_inst(inst)
+    }
+
+    fn unroll_resource_domain_by_ident(&self, ident: &StructIdent) -> Vec<BaseValue> {
+        self.eval_state.all_resources_by_ident(ident)
+    }
+
+    //
+    // utilities
+    //
+
+    fn record_evaluation_failure(&self, exp: &Exp, msg: &str) {
+        let env = self.target.global_env();
+        let loc = env.get_node_loc(exp.node_id());
+        env.error(&loc, &format!("failed to evaluate expression: {}", msg));
+    }
+
+    fn record_checking_failure(&self, exp: &Exp) {
+        let env = self.target.global_env();
+        let loc = env.get_node_loc(exp.node_id());
+        env.error(&loc, "property does not hold");
+    }
+
+    fn eval_failure_code() -> BigInt {
+        BigInt::from(-1)
+    }
+
+    //
+    // settings
+    //
+
+    fn get_settings(&self) -> Rc<InterpreterSettings> {
+        self.target
+            .global_env()
+            .get_extension::<InterpreterSettings>()
+            .unwrap_or_default()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/local_state.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/local_state.rs
new file mode 100644
index 000000000..efb21fa36
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/local_state.rs
@@ -0,0 +1,244 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file implements the information needed in the local interpretation context, i.e., the
+//! context created and updated when interpreting a single function.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use move_binary_format::errors::{Location, PartialVMError, VMError};
+use move_core_types::vm_status::StatusCode;
+use move_model::ast::TempIndex;
+
+use crate::concrete::{
+    ty::{CodeOffset, Type},
+    value::{LocalSlot, Pointer, TypedValue},
+};
+
+#[derive(Clone, Debug)]
+pub enum AbortInfo {
+    /// User-specific abort
+    User(u64, Location),
+    /// Internal abort (e.g., integer overflow or resource does not exist in global storage)
+    Internal(StatusCode, Location),
+}
+
+impl AbortInfo {
+    /// Convert the AbortInfo into a VMError
+    pub fn into_err(self) -> VMError {
+        match self {
+            Self::User(status_code, location) => PartialVMError::new(StatusCode::ABORTED)
+                .with_sub_status(status_code)
+                .finish(location),
+            Self::Internal(status_code, location) => {
+                PartialVMError::new(status_code).finish(location)
+            }
+        }
+    }
+
+    /// Retrieve the status code as a u64
+    pub fn get_status_code(&self) -> u64 {
+        match self {
+            Self::User(status_code, _) => *status_code,
+            Self::Internal(status_code, _) => *status_code as u64,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum TerminationStatus {
+    /// This function has not terminated, it is running normally
+    None,
+    /// An abort has been triggered and the function is in post-abort state
+    PostAbort(AbortInfo),
+    /// The function terminated successfully with a list of return values
+    Return(Vec<TypedValue>),
+    /// The function terminated with an abort
+    Abort(AbortInfo),
+}
+
+pub struct LocalState {
+    /// slots that holds local variables
+    slots: Vec<LocalSlot>,
+    /// program counter
+    pc: CodeOffset,
+    /// whether we set the PC to branch in the handling of last bytecode
+    pc_branch: bool,
+    /// termination status
+    termination: TerminationStatus,
+    /// mutable parameters that gets destroyed during the execution
+    destroyed_args: BTreeMap<TempIndex, TypedValue>,
+    /// whether specification checking needs to be skipped
+    skip_specs: bool,
+    /// local mutable references that are explicitly marked as uninit
+    uninit_mut_refs: BTreeSet<TempIndex>,
+}
+
+impl LocalState {
+    pub fn new(slots: Vec<LocalSlot>, skip_specs: bool) -> Self {
+        Self {
+            slots,
+            pc: 0,
+            pc_branch: false,
+            termination: TerminationStatus::None,
+            destroyed_args: BTreeMap::new(),
+            skip_specs,
+            uninit_mut_refs: BTreeSet::new(),
+        }
+    }
+
+    /// Get the number of slots available in this state
+    pub fn num_slots(&self) -> usize {
+        self.slots.len()
+    }
+
+    /// Get the type of the local slot at `index`
+    pub fn get_type(&self, index: TempIndex) -> &Type {
+        self.slots.get(index).unwrap().get_type()
+    }
+
+    /// Check whether the local slot at `index` holds a value
+    pub fn has_value(&self, index: TempIndex) -> bool {
+        self.slots.get(index).unwrap().has_value()
+    }
+    /// Get the value held in local slot `index`. Panics if the slot does not hold a value
+    pub fn get_value(&self, index: TempIndex) -> TypedValue {
+        self.slots.get(index).unwrap().get_value()
+    }
+    /// Put the value held in local slot `index`. Override if the slot already holds a value
+    pub fn put_value_override(&mut self, index: TempIndex, val: TypedValue) {
+        self.slots.get_mut(index).unwrap().put_value_override(val)
+    }
+    /// Put the value held in local slot `index`. Panics if the slot already holds a value
+    pub fn put_value(&mut self, index: TempIndex, val: TypedValue) {
+        self.slots.get_mut(index).unwrap().put_value(val)
+    }
+    /// Delete the value held in local slot `index`. Panics if the slot does not hold a value
+    pub fn del_value(&mut self, index: TempIndex) -> TypedValue {
+        self.slots.get_mut(index).unwrap().del_value()
+    }
+
+    /// Save a mutable argument that is destroyed
+    pub fn save_destroyed_arg(&mut self, index: TempIndex, val: TypedValue) {
+        let exists = self.destroyed_args.insert(index, val);
+        if cfg!(debug_assertions) {
+            assert!(exists.is_none());
+        }
+    }
+    /// Load a mutable argument that is destroyed
+    pub fn load_destroyed_arg(&mut self, index: TempIndex) -> TypedValue {
+        self.destroyed_args.remove(&index).unwrap()
+    }
+
+    /// Mark a mutable reference is uninitialized explicitly
+    pub fn mark_uninit(&mut self, index: TempIndex) {
+        let inserted = self.uninit_mut_refs.insert(index);
+        if cfg!(debug_assertions) {
+            assert!(inserted);
+        }
+    }
+    /// Unset the mark that the mutable reference is uninitialized, return True if unset
+    pub fn unset_uninit(&mut self, index: TempIndex) -> bool {
+        self.uninit_mut_refs.remove(&index)
+    }
+
+    /// Get the current PC location (i.e., which bytecode to be executed)
+    pub fn get_pc(&self) -> CodeOffset {
+        self.pc
+    }
+    /// Set the PC location to jump to on next execution
+    pub fn set_pc(&mut self, pc: CodeOffset) {
+        if cfg!(debug_assertions) {
+            assert!(!self.pc_branch);
+        }
+        self.pc = pc;
+        self.pc_branch = true;
+    }
+    /// Decide the PC location for next bytecode instruction
+    pub fn ready_pc_for_next_instruction(&mut self) {
+        if self.pc_branch {
+            self.pc_branch = false
+        } else {
+            self.pc += 1;
+        }
+    }
+
+    /// Collect the pointers of the underlying values in the local slots
+    pub fn collect_pointers(&self) -> BTreeMap<TempIndex, &Pointer> {
+        self.slots
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, slot)| slot.get_content().map(|(_, ptr)| (idx, ptr)))
+            .chain(
+                self.destroyed_args
+                    .iter()
+                    .map(|(idx, val)| (*idx, val.get_ptr())),
+            )
+            .collect()
+    }
+
+    /// Mark that an abort is raised and we will be executing the abort action next
+    pub fn transit_to_post_abort(&mut self, info: AbortInfo) {
+        if cfg!(debug_assertions) {
+            assert!(matches!(self.termination, TerminationStatus::None));
+        }
+        self.termination = TerminationStatus::PostAbort(info);
+    }
+    /// Check whether execution of the current function is finished or not
+    pub fn is_terminated(&self) -> bool {
+        matches!(
+            self.termination,
+            TerminationStatus::Return(_) | TerminationStatus::Abort(_)
+        )
+    }
+    /// Check whether we are executing in a post-abort status
+    pub fn is_post_abort(&self) -> bool {
+        matches!(self.termination, TerminationStatus::PostAbort(_))
+    }
+    /// Mark that the current function terminated with an abort
+    pub fn terminate_with_abort(&mut self, abort_info: AbortInfo) {
+        if cfg!(debug_assertions) {
+            assert!(!self.is_terminated());
+        }
+        let info = match &self.termination {
+            TerminationStatus::None => {
+                // no prior aborts has been seen, and no abort action attached
+                abort_info
+            }
+            TerminationStatus::PostAbort(original_info) => {
+                // re-abort, make sure we are aborting with the same status code
+                if cfg!(debug_assertions) {
+                    assert_eq!(
+                        original_info.get_status_code(),
+                        abort_info.get_status_code()
+                    );
+                }
+                original_info.clone()
+            }
+            _ => unreachable!(),
+        };
+        self.termination = TerminationStatus::Abort(info);
+    }
+    /// Mark that the current function terminated with return values
+    pub fn terminate_with_return(&mut self, ret_vals: Vec<TypedValue>) {
+        if cfg!(debug_assertions) {
+            assert!(!self.is_terminated());
+        }
+        self.termination = TerminationStatus::Return(ret_vals);
+    }
+    /// Consume and reduce the state into termination status
+    pub fn into_termination_status(self) -> TerminationStatus {
+        self.termination
+    }
+
+    /// Mark the spec checking disabled for the rest of the function
+    pub fn skip_specs(&mut self) {
+        self.skip_specs = true;
+    }
+
+    /// Check whether we are skipping the specs
+    pub fn is_spec_skipped(&self) -> bool {
+        self.skip_specs
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/mod.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/mod.rs
new file mode 100644
index 000000000..259e4a497
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/mod.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod evaluator;
+pub mod local_state;
+pub mod player;
+pub mod runtime;
+pub mod settings;
+pub mod ty;
+pub mod value;
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/player.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/player.rs
new file mode 100644
index 000000000..eb6e8dfff
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/player.rs
@@ -0,0 +1,2460 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file implements the statement interpretation part of the stackless bytecode interpreter.
+
+use std::{collections::BTreeMap, rc::Rc};
+
+use num::{BigInt, ToPrimitive, Zero};
+
+use bytecode_interpreter_crypto::{
+    ed25519_deserialize_public_key, ed25519_deserialize_signature, ed25519_verify_signature,
+    sha2_256_of, sha3_256_of,
+};
+use move_binary_format::errors::Location;
+use move_core_types::{
+    account_address::AccountAddress,
+    language_storage::CORE_CODE_ADDRESS,
+    vm_status::{sub_status, StatusCode},
+};
+use move_model::{
+    ast::{Exp, MemoryLabel, TempIndex},
+    model::{FunId, FunctionEnv, ModuleId, StructId},
+    ty as MT,
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget,
+    function_target_pipeline::FunctionTargetsHolder,
+    stackless_bytecode::{
+        AbortAction, AssignKind, BorrowEdge, BorrowNode, Bytecode, Constant, HavocKind, Label,
+        Operation, PropKind,
+    },
+};
+
+use crate::{
+    concrete::{
+        evaluator::{Evaluator, ExpState},
+        local_state::{AbortInfo, LocalState, TerminationStatus},
+        settings::InterpreterSettings,
+        ty::{
+            convert_model_base_type, convert_model_local_type, convert_model_partial_struct_type,
+            convert_model_struct_type, BaseType, CodeOffset, Type,
+        },
+        value::{BaseValue, EvalState, GlobalState, LocalSlot, Pointer, TypedValue},
+    },
+    shared::variant::choose_variant,
+};
+
+//**************************************************************************************************
+// Types
+//**************************************************************************************************
+
+pub type ExecResult<T> = ::std::result::Result<T, AbortInfo>;
+
+//**************************************************************************************************
+// Constants
+//**************************************************************************************************
+
+// TODO(mengxu): these constants are defined in values_impl.rs which are currently not exposed.
+const INDEX_OUT_OF_BOUNDS: u64 = sub_status::NFE_VECTOR_ERROR_BASE + 1;
+const POP_EMPTY_VEC: u64 = sub_status::NFE_VECTOR_ERROR_BASE + 2;
+const DESTROY_NON_EMPTY_VEC: u64 = sub_status::NFE_VECTOR_ERROR_BASE + 3;
+
+//**************************************************************************************************
+// Execution context
+//**************************************************************************************************
+
+pub struct FunctionContext<'env> {
+    // context
+    holder: &'env FunctionTargetsHolder,
+    target: FunctionTarget<'env>,
+    ty_args: Vec<BaseType>,
+    label_offsets: BTreeMap<Label, CodeOffset>,
+    // debug
+    level: usize,
+}
+
+impl<'env> FunctionContext<'env> {
+    pub fn new(
+        holder: &'env FunctionTargetsHolder,
+        target: FunctionTarget<'env>,
+        ty_args: Vec<BaseType>,
+        level: usize,
+    ) -> Self {
+        let label_offsets = Bytecode::label_offsets(target.get_bytecode());
+        Self {
+            holder,
+            target,
+            ty_args,
+            label_offsets,
+            level,
+        }
+    }
+
+    //
+    // settings
+    //
+
+    /// Retrieve the `InterpreterSettings` from the global environment
+    pub fn get_settings(&self) -> Rc<InterpreterSettings> {
+        self.target
+            .global_env()
+            .get_extension::<InterpreterSettings>()
+            .unwrap_or_default()
+    }
+
+    //
+    // execution
+    //
+
+    /// Collect addresses stored in the value recursively
+    fn collect_addresses(val: &BaseValue, addresses: &mut Vec<AccountAddress>) {
+        match val {
+            BaseValue::Address(v) | BaseValue::Signer(v) => {
+                addresses.push(*v);
+            }
+            BaseValue::Vector(vec) | BaseValue::Struct(vec) => {
+                for (_, val) in vec.iter().enumerate() {
+                    Self::collect_addresses(val, addresses);
+                }
+            }
+            BaseValue::Bool(_) => (),
+            BaseValue::Int(_) => (),
+        }
+    }
+
+    /// Execute a user function with value arguments.
+    pub fn exec_user_function(
+        &self,
+        skip_specs: bool,
+        typed_args: Vec<TypedValue>,
+        global_state: &mut GlobalState,
+        eval_state: &mut EvalState,
+    ) -> ExecResult<LocalState> {
+        // collect addresses
+        for (_, typed_arg) in typed_args.iter().enumerate() {
+            let mut addresses = vec![];
+            Self::collect_addresses(typed_arg.get_val(), &mut addresses);
+            global_state.put_touched_addresses(&addresses);
+        }
+
+        // execute the user function
+        let instructions = self.target.get_bytecode();
+        let debug_bytecode = self.get_settings().verbose_bytecode;
+        let mut local_state = self.prepare_local_state(skip_specs, typed_args);
+        while !local_state.is_terminated() {
+            let pc = local_state.get_pc() as usize;
+            let bytecode = instructions.get(pc).unwrap();
+            if debug_bytecode {
+                println!(
+                    "{} {}[{}]: {}",
+                    "-".repeat(self.level),
+                    self.target.func_env.get_full_name_str(),
+                    pc,
+                    bytecode.display(&self.target, &self.label_offsets)
+                );
+            }
+            self.exec_bytecode(bytecode, &mut local_state, global_state, eval_state)?;
+        }
+        Ok(local_state)
+    }
+
+    /// Execute a native function with the type arguments and value arguments.
+    fn exec_native_function(
+        &self,
+        srcs: &[TempIndex],
+        typed_args: Vec<TypedValue>,
+        local_state: &mut LocalState,
+        global_state: &mut GlobalState,
+    ) -> ExecResult<Vec<TypedValue>> {
+        let mut dummy_state = self.prepare_local_state(local_state.is_spec_skipped(), typed_args);
+        if cfg!(debug_assertions) {
+            assert_eq!(dummy_state.num_slots(), srcs.len());
+        }
+
+        // locate
+        let env = self.target.global_env();
+        let addr = *self.target.module_env().self_address();
+        let module_name = env
+            .symbol_pool()
+            .string(self.target.module_env().get_name().name());
+        let function_name = env.symbol_pool().string(self.target.get_name());
+
+        // dispatch
+        match (addr, module_name.as_str(), function_name.as_str()) {
+            (CORE_CODE_ADDRESS, "vector", "empty") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 0);
+                }
+                let res = self.native_vector_empty();
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "vector", "length") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_vector_length(dummy_state.del_value(0));
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "vector", "borrow") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 2);
+                }
+                self.native_vector_borrow(dummy_state.del_value(0), dummy_state.del_value(1))
+                    .map(|res| vec![res])
+            }
+            (CORE_CODE_ADDRESS, "vector", "borrow_mut") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 2);
+                }
+                self.native_vector_borrow_mut(
+                    *srcs.first().unwrap(),
+                    dummy_state.del_value(0),
+                    dummy_state.del_value(1),
+                )
+                .map(|res| vec![res])
+            }
+            (CORE_CODE_ADDRESS, "vector", "push_back") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 2);
+                }
+                let res = self
+                    .native_vector_push_back(dummy_state.del_value(0), dummy_state.del_value(1));
+                local_state.put_value_override(*srcs.first().unwrap(), res);
+                Ok(vec![])
+            }
+            (CORE_CODE_ADDRESS, "vector", "pop_back") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_vector_pop_back(dummy_state.del_value(0));
+                match res {
+                    Ok((new_vec, elem_val)) => {
+                        local_state.put_value_override(*srcs.first().unwrap(), new_vec);
+                        Ok(vec![elem_val])
+                    }
+                    Err(e) => Err(e),
+                }
+            }
+            (CORE_CODE_ADDRESS, "vector", "destroy_empty") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_vector_destroy_empty(dummy_state.del_value(0));
+                match res {
+                    Ok(_) => {
+                        local_state.del_value(*srcs.first().unwrap());
+                        Ok(vec![])
+                    }
+                    Err(e) => Err(e),
+                }
+            }
+            (CORE_CODE_ADDRESS, "vector", "swap") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 3);
+                }
+                let res = self.native_vector_swap(
+                    dummy_state.del_value(0),
+                    dummy_state.del_value(1),
+                    dummy_state.del_value(2),
+                );
+                match res {
+                    Ok(new_vec) => {
+                        local_state.put_value_override(*srcs.first().unwrap(), new_vec);
+                        Ok(vec![])
+                    }
+                    Err(e) => Err(e),
+                }
+            }
+            (CORE_CODE_ADDRESS, "signer", "borrow_address") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_signer_borrow_address(dummy_state.del_value(0));
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "hash", "sha2_256") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_hash_sha2_256(dummy_state.del_value(0));
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "hash", "sha3_256") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_hash_sha3_256(dummy_state.del_value(0));
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "bcs", "to_bytes") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                self.native_bcs_to_bytes(dummy_state.del_value(0))
+                    .map(|res| vec![res])
+            }
+            (CORE_CODE_ADDRESS, "event", "write_to_event_store") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 3);
+                }
+                self.native_event_write_to_event_store(
+                    dummy_state.del_value(0),
+                    dummy_state.del_value(1),
+                    dummy_state.del_value(2),
+                    global_state,
+                );
+                Ok(vec![])
+            }
+            (CORE_CODE_ADDRESS, "Signature", "ed25519_validate_pubkey") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                let res = self.native_signature_ed25519_validate_pubkey(dummy_state.del_value(0));
+                Ok(vec![res])
+            }
+            (CORE_CODE_ADDRESS, "Signature", "ed25519_verify") => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 3);
+                }
+                let res = self.native_signature_ed25519_signature_verification(
+                    dummy_state.del_value(0),
+                    dummy_state.del_value(1),
+                    dummy_state.del_value(2),
+                );
+                Ok(vec![res])
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    fn exec_bytecode(
+        &self,
+        bytecode: &Bytecode,
+        local_state: &mut LocalState,
+        global_state: &mut GlobalState,
+        eval_state: &mut EvalState,
+    ) -> ExecResult<()> {
+        match bytecode {
+            Bytecode::Assign(_, dst, src, kind) => {
+                self.handle_assign(*dst, *src, kind, local_state)
+            }
+            Bytecode::Load(_, dst, constant) => self.handle_load(*dst, constant, local_state),
+            Bytecode::Call(_, dsts, op, srcs, on_abort) => self.handle_operation(
+                dsts,
+                op,
+                srcs,
+                on_abort.as_ref(),
+                local_state,
+                global_state,
+                eval_state,
+            )?,
+            Bytecode::Label(_, label) => {
+                if cfg!(debug_assertions) {
+                    self.code_offset_by_label(*label);
+                }
+            }
+            Bytecode::Jump(_, label) => {
+                local_state.set_pc(self.code_offset_by_label(*label));
+            }
+            Bytecode::Branch(_, then_label, else_label, cond) => {
+                self.handle_conditional_branch(*cond, *then_label, *else_label, local_state)
+            }
+            Bytecode::Abort(_, index) => self.handle_abort(*index, local_state),
+            Bytecode::Ret(_, rets) => self.handle_return(rets, local_state),
+            Bytecode::Nop(_) => (),
+            Bytecode::SaveMem(_, mem_label, qid) => self.handle_save_mem(
+                *mem_label,
+                qid.module_id,
+                qid.id,
+                &qid.inst,
+                global_state,
+                eval_state,
+            ),
+            Bytecode::Prop(_, PropKind::Assert, exp) => {
+                if !local_state.is_spec_skipped() {
+                    self.handle_prop_assert(exp, eval_state, local_state, global_state)
+                }
+            }
+            Bytecode::Prop(_, PropKind::Assume, exp) => {
+                if !local_state.is_spec_skipped() {
+                    self.handle_prop_assume(exp, eval_state, local_state, global_state)?
+                }
+            }
+            // expressions (TODO: not supported yet)
+            Bytecode::Prop(_, PropKind::Modifies, _) => {}
+            // not-in-use as of now
+            Bytecode::SaveSpecVar(..) => unreachable!(),
+        }
+        local_state.ready_pc_for_next_instruction();
+        Ok(())
+    }
+
+    //
+    // per-bytecode processing
+    //
+
+    fn handle_assign(
+        &self,
+        dst: TempIndex,
+        src: TempIndex,
+        kind: &AssignKind,
+        local_state: &mut LocalState,
+    ) {
+        let into_val = match kind {
+            AssignKind::Move => {
+                let from_val = local_state.del_value(src);
+                from_val.assign_cast(local_state.get_type(dst).clone())
+            }
+            AssignKind::Copy => {
+                let from_val = local_state.get_value(src);
+                from_val.assign_cast(local_state.get_type(dst).clone())
+            }
+            AssignKind::Store => {
+                let from_val = local_state.get_value(src);
+                let into_ty = local_state.get_type(dst).clone();
+                if from_val.get_ty().is_ref(Some(true)) {
+                    from_val.borrow_direct(into_ty, src)
+                } else {
+                    from_val.assign_cast(into_ty)
+                }
+            }
+        };
+        local_state.put_value_override(dst, into_val);
+    }
+
+    fn handle_load(&self, dst: TempIndex, constant: &Constant, local_state: &mut LocalState) {
+        let val = match constant {
+            Constant::Bool(v) => TypedValue::mk_bool(*v),
+            Constant::U8(v) => TypedValue::mk_u8(*v),
+            Constant::U16(v) => TypedValue::mk_u16(*v),
+            Constant::U32(v) => TypedValue::mk_u32(*v),
+            Constant::U64(v) => TypedValue::mk_u64(*v),
+            Constant::U128(v) => TypedValue::mk_u128(*v),
+            Constant::U256(_) => unimplemented!(),
+            Constant::Address(v) => TypedValue::mk_address(
+                AccountAddress::from_hex_literal(&format!("{:#x}", v)).unwrap(),
+            ),
+            Constant::ByteArray(v) => {
+                let elems = v.iter().map(|e| TypedValue::mk_u8(*e)).collect();
+                TypedValue::mk_vector(BaseType::mk_u8(), elems)
+            }
+            Constant::AddressArray(v) => {
+                let elems = v
+                    .iter()
+                    .map(|e| {
+                        TypedValue::mk_address(
+                            AccountAddress::from_hex_literal(&format!("{:#x}", *e)).unwrap(),
+                        )
+                    })
+                    .collect();
+                TypedValue::mk_vector(BaseType::mk_address(), elems)
+            }
+            Constant::Vector(_) => unimplemented!(),
+        };
+        local_state.put_value_override(dst, val);
+    }
+
+    fn handle_operation(
+        &self,
+        dsts: &[TempIndex],
+        op: &Operation,
+        srcs: &[TempIndex],
+        on_abort: Option<&AbortAction>,
+        local_state: &mut LocalState,
+        global_state: &mut GlobalState,
+        eval_state: &mut EvalState,
+    ) -> ExecResult<()> {
+        // check abort handler
+        if cfg!(debug_assertions) {
+            match on_abort {
+                None => (),
+                Some(action) => {
+                    assert!(op.can_abort());
+                    assert!(local_state
+                        .get_type(action.1)
+                        .is_compatible_for_abort_code());
+                }
+            }
+        }
+
+        // operations that does not need to have the argument in storage
+        match op {
+            // built-ins
+            Operation::Uninit => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                self.handle_uninit(srcs[0], local_state);
+                return Ok(());
+            }
+            Operation::Destroy => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                self.handle_destroy(srcs[0], local_state);
+                return Ok(());
+            }
+            Operation::Stop => {
+                // we should never see the Stop operation in interpreter mode
+                unreachable!()
+            }
+            Operation::Havoc(kind) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(dsts.len(), 1);
+                    let target_ty = local_state.get_type(*dsts.first().unwrap());
+                    match kind {
+                        HavocKind::Value => {
+                            assert!(target_ty.is_base());
+                        }
+                        HavocKind::MutationValue | HavocKind::MutationAll => {
+                            assert!(target_ty.is_ref(Some(true)));
+                        }
+                    }
+                }
+                return Ok(());
+            }
+            // debugging
+            Operation::TraceLocal(index) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                    assert_eq!(local_state.get_type(*index), local_state.get_type(srcs[0]));
+                }
+                return Ok(());
+            }
+            Operation::TraceReturn(num) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                    assert!(*num < self.target.get_return_count());
+                }
+                return Ok(());
+            }
+            Operation::TraceAbort => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                    assert!(local_state.get_type(srcs[0]).is_compatible_for_abort_code());
+                }
+                return Ok(());
+            }
+            Operation::TraceExp(_kind, node_id) => {
+                // Perhaps do something with kind?
+                if cfg!(debug_assertions) {
+                    let env = self.target.global_env();
+                    let node_ty =
+                        convert_model_local_type(env, &env.get_node_type(*node_id), &self.ty_args);
+                    assert_eq!(srcs.len(), 1);
+                    assert_eq!(local_state.get_type(srcs[0]), &node_ty);
+                }
+                return Ok(());
+            }
+            // all others require args to be collected up front
+            _ => (),
+        }
+
+        // collect arguments
+        let mut typed_args: Vec<_> = srcs.iter().map(|idx| local_state.get_value(*idx)).collect();
+
+        // case on operation type
+        let op_result = match op {
+            // function call
+            Operation::Function(module_id, fun_id, ty_args) => self.handle_call_function(
+                *module_id,
+                *fun_id,
+                ty_args,
+                typed_args,
+                srcs,
+                local_state,
+                global_state,
+                eval_state,
+            ),
+            // opaque
+            Operation::OpaqueCallBegin(module_id, fun_id, ty_args) => self.handle_call_function(
+                *module_id,
+                *fun_id,
+                ty_args,
+                typed_args,
+                srcs,
+                local_state,
+                global_state,
+                eval_state,
+            ),
+            Operation::OpaqueCallEnd(module_id, fun_id, ty_args) => {
+                self.handle_opaque_call_end(*module_id, *fun_id, ty_args, typed_args);
+                Ok(vec![])
+            }
+            // struct
+            Operation::Pack(module_id, struct_id, ty_args) => {
+                let packed = self.handle_pack(*module_id, *struct_id, ty_args, typed_args);
+                Ok(vec![packed])
+            }
+            Operation::Unpack(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let unpacked =
+                    self.handle_unpack(*module_id, *struct_id, ty_args, typed_args.remove(0));
+                Ok(unpacked)
+            }
+            Operation::GetField(module_id, struct_id, ty_args, field_num) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let field = self.handle_get_field(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    *field_num,
+                    typed_args.remove(0),
+                );
+                Ok(vec![field])
+            }
+            Operation::BorrowField(module_id, struct_id, ty_args, field_num) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let (is_mut, _) = local_state.get_type(dsts[0]).get_ref_type();
+                let field = self.handle_borrow_field(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    *field_num,
+                    is_mut,
+                    srcs[0],
+                    typed_args.remove(0),
+                );
+                Ok(vec![field])
+            }
+            Operation::MoveTo(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                self.handle_move_to(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    typed_args.remove(1),
+                    typed_args.remove(0),
+                    global_state,
+                )
+                .map(|_| Vec::new())
+            }
+            Operation::MoveFrom(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                self.handle_move_from(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    typed_args.remove(0),
+                    global_state,
+                )
+                .map(|object| vec![object])
+            }
+            Operation::GetGlobal(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                self.handle_get_global(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    typed_args.remove(0),
+                    global_state,
+                )
+                .map(|object| vec![object])
+            }
+            Operation::BorrowGlobal(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let (is_mut, _) = local_state.get_type(dsts[0]).get_ref_type();
+                self.handle_borrow_global(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    is_mut,
+                    typed_args.remove(0),
+                    global_state,
+                )
+                .map(|object| vec![object])
+            }
+            Operation::Exists(module_id, struct_id, ty_args) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let exists = self.handle_exists_global(
+                    *module_id,
+                    *struct_id,
+                    ty_args,
+                    typed_args.remove(0),
+                    global_state,
+                );
+                Ok(vec![exists])
+            }
+            // scope
+            Operation::PackRef
+            | Operation::UnpackRef
+            | Operation::PackRefDeep
+            | Operation::UnpackRefDeep => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                    let arg_ty = typed_args.get(0).unwrap().get_ty();
+                    assert!(arg_ty.is_struct() || arg_ty.is_ref_struct(Some(true)));
+                }
+                Ok(vec![])
+            }
+            // write-back
+            Operation::IsParent(BorrowNode::Reference(parent_idx), edge) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let result = self.handle_is_parent(*parent_idx, edge, typed_args.remove(0));
+                Ok(vec![result])
+            }
+            Operation::IsParent(_, _) => {
+                // only Reference can appear in BorrowNode
+                unreachable!()
+            }
+            Operation::WriteBack(BorrowNode::GlobalRoot(qid), edge) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                match edge {
+                    BorrowEdge::Direct => self.handle_write_back_global_struct(
+                        qid.module_id,
+                        qid.id,
+                        &qid.inst,
+                        typed_args.remove(0),
+                        global_state,
+                    ),
+                    _ => unreachable!(),
+                }
+                Ok(vec![])
+            }
+            Operation::WriteBack(BorrowNode::LocalRoot(idx), edge) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                match edge {
+                    BorrowEdge::Direct => {
+                        self.handle_write_back_local(*idx, typed_args.remove(0), local_state)
+                    }
+                    _ => unreachable!(),
+                }
+                Ok(vec![])
+            }
+            Operation::WriteBack(BorrowNode::Reference(idx), edge) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                match edge {
+                    BorrowEdge::Direct => {
+                        self.handle_write_back_ref_direct(*idx, typed_args.remove(0), local_state)
+                    }
+                    BorrowEdge::Field(qid, field_num) => self.handle_write_back_ref_field(
+                        qid.module_id,
+                        qid.id,
+                        &qid.inst,
+                        *idx,
+                        *field_num,
+                        typed_args.remove(0),
+                        local_state,
+                    ),
+                    BorrowEdge::Index(_) => {
+                        self.handle_write_back_ref_element(*idx, typed_args.remove(0), local_state)
+                    }
+                    BorrowEdge::Hyper(hyper) => self.handle_write_back_ref_hyper(
+                        hyper,
+                        *idx,
+                        typed_args.remove(0),
+                        local_state,
+                    ),
+                }
+                Ok(vec![])
+            }
+            Operation::WriteBack(BorrowNode::ReturnPlaceholder(_), ..) => {
+                // this node should never appear in bytecode
+                unreachable!()
+            }
+            // references
+            Operation::BorrowLoc => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let (is_mut, _) = local_state.get_type(dsts[0]).get_ref_type();
+                let object = self.handle_borrow_local(is_mut, typed_args.remove(0), srcs[0]);
+                Ok(vec![object])
+            }
+            Operation::ReadRef => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let object = self.handle_read_ref(typed_args.remove(0));
+                Ok(vec![object])
+            }
+            Operation::WriteRef => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                self.handle_write_ref(typed_args.remove(1), srcs[0], local_state);
+                Ok(vec![])
+            }
+            Operation::FreezeRef => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let object = self.handle_freeze_ref(typed_args.remove(0));
+                Ok(vec![object])
+            }
+            // cast
+            Operation::CastU8
+            | Operation::CastU16
+            | Operation::CastU32
+            | Operation::CastU64
+            | Operation::CastU128
+            | Operation::CastU256 => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let val = typed_args.remove(0);
+                match op {
+                    Operation::CastU8 => self.handle_cast_u8(val),
+                    Operation::CastU16 => self.handle_cast_u16(val),
+                    Operation::CastU32 => self.handle_cast_u32(val),
+                    Operation::CastU64 => self.handle_cast_u64(val),
+                    Operation::CastU128 => self.handle_cast_u128(val),
+                    Operation::CastU256 => self.handle_cast_u256(val),
+                    _ => unreachable!(),
+                }
+                .map(|casted| vec![casted])
+            }
+            // binary arithmetic
+            Operation::Add | Operation::Sub | Operation::Mul | Operation::Div | Operation::Mod => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                self.handle_binary_arithmetic(op, lhs, rhs, local_state.get_type(dsts[0]))
+                    .map(|calculated| vec![calculated])
+            }
+            // binary bitwise
+            Operation::BitAnd | Operation::BitOr | Operation::Xor => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                let calculated =
+                    self.handle_binary_bitwise(op, lhs, rhs, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // binary bitshift
+            Operation::Shl | Operation::Shr => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                let calculated =
+                    self.handle_binary_bitshift(op, lhs, rhs, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // binary comparison
+            Operation::Lt | Operation::Le | Operation::Ge | Operation::Gt => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                let calculated =
+                    self.handle_binary_comparison(op, lhs, rhs, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // binary equality
+            Operation::Eq | Operation::Neq => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                let calculated =
+                    self.handle_binary_equality(op, lhs, rhs, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // unary boolean
+            Operation::Not => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 1);
+                }
+                let opv = typed_args.remove(0);
+                let calculated = self.handle_unary_boolean(op, opv, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // binary boolean
+            Operation::And | Operation::Or => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_args.len(), 2);
+                }
+                let rhs = typed_args.remove(1);
+                let lhs = typed_args.remove(0);
+                let calculated =
+                    self.handle_binary_boolean(op, lhs, rhs, local_state.get_type(dsts[0]));
+                Ok(vec![calculated])
+            }
+            // event (TODO: not supported yet)
+            Operation::EmitEvent | Operation::EventStoreDiverge => Ok(vec![]),
+            // already handled
+            Operation::Stop
+            | Operation::Uninit
+            | Operation::Destroy
+            | Operation::Havoc(..)
+            | Operation::TraceLocal(..)
+            | Operation::TraceReturn(..)
+            | Operation::TraceAbort
+            | Operation::TraceExp(..)
+            | Operation::TraceGlobalMem(..) => {
+                unreachable!();
+            }
+        };
+
+        // handle result
+        match op_result {
+            Ok(typed_rets) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(typed_rets.len(), dsts.len());
+                }
+                for (typed_ret, &idx) in typed_rets.into_iter().zip(dsts) {
+                    local_state.put_value_override(idx, typed_ret);
+                }
+            }
+            Err(abort_info) => match on_abort {
+                None => {
+                    return Err(abort_info);
+                }
+                Some(action) => {
+                    let abort_idx = action.1;
+                    let abort_val = if local_state.get_type(abort_idx).is_u64() {
+                        TypedValue::mk_u64(abort_info.get_status_code())
+                    } else {
+                        TypedValue::mk_num(BigInt::from(abort_info.get_status_code()))
+                    };
+                    local_state.put_value(abort_idx, abort_val);
+                    local_state.set_pc(self.code_offset_by_label(action.0));
+                    local_state.transit_to_post_abort(abort_info);
+                }
+            },
+        }
+        Ok(())
+    }
+
+    fn handle_call_function(
+        &self,
+        module_id: ModuleId,
+        fun_id: FunId,
+        ty_args: &[MT::Type],
+        typed_args: Vec<TypedValue>,
+        srcs: &[TempIndex],
+        local_state: &mut LocalState,
+        global_state: &mut GlobalState,
+        eval_state: &mut EvalState,
+    ) -> ExecResult<Vec<TypedValue>> {
+        let env = self.target.global_env();
+        let callee_env = env.get_function(module_id.qualified(fun_id));
+        let callee_ctxt = self.derive_callee_ctxt(&callee_env, ty_args);
+
+        // check argument count and types
+        if cfg!(debug_assertions) {
+            assert_eq!(callee_ctxt.target.get_parameter_count(), typed_args.len());
+        }
+
+        // short-circuit the execution if this is a native function
+        if callee_env.is_native() {
+            return callee_ctxt.exec_native_function(srcs, typed_args, local_state, global_state);
+        }
+
+        // collect mutable arguments
+        let mut_args: BTreeMap<_, _> = typed_args
+            .iter()
+            .enumerate()
+            .filter(|(_, arg)| arg.get_ty().is_ref(Some(true)))
+            .map(|(callee_idx, _)| (callee_idx, srcs[callee_idx]))
+            .collect();
+
+        // wrap the pointer in mut_ref args
+        let typed_args = typed_args
+            .into_iter()
+            .enumerate()
+            .map(|(idx, arg)| {
+                if mut_args.contains_key(&idx) {
+                    arg.box_into_mut_ref_arg(srcs[idx])
+                } else {
+                    arg
+                }
+            })
+            .collect();
+
+        // execute the user function
+        let mut callee_state = callee_ctxt.exec_user_function(
+            local_state.is_spec_skipped(),
+            typed_args,
+            global_state,
+            eval_state,
+        )?;
+
+        // update mutable arguments
+        for (callee_idx, origin_idx) in mut_args {
+            let old_val = local_state.del_value(origin_idx);
+            let new_val = if callee_state.has_value(callee_idx) {
+                callee_state.del_value(callee_idx)
+            } else {
+                callee_state.load_destroyed_arg(callee_idx)
+            }
+            .unbox_from_mut_ref_arg();
+            if cfg!(debug_assertions) {
+                assert_eq!(old_val.get_ptr(), new_val.get_ptr());
+            }
+            local_state.put_value(origin_idx, new_val);
+        }
+
+        // check callee termination status
+        let termination = callee_state.into_termination_status();
+        match termination {
+            TerminationStatus::Abort(abort_info) => Err(abort_info),
+            TerminationStatus::Return(return_vals) => Ok(return_vals),
+            TerminationStatus::None | TerminationStatus::PostAbort(_) => unreachable!(),
+        }
+    }
+
+    fn handle_opaque_call_end(
+        &self,
+        module_id: ModuleId,
+        fun_id: FunId,
+        ty_args: &[MT::Type],
+        typed_args: Vec<TypedValue>,
+    ) {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let callee_env = env.get_function(module_id.qualified(fun_id));
+            let callee_ctxt = self.derive_callee_ctxt(&callee_env, ty_args);
+            assert_eq!(callee_ctxt.target.get_parameter_count(), typed_args.len());
+        }
+    }
+
+    fn handle_pack(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_fields: Vec<TypedValue>,
+    ) -> TypedValue {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        if cfg!(debug_assertions) {
+            assert_eq!(inst.fields.len(), op_fields.len());
+        }
+        TypedValue::mk_struct(inst, op_fields)
+    }
+
+    fn handle_unpack(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_struct: TypedValue,
+    ) -> Vec<TypedValue> {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+            assert_eq!(&inst, op_struct.get_ty().get_struct_inst());
+        }
+        op_struct.unpack_struct()
+    }
+
+    fn handle_get_field(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        field_num: usize,
+        op_struct: TypedValue,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+            assert!(
+                op_struct.get_ty().is_struct_of(&inst)
+                    || op_struct.get_ty().is_ref_struct_of(&inst, None)
+            );
+        }
+        if op_struct.get_ty().is_struct() {
+            op_struct.unpack_struct_field(field_num)
+        } else {
+            op_struct.unpack_ref_struct_field(field_num, None)
+        }
+    }
+
+    fn handle_borrow_field(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        field_num: usize,
+        is_mut: bool,
+        local_idx: TempIndex,
+        op_struct: TypedValue,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+            assert_eq!(&inst, op_struct.get_ty().get_ref_struct_inst(None));
+        }
+        op_struct.borrow_ref_struct_field(field_num, is_mut, local_idx)
+    }
+
+    fn handle_move_to(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_signer: TypedValue,
+        op_struct: TypedValue,
+        global_state: &mut GlobalState,
+    ) -> Result<(), AbortInfo> {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = op_signer.into_signer();
+        if global_state.has_resource(&addr, &inst) {
+            return Err(self.sys_abort(StatusCode::RESOURCE_ALREADY_EXISTS));
+        }
+        global_state.put_resource(addr, inst, op_struct);
+        Ok(())
+    }
+
+    fn handle_move_from(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_addr: TypedValue,
+        global_state: &mut GlobalState,
+    ) -> Result<TypedValue, AbortInfo> {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = op_addr.into_address();
+        match global_state.del_resource(addr, inst) {
+            None => Err(self.sys_abort(StatusCode::MISSING_DATA)),
+            Some(object) => Ok(object),
+        }
+    }
+
+    fn handle_get_global(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_addr: TypedValue,
+        global_state: &mut GlobalState,
+    ) -> Result<TypedValue, AbortInfo> {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = op_addr.into_address();
+        match global_state.get_resource_for_code(None, addr, inst) {
+            None => Err(self.sys_abort(StatusCode::MISSING_DATA)),
+            Some(object) => Ok(object),
+        }
+    }
+
+    fn handle_borrow_global(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        is_mut: bool,
+        op_addr: TypedValue,
+        global_state: &mut GlobalState,
+    ) -> Result<TypedValue, AbortInfo> {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = op_addr.into_address();
+        match global_state.get_resource_for_code(Some(is_mut), addr, inst) {
+            None => Err(self.sys_abort(StatusCode::MISSING_DATA)),
+            Some(object) => Ok(object),
+        }
+    }
+
+    fn handle_exists_global(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_addr: TypedValue,
+        global_state: &GlobalState,
+    ) -> TypedValue {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = op_addr.into_address();
+        TypedValue::mk_bool(global_state.has_resource(&addr, &inst))
+    }
+
+    fn handle_is_parent(
+        &self,
+        parent_idx: TempIndex,
+        edge: &BorrowEdge,
+        op_val: TypedValue,
+    ) -> TypedValue {
+        fn follow_pointer_edge(p: &Pointer, e: &BorrowEdge) -> bool {
+            match (p, e) {
+                (Pointer::RefField(_, p_field_num), BorrowEdge::Field(_, e_field_num)) => {
+                    p_field_num == e_field_num
+                }
+                (Pointer::RefElement(_, _), BorrowEdge::Index(_)) => true,
+                _ => false,
+            }
+        }
+
+        fn follow_pointer_trace(trace: &[Pointer], edges: &[BorrowEdge]) -> bool {
+            for (p, e) in trace.iter().rev().zip(edges.iter()) {
+                if !follow_pointer_edge(p, e) {
+                    return false;
+                }
+            }
+            true
+        }
+
+        let (_, _, ptr) = op_val.decompose();
+        let is_parent = match ptr {
+            Pointer::RefDirect(idx) => idx == parent_idx,
+            Pointer::RefField(idx, _) => idx == parent_idx,
+            Pointer::RefElement(idx, _) => idx == parent_idx,
+            Pointer::ArgRef(idx, _) => idx == parent_idx,
+            Pointer::RetRef(mut trace) => match trace.pop().unwrap() {
+                Pointer::ArgRef(idx, _) => {
+                    if idx == parent_idx {
+                        if trace.len() == 1 {
+                            follow_pointer_edge(trace.get(0).unwrap(), edge)
+                        } else {
+                            match edge {
+                                BorrowEdge::Hyper(hyper) => {
+                                    if hyper.len() == trace.len() {
+                                        follow_pointer_trace(&trace, hyper)
+                                    } else {
+                                        false
+                                    }
+                                }
+                                _ => false,
+                            }
+                        }
+                    } else {
+                        false
+                    }
+                }
+                _ => unreachable!(),
+            },
+            Pointer::None | Pointer::Local(_) | Pointer::Global(_) => unreachable!(),
+        };
+        TypedValue::mk_bool(is_parent)
+    }
+
+    fn handle_write_back_global_struct(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        op_struct: TypedValue,
+        global_state: &mut GlobalState,
+    ) {
+        let env = self.target.global_env();
+        let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+        let addr = match op_struct.get_ptr() {
+            // TODO (mengxu) this needs to be extended to check for actual address in borrow graph
+            // only put the resource back when the address matches
+            Pointer::Global(addr) => *addr,
+            _ => unreachable!(),
+        };
+        let old_resource = global_state.put_resource(addr, inst, op_struct.read_ref());
+        if cfg!(debug_assertions) {
+            assert!(old_resource.is_some());
+        }
+    }
+
+    fn handle_write_back_local(
+        &self,
+        local_root: TempIndex,
+        op_val: TypedValue,
+        local_state: &mut LocalState,
+    ) {
+        if cfg!(debug_assertions) {
+            assert!(op_val
+                .get_ty()
+                .is_ref_of(local_state.get_type(local_root).get_base_type(), Some(true)));
+            assert!(local_state.has_value(local_root));
+        }
+        match op_val.get_ptr() {
+            Pointer::Local(root_idx) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(*root_idx, local_root);
+                }
+                local_state.put_value_override(local_root, op_val.read_ref());
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    fn handle_write_back_ref_direct(
+        &self,
+        local_ref: TempIndex,
+        op_val: TypedValue,
+        local_state: &mut LocalState,
+    ) {
+        let old_val = local_state.del_value(local_ref);
+        if cfg!(debug_assertions) {
+            let new_ty = op_val.get_ty();
+            assert!(new_ty.is_ref(Some(true)));
+            assert_eq!(new_ty, old_val.get_ty());
+        }
+
+        let new_val = match op_val.get_ptr() {
+            Pointer::RefDirect(parent_idx) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(*parent_idx, local_ref);
+                }
+                old_val.update_ref_direct(op_val)
+            }
+            Pointer::RetRef(trace) => {
+                // check pointer validity
+                if cfg!(debug_assertions) {
+                    assert_eq!(trace.len(), 1);
+                    match trace.get(0).unwrap() {
+                        Pointer::ArgRef(ref_idx, original_ptr) => {
+                            assert_eq!(*ref_idx, local_ref);
+                            assert_eq!(original_ptr.as_ref(), old_val.get_ptr());
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+                op_val.unbox_from_mut_ref_ret()
+            }
+            _ => unreachable!(),
+        };
+        local_state.put_value(local_ref, new_val);
+    }
+
+    fn handle_write_back_ref_field(
+        &self,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        local_ref: TempIndex,
+        field_num: usize,
+        op_val: TypedValue,
+        local_state: &mut LocalState,
+    ) {
+        let old_struct = local_state.del_value(local_ref);
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let inst = convert_model_struct_type(env, module_id, struct_id, ty_args, &self.ty_args);
+            assert!(old_struct.get_ty().is_ref_struct_of(&inst, Some(true)));
+
+            // check pointer validity
+            match op_val.get_ptr() {
+                Pointer::RefField(ref_idx, ref_field) => {
+                    assert_eq!(*ref_field, field_num);
+                    assert_eq!(*ref_idx, local_ref);
+                }
+                Pointer::RetRef(trace) => {
+                    assert_eq!(trace.len(), 2);
+                    match trace.get(1).unwrap() {
+                        Pointer::ArgRef(ref_idx, _) => {
+                            assert_eq!(*ref_idx, local_ref);
+                        }
+                        _ => unreachable!(),
+                    }
+                    match trace.get(0).unwrap() {
+                        Pointer::RefField(_, ref_field) => {
+                            assert_eq!(*ref_field, field_num);
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+                _ => unreachable!(),
+            };
+        }
+        let new_struct = old_struct.update_ref_struct_field(field_num, op_val);
+        local_state.put_value(local_ref, new_struct);
+    }
+
+    fn handle_write_back_ref_element(
+        &self,
+        local_ref: TempIndex,
+        op_val: TypedValue,
+        local_state: &mut LocalState,
+    ) {
+        let old_vector = local_state.del_value(local_ref);
+        let elem_num = match op_val.get_ptr() {
+            Pointer::RefElement(ref_idx, elem_num) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(*ref_idx, local_ref);
+                }
+                elem_num
+            }
+            Pointer::RetRef(trace) => {
+                assert_eq!(trace.len(), 2);
+                match trace.get(1).unwrap() {
+                    Pointer::ArgRef(ref_idx, _) => {
+                        assert_eq!(*ref_idx, local_ref);
+                    }
+                    _ => unreachable!(),
+                }
+                match trace.get(0).unwrap() {
+                    Pointer::RefElement(_, elem_num) => elem_num,
+                    _ => unreachable!(),
+                }
+            }
+            _ => unreachable!(),
+        };
+        let new_vector = old_vector.update_ref_vector_element(*elem_num, op_val);
+        local_state.put_value(local_ref, new_vector);
+    }
+
+    fn handle_write_back_ref_hyper(
+        &self,
+        edges: &[BorrowEdge],
+        local_ref: TempIndex,
+        op_val: TypedValue,
+        local_state: &mut LocalState,
+    ) {
+        let new_val = match op_val.get_ptr() {
+            Pointer::RetRef(trace) => {
+                let steps = edges.len();
+                if cfg!(debug_assertions) {
+                    assert_eq!(trace.len(), steps + 1);
+                    match trace.last().unwrap() {
+                        Pointer::ArgRef(ref_idx, _) => assert_eq!(*ref_idx, local_ref),
+                        _ => unreachable!(),
+                    }
+                }
+
+                let mut cur = local_state.del_value(local_ref);
+                let mut path = vec![];
+                for (i, edge) in edges.iter().enumerate() {
+                    let ptr = trace.get(steps - 1 - i).unwrap();
+                    let sub = match (ptr, edge) {
+                        (
+                            Pointer::RefField(callee_idx, p_field_num),
+                            BorrowEdge::Field(qid, field_num),
+                        ) => {
+                            if cfg!(debug_assertions) {
+                                let env = self.target.global_env();
+                                let inst = convert_model_struct_type(
+                                    env,
+                                    qid.module_id,
+                                    qid.id,
+                                    &qid.inst,
+                                    &self.ty_args,
+                                );
+                                assert!(cur.get_ty().is_ref_struct_of(&inst, Some(true)));
+                                assert_eq!(p_field_num, field_num);
+                            }
+                            path.push(cur.clone());
+                            // NOTE: the local_idx argument can be any dummy value here
+                            cur.borrow_ref_struct_field(*field_num, true, *callee_idx)
+                        }
+                        (Pointer::RefElement(callee_idx, elem_num), BorrowEdge::Index(_)) => {
+                            if cfg!(debug_assertions) {
+                                assert!(cur.get_ty().is_ref_vector(Some(true)));
+                            }
+                            path.push(cur.clone());
+                            // NOTE: the local_idx argument can be any dummy value here
+                            cur.borrow_ref_vector_element(*elem_num, true, *callee_idx)
+                                .unwrap()
+                        }
+                        _ => unreachable!(),
+                    };
+                    cur = sub;
+                }
+
+                if cfg!(debug_assertions) {
+                    let new_ty = op_val.get_ty();
+                    assert!(new_ty.is_ref(Some(true)));
+                    assert_eq!(new_ty, cur.get_ty());
+                }
+
+                // TODO (mengxu): refactor the code to remove this clone
+                let mut cur = op_val.clone();
+                for (i, (val, edge)) in path.into_iter().zip(edges.iter()).rev().enumerate() {
+                    let ptr = trace.get(i).unwrap();
+                    let sub = match edge {
+                        BorrowEdge::Field(_, field_num) => {
+                            val.update_ref_struct_field(*field_num, cur)
+                        }
+                        BorrowEdge::Index(_) => {
+                            let elem_num = match ptr {
+                                Pointer::RefElement(_, elem_num) => elem_num,
+                                _ => unreachable!(),
+                            };
+                            val.update_ref_vector_element(*elem_num, cur)
+                        }
+                        _ => unreachable!(),
+                    };
+                    cur = sub;
+                }
+                cur
+            }
+            _ => unreachable!(),
+        };
+        local_state.put_value(local_ref, new_val);
+    }
+
+    fn handle_borrow_local(
+        &self,
+        is_mut: bool,
+        local_val: TypedValue,
+        local_idx: TempIndex,
+    ) -> TypedValue {
+        local_val.borrow_local(is_mut, local_idx)
+    }
+
+    fn handle_read_ref(&self, from_ref: TypedValue) -> TypedValue {
+        from_ref.read_ref()
+    }
+
+    fn handle_write_ref(
+        &self,
+        from_val: TypedValue,
+        into_ref: TempIndex,
+        local_state: &mut LocalState,
+    ) {
+        let old_val = local_state.del_value(into_ref);
+        let (old_ty, _, old_ptr) = old_val.decompose();
+        if cfg!(debug_assertions) {
+            assert!(old_ty.is_ref_of(from_val.get_ty().get_base_type(), Some(true)));
+        }
+        let new_val = from_val.write_ref(old_ptr);
+        local_state.put_value(into_ref, new_val);
+    }
+
+    fn handle_freeze_ref(&self, ref_val: TypedValue) -> TypedValue {
+        ref_val.freeze_ref()
+    }
+
+    fn handle_uninit(&self, local_idx: TempIndex, local_state: &mut LocalState) {
+        if cfg!(debug_assertions) {
+            assert!(!local_state.has_value(local_idx));
+        }
+        local_state.mark_uninit(local_idx);
+    }
+
+    fn handle_destroy(&self, local_idx: TempIndex, local_state: &mut LocalState) {
+        if local_state.unset_uninit(local_idx) {
+            if cfg!(debug_assertions) {
+                assert!(!local_state.has_value(local_idx));
+            }
+        } else {
+            let val = local_state.del_value(local_idx);
+            if local_idx < self.target.get_parameter_count() {
+                local_state.save_destroyed_arg(local_idx, val);
+            }
+        }
+    }
+
+    fn handle_cast_u8(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8()
+        } else if ty.is_u16() {
+            let v = val.into_u16();
+            if v > (u8::MAX as u16) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
+        } else if ty.is_u32() {
+            let v = val.into_u32();
+            if v > (u8::MAX as u32) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
+        } else if ty.is_u64() {
+            let v = val.into_u64();
+            if v > (u8::MAX as u64) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u8::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
+        } else {
+            let n = val.into_num();
+            match n.to_u8() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u8(v))
+    }
+
+    fn handle_cast_u16(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u16
+        } else if ty.is_u16() {
+            val.into_u16()
+        } else if ty.is_u32() {
+            let v = val.into_u32();
+            if v > (u16::MAX as u32) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else if ty.is_u64() {
+            let v = val.into_u64();
+            if v > (u16::MAX as u64) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u16::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else {
+            let n = val.into_num();
+            match n.to_u16() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u16(v))
+    }
+
+    fn handle_cast_u32(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u32
+        } else if ty.is_u16() {
+            val.into_u16() as u32
+        } else if ty.is_u32() {
+            val.into_u32()
+        } else if ty.is_u64() {
+            let v = val.into_u64();
+            if v > (u32::MAX as u64) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u32
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u32::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u32
+        } else {
+            let n = val.into_num();
+            match n.to_u32() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u32(v))
+    }
+
+    fn handle_cast_u64(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u64
+        } else if ty.is_u16() {
+            val.into_u16() as u64
+        } else if ty.is_u32() {
+            val.into_u32() as u64
+        } else if ty.is_u64() {
+            val.into_u64()
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u64::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u64
+        } else {
+            let n = val.into_num();
+            match n.to_u64() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u64(v))
+    }
+
+    fn handle_cast_u128(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u128
+        } else if ty.is_u16() {
+            val.into_u16() as u128
+        } else if ty.is_u32() {
+            val.into_u32() as u128
+        } else if ty.is_u64() {
+            val.into_u64() as u128
+        } else if ty.is_u128() {
+            val.into_u128()
+        } else {
+            let n = val.into_num();
+            match n.to_u128() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u128(v))
+    }
+
+    fn handle_cast_u256(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u128
+        } else if ty.is_u16() {
+            val.into_u16() as u128
+        } else if ty.is_u32() {
+            val.into_u32() as u128
+        } else if ty.is_u64() {
+            val.into_u64() as u128
+        } else if ty.is_u128() {
+            val.into_u128()
+        } else {
+            let n = val.into_num();
+            match n.to_u128() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u128(v))
+    }
+
+    fn handle_binary_arithmetic(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> Result<TypedValue, AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert!(res.is_compatible_for_arithmetic(lhs.get_ty(), rhs.get_ty()));
+        }
+
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::Add => lval + rval,
+            Operation::Sub => lval - rval,
+            Operation::Mul => lval * rval,
+            Operation::Div => {
+                if rval.is_zero() {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                lval / rval
+            }
+            Operation::Mod => {
+                if rval.is_zero() {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                lval % rval
+            }
+            _ => unreachable!(),
+        };
+
+        let res_val = if res.is_u8() {
+            match result.to_u8() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => TypedValue::mk_u8(v),
+            }
+        } else if res.is_u64() {
+            match result.to_u64() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => TypedValue::mk_u64(v),
+            }
+        } else if res.is_u128() {
+            match result.to_u128() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => TypedValue::mk_u128(v),
+            }
+        } else {
+            if cfg!(debug_assertions) {
+                assert!(res.is_num());
+            }
+            TypedValue::mk_num(result)
+        };
+        Ok(res_val)
+    }
+
+    fn handle_binary_bitwise(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(res.is_compatible_for_bitwise(lhs.get_ty(), rhs.get_ty()));
+        }
+
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::BitAnd => lval & rval,
+            Operation::BitOr => lval | rval,
+            Operation::Xor => lval ^ rval,
+            _ => unreachable!(),
+        };
+
+        if res.is_u8() {
+            TypedValue::mk_u8(result.to_u8().unwrap())
+        } else if res.is_u64() {
+            TypedValue::mk_u64(result.to_u64().unwrap())
+        } else {
+            if cfg!(debug_assertions) {
+                assert!(res.is_u128());
+            }
+            TypedValue::mk_u128(result.to_u128().unwrap())
+        }
+    }
+
+    fn handle_binary_bitshift(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(res.is_compatible_for_bitshift(lhs.get_ty()));
+            assert!(rhs.get_ty().is_u8());
+        }
+        let rval = rhs.into_u8();
+        if lhs.get_ty().is_u8() {
+            let lval = lhs.into_u8();
+            let result = match op {
+                Operation::Shl => lval << rval,
+                Operation::Shr => lval >> rval,
+                _ => unreachable!(),
+            };
+            TypedValue::mk_u8(result)
+        } else if lhs.get_ty().is_u64() {
+            let lval = lhs.into_u64();
+            let result = match op {
+                Operation::Shl => lval << rval,
+                Operation::Shr => lval >> rval,
+                _ => unreachable!(),
+            };
+            TypedValue::mk_u64(result)
+        } else {
+            assert!(lhs.get_ty().is_u128());
+            let lval = lhs.into_u128();
+            let result = match op {
+                Operation::Shl => lval << rval,
+                Operation::Shr => lval >> rval,
+                _ => unreachable!(),
+            };
+            TypedValue::mk_u128(result)
+        }
+    }
+
+    fn handle_binary_comparison(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(lhs.get_ty().is_compatible_for_comparison(rhs.get_ty()));
+            assert!(res.is_bool());
+        }
+
+        let lval = lhs.into_int();
+        let rval = rhs.into_int();
+        let result = match op {
+            Operation::Lt => lval < rval,
+            Operation::Le => lval <= rval,
+            Operation::Ge => lval >= rval,
+            Operation::Gt => lval > rval,
+            _ => unreachable!(),
+        };
+        TypedValue::mk_bool(result)
+    }
+
+    fn handle_binary_equality(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(lhs.get_ty().is_compatible_for_equality(rhs.get_ty()));
+            assert!(res.is_bool());
+        }
+        let lval = lhs.get_val();
+        let rval = rhs.get_val();
+        let result = match op {
+            Operation::Eq => lval == rval,
+            Operation::Neq => lval != rval,
+            _ => unreachable!(),
+        };
+        TypedValue::mk_bool(result)
+    }
+
+    fn handle_unary_boolean(&self, op: &Operation, opv: TypedValue, res: &Type) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(opv.get_ty().is_bool());
+            assert!(res.is_bool());
+        }
+        let opval = opv.into_bool();
+        let result = match op {
+            Operation::Not => !opval,
+            _ => unreachable!(),
+        };
+        TypedValue::mk_bool(result)
+    }
+
+    fn handle_binary_boolean(
+        &self,
+        op: &Operation,
+        lhs: TypedValue,
+        rhs: TypedValue,
+        res: &Type,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(lhs.get_ty().is_bool());
+            assert!(rhs.get_ty().is_bool());
+            assert!(res.is_bool());
+        }
+        let lval = lhs.into_bool();
+        let rval = rhs.into_bool();
+        let result = match op {
+            Operation::And => lval && rval,
+            Operation::Or => lval || rval,
+            _ => unreachable!(),
+        };
+        TypedValue::mk_bool(result)
+    }
+
+    fn handle_conditional_branch(
+        &self,
+        cond: TempIndex,
+        then_label: Label,
+        else_label: Label,
+        local_state: &mut LocalState,
+    ) {
+        let cond_val = local_state.get_value(cond);
+        if cfg!(debug_assertions) {
+            assert!(cond_val.get_ty().is_bool());
+        }
+        let label = if cond_val.into_bool() {
+            then_label
+        } else {
+            else_label
+        };
+        local_state.set_pc(self.code_offset_by_label(label));
+    }
+
+    fn handle_abort(&self, index: TempIndex, local_state: &mut LocalState) {
+        let val = local_state.get_value(index);
+        if cfg!(debug_assertions) {
+            assert!(val.get_ty().is_compatible_for_abort_code());
+        }
+        let abort_code = if val.get_ty().is_u64() {
+            val.into_u64()
+        } else {
+            val.into_num().to_u64().unwrap()
+        };
+        local_state.terminate_with_abort(self.usr_abort(abort_code));
+    }
+
+    fn handle_return(&self, rets: &[TempIndex], local_state: &mut LocalState) {
+        if cfg!(debug_assertions) {
+            let env = self.target.global_env();
+            let decl_ret_types = self.target.get_return_types();
+            assert_eq!(rets.len(), decl_ret_types.len());
+            for (ret_index, ret_decl_ty) in rets.iter().zip(decl_ret_types) {
+                let ret_ty = convert_model_local_type(env, ret_decl_ty, &self.ty_args);
+                assert_eq!(&ret_ty, local_state.get_type(*ret_index));
+            }
+        }
+
+        let ptrs = local_state.collect_pointers();
+        let ret_vals = rets
+            .iter()
+            .map(|index| {
+                let val = local_state.get_value(*index);
+                // mark mut_ref returns with the pointer trace
+                if val.get_ty().is_ref(Some(true)) {
+                    val.box_into_mut_ref_ret(&ptrs)
+                } else {
+                    val
+                }
+            })
+            .collect();
+        local_state.terminate_with_return(ret_vals);
+    }
+
+    fn handle_prop_assert(
+        &self,
+        exp: &Exp,
+        eval_state: &EvalState,
+        local_state: &LocalState,
+        global_state: &GlobalState,
+    ) {
+        let evaluator = Evaluator::new(
+            self.holder,
+            &self.target,
+            &self.ty_args,
+            self.level,
+            ExpState::default(),
+            eval_state,
+            local_state,
+            global_state,
+        );
+        evaluator.check_assert(exp);
+    }
+
+    fn handle_prop_assume(
+        &self,
+        exp: &Exp,
+        eval_state: &EvalState,
+        local_state: &mut LocalState,
+        global_state: &GlobalState,
+    ) -> ExecResult<()> {
+        let evaluator = Evaluator::new(
+            self.holder,
+            &self.target,
+            &self.ty_args,
+            self.level,
+            ExpState::default(),
+            eval_state,
+            local_state,
+            global_state,
+        );
+        match evaluator.check_assume(exp) {
+            None => (),
+            // handle let-bindings
+            Some(Ok((local_idx, local_val))) => {
+                local_state.put_value_override(local_idx, local_val);
+            }
+            Some(Err(_)) => {
+                // unable to find a satisfiable value for a let-binding
+                local_state.skip_specs();
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // natives
+    //
+
+    fn native_vector_empty(&self) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+        }
+        TypedValue::mk_vector(self.ty_args.get(0).unwrap().clone(), vec![])
+    }
+
+    fn native_vector_length(&self, vec_val: TypedValue) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            // NOTE: this function accepts a value instead of a reference!
+            // This is different from the Move native implementation.
+            assert_eq!(
+                vec_val.get_ty().get_vector_elem(),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        TypedValue::mk_u64(vec_val.into_vector().len() as u64)
+    }
+
+    fn native_vector_borrow(
+        &self,
+        vec_val: TypedValue,
+        elem_val: TypedValue,
+    ) -> Result<TypedValue, AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            // NOTE: this function accepts a value instead of a reference!
+            // This is different from the Move native implementation.
+            assert_eq!(
+                vec_val.get_ty().get_vector_elem(),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        let elem_num = elem_val.into_u64() as usize;
+        vec_val
+            .get_vector_element(elem_num)
+            .ok_or_else(|| self.usr_abort(INDEX_OUT_OF_BOUNDS))
+    }
+
+    fn native_vector_borrow_mut(
+        &self,
+        vec_idx: TempIndex,
+        vec_val: TypedValue,
+        elem_val: TypedValue,
+    ) -> Result<TypedValue, AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                vec_val.get_ty().get_ref_vector_elem(Some(true)),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        let elem_num = elem_val.into_u64() as usize;
+        vec_val
+            .borrow_ref_vector_element(elem_num, true, vec_idx)
+            .ok_or_else(|| self.usr_abort(INDEX_OUT_OF_BOUNDS))
+    }
+
+    fn native_vector_push_back(&self, vec_val: TypedValue, elem_val: TypedValue) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                vec_val.get_ty().get_ref_vector_elem(Some(true)),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        vec_val.update_ref_vector_push_back(elem_val)
+    }
+
+    fn native_vector_pop_back(
+        &self,
+        vec_val: TypedValue,
+    ) -> Result<(TypedValue, TypedValue), AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                vec_val.get_ty().get_ref_vector_elem(Some(true)),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        vec_val
+            .update_ref_vector_pop_back()
+            .ok_or_else(|| self.usr_abort(POP_EMPTY_VEC))
+    }
+
+    fn native_vector_destroy_empty(&self, vec_val: TypedValue) -> Result<(), AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                vec_val.get_ty().get_vector_elem(),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        if !vec_val.into_vector().is_empty() {
+            return Err(self.usr_abort(DESTROY_NON_EMPTY_VEC));
+        }
+        Ok(())
+    }
+
+    fn native_vector_swap(
+        &self,
+        vec_val: TypedValue,
+        lhs: TypedValue,
+        rhs: TypedValue,
+    ) -> Result<TypedValue, AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                vec_val.get_ty().get_ref_vector_elem(Some(true)),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        vec_val
+            .update_ref_vector_swap(lhs.into_u64() as usize, rhs.into_u64() as usize)
+            .ok_or_else(|| self.usr_abort(INDEX_OUT_OF_BOUNDS))
+    }
+
+    fn native_signer_borrow_address(&self, signer_val: TypedValue) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 0);
+        }
+        // NOTE: this function accepts a value instead of a reference!
+        // This is different from the Move native implementation.
+        let addr = signer_val.into_signer();
+        TypedValue::mk_address(addr)
+    }
+
+    fn native_hash_sha2_256(&self, bytes_val: TypedValue) -> TypedValue {
+        let elem_ty = BaseType::mk_u8();
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 0);
+            assert!(bytes_val.get_ty().is_vector_of(&elem_ty));
+        }
+        let bytes: Vec<_> = bytes_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let digest = sha2_256_of(&bytes);
+        let hashed = digest.into_iter().map(TypedValue::mk_u8).collect();
+        TypedValue::mk_vector(elem_ty, hashed)
+    }
+
+    fn native_hash_sha3_256(&self, bytes_val: TypedValue) -> TypedValue {
+        let elem_ty = BaseType::mk_u8();
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 0);
+            assert!(bytes_val.get_ty().is_vector_of(&elem_ty));
+        }
+        let bytes: Vec<_> = bytes_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let digest = sha3_256_of(&bytes);
+        let hashed = digest.into_iter().map(TypedValue::mk_u8).collect();
+        TypedValue::mk_vector(elem_ty, hashed)
+    }
+
+    fn native_bcs_to_bytes(&self, object: TypedValue) -> Result<TypedValue, AbortInfo> {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            object
+                .get_ty()
+                .is_ref_of(self.ty_args.get(0).unwrap(), Some(false));
+        }
+        object
+            .into_bcs_bytes()
+            .map(|bytes| {
+                let bcs_val = bytes.into_iter().map(TypedValue::mk_u8).collect();
+                TypedValue::mk_vector(BaseType::mk_u8(), bcs_val)
+            })
+            .ok_or_else(|| self.usr_abort(sub_status::NFE_BCS_SERIALIZATION_FAILURE))
+    }
+
+    fn native_event_write_to_event_store(
+        &self,
+        guid_val: TypedValue,
+        seq_val: TypedValue,
+        msg_val: TypedValue,
+        global_state: &mut GlobalState,
+    ) {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 1);
+            assert_eq!(
+                msg_val.get_ty().get_base_type(),
+                self.ty_args.get(0).unwrap()
+            );
+        }
+        let guid = guid_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let seq = seq_val.into_u64();
+        global_state.emit_event(guid, seq, msg_val);
+    }
+
+    fn native_signature_ed25519_validate_pubkey(&self, key: TypedValue) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 0);
+        }
+        let bytes: Vec<_> = key.into_vector().into_iter().map(|e| e.into_u8()).collect();
+        let valid = ed25519_deserialize_public_key(bytes.as_slice()).is_ok();
+        TypedValue::mk_bool(valid)
+    }
+
+    fn native_signature_ed25519_signature_verification(
+        &self,
+        sig_val: TypedValue,
+        key_val: TypedValue,
+        msg_val: TypedValue,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert_eq!(self.ty_args.len(), 0);
+        }
+
+        let sig_bytes: Vec<_> = sig_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let sig = match ed25519_deserialize_signature(sig_bytes.as_slice()) {
+            Ok(sig) => sig,
+            Err(_) => {
+                return TypedValue::mk_bool(false);
+            }
+        };
+
+        let key_bytes: Vec<_> = key_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let key = match ed25519_deserialize_public_key(key_bytes.as_slice()) {
+            Ok(key) => key,
+            Err(_) => {
+                return TypedValue::mk_bool(false);
+            }
+        };
+
+        let msg_bytes: Vec<_> = msg_val
+            .into_vector()
+            .into_iter()
+            .map(|e| e.into_u8())
+            .collect();
+        let verified = ed25519_verify_signature(&key, &sig, &msg_bytes).is_ok();
+        TypedValue::mk_bool(verified)
+    }
+
+    //
+    // expressions
+    //
+
+    fn handle_save_mem(
+        &self,
+        mem_label: MemoryLabel,
+        module_id: ModuleId,
+        struct_id: StructId,
+        ty_args: &[MT::Type],
+        global_state: &GlobalState,
+        eval_state: &mut EvalState,
+    ) {
+        let env = self.target.global_env();
+        let inst = convert_model_partial_struct_type(env, module_id, struct_id, ty_args);
+        eval_state.save_memory(mem_label, inst, global_state);
+    }
+
+    //
+    // utilities
+    //
+
+    fn code_offset_by_label(&self, label: Label) -> CodeOffset {
+        return *self.label_offsets.get(&label).unwrap();
+    }
+
+    fn module_location(&self) -> Location {
+        let module_id = self.target.module_env().get_verified_module().self_id();
+        Location::Module(module_id)
+    }
+
+    fn usr_abort(&self, status_code: u64) -> AbortInfo {
+        AbortInfo::User(status_code, self.module_location())
+    }
+
+    fn sys_abort(&self, status_code: StatusCode) -> AbortInfo {
+        AbortInfo::Internal(status_code, self.module_location())
+    }
+
+    fn derive_callee_ctxt(
+        &self,
+        callee_env: &'env FunctionEnv<'env>,
+        ty_args: &[MT::Type],
+    ) -> FunctionContext<'env> {
+        let env = self.target.global_env();
+        let callee_target = choose_variant(self.holder, callee_env);
+
+        // check and convert type arguments
+        if cfg!(debug_assertions) {
+            let callee_ty_params = callee_target.func_env.get_type_parameters();
+            // TODO (mengxu) verify type constraints
+            assert_eq!(callee_ty_params.len(), ty_args.len());
+        }
+        let callee_ty_insts: Vec<_> = ty_args
+            .iter()
+            .map(|ty_arg| convert_model_base_type(env, ty_arg, &self.ty_args))
+            .collect();
+
+        // build the context
+        FunctionContext::new(self.holder, callee_target, callee_ty_insts, self.level + 1)
+    }
+
+    fn prepare_local_state(&self, skip_specs: bool, typed_args: Vec<TypedValue>) -> LocalState {
+        let target = &self.target;
+        let env = target.global_env();
+
+        // discover and validate local slots
+        let param_decls = target.func_env.get_parameters();
+        if cfg!(debug_assertions) {
+            assert_eq!(param_decls.len(), typed_args.len());
+            assert!(param_decls.len() <= target.get_local_count());
+        }
+
+        let mut local_slots = vec![];
+        for (i, typed_arg) in typed_args.into_iter().enumerate() {
+            let name = env
+                .symbol_pool()
+                .string(target.get_local_name(i))
+                .to_string();
+
+            // check that types for local slots is compatible with the declared parameter type
+            if cfg!(debug_assertions) {
+                let local_ty = target.get_local_type(i);
+                let param_decl_ty = &param_decls.get(i).unwrap().1;
+                if local_ty != param_decl_ty {
+                    assert!(matches!(
+                            param_decl_ty,
+                            MT::Type::Reference(false, base_ty)
+                            if local_ty == base_ty.as_ref()));
+                }
+                let ty = convert_model_local_type(env, local_ty, &self.ty_args);
+                assert_eq!(&ty, typed_arg.get_ty());
+            }
+
+            let slot = LocalSlot::new_arg(name, typed_arg);
+            local_slots.push(slot);
+        }
+        for i in param_decls.len()..target.get_local_count() {
+            let name = env
+                .symbol_pool()
+                .string(target.get_local_name(i))
+                .to_string();
+            let ty = convert_model_local_type(env, target.get_local_type(i), &self.ty_args);
+            let slot = LocalSlot::new_tmp(name, ty);
+            local_slots.push(slot);
+        }
+        LocalState::new(local_slots, skip_specs)
+    }
+}
+
+//**************************************************************************************************
+// Entrypoint
+//**************************************************************************************************
+
+/// Entrypoint of the interpretation logic
+pub fn entrypoint(
+    holder: &FunctionTargetsHolder,
+    target: FunctionTarget,
+    ty_args: &[BaseType],
+    typed_args: Vec<TypedValue>,
+    skip_specs: bool,
+    level: usize,
+    global_state: &mut GlobalState,
+) -> ExecResult<Vec<TypedValue>> {
+    let mut eval_state = EvalState::default();
+    let ctxt = FunctionContext::new(holder, target, ty_args.to_vec(), level);
+    let local_state =
+        ctxt.exec_user_function(skip_specs, typed_args, global_state, &mut eval_state)?;
+    let termination = local_state.into_termination_status();
+    match termination {
+        TerminationStatus::Abort(abort_info) => Err(abort_info),
+        TerminationStatus::Return(return_vals) => Ok(return_vals),
+        TerminationStatus::None | TerminationStatus::PostAbort(_) => unreachable!(),
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/runtime.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/runtime.rs
new file mode 100644
index 000000000..8fd789bd4
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/runtime.rs
@@ -0,0 +1,331 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file implements the orchestration part of the stackless bytecode interpreter and also
+//! provides outside-facing interfaces for the clients of stackless bytecode interpreter. Clients
+//! of the interpreter should never directly interact with the statement player (in `player.rs`) nor
+//! the expression evaluator (in `evaluator.rs`).
+
+use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMResult};
+use move_core_types::{
+    language_storage::{StructTag, TypeTag},
+    runtime_value::MoveValue,
+    vm_status::StatusCode,
+};
+use move_model::{
+    model::{AbilitySet, FunctionEnv, GlobalEnv, TypeParameter},
+    ty as MT,
+};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget, function_target_pipeline::FunctionTargetsHolder,
+};
+
+use crate::{
+    concrete::{
+        player,
+        settings::InterpreterSettings,
+        ty::{
+            convert_model_base_type, BaseType, IntType, PrimitiveType, StructField,
+            StructInstantiation,
+        },
+        value::{GlobalState, TypedValue},
+    },
+    shared::{ident::StructIdent, variant::choose_variant},
+};
+
+/// A stackless bytecode runtime in charge of pre- and post-execution checking, conversion, and
+/// monitoring. The main, step-by-step interpretation loop is delegated to the `Player` instance.
+pub struct Runtime<'env> {
+    env: &'env GlobalEnv,
+    functions: &'env FunctionTargetsHolder,
+}
+
+impl<'env> Runtime<'env> {
+    //
+    // public interfaces
+    //
+
+    /// Construct a runtime with all information pre-loaded.
+    pub fn new(env: &'env GlobalEnv, functions: &'env FunctionTargetsHolder) -> Self {
+        Self { env, functions }
+    }
+
+    /// Execute a function (identified by `fun_id`) with given type arguments, arguments, and a
+    /// mutable reference of the global state. Returns the result of the execution. Any updates to
+    /// the global states is recorded in the mutable reference.
+    pub fn execute(
+        &self,
+        fun_env: &FunctionEnv,
+        ty_args: &[TypeTag],
+        args: &[MoveValue],
+        global_state: &mut GlobalState,
+    ) -> VMResult<Vec<TypedValue>> {
+        let (converted_ty_args, converted_args) =
+            check_and_convert_type_args_and_args(fun_env, ty_args, args)
+                .map_err(|e| e.finish(Location::Undefined))?;
+        let fun_target = choose_variant(self.functions, fun_env);
+        self.execute_target(
+            fun_target,
+            &converted_ty_args,
+            &converted_args,
+            global_state,
+        )
+    }
+
+    //
+    // execution internals
+    //
+
+    fn execute_target(
+        &self,
+        fun_target: FunctionTarget,
+        ty_args: &[BaseType],
+        args: &[TypedValue],
+        global_state: &mut GlobalState,
+    ) -> VMResult<Vec<TypedValue>> {
+        let settings = self
+            .env
+            .get_extension::<InterpreterSettings>()
+            .unwrap_or_default();
+        player::entrypoint(
+            self.functions,
+            fun_target,
+            ty_args,
+            args.to_vec(),
+            settings.no_expr_check,
+            /* level */ 1,
+            global_state,
+        )
+        .map_err(|abort_info| abort_info.into_err())
+    }
+}
+
+//**************************************************************************************************
+// Utilities
+//**************************************************************************************************
+
+fn check_and_convert_type_args_and_args(
+    fun_env: &FunctionEnv,
+    ty_args: &[TypeTag],
+    args: &[MoveValue],
+) -> PartialVMResult<(Vec<BaseType>, Vec<TypedValue>)> {
+    let env = fun_env.module_env.env;
+
+    // check and convert type arguments
+    check_type_instantiation(env, &fun_env.get_type_parameters(), ty_args)?;
+    let mut converted_ty_args = vec![];
+    for ty_arg in ty_args {
+        let converted = convert_move_type_tag(env, ty_arg)?;
+        converted_ty_args.push(converted);
+    }
+
+    // check and convert value arguments
+    let params = fun_env.get_parameters();
+    if params.len() != args.len() {
+        return Err(PartialVMError::new(
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ));
+    }
+    let mut converted_args = vec![];
+    for (i, (arg, param)) in args.iter().zip(params.into_iter()).enumerate() {
+        let local_ty = fun_env.get_local_type(i);
+        debug_assert_eq!(local_ty, param.1);
+
+        // NOTE: for historical reasons, we may receive `&signer` as arguments
+        // TODO (mengxu): clean this up when we no longer accept `&signer` as valid arguments
+        // for transaction scripts and `public(script)` functions.
+        match local_ty {
+            MT::Type::Reference(false, base_ty)
+                if matches!(*base_ty, MT::Type::Primitive(MT::PrimitiveType::Signer)) =>
+            {
+                match arg {
+                    MoveValue::Address(v) => {
+                        converted_args.push(TypedValue::mk_signer(*v));
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+                    }
+                }
+            }
+            _ => {
+                let base_ty = convert_model_base_type(env, &local_ty, &converted_ty_args);
+                let converted = convert_move_value(arg, &base_ty)?;
+                converted_args.push(converted);
+            }
+        }
+    }
+
+    Ok((converted_ty_args, converted_args))
+}
+
+pub fn convert_move_type_tag(env: &GlobalEnv, tag: &TypeTag) -> PartialVMResult<BaseType> {
+    let converted = match tag {
+        TypeTag::Bool => BaseType::mk_bool(),
+        TypeTag::U8 => BaseType::mk_u8(),
+        TypeTag::U16 => BaseType::mk_u16(),
+        TypeTag::U32 => BaseType::mk_u32(),
+        TypeTag::U64 => BaseType::mk_u64(),
+        TypeTag::U128 => BaseType::mk_u128(),
+        TypeTag::U256 => BaseType::mk_u256(),
+        TypeTag::Address => BaseType::mk_address(),
+        TypeTag::Signer => BaseType::mk_signer(),
+        TypeTag::Vector(elem_tag) => BaseType::mk_vector(convert_move_type_tag(env, elem_tag)?),
+        TypeTag::Struct(struct_tag) => {
+            BaseType::mk_struct(convert_move_struct_tag(env, struct_tag)?)
+        }
+    };
+    Ok(converted)
+}
+
+pub fn convert_move_struct_tag(
+    env: &GlobalEnv,
+    struct_tag: &StructTag,
+) -> PartialVMResult<StructInstantiation> {
+    // get struct env
+    let struct_id = env.find_struct_by_tag(struct_tag).ok_or_else(|| {
+        PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE).with_message(format!(
+            "Cannot find struct `{}::{}::{}`",
+            struct_tag.address.short_str_lossless(),
+            struct_tag.module,
+            struct_tag.name,
+        ))
+    })?;
+    let struct_env = env.get_struct(struct_id);
+    let ident = StructIdent::new(&struct_env);
+
+    // check and convert type args
+    check_type_instantiation(
+        env,
+        &struct_env.get_type_parameters(),
+        &struct_tag.type_params,
+    )?;
+    let insts = struct_tag
+        .type_params
+        .iter()
+        .map(|ty_arg| convert_move_type_tag(env, ty_arg))
+        .collect::<PartialVMResult<Vec<_>>>()?;
+
+    // collect fields
+    let fields = struct_env
+        .get_fields()
+        .map(|field_env| {
+            let field_name = env.symbol_pool().string(field_env.get_name()).to_string();
+            let field_ty = convert_model_base_type(env, &field_env.get_type(), &insts);
+            StructField {
+                name: field_name,
+                ty: field_ty,
+            }
+        })
+        .collect();
+
+    Ok(StructInstantiation {
+        ident,
+        insts,
+        fields,
+    })
+}
+
+pub fn convert_move_value(val: &MoveValue, ty: &BaseType) -> PartialVMResult<TypedValue> {
+    let converted = match (val, ty) {
+        (MoveValue::Bool(v), BaseType::Primitive(PrimitiveType::Bool)) => TypedValue::mk_bool(*v),
+        (MoveValue::U8(v), BaseType::Primitive(PrimitiveType::Int(IntType::U8))) => {
+            TypedValue::mk_u8(*v)
+        }
+        (MoveValue::U64(v), BaseType::Primitive(PrimitiveType::Int(IntType::U64))) => {
+            TypedValue::mk_u64(*v)
+        }
+        (MoveValue::U128(v), BaseType::Primitive(PrimitiveType::Int(IntType::U128))) => {
+            TypedValue::mk_u128(*v)
+        }
+        (MoveValue::Address(v), BaseType::Primitive(PrimitiveType::Address)) => {
+            TypedValue::mk_address(*v)
+        }
+        (MoveValue::Signer(v), BaseType::Primitive(PrimitiveType::Signer)) => {
+            TypedValue::mk_signer(*v)
+        }
+        (MoveValue::Vector(v), BaseType::Vector(elem)) => {
+            let converted = v
+                .iter()
+                .map(|e| convert_move_value(e, elem))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            TypedValue::mk_vector(*elem.clone(), converted)
+        }
+        (MoveValue::Struct(v), BaseType::Struct(inst)) => {
+            let fields = v.fields();
+            if fields.len() != inst.fields.len() {
+                return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+            }
+            let converted = fields
+                .iter()
+                .zip(inst.fields.iter())
+                .map(|(f, info)| convert_move_value(f, &info.ty))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            TypedValue::mk_struct(inst.clone(), converted)
+        }
+        _ => {
+            return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+        }
+    };
+    Ok(converted)
+}
+
+fn check_type_instantiation(
+    env: &GlobalEnv,
+    params: &[TypeParameter],
+    args: &[TypeTag],
+) -> PartialVMResult<()> {
+    if params.len() != args.len() {
+        return Err(PartialVMError::new(
+            StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+        ));
+    }
+    for (arg, param) in args.iter().zip(params) {
+        if !param.1 .0.is_subset(get_abilities(env, arg)?) {
+            return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+        }
+    }
+    Ok(())
+}
+
+fn get_abilities(env: &GlobalEnv, ty: &TypeTag) -> PartialVMResult<AbilitySet> {
+    match ty {
+        TypeTag::Bool
+        | TypeTag::U8
+        | TypeTag::U16
+        | TypeTag::U32
+        | TypeTag::U64
+        | TypeTag::U128
+        | TypeTag::U256
+        | TypeTag::Address => Ok(AbilitySet::PRIMITIVES),
+        TypeTag::Signer => Ok(AbilitySet::SIGNER),
+        TypeTag::Vector(elem_ty) => AbilitySet::polymorphic_abilities(
+            AbilitySet::VECTOR,
+            vec![false],
+            vec![get_abilities(env, elem_ty)?],
+        ),
+        TypeTag::Struct(struct_tag) => {
+            let struct_id = env.find_struct_by_tag(struct_tag).ok_or_else(|| {
+                PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find struct `{}::{}::{}`",
+                    struct_tag.address.short_str_lossless(),
+                    struct_tag.module,
+                    struct_tag.name,
+                ))
+            })?;
+            let struct_env = env.get_struct(struct_id);
+            let declared_phantom_parameters = (0..struct_env.get_type_parameters().len())
+                .map(|idx| struct_env.is_phantom_parameter(idx));
+            let ty_arg_abilities = struct_tag
+                .type_params
+                .iter()
+                .map(|arg| get_abilities(env, arg))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            AbilitySet::polymorphic_abilities(
+                struct_env.get_abilities(),
+                declared_phantom_parameters,
+                ty_arg_abilities,
+            )
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/settings.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/settings.rs
new file mode 100644
index 000000000..2bcf8bccf
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/settings.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[derive(Default, Clone)]
+pub struct InterpreterSettings {
+    /// skip expression checking
+    pub no_expr_check: bool,
+    /// dump stepwise bytecode
+    pub verbose_stepwise: bool,
+    /// dump bytecode trace
+    pub verbose_bytecode: bool,
+    /// dump expression trace
+    pub verbose_expression: bool,
+}
+
+impl InterpreterSettings {
+    pub fn verbose_default() -> Self {
+        Self {
+            verbose_stepwise: true,
+            verbose_bytecode: true,
+            verbose_expression: true,
+            ..Default::default()
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/ty.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/ty.rs
new file mode 100644
index 000000000..91cc6ee58
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/ty.rs
@@ -0,0 +1,928 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! The type system in move-model is a fat type system that is designed to cover all cases that can
+//! possibly appear in the whole bytecode transformation pipeline. Natually, this means that some
+//! types are no longer applicable when the Move program reaches the end of the transformation.
+//!
+//! The type system for the interpreter is a strict subset of what is offered in the move-model.
+//! In other word, it is slimmed down version of the type system in move-model and a very restricted
+//! set of types that are only applicable to the interpreter. Doing so enables us to write code in a
+//! more precise way. For example, a type argument can only be a `BaseType` and never a reference.
+//! Therefore, `BaseType` is preferred over `Type` for if a struct field/function argument holds
+//! a type argument (e.g., `struct FunctionContext {ty_args: Vec<BaseType>, ...}` is preferred over
+//! `ty_args: Vec<Type>`, as the former is more descriptive and less error prone).
+
+use std::fmt;
+
+use move_core_types::{
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    runtime_value::{MoveStructLayout, MoveTypeLayout},
+};
+use move_model::{
+    model::{GlobalEnv, ModuleId, StructId},
+    ty as MT,
+};
+use move_stackless_bytecode::stackless_bytecode::Constant;
+
+use crate::shared::ident::StructIdent;
+
+// avoid dependency to `move_binary_format::file_format`
+pub type TypeParameterIndex = u16;
+pub type CodeOffset = u16;
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum IntType {
+    Num,
+    U8,
+    U64,
+    U128,
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16,
+    U32,
+    U256,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum PrimitiveType {
+    Bool,
+    Int(IntType),
+    Address,
+    Signer,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct StructField {
+    pub name: String,
+    pub ty: BaseType,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct StructInstantiation {
+    pub ident: StructIdent,
+    pub insts: Vec<BaseType>,
+    pub fields: Vec<StructField>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum BaseType {
+    Primitive(PrimitiveType),
+    Vector(Box<BaseType>),
+    Struct(StructInstantiation),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Type {
+    Base(BaseType),
+    Reference(bool, BaseType),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum PartialBaseType {
+    Primitive(PrimitiveType),
+    Parameter(TypeParameterIndex),
+    Vector(Box<PartialBaseType>),
+    Struct(PartialStructInstantiation),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct PartialStructField {
+    pub name: String,
+    pub ty: PartialBaseType,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct PartialStructInstantiation {
+    pub ident: StructIdent,
+    pub insts: Vec<PartialBaseType>,
+    pub fields: Vec<PartialStructField>,
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for IntType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let repr = match self {
+            Self::Num => "num",
+            Self::U8 => "u8",
+            Self::U16 => "u16",
+            Self::U32 => "u32",
+            Self::U64 => "u64",
+            Self::U128 => "u128",
+            Self::U256 => "u256",
+        };
+        f.write_str(repr)
+    }
+}
+
+impl fmt::Display for PrimitiveType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Bool => write!(f, "bool"),
+            Self::Int(sub) => sub.fmt(f),
+            Self::Address => write!(f, "address"),
+            Self::Signer => write!(f, "signer"),
+        }
+    }
+}
+
+impl fmt::Display for StructInstantiation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let inst_tokens: Vec<_> = self.insts.iter().map(|t| t.to_string()).collect();
+        let field_tokens: Vec<_> = self
+            .fields
+            .iter()
+            .map(|f| format!("{}: {}", f.name, f.ty))
+            .collect();
+        write!(
+            f,
+            "struct {}<{}> {{{}}}",
+            self.ident,
+            inst_tokens.join(", "),
+            field_tokens.join(",")
+        )
+    }
+}
+
+impl fmt::Display for BaseType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Primitive(sub) => sub.fmt(f),
+            Self::Vector(sub) => write!(f, "vector<{}>", sub),
+            Self::Struct(inst) => inst.fmt(f),
+        }
+    }
+}
+
+impl fmt::Display for Type {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Base(sub) => sub.fmt(f),
+            Self::Reference(false, sub) => write!(f, "&{}", sub),
+            Self::Reference(true, sub) => write!(f, "&mut {}", sub),
+        }
+    }
+}
+
+impl fmt::Display for PartialBaseType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Primitive(sub) => sub.fmt(f),
+            Self::Parameter(idx) => write!(f, "#{}", idx),
+            Self::Vector(sub) => write!(f, "vector<{}>", sub),
+            Self::Struct(inst) => inst.fmt(f),
+        }
+    }
+}
+
+impl fmt::Display for PartialStructInstantiation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let inst_tokens: Vec<_> = self.insts.iter().map(|t| t.to_string()).collect();
+        let field_tokens: Vec<_> = self
+            .fields
+            .iter()
+            .map(|f| format!("{}: {}", f.name, f.ty))
+            .collect();
+        write!(
+            f,
+            "struct {}<{}> {{{}}}",
+            self.ident,
+            inst_tokens.join(", "),
+            field_tokens.join(",")
+        )
+    }
+}
+
+//**************************************************************************************************
+// Implementation
+//**************************************************************************************************
+
+impl StructInstantiation {
+    pub fn to_move_struct_tag(&self) -> StructTag {
+        let type_args = self.insts.iter().map(|e| e.to_move_type_tag()).collect();
+        StructTag {
+            address: self.ident.module.address,
+            module: Identifier::new(self.ident.module.name.as_str()).unwrap(),
+            name: Identifier::new(self.ident.name.as_str()).unwrap(),
+            type_params: type_args,
+        }
+    }
+
+    pub fn to_move_struct_layout(&self) -> MoveStructLayout {
+        MoveStructLayout::new(
+            self.fields
+                .iter()
+                .map(|e| e.ty.to_move_type_layout())
+                .collect(),
+        )
+    }
+}
+
+impl BaseType {
+    //
+    // factory
+    //
+
+    pub fn mk_bool() -> Self {
+        BaseType::Primitive(PrimitiveType::Bool)
+    }
+
+    pub fn mk_u8() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U8))
+    }
+
+    pub fn mk_u16() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U16))
+    }
+
+    pub fn mk_u32() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U32))
+    }
+
+    pub fn mk_u64() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U64))
+    }
+
+    pub fn mk_u128() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U128))
+    }
+
+    pub fn mk_u256() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U256))
+    }
+
+    pub fn mk_num() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::Num))
+    }
+
+    pub fn mk_address() -> Self {
+        BaseType::Primitive(PrimitiveType::Address)
+    }
+
+    pub fn mk_signer() -> Self {
+        BaseType::Primitive(PrimitiveType::Signer)
+    }
+
+    pub fn mk_vector(elem: BaseType) -> Self {
+        BaseType::Vector(Box::new(elem))
+    }
+
+    pub fn mk_struct(inst: StructInstantiation) -> Self {
+        BaseType::Struct(inst)
+    }
+
+    pub fn into_ref_type(self, is_mut: bool) -> Type {
+        Type::Reference(is_mut, self)
+    }
+
+    //
+    // helpers
+    //
+
+    pub fn is_bool(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Bool))
+    }
+
+    pub fn is_u8(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U8)))
+    }
+
+    pub fn is_u16(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U16)))
+    }
+
+    pub fn is_u32(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U32)))
+    }
+
+    pub fn is_u64(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U64)))
+    }
+
+    pub fn is_u128(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U128)))
+    }
+
+    pub fn is_u256(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U256)))
+    }
+
+    pub fn is_num(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::Num)))
+    }
+
+    pub fn is_int(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(_)))
+    }
+
+    pub fn is_address(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Address))
+    }
+
+    pub fn is_signer(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Signer))
+    }
+
+    pub fn is_vector(&self) -> bool {
+        matches!(self, BaseType::Vector(_))
+    }
+
+    pub fn is_struct(&self) -> bool {
+        matches!(self, BaseType::Struct(_))
+    }
+
+    pub fn get_vector_elem(&self) -> &BaseType {
+        match self {
+            BaseType::Vector(elem_ty) => elem_ty.as_ref(),
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn get_struct_inst(&self) -> &StructInstantiation {
+        match self {
+            BaseType::Struct(inst) => inst,
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn into_vector_elem(self) -> BaseType {
+        match self {
+            BaseType::Vector(elem_ty) => *elem_ty,
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn into_struct_inst(self) -> StructInstantiation {
+        match self {
+            BaseType::Struct(inst) => inst,
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn is_vector_of(&self, elem: &BaseType) -> bool {
+        self.is_vector() && self.get_vector_elem() == elem
+    }
+
+    pub fn is_struct_of(&self, inst: &StructInstantiation) -> bool {
+        self.is_struct() && self.get_struct_inst() == inst
+    }
+
+    //
+    // checking
+    //
+
+    pub fn is_compatible_for_assign(&self, other: &BaseType) -> bool {
+        match (self, other) {
+            (
+                BaseType::Primitive(PrimitiveType::Int(IntType::Num)),
+                BaseType::Primitive(PrimitiveType::Int(_)),
+            ) => true,
+            (
+                BaseType::Primitive(PrimitiveType::Int(_)),
+                BaseType::Primitive(PrimitiveType::Int(IntType::Num)),
+            ) => true,
+            _ => self == other,
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn is_compatible_for_equality(&self, other: &BaseType) -> bool {
+        self.is_compatible_for_assign(other)
+    }
+
+    pub fn is_compatible_for_arithmetic(&self, lhs: &BaseType, rhs: &BaseType) -> bool {
+        self.is_int()
+            && self.is_compatible_for_assign(lhs)
+            && self.is_compatible_for_assign(rhs)
+            && lhs.is_compatible_for_assign(rhs)
+    }
+
+    pub fn is_compatible_for_bitwise(&self, lhs: &BaseType, rhs: &BaseType) -> bool {
+        match (self, lhs, rhs) {
+            (BaseType::Primitive(PrimitiveType::Int(IntType::Num)), _, _) => false,
+            (
+                BaseType::Primitive(PrimitiveType::Int(self_ty)),
+                BaseType::Primitive(PrimitiveType::Int(lhs_ty)),
+                BaseType::Primitive(PrimitiveType::Int(rhs_ty)),
+            ) => self_ty == lhs_ty && self_ty == rhs_ty,
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_comparison(&self, other: &BaseType) -> bool {
+        self.is_int() && self.is_compatible_for_assign(other)
+    }
+
+    pub fn is_compatible_for_bitshift(&self, other: &BaseType) -> bool {
+        match (self, other) {
+            (BaseType::Primitive(PrimitiveType::Int(IntType::Num)), _) => false,
+            (
+                BaseType::Primitive(PrimitiveType::Int(self_ty)),
+                BaseType::Primitive(PrimitiveType::Int(other_ty)),
+            ) => self_ty == other_ty,
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_constant(&self, value: &Constant) -> bool {
+        match (self, value) {
+            (BaseType::Primitive(PrimitiveType::Bool), Constant::Bool(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::U8)), Constant::U8(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::U64)), Constant::U64(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::U128)), Constant::U128(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::Num)), Constant::U8(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::Num)), Constant::U64(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Int(IntType::Num)), Constant::U128(_)) => true,
+            (BaseType::Primitive(PrimitiveType::Address), Constant::Address(_)) => true,
+            (BaseType::Vector(elem_ty), Constant::ByteArray(_)) => {
+                elem_ty.as_ref() == &BaseType::mk_u8()
+            }
+            _ => false,
+        }
+    }
+
+    //
+    // conversion
+    //
+
+    pub fn to_move_type_tag(&self) -> TypeTag {
+        match self {
+            BaseType::Primitive(PrimitiveType::Bool) => TypeTag::Bool,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => TypeTag::U8,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => TypeTag::U16,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => TypeTag::U32,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => TypeTag::U64,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => TypeTag::U128,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => TypeTag::U256,
+            BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
+            BaseType::Primitive(PrimitiveType::Address) => TypeTag::Address,
+            BaseType::Primitive(PrimitiveType::Signer) => TypeTag::Signer,
+            BaseType::Vector(elem) => TypeTag::Vector(Box::new(elem.to_move_type_tag())),
+            BaseType::Struct(inst) => TypeTag::Struct(Box::new(inst.to_move_struct_tag())),
+        }
+    }
+
+    pub fn to_move_type_layout(&self) -> MoveTypeLayout {
+        match self {
+            BaseType::Primitive(PrimitiveType::Bool) => MoveTypeLayout::Bool,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => MoveTypeLayout::U8,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => MoveTypeLayout::U16,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => MoveTypeLayout::U32,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => MoveTypeLayout::U64,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => MoveTypeLayout::U128,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => MoveTypeLayout::U256,
+            BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
+            BaseType::Primitive(PrimitiveType::Address) => MoveTypeLayout::Address,
+            BaseType::Primitive(PrimitiveType::Signer) => MoveTypeLayout::Signer,
+            BaseType::Vector(elem) => MoveTypeLayout::Vector(Box::new(elem.to_move_type_layout())),
+            BaseType::Struct(inst) => MoveTypeLayout::Struct(inst.to_move_struct_layout()),
+        }
+    }
+}
+
+macro_rules! gen {
+    (
+        $mk_base:ident, $mk_ref:ident,
+        $is_base:ident, $is_ref:ident
+    ) => {
+        pub fn $mk_base() -> Self {
+            Self::Base(BaseType::$mk_base())
+        }
+        pub fn $mk_ref(is_mut: bool) -> Self {
+            Self::Reference(is_mut, BaseType::$mk_base())
+        }
+
+        pub fn $is_base(&self) -> bool {
+            self.is_base() && self.get_base_type().$is_base()
+        }
+        pub fn $is_ref(&self, is_mut_opt: Option<bool>) -> bool {
+            self.is_ref(is_mut_opt) && self.get_ref_type().1.$is_base()
+        }
+    };
+    (
+        $mk_base:ident, $mk_ref:ident,
+        $is_base:ident, $is_ref:ident,
+        $p:ident, $t:ty,
+        $get_base_p:ident, $get_ref_p:ident,
+        $into_base_p:ident, $into_ref_p:ident,
+        $is_base_of:ident, $is_ref_of:ident
+    ) => {
+        pub fn $mk_base($p: $t) -> Self {
+            Self::Base(BaseType::$mk_base($p))
+        }
+        pub fn $mk_ref($p: $t, is_mut: bool) -> Self {
+            Self::Reference(is_mut, BaseType::$mk_base($p))
+        }
+
+        pub fn $is_base(&self) -> bool {
+            self.is_base() && self.get_base_type().$is_base()
+        }
+        pub fn $is_ref(&self, is_mut_opt: Option<bool>) -> bool {
+            self.is_ref(is_mut_opt) && self.get_ref_type().1.$is_base()
+        }
+
+        pub fn $get_base_p(&self) -> &$t {
+            self.get_base_type().$get_base_p()
+        }
+        pub fn $get_ref_p(&self, is_mut_opt: Option<bool>) -> &$t {
+            let (self_is_mut, self_ty) = self.get_ref_type();
+            match is_mut_opt {
+                None => (),
+                Some(is_mut) => {
+                    if cfg!(debug_assertions) {
+                        assert_eq!(self_is_mut, is_mut);
+                    }
+                }
+            }
+            self_ty.$get_base_p()
+        }
+
+        pub fn $into_base_p(self) -> $t {
+            self.into_base_type().$into_base_p()
+        }
+        pub fn $into_ref_p(self, is_mut_opt: Option<bool>) -> $t {
+            let (self_is_mut, self_ty) = self.into_ref_type();
+            match is_mut_opt {
+                None => (),
+                Some(is_mut) => {
+                    if cfg!(debug_assertions) {
+                        assert_eq!(self_is_mut, is_mut);
+                    }
+                }
+            }
+            self_ty.$into_base_p()
+        }
+
+        pub fn $is_base_of(&self, $p: &$t) -> bool {
+            self.is_base() && self.get_base_type().$is_base_of($p)
+        }
+        pub fn $is_ref_of(&self, $p: &$t, is_mut_opt: Option<bool>) -> bool {
+            self.is_ref(is_mut_opt) && self.get_ref_type().1.$is_base_of($p)
+        }
+    };
+}
+
+#[allow(dead_code)]
+impl Type {
+    //
+    // factory
+    //
+
+    gen!(mk_bool, mk_ref_bool, is_bool, is_ref_bool);
+    gen!(mk_u8, mk_ref_u8, is_u8, is_ref_u8);
+    gen!(mk_u16, mk_ref_u16, is_u16, is_ref_u16);
+    gen!(mk_u32, mk_ref_u32, is_u32, is_ref_u32);
+    gen!(mk_u64, mk_ref_u64, is_u64, is_ref_u64);
+    gen!(mk_u128, mk_ref_u128, is_u128, is_ref_u128);
+    gen!(mk_u256, mk_ref_u256, is_u256, is_ref_u256);
+    gen!(mk_num, mk_ref_num, is_num, is_ref_num);
+    gen!(mk_address, mk_ref_address, is_address, is_ref_address);
+    gen!(mk_signer, mk_ref_signer, is_signer, is_ref_signer);
+    gen!(
+        mk_vector,
+        mk_ref_vector,
+        is_vector,
+        is_ref_vector,
+        elem,
+        BaseType,
+        get_vector_elem,
+        get_ref_vector_elem,
+        into_vector_elem,
+        into_ref_vector_elem,
+        is_vector_of,
+        is_ref_vector_of
+    );
+    gen!(
+        mk_struct,
+        mk_ref_struct,
+        is_struct,
+        is_ref_struct,
+        inst,
+        StructInstantiation,
+        get_struct_inst,
+        get_ref_struct_inst,
+        into_struct_inst,
+        into_ref_struct_inst,
+        is_struct_of,
+        is_ref_struct_of
+    );
+
+    //
+    // helpers
+    //
+
+    pub fn is_base(&self) -> bool {
+        matches!(self, Type::Base(_))
+    }
+
+    pub fn is_ref(&self, is_mut_opt: Option<bool>) -> bool {
+        matches!(
+            self,
+            Type::Reference(self_is_mut, _)
+            if is_mut_opt.map_or(true, |is_mut| *self_is_mut == is_mut)
+        )
+    }
+
+    pub fn get_base_type(&self) -> &BaseType {
+        match self {
+            Type::Base(base_ty) => base_ty,
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn get_ref_type(&self) -> (bool, &BaseType) {
+        match self {
+            Type::Reference(is_mut, base_ty) => (*is_mut, base_ty),
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn into_base_type(self) -> BaseType {
+        match self {
+            Type::Base(base_ty) => base_ty,
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn into_ref_type(self) -> (bool, BaseType) {
+        match self {
+            Type::Reference(is_mut, base_ty) => (is_mut, base_ty),
+            _ => unreachable!(),
+        }
+    }
+
+    pub fn is_base_of(&self, ty: &BaseType) -> bool {
+        self.is_base() && self.get_base_type() == ty
+    }
+
+    pub fn is_ref_of(&self, ty: &BaseType, is_mut_opt: Option<bool>) -> bool {
+        self.is_ref(is_mut_opt) && self.get_ref_type().1 == ty
+    }
+
+    pub fn is_int(&self) -> bool {
+        self.is_base() && self.get_base_type().is_int()
+    }
+
+    pub fn is_ref_int(&self, is_mut_opt: Option<bool>) -> bool {
+        self.is_ref(is_mut_opt) && self.get_ref_type().1.is_int()
+    }
+
+    //
+    // checking
+    //
+
+    pub fn is_compatible_for_assign(&self, other: &Type) -> bool {
+        match (self, other) {
+            (Type::Base(base_ty_1), Type::Base(base_ty_2)) => {
+                base_ty_1.is_compatible_for_assign(base_ty_2)
+            }
+            (Type::Reference(is_mut_1, base_ty_1), Type::Reference(is_mut_2, base_ty_2)) => {
+                is_mut_1 == is_mut_2 && base_ty_1.is_compatible_for_assign(base_ty_2)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_equality(&self, other: &Type) -> bool {
+        self.is_compatible_for_assign(other)
+    }
+
+    pub fn is_compatible_for_arithmetic(&self, lhs: &Type, rhs: &Type) -> bool {
+        match (self, lhs, rhs) {
+            (Type::Base(self_ty), Type::Base(lhs_ty), Type::Base(rhs_ty)) => {
+                self_ty.is_compatible_for_arithmetic(lhs_ty, rhs_ty)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_bitwise(&self, lhs: &Type, rhs: &Type) -> bool {
+        match (self, lhs, rhs) {
+            (Type::Base(self_ty), Type::Base(lhs_ty), Type::Base(rhs_ty)) => {
+                self_ty.is_compatible_for_bitwise(lhs_ty, rhs_ty)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_comparison(&self, other: &Type) -> bool {
+        match (self, other) {
+            (Type::Base(self_ty), Type::Base(other_ty)) => {
+                self_ty.is_compatible_for_comparison(other_ty)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_bitshift(&self, other: &Type) -> bool {
+        match (self, other) {
+            (Type::Base(self_ty), Type::Base(other_ty)) => {
+                self_ty.is_compatible_for_bitshift(other_ty)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_constant(&self, value: &Constant) -> bool {
+        match self {
+            Type::Base(base_ty) => base_ty.is_compatible_for_constant(value),
+            _ => false,
+        }
+    }
+
+    pub fn is_compatible_for_abort_code(&self) -> bool {
+        self.is_u64() || self.is_num()
+    }
+}
+
+impl PartialBaseType {
+    //
+    // factory
+    //
+
+    pub fn mk_bool() -> Self {
+        Self::Primitive(PrimitiveType::Bool)
+    }
+
+    pub fn mk_u8() -> Self {
+        Self::Primitive(PrimitiveType::Int(IntType::U8))
+    }
+
+    pub fn mk_u64() -> Self {
+        Self::Primitive(PrimitiveType::Int(IntType::U64))
+    }
+
+    pub fn mk_u128() -> Self {
+        Self::Primitive(PrimitiveType::Int(IntType::U128))
+    }
+
+    pub fn mk_num() -> Self {
+        Self::Primitive(PrimitiveType::Int(IntType::Num))
+    }
+
+    pub fn mk_address() -> Self {
+        Self::Primitive(PrimitiveType::Address)
+    }
+
+    pub fn mk_signer() -> Self {
+        Self::Primitive(PrimitiveType::Signer)
+    }
+
+    pub fn mk_parameter(idx: TypeParameterIndex) -> Self {
+        Self::Parameter(idx)
+    }
+
+    pub fn mk_vector(elem: Self) -> Self {
+        Self::Vector(Box::new(elem))
+    }
+
+    pub fn mk_struct(inst: PartialStructInstantiation) -> Self {
+        Self::Struct(inst)
+    }
+}
+
+//**************************************************************************************************
+// Conversion
+//**************************************************************************************************
+
+pub fn convert_model_local_type(env: &GlobalEnv, ty: &MT::Type, subst: &[BaseType]) -> Type {
+    match ty {
+        MT::Type::Primitive(..)
+        | MT::Type::Vector(..)
+        | MT::Type::Struct(..)
+        | MT::Type::TypeParameter(..) => Type::Base(convert_model_base_type(env, ty, subst)),
+        MT::Type::Reference(is_mut, base_ty) => {
+            convert_model_base_type(env, base_ty, subst).into_ref_type(*is_mut)
+        }
+        _ => unreachable!(),
+    }
+}
+
+pub fn convert_model_base_type(env: &GlobalEnv, ty: &MT::Type, subst: &[BaseType]) -> BaseType {
+    match ty {
+        MT::Type::Primitive(MT::PrimitiveType::Bool) => BaseType::mk_bool(),
+        MT::Type::Primitive(MT::PrimitiveType::U8) => BaseType::mk_u8(),
+        MT::Type::Primitive(MT::PrimitiveType::U64) => BaseType::mk_u64(),
+        MT::Type::Primitive(MT::PrimitiveType::U128) => BaseType::mk_u128(),
+        MT::Type::Primitive(MT::PrimitiveType::Num) => BaseType::mk_num(),
+        MT::Type::Primitive(MT::PrimitiveType::Address) => BaseType::mk_address(),
+        MT::Type::Primitive(MT::PrimitiveType::Signer) => BaseType::mk_signer(),
+        MT::Type::Vector(elem) => BaseType::mk_vector(convert_model_base_type(env, elem, subst)),
+        MT::Type::Struct(module_id, struct_id, ty_insts) => BaseType::mk_struct(
+            convert_model_struct_type(env, *module_id, *struct_id, ty_insts, subst),
+        ),
+        MT::Type::TypeParameter(index) => subst.get(*index as usize).unwrap().clone(),
+        _ => unreachable!(),
+    }
+}
+
+pub fn convert_model_struct_type(
+    env: &GlobalEnv,
+    module_id: ModuleId,
+    struct_id: StructId,
+    ty_args: &[MT::Type],
+    subst: &[BaseType],
+) -> StructInstantiation {
+    // derive struct identity
+    let struct_env = env.get_struct(module_id.qualified(struct_id));
+    let ident = StructIdent::new(&struct_env);
+
+    // check type arguments
+    if cfg!(debug_assertions) {
+        assert_eq!(struct_env.get_type_parameters().len(), ty_args.len());
+        // TODO (mengxu) verify type constraints
+    }
+
+    // convert instantiations
+    let insts: Vec<_> = ty_args
+        .iter()
+        .map(|ty_arg| convert_model_base_type(env, ty_arg, subst))
+        .collect();
+
+    // collect fields
+    let fields = struct_env
+        .get_fields()
+        .map(|field_env| {
+            let field_name = env.symbol_pool().string(field_env.get_name()).to_string();
+            let field_ty = convert_model_base_type(env, &field_env.get_type(), &insts);
+            StructField {
+                name: field_name,
+                ty: field_ty,
+            }
+        })
+        .collect();
+
+    // return the information for constructing the struct type
+    StructInstantiation {
+        ident,
+        insts,
+        fields,
+    }
+}
+
+pub fn convert_model_partial_base_type(env: &GlobalEnv, ty: &MT::Type) -> PartialBaseType {
+    match ty {
+        MT::Type::Primitive(MT::PrimitiveType::Bool) => PartialBaseType::mk_bool(),
+        MT::Type::Primitive(MT::PrimitiveType::U8) => PartialBaseType::mk_u8(),
+        MT::Type::Primitive(MT::PrimitiveType::U64) => PartialBaseType::mk_u64(),
+        MT::Type::Primitive(MT::PrimitiveType::U128) => PartialBaseType::mk_u128(),
+        MT::Type::Primitive(MT::PrimitiveType::Num) => PartialBaseType::mk_num(),
+        MT::Type::Primitive(MT::PrimitiveType::Address) => PartialBaseType::mk_address(),
+        MT::Type::Primitive(MT::PrimitiveType::Signer) => PartialBaseType::mk_signer(),
+        MT::Type::Vector(elem) => {
+            PartialBaseType::mk_vector(convert_model_partial_base_type(env, elem))
+        }
+        MT::Type::Struct(module_id, struct_id, ty_insts) => PartialBaseType::mk_struct(
+            convert_model_partial_struct_type(env, *module_id, *struct_id, ty_insts),
+        ),
+        MT::Type::TypeParameter(index) => PartialBaseType::mk_parameter(*index),
+        _ => unreachable!(),
+    }
+}
+
+pub fn convert_model_partial_struct_type(
+    env: &GlobalEnv,
+    module_id: ModuleId,
+    struct_id: StructId,
+    ty_args: &[MT::Type],
+) -> PartialStructInstantiation {
+    // derive struct identity
+    let struct_env = env.get_struct(module_id.qualified(struct_id));
+    let ident = StructIdent::new(&struct_env);
+
+    // check type arguments
+    if cfg!(debug_assertions) {
+        assert_eq!(struct_env.get_type_parameters().len(), ty_args.len());
+        // TODO (mengxu) verify type constraints
+    }
+
+    // convert instantiations
+    let insts: Vec<_> = ty_args
+        .iter()
+        .map(|ty_arg| convert_model_partial_base_type(env, ty_arg))
+        .collect();
+
+    // collect fields
+    let fields = struct_env
+        .get_fields()
+        .map(|field_env| {
+            let field_name = env.symbol_pool().string(field_env.get_name()).to_string();
+            let field_ty = convert_model_partial_base_type(env, &field_env.get_type());
+            PartialStructField {
+                name: field_name,
+                ty: field_ty,
+            }
+        })
+        .collect();
+
+    // return the information for constructing the struct type
+    PartialStructInstantiation {
+        ident,
+        insts,
+        fields,
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/value.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/value.rs
new file mode 100644
index 000000000..f96bd3672
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/concrete/value.rs
@@ -0,0 +1,1389 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file implements several value representations to track values produced and consumed during
+//! the statement interpretation and expression evaluation process. The value representations are
+//! carefully designed to match the type system. In particular, `BaseValue` must match `BaseType`
+//! and `TypedValue` must match `Type` (by match, we mean each value must have a way to type it,
+//! and each type must also have a way to construct a value of this type).
+
+use num::{BigInt, ToPrimitive};
+use std::collections::{BTreeMap, BTreeSet};
+
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    runtime_value::{MoveStruct, MoveValue},
+    u256,
+};
+use move_model::ast::{MemoryLabel, TempIndex};
+
+use crate::{
+    concrete::ty::{
+        BaseType, PartialStructInstantiation, PrimitiveType, StructInstantiation, Type,
+    },
+    shared::ident::StructIdent,
+};
+
+//**************************************************************************************************
+// Value core
+//**************************************************************************************************
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum BaseValue {
+    Bool(bool),
+    Int(BigInt),
+    Address(AccountAddress),
+    Signer(AccountAddress),
+    Vector(Vec<BaseValue>),
+    Struct(Vec<BaseValue>),
+}
+
+impl BaseValue {
+    pub fn mk_bool(v: bool) -> Self {
+        Self::Bool(v)
+    }
+    pub fn mk_u8(v: u8) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u16(v: u16) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u32(v: u32) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u64(v: u64) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u128(v: u128) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u256(v: u256::U256) -> Self {
+        Self::Int(BigInt::from(&v))
+    }
+    pub fn mk_num(v: BigInt) -> Self {
+        Self::Int(v)
+    }
+    pub fn mk_address(v: AccountAddress) -> Self {
+        Self::Address(v)
+    }
+    pub fn mk_signer(v: AccountAddress) -> Self {
+        Self::Signer(v)
+    }
+    pub fn mk_vector(v: Vec<BaseValue>) -> Self {
+        Self::Vector(v)
+    }
+    pub fn mk_struct(v: Vec<BaseValue>) -> Self {
+        Self::Struct(v)
+    }
+
+    pub fn into_bool(self) -> bool {
+        match self {
+            Self::Bool(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u8(self) -> u8 {
+        match self {
+            Self::Int(v) => v.to_u8().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u16(self) -> u16 {
+        match self {
+            Self::Int(v) => v.to_u16().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u32(self) -> u32 {
+        match self {
+            Self::Int(v) => v.to_u32().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u64(self) -> u64 {
+        match self {
+            Self::Int(v) => v.to_u64().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u128(self) -> u128 {
+        match self {
+            Self::Int(v) => v.to_u128().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u256(self) -> u256::U256 {
+        match self {
+            Self::Int(v) => u256::U256::from_le_bytes(
+                &v.to_bytes_le()
+                    .1
+                    .try_into()
+                    .unwrap_or_else(|_| panic!("Cannot convert {} to U256", v)),
+            ),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_num(self) -> BigInt {
+        match self {
+            Self::Int(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_int(self) -> BigInt {
+        match self {
+            Self::Int(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_address(self) -> AccountAddress {
+        match self {
+            Self::Address(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_signer(self) -> AccountAddress {
+        match self {
+            Self::Signer(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_vector(self) -> Vec<BaseValue> {
+        match self {
+            Self::Vector(v) => v,
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_struct(self) -> Vec<BaseValue> {
+        match self {
+            Self::Struct(v) => v,
+            _ => unreachable!(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Pointer {
+    None,
+    Global(AccountAddress),
+    Local(TempIndex),
+    RefDirect(TempIndex),
+    RefField(TempIndex, usize),
+    RefElement(TempIndex, usize),
+    ArgRef(TempIndex, Box<Pointer>),
+    RetRef(Vec<Pointer>),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct TypedValue {
+    ty: Type,
+    val: BaseValue,
+    ptr: Pointer,
+}
+
+#[allow(dead_code)]
+impl TypedValue {
+    pub fn fuse_base(ty: BaseType, val: BaseValue) -> Self {
+        fn type_match(ty: &BaseType, val: &BaseValue) -> bool {
+            match (ty, val) {
+                (BaseType::Primitive(PrimitiveType::Bool), BaseValue::Bool(_)) => true,
+                (BaseType::Primitive(PrimitiveType::Int(_)), BaseValue::Int(_)) => true,
+                (BaseType::Primitive(PrimitiveType::Address), BaseValue::Address(_)) => true,
+                (BaseType::Primitive(PrimitiveType::Signer), BaseValue::Signer(_)) => true,
+                (BaseType::Vector(elem_ty), BaseValue::Vector(elem_vals)) => elem_vals
+                    .iter()
+                    .all(|elem_val| type_match(elem_ty, elem_val)),
+                (BaseType::Struct(inst), BaseValue::Struct(field_vals)) => {
+                    field_vals.len() == inst.fields.len()
+                        && field_vals
+                            .iter()
+                            .zip(inst.fields.iter())
+                            .all(|(field_val, field_info)| type_match(&field_info.ty, field_val))
+                }
+                _ => false,
+            }
+        }
+
+        if cfg!(debug_assertions) {
+            assert!(type_match(&ty, &val));
+        }
+        Self {
+            ty: Type::Base(ty),
+            val,
+            ptr: Pointer::None,
+        }
+    }
+
+    //
+    // value creation
+    //
+
+    pub fn mk_bool(v: bool) -> Self {
+        Self {
+            ty: Type::mk_bool(),
+            val: BaseValue::mk_bool(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_u8(v: u8) -> Self {
+        Self {
+            ty: Type::mk_u8(),
+            val: BaseValue::mk_u8(v),
+            ptr: Pointer::None,
+        }
+    }
+
+    pub fn mk_u16(v: u16) -> Self {
+        Self {
+            ty: Type::mk_u16(),
+            val: BaseValue::mk_u16(v),
+            ptr: Pointer::None,
+        }
+    }
+
+    pub fn mk_u32(v: u32) -> Self {
+        Self {
+            ty: Type::mk_u32(),
+            val: BaseValue::mk_u32(v),
+            ptr: Pointer::None,
+        }
+    }
+
+    pub fn mk_u64(v: u64) -> Self {
+        Self {
+            ty: Type::mk_u64(),
+            val: BaseValue::mk_u64(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_u128(v: u128) -> Self {
+        Self {
+            ty: Type::mk_u128(),
+            val: BaseValue::mk_u128(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_num(v: BigInt) -> Self {
+        Self {
+            ty: Type::mk_num(),
+            val: BaseValue::mk_num(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_address(v: AccountAddress) -> Self {
+        Self {
+            ty: Type::mk_address(),
+            val: BaseValue::mk_address(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_signer(v: AccountAddress) -> Self {
+        Self {
+            ty: Type::mk_signer(),
+            val: BaseValue::mk_signer(v),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_vector(elem: BaseType, v: Vec<TypedValue>) -> Self {
+        if cfg!(debug_assertions) {
+            for e in &v {
+                assert_eq!(e.ty.get_base_type(), &elem);
+            }
+        }
+        Self {
+            ty: Type::mk_vector(elem),
+            val: BaseValue::mk_vector(v.into_iter().map(|e| e.val).collect()),
+            ptr: Pointer::None,
+        }
+    }
+    pub fn mk_struct(inst: StructInstantiation, v: Vec<TypedValue>) -> Self {
+        if cfg!(debug_assertions) {
+            assert_eq!(inst.fields.len(), v.len());
+            for (e, field) in v.iter().zip(inst.fields.iter()) {
+                assert_eq!(e.ty.get_base_type(), &field.ty);
+            }
+        }
+        Self {
+            ty: Type::mk_struct(inst),
+            val: BaseValue::mk_struct(v.into_iter().map(|e| e.val).collect()),
+            ptr: Pointer::None,
+        }
+    }
+
+    pub fn mk_ref_bool(v: bool, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_bool(is_mut),
+            val: BaseValue::mk_bool(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_u8(v: u8, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_u8(is_mut),
+            val: BaseValue::mk_u8(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_u64(v: u64, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_u64(is_mut),
+            val: BaseValue::mk_u64(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_u128(v: u128, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_u128(is_mut),
+            val: BaseValue::mk_u128(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_u256(v: u256::U256, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_u256(is_mut),
+            val: BaseValue::mk_u256(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_num(v: BigInt, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_num(is_mut),
+            val: BaseValue::mk_num(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_address(v: AccountAddress, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_address(is_mut),
+            val: BaseValue::mk_address(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_signer(v: AccountAddress, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_signer(is_mut),
+            val: BaseValue::mk_signer(v),
+            ptr,
+        }
+    }
+    pub fn mk_ref_vector(elem: BaseType, v: Vec<TypedValue>, is_mut: bool, ptr: Pointer) -> Self {
+        if cfg!(debug_assertions) {
+            for e in &v {
+                assert_eq!(e.ty.get_base_type(), &elem);
+            }
+        }
+        Self {
+            ty: Type::mk_ref_vector(elem, is_mut),
+            val: BaseValue::mk_vector(v.into_iter().map(|e| e.val).collect()),
+            ptr,
+        }
+    }
+    pub fn mk_ref_struct(
+        inst: StructInstantiation,
+        v: Vec<TypedValue>,
+        is_mut: bool,
+        ptr: Pointer,
+    ) -> Self {
+        if cfg!(debug_assertions) {
+            assert_eq!(inst.fields.len(), v.len());
+            for (e, field) in v.iter().zip(inst.fields.iter()) {
+                assert_eq!(e.ty.get_base_type(), &field.ty);
+            }
+        }
+        Self {
+            ty: Type::mk_ref_struct(inst, is_mut),
+            val: BaseValue::mk_struct(v.into_iter().map(|e| e.val).collect()),
+            ptr,
+        }
+    }
+
+    //
+    // value casting
+    //
+
+    pub fn into_bool(self) -> bool {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_bool());
+        }
+        self.val.into_bool()
+    }
+    pub fn into_u8(self) -> u8 {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_u8());
+        }
+        self.val.into_u8()
+    }
+    pub fn into_u64(self) -> u64 {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_u64());
+        }
+        self.val.into_u64()
+    }
+    pub fn into_u128(self) -> u128 {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_u128());
+        }
+        self.val.into_u128()
+    }
+    pub fn into_num(self) -> BigInt {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_num());
+        }
+        self.val.into_num()
+    }
+    pub fn into_int(self) -> BigInt {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_int());
+        }
+        self.val.into_int()
+    }
+    pub fn into_address(self) -> AccountAddress {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_address());
+        }
+        self.val.into_address()
+    }
+    pub fn into_signer(self) -> AccountAddress {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_signer());
+        }
+        self.val.into_signer()
+    }
+    pub fn into_vector(self) -> Vec<BaseValue> {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_vector());
+        }
+        self.val.into_vector()
+    }
+    pub fn into_struct(self) -> Vec<BaseValue> {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_struct());
+        }
+        self.val.into_struct()
+    }
+
+    pub fn into_ref_bool(self) -> (bool, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_bool(None));
+        }
+        (self.val.into_bool(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u8(self) -> (u8, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u8(None));
+        }
+        (self.val.into_u8(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u16(self) -> (u16, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u16(None));
+        }
+        (self.val.into_u16(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u32(self) -> (u32, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u32(None));
+        }
+        (self.val.into_u32(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u64(self) -> (u64, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u64(None));
+        }
+        (self.val.into_u64(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u128(self) -> (u128, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u128(None));
+        }
+        (self.val.into_u128(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u256(self) -> (u256::U256, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u256(None));
+        }
+        (self.val.into_u256(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_num(self) -> (BigInt, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_num(None));
+        }
+        (self.val.into_num(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_address(self) -> (AccountAddress, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_address(None));
+        }
+        (self.val.into_address(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_signer(self) -> (AccountAddress, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_signer(None));
+        }
+        (self.val.into_signer(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_vector(self) -> (Vec<BaseValue>, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_vector(None));
+        }
+        (self.val.into_vector(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_struct(self) -> (Vec<BaseValue>, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_struct(None));
+        }
+        (self.val.into_struct(), self.ty.into_ref_type().0, self.ptr)
+    }
+
+    //
+    // Getters
+    //
+
+    pub fn get_ty(&self) -> &Type {
+        &self.ty
+    }
+    pub fn get_val(&self) -> &BaseValue {
+        &self.val
+    }
+    pub fn get_ptr(&self) -> &Pointer {
+        &self.ptr
+    }
+    pub fn decompose(self) -> (Type, BaseValue, Pointer) {
+        (self.ty, self.val, self.ptr)
+    }
+
+    //
+    // Operations
+    //
+
+    /// Cast this value into a compatible type. Cast `ty` must be compatible
+    pub fn assign_cast(self, ty: Type) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(ty.is_compatible_for_assign(&self.ty));
+        }
+        TypedValue {
+            ty,
+            val: self.val,
+            ptr: self.ptr,
+        }
+    }
+
+    /// Create a reference that is a direct borrow of another reference value
+    pub fn borrow_direct(self, ty: Type, local_idx: TempIndex) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(ty.is_compatible_for_assign(&self.ty));
+        }
+        TypedValue {
+            ty,
+            val: self.val,
+            ptr: Pointer::RefDirect(local_idx),
+        }
+    }
+
+    /// Create a reference to the base value
+    pub fn borrow_local(self, is_mut: bool, local_idx: TempIndex) -> TypedValue {
+        TypedValue {
+            ty: Type::Reference(is_mut, self.ty.into_base_type()),
+            val: self.val,
+            ptr: Pointer::Local(local_idx),
+        }
+    }
+
+    /// Read the reference and create a base value
+    pub fn read_ref(self) -> TypedValue {
+        TypedValue {
+            ty: Type::Base(self.ty.into_ref_type().1),
+            val: self.val,
+            ptr: Pointer::None,
+        }
+    }
+
+    /// Create a mutable reference to this base value
+    pub fn write_ref(self, ptr: Pointer) -> TypedValue {
+        TypedValue {
+            ty: Type::Reference(true, self.ty.into_base_type()),
+            val: self.val,
+            ptr,
+        }
+    }
+
+    /// Convert the mutable reference into immutable
+    pub fn freeze_ref(self) -> TypedValue {
+        let (is_mut, base_ty) = self.ty.into_ref_type();
+        if cfg!(debug_assertions) {
+            assert!(is_mut);
+        }
+        TypedValue {
+            ty: Type::Reference(false, base_ty),
+            val: self.val,
+            ptr: self.ptr,
+        }
+    }
+
+    /// Wrap the pointer in the mutable reference to mark that this ref is passed in as an argument
+    pub fn box_into_mut_ref_arg(self, index: TempIndex) -> TypedValue {
+        let (ty, val, ptr) = self.decompose();
+        if cfg!(debug_assertions) {
+            assert!(ty.is_ref(Some(true)));
+        }
+        TypedValue {
+            ty,
+            val,
+            ptr: Pointer::ArgRef(index, Box::new(ptr)),
+        }
+    }
+
+    /// Unwrap the pointer from the mutable reference to its original pointer
+    pub fn unbox_from_mut_ref_arg(self) -> TypedValue {
+        let (ty, val, ptr) = self.decompose();
+        if cfg!(debug_assertions) {
+            assert!(ty.is_ref(Some(true)));
+        }
+        let unboxed_ptr = match ptr {
+            Pointer::ArgRef(_, original_ptr) => *original_ptr,
+            _ => unreachable!(),
+        };
+        TypedValue {
+            ty,
+            val,
+            ptr: unboxed_ptr,
+        }
+    }
+
+    /// Wrap the pointer in the mutable reference to mark that this ref is passed out as a return
+    pub fn box_into_mut_ref_ret(self, ptrs: &BTreeMap<TempIndex, &Pointer>) -> TypedValue {
+        fn follow_return_pointers_recursive(
+            cur: &Pointer,
+            ptrs: &BTreeMap<TempIndex, &Pointer>,
+            trace: &mut Vec<Pointer>,
+        ) {
+            match cur {
+                Pointer::ArgRef(_, _) => trace.push(cur.clone()),
+                Pointer::RefDirect(idx) => {
+                    follow_return_pointers_recursive(ptrs.get(idx).unwrap(), ptrs, trace);
+                }
+                Pointer::RefField(idx, _) | Pointer::RefElement(idx, _) => {
+                    trace.push(cur.clone());
+                    follow_return_pointers_recursive(ptrs.get(idx).unwrap(), ptrs, trace);
+                }
+                Pointer::None | Pointer::Local(_) | Pointer::Global(_) | Pointer::RetRef(_) => {
+                    unreachable!()
+                }
+            }
+        }
+
+        let (ty, val, ptr) = self.decompose();
+        if cfg!(debug_assertions) {
+            assert!(ty.is_ref(Some(true)));
+        }
+
+        let mut trace = vec![];
+        follow_return_pointers_recursive(&ptr, ptrs, &mut trace);
+        let boxed_ptr = Pointer::RetRef(trace);
+        TypedValue {
+            ty,
+            val,
+            ptr: boxed_ptr,
+        }
+    }
+
+    /// Unwrap the pointer from the mutable reference to its original pointer
+    pub fn unbox_from_mut_ref_ret(self) -> TypedValue {
+        let (ty, val, ptr) = self.decompose();
+        if cfg!(debug_assertions) {
+            assert!(ty.is_ref(Some(true)));
+        }
+        let unboxed_ptr = match ptr {
+            Pointer::RetRef(mut trace) => {
+                let sub = trace.pop().unwrap();
+                if cfg!(debug_assertions) {
+                    assert!(trace.is_empty());
+                }
+                match sub {
+                    Pointer::ArgRef(_, original_ptr) => *original_ptr,
+                    _ => unreachable!(),
+                }
+            }
+            _ => unreachable!(),
+        };
+        TypedValue {
+            ty,
+            val,
+            ptr: unboxed_ptr,
+        }
+    }
+
+    /// update the reference directly
+    pub fn update_ref_direct(self, ref_val: TypedValue) -> TypedValue {
+        let (old_ty, _, old_ptr) = self.decompose();
+        let (new_ty, new_val, _) = ref_val.decompose();
+        if cfg!(debug_assertions) {
+            assert!(old_ty.is_ref(Some(true)));
+            assert_eq!(old_ty, new_ty);
+        }
+        TypedValue {
+            ty: old_ty,
+            val: new_val,
+            ptr: old_ptr,
+        }
+    }
+
+    /// Retrieve an element from a vector at the given index. Return None of index out-of-bounds.
+    pub fn get_vector_element(self, elem_num: usize) -> Option<TypedValue> {
+        let elem_ty = self.ty.into_vector_elem();
+        let val = match self.val {
+            BaseValue::Vector(mut v) => {
+                if elem_num >= v.len() {
+                    return None;
+                }
+                v.remove(elem_num)
+            }
+            _ => unreachable!(),
+        };
+        Some(TypedValue {
+            ty: Type::Base(elem_ty),
+            val,
+            ptr: Pointer::None,
+        })
+    }
+
+    /// Borrow an element from a vector at the given index. Return None of index out-of-bounds.
+    pub fn borrow_ref_vector_element(
+        self,
+        elem_num: usize,
+        is_mut: bool,
+        local_idx: TempIndex,
+    ) -> Option<TypedValue> {
+        if cfg!(debug_assertions) {
+            let (self_is_mut, _) = self.ty.get_ref_type();
+            assert!(self_is_mut || !is_mut);
+        }
+        let elem_ty = self.ty.into_ref_vector_elem(None);
+        let val = match self.val {
+            BaseValue::Vector(mut v) => {
+                if elem_num >= v.len() {
+                    return None;
+                }
+                v.remove(elem_num)
+            }
+            _ => unreachable!(),
+        };
+        Some(TypedValue {
+            ty: Type::Reference(is_mut, elem_ty),
+            val,
+            ptr: Pointer::RefElement(local_idx, elem_num),
+        })
+    }
+
+    /// Push an element back to a vector
+    pub fn update_ref_vector_push_back(self, elem_val: TypedValue) -> TypedValue {
+        let (elem_ty, elem_val, _) = elem_val.decompose();
+        let (vec_ty, vec_val, vec_ptr) = self.decompose();
+        let elem = vec_ty.into_ref_vector_elem(Some(true));
+        if cfg!(debug_assertions) {
+            assert!(elem_ty.is_base_of(&elem));
+        }
+        let mut elems = vec_val.into_vector();
+        elems.push(elem_val);
+        TypedValue {
+            ty: Type::mk_ref_vector(elem, true),
+            val: BaseValue::mk_vector(elems),
+            ptr: vec_ptr,
+        }
+    }
+
+    /// Pop an element from the back of the vector
+    pub fn update_ref_vector_pop_back(self) -> Option<(TypedValue, TypedValue)> {
+        let (vec_ty, vec_val, vec_ptr) = self.decompose();
+        let elem_ty = vec_ty.into_ref_vector_elem(Some(true));
+        let mut elems = vec_val.into_vector();
+        match elems.pop() {
+            None => None,
+            Some(elem_val) => {
+                let elem = TypedValue {
+                    ty: Type::Base(elem_ty.clone()),
+                    val: elem_val,
+                    ptr: Pointer::None,
+                };
+                let new_vec = TypedValue {
+                    ty: Type::mk_ref_vector(elem_ty, true),
+                    val: BaseValue::mk_vector(elems),
+                    ptr: vec_ptr,
+                };
+                Some((new_vec, elem))
+            }
+        }
+    }
+
+    /// Swap two elements in the vector
+    pub fn update_ref_vector_swap(self, lhs: usize, rhs: usize) -> Option<TypedValue> {
+        let (vec_ty, vec_val, vec_ptr) = self.decompose();
+        if cfg!(debug_assertions) {
+            assert!(vec_ty.is_ref_vector(Some(true)));
+        }
+        let mut elems = vec_val.into_vector();
+        if lhs >= elems.len() || rhs >= elems.len() {
+            return None;
+        }
+        elems.swap(lhs, rhs);
+        let new_vec = TypedValue {
+            ty: vec_ty,
+            val: BaseValue::mk_vector(elems),
+            ptr: vec_ptr,
+        };
+        Some(new_vec)
+    }
+
+    /// Update an element in the vector, creates a new vector that contains the update
+    pub fn update_ref_vector_element(self, elem_num: usize, elem_val: TypedValue) -> TypedValue {
+        let (elem_ty, elem_val, _) = elem_val.decompose();
+        let (vec_ty, vec_val, vec_ptr) = self.decompose();
+        let elem = vec_ty.into_ref_vector_elem(Some(true));
+        if cfg!(debug_assertions) {
+            assert!(elem_ty.is_ref_of(&elem, Some(true)));
+        }
+        let mut elems = vec_val.into_vector();
+        *elems.get_mut(elem_num).unwrap() = elem_val;
+        TypedValue {
+            ty: Type::mk_ref_vector(elem, true),
+            val: BaseValue::mk_vector(elems),
+            ptr: vec_ptr,
+        }
+    }
+
+    /// Unpack a struct value
+    pub fn unpack_struct(self) -> Vec<TypedValue> {
+        let fields = self.ty.into_struct_inst().fields;
+        match self.val {
+            BaseValue::Struct(v) => v
+                .into_iter()
+                .zip(fields)
+                .map(|(field_val, field_info)| TypedValue {
+                    ty: Type::Base(field_info.ty),
+                    val: field_val,
+                    ptr: Pointer::None,
+                })
+                .collect(),
+            _ => unreachable!(),
+        }
+    }
+
+    /// Unpack one specific field from a struct value
+    pub fn unpack_struct_field(self, field_num: usize) -> TypedValue {
+        let field = self.ty.into_struct_inst().fields.remove(field_num);
+        let val = match self.val {
+            BaseValue::Struct(mut v) => v.remove(field_num),
+            _ => unreachable!(),
+        };
+        TypedValue {
+            ty: Type::Base(field.ty),
+            val,
+            ptr: Pointer::None,
+        }
+    }
+
+    /// Unpack one specific field from a struct reference
+    pub fn unpack_ref_struct_field(self, field_num: usize, is_mut_opt: Option<bool>) -> TypedValue {
+        let field = self
+            .ty
+            .into_ref_struct_inst(is_mut_opt)
+            .fields
+            .remove(field_num);
+        let val = match self.val {
+            BaseValue::Struct(mut v) => v.remove(field_num),
+            _ => unreachable!(),
+        };
+        TypedValue {
+            ty: Type::Base(field.ty),
+            val,
+            ptr: Pointer::None,
+        }
+    }
+
+    /// Borrow one specific field from a struct reference
+    pub fn borrow_ref_struct_field(
+        self,
+        field_num: usize,
+        is_mut: bool,
+        local_idx: TempIndex,
+    ) -> TypedValue {
+        if cfg!(debug_assertions) {
+            let (self_is_mut, _) = self.ty.get_ref_type();
+            assert!(self_is_mut || !is_mut);
+        }
+        let field = self.ty.into_ref_struct_inst(None).fields.remove(field_num);
+        let val = match self.val {
+            BaseValue::Struct(mut v) => v.remove(field_num),
+            _ => unreachable!(),
+        };
+        TypedValue {
+            ty: Type::Reference(is_mut, field.ty),
+            val,
+            ptr: Pointer::RefField(local_idx, field_num),
+        }
+    }
+
+    /// update one specific field from a struct reference, create a new struct reference
+    pub fn update_ref_struct_field(self, field_num: usize, field_val: TypedValue) -> TypedValue {
+        let (field_ty, field_val, _) = field_val.decompose();
+        let (struct_ty, struct_val, struct_ptr) = self.decompose();
+        let inst = struct_ty.into_ref_struct_inst(Some(true));
+        if cfg!(debug_assertions) {
+            assert!(field_ty.is_ref_of(&inst.fields.get(field_num).unwrap().ty, Some(true)));
+        }
+        let mut fields = struct_val.into_struct();
+        *fields.get_mut(field_num).unwrap() = field_val;
+        TypedValue {
+            ty: Type::mk_ref_struct(inst, true),
+            val: BaseValue::mk_struct(fields),
+            ptr: struct_ptr,
+        }
+    }
+
+    fn into_move_value(self) -> MoveValue {
+        match self.val {
+            BaseValue::Bool(v) => MoveValue::Bool(v),
+            BaseValue::Int(v) => {
+                if self.ty.is_u8() {
+                    MoveValue::U8(v.to_u8().unwrap())
+                } else if self.ty.is_u64() {
+                    MoveValue::U64(v.to_u64().unwrap())
+                } else {
+                    if cfg!(debug_assertions) {
+                        assert!(self.ty.is_u128());
+                    }
+                    MoveValue::U128(v.to_u128().unwrap())
+                }
+            }
+            BaseValue::Address(v) => MoveValue::Address(v),
+            BaseValue::Signer(v) => MoveValue::Signer(v),
+            BaseValue::Vector(v) => {
+                let elem_ty = self.ty.into_vector_elem();
+                let move_elems = v
+                    .into_iter()
+                    .map(|elem| {
+                        let full_elem = TypedValue {
+                            ty: Type::Base(elem_ty.clone()),
+                            val: elem,
+                            ptr: Pointer::None,
+                        };
+                        full_elem.into_move_value()
+                    })
+                    .collect();
+                MoveValue::Vector(move_elems)
+            }
+            BaseValue::Struct(v) => {
+                let move_fields = v
+                    .into_iter()
+                    .zip(self.ty.into_struct_inst().fields)
+                    .map(|(field_val, field_info)| {
+                        let full_field = TypedValue {
+                            ty: Type::Base(field_info.ty),
+                            val: field_val,
+                            ptr: Pointer::None,
+                        };
+                        full_field.into_move_value()
+                    })
+                    .collect();
+                MoveValue::Struct(MoveStruct::new(move_fields))
+            }
+        }
+    }
+
+    /// Into BCS-serialized bytes
+    pub fn into_bcs_bytes(self) -> Option<Vec<u8>> {
+        self.into_move_value().simple_serialize()
+    }
+}
+
+//**************************************************************************************************
+// Local state
+//**************************************************************************************************
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct LocalSlot {
+    name: String,
+    ty: Type,
+    is_arg: bool,
+    content: Option<(BaseValue, Pointer)>,
+}
+
+impl LocalSlot {
+    /// Create a local slot that holds a function argument
+    pub fn new_arg(name: String, val: TypedValue) -> Self {
+        let (ty, val, ptr) = val.decompose();
+        LocalSlot {
+            name,
+            ty,
+            is_arg: true,
+            content: Some((val, ptr)),
+        }
+    }
+    /// Create a local slot that holds a function temporary
+    pub fn new_tmp(name: String, ty: Type) -> Self {
+        LocalSlot {
+            name,
+            ty,
+            is_arg: false,
+            content: None,
+        }
+    }
+
+    /// Get the type of this local slot
+    pub fn get_type(&self) -> &Type {
+        &self.ty
+    }
+
+    /// Check whether this local slot holds a value
+    pub fn has_value(&self) -> bool {
+        self.content.is_some()
+    }
+    /// Get the value held in this local slot. Panics if the slot does not hold a value
+    pub fn get_value(&self) -> TypedValue {
+        let (val, ptr) = self.content.as_ref().unwrap();
+        TypedValue {
+            ty: self.ty.clone(),
+            val: val.clone(),
+            ptr: ptr.clone(),
+        }
+    }
+    /// Put the value held in this local slot. Override if the slot already holds a value
+    pub fn put_value_override(&mut self, val: TypedValue) {
+        let (ty, val, ptr) = val.decompose();
+        if cfg!(debug_assertions) {
+            assert_eq!(ty, self.ty);
+        }
+        self.content = Some((val, ptr));
+    }
+    /// Put the value held in this local slot. Panics if the slot already holds a value
+    pub fn put_value(&mut self, val: TypedValue) {
+        if cfg!(debug_assertions) {
+            assert!(self.content.is_none());
+        }
+        self.put_value_override(val);
+    }
+    /// Delete the value held in this local slot. Panics if the slot does not hold a value
+    pub fn del_value(&mut self) -> TypedValue {
+        let (val, ptr) = self.content.take().unwrap();
+        TypedValue {
+            ty: self.ty.clone(),
+            val,
+            ptr,
+        }
+    }
+
+    /// Get the content of the slot, if any, return None of the slot does not currently hold a value
+    pub fn get_content(&self) -> Option<&(BaseValue, Pointer)> {
+        self.content.as_ref()
+    }
+}
+
+//**************************************************************************************************
+// Global state
+//**************************************************************************************************
+
+#[derive(Debug, Clone, Default, Eq, PartialEq)]
+struct AccountState {
+    storage: BTreeMap<StructInstantiation, BaseValue>,
+}
+
+impl AccountState {
+    /// Get a resource from the address, return None of the resource does not exist
+    fn get_resource(&self, key: &StructInstantiation) -> Option<BaseValue> {
+        self.storage.get(key).cloned()
+    }
+
+    /// Remove a resource from the address, return the old resource if exists
+    fn del_resource(&mut self, key: &StructInstantiation) -> Option<BaseValue> {
+        self.storage.remove(key)
+    }
+
+    /// Put a resource into the address, return the old resource if exists
+    fn put_resource(&mut self, key: &StructInstantiation, object: BaseValue) -> Option<BaseValue> {
+        self.storage.insert(key.clone(), object)
+    }
+
+    /// Check whether the address has a resource
+    fn has_resource(&self, key: &StructInstantiation) -> bool {
+        self.storage.contains_key(key)
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Default)]
+pub struct GlobalState {
+    accounts: BTreeMap<AccountAddress, AccountState>,
+    events: BTreeMap<Vec<u8>, BTreeMap<u64, TypedValue>>,
+    touched_addresses: BTreeSet<AccountAddress>,
+}
+
+impl GlobalState {
+    /// Get a reference to a resource from the address, return None if the resource does not exist
+    pub fn get_resource_for_spec(
+        &self,
+        is_mut_opt: Option<bool>,
+        addr: AccountAddress,
+        key: StructInstantiation,
+    ) -> Option<TypedValue> {
+        self.accounts.get(&addr).and_then(|account| {
+            account.get_resource(&key).map(|val| {
+                let ty = match is_mut_opt {
+                    None => Type::mk_struct(key),
+                    Some(is_mut) => Type::mk_ref_struct(key, is_mut),
+                };
+                TypedValue {
+                    ty,
+                    val,
+                    ptr: Pointer::Global(addr),
+                }
+            })
+        })
+    }
+
+    /// Get a reference to a resource from the address, return None if the resource does not exist
+    /// otherwise, update the set of addresses touched by the bytecode
+    pub fn get_resource_for_code(
+        &mut self,
+        is_mut_opt: Option<bool>,
+        addr: AccountAddress,
+        key: StructInstantiation,
+    ) -> Option<TypedValue> {
+        self.touched_addresses.insert(addr);
+        self.get_resource_for_spec(is_mut_opt, addr, key)
+    }
+
+    /// Remove a resource from the address, return the old resource (as struct) if exists
+    pub fn del_resource(
+        &mut self,
+        addr: AccountAddress,
+        key: StructInstantiation,
+    ) -> Option<TypedValue> {
+        self.touched_addresses.insert(addr);
+        self.accounts.get_mut(&addr).and_then(|account| {
+            account.del_resource(&key).map(|val| TypedValue {
+                ty: Type::mk_struct(key),
+                val,
+                ptr: Pointer::None,
+            })
+        })
+    }
+
+    /// Put a resource into the address, return the old resource (as struct) if exists
+    pub fn put_resource(
+        &mut self,
+        addr: AccountAddress,
+        key: StructInstantiation,
+        object: TypedValue,
+    ) -> Option<TypedValue> {
+        if cfg!(debug_assertions) {
+            assert_eq!(key, object.ty.into_struct_inst());
+        }
+        self.touched_addresses.insert(addr);
+        self.accounts
+            .entry(addr)
+            .or_default()
+            .put_resource(&key, object.val)
+            .map(|val| TypedValue {
+                ty: Type::mk_struct(key),
+                val,
+                ptr: Pointer::None,
+            })
+    }
+
+    /// Check whether the address has a resource
+    pub fn has_resource(&self, addr: &AccountAddress, key: &StructInstantiation) -> bool {
+        self.accounts
+            .get(addr)
+            .map_or(false, |account| account.has_resource(key))
+    }
+
+    /// Emit an event to the event store
+    pub fn emit_event(&mut self, guid: Vec<u8>, seq: u64, msg: TypedValue) {
+        let res = self.events.entry(guid).or_default().insert(seq, msg);
+        if cfg!(debug_assertions) {
+            assert!(res.is_none());
+        }
+    }
+
+    /// Output all the addresses that are touched by the bytecode so far
+    pub fn get_touched_addresses(&self) -> &BTreeSet<AccountAddress> {
+        &self.touched_addresses
+    }
+
+    /// Put new addresses to all the addresses that are touched by the bytecode
+    pub fn put_touched_addresses(&mut self, addresses: &[AccountAddress]) {
+        self.touched_addresses.extend(addresses);
+    }
+
+    /// Calculate the delta (i.e., a ChangeSet) against the old state
+    pub fn delta(&self, old_state: &GlobalState) -> ChangeSet {
+        fn bcs_serialize_resource(key: &StructInstantiation, val: &BaseValue) -> Vec<u8> {
+            let typed_val = TypedValue {
+                ty: Type::mk_struct(key.clone()),
+                val: val.clone(),
+                ptr: Pointer::None,
+            };
+            typed_val.into_bcs_bytes().unwrap()
+        }
+
+        let mut change_set = ChangeSet::new();
+        let empty_account_state = AccountState::default();
+
+        // collect added / modified resources
+        for (addr, account_state) in &self.accounts {
+            let old_account_state = old_state.accounts.get(addr).unwrap_or(&empty_account_state);
+            for (key, val) in &account_state.storage {
+                match old_account_state.storage.get(key) {
+                    None => change_set
+                        .add_resource_op(
+                            *addr,
+                            key.to_move_struct_tag(),
+                            Op::New(bcs_serialize_resource(key, val)),
+                        )
+                        .unwrap(),
+                    Some(old_val) => {
+                        if val != old_val {
+                            change_set
+                                .add_resource_op(
+                                    *addr,
+                                    key.to_move_struct_tag(),
+                                    Op::Modify(bcs_serialize_resource(key, val)),
+                                )
+                                .unwrap();
+                        }
+                    }
+                }
+            }
+        }
+
+        // collect deleted resources
+        for (old_addr, old_account_state) in &old_state.accounts {
+            let account_state = self.accounts.get(old_addr).unwrap_or(&empty_account_state);
+            for old_key in old_account_state.storage.keys() {
+                if !account_state.storage.contains_key(old_key) {
+                    change_set
+                        .add_resource_op(*old_addr, old_key.to_move_struct_tag(), Op::Delete)
+                        .unwrap();
+                }
+            }
+        }
+
+        change_set
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Default)]
+pub struct EvalState {
+    // global resources specifically marked as saved
+    saved_memory: BTreeMap<
+        MemoryLabel,
+        BTreeMap<StructIdent, BTreeMap<StructInstantiation, BTreeMap<AccountAddress, BaseValue>>>,
+    >,
+}
+
+impl EvalState {
+    /// Collect resources of the (partial) instantiation type from the global state and save them
+    /// under the given memory label
+    pub fn save_memory(
+        &mut self,
+        label: MemoryLabel,
+        partial_inst: PartialStructInstantiation,
+        global_state: &GlobalState,
+    ) {
+        let mut per_struct_map = BTreeMap::new();
+        for (addr, state) in &global_state.accounts {
+            for (inst, val) in &state.storage {
+                if inst.ident == partial_inst.ident {
+                    per_struct_map
+                        .entry(inst.clone())
+                        .or_insert_with(BTreeMap::new)
+                        .insert(*addr, val.clone());
+                }
+            }
+        }
+        self.saved_memory
+            .entry(label)
+            .and_modify(|per_label_map| per_label_map.clear())
+            .or_default()
+            .insert(partial_inst.ident, per_struct_map);
+    }
+
+    /// Load a resource with given instantiation type from the specified address, saved by the
+    /// given memory label.
+    pub fn load_memory(
+        &self,
+        label: &MemoryLabel,
+        inst: &StructInstantiation,
+        addr: &AccountAddress,
+    ) -> Option<BaseValue> {
+        self.saved_memory
+            .get(label)
+            .and_then(|sub| sub.get(&inst.ident))
+            .and_then(|sub| sub.get(inst))
+            .and_then(|sub| sub.get(addr))
+            .cloned()
+    }
+
+    /// Populate a global state with the resources saved by the given memmory label
+    pub fn register_memory(&self, label: &MemoryLabel, global_state: &mut GlobalState) {
+        for inst_map in self.saved_memory.get(label).unwrap().values() {
+            for (inst, account_map) in inst_map {
+                for (addr, val) in account_map {
+                    let typed_val = TypedValue {
+                        ty: Type::mk_struct(inst.clone()),
+                        val: val.clone(),
+                        ptr: Pointer::None,
+                    };
+                    let exists = global_state.put_resource(*addr, inst.clone(), typed_val);
+                    if cfg!(debug_assertions) {
+                        assert!(exists.is_none());
+                    }
+                }
+            }
+        }
+    }
+
+    /// Return all addresses in the state
+    pub fn all_addresses(&self) -> BTreeSet<AccountAddress> {
+        self.saved_memory
+            .values()
+            .flat_map(|v1| v1.values().map(|v2| v2.values().map(|v3| v3.keys())))
+            .flatten()
+            .flatten()
+            .copied()
+            .collect()
+    }
+
+    /// Return all resources with instantiation matching
+    pub fn all_resources_by_inst(&self, inst: &StructInstantiation) -> Vec<BaseValue> {
+        let mut resources = vec![];
+        for v1 in self.saved_memory.values() {
+            match v1.get(&inst.ident) {
+                None => (),
+                Some(v2) => match v2.get(inst) {
+                    None => (),
+                    Some(v3) => {
+                        resources.extend(v3.values().cloned());
+                    }
+                },
+            }
+        }
+        resources
+    }
+
+    /// Return all resources with identity matching
+    pub fn all_resources_by_ident(&self, ident: &StructIdent) -> Vec<BaseValue> {
+        let mut resources = vec![];
+        for v1 in self.saved_memory.values() {
+            match v1.get(ident) {
+                None => (),
+                Some(v2) => {
+                    for v3 in v2.values() {
+                        resources.extend(v3.values().cloned());
+                    }
+                }
+            }
+        }
+        resources
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/lib.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/lib.rs
new file mode 100644
index 000000000..0c6d1f551
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/lib.rs
@@ -0,0 +1,456 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use anyhow::{bail, Result};
+use clap::Parser;
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use std::fmt::Write;
+
+use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::ChangeSet,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    parser::{parse_transaction_argument, parse_type_tag},
+    runtime_value::{MoveStruct, MoveValue},
+    transaction_argument::TransactionArgument,
+    vm_status::StatusCode,
+};
+use move_model::{
+    model::{FunctionEnv, GlobalEnv},
+    ty::{PrimitiveType as ModelPrimitiveType, Type as ModelType},
+};
+use move_stackless_bytecode::{
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, ProcessorResultDisplay,
+    },
+    options::ProverOptions,
+    pipeline_factory::default_pipeline_with_options,
+};
+
+pub mod concrete;
+pub mod shared;
+
+use crate::concrete::{
+    runtime::{convert_move_type_tag, Runtime},
+    settings::InterpreterSettings,
+    ty::{BaseType, IntType, PrimitiveType},
+    value::{BaseValue, GlobalState, TypedValue},
+};
+
+/// Options passed into the interpreter generator.
+#[derive(Parser)]
+pub struct InterpreterOptions {
+    /// The function to be executed, specified in the format of `addr::module_name::function_name`
+    #[clap(long = "entry", value_parser = parse_entrypoint)]
+    pub entrypoint: (ModuleId, Identifier),
+
+    /// Possibly-empty list of signers for the execution
+    #[clap(
+        long = "signers",
+        value_parser = AccountAddress::from_hex_literal,
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub signers: Vec<AccountAddress>,
+    /// Possibly-empty list of arguments passed to the transaction
+    #[clap(
+        long = "args",
+        value_parser = parse_transaction_argument,
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub args: Vec<TransactionArgument>,
+    /// Possibly-empty list of type arguments passed to the transaction (e.g., `T` in
+    /// `main<T>()`). Must match the type arguments kinds expected by `script_file`.
+    #[clap(
+        long = "ty-args",
+        value_parser = parse_type_tag,
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub ty_args: Vec<TypeTag>,
+
+    /// Skip checking of expressions
+    #[clap(long = "no-expr-check")]
+    pub no_expr_check: bool,
+    /// Level of verbosity
+    #[clap(short = 'v', long = "verbose")]
+    pub verbose: Option<u64>,
+}
+
+fn parse_entrypoint(input: &str) -> Result<(ModuleId, Identifier)> {
+    let tokens: Vec<_> = input.split("::").collect();
+    if tokens.len() != 3 {
+        bail!("Invalid entrypoint: {}", input);
+    }
+    let module_id = ModuleId::new(
+        AccountAddress::from_hex_literal(tokens[0])?,
+        Identifier::new(tokens[1])?,
+    );
+    let func_name = Identifier::new(tokens[2])?;
+    Ok((module_id, func_name))
+}
+
+#[derive(Debug, Eq, PartialEq)]
+struct ExecutionResult {
+    vm_result: VMResult<Vec<TypedValue>>,
+    global_state: GlobalState,
+}
+
+//**************************************************************************************************
+// Entry
+//**************************************************************************************************
+
+pub fn interpret_with_options(
+    options: InterpreterOptions,
+    env: &GlobalEnv,
+) -> (VMResult<Vec<Vec<u8>>>, ChangeSet, GlobalState) {
+    // consolidate arguments
+    let args: Vec<_> = options
+        .signers
+        .into_iter()
+        .map(MoveValue::Signer)
+        .chain(options.args.into_iter().map(|arg| match arg {
+            TransactionArgument::Bool(v) => MoveValue::Bool(v),
+            TransactionArgument::U8(v) => MoveValue::U8(v),
+            TransactionArgument::U64(v) => MoveValue::U64(v),
+            TransactionArgument::U128(v) => MoveValue::U128(v),
+            TransactionArgument::Address(v) => MoveValue::Address(v),
+            TransactionArgument::U8Vector(v) => {
+                MoveValue::Vector(v.into_iter().map(MoveValue::U8).collect())
+            }
+            TransactionArgument::U16(v) => MoveValue::U16(v),
+            TransactionArgument::U32(v) => MoveValue::U32(v),
+            TransactionArgument::U256(v) => MoveValue::U256(v),
+        }))
+        .collect();
+
+    // collect settings
+    let settings = InterpreterSettings {
+        no_expr_check: options.no_expr_check,
+        verbose_stepwise: options.verbose.map_or(false, |level| level > 0),
+        verbose_bytecode: options.verbose.map_or(false, |level| level > 1),
+        verbose_expression: options.verbose.map_or(false, |level| level > 2),
+    };
+
+    // run the actual interpreter
+    let interpreter = StacklessBytecodeInterpreter::new(env, None, settings);
+    interpreter.interpret(
+        &options.entrypoint.0,
+        &options.entrypoint.1,
+        &options.ty_args,
+        &args,
+        &GlobalState::default(),
+    )
+}
+
+pub struct StacklessBytecodeInterpreter<'env> {
+    pub env: &'env GlobalEnv,
+    targets: FunctionTargetsHolder,
+}
+
+impl<'env> StacklessBytecodeInterpreter<'env> {
+    pub fn new(
+        env: &'env GlobalEnv,
+        options_opt: Option<ProverOptions>,
+        settings: InterpreterSettings,
+    ) -> Self {
+        // make sure that the global env does not have an error
+        if env.has_errors() {
+            let mut buffer = Buffer::no_color();
+            env.report_diag(&mut buffer, Severity::Error);
+            panic!(
+                "errors accumulated in the model builder and the transformation pipeline\n{}",
+                String::from_utf8_lossy(&buffer.into_inner())
+            )
+        }
+
+        // create the pipeline
+        let options = options_opt.unwrap_or_else(|| ProverOptions {
+            for_interpretation: true,
+            ..Default::default()
+        });
+        let pipeline = default_pipeline_with_options(&options);
+        env.set_extension(options);
+
+        // collect and transform function targets
+        let mut targets = FunctionTargetsHolder::default();
+        for module_env in env.get_modules() {
+            for func_env in module_env.get_functions() {
+                targets.add_target(&func_env)
+            }
+        }
+        if settings.verbose_stepwise {
+            pipeline.run_with_hook(
+                env,
+                &mut targets,
+                |holder| verbose_stepwise_processing(env, 0, None, holder),
+                |step, processor, holders| {
+                    verbose_stepwise_processing(env, step, Some(processor), holders)
+                },
+            )
+        } else {
+            pipeline.run(env, &mut targets);
+        }
+
+        // dump the bytecode if requested
+        if settings.verbose_stepwise {
+            let mut text = String::new();
+            for module_env in env.get_modules() {
+                for func_env in module_env.get_functions() {
+                    for (variant, target) in targets.get_targets(&func_env) {
+                        target.register_annotation_formatters_for_test();
+                        writeln!(&mut text, "[variant {}]\n{}", variant, target).unwrap();
+                    }
+                }
+            }
+            println!("{}", text);
+        }
+
+        // register settings with the env before returning
+        env.set_extension(settings);
+        Self { env, targets }
+    }
+
+    fn interpret_internal(
+        &self,
+        fun_env: &FunctionEnv,
+        ty_args: &[TypeTag],
+        args: &[MoveValue],
+        global_state: &GlobalState,
+    ) -> (VMResult<Vec<Vec<u8>>>, ChangeSet, GlobalState) {
+        let mut new_global_state = global_state.clone();
+
+        // execute and convert results
+        let vm = Runtime::new(self.env, &self.targets);
+        let vm_result = vm.execute(fun_env, ty_args, args, &mut new_global_state);
+        let serialized_vm_result = vm_result.map(|rets| {
+            rets.into_iter()
+                .map(|v| {
+                    let (ty, val, _) = v.decompose();
+                    let move_val = convert_typed_value_to_move_value(ty.get_base_type(), val);
+                    move_val.simple_serialize().unwrap()
+                })
+                .collect::<Vec<_>>()
+        });
+
+        let change_set = new_global_state.delta(global_state);
+        (serialized_vm_result, change_set, new_global_state)
+    }
+
+    pub fn interpret(
+        &self,
+        module_id: &ModuleId,
+        func_name: &IdentStr,
+        ty_args: &[TypeTag],
+        args: &[MoveValue],
+        global_state: &GlobalState,
+    ) -> (VMResult<Vec<Vec<u8>>>, ChangeSet, GlobalState) {
+        // find the entrypoint
+        let entrypoint_env = match derive_entrypoint_env(self.env, module_id, func_name) {
+            Ok(func_env) => func_env,
+            Err(err) => {
+                return (
+                    Err(err.finish(Location::Undefined)),
+                    ChangeSet::new(),
+                    global_state.clone(),
+                )
+            }
+        };
+
+        // run the actual interpretation
+        self.interpret_internal(&entrypoint_env, ty_args, args, global_state)
+    }
+
+    pub fn interpret_with_bcs_arguments(
+        &self,
+        module_id: &ModuleId,
+        func_name: &IdentStr,
+        ty_args: &[TypeTag],
+        bcs_args: &[Vec<u8>],
+        senders_opt: Option<&[AccountAddress]>,
+        global_state: &GlobalState,
+    ) -> (VMResult<Vec<Vec<u8>>>, ChangeSet, GlobalState) {
+        // find the entrypoint
+        let entrypoint_env = match derive_entrypoint_env(self.env, module_id, func_name) {
+            Ok(func_env) => func_env,
+            Err(err) => {
+                return (
+                    Err(err.finish(Location::Undefined)),
+                    ChangeSet::new(),
+                    global_state.clone(),
+                )
+            }
+        };
+
+        // convert the args
+        let args = match convert_bcs_arguments_to_move_value_arguments(
+            &entrypoint_env,
+            bcs_args,
+            senders_opt,
+        ) {
+            Ok(args) => args,
+            Err(err) => {
+                return (
+                    Err(err.finish(Location::Undefined)),
+                    ChangeSet::new(),
+                    global_state.clone(),
+                )
+            }
+        };
+
+        // run the actual interpretation
+        self.interpret_internal(&entrypoint_env, ty_args, &args, global_state)
+    }
+
+    pub fn report_property_checking_results(&self) -> Option<String> {
+        if self.env.has_errors() {
+            let mut buffer = Buffer::no_color();
+            self.env.report_diag(&mut buffer, Severity::Error);
+            self.env.clear_diag();
+            Some(String::from_utf8_lossy(&buffer.into_inner()).to_string())
+        } else {
+            None
+        }
+    }
+}
+
+fn verbose_stepwise_processing(
+    env: &GlobalEnv,
+    step: usize,
+    processor_opt: Option<&dyn FunctionTargetProcessor>,
+    targets: &FunctionTargetsHolder,
+) {
+    // short-circuit the execution if prior phases run into errors
+    if env.has_errors() {
+        return;
+    }
+
+    let name = processor_opt
+        .map(|processor| processor.name())
+        .unwrap_or_else(|| "stackless".to_string());
+
+    // dump bytecode
+    let mut text = String::new();
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            for (_, target) in targets.get_targets(&func_env) {
+                if !target.data.code.is_empty() {
+                    target.register_annotation_formatters_for_test();
+
+                    writeln!(&mut text, "[{}-{}]\n{}", step, name, target).unwrap();
+                }
+            }
+        }
+    }
+
+    // dump analysis results, if any
+    if let Some(processor) = processor_opt {
+        text += &ProcessorResultDisplay {
+            env,
+            targets,
+            processor,
+        }
+        .to_string();
+    }
+    println!("{}", text);
+}
+
+fn derive_entrypoint_env<'env>(
+    env: &'env GlobalEnv,
+    module_id: &ModuleId,
+    func_name: &IdentStr,
+) -> PartialVMResult<FunctionEnv<'env>> {
+    env.find_module_by_language_storage_id(module_id)
+        .and_then(|module_env| module_env.find_function(env.symbol_pool().make(func_name.as_str())))
+        .ok_or_else(|| PartialVMError::new(StatusCode::LOOKUP_FAILED))
+}
+
+fn convert_typed_value_to_move_value(ty: &BaseType, val: BaseValue) -> MoveValue {
+    match ty {
+        BaseType::Primitive(PrimitiveType::Bool) => MoveValue::Bool(val.into_bool()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => MoveValue::U8(val.into_u8()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => MoveValue::U16(val.into_u16()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => MoveValue::U32(val.into_u32()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => MoveValue::U64(val.into_u64()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => MoveValue::U128(val.into_u128()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => MoveValue::U256(val.into_u256()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
+        BaseType::Primitive(PrimitiveType::Address) => MoveValue::Address(val.into_address()),
+        BaseType::Primitive(PrimitiveType::Signer) => MoveValue::Signer(val.into_signer()),
+        BaseType::Vector(elem) => MoveValue::Vector(
+            val.into_vector()
+                .into_iter()
+                .map(|e| convert_typed_value_to_move_value(elem, e))
+                .collect(),
+        ),
+        BaseType::Struct(inst) => MoveValue::Struct(MoveStruct::new(
+            val.into_struct()
+                .into_iter()
+                .zip(inst.fields.iter())
+                .map(|(field_val, field_info)| {
+                    convert_typed_value_to_move_value(&field_info.ty, field_val)
+                })
+                .collect(),
+        )),
+    }
+}
+
+fn convert_bcs_arguments_to_move_value_arguments(
+    func_env: &FunctionEnv,
+    bcs_args: &[Vec<u8>],
+    senders_opt: Option<&[AccountAddress]>,
+) -> PartialVMResult<Vec<MoveValue>> {
+    let env = func_env.module_env.env;
+    let mut move_vals = vec![];
+
+    let params = func_env.get_parameters();
+    let num_signer_args = match senders_opt {
+        None => 0,
+        Some(senders) => {
+            for (i, param) in params.iter().enumerate() {
+                match &param.1 {
+                    ModelType::Primitive(ModelPrimitiveType::Signer) => {
+                        if i >= senders.len() {
+                            return Err(PartialVMError::new(
+                                StatusCode::NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH,
+                            ));
+                        }
+                        move_vals.push(MoveValue::Signer(senders[i]))
+                    }
+                    _ => {
+                        if i != 0 && i != senders.len() {
+                            return Err(PartialVMError::new(
+                                StatusCode::NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH,
+                            ));
+                        }
+                        break;
+                    }
+                }
+            }
+            move_vals.len()
+        }
+    };
+
+    if (num_signer_args + bcs_args.len()) != params.len() {
+        return Err(PartialVMError::new(
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ));
+    }
+    for (arg_bcs, param) in bcs_args.iter().zip(&params[num_signer_args..]) {
+        match param.1.clone().into_type_tag(env) {
+            None => {
+                return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+            }
+            Some(type_tag) => {
+                let ty = convert_move_type_tag(env, &type_tag)?;
+                let val = MoveValue::simple_deserialize(arg_bcs, &ty.to_move_type_layout())
+                    .map_err(|_| PartialVMError::new(StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT))?;
+                move_vals.push(val);
+            }
+        }
+    }
+    Ok(move_vals)
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/bridge.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/bridge.rs
new file mode 100644
index 000000000..f13e612d2
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/bridge.rs
@@ -0,0 +1,64 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, VMResult};
+use move_core_types::{
+    effects::{AccountChangeSet, ChangeSet, Op},
+    resolver::MoveResolver,
+};
+
+/// The result returned by the stackless VM does not contain code offsets and indices. In order to
+/// do cross-vm comparison, we need to adapt the Move VM result by removing these fields.
+pub fn adapt_move_vm_result<T>(result: VMResult<T>) -> VMResult<T> {
+    result.map_err(|err| {
+        let (status_code, sub_status, _, _, location, _, _) = err.all_data();
+        let adapted = PartialVMError::new(status_code);
+        let adapted = match sub_status {
+            None => adapted,
+            Some(status_code) => adapted.with_sub_status(status_code),
+        };
+        adapted.finish(location)
+    })
+}
+
+/// The change-set produced by the stackless VM guarantees that for a global resource, if the
+/// underlying value is not changed in the execution, there will not be an entry in the change set.
+/// The same guarantee is not provided by the Move VM. In Move VM, we could borrow_global_mut but
+/// write the same value back instead of an updated value. In this case, the Move VM produces an
+/// entry in the change_set.
+pub fn adapt_move_vm_change_set<S: MoveResolver>(
+    change_set_result: VMResult<ChangeSet>,
+    old_storage: &S,
+) -> VMResult<ChangeSet> {
+    change_set_result.map(|change_set| adapt_move_vm_change_set_internal(change_set, old_storage))
+}
+
+fn adapt_move_vm_change_set_internal<S: MoveResolver>(
+    change_set: ChangeSet,
+    old_storage: &S,
+) -> ChangeSet {
+    let mut adapted = ChangeSet::new();
+    for (addr, state) in change_set.into_inner() {
+        let (modules, resources) = state.into_inner();
+
+        let resources = resources
+            .into_iter()
+            .filter(|(tag, op)| match op {
+                Op::New(_) | Op::Delete => true,
+                Op::Modify(new_val) => match old_storage.get_resource(&addr, tag).unwrap() {
+                    Some(old_val) => new_val != &old_val,
+                    None => true,
+                },
+            })
+            .collect();
+
+        adapted
+            .add_account_changeset(
+                addr,
+                AccountChangeSet::from_modules_resources(modules, resources),
+            )
+            .unwrap();
+    }
+    adapted
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/ident.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/ident.rs
new file mode 100644
index 000000000..9a2187f9b
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/ident.rs
@@ -0,0 +1,94 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt;
+
+use move_core_types::account_address::AccountAddress;
+use move_model::model::{ModuleEnv, StructEnv};
+use move_stackless_bytecode::{
+    function_target::FunctionTarget, function_target_pipeline::FunctionVariant,
+};
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct ModuleIdent {
+    pub address: AccountAddress,
+    pub name: String,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct FunctionIdent {
+    pub module: ModuleIdent,
+    pub name: String,
+    pub variant: FunctionVariant,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct StructIdent {
+    pub module: ModuleIdent,
+    pub name: String,
+}
+
+//**************************************************************************************************
+// Display
+//**************************************************************************************************
+
+impl fmt::Display for ModuleIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "0x{}::{}", self.address.short_str_lossless(), self.name)
+    }
+}
+
+impl fmt::Display for FunctionIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "$[{}]-{}::{}", self.variant, self.module, self.name)
+    }
+}
+
+impl fmt::Display for StructIdent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}::{}", self.module, self.name)
+    }
+}
+
+//**************************************************************************************************
+// Implementation
+//**************************************************************************************************
+
+impl ModuleIdent {
+    pub fn new(module_env: &ModuleEnv) -> Self {
+        let env = module_env.env;
+        Self {
+            address: *module_env.self_address(),
+            name: env
+                .symbol_pool()
+                .string(module_env.get_name().name())
+                .to_string(),
+        }
+    }
+}
+
+impl FunctionIdent {
+    #[allow(dead_code)]
+    pub fn new(target: &FunctionTarget) -> Self {
+        let func_env = target.func_env;
+        let module_env = &func_env.module_env;
+        let env = module_env.env;
+        FunctionIdent {
+            module: ModuleIdent::new(module_env),
+            name: env.symbol_pool().string(target.get_name()).to_string(),
+            variant: target.data.variant.clone(),
+        }
+    }
+}
+
+impl StructIdent {
+    pub fn new(struct_env: &StructEnv) -> Self {
+        let module_env = &struct_env.module_env;
+        let env = module_env.env;
+        StructIdent {
+            module: ModuleIdent::new(module_env),
+            name: env.symbol_pool().string(struct_env.get_name()).to_string(),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/mod.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/mod.rs
new file mode 100644
index 000000000..11025539d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bridge;
+pub mod ident;
+pub mod variant;
diff --git a/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/variant.rs b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/variant.rs
new file mode 100644
index 000000000..8acb49d05
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode-interpreter/src/shared/variant.rs
@@ -0,0 +1,35 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_model::model::FunctionEnv;
+use move_stackless_bytecode::{
+    function_target::FunctionTarget,
+    function_target_pipeline::{FunctionTargetsHolder, FunctionVariant, VerificationFlavor},
+};
+
+// TODO (mengxu): find a better way to determine which variant to call
+pub fn choose_variant<'env>(
+    holder: &'env FunctionTargetsHolder,
+    func_env: &'env FunctionEnv<'env>,
+) -> FunctionTarget<'env> {
+    let mut target_variant = None;
+    for (variant, target) in holder.get_targets(func_env) {
+        // regular verification variant is preferred, baseline version is the second choice
+        match variant {
+            FunctionVariant::Baseline => {
+                if target_variant.is_none() {
+                    target_variant = Some(target);
+                }
+            }
+            FunctionVariant::Verification(VerificationFlavor::Regular) => {
+                // TODO (mengxu): think about a way to handle ghost type parameters
+                if target.data.ghost_type_param_count == 0 {
+                    target_variant = Some(target);
+                }
+            }
+            _ => (),
+        }
+    }
+    target_variant.unwrap()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/Cargo.toml b/vendors/move/crates/move-stackless-bytecode/Cargo.toml
new file mode 100644
index 000000000..ca9d114ba
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "move-stackless-bytecode"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move stackless bytecode"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+move-model.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-command-line-common.workspace = true
+move-read-write-set-types.workspace = true
+move-compiler.workspace = true
+
+codespan.workspace = true
+codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
+ethnum.workspace = true
+num.workspace = true
+im.workspace = true
+itertools.workspace = true
+log.workspace = true
+serde.workspace = true
+paste.workspace = true
+petgraph.workspace = true
+
+[dev-dependencies]
+move-stdlib.workspace = true
+datatest-stable.workspace = true
+move-prover-test-utils.workspace = true
+anyhow = "1.0.71"
+
+[[test]]
+name = "testsuite"
+harness = false
diff --git a/vendors/move/crates/move-stackless-bytecode/src/access_path.rs b/vendors/move/crates/move-stackless-bytecode/src/access_path.rs
new file mode 100644
index 000000000..c7c245028
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/access_path.rs
@@ -0,0 +1,953 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file contains an abstraction of concrete *access paths*, which are canonical names for a particular cell in
+//! memory. Some examples of concrete paths are:
+//! * `0x7/M::T/f` (i.e., the field `f` of the `M::T` resource stored at address `0x7`
+//! * `Formal(0)/[2]` (i.e., the value stored at index 2 of the array bound the 0th formal of the current procedure)
+//! An abstract path is similar; it consists of the following components:
+//! * A *root*, which is either an abstract address or a local
+//! * Zero or more *offsets*, where an offset is a field, an unknown vector index, or an abstract struct type
+//!
+//! Abstract addresses are a set containing constants and abstract access paths read from the environment. For example,
+//! in the following Move code:
+//!```ignore
+//! struct S { f: u64 }
+//!
+//! fun foo(x: S) {
+//!   let a = if (*) { 0x1 } else { *&x.f }
+//!    ... // program point 1
+//! }
+//!```
+//!, the value of `a` will be `{ 0x1, Footprint(x/f) }` at program point 1.
+
+use crate::dataflow_domains::{AbstractDomain, SetDomain};
+use move_core_types::{account_address::AccountAddress, language_storage::StructTag};
+use move_model::{
+    ast::TempIndex,
+    model::{FunctionEnv, GlobalEnv, ModuleId, QualifiedId, StructId},
+    ty::{PrimitiveType, Type, TypeDisplayContext},
+};
+use num::BigUint;
+use std::{
+    fmt,
+    fmt::{Debug, Formatter},
+};
+
+type Address = BigUint;
+
+// =================================================================================================
+// Data Model
+
+/// Fully qualified type identifier `base` bound to type actuals `types`
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AbsStructType {
+    /// Module ID and struct ID
+    base: QualifiedId<StructId>,
+    /// Instantiation of generic type parameters
+    types: Vec<Type>,
+}
+
+/// Building block for abstraction of addresses
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Addr {
+    /// Account address constant
+    Constant(Address),
+    /// Account address read from given access path. This represents the value read from the given path at the beginning of
+    /// the current function
+    Footprint(AccessPath),
+}
+
+/// Abstraction of an address: non-empty set of constant or footprint address values
+pub type AbsAddr = SetDomain<Addr>;
+
+/// Abstraction of a key of type `addr`::`ty` in global storage
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct GlobalKey {
+    /// Account address of key
+    addr: AbsAddr,
+    /// Type of key
+    ty: AbsStructType,
+}
+
+/// Root of an access path: a global, local, or return variable
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Root {
+    /// A key in global storage
+    Global(GlobalKey), // TODO: this could (and maybe should) be AbsAddr + Offset::Global
+    /// A formal parameter
+    Formal(TempIndex),
+    /// A local variable
+    Local(TempIndex),
+    /// A return variable
+    Return(usize),
+}
+
+/// Offset of an access path: either a field, vector index, or global key
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Offset {
+    /// Index into contents of a struct by field offset
+    Field(usize),
+    /// Unknown index into a vector
+    VectorIndex,
+    /// A type index into global storage. Only follows a field or vector index of type address
+    Global(AbsStructType),
+}
+
+/// A unique identifier for a memory cell: root followed by zero or more offsets
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AccessPath {
+    root: Root,
+    offsets: Vec<Offset>,
+}
+
+// =================================================================================================
+// Abstract domain operations
+
+/// Trait for a domain that can be viewed as a partial map from access paths to values
+/// and values can be deleted using their access paths
+pub trait AccessPathMap<T: AbstractDomain> {
+    fn get_access_path(&self, ap: AccessPath) -> Option<&T>;
+    fn remove_access_path(&mut self, ap: AccessPath) -> Option<T>;
+}
+
+/// Trait for an abstract domain that can represent footprint values
+pub trait FootprintDomain: AbstractDomain + Clone + Debug + PartialEq + Sized {
+    /// Create a footprint value for access path `ap`
+    fn make_footprint(ap: AccessPath) -> Option<Self>;
+}
+
+impl Addr {
+    /// Create a constant address from concrete address `a`
+    pub fn constant(a: Address) -> Self {
+        Addr::Constant(a)
+    }
+
+    /// Create a footprint address from access path `ap`
+    pub fn footprint(ap: AccessPath) -> Self {
+        assert!(
+            !ap.root.is_return(),
+            "Attempting to create footprint from return access path"
+        );
+        assert!(
+            !ap.root.is_local(),
+            "Attempting to create footprint from local access path"
+        );
+
+        Self::Footprint(ap)
+    }
+
+    /// Return `true` if `self` is a constant
+    pub fn is_constant(&self) -> bool {
+        match self {
+            Self::Constant(_) => true,
+            Self::Footprint(_) => false,
+        }
+    }
+
+    /// Convert this address-typed abstract value A into an access path A/mid::sid::types
+    pub fn add_struct_offset(self, mid: &ModuleId, sid: StructId, types: Vec<Type>) -> AccessPath {
+        match self {
+            Self::Footprint(mut ap) => {
+                // TODO: assert type address?
+                ap.add_offset(Offset::global(mid, sid, types));
+                ap
+            }
+            Self::Constant(a) => AccessPath::new_address_constant(a, mid, sid, types),
+        }
+    }
+
+    /// Convert `self` into a concrete `AccountAddress` if it is a constant. Returns `None`
+    /// otherwise.
+    pub fn get_concrete_address(&self) -> Option<AccountAddress> {
+        match self {
+            Addr::Constant(a) => Some(move_model::big_uint_to_addr(a)),
+            Addr::Footprint(_) => None,
+        }
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> AddrDisplay<'a> {
+        AddrDisplay { addr: self, env }
+    }
+}
+
+impl AbsAddr {
+    /// Create a constant address from concrete address `a`
+    pub fn constant(a: Address) -> Self {
+        SetDomain::singleton(Addr::Constant(a))
+    }
+
+    /// Create a footprint address from access path `ap`
+    pub fn footprint(ap: AccessPath) -> Self {
+        SetDomain::singleton(Addr::Footprint(ap))
+    }
+
+    /// Create a footprint address read from formal `temp_index`
+    pub fn formal(formal_index: TempIndex, func_env: &FunctionEnv) -> Self {
+        assert!(
+            func_env.is_parameter(formal_index),
+            "Attempting to create formal from local index"
+        );
+        Self::footprint(AccessPath::from_index(formal_index, func_env))
+    }
+
+    /// Return `true` if `self` is a constant
+    pub fn is_constant(&self) -> bool {
+        self.iter().all(|a| a.is_constant())
+    }
+
+    /// Return `true` if `self` consists only of statically known constants
+    pub fn is_statically_known(&self) -> bool {
+        for a in self.iter() {
+            if !a.is_constant() {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Substitute all occurrences of Footprint(ap) in `self` by resolving the access path
+    /// `ap` in `sub_map`
+    pub fn substitute_footprint(
+        &mut self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) {
+        let mut acc = SetDomain::default();
+        for a in self.iter() {
+            match a {
+                Addr::Footprint(ap) => {
+                    acc.join(&ap.substitute_footprint(actuals, type_actuals, func_env, sub_map));
+                }
+                c => {
+                    acc.insert(c.clone());
+                }
+            }
+        }
+        *self = acc
+    }
+
+    /// Return a new abstract address by adding the offset `mid::sid<types>` to each element
+    /// of `self`
+    pub fn add_struct_offset(self, mid: &ModuleId, sid: StructId, types: Vec<Type>) -> Self {
+        let mut acc = Self::default();
+        for v in self.into_iter() {
+            acc.insert(Addr::Footprint(v.add_struct_offset(
+                mid,
+                sid,
+                types.clone(),
+            )));
+        }
+        acc
+    }
+
+    /// Return a new abstract address by adding the offset `offset` to each element of `self`
+    pub fn add_offset(&self, offset: Offset) -> Self {
+        let mut extended_aps: AbsAddr = AbsAddr::default();
+        for p in self.iter() {
+            match p {
+                Addr::Footprint(ap) => {
+                    let mut extended_ap = ap.clone();
+                    extended_ap.add_offset(offset.clone());
+                    extended_aps.insert(Addr::Footprint(extended_ap));
+                }
+                Addr::Constant(c) => {
+                    panic!(
+                        "Type error: address constant {:?} as base for offset {:?}",
+                        c, offset
+                    )
+                }
+            }
+        }
+        extended_aps
+    }
+
+    /// Produce a new version of `self` with `prefix` prepended to each footprint
+    /// value
+    pub fn prepend(self, prefix: AccessPath) -> Self {
+        let mut acc = Self::default();
+        for v in self.into_iter() {
+            match v {
+                Addr::Footprint(ap) => {
+                    let mut new_ap = ap.clone();
+                    new_ap.prepend(prefix.clone());
+                    acc.insert(Addr::Footprint(new_ap));
+                }
+                a => {
+                    acc.insert(a);
+                }
+            }
+        }
+        acc
+    }
+
+    /// return an iterator over the footprint paths in `self`
+    pub fn footprint_paths(&self) -> impl Iterator<Item = &AccessPath> {
+        self.iter().filter_map(|a| match a {
+            Addr::Footprint(ap) => Some(ap),
+            Addr::Constant(_) => None,
+        })
+    }
+
+    /// Return an iterator over the concrete addresses in `self`
+    pub fn get_concrete_addresses(&self) -> Vec<AccountAddress> {
+        self.iter().flat_map(|a| a.get_concrete_address()).collect()
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> AbsAddrDisplay<'a> {
+        AbsAddrDisplay { addr: self, env }
+    }
+}
+
+impl FootprintDomain for AbsAddr {
+    fn make_footprint(ap: AccessPath) -> Option<Self> {
+        if !ap.root.is_return() && !ap.root.is_local() {
+            Some(AbsAddr::footprint(ap))
+        } else {
+            None
+        }
+    }
+}
+
+impl From<&AccountAddress> for AbsAddr {
+    fn from(addr: &AccountAddress) -> Self {
+        Self::constant(move_model::addr_to_big_uint(addr))
+    }
+}
+
+impl GlobalKey {
+    pub fn new(addr: AbsAddr, mid: &ModuleId, sid: StructId, types: Vec<Type>) -> Self {
+        Self {
+            addr,
+            ty: AbsStructType::new(mid, sid, types),
+        }
+    }
+
+    /// Create a constant `GlobalKey` using constant `addr` and type `ty`
+    pub fn constant(addr: BigUint, ty: AbsStructType) -> Self {
+        Self {
+            addr: AbsAddr::constant(addr),
+            ty,
+        }
+    }
+
+    /// Return the abstract address associated with `self`
+    pub fn address(&self) -> &AbsAddr {
+        &self.addr
+    }
+
+    /// Return the abstract struct type associated with `self`
+    pub fn struct_type(&self) -> &AbsStructType {
+        &self.ty
+    }
+
+    /// Return true if the address and type parameters of this global key are known statically
+    pub fn is_statically_known(&self) -> bool {
+        self.addr.is_statically_known() && self.ty.is_closed()
+    }
+
+    /// Substitute all occurrences of Footprint(ap) in `self.addr` by resolving the access path
+    /// `ap` in `sub_map`.
+    pub fn substitute_footprint(
+        &mut self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) {
+        self.addr
+            .substitute_footprint(actuals, type_actuals, func_env, sub_map);
+        self.ty.substitute_footprint(type_actuals);
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> GlobalKeyDisplay<'a> {
+        GlobalKeyDisplay { g: self, env }
+    }
+}
+
+impl Root {
+    /// Create a `Root` from local index `index`
+    pub fn from_index(index: TempIndex, fun: &FunctionEnv) -> Self {
+        if fun.is_parameter(index) {
+            Root::Formal(index)
+        } else {
+            Root::Local(index)
+        }
+    }
+
+    /// Create a `Root` from global storage key `key`
+    pub fn global(key: GlobalKey) -> Self {
+        Root::Global(key)
+    }
+
+    /// Create a `Root` from return variable `index`
+    pub fn ret(index: usize) -> Self {
+        Root::Return(index)
+    }
+
+    /// Return the type of `self` in `fun`
+    pub fn get_type(&self, fun: &FunctionEnv) -> Type {
+        match self {
+            Self::Global(g) => g.ty.get_type(),
+            Self::Formal(i) => fun.get_local_type(*i),
+            Self::Local(i) => {
+                if *i < fun.get_local_count() {
+                    fun.get_local_type(*i)
+                } else {
+                    // temporary local generated by stackless bytecode. use dummy type
+                    Type::Error
+                }
+            }
+            Self::Return(i) => fun.get_return_type(*i),
+        }
+    }
+
+    /// Return true if this variable is a formal parameter
+    pub fn is_formal(&self) -> bool {
+        matches!(self, Self::Formal(_))
+    }
+
+    /// Return `true` if this variable is a return value
+    pub fn is_return(&self) -> bool {
+        matches!(self, Self::Return(_))
+    }
+
+    /// Return `true` if this variable is a lol
+    pub fn is_local(&self) -> bool {
+        matches!(self, Self::Local(_))
+    }
+
+    /// Return true if `self` can be determined statically
+    pub fn is_statically_known(&self) -> bool {
+        match self {
+            Self::Local(..) | Self::Return(..) | Self::Formal(..) => false,
+            Self::Global(g) => g.is_statically_known(),
+        }
+    }
+
+    /// Replace all footprint paths in `self` using `actuals` and `sub_map`.
+    /// Bind free type variables to `type_actuals`.
+    pub fn substitute_footprint(
+        &mut self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) {
+        match self {
+            Self::Global(g) => g.substitute_footprint(actuals, type_actuals, func_env, sub_map),
+            Self::Formal(_) | Self::Local(_) | Self::Return(_) => (),
+        }
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> RootDisplay<'a> {
+        RootDisplay { root: self, env }
+    }
+}
+
+impl Offset {
+    pub fn global(mid: &ModuleId, sid: StructId, types: Vec<Type>) -> Self {
+        Offset::Global(AbsStructType::new(mid, sid, types))
+    }
+
+    pub fn field(f: usize) -> Self {
+        Offset::Field(f)
+    }
+
+    /// Get the type of offset `base`/`self` in function `fun`
+    pub fn get_type(&self, base: &Type, env: &GlobalEnv) -> Type {
+        match (base.skip_reference(), self) {
+            (Type::Struct(mid, sid, types), Offset::Field(f)) => {
+                let field_type = env
+                    .get_module(*mid)
+                    .get_struct(*sid)
+                    .get_field_by_offset(*f)
+                    .get_type();
+                field_type.instantiate(types)
+            }
+            (Type::Vector(t), Offset::VectorIndex) => *t.clone(),
+            (Type::Primitive(PrimitiveType::Address), Offset::Global(s)) => s.get_type(),
+            (Type::Primitive(PrimitiveType::Signer), Offset::Global(s)) => {
+                // we conflate address and signer, so this can happen
+                s.get_type()
+            }
+            (Type::Error, _) => {
+                // couldn't infer the type of `base`. propagate the error
+                Type::Error
+            }
+            (Type::Primitive(_), Offset::Global(_))
+            | (Type::Primitive(_), Offset::Field(_))
+            | (Type::Primitive(_), Offset::VectorIndex)
+            | (Type::Tuple(_), Offset::Field(_))
+            | (Type::Tuple(_), Offset::VectorIndex)
+            | (Type::Tuple(_), Offset::Global(_))
+            | (Type::Vector(_), Offset::Field(_))
+            | (Type::Vector(_), Offset::Global(_))
+            | (Type::Struct(_, _, _), Offset::VectorIndex)
+            | (Type::Struct(_, _, _), Offset::Global(_))
+            | (Type::TypeParameter(_), Offset::Field(_))
+            | (Type::TypeParameter(_), Offset::VectorIndex)
+            | (Type::TypeParameter(_), Offset::Global(_))
+            | (Type::Reference(_, _), Offset::Field(_))
+            | (Type::Reference(_, _), Offset::VectorIndex)
+            | (Type::Reference(_, _), Offset::Global(_))
+            | (Type::Fun(_, _), Offset::Field(_))
+            | (Type::Fun(_, _), Offset::VectorIndex)
+            | (Type::Fun(_, _), Offset::Global(_))
+            | (Type::TypeDomain(_), Offset::Field(_))
+            | (Type::TypeDomain(_), Offset::VectorIndex)
+            | (Type::TypeDomain(_), Offset::Global(_))
+            | (Type::ResourceDomain(_, _, _), Offset::Field(_))
+            | (Type::ResourceDomain(_, _, _), Offset::VectorIndex)
+            | (Type::ResourceDomain(_, _, _), Offset::Global(_))
+            | (Type::Var(_), Offset::Field(_))
+            | (Type::Var(_), Offset::VectorIndex)
+            | (Type::Var(_), Offset::Global(_)) => {
+                panic!(
+                    "get_type warning: Invalid base type {} for offset {:?} in get_type",
+                    base.display(&move_model::ty::TypeDisplayContext::WithEnv {
+                        env,
+                        type_param_names: None
+                    }),
+                    self,
+                )
+            }
+        }
+    }
+
+    /// Bind free type variables in `self` to `type_actuals`
+    pub fn substitute_footprint(&mut self, type_actuals: &[Type]) {
+        match self {
+            Offset::Global(g) => g.substitute_footprint(type_actuals),
+            Offset::Field(..) | Offset::VectorIndex => (),
+        }
+    }
+
+    /// Return true if this offset is the same in all concrete program executions
+    pub fn is_statically_known(&self) -> bool {
+        use Offset::*;
+        match self {
+            Field(..) => true,
+            Global(..) // Note: even if `g.is_statically_known()`, we should return
+		// false here because `g` will always have a successor field that
+		// is an offset determined at runtime
+		| VectorIndex => false,
+        }
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, base_type: &'a Type, env: &'a GlobalEnv) -> OffsetDisplay<'a> {
+        OffsetDisplay {
+            offset: self,
+            base_type,
+            env,
+        }
+    }
+}
+
+impl AccessPath {
+    pub fn new(root: Root, offsets: Vec<Offset>) -> Self {
+        AccessPath { root, offsets }
+    }
+
+    pub fn new_root(root: Root) -> Self {
+        AccessPath {
+            root,
+            offsets: vec![],
+        }
+    }
+
+    pub fn new_global(addr: AbsAddr, mid: &ModuleId, sid: StructId, types: Vec<Type>) -> Self {
+        Self::new_root(Root::Global(GlobalKey::new(addr, mid, sid, types)))
+    }
+
+    pub fn new_address_constant(
+        addr: BigUint,
+        mid: &ModuleId,
+        sid: StructId,
+        types: Vec<Type>,
+    ) -> Self {
+        Self::new_global(AbsAddr::constant(addr), mid, sid, types)
+    }
+
+    pub fn new_global_constant(addr: BigUint, ty: AbsStructType) -> Self {
+        Self::new_root(Root::Global(GlobalKey::constant(addr, ty)))
+    }
+
+    pub fn from_index(i: TempIndex, func_env: &FunctionEnv) -> Self {
+        Self::new_root(Root::from_index(i, func_env))
+    }
+
+    /// Unpack `self` into its root and offsets
+    pub fn into(self) -> (Root, Vec<Offset>) {
+        (self.root, self.offsets)
+    }
+
+    pub fn root(&self) -> &Root {
+        &self.root
+    }
+
+    pub fn offsets(&self) -> &[Offset] {
+        &self.offsets
+    }
+
+    /// extend this access path by adding offset `o` to the end
+    pub fn add_offset(&mut self, o: Offset) {
+        self.offsets.push(o)
+    }
+
+    /// Return the type of this access path
+    pub fn get_type(&self, fun: &FunctionEnv) -> Type {
+        let mut ty = self.root.get_type(fun);
+        for offset in &self.offsets {
+            let offset_ty = offset.get_type(&ty, fun.module_env.env);
+            ty = offset_ty;
+        }
+        ty
+    }
+
+    /// prepend `prefix` to self by swapping `self`'s root for prefix.root and
+    /// replacing `self`'s accesses with prefix.accesses :: self.accesses
+    pub fn prepend(&mut self, prefix: Self) {
+        // TODO: assert root is a formal
+        self.root = prefix.root;
+        let mut suffix_offsets = self.offsets.clone();
+        self.offsets = prefix.offsets;
+        self.offsets.append(&mut suffix_offsets)
+    }
+
+    /// Construct a new abstract address by prepending the addresses in `addrs` to `self`
+    pub fn prepend_addrs(&self, addrs: &AbsAddr) -> AbsAddr {
+        let mut acc = AbsAddr::default();
+        for a in addrs.iter() {
+            match a {
+                Addr::Footprint(ap) => {
+                    let mut new_ap = self.clone();
+                    new_ap.prepend(ap.clone());
+                    acc.insert(Addr::footprint(new_ap));
+                }
+                Addr::Constant(c) => {
+                    if self.offsets.is_empty() {
+                        acc.insert(Addr::constant(c.clone()));
+                    } else {
+                        // access path with constant base and offsets (e.g., 0x1/M::S/f/g)
+                        // normalize by converting into a path with a global base instead
+                        match &self.offsets[0] {
+                            Offset::Global(struct_type) => {
+                                let root = Root::Global(GlobalKey::constant(
+                                    c.clone(),
+                                    struct_type.clone(),
+                                ));
+                                let mut new_offsets = vec![];
+                                for v in self.offsets[1..].iter() {
+                                    new_offsets.push(v.clone())
+                                }
+                                acc.insert(Addr::footprint(AccessPath::new(root, new_offsets)));
+                            }
+                            _ => panic!(
+                                "Invariant violation: constant root with bad offsets {:?}",
+                                self.offsets
+                            ),
+                        }
+                    }
+                }
+            }
+        }
+        acc
+    }
+
+    /// Replace all footprint paths in `self` using `actuals` and `sub_map`.
+    /// Bind free type variables to `type_actuals`.
+    pub fn substitute_footprint(
+        &self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) -> AbsAddr {
+        let mut new_offsets = self.offsets.clone();
+        new_offsets.iter_mut().for_each(|o| {
+            o.substitute_footprint(type_actuals);
+        });
+        match &self.root {
+            Root::Formal(i) => {
+                let temp_index = actuals[*i];
+                let caller_root = Root::from_index(temp_index, func_env);
+                let mut results = AbsAddr::default();
+
+                // In this loop, we lookup the access path in the submap,
+                // starting with the root of the caller and adding the
+                // offsets of the current access path.
+                // When a result is found, we accumulate to results
+                // We need to try with the offsets to handle cases such as
+                // Formal(1): { data: None, children: { Field(0): { data: Footprint(AccessPath { root: Formal(0), offsets: [] }) } }
+                // where simply reading Formal(1) would yield None
+                // but Formal(1)/0 gives the mapping to Formal(0)
+                for i in 0..=new_offsets.len() {
+                    let caller_offsets = Vec::from(&new_offsets[0..i]);
+                    let ap = AccessPath::new(caller_root.clone(), caller_offsets.clone());
+                    if let Some(addrs) = sub_map.get_access_path(ap) {
+                        // We need to adjust the offset from the current access path
+                        // to avoid duplicating it (i.e. Formal(0)/0/0 instead of Formal(0)/0)
+                        let callee_offsets = Vec::from(&new_offsets[i..new_offsets.len()]);
+                        let new_addrs =
+                            AccessPath::new(self.root.clone(), callee_offsets).prepend_addrs(addrs);
+                        results.join(&new_addrs);
+                    }
+                }
+                results
+            }
+            Root::Global(g) => {
+                let mut new_g = g.clone();
+                new_g.substitute_footprint(actuals, type_actuals, func_env, sub_map);
+                AbsAddr::singleton(Addr::footprint(AccessPath::new(
+                    Root::Global(new_g),
+                    new_offsets,
+                )))
+            }
+            Root::Local(_) | Root::Return(_) => AbsAddr::default(),
+        }
+    }
+
+    /// Return true if `self` can be converted to a compact set of concrete access paths.
+    /// Returns false if (e.g.) `self` contains an global root with an unbound
+    /// address/type parameter, a global offset, or a vector index offset.
+    pub fn is_statically_known(&self) -> bool {
+        self.root.is_statically_known() && {
+            for offset in &self.offsets {
+                if !offset.is_statically_known() {
+                    return false;
+                }
+            }
+            true
+        }
+    }
+
+    /// Return `true` if `self` has no unbound address or type variables (i.e., the type variables
+    /// and addresses in `self.root` are statically known and `self` has no `Global` offsets.
+    /// This function is the same as `is_statically_known` except that `is_statically_known` returns
+    /// `false` if `self` has `Vector` offsets, but this function will not.
+    pub fn all_addresses_types_bound(&self) -> bool {
+        self.root.is_statically_known() && {
+            for offset in &self.offsets {
+                if matches!(offset, Offset::Global(_)) {
+                    return false;
+                }
+            }
+            true
+        }
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> AccessPathDisplay<'a> {
+        AccessPathDisplay { ap: self, env }
+    }
+}
+
+impl AbsStructType {
+    pub fn new(mid: &ModuleId, sid: StructId, types: Vec<Type>) -> Self {
+        AbsStructType {
+            base: mid.qualified(sid),
+            types,
+        }
+    }
+
+    /// Return the concrete type of `self`
+    pub fn get_type(&self) -> Type {
+        Type::Struct(self.base.module_id, self.base.id, self.types.clone())
+    }
+
+    /// If this `self` is closed, convert it to a `StructTag`. Return
+    /// `None` otherwise
+    pub fn get_type_tag(&self, env: &GlobalEnv) -> Option<StructTag> {
+        self.get_type().into_struct_tag(env)
+    }
+
+    /// Substitue the open types in self.types with caller `type_actuals`
+    pub fn substitute_footprint(&mut self, type_actuals: &[Type]) {
+        for t in self.types.iter_mut() {
+            *t = t.instantiate(type_actuals)
+        }
+    }
+
+    /// Returns a normalized representation of this type if it closed,
+    /// None if it is open
+    pub fn normalize(&self, env: &GlobalEnv) -> Option<StructTag> {
+        self.get_type().into_struct_tag(env)
+    }
+
+    /// Return `true` if `self` has no type variables or if all of `self`'s type variables are bound
+    pub fn is_closed(&self) -> bool {
+        for t in &self.types {
+            if t.is_open() {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a GlobalEnv) -> AbsStructTypeDisplay<'a> {
+        AbsStructTypeDisplay { s: self, env }
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+pub struct AbsStructTypeDisplay<'a> {
+    s: &'a AbsStructType,
+    env: &'a GlobalEnv,
+}
+
+impl<'a> fmt::Display for AbsStructTypeDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.s.normalize(self.env) {
+            Some(t) => {
+                write!(f, "{}", t)
+            }
+            None => {
+                let tctx = TypeDisplayContext::WithEnv {
+                    env: self.env,
+                    type_param_names: None,
+                };
+                let dummy_type =
+                    Type::Struct(self.s.base.module_id, self.s.base.id, self.s.types.clone());
+                write!(f, "{}", dummy_type.display(&tctx))
+            }
+        }
+    }
+}
+
+pub struct AddrDisplay<'a> {
+    addr: &'a Addr,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for AddrDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.addr {
+            Addr::Constant(a) => write!(f, "{:#x}", a),
+            Addr::Footprint(ap) => write!(f, "{}", ap.display(self.env)),
+        }
+    }
+}
+
+pub struct AbsAddrDisplay<'a> {
+    addr: &'a AbsAddr,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for AbsAddrDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        if self.addr.len() == 1 {
+            write!(f, "{}", self.addr.iter().next().unwrap().display(self.env))
+        } else {
+            f.write_str("{")?;
+            for a in self.addr.iter() {
+                write!(f, "{}", a.display(self.env))?;
+                // TODO: nice comma-separated list
+                f.write_str(", ")?;
+            }
+            f.write_str("}")
+        }
+    }
+}
+
+pub struct GlobalKeyDisplay<'a> {
+    g: &'a GlobalKey,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for GlobalKeyDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}/{}",
+            self.g.addr.display(self.env),
+            self.g.ty.display(self.env.module_env.env)
+        )
+    }
+}
+
+pub struct RootDisplay<'a> {
+    root: &'a Root,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for RootDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.root {
+            Root::Global(g) => write!(f, "{}", g.display(self.env)),
+            Root::Local(i) => write!(f, "Loc({})", i), // TODO: print name if available
+            Root::Formal(i) => write!(f, "Formal({})", i), // TODO: print name if available
+            Root::Return(i) => write!(f, "Ret({})", i),
+        }
+    }
+}
+
+pub struct OffsetDisplay<'a> {
+    offset: &'a Offset,
+    base_type: &'a Type,
+    env: &'a GlobalEnv,
+}
+
+impl<'a> fmt::Display for OffsetDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use Offset::*;
+        match self.offset {
+            Field(fld) => match self.base_type.skip_reference() {
+                Type::Struct(mid, sid, _types) => f.write_str(
+                    self.env
+                        .get_module(*mid)
+                        .get_struct(*sid)
+                        .get_field_by_offset(*fld)
+                        .get_identifier()
+                        .expect("identifier defined")
+                        .as_str(),
+                ),
+                Type::Error => {
+                    // this happens when we are trying to print an access path rooted in a stackless
+                    // bytecode-generated local. we do not know the type of this local, so we cannot
+                    // infer the type of its fields either. just print the index
+                    write!(f, "{}", *fld)
+                }
+                _ => {
+                    panic!(
+                        "Warning: Invalid base type {:?} for field offset {:?}",
+                        self.base_type, self.offset
+                    );
+                }
+            },
+            VectorIndex => f.write_str("[_]"),
+            Global(g) => write!(f, "{}", g.display(self.env)),
+        }
+    }
+}
+
+pub struct AccessPathDisplay<'a> {
+    ap: &'a AccessPath,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for AccessPathDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let genv = self.env.module_env.env;
+        write!(f, "{}", self.ap.root.display(self.env))?;
+        let mut root_ty = self.ap.root.get_type(self.env);
+        for offset in &self.ap.offsets {
+            f.write_str("/")?;
+            write!(f, "{}", offset.display(&root_ty, genv))?;
+            let offset_ty = offset.get_type(&root_ty, genv);
+            root_ty = offset_ty;
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/access_path_trie.rs b/vendors/move/crates/move-stackless-bytecode/src/access_path_trie.rs
new file mode 100644
index 000000000..37f022c25
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/access_path_trie.rs
@@ -0,0 +1,590 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! The obvious approach to abstracting a set of concrete paths is using a set of abstract paths.
+//! An access path trie represents a set of paths in a way that avoids redundant representations of
+//! the same memory. Root nodes are access path roots and each internal node is an access path offset.
+//! Each node is (optionally) associated with abstract value of a generic type `T`.
+
+use crate::{
+    access_path::{AbsAddr, AccessPath, AccessPathMap, FootprintDomain, Offset, Root},
+    dataflow_domains::{AbstractDomain, JoinResult, MapDomain},
+};
+use im::ordmap::Entry;
+use move_core_types::language_storage::TypeTag;
+use move_model::{
+    ast::TempIndex,
+    model::{FunctionEnv, GlobalEnv},
+    ty::Type,
+};
+use std::{
+    fmt,
+    fmt::Formatter,
+    ops::{Deref, DerefMut},
+};
+
+// =================================================================================================
+// Data model
+
+/// A node in the access Trie: `data` associated with the parent node + `children` mapping offsets to child nodes
+#[derive(Debug, Clone, PartialOrd, PartialEq, Eq)]
+pub struct TrieNode<T: FootprintDomain> {
+    /// Optional data associated with the parent in the trie
+    data: Option<T>,
+    /// Child pointers labeled by offsets
+    children: MapDomain<Offset, TrieNode<T>>,
+}
+
+/// Set of (root node, child) associations
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+pub struct AccessPathTrie<T: FootprintDomain>(MapDomain<Root, TrieNode<T>>);
+
+// =================================================================================================
+// Abstract domain operations
+
+impl<T: FootprintDomain> TrieNode<T> {
+    pub fn new(data: T) -> Self {
+        TrieNode {
+            data: Some(data),
+            children: MapDomain::default(),
+        }
+    }
+
+    pub fn new_opt(data: Option<T>) -> Self {
+        TrieNode {
+            data,
+            children: MapDomain::default(),
+        }
+    }
+
+    /// Like join, but gracefully handles `Non` data fields by treating None as Bottom
+    pub fn join_data_opt_(mut data: &mut Option<T>, other: &Option<T>) -> JoinResult {
+        match (&mut data, other) {
+            (Some(data1), Some(data2)) => data1.join(data2),
+            (None, Some(d)) => {
+                *data = Some(d.clone());
+                JoinResult::Changed
+            }
+            (_, None) => JoinResult::Unchanged,
+        }
+    }
+
+    /// Like join, but gracefully handles `None` data fields by treating None as Bottom
+    pub fn join_data_opt(&mut self, other: &Option<T>) -> JoinResult {
+        Self::join_data_opt_(&mut self.data, other)
+    }
+
+    pub fn join_child_data(&self, mut acc: Option<T>) -> Option<T> {
+        Self::join_data_opt_(&mut acc, &self.data);
+        for v in self.children.values() {
+            acc = v.join_child_data(acc)
+        }
+        acc
+    }
+
+    pub fn get_child_data(&self) -> Option<T> {
+        self.join_child_data(None)
+    }
+
+    pub fn data(&self) -> &Option<T> {
+        &self.data
+    }
+
+    pub fn children(&self) -> &MapDomain<Offset, TrieNode<T>> {
+        &self.children
+    }
+
+    pub fn entry(&mut self, o: Offset) -> Entry<Offset, TrieNode<T>> {
+        self.children.entry(o)
+    }
+
+    /// Return the node mapped to `o` from self (if any)
+    pub fn get_offset(&self, o: &Offset) -> Option<&Self> {
+        self.children.get(o)
+    }
+
+    /// Return a mutable reference to the node mapped to `o` from self (if any)
+    pub fn get_offset_mut(&mut self, o: &Offset) -> Option<&mut Self> {
+        self.children.get_mut(o)
+    }
+
+    /// Removes the node mapped to `o` from self (if it exists)
+    pub fn remove_offset(&mut self, o: &Offset) -> Option<Self> {
+        self.children.remove(o)
+    }
+
+    /// Return true if `self`'s keys can be converted into a compact set of concrete access paths
+    /// Note: this says nothing about the `data` part of `self`
+    pub fn keys_statically_known(&self) -> bool {
+        for (offset, child) in self.children.iter() {
+            if !offset.is_statically_known() || !child.keys_statically_known() {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Bind caller data in `actuals`, `type_actuals`, and `sub_map` to `self`.
+    /// (1) Bind all free type variables in `self` to `type_actuals`
+    /// (2) Apply `sub_data` to `self.data` and (recursively) to the `data` fields of `self.children`
+    pub fn substitute_footprint<F>(
+        mut self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+        mut sub_data: F,
+    ) -> Self
+    where
+        F: FnMut(&mut T, &[TempIndex], &[Type], &FunctionEnv, &dyn AccessPathMap<AbsAddr>) + Copy,
+    {
+        match &mut self.data {
+            Some(d) => sub_data(d, actuals, type_actuals, func_env, sub_map),
+            None => (),
+        }
+        let mut acc = Self::new_opt(self.data);
+        for (mut k, v) in self.children.into_iter() {
+            k.substitute_footprint(type_actuals);
+            acc.children.insert_join(
+                k,
+                v.substitute_footprint(actuals, type_actuals, func_env, sub_map, sub_data),
+            );
+        }
+        acc
+    }
+
+    /// Apply `f` to each node in `self`
+    pub fn iter_values<F>(&mut self, f: F)
+    where
+        F: FnMut(&mut TrieNode<T>) + Copy,
+    {
+        self.children.update_values(f);
+    }
+
+    /// Apply `f` to each offset in `self`
+    pub fn iter_offsets<F>(&self, mut f: F) -> F
+    where
+        F: FnMut(&Offset),
+    {
+        for (k, v) in self.children.iter() {
+            f(k);
+            f = v.iter_offsets(f);
+        }
+        f
+    }
+
+    /// Apply `f` to all (access path, Option<data>) pairs encoded in `self`
+    fn iter_paths_opt<F>(&self, ap: &AccessPath, mut f: F) -> F
+    where
+        F: FnMut(&AccessPath, &Option<&T>),
+    {
+        f(ap, &self.data.as_ref());
+        for (k, v) in self.children.iter() {
+            let mut new_ap = ap.clone();
+            new_ap.add_offset(k.clone());
+            f = v.iter_paths_opt(&new_ap, f)
+        }
+        // have to thread F through to avoid constraining it with Copy
+        f
+    }
+}
+
+impl<T: FootprintDomain> AbstractDomain for TrieNode<T> {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let data_result = self.join_data_opt(&other.data);
+        let children_result = self.children.join(&other.children);
+        if data_result == JoinResult::Unchanged && children_result == JoinResult::Unchanged {
+            JoinResult::Unchanged
+        } else {
+            JoinResult::Changed
+        }
+    }
+}
+
+impl<T: FootprintDomain + PartialEq> AbstractDomain for AccessPathTrie<T> {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        if self == other {
+            return JoinResult::Unchanged;
+        }
+        let mut acc = AccessPathTrie::default();
+        acc.join_footprint(self, other);
+        acc.join_footprint(other, self);
+        *self = acc;
+        JoinResult::Changed
+    }
+}
+
+impl<T: FootprintDomain> AccessPathMap<T> for AccessPathTrie<T> {
+    fn get_access_path(&self, ap: AccessPath) -> Option<&T> {
+        match self.get_node(ap) {
+            Some(n) => n.data.as_ref(),
+            None => None,
+        }
+    }
+
+    fn remove_access_path(&mut self, ap: AccessPath) -> Option<T> {
+        self.remove_node(ap).and_then(|n| n.data)
+    }
+}
+
+impl<T: FootprintDomain> AccessPathTrie<T> {
+    fn join_footprint(&mut self, t1: &Self, t2: &Self) {
+        t1.iter_paths_opt(|ap, data1_opt| {
+            let data2_opt = t2.get_access_path(ap.clone());
+            match (*data1_opt, data2_opt) {
+                (Some(data1), Some(data2)) => {
+                    let mut new_data = data1.clone();
+                    new_data.join(data2);
+                    self.update_access_path_weak(ap.clone(), Some(new_data));
+                }
+                (None, Some(data)) | (Some(data), None) => {
+                    let mut new_data = data.clone();
+                    if let Some(footprint) = T::make_footprint(ap.clone()) {
+                        new_data.join(&footprint);
+                    }
+                    self.update_access_path_weak(ap.clone(), Some(new_data));
+                }
+                (None, None) => (),
+            }
+        })
+    }
+
+    fn get_node(&self, ap: AccessPath) -> Option<&TrieNode<T>> {
+        let mut node = match self.0.get(ap.root()) {
+            Some(n) => n,
+            None => return None,
+        };
+        for offset in ap.offsets() {
+            node = match node.get_offset(offset) {
+                Some(n) => n,
+                None => return None,
+            }
+        }
+        Some(node)
+    }
+
+    /// Removes node located at the given access path
+    /// Returns the node if it has been fully removed from the trie (i.e. it did not have any children)
+    pub fn remove_node(&mut self, ap: AccessPath) -> Option<TrieNode<T>> {
+        let mut node = self.0.get_mut(ap.root())?;
+
+        // If no offset, we want to remove the root node
+        if ap.offsets().is_empty() {
+            if node.children.is_empty() {
+                return self.0.remove(ap.root());
+            } else {
+                node.data = None;
+            }
+        // Otherwise, find the offset in the trie
+        } else {
+            let offsets_count = ap.offsets().len();
+            for offset in &ap.offsets()[0..offsets_count - 1] {
+                node = node.get_offset_mut(offset)?;
+            }
+            let last_offset = &ap.offsets()[offsets_count - 1];
+            let to_remove = node.get_offset_mut(last_offset)?;
+
+            if to_remove.children.is_empty() {
+                return node.remove_offset(last_offset);
+            } else {
+                to_remove.data = None;
+            }
+        }
+        None
+    }
+
+    pub fn get_child_data(&self) -> Option<T> {
+        let mut acc = None;
+        for v in self.values() {
+            acc = v.join_child_data(acc)
+        }
+        acc
+    }
+
+    /// Like `update_access_path`, but always performs a weak update
+    pub fn update_access_path_weak(&mut self, ap: AccessPath, data: Option<T>) {
+        self.update_access_path_(ap, TrieNode::new_opt(data), true)
+    }
+
+    /// Update `ap` in `global`.
+    /// Performs a strong update if the base of `ap` is a local and all offsets are Field's.
+    /// Otherwise, performs a weak update (TODO: more details).
+    /// Creates nodes for each offset in `ap` if they do not already exist
+    pub fn update_access_path(&mut self, ap: AccessPath, data: Option<T>) {
+        self.update_access_path_(ap, TrieNode::new_opt(data), false)
+    }
+
+    /// Join the value bound to `ap` with `node`
+    pub fn join_access_path(&mut self, ap: AccessPath, node: TrieNode<T>) {
+        self.update_access_path_(ap, node, true)
+    }
+
+    /// Update the value bound to `ap` with `new_node`.
+    /// If `weak_update` is true, do this by joining `new_node` with the old value`
+    /// If `weak_update` is false, attempt to replace the old value with `new_node`.
+    /// However, this may still result in a weak update if `ap` does not permit a strong
+    /// update (e.g., if it contains a vector index)
+    fn update_access_path_(
+        &mut self,
+        ap: AccessPath,
+        new_node: TrieNode<T>,
+        mut weak_update: bool,
+    ) {
+        let (root, offsets) = ap.into();
+        let needs_weak_update = match &root {
+            // local base. strong update possible because of Move aliasing semantics
+            Root::Local(_) | Root::Formal(_) | Root::Return(_) => false,
+            // global base. must do weak update unless g is statically known
+            Root::Global(g) => !g.is_statically_known(),
+        };
+        if needs_weak_update {
+            weak_update = true
+        };
+
+        let mut node = self.0.entry(root).or_default();
+        for offset in offsets.into_iter() {
+            // if one of the offsets is not statically known, we must do a weak update
+            weak_update = weak_update || !offset.is_statically_known();
+            node = node.entry(offset).or_default();
+        }
+        if weak_update {
+            node.join(&new_node);
+        } else {
+            // strong update; overwrite data
+            *node = new_node
+        }
+    }
+
+    /// Bind `data` to `local_index` in the trie, overwriting the old value of `local_index`
+    pub fn bind_local(&mut self, local_index: TempIndex, data: T, fun_env: &FunctionEnv) {
+        self.bind_root(Root::from_index(local_index, fun_env), data)
+    }
+
+    /// Bind `node` to `local_index` in the trie, overwriting the old value of `local_index`
+    pub fn bind_local_node(
+        &mut self,
+        local_index: TempIndex,
+        node: TrieNode<T>,
+        fun_env: &FunctionEnv,
+    ) {
+        self.bind_node(Root::from_index(local_index, fun_env), node);
+    }
+
+    /// Bind `node` to `lhs` in the trie, overwriting the old value of `lhs`
+    pub fn bind_node(&mut self, lhs: Root, node: TrieNode<T>) {
+        self.0.insert(lhs, node);
+    }
+
+    /// Remove the value bound to the local variable `local_index`
+    pub fn remove_local(&mut self, local_index: TempIndex, fun_env: &FunctionEnv) {
+        self.0.remove(&Root::from_index(local_index, fun_env));
+    }
+
+    /// Bind `data` to the return variable `return_index`
+    pub fn bind_return(&mut self, return_index: usize, data: T) {
+        self.bind_root(Root::ret(return_index), data)
+    }
+
+    /// Bind `root` to `data`
+    pub fn bind_root(&mut self, root: Root, data: T) {
+        self.0.insert(root, TrieNode::new(data));
+    }
+
+    /// Retrieve the data associated with `local_index` in the trie. Returns `None` if there is no associated data
+    pub fn get_local(&self, local_index: TempIndex, fun_env: &FunctionEnv) -> Option<&T> {
+        self.get_local_node(local_index, fun_env)
+            .and_then(|n| n.data.as_ref())
+    }
+
+    /// Retrieve the node associated with `local_index` in the trie. Returns `None` if there is no associated node
+    pub fn get_local_node(
+        &self,
+        local_index: TempIndex,
+        fun_env: &FunctionEnv,
+    ) -> Option<&TrieNode<T>> {
+        self.0.get(&Root::from_index(local_index, fun_env))
+    }
+
+    /// Return `true` if there is a value bound to local variable `local_index`
+    pub fn local_exists(&self, local_index: TempIndex, fun_env: &FunctionEnv) -> bool {
+        self.0.contains_key(&Root::from_index(local_index, fun_env))
+    }
+
+    /// Return `true` if the keys of `self` have no dynamic components and thus can be converted into
+    /// a compact set of concrete access paths.
+    pub fn keys_statically_known(&self) -> bool {
+        for (root, node) in self.0.iter() {
+            if !root.is_statically_known() || !node.keys_statically_known() {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Bind caller data in `actuals`, `type_actuals`, and `sub_map` to `self`.
+    /// (1) Bind all free type variables in `self` to `type_actuals`
+    /// (2) Apply `sub_data` to `self.data` and (recursively) to the `data` fields of `self.children`
+    pub fn substitute_footprint<F>(
+        self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+        sub_data: F,
+    ) -> Self
+    where
+        F: FnMut(&mut T, &[TempIndex], &[Type], &FunctionEnv, &dyn AccessPathMap<AbsAddr>) + Copy,
+    {
+        let mut acc = Self::default();
+        for (mut k, v) in self.0.into_iter() {
+            k.substitute_footprint(actuals, type_actuals, func_env, sub_map);
+            let new_v = v.substitute_footprint(actuals, type_actuals, func_env, sub_map, sub_data);
+            acc.insert_join(k, new_v);
+        }
+        acc
+    }
+
+    /// Same as `substitute_footprint`, but does not change the `data` field of any node
+    pub fn substitute_footprint_skip_data(
+        self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) -> Self {
+        // TODO: is there a less hacky way to do this?
+        fn no_op<T>(
+            _: &mut T,
+            _: &[TempIndex],
+            _: &[Type],
+            _: &FunctionEnv,
+            _: &dyn AccessPathMap<AbsAddr>,
+        ) {
+        }
+        self.substitute_footprint(actuals, type_actuals, func_env, sub_map, no_op)
+    }
+
+    /// Substitute concrete values `actuals` and `type_actuals` into `self`
+    pub fn substitute_footprint_concrete(
+        self,
+        actuals: &[TempIndex],
+        type_actuals: &[TypeTag],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+        env: &GlobalEnv,
+    ) -> Self {
+        let types = type_actuals
+            .iter()
+            .map(|t| Type::from_type_tag(t, env))
+            .collect::<Vec<Type>>();
+        self.substitute_footprint_skip_data(actuals, &types, func_env, sub_map)
+    }
+
+    /// Apply `f` to each node in `self`
+    pub fn iter_values<F>(&mut self, mut f: F)
+    where
+        F: FnMut(&mut TrieNode<T>) + Copy,
+    {
+        self.update_values(|node| {
+            f(node);
+            node.iter_values(f);
+        });
+    }
+
+    /// Apply `f` to each offset in `self`
+    pub fn iter_offsets<F>(&self, mut f: F)
+    where
+        F: FnMut(&Offset),
+    {
+        for (_k, node) in self.0.iter() {
+            f = node.iter_offsets(f)
+        }
+    }
+
+    /// Apply `f` to each (access path, Option(data)) pair encoded in `self`
+    pub fn iter_paths_opt<F>(&self, mut f: F)
+    where
+        F: FnMut(&AccessPath, &Option<&T>),
+    {
+        for (root, node) in self.iter() {
+            let ap = AccessPath::new_root(root.clone());
+            f = node.iter_paths_opt(&ap, f)
+        }
+    }
+
+    /// Apply `f` to each (access path, data) pair encoded in `self`
+    pub fn iter_paths<F>(&self, mut f: F)
+    where
+        F: FnMut(&AccessPath, &T),
+    {
+        self.iter_paths_opt(|ap, t_opt| {
+            t_opt.map(|t| f(ap, t));
+        })
+    }
+
+    /// Apply `f` to each (access path, data) pair encoded in `self`
+    /// and collects the result when `f` returns `Some(r)`
+    pub fn filter_map_paths<F, R>(&self, mut f: F) -> Vec<R>
+    where
+        F: FnMut(&AccessPath, &T) -> Option<R>,
+    {
+        let mut results = vec![];
+        self.iter_paths(|a, b| {
+            if let Some(r) = f(a, b) {
+                results.push(r);
+            }
+        });
+        results
+    }
+
+    /// Return a wrapper that of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> AccessPathTrieDisplay<'a, T> {
+        AccessPathTrieDisplay { t: self, env }
+    }
+}
+
+// =================================================================================================
+// Boilerplate traits and formatting
+
+impl<T: FootprintDomain> Default for TrieNode<T> {
+    fn default() -> Self {
+        TrieNode {
+            data: None,
+            children: MapDomain::default(),
+        }
+    }
+}
+
+impl<T: FootprintDomain> Default for AccessPathTrie<T> {
+    fn default() -> Self {
+        AccessPathTrie(MapDomain::default())
+    }
+}
+
+impl<T: FootprintDomain> Deref for AccessPathTrie<T> {
+    type Target = MapDomain<Root, TrieNode<T>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T: FootprintDomain> DerefMut for AccessPathTrie<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+pub struct AccessPathTrieDisplay<'a, T: FootprintDomain> {
+    t: &'a AccessPathTrie<T>,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a, T: FootprintDomain> fmt::Display for AccessPathTrieDisplay<'a, T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        self.t
+            .iter_paths(|path, v| writeln!(f, "{}: {:?}", path.display(self.env), v).unwrap());
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/annotations.rs b/vendors/move/crates/move-stackless-bytecode/src/annotations.rs
new file mode 100644
index 000000000..89dd8c539
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/annotations.rs
@@ -0,0 +1,104 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    any::{Any, TypeId},
+    collections::BTreeMap,
+    fmt::{Debug, Formatter, Result},
+    rc::Rc,
+};
+
+use itertools::Itertools;
+
+/// A container for an extensible, dynamically typed set of annotations, that may or may not have
+/// reached a fixedpoint state
+#[derive(Default, Clone)]
+pub struct Annotations {
+    map: BTreeMap<TypeId, (Data, bool)>,
+}
+
+/// An internal struct to represent annotation data. This carries in addition to the
+/// dynamically typed value a function for cloning this value. This works
+/// around the restriction that we cannot use a trait to call into an Any type, so we need
+/// to maintain the "vtable" by ourselves.
+struct Data {
+    value: Box<dyn Any>,
+    clone_fun: Rc<dyn Fn(&Box<dyn Any>) -> Box<dyn Any>>,
+}
+
+impl Data {
+    fn new<T: Any + Clone>(x: T) -> Self {
+        let clone_fun = Rc::new(|x: &Box<dyn Any>| -> Box<dyn Any> {
+            Box::new(x.downcast_ref::<T>().unwrap().clone())
+        });
+        Self {
+            value: Box::new(x),
+            clone_fun,
+        }
+    }
+}
+
+impl Clone for Data {
+    fn clone(&self) -> Self {
+        Self {
+            value: (self.clone_fun)(&self.value),
+            clone_fun: self.clone_fun.clone(),
+        }
+    }
+}
+
+impl Debug for Annotations {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(
+            f,
+            "annotations{{{}}}",
+            self.map.keys().map(|t| format!("{:?}", t)).join(", ")
+        )
+    }
+}
+
+impl Annotations {
+    /// Tests whether annotation of type T is present.
+    pub fn has<T: Any>(&self) -> bool {
+        let id = TypeId::of::<T>();
+        self.map.contains_key(&id)
+    }
+
+    /// Gets annotation of type T.
+    pub fn get<T: Any>(&self) -> Option<&T> {
+        let id = TypeId::of::<T>();
+        self.map
+            .get(&id)
+            .and_then(|(d, _)| d.value.downcast_ref::<T>())
+    }
+
+    /// Gets annotation of type T or creates one from default.
+    pub fn get_or_default_mut<T: Any + Default + Clone>(&mut self, fixedpoint: bool) -> &mut T {
+        let id = TypeId::of::<T>();
+        let (data, _) = self
+            .map
+            .entry(id)
+            .or_insert_with(|| (Data::new(T::default()), fixedpoint));
+        data.value.downcast_mut::<T>().expect("cast successful")
+    }
+
+    /// Sets annotation of type T.
+    pub fn set<T: Any + Clone>(&mut self, x: T, fixedpoint: bool) {
+        let id = TypeId::of::<T>();
+        self.map.insert(id, (Data::new(x), fixedpoint));
+    }
+
+    /// Removes annotation of type T.
+    pub fn remove<T: Any>(&mut self) -> Option<Box<T>> {
+        let id = TypeId::of::<T>();
+        self.map
+            .remove(&id)
+            .and_then(|(d, _)| d.value.downcast::<T>().ok())
+    }
+
+    /// Mark whether the annotations all reach a fixedpoint status
+    pub fn reached_fixedpoint(&self) -> bool {
+        self.map.values().all(|(_, fixedpoint)| *fixedpoint)
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/borrow_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/borrow_analysis.rs
new file mode 100644
index 000000000..9f9e7adc7
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/borrow_analysis.rs
@@ -0,0 +1,765 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Data flow analysis computing borrow information for preparation of memory_instrumentation.
+
+use std::{borrow::BorrowMut, collections::BTreeMap, fmt};
+
+use itertools::Itertools;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::TempIndex,
+    model::{FunctionEnv, GlobalEnv, QualifiedInstId},
+    pragmas::INTRINSIC_FUN_MAP_BORROW_MUT,
+    ty::Type,
+    well_known::VECTOR_BORROW_MUT,
+};
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, MapDomain, SetDomain},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    livevar_analysis::LiveVarAnnotation,
+    stackless_bytecode::{AssignKind, BorrowEdge, BorrowNode, Bytecode, IndexEdgeKind, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd, Default)]
+pub struct BorrowInfo {
+    /// Contains the nodes which are alive. This excludes nodes which are alive because
+    /// other nodes which are alive borrow from them.
+    live_nodes: SetDomain<BorrowNode>,
+
+    /// Forward borrow information.
+    borrowed_by: MapDomain<BorrowNode, SetDomain<(BorrowNode, BorrowEdge)>>,
+
+    /// Backward borrow information. This field is not used during analysis, but computed once
+    /// analysis is done.
+    borrows_from: MapDomain<BorrowNode, SetDomain<(BorrowNode, BorrowEdge)>>,
+}
+
+/// Represents a write-back from a source node to a destination node with the associated edge
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct WriteBackAction {
+    /// the `src` of a write-back action must be a reference
+    pub src: TempIndex,
+    pub dst: BorrowNode,
+    pub edge: BorrowEdge,
+}
+
+impl BorrowInfo {
+    /// Gets the children of this node.
+    fn get_children(&self, node: &BorrowNode) -> Vec<&BorrowNode> {
+        self.borrowed_by
+            .get(node)
+            .map(|s| s.iter().map(|(n, _)| n).collect_vec())
+            .unwrap_or_default()
+    }
+
+    /// Gets the parents (together with the edges) of this node.
+    fn get_incoming(&self, node: &BorrowNode) -> Vec<(&BorrowNode, &BorrowEdge)> {
+        self.borrows_from
+            .get(node)
+            .map(|s| s.iter().map(|(n, e)| (n, e)).collect_vec())
+            .unwrap_or_default()
+    }
+
+    /// Checks whether a node is in use. A node is used if it is in the live_nodes set
+    /// or if it is borrowed by a node which is used.
+    pub fn is_in_use(&self, node: &BorrowNode) -> bool {
+        if self.live_nodes.contains(node) {
+            true
+        } else {
+            self.get_children(node)
+                .iter()
+                .any(|child| self.is_in_use(child))
+        }
+    }
+
+    /// Returns nodes which are dying from this to the next state. This includes those which
+    /// are directly dying plus those from which they borrow. Returns nodes in child-first order.
+    pub fn dying_nodes(&self, next: &BorrowInfo) -> Vec<(BorrowNode, Vec<Vec<WriteBackAction>>)> {
+        let mut result = vec![];
+        for dying in self.live_nodes.difference(&next.live_nodes) {
+            if next.is_in_use(dying) {
+                continue;
+            }
+
+            // Collect ancestors trees until reaching an ancestor that is still in use.
+            let dying_trees = self.collect_dying_ancestor_trees(dying, next);
+            result.push((dying.clone(), dying_trees));
+        }
+        result
+    }
+
+    /// Start from this node and follow-up the borrow chain until reaching a live/in-use ancestor.
+    /// Collect possible paths (from this node to a live ancestor) and return them in the DFS order.
+    fn collect_dying_ancestor_trees(
+        &self,
+        node: &BorrowNode,
+        next: &BorrowInfo,
+    ) -> Vec<Vec<WriteBackAction>> {
+        let mut trees = vec![];
+        self.collect_dying_ancestor_trees_recursive(node, next, vec![], &mut trees);
+        trees
+    }
+
+    fn collect_dying_ancestor_trees_recursive(
+        &self,
+        node: &BorrowNode,
+        next: &BorrowInfo,
+        order: Vec<WriteBackAction>,
+        trees: &mut Vec<Vec<WriteBackAction>>,
+    ) {
+        match node {
+            BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                trees.push(order);
+            }
+            BorrowNode::Reference(index) => {
+                if next.is_in_use(node) {
+                    // stop at a live reference
+                    trees.push(order);
+                } else {
+                    let incoming = self.get_incoming(node);
+                    if incoming.is_empty() {
+                        // when the borrow reference node has no incoming edges, it means that this
+                        // reference is a function argument.
+                        trees.push(order);
+                    } else {
+                        // when there are incoming edges, this borrow occurs within the body
+                        // of this function and this node need to be further traced upwards.
+                        for (parent, edge) in incoming {
+                            let mut appended = order.clone();
+                            appended.push(WriteBackAction {
+                                src: *index,
+                                dst: parent.clone(),
+                                edge: edge.clone(),
+                            });
+                            self.collect_dying_ancestor_trees_recursive(
+                                parent, next, appended, trees,
+                            );
+                        }
+                    }
+                }
+            }
+            BorrowNode::ReturnPlaceholder(..) => {
+                unreachable!("placeholder node type is not expected here");
+            }
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.live_nodes.is_empty() && self.borrowed_by.is_empty() && self.borrows_from.is_empty()
+    }
+
+    pub fn borrow_info_str(&self, func_target: &FunctionTarget<'_>) -> String {
+        let mut parts = vec![];
+        let mut add = |name: &str, value: String| {
+            if !value.is_empty() {
+                parts.push(format!("{}: {}", name, value));
+            }
+        };
+        add(
+            "live_nodes",
+            self.live_nodes
+                .iter()
+                .map(|node| format!("{}", node.display(func_target)))
+                .join(", "),
+        );
+        let borrows_str =
+            |(node1, borrows): (&BorrowNode, &SetDomain<(BorrowNode, BorrowEdge)>)| {
+                format!(
+                    "{} -> {{{}}}",
+                    node1.display(func_target),
+                    borrows
+                        .iter()
+                        .map(|(node2, edge)| format!(
+                            "({}, {})",
+                            edge.display(func_target.global_env()),
+                            node2.display(func_target)
+                        ))
+                        .join(", ")
+                )
+            };
+        add(
+            "borrowed_by",
+            self.borrowed_by.iter().map(borrows_str).join(", "),
+        );
+        add(
+            "borrows_from",
+            self.borrows_from.iter().map(borrows_str).join(", "),
+        );
+        parts.iter().join("\n")
+    }
+
+    fn add_node(&mut self, node: BorrowNode) {
+        self.live_nodes.insert(node);
+    }
+
+    fn del_node(&mut self, node: &BorrowNode) {
+        self.live_nodes.remove(node);
+    }
+
+    fn add_edge(&mut self, parent: BorrowNode, child: BorrowNode, weight: BorrowEdge) -> bool {
+        self.borrowed_by
+            .entry(parent)
+            .or_default()
+            .insert((child, weight))
+            .is_none()
+    }
+
+    fn consolidate(&mut self) {
+        for (src, outgoing) in self.borrowed_by.iter() {
+            for (dst, edge) in outgoing.iter() {
+                self.borrows_from
+                    .entry(dst.clone())
+                    .or_default()
+                    .insert((src.clone(), edge.clone()));
+            }
+        }
+    }
+
+    /// Collect those leaves which are returned and summarize them in a hyper edge.
+    /// Each of those leaves has a path `in_mut -> ref1 .. -> refn -> out_mut`.
+    /// We create a hyper edge `in_mut --summarize(ref1, .., refn)-> out_mut` for it.
+    fn summarize(
+        &mut self,
+        target: &FunctionTarget<'_>,
+        ret_info: &BorrowInfo,
+        ret_values: &[TempIndex],
+    ) {
+        for (src, outgoing) in ret_info.borrows_from.iter() {
+            if let BorrowNode::Reference(idx) = src {
+                if let Some(pos) = ret_values.iter().position(|i| i == idx) {
+                    // Construct hyper edges for this return value.
+                    let leaf = BorrowNode::ReturnPlaceholder(pos);
+                    self.construct_hyper_edges(&leaf, ret_info, vec![], outgoing)
+                }
+            }
+        }
+        for (ret_idx, ret_val) in ret_values.iter().enumerate() {
+            let ty = target.get_return_type(ret_idx);
+            if ty.is_mutable_reference() && *ret_val < target.get_parameter_count() {
+                // Special case of a &mut parameter directly returned. We do not have this in
+                // the borrow graph, so synthesize an edge.
+                self.add_edge(
+                    BorrowNode::Reference(*ret_val),
+                    BorrowNode::ReturnPlaceholder(ret_idx),
+                    BorrowEdge::Direct,
+                );
+            }
+        }
+    }
+
+    fn construct_hyper_edges(
+        &mut self,
+        leaf: &BorrowNode,
+        ret_info: &BorrowInfo,
+        prefix: Vec<BorrowEdge>,
+        outgoing: &SetDomain<(BorrowNode, BorrowEdge)>,
+    ) {
+        for (dest, edge) in outgoing.iter() {
+            let mut path = prefix.to_owned();
+            path.push(edge.clone());
+            if let Some(succs) = ret_info.borrows_from.get(dest) {
+                self.construct_hyper_edges(leaf, ret_info, path, succs);
+            } else {
+                // Reached a leaf.
+                let edge = if path.len() == 1 {
+                    path.pop().unwrap()
+                } else {
+                    path.reverse();
+                    let flattened = path
+                        .iter()
+                        .flat_map(|e| e.flatten().into_iter())
+                        .cloned()
+                        .collect();
+                    BorrowEdge::Hyper(flattened)
+                };
+                self.borrowed_by
+                    .entry(dest.clone())
+                    .or_default()
+                    .insert((leaf.clone(), edge));
+            }
+        }
+    }
+
+    /// Instantiates the summarized borrow graph of a function call in this graph.
+    fn instantiate(
+        &mut self,
+        callee_env: &FunctionEnv,
+        callee_targs: &[Type],
+        callee_summary: &BorrowInfo,
+        ins: &[TempIndex],
+        outs: &[TempIndex],
+    ) {
+        let get_in = |idx: usize| {
+            assert!(
+                idx < ins.len(),
+                "inconsistent borrow information: undefined input"
+            );
+            ins[idx]
+        };
+        for (ret_idx, out) in outs.iter().enumerate() {
+            if let Some(edges) = callee_summary
+                .borrows_from
+                .get(&BorrowNode::ReturnPlaceholder(ret_idx))
+            {
+                let out_node = BorrowNode::Reference(*out);
+                self.add_node(out_node.clone());
+                for (in_node, edge) in edges.iter() {
+                    if let BorrowNode::Reference(in_idx) = in_node {
+                        let actual_in_node = BorrowNode::Reference(get_in(*in_idx));
+                        self.add_edge(
+                            actual_in_node,
+                            out_node.clone(),
+                            edge.instantiate(callee_targs),
+                        );
+                    }
+                }
+            } else {
+                assert!(
+                    !callee_env.get_return_type(ret_idx).is_mutable_reference(),
+                    "inconsistent borrow information: undefined output: {}",
+                    callee_env.get_full_name_str()
+                )
+            }
+        }
+    }
+
+    fn join(&mut self, other: &Self) -> JoinResult {
+        self.live_nodes
+            .join(&other.live_nodes)
+            .combine(self.borrowed_by.join(&other.borrowed_by))
+            .combine(self.borrows_from.join(&other.borrows_from))
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct BorrowInfoAtCodeOffset {
+    pub before: BorrowInfo,
+    pub after: BorrowInfo,
+}
+
+/// Borrow annotation computed by the borrow analysis processor.
+#[derive(Clone, Default)]
+pub struct BorrowAnnotation {
+    summary: BorrowInfo,
+    code_map: BTreeMap<CodeOffset, BorrowInfoAtCodeOffset>,
+}
+
+impl BorrowAnnotation {
+    pub fn get_summary(&self) -> &BorrowInfo {
+        &self.summary
+    }
+    pub fn get_borrow_info_at(&self, code_offset: CodeOffset) -> Option<&BorrowInfoAtCodeOffset> {
+        self.code_map.get(&code_offset)
+    }
+
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = self.summary.join(&other.summary);
+        for (offset, info) in self.code_map.iter_mut() {
+            let other_info = other.code_map.get(offset).unwrap();
+            result = result.combine(
+                info.before
+                    .join(&other_info.before)
+                    .combine(info.after.join(&other_info.after)),
+            );
+        }
+        result
+    }
+}
+
+/// Borrow analysis processor.
+pub struct BorrowAnalysisProcessor {
+    borrow_natives: Vec<String>,
+}
+
+impl BorrowAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Self::new_borrow_natives(vec![])
+    }
+
+    pub fn new_borrow_natives(borrow_natives: Vec<String>) -> Box<Self> {
+        Box::new(BorrowAnalysisProcessor { borrow_natives })
+    }
+}
+
+impl FunctionTargetProcessor for BorrowAnalysisProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let mut borrow_annotation = get_custom_annotation_or_none(func_env, &self.borrow_natives)
+            .unwrap_or_else(|| {
+                let func_target = FunctionTarget::new(func_env, &data);
+                let analyzer = BorrowAnalysis::new(&func_target, targets, &self.borrow_natives);
+                analyzer.analyze(&data.code)
+            });
+
+        // Annotate function target with computed borrow data
+        let fixedpoint = match scc_opt {
+            None => true,
+            Some(_) => match data.annotations.get::<BorrowAnnotation>() {
+                None => false,
+                Some(old_annotation) => match borrow_annotation.join(old_annotation) {
+                    JoinResult::Unchanged => true,
+                    JoinResult::Changed => false,
+                },
+            },
+        };
+        data.annotations
+            .borrow_mut()
+            .set::<BorrowAnnotation>(borrow_annotation, fixedpoint);
+        data
+    }
+
+    fn finalize(&self, _env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        for (fun_id, variant) in targets.get_funs_and_variants().collect_vec() {
+            if let Some(data) = targets.get_data_mut(&fun_id, &variant) {
+                data.annotations.remove::<LiveVarAnnotation>();
+            }
+        }
+    }
+
+    fn name(&self) -> String {
+        "borrow_analysis".to_string()
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut fmt::Formatter,
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        writeln!(f, "\n\n==== borrow analysis summaries ====\n")?;
+        for ref module in env.get_modules() {
+            for ref fun in module.get_functions() {
+                for (_, ref target) in targets.get_targets(fun) {
+                    if let Some(an) = target.get_annotations().get::<BorrowAnnotation>() {
+                        if !an.summary.is_empty() {
+                            writeln!(
+                                f,
+                                "fun {}[{}]",
+                                fun.get_full_name_str(),
+                                target.data.variant
+                            )?;
+                            writeln!(f, "{}\n", an.summary.borrow_info_str(target))?;
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+/// If fun_env matches one of the functions implementing custom mutable borrow semantics,
+/// return the name of this function
+fn get_custom_borrow_info_or_none(
+    fun_env: &FunctionEnv,
+    borrow_natives: &Vec<String>,
+) -> Option<String> {
+    for name in borrow_natives {
+        if &fun_env.get_full_name_str() == name {
+            return Some(name.to_string());
+        }
+    }
+    None
+}
+
+/// Create a borrow annotation that captures the borrow relation between function params and returns
+fn summarize_custom_borrow(
+    edge_kind: IndexEdgeKind,
+    params: &[usize],
+    returns: &[usize],
+) -> BorrowAnnotation {
+    let mut an = BorrowAnnotation::default();
+    for param_index in params {
+        for return_index in returns {
+            let param_node = BorrowNode::Reference(*param_index);
+            let return_node = BorrowNode::ReturnPlaceholder(*return_index);
+            let edge = BorrowEdge::Index(edge_kind.clone());
+            an.summary
+                .borrowed_by
+                .entry(param_node)
+                .or_default()
+                .insert((return_node, edge));
+        }
+    }
+    an.summary.consolidate();
+    an
+}
+
+fn get_custom_annotation_or_none(
+    fun_env: &FunctionEnv,
+    borrow_natives: &Vec<String>,
+) -> Option<BorrowAnnotation> {
+    match get_custom_borrow_info_or_none(fun_env, borrow_natives) {
+        None => {
+            // check whether this borrow has known special semantics
+            if fun_env.is_well_known(VECTOR_BORROW_MUT) {
+                Some(summarize_custom_borrow(IndexEdgeKind::Vector, &[0], &[0]))
+            } else if fun_env.is_intrinsic_of(INTRINSIC_FUN_MAP_BORROW_MUT) {
+                Some(summarize_custom_borrow(IndexEdgeKind::Table, &[0], &[0]))
+            } else if fun_env.is_native_or_intrinsic() {
+                // non-borrow related native/intrinsic has no borrow semantics
+                Some(BorrowAnnotation::default())
+            } else {
+                // this is a normal function and we can summarize its borrow semantics
+                None
+            }
+        }
+        Some(name) => Some(summarize_custom_borrow(
+            IndexEdgeKind::Custom(name),
+            &[0],
+            &[0],
+        )),
+    }
+}
+
+struct BorrowAnalysis<'a> {
+    func_target: &'a FunctionTarget<'a>,
+    livevar_annotation: &'a LiveVarAnnotation,
+    targets: &'a FunctionTargetsHolder,
+    borrow_natives: &'a Vec<String>,
+}
+
+impl<'a> BorrowAnalysis<'a> {
+    fn new(
+        func_target: &'a FunctionTarget<'a>,
+        targets: &'a FunctionTargetsHolder,
+        borrow_natives: &'a Vec<String>,
+    ) -> Self {
+        let livevar_annotation = func_target
+            .get_annotations()
+            .get::<LiveVarAnnotation>()
+            .expect("livevar annotation");
+
+        Self {
+            func_target,
+            livevar_annotation,
+            targets,
+            borrow_natives,
+        }
+    }
+
+    fn analyze(&self, instrs: &[Bytecode]) -> BorrowAnnotation {
+        let cfg = StacklessControlFlowGraph::new_forward(instrs);
+
+        let mut state = BorrowInfo::default();
+
+        // Initialize state from parameters
+        for idx in 0..self.func_target.get_parameter_count() {
+            state.add_node(self.borrow_node(idx));
+        }
+
+        // Run the dataflow analysis
+        let state_map = self.analyze_function(state, instrs, &cfg);
+
+        // Summarize the result
+        let code_map = self.state_per_instruction(state_map, instrs, &cfg, |before, after| {
+            let mut before = before.clone();
+            let mut after = after.clone();
+            before.consolidate();
+            after.consolidate();
+            BorrowInfoAtCodeOffset { before, after }
+        });
+        let mut summary = BorrowInfo::default();
+        for (offs, code) in instrs.iter().enumerate() {
+            if let Bytecode::Ret(_, temps) = code {
+                if let Some(info) = code_map.get(&(offs as u16)) {
+                    summary.summarize(self.func_target, &info.before, temps);
+                }
+            }
+        }
+        summary.consolidate();
+        BorrowAnnotation { summary, code_map }
+    }
+
+    fn borrow_node(&self, idx: TempIndex) -> BorrowNode {
+        let ty = self.func_target.get_local_type(idx);
+        if ty.is_reference() {
+            BorrowNode::Reference(idx)
+        } else {
+            BorrowNode::LocalRoot(idx)
+        }
+    }
+}
+
+impl<'a> TransferFunctions for BorrowAnalysis<'a> {
+    type State = BorrowInfo;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut BorrowInfo, instr: &Bytecode, code_offset: CodeOffset) {
+        use Bytecode::*;
+        let livevar_annotation_at = self
+            .livevar_annotation
+            .get_live_var_info_at(code_offset)
+            .expect("livevar annotation");
+
+        match instr {
+            Assign(_, dest, src, kind) => {
+                let dest_node = self.borrow_node(*dest);
+                state.add_node(dest_node.clone());
+
+                let src_node = self.borrow_node(*src);
+                match kind {
+                    AssignKind::Move => {
+                        assert!(!self.func_target.get_local_type(*src).is_reference());
+                        assert!(!self.func_target.get_local_type(*dest).is_reference());
+                        state.del_node(&src_node);
+                    }
+                    AssignKind::Copy => {
+                        assert!(!self.func_target.get_local_type(*src).is_reference());
+                        assert!(!self.func_target.get_local_type(*dest).is_reference());
+                    }
+                    AssignKind::Store => {
+                        if self.func_target.get_local_type(*src).is_mutable_reference() {
+                            assert!(self
+                                .func_target
+                                .get_local_type(*dest)
+                                .is_mutable_reference());
+                            state.add_edge(src_node, dest_node, BorrowEdge::Direct);
+                        }
+                    }
+                }
+            }
+            Call(_, dests, oper, srcs, _) => {
+                use Operation::*;
+                match oper {
+                    // In the borrows below, we only create an edge if the
+                    // borrowed value is actually alive. For a dead borrow we would
+                    // otherwise never end live time, because we cannot see a node
+                    // being created and dying at the very same instruction.
+                    BorrowLoc if livevar_annotation_at.after.contains(&dests[0]) => {
+                        let dest_node = self.borrow_node(dests[0]);
+                        let src_node = self.borrow_node(srcs[0]);
+                        state.add_node(dest_node.clone());
+                        state.add_edge(src_node, dest_node, BorrowEdge::Direct);
+                    }
+                    BorrowGlobal(mid, sid, inst)
+                        if livevar_annotation_at.after.contains(&dests[0]) =>
+                    {
+                        let dest_node = self.borrow_node(dests[0]);
+                        let src_node = BorrowNode::GlobalRoot(QualifiedInstId {
+                            module_id: *mid,
+                            id: *sid,
+                            inst: inst.to_owned(),
+                        });
+                        state.add_node(dest_node.clone());
+                        state.add_edge(src_node, dest_node, BorrowEdge::Direct);
+                    }
+                    BorrowField(mid, sid, inst, field)
+                        if livevar_annotation_at.after.contains(&dests[0]) =>
+                    {
+                        let dest_node = self.borrow_node(dests[0]);
+                        let src_node = self.borrow_node(srcs[0]);
+                        state.add_node(dest_node.clone());
+                        state.add_edge(
+                            src_node,
+                            dest_node,
+                            BorrowEdge::Field(mid.qualified_inst(*sid, inst.to_owned()), *field),
+                        );
+                    }
+                    Function(mid, fid, targs) => {
+                        let callee_env = &self
+                            .func_target
+                            .global_env()
+                            .get_function_qid(mid.qualified(*fid));
+
+                        let callee_annotation =
+                            get_custom_annotation_or_none(callee_env, self.borrow_natives)
+                                .unwrap_or_else(|| {
+                                    let callee_info = if mid.qualified(*fid)
+                                        == self.func_target.func_env.get_qualified_id()
+                                    {
+                                        // self recursion (this is because we removed the current target from `self.targets`)
+                                        self.func_target.get_annotations().get::<BorrowAnnotation>()
+                                    } else {
+                                        let callee_target = self
+                                            .targets
+                                            .get_target(callee_env, &FunctionVariant::Baseline);
+                                        callee_target.get_annotations().get::<BorrowAnnotation>()
+                                    };
+                                    match callee_info {
+                                        None => {
+                                            // 1st iteration of the recursive case
+                                            BorrowAnnotation::default()
+                                        }
+                                        Some(annotation) => {
+                                            // non-recursive case or Nth iteration of fixedpoint (N >= 1)
+                                            annotation.clone()
+                                        }
+                                    }
+                                });
+
+                        state.instantiate(
+                            callee_env,
+                            targs,
+                            &callee_annotation.summary,
+                            srcs,
+                            dests,
+                        );
+                    }
+                    OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
+                        // just skip
+                    }
+                    _ => {
+                        // Other operations do not create references.
+                    }
+                }
+            }
+            _ => {
+                // Other instructions do not create references
+            }
+        }
+
+        // Update live_vars.
+        for idx in livevar_annotation_at
+            .before
+            .difference(&livevar_annotation_at.after)
+        {
+            if self.func_target.get_local_type(*idx).is_reference() {
+                let node = self.borrow_node(*idx);
+                state.del_node(&node);
+            }
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for BorrowAnalysis<'a> {}
+
+impl AbstractDomain for BorrowInfo {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let live_changed = self.live_nodes.join(&other.live_nodes);
+        let borrowed_changed = self.borrowed_by.join(&other.borrowed_by);
+        borrowed_changed.combine(live_changed)
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+/// Format a borrow annotation.
+pub fn format_borrow_annotation(
+    func_target: &FunctionTarget<'_>,
+    code_offset: CodeOffset,
+) -> Option<String> {
+    if let Some(BorrowAnnotation { code_map, .. }) =
+        func_target.get_annotations().get::<BorrowAnnotation>()
+    {
+        if let Some(map_at) = code_map.get(&code_offset) {
+            if !map_at.before.is_empty() {
+                return Some(map_at.before.borrow_info_str(func_target));
+            }
+        }
+    }
+    None
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/clean_and_optimize.rs b/vendors/move/crates/move-stackless-bytecode/src/clean_and_optimize.rs
new file mode 100644
index 000000000..b1c6d8bd5
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/clean_and_optimize.rs
@@ -0,0 +1,249 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Final phase of cleanup and optimization.
+
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    model::FunctionEnv,
+    pragmas::INTRINSIC_FUN_MAP_BORROW_MUT,
+    well_known::{EVENT_EMIT_EVENT, VECTOR_BORROW_MUT},
+};
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    options::ProverOptions,
+    stackless_bytecode::{BorrowNode, Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+pub struct CleanAndOptimizeProcessor();
+
+impl CleanAndOptimizeProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self())
+    }
+}
+
+impl FunctionTargetProcessor for CleanAndOptimizeProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() {
+            // Nothing to do
+            return data;
+        }
+
+        // Run optimizer
+        let options = ProverOptions::get(func_env.module_env.env);
+        let instrs = std::mem::take(&mut data.code);
+        let new_instrs = Optimizer {
+            options: &options,
+            target: &FunctionTarget::new(func_env, &data),
+        }
+        .run(instrs);
+        data.code = new_instrs;
+        data
+    }
+
+    fn name(&self) -> String {
+        "clean_and_optimize".to_string()
+    }
+}
+
+// Analysis
+// ========
+
+/// A data flow analysis state used for optimization analysis. Currently it tracks the nodes
+/// which have been updated but not yet written back.
+#[derive(Debug, Clone, Default, Eq, PartialEq, PartialOrd)]
+struct AnalysisState {
+    unwritten: BTreeSet<BorrowNode>,
+}
+
+impl AbstractDomain for AnalysisState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let n = self.unwritten.len();
+        self.unwritten.extend(other.unwritten.iter().cloned());
+        if self.unwritten.len() == n {
+            JoinResult::Unchanged
+        } else {
+            JoinResult::Changed
+        }
+    }
+}
+
+struct Optimizer<'a> {
+    options: &'a ProverOptions,
+    target: &'a FunctionTarget<'a>,
+}
+
+impl<'a> TransferFunctions for Optimizer<'a> {
+    type State = AnalysisState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut AnalysisState, instr: &Bytecode, _offset: CodeOffset) {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+        if let Call(_, _, oper, srcs, _) = instr {
+            match oper {
+                WriteRef => {
+                    state.unwritten.insert(Reference(srcs[0]));
+                }
+                WriteBack(Reference(dest), ..) => {
+                    if state.unwritten.contains(&Reference(srcs[0])) {
+                        state.unwritten.insert(Reference(*dest));
+                    }
+                }
+                Function(mid, fid, _) => {
+                    let callee_env = &self
+                        .target
+                        .global_env()
+                        .get_function_qid(mid.qualified(*fid));
+                    let has_effect = if !self.options.for_interpretation
+                        && callee_env.is_native_or_intrinsic()
+                    {
+                        // Exploit knowledge about builtin functions
+                        !(callee_env.is_well_known(VECTOR_BORROW_MUT)
+                            || callee_env.is_well_known(EVENT_EMIT_EVENT)
+                            || callee_env.is_intrinsic_of(INTRINSIC_FUN_MAP_BORROW_MUT)
+                            || is_custom_borrow(callee_env, &self.options.borrow_natives))
+                    } else {
+                        true
+                    };
+
+                    // Mark &mut parameters to functions as unwritten.
+                    if has_effect {
+                        for src in srcs {
+                            if self.target.get_local_type(*src).is_mutable_reference() {
+                                state.unwritten.insert(Reference(*src));
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+/// Check if fun_env matches one of the functions implementing custom mutable borrow semantics.
+fn is_custom_borrow(fun_env: &FunctionEnv, borrow_natives: &Vec<String>) -> bool {
+    for name in borrow_natives {
+        if &fun_env.get_full_name_str() == name {
+            return true;
+        }
+    }
+    false
+}
+
+impl<'a> DataflowAnalysis for Optimizer<'a> {}
+
+// Transformation
+// ==============
+
+impl<'a> Optimizer<'a> {
+    fn run(&mut self, instrs: Vec<Bytecode>) -> Vec<Bytecode> {
+        // Rum Analysis
+        let cfg = StacklessControlFlowGraph::new_forward(&instrs);
+        let state = self.analyze_function(AnalysisState::default(), &instrs, &cfg);
+        let data = self.state_per_instruction(state, &instrs, &cfg, |before, _| before.clone());
+
+        // Transform code.
+        let mut new_instrs = vec![];
+        let mut should_skip = BTreeSet::new();
+        for (code_offset, instr) in instrs.iter().enumerate() {
+            use BorrowNode::*;
+            use Bytecode::*;
+            use Operation::*;
+
+            let is_unwritten = |code_offset: CodeOffset, node: &BorrowNode| {
+                if let Some(unwritten) = data.get(&code_offset).map(|d| &d.unwritten) {
+                    unwritten.contains(node)
+                } else {
+                    // No data for this node, so assume it is unwritten.
+                    true
+                }
+            };
+
+            // Perform peephole optimization
+            match (new_instrs.last(), instr) {
+                (None, _) => {}
+                (Some(Call(_, _, UnpackRef, srcs1, _)), Call(_, _, PackRef, srcs2, _))
+                    if srcs1[0] == srcs2[0] =>
+                {
+                    // skip this redundant unpack/pack pair.
+                    new_instrs.pop();
+                    continue;
+                }
+                (Some(Call(_, dests, IsParent(..), srcs, _)), Branch(_, _, _, tmp))
+                    if dests[0] == *tmp
+                        && !is_unwritten(code_offset as CodeOffset, &Reference(srcs[0])) =>
+                {
+                    assert!(matches!(instrs[code_offset + 1], Label(..)));
+                    // skip this obsolete IsParent check when all WriteBacks in this block are redundant
+                    let mut block_cursor = code_offset + 2;
+                    let mut skip_branch = true;
+                    loop {
+                        match &instrs[block_cursor] {
+                            Call(_, _, WriteBack(_, _), srcs, _) => {
+                                if is_unwritten(block_cursor as CodeOffset, &Reference(srcs[0])) {
+                                    skip_branch = false;
+                                    break;
+                                }
+                                // skip redundant write-backs
+                                should_skip.insert(block_cursor);
+                            }
+                            Call(_, _, TraceLocal(_), _, _) => {
+                                // since the previous write-back is skipped, this trace local is redundant as well
+                                should_skip.insert(block_cursor);
+                            }
+                            _ => {
+                                break;
+                            }
+                        }
+                        block_cursor += 1;
+                    }
+                    if skip_branch {
+                        // get rid of the label as well
+                        should_skip.insert(code_offset + 1);
+                        new_instrs.pop();
+                        continue;
+                    }
+                }
+                (Some(_), _) => {}
+            }
+
+            // Do not include this instruction if it is marked as skipped
+            if should_skip.contains(&code_offset) {
+                continue;
+            }
+
+            // Other cases for skipping the instruction
+            match instr {
+                // Remove unnecessary WriteBack
+                Call(_, _, WriteBack(..), srcs, _)
+                    if !is_unwritten(code_offset as CodeOffset, &Reference(srcs[0])) =>
+                {
+                    continue;
+                }
+                _ => {}
+            }
+
+            // This instruction should be included
+            new_instrs.push(instr.clone());
+        }
+        new_instrs
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/compositional_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/compositional_analysis.rs
new file mode 100644
index 000000000..20bbc5286
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/compositional_analysis.rs
@@ -0,0 +1,86 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_model::model::{FunId, GlobalEnv, QualifiedId};
+
+use crate::{
+    dataflow_analysis::DataflowAnalysis,
+    dataflow_domains::AbstractDomain,
+    function_target::FunctionTarget,
+    function_target_pipeline::{FunctionTargetsHolder, FunctionVariant},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+/// Provides access to procedure summaries that have already been computed
+pub struct SummaryCache<'a> {
+    targets: &'a FunctionTargetsHolder,
+    global_env: &'a GlobalEnv,
+}
+
+impl<'a> SummaryCache<'a> {
+    pub fn new(targets: &'a FunctionTargetsHolder, global_env: &'a GlobalEnv) -> Self {
+        Self {
+            targets,
+            global_env,
+        }
+    }
+
+    /// Return a summary for a variant of `fun_id`. Returns None if `fun_id` is a native function or
+    /// we are at the first iteration of a recursive functions group.
+    pub fn get<Summary: 'static>(
+        &self,
+        fun_id: QualifiedId<FunId>,
+        variant: &FunctionVariant,
+    ) -> Option<&Summary> {
+        let fun_env = self.global_env.get_function(fun_id);
+        self.targets
+            .get_data(&fun_id, variant)
+            .and_then(|fun_data| {
+                if fun_env.is_native_or_intrinsic() {
+                    None
+                } else {
+                    fun_data.annotations.get::<Summary>()
+                }
+            })
+    }
+
+    pub fn global_env(&self) -> &GlobalEnv {
+        self.global_env
+    }
+}
+
+/// Trait that lifts an intraprocedural analysis into a bottom-up, compositional interprocedural
+/// analysis. Here, the type `Summary` represents a transformation of the final data flow analysis
+/// state.
+pub trait CompositionalAnalysis<Summary: AbstractDomain + 'static>: DataflowAnalysis
+where
+    Self::State: AbstractDomain + 'static,
+{
+    /// Specifies mapping from elements of dataflow analysis domain to elements of `Domain`.
+    fn to_summary(&self, state: Self::State, fun_target: &FunctionTarget) -> Summary;
+
+    /// Computes a postcondition for the function `data` and then maps the postcondition to an
+    /// element of abstract domain `Domain` by applying `to_summary` function. The result is stored
+    /// in the summary cache of `data`.
+    fn summarize(&self, fun_target: &FunctionTarget<'_>, initial_state: Self::State) -> Summary {
+        if !fun_target.func_env.is_native() {
+            let instrs = &fun_target.data.code;
+            let cfg = if Self::BACKWARD {
+                unimplemented!("backward compositional analysis")
+            } else {
+                StacklessControlFlowGraph::new_forward(instrs)
+            };
+            let state_map = self.analyze_function(initial_state.clone(), instrs, &cfg);
+            if let Some(exit_state) = state_map.get(&cfg.exit_block()) {
+                self.to_summary(exit_state.post.clone(), fun_target)
+            } else {
+                self.to_summary(initial_state, fun_target)
+            }
+        } else {
+            // TODO: not clear that this is desired, but some clients rely on
+            // every function having a summary, even natives
+            self.to_summary(initial_state, fun_target)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/data_invariant_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/data_invariant_instrumentation.rs
new file mode 100644
index 000000000..d3b5b9d9d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/data_invariant_instrumentation.rs
@@ -0,0 +1,283 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Transformation which injects data invariants into the bytecode.
+//!
+//! This transformation adds the data invariant to all occurrences of the `WellFormed(x)` call
+//! which has been introduced by the spec instrumenter, by essentially transforming `WellFormed(x)`
+//! into `WellFormed(x) && <data invariant>(x)`. The `WellFormed` expressions are maintained in the
+//! output for processing by the backend, in case type assumptions needed to be added by the backend
+//! (which depends on the compilation scheme). It also handles PackRef/PackRefDeep
+//! instructions introduced by memory instrumentation, as well as the Pack instructions.
+
+use move_model::{
+    ast,
+    ast::{ConditionKind, Exp, ExpData, QuantKind, TempIndex},
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, Loc, NodeId, StructEnv},
+    pragmas::{INTRINSIC_FUN_MAP_SPEC_GET, INTRINSIC_TYPE_MAP},
+    ty::Type,
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, Operation, PropKind},
+};
+
+const INVARIANT_FAILS_MESSAGE: &str = "data invariant does not hold";
+
+pub struct DataInvariantInstrumentationProcessor {}
+
+impl DataInvariantInstrumentationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for DataInvariantInstrumentationProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            // Nothing to do.
+            return data;
+        }
+        let options = ProverOptions::get(fun_env.module_env.env);
+        Instrumenter::run(&options, targets, fun_env, data)
+    }
+
+    fn name(&self) -> String {
+        "data_invariant_instrumenter".to_string()
+    }
+}
+
+struct Instrumenter<'a> {
+    _options: &'a ProverOptions,
+    _targets: &'a mut FunctionTargetsHolder,
+    builder: FunctionDataBuilder<'a>,
+    for_verification: bool,
+}
+
+impl<'a> Instrumenter<'a> {
+    fn run(
+        options: &'a ProverOptions,
+        targets: &'a mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv<'a>,
+        data: FunctionData,
+    ) -> FunctionData {
+        // Function is instrumented for verification if this is the verification variant,
+        // or if it is function with a friend which is verified in the friends context.
+        let for_verification = data.variant.is_verified() || fun_env.has_friend();
+        let builder = FunctionDataBuilder::new(fun_env, data);
+        let mut instrumenter = Instrumenter {
+            _options: options,
+            _targets: targets,
+            builder,
+            for_verification,
+        };
+        instrumenter.instrument();
+        instrumenter.builder.data
+    }
+
+    fn instrument(&mut self) {
+        // Extract and clear current code
+        let old_code = std::mem::take(&mut self.builder.data.code);
+
+        // Instrument and generate new code
+        for bc in old_code {
+            self.instrument_bytecode(bc.clone());
+        }
+    }
+
+    fn instrument_bytecode(&mut self, bc: Bytecode) {
+        use Bytecode::*;
+        use Operation::*;
+        match bc {
+            // Remove Unpack, we currently don't need it.
+            Call(_, _, UnpackRef, ..) | Call(_, _, UnpackRefDeep, ..) => {}
+
+            // Instructions which lead to asserting data invariants.
+            Call(id, dests, Pack(mid, sid, targs), srcs, aa) if self.for_verification => {
+                let struct_temp = dests[0];
+                self.builder
+                    .emit(Call(id, dests, Pack(mid, sid, targs), srcs, aa));
+                // Emit a shallow assert of the data invariant.
+                self.emit_data_invariant_for_temp(false, PropKind::Assert, struct_temp);
+            }
+            Call(_, _, PackRef, srcs, _) if self.for_verification => {
+                // Emit a shallow assert of the data invariant.
+                self.emit_data_invariant_for_temp(false, PropKind::Assert, srcs[0]);
+            }
+            Call(_, _, PackRefDeep, srcs, _) if self.for_verification => {
+                // Emit a deep assert of the data invariant.
+                self.emit_data_invariant_for_temp(true, PropKind::Assert, srcs[0]);
+            }
+
+            // Augment WellFormed calls in assumptions. Currently those cannot appear in assertions.
+            // We leave the old WellFormed check for the backend to process any type related
+            // assumptions.
+            Prop(id, PropKind::Assume, exp) => {
+                let mut rewriter = |e: Exp| {
+                    if let ExpData::Call(_, ast::Operation::WellFormed, args) = e.as_ref() {
+                        let inv = self.builder.mk_join_bool(
+                            ast::Operation::And,
+                            self.translate_invariant(true, args[0].clone())
+                                .into_iter()
+                                .map(|(_, e)| e),
+                        );
+                        let e = self
+                            .builder
+                            .mk_join_opt_bool(ast::Operation::And, Some(e), inv)
+                            .unwrap();
+                        Ok(e)
+                    } else {
+                        Err(e)
+                    }
+                };
+                let exp = ExpData::rewrite(exp, &mut rewriter);
+                self.builder.emit(Prop(id, PropKind::Assume, exp));
+            }
+            _ => self.builder.emit(bc),
+        }
+    }
+
+    /// Emits a data invariant, shallow or deep, assume or assert, for the value in temporary.
+    fn emit_data_invariant_for_temp(&mut self, deep: bool, kind: PropKind, temp: TempIndex) {
+        let temp_exp = self.builder.mk_temporary(temp);
+        for (loc, inv) in self.translate_invariant(deep, temp_exp) {
+            self.builder.set_next_debug_comment(format!(
+                "data invariant {}",
+                loc.display(self.builder.global_env())
+            ));
+            if kind == PropKind::Assert {
+                self.builder
+                    .set_loc_and_vc_info(loc, INVARIANT_FAILS_MESSAGE);
+            }
+            self.builder.emit_with(|id| Bytecode::Prop(id, kind, inv));
+        }
+    }
+
+    fn translate_invariant(&self, deep: bool, value: Exp) -> Vec<(Loc, Exp)> {
+        let env = self.builder.global_env();
+        let ty = env.get_node_type(value.node_id());
+        match ty.skip_reference() {
+            Type::Struct(mid, sid, targs) => {
+                let struct_env = env.get_module(*mid).into_struct(*sid);
+                if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                    let decl = env
+                        .intrinsics
+                        .get_decl_for_struct(&mid.qualified(*sid))
+                        .expect("intrinsic declaration");
+                    let spec_fun_get = decl
+                        .lookup_spec_fun(env, INTRINSIC_FUN_MAP_SPEC_GET)
+                        .expect("intrinsic map_get function");
+
+                    // When dealing with a map, we cannot maintain individual locations for
+                    // invariants. Instead we choose just one as a representative.
+                    // TODO(refactoring): we should use the spec block position instead.
+                    let mut loc = env.unknown_loc();
+                    let quant = self.builder.mk_map_quant_opt(
+                        QuantKind::Forall,
+                        value,
+                        spec_fun_get,
+                        &targs[0],
+                        &targs[1],
+                        &mut |e| {
+                            let invs = self.translate_invariant(deep, e);
+                            if !invs.is_empty() {
+                                loc = invs[0].0.clone();
+                            }
+                            self.builder
+                                .mk_join_bool(ast::Operation::And, invs.into_iter().map(|(_, e)| e))
+                        },
+                    );
+                    if let Some(e) = quant {
+                        vec![(loc, e)]
+                    } else {
+                        vec![]
+                    }
+                } else {
+                    self.translate_invariant_for_struct(deep, value, struct_env, targs)
+                }
+            }
+            Type::Vector(ety) => {
+                // When dealing with a vector, we cannot maintain individual locations for
+                // invariants. Instead we choose just one as a representative.
+                // TODO(refactoring): we should use the spec block position instead.
+                let mut loc = env.unknown_loc();
+                let quant =
+                    self.builder
+                        .mk_vector_quant_opt(QuantKind::Forall, value, ety, &mut |elem| {
+                            let invs = self.translate_invariant(deep, elem);
+                            if !invs.is_empty() {
+                                loc = invs[0].0.clone();
+                            }
+                            self.builder
+                                .mk_join_bool(ast::Operation::And, invs.into_iter().map(|(_, e)| e))
+                        });
+                if let Some(e) = quant {
+                    vec![(loc, e)]
+                } else {
+                    vec![]
+                }
+            }
+            _ => vec![],
+        }
+    }
+
+    fn translate_invariant_for_struct(
+        &self,
+        deep: bool,
+        value: Exp,
+        struct_env: StructEnv<'_>,
+        targs: &[Type],
+    ) -> Vec<(Loc, Exp)> {
+        use ast::Operation::*;
+        use ExpData::*;
+
+        // First generate a conjunction for all invariants on this struct.
+        let mut result = vec![];
+        for cond in struct_env
+            .get_spec()
+            .filter_kind(ConditionKind::StructInvariant)
+        {
+            // Rewrite the invariant expression, inserting `value` for the struct target.
+            // By convention, selection from the target is represented as a `Select` operation with
+            // an empty argument list. It is guaranteed that this uniquely identifies the
+            // target, as any other `Select` will have exactly one argument.
+            let exp_rewriter = &mut |e: Exp| match e.as_ref() {
+                Call(id, oper @ Select(..), args) if args.is_empty() => {
+                    Ok(Call(*id, oper.to_owned(), vec![value.clone()]).into_exp())
+                }
+                _ => Err(e),
+            };
+            // Also instantiate types.
+            let env = self.builder.global_env();
+            let node_rewriter = &mut |id: NodeId| ExpData::instantiate_node(env, id, targs);
+
+            let exp =
+                ExpData::rewrite_exp_and_node_id(cond.exp.clone(), exp_rewriter, node_rewriter);
+            result.push((cond.loc.clone(), exp));
+        }
+
+        // If this is deep, recurse over all fields.
+        if deep {
+            for field_env in struct_env.get_fields() {
+                let field_exp = self
+                    .builder
+                    .mk_field_select(&field_env, targs, value.clone());
+                result.extend(self.translate_invariant(deep, field_exp));
+            }
+        }
+
+        result
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/dataflow_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/dataflow_analysis.rs
new file mode 100644
index 000000000..aec7b1e5a
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/dataflow_analysis.rs
@@ -0,0 +1,154 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Adapted from AbstractInterpreter for Bytecode, this module defines the data-flow analysis
+//! framework for stackless bytecode.
+
+use crate::{
+    dataflow_domains::{AbstractDomain, JoinResult},
+    stackless_bytecode::Bytecode,
+    stackless_control_flow_graph::{BlockId, StacklessControlFlowGraph},
+};
+use move_binary_format::file_format::CodeOffset;
+use std::{
+    collections::{BTreeMap, VecDeque},
+    fmt::Debug,
+};
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub struct BlockState<State: Clone> {
+    pub pre: State,
+    pub post: State,
+}
+
+pub type StateMap<State> = BTreeMap<BlockId, BlockState<State>>;
+
+/// Take a pre-state + instruction and mutate it to produce a post-state。
+pub trait TransferFunctions {
+    type State: AbstractDomain + Clone;
+    const BACKWARD: bool;
+
+    fn execute_block(
+        &self,
+        block_id: BlockId,
+        mut state: Self::State,
+        instrs: &[Bytecode],
+        cfg: &StacklessControlFlowGraph,
+    ) -> Self::State {
+        if cfg.is_dummmy(block_id) {
+            return state;
+        }
+        let instr_inds = cfg.instr_indexes(block_id).unwrap();
+        if Self::BACKWARD {
+            for offset in instr_inds.rev() {
+                let instr = &instrs[offset as usize];
+                self.execute(&mut state, instr, offset);
+            }
+        } else {
+            for offset in instr_inds {
+                let instr = &instrs[offset as usize];
+                self.execute(&mut state, instr, offset);
+            }
+        }
+        state
+    }
+
+    fn execute(&self, state: &mut Self::State, instr: &Bytecode, offset: CodeOffset);
+}
+
+pub trait DataflowAnalysis: TransferFunctions {
+    fn analyze_function(
+        &self,
+        initial_state: Self::State,
+        instrs: &[Bytecode],
+        cfg: &StacklessControlFlowGraph,
+    ) -> StateMap<Self::State> {
+        let mut state_map: StateMap<Self::State> = StateMap::new();
+        let mut work_list = VecDeque::new();
+        work_list.push_back(cfg.entry_block());
+        state_map.insert(
+            cfg.entry_block(),
+            BlockState {
+                pre: initial_state.clone(),
+                post: initial_state.clone(),
+            },
+        );
+        while let Some(block_id) = work_list.pop_front() {
+            let pre = state_map.get(&block_id).expect("basic block").pre.clone();
+            let post = self.execute_block(block_id, pre, instrs, cfg);
+
+            // propagate postcondition of this block to successor blocks
+            for next_block_id in cfg.successors(block_id) {
+                match state_map.get_mut(next_block_id) {
+                    Some(next_block_res) => {
+                        let join_result = next_block_res.pre.join(&post);
+                        match join_result {
+                            JoinResult::Unchanged => {
+                                // Pre is the same after join. Reanalyzing this block would produce
+                                // the same post. Don't schedule it.
+                                continue;
+                            }
+                            JoinResult::Changed => {
+                                // The pre changed. Schedule the next block.
+                                work_list.push_back(*next_block_id);
+                            }
+                        }
+                    }
+                    None => {
+                        // Haven't visited the next block yet. Use the post of the current block as
+                        // its pre and schedule it.
+                        state_map.insert(
+                            *next_block_id,
+                            BlockState {
+                                pre: post.clone(),
+                                post: initial_state.clone(),
+                            },
+                        );
+                        work_list.push_back(*next_block_id);
+                    }
+                }
+            }
+            state_map.get_mut(&block_id).expect("basic block").post = post;
+        }
+        state_map
+    }
+
+    /// Takes the StateMap resulting from `analyze_function` and converts it into a map
+    /// from each code offset into a derived state `A`. This re-executes the analysis for
+    /// each instruction within a basic block to reconstruct the intermediate results
+    /// from block begin to block end. The function `f` gets passed the before/after state
+    /// of the instruction at a code offset. Returns a map from code offset to `A`.
+    fn state_per_instruction<A, F>(
+        &self,
+        state_map: StateMap<Self::State>,
+        instrs: &[Bytecode],
+        cfg: &StacklessControlFlowGraph,
+        mut f: F,
+    ) -> BTreeMap<CodeOffset, A>
+    where
+        F: FnMut(&Self::State, &Self::State) -> A,
+    {
+        let mut result = BTreeMap::new();
+        for (block_id, block_state) in state_map {
+            let mut state = block_state.pre;
+            if !cfg.is_dummmy(block_id) {
+                let instr_inds = cfg.instr_indexes(block_id).unwrap();
+                if Self::BACKWARD {
+                    for offset in instr_inds.rev() {
+                        let after = state.clone();
+                        self.execute(&mut state, &instrs[offset as usize], offset);
+                        result.insert(offset, f(&state, &after));
+                    }
+                } else {
+                    for offset in instr_inds {
+                        let before = state.clone();
+                        self.execute(&mut state, &instrs[offset as usize], offset);
+                        result.insert(offset, f(&before, &state));
+                    }
+                }
+            }
+        }
+        result
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/dataflow_domains.rs b/vendors/move/crates/move-stackless-bytecode/src/dataflow_domains.rs
new file mode 100644
index 000000000..337c272ac
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/dataflow_domains.rs
@@ -0,0 +1,287 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines traits and representations of domains used in dataflow analysis.
+
+use im::{ordmap, ordset, OrdMap, OrdSet};
+use itertools::Itertools;
+use std::{
+    borrow::Borrow,
+    collections::{BTreeMap, BTreeSet},
+    fmt::Debug,
+    ops::{Deref, DerefMut},
+};
+
+// ================================================================================================
+// Abstract Domains
+
+/// Represents the abstract outcome of a join.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum JoinResult {
+    /// The left operand subsumes the right operand: L union R == L.
+    Unchanged,
+    /// The left operand does not subsume the right one and was changed as part of the join.
+    Changed,
+}
+
+impl JoinResult {
+    /// Build the least upper bound of two join results, where `Unchanged` is bottom element of the
+    /// semilattice.
+    pub fn combine(self, other: JoinResult) -> JoinResult {
+        use JoinResult::*;
+        match (self, other) {
+            (Unchanged, Unchanged) => Unchanged,
+            _ => Changed,
+        }
+    }
+}
+
+/// A trait to be implemented by domains which support a join.
+pub trait AbstractDomain {
+    // TODO: would be cool to add a derive(Join) macro for this
+    fn join(&mut self, other: &Self) -> JoinResult;
+}
+
+// ================================================================================================
+// Predefined Domain Types
+
+// As the underlying implementation of the below types we use the collections from the `im`(mutable)
+// crate (`im::OrdSet` and `im::OrdMap`), a representation which supports structure sharing.
+// This is important because in data flow analysis we often refine a set or map
+// value in each step of the analysis, e.g. adding a single element to a larger collection, while
+// the original collection still need to be available at the previous program point.
+
+// ------------------------------------------------------------------------------------------------
+// Set Type
+
+/// Implements a set domain.
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct SetDomain<E: Ord + Clone>(OrdSet<E>);
+
+impl<E: Ord + Clone> Default for SetDomain<E> {
+    fn default() -> Self {
+        Self(OrdSet::default())
+    }
+}
+
+impl<E: Ord + Clone> From<OrdSet<E>> for SetDomain<E> {
+    fn from(ord_set: OrdSet<E>) -> Self {
+        Self(ord_set)
+    }
+}
+
+impl<E: Ord + Clone> AsRef<OrdSet<E>> for SetDomain<E> {
+    fn as_ref(&self) -> &OrdSet<E> {
+        &self.0
+    }
+}
+
+impl<E: Ord + Clone> Borrow<OrdSet<E>> for SetDomain<E> {
+    fn borrow(&self) -> &OrdSet<E> {
+        self.as_ref()
+    }
+}
+
+impl<E: Ord + Clone> Deref for SetDomain<E> {
+    type Target = OrdSet<E>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<E: Ord + Clone> DerefMut for SetDomain<E> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<E: Ord + Clone + Debug> Debug for SetDomain<E> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self.0)
+    }
+}
+
+impl<E: Ord + Clone> std::iter::FromIterator<E> for SetDomain<E> {
+    fn from_iter<I: IntoIterator<Item = E>>(iter: I) -> Self {
+        let mut s = SetDomain::default();
+        for e in iter {
+            s.insert(e);
+        }
+        s
+    }
+}
+
+impl<E: Ord + Clone> std::iter::IntoIterator for SetDomain<E> {
+    type Item = E;
+    type IntoIter = im::ordset::ConsumingIter<E>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<E: Ord + Clone> AbstractDomain for SetDomain<E> {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut change = JoinResult::Unchanged;
+        for e in other.iter() {
+            if self.insert(e.clone()).is_none() {
+                change = JoinResult::Changed;
+            }
+        }
+        change
+    }
+}
+
+impl<E: Ord + Clone> From<BTreeSet<E>> for SetDomain<E> {
+    fn from(s: BTreeSet<E>) -> Self {
+        s.into_iter().collect()
+    }
+}
+
+impl<E: Ord + Clone> SetDomain<E> {
+    pub fn singleton(e: E) -> Self {
+        ordset!(e).into()
+    }
+
+    /// Implements set difference, which is not following standard APIs for rust sets in OrdSet
+    pub fn difference<'a>(&'a self, other: &'a Self) -> impl Iterator<Item = &'a E> {
+        self.iter().filter(move |e| !other.contains(e))
+    }
+
+    /// Implements is_disjoint which is not available in OrdSet
+    pub fn is_disjoint(&self, other: &Self) -> bool {
+        self.iter().all(move |e| !other.contains(e))
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Map Type
+
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct MapDomain<K: Ord, V: AbstractDomain>(OrdMap<K, V>);
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> Default for MapDomain<K, V> {
+    fn default() -> Self {
+        Self(OrdMap::default())
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> From<OrdMap<K, V>> for MapDomain<K, V> {
+    fn from(ord_map: OrdMap<K, V>) -> Self {
+        Self(ord_map)
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> AsRef<OrdMap<K, V>> for MapDomain<K, V> {
+    fn as_ref(&self) -> &OrdMap<K, V> {
+        &self.0
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> Borrow<OrdMap<K, V>> for MapDomain<K, V> {
+    fn borrow(&self) -> &OrdMap<K, V> {
+        self.as_ref()
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> Deref for MapDomain<K, V> {
+    type Target = OrdMap<K, V>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> DerefMut for MapDomain<K, V> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<K: Ord + Clone + Debug, V: AbstractDomain + Clone + Debug> Debug for MapDomain<K, V> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self.0)
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> std::iter::FromIterator<(K, V)>
+    for MapDomain<K, V>
+{
+    fn from_iter<I: IntoIterator<Item = (K, V)>>(iter: I) -> Self {
+        let mut s = MapDomain::default();
+        for (k, v) in iter {
+            s.insert(k, v);
+        }
+        s
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> std::iter::IntoIterator for MapDomain<K, V> {
+    type Item = (K, V);
+    type IntoIter = im::ordmap::ConsumingIter<(K, V)>;
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> AbstractDomain for MapDomain<K, V> {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut change = JoinResult::Unchanged;
+        for (k, v) in other.iter() {
+            change = change.combine(self.insert_join(k.clone(), v.clone()));
+        }
+        change
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> From<BTreeMap<K, V>> for MapDomain<K, V> {
+    fn from(m: BTreeMap<K, V>) -> Self {
+        m.into_iter().collect()
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone> MapDomain<K, V> {
+    /// Construct a singleton map.
+    pub fn singleton(k: K, v: V) -> MapDomain<K, V> {
+        (ordmap! {k => v}).into()
+    }
+
+    /// Join `v` with self[k] if `k` is bound, insert `v` otherwise
+    pub fn insert_join(&mut self, k: K, v: V) -> JoinResult {
+        let mut change = JoinResult::Unchanged;
+        self.0
+            .entry(k)
+            .and_modify(|old_v| {
+                change = old_v.join(&v);
+            })
+            .or_insert_with(|| {
+                change = JoinResult::Changed;
+                v
+            });
+        change
+    }
+}
+
+impl<K: Ord + Clone, V: AbstractDomain + Clone + PartialEq> MapDomain<K, V> {
+    /// Updates the values in the range of the map using the given function. Notice
+    /// that with other kind of map representations we would use `iter_mut` for this,
+    /// but this is not available in OrdMap for obvious reasons (because entries are shared),
+    /// so we need to use this pattern here instead.
+    pub fn update_values(&mut self, mut f: impl FnMut(&mut V)) {
+        // Commpute the key-values which actually changed. If the change is small, we preserve
+        // structure sharing.
+        let new_values = self
+            .iter()
+            .filter_map(|(k, v)| {
+                let mut v_new = v.clone();
+                f(&mut v_new);
+                if v != &v_new {
+                    Some((k.clone(), v_new))
+                } else {
+                    None
+                }
+            })
+            .collect_vec();
+        self.extend(new_values);
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/debug_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/debug_instrumentation.rs
new file mode 100644
index 000000000..54afa69fc
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/debug_instrumentation.rs
@@ -0,0 +1,114 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Transformation which injects trace instructions which are used to visualize execution.
+//!
+//! This transformation should run before copy propagation and any other bytecode modifications.
+//! It emits instructions of the form `trace_local[original_idx](idx)`. Initially
+//! `original_idx == idx`, where the temp `idx` is a named variable from the Move
+//! compiler. Later transformations may replace `idx` but `original_idx` will be preserved so
+//! the user sees the value of their named variable.
+
+use std::collections::BTreeSet;
+
+use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{Bytecode, Operation},
+};
+
+pub struct DebugInstrumenter {}
+
+impl DebugInstrumenter {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for DebugInstrumenter {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        use Bytecode::*;
+
+        if fun_env.is_native() {
+            // Nothing to do
+            return data;
+        }
+
+        let mut builder = FunctionDataBuilder::new(fun_env, data);
+        let code = std::mem::take(&mut builder.data.code);
+
+        // Emit trace instructions for parameters at entry.
+        builder.set_loc(builder.fun_env.get_loc().at_start());
+        for i in 0..builder.fun_env.get_parameter_count() {
+            builder.emit_with(|id| Call(id, vec![], Operation::TraceLocal(i), vec![i], None));
+        }
+
+        for bc in code {
+            match &bc {
+                Ret(id, locals) => {
+                    // Emit trace instructions for return values.
+                    builder.set_loc_from_attr(*id);
+                    for (i, l) in locals.iter().enumerate() {
+                        builder.emit_with(|id| {
+                            Call(id, vec![], Operation::TraceReturn(i), vec![*l], None)
+                        });
+                    }
+                    builder.emit(bc);
+                }
+                Abort(id, l) => {
+                    builder.set_loc_from_attr(*id);
+                    builder.emit_with(|id| Call(id, vec![], Operation::TraceAbort, vec![*l], None));
+                    builder.emit(bc);
+                }
+                Call(_, _, Operation::WriteRef, srcs, _) if srcs[0] < fun_env.get_local_count() => {
+                    builder.set_loc_from_attr(bc.get_attr_id());
+                    builder.emit(bc.clone());
+                    builder.emit_with(|id| {
+                        Call(
+                            id,
+                            vec![],
+                            Operation::TraceLocal(srcs[0]),
+                            vec![srcs[0]],
+                            None,
+                        )
+                    });
+                }
+                _ => {
+                    builder.set_loc_from_attr(bc.get_attr_id());
+                    builder.emit(bc.clone());
+                    // Emit trace instructions for modified values.
+                    let (val_targets, mut_targets) = bc.modifies(&builder.get_target());
+                    let affected_variables: BTreeSet<_> = val_targets
+                        .into_iter()
+                        .chain(mut_targets.into_iter().map(|(idx, _)| idx))
+                        .collect();
+                    for idx in affected_variables {
+                        // Only emit this for user declared locals, not for ones introduced
+                        // by stack elimination.
+                        if !fun_env.is_temporary(idx) {
+                            builder.emit_with(|id| {
+                                Call(id, vec![], Operation::TraceLocal(idx), vec![idx], None)
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        builder.data
+    }
+
+    fn name(&self) -> String {
+        "debug_instrumenter".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/eliminate_imm_refs.rs b/vendors/move/crates/move-stackless-bytecode/src/eliminate_imm_refs.rs
new file mode 100644
index 000000000..aa670c0aa
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/eliminate_imm_refs.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{AssignKind, Bytecode, Operation},
+};
+
+pub struct EliminateImmRefsProcessor {}
+
+impl EliminateImmRefsProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(EliminateImmRefsProcessor {})
+    }
+}
+
+impl FunctionTargetProcessor for EliminateImmRefsProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let mut elim = EliminateImmRefs::new(FunctionDataBuilder::new(func_env, data));
+        elim.run();
+        elim.builder.data
+    }
+
+    fn name(&self) -> String {
+        "eliminate_imm_refs".to_string()
+    }
+}
+
+pub struct EliminateImmRefs<'a> {
+    builder: FunctionDataBuilder<'a>,
+}
+
+impl<'a> EliminateImmRefs<'a> {
+    fn new(builder: FunctionDataBuilder<'a>) -> Self {
+        Self { builder }
+    }
+
+    fn run(&mut self) {
+        for bc in std::mem::take(&mut self.builder.data.code) {
+            self.transform_bytecode(bc);
+        }
+        self.builder.data.local_types = std::mem::take(&mut self.builder.data.local_types)
+            .into_iter()
+            .map(|ty| self.transform_type(ty))
+            .collect();
+        self.builder.data.return_types = std::mem::take(&mut self.builder.data.return_types)
+            .into_iter()
+            .map(|ty| self.transform_type(ty))
+            .collect();
+    }
+
+    fn transform_type(&self, ty: Type) -> Type {
+        if let Type::Reference(false, y) = ty {
+            *y
+        } else {
+            ty
+        }
+    }
+
+    fn is_imm_ref(&self, idx: TempIndex) -> bool {
+        self.builder
+            .get_target()
+            .get_local_type(idx)
+            .is_immutable_reference()
+    }
+
+    fn transform_bytecode(&mut self, bytecode: Bytecode) {
+        use Bytecode::*;
+        use Operation::*;
+        match bytecode {
+            Call(attr_id, dests, op, srcs, aa) => match op {
+                ReadRef if self.is_imm_ref(srcs[0]) => {
+                    self.builder
+                        .emit(Assign(attr_id, dests[0], srcs[0], AssignKind::Move));
+                }
+                FreezeRef => self.builder.emit(Call(attr_id, dests, ReadRef, srcs, None)),
+                BorrowLoc if self.is_imm_ref(dests[0]) => {
+                    self.builder
+                        .emit(Assign(attr_id, dests[0], srcs[0], AssignKind::Copy));
+                }
+                BorrowField(mid, sid, type_actuals, offset) if self.is_imm_ref(dests[0]) => {
+                    self.builder.emit(Call(
+                        attr_id,
+                        dests,
+                        GetField(mid, sid, type_actuals, offset),
+                        srcs,
+                        aa,
+                    ));
+                }
+                BorrowGlobal(mid, sid, type_actuals) if self.is_imm_ref(dests[0]) => {
+                    self.builder.emit(Call(
+                        attr_id,
+                        dests,
+                        GetGlobal(mid, sid, type_actuals),
+                        srcs,
+                        aa,
+                    ));
+                }
+                Destroy if self.is_imm_ref(srcs[0]) => {
+                    // skip the destroy on an immutable ref
+                }
+                _ => self.builder.emit(Call(attr_id, dests, op, srcs, aa)),
+            },
+            _ => self.builder.emit(bytecode),
+        };
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/escape_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/escape_analysis.rs
new file mode 100644
index 000000000..4f86a5938
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/escape_analysis.rs
@@ -0,0 +1,412 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This escape analysis flags procedures that return a reference pointing inside of a struct type
+//! declared in the current module.
+
+use std::{
+    cell::RefCell,
+    cmp::Ordering,
+    collections::{BTreeMap, BTreeSet, HashSet},
+};
+
+use codespan::FileId;
+use codespan_reporting::diagnostic::{Diagnostic, Label, Severity};
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{Operation as ASTOperation, TempIndex},
+    model::{FieldId, FunctionEnv, ModuleId, QualifiedId, StructId},
+};
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, MapDomain},
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+// =================================================================================================
+// Data Model
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub enum AbsValue {
+    NonRef,
+    OkRef,
+    InternalRef,
+}
+
+impl AbsValue {
+    pub fn is_internal_ref(&self) -> bool {
+        matches!(self, Self::InternalRef)
+    }
+}
+
+type EscapeAnalysisState = MapDomain<TempIndex, AbsValue>;
+
+impl EscapeAnalysisState {
+    fn get_local_index(&self, i: &TempIndex) -> &AbsValue {
+        self.get(i)
+            .unwrap_or_else(|| panic!("Unbound local index {} in state {:?}", i, self))
+    }
+
+    fn assign(&mut self, lhs: TempIndex, rhs: &TempIndex) {
+        let rhs_value = *self.get_local_index(rhs);
+        self.insert(lhs, rhs_value);
+    }
+
+    pub fn call(&mut self, rets: &[TempIndex], args: &[TempIndex], call_env: &FunctionEnv) {
+        let has_internal_ref_input = args
+            .iter()
+            .any(|arg_index| self.get(arg_index).unwrap().is_internal_ref());
+        for (ret_index, ret_type) in call_env.get_return_types().iter().enumerate() {
+            let ret_value = if ret_type.is_reference() {
+                if has_internal_ref_input {
+                    AbsValue::InternalRef
+                } else {
+                    AbsValue::OkRef
+                }
+            } else {
+                AbsValue::NonRef
+            };
+            self.insert(rets[ret_index], ret_value);
+        }
+    }
+}
+
+// =================================================================================================
+// Joins
+
+impl PartialOrd for AbsValue {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self == other {
+            return Some(Ordering::Equal);
+        }
+        match (self, other) {
+            (_, AbsValue::InternalRef) => Some(Ordering::Less),
+            _ => None,
+        }
+    }
+}
+
+impl AbstractDomain for AbsValue {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        if self == other {
+            return JoinResult::Unchanged;
+        }
+        // unequal; use top value
+        *self = AbsValue::InternalRef;
+        JoinResult::Changed
+    }
+}
+
+// =================================================================================================
+// Transfer functions
+
+#[derive(PartialOrd, PartialEq, Eq, Ord)]
+struct WarningId {
+    ret_index: usize,
+    offset: CodeOffset,
+}
+
+struct SpecMemoryInfo {
+    /// Fields that occur in struct, module, or global specs. Leaked references to fields inside
+    /// this set will be flagged, leaked references to other fields will be allowed.
+    relevant_fields: BTreeSet<(QualifiedId<StructId>, FieldId)>,
+    /// Structs that occur in struct, module, or global specs. Leaked references to fields inside
+    /// these structs may cause a spec like `invariant forall s: S: s == S { f: 10 }` to be false
+    relevant_structs: BTreeSet<QualifiedId<StructId>>,
+    /// Vector-related operations that occur in struct, module, or global specs. Leaked references
+    /// to vector contents will be allowed if this is empty
+    vector_operations: HashSet<ASTOperation>,
+}
+
+struct EscapeAnalysis<'a> {
+    func_env: &'a FunctionEnv<'a>,
+    /// Warnings about escaped references to surface to the programmer
+    // Uses a map instead of a vec to avoid reporting multiple warnings
+    // at program locations in a loop during fixpoint iteration
+    escape_warnings: RefCell<BTreeMap<WarningId, Diagnostic<FileId>>>,
+    /// Information about the memory touched by the specs of the declaring module for this function
+    /// If the function's declaring module has no specs, this will be None
+    spec_memory: Option<SpecMemoryInfo>,
+}
+
+impl EscapeAnalysis<'_> {
+    pub fn add_escaped_return_warning(&self, ret_index: usize, is_mut: bool, offset: CodeOffset) {
+        let message = format!(
+            "Leaked {} module-internal reference via return value {}",
+            if is_mut { "mutable" } else { "immutable" },
+            ret_index
+        );
+        let fun_loc = self.func_env.get_loc();
+        let label = Label::primary(fun_loc.file_id(), fun_loc.span());
+        let severity = if is_mut {
+            Severity::Error
+        } else {
+            Severity::Warning
+        };
+        let warning_id = WarningId { ret_index, offset };
+        self.escape_warnings.borrow_mut().insert(
+            warning_id,
+            Diagnostic::new(severity)
+                .with_message(message)
+                .with_labels(vec![label]),
+        );
+    }
+
+    /// Return true if `fld` is mentioned in a specification of the current module *or* if the
+    /// module has no specifications (i.e., we consider all fields to be relevant in that case)
+    pub fn specs_contain_field(&self, mid: &ModuleId, sid: &StructId, fld: &FieldId) -> bool {
+        if let Some(specs) = &self.spec_memory {
+            let qsid = mid.qualified(*sid);
+            specs.relevant_structs.contains(&qsid) || specs.relevant_fields.contains(&(qsid, *fld))
+        } else {
+            true
+        }
+    }
+
+    /// Return `true` if vector indexes are mentioned in a specification of the current module *or*
+    /// if the module has no specifications
+    pub fn specs_contain_vector_index(&self) -> bool {
+        use ASTOperation::*;
+        if let Some(specs) = &self.spec_memory {
+            for op in &specs.vector_operations {
+                match op {
+                    // TODO: not sure about SingleVec, IndexOf, ContainsVec, InRangeVec, RangeVec
+                    Index | Slice | UpdateVec | SingleVec | IndexOfVec | ContainsVec
+                    | InRangeVec | RangeVec => return true,
+                    _ => (),
+                }
+            }
+            false
+        } else {
+            true
+        }
+    }
+
+    /// Returns `true` if vector lengths are mentioned in a specification of the current module *or*
+    /// if the module has no specifications
+    pub fn specs_contain_vector_length(&self) -> bool {
+        use ASTOperation::*;
+        if let Some(specs) = &self.spec_memory {
+            for op in &specs.vector_operations {
+                match op {
+                    // TODO: does every indexing-related operation belong here?
+                    Len | SingleVec | EmptyVec => return true,
+                    _ => (),
+                }
+            }
+            false
+        } else {
+            true
+        }
+    }
+}
+
+impl<'a> TransferFunctions for EscapeAnalysis<'a> {
+    type State = EscapeAnalysisState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut Self::State, instr: &Bytecode, offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+
+        match instr {
+            Call(_, rets, oper, args, _) => match oper {
+                BorrowField(mid, sid, _type_params, offset) => {
+                    let struct_env = self.func_env.module_env.get_struct(*sid);
+                    let field_env = struct_env.get_field_by_offset(*offset);
+                    let field_id = field_env.get_id();
+
+                    let to_propagate = match state.get_local_index(&args[0]) {
+                        AbsValue::OkRef => {
+                            // TODO: or if the field is a vector and specs contain a length
+                            if self.specs_contain_field(mid, sid, &field_id)
+                                || (field_env.get_type().is_vector()
+                                    && self.specs_contain_vector_length())
+                            {
+                                AbsValue::InternalRef
+                            } else {
+                                AbsValue::OkRef
+                            }
+                        }
+                        AbsValue::InternalRef => AbsValue::InternalRef,
+                        AbsValue::NonRef => panic!("Invariant violation: expected reference"),
+                    };
+                    state.insert(rets[0], to_propagate);
+                }
+                BorrowGlobal(_mid, _sid, _types) => {
+                    state.insert(rets[0], AbsValue::InternalRef);
+                }
+                ReadRef | MoveFrom(..) | Exists(..) | Pack(..) | Eq | Neq | CastU8 | CastU64
+                | CastU128 | Not | Add | Sub | Mul | Div | Mod | BitOr | BitAnd | Xor | Shl
+                | Shr | Lt | Gt | Le | Ge | Or | And => {
+                    // These operations all produce a non-reference value
+                    state.insert(rets[0], AbsValue::NonRef);
+                }
+                BorrowLoc => {
+                    state.insert(rets[0], AbsValue::OkRef);
+                }
+                Function(mid, fid, _) => {
+                    let callee_fun_env = self
+                        .func_env
+                        .module_env
+                        .env
+                        .get_function(mid.qualified(*fid));
+                    if callee_fun_env.is_native() {
+                        // check if this is a modeled native
+                        match (
+                            callee_fun_env.module_env.get_identifier().as_str(),
+                            callee_fun_env.get_identifier().as_str(),
+                        ) {
+                            ("vector", "borrow_mut") | ("vector", "borrow") => {
+                                let vec_arg = 0;
+                                let to_propagate = match state.get_local_index(&args[vec_arg]) {
+                                    AbsValue::OkRef => {
+                                        if self.specs_contain_vector_index() {
+                                            AbsValue::InternalRef
+                                        } else {
+                                            AbsValue::OkRef
+                                        }
+                                    }
+                                    AbsValue::InternalRef => AbsValue::InternalRef,
+                                    AbsValue::NonRef => {
+                                        panic!("Invariant violation: expected reference")
+                                    }
+                                };
+                                state.insert(rets[0], to_propagate);
+                            }
+                            _ => {
+                                // unmodeled native, treat the same as ordinary call
+                                state.call(rets, args, &callee_fun_env)
+                            }
+                        }
+                    } else {
+                        state.call(rets, args, &callee_fun_env)
+                    }
+                }
+                Unpack(..) => {
+                    for ret_index in rets {
+                        state.insert(*ret_index, AbsValue::NonRef);
+                    }
+                }
+                FreezeRef => state.assign(rets[0], &args[0]),
+                WriteRef | MoveTo(..) => {
+                    // these operations do not assign any locals
+                }
+                Uninit => {
+                    // this operation is just a marker and does not assign any locals
+                }
+                Destroy => {
+                    state.remove(&args[0]);
+                }
+                oper => panic!("unsupported oper {:?}", oper),
+            },
+            Load(_, lhs, _) => {
+                state.insert(*lhs, AbsValue::NonRef);
+            }
+            Assign(_, lhs, rhs, _) => state.assign(*lhs, rhs),
+            Ret(_, rets) => {
+                let ret_types = self.func_env.get_return_types();
+                for (ret_index, ret) in rets.iter().enumerate() {
+                    if state.get_local_index(ret).is_internal_ref() {
+                        self.add_escaped_return_warning(
+                            ret_index,
+                            ret_types[ret_index].is_mutable_reference(),
+                            offset,
+                        );
+                    }
+                }
+            }
+            Abort(..) | SaveMem(..) | Prop(..) | SaveSpecVar(..) | Branch(..) | Jump(..)
+            | Label(..) | Nop(..) => {
+                // these operations do not assign any locals
+            }
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for EscapeAnalysis<'a> {}
+pub struct EscapeAnalysisProcessor();
+impl EscapeAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(EscapeAnalysisProcessor())
+    }
+}
+
+impl FunctionTargetProcessor for EscapeAnalysisProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() {
+            return data;
+        }
+        let mut initial_state = EscapeAnalysisState::default();
+        // initialize_formals
+        for (param_index, param_type) in func_env.get_parameter_types().iter().enumerate() {
+            let param_val = if param_type.is_reference() {
+                AbsValue::OkRef
+            } else {
+                AbsValue::NonRef
+            };
+            initial_state.insert(param_index, param_val);
+        }
+
+        // compute set of fields and vector ops used in all struct specs
+        // Note: global and module specs are not relevant here because
+        // it is not possible to leak a reference to a global outside of
+        // the module that declares it.
+        let mut has_specs = false;
+        let menv = &func_env.module_env;
+        let mut relevant_fields = BTreeSet::new();
+        let mut relevant_structs = BTreeSet::new();
+        let mut vector_operations = HashSet::new();
+        for struct_env in menv.get_structs() {
+            let struct_spec = struct_env.get_spec();
+            if !struct_spec.conditions.is_empty() {
+                relevant_structs.insert(struct_env.get_qualified_id());
+            }
+            for condition in &struct_spec.conditions {
+                for exp in condition.all_exps() {
+                    exp.field_usage(&mut relevant_fields);
+                    exp.struct_usage(&mut relevant_structs);
+                    exp.vector_usage(&mut vector_operations);
+                    has_specs = true
+                }
+            }
+        }
+
+        let cfg = StacklessControlFlowGraph::new_forward(&data.code);
+        let analysis = EscapeAnalysis {
+            func_env,
+            escape_warnings: RefCell::new(BTreeMap::new()),
+            spec_memory: if has_specs {
+                Some(SpecMemoryInfo {
+                    relevant_fields,
+                    relevant_structs,
+                    vector_operations,
+                })
+            } else {
+                None
+            },
+        };
+        analysis.analyze_function(initial_state, &data.code, &cfg);
+        let env = func_env.module_env.env;
+        for (_, warning) in analysis.escape_warnings.into_inner() {
+            env.add_diag(warning)
+        }
+        data
+    }
+
+    fn name(&self) -> String {
+        "escape_analysis".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/function_data_builder.rs b/vendors/move/crates/move-stackless-bytecode/src/function_data_builder.rs
new file mode 100644
index 000000000..69f1c4a13
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/function_data_builder.rs
@@ -0,0 +1,242 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Provides a builder for `FunctionData`, including building expressions and rewriting
+//! bytecode.
+
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    stackless_bytecode::{AttrId, Bytecode, HavocKind, Label, Operation, PropKind},
+};
+use move_model::{
+    ast::{Exp, TempIndex},
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, Loc},
+    ty::Type,
+};
+
+#[derive(Default)]
+pub struct FunctionDataBuilderOptions {
+    pub no_fallthrough_jump_removal: bool,
+}
+
+/// A builder for `FunctionData`.
+pub struct FunctionDataBuilder<'env> {
+    pub fun_env: &'env FunctionEnv<'env>,
+    pub data: FunctionData,
+    pub options: FunctionDataBuilderOptions,
+    next_free_attr_index: usize,
+    next_free_label_index: usize,
+    current_loc: Loc,
+    next_vc_info: Option<String>,
+    next_debug_comment: Option<String>,
+}
+
+impl<'env> ExpGenerator<'env> for FunctionDataBuilder<'env> {
+    fn function_env(&self) -> &FunctionEnv<'env> {
+        self.fun_env
+    }
+
+    fn get_current_loc(&self) -> Loc {
+        self.current_loc.clone()
+    }
+
+    fn set_loc(&mut self, loc: Loc) {
+        self.current_loc = loc;
+    }
+
+    fn add_local(&mut self, ty: Type) -> TempIndex {
+        let idx = self.data.local_types.len();
+        self.data.local_types.push(ty);
+        idx
+    }
+
+    fn get_local_type(&self, temp: TempIndex) -> Type {
+        self.data
+            .local_types
+            .get(temp)
+            .expect("local variable")
+            .clone()
+    }
+}
+
+impl<'env> FunctionDataBuilder<'env> {
+    /// Creates a new builder with customized options
+    pub fn new_with_options(
+        fun_env: &'env FunctionEnv<'env>,
+        data: FunctionData,
+        options: FunctionDataBuilderOptions,
+    ) -> Self {
+        let next_free_attr_index = data.next_free_attr_index();
+        let next_free_label_index = data.next_free_label_index();
+        FunctionDataBuilder {
+            fun_env,
+            data,
+            options,
+            next_free_attr_index,
+            next_free_label_index,
+            current_loc: fun_env.get_loc(),
+            next_vc_info: None,
+            next_debug_comment: None,
+        }
+    }
+
+    /// Creates a new builder with options set to default values
+    pub fn new(fun_env: &'env FunctionEnv<'env>, data: FunctionData) -> Self {
+        Self::new_with_options(fun_env, data, FunctionDataBuilderOptions::default())
+    }
+
+    /// Gets a function target viewpoint on this builder. This locks the data for mutation
+    /// until the returned value dies.
+    pub fn get_target(&self) -> FunctionTarget<'_> {
+        FunctionTarget::new(self.fun_env, &self.data)
+    }
+
+    /// Add a return parameter.
+    pub fn add_return(&mut self, ty: Type) -> usize {
+        let idx = self.data.return_types.len();
+        self.data.return_types.push(ty);
+        idx
+    }
+
+    /// Sets the default location as well as information about the verification condition
+    /// message associated with the next instruction generated with `emit_with`.
+    pub fn set_loc_and_vc_info(&mut self, loc: Loc, message: &str) {
+        self.next_vc_info = Some(message.to_string());
+        self.set_loc(loc);
+    }
+
+    /// Sets the default location from a code attribute id.
+    pub fn set_loc_from_attr(&mut self, attr_id: AttrId) {
+        let loc = if let Some(l) = self.data.locations.get(&attr_id) {
+            l.clone()
+        } else {
+            self.global_env().unknown_loc()
+        };
+        self.current_loc = loc;
+    }
+
+    /// Gets the location from the bytecode attribute.
+    pub fn get_loc(&self, attr_id: AttrId) -> Loc {
+        self.data
+            .locations
+            .get(&attr_id)
+            .cloned()
+            .unwrap_or_else(|| self.fun_env.get_loc())
+    }
+
+    /// Creates a new bytecode attribute id with default location.
+    pub fn new_attr(&mut self) -> AttrId {
+        let id = AttrId::new(self.next_free_attr_index);
+        self.next_free_attr_index += 1;
+        self.data.locations.insert(id, self.current_loc.clone());
+        id
+    }
+
+    /// Creates a new branching label for bytecode.
+    pub fn new_label(&mut self) -> Label {
+        let label = Label::new(self.next_free_label_index);
+        self.next_free_label_index += 1;
+        label
+    }
+
+    /// Emits a bytecode.
+    pub fn emit(&mut self, bc: Bytecode) {
+        use Bytecode::*;
+        let no_fallthrough_jump_removal = self.options.no_fallthrough_jump_removal;
+        // Perform some minimal peephole optimization
+        match (self.data.code.last(), &bc) {
+            // jump L; L: ..
+            (Some(Jump(_, label1)), Label(_, label2))
+                if !no_fallthrough_jump_removal && label1 == label2 =>
+            {
+                *self.data.code.last_mut().unwrap() = bc;
+            }
+            _ => {
+                self.data.code.push(bc);
+            }
+        }
+    }
+
+    /// Emits a sequence of bytecodes.
+    pub fn emit_vec(&mut self, bcs: Vec<Bytecode>) {
+        for bc in bcs {
+            self.emit(bc);
+        }
+    }
+
+    /// Emits a bytecode via a function which takes a freshly generated attribute id.
+    pub fn emit_with<F>(&mut self, f: F)
+    where
+        F: FnOnce(AttrId) -> Bytecode,
+    {
+        let attr_id = self.new_attr();
+        if let Some(info) = std::mem::take(&mut self.next_vc_info) {
+            self.data.vc_infos.insert(attr_id, info);
+        }
+        if let Some(comment) = std::mem::take(&mut self.next_debug_comment) {
+            self.data.debug_comments.insert(attr_id, comment);
+        }
+        self.emit(f(attr_id))
+    }
+
+    /// Emits a Bytecode::Prop based on given kind and expression.
+    pub fn emit_prop(&mut self, kind: PropKind, exp: Exp) {
+        self.emit_with(move |id| Bytecode::Prop(id, kind, exp));
+    }
+
+    /// Sets the debug comment which should be associated with the next instruction
+    /// emitted with `self.emit_with(|id| ..)`.
+    pub fn set_next_debug_comment(&mut self, comment: String) {
+        self.next_debug_comment = Some(comment);
+    }
+
+    /// This will clear the state that the next `self.emit_with(..)` will add a debug comment.
+    pub fn clear_next_debug_comment(&mut self) {
+        self.next_debug_comment = None;
+    }
+
+    /// Emits a let: this creates a new temporary and emits an assumption that this temporary
+    /// is equal to the given expression. This can be used to abbreviate large expressions
+    /// which are used multiple times, or get the value of an expression into a temporary for
+    /// bytecode. Returns the temporary and a local expression referring to it.
+    pub fn emit_let(&mut self, def: Exp) -> (TempIndex, Exp) {
+        let ty = self.global_env().get_node_type(def.node_id());
+        let temp = self.new_temp(ty);
+        let temp_exp = self.mk_temporary(temp);
+        let definition = self.mk_identical(temp_exp.clone(), def);
+        self.emit_with(|id| Bytecode::Prop(id, PropKind::Assume, definition));
+        (temp, temp_exp)
+    }
+
+    /// Similar to `emit_let`, but with the temporary created as identical to the dereference of
+    /// the mutation (if the `def` argument is a mutable reference).
+    pub fn emit_let_skip_reference(&mut self, def: Exp) -> (TempIndex, Exp) {
+        let ty = self
+            .global_env()
+            .get_node_type(def.node_id())
+            .skip_reference()
+            .clone();
+        let temp = self.new_temp(ty);
+        let temp_exp = self.mk_temporary(temp);
+        let definition = self.mk_identical(temp_exp.clone(), def);
+        self.emit_with(|id| Bytecode::Prop(id, PropKind::Assume, definition));
+        (temp, temp_exp)
+    }
+
+    /// Emits a new temporary with a havoced value of given type.
+    pub fn emit_let_havoc(&mut self, ty: Type) -> (TempIndex, Exp) {
+        let havoc_kind = if ty.is_mutable_reference() {
+            HavocKind::MutationAll
+        } else {
+            HavocKind::Value
+        };
+        let temp = self.new_temp(ty);
+        let temp_exp = self.mk_temporary(temp);
+        self.emit_with(|id| {
+            Bytecode::Call(id, vec![temp], Operation::Havoc(havoc_kind), vec![], None)
+        });
+        (temp, temp_exp)
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/function_target.rs b/vendors/move/crates/move-stackless-bytecode/src/function_target.rs
new file mode 100644
index 000000000..79f0aeab1
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/function_target.rs
@@ -0,0 +1,664 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    annotations::Annotations,
+    borrow_analysis, livevar_analysis, reaching_def_analysis, read_write_set_analysis,
+    stackless_bytecode::{AttrId, Bytecode, Label},
+};
+use itertools::Itertools;
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::Spec,
+    model::{
+        FunId, FunctionEnv, FunctionVisibility, GlobalEnv, Loc, ModuleEnv, QualifiedId, StructId,
+    },
+    symbol::{Symbol, SymbolPool},
+    ty::{Type, TypeDisplayContext},
+};
+
+use crate::function_target_pipeline::FunctionVariant;
+use move_model::{
+    ast::{Exp, ExpData, TempIndex},
+    model::QualifiedInstId,
+};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+    ops::Range,
+};
+
+/// A FunctionTarget is a drop-in replacement for a FunctionEnv which allows to rewrite
+/// and analyze bytecode and parameter/local types. It encapsulates a FunctionEnv and information
+/// which can be rewritten using the `FunctionTargetsHolder` data structure.
+pub struct FunctionTarget<'env> {
+    pub func_env: &'env FunctionEnv<'env>,
+    pub data: &'env FunctionData,
+
+    // Used for debugging and testing, containing any attached annotation formatters.
+    annotation_formatters: RefCell<Vec<Box<AnnotationFormatter>>>,
+}
+
+impl<'env> Clone for FunctionTarget<'env> {
+    fn clone(&self) -> Self {
+        // Annotation formatters are transient and forgotten on clone, so this is a cheap
+        // handle.
+        Self {
+            func_env: self.func_env,
+            data: self.data,
+            annotation_formatters: RefCell::new(vec![]),
+        }
+    }
+}
+
+/// Holds the owned data belonging to a FunctionTarget, contained in a
+/// `FunctionTargetsHolder`.
+#[derive(Debug, Clone)]
+pub struct FunctionData {
+    /// The function variant.
+    pub variant: FunctionVariant,
+    /// The type instantiation.
+    pub type_args: Vec<Type>,
+    /// The bytecode.
+    pub code: Vec<Bytecode>,
+    /// The locals, including parameters.
+    pub local_types: Vec<Type>,
+    /// The return types.
+    pub return_types: Vec<Type>,
+    /// The set of global resources acquired by  this function.
+    pub acquires_global_resources: Vec<StructId>,
+    /// A map from byte code attribute to source code location.
+    pub locations: BTreeMap<AttrId, Loc>,
+    /// The set of asserts that represent loop invariants
+    pub loop_invariants: BTreeSet<AttrId>,
+    /// A map from byte code attribute to comments associated with this bytecode.
+    /// These comments are generated by transformations and are intended for internal
+    /// debugging when the bytecode is dumped.
+    pub debug_comments: BTreeMap<AttrId, String>,
+    /// A map from byte code attribute to a message to be printed out if verification
+    /// fails at this bytecode.
+    pub vc_infos: BTreeMap<AttrId, String>,
+    /// Annotations associated with this function. This is shared between multiple function
+    /// variants.
+    pub annotations: Annotations,
+    /// A mapping from symbolic names to temporaries.
+    pub name_to_index: BTreeMap<Symbol, usize>,
+    /// A cache of targets modified by this function.
+    pub modify_targets: BTreeMap<QualifiedId<StructId>, Vec<Exp>>,
+    /// The number of ghost type parameters introduced in order to instantiate related invariants
+    pub ghost_type_param_count: usize,
+}
+
+impl<'env> FunctionTarget<'env> {
+    pub fn new(
+        func_env: &'env FunctionEnv<'env>,
+        data: &'env FunctionData,
+    ) -> FunctionTarget<'env> {
+        FunctionTarget {
+            func_env,
+            data,
+            annotation_formatters: RefCell::new(vec![]),
+        }
+    }
+
+    /// Returns the name of this function.
+    pub fn get_name(&self) -> Symbol {
+        self.func_env.get_name()
+    }
+
+    /// Gets the id of this function.
+    pub fn get_id(&self) -> FunId {
+        self.func_env.get_id()
+    }
+
+    /// Shortcut for accessing the symbol pool.
+    pub fn symbol_pool(&self) -> &SymbolPool {
+        self.func_env.module_env.symbol_pool()
+    }
+
+    /// Shortcut for accessing the module env of this function.
+    pub fn module_env(&self) -> &ModuleEnv {
+        &self.func_env.module_env
+    }
+
+    /// Shortcut for accessing the global env of this function.
+    pub fn global_env(&self) -> &GlobalEnv {
+        self.func_env.module_env.env
+    }
+
+    /// Returns the location of this function.
+    pub fn get_loc(&self) -> Loc {
+        self.func_env.get_loc()
+    }
+
+    /// Returns the location of the bytecode with the given attribute.
+    pub fn get_bytecode_loc(&self, attr_id: AttrId) -> Loc {
+        if let Some(loc) = self.data.locations.get(&attr_id) {
+            loc.clone()
+        } else {
+            self.func_env.module_env.env.internal_loc()
+        }
+    }
+
+    /// Returns the debug comment, if any, associated with the given attribute.
+    pub fn get_debug_comment(&self, attr_id: AttrId) -> Option<&String> {
+        self.data.debug_comments.get(&attr_id)
+    }
+
+    /// Returns the verification condition message, if any, associated with the given attribute.
+    pub fn get_vc_info(&self, attr_id: AttrId) -> Option<&String> {
+        self.data.vc_infos.get(&attr_id)
+    }
+
+    /// Returns true if this function is opaque.
+    pub fn is_opaque(&self) -> bool {
+        self.func_env.is_opaque()
+    }
+
+    /// Returns true if this function has public, friend, or script visibility.
+    pub fn is_exposed(&self) -> bool {
+        self.func_env.is_exposed()
+    }
+
+    /// Returns the visibility of this function.
+    pub fn visibility(&self) -> FunctionVisibility {
+        self.func_env.visibility()
+    }
+
+    /// Returns true if this function mutates any references (i.e. has &mut parameters).
+    pub fn is_mutating(&self) -> bool {
+        self.func_env.is_mutating()
+    }
+
+    /// Returns the number of type parameters associated with this function, this includes both
+    /// the defined type parameters and the ghost type parameters.
+    ///
+    /// NOTE: with the existence of ghost type parameters, the number returned here can be different
+    /// from the number returned by `FunctionEnv`.
+    pub fn get_type_parameter_count(&self) -> usize {
+        self.func_env.get_type_parameters().len() + self.data.ghost_type_param_count
+    }
+
+    /// Returns return type at given index.
+    pub fn get_return_type(&self, idx: usize) -> &Type {
+        &self.data.return_types[idx]
+    }
+
+    /// Returns return types of this function.
+    pub fn get_return_types(&self) -> &[Type] {
+        &self.data.return_types
+    }
+
+    /// Returns the number of return values of this function.
+    pub fn get_return_count(&self) -> usize {
+        self.data.return_types.len()
+    }
+
+    /// Return the number of parameters of this function
+    pub fn get_parameter_count(&self) -> usize {
+        self.func_env.get_parameter_count()
+    }
+
+    /// Return an iterator over this function's parameters
+    pub fn get_parameters(&self) -> Range<usize> {
+        0..self.func_env.get_parameter_count()
+    }
+
+    /// Get the name to be used for a local. If the local has a user name, use that for naming,
+    /// otherwise generate a unique name.
+    pub fn get_local_name(&self, idx: usize) -> Symbol {
+        self.func_env.get_local_name(idx)
+    }
+
+    /// Return true if this local has a user name.
+    pub fn has_local_user_name(&self, idx: usize) -> bool {
+        idx < self.get_user_local_count()
+    }
+
+    /// Get the index corresponding to a local name. The name must either match a user name,
+    /// or have the syntax `$t<N>$`.
+    pub fn get_local_index(&self, name: Symbol) -> Option<usize> {
+        self.data.name_to_index.get(&name).cloned().or_else(|| {
+            let str = self.global_env().symbol_pool().string(name);
+            str.strip_prefix("$t").map(|s| s.parse::<usize>().unwrap())
+        })
+    }
+
+    /// Gets the number of locals of this function, including parameters.
+    pub fn get_local_count(&self) -> usize {
+        self.data.local_types.len()
+    }
+
+    /// Gets the number of user declared locals of this function, excluding locals which have
+    /// been introduced by transformations.
+    pub fn get_user_local_count(&self) -> usize {
+        self.func_env.get_local_count()
+    }
+
+    /// Return an iterator over the non-parameter local variables of this function
+    pub fn get_non_parameter_locals(&self) -> Range<usize> {
+        self.get_parameter_count()..self.get_local_count()
+    }
+
+    /// Returns true if the index is for a temporary, not user declared local.
+    pub fn is_temporary(&self, idx: usize) -> bool {
+        self.func_env.is_temporary(idx)
+    }
+
+    /// Gets the type of the local at index. This must use an index in the range as determined by
+    /// `get_local_count`.
+    pub fn get_local_type(&self, idx: usize) -> &Type {
+        &self.data.local_types[idx]
+    }
+
+    /// Returns specification associated with this function.
+    pub fn get_spec(&'env self) -> &'env Spec {
+        self.func_env.get_spec()
+    }
+
+    /// Returns the value of a boolean pragma for this function. This first looks up a
+    /// pragma in this function, then the enclosing module, and finally uses the provided default.
+    /// property
+    pub fn is_pragma_true(&self, name: &str, default: impl FnOnce() -> bool) -> bool {
+        self.func_env.is_pragma_true(name, default)
+    }
+
+    /// Gets the bytecode.
+    pub fn get_bytecode(&self) -> &[Bytecode] {
+        &self.data.code
+    }
+
+    /// Gets annotations.
+    pub fn get_annotations(&self) -> &'env Annotations {
+        &self.data.annotations
+    }
+
+    /// Gets acquired resources
+    pub fn get_acquires_global_resources(&self) -> &[StructId] {
+        &self.data.acquires_global_resources
+    }
+
+    /// Gets index of return parameter for a reference input parameter, or None, if this is
+    /// not a reference parameter.
+    pub fn get_mut_ref_return_index(&self, idx: usize) -> Option<usize> {
+        self.get_mut_ref_mapping().get(&idx).cloned()
+    }
+
+    /// Returns a map from &mut parameters to the return indices associated with them
+    /// *after* &mut instrumentation. By convention, the return values are appended after
+    /// the regular function parameters, in the order they are in the parameter list.
+    pub fn get_mut_ref_mapping(&self) -> BTreeMap<TempIndex, usize> {
+        let mut res = BTreeMap::new();
+        let mut ret_index = self.func_env.get_return_count();
+        for idx in 0..self.get_parameter_count() {
+            if self.get_local_type(idx).is_mutable_reference() {
+                res.insert(idx, ret_index);
+                ret_index = usize::saturating_add(ret_index, 1);
+            }
+        }
+        res
+    }
+
+    /// Gets modify targets for a type
+    pub fn get_modify_targets_for_type(&self, ty: &QualifiedId<StructId>) -> Option<&Vec<Exp>> {
+        self.get_modify_targets().get(ty)
+    }
+
+    /// Gets all modify targets
+    pub fn get_modify_targets(&self) -> &BTreeMap<QualifiedId<StructId>, Vec<Exp>> {
+        &self.data.modify_targets
+    }
+
+    /// Get all modifies targets, as instantiated struct ids.
+    pub fn get_modify_ids(&self) -> BTreeSet<QualifiedInstId<StructId>> {
+        self.data
+            .modify_targets
+            .iter()
+            .flat_map(|(qid, exps)| {
+                exps.iter().map(move |e| {
+                    let env = self.global_env();
+                    let rty = &env.get_node_instantiation(e.node_id())[0];
+                    let (_, _, inst) = rty.require_struct();
+                    qid.instantiate(inst.to_owned())
+                })
+            })
+            .collect()
+    }
+
+    pub fn get_modify_ids_and_exps(&self) -> BTreeMap<QualifiedInstId<StructId>, Vec<&Exp>> {
+        // TODO: for now we compute this from the legacy representation, but if this
+        //   viewpoint becomes the major use case, we should store it instead directly.
+        let mut res = BTreeMap::new();
+        for (qid, exps) in &self.data.modify_targets {
+            for target in exps {
+                let env = self.global_env();
+                let rty = &env.get_node_instantiation(target.node_id())[0];
+                let (_, _, inst) = rty.require_struct();
+                let qinstid = qid.instantiate(inst.to_owned());
+                res.entry(qinstid)
+                    .or_insert_with(Vec::new)
+                    .push(&target.call_args()[0]);
+            }
+        }
+        res
+    }
+
+    /// Pretty print a bytecode instruction with offset, comments, annotations, and VC information.
+    pub fn pretty_print_bytecode(
+        &self,
+        label_offsets: &BTreeMap<Label, CodeOffset>,
+        offset: usize,
+        code: &Bytecode,
+    ) -> String {
+        let mut texts = vec![];
+
+        // add debug comment
+        let attr_id = code.get_attr_id();
+        if let Some(comment) = self.get_debug_comment(attr_id) {
+            texts.push(format!("     # {}", comment));
+        }
+
+        // add annotations
+        let annotations = self
+            .annotation_formatters
+            .borrow()
+            .iter()
+            .filter_map(|fmt_fun| fmt_fun(self, offset as CodeOffset))
+            .map(|s| format!("     # {}", s.replace('\n', "\n     # ").trim()))
+            .join("\n");
+        if !annotations.is_empty() {
+            texts.push(annotations);
+        }
+
+        // add vc info
+        if let Some(msg) = self.data.vc_infos.get(&attr_id) {
+            let loc = self
+                .data
+                .locations
+                .get(&attr_id)
+                .cloned()
+                .unwrap_or_else(|| self.global_env().unknown_loc());
+            texts.push(format!(
+                "     # VC: {} {}",
+                msg,
+                loc.display(self.global_env())
+            ));
+        }
+
+        // add the instruction itself with offset
+        texts.push(format!(
+            "{:>3}: {}",
+            offset,
+            code.display(self, label_offsets)
+        ));
+
+        texts.join("\n")
+    }
+}
+
+impl FunctionData {
+    /// Creates new function target data.
+    pub fn new(
+        func_env: &FunctionEnv<'_>,
+        code: Vec<Bytecode>,
+        local_types: Vec<Type>,
+        return_types: Vec<Type>,
+        locations: BTreeMap<AttrId, Loc>,
+        acquires_global_resources: Vec<StructId>,
+        loop_invariants: BTreeSet<AttrId>,
+    ) -> Self {
+        let name_to_index = (0..func_env.get_local_count())
+            .map(|idx| (func_env.get_local_name(idx), idx))
+            .collect();
+        let modify_targets = func_env.get_modify_targets();
+        FunctionData {
+            variant: FunctionVariant::Baseline,
+            type_args: vec![],
+            code,
+            local_types,
+            return_types,
+            acquires_global_resources,
+            locations,
+            loop_invariants,
+            debug_comments: Default::default(),
+            vc_infos: Default::default(),
+            annotations: Default::default(),
+            name_to_index,
+            modify_targets,
+            ghost_type_param_count: 0,
+        }
+    }
+
+    /// Computes the next available index for AttrId.
+    pub fn next_free_attr_index(&self) -> usize {
+        self.code
+            .iter()
+            .map(|b| b.get_attr_id().as_usize())
+            .max()
+            .unwrap_or(0)
+            + 1
+    }
+
+    /// Computes the next available index for Label.
+    pub fn next_free_label_index(&self) -> usize {
+        self.code
+            .iter()
+            .filter_map(|b| {
+                if let Bytecode::Label(_, l) = b {
+                    Some(l.as_usize())
+                } else {
+                    None
+                }
+            })
+            .max()
+            .unwrap_or(0)
+            + 1
+    }
+
+    /// Apply a variable renaming to this data, adjusting internal data structures.
+    pub fn rename_vars<F>(&mut self, _f: &F)
+    where
+        F: Fn(TempIndex) -> TempIndex,
+    {
+        // Nothing to do currently.
+    }
+
+    /// Fork this function data, without annotations, and mark it as the given
+    /// variant.
+    pub fn fork(&self, new_variant: FunctionVariant) -> Self {
+        assert_ne!(self.variant, new_variant);
+        FunctionData {
+            variant: new_variant,
+            ..self.clone()
+        }
+    }
+
+    /// Fork this function data with (potentially partial) instantiations.
+    pub fn fork_with_instantiation(
+        &self,
+        env: &GlobalEnv,
+        inst: &[Type],
+        new_variant: FunctionVariant,
+    ) -> Self {
+        let type_args = if self.type_args.is_empty() {
+            // This is a basic variant wo/ type instantiation, just use the given inst.
+            inst.to_vec()
+        } else {
+            // This is already specialized, specialize it further with inst.
+            Type::instantiate_slice(&self.type_args, inst)
+        };
+
+        // fix types
+        let local_types = Type::instantiate_slice(&self.local_types, inst);
+        let return_types = Type::instantiate_slice(&self.return_types, inst);
+        let code = self
+            .code
+            .iter()
+            .map(|bc| bc.instantiate(env, inst))
+            .collect();
+        let modify_targets = self
+            .modify_targets
+            .iter()
+            .map(|(key, val)| {
+                let new_val = val
+                    .iter()
+                    .map(|exp| {
+                        ExpData::rewrite_node_id(exp.clone(), &mut |id| {
+                            ExpData::instantiate_node(env, id, inst)
+                        })
+                    })
+                    .collect();
+                (*key, new_val)
+            })
+            .collect();
+
+        // construct the new data
+        Self {
+            variant: new_variant,
+            type_args,
+            code,
+            local_types,
+            return_types,
+            modify_targets,
+            ..self.clone()
+        }
+    }
+
+    /// Get the instantiation of this function as a vector of types.
+    pub fn get_type_instantiation(&self, _fun_env: &FunctionEnv) -> Vec<Type> {
+        self.type_args.clone()
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+/// A function which is called to display the value of an annotation for a given function target
+/// at the given code offset. The function is passed the function target and the code offset, and
+/// is expected to pick the annotation of its respective type from the function target and for
+/// the given code offset. It should return None if there is no relevant annotation.
+pub type AnnotationFormatter = dyn Fn(&FunctionTarget<'_>, CodeOffset) -> Option<String>;
+
+impl<'env> FunctionTarget<'env> {
+    /// Register a formatter. Each function target processor which introduces new annotations
+    /// should register a formatter in order to get is value printed when a function target
+    /// is displayed for debugging or testing.
+    pub fn register_annotation_formatter(&self, formatter: Box<AnnotationFormatter>) {
+        self.annotation_formatters.borrow_mut().push(formatter);
+    }
+
+    /// Tests use this function to register all relevant annotation formatters. Extend this with
+    /// new formatters relevant for tests.
+    pub fn register_annotation_formatters_for_test(&self) {
+        self.register_annotation_formatter(Box::new(livevar_analysis::format_livevar_annotation));
+        self.register_annotation_formatter(Box::new(borrow_analysis::format_borrow_annotation));
+        self.register_annotation_formatter(Box::new(
+            reaching_def_analysis::format_reaching_def_annotation,
+        ));
+        self.register_annotation_formatter(Box::new(
+            read_write_set_analysis::format_read_write_set_annotation,
+        ));
+    }
+}
+
+impl<'env> fmt::Display for FunctionTarget<'env> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let modifier = if self.func_env.is_native() {
+            "native "
+        } else if self.func_env.is_intrinsic() {
+            "intrinsic "
+        } else {
+            ""
+        };
+        write!(
+            f,
+            "{}{}fun {}::{}",
+            self.func_env.visibility_str(),
+            modifier,
+            self.func_env
+                .module_env
+                .get_name()
+                .display(self.symbol_pool()),
+            self.get_name().display(self.symbol_pool())
+        )?;
+        let tparams_count_all = self.get_type_parameter_count();
+        let tparams_count_defined = self.func_env.get_type_parameter_count();
+        if tparams_count_all != 0 {
+            write!(f, "<")?;
+            for i in 0..tparams_count_all {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+                write!(f, "#{}", i)?;
+                if i >= tparams_count_defined {
+                    write!(f, "*")?; // denotes a ghost type parameter
+                }
+            }
+            write!(f, ">")?;
+        }
+        let tctx = TypeDisplayContext::WithEnv {
+            env: self.global_env(),
+            type_param_names: None,
+        };
+        let write_decl = |f: &mut fmt::Formatter<'_>, i: TempIndex| {
+            let ty = self.get_local_type(i).display(&tctx);
+            if self.has_local_user_name(i) {
+                write!(
+                    f,
+                    "$t{}|{}: {}",
+                    i,
+                    self.get_local_name(i)
+                        .display(self.global_env().symbol_pool()),
+                    ty
+                )
+            } else {
+                write!(f, "$t{}: {}", i, ty)
+            }
+        };
+        write!(f, "(")?;
+        for i in 0..self.get_parameter_count() {
+            if i > 0 {
+                write!(f, ", ")?;
+            }
+            write_decl(f, i)?;
+        }
+        write!(f, ")")?;
+        if self.get_return_count() > 0 {
+            write!(f, ": ")?;
+            if self.get_return_count() > 1 {
+                write!(f, "(")?;
+            }
+            for i in 0..self.get_return_count() {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+                write!(f, "{}", self.get_return_type(i).display(&tctx))?;
+            }
+            if self.get_return_count() > 1 {
+                write!(f, ")")?;
+            }
+        }
+        if self.func_env.is_native_or_intrinsic() {
+            writeln!(f, ";")?;
+        } else {
+            writeln!(f, " {{")?;
+            for i in self.get_parameter_count()..self.get_local_count() {
+                write!(f, "     var ")?;
+                write_decl(f, i)?;
+                writeln!(f)?;
+            }
+            let label_offsets = Bytecode::label_offsets(self.get_bytecode());
+            for (offset, code) in self.get_bytecode().iter().enumerate() {
+                writeln!(
+                    f,
+                    "{}",
+                    self.pretty_print_bytecode(&label_offsets, offset, code)
+                )?;
+            }
+            writeln!(f, "}}")?;
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs b/vendors/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs
new file mode 100644
index 000000000..6486f4afb
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs
@@ -0,0 +1,629 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use core::fmt;
+use std::{
+    cmp::Ordering,
+    collections::{btree_map::Entry as MapEntry, BTreeMap, BTreeSet},
+    fmt::Formatter,
+    fs,
+};
+
+use itertools::{Either, Itertools};
+use log::{debug, info};
+use petgraph::{
+    algo::has_path_connecting,
+    graph::{DiGraph, NodeIndex},
+};
+
+use move_model::model::{FunId, FunctionEnv, GlobalEnv, QualifiedId};
+
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    print_targets_for_test,
+    stackless_bytecode_generator::StacklessBytecodeGenerator,
+    stackless_control_flow_graph::generate_cfg_in_dot_format,
+};
+
+/// A data structure which holds data for multiple function targets, and allows to
+/// manipulate them as part of a transformation pipeline.
+#[derive(Debug, Default)]
+pub struct FunctionTargetsHolder {
+    targets: BTreeMap<QualifiedId<FunId>, BTreeMap<FunctionVariant, FunctionData>>,
+}
+
+/// Describes a function verification flavor.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum VerificationFlavor {
+    Regular,
+    Instantiated(usize),
+    Inconsistency(Box<VerificationFlavor>),
+}
+
+impl std::fmt::Display for VerificationFlavor {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            VerificationFlavor::Regular => write!(f, ""),
+            VerificationFlavor::Instantiated(index) => {
+                write!(f, "instantiated_{}", index)
+            }
+            VerificationFlavor::Inconsistency(flavor) => write!(f, "inconsistency_{}", flavor),
+        }
+    }
+}
+
+/// Describes a function target variant.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum FunctionVariant {
+    /// The baseline variant which was created from the original Move bytecode and is then
+    /// subject of multiple transformations.
+    Baseline,
+    /// A variant which is instrumented for verification. Only functions which are target
+    /// of verification have one of those. There can be multiple verification variants,
+    /// each identified by a unique flavor.
+    Verification(VerificationFlavor),
+}
+
+impl FunctionVariant {
+    pub fn is_verified(&self) -> bool {
+        matches!(self, FunctionVariant::Verification(..))
+    }
+}
+
+impl std::fmt::Display for FunctionVariant {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        use FunctionVariant::*;
+        match self {
+            Baseline => write!(f, "baseline"),
+            Verification(VerificationFlavor::Regular) => write!(f, "verification"),
+            Verification(v) => write!(f, "verification[{}]", v),
+        }
+    }
+}
+
+/// A trait describing a function target processor.
+pub trait FunctionTargetProcessor {
+    /// Processes a function variant. Takes as parameter a target holder which can be mutated, the
+    /// env of the function being processed, and the target data. During the time the processor is
+    /// called, the target data is removed from the holder, and added back once transformation
+    /// has finished. This allows the processor to take ownership on the target data.
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        _fun_env: &FunctionEnv,
+        _data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        unimplemented!()
+    }
+
+    /// Same as `process` but can return None to indicate that the function variant is
+    /// removed. By default, this maps to `Some(self.process(..))`. One needs to implement
+    /// either this function or `process`.
+    fn process_and_maybe_remove(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) -> Option<FunctionData> {
+        Some(self.process(targets, func_env, data, scc_opt))
+    }
+
+    /// Returns a name for this processor. This should be suitable as a file suffix.
+    fn name(&self) -> String;
+
+    /// A function which is called once before any `process` call is issued.
+    fn initialize(&self, _env: &GlobalEnv, _targets: &mut FunctionTargetsHolder) {}
+
+    /// A function which is called once after the last `process` call.
+    fn finalize(&self, _env: &GlobalEnv, _targets: &mut FunctionTargetsHolder) {}
+
+    /// A function which can be implemented to indicate that instead of a sequence of initialize,
+    /// process, and finalize, this processor has a single `run` function for the analysis of the
+    /// whole set of functions.
+    fn is_single_run(&self) -> bool {
+        false
+    }
+
+    /// To be implemented if `is_single_run()` is true.
+    fn run(&self, _env: &GlobalEnv, _targets: &mut FunctionTargetsHolder) {
+        unimplemented!()
+    }
+
+    /// A function which creates a dump of the processors results, for debugging.
+    fn dump_result(
+        &self,
+        _f: &mut Formatter<'_>,
+        _env: &GlobalEnv,
+        _targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        Ok(())
+    }
+}
+
+pub struct ProcessorResultDisplay<'a> {
+    pub env: &'a GlobalEnv,
+    pub targets: &'a FunctionTargetsHolder,
+    pub processor: &'a dyn FunctionTargetProcessor,
+}
+
+impl<'a> fmt::Display for ProcessorResultDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        self.processor.dump_result(f, self.env, self.targets)
+    }
+}
+
+/// A processing pipeline for function targets.
+#[derive(Default)]
+pub struct FunctionTargetPipeline {
+    processors: Vec<Box<dyn FunctionTargetProcessor>>,
+}
+
+impl FunctionTargetsHolder {
+    /// Get an iterator for all functions this holder.
+    pub fn get_funs(&self) -> impl Iterator<Item = QualifiedId<FunId>> + '_ {
+        self.targets.keys().cloned()
+    }
+
+    /// Gets an iterator for all functions and variants in this holder.
+    pub fn get_funs_and_variants(
+        &self,
+    ) -> impl Iterator<Item = (QualifiedId<FunId>, FunctionVariant)> + '_ {
+        self.targets
+            .iter()
+            .flat_map(|(id, vs)| vs.keys().map(move |v| (*id, v.clone())))
+    }
+
+    /// Adds a new function target. The target will be initialized from the Move byte code.
+    pub fn add_target(&mut self, func_env: &FunctionEnv<'_>) {
+        let generator = StacklessBytecodeGenerator::new(func_env);
+        let data = generator.generate_function();
+        self.targets
+            .entry(func_env.get_qualified_id())
+            .or_default()
+            .insert(FunctionVariant::Baseline, data);
+    }
+
+    /// Gets a function target for read-only consumption, for the given variant.
+    pub fn get_target<'env>(
+        &'env self,
+        func_env: &'env FunctionEnv<'env>,
+        variant: &FunctionVariant,
+    ) -> FunctionTarget<'env> {
+        let data = self
+            .get_data(&func_env.get_qualified_id(), variant)
+            .unwrap_or_else(|| {
+                panic!(
+                    "expected function target: {} ({:?})",
+                    func_env.get_full_name_str(),
+                    variant
+                )
+            });
+        FunctionTarget::new(func_env, data)
+    }
+
+    pub fn has_target(&self, func_env: &FunctionEnv<'_>, variant: &FunctionVariant) -> bool {
+        self.get_data(&func_env.get_qualified_id(), variant)
+            .is_some()
+    }
+
+    /// Gets all available variants for function.
+    pub fn get_target_variants(&self, func_env: &FunctionEnv<'_>) -> Vec<FunctionVariant> {
+        self.targets
+            .get(&func_env.get_qualified_id())
+            .expect("function targets exist")
+            .keys()
+            .cloned()
+            .collect_vec()
+    }
+
+    /// Gets targets for all available variants.
+    pub fn get_targets<'env>(
+        &'env self,
+        func_env: &'env FunctionEnv<'env>,
+    ) -> Vec<(FunctionVariant, FunctionTarget<'env>)> {
+        self.targets
+            .get(&func_env.get_qualified_id())
+            .expect("function targets exist")
+            .iter()
+            .map(|(v, d)| (v.clone(), FunctionTarget::new(func_env, d)))
+            .collect_vec()
+    }
+
+    /// Gets function data for a variant.
+    pub fn get_data(
+        &self,
+        id: &QualifiedId<FunId>,
+        variant: &FunctionVariant,
+    ) -> Option<&FunctionData> {
+        self.targets.get(id).and_then(|vs| vs.get(variant))
+    }
+
+    /// Gets mutable function data for a variant.
+    pub fn get_data_mut(
+        &mut self,
+        id: &QualifiedId<FunId>,
+        variant: &FunctionVariant,
+    ) -> Option<&mut FunctionData> {
+        self.targets.get_mut(id).and_then(|vs| vs.get_mut(variant))
+    }
+
+    /// Removes function data for a variant.
+    pub fn remove_target_data(
+        &mut self,
+        id: &QualifiedId<FunId>,
+        variant: &FunctionVariant,
+    ) -> FunctionData {
+        self.targets
+            .get_mut(id)
+            .expect("function target exists")
+            .remove(variant)
+            .expect("variant exists")
+    }
+
+    /// Sets function data for a function's variant.
+    pub fn insert_target_data(
+        &mut self,
+        id: &QualifiedId<FunId>,
+        variant: FunctionVariant,
+        data: FunctionData,
+    ) {
+        self.targets.entry(*id).or_default().insert(variant, data);
+    }
+
+    /// Processes the function target data for given function.
+    fn process(
+        &mut self,
+        func_env: &FunctionEnv,
+        processor: &dyn FunctionTargetProcessor,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) {
+        let id = func_env.get_qualified_id();
+        for variant in self.get_target_variants(func_env) {
+            // Remove data so we can own it.
+            let data = self.remove_target_data(&id, &variant);
+            if let Some(processed_data) =
+                processor.process_and_maybe_remove(self, func_env, data, scc_opt)
+            {
+                // Put back processed data.
+                self.insert_target_data(&id, variant, processed_data);
+            }
+        }
+    }
+}
+
+impl FunctionTargetPipeline {
+    /// Adds a processor to this pipeline. Processor will be called in the order they have been
+    /// added.
+    pub fn add_processor(&mut self, processor: Box<dyn FunctionTargetProcessor>) {
+        self.processors.push(processor)
+    }
+
+    /// Gets the last processor in the pipeline, for testing.
+    pub fn last_processor(&self) -> &dyn FunctionTargetProcessor {
+        self.processors
+            .iter()
+            .last()
+            .expect("pipeline not empty")
+            .as_ref()
+    }
+
+    /// Build the call graph
+    fn build_call_graph(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> (
+        DiGraph<QualifiedId<FunId>, ()>,
+        BTreeMap<QualifiedId<FunId>, NodeIndex>,
+    ) {
+        let mut graph = DiGraph::new();
+        let mut nodes = BTreeMap::new();
+        for fun_id in targets.get_funs() {
+            let node_idx = graph.add_node(fun_id);
+            nodes.insert(fun_id, node_idx);
+        }
+        for fun_id in targets.get_funs() {
+            let src_idx = nodes.get(&fun_id).unwrap();
+            let fun_env = env.get_function(fun_id);
+            for callee in fun_env.get_called_functions() {
+                let dst_idx = nodes
+                    .get(&callee)
+                    .expect("callee is not in function targets");
+                graph.add_edge(*src_idx, *dst_idx, ());
+            }
+        }
+        (graph, nodes)
+    }
+
+    /// Collect strongly connected components (SCCs) from the call graph.
+    fn derive_call_graph_sccs(
+        env: &GlobalEnv,
+        graph: &DiGraph<QualifiedId<FunId>, ()>,
+    ) -> BTreeMap<QualifiedId<FunId>, Option<BTreeSet<QualifiedId<FunId>>>> {
+        let mut sccs = BTreeMap::new();
+        for scc in petgraph::algo::tarjan_scc(graph) {
+            let mut part = BTreeSet::new();
+            let mut is_cyclic = scc.len() > 1;
+            for node_idx in scc {
+                let fun_id = *graph.node_weight(node_idx).unwrap();
+                let fun_env = env.get_function(fun_id);
+                if !is_cyclic && fun_env.get_called_functions().contains(&fun_id) {
+                    is_cyclic = true;
+                }
+                let inserted = part.insert(fun_id);
+                assert!(inserted);
+            }
+
+            if is_cyclic {
+                for fun_id in &part {
+                    let existing = sccs.insert(*fun_id, Some(part.clone()));
+                    assert!(existing.is_none());
+                }
+            } else {
+                let fun_id = part.into_iter().next().unwrap();
+                let existing = sccs.insert(fun_id, None);
+                assert!(existing.is_none());
+            }
+        }
+        sccs
+    }
+
+    /// Sort the call graph in topological order with strongly connected components (SCCs)
+    /// to represent recursive calls.
+    pub fn sort_targets_in_topological_order(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> Vec<Either<QualifiedId<FunId>, Vec<QualifiedId<FunId>>>> {
+        // collect sccs
+        let (graph, nodes) = Self::build_call_graph(env, targets);
+        let sccs = Self::derive_call_graph_sccs(env, &graph);
+
+        let mut scc_staging = BTreeMap::new();
+        for scc_opt in sccs.values() {
+            match scc_opt.as_ref() {
+                None => (),
+                Some(scc) => {
+                    scc_staging.insert(scc, vec![]);
+                }
+            }
+        }
+
+        // construct the work list (with a deterministic ordering)
+        let mut worklist = vec![];
+        for fun in targets.get_funs() {
+            let fun_env = env.get_function(fun);
+            worklist.push((
+                fun,
+                fun_env.get_called_functions().into_iter().collect_vec(),
+            ));
+        }
+
+        // analyze bottom-up from the leaves of the call graph
+        // NOTE: this algorithm produces a deterministic ordering of functions to be analyzed
+        let mut dep_ordered = vec![];
+        while !worklist.is_empty() {
+            worklist.sort_by(|(caller1, callees1), (caller2, callees2)| {
+                // rules of ordering:
+                // - if function A depends on B (i.e., calls B), put B towards the end of the worklist
+                // - if there are no dependencies among A and B, rank them by callee size
+
+                let node1 = *nodes.get(caller1).unwrap();
+                let node2 = *nodes.get(caller2).unwrap();
+                match (
+                    has_path_connecting(&graph, node1, node2, None),
+                    has_path_connecting(&graph, node2, node1, None),
+                ) {
+                    (true, true) => Ordering::Equal,
+                    (true, false) => Ordering::Less,
+                    (false, true) => Ordering::Greater,
+                    (false, false) => {
+                        // Put functions with 0 calls first in line, at the end of the vector
+                        callees2.len().cmp(&callees1.len())
+                    }
+                }
+            });
+
+            let (call_id, callees) = worklist.pop().unwrap();
+
+            // At this point, one of two things is true:
+            // 1. callees is empty (common case)
+            // 2. callees is nonempty and call_id is part of a recursive or mutually recursive function group
+
+            match sccs.get(&call_id).unwrap().as_ref() {
+                None => {
+                    // case 1: non-recursive call
+                    assert!(callees.is_empty());
+                    dep_ordered.push(Either::Left(call_id));
+                }
+                Some(scc) => {
+                    // case 2: recursive call group
+                    match scc_staging.entry(scc) {
+                        MapEntry::Vacant(_) => {
+                            panic!("all scc groups should be in staging")
+                        }
+                        MapEntry::Occupied(mut entry) => {
+                            let scc_vec = entry.get_mut();
+                            scc_vec.push(call_id);
+                            if scc_vec.len() == scc.len() {
+                                dep_ordered.push(Either::Right(entry.remove()));
+                            }
+                        }
+                    }
+                }
+            }
+
+            // update the worklist
+            for (_, callees) in worklist.iter_mut() {
+                callees.retain(|e| e != &call_id);
+            }
+        }
+
+        // ensure that everything is cleared
+        assert!(scc_staging.is_empty());
+
+        // return the ordered dep list
+        dep_ordered
+    }
+
+    /// Runs the pipeline on all functions in the targets holder. Processors are run on each
+    /// individual function in breadth-first fashion; i.e. a processor can expect that processors
+    /// preceding it in the pipeline have been executed for all functions before it is called.
+    pub fn run_with_hook<H1, H2>(
+        &self,
+        env: &GlobalEnv,
+        targets: &mut FunctionTargetsHolder,
+        hook_before_pipeline: H1,
+        hook_after_each_processor: H2,
+    ) where
+        H1: Fn(&FunctionTargetsHolder),
+        H2: Fn(usize, &dyn FunctionTargetProcessor, &FunctionTargetsHolder),
+    {
+        let topological_order = Self::sort_targets_in_topological_order(env, targets);
+        info!("transforming bytecode");
+        hook_before_pipeline(targets);
+        for (step_count, processor) in self.processors.iter().enumerate() {
+            if processor.is_single_run() {
+                processor.run(env, targets);
+            } else {
+                processor.initialize(env, targets);
+                for item in &topological_order {
+                    match item {
+                        Either::Left(fid) => {
+                            let func_env = env.get_function(*fid);
+                            targets.process(&func_env, processor.as_ref(), None);
+                        }
+                        Either::Right(scc) => 'fixedpoint: loop {
+                            let scc_env: Vec<_> =
+                                scc.iter().map(|fid| env.get_function(*fid)).collect();
+                            for fid in scc {
+                                let func_env = env.get_function(*fid);
+                                targets.process(&func_env, processor.as_ref(), Some(&scc_env));
+                            }
+
+                            // check for fixedpoint in summaries
+                            for fid in scc {
+                                let func_env = env.get_function(*fid);
+                                for (_, target) in targets.get_targets(&func_env) {
+                                    if !target.data.annotations.reached_fixedpoint() {
+                                        continue 'fixedpoint;
+                                    }
+                                }
+                            }
+                            // fixedpoint reached when execution hits this line
+                            break 'fixedpoint;
+                        },
+                    }
+                }
+                processor.finalize(env, targets);
+            }
+            hook_after_each_processor(step_count + 1, processor.as_ref(), targets);
+        }
+    }
+
+    /// Run the pipeline on all functions in the targets holder, with no hooks in effect
+    pub fn run(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        self.run_with_hook(env, targets, |_| {}, |_, _, _| {})
+    }
+
+    /// Runs the pipeline on all functions in the targets holder, dump the bytecode before the
+    /// pipeline as well as after each processor pass. If `dump_cfg` is set, dump the per-function
+    /// control-flow graph (in dot format) too.
+    pub fn run_with_dump(
+        &self,
+        env: &GlobalEnv,
+        targets: &mut FunctionTargetsHolder,
+        dump_base_name: &str,
+        dump_cfg: bool,
+    ) {
+        self.run_with_hook(
+            env,
+            targets,
+            |holders| {
+                Self::dump_to_file(
+                    dump_base_name,
+                    0,
+                    "stackless",
+                    &Self::get_pre_pipeline_dump(env, holders),
+                )
+            },
+            |step_count, processor, holders| {
+                let suffix = processor.name();
+                Self::dump_to_file(
+                    dump_base_name,
+                    step_count,
+                    &suffix,
+                    &Self::get_per_processor_dump(env, holders, processor),
+                );
+                if dump_cfg {
+                    Self::dump_cfg(env, holders, dump_base_name, step_count, &suffix);
+                }
+            },
+        );
+    }
+
+    fn print_targets(env: &GlobalEnv, name: &str, targets: &FunctionTargetsHolder) -> String {
+        print_targets_for_test(env, &format!("after processor `{}`", name), targets)
+    }
+
+    fn get_pre_pipeline_dump(env: &GlobalEnv, targets: &FunctionTargetsHolder) -> String {
+        Self::print_targets(env, "stackless", targets)
+    }
+
+    fn get_per_processor_dump(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+        processor: &dyn FunctionTargetProcessor,
+    ) -> String {
+        let mut dump = format!(
+            "{}",
+            ProcessorResultDisplay {
+                env,
+                targets,
+                processor,
+            }
+        );
+        if !processor.is_single_run() {
+            if !dump.is_empty() {
+                dump = format!("\n\n{}", dump);
+            }
+            dump.push_str(&Self::print_targets(env, &processor.name(), targets));
+        }
+        dump
+    }
+
+    fn dump_to_file(base_name: &str, step_count: usize, suffix: &str, content: &str) {
+        let dump = format!("{}\n", content.trim());
+        let file_name = format!("{}_{}_{}.bytecode", base_name, step_count, suffix);
+        debug!("dumping bytecode to `{}`", file_name);
+        fs::write(&file_name, dump).expect("dumping bytecode");
+    }
+
+    /// Generate dot files for control-flow graphs.
+    fn dump_cfg(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+        base_name: &str,
+        step_count: usize,
+        suffix: &str,
+    ) {
+        for (fun_id, variants) in &targets.targets {
+            let func_env = env.get_function(*fun_id);
+            let func_name = func_env.get_full_name_str();
+            let func_name = func_name.replace("::", "__");
+            for (variant, data) in variants {
+                if !data.code.is_empty() {
+                    let dot_file = format!(
+                        "{}_{}_{}_{}_{}_cfg.dot",
+                        base_name, step_count, suffix, func_name, variant
+                    );
+                    debug!("generating dot graph for cfg in `{}`", dot_file);
+                    let func_target = FunctionTarget::new(&func_env, data);
+                    let dot_graph = generate_cfg_in_dot_format(&func_target);
+                    fs::write(&dot_file, &dot_graph).expect("generating dot file for CFG");
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/global_invariant_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_analysis.rs
new file mode 100644
index 000000000..415da089c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_analysis.rs
@@ -0,0 +1,559 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Analysis pass which analyzes how to injects global invariants into the bytecode.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+};
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::ConditionKind,
+    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, QualifiedId, QualifiedInstId, StructId},
+    ty::{Type, TypeDisplayContext, TypeInstantiationDerivation, TypeUnificationAdapter, Variance},
+};
+
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
+    usage_analysis,
+    verification_analysis::{is_invariant_suspendable, InvariantAnalysisData},
+};
+
+/// A named struct for holding the information on how an invariant is relevant to a bytecode.
+#[derive(Default, Clone)]
+pub struct PerBytecodeRelevance {
+    /// for each `inst_fun` (instantiation of function type parameters) in the key set, the
+    /// associated value is a set of `inst_inv` (instantiation of invariant type parameters) that
+    /// are applicable to the concrete function instance `F<inst_fun>`.
+    pub insts: BTreeMap<Vec<Type>, BTreeSet<Vec<Type>>>,
+}
+
+impl PerBytecodeRelevance {
+    fn merge(&mut self, other: PerBytecodeRelevance) {
+        for (fun_inst, inv_insts) in other.insts {
+            self.insts.entry(fun_inst).or_default().extend(inv_insts);
+        }
+    }
+}
+
+/// A named struct for holding the information on how invariants are relevant to a function.
+#[derive(Clone)]
+pub struct PerFunctionRelevance {
+    /// Invariants that needs to be assumed at function entrypoint
+    /// - Key: global invariants that needs to be assumed before the first instruction,
+    /// - Value: the instantiation information per each related invariant.
+    pub entrypoint_assumptions: BTreeMap<GlobalId, PerBytecodeRelevance>,
+
+    /// For each bytecode at given code offset, the associated value is a map of
+    /// - Key: global invariants that needs to be asserted after the bytecode instruction and
+    /// - Value: the instantiation information per each related invariant.
+    pub per_bytecode_assertions: BTreeMap<CodeOffset, BTreeMap<GlobalId, PerBytecodeRelevance>>,
+
+    /// Invariants that needs to be asserted at function exitpoint
+    /// - Key: global invariants that needs to be assumed before the first instruction,
+    /// - Value: the instantiation information per each related invariant.
+    pub exitpoint_assertions: BTreeMap<GlobalId, PerBytecodeRelevance>,
+
+    /// Number of ghost type parameters introduced in order to instantiate all asserted invariants
+    pub ghost_type_param_count: usize,
+}
+
+/// Get verification information for this function.
+pub fn get_info<'env>(target: &FunctionTarget<'env>) -> &'env PerFunctionRelevance {
+    target
+        .get_annotations()
+        .get::<PerFunctionRelevance>()
+        .expect("Global invariant analysis not performed")
+}
+
+// The function target processor
+pub struct GlobalInvariantAnalysisProcessor {}
+
+impl GlobalInvariantAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for GlobalInvariantAnalysisProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            // Nothing to do
+            return data;
+        }
+        if !data.variant.is_verified() {
+            // Only need to instrument if this is a verification variant
+            return data;
+        }
+
+        // Analyze invariants
+        let target = FunctionTarget::new(fun_env, &data);
+        let analysis_result = PerFunctionRelevance::analyze(&target, targets);
+        // TODO(mengxu): re-verify that recursive functions do not impact how  global invariant
+        // analysis are performed.
+        data.annotations.set(analysis_result, true);
+
+        // This is an analysis pass, nothing gets changed
+        data
+    }
+
+    fn name(&self) -> String {
+        "global_invariant_analysis".to_string()
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut fmt::Formatter<'_>,
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        // utils
+        let type_display_ctxt = TypeDisplayContext::WithEnv {
+            env,
+            type_param_names: None,
+        };
+
+        let display_type_slice = |tys: &[Type]| -> String {
+            let content = tys
+                .iter()
+                .map(|t| t.display(&type_display_ctxt).to_string())
+                .collect::<Vec<_>>()
+                .join(", ");
+            format!("<{}>", content)
+        };
+
+        let make_indent = |indent: usize| "  ".repeat(indent);
+
+        let display_inv_relevance = |f: &mut fmt::Formatter,
+                                     invs: &BTreeMap<GlobalId, PerBytecodeRelevance>,
+                                     header: &str,
+                                     assert_or_assume: &str|
+         -> fmt::Result {
+            let mut indent = 1;
+
+            // oneliner for empty invs
+            if invs.is_empty() {
+                return writeln!(f, "{}{} {{}}", make_indent(indent), header);
+            }
+
+            writeln!(f, "{}{} {{", make_indent(indent), header)?;
+            indent += 1;
+
+            for (inv_id, inv_rel) in invs {
+                writeln!(
+                    f,
+                    "{}{} {} = [",
+                    make_indent(indent),
+                    assert_or_assume,
+                    inv_id
+                )?;
+                indent += 1;
+
+                for (rel_inst, inv_insts) in &inv_rel.insts {
+                    writeln!(
+                        f,
+                        "{}{} -> [",
+                        make_indent(indent),
+                        display_type_slice(rel_inst)
+                    )?;
+                    indent += 1;
+
+                    for inv_inst in inv_insts {
+                        writeln!(f, "{}{}", make_indent(indent), display_type_slice(inv_inst))?;
+                    }
+
+                    indent -= 1;
+                    writeln!(f, "{}]", make_indent(indent))?;
+                }
+
+                indent -= 1;
+                writeln!(f, "{}]", make_indent(indent))?;
+            }
+
+            indent -= 1;
+            writeln!(f, "{}}}", make_indent(indent))
+        };
+
+        writeln!(
+            f,
+            "\n********* Result of global invariant instrumentation *********\n"
+        )?;
+        for (fun_id, fun_variant) in targets.get_funs_and_variants() {
+            if !matches!(
+                fun_variant,
+                FunctionVariant::Verification(VerificationFlavor::Regular)
+            ) {
+                // the analysis results are available in the regular verification variant
+                continue;
+            }
+
+            let fenv = env.get_function(fun_id);
+            let target = targets.get_target(&fenv, &fun_variant);
+            let result = target
+                .get_annotations()
+                .get::<PerFunctionRelevance>()
+                .expect("Analysis not performed");
+
+            writeln!(f, "{}: [", fenv.get_full_name_str())?;
+
+            // display entrypoint assumptions
+            display_inv_relevance(f, &result.entrypoint_assumptions, "entrypoint", "assume")?;
+
+            // display per-bytecode assertions
+            for (code_offset, code_invs) in &result.per_bytecode_assertions {
+                let bc = target.data.code.get(*code_offset as usize).unwrap();
+                let header = format!("{}: {}", code_offset, bc.display(&target, &BTreeMap::new()));
+                display_inv_relevance(f, code_invs, &header, "assert")?;
+            }
+
+            // display exitpoint assertions
+            display_inv_relevance(f, &result.exitpoint_assertions, "exitpoint", "assert")?;
+
+            writeln!(f, "]")?;
+        }
+
+        writeln!(f, "\n********* Global invariants by ID *********\n")?;
+        let mut all_invs = BTreeSet::new();
+        for menv in env.get_modules() {
+            all_invs.extend(env.get_global_invariants_by_module(menv.get_id()));
+        }
+        for inv_id in all_invs {
+            let inv = env.get_global_invariant(inv_id).unwrap();
+            let inv_src = env.get_source(&inv.loc).unwrap_or("<unknown invariant>");
+            writeln!(f, "{} => {}", inv_id, inv_src)?;
+        }
+        writeln!(f)
+    }
+}
+
+/// This impl block is about the analysis pass
+impl PerFunctionRelevance {
+    /// Collect and build the relevance analysis information for this function target.
+    fn analyze(target: &FunctionTarget, targets: &FunctionTargetsHolder) -> Self {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+
+        // collect information
+        let fid = target.func_env.get_qualified_id();
+        let env = target.global_env();
+        let inv_analysis = env
+            .get_extension::<InvariantAnalysisData>()
+            .expect("Verification analysis not performed");
+
+        let check_suspendable_inv_on_return =
+            inv_analysis.fun_set_with_inv_check_on_exit.contains(&fid);
+        let inv_applicability = inv_analysis
+            .fun_to_inv_map
+            .get(&fid)
+            .expect("Invariant applicability not available");
+        let fun_type_params_arity = target.get_type_parameter_count();
+
+        let inv_ro = &inv_applicability.accessed;
+        let (inv_rw_return, inv_rw_normal): (BTreeSet<_>, BTreeSet<_>) =
+            if check_suspendable_inv_on_return {
+                inv_applicability
+                    .direct_modified
+                    .iter()
+                    .cloned()
+                    .partition(|inv_id| is_invariant_suspendable(env, *inv_id))
+            } else {
+                (BTreeSet::new(), inv_applicability.direct_modified.clone())
+            };
+
+        // collect invariant applicability and instantiation information per bytecode, i.e.,
+        // - which invariants should be instrumented after each instruction and
+        // - per each invariant applicable, how to instantiate them.
+        let mut entrypoint_assumptions = BTreeMap::new();
+        let mut per_bytecode_assertions = BTreeMap::new();
+        let mut exitpoint_assertions = BTreeMap::new();
+        let mut ghost_type_param_count = 0;
+
+        for (code_offset, bc) in target.data.code.iter().enumerate() {
+            let code_offset = code_offset as CodeOffset;
+
+            // collect memory accessed/modified in operations
+            let (mem_ro, mem_rw) = match bc {
+                Call(_, _, oper, _, _) => match oper {
+                    Function(mid, fid, inst) => {
+                        let callee_fid = mid.qualified(*fid);
+                        get_callee_memory_usage_for_invariant_instrumentation(
+                            env, targets, callee_fid, inst,
+                        )
+                    }
+                    OpaqueCallBegin(mid, fid, inst) => {
+                        let callee_fid = mid.qualified(*fid);
+                        let (mem_ro, _) = get_callee_memory_usage_for_invariant_instrumentation(
+                            env, targets, callee_fid, inst,
+                        );
+                        (mem_ro, BTreeSet::new())
+                    }
+                    OpaqueCallEnd(mid, fid, inst) => {
+                        let callee_fid = mid.qualified(*fid);
+                        let (_, mem_rw) = get_callee_memory_usage_for_invariant_instrumentation(
+                            env, targets, callee_fid, inst,
+                        );
+                        (BTreeSet::new(), mem_rw)
+                    }
+
+                    MoveTo(mid, sid, inst) | MoveFrom(mid, sid, inst) => {
+                        let mem = mid.qualified_inst(*sid, inst.to_owned());
+                        (BTreeSet::new(), std::iter::once(mem).collect())
+                    }
+                    WriteBack(GlobalRoot(mem), _) => {
+                        (BTreeSet::new(), std::iter::once(mem.clone()).collect())
+                    }
+
+                    Exists(mid, sid, inst) | GetGlobal(mid, sid, inst) => {
+                        let mem = mid.qualified_inst(*sid, inst.to_owned());
+                        (std::iter::once(mem).collect(), BTreeSet::new())
+                    }
+
+                    // shortcut other operations
+                    _ => continue,
+                },
+
+                Prop(_, PropKind::Assert, exp) | Prop(_, PropKind::Assume, exp) => (
+                    exp.used_memory(env)
+                        .into_iter()
+                        .map(|(usage, _)| usage)
+                        .collect(),
+                    BTreeSet::new(),
+                ),
+
+                // shortcut other bytecodes
+                _ => continue,
+            };
+
+            // collect instantiation information (step 1)
+            // - entrypoint assumptions arised from memories that are read-only from the bytecode
+            let relevance_ro = Self::calculate_invariant_relevance(
+                env,
+                mem_ro.iter(),
+                inv_ro,
+                fun_type_params_arity,
+                &mut ghost_type_param_count,
+                /* ignore_uninstantiated_invariant */ true,
+            );
+
+            // collect instantiation information (step 2)
+            // - invariants that need to be assumed and asserted for read-write operations
+            let relevance_rw_normal = Self::calculate_invariant_relevance(
+                env,
+                mem_rw.iter(),
+                &inv_rw_normal,
+                fun_type_params_arity,
+                &mut ghost_type_param_count,
+                /* ignore_uninstantiated_invariant */ false,
+            );
+            let relevance_rw_return = Self::calculate_invariant_relevance(
+                env,
+                mem_rw.iter(),
+                &inv_rw_return,
+                fun_type_params_arity,
+                &mut ghost_type_param_count,
+                /* ignore_uninstantiated_invariant */ false,
+            );
+
+            // entrypoint assumptions are about both the ro invariants and rw invariants, and
+            // regardless of whether they are checked in-place or deferred to the exit point.
+            for (inv_id, inv_rel) in relevance_ro
+                .iter()
+                .chain(relevance_rw_normal.iter())
+                .chain(relevance_rw_return.iter())
+            {
+                let inv = env.get_global_invariant(*inv_id).unwrap();
+                if matches!(inv.kind, ConditionKind::GlobalInvariantUpdate(..)) {
+                    // update invariants should not be assumed at function entrypoint
+                    continue;
+                }
+                entrypoint_assumptions
+                    .entry(*inv_id)
+                    .or_insert_with(PerBytecodeRelevance::default)
+                    .merge(inv_rel.clone());
+            }
+
+            // normal rw invariants are asserted in-place, right after the bytecode
+            per_bytecode_assertions.insert(code_offset, relevance_rw_normal);
+
+            // exitpoint assertions are only about the rw invariants deferred to the exit point.
+            for (inv_id, inv_rel) in relevance_rw_return {
+                exitpoint_assertions
+                    .entry(inv_id)
+                    .or_insert_with(PerBytecodeRelevance::default)
+                    .merge(inv_rel);
+            }
+        }
+
+        // wrap and return the analysis result
+        Self {
+            entrypoint_assumptions,
+            per_bytecode_assertions,
+            exitpoint_assertions,
+            ghost_type_param_count,
+        }
+    }
+
+    /// Given a set of memories, calculate the global invariants that are related to this memory
+    /// set and for each related global invariant, derive how to instantiate the invariant to make
+    /// it relevant.
+    fn calculate_invariant_relevance<'a>(
+        env: &GlobalEnv,
+        mem_related: impl Iterator<Item = &'a QualifiedInstId<StructId>>,
+        inv_related: &BTreeSet<GlobalId>,
+        fun_type_params_arity: usize,
+        fun_type_params_ghost_count: &mut usize,
+        ignore_uninstantiated_invariant: bool,
+    ) -> BTreeMap<GlobalId, PerBytecodeRelevance> {
+        let mut result = BTreeMap::new();
+
+        for rel_mem in mem_related {
+            let rel_ty = rel_mem.to_type();
+            for inv_id in inv_related {
+                let inv = env.get_global_invariant(*inv_id).unwrap();
+                let inv_type_params = match &inv.kind {
+                    ConditionKind::GlobalInvariant(params) => params,
+                    ConditionKind::GlobalInvariantUpdate(params) => params,
+                    _ => unreachable!(
+                        "A global invariant must have a condition kind of either \
+                            `GlobalInvariant` or `GlobalInvariantUpdate`"
+                    ),
+                };
+                let inv_type_params_arity = inv_type_params.len();
+
+                for inv_mem in &inv.mem_usage {
+                    let inv_ty = inv_mem.to_type();
+
+                    // make sure these two types unify before trying to instantiate them
+                    let adapter = TypeUnificationAdapter::new_pair(&rel_ty, &inv_ty, true, true);
+                    if adapter.unify(Variance::Allow, false).is_none() {
+                        continue;
+                    }
+
+                    // instantiate the bytecode first
+                    //
+                    // NOTE: in fact, in this phase, we don't intend to instantiation the function
+                    // nor do we want to collect information on how this function (or this bytecode)
+                    // needs to be instantiated. All we care is how the invariant should be
+                    // instantiated in order to be instrumented at this code point, with a generic
+                    // function and generic code.
+                    //
+                    // But unfortunately, based on how the type unification logic is written now,
+                    // this two-step instantiation is needed in order to find all possible
+                    // instantiations of the invariant. I won't deny that there might be a way to
+                    // collect invariant instantiation combinations without instantiating the
+                    // function type parameters, but I haven't iron out one so far.
+                    let rel_insts = TypeInstantiationDerivation::progressive_instantiation(
+                        std::iter::once(&rel_ty),
+                        std::iter::once(&inv_ty),
+                        true,
+                        true,
+                        true,
+                        false,
+                        fun_type_params_arity,
+                        true,
+                        false,
+                    );
+
+                    // for each instantiation of the bytecode, instantiate the invariants
+                    for rel_inst in rel_insts {
+                        let inst_rel_ty = rel_ty.instantiate(&rel_inst);
+                        let inv_insts = TypeInstantiationDerivation::progressive_instantiation(
+                            std::iter::once(&inst_rel_ty),
+                            std::iter::once(&inv_ty),
+                            false,
+                            true,
+                            false,
+                            true,
+                            inv_type_params_arity,
+                            false,
+                            true,
+                        );
+
+                        let mut wellformed_inv_inst = vec![];
+                        for inv_inst in inv_insts {
+                            if inv_inst.iter().any(|t| matches!(t, Type::Error)) {
+                                if ignore_uninstantiated_invariant {
+                                    continue;
+                                }
+                                let adapted_inv_inst = inv_inst
+                                    .into_iter()
+                                    .map(|t| {
+                                        if matches!(t, Type::Error) {
+                                            let ghost_idx = fun_type_params_arity
+                                                + *fun_type_params_ghost_count;
+                                            *fun_type_params_ghost_count += 1;
+                                            Type::TypeParameter(ghost_idx as u16)
+                                        } else {
+                                            t
+                                        }
+                                    })
+                                    .collect();
+                                wellformed_inv_inst.push(adapted_inv_inst);
+                            } else {
+                                wellformed_inv_inst.push(inv_inst);
+                            }
+                        }
+
+                        // record the relevance information
+                        result
+                            .entry(*inv_id)
+                            .or_insert_with(PerBytecodeRelevance::default)
+                            .insts
+                            .entry(rel_inst)
+                            .or_insert_with(BTreeSet::new)
+                            .extend(wellformed_inv_inst);
+                    }
+                }
+            }
+        }
+
+        result
+    }
+}
+
+fn get_callee_memory_usage_for_invariant_instrumentation(
+    env: &GlobalEnv,
+    targets: &FunctionTargetsHolder,
+    callee_fid: QualifiedId<FunId>,
+    callee_inst: &[Type],
+) -> (
+    BTreeSet<QualifiedInstId<StructId>>, // memory constitute to entry-point assumptions
+    BTreeSet<QualifiedInstId<StructId>>, // memory constitute to in-line or exit-point assertions
+) {
+    let inv_analysis = env
+        .get_extension::<InvariantAnalysisData>()
+        .expect("Verification analysis not performed");
+
+    let callee_env = env.get_function(callee_fid);
+    let callee_target = targets.get_target(&callee_env, &FunctionVariant::Baseline);
+    let callee_usage = usage_analysis::get_memory_usage(&callee_target);
+
+    // NOTE: it is important to include *ALL* memories accessed/modified by the callee
+    // instead of just the direct ones. Reasons include:
+    // - if a function `F` delegates suspendable invariant checking to its caller,
+    //   all the functions that `F` calls will not check suspendable invariants anymore.
+    // - if a function `F` is inlined, then all its callee might be inlined as well and
+    //   it is important to assume the invariants for them.
+    let all_accessed = callee_usage.accessed.get_all_inst(callee_inst);
+    if inv_analysis.fun_set_with_no_inv_check.contains(&callee_fid) {
+        let mem_rw = callee_usage.modified.get_all_inst(callee_inst);
+        let mem_ro = all_accessed.difference(&mem_rw).cloned().collect();
+        (mem_ro, mem_rw)
+    } else {
+        (all_accessed, BTreeSet::new())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation.rs
new file mode 100644
index 000000000..ecf0fc25a
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation.rs
@@ -0,0 +1,310 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Instrumentation pass which injects global invariants into the bytecode.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::Exp,
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, GlobalId, Loc},
+    spec_translator::{SpecTranslator, TranslatedSpec},
+    ty::Type,
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    global_invariant_analysis::{self, PerFunctionRelevance},
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, Operation, PropKind},
+};
+
+const GLOBAL_INVARIANT_FAILS_MESSAGE: &str = "global memory invariant does not hold";
+
+/// A transposed view of `PerFunctionRelevance` from the point of per function instantiations
+#[derive(Default)]
+struct InstrumentationPack {
+    /// Invariants that needs to be assumed at function entrypoint
+    /// - Key: global invariants that needs to be assumed before the first instruction,
+    /// - Value: the instantiation information per each related invariant.
+    entrypoint_assumptions: BTreeMap<GlobalId, BTreeSet<Vec<Type>>>,
+
+    /// For each bytecode at given code offset, the associated value is a map of
+    /// - Key: global invariants that needs to be asserted after the bytecode instruction and
+    /// - Value: the instantiation information per each related invariant.
+    per_bytecode_assertions: BTreeMap<CodeOffset, BTreeMap<GlobalId, BTreeSet<Vec<Type>>>>,
+
+    /// Invariants that needs to be asserted at function exitpoint
+    /// - Key: global invariants that needs to be assumed before the first instruction,
+    /// - Value: the instantiation information per each related invariant.
+    exitpoint_assertions: BTreeMap<GlobalId, BTreeSet<Vec<Type>>>,
+
+    /// Number of ghost type parameters introduced in order to instantiate all asserted invariants
+    ghost_type_param_count: usize,
+}
+
+impl InstrumentationPack {
+    fn transpose(relevance: &PerFunctionRelevance) -> Self {
+        let mut result = Self::default();
+
+        // transpose the `entrypoint_assumptions`
+        for (inv_id, inv_rel) in &relevance.entrypoint_assumptions {
+            for inv_insts in inv_rel.insts.values() {
+                result
+                    .entrypoint_assumptions
+                    .entry(*inv_id)
+                    .or_default()
+                    .extend(inv_insts.clone());
+            }
+        }
+
+        // transpose the `per_bytecode_assertions`
+        for (code_offset, per_code) in &relevance.per_bytecode_assertions {
+            for (inv_id, inv_rel) in per_code {
+                for inv_insts in inv_rel.insts.values() {
+                    result
+                        .per_bytecode_assertions
+                        .entry(*code_offset)
+                        .or_default()
+                        .entry(*inv_id)
+                        .or_default()
+                        .extend(inv_insts.clone());
+                }
+            }
+        }
+
+        // transpose the `exitpoint_assertions`
+        for (inv_id, inv_rel) in &relevance.exitpoint_assertions {
+            for inv_insts in inv_rel.insts.values() {
+                result
+                    .exitpoint_assertions
+                    .entry(*inv_id)
+                    .or_default()
+                    .extend(inv_insts.clone());
+            }
+        }
+
+        // set the number of ghost type parameters
+        result.ghost_type_param_count = relevance.ghost_type_param_count;
+
+        result
+    }
+}
+
+// The function target processor
+pub struct GlobalInvariantInstrumentationProcessor {}
+
+impl GlobalInvariantInstrumentationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for GlobalInvariantInstrumentationProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            // nothing to do
+            return data;
+        }
+        if !data.variant.is_verified() {
+            // only need to instrument if this is a verification variant
+            return data;
+        }
+        debug_assert!(matches!(
+            data.variant,
+            FunctionVariant::Verification(VerificationFlavor::Regular)
+        ));
+
+        // retrieve and transpose the analysis result
+        let target = FunctionTarget::new(fun_env, &data);
+        let analysis_result = global_invariant_analysis::get_info(&target);
+        let summary = InstrumentationPack::transpose(analysis_result);
+
+        // instrument the invariants in the generic version of the function only.
+        Instrumenter::new(fun_env, data).instrument(&summary)
+    }
+
+    fn name(&self) -> String {
+        "global_invariant_instrumentation".to_string()
+    }
+}
+
+/// A contextualized instrumenter to handle the global invariant instrumentation process.
+struct Instrumenter<'env> {
+    builder: FunctionDataBuilder<'env>,
+}
+
+impl<'env> Instrumenter<'env> {
+    fn new(fun_env: &'env FunctionEnv<'env>, data: FunctionData) -> Self {
+        let builder = FunctionDataBuilder::new(fun_env, data);
+        Self { builder }
+    }
+
+    /// The driver function for the overall instrumentation process
+    fn instrument(mut self, pack: &InstrumentationPack) -> FunctionData {
+        // extract and clear current code
+        let old_code = std::mem::take(&mut self.builder.data.code);
+
+        // pre-translate invariants
+        //
+        // NOTE: here, we need to save a reference to the `TranslatedSpec` for two special types
+        // of instructions, OpaqueCallEnd and Return, in order to handle update invariants.
+        //
+        // - For an OpaqueCallEnd, we need to find the matching OpaqueCallBegin and emit the state
+        //   snapshotting instructions there.
+        //
+        // - For a Return, we need to emit the state snapshotting instructions at the entry point,
+        //   after the entry point assumptions.
+        let xlated_entrypoint = self.translate_invariants(&pack.entrypoint_assumptions);
+        let xlated_exitpoint = self.translate_invariants(&pack.exitpoint_assertions);
+
+        let mut xlated_inlined = BTreeMap::new();
+        let mut xlated_for_opaque_begin = BTreeMap::new();
+        let mut xlated_for_opaque_end = BTreeMap::new();
+        for (&code_offset, related_invs) in &pack.per_bytecode_assertions {
+            let xlated = self.translate_invariants(related_invs);
+            xlated_inlined.insert(code_offset, xlated);
+
+            // for OpaqueCallEnd, we need to place assumptions about update invariants at the
+            // matching OpaqueCallBegin
+            if let Bytecode::Call(_, _, Operation::OpaqueCallEnd(..), ..) =
+                old_code.get(code_offset as usize).unwrap()
+            {
+                for needle in (0..(code_offset.wrapping_sub(1) as usize)).rev() {
+                    if matches!(
+                        old_code.get(needle).unwrap(),
+                        Bytecode::Call(_, _, Operation::OpaqueCallBegin(..), ..)
+                    ) {
+                        let needle = needle as CodeOffset;
+                        xlated_for_opaque_begin.insert(needle, code_offset);
+                        xlated_for_opaque_end.insert(code_offset, needle);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Step 1: emit entrypoint assumptions
+        self.assert_or_assume_translated_invariants(&xlated_entrypoint, PropKind::Assume);
+
+        // Step 2: emit entrypoint snapshots. This can happen if this function defers invariant
+        // checking to the return point and one of the suspended invariant is an update invariant.
+        self.emit_state_saves_for_update_invs(&xlated_exitpoint);
+
+        // Step 3: go over the bytecode and instrument assertions.
+        //         For update invariants, instrument state snapshots before the bytecode.
+        for (code_offset, bc) in old_code.into_iter().enumerate() {
+            let code_offset = code_offset as CodeOffset;
+
+            // pre-instrumentation for state snapshots
+            if let Some(xlated) = xlated_for_opaque_begin
+                .get(&code_offset)
+                .map(|offset| xlated_inlined.get(offset).unwrap())
+            {
+                self.emit_state_saves_for_update_invs(xlated);
+            }
+
+            if let Some(xlated) = xlated_inlined.get(&code_offset) {
+                // skip pre-instrumentation for OpaqueCallEnd, already got them on OpaqueCallBegin
+                if !xlated_for_opaque_end.contains_key(&code_offset) {
+                    self.emit_state_saves_for_update_invs(xlated);
+                }
+            }
+
+            // for the return bytecode, the assertion comes before the bytecode
+            if matches!(bc, Bytecode::Ret(..)) {
+                self.assert_or_assume_translated_invariants(&xlated_exitpoint, PropKind::Assert);
+            }
+
+            // the bytecode itself
+            self.builder.emit(bc);
+
+            // post-instrumentation for assertions
+            if let Some(xlated) = xlated_inlined.get(&code_offset) {
+                self.assert_or_assume_translated_invariants(xlated, PropKind::Assert);
+            }
+        }
+
+        // override the number of ghost type parameters
+        self.builder.data.ghost_type_param_count = pack.ghost_type_param_count;
+
+        // Finally, return with the new data accumulated
+        self.builder.data
+    }
+
+    /// Translate the given invariants (with instantiations). This will care for instantiating the
+    /// invariants in the function context as well.
+    fn translate_invariants(
+        &mut self,
+        invs_with_insts: &BTreeMap<GlobalId, BTreeSet<Vec<Type>>>,
+    ) -> TranslatedSpec {
+        let env = self.builder.global_env();
+        let options = ProverOptions::get(env);
+
+        let inst_invs = invs_with_insts.iter().flat_map(|(inv_id, inv_insts)| {
+            inv_insts.iter().map(move |inst| (*inv_id, inst.clone()))
+        });
+
+        SpecTranslator::translate_invariants_by_id(
+            options.auto_trace_level.invariants(),
+            &mut self.builder,
+            inst_invs,
+        )
+    }
+
+    /// Emit an assert or assume for all invariants found in the `TranslatedSpec`
+    fn assert_or_assume_translated_invariants(
+        &mut self,
+        xlated: &TranslatedSpec,
+        prop_kind: PropKind,
+    ) {
+        for (loc, _, cond) in &xlated.invariants {
+            self.emit_invariant(loc.clone(), cond.clone(), prop_kind);
+        }
+    }
+
+    /// Emit an assert or assume for one invariant, give location and expression for the property
+    fn emit_invariant(&mut self, loc: Loc, cond: Exp, prop_kind: PropKind) {
+        self.builder.set_next_debug_comment(format!(
+            "global invariant {}",
+            loc.display(self.builder.global_env())
+        ));
+        // No error messages on assumes
+        if matches!(prop_kind, PropKind::Assert) {
+            self.builder
+                .set_loc_and_vc_info(loc, GLOBAL_INVARIANT_FAILS_MESSAGE);
+        }
+        self.builder
+            .emit_with(|id| Bytecode::Prop(id, prop_kind, cond));
+    }
+
+    /// Update invariants contain "old" expressions, so it is necessary to save any types in the
+    /// state that appear in the old expressions.
+    fn emit_state_saves_for_update_invs(&mut self, xlated: &TranslatedSpec) {
+        // Emit all necessary state saves
+        self.builder
+            .set_next_debug_comment("state save for global update invariants".to_string());
+        for (mem, label) in &xlated.saved_memory {
+            self.builder
+                .emit_with(|id| Bytecode::SaveMem(id, *label, mem.clone()));
+        }
+        for (var, label) in &xlated.saved_spec_vars {
+            self.builder
+                .emit_with(|id| Bytecode::SaveSpecVar(id, *label, var.clone()));
+        }
+        self.builder.clear_next_debug_comment();
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation_v2.rs b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation_v2.rs
new file mode 100644
index 000000000..c1e27324d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/global_invariant_instrumentation_v2.rs
@@ -0,0 +1,790 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Transformation which injects global invariants into the bytecode.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
+#[allow(unused_imports)]
+use log::{debug, info, log, warn};
+
+#[cfg(invariant_trace)]
+use move_model::ty::TypeDisplayContext;
+use move_model::{
+    ast::{ConditionKind, Exp, GlobalInvariant},
+    exp_generator::ExpGenerator,
+    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, Loc, QualifiedId, QualifiedInstId, StructId},
+    pragmas::CONDITION_ISOLATED_PROP,
+    spec_translator::{SpecTranslator, TranslatedSpec},
+    ty::{Type, TypeUnificationAdapter, Variance},
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    options::ProverOptions,
+    stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
+    usage_analysis,
+    verification_analysis_v2::InvariantAnalysisData,
+};
+
+const GLOBAL_INVARIANT_FAILS_MESSAGE: &str = "global memory invariant does not hold";
+
+pub struct GlobalInvariantInstrumentationProcessorV2 {}
+
+impl GlobalInvariantInstrumentationProcessorV2 {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for GlobalInvariantInstrumentationProcessorV2 {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            // Nothing to do.
+            return data;
+        }
+        if !data.variant.is_verified() {
+            // Only need to instrument if this is a verification variant
+            return data;
+        }
+
+        // Analyze invariants
+        let target = FunctionTarget::new(fun_env, &data);
+        let Analyzer { plain, func_insts } = Analyzer::analyze(&target);
+
+        // Collect information
+        let env = target.global_env();
+
+        // Create variants for possible function instantiations
+        let mut func_variants = vec![];
+        for (i, (ty_args, mut global_ids)) in func_insts.into_iter().enumerate() {
+            let variant_data = data.fork_with_instantiation(
+                env,
+                &ty_args,
+                FunctionVariant::Verification(VerificationFlavor::Instantiated(i)),
+            );
+            global_ids.extend(plain.clone().into_iter());
+            func_variants.push((variant_data, global_ids));
+        }
+
+        // Instrument the main variant
+        let main = Instrumenter::run(fun_env, data, plain);
+
+        // Instrument the variants representing different instantiations
+        for (variant_data, variant_global_invariants) in func_variants {
+            let variant = Instrumenter::run(fun_env, variant_data, variant_global_invariants);
+            targets.insert_target_data(
+                &fun_env.get_qualified_id(),
+                variant.variant.clone(),
+                variant,
+            );
+        }
+
+        // Return the main variant
+        main
+    }
+
+    fn name(&self) -> String {
+        "global_invariant_instrumenter_v2".to_string()
+    }
+}
+
+struct Analyzer {
+    plain: BTreeSet<GlobalId>,
+    func_insts: BTreeMap<Vec<Type>, BTreeSet<GlobalId>>,
+}
+
+impl Analyzer {
+    pub fn analyze(target: &FunctionTarget) -> Self {
+        let mut analyzer = Self {
+            plain: BTreeSet::new(),
+            func_insts: BTreeMap::new(),
+        };
+        analyzer.collect_related_global_invariants(target);
+        analyzer
+    }
+
+    /// Collect global invariants that are read and written by this function
+    fn collect_related_global_invariants(&mut self, target: &FunctionTarget) {
+        let env = target.global_env();
+
+        // get memory (list of structs) read or written by the function target,
+        // then find all invariants in loaded modules that refer to that memory.
+        let mut invariants_for_used_memory = BTreeSet::new();
+        for mem in usage_analysis::get_memory_usage(target).accessed.all.iter() {
+            invariants_for_used_memory.extend(env.get_global_invariants_for_memory(mem));
+        }
+
+        // filter non-applicable global invariants
+        for invariant_id in invariants_for_used_memory {
+            self.check_global_invariant_applicability(
+                target,
+                env.get_global_invariant(invariant_id).unwrap(),
+            );
+        }
+    }
+
+    fn check_global_invariant_applicability(
+        &mut self,
+        target: &FunctionTarget,
+        invariant: &GlobalInvariant,
+    ) {
+        // marks whether the invariant will be checked in all instantiations of this function
+        let mut is_generic = false;
+
+        // collect instantiations of this function that are needed to check this global invariant
+        let mut func_insts = BTreeSet::new();
+
+        let fun_mems = &usage_analysis::get_memory_usage(target).accessed.all;
+        let fun_arity = target.get_type_parameter_count();
+        for inv_mem in &invariant.mem_usage {
+            for fun_mem in fun_mems.iter() {
+                if inv_mem.module_id != fun_mem.module_id || inv_mem.id != fun_mem.id {
+                    continue;
+                }
+                let adapter =
+                    TypeUnificationAdapter::new_vec(&fun_mem.inst, &inv_mem.inst, true, true);
+                let rel = adapter.unify(Variance::Allow, /* shallow_subst */ false);
+                match rel {
+                    None => continue,
+                    Some((subs_fun, _)) => {
+                        if subs_fun.is_empty() {
+                            is_generic = true;
+                        } else {
+                            func_insts.insert(Type::type_param_map_to_inst(fun_arity, subs_fun));
+                        }
+                    }
+                }
+            }
+        }
+
+        // save the instantiation required to evaluate this invariant
+        for inst in func_insts {
+            self.func_insts
+                .entry(inst)
+                .or_default()
+                .insert(invariant.id);
+        }
+        if is_generic {
+            self.plain.insert(invariant.id);
+        }
+    }
+}
+
+struct Instrumenter<'a> {
+    options: &'a ProverOptions,
+    builder: FunctionDataBuilder<'a>,
+    _function_inst: Vec<Type>,
+    used_memory: BTreeSet<QualifiedInstId<StructId>>,
+    // Invariants that unify with the state used in a function instantiation
+    related_invariants: BTreeSet<GlobalId>,
+    saved_from_before_instr_or_call: Option<(TranslatedSpec, BTreeSet<GlobalId>)>,
+}
+
+impl<'a> Instrumenter<'a> {
+    fn run(
+        fun_env: &FunctionEnv<'a>,
+        data: FunctionData,
+        related_invariants: BTreeSet<GlobalId>,
+    ) -> FunctionData {
+        if !data.variant.is_verified() {
+            // Run the instrumentation only if this is a verification variant.
+            return data;
+        }
+
+        let global_env = fun_env.module_env.env;
+        let options = ProverOptions::get(global_env);
+        let function_inst = data.get_type_instantiation(fun_env);
+        let builder = FunctionDataBuilder::new(fun_env, data);
+        let used_memory: BTreeSet<_> = usage_analysis::get_memory_usage(&builder.get_target())
+            .accessed
+            .get_all_inst(&function_inst);
+
+        #[cfg(invariant_trace)]
+        {
+            let tctx = TypeDisplayContext::WithEnv {
+                env: global_env,
+                type_param_names: None,
+            };
+            println!(
+                "{}<{}>: {}",
+                builder.data.variant,
+                function_inst
+                    .iter()
+                    .map(|t| t.display(&tctx).to_string())
+                    .join(","),
+                used_memory
+                    .iter()
+                    .map(|m| global_env.display(m).to_string())
+                    .join(",")
+            );
+        }
+
+        let mut instrumenter = Instrumenter {
+            options: options.as_ref(),
+            builder,
+            _function_inst: function_inst,
+            used_memory,
+            related_invariants,
+            saved_from_before_instr_or_call: None,
+        };
+        instrumenter.instrument(global_env);
+        instrumenter.builder.data
+    }
+
+    fn instrument(&mut self, global_env: &GlobalEnv) {
+        // Collect information
+        let fun_env = self.builder.fun_env;
+        let fun_id = fun_env.get_qualified_id();
+
+        let inv_ana_data = global_env.get_extension::<InvariantAnalysisData>().unwrap();
+        let disabled_inv_fun_set = &inv_ana_data.disabled_inv_fun_set;
+        let non_inv_fun_set = &inv_ana_data.non_inv_fun_set;
+        let target_invariants = &inv_ana_data.target_invariants;
+        let disabled_invs_for_fun = &inv_ana_data.disabled_invs_for_fun;
+
+        // Extract and clear current code
+        let old_code = std::mem::take(&mut self.builder.data.code);
+
+        // Emit entrypoint assumptions
+        let mut entrypoint_invariants = self.filter_entrypoint_invariants(&self.related_invariants);
+        if non_inv_fun_set.contains(&fun_id) {
+            if let Some(invs_disabled) = disabled_invs_for_fun.get(&fun_id) {
+                entrypoint_invariants = entrypoint_invariants
+                    .difference(invs_disabled)
+                    .cloned()
+                    .collect();
+            }
+        }
+        let xlated_spec = self.translate_invariants(&entrypoint_invariants);
+        self.assert_or_assume_translated_invariants(
+            &xlated_spec.invariants,
+            &entrypoint_invariants,
+            PropKind::Assume,
+        );
+
+        // In addition to the entrypoint invariants assumed just above, it is necessary
+        // to assume more invariants in a special case.  When invariants are disabled in
+        // this function but not in callers, we will later assert those invariants just
+        // before return instructions.
+        // We need to assume those invariants at the beginning of the function in order
+        // to prove them later. They aren't necessarily entrypoint invariants if we are
+        // verifying a function in a strict dependency, or in a friend module that does not
+        // have the target module in its dependencies.
+        // So, the next code finds the set of target invariants (which will be assumed on return)
+        // and assumes those that are not entrypoint invariants.
+        if disabled_inv_fun_set.contains(&fun_id) {
+            // Separate the update invariants, because we never want to assume them.
+            let (global_target_invs, _update_target_invs) =
+                self.separate_update_invariants(target_invariants);
+            let return_invariants: BTreeSet<_> = global_target_invs
+                .difference(&entrypoint_invariants)
+                .cloned()
+                .collect();
+            let xlated_spec = self.translate_invariants(&return_invariants);
+            self.assert_or_assume_translated_invariants(
+                &xlated_spec.invariants,
+                &return_invariants,
+                PropKind::Assume,
+            );
+        }
+
+        // Generate new instrumented code.
+        for bc in old_code {
+            self.instrument_bytecode(bc, fun_id, &inv_ana_data, &entrypoint_invariants);
+        }
+    }
+
+    /// Returns list of invariant ids to be assumed at the beginning of the current function.
+    fn filter_entrypoint_invariants(
+        &self,
+        related_invariants: &BTreeSet<GlobalId>,
+    ) -> BTreeSet<GlobalId> {
+        // Emit an assume of each invariant over memory touched by this function.
+        // Such invariants include
+        // - invariants declared in this module, or
+        // - invariants declared in transitively dependent modules
+        //
+        // Excludes global invariants that
+        // - are marked by the user explicitly as `[isolated]`, or
+        // - are not declared in dependent modules of the module defining the
+        //   function (which may not be the target module) and upon which the
+        //   code should therefore not depend, apart from the update itself, or
+        // - are "update" invariants.
+
+        // Adds back target invariants that are modified (directly or indirectly) in the function.
+
+        let env = self.builder.global_env();
+        let module_env = &self.builder.fun_env.module_env;
+
+        related_invariants
+            .iter()
+            .filter_map(|id| {
+                env.get_global_invariant(*id).filter(|inv| {
+                    // excludes "update invariants"
+                    matches!(inv.kind, ConditionKind::GlobalInvariant(..))
+                        && module_env.is_transitive_dependency(inv.declaring_module)
+                        && !module_env
+                            .env
+                            .is_property_true(&inv.properties, CONDITION_ISOLATED_PROP)
+                            .unwrap_or(false)
+                })
+            })
+            .map(|inv| inv.id)
+            .collect()
+    }
+
+    fn instrument_bytecode(
+        &mut self,
+        bc: Bytecode,
+        fun_id: QualifiedId<FunId>,
+        inv_ana_data: &InvariantAnalysisData,
+        entrypoint_invariants: &BTreeSet<GlobalId>,
+    ) {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+        let target_invariants = &inv_ana_data.target_invariants;
+        let disabled_inv_fun_set = &inv_ana_data.disabled_inv_fun_set;
+        let always_check_invs: BTreeSet<GlobalId>;
+        if let Some(disabled_invs) = &inv_ana_data.disabled_invs_for_fun.get(&fun_id) {
+            always_check_invs = entrypoint_invariants
+                .difference(disabled_invs)
+                .cloned()
+                .collect();
+        } else {
+            always_check_invs = entrypoint_invariants.clone();
+        }
+
+        match &bc {
+            Call(_, _, WriteBack(GlobalRoot(mem), ..), ..) => {
+                self.emit_invariants_for_bytecode(
+                    &bc,
+                    &fun_id,
+                    inv_ana_data,
+                    mem,
+                    &always_check_invs,
+                );
+            }
+            Call(_, _, MoveTo(mid, sid, inst), ..) | Call(_, _, MoveFrom(mid, sid, inst), ..) => {
+                let mem = mid.qualified_inst(*sid, inst.to_owned());
+                self.emit_invariants_for_bytecode(
+                    &bc,
+                    &fun_id,
+                    inv_ana_data,
+                    &mem,
+                    &always_check_invs,
+                );
+            }
+            // Emit assumes before procedure calls.  This also deals with saves for update invariants.
+            Call(_, _, OpaqueCallBegin(module_id, id, _), _, _) => {
+                self.assume_invariants_for_opaque_begin(
+                    module_id.qualified(*id),
+                    entrypoint_invariants,
+                    inv_ana_data,
+                );
+                // Then emit the call instruction.
+                self.builder.emit(bc);
+            }
+            // Emit asserts after procedure calls
+            Call(_, _, OpaqueCallEnd(module_id, id, _), _, _) => {
+                // First, emit the call instruction.
+                self.builder.emit(bc.clone());
+                self.assert_invariants_for_opaque_end(module_id.qualified(*id), inv_ana_data)
+            }
+            // An inline call needs to be treated similarly (but there is just one instruction.
+            Call(_, _, Function(module_id, id, _), _, _) => {
+                self.assume_invariants_for_opaque_begin(
+                    module_id.qualified(*id),
+                    entrypoint_invariants,
+                    inv_ana_data,
+                );
+                // Then emit the call instruction.
+                self.builder.emit(bc.clone());
+                self.assert_invariants_for_opaque_end(module_id.qualified(*id), inv_ana_data)
+            }
+            // When invariants are disabled in the body of this function but not in its
+            // callers, assert them just before a return instruction (the caller will be
+            // assuming they hold).
+            Ret(_, _) => {
+                if disabled_inv_fun_set.contains(&fun_id) {
+                    // TODO: It is only necessary to assert invariants that were disabled here.
+                    // Asserting more won't hurt, but generates unnecessary work for the prover.
+                    let (global_target_invs, _update_target_invs) =
+                        self.separate_update_invariants(target_invariants);
+                    let xlated_spec = self.translate_invariants(&global_target_invs);
+                    self.assert_or_assume_translated_invariants(
+                        &xlated_spec.invariants,
+                        &global_target_invs,
+                        PropKind::Assert,
+                    );
+                }
+                self.builder.emit(bc);
+            }
+            _ => self.builder.emit(bc),
+        }
+    }
+
+    /// Emit invariants and saves for call to OpaqueCallBegin in the
+    /// special case where the invariants are not checked in the
+    /// called function.
+    fn assume_invariants_for_opaque_begin(
+        &mut self,
+        called_fun_id: QualifiedId<FunId>,
+        entrypoint_invariants: &BTreeSet<GlobalId>,
+        inv_ana_data: &InvariantAnalysisData,
+    ) {
+        let target_invariants = &inv_ana_data.target_invariants;
+        let disabled_inv_fun_set = &inv_ana_data.disabled_inv_fun_set;
+        let non_inv_fun_set = &inv_ana_data.non_inv_fun_set;
+        let funs_that_modify_inv = &inv_ana_data.funs_that_modify_inv;
+        // Normally, invariants would be assumed and asserted in
+        // a called function, and so there would be no need to assume
+        // the invariant before the call.
+        // When invariants are not disabled in the current function
+        // but the called function doesn't check them, we are going to
+        // need to assert the invariant when the call returns (at the
+        // matching OpaqueCallEnd instruction). So, we assume the
+        // invariant here, before the OpaqueCallBegin, so that we have
+        // a hope of proving it later.
+        let fun_id = self.builder.fun_env.get_qualified_id();
+        if !disabled_inv_fun_set.contains(&fun_id)
+            && !non_inv_fun_set.contains(&fun_id)
+            && non_inv_fun_set.contains(&called_fun_id)
+        {
+            // Do not assume update invs
+            // This prevents ASSERTING the updates because emit_assumes_and_saves
+            // stores translated invariants for assertion in assume_invariants_for_opaque_end,
+            // and we don't want updates to be asserted there.
+            // TODO: This should all be refactored to eliminate hacks like the previous
+            // sentence.
+            let (global_invs, _update_invs) = self.separate_update_invariants(target_invariants);
+            // assume the invariants that are modified by the called function
+            let modified_invs =
+                self.get_invs_modified_by_fun(&global_invs, called_fun_id, funs_that_modify_inv);
+            self.emit_assumes_and_saves_before_bytecode(modified_invs, entrypoint_invariants);
+        }
+    }
+
+    /// Called when invariants need to be checked, but an opaque called function
+    /// doesn't check them.
+    fn assert_invariants_for_opaque_end(
+        &mut self,
+        called_fun_id: QualifiedId<FunId>,
+        inv_ana_data: &InvariantAnalysisData,
+    ) {
+        let disabled_inv_fun_set = &inv_ana_data.disabled_inv_fun_set;
+        let non_inv_fun_set = &inv_ana_data.non_inv_fun_set;
+        // Add invariant assertions after function call when invariant holds in the
+        // body of the current function, but the called function does not assert
+        // invariants.
+        // The asserted invariant ensures the the invariant
+        // holds in the body of the current function, as is required.
+        let fun_id = self.builder.fun_env.get_qualified_id();
+        if !disabled_inv_fun_set.contains(&fun_id)
+            && !non_inv_fun_set.contains(&fun_id)
+            && non_inv_fun_set.contains(&called_fun_id)
+        {
+            self.emit_asserts_after_bytecode();
+        }
+    }
+
+    /// Emit invariant-related assumptions and assertions around a bytecode.
+    /// Before instruction, emit assumptions of global invariants, if necessary,
+    /// and emit saves of old state for update invariants.
+    fn emit_invariants_for_bytecode(
+        &mut self,
+        bc: &Bytecode,
+        fun_id: &QualifiedId<FunId>,
+        inv_ana_data: &InvariantAnalysisData,
+        mem: &QualifiedInstId<StructId>,
+        entrypoint_invariants: &BTreeSet<GlobalId>,
+    ) {
+        // When invariants are enabled during the body of the current function, add asserts after
+        // the operation for each invariant that the operation could modify. Such an operation
+        // includes write-backs to a GlobalRoot or MoveTo/MoveFrom a location in the global storage.
+        let target_invariants = &inv_ana_data.target_invariants;
+
+        let env = self.builder.global_env();
+        // consider only the invariants that are modified by instruction
+        // TODO (IMPORTANT): target_invariants and disabled_invs were not computed with unification,
+        // so it may be that some invariants are not going to be emitted that should be.
+        let mut modified_invariants: BTreeSet<GlobalId> = env
+            .get_global_invariants_for_memory(mem)
+            .intersection(target_invariants)
+            .copied()
+            .collect();
+
+        if let Some(disabled_invs) = &inv_ana_data.disabled_invs_for_fun.get(fun_id) {
+            modified_invariants = modified_invariants
+                .difference(disabled_invs)
+                .cloned()
+                .collect();
+        }
+        self.emit_assumes_and_saves_before_bytecode(modified_invariants, entrypoint_invariants);
+        // put out the modifying instruction byte code.
+        self.builder.emit(bc.clone());
+        self.emit_asserts_after_bytecode();
+    }
+
+    // emit assumptions for invariants that were not assumed on entry and saves for types that are embedded
+    // in "old" in update invariants.
+    // When processing assumes before an opaque instruction, modified_invs contains no update invariants.
+    fn emit_assumes_and_saves_before_bytecode(
+        &mut self,
+        modified_invs: BTreeSet<GlobalId>,
+        entrypoint_invariants: &BTreeSet<GlobalId>,
+    ) {
+        // translate all the invariants. Some were already translated at the entrypoint, but
+        // that's ok because entrypoint invariants are global invariants that don't have "old",
+        // so redundant state tags are not going to be a problem.
+        let mut xlated_invs = self.translate_invariants(&modified_invs);
+
+        let (global_invs, _update_invs) = self.separate_update_invariants(&modified_invs);
+
+        // remove entrypoint invariants so we don't assume them again here.
+        let modified_assumes: BTreeSet<GlobalId> = global_invs
+            .difference(entrypoint_invariants)
+            .cloned()
+            .collect();
+        // assume the global invariants that weren't assumed at entrypoint
+        self.assert_or_assume_translated_invariants(
+            &xlated_invs.invariants,
+            &modified_assumes,
+            PropKind::Assume,
+        );
+        // emit the instructions to save state in the state tags assigned in the previous step
+        self.emit_state_saves_for_update_invs(&mut xlated_invs);
+        // Save the translated invariants for use in asserts after instruction or opaque call end
+        if self.saved_from_before_instr_or_call.is_none() {
+            self.saved_from_before_instr_or_call = Some((xlated_invs, modified_invs));
+        } else {
+            panic!("self.saved_from_pre should be None");
+        }
+    }
+
+    fn emit_asserts_after_bytecode(&mut self) {
+        // assert the global and update invariants that instruction modifies, regardless of where they
+        // were assumed
+        if let Some((xlated_invs, modified_invs)) =
+            std::mem::take(&mut self.saved_from_before_instr_or_call)
+        {
+            self.assert_or_assume_translated_invariants(
+                &xlated_invs.invariants,
+                &modified_invs,
+                PropKind::Assert,
+            );
+        } else {
+            // This should never happen
+            panic!("saved_from_pre should be Some");
+        }
+    }
+
+    /// Given a set of invariants, return a pair of sets: global invariants and update invariants
+    fn separate_update_invariants(
+        &self,
+        invariants: &BTreeSet<GlobalId>,
+    ) -> (BTreeSet<GlobalId>, BTreeSet<GlobalId>) {
+        let global_env = self.builder.fun_env.module_env.env;
+        let mut global_invs: BTreeSet<GlobalId> = BTreeSet::new();
+        let mut update_invs: BTreeSet<GlobalId> = BTreeSet::new();
+        for inv_id in invariants {
+            let inv = global_env.get_global_invariant(*inv_id).unwrap();
+            if matches!(inv.kind, ConditionKind::GlobalInvariantUpdate(..)) {
+                update_invs.insert(*inv_id);
+            } else {
+                global_invs.insert(*inv_id);
+            }
+        }
+        (global_invs, update_invs)
+    }
+
+    /// Returns the set of invariants modified by a function
+    fn get_invs_modified_by_fun(
+        &self,
+        inv_set: &BTreeSet<GlobalId>,
+        fun_id: QualifiedId<FunId>,
+        funs_that_modify_inv: &BTreeMap<GlobalId, BTreeSet<QualifiedId<FunId>>>,
+    ) -> BTreeSet<GlobalId> {
+        let mut modified_inv_set: BTreeSet<GlobalId> = BTreeSet::new();
+        for inv_id in inv_set {
+            if let Some(fun_id_set) = funs_that_modify_inv.get(inv_id) {
+                if fun_id_set.contains(&fun_id) {
+                    modified_inv_set.insert(*inv_id);
+                }
+            }
+        }
+        modified_inv_set
+    }
+
+    /// Update invariants contain "old" expressions, so it is necessary to save any types in the
+    /// state that appear in the old expressions.  "update_invs" argument must contain only update
+    /// invariants (not checked).
+    fn emit_state_saves_for_update_invs(&mut self, xlated_spec: &mut TranslatedSpec) {
+        // Emit all necessary state saves
+        self.builder
+            .set_next_debug_comment("state save for global update invariants".to_string());
+        for (mem, label) in std::mem::take(&mut xlated_spec.saved_memory) {
+            self.builder
+                .emit_with(|id| Bytecode::SaveMem(id, label, mem));
+        }
+        for (var, label) in std::mem::take(&mut xlated_spec.saved_spec_vars) {
+            self.builder
+                .emit_with(|id| Bytecode::SaveSpecVar(id, label, var));
+        }
+        self.builder.clear_next_debug_comment();
+    }
+
+    /// emit asserts or assumes (depending on prop_kind argument) for the invariants in
+    /// xlated_invariants that is also in inv_set at the current location,
+    fn assert_or_assume_translated_invariants(
+        &mut self,
+        xlated_invariants: &[(Loc, GlobalId, Exp)],
+        inv_set: &BTreeSet<GlobalId>,
+        prop_kind: PropKind,
+    ) {
+        let global_env = self.builder.global_env();
+        for (loc, mid, cond) in xlated_invariants {
+            if inv_set.contains(mid) {
+                // Check for hard-to-debug coding error (this is not a user error)
+                if inv_set.contains(mid)
+                    && matches!(prop_kind, PropKind::Assume)
+                    && matches!(
+                        global_env.get_global_invariant(*mid).unwrap().kind,
+                        ConditionKind::GlobalInvariantUpdate(..)
+                    )
+                {
+                    panic!("Not allowed to assume update invariant");
+                }
+                self.emit_invariant(loc, cond, prop_kind);
+            }
+        }
+    }
+
+    /// Emit an assert or assume for one invariant, give location and expression for the property
+    fn emit_invariant(&mut self, loc: &Loc, cond: &Exp, prop_kind: PropKind) {
+        self.builder.set_next_debug_comment(format!(
+            "global invariant {}",
+            loc.display(self.builder.global_env())
+        ));
+        // No error messages on assumes
+        if prop_kind == PropKind::Assert {
+            self.builder
+                .set_loc_and_vc_info(loc.clone(), GLOBAL_INVARIANT_FAILS_MESSAGE);
+        }
+        self.builder
+            .emit_with(|id| Bytecode::Prop(id, prop_kind, cond.clone()));
+    }
+
+    /// Translate the given set of invariants. This will care for instantiating the
+    /// invariants in the function context.
+    fn translate_invariants(&mut self, invs: &BTreeSet<GlobalId>) -> TranslatedSpec {
+        let inst_invs = self.compute_instances_for_invariants(invs);
+        SpecTranslator::translate_invariants_by_id(
+            self.options.auto_trace_level.invariants(),
+            &mut self.builder,
+            inst_invs.into_iter(),
+        )
+    }
+
+    /// Compute the instantiations which need to be verified for each invariant in the input.
+    /// This may filter out certain invariants which do not have a valid instantiation.
+    fn compute_instances_for_invariants(
+        &self,
+        invs: &BTreeSet<GlobalId>,
+    ) -> Vec<(GlobalId, Vec<Type>)> {
+        invs.iter()
+            .flat_map(|id| {
+                let inv = self.builder.global_env().get_global_invariant(*id).unwrap();
+                self.compute_invariant_instances(inv).into_iter()
+            })
+            .collect()
+    }
+
+    /// Compute the instantiations for the given invariant, by comparing the memory accessed
+    /// by the invariant with that of the enclosing function.
+    fn compute_invariant_instances(
+        &self,
+        inv: &GlobalInvariant,
+    ) -> BTreeSet<(GlobalId, Vec<Type>)> {
+        // Determine the type arity of this invariant. If it is 0, we shortcut with just
+        // returning a single empty instance.
+        let arity = match &inv.kind {
+            ConditionKind::GlobalInvariant(ps) | ConditionKind::GlobalInvariantUpdate(ps) => {
+                ps.len() as u16
+            }
+            _ => 0,
+        };
+        if arity == 0 {
+            return vec![(inv.id, vec![])].into_iter().collect();
+        }
+
+        // Holds possible instantiations per type parameter
+        let mut per_type_param_insts = BTreeMap::new();
+
+        // Pairwise unify memory used by the invariant against memory in the function.
+        // Notice that the function memory is already instantiated for the function variant
+        // we are instrumenting.
+        for inv_mem in &inv.mem_usage {
+            for fun_mem in &self.used_memory {
+                let adapter = TypeUnificationAdapter::new_vec(
+                    &fun_mem.inst,
+                    &inv_mem.inst,
+                    /* treat_lhs_type_param_as_var */ false,
+                    /* treat_rhs_type_local_as_var */ true,
+                );
+                #[cfg(invariant_trace)]
+                println!(
+                    "{} =?= {} for inv {}",
+                    self.builder.global_env().display(fun_mem),
+                    self.builder.global_env().display(inv_mem),
+                    inv.loc.display(self.builder.global_env())
+                );
+                let rel = adapter.unify(Variance::Allow, /* shallow_subst */ false);
+                match rel {
+                    None => continue,
+                    Some((_, subst_rhs)) => {
+                        #[cfg(invariant_trace)]
+                        println!("unifies {:?}", subst_rhs);
+                        for (k, v) in subst_rhs {
+                            per_type_param_insts
+                                .entry(k)
+                                .or_insert_with(BTreeSet::new)
+                                .insert(v);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Check whether all type parameters have at least one instantiation. If not, this
+        // invariant is not applicable (this corresponds to an unbound TypeLocal in the older
+        // translation scheme).
+        // TODO: we should generate a type check error if an invariant has unused, dead
+        //   type parameters because such an invariant can never pass this test.
+        let mut all_insts = BTreeSet::new();
+        if (0..arity).collect::<BTreeSet<_>>() == per_type_param_insts.keys().cloned().collect() {
+            // Compute the cartesian product of all individual type parameter instantiations.
+            for inst in per_type_param_insts
+                .values()
+                .map(|tys| tys.iter().cloned())
+                .multi_cartesian_product()
+            {
+                all_insts.insert((inv.id, inst));
+            }
+        }
+        all_insts
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/graph.rs b/vendors/move/crates/move-stackless-bytecode/src/graph.rs
new file mode 100644
index 000000000..f9a79ee88
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/graph.rs
@@ -0,0 +1,358 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// This module implements a technique to compute the natural loops of a graph.
+// The implementation is based on the computation of the dominance relation
+// of a graph using the technique method in this paper:
+// Keith D. Cooper, Timothy J. Harvey, Ken Kennedy, "A Simple, Fast Dominance Algorithm ",
+// Software Practice and Experience, 2001.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt::Debug,
+};
+
+pub struct NaturalLoop<T: Ord + Copy + Debug> {
+    pub loop_header: T,
+    pub loop_latch: T, // latch -> header is the back edge representing this loop
+    pub loop_body: BTreeSet<T>,
+}
+
+pub struct Graph<T: Ord + Copy + Debug> {
+    entry: T,
+    nodes: Vec<T>,
+    edges: Vec<(T, T)>,
+    predecessors: BTreeMap<T, BTreeSet<T>>,
+    successors: BTreeMap<T, BTreeSet<T>>,
+}
+
+impl<T: Ord + Copy + Debug> Graph<T> {
+    /// This function creates a graph from a set of nodes (with a unique entry node)
+    /// and a set of edges.
+    pub fn new(entry: T, nodes: Vec<T>, edges: Vec<(T, T)>) -> Self {
+        let mut predecessors: BTreeMap<T, BTreeSet<T>> =
+            nodes.iter().map(|x| (*x, BTreeSet::new())).collect();
+        let mut successors: BTreeMap<T, BTreeSet<T>> =
+            nodes.iter().map(|x| (*x, BTreeSet::new())).collect();
+        for edge in &edges {
+            successors.entry(edge.0).and_modify(|x| {
+                x.insert(edge.1);
+            });
+            predecessors.entry(edge.1).and_modify(|x| {
+                x.insert(edge.0);
+            });
+        }
+        Self {
+            entry,
+            nodes,
+            edges,
+            predecessors,
+            successors,
+        }
+    }
+
+    /// This function computes the loop headers and natural loops of a reducible graph.
+    /// If the graph is irreducible, None is returned.
+    pub fn compute_reducible(&self) -> Option<Vec<NaturalLoop<T>>> {
+        let dom_relation = DomRelation::new(self);
+        let mut loop_headers = BTreeSet::new();
+        let mut back_edges = vec![];
+        let mut non_back_edges = vec![];
+        for e in &self.edges {
+            if !dom_relation.is_reachable(e.0) {
+                continue;
+            }
+            if dom_relation.is_dominated_by(e.0, e.1) {
+                back_edges.push(*e);
+                loop_headers.insert(e.1);
+            } else {
+                non_back_edges.push(*e);
+            }
+        }
+        if Graph::new(self.entry, self.nodes.clone(), non_back_edges).is_acyclic() {
+            let natural_loops = back_edges
+                .into_iter()
+                .map(|edge| self.natural_loop(edge))
+                .collect();
+            Some(natural_loops)
+        } else {
+            None
+        }
+    }
+
+    fn is_acyclic(&self) -> bool {
+        let mut visited = BTreeMap::new();
+        let mut stack = vec![];
+        visited.insert(self.entry, false);
+        stack.push(self.entry);
+        while let Some(n) = stack.pop() {
+            if visited[&n] {
+                visited.entry(n).and_modify(|x| {
+                    *x = false;
+                });
+                continue;
+            }
+            stack.push(n);
+            visited.entry(n).and_modify(|x| {
+                *x = true;
+            });
+            for s in &self.successors[&n] {
+                if visited.contains_key(s) {
+                    if visited[s] {
+                        return false;
+                    }
+                } else {
+                    visited.insert(*s, false);
+                    stack.push(*s);
+                }
+            }
+        }
+        true
+    }
+
+    fn natural_loop(&self, back_edge: (T, T)) -> NaturalLoop<T> {
+        let loop_latch = back_edge.0;
+        let loop_header = back_edge.1;
+        let mut stack = vec![];
+        let mut loop_body = BTreeSet::new();
+        loop_body.insert(loop_header);
+        if loop_latch != loop_header {
+            loop_body.insert(loop_latch);
+            stack.push(loop_latch);
+        }
+        while let Some(m) = stack.pop() {
+            for p in &self.predecessors[&m] {
+                if !loop_body.contains(p) {
+                    loop_body.insert(*p);
+                    stack.push(*p);
+                }
+            }
+        }
+        NaturalLoop {
+            loop_header,
+            loop_latch,
+            loop_body,
+        }
+    }
+}
+
+struct DomRelation<T: Ord + Copy + Debug> {
+    node_to_postorder_num: BTreeMap<T, usize>,
+    postorder_num_to_node: Vec<T>,
+    idom_tree: BTreeMap<usize, usize>,
+}
+
+impl<T: Ord + Copy + Debug> DomRelation<T> {
+    /// This function computes the dominance relation on the subset of the graph
+    /// that is reachable from its entry node.
+    pub fn new(graph: &Graph<T>) -> Self {
+        let mut dom_relation = Self {
+            node_to_postorder_num: BTreeMap::new(),
+            postorder_num_to_node: vec![],
+            idom_tree: BTreeMap::new(),
+        };
+        dom_relation.postorder_visit(graph);
+        dom_relation.compute_dominators(graph);
+        dom_relation
+    }
+
+    /// This function returns true iff `x` is reachable from the entry node of the graph.
+    pub fn is_reachable(&self, x: T) -> bool {
+        self.node_to_postorder_num.contains_key(&x)
+    }
+
+    /// This function returns true iff `x` is dominated by `y`.
+    pub fn is_dominated_by(&self, x: T, y: T) -> bool {
+        let x_num = self.node_to_postorder_num[&x];
+        let y_num = self.node_to_postorder_num[&y];
+        let mut curr_num = x_num;
+        loop {
+            if curr_num == y_num {
+                return true;
+            }
+            if curr_num == self.entry_num() {
+                return false;
+            }
+            curr_num = self.idom_tree[&curr_num];
+        }
+    }
+
+    fn entry_num(&self) -> usize {
+        self.num_nodes() - 1
+    }
+
+    fn num_nodes(&self) -> usize {
+        self.node_to_postorder_num.len()
+    }
+
+    fn postorder_visit(&mut self, graph: &Graph<T>) {
+        let mut stack = vec![];
+        let mut visited = BTreeSet::new();
+        let mut grey = BTreeSet::new();
+        stack.push(graph.entry);
+        visited.insert(graph.entry);
+        while let Some(curr) = stack.pop() {
+            if grey.contains(&curr) {
+                let curr_num = self.postorder_num_to_node.len();
+                self.postorder_num_to_node.push(curr);
+                self.node_to_postorder_num.insert(curr, curr_num);
+            } else {
+                grey.insert(curr);
+                stack.push(curr);
+                for child in &graph.successors[&curr] {
+                    if !visited.contains(child) {
+                        visited.insert(*child);
+                        stack.push(*child);
+                    }
+                }
+            }
+        }
+    }
+
+    fn compute_dominators(&mut self, graph: &Graph<T>) {
+        let entry_num = self.entry_num();
+        self.idom_tree.insert(entry_num, entry_num);
+        let mut changed = true;
+        while changed {
+            changed = false;
+            for node_num in (0..self.num_nodes() - 1).rev() {
+                let b = self.postorder_num_to_node[node_num];
+                let mut new_idom = self.num_nodes();
+                for p in &graph.predecessors[&b] {
+                    if !self.node_to_postorder_num.contains_key(p) {
+                        continue; // not all nodes are reachable
+                    }
+                    let pred_num = self.node_to_postorder_num[p];
+                    if self.idom_tree.contains_key(&pred_num) {
+                        if new_idom == self.num_nodes() {
+                            new_idom = pred_num;
+                        } else {
+                            new_idom = self.intersect(pred_num, new_idom);
+                        }
+                    }
+                }
+                assert!(new_idom != self.num_nodes());
+                if self.idom_tree.contains_key(&node_num) && self.idom_tree[&node_num] == new_idom {
+                    continue;
+                } else {
+                    self.idom_tree
+                        .entry(node_num)
+                        .and_modify(|x| {
+                            *x = new_idom;
+                        })
+                        .or_insert(new_idom);
+                    changed = true;
+                }
+            }
+        }
+    }
+
+    fn intersect(&self, x: usize, y: usize) -> usize {
+        let mut finger1 = x;
+        let mut finger2 = y;
+        while finger1 != finger2 {
+            while finger1 < finger2 {
+                finger1 = self.idom_tree[&finger1];
+            }
+            while finger2 < finger1 {
+                finger2 = self.idom_tree[&finger2];
+            }
+        }
+        finger1
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test1() {
+        let nodes = vec![1, 2, 3, 4, 5];
+        let edges = vec![(1, 2), (2, 1), (4, 1), (3, 2), (5, 3), (5, 4)];
+        let source = 5;
+        let graph = Graph::new(source, nodes, edges);
+        assert!(graph.compute_reducible().is_none());
+    }
+
+    #[test]
+    fn test2() {
+        let nodes = vec![1, 2, 3, 4, 5, 6];
+        let edges = vec![
+            (1, 2),
+            (2, 1),
+            (2, 3),
+            (3, 2),
+            (4, 2),
+            (4, 3),
+            (5, 1),
+            (6, 5),
+            (6, 4),
+        ];
+        let source = 6;
+        let graph = Graph::new(source, nodes, edges);
+        assert!(graph.compute_reducible().is_none());
+    }
+
+    #[test]
+    fn test3() {
+        let nodes = vec![1, 2, 3, 4, 5, 6];
+        let edges = vec![(1, 2), (2, 3), (2, 4), (2, 6), (3, 5), (4, 5), (5, 2)];
+        let source = 1;
+        let graph = Graph::new(source, nodes, edges);
+        let natural_loops = graph.compute_reducible().unwrap();
+        assert_eq!(natural_loops.len(), 1);
+        let single_loop = &natural_loops[0];
+        assert_eq!(single_loop.loop_header, 2);
+        assert_eq!(single_loop.loop_latch, 5);
+        assert_eq!(
+            single_loop.loop_body,
+            vec![2, 3, 4, 5].into_iter().collect()
+        );
+    }
+
+    #[test]
+    fn test4() {
+        let nodes = vec![1, 2, 3, 4, 5, 6];
+        let edges = vec![(1, 2), (2, 3), (2, 4), (2, 6), (3, 5), (4, 5), (5, 2)];
+        let source = 6;
+        let graph = Graph::new(source, nodes, edges);
+        assert!(graph.compute_reducible().is_some());
+    }
+
+    #[test]
+    fn test5() {
+        // nested natural loops
+        let nodes = vec![1, 2, 3, 4, 5, 6];
+        let edges = vec![
+            (1, 2),
+            (2, 3),
+            (2, 4),
+            (2, 6),
+            (3, 5),
+            (4, 5),
+            (5, 2),
+            (3, 2),
+        ];
+        let source = 1;
+        let graph = Graph::new(source, nodes, edges);
+        let natural_loops = graph.compute_reducible().unwrap();
+
+        assert_eq!(natural_loops.len(), 2);
+        let (inner_loop, outer_loop) = if natural_loops[0].loop_latch == 3 {
+            assert_eq!(natural_loops[1].loop_latch, 5);
+            (&natural_loops[0], &natural_loops[1])
+        } else {
+            assert_eq!(natural_loops[0].loop_latch, 5);
+            assert_eq!(natural_loops[1].loop_latch, 3);
+            (&natural_loops[1], &natural_loops[0])
+        };
+
+        assert_eq!(inner_loop.loop_header, 2);
+        assert_eq!(inner_loop.loop_body, vec![2, 3].into_iter().collect());
+
+        assert_eq!(outer_loop.loop_header, 2);
+        assert_eq!(outer_loop.loop_body, vec![2, 3, 4, 5].into_iter().collect());
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/inconsistency_check.rs b/vendors/move/crates/move-stackless-bytecode/src/inconsistency_check.rs
new file mode 100644
index 000000000..bd144e9a1
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/inconsistency_check.rs
@@ -0,0 +1,106 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Instrument `assert false;` in strategic locations in the program such that if proved, signals
+//! an inconsistency among the specifications.
+//!
+//! The presence of inconsistency is a serious issue. If there is an inconsistency in the
+//! verification assumptions (perhaps due to a specification mistake or a Prover bug), any false
+//! post-condition can be proved vacuously. The `InconsistencyCheckInstrumentationProcessor` adds
+//! an `assert false` before
+//! - every `return` and
+//! - every `abort` (if the `unconditional-abort-as-inconsistency` option is set).
+//! In this way, if the instrumented `assert false` can be proved, it means we have an inconsistency
+//! in the specifications.
+//!
+//! A function that unconditionally abort might be considered as some form of inconsistency as well.
+//! Consider the function `fun always_abort() { abort 0 }`, it might seem surprising that the prover
+//! can prove that `spec always_abort { ensures 1 == 2; }`. If this function aborts unconditionally,
+//! any post-condition can be proved. Checking of this behavior is turned-off by default, and can
+//! be enabled with the `unconditional-abort-as-inconsistency` flag.
+
+use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, PropKind},
+};
+
+// This message is for the boogie wrapper, and not shown to the users.
+const EXPECTED_TO_FAIL: &str = "expected to fail";
+
+pub struct InconsistencyCheckInstrumenter {}
+
+impl InconsistencyCheckInstrumenter {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for InconsistencyCheckInstrumenter {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            // Nothing to do.
+            return data;
+        }
+        let flavor = match &data.variant {
+            FunctionVariant::Baseline
+            | FunctionVariant::Verification(VerificationFlavor::Inconsistency(..)) => {
+                // instrumentation only applies to non-inconsistency verification variants
+                return data;
+            }
+            FunctionVariant::Verification(flavor) => flavor.clone(),
+        };
+
+        // obtain the options first
+        let options = ProverOptions::get(fun_env.module_env.env);
+
+        // create a clone of the data for inconsistency check
+        let new_data = data.fork(FunctionVariant::Verification(
+            VerificationFlavor::Inconsistency(Box::new(flavor)),
+        ));
+
+        // instrumentation
+        let mut builder = FunctionDataBuilder::new(fun_env, new_data);
+        let old_code = std::mem::take(&mut builder.data.code);
+        for bc in old_code {
+            if matches!(bc, Bytecode::Ret(..))
+                || (matches!(bc, Bytecode::Abort(..))
+                    && !options.unconditional_abort_as_inconsistency)
+            {
+                let loc = builder.fun_env.get_spec_loc();
+                builder.set_loc_and_vc_info(loc, EXPECTED_TO_FAIL);
+                let exp = builder.mk_bool_const(false);
+                builder.emit_with(|id| Bytecode::Prop(id, PropKind::Assert, exp));
+            }
+            builder.emit(bc);
+        }
+
+        // add the new variant to targets
+        let new_data = builder.data;
+        targets.insert_target_data(
+            &fun_env.get_qualified_id(),
+            new_data.variant.clone(),
+            new_data,
+        );
+
+        // the original function data is unchanged
+        data
+    }
+
+    fn name(&self) -> String {
+        "inconsistency_check_instrumenter".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/lib.rs b/vendors/move/crates/move-stackless-bytecode/src/lib.rs
new file mode 100644
index 000000000..07ce643b7
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/lib.rs
@@ -0,0 +1,72 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::function_target_pipeline::FunctionTargetsHolder;
+use move_model::model::GlobalEnv;
+use std::fmt::Write;
+
+pub mod access_path;
+pub mod access_path_trie;
+pub mod annotations;
+pub mod borrow_analysis;
+pub mod clean_and_optimize;
+pub mod compositional_analysis;
+pub mod data_invariant_instrumentation;
+pub mod dataflow_analysis;
+pub mod dataflow_domains;
+pub mod debug_instrumentation;
+pub mod eliminate_imm_refs;
+pub mod escape_analysis;
+pub mod function_data_builder;
+pub mod function_target;
+pub mod function_target_pipeline;
+pub mod global_invariant_analysis;
+pub mod global_invariant_instrumentation;
+pub mod global_invariant_instrumentation_v2;
+pub mod graph;
+pub mod inconsistency_check;
+pub mod livevar_analysis;
+pub mod loop_analysis;
+pub mod memory_instrumentation;
+pub mod mono_analysis;
+pub mod mut_ref_instrumentation;
+pub mod mutation_tester;
+pub mod number_operation;
+pub mod number_operation_analysis;
+pub mod options;
+pub mod packed_types_analysis;
+pub mod pipeline_factory;
+pub mod reaching_def_analysis;
+pub mod read_write_set_analysis;
+pub mod spec_instrumentation;
+pub mod stackless_bytecode;
+pub mod stackless_bytecode_generator;
+pub mod stackless_control_flow_graph;
+pub mod usage_analysis;
+pub mod verification_analysis;
+pub mod verification_analysis_v2;
+pub mod well_formed_instrumentation;
+
+/// Print function targets for testing and debugging.
+pub fn print_targets_for_test(
+    env: &GlobalEnv,
+    header: &str,
+    targets: &FunctionTargetsHolder,
+) -> String {
+    let mut text = String::new();
+    writeln!(&mut text, "============ {} ================", header).unwrap();
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            for (variant, target) in targets.get_targets(&func_env) {
+                if !target.data.code.is_empty() || target.func_env.is_native_or_intrinsic() {
+                    target.register_annotation_formatters_for_test();
+                    writeln!(&mut text, "\n[variant {}]\n{}", variant, target).unwrap();
+                }
+            }
+        }
+    }
+    text
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/livevar_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/livevar_analysis.rs
new file mode 100644
index 000000000..9fb9a33b2
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/livevar_analysis.rs
@@ -0,0 +1,460 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Live variable analysis with subsequent dead assignment elimination and
+// computation of new Destroy instructions.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{AbortAction, AttrId, Bytecode, Label, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+/// The annotation for live variable analysis. For each code position, we have a set of local
+/// variable indices that are live just before the code offset, i.e. these variables are used
+/// before being overwritten.
+#[derive(Debug, Default, Clone)]
+pub struct LiveVarInfoAtCodeOffset {
+    pub before: BTreeSet<TempIndex>,
+    pub after: BTreeSet<TempIndex>,
+}
+
+#[derive(Default, Clone)]
+pub struct LiveVarAnnotation(BTreeMap<CodeOffset, LiveVarInfoAtCodeOffset>);
+
+impl LiveVarAnnotation {
+    pub fn get_live_var_info_at(
+        &self,
+        code_offset: CodeOffset,
+    ) -> Option<&LiveVarInfoAtCodeOffset> {
+        self.0.get(&code_offset)
+    }
+}
+
+pub struct LiveVarAnalysisProcessor {
+    /// Whether the processor should attach `LiveVarAnnotation` to the function data.
+    annotate: bool,
+}
+
+impl LiveVarAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(LiveVarAnalysisProcessor { annotate: true })
+    }
+
+    pub fn new_no_annotate() -> Box<Self> {
+        Box::new(LiveVarAnalysisProcessor { annotate: false })
+    }
+}
+
+impl FunctionTargetProcessor for LiveVarAnalysisProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() {
+            // Native functions have no byte code.
+            return data;
+        }
+
+        let next_free_label = data.next_free_label_index();
+        let next_free_attr = data.next_free_attr_index();
+        let code = std::mem::take(&mut data.code);
+        let func_target = FunctionTarget::new(func_env, &data);
+
+        // Call 1st time
+        let (code, _) =
+            Self::analyze_and_transform(&func_target, next_free_label, next_free_attr, code);
+
+        // Eliminate unused locals after dead code elimination.
+        let (code, local_types, remap) = Self::eliminate_unused_vars(&func_target, code);
+        data.rename_vars(&|idx| {
+            if let Some(new_idx) = remap.get(&idx) {
+                *new_idx
+            } else {
+                idx
+            }
+        });
+        data.local_types = local_types;
+        data.code = code;
+
+        if self.annotate {
+            // Call analysis 2nd time on transformed code.
+            let func_target = FunctionTarget::new(func_env, &data);
+            let offset_to_live_refs = LiveVarAnnotation(Self::analyze(&func_target, &data.code));
+            // Annotate function target with computed life variable data.
+            // TODO(mengxu): verify that recursion does not affect how live-var analysis is done
+            data.annotations
+                .set::<LiveVarAnnotation>(offset_to_live_refs, true);
+        }
+        data
+    }
+
+    fn name(&self) -> String {
+        "livevar_analysis".to_string()
+    }
+}
+
+impl LiveVarAnalysisProcessor {
+    fn analyze_and_transform(
+        func_target: &FunctionTarget,
+        next_free_label: usize,
+        next_free_attr: usize,
+        code: Vec<Bytecode>,
+    ) -> (Vec<Bytecode>, BTreeMap<CodeOffset, LiveVarInfoAtCodeOffset>) {
+        let annotations = Self::analyze(func_target, &code);
+        let mut analyzer = LiveVarAnalysis::new(func_target, next_free_label, next_free_attr);
+        let new_bytecode = analyzer.transform_code(&annotations, code);
+        (new_bytecode, annotations)
+    }
+
+    fn analyze(
+        func_target: &FunctionTarget,
+        code: &[Bytecode],
+    ) -> BTreeMap<CodeOffset, LiveVarInfoAtCodeOffset> {
+        // Perform backward analysis from all blocks just in case some block
+        // cannot reach an exit block
+        let cfg = StacklessControlFlowGraph::new_backward(code, true);
+        let analyzer = LiveVarAnalysis::new(func_target, 0, 0);
+        let state_map = analyzer.analyze_function(
+            LiveVarState {
+                livevars: BTreeSet::new(),
+            },
+            code,
+            &cfg,
+        );
+        analyzer.state_per_instruction(state_map, code, &cfg, |before, after| {
+            LiveVarInfoAtCodeOffset {
+                before: before.livevars.clone(),
+                after: after.livevars.clone(),
+            }
+        })
+    }
+
+    fn eliminate_unused_vars(
+        func_target: &FunctionTarget,
+        code: Vec<Bytecode>,
+    ) -> (Vec<Bytecode>, Vec<Type>, BTreeMap<TempIndex, TempIndex>) {
+        let mut new_code = vec![];
+        let mut new_vars = vec![];
+        let mut remap = BTreeMap::new();
+        // Do not change user declared vars, so populate remap info with them first.
+        for local in 0..func_target.get_user_local_count() {
+            let ty = func_target.get_local_type(local);
+            new_vars.push(ty.clone());
+            remap.insert(local, local);
+        }
+        let mut transform_local = |local: TempIndex| {
+            if let Some(new_idx) = remap.get(&local) {
+                *new_idx
+            } else {
+                let new_idx = new_vars.len();
+                let ty = func_target.get_local_type(local);
+                new_vars.push(ty.clone());
+                remap.insert(local, new_idx);
+                new_idx
+            }
+        };
+        for bytecode in code {
+            new_code.push(bytecode.remap_all_vars(func_target, &mut transform_local));
+        }
+        (new_code, new_vars, remap)
+    }
+}
+
+struct LiveVarAnalysis<'a> {
+    func_target: &'a FunctionTarget<'a>,
+    next_label_id: usize,
+    next_attr_id: usize,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+struct LiveVarState {
+    livevars: BTreeSet<TempIndex>,
+}
+
+impl LiveVarState {
+    fn remove(&mut self, vars: &[TempIndex]) -> bool {
+        let mut removed = false;
+        for v in vars {
+            if self.livevars.remove(v) {
+                removed = true;
+            }
+        }
+        removed
+    }
+
+    fn insert(&mut self, vars: &[TempIndex]) {
+        for v in vars {
+            self.livevars.insert(*v);
+        }
+    }
+}
+
+impl<'a> LiveVarAnalysis<'a> {
+    fn new(func_target: &'a FunctionTarget, next_label_id: usize, next_attr_id: usize) -> Self {
+        Self {
+            func_target,
+            next_label_id,
+            next_attr_id,
+        }
+    }
+
+    fn transform_code(
+        &mut self,
+        annotations: &BTreeMap<CodeOffset, LiveVarInfoAtCodeOffset>,
+        mut code: Vec<Bytecode>,
+    ) -> Vec<Bytecode> {
+        let label_to_code_offset = Bytecode::label_offsets(&code);
+        let mut transformed_code = vec![];
+        let mut new_bytecodes = vec![];
+
+        // insert marks for uninitialized mutable references
+        let num_args = self.func_target.get_parameter_count();
+        if let Some(info) = annotations.get(&0) {
+            for index in &info.before {
+                // only mark the mutable references conditionally defined in function body as uninit
+                if *index >= num_args
+                    && self
+                        .func_target
+                        .get_local_type(*index)
+                        .is_mutable_reference()
+                {
+                    transformed_code.push(Bytecode::Call(
+                        self.new_attr_id(),
+                        vec![],
+                        Operation::Uninit,
+                        vec![*index],
+                        None,
+                    ));
+                }
+            }
+        }
+
+        // optimize the function body
+        let mut skip_next = false;
+        for code_offset in 0..code.len() {
+            if skip_next {
+                skip_next = false;
+                continue;
+            }
+            let bytecode = std::mem::replace(&mut code[code_offset], Bytecode::Nop(AttrId::new(0)));
+            let annotation_at = &annotations[&(code_offset as CodeOffset)];
+            match bytecode {
+                Bytecode::Branch(attr_id, then_label, else_label, src) => {
+                    let (then_label, mut bytecodes) = self.create_block_to_destroy_refs(
+                        then_label,
+                        self.lost_refs_along_edge(
+                            annotations,
+                            code_offset as CodeOffset,
+                            label_to_code_offset[&then_label],
+                        ),
+                    );
+                    new_bytecodes.append(&mut bytecodes);
+                    let (else_label, mut bytecodes) = self.create_block_to_destroy_refs(
+                        else_label,
+                        self.lost_refs_along_edge(
+                            annotations,
+                            code_offset as CodeOffset,
+                            label_to_code_offset[&else_label],
+                        ),
+                    );
+                    new_bytecodes.append(&mut bytecodes);
+                    transformed_code.push(Bytecode::Branch(attr_id, then_label, else_label, src));
+                }
+                Bytecode::Load(_, dest, _) | Bytecode::Assign(_, dest, _, _)
+                    if !annotation_at.after.contains(&dest) =>
+                {
+                    // Drop this load/assign as it is not used.
+                }
+                Bytecode::Call(attr_id, dests, oper, srcs, aa)
+                    if code_offset + 1 < code.len()
+                        && dests.len() == 1
+                        && !matches!(oper, Operation::BorrowLoc | Operation::BorrowGlobal(..)) =>
+                {
+                    // Catch the common case where we have:
+                    //
+                    //   $t := call(...)
+                    //   x := $t
+                    //   <$t is dead>
+                    //
+                    // This is an artifact from transformation from stack to stackless bytecode.
+                    // Copy propagation cannot catch this case because it does not have the
+                    // livevar information about $t.
+                    //
+                    // With one exception: if the called operation is a BorrowLocal or BorrowGlobal (i.e., an operation
+                    // that creates a root mutable reference), do not optimize it away as we need this local/global root
+                    // reference for our IsParent test. An alternative (i.e., one way to get rid of this exception) is
+                    // to support IsParent test against local and global directly, but that is more complicated.
+                    let next_code_offset = code_offset + 1;
+                    if let Bytecode::Assign(_, dest, src, _) = &code[next_code_offset] {
+                        let annotation_at = &annotations[&(next_code_offset as CodeOffset)];
+                        if src == &dests[0] && !annotation_at.after.contains(src) {
+                            transformed_code.push(Bytecode::Call(
+                                attr_id,
+                                vec![*dest],
+                                oper,
+                                srcs,
+                                aa,
+                            ));
+                            skip_next = true;
+                        } else {
+                            transformed_code.push(Bytecode::Call(attr_id, dests, oper, srcs, aa));
+                        }
+                    } else {
+                        transformed_code.push(Bytecode::Call(attr_id, dests, oper, srcs, aa));
+                    }
+                }
+                _ => {
+                    transformed_code.push(bytecode);
+                }
+            }
+        }
+        transformed_code.append(&mut new_bytecodes);
+        transformed_code
+    }
+
+    fn new_label(&mut self) -> Label {
+        let label = Label::new(self.next_label_id);
+        self.next_label_id += 1;
+        label
+    }
+
+    fn new_attr_id(&mut self) -> AttrId {
+        let attr_id = AttrId::new(self.next_attr_id);
+        self.next_attr_id += 1;
+        attr_id
+    }
+
+    fn create_block_to_destroy_refs(
+        &mut self,
+        jump_label: Label,
+        refs: Vec<TempIndex>,
+    ) -> (Label, Vec<Bytecode>) {
+        let mut start_label = jump_label;
+        let mut new_bytecodes = vec![];
+        if !refs.is_empty() {
+            start_label = self.new_label();
+            new_bytecodes.push(Bytecode::Label(self.new_attr_id(), start_label));
+            for idx in refs {
+                new_bytecodes.push(Bytecode::Call(
+                    self.new_attr_id(),
+                    vec![],
+                    Operation::Destroy,
+                    vec![idx],
+                    None,
+                ));
+            }
+            new_bytecodes.push(Bytecode::Jump(self.new_attr_id(), jump_label));
+        }
+        (start_label, new_bytecodes)
+    }
+
+    fn lost_refs_along_edge(
+        &self,
+        annotations: &BTreeMap<CodeOffset, LiveVarInfoAtCodeOffset>,
+        src_code_offset: CodeOffset,
+        dest_code_offset: CodeOffset,
+    ) -> Vec<TempIndex> {
+        annotations[&src_code_offset]
+            .after
+            .iter()
+            .filter(|x| {
+                self.func_target.get_local_type(**x).is_reference()
+                    && !annotations[&dest_code_offset].before.contains(x)
+            })
+            .copied()
+            .collect()
+    }
+}
+
+impl<'a> TransferFunctions for LiveVarAnalysis<'a> {
+    type State = LiveVarState;
+    const BACKWARD: bool = true;
+
+    fn execute(&self, state: &mut LiveVarState, instr: &Bytecode, _idx: CodeOffset) {
+        use Bytecode::*;
+        match instr {
+            Assign(_, dst, src, _) => {
+                if state.remove(&[*dst]) {
+                    state.insert(&[*src]);
+                }
+            }
+            Load(_, dst, _) => {
+                state.remove(&[*dst]);
+            }
+            Call(_, dsts, _, srcs, on_abort) => {
+                state.remove(dsts);
+                state.insert(srcs);
+                if let Some(AbortAction(_, dst)) = on_abort {
+                    state.remove(&[*dst]);
+                }
+            }
+            Ret(_, srcs) => {
+                state.insert(srcs);
+            }
+            Abort(_, src) | Branch(_, _, _, src) => {
+                state.insert(&[*src]);
+            }
+            Prop(_, _, exp) => {
+                for (idx, _) in exp.used_temporaries(self.func_target.global_env()) {
+                    state.insert(&[idx]);
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for LiveVarAnalysis<'a> {}
+
+impl AbstractDomain for LiveVarState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = JoinResult::Unchanged;
+        for livevar in &other.livevars {
+            if !self.livevars.contains(livevar) {
+                self.livevars.insert(*livevar);
+                result = JoinResult::Changed;
+            }
+        }
+        result
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+/// Format a live variable annotation.
+pub fn format_livevar_annotation(
+    target: &FunctionTarget<'_>,
+    code_offset: CodeOffset,
+) -> Option<String> {
+    if let Some(LiveVarAnnotation(map)) = target.get_annotations().get::<LiveVarAnnotation>() {
+        if let Some(map_at) = map.get(&code_offset) {
+            let mut res = map_at
+                .before
+                .iter()
+                .map(|idx| {
+                    let name = target.get_local_name(*idx);
+                    format!("{}", name.display(target.symbol_pool()),)
+                })
+                .join(", ");
+            res.insert_str(0, "live vars: ");
+            return Some(res);
+        }
+    }
+    None
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/loop_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/loop_analysis.rs
new file mode 100644
index 000000000..c166fae77
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/loop_analysis.rs
@@ -0,0 +1,536 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{self, TempIndex},
+    exp_generator::ExpGenerator,
+    model::FunctionEnv,
+    ty::{PrimitiveType, Type},
+};
+
+use crate::{
+    function_data_builder::{FunctionDataBuilder, FunctionDataBuilderOptions},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    graph::{Graph, NaturalLoop},
+    options::ProverOptions,
+    stackless_bytecode::{AttrId, Bytecode, HavocKind, Label, Operation, PropKind},
+    stackless_control_flow_graph::{BlockContent, BlockId, StacklessControlFlowGraph},
+};
+
+const LOOP_INVARIANT_BASE_FAILED: &str = "base case of the loop invariant does not hold";
+const LOOP_INVARIANT_INDUCTION_FAILED: &str = "induction case of the loop invariant does not hold";
+
+/// A fat-loop captures the information of one or more natural loops that share the same loop
+/// header. This shared header is called the header of the fat-loop.
+///
+/// Conceptually, every back edge defines a unique natural loop and different back edges may points
+/// to the same loop header (e.g., when there are two "continue" statements in the loop body).
+///
+/// However, since these natural loops share the same loop header, they share the same loop
+/// invariants too and the fat-loop targets (i.e., variables that may be changed in any sub-loop)
+/// is the union of loop targets per each natural loop that share the header.
+#[derive(Debug, Clone)]
+pub struct FatLoop {
+    pub invariants: BTreeMap<CodeOffset, (AttrId, ast::Exp)>,
+    pub val_targets: BTreeSet<TempIndex>,
+    pub mut_targets: BTreeMap<TempIndex, bool>,
+    pub back_edges: BTreeSet<CodeOffset>,
+}
+
+#[derive(Debug, Clone)]
+pub struct LoopAnnotation {
+    pub fat_loops: BTreeMap<Label, FatLoop>,
+}
+
+impl LoopAnnotation {
+    fn back_edges_locations(&self) -> BTreeSet<CodeOffset> {
+        self.fat_loops
+            .values()
+            .flat_map(|l| l.back_edges.iter())
+            .copied()
+            .collect()
+    }
+
+    fn invariants_locations(&self) -> BTreeSet<CodeOffset> {
+        self.fat_loops
+            .values()
+            .flat_map(|l| l.invariants.keys())
+            .copied()
+            .collect()
+    }
+}
+
+pub struct LoopAnalysisProcessor {}
+
+impl LoopAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(LoopAnalysisProcessor {})
+    }
+}
+
+impl FunctionTargetProcessor for LoopAnalysisProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native() {
+            return data;
+        }
+        let loop_annotation = Self::build_loop_annotation(func_env, &data);
+        Self::transform(func_env, data, &loop_annotation)
+    }
+
+    fn name(&self) -> String {
+        "loop_analysis".to_string()
+    }
+}
+
+impl LoopAnalysisProcessor {
+    /// Perform a loop transformation that eliminate back-edges in a loop and flatten the function
+    /// CFG into a directed acyclic graph (DAG).
+    ///
+    /// The general procedure works as following (assuming the loop invariant expression is L):
+    ///
+    /// - At the beginning of the loop header (identified by the label bytecode), insert the
+    ///   following statements:
+    ///     - assert L;
+    ///     - havoc T;
+    ///     - assume L;
+    /// - Create a new dummy block (say, block X) with only the following statements
+    ///     - assert L;
+    ///     - stop;
+    /// - For each backedge in this loop:
+    ///     - In the source block of the back edge, replace the last statement (must be a jump or
+    ///       branch) with the new label of X.
+    fn transform(
+        func_env: &FunctionEnv<'_>,
+        data: FunctionData,
+        loop_annotation: &LoopAnnotation,
+    ) -> FunctionData {
+        let options = ProverOptions::get(func_env.module_env.env);
+
+        let back_edge_locs = loop_annotation.back_edges_locations();
+        let invariant_locs = loop_annotation.invariants_locations();
+        let mut builder = FunctionDataBuilder::new_with_options(
+            func_env,
+            data,
+            FunctionDataBuilderOptions {
+                no_fallthrough_jump_removal: true,
+            },
+        );
+        let mut goto_fixes = vec![];
+        let code = std::mem::take(&mut builder.data.code);
+        for (offset, bytecode) in code.into_iter().enumerate() {
+            match bytecode {
+                Bytecode::Label(attr_id, label) => {
+                    builder.emit(bytecode);
+                    builder.set_loc_from_attr(attr_id);
+                    if let Some(loop_info) = loop_annotation.fat_loops.get(&label) {
+                        // assert loop invariants -> this is the base case
+                        for (attr_id, exp) in loop_info.invariants.values() {
+                            builder.set_loc_and_vc_info(
+                                builder.get_loc(*attr_id),
+                                LOOP_INVARIANT_BASE_FAILED,
+                            );
+                            builder.emit_with(|attr_id| {
+                                Bytecode::Prop(attr_id, PropKind::Assert, exp.clone())
+                            });
+                        }
+
+                        // havoc all loop targets
+                        for idx in &loop_info.val_targets {
+                            builder.emit_with(|attr_id| {
+                                Bytecode::Call(
+                                    attr_id,
+                                    vec![*idx],
+                                    Operation::Havoc(HavocKind::Value),
+                                    vec![],
+                                    None,
+                                )
+                            });
+                            // add a well-formed assumption explicitly and immediately
+                            let exp = builder.mk_call(
+                                &Type::Primitive(PrimitiveType::Bool),
+                                ast::Operation::WellFormed,
+                                vec![builder.mk_temporary(*idx)],
+                            );
+                            builder.emit_with(move |id| Bytecode::Prop(id, PropKind::Assume, exp));
+                        }
+                        for (idx, havoc_all) in &loop_info.mut_targets {
+                            let havoc_kind = if *havoc_all {
+                                HavocKind::MutationAll
+                            } else {
+                                HavocKind::MutationValue
+                            };
+                            builder.emit_with(|attr_id| {
+                                Bytecode::Call(
+                                    attr_id,
+                                    vec![*idx],
+                                    Operation::Havoc(havoc_kind),
+                                    vec![],
+                                    None,
+                                )
+                            });
+                            // add a well-formed assumption explicitly and immediately
+                            let exp = builder.mk_call(
+                                &Type::Primitive(PrimitiveType::Bool),
+                                ast::Operation::WellFormed,
+                                vec![builder.mk_temporary(*idx)],
+                            );
+                            builder.emit_with(move |id| Bytecode::Prop(id, PropKind::Assume, exp));
+                        }
+
+                        // trace implicitly reassigned variables after havocking
+                        let affected_variables: BTreeSet<_> = loop_info
+                            .val_targets
+                            .iter()
+                            .chain(loop_info.mut_targets.keys())
+                            .collect();
+
+                        // Only emit this for user declared locals, not for ones introduced
+                        // by stack elimination.
+                        let affected_non_temporary_variables: BTreeSet<_> = affected_variables
+                            .into_iter()
+                            .filter(|&idx| !func_env.is_temporary(*idx))
+                            .collect();
+
+                        if affected_non_temporary_variables.is_empty() {
+                            // no user declared local is havocked
+                            builder.set_next_debug_comment(format!(
+                                "info: enter loop {}",
+                                match loop_info.invariants.is_empty() {
+                                    true => "",
+                                    false => ", loop invariant holds at current state",
+                                }
+                            ));
+                        } else {
+                            // show the havocked locals to user
+                            let affected_non_temporary_variable_names: Vec<_> =
+                                affected_non_temporary_variables
+                                    .iter()
+                                    .map(|&idx| {
+                                        func_env
+                                            .symbol_pool()
+                                            .string(func_env.get_local_name(*idx))
+                                            .to_string()
+                                    })
+                                    .collect();
+                            let joined_variables_names_str =
+                                affected_non_temporary_variable_names.join(", ");
+                            builder.set_next_debug_comment(format!(
+                                "info: enter loop, variable(s) {} havocked and reassigned",
+                                joined_variables_names_str
+                            ));
+                        }
+
+                        // track the new values of havocked user declared locals
+                        for idx_ in &affected_non_temporary_variables {
+                            let idx = *idx_;
+                            builder.emit_with(|id| {
+                                Bytecode::Call(
+                                    id,
+                                    vec![],
+                                    Operation::TraceLocal(*idx),
+                                    vec![*idx],
+                                    None,
+                                )
+                            });
+                        }
+
+                        // after showing the havocked locals and their new values, show the following message
+                        if !affected_non_temporary_variables.is_empty()
+                            && !loop_info.invariants.is_empty()
+                        {
+                            builder.set_next_debug_comment(
+                                "info: loop invariant holds at current state".to_string(),
+                            );
+                        }
+
+                        // add an additional assumption that the loop did not abort
+                        let exp =
+                            builder.mk_not(builder.mk_bool_call(ast::Operation::AbortFlag, vec![]));
+                        builder.emit_with(|attr_id| Bytecode::Prop(attr_id, PropKind::Assume, exp));
+
+                        // re-assume loop invariants
+                        for (attr_id, exp) in loop_info.invariants.values() {
+                            builder.emit(Bytecode::Prop(*attr_id, PropKind::Assume, exp.clone()));
+                        }
+                    }
+                }
+                Bytecode::Prop(_, PropKind::Assert, _)
+                    if invariant_locs.contains(&(offset as CodeOffset)) =>
+                {
+                    // skip it, as the invariant should have been added as an assert after the label
+                }
+                _ => {
+                    builder.emit(bytecode);
+                }
+            }
+            // mark that the goto labels in this bytecode needs to be updated to a new label
+            // representing the invariant-checking block for the loop.
+            if back_edge_locs.contains(&(offset as CodeOffset)) {
+                goto_fixes.push(builder.data.code.len() - 1);
+            }
+        }
+
+        // create one invariant-checking block for each fat loop
+        let invariant_checker_labels: BTreeMap<_, _> = loop_annotation
+            .fat_loops
+            .keys()
+            .map(|label| (*label, builder.new_label()))
+            .collect();
+
+        for (label, loop_info) in &loop_annotation.fat_loops {
+            let checker_label = invariant_checker_labels.get(label).unwrap();
+            builder.set_next_debug_comment(format!(
+                "Loop invariant checking block for the loop started with header: L{}",
+                label.as_usize()
+            ));
+            builder.emit_with(|attr_id| Bytecode::Label(attr_id, *checker_label));
+            builder.clear_next_debug_comment();
+
+            // add instrumentations to assert loop invariants -> this is the induction case
+            for (attr_id, exp) in loop_info.invariants.values() {
+                builder.set_loc_and_vc_info(
+                    builder.get_loc(*attr_id),
+                    LOOP_INVARIANT_INDUCTION_FAILED,
+                );
+                builder.emit_with(|attr_id| Bytecode::Prop(attr_id, PropKind::Assert, exp.clone()));
+            }
+
+            // stop the checking in proving mode (branch back to loop header for interpretation mode)
+            builder.emit_with(|attr_id| {
+                if options.for_interpretation {
+                    Bytecode::Jump(attr_id, *label)
+                } else {
+                    Bytecode::Call(attr_id, vec![], Operation::Stop, vec![], None)
+                }
+            });
+        }
+
+        // fix the goto statements in the loop latch blocks
+        for code_offset in goto_fixes {
+            let updated_goto = match &builder.data.code[code_offset] {
+                Bytecode::Jump(attr_id, old_label) => {
+                    Bytecode::Jump(*attr_id, *invariant_checker_labels.get(old_label).unwrap())
+                }
+                Bytecode::Branch(attr_id, if_label, else_label, idx) => {
+                    let new_if_label = *invariant_checker_labels.get(if_label).unwrap_or(if_label);
+                    let new_else_label = *invariant_checker_labels
+                        .get(else_label)
+                        .unwrap_or(else_label);
+                    Bytecode::Branch(*attr_id, new_if_label, new_else_label, *idx)
+                }
+                _ => panic!("Expect a branch statement"),
+            };
+            builder.data.code[code_offset] = updated_goto;
+        }
+
+        // we have unrolled the loop into a DAG, and there will be no loop invariants left
+        builder.data.loop_invariants.clear();
+        builder.data
+    }
+
+    /// Collect invariants in the given loop header block
+    ///
+    /// Loop invariants are defined as
+    /// 1) the longest sequence of consecutive
+    /// 2) `PropKind::Assert` propositions
+    /// 3) in the loop header block, immediately after the `Label` statement,
+    /// 4) which are also marked in the `loop_invariants` field in the `FunctionData`.
+    /// All above conditions must be met to be qualified as a loop invariant.
+    ///
+    /// The reason we piggyback on `PropKind::Assert` instead of introducing a new
+    /// `PropKind::Invariant` is that we don't want to introduce a`PropKind::Invariant` type which
+    /// only exists to be eliminated. The same logic applies for other invariants in the system
+    /// (e.g., data invariants, global invariants, etc).
+    ///
+    /// In other words, for the loop header block:
+    /// - the first statement must be a `label`,
+    /// - followed by N `assert` statements, N >= 0
+    /// - all these N `assert` statements are marked as loop invariants,
+    /// - statement N + 1 is either not an `assert` or is not marked in `loop_invariants`.
+    fn collect_loop_invariants(
+        cfg: &StacklessControlFlowGraph,
+        func_target: &FunctionTarget<'_>,
+        loop_header: BlockId,
+    ) -> BTreeMap<CodeOffset, (AttrId, ast::Exp)> {
+        let code = func_target.get_bytecode();
+        let asserts_as_invariants = &func_target.data.loop_invariants;
+
+        let mut invariants = BTreeMap::new();
+        for (index, code_offset) in cfg.instr_indexes(loop_header).unwrap().enumerate() {
+            let bytecode = &code[code_offset as usize];
+            if index == 0 {
+                assert!(matches!(bytecode, Bytecode::Label(_, _)));
+            } else {
+                match bytecode {
+                    Bytecode::Prop(attr_id, PropKind::Assert, exp)
+                        if asserts_as_invariants.contains(attr_id) =>
+                    {
+                        invariants.insert(code_offset, (*attr_id, exp.clone()));
+                    }
+                    _ => break,
+                }
+            }
+        }
+        invariants
+    }
+
+    /// Collect variables that may be changed during the loop execution.
+    ///
+    /// The input to this function should include all the sub loops that constitute a fat-loop.
+    /// This function will return two sets of variables that represents, respectively,
+    /// - the set of values to be havoc-ed, and
+    /// - the set of mutations to he havoc-ed and how they should be havoc-ed.
+    fn collect_loop_targets(
+        cfg: &StacklessControlFlowGraph,
+        func_target: &FunctionTarget<'_>,
+        sub_loops: &[NaturalLoop<BlockId>],
+    ) -> (BTreeSet<TempIndex>, BTreeMap<TempIndex, bool>) {
+        let code = func_target.get_bytecode();
+        let mut val_targets = BTreeSet::new();
+        let mut mut_targets = BTreeMap::new();
+        let fat_loop_body: BTreeSet<_> = sub_loops
+            .iter()
+            .flat_map(|l| l.loop_body.iter())
+            .copied()
+            .collect();
+        for block_id in fat_loop_body {
+            for code_offset in cfg
+                .instr_indexes(block_id)
+                .expect("A loop body should never contain a dummy block")
+            {
+                let bytecode = &code[code_offset as usize];
+                let (bc_val_targets, bc_mut_targets) = bytecode.modifies(func_target);
+                val_targets.extend(bc_val_targets);
+                for (idx, is_full_havoc) in bc_mut_targets {
+                    mut_targets
+                        .entry(idx)
+                        .and_modify(|v| {
+                            *v = *v || is_full_havoc;
+                        })
+                        .or_insert(is_full_havoc);
+                }
+            }
+        }
+        (val_targets, mut_targets)
+    }
+
+    /// Collect code offsets that are branch instructions forming loop back-edges
+    ///
+    /// The input to this function should include all the sub loops that constitute a fat-loop.
+    /// This function will return one back-edge location for each sub loop.
+    fn collect_loop_back_edges(
+        code: &[Bytecode],
+        cfg: &StacklessControlFlowGraph,
+        header_label: Label,
+        sub_loops: &[NaturalLoop<BlockId>],
+    ) -> BTreeSet<CodeOffset> {
+        sub_loops
+            .iter()
+            .map(|l| {
+                let code_offset = match cfg.content(l.loop_latch) {
+                    BlockContent::Dummy => {
+                        panic!("A loop body should never contain a dummy block")
+                    }
+                    BlockContent::Basic { upper, .. } => *upper,
+                };
+                match &code[code_offset as usize] {
+                    Bytecode::Jump(_, goto_label) if *goto_label == header_label => {}
+                    Bytecode::Branch(_, if_label, else_label, _)
+                        if *if_label == header_label || *else_label == header_label => {}
+                    _ => panic!("The latch bytecode of a loop does not branch into the header"),
+                };
+                code_offset
+            })
+            .collect()
+    }
+
+    /// Find all loops in the function and collect information needed for invariant instrumentation
+    /// and loop-to-DAG transformation.
+    fn build_loop_annotation(func_env: &FunctionEnv<'_>, data: &FunctionData) -> LoopAnnotation {
+        // build for natural loops
+        let func_target = FunctionTarget::new(func_env, data);
+        let code = func_target.get_bytecode();
+        let cfg = StacklessControlFlowGraph::new_forward(code);
+        let entry = cfg.entry_block();
+        let nodes = cfg.blocks();
+        let edges: Vec<(BlockId, BlockId)> = nodes
+            .iter()
+            .flat_map(|x| {
+                cfg.successors(*x)
+                    .iter()
+                    .map(|y| (*x, *y))
+                    .collect::<Vec<(BlockId, BlockId)>>()
+            })
+            .collect();
+        let graph = Graph::new(entry, nodes, edges);
+        let natural_loops = graph.compute_reducible().expect(
+            "A well-formed Move function is expected to have a reducible control-flow graph",
+        );
+
+        // collect shared headers from loops
+        let mut fat_headers = BTreeMap::new();
+        for single_loop in natural_loops {
+            fat_headers
+                .entry(single_loop.loop_header)
+                .or_insert_with(Vec::new)
+                .push(single_loop);
+        }
+
+        // build fat loops by label
+        let mut fat_loops = BTreeMap::new();
+        for (fat_root, sub_loops) in fat_headers {
+            // get the label of the scc root
+            let label = match cfg.content(fat_root) {
+                BlockContent::Dummy => panic!("A loop header should never be a dummy block"),
+                BlockContent::Basic { lower, upper: _ } => match code[*lower as usize] {
+                    Bytecode::Label(_, label) => label,
+                    _ => panic!("A loop header block is expected to start with a Label bytecode"),
+                },
+            };
+
+            let invariants = Self::collect_loop_invariants(&cfg, &func_target, fat_root);
+            let (val_targets, mut_targets) =
+                Self::collect_loop_targets(&cfg, &func_target, &sub_loops);
+            let back_edges = Self::collect_loop_back_edges(code, &cfg, label, &sub_loops);
+
+            // done with all information collection.
+            fat_loops.insert(
+                label,
+                FatLoop {
+                    invariants,
+                    val_targets,
+                    mut_targets,
+                    back_edges,
+                },
+            );
+        }
+
+        // check for redundant loop invariant declarations in the spec
+        let all_invariants: BTreeSet<_> = fat_loops
+            .values()
+            .flat_map(|l| l.invariants.values().map(|(attr_id, _)| *attr_id))
+            .collect();
+
+        let env = func_target.global_env();
+        for attr_id in data.loop_invariants.difference(&all_invariants) {
+            env.error(
+                &func_target.get_bytecode_loc(*attr_id),
+                "Loop invariants must be declared at the beginning of the loop header in a \
+                consecutive sequence",
+            );
+        }
+
+        LoopAnnotation { fat_loops }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/memory_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/memory_instrumentation.rs
new file mode 100644
index 000000000..40190d51e
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/memory_instrumentation.rs
@@ -0,0 +1,348 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::ConditionKind,
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, StructEnv},
+    ty::{Type, BOOL_TYPE},
+};
+
+use crate::{
+    borrow_analysis::{BorrowAnnotation, WriteBackAction},
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{
+        BorrowNode,
+        Bytecode::{self, *},
+        Operation,
+    },
+};
+
+pub struct MemoryInstrumentationProcessor {}
+
+impl MemoryInstrumentationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(MemoryInstrumentationProcessor {})
+    }
+}
+
+impl FunctionTargetProcessor for MemoryInstrumentationProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if func_env.is_native_or_intrinsic() {
+            return data;
+        }
+        let borrow_annotation = data
+            .annotations
+            .remove::<BorrowAnnotation>()
+            .expect("borrow annotation");
+        let mut builder = FunctionDataBuilder::new(func_env, data);
+        let code = std::mem::take(&mut builder.data.code);
+        let mut instrumenter = Instrumenter::new(builder, &borrow_annotation);
+        for (code_offset, bytecode) in code.into_iter().enumerate() {
+            instrumenter.instrument(code_offset as CodeOffset, bytecode);
+        }
+        instrumenter.builder.data
+    }
+
+    fn name(&self) -> String {
+        "memory_instr".to_string()
+    }
+}
+
+struct Instrumenter<'a> {
+    builder: FunctionDataBuilder<'a>,
+    borrow_annotation: &'a BorrowAnnotation,
+}
+
+impl<'a> Instrumenter<'a> {
+    fn new(builder: FunctionDataBuilder<'a>, borrow_annotation: &'a BorrowAnnotation) -> Self {
+        Self {
+            builder,
+            borrow_annotation,
+        }
+    }
+
+    fn instrument(&mut self, code_offset: CodeOffset, bytecode: Bytecode) {
+        if bytecode.is_branch()
+            || matches!(bytecode, Bytecode::Call(_, _, Operation::Destroy, _, _))
+        {
+            // Add memory instrumentation before instruction.
+            self.memory_instrumentation(code_offset, &bytecode);
+            self.builder.emit(bytecode);
+        } else {
+            self.builder.emit(bytecode.clone());
+            self.memory_instrumentation(code_offset, &bytecode);
+        }
+    }
+
+    /// Determines whether the type needs a pack ref.
+    fn is_pack_ref_ty(&self, ty: &Type) -> bool {
+        use Type::*;
+        let env = self.builder.global_env();
+        match ty.skip_reference() {
+            Struct(mid, sid, inst) => {
+                self.is_pack_ref_struct(&env.get_struct_qid(mid.qualified(*sid)))
+                    || inst.iter().any(|t| self.is_pack_ref_ty(t))
+            }
+            Vector(et) => self.is_pack_ref_ty(et.as_ref()),
+            Primitive(_)
+            | Tuple(_)
+            | TypeParameter(_)
+            | Reference(_, _)
+            | Fun(_, _)
+            | TypeDomain(_)
+            | ResourceDomain(_, _, _)
+            | Error
+            | Var(_) => false,
+        }
+    }
+
+    /// Determines whether the struct needs a pack ref.
+    fn is_pack_ref_struct(&self, struct_env: &StructEnv<'_>) -> bool {
+        struct_env.get_spec().any_kind(ConditionKind::StructInvariant)
+        // If any of the fields has it, it inherits to the struct.
+        ||  struct_env
+            .get_fields()
+            .any(|fe| self.is_pack_ref_ty(&fe.get_type()))
+    }
+
+    /// Calculate the differentiating factor for a particular write-back chain (among the tree)
+    fn get_differentiation_factors(tree: &[Vec<WriteBackAction>], index: usize) -> BTreeSet<usize> {
+        // utility function to first the first different action among two chains
+        fn index_of_first_different_action(
+            base: &[WriteBackAction],
+            another: &[WriteBackAction],
+        ) -> usize {
+            for ((i, a1), a2) in base.iter().enumerate().zip(another.iter()) {
+                if a1 != a2 {
+                    return i;
+                }
+            }
+            unreachable!("Two write-back action chains cannot be exactly the same");
+        }
+
+        // derive all the borrow edges that uniquely differentiate this chain
+        let base = &tree[index];
+        let diffs = tree
+            .iter()
+            .enumerate()
+            .filter_map(|(i, chain)| {
+                if i == index {
+                    None
+                } else {
+                    Some(index_of_first_different_action(base, chain))
+                }
+            })
+            .collect();
+
+        // return the indices of the actions that differentiate this borrow chain
+        diffs
+    }
+
+    fn memory_instrumentation(&mut self, code_offset: CodeOffset, bytecode: &Bytecode) {
+        let param_count = self.builder.get_target().get_parameter_count();
+
+        let borrow_annotation_at = self
+            .borrow_annotation
+            .get_borrow_info_at(code_offset)
+            .unwrap();
+        let before = &borrow_annotation_at.before;
+        let after = &borrow_annotation_at.after;
+
+        // Generate UnpackRef from Borrow instructions.
+        if let Call(attr_id, dests, op, _, _) = bytecode {
+            use Operation::*;
+            match op {
+                BorrowLoc | BorrowField(..) | BorrowGlobal(..) => {
+                    let ty = &self
+                        .builder
+                        .get_target()
+                        .get_local_type(dests[0])
+                        .to_owned();
+                    let node = BorrowNode::Reference(dests[0]);
+                    if self.is_pack_ref_ty(ty) && after.is_in_use(&node) {
+                        self.builder.set_loc_from_attr(*attr_id);
+                        self.builder.emit_with(|id| {
+                            Bytecode::Call(id, vec![], Operation::UnpackRef, vec![dests[0]], None)
+                        });
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        // Generate PackRef for nodes which go out of scope, as well as WriteBack.
+        let attr_id = bytecode.get_attr_id();
+        self.builder.set_loc_from_attr(attr_id);
+
+        for (node, ancestors) in before.dying_nodes(after) {
+            // we only care about references that occurs in the function body
+            let node_idx = match node {
+                BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                    continue;
+                }
+                BorrowNode::Reference(idx) => {
+                    if idx < param_count {
+                        // NOTE: we have an entry-point assumption where a &mut parameter must
+                        // have its data invariants hold. As a result, when we write-back the
+                        // references, we should assert that the data invariant still hold.
+                        //
+                        // This, however, does not apply to &mut references we obtained in the
+                        // function body, i.e., by borrow local or borrow global. These cases
+                        // are handled by the `pre_writeback_check_opt` (see below).
+                        let target = self.builder.get_target();
+                        let ty = target.get_local_type(idx);
+                        if self.is_pack_ref_ty(ty) {
+                            self.builder.emit_with(|id| {
+                                Bytecode::Call(id, vec![], Operation::PackRefDeep, vec![idx], None)
+                            });
+                        }
+                        continue;
+                    }
+                    idx
+                }
+                BorrowNode::ReturnPlaceholder(..) => {
+                    unreachable!("Unexpected placeholder borrow node");
+                }
+            };
+
+            // Generate write_back for this reference.
+            let is_conditional = ancestors.len() > 1;
+            for (chain_index, chain) in ancestors.iter().enumerate() {
+                // sanity check: the src node of the first action must be the node itself
+                assert_eq!(
+                    chain
+                        .first()
+                        .expect("The write-back chain should contain at action")
+                        .src,
+                    node_idx
+                );
+
+                // decide on whether we need IsParent checks and how to instrument the checks
+                let skip_label_opt = if is_conditional {
+                    let factors = Self::get_differentiation_factors(&ancestors, chain_index);
+                    let mut last_is_parent_temp = None;
+
+                    for idx in factors {
+                        let action = &chain[idx];
+                        let temp = self.builder.new_temp(BOOL_TYPE.clone());
+                        self.builder.emit_with(|id| {
+                            Bytecode::Call(
+                                id,
+                                vec![temp],
+                                Operation::IsParent(action.dst.clone(), action.edge.clone()),
+                                vec![action.src],
+                                None,
+                            )
+                        });
+
+                        let combined_temp = match last_is_parent_temp {
+                            None => temp,
+                            Some(last_temp) => {
+                                let temp_conjunction = self.builder.new_temp(BOOL_TYPE.clone());
+                                self.builder.emit_with(|id| {
+                                    Bytecode::Call(
+                                        id,
+                                        vec![temp_conjunction],
+                                        Operation::And,
+                                        vec![last_temp, temp],
+                                        None,
+                                    )
+                                });
+                                temp_conjunction
+                            }
+                        };
+                        last_is_parent_temp = Some(combined_temp);
+                    }
+
+                    let update_label = self.builder.new_label();
+                    let skip_label = self.builder.new_label();
+                    self.builder.emit_with(|id| {
+                        Bytecode::Branch(
+                            id,
+                            update_label,
+                            skip_label,
+                            last_is_parent_temp
+                                .expect("There should be at least one IsParent call for a conditional write-back"),
+                        )
+                    });
+                    self.builder
+                        .emit_with(|id| Bytecode::Label(id, update_label));
+                    Some(skip_label)
+                } else {
+                    None
+                };
+
+                // issue a chain of write-back actions
+                for action in chain {
+                    // decide if we need a pre-writeback pack-ref (i.e., data structure invariant checking)
+                    let pre_writeback_check_opt = match &action.dst {
+                        BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                            // On write-back to a root, "pack" the reference, i.e. validate all its invariants.
+                            let target = self.builder.get_target();
+                            let ty = target.get_local_type(action.src);
+                            if self.is_pack_ref_ty(ty) {
+                                Some(action.src)
+                            } else {
+                                None
+                            }
+                        }
+                        BorrowNode::Reference(..) => None,
+                        BorrowNode::ReturnPlaceholder(..) => unreachable!("invalid placeholder"),
+                    };
+                    if let Some(idx) = pre_writeback_check_opt {
+                        self.builder.emit_with(|id| {
+                            Bytecode::Call(id, vec![], Operation::PackRefDeep, vec![idx], None)
+                        });
+                    }
+
+                    // emit the write-back
+                    self.builder.emit_with(|id| {
+                        Bytecode::Call(
+                            id,
+                            vec![],
+                            Operation::WriteBack(action.dst.clone(), action.edge.clone()),
+                            vec![action.src],
+                            None,
+                        )
+                    });
+
+                    // add a trace for written back value if it's a user variable.
+                    match action.dst {
+                        BorrowNode::LocalRoot(temp) | BorrowNode::Reference(temp) => {
+                            if temp < self.builder.fun_env.get_local_count() {
+                                self.builder.emit_with(|id| {
+                                    Bytecode::Call(
+                                        id,
+                                        vec![],
+                                        Operation::TraceLocal(temp),
+                                        vec![temp],
+                                        None,
+                                    )
+                                });
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+
+                // continued from IsParent check
+                if let Some(label) = skip_label_opt {
+                    self.builder.emit_with(|id| Bytecode::Label(id, label));
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/mono_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/mono_analysis.rs
new file mode 100644
index 000000000..d682ed1fa
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/mono_analysis.rs
@@ -0,0 +1,591 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Analysis which computes information needed in backends for monomorphization. This
+//! computes the distinct type instantiations in the model for structs and inlined functions.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+    rc::Rc,
+};
+
+use itertools::Itertools;
+
+use move_model::{
+    ast,
+    ast::{Condition, ConditionKind, ExpData},
+    model::{
+        FunId, GlobalEnv, ModuleId, QualifiedId, QualifiedInstId, SpecFunId, SpecVarId, StructEnv,
+        StructId,
+    },
+    pragmas::INTRINSIC_TYPE_MAP,
+    ty::{Type, TypeDisplayContext, TypeInstantiationDerivation, TypeUnificationAdapter, Variance},
+    well_known::{
+        TYPE_INFO_MOVE, TYPE_INFO_SPEC, TYPE_NAME_GET_MOVE, TYPE_NAME_GET_SPEC, TYPE_NAME_MOVE,
+        TYPE_NAME_SPEC, TYPE_SPEC_IS_STRUCT,
+    },
+};
+
+use crate::{
+    function_target::FunctionTarget,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    stackless_bytecode::{BorrowEdge, Bytecode, Operation},
+    usage_analysis::UsageProcessor,
+};
+
+/// The environment extension computed by this analysis.
+#[derive(Clone, Default, Debug)]
+pub struct MonoInfo {
+    pub structs: BTreeMap<QualifiedId<StructId>, BTreeSet<Vec<Type>>>,
+    pub funs: BTreeMap<(QualifiedId<FunId>, FunctionVariant), BTreeSet<Vec<Type>>>,
+    pub spec_funs: BTreeMap<QualifiedId<SpecFunId>, BTreeSet<Vec<Type>>>,
+    pub spec_vars: BTreeMap<QualifiedId<SpecVarId>, BTreeSet<Vec<Type>>>,
+    pub type_params: BTreeSet<u16>,
+    pub vec_inst: BTreeSet<Type>,
+    pub table_inst: BTreeMap<QualifiedId<StructId>, BTreeSet<(Type, Type)>>,
+    pub native_inst: BTreeMap<ModuleId, BTreeSet<Vec<Type>>>,
+    pub all_types: BTreeSet<Type>,
+    pub axioms: Vec<(Condition, Vec<Vec<Type>>)>,
+}
+
+/// Get the information computed by this analysis.
+pub fn get_info(env: &GlobalEnv) -> Rc<MonoInfo> {
+    env.get_extension::<MonoInfo>()
+        .unwrap_or_else(|| Rc::new(MonoInfo::default()))
+}
+
+pub struct MonoAnalysisProcessor();
+
+impl MonoAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self())
+    }
+}
+
+/// This processor computes monomorphization information for backends.
+impl FunctionTargetProcessor for MonoAnalysisProcessor {
+    fn name(&self) -> String {
+        "mono_analysis".to_owned()
+    }
+
+    fn is_single_run(&self) -> bool {
+        true
+    }
+
+    fn run(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        self.analyze(env, targets);
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut fmt::Formatter,
+        env: &GlobalEnv,
+        _targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        writeln!(f, "\n\n==== mono-analysis result ====\n")?;
+        let info = env
+            .get_extension::<MonoInfo>()
+            .expect("monomorphization analysis not run");
+        let tctx = TypeDisplayContext::WithEnv {
+            env,
+            type_param_names: None,
+        };
+        let display_inst = |tys: &[Type]| {
+            tys.iter()
+                .map(|ty| ty.display(&tctx).to_string())
+                .join(", ")
+        };
+        for (sid, insts) in &info.structs {
+            let sname = env.get_struct(*sid).get_full_name_str();
+            writeln!(f, "struct {} = {{", sname)?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+        for ((fid, variant), insts) in &info.funs {
+            let fname = env.get_function(*fid).get_full_name_str();
+            writeln!(f, "fun {} [{}] = {{", fname, variant)?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+        for (fid, insts) in &info.spec_funs {
+            let module_env = env.get_module(fid.module_id);
+            let decl = module_env.get_spec_fun(fid.id);
+            let mname = module_env.get_full_name_str();
+            let fname = decl.name.display(env.symbol_pool());
+            writeln!(f, "spec fun {}::{} = {{", mname, fname)?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+        for (module, insts) in &info.native_inst {
+            writeln!(
+                f,
+                "module {} = {{",
+                env.get_module(*module).get_full_name_str()
+            )?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+        for (cond, insts) in &info.axioms {
+            writeln!(f, "axiom {} = {{", cond.loc.display(env))?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+
+        Ok(())
+    }
+}
+
+// Instantiation Analysis
+// ======================
+
+impl MonoAnalysisProcessor {
+    fn analyze<'a>(&self, env: &'a GlobalEnv, targets: &'a FunctionTargetsHolder) {
+        let mut analyzer = Analyzer {
+            env,
+            targets,
+            info: MonoInfo::default(),
+            todo_funs: vec![],
+            done_funs: BTreeSet::new(),
+            todo_spec_funs: vec![],
+            done_spec_funs: BTreeSet::new(),
+            done_types: BTreeSet::new(),
+            inst_opt: None,
+        };
+        // Analyze axioms found in modules.
+        for module_env in env.get_modules() {
+            for axiom in module_env.get_spec().filter_kind_axiom() {
+                analyzer.analyze_exp(&axiom.exp)
+            }
+        }
+        // Analyze functions
+        analyzer.analyze_funs();
+        let Analyzer {
+            mut info,
+            done_types,
+            ..
+        } = analyzer;
+        info.all_types = done_types;
+        env.set_extension(info);
+    }
+}
+
+struct Analyzer<'a> {
+    env: &'a GlobalEnv,
+    targets: &'a FunctionTargetsHolder,
+    info: MonoInfo,
+    todo_funs: Vec<(QualifiedId<FunId>, FunctionVariant, Vec<Type>)>,
+    done_funs: BTreeSet<(QualifiedId<FunId>, FunctionVariant, Vec<Type>)>,
+    todo_spec_funs: Vec<(QualifiedId<SpecFunId>, Vec<Type>)>,
+    done_spec_funs: BTreeSet<(QualifiedId<SpecFunId>, Vec<Type>)>,
+    done_types: BTreeSet<Type>,
+    inst_opt: Option<Vec<Type>>,
+}
+
+impl<'a> Analyzer<'a> {
+    fn analyze_funs(&mut self) {
+        // Analyze top-level, verified functions. Any functions they call will be queued
+        // in self.todo_targets for later analysis. During this phase, self.inst_opt is None.
+        for module in self.env.get_modules() {
+            for fun in module.get_functions() {
+                for (variant, target) in self.targets.get_targets(&fun) {
+                    if !variant.is_verified() {
+                        continue;
+                    }
+                    self.analyze_fun(target.clone());
+
+                    // We also need to analyze all modify targets because they are not
+                    // included in the bytecode.
+                    for (_, exps) in target.get_modify_ids_and_exps() {
+                        for exp in exps {
+                            self.analyze_exp(exp);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Next do todo-list for regular functions, while self.inst_opt contains the
+        // specific instantiation.
+        while let Some((fun, variant, inst)) = self.todo_funs.pop() {
+            self.inst_opt = Some(inst);
+            self.analyze_fun(
+                self.targets
+                    .get_target(&self.env.get_function(fun), &variant),
+            );
+            let inst = std::mem::take(&mut self.inst_opt).unwrap();
+            // Insert it into final analysis result.
+            self.info
+                .funs
+                .entry((fun, variant.clone()))
+                .or_default()
+                .insert(inst.clone());
+            self.done_funs.insert((fun, variant, inst));
+        }
+
+        // Next do axioms, based on the types discovered for regular functions.
+        let axioms = self.compute_axiom_instances();
+        for (cond, insts) in axioms {
+            for inst in &insts {
+                self.inst_opt = Some(inst.clone());
+                self.analyze_exp(&cond.exp);
+            }
+            self.info.axioms.push((cond, insts))
+        }
+
+        // Finally do spec functions, after all regular functions and axioms are done.
+        while let Some((fun, inst)) = self.todo_spec_funs.pop() {
+            self.inst_opt = Some(inst);
+            self.analyze_spec_fun(fun);
+            let inst = std::mem::take(&mut self.inst_opt).unwrap();
+            // Insert it into final analysis result.
+            self.info
+                .spec_funs
+                .entry(fun)
+                .or_default()
+                .insert(inst.clone());
+            self.done_spec_funs.insert((fun, inst));
+        }
+    }
+
+    /// Analyze axioms, computing all the instantiations needed. We over-approximate the
+    /// instantiations by using the cartesian product of all known types. As the number of
+    /// type parameters for axioms is restricted to 2, the number of instantiations
+    /// should stay in range. Since each axiom instance is eventually instantiated for
+    /// distinct types, unnecessary axioms should be ignorable by the SMT solver, avoiding
+    /// over-triggering.
+    fn compute_axiom_instances(&self) -> Vec<(Condition, Vec<Vec<Type>>)> {
+        let mut axioms = vec![];
+        let all_types = self
+            .done_types
+            .iter()
+            .filter(|t| t.can_be_type_argument())
+            .cloned()
+            .collect::<Vec<_>>();
+        for module_env in self.env.get_modules() {
+            for cond in &module_env.get_spec().conditions {
+                if let ConditionKind::Axiom(params) = &cond.kind {
+                    let type_insts = match params.len() {
+                        0 => vec![vec![]],
+                        1 => all_types.iter().cloned().map(|t| vec![t]).collect(),
+                        2 => itertools::iproduct!(
+                            all_types.iter().cloned(),
+                            all_types.iter().cloned()
+                        )
+                        .map(|(x, y)| vec![x, y])
+                        .collect(),
+                        _ => {
+                            self.env.error(
+                                &cond.loc,
+                                "axioms cannot have more than two type parameters",
+                            );
+                            vec![]
+                        }
+                    };
+                    axioms.push((cond.clone(), type_insts));
+                }
+            }
+        }
+        axioms
+    }
+
+    fn analyze_fun(&mut self, target: FunctionTarget<'_>) {
+        // Analyze function locals and return value types.
+        for idx in 0..target.get_local_count() {
+            self.add_type_root(target.get_local_type(idx));
+        }
+        for ty in target.get_return_types().iter() {
+            self.add_type_root(ty);
+        }
+        // Analyze code.
+        if !target.func_env.is_native_or_intrinsic() {
+            for bc in target.get_bytecode() {
+                self.analyze_bytecode(&target, bc);
+            }
+        }
+        // Analyze instantiations (when this function is a verification target)
+        if self.inst_opt.is_none() {
+            // collect information
+            let fun_type_params_arity = target.get_type_parameter_count();
+            let usage_state = UsageProcessor::analyze(self.targets, target.func_env, target.data);
+
+            // collect instantiations
+            let mut all_insts = BTreeSet::new();
+            for lhs_m in usage_state.accessed.all.iter() {
+                let lhs_ty = lhs_m.to_type();
+                for rhs_m in usage_state.accessed.all.iter() {
+                    let rhs_ty = rhs_m.to_type();
+
+                    // make sure these two types unify before trying to instantiate them
+                    let adapter = TypeUnificationAdapter::new_pair(&lhs_ty, &rhs_ty, true, true);
+                    if adapter.unify(Variance::Allow, false).is_none() {
+                        continue;
+                    }
+
+                    // find all instantiation combinations given by this unification
+                    let fun_insts = TypeInstantiationDerivation::progressive_instantiation(
+                        std::iter::once(&lhs_ty),
+                        std::iter::once(&rhs_ty),
+                        true,
+                        false,
+                        true,
+                        false,
+                        fun_type_params_arity,
+                        true,
+                        false,
+                    );
+                    all_insts.extend(fun_insts);
+                }
+            }
+
+            // mark all the instantiated targets as todo
+            for fun_inst in all_insts {
+                self.todo_funs.push((
+                    target.func_env.get_qualified_id(),
+                    target.data.variant.clone(),
+                    fun_inst,
+                ));
+            }
+        }
+    }
+
+    fn analyze_bytecode(&mut self, _target: &FunctionTarget<'_>, bc: &Bytecode) {
+        use Bytecode::*;
+        use Operation::*;
+        // We only need to analyze function calls, not `pack` or other instructions
+        // because the types those are using are reflected in locals which are analyzed
+        // elsewhere.
+        match bc {
+            Call(_, _, Function(mid, fid, targs), ..) => {
+                let module_env = &self.env.get_module(*mid);
+                let callee_env = module_env.get_function(*fid);
+                let actuals = self.instantiate_vec(targs);
+
+                // the type reflection functions are specially handled here
+                if self.env.get_extlib_address() == *module_env.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module_env.get_name().name().display(self.env.symbol_pool()),
+                        callee_env.get_name().display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_MOVE || qualified_name == TYPE_INFO_MOVE {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+                if self.env.get_stdlib_address() == *module_env.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module_env.get_name().name().display(self.env.symbol_pool()),
+                        callee_env.get_name().display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_GET_MOVE {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+
+                if callee_env.is_native_or_intrinsic() && !actuals.is_empty() {
+                    // Mark the associated module to be instantiated with the given actuals.
+                    // This will instantiate all functions in the module with matching number
+                    // of type parameters.
+                    self.info
+                        .native_inst
+                        .entry(callee_env.module_env.get_id())
+                        .or_default()
+                        .insert(actuals);
+                } else if !callee_env.is_opaque() {
+                    // This call needs to be inlined, with targs instantiated by self.inst_opt.
+                    // Schedule for later processing if this instance has not been processed yet.
+                    let entry = (mid.qualified(*fid), FunctionVariant::Baseline, actuals);
+                    if !self.done_funs.contains(&entry) {
+                        self.todo_funs.push(entry);
+                    }
+                }
+            }
+            Call(_, _, WriteBack(_, edge), ..) => {
+                // In very rare occasions, not all types used in the function can appear in
+                // function parameters, locals, and return values. Types hidden in the write-back
+                // chain of a hyper edge is one such case. Therefore, we need an extra processing
+                // to collect types used in borrow edges.
+                //
+                // TODO(mengxu): need to revisit this once the modeling for dynamic borrow is done
+                self.add_types_in_borrow_edge(edge)
+            }
+            Prop(_, _, exp) => self.analyze_exp(exp),
+            SaveMem(_, _, mem) => {
+                let mem = self.instantiate_mem(mem.to_owned());
+                let struct_env = self.env.get_struct_qid(mem.to_qualified_id());
+                self.add_struct(struct_env, &mem.inst);
+            }
+            _ => {}
+        }
+    }
+
+    fn instantiate_vec(&self, targs: &[Type]) -> Vec<Type> {
+        if let Some(inst) = &self.inst_opt {
+            Type::instantiate_slice(targs, inst)
+        } else {
+            targs.to_owned()
+        }
+    }
+
+    fn instantiate_mem(&self, mem: QualifiedInstId<StructId>) -> QualifiedInstId<StructId> {
+        if let Some(inst) = &self.inst_opt {
+            mem.instantiate(inst)
+        } else {
+            mem
+        }
+    }
+
+    // Expression and Spec Fun Analysis
+    // --------------------------------
+
+    fn analyze_spec_fun(&mut self, fun: QualifiedId<SpecFunId>) {
+        let module_env = self.env.get_module(fun.module_id);
+        let decl = module_env.get_spec_fun(fun.id);
+        for (_, ty) in &decl.params {
+            self.add_type_root(ty)
+        }
+        self.add_type_root(&decl.result_type);
+        if let Some(exp) = &decl.body {
+            self.analyze_exp(exp)
+        }
+    }
+
+    fn analyze_exp(&mut self, exp: &ExpData) {
+        exp.visit(&mut |e| {
+            let node_id = e.node_id();
+            self.add_type_root(&self.env.get_node_type(node_id));
+            for ref ty in self.env.get_node_instantiation(node_id) {
+                self.add_type_root(ty);
+            }
+            if let ExpData::Call(node_id, ast::Operation::Function(mid, fid, _), _) = e {
+                let actuals = self.instantiate_vec(&self.env.get_node_instantiation(*node_id));
+                let module = self.env.get_module(*mid);
+                let spec_fun = module.get_spec_fun(*fid);
+
+                // the type reflection functions are specially handled here
+                if self.env.get_extlib_address() == *module.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module.get_name().name().display(self.env.symbol_pool()),
+                        spec_fun.name.display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_SPEC
+                        || qualified_name == TYPE_INFO_SPEC
+                        || qualified_name == TYPE_SPEC_IS_STRUCT
+                    {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+                if self.env.get_stdlib_address() == *module.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module.get_name().name().display(self.env.symbol_pool()),
+                        spec_fun.name.display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_GET_SPEC {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+
+                if spec_fun.is_native && !actuals.is_empty() {
+                    // Add module to native modules
+                    self.info
+                        .native_inst
+                        .entry(module.get_id())
+                        .or_default()
+                        .insert(actuals);
+                } else {
+                    let entry = (mid.qualified(*fid), actuals);
+                    // Only if this call has not been processed yet, queue it for future processing.
+                    if !self.done_spec_funs.contains(&entry) {
+                        self.todo_spec_funs.push(entry);
+                    }
+                }
+            }
+        });
+    }
+
+    // Type Analysis
+    // -------------
+
+    fn add_type_root(&mut self, ty: &Type) {
+        if let Some(inst) = &self.inst_opt {
+            let ty = ty.instantiate(inst);
+            self.add_type(&ty)
+        } else {
+            self.add_type(ty)
+        }
+    }
+
+    fn add_type(&mut self, ty: &Type) {
+        if !self.done_types.insert(ty.to_owned()) {
+            return;
+        }
+        ty.visit(&mut |t| match t {
+            Type::Vector(et) => {
+                self.info.vec_inst.insert(et.as_ref().clone());
+            }
+            Type::Struct(mid, sid, targs) => {
+                self.add_struct(self.env.get_module(*mid).into_struct(*sid), targs)
+            }
+            Type::TypeParameter(idx) => {
+                self.info.type_params.insert(*idx);
+            }
+            _ => {}
+        });
+    }
+
+    fn add_struct(&mut self, struct_: StructEnv<'_>, targs: &[Type]) {
+        if struct_.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+            self.info
+                .table_inst
+                .entry(struct_.get_qualified_id())
+                .or_default()
+                .insert((targs[0].clone(), targs[1].clone()));
+        } else if struct_.is_native_or_intrinsic() && !targs.is_empty() {
+            self.info
+                .native_inst
+                .entry(struct_.module_env.get_id())
+                .or_default()
+                .insert(targs.to_owned());
+        } else {
+            self.info
+                .structs
+                .entry(struct_.get_qualified_id())
+                .or_default()
+                .insert(targs.to_owned());
+            for field in struct_.get_fields() {
+                self.add_type(&field.get_type().instantiate(targs));
+            }
+        }
+    }
+
+    // Utility functions
+    // -----------------
+
+    fn add_types_in_borrow_edge(&mut self, edge: &BorrowEdge) {
+        match edge {
+            BorrowEdge::Direct | BorrowEdge::Index(_) => (),
+            BorrowEdge::Field(qid, _) => {
+                self.add_type_root(&qid.to_type());
+            }
+            BorrowEdge::Hyper(edges) => {
+                for item in edges {
+                    self.add_types_in_borrow_edge(item);
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/mut_ref_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/mut_ref_instrumentation.rs
new file mode 100644
index 000000000..0cae43962
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/mut_ref_instrumentation.rs
@@ -0,0 +1,85 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use itertools::Itertools;
+
+use move_model::{ast::TempIndex, model::FunctionEnv};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{AssignKind, Bytecode, Operation},
+};
+
+pub struct MutRefInstrumenter {}
+
+impl MutRefInstrumenter {
+    pub fn new() -> Box<Self> {
+        Box::new(MutRefInstrumenter {})
+    }
+}
+
+impl FunctionTargetProcessor for MutRefInstrumenter {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if fun_env.is_native() {
+            return data;
+        }
+
+        let mut builder = FunctionDataBuilder::new(fun_env, data);
+
+        // Compute &mut parameters.
+        let param_count = builder.get_target().get_parameter_count();
+        let mut_ref_params = (0..param_count)
+            .filter(|idx| is_mut_ref(&builder, *idx))
+            .collect_vec();
+
+        // Transform bytecode.
+        for bc in std::mem::take(&mut builder.data.code) {
+            use Bytecode::*;
+            use Operation::*;
+            match bc {
+                Assign(attr_id, dest, src, AssignKind::Move)
+                    if src < param_count && is_mut_ref(&builder, src) =>
+                {
+                    // Do not allow a move of a &mut parameter. This would make it hard
+                    // to return the right version of it at return. Instead turn this into
+                    // a copy, which will ensure any value updated will be written back
+                    // to the original parameter before returned (via borrow semantics).
+                    builder.emit(Assign(attr_id, dest, src, AssignKind::Copy))
+                }
+                Ret(attr_id, rets) => {
+                    // Emit traces for &mut params at exit.
+                    builder.set_loc_from_attr(attr_id);
+                    for added in &mut_ref_params {
+                        builder.emit_with(|id| {
+                            Call(id, vec![], TraceLocal(*added), vec![*added], None)
+                        });
+                    }
+                    builder.emit(Ret(attr_id, rets));
+                }
+                _ => builder.emit(bc),
+            }
+        }
+
+        builder.data
+    }
+
+    fn name(&self) -> String {
+        "mut_ref_instrumentation".to_string()
+    }
+}
+
+fn is_mut_ref(builder: &FunctionDataBuilder<'_>, idx: TempIndex) -> bool {
+    builder
+        .get_target()
+        .get_local_type(idx)
+        .is_mutable_reference()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/mutation_tester.rs b/vendors/move/crates/move-stackless-bytecode/src/mutation_tester.rs
new file mode 100644
index 000000000..3a117afd3
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/mutation_tester.rs
@@ -0,0 +1,194 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Transformation which mutates code for mutation testing in various ways
+//!
+//! This transformation should run after code is translated to bytecode, but before any
+//!  other bytecode modification
+//! It emits instructions in bytecode format, but with changes made
+//! Note that this mutation does nothing if mutation flags are not enabled
+
+use move_model::{
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, GlobalEnv},
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, Operation},
+};
+
+pub struct MutationTester {}
+
+pub struct MutationManager {
+    pub mutated: bool,
+    pub add_sub: usize,
+    pub sub_add: usize,
+    pub mul_div: usize,
+    pub div_mul: usize,
+}
+
+impl MutationTester {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+fn mutate_arith(
+    call: Bytecode,
+    mutation_value: usize,
+    global_env: &GlobalEnv,
+    mutation_manager: MutationManager,
+    bc: Bytecode,
+) -> Bytecode {
+    if mutation_value > 1 {
+        global_env.set_extension(MutationManager {
+            mutated: mutation_manager.mutated,
+            add_sub: mutation_manager.add_sub,
+            sub_add: mutation_manager.sub_add,
+            mul_div: mutation_manager.mul_div,
+            div_mul: mutation_manager.div_mul,
+        });
+    }
+    if mutation_value == 1 {
+        global_env.set_extension(MutationManager {
+            mutated: true,
+            add_sub: mutation_manager.add_sub,
+            sub_add: mutation_manager.sub_add,
+            mul_div: mutation_manager.mul_div,
+            div_mul: mutation_manager.div_mul,
+        });
+        call
+    } else {
+        bc
+    }
+}
+
+impl FunctionTargetProcessor for MutationTester {
+    fn initialize(&self, global_env: &GlobalEnv, _targets: &mut FunctionTargetsHolder) {
+        let options = ProverOptions::get(global_env);
+        let m = global_env.get_extension::<MutationManager>();
+        match m {
+            Some(x) => global_env.set_extension(MutationManager { ..*x }),
+            None => global_env.set_extension(MutationManager {
+                mutated: false,
+                add_sub: options.mutation_add_sub,
+                sub_add: options.mutation_sub_add,
+                mul_div: options.mutation_mul_div,
+                div_mul: options.mutation_div_mul,
+            }),
+        };
+    }
+
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        use Bytecode::*;
+
+        if fun_env.is_native() {
+            // Nothing to do
+            return data;
+        }
+
+        if !data.variant.is_verified() {
+            // Only need to instrument if this is a verification variant
+            return data;
+        }
+
+        let mut builder = FunctionDataBuilder::new(fun_env, data);
+        let code = std::mem::take(&mut builder.data.code);
+
+        builder.set_loc(builder.fun_env.get_loc().at_start());
+        let global_env = fun_env.module_env.env;
+        let m = global_env.get_extension::<MutationManager>().unwrap();
+
+        for bc in code {
+            match bc {
+                Call(ref attrid, ref indices, Operation::Add, ref srcs, ref dests) => {
+                    let call = Call(
+                        *attrid,
+                        (*indices).clone(),
+                        Operation::Sub,
+                        (*srcs).clone(),
+                        (*dests).clone(),
+                    );
+                    let mv = m.add_sub;
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
+                    let mm = MutationManager {
+                        add_sub: result,
+                        ..*m
+                    };
+                    builder.emit(mutate_arith(call, mv, global_env, mm, bc));
+                }
+                Call(ref attrid, ref indices, Operation::Sub, ref srcs, ref dests) => {
+                    let call = Call(
+                        *attrid,
+                        (*indices).clone(),
+                        Operation::Add,
+                        (*srcs).clone(),
+                        (*dests).clone(),
+                    );
+                    let mv = m.sub_add;
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
+                    let mm = MutationManager {
+                        sub_add: result,
+                        ..*m
+                    };
+                    builder.emit(mutate_arith(call, mv, global_env, mm, bc));
+                }
+                Call(ref attrid, ref indices, Operation::Mul, ref srcs, ref dests) => {
+                    let call = Call(
+                        *attrid,
+                        (*indices).clone(),
+                        Operation::Div,
+                        (*srcs).clone(),
+                        (*dests).clone(),
+                    );
+                    let mv = m.mul_div;
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
+                    let mm = MutationManager {
+                        mul_div: result,
+                        ..*m
+                    };
+                    builder.emit(mutate_arith(call, mv, global_env, mm, bc));
+                }
+                Call(ref attrid, ref indices, Operation::Div, ref srcs, ref dests) => {
+                    let call = Call(
+                        *attrid,
+                        (*indices).clone(),
+                        Operation::Mul,
+                        (*srcs).clone(),
+                        (*dests).clone(),
+                    );
+                    let mv = m.mul_div;
+                    let result = if mv > 0 { mv - 1 } else { mv };
+                    let mm = MutationManager {
+                        div_mul: result,
+                        ..*m
+                    };
+                    builder.emit(mutate_arith(call, mv, global_env, mm, bc));
+                }
+                _ => {
+                    builder.emit(bc);
+                }
+            }
+        }
+
+        builder.data
+    }
+
+    fn name(&self) -> String {
+        "mutation_tester".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/number_operation.rs b/vendors/move/crates/move-stackless-bytecode/src/number_operation.rs
new file mode 100644
index 000000000..261096828
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/number_operation.rs
@@ -0,0 +1,334 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file defines types, data structures and corresponding functions to
+//! mark the operation (arithmetic or bitwise) that a variable or a field involves,
+//! which will be used later when the correct number type (int or bv<N>) in the boogie program
+
+use itertools::Itertools;
+use move_model::{
+    ast::{PropertyValue, TempIndex, Value},
+    model::{FieldId, FunId, FunctionEnv, ModuleId, NodeId, SpecFunId, StructEnv, StructId},
+    pragmas::{BV_PARAM_PROP, BV_RET_PROP},
+    ty::Type,
+};
+use std::{collections::BTreeMap, str};
+
+static PARSING_ERROR: &str = "error happened when parsing the bv pragma";
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub enum NumOperation {
+    /// Default value, not involved in arithmetic or bitwise operations
+    #[default]
+    Bottom,
+    /// Involved in arithmetic operations
+    Arithmetic,
+    /// Involved in bitwise operations
+    Bitwise,
+}
+
+impl NumOperation {
+    /// Check whether two operations are conflicting
+    pub fn conflict(&self, other: &NumOperation) -> bool {
+        use NumOperation::*;
+        (*self == Arithmetic && *other == Bitwise) || (*self == Bitwise && *other == Arithmetic)
+    }
+
+    /// Return the operation according to the partial order in NumOperation
+    pub fn merge(&self, other: &NumOperation) -> NumOperation {
+        if self.ge(other) {
+            *self
+        } else {
+            *other
+        }
+    }
+}
+
+// NumOperation of a variable
+pub type OperationMap = BTreeMap<usize, NumOperation>;
+pub type ExpMap = BTreeMap<NodeId, NumOperation>;
+pub type OperationVec = Vec<NumOperation>;
+// NumOperation of a field
+pub type StructFieldOperationMap = BTreeMap<FieldId, NumOperation>;
+pub type FuncOperationMap = BTreeMap<(ModuleId, FunId), OperationMap>;
+pub type SpecFuncOperationMap = BTreeMap<(ModuleId, SpecFunId), (OperationVec, OperationVec)>;
+pub type StructOperationMap = BTreeMap<(ModuleId, StructId), StructFieldOperationMap>;
+
+#[derive(Default, Debug, Clone, Eq, PartialEq, PartialOrd)]
+pub struct GlobalNumberOperationState {
+    // TODO(tengzhang): spec funs and spec vars need to be handled here
+    // Each TempIndex for parameters appearing the function has a corresponding NumOperation
+    temp_index_operation_map: FuncOperationMap,
+    // Each return value in the function has a corresponding NumOperation
+    ret_operation_map: FuncOperationMap,
+    // Each TempIndex for locals appearing the function has a corresponding NumOperation
+    local_oper: FuncOperationMap,
+    // local_oper, but for baseline
+    local_oper_baseline: FuncOperationMap,
+    // Each node id appearing the function has a corresponding NumOperation
+    pub exp_operation_map: ExpMap,
+    // NumberOperation state for spec functions
+    pub spec_fun_operation_map: SpecFuncOperationMap,
+    // Each field in the struct has a corresponding NumOperation
+    pub struct_operation_map: StructOperationMap,
+}
+
+impl GlobalNumberOperationState {
+    /// Parse pragma bv=b"..." and pragma bv_ret=b"...", the result is a list of position (starting from 0)
+    /// in the argument list of the function
+    /// or a struct definition
+    fn extract_bv_vars(bv_temp_opt: Option<&PropertyValue>) -> Vec<usize> {
+        let mut bv_temp_vec = vec![];
+        if let Some(PropertyValue::Value(Value::ByteArray(arr))) = bv_temp_opt {
+            let param_str = str::from_utf8(arr).expect(PARSING_ERROR);
+            let idx_vec = param_str
+                .split(',')
+                .map(|s| s.trim().parse::<usize>().expect(PARSING_ERROR))
+                .collect_vec();
+            bv_temp_vec = idx_vec;
+        }
+        bv_temp_vec
+    }
+
+    pub fn get_ret_map(&self) -> &FuncOperationMap {
+        &self.ret_operation_map
+    }
+
+    pub fn get_mut_ret_map(&mut self) -> &mut FuncOperationMap {
+        &mut self.ret_operation_map
+    }
+
+    pub fn get_non_param_local_map(
+        &self,
+        mid: ModuleId,
+        fid: FunId,
+        baseline_flag: bool,
+    ) -> &OperationMap {
+        if baseline_flag {
+            self.local_oper_baseline.get(&(mid, fid)).unwrap()
+        } else {
+            self.local_oper.get(&(mid, fid)).unwrap()
+        }
+    }
+
+    pub fn get_mut_non_param_local_map(
+        &mut self,
+        mid: ModuleId,
+        fid: FunId,
+        baseline_flag: bool,
+    ) -> &mut OperationMap {
+        if baseline_flag {
+            self.local_oper_baseline.get_mut(&(mid, fid)).unwrap()
+        } else {
+            self.local_oper.get_mut(&(mid, fid)).unwrap()
+        }
+    }
+
+    pub fn get_temp_index_oper(
+        &self,
+        mid: ModuleId,
+        fid: FunId,
+        idx: TempIndex,
+        baseline_flag: bool,
+    ) -> Option<&NumOperation> {
+        if baseline_flag {
+            if self
+                .local_oper_baseline
+                .get(&(mid, fid))
+                .unwrap()
+                .contains_key(&idx)
+            {
+                self.local_oper_baseline.get(&(mid, fid)).unwrap().get(&idx)
+            } else {
+                self.temp_index_operation_map
+                    .get(&(mid, fid))
+                    .unwrap()
+                    .get(&idx)
+            }
+        } else if self.local_oper.get(&(mid, fid)).unwrap().contains_key(&idx) {
+            self.local_oper.get(&(mid, fid)).unwrap().get(&idx)
+        } else {
+            self.temp_index_operation_map
+                .get(&(mid, fid))
+                .unwrap()
+                .get(&idx)
+        }
+    }
+
+    pub fn get_mut_temp_index_oper(
+        &mut self,
+        mid: ModuleId,
+        fid: FunId,
+        idx: TempIndex,
+        baseline_flag: bool,
+    ) -> Option<&mut NumOperation> {
+        if baseline_flag {
+            if self
+                .local_oper_baseline
+                .get(&(mid, fid))
+                .unwrap()
+                .contains_key(&idx)
+            {
+                self.local_oper_baseline
+                    .get_mut(&(mid, fid))
+                    .unwrap()
+                    .get_mut(&idx)
+            } else {
+                self.temp_index_operation_map
+                    .get_mut(&(mid, fid))
+                    .unwrap()
+                    .get_mut(&idx)
+            }
+        } else if self.local_oper.get(&(mid, fid)).unwrap().contains_key(&idx) {
+            self.local_oper.get_mut(&(mid, fid)).unwrap().get_mut(&idx)
+        } else {
+            self.temp_index_operation_map
+                .get_mut(&(mid, fid))
+                .unwrap()
+                .get_mut(&idx)
+        }
+    }
+
+    /// Create the initial NumberOperationState
+    pub fn create_initial_func_oper_state(&mut self, func_env: &FunctionEnv) {
+        use NumOperation::*;
+
+        // Obtain positions that are marked as Bitwise by analyzing the pragma
+        let para_sym = &func_env.module_env.env.symbol_pool().make(BV_PARAM_PROP);
+        let ret_sym = &func_env.module_env.env.symbol_pool().make(BV_RET_PROP);
+        let number_param_property = func_env.get_spec().properties.get(para_sym);
+        let number_ret_property = func_env.get_spec().properties.get(ret_sym);
+        let para_idx_vec = Self::extract_bv_vars(number_param_property);
+        let ret_idx_vec = Self::extract_bv_vars(number_ret_property);
+
+        let mid = func_env.module_env.get_id();
+        let fid = func_env.get_id();
+        let mut default_map = BTreeMap::new();
+        let mut default_ret_operation_map = BTreeMap::new();
+
+        // Set initial state for tempIndex
+        for i in 0..func_env.get_parameter_count() {
+            if para_idx_vec.contains(&i) {
+                default_map.insert(i, Bitwise);
+            } else {
+                // If not appearing in the pragma, mark it as Arithmetic or Bottom
+                // Similar logic when populating ret_operation_map below
+                let local_ty = func_env.get_local_type(i);
+                let arith_flag = if let Type::Reference(_, tr) = local_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = local_ty {
+                    tr.is_number()
+                } else {
+                    local_ty.is_number()
+                };
+                if arith_flag {
+                    default_map.insert(i, Arithmetic);
+                } else {
+                    default_map.insert(i, Bottom);
+                }
+            }
+        }
+
+        // Set initial state for ret_operation_map
+        for i in 0..func_env.get_return_count() {
+            if ret_idx_vec.contains(&i) {
+                default_ret_operation_map.insert(i, Bitwise);
+            } else {
+                let ret_ty = func_env.get_return_type(i);
+                let arith_flag = if let Type::Reference(_, tr) = ret_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = ret_ty {
+                    tr.is_number()
+                } else {
+                    ret_ty.is_number()
+                };
+                if arith_flag {
+                    default_ret_operation_map.insert(i, Arithmetic);
+                } else {
+                    default_ret_operation_map.insert(i, Bottom);
+                }
+            }
+        }
+
+        self.temp_index_operation_map
+            .insert((mid, fid), default_map);
+        self.local_oper_baseline.insert((mid, fid), BTreeMap::new());
+        self.local_oper.insert((mid, fid), BTreeMap::new());
+        self.ret_operation_map
+            .insert((mid, fid), default_ret_operation_map);
+    }
+
+    /// Populate default state for struct operation map
+    pub fn create_initial_struct_oper_state(&mut self, struct_env: &StructEnv) {
+        use NumOperation::*;
+
+        // Obtain positions that are marked as Bitwise by analyzing the pragma
+        let para_sym = &struct_env.module_env.env.symbol_pool().make(BV_PARAM_PROP);
+        let bv_struct_opt = struct_env.get_spec().properties.get(para_sym);
+        let field_idx_vec = Self::extract_bv_vars(bv_struct_opt);
+
+        let mid = struct_env.module_env.get_id();
+        let sid = struct_env.get_id();
+        let struct_env = struct_env.module_env.env.get_module(mid).into_struct(sid);
+        let mut field_oper_map = BTreeMap::new();
+
+        for (i, field) in struct_env.get_fields().enumerate() {
+            if field_idx_vec.contains(&i) {
+                field_oper_map.insert(field.get_id(), Bitwise);
+            } else {
+                let field_ty = field.get_type();
+                let arith_flag = if let Type::Reference(_, tr) = field_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = field_ty {
+                    tr.is_number()
+                } else {
+                    field_ty.is_number()
+                };
+                if arith_flag {
+                    field_oper_map.insert(field.get_id(), Arithmetic);
+                } else {
+                    field_oper_map.insert(field.get_id(), Bottom);
+                }
+            }
+        }
+        self.struct_operation_map.insert((mid, sid), field_oper_map);
+    }
+
+    /// Updates the number operation for the given node id.
+    pub fn update_node_oper(
+        &mut self,
+        node_id: NodeId,
+        num_oper: NumOperation,
+        allow: bool,
+    ) -> bool {
+        let mods = &mut self.exp_operation_map;
+        let oper = mods.get_mut(&node_id).expect("node exist");
+        if !allow && oper.conflict(&num_oper) {
+            false
+        } else {
+            *oper = num_oper;
+            true
+        }
+    }
+
+    /// Gets the number operation of the given node.
+    pub fn get_node_num_oper(&self, node_id: NodeId) -> NumOperation {
+        self.get_node_num_oper_opt(node_id)
+            .expect("node number oper defined")
+    }
+
+    /// Gets the number operation of the given node, if available.
+    pub fn get_node_num_oper_opt(&self, node_id: NodeId) -> Option<NumOperation> {
+        self.exp_operation_map.get(&node_id).copied()
+    }
+
+    pub fn update_spec_ret(&mut self, mid: &ModuleId, fid: &SpecFunId, oper: NumOperation) {
+        let ret_num_oper_vec = &mut self
+            .spec_fun_operation_map
+            .get_mut(&(*mid, *fid))
+            .unwrap()
+            .1;
+        ret_num_oper_vec[0] = oper;
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/number_operation_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/number_operation_analysis.rs
new file mode 100644
index 000000000..35aff5685
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/number_operation_analysis.rs
@@ -0,0 +1,1116 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Analysis on partitioning temp variables, struct fields and function parameters according to involved operations (arithmetic or bitwise)
+//
+// The result of this analysis will be used when generating the boogie code
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::FunctionTarget,
+    function_target_pipeline::{
+        FunctionTargetPipeline, FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant,
+    },
+    number_operation::{
+        GlobalNumberOperationState,
+        NumOperation::{self, Arithmetic, Bitwise, Bottom},
+    },
+    options::ProverOptions,
+    stackless_bytecode::{AttrId, Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+use itertools::Either;
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{Exp, ExpData, TempIndex},
+    model::{FunId, GlobalEnv, ModuleId},
+    ty::{PrimitiveType, Type},
+};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    str,
+};
+
+static CONFLICT_ERROR_MSG: &str = "cannot appear in both arithmetic and bitwise operation";
+
+pub struct NumberOperationProcessor {}
+
+impl NumberOperationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(NumberOperationProcessor {})
+    }
+
+    /// Create initial number operation state for expressions
+    pub fn create_initial_exp_oper_state(&self, env: &GlobalEnv) {
+        let mut default_exp = BTreeMap::new();
+        let exp_info_map = env.get_nodes();
+        for id in exp_info_map {
+            default_exp.insert(id, Bottom);
+        }
+        let mut global_state = env.get_cloned_extension::<GlobalNumberOperationState>();
+        global_state.exp_operation_map = default_exp;
+        env.set_extension(global_state);
+    }
+
+    /// Entry point of the analysis
+    fn analyze<'a>(&self, env: &'a GlobalEnv, targets: &'a FunctionTargetsHolder) {
+        self.create_initial_exp_oper_state(env);
+        let fun_env_vec = FunctionTargetPipeline::sort_targets_in_topological_order(env, targets);
+        for item in &fun_env_vec {
+            match item {
+                Either::Left(fid) => {
+                    let func_env = env.get_function(*fid);
+                    for (_, target) in targets.get_targets(&func_env) {
+                        if target.data.code.is_empty() {
+                            continue;
+                        }
+                        self.analyze_fun(env, target.clone());
+                    }
+                }
+                Either::Right(scc) => {
+                    for fid in scc {
+                        let func_env = env.get_function(*fid);
+                        for (_, target) in targets.get_targets(&func_env) {
+                            if target.data.code.is_empty() {
+                                continue;
+                            }
+                            self.analyze_fun(env, target.clone());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn analyze_fun(&self, env: &GlobalEnv, target: FunctionTarget) {
+        if !target.func_env.is_native_or_intrinsic() {
+            let cfg = StacklessControlFlowGraph::one_block(target.get_bytecode());
+            let analyzer = NumberOperationAnalysis {
+                func_target: target,
+                ban_int_2_bv_conversion: ProverOptions::get(env).ban_int_2_bv,
+            };
+            analyzer.analyze_function(
+                NumberOperationState::create_initial_state(),
+                analyzer.func_target.get_bytecode(),
+                &cfg,
+            );
+        }
+    }
+}
+
+impl FunctionTargetProcessor for NumberOperationProcessor {
+    fn is_single_run(&self) -> bool {
+        true
+    }
+
+    fn run(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        self.analyze(env, targets);
+    }
+
+    fn name(&self) -> String {
+        "number_operation_analysis".to_string()
+    }
+}
+
+struct NumberOperationAnalysis<'a> {
+    func_target: FunctionTarget<'a>,
+    ban_int_2_bv_conversion: bool,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+struct NumberOperationState {
+    // Flag to mark whether the global state has been changed in one pass
+    pub changed: bool,
+}
+
+impl NumberOperationState {
+    /// Create a default NumberOperationState
+    fn create_initial_state() -> Self {
+        NumberOperationState { changed: false }
+    }
+}
+
+fn vector_table_funs_name_propogate_to_dest(callee_name: &str) -> bool {
+    callee_name.contains("borrow")
+        || callee_name.contains("borrow_mut")
+        || callee_name.contains("pop_back")
+        || callee_name.contains("singleton")
+        || callee_name.contains("remove")
+        || callee_name.contains("swap_remove")
+        || callee_name.contains("spec_get")
+}
+
+fn vector_funs_name_propogate_to_srcs(callee_name: &str) -> bool {
+    callee_name == "contains"
+        || callee_name == "index_of"
+        || callee_name == "append"
+        || callee_name == "push_back"
+        || callee_name == "insert"
+}
+
+fn table_funs_name_propogate_to_srcs(callee_name: &str) -> bool {
+    callee_name == "add" || callee_name == "borrow_mut_with_default" || callee_name == "upsert"
+}
+
+impl<'a> NumberOperationAnalysis<'a> {
+    /// Analyze the expression in the spec
+    fn handle_exp(
+        &self,
+        attr_id: AttrId,
+        e: &Exp,
+        global_state: &mut GlobalNumberOperationState,
+        state: &mut NumberOperationState,
+    ) {
+        // TODO(tengzhang): add logic to support converting int to bv in the spec
+        let allow_merge = false;
+        let opers_for_propagation = |oper: &move_model::ast::Operation| {
+            use move_model::ast::Operation::*;
+            matches!(
+                *oper,
+                Add | Sub
+                    | Mul
+                    | Div
+                    | Mod
+                    | BitOr
+                    | BitAnd
+                    | Xor
+                    | Shr
+                    | Shl
+                    | Lt
+                    | Le
+                    | Gt
+                    | Ge
+                    | Neq
+                    | Eq
+            )
+        };
+        let bitwise_oper = |oper: &move_model::ast::Operation| {
+            use move_model::ast::Operation::*;
+            matches!(*oper, |BitOr| BitAnd | Xor)
+        };
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        let cur_mid = self.func_target.func_env.module_env.get_id();
+        let cur_fid = self.func_target.func_env.get_id();
+        let update_temporary = |arg: &Exp,
+                                oper: &NumOperation,
+                                global_state: &mut GlobalNumberOperationState,
+                                state: &mut NumberOperationState| {
+            if let ExpData::Temporary(_, idx) = arg.as_ref() {
+                let cur_oper = global_state
+                    .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                    .unwrap_or(&Bottom);
+                if *cur_oper != *oper {
+                    state.changed = true;
+                    *global_state
+                        .get_mut_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                        .unwrap() = *oper;
+                }
+            }
+        };
+        let visitor = &mut |exp: &ExpData| {
+            match exp {
+                ExpData::Temporary(id, idx) => {
+                    let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+                    let oper = global_state
+                        .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                        .unwrap_or(&Bottom);
+                    // Update num_oper for the node for the temporary variable
+                    global_state.update_node_oper(*id, *oper, true);
+                }
+                ExpData::Block(id, _, exp) => {
+                    let exp_oper = global_state.get_node_num_oper(exp.node_id());
+                    global_state.update_node_oper(*id, exp_oper, true);
+                }
+                ExpData::IfElse(id, _, true_exp, false_exp) => {
+                    let true_oper = global_state.get_node_num_oper(true_exp.node_id());
+                    let false_oper = global_state.get_node_num_oper(false_exp.node_id());
+                    if !allow_merge && true_oper.conflict(&false_oper) {
+                        self.func_target.global_env().error(
+                            &self.func_target.get_bytecode_loc(attr_id),
+                            CONFLICT_ERROR_MSG,
+                        );
+                    }
+                    global_state.update_node_oper(*id, true_oper.merge(&false_oper), true);
+                }
+                ExpData::Call(id, oper, args) => {
+                    let mut arg_oper = vec![];
+                    for arg in args {
+                        arg_oper.push(global_state.get_node_num_oper(arg.node_id()));
+                    }
+                    match oper {
+                        move_model::ast::Operation::Identical => {
+                            let num_oper_0 = global_state.get_node_num_oper(args[0].node_id());
+                            let num_oper_1 = global_state.get_node_num_oper(args[1].node_id());
+                            if !num_oper_0.conflict(&num_oper_1) {
+                                let merged = num_oper_0.merge(&num_oper_1);
+                                global_state.update_node_oper(*id, merged, true);
+                                for arg in args {
+                                    global_state.update_node_oper(arg.node_id(), merged, true);
+                                    update_temporary(arg, &merged, global_state, state);
+                                }
+                            }
+                        }
+                        // Update node for index
+                        move_model::ast::Operation::Index => {
+                            global_state.update_node_oper(*id, arg_oper[0], true);
+                        }
+                        // Update node for return value
+                        move_model::ast::Operation::Result(i) => {
+                            let oper = global_state
+                                .get_ret_map()
+                                .get(&(cur_mid, cur_fid))
+                                .unwrap()
+                                .get(i)
+                                .unwrap_or(&Bottom);
+                            global_state.update_node_oper(*id, *oper, true);
+                        }
+                        // Update node for field operation
+                        move_model::ast::Operation::Select(mid, sid, field_id)
+                        | move_model::ast::Operation::UpdateField(mid, sid, field_id) => {
+                            let field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*mid, *sid))
+                                .unwrap()
+                                .get(field_id)
+                                .unwrap();
+                            global_state.update_node_oper(*id, *field_oper, true);
+                        }
+                        move_model::ast::Operation::Cast => {
+                            // Obtained the updated num_oper of the expression
+                            let num_oper = global_state.get_node_num_oper(args[0].node_id());
+                            // Update the node of cast
+                            global_state.update_node_oper(*id, num_oper, true);
+                        }
+                        move_model::ast::Operation::Int2Bv => {
+                            global_state.update_node_oper(*id, Bitwise, true);
+                        }
+                        move_model::ast::Operation::Bv2Int => {
+                            global_state.update_node_oper(*id, Arithmetic, true);
+                        }
+                        move_model::ast::Operation::Function(mid, sid, _) => {
+                            let module_env = &self.func_target.global_env().get_module(*mid);
+                            let callee_name = module_env
+                                .get_spec_fun(*sid)
+                                .name
+                                .display(self.func_target.global_env().symbol_pool())
+                                .to_string();
+                            if module_env.is_std_vector() || module_env.is_table() {
+                                if !args.is_empty() {
+                                    let oper_first =
+                                        global_state.get_node_num_oper(args[0].node_id());
+                                    // First argument is the target vector and the return type has the same NumberOperation type
+                                    if vector_table_funs_name_propogate_to_dest(&callee_name) {
+                                        global_state.update_node_oper(*id, oper_first, true);
+                                    } else {
+                                        global_state.update_node_oper(*id, Bottom, allow_merge);
+                                    }
+                                    // Handle the case of borrow_mut_with_default
+                                    if callee_name.contains("borrow_mut_with_default") {
+                                        assert!(args.len() >= 3);
+                                        update_temporary(
+                                            &args[2],
+                                            &oper_first,
+                                            global_state,
+                                            state,
+                                        );
+                                    }
+                                }
+                            } else {
+                                // Analysis for general spec functions.
+                                let module = &self.func_target.global_env().get_module(*mid);
+                                let callee_spec_fun = module.get_spec_fun(*sid);
+                                // Try to get num_oper for signatures
+                                // If not exists, compute num_oper for this spec fun and update the exp_operation_map and spec_fun_map
+                                if let std::collections::btree_map::Entry::Vacant(_) =
+                                    global_state.spec_fun_operation_map.entry((*mid, *sid))
+                                {
+                                    let mut para_vec = vec![];
+                                    let mut ret_vec = vec![];
+                                    // Default num oper is determined by the actual arguments
+                                    para_vec.append(&mut arg_oper);
+                                    ret_vec.push(Bottom);
+                                    if callee_spec_fun.body.is_some() {
+                                        let body_exp = callee_spec_fun.body.as_ref().unwrap();
+                                        let local_map = body_exp.free_local_vars_with_node_id();
+                                        for (i, (sym, _)) in
+                                            callee_spec_fun.params.iter().enumerate()
+                                        {
+                                            if local_map.contains_key(sym) {
+                                                let sym_node_id = local_map.get(sym).unwrap();
+                                                let oper_opt =
+                                                    global_state.exp_operation_map.get(sym_node_id);
+                                                if let Some(oper) = oper_opt {
+                                                    // Still need to check compatibility
+                                                    if !allow_merge && oper.conflict(&para_vec[i]) {
+                                                        self.func_target.global_env().error(
+                                                            &self
+                                                                .func_target
+                                                                .get_bytecode_loc(attr_id),
+                                                            CONFLICT_ERROR_MSG,
+                                                        );
+                                                    } else {
+                                                        let merged = oper.merge(&para_vec[i]);
+                                                        para_vec[i] = merged;
+                                                    }
+                                                }
+                                                global_state.update_node_oper(
+                                                    *sym_node_id,
+                                                    para_vec[i],
+                                                    true,
+                                                );
+                                            }
+                                        }
+                                        global_state
+                                            .spec_fun_operation_map
+                                            .insert((*mid, *sid), (para_vec, ret_vec));
+
+                                        // Check compatibility between formal and actual arguments
+                                        self.handle_exp(attr_id, body_exp, global_state, state);
+                                        global_state.update_node_oper(
+                                            *id,
+                                            global_state.get_node_num_oper(body_exp.node_id()),
+                                            allow_merge,
+                                        );
+                                        global_state.update_spec_ret(
+                                            mid,
+                                            sid,
+                                            global_state.get_node_num_oper(body_exp.node_id()),
+                                        );
+                                    } else {
+                                        global_state
+                                            .spec_fun_operation_map
+                                            .insert((*mid, *sid), (para_vec, ret_vec));
+                                    }
+                                } else {
+                                    // Check compatibility between formal and actual arguments
+                                    let para_oper_vec = &global_state
+                                        .spec_fun_operation_map
+                                        .get(&(*mid, *sid))
+                                        .unwrap()
+                                        .0;
+                                    assert_eq!(para_oper_vec.len(), arg_oper.len());
+                                    for (formal_oper, actual_oper) in
+                                        para_oper_vec.iter().zip(arg_oper.iter())
+                                    {
+                                        // For simplicity, only check compatibility
+                                        if !allow_merge && formal_oper.conflict(actual_oper) {
+                                            self.func_target.global_env().error(
+                                                &self.func_target.get_bytecode_loc(attr_id),
+                                                CONFLICT_ERROR_MSG,
+                                            );
+                                        }
+                                    }
+                                }
+                                // Update number oper for this node based on the return value of the spec fun
+                                let ret_num_oper_vec = &global_state
+                                    .spec_fun_operation_map
+                                    .get(&(*mid, *sid))
+                                    .unwrap()
+                                    .1;
+                                if !ret_num_oper_vec.is_empty() {
+                                    global_state.update_node_oper(
+                                        *id,
+                                        ret_num_oper_vec[0],
+                                        allow_merge,
+                                    );
+                                }
+                            }
+                        }
+                        move_model::ast::Operation::WellFormed => {
+                            global_state.update_node_oper(*id, arg_oper[0], true);
+                        }
+                        _ => {
+                            // All args must have compatible number operations
+                            // TODO(tengzhang): support converting int to bv
+                            if opers_for_propagation(oper) {
+                                let mut merged = if bitwise_oper(oper) { Bitwise } else { Bottom };
+                                if bitwise_oper(oper) {
+                                    let ty =
+                                        self.func_target.global_env().get_node_type(exp.node_id());
+                                    if matches!(ty, Type::Primitive(PrimitiveType::Num)) {
+                                        self.func_target.global_env().update_node_type(
+                                            exp.node_id(),
+                                            self.func_target
+                                                .global_env()
+                                                .get_node_type(args[0].node_id())
+                                                .skip_reference()
+                                                .clone(),
+                                        );
+                                    }
+                                }
+                                for num_oper in &arg_oper {
+                                    if !allow_merge && num_oper.conflict(&merged) {
+                                        self.func_target.global_env().error(
+                                            &self.func_target.get_bytecode_loc(attr_id),
+                                            CONFLICT_ERROR_MSG,
+                                        );
+                                    }
+                                    merged = num_oper.merge(&merged);
+                                }
+
+                                for (arg, arg_oper) in args.iter().zip(arg_oper.iter()) {
+                                    if merged != *arg_oper {
+                                        // propagate to arg if necessary
+                                        global_state.update_node_oper(
+                                            arg.node_id(),
+                                            merged,
+                                            allow_merge,
+                                        );
+                                        update_temporary(arg, &merged, global_state, state);
+                                    }
+                                }
+
+                                global_state.update_node_oper(*id, merged, allow_merge);
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+        };
+        e.visit(visitor);
+    }
+
+    /// Check whether operations in s conflicting
+    fn check_conflict_set(&self, s: &BTreeSet<&NumOperation>) -> bool {
+        if self.ban_int_2_bv_conversion {
+            let mut arith_flag = false;
+            let mut bitwise_flag = false;
+            for &oper in s {
+                if *oper == Arithmetic {
+                    arith_flag = true;
+                }
+                if *oper == Bitwise {
+                    bitwise_flag = true;
+                }
+            }
+            arith_flag && bitwise_flag
+        } else {
+            false
+        }
+    }
+
+    /// Check whether oper_1 and oper_2 conflict
+    fn check_conflict(&self, oper_1: &NumOperation, oper_2: &NumOperation) -> bool {
+        if self.ban_int_2_bv_conversion {
+            oper_1.conflict(oper_2)
+        } else {
+            false
+        }
+    }
+
+    /// Check whether operation of dest and src conflict, if not propagate the merged operation
+    fn check_and_propagate(
+        &self,
+        id: &AttrId,
+        state: &mut NumberOperationState,
+        dest: &TempIndex,
+        src: &TempIndex,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        // Each TempIndex has a default operation in the map, can unwrap
+        let dest_oper = global_state
+            .get_temp_index_oper(mid, fid, *dest, baseline_flag)
+            .unwrap();
+        let src_oper = global_state
+            .get_temp_index_oper(mid, fid, *src, baseline_flag)
+            .unwrap();
+        if self.check_conflict(dest_oper, src_oper) {
+            self.func_target
+                .func_env
+                .module_env
+                .env
+                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+        } else {
+            let merged_oper = dest_oper.merge(src_oper);
+            if merged_oper != *dest_oper || merged_oper != *src_oper {
+                state.changed = true;
+            }
+            *global_state
+                .get_mut_temp_index_oper(mid, fid, *dest, baseline_flag)
+                .unwrap() = merged_oper;
+            *global_state
+                .get_mut_temp_index_oper(mid, fid, *src, baseline_flag)
+                .unwrap() = merged_oper;
+        }
+    }
+
+    /// Update operation in dests and srcs using oper
+    fn check_and_update_oper(
+        &self,
+        id: &AttrId,
+        state: &mut NumberOperationState,
+        dests: &[TempIndex],
+        srcs: &[TempIndex],
+        oper: NumOperation,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        let op_srcs_0 = global_state
+            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+            .unwrap();
+        let op_srcs_1 = global_state
+            .get_temp_index_oper(mid, fid, srcs[1], baseline_flag)
+            .unwrap();
+        let op_dests_0 = global_state
+            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap();
+        // Check conflicts among dests and srcs
+        let mut state_set = BTreeSet::new();
+        state_set.insert(op_srcs_0);
+        state_set.insert(op_srcs_1);
+        state_set.insert(op_dests_0);
+        if self.check_conflict_set(&state_set) {
+            self.func_target
+                .func_env
+                .module_env
+                .env
+                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+            return;
+        }
+        if oper != *op_srcs_0 || oper != *op_srcs_1 || oper != *op_dests_0 {
+            state.changed = true;
+        }
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+            .unwrap() = oper;
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, srcs[1], baseline_flag)
+            .unwrap() = oper;
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap() = oper;
+    }
+
+    fn check_and_update_oper_dest(
+        &self,
+        state: &mut NumberOperationState,
+        dests: &[TempIndex],
+        oper: NumOperation,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        let op_dests_0 = global_state
+            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap();
+        if oper != *op_dests_0 {
+            state.changed = true;
+        }
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap() = oper;
+    }
+
+    /// Generate default num_oper for all non-parameter locals
+    fn populate_non_param_oper(&self, global_state: &mut GlobalNumberOperationState) {
+        let mid = self.func_target.func_env.module_env.get_id();
+        let fid = self.func_target.func_env.get_id();
+        let non_param_range = self.func_target.get_non_parameter_locals();
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        for i in non_param_range {
+            if !global_state
+                .get_non_param_local_map(mid, fid, baseline_flag)
+                .contains_key(&i)
+            {
+                global_state
+                    .get_mut_non_param_local_map(mid, fid, baseline_flag)
+                    .insert(i, Bottom);
+            }
+        }
+    }
+}
+
+impl<'a> TransferFunctions for NumberOperationAnalysis<'a> {
+    type State = NumberOperationState;
+    const BACKWARD: bool = false;
+
+    /// Update global state of num_operation by analyzing each instruction
+    fn execute(&self, state: &mut NumberOperationState, instr: &Bytecode, _offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+        let mut global_state = self
+            .func_target
+            .global_env()
+            .get_cloned_extension::<GlobalNumberOperationState>();
+        self.populate_non_param_oper(&mut global_state);
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        let cur_mid = self.func_target.func_env.module_env.get_id();
+        let cur_fid = self.func_target.func_env.get_id();
+        match instr {
+            Assign(id, dest, src, _) => {
+                self.check_and_propagate(
+                    id,
+                    state,
+                    dest,
+                    src,
+                    cur_mid,
+                    cur_fid,
+                    &mut global_state,
+                    baseline_flag,
+                );
+            }
+            // Check and update operations of rets in temp_index_operation_map and operations in ret_operation_map
+            Ret(id, rets) => {
+                let ret_types = self.func_target.get_return_types();
+                for ((i, _), ret) in ret_types.iter().enumerate().zip(rets) {
+                    let ret_oper = global_state
+                        .get_ret_map()
+                        .get(&(cur_mid, cur_fid))
+                        .unwrap()
+                        .get(&i)
+                        .unwrap();
+                    let idx_oper = global_state
+                        .get_temp_index_oper(cur_mid, cur_fid, *ret, baseline_flag)
+                        .unwrap();
+
+                    if self.check_conflict(idx_oper, ret_oper) {
+                        self.func_target
+                            .func_env
+                            .module_env
+                            .env
+                            .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+                    } else {
+                        let merged = idx_oper.merge(ret_oper);
+                        if merged != *idx_oper || merged != *ret_oper {
+                            state.changed = true;
+                        }
+                        *global_state
+                            .get_mut_temp_index_oper(cur_mid, cur_fid, *ret, baseline_flag)
+                            .unwrap() = merged;
+                        global_state
+                            .get_mut_ret_map()
+                            .get_mut(&(cur_mid, cur_fid))
+                            .unwrap()
+                            .insert(i, merged);
+                    }
+                }
+            }
+            Call(id, dests, oper, srcs, _) => {
+                match oper {
+                    BorrowLoc | ReadRef | CastU8 | CastU16 | CastU32 | CastU64 | CastU128
+                    | CastU256 => {
+                        self.check_and_propagate(
+                            id,
+                            state,
+                            &dests[0],
+                            &srcs[0],
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    WriteRef | Lt | Le | Gt | Ge | Eq | Neq => {
+                        self.check_and_propagate(
+                            id,
+                            state,
+                            &srcs[0],
+                            &srcs[1],
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    Add | Sub | Mul | Div | Mod => {
+                        let mut num_oper = Arithmetic;
+                        if !self.ban_int_2_bv_conversion {
+                            let op_srcs_0 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                                .unwrap();
+                            let op_srcs_1 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[1], baseline_flag)
+                                .unwrap();
+                            let op_dests_0 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                                .unwrap();
+                            // If there is conflict among operations, merged will not be used for updating
+                            num_oper = op_srcs_0.merge(op_srcs_1).merge(op_dests_0);
+                        }
+                        self.check_and_update_oper(
+                            id,
+                            state,
+                            dests,
+                            srcs,
+                            num_oper,
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    BitOr | BitAnd | Xor => {
+                        if self.ban_int_2_bv_conversion {
+                            self.check_and_update_oper(
+                                id,
+                                state,
+                                dests,
+                                srcs,
+                                Bitwise,
+                                cur_mid,
+                                cur_fid,
+                                &mut global_state,
+                                baseline_flag,
+                            );
+                        } else {
+                            self.check_and_update_oper_dest(
+                                state,
+                                dests,
+                                Bitwise,
+                                cur_mid,
+                                cur_fid,
+                                &mut global_state,
+                                baseline_flag,
+                            )
+                        }
+                    }
+                    Shl | Shr => {
+                        let op_srcs_0 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let op_srcs_1 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, srcs[1], baseline_flag)
+                            .unwrap();
+                        let op_dests_0 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                            .unwrap();
+                        // If there is conflict among operations, merged will not be used for updating
+                        let merged = op_srcs_0.merge(op_srcs_1).merge(op_dests_0);
+                        self.check_and_update_oper(
+                            id,
+                            state,
+                            dests,
+                            srcs,
+                            merged,
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    // Checking and operations in the struct_operation_map when packing
+                    Pack(msid, sid, _) => {
+                        let struct_env = self
+                            .func_target
+                            .global_env()
+                            .get_module(*msid)
+                            .into_struct(*sid);
+                        for (i, field) in struct_env.get_fields().enumerate() {
+                            let current_field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*msid, *sid))
+                                .unwrap()
+                                .get(&field.get_id())
+                                .unwrap();
+                            let pack_oper = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[i], baseline_flag)
+                                .unwrap();
+                            if self.check_conflict(current_field_oper, pack_oper) {
+                                self.func_target.func_env.module_env.env.error(
+                                    &self.func_target.get_bytecode_loc(*id),
+                                    CONFLICT_ERROR_MSG,
+                                );
+                            } else {
+                                let merged = current_field_oper.merge(pack_oper);
+                                if merged != *current_field_oper || merged != *pack_oper {
+                                    state.changed = true;
+                                }
+                                *global_state
+                                    .get_mut_temp_index_oper(
+                                        cur_mid,
+                                        cur_fid,
+                                        srcs[i],
+                                        baseline_flag,
+                                    )
+                                    .unwrap() = merged;
+                                global_state
+                                    .struct_operation_map
+                                    .get_mut(&(*msid, *sid))
+                                    .unwrap()
+                                    .insert(field.get_id(), merged);
+                            }
+                        }
+                    }
+                    // Checking and operations in the struct_operation_map when unpacking
+                    Unpack(msid, sid, _) => {
+                        let struct_env = self
+                            .func_target
+                            .global_env()
+                            .get_module(*msid)
+                            .into_struct(*sid);
+                        for (i, field) in struct_env.get_fields().enumerate() {
+                            let current_field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*msid, *sid))
+                                .unwrap()
+                                .get(&field.get_id())
+                                .unwrap();
+                            let pack_oper = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, dests[i], baseline_flag)
+                                .unwrap();
+                            if self.check_conflict(current_field_oper, pack_oper) {
+                                self.func_target.func_env.module_env.env.error(
+                                    &self.func_target.get_bytecode_loc(*id),
+                                    CONFLICT_ERROR_MSG,
+                                );
+                            } else {
+                                let merged = current_field_oper.merge(pack_oper);
+                                if merged != *current_field_oper || merged != *pack_oper {
+                                    state.changed = true;
+                                }
+                                *global_state
+                                    .get_mut_temp_index_oper(
+                                        cur_mid,
+                                        cur_fid,
+                                        dests[i],
+                                        baseline_flag,
+                                    )
+                                    .unwrap() = merged;
+                                global_state
+                                    .struct_operation_map
+                                    .get_mut(&(*msid, *sid))
+                                    .unwrap()
+                                    .insert(field.get_id(), merged);
+                            }
+                        }
+                    }
+                    GetField(msid, sid, _, offset) | BorrowField(msid, sid, _, offset) => {
+                        let dests_oper = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let field_oper = global_state
+                            .struct_operation_map
+                            .get(&(*msid, *sid))
+                            .unwrap()
+                            .get(
+                                &self
+                                    .func_target
+                                    .func_env
+                                    .module_env
+                                    .get_struct(*sid)
+                                    .get_field_by_offset(*offset)
+                                    .get_id(),
+                            )
+                            .unwrap();
+
+                        if self.check_conflict(dests_oper, field_oper) {
+                            self.func_target
+                                .func_env
+                                .module_env
+                                .env
+                                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+                        } else {
+                            let merged_oper = dests_oper.merge(field_oper);
+                            if merged_oper != *field_oper || merged_oper != *dests_oper {
+                                state.changed = true;
+                            }
+                            *global_state
+                                .get_mut_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                                .unwrap() = merged_oper;
+                            global_state
+                                .struct_operation_map
+                                .get_mut(&(*msid, *sid))
+                                .unwrap()
+                                .insert(
+                                    self.func_target
+                                        .func_env
+                                        .module_env
+                                        .get_struct(*sid)
+                                        .get_field_by_offset(*offset)
+                                        .get_id(),
+                                    merged_oper,
+                                );
+                        }
+                    }
+                    Function(msid, fsid, _) => {
+                        let module_env = &self.func_target.global_env().get_module(*msid);
+                        // Vector functions are handled separately
+                        if !module_env.is_std_vector() && !module_env.is_table() {
+                            for (i, src) in srcs.iter().enumerate() {
+                                let cur_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, *src, baseline_flag)
+                                    .unwrap();
+                                let callee_oper = global_state
+                                    .get_temp_index_oper(*msid, *fsid, i, true)
+                                    .unwrap();
+
+                                if self.check_conflict(cur_oper, callee_oper) {
+                                    self.func_target.func_env.module_env.env.error(
+                                        &self.func_target.get_bytecode_loc(*id),
+                                        CONFLICT_ERROR_MSG,
+                                    );
+                                } else {
+                                    let merged = cur_oper.merge(callee_oper);
+                                    if merged != *cur_oper || merged != *callee_oper {
+                                        state.changed = true;
+                                    }
+                                    *global_state
+                                        .get_mut_temp_index_oper(
+                                            cur_mid,
+                                            cur_fid,
+                                            *src,
+                                            baseline_flag,
+                                        )
+                                        .unwrap() = merged;
+                                    *global_state
+                                        .get_mut_temp_index_oper(*msid, *fsid, i, true)
+                                        .unwrap() = merged;
+                                }
+                            }
+                            for (i, dest) in dests.iter().enumerate() {
+                                let cur_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, *dest, baseline_flag)
+                                    .unwrap();
+                                let callee_oper = global_state
+                                    .get_ret_map()
+                                    .get(&(*msid, *fsid))
+                                    .unwrap()
+                                    .get(&i)
+                                    .unwrap();
+                                if self.check_conflict(cur_oper, callee_oper) {
+                                    self.func_target.func_env.module_env.env.error(
+                                        &self.func_target.get_bytecode_loc(*id),
+                                        CONFLICT_ERROR_MSG,
+                                    );
+                                } else {
+                                    let merged = cur_oper.merge(callee_oper);
+                                    if merged != *cur_oper || merged != *callee_oper {
+                                        state.changed = true;
+                                    }
+                                    *global_state
+                                        .get_mut_temp_index_oper(
+                                            cur_mid,
+                                            cur_fid,
+                                            *dest,
+                                            baseline_flag,
+                                        )
+                                        .unwrap() = merged;
+                                    global_state
+                                        .get_mut_ret_map()
+                                        .get_mut(&(*msid, *fsid))
+                                        .unwrap()
+                                        .insert(i, merged);
+                                }
+                            }
+                        } else {
+                            let callee = module_env.get_function(*fsid);
+                            let callee_name = callee.get_name_str();
+                            let check_and_update_bitwise =
+                                |idx: &TempIndex,
+                                 global_state: &mut GlobalNumberOperationState,
+                                 state: &mut NumberOperationState| {
+                                    let cur_oper = global_state
+                                        .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                                        .unwrap();
+
+                                    if self.check_conflict(cur_oper, &Bitwise) {
+                                        self.func_target.func_env.module_env.env.error(
+                                            &self.func_target.get_bytecode_loc(*id),
+                                            CONFLICT_ERROR_MSG,
+                                        );
+                                    } else if *cur_oper != Bitwise {
+                                        state.changed = true;
+                                        *global_state
+                                            .get_mut_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                *idx,
+                                                baseline_flag,
+                                            )
+                                            .unwrap() = Bitwise;
+                                    }
+                                };
+                            if !srcs.is_empty() {
+                                // First element
+                                let first_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                                    .unwrap();
+                                // Bitwise is specified explicitly in the fun or struct spec
+                                if vector_table_funs_name_propogate_to_dest(&callee_name) {
+                                    if *first_oper == Bitwise {
+                                        // Do not consider the method remove_return_key where the first return value is k
+                                        for dest in dests.iter() {
+                                            check_and_update_bitwise(
+                                                dest,
+                                                &mut global_state,
+                                                state,
+                                            );
+                                        }
+                                    }
+                                } else {
+                                    let mut second_oper = first_oper;
+                                    let mut src_idx = 0;
+                                    if module_env.is_std_vector()
+                                        && vector_funs_name_propogate_to_srcs(&callee_name)
+                                    {
+                                        assert!(srcs.len() > 1);
+                                        second_oper = global_state
+                                            .get_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                srcs[1],
+                                                baseline_flag,
+                                            )
+                                            .unwrap();
+                                        src_idx = 1;
+                                    } else if table_funs_name_propogate_to_srcs(&callee_name) {
+                                        assert!(srcs.len() > 2);
+                                        second_oper = global_state
+                                            .get_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                srcs[2],
+                                                baseline_flag,
+                                            )
+                                            .unwrap();
+                                        src_idx = 2;
+                                    }
+                                    if *first_oper == Bitwise || *second_oper == Bitwise {
+                                        check_and_update_bitwise(
+                                            &srcs[0],
+                                            &mut global_state,
+                                            state,
+                                        );
+                                        check_and_update_bitwise(
+                                            &srcs[src_idx],
+                                            &mut global_state,
+                                            state,
+                                        );
+                                    }
+                                }
+                            } // empty, do nothing
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            Prop(id, _, exp) => {
+                self.handle_exp(*id, exp, &mut global_state, state);
+            }
+            _ => {}
+        }
+        self.func_target.global_env().set_extension(global_state);
+    }
+}
+
+impl<'a> DataflowAnalysis for NumberOperationAnalysis<'a> {}
+
+impl AbstractDomain for NumberOperationState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = JoinResult::Unchanged;
+        self.changed = false;
+        if other.changed {
+            result = JoinResult::Changed;
+        }
+        result
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/options.rs b/vendors/move/crates/move-stackless-bytecode/src/options.rs
new file mode 100644
index 000000000..822f127ee
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/options.rs
@@ -0,0 +1,141 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use codespan_reporting::diagnostic::Severity;
+use move_model::model::{GlobalEnv, VerificationScope};
+use serde::{Deserialize, Serialize};
+use std::rc::Rc;
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
+pub enum AutoTraceLevel {
+    Off,
+    VerifiedFunction,
+    AllFunctions,
+}
+
+impl AutoTraceLevel {
+    pub fn verified_functions(self) -> bool {
+        use AutoTraceLevel::*;
+        matches!(self, VerifiedFunction | AllFunctions)
+    }
+    pub fn functions(self) -> bool {
+        use AutoTraceLevel::*;
+        matches!(self, AllFunctions)
+    }
+    pub fn invariants(self) -> bool {
+        use AutoTraceLevel::*;
+        matches!(self, VerifiedFunction | AllFunctions)
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct ProverOptions {
+    /// Whether to only generate backend code.
+    pub generate_only: bool,
+    /// Whether to generate stubs for native functions.
+    pub native_stubs: bool,
+    /// Whether to minimize execution traces in errors.
+    pub minimize_execution_trace: bool,
+    /// Whether to omit debug information in generated model.
+    pub omit_model_debug: bool,
+    /// Whether output for e.g. diagnosis shall be stable/redacted so it can be used in test
+    /// output.
+    pub stable_test_output: bool,
+    /// Scope of what functions to verify.
+    pub verify_scope: VerificationScope,
+    /// [deprecated] Whether to emit global axiom that resources are well-formed.
+    pub resource_wellformed_axiom: bool,
+    /// Whether to assume wellformedness when elements are read from memory, instead of on
+    /// function entry.
+    pub assume_wellformed_on_access: bool,
+    /// Indicates that we should do any mutations
+    pub mutation: bool,
+    /// Indicates that we should use the add-subtract mutation on the given block
+    pub mutation_add_sub: usize,
+    /// Indicates that we should use the subtract-add mutation on the given block
+    pub mutation_sub_add: usize,
+    /// Indicates that we should use the multiply-divide mutation on the given block
+    pub mutation_mul_div: usize,
+    /// Indicates that we should use the divide-multiply mutation on the given block
+    pub mutation_div_mul: usize,
+    /// Whether to use the polymorphic boogie backend.
+    pub boogie_poly: bool,
+    /// Whether pack/unpack should recurse over the structure.
+    pub deep_pack_unpack: bool,
+    /// Auto trace level.
+    pub auto_trace_level: AutoTraceLevel,
+    /// Minimal severity level for diagnostics to be reported.
+    pub report_severity: Severity,
+    /// Whether to dump the transformed stackless bytecode to a file
+    pub dump_bytecode: bool,
+    /// Whether to dump the control-flow graphs (in dot format) to files, one per each function
+    pub dump_cfg: bool,
+    /// Number of Boogie instances to be run concurrently.
+    pub num_instances: usize,
+    /// Whether to run Boogie instances sequentially.
+    pub sequential_task: bool,
+    /// Whether to check the inconsistency
+    pub check_inconsistency: bool,
+    /// Whether to consider a function that abort unconditionally as an inconsistency violation
+    pub unconditional_abort_as_inconsistency: bool,
+    /// Whether to run the transformation passes for concrete interpretation (instead of proving)
+    pub for_interpretation: bool,
+    /// Whether to skip loop analysis.
+    pub skip_loop_analysis: bool,
+    /// Optional names of native methods (qualified with module name, e.g., m::foo) implementing
+    /// mutable borrow semantics
+    pub borrow_natives: Vec<String>,
+    /// Whether to ban convertion from int to bv at the boogie backend
+    pub ban_int_2_bv: bool,
+}
+
+// add custom struct for mutation options
+
+impl Default for ProverOptions {
+    fn default() -> Self {
+        Self {
+            generate_only: false,
+            native_stubs: false,
+            minimize_execution_trace: true,
+            omit_model_debug: false,
+            stable_test_output: false,
+            verify_scope: VerificationScope::All,
+            resource_wellformed_axiom: false,
+            assume_wellformed_on_access: false,
+            mutation: false,
+            mutation_add_sub: 0,
+            mutation_sub_add: 0,
+            mutation_mul_div: 0,
+            mutation_div_mul: 0,
+            boogie_poly: false,
+            deep_pack_unpack: false,
+            auto_trace_level: AutoTraceLevel::Off,
+            report_severity: Severity::Warning,
+            dump_bytecode: false,
+            dump_cfg: false,
+            num_instances: 1,
+            sequential_task: false,
+            check_inconsistency: false,
+            unconditional_abort_as_inconsistency: false,
+            for_interpretation: false,
+            skip_loop_analysis: false,
+            borrow_natives: vec![],
+            ban_int_2_bv: false,
+        }
+    }
+}
+
+impl ProverOptions {
+    pub fn get(env: &GlobalEnv) -> Rc<ProverOptions> {
+        if !env.has_extension::<ProverOptions>() {
+            env.set_extension(ProverOptions::default())
+        }
+        env.get_extension::<ProverOptions>().unwrap()
+    }
+
+    pub fn set(env: &GlobalEnv, options: ProverOptions) {
+        env.set_extension::<ProverOptions>(options);
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs
new file mode 100644
index 000000000..11e401f8f
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs
@@ -0,0 +1,199 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_core_types::language_storage::{StructTag, TypeTag};
+use move_model::{
+    model::{FunctionEnv, GlobalEnv},
+    ty::Type,
+};
+
+use crate::{
+    compositional_analysis::{CompositionalAnalysis, SummaryCache},
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, SetDomain},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    stackless_bytecode::{Bytecode, Operation},
+};
+
+/// Get all closed types that may be packed by (1) genesis and (2) all transaction scripts.
+/// This makes some simplifying assumptions that are not correct in general, but hold for the
+/// current Diem Framework:
+/// - Transaction scripts have at most 1 type argument
+/// - The only values that can be bound to a transaction script type argument are XUS and
+///   XDX. Passing any other values will lead to an aborted transaction.
+/// The first assumption is checked and will trigger an assert failure if violated. The second
+/// is unchecked, but would be a nice property for the prover.
+pub fn get_packed_types(
+    env: &GlobalEnv,
+    targets: &FunctionTargetsHolder,
+    coin_types: Vec<Type>,
+) -> BTreeSet<StructTag> {
+    let mut packed_types = BTreeSet::new();
+    for module_env in env.get_modules() {
+        let module_name = module_env.get_identifier().to_string();
+        let is_script = module_env.is_script_module();
+        if is_script || module_name == "Genesis" {
+            for func_env in module_env.get_functions() {
+                let fun_target = targets.get_target(&func_env, &FunctionVariant::Baseline);
+                let annotation = fun_target
+                    .get_annotations()
+                    .get::<PackedTypesState>()
+                    .expect(
+                        "Invariant violation: usage analysis should be run before calling this",
+                    );
+
+                packed_types.extend(annotation.closed_types.clone());
+                // instantiate the tx script open types with XUS, XDX
+                if is_script {
+                    let num_type_parameters = func_env.get_type_parameters().len();
+                    assert!(num_type_parameters <= 1, "Assuming that transaction scripts have <= 1 type parameters for simplicity. If there can be >1 type parameter, the code here must account for all permutations of type params");
+
+                    if num_type_parameters == 1 {
+                        for open_ty in annotation.open_types.iter() {
+                            for coin_ty in &coin_types {
+                                match open_ty.instantiate(vec![coin_ty.clone()].as_slice()).into_type_tag(env) {
+                                    Some(TypeTag::Struct(s)) =>     {
+                                        packed_types.insert(*s);
+                                    }
+                                    _ => panic!("Invariant violation: failed to specialize tx script open type {:?} into struct", open_ty),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    packed_types
+}
+
+#[derive(Debug, Clone, Default, Eq, PartialOrd, PartialEq)]
+struct PackedTypesState {
+    // Closed types (i.e., with no free type variables) that may be directly or transitively packed by this function.
+    closed_types: SetDomain<StructTag>,
+    // Open types (i.e., with free type variables) that may be directly or transitively packed by this function.
+    open_types: SetDomain<Type>,
+}
+
+impl AbstractDomain for PackedTypesState {
+    // TODO: would be cool to add a derive(Join) macro for this
+    fn join(&mut self, other: &Self) -> JoinResult {
+        match (
+            self.closed_types.join(&other.closed_types),
+            self.open_types.join(&other.open_types),
+        ) {
+            (JoinResult::Unchanged, JoinResult::Unchanged) => JoinResult::Unchanged,
+            _ => JoinResult::Changed,
+        }
+    }
+}
+
+struct PackedTypesAnalysis<'a> {
+    cache: SummaryCache<'a>,
+}
+
+impl<'a> TransferFunctions for PackedTypesAnalysis<'a> {
+    type State = PackedTypesState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut Self::State, instr: &Bytecode, _offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+
+        if let Call(_, _, oper, ..) = instr {
+            match oper {
+                Pack(mid, sid, types) => {
+                    let env = self.cache.global_env();
+                    match env.get_struct_tag(*mid, *sid, types) {
+                        Some(tag) => {
+                            // type is closed
+                            state.closed_types.insert(tag);
+                        }
+                        None => {
+                            // type is open
+                            state
+                                .open_types
+                                .insert(Type::Struct(*mid, *sid, types.clone()));
+                        }
+                    }
+                }
+                Function(mid, fid, types) => {
+                    if let Some(summary) = self
+                        .cache
+                        .get::<PackedTypesState>(mid.qualified(*fid), &FunctionVariant::Baseline)
+                    {
+                        // add closed types
+                        for ty in summary.closed_types.iter() {
+                            state.closed_types.insert(ty.clone());
+                        }
+                        // instantiate open types with the type parameters at this call site
+                        for open_ty in summary.open_types.iter() {
+                            let specialized_ty = open_ty.instantiate(types);
+                            if specialized_ty.is_open() {
+                                state.open_types.insert(specialized_ty);
+                            } else if let Some(TypeTag::Struct(s)) =
+                                specialized_ty.into_type_tag(self.cache.global_env())
+                            {
+                                state.closed_types.insert(*s);
+                            } else {
+                                panic!("Invariant violation: struct type {:?} became non-struct type after substitution", open_ty)
+                            }
+                        }
+                    }
+                    // TODO(mengxu, sam): fix the recursive function case
+                }
+                OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
+                    // skip
+                }
+                _ => (),
+            }
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for PackedTypesAnalysis<'a> {}
+impl<'a> CompositionalAnalysis<PackedTypesState> for PackedTypesAnalysis<'a> {
+    fn to_summary(
+        &self,
+        state: PackedTypesState,
+        _fun_target: &FunctionTarget,
+    ) -> PackedTypesState {
+        state
+    }
+}
+
+pub struct PackedTypesProcessor();
+impl PackedTypesProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(PackedTypesProcessor())
+    }
+}
+
+impl FunctionTargetProcessor for PackedTypesProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let initial_state = PackedTypesState::default();
+        let fun_target = FunctionTarget::new(func_env, &data);
+        let cache = SummaryCache::new(targets, func_env.module_env.env);
+        let analysis = PackedTypesAnalysis { cache };
+        let summary = analysis.summarize(&fun_target, initial_state);
+        // TODO(mengxu, sam): recursion seems to have an impact on how this analysis are conducted,
+        // resolve the TODO item above in the code and update the fixedpoint calculation logic here.
+        data.annotations.set(summary, true);
+        data
+    }
+
+    fn name(&self) -> String {
+        "packed_types_analysis".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/pipeline_factory.rs b/vendors/move/crates/move-stackless-bytecode/src/pipeline_factory.rs
new file mode 100644
index 000000000..95083f159
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/pipeline_factory.rs
@@ -0,0 +1,115 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    borrow_analysis::BorrowAnalysisProcessor,
+    clean_and_optimize::CleanAndOptimizeProcessor,
+    data_invariant_instrumentation::DataInvariantInstrumentationProcessor,
+    debug_instrumentation::DebugInstrumenter,
+    eliminate_imm_refs::EliminateImmRefsProcessor,
+    function_target_pipeline::{FunctionTargetPipeline, FunctionTargetProcessor},
+    global_invariant_analysis::GlobalInvariantAnalysisProcessor,
+    global_invariant_instrumentation::GlobalInvariantInstrumentationProcessor,
+    inconsistency_check::InconsistencyCheckInstrumenter,
+    livevar_analysis::LiveVarAnalysisProcessor,
+    loop_analysis::LoopAnalysisProcessor,
+    memory_instrumentation::MemoryInstrumentationProcessor,
+    mono_analysis::MonoAnalysisProcessor,
+    mut_ref_instrumentation::MutRefInstrumenter,
+    mutation_tester::MutationTester,
+    number_operation_analysis::NumberOperationProcessor,
+    options::ProverOptions,
+    reaching_def_analysis::ReachingDefProcessor,
+    spec_instrumentation::SpecInstrumentationProcessor,
+    usage_analysis::UsageProcessor,
+    verification_analysis::VerificationAnalysisProcessor,
+    well_formed_instrumentation::WellFormedInstrumentationProcessor,
+};
+
+pub fn default_pipeline_with_options(options: &ProverOptions) -> FunctionTargetPipeline {
+    // NOTE: the order of these processors is import!
+    let mut processors: Vec<Box<dyn FunctionTargetProcessor>> = vec![
+        DebugInstrumenter::new(),
+        // transformation and analysis
+        EliminateImmRefsProcessor::new(),
+        MutRefInstrumenter::new(),
+        ReachingDefProcessor::new(),
+        LiveVarAnalysisProcessor::new(),
+        BorrowAnalysisProcessor::new_borrow_natives(options.borrow_natives.clone()),
+        MemoryInstrumentationProcessor::new(),
+        CleanAndOptimizeProcessor::new(),
+        UsageProcessor::new(),
+        VerificationAnalysisProcessor::new(),
+    ];
+
+    if !options.skip_loop_analysis {
+        processors.push(LoopAnalysisProcessor::new());
+    }
+
+    processors.append(&mut vec![
+        // spec instrumentation
+        SpecInstrumentationProcessor::new(),
+        GlobalInvariantAnalysisProcessor::new(),
+        GlobalInvariantInstrumentationProcessor::new(),
+        WellFormedInstrumentationProcessor::new(),
+        DataInvariantInstrumentationProcessor::new(),
+        // monomorphization
+        MonoAnalysisProcessor::new(),
+    ]);
+
+    if options.mutation {
+        // pass which may do nothing
+        processors.push(MutationTester::new());
+    }
+
+    // inconsistency check instrumentation should be the last one in the pipeline
+    if options.check_inconsistency {
+        processors.push(InconsistencyCheckInstrumenter::new());
+    }
+
+    if !options.for_interpretation {
+        processors.push(NumberOperationProcessor::new());
+    }
+
+    let mut res = FunctionTargetPipeline::default();
+    for p in processors {
+        res.add_processor(p);
+    }
+    res
+}
+
+pub fn default_pipeline() -> FunctionTargetPipeline {
+    default_pipeline_with_options(&ProverOptions::default())
+}
+
+pub fn experimental_pipeline() -> FunctionTargetPipeline {
+    // Enter your pipeline here
+    let processors: Vec<Box<dyn FunctionTargetProcessor>> = vec![
+        DebugInstrumenter::new(),
+        // transformation and analysis
+        EliminateImmRefsProcessor::new(),
+        MutRefInstrumenter::new(),
+        ReachingDefProcessor::new(),
+        LiveVarAnalysisProcessor::new(),
+        BorrowAnalysisProcessor::new(),
+        MemoryInstrumentationProcessor::new(),
+        CleanAndOptimizeProcessor::new(),
+        UsageProcessor::new(),
+        VerificationAnalysisProcessor::new(),
+        LoopAnalysisProcessor::new(),
+        // spec instrumentation
+        SpecInstrumentationProcessor::new(),
+        DataInvariantInstrumentationProcessor::new(),
+        GlobalInvariantAnalysisProcessor::new(),
+        GlobalInvariantInstrumentationProcessor::new(),
+        // optimization
+        MonoAnalysisProcessor::new(),
+    ];
+
+    let mut res = FunctionTargetPipeline::default();
+    for p in processors {
+        res.add_processor(p);
+    }
+    res
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/reaching_def_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/reaching_def_analysis.rs
new file mode 100644
index 000000000..334c83f7e
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/reaching_def_analysis.rs
@@ -0,0 +1,319 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Reaching definition analysis with subsequent copy propagation.
+//
+// This analysis and transformation only propagates definitions, leaving dead assignments
+// in the code. The subsequent livevar_analysis takes care of removing those.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{ast::TempIndex, model::FunctionEnv};
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{AbortAction, BorrowNode, Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+
+/// The reaching definitions we are capturing. Currently we only capture
+/// aliases (assignment).
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Def {
+    Alias(TempIndex),
+}
+
+type DefMap = BTreeMap<TempIndex, BTreeSet<Def>>;
+type HavocSet = BTreeSet<TempIndex>;
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Default)]
+pub struct ReachingDefState {
+    pub map: DefMap,
+    pub havoced: HavocSet,
+}
+
+/// The annotation for reaching definitions. For each code position, we have a map of local
+/// indices to the set of definitions reaching the code position.
+#[derive(Default)]
+pub struct ReachingDefAnnotation(BTreeMap<CodeOffset, ReachingDefState>);
+
+pub struct ReachingDefProcessor {}
+
+impl ReachingDefProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(ReachingDefProcessor {})
+    }
+
+    /// Returns Some(temp, def) if temp has a unique reaching definition and None otherwise.
+    fn get_unique_def(
+        temp: TempIndex,
+        defs: &BTreeSet<Def>,
+        havoc_vars: &HavocSet,
+    ) -> Option<(TempIndex, TempIndex)> {
+        if defs.len() != 1 {
+            return None;
+        }
+        let Def::Alias(def) = defs.iter().next().unwrap();
+        if havoc_vars.contains(def) {
+            return None;
+        }
+        Some((temp, *def))
+    }
+
+    /// Gets the propagated local resolving aliases using the reaching definitions.
+    fn get_propagated_local(temp: TempIndex, state: &ReachingDefState) -> TempIndex {
+        // For being robust, we protect this function against cycles in alias definitions. If
+        // a cycle is detected, alias resolution stops.
+        fn get(
+            temp: TempIndex,
+            state: &ReachingDefState,
+            visited: &mut BTreeSet<TempIndex>,
+        ) -> TempIndex {
+            if let Some(defs) = state.map.get(&temp) {
+                if let Some((_, def_temp)) =
+                    ReachingDefProcessor::get_unique_def(temp, defs, &state.havoced)
+                {
+                    if visited.insert(def_temp) {
+                        return get(def_temp, state, visited);
+                    }
+                }
+            }
+            temp
+        }
+        let mut visited = BTreeSet::new();
+        get(temp, state, &mut visited)
+    }
+
+    /// Perform copy propagation based on reaching definitions analysis results.
+    pub fn copy_propagation(
+        target: &FunctionTarget<'_>,
+        code: Vec<Bytecode>,
+        defs: &ReachingDefAnnotation,
+    ) -> Vec<Bytecode> {
+        let default_state = ReachingDefState::default();
+
+        let mut res = vec![];
+        for (pc, bytecode) in code.into_iter().enumerate() {
+            let state = defs.0.get(&(pc as CodeOffset)).unwrap_or(&default_state);
+            let mut propagate = |local| Self::get_propagated_local(local, state);
+            res.push(bytecode.remap_src_vars(target, &mut propagate));
+        }
+        res
+    }
+
+    /// Compute the set of locals which are borrowed from or which are otherwise used to refer to.
+    /// We can't alias such locals to other locals because of reference semantics.
+    fn borrowed_locals(&self, code: &[Bytecode]) -> BTreeSet<TempIndex> {
+        use Bytecode::*;
+        code.iter()
+            .filter_map(|bc| match bc {
+                Call(_, _, Operation::BorrowLoc, srcs, _) => Some(srcs[0]),
+                Call(_, _, Operation::WriteBack(BorrowNode::LocalRoot(src), ..), ..)
+                | Call(_, _, Operation::IsParent(BorrowNode::LocalRoot(src), ..), ..) => Some(*src),
+                Call(_, _, Operation::WriteBack(BorrowNode::Reference(src), ..), ..)
+                | Call(_, _, Operation::IsParent(BorrowNode::Reference(src), ..), ..) => Some(*src),
+                _ => None,
+            })
+            .collect()
+    }
+}
+
+impl FunctionTargetProcessor for ReachingDefProcessor {
+    fn process(
+        &self,
+        _targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if !func_env.is_native() {
+            let cfg = StacklessControlFlowGraph::new_forward(&data.code);
+            let analyzer = ReachingDefAnalysis {
+                _target: FunctionTarget::new(func_env, &data),
+                borrowed_locals: self.borrowed_locals(&data.code),
+            };
+            let block_state_map = analyzer.analyze_function(
+                ReachingDefState {
+                    map: BTreeMap::new(),
+                    havoced: BTreeSet::new(),
+                },
+                &data.code,
+                &cfg,
+            );
+            let per_bytecode_state =
+                analyzer.state_per_instruction(block_state_map, &data.code, &cfg, |before, _| {
+                    before.clone()
+                });
+
+            // Run copy propagation transformation.
+            let annotations = ReachingDefAnnotation(per_bytecode_state);
+            let code = std::mem::take(&mut data.code);
+            let target = FunctionTarget::new(func_env, &data);
+            let new_code = Self::copy_propagation(&target, code, &annotations);
+            data.code = new_code;
+
+            // Currently we do not need reaching defs after this phase. If so in the future, we
+            // need to uncomment this statement.
+            //data.annotations.set(annotations);
+        }
+
+        data
+    }
+
+    fn name(&self) -> String {
+        "reaching_def_analysis".to_string()
+    }
+}
+
+struct ReachingDefAnalysis<'a> {
+    _target: FunctionTarget<'a>,
+    borrowed_locals: BTreeSet<TempIndex>,
+}
+
+impl<'a> ReachingDefAnalysis<'a> {}
+
+impl<'a> TransferFunctions for ReachingDefAnalysis<'a> {
+    type State = ReachingDefState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut ReachingDefState, instr: &Bytecode, _offset: CodeOffset) {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+        match instr {
+            Assign(_, dest, src, _) => {
+                state.kill(*dest);
+                if !self.borrowed_locals.contains(dest) && !self.borrowed_locals.contains(src) {
+                    state.def_alias(*dest, *src);
+                }
+            }
+            Load(_, dest, ..) => {
+                state.kill(*dest);
+            }
+            Call(_, dests, oper, _, on_abort) => {
+                // generic kills
+                for dest in dests {
+                    state.kill(*dest);
+                }
+                if let Some(AbortAction(_, dest)) = on_abort {
+                    state.kill(*dest);
+                }
+                // op-specific actions
+                match oper {
+                    WriteBack(LocalRoot(local_root), ..) => {
+                        state.kill(*local_root);
+                    }
+                    Havoc(_) => {
+                        state.havoc(dests[0]);
+                    }
+                    _ => (),
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for ReachingDefAnalysis<'a> {}
+
+impl AbstractDomain for ReachingDefState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = JoinResult::Unchanged;
+        for idx in self.map.keys().cloned().collect_vec() {
+            if let Some(other_defs) = other.map.get(&idx) {
+                // Union of definitions
+                let defs = self.map.get_mut(&idx).unwrap();
+                for d in other_defs {
+                    if defs.insert(d.clone()) {
+                        result = JoinResult::Changed;
+                    }
+                }
+            } else {
+                // Kill this definition as it is not contained in both incoming states.
+                self.map.remove(&idx);
+                result = JoinResult::Changed;
+            }
+        }
+        result
+    }
+}
+
+impl ReachingDefState {
+    fn def_alias(&mut self, dest: TempIndex, src: TempIndex) {
+        // ensure that the previous def is killed
+        assert!(!self.map.contains_key(&dest));
+
+        // cascade the definition
+        for defs in self.map.values_mut() {
+            if defs.contains(&Def::Alias(dest)) {
+                defs.insert(Def::Alias(src));
+            }
+        }
+
+        // update the new alias
+        self.map.entry(dest).or_default().insert(Def::Alias(src));
+    }
+
+    fn kill(&mut self, dest: TempIndex) {
+        self.map.remove(&dest);
+        self.havoced.remove(&dest);
+    }
+
+    fn havoc(&mut self, dest: TempIndex) {
+        self.havoced.insert(dest);
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+/// Format a reaching definition annotation.
+pub fn format_reaching_def_annotation(
+    target: &FunctionTarget<'_>,
+    code_offset: CodeOffset,
+) -> Option<String> {
+    if let Some(ReachingDefAnnotation(map)) =
+        target.get_annotations().get::<ReachingDefAnnotation>()
+    {
+        if let Some(map_at) = map.get(&code_offset) {
+            let mut res = map_at
+                .map
+                .iter()
+                .map(|(idx, defs)| {
+                    let name = target.get_local_name(*idx);
+                    format!(
+                        "{} -> {{{}}}",
+                        name.display(target.symbol_pool()),
+                        defs.iter()
+                            .map(|def| {
+                                match def {
+                                    Def::Alias(a) => {
+                                        let local_name = format!(
+                                            "{}",
+                                            target.get_local_name(*a).display(target.symbol_pool())
+                                        );
+                                        if map_at.havoced.contains(a) {
+                                            format!("{}, {}*", local_name, local_name)
+                                        } else {
+                                            local_name
+                                        }
+                                    }
+                                }
+                            })
+                            .join(", ")
+                    )
+                })
+                .join(", ");
+            res.insert_str(0, "reach: ");
+            return Some(res);
+        }
+    }
+    None
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/read_write_set_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/read_write_set_analysis.rs
new file mode 100644
index 000000000..8e859f395
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/read_write_set_analysis.rs
@@ -0,0 +1,909 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! The read/write set analysis is a compositional analysis that starts from the leaves of the
+//! call graph and analyzes each procedure once. The result is a summary of the abstract paths
+//! read/written by each procedure and the value(s) returned by the procedure.
+//!
+//! When the analysis encounters a call, it fetches the summary for the callee and applies it to the
+//! current state. This logic (implemented in `apply_summary`) is by far the most complex part of themove
+//! analysis.
+
+use std::{fmt, fmt::Formatter};
+
+use move_binary_format::file_format::CodeOffset;
+use move_core_types::language_storage::TypeTag;
+use move_model::{
+    ast::TempIndex,
+    model::{FunctionEnv, GlobalEnv, ModuleId, StructId},
+    ty::Type,
+};
+use move_read_write_set_types::{
+    Access, AccessPath as RWAccessPath, Offset as RWOffset, ReadWriteSet, Root as RWRoot,
+    RootAddress as RWRootAddress,
+};
+
+use crate::{
+    access_path::{AbsAddr, AccessPath, AccessPathMap, Addr, FootprintDomain, Offset, Root},
+    access_path_trie::AccessPathTrie,
+    compositional_analysis::{CompositionalAnalysis, SummaryCache},
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    stackless_bytecode::{Bytecode, Constant, Operation},
+};
+
+// =================================================================================================
+// Data Model
+
+/// A record of the glocals and locals accessed by the current procedure + the address values stored
+/// by locals or globals
+#[derive(Debug, Clone, Eq, PartialOrd, PartialEq, Default)]
+pub struct ReadWriteSetState {
+    /// memory accessed so far
+    accesses: AccessPathTrie<Access>,
+    /// mapping from locals to formal or global roots
+    locals: AccessPathTrie<AbsAddr>,
+}
+
+/// A abstract `ReadWriteSetState` that has been (fully or partially) concretized by substituting
+/// concrete values. Represented as a separate type to avoid confusion/comparison with an
+/// overapproximate `ReadWriteSet`
+#[derive(Debug, Clone, Eq, PartialOrd, PartialEq)]
+pub struct SpecializedReadWriteSetState(AccessPathTrie<Access>);
+
+// =================================================================================================
+// Abstract Domain Operations
+
+impl ReadWriteSetState {
+    // TODO: figure out how to reuse this in apply_footprint
+    pub fn sub_actuals(
+        accesses: AccessPathTrie<Access>,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        fun_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+    ) -> AccessPathTrie<Access> {
+        // (1) bind all footprint values and types in callee accesses to their caller values
+        let mut new_accesses =
+            accesses.substitute_footprint_skip_data(actuals, type_actuals, fun_env, sub_map);
+        // (2) bind footprint paths in callee accesses with their caller values
+        for (callee_i, caller_i) in actuals.iter().enumerate() {
+            let formal_i = Root::from_index(callee_i, fun_env);
+            let actual_i = AccessPath::from_index(*caller_i, fun_env);
+            // sub_map should always be generated to contain all actuals
+            let actual_v = sub_map
+                .get_access_path(actual_i)
+                .expect("actual not found in caller state");
+            assert!(
+                formal_i.is_formal(),
+                "Arity mismatch between caller and callee for {}; given {} actuals for {} formals",
+                fun_env.get_full_name_str(),
+                actuals.len(),
+                fun_env.get_parameter_count(),
+            );
+            if let Some(node) = new_accesses.remove(&formal_i) {
+                let formal_ap = AccessPath::new(formal_i, vec![]);
+                for v in formal_ap.prepend_addrs(actual_v).iter() {
+                    match v {
+                        Addr::Footprint(ap) => {
+                            new_accesses.join_access_path(ap.clone(), node.clone());
+                        }
+                        Addr::Constant(c) => {
+                            for (offset, child) in node.children().iter() {
+                                match offset {
+                                    Offset::Global(g) => {
+                                        // create new root out of c/g, add c/g/child to summary
+                                        new_accesses.join_access_path(
+                                            AccessPath::new_global_constant(c.clone(), g.clone()),
+                                            child.clone(),
+                                        )
+                                    }
+                                    o => panic!("Bad offset type {:?} for address base", o),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        new_accesses
+    }
+
+    /// Apply `callee_summary` to the caller state in `self`. There are three steps.
+    /// 1. Substitute footprint values in the callee summary with their values in the caller state (including both actuals and values read from globals)
+    /// 2. Bind return values in the callee summary to the return variables in the caller state
+    /// 3. Join caller accesses and callee accesses
+    pub fn apply_summary(
+        &mut self, // caller state
+        callee_summary_: &Self,
+        actuals: &[TempIndex],
+        type_actuals: &[Type],
+        returns: &[TempIndex],
+        caller_fun_env: &FunctionEnv,
+        callee_fun_env: &FunctionEnv,
+    ) {
+        // TODO: refactor this to work without copies
+        let callee_summary = callee_summary_.clone();
+        // (1) bind all footprint values and types in callee locals to their caller values
+        let mut new_callee_locals = callee_summary.locals.substitute_footprint(
+            actuals,
+            type_actuals,
+            caller_fun_env,
+            &self.locals,
+            AbsAddr::substitute_footprint,
+        );
+        // (2) bind all footprint values and types in callee accesses to their caller values
+        let mut new_callee_accesses = callee_summary.accesses.substitute_footprint_skip_data(
+            actuals,
+            type_actuals,
+            caller_fun_env,
+            &self.locals,
+        );
+        // (3) bind footprint paths in callee accesses with their caller values
+        for (i_callee, i_caller) in actuals.iter().enumerate() {
+            let formal_i = Root::from_index(i_callee, callee_fun_env);
+            let actual_v = self
+                .locals
+                .get_local(*i_caller, caller_fun_env)
+                .cloned()
+                .unwrap_or_default();
+            assert!(
+                formal_i.is_formal(),
+                "Arity mismatch between caller and callee"
+            );
+            if let Some(node) = new_callee_accesses.remove(&formal_i) {
+                let formal_ap = AccessPath::new(formal_i, vec![]);
+                if actual_v.is_empty() {
+                    continue;
+                }
+                for v in formal_ap.prepend_addrs(&actual_v).iter() {
+                    match v {
+                        Addr::Footprint(ap) => {
+                            self.accesses.join_access_path(ap.clone(), node.clone());
+                        }
+                        Addr::Constant(c) => {
+                            for (offset, child) in node.children().iter() {
+                                match offset {
+                                    Offset::Global(g) => {
+                                        // create new root out of c/g, add c/g/child to summary
+                                        self.accesses.join_access_path(
+                                            AccessPath::new_global_constant(c.clone(), g.clone()),
+                                            child.clone(),
+                                        )
+                                    }
+                                    o => panic!("Bad offset type {:?} for address base", o),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        // (4) bind return values in caller locals
+        for (i, ret) in returns.iter().enumerate() {
+            let retvar_i = Root::Return(i);
+            if let Some(node) = new_callee_locals.remove(&retvar_i) {
+                self.locals.bind_local_node(*ret, node, caller_fun_env)
+            }
+        }
+        // (5) join caller and callee accesses
+        // TODO: can we do a strong update here in some cases?
+        self.accesses.join(&new_callee_accesses);
+    }
+
+    pub fn assign_local(
+        &mut self,
+        lhs_index: TempIndex,
+        rhs_index: TempIndex,
+        func_env: &FunctionEnv,
+    ) {
+        self.assign_root(Root::from_index(lhs_index, func_env), rhs_index, func_env)
+    }
+
+    pub fn assign_root(&mut self, lhs: Root, rhs_index: TempIndex, func_env: &FunctionEnv) {
+        if let Some(rhs_data) = self.locals.get_local(rhs_index, func_env).cloned() {
+            self.locals.bind_root(lhs, rhs_data);
+            self.record_access(rhs_index, Access::Read, func_env)
+        } else if let Some(rhs_node) = self.locals.get_local_node(rhs_index, func_env).cloned() {
+            self.locals.bind_node(lhs, rhs_node);
+        }
+    }
+
+    /// Return the local access paths rooted in `addr_idx`/`mid`::`sid`<`types`>
+    fn get_global_paths(
+        &self,
+        addr_idx: TempIndex,
+        mid: &ModuleId,
+        sid: StructId,
+        types: &[Type],
+        fun_env: &FunctionEnv,
+    ) -> Vec<AccessPath> {
+        let mut acc = vec![];
+        for v in self
+            .locals
+            .get_local(addr_idx, fun_env)
+            .unwrap_or_else(|| panic!("Untracked local {:?} of address type", addr_idx))
+            .iter()
+        {
+            acc.push(v.clone().add_struct_offset(mid, sid, types.to_vec()))
+        }
+        acc
+    }
+
+    /// Remove the local access paths rooted `addr_idx`/`mid`::`sid`<`types`>
+    pub fn remove_global(
+        &mut self,
+        addr_idx: TempIndex,
+        mid: &ModuleId,
+        sid: StructId,
+        types: &[Type],
+        fun_env: &FunctionEnv,
+    ) {
+        for ap in self.get_global_paths(addr_idx, mid, sid, types, fun_env) {
+            self.locals.update_access_path(ap, None)
+        }
+    }
+
+    /// Record an access of type `access` to the path `local_idx`/`mid`::`sid`<`types`>
+    fn add_global_access(
+        &mut self,
+        local_idx: TempIndex,
+        mid: &ModuleId,
+        sid: StructId,
+        types: &[Type],
+        access: Access,
+        fun_env: &FunctionEnv,
+    ) {
+        for ap in self.get_global_paths(local_idx, mid, sid, types, fun_env) {
+            self.accesses.update_access_path_weak(ap, Some(access))
+        }
+    }
+
+    /// Record an access of type `access` to the local variable `local_idx`
+    fn record_access(&mut self, local_idx: TempIndex, access: Access, fun_env: &FunctionEnv) {
+        for p in self
+            .locals
+            .get_local(local_idx, fun_env)
+            .unwrap_or_else(|| panic!("Unbound local {:?}", local_idx))
+            .iter()
+        {
+            if let Addr::Footprint(ap) = p {
+                self.accesses
+                    .update_access_path_weak(ap.clone(), Some(access))
+            }
+        }
+    }
+
+    /// Record an access of type `access_type` to the path `base`/`offset`
+    pub fn access_offset(
+        &mut self,
+        base: TempIndex,
+        offset: Offset,
+        access_type: Access,
+        fun_env: &FunctionEnv,
+    ) {
+        let borrowed = self
+            .locals
+            .get_local(base, fun_env)
+            .unwrap_or_else(|| panic!("Unbound local {:?}", base))
+            .clone();
+        let extended_aps = borrowed.add_offset(offset);
+        for ap in extended_aps.footprint_paths() {
+            self.accesses
+                .update_access_path_weak(ap.clone(), Some(access_type))
+        }
+    }
+
+    /// Assign `ret` = `base`/`offset` and record an access of type `access_type` to `base`/`offset`
+    pub fn assign_offset(
+        &mut self,
+        ret: TempIndex,
+        base: TempIndex,
+        offset: Offset,
+        access_type: Option<Access>,
+        fun_env: &FunctionEnv,
+    ) {
+        let borrowed_opt = self.locals.get_local(base, fun_env);
+        if let Some(borrowed) = borrowed_opt {
+            let extended_aps = borrowed.add_offset(offset);
+            for ap in extended_aps.footprint_paths() {
+                self.locals
+                    .update_access_path(ap.clone(), Some(AbsAddr::footprint(ap.clone())));
+                if access_type.is_some() {
+                    self.accesses.update_access_path(ap.clone(), access_type)
+                }
+            }
+            self.locals.bind_local(ret, extended_aps, fun_env)
+        } else {
+            let ap = AccessPath::new(Root::from_index(base, fun_env), vec![offset]);
+            let borrowed = self
+                .locals
+                .get_access_path(ap)
+                .unwrap_or_else(|| panic!("Unbound local {:?}", base))
+                .clone();
+            self.locals.bind_local(ret, borrowed, fun_env)
+        }
+    }
+
+    /// Write `rhs` to `lhs_ref`
+    pub fn write_ref(&mut self, lhs_ref: TempIndex, rhs: TempIndex, fun_env: &FunctionEnv) {
+        if let Some(rhs_val) = self.locals.get_local(rhs, fun_env).cloned() {
+            let lhs_paths = self
+                .locals
+                .get_local(lhs_ref, fun_env)
+                .expect("Unbound local")
+                .clone();
+            for ap in lhs_paths.footprint_paths() {
+                self.locals
+                    .update_access_path(ap.clone(), Some(rhs_val.clone()))
+            }
+        }
+    }
+
+    /// Substitute concrete values `actuals` and `type_actuals` into `self`
+    pub fn substitute_footprint_concrete(
+        self,
+        actuals: &[TempIndex],
+        type_actuals: &[TypeTag],
+        func_env: &FunctionEnv,
+        sub_map: &dyn AccessPathMap<AbsAddr>,
+        env: &GlobalEnv,
+    ) -> SpecializedReadWriteSetState {
+        let accesses = self.accesses.substitute_footprint_concrete(
+            actuals,
+            type_actuals,
+            func_env,
+            sub_map,
+            env,
+        );
+        SpecializedReadWriteSetState(accesses)
+    }
+
+    pub fn accesses(&self) -> &AccessPathTrie<Access> {
+        &self.accesses
+    }
+
+    pub fn locals(&self) -> &AccessPathTrie<AbsAddr> {
+        &self.locals
+    }
+
+    /// Return a wrapper of `self` that implements `Display` using `env`
+    pub fn display<'a>(&'a self, env: &'a FunctionEnv) -> ReadWriteSetStateDisplay<'a> {
+        ReadWriteSetStateDisplay { state: self, env }
+    }
+}
+
+impl SpecializedReadWriteSetState {
+    /// Return true if `self` has no dynamic components and can be converted into a compact
+    /// set of concrete access paths
+    pub fn is_statically_known(&self) -> bool {
+        self.0.keys_statically_known()
+    }
+}
+
+// =================================================================================================
+// Joins
+
+impl AbstractDomain for ReadWriteSetState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        match (
+            self.accesses.join(&other.accesses),
+            self.locals.join(&other.locals),
+        ) {
+            (JoinResult::Unchanged, JoinResult::Unchanged) => JoinResult::Unchanged,
+            _ => JoinResult::Changed,
+        }
+    }
+}
+
+impl FootprintDomain for Access {
+    fn make_footprint(_ap: AccessPath) -> Option<Self> {
+        None
+    }
+}
+
+impl AbstractDomain for Access {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        if self == other {
+            return JoinResult::Unchanged;
+        }
+        // unequal; use top value
+        *self = Access::ReadWrite;
+        JoinResult::Changed
+    }
+}
+
+// =================================================================================================
+// Transfer functions
+
+struct ReadWriteSetAnalysis<'a> {
+    cache: SummaryCache<'a>,
+    func_env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> TransferFunctions for ReadWriteSetAnalysis<'a> {
+    type State = ReadWriteSetState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut Self::State, instr: &Bytecode, _offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+
+        let func_env = &self.func_env;
+        match instr {
+            Call(_, rets, oper, args, _abort_action) => match oper {
+                BorrowField(_mid, _sid, _types, fld) => {
+                    if state.locals.local_exists(args[0], func_env) {
+                        state.assign_offset(rets[0], args[0], Offset::field(*fld), None, func_env);
+                    }
+                }
+                ReadRef => {
+                    if state.locals.local_exists(args[0], func_env) {
+                        // rets[0] = args[0]
+                        state.assign_local(rets[0], args[0], func_env)
+                    }
+                }
+                WriteRef => {
+                    state.record_access(args[0], Access::Write, func_env);
+                    // *args[0] = args1
+                    state.write_ref(args[0], args[1], func_env)
+                }
+                FreezeRef | BorrowLoc => state.assign_local(rets[0], args[0], func_env),
+                BorrowGlobal(mid, sid, types) => {
+                    // borrow_global<T>(a). bind ret to a/T
+                    let addrs = state
+                        .locals
+                        .get_local(args[0], func_env)
+                        .expect("Unbound address local")
+                        .clone();
+                    let offset = Offset::global(mid, *sid, types.clone());
+                    let mut extended_aps: AbsAddr = AbsAddr::default();
+                    for p in addrs.iter() {
+                        match p {
+                            Addr::Footprint(ap) => {
+                                let mut extended_ap = ap.clone();
+                                extended_ap.add_offset(offset.clone());
+                                extended_aps.insert(Addr::Footprint(extended_ap.clone()));
+                                state.locals.update_access_path(extended_ap.clone(), None);
+                            }
+                            Addr::Constant(c) => {
+                                let extended_ap = AccessPath::new_address_constant(
+                                    c.clone(),
+                                    mid,
+                                    *sid,
+                                    types.clone(),
+                                );
+                                extended_aps.insert(Addr::footprint(extended_ap));
+                            }
+                        }
+                    }
+                    state.locals.bind_local(rets[0], extended_aps, func_env)
+                }
+                MoveFrom(mid, sid, types) => {
+                    state.add_global_access(args[0], mid, *sid, types, Access::Write, func_env);
+                    state.remove_global(args[0], mid, *sid, types, func_env)
+                }
+                MoveTo(mid, sid, types) => {
+                    state.add_global_access(args[1], mid, *sid, types, Access::Write, func_env);
+                }
+                Exists(mid, sid, types) => {
+                    state.add_global_access(args[0], mid, *sid, types, Access::Read, func_env)
+                }
+                Function(mid, fid, types) => {
+                    let fun_id = mid.qualified(*fid);
+                    let global_env = self.cache.global_env();
+                    let callee_fun_env = global_env.get_function(fun_id);
+                    if let Some(callee_summary) = self
+                        .cache
+                        .get::<ReadWriteSetState>(fun_id, &FunctionVariant::Baseline)
+                    {
+                        state.apply_summary(
+                            callee_summary,
+                            args,
+                            types,
+                            rets,
+                            func_env,
+                            &callee_fun_env,
+                        );
+                    } else {
+                        // native fun. use handwritten model
+                        call_native_function(
+                            state,
+                            callee_fun_env.module_env.get_identifier().as_str(),
+                            callee_fun_env.get_identifier().as_str(),
+                            args,
+                            rets,
+                            func_env,
+                        )
+                    }
+                }
+                OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
+                    // skip
+                }
+                Uninit => {
+                    // do nothing, this marks a reference (args[0]) but the ref is only defined later
+                }
+                Destroy => state.locals.remove_local(args[0], func_env),
+                Eq | Neq => {
+                    // These operations read reference types passed to them. Add Access::Read's for both operands
+                    if state.locals.local_exists(args[0], func_env) {
+                        state.record_access(args[0], Access::Read, func_env)
+                    }
+                    if state.locals.local_exists(args[1], func_env) {
+                        state.record_access(args[1], Access::Read, func_env)
+                    }
+                }
+                Pack(_mid, sid, _types) => {
+                    // rets[0] = Pack<mid::sid<types>>(args)
+                    for (arg_index, fld) in func_env
+                        .module_env
+                        .get_struct(*sid)
+                        .get_fields()
+                        .enumerate()
+                    {
+                        let ty = fld.get_type();
+                        if ty.is_address() || ty.is_struct() || ty.is_vector() {
+                            if let Some(rhs) = state
+                                .locals
+                                .get_local_node(args[arg_index], func_env)
+                                .cloned()
+                            {
+                                // rets[0]/fld = args[arg_index]
+                                let mut ap = AccessPath::from_index(rets[0], func_env);
+                                ap.add_offset(Offset::field(fld.get_offset()));
+                                // TODO: join, or can we do a strong update?
+                                state.locals.join_access_path(ap, rhs);
+                            }
+                        }
+                    }
+                }
+                Unpack(_mid, sid, _types) => {
+                    // rets = Unpack<mid::sid<types>>(args[0])
+                    if state.locals.local_exists(args[0], func_env) {
+                        for (ret_index, fld) in func_env
+                            .module_env
+                            .get_struct(*sid)
+                            .get_fields()
+                            .enumerate()
+                        {
+                            let ty = fld.get_type();
+                            if ty.is_address() || ty.is_struct() || ty.is_vector() {
+                                // rets[ret_index] = args[0]/fld
+                                state.assign_offset(
+                                    rets[ret_index],
+                                    args[0],
+                                    Offset::field(fld.get_offset()),
+                                    // TODO: add Some(Read) here?
+                                    None,
+                                    func_env,
+                                );
+                            }
+                        }
+                    }
+                }
+                CastU8 | CastU64 | CastU128 | Not | Add | Sub | Mul | Div | Mod | BitOr
+                | BitAnd | Xor | Shl | Shr | Lt | Gt | Le | Ge | Or | And => {
+                    // These operations touch non-reference values; nothing to do
+                }
+                oper => unimplemented!("unsupported oper {:?}", oper),
+            },
+            Load(_attr_id, lhs, constant) => {
+                if let Constant::Address(a) = constant {
+                    state
+                        .locals
+                        .bind_local(*lhs, AbsAddr::constant(a.clone()), func_env)
+                }
+            }
+            Assign(_attr_id, lhs, rhs, _assign_kind) => state.assign_local(*lhs, *rhs, func_env),
+            Ret(_attr_id, rets) => {
+                for (ret_index, ret_val) in rets.iter().enumerate() {
+                    state.assign_root(Root::Return(ret_index), *ret_val, func_env)
+                }
+            }
+            Abort(..) => {}
+            SaveMem(..) | Prop(..) | SaveSpecVar(..) | Branch(..) | Jump(..) | Label(..)
+            | Nop(..) => (),
+        }
+    }
+}
+
+/// Execute `rets` = call `module_name`::`function_name`(`args`) in `state`
+fn call_native_function(
+    state: &mut ReadWriteSetState,
+    module_name: &str,
+    fun_name: &str,
+    args: &[TempIndex],
+    rets: &[TempIndex],
+    func_env: &FunctionEnv,
+) {
+    // native fun. use handwritten model
+    match (module_name, fun_name) {
+        ("bcs", "to_bytes") => {
+            if state.locals.local_exists(args[0], func_env) {
+                state.record_access(args[0], Access::Read, func_env)
+            }
+        }
+        ("signer", "borrow_address") => {
+            if state.locals.local_exists(args[0], func_env) {
+                // treat as identity function
+                state.assign_local(rets[0], args[0], func_env)
+            }
+        }
+        ("vector", "borrow_mut") | ("vector", "borrow") => {
+            if state.locals.local_exists(args[0], func_env) {
+                // this will look at vector length. record as read of an index
+                state.access_offset(args[0], Offset::VectorIndex, Access::Read, func_env);
+                state.assign_offset(rets[0], args[0], Offset::VectorIndex, None, func_env)
+            }
+        }
+        ("vector", "length") | ("vector", "is_empty") => {
+            if state.locals.local_exists(args[0], func_env) {
+                state.record_access(args[0], Access::Read, func_env)
+            }
+        }
+        ("vector", "pop_back") => {
+            if state.locals.local_exists(args[0], func_env) {
+                // this will look at vector length. record as read of an index
+                state.access_offset(args[0], Offset::VectorIndex, Access::Read, func_env);
+                state.access_offset(args[0], Offset::VectorIndex, Access::Write, func_env);
+                state.assign_offset(
+                    rets[0],
+                    args[0],
+                    Offset::VectorIndex,
+                    Some(Access::Read),
+                    func_env,
+                )
+            }
+        }
+        ("vector", "push_back") | ("vector", "append") | ("vector", "swap") => {
+            if state.locals.local_exists(args[0], func_env) {
+                // this will look at vector length. record as read of an index
+                state.access_offset(args[0], Offset::VectorIndex, Access::Read, func_env);
+                // writes an index (or several indexes)
+                state.access_offset(args[0], Offset::VectorIndex, Access::Write, func_env);
+            }
+        }
+        ("vector", "contains") => {
+            if state.locals.local_exists(args[0], func_env) {
+                state.record_access(args[0], Access::Read, func_env); // reads the length + contents
+            }
+        }
+        ("Account", "create_signer") => {
+            if state.locals.local_exists(args[0], func_env) {
+                state.record_access(args[0], Access::Read, func_env); // reads the input address
+                                                                      // treat as assignment
+                state.assign_local(rets[0], args[0], func_env)
+            }
+        }
+        ("DiemAccount", "create_signer") => {
+            if state.locals.local_exists(args[0], func_env) {
+                state.record_access(args[0], Access::Read, func_env); // reads the input address
+                                                                      // treat as assignment
+                state.assign_local(rets[0], args[0], func_env)
+            }
+        }
+        ("vector", "empty") | ("vector", "destroy_empty") | ("vector", "reverse") => (),
+        ("string", "internal_check_utf8")
+        | ("string", "internal_is_char_boundary")
+        | ("string", "internal_sub_string")
+        | ("string", "internal_index_of") => (),
+        ("event", "write_to_event_store") => (),
+        ("hash", "sha3_256") | ("hash", "sha2_256") => (),
+        ("Signature", "ed25519_validate_pubkey") | ("Signature", "ed25519_verify") => (),
+        (m, f) => {
+            panic!("Unsupported native function {:?}::{:?}", m, f)
+        }
+    }
+}
+
+impl<'a> DataflowAnalysis for ReadWriteSetAnalysis<'a> {}
+impl<'a> CompositionalAnalysis<ReadWriteSetState> for ReadWriteSetAnalysis<'a> {
+    fn to_summary(&self, mut state: Self::State, fun_target: &FunctionTarget) -> ReadWriteSetState {
+        // remove locals to keep summary compact
+        for i in fun_target.get_non_parameter_locals() {
+            state.locals.remove_local(i, fun_target.func_env)
+        }
+        // remove locals with no offsets
+        for i in fun_target.get_parameters() {
+            if let Some(node) = state.locals.get_local_node(i, fun_target.func_env) {
+                if node.children().is_empty() {
+                    state.locals.remove_local(i, fun_target.func_env)
+                }
+            }
+        }
+
+        // collect access paths only associated with a single addr s.t. ap = { Footprint(ap) }
+        let aps_to_remove =
+            state
+                .locals
+                .filter_map_paths(|ap, addrs| match (addrs.iter().next(), addrs.len()) {
+                    (Some(Addr::Footprint(x)), 1) if x == ap => Some(ap.clone()),
+                    _ => None,
+                });
+        for ap in aps_to_remove.iter() {
+            state.locals.remove_node(ap.clone());
+        }
+
+        state
+    }
+}
+pub struct ReadWriteSetProcessor();
+impl ReadWriteSetProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(ReadWriteSetProcessor())
+    }
+}
+
+impl FunctionTargetProcessor for ReadWriteSetProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let fun_target = FunctionTarget::new(func_env, &data);
+        let mut initial_state = ReadWriteSetState::default();
+        // initialize_formals
+        for param_index in fun_target.get_parameters() {
+            initial_state.locals.bind_local(
+                param_index,
+                AbsAddr::formal(param_index, func_env),
+                func_env,
+            )
+        }
+        let cache = SummaryCache::new(targets, func_env.module_env.env);
+        let analysis = ReadWriteSetAnalysis { cache, func_env };
+        let summary = analysis.summarize(&fun_target, initial_state);
+        // TODO(mengxu, sam): recursion seems to have an impact on how this analysis are conducted,
+        // revisit the code logic and update the fixedpoint calculation logic here.
+        data.annotations.set(summary, true);
+        data
+    }
+
+    fn name(&self) -> String {
+        "read_write_set_analysis".to_string()
+    }
+}
+
+// =================================================================================================
+// Entrypoint for clients
+
+pub fn get_read_write_set(env: &GlobalEnv, targets: &FunctionTargetsHolder) {
+    for module_env in env.get_modules() {
+        let module_name = module_env.get_identifier().to_string();
+        for func_env in module_env.get_functions() {
+            let fun_target = targets.get_target(&func_env, &FunctionVariant::Baseline);
+            let annotation = fun_target
+                .get_annotations()
+                .get::<ReadWriteSetState>()
+                .expect(
+                "Invariant violation: read/write set analysis should be run before calling this",
+            );
+            println!("{}::{}", module_name, func_env.get_identifier());
+            println!("{}", annotation.display(fun_target.func_env))
+        }
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+/// Return a string representation of the summary for `target`
+pub fn format_read_write_set_annotation(
+    target: &FunctionTarget<'_>,
+    code_offset: CodeOffset,
+) -> Option<String> {
+    // hack: the summary only contains the state at the exit block, but the
+    // caller of this function wants to print at every `code_offset`. This
+    // allows us to only print once/function
+    // TODO: change printing interface to allow optional per-procedure and per-bytecode printing
+    if code_offset != 0 {
+        return None;
+    }
+    target
+        .get_annotations()
+        .get::<ReadWriteSetState>()
+        .map(|a| format!("{}", a.display(target.func_env)))
+}
+
+pub struct ReadWriteSetStateDisplay<'a> {
+    state: &'a ReadWriteSetState,
+    env: &'a FunctionEnv<'a>,
+}
+
+impl<'a> fmt::Display for ReadWriteSetStateDisplay<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.write_str("Accesses:\n")?;
+        writeln!(f, "{}", self.state.accesses.display(self.env))?;
+        f.write_str("Locals:\n")?;
+        self.state.locals.iter_paths(|path, v| {
+            writeln!(f, "{}: {}", path.display(self.env), v.display(self.env)).unwrap();
+        });
+        Ok(())
+    }
+}
+
+// =================================================================================================
+// Converting Infer Result into standalone types
+
+impl Offset {
+    pub fn normalize(&self, env: &GlobalEnv) -> RWOffset {
+        match self {
+            Offset::Field(idx) => RWOffset::Field(*idx),
+            Offset::VectorIndex => RWOffset::VectorIndex,
+            Offset::Global(s) => RWOffset::Global(
+                s.get_type()
+                    .into_struct_type(env)
+                    .expect("Failed to normalize type"),
+            ),
+        }
+    }
+}
+
+impl AccessPath {
+    pub fn normalize(&self, env: &GlobalEnv) -> Vec<RWAccessPath> {
+        let mut normalized_offset = self
+            .offsets()
+            .iter()
+            .map(|offset| offset.normalize(env))
+            .collect::<Vec<_>>();
+
+        let roots = match self.root() {
+            Root::Formal(idx) => {
+                if normalized_offset.is_empty() {
+                    return vec![];
+                }
+                let access_type = if let RWOffset::Global(ty) = normalized_offset.remove(0) {
+                    ty
+                } else {
+                    return vec![];
+                };
+                vec![RWRoot {
+                    root: RWRootAddress::Formal(*idx),
+                    type_: access_type,
+                }]
+            }
+            Root::Global(key) => {
+                let access_type = key
+                    .struct_type()
+                    .get_type()
+                    .into_struct_type(env)
+                    .expect("None struct type found in global key");
+                key.address()
+                    .get_concrete_addresses()
+                    .into_iter()
+                    .map(|addr| RWRoot {
+                        root: RWRootAddress::Const(addr),
+                        type_: access_type.clone(),
+                    })
+                    .collect()
+            }
+            Root::Local(_) | Root::Return(_) => panic!("Malformed root"),
+        };
+
+        roots
+            .into_iter()
+            .map(|root| RWAccessPath {
+                root,
+                offsets: normalized_offset.clone(),
+            })
+            .collect()
+    }
+}
+
+impl ReadWriteSetState {
+    pub fn normalize(&self, env: &GlobalEnv) -> ReadWriteSet {
+        let mut analysis_result = ReadWriteSet::new();
+        self.accesses.iter_paths(|access_path, access| {
+            let access_pathes = access_path.normalize(env);
+            for concrete_access_path in access_pathes {
+                analysis_result.add_access_path(concrete_access_path, *access);
+            }
+        });
+        analysis_result
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/spec_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/spec_instrumentation.rs
new file mode 100644
index 000000000..7152ca6cd
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/spec_instrumentation.rs
@@ -0,0 +1,1175 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Transformation which injects specifications (Move function spec blocks) into the bytecode.
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+};
+
+use itertools::Itertools;
+
+use move_model::{
+    ast,
+    ast::{Exp, ExpData, TempIndex, Value},
+    exp_generator::ExpGenerator,
+    model::{FunId, FunctionEnv, GlobalEnv, Loc, ModuleId, QualifiedId, QualifiedInstId, StructId},
+    pragmas::{ABORTS_IF_IS_PARTIAL_PRAGMA, EMITS_IS_PARTIAL_PRAGMA, EMITS_IS_STRICT_PRAGMA},
+    spec_translator::{SpecTranslator, TranslatedSpec},
+    ty::{Type, TypeDisplayContext, BOOL_TYPE, NUM_TYPE},
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    livevar_analysis::LiveVarAnalysisProcessor,
+    options::ProverOptions,
+    reaching_def_analysis::ReachingDefProcessor,
+    stackless_bytecode::{
+        AbortAction, AssignKind, AttrId, BorrowEdge, BorrowNode, Bytecode, HavocKind, Label,
+        Operation, PropKind,
+    },
+    usage_analysis, verification_analysis,
+};
+
+const REQUIRES_FAILS_MESSAGE: &str = "precondition does not hold at this call";
+const ENSURES_FAILS_MESSAGE: &str = "post-condition does not hold";
+const ABORTS_IF_FAILS_MESSAGE: &str = "function does not abort under this condition";
+const ABORT_NOT_COVERED: &str = "abort not covered by any of the `aborts_if` clauses";
+const ABORTS_CODE_NOT_COVERED: &str =
+    "abort code not covered by any of the `aborts_if` or `aborts_with` clauses";
+const EMITS_FAILS_MESSAGE: &str = "function does not emit the expected event";
+const EMITS_NOT_COVERED: &str = "emitted event not covered by any of the `emits` clauses";
+
+fn modify_check_fails_message(
+    env: &GlobalEnv,
+    mem: QualifiedId<StructId>,
+    targs: &[Type],
+) -> String {
+    let targs_str = if targs.is_empty() {
+        "".to_string()
+    } else {
+        let tctx = TypeDisplayContext::WithEnv {
+            env,
+            type_param_names: None,
+        };
+        format!(
+            "<{}>",
+            targs
+                .iter()
+                .map(|ty| ty.display(&tctx).to_string())
+                .join(", ")
+        )
+    };
+    let module_env = env.get_module(mem.module_id);
+    format!(
+        "caller does not have permission to modify `{}::{}{}` at given address",
+        module_env.get_name().display(env.symbol_pool()),
+        module_env
+            .get_struct(mem.id)
+            .get_name()
+            .display(env.symbol_pool()),
+        targs_str
+    )
+}
+
+//  ================================================================================================
+/// # Spec Instrumenter
+
+pub struct SpecInstrumentationProcessor {}
+
+impl SpecInstrumentationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for SpecInstrumentationProcessor {
+    fn initialize(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        // Perform static analysis part of modifies check.
+        check_modifies(env, targets);
+    }
+
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        mut data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        assert_eq!(data.variant, FunctionVariant::Baseline);
+        if fun_env.is_native() || fun_env.is_intrinsic() {
+            return data;
+        }
+
+        let options = ProverOptions::get(fun_env.module_env.env);
+        let verification_info =
+            verification_analysis::get_info(&FunctionTarget::new(fun_env, &data));
+        let is_verified = verification_info.verified;
+        let is_inlined = verification_info.inlined;
+
+        if is_verified {
+            // Create a clone of the function data, moving annotations
+            // out of this data and into the clone.
+            let mut verification_data =
+                data.fork(FunctionVariant::Verification(VerificationFlavor::Regular));
+            verification_data =
+                Instrumenter::run(&options, targets, fun_env, verification_data, scc_opt);
+            targets.insert_target_data(
+                &fun_env.get_qualified_id(),
+                verification_data.variant.clone(),
+                verification_data,
+            );
+        }
+
+        // Instrument baseline variant only if it is inlined.
+        if is_inlined {
+            Instrumenter::run(&options, targets, fun_env, data, scc_opt)
+        } else {
+            // Clear code but keep function data stub.
+            // TODO(refactoring): the stub is currently still needed because boogie_wrapper
+            //   seems to access information about it, which it should not in fact.
+            // NOTE(mengxu): do not clear the code if we are instrumenting for the interpreter.
+            // For functions whose verification is turned off with `pragma verify=false` or due to
+            // other reasons, we still want to keep a copy of the code in baseline.
+            if !options.for_interpretation {
+                data.code = vec![];
+            }
+            data
+        }
+    }
+
+    fn name(&self) -> String {
+        "spec_instrumenter".to_string()
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut fmt::Formatter,
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        writeln!(f, "\n\n==== spec-instrumenter input specs ====\n")?;
+        for ref module in env.get_modules() {
+            if !module.is_target() {
+                continue;
+            }
+            for ref fun in module.get_functions() {
+                for (variant, target) in targets.get_targets(fun) {
+                    let spec = target.get_spec();
+                    if !spec.conditions.is_empty() {
+                        writeln!(
+                            f,
+                            "fun {}[{}]\n{}",
+                            fun.get_full_name_str(),
+                            variant,
+                            fun.module_env.env.display(spec)
+                        )?;
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+struct Instrumenter<'a> {
+    options: &'a ProverOptions,
+    builder: FunctionDataBuilder<'a>,
+    ret_locals: Vec<TempIndex>,
+    ret_label: Label,
+    can_return: bool,
+    abort_local: TempIndex,
+    abort_label: Label,
+    can_abort: bool,
+    mem_info: &'a BTreeSet<QualifiedInstId<StructId>>,
+}
+
+impl<'a> Instrumenter<'a> {
+    fn run(
+        options: &'a ProverOptions,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv<'a>,
+        data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        // Pre-collect properties in the original function data
+        let props: Vec<_> = data
+            .code
+            .iter()
+            .filter_map(|bc| match bc {
+                Bytecode::Prop(id, PropKind::Assume, exp)
+                | Bytecode::Prop(id, PropKind::Assert, exp) => Some((*id, exp.clone())),
+                _ => None,
+            })
+            .collect();
+
+        let mut builder = FunctionDataBuilder::new(fun_env, data);
+
+        // Create label and locals for unified return exit point. We translate each `Ret(t..)`
+        // instruction into `Assign(r.., t..); Jump(RetLab)`.
+        let ret_locals = builder
+            .data
+            .return_types
+            .clone()
+            .into_iter()
+            .map(|ty| builder.new_temp(ty))
+            .collect_vec();
+        let ret_label = builder.new_label();
+
+        // Similarly create label and local for unified abort exit point. We translate `Abort(c)`
+        // into `Assign(r, c); Jump(AbortLabel)`, as well as `Call(..)` into `Call(..);
+        // OnAbort(AbortLabel, r)`. The `OnAbort` is a new instruction: if the last
+        // call aborted, it stores the abort code in `r` and jumps to the label.
+        let abort_local = builder.new_temp(NUM_TYPE.clone());
+        let abort_label = builder.new_label();
+
+        // Translate the specification. This deals with elimination of `old(..)` expressions,
+        // as well as replaces `result_n` references with `ret_locals`.
+        let auto_trace = options.auto_trace_level.verified_functions()
+            && builder.data.variant.is_verified()
+            || options.auto_trace_level.functions();
+        let spec = SpecTranslator::translate_fun_spec(
+            auto_trace,
+            false,
+            &mut builder,
+            fun_env,
+            &[],
+            None,
+            &ret_locals,
+        );
+
+        // Translate inlined properties. This deals with elimination of `old(..)` expressions in
+        // inlined spec blocks
+        let inlined_props: BTreeMap<_, _> = props
+            .into_iter()
+            .map(|(id, prop)| {
+                let loc = builder.get_loc(id);
+                (
+                    id,
+                    SpecTranslator::translate_inline_property(
+                        &loc,
+                        auto_trace,
+                        &mut builder,
+                        &prop,
+                    ),
+                )
+            })
+            .collect();
+
+        let mut mem_info = BTreeSet::new();
+
+        if auto_trace {
+            // Retrieve the memory used by the function
+            mem_info =
+                usage_analysis::get_memory_usage(&FunctionTarget::new(fun_env, &builder.data))
+                    .accessed
+                    .get_all_inst(&builder.data.type_args);
+        }
+
+        // Create and run the instrumenter.
+        let mut instrumenter = Instrumenter {
+            options,
+            builder,
+            ret_locals,
+            ret_label,
+            can_return: false,
+            abort_local,
+            abort_label,
+            can_abort: false,
+            mem_info: &mem_info,
+        };
+        instrumenter.instrument(&spec, &inlined_props);
+
+        // Run copy propagation (reaching definitions) and then assignment
+        // elimination (live vars). This cleans up some redundancy created by
+        // the instrumentation scheme.
+        let mut data = instrumenter.builder.data;
+        let reach_def = ReachingDefProcessor::new();
+        let live_vars = LiveVarAnalysisProcessor::new_no_annotate();
+        data = reach_def.process(targets, fun_env, data, scc_opt);
+        live_vars.process(targets, fun_env, data, scc_opt)
+    }
+
+    fn is_verified(&self) -> bool {
+        self.builder.data.variant.is_verified()
+    }
+
+    fn instrument(
+        &mut self,
+        spec: &TranslatedSpec,
+        inlined_props: &BTreeMap<AttrId, (TranslatedSpec, Exp)>,
+    ) {
+        use Bytecode::*;
+        use PropKind::*;
+
+        // Extract and clear current code
+        let old_code = std::mem::take(&mut self.builder.data.code);
+
+        // Emit `let` bindings.
+        self.emit_lets(spec, false);
+
+        // Inject preconditions as assumes. This is done for all self.variant values.
+        self.builder
+            .set_loc(self.builder.fun_env.get_loc().at_start()); // reset to function level
+        for (loc, exp) in spec.pre_conditions(&self.builder) {
+            self.builder.set_loc(loc);
+            self.builder
+                .emit_with(move |attr_id| Prop(attr_id, Assume, exp))
+        }
+
+        if self.is_verified() {
+            // Inject 'CanModify' assumptions for this function.
+            for (loc, exp) in &spec.modifies {
+                let struct_ty = self.builder.global_env().get_node_type(exp.node_id());
+                self.generate_modifies_check(
+                    PropKind::Assume,
+                    spec,
+                    loc,
+                    &struct_ty,
+                    exp,
+                    exp.call_args()[0].to_owned(),
+                );
+            }
+
+            // For the verification variant, we generate post-conditions. Inject any state
+            // save instructions needed for this.
+            for translated_spec in
+                std::iter::once(spec).chain(inlined_props.values().map(|(s, _)| s))
+            {
+                for (mem, label) in &translated_spec.saved_memory {
+                    let mem = mem.clone();
+                    self.builder
+                        .emit_with(|attr_id| SaveMem(attr_id, *label, mem));
+                }
+                for (spec_var, label) in &translated_spec.saved_spec_vars {
+                    let spec_var = spec_var.clone();
+                    self.builder
+                        .emit_with(|attr_id| SaveSpecVar(attr_id, *label, spec_var));
+                }
+                let saved_params = translated_spec.saved_params.clone();
+                self.emit_save_for_old(&saved_params);
+            }
+        } else {
+            // The inlined variant may have an inlined spec that used "old" values - these need to
+            // be saved in both cases
+            assert!(
+                verification_analysis::get_info(&FunctionTarget::new(
+                    self.builder.fun_env,
+                    &self.builder.data
+                ))
+                .inlined
+            );
+            for translated_spec in inlined_props.values().map(|(s, _)| s) {
+                let saved_params = translated_spec.saved_params.clone();
+                self.emit_save_for_old(&saved_params);
+            }
+        }
+
+        // Instrument and generate new code
+        for bc in old_code {
+            self.instrument_bytecode(spec, inlined_props, bc);
+        }
+
+        // Generate return and abort blocks
+        if self.can_return {
+            self.generate_return_block(spec);
+        }
+        if self.can_abort {
+            self.generate_abort_block(spec);
+        }
+    }
+
+    fn instrument_bytecode(
+        &mut self,
+        spec: &TranslatedSpec,
+        inlined_props: &BTreeMap<AttrId, (TranslatedSpec, Exp)>,
+        bc: Bytecode,
+    ) {
+        use Bytecode::*;
+        use Operation::*;
+
+        // Prefix with modifies checks for builtin memory modifiers. Notice that we assume
+        // the BorrowGlobal at this point represents a mutation and immutable references have
+        // been removed.
+        match &bc {
+            Call(id, _, BorrowGlobal(mid, sid, targs), srcs, _)
+            | Call(id, _, MoveFrom(mid, sid, targs), srcs, _) => {
+                let addr_exp = self.builder.mk_temporary(srcs[0]);
+                self.generate_modifies_check(
+                    PropKind::Assert,
+                    spec,
+                    &self.builder.get_loc(*id),
+                    &Type::Struct(*mid, *sid, targs.to_owned()),
+                    &addr_exp,
+                    addr_exp.clone(),
+                );
+            }
+            Call(id, _, MoveTo(mid, sid, targs), srcs, _) => {
+                let addr_exp = self.builder.mk_temporary(srcs[1]);
+                self.generate_modifies_check(
+                    PropKind::Assert,
+                    spec,
+                    &self.builder.get_loc(*id),
+                    &Type::Struct(*mid, *sid, targs.to_owned()),
+                    &addr_exp,
+                    addr_exp.clone(),
+                );
+            }
+            _ => {}
+        }
+
+        // Instrument bytecode.
+        match bc {
+            Ret(id, results) => {
+                self.builder.set_loc_from_attr(id);
+                for (i, r) in self.ret_locals.clone().into_iter().enumerate() {
+                    self.builder
+                        .emit_with(|id| Assign(id, r, results[i], AssignKind::Move));
+                }
+                let ret_label = self.ret_label;
+                self.builder.emit_with(|id| Jump(id, ret_label));
+                self.can_return = true;
+            }
+            Abort(id, code) => {
+                self.builder.set_loc_from_attr(id);
+                let abort_local = self.abort_local;
+                let abort_label = self.abort_label;
+                self.builder
+                    .emit_with(|id| Assign(id, abort_local, code, AssignKind::Move));
+                self.builder.emit_with(|id| Jump(id, abort_label));
+                self.can_abort = true;
+            }
+            Call(id, dests, Function(mid, fid, targs), srcs, aa) => {
+                self.instrument_call(id, dests, mid, fid, targs, srcs, aa);
+            }
+            Call(id, dests, oper, srcs, _) if oper.can_abort() => {
+                self.builder.emit(Call(
+                    id,
+                    dests,
+                    oper,
+                    srcs,
+                    Some(AbortAction(self.abort_label, self.abort_local)),
+                ));
+                self.can_abort = true;
+            }
+            Prop(id, kind @ PropKind::Assume, prop) | Prop(id, kind @ PropKind::Assert, prop) => {
+                match inlined_props.get(&id) {
+                    None => {
+                        self.builder.emit(Prop(id, kind, prop));
+                    }
+                    Some((translated_spec, exp)) => {
+                        // Logic specifically for generating code of updating global spec variables in the function body
+                        if *exp == prop && !translated_spec.updates.is_empty() {
+                            self.emit_updates(translated_spec);
+                        } else {
+                            self.emit_traces(translated_spec, exp);
+                            self.builder.emit(Prop(id, kind, exp.clone()));
+                        }
+                    }
+                }
+            }
+            _ => self.builder.emit(bc),
+        }
+    }
+
+    fn instrument_call(
+        &mut self,
+        id: AttrId,
+        dests: Vec<TempIndex>,
+        mid: ModuleId,
+        fid: FunId,
+        targs: Vec<Type>,
+        srcs: Vec<TempIndex>,
+        aa: Option<AbortAction>,
+    ) {
+        use Bytecode::*;
+        use PropKind::*;
+        let targs = &targs; // linter does not allow `ref targs` parameter
+
+        let env = self.builder.global_env();
+
+        let callee_env = env.get_module(mid).into_function(fid);
+        let callee_opaque = callee_env.is_opaque();
+        let mut callee_spec = SpecTranslator::translate_fun_spec(
+            self.options.auto_trace_level.functions(),
+            true,
+            &mut self.builder,
+            &callee_env,
+            targs,
+            Some(&srcs),
+            &dests,
+        );
+
+        self.builder.set_loc_from_attr(id);
+
+        // Emit `let` assignments.
+        self.emit_lets(&callee_spec, false);
+        self.builder.set_loc_from_attr(id);
+
+        // Emit pre conditions if this is the verification variant or if the callee
+        // is opaque. For inlined callees outside of verification entry points, we skip
+        // emitting any pre-conditions because they are assumed already at entry into the
+        // function.
+        if self.is_verified() || callee_opaque {
+            for (loc, cond) in callee_spec.pre_conditions(&self.builder) {
+                self.emit_traces(&callee_spec, &cond);
+                // Determine whether we want to emit this as an assertion or an assumption.
+                let prop_kind = match self.builder.data.variant {
+                    FunctionVariant::Verification(..) => {
+                        self.builder
+                            .set_loc_and_vc_info(loc, REQUIRES_FAILS_MESSAGE);
+                        Assert
+                    }
+                    FunctionVariant::Baseline => Assume,
+                };
+                self.builder.emit_with(|id| Prop(id, prop_kind, cond));
+            }
+        }
+
+        // Emit modify permissions as assertions if this is the verification variant. For
+        // non-verification variants, we don't need to do this because they are independently
+        // verified.
+        if self.is_verified() {
+            let loc = self.builder.get_loc(id);
+            for (_, exp) in &callee_spec.modifies {
+                let rty = env.get_node_type(exp.node_id());
+                let new_addr = exp.call_args()[0].clone();
+                self.generate_modifies_check(
+                    PropKind::Assert,
+                    &callee_spec,
+                    &loc,
+                    &rty,
+                    exp,
+                    new_addr,
+                );
+            }
+        }
+
+        // From here on code differs depending on whether the callee is opaque or not.
+        if !callee_env.is_opaque() || self.options.for_interpretation {
+            self.builder.emit(Call(
+                id,
+                dests,
+                Operation::Function(mid, fid, targs.clone()),
+                srcs,
+                Some(AbortAction(self.abort_label, self.abort_local)),
+            ));
+            self.can_abort = true;
+        } else {
+            // Generates OpaqueCallBegin.
+            self.generate_opaque_call(
+                dests.clone(),
+                mid,
+                fid,
+                targs,
+                srcs.clone(),
+                aa.clone(),
+                true,
+            );
+
+            // Emit saves for parameters used in old(..) context. Those can be referred
+            // to in aborts conditions, and must be initialized before evaluating those.
+            self.emit_save_for_old(&callee_spec.saved_params);
+
+            let callee_aborts_if_is_partial =
+                callee_env.is_pragma_true(ABORTS_IF_IS_PARTIAL_PRAGMA, || false);
+
+            // Translate the abort condition. If the abort_cond_temp_opt is None, it indicates
+            // that the abort condition is known to be false, so we can skip the abort handling.
+            let (abort_cond_temp_opt, code_cond) =
+                self.generate_abort_opaque_cond(callee_aborts_if_is_partial, &callee_spec);
+            if let Some(abort_cond_temp) = abort_cond_temp_opt {
+                let abort_local = self.abort_local;
+                let abort_label = self.abort_label;
+                let no_abort_label = self.builder.new_label();
+                let abort_here_label = self.builder.new_label();
+                self.builder
+                    .emit_with(|id| Branch(id, abort_here_label, no_abort_label, abort_cond_temp));
+                self.builder.emit_with(|id| Label(id, abort_here_label));
+                if let Some(cond) = code_cond {
+                    self.emit_traces(&callee_spec, &cond);
+                    self.builder.emit_with(move |id| Prop(id, Assume, cond));
+                }
+                self.builder.emit_with(move |id| {
+                    Call(id, vec![], Operation::TraceAbort, vec![abort_local], None)
+                });
+                self.builder.emit_with(|id| Jump(id, abort_label));
+                self.builder.emit_with(|id| Label(id, no_abort_label));
+                self.can_abort = true;
+            }
+
+            // Emit memory state saves
+            for (mem, label) in std::mem::take(&mut callee_spec.saved_memory) {
+                self.builder.emit_with(|id| SaveMem(id, label, mem));
+            }
+            for (var, label) in std::mem::take(&mut callee_spec.saved_spec_vars) {
+                self.builder.emit_with(|id| SaveSpecVar(id, label, var));
+            }
+
+            // Emit modifies properties which havoc memory at the modified location.
+            for (_, exp) in std::mem::take(&mut callee_spec.modifies) {
+                self.emit_traces(&callee_spec, &exp);
+                self.builder.emit_with(|id| Prop(id, Modifies, exp));
+            }
+
+            // Havoc all &mut parameters, their post-value are to be determined by the post
+            // conditions.
+            //
+            // There is some special case here about EventHandle types. Even though
+            // they are `&mut`, they are never modified, and this is not expressed in the
+            // specifications. We treat this by skipping the Havoc for them. TODO: find a better
+            // solution
+            let mut_srcs = srcs
+                .iter()
+                .cloned()
+                .filter(|src| {
+                    let ty = &self.builder.data.local_types[*src];
+                    ty.is_mutable_reference()
+                        && !self
+                            .builder
+                            .global_env()
+                            .is_wellknown_event_handle_type(ty.skip_reference())
+                })
+                .collect_vec();
+            for src in &mut_srcs {
+                self.builder.emit_with(|id| {
+                    Call(
+                        id,
+                        vec![*src],
+                        Operation::Havoc(HavocKind::MutationValue),
+                        vec![],
+                        None,
+                    )
+                });
+            }
+
+            // Emit placeholders for assuming well-formedness of return values and mutable ref
+            // parameters.
+            for idx in mut_srcs.into_iter().chain(dests.iter().cloned()) {
+                let exp = self.builder.mk_call(
+                    &BOOL_TYPE,
+                    ast::Operation::WellFormed,
+                    vec![self.builder.mk_temporary(idx)],
+                );
+                self.builder.emit_with(move |id| Prop(id, Assume, exp));
+            }
+
+            // Emit `let post` assignments.
+            self.emit_lets(&callee_spec, true);
+
+            // Emit spec var updates.
+            self.emit_updates(&callee_spec);
+
+            // Emit post conditions as assumptions.
+            for (_, cond) in std::mem::take(&mut callee_spec.post) {
+                self.emit_traces(&callee_spec, &cond);
+                self.builder.emit_with(|id| Prop(id, Assume, cond));
+            }
+
+            // Emit the events in the `emits` specs of the callee.
+            for (_, msg, handle, cond) in std::mem::take(&mut callee_spec.emits) {
+                self.emit_traces(&callee_spec, &msg);
+                self.emit_traces(&callee_spec, &handle);
+                if let Some(c) = &cond {
+                    self.emit_traces(&callee_spec, c);
+                }
+
+                let temp_msg = self.builder.emit_let(msg).0;
+                // the event handle needs to be let-bound without the reference as we do not want
+                // to create mutable references via Assume(Identical) as it complicates both
+                // the live var analysis and the borrow analysis.
+                let temp_handle = self.builder.emit_let_skip_reference(handle).0;
+
+                let mut temp_list = vec![temp_msg, temp_handle];
+                if let Some(cond) = cond {
+                    temp_list.push(self.builder.emit_let(cond).0);
+                }
+                self.builder
+                    .emit(Call(id, vec![], Operation::EmitEvent, temp_list, None));
+            }
+            // TODO: We treat the emits spec of a opaque function "strictly" for convenience,
+            //   ignoring its own EMITS_IS_STRICT_PRAGMA flag.
+            if callee_env.is_pragma_true(EMITS_IS_PARTIAL_PRAGMA, || false) {
+                self.builder
+                    .emit(Call(id, vec![], Operation::EventStoreDiverge, vec![], None));
+            }
+
+            // Generate OpaqueCallEnd instruction if invariant_v2.
+            self.generate_opaque_call(dests, mid, fid, targs, srcs, aa, false);
+        }
+    }
+
+    fn emit_save_for_old(&mut self, vars: &BTreeMap<TempIndex, TempIndex>) {
+        use Bytecode::*;
+        for (idx, saved_idx) in vars {
+            if self.builder.data.local_types[*idx].is_reference() {
+                self.builder.emit_with(|attr_id| {
+                    Call(
+                        attr_id,
+                        vec![*saved_idx],
+                        Operation::ReadRef,
+                        vec![*idx],
+                        None,
+                    )
+                })
+            } else {
+                self.builder
+                    .emit_with(|attr_id| Assign(attr_id, *saved_idx, *idx, AssignKind::Copy))
+            }
+        }
+    }
+
+    fn emit_updates(&mut self, spec: &TranslatedSpec) {
+        for (loc, lhs, rhs) in &spec.updates {
+            // Emit update of lhs, which is guaranteed to represent a ghost memory access.
+            // We generate the actual byte code operations which would appear on a regular
+            // memory update, such that subsequent phases (like invariant instrumentation)
+            // interpret this like any other memory access.
+            self.builder.set_loc(loc.clone());
+            self.emit_traces(spec, lhs);
+            self.emit_traces(spec, rhs);
+
+            // Extract the ghost mem from lhs
+            let (ghost_mem, _field_id, addr) = lhs
+                .extract_ghost_mem_access(self.builder.global_env())
+                .expect("lhs of update valid");
+            let ghost_mem_ty = ghost_mem.to_type();
+
+            // Construct new ghost mem struct value from rhs. We assign the struct value
+            // directly, ignoring the `_field_id`. This is currently possible because
+            // each ghost memory struct contains exactly one field. Should this change,
+            // this code here needs to be generalized.
+            let (rhs_temp, _) = self.builder.emit_let(self.builder.mk_call_with_inst(
+                &ghost_mem_ty,
+                ghost_mem.inst.clone(),
+                ast::Operation::Pack(ghost_mem.module_id, ghost_mem.id),
+                vec![rhs.clone()],
+            ));
+
+            // Update memory. We create a mut ref for the location then write the value back to it.
+            let (addr_temp, _) = self.builder.emit_let(addr);
+            let mem_ref = self
+                .builder
+                .new_temp(Type::Reference(true, Box::new(ghost_mem_ty)));
+            // mem_ref = borrow_global_mut<ghost_mem>(addr)
+            self.builder.emit_with(|id| {
+                Bytecode::Call(
+                    id,
+                    vec![mem_ref],
+                    Operation::BorrowGlobal(
+                        ghost_mem.module_id,
+                        ghost_mem.id,
+                        ghost_mem.inst.clone(),
+                    ),
+                    vec![addr_temp],
+                    None,
+                )
+            });
+            // *mem_ref = rhs_temp
+            self.builder.emit_with(|id| {
+                Bytecode::Call(
+                    id,
+                    vec![],
+                    Operation::WriteRef,
+                    vec![mem_ref, rhs_temp],
+                    None,
+                )
+            });
+            // write_back[GhostMem](mem_ref)
+            self.builder.emit_with(|id| {
+                Bytecode::Call(
+                    id,
+                    vec![],
+                    Operation::WriteBack(
+                        BorrowNode::GlobalRoot(ghost_mem.clone()),
+                        BorrowEdge::Direct,
+                    ),
+                    vec![mem_ref],
+                    None,
+                )
+            });
+        }
+    }
+
+    fn emit_lets(&mut self, spec: &TranslatedSpec, post_state: bool) {
+        use Bytecode::*;
+        let lets = spec
+            .lets
+            .iter()
+            .filter(|(_, is_post, ..)| *is_post == post_state);
+        for (loc, _, temp, exp) in lets {
+            self.emit_traces(spec, exp);
+            self.builder.set_loc(loc.to_owned());
+            let assign = self
+                .builder
+                .mk_identical(self.builder.mk_temporary(*temp), exp.clone());
+            self.builder
+                .emit_with(|id| Prop(id, PropKind::Assume, assign));
+        }
+    }
+
+    /// Emit traces which are related to the `emitted_exp`.
+    fn emit_traces(&mut self, spec: &TranslatedSpec, emitted_exp: &ExpData) {
+        use Bytecode::*;
+        // Collect all node_ids from the expression which is emitted and select those traces
+        // from the spec which have those ids.
+        let node_ids = emitted_exp.node_ids().into_iter().collect::<BTreeSet<_>>();
+        let traces = spec
+            .debug_traces
+            .iter()
+            .filter(|(_, _, exp)| node_ids.contains(&exp.node_id()));
+        for (node_id, kind, exp) in traces {
+            let env = self.builder.global_env();
+            let loc = env.get_node_loc(*node_id);
+            if !exp.free_vars(env).is_empty() {
+                continue;
+            }
+            self.builder.set_loc(loc);
+            let temp = if let ExpData::Temporary(_, temp) = exp.as_ref() {
+                *temp
+            } else {
+                self.builder.emit_let(exp.clone()).0
+            };
+            self.builder.emit_with(|id| {
+                Call(
+                    id,
+                    vec![],
+                    Operation::TraceExp(*kind, *node_id),
+                    vec![temp],
+                    None,
+                )
+            });
+        }
+
+        // Collects related global memory.
+        for memory in self.mem_info {
+            self.builder.emit_with(|id| {
+                Call(
+                    id,
+                    vec![],
+                    Operation::TraceGlobalMem(memory.clone()),
+                    vec![],
+                    None,
+                )
+            });
+        }
+    }
+
+    fn generate_abort_block(&mut self, spec: &TranslatedSpec) {
+        use Bytecode::*;
+        // Set the location to the function and emit label.
+        let fun_loc = self.builder.fun_env.get_loc().at_end();
+        self.builder.set_loc(fun_loc);
+        let abort_label = self.abort_label;
+        self.builder.emit_with(|id| Label(id, abort_label));
+
+        if self.is_verified() {
+            self.generate_abort_verify(spec);
+        }
+
+        // Emit abort
+        let abort_local = self.abort_local;
+        self.builder.emit_with(|id| Abort(id, abort_local));
+    }
+
+    /// Generates verification conditions for abort block.
+    fn generate_abort_verify(&mut self, spec: &TranslatedSpec) {
+        use Bytecode::*;
+        use PropKind::*;
+
+        let is_partial = self
+            .builder
+            .fun_env
+            .is_pragma_true(ABORTS_IF_IS_PARTIAL_PRAGMA, || false);
+
+        if !is_partial {
+            // If not partial, emit an assertion for the overall aborts condition.
+            if let Some(cond) = spec.aborts_condition(&self.builder) {
+                let loc = self.builder.fun_env.get_spec_loc();
+                self.emit_traces(spec, &cond);
+                self.builder.set_loc_and_vc_info(loc, ABORT_NOT_COVERED);
+                self.builder.emit_with(move |id| Prop(id, Assert, cond));
+            }
+        }
+
+        if spec.has_aborts_code_specs() {
+            // If any codes are specified, emit an assertion for the code condition.
+            let actual_code = self.builder.mk_temporary(self.abort_local);
+            if let Some(code_cond) = spec.aborts_code_condition(&self.builder, &actual_code) {
+                let loc = self.builder.fun_env.get_spec_loc();
+                self.emit_traces(spec, &code_cond);
+                self.builder
+                    .set_loc_and_vc_info(loc, ABORTS_CODE_NOT_COVERED);
+                self.builder
+                    .emit_with(move |id| Prop(id, Assert, code_cond));
+            }
+        }
+    }
+
+    /// Generates an abort condition for assumption in opaque calls. This returns a temporary
+    /// in which the abort condition is stored, plus an optional expression which constraints
+    /// the abort code. If the 1st return value is None, it indicates that the abort condition
+    /// is known to be false.
+    fn generate_abort_opaque_cond(
+        &mut self,
+        is_partial: bool,
+        spec: &TranslatedSpec,
+    ) -> (Option<TempIndex>, Option<Exp>) {
+        let aborts_cond = if is_partial {
+            None
+        } else {
+            spec.aborts_condition(&self.builder)
+        };
+        let aborts_cond_temp = if let Some(cond) = aborts_cond {
+            if matches!(cond.as_ref(), ExpData::Value(_, Value::Bool(false))) {
+                return (None, None);
+            }
+            // Introduce a temporary to hold the value of the aborts condition.
+            self.builder.emit_let(cond).0
+        } else {
+            // Introduce a havoced temporary to hold an arbitrary value for the aborts
+            // condition.
+            self.builder.emit_let_havoc(BOOL_TYPE.clone()).0
+        };
+        let aborts_code_cond = if spec.has_aborts_code_specs() {
+            let actual_code = self.builder.mk_temporary(self.abort_local);
+            spec.aborts_code_condition(&self.builder, &actual_code)
+        } else {
+            None
+        };
+        (Some(aborts_cond_temp), aborts_code_cond)
+    }
+
+    fn generate_return_block(&mut self, spec: &TranslatedSpec) {
+        use Bytecode::*;
+        use PropKind::*;
+
+        // Set the location to the function and emit label.
+        self.builder
+            .set_loc(self.builder.fun_env.get_loc().at_end());
+        let ret_label = self.ret_label;
+        self.builder.emit_with(|id| Label(id, ret_label));
+
+        // Emit specification variable updates. They are generated for both verified and inlined
+        // function variants, as the evolution of state updates is always the same.
+        let lets_emitted = if !spec.updates.is_empty() {
+            self.emit_lets(spec, true);
+            self.emit_updates(spec);
+            true
+        } else {
+            false
+        };
+
+        if self.is_verified() {
+            // Emit `let` bindings if not already emitted.
+            if !lets_emitted {
+                self.emit_lets(spec, true);
+            }
+
+            // Emit the negation of all aborts conditions.
+            for (loc, abort_cond, _) in &spec.aborts {
+                self.emit_traces(spec, abort_cond);
+                let exp = self.builder.mk_not(abort_cond.clone());
+                self.builder
+                    .set_loc_and_vc_info(loc.clone(), ABORTS_IF_FAILS_MESSAGE);
+                self.builder.emit_with(|id| Prop(id, Assert, exp))
+            }
+
+            // Emit all post-conditions which must hold as we do not abort.
+            for (loc, cond) in &spec.post {
+                self.emit_traces(spec, cond);
+                self.builder
+                    .set_loc_and_vc_info(loc.clone(), ENSURES_FAILS_MESSAGE);
+                self.builder
+                    .emit_with(move |id| Prop(id, Assert, cond.clone()))
+            }
+
+            // Emit all event `emits` checks.
+            for (loc, cond) in spec.emits_conditions(&self.builder) {
+                self.emit_traces(spec, &cond);
+                self.builder.set_loc_and_vc_info(loc, EMITS_FAILS_MESSAGE);
+                self.builder.emit_with(move |id| Prop(id, Assert, cond))
+            }
+
+            let emits_is_partial = self
+                .builder
+                .fun_env
+                .is_pragma_true(EMITS_IS_PARTIAL_PRAGMA, || false);
+            let emits_is_strict = self
+                .builder
+                .fun_env
+                .is_pragma_true(EMITS_IS_STRICT_PRAGMA, || false);
+            if (!spec.emits.is_empty() && !emits_is_partial)
+                || (spec.emits.is_empty() && emits_is_strict)
+            {
+                // If not partial, emit an assertion for the completeness of the emits specs.
+                let cond = spec.emits_completeness_condition(&self.builder);
+                let loc = self.builder.fun_env.get_spec_loc();
+                self.emit_traces(spec, &cond);
+                self.builder.set_loc_and_vc_info(loc, EMITS_NOT_COVERED);
+                self.builder.emit_with(move |id| Prop(id, Assert, cond));
+            }
+        }
+
+        // Emit return
+        let ret_locals = self.ret_locals.clone();
+        self.builder.emit_with(move |id| Ret(id, ret_locals))
+    }
+
+    /// Generate a check whether the target can modify the given memory provided
+    /// (a) the target constraints the given memory (b) the target is the verification variant.
+    fn generate_modifies_check(
+        &mut self,
+        kind: PropKind,
+        spec: &TranslatedSpec,
+        loc: &Loc,
+        resource_type: &Type,
+        original_exp: &Exp, // this contains the right node ids for tracing
+        addr: Exp,
+    ) {
+        let target = self.builder.get_target();
+        let (mid, sid, _) = resource_type.require_struct();
+        if self.is_verified()
+            && target
+                .get_modify_targets_for_type(&mid.qualified(sid))
+                .is_some()
+        {
+            self.emit_traces(spec, original_exp);
+            let env = self.builder.global_env();
+            let node_id = env.new_node(loc.clone(), BOOL_TYPE.clone());
+            env.set_node_instantiation(node_id, vec![resource_type.to_owned()]);
+            let can_modify =
+                ExpData::Call(node_id, ast::Operation::CanModify, vec![addr]).into_exp();
+            if kind == PropKind::Assert {
+                let (mid, sid, inst) = resource_type.require_struct();
+                self.builder.set_loc_and_vc_info(
+                    loc.clone(),
+                    &modify_check_fails_message(env, mid.qualified(sid), inst),
+                );
+            } else {
+                self.builder.set_loc(loc.clone());
+            }
+            self.builder
+                .emit_with(|id| Bytecode::Prop(id, kind, can_modify));
+        }
+    }
+
+    fn generate_opaque_call(
+        &mut self,
+        dests: Vec<TempIndex>,
+        mid: ModuleId,
+        fid: FunId,
+        targs: &[Type],
+        srcs: Vec<TempIndex>,
+        aa: Option<AbortAction>,
+        is_begin: bool,
+    ) {
+        let opaque_op = if is_begin {
+            Operation::OpaqueCallBegin(mid, fid, targs.to_vec())
+        } else {
+            Operation::OpaqueCallEnd(mid, fid, targs.to_vec())
+        };
+        self.builder
+            .emit_with(|id| Bytecode::Call(id, dests, opaque_op, srcs, aa));
+    }
+}
+
+//  ================================================================================================
+/// # Modifies Checker
+
+/// Check modifies annotations. This is depending on usage analysis and is therefore
+/// invoked here from the initialize trait function of this processor.
+fn check_modifies(env: &GlobalEnv, targets: &FunctionTargetsHolder) {
+    for module_env in env.get_modules() {
+        if module_env.is_target() {
+            for fun_env in module_env.get_functions() {
+                check_caller_callee_modifies_relation(env, targets, &fun_env);
+                check_opaque_modifies_completeness(env, targets, &fun_env);
+            }
+        }
+    }
+}
+
+fn check_caller_callee_modifies_relation(
+    env: &GlobalEnv,
+    targets: &FunctionTargetsHolder,
+    fun_env: &FunctionEnv,
+) {
+    if fun_env.is_native() || fun_env.is_intrinsic() {
+        return;
+    }
+    let caller_func_target = targets.get_target(fun_env, &FunctionVariant::Baseline);
+    for callee in fun_env.get_called_functions() {
+        let callee_fun_env = env.get_function(callee);
+        if callee_fun_env.is_native() || callee_fun_env.is_intrinsic() {
+            continue;
+        }
+        let callee_func_target = targets.get_target(&callee_fun_env, &FunctionVariant::Baseline);
+        let callee_modified_memory = usage_analysis::get_memory_usage(&callee_func_target)
+            .modified
+            .get_all_uninst();
+        for target in caller_func_target.get_modify_targets().keys() {
+            if callee_modified_memory.contains(target)
+                && callee_func_target
+                    .get_modify_targets_for_type(target)
+                    .is_none()
+            {
+                let loc = caller_func_target.get_loc();
+                env.error(
+                    &loc,
+                    &format!(
+                        "caller `{}` specifies modify targets for `{}` but callee `{}` does not",
+                        fun_env.get_full_name_str(),
+                        env.get_module(target.module_id)
+                            .into_struct(target.id)
+                            .get_full_name_str(),
+                        callee_fun_env.get_full_name_str()
+                    ),
+                );
+            }
+        }
+    }
+}
+
+fn check_opaque_modifies_completeness(
+    env: &GlobalEnv,
+    targets: &FunctionTargetsHolder,
+    fun_env: &FunctionEnv,
+) {
+    let target = targets.get_target(fun_env, &FunctionVariant::Baseline);
+    if !target.is_opaque() {
+        return;
+    }
+    // All memory directly or indirectly modified by this opaque function must be captured by
+    // a modifies clause. Otherwise we could introduce unsoundness.
+    // TODO: we currently except Event::EventHandle from this, because this is treated as
+    //   an immutable reference. We should find a better way how to deal with event handles.
+    for mem in usage_analysis::get_memory_usage(&target)
+        .modified
+        .all
+        .iter()
+    {
+        if env.is_wellknown_event_handle_type(&Type::Struct(mem.module_id, mem.id, vec![])) {
+            continue;
+        }
+        if env.get_struct_qid(mem.to_qualified_id()).is_ghost_memory() {
+            continue;
+        }
+        let found = target.get_modify_ids().iter().any(|id| mem == id);
+        if !found {
+            let loc = fun_env.get_spec_loc();
+            env.error(&loc,
+            &format!("function `{}` is opaque but its specification does not have a modifies clause for `{}`",
+                fun_env.get_full_name_str(),
+                env.display(mem))
+            )
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode.rs b/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode.rs
new file mode 100644
index 000000000..d81d9573b
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode.rs
@@ -0,0 +1,1255 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::function_target::FunctionTarget;
+use ethnum::U256;
+use itertools::Itertools;
+use move_binary_format::file_format::CodeOffset;
+use move_core_types::u256;
+use move_model::{
+    ast::{Exp, ExpData, MemoryLabel, TempIndex, TraceKind},
+    exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
+    model::{FunId, GlobalEnv, ModuleId, NodeId, QualifiedInstId, SpecVarId, StructId},
+    ty::{Type, TypeDisplayContext},
+};
+use num::BigUint;
+use std::{collections::BTreeMap, fmt, fmt::Formatter};
+
+/// A label for a branch destination.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct Label(u16);
+
+impl Label {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as u16)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+/// An id for an attribute attached to an instruction.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct AttrId(u16);
+
+impl AttrId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as u16)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+/// An id for a spec block. A spec block can contain assumes and asserts to be enforced at a
+/// program point.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct SpecBlockId(u16);
+
+impl SpecBlockId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx as u16)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0 as usize
+    }
+}
+
+/// The kind of an assignment in the bytecode.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum AssignKind {
+    /// The assign copies the lhs value.
+    Copy,
+    /// The assign moves the lhs value.
+    Move,
+    /// The assign stores the lhs value.
+    // TODO: figure out why we can't treat this as either copy or move. The lifetime analysis
+    // currently makes a difference of this case. It originates from stack code where Copy
+    // and Move push on the stack and Store pops.
+    Store,
+}
+
+/// The type of variable that is being havoc-ed
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum HavocKind {
+    /// Havoc a value
+    Value,
+    /// Havoc the value part in a mutation, but keep its pointer unchanged
+    MutationValue,
+    /// Havoc everything in a mutation
+    MutationAll,
+}
+
+/// A constant value.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Constant {
+    Bool(bool),
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Address(BigUint),
+    ByteArray(Vec<u8>),
+    AddressArray(Vec<BigUint>), // TODO: merge AddressArray to Vector type in the futureq
+    Vector(Vec<Constant>),
+    U16(u16),
+    U32(u32),
+    U256(U256),
+}
+
+impl From<&u256::U256> for Constant {
+    fn from(n: &u256::U256) -> Constant {
+        Constant::U256(U256::from(n))
+    }
+}
+
+/// An operation -- target of a call. This contains user functions, builtin functions, and
+/// operators.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Operation {
+    // User function
+    Function(ModuleId, FunId, Vec<Type>),
+
+    // Markers for beginning and end of transformed
+    // opaque function calls (the function call is replaced
+    // by assumes/asserts/gotos, but it is necessary to
+    // add more assumes/asserts later in the pipeline.
+    OpaqueCallBegin(ModuleId, FunId, Vec<Type>),
+    OpaqueCallEnd(ModuleId, FunId, Vec<Type>),
+
+    // Pack/Unpack
+    Pack(ModuleId, StructId, Vec<Type>),
+    Unpack(ModuleId, StructId, Vec<Type>),
+
+    // Resources
+    MoveTo(ModuleId, StructId, Vec<Type>),
+    MoveFrom(ModuleId, StructId, Vec<Type>),
+    Exists(ModuleId, StructId, Vec<Type>),
+
+    // Borrow
+    BorrowLoc,
+    BorrowField(ModuleId, StructId, Vec<Type>, usize),
+    BorrowGlobal(ModuleId, StructId, Vec<Type>),
+
+    // Get
+    GetField(ModuleId, StructId, Vec<Type>, usize),
+    GetGlobal(ModuleId, StructId, Vec<Type>),
+
+    // Builtins
+    Uninit,
+    Destroy,
+    ReadRef,
+    WriteRef,
+    FreezeRef,
+    Havoc(HavocKind),
+    Stop,
+
+    // Memory model
+    IsParent(BorrowNode, BorrowEdge),
+    WriteBack(BorrowNode, BorrowEdge),
+    UnpackRef,
+    PackRef,
+    UnpackRefDeep,
+    PackRefDeep,
+
+    // Unary
+    CastU8,
+    CastU16,
+    CastU32,
+    CastU64,
+    CastU128,
+    Not,
+
+    // Binary
+    Add,
+    Sub,
+    Mul,
+    Div,
+    Mod,
+    BitOr,
+    BitAnd,
+    Xor,
+    Shl,
+    Shr,
+    Lt,
+    Gt,
+    Le,
+    Ge,
+    Or,
+    And,
+    Eq,
+    Neq,
+    CastU256,
+
+    // Debugging
+    TraceLocal(TempIndex),
+    TraceReturn(usize),
+    TraceAbort,
+    TraceExp(TraceKind, NodeId),
+    TraceGlobalMem(QualifiedInstId<StructId>),
+
+    // Event
+    EmitEvent,
+    EventStoreDiverge,
+}
+
+impl Operation {
+    /// Returns true of the operation can cause abort.
+    pub fn can_abort(&self) -> bool {
+        match self {
+            Operation::Function(_, _, _) => true,
+            Operation::OpaqueCallBegin(_, _, _) => false,
+            Operation::OpaqueCallEnd(_, _, _) => false,
+            Operation::Pack(_, _, _) => false,
+            Operation::Unpack(_, _, _) => false,
+            Operation::MoveTo(_, _, _) => true,
+            Operation::MoveFrom(_, _, _) => true,
+            Operation::Exists(_, _, _) => false,
+            Operation::BorrowLoc => false,
+            Operation::BorrowField(_, _, _, _) => false,
+            Operation::BorrowGlobal(_, _, _) => true,
+            Operation::GetField(_, _, _, _) => false,
+            Operation::GetGlobal(_, _, _) => true,
+            Operation::Uninit => false,
+            Operation::Destroy => false,
+            Operation::ReadRef => false,
+            Operation::WriteRef => false,
+            Operation::FreezeRef => false,
+            Operation::Havoc(_) => false,
+            Operation::Stop => false,
+            Operation::WriteBack(..) => false,
+            Operation::IsParent(..) => false,
+            Operation::UnpackRef => false,
+            Operation::PackRef => false,
+            Operation::UnpackRefDeep => false,
+            Operation::PackRefDeep => false,
+            Operation::CastU8 => true,
+            Operation::CastU16 => true,
+            Operation::CastU32 => true,
+            Operation::CastU64 => true,
+            Operation::CastU128 => true,
+            Operation::CastU256 => true,
+            Operation::Not => false,
+            Operation::Add => true,
+            Operation::Sub => true,
+            Operation::Mul => true,
+            Operation::Div => true,
+            Operation::Mod => true,
+            Operation::BitOr => false,
+            Operation::BitAnd => false,
+            Operation::Xor => false,
+            Operation::Shl => true,
+            Operation::Shr => true,
+            Operation::Lt => false,
+            Operation::Gt => false,
+            Operation::Le => false,
+            Operation::Ge => false,
+            Operation::Or => false,
+            Operation::And => false,
+            Operation::Eq => false,
+            Operation::Neq => false,
+            Operation::TraceLocal(..) => false,
+            Operation::TraceAbort => false,
+            Operation::TraceReturn(..) => false,
+            Operation::TraceExp(..) => false,
+            Operation::EmitEvent => false,
+            Operation::EventStoreDiverge => false,
+            Operation::TraceGlobalMem(..) => false,
+        }
+    }
+}
+
+/// A borrow node -- used in memory operations.
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub enum BorrowNode {
+    GlobalRoot(QualifiedInstId<StructId>),
+    LocalRoot(TempIndex),
+    Reference(TempIndex),
+    // Used in summaries to represent a returned mutation at return index. This does not
+    // appear in bytecode instructions.
+    ReturnPlaceholder(usize),
+}
+
+impl BorrowNode {
+    pub fn get_ref(&self) -> Option<TempIndex> {
+        if let BorrowNode::Reference(idx) = self {
+            Some(*idx)
+        } else {
+            None
+        }
+    }
+
+    pub fn instantiate(&self, params: &[Type]) -> Self {
+        match self {
+            Self::GlobalRoot(qid) => Self::GlobalRoot(qid.instantiate_ref(params)),
+            _ => self.clone(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+/// A type of index borrow edge
+pub enum IndexEdgeKind {
+    /// vector operations support
+    Vector,
+    /// table operations support
+    Table,
+    /// support for a custom native function with a given name
+    Custom(String),
+}
+
+/// A borrow edge.
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub enum BorrowEdge {
+    /// Direct borrow.
+    Direct,
+    /// Field borrow with static offset.
+    Field(QualifiedInstId<StructId>, usize),
+    /// Vector borrow with dynamic index.
+    Index(IndexEdgeKind),
+    /// Composed sequence of edges.
+    Hyper(Vec<BorrowEdge>),
+}
+
+impl BorrowEdge {
+    pub fn flatten(&self) -> Vec<&BorrowEdge> {
+        if let BorrowEdge::Hyper(edges) = self {
+            edges.iter().collect_vec()
+        } else {
+            vec![self]
+        }
+    }
+
+    pub fn instantiate(&self, params: &[Type]) -> Self {
+        match self {
+            Self::Field(qid, offset) => Self::Field(qid.instantiate_ref(params), *offset),
+            Self::Hyper(edges) => {
+                let new_edges = edges.iter().map(|e| e.instantiate(params)).collect();
+                Self::Hyper(new_edges)
+            }
+            _ => self.clone(),
+        }
+    }
+}
+/// A specification property kind.
+#[derive(Debug, Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+pub enum PropKind {
+    Assert,
+    Assume,
+    Modifies,
+}
+
+/// Information about the action to take on abort. The label represents the
+/// destination to jump to, and the temporary where to store the abort code before
+/// jump.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AbortAction(pub Label, pub TempIndex);
+
+/// The stackless bytecode.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Bytecode {
+    Assign(AttrId, TempIndex, TempIndex, AssignKind),
+
+    Call(
+        AttrId,
+        Vec<TempIndex>,
+        Operation,
+        Vec<TempIndex>,
+        Option<AbortAction>,
+    ),
+    Ret(AttrId, Vec<TempIndex>),
+
+    Load(AttrId, TempIndex, Constant),
+    Branch(AttrId, Label, Label, TempIndex),
+    Jump(AttrId, Label),
+    Label(AttrId, Label),
+    Abort(AttrId, TempIndex),
+    Nop(AttrId),
+
+    SaveMem(AttrId, MemoryLabel, QualifiedInstId<StructId>),
+    SaveSpecVar(AttrId, MemoryLabel, QualifiedInstId<SpecVarId>),
+    Prop(AttrId, PropKind, Exp),
+}
+
+impl Bytecode {
+    pub fn get_attr_id(&self) -> AttrId {
+        use Bytecode::*;
+        match self {
+            Assign(id, ..)
+            | Call(id, ..)
+            | Ret(id, ..)
+            | Load(id, ..)
+            | Branch(id, ..)
+            | Jump(id, ..)
+            | Label(id, ..)
+            | Abort(id, ..)
+            | Nop(id)
+            | SaveMem(id, ..)
+            | SaveSpecVar(id, ..)
+            | Prop(id, ..) => *id,
+        }
+    }
+
+    pub fn is_exit(&self) -> bool {
+        matches!(
+            self,
+            Bytecode::Ret(..) | Bytecode::Abort(..) | Bytecode::Call(_, _, Operation::Stop, _, _)
+        )
+    }
+
+    pub fn is_return(&self) -> bool {
+        matches!(self, Bytecode::Ret(..))
+    }
+
+    pub fn is_unconditional_branch(&self) -> bool {
+        matches!(
+            self,
+            Bytecode::Ret(..)
+                | Bytecode::Jump(..)
+                | Bytecode::Abort(..)
+                | Bytecode::Call(_, _, Operation::Stop, _, _)
+        )
+    }
+
+    pub fn is_conditional_branch(&self) -> bool {
+        matches!(
+            self,
+            Bytecode::Branch(..) | Bytecode::Call(_, _, _, _, Some(_))
+        )
+    }
+
+    pub fn is_branch(&self) -> bool {
+        self.is_conditional_branch() || self.is_unconditional_branch()
+    }
+
+    /// Return the destination(s) if self is a branch/jump instruction
+    pub fn branch_dests(&self) -> Vec<Label> {
+        match self {
+            Bytecode::Branch(_, then_label, else_label, _) => vec![*then_label, *else_label],
+            Bytecode::Jump(_, label) | Bytecode::Call(_, _, _, _, Some(AbortAction(label, _))) => {
+                vec![*label]
+            }
+            _ => vec![],
+        }
+    }
+
+    /// Returns a mapping from labels to code offsets.
+    pub fn label_offsets(code: &[Bytecode]) -> BTreeMap<Label, CodeOffset> {
+        let mut res = BTreeMap::new();
+        for (offs, bc) in code.iter().enumerate() {
+            if let Bytecode::Label(_, label) = bc {
+                assert!(res.insert(*label, offs as CodeOffset).is_none());
+            }
+        }
+        res
+    }
+
+    /// Return the successor offsets of this instruction. In addition to the code, a map
+    /// of label to code offset need to be passed in.
+    pub fn get_successors(
+        pc: CodeOffset,
+        code: &[Bytecode],
+        label_offsets: &BTreeMap<Label, CodeOffset>,
+    ) -> Vec<CodeOffset> {
+        let bytecode = &code[pc as usize];
+        let mut v = vec![];
+        if !bytecode.is_branch() {
+            // Fall through situation, just return the next pc.
+            v.push(pc + 1);
+        } else {
+            for label in bytecode.branch_dests() {
+                v.push(*label_offsets.get(&label).expect("label defined"));
+            }
+            if matches!(bytecode, Bytecode::Call(_, _, _, _, Some(_))) {
+                // Falls through.
+                v.push(pc + 1);
+            }
+        }
+        // always give successors in ascending order
+        if v.len() > 1 && v[0] > v[1] {
+            v.swap(0, 1);
+        }
+        v
+    }
+
+    /// Returns the code offsets at which the code exits(aborts or returns).
+    pub fn get_exits(code: &[Bytecode]) -> Vec<CodeOffset> {
+        code.iter()
+            .enumerate()
+            .filter(|(_, bytecode)| bytecode.is_exit())
+            .map(|(idx, _)| idx as CodeOffset)
+            .collect()
+    }
+
+    /// Remaps variables in the instruction.
+    pub fn remap_all_vars<F>(self, func_target: &FunctionTarget<'_>, f: &mut F) -> Self
+    where
+        F: FnMut(TempIndex) -> TempIndex,
+    {
+        self.remap_vars_internal(func_target, &mut |_, idx| f(idx))
+    }
+
+    /// Remaps variables in source position in the instruction.
+    pub fn remap_src_vars<F>(self, func_target: &FunctionTarget<'_>, f: &mut F) -> Self
+    where
+        F: FnMut(TempIndex) -> TempIndex,
+    {
+        self.remap_vars_internal(func_target, &mut |is_src, idx| {
+            if is_src {
+                f(idx)
+            } else {
+                idx
+            }
+        })
+    }
+
+    fn remap_vars_internal<F>(self, func_target: &FunctionTarget<'_>, f: &mut F) -> Self
+    where
+        F: FnMut(bool, TempIndex) -> TempIndex,
+    {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+        let map = |is_src: bool, f: &mut F, v: Vec<TempIndex>| -> Vec<TempIndex> {
+            v.into_iter().map(|i| f(is_src, i)).collect()
+        };
+        let map_abort = |f: &mut F, aa: Option<AbortAction>| {
+            aa.map(|AbortAction(l, code)| AbortAction(l, f(false, code)))
+        };
+        let map_node = |f: &mut F, node: BorrowNode| match node {
+            LocalRoot(tmp) => LocalRoot(f(true, tmp)),
+            Reference(tmp) => Reference(f(true, tmp)),
+            _ => node,
+        };
+        match self {
+            Load(attr, dst, cons) => Load(attr, f(false, dst), cons),
+            Assign(attr, dest, src, kind) => Assign(attr, f(false, dest), f(true, src), kind),
+            Call(attr, _, WriteBack(node, edge), srcs, aa) => Call(
+                attr,
+                vec![],
+                WriteBack(map_node(f, node), edge),
+                map(true, f, srcs),
+                map_abort(f, aa),
+            ),
+            Call(attr, dests, IsParent(node, edge), srcs, aa) => Call(
+                attr,
+                map(false, f, dests),
+                IsParent(map_node(f, node), edge),
+                map(true, f, srcs),
+                map_abort(f, aa),
+            ),
+            Call(attr, dests, op, srcs, aa) => Call(
+                attr,
+                map(false, f, dests),
+                op,
+                map(true, f, srcs),
+                map_abort(f, aa),
+            ),
+            Ret(attr, rets) => Ret(attr, map(true, f, rets)),
+            Branch(attr, if_label, else_label, cond) => {
+                Branch(attr, if_label, else_label, f(true, cond))
+            }
+            Abort(attr, cond) => Abort(attr, f(true, cond)),
+            Prop(attr, kind, exp) => {
+                let new_exp = Bytecode::remap_exp(func_target, &mut |idx| f(true, idx), exp);
+                Prop(attr, kind, new_exp)
+            }
+            _ => self,
+        }
+    }
+
+    fn remap_exp<F>(func_target: &FunctionTarget<'_>, f: &mut F, exp: Exp) -> Exp
+    where
+        F: FnMut(TempIndex) -> TempIndex,
+    {
+        let mut replacer = |node_id: NodeId, target: RewriteTarget| {
+            if let RewriteTarget::Temporary(idx) = target {
+                Some(ExpData::Temporary(node_id, f(idx)).into_exp())
+            } else {
+                None
+            }
+        };
+        ExpRewriter::new(func_target.global_env(), &mut replacer).rewrite_exp(exp)
+    }
+
+    pub fn instantiate(&self, env: &GlobalEnv, params: &[Type]) -> Self {
+        use Operation::*;
+        match self {
+            Self::Call(attr_id, dsts, op, srcs, on_abort) => {
+                let new_op = match op {
+                    // function
+                    Function(mid, fid, tys) => {
+                        Function(*mid, *fid, Type::instantiate_slice(tys, params))
+                    }
+                    OpaqueCallBegin(mid, fid, tys) => {
+                        OpaqueCallBegin(*mid, *fid, Type::instantiate_slice(tys, params))
+                    }
+                    OpaqueCallEnd(mid, fid, tys) => {
+                        OpaqueCallEnd(*mid, *fid, Type::instantiate_slice(tys, params))
+                    }
+                    // struct
+                    Pack(mid, sid, tys) => Pack(*mid, *sid, Type::instantiate_slice(tys, params)),
+                    Unpack(mid, sid, tys) => {
+                        Unpack(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    BorrowField(mid, sid, tys, field_num) => {
+                        BorrowField(*mid, *sid, Type::instantiate_slice(tys, params), *field_num)
+                    }
+                    GetField(mid, sid, tys, field_num) => {
+                        GetField(*mid, *sid, Type::instantiate_slice(tys, params), *field_num)
+                    }
+                    // storage
+                    MoveTo(mid, sid, tys) => {
+                        MoveTo(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    MoveFrom(mid, sid, tys) => {
+                        MoveFrom(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    Exists(mid, sid, tys) => {
+                        Exists(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    BorrowGlobal(mid, sid, tys) => {
+                        BorrowGlobal(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    GetGlobal(mid, sid, tys) => {
+                        GetGlobal(*mid, *sid, Type::instantiate_slice(tys, params))
+                    }
+                    // memory model
+                    IsParent(node, edge) => {
+                        IsParent(node.instantiate(params), edge.instantiate(params))
+                    }
+                    WriteBack(node, edge) => {
+                        WriteBack(node.instantiate(params), edge.instantiate(params))
+                    }
+                    // others
+                    _ => op.clone(),
+                };
+                Self::Call(
+                    *attr_id,
+                    dsts.clone(),
+                    new_op,
+                    srcs.clone(),
+                    on_abort.clone(),
+                )
+            }
+            Self::SaveMem(attr_id, label, qid) => {
+                Self::SaveMem(*attr_id, *label, qid.instantiate_ref(params))
+            }
+            Self::SaveSpecVar(attr_id, label, qid) => {
+                Self::SaveSpecVar(*attr_id, *label, qid.instantiate_ref(params))
+            }
+            Self::Prop(attr_id, kind, exp) => Self::Prop(
+                *attr_id,
+                *kind,
+                ExpData::rewrite_node_id(exp.clone(), &mut |id| {
+                    ExpData::instantiate_node(env, id, params)
+                }),
+            ),
+            _ => self.clone(),
+        }
+    }
+
+    /// Return the temporaries this instruction modifies and how the temporaries are modified.
+    ///
+    /// For a temporary with TempIndex $t, if $t is modified by the instruction and
+    /// 1) $t is a value or an immutable reference, it will show up in the first Vec
+    /// 2) $t is a mutable reference and only its value is modified, not the reference itself,
+    ///    it will show up in the second Vec as ($t, false).
+    /// 3) $t is a mutable reference and the reference itself is modified (i.e., the location and
+    ///    path it is pointing to), it will show up in the second Vec as ($t, true).
+    pub fn modifies(
+        &self,
+        func_target: &FunctionTarget<'_>,
+    ) -> (Vec<TempIndex>, Vec<(TempIndex, bool)>) {
+        use BorrowNode::*;
+        use Bytecode::*;
+        use Operation::*;
+        let add_abort = |mut res: Vec<TempIndex>, aa: &Option<AbortAction>| {
+            if let Some(AbortAction(_, dest)) = aa {
+                res.push(*dest)
+            }
+            res
+        };
+
+        match self {
+            Assign(_, dest, _, _) => {
+                if func_target.get_local_type(*dest).is_mutable_reference() {
+                    // reference assignment completely distorts the reference (value + pointer)
+                    (vec![], vec![(*dest, true)])
+                } else {
+                    // value assignment
+                    (vec![*dest], vec![])
+                }
+            }
+            Load(_, dest, _) => {
+                // constants can only be values, hence no modifications on the reference
+                (vec![*dest], vec![])
+            }
+            Call(_, _, Operation::WriteBack(LocalRoot(dest), ..), _, aa) => {
+                // write-back to a local variable distorts the value
+                (add_abort(vec![*dest], aa), vec![])
+            }
+            Call(_, _, Operation::WriteBack(Reference(dest), ..), _, aa) => {
+                // write-back to a reference only distorts the value, but not the pointer itself
+                (add_abort(vec![], aa), vec![(*dest, false)])
+            }
+            Call(_, _, Operation::WriteRef, srcs, aa) => {
+                // write-ref only distorts the value of the reference, but not the pointer itself
+                (add_abort(vec![], aa), vec![(srcs[0], false)])
+            }
+            Call(_, dests, Function(..), srcs, aa) => {
+                let mut val_targets = vec![];
+                let mut mut_targets = vec![];
+                for src in srcs {
+                    if func_target.get_local_type(*src).is_mutable_reference() {
+                        // values in mutable references can be distorted, but pointer stays the same
+                        mut_targets.push((*src, false));
+                    }
+                }
+                for dest in dests {
+                    if func_target.get_local_type(*dest).is_mutable_reference() {
+                        // similar to reference assignment
+                        mut_targets.push((*dest, true));
+                    } else {
+                        // similar to value assignment
+                        val_targets.push(*dest);
+                    }
+                }
+                (add_abort(val_targets, aa), mut_targets)
+            }
+            // *** Double-check that this is in Wolfgang's code
+            Call(_, dests, _, _, aa) => {
+                let mut val_targets = vec![];
+                let mut mut_targets = vec![];
+                for dest in dests {
+                    if func_target.get_local_type(*dest).is_mutable_reference() {
+                        // similar to reference assignment
+                        mut_targets.push((*dest, true));
+                    } else {
+                        // similar to value assignment
+                        val_targets.push(*dest);
+                    }
+                }
+                (add_abort(val_targets, aa), mut_targets)
+            }
+            _ => (vec![], vec![]),
+        }
+    }
+}
+
+// =================================================================================================
+// Formatting
+
+impl Bytecode {
+    /// Creates a format object for a bytecode in context of a function target.
+    pub fn display<'env>(
+        &'env self,
+        func_target: &'env FunctionTarget<'env>,
+        label_offsets: &'env BTreeMap<Label, CodeOffset>,
+    ) -> BytecodeDisplay<'env> {
+        BytecodeDisplay {
+            bytecode: self,
+            func_target,
+            label_offsets,
+        }
+    }
+}
+
+/// A display object for a bytecode.
+pub struct BytecodeDisplay<'env> {
+    bytecode: &'env Bytecode,
+    func_target: &'env FunctionTarget<'env>,
+    label_offsets: &'env BTreeMap<Label, CodeOffset>,
+}
+
+impl<'env> fmt::Display for BytecodeDisplay<'env> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use Bytecode::*;
+        match &self.bytecode {
+            Assign(_, dst, src, AssignKind::Copy) => {
+                write!(f, "{} := copy({})", self.lstr(*dst), self.lstr(*src))?
+            }
+            Assign(_, dst, src, AssignKind::Move) => {
+                write!(f, "{} := move({})", self.lstr(*dst), self.lstr(*src))?
+            }
+            Assign(_, dst, src, AssignKind::Store) => {
+                write!(f, "{} := {}", self.lstr(*dst), self.lstr(*src))?
+            }
+            Call(_, dsts, oper, args, aa) => {
+                if !dsts.is_empty() {
+                    self.fmt_locals(f, dsts, false)?;
+                    write!(f, " := ")?;
+                }
+                write!(f, "{}", oper.display(self.func_target))?;
+                self.fmt_locals(f, args, true)?;
+                if let Some(AbortAction(label, code)) = aa {
+                    write!(
+                        f,
+                        " on_abort goto {} with {}",
+                        self.label_str(*label),
+                        self.lstr(*code)
+                    )?;
+                }
+            }
+            Ret(_, srcs) => {
+                write!(f, "return ")?;
+                self.fmt_locals(f, srcs, false)?;
+            }
+            Load(_, dst, cons) => {
+                write!(f, "{} := {}", self.lstr(*dst), cons)?;
+            }
+            Branch(_, then_label, else_label, src) => {
+                write!(
+                    f,
+                    "if ({}) goto {} else goto {}",
+                    self.lstr(*src),
+                    self.label_str(*then_label),
+                    self.label_str(*else_label),
+                )?;
+            }
+            Jump(_, label) => {
+                write!(f, "goto {}", self.label_str(*label))?;
+            }
+            Label(_, label) => {
+                write!(f, "label L{}", label.as_usize())?;
+            }
+            Abort(_, src) => {
+                write!(f, "abort({})", self.lstr(*src))?;
+            }
+            Nop(_) => {
+                write!(f, "nop")?;
+            }
+            SaveMem(_, label, qid) => {
+                let env = self.func_target.global_env();
+                write!(f, "@{} := save_mem({})", label.as_usize(), env.display(qid))?;
+            }
+            SaveSpecVar(_, label, qid) => {
+                let env = self.func_target.global_env();
+                let module_env = env.get_module(qid.module_id);
+                let spec_var = module_env.get_spec_var(qid.id);
+                write!(
+                    f,
+                    "@{} := save_spec_var({}::{})",
+                    label.as_usize(),
+                    module_env.get_name().display(env.symbol_pool()),
+                    spec_var.name.display(env.symbol_pool())
+                )?;
+            }
+            Prop(_, kind, exp) => {
+                let exp_display = exp.display(self.func_target.func_env.module_env.env);
+                match kind {
+                    PropKind::Assume => write!(f, "assume {}", exp_display)?,
+                    PropKind::Assert => write!(f, "assert {}", exp_display)?,
+                    PropKind::Modifies => write!(f, "modifies {}", exp_display)?,
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+impl<'env> BytecodeDisplay<'env> {
+    fn fmt_locals(
+        &self,
+        f: &mut Formatter<'_>,
+        locals: &[TempIndex],
+        always_brace: bool,
+    ) -> fmt::Result {
+        if !always_brace && locals.len() == 1 {
+            write!(f, "{}", self.lstr(locals[0]))?
+        } else {
+            write!(f, "(")?;
+            for (i, l) in locals.iter().enumerate() {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+                write!(f, "{}", self.lstr(*l))?;
+            }
+            write!(f, ")")?;
+        }
+        Ok(())
+    }
+
+    fn lstr(&self, idx: TempIndex) -> String {
+        format!("$t{}", idx)
+    }
+
+    fn label_str(&self, label: Label) -> String {
+        self.label_offsets
+            .get(&label)
+            .map(|offs| offs.to_string())
+            .unwrap_or_else(|| format!("L{}", label.as_usize()))
+    }
+}
+
+impl Operation {
+    /// Creates a format object for a bytecode in context of a function target.
+    pub fn display<'env>(
+        &'env self,
+        func_target: &'env FunctionTarget<'env>,
+    ) -> OperationDisplay<'env> {
+        OperationDisplay {
+            oper: self,
+            func_target,
+        }
+    }
+}
+
+/// A display object for an operation.
+pub struct OperationDisplay<'env> {
+    oper: &'env Operation,
+    func_target: &'env FunctionTarget<'env>,
+}
+
+impl<'env> fmt::Display for OperationDisplay<'env> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use Operation::*;
+        match self.oper {
+            // User function
+            Function(mid, fid, targs)
+            | OpaqueCallBegin(mid, fid, targs)
+            | OpaqueCallEnd(mid, fid, targs) => {
+                let func_env = self
+                    .func_target
+                    .global_env()
+                    .get_module(*mid)
+                    .into_function(*fid);
+                write!(
+                    f,
+                    "{}",
+                    match self.oper {
+                        OpaqueCallBegin(_, _, _) => "opaque begin: ",
+                        OpaqueCallEnd(_, _, _) => "opaque end: ",
+                        _ => "",
+                    }
+                )?;
+                write!(
+                    f,
+                    "{}::{}",
+                    func_env
+                        .module_env
+                        .get_name()
+                        .display(func_env.symbol_pool()),
+                    func_env.get_name().display(func_env.symbol_pool()),
+                )?;
+                self.fmt_type_args(f, targs)?;
+            }
+
+            // Pack/Unpack
+            Pack(mid, sid, targs) => {
+                write!(f, "pack {}", self.struct_str(*mid, *sid, targs))?;
+            }
+            Unpack(mid, sid, targs) => {
+                write!(f, "unpack {}", self.struct_str(*mid, *sid, targs))?;
+            }
+
+            // Borrow
+            BorrowLoc => {
+                write!(f, "borrow_local")?;
+            }
+            BorrowField(mid, sid, targs, offset) => {
+                write!(f, "borrow_field<{}>", self.struct_str(*mid, *sid, targs))?;
+                let struct_env = self
+                    .func_target
+                    .global_env()
+                    .get_module(*mid)
+                    .into_struct(*sid);
+                let field_env = struct_env.get_field_by_offset(*offset);
+                write!(
+                    f,
+                    ".{}",
+                    field_env.get_name().display(struct_env.symbol_pool())
+                )?;
+            }
+            BorrowGlobal(mid, sid, targs) => {
+                write!(f, "borrow_global<{}>", self.struct_str(*mid, *sid, targs))?;
+            }
+            GetField(mid, sid, targs, offset) => {
+                write!(f, "get_field<{}>", self.struct_str(*mid, *sid, targs))?;
+                let struct_env = self
+                    .func_target
+                    .global_env()
+                    .get_module(*mid)
+                    .into_struct(*sid);
+                let field_env = struct_env.get_field_by_offset(*offset);
+                write!(
+                    f,
+                    ".{}",
+                    field_env.get_name().display(struct_env.symbol_pool())
+                )?;
+            }
+            GetGlobal(mid, sid, targs) => {
+                write!(f, "get_global<{}>", self.struct_str(*mid, *sid, targs))?;
+            }
+
+            // Resources
+            MoveTo(mid, sid, targs) => {
+                write!(f, "move_to<{}>", self.struct_str(*mid, *sid, targs))?;
+            }
+            MoveFrom(mid, sid, targs) => {
+                write!(f, "move_from<{}>", self.struct_str(*mid, *sid, targs))?;
+            }
+            Exists(mid, sid, targs) => {
+                write!(f, "exists<{}>", self.struct_str(*mid, *sid, targs))?;
+            }
+
+            // Builtins
+            Uninit => {
+                write!(f, "uninit")?;
+            }
+            Destroy => {
+                write!(f, "destroy")?;
+            }
+            ReadRef => {
+                write!(f, "read_ref")?;
+            }
+            WriteRef => {
+                write!(f, "write_ref")?;
+            }
+            FreezeRef => {
+                write!(f, "freeze_ref")?;
+            }
+
+            // Memory model
+            UnpackRef => {
+                write!(f, "unpack_ref")?;
+            }
+            PackRef => {
+                write!(f, "pack_ref")?;
+            }
+            PackRefDeep => {
+                write!(f, "pack_ref_deep")?;
+            }
+            UnpackRefDeep => {
+                write!(f, "unpack_ref_deep")?;
+            }
+            WriteBack(node, edge) => write!(
+                f,
+                "write_back[{}{}]",
+                node.display(self.func_target),
+                edge.display(self.func_target.global_env())
+            )?,
+            IsParent(node, edge) => write!(
+                f,
+                "is_parent[{}{}]",
+                node.display(self.func_target),
+                edge.display(self.func_target.global_env())
+            )?,
+
+            Havoc(kind) => {
+                write!(
+                    f,
+                    "havoc[{}]",
+                    match kind {
+                        HavocKind::Value => "val",
+                        HavocKind::MutationValue => "mut",
+                        HavocKind::MutationAll => "mut_all",
+                    }
+                )?;
+            }
+            Stop => {
+                write!(f, "stop")?;
+            }
+            // Unary
+            CastU8 => write!(f, "(u8)")?,
+            CastU16 => write!(f, "(u16)")?,
+            CastU32 => write!(f, "(u32)")?,
+            CastU64 => write!(f, "(u64)")?,
+            CastU128 => write!(f, "(u128)")?,
+            CastU256 => write!(f, "(u256)")?,
+            Not => write!(f, "!")?,
+
+            // Binary
+            Add => write!(f, "+")?,
+            Sub => write!(f, "-")?,
+            Mul => write!(f, "*")?,
+            Div => write!(f, "/")?,
+            Mod => write!(f, "%")?,
+            BitOr => write!(f, "|")?,
+            BitAnd => write!(f, "&")?,
+            Xor => write!(f, "^")?,
+            Shl => write!(f, "<<")?,
+            Shr => write!(f, ">>")?,
+            Lt => write!(f, "<")?,
+            Gt => write!(f, ">")?,
+            Le => write!(f, "<=")?,
+            Ge => write!(f, ">=")?,
+            Or => write!(f, "||")?,
+            And => write!(f, "&&")?,
+            Eq => write!(f, "==")?,
+            Neq => write!(f, "!=")?,
+
+            // Debugging
+            TraceLocal(l) => {
+                let name = self.func_target.get_local_name(*l);
+                write!(
+                    f,
+                    "trace_local[{}]",
+                    name.display(self.func_target.symbol_pool())
+                )?
+            }
+            TraceAbort => write!(f, "trace_abort")?,
+            TraceReturn(r) => write!(f, "trace_return[{}]", r)?,
+            TraceExp(kind, node_id) => {
+                let loc = self.func_target.global_env().get_node_loc(*node_id);
+                write!(
+                    f,
+                    "trace_exp[{}, {}]",
+                    kind,
+                    loc.display(self.func_target.global_env())
+                )?
+            }
+            EmitEvent => write!(f, "emit_event")?,
+            EventStoreDiverge => write!(f, "event_store_diverge")?,
+            TraceGlobalMem(_) => write!(f, "trace_global_mem")?,
+        }
+        Ok(())
+    }
+}
+
+impl<'env> OperationDisplay<'env> {
+    fn fmt_type_args(&self, f: &mut Formatter<'_>, targs: &[Type]) -> fmt::Result {
+        if !targs.is_empty() {
+            let tctx = TypeDisplayContext::WithEnv {
+                env: self.func_target.global_env(),
+                type_param_names: None,
+            };
+            write!(f, "<")?;
+            for (i, ty) in targs.iter().enumerate() {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+                write!(f, "{}", ty.display(&tctx))?;
+            }
+            write!(f, ">")?;
+        }
+        Ok(())
+    }
+
+    fn struct_str(&self, mid: ModuleId, sid: StructId, targs: &[Type]) -> String {
+        let ty = Type::Struct(mid, sid, targs.to_vec());
+        let tctx = TypeDisplayContext::WithEnv {
+            env: self.func_target.global_env(),
+            type_param_names: None,
+        };
+        format!("{}", ty.display(&tctx))
+    }
+}
+
+impl fmt::Display for Constant {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use Constant::*;
+        match self {
+            Bool(x) => write!(f, "{}", x)?,
+            U8(x) => write!(f, "{}", x)?,
+            U64(x) => write!(f, "{}", x)?,
+            U128(x) => write!(f, "{}", x)?,
+            U256(x) => write!(f, "{}", x)?,
+            Address(x) => write!(f, "0x{}", x.to_str_radix(16))?,
+            ByteArray(x) => write!(f, "{:?}", x)?,
+            AddressArray(x) => write!(
+                f,
+                "{:?}",
+                x.iter()
+                    .map(|v| format!("0x{}", v.to_str_radix(16)))
+                    .collect_vec()
+            )?,
+            Vector(x) => write!(f, "{:?}", x.iter().map(|v| format!("{}", v)).collect_vec())?,
+            U16(x) => write!(f, "{}", x)?,
+            U32(x) => write!(f, "{}", x)?,
+        }
+        Ok(())
+    }
+}
+
+/// A display object for a borrow node.
+pub struct BorrowNodeDisplay<'env> {
+    node: &'env BorrowNode,
+    func_target: &'env FunctionTarget<'env>,
+}
+
+impl BorrowNode {
+    /// Creates a format object for a borrow node in context of a function target.
+    pub fn display<'env>(
+        &'env self,
+        func_target: &'env FunctionTarget<'env>,
+    ) -> BorrowNodeDisplay<'env> {
+        BorrowNodeDisplay {
+            node: self,
+            func_target,
+        }
+    }
+}
+
+impl<'env> fmt::Display for BorrowNodeDisplay<'env> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        use BorrowNode::*;
+        match self.node {
+            GlobalRoot(s) => {
+                let ty = Type::Struct(s.module_id, s.id, s.inst.to_owned());
+                let tctx = TypeDisplayContext::WithEnv {
+                    env: self.func_target.global_env(),
+                    type_param_names: None,
+                };
+                write!(f, "{}", ty.display(&tctx))?;
+            }
+            LocalRoot(idx) => {
+                write!(f, "LocalRoot($t{})", idx)?;
+            }
+            Reference(idx) => {
+                write!(f, "Reference($t{})", idx)?;
+            }
+            ReturnPlaceholder(idx) => {
+                write!(f, "Return({})", idx)?;
+            }
+        }
+        Ok(())
+    }
+}
+impl BorrowEdge {
+    pub fn display<'a>(&'a self, env: &'a GlobalEnv) -> BorrowEdgeDisplay<'a> {
+        BorrowEdgeDisplay { env, edge: self }
+    }
+}
+
+pub struct BorrowEdgeDisplay<'a> {
+    env: &'a GlobalEnv,
+    edge: &'a BorrowEdge,
+}
+
+impl<'a> std::fmt::Display for BorrowEdgeDisplay<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use BorrowEdge::*;
+        let tctx = TypeDisplayContext::WithEnv {
+            env: self.env,
+            type_param_names: None,
+        };
+        match self.edge {
+            Field(qid, field) => {
+                let struct_env = self.env.get_struct(qid.to_qualified_id());
+                let field_env = struct_env.get_field_by_offset(*field);
+                let field_type = field_env.get_type().instantiate(&qid.inst);
+                write!(
+                    f,
+                    ".{} ({})",
+                    field_env.get_name().display(self.env.symbol_pool()),
+                    field_type.display(&tctx),
+                )
+            }
+            Index(_) => write!(f, "[]"),
+            Direct => write!(f, "@"),
+            Hyper(es) => {
+                write!(
+                    f,
+                    "{}",
+                    es.iter()
+                        .map(|e| format!("{}", e.display(self.env)))
+                        .join("/")
+                )
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode_generator.rs b/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode_generator.rs
new file mode 100644
index 000000000..6884dcf6c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/stackless_bytecode_generator.rs
@@ -0,0 +1,1373 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    function_target::FunctionData,
+    stackless_bytecode::{
+        AssignKind, AttrId,
+        Bytecode::{self},
+        Constant, Label, Operation, PropKind,
+    },
+};
+use itertools::Itertools;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        Bytecode as MoveBytecode, CodeOffset, CompiledModule, FieldHandleIndex, SignatureIndex,
+    },
+    views::{FunctionHandleView, ViewInternals},
+};
+use move_core_types::{
+    language_storage::{self, CORE_CODE_ADDRESS},
+    runtime_value::MoveValue,
+};
+use move_model::{
+    ast::{ConditionKind, TempIndex},
+    model::{FunId, FunctionEnv, Loc, ModuleId, StructId},
+    ty::{PrimitiveType, Type},
+};
+use num::BigUint;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    convert::TryInto,
+    matches,
+};
+
+pub struct StacklessBytecodeGenerator<'a> {
+    func_env: &'a FunctionEnv<'a>,
+    module: &'a CompiledModule,
+    temp_count: usize,
+    temp_stack: Vec<usize>,
+    local_types: Vec<Type>,
+    code: Vec<Bytecode>,
+    location_table: BTreeMap<AttrId, Loc>,
+    loop_invariants: BTreeSet<AttrId>,
+    fallthrough_labels: BTreeSet<Label>,
+}
+
+impl<'a> StacklessBytecodeGenerator<'a> {
+    pub fn new(func_env: &'a FunctionEnv<'a>) -> Self {
+        let local_types = (0..func_env.get_local_count())
+            .map(|i| func_env.get_local_type(i))
+            .collect_vec();
+        StacklessBytecodeGenerator {
+            func_env,
+            module: func_env.module_env.get_verified_module(),
+            temp_count: local_types.len(),
+            temp_stack: vec![],
+            local_types,
+            code: vec![],
+            location_table: BTreeMap::new(),
+            loop_invariants: BTreeSet::new(),
+            fallthrough_labels: BTreeSet::new(),
+        }
+    }
+
+    pub fn generate_function(mut self) -> FunctionData {
+        let original_code = self.func_env.get_bytecode();
+        let mut label_map = BTreeMap::new();
+
+        // Generate labels.
+        for (pos, bytecode) in original_code.iter().enumerate() {
+            if let MoveBytecode::BrTrue(code_offset)
+            | MoveBytecode::BrFalse(code_offset)
+            | MoveBytecode::Branch(code_offset) = bytecode
+            {
+                let offs = *code_offset as CodeOffset;
+                if label_map.get(&offs).is_none() {
+                    let label = Label::new(label_map.len());
+                    label_map.insert(offs, label);
+                }
+            }
+            if let MoveBytecode::BrTrue(_) | MoveBytecode::BrFalse(_) = bytecode {
+                let next_offs = (pos + 1) as CodeOffset;
+                if label_map.get(&next_offs).is_none() {
+                    let fall_through_label = Label::new(label_map.len());
+                    label_map.insert(next_offs, fall_through_label);
+                    self.fallthrough_labels.insert(fall_through_label);
+                }
+            };
+        }
+
+        // Generate bytecode.
+        for (code_offset, bytecode) in original_code.iter().enumerate() {
+            self.generate_bytecode(bytecode, code_offset as CodeOffset, &label_map);
+        }
+
+        // Eliminate fall-through for non-branching instructions
+        let code = std::mem::take(&mut self.code);
+        for bytecode in code.into_iter() {
+            if let Bytecode::Label(attr_id, label) = bytecode {
+                if !self.code.is_empty() && !self.code[self.code.len() - 1].is_branch() {
+                    self.code.push(Bytecode::Jump(attr_id, label));
+                }
+            }
+            self.code.push(bytecode);
+        }
+
+        let Self {
+            func_env,
+            module: _,
+            temp_count: _,
+            temp_stack: _,
+            local_types,
+            code,
+            location_table,
+            loop_invariants,
+            ..
+        } = self;
+
+        FunctionData::new(
+            func_env,
+            code,
+            local_types,
+            func_env.get_return_types(),
+            location_table,
+            func_env.get_acquires_global_resources(),
+            loop_invariants,
+        )
+    }
+
+    /// Create a new attribute id and populate location table.
+    fn new_loc_attr(&mut self, code_offset: CodeOffset) -> AttrId {
+        let loc = self.func_env.get_bytecode_loc(code_offset);
+        let attr = AttrId::new(self.location_table.len());
+        self.location_table.insert(attr, loc);
+        attr
+    }
+
+    /// Create a new attribute id and populate location table from node_id.
+    fn new_loc_attr_from_loc(&mut self, loc: Loc) -> AttrId {
+        let attr = AttrId::new(self.location_table.len());
+        self.location_table.insert(attr, loc);
+        attr
+    }
+
+    fn get_field_info(&self, field_handle_index: FieldHandleIndex) -> (StructId, usize, Type) {
+        let field_handle = self.module.field_handle_at(field_handle_index);
+        let struct_id = self.func_env.module_env.get_struct_id(field_handle.owner);
+        let struct_env = self.func_env.module_env.get_struct(struct_id);
+        let field_env = struct_env.get_field_by_offset(field_handle.field as usize);
+        (struct_id, field_handle.field as usize, field_env.get_type())
+    }
+
+    fn get_type_params(&self, type_params_index: SignatureIndex) -> Vec<Type> {
+        self.func_env
+            .module_env
+            .get_type_actuals(Some(type_params_index))
+    }
+
+    #[allow(clippy::cognitive_complexity)]
+    pub fn generate_bytecode(
+        &mut self,
+        bytecode: &MoveBytecode,
+        code_offset: CodeOffset,
+        label_map: &BTreeMap<CodeOffset, Label>,
+    ) {
+        // Add label if defined at this code offset.
+        if let Some(label) = label_map.get(&code_offset) {
+            let label_attr_id = self.new_loc_attr(code_offset);
+            self.code.push(Bytecode::Label(label_attr_id, *label));
+        }
+
+        // Handle spec block if defined at this code offset.
+        if let Some(spec) = self.func_env.get_spec().on_impl.get(&code_offset) {
+            for cond in &spec.conditions {
+                let attr_id = self.new_loc_attr_from_loc(cond.loc.clone());
+                let kind = match cond.kind {
+                    ConditionKind::Assert => PropKind::Assert,
+                    ConditionKind::Assume => PropKind::Assume,
+                    ConditionKind::LoopInvariant => {
+                        self.loop_invariants.insert(attr_id);
+                        PropKind::Assert
+                    }
+                    // Updating global spec variables are translated to Assume, which will be replaced when instrumenting the spec
+                    ConditionKind::Update => PropKind::Assume,
+                    _ => {
+                        panic!("unsupported spec condition in code")
+                    }
+                };
+                self.code
+                    .push(Bytecode::Prop(attr_id, kind, cond.exp.clone()));
+            }
+
+            // If the current instruction is just a Nop, skip it. It has been generated to support
+            // spec blocks.
+            if matches!(bytecode, MoveBytecode::Nop) {
+                return;
+            }
+        }
+
+        let attr_id = self.new_loc_attr(code_offset);
+
+        let global_env = self.func_env.module_env.env;
+        let mut vec_module_id_opt: Option<ModuleId> = None;
+        let mut mk_vec_function_operation = |name: &str, tys: Vec<Type>| -> Operation {
+            let vec_module_env = vec_module_id_opt.get_or_insert_with(|| {
+                let vec_module = global_env.to_module_name(&language_storage::ModuleId::new(
+                    CORE_CODE_ADDRESS,
+                    move_core_types::identifier::Identifier::new("vector").unwrap(),
+                ));
+                global_env
+                    .find_module(&vec_module)
+                    .expect("unexpected reference to module not found in global env")
+                    .get_id()
+            });
+
+            let vec_fun = FunId::new(global_env.symbol_pool().make(name));
+            Operation::Function(*vec_module_env, vec_fun, tys)
+        };
+
+        let mk_call = |op: Operation, dsts: Vec<usize>, srcs: Vec<usize>| -> Bytecode {
+            Bytecode::Call(attr_id, dsts, op, srcs, None)
+        };
+        let mk_unary = |op: Operation, dst: usize, src: usize| -> Bytecode {
+            Bytecode::Call(attr_id, vec![dst], op, vec![src], None)
+        };
+        let mk_binary = |op: Operation, dst: usize, src1: usize, src2: usize| -> Bytecode {
+            Bytecode::Call(attr_id, vec![dst], op, vec![src1, src2], None)
+        };
+
+        match bytecode {
+            MoveBytecode::Pop => {
+                let temp_index = self.temp_stack.pop().unwrap();
+                self.code
+                    .push(mk_call(Operation::Destroy, vec![], vec![temp_index]));
+            }
+            MoveBytecode::BrTrue(target) => {
+                let temp_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Branch(
+                    attr_id,
+                    *label_map.get(target).unwrap(),
+                    *label_map.get(&(code_offset + 1)).unwrap(),
+                    temp_index,
+                ));
+            }
+
+            MoveBytecode::BrFalse(target) => {
+                let temp_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Branch(
+                    attr_id,
+                    *label_map.get(&(code_offset + 1)).unwrap(),
+                    *label_map.get(target).unwrap(),
+                    temp_index,
+                ));
+            }
+
+            MoveBytecode::Abort => {
+                let error_code_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Abort(attr_id, error_code_index));
+            }
+
+            MoveBytecode::StLoc(idx) => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Assign(
+                    attr_id,
+                    *idx as TempIndex,
+                    operand_index,
+                    AssignKind::Store,
+                ));
+            }
+
+            MoveBytecode::Ret => {
+                let mut return_temps = vec![];
+                for _ in 0..self.func_env.get_return_count() {
+                    let return_temp_index = self.temp_stack.pop().unwrap();
+                    return_temps.push(return_temp_index);
+                }
+                return_temps.reverse();
+                self.code.push(Bytecode::Ret(attr_id, return_temps));
+            }
+
+            MoveBytecode::Branch(target) => {
+                // Attempt to eliminate the common pattern `if c goto L1 else L2; L2: goto L3`
+                // and replace it with `if c goto L1 else L3`, provided L2 is a fall-through
+                // label, i.e. not referenced from elsewhere.
+                let target_label = *label_map.get(target).unwrap();
+                let at = self.code.len();
+                let rewritten = if at >= 2 {
+                    match (&self.code[at - 2], &self.code[at - 1]) {
+                        (
+                            Bytecode::Branch(attr, if_true, if_false, c),
+                            Bytecode::Label(_, cont),
+                        ) if self.fallthrough_labels.contains(cont) && if_false == cont => {
+                            let bc = Bytecode::Branch(*attr, *if_true, target_label, *c);
+                            self.code.pop();
+                            self.code.pop();
+                            self.code.push(bc);
+                            true
+                        }
+                        _ => false,
+                    }
+                } else {
+                    false
+                };
+                if !rewritten {
+                    self.code.push(Bytecode::Jump(attr_id, target_label));
+                }
+            }
+
+            MoveBytecode::FreezeRef => {
+                let mutable_ref_index = self.temp_stack.pop().unwrap();
+                let mutable_ref_sig = self.local_types[mutable_ref_index].clone();
+                if let Type::Reference(is_mut, signature) = mutable_ref_sig {
+                    if is_mut {
+                        let immutable_ref_index = self.temp_count;
+                        self.temp_stack.push(immutable_ref_index);
+                        self.local_types.push(Type::Reference(false, signature));
+                        self.code.push(mk_call(
+                            Operation::FreezeRef,
+                            vec![immutable_ref_index],
+                            vec![mutable_ref_index],
+                        ));
+                        self.temp_count += 1;
+                    }
+                }
+            }
+
+            MoveBytecode::ImmBorrowField(field_handle_index)
+            | MoveBytecode::MutBorrowField(field_handle_index) => {
+                let struct_ref_index = self.temp_stack.pop().unwrap();
+                let (struct_id, field_offset, field_type) =
+                    self.get_field_info(*field_handle_index);
+                let field_ref_index = self.temp_count;
+                self.temp_stack.push(field_ref_index);
+
+                self.code.push(mk_call(
+                    Operation::BorrowField(
+                        self.func_env.module_env.get_id(),
+                        struct_id,
+                        vec![],
+                        field_offset,
+                    ),
+                    vec![field_ref_index],
+                    vec![struct_ref_index],
+                ));
+                self.temp_count += 1;
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowField(..));
+                self.local_types
+                    .push(Type::Reference(is_mut, Box::new(field_type)));
+            }
+
+            MoveBytecode::ImmBorrowFieldGeneric(field_inst_index)
+            | MoveBytecode::MutBorrowFieldGeneric(field_inst_index) => {
+                let field_inst = self.module.field_instantiation_at(*field_inst_index);
+                let struct_ref_index = self.temp_stack.pop().unwrap();
+                let (struct_id, field_offset, base_field_type) =
+                    self.get_field_info(field_inst.handle);
+                let actuals = self.get_type_params(field_inst.type_parameters);
+                let field_type = base_field_type.instantiate(&actuals);
+                let field_ref_index = self.temp_count;
+                self.temp_stack.push(field_ref_index);
+
+                self.code.push(mk_call(
+                    Operation::BorrowField(
+                        self.func_env.module_env.get_id(),
+                        struct_id,
+                        actuals,
+                        field_offset,
+                    ),
+                    vec![field_ref_index],
+                    vec![struct_ref_index],
+                ));
+                self.temp_count += 1;
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowFieldGeneric(..));
+                self.local_types
+                    .push(Type::Reference(is_mut, Box::new(field_type)));
+            }
+
+            MoveBytecode::LdU8(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U8));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U8(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU16(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U16));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U16(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU32(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U32));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U32(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU64(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U64));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U64(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU256(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U256));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::from(number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU128(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U128));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U128(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU8 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U8));
+                self.code
+                    .push(mk_unary(Operation::CastU8, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU16 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U16));
+                self.code
+                    .push(mk_unary(Operation::CastU16, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU32 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U32));
+                self.code
+                    .push(mk_unary(Operation::CastU32, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU64 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U64));
+                self.code
+                    .push(mk_unary(Operation::CastU64, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU128 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U128));
+                self.code
+                    .push(mk_unary(Operation::CastU128, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU256 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U256));
+                self.code
+                    .push(mk_unary(Operation::CastU256, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdConst(idx) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                let constant = self.func_env.module_env.get_constant(*idx);
+                let ty = self
+                    .func_env
+                    .module_env
+                    .globalize_signature(&constant.type_);
+                let value = Self::translate_value(
+                    &ty,
+                    &self.func_env.module_env.get_constant_value(constant),
+                );
+                self.local_types.push(ty);
+                self.code.push(Bytecode::Load(attr_id, temp_index, value));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdTrue => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::Bool(true)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdFalse => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::Bool(false)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CopyLoc(idx) => {
+                let signature = self.func_env.get_local_type(*idx as usize);
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(signature); // same type as the value copied
+                self.code.push(Bytecode::Assign(
+                    attr_id,
+                    temp_index,
+                    *idx as TempIndex,
+                    AssignKind::Copy,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::MoveLoc(idx) => {
+                let signature = self.func_env.get_local_type(*idx as usize);
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(signature); // same type as the value copied
+                self.code.push(Bytecode::Assign(
+                    attr_id,
+                    temp_index,
+                    *idx as TempIndex,
+                    AssignKind::Move,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::MutBorrowLoc(idx) => {
+                let signature = self.func_env.get_local_type(*idx as usize);
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types
+                    .push(Type::Reference(true, Box::new(signature)));
+                self.code.push(mk_unary(
+                    Operation::BorrowLoc,
+                    temp_index,
+                    *idx as TempIndex,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::ImmBorrowLoc(idx) => {
+                let signature = self.func_env.get_local_type(*idx as usize);
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types
+                    .push(Type::Reference(false, Box::new(signature)));
+                self.code.push(mk_unary(
+                    Operation::BorrowLoc,
+                    temp_index,
+                    *idx as TempIndex,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::Call(idx) => {
+                let function_handle = self.module.function_handle_at(*idx);
+                let function_handle_view = FunctionHandleView::new(self.module, function_handle);
+
+                let mut arg_temp_indices = vec![];
+                let mut return_temp_indices = vec![];
+                for _ in function_handle_view.arg_tokens() {
+                    let arg_temp_index = self.temp_stack.pop().unwrap();
+                    arg_temp_indices.push(arg_temp_index);
+                }
+                for return_type_view in function_handle_view.return_tokens() {
+                    let return_temp_index = self.temp_count;
+                    let return_type = self
+                        .func_env
+                        .module_env
+                        .globalize_signature(return_type_view.as_inner());
+                    return_temp_indices.push(return_temp_index);
+                    self.temp_stack.push(return_temp_index);
+                    self.local_types.push(return_type);
+                    self.temp_count += 1;
+                }
+                arg_temp_indices.reverse();
+                let callee_env = self.func_env.module_env.get_used_function(*idx);
+                self.code.push(mk_call(
+                    Operation::Function(
+                        callee_env.module_env.get_id(),
+                        callee_env.get_id(),
+                        vec![],
+                    ),
+                    return_temp_indices,
+                    arg_temp_indices,
+                ))
+            }
+            MoveBytecode::CallGeneric(idx) => {
+                let func_instantiation = self.module.function_instantiation_at(*idx);
+
+                let type_sigs = self.get_type_params(func_instantiation.type_parameters);
+                let function_handle = self.module.function_handle_at(func_instantiation.handle);
+                let function_handle_view = FunctionHandleView::new(self.module, function_handle);
+
+                let mut arg_temp_indices = vec![];
+                let mut return_temp_indices = vec![];
+                for _ in function_handle_view.arg_tokens() {
+                    let arg_temp_index = self.temp_stack.pop().unwrap();
+                    arg_temp_indices.push(arg_temp_index);
+                }
+                for return_type_view in function_handle_view.return_tokens() {
+                    let return_temp_index = self.temp_count;
+                    // instantiate type parameters
+                    let return_type = self
+                        .func_env
+                        .module_env
+                        .globalize_signature(return_type_view.as_inner())
+                        .instantiate(&type_sigs);
+                    return_temp_indices.push(return_temp_index);
+                    self.temp_stack.push(return_temp_index);
+                    self.local_types.push(return_type);
+                    self.temp_count += 1;
+                }
+                arg_temp_indices.reverse();
+                let callee_env = self
+                    .func_env
+                    .module_env
+                    .get_used_function(func_instantiation.handle);
+                self.code.push(mk_call(
+                    Operation::Function(
+                        callee_env.module_env.get_id(),
+                        callee_env.get_id(),
+                        type_sigs,
+                    ),
+                    return_temp_indices,
+                    arg_temp_indices,
+                ))
+            }
+
+            MoveBytecode::Pack(idx) => {
+                let struct_env = self.func_env.module_env.get_struct_by_def_idx(*idx);
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_count;
+                for _ in struct_env.get_fields() {
+                    let field_temp_index = self.temp_stack.pop().unwrap();
+                    field_temp_indices.push(field_temp_index);
+                }
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    vec![],
+                ));
+                self.temp_stack.push(struct_temp_index);
+                field_temp_indices.reverse();
+                self.code.push(mk_call(
+                    Operation::Pack(struct_env.module_env.get_id(), struct_env.get_id(), vec![]),
+                    vec![struct_temp_index],
+                    field_temp_indices,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::PackGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let actuals = self.get_type_params(struct_instantiation.type_parameters);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(struct_instantiation.def);
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_count;
+                for _ in struct_env.get_fields() {
+                    let field_temp_index = self.temp_stack.pop().unwrap();
+                    field_temp_indices.push(field_temp_index);
+                }
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    actuals.clone(),
+                ));
+                self.temp_stack.push(struct_temp_index);
+                field_temp_indices.reverse();
+                self.code.push(mk_call(
+                    Operation::Pack(struct_env.module_env.get_id(), struct_env.get_id(), actuals),
+                    vec![struct_temp_index],
+                    field_temp_indices,
+                ));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::Unpack(idx) => {
+                let struct_env = self.func_env.module_env.get_struct_by_def_idx(*idx);
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_stack.pop().unwrap();
+                for field_env in struct_env.get_fields() {
+                    let field_temp_index = self.temp_count;
+                    field_temp_indices.push(field_temp_index);
+                    self.temp_stack.push(field_temp_index);
+                    self.local_types.push(field_env.get_type());
+                    self.temp_count += 1;
+                }
+                self.code.push(mk_call(
+                    Operation::Unpack(struct_env.module_env.get_id(), struct_env.get_id(), vec![]),
+                    field_temp_indices,
+                    vec![struct_temp_index],
+                ));
+            }
+
+            MoveBytecode::UnpackGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let actuals = self.get_type_params(struct_instantiation.type_parameters);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(struct_instantiation.def);
+                let mut field_temp_indices = vec![];
+                let struct_temp_index = self.temp_stack.pop().unwrap();
+                for field_env in struct_env.get_fields() {
+                    let field_type = field_env.get_type().instantiate(&actuals);
+                    let field_temp_index = self.temp_count;
+                    field_temp_indices.push(field_temp_index);
+                    self.temp_stack.push(field_temp_index);
+                    self.local_types.push(field_type);
+                    self.temp_count += 1;
+                }
+                self.code.push(mk_call(
+                    Operation::Unpack(struct_env.module_env.get_id(), struct_env.get_id(), actuals),
+                    field_temp_indices,
+                    vec![struct_temp_index],
+                ));
+            }
+
+            MoveBytecode::ReadRef => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let operand_sig = self.local_types[operand_index].clone();
+                let temp_index = self.temp_count;
+                if let Type::Reference(_, signature) = operand_sig {
+                    self.local_types.push(*signature);
+                }
+                self.temp_stack.push(temp_index);
+                self.temp_count += 1;
+                self.code
+                    .push(mk_unary(Operation::ReadRef, temp_index, operand_index));
+            }
+
+            MoveBytecode::WriteRef => {
+                let ref_operand_index = self.temp_stack.pop().unwrap();
+                let val_operand_index = self.temp_stack.pop().unwrap();
+                self.code.push(mk_call(
+                    Operation::WriteRef,
+                    vec![],
+                    vec![ref_operand_index, val_operand_index],
+                ));
+            }
+
+            MoveBytecode::Add
+            | MoveBytecode::Sub
+            | MoveBytecode::Mul
+            | MoveBytecode::Mod
+            | MoveBytecode::Div
+            | MoveBytecode::BitOr
+            | MoveBytecode::BitAnd
+            | MoveBytecode::Xor
+            | MoveBytecode::Shl
+            | MoveBytecode::Shr => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let operand_type = self.local_types[operand1_index].clone();
+                let temp_index = self.temp_count;
+                self.local_types.push(operand_type);
+                self.temp_stack.push(temp_index);
+                self.temp_count += 1;
+                match bytecode {
+                    MoveBytecode::Add => {
+                        self.code.push(mk_binary(
+                            Operation::Add,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Sub => {
+                        self.code.push(mk_binary(
+                            Operation::Sub,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Mul => {
+                        self.code.push(mk_binary(
+                            Operation::Mul,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Mod => {
+                        self.code.push(mk_binary(
+                            Operation::Mod,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Div => {
+                        self.code.push(mk_binary(
+                            Operation::Div,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::BitOr => {
+                        self.code.push(mk_binary(
+                            Operation::BitOr,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::BitAnd => {
+                        self.code.push(mk_binary(
+                            Operation::BitAnd,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Xor => {
+                        self.code.push(mk_binary(
+                            Operation::Xor,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Shl => {
+                        self.code.push(mk_binary(
+                            Operation::Shl,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Shr => {
+                        self.code.push(mk_binary(
+                            Operation::Shr,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    _ => {}
+                }
+            }
+            MoveBytecode::Or => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_binary(
+                    Operation::Or,
+                    temp_index,
+                    operand1_index,
+                    operand2_index,
+                ));
+            }
+
+            MoveBytecode::And => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_binary(
+                    Operation::And,
+                    temp_index,
+                    operand1_index,
+                    operand2_index,
+                ));
+            }
+
+            MoveBytecode::Not => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code
+                    .push(mk_unary(Operation::Not, temp_index, operand_index));
+            }
+            MoveBytecode::Eq => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_binary(
+                    Operation::Eq,
+                    temp_index,
+                    operand1_index,
+                    operand2_index,
+                ));
+            }
+            MoveBytecode::Neq => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_binary(
+                    Operation::Neq,
+                    temp_index,
+                    operand1_index,
+                    operand2_index,
+                ));
+            }
+            MoveBytecode::Lt | MoveBytecode::Gt | MoveBytecode::Le | MoveBytecode::Ge => {
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                match bytecode {
+                    MoveBytecode::Lt => {
+                        self.code.push(mk_binary(
+                            Operation::Lt,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Gt => {
+                        self.code.push(mk_binary(
+                            Operation::Gt,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Le => {
+                        self.code.push(mk_binary(
+                            Operation::Le,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    MoveBytecode::Ge => {
+                        self.code.push(mk_binary(
+                            Operation::Ge,
+                            temp_index,
+                            operand1_index,
+                            operand2_index,
+                        ));
+                    }
+                    _ => {}
+                }
+            }
+            MoveBytecode::Exists(struct_index) => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_unary(
+                    Operation::Exists(
+                        self.func_env.module_env.get_id(),
+                        self.func_env.module_env.get_struct_id(*struct_index),
+                        vec![],
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::ExistsGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::Bool));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(mk_unary(
+                    Operation::Exists(
+                        self.func_env.module_env.get_id(),
+                        self.func_env
+                            .module_env
+                            .get_struct_id(struct_instantiation.def),
+                        self.get_type_params(struct_instantiation.type_parameters),
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::MutBorrowGlobal(idx) | MoveBytecode::ImmBorrowGlobal(idx) => {
+                let struct_env = self.func_env.module_env.get_struct_by_def_idx(*idx);
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowGlobal(..));
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Reference(
+                    is_mut,
+                    Box::new(Type::Struct(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        vec![],
+                    )),
+                ));
+                self.temp_stack.push(temp_index);
+                self.temp_count += 1;
+                self.code.push(mk_unary(
+                    Operation::BorrowGlobal(
+                        self.func_env.module_env.get_id(),
+                        self.func_env.module_env.get_struct_id(*idx),
+                        vec![],
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::MutBorrowGlobalGeneric(idx)
+            | MoveBytecode::ImmBorrowGlobalGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let is_mut = matches!(bytecode, MoveBytecode::MutBorrowGlobalGeneric(..));
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(struct_instantiation.def);
+
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                let actuals = self.get_type_params(struct_instantiation.type_parameters);
+                self.local_types.push(Type::Reference(
+                    is_mut,
+                    Box::new(Type::Struct(
+                        struct_env.module_env.get_id(),
+                        struct_env.get_id(),
+                        actuals.clone(),
+                    )),
+                ));
+                self.temp_stack.push(temp_index);
+                self.temp_count += 1;
+                self.code.push(mk_unary(
+                    Operation::BorrowGlobal(
+                        self.func_env.module_env.get_id(),
+                        self.func_env
+                            .module_env
+                            .get_struct_id(struct_instantiation.def),
+                        actuals,
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::MoveFrom(idx) => {
+                let struct_env = self.func_env.module_env.get_struct_by_def_idx(*idx);
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    vec![],
+                ));
+                self.temp_count += 1;
+                self.code.push(mk_unary(
+                    Operation::MoveFrom(
+                        self.func_env.module_env.get_id(),
+                        self.func_env.module_env.get_struct_id(*idx),
+                        vec![],
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::MoveFromGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let struct_env = self
+                    .func_env
+                    .module_env
+                    .get_struct_by_def_idx(struct_instantiation.def);
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                let actuals = self.get_type_params(struct_instantiation.type_parameters);
+                self.local_types.push(Type::Struct(
+                    struct_env.module_env.get_id(),
+                    struct_env.get_id(),
+                    actuals.clone(),
+                ));
+                self.temp_count += 1;
+                self.code.push(mk_unary(
+                    Operation::MoveFrom(
+                        self.func_env.module_env.get_id(),
+                        self.func_env
+                            .module_env
+                            .get_struct_id(struct_instantiation.def),
+                        actuals,
+                    ),
+                    temp_index,
+                    operand_index,
+                ));
+            }
+
+            MoveBytecode::MoveTo(idx) => {
+                let value_operand_index = self.temp_stack.pop().unwrap();
+                let signer_operand_index = self.temp_stack.pop().unwrap();
+                self.code.push(mk_call(
+                    Operation::MoveTo(
+                        self.func_env.module_env.get_id(),
+                        self.func_env.module_env.get_struct_id(*idx),
+                        vec![],
+                    ),
+                    vec![],
+                    vec![value_operand_index, signer_operand_index],
+                ));
+            }
+
+            MoveBytecode::MoveToGeneric(idx) => {
+                let struct_instantiation = self.module.struct_instantiation_at(*idx);
+                let value_operand_index = self.temp_stack.pop().unwrap();
+                let signer_operand_index = self.temp_stack.pop().unwrap();
+                self.code.push(mk_call(
+                    Operation::MoveTo(
+                        self.func_env.module_env.get_id(),
+                        self.func_env
+                            .module_env
+                            .get_struct_id(struct_instantiation.def),
+                        self.get_type_params(struct_instantiation.type_parameters),
+                    ),
+                    vec![],
+                    vec![value_operand_index, signer_operand_index],
+                ));
+            }
+
+            MoveBytecode::Nop => self.code.push(Bytecode::Nop(attr_id)),
+
+            // TODO full prover support for vector bytecode instructions
+            // These should go to non-functional call operations
+            MoveBytecode::VecLen(sig) => {
+                let tys = self.get_type_params(*sig);
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Primitive(PrimitiveType::U64));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![temp_index],
+                    mk_vec_function_operation("length", tys),
+                    vec![operand_index],
+                    None,
+                ))
+            }
+            MoveBytecode::VecMutBorrow(sig) | MoveBytecode::VecImmBorrow(sig) => {
+                let is_mut = match bytecode {
+                    MoveBytecode::VecMutBorrow(_) => true,
+                    MoveBytecode::VecImmBorrow(_) => false,
+                    _ => unreachable!(),
+                };
+                let [ty]: [Type; 1] = self.get_type_params(*sig).try_into().unwrap();
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types
+                    .push(Type::Reference(is_mut, Box::new(ty.clone())));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                let vec_fun = if is_mut { "borrow_mut" } else { "borrow" };
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![temp_index],
+                    mk_vec_function_operation(vec_fun, vec![ty]),
+                    vec![operand1_index, operand2_index],
+                    None,
+                ))
+            }
+            MoveBytecode::VecPushBack(sig) => {
+                let tys = self.get_type_params(*sig);
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![],
+                    mk_vec_function_operation("push_back", tys),
+                    vec![operand1_index, operand2_index],
+                    None,
+                ))
+            }
+            MoveBytecode::VecPopBack(sig) => {
+                let [ty]: [Type; 1] = self.get_type_params(*sig).try_into().unwrap();
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.local_types.push(ty.clone());
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![temp_index],
+                    mk_vec_function_operation("pop_back", vec![ty]),
+                    vec![operand_index],
+                    None,
+                ))
+            }
+            MoveBytecode::VecSwap(sig) => {
+                let tys = self.get_type_params(*sig);
+                let operand3_index = self.temp_stack.pop().unwrap();
+                let operand2_index = self.temp_stack.pop().unwrap();
+                let operand1_index = self.temp_stack.pop().unwrap();
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![],
+                    mk_vec_function_operation("swap", tys),
+                    vec![operand1_index, operand2_index, operand3_index],
+                    None,
+                ))
+            }
+            MoveBytecode::VecPack(sig, n) => {
+                let n = *n as usize;
+                let [ty]: [Type; 1] = self.get_type_params(*sig).try_into().unwrap();
+                let operands = self.temp_stack.split_off(self.temp_stack.len() - n);
+                let temp_index = self.temp_count;
+                self.local_types.push(Type::Vector(Box::new(ty.clone())));
+                self.temp_count += 1;
+                self.temp_stack.push(temp_index);
+
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![temp_index],
+                    mk_vec_function_operation("empty", vec![ty.clone()]),
+                    vec![],
+                    None,
+                ));
+                if !operands.is_empty() {
+                    let mut_ref_index = self.temp_count;
+                    self.local_types.push(Type::Reference(
+                        true,
+                        Box::new(Type::Vector(Box::new(ty.clone()))),
+                    ));
+                    self.temp_count += 1;
+
+                    self.code
+                        .push(mk_unary(Operation::BorrowLoc, mut_ref_index, temp_index));
+
+                    for operand in operands {
+                        self.code.push(Bytecode::Call(
+                            attr_id,
+                            vec![],
+                            mk_vec_function_operation("push_back", vec![ty.clone()]),
+                            vec![mut_ref_index, operand],
+                            None,
+                        ));
+                    }
+                }
+            }
+            MoveBytecode::VecUnpack(sig, n) => {
+                let n = *n as usize;
+                let [ty]: [Type; 1] = self.get_type_params(*sig).try_into().unwrap();
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temps = (0..n).map(|idx| self.temp_count + idx).collect::<Vec<_>>();
+                self.local_types.extend(vec![ty.clone(); n]);
+                self.temp_count += n;
+                self.temp_stack.extend(&temps);
+
+                if !temps.is_empty() {
+                    let mut_ref_index = self.temp_count;
+                    self.local_types.push(Type::Reference(
+                        true,
+                        Box::new(Type::Vector(Box::new(ty.clone()))),
+                    ));
+                    self.temp_count += 1;
+
+                    self.code
+                        .push(mk_unary(Operation::BorrowLoc, mut_ref_index, operand_index));
+
+                    for temp in temps {
+                        self.code.push(Bytecode::Call(
+                            attr_id,
+                            vec![temp],
+                            mk_vec_function_operation("pop_back", vec![ty.clone()]),
+                            vec![mut_ref_index],
+                            None,
+                        ));
+                    }
+                }
+
+                self.code.push(Bytecode::Call(
+                    attr_id,
+                    vec![],
+                    mk_vec_function_operation("destroy_empty", vec![ty]),
+                    vec![operand_index],
+                    None,
+                ))
+            }
+        }
+    }
+
+    fn translate_value(ty: &Type, value: &MoveValue) -> Constant {
+        match (ty, &value) {
+            (Type::Vector(inner), MoveValue::Vector(vs)) => match **inner {
+                Type::Primitive(PrimitiveType::U8) => {
+                    let b = vs
+                        .iter()
+                        .map(|v| match Self::translate_value(inner, v) {
+                            Constant::U8(u) => u,
+                            _ => panic!("Expected u8, but found: {:?}", inner),
+                        })
+                        .collect::<Vec<u8>>();
+                    Constant::ByteArray(b)
+                }
+                Type::Primitive(PrimitiveType::Address) => {
+                    let b = vs
+                        .iter()
+                        .map(|v| match Self::translate_value(inner, v) {
+                            Constant::Address(a) => a,
+                            _ => panic!("Expected address, but found: {:?}", inner),
+                        })
+                        .collect::<Vec<BigUint>>();
+                    Constant::AddressArray(b)
+                }
+                _ => {
+                    let b = vs
+                        .iter()
+                        .map(|v| Self::translate_value(inner, v))
+                        .collect::<Vec<Constant>>();
+                    Constant::Vector(b)
+                }
+            },
+            (Type::Primitive(PrimitiveType::Bool), MoveValue::Bool(b)) => Constant::Bool(*b),
+            (Type::Primitive(PrimitiveType::U8), MoveValue::U8(b)) => Constant::U8(*b),
+            (Type::Primitive(PrimitiveType::U16), MoveValue::U16(b)) => Constant::U16(*b),
+            (Type::Primitive(PrimitiveType::U32), MoveValue::U32(b)) => Constant::U32(*b),
+            (Type::Primitive(PrimitiveType::U64), MoveValue::U64(b)) => Constant::U64(*b),
+            (Type::Primitive(PrimitiveType::U128), MoveValue::U128(b)) => Constant::U128(*b),
+            (Type::Primitive(PrimitiveType::U256), MoveValue::U256(b)) => Constant::U256(b.into()),
+            (Type::Primitive(PrimitiveType::Address), MoveValue::Address(a)) => {
+                Constant::Address(move_model::addr_to_big_uint(a))
+            }
+            _ => panic!("Unexpected (and possibly invalid) constant type: {:?}", ty),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/stackless_control_flow_graph.rs b/vendors/move/crates/move-stackless-bytecode/src/stackless_control_flow_graph.rs
new file mode 100644
index 000000000..27b2395e8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/stackless_control_flow_graph.rs
@@ -0,0 +1,357 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Adapted from control_flow_graph for Bytecode, this module defines the control-flow graph on
+//! Stackless Bytecode used in analysis as part of Move prover.
+
+use crate::{
+    function_target::FunctionTarget,
+    stackless_bytecode::{Bytecode, Label},
+};
+use move_binary_format::file_format::CodeOffset;
+use petgraph::{dot::Dot, graph::Graph};
+use std::collections::{BTreeMap, BTreeSet};
+
+type Map<K, V> = BTreeMap<K, V>;
+type Set<V> = BTreeSet<V>;
+pub type BlockId = CodeOffset;
+
+#[derive(Debug)]
+struct Block {
+    successors: Vec<BlockId>,
+    content: BlockContent,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum BlockContent {
+    Basic {
+        lower: CodeOffset,
+        upper: CodeOffset,
+    },
+    Dummy,
+}
+
+pub struct StacklessControlFlowGraph {
+    entry_block_id: BlockId,
+    blocks: Map<BlockId, Block>,
+    backward: bool,
+}
+
+const DUMMY_ENTRANCE: BlockId = 0;
+const DUMMY_EXIT: BlockId = 1;
+
+impl StacklessControlFlowGraph {
+    pub fn new_forward(code: &[Bytecode]) -> Self {
+        Self {
+            entry_block_id: DUMMY_ENTRANCE,
+            blocks: Self::collect_blocks(code),
+            backward: false,
+        }
+    }
+
+    /// If from_all_blocks is false, perform backward analysis only from blocks that may exit.
+    /// If from_all_blocks is true, perform backward analysis from all blocks.
+    pub fn new_backward(code: &[Bytecode], from_all_blocks: bool) -> Self {
+        let blocks = Self::collect_blocks(code);
+        let mut block_id_to_predecessors: Map<BlockId, Vec<BlockId>> =
+            blocks.keys().map(|block_id| (*block_id, vec![])).collect();
+        for (block_id, block) in &blocks {
+            for succ_block_id in &block.successors {
+                if from_all_blocks && *succ_block_id == DUMMY_EXIT {
+                    continue;
+                }
+                let predecessors = &mut block_id_to_predecessors.get_mut(succ_block_id).unwrap();
+                predecessors.push(*block_id);
+            }
+        }
+        if from_all_blocks {
+            let predecessors = &mut block_id_to_predecessors.get_mut(&DUMMY_EXIT).unwrap();
+            blocks.keys().for_each(|block_id| {
+                if *block_id != DUMMY_ENTRANCE && *block_id != DUMMY_EXIT {
+                    predecessors.push(*block_id);
+                }
+            });
+        }
+        Self {
+            entry_block_id: DUMMY_EXIT,
+            blocks: block_id_to_predecessors
+                .into_iter()
+                .map(|(block_id, predecessors)| {
+                    (
+                        block_id,
+                        Block {
+                            successors: predecessors,
+                            content: blocks[&block_id].content,
+                        },
+                    )
+                })
+                .collect(),
+            backward: true,
+        }
+    }
+
+    /// Generate a block that contains all the code
+    pub fn one_block(code: &[Bytecode]) -> Self {
+        let mut blocks = Map::new();
+        let mut successors = vec![];
+        let entry_bb = 2 as BlockId;
+        successors.insert(0, entry_bb);
+        successors.insert(1, DUMMY_EXIT);
+        let bb = BlockContent::Basic {
+            lower: 0,
+            upper: code.len() as u16 - 1,
+        };
+        blocks.insert(
+            entry_bb,
+            Block {
+                successors,
+                content: bb,
+            },
+        );
+        blocks.insert(
+            DUMMY_ENTRANCE,
+            Block {
+                successors: vec![entry_bb],
+                content: BlockContent::Dummy,
+            },
+        );
+        blocks.insert(
+            DUMMY_EXIT,
+            Block {
+                successors: Vec::new(),
+                content: BlockContent::Dummy,
+            },
+        );
+        Self {
+            entry_block_id: DUMMY_ENTRANCE,
+            blocks,
+            backward: false,
+        }
+    }
+
+    fn collect_blocks(code: &[Bytecode]) -> Map<BlockId, Block> {
+        // First go through and collect basic block offsets.
+        // Need to do this first in order to handle backwards edges.
+        let label_offsets = Bytecode::label_offsets(code);
+        let mut bb_offsets = Set::new();
+        bb_offsets.insert(0);
+        for pc in 0..code.len() {
+            StacklessControlFlowGraph::record_block_ids(
+                pc as CodeOffset,
+                code,
+                &mut bb_offsets,
+                &label_offsets,
+            );
+        }
+        // Now construct blocks
+        let mut blocks = Map::new();
+        // Maps basic block entry offsets to their key in blocks
+        let mut offset_to_key = Map::new();
+        // Block counter starts at 2 because entry and exit will be block 0 and 1
+        let mut bcounter = 2;
+        let mut block_entry = 0;
+        for pc in 0..code.len() {
+            let co_pc: CodeOffset = pc as CodeOffset;
+            // Create a basic block
+            if StacklessControlFlowGraph::is_end_of_block(co_pc, code, &bb_offsets) {
+                let mut successors = Bytecode::get_successors(co_pc, code, &label_offsets);
+                for successor in successors.iter_mut() {
+                    *successor = *offset_to_key.entry(*successor).or_insert(bcounter);
+                    bcounter = std::cmp::max(*successor + 1, bcounter);
+                }
+                if code[co_pc as usize].is_exit() {
+                    successors.push(DUMMY_EXIT);
+                }
+                let bb = BlockContent::Basic {
+                    lower: block_entry,
+                    upper: co_pc,
+                };
+                let key = *offset_to_key.entry(block_entry).or_insert(bcounter);
+                bcounter = std::cmp::max(key + 1, bcounter);
+                blocks.insert(
+                    key,
+                    Block {
+                        successors,
+                        content: bb,
+                    },
+                );
+                block_entry = co_pc + 1;
+            }
+        }
+        assert_eq!(block_entry, code.len() as CodeOffset);
+        let entry_bb = *offset_to_key.get(&0).unwrap();
+        blocks.insert(
+            DUMMY_ENTRANCE,
+            Block {
+                successors: vec![entry_bb],
+                content: BlockContent::Dummy,
+            },
+        );
+        blocks.insert(
+            DUMMY_EXIT,
+            Block {
+                successors: Vec::new(),
+                content: BlockContent::Dummy,
+            },
+        );
+        blocks
+    }
+
+    fn is_end_of_block(pc: CodeOffset, code: &[Bytecode], block_ids: &Set<BlockId>) -> bool {
+        pc + 1 == (code.len() as CodeOffset) || block_ids.contains(&(pc + 1))
+    }
+
+    fn record_block_ids(
+        pc: CodeOffset,
+        code: &[Bytecode],
+        block_ids: &mut Set<BlockId>,
+        label_offsets: &BTreeMap<Label, CodeOffset>,
+    ) {
+        let bytecode = &code[pc as usize];
+
+        for label in bytecode.branch_dests() {
+            block_ids.insert(*label_offsets.get(&label).unwrap());
+        }
+
+        if bytecode.is_branch() && pc + 1 < (code.len() as CodeOffset) {
+            block_ids.insert(pc + 1);
+        }
+    }
+}
+
+impl StacklessControlFlowGraph {
+    pub fn successors(&self, block_id: BlockId) -> &Vec<BlockId> {
+        &self.blocks[&block_id].successors
+    }
+
+    pub fn content(&self, block_id: BlockId) -> &BlockContent {
+        &self.blocks[&block_id].content
+    }
+
+    pub fn blocks(&self) -> Vec<BlockId> {
+        self.blocks.keys().cloned().collect()
+    }
+
+    pub fn entry_block(&self) -> BlockId {
+        self.entry_block_id
+    }
+
+    pub fn exit_block(&self) -> BlockId {
+        if self.backward {
+            DUMMY_ENTRANCE
+        } else {
+            DUMMY_EXIT
+        }
+    }
+
+    pub fn instr_indexes(
+        &self,
+        block_id: BlockId,
+    ) -> Option<Box<dyn DoubleEndedIterator<Item = CodeOffset>>> {
+        match self.blocks[&block_id].content {
+            BlockContent::Basic { lower, upper } => Some(Box::new(lower..=upper)),
+            BlockContent::Dummy => None,
+        }
+    }
+
+    pub fn num_blocks(&self) -> u16 {
+        self.blocks.len() as u16
+    }
+
+    pub fn is_dummmy(&self, block_id: BlockId) -> bool {
+        matches!(self.blocks[&block_id].content, BlockContent::Dummy)
+    }
+
+    pub fn display(&self) {
+        println!("+=======================+");
+        println!("entry_block_id = {}", self.entry_block_id);
+        println!("blocks = {:?}", self.blocks);
+        println!("is_backward = {}", self.backward);
+        println!("+=======================+");
+    }
+}
+
+// CFG dot graph generation
+struct DotCFGBlock<'env> {
+    block_id: BlockId,
+    content: BlockContent,
+    func_target: &'env FunctionTarget<'env>,
+    label_offsets: BTreeMap<Label, CodeOffset>,
+}
+
+impl<'env> std::fmt::Display for DotCFGBlock<'env> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let code_range = match self.content {
+            BlockContent::Basic { lower, upper } => format!("offset {}..={}", lower, upper),
+            BlockContent::Dummy => "X".to_owned(),
+        };
+        writeln!(f, "[Block {} - {}]", self.block_id, code_range)?;
+        match self.content {
+            BlockContent::Basic { lower, upper } => {
+                let code = &self.func_target.data.code;
+                for (offset, instruction) in
+                    (lower..=upper).zip(&code[(lower as usize)..=(upper as usize)])
+                {
+                    let text = self.func_target.pretty_print_bytecode(
+                        &self.label_offsets,
+                        offset as usize,
+                        instruction,
+                    );
+                    writeln!(f, "{}", text)?;
+                }
+            }
+            BlockContent::Dummy => {}
+        }
+        Ok(())
+    }
+}
+
+// A dummy struct to implement fmt required by petgraph::Dot
+struct DotCFGEdge {}
+
+impl std::fmt::Display for DotCFGEdge {
+    fn fmt(&self, _f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        Ok(())
+    }
+}
+
+/// Generate the dot representation of the CFG (which can be rendered by the Dot program)
+pub fn generate_cfg_in_dot_format<'env>(func_target: &'env FunctionTarget<'env>) -> String {
+    let code = &func_target.data.code;
+    let cfg = StacklessControlFlowGraph::new_forward(code);
+    let label_offsets = Bytecode::label_offsets(code);
+    let mut graph = Graph::new();
+
+    // add nodes
+    let mut node_map = Map::new();
+    for (block_id, block) in &cfg.blocks {
+        let dot_block = DotCFGBlock {
+            block_id: *block_id,
+            content: block.content,
+            func_target,
+            label_offsets: label_offsets.clone(),
+        };
+        let node_index = graph.add_node(dot_block);
+        node_map.insert(block_id, node_index);
+    }
+
+    // add edges
+    for (block_id, block) in &cfg.blocks {
+        for successor in &block.successors {
+            graph.add_edge(
+                *node_map.get(block_id).unwrap(),
+                *node_map.get(successor).unwrap(),
+                DotCFGEdge {},
+            );
+        }
+    }
+
+    // generate dot string
+    format!(
+        "{}",
+        Dot::with_attr_getters(&graph, &[], &|_, _| "".to_string(), &|_, _| {
+            "shape=box".to_string()
+        })
+    )
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/usage_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/usage_analysis.rs
new file mode 100644
index 000000000..0cd0659f4
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/usage_analysis.rs
@@ -0,0 +1,412 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeSet, fmt, fmt::Formatter};
+
+use itertools::Itertools;
+use paste::paste;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{ConditionKind, Spec},
+    model::{FunctionEnv, GlobalEnv, QualifiedId, QualifiedInstId, StructId},
+    ty::Type,
+};
+
+use crate::{
+    compositional_analysis::{CompositionalAnalysis, SummaryCache},
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, SetDomain},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
+};
+
+pub fn get_memory_usage<'env>(target: &FunctionTarget<'env>) -> &'env UsageState {
+    target
+        .get_annotations()
+        .get::<UsageState>()
+        .expect("Invariant violation: target not analyzed")
+}
+
+/// A summary of the memory accessed / modified per function, both directly and transitively.
+#[derive(Default, Clone)]
+pub struct MemoryUsage {
+    // The memory directly used in the function.
+    pub direct: SetDomain<QualifiedInstId<StructId>>,
+    // The memory transitively used in either the function itself or at least one of its callees.
+    pub transitive: SetDomain<QualifiedInstId<StructId>>,
+    // The union of the above sets
+    pub all: SetDomain<QualifiedInstId<StructId>>,
+}
+
+#[derive(Default, Clone)]
+pub struct UsageState {
+    /// The memory accessed by this function. This is the union of the three individual fields
+    /// below.
+    pub accessed: MemoryUsage,
+    /// The memory modified by this function.
+    pub modified: MemoryUsage,
+    /// The memory mentioned by the assume expressions in this function.
+    pub assumed: MemoryUsage,
+    /// The memory mentioned by the assert expressions in this function.
+    pub asserted: MemoryUsage,
+}
+
+impl MemoryUsage {
+    //
+    // setters that insert element(s) to related sets
+    //
+
+    fn add_direct(&mut self, mem: QualifiedInstId<StructId>) {
+        self.direct.insert(mem.clone());
+        self.all.insert(mem);
+    }
+
+    fn add_transitive(&mut self, mem: QualifiedInstId<StructId>) {
+        self.transitive.insert(mem.clone());
+        self.all.insert(mem);
+    }
+
+    //
+    // accessors that further instantiate the memories
+    //
+
+    pub fn get_direct_inst(&self, inst: &[Type]) -> BTreeSet<QualifiedInstId<StructId>> {
+        self.direct
+            .iter()
+            .map(|mem| mem.instantiate_ref(inst))
+            .collect()
+    }
+
+    pub fn get_transitive_inst(&self, inst: &[Type]) -> BTreeSet<QualifiedInstId<StructId>> {
+        self.transitive
+            .iter()
+            .map(|mem| mem.instantiate_ref(inst))
+            .collect()
+    }
+
+    pub fn get_all_inst(&self, inst: &[Type]) -> BTreeSet<QualifiedInstId<StructId>> {
+        self.all
+            .iter()
+            .map(|mem| mem.instantiate_ref(inst))
+            .collect()
+    }
+
+    //
+    // accessors that uninstantiate the memories
+    //
+
+    pub fn get_direct_uninst(&self) -> BTreeSet<QualifiedId<StructId>> {
+        self.direct
+            .iter()
+            .map(|mem| mem.module_id.qualified(mem.id))
+            .collect()
+    }
+
+    pub fn get_transitive_uninst(&self) -> BTreeSet<QualifiedId<StructId>> {
+        self.transitive
+            .iter()
+            .map(|mem| mem.module_id.qualified(mem.id))
+            .collect()
+    }
+
+    pub fn get_all_uninst(&self) -> BTreeSet<QualifiedId<StructId>> {
+        self.all
+            .iter()
+            .map(|mem| mem.module_id.qualified(mem.id))
+            .collect()
+    }
+}
+
+impl AbstractDomain for MemoryUsage {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        match (
+            self.direct.join(&other.direct),
+            self.transitive.join(&other.transitive),
+            self.all.join(&other.all),
+        ) {
+            (JoinResult::Unchanged, JoinResult::Unchanged, JoinResult::Unchanged) => {
+                JoinResult::Unchanged
+            }
+            _ => JoinResult::Changed,
+        }
+    }
+}
+
+macro_rules! generate_inserter {
+    ($field: ident, $method: ident) => {
+        paste! {
+            #[allow(dead_code)]
+            fn [<$method _ $field>](&mut self, mem: QualifiedInstId<StructId>) {
+                self.$field.$method(mem.clone());
+                self.accessed.$method(mem);
+            }
+
+            #[allow(dead_code)]
+            fn [<$method _ $field _iter>](
+                &mut self,
+                mems: impl Iterator<Item = QualifiedInstId<StructId>>
+            ) {
+                for mem in mems {
+                    self.[<$method _ $field>](mem);
+                }
+            }
+        }
+    };
+}
+
+/// Generated functions
+impl UsageState {
+    generate_inserter!(accessed, add_direct);
+    generate_inserter!(accessed, add_transitive);
+
+    generate_inserter!(modified, add_direct);
+    generate_inserter!(modified, add_transitive);
+
+    generate_inserter!(assumed, add_direct);
+    generate_inserter!(assumed, add_transitive);
+
+    generate_inserter!(asserted, add_direct);
+    generate_inserter!(asserted, add_transitive);
+}
+
+/// Helpers for the abstract interpretation process
+impl UsageState {
+    fn subsume_callee(&mut self, callee: &Self, inst: &[Type]) {
+        self.add_transitive_accessed_iter(callee.accessed.get_all_inst(inst).into_iter());
+        self.add_transitive_modified_iter(callee.modified.get_all_inst(inst).into_iter());
+        self.add_transitive_assumed_iter(callee.assumed.get_all_inst(inst).into_iter());
+        self.add_transitive_asserted_iter(callee.asserted.get_all_inst(inst).into_iter());
+    }
+}
+
+impl AbstractDomain for UsageState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        match (
+            self.accessed.join(&other.accessed),
+            self.modified.join(&other.modified),
+            self.assumed.join(&other.assumed),
+            self.asserted.join(&other.asserted),
+        ) {
+            (
+                JoinResult::Unchanged,
+                JoinResult::Unchanged,
+                JoinResult::Unchanged,
+                JoinResult::Unchanged,
+            ) => JoinResult::Unchanged,
+            _ => JoinResult::Changed,
+        }
+    }
+}
+
+struct MemoryUsageAnalysis<'a> {
+    cache: SummaryCache<'a>,
+}
+
+impl<'a> DataflowAnalysis for MemoryUsageAnalysis<'a> {}
+
+impl<'a> CompositionalAnalysis<UsageState> for MemoryUsageAnalysis<'a> {
+    fn to_summary(&self, state: UsageState, _fun_target: &FunctionTarget) -> UsageState {
+        state
+    }
+}
+
+impl<'a> TransferFunctions for MemoryUsageAnalysis<'a> {
+    type State = UsageState;
+    const BACKWARD: bool = false;
+
+    fn execute(&self, state: &mut Self::State, code: &Bytecode, _offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+        use PropKind::*;
+
+        match code {
+            // memory accesses in operations
+            Call(_, _, oper, _, _) => match oper {
+                Function(mid, fid, inst)
+                | OpaqueCallBegin(mid, fid, inst)
+                | OpaqueCallEnd(mid, fid, inst) => {
+                    let callee_id = mid.qualified(*fid);
+                    if let Some(summary) = self
+                        .cache
+                        .get::<UsageState>(callee_id, &FunctionVariant::Baseline)
+                    {
+                        state.subsume_callee(summary, inst);
+                    }
+                }
+                MoveTo(mid, sid, inst)
+                | MoveFrom(mid, sid, inst)
+                | BorrowGlobal(mid, sid, inst) => {
+                    let mem = mid.qualified_inst(*sid, inst.to_owned());
+                    state.add_direct_modified(mem);
+                }
+                WriteBack(BorrowNode::GlobalRoot(mem), _) => {
+                    state.add_direct_modified(mem.clone());
+                }
+                Exists(mid, sid, inst) | GetGlobal(mid, sid, inst) => {
+                    let mem = mid.qualified_inst(*sid, inst.to_owned());
+                    state.add_direct_accessed(mem);
+                }
+                _ => {}
+            },
+            // memory accesses in expressions
+            Prop(_, kind, exp) => match kind {
+                Assume => state.add_direct_assumed_iter(
+                    exp.used_memory(self.cache.global_env())
+                        .into_iter()
+                        .map(|(usage, _)| usage),
+                ),
+                Assert => state.add_direct_asserted_iter(
+                    exp.used_memory(self.cache.global_env())
+                        .into_iter()
+                        .map(|(usage, _)| usage),
+                ),
+                Modifies => {
+                    // do nothing, as the `modifies` memories are captured by other sets
+                }
+            },
+            _ => {}
+        }
+    }
+}
+
+impl<'a> MemoryUsageAnalysis<'a> {
+    /// Compute usage information for the given spec. This spec maybe injected in later
+    /// phases into the code, but we need to account for it's memory usage already here
+    /// as spec injection itself depends on this information.
+    fn compute_spec_usage(&self, spec: &Spec, state: &mut UsageState) {
+        use ConditionKind::*;
+        for cond in &spec.conditions {
+            let mut used_memory = cond.exp.used_memory(self.cache.global_env());
+            for exp in &cond.additional_exps {
+                used_memory.extend(exp.used_memory(self.cache.global_env()));
+            }
+            match &cond.kind {
+                Ensures | AbortsIf | Emits => {
+                    state.add_direct_asserted_iter(used_memory.into_iter().map(|(usage, _)| usage));
+                }
+                _ => {
+                    state.add_direct_assumed_iter(used_memory.into_iter().map(|(usage, _)| usage));
+                }
+            }
+            if matches!(cond.kind, Update) {
+                // Add target of spec update to modified memory
+                if let Some((mem, _, _)) =
+                    cond.additional_exps[0].extract_ghost_mem_access(self.cache.global_env())
+                {
+                    state.add_direct_modified(mem);
+                }
+            }
+        }
+
+        // Handle memory update of the specs in the function body
+        for impl_spec in spec.on_impl.values() {
+            for cond in &impl_spec.conditions {
+                if matches!(cond.kind, Update) && !cond.additional_exps.is_empty() {
+                    if let Some((mem, _, _)) =
+                        cond.additional_exps[0].extract_ghost_mem_access(self.cache.global_env())
+                    {
+                        state.add_direct_modified(mem);
+                    }
+                }
+            }
+        }
+    }
+}
+
+pub struct UsageProcessor();
+
+impl UsageProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(UsageProcessor())
+    }
+
+    pub fn analyze(
+        targets: &FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        data: &FunctionData,
+    ) -> UsageState {
+        let func_target = FunctionTarget::new(func_env, data);
+        let cache = SummaryCache::new(targets, func_env.module_env.env);
+        let analysis = MemoryUsageAnalysis { cache };
+        let mut summary = analysis.summarize(&func_target, UsageState::default());
+        analysis.compute_spec_usage(func_env.get_spec(), &mut summary);
+        summary
+    }
+}
+
+impl FunctionTargetProcessor for UsageProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        func_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let summary = Self::analyze(targets, func_env, &data);
+        // TODO(mengxu): re-check the code on whether recursion have an impact on the analysis here.
+        data.annotations.set(summary, true);
+        data
+    }
+
+    fn name(&self) -> String {
+        "usage_analysis".to_string()
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut Formatter<'_>,
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        writeln!(f, "\n\n********* Result of usage analysis *********\n\n")?;
+        for module in env.get_modules() {
+            if !module.is_target() {
+                continue;
+            }
+            for fun in module.get_functions() {
+                for (_, ref target) in targets.get_targets(&fun) {
+                    let usage = get_memory_usage(target);
+                    writeln!(
+                        f,
+                        "function {} [{}] {{",
+                        target.func_env.get_full_name_str(),
+                        target.data.variant
+                    )?;
+
+                    let mut print_usage = |set: &MemoryUsage, name: &str| -> fmt::Result {
+                        writeln!(
+                            f,
+                            "  {} = {{{}}}",
+                            name,
+                            set.all
+                                .iter()
+                                .map(|qid| env.display(qid).to_string())
+                                .join(", ")
+                        )?;
+                        writeln!(
+                            f,
+                            "  directly {} = {{{}}}",
+                            name,
+                            set.direct
+                                .iter()
+                                .map(|qid| env.display(qid).to_string())
+                                .join(", ")
+                        )
+                    };
+
+                    print_usage(&usage.accessed, "accessed")?;
+                    print_usage(&usage.modified, "modified")?;
+                    print_usage(&usage.assumed, "assumed")?;
+                    print_usage(&usage.asserted, "asserted")?;
+
+                    writeln!(f, "}}")?;
+                }
+            }
+        }
+        writeln!(f)?;
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/verification_analysis.rs b/vendors/move/crates/move-stackless-bytecode/src/verification_analysis.rs
new file mode 100644
index 000000000..57a601334
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/verification_analysis.rs
@@ -0,0 +1,729 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Analysis which computes an annotation for each function on whether this function should be
+//! verified or inlined. It also calculates the set of global invariants that are applicable to
+//! each function as well as collect information on how these invariants should be handled (i.e.,
+//! checked after bytecode, checked at function exit, or deferred to caller).
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt::{self, Formatter},
+};
+
+use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
+
+use move_model::{
+    ast::GlobalInvariant,
+    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, QualifiedId, VerificationScope},
+    pragmas::{
+        CONDITION_SUSPENDABLE_PROP, DELEGATE_INVARIANTS_TO_CALLER_PRAGMA,
+        DISABLE_INVARIANTS_IN_BODY_PRAGMA, VERIFY_PRAGMA,
+    },
+    ty::{TypeUnificationAdapter, Variance},
+};
+
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    options::ProverOptions,
+    usage_analysis,
+};
+
+/// The annotation for information about verification.
+#[derive(Clone, Default)]
+pub struct VerificationInfo {
+    /// Whether the function is target of verification.
+    pub verified: bool,
+    /// Whether the function needs to have an inlined variant since it is called from a verified
+    /// function and is not opaque.
+    pub inlined: bool,
+}
+
+/// Get verification information for this function.
+pub fn get_info(target: &FunctionTarget<'_>) -> VerificationInfo {
+    target
+        .get_annotations()
+        .get::<VerificationInfo>()
+        .cloned()
+        .unwrap_or_default()
+}
+
+/// A named tuple for holding the information on how an invariant is relevant to a function.
+pub struct InvariantRelevance {
+    /// Global invariants covering memories that are accessed in a function
+    pub accessed: BTreeSet<GlobalId>,
+    /// Global invariants covering memories that are modified in a function
+    pub modified: BTreeSet<GlobalId>,
+    /// Global invariants covering memories that are directly accessed in a function
+    pub direct_accessed: BTreeSet<GlobalId>,
+    /// Global invariants covering memories that are directly modified in a function
+    pub direct_modified: BTreeSet<GlobalId>,
+}
+
+/// Analysis info saved for the global_invariant_instrumentation phase
+pub struct InvariantAnalysisData {
+    /// Functions which have invariants checked on return instead of in body
+    pub fun_set_with_inv_check_on_exit: BTreeSet<QualifiedId<FunId>>,
+    /// Functions which invariants checking is turned-off anywhere in the function
+    pub fun_set_with_no_inv_check: BTreeSet<QualifiedId<FunId>>,
+    /// A mapping from function to the set of global invariants used and modified, respectively
+    pub fun_to_inv_map: BTreeMap<QualifiedId<FunId>, InvariantRelevance>,
+}
+
+// The function target processor
+pub struct VerificationAnalysisProcessor();
+
+impl VerificationAnalysisProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self())
+    }
+}
+
+impl FunctionTargetProcessor for VerificationAnalysisProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        // This function implements the logic to decide whether to verify this function
+
+        // Rule 1: never verify if "pragma verify = false;"
+        if !fun_env.is_pragma_true(VERIFY_PRAGMA, || true) {
+            return data;
+        }
+
+        // Rule 2: verify the function if it is within the target modules
+        let env = fun_env.module_env.env;
+        let target_modules = env.get_target_modules();
+
+        let is_in_target_module = target_modules
+            .iter()
+            .any(|menv| menv.get_id() == fun_env.module_env.get_id());
+        if is_in_target_module {
+            if Self::is_within_verification_scope(fun_env) {
+                Self::mark_verified(fun_env, &mut data, targets);
+            }
+            return data;
+        }
+
+        // Rule 3: verify the function if a global invariant (including update invariant) that is
+        // defined in the target modules (a.k.a. a target invariant) need to be checked in the
+        // function, i.e., the function directly modifies some memory that are covered by at least
+        // one of the target invariants.
+        let inv_analysis = env.get_extension::<InvariantAnalysisData>().unwrap();
+        let target_invs: BTreeSet<_> = target_modules
+            .iter()
+            .flat_map(|menv| env.get_global_invariants_by_module(menv.get_id()))
+            .collect();
+        let inv_relevance = inv_analysis
+            .fun_to_inv_map
+            .get(&fun_env.get_qualified_id())
+            .unwrap();
+        if !inv_relevance.direct_modified.is_disjoint(&target_invs) {
+            if Self::is_within_verification_scope(fun_env) {
+                Self::mark_verified(fun_env, &mut data, targets);
+            }
+            return data;
+        }
+
+        // we don't verify this function
+        data
+    }
+
+    fn name(&self) -> String {
+        "verification_analysis".to_string()
+    }
+
+    fn dump_result(
+        &self,
+        f: &mut Formatter<'_>,
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> fmt::Result {
+        writeln!(f, "\n********* Result of verification analysis *********\n")?;
+
+        let analysis = env
+            .get_extension::<InvariantAnalysisData>()
+            .expect("Verification analysis not performed");
+
+        writeln!(f, "functions that defer invariant checking at return: [")?;
+        for fun_id in &analysis.fun_set_with_inv_check_on_exit {
+            writeln!(f, "  {}", env.get_function(*fun_id).get_full_name_str())?;
+        }
+        writeln!(f, "]\n")?;
+
+        writeln!(f, "functions that delegate invariants to its callers: [")?;
+        for fun_id in &analysis.fun_set_with_no_inv_check {
+            writeln!(f, "  {}", env.get_function(*fun_id).get_full_name_str())?;
+        }
+        writeln!(f, "]\n")?;
+
+        writeln!(f, "invariant applicability: [")?;
+        let target_invs: BTreeSet<_> = env
+            .get_target_modules()
+            .iter()
+            .flat_map(|menv| env.get_global_invariants_by_module(menv.get_id()))
+            .collect();
+
+        let fmt_inv_ids = |ids: &BTreeSet<GlobalId>| -> String {
+            ids.iter()
+                .map(|i| {
+                    if target_invs.contains(i) {
+                        format!("{}*", i)
+                    } else {
+                        i.to_string()
+                    }
+                })
+                .join(", ")
+        };
+
+        for (fun_id, inv_relevance) in &analysis.fun_to_inv_map {
+            writeln!(f, "  {}: {{", env.get_function(*fun_id).get_full_name_str())?;
+            writeln!(
+                f,
+                "    accessed: [{}]",
+                fmt_inv_ids(&inv_relevance.accessed)
+            )?;
+            writeln!(
+                f,
+                "    modified: [{}]",
+                fmt_inv_ids(&inv_relevance.modified)
+            )?;
+            writeln!(
+                f,
+                "    directly accessed: [{}]",
+                fmt_inv_ids(&inv_relevance.direct_accessed)
+            )?;
+            writeln!(
+                f,
+                "    directly modified: [{}]",
+                fmt_inv_ids(&inv_relevance.direct_modified)
+            )?;
+            writeln!(f, "  }}")?;
+        }
+        writeln!(f, "]\n")?;
+
+        writeln!(f, "verification analysis: [")?;
+        for (fun_id, fun_variant) in targets.get_funs_and_variants() {
+            let fenv = env.get_function(fun_id);
+            let target = targets.get_target(&fenv, &fun_variant);
+            let result = get_info(&target);
+            write!(f, "  {}: ", fenv.get_full_name_str())?;
+            if result.verified {
+                if result.inlined {
+                    writeln!(f, "verified + inlined")?;
+                } else {
+                    writeln!(f, "verified")?;
+                }
+            } else {
+                writeln!(f, "inlined")?;
+            }
+        }
+        writeln!(f, "]")
+    }
+
+    fn initialize(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        let options = ProverOptions::get(env);
+
+        // If we are verifying only one function or module, check that this indeed exists.
+        match &options.verify_scope {
+            VerificationScope::Only(name) | VerificationScope::OnlyModule(name) => {
+                let for_module = matches!(&options.verify_scope, VerificationScope::OnlyModule(_));
+                let mut target_exists = false;
+                for module in env.get_modules() {
+                    if module.is_target() {
+                        if for_module {
+                            target_exists = module.matches_name(name)
+                        } else {
+                            target_exists = module.get_functions().any(|f| f.matches_name(name));
+                        }
+                        if target_exists {
+                            break;
+                        }
+                    }
+                }
+                if !target_exists {
+                    env.error(
+                        &env.unknown_loc(),
+                        &format!(
+                            "{} target {} does not exist in target modules",
+                            if for_module { "module" } else { "function" },
+                            name
+                        ),
+                    )
+                }
+            }
+            _ => {}
+        }
+
+        // Collect information for global invariant instrumentation
+
+        // probe how global invariants will be evaluated in the functions
+        let (fun_set_with_inv_check_on_exit, fun_set_with_no_inv_check) =
+            Self::probe_invariant_status_in_functions(env);
+
+        // get a map on how invariants are applicable in functions
+        let fun_to_inv_map = Self::build_function_to_invariants_map(env, targets);
+
+        // error checking, this needs to be done after the invariant applicability map because some
+        // rules depends on information in that map.
+        for fun_id in &fun_set_with_no_inv_check {
+            let fun_env = env.get_function(*fun_id);
+
+            // Rule 1: external-facing functions are not allowed in the N set (i.e., have invariant
+            // checking completely turned-off), UNLESS they don't modify any memory that are checked
+            // in any suspendable invariant.
+            if fun_env.has_unknown_callers() {
+                let relevance = fun_to_inv_map.get(fun_id).unwrap();
+                let num_suspendable_inv_modified = relevance
+                    .modified
+                    .iter()
+                    .filter(|inv_id| is_invariant_suspendable(env, **inv_id))
+                    .count();
+                if num_suspendable_inv_modified != 0 {
+                    if is_invariant_checking_delegated(&fun_env) {
+                        let message = "Public or script functions cannot delegate invariants";
+                        env.error(&fun_env.get_loc(), message);
+                    } else {
+                        let message = "Public or script functions cannot be transitively \
+                        called by functions disabling or delegating invariants";
+                        let trace = Self::compute_non_inv_cause_chain(&fun_env);
+                        env.error_with_notes(&fun_env.get_loc(), message, trace);
+                    };
+                }
+            }
+
+            // Rule 2: a function cannot be both on the E set and N set, i.e., a function cannot
+            // have invariant checking turned-off completely while also checking the invariant at
+            // the function return.
+            if fun_set_with_inv_check_on_exit.contains(fun_id) {
+                let message = format!(
+                    "Functions must not have `pragma {}` when invariant checking is turned-off on \
+                    this function",
+                    DISABLE_INVARIANTS_IN_BODY_PRAGMA,
+                );
+                let trace = Self::compute_non_inv_cause_chain(&fun_env);
+                env.error_with_notes(&fun_env.get_loc(), &message, trace);
+            }
+        }
+
+        // prune the function-to-invariants map with the pragma-magic
+        let fun_to_inv_map =
+            Self::prune_function_to_invariants_map(env, fun_to_inv_map, &fun_set_with_no_inv_check);
+
+        // check for unused invariants defined in the target module
+        let all_checked_invariants: BTreeSet<_> = fun_to_inv_map
+            .values()
+            .flat_map(|rel| rel.direct_modified.iter())
+            .cloned()
+            .collect();
+        for module_env in env.get_modules() {
+            if !module_env.is_target() {
+                continue;
+            }
+            for inv_id in env.get_global_invariants_by_module(module_env.get_id()) {
+                if !all_checked_invariants.contains(&inv_id) {
+                    let inv = env.get_global_invariant(inv_id).unwrap();
+                    env.diag(
+                        Severity::Warning,
+                        &inv.loc,
+                        "Global invariant is not checked anywhere in the code",
+                    );
+                }
+            }
+        }
+
+        // save the analysis results in the env
+        let result = InvariantAnalysisData {
+            fun_set_with_inv_check_on_exit,
+            fun_set_with_no_inv_check,
+            fun_to_inv_map,
+        };
+        env.set_extension(result);
+    }
+}
+
+/// This impl block contains functions on marking a function as verified or inlined
+impl VerificationAnalysisProcessor {
+    /// Check whether the function falls within the verification scope given in the options
+    fn is_within_verification_scope(fun_env: &FunctionEnv) -> bool {
+        let env = fun_env.module_env.env;
+        let options = ProverOptions::get(env);
+        match &options.verify_scope {
+            VerificationScope::Public => fun_env.is_exposed(),
+            VerificationScope::All => true,
+            VerificationScope::Only(name) => fun_env.matches_name(name),
+            VerificationScope::OnlyModule(name) => fun_env.module_env.matches_name(name),
+            VerificationScope::None => false,
+        }
+    }
+
+    /// Mark that this function should be verified, and as a result, mark that all its callees
+    /// should be inlined
+    fn mark_verified(
+        fun_env: &FunctionEnv,
+        data: &mut FunctionData,
+        targets: &mut FunctionTargetsHolder,
+    ) {
+        // TODO(mengxu): re-check the treatment of fixedpoint here
+        let info = data
+            .annotations
+            .get_or_default_mut::<VerificationInfo>(true);
+        if !info.verified {
+            info.verified = true;
+            Self::mark_callees_inlined(fun_env, targets);
+        }
+    }
+
+    /// Mark that this function should be inlined because it is called by a function that is marked
+    /// as verified, and as a result, mark that all its callees should be inlined as well.
+    ///
+    /// NOTE: This does not apply to opaque, native, or intrinsic functions.
+    fn mark_inlined(fun_env: &FunctionEnv, targets: &mut FunctionTargetsHolder) {
+        if fun_env.is_opaque() || fun_env.is_native() || fun_env.is_intrinsic() {
+            return;
+        }
+
+        // at this time, we only have the `baseline` variant in the targets
+        let variant = FunctionVariant::Baseline;
+        if let Some(data) = targets.get_data_mut(&fun_env.get_qualified_id(), &variant) {
+            // TODO(mengxu): re-check the treatment of fixedpoint here
+            let info = data
+                .annotations
+                .get_or_default_mut::<VerificationInfo>(true);
+            if !info.inlined {
+                info.inlined = true;
+                Self::mark_callees_inlined(fun_env, targets);
+            }
+        } else {
+            fun_env.module_env.env.error(
+                &fun_env.get_loc(),
+                &format!(
+                    "function `{}` is a recursive function \
+                       (or part of a mutually recursive function group) \
+                       and should be marked as opaque",
+                    fun_env.get_full_name_str()
+                ),
+            );
+        }
+    }
+
+    /// Marks all callees of this function to be inlined. Forms a mutual recursion with the
+    /// `mark_inlined` function above.
+    fn mark_callees_inlined(fun_env: &FunctionEnv, targets: &mut FunctionTargetsHolder) {
+        for callee in fun_env.get_called_functions() {
+            let callee_env = fun_env.module_env.env.get_function(callee);
+            Self::mark_inlined(&callee_env, targets);
+        }
+    }
+}
+
+/// This impl block contains functions on global invariant applicability analysis
+impl VerificationAnalysisProcessor {
+    /// Build the E set and N set
+    ///
+    /// E set: f in E if declared pragma disable_invariant_in_body for f
+    /// N set: f in N if f is called from a function in E or N
+    ///        can also put f in N by pragma delegate_invariant_to_caller
+    ///
+    /// E set means: a suspendable invariant holds before, after, but NOT during the function body
+    /// N set means: a suspendable invariant doesn't hold at any point in the function
+    fn probe_invariant_status_in_functions(
+        env: &GlobalEnv,
+    ) -> (BTreeSet<QualifiedId<FunId>>, BTreeSet<QualifiedId<FunId>>) {
+        let mut disabled_inv_fun_set = BTreeSet::new(); // the E set
+        let mut non_inv_fun_set = BTreeSet::new(); // the N set
+
+        // Invariant: if a function is in non_inv_fun_set and not in worklist, then all the
+        // functions it calls are also in non_inv_fun_set or in worklist. As a result, when the
+        // worklist is empty, all callees of a function in non_inv_fun_set will also be in
+        // non_inv_fun_set. Each function is added at most once to the worklist.
+        let mut worklist = vec![];
+        for module_env in env.get_modules() {
+            for fun_env in module_env.get_functions() {
+                if is_invariant_checking_disabled(&fun_env) {
+                    let fun_id = fun_env.get_qualified_id();
+                    disabled_inv_fun_set.insert(fun_id);
+                    worklist.push(fun_id);
+                }
+                if is_invariant_checking_delegated(&fun_env) {
+                    let fun_id = fun_env.get_qualified_id();
+                    // Add to work_list only if fun_id is not in non_inv_fun_set (may have inferred
+                    // this from a caller already).
+                    if non_inv_fun_set.insert(fun_id) {
+                        worklist.push(fun_id);
+                    }
+                }
+                // Downward closure of the non_inv_fun_set
+                while let Some(called_fun_id) = worklist.pop() {
+                    let called_funs = env.get_function(called_fun_id).get_called_functions();
+                    for called_fun_id in called_funs {
+                        if non_inv_fun_set.insert(called_fun_id) {
+                            // Add to work_list only if fun_id is not in fun_set
+                            worklist.push(called_fun_id);
+                        }
+                    }
+                }
+            }
+        }
+        (disabled_inv_fun_set, non_inv_fun_set)
+    }
+
+    /// Compute the chain of calls which leads to an implicit non-inv function, i.e., explain why
+    /// a function appears in the N-set.
+    fn compute_non_inv_cause_chain(fun_env: &FunctionEnv<'_>) -> Vec<String> {
+        let global_env = fun_env.module_env.env;
+        let mut worklist: BTreeSet<Vec<QualifiedId<FunId>>> = fun_env
+            .get_calling_functions()
+            .into_iter()
+            .map(|id| vec![id])
+            .collect();
+        let mut done = BTreeSet::new();
+        let mut result = vec![];
+        while let Some(caller_list) = worklist.iter().next().cloned() {
+            worklist.remove(&caller_list);
+            let caller_id = *caller_list.iter().last().unwrap();
+            done.insert(caller_id);
+            let caller_env = global_env.get_function_qid(caller_id);
+            let display_chain = || {
+                vec![fun_env.get_qualified_id()]
+                    .into_iter()
+                    .chain(caller_list.iter().cloned())
+                    .map(|id| global_env.get_function_qid(id).get_full_name_str())
+                    .join(" <- ")
+            };
+            if is_invariant_checking_disabled(&caller_env) {
+                result.push(format!("disabled by {}", display_chain()));
+            } else if is_invariant_checking_delegated(&caller_env) {
+                result.push(format!("delegated by {}", display_chain()));
+            } else {
+                worklist.extend(
+                    caller_env
+                        .get_calling_functions()
+                        .into_iter()
+                        .filter_map(|id| {
+                            if done.contains(&id) {
+                                None
+                            } else {
+                                let mut new_caller_list = caller_list.clone();
+                                new_caller_list.push(id);
+                                Some(new_caller_list)
+                            }
+                        }),
+                );
+            }
+        }
+        if result.is_empty() {
+            result.push("cannot determine disabling reason (bug?)".to_owned())
+        }
+        result
+    }
+
+    /// Produce a `Map[fun_id -> InvariantRelevance]` ignoring the relevant pragmas on both
+    /// function-side (i.e., `disable_invariants_in_body` and `delegate_invariants_to_caller`) and
+    /// invariant-side (i.e., `suspendable`)
+    fn build_function_to_invariants_map(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> BTreeMap<QualifiedId<FunId>, InvariantRelevance> {
+        // collect all global invariants
+        let mut global_invariants = vec![];
+        for menv in env.get_modules() {
+            for inv_id in env.get_global_invariants_by_module(menv.get_id()) {
+                global_invariants.push(env.get_global_invariant(inv_id).unwrap());
+            }
+        }
+
+        // go over each function target and check global invariant applicability
+        let mut invariant_relevance = BTreeMap::new();
+        for (fun_id, fun_variant) in targets.get_funs_and_variants() {
+            debug_assert!(matches!(fun_variant, FunctionVariant::Baseline));
+            let fenv = env.get_function(fun_id);
+            let target = targets.get_target(&fenv, &fun_variant);
+            let related =
+                Self::find_relevant_invariants(&target, global_invariants.clone().into_iter());
+            invariant_relevance.insert(fun_id, related);
+        }
+
+        // return the collected relevance map
+        invariant_relevance
+    }
+
+    /// From the iterator of global invariants, find the ones that are relevant to the function as
+    /// well as how/why the invariant is relevant.
+    fn find_relevant_invariants<'a>(
+        target: &FunctionTarget,
+        invariants: impl Iterator<Item = &'a GlobalInvariant>,
+    ) -> InvariantRelevance {
+        let mem_usage = usage_analysis::get_memory_usage(target);
+        let mem_accessed = &mem_usage.accessed.all;
+        let mem_modified = &mem_usage.modified.all;
+        let mem_direct_accessed = &mem_usage.accessed.direct;
+        let mem_direct_modified = &mem_usage.modified.direct;
+
+        let mut inv_accessed = BTreeSet::new();
+        let mut inv_modified = BTreeSet::new();
+        let mut inv_direct_accessed = BTreeSet::new();
+        let mut inv_direct_modified = BTreeSet::new();
+        for inv in invariants {
+            for fun_mem in mem_accessed.iter() {
+                for inv_mem in &inv.mem_usage {
+                    if inv_mem.module_id != fun_mem.module_id || inv_mem.id != fun_mem.id {
+                        continue;
+                    }
+                    let adapter =
+                        TypeUnificationAdapter::new_vec(&fun_mem.inst, &inv_mem.inst, true, true);
+                    let rel = adapter.unify(Variance::Allow, /* shallow_subst */ false);
+                    if rel.is_some() {
+                        inv_accessed.insert(inv.id);
+
+                        // the rest exploits the fact that the `used_memory` set (a read-write set)
+                        // is always a superset of the others.
+                        if mem_modified.contains(fun_mem) {
+                            inv_modified.insert(inv.id);
+                        }
+                        if mem_direct_accessed.contains(fun_mem) {
+                            inv_direct_accessed.insert(inv.id);
+                        }
+                        if mem_direct_modified.contains(fun_mem) {
+                            inv_direct_modified.insert(inv.id);
+                        }
+                    }
+                }
+            }
+        }
+        InvariantRelevance {
+            accessed: inv_accessed,
+            modified: inv_modified,
+            direct_accessed: inv_direct_accessed,
+            direct_modified: inv_direct_modified,
+        }
+    }
+
+    /// Prune the `Map[fun_id -> InvariantRelevance]` returned by `build_function_to_invariants_map`
+    /// after considering the invariant-related pragmas.
+    fn prune_function_to_invariants_map(
+        env: &GlobalEnv,
+        original: BTreeMap<QualifiedId<FunId>, InvariantRelevance>,
+        fun_set_with_no_inv_check: &BTreeSet<QualifiedId<FunId>>,
+    ) -> BTreeMap<QualifiedId<FunId>, InvariantRelevance> {
+        // NOTE: All fields in `InvariantRelevance` are derived based on unification of memory
+        // usage/modification of the function and the invariant. In `MemoryUsageAnalysis`, both used
+        // memory and modified memory subsumes the set summarized in the called functions.
+        //
+        // If the called function is NOT a generic function, this means that all the invariants that
+        // are applicable to the called function will be applicable to its caller function as well.
+        //
+        // If the called function IS a generic function, this means that all the invariants that are
+        // applicable to this specific instantiation of the called function (which can be another
+        // type parameter, i.e., a type parameter from the caller function) will be applicable to
+        // this caller function as well.
+        //
+        // This means that if we disable a suspendable invariant `I` in the called function, for all
+        // the callers of this called function, `I` is either
+        // - already marked as relevant to the caller (in the `accessed/modified` set), or
+        // - `I` is not relevant to the caller and we should not instrument `I` in the caller.
+        // This information will be consumed in the invariant instrumentation phase later.
+
+        // Step 1: remove suspended invariants from the the relevance set. These suspended
+        // invariants themselves forms a relevance set which will be considered as directly
+        // accessed/modified in all callers of this function.
+        let mut pruned = BTreeMap::new();
+        let mut deferred = BTreeMap::new();
+        for (fun_id, mut relevance) in original.into_iter() {
+            if fun_set_with_no_inv_check.contains(&fun_id) {
+                let suspended = relevance.prune_suspendable(env);
+                deferred.insert(fun_id, suspended);
+            }
+            pruned.insert(fun_id, relevance);
+        }
+
+        // Step 2: defer the suspended invariants back to the caller and the caller will accept
+        // them in the directly accessed/modified sets. Later in the instrumentation phase, the
+        // caller should treat the call instruction in the same way as if the instruction modifies
+        // the deferred invariants.
+        let mut result = BTreeMap::new();
+        for (fun_id, mut relevance) in pruned.into_iter() {
+            if !fun_set_with_no_inv_check.contains(&fun_id) {
+                let fenv = env.get_function(fun_id);
+                for callee in fenv.get_called_functions() {
+                    if fun_set_with_no_inv_check.contains(&callee) {
+                        // all invariants in the callee side will now be deferred to this function
+                        let suspended = deferred.get(&callee).unwrap();
+                        relevance.subsume_callee(suspended);
+                    }
+                }
+            }
+            result.insert(fun_id, relevance);
+        }
+        result
+    }
+}
+
+/// This impl block contains functions that are mostly utilities functions and are only relevant
+/// within this file.
+impl InvariantRelevance {
+    /// Split off `[suspendable]` invariants from the sets and form a new `InvariantRelevance` for
+    /// these suspended ones. This represents the invariants that will be deferred to the caller.
+    fn prune_suspendable(&mut self, env: &GlobalEnv) -> Self {
+        fn separate(holder: &mut BTreeSet<GlobalId>, env: &GlobalEnv) -> BTreeSet<GlobalId> {
+            let mut split = BTreeSet::new();
+            holder.retain(|inv_id| {
+                if is_invariant_suspendable(env, *inv_id) {
+                    split.insert(*inv_id);
+                    false
+                } else {
+                    true
+                }
+            });
+            split
+        }
+
+        let accessed = separate(&mut self.accessed, env);
+        let modified = separate(&mut self.modified, env);
+        let direct_accessed = separate(&mut self.direct_accessed, env);
+        let direct_modified = separate(&mut self.direct_modified, env);
+        Self {
+            accessed,
+            modified,
+            direct_accessed,
+            direct_modified,
+        }
+    }
+
+    /// Accept the invariants deferred from the callee and incorporate them into the callers' direct
+    /// accessed/modified set if these invariants are also in the caller's transitive set.
+    ///
+    /// NOTE: it is possible that the deferred invariants are not in the caller's transitive set.
+    /// For example, if the callee (C) is a generic function that modifies memory S<T> while the
+    /// suspended invariant I is about S<bool>. The caller (F) calls a concrete instantiation of C
+    /// which modifies S<u64>. In this case, I is applicable to C but not applicable to F.
+    fn subsume_callee(&mut self, suspended: &InvariantRelevance) {
+        self.direct_accessed
+            .extend(suspended.accessed.intersection(&self.accessed));
+        self.direct_modified
+            .extend(suspended.modified.intersection(&self.modified));
+    }
+}
+
+// Helper functions
+// ----------------
+
+pub fn is_invariant_checking_disabled(fun_env: &FunctionEnv) -> bool {
+    fun_env.is_pragma_true(DISABLE_INVARIANTS_IN_BODY_PRAGMA, || false)
+}
+
+pub fn is_invariant_checking_delegated(fun_env: &FunctionEnv) -> bool {
+    fun_env.is_pragma_true(DELEGATE_INVARIANTS_TO_CALLER_PRAGMA, || false)
+}
+
+pub fn is_invariant_suspendable(env: &GlobalEnv, inv_id: GlobalId) -> bool {
+    let inv = env.get_global_invariant(inv_id).unwrap();
+    env.is_property_true(&inv.properties, CONDITION_SUSPENDABLE_PROP)
+        .unwrap_or(false)
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/verification_analysis_v2.rs b/vendors/move/crates/move-stackless-bytecode/src/verification_analysis_v2.rs
new file mode 100644
index 000000000..c683f1c88
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/verification_analysis_v2.rs
@@ -0,0 +1,792 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Analysis which computes an annotation for each function whether
+
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+use itertools::Itertools;
+use log::debug;
+
+use move_model::{
+    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, ModuleEnv, QualifiedId, VerificationScope},
+    pragmas::{
+        CONDITION_SUSPENDABLE_PROP, DELEGATE_INVARIANTS_TO_CALLER_PRAGMA,
+        DISABLE_INVARIANTS_IN_BODY_PRAGMA, VERIFY_PRAGMA,
+    },
+};
+
+use crate::{
+    dataflow_domains::SetDomain,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    options::ProverOptions,
+    usage_analysis,
+};
+
+/// The annotation for information about verification.
+#[derive(Clone, Default)]
+pub struct VerificationInfoV2 {
+    /// Whether the function is target of verification.
+    pub verified: bool,
+    /// Whether the function needs to have an inlined variant since it is called from a verified
+    /// function and is not opaque.
+    pub inlined: bool,
+}
+
+/// Get verification information for this function.
+pub fn get_info(target: &FunctionTarget<'_>) -> VerificationInfoV2 {
+    target
+        .get_annotations()
+        .get::<VerificationInfoV2>()
+        .cloned()
+        .unwrap_or_default()
+}
+
+// Analysis info to save for global_invariant_instrumentation phase
+pub struct InvariantAnalysisData {
+    /// The set of all functions in target module.
+    pub target_fun_ids: BTreeSet<QualifiedId<FunId>>,
+    /// Functions in dependent modules that are transitively called by functions in target module.
+    pub dep_fun_ids: BTreeSet<QualifiedId<FunId>>,
+    /// functions where invariants are disabled by pragma disable_invariants_in_body
+    pub disabled_inv_fun_set: BTreeSet<QualifiedId<FunId>>,
+    /// Functions where invariants are disabled in a transitive caller, or by
+    /// pragma delegate_invariant_to_caller
+    pub non_inv_fun_set: BTreeSet<QualifiedId<FunId>>,
+    /// global and update invariants in the target module
+    pub target_invariants: BTreeSet<GlobalId>,
+    /// Maps invariant ID to set of functions that modify the invariant
+    /// Does not include update invariants
+    pub funs_that_modify_inv: BTreeMap<GlobalId, BTreeSet<QualifiedId<FunId>>>,
+    /// Maps function to the set of invariants that it modifies
+    /// Does not include update invariants
+    pub invs_modified_by_fun: BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>>,
+    /// Functions that modify some invariant in the target
+    /// Does not include update invariants
+    pub funs_that_modify_some_inv: BTreeSet<QualifiedId<FunId>>,
+    /// functions that are in non_inv_fun_set and M[I] for some I.
+    /// We have to verify the callers, which may be in friend modules.
+    pub funs_that_delegate_to_caller: BTreeSet<QualifiedId<FunId>>,
+    /// Functions that are not in target or deps, but that call a function
+    /// in non_inv_fun_set that modifies some invariant from target module
+    /// and eventually calls a function in target mod or a dependency.
+    pub friend_fun_ids: BTreeSet<QualifiedId<FunId>>,
+    /// For each function, give the set of invariants that are disabled in that function.
+    /// This is defined as the least set satisfying set inequalities: (1) in a function where
+    /// invariants are disabled, it is the set of invariants modified in the function, and
+    /// (2) in a function in non_inv_fun_set, it is the least set that includes all disabled_invs
+    /// for calling functions.
+    pub disabled_invs_for_fun: BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>>,
+}
+
+/// Get all invariants from target modules
+fn get_target_invariants(
+    global_env: &GlobalEnv,
+    target_modules: &[ModuleEnv],
+) -> BTreeSet<GlobalId> {
+    let target_mod_ids = target_modules
+        .iter()
+        .map(|mod_env| mod_env.get_id())
+        .flat_map(|target_mod_id| global_env.get_global_invariants_by_module(target_mod_id))
+        .collect();
+    target_mod_ids
+}
+
+/// Computes and returns the set of disabled invariants for each function in disabled_inv_fun_set
+/// Disabled invariants for a function are the invariants modified (directly or indirectly) by the fun
+/// that are also declared to be suspendable via "invariant [suspendable] ..."
+fn compute_disabled_invs_for_fun(
+    global_env: &GlobalEnv,
+    disabled_inv_fun_set: &BTreeSet<QualifiedId<FunId>>,
+    invs_modified_by_fun: &BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>>,
+) -> BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>> {
+    let mut disabled_invs_for_fun: BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>> =
+        BTreeMap::new();
+    for module_env in global_env.get_modules() {
+        for fun_env in module_env.get_functions() {
+            let fun_id = fun_env.get_qualified_id();
+            // If function disables invariants, get the set of invariants modified in the function
+            // and keep only those that are declared to be suspendable
+            if disabled_inv_fun_set.contains(&fun_id) {
+                if let Some(modified_invs) = invs_modified_by_fun.get(&fun_id) {
+                    let disabled_invs: BTreeSet<GlobalId> = modified_invs
+                        .iter()
+                        .filter(|inv_id| {
+                            global_env
+                                .is_property_true(
+                                    &global_env
+                                        .get_global_invariant(**inv_id)
+                                        .unwrap()
+                                        .properties,
+                                    CONDITION_SUSPENDABLE_PROP,
+                                )
+                                .unwrap_or(false)
+                        })
+                        .cloned()
+                        .collect();
+                    debug_print_inv_set(
+                        global_env,
+                        &disabled_invs,
+                        "$$$$$$$$$$$$$$$$\ncompute_disabled_invs_for_fun",
+                    );
+                    disabled_invs_for_fun.insert(fun_id, disabled_invs.clone());
+                }
+            }
+        }
+    }
+
+    // Compute a least fixed point of disable_invs_for_fun.  Starts with disabled inv functions and
+    // all invariants that they modify. Then propagate those to called functions.  They're not top-sorted
+    // (which may not be good enough for recursion, in this case, I'm not sure).  So fun_ids go back
+    // into the worklist until the disable_inv_set for each fun converges (worklist will be empty).
+    let mut worklist: VecDeque<QualifiedId<FunId>> = disabled_inv_fun_set.iter().cloned().collect();
+    while let Some(caller_fun_id) = worklist.pop_front() {
+        // If None, it's ok to skip because there are no disabled_invs to propagate to called funs
+        if let Some(disabled_invs_for_caller) = disabled_invs_for_fun.remove(&caller_fun_id) {
+            let called_funs = global_env
+                .get_function(caller_fun_id)
+                .get_called_functions();
+            for called_fun_id in called_funs {
+                let disabled_invs_for_called =
+                    disabled_invs_for_fun.entry(called_fun_id).or_default();
+                // if caller has any disabled_invs that callee does not, add them to called
+                // and add called to the worklist for further processing
+                if !disabled_invs_for_caller.is_subset(disabled_invs_for_called) {
+                    // Add missing inv_ids to called set
+                    for inv_id in &disabled_invs_for_caller {
+                        disabled_invs_for_called.insert(*inv_id);
+                    }
+                    worklist.push_back(called_fun_id);
+                }
+            }
+            // put back disabled_invs_for_caller
+            disabled_invs_for_fun.insert(caller_fun_id, disabled_invs_for_caller);
+        }
+    }
+    disabled_invs_for_fun
+}
+
+/// Check whether function is callable from unknown sites (i.e., it is public or
+/// a script fun) and modifies some invariant in the target module.
+/// The second condition is an exception for functions that cannot invalidate
+/// any invariants.
+fn check_legal_disabled_invariants(
+    fun_env: &FunctionEnv,
+    disabled_inv_fun_set: &BTreeSet<QualifiedId<FunId>>,
+    non_inv_fun_set: &BTreeSet<QualifiedId<FunId>>,
+    funs_that_modify_some_inv: &BTreeSet<QualifiedId<FunId>>,
+) {
+    let global_env = fun_env.module_env.env;
+    let fun_id = fun_env.get_qualified_id();
+    if non_inv_fun_set.contains(&fun_id) && funs_that_modify_some_inv.contains(&fun_id) {
+        if disabled_inv_fun_set.contains(&fun_id) {
+            global_env.error(
+                &fun_env.get_loc(),
+                "Functions must not have a disable invariant pragma when invariants are \
+                 disabled in a transitive caller or there is a \
+                 pragma delegate_invariants_to_caller",
+            );
+        } else if fun_env.has_unknown_callers() {
+            if is_fun_delegating(fun_env) {
+                global_env.error(
+                    &fun_env.get_loc(),
+                    "Public or script functions cannot delegate invariants",
+                )
+            } else {
+                global_env.error_with_notes(
+                    &fun_env.get_loc(),
+                    "Public or script functions cannot be transitively called by \
+                      functions disabling or delegating invariants",
+                    compute_non_inv_cause_chain(fun_env),
+                )
+            }
+        }
+    }
+}
+
+/// Compute the chain of calls which leads to an implicit non-inv function.
+fn compute_non_inv_cause_chain(fun_env: &FunctionEnv<'_>) -> Vec<String> {
+    let global_env = fun_env.module_env.env;
+    let mut worklist: BTreeSet<Vec<QualifiedId<FunId>>> = fun_env
+        .get_calling_functions()
+        .into_iter()
+        .map(|id| vec![id])
+        .collect();
+    let mut done = BTreeSet::new();
+    let mut result = vec![];
+    while let Some(caller_list) = worklist.iter().next().cloned() {
+        worklist.remove(&caller_list);
+        let caller_id = *caller_list.iter().last().unwrap();
+        done.insert(caller_id);
+        let caller_env = global_env.get_function_qid(caller_id);
+        let display_chain = || {
+            vec![fun_env.get_qualified_id()]
+                .into_iter()
+                .chain(caller_list.iter().cloned())
+                .map(|id| global_env.get_function_qid(id).get_full_name_str())
+                .join(" <- ")
+        };
+        if is_fun_disabled(&caller_env) {
+            result.push(format!("disabled by {}", display_chain()));
+        } else if is_fun_delegating(&caller_env) {
+            result.push(format!("delegated by {}", display_chain()));
+        } else {
+            worklist.extend(
+                caller_env
+                    .get_calling_functions()
+                    .into_iter()
+                    .filter_map(|id| {
+                        if done.contains(&id) {
+                            None
+                        } else {
+                            let mut new_caller_list = caller_list.clone();
+                            new_caller_list.push(id);
+                            Some(new_caller_list)
+                        }
+                    }),
+            );
+        }
+    }
+    if result.is_empty() {
+        result.push("cannot determine disabling reason (bug?)".to_owned())
+    }
+    result
+}
+
+// Using pragmas, find functions called from a context where invariant
+// checking is disabled.
+// disabled_inv_fun set are disabled by pragma
+// non_inv_fun_set are disabled by pragma or because they're called from
+// another function in disabled_inv_fun_set or non_inv_fun_set.
+fn compute_disabled_and_non_inv_fun_sets(
+    global_env: &GlobalEnv,
+) -> (BTreeSet<QualifiedId<FunId>>, BTreeSet<QualifiedId<FunId>>) {
+    let mut non_inv_fun_set: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+    let mut disabled_inv_fun_set: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+    // invariant: If a function is in non_inv_fun_set and not in worklist,
+    // then all the functions it calls are also in fun_set
+    // or in worklist.  When worklist is empty, all callees of a function
+    // in non_inv_fun_set will also be in non_inv_fun_set.
+    // Each function is added at most once to the worklist.
+    let mut worklist = vec![];
+    for module_env in global_env.get_modules() {
+        for fun_env in module_env.get_functions() {
+            if is_fun_disabled(&fun_env) {
+                let fun_id = fun_env.get_qualified_id();
+                disabled_inv_fun_set.insert(fun_id);
+                worklist.push(fun_id);
+            }
+            if is_fun_delegating(&fun_env) {
+                let fun_id = fun_env.get_qualified_id();
+                if non_inv_fun_set.insert(fun_id) {
+                    // Add to work_list only if fun_id is not in non_inv_fun_set (may have inferred
+                    // this from a caller already).
+                    worklist.push(fun_id);
+                }
+            }
+            // Downward closure of non_inv_fun_set
+            while let Some(called_fun_id) = worklist.pop() {
+                let called_funs = global_env
+                    .get_function(called_fun_id)
+                    .get_called_functions();
+                for called_fun_id in called_funs {
+                    if non_inv_fun_set.insert(called_fun_id) {
+                        // Add to work_list only if fun_id is not in fun_set
+                        worklist.push(called_fun_id);
+                    }
+                }
+            }
+        }
+    }
+    (disabled_inv_fun_set, non_inv_fun_set)
+}
+
+fn is_fun_disabled(fun_env: &FunctionEnv<'_>) -> bool {
+    fun_env.is_pragma_true(DISABLE_INVARIANTS_IN_BODY_PRAGMA, || false)
+}
+
+fn is_fun_delegating(fun_env: &FunctionEnv<'_>) -> bool {
+    fun_env.is_pragma_true(DELEGATE_INVARIANTS_TO_CALLER_PRAGMA, || false)
+}
+
+/// Collect all functions that are defined in the target module, or called transitively
+/// from those functions.
+/// TODO: This is not very efficient.  It would be better to compute the transitive closure.
+fn compute_dep_fun_ids(
+    global_env: &GlobalEnv,
+    target_modules: &[ModuleEnv],
+) -> BTreeSet<QualifiedId<FunId>> {
+    let mut dep_fun_ids = BTreeSet::new();
+    for module_env in global_env.get_modules() {
+        for target_env in target_modules {
+            if target_env.is_transitive_dependency(module_env.get_id()) {
+                for fun_env in module_env.get_functions() {
+                    dep_fun_ids.insert(fun_env.get_qualified_id());
+                }
+            }
+        }
+    }
+    dep_fun_ids
+}
+
+/// Compute a map from each invariant to the set of functions that modify state
+/// appearing in the invariant. Return that, and a second value that is the union
+/// of functions over all invariants in the first map.
+/// This is not applied to update invariants?
+fn compute_funs_that_modify_inv(
+    global_env: &GlobalEnv,
+    target_invariants: &BTreeSet<GlobalId>,
+    targets: &mut FunctionTargetsHolder,
+    variant: FunctionVariant,
+) -> (
+    BTreeMap<GlobalId, BTreeSet<QualifiedId<FunId>>>,
+    BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>>,
+    BTreeSet<QualifiedId<FunId>>,
+) {
+    let mut funs_that_modify_inv: BTreeMap<GlobalId, BTreeSet<QualifiedId<FunId>>> =
+        BTreeMap::new();
+    let mut funs_that_modify_some_inv: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+    let mut invs_modified_by_fun: BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>> =
+        BTreeMap::new();
+    for inv_id in target_invariants {
+        // Collect the global state used by inv_id (this is computed in usage_analysis.rs)
+        let inv_mem_use: SetDomain<_> = global_env
+            .get_global_invariant(*inv_id)
+            .unwrap()
+            .mem_usage
+            .iter()
+            .cloned()
+            .collect();
+        // set of functions that modify state in inv_id that we are building
+        let mut fun_id_set: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+        // Iterate over all functions in the module cluster
+        for module_env in global_env.get_modules() {
+            for fun_env in module_env.get_functions() {
+                // Get all memory modified by this function.
+                let fun_target = targets.get_target(&fun_env, &variant);
+                let modified_memory = &usage_analysis::get_memory_usage(&fun_target).modified.all;
+                // Add functions to set if it modifies mem used in invariant
+                // TODO: This should be using unification.
+                if !modified_memory.is_disjoint(&inv_mem_use) {
+                    let fun_id = fun_env.get_qualified_id();
+                    fun_id_set.insert(fun_id);
+                    funs_that_modify_some_inv.insert(fun_id);
+                    let inv_set = invs_modified_by_fun.entry(fun_id).or_default();
+                    inv_set.insert(*inv_id);
+                }
+            }
+        }
+        if !fun_id_set.is_empty() {
+            funs_that_modify_inv.insert(*inv_id, fun_id_set);
+        }
+    }
+    (
+        funs_that_modify_inv,
+        invs_modified_by_fun,
+        funs_that_modify_some_inv,
+    )
+}
+
+/// Compute the set of functions that are friend modules of target or deps, but not in
+/// target or deps, and that call a function in non_inv_fun_set that modifies some target
+/// invariant.  The Prover needs to verify that these functions preserve the target invariants.
+fn compute_friend_fun_ids(
+    global_env: &GlobalEnv,
+    target_fun_ids: &BTreeSet<QualifiedId<FunId>>,
+    dep_fun_ids: &BTreeSet<QualifiedId<FunId>>,
+    funs_that_delegate_to_caller: &BTreeSet<QualifiedId<FunId>>,
+) -> BTreeSet<QualifiedId<FunId>> {
+    let mut friend_fun_set: BTreeSet<QualifiedId<FunId>> = BTreeSet::new();
+    let mut worklist: Vec<QualifiedId<FunId>> = target_fun_ids.iter().cloned().collect();
+    worklist.extend(dep_fun_ids.iter().cloned());
+    while let Some(fun_id) = worklist.pop() {
+        // Check for legacy friend pragma
+        // TODO: Delete when we stop using pragma friend in DiemFramework
+        let fun_env = global_env.get_function(fun_id);
+        let friend_env = fun_env.get_transitive_friend();
+        let friend_id = friend_env.get_qualified_id();
+        // if no transitive friend, it just returns the original fun_env
+        if friend_id != fun_env.get_qualified_id() && friend_fun_set.insert(friend_id) {
+            worklist.push(friend_id);
+        }
+        if funs_that_delegate_to_caller.contains(&fun_id) {
+            let callers = fun_env.get_calling_functions();
+            for caller_fun_id in callers {
+                // Exclude callers that are in target or dep modules, because we will verify them, anyway.
+                // We also don't need to put them in the worklist, because they were in there initially.
+                // Also, don't need to process if it's already in friend_fun_set
+                if !target_fun_ids.contains(&caller_fun_id)
+                    && !dep_fun_ids.contains(&caller_fun_id)
+                    && friend_fun_set.insert(caller_fun_id)
+                {
+                    worklist.push(caller_fun_id);
+                }
+            }
+        }
+    }
+    friend_fun_set
+}
+
+#[allow(dead_code)]
+/// Debug print: Print global id and body of each invariant, so we can just print the global
+/// id's in sets for compactness
+fn debug_print_global_ids(global_env: &GlobalEnv, global_ids: &BTreeSet<GlobalId>) {
+    for inv_id in global_ids {
+        debug_print_inv_full(global_env, inv_id);
+    }
+}
+
+/// Debugging function to print a set of function id's using their
+/// symbolic function names.
+#[allow(dead_code)]
+fn debug_print_fun_id_set(
+    global_env: &GlobalEnv,
+    fun_ids: &BTreeSet<QualifiedId<FunId>>,
+    set_name: &str,
+) {
+    debug!(
+        "****************\n{}: {:?}",
+        set_name,
+        fun_ids
+            .iter()
+            .map(|fun_id| global_env.get_function(*fun_id).get_name_string())
+            .collect::<Vec<_>>()
+    );
+}
+
+/// Debugging code to print sets of invariants
+#[allow(dead_code)]
+pub fn debug_print_inv_set(
+    global_env: &GlobalEnv,
+    global_ids: &BTreeSet<GlobalId>,
+    set_name: &str,
+) {
+    if global_ids.is_empty() {
+        return;
+    }
+    debug!("{}:", set_name);
+    // for global_id in global_ids {
+    //     debug!("global_id: {:?}", *global_id);
+    // }
+    debug!("++++++++++++++++\n{}:", set_name);
+    for inv_id in global_ids {
+        debug_print_inv_full(global_env, inv_id);
+    }
+}
+
+/// Given global id of invariant, prints the global ID and the source code
+/// of the invariant
+#[allow(dead_code)]
+fn debug_print_inv_full(global_env: &GlobalEnv, inv_id: &GlobalId) {
+    let inv = global_env.get_global_invariant(*inv_id);
+    let loc = &inv.unwrap().loc;
+    debug!(
+        "{:?} {:?}: {}",
+        *inv_id,
+        inv.unwrap().kind,
+        global_env.get_source(loc).unwrap(),
+    );
+}
+
+#[allow(dead_code)]
+fn debug_print_fun_inv_map(
+    global_env: &GlobalEnv,
+    fun_inv_map: &BTreeMap<QualifiedId<FunId>, BTreeSet<GlobalId>>,
+    map_name: &str,
+) {
+    debug!("****************\nMAP NAME {}:", map_name);
+    for (fun_id, inv_id_set) in fun_inv_map.iter() {
+        let fname = global_env.get_function(*fun_id).get_name_string();
+        debug!("FUNCTION {}:", fname);
+        for inv_id in inv_id_set {
+            debug_print_inv_full(global_env, inv_id);
+        }
+        //        debug_print_inv_set(global_env, inv_id_set, &fname);
+    }
+}
+
+// global_env.get_function(*fun_id).get_name_string();
+
+/// Print sets and maps computed during verification analysis
+#[allow(dead_code)]
+fn debug_print_invariant_analysis_data(
+    global_env: &GlobalEnv,
+    inv_ana_data: &InvariantAnalysisData,
+) {
+    debug_print_fun_id_set(global_env, &inv_ana_data.target_fun_ids, "target_fun_ids");
+    debug_print_fun_id_set(global_env, &inv_ana_data.dep_fun_ids, "dep_fun_ids");
+    debug_print_fun_id_set(
+        global_env,
+        &inv_ana_data.disabled_inv_fun_set,
+        "disabled_inv_fun_set",
+    );
+    debug_print_fun_id_set(global_env, &inv_ana_data.non_inv_fun_set, "non_inv_fun_set");
+    debug_print_inv_set(
+        global_env,
+        &inv_ana_data.target_invariants,
+        "target_invariants",
+    );
+
+    // "funs_modified_by_inv" map
+
+    debug_print_fun_inv_map(
+        global_env,
+        &inv_ana_data.invs_modified_by_fun,
+        "invs_modified_by_fun",
+    );
+
+    debug_print_fun_id_set(
+        global_env,
+        &inv_ana_data.funs_that_modify_some_inv,
+        "funs_that_modify_some_inv",
+    );
+    debug_print_fun_id_set(
+        global_env,
+        &inv_ana_data.funs_that_delegate_to_caller,
+        "funs_that_delegate_to_caller",
+    );
+    debug_print_fun_id_set(global_env, &inv_ana_data.friend_fun_ids, "friend_fun_ids");
+
+    debug_print_fun_inv_map(
+        global_env,
+        &inv_ana_data.disabled_invs_for_fun,
+        "disabled_invs_for_fun",
+    );
+}
+
+pub struct VerificationAnalysisProcessorV2();
+
+impl VerificationAnalysisProcessorV2 {
+    pub fn new() -> Box<Self> {
+        Box::new(Self())
+    }
+}
+
+impl FunctionTargetProcessor for VerificationAnalysisProcessorV2 {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        let global_env = fun_env.module_env.env;
+        let fun_id = fun_env.get_qualified_id();
+        let variant = data.variant.clone();
+        // When this is called, the data of this function is removed from targets so it can
+        // be mutated, as per pipeline processor design. We put it back temporarily to have
+        // a unique model of targets.
+        targets.insert_target_data(&fun_id, variant.clone(), data);
+        let inv_ana_data = global_env.get_extension::<InvariantAnalysisData>().unwrap();
+        let target_fun_ids = &inv_ana_data.target_fun_ids;
+        let dep_fun_ids = &inv_ana_data.dep_fun_ids;
+        let friend_fun_ids = &inv_ana_data.friend_fun_ids;
+        let funs_that_modify_some_inv = &inv_ana_data.funs_that_modify_some_inv;
+        // Logic to decide whether to verify this function
+        // Never verify if "pragma verify = false;"
+        if fun_env.is_pragma_true(VERIFY_PRAGMA, || true) {
+            let is_in_target_mod = target_fun_ids.contains(&fun_id);
+            let is_in_deps_and_modifies_inv =
+                dep_fun_ids.contains(&fun_id) && funs_that_modify_some_inv.contains(&fun_id);
+            let is_in_friends = friend_fun_ids.contains(&fun_id);
+            let is_normally_verified =
+                is_in_target_mod || is_in_deps_and_modifies_inv || is_in_friends;
+            let options = ProverOptions::get(global_env);
+            let is_verified = match &options.verify_scope {
+                VerificationScope::Public => {
+                    (is_in_target_mod && fun_env.is_exposed())
+                        || is_in_deps_and_modifies_inv
+                        || is_in_friends
+                }
+                VerificationScope::All => is_normally_verified,
+                VerificationScope::Only(function_name) => {
+                    fun_env.matches_name(function_name) && is_in_target_mod
+                }
+                VerificationScope::OnlyModule(module_name) => {
+                    is_in_target_mod && fun_env.module_env.matches_name(module_name)
+                }
+                VerificationScope::None => false,
+            };
+            if is_verified {
+                debug!("marking `{}` to be verified", fun_env.get_full_name_str());
+                mark_verified(fun_env, variant.clone(), targets);
+            }
+        }
+
+        targets.remove_target_data(&fun_id, &variant)
+    }
+
+    fn name(&self) -> String {
+        "verification_analysis_v2".to_string()
+    }
+
+    fn initialize(&self, global_env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        let options = ProverOptions::get(global_env);
+
+        // If we are verifying only one function or module, check that this indeed exists.
+        match &options.verify_scope {
+            VerificationScope::Only(name) | VerificationScope::OnlyModule(name) => {
+                let for_module = matches!(&options.verify_scope, VerificationScope::OnlyModule(_));
+                let mut target_exists = false;
+                for module in global_env.get_modules() {
+                    if module.is_target() {
+                        if for_module {
+                            target_exists = module.matches_name(name)
+                        } else {
+                            target_exists = module.get_functions().any(|f| f.matches_name(name));
+                        }
+                        if target_exists {
+                            break;
+                        }
+                    }
+                }
+                if !target_exists {
+                    global_env.error(
+                        &global_env.unknown_loc(),
+                        &format!(
+                            "{} target {} does not exist in target modules",
+                            if for_module { "module" } else { "function" },
+                            name
+                        ),
+                    )
+                }
+            }
+            _ => {}
+        }
+
+        let target_modules = global_env.get_target_modules();
+        let target_fun_ids: BTreeSet<QualifiedId<FunId>> = target_modules
+            .iter()
+            .flat_map(|mod_env| mod_env.get_functions())
+            .map(|fun| fun.get_qualified_id())
+            .collect();
+        let dep_fun_ids = compute_dep_fun_ids(global_env, &target_modules);
+        let (disabled_inv_fun_set, non_inv_fun_set) =
+            compute_disabled_and_non_inv_fun_sets(global_env);
+        let target_invariants = get_target_invariants(global_env, &target_modules);
+        let (funs_that_modify_inv, invs_modified_by_fun, funs_that_modify_some_inv) =
+            compute_funs_that_modify_inv(
+                global_env,
+                &target_invariants,
+                targets,
+                FunctionVariant::Baseline,
+            );
+        let funs_that_delegate_to_caller = non_inv_fun_set
+            .intersection(&funs_that_modify_some_inv)
+            .cloned()
+            .collect();
+        let friend_fun_ids = compute_friend_fun_ids(
+            global_env,
+            &target_fun_ids,
+            &dep_fun_ids,
+            &funs_that_delegate_to_caller,
+        );
+        let disabled_invs_for_fun =
+            compute_disabled_invs_for_fun(global_env, &disabled_inv_fun_set, &invs_modified_by_fun);
+
+        // Check for public or script functions that are in non_inv_fun_set
+        for module_env in global_env.get_modules() {
+            for fun_env in module_env.get_functions() {
+                check_legal_disabled_invariants(
+                    &fun_env,
+                    &disabled_inv_fun_set,
+                    &non_inv_fun_set,
+                    &funs_that_modify_some_inv,
+                );
+            }
+        }
+        let inv_ana_data = InvariantAnalysisData {
+            target_fun_ids,
+            dep_fun_ids,
+            disabled_inv_fun_set,
+            non_inv_fun_set,
+            target_invariants,
+            funs_that_modify_inv,
+            invs_modified_by_fun,
+            funs_that_modify_some_inv,
+            funs_that_delegate_to_caller,
+            friend_fun_ids,
+            disabled_invs_for_fun,
+        };
+
+        // Note: To print verbose debugging info, use
+        debug_print_invariant_analysis_data(global_env, &inv_ana_data);
+
+        global_env.set_extension(inv_ana_data);
+    }
+}
+
+/// Mark this function as being verified. If it has a friend and is verified only in the
+/// friends context, mark the friend instead. This also marks all functions directly or
+/// indirectly called by this function as inlined if they are not opaque.
+fn mark_verified(
+    fun_env: &FunctionEnv<'_>,
+    variant: FunctionVariant,
+    targets: &mut FunctionTargetsHolder,
+) {
+    let actual_env = fun_env.get_transitive_friend();
+    if actual_env.get_qualified_id() != fun_env.get_qualified_id() {
+        // Instead of verifying this function directly, we mark the friend as being verified,
+        // and this function as inlined.
+        mark_inlined(fun_env, variant.clone(), targets);
+    }
+    // The user can override with `pragma verify = false`, so respect this.
+    let options = ProverOptions::get(fun_env.module_env.env);
+    if !actual_env.is_explicitly_not_verified(&options.verify_scope) {
+        let info = targets
+            .get_data_mut(&actual_env.get_qualified_id(), &variant)
+            .expect("function data available")
+            .annotations
+            .get_or_default_mut::<VerificationInfoV2>(true);
+        if !info.verified {
+            info.verified = true;
+            mark_callees_inlined(&actual_env, variant, targets);
+        }
+    }
+}
+
+/// Mark this function as inlined if it is not opaque, and if it is
+/// are called from a verified function via a chain of zero-or-more
+/// inline functions.  If it is not called from a verified function,
+/// it does not need to be inlined.
+fn mark_inlined(
+    fun_env: &FunctionEnv<'_>,
+    variant: FunctionVariant,
+    targets: &mut FunctionTargetsHolder,
+) {
+    if fun_env.is_native() || fun_env.is_intrinsic() {
+        return;
+    }
+    debug_assert!(
+        targets.get_target_variants(fun_env).contains(&variant),
+        "`{}` has variant `{:?}`",
+        fun_env.get_name().display(fun_env.symbol_pool()),
+        variant
+    );
+    let data = targets
+        .get_data_mut(&fun_env.get_qualified_id(), &variant)
+        .expect("function data defined");
+    let info = data
+        .annotations
+        .get_or_default_mut::<VerificationInfoV2>(true);
+    if !info.inlined {
+        info.inlined = true;
+        mark_callees_inlined(fun_env, variant, targets);
+    }
+}
+
+/// Continue transitively marking callees as inlined.
+fn mark_callees_inlined(
+    fun_env: &FunctionEnv<'_>,
+    variant: FunctionVariant,
+    targets: &mut FunctionTargetsHolder,
+) {
+    for callee in fun_env.get_called_functions() {
+        let callee_env = fun_env.module_env.env.get_function(callee);
+        if !callee_env.is_opaque() {
+            mark_inlined(&callee_env, variant.clone(), targets);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/src/well_formed_instrumentation.rs b/vendors/move/crates/move-stackless-bytecode/src/well_formed_instrumentation.rs
new file mode 100644
index 000000000..4f095bc4c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/src/well_formed_instrumentation.rs
@@ -0,0 +1,128 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Transformation which injects well-formed assumptions at top-level entry points of verified
+//! functions. These assumptions are both about parameters and any memory referred to by
+//! the code. For ghost memory, the transformation also assumes initial values if provided.
+//!
+//! This needs to be run *after* function specifications and global invariants have been
+//! injected because only then we know all accessed memory.
+//!
+//! This phase need to be run *before* data invariant instrumentation, because the latter relies
+//! on the well-formed assumptions, augmenting them with the data invariant.
+//! Because data invariants cannot refer to global memory, they are not relevant for memory
+//! usage, and their injection therefore can happen after this phase.
+
+use num::{BigUint, Zero};
+
+use move_model::{
+    ast::{Operation, QuantKind},
+    exp_generator::ExpGenerator,
+    model::FunctionEnv,
+    ty::BOOL_TYPE,
+};
+
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::PropKind,
+    usage_analysis::UsageProcessor,
+};
+
+pub struct WellFormedInstrumentationProcessor {}
+
+impl WellFormedInstrumentationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(Self {})
+    }
+}
+
+impl FunctionTargetProcessor for WellFormedInstrumentationProcessor {
+    fn process(
+        &self,
+        targets: &mut FunctionTargetsHolder,
+        fun_env: &FunctionEnv,
+        data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
+    ) -> FunctionData {
+        if !data.variant.is_verified() {
+            // only need to do this for verified functions
+            return data;
+        }
+        // Rerun usage analysis for this function.
+        let usage = UsageProcessor::analyze(targets, fun_env, &data);
+        let mut builder = FunctionDataBuilder::new(fun_env, data);
+        builder.set_loc(fun_env.get_loc().at_start());
+        let old_code = std::mem::take(&mut builder.data.code);
+
+        // Inject well-formedness assumptions for parameters.
+        for param in 0..builder.fun_env.get_parameter_count() {
+            let exp = builder.mk_call(
+                &BOOL_TYPE,
+                Operation::WellFormed,
+                vec![builder.mk_temporary(param)],
+            );
+            builder.emit_prop(PropKind::Assume, exp);
+        }
+
+        // Inject well-formedness assumption for used memory.
+        for mem in usage.accessed.all {
+            let struct_env = builder.global_env().get_struct_qid(mem.to_qualified_id());
+            if struct_env.is_native_or_intrinsic() {
+                // If this is native or intrinsic memory, skip this.
+                continue;
+            }
+            let exp = builder
+                .mk_inst_mem_quant_opt(QuantKind::Forall, &mem, &mut |val| {
+                    Some(builder.mk_call(&BOOL_TYPE, Operation::WellFormed, vec![val]))
+                })
+                .expect("quant defined");
+            builder.emit_prop(PropKind::Assume, exp);
+
+            // If this is ghost memory, assume it exists, and if it has an initializer,
+            // assume it has this value.
+            if let Some(spec_var) = struct_env.get_ghost_memory_spec_var() {
+                let mem_ty = mem.to_type();
+                let zero_addr = builder.mk_address_const(BigUint::zero());
+                let exists = builder.mk_call_with_inst(
+                    &BOOL_TYPE,
+                    vec![mem_ty.clone()],
+                    Operation::Exists(None),
+                    vec![zero_addr.clone()],
+                );
+                builder.emit_prop(PropKind::Assume, exists);
+                let svar_module = builder.global_env().get_module(spec_var.module_id);
+                let svar = svar_module.get_spec_var(spec_var.id);
+                if let Some(init) = &svar.init {
+                    let mem_val = builder.mk_call_with_inst(
+                        &mem_ty,
+                        mem.inst.clone(),
+                        Operation::Pack(mem.module_id, mem.id),
+                        vec![init.clone()],
+                    );
+                    let mem_access = builder.mk_call_with_inst(
+                        &mem_ty,
+                        vec![mem_ty.clone()],
+                        Operation::Global(None),
+                        vec![zero_addr],
+                    );
+                    let eq_with_init = builder.mk_identical(mem_access, mem_val);
+                    builder.emit_prop(PropKind::Assume, eq_with_init);
+                }
+            }
+        }
+
+        // Append the old code
+        for bc in old_code {
+            builder.emit(bc);
+        }
+
+        builder.data
+    }
+
+    fn name(&self) -> String {
+        "entry_point_instrumenter".to_string()
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.exp
new file mode 100644
index 000000000..844fe638d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.exp
@@ -0,0 +1,652 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := pack TestBorrow::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestBorrow::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut TestBorrow::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestBorrow::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestBorrow::test5($t3)
+  5: $t5 := 0
+  6: TestBorrow::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestBorrow::R
+     var $t2|r2#1#0: TestBorrow::R
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+     var $t6: u64
+     var $t7: TestBorrow::R
+     var $t8: &mut TestBorrow::R
+     var $t9: bool
+     var $t10: &mut TestBorrow::R
+     var $t11: &mut TestBorrow::R
+     var $t12: &mut TestBorrow::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestBorrow::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestBorrow::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: destroy($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestBorrow::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1#1#0: TestBorrow::R
+     var $t4|r2#1#0: TestBorrow::R
+     var $t5|t_ref#1#0: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: TestBorrow::R
+     var $t8: u64
+     var $t9: TestBorrow::R
+     var $t10: &mut TestBorrow::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestBorrow::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestBorrow::R
+     var $t21: &mut TestBorrow::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestBorrow::R
+     var $t27: &mut TestBorrow::R
+     var $t28: u64
+     var $t29: &mut TestBorrow::R
+     var $t30: &mut TestBorrow::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestBorrow::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestBorrow::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestBorrow::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestBorrow::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t2 := 3
+  1: $t0 := pack TestBorrow::R($t2)
+  2: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  3: $t4 := borrow_field<TestBorrow::R>.x($t3)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  4: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: write_ref($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: write_ref($t0, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  1: trace_local[x_ref]($t0)
+     # live_nodes: LocalRoot($t1)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut u64
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t0)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  2: trace_local[r_ref]($t0)
+     # live_nodes: LocalRoot($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  3: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: u64
+     var $t4: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := 0
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  4: TestBorrow::test3($t2, $t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  5: $t4 := move($t0)
+     # live_nodes: LocalRoot($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  6: return $t4
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut u64
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  1: trace_local[r_ref]($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  2: return $t1
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := TestBorrow::test5($t2)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  5: TestBorrow::test2($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  7: return $t5
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestBorrow::R
+     var $t2|r2#1#0: TestBorrow::R
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestBorrow::R
+     var $t7: &mut TestBorrow::R
+     var $t8: u64
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t1 := pack TestBorrow::R($t4)
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  3: $t2 := pack TestBorrow::R($t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  5: $t3 := $t6
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  6: if ($t0) goto 15 else goto 18
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  8: destroy($t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  9: $t7 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 10: $t3 := $t7
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 11: label L0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 12: $t8 := 0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 13: TestBorrow::test3($t3, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 14: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 15: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 16: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 17: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 18: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 19: destroy($t6)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 20: goto 11
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1#1#0: TestBorrow::R
+     var $t4|r2#1#0: TestBorrow::R
+     var $t5|t_ref#1#0: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestBorrow::R
+     var $t9: u64
+     var $t10: bool
+     var $t11: u64
+     var $t12: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestBorrow::R
+     var $t16: &mut TestBorrow::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  0: $t6 := 3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  1: $t3 := pack TestBorrow::R($t6)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  2: $t7 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  3: $t4 := pack TestBorrow::R($t7)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  4: $t8 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t8)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(@, LocalRoot($t4))}
+  5: $t5 := $t8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  6: label L6
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  7: $t9 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  8: $t10 := <($t9, $t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  9: if ($t10) goto 10 else goto 29
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 10: label L1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 11: label L2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 12: destroy($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 13: $t11 := 2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 14: $t12 := /($t1, $t11)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 15: $t13 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 16: $t14 := ==($t12, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 17: if ($t14) goto 18 else goto 22
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 18: label L4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 19: $t15 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t15)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 20: $t5 := $t15
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 21: goto 25
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 22: label L3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 23: $t16 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t16)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 24: $t5 := $t16
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 25: label L5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 26: $t17 := 1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 27: $t1 := -($t1, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 28: goto 6
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 29: label L0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 30: if ($t0) goto 31 else goto 36
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 31: label L8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 32: destroy($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 33: $t18 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 34: TestBorrow::test3($t2, $t18)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 35: goto 40
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 36: label L7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 37: destroy($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 38: $t19 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 39: TestBorrow::test3($t5, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 40: label L9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 41: trace_local[r_ref]($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 42: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun TestBorrow::test5[baseline]
+borrowed_by: Reference($t0) -> {(.x (u64), Return(0))}
+borrows_from: Return(0) -> {(.x (u64), Reference($t0))}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.move
new file mode 100644
index 000000000..49592ecd8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/basic_test.move
@@ -0,0 +1,70 @@
+module 0x42::TestBorrow {
+    struct R has copy, drop {
+        x: u64
+    }
+
+    fun test1() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        r
+    }
+
+    fun test2(x_ref: &mut u64, v: u64) {
+        *x_ref = v
+    }
+
+    public fun test3(r_ref: &mut R, v: u64) {
+        let x_ref = &mut r_ref.x;
+        test2(x_ref, v)
+    }
+
+    fun test4() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        test3(r_ref, 0);
+        r
+    }
+
+    public fun test5(r_ref: &mut R) : &mut u64 {
+        &mut r_ref.x
+    }
+
+    fun test6() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = test5(r_ref);
+        test2(x_ref, 0);
+        r
+    }
+
+    fun test7(b: bool) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let r_ref = &mut r1;
+        if (b) {
+            r_ref = &mut r2;
+        };
+        test3(r_ref, 0)
+    }
+
+    fun test8(b: bool, n: u64, r_ref: &mut R) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let t_ref = &mut r2;
+        while (0 < n) {
+            if (n/2 == 0) {
+                t_ref = &mut r1
+            } else {
+                t_ref = &mut r2;
+            };
+            n = n - 1
+        };
+        if (b) {
+            test3(r_ref, 0);
+        } else {
+            test3(t_ref, 0);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.exp b/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.exp
new file mode 100644
index 000000000..5ac369799
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.exp
@@ -0,0 +1,296 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t3: u64
+     var $t4: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<MultiLayerCalling::HasVector>.v($t1)
+  2: $t3 := 7
+  3: $t4 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t2, $t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::inner($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+     var $t3: &mut vector<u8>
+     var $t4: u8
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::mid($t1)
+  2: $t3 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t2)
+  3: $t4 := 42
+  4: vector::push_back<u8>($t3, $t4)
+  5: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: vector<#0>, $t1|e: #0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: vector<#0>, $t1|e: #0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t2: u64
+     var $t3: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<MultiLayerCalling::HasVector>.v($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  1: $t2 := 7
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  2: $t3 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t1, $t2)
+     # live_nodes: Reference($t0), Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}, Reference($t1) -> {([], Reference($t3))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}, Reference($t3) -> {([], Reference($t1))}
+  3: trace_local[has_vector]($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}, Reference($t1) -> {([], Reference($t3))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}, Reference($t3) -> {([], Reference($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::inner($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: trace_local[has_vector]($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  2: return $t1
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     var $t2: &mut vector<u8>
+     var $t3: u8
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::mid($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: $t2 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t1)
+     # live_nodes: Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  2: $t3 := 42
+     # live_nodes: Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  3: vector::push_back<u8>($t2, $t3)
+     # live_nodes: Reference($t0)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  4: trace_local[has_vector]($t0)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  5: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun MultiLayerCalling::inner[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+
+fun MultiLayerCalling::mid[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.move b/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.move
new file mode 100644
index 000000000..003dbbcee
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/function_call.move
@@ -0,0 +1,26 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x2::MultiLayerCalling {
+    use std::vector;
+
+    struct HasVector {
+        v: vector<HasAnotherVector>,
+    }
+
+    struct HasAnotherVector {
+        v: vector<u8>,
+    }
+
+    fun outer(has_vector: &mut HasVector) {
+        let has_another_vector = mid(has_vector);
+        vector::push_back(&mut has_another_vector.v, 42)
+    }
+
+    fun mid(has_vector: &mut HasVector): &mut HasAnotherVector {
+        inner(has_vector)
+    }
+
+    fun inner(has_vector: &mut HasVector): &mut HasAnotherVector {
+        vector::borrow_mut(&mut has_vector.v, 7)
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.exp b/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.exp
new file mode 100644
index 000000000..7f542415f
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.exp
@@ -0,0 +1,301 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun Collection::borrow_mut<#0>($t0|c: &mut Collection::Collection<#0>, $t1|i: u64): &mut #0 {
+     var $t2: &mut Collection::Collection<#0>
+     var $t3: &mut vector<#0>
+     var $t4: u64
+     var $t5: &mut #0
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<Collection::Collection<#0>>.items($t2)
+  2: $t4 := move($t1)
+  3: $t5 := vector::borrow_mut<#0>($t3, $t4)
+  4: return $t5
+}
+
+
+[variant baseline]
+public fun Collection::make_collection<#0>(): Collection::Collection<#0> {
+     var $t0: vector<#0>
+     var $t1: address
+     var $t2: Collection::Collection<#0>
+  0: $t0 := vector::empty<#0>()
+  1: $t1 := 0x2
+  2: $t2 := pack Collection::Collection<#0>($t0, $t1)
+  3: return $t2
+}
+
+
+[variant baseline]
+public fun Test::foo<#0>($t0|i: u64) {
+     var $t1|c#1#0: Collection::Collection<Test::Token<#0>>
+     var $t2|t#1#0: &mut Test::Token<#0>
+     var $t3: Collection::Collection<Test::Token<#0>>
+     var $t4: &mut Collection::Collection<Test::Token<#0>>
+     var $t5: u64
+     var $t6: &mut Test::Token<#0>
+     var $t7: u64
+     var $t8: &mut Test::Token<#0>
+     var $t9: &mut u64
+  0: $t3 := Collection::make_collection<Test::Token<#0>>()
+  1: $t1 := $t3
+  2: $t4 := borrow_local($t1)
+  3: $t5 := move($t0)
+  4: $t6 := Collection::borrow_mut<Test::Token<#0>>($t4, $t5)
+  5: $t2 := $t6
+  6: $t7 := 0
+  7: $t8 := move($t2)
+  8: $t9 := borrow_field<Test::Token<#0>>.value($t8)
+  9: write_ref($t9, $t7)
+ 10: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: vector<#0>, $t1|e: #0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: vector<#0>, $t1|e: #0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun Collection::borrow_mut<#0>($t0|c: &mut Collection::Collection<#0>, $t1|i: u64): &mut #0 {
+     var $t2: &mut vector<#0>
+     var $t3: &mut #0
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<Collection::Collection<#0>>.items($t0)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}
+  1: $t3 := vector::borrow_mut<#0>($t2, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}, Reference($t2) -> {([], Reference($t3))}
+     # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}, Reference($t3) -> {([], Reference($t2))}
+  2: trace_local[c]($t0)
+     # live_nodes: LocalRoot($t1), Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}, Reference($t2) -> {([], Reference($t3))}
+     # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}, Reference($t3) -> {([], Reference($t2))}
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Collection::make_collection<#0>(): Collection::Collection<#0> {
+     var $t0: vector<#0>
+     var $t1: address
+     var $t2: Collection::Collection<#0>
+  0: $t0 := vector::empty<#0>()
+  1: $t1 := 0x2
+  2: $t2 := pack Collection::Collection<#0>($t0, $t1)
+  3: return $t2
+}
+
+
+[variant baseline]
+public fun Test::foo<#0>($t0|i: u64) {
+     var $t1|c#1#0: Collection::Collection<Test::Token<#0>>
+     var $t2|t#1#0: &mut Test::Token<#0>
+     var $t3: &mut Collection::Collection<Test::Token<#0>>
+     var $t4: &mut Test::Token<#0>
+     var $t5: u64
+     var $t6: &mut u64
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := Collection::make_collection<Test::Token<#0>>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
+  2: $t4 := Collection::borrow_mut<Test::Token<#0>>($t3, $t0)
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
+  3: $t5 := 0
+     # live_nodes: LocalRoot($t0), Reference($t4)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
+  4: $t6 := borrow_field<Test::Token<#0>>.value($t4)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
+  5: write_ref($t6, $t5)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
+  6: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun Collection::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {(.items (vector<#0>)/[], Return(0))}
+borrows_from: Return(0) -> {(.items (vector<#0>)/[], Reference($t0))}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.move b/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.move
new file mode 100644
index 000000000..9aee1d251
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow/hyper_edge.move
@@ -0,0 +1,33 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x2::Collection {
+    use std::vector;
+
+    struct Collection<T> has drop {
+        items: vector<T>,
+        owner: address,
+    }
+
+    public fun borrow_mut<T>(c: &mut Collection<T>, i: u64): &mut T {
+        vector::borrow_mut(&mut c.items, i)
+    }
+
+    public fun make_collection<T>(): Collection<T> {
+        Collection {
+            items: vector::empty(),
+            owner: @0x2,
+        }
+    }
+}
+
+module 0x2::Test {
+    use 0x2::Collection;
+
+    struct Token<phantom T> has drop { value: u64 }
+
+    public fun foo<T>(i: u64) {
+        let c = Collection::make_collection<Token<T>>();
+        let t = Collection::borrow_mut(&mut c, i);
+        t.value = 0;
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.exp
new file mode 100644
index 000000000..21c9efddd
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.exp
@@ -0,0 +1,966 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: TestBorrow::R
+     var $t5: &mut TestBorrow::R
+     var $t6: &mut u64
+     var $t7: u64
+     var $t8: &mut u64
+     var $t9: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t4 := pack TestBorrow::R($t2, $t3)
+  3: $t0 := $t4
+  4: $t5 := borrow_local($t0)
+  5: $t6 := borrow_field<TestBorrow::R>.x($t5)
+  6: $t1 := $t6
+  7: $t7 := 0
+  8: $t8 := move($t1)
+  9: write_ref($t8, $t7)
+ 10: $t9 := move($t0)
+ 11: return $t9
+}
+
+
+[variant baseline]
+fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
+     var $t1|r#1#0: TestBorrow::R
+     var $t2|r_field#1#0: &mut u64
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+     var $t7: &mut TestBorrow::R
+     var $t8: &mut TestBorrow::R
+     var $t9: &mut u64
+     var $t10: bool
+     var $t11: &mut u64
+     var $t12: bool
+     var $t13: &mut TestBorrow::R
+     var $t14: &mut u64
+     var $t15: &mut TestBorrow::R
+     var $t16: u64
+     var $t17: &mut u64
+     var $t18: TestBorrow::R
+  0: $t4 := 3
+  1: $t5 := 4
+  2: $t6 := pack TestBorrow::R($t4, $t5)
+  3: $t1 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t3 := $t7
+  6: $t8 := copy($t3)
+  7: $t9 := borrow_field<TestBorrow::R>.x($t8)
+  8: $t2 := $t9
+  9: $t10 := copy($t0)
+ 10: if ($t10) goto 11 else goto 19
+ 11: label L1
+ 12: $t11 := move($t2)
+ 13: destroy($t11)
+ 14: $t12 := move($t0)
+ 15: $t13 := move($t3)
+ 16: $t14 := TestBorrow::test9($t12, $t13)
+ 17: $t2 := $t14
+ 18: goto 23
+ 19: label L0
+ 20: $t15 := move($t3)
+ 21: destroy($t15)
+ 22: goto 23
+ 23: label L2
+ 24: $t16 := 0
+ 25: $t17 := move($t2)
+ 26: write_ref($t17, $t16)
+ 27: $t18 := move($t1)
+ 28: return $t18
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := 0
+  6: TestBorrow::test3($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut TestBorrow::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestBorrow::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := TestBorrow::test5($t4)
+  6: $t6 := 0
+  7: TestBorrow::test2($t5, $t6)
+  8: $t7 := move($t0)
+  9: return $t7
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestBorrow::R
+     var $t2|r2#1#0: TestBorrow::R
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+     var $t7: u64
+     var $t8: u64
+     var $t9: TestBorrow::R
+     var $t10: &mut TestBorrow::R
+     var $t11: bool
+     var $t12: &mut TestBorrow::R
+     var $t13: &mut TestBorrow::R
+     var $t14: &mut TestBorrow::R
+     var $t15: u64
+  0: $t4 := 3
+  1: $t5 := 4
+  2: $t6 := pack TestBorrow::R($t4, $t5)
+  3: $t1 := $t6
+  4: $t7 := 4
+  5: $t8 := 5
+  6: $t9 := pack TestBorrow::R($t7, $t8)
+  7: $t2 := $t9
+  8: $t10 := borrow_local($t1)
+  9: $t3 := $t10
+ 10: $t11 := move($t0)
+ 11: if ($t11) goto 12 else goto 18
+ 12: label L1
+ 13: $t12 := move($t3)
+ 14: destroy($t12)
+ 15: $t13 := borrow_local($t2)
+ 16: $t3 := $t13
+ 17: goto 18
+ 18: label L0
+ 19: $t14 := move($t3)
+ 20: $t15 := 0
+ 21: TestBorrow::test3($t14, $t15)
+ 22: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1#1#0: TestBorrow::R
+     var $t4|r2#1#0: TestBorrow::R
+     var $t5|t_ref#1#0: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: TestBorrow::R
+     var $t9: u64
+     var $t10: u64
+     var $t11: TestBorrow::R
+     var $t12: &mut TestBorrow::R
+     var $t13: u64
+     var $t14: u64
+     var $t15: bool
+     var $t16: &mut TestBorrow::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     var $t20: u64
+     var $t21: bool
+     var $t22: &mut TestBorrow::R
+     var $t23: &mut TestBorrow::R
+     var $t24: u64
+     var $t25: u64
+     var $t26: u64
+     var $t27: bool
+     var $t28: &mut TestBorrow::R
+     var $t29: &mut TestBorrow::R
+     var $t30: u64
+     var $t31: &mut TestBorrow::R
+     var $t32: &mut TestBorrow::R
+     var $t33: u64
+  0: $t6 := 3
+  1: $t7 := 4
+  2: $t8 := pack TestBorrow::R($t6, $t7)
+  3: $t3 := $t8
+  4: $t9 := 4
+  5: $t10 := 5
+  6: $t11 := pack TestBorrow::R($t9, $t10)
+  7: $t4 := $t11
+  8: $t12 := borrow_local($t4)
+  9: $t5 := $t12
+ 10: goto 11
+ 11: label L6
+ 12: $t13 := 0
+ 13: $t14 := copy($t1)
+ 14: $t15 := <($t13, $t14)
+ 15: if ($t15) goto 16 else goto 41
+ 16: label L1
+ 17: goto 18
+ 18: label L2
+ 19: $t16 := move($t5)
+ 20: destroy($t16)
+ 21: $t17 := copy($t1)
+ 22: $t18 := 2
+ 23: $t19 := /($t17, $t18)
+ 24: $t20 := 0
+ 25: $t21 := ==($t19, $t20)
+ 26: if ($t21) goto 27 else goto 31
+ 27: label L4
+ 28: $t22 := borrow_local($t3)
+ 29: $t5 := $t22
+ 30: goto 35
+ 31: label L3
+ 32: $t23 := borrow_local($t4)
+ 33: $t5 := $t23
+ 34: goto 35
+ 35: label L5
+ 36: $t24 := move($t1)
+ 37: $t25 := 1
+ 38: $t26 := -($t24, $t25)
+ 39: $t1 := $t26
+ 40: goto 11
+ 41: label L0
+ 42: $t27 := move($t0)
+ 43: if ($t27) goto 44 else goto 51
+ 44: label L8
+ 45: $t28 := move($t5)
+ 46: destroy($t28)
+ 47: $t29 := move($t2)
+ 48: $t30 := 0
+ 49: TestBorrow::test3($t29, $t30)
+ 50: goto 58
+ 51: label L7
+ 52: $t31 := move($t2)
+ 53: destroy($t31)
+ 54: $t32 := move($t5)
+ 55: $t33 := 0
+ 56: TestBorrow::test3($t32, $t33)
+ 57: goto 58
+ 58: label L9
+ 59: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t2|r_field#1#0: &mut u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: bool
+     var $t6: &mut u64
+     var $t7: &mut TestBorrow::R
+     var $t8: &mut u64
+     var $t9: &mut TestBorrow::R
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: &mut u64
+  0: $t3 := copy($t1)
+  1: $t4 := borrow_field<TestBorrow::R>.x($t3)
+  2: $t2 := $t4
+  3: $t5 := move($t0)
+  4: if ($t5) goto 5 else goto 12
+  5: label L1
+  6: $t6 := move($t2)
+  7: destroy($t6)
+  8: $t7 := move($t1)
+  9: $t8 := borrow_field<TestBorrow::R>.y($t7)
+ 10: $t2 := $t8
+ 11: goto 16
+ 12: label L0
+ 13: $t9 := move($t1)
+ 14: destroy($t9)
+ 15: goto 16
+ 16: label L2
+ 17: $t10 := 0
+ 18: $t11 := copy($t2)
+ 19: write_ref($t11, $t10)
+ 20: $t12 := move($t2)
+ 21: return $t12
+}
+
+============ after pipeline `borrow_strong` ================
+
+[variant baseline]
+fun TestBorrow::test1(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t0 := pack TestBorrow::R($t2, $t3)
+  3: $t4 := borrow_local($t0)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+     # live_nodes: Reference($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  5: $t6 := 0
+     # live_nodes: Reference($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  6: write_ref($t5, $t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  7: $t7 := move($t0)
+     # live_nodes: LocalRoot($t7)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  8: return $t7
+}
+
+
+[variant baseline]
+fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
+     var $t1|r#1#0: TestBorrow::R
+     var $t2|r_field#1#0: &mut u64
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestBorrow::R
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: TestBorrow::R
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  2: $t1 := pack TestBorrow::R($t4, $t5)
+     # live_nodes: LocalRoot($t0)
+  3: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  4: $t7 := borrow_field<TestBorrow::R>.x($t6)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  5: $t2 := $t7
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  6: if ($t0) goto 18 else goto 21
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  8: destroy($t7)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  9: $t2 := TestBorrow::test9($t0, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 10: goto 13
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 11: label L0
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 12: destroy($t6)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 13: label L2
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 14: $t8 := 0
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 15: write_ref($t2, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 16: $t9 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 17: return $t9
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 18: label L3
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 19: destroy($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 20: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 21: label L4
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 22: destroy($t7)
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 23: goto 11
+}
+
+
+[variant baseline]
+fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: write_ref($t0, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  1: trace_local[x_ref]($t0)
+     # live_nodes: LocalRoot($t1)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
+     var $t2: &mut u64
+     # live_nodes: LocalRoot($t1), Reference($t0)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
+     # live_nodes: LocalRoot($t1), Reference($t0)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  2: trace_local[r_ref]($t0)
+     # live_nodes: LocalRoot($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  3: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test4(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  5: TestBorrow::test3($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t1: &mut u64
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  1: trace_local[r_ref]($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.x (u64), Reference($t0))}
+  2: return $t1
+}
+
+
+[variant baseline]
+fun TestBorrow::test6(): TestBorrow::R {
+     var $t0|r#1#0: TestBorrow::R
+     var $t1: u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := TestBorrow::test5($t3)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: TestBorrow::test2($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestBorrow::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestBorrow::R
+     var $t2|r2#1#0: TestBorrow::R
+     var $t3|r_ref#1#0: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestBorrow::R
+     var $t9: &mut TestBorrow::R
+     var $t10: u64
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 3
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := 4
+     # live_nodes: LocalRoot($t0)
+  2: $t1 := pack TestBorrow::R($t4, $t5)
+     # live_nodes: LocalRoot($t0)
+  3: $t6 := 4
+     # live_nodes: LocalRoot($t0)
+  4: $t7 := 5
+     # live_nodes: LocalRoot($t0)
+  5: $t2 := pack TestBorrow::R($t6, $t7)
+     # live_nodes: LocalRoot($t0)
+  6: $t8 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(@, LocalRoot($t1))}
+  7: $t3 := $t8
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  8: if ($t0) goto 17 else goto 20
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  9: label L1
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 10: destroy($t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 11: $t9 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 12: $t3 := $t9
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 13: label L0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 14: $t10 := 0
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 15: TestBorrow::test3($t3, $t10)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 16: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 17: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 18: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 19: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 20: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 21: destroy($t8)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 22: goto 13
+}
+
+
+[variant baseline]
+fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
+     var $t3|r1#1#0: TestBorrow::R
+     var $t4|r2#1#0: TestBorrow::R
+     var $t5|t_ref#1#0: &mut TestBorrow::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: &mut TestBorrow::R
+     var $t11: u64
+     var $t12: bool
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: &mut TestBorrow::R
+     var $t18: &mut TestBorrow::R
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  0: $t6 := 3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  1: $t7 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  2: $t3 := pack TestBorrow::R($t6, $t7)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  3: $t8 := 4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  4: $t9 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  5: $t4 := pack TestBorrow::R($t8, $t9)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+  6: $t10 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t10)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t10))}
+     # borrows_from: Reference($t10) -> {(@, LocalRoot($t4))}
+  7: $t5 := $t10
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+  8: label L6
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+  9: $t11 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 10: $t12 := <($t11, $t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 11: if ($t12) goto 12 else goto 31
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 12: label L1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 13: label L2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 14: destroy($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 15: $t13 := 2
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 16: $t14 := /($t1, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 17: $t15 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 18: $t16 := ==($t14, $t15)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 19: if ($t16) goto 20 else goto 24
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 20: label L4
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 21: $t17 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t17)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 22: $t5 := $t17
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 23: goto 27
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 24: label L3
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 25: $t18 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t18)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 26: $t5 := $t18
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 27: label L5
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 28: $t19 := 1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 29: $t1 := -($t1, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 30: goto 8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 31: label L0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 32: if ($t0) goto 33 else goto 38
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 33: label L8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 34: destroy($t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 35: $t20 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 36: TestBorrow::test3($t2, $t20)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 37: goto 42
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 38: label L7
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 39: destroy($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 40: $t21 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 41: TestBorrow::test3($t5, $t21)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 42: label L9
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 43: trace_local[r_ref]($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 44: return ()
+}
+
+
+[variant baseline]
+fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
+     var $t2|r_field#1#0: &mut u64
+     var $t3: &mut u64
+     var $t4: u64
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: $t3 := borrow_field<TestBorrow::R>.x($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t1))}
+  1: $t2 := $t3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  2: if ($t0) goto 14 else goto 17
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  3: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  4: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t1)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  5: $t2 := borrow_field<TestBorrow::R>.y($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  6: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  7: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  8: destroy($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  9: label L2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 10: $t4 := 0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 11: write_ref($t2, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 12: trace_local[r_ref]($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 13: return $t2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 14: label L3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 15: destroy($t2)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 16: goto 3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 17: label L4
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 18: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 19: goto 7
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun TestBorrow::test5[baseline]
+borrowed_by: Reference($t0) -> {(.x (u64), Return(0))}
+borrows_from: Return(0) -> {(.x (u64), Reference($t0))}
+
+fun TestBorrow::test9[baseline]
+borrowed_by: Reference($t1) -> {(.y (u64), Return(0)), (.x (u64)/@, Return(0))}
+borrows_from: Return(0) -> {(.y (u64), Reference($t1)), (.x (u64)/@, Reference($t1))}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.move
new file mode 100644
index 000000000..9b530c7eb
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/basic_test.move
@@ -0,0 +1,91 @@
+module 0x42::TestBorrow {
+    struct R has copy, drop {
+        x: u64,
+        y: u64
+    }
+
+    fun test1() : R {
+        let r = R {x: 3, y: 4};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        r
+    }
+
+    fun test2(x_ref: &mut u64, v: u64) {
+        *x_ref = v
+    }
+
+    public fun test3(r_ref: &mut R, v: u64) {
+        let x_ref = &mut r_ref.x;
+        test2(x_ref, v)
+    }
+
+    fun test4() : R {
+        let r = R {x: 3, y: 4};
+        let r_ref = &mut r;
+        test3(r_ref, 0);
+        r
+    }
+
+    public fun test5(r_ref: &mut R) : &mut u64 {
+        &mut r_ref.x
+    }
+
+    fun test6() : R {
+        let r = R {x: 3, y: 4};
+        let r_ref = &mut r;
+        let x_ref = test5(r_ref);
+        test2(x_ref, 0);
+        r
+    }
+
+    fun test7(b: bool) {
+        let r1 = R {x: 3, y: 4};
+        let r2 = R {x: 4, y: 5};
+        let r_ref = &mut r1;
+        if (b) {
+            r_ref = &mut r2;
+        };
+        test3(r_ref, 0)
+    }
+
+    fun test8(b: bool, n: u64, r_ref: &mut R) {
+        let r1 = R {x: 3, y: 4};
+        let r2 = R {x: 4, y: 5};
+        let t_ref = &mut r2;
+        while (0 < n) {
+            if (n/2 == 0) {
+                t_ref = &mut r1
+            } else {
+                t_ref = &mut r2;
+            };
+            n = n - 1
+        };
+        if (b) {
+            test3(r_ref, 0);
+        } else {
+            test3(t_ref, 0);
+        }
+    }
+
+    fun test9(b : bool, r_ref: &mut R) : &mut u64 {
+        let r_field = &mut r_ref.x;
+        if(b) {
+            r_field = &mut r_ref.y;
+        };
+        *r_field = 0;
+        r_field
+    }
+
+    fun test10(b : bool) : R {
+        let r = R {x: 3, y: 4};
+        let r_ref = &mut r;
+        let r_field = &mut r_ref.x;
+        if(b) {
+            r_field = test9(b, r_ref);
+        };
+        *r_field = 0;
+        r
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.exp b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.exp
new file mode 100644
index 000000000..9c6f7172c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.exp
@@ -0,0 +1,1164 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path($t0|b: bool): TestMutRef::N {
+     var $t1|r#1#0: &mut u64
+     var $t2|x#1#0: TestMutRef::N
+     var $t3: u64
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: TestMutRef::N
+     var $t7: bool
+     var $t8: &mut TestMutRef::N
+     var $t9: &mut u64
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: TestMutRef::N
+  0: $t3 := 1
+  1: $t4 := 2
+  2: $t5 := pack TestMutRef::T($t4)
+  3: $t6 := pack TestMutRef::N($t3, $t5)
+  4: $t2 := $t6
+  5: $t7 := move($t0)
+  6: $t8 := borrow_local($t2)
+  7: $t9 := TestMutRef::return_ref_different_path($t7, $t8)
+  8: $t1 := $t9
+  9: $t10 := 5
+ 10: $t11 := move($t1)
+ 11: write_ref($t11, $t10)
+ 12: $t12 := move($t2)
+ 13: return $t12
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: vector<u64>
+     var $t12: vector<TestMutRef::T>
+     var $t13: TestMutRef::V
+     var $t14: bool
+     var $t15: &mut TestMutRef::V
+     var $t16: &mut u64
+     var $t17: u64
+     var $t18: &mut u64
+     var $t19: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := move($t1)
+ 11: $t12 := move($t3)
+ 12: $t13 := pack TestMutRef::V($t11, $t12)
+ 13: $t4 := $t13
+ 14: $t14 := move($t0)
+ 15: $t15 := borrow_local($t4)
+ 16: $t16 := TestMutRef::return_ref_different_path_vec($t14, $t15)
+ 17: $t2 := $t16
+ 18: $t17 := 5
+ 19: $t18 := move($t2)
+ 20: write_ref($t18, $t17)
+ 21: $t19 := move($t4)
+ 22: return $t19
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut vector<TestMutRef::T>
+     var $t12: u64
+     var $t13: TestMutRef::T
+     var $t14: &mut vector<TestMutRef::T>
+     var $t15: u64
+     var $t16: TestMutRef::T
+     var $t17: vector<u64>
+     var $t18: vector<TestMutRef::T>
+     var $t19: TestMutRef::V
+     var $t20: bool
+     var $t21: &mut TestMutRef::V
+     var $t22: &mut u64
+     var $t23: u64
+     var $t24: &mut u64
+     var $t25: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := borrow_local($t3)
+ 11: $t12 := 3
+ 12: $t13 := pack TestMutRef::T($t12)
+ 13: vector::push_back<TestMutRef::T>($t11, $t13)
+ 14: $t14 := borrow_local($t3)
+ 15: $t15 := 4
+ 16: $t16 := pack TestMutRef::T($t15)
+ 17: vector::push_back<TestMutRef::T>($t14, $t16)
+ 18: $t17 := move($t1)
+ 19: $t18 := move($t3)
+ 20: $t19 := pack TestMutRef::V($t17, $t18)
+ 21: $t4 := $t19
+ 22: $t20 := move($t0)
+ 23: $t21 := borrow_local($t4)
+ 24: $t22 := TestMutRef::return_ref_different_path_vec2($t20, $t21)
+ 25: $t2 := $t22
+ 26: $t23 := 5
+ 27: $t24 := move($t2)
+ 28: write_ref($t24, $t23)
+ 29: $t25 := move($t4)
+ 30: return $t25
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2_incorrect($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: vector<u64>
+     var $t6: vector<TestMutRef::T>
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut vector<TestMutRef::T>
+     var $t12: u64
+     var $t13: TestMutRef::T
+     var $t14: &mut vector<TestMutRef::T>
+     var $t15: u64
+     var $t16: TestMutRef::T
+     var $t17: vector<u64>
+     var $t18: vector<TestMutRef::T>
+     var $t19: TestMutRef::V
+     var $t20: bool
+     var $t21: &mut TestMutRef::V
+     var $t22: &mut u64
+     var $t23: u64
+     var $t24: &mut u64
+     var $t25: TestMutRef::V
+  0: $t5 := vector::empty<u64>()
+  1: $t1 := $t5
+  2: $t6 := vector::empty<TestMutRef::T>()
+  3: $t3 := $t6
+  4: $t7 := borrow_local($t1)
+  5: $t8 := 1
+  6: vector::push_back<u64>($t7, $t8)
+  7: $t9 := borrow_local($t1)
+  8: $t10 := 2
+  9: vector::push_back<u64>($t9, $t10)
+ 10: $t11 := borrow_local($t3)
+ 11: $t12 := 3
+ 12: $t13 := pack TestMutRef::T($t12)
+ 13: vector::push_back<TestMutRef::T>($t11, $t13)
+ 14: $t14 := borrow_local($t3)
+ 15: $t15 := 4
+ 16: $t16 := pack TestMutRef::T($t15)
+ 17: vector::push_back<TestMutRef::T>($t14, $t16)
+ 18: $t17 := move($t1)
+ 19: $t18 := move($t3)
+ 20: $t19 := pack TestMutRef::V($t17, $t18)
+ 21: $t4 := $t19
+ 22: $t20 := move($t0)
+ 23: $t21 := borrow_local($t4)
+ 24: $t22 := TestMutRef::return_ref_different_path_vec2($t20, $t21)
+ 25: $t2 := $t22
+ 26: $t23 := 0
+ 27: $t24 := move($t2)
+ 28: write_ref($t24, $t23)
+ 29: $t25 := move($t4)
+ 30: return $t25
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_root($t0|b: bool): (TestMutRef::T, TestMutRef::R) {
+     var $t1|r#1#0: &mut u64
+     var $t2|x#1#0: TestMutRef::T
+     var $t3|y#1#0: TestMutRef::R
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: u64
+     var $t7: TestMutRef::R
+     var $t8: bool
+     var $t9: &mut TestMutRef::T
+     var $t10: &mut TestMutRef::R
+     var $t11: &mut u64
+     var $t12: u64
+     var $t13: &mut u64
+     var $t14: TestMutRef::T
+     var $t15: TestMutRef::R
+  0: $t4 := 1
+  1: $t5 := pack TestMutRef::T($t4)
+  2: $t2 := $t5
+  3: $t6 := 10
+  4: $t7 := pack TestMutRef::R($t6)
+  5: $t3 := $t7
+  6: $t8 := move($t0)
+  7: $t9 := borrow_local($t2)
+  8: $t10 := borrow_local($t3)
+  9: $t11 := TestMutRef::return_ref_different_root($t8, $t9, $t10)
+ 10: $t1 := $t11
+ 11: $t12 := 5
+ 12: $t13 := move($t1)
+ 13: write_ref($t13, $t12)
+ 14: $t14 := move($t2)
+ 15: $t15 := move($t3)
+ 16: return ($t14, $t15)
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::N
+     var $t5: &mut u64
+     var $t6: &mut TestMutRef::N
+     var $t7: &mut TestMutRef::T
+     var $t8: &mut u64
+     var $t9: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 7
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::N>.value($t4)
+  5: $t2 := $t5
+  6: goto 13
+  7: label L0
+  8: $t6 := move($t1)
+  9: $t7 := borrow_field<TestMutRef::N>.t($t6)
+ 10: $t8 := borrow_field<TestMutRef::T>.value($t7)
+ 11: $t2 := $t8
+ 12: goto 13
+ 13: label L2
+ 14: $t9 := move($t2)
+ 15: return $t9
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::V
+     var $t9: &mut vector<u64>
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 9
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::V>.is($t4)
+  5: $t6 := 1
+  6: $t7 := vector::borrow_mut<u64>($t5, $t6)
+  7: $t2 := $t7
+  8: goto 16
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: $t9 := borrow_field<TestMutRef::V>.is($t8)
+ 12: $t10 := 0
+ 13: $t11 := vector::borrow_mut<u64>($t9, $t10)
+ 14: $t2 := $t11
+ 15: goto 16
+ 16: label L2
+ 17: $t12 := move($t2)
+ 18: return $t12
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: bool
+     var $t4: &mut TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::V
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: &mut TestMutRef::T
+     var $t12: &mut u64
+     var $t13: &mut u64
+  0: $t3 := move($t0)
+  1: if ($t3) goto 2 else goto 9
+  2: label L1
+  3: $t4 := move($t1)
+  4: $t5 := borrow_field<TestMutRef::V>.is($t4)
+  5: $t6 := 1
+  6: $t7 := vector::borrow_mut<u64>($t5, $t6)
+  7: $t2 := $t7
+  8: goto 17
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: $t9 := borrow_field<TestMutRef::V>.ts($t8)
+ 12: $t10 := 0
+ 13: $t11 := vector::borrow_mut<TestMutRef::T>($t9, $t10)
+ 14: $t12 := borrow_field<TestMutRef::T>.value($t11)
+ 15: $t2 := $t12
+ 16: goto 17
+ 17: label L2
+ 18: $t13 := move($t2)
+ 19: return $t13
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T, $t2|y: &mut TestMutRef::R): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     var $t4: bool
+     var $t5: &mut TestMutRef::R
+     var $t6: &mut TestMutRef::T
+     var $t7: &mut u64
+     var $t8: &mut TestMutRef::T
+     var $t9: &mut TestMutRef::R
+     var $t10: &mut u64
+     var $t11: &mut u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 9
+  2: label L1
+  3: $t5 := move($t2)
+  4: destroy($t5)
+  5: $t6 := move($t1)
+  6: $t7 := borrow_field<TestMutRef::T>.value($t6)
+  7: $t3 := $t7
+  8: goto 16
+  9: label L0
+ 10: $t8 := move($t1)
+ 11: destroy($t8)
+ 12: $t9 := move($t2)
+ 13: $t10 := borrow_field<TestMutRef::R>.value($t9)
+ 14: $t3 := $t10
+ 15: goto 16
+ 16: label L2
+ 17: $t11 := move($t3)
+ 18: return $t11
+}
+
+============ after pipeline `borrow_strong` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: vector<#0>, $t1|e: #0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: vector<#0>, $t1|e: #0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path($t0|b: bool): TestMutRef::N {
+     var $t1|r#1#0: &mut u64
+     var $t2|x#1#0: TestMutRef::N
+     var $t3: u64
+     var $t4: u64
+     var $t5: TestMutRef::T
+     var $t6: &mut TestMutRef::N
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: TestMutRef::N
+     # live_nodes: LocalRoot($t0)
+  0: $t3 := 1
+     # live_nodes: LocalRoot($t0)
+  1: $t4 := 2
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := pack TestMutRef::T($t4)
+     # live_nodes: LocalRoot($t0)
+  3: $t2 := pack TestMutRef::N($t3, $t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}
+  5: $t7 := TestMutRef::return_ref_different_path($t0, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  6: $t8 := 5
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  7: write_ref($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  8: $t9 := move($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+  9: return $t9
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: vector<TestMutRef::T>
+     var $t6: &mut vector<u64>
+     var $t7: u64
+     var $t8: &mut vector<u64>
+     var $t9: u64
+     var $t10: vector<u64>
+     var $t11: &mut TestMutRef::V
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t5 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t6 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  3: $t7 := 1
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t6, $t7)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
+  5: $t8 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  6: $t9 := 2
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t8, $t9)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  8: $t10 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  9: $t4 := pack TestMutRef::V($t10, $t5)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 10: $t11 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t11)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}
+ 11: $t12 := TestMutRef::return_ref_different_path_vec($t0, $t11)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 12: $t13 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 13: write_ref($t12, $t13)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 14: $t14 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t14)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+ 15: return $t14
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: TestMutRef::T
+     var $t12: &mut vector<TestMutRef::T>
+     var $t13: u64
+     var $t14: TestMutRef::T
+     var $t15: vector<u64>
+     var $t16: vector<TestMutRef::T>
+     var $t17: &mut TestMutRef::V
+     var $t18: &mut u64
+     var $t19: u64
+     var $t20: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  3: $t6 := 1
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  5: $t7 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  6: $t8 := 2
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  8: $t9 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+  9: $t10 := 3
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 10: $t11 := pack TestMutRef::T($t10)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 11: vector::push_back<TestMutRef::T>($t9, $t11)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 12: $t12 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 13: $t13 := 4
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 14: $t14 := pack TestMutRef::T($t13)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 15: vector::push_back<TestMutRef::T>($t12, $t14)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 16: $t15 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 17: $t16 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 18: $t4 := pack TestMutRef::V($t15, $t16)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 19: $t17 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
+ 20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 21: $t19 := 5
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 22: write_ref($t18, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 23: $t20 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 24: return $t20
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_path_vec2_incorrect($t0|b: bool): TestMutRef::V {
+     var $t1|is#1#0: vector<u64>
+     var $t2|r#1#0: &mut u64
+     var $t3|ts#1#0: vector<TestMutRef::T>
+     var $t4|x#1#0: TestMutRef::V
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     var $t7: &mut vector<u64>
+     var $t8: u64
+     var $t9: &mut vector<TestMutRef::T>
+     var $t10: u64
+     var $t11: TestMutRef::T
+     var $t12: &mut vector<TestMutRef::T>
+     var $t13: u64
+     var $t14: TestMutRef::T
+     var $t15: vector<u64>
+     var $t16: vector<TestMutRef::T>
+     var $t17: &mut TestMutRef::V
+     var $t18: &mut u64
+     var $t19: u64
+     var $t20: TestMutRef::V
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<u64>()
+     # live_nodes: LocalRoot($t0)
+  1: $t3 := vector::empty<TestMutRef::T>()
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  3: $t6 := 1
+     # live_nodes: LocalRoot($t0), Reference($t5)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  4: vector::push_back<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}
+  5: $t7 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  6: $t8 := 2
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  7: vector::push_back<u64>($t7, $t8)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}
+  8: $t9 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+  9: $t10 := 3
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 10: $t11 := pack TestMutRef::T($t10)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 11: vector::push_back<TestMutRef::T>($t9, $t11)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}
+ 12: $t12 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 13: $t13 := 4
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 14: $t14 := pack TestMutRef::T($t13)
+     # live_nodes: LocalRoot($t0), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 15: vector::push_back<TestMutRef::T>($t12, $t14)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 16: $t15 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 17: $t16 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 18: $t4 := pack TestMutRef::V($t15, $t16)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+ 19: $t17 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
+ 20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 21: $t19 := 0
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 22: write_ref($t18, $t19)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 23: $t20 := move($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+ 24: return $t20
+}
+
+
+[variant baseline]
+fun TestMutRef::call_return_ref_different_root($t0|b: bool): (TestMutRef::T, TestMutRef::R) {
+     var $t1|r#1#0: &mut u64
+     var $t2|x#1#0: TestMutRef::T
+     var $t3|y#1#0: TestMutRef::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestMutRef::T
+     var $t7: &mut TestMutRef::R
+     var $t8: &mut u64
+     var $t9: u64
+     var $t10: TestMutRef::T
+     var $t11: TestMutRef::R
+     # live_nodes: LocalRoot($t0)
+  0: $t4 := 1
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := pack TestMutRef::T($t4)
+     # live_nodes: LocalRoot($t0)
+  2: $t5 := 10
+     # live_nodes: LocalRoot($t0)
+  3: $t3 := pack TestMutRef::R($t5)
+     # live_nodes: LocalRoot($t0)
+  4: $t6 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}
+  5: $t7 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}
+  6: $t8 := TestMutRef::return_ref_different_root($t0, $t6, $t7)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  7: $t9 := 5
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  8: write_ref($t8, $t9)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+  9: $t10 := move($t2)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+ 10: $t11 := move($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t11)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+ 11: return ($t10, $t11)
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut TestMutRef::T
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 4
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t2 := borrow_field<TestMutRef::N>.value($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1))}
+  3: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  4: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  5: $t3 := borrow_field<TestMutRef::N>.t($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.t (TestMutRef::T), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  6: $t2 := borrow_field<TestMutRef::T>.value($t3)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  7: label L2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  8: trace_local[x]($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
+  9: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut vector<u64>
+     var $t4: u64
+     var $t5: &mut vector<u64>
+     var $t6: u64
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 6
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t3 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  3: $t4 := 1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  4: $t2 := vector::borrow_mut<u64>($t3, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  5: goto 10
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  6: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  7: $t5 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+  8: $t6 := 0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+  9: $t2 := vector::borrow_mut<u64>($t5, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 10: label L2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 11: trace_local[x]($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
+ 12: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutRef::V): &mut u64 {
+     var $t2|tmp#$2: &mut u64
+     var $t3: &mut vector<u64>
+     var $t4: u64
+     var $t5: &mut vector<TestMutRef::T>
+     var $t6: u64
+     var $t7: &mut TestMutRef::T
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  0: if ($t0) goto 1 else goto 6
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  2: $t3 := borrow_field<TestMutRef::V>.is($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  3: $t4 := 1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  4: $t2 := vector::borrow_mut<u64>($t3, $t4)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
+  5: goto 11
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  6: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1)
+  7: $t5 := borrow_field<TestMutRef::V>.ts($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}
+  8: $t6 := 0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}
+  9: $t7 := vector::borrow_mut<TestMutRef::T>($t5, $t6)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t7)
+     # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t5) -> {([], Reference($t7))}
+     # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 10: $t2 := borrow_field<TestMutRef::T>.value($t7)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 11: label L2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 12: trace_local[x]($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
+ 13: return $t2
+}
+
+
+[variant baseline]
+fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T, $t2|y: &mut TestMutRef::R): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  0: if ($t0) goto 1 else goto 5
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  1: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  2: destroy($t2)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  3: $t3 := borrow_field<TestMutRef::T>.value($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1))}
+  4: goto 8
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  5: label L0
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  6: destroy($t1)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
+  7: $t3 := borrow_field<TestMutRef::R>.value($t2)
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+  8: label L2
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+  9: trace_local[x]($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+ 10: trace_local[y]($t2)
+     # live_nodes: LocalRoot($t0), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
+     # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
+ 11: return $t3
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun TestMutRef::return_ref_different_path[baseline]
+borrowed_by: Reference($t1) -> {(.value (u64), Return(0)), (.t (TestMutRef::T)/.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.value (u64), Reference($t1)), (.t (TestMutRef::T)/.value (u64), Reference($t1))}
+
+fun TestMutRef::return_ref_different_path_vec[baseline]
+borrowed_by: Reference($t1) -> {(.is (vector<u64>)/[], Return(0))}
+borrows_from: Return(0) -> {(.is (vector<u64>)/[], Reference($t1))}
+
+fun TestMutRef::return_ref_different_path_vec2[baseline]
+borrowed_by: Reference($t1) -> {(.is (vector<u64>)/[], Return(0)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.is (vector<u64>)/[], Reference($t1)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t1))}
+
+fun TestMutRef::return_ref_different_root[baseline]
+borrowed_by: Reference($t1) -> {(.value (u64), Return(0))}, Reference($t2) -> {(.value (u64), Return(0))}
+borrows_from: Return(0) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.move b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.move
new file mode 100644
index 000000000..aa26d69fb
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/borrow_strong/mut_ref.move
@@ -0,0 +1,117 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x1::TestMutRef {
+    use std::vector;
+
+    struct T has copy, drop { value: u64 }
+    struct R has copy, drop { value: u64 }
+    struct N has copy, drop { value: u64, t: T }
+
+    spec T { invariant value > 0; }
+
+    // Return reference with different root
+    // ====================================
+
+    fun return_ref_different_root(b: bool, x: &mut T, y: &mut R): &mut u64 {
+        if (b) &mut x.value else &mut y.value
+    }
+
+    fun call_return_ref_different_root(b: bool): (T, R) {
+        let x = T{value: 1};
+        let y = R{value: 10};
+        let r = return_ref_different_root(b, &mut x, &mut y);
+        *r = 5;
+        (x, y)
+    }
+    spec call_return_ref_different_root {
+        ensures b ==> result_1 == T{value: 5} && result_2 == R{value: 10};
+        ensures !b ==> result_1 == T{value: 1} && result_2 == R{value: 5};
+    }
+
+    // Return reference with different path
+    // ====================================
+
+    fun return_ref_different_path(b: bool, x: &mut N): &mut u64 {
+        if (b) &mut x.value else &mut x.t.value
+    }
+
+    fun call_return_ref_different_path(b: bool): N {
+        let x = N{value: 1, t: T{value: 2}};
+        let r = return_ref_different_path(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path {
+        ensures b ==> result == N{value: 5, t: T{value: 2}};
+        ensures !b ==> result == N{value: 1, t: T{value: 5}};
+    }
+
+    // Return reference with different path, vector
+    // ============================================
+
+    struct V has copy, drop { is: vector<u64>, ts: vector<T> }
+
+    // Different path into one vector
+
+    fun return_ref_different_path_vec(b: bool, x: &mut V): &mut u64 {
+        if (b) vector::borrow_mut(&mut x.is, 1)  else vector::borrow_mut(&mut x.is, 0)
+    }
+
+    fun call_return_ref_different_path_vec(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path_vec {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(5u64)), ts: vec()};
+        ensures !b ==> result == V{is: concat(vec(5u64), vec(2u64)), ts: vec()};
+    }
+
+    // Different path into a vector or a vector of structs subfield
+
+    fun return_ref_different_path_vec2(b: bool, x: &mut V): &mut u64 {
+        if (b) vector::borrow_mut(&mut x.is, 1) else &mut (vector::borrow_mut(&mut x.ts, 0)).value
+    }
+
+    fun call_return_ref_different_path_vec2(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        vector::push_back(&mut ts, T{value: 3});
+        vector::push_back(&mut ts, T{value: 4});
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec2(b, &mut x);
+        *r = 5;
+        x
+    }
+    spec call_return_ref_different_path_vec2 {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(5u64)), ts: concat(vec(T{value: 3}), vec(T{value: 4}))};
+        ensures !b ==> result == V{is: concat(vec(1u64), vec(2u64)), ts: concat(vec(T{value: 5}), vec(T{value: 4}))};
+    }
+
+    // Some as above but with invariant violation.
+
+    fun call_return_ref_different_path_vec2_incorrect(b: bool): V {
+        let is = vector::empty();
+        let ts = vector::empty();
+        vector::push_back(&mut is, 1);
+        vector::push_back(&mut is, 2);
+        vector::push_back(&mut ts, T{value: 3});
+        vector::push_back(&mut ts, T{value: 4});
+        let x = V{is, ts};
+        let r = return_ref_different_path_vec2(b, &mut x);
+        *r = 0;
+        x
+    }
+    spec call_return_ref_different_path_vec2_incorrect {
+        ensures b ==> result == V{is: concat(vec(1u64), vec(0u64)), ts: concat(vec(T{value: 3}), vec(T{value: 4}))};
+        ensures !b ==> result == V{is: concat(vec(1u64), vec(2u64)), ts: concat(vec(T{value: 0}), vec(T{value: 4}))};
+    }
+
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.exp b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.exp
new file mode 100644
index 000000000..48f882f11
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.exp
@@ -0,0 +1,92 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_borrow_mut_local(): Test::R<u64> {
+     var $t0|d#1#0: Test::R<u64>
+     var $t1|r#1#0: &mut Test::R<u64>
+     var $t2: u64
+     var $t3: u64
+     var $t4: Test::S
+     var $t5: u64
+     var $t6: Test::R<u64>
+     var $t7: &mut Test::R<u64>
+     var $t8: u64
+     var $t9: &mut Test::R<u64>
+     var $t10: &mut Test::S
+     var $t11: &mut u64
+     var $t12: u64
+     var $t13: &mut Test::R<u64>
+     var $t14: &mut u64
+     var $t15: Test::R<u64>
+  0: $t2 := 2
+  1: $t3 := 1
+  2: $t4 := pack Test::S($t3)
+  3: $t5 := 0
+  4: $t6 := pack Test::R<u64>($t2, $t4, $t5)
+  5: $t0 := $t6
+  6: $t7 := borrow_local($t0)
+  7: $t1 := $t7
+  8: $t8 := 2
+  9: $t9 := copy($t1)
+ 10: $t10 := borrow_field<Test::R<u64>>.s($t9)
+ 11: $t11 := borrow_field<Test::S>.y($t10)
+ 12: write_ref($t11, $t8)
+ 13: $t12 := 3
+ 14: $t13 := move($t1)
+ 15: $t14 := borrow_field<Test::R<u64>>.x($t13)
+ 16: write_ref($t14, $t12)
+ 17: $t15 := move($t0)
+ 18: return $t15
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_borrow_mut_local(): Test::R<u64> {
+     var $t0|d#1#0: Test::R<u64>
+     var $t1|r#1#0: &mut Test::R<u64>
+     var $t2: u64
+     var $t3: u64
+     var $t4: Test::S
+     var $t5: u64
+     var $t6: &mut Test::R<u64>
+     var $t7: u64
+     var $t8: &mut Test::S
+     var $t9: &mut u64
+     var $t10: u64
+     var $t11: &mut u64
+     var $t12: Test::R<u64>
+  0: $t2 := 2
+  1: $t3 := 1
+  2: $t4 := pack Test::S($t3)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:17:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:17:9+16
+  3: assert Gt(select Test::S.y($t4), 0)
+  4: $t5 := 0
+  5: $t0 := pack Test::R<u64>($t2, $t4, $t5)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:13:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:13:9+18
+  6: assert Gt(select Test::R.x($t0), select Test::S.y(select Test::R.s($t0)))
+  7: $t6 := borrow_local($t0)
+  8: $t7 := 2
+  9: $t8 := borrow_field<Test::R<u64>>.s($t6)
+ 10: $t9 := borrow_field<Test::S>.y($t8)
+ 11: write_ref($t9, $t7)
+ 12: write_back[Reference($t8).y (u64)]($t9)
+ 13: write_back[Reference($t6).s (Test::S)]($t8)
+ 14: $t10 := 3
+ 15: $t11 := borrow_field<Test::R<u64>>.x($t6)
+ 16: write_ref($t11, $t10)
+ 17: write_back[Reference($t6).x (u64)]($t11)
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:13:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:13:9+18
+ 18: assert Gt(select Test::R.x($t6), select Test::S.y(select Test::R.s($t6)))
+     # data invariant at tests/data_invariant_instrumentation/borrow.move:17:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/borrow.move:17:9+16
+ 19: assert Gt(select Test::S.y(select Test::R.s($t6)), 0)
+ 20: write_back[LocalRoot($t0)@]($t6)
+ 21: trace_local[d#1#0]($t0)
+ 22: $t12 := move($t0)
+ 23: label L1
+ 24: return $t12
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.move b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.move
new file mode 100644
index 000000000..5a2b2191e
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/borrow.move
@@ -0,0 +1,27 @@
+module 0x42::Test {
+    struct R<T> has key {
+        x: u64,
+        s: S,
+        t: T,
+    }
+
+    struct S has copy, drop, store {
+        y: u64
+    }
+
+    spec R {
+        invariant x > s.y;
+    }
+
+    spec S {
+        invariant y > 0;
+    }
+
+    public fun test_borrow_mut_local(): R<u64> {
+        let d = R{x: 2, s: S{y:1}, t: 0};
+        let r = &mut d;
+        r.s.y = 2;
+        r.x = 3;
+        d
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.exp b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.exp
new file mode 100644
index 000000000..afa97b826
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.exp
@@ -0,0 +1,36 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_pack(): Test::R {
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
+  3: $t3 := pack Test::R($t0, $t2)
+  4: return $t3
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_pack(): Test::R {
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
+     # data invariant at tests/data_invariant_instrumentation/pack.move:16:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:16:9+16
+  3: assert Gt(select Test::S.y($t2), 0)
+  4: $t3 := pack Test::R($t0, $t2)
+     # data invariant at tests/data_invariant_instrumentation/pack.move:12:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:12:9+18
+  5: assert Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3)))
+  6: label L1
+  7: return $t3
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.move b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.move
new file mode 100644
index 000000000..12acb45bf
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/pack.move
@@ -0,0 +1,24 @@
+module 0x42::Test {
+    struct R {
+        x: u64,
+        s: S,
+    }
+
+    struct S {
+        y: u64
+    }
+
+    spec R {
+        invariant x > s.y;
+    }
+
+    spec S {
+        invariant y > 0;
+    }
+
+    public fun test_pack() : R {
+        let s = S {y: 1};
+        let r = R {x: 3, s: s};
+        r
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.exp b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.exp
new file mode 100644
index 000000000..4ec2addfc
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.exp
@@ -0,0 +1,25 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test_param($t0|_simple_R: Test::R, $t1|_ref_R: &Test::R, $t2|_simple_S: Test::S, $t3|_mut_R: &mut Test::R) {
+  0: return ()
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test_param($t0|_simple_R: Test::R, $t1|_ref_R: Test::R, $t2|_simple_S: Test::S, $t3|_mut_R: &mut Test::R) {
+  0: assume And(WellFormed($t0), And(Gt(select Test::R.x($t0), select Test::S.y(select Test::R.s($t0))), Gt(select Test::S.y(select Test::R.s($t0)), 0)))
+  1: assume And(WellFormed($t1), And(Gt(select Test::R.x($t1), select Test::S.y(select Test::R.s($t1))), Gt(select Test::S.y(select Test::R.s($t1)), 0)))
+  2: assume And(WellFormed($t2), Gt(select Test::S.y($t2), 0))
+  3: assume And(WellFormed($t3), And(Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3))), Gt(select Test::S.y(select Test::R.s($t3)), 0)))
+  4: trace_local[_mut_R]($t3)
+     # data invariant at tests/data_invariant_instrumentation/params.move:12:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:12:9+18
+  5: assert Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3)))
+     # data invariant at tests/data_invariant_instrumentation/params.move:16:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:16:9+16
+  6: assert Gt(select Test::S.y(select Test::R.s($t3)), 0)
+  7: label L1
+  8: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.move b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.move
new file mode 100644
index 000000000..63f81fbcf
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/params.move
@@ -0,0 +1,20 @@
+module 0x42::Test {
+    struct R has drop {
+        x: u64,
+        s: S,
+    }
+
+    struct S has drop {
+        y: u64
+    }
+
+    spec R {
+        invariant x > s.y;
+    }
+
+    spec S {
+        invariant y > 0;
+    }
+
+    public fun test_param(_simple_R: R, _ref_R: &R, _simple_S: S, _mut_R: &mut R) {}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.exp b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.exp
new file mode 100644
index 000000000..50a023add
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.exp
@@ -0,0 +1,15 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::test($t0|_r: Test::R) {
+  0: return ()
+}
+
+============ after pipeline `data_invariant_instrumentation` ================
+
+[variant verification]
+public fun Test::test($t0|_r: Test::R) {
+  0: assume And(WellFormed($t0), forall $elem: select Test::R.s($t0): forall $elem: $elem: Gt(select Test::S.y($elem), 0))
+  1: label L1
+  2: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.move b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.move
new file mode 100644
index 000000000..0b13d1ec7
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/data_invariant_instrumentation/vector.move
@@ -0,0 +1,18 @@
+module 0x42::Test {
+
+    struct R has drop {
+        x: u64,
+        s: vector<vector<S>>,
+    }
+
+    struct S has drop {
+        y: u64
+    }
+
+    spec S {
+        invariant y > 0;
+    }
+
+    public fun test(_r: R) {
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.exp
new file mode 100644
index 000000000..c1a9c1aa8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.exp
@@ -0,0 +1,176 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateImmRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateImmRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test2(): u64 {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: &u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := borrow_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := read_ref($t4)
+  6: return $t5
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test3($t0|r_ref: &TestEliminateImmRefs::R): u64 {
+     var $t1: &TestEliminateImmRefs::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test4(): u64 {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: TestEliminateImmRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: destroy($t3)
+  5: $t4 := move($t0)
+  6: return $t4
+}
+
+============ after pipeline `eliminate_imm_refs` ================
+
+[variant baseline]
+fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateImmRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateImmRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test2(): u64 {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := get_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := move($t4)
+  6: return $t5
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test3($t0|r_ref: TestEliminateImmRefs::R): u64 {
+     var $t1: TestEliminateImmRefs::R
+     var $t2: u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := get_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := move($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test4(): u64 {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
+     var $t0|r#1#0: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: TestEliminateImmRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := move($t0)
+  5: return $t4
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.move
new file mode 100644
index 000000000..8dada99bc
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/eliminate_imm_refs/basic_test.move
@@ -0,0 +1,39 @@
+module 0x42::TestEliminateImmRefs {
+
+    struct R has copy, drop {
+        x: u64
+    }
+
+    fun test1() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        r
+    }
+
+    fun test2() : u64 {
+        let r = R {x: 3};
+        let r_ref = & r;
+        let x_ref = & r_ref.x;
+        *x_ref
+    }
+
+    fun test3(r_ref: &R) : u64 {
+        let x_ref = & r_ref.x;
+        *x_ref
+    }
+
+    fun test4() : u64 {
+        let r = R {x: 3};
+        let r_ref = & r;
+        test3(r_ref)
+    }
+
+    fun test5() : R {
+        let r = R {x: 3};
+        let p = &r;
+        let _ = p;
+        r
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.exp
new file mode 100644
index 000000000..a95f285aa
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.exp
@@ -0,0 +1,320 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun LeakInternalRefs::leak_immut_ref($t0|s: &LeakInternalRefs::S): &u64 {
+     var $t1: &LeakInternalRefs::S
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_in_branch($t0|b: bool, $t1|x: &mut u64, $t2|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     var $t4: bool
+     var $t5: &mut LeakInternalRefs::S
+     var $t6: &mut u64
+     var $t7: &mut u64
+     var $t8: &mut LeakInternalRefs::S
+     var $t9: &mut u64
+     var $t10: &mut u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t2)
+  4: destroy($t5)
+  5: $t6 := move($t1)
+  6: $t3 := $t6
+  7: goto 15
+  8: label L0
+  9: $t7 := move($t1)
+ 10: destroy($t7)
+ 11: $t8 := move($t2)
+ 12: $t9 := borrow_field<LeakInternalRefs::S>.f($t8)
+ 13: $t3 := $t9
+ 14: goto 15
+ 15: label L2
+ 16: $t10 := move($t3)
+ 17: return $t10
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_in_loop($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t2|i#1#0: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: bool
+     var $t7: u64
+     var $t8: u64
+     var $t9: bool
+     var $t10: &mut u64
+     var $t11: &mut LeakInternalRefs::S
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut LeakInternalRefs::S
+     var $t17: &mut u64
+  0: $t3 := 0
+  1: $t2 := $t3
+  2: goto 3
+  3: label L5
+  4: $t4 := copy($t2)
+  5: $t5 := 10
+  6: $t6 := <($t4, $t5)
+  7: if ($t6) goto 8 else goto 27
+  8: label L1
+  9: goto 10
+ 10: label L2
+ 11: $t7 := copy($t2)
+ 12: $t8 := 7
+ 13: $t9 := ==($t7, $t8)
+ 14: if ($t9) goto 15 else goto 21
+ 15: label L4
+ 16: $t10 := move($t0)
+ 17: destroy($t10)
+ 18: $t11 := move($t1)
+ 19: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
+ 20: return $t12
+ 21: label L3
+ 22: $t13 := move($t2)
+ 23: $t14 := 1
+ 24: $t15 := +($t13, $t14)
+ 25: $t2 := $t15
+ 26: goto 3
+ 27: label L0
+ 28: $t16 := move($t1)
+ 29: destroy($t16)
+ 30: $t17 := move($t0)
+ 31: return $t17
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_mut_ref($t0|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t1: &mut LeakInternalRefs::S
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_two_refs($t0|s: &mut LeakInternalRefs::S): (&mut u64, &mut u64) {
+     var $t1: &mut LeakInternalRefs::S
+     var $t2: &mut u64
+     var $t3: &mut LeakInternalRefs::S
+     var $t4: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: $t3 := move($t0)
+  3: $t4 := borrow_field<LeakInternalRefs::S>.g($t3)
+  4: return ($t2, $t4)
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::read_but_dont_leak($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t2: &mut LeakInternalRefs::S
+     var $t3: &mut u64
+     var $t4: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := borrow_field<LeakInternalRefs::S>.f($t2)
+  2: destroy($t3)
+  3: $t4 := move($t0)
+  4: return $t4
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+fun LeakInternalRefs::leak_immut_ref($t0|s: &LeakInternalRefs::S): &u64 {
+     var $t1: &LeakInternalRefs::S
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_in_branch($t0|b: bool, $t1|x: &mut u64, $t2|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t3|tmp#$3: &mut u64
+     var $t4: bool
+     var $t5: &mut LeakInternalRefs::S
+     var $t6: &mut u64
+     var $t7: &mut u64
+     var $t8: &mut LeakInternalRefs::S
+     var $t9: &mut u64
+     var $t10: &mut u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t2)
+  4: destroy($t5)
+  5: $t6 := move($t1)
+  6: $t3 := $t6
+  7: goto 15
+  8: label L0
+  9: $t7 := move($t1)
+ 10: destroy($t7)
+ 11: $t8 := move($t2)
+ 12: $t9 := borrow_field<LeakInternalRefs::S>.f($t8)
+ 13: $t3 := $t9
+ 14: goto 15
+ 15: label L2
+ 16: $t10 := move($t3)
+ 17: return $t10
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_in_loop($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t2|i#1#0: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: bool
+     var $t7: u64
+     var $t8: u64
+     var $t9: bool
+     var $t10: &mut u64
+     var $t11: &mut LeakInternalRefs::S
+     var $t12: &mut u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: &mut LeakInternalRefs::S
+     var $t17: &mut u64
+  0: $t3 := 0
+  1: $t2 := $t3
+  2: goto 3
+  3: label L5
+  4: $t4 := copy($t2)
+  5: $t5 := 10
+  6: $t6 := <($t4, $t5)
+  7: if ($t6) goto 8 else goto 27
+  8: label L1
+  9: goto 10
+ 10: label L2
+ 11: $t7 := copy($t2)
+ 12: $t8 := 7
+ 13: $t9 := ==($t7, $t8)
+ 14: if ($t9) goto 15 else goto 21
+ 15: label L4
+ 16: $t10 := move($t0)
+ 17: destroy($t10)
+ 18: $t11 := move($t1)
+ 19: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
+ 20: return $t12
+ 21: label L3
+ 22: $t13 := move($t2)
+ 23: $t14 := 1
+ 24: $t15 := +($t13, $t14)
+ 25: $t2 := $t15
+ 26: goto 3
+ 27: label L0
+ 28: $t16 := move($t1)
+ 29: destroy($t16)
+ 30: $t17 := move($t0)
+ 31: return $t17
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_mut_ref($t0|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t1: &mut LeakInternalRefs::S
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::leak_two_refs($t0|s: &mut LeakInternalRefs::S): (&mut u64, &mut u64) {
+     var $t1: &mut LeakInternalRefs::S
+     var $t2: &mut u64
+     var $t3: &mut LeakInternalRefs::S
+     var $t4: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_field<LeakInternalRefs::S>.f($t1)
+  2: $t3 := move($t0)
+  3: $t4 := borrow_field<LeakInternalRefs::S>.g($t3)
+  4: return ($t2, $t4)
+}
+
+
+[variant baseline]
+fun LeakInternalRefs::read_but_dont_leak($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs::S): &mut u64 {
+     var $t2: &mut LeakInternalRefs::S
+     var $t3: &mut u64
+     var $t4: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := borrow_field<LeakInternalRefs::S>.f($t2)
+  2: destroy($t3)
+  3: $t4 := move($t0)
+  4: return $t4
+}
+
+============ Diagnostics ================
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/return_internal_refs.move:13:5
+   │
+13 │ ╭     fun leak_two_refs(s: &mut S): (&mut u64, &mut u64) {
+14 │ │         (&mut s.f, &mut s.g)
+15 │ │     }
+   │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 1
+   ┌─ tests/escape_analysis/return_internal_refs.move:13:5
+   │
+13 │ ╭     fun leak_two_refs(s: &mut S): (&mut u64, &mut u64) {
+14 │ │         (&mut s.f, &mut s.g)
+15 │ │     }
+   │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 0
+  ┌─ tests/escape_analysis/return_internal_refs.move:5:5
+  │
+5 │ ╭     fun leak_mut_ref(s: &mut S): &mut u64 {
+6 │ │         &mut s.f
+7 │ │     }
+  │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/return_internal_refs.move:25:5
+   │
+25 │ ╭     fun leak_in_loop(x: &mut u64, s: &mut S): &mut u64 {
+26 │ │         let i = 0;
+27 │ │         while (i < 10) {
+28 │ │             if (i == 7) {
+   · │
+33 │ │         x
+34 │ │     }
+   │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/return_internal_refs.move:17:5
+   │
+17 │ ╭     fun leak_in_branch(b: bool, x: &mut u64, s: &mut S): &mut u64 {
+18 │ │         if (b) {
+19 │ │             x
+20 │ │         } else {
+21 │ │             &mut s.f
+22 │ │         }
+23 │ │     }
+   │ ╰─────^
+
+warning: Leaked immutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/return_internal_refs.move:9:5
+   │
+ 9 │ ╭     fun leak_immut_ref(s: &S): &u64 {
+10 │ │         &s.f
+11 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.move
new file mode 100644
index 000000000..9d5d2663d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_internal_refs.move
@@ -0,0 +1,41 @@
+module 0x1::LeakInternalRefs {
+
+    struct S { f: u64, g: u64 }
+
+    fun leak_mut_ref(s: &mut S): &mut u64 {
+        &mut s.f
+    }
+
+    fun leak_immut_ref(s: &S): &u64 {
+        &s.f
+    }
+
+    fun leak_two_refs(s: &mut S): (&mut u64, &mut u64) {
+        (&mut s.f, &mut s.g)
+    }
+
+    fun leak_in_branch(b: bool, x: &mut u64, s: &mut S): &mut u64 {
+        if (b) {
+            x
+        } else {
+            &mut s.f
+        }
+    }
+
+    fun leak_in_loop(x: &mut u64, s: &mut S): &mut u64 {
+        let i = 0;
+        while (i < 10) {
+            if (i == 7) {
+                return &mut s.f
+            };
+            i = i + 1;
+        };
+        x
+    }
+
+    fun read_but_dont_leak(x: &mut u64, s: &mut S): &mut u64 {
+        let _ = &mut s.f;
+        x
+    }
+
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.exp
new file mode 100644
index 000000000..9f3c465b9
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.exp
@@ -0,0 +1,228 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun ReturnRefsIntoVec::return_vec_index_immut($t0|v: &vector<u64>): &u64 {
+     var $t1: &vector<u64>
+     var $t2: u64
+     var $t3: &u64
+  0: $t1 := move($t0)
+  1: $t2 := 0
+  2: $t3 := vector::borrow<u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun ReturnRefsIntoVec::return_vec_index_mut($t0|v: &mut vector<u64>): &mut u64 {
+     var $t1: &mut vector<u64>
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := 0
+  2: $t3 := vector::borrow_mut<u64>($t1, $t2)
+  3: return $t3
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun ReturnRefsIntoVec::return_vec_index_immut($t0|v: &vector<u64>): &u64 {
+     var $t1: &vector<u64>
+     var $t2: u64
+     var $t3: &u64
+  0: $t1 := move($t0)
+  1: $t2 := 0
+  2: $t3 := vector::borrow<u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun ReturnRefsIntoVec::return_vec_index_mut($t0|v: &mut vector<u64>): &mut u64 {
+     var $t1: &mut vector<u64>
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := 0
+  2: $t3 := vector::borrow_mut<u64>($t1, $t2)
+  3: return $t3
+}
+
+============ Diagnostics ================
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/return_refs_into_vec.move:12:5
+   │
+12 │ ╭     fun return_vec_index_mut(v: &mut vector<u64>): &mut u64 {
+13 │ │         vector::borrow_mut(v, 0)
+14 │ │     }
+   │ ╰─────^
+
+warning: Leaked immutable module-internal reference via return value 0
+  ┌─ tests/escape_analysis/return_refs_into_vec.move:7:5
+  │
+7 │ ╭     fun return_vec_index_immut(v: &vector<u64>): &u64 {
+8 │ │         vector::borrow(v, 0)
+9 │ │     }
+  │ ╰─────^
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.move
new file mode 100644
index 000000000..f6518eabc
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_into_vec.move
@@ -0,0 +1,16 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x1::ReturnRefsIntoVec {
+    use std::vector;
+
+    // should not complain
+    fun return_vec_index_immut(v: &vector<u64>): &u64 {
+        vector::borrow(v, 0)
+    }
+
+    // should complain
+    fun return_vec_index_mut(v: &mut vector<u64>): &mut u64 {
+        vector::borrow_mut(v, 0)
+    }
+
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.exp
new file mode 100644
index 000000000..40ecdb6f0
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.exp
@@ -0,0 +1,85 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun ReturnRefsSafe::return_freeze($t0|x: &mut u64): &u64 {
+     var $t1: &mut u64
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := freeze_ref($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_immut($t0|x: &u64): &u64 {
+     var $t1: &u64
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_mut($t0|x: &mut u64): &mut u64 {
+     var $t1: &mut u64
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_vec_immut($t0|v: &vector<u64>): &vector<u64> {
+     var $t1: &vector<u64>
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_vec_mut($t0|v: &mut vector<u64>): &mut vector<u64> {
+     var $t1: &mut vector<u64>
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+fun ReturnRefsSafe::return_freeze($t0|x: &mut u64): &u64 {
+     var $t1: &mut u64
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := freeze_ref($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_immut($t0|x: &u64): &u64 {
+     var $t1: &u64
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_mut($t0|x: &mut u64): &mut u64 {
+     var $t1: &mut u64
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_vec_immut($t0|v: &vector<u64>): &vector<u64> {
+     var $t1: &vector<u64>
+  0: $t1 := move($t0)
+  1: return $t1
+}
+
+
+[variant baseline]
+fun ReturnRefsSafe::return_vec_mut($t0|v: &mut vector<u64>): &mut vector<u64> {
+     var $t1: &mut vector<u64>
+  0: $t1 := move($t0)
+  1: return $t1
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.move
new file mode 100644
index 000000000..0398e9019
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/return_refs_safe.move
@@ -0,0 +1,25 @@
+module 0x1::ReturnRefsSafe {
+    // Make sure the analysis doesn't complain about returning
+    // refs to formals or their children
+
+    fun return_immut(x: &u64): &u64 {
+        x
+    }
+
+    fun return_mut(x: &mut u64): &mut u64 {
+        x
+    }
+
+    fun return_freeze(x: &mut u64): &u64 {
+        x
+    }
+
+    fun return_vec_immut(v: &vector<u64>): &vector<u64> {
+        v
+    }
+
+    fun return_vec_mut(v: &mut vector<u64>): &mut vector<u64> {
+        v
+    }
+
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.exp
new file mode 100644
index 000000000..0115142a0
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.exp
@@ -0,0 +1,50 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun StructEq::leak_f($t0|s: &mut StructEq::S): &mut u64 {
+     var $t1: &mut StructEq::S
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructEq::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun StructEq::new(): StructEq::S {
+     var $t0: u64
+     var $t1: StructEq::S
+  0: $t0 := 10
+  1: $t1 := pack StructEq::S($t0)
+  2: return $t1
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+public fun StructEq::leak_f($t0|s: &mut StructEq::S): &mut u64 {
+     var $t1: &mut StructEq::S
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructEq::S>.f($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun StructEq::new(): StructEq::S {
+     var $t0: u64
+     var $t1: StructEq::S
+  0: $t0 := 10
+  1: $t1 := pack StructEq::S($t0)
+  2: return $t1
+}
+
+============ Diagnostics ================
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/struct_eq.move:12:5
+   │
+12 │ ╭     public fun leak_f(s: &mut S): &mut u64 {
+13 │ │         &mut s.f
+14 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.move
new file mode 100644
index 000000000..33b9ff480
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_eq.move
@@ -0,0 +1,15 @@
+module 0x1::StructEq {
+
+    struct S { f: u64 }
+
+    invariant forall s: S: s == S { f: 10 };
+
+    public fun new(): S {
+        S { f: 10 }
+    }
+
+    // should complain
+    public fun leak_f(s: &mut S): &mut u64 {
+        &mut s.f
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.exp
new file mode 100644
index 000000000..27801d2d0
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.exp
@@ -0,0 +1,110 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun StructSpecRelevance::create($t0|i: u64, $t1|j: u64): StructSpecRelevance::Nonzero {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: StructSpecRelevance::Nonzero
+  0: $t2 := copy($t0)
+  1: $t3 := 0
+  2: $t4 := >($t2, $t3)
+  3: if ($t4) goto 4 else goto 6
+  4: label L1
+  5: goto 9
+  6: label L0
+  7: $t5 := 0
+  8: abort($t5)
+  9: label L2
+ 10: $t6 := move($t0)
+ 11: $t7 := move($t1)
+ 12: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
+ 13: return $t8
+}
+
+
+[variant baseline]
+public fun StructSpecRelevance::leak_i_bad($t0|n: &mut StructSpecRelevance::Nonzero): &mut u64 {
+     var $t1: &mut StructSpecRelevance::Nonzero
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructSpecRelevance::Nonzero>.i($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun StructSpecRelevance::leak_j_ok($t0|n: &mut StructSpecRelevance::Nonzero): &mut u64 {
+     var $t1: &mut StructSpecRelevance::Nonzero
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructSpecRelevance::Nonzero>.j($t1)
+  2: return $t2
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+public fun StructSpecRelevance::create($t0|i: u64, $t1|j: u64): StructSpecRelevance::Nonzero {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: StructSpecRelevance::Nonzero
+  0: $t2 := copy($t0)
+  1: $t3 := 0
+  2: $t4 := >($t2, $t3)
+  3: if ($t4) goto 4 else goto 6
+  4: label L1
+  5: goto 9
+  6: label L0
+  7: $t5 := 0
+  8: abort($t5)
+  9: label L2
+ 10: $t6 := move($t0)
+ 11: $t7 := move($t1)
+ 12: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
+ 13: return $t8
+}
+
+
+[variant baseline]
+public fun StructSpecRelevance::leak_i_bad($t0|n: &mut StructSpecRelevance::Nonzero): &mut u64 {
+     var $t1: &mut StructSpecRelevance::Nonzero
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructSpecRelevance::Nonzero>.i($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun StructSpecRelevance::leak_j_ok($t0|n: &mut StructSpecRelevance::Nonzero): &mut u64 {
+     var $t1: &mut StructSpecRelevance::Nonzero
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<StructSpecRelevance::Nonzero>.j($t1)
+  2: return $t2
+}
+
+============ Diagnostics ================
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/struct_spec_relevance.move:14:5
+   │
+14 │ ╭     public fun leak_j_ok(n: &mut Nonzero): &mut u64 {
+15 │ │         &mut n.j
+16 │ │     }
+   │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/struct_spec_relevance.move:9:5
+   │
+ 9 │ ╭     public fun leak_i_bad(n: &mut Nonzero): &mut u64 {
+10 │ │         &mut n.i
+11 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.move
new file mode 100644
index 000000000..8bb7c553d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/struct_spec_relevance.move
@@ -0,0 +1,22 @@
+module 0x1::StructSpecRelevance {
+    struct Nonzero { i: u64, j: u64 }
+
+    spec Nonzero {
+        invariant i > 0;
+    }
+
+    // Can't leak i because it's involved in a spec
+    public fun leak_i_bad(n: &mut Nonzero): &mut u64 {
+        &mut n.i
+    }
+
+    // Leaking j is ok because specs say nothing about it
+    public fun leak_j_ok(n: &mut Nonzero): &mut u64 {
+        &mut n.j
+    }
+
+    public fun create(i: u64, j: u64): Nonzero {
+        assert!(i > 0, 0);
+        Nonzero { i, j }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.exp b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.exp
new file mode 100644
index 000000000..8a8d6ec3b
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.exp
@@ -0,0 +1,252 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun VecEq::leak_index_into_v($t0|g: &mut VecEq::G): &mut u64 {
+     var $t1: &mut VecEq::G
+     var $t2: &mut vector<u64>
+     var $t3: u64
+     var $t4: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<VecEq::G>.v($t1)
+  2: $t3 := 0
+  3: $t4 := vector::borrow_mut<u64>($t2, $t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+public fun VecEq::leak_v($t0|g: &mut VecEq::G): &mut vector<u64> {
+     var $t1: &mut VecEq::G
+     var $t2: &mut vector<u64>
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<VecEq::G>.v($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun VecEq::new(): VecEq::G {
+     var $t0: u64
+     var $t1: vector<u64>
+     var $t2: VecEq::G
+  0: $t0 := 10
+  1: $t1 := vector::singleton<u64>($t0)
+  2: $t2 := pack VecEq::G($t1)
+  3: return $t2
+}
+
+============ after pipeline `escape_analysis` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public fun VecEq::leak_index_into_v($t0|g: &mut VecEq::G): &mut u64 {
+     var $t1: &mut VecEq::G
+     var $t2: &mut vector<u64>
+     var $t3: u64
+     var $t4: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<VecEq::G>.v($t1)
+  2: $t3 := 0
+  3: $t4 := vector::borrow_mut<u64>($t2, $t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+public fun VecEq::leak_v($t0|g: &mut VecEq::G): &mut vector<u64> {
+     var $t1: &mut VecEq::G
+     var $t2: &mut vector<u64>
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<VecEq::G>.v($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+public fun VecEq::new(): VecEq::G {
+     var $t0: u64
+     var $t1: vector<u64>
+     var $t2: VecEq::G
+  0: $t0 := 10
+  1: $t1 := vector::singleton<u64>($t0)
+  2: $t2 := pack VecEq::G($t1)
+  3: return $t2
+}
+
+============ Diagnostics ================
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/vec_eq.move:17:5
+   │
+17 │ ╭     public fun leak_v(g: &mut G): &mut vector<u64> {
+18 │ │         &mut g.v
+19 │ │     }
+   │ ╰─────^
+
+error: Leaked mutable module-internal reference via return value 0
+   ┌─ tests/escape_analysis/vec_eq.move:22:5
+   │
+22 │ ╭     public fun leak_index_into_v(g: &mut G): &mut u64 {
+23 │ │         vector::borrow_mut(&mut g.v, 0)
+24 │ │     }
+   │ ╰─────^
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.move b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.move
new file mode 100644
index 000000000..7af005e69
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/escape_analysis/vec_eq.move
@@ -0,0 +1,25 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x1::VecEq {
+    use std::vector;
+
+    struct G { v: vector<u64> }
+
+    spec G {
+        invariant v == vec<u64>(10);
+    }
+
+    public fun new(): G {
+        G { v: vector::singleton(10) }
+    }
+
+    // should complain
+    public fun leak_v(g: &mut G): &mut vector<u64> {
+        &mut g.v
+    }
+
+    // should also complain
+    public fun leak_index_into_v(g: &mut G): &mut u64 {
+        vector::borrow_mut(&mut g.v, 0)
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.exp
new file mode 100644
index 000000000..7c4c9b025
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.exp
@@ -0,0 +1,349 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun signer::address_of($t0|s: &signer): address {
+     var $t1: &signer
+     var $t2: &address
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := signer::borrow_address($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public native fun signer::borrow_address($t0|s: &signer): &address;
+
+
+[variant baseline]
+fun SmokeTest::arithmetic_ops($t0|a: u64): (u64, u64) {
+     var $t1|c#1#0: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: bool
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := 2
+  1: $t1 := $t2
+  2: $t3 := copy($t1)
+  3: $t4 := 2
+  4: $t5 := !=($t3, $t4)
+  5: if ($t5) goto 6 else goto 9
+  6: label L1
+  7: $t6 := 42
+  8: abort($t6)
+  9: label L0
+ 10: $t7 := move($t1)
+ 11: $t8 := move($t0)
+ 12: return ($t7, $t8)
+}
+
+
+[variant baseline]
+fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
+     var $t2|tmp#$2: bool
+     var $t3|tmp#$3: bool
+     var $t4|c#1#0: bool
+     var $t5|d#1#0: bool
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: u64
+     var $t10: u64
+     var $t11: bool
+     var $t12: bool
+     var $t13: bool
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: bool
+     var $t18: u64
+     var $t19: u64
+     var $t20: bool
+     var $t21: bool
+     var $t22: bool
+     var $t23: bool
+     var $t24: bool
+     var $t25: bool
+     var $t26: u64
+     var $t27: bool
+     var $t28: bool
+  0: $t6 := copy($t0)
+  1: $t7 := copy($t1)
+  2: $t8 := >($t6, $t7)
+  3: if ($t8) goto 4 else goto 10
+  4: label L1
+  5: $t9 := copy($t0)
+  6: $t10 := copy($t1)
+  7: $t11 := >=($t9, $t10)
+  8: $t2 := $t11
+  9: goto 14
+ 10: label L0
+ 11: $t12 := false
+ 12: $t2 := $t12
+ 13: goto 14
+ 14: label L2
+ 15: $t13 := move($t2)
+ 16: $t4 := $t13
+ 17: $t14 := copy($t0)
+ 18: $t15 := copy($t1)
+ 19: $t16 := <($t14, $t15)
+ 20: if ($t16) goto 21 else goto 25
+ 21: label L4
+ 22: $t17 := true
+ 23: $t3 := $t17
+ 24: goto 31
+ 25: label L3
+ 26: $t18 := move($t0)
+ 27: $t19 := move($t1)
+ 28: $t20 := <=($t18, $t19)
+ 29: $t3 := $t20
+ 30: goto 31
+ 31: label L5
+ 32: $t21 := move($t3)
+ 33: $t5 := $t21
+ 34: $t22 := copy($t4)
+ 35: $t23 := copy($t5)
+ 36: $t24 := !=($t22, $t23)
+ 37: $t25 := !($t24)
+ 38: if ($t25) goto 39 else goto 42
+ 39: label L7
+ 40: $t26 := 42
+ 41: abort($t26)
+ 42: label L6
+ 43: $t27 := move($t4)
+ 44: $t28 := move($t5)
+ 45: return ($t27, $t28)
+}
+
+
+[variant baseline]
+fun SmokeTest::identity($t0|a: SmokeTest::A, $t1|b: SmokeTest::B, $t2|c: SmokeTest::C): (SmokeTest::A, SmokeTest::B, SmokeTest::C) {
+     var $t3: SmokeTest::A
+     var $t4: SmokeTest::B
+     var $t5: SmokeTest::C
+  0: $t3 := move($t0)
+  1: $t4 := move($t1)
+  2: $t5 := move($t2)
+  3: return ($t3, $t4, $t5)
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_A($t0|a: address, $t1|va: u64): SmokeTest::A {
+     var $t2: address
+     var $t3: u64
+     var $t4: SmokeTest::A
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack SmokeTest::A($t2, $t3)
+  3: return $t4
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): SmokeTest::B {
+     var $t3|var_a#1#0: SmokeTest::A
+     var $t4: address
+     var $t5: u64
+     var $t6: SmokeTest::A
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: SmokeTest::B
+  0: $t4 := move($t0)
+  1: $t5 := move($t1)
+  2: $t6 := pack SmokeTest::A($t4, $t5)
+  3: $t3 := $t6
+  4: $t7 := move($t2)
+  5: $t8 := move($t3)
+  6: $t9 := pack SmokeTest::B($t7, $t8)
+  7: return $t9
+}
+
+
+[variant baseline]
+fun SmokeTest::pack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64): SmokeTest::C {
+     var $t4|var_a#1#0: SmokeTest::A
+     var $t5|var_b#1#0: SmokeTest::B
+     var $t6: address
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: u64
+     var $t10: SmokeTest::A
+     var $t11: SmokeTest::B
+     var $t12: u64
+     var $t13: SmokeTest::B
+     var $t14: SmokeTest::C
+  0: $t6 := move($t0)
+  1: $t7 := move($t1)
+  2: $t8 := pack SmokeTest::A($t6, $t7)
+  3: $t4 := $t8
+  4: $t9 := move($t2)
+  5: $t10 := move($t4)
+  6: $t11 := pack SmokeTest::B($t9, $t10)
+  7: $t5 := $t11
+  8: $t12 := move($t3)
+  9: $t13 := move($t5)
+ 10: $t14 := pack SmokeTest::C($t12, $t13)
+ 11: return $t14
+}
+
+
+[variant baseline]
+fun SmokeTest::ref_A($t0|a: address, $t1|b: bool): SmokeTest::A {
+     var $t2|tmp#$2: SmokeTest::A
+     var $t3|var_a#1#0: SmokeTest::A
+     var $t4: bool
+     var $t5: address
+     var $t6: u64
+     var $t7: SmokeTest::A
+     var $t8: address
+     var $t9: u64
+     var $t10: SmokeTest::A
+     var $t11: SmokeTest::A
+     var $t12: &SmokeTest::A
+     var $t13: &u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: u64
+     var $t18: SmokeTest::A
+  0: $t4 := move($t1)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t0)
+  4: $t6 := 1
+  5: $t7 := pack SmokeTest::A($t5, $t6)
+  6: $t2 := $t7
+  7: goto 14
+  8: label L0
+  9: $t8 := move($t0)
+ 10: $t9 := 42
+ 11: $t10 := pack SmokeTest::A($t8, $t9)
+ 12: $t2 := $t10
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t2)
+ 16: $t3 := $t11
+ 17: $t12 := borrow_local($t3)
+ 18: $t13 := borrow_field<SmokeTest::A>.val($t12)
+ 19: $t14 := read_ref($t13)
+ 20: $t15 := 42
+ 21: $t16 := !=($t14, $t15)
+ 22: if ($t16) goto 23 else goto 26
+ 23: label L4
+ 24: $t17 := 42
+ 25: abort($t17)
+ 26: label L3
+ 27: $t18 := move($t3)
+ 28: return $t18
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_A($t0|a: address, $t1|va: u64): (address, u64) {
+     var $t2: address
+     var $t3: u64
+     var $t4: SmokeTest::A
+     var $t5: address
+     var $t6: u64
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack SmokeTest::A($t2, $t3)
+  3: ($t5, $t6) := unpack SmokeTest::A($t4)
+  4: return ($t5, $t6)
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): (address, u64, u64) {
+     var $t3|aa#1#0: address
+     var $t4|v1#1#0: u64
+     var $t5|v2#1#0: u64
+     var $t6|var_a#1#0: SmokeTest::A
+     var $t7: address
+     var $t8: u64
+     var $t9: SmokeTest::A
+     var $t10: u64
+     var $t11: SmokeTest::A
+     var $t12: SmokeTest::B
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: address
+     var $t16: u64
+     var $t17: address
+     var $t18: u64
+     var $t19: u64
+  0: $t7 := move($t0)
+  1: $t8 := move($t1)
+  2: $t9 := pack SmokeTest::A($t7, $t8)
+  3: $t6 := $t9
+  4: $t10 := move($t2)
+  5: $t11 := move($t6)
+  6: $t12 := pack SmokeTest::B($t10, $t11)
+  7: ($t13, $t14) := unpack SmokeTest::B($t12)
+  8: ($t15, $t16) := unpack SmokeTest::A($t14)
+  9: $t4 := $t16
+ 10: $t3 := $t15
+ 11: $t5 := $t13
+ 12: $t17 := move($t3)
+ 13: $t18 := move($t4)
+ 14: $t19 := move($t5)
+ 15: return ($t17, $t18, $t19)
+}
+
+
+[variant baseline]
+fun SmokeTest::unpack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64): (address, u64, u64, u64) {
+     var $t4|aa#1#0: address
+     var $t5|v1#1#0: u64
+     var $t6|v2#1#0: u64
+     var $t7|v3#1#0: u64
+     var $t8|var_a#1#0: SmokeTest::A
+     var $t9|var_b#1#0: SmokeTest::B
+     var $t10: address
+     var $t11: u64
+     var $t12: SmokeTest::A
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: SmokeTest::B
+     var $t16: u64
+     var $t17: SmokeTest::B
+     var $t18: SmokeTest::C
+     var $t19: u64
+     var $t20: SmokeTest::B
+     var $t21: u64
+     var $t22: SmokeTest::A
+     var $t23: address
+     var $t24: u64
+     var $t25: address
+     var $t26: u64
+     var $t27: u64
+     var $t28: u64
+  0: $t10 := move($t0)
+  1: $t11 := move($t1)
+  2: $t12 := pack SmokeTest::A($t10, $t11)
+  3: $t8 := $t12
+  4: $t13 := move($t2)
+  5: $t14 := move($t8)
+  6: $t15 := pack SmokeTest::B($t13, $t14)
+  7: $t9 := $t15
+  8: $t16 := move($t3)
+  9: $t17 := move($t9)
+ 10: $t18 := pack SmokeTest::C($t16, $t17)
+ 11: ($t19, $t20) := unpack SmokeTest::C($t18)
+ 12: ($t21, $t22) := unpack SmokeTest::B($t20)
+ 13: ($t23, $t24) := unpack SmokeTest::A($t22)
+ 14: $t5 := $t24
+ 15: $t4 := $t23
+ 16: $t6 := $t21
+ 17: $t7 := $t19
+ 18: $t25 := move($t4)
+ 19: $t26 := move($t5)
+ 20: $t27 := move($t6)
+ 21: $t28 := move($t7)
+ 22: return ($t25, $t26, $t27, $t28)
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.move b/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.move
new file mode 100644
index 000000000..92acb6be1
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/smoke_test.move
@@ -0,0 +1,93 @@
+// This module contains just some arbitrary code to smoke test the basic functionality of translation from Move
+// to stackless bytecode. Coverage for byte code translation is achieved by many more tests in the prover.
+
+// dep: ../move-stdlib/sources/signer.move
+
+module 0x42::SmokeTest {
+    // -----------------
+    // Basic Ops
+    // -----------------
+
+	fun bool_ops(a: u64, b: u64): (bool, bool) {
+        let c: bool;
+        let d: bool;
+        c = a > b && a >= b;
+        d = a < b || a <= b;
+        if (!(c != d)) abort 42;
+        (c, d)
+    }
+
+	fun arithmetic_ops(a: u64): (u64, u64) {
+        let c: u64;
+        c = (6 + 4 - 1) * 2 / 3 % 4;
+        if (c != 2) abort 42;
+        (c, a)
+    }
+
+    struct A {
+        addr: address,
+        val: u64,
+    }
+
+    struct B {
+        val: u64,
+        a: A,
+    }
+
+    struct C {
+        val: u64,
+        b: B,
+    }
+
+    fun identity(a: A, b: B, c: C): (A,B,C) {
+        (a, b, c)
+    }
+
+    fun pack_A(a: address, va: u64): A {
+        A{ addr:a, val:va }
+    }
+
+    fun pack_B(a: address, va: u64, vb: u64): B {
+        let var_a = A{ addr: a, val: va };
+        let var_b = B{ val: vb, a: var_a };
+        var_b
+    }
+
+    fun pack_C(a: address, va: u64, vb: u64, vc: u64): C {
+        let var_a = A{ addr: a, val: va };
+        let var_b = B{ val: vb, a: var_a };
+        let var_c = C{ val: vc, b: var_b };
+        var_c
+    }
+
+    fun unpack_A(a: address, va: u64): (address, u64) {
+        let var_a = A{ addr:a, val:va };
+        let A{addr: aa, val:v1} = var_a;
+        (aa, v1)
+    }
+
+    fun unpack_B(a: address, va: u64, vb: u64): (address, u64, u64) {
+        let var_a = A{ addr: a, val: va };
+        let var_b = B{ val: vb, a: var_a };
+        let B{val: v2, a: A{ addr:aa, val: v1}} = var_b;
+        (aa, v1, v2)
+    }
+
+    fun unpack_C(a: address, va: u64, vb: u64, vc: u64): (address, u64, u64, u64) {
+        let var_a = A{ addr: a, val: va };
+        let var_b = B{ val: vb, a: var_a };
+        let var_c = C{ val: vc, b: var_b };
+        let C{val: v3, b: B{val: v2, a: A{ addr:aa, val: v1}}} = var_c;
+        (aa, v1, v2, v3)
+    }
+
+    fun ref_A(a: address, b: bool): A {
+        let var_a = if (b) A{ addr: a, val: 1 }
+                    else A{ addr: a, val: 42 };
+        let var_a_ref = &var_a;
+        let b_val_ref = &var_a_ref.val;
+        let b_var = *b_val_ref;
+        if (b_var != 42) abort 42;
+        var_a
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.exp b/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.exp
new file mode 100644
index 000000000..88e1b586c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.exp
@@ -0,0 +1,92 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestSpecBlock::looping($t0|x: u64): u64 {
+     var $t1: u64
+     var $t2: u64
+     var $t3: bool
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: assume Le($t0, 10)
+  1: goto 2
+  2: label L3
+  3: $t1 := copy($t0)
+  4: $t2 := 10
+  5: $t3 := <($t1, $t2)
+  6: if ($t3) goto 7 else goto 16
+  7: label L1
+  8: goto 9
+  9: label L2
+ 10: assume Lt($t0, 10)
+ 11: $t4 := move($t0)
+ 12: $t5 := 1
+ 13: $t6 := +($t4, $t5)
+ 14: $t0 := $t6
+ 15: goto 2
+ 16: label L0
+ 17: assert Eq<u64>($t0, 10)
+ 18: $t7 := move($t0)
+ 19: return $t7
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple1($t0|x: u64, $t1|y: u64) {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: bool
+     var $t6: u64
+  0: $t2 := copy($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := >($t2, $t3)
+  3: $t5 := !($t4)
+  4: if ($t5) goto 5 else goto 8
+  5: label L1
+  6: $t6 := 1
+  7: abort($t6)
+  8: label L0
+  9: assert Gt($t0, $t1)
+ 10: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple2($t0|x: u64) {
+     var $t1|y#1#0: u64
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := 1
+  2: $t4 := +($t2, $t3)
+  3: $t1 := $t4
+  4: assert Eq<u64>($t0, Sub($t1, 1))
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple3($t0|x: u64, $t1|y: u64) {
+  0: assume Gt($t0, $t1)
+  1: assert Ge($t0, $t1)
+  2: return ()
+}
+
+
+[variant baseline]
+fun TestSpecBlock::simple4($t0|x: u64, $t1|y: u64) {
+     var $t2|z#1#0: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t3 := copy($t0)
+  1: $t4 := copy($t1)
+  2: $t5 := +($t3, $t4)
+  3: $t2 := $t5
+  4: assume Gt($t0, $t1)
+  5: assert Gt($t2, Mul(2, $t1))
+  6: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.move b/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.move
new file mode 100644
index 000000000..eeac65163
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/specs-in-fun.move
@@ -0,0 +1,43 @@
+module 0x42::TestSpecBlock {
+
+    fun simple1(x: u64, y: u64) {
+        if (!(x > y)) abort 1;
+        spec {
+            assert x > y;
+        }
+    }
+
+    fun simple2(x: u64) {
+        let y: u64;
+        y = x + 1;
+        spec {
+            assert x == y - 1;
+        }
+    }
+
+    fun simple3(x: u64, y: u64) {
+        spec {
+            assume x > y;
+            assert x >= y;
+        }
+    }
+
+    fun simple4(x: u64, y: u64) {
+        let z: u64;
+        z = x + y;
+        spec {
+            assume x > y;
+            assert z > 2*y;
+        }
+    }
+
+    fun looping(x: u64): u64 {
+        spec { assume x <= 10; };
+        while (x < 10) {
+          spec { assume x < 10; };
+          x = x + 1;
+        };
+        spec { assert x == 10; };
+        x
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.exp b/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.exp
new file mode 100644
index 000000000..ed141a4ed
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.exp
@@ -0,0 +1,115 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v#1#0: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun M::f() {
+     var $t0|v#1#0: vector<u8>
+     var $t1: u8
+     var $t2: u8
+     var $t3: vector<u8>
+     var $t4: &mut vector<u8>
+     var $t5: &vector<u8>
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: u64
+  0: $t1 := 0
+  1: $t2 := 0
+  2: $t3 := vector::empty<u8>()
+  3: $t4 := borrow_local($t3)
+  4: vector::push_back<u8>($t4, $t1)
+  5: vector::push_back<u8>($t4, $t2)
+  6: $t0 := $t3
+  7: $t5 := borrow_local($t0)
+  8: $t6 := vector::length<u8>($t5)
+  9: $t7 := 1
+ 10: $t8 := ==($t6, $t7)
+ 11: if ($t8) goto 12 else goto 14
+ 12: label L1
+ 13: goto 17
+ 14: label L0
+ 15: $t9 := 0
+ 16: abort($t9)
+ 17: label L2
+ 18: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.move b/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.move
new file mode 100644
index 000000000..994e4a277
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/from_move/vector_instructions.move
@@ -0,0 +1,16 @@
+// dep: ../move-stdlib/sources/vector.move
+
+module 0x42::M {
+    use std::vector;
+    const ZERO: u8 = 0;
+
+    fun f() {
+        let v = vector[ZERO, ZERO];
+        let len = vector::length(&v);
+        assert!(len == 1, 0);
+    }
+
+    spec f {
+        aborts_if true;
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.exp
new file mode 100644
index 000000000..1139a9501
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.exp
@@ -0,0 +1,237 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestLiveVars::test1($t0|r_ref: &TestLiveVars::R): u64 {
+     var $t1: &TestLiveVars::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestLiveVars::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun TestLiveVars::test2($t0|b: bool): u64 {
+     var $t1|r1#1#0: TestLiveVars::R
+     var $t2|r2#1#0: TestLiveVars::R
+     var $t3|r_ref#1#0: &TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: &TestLiveVars::R
+     var $t9: bool
+     var $t10: &TestLiveVars::R
+     var $t11: &TestLiveVars::R
+     var $t12: &TestLiveVars::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestLiveVars::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestLiveVars::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: destroy($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := TestLiveVars::test1($t12)
+ 19: return $t13
+}
+
+
+[variant baseline]
+fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: &TestLiveVars::R): u64 {
+     var $t2|r1#1#0: TestLiveVars::R
+     var $t3|r2#1#0: TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: u64
+     var $t9: u64
+     var $t10: bool
+     var $t11: &TestLiveVars::R
+     var $t12: u64
+     var $t13: u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: &TestLiveVars::R
+     var $t18: &TestLiveVars::R
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
+     var $t22: &TestLiveVars::R
+     var $t23: u64
+  0: $t4 := 3
+  1: $t5 := pack TestLiveVars::R($t4)
+  2: $t2 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestLiveVars::R($t6)
+  5: $t3 := $t7
+  6: goto 7
+  7: label L6
+  8: $t8 := 0
+  9: $t9 := copy($t0)
+ 10: $t10 := <($t8, $t9)
+ 11: if ($t10) goto 12 else goto 37
+ 12: label L1
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t1)
+ 16: destroy($t11)
+ 17: $t12 := copy($t0)
+ 18: $t13 := 2
+ 19: $t14 := /($t12, $t13)
+ 20: $t15 := 0
+ 21: $t16 := ==($t14, $t15)
+ 22: if ($t16) goto 23 else goto 27
+ 23: label L4
+ 24: $t17 := borrow_local($t2)
+ 25: $t1 := $t17
+ 26: goto 31
+ 27: label L3
+ 28: $t18 := borrow_local($t3)
+ 29: $t1 := $t18
+ 30: goto 31
+ 31: label L5
+ 32: $t19 := move($t0)
+ 33: $t20 := 1
+ 34: $t21 := -($t19, $t20)
+ 35: $t0 := $t21
+ 36: goto 7
+ 37: label L0
+ 38: $t22 := move($t1)
+ 39: $t23 := TestLiveVars::test1($t22)
+ 40: return $t23
+}
+
+============ after pipeline `livevar` ================
+
+[variant baseline]
+fun TestLiveVars::test1($t0|r_ref: TestLiveVars::R): u64 {
+     var $t1: u64
+     # live vars: r_ref
+  0: $t1 := get_field<TestLiveVars::R>.x($t0)
+     # live vars: $t1
+  1: return $t1
+}
+
+
+[variant baseline]
+fun TestLiveVars::test2($t0|b: bool): u64 {
+     var $t1|r1#1#0: TestLiveVars::R
+     var $t2|r2#1#0: TestLiveVars::R
+     var $t3|r_ref#1#0: TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: u64
+     # live vars: b
+  0: $t4 := 3
+     # live vars: b, $t4
+  1: $t5 := pack TestLiveVars::R($t4)
+     # live vars: b, $t5
+  2: $t6 := 4
+     # live vars: b, $t5, $t6
+  3: $t7 := pack TestLiveVars::R($t6)
+     # live vars: b, $t5, $t7
+  4: $t3 := $t5
+     # live vars: b, r_ref#1#0, $t7
+  5: if ($t0) goto 6 else goto 8
+     # live vars: $t7
+  6: label L1
+     # live vars: $t7
+  7: $t3 := $t7
+     # live vars: r_ref#1#0
+  8: label L0
+     # live vars: r_ref#1#0
+  9: $t8 := TestLiveVars::test1($t3)
+     # live vars: $t8
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: TestLiveVars::R): u64 {
+     var $t2|r1#1#0: TestLiveVars::R
+     var $t3|r2#1#0: TestLiveVars::R
+     var $t4: u64
+     var $t5: TestLiveVars::R
+     var $t6: u64
+     var $t7: TestLiveVars::R
+     var $t8: u64
+     var $t9: bool
+     var $t10: u64
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: u64
+     var $t15: u64
+     # live vars: n, r_ref
+  0: $t4 := 3
+     # live vars: n, r_ref, $t4
+  1: $t5 := pack TestLiveVars::R($t4)
+     # live vars: n, r_ref, $t5
+  2: $t6 := 4
+     # live vars: n, r_ref, $t5, $t6
+  3: $t7 := pack TestLiveVars::R($t6)
+     # live vars: n, r_ref, $t5, $t7
+  4: label L6
+     # live vars: n, r_ref, $t5, $t7
+  5: $t8 := 0
+     # live vars: n, r_ref, $t5, $t7, $t8
+  6: $t9 := <($t8, $t0)
+     # live vars: n, r_ref, $t5, $t7, $t9
+  7: if ($t9) goto 8 else goto 24
+     # live vars: n, $t5, $t7
+  8: label L1
+     # live vars: n, $t5, $t7
+  9: label L2
+     # live vars: n, $t5, $t7
+ 10: $t10 := 2
+     # live vars: n, $t5, $t7, $t10
+ 11: $t11 := /($t0, $t10)
+     # live vars: n, $t5, $t7, $t11
+ 12: $t12 := 0
+     # live vars: n, $t5, $t7, $t11, $t12
+ 13: $t13 := ==($t11, $t12)
+     # live vars: n, $t5, $t7, $t13
+ 14: if ($t13) goto 15 else goto 18
+     # live vars: n, $t5, $t7
+ 15: label L4
+     # live vars: n, $t5, $t7
+ 16: $t1 := $t5
+     # live vars: n, r_ref, $t5, $t7
+ 17: goto 20
+     # live vars: n, $t5, $t7
+ 18: label L3
+     # live vars: n, $t5, $t7
+ 19: $t1 := $t7
+     # live vars: n, r_ref, $t5, $t7
+ 20: label L5
+     # live vars: n, r_ref, $t5, $t7
+ 21: $t14 := 1
+     # live vars: n, r_ref, $t5, $t7, $t14
+ 22: $t0 := -($t0, $t14)
+     # live vars: n, r_ref, $t5, $t7
+ 23: goto 4
+     # live vars: r_ref
+ 24: label L0
+     # live vars: r_ref
+ 25: $t15 := TestLiveVars::test1($t1)
+     # live vars: $t15
+ 26: return $t15
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.move
new file mode 100644
index 000000000..9f0c3f241
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/livevar/basic_test.move
@@ -0,0 +1,34 @@
+module 0x42::TestLiveVars {
+    struct R has copy, drop {
+        x: u64
+    }
+
+    fun test1(r_ref: &R) : u64 {
+        let x_ref = & r_ref.x;
+        *x_ref
+    }
+
+    fun test2(b: bool) : u64 {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let r_ref = &r1;
+        if (b) {
+            r_ref = &r2;
+        };
+        test1(r_ref)
+    }
+
+    fun test3(n: u64, r_ref: &R) : u64 {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        while (0 < n) {
+            if (n/2 == 0) {
+                r_ref = &r1
+            } else {
+                r_ref = &r2;
+            };
+            n = n - 1
+        };
+        test1(r_ref)
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.exp
new file mode 100644
index 000000000..4b7c7989d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.exp
@@ -0,0 +1,516 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestPackref::test1(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestPackref::R
+     var $t4: &mut TestPackref::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestPackref::R
+  0: $t2 := 3
+  1: $t3 := pack TestPackref::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestPackref::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestPackref::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestPackref::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test4(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestPackref::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
+     var $t1: &mut TestPackref::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestPackref::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestPackref::test6(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestPackref::test5($t3)
+  5: $t5 := 0
+  6: TestPackref::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestPackref::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestPackref::R
+     var $t2|r2#1#0: TestPackref::R
+     var $t3|r_ref#1#0: &mut TestPackref::R
+     var $t4: u64
+     var $t5: TestPackref::R
+     var $t6: u64
+     var $t7: TestPackref::R
+     var $t8: &mut TestPackref::R
+     var $t9: bool
+     var $t10: &mut TestPackref::R
+     var $t11: &mut TestPackref::R
+     var $t12: &mut TestPackref::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestPackref::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestPackref::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: destroy($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestPackref::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R) {
+     var $t3|r1#1#0: TestPackref::R
+     var $t4|r2#1#0: TestPackref::R
+     var $t5|t_ref#1#0: &mut TestPackref::R
+     var $t6: u64
+     var $t7: TestPackref::R
+     var $t8: u64
+     var $t9: TestPackref::R
+     var $t10: &mut TestPackref::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestPackref::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestPackref::R
+     var $t21: &mut TestPackref::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestPackref::R
+     var $t27: &mut TestPackref::R
+     var $t28: u64
+     var $t29: &mut TestPackref::R
+     var $t30: &mut TestPackref::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestPackref::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestPackref::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestPackref::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestPackref::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `memory_instr` ================
+
+[variant baseline]
+fun TestPackref::test1(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t2 := 3
+  1: $t0 := pack TestPackref::R($t2)
+  2: $t3 := borrow_local($t0)
+  3: $t4 := borrow_field<TestPackref::R>.x($t3)
+  4: $t5 := 0
+  5: write_ref($t4, $t5)
+  6: write_back[Reference($t3).x (u64)]($t4)
+  7: write_back[LocalRoot($t0)@]($t3)
+  8: trace_local[r#1#0]($t0)
+  9: $t6 := move($t0)
+ 10: return $t6
+}
+
+
+[variant baseline]
+fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+  0: write_ref($t0, $t1)
+  1: trace_local[x_ref]($t0)
+  2: return ()
+}
+
+
+[variant baseline]
+public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
+     var $t2: &mut u64
+  0: $t2 := borrow_field<TestPackref::R>.x($t0)
+  1: TestPackref::test2($t2, $t1)
+  2: write_back[Reference($t0).x (u64)]($t2)
+  3: trace_local[r_ref]($t0)
+  4: trace_local[r_ref]($t0)
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestPackref::test4(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: u64
+     var $t4: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := 0
+  4: TestPackref::test3($t2, $t3)
+  5: write_back[LocalRoot($t0)@]($t2)
+  6: trace_local[r#1#0]($t0)
+  7: $t4 := move($t0)
+  8: return $t4
+}
+
+
+[variant baseline]
+public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
+     var $t1: &mut u64
+  0: $t1 := borrow_field<TestPackref::R>.x($t0)
+  1: trace_local[r_ref]($t0)
+  2: write_back[Reference($t0).x (u64)]($t1)
+  3: trace_local[r_ref]($t0)
+  4: return $t1
+}
+
+
+[variant baseline]
+fun TestPackref::test6(): TestPackref::R {
+     var $t0|r#1#0: TestPackref::R
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := TestPackref::test5($t2)
+  4: $t4 := 0
+  5: TestPackref::test2($t3, $t4)
+  6: write_back[Reference($t2).x (u64)]($t3)
+  7: write_back[LocalRoot($t0)@]($t2)
+  8: trace_local[r#1#0]($t0)
+  9: $t5 := move($t0)
+ 10: return $t5
+}
+
+
+[variant baseline]
+fun TestPackref::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestPackref::R
+     var $t2|r2#1#0: TestPackref::R
+     var $t3|r_ref#1#0: &mut TestPackref::R
+     var $t4: u64
+     var $t5: u64
+     var $t6: &mut TestPackref::R
+     var $t7: &mut TestPackref::R
+     var $t8: u64
+     var $t9: bool
+     var $t10: bool
+  0: $t4 := 3
+  1: $t1 := pack TestPackref::R($t4)
+  2: $t5 := 4
+  3: $t2 := pack TestPackref::R($t5)
+  4: $t6 := borrow_local($t1)
+  5: $t3 := $t6
+  6: if ($t0) goto 31 else goto 35
+  7: label L1
+  8: write_back[LocalRoot($t1)@]($t6)
+  9: trace_local[r1#1#0]($t1)
+ 10: destroy($t6)
+ 11: $t7 := borrow_local($t2)
+ 12: $t3 := $t7
+ 13: label L0
+ 14: $t8 := 0
+ 15: TestPackref::test3($t3, $t8)
+ 16: $t9 := is_parent[Reference($t6)@]($t3)
+ 17: if ($t9) goto 18 else goto 22
+ 18: label L4
+ 19: write_back[Reference($t6)@]($t3)
+ 20: write_back[LocalRoot($t1)@]($t6)
+ 21: trace_local[r1#1#0]($t1)
+ 22: label L5
+ 23: $t10 := is_parent[Reference($t7)@]($t3)
+ 24: if ($t10) goto 25 else goto 29
+ 25: label L6
+ 26: write_back[Reference($t7)@]($t3)
+ 27: write_back[LocalRoot($t2)@]($t7)
+ 28: trace_local[r2#1#0]($t2)
+ 29: label L7
+ 30: return ()
+ 31: label L2
+ 32: write_back[Reference($t6)@]($t3)
+ 33: destroy($t3)
+ 34: goto 7
+ 35: label L3
+ 36: destroy($t6)
+ 37: goto 13
+}
+
+
+[variant baseline]
+fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R) {
+     var $t3|r1#1#0: TestPackref::R
+     var $t4|r2#1#0: TestPackref::R
+     var $t5|t_ref#1#0: &mut TestPackref::R
+     var $t6: u64
+     var $t7: u64
+     var $t8: &mut TestPackref::R
+     var $t9: u64
+     var $t10: bool
+     var $t11: u64
+     var $t12: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestPackref::R
+     var $t16: &mut TestPackref::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     var $t20: bool
+     var $t21: bool
+     var $t22: bool
+     var $t23: bool
+     var $t24: bool
+     var $t25: bool
+     var $t26: bool
+     var $t27: bool
+     var $t28: bool
+  0: $t6 := 3
+  1: $t3 := pack TestPackref::R($t6)
+  2: $t7 := 4
+  3: $t4 := pack TestPackref::R($t7)
+  4: $t8 := borrow_local($t4)
+  5: $t5 := $t8
+  6: label L6
+  7: $t9 := 0
+  8: $t10 := <($t9, $t1)
+  9: if ($t10) goto 10 else goto 50
+ 10: label L1
+ 11: label L2
+ 12: $t20 := is_parent[Reference($t8)@]($t5)
+ 13: if ($t20) goto 14 else goto 18
+ 14: label L10
+ 15: write_back[Reference($t8)@]($t5)
+ 16: write_back[LocalRoot($t4)@]($t8)
+ 17: trace_local[r2#1#0]($t4)
+ 18: label L11
+ 19: $t21 := is_parent[Reference($t15)@]($t5)
+ 20: if ($t21) goto 21 else goto 25
+ 21: label L12
+ 22: write_back[Reference($t15)@]($t5)
+ 23: write_back[LocalRoot($t3)@]($t15)
+ 24: trace_local[r1#1#0]($t3)
+ 25: label L13
+ 26: $t22 := is_parent[Reference($t16)@]($t5)
+ 27: if ($t22) goto 28 else goto 32
+ 28: label L14
+ 29: write_back[Reference($t16)@]($t5)
+ 30: write_back[LocalRoot($t4)@]($t16)
+ 31: trace_local[r2#1#0]($t4)
+ 32: label L15
+ 33: destroy($t5)
+ 34: $t11 := 2
+ 35: $t12 := /($t1, $t11)
+ 36: $t13 := 0
+ 37: $t14 := ==($t12, $t13)
+ 38: if ($t14) goto 39 else goto 43
+ 39: label L4
+ 40: $t15 := borrow_local($t3)
+ 41: $t5 := $t15
+ 42: goto 46
+ 43: label L3
+ 44: $t16 := borrow_local($t4)
+ 45: $t5 := $t16
+ 46: label L5
+ 47: $t17 := 1
+ 48: $t1 := -($t1, $t17)
+ 49: goto 6
+ 50: label L0
+ 51: if ($t0) goto 52 else goto 78
+ 52: label L8
+ 53: $t23 := is_parent[Reference($t8)@]($t5)
+ 54: if ($t23) goto 55 else goto 59
+ 55: label L16
+ 56: write_back[Reference($t8)@]($t5)
+ 57: write_back[LocalRoot($t4)@]($t8)
+ 58: trace_local[r2#1#0]($t4)
+ 59: label L17
+ 60: $t24 := is_parent[Reference($t15)@]($t5)
+ 61: if ($t24) goto 62 else goto 66
+ 62: label L18
+ 63: write_back[Reference($t15)@]($t5)
+ 64: write_back[LocalRoot($t3)@]($t15)
+ 65: trace_local[r1#1#0]($t3)
+ 66: label L19
+ 67: $t25 := is_parent[Reference($t16)@]($t5)
+ 68: if ($t25) goto 69 else goto 73
+ 69: label L20
+ 70: write_back[Reference($t16)@]($t5)
+ 71: write_back[LocalRoot($t4)@]($t16)
+ 72: trace_local[r2#1#0]($t4)
+ 73: label L21
+ 74: destroy($t5)
+ 75: $t18 := 0
+ 76: TestPackref::test3($t2, $t18)
+ 77: goto 103
+ 78: label L7
+ 79: destroy($t2)
+ 80: $t19 := 0
+ 81: TestPackref::test3($t5, $t19)
+ 82: $t26 := is_parent[Reference($t8)@]($t5)
+ 83: if ($t26) goto 84 else goto 88
+ 84: label L22
+ 85: write_back[Reference($t8)@]($t5)
+ 86: write_back[LocalRoot($t4)@]($t8)
+ 87: trace_local[r2#1#0]($t4)
+ 88: label L23
+ 89: $t27 := is_parent[Reference($t15)@]($t5)
+ 90: if ($t27) goto 91 else goto 95
+ 91: label L24
+ 92: write_back[Reference($t15)@]($t5)
+ 93: write_back[LocalRoot($t3)@]($t15)
+ 94: trace_local[r1#1#0]($t3)
+ 95: label L25
+ 96: $t28 := is_parent[Reference($t16)@]($t5)
+ 97: if ($t28) goto 98 else goto 102
+ 98: label L26
+ 99: write_back[Reference($t16)@]($t5)
+100: write_back[LocalRoot($t4)@]($t16)
+101: trace_local[r2#1#0]($t4)
+102: label L27
+103: label L9
+104: trace_local[r_ref]($t2)
+105: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.move
new file mode 100644
index 000000000..bacf2b4f7
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/memory_instr/basic_test.move
@@ -0,0 +1,70 @@
+module 0x42::TestPackref {
+    struct R has copy, drop {
+        x: u64
+    }
+
+    fun test1() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        r
+    }
+
+    fun test2(x_ref: &mut u64, v: u64) {
+        *x_ref = v
+    }
+
+    public fun test3(r_ref: &mut R, v: u64) {
+        let x_ref = &mut r_ref.x;
+        test2(x_ref, v)
+    }
+
+    fun test4() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        test3(r_ref, 0);
+        r
+    }
+
+    public fun test5(r_ref: &mut R) : &mut u64 {
+        &mut r_ref.x
+    }
+
+    fun test6() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = test5(r_ref);
+        test2(x_ref, 0);
+        r
+    }
+
+    fun test7(b: bool) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let r_ref = &mut r1;
+        if (b) {
+            r_ref = &mut r2;
+        };
+        test3(r_ref, 0)
+    }
+
+    fun test8(b: bool, n: u64, r_ref: &mut R) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let t_ref = &mut r2;
+        while (0 < n) {
+            if (n/2 == 0) {
+                t_ref = &mut r1
+            } else {
+                t_ref = &mut r2;
+            };
+            n = n - 1
+        };
+        if (b) {
+            test3(r_ref, 0);
+        } else {
+            test3(t_ref, 0);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.exp b/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.exp
new file mode 100644
index 000000000..c6e5fe4a8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.exp
@@ -0,0 +1,79 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Test::f1<#0>($t0|x1: #0): Test::A<#0, u64> {
+     var $t1: #0
+     var $t2: u64
+     var $t3: Test::A<#0, u64>
+  0: $t1 := move($t0)
+  1: $t2 := 10
+  2: $t3 := pack Test::A<#0, u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f2($t0|x: u8): Test::B<u8> {
+     var $t1: u8
+     var $t2: Test::A<u8, u64>
+     var $t3: Test::B<u8>
+  0: $t1 := move($t0)
+  1: $t2 := Test::f1<u8>($t1)
+  2: $t3 := pack Test::B<u8>($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f3<#0>($t0|x1: #0): Test::A<#0, u64> {
+     var $t1: #0
+     var $t2: u64
+     var $t3: Test::A<#0, u64>
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := pack Test::A<#0, u64>($t1, $t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f4<#0>($t0|x1: #0): Test::B<#0> {
+     var $t1: #0
+     var $t2: Test::A<#0, u64>
+     var $t3: Test::B<#0>
+  0: $t1 := move($t0)
+  1: $t2 := Test::f3<#0>($t1)
+  2: $t3 := pack Test::B<#0>($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Test::f5(): Test::B<u128> {
+     var $t0: u128
+     var $t1: Test::B<u128>
+  0: $t0 := 1
+  1: $t1 := Test::f4<u128>($t0)
+  2: return $t1
+}
+
+
+
+==== mono-analysis result ====
+
+struct Test::A = {
+  <u8, u64>
+  <u128, u64>
+  <#0, u64>
+}
+struct Test::B = {
+  <u8>
+  <u128>
+  <#0>
+}
+fun Test::f1 [baseline] = {
+  <u8>
+}
+fun Test::f4 [baseline] = {
+  <u128>
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.move b/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.move
new file mode 100644
index 000000000..03424d193
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/mono_analysis/test.move
@@ -0,0 +1,37 @@
+address 0x123 {
+module Test {
+
+    struct A<T1, T2> {
+        x1: T1,
+        x2: T2,
+    }
+
+    struct B<T1> {
+        x1: A<T1, u64>,
+    }
+
+    public fun f1<T>(x1: T): A<T, u64> {
+        A{x1, x2: 10}
+    }
+
+    public fun f2(x: u8): B<u8> {
+        B{x1: f1(x)}
+    }
+
+    public fun f3<T>(x1: T): A<T, u64> {
+        A{x1, x2: 1}
+    }
+    spec f3 {
+        pragma opaque = true;
+    }
+
+    public fun f4<T>(x1: T): B<T> {
+        B{x1: f3(x1)}
+    }
+
+    public fun f5(): B<u128> {
+        f4(1)
+    }
+
+}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.exp b/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.exp
new file mode 100644
index 000000000..92c07e913
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.exp
@@ -0,0 +1,460 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := move($t0)
+  2: write_ref($t3, $t2)
+  3: return ()
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R): &mut u64 {
+     var $t1: &mut TestEliminateMutRefs::R
+     var $t2: &mut u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestEliminateMutRefs::R>.x($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestEliminateMutRefs::R
+     var $t2|r2#1#0: TestEliminateMutRefs::R
+     var $t3|r_ref#1#0: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: &mut TestEliminateMutRefs::R
+     var $t9: bool
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: &mut TestEliminateMutRefs::R
+     var $t12: &mut TestEliminateMutRefs::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestEliminateMutRefs::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestEliminateMutRefs::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 16
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: destroy($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L0
+ 17: $t12 := move($t3)
+ 18: $t13 := 0
+ 19: TestEliminateMutRefs::test3($t12, $t13)
+ 20: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEliminateMutRefs::R) {
+     var $t3|r1#1#0: TestEliminateMutRefs::R
+     var $t4|r2#1#0: TestEliminateMutRefs::R
+     var $t5|t_ref#1#0: &mut TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: u64
+     var $t9: TestEliminateMutRefs::R
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestEliminateMutRefs::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestEliminateMutRefs::R
+     var $t21: &mut TestEliminateMutRefs::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestEliminateMutRefs::R
+     var $t27: &mut TestEliminateMutRefs::R
+     var $t28: u64
+     var $t29: &mut TestEliminateMutRefs::R
+     var $t30: &mut TestEliminateMutRefs::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestEliminateMutRefs::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestEliminateMutRefs::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: goto 9
+  9: label L6
+ 10: $t11 := 0
+ 11: $t12 := copy($t1)
+ 12: $t13 := <($t11, $t12)
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestEliminateMutRefs::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestEliminateMutRefs::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
+}
+
+============ after pipeline `mut_ref_instrumentation` ================
+
+[variant baseline]
+fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1|x_ref#1#0: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
+     var $t2: u64
+     var $t3: &mut u64
+  0: $t2 := move($t1)
+  1: $t3 := copy($t0)
+  2: write_ref($t3, $t2)
+  3: trace_local[x_ref]($t0)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: trace_local[r_ref]($t0)
+  5: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
+}
+
+
+[variant baseline]
+public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R): &mut u64 {
+     var $t1: &mut TestEliminateMutRefs::R
+     var $t2: &mut u64
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_field<TestEliminateMutRefs::R>.x($t1)
+  2: trace_local[r_ref]($t0)
+  3: return $t2
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
+     var $t0|r#1#0: TestEliminateMutRefs::R
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test7($t0|b: bool) {
+     var $t1|r1#1#0: TestEliminateMutRefs::R
+     var $t2|r2#1#0: TestEliminateMutRefs::R
+     var $t3|r_ref#1#0: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: &mut TestEliminateMutRefs::R
+     var $t9: bool
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: &mut TestEliminateMutRefs::R
+     var $t12: &mut TestEliminateMutRefs::R
+     var $t13: u64
+  0: $t4 := 3
+  1: $t5 := pack TestEliminateMutRefs::R($t4)
+  2: $t1 := $t5
+  3: $t6 := 4
+  4: $t7 := pack TestEliminateMutRefs::R($t6)
+  5: $t2 := $t7
+  6: $t8 := borrow_local($t1)
+  7: $t3 := $t8
+  8: $t9 := move($t0)
+  9: if ($t9) goto 10 else goto 15
+ 10: label L1
+ 11: $t10 := move($t3)
+ 12: destroy($t10)
+ 13: $t11 := borrow_local($t2)
+ 14: $t3 := $t11
+ 15: label L0
+ 16: $t12 := move($t3)
+ 17: $t13 := 0
+ 18: TestEliminateMutRefs::test3($t12, $t13)
+ 19: return ()
+}
+
+
+[variant baseline]
+fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEliminateMutRefs::R) {
+     var $t3|r1#1#0: TestEliminateMutRefs::R
+     var $t4|r2#1#0: TestEliminateMutRefs::R
+     var $t5|t_ref#1#0: &mut TestEliminateMutRefs::R
+     var $t6: u64
+     var $t7: TestEliminateMutRefs::R
+     var $t8: u64
+     var $t9: TestEliminateMutRefs::R
+     var $t10: &mut TestEliminateMutRefs::R
+     var $t11: u64
+     var $t12: u64
+     var $t13: bool
+     var $t14: &mut TestEliminateMutRefs::R
+     var $t15: u64
+     var $t16: u64
+     var $t17: u64
+     var $t18: u64
+     var $t19: bool
+     var $t20: &mut TestEliminateMutRefs::R
+     var $t21: &mut TestEliminateMutRefs::R
+     var $t22: u64
+     var $t23: u64
+     var $t24: u64
+     var $t25: bool
+     var $t26: &mut TestEliminateMutRefs::R
+     var $t27: &mut TestEliminateMutRefs::R
+     var $t28: u64
+     var $t29: &mut TestEliminateMutRefs::R
+     var $t30: &mut TestEliminateMutRefs::R
+     var $t31: u64
+  0: $t6 := 3
+  1: $t7 := pack TestEliminateMutRefs::R($t6)
+  2: $t3 := $t7
+  3: $t8 := 4
+  4: $t9 := pack TestEliminateMutRefs::R($t8)
+  5: $t4 := $t9
+  6: $t10 := borrow_local($t4)
+  7: $t5 := $t10
+  8: label L6
+  9: $t11 := 0
+ 10: $t12 := copy($t1)
+ 11: $t13 := <($t11, $t12)
+ 12: if ($t13) goto 13 else goto 36
+ 13: label L1
+ 14: label L2
+ 15: $t14 := move($t5)
+ 16: destroy($t14)
+ 17: $t15 := copy($t1)
+ 18: $t16 := 2
+ 19: $t17 := /($t15, $t16)
+ 20: $t18 := 0
+ 21: $t19 := ==($t17, $t18)
+ 22: if ($t19) goto 23 else goto 27
+ 23: label L4
+ 24: $t20 := borrow_local($t3)
+ 25: $t5 := $t20
+ 26: goto 30
+ 27: label L3
+ 28: $t21 := borrow_local($t4)
+ 29: $t5 := $t21
+ 30: label L5
+ 31: $t22 := move($t1)
+ 32: $t23 := 1
+ 33: $t24 := -($t22, $t23)
+ 34: $t1 := $t24
+ 35: goto 8
+ 36: label L0
+ 37: $t25 := move($t0)
+ 38: if ($t25) goto 39 else goto 46
+ 39: label L8
+ 40: $t26 := move($t5)
+ 41: destroy($t26)
+ 42: $t27 := copy($t2)
+ 43: $t28 := 0
+ 44: TestEliminateMutRefs::test3($t27, $t28)
+ 45: goto 52
+ 46: label L7
+ 47: $t29 := copy($t2)
+ 48: destroy($t29)
+ 49: $t30 := move($t5)
+ 50: $t31 := 0
+ 51: TestEliminateMutRefs::test3($t30, $t31)
+ 52: label L9
+ 53: trace_local[r_ref]($t2)
+ 54: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.move b/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.move
new file mode 100644
index 000000000..5133d72e2
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/mut_ref_instrumentation/basic_test.move
@@ -0,0 +1,71 @@
+module 0x42::TestEliminateMutRefs {
+
+    struct R has copy, drop {
+        x: u64
+    }
+
+    fun test1() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = &mut r_ref.x;
+        *x_ref = 0;
+        r
+    }
+
+    fun test2(x_ref: &mut u64, v: u64) {
+        *x_ref = v
+    }
+
+    public fun test3(r_ref: &mut R, v: u64) {
+        let x_ref = &mut r_ref.x;
+        test2(x_ref, v)
+    }
+
+    fun test4() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        test3(r_ref, 0);
+        r
+    }
+
+    public fun test5(r_ref: &mut R) : &mut u64 {
+        &mut r_ref.x
+    }
+
+    fun test6() : R {
+        let r = R {x: 3};
+        let r_ref = &mut r;
+        let x_ref = test5(r_ref);
+        test2(x_ref, 0);
+        r
+    }
+
+    fun test7(b: bool) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let r_ref = &mut r1;
+        if (b) {
+            r_ref = &mut r2;
+        };
+        test3(r_ref, 0)
+    }
+
+    fun test8(b: bool, n: u64, r_ref: &mut R) {
+        let r1 = R {x: 3};
+        let r2 = R {x: 4};
+        let t_ref = &mut r2;
+        while (0 < n) {
+            if (n/2 == 0) {
+                t_ref = &mut r1
+            } else {
+                t_ref = &mut r2;
+            };
+            n = n - 1
+        };
+        if (b) {
+            test3(r_ref, 0);
+        } else {
+            test3(t_ref, 0);
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.exp b/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.exp
new file mode 100644
index 000000000..27b13bd82
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.exp
@@ -0,0 +1,46 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun TestBranching::branching($t0|cond: bool): u64 {
+     var $t1|tmp#$1: u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t2 := move($t0)
+  1: if ($t2) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
+  5: goto 10
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
+  9: goto 10
+ 10: label L2
+ 11: $t5 := move($t1)
+ 12: return $t5
+}
+
+============ after pipeline `reaching_def` ================
+
+[variant baseline]
+fun TestBranching::branching($t0|cond: bool): u64 {
+     var $t1|tmp#$1: u64
+     var $t2: bool
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+  0: $t2 := move($t0)
+  1: if ($t0) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
+  5: goto 9
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
+  9: label L2
+ 10: $t5 := move($t1)
+ 11: return $t1
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.move b/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.move
new file mode 100644
index 000000000..e8efb8efe
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/reaching_def/test_branching.move
@@ -0,0 +1,6 @@
+module 0x42::TestBranching {
+    fun branching(cond: bool) : u64 {
+      let x = if (cond) { 3 } else { 4 };
+      x
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.exp
new file mode 100644
index 000000000..e9a9b2f5a
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.exp
@@ -0,0 +1,63 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Fields::borrow_read($t0|s: &Fields::S): u64 {
+     var $t1: &Fields::S
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Fields::S>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Fields::borrow_read_generic<#0>($t0|t: &Fields::T<#0>): u64 {
+     var $t1: &Fields::T<#0>
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Fields::T<#0>>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+public fun Fields::borrow_read($t0|s: &Fields::S): u64 {
+     var $t1: &Fields::S
+     var $t2: &u64
+     var $t3: u64
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/f
+     #
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Fields::S>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+public fun Fields::borrow_read_generic<#0>($t0|t: &Fields::T<#0>): u64 {
+     var $t1: &Fields::T<#0>
+     var $t2: &u64
+     var $t3: u64
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/f
+     #
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Fields::T<#0>>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.move
new file mode 100644
index 000000000..a2e914dfb
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/fields.move
@@ -0,0 +1,15 @@
+address 0x2 {
+module Fields {
+    struct S { f: u64 }
+
+    struct T<phantom A> { f: u64 }
+
+    public fun borrow_read(s: &S): u64 {
+        s.f
+    }
+
+    public fun borrow_read_generic<A>(t: &T<A>): u64 {
+        t.f
+    }
+}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.exp
new file mode 100644
index 000000000..63d9d6e9d
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.exp
@@ -0,0 +1,180 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
+     var $t2: bool
+     var $t3: address
+     var $t4: u64
+     var $t5: address
+  0: $t2 := move($t1)
+  1: if ($t2) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 0x2
+  4: $t0 := $t3
+  5: goto 6
+  6: label L0
+  7: $t4 := 4
+  8: destroy($t4)
+  9: $t5 := move($t0)
+ 10: return $t5
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_constant($t0|a: address): address {
+     var $t1: address
+  0: $t1 := 0x2
+  1: return $t1
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_field($t0|s: &mut Footprint::S) {
+     var $t1: address
+     var $t2: &mut Footprint::S
+     var $t3: &mut address
+  0: $t1 := 0x2
+  1: $t2 := move($t0)
+  2: $t3 := borrow_field<Footprint::S>.f($t2)
+  3: write_ref($t3, $t1)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool) {
+     var $t2: bool
+     var $t3: address
+     var $t4: &mut Footprint::S
+     var $t5: &mut address
+     var $t6: &mut Footprint::S
+  0: $t2 := move($t1)
+  1: if ($t2) goto 2 else goto 8
+  2: label L1
+  3: $t3 := 0x2
+  4: $t4 := move($t0)
+  5: $t5 := borrow_field<Footprint::S>.f($t4)
+  6: write_ref($t5, $t3)
+  7: goto 12
+  8: label L0
+  9: $t6 := move($t0)
+ 10: destroy($t6)
+ 11: goto 12
+ 12: label L2
+ 13: return ()
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_other_param($t0|a1: address, $t1|a2: address): address {
+     var $t2: address
+  0: $t2 := move($t1)
+  1: return $t2
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
+     var $t2: bool
+     var $t3: address
+     var $t4: u64
+     var $t5: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(1): Read
+     #
+     # Locals:
+     # Ret(0): {0x2, Formal(0), }
+     #
+  0: $t2 := move($t1)
+  1: if ($t2) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 0x2
+  4: $t0 := $t3
+  5: goto 6
+  6: label L0
+  7: $t4 := 4
+  8: destroy($t4)
+  9: $t5 := move($t0)
+ 10: return $t5
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_constant($t0|a: address): address {
+     var $t1: address
+     # Accesses:
+     #
+     # Locals:
+     # Ret(0): 0x2
+     #
+  0: $t1 := 0x2
+  1: return $t1
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_field($t0|s: &mut Footprint::S) {
+     var $t1: address
+     var $t2: &mut Footprint::S
+     var $t3: &mut address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Write
+     #
+     # Locals:
+     # Formal(0)/f: 0x2
+     #
+  0: $t1 := 0x2
+  1: $t2 := move($t0)
+  2: $t3 := borrow_field<Footprint::S>.f($t2)
+  3: write_ref($t3, $t1)
+  4: return ()
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool) {
+     var $t2: bool
+     var $t3: address
+     var $t4: &mut Footprint::S
+     var $t5: &mut address
+     var $t6: &mut Footprint::S
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Write
+     # Formal(1): Read
+     #
+     # Locals:
+     # Formal(0)/f: {0x2, Formal(0)/f, }
+     #
+  0: $t2 := move($t1)
+  1: if ($t2) goto 2 else goto 8
+  2: label L1
+  3: $t3 := 0x2
+  4: $t4 := move($t0)
+  5: $t5 := borrow_field<Footprint::S>.f($t4)
+  6: write_ref($t5, $t3)
+  7: goto 12
+  8: label L0
+  9: $t6 := move($t0)
+ 10: destroy($t6)
+ 11: goto 12
+ 12: label L2
+ 13: return ()
+}
+
+
+[variant baseline]
+public fun Footprint::reassign_other_param($t0|a1: address, $t1|a2: address): address {
+     var $t2: address
+     # Accesses:
+     # Formal(1): Read
+     #
+     # Locals:
+     # Ret(0): Formal(1)
+     #
+  0: $t2 := move($t1)
+  1: return $t2
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.move
new file mode 100644
index 000000000..ff13b29ef
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/footprint.move
@@ -0,0 +1,38 @@
+address 0x2 {
+module Footprint {
+    struct S { f: address }
+
+    // expected: empty summary
+    public fun reassign_constant(a: address): address {
+        a = @0x2;
+        a
+    }
+
+    // expected: returns Footprint(a2)
+    public fun reassign_other_param(a1: address, a2: address): address {
+        a1 = a2;
+        a1
+    }
+
+    // expected: returns Footprint({a, 0x2})
+    public fun reassign_cond(a: address, b: bool): address {
+        if (b) {
+            a = @0x2;
+        };
+        _ = 2 + 2;
+        a
+    }
+
+    // expected: s.f |-> 0x2
+    public fun reassign_field(s: &mut S) {
+        s.f = @0x2;
+    }
+
+    // expected: s.f |-> {0x2, Footprint(s.f)}
+    public fun reassign_field_cond(s: &mut S, b: bool) {
+        if (b) {
+            s.f = @0x2
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.exp
new file mode 100644
index 000000000..29f703d49
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.exp
@@ -0,0 +1,89 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: bool) {
+     var $t3|tmp#$3: u64
+     var $t4: bool
+     var $t5: &MultiDeps::T
+     var $t6: &mut MultiDeps::S
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: &MultiDeps::T
+     var $t10: &u64
+     var $t11: u64
+     var $t12: u64
+     var $t13: &mut MultiDeps::S
+     var $t14: &mut u64
+  0: $t4 := move($t2)
+  1: if ($t4) goto 2 else goto 10
+  2: label L1
+  3: $t5 := move($t1)
+  4: destroy($t5)
+  5: $t6 := copy($t0)
+  6: $t7 := borrow_field<MultiDeps::S>.f($t6)
+  7: $t8 := read_ref($t7)
+  8: $t3 := $t8
+  9: goto 16
+ 10: label L0
+ 11: $t9 := move($t1)
+ 12: $t10 := borrow_field<MultiDeps::T>.f($t9)
+ 13: $t11 := read_ref($t10)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L2
+ 17: $t12 := move($t3)
+ 18: $t13 := move($t0)
+ 19: $t14 := borrow_field<MultiDeps::S>.f($t13)
+ 20: write_ref($t14, $t12)
+ 21: return ()
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: bool) {
+     var $t3|tmp#$3: u64
+     var $t4: bool
+     var $t5: &MultiDeps::T
+     var $t6: &mut MultiDeps::S
+     var $t7: &mut u64
+     var $t8: u64
+     var $t9: &MultiDeps::T
+     var $t10: &u64
+     var $t11: u64
+     var $t12: u64
+     var $t13: &mut MultiDeps::S
+     var $t14: &mut u64
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: ReadWrite
+     # Formal(1): Read
+     # Formal(1)/f: Read
+     # Formal(2): Read
+     #
+     # Locals:
+     # Formal(0)/f: {Formal(0)/f, Formal(1)/f, }
+     #
+  0: $t4 := move($t2)
+  1: if ($t4) goto 2 else goto 10
+  2: label L1
+  3: $t5 := move($t1)
+  4: destroy($t5)
+  5: $t6 := copy($t0)
+  6: $t7 := borrow_field<MultiDeps::S>.f($t6)
+  7: $t8 := read_ref($t7)
+  8: $t3 := $t8
+  9: goto 16
+ 10: label L0
+ 11: $t9 := move($t1)
+ 12: $t10 := borrow_field<MultiDeps::T>.f($t9)
+ 13: $t11 := read_ref($t10)
+ 14: $t3 := $t11
+ 15: goto 16
+ 16: label L2
+ 17: $t12 := move($t3)
+ 18: $t13 := move($t0)
+ 19: $t14 := borrow_field<MultiDeps::S>.f($t13)
+ 20: write_ref($t14, $t12)
+ 21: return ()
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.move
new file mode 100644
index 000000000..c19688042
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/multi_deps.move
@@ -0,0 +1,11 @@
+address 0x1 {
+module MultiDeps {
+  struct S has key { f: u64 }
+  struct T has key { f: u64 }
+
+  fun add_to(s: &mut S, t: &T, v: bool) {
+      *&mut s.f = if(v) { *&mut s.f } else { t.f }
+  }
+
+}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.exp
new file mode 100644
index 000000000..fd8ee07db
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.exp
@@ -0,0 +1,196 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun NestedFields::nested_fields_direct($t0|a: &NestedFields::A): address {
+     var $t1: &NestedFields::A
+     var $t2: &NestedFields::B
+     var $t3: &NestedFields::C
+     var $t4: &address
+     var $t5: address
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::A>.b($t1)
+  2: $t3 := borrow_field<NestedFields::B>.c($t2)
+  3: $t4 := borrow_field<NestedFields::C>.f($t3)
+  4: $t5 := read_ref($t4)
+  5: return $t5
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_helper1($t0|c: &NestedFields::C): address {
+     var $t1: &NestedFields::C
+     var $t2: &address
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::C>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_helper2($t0|b: &NestedFields::B): address {
+     var $t1: &NestedFields::B
+     var $t2: &NestedFields::C
+     var $t3: &address
+     var $t4: address
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::B>.c($t1)
+  2: $t3 := borrow_field<NestedFields::C>.f($t2)
+  3: $t4 := read_ref($t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &NestedFields::A, $t2|flag: bool): address {
+     var $t3|tmp#$3: address
+     var $t4: bool
+     var $t5: &NestedFields::A
+     var $t6: &NestedFields::A
+     var $t7: &NestedFields::B
+     var $t8: &NestedFields::C
+     var $t9: address
+     var $t10: &NestedFields::A
+     var $t11: &NestedFields::A
+     var $t12: &NestedFields::B
+     var $t13: address
+     var $t14: address
+  0: $t4 := move($t2)
+  1: if ($t4) goto 2 else goto 11
+  2: label L1
+  3: $t5 := move($t1)
+  4: destroy($t5)
+  5: $t6 := move($t0)
+  6: $t7 := borrow_field<NestedFields::A>.b($t6)
+  7: $t8 := borrow_field<NestedFields::B>.c($t7)
+  8: $t9 := NestedFields::nested_fields_helper1($t8)
+  9: $t3 := $t9
+ 10: goto 19
+ 11: label L0
+ 12: $t10 := move($t0)
+ 13: destroy($t10)
+ 14: $t11 := move($t1)
+ 15: $t12 := borrow_field<NestedFields::A>.b($t11)
+ 16: $t13 := NestedFields::nested_fields_helper2($t12)
+ 17: $t3 := $t13
+ 18: goto 19
+ 19: label L2
+ 20: $t14 := move($t3)
+ 21: return $t14
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+fun NestedFields::nested_fields_direct($t0|a: &NestedFields::A): address {
+     var $t1: &NestedFields::A
+     var $t2: &NestedFields::B
+     var $t3: &NestedFields::C
+     var $t4: &address
+     var $t5: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/b/c/f: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/b/c/f
+     #
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::A>.b($t1)
+  2: $t3 := borrow_field<NestedFields::B>.c($t2)
+  3: $t4 := borrow_field<NestedFields::C>.f($t3)
+  4: $t5 := read_ref($t4)
+  5: return $t5
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_helper1($t0|c: &NestedFields::C): address {
+     var $t1: &NestedFields::C
+     var $t2: &address
+     var $t3: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/f
+     #
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::C>.f($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_helper2($t0|b: &NestedFields::B): address {
+     var $t1: &NestedFields::B
+     var $t2: &NestedFields::C
+     var $t3: &address
+     var $t4: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/c/f: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/c/f
+     #
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<NestedFields::B>.c($t1)
+  2: $t3 := borrow_field<NestedFields::C>.f($t2)
+  3: $t4 := read_ref($t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &NestedFields::A, $t2|flag: bool): address {
+     var $t3|tmp#$3: address
+     var $t4: bool
+     var $t5: &NestedFields::A
+     var $t6: &NestedFields::A
+     var $t7: &NestedFields::B
+     var $t8: &NestedFields::C
+     var $t9: address
+     var $t10: &NestedFields::A
+     var $t11: &NestedFields::A
+     var $t12: &NestedFields::B
+     var $t13: address
+     var $t14: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/b/c: Read
+     # Formal(0)/b/c/f: Read
+     # Formal(1): Read
+     # Formal(1)/b: Read
+     # Formal(1)/b/c/f: Read
+     # Formal(2): Read
+     #
+     # Locals:
+     # Ret(0): {Formal(0)/b/c/f, Formal(1)/b/c/f, }
+     #
+  0: $t4 := move($t2)
+  1: if ($t4) goto 2 else goto 11
+  2: label L1
+  3: $t5 := move($t1)
+  4: destroy($t5)
+  5: $t6 := move($t0)
+  6: $t7 := borrow_field<NestedFields::A>.b($t6)
+  7: $t8 := borrow_field<NestedFields::B>.c($t7)
+  8: $t9 := NestedFields::nested_fields_helper1($t8)
+  9: $t3 := $t9
+ 10: goto 19
+ 11: label L0
+ 12: $t10 := move($t0)
+ 13: destroy($t10)
+ 14: $t11 := move($t1)
+ 15: $t12 := borrow_field<NestedFields::A>.b($t11)
+ 16: $t13 := NestedFields::nested_fields_helper2($t12)
+ 17: $t3 := $t13
+ 18: goto 19
+ 19: label L2
+ 20: $t14 := move($t3)
+ 21: return $t14
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.move
new file mode 100644
index 000000000..0c68d0feb
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/nested_fields.move
@@ -0,0 +1,25 @@
+module 0x1::NestedFields {
+    struct A { b: B }
+    struct B { c: C }
+    struct C { f: address }
+
+    fun nested_fields_direct(a: &A): address {
+        a.b.c.f
+    }
+
+    fun nested_fields_helper1(c: &C): address {
+        c.f
+    }
+
+    fun nested_fields_helper2(b: &B): address {
+        b.c.f
+    }
+
+    fun nested_fields_interproc(a1: &A, a2: &A, flag: bool): address {
+        if (flag) {
+            nested_fields_helper1(&a1.b.c)
+        } else {
+            nested_fields_helper2(&a2.b)
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.exp
new file mode 100644
index 000000000..3fd12ae56
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.exp
@@ -0,0 +1,62 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun SimplePackUnpack::pack_unpack($t0|a: address): address {
+     var $t1: address
+     var $t2: SimplePackUnpack::S
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := pack SimplePackUnpack::S($t1)
+  2: $t3 := SimplePackUnpack::unpack($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun SimplePackUnpack::unpack($t0|s: SimplePackUnpack::S): address {
+     var $t1: &SimplePackUnpack::S
+     var $t2: &address
+     var $t3: address
+  0: $t1 := borrow_local($t0)
+  1: $t2 := borrow_field<SimplePackUnpack::S>.a1($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+fun SimplePackUnpack::pack_unpack($t0|a: address): address {
+     var $t1: address
+     var $t2: SimplePackUnpack::S
+     var $t3: address
+     # Accesses:
+     # Formal(0): Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)
+     #
+  0: $t1 := move($t0)
+  1: $t2 := pack SimplePackUnpack::S($t1)
+  2: $t3 := SimplePackUnpack::unpack($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun SimplePackUnpack::unpack($t0|s: SimplePackUnpack::S): address {
+     var $t1: &SimplePackUnpack::S
+     var $t2: &address
+     var $t3: address
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/a1: Read
+     #
+     # Locals:
+     # Ret(0): Formal(0)/a1
+     #
+  0: $t1 := borrow_local($t0)
+  1: $t2 := borrow_field<SimplePackUnpack::S>.a1($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.move
new file mode 100644
index 000000000..d38d0ed6c
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/simple_pack_unpack.move
@@ -0,0 +1,12 @@
+module 0x1::SimplePackUnpack {
+    struct S has drop { a1: address }
+
+    fun unpack(s: S): address {
+        s.a1
+    } // ret |-> { Formal(0)/a1 }
+
+    fun pack_unpack(a: address): address {
+        let s = S { a1: a };
+        unpack(s)
+    }  // ret |-> { Formal(0) }
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.exp b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.exp
new file mode 100644
index 000000000..7ed892af8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.exp
@@ -0,0 +1,94 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public fun UpdateReturn::abort_or_write($t0|s: &mut UpdateReturn::S, $t1|b: bool, $t2|x: u64): u64 {
+     var $t3: bool
+     var $t4: &mut UpdateReturn::S
+     var $t5: u64
+     var $t6: &mut UpdateReturn::S
+     var $t7: u64
+     var $t8: u64
+  0: $t3 := move($t1)
+  1: if ($t3) goto 2 else goto 7
+  2: label L1
+  3: $t4 := move($t0)
+  4: destroy($t4)
+  5: $t5 := 77
+  6: abort($t5)
+  7: label L0
+  8: $t6 := move($t0)
+  9: $t7 := move($t2)
+ 10: $t8 := UpdateReturn::write_f($t6, $t7)
+ 11: return $t8
+}
+
+
+[variant baseline]
+public fun UpdateReturn::write_f($t0|s: &mut UpdateReturn::S, $t1|x: u64): u64 {
+     var $t2: u64
+     var $t3: &mut UpdateReturn::S
+     var $t4: &mut u64
+     var $t5: u64
+  0: $t2 := 7
+  1: $t3 := move($t0)
+  2: $t4 := borrow_field<UpdateReturn::S>.f($t3)
+  3: write_ref($t4, $t2)
+  4: $t5 := move($t1)
+  5: return $t5
+}
+
+============ after pipeline `read_write_set` ================
+
+[variant baseline]
+public fun UpdateReturn::abort_or_write($t0|s: &mut UpdateReturn::S, $t1|b: bool, $t2|x: u64): u64 {
+     var $t3: bool
+     var $t4: &mut UpdateReturn::S
+     var $t5: u64
+     var $t6: &mut UpdateReturn::S
+     var $t7: u64
+     var $t8: u64
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Write
+     # Formal(1): Read
+     # Formal(2): Read
+     #
+     # Locals:
+     # Ret(0): Formal(2)
+     #
+  0: $t3 := move($t1)
+  1: if ($t3) goto 2 else goto 7
+  2: label L1
+  3: $t4 := move($t0)
+  4: destroy($t4)
+  5: $t5 := 77
+  6: abort($t5)
+  7: label L0
+  8: $t6 := move($t0)
+  9: $t7 := move($t2)
+ 10: $t8 := UpdateReturn::write_f($t6, $t7)
+ 11: return $t8
+}
+
+
+[variant baseline]
+public fun UpdateReturn::write_f($t0|s: &mut UpdateReturn::S, $t1|x: u64): u64 {
+     var $t2: u64
+     var $t3: &mut UpdateReturn::S
+     var $t4: &mut u64
+     var $t5: u64
+     # Accesses:
+     # Formal(0): Read
+     # Formal(0)/f: Write
+     # Formal(1): Read
+     #
+     # Locals:
+     # Ret(0): Formal(1)
+     #
+  0: $t2 := 7
+  1: $t3 := move($t0)
+  2: $t4 := borrow_field<UpdateReturn::S>.f($t3)
+  3: write_ref($t4, $t2)
+  4: $t5 := move($t1)
+  5: return $t5
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.move b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.move
new file mode 100644
index 000000000..5421131c3
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/read_write_set/update_return.move
@@ -0,0 +1,17 @@
+address 0x1 {
+module UpdateReturn {
+
+    struct S has key { f: u64 }
+
+    public fun write_f(s: &mut S, x: u64): u64 {
+        s.f = 7;
+        x
+    }
+
+    // this function will update the return value via a join
+    public fun abort_or_write(s: &mut S, b: bool, x: u64): u64 {
+        if (b) abort(77);
+        write_f(s, x)
+    }
+}
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.exp b/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.exp
new file mode 100644
index 000000000..6dca479e8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.exp
@@ -0,0 +1,351 @@
+============ initial translation from Move ================
+
+[variant baseline]
+fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
+     var $t3|tmp#$3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: u64
+     var $t11: u64
+  0: $t4 := move($t0)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t1)
+  4: $t6 := move($t2)
+  5: $t7 := /($t5, $t6)
+  6: $t3 := $t7
+  7: goto 14
+  8: label L0
+  9: $t8 := move($t1)
+ 10: $t9 := move($t2)
+ 11: $t10 := *($t8, $t9)
+ 12: $t3 := $t10
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t3)
+ 16: return $t11
+}
+
+
+[variant baseline]
+fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: u64
+     var $t4: bool
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+     var $t8: u64
+  0: $t2 := copy($t1)
+  1: $t3 := 0
+  2: $t4 := !=($t2, $t3)
+  3: if ($t4) goto 4 else goto 7
+  4: label L1
+  5: $t5 := 22
+  6: abort($t5)
+  7: label L0
+  8: $t6 := move($t0)
+  9: $t7 := move($t1)
+ 10: $t8 := /($t6, $t7)
+ 11: return $t8
+}
+
+
+[variant baseline]
+fun Test::multiple_results($t0|a: u64, $t1|b: u64): (u64, u64) {
+     var $t2: u64
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: u64
+  0: $t2 := copy($t0)
+  1: $t3 := copy($t1)
+  2: $t4 := /($t2, $t3)
+  3: $t5 := move($t0)
+  4: $t6 := move($t1)
+  5: $t7 := %($t5, $t6)
+  6: return ($t4, $t7)
+}
+
+
+[variant baseline]
+fun Test::mut_ref_param($t0|r: &mut Test::R): u64 {
+     var $t1|x#1#0: u64
+     var $t2: &mut Test::R
+     var $t3: &u64
+     var $t4: u64
+     var $t5: &mut Test::R
+     var $t6: &u64
+     var $t7: u64
+     var $t8: u64
+     var $t9: u64
+     var $t10: &mut Test::R
+     var $t11: &mut u64
+     var $t12: u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<Test::R>.v($t2)
+  2: $t4 := read_ref($t3)
+  3: $t1 := $t4
+  4: $t5 := copy($t0)
+  5: $t6 := borrow_field<Test::R>.v($t5)
+  6: $t7 := read_ref($t6)
+  7: $t8 := 1
+  8: $t9 := -($t7, $t8)
+  9: $t10 := move($t0)
+ 10: $t11 := borrow_field<Test::R>.v($t10)
+ 11: write_ref($t11, $t9)
+ 12: $t12 := move($t1)
+ 13: return $t12
+}
+
+
+[variant baseline]
+fun Test::ref_param($t0|r: &Test::R): u64 {
+     var $t1: &Test::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Test::R>.v($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
+}
+
+
+[variant baseline]
+fun Test::ref_param_return_ref($t0|r: &Test::R): &u64 {
+     var $t1: &Test::R
+     var $t2: &u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<Test::R>.v($t1)
+  2: return $t2
+}
+
+============ after pipeline `spec_instrumentation` ================
+
+[variant verification]
+fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
+     var $t3|tmp#$3: u64
+     var $t4: num
+  0: if ($t0) goto 1 else goto 4
+  1: label L1
+  2: $t3 := /($t1, $t2) on_abort goto 12 with $t4
+  3: goto 6
+  4: label L0
+  5: $t3 := *($t1, $t2) on_abort goto 12 with $t4
+  6: label L2
+  7: label L3
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:27:6+50
+  8: assert Not(And($t0, Eq<u64>($t2, 0)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:28:6+35
+  9: assert Implies($t0, Eq<u64>($t3, Div($t1, $t2)))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:29:6+36
+ 10: assert Implies(Not($t0), Eq<u64>($t3, Mul($t1, $t2)))
+ 11: return $t3
+ 12: label L4
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
+ 13: assert And($t0, Eq<u64>($t2, 0))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
+ 14: assert And(And($t0, Eq<u64>($t2, 0)), Eq(-1, $t4))
+ 15: abort($t4)
+}
+
+
+[variant verification]
+fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
+     var $t2: u64
+     var $t3: bool
+     var $t4: u64
+     var $t5: num
+     var $t6: u64
+  0: $t2 := 0
+  1: $t3 := !=($t1, $t2)
+  2: if ($t3) goto 3 else goto 7
+  3: label L1
+  4: $t4 := 22
+  5: $t5 := move($t4)
+  6: goto 14
+  7: label L0
+  8: $t6 := /($t0, $t1) on_abort goto 14 with $t5
+  9: label L2
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:9:6+25
+ 10: assert Not(Eq<u64>($t1, 0))
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:10:6+17
+ 11: assert Not(Eq<u64>($t0, 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:11:6+24
+ 12: assert Eq<u64>($t6, Div($t0, $t1))
+ 13: return $t6
+ 14: label L3
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
+ 15: assert Or(Eq<u64>($t1, 0), Eq<u64>($t0, 0))
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
+ 16: assert Or(And(Eq<u64>($t1, 0), Eq(22, $t5)), Eq<u64>($t0, 0))
+ 17: abort($t5)
+}
+
+
+[variant verification]
+fun Test::multiple_results($t0|a: u64, $t1|b: u64): (u64, u64) {
+     var $t2: u64
+     var $t3: num
+     var $t4: u64
+  0: $t2 := /($t0, $t1) on_abort goto 7 with $t3
+  1: $t4 := %($t0, $t1) on_abort goto 7 with $t3
+  2: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:18:6+40
+  3: assert Not(Eq<u64>($t1, 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:19:6+26
+  4: assert Eq<u64>($t2, Div($t0, $t1))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:20:6+26
+  5: assert Eq<u64>($t4, Mod($t0, $t1))
+  6: return ($t2, $t4)
+  7: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:17:2+136
+  8: assert Eq<u64>($t1, 0)
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:17:2+136
+  9: assert And(Eq<u64>($t1, 0), Eq(-1, $t3))
+ 10: abort($t3)
+}
+
+
+[variant verification]
+fun Test::mut_ref_param($t0|r: &mut Test::R): u64 {
+     var $t1|x#1#0: u64
+     var $t2: Test::R
+     var $t3: u64
+     var $t4: u64
+     var $t5: u64
+     var $t6: u64
+     var $t7: num
+     var $t8: &mut u64
+  0: $t2 := read_ref($t0)
+  1: $t3 := get_field<Test::R>.v($t0)
+  2: $t4 := get_field<Test::R>.v($t0)
+  3: $t5 := 1
+  4: $t6 := -($t4, $t5) on_abort goto 15 with $t7
+  5: $t8 := borrow_field<Test::R>.v($t0)
+  6: write_ref($t8, $t6)
+  7: write_back[Reference($t0).v (u64)]($t8)
+  8: trace_local[r]($t0)
+  9: trace_local[r]($t0)
+ 10: label L1
+     # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:54:6+42
+ 11: assert Not(Eq<u64>(select Test::R.v($t2), 0))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:55:6+27
+ 12: assert Eq<u64>($t3, select Test::R.v($t2))
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:56:6+28
+ 13: assert Eq<u64>(select Test::R.v($t0), Add(select Test::R.v($t2), 1))
+ 14: return $t3
+ 15: label L2
+     # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:53:2+138
+ 16: assert Eq<u64>(select Test::R.v($t2), 0)
+     # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:53:2+138
+ 17: assert And(Eq<u64>(select Test::R.v($t2), 0), Eq(-1, $t7))
+ 18: abort($t7)
+}
+
+
+[variant verification]
+fun Test::ref_param($t0|r: Test::R): u64 {
+     var $t1: u64
+  0: $t1 := get_field<Test::R>.v($t0)
+  1: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:38:6+22
+  2: assert Eq<u64>($t1, select Test::R.v($t0))
+  3: return $t1
+}
+
+
+[variant verification]
+fun Test::ref_param_return_ref($t0|r: Test::R): u64 {
+     var $t1: u64
+  0: $t1 := get_field<Test::R>.v($t0)
+  1: label L1
+     # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:45:6+22
+  2: assert Eq<u64>($t1, select Test::R.v($t0))
+  3: return $t1
+}
+
+
+
+==== spec-instrumenter input specs ====
+
+fun Test::branching_result[baseline]
+spec {
+  aborts_if And($t0, Eq<u64>($t2, 0));
+  ensures Implies($t0, Eq<u64>(result0(), Div($t1, $t2)));
+  ensures Implies(Not($t0), Eq<u64>(result0(), Mul($t1, $t2)));
+}
+
+fun Test::branching_result[verification]
+spec {
+  aborts_if And($t0, Eq<u64>($t2, 0));
+  ensures Implies($t0, Eq<u64>(result0(), Div($t1, $t2)));
+  ensures Implies(Not($t0), Eq<u64>(result0(), Mul($t1, $t2)));
+}
+
+fun Test::implicit_and_explicit_abort[baseline]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  aborts_if Eq<u64>($t0, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+}
+
+fun Test::implicit_and_explicit_abort[verification]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  aborts_if Eq<u64>($t0, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+}
+
+fun Test::multiple_results[baseline]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+  ensures Eq<u64>(result1(), Mod($t0, $t1));
+}
+
+fun Test::multiple_results[verification]
+spec {
+  aborts_if Eq<u64>($t1, 0);
+  ensures Eq<u64>(result0(), Div($t0, $t1));
+  ensures Eq<u64>(result1(), Mod($t0, $t1));
+}
+
+fun Test::mut_ref_param[baseline]
+spec {
+  aborts_if Eq<u64>(select Test::R.v($t0), 0);
+  ensures Eq<u64>(result0(), Old<u64>(select Test::R.v($t0)));
+  ensures Eq<u64>(select Test::R.v($t0), Add(Old<u64>(select Test::R.v($t0)), 1));
+}
+
+fun Test::mut_ref_param[verification]
+spec {
+  aborts_if Eq<u64>(select Test::R.v($t0), 0);
+  ensures Eq<u64>(result0(), Old<u64>(select Test::R.v($t0)));
+  ensures Eq<u64>(select Test::R.v($t0), Add(Old<u64>(select Test::R.v($t0)), 1));
+}
+
+fun Test::ref_param[baseline]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v($t0));
+}
+
+fun Test::ref_param[verification]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v($t0));
+}
+
+fun Test::ref_param_return_ref[baseline]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v($t0));
+}
+
+fun Test::ref_param_return_ref[verification]
+spec {
+  ensures Eq<u64>(result0(), select Test::R.v($t0));
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.move b/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.move
new file mode 100644
index 000000000..5cd786e62
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/spec_instrumentation/fun_spec.move
@@ -0,0 +1,59 @@
+// Contains tests for treatment of function specifications.
+module 0x42::Test {
+
+	fun implicit_and_explicit_abort(a: u64, b: u64): u64 {
+	    if (b != 0) abort(22);
+	    a / b
+	}
+	spec implicit_and_explicit_abort {
+	    aborts_if b == 0 with 22;
+	    aborts_if a == 0;
+	    ensures result == a / b;
+	}
+
+	fun multiple_results(a: u64, b: u64): (u64, u64) {
+	    (a / b, a % b)
+	}
+	spec multiple_results {
+	    aborts_if b == 0 with EXECUTION_FAILURE;
+	    ensures result_1 == a / b;
+	    ensures result_2 == a % b;
+	}
+
+	fun branching_result(is_div: bool, a: u64, b: u64): u64 {
+	    if (is_div) a / b else a * b
+	}
+	spec branching_result {
+	    aborts_if is_div && b == 0 with EXECUTION_FAILURE;
+	    ensures is_div ==> result == a / b;
+	    ensures !is_div ==> result == a * b;
+	}
+
+	struct R has key { v: u64 }
+
+	fun ref_param(r: &R): u64 {
+	    r.v
+	}
+	spec ref_param {
+	    ensures result == r.v;
+	}
+
+	fun ref_param_return_ref(r: &R): &u64 {
+	    &r.v
+	}
+	spec ref_param_return_ref {
+	    ensures result == r.v;
+	}
+
+	fun mut_ref_param(r: &mut R): u64 {
+	    let x = r.v;
+	    r.v = r.v - 1;
+	    x
+	}
+	spec mut_ref_param {
+	    aborts_if r.v == 0 with EXECUTION_FAILURE;
+	    ensures result == old(r.v);
+	    ensures r.v == old(r.v) + 1;
+	}
+
+}
diff --git a/vendors/move/crates/move-stackless-bytecode/tests/testsuite.rs b/vendors/move/crates/move-stackless-bytecode/tests/testsuite.rs
new file mode 100644
index 000000000..d46bc63c8
--- /dev/null
+++ b/vendors/move/crates/move-stackless-bytecode/tests/testsuite.rs
@@ -0,0 +1,287 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::anyhow;
+use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use move_command_line_common::testing::EXP_EXT;
+use move_compiler::{diagnostics::WarningFilters, shared::PackagePaths};
+use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
+use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
+use move_stackless_bytecode::{
+    borrow_analysis::BorrowAnalysisProcessor,
+    clean_and_optimize::CleanAndOptimizeProcessor,
+    data_invariant_instrumentation::DataInvariantInstrumentationProcessor,
+    eliminate_imm_refs::EliminateImmRefsProcessor,
+    escape_analysis::EscapeAnalysisProcessor,
+    function_target_pipeline::{
+        FunctionTargetPipeline, FunctionTargetsHolder, ProcessorResultDisplay,
+    },
+    global_invariant_analysis::GlobalInvariantAnalysisProcessor,
+    global_invariant_instrumentation::GlobalInvariantInstrumentationProcessor,
+    livevar_analysis::LiveVarAnalysisProcessor,
+    memory_instrumentation::MemoryInstrumentationProcessor,
+    mono_analysis::MonoAnalysisProcessor,
+    mut_ref_instrumentation::MutRefInstrumenter,
+    options::ProverOptions,
+    print_targets_for_test,
+    reaching_def_analysis::ReachingDefProcessor,
+    read_write_set_analysis::ReadWriteSetProcessor,
+    spec_instrumentation::SpecInstrumentationProcessor,
+    usage_analysis::UsageProcessor,
+    verification_analysis::VerificationAnalysisProcessor,
+    well_formed_instrumentation::WellFormedInstrumentationProcessor,
+};
+use std::path::Path;
+
+fn get_tested_transformation_pipeline(
+    dir_name: &str,
+) -> anyhow::Result<Option<FunctionTargetPipeline>> {
+    match dir_name {
+        "from_move" => Ok(None),
+        "eliminate_imm_refs" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "mut_ref_instrumentation" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            Ok(Some(pipeline))
+        }
+        "reaching_def" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "livevar" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "borrow" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "borrow_strong" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "escape_analysis" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(Box::new(EscapeAnalysisProcessor {}));
+            Ok(Some(pipeline))
+        }
+        "memory_instr" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "clean_and_optimize" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "verification_analysis" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "spec_instrumentation" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            pipeline.add_processor(SpecInstrumentationProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "data_invariant_instrumentation" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            pipeline.add_processor(SpecInstrumentationProcessor::new());
+            pipeline.add_processor(GlobalInvariantAnalysisProcessor::new());
+            pipeline.add_processor(WellFormedInstrumentationProcessor::new());
+            pipeline.add_processor(DataInvariantInstrumentationProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "global_invariant_analysis" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            pipeline.add_processor(SpecInstrumentationProcessor::new());
+            pipeline.add_processor(GlobalInvariantAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "global_invariant_instrumentation" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(EliminateImmRefsProcessor::new());
+            pipeline.add_processor(MutRefInstrumenter::new());
+            pipeline.add_processor(ReachingDefProcessor::new());
+            pipeline.add_processor(LiveVarAnalysisProcessor::new());
+            pipeline.add_processor(BorrowAnalysisProcessor::new());
+            pipeline.add_processor(MemoryInstrumentationProcessor::new());
+            pipeline.add_processor(CleanAndOptimizeProcessor::new());
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            pipeline.add_processor(SpecInstrumentationProcessor::new());
+            pipeline.add_processor(GlobalInvariantAnalysisProcessor::new());
+            pipeline.add_processor(GlobalInvariantInstrumentationProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "read_write_set" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(Box::new(ReadWriteSetProcessor {}));
+            Ok(Some(pipeline))
+        }
+        "mono_analysis" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(UsageProcessor::new());
+            pipeline.add_processor(VerificationAnalysisProcessor::new());
+            pipeline.add_processor(SpecInstrumentationProcessor::new());
+            pipeline.add_processor(GlobalInvariantAnalysisProcessor::new());
+            pipeline.add_processor(WellFormedInstrumentationProcessor::new());
+            pipeline.add_processor(DataInvariantInstrumentationProcessor::new());
+            pipeline.add_processor(MonoAnalysisProcessor::new());
+            Ok(Some(pipeline))
+        }
+        "usage_analysis" => {
+            let mut pipeline = FunctionTargetPipeline::default();
+            pipeline.add_processor(UsageProcessor::new());
+            Ok(Some(pipeline))
+        }
+        _ => Err(anyhow!(
+            "the sub-directory `{}` has no associated pipeline to test",
+            dir_name
+        )),
+    }
+}
+
+fn test_runner(path: &Path) -> datatest_stable::Result<()> {
+    let mut sources = extract_test_directives(path, "// dep:")?;
+    sources.push(path.to_string_lossy().to_string());
+    let env: GlobalEnv = run_model_builder_with_options(
+        vec![PackagePaths {
+            name: None,
+            paths: sources,
+            named_address_map: move_stdlib::move_stdlib_named_addresses(),
+        }],
+        vec![],
+        ModelBuilderOptions::default(),
+        Some(WarningFilters::unused_warnings_filter_for_test()),
+    )?;
+    let out = if env.has_errors() {
+        let mut error_writer = Buffer::no_color();
+        env.report_diag(&mut error_writer, Severity::Error);
+        String::from_utf8_lossy(&error_writer.into_inner()).to_string()
+    } else {
+        let options = ProverOptions {
+            stable_test_output: true,
+            ..Default::default()
+        };
+        env.set_extension(options);
+        let dir_name = path
+            .parent()
+            .and_then(|p| p.file_name())
+            .and_then(|p| p.to_str())
+            .ok_or_else(|| anyhow!("bad file name"))?;
+        let pipeline_opt = get_tested_transformation_pipeline(dir_name)?;
+
+        // Initialize and print function targets
+        let mut text = String::new();
+        let mut targets = FunctionTargetsHolder::default();
+        for module_env in env.get_modules() {
+            for func_env in module_env.get_functions() {
+                targets.add_target(&func_env);
+            }
+        }
+        text += &print_targets_for_test(&env, "initial translation from Move", &targets);
+
+        // Run pipeline if any
+        if let Some(pipeline) = pipeline_opt {
+            pipeline.run(&env, &mut targets);
+            let processor = pipeline.last_processor();
+            if !processor.is_single_run() {
+                text += &print_targets_for_test(
+                    &env,
+                    &format!("after pipeline `{}`", dir_name),
+                    &targets,
+                );
+            }
+            text += &ProcessorResultDisplay {
+                env: &env,
+                targets: &targets,
+                processor,
+            }
+            .to_string();
+        }
+        // add Warning and Error diagnostics to output
+        let mut error_writer = Buffer::no_color();
+        if env.has_errors() || env.has_warnings() {
+            env.report_diag(&mut error_writer, Severity::Warning);
+            text += "============ Diagnostics ================\n";
+            text += &String::from_utf8_lossy(&error_writer.into_inner());
+        }
+        text
+    };
+    let baseline_path = path.with_extension(EXP_EXT);
+    verify_or_update_baseline(baseline_path.as_path(), &out)?;
+    Ok(())
+}
+
+datatest_stable::harness!(test_runner, "tests", r".*\.move");
diff --git a/vendors/move/crates/move-stdlib/Cargo.toml b/vendors/move/crates/move-stdlib/Cargo.toml
new file mode 100644
index 000000000..1c8a7b562
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "move-stdlib"
+version = "0.1.1"
+edition = "2021"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem stdlib"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[dependencies]
+move-errmapgen.workspace = true
+move-docgen.workspace = true
+move-command-line-common.workspace = true
+move-prover.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-runtime = { path = "../move-vm-runtime" }
+log.workspace = true
+walkdir.workspace = true
+smallvec.workspace = true
+sha2.workspace = true
+sha3.workspace = true
+anyhow = "1.0.71"
+hex.workspace = true
+
+[dev-dependencies]
+move-unit-test.workspace = true
+tempfile.workspace = true
+dir-diff.workspace = true
+file_diff.workspace = true
+move-cli.workspace = true
+move-package.workspace = true
+
+[features]
+default = []
+testing = []
diff --git a/vendors/move/crates/move-stdlib/Move.toml b/vendors/move/crates/move-stdlib/Move.toml
new file mode 100644
index 000000000..2a4fdf0b6
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveStdlib"
+version = "1.5.0"
+
+[addresses]
+std = "_"
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/crates/move-stdlib/doc_templates/overview.md b/vendors/move/crates/move-stdlib/doc_templates/overview.md
new file mode 100644
index 000000000..74606d23f
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/doc_templates/overview.md
@@ -0,0 +1,7 @@
+# Move Stdlib Modules
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/crates/move-stdlib/doc_templates/references.md b/vendors/move/crates/move-stdlib/doc_templates/references.md
new file mode 100644
index 000000000..7e71c78da
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/doc_templates/references.md
@@ -0,0 +1,2 @@
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/ascii.md b/vendors/move/crates/move-stdlib/docs/ascii.md
new file mode 100644
index 000000000..5ed684675
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/ascii.md
@@ -0,0 +1,536 @@
+
+<a name="0x1_ascii"></a>
+
+# Module `0x1::ascii`
+
+The <code>ASCII</code> module defines basic string and char newtypes in Move that verify
+that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+
+
+-  [Struct `String`](#0x1_ascii_String)
+-  [Struct `Char`](#0x1_ascii_Char)
+-  [Constants](#@Constants_0)
+-  [Function `char`](#0x1_ascii_char)
+-  [Function `string`](#0x1_ascii_string)
+-  [Function `try_string`](#0x1_ascii_try_string)
+-  [Function `all_characters_printable`](#0x1_ascii_all_characters_printable)
+-  [Function `push_char`](#0x1_ascii_push_char)
+-  [Function `pop_char`](#0x1_ascii_pop_char)
+-  [Function `length`](#0x1_ascii_length)
+-  [Function `as_bytes`](#0x1_ascii_as_bytes)
+-  [Function `into_bytes`](#0x1_ascii_into_bytes)
+-  [Function `byte`](#0x1_ascii_byte)
+-  [Function `is_valid_char`](#0x1_ascii_is_valid_char)
+-  [Function `is_printable_char`](#0x1_ascii_is_printable_char)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a name="0x1_ascii_String"></a>
+
+## Struct `String`
+
+The <code><a href="ascii.md#0x1_ascii_String">String</a></code> struct holds a vector of bytes that all represent
+valid ASCII characters. Note that these ASCII characters may not all
+be printable. To determine if a <code><a href="ascii.md#0x1_ascii_String">String</a></code> contains only "printable"
+characters you should use the <code>all_characters_printable</code> predicate
+defined in this module.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> i in 0..len(bytes): <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_Char"></a>
+
+## Struct `Char`
+
+An ASCII character.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_Char">Char</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>byte: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte);
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_ascii_EINVALID_ASCII_CHARACTER"></a>
+
+An invalid ASCII character was encountered when creating an ASCII string.
+
+
+<pre><code><b>const</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>: u64 = 65536;
+</code></pre>
+
+
+
+<a name="0x1_ascii_char"></a>
+
+## Function `char`
+
+Convert a <code>byte</code> into a <code><a href="ascii.md#0x1_ascii_Char">Char</a></code> that is checked to make sure it is valid ASCII.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <b>assert</b>!(<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte), <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>);
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_string"></a>
+
+## Function `string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Aborts if
+<code>bytes</code> contains non-ASCII characters.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">String</a> {
+   <b>let</b> x = <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes);
+   <b>assert</b>!(
+        <a href="option.md#0x1_option_is_some">option::is_some</a>(&x),
+        <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>
+   );
+   <a href="option.md#0x1_option_destroy_some">option::destroy_some</a>(x)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> exists i in 0..len(bytes): !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_try_string"></a>
+
+## Function `try_string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Returns
+<code>Some(&lt;ascii_string&gt;)</code> if the <code>bytes</code> contains all valid ASCII
+characters. Otherwise returns <code>None</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="ascii.md#0x1_ascii_String">ascii::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ascii.md#0x1_ascii_String">String</a>&gt; {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> possible_byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(possible_byte)) <b>return</b> <a href="option.md#0x1_option_none">option::none</a>();
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+   };
+   <a href="option.md#0x1_option_some">option::some</a>(<a href="ascii.md#0x1_ascii_String">String</a> { bytes })
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_all_characters_printable"></a>
+
+## Function `all_characters_printable`
+
+Returns <code><b>true</b></code> if all characters in <code><a href="string.md#0x1_string">string</a></code> are printable characters
+Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1_ascii_String">String</a></code>s are printable strings.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): bool {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&<a href="string.md#0x1_string">string</a>.bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="string.md#0x1_string">string</a>.bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte)) <b>return</b> <b>false</b>;
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+   };
+   <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> result ==&gt; (<b>forall</b> j in 0..len(<a href="string.md#0x1_string">string</a>.bytes): <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]));
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_push_char"></a>
+
+## Function `push_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>, char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>, char: <a href="ascii.md#0x1_ascii_Char">Char</a>) {
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes, char.byte);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) + 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_pop_char"></a>
+
+## Function `pop_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte: <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) - 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_as_bytes"></a>
+
+## Function `as_bytes`
+
+Get the inner bytes of the <code><a href="string.md#0x1_string">string</a></code> as a reference
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   &<a href="string.md#0x1_string">string</a>.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_into_bytes"></a>
+
+## Function `into_bytes`
+
+Unpack the <code><a href="string.md#0x1_string">string</a></code> to get its backing bytes
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   <b>let</b> <a href="ascii.md#0x1_ascii_String">String</a> { bytes } = <a href="string.md#0x1_string">string</a>;
+   bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_byte"></a>
+
+## Function `byte`
+
+Unpack the <code>char</code> into its underlying byte.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">Char</a>): u8 {
+   <b>let</b> <a href="ascii.md#0x1_ascii_Char">Char</a> { byte } = char;
+   byte
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_valid_char"></a>
+
+## Function `is_valid_char`
+
+Returns <code><b>true</b></code> if <code>b</code> is a valid ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool {
+   b &lt;= 0x7F
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_printable_char"></a>
+
+## Function `is_printable_char`
+
+Returns <code><b>true</b></code> if <code>byte</code> is an printable ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool {
+   byte &gt;= 0x20 && // Disallow metacharacters
+   <a href="ascii.md#0x1_ascii_byte">byte</a> &lt;= 0x7E // Don't allow DEL metacharacter
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/bcs.md b/vendors/move/crates/move-stdlib/docs/bcs.md
new file mode 100644
index 000000000..9b235af18
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/bcs.md
@@ -0,0 +1,59 @@
+
+<a name="0x1_bcs"></a>
+
+# Module `0x1::bcs`
+
+Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+Serialization). BCS is the binary encoding for Move resources and other non-module values
+published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+details on BCS.
+
+
+-  [Function `to_bytes`](#0x1_bcs_to_bytes)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bcs_to_bytes"></a>
+
+## Function `to_bytes`
+
+Return the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+
+
+Native function which is defined in the prover's prelude.
+
+
+<a name="0x1_bcs_serialize"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialize">serialize</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/bit_vector.md b/vendors/move/crates/move-stdlib/docs/bit_vector.md
new file mode 100644
index 000000000..79d5a5c3e
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/bit_vector.md
@@ -0,0 +1,447 @@
+
+<a name="0x1_bit_vector"></a>
+
+# Module `0x1::bit_vector`
+
+
+
+-  [Struct `BitVector`](#0x1_bit_vector_BitVector)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_bit_vector_new)
+-  [Function `set`](#0x1_bit_vector_set)
+-  [Function `unset`](#0x1_bit_vector_unset)
+-  [Function `shift_left`](#0x1_bit_vector_shift_left)
+-  [Function `is_index_set`](#0x1_bit_vector_is_index_set)
+-  [Function `length`](#0x1_bit_vector_length)
+-  [Function `longest_set_sequence_starting_at`](#0x1_bit_vector_longest_set_sequence_starting_at)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bit_vector_BitVector"></a>
+
+## Struct `BitVector`
+
+
+
+<pre><code><b>struct</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bit_field: <a href="vector.md#0x1_vector">vector</a>&lt;bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_bit_vector_EINDEX"></a>
+
+The provided index is out of bounds
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_ELENGTH"></a>
+
+An invalid length of bitvector was given
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 131073;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_MAX_SIZE"></a>
+
+The maximum allowed bitvector size
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>: u64 = 1024;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_new"></a>
+
+## Function `new`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+    <b>assert</b>!(length &gt; 0, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>assert</b>!(<a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt; <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>let</b> counter = 0;
+    <b>let</b> bit_field = <a href="vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>while</b> ({<b>spec</b> {
+        <b>invariant</b> counter &lt;= length;
+        <b>invariant</b> len(bit_field) == counter;
+    };
+        (counter &lt; length)}) {
+        <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bit_field, <b>false</b>);
+        counter = counter + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> counter == length;
+        <b>assert</b> len(bit_field) == length;
+    };
+
+    <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+        length,
+        bit_field,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a>;
+<b>ensures</b> result.length == length;
+<b>ensures</b> len(result.bit_field) == length;
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_NewAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a> {
+    length: u64;
+    <b>aborts_if</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt;= 0 <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+    <b>aborts_if</b> length &gt;= <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a> <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_set"></a>
+
+## Function `set`
+
+Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a>;
+<b>ensures</b> bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_SetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_unset"></a>
+
+## Function `unset`
+
+Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
+<b>ensures</b> !bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_UnsetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_shift_left"></a>
+
+## Function `shift_left`
+
+Shift the <code>bitvector</code> left by <code>amount</code>. If <code>amount</code> is greater than the
+bitvector's length the bitvector will be zeroed out.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, amount: u64) {
+    <b>if</b> (amount &gt;= bitvector.length) {
+       <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field);
+       <b>let</b> i = 0;
+       <b>while</b> (i &lt; len) {
+           <b>let</b> elem = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, i);
+           *elem = <b>false</b>;
+           i = i + 1;
+       };
+    } <b>else</b> {
+        <b>let</b> i = amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <b>if</b> (<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, i)) <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector, i - amount)
+            <b>else</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i - amount);
+            i = i + 1;
+        };
+
+        i = bitvector.length - amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i);
+            i = i + 1;
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_is_index_set"></a>
+
+## Function `is_index_set`
+
+Return the value of the bit at <code>bit_index</code> in the <code>bitvector</code>. <code><b>true</b></code>
+represents "1" and <code><b>false</b></code> represents a 0
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bitvector.bit_field, bit_index)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a>;
+<b>ensures</b> result == bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_IsIndexSetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_spec_is_index_set"></a>
+
+
+<pre><code><b>fun</b> <a href="bit_vector.md#0x1_bit_vector_spec_is_index_set">spec_is_index_set</a>(bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+   <b>if</b> (bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector)) {
+       <b>false</b>
+   } <b>else</b> {
+       bitvector.bit_field[bit_index]
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_length"></a>
+
+## Function `length`
+
+Return the length (number of usable bits) of this bitvector
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_longest_set_sequence_starting_at"></a>
+
+## Function `longest_set_sequence_starting_at`
+
+Returns the length of the longest sequence of set bits starting at (and
+including) <code>start_index</code> in the <code>bitvector</code>. If there is no such
+sequence, then <code>0</code> is returned.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, start_index: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, start_index: u64): u64 {
+    <b>assert</b>!(start_index &lt; bitvector.length, <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> index = start_index;
+
+    // Find the greatest index in the <a href="vector.md#0x1_vector">vector</a> such that all indices less than it are set.
+    <b>while</b> (index &lt; bitvector.length) {
+        <b>if</b> (!<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, index)) <b>break</b>;
+        index = index + 1;
+    };
+
+    index - start_index
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/error.md b/vendors/move/crates/move-stdlib/docs/error.md
new file mode 100644
index 000000000..0cc2487da
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/error.md
@@ -0,0 +1,475 @@
+
+<a name="0x1_error"></a>
+
+# Module `0x1::error`
+
+This module defines a set of canonical error codes which are optional to use by applications for the
+<code><b>abort</b></code> and <code><b>assert</b>!</code> features.
+
+Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+Given an error category <code>0x1</code> and a reason <code>0x3</code>, a canonical abort code looks as <code>0x10003</code>.
+
+A module can use a canonical code with a constant declaration of the following form:
+
+```
+///  An invalid ASCII character was encountered when creating a string.
+const EINVALID_CHARACTER: u64 = 0x010003;
+```
+
+This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+error reason understand by the existing error map tooling, or as a canonical code.
+
+The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+error codes here are a bit richer than HTTP codes.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `canonical`](#0x1_error_canonical)
+-  [Function `invalid_argument`](#0x1_error_invalid_argument)
+-  [Function `out_of_range`](#0x1_error_out_of_range)
+-  [Function `invalid_state`](#0x1_error_invalid_state)
+-  [Function `unauthenticated`](#0x1_error_unauthenticated)
+-  [Function `permission_denied`](#0x1_error_permission_denied)
+-  [Function `not_found`](#0x1_error_not_found)
+-  [Function `aborted`](#0x1_error_aborted)
+-  [Function `already_exists`](#0x1_error_already_exists)
+-  [Function `resource_exhausted`](#0x1_error_resource_exhausted)
+-  [Function `internal`](#0x1_error_internal)
+-  [Function `not_implemented`](#0x1_error_not_implemented)
+-  [Function `unavailable`](#0x1_error_unavailable)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_error_ABORTED"></a>
+
+Concurrency conflict, such as read-modify-write conflict (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ABORTED">ABORTED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a name="0x1_error_ALREADY_EXISTS"></a>
+
+The resource that a client tried to create already exists (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>: u64 = 8;
+</code></pre>
+
+
+
+<a name="0x1_error_CANCELLED"></a>
+
+Request cancelled by the client (http: 499)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_CANCELLED">CANCELLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a name="0x1_error_INTERNAL"></a>
+
+Internal error (http: 500)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INTERNAL">INTERNAL</a>: u64 = 11;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_ARGUMENT"></a>
+
+Caller specified an invalid argument (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_STATE"></a>
+
+The system is not in a state where the operation can be performed (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_FOUND"></a>
+
+A specified resource is not found (http: 404)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_IMPLEMENTED"></a>
+
+Feature not implemented (http: 501)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>: u64 = 12;
+</code></pre>
+
+
+
+<a name="0x1_error_OUT_OF_RANGE"></a>
+
+An input or result of a computation is out of range (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_error_PERMISSION_DENIED"></a>
+
+client does not have sufficient permission (http: 403)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a name="0x1_error_RESOURCE_EXHAUSTED"></a>
+
+Out of gas or other forms of quota (http: 429)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAUTHENTICATED"></a>
+
+Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAVAILABLE"></a>
+
+The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a name="0x1_error_canonical"></a>
+
+## Function `canonical`
+
+Construct a canonical error code from a category and a reason.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64 {
+  (category &lt;&lt; 16) + reason
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+Functions to construct a canonical error code of the given category.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_out_of_range"></a>
+
+## Function `out_of_range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unauthenticated"></a>
+
+## Function `unauthenticated`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_permission_denied"></a>
+
+## Function `permission_denied`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_found"></a>
+
+## Function `not_found`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_aborted"></a>
+
+## Function `aborted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ABORTED">ABORTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_already_exists"></a>
+
+## Function `already_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_resource_exhausted"></a>
+
+## Function `resource_exhausted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INTERNAL">INTERNAL</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_implemented"></a>
+
+## Function `not_implemented`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unavailable"></a>
+
+## Function `unavailable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/fixed_point32.md b/vendors/move/crates/move-stdlib/docs/fixed_point32.md
new file mode 100644
index 000000000..55848f5f7
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/fixed_point32.md
@@ -0,0 +1,833 @@
+
+<a name="0x1_fixed_point32"></a>
+
+# Module `0x1::fixed_point32`
+
+Defines a fixed-point numeric type with a 32-bit integer part and
+a 32-bit fractional part.
+
+
+-  [Struct `FixedPoint32`](#0x1_fixed_point32_FixedPoint32)
+-  [Constants](#@Constants_0)
+-  [Function `multiply_u64`](#0x1_fixed_point32_multiply_u64)
+-  [Function `divide_u64`](#0x1_fixed_point32_divide_u64)
+-  [Function `create_from_rational`](#0x1_fixed_point32_create_from_rational)
+-  [Function `create_from_raw_value`](#0x1_fixed_point32_create_from_raw_value)
+-  [Function `get_raw_value`](#0x1_fixed_point32_get_raw_value)
+-  [Function `is_zero`](#0x1_fixed_point32_is_zero)
+-  [Function `min`](#0x1_fixed_point32_min)
+-  [Function `max`](#0x1_fixed_point32_max)
+-  [Function `create_from_u64`](#0x1_fixed_point32_create_from_u64)
+-  [Function `floor`](#0x1_fixed_point32_floor)
+-  [Function `ceil`](#0x1_fixed_point32_ceil)
+-  [Function `round`](#0x1_fixed_point32_round)
+-  [Module Specification](#@Module_Specification_1)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_fixed_point32_FixedPoint32"></a>
+
+## Struct `FixedPoint32`
+
+Define a fixed-point numeric type with 32 fractional bits.
+This is just a u64 integer but it is wrapped in a struct to
+make a unique type. This is a binary representation, so decimal
+values may not be exactly representable, but it provides more
+than 9 decimal digits of precision both before and after the
+decimal point (18 digits total). For comparison, double precision
+floating-point has less than 16 decimal digits of precision, so
+be careful about using floating-point to convert these values to
+decimal.
+
+
+<pre><code><b>struct</b> <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_fixed_point32_MAX_U64"></a>
+
+> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDENOMINATOR"></a>
+
+The denominator provided was zero
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION"></a>
+
+The quotient value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION_BY_ZERO"></a>
+
+A division by zero was encountered
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EMULTIPLICATION"></a>
+
+The multiplied value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_ERATIO_OUT_OF_RANGE"></a>
+
+The computed ratio when converting to a <code><a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a></code> would be unrepresentable
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_multiply_u64"></a>
+
+## Function `multiply_u64`
+
+Multiply a u64 integer by a fixed-point number, truncating any
+fractional part of the product. This will abort if the product
+overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // The product of two 64 bit values <b>has</b> 128 bits, so perform the
+    // multiplication <b>with</b> u128 types and keep the full 128 bit product
+    // <b>to</b> avoid losing accuracy.
+    <b>let</b> unscaled_product = (val <b>as</b> u128) * (multiplier.value <b>as</b> u128);
+    // The unscaled product <b>has</b> 32 fractional bits (from the multiplier)
+    // so rescale it by shifting away the low bits.
+    <b>let</b> product = unscaled_product &gt;&gt; 32;
+    // Check whether the value is too large.
+    <b>assert</b>!(product &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>);
+    (product <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_MultiplyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a> {
+    val: num;
+    multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_multiply_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val: num, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val * multiplier.value) &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_divide_u64"></a>
+
+## Function `divide_u64`
+
+Divide a u64 integer by a fixed-point number, truncating any
+fractional part of the quotient. This will abort if the divisor
+is zero or if the quotient overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // Check for division by zero.
+    <b>assert</b>!(divisor.value != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>);
+    // First convert <b>to</b> 128 bits and then shift left <b>to</b>
+    // add 32 fractional zero bits <b>to</b> the dividend.
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_value / (divisor.value <b>as</b> u128);
+    // Check whether the value is too large.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>);
+    // the value may be too large, which will cause the cast <b>to</b> fail
+    // <b>with</b> an arithmetic <a href="error.md#0x1_error">error</a>.
+    (quotient <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_DivideAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a> {
+    val: num;
+    divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> divisor.value == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_divide_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val: num, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val &lt;&lt; 32) / divisor.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_rational"></a>
+
+## Function `create_from_rational`
+
+Create a fixed-point value from a rational number specified by its
+numerator and denominator. Calling this function should be preferred
+for using <code><a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">Self::create_from_raw_value</a></code> which is also available.
+This will abort if the denominator is zero. It will also
+abort if the numerator is nonzero and the ratio is not in the range
+2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+rounding errors: if you round to display N digits after the decimal
+point, you can use a denominator of 10^N to avoid numbers where the
+very small imprecision in the binary representation could change the
+rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    // If the denominator is zero, this will <b>abort</b>.
+    // Scale the numerator <b>to</b> have 64 fractional bits and the denominator
+    // <b>to</b> have 32 fractional bits, so that the quotient will have 32
+    // fractional bits.
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(scaled_denominator != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>);
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>assert</b>!(quotient != 0 || numerator == 0, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    // Return the quotient <b>as</b> a fixed-point number. We first need <b>to</b> check whether the cast
+    // can succeed.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value: (quotient <b>as</b> u64) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator, denominator);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromRationalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
+    numerator: u64;
+    denominator: u64;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>;
+    <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+    <b>aborts_if</b> quotient &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_rational"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator: num, denominator: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (numerator &lt;&lt; 64) / (denominator &lt;&lt; 32)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_raw_value"></a>
+
+## Function `create_from_raw_value`
+
+Create a fixedpoint value from a raw value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.value == value;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_get_raw_value"></a>
+
+## Function `get_raw_value`
+
+Accessor for the raw u64 value. Other less common operations, such as
+adding or subtracting FixedPoint32 values, can be done using the raw
+values directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_is_zero"></a>
+
+## Function `is_zero`
+
+Returns true if the ratio is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): bool {
+    num.value == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_u64"></a>
+
+## Function `create_from_u64`
+
+Create a fixedpoint value from a u64 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>let</b> value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(value &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (value <b>as</b> u64)}
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: val &lt;&lt; 32}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint32 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 32
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u128) + (1 &lt;&lt; 32));
+    (val &gt;&gt; 32 <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint32 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 32) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 32
+    } <b>else</b> {
+        <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> boundary = (1 &lt;&lt; 32) / 2;
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/hash.md b/vendors/move/crates/move-stdlib/docs/hash.md
new file mode 100644
index 000000000..c054f33cb
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/hash.md
@@ -0,0 +1,65 @@
+
+<a name="0x1_hash"></a>
+
+# Module `0x1::hash`
+
+Module which defines SHA hashes for byte vectors.
+
+The functions in this module are natively declared both in the Move runtime
+as in the Move prover's prelude.
+
+
+-  [Function `sha2_256`](#0x1_hash_sha2_256)
+-  [Function `sha3_256`](#0x1_hash_sha3_256)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_hash_sha2_256"></a>
+
+## Function `sha2_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_hash_sha3_256"></a>
+
+## Function `sha3_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/option.md b/vendors/move/crates/move-stdlib/docs/option.md
new file mode 100644
index 000000000..1c9ea0dcf
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/option.md
@@ -0,0 +1,877 @@
+
+<a name="0x1_option"></a>
+
+# Module `0x1::option`
+
+This module defines the Option type and its methods to represent and handle an optional value.
+
+
+-  [Struct `Option`](#0x1_option_Option)
+-  [Constants](#@Constants_0)
+-  [Function `none`](#0x1_option_none)
+-  [Function `some`](#0x1_option_some)
+-  [Function `is_none`](#0x1_option_is_none)
+-  [Function `is_some`](#0x1_option_is_some)
+-  [Function `contains`](#0x1_option_contains)
+-  [Function `borrow`](#0x1_option_borrow)
+-  [Function `borrow_with_default`](#0x1_option_borrow_with_default)
+-  [Function `get_with_default`](#0x1_option_get_with_default)
+-  [Function `fill`](#0x1_option_fill)
+-  [Function `extract`](#0x1_option_extract)
+-  [Function `borrow_mut`](#0x1_option_borrow_mut)
+-  [Function `swap`](#0x1_option_swap)
+-  [Function `swap_or_fill`](#0x1_option_swap_or_fill)
+-  [Function `destroy_with_default`](#0x1_option_destroy_with_default)
+-  [Function `destroy_some`](#0x1_option_destroy_some)
+-  [Function `destroy_none`](#0x1_option_destroy_none)
+-  [Function `to_vec`](#0x1_option_to_vec)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Schema](#@Helper_Schema_2)
+
+
+<pre><code><b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_option_Option"></a>
+
+## Struct `Option`
+
+Abstraction of a value that may or may not be present. Implemented with a vector of size
+zero or one because Move bytecode does not have ADTs.
+
+
+<pre><code><b>struct</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+The size of vector is always less than equal to 1
+because it's 0 for "none" or 1 for "some".
+
+
+<pre><code><b>invariant</b> len(vec) &lt;= 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_option_EOPTION_IS_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>Some</code> while it should be <code>None</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 262144;
+</code></pre>
+
+
+
+<a name="0x1_option_EOPTION_NOT_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>None</code> while it should be <code>Some</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 262145;
+</code></pre>
+
+
+
+<a name="0x1_option_none"></a>
+
+## Function `none`
+
+Return an empty <code><a href="option.md#0x1_option_Option">Option</a></code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_empty">vector::empty</a>() }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;();
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_none"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_some"></a>
+
+## Function `some`
+
+Return an <code><a href="option.md#0x1_option_Option">Option</a></code> containing <code>e</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_singleton">vector::singleton</a>(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_some">spec_some</a>(e);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_some"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_some">spec_some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_none"></a>
+
+## Function `is_none`
+
+Return true if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_some"></a>
+
+## Function `is_some`
+
+Return true if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    !<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_some">is_some</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_contains"></a>
+
+## Function `contains`
+
+Return true if the value in <code>t</code> is equal to <code>e_ref</code>
+Always returns <code><b>false</b></code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e_ref: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e_ref: &Element): bool {
+    <a href="vector.md#0x1_vector_contains">vector::contains</a>(&t.vec, e_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_contains">spec_contains</a>(t, e_ref);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_contains">spec_contains</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): bool {
+   <a href="option.md#0x1_option_is_some">is_some</a>(t) && <a href="option.md#0x1_option_borrow">borrow</a>(t) == e
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow"></a>
+
+## Function `borrow`
+
+Return an immutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Return a reference to the value inside <code>t</code> if it holds one
+Return <code>default_ref</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default_ref: &Element): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default_ref: &Element): &Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default_ref
+    <b>else</b> <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default_ref);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_get_with_default"></a>
+
+## Function `get_with_default`
+
+Return the value inside <code>t</code> if it holds one
+Return <code>default</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b>, drop&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b> + drop&gt;(
+    t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;,
+    default: Element,
+): Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default
+    <b>else</b> *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_fill"></a>
+
+## Function `fill`
+
+Convert the none option <code>t</code> to a some option by adding <code>e</code>.
+Aborts if <code>t</code> already holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element) {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e)
+    <b>else</b> <b>abort</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_extract"></a>
+
+## Function `extract`
+
+Convert a <code>some</code> option to a <code>none</code> by removing and returning the value stored inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &<b>mut</b> Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap"></a>
+
+## Function `swap`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref);
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap_or_fill"></a>
+
+## Function `swap_or_fill`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value;
+or if there is no old value, fill it with <code>e</code>.
+Different from swap(), swap_or_fill() allows for <code>t</code> not holding a value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="option.md#0x1_option_none">none</a>()
+        <b>else</b> <a href="option.md#0x1_option_some">some</a>(<a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref));
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <b>old</b>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_with_default"></a>
+
+## Function `destroy_with_default`
+
+Destroys <code>t.</code> If <code>t</code> holds a value, return it. Returns <code>default</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default: Element): Element {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&vec)) default
+    <b>else</b> <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_some"></a>
+
+## Function `destroy_some`
+
+Unpack <code>t</code> and return its contents
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(&t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>let</b> elem = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec);
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec);
+    elem
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_none"></a>
+
+## Function `destroy_none`
+
+Unpack <code>t</code>
+Aborts if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;) {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_none">is_none</a>(&t), <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_to_vec"></a>
+
+## Function `to_vec`
+
+Convert <code>t</code> into a vector of length 1 if it is <code>Some</code>,
+and an empty vector otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == t.vec;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a name="@Helper_Schema_2"></a>
+
+### Helper Schema
+
+
+
+<a name="0x1_option_AbortsIfNone"></a>
+
+
+<pre><code><b>schema</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt; {
+    t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;;
+    <b>aborts_if</b> <a href="option.md#0x1_option_is_none">is_none</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>;
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/overview.md b/vendors/move/crates/move-stdlib/docs/overview.md
new file mode 100644
index 000000000..e8aff3f04
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/overview.md
@@ -0,0 +1,28 @@
+
+<a name="@Move_Stdlib_Modules_0"></a>
+
+# Move Stdlib Modules
+
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+
+<a name="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::ascii`](ascii.md#0x1_ascii)
+-  [`0x1::bcs`](bcs.md#0x1_bcs)
+-  [`0x1::bit_vector`](bit_vector.md#0x1_bit_vector)
+-  [`0x1::error`](error.md#0x1_error)
+-  [`0x1::fixed_point32`](fixed_point32.md#0x1_fixed_point32)
+-  [`0x1::hash`](hash.md#0x1_hash)
+-  [`0x1::option`](option.md#0x1_option)
+-  [`0x1::signer`](signer.md#0x1_signer)
+-  [`0x1::string`](string.md#0x1_string)
+-  [`0x1::type_name`](type_name.md#0x1_type_name)
+-  [`0x1::vector`](vector.md#0x1_vector)
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/signer.md b/vendors/move/crates/move-stdlib/docs/signer.md
new file mode 100644
index 000000000..bc4020096
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/signer.md
@@ -0,0 +1,87 @@
+
+<a name="0x1_signer"></a>
+
+# Module `0x1::signer`
+
+
+
+-  [Function `borrow_address`](#0x1_signer_borrow_address)
+-  [Function `address_of`](#0x1_signer_address_of)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_signer_borrow_address"></a>
+
+## Function `borrow_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_signer_address_of"></a>
+
+## Function `address_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b> {
+    *<a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+Return true only if <code>s</code> is a transaction signer. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer">is_txn_signer</a>(s: <a href="signer.md#0x1_signer">signer</a>): bool;
+</code></pre>
+
+
+Return true only if <code>a</code> is a transaction signer address. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer_addr"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer_addr">is_txn_signer_addr</a>(a: <b>address</b>): bool;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/string.md b/vendors/move/crates/move-stdlib/docs/string.md
new file mode 100644
index 000000000..e962b56d8
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/string.md
@@ -0,0 +1,446 @@
+
+<a name="0x1_string"></a>
+
+# Module `0x1::string`
+
+The <code><a href="string.md#0x1_string">string</a></code> module defines the <code><a href="string.md#0x1_string_String">String</a></code> type which represents UTF8 encoded strings.
+
+
+-  [Struct `String`](#0x1_string_String)
+-  [Constants](#@Constants_0)
+-  [Function `utf8`](#0x1_string_utf8)
+-  [Function `try_utf8`](#0x1_string_try_utf8)
+-  [Function `bytes`](#0x1_string_bytes)
+-  [Function `is_empty`](#0x1_string_is_empty)
+-  [Function `length`](#0x1_string_length)
+-  [Function `append`](#0x1_string_append)
+-  [Function `append_utf8`](#0x1_string_append_utf8)
+-  [Function `insert`](#0x1_string_insert)
+-  [Function `sub_string`](#0x1_string_sub_string)
+-  [Function `index_of`](#0x1_string_index_of)
+-  [Function `internal_check_utf8`](#0x1_string_internal_check_utf8)
+-  [Function `internal_is_char_boundary`](#0x1_string_internal_is_char_boundary)
+-  [Function `internal_sub_string`](#0x1_string_internal_sub_string)
+-  [Function `internal_index_of`](#0x1_string_internal_index_of)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_string_String"></a>
+
+## Struct `String`
+
+A <code><a href="string.md#0x1_string_String">String</a></code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="string.md#0x1_string_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_string_EINVALID_INDEX"></a>
+
+Index out of range.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_string_EINVALID_UTF8"></a>
+
+An invalid UTF8 encoding.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_string_utf8"></a>
+
+## Function `utf8`
+
+Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+    <b>assert</b>!(<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes), <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>);
+    <a href="string.md#0x1_string_String">String</a>{bytes}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_try_utf8"></a>
+
+## Function `try_utf8`
+
+Tries to create a new string from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="string.md#0x1_string_String">String</a>&gt; {
+    <b>if</b> (<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes)) {
+        <a href="option.md#0x1_option_some">option::some</a>(<a href="string.md#0x1_string_String">String</a>{bytes})
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_bytes"></a>
+
+## Function `bytes`
+
+Returns a reference to the underlying byte vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    &s.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_is_empty"></a>
+
+## Function `is_empty`
+
+Checks whether this string is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">String</a>): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_length"></a>
+
+## Function `length`
+
+Returns the length of this string, in bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append"></a>
+
+## Function `append`
+
+Appends a string.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, r: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, r: <a href="string.md#0x1_string_String">String</a>) {
+    <a href="vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> s.bytes, r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append_utf8"></a>
+
+## Function `append_utf8`
+
+Appends bytes which must be in valid utf8 format.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="string.md#0x1_string_append">append</a>(s, <a href="string.md#0x1_string_utf8">utf8</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_insert"></a>
+
+## Function `insert`
+
+Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+boundary.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, at: u64, o: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, at: u64, o: <a href="string.md#0x1_string_String">String</a>) {
+    <b>let</b> bytes = &s.bytes;
+    <b>assert</b>!(at &lt;= <a href="vector.md#0x1_vector_length">vector::length</a>(bytes) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, at), <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>);
+    <b>let</b> l = <a href="string.md#0x1_string_length">length</a>(s);
+    <b>let</b> front = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, 0, at);
+    <b>let</b> end = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, at, l);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, o);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, end);
+    *s = front;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_sub_string"></a>
+
+## Function `sub_string`
+
+Returns a sub-string using the given byte indices, where <code>i</code> is the first byte position and <code>j</code> is the start
+of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+guaranteeing that the result is valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">String</a> {
+    <b>let</b> bytes = &s.bytes;
+    <b>let</b> l = <a href="vector.md#0x1_vector_length">vector::length</a>(bytes);
+    <b>assert</b>!(
+        j &lt;= l && i &lt;= j && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, i) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, j),
+        <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>
+    );
+    <a href="string.md#0x1_string_String">String</a>{bytes: <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(bytes, i, j)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_index_of"></a>
+
+## Function `index_of`
+
+Computes the index of the first occurrence of a string. Returns <code><a href="string.md#0x1_string_length">length</a>(s)</code> if no occurrence found.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, r: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">String</a>, r: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(&s.bytes, &r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_check_utf8"></a>
+
+## Function `internal_check_utf8`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_is_char_boundary"></a>
+
+## Function `internal_is_char_boundary`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_sub_string"></a>
+
+## Function `internal_sub_string`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_index_of"></a>
+
+## Function `internal_index_of`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/type_name.md b/vendors/move/crates/move-stdlib/docs/type_name.md
new file mode 100644
index 000000000..070e0ffd5
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/type_name.md
@@ -0,0 +1,158 @@
+
+<a name="0x1_type_name"></a>
+
+# Module `0x1::type_name`
+
+Functionality for converting Move types into values. Use with care!
+
+
+-  [Struct `TypeName`](#0x1_type_name_TypeName)
+-  [Function `get`](#0x1_type_name_get)
+-  [Function `get_with_original_ids`](#0x1_type_name_get_with_original_ids)
+-  [Function `borrow_string`](#0x1_type_name_borrow_string)
+-  [Function `into_string`](#0x1_type_name_into_string)
+
+
+<pre><code><b>use</b> <a href="ascii.md#0x1_ascii">0x1::ascii</a>;
+</code></pre>
+
+
+
+<a name="0x1_type_name_TypeName"></a>
+
+## Struct `TypeName`
+
+
+
+<pre><code><b>struct</b> <a href="type_name.md#0x1_type_name_TypeName">TypeName</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="ascii.md#0x1_ascii_String">ascii::String</a></code>
+</dt>
+<dd>
+ String representation of the type. All types are represented
+ using their source syntax:
+ "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+ Struct types are represented as fully qualified type names; e.g.
+ <code>00000000000000000000000000000001::string::String</code> or
+ <code>0000000000000000000000000000000a::module_name1::type_name1&lt;0000000000000000000000000000000a::module_name2::type_name2&lt;u64&gt;&gt;</code>
+ Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_type_name_get"></a>
+
+## Function `get`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are defining IDs (the ID of the package in
+storage that first introduced the type).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_get_with_original_ids"></a>
+
+## Function `get_with_original_ids`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are original IDs (the ID of the first version of
+the package, even if the type in question was introduced in a
+later upgrade).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_borrow_string"></a>
+
+## Function `borrow_string`
+
+Get the String representation of <code>self</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): &<a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): &String {
+    &self.name
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_into_string"></a>
+
+## Function `into_string`
+
+Convert <code>self</code> into its inner String
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): String {
+    self.name
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/docs/vector.md b/vendors/move/crates/move-stdlib/docs/vector.md
new file mode 100644
index 000000000..dfadab2f5
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/docs/vector.md
@@ -0,0 +1,700 @@
+
+<a name="0x1_vector"></a>
+
+# Module `0x1::vector`
+
+A variable-sized container that can hold any type. Indexing is 0-based, and
+vectors are growable. This module has many native functions.
+Verification of modules that use this one uses model functions that are implemented
+directly in Boogie. The specification language has built-in functions operations such
+as <code>singleton_vector</code>. There are some helper functions defined here for specifications in other
+modules as well.
+
+>Note: We did not verify most of the
+Move functions here because many have loops, requiring loop invariants to prove, and
+the return on investment didn't seem worth it for these simple functions.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_vector_empty)
+-  [Function `length`](#0x1_vector_length)
+-  [Function `borrow`](#0x1_vector_borrow)
+-  [Function `push_back`](#0x1_vector_push_back)
+-  [Function `borrow_mut`](#0x1_vector_borrow_mut)
+-  [Function `pop_back`](#0x1_vector_pop_back)
+-  [Function `destroy_empty`](#0x1_vector_destroy_empty)
+-  [Function `swap`](#0x1_vector_swap)
+-  [Function `singleton`](#0x1_vector_singleton)
+-  [Function `reverse`](#0x1_vector_reverse)
+-  [Function `append`](#0x1_vector_append)
+-  [Function `is_empty`](#0x1_vector_is_empty)
+-  [Function `contains`](#0x1_vector_contains)
+-  [Function `index_of`](#0x1_vector_index_of)
+-  [Function `remove`](#0x1_vector_remove)
+-  [Function `insert`](#0x1_vector_insert)
+-  [Function `swap_remove`](#0x1_vector_swap_remove)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Functions](#@Helper_Functions_2)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+The index into the vector is out of bounds
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_vector_empty"></a>
+
+## Function `empty`
+
+Create an empty vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th element of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_push_back"></a>
+
+## Function `push_back`
+
+Add element <code>e</code> to the end of the vector <code>v</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th element in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an element from the end of vector <code>v</code>.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap"></a>
+
+## Function `swap`
+
+Swaps the elements at the <code>i</code>th and <code>j</code>th indices in the vector <code>v</code>.
+Aborts if <code>i</code> or <code>j</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_singleton"></a>
+
+## Function `singleton`
+
+Return an vector of size one containing element <code>e</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> v = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> v, e);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == vec(e);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverses the order of the elements in the vector <code>v</code> in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>if</b> (len == 0) <b>return</b> ();
+
+    <b>let</b> front_index = 0;
+    <b>let</b> back_index = len -1;
+    <b>while</b> (front_index &lt; back_index) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, front_index, back_index);
+        front_index = front_index + 1;
+        back_index = back_index - 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_append"></a>
+
+## Function `append`
+
+Pushes all of the elements of the <code>other</code> vector into the <code>lhs</code> vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> other);
+    <b>while</b> (!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(&other)) <a href="vector.md#0x1_vector_push_back">push_back</a>(lhs, <a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no elements and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_contains"></a>
+
+## Function `contains`
+
+Return true if <code>e</code> is in the vector <code>v</code>.
+Otherwise, returns false.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> <b>true</b>;
+        i = i + 1;
+    };
+    <b>false</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_index_of"></a>
+
+## Function `index_of`
+
+Return <code>(<b>true</b>, i)</code> if <code>e</code> is in the vector <code>v</code> at index <code>i</code>.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> (<b>true</b>, i);
+        i = i + 1;
+    };
+    (<b>false</b>, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_remove"></a>
+
+## Function `remove`
+
+Remove the <code>i</code>th element of the vector <code>v</code>, shifting all subsequent elements.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i out of bounds; <b>abort</b>
+    <b>if</b> (i &gt;= len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    len = len - 1;
+    <b>while</b> (i &lt; len) <a href="vector.md#0x1_vector_swap">swap</a>(v, i, { i = i + 1; i });
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_insert"></a>
+
+## Function `insert`
+
+Insert <code>e</code> at position <code>i</code> in the vector <code>v</code>.
+If <code>i</code> is in bounds, this shifts the old <code>v[i]</code> and all subsequent elements to the right.
+If <code>i == <a href="vector.md#0x1_vector_length">length</a>(v)</code>, this adds <code>e</code> to the end of the vector.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i &gt; <a href="vector.md#0x1_vector_length">length</a>(v)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i too big <b>abort</b>
+    <b>if</b> (i &gt; len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(v, e);
+    <b>while</b> (i &lt; len) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, i, len);
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th element of the vector <code>v</code> with the last element and then pop the vector.
+This is O(1), but does not preserve ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>assert</b>!(!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(v), <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <b>let</b> last_idx = <a href="vector.md#0x1_vector_length">length</a>(v) - 1;
+    <a href="vector.md#0x1_vector_swap">swap</a>(v, i, last_idx);
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+<a name="@Helper_Functions_2"></a>
+
+### Helper Functions
+
+
+Check if <code>v1</code> is equal to the result of adding <code>e</code> at the end of <code>v2</code>
+
+
+<a name="0x1_vector_eq_push_back"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_push_back">eq_push_back</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element): bool {
+    len(v1) == len(v2) + 1 &&
+    v1[len(v1)-1] == e &&
+    v1[0..len(v1)-1] == v2[0..len(v2)]
+}
+</code></pre>
+
+
+Check if <code>v</code> is equal to the result of concatenating <code>v1</code> and <code>v2</code>
+
+
+<a name="0x1_vector_eq_append"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_append">eq_append</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v) == len(v1) + len(v2) &&
+    v[0..len(v1)] == v1 &&
+    v[len(v1)..len(v)] == v2
+}
+</code></pre>
+
+
+Check <code>v1</code> is equal to the result of removing the first element of <code>v2</code>
+
+
+<a name="0x1_vector_eq_pop_front"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_pop_front">eq_pop_front</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1 == v2[1..len(v2)]
+}
+</code></pre>
+
+
+Check that <code>v1</code> is equal to the result of removing the element at index <code>i</code> from <code>v2</code>.
+
+
+<a name="0x1_vector_eq_remove_elem_at_index"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_remove_elem_at_index">eq_remove_elem_at_index</a>&lt;Element&gt;(i: u64, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1[0..i] == v2[0..i] &&
+    v1[i..len(v1)] == v2[i + 1..len(v2)]
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/crates/move-stdlib/error_description.errmap b/vendors/move/crates/move-stdlib/error_description.errmap
new file mode 100644
index 000000000..e27880958
Binary files /dev/null and b/vendors/move/crates/move-stdlib/error_description.errmap differ
diff --git a/vendors/move/crates/move-stdlib/nursery/Move.toml b/vendors/move/crates/move-stdlib/nursery/Move.toml
new file mode 100644
index 000000000..c7c3506ca
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveNursery"
+version = "1.5.0"
+
+[dependencies]
+MoveStdlib = { local = ".." }
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/crates/move-stdlib/nursery/docs/compare.md b/vendors/move/crates/move-stdlib/nursery/docs/compare.md
new file mode 100644
index 000000000..8d8aa2b74
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/docs/compare.md
@@ -0,0 +1,171 @@
+
+<a name="0x1_compare"></a>
+
+# Module `0x1::compare`
+
+Utilities for comparing Move values based on their representation in BCS.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `cmp_bcs_bytes`](#0x1_compare_cmp_bcs_bytes)
+-  [Function `cmp_u8`](#0x1_compare_cmp_u8)
+-  [Function `cmp_u64`](#0x1_compare_cmp_u64)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_compare_EQUAL"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>: u8 = 0;
+</code></pre>
+
+
+
+<a name="0x1_compare_GREATER_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>: u8 = 2;
+</code></pre>
+
+
+
+<a name="0x1_compare_LESS_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>: u8 = 1;
+</code></pre>
+
+
+
+<a name="0x1_compare_cmp_bcs_bytes"></a>
+
+## Function `cmp_bcs_bytes`
+
+compare vectors <code>v1</code> and <code>v2</code> using (1) vector contents from right to left and then
+(2) vector length to break ties.
+Returns either <code><a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> (0u8), <code><a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (1u8), or <code><a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code> (2u8).
+
+This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+(i.e., vectors produced by <code>bcs::to_bytes</code>). A typical client will call
+<code><a href="compare.md#0x1_compare_cmp_bcs_bytes">compare::cmp_bcs_bytes</a>(bcs::to_bytes(&t1), bcs::to_bytes(&t2))</code>. The comparison provides the
+following guarantees w.r.t the original values t1 and t2:
+- <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(t2, t1) == <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code>
+- <code>compare::cmp&lt;T&gt;(t1, t2) == <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 == t2</code> and (similarly)
+<code>compare::cmp&lt;T&gt;(t1, t2) != <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 != t2</code>, where <code>==</code> and <code>!=</code> denote the Move
+bytecode operations for polymorphic equality.
+- for all primitive types <code>T</code> with <code>&lt;</code> and <code>&gt;</code> comparison operators exposed in Move bytecode
+(<code>u8</code>, <code>u16</code>, <code>u32</code>, <code>u64</code>, <code>u128</code>, <code>u256</code>), we have
+<code>compare_bcs_bytes(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &lt; t2</code> and (similarly)
+<code>compare_bcs_bytes(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &gt; t2</code>.
+
+For all other types, the order is whatever the BCS encoding of the type and the comparison
+strategy above gives you. One case where the order might be surprising is the <code><b>address</b></code>
+type.
+CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+to left, byte-by-byte comparison means that (for example)
+<code>compare_bcs_bytes(bcs(0x01), bcs(0x10)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you'd expect), but
+<code>compare_bcs_bytes(bcs(0x100), bcs(0x001)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you probably wouldn't expect).
+Keep this in mind when using this function to compare addresses.
+
+> TODO: there is currently no specification for this function, which causes no problem because it is not yet
+> used in the Diem framework. However, should this functionality be needed in specification, a customized
+> native abstraction is needed in the prover framework.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8 {
+    <b>let</b> i1 = <a href="_length">vector::length</a>(v1);
+    <b>let</b> i2 = <a href="_length">vector::length</a>(v2);
+    <b>let</b> len_cmp = <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1, i2);
+
+    // BCS uses little endian encoding for all integer types, so we <b>choose</b> <b>to</b> <a href="compare.md#0x1_compare">compare</a> from left
+    // <b>to</b> right. Going right <b>to</b> left would make the behavior of compare::cmp diverge from the
+    // bytecode operators &lt; and &gt; on integer values (which would be confusing).
+    <b>while</b> (i1 &gt; 0 && i2 &gt; 0) {
+        i1 = i1 - 1;
+        i2 = i2 - 1;
+        <b>let</b> elem_cmp = <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(*<a href="_borrow">vector::borrow</a>(v1, i1), *<a href="_borrow">vector::borrow</a>(v2, i2));
+        <b>if</b> (elem_cmp != 0) <b>return</b> elem_cmp
+        // <b>else</b>, <a href="compare.md#0x1_compare">compare</a> next element
+    };
+    // all compared elements equal; <b>use</b> length comparion <b>to</b> <b>break</b> the tie
+    len_cmp
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u8"></a>
+
+## Function `cmp_u8`
+
+Compare two <code>u8</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u64"></a>
+
+## Function `cmp_u64`
+
+Compare two <code>u64</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-stdlib/nursery/docs/debug.md b/vendors/move/crates/move-stdlib/nursery/docs/debug.md
new file mode 100644
index 000000000..33bd18df1
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/docs/debug.md
@@ -0,0 +1,61 @@
+
+<a name="0x1_debug"></a>
+
+# Module `0x1::debug`
+
+Module providing debug functionality.
+
+
+-  [Function `print`](#0x1_debug_print)
+-  [Function `print_stack_trace`](#0x1_debug_print_stack_trace)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_debug_print"></a>
+
+## Function `print`
+
+Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_debug_print_stack_trace"></a>
+
+## Function `print_stack_trace`
+
+Prints the calling function's stack trace.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>();
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/crates/move-stdlib/nursery/sources/compare.move b/vendors/move/crates/move-stdlib/nursery/sources/compare.move
new file mode 100644
index 000000000..73793c200
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/sources/compare.move
@@ -0,0 +1,74 @@
+/// Utilities for comparing Move values based on their representation in BCS.
+module std::compare {
+    use std::vector;
+
+    // Move does not have signed integers, so we cannot use the usual 0, -1, 1 convention to
+    // represent EQUAL, LESS_THAN, and GREATER_THAN. Instead, we fun a new convention using u8
+    // constants:
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+    /// compare vectors `v1` and `v2` using (1) vector contents from right to left and then
+    /// (2) vector length to break ties.
+    /// Returns either `EQUAL` (0u8), `LESS_THAN` (1u8), or `GREATER_THAN` (2u8).
+    ///
+    /// This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+    /// (i.e., vectors produced by `bcs::to_bytes`). A typical client will call
+    /// `compare::cmp_bcs_bytes(bcs::to_bytes(&t1), bcs::to_bytes(&t2))`. The comparison provides the
+    /// following guarantees w.r.t the original values t1 and t2:
+    /// - `cmp_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `cmp_bcs_bytes(t2, t1) == GREATER_THAN`
+    /// - `compare::cmp<T>(t1, t2) == EQUAL` iff `t1 == t2` and (similarly)
+    ///   `compare::cmp<T>(t1, t2) != EQUAL` iff `t1 != t2`, where `==` and `!=` denote the Move
+    ///    bytecode operations for polymorphic equality.
+    /// - for all primitive types `T` with `<` and `>` comparison operators exposed in Move bytecode
+    ///   (`u8`, `u16`, `u32`, `u64`, `u128`, `u256`), we have
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 < t2` and (similarly)
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 > t2`.
+    ///
+    /// For all other types, the order is whatever the BCS encoding of the type and the comparison
+    /// strategy above gives you. One case where the order might be surprising is the `address`
+    /// type.
+    /// CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+    /// to left, byte-by-byte comparison means that (for example)
+    /// `compare_bcs_bytes(bcs(0x01), bcs(0x10)) == LESS_THAN` (as you'd expect), but
+    /// `compare_bcs_bytes(bcs(0x100), bcs(0x001)) == LESS_THAN` (as you probably wouldn't expect).
+    /// Keep this in mind when using this function to compare addresses.
+    ///
+    /// > TODO: there is currently no specification for this function, which causes no problem because it is not yet
+    /// > used in the Diem framework. However, should this functionality be needed in specification, a customized
+    /// > native abstraction is needed in the prover framework.
+    public fun cmp_bcs_bytes(v1: &vector<u8>, v2: &vector<u8>): u8 {
+        let i1 = vector::length(v1);
+        let i2 = vector::length(v2);
+        let len_cmp = cmp_u64(i1, i2);
+
+        // BCS uses little endian encoding for all integer types, so we choose to compare from left
+        // to right. Going right to left would make the behavior of compare::cmp diverge from the
+        // bytecode operators < and > on integer values (which would be confusing).
+        while (i1 > 0 && i2 > 0) {
+            i1 = i1 - 1;
+            i2 = i2 - 1;
+            let elem_cmp = cmp_u8(*vector::borrow(v1, i1), *vector::borrow(v2, i2));
+            if (elem_cmp != 0) return elem_cmp
+            // else, compare next element
+        };
+        // all compared elements equal; use length comparion to break the tie
+        len_cmp
+    }
+
+    /// Compare two `u8`'s
+    fun cmp_u8(i1: u8, i2: u8): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+    /// Compare two `u64`'s
+    fun cmp_u64(i1: u64, i2: u64): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+}
diff --git a/vendors/move/crates/move-stdlib/nursery/sources/debug.move b/vendors/move/crates/move-stdlib/nursery/sources/debug.move
new file mode 100644
index 000000000..d4a506d10
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/sources/debug.move
@@ -0,0 +1,18 @@
+/// Module providing debug functionality.
+module std::debug {
+
+    /// Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+    native public fun print<T>(x: &T);
+
+    /// Prints the calling function's stack trace.
+    native public fun print_stack_trace();
+
+    #[test_only]
+    use std::string;
+
+    #[test_only]
+    /// Utility function for printing a sequence of UTF8 bytes as a string (e.g., `b"Hello"`).
+    public fun print_string(utf8_bytes: vector<u8>) {
+        print<string::String>(&string::utf8(utf8_bytes));
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/nursery/tests/compare_tests.move b/vendors/move/crates/move-stdlib/nursery/tests/compare_tests.move
new file mode 100644
index 000000000..4af198639
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/nursery/tests/compare_tests.move
@@ -0,0 +1,86 @@
+// Tests for polymorphic comparison in Move
+#[test_only]
+module std::compareTests {
+    use std::compare;
+    use std::bcs;
+
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+
+    #[test]
+    fun equality_of_simple_types() {
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&true)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&1u8)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&1u16)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&1u32)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&1u128)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&1u256)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"01")) == EQUAL, 0);
+    }
+
+    #[test]
+    fun inequality_of_simple_types() {
+        // inequality of simple types
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) != EQUAL, 0);
+    }
+
+    #[test]
+    fun less_than_with_natural_ordering() {
+        // less than for types with a natural ordering exposed via bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&false), &bcs::to_bytes(&true)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u8), &bcs::to_bytes(&1u8)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u16), &bcs::to_bytes(&1u16)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u32), &bcs::to_bytes(&1u32)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0), &bcs::to_bytes(&1)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u128), &bcs::to_bytes(&1u128)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u256), &bcs::to_bytes(&1u256)) == LESS_THAN, 0);
+    }
+
+    #[test]
+    fun less_than_without_natural_ordering() {
+        // less then for types without a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x0), &bcs::to_bytes(&@0x1)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x01), &bcs::to_bytes(&@0x10)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x100), &bcs::to_bytes(&@0x001)) == LESS_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"00"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"10")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0000"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); //
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0100"), &bcs::to_bytes(&x"0001")) == LESS_THAN, 0); // potentially confusing
+    }
+
+    #[test]
+    fun greater_than_with_natural_ordering() {
+        // greater than for types with a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) == GREATER_THAN, 0);
+    }
+
+    #[test]
+    fun greater_than_without_natural_ordering() {
+        // greater than for types without a natural ordering exposed by by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x10), &bcs::to_bytes(&@0x01)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x001), &bcs::to_bytes(&@0x100)) == GREATER_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"10"), &bcs::to_bytes(&x"01")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"0000")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0001"), &bcs::to_bytes(&x"0100")) == GREATER_THAN, 0); // potentially confusing
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/ascii.move b/vendors/move/crates/move-stdlib/sources/ascii.move
new file mode 100644
index 000000000..f3c9daec5
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/ascii.move
@@ -0,0 +1,148 @@
+/// The `ASCII` module defines basic string and char newtypes in Move that verify
+/// that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+module std::ascii {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid ASCII character was encountered when creating an ASCII string.
+    const EINVALID_ASCII_CHARACTER: u64 = 0x10000;
+
+   /// The `String` struct holds a vector of bytes that all represent
+   /// valid ASCII characters. Note that these ASCII characters may not all
+   /// be printable. To determine if a `String` contains only "printable"
+   /// characters you should use the `all_characters_printable` predicate
+   /// defined in this module.
+   struct String has copy, drop, store {
+       bytes: vector<u8>,
+   }
+   spec String {
+       invariant forall i in 0..len(bytes): is_valid_char(bytes[i]);
+   }
+
+   /// An ASCII character.
+   struct Char has copy, drop, store {
+       byte: u8,
+   }
+   spec Char {
+       invariant is_valid_char(byte);
+   }
+
+    /// Convert a `byte` into a `Char` that is checked to make sure it is valid ASCII.
+    public fun char(byte: u8): Char {
+        assert!(is_valid_char(byte), EINVALID_ASCII_CHARACTER);
+        Char { byte }
+    }
+    spec char {
+        aborts_if !is_valid_char(byte) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Aborts if
+    /// `bytes` contains non-ASCII characters.
+    public fun string(bytes: vector<u8>): String {
+       let x = try_string(bytes);
+       assert!(
+            option::is_some(&x),
+            EINVALID_ASCII_CHARACTER
+       );
+       option::destroy_some(x)
+    }
+    spec string {
+        aborts_if exists i in 0..len(bytes): !is_valid_char(bytes[i]) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Returns
+    /// `Some(<ascii_string>)` if the `bytes` contains all valid ASCII
+    /// characters. Otherwise returns `None`.
+    public fun try_string(bytes: vector<u8>): Option<String> {
+       let len = vector::length(&bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_valid_char(bytes[j]);
+           };
+           i < len
+       }) {
+           let possible_byte = *vector::borrow(&bytes, i);
+           if (!is_valid_char(possible_byte)) return option::none();
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_valid_char(bytes[j]);
+       };
+       option::some(String { bytes })
+    }
+
+    /// Returns `true` if all characters in `string` are printable characters
+    /// Returns `false` otherwise. Not all `String`s are printable strings.
+    public fun all_characters_printable(string: &String): bool {
+       let len = vector::length(&string.bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_printable_char(string.bytes[j]);
+           };
+           i < len
+       }) {
+           let byte = *vector::borrow(&string.bytes, i);
+           if (!is_printable_char(byte)) return false;
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_printable_char(string.bytes[j]);
+       };
+       true
+    }
+    spec all_characters_printable {
+        ensures result ==> (forall j in 0..len(string.bytes): is_printable_char(string.bytes[j]));
+    }
+
+    public fun push_char(string: &mut String, char: Char) {
+        vector::push_back(&mut string.bytes, char.byte);
+    }
+    spec push_char {
+        ensures len(string.bytes) == len(old(string.bytes)) + 1;
+    }
+
+    public fun pop_char(string: &mut String): Char {
+        Char { byte: vector::pop_back(&mut string.bytes) }
+    }
+    spec pop_char {
+        ensures len(string.bytes) == len(old(string.bytes)) - 1;
+    }
+
+    public fun length(string: &String): u64 {
+        vector::length(as_bytes(string))
+    }
+
+    /// Get the inner bytes of the `string` as a reference
+    public fun as_bytes(string: &String): &vector<u8> {
+       &string.bytes
+    }
+
+    /// Unpack the `string` to get its backing bytes
+    public fun into_bytes(string: String): vector<u8> {
+       let String { bytes } = string;
+       bytes
+    }
+
+    /// Unpack the `char` into its underlying byte.
+    public fun byte(char: Char): u8 {
+       let Char { byte } = char;
+       byte
+    }
+
+    /// Returns `true` if `b` is a valid ASCII character. Returns `false` otherwise.
+    public fun is_valid_char(b: u8): bool {
+       b <= 0x7F
+    }
+
+    /// Returns `true` if `byte` is an printable ASCII character. Returns `false` otherwise.
+    public fun is_printable_char(byte: u8): bool {
+       byte >= 0x20 && // Disallow metacharacters
+       byte <= 0x7E // Don't allow DEL metacharacter
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/bcs.move b/vendors/move/crates/move-stdlib/sources/bcs.move
new file mode 100644
index 000000000..7e47428ca
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/bcs.move
@@ -0,0 +1,17 @@
+/// Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+/// Serialization). BCS is the binary encoding for Move resources and other non-module values
+/// published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+/// details on BCS.
+module std::bcs {
+    /// Return the binary representation of `v` in BCS (Binary Canonical Serialization) format
+    native public fun to_bytes<MoveValue>(v: &MoveValue): vector<u8>;
+
+    // ==============================
+    // Module Specification
+    spec module {} // switch to module documentation context
+
+    spec module {
+        /// Native function which is defined in the prover's prelude.
+        native fun serialize<MoveValue>(v: &MoveValue): vector<u8>;
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/bit_vector.move b/vendors/move/crates/move-stdlib/sources/bit_vector.move
new file mode 100644
index 000000000..09111f134
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/bit_vector.move
@@ -0,0 +1,162 @@
+module std::bit_vector {
+    use std::vector;
+
+    /// The provided index is out of bounds
+    const EINDEX: u64 = 0x20000;
+    /// An invalid length of bitvector was given
+    const ELENGTH: u64 = 0x20001;
+
+    #[test_only]
+    const WORD_SIZE: u64 = 1;
+    /// The maximum allowed bitvector size
+    const MAX_SIZE: u64 = 1024;
+
+    struct BitVector has copy, drop, store {
+        length: u64,
+        bit_field: vector<bool>,
+    }
+
+    public fun new(length: u64): BitVector {
+        assert!(length > 0, ELENGTH);
+        assert!(length < MAX_SIZE, ELENGTH);
+        let counter = 0;
+        let bit_field = vector::empty();
+        while ({spec {
+            invariant counter <= length;
+            invariant len(bit_field) == counter;
+        };
+            (counter < length)}) {
+            vector::push_back(&mut bit_field, false);
+            counter = counter + 1;
+        };
+        spec {
+            assert counter == length;
+            assert len(bit_field) == length;
+        };
+
+        BitVector {
+            length,
+            bit_field,
+        }
+    }
+    spec new {
+        include NewAbortsIf;
+        ensures result.length == length;
+        ensures len(result.bit_field) == length;
+    }
+    spec schema NewAbortsIf {
+        length: u64;
+        aborts_if length <= 0 with ELENGTH;
+        aborts_if length >= MAX_SIZE with ELENGTH;
+    }
+
+    /// Set the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun set(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = true;
+    }
+    spec set {
+        include SetAbortsIf;
+        ensures bitvector.bit_field[bit_index];
+    }
+    spec schema SetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Unset the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun unset(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = false;
+    }
+    spec unset {
+        include UnsetAbortsIf;
+        ensures !bitvector.bit_field[bit_index];
+    }
+    spec schema UnsetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Shift the `bitvector` left by `amount`. If `amount` is greater than the
+    /// bitvector's length the bitvector will be zeroed out.
+    public fun shift_left(bitvector: &mut BitVector, amount: u64) {
+        if (amount >= bitvector.length) {
+           let len = vector::length(&bitvector.bit_field);
+           let i = 0;
+           while (i < len) {
+               let elem = vector::borrow_mut(&mut bitvector.bit_field, i);
+               *elem = false;
+               i = i + 1;
+           };
+        } else {
+            let i = amount;
+
+            while (i < bitvector.length) {
+                if (is_index_set(bitvector, i)) set(bitvector, i - amount)
+                else unset(bitvector, i - amount);
+                i = i + 1;
+            };
+
+            i = bitvector.length - amount;
+
+            while (i < bitvector.length) {
+                unset(bitvector, i);
+                i = i + 1;
+            };
+        }
+    }
+
+    /// Return the value of the bit at `bit_index` in the `bitvector`. `true`
+    /// represents "1" and `false` represents a 0
+    public fun is_index_set(bitvector: &BitVector, bit_index: u64): bool {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        *vector::borrow(&bitvector.bit_field, bit_index)
+    }
+    spec is_index_set {
+        include IsIndexSetAbortsIf;
+        ensures result == bitvector.bit_field[bit_index];
+    }
+    spec schema IsIndexSetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+    spec fun spec_is_index_set(bitvector: BitVector, bit_index: u64): bool {
+        if (bit_index >= length(bitvector)) {
+            false
+        } else {
+            bitvector.bit_field[bit_index]
+        }
+    }
+
+    /// Return the length (number of usable bits) of this bitvector
+    public fun length(bitvector: &BitVector): u64 {
+        vector::length(&bitvector.bit_field)
+    }
+
+    /// Returns the length of the longest sequence of set bits starting at (and
+    /// including) `start_index` in the `bitvector`. If there is no such
+    /// sequence, then `0` is returned.
+    public fun longest_set_sequence_starting_at(bitvector: &BitVector, start_index: u64): u64 {
+        assert!(start_index < bitvector.length, EINDEX);
+        let index = start_index;
+
+        // Find the greatest index in the vector such that all indices less than it are set.
+        while (index < bitvector.length) {
+            if (!is_index_set(bitvector, index)) break;
+            index = index + 1;
+        };
+
+        index - start_index
+    }
+
+    #[test_only]
+    public fun word_size(): u64 {
+        WORD_SIZE
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/error.move b/vendors/move/crates/move-stdlib/sources/error.move
new file mode 100644
index 000000000..81958a691
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/error.move
@@ -0,0 +1,82 @@
+/// This module defines a set of canonical error codes which are optional to use by applications for the
+/// `abort` and `assert!` features.
+///
+/// Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+/// Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+/// Given an error category `0x1` and a reason `0x3`, a canonical abort code looks as `0x10003`.
+///
+/// A module can use a canonical code with a constant declaration of the following form:
+///
+/// ```
+/// ///  An invalid ASCII character was encountered when creating a string.
+/// const EINVALID_CHARACTER: u64 = 0x010003;
+/// ```
+///
+/// This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+/// error reason understand by the existing error map tooling, or as a canonical code.
+///
+/// The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+/// from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+/// associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+/// error codes here are a bit richer than HTTP codes.
+module std::error {
+
+  /// Caller specified an invalid argument (http: 400)
+  const INVALID_ARGUMENT: u64 = 0x1;
+
+  /// An input or result of a computation is out of range (http: 400)
+  const OUT_OF_RANGE: u64 = 0x2;
+
+  /// The system is not in a state where the operation can be performed (http: 400)
+  const INVALID_STATE: u64 = 0x3;
+
+  /// Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+  const UNAUTHENTICATED: u64 = 0x4;
+
+  /// client does not have sufficient permission (http: 403)
+  const PERMISSION_DENIED: u64 = 0x5;
+
+  /// A specified resource is not found (http: 404)
+  const NOT_FOUND: u64 = 0x6;
+
+  /// Concurrency conflict, such as read-modify-write conflict (http: 409)
+  const ABORTED: u64 = 0x7;
+
+  /// The resource that a client tried to create already exists (http: 409)
+  const ALREADY_EXISTS: u64 = 0x8;
+
+  /// Out of gas or other forms of quota (http: 429)
+  const RESOURCE_EXHAUSTED: u64 = 0x9;
+
+  #[allow(unused_const)]
+  /// Request cancelled by the client (http: 499)
+  const CANCELLED: u64 = 0xA;
+
+  /// Internal error (http: 500)
+  const INTERNAL: u64 = 0xB;
+
+  /// Feature not implemented (http: 501)
+  const NOT_IMPLEMENTED: u64 = 0xC;
+
+  /// The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+  const UNAVAILABLE: u64 = 0xD;
+
+  /// Construct a canonical error code from a category and a reason.
+  public fun canonical(category: u64, reason: u64): u64 {
+    (category << 16) + reason
+  }
+
+  /// Functions to construct a canonical error code of the given category.
+  public fun invalid_argument(r: u64): u64 {  canonical(INVALID_ARGUMENT, r) }
+  public fun out_of_range(r: u64): u64 {  canonical(OUT_OF_RANGE, r) }
+  public fun invalid_state(r: u64): u64 {  canonical(INVALID_STATE, r) }
+  public fun unauthenticated(r: u64): u64 { canonical(UNAUTHENTICATED, r) }
+  public fun permission_denied(r: u64): u64 { canonical(PERMISSION_DENIED, r) }
+  public fun not_found(r: u64): u64 { canonical(NOT_FOUND, r) }
+  public fun aborted(r: u64): u64 { canonical(ABORTED, r) }
+  public fun already_exists(r: u64): u64 { canonical(ALREADY_EXISTS, r) }
+  public fun resource_exhausted(r: u64): u64 {  canonical(RESOURCE_EXHAUSTED, r) }
+  public fun internal(r: u64): u64 {  canonical(INTERNAL, r) }
+  public fun not_implemented(r: u64): u64 {  canonical(NOT_IMPLEMENTED, r) }
+  public fun unavailable(r: u64): u64 { canonical(UNAVAILABLE, r) }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/fixed_point32.move b/vendors/move/crates/move-stdlib/sources/fixed_point32.move
new file mode 100644
index 000000000..05f2614fe
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/fixed_point32.move
@@ -0,0 +1,294 @@
+/// Defines a fixed-point numeric type with a 32-bit integer part and
+/// a 32-bit fractional part.
+
+module std::fixed_point32 {
+
+    /// Define a fixed-point numeric type with 32 fractional bits.
+    /// This is just a u64 integer but it is wrapped in a struct to
+    /// make a unique type. This is a binary representation, so decimal
+    /// values may not be exactly representable, but it provides more
+    /// than 9 decimal digits of precision both before and after the
+    /// decimal point (18 digits total). For comparison, double precision
+    /// floating-point has less than 16 decimal digits of precision, so
+    /// be careful about using floating-point to convert these values to
+    /// decimal.
+    struct FixedPoint32 has copy, drop, store { value: u64 }
+
+    ///> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// The denominator provided was zero
+    const EDENOMINATOR: u64 = 0x10001;
+    /// The quotient value would be too large to be held in a `u64`
+    const EDIVISION: u64 = 0x20002;
+    /// The multiplied value would be too large to be held in a `u64`
+    const EMULTIPLICATION: u64 = 0x20003;
+    /// A division by zero was encountered
+    const EDIVISION_BY_ZERO: u64 = 0x10004;
+    /// The computed ratio when converting to a `FixedPoint32` would be unrepresentable
+    const ERATIO_OUT_OF_RANGE: u64 = 0x20005;
+
+    /// Multiply a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the product. This will abort if the product
+    /// overflows.
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64 {
+        // The product of two 64 bit values has 128 bits, so perform the
+        // multiplication with u128 types and keep the full 128 bit product
+        // to avoid losing accuracy.
+        let unscaled_product = (val as u128) * (multiplier.value as u128);
+        // The unscaled product has 32 fractional bits (from the multiplier)
+        // so rescale it by shifting away the low bits.
+        let product = unscaled_product >> 32;
+        // Check whether the value is too large.
+        assert!(product <= MAX_U64, EMULTIPLICATION);
+        (product as u64)
+    }
+    spec multiply_u64 {
+        pragma opaque;
+        include MultiplyAbortsIf;
+        ensures result == spec_multiply_u64(val, multiplier);
+    }
+    spec schema MultiplyAbortsIf {
+        val: num;
+        multiplier: FixedPoint32;
+        aborts_if spec_multiply_u64(val, multiplier) > MAX_U64 with EMULTIPLICATION;
+    }
+    spec fun spec_multiply_u64(val: num, multiplier: FixedPoint32): num {
+        (val * multiplier.value) >> 32
+    }
+
+    /// Divide a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the quotient. This will abort if the divisor
+    /// is zero or if the quotient overflows.
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64 {
+        // Check for division by zero.
+        assert!(divisor.value != 0, EDIVISION_BY_ZERO);
+        // First convert to 128 bits and then shift left to
+        // add 32 fractional zero bits to the dividend.
+        let scaled_value = (val as u128) << 32;
+        let quotient = scaled_value / (divisor.value as u128);
+        // Check whether the value is too large.
+        assert!(quotient <= MAX_U64, EDIVISION);
+        // the value may be too large, which will cause the cast to fail
+        // with an arithmetic error.
+        (quotient as u64)
+    }
+    spec divide_u64 {
+        pragma opaque;
+        include DivideAbortsIf;
+        ensures result == spec_divide_u64(val, divisor);
+    }
+    spec schema DivideAbortsIf {
+        val: num;
+        divisor: FixedPoint32;
+        aborts_if divisor.value == 0 with EDIVISION_BY_ZERO;
+        aborts_if spec_divide_u64(val, divisor) > MAX_U64 with EDIVISION;
+    }
+    spec fun spec_divide_u64(val: num, divisor: FixedPoint32): num {
+        (val << 32) / divisor.value
+    }
+
+    /// Create a fixed-point value from a rational number specified by its
+    /// numerator and denominator. Calling this function should be preferred
+    /// for using `Self::create_from_raw_value` which is also available.
+    /// This will abort if the denominator is zero. It will also
+    /// abort if the numerator is nonzero and the ratio is not in the range
+    /// 2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+    /// rounding errors: if you round to display N digits after the decimal
+    /// point, you can use a denominator of 10^N to avoid numbers where the
+    /// very small imprecision in the binary representation could change the
+    /// rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32 {
+        // If the denominator is zero, this will abort.
+        // Scale the numerator to have 64 fractional bits and the denominator
+        // to have 32 fractional bits, so that the quotient will have 32
+        // fractional bits.
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        assert!(scaled_denominator != 0, EDENOMINATOR);
+        let quotient = scaled_numerator / scaled_denominator;
+        assert!(quotient != 0 || numerator == 0, ERATIO_OUT_OF_RANGE);
+        // Return the quotient as a fixed-point number. We first need to check whether the cast
+        // can succeed.
+        assert!(quotient <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32 { value: (quotient as u64) }
+    }
+    spec create_from_rational {
+        pragma opaque;
+        include CreateFromRationalAbortsIf;
+        ensures result == spec_create_from_rational(numerator, denominator);
+    }
+    spec schema CreateFromRationalAbortsIf {
+        numerator: u64;
+        denominator: u64;
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        let quotient = scaled_numerator / scaled_denominator;
+        aborts_if scaled_denominator == 0 with EDENOMINATOR;
+        aborts_if quotient == 0 && scaled_numerator != 0 with ERATIO_OUT_OF_RANGE;
+        aborts_if quotient > MAX_U64 with ERATIO_OUT_OF_RANGE;
+    }
+    spec fun spec_create_from_rational(numerator: num, denominator: num): FixedPoint32 {
+        FixedPoint32{value: (numerator << 64) / (denominator << 32)}
+    }
+
+    /// Create a fixedpoint value from a raw value.
+    public fun create_from_raw_value(value: u64): FixedPoint32 {
+        FixedPoint32 { value }
+    }
+    spec create_from_raw_value {
+        pragma opaque;
+        aborts_if false;
+        ensures result.value == value;
+    }
+
+    /// Accessor for the raw u64 value. Other less common operations, such as
+    /// adding or subtracting FixedPoint32 values, can be done using the raw
+    /// values directly.
+    public fun get_raw_value(num: FixedPoint32): u64 {
+        num.value
+    }
+
+    /// Returns true if the ratio is zero.
+    public fun is_zero(num: FixedPoint32): bool {
+        num.value == 0
+    }
+
+    /// Returns the smaller of the two FixedPoint32 numbers.
+    public fun min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec min {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_min(num1, num2);
+    }
+    spec fun spec_min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Returns the larger of the two FixedPoint32 numbers.
+    public fun max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec max {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_max(num1, num2);
+    }
+    spec fun spec_max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Create a fixedpoint value from a u64 value.
+    public fun create_from_u64(val: u64): FixedPoint32 {
+        let value = (val as u128) << 32;
+        assert!(value <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32{value: (value as u64)}
+    }
+    spec create_from_u64 {
+        pragma opaque;
+        include CreateFromU64AbortsIf;
+        ensures result == spec_create_from_u64(val);
+    }
+    spec schema CreateFromU64AbortsIf {
+        val: num;
+        let scaled_value = (val as u128) << 32;
+        aborts_if scaled_value > MAX_U64;
+    }
+    spec fun spec_create_from_u64(val: num): FixedPoint32 {
+        FixedPoint32 {value: val << 32}
+    }
+
+    /// Returns the largest integer less than or equal to a given number.
+    public fun floor(num: FixedPoint32): u64 {
+        num.value >> 32
+    }
+    spec floor {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_floor(num);
+    }
+    spec fun spec_floor(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional) >> 32
+        }
+    }
+
+    /// Rounds up the given FixedPoint32 to the next largest integer.
+    public fun ceil(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        if (num.value == floored_num) {
+            return floored_num >> 32
+        };
+        let val = ((floored_num as u128) + (1 << 32));
+        (val >> 32 as u64)
+    }
+    spec ceil {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_ceil(num);
+    }
+    spec fun spec_ceil(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let one = 1 << 32;
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    /// Returns the value of a FixedPoint32 to the nearest integer.
+    public fun round(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        let boundary = floored_num + ((1 << 32) / 2);
+        if (num.value < boundary) {
+            floored_num >> 32
+        } else {
+            ceil(num)
+        }
+    }
+    spec round {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_round(num);
+    }
+    spec fun spec_round(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let boundary = (1 << 32) / 2;
+        let one = 1 << 32;
+        if (fractional < boundary) {
+            (val.value - fractional) >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    // **************** SPECIFICATIONS ****************
+
+    spec module {} // switch documentation context to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/hash.move b/vendors/move/crates/move-stdlib/sources/hash.move
new file mode 100644
index 000000000..daadc4e81
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/hash.move
@@ -0,0 +1,8 @@
+/// Module which defines SHA hashes for byte vectors.
+///
+/// The functions in this module are natively declared both in the Move runtime
+/// as in the Move prover's prelude.
+module std::hash {
+    native public fun sha2_256(data: vector<u8>): vector<u8>;
+    native public fun sha3_256(data: vector<u8>): vector<u8>;
+}
diff --git a/vendors/move/crates/move-stdlib/sources/option.move b/vendors/move/crates/move-stdlib/sources/option.move
new file mode 100644
index 000000000..eed419b2d
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/option.move
@@ -0,0 +1,259 @@
+/// This module defines the Option type and its methods to represent and handle an optional value.
+module std::option {
+    use std::vector;
+
+    /// Abstraction of a value that may or may not be present. Implemented with a vector of size
+    /// zero or one because Move bytecode does not have ADTs.
+    struct Option<Element> has copy, drop, store {
+        vec: vector<Element>
+    }
+    spec Option {
+        /// The size of vector is always less than equal to 1
+        /// because it's 0 for "none" or 1 for "some".
+        invariant len(vec) <= 1;
+    }
+
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `Some` while it should be `None`.
+    const EOPTION_IS_SET: u64 = 0x40000;
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `None` while it should be `Some`.
+    const EOPTION_NOT_SET: u64 = 0x40001;
+
+    /// Return an empty `Option`
+    public fun none<Element>(): Option<Element> {
+        Option { vec: vector::empty() }
+    }
+    spec none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_none<Element>();
+    }
+    spec fun spec_none<Element>(): Option<Element> {
+        Option{ vec: vec() }
+    }
+
+    /// Return an `Option` containing `e`
+    public fun some<Element>(e: Element): Option<Element> {
+        Option { vec: vector::singleton(e) }
+    }
+    spec some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_some(e);
+    }
+    spec fun spec_some<Element>(e: Element): Option<Element> {
+        Option{ vec: vec(e) }
+    }
+
+    /// Return true if `t` does not hold a value
+    public fun is_none<Element>(t: &Option<Element>): bool {
+        vector::is_empty(&t.vec)
+    }
+    spec is_none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_none(t);
+    }
+
+    /// Return true if `t` holds a value
+    public fun is_some<Element>(t: &Option<Element>): bool {
+        !vector::is_empty(&t.vec)
+    }
+    spec is_some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_some(t);
+    }
+
+    /// Return true if the value in `t` is equal to `e_ref`
+    /// Always returns `false` if `t` does not hold a value
+    public fun contains<Element>(t: &Option<Element>, e_ref: &Element): bool {
+        vector::contains(&t.vec, e_ref)
+    }
+    spec contains {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_contains(t, e_ref);
+    }
+    spec fun spec_contains<Element>(t: Option<Element>, e: Element): bool {
+        is_some(t) && borrow(t) == e
+    }
+
+    /// Return an immutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow<Element>(t: &Option<Element>): &Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow(&t.vec, 0)
+    }
+    spec borrow {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Return a reference to the value inside `t` if it holds one
+    /// Return `default_ref` if `t` does not hold a value
+    public fun borrow_with_default<Element>(t: &Option<Element>, default_ref: &Element): &Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default_ref
+        else vector::borrow(vec_ref, 0)
+    }
+    spec borrow_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default_ref);
+    }
+
+    /// Return the value inside `t` if it holds one
+    /// Return `default` if `t` does not hold a value
+    public fun get_with_default<Element: copy + drop>(
+        t: &Option<Element>,
+        default: Element,
+    ): Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default
+        else *vector::borrow(vec_ref, 0)
+    }
+    spec get_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Convert the none option `t` to a some option by adding `e`.
+    /// Aborts if `t` already holds a value
+    public fun fill<Element>(t: &mut Option<Element>, e: Element) {
+        let vec_ref = &mut t.vec;
+        if (vector::is_empty(vec_ref)) vector::push_back(vec_ref, e)
+        else abort EOPTION_IS_SET
+    }
+    spec fill {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Convert a `some` option to a `none` by removing and returning the value stored inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun extract<Element>(t: &mut Option<Element>): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::pop_back(&mut t.vec)
+    }
+    spec extract {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_none(t);
+    }
+
+    /// Return a mutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow_mut<Element>(t: &mut Option<Element>): &mut Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow_mut(&mut t.vec, 0)
+    }
+    spec borrow_mut {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value
+    /// Aborts if `t` does not hold a value
+    public fun swap<Element>(t: &mut Option<Element>, e: Element): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        let vec_ref = &mut t.vec;
+        let old_value = vector::pop_back(vec_ref);
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value;
+    /// or if there is no old value, fill it with `e`.
+    /// Different from swap(), swap_or_fill() allows for `t` not holding a value.
+    public fun swap_or_fill<Element>(t: &mut Option<Element>, e: Element): Option<Element> {
+        let vec_ref = &mut t.vec;
+        let old_value = if (vector::is_empty(vec_ref)) none()
+            else some(vector::pop_back(vec_ref));
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap_or_fill {
+        pragma opaque;
+        ensures result == old(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Destroys `t.` If `t` holds a value, return it. Returns `default` otherwise
+    public fun destroy_with_default<Element: drop>(t: Option<Element>, default: Element): Element {
+        let Option { vec } = t;
+        if (vector::is_empty(&vec)) default
+        else vector::pop_back(&mut vec)
+    }
+    spec destroy_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Unpack `t` and return its contents
+    /// Aborts if `t` does not hold a value
+    public fun destroy_some<Element>(t: Option<Element>): Element {
+        assert!(is_some(&t), EOPTION_NOT_SET);
+        let Option { vec } = t;
+        let elem = vector::pop_back(&mut vec);
+        vector::destroy_empty(vec);
+        elem
+    }
+    spec destroy_some {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Unpack `t`
+    /// Aborts if `t` holds a value
+    public fun destroy_none<Element>(t: Option<Element>) {
+        assert!(is_none(&t), EOPTION_IS_SET);
+        let Option { vec } = t;
+        vector::destroy_empty(vec)
+    }
+    spec destroy_none {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+    }
+
+    /// Convert `t` into a vector of length 1 if it is `Some`,
+    /// and an empty vector otherwise
+    public fun to_vec<Element>(t: Option<Element>): vector<Element> {
+        let Option { vec } = t;
+        vec
+    }
+    spec to_vec {
+        pragma opaque;
+        aborts_if false;
+        ensures result == t.vec;
+    }
+
+    spec module {} // switch documentation context back to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+
+    /// # Helper Schema
+
+    spec schema AbortsIfNone<Element> {
+        t: Option<Element>;
+        aborts_if is_none(t) with EOPTION_NOT_SET;
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/signer.move b/vendors/move/crates/move-stdlib/sources/signer.move
new file mode 100644
index 000000000..1996b4331
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/signer.move
@@ -0,0 +1,21 @@
+module std::signer {
+    // Borrows the address of the signer
+    // Conceptually, you can think of the `signer` as being a struct wrapper arround an
+    // address
+    // ```
+    // struct signer has drop { addr: address }
+    // ```
+    // `borrow_address` borrows this inner field
+    native public fun borrow_address(s: &signer): &address;
+
+    // Copies the address of the signer
+    public fun address_of(s: &signer): address {
+        *borrow_address(s)
+    }
+
+    /// Return true only if `s` is a transaction signer. This is a spec function only available in spec.
+    spec native fun is_txn_signer(s: signer): bool;
+
+    /// Return true only if `a` is a transaction signer address. This is a spec function only available in spec.
+    spec native fun is_txn_signer_addr(a: address): bool;
+}
diff --git a/vendors/move/crates/move-stdlib/sources/string.move b/vendors/move/crates/move-stdlib/sources/string.move
new file mode 100644
index 000000000..fa9f6b61b
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/string.move
@@ -0,0 +1,101 @@
+/// The `string` module defines the `String` type which represents UTF8 encoded strings.
+module std::string {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid UTF8 encoding.
+    const EINVALID_UTF8: u64 = 1;
+
+    /// Index out of range.
+    const EINVALID_INDEX: u64 = 2;
+
+    /// A `String` holds a sequence of bytes which is guaranteed to be in utf8 format.
+    struct String has copy, drop, store {
+        bytes: vector<u8>,
+    }
+
+    /// Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+    public fun utf8(bytes: vector<u8>): String {
+        assert!(internal_check_utf8(&bytes), EINVALID_UTF8);
+        String{bytes}
+    }
+
+    /// Tries to create a new string from a sequence of bytes.
+    public fun try_utf8(bytes: vector<u8>): Option<String> {
+        if (internal_check_utf8(&bytes)) {
+            option::some(String{bytes})
+        } else {
+            option::none()
+        }
+    }
+
+    /// Returns a reference to the underlying byte vector.
+    public fun bytes(s: &String): &vector<u8> {
+        &s.bytes
+    }
+
+    /// Checks whether this string is empty.
+    public fun is_empty(s: &String): bool {
+        vector::is_empty(&s.bytes)
+    }
+
+    /// Returns the length of this string, in bytes.
+    public fun length(s: &String): u64 {
+        vector::length(&s.bytes)
+    }
+
+    /// Appends a string.
+    public fun append(s: &mut String, r: String) {
+        vector::append(&mut s.bytes, r.bytes)
+    }
+
+    /// Appends bytes which must be in valid utf8 format.
+    public fun append_utf8(s: &mut String, bytes: vector<u8>) {
+        append(s, utf8(bytes))
+    }
+
+    /// Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+    /// boundary.
+    public fun insert(s: &mut String, at: u64, o: String) {
+        let bytes = &s.bytes;
+        assert!(at <= vector::length(bytes) && internal_is_char_boundary(bytes, at), EINVALID_INDEX);
+        let l = length(s);
+        let front = sub_string(s, 0, at);
+        let end = sub_string(s, at, l);
+        append(&mut front, o);
+        append(&mut front, end);
+        *s = front;
+    }
+
+    /// Returns a sub-string using the given byte indices, where `i` is the first byte position and `j` is the start
+    /// of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+    /// guaranteeing that the result is valid utf8.
+    public fun sub_string(s: &String, i: u64, j: u64): String {
+        let bytes = &s.bytes;
+        let l = vector::length(bytes);
+        assert!(
+            j <= l && i <= j && internal_is_char_boundary(bytes, i) && internal_is_char_boundary(bytes, j),
+            EINVALID_INDEX
+        );
+        String{bytes: internal_sub_string(bytes, i, j)}
+    }
+
+    /// Computes the index of the first occurrence of a string. Returns `length(s)` if no occurrence found.
+    public fun index_of(s: &String, r: &String): u64 {
+        internal_index_of(&s.bytes, &r.bytes)
+    }
+
+
+    // Native API
+    native fun internal_check_utf8(v: &vector<u8>): bool;
+    native fun internal_is_char_boundary(v: &vector<u8>, i: u64): bool;
+    native fun internal_sub_string(v: &vector<u8>, i: u64, j: u64): vector<u8>;
+    native fun internal_index_of(v: &vector<u8>, r: &vector<u8>): u64;
+
+    // Test only API for the native function. Don't return a value so other
+    // tests aren't tempted to use this function.
+    #[test_only]
+    public fun internal_sub_string_for_testing(v: &vector<u8>, i: u64, j: u64) {
+        internal_sub_string(v, i, j);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/type_name.move b/vendors/move/crates/move-stdlib/sources/type_name.move
new file mode 100644
index 000000000..f439a6418
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/type_name.move
@@ -0,0 +1,38 @@
+/// Functionality for converting Move types into values. Use with care!
+module std::type_name {
+    use std::ascii::String;
+
+    struct TypeName has copy, drop, store {
+        /// String representation of the type. All types are represented
+        /// using their source syntax:
+        /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+        /// Struct types are represented as fully qualified type names; e.g.
+        /// `00000000000000000000000000000001::string::String` or
+        /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+        /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+        name: String
+    }
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are defining IDs (the ID of the package in
+    /// storage that first introduced the type).
+    public native fun get<T>(): TypeName;
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are original IDs (the ID of the first version of
+    /// the package, even if the type in question was introduced in a
+    /// later upgrade).
+    public native fun get_with_original_ids<T>(): TypeName;
+
+    /// Get the String representation of `self`
+    public fun borrow_string(self: &TypeName): &String {
+        &self.name
+    }
+
+    /// Convert `self` into its inner String
+    public fun into_string(self: TypeName): String {
+        self.name
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/sources/unit_test.move b/vendors/move/crates/move-stdlib/sources/unit_test.move
new file mode 100644
index 000000000..5f8da39e3
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/unit_test.move
@@ -0,0 +1,12 @@
+#[test_only]
+/// Module providing testing functionality. Only included for tests.
+module std::unit_test {
+    /// Return a `num_signers` number of unique signer values. No ordering or
+    /// starting value guarantees are made, only that the order and values of
+    /// the signers in the returned vector is deterministic.
+    ///
+    /// This function is also used to poison modules compiled in `test` mode.
+    /// This will cause a linking failure if an attempt is made to publish a
+    /// test module in a VM that isn't in unit test mode.
+    native public fun create_signers_for_testing(num_signers: u64): vector<signer>;
+}
diff --git a/vendors/move/crates/move-stdlib/sources/vector.move b/vendors/move/crates/move-stdlib/sources/vector.move
new file mode 100644
index 000000000..32d895002
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/sources/vector.move
@@ -0,0 +1,217 @@
+/// A variable-sized container that can hold any type. Indexing is 0-based, and
+/// vectors are growable. This module has many native functions.
+/// Verification of modules that use this one uses model functions that are implemented
+/// directly in Boogie. The specification language has built-in functions operations such
+/// as `singleton_vector`. There are some helper functions defined here for specifications in other
+/// modules as well.
+///
+/// >Note: We did not verify most of the
+/// Move functions here because many have loops, requiring loop invariants to prove, and
+/// the return on investment didn't seem worth it for these simple functions.
+module std::vector {
+
+    /// The index into the vector is out of bounds
+    const EINDEX_OUT_OF_BOUNDS: u64 = 0x20000;
+
+    #[bytecode_instruction]
+    /// Create an empty vector.
+    native public fun empty<Element>(): vector<Element>;
+
+    #[bytecode_instruction]
+    /// Return the length of the vector.
+    native public fun length<Element>(v: &vector<Element>): u64;
+
+    #[bytecode_instruction]
+    /// Acquire an immutable reference to the `i`th element of the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+
+    #[bytecode_instruction]
+    /// Add element `e` to the end of the vector `v`.
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+
+    #[bytecode_instruction]
+    /// Return a mutable reference to the `i`th element in the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+
+    #[bytecode_instruction]
+    /// Pop an element from the end of vector `v`.
+    /// Aborts if `v` is empty.
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+
+    #[bytecode_instruction]
+    /// Destroy the vector `v`.
+    /// Aborts if `v` is not empty.
+    native public fun destroy_empty<Element>(v: vector<Element>);
+
+    #[bytecode_instruction]
+    /// Swaps the elements at the `i`th and `j`th indices in the vector `v`.
+    /// Aborts if `i` or `j` is out of bounds.
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+
+    /// Return an vector of size one containing element `e`.
+    public fun singleton<Element>(e: Element): vector<Element> {
+        let v = empty();
+        push_back(&mut v, e);
+        v
+    }
+    spec singleton {
+        // TODO: when using opaque here, we get verification errors.
+        // pragma opaque;
+        aborts_if false;
+        ensures result == vec(e);
+    }
+
+    /// Reverses the order of the elements in the vector `v` in place.
+    public fun reverse<Element>(v: &mut vector<Element>) {
+        let len = length(v);
+        if (len == 0) return ();
+
+        let front_index = 0;
+        let back_index = len -1;
+        while (front_index < back_index) {
+            swap(v, front_index, back_index);
+            front_index = front_index + 1;
+            back_index = back_index - 1;
+        }
+    }
+    spec reverse {
+        pragma intrinsic = true;
+    }
+
+
+    /// Pushes all of the elements of the `other` vector into the `lhs` vector.
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>) {
+        reverse(&mut other);
+        while (!is_empty(&other)) push_back(lhs, pop_back(&mut other));
+        destroy_empty(other);
+    }
+    spec append {
+        pragma intrinsic = true;
+    }
+    spec is_empty {
+        pragma intrinsic = true;
+    }
+
+
+    /// Return `true` if the vector `v` has no elements and `false` otherwise.
+    public fun is_empty<Element>(v: &vector<Element>): bool {
+        length(v) == 0
+    }
+
+    /// Return true if `e` is in the vector `v`.
+    /// Otherwise, returns false.
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return true;
+            i = i + 1;
+        };
+        false
+    }
+    spec contains {
+        pragma intrinsic = true;
+    }
+
+    /// Return `(true, i)` if `e` is in the vector `v` at index `i`.
+    /// Otherwise, returns `(false, 0)`.
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64) {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return (true, i);
+            i = i + 1;
+        };
+        (false, 0)
+    }
+    spec index_of {
+        pragma intrinsic = true;
+    }
+
+    /// Remove the `i`th element of the vector `v`, shifting all subsequent elements.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        let len = length(v);
+        // i out of bounds; abort
+        if (i >= len) abort EINDEX_OUT_OF_BOUNDS;
+
+        len = len - 1;
+        while (i < len) swap(v, i, { i = i + 1; i });
+        pop_back(v)
+    }
+    spec remove {
+        pragma intrinsic = true;
+    }
+
+    /// Insert `e` at position `i` in the vector `v`.
+    /// If `i` is in bounds, this shifts the old `v[i]` and all subsequent elements to the right.
+    /// If `i == length(v)`, this adds `e` to the end of the vector.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i > length(v)`
+    public fun insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        let len = length(v);
+        // i too big abort
+        if (i > len) abort EINDEX_OUT_OF_BOUNDS;
+
+        push_back(v, e);
+        while (i < len) {
+            swap(v, i, len);
+            i = i + 1
+        }
+    }
+    spec insert {
+        pragma intrinsic = true;
+    }
+
+    /// Swap the `i`th element of the vector `v` with the last element and then pop the vector.
+    /// This is O(1), but does not preserve ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        assert!(!is_empty(v), EINDEX_OUT_OF_BOUNDS);
+        let last_idx = length(v) - 1;
+        swap(v, i, last_idx);
+        pop_back(v)
+    }
+    spec swap_remove {
+        pragma intrinsic = true;
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Helper Functions
+
+    spec module {
+        /// Check if `v1` is equal to the result of adding `e` at the end of `v2`
+        fun eq_push_back<Element>(v1: vector<Element>, v2: vector<Element>, e: Element): bool {
+            len(v1) == len(v2) + 1 &&
+            v1[len(v1)-1] == e &&
+            v1[0..len(v1)-1] == v2[0..len(v2)]
+        }
+
+        /// Check if `v` is equal to the result of concatenating `v1` and `v2`
+        fun eq_append<Element>(v: vector<Element>, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v) == len(v1) + len(v2) &&
+            v[0..len(v1)] == v1 &&
+            v[len(v1)..len(v)] == v2
+        }
+
+        /// Check `v1` is equal to the result of removing the first element of `v2`
+        fun eq_pop_front<Element>(v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1 == v2[1..len(v2)]
+        }
+
+        /// Check that `v1` is equal to the result of removing the element at index `i` from `v2`.
+        fun eq_remove_elem_at_index<Element>(i: u64, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1[0..i] == v2[0..i] &&
+            v1[i..len(v1)] == v2[i + 1..len(v2)]
+        }
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/src/lib.rs b/vendors/move/crates/move-stdlib/src/lib.rs
new file mode 100644
index 000000000..5561bac4b
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/lib.rs
@@ -0,0 +1,163 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use log::LevelFilter;
+use move_command_line_common::{
+    address::NumericalAddress,
+    files::{extension_equals, find_filenames, MOVE_EXTENSION},
+};
+use std::{collections::BTreeMap, path::PathBuf};
+
+#[cfg(test)]
+mod tests;
+pub mod utils;
+
+pub mod natives;
+
+const MODULES_DIR: &str = "sources";
+const NURSERY_DIR: &str = "nursery";
+const DOCS_DIR: &str = "docs";
+const NURSERY_DOCS_DIR: &str = "nursery/docs";
+const ERRMAP_FILE: &str = "error_description.errmap";
+
+const REFERENCES_TEMPLATE: &str = "doc_templates/references.md";
+const OVERVIEW_TEMPLATE: &str = "doc_templates/overview.md";
+
+pub fn unit_testing_files() -> Vec<String> {
+    vec![path_in_crate("sources/UnitTest.move")]
+        .into_iter()
+        .map(|p| p.into_os_string().into_string().unwrap())
+        .collect()
+}
+
+pub fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push(relative.into());
+    path
+}
+
+pub fn move_stdlib_modules_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), MODULES_DIR)
+}
+
+pub fn move_stdlib_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), DOCS_DIR)
+}
+
+pub fn move_nursery_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), NURSERY_DOCS_DIR)
+}
+
+pub fn move_stdlib_errmap_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), ERRMAP_FILE)
+}
+
+pub fn move_stdlib_files() -> Vec<String> {
+    let path = path_in_crate(MODULES_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_nursery_files() -> Vec<String> {
+    let path = path_in_crate(NURSERY_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_stdlib_named_addresses() -> BTreeMap<String, NumericalAddress> {
+    let mapping = [("std", "0x1")];
+    mapping
+        .iter()
+        .map(|(name, addr)| (name.to_string(), NumericalAddress::parse_str(addr).unwrap()))
+        .collect()
+}
+
+pub fn build_doc(
+    output_path: &str,
+    doc_path: &str,
+    templates: Vec<String>,
+    references_file: Option<String>,
+    sources: &[String],
+    dep_paths: Vec<String>,
+    with_diagram: bool,
+    named_addresses: BTreeMap<String, NumericalAddress>,
+) {
+    let options = move_prover::cli::Options {
+        move_sources: sources.to_vec(),
+        move_deps: dep_paths,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(&named_addresses),
+        verbosity_level: LevelFilter::Warn,
+        run_docgen: true,
+        docgen: move_docgen::DocgenOptions {
+            root_doc_templates: templates,
+            references_file,
+            doc_path: vec![doc_path.to_string()],
+            output_directory: output_path.to_string(),
+            include_dep_diagrams: with_diagram,
+            include_call_diagrams: with_diagram,
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+pub fn build_stdlib_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![path_in_crate(OVERVIEW_TEMPLATE)
+            .to_string_lossy()
+            .to_string()],
+        Some(
+            path_in_crate(REFERENCES_TEMPLATE)
+                .to_string_lossy()
+                .to_string(),
+        ),
+        move_stdlib_files().as_slice(),
+        vec![],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_nursery_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![],
+        None,
+        move_nursery_files().as_slice(),
+        vec![move_stdlib_modules_full_path()],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_error_code_map(output_path: &str) {
+    let options = move_prover::cli::Options {
+        move_sources: crate::move_stdlib_files(),
+        move_deps: vec![],
+        verbosity_level: LevelFilter::Warn,
+        run_errmapgen: true,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(
+            &move_stdlib_named_addresses(),
+        ),
+        errmapgen: move_errmapgen::ErrmapOptions {
+            output_file: output_path.to_string(),
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+const ERROR_DESCRIPTIONS: &[u8] = include_bytes!("../error_description.errmap");
+
+pub fn error_descriptions() -> &'static [u8] {
+    ERROR_DESCRIPTIONS
+}
diff --git a/vendors/move/crates/move-stdlib/src/main.rs b/vendors/move/crates/move-stdlib/src/main.rs
new file mode 100644
index 000000000..050cd6afe
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/main.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_stdlib::utils::time_it;
+
+fn main() {
+    // Generate documentation
+    {
+        time_it("Generating stdlib documentation", || {
+            std::fs::remove_dir_all(move_stdlib::move_stdlib_docs_full_path()).unwrap_or(());
+            //std::fs::create_dir_all(&move_stdlib::move_stdlib_docs_full_path()).unwrap();
+            move_stdlib::build_stdlib_doc(&move_stdlib::move_stdlib_docs_full_path());
+        });
+
+        time_it("Generating nursery documentation", || {
+            std::fs::remove_dir_all(move_stdlib::move_nursery_docs_full_path()).unwrap_or(());
+            move_stdlib::build_nursery_doc(&move_stdlib::move_nursery_docs_full_path());
+        });
+
+        time_it("Generating error explanations", || {
+            std::fs::remove_file(move_stdlib::move_stdlib_errmap_full_path()).unwrap_or(());
+            move_stdlib::build_error_code_map(&move_stdlib::move_stdlib_errmap_full_path());
+        });
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/bcs.rs b/vendors/move/crates/move-stdlib/src/natives/bcs.rs
new file mode 100644
index 000000000..b4e0c1392
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/bcs.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    vm_status::sub_status::NFE_BCS_SERIALIZATION_FAILURE,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+/***************************************************************************************************
+ * native fun to_bytes
+ *
+ *   gas cost: size_of(val_type) * input_unit_cost +        | get type layout
+ *             size_of(val) * input_unit_cost +             | serialize value
+ *             max(size_of(output), 1) * output_unit_cost
+ *
+ *             If any of the first two steps fails, a partial cost + an additional failure_cost
+ *             will be charged.
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct ToBytesGasParameters {
+    pub per_byte_serialized: InternalGasPerByte,
+    pub legacy_min_output_size: NumBytes,
+    pub failure: InternalGas,
+}
+
+/// Rust implementation of Move's `native public fun to_bytes<T>(&T): vector<u8>`
+#[inline]
+fn native_to_bytes(
+    gas_params: &ToBytesGasParameters,
+    context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    // pop type and value
+    let ref_to_val = pop_arg!(args, Reference);
+    let arg_type = ty_args.pop().unwrap();
+
+    // get type layout
+    let layout = match context.type_to_type_layout(&arg_type)? {
+        Some(layout) => layout,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    // serialize value
+    let val = ref_to_val.read_ref()?;
+    let serialized_value = match val.simple_serialize(&layout) {
+        Some(serialized_value) => serialized_value,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_serialized
+            * std::cmp::max(
+                NumBytes::new(serialized_value.len() as u64),
+                gas_params.legacy_min_output_size,
+            )
+    );
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(serialized_value)],
+    ))
+}
+
+pub fn make_native_to_bytes(gas_params: ToBytesGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_to_bytes(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub to_bytes: ToBytesGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [("to_bytes", make_native_to_bytes(gas_params.to_bytes))];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/debug.rs b/vendors/move/crates/move-stdlib/src/natives/debug.rs
new file mode 100644
index 000000000..1e0d9d08f
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/debug.rs
@@ -0,0 +1,698 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
+#[allow(unused_imports)]
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun print
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_nop(
+    gas_params: &PrintGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[inline]
+fn native_print(
+    gas_params: &PrintGasParameters,
+    _context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+    _move_std_addr: AccountAddress,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    let _val = args.pop_back().unwrap();
+    let _ty = ty_args.pop().unwrap();
+
+    // No-op if the feature flag is not present.
+    #[cfg(feature = "testing")]
+    {
+        let canonical = false;
+        let single_line = false;
+        let include_int_types = false;
+
+        let mut out = "[debug] ".to_string();
+        let val = _val.value_as::<Reference>()?.read_ref()?;
+
+        testing::print_value(
+            _context,
+            &mut out,
+            val,
+            _ty,
+            &_move_std_addr,
+            0,
+            canonical,
+            single_line,
+            include_int_types,
+        )?;
+        println!("{}", out);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print(
+    silent: bool,
+    gas_params: PrintGasParameters,
+    move_std_addr: AccountAddress,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print(&gas_params, context, ty_args, args, move_std_addr)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * native fun print_stack_trace
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintStackTraceGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_stack_trace_nop(
+    gas_params: &PrintStackTraceGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[allow(unused_variables)]
+#[inline]
+fn native_print_stack_trace(
+    gas_params: &PrintStackTraceGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+
+    #[cfg(feature = "testing")]
+    {
+        let mut s = String::new();
+        context.print_stack_trace(&mut s)?;
+        println!("{}", s);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print_stack_trace(
+    silent: bool,
+    gas_params: PrintStackTraceGasParameters,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace(&gas_params, context, ty_args, args)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub print: PrintGasParameters,
+    pub print_stack_trace: PrintStackTraceGasParameters,
+}
+
+pub fn make_all(
+    silent: bool,
+    gas_params: GasParameters,
+    move_std_addr: AccountAddress,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "print",
+            make_native_print(silent, gas_params.print, move_std_addr),
+        ),
+        (
+            "print_stack_trace",
+            make_native_print_stack_trace(silent, gas_params.print_stack_trace),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
+
+#[cfg(feature = "testing")]
+mod testing {
+    use move_binary_format::errors::{PartialVMError, PartialVMResult};
+    use move_core_types::{
+        account_address::AccountAddress, annotated_value as A, language_storage::TypeTag,
+        runtime_value as R, vm_status::StatusCode,
+    };
+    use move_vm_runtime::native_functions::NativeContext;
+    use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
+    use std::{fmt, fmt::Write};
+
+    const VECTOR_BEGIN: &str = "[";
+
+    const VECTOR_OR_STRUCT_SEP: &str = ",";
+
+    const VECTOR_END: &str = "]";
+
+    const STRUCT_BEGIN: &str = "{";
+
+    const STRUCT_END: &str = "}";
+
+    fn fmt_error_to_partial_vm_error(e: fmt::Error) -> PartialVMError {
+        PartialVMError::new(StatusCode::UNKNOWN_STATUS)
+            .with_message("write! macro failed with: ".to_string() + e.to_string().as_str())
+    }
+
+    fn to_vec_u8_type_err<E>(_e: E) -> PartialVMError {
+        PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+            .with_message("Could not convert Vec<MoveValue> to Vec<u8>: ".to_string())
+    }
+
+    fn get_annotated_struct_layout(
+        context: &NativeContext,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveStructLayout> {
+        let annotated_type_layout = context.type_to_fully_annotated_layout(ty)?.unwrap();
+        match annotated_type_layout {
+            A::MoveTypeLayout::Struct(annotated_struct_layout) => Ok(annotated_struct_layout),
+            _ => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                    "Could not convert Type to fully-annotated MoveTypeLayout via NativeContext"
+                        .to_string(),
+                ),
+            ),
+        }
+    }
+
+    fn get_vector_inner_type(ty: &Type) -> PartialVMResult<&Type> {
+        match ty {
+            Type::Vector(ty) => Ok(ty),
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Could not get the inner Type of a vector's Type".to_string())),
+        }
+    }
+
+    /// Converts a `MoveValue::Vector` of `u8`'s to a `String` by wrapping it in double quotes and
+    /// escaping double quotes and backslashes.
+    ///
+    /// Examples:
+    ///  - 'Hello' returns "Hello"
+    ///  - '"Hello?" What are you saying?' returns "\"Hello?\" What are you saying?"
+    ///  - '\ and " are escaped' returns "\\ and \" are escaped"
+    fn move_value_as_escaped_string(val: A::MoveValue) -> PartialVMResult<String> {
+        match val {
+            A::MoveValue::Vector(bytes) => {
+                let buf = R::MoveValue::vec_to_vec_u8(
+                    bytes.into_iter().map(A::MoveValue::undecorate).collect(),
+                )
+                .map_err(to_vec_u8_type_err)?;
+
+                let str = String::from_utf8(buf).map_err(|e| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "Could not parse UTF8 bytes: ".to_string() + e.to_string().as_str(),
+                    )
+                })?;
+
+                // We need to escape displayed double quotes " as \" and, as a result, also escape
+                // displayed \ as \\.
+                Ok(str.replace('\\', "\\\\").replace('"', "\\\""))
+            }
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Expected a MoveValue::Vector of u8's".to_string())),
+        }
+    }
+
+    fn print_padding_at_depth(out: &mut String, depth: usize) -> PartialVMResult<()> {
+        for _ in 0..depth {
+            // add 2 spaces
+            write!(out, "  ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+
+        Ok(())
+    }
+
+    fn is_non_empty_vector_u8(vec: &Vec<A::MoveValue>) -> bool {
+        if vec.is_empty() {
+            false
+        } else {
+            matches!(vec.last().unwrap(), A::MoveValue::U8(_))
+        }
+    }
+
+    fn is_vector_or_struct_move_value(mv: &A::MoveValue) -> bool {
+        matches!(mv, A::MoveValue::Vector(_) | A::MoveValue::Struct(_))
+    }
+
+    /// Prints any `Value` in a user-friendly manner.
+    pub(crate) fn print_value(
+        context: &NativeContext,
+        out: &mut String,
+        val: Value,
+        ty: Type,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        // get type layout in VM format
+        let ty_layout = context.type_to_type_layout(&ty)?.unwrap();
+
+        match &ty_layout {
+            R::MoveTypeLayout::Vector(_) => {
+                // get the inner type T of a vector<T>
+                let inner_ty = get_vector_inner_type(&ty)?;
+                let inner_tyl = context.type_to_type_layout(inner_ty)?.unwrap();
+
+                match inner_tyl {
+                    // We cannot simply convert a `Value` (of type vector) to a `MoveValue` because
+                    // there might be a struct in the vector that needs to be "decorated" using the
+                    // logic in this function. Instead, we recursively "unpack" the vector until we
+                    // get down to either (1) a primitive type, which we can forward to
+                    // `print_move_value`, or (2) a struct type, which we can decorate and forward
+                    // to `print_move_value`.
+                    R::MoveTypeLayout::Vector(_) | R::MoveTypeLayout::Struct(_) => {
+                        // `val` is either a `Vec<Vec<Value>>`, a `Vec<Struct>`,  or a `Vec<signer>`, so we cast `val` as a `Vec<Value>` and call ourselves recursively
+                        let vec = val.value_as::<Vec<Value>>()?;
+
+                        let print_inner_value =
+                            |out: &mut String,
+                             val: Value,
+                             move_std_addr: &AccountAddress,
+                             depth: usize,
+                             canonicalize: bool,
+                             single_line: bool,
+                             include_int_types: bool| {
+                                print_value(
+                                    context,
+                                    out,
+                                    val,
+                                    inner_ty.clone(),
+                                    move_std_addr,
+                                    depth,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )
+                            };
+
+                        print_non_u8_vector(
+                            out,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                            vec,
+                            print_inner_value,
+                            true,
+                        )?;
+                    }
+                    // If the inner type T of this vector<T> is a primitive bool/unsigned integer/address type, we convert the
+                    // vector<T> to a MoveValue and print it.
+                    _ => {
+                        let ann_ty_layout = context.type_to_fully_annotated_layout(&ty)?.unwrap();
+                        let mv = val.as_move_value(&ty_layout).decorate(&ann_ty_layout);
+                        print_move_value(
+                            out,
+                            mv,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+                    }
+                };
+            }
+            // For a struct, we convert it to a MoveValue annotated with its field names and types and print it
+            R::MoveTypeLayout::Struct(_) => {
+                let move_struct = match val.as_move_value(&ty_layout) {
+                    R::MoveValue::Struct(s) => s,
+                    _ => {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message("Expected MoveValue::MoveStruct".to_string()))
+                    }
+                };
+
+                let annotated_struct_layout = get_annotated_struct_layout(context, &ty)?;
+                let decorated_struct = move_struct.decorate(&annotated_struct_layout);
+
+                print_move_value(
+                    out,
+                    A::MoveValue::Struct(decorated_struct),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+            // For non-structs and non-vectors, convert them to a MoveValue and print them
+            _ => {
+                let ann_ty_layout = context.type_to_fully_annotated_layout(&ty)?.unwrap();
+                print_move_value(
+                    out,
+                    val.as_move_value(&ty_layout).decorate(&ann_ty_layout),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Prints the MoveValue in `mv`, optionally-printing integer types if `include_int_type` is
+    /// true.
+    fn print_move_value(
+        out: &mut String,
+        mv: A::MoveValue,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        match mv {
+            A::MoveValue::U8(u8) => {
+                write!(out, "{}", u8).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u8").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U16(u16) => {
+                write!(out, "{}", u16).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u16").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U32(u32) => {
+                write!(out, "{}", u32).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u32").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U64(u64) => {
+                write!(out, "{}", u64).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u64").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U128(u128) => {
+                write!(out, "{}", u128).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u128").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U256(u256) => {
+                write!(out, "{}", u256).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u256").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::Bool(b) => {
+                // Note that when `include_int_types` is enabled, the boolean `true` and `false`
+                // values unambiguously encode their type, since they are different than any integer
+                // type value, address value, signer value, vector value and struct value.
+                write!(out, "{}", if b { "true" } else { "false" })
+                    .map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Address(a) => {
+                let str = if canonicalize {
+                    a.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    a.to_hex_literal()
+                };
+                write!(out, "@{}", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Signer(s) => {
+                let str = if canonicalize {
+                    s.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    s.to_hex_literal()
+                };
+                write!(out, "signer({})", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Vector(vec) => {
+                // If this is a vector<u8> we print it in hex (as most users would expect us to)
+                if is_non_empty_vector_u8(&vec) {
+                    let bytes = R::MoveValue::vec_to_vec_u8(
+                        vec.into_iter().map(A::MoveValue::undecorate).collect(),
+                    )
+                    .map_err(to_vec_u8_type_err)?;
+                    write!(out, "0x{}", hex::encode(bytes))
+                        .map_err(fmt_error_to_partial_vm_error)?;
+                } else {
+                    let is_complex_inner_type =
+                        vec.last().map_or(false, is_vector_or_struct_move_value);
+                    print_non_u8_vector(
+                        out,
+                        move_std_addr,
+                        depth,
+                        canonicalize,
+                        single_line,
+                        include_int_types,
+                        vec,
+                        print_move_value,
+                        is_complex_inner_type,
+                    )?;
+                }
+            }
+            A::MoveValue::Struct(A::MoveStruct { type_, mut fields }) => {
+                let type_tag = TypeTag::from(type_.clone());
+
+                // Check if struct is an std::string::String
+                if !canonicalize && type_.is_std_string(move_std_addr) {
+                    if fields.len() != 1 {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::string::String struct to have just one field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let (id, val) = fields.pop().unwrap();
+                    if id.into_string() != "bytes" {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::string::String struct to have a `bytes` field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let str = move_value_as_escaped_string(val)?;
+                    write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                } else if !canonicalize && type_.is_ascii_string(move_std_addr) {
+                    if fields.len() != 1 {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::ascii::String struct to have just one field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let (id, val) = fields.pop().unwrap();
+                    if id.into_string() != "bytes" {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::ascii::String struct to have a `bytes` field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let str = move_value_as_escaped_string(val)?;
+                    write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                } else {
+                    write!(out, "{} ", type_tag).map_err(fmt_error_to_partial_vm_error)?;
+                    write!(out, "{}", STRUCT_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+
+                    // For each field, print its name and value (and type)
+                    let mut iter = fields.into_iter();
+                    if let Some((field_name, field_value)) = iter.next() {
+                        // Start an indented new line
+                        if !single_line {
+                            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                            print_padding_at_depth(out, depth + 1)?;
+                        }
+
+                        write!(out, "{}: ", field_name.into_string())
+                            .map_err(fmt_error_to_partial_vm_error)?;
+                        print_move_value(
+                            out,
+                            field_value,
+                            move_std_addr,
+                            depth + 1,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+
+                        for (field_name, field_value) in iter {
+                            write!(out, "{}", VECTOR_OR_STRUCT_SEP)
+                                .map_err(fmt_error_to_partial_vm_error)?;
+
+                            if !single_line {
+                                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                print_padding_at_depth(out, depth + 1)?;
+                            } else {
+                                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                            }
+                            write!(out, "{}: ", field_name.into_string())
+                                .map_err(fmt_error_to_partial_vm_error)?;
+                            print_move_value(
+                                out,
+                                field_value,
+                                move_std_addr,
+                                depth + 1,
+                                canonicalize,
+                                single_line,
+                                include_int_types,
+                            )?;
+                        }
+                    }
+
+                    // Ends printing the struct with "}", which could be on its own line
+                    if !single_line {
+                        writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                        print_padding_at_depth(out, depth)?;
+                    }
+                    write!(out, "{}", STRUCT_END).map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn print_non_u8_vector<ValType>(
+        out: &mut String,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+        vec: Vec<ValType>,
+        print_inner_value: impl Fn(
+            &mut String,
+            ValType,
+            &AccountAddress,
+            usize,
+            bool,
+            bool,
+            bool,
+        ) -> PartialVMResult<()>,
+        is_complex_inner_type: bool,
+    ) -> PartialVMResult<()> {
+        write!(out, "{}", VECTOR_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+        let mut iter = vec.into_iter();
+        let mut empty_vec = true;
+
+        if let Some(first_elem) = iter.next() {
+            empty_vec = false;
+
+            // For vectors-of-vectors, and for vectors-of-structs, we start a newline for each element
+            if !single_line && is_complex_inner_type {
+                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                print_padding_at_depth(out, depth + 1)?;
+            } else {
+                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+            }
+
+            print_inner_value(
+                out,
+                first_elem,
+                move_std_addr,
+                depth + 1,
+                canonicalize,
+                single_line,
+                include_int_types,
+            )?;
+
+            for elem in iter {
+                write!(out, "{}", VECTOR_OR_STRUCT_SEP).map_err(fmt_error_to_partial_vm_error)?;
+
+                // For vectors of vectors or vectors of structs, we start a newline for each element
+                if !single_line && is_complex_inner_type {
+                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                    print_padding_at_depth(out, depth + 1)?;
+                } else {
+                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                }
+                print_inner_value(
+                    out,
+                    elem,
+                    move_std_addr,
+                    depth + 1,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        // For vectors of vectors or vectors of structs, we display the closing ] on a newline
+        if !single_line && is_complex_inner_type {
+            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+            print_padding_at_depth(out, depth)?;
+        } else if !empty_vec {
+            write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+        write!(out, "{}", VECTOR_END).map_err(fmt_error_to_partial_vm_error)?;
+
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/hash.rs b/vendors/move/crates/move-stdlib/src/natives/hash.rs
new file mode 100644
index 000000000..8656c640b
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/hash.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use sha2::{Digest, Sha256};
+use sha3::Sha3_256;
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun sha2_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha2_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha2_256(
+    gas_params: &Sha2_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha2_256(gas_params: Sha2_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha2_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun sha3_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha3_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha3_256(
+    gas_params: &Sha3_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha3_256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha3_256(gas_params: Sha3_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha3_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub sha2_256: Sha2_256GasParameters,
+    pub sha3_256: Sha3_256GasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("sha2_256", make_native_sha2_256(gas_params.sha2_256)),
+        ("sha3_256", make_native_sha3_256(gas_params.sha3_256)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/helpers.rs b/vendors/move/crates/move-stdlib/src/natives/helpers.rs
new file mode 100644
index 000000000..1a8b8a88c
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/helpers.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_runtime::native_functions::NativeFunction;
+
+pub fn make_module_natives(
+    natives: impl IntoIterator<Item = (impl Into<String>, NativeFunction)>,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    natives
+        .into_iter()
+        .map(|(func_name, func)| (func_name.into(), func))
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/mod.rs b/vendors/move/crates/move-stdlib/src/natives/mod.rs
new file mode 100644
index 000000000..30c7579ea
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/mod.rs
@@ -0,0 +1,173 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bcs;
+pub mod debug;
+pub mod hash;
+pub mod signer;
+pub mod string;
+pub mod type_name;
+#[cfg(feature = "testing")]
+pub mod unit_test;
+pub mod vector;
+
+mod helpers;
+
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub bcs: bcs::GasParameters,
+    pub hash: hash::GasParameters,
+    pub signer: signer::GasParameters,
+    pub string: string::GasParameters,
+    pub type_name: type_name::GasParameters,
+    pub vector: vector::GasParameters,
+
+    #[cfg(feature = "testing")]
+    pub unit_test: unit_test::GasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            bcs: bcs::GasParameters {
+                to_bytes: bcs::ToBytesGasParameters {
+                    per_byte_serialized: 0.into(),
+                    legacy_min_output_size: 0.into(),
+                    failure: 0.into(),
+                },
+            },
+
+            hash: hash::GasParameters {
+                sha2_256: hash::Sha2_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+                sha3_256: hash::Sha3_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+            },
+            type_name: type_name::GasParameters {
+                get: type_name::GetGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+            },
+            signer: signer::GasParameters {
+                borrow_address: signer::BorrowAddressGasParameters { base: 0.into() },
+            },
+            string: string::GasParameters {
+                check_utf8: string::CheckUtf8GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                is_char_boundary: string::IsCharBoundaryGasParameters { base: 0.into() },
+                sub_string: string::SubStringGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                index_of: string::IndexOfGasParameters {
+                    base: 0.into(),
+                    per_byte_pattern: 0.into(),
+                    per_byte_searched: 0.into(),
+                },
+            },
+            vector: vector::GasParameters {
+                empty: vector::EmptyGasParameters { base: 0.into() },
+                length: vector::LengthGasParameters { base: 0.into() },
+                push_back: vector::PushBackGasParameters {
+                    base: 0.into(),
+                    legacy_per_abstract_memory_unit: 0.into(),
+                },
+                borrow: vector::BorrowGasParameters { base: 0.into() },
+                pop_back: vector::PopBackGasParameters { base: 0.into() },
+                destroy_empty: vector::DestroyEmptyGasParameters { base: 0.into() },
+                swap: vector::SwapGasParameters { base: 0.into() },
+            },
+            #[cfg(feature = "testing")]
+            unit_test: unit_test::GasParameters {
+                create_signers_for_testing: unit_test::CreateSignersForTestingGasParameters {
+                    base_cost: 0.into(),
+                    unit_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn all_natives(
+    move_std_addr: AccountAddress,
+    gas_params: GasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("bcs", bcs::make_all(gas_params.bcs));
+    add_natives!("hash", hash::make_all(gas_params.hash));
+    add_natives!("signer", signer::make_all(gas_params.signer));
+    add_natives!("string", string::make_all(gas_params.string));
+    add_natives!("type_name", type_name::make_all(gas_params.type_name));
+    add_natives!("vector", vector::make_all(gas_params.vector));
+    #[cfg(feature = "testing")]
+    {
+        add_natives!("unit_test", unit_test::make_all(gas_params.unit_test));
+    }
+
+    make_table_from_iter(move_std_addr, natives)
+}
+
+#[derive(Debug, Clone)]
+pub struct NurseryGasParameters {
+    debug: debug::GasParameters,
+}
+
+impl NurseryGasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            debug: debug::GasParameters {
+                print: debug::PrintGasParameters {
+                    base_cost: 0.into(),
+                },
+                print_stack_trace: debug::PrintStackTraceGasParameters {
+                    base_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn nursery_natives(
+    silent: bool,
+    move_std_addr: AccountAddress,
+    gas_params: NurseryGasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!(
+        "debug",
+        debug::make_all(silent, gas_params.debug, move_std_addr)
+    );
+
+    make_table_from_iter(move_std_addr, natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/signer.rs b/vendors/move/crates/move-stdlib/src/natives/signer.rs
new file mode 100644
index 000000000..6aed1bb7a
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/signer.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::InternalGas;
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::SignerRef, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun borrow_address
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowAddressGasParameters {
+    pub base: InternalGas,
+}
+
+#[inline]
+fn native_borrow_address(
+    gas_params: &BorrowAddressGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let signer_reference = pop_arg!(arguments, SignerRef);
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![signer_reference.borrow_signer()?],
+    ))
+}
+
+pub fn make_native_borrow_address(gas_params: BorrowAddressGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_address(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub borrow_address: BorrowAddressGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "borrow_address",
+        make_native_borrow_address(gas_params.borrow_address),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/string.rs b/vendors/move/crates/move-stdlib/src/natives/string.rs
new file mode 100644
index 000000000..679364fbc
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/string.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implementation of native functions for utf8 strings.
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, VectorRef},
+};
+use std::{collections::VecDeque, sync::Arc};
+
+// The implementation approach delegates all utf8 handling to Rust.
+// This is possible without copying of bytes because (a) we can
+// get a `std::cell::Ref<Vec<u8>>` from a `vector<u8>` and in turn a `&[u8]`
+// from that (b) assuming that `vector<u8>` embedded in a string
+// is already valid utf8, we can use `str::from_utf8_unchecked` to
+// create a `&str` view on the bytes without a copy. Once we have this
+// view, we can call ut8 functions like length, substring, etc.
+
+/***************************************************************************************************
+ * native fun internal_check_utf8
+ *
+ *   gas cost: base_cost + unit_cost * length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct CheckUtf8GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_check_utf8(
+    gas_params: &CheckUtf8GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 1);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new(s_ref.as_slice().len() as u64);
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let ok = std::str::from_utf8(s_ref.as_slice()).is_ok();
+    // TODO: extensible native cost tables
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_check_utf8(gas_params: CheckUtf8GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_check_utf8(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_is_char_boundary
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IsCharBoundaryGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_is_char_boundary(
+    gas_params: &IsCharBoundaryGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let i = pop_arg!(args, u64);
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let ok = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice()).is_char_boundary(i as usize)
+    };
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_is_char_boundary(gas_params: IsCharBoundaryGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_is_char_boundary(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_sub_string
+ *
+ *   gas cost: base_cost + unit_cost * sub_string_length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SubStringGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_sub_string(
+    gas_params: &SubStringGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 3);
+
+    let j = pop_arg!(args, u64) as usize;
+    let i = pop_arg!(args, u64) as usize;
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    if j < i {
+        // TODO: what abort code should we use here?
+        return Ok(NativeResult::err(context.gas_used(), 1));
+    }
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new((j - i) as u64);
+    native_charge_gas_early_exit!(context, cost);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice())
+    };
+    let v = Value::vector_u8(s_str[i..j].as_bytes().iter().cloned());
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(v))
+}
+
+pub fn make_native_sub_string(gas_params: SubStringGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sub_string(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_index_of
+ *
+ *   gas cost: base_cost + unit_cost * bytes_searched
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IndexOfGasParameters {
+    pub base: InternalGas,
+    pub per_byte_pattern: InternalGasPerByte,
+    pub per_byte_searched: InternalGasPerByte,
+}
+
+fn native_index_of(
+    gas_params: &IndexOfGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r_arg = pop_arg!(args, VectorRef);
+    let r_ref = r_arg.as_bytes_ref();
+    let r_str = unsafe { std::str::from_utf8_unchecked(r_ref.as_slice()) };
+    // Charge pattern fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_pattern * NumBytes::new(r_str.len() as u64)
+    );
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe { std::str::from_utf8_unchecked(s_ref.as_slice()) };
+    let pos = match s_str.find(r_str) {
+        Some(size) => size,
+        None => s_str.len(),
+    };
+    // TODO(Gas): What is the algorithm used for the search?
+    //            Ideally it should be something like KMP with O(n) time complexity...
+    // Charge search fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_searched * NumBytes::new(pos as u64)
+    );
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::u64(pos as u64)))
+}
+
+pub fn make_native_index_of(gas_params: IndexOfGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_index_of(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub check_utf8: CheckUtf8GasParameters,
+    pub is_char_boundary: IsCharBoundaryGasParameters,
+    pub sub_string: SubStringGasParameters,
+    pub index_of: IndexOfGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "internal_check_utf8",
+            make_native_check_utf8(gas_params.check_utf8),
+        ),
+        (
+            "internal_is_char_boundary",
+            make_native_is_char_boundary(gas_params.is_char_boundary),
+        ),
+        (
+            "internal_sub_string",
+            make_native_sub_string(gas_params.sub_string),
+        ),
+        (
+            "internal_index_of",
+            make_native_index_of(gas_params.index_of),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/type_name.rs b/vendors/move/crates/move-stdlib/src/natives/type_name.rs
new file mode 100644
index 000000000..595e4dde6
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/type_name.rs
@@ -0,0 +1,89 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    values::{Struct, Value},
+};
+
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+#[derive(Debug, Clone)]
+pub struct GetGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_get(
+    use_original_id: bool,
+    gas_params: &GetGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert_eq!(ty_args.len(), 1);
+    debug_assert!(arguments.is_empty());
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let type_tag = if use_original_id {
+        context.type_to_runtime_type_tag(&ty_args[0])
+    } else {
+        context.type_to_type_tag(&ty_args[0])
+    }?;
+
+    let type_name = type_tag.to_canonical_string(/* with_prefix */ false);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte * NumBytes::new(type_name.len() as u64)
+    );
+
+    // make a std::string::String
+    let string_val = Value::struct_(Struct::pack(vec![Value::vector_u8(
+        type_name.as_bytes().to_vec(),
+    )]));
+    // make a std::type_name::TypeName
+    let type_name_val = Value::struct_(Struct::pack(vec![string_val]));
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![type_name_val],
+    ))
+}
+
+pub fn make_native_get(use_original_id: bool, gas_params: GetGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| {
+        native_get(use_original_id, &gas_params, context, ty_args, args)
+    })
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub get: GetGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "get",
+            make_native_get(/* use_original_id */ false, gas_params.get.clone()),
+        ),
+        (
+            "get_with_original_ids",
+            make_native_get(/* use_original_id */ true, gas_params.get),
+        ),
+    ];
+
+    crate::natives::helpers::make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/unit_test.rs b/vendors/move/crates/move-stdlib/src/natives/unit_test.rs
new file mode 100644
index 000000000..610ecefe6
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/unit_test.rs
@@ -0,0 +1,85 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerArg, NumArgs},
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun create_signers_for_testing
+ *
+ *   gas cost: base_cost + unit_cost * num_of_signers
+ *
+ **************************************************************************************************/
+fn to_le_bytes(i: u64) -> [u8; AccountAddress::LENGTH] {
+    let bytes = i.to_le_bytes();
+    let mut result = [0u8; AccountAddress::LENGTH];
+    result[..bytes.len()].clone_from_slice(bytes.as_ref());
+    result
+}
+
+#[derive(Debug, Clone)]
+pub struct CreateSignersForTestingGasParameters {
+    pub base_cost: InternalGas,
+    pub unit_cost: InternalGasPerArg,
+}
+
+fn native_create_signers_for_testing(
+    gas_params: &CreateSignersForTestingGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.len() == 1);
+
+    let num_signers = pop_arg!(args, u64);
+    let signers = Value::vector_for_testing_only(
+        (0..num_signers).map(|i| Value::signer(AccountAddress::new(to_le_bytes(i)))),
+    );
+
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumArgs::new(num_signers);
+    native_charge_gas_early_exit!(context, cost);
+
+    Ok(NativeResult::ok(context.gas_used(), smallvec![signers]))
+}
+
+pub fn make_native_create_signers_for_testing(
+    gas_params: CreateSignersForTestingGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_create_signers_for_testing(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub create_signers_for_testing: CreateSignersForTestingGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "create_signers_for_testing",
+        make_native_create_signers_for_testing(gas_params.create_signers_for_testing),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/natives/vector.rs b/vendors/move/crates/move-stdlib/src/natives/vector.rs
new file mode 100644
index 000000000..194777201
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/natives/vector.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerAbstractMemoryUnit},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, Vector, VectorRef},
+    views::ValueView,
+};
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct EmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_empty(
+    gas_params: &EmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.is_empty());
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Vector::empty(&ty_args[0]))
+}
+
+pub fn make_native_empty(gas_params: EmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun length
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct LengthGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_length(
+    gas_params: &LengthGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(context.gas_used(), r.len(&ty_args[0]))
+}
+
+pub fn make_native_length(gas_params: LengthGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_length(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun push_back
+ *
+ *   gas cost: base_cost + legacy_unit_cost * max(1, size_of(val))
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PushBackGasParameters {
+    pub base: InternalGas,
+    pub legacy_per_abstract_memory_unit: InternalGasPerAbstractMemoryUnit,
+}
+
+pub fn native_push_back(
+    gas_params: &PushBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let e = args.pop_back().unwrap();
+    let r = pop_arg!(args, VectorRef);
+
+    if gas_params.legacy_per_abstract_memory_unit != 0.into() {
+        let cost = gas_params.legacy_per_abstract_memory_unit
+            * std::cmp::max(e.legacy_abstract_memory_size(), 1.into());
+        native_charge_gas_early_exit!(context, cost);
+    }
+
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.push_back(
+            e,
+            &ty_args[0],
+            context.runtime_limits_config().vector_len_max,
+        ),
+    )
+}
+
+pub fn make_native_push_back(gas_params: PushBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_push_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun borrow
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_borrow(
+    gas_params: &BorrowGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.borrow_elem(idx, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_borrow(gas_params: BorrowGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun pop
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PopBackGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_pop_back(
+    gas_params: &PopBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.pop(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_pop_back(gas_params: PopBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_pop_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun destroy_empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_destroy_empty(
+    gas_params: &DestroyEmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let v = pop_arg!(args, Vector);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        v.destroy_empty(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_destroy_empty(gas_params: DestroyEmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun swap
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SwapGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_swap(
+    gas_params: &SwapGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 3);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx2 = pop_arg!(args, u64) as usize;
+    let idx1 = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.swap(idx1, idx2, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_swap(gas_params: SwapGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_swap(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+fn native_error_to_abort(err: PartialVMError) -> PartialVMError {
+    let (major_status, sub_status_opt, message_opt, exec_state_opt, indices, offsets) =
+        err.all_data();
+    let new_err = match major_status {
+        StatusCode::VECTOR_OPERATION_ERROR => PartialVMError::new(StatusCode::ABORTED),
+        _ => PartialVMError::new(major_status),
+    };
+    let new_err = match sub_status_opt {
+        None => new_err,
+        Some(code) => new_err.with_sub_status(code),
+    };
+    let new_err = match message_opt {
+        None => new_err,
+        Some(message) => new_err.with_message(message),
+    };
+    let new_err = match exec_state_opt {
+        None => new_err,
+        Some(stacktrace) => new_err.with_exec_state(stacktrace),
+    };
+    new_err.at_indices(indices).at_code_offsets(offsets)
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub empty: EmptyGasParameters,
+    pub length: LengthGasParameters,
+    pub push_back: PushBackGasParameters,
+    pub borrow: BorrowGasParameters,
+    pub pop_back: PopBackGasParameters,
+    pub destroy_empty: DestroyEmptyGasParameters,
+    pub swap: SwapGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("empty", make_native_empty(gas_params.empty)),
+        ("length", make_native_length(gas_params.length)),
+        ("push_back", make_native_push_back(gas_params.push_back)),
+        ("borrow", make_native_borrow(gas_params.borrow.clone())),
+        ("borrow_mut", make_native_borrow(gas_params.borrow)),
+        ("pop_back", make_native_pop_back(gas_params.pop_back)),
+        (
+            "destroy_empty",
+            make_native_destroy_empty(gas_params.destroy_empty),
+        ),
+        ("swap", make_native_swap(gas_params.swap)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/crates/move-stdlib/src/tests.rs b/vendors/move/crates/move-stdlib/src/tests.rs
new file mode 100644
index 000000000..c89e6392e
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/tests.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::bail;
+use std::{cmp::Ordering, path::Path};
+use tempfile::tempdir;
+use walkdir::{DirEntry, WalkDir};
+
+#[test]
+fn check_that_docs_are_updated() {
+    let temp_dir = tempdir().unwrap();
+
+    crate::build_stdlib_doc(&temp_dir.path().to_string_lossy());
+
+    let res = check_dirs_not_diff(&temp_dir, crate::move_stdlib_docs_full_path());
+    assert!(
+        res.is_ok(),
+        "Generated docs differ from the ones checked in. {}",
+        res.unwrap_err()
+    )
+}
+
+#[test]
+fn check_that_the_errmap_is_updated() {
+    let temp_file = tempfile::NamedTempFile::new().unwrap();
+
+    crate::build_error_code_map(&temp_file.path().to_string_lossy());
+
+    assert!(
+        file_diff::diff(
+            &temp_file.path().to_string_lossy(),
+            &crate::move_stdlib_errmap_full_path()
+        ),
+        "Generated errmap differ from the one checked in"
+    );
+}
+
+fn check_dirs_not_diff<A: AsRef<Path>, B: AsRef<Path>>(
+    actual: A,
+    expected: B,
+) -> anyhow::Result<()> {
+    let mut act_walker = sorted_walk_dir(actual)?;
+    let mut exp_walker = sorted_walk_dir(expected)?;
+
+    for (a, b) in (&mut act_walker).zip(&mut exp_walker) {
+        let a = a?;
+        let b = b?;
+
+        if a.depth() != b.depth() {
+            bail!(
+                "Mismatched depth for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type() != b.file_type() {
+            bail!(
+                "Mismatched file type for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_name() != b.file_name() {
+            bail!(
+                "Mismatched file name for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type().is_file() && std::fs::read(a.path())? != std::fs::read(b.path())? {
+            bail!("{} needs to be updated", display_dir_entry(a))
+        }
+    }
+
+    if let Some(a) = act_walker.next() {
+        bail!(
+            "Unexpected dir entry: {}. Not found in expected",
+            display_dir_entry(a?)
+        )
+    }
+    if let Some(b) = exp_walker.next() {
+        bail!(
+            "Expected dir entry: {}. Not found in actual",
+            display_dir_entry(b?)
+        )
+    }
+    Ok(())
+}
+
+fn sorted_walk_dir<P: AsRef<Path>>(path: P) -> Result<walkdir::IntoIter, std::io::Error> {
+    fn compare_by_file_name(a: &DirEntry, b: &DirEntry) -> Ordering {
+        a.file_name().cmp(b.file_name())
+    }
+
+    let mut walkdir = WalkDir::new(path).sort_by(compare_by_file_name).into_iter();
+    match walkdir.next() {
+        Some(Err(e)) => Err(e.into()),
+        _ => Ok(walkdir),
+    }
+}
+
+fn display_dir_entry(d: walkdir::DirEntry) -> String {
+    d.into_path().to_string_lossy().to_string()
+}
diff --git a/vendors/move/crates/move-stdlib/src/utils.rs b/vendors/move/crates/move-stdlib/src/utils.rs
new file mode 100644
index 000000000..2a762867b
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/src/utils.rs
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{io::Write, time::Instant};
+
+pub fn time_it<F, R>(msg: &str, f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    let now = Instant::now();
+    print!("{} ... ", msg);
+    let _ = std::io::stdout().flush();
+    let res = f();
+    println!("(took {:.3}s)", now.elapsed().as_secs_f64());
+    res
+}
diff --git a/vendors/move/crates/move-stdlib/tests/ascii_tests.move b/vendors/move/crates/move-stdlib/tests/ascii_tests.move
new file mode 100644
index 000000000..c455b362b
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/ascii_tests.move
@@ -0,0 +1,120 @@
+#[test_only]
+module std::ascii_tests {
+    use std::ascii;
+    use std::vector;
+    use std::option;
+
+    #[test]
+    fun test_ascii_chars() {
+        let i = 0;
+        let end = 128;
+        let vec = vector::empty();
+
+        while (i < end) {
+            assert!(ascii::is_valid_char(i), 0);
+            vector::push_back(&mut vec, i);
+            i = i + 1;
+        };
+
+        let str = ascii::string(vec);
+        assert!(vector::length(ascii::as_bytes(&str)) == 128, 0);
+        assert!(!ascii::all_characters_printable(&str), 1);
+        assert!(vector::length(&ascii::into_bytes(str)) == 128, 2);
+    }
+
+    #[test]
+    fun test_ascii_push_chars() {
+        let i = 0;
+        let end = 128;
+        let str = ascii::string(vector::empty());
+
+        while (i < end) {
+            ascii::push_char(&mut str, ascii::char(i));
+            i = i + 1;
+        };
+
+        assert!(vector::length(ascii::as_bytes(&str)) == 128, 0);
+        assert!(ascii::length(&str) == 128, 0);
+        assert!(!ascii::all_characters_printable(&str), 1);
+    }
+
+    #[test]
+    fun test_ascii_push_char_pop_char() {
+        let i = 0;
+        let end = 128;
+        let str = ascii::string(vector::empty());
+
+        while (i < end) {
+            ascii::push_char(&mut str, ascii::char(i));
+            i = i + 1;
+        };
+
+        while (i > 0) {
+            let char = ascii::pop_char(&mut str);
+            assert!(ascii::byte(char) == i - 1, 0);
+            i = i - 1;
+        };
+
+        assert!(vector::length(ascii::as_bytes(&str)) == 0, 0);
+        assert!(ascii::length(&str) == 0, 0);
+        assert!(ascii::all_characters_printable(&str), 1);
+    }
+
+    #[test]
+    fun test_printable_chars() {
+        let i = 0x20;
+        let end = 0x7E;
+        let vec = vector::empty();
+
+        while (i <= end) {
+            assert!(ascii::is_printable_char(i), 0);
+            vector::push_back(&mut vec, i);
+            i = i + 1;
+        };
+
+        let str = ascii::string(vec);
+        assert!(ascii::all_characters_printable(&str), 0);
+    }
+
+    #[test]
+    fun printable_chars_dont_allow_tab() {
+        let str = ascii::string(vector::singleton(0x09));
+        assert!(!ascii::all_characters_printable(&str), 0);
+    }
+
+    #[test]
+    fun printable_chars_dont_allow_newline() {
+        let str = ascii::string(vector::singleton(0x0A));
+        assert!(!ascii::all_characters_printable(&str), 0);
+    }
+
+    #[test]
+    fun test_invalid_ascii_characters() {
+        let i = 128u8;
+        let end = 255u8;
+        while (i < end) {
+            let try_str = ascii::try_string(vector::singleton(i));
+            assert!(option::is_none(&try_str), 0);
+            i = i + 1;
+        };
+    }
+
+    #[test]
+    fun test_nonvisible_chars() {
+        let i = 0;
+        let end = 0x09;
+        while (i < end) {
+            let str = ascii::string(vector::singleton(i));
+            assert!(!ascii::all_characters_printable(&str), 0);
+            i = i + 1;
+        };
+
+        let i = 0x0B;
+        let end = 0x0F;
+        while (i <= end) {
+            let str = ascii::string(vector::singleton(i));
+            assert!(!ascii::all_characters_printable(&str), 0);
+            i = i + 1;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/bcs_tests.move b/vendors/move/crates/move-stdlib/tests/bcs_tests.move
new file mode 100644
index 000000000..c6ca978b3
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/bcs_tests.move
@@ -0,0 +1,103 @@
+#[test_only]
+module std::bcs_tests {
+    use std::bcs;
+
+    struct Box<T> has copy, drop, store { x: T }
+    struct Box3<T> has copy, drop, store { x: Box<Box<T>> }
+    struct Box7<T> has copy, drop, store { x: Box3<Box3<T>> }
+    struct Box15<T> has copy, drop, store { x: Box7<Box7<T>> }
+    struct Box31<T> has copy, drop, store { x: Box15<Box15<T>> }
+    struct Box63<T> has copy, drop, store { x: Box31<Box31<T>> }
+    struct Box127<T> has copy, drop, store { x: Box63<Box63<T>> }
+
+    #[test]
+    fun bcs_address() {
+        let addr = @0x1234567890abcdef1234567890abcdef89b9f9d1fadc027cf9532d6f99041522;
+        let expected_output = x"1234567890abcdef1234567890abcdef89b9f9d1fadc027cf9532d6f99041522";
+        assert!(bcs::to_bytes(&addr) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_bool() {
+        let expected_output = x"01";
+        assert!(bcs::to_bytes(&true) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u8() {
+        let expected_output = x"01";
+        assert!(bcs::to_bytes(&1u8) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u16() {
+        let expected_output = x"0100";
+        assert!(bcs::to_bytes(&1u16) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u32() {
+        let expected_output = x"01000000";
+        assert!(bcs::to_bytes(&1u32) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u64() {
+        let expected_output = x"0100000000000000";
+        assert!(bcs::to_bytes(&1) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u128() {
+        let expected_output = x"01000000000000000000000000000000";
+        assert!(bcs::to_bytes(&1u128) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u256() {
+        let expected_output = x"0100000000000000000000000000000000000000000000000000000000000000";
+        assert!(bcs::to_bytes(&1u256) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_vec_u8() {
+        let v = x"0f";
+        let expected_output = x"010f";
+        assert!(bcs::to_bytes(&v) == expected_output, 0);
+    }
+
+    fun box3<T>(x: T): Box3<T> {
+        Box3 { x: Box { x: Box { x } } }
+    }
+
+    fun box7<T>(x: T): Box7<T> {
+        Box7 { x: box3(box3(x)) }
+    }
+
+    fun box15<T>(x: T): Box15<T> {
+        Box15 { x: box7(box7(x)) }
+    }
+
+    fun box31<T>(x: T): Box31<T> {
+        Box31 { x: box15(box15(x)) }
+    }
+
+    fun box63<T>(x: T): Box63<T> {
+        Box63 { x: box31(box31(x)) }
+    }
+
+    fun box127<T>(x: T): Box127<T> {
+        Box127 { x: box63(box63(x)) }
+    }
+
+    #[test]
+    fun encode_128() {
+        bcs::to_bytes(&box127(true));
+    }
+
+    #[test]
+    #[expected_failure] // VM_MAX_VALUE_DEPTH_REACHED
+    fun encode_129() {
+        bcs::to_bytes(&Box { x: box127(true) });
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/bit_vector_tests.move b/vendors/move/crates/move-stdlib/tests/bit_vector_tests.move
new file mode 100644
index 000000000..2dfa2e047
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/bit_vector_tests.move
@@ -0,0 +1,223 @@
+#[test_only]
+module std::bit_vector_tests {
+    use std::bit_vector;
+
+    #[test_only]
+    fun test_bitvector_set_unset_of_size(k: u64) {
+        let bitvector = bit_vector::new(k);
+        let index = 0;
+        while (index < k) {
+            bit_vector::set(&mut bitvector, index);
+            assert!(bit_vector::is_index_set(&bitvector, index), 0);
+            index = index + 1;
+            let index_to_right = index;
+            while (index_to_right < k) {
+                assert!(!bit_vector::is_index_set(&bitvector, index_to_right), 1);
+                index_to_right = index_to_right + 1;
+            };
+        };
+        // now go back down unsetting
+        index = 0;
+
+        while (index < k) {
+            bit_vector::unset(&mut bitvector, index);
+            assert!(!bit_vector::is_index_set(&bitvector, index), 0);
+            index = index + 1;
+            let index_to_right = index;
+            while (index_to_right < k) {
+                assert!(bit_vector::is_index_set(&bitvector, index_to_right), 1);
+                index_to_right = index_to_right + 1;
+            };
+        };
+    }
+
+    #[test]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
+    fun set_bit_out_of_bounds() {
+        let bitvector = bit_vector::new(bit_vector::word_size());
+        bit_vector::set(&mut bitvector, bit_vector::word_size());
+    }
+
+    #[test]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
+    fun unset_bit_out_of_bounds() {
+        let bitvector = bit_vector::new(bit_vector::word_size());
+        bit_vector::unset(&mut bitvector, bit_vector::word_size());
+    }
+
+    #[test]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
+    fun index_bit_out_of_bounds() {
+        let bitvector = bit_vector::new(bit_vector::word_size());
+        bit_vector::is_index_set(&bitvector, bit_vector::word_size());
+    }
+
+    #[test]
+    fun test_set_bit_and_index_basic() {
+        test_bitvector_set_unset_of_size(8)
+    }
+
+    #[test]
+    fun test_set_bit_and_index_odd_size() {
+        test_bitvector_set_unset_of_size(300)
+    }
+
+    #[test]
+    fun longest_sequence_no_set_zero_index() {
+        let bitvector = bit_vector::new(100);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 0) == 0, 0);
+    }
+
+    #[test]
+    fun longest_sequence_one_set_zero_index() {
+        let bitvector = bit_vector::new(100);
+        bit_vector::set(&mut bitvector, 1);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 0) == 0, 0);
+    }
+
+    #[test]
+    fun longest_sequence_no_set_nonzero_index() {
+        let bitvector = bit_vector::new(100);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 51) == 0, 0);
+    }
+
+    #[test]
+    fun longest_sequence_two_set_nonzero_index() {
+        let bitvector = bit_vector::new(100);
+        bit_vector::set(&mut bitvector, 50);
+        bit_vector::set(&mut bitvector, 52);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 51) == 0, 0);
+    }
+
+    #[test]
+    fun longest_sequence_with_break() {
+        let bitvector = bit_vector::new(100);
+        let i = 0;
+        while (i < 20) {
+            bit_vector::set(&mut bitvector, i);
+            i = i + 1;
+        };
+        // create a break in the run
+        i = i + 1;
+        while (i < 100) {
+            bit_vector::set(&mut bitvector, i);
+            i = i + 1;
+        };
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 0) == 20, 0);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 20) == 0, 0);
+        assert!(bit_vector::longest_set_sequence_starting_at(&bitvector, 21) == 100 - 21, 0);
+    }
+
+    #[test]
+    fun test_shift_left() {
+        let bitlen = 133;
+        let bitvector = bit_vector::new(bitlen);
+
+        let i = 0;
+        while (i < bitlen) {
+            bit_vector::set(&mut bitvector, i);
+            i = i + 1;
+        };
+
+        i = bitlen - 1;
+        while (i > 0) {
+            assert!(bit_vector::is_index_set(&bitvector, i), 0);
+            bit_vector::shift_left(&mut bitvector, 1);
+            assert!(!bit_vector::is_index_set(&bitvector,  i), 1);
+            i = i - 1;
+        };
+    }
+
+    #[test]
+    fun test_shift_left_specific_amount() {
+        let bitlen = 300;
+        let shift_amount = 133;
+        let bitvector = bit_vector::new(bitlen);
+
+        bit_vector::set(&mut bitvector, 201);
+        assert!(bit_vector::is_index_set(&bitvector, 201), 0);
+
+        bit_vector::shift_left(&mut bitvector, shift_amount);
+        assert!(bit_vector::is_index_set(&bitvector, 201 - shift_amount), 1);
+        assert!(!bit_vector::is_index_set(&bitvector, 201), 2);
+
+        // Make sure this shift clears all the bits
+        bit_vector::shift_left(&mut bitvector, bitlen  - 1);
+
+        let i = 0;
+        while (i < bitlen) {
+            assert!(!bit_vector::is_index_set(&bitvector, i), 3);
+            i = i + 1;
+        }
+    }
+
+    #[test]
+    fun test_shift_left_specific_amount_to_unset_bit() {
+        let bitlen = 50;
+        let chosen_index = 24;
+        let shift_amount = 3;
+        let bitvector = bit_vector::new(bitlen);
+
+        let i = 0;
+
+        while (i < bitlen) {
+            bit_vector::set(&mut bitvector, i);
+            i = i + 1;
+        };
+
+        bit_vector::unset(&mut bitvector, chosen_index);
+        assert!(!bit_vector::is_index_set(&bitvector, chosen_index), 0);
+
+        bit_vector::shift_left(&mut bitvector, shift_amount);
+
+        i = 0;
+
+        while (i < bitlen) {
+            // only chosen_index - shift_amount and the remaining bits should be BitVector::unset
+            if ((i == chosen_index - shift_amount) || (i >= bitlen - shift_amount)) {
+                assert!(!bit_vector::is_index_set(&bitvector, i), 1);
+            } else {
+                assert!(bit_vector::is_index_set(&bitvector, i), 2);
+            };
+            i = i + 1;
+        }
+    }
+
+    #[test]
+    fun shift_left_at_size() {
+        let bitlen = 133;
+        let bitvector = bit_vector::new(bitlen);
+
+        let i = 0;
+        while (i < bitlen) {
+            bit_vector::set(&mut bitvector, i);
+            i = i + 1;
+        };
+
+        bit_vector::shift_left(&mut bitvector, bitlen - 1);
+        i = bitlen - 1;
+        while (i > 0) {
+            assert!(!bit_vector::is_index_set(&bitvector,  i), 1);
+            i = i - 1;
+        };
+    }
+
+    #[test]
+    fun shift_left_more_than_size() {
+        let bitlen = 133;
+        let bitvector = bit_vector::new(bitlen);
+        bit_vector::shift_left(&mut bitvector, bitlen);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = bit_vector::ELENGTH)]
+    fun empty_bitvector() {
+        bit_vector::new(0);
+    }
+
+    #[test]
+    fun single_bit_bitvector() {
+        let bitvector = bit_vector::new(1);
+        assert!(bit_vector::length(&bitvector) == 1, 0);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/fixedpoint32_tests.move b/vendors/move/crates/move-stdlib/tests/fixedpoint32_tests.move
new file mode 100644
index 000000000..83513dbe0
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/fixedpoint32_tests.move
@@ -0,0 +1,188 @@
+#[test_only]
+module std::fixed_point32_tests {
+    use std::fixed_point32;
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EDENOMINATOR)]
+    fun create_div_zero() {
+        // A denominator of zero should cause an arithmetic error.
+        fixed_point32::create_from_rational(2, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
+    fun create_overflow() {
+        // The maximum value is 2^32 - 1. Check that anything larger aborts
+        // with an overflow.
+        fixed_point32::create_from_rational(4294967296, 1); // 2^32
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
+    fun create_underflow() {
+        // The minimum non-zero value is 2^-32. Check that anything smaller
+        // aborts.
+        fixed_point32::create_from_rational(1, 8589934592); // 2^-33
+    }
+
+    #[test]
+    fun create_zero() {
+        let x = fixed_point32::create_from_rational(0, 1);
+        assert!(fixed_point32::is_zero(x), 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION_BY_ZERO)]
+    fun divide_by_zero() {
+        // Dividing by zero should cause an arithmetic error.
+        let f = fixed_point32::create_from_raw_value(0);
+        fixed_point32::divide_u64(1, f);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION)]
+    fun divide_overflow_small_divisore() {
+        let f = fixed_point32::create_from_raw_value(1); // 0x0.00000001
+        // Divide 2^32 by the minimum fractional value. This should overflow.
+        fixed_point32::divide_u64(4294967296, f);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION)]
+    fun divide_overflow_large_numerator() {
+        let f = fixed_point32::create_from_rational(1, 2); // 0.5
+        // Divide the maximum u64 value by 0.5. This should overflow.
+        fixed_point32::divide_u64(18446744073709551615, f);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EMULTIPLICATION)]
+    fun multiply_overflow_small_multiplier() {
+        let f = fixed_point32::create_from_rational(3, 2); // 1.5
+        // Multiply the maximum u64 value by 1.5. This should overflow.
+        fixed_point32::multiply_u64(18446744073709551615, f);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::EMULTIPLICATION)]
+    fun multiply_overflow_large_multiplier() {
+        let f = fixed_point32::create_from_raw_value(18446744073709551615);
+        // Multiply 2^33 by the maximum fixed-point value. This should overflow.
+        fixed_point32::multiply_u64(8589934592, f);
+    }
+
+    #[test]
+    fun exact_multiply() {
+        let f = fixed_point32::create_from_rational(3, 4); // 0.75
+        let nine = fixed_point32::multiply_u64(12, f); // 12 * 0.75
+        assert!(nine == 9, 0);
+    }
+
+    #[test]
+    fun exact_divide() {
+        let f = fixed_point32::create_from_rational(3, 4); // 0.75
+        let twelve = fixed_point32::divide_u64(9, f); // 9 / 0.75
+        assert!(twelve == 12, 0);
+    }
+
+    #[test]
+    fun multiply_truncates() {
+        let f = fixed_point32::create_from_rational(1, 3); // 0.333...
+        let not_three = fixed_point32::multiply_u64(9, copy f); // 9 * 0.333...
+        // multiply_u64 does NOT round -- it truncates -- so values that
+        // are not perfectly representable in binary may be off by one.
+        assert!(not_three == 2, 0);
+
+        // Try again with a fraction slightly larger than 1/3.
+        let f = fixed_point32::create_from_raw_value(fixed_point32::get_raw_value(f) + 1);
+        let three = fixed_point32::multiply_u64(9, f);
+        assert!(three == 3, 1);
+    }
+
+    #[test]
+    fun create_from_rational_max_numerator_denominator() {
+        // Test creating a 1.0 fraction from the maximum u64 value.
+        let f = fixed_point32::create_from_rational(18446744073709551615, 18446744073709551615);
+        let one = fixed_point32::get_raw_value(f);
+        assert!(one == 4294967296, 0); // 0x1.00000000
+    }
+
+    #[test]
+    fun min_can_return_smaller_fixed_point_number() {
+        let one = fixed_point32::create_from_rational(1, 1);
+        let two = fixed_point32::create_from_rational(2, 1);
+        let smaller_number1 = fixed_point32::min(one, two);
+        let val1 = fixed_point32::get_raw_value(smaller_number1);
+        assert!(val1 == 4294967296, 0);  // 0x1.00000000
+        let smaller_number2 = fixed_point32::min(two, one);
+        let val2 = fixed_point32::get_raw_value(smaller_number2);
+        assert!(val2 == 4294967296, 0);  // 0x1.00000000
+    }
+
+    #[test]
+    fun max_can_return_larger_fixed_point_number() {
+        let one = fixed_point32::create_from_rational(1, 1);
+        let two = fixed_point32::create_from_rational(2, 1);
+        let larger_number1 = fixed_point32::max(one, two);
+        let larger_number2 = fixed_point32::max(two, one);
+        let val1 = fixed_point32::get_raw_value(larger_number1);
+        assert!(val1 == 8589934592, 0);  // 0x2.00000000
+        let val2 = fixed_point32::get_raw_value(larger_number2);
+        assert!(val2 == 8589934592, 0);  // 0x2.00000000
+    }
+
+    #[test]
+    fun floor_can_return_the_correct_number_zero() {
+        let point_five = fixed_point32::create_from_rational(1, 2);
+        let val = fixed_point32::floor(point_five);
+        assert!(val == 0, 0);
+    }
+
+    #[test]
+    fun create_from_u64_create_correct_fixed_point_number() {
+        let one = fixed_point32::create_from_u64(1);
+        let val = fixed_point32::get_raw_value(one);
+        assert!(val == 4294967296, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
+    fun create_from_u64_throw_error_when_number_too_large() {
+        fixed_point32::create_from_u64(4294967296); // (u64 >> 32) + 1
+    }
+
+    #[test]
+    fun floor_can_return_the_correct_number_one() {
+        let three_point_five = fixed_point32::create_from_rational(7, 2); // 3.5
+        let val = fixed_point32::floor(three_point_five);
+        assert!(val == 3, 0);
+    }
+
+    #[test]
+    fun ceil_can_round_up_correctly() {
+        let point_five = fixed_point32::create_from_rational(1, 2); // 0.5
+        let val = fixed_point32::ceil(point_five);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun ceil_will_not_change_if_number_already_integer() {
+        let one = fixed_point32::create_from_rational(1, 1); // 0.5
+        let val = fixed_point32::ceil(one);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun round_can_round_up_correctly() {
+        let point_five = fixed_point32::create_from_rational(1, 2); // 0.5
+        let val = fixed_point32::round(point_five);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun round_can_round_down_correctly() {
+        let num = fixed_point32::create_from_rational(499, 1000); // 0.499
+        let val = fixed_point32::round(num);
+        assert!(val == 0, 0);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/hash_tests.move b/vendors/move/crates/move-stdlib/tests/hash_tests.move
new file mode 100644
index 000000000..449f7b914
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/hash_tests.move
@@ -0,0 +1,18 @@
+#[test_only]
+module std::hash_tests {
+    use std::hash;
+
+    #[test]
+    fun sha2_256_expected_hash() {
+        let input = x"616263";
+        let expected_output = x"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad";
+        assert!(hash::sha2_256(input) == expected_output, 0);
+    }
+
+    #[test]
+    fun sha3_256_expected_hash() {
+        let input = x"616263";
+        let expected_output = x"3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532";
+        assert!(hash::sha3_256(input) == expected_output, 0);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/move_unit_test.rs b/vendors/move/crates/move-stdlib/tests/move_unit_test.rs
new file mode 100644
index 000000000..c882bcfc9
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/move_unit_test.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::base::test::{run_move_unit_tests, UnitTestResult};
+use move_core_types::account_address::AccountAddress;
+use move_stdlib::{
+    natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters},
+    path_in_crate,
+};
+use move_unit_test::UnitTestingConfig;
+use tempfile::tempdir;
+
+fn run_tests_for_pkg(path_to_pkg: impl Into<String>, include_nursery_natives: bool) {
+    let pkg_path = path_in_crate(path_to_pkg);
+
+    let mut natives = all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        GasParameters::zeros(),
+    );
+    if include_nursery_natives {
+        natives.extend(nursery_natives(
+            /* silent */ false,
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            NurseryGasParameters::zeros(),
+        ))
+    }
+
+    let result = run_move_unit_tests(
+        &pkg_path,
+        move_package::BuildConfig {
+            test_mode: true,
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            ..Default::default()
+        },
+        UnitTestingConfig::default_with_bound(Some(1_000_000_000)),
+        natives,
+        None,
+        /* compute_coverage */ false,
+        &mut std::io::stdout(),
+        &mut std::io::stdout(),
+    )
+    .unwrap();
+    if result != UnitTestResult::Success {
+        panic!("aborting because of Move unit test failures");
+    }
+}
+
+#[test]
+fn move_unit_tests() {
+    run_tests_for_pkg(".", false);
+    run_tests_for_pkg("nursery", true);
+}
diff --git a/vendors/move/crates/move-stdlib/tests/move_verification_test.rs b/vendors/move/crates/move-stdlib/tests/move_verification_test.rs
new file mode 100644
index 000000000..2a5dbffb1
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/move_verification_test.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// TODO: split this into individual tests once the package system supports this.
+
+#[test]
+fn prove() {
+    // TODO re-enable when the prover works again
+    // use move_cli::base::prove::ProverTest;
+    // ProverTest::create(".").run();
+    // ProverTest::create("nursery").run()
+}
diff --git a/vendors/move/crates/move-stdlib/tests/option_tests.move b/vendors/move/crates/move-stdlib/tests/option_tests.move
new file mode 100644
index 000000000..950a940dc
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/option_tests.move
@@ -0,0 +1,170 @@
+#[test_only]
+module std::option_tests {
+    use std::option;
+    use std::vector;
+
+    #[test]
+    fun option_none_is_none() {
+        let none = option::none<u64>();
+        assert!(option::is_none(&none), 0);
+        assert!(!option::is_some(&none), 1);
+    }
+
+    #[test]
+    fun option_some_is_some() {
+        let some = option::some(5);
+        assert!(!option::is_none(&some), 0);
+        assert!(option::is_some(&some), 1);
+    }
+
+    #[test]
+    fun option_contains() {
+        let none = option::none<u64>();
+        let some = option::some(5);
+        let some_other = option::some(6);
+        assert!(option::contains(&some, &5), 0);
+        assert!(option::contains(&some_other, &6), 1);
+        assert!(!option::contains(&none, &5), 2);
+        assert!(!option::contains(&some_other, &5), 3);
+    }
+
+    #[test]
+    fun option_borrow_some() {
+        let some = option::some(5);
+        let some_other = option::some(6);
+        assert!(*option::borrow(&some) == 5, 3);
+        assert!(*option::borrow(&some_other) == 6, 4);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
+    fun option_borrow_none() {
+        option::borrow(&option::none<u64>());
+    }
+
+    #[test]
+    fun borrow_mut_some() {
+        let some = option::some(1);
+        let ref = option::borrow_mut(&mut some);
+        *ref = 10;
+        assert!(*option::borrow(&some) == 10, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
+    fun borrow_mut_none() {
+        option::borrow_mut(&mut option::none<u64>());
+    }
+
+    #[test]
+    fun borrow_with_default() {
+        let none = option::none<u64>();
+        let some = option::some(5);
+        assert!(*option::borrow_with_default(&some, &7) == 5, 0);
+        assert!(*option::borrow_with_default(&none, &7) == 7, 1);
+    }
+
+    #[test]
+    fun get_with_default() {
+        let none = option::none<u64>();
+        let some = option::some(5);
+        assert!(option::get_with_default(&some, 7) == 5, 0);
+        assert!(option::get_with_default(&none, 7) == 7, 1);
+    }
+
+    #[test]
+    fun extract_some() {
+        let opt = option::some(1);
+        assert!(option::extract(&mut opt) == 1, 0);
+        assert!(option::is_none(&opt), 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
+    fun extract_none() {
+        option::extract(&mut option::none<u64>());
+    }
+
+    #[test]
+    fun swap_some() {
+        let some = option::some(5);
+        assert!(option::swap(&mut some, 1) == 5, 0);
+        assert!(*option::borrow(&some) == 1, 1);
+    }
+
+    #[test]
+    fun swap_or_fill_some() {
+        let some = option::some(5);
+        assert!(option::swap_or_fill(&mut some, 1) == option::some(5), 0);
+        assert!(*option::borrow(&some) == 1, 1);
+    }
+
+    #[test]
+    fun swap_or_fill_none() {
+        let none = option::none();
+        assert!(option::swap_or_fill(&mut none, 1) == option::none(), 0);
+        assert!(*option::borrow(&none) == 1, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
+    fun swap_none() {
+        option::swap(&mut option::none<u64>(), 1);
+    }
+
+    #[test]
+    fun fill_none() {
+        let none = option::none<u64>();
+        option::fill(&mut none, 3);
+        assert!(option::is_some(&none), 0);
+        assert!(*option::borrow(&none) == 3, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_IS_SET)]
+    fun fill_some() {
+        option::fill(&mut option::some(3), 0);
+    }
+
+    #[test]
+    fun destroy_with_default() {
+        assert!(option::destroy_with_default(option::none<u64>(), 4) == 4, 0);
+        assert!(option::destroy_with_default(option::some(4), 5) == 4, 1);
+    }
+
+    #[test]
+    fun destroy_some() {
+        assert!(option::destroy_some(option::some(4)) == 4, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
+    fun destroy_some_none() {
+        option::destroy_some(option::none<u64>());
+    }
+
+    #[test]
+    fun destroy_none() {
+        option::destroy_none(option::none<u64>());
+    }
+
+    #[test]
+    #[expected_failure(abort_code = option::EOPTION_IS_SET)]
+    fun destroy_none_some() {
+        option::destroy_none(option::some<u64>(0));
+    }
+
+    #[test]
+    fun into_vec_some() {
+        let v = option::to_vec(option::some<u64>(0));
+        assert!(vector::length(&v) == 1, 0);
+        let x = vector::pop_back(&mut v);
+        assert!(x == 0, 1);
+    }
+
+    #[test]
+    fun into_vec_none() {
+        let v: vector<u64> = option::to_vec(option::none());
+        assert!(vector::is_empty(&v), 0);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/string_tests.move b/vendors/move/crates/move-stdlib/tests/string_tests.move
new file mode 100644
index 000000000..e7810a342
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/string_tests.move
@@ -0,0 +1,78 @@
+#[test_only]
+module std::string_tests {
+    use std::string;
+
+    #[test]
+    fun test_valid_utf8() {
+        let sparkle_heart = vector[240, 159, 146, 150];
+        let s = string::utf8(sparkle_heart);
+        assert!(string::length(&s) == 4, 22);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_UTF8)]
+    fun test_invalid_utf8() {
+        let no_sparkle_heart = vector[0, 159, 146, 150];
+        let s = string::utf8(no_sparkle_heart);
+        assert!(string::length(&s) == 1, 22);
+    }
+
+    #[test]
+    fun test_sub_string() {
+        let s = string::utf8(b"abcd");
+        let sub = string::sub_string(&s, 2, 4);
+        assert!(sub == string::utf8(b"cd"), 22)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_INDEX)]
+    fun test_sub_string_invalid_boundary() {
+        let sparkle_heart = vector[240, 159, 146, 150];
+        let s = string::utf8(sparkle_heart);
+        let _sub = string::sub_string(&s, 1, 4);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_INDEX)]
+    fun test_sub_string_invalid_index() {
+        let s = string::utf8(b"abcd");
+        let _sub = string::sub_string(&s, 4, 5);
+    }
+
+    #[test]
+    fun test_sub_string_empty() {
+        let s = string::utf8(b"abcd");
+        let sub = string::sub_string(&s, 4, 4);
+        assert!(string::is_empty(&sub), 22)
+    }
+
+    #[test]
+    fun test_index_of() {
+        let s = string::utf8(b"abcd");
+        let r = string::utf8(b"bc");
+        let p = string::index_of(&s, &r);
+        assert!(p == 1, 22)
+    }
+
+    #[test]
+    fun test_index_of_fail() {
+        let s = string::utf8(b"abcd");
+        let r = string::utf8(b"bce");
+        let p = string::index_of(&s, &r);
+        assert!(p == 4, 22)
+    }
+
+    #[test]
+    fun test_append() {
+        let s = string::utf8(b"abcd");
+        string::append(&mut s, string::utf8(b"ef"));
+        assert!(s == string::utf8(b"abcdef"), 22)
+    }
+
+    #[test]
+    fun test_insert() {
+        let s = string::utf8(b"abcd");
+        string::insert(&mut s, 1, string::utf8(b"xy"));
+        assert!(s == string::utf8(b"axybcd"), 22)
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/type_name_tests.move b/vendors/move/crates/move-stdlib/tests/type_name_tests.move
new file mode 100644
index 000000000..48c1ba2ed
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/type_name_tests.move
@@ -0,0 +1,47 @@
+// note: intentionally using 0xa here to test non-0x1 module addresses
+module 0xA::type_name_tests {
+    #[test_only]
+    use std::type_name::{get, into_string};
+    #[test_only]
+    use std::ascii::string;
+
+    struct TestStruct {}
+
+    struct TestGenerics<phantom T> { }
+
+    struct TestMultiGenerics<phantom T1, phantom T2, phantom T3> { }
+
+    #[test]
+    fun test_ground_types() {
+        assert!(into_string(get<u8>()) == string(b"u8"), 0);
+        assert!(into_string(get<u64>()) == string(b"u64"), 0);
+        assert!(into_string(get<u128>()) == string(b"u128"), 0);
+        assert!(into_string(get<address>()) == string(b"address"), 0);
+        assert!(into_string(get<signer>()) == string(b"signer"), 0);
+        assert!(into_string(get<vector<u8>>()) == string(b"vector<u8>"), 0)
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_structs() {
+        assert!(into_string(get<TestStruct>()) == string(b"000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestStruct"), 0);
+        assert!(into_string(get<std::ascii::String>()) == string(b"0000000000000000000000000000000000000000000000000000000000000001::ascii::String"), 0);
+        assert!(into_string(get<std::option::Option<u64>>()) == string(b"0000000000000000000000000000000000000000000000000000000000000001::option::Option<u64>"), 0);
+        assert!(into_string(get<std::string::String>()) == string(b"0000000000000000000000000000000000000000000000000000000000000001::string::String"), 0);
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_generics() {
+        assert!(into_string(get<TestGenerics<std::string::String>>()) == string(b"000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestGenerics<0000000000000000000000000000000000000000000000000000000000000001::string::String>"), 0);
+        assert!(into_string(get<vector<TestGenerics<u64>>>()) == string(b"vector<000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestGenerics<u64>>"), 0);
+        assert!(into_string(get<std::option::Option<TestGenerics<u8>>>()) == string(b"0000000000000000000000000000000000000000000000000000000000000001::option::Option<000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestGenerics<u8>>"), 0);
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_multi_generics() {
+        assert!(into_string(get<TestMultiGenerics<bool, u64, u128>>()) == string(b"000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestMultiGenerics<bool,u64,u128>"), 0);
+        assert!(into_string(get<TestMultiGenerics<bool, vector<u64>, TestGenerics<u128>>>()) == string(b"000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestMultiGenerics<bool,vector<u64>,000000000000000000000000000000000000000000000000000000000000000a::type_name_tests::TestGenerics<u128>>"), 0);
+    }
+}
diff --git a/vendors/move/crates/move-stdlib/tests/vector_tests.move b/vendors/move/crates/move-stdlib/tests/vector_tests.move
new file mode 100644
index 000000000..5480f6b68
--- /dev/null
+++ b/vendors/move/crates/move-stdlib/tests/vector_tests.move
@@ -0,0 +1,569 @@
+#[test_only]
+module std::vector_tests {
+    use std::vector as V;
+
+    struct R has store { }
+    struct Droppable has drop {}
+    struct NotDroppable {}
+
+    #[test]
+    fun test_singleton_contains() {
+        assert!(*V::borrow(&V::singleton(0), 0) == 0, 0);
+        assert!(*V::borrow(&V::singleton(true), 0) == true, 0);
+        assert!(*V::borrow(&V::singleton(@0x1), 0) == @0x1, 0);
+    }
+
+    #[test]
+    fun test_singleton_len() {
+        assert!(V::length(&V::singleton(0)) == 1, 0);
+        assert!(V::length(&V::singleton(true)) == 1, 0);
+        assert!(V::length(&V::singleton(@0x1)) == 1, 0);
+    }
+
+    #[test]
+    fun test_empty_is_empty() {
+        assert!(V::is_empty(&V::empty<u64>()), 0);
+    }
+
+    #[test]
+    fun append_empties_is_empty() {
+        let v1 = V::empty<u64>();
+        let v2 = V::empty<u64>();
+        V::append(&mut v1, v2);
+        assert!(V::is_empty(&v1), 0);
+    }
+
+    #[test]
+    fun append_respects_order_empty_lhs() {
+        let v1 = V::empty();
+        let v2 = V::empty();
+        V::push_back(&mut v2, 0);
+        V::push_back(&mut v2, 1);
+        V::push_back(&mut v2, 2);
+        V::push_back(&mut v2, 3);
+        V::append(&mut v1, v2);
+        assert!(!V::is_empty(&v1), 0);
+        assert!(V::length(&v1) == 4, 1);
+        assert!(*V::borrow(&v1, 0) == 0, 2);
+        assert!(*V::borrow(&v1, 1) == 1, 3);
+        assert!(*V::borrow(&v1, 2) == 2, 4);
+        assert!(*V::borrow(&v1, 3) == 3, 5);
+    }
+
+    #[test]
+    fun append_respects_order_empty_rhs() {
+        let v1 = V::empty();
+        let v2 = V::empty();
+        V::push_back(&mut v1, 0);
+        V::push_back(&mut v1, 1);
+        V::push_back(&mut v1, 2);
+        V::push_back(&mut v1, 3);
+        V::append(&mut v1, v2);
+        assert!(!V::is_empty(&v1), 0);
+        assert!(V::length(&v1) == 4, 1);
+        assert!(*V::borrow(&v1, 0) == 0, 2);
+        assert!(*V::borrow(&v1, 1) == 1, 3);
+        assert!(*V::borrow(&v1, 2) == 2, 4);
+        assert!(*V::borrow(&v1, 3) == 3, 5);
+    }
+
+    #[test]
+    fun append_respects_order_nonempty_rhs_lhs() {
+        let v1 = V::empty();
+        let v2 = V::empty();
+        V::push_back(&mut v1, 0);
+        V::push_back(&mut v1, 1);
+        V::push_back(&mut v1, 2);
+        V::push_back(&mut v1, 3);
+        V::push_back(&mut v2, 4);
+        V::push_back(&mut v2, 5);
+        V::push_back(&mut v2, 6);
+        V::push_back(&mut v2, 7);
+        V::append(&mut v1, v2);
+        assert!(!V::is_empty(&v1), 0);
+        assert!(V::length(&v1) == 8, 1);
+        let i = 0;
+        while (i < 8) {
+            assert!(*V::borrow(&v1, i) == i, i);
+            i = i + 1;
+        }
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
+    fun borrow_out_of_range() {
+        let v = V::empty();
+        V::push_back(&mut v, 7);
+        V::borrow(&v, 1);
+    }
+
+    #[test]
+    fun vector_contains() {
+        let vec = V::empty();
+        assert!(!V::contains(&vec, &0), 1);
+
+        V::push_back(&mut vec, 0);
+        assert!(V::contains(&vec, &0), 2);
+        assert!(!V::contains(&vec, &1), 3);
+
+        V::push_back(&mut vec, 1);
+        assert!(V::contains(&vec, &0), 4);
+        assert!(V::contains(&vec, &1), 5);
+        assert!(!V::contains(&vec, &2), 6);
+
+        V::push_back(&mut vec, 2);
+        assert!(V::contains(&vec, &0), 7);
+        assert!(V::contains(&vec, &1), 8);
+        assert!(V::contains(&vec, &2), 9);
+        assert!(!V::contains(&vec, &3), 10);
+    }
+
+    #[test]
+    fun destroy_empty() {
+        V::destroy_empty(V::empty<u64>());
+        V::destroy_empty(V::empty<R>());
+    }
+
+    #[test]
+    fun destroy_empty_with_pops() {
+        let v = V::empty();
+        V::push_back(&mut v, 42);
+        V::pop_back(&mut v);
+        V::destroy_empty(v);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 3, location = Self)]
+    fun destroy_non_empty() {
+        let v = V::empty();
+        V::push_back(&mut v, 42);
+        V::destroy_empty(v);
+    }
+
+    #[test]
+    fun get_set_work() {
+        let vec = V::empty();
+        V::push_back(&mut vec, 0);
+        V::push_back(&mut vec, 1);
+        assert!(*V::borrow(&vec, 1) == 1, 0);
+        assert!(*V::borrow(&vec, 0) == 0, 1);
+
+        *V::borrow_mut(&mut vec, 0) = 17;
+        assert!(*V::borrow(&vec, 1) == 1, 0);
+        assert!(*V::borrow(&vec, 0) == 17, 0);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 2, location = Self)]
+    fun pop_out_of_range() {
+        let v = V::empty<u64>();
+        V::pop_back(&mut v);
+    }
+
+    #[test]
+    fun swap_different_indices() {
+        let vec = V::empty();
+        V::push_back(&mut vec, 0);
+        V::push_back(&mut vec, 1);
+        V::push_back(&mut vec, 2);
+        V::push_back(&mut vec, 3);
+        V::swap(&mut vec, 0, 3);
+        V::swap(&mut vec, 1, 2);
+        assert!(*V::borrow(&vec, 0) == 3, 0);
+        assert!(*V::borrow(&vec, 1) == 2, 0);
+        assert!(*V::borrow(&vec, 2) == 1, 0);
+        assert!(*V::borrow(&vec, 3) == 0, 0);
+    }
+
+    #[test]
+    fun swap_same_index() {
+        let vec = V::empty();
+        V::push_back(&mut vec, 0);
+        V::push_back(&mut vec, 1);
+        V::push_back(&mut vec, 2);
+        V::push_back(&mut vec, 3);
+        V::swap(&mut vec, 1, 1);
+        assert!(*V::borrow(&vec, 0) == 0, 0);
+        assert!(*V::borrow(&vec, 1) == 1, 0);
+        assert!(*V::borrow(&vec, 2) == 2, 0);
+        assert!(*V::borrow(&vec, 3) == 3, 0);
+    }
+
+    #[test]
+    fun remove_singleton_vector() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        assert!(V::remove(&mut v, 0) == 0, 0);
+        assert!(V::length(&v) == 0, 0);
+    }
+
+    #[test]
+    fun remove_nonsingleton_vector() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        assert!(V::remove(&mut v, 1) == 1, 0);
+        assert!(V::length(&v) == 3, 0);
+        assert!(*V::borrow(&v, 0) == 0, 0);
+        assert!(*V::borrow(&v, 1) == 2, 0);
+        assert!(*V::borrow(&v, 2) == 3, 0);
+    }
+
+    #[test]
+    fun remove_nonsingleton_vector_last_elem() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        assert!(V::remove(&mut v, 3) == 3, 0);
+        assert!(V::length(&v) == 3, 0);
+        assert!(*V::borrow(&v, 0) == 0, 0);
+        assert!(*V::borrow(&v, 1) == 1, 0);
+        assert!(*V::borrow(&v, 2) == 2, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
+    fun remove_empty_vector() {
+        let v = V::empty<u64>();
+        V::remove(&mut v, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
+    fun remove_out_of_bound_index() {
+        let v = V::empty<u64>();
+        V::push_back(&mut v, 0);
+        V::remove(&mut v, 1);
+    }
+
+    #[test]
+    fun reverse_vector_empty() {
+        let v = V::empty<u64>();
+        let is_empty = V::is_empty(&v);
+        V::reverse(&mut v);
+        assert!(is_empty == V::is_empty(&v), 0);
+    }
+
+    #[test]
+    fun reverse_singleton_vector() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        assert!(*V::borrow(&v, 0) == 0, 1);
+        V::reverse(&mut v);
+        assert!(*V::borrow(&v, 0) == 0, 2);
+    }
+
+    #[test]
+    fun reverse_vector_nonempty_even_length() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        assert!(*V::borrow(&v, 0) == 0, 1);
+        assert!(*V::borrow(&v, 1) == 1, 2);
+        assert!(*V::borrow(&v, 2) == 2, 3);
+        assert!(*V::borrow(&v, 3) == 3, 4);
+
+        V::reverse(&mut v);
+
+        assert!(*V::borrow(&v, 3) == 0, 5);
+        assert!(*V::borrow(&v, 2) == 1, 6);
+        assert!(*V::borrow(&v, 1) == 2, 7);
+        assert!(*V::borrow(&v, 0) == 3, 8);
+    }
+
+    #[test]
+    fun reverse_vector_nonempty_odd_length_non_singleton() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+
+        assert!(*V::borrow(&v, 0) == 0, 1);
+        assert!(*V::borrow(&v, 1) == 1, 2);
+        assert!(*V::borrow(&v, 2) == 2, 3);
+
+        V::reverse(&mut v);
+
+        assert!(*V::borrow(&v, 2) == 0, 4);
+        assert!(*V::borrow(&v, 1) == 1, 5);
+        assert!(*V::borrow(&v, 0) == 2, 6);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
+    fun swap_empty() {
+        let v = V::empty<u64>();
+        V::swap(&mut v, 0, 0);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
+    fun swap_out_of_range() {
+        let v = V::empty<u64>();
+
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        V::swap(&mut v, 1, 10);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
+    fun swap_remove_empty() {
+        let v = V::empty<u64>();
+        V::swap_remove(&mut v, 0);
+    }
+
+    #[test]
+    fun swap_remove_singleton() {
+        let v = V::empty<u64>();
+        V::push_back(&mut v, 0);
+        assert!(V::swap_remove(&mut v, 0) == 0, 0);
+        assert!(V::is_empty(&v), 1);
+    }
+
+    #[test]
+    fun swap_remove_inside_vector() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        assert!(*V::borrow(&v, 0) == 0, 1);
+        assert!(*V::borrow(&v, 1) == 1, 2);
+        assert!(*V::borrow(&v, 2) == 2, 3);
+        assert!(*V::borrow(&v, 3) == 3, 4);
+
+        assert!(V::swap_remove(&mut v, 1) == 1, 5);
+        assert!(V::length(&v) == 3, 6);
+
+        assert!(*V::borrow(&v, 0) == 0, 7);
+        assert!(*V::borrow(&v, 1) == 3, 8);
+        assert!(*V::borrow(&v, 2) == 2, 9);
+
+    }
+
+    #[test]
+    fun swap_remove_end_of_vector() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::push_back(&mut v, 1);
+        V::push_back(&mut v, 2);
+        V::push_back(&mut v, 3);
+
+        assert!(*V::borrow(&v, 0) == 0, 1);
+        assert!(*V::borrow(&v, 1) == 1, 2);
+        assert!(*V::borrow(&v, 2) == 2, 3);
+        assert!(*V::borrow(&v, 3) == 3, 4);
+
+        assert!(V::swap_remove(&mut v, 3) == 3, 5);
+        assert!(V::length(&v) == 3, 6);
+
+        assert!(*V::borrow(&v, 0) == 0, 7);
+        assert!(*V::borrow(&v, 1) == 1, 8);
+        assert!(*V::borrow(&v, 2) == 2, 9);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 1, location = std::vector)]
+    fun swap_remove_out_of_range() {
+        let v = V::empty();
+        V::push_back(&mut v, 0);
+        V::swap_remove(&mut v, 1);
+    }
+
+    #[test]
+    fun push_back_and_borrow() {
+        let v = V::empty();
+        V::push_back(&mut v, 7);
+        assert!(!V::is_empty(&v), 0);
+        assert!(V::length(&v) == 1, 1);
+        assert!(*V::borrow(&v, 0) == 7, 2);
+
+        V::push_back(&mut v, 8);
+        assert!(V::length(&v) == 2, 3);
+        assert!(*V::borrow(&v, 0) == 7, 4);
+        assert!(*V::borrow(&v, 1) == 8, 5);
+    }
+
+    #[test]
+    fun index_of_empty_not_has() {
+        let v = V::empty();
+        let (has, index) = V::index_of(&v, &true);
+        assert!(!has, 0);
+        assert!(index == 0, 1);
+    }
+
+    #[test]
+    fun index_of_nonempty_not_has() {
+        let v = V::empty();
+        V::push_back(&mut v, false);
+        let (has, index) = V::index_of(&v, &true);
+        assert!(!has, 0);
+        assert!(index == 0, 1);
+    }
+
+    #[test]
+    fun index_of_nonempty_has() {
+        let v = V::empty();
+        V::push_back(&mut v, false);
+        V::push_back(&mut v, true);
+        let (has, index) = V::index_of(&v, &true);
+        assert!(has, 0);
+        assert!(index == 1, 1);
+    }
+
+    // index_of will return the index first occurence that is equal
+    #[test]
+    fun index_of_nonempty_has_multiple_occurences() {
+        let v = V::empty();
+        V::push_back(&mut v, false);
+        V::push_back(&mut v, true);
+        V::push_back(&mut v, true);
+        let (has, index) = V::index_of(&v, &true);
+        assert!(has, 0);
+        assert!(index == 1, 1);
+    }
+
+    #[test]
+    fun length() {
+        let empty = V::empty();
+        assert!(V::length(&empty) == 0, 0);
+        let i = 0;
+        let max_len = 42;
+        while (i < max_len) {
+            V::push_back(&mut empty, i);
+            assert!(V::length(&empty) == i + 1, i);
+            i = i + 1;
+        }
+    }
+
+    #[test]
+    fun pop_push_back() {
+        let v = V::empty();
+        let i = 0;
+        let max_len = 42;
+
+        while (i < max_len) {
+            V::push_back(&mut v, i);
+            i = i + 1;
+        };
+
+        while (i > 0) {
+            assert!(V::pop_back(&mut v) == i - 1, i);
+            i = i - 1;
+        };
+    }
+
+    #[test_only]
+    fun test_natives_with_type<T>(x1: T, x2: T): (T, T) {
+        let v = V::empty();
+        assert!(V::length(&v) == 0, 0);
+        V::push_back(&mut v, x1);
+        assert!(V::length(&v) == 1, 1);
+        V::push_back(&mut v, x2);
+        assert!(V::length(&v) == 2, 2);
+        V::swap(&mut v, 0, 1);
+        x1 = V::pop_back(&mut v);
+        assert!(V::length(&v) == 1, 3);
+        x2 = V::pop_back(&mut v);
+        assert!(V::length(&v) == 0, 4);
+        V::destroy_empty(v);
+        (x1, x2)
+    }
+
+    #[test]
+    fun test_natives_with_different_instantiations() {
+        test_natives_with_type<u8>(1u8, 2u8);
+        test_natives_with_type<u16>(45356u16, 25345u16);
+        test_natives_with_type<u32>(45356u32, 28768867u32);
+        test_natives_with_type<u64>(1u64, 2u64);
+        test_natives_with_type<u128>(1u128, 2u128);
+        test_natives_with_type<u256>(45356u256, 253458768867u256);
+        test_natives_with_type<bool>(true, false);
+        test_natives_with_type<address>(@0x1, @0x2);
+
+        test_natives_with_type<vector<u8>>(V::empty(), V::empty());
+
+        test_natives_with_type<Droppable>(Droppable{}, Droppable{});
+        (NotDroppable {}, NotDroppable {}) = test_natives_with_type<NotDroppable>(
+            NotDroppable {},
+            NotDroppable {}
+        );
+    }
+
+    #[test]
+    fun test_insert() {
+        let v = vector[7];
+        V::insert(&mut v, 6, 0);
+        assert!(v == vector[6, 7], 0);
+
+        let v = vector[7, 9];
+        V::insert(&mut v, 8, 1);
+        assert!(v == vector[7, 8, 9], 0);
+
+        let v = vector[6, 7];
+        V::insert(&mut v, 5, 0);
+        assert!(v == vector[5, 6, 7], 0);
+
+        let v = vector[5, 6, 8];
+        V::insert(&mut v, 7, 2);
+        assert!(v == vector[5, 6, 7, 8], 0);
+    }
+
+    #[test]
+    fun insert_at_end() {
+        let v = vector[];
+        V::insert(&mut v, 6, 0);
+        assert!(v == vector[6], 0);
+
+        V::insert(&mut v, 7, 1);
+        assert!(v == vector[6, 7], 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
+    fun insert_out_of_range() {
+        let v = vector[7];
+        V::insert(&mut v, 6, 2);
+    }
+
+    #[test]
+    fun size_limit_ok() {
+        let v = V::empty();
+        let i = 0;
+        // Limit is currently 1024 * 1024
+        let max_len = 1024 * 1024;
+
+        while (i < max_len) {
+            V::push_back(&mut v, i);
+            i = i + 1;
+        };
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status = 4, location = Self)]
+    fun size_limit_fail() {
+        let v = V::empty();
+        let i = 0;
+        // Limit is currently 1024 * 1024
+        let max_len = 1024 * 1024 + 1;
+
+        while (i < max_len) {
+            V::push_back(&mut v, i);
+            i = i + 1;
+        };
+    }
+}
diff --git a/vendors/move/crates/move-symbol-pool/Cargo.toml b/vendors/move/crates/move-symbol-pool/Cargo.toml
new file mode 100644
index 000000000..9b717bc2d
--- /dev/null
+++ b/vendors/move/crates/move-symbol-pool/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "move-symbol-pool"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "A static, global string table for Move tools"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+once_cell.workspace = true
+serde.workspace = true
+phf.workspace = true
+
+[dev-dependencies]
+serde_json.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/crates/move-symbol-pool/src/lib.rs b/vendors/move/crates/move-symbol-pool/src/lib.rs
new file mode 100644
index 000000000..f2eb8de03
--- /dev/null
+++ b/vendors/move/crates/move-symbol-pool/src/lib.rs
@@ -0,0 +1,110 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! A global, uniqued cache of strings that is never purged. Inspired by
+//! [servo/string-cache].
+//!
+//! This module provides storage for strings that are meant to remain in use for
+//! the entire running duration of a program. Strings that are stored in this
+//! global, static cache are never evicted, and so the memory consumed by them
+//! can only ever grow.
+//!
+//! The strings can be accessed via the [`Symbol`] type, which acts as a pointer
+//! to the underlying string data.
+//!
+//! NOTE: If you're looking for a `#[forbid(unsafe_code)]` attribute here, you
+//! won't find one: symbol-pool (and its inspiration, servo/string-cache) uses
+//! `unsafe` Rust in order to store and dereference `Symbol` pointers to
+//! strings.
+//!
+//! [servo/string-cache]: https://github.com/servo/string-cache
+//! [`Symbol`]: crate::Symbol
+
+mod pool;
+pub mod symbol;
+
+use once_cell::sync::Lazy;
+use pool::Pool;
+use std::sync::Mutex;
+
+pub use symbol::Symbol;
+
+static_symbols!(
+    "std",
+    "vector",
+    "u8",
+    "u16",
+    "u32",
+    "u64",
+    "u128",
+    "bool",
+    "address",
+    "$spec_domain",
+    "Self",
+    "friend",
+    "dummy_field",
+    "_",
+    "init",
+    "unit_test",
+    "legacy",
+    "2024",
+    "alpha",
+    "sui",
+    "object",
+    "new",
+    "new_uid_from_hash",
+    "test_scenario",
+    "new_object",
+    "UID",
+    "sui_system",
+    "create",
+    "clock",
+    "option",
+    "Option",
+    "string",
+    "ascii",
+    "String",
+    "Clock",
+    "tx_context",
+    "TxContext",
+    "ID",
+    "SUI",
+    "authenticator_state",
+    "AuthenticatorState",
+    "id",
+    "transfer",
+    "freeze_object",
+    "share_object",
+    "event",
+    "emit",
+    "Receiving",
+    "receive",
+);
+
+/// The global, unique cache of strings.
+pub(crate) static SYMBOL_POOL: Lazy<Mutex<Pool>> = Lazy::new(|| Mutex::new(Pool::new()));
+
+#[cfg(test)]
+mod tests {
+    use crate::{Pool, Symbol, SYMBOL_POOL};
+    use std::mem::replace;
+
+    #[test]
+    fn test_serialization() {
+        // Internally, a Symbol behaves like a pointer. Naively serializing it
+        // as an address in the pool is incorrect, as it may be serialized by
+        // one process with its own pool, and deserialized by another process
+        // with a different pool.
+        let s = Symbol::from("serialize me!");
+        let serialized = serde_json::to_string(&s).unwrap();
+
+        // Artificially reset the pool for testing purposes. The address pointed
+        // to by the Symbol is now no longer valid.
+        let _ = replace(&mut SYMBOL_POOL.lock().unwrap().0, Pool::new().0);
+
+        // Below, test that deserialization still succeeds.
+        let deserialized: Symbol = serde_json::from_str(&serialized).unwrap();
+        assert_eq!(deserialized.as_str(), "serialize me!");
+    }
+}
diff --git a/vendors/move/crates/move-symbol-pool/src/pool.rs b/vendors/move/crates/move-symbol-pool/src/pool.rs
new file mode 100644
index 000000000..d0f61416b
--- /dev/null
+++ b/vendors/move/crates/move-symbol-pool/src/pool.rs
@@ -0,0 +1,131 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! A pool of uniqued string data akin to a hash set.
+//!
+//! The string pool is represented as a statically sized contiguous array of
+//! buckets. Each bucket represents space within which an entry in the pool
+//! may be allocated. An entry is an intrusively-linked list of with two data:
+//! a heap-allocated string, and the hash value of that string data.
+//!
+//! Insertion performance into the pool is comparable to a hash set, because the
+//! underlying data structure is similar: a hashing function determines which
+//! bucket in the array the string ought to be inserted into. The entries in
+//! that bucket are iterated upon. If no entries match the string, a new
+//! entry is appended to the end of the linked list of entries.
+//!
+//! * Why not use a [`HashSet`]? A set is dynamically resized as elements are
+//!   added. Ideally converting a [`Symbol`] to its string value is as
+//!   performant as dereferencing a pointer. But implementing the [`Symbol]` as
+//!   a pointer would not be safe if the data being pointed to could be
+//!   reallocated.
+//! * Why not use a [`LinkedList`]? A linked list does not unique the elements.
+//!   Ensuring the elements in the list are unique would require traversing the
+//!   list, which would not be performant for large lists.
+//! * Why not use a [`HashSet`] in conjunction with a [`LinkedList`]? This would
+//!   be simpler to implement, but would involve storing the string data twice:
+//!   once in the set for uniqueness checking, and once in the linked list to
+//!   maintain a constant memory address for the string data. This pool
+//!   implementation is more space-efficient.
+//!
+//! [`Symbol`]: crate::Symbol
+//! [`HashSet`]: std::collections::HashSet
+//! [`LinkedList`]: std::collections::LinkedList
+
+use std::{
+    borrow::Cow,
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+    ptr::NonNull,
+};
+
+/// The number of buckets in the pool's contiguous array.
+const NB_BUCKETS: usize = 1 << 12; // 4096
+/// A mask used to convert a string hash into the index of one of the contiguous buckets.
+const BUCKET_MASK: u64 = NB_BUCKETS as u64 - 1;
+
+/// A bucket is a space on the heap within which an entry may be allocated.
+type Bucket = Option<Box<Entry>>;
+
+/// A string in the pool.
+pub(crate) struct Entry {
+    pub(crate) string: Box<str>,
+    hash: u64,
+    next: Bucket,
+}
+
+/// A contiguous array of buckets.
+pub(crate) struct Pool(pub(crate) Box<[Bucket; NB_BUCKETS]>);
+
+impl Pool {
+    /// Allocates a contiguous array of buckets on the heap. As strings are
+    /// inserted into the pool, buckets in this array are filled with an entry.
+    pub(crate) fn new() -> Self {
+        let vec = std::mem::ManuallyDrop::new(vec![0_usize; NB_BUCKETS]);
+        Self(unsafe { Box::from_raw(vec.as_ptr() as *mut [Bucket; NB_BUCKETS]) })
+    }
+
+    /// Computes the hash value of a string, which is used to determine both
+    /// which top-level bucket contains an entry corresponding to the string,
+    /// as well as a scalar value that can be used to quickly check whether
+    /// two strings are not equal.
+    fn hash(string: &str) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        string.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    /// Given a string, returns its entry in the pool (adding it if it does not
+    /// yet exist in the pool).
+    pub(crate) fn insert(&mut self, string: Cow<str>) -> NonNull<Entry> {
+        let hash = Self::hash(&string);
+        // Access the top-level bucket in the pool's contiguous array that
+        // contains the linked list of entries that contain the string.
+        let bucket_index = (hash & BUCKET_MASK) as usize;
+        let mut ptr: Option<&mut Box<Entry>> = self.0[bucket_index].as_mut();
+
+        // Iterate over the entires in the bucket.
+        while let Some(entry) = ptr.take() {
+            // If we find the string we're looking for, don't add anything to
+            // the pool. Instead, just return the existing entry.
+            // NOTE: Strings with different hash values can't possibly be equal,
+            // so comparing those hash values first ought to filter out unequal
+            // strings faster than comparing the strings themselves.
+            if entry.hash == hash && *entry.string == *string {
+                return NonNull::from(&mut **entry);
+            }
+            ptr = entry.next.as_mut();
+        }
+
+        // The string doesn't exist in the pool yet; insert it at the head of
+        // the linked list of entries.
+        let mut entry = Box::new(Entry {
+            string: string.into_owned().into_boxed_str(),
+            hash,
+            next: self.0[bucket_index].take(),
+        });
+        let ptr = NonNull::from(&mut *entry);
+
+        // The bucket in the top-level contiguous array now points to the new
+        // head of the linked list.
+        self.0[bucket_index] = Some(entry);
+
+        ptr
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::borrow::Cow;
+
+    use crate::Pool;
+
+    #[test]
+    fn test_insert_identical_strings_have_the_same_entry() {
+        let mut pool = Pool::new();
+        let e1 = pool.insert(Cow::Borrowed("hi"));
+        let e2 = pool.insert(Cow::Owned("hi".to_owned()));
+        assert_eq!(e1, e2);
+    }
+}
diff --git a/vendors/move/crates/move-symbol-pool/src/symbol.rs b/vendors/move/crates/move-symbol-pool/src/symbol.rs
new file mode 100644
index 000000000..6dac58c90
--- /dev/null
+++ b/vendors/move/crates/move-symbol-pool/src/symbol.rs
@@ -0,0 +1,401 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    pool::Entry,
+    static_symbols::{STATIC_SYMBOLS, STATIC_SYMBOL_IDX},
+    SYMBOL_POOL,
+};
+use serde::{de::Deserialize, ser::Serialize};
+use std::{borrow::Cow, cmp::Ordering, fmt, num::NonZeroU64, ops::Deref};
+
+/// Represents a string that has been cached.
+///
+/// A `Symbol` represents a pointer to string data that is owned by the global
+/// symbol pool; it is not the string data itself. This enables this
+/// representation to implement `Copy` and other traits that some string types
+/// cannot.
+///
+/// The strings that `Symbol` types represent are added to the global cache as
+/// the `Symbol` are created.
+///
+/// ```
+///# use crate::move_symbol_pool::Symbol;
+/// let s1 = Symbol::from("hi"); // "hi" is stored in the global cache
+/// let s2 = Symbol::from("hi"); // "hi" is already stored, cache does not grow
+/// assert_eq!(s1, s2);
+/// ```
+///
+/// Use the method [`as_str()`] to access the string value that a `Symbol`
+/// represents. `Symbol` also implements the [`Display`] trait, so it can be
+/// printed as an ordinary string would. This makes it easier to use with
+/// crates that print strings to a terminal, such as codespan.
+///
+/// ```
+///# use crate::move_symbol_pool::Symbol;
+/// let message = format!("{} {}",
+///     Symbol::from("hello").as_str(),
+///     Symbol::from("world"));
+/// assert_eq!(message, "hello world");
+/// ```
+///
+/// [`as_str()`]: crate::Symbol::as_str
+/// [`Display`]: std::fmt::Display
+#[derive(Clone, Copy, Eq, Hash, PartialEq)]
+pub struct Symbol(NonZeroU64);
+
+/// The `Tag` signifies what sort of Symbol it is
+/// The `Tag` is stored in the lowest two bits of the Symbol's value
+/// `Tag::Dynamic`: if the `Symbol` points into the Symbol pool, the lower bits will be zero for
+///                 pointer alignment. So the tag value is 0
+/// `Tag::Inline`: if the string for the `Symbol` has less than 7 characters, those characters can
+///                be stuffed into the value of the symbol, along with the tag and the length. The
+///                tag is set to 1
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+enum Tag {
+    /// Tag for `Symbol`s that point into into the `SYMBOL_POOL`
+    Dynamic = DYNAMIC_TAG,
+    /// Tag for `Symbol's that can fit entirely in the symbol's value
+    Inlined = INLINE_TAG,
+    /// Tag for `Symbol`s that are statically allocated
+    Static = STATIC_TAG,
+}
+
+/// Tag value for a symbol put into the `SYMBOL_POOL`
+const DYNAMIC_TAG: u8 = 0b_00;
+/// Tag value for an inlined symbol.
+const INLINE_TAG: u8 = 0b_01;
+/// Tag value for a static symbol
+const STATIC_TAG: u8 = 0b_10;
+/// Mask for the tag bits
+const TAG_MASK: u64 = 0b_11;
+/// Offset for the storage of the length of the string in the inlined case
+const LEN_OFFSET: u64 = 4;
+/// Mask for the storage of the string length
+const LEN_MASK: u64 = 0xF0;
+/// Maximum length of the string if inlined into the symbol's value
+const MAX_INLINE_LEN: usize = 7;
+/// Number of bits to shift for static strings
+const STATIC_SHIFT_BITS: usize = 2;
+
+impl Symbol {
+    pub fn as_str(&self) -> &str {
+        self.as_ref()
+    }
+
+    fn tag(&self) -> Tag {
+        let tag = (self.0.get() & TAG_MASK) as u8;
+        match tag {
+            DYNAMIC_TAG => Tag::Dynamic,
+            INLINE_TAG => Tag::Inlined,
+            STATIC_TAG => Tag::Static,
+            _ => unreachable!("unknown tag for symbol"),
+        }
+    }
+
+    /// For the symbol! macro
+    #[inline(always)]
+    #[doc(hidden)]
+    pub const fn pack_static(n: u32) -> Self {
+        Self(unsafe {
+            // STATIC_TAG ensures this is non-zero
+            NonZeroU64::new_unchecked((STATIC_TAG as u64) | ((n as u64) << STATIC_SHIFT_BITS))
+        })
+    }
+}
+
+impl<'a> From<Cow<'a, str>> for Symbol {
+    fn from(s: Cow<'a, str>) -> Self {
+        let len = s.len();
+        if let Some(idx) = STATIC_SYMBOL_IDX.get(&s) {
+            Self::pack_static(*idx)
+        } else if len <= MAX_INLINE_LEN {
+            let mut data: u64 = (INLINE_TAG as u64) | ((len as u64) << LEN_OFFSET);
+            {
+                let dest = inline_symbol_slice_mut(&mut data);
+                dest[..len].copy_from_slice(s.as_bytes())
+            }
+            Symbol(NonZeroU64::new(data).expect("value of an inlined symbol cannot be null"))
+        } else {
+            let mut pool = SYMBOL_POOL.lock().expect("could not acquire lock on pool");
+            let address = pool.insert(s).as_ptr() as u64;
+            Symbol(NonZeroU64::new(address).expect("address of pooled symbol cannot be null"))
+        }
+    }
+}
+
+impl From<&str> for Symbol {
+    fn from(s: &str) -> Self {
+        Self::from(Cow::Borrowed(s))
+    }
+}
+
+impl From<String> for Symbol {
+    fn from(s: String) -> Self {
+        Self::from(Cow::Owned(s))
+    }
+}
+
+impl Deref for Symbol {
+    type Target = str;
+
+    fn deref(&self) -> &str {
+        match self.tag() {
+            Tag::Dynamic => {
+                let ptr = self.0.get() as *const Entry;
+                let entry = unsafe { &*ptr };
+                &entry.string
+            }
+            Tag::Inlined => {
+                let len = (self.0.get() & LEN_MASK) >> LEN_OFFSET;
+                let bytes = &inline_symbol_slice(&self.0)[..(len as usize)];
+                unsafe { std::str::from_utf8_unchecked(bytes) }
+            }
+            Tag::Static => {
+                let idx = self.0.get() >> STATIC_SHIFT_BITS;
+                STATIC_SYMBOLS[idx as usize]
+            }
+        }
+    }
+}
+
+impl AsRef<str> for Symbol {
+    fn as_ref(&self) -> &str {
+        self
+    }
+}
+
+impl fmt::Display for Symbol {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.as_str().fmt(f)
+    }
+}
+
+impl fmt::Debug for Symbol {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.as_str().fmt(f)
+    }
+}
+
+impl Ord for Symbol {
+    fn cmp(&self, other: &Symbol) -> Ordering {
+        if self.0 == other.0 {
+            Ordering::Equal
+        } else {
+            self.as_str().cmp(other.as_str())
+        }
+    }
+}
+
+impl PartialOrd for Symbol {
+    fn partial_cmp(&self, other: &Symbol) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Serialize for Symbol {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.as_str().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for Symbol {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Ok(Symbol::from(String::deserialize(deserializer)?))
+    }
+}
+
+#[inline(always)]
+fn inline_symbol_slice(x: &NonZeroU64) -> &[u8] {
+    unsafe {
+        let x: *const NonZeroU64 = x;
+        let mut data = x as *const u8;
+        // Lowest byte (first in little-endian, last in big-endian) is skipped as it stores the
+        // tag
+        if cfg!(target_endian = "little") {
+            data = data.offset(1);
+        }
+        let len = 7;
+        std::slice::from_raw_parts(data, len)
+    }
+}
+
+#[inline(always)]
+fn inline_symbol_slice_mut(x: &mut u64) -> &mut [u8] {
+    unsafe {
+        let x: *mut u64 = x;
+        let mut data = x as *mut u8;
+        // Lowest byte (first in little-endian, last in big-endian) is skipped as it stores the
+        // tag
+        if cfg!(target_endian = "little") {
+            data = data.offset(1);
+        }
+        let len = 7;
+        std::slice::from_raw_parts_mut(data, len)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        static_symbols::{STATIC_SYMBOLS, STATIC_SYMBOL_IDX},
+        symbol::{Tag, MAX_INLINE_LEN},
+        Symbol,
+    };
+
+    use std::mem::size_of;
+
+    #[test]
+    fn test_size() {
+        // Assert that the size of a Symbol is fairly small. Since it'll be used
+        // throughout the Move codebase, increases to this size should be
+        // scrutinized.
+        assert_eq!(size_of::<Symbol>(), size_of::<u64>());
+    }
+
+    #[test]
+    fn test_tag() {
+        let s = "bonjour le monde";
+        for n in 0..=s.len() {
+            let sym = Symbol::from(&s[..n]);
+            assert_eq!(sym.len(), n);
+            let expected_tag = if n <= MAX_INLINE_LEN {
+                Tag::Inlined
+            } else {
+                Tag::Dynamic
+            };
+            assert_eq!(sym.tag(), expected_tag)
+        }
+    }
+
+    #[test]
+    fn test_from_different_strings_have_different_addresses() {
+        let s1 = Symbol::from("hi");
+        let s2 = Symbol::from("hello");
+        assert_eq!(s1.tag(), Tag::Inlined);
+        assert_eq!(s2.tag(), Tag::Inlined);
+        assert_ne!(s1.0, s2.0);
+
+        let s1 = Symbol::from("hi");
+        let s2 = Symbol::from("bonjour le monde");
+        assert_eq!(s1.tag(), Tag::Inlined);
+        assert_eq!(s2.tag(), Tag::Dynamic);
+        assert_ne!(s1.0, s2.0);
+
+        let s1 = Symbol::from("bonjour!");
+        let s2 = Symbol::from("bonjour le monde");
+        assert_eq!(s1.tag(), Tag::Dynamic);
+        assert_eq!(s2.tag(), Tag::Dynamic);
+        assert_ne!(s1.0, s2.0);
+    }
+
+    #[test]
+    fn test_from_identical_strings_have_the_same_address() {
+        let s1 = Symbol::from("hi");
+        let s2 = Symbol::from("hi");
+        assert_eq!(s1.tag(), Tag::Inlined);
+        assert_eq!(s2.tag(), Tag::Inlined);
+        assert_eq!(s1.0, s2.0);
+
+        let s1 = Symbol::from("bonjour le monde");
+        let s2 = Symbol::from("bonjour le monde");
+        assert_eq!(s1.tag(), Tag::Dynamic);
+        assert_eq!(s2.tag(), Tag::Dynamic);
+        assert_eq!(s1.0, s2.0);
+    }
+
+    #[test]
+    fn test_all_static_strings() {
+        // check all symbols round trip correctly
+        for s in STATIC_SYMBOLS {
+            let from_s = Symbol::from(*s);
+            let idx = *STATIC_SYMBOL_IDX.get(*s).unwrap();
+            let from_idx = Symbol::pack_static(idx);
+            assert_eq!(from_s.tag(), Tag::Static);
+            assert_eq!(from_idx.tag(), Tag::Static);
+            assert_eq!(from_s.0, from_idx.0);
+            assert_eq!(from_s.0, from_idx.0);
+            assert_eq!(from_s, from_idx);
+        }
+        // check all entries in `STATIC_SYMBOL_IDX` are present in `STATIC_SYMBOLS`
+        let mut entries = STATIC_SYMBOL_IDX.entries().collect::<Vec<_>>();
+        entries.sort_by_key(|(_, idx)| *idx);
+        assert_eq!(entries.len(), STATIC_SYMBOLS.len());
+        for ((map_s, map_idx), (sym_idx, sym_s)) in
+            entries.iter().zip(STATIC_SYMBOLS.iter().enumerate())
+        {
+            let map_s = *map_s;
+            let map_idx = **map_idx as usize;
+            assert_eq!(map_idx, sym_idx);
+            assert_eq!(map_s, sym_s);
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! static_symbols_with_idx {
+    ($($str:tt => $idx:expr),* $(,)?) => {
+        pub mod static_symbols {
+            #[macro_export]
+            macro_rules! symbol {
+                $(($str) => { $crate::static_symbols::StaticSymbolConsts::<{$idx}>::SYMBOL };)*
+                ($non_static:expr) => {
+                    // TODO find a way to link to the file and line number of
+                    // static_symbols! invocation
+                    compile_error!(
+                        "Unknown static symbol. Static symbols can be added to the \
+                        list in move-symbol-pool",
+                    )
+                };
+            }
+
+            pub const STATIC_SYMBOLS: &[&str] = &[$($str,)*];
+            pub const STATIC_SYMBOL_IDX: phf::Map<&'static str, u32> = phf::phf_map! {
+                $($str => $idx,)*
+            };
+
+            pub struct StaticSymbolConsts<const N: u32>;
+            $(impl StaticSymbolConsts<{$idx}> {
+                pub const SYMBOL: $crate::symbol::Symbol = $crate::symbol::Symbol::pack_static($idx);
+            })*
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! expand_symbol_idxs {
+    ($count:expr, [$s:tt], [$(($accm:tt, $idx:expr)),* $(,)?], $callback:ident) => {
+        $callback! {
+            $s => 0,
+            $($accm => ($count - ($idx))),*
+        }
+    };
+    ($count:expr, [$s:tt, $($rest:tt),+], [$(($acc:tt, $idx:expr)),* $(,)?], $callback:ident) => {
+        expand_symbol_idxs! {
+            1 + $count,
+            [$($rest),+],
+            [($s, $count), $(($acc, $idx)),*],
+            $callback
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! static_symbols {
+    ($($str:tt),* $(,)?) => {
+        expand_symbol_idxs! {
+            0,
+            [$($str),*],
+            [],
+            static_symbols_with_idx
+        }
+    };
+}
diff --git a/vendors/move/crates/move-symbol-pool/tests/symbol.rs b/vendors/move/crates/move-symbol-pool/tests/symbol.rs
new file mode 100644
index 000000000..b0bcd7f8d
--- /dev/null
+++ b/vendors/move/crates/move-symbol-pool/tests/symbol.rs
@@ -0,0 +1,45 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_symbol_pool::Symbol;
+
+#[test]
+fn test_from() {
+    let _ = Symbol::from("this shouldn't panic");
+}
+
+#[test]
+fn test_as_str() {
+    let s = Symbol::from("a");
+    assert_eq!(s.as_str(), "a");
+}
+
+#[test]
+fn test_as_str_lifetime_is_static() {
+    let symbol = Symbol::from("1");
+    let string = symbol.as_str();
+
+    // Grow the symbol pool with nearly 100 new symbols.
+    for n in 2..100 {
+        let _symbol_n = Symbol::from(n.to_string());
+    }
+
+    // Both the symbol and its reference to string data ought to remain valid,
+    // no matter how many elements were added to the underlying pool.
+    assert_eq!(symbol.as_str(), "1");
+    assert_eq!(string, "1");
+}
+
+#[test]
+fn test_display() {
+    assert_eq!(format!("{}", Symbol::from("hola")), "hola");
+}
+
+#[test]
+fn test_ord() {
+    assert!(Symbol::from("aardvark") < Symbol::from("bear"));
+    assert!(Symbol::from("bear") <= Symbol::from("bear"));
+    assert!(Symbol::from("cat") > Symbol::from("bear"));
+    assert!(Symbol::from("dog") >= Symbol::from("cat"));
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/Cargo.toml b/vendors/move/crates/move-transactional-test-runner/Cargo.toml
new file mode 100644
index 000000000..3010ea238
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/Cargo.toml
@@ -0,0 +1,47 @@
+[package]
+name = "move-transactional-test-runner"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Transactional testing framework for Move"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+once_cell.workspace = true
+regex.workspace = true
+rayon.workspace = true
+clap.workspace = true
+tempfile.workspace = true
+async-trait.workspace = true
+tokio.workspace = true
+
+move-bytecode-source-map.workspace = true
+move-disassembler.workspace = true
+move-binary-format.workspace = true
+move-cli.workspace = true
+move-command-line-common.workspace = true
+move-core-types.workspace = true
+move-ir-compiler.workspace = true
+move-ir-types.workspace = true
+move-compiler.workspace = true
+move-stdlib.workspace = true
+move-symbol-pool.workspace = true
+move-vm-config.workspace = true
+move-vm-test-utils.workspace = true
+move-vm-types.workspace = true
+move-vm-runtime.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+difference.workspace = true
+
+[[test]]
+name = "tests"
+harness = false
+
+[features]
+failpoints = ['move-vm-runtime/failpoints']
diff --git a/vendors/move/crates/move-transactional-test-runner/src/framework.rs b/vendors/move/crates/move-transactional-test-runner/src/framework.rs
new file mode 100644
index 000000000..cdc2dabc1
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/src/framework.rs
@@ -0,0 +1,834 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::tasks::{
+    taskify, InitCommand, PrintBytecodeCommand, PublishCommand, RunCommand, SyntaxChoice,
+    TaskCommand, TaskInput,
+};
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use clap::Parser;
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_source_map::{mapping::SourceMapping, source_map::SourceMap};
+use move_command_line_common::{
+    address::ParsedAddress,
+    env::read_bool_env_var,
+    files::{MOVE_EXTENSION, MOVE_IR_EXTENSION},
+    testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT},
+    types::ParsedType,
+    values::{ParsableValue, ParsedValue},
+};
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit,
+    diagnostics::{Diagnostics, FilesSourceText, WarningFilters},
+    editions::Edition,
+    shared::{NumericalAddress, PackageConfig},
+    FullyCompiledProgram,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+};
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use move_ir_types::location::Spanned;
+use move_symbol_pool::Symbol;
+use move_vm_runtime::session::SerializedReturnValues;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt::{Debug, Write as FmtWrite},
+    future::Future,
+    io::Write,
+    path::Path,
+};
+use tempfile::NamedTempFile;
+
+pub struct CompiledState<'a> {
+    pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+    pre_compiled_ids: BTreeSet<(AccountAddress, String)>,
+    compiled_module_named_address_mapping: BTreeMap<ModuleId, Symbol>,
+    pub named_address_mapping: BTreeMap<String, NumericalAddress>,
+    default_named_address_mapping: Option<NumericalAddress>,
+    edition: Edition,
+    modules: BTreeMap<ModuleId, CompiledModule>,
+    temp_files: BTreeMap<String, NamedTempFile>,
+}
+
+impl<'a> CompiledState<'a> {
+    pub fn resolve_named_address(&self, s: &str) -> AccountAddress {
+        if let Some(addr) = self
+            .named_address_mapping
+            .get(s)
+            .or(self.default_named_address_mapping.as_ref())
+        {
+            return AccountAddress::new(addr.into_bytes());
+        }
+        panic!("Failed to resolve named address '{}'", s)
+    }
+
+    pub fn resolve_address(&self, addr: &ParsedAddress) -> AccountAddress {
+        match addr {
+            ParsedAddress::Named(named_addr) => self.resolve_named_address(named_addr.as_str()),
+            ParsedAddress::Numerical(addr) => addr.into_inner(),
+        }
+    }
+
+    pub fn resolve_args<Extra: ParsableValue>(
+        &self,
+        args: Vec<ParsedValue<Extra>>,
+    ) -> Result<Vec<Extra::ConcreteValue>> {
+        args.into_iter()
+            .map(|arg| arg.into_concrete_value(&|s| Some(self.resolve_named_address(s))))
+            .collect()
+    }
+
+    pub fn resolve_type_args(&self, type_args: Vec<ParsedType>) -> Result<Vec<TypeTag>> {
+        type_args
+            .into_iter()
+            .map(|arg| arg.into_type_tag(&|s| Some(self.resolve_named_address(s))))
+            .collect()
+    }
+}
+
+fn merge_output(left: Option<String>, right: Option<String>) -> Option<String> {
+    match (left, right) {
+        (None, right) => right,
+        (left, None) => left,
+        (Some(mut left), Some(right)) => {
+            left.push_str(&right);
+            Some(left)
+        }
+    }
+}
+
+#[async_trait]
+pub trait MoveTestAdapter<'a>: Sized + Send {
+    type ExtraPublishArgs: Send + Parser + Default;
+    type ExtraValueArgs: ParsableValue + Clone;
+    type ExtraRunArgs: Send + Parser;
+    type Subcommand: Send + Parser;
+    type ExtraInitArgs: Send + Parser;
+
+    fn compiled_state(&mut self) -> &mut CompiledState<'a>;
+    fn default_syntax(&self) -> SyntaxChoice;
+    async fn init(
+        default_syntax: SyntaxChoice,
+        option: Option<&'a FullyCompiledProgram>,
+        init_data: Option<TaskInput<(InitCommand, Self::ExtraInitArgs)>>,
+    ) -> (Self, Option<String>);
+    async fn publish_modules(
+        &mut self,
+        modules: Vec<MaybeNamedCompiledModule>,
+        gas_budget: Option<u64>,
+        extra: Self::ExtraPublishArgs,
+    ) -> Result<(Option<String>, Vec<MaybeNamedCompiledModule>)>;
+    async fn call_function(
+        &mut self,
+        module: &ModuleId,
+        function: &IdentStr,
+        type_args: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        args: Vec<<<Self as MoveTestAdapter<'a>>::ExtraValueArgs as ParsableValue>::ConcreteValue>,
+        gas_budget: Option<u64>,
+        extra: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)>;
+
+    async fn handle_subcommand(
+        &mut self,
+        subcommand: TaskInput<Self::Subcommand>,
+    ) -> Result<Option<String>>;
+
+    async fn handle_command(
+        &mut self,
+        task: TaskInput<
+            TaskCommand<
+                Self::ExtraInitArgs,
+                Self::ExtraPublishArgs,
+                Self::ExtraValueArgs,
+                Self::ExtraRunArgs,
+                Self::Subcommand,
+            >,
+        >,
+    ) -> Result<Option<String>>
+    where
+        'a: 'async_trait,
+    {
+        let TaskInput {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        } = task;
+        match command {
+            TaskCommand::Init { .. } => {
+                panic!("The 'init' command is optional. But if used, it must be the first command")
+            }
+            TaskCommand::PrintBytecode(PrintBytecodeCommand { syntax }) => {
+                let syntax = syntax.unwrap_or_else(|| self.default_syntax());
+                let (warnings_opt, output, _data, modules) = compile_any(
+                    self,
+                    "publish",
+                    syntax,
+                    name,
+                    number,
+                    start_line,
+                    command_lines_stop,
+                    stop_line,
+                    data,
+                    |_adapter, modules| async { Ok((None, modules)) },
+                )
+                .await?;
+                let output = merge_output(output, warnings_opt);
+                let output = modules.into_iter().fold(output, |output, m| {
+                    let MaybeNamedCompiledModule {
+                        module, source_map, ..
+                    } = m;
+                    let view = BinaryIndexedView::Module(&module);
+                    let source_mapping = match source_map {
+                        Some(m) => SourceMapping::new(m, view),
+                        None => SourceMapping::new_from_view(view, Spanned::unsafe_no_loc(()).loc)
+                            .expect("Unable to build dummy source mapping"),
+                    };
+                    let disassembler =
+                        Disassembler::new(source_mapping, DisassemblerOptions::new());
+                    merge_output(output, Some(disassembler.disassemble().unwrap()))
+                });
+                Ok(output)
+            }
+            TaskCommand::Publish(PublishCommand { gas_budget, syntax }, extra_args) => {
+                let syntax = syntax.unwrap_or_else(|| self.default_syntax());
+                let (warnings_opt, output, data, modules) = compile_any(
+                    self,
+                    "publish",
+                    syntax,
+                    name,
+                    number,
+                    start_line,
+                    command_lines_stop,
+                    stop_line,
+                    data,
+                    |adapter, modules| adapter.publish_modules(modules, gas_budget, extra_args),
+                )
+                .await?;
+                store_modules(self, syntax, data, modules);
+                Ok(merge_output(warnings_opt, output))
+            }
+            TaskCommand::Run(
+                RunCommand {
+                    signers,
+                    args,
+                    type_args,
+                    gas_budget,
+                    syntax,
+                    name: None,
+                },
+                extra_args,
+            ) => {
+                let syntax = syntax.unwrap_or_else(|| self.default_syntax());
+                let empty_publish_args = <Self::ExtraPublishArgs as Default>::default();
+                let (warnings_opt, output, data, modules) = compile_any(
+                    self,
+                    "publish",
+                    syntax,
+                    name,
+                    number,
+                    start_line,
+                    command_lines_stop,
+                    stop_line,
+                    data,
+                    |adapter, modules| {
+                        adapter.publish_modules(modules, gas_budget, empty_publish_args)
+                    },
+                )
+                .await?;
+                let (module_id, name) = single_entry_function(&modules).unwrap_or_else(|err| {
+                    panic!("{} on lines {}-{}", err, start_line, command_lines_stop)
+                });
+                let output = merge_output(warnings_opt, output);
+                store_modules(self, syntax, data, modules);
+                let type_args = self.compiled_state().resolve_type_args(type_args)?;
+                let args = self.compiled_state().resolve_args(args)?;
+                let (ret_output, return_values) = self
+                    .call_function(
+                        &module_id,
+                        name.as_ident_str(),
+                        type_args,
+                        signers,
+                        args,
+                        gas_budget,
+                        extra_args,
+                    )
+                    .await?;
+                let output = merge_output(ret_output, output);
+                let rendered_return_value = display_return_values(return_values);
+                Ok(merge_output(output, rendered_return_value))
+            }
+            TaskCommand::Run(
+                RunCommand {
+                    signers,
+                    args,
+                    type_args,
+                    gas_budget,
+                    syntax,
+                    name: Some((raw_addr, module_name, name)),
+                },
+                extra_args,
+            ) => {
+                assert!(
+                    syntax.is_none(),
+                    "syntax flag meaningless with function execution"
+                );
+                let addr = self.compiled_state().resolve_address(&raw_addr);
+                let module_id = ModuleId::new(addr, module_name);
+                let type_args = self.compiled_state().resolve_type_args(type_args)?;
+                let args = self.compiled_state().resolve_args(args)?;
+                let (output, return_values) = self
+                    .call_function(
+                        &module_id,
+                        name.as_ident_str(),
+                        type_args,
+                        signers,
+                        args,
+                        gas_budget,
+                        extra_args,
+                    )
+                    .await?;
+                let rendered_return_value = display_return_values(return_values);
+                Ok(merge_output(output, rendered_return_value))
+            }
+            TaskCommand::Subcommand(c) => {
+                self.handle_subcommand(TaskInput {
+                    command: c,
+                    name,
+                    number,
+                    start_line,
+                    command_lines_stop,
+                    stop_line,
+                    data,
+                })
+                .await
+            }
+        }
+    }
+}
+
+fn single_entry_function(
+    modules: &[MaybeNamedCompiledModule],
+) -> anyhow::Result<(ModuleId, Identifier)> {
+    anyhow::ensure!(modules.len() == 1, "Expected exactly one module");
+    let module = &modules[0].module;
+    let entry_funs: Vec<_> = module
+        .function_defs()
+        .iter()
+        .filter(|def| def.is_entry)
+        .collect();
+    let function = if entry_funs.len() == 1 {
+        entry_funs[0]
+    } else if module.function_defs.len() == 1 {
+        module.function_def_at(move_binary_format::file_format::FunctionDefinitionIndex::new(0))
+    } else {
+        anyhow::bail!("Expected exactly one function or one entry function");
+    };
+    let function_handle = module.function_handle_at(function.function);
+    let name = module.identifier_at(function_handle.name).to_owned();
+    Ok((module.self_id(), name))
+}
+
+fn display_return_values(return_values: SerializedReturnValues) -> Option<String> {
+    let SerializedReturnValues {
+        mutable_reference_outputs,
+        return_values,
+    } = return_values;
+    let mut output = vec![];
+    if !mutable_reference_outputs.is_empty() {
+        let values = mutable_reference_outputs
+            .iter()
+            .map(|(idx, bytes, layout)| {
+                let value =
+                    move_vm_types::values::Value::simple_deserialize(bytes, layout).unwrap();
+                (idx, value)
+            })
+            .collect::<Vec<_>>();
+        let printed = values
+            .iter()
+            .map(|(idx, v)| {
+                let mut buf = String::new();
+                move_vm_types::values::debug::print_value(&mut buf, v).unwrap();
+                format!("local#{}: {}", idx, buf)
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+        output.push(format!("mutable inputs after call: {}", printed))
+    };
+    if !return_values.is_empty() {
+        let values = return_values
+            .iter()
+            .map(|(bytes, layout)| {
+                move_vm_types::values::Value::simple_deserialize(bytes, layout).unwrap()
+            })
+            .collect::<Vec<_>>();
+        let printed = values
+            .iter()
+            .map(|v| {
+                let mut buf = String::new();
+                move_vm_types::values::debug::print_value(&mut buf, v).unwrap();
+                buf
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+        output.push(format!("return values: {}", printed))
+    };
+    if output.is_empty() {
+        None
+    } else {
+        Some(output.join("\n"))
+    }
+}
+
+impl<'a> CompiledState<'a> {
+    pub fn new(
+        named_address_mapping: BTreeMap<String, NumericalAddress>,
+        pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+        default_named_address_mapping: Option<NumericalAddress>,
+        compiler_edition: Option<Edition>,
+    ) -> Self {
+        let pre_compiled_ids = match pre_compiled_deps {
+            None => BTreeSet::new(),
+            Some(pre_compiled) => pre_compiled
+                .cfgir
+                .modules
+                .key_cloned_iter()
+                .map(|(ident, _)| {
+                    (
+                        ident.value.address.into_addr_bytes().into_inner(),
+                        ident.value.module.to_string(),
+                    )
+                })
+                .collect(),
+        };
+        let mut state = Self {
+            pre_compiled_deps,
+            pre_compiled_ids,
+            modules: BTreeMap::new(),
+            compiled_module_named_address_mapping: BTreeMap::new(),
+            named_address_mapping,
+            edition: compiler_edition.unwrap_or(Edition::LEGACY),
+            default_named_address_mapping,
+            temp_files: BTreeMap::new(),
+        };
+        if let Some(pcd) = pre_compiled_deps {
+            for unit in &pcd.compiled {
+                if let AnnotatedCompiledUnit::Module(annot_module) = unit {
+                    let (named_addr_opt, _id) = annot_module.module_id();
+                    state.add_precompiled(
+                        named_addr_opt.map(|n| n.value),
+                        annot_module.named_module.module.clone(),
+                    );
+                }
+            }
+        }
+        state
+    }
+
+    pub fn dep_modules(&self) -> impl Iterator<Item = &CompiledModule> {
+        self.modules.values()
+    }
+
+    pub fn source_files(&self) -> impl Iterator<Item = &String> {
+        self.temp_files.keys()
+    }
+
+    pub fn add_with_source_file(
+        &mut self,
+        modules: Vec<MaybeNamedCompiledModule>,
+        (path, tempfile): (String, NamedTempFile),
+    ) {
+        let prev = self.temp_files.insert(path, tempfile);
+        assert!(prev.is_none());
+        for m in modules {
+            let MaybeNamedCompiledModule {
+                named_address: named_addr_opt,
+                module,
+                ..
+            } = m;
+            let id = module.self_id();
+            self.check_not_precompiled(&id);
+            if let Some(named_addr) = named_addr_opt {
+                self.compiled_module_named_address_mapping
+                    .insert(id.clone(), named_addr);
+            }
+            self.modules.insert(id, module);
+        }
+    }
+
+    pub fn add_and_generate_interface_file(&mut self, module: CompiledModule) {
+        let id = module.self_id();
+        self.check_not_precompiled(&id);
+        let interface_file = NamedTempFile::new().unwrap();
+        let path = interface_file.path().to_str().unwrap().to_owned();
+        let (_id, interface_text) = move_compiler::interface_generator::write_module_to_string(
+            &self.compiled_module_named_address_mapping,
+            &module,
+        )
+        .unwrap();
+        interface_file
+            .reopen()
+            .unwrap()
+            .write_all(interface_text.as_bytes())
+            .unwrap();
+        let prev = self.temp_files.insert(path, interface_file);
+        assert!(prev.is_none());
+        self.modules.insert(id, module);
+    }
+
+    fn add_precompiled(&mut self, named_addr_opt: Option<Symbol>, module: CompiledModule) {
+        let id = module.self_id();
+        if let Some(named_addr) = named_addr_opt {
+            self.compiled_module_named_address_mapping
+                .insert(id.clone(), named_addr);
+        }
+        self.modules.insert(id, module);
+    }
+
+    pub fn is_precompiled_dep(&self, id: &ModuleId) -> bool {
+        let addr = *id.address();
+        let name = id.name().to_string();
+        self.pre_compiled_ids.contains(&(addr, name))
+    }
+
+    fn check_not_precompiled(&self, id: &ModuleId) {
+        assert!(
+            !self.is_precompiled_dep(id),
+            "Error publishing module: '{}'. \
+             Re-publishing modules in pre-compiled lib is not yet supported",
+            id
+        )
+    }
+}
+
+pub struct MaybeNamedCompiledModule {
+    pub named_address: Option<Symbol>,
+    pub module: CompiledModule,
+    pub source_map: Option<SourceMap>,
+}
+
+pub async fn compile_any<'state, 'adapter: 'result, 'result, F, A, R>(
+    test_adapter: &'adapter mut A,
+    command: &str,
+    syntax: SyntaxChoice,
+    _name: String,
+    _number: usize,
+    start_line: usize,
+    command_lines_stop: usize,
+    _stop_line: usize,
+    data: Option<NamedTempFile>,
+    handler: F,
+) -> Result<(
+    Option<String>,
+    Option<String>,
+    NamedTempFile,
+    Vec<MaybeNamedCompiledModule>,
+)>
+where
+    A: MoveTestAdapter<'state> + 'adapter,
+    F: FnOnce(&'adapter mut A, Vec<MaybeNamedCompiledModule>) -> R,
+    R: Future<Output = Result<(Option<String>, Vec<MaybeNamedCompiledModule>)>> + 'result,
+{
+    let data = match data {
+        Some(f) => f,
+        None => panic!(
+            "Expected a module text block following '{command}' starting on lines {}-{}",
+            start_line, command_lines_stop
+        ),
+    };
+    let state = test_adapter.compiled_state();
+    let (modules, warnings_opt) = match syntax {
+        SyntaxChoice::Source => {
+            let (units, warnings_opt) = compile_source_units(state, data.path())?;
+            let modules = units
+                .into_iter()
+                .map(|unit| match unit {
+                    AnnotatedCompiledUnit::Module(annot_module) => {
+                        let (named_addr_opt, _id) = annot_module.module_id();
+                        let named_addr_opt = named_addr_opt.map(|n| n.value);
+                        let module = annot_module.named_module.module;
+                        let source_map = Some(annot_module.named_module.source_map);
+                        MaybeNamedCompiledModule {
+                            named_address: named_addr_opt,
+                            module,
+                            source_map,
+                        }
+                    }
+                    AnnotatedCompiledUnit::Script(_) => panic!(
+                        "Expected a module text block, not a script, \
+                        following '{command}' starting on lines {}-{}",
+                        start_line, command_lines_stop
+                    ),
+                })
+                .collect();
+            (modules, warnings_opt)
+        }
+        SyntaxChoice::IR => {
+            let module = compile_ir_module(state, data.path())?;
+            (
+                vec![MaybeNamedCompiledModule {
+                    named_address: None,
+                    module,
+                    source_map: None,
+                }],
+                None,
+            )
+        }
+    };
+    let (output, modules) = handler(test_adapter, modules).await?;
+    Ok((warnings_opt, output, data, modules))
+}
+
+pub fn store_modules<'a, A: MoveTestAdapter<'a>>(
+    test_adapter: &mut A,
+    syntax: SyntaxChoice,
+    data: NamedTempFile,
+    mut modules: Vec<MaybeNamedCompiledModule>,
+) {
+    match syntax {
+        SyntaxChoice::Source => {
+            let path = data.path().to_str().unwrap().to_owned();
+            test_adapter
+                .compiled_state()
+                .add_with_source_file(modules, (path, data))
+        }
+        SyntaxChoice::IR => {
+            let module = modules.pop().unwrap().module;
+            test_adapter
+                .compiled_state()
+                .add_and_generate_interface_file(module);
+        }
+    }
+}
+
+pub fn compile_source_units(
+    state: &CompiledState,
+    file_name: impl AsRef<Path>,
+) -> Result<(Vec<AnnotatedCompiledUnit>, Option<String>)> {
+    fn rendered_diags(files: &FilesSourceText, diags: Diagnostics) -> Option<String> {
+        if diags.is_empty() {
+            return None;
+        }
+
+        let error_buffer = if read_bool_env_var(move_command_line_common::testing::PRETTY) {
+            move_compiler::diagnostics::report_diagnostics_to_color_buffer(files, diags)
+        } else {
+            move_compiler::diagnostics::report_diagnostics_to_buffer(files, diags)
+        };
+        Some(String::from_utf8(error_buffer).unwrap())
+    }
+
+    use move_compiler::PASS_COMPILATION;
+    let named_address_mapping = state.named_address_mapping.clone();
+    // txn testing framework test code includes private unused functions and unused struct types on
+    // purpose and generating warnings for all of them does not make much sense (and there would be
+    // a lot of them!) so let's suppress them function warnings, so let's suppress these
+    let warning_filter = WarningFilters::unused_warnings_filter_for_test();
+    let (mut files, comments_and_compiler_res) = move_compiler::Compiler::from_files(
+        vec![file_name.as_ref().to_str().unwrap().to_owned()],
+        state.source_files().cloned().collect::<Vec<_>>(),
+        named_address_mapping,
+    )
+    .set_pre_compiled_lib_opt(state.pre_compiled_deps)
+    .set_flags(move_compiler::Flags::empty().set_sources_shadow_deps(true))
+    .set_warning_filter(Some(warning_filter))
+    .set_default_config(PackageConfig {
+        edition: state.edition,
+        ..PackageConfig::default()
+    })
+    .run::<PASS_COMPILATION>()?;
+    let units_or_diags = comments_and_compiler_res
+        .map(|(_comments, move_compiler)| move_compiler.into_compiled_units());
+
+    match units_or_diags {
+        Err(diags) => {
+            if let Some(pcd) = state.pre_compiled_deps {
+                for (file_name, text) in &pcd.files {
+                    // TODO This is bad. Rethink this when errors are redone
+                    if !files.contains_key(file_name) {
+                        files.insert(*file_name, text.clone());
+                    }
+                }
+            }
+
+            Err(anyhow!(rendered_diags(&files, diags).unwrap()))
+        }
+        Ok((units, warnings)) => Ok((units, rendered_diags(&files, warnings))),
+    }
+}
+
+pub fn compile_ir_module(
+    state: &CompiledState,
+    file_name: impl AsRef<Path>,
+) -> Result<CompiledModule> {
+    use move_ir_compiler::Compiler as IRCompiler;
+    let code = std::fs::read_to_string(file_name).unwrap();
+    IRCompiler::new(state.dep_modules().collect()).into_compiled_module(&code)
+}
+
+pub fn compile_ir_script(
+    state: &CompiledState,
+    file_name: impl AsRef<Path>,
+) -> Result<CompiledScript> {
+    use move_ir_compiler::Compiler as IRCompiler;
+    let code = std::fs::read_to_string(file_name).unwrap();
+    let (script, _) = IRCompiler::new(state.dep_modules().collect())
+        .into_compiled_script_and_source_map(&code)?;
+    Ok(script)
+}
+
+pub async fn handle_actual_output<'a, Adapter>(
+    path: &Path,
+    fully_compiled_program_opt: Option<&'a FullyCompiledProgram>,
+) -> Result<(String, Adapter), Box<dyn std::error::Error>>
+where
+    Adapter: MoveTestAdapter<'a>,
+    Adapter::ExtraInitArgs: Debug,
+    Adapter::ExtraPublishArgs: Debug,
+    Adapter::ExtraValueArgs: Debug,
+    Adapter::ExtraRunArgs: Debug,
+    Adapter::Subcommand: Debug,
+{
+    let extension = path.extension().unwrap().to_str().unwrap();
+    let default_syntax = if extension == MOVE_IR_EXTENSION {
+        SyntaxChoice::IR
+    } else {
+        assert!(extension == MOVE_EXTENSION);
+        SyntaxChoice::Source
+    };
+    let mut output = String::new();
+    let mut tasks = taskify::<
+        TaskCommand<
+            Adapter::ExtraInitArgs,
+            Adapter::ExtraPublishArgs,
+            Adapter::ExtraValueArgs,
+            Adapter::ExtraRunArgs,
+            Adapter::Subcommand,
+        >,
+    >(path)?
+    .into_iter()
+    .collect::<VecDeque<_>>();
+    assert!(!tasks.is_empty());
+    let num_tasks = tasks.len();
+    writeln!(
+        &mut output,
+        "processed {} task{}",
+        num_tasks,
+        if num_tasks > 1 { "s" } else { "" }
+    )
+    .unwrap();
+
+    let first_task = tasks.pop_front().unwrap();
+    let init_opt = match &first_task.command {
+        TaskCommand::Init(_, _) => Some(first_task.map(|known| match known {
+            TaskCommand::Init(command, extra_args) => (command, extra_args),
+            _ => unreachable!(),
+        })),
+        _ => {
+            tasks.push_front(first_task);
+            None
+        }
+    };
+    let (mut adapter, result_opt) =
+        Adapter::init(default_syntax, fully_compiled_program_opt, init_opt).await;
+    if let Some(result) = result_opt {
+        writeln!(output, "\ninit:\n{}", result)?;
+    }
+    for task in tasks {
+        handle_known_task(&mut output, &mut adapter, task).await;
+    }
+    Ok((output, adapter))
+}
+
+pub async fn run_test_impl<'a, Adapter>(
+    path: &Path,
+    fully_compiled_program_opt: Option<&'a FullyCompiledProgram>,
+) -> Result<(), Box<dyn std::error::Error>>
+where
+    Adapter: MoveTestAdapter<'a>,
+    Adapter::ExtraInitArgs: Debug,
+    Adapter::ExtraPublishArgs: Debug,
+    Adapter::ExtraValueArgs: Debug,
+    Adapter::ExtraRunArgs: Debug,
+    Adapter::Subcommand: Debug,
+{
+    let output = handle_actual_output::<Adapter>(path, fully_compiled_program_opt).await?;
+    handle_expected_output(path, output.0)?;
+    Ok(())
+}
+
+async fn handle_known_task<'a, Adapter: MoveTestAdapter<'a>>(
+    output: &mut String,
+    adapter: &mut Adapter,
+    task: TaskInput<
+        TaskCommand<
+            Adapter::ExtraInitArgs,
+            Adapter::ExtraPublishArgs,
+            Adapter::ExtraValueArgs,
+            Adapter::ExtraRunArgs,
+            Adapter::Subcommand,
+        >,
+    >,
+) {
+    let task_number = task.number;
+    let task_name = task.name.to_owned();
+    let start_line = task.start_line;
+    let stop_line = task.stop_line;
+    let result = adapter.handle_command(task).await;
+    let result_string = match result {
+        Ok(None) => return,
+        Ok(Some(s)) => s,
+        Err(e) => format!("Error: {}", e),
+    };
+    assert!(!result_string.is_empty());
+
+    writeln!(
+        output,
+        "\ntask {} '{}'. lines {}-{}:\n{}",
+        task_number, task_name, start_line, stop_line, result_string
+    )
+    .unwrap();
+}
+
+fn handle_expected_output(test_path: &Path, output: impl AsRef<str>) -> Result<()> {
+    let output = output.as_ref();
+    assert!(!output.is_empty());
+    let exp_path = test_path.with_extension(EXP_EXT);
+
+    if read_env_update_baseline() {
+        std::fs::write(exp_path, output).unwrap();
+        return Ok(());
+    }
+
+    if !exp_path.exists() {
+        std::fs::write(&exp_path, "").unwrap();
+    }
+    let expected_output = std::fs::read_to_string(&exp_path)
+        .unwrap()
+        .replace("\r\n", "\n")
+        .replace('\r', "\n");
+    if output != expected_output {
+        let msg = format!(
+            "Expected errors differ from actual errors:\n{}",
+            format_diff(expected_output, output),
+        );
+        anyhow::bail!(add_update_baseline_fix(msg))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/src/lib.rs b/vendors/move/crates/move-transactional-test-runner/src/lib.rs
new file mode 100644
index 000000000..8be1f95d5
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod framework;
+pub mod tasks;
+pub mod vm_test_harness;
diff --git a/vendors/move/crates/move-transactional-test-runner/src/tasks.rs b/vendors/move/crates/move-transactional-test-runner/src/tasks.rs
new file mode 100644
index 000000000..dcedbd51a
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/src/tasks.rs
@@ -0,0 +1,381 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use anyhow::{anyhow, bail, Result};
+use clap::*;
+use move_command_line_common::{
+    address::ParsedAddress,
+    files::{MOVE_EXTENSION, MOVE_IR_EXTENSION},
+    types::ParsedType,
+    values::{ParsableValue, ParsedValue},
+};
+use move_compiler::shared::NumericalAddress;
+use move_core_types::identifier::Identifier;
+use std::{convert::TryInto, fmt::Debug, path::Path, str::FromStr};
+use tempfile::NamedTempFile;
+
+#[derive(Debug)]
+pub struct TaskInput<Command> {
+    pub command: Command,
+    pub name: String,
+    pub number: usize,
+    pub start_line: usize,
+    pub command_lines_stop: usize,
+    pub stop_line: usize,
+    pub data: Option<NamedTempFile>,
+}
+
+pub fn taskify<Command: Debug + Parser>(filename: &Path) -> Result<Vec<TaskInput<Command>>> {
+    use regex::Regex;
+    use std::{
+        fs::File,
+        io::{self, BufRead, Write},
+    };
+    // checks for lines that are entirely whitespace
+    let re_whitespace = Regex::new(r"^\s*$").unwrap();
+    // checks for lines that start with // comments
+    // here the next character is whitespace or an ASCII character other than #
+    let re_comment = Regex::new(r"^\s*//(\s|[\x20-\x22]|[[\x24-\x7E]])").unwrap();
+    // checks for lines that start with //# commands
+    // cutting leading/trailing whitespace
+    // capturing the command text
+    let re_command_text = Regex::new(r"^\s*//#\s*(.*)\s*$").unwrap();
+
+    let file = File::open(filename).unwrap();
+    let lines: Vec<String> = io::BufReader::new(file)
+        .lines()
+        .map(|ln| ln.expect("Could not parse line"))
+        .collect();
+
+    let lines_iter = lines.into_iter().enumerate().map(|(idx, l)| (idx + 1, l));
+    let skipped_whitespace = lines_iter.skip_while(|(_line_number, line)| {
+        re_whitespace.is_match(line) || re_comment.is_match(line)
+    });
+    let mut bucketed_lines = vec![];
+    let mut cur_commands = vec![];
+    let mut cur_text = vec![];
+    let mut in_command = true;
+    for (line_number, line) in skipped_whitespace {
+        if let Some(captures) = re_command_text.captures(&line) {
+            if !in_command {
+                bucketed_lines.push((cur_commands, cur_text));
+                cur_commands = vec![];
+                cur_text = vec![];
+                in_command = true;
+            }
+            let command_text = match captures.len() {
+                1 => continue,
+                2 => captures.get(1).unwrap().as_str().to_string(),
+                n => panic!("COMMAND_TEXT captured {}. expected 1 or 2", n),
+            };
+            if command_text.is_empty() {
+                continue;
+            }
+            cur_commands.push((line_number, command_text))
+        } else if re_whitespace.is_match(&line) {
+            in_command = false;
+            continue;
+        } else {
+            in_command = false;
+            cur_text.push((line_number, line))
+        }
+    }
+    bucketed_lines.push((cur_commands, cur_text));
+
+    if bucketed_lines.is_empty() {
+        return Ok(vec![]);
+    }
+
+    let mut tasks = vec![];
+    for (number, (commands, text)) in bucketed_lines.into_iter().enumerate() {
+        if commands.is_empty() {
+            assert!(number == 0);
+            bail!("No initial command")
+        }
+
+        let start_line = commands.first().unwrap().0;
+        let command_lines_stop = commands.last().unwrap().0;
+        let mut command_text = "task ".to_string();
+        for (line_number, text) in commands {
+            assert!(!text.is_empty(), "{}: {}", line_number, text);
+            command_text = format!("{} {}", command_text, text);
+        }
+        let command_split = command_text.split_ascii_whitespace().collect::<Vec<_>>();
+        let name_opt = command_split.get(1).map(|s| (*s).to_owned());
+        let command = match Command::try_parse_from(command_split) {
+            Ok(command) => command,
+            Err(e) => {
+                let mut spit_iter = command_text.split_ascii_whitespace();
+                // skip 'task'
+                spit_iter.next();
+                let help_command = match spit_iter.next() {
+                    None => vec!["task", "--help"],
+                    Some(c) => vec!["task", c, "--help"],
+                };
+                let help = match Command::try_parse_from(help_command) {
+                    Ok(_) => panic!(),
+                    Err(e) => e,
+                };
+                bail!(
+                    "Invalid command. Got error {}\nLines {} - {}.\n{}",
+                    e,
+                    start_line,
+                    command_lines_stop,
+                    help
+                )
+            }
+        };
+        let name = name_opt.unwrap();
+
+        let stop_line = if text.is_empty() {
+            command_lines_stop
+        } else {
+            text[text.len() - 1].0
+        };
+
+        // Keep fucking this up somehow
+        // let last_non_whitespace = text
+        //     .iter()
+        //     .rposition(|(_, l)| !WHITESPACE.is_match(l))
+        //     .unwrap_or(0);
+        // let initial_text = text
+        //     .into_iter()
+        //     .take_while(|(i, _)| *i < last_non_whitespace)
+        //     .map(|(_, l)| l);
+        let file_text_vec = (0..command_lines_stop)
+            .map(|_| String::new())
+            .chain(text.into_iter().map(|(_ln, l)| l))
+            .collect::<Vec<String>>();
+        let data = if file_text_vec.iter().all(|s| re_whitespace.is_match(s)) {
+            None
+        } else {
+            let data = NamedTempFile::new()?;
+            data.reopen()?
+                .write_all(file_text_vec.join("\n").as_bytes())?;
+            Some(data)
+        };
+
+        tasks.push(TaskInput {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        })
+    }
+    Ok(tasks)
+}
+
+impl<T> TaskInput<T> {
+    pub fn map<U>(self, f: impl FnOnce(T) -> U) -> TaskInput<U> {
+        let Self {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        } = self;
+        TaskInput {
+            command: f(command),
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SyntaxChoice {
+    Source,
+    IR,
+}
+
+/// Translates the given Move IR module into bytecode, then prints a textual
+/// representation of that bytecode.
+#[derive(Debug, Parser)]
+pub struct PrintBytecodeCommand {
+    #[clap(long = "syntax")]
+    pub syntax: Option<SyntaxChoice>,
+}
+
+#[derive(Debug, Parser)]
+pub struct InitCommand {
+    #[clap(
+        long = "addresses",
+        value_parser = move_compiler::shared::parse_named_address,
+        num_args(1..),
+    )]
+    pub named_addresses: Vec<(String, NumericalAddress)>,
+}
+
+#[derive(Debug, Parser)]
+pub struct PublishCommand {
+    #[clap(long = "gas-budget")]
+    pub gas_budget: Option<u64>,
+    #[clap(long = "syntax")]
+    pub syntax: Option<SyntaxChoice>,
+}
+
+#[derive(Debug, Parser)]
+pub struct RunCommand<ExtraValueArgs: ParsableValue> {
+    #[clap(
+        long = "signers",
+        value_parser = ParsedAddress::parse,
+        num_args(1..),
+    )]
+    pub signers: Vec<ParsedAddress>,
+    #[clap(
+        long = "args",
+        value_parser = ParsedValue::<ExtraValueArgs>::parse,
+        num_args(1..),
+    )]
+    pub args: Vec<ParsedValue<ExtraValueArgs>>,
+    #[clap(
+        long = "type-args",
+        value_parser = ParsedType::parse,
+        num_args(1..),
+    )]
+    pub type_args: Vec<ParsedType>,
+    #[clap(long = "gas-budget")]
+    pub gas_budget: Option<u64>,
+    #[clap(long = "syntax")]
+    pub syntax: Option<SyntaxChoice>,
+    #[clap(name = "NAME", value_parser = parse_qualified_module_access)]
+    pub name: Option<(ParsedAddress, Identifier, Identifier)>,
+}
+
+#[derive(Debug)]
+pub enum TaskCommand<
+    ExtraInitArgs: Parser,
+    ExtraPublishArgs: Parser,
+    ExtraValueArgs: ParsableValue,
+    ExtraRunArgs: Parser,
+    SubCommands: Parser,
+> {
+    Init(InitCommand, ExtraInitArgs),
+    PrintBytecode(PrintBytecodeCommand),
+    Publish(PublishCommand, ExtraPublishArgs),
+    Run(RunCommand<ExtraValueArgs>, ExtraRunArgs),
+    Subcommand(SubCommands),
+}
+
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > FromArgMatches
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+    fn from_arg_matches(matches: &ArgMatches) -> Result<Self, Error> {
+        Ok(match matches.subcommand() {
+            Some(("init", matches)) => TaskCommand::Init(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            Some(("print-bytecode", matches)) => {
+                TaskCommand::PrintBytecode(FromArgMatches::from_arg_matches(matches)?)
+            }
+            Some(("publish", matches)) => TaskCommand::Publish(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            Some(("run", matches)) => TaskCommand::Run(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            _ => TaskCommand::Subcommand(SubCommands::from_arg_matches(matches)?),
+        })
+    }
+
+    fn update_from_arg_matches(&mut self, matches: &ArgMatches) -> Result<(), Error> {
+        *self = Self::from_arg_matches(matches)?;
+        Ok(())
+    }
+}
+
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > CommandFactory
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+    fn command() -> Command {
+        SubCommands::command()
+            .name("Task Command")
+            .subcommand(InitCommand::augment_args(ExtraInitArgs::command()).name("init"))
+            .subcommand(PrintBytecodeCommand::command().name("print-bytecode"))
+            .subcommand(PublishCommand::augment_args(ExtraPublishArgs::command()).name("publish"))
+            .subcommand(
+                RunCommand::<ExtraValueArgs>::augment_args(ExtraRunArgs::command()).name("run"),
+            )
+    }
+
+    fn command_for_update() -> Command {
+        todo!()
+    }
+}
+// Note: this needs to be manually implemented because clap cannot handle generic tuples
+// with more than 1 element currently.
+//
+// The code is a simplified version of what `#[derive(Parser)` would generate had it worked.
+// (`cargo expand` is useful in printing out the derived code.)
+//
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > Parser
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+}
+
+#[derive(Debug, Parser, Default)]
+pub struct EmptyCommand;
+
+fn parse_qualified_module_access(s: &str) -> Result<(ParsedAddress, Identifier, Identifier)> {
+    let [addr_str, module_str, struct_str]: [&str; 3] =
+        s.split("::").collect::<Vec<_>>().try_into().map_err(|e| {
+            anyhow!(
+                "Invalid module access. \
+                 Expected 3 distinct parts, address, module, and struct. Got error {:?}",
+                e
+            )
+        })?;
+    let addr = ParsedAddress::parse(addr_str)?;
+    let module = Identifier::new(module_str)?;
+    let struct_ = Identifier::new(struct_str)?;
+    Ok((addr, module, struct_))
+}
+
+impl FromStr for SyntaxChoice {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            MOVE_EXTENSION => Ok(SyntaxChoice::Source),
+            MOVE_IR_EXTENSION => Ok(SyntaxChoice::IR),
+            _ => Err(anyhow!(
+                "Invalid syntax choice. Expected '{}' or '{}'",
+                MOVE_EXTENSION,
+                MOVE_IR_EXTENSION
+            )),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/src/vm_test_harness.rs b/vendors/move/crates/move-transactional-test-runner/src/vm_test_harness.rs
new file mode 100644
index 000000000..3e89d4f01
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/src/vm_test_harness.rs
@@ -0,0 +1,351 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, path::Path};
+
+use crate::{
+    framework::{run_test_impl, CompiledState, MaybeNamedCompiledModule, MoveTestAdapter},
+    tasks::{EmptyCommand, InitCommand, SyntaxChoice, TaskInput},
+};
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use clap::Parser;
+use move_binary_format::{
+    errors::{Location, VMError, VMResult},
+    CompiledModule,
+};
+use move_command_line_common::{
+    address::ParsedAddress, files::verify_and_create_named_address_mapping,
+};
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit, editions::Edition, shared::PackagePaths,
+    FullyCompiledProgram,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::IdentStr,
+    language_storage::{ModuleId, TypeTag},
+    runtime_value::MoveValue,
+};
+use move_stdlib::move_stdlib_named_addresses;
+use move_symbol_pool::Symbol;
+use move_vm_config::runtime::VMConfig;
+use move_vm_runtime::{
+    move_vm::MoveVM,
+    session::{SerializedReturnValues, Session},
+};
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use once_cell::sync::Lazy;
+
+const STD_ADDR: AccountAddress = AccountAddress::ONE;
+
+struct SimpleVMTestAdapter<'a> {
+    compiled_state: CompiledState<'a>,
+    storage: InMemoryStorage,
+    default_syntax: SyntaxChoice,
+}
+
+#[derive(Debug, Parser)]
+pub struct AdapterInitArgs {
+    #[clap(long = "edition")]
+    pub edition: Option<Edition>,
+}
+
+#[async_trait]
+impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
+    type ExtraInitArgs = AdapterInitArgs;
+    type ExtraPublishArgs = EmptyCommand;
+    type ExtraValueArgs = ();
+    type ExtraRunArgs = EmptyCommand;
+    type Subcommand = EmptyCommand;
+
+    fn compiled_state(&mut self) -> &mut CompiledState<'a> {
+        &mut self.compiled_state
+    }
+
+    fn default_syntax(&self) -> SyntaxChoice {
+        self.default_syntax
+    }
+
+    async fn init(
+        default_syntax: SyntaxChoice,
+        pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+        task_opt: Option<TaskInput<(InitCommand, Self::ExtraInitArgs)>>,
+    ) -> (Self, Option<String>) {
+        let (additional_mapping, compiler_edition) = match task_opt.map(|t| t.command) {
+            Some((InitCommand { named_addresses }, AdapterInitArgs { edition })) => {
+                let addresses = verify_and_create_named_address_mapping(named_addresses).unwrap();
+                let compiler_edition = edition.unwrap_or(Edition::LEGACY);
+                (addresses, compiler_edition)
+            }
+            None => (BTreeMap::new(), Edition::LEGACY),
+        };
+
+        let mut named_address_mapping = move_stdlib_named_addresses();
+        for (name, addr) in additional_mapping {
+            if named_address_mapping.contains_key(&name) {
+                panic!(
+                    "Invalid init. The named address '{}' is reserved by the move-stdlib",
+                    name
+                )
+            }
+            named_address_mapping.insert(name, addr);
+        }
+        let mut adapter = Self {
+            compiled_state: CompiledState::new(
+                named_address_mapping,
+                pre_compiled_deps,
+                None,
+                Some(compiler_edition),
+            ),
+            default_syntax,
+            storage: InMemoryStorage::new(),
+        };
+
+        adapter
+            .perform_session_action(
+                None,
+                |session, gas_status| {
+                    for module in &*MOVE_STDLIB_COMPILED {
+                        let mut module_bytes = vec![];
+                        module.serialize(&mut module_bytes).unwrap();
+
+                        let id = module.self_id();
+                        let sender = *id.address();
+                        session
+                            .publish_module(module_bytes, sender, gas_status)
+                            .unwrap();
+                    }
+                    Ok(())
+                },
+                VMConfig::default(),
+            )
+            .unwrap();
+        let mut addr_to_name_mapping = BTreeMap::new();
+        for (name, addr) in move_stdlib_named_addresses() {
+            let prev = addr_to_name_mapping.insert(addr, Symbol::from(name));
+            assert!(prev.is_none());
+        }
+        for module in MOVE_STDLIB_COMPILED
+            .iter()
+            .filter(|module| !adapter.compiled_state.is_precompiled_dep(&module.self_id()))
+            .collect::<Vec<_>>()
+        {
+            adapter
+                .compiled_state
+                .add_and_generate_interface_file(module.clone());
+        }
+        (adapter, None)
+    }
+
+    async fn publish_modules(
+        &mut self,
+        modules: Vec<MaybeNamedCompiledModule>,
+        gas_budget: Option<u64>,
+        _extra_args: Self::ExtraPublishArgs,
+    ) -> Result<(Option<String>, Vec<MaybeNamedCompiledModule>)> {
+        let all_bytes = modules
+            .iter()
+            .map(|m| {
+                let mut module_bytes = vec![];
+                m.module.serialize(&mut module_bytes)?;
+                Ok(module_bytes)
+            })
+            .collect::<Result<_>>()?;
+
+        let id = modules.first().unwrap().module.self_id();
+        let sender = *id.address();
+        match self.perform_session_action(
+            gas_budget,
+            |session, gas_status| session.publish_module_bundle(all_bytes, sender, gas_status),
+            VMConfig::default(),
+        ) {
+            Ok(()) => Ok((None, modules)),
+            Err(e) => Err(anyhow!(
+                "Unable to publish module '{}'. Got VMError: {}",
+                id,
+                format_vm_error(&e)
+            )),
+        }
+    }
+
+    async fn call_function(
+        &mut self,
+        module: &ModuleId,
+        function: &IdentStr,
+        type_arg_tags: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        txn_args: Vec<MoveValue>,
+        gas_budget: Option<u64>,
+        _extra_args: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)> {
+        let signers: Vec<_> = signers
+            .into_iter()
+            .map(|addr| self.compiled_state().resolve_address(&addr))
+            .collect();
+
+        let args = txn_args
+            .iter()
+            .map(|arg| arg.simple_serialize().unwrap())
+            .collect::<Vec<_>>();
+        // TODO rethink testing signer args
+        let args = signers
+            .iter()
+            .map(|a| MoveValue::Signer(*a).simple_serialize().unwrap())
+            .chain(args)
+            .collect();
+        let serialized_return_values = self
+            .perform_session_action(
+                gas_budget,
+                |session, gas_status| {
+                    let type_args: Vec<_> = type_arg_tags
+                        .into_iter()
+                        .map(|tag| session.load_type(&tag))
+                        .collect::<VMResult<_>>()?;
+
+                    session.execute_function_bypass_visibility(
+                        module, function, type_args, args, gas_status,
+                    )
+                },
+                test_vm_config(),
+            )
+            .map_err(|e| {
+                anyhow!(
+                    "Function execution failed with VMError: {}",
+                    format_vm_error(&e)
+                )
+            })?;
+        Ok((None, serialized_return_values))
+    }
+
+    #[allow(clippy::diverging_sub_expression)]
+    async fn handle_subcommand(
+        &mut self,
+        _: TaskInput<Self::Subcommand>,
+    ) -> Result<Option<String>> {
+        unimplemented!()
+    }
+}
+
+pub fn format_vm_error(e: &VMError) -> String {
+    let location_string = match e.location() {
+        Location::Undefined => "undefined".to_owned(),
+        Location::Script => "script".to_owned(),
+        Location::Module(id) => format!("0x{}::{}", id.address().short_str_lossless(), id.name()),
+    };
+    format!(
+        "{{
+    major_status: {major_status:?},
+    sub_status: {sub_status:?},
+    location: {location_string},
+    indices: {indices:?},
+    offsets: {offsets:?},
+}}",
+        major_status = e.major_status(),
+        sub_status = e.sub_status(),
+        location_string = location_string,
+        // TODO maybe include source map info?
+        indices = e.indices(),
+        offsets = e.offsets(),
+    )
+}
+
+impl<'a> SimpleVMTestAdapter<'a> {
+    fn perform_session_action<Ret>(
+        &mut self,
+        gas_budget: Option<u64>,
+        f: impl FnOnce(&mut Session<&InMemoryStorage>, &mut GasStatus) -> VMResult<Ret>,
+        vm_config: VMConfig,
+    ) -> VMResult<Ret> {
+        // start session
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                STD_ADDR,
+                // TODO: come up with a suitable gas schedule
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            vm_config,
+        )
+        .unwrap();
+        let (mut session, mut gas_status) = {
+            let gas_status = move_cli::sandbox::utils::get_gas_status(
+                &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE,
+                gas_budget,
+            )
+            .unwrap();
+            let session = vm.new_session(&self.storage);
+            (session, gas_status)
+        };
+
+        // perform op
+        let res = f(&mut session, &mut gas_status)?;
+
+        // save changeset
+        // TODO support events
+        let (changeset, _events) = session.finish().0?;
+        self.storage.apply(changeset).unwrap();
+        Ok(res)
+    }
+}
+
+static PRECOMPILED_MOVE_STDLIB: Lazy<FullyCompiledProgram> = Lazy::new(|| {
+    let program_res = move_compiler::construct_pre_compiled_lib(
+        vec![PackagePaths {
+            name: None,
+            paths: move_stdlib::move_stdlib_files(),
+            named_address_map: move_stdlib::move_stdlib_named_addresses(),
+        }],
+        None,
+        move_compiler::Flags::empty(),
+    )
+    .unwrap();
+    match program_res {
+        Ok(stdlib) => stdlib,
+        Err((files, errors)) => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, errors)
+        }
+    }
+});
+
+static MOVE_STDLIB_COMPILED: Lazy<Vec<CompiledModule>> = Lazy::new(|| {
+    let (files, units_res) = move_compiler::Compiler::from_files(
+        move_stdlib::move_stdlib_files(),
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build()
+    .unwrap();
+    match units_res {
+        Err(diags) => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, diags)
+        }
+        Ok((_, warnings)) if !warnings.is_empty() => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, warnings)
+        }
+        Ok((units, _warnings)) => units
+            .into_iter()
+            .filter_map(|m| match m {
+                AnnotatedCompiledUnit::Module(annot_module) => {
+                    Some(annot_module.named_module.module)
+                }
+                AnnotatedCompiledUnit::Script(_) => None,
+            })
+            .collect(),
+    }
+});
+
+fn test_vm_config() -> VMConfig {
+    VMConfig {
+        enable_invariant_violation_check_in_swap_loc: false,
+        ..Default::default()
+    }
+}
+
+#[tokio::main]
+pub async fn run_test(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
+    run_test_impl::<SimpleVMTestAdapter>(path, Some(&*PRECOMPILED_MOVE_STDLIB)).await
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/tests.rs b/vendors/move/crates/move-transactional-test-runner/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.exp
new file mode 100644
index 000000000..6902197c9
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.exp
@@ -0,0 +1,16 @@
+processed 8 tasks
+
+task 3 'run'. lines 29-29:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::N,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
+
+task 6 'run'. lines 53-53:
+return values: { 42 }
+
+task 7 'run'. lines 55-55:
+return values: 42
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.move
new file mode 100644
index 000000000..814a83e52
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/example.move
@@ -0,0 +1,55 @@
+//# init --addresses A=0x42
+
+//# run
+
+module 0x1::m {
+    fun main() {}
+}
+
+//# publish
+module A::N {
+    struct R<V: store> has key {
+        v: V
+    }
+
+    public fun make(v: u64): R<u64> {
+        R { v }
+    }
+
+    public fun take(r: R<u64>): u64 {
+        let R { v } = r;
+        v
+    }
+
+    public entry fun ex(_s: signer, _u: u64) {
+        abort 0
+    }
+}
+
+//# run --signers 0x1 --args 0 -- 0x42::N::ex
+
+//# run --args 0
+
+module 0x2::m {
+    entry fun main(v: u64) {
+        helper(v)
+    }
+    fun helper(v: u64) {
+        A::N::take(A::N::make(v));
+    }
+}
+
+//# run --args 42 --syntax=mvir
+
+module 0x3.m {
+import 0x42.N;
+entry foo(v: u64) {
+label b0:
+    _ = N.take(N.make(move(v)));
+    return;
+}
+}
+
+//# run 0x42::N::make --args 42
+
+//# run 0x42::N::take --args struct(42)
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.move
new file mode 100644
index 000000000..8f82a7db1
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/leading_comment.move
@@ -0,0 +1,8 @@
+// my cool copyright
+// copyright continues here
+
+// description of test
+
+//# publish
+
+module 0x42::M {}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.exp
new file mode 100644
index 000000000..88c8dce96
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 16-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000044::m'. Got VMError: {
+    major_status: MODULE_ADDRESS_DOES_NOT_MATCH_SENDER,
+    sub_status: None,
+    location: undefined,
+    indices: [(AddressIdentifier, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.move
new file mode 100644
index 000000000..c6fa6a5dd
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/multiple_modules.move
@@ -0,0 +1,21 @@
+//# publish
+
+module 0x42::m {
+    public fun foo() {
+        0x42::n::bar()
+    }
+}
+
+module 0x42::n {
+    public fun bar() {}
+}
+
+//# run 0x42::m::foo
+
+// mismatched addresses not supported
+//# publish
+
+module 0x44::m {
+}
+module 0x45::n {
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp
new file mode 100644
index 000000000..021f18067
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp
@@ -0,0 +1,4 @@
+processed 4 tasks
+
+task 3 'run'. lines 21-21:
+return values: { 42 }
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move
new file mode 100644
index 000000000..aef3acd86
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move
@@ -0,0 +1,21 @@
+//# init --addresses A=42
+
+//# run --args @A
+module 0x42::m {
+    fun main(a: &address) {
+        assert!(*a == @42, 1000);
+    }
+}
+
+//# publish
+module A::M {
+    struct Foo has key {
+        x: u64,
+    }
+
+    public fun test(): Foo {
+        Foo { x: 42 }
+    }
+}
+
+//# run 42::M::test
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
new file mode 100644
index 000000000..863811f82
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
@@ -0,0 +1,23 @@
+processed 2 tasks
+
+task 0 'print-bytecode'. lines 1-7:
+// Move bytecode v6
+module 42.M {
+
+
+entry foo<Ty0, Ty1>() {
+B0:
+	0: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 9-13:
+// Move bytecode v6
+module 42.M {
+
+
+entry foo<X, Y>() {
+B0:
+	0: Ret
+}
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.move
new file mode 100644
index 000000000..054f68f81
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/print_bytecode.move
@@ -0,0 +1,13 @@
+//# print-bytecode --syntax=mvir
+module 0x42.M {
+entry foo<T, U>() {
+label b0:
+    return;
+}
+}
+
+//# print-bytecode
+module 0x42::M {
+entry fun foo<X, Y>() {
+}
+}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.move
new file mode 100644
index 000000000..20b305b58
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/simple_init.move
@@ -0,0 +1,9 @@
+//# init --addresses A=0x42 K=0x19
+
+//# publish
+
+module A::M {}
+
+//# publish
+
+module K::S {}
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.exp b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.move b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.move
new file mode 100644
index 000000000..ab3df3c0f
--- /dev/null
+++ b/vendors/move/crates/move-transactional-test-runner/tests/vm_test_harness/single_publish.move
@@ -0,0 +1,5 @@
+//# publish
+address 0x42 {
+module N {
+}
+}
diff --git a/vendors/move/crates/move-unit-test/Cargo.toml b/vendors/move/crates/move-unit-test/Cargo.toml
new file mode 100644
index 000000000..596454601
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "move-unit-test"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Unit testing framework for Move code"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.71"
+better_any.workspace = true
+clap.workspace = true
+codespan-reporting.workspace = true
+colored.workspace = true
+rayon.workspace = true
+regex.workspace = true
+once_cell.workspace = true
+itertools.workspace = true
+
+move-command-line-common.workspace = true
+move-stdlib = { workspace = true, features = ["testing"] }
+move-core-types.workspace = true
+move-compiler.workspace = true
+move-ir-types.workspace = true
+move-symbol-pool.workspace = true
+move-vm-types.workspace = true
+move-vm-runtime = { workspace = true, features = ["testing"] }
+move-vm-profiler.workspace = true
+move-vm-test-utils.workspace = true
+move-binary-format.workspace = true
+move-model.workspace = true
+move-stackless-bytecode-interpreter.workspace = true
+move-bytecode-utils.workspace = true
+
+[dev-dependencies]
+datatest-stable.workspace = true
+difference.workspace = true
+
+[[bin]]
+name = "move-unit-test"
+path = "src/main.rs"
+
+[[test]]
+name = "move_unit_test_testsuite"
+harness = false
diff --git a/vendors/move/crates/move-unit-test/README.md b/vendors/move/crates/move-unit-test/README.md
new file mode 100644
index 000000000..40e4b2cd2
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/README.md
@@ -0,0 +1,64 @@
+---
+id: move-unit-test
+title: Move Unit Testing Framework
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/move-unit-test/README.md
+---
+
+# Summary
+
+This crate defines the core logic for running and reporting Move unit
+tests. Move unit testing is made up of two main components; a test runner,
+and a test reporter.
+
+It's important to also note here that unit tests can be run using the
+[stackless bytecode interpreter](../../move-prover/interpreter). If the
+unit tests are run with the stackless bytecode interpreter and the test
+returns a value, then the result of executing the unit test with the Move
+VM and the result of the interpreter will be compared and an error will
+be raised if they are not equal.
+
+Detailed information on how to use unit tests as a user of Move can be
+found [here](https://move-language.github.io/move/unit-testing.html).
+
+## Test Runner
+
+The test runner consumes a
+[`TestPlan`](../../move-compiler/src/unit_test/mod.rs): this is a
+datastructure that is built by the Move compiler, based on source `#[test]`
+attributes. At a high level, this test plan consists of:
+1. A list of `ModuleTestPlan`s for each non-dependency module. A
+   `ModuleTestPlan` consists of a list of unit tests declared in a module,
+   along with its arguments and whether the unit test is an expected
+   failure or not.
+2. Compiled modules for each source module, along with compiled modules for
+   all transitive dependencies.
+3. The source text and source maps for every source and transitive dependency.
+
+The test runner takes this `TestPlan` along with various configuration
+options (e.g., number of threads). From this information the test runner
+creates an initial test state consisting solely of the modules in bullet
+(2) above. This will be the same initial state for all unit tests.
+
+After constructing this initial state, a work queue of `ModuleTestPlan`s is
+passed to a [`rayon`](https://docs.rs/rayon/latest/rayon/) threadpool to
+execute.  After the execution of each test a `PASS`, `FAIL` or `TIMEOUT` is
+reported to the writer (usually `std::io::stdout`) as soon as the test's
+result is known. The result of running tests in a `ModuleTestPlan` is a
+mapping of failing and passing tests (where failing means that the tests
+failed when it was expected to fail, or vis versa) along with profiling
+information and failure information if applicable. These test statistics
+for each module are combined in parallel and produce a `TestResults` data
+structure.
+
+## Test Reporter
+
+After all of the unit tests have been run and a `TestResults` data
+structure has been created, the test reporter will iterate through the test
+results, and will use the data in the `TestFailure` info along with the
+source maps and source text in the test plan to display source-level error
+messages for any failing tests.
+
+Depending on the options passed to the unit testing framework, additional
+info, such as the global storage state at the point of error for each
+failing test, or the execution time and number of instructions for each
+test may be display at the end of a test run.
diff --git a/vendors/move/crates/move-unit-test/src/cargo_runner.rs b/vendors/move/crates/move-unit-test/src/cargo_runner.rs
new file mode 100644
index 000000000..0784e5eba
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/cargo_runner.rs
@@ -0,0 +1,76 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_command_line_common::files::find_filenames;
+use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
+
+use crate::UnitTestingConfig;
+
+pub fn run_tests_with_config_and_filter(
+    mut config: UnitTestingConfig,
+    root_path: &str,
+    source_pattern: &str,
+    dep_root: Option<&str>,
+    native_function_table: Option<NativeFunctionTable>,
+    cost_table: Option<CostTable>,
+) {
+    let get_files = |root_path, pat| {
+        let source_re = regex::Regex::new(pat)
+            .unwrap_or_else(|_| panic!("Invalid regular expression: '{}'", pat));
+        find_filenames(&[root_path], |path| {
+            source_re.is_match(&path.to_string_lossy())
+        })
+        .unwrap()
+    };
+
+    let sources = get_files(root_path, source_pattern);
+    let deps = dep_root
+        .map(|root| get_files(root, r".*\.move$"))
+        .unwrap_or_default();
+
+    config.source_files = sources;
+    config.dep_files = deps;
+    let test_plan = config.build_test_plan().expect("Unable to build test plan");
+
+    let (_, all_tests_passed) = config
+        .run_and_report_unit_tests(
+            test_plan,
+            native_function_table,
+            cost_table,
+            std::io::stdout(),
+        )
+        .expect("Failed to execute tests");
+
+    // If all tests passed, exit with 0 otherwise with a non-zero exit code.
+    if all_tests_passed {
+        std::process::exit(0)
+    } else {
+        std::process::exit(1)
+    }
+}
+
+#[macro_export]
+macro_rules! register_move_unit_tests {
+    ($config:expr, $root:expr, $pattern:expr) => {
+        #[test]
+        fn move_unit_tests() {
+            $crate::cargo_runner::run_tests_with_config_and_filter(
+                $config, $root, $pattern, None, None,
+            )
+        }
+    };
+    ($config:expr, $root:expr, $source_pattern:expr, $dep_root:expr, $native_function_table:expr) => {
+        #[test]
+        fn move_unit_tests() {
+            $crate::cargo_runner::run_tests_with_config_and_filter(
+                $config,
+                $root,
+                $source_pattern,
+                Some($dep_root),
+                $native_function_table,
+            )
+        }
+    };
+}
diff --git a/vendors/move/crates/move-unit-test/src/extensions.rs b/vendors/move/crates/move-unit-test/src/extensions.rs
new file mode 100644
index 000000000..676323264
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/extensions.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module manages native extensions supported by the unit testing framework.
+//! Such extensions are enabled by cfg features and must be compiled into the test
+//! to be usable.
+
+use move_vm_runtime::native_extensions::NativeContextExtensions;
+use once_cell::sync::Lazy;
+use std::sync::Mutex;
+
+static EXTENSION_HOOK: Lazy<
+    Mutex<Option<Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>>>,
+> = Lazy::new(|| Mutex::new(None));
+
+/// Sets a hook which is called to populate additional native extensions. This can be used to
+/// get extensions living outside of the Move repo into the unit testing environment.
+///
+/// This need to be called with the extensions of the custom Move environment at two places:
+///
+/// (a) At start of a custom Move CLI, to enable unit testing with the additional
+/// extensions;
+/// (b) Before `cli::run_move_unit_tests` if unit tests are called programmatically from Rust.
+/// You may want to define a new function `my_cli::run_move_unit_tests` which does this.
+///
+/// Note that the table extension is handled already internally, and does not need to added via
+/// this hook.
+pub fn set_extension_hook(p: Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>) {
+    *EXTENSION_HOOK.lock().unwrap() = Some(p)
+}
+
+/// Create all available native context extensions.
+#[allow(unused_mut, clippy::let_and_return)]
+pub(crate) fn new_extensions<'a>() -> NativeContextExtensions<'a> {
+    let mut e = NativeContextExtensions::default();
+    if let Some(h) = &*EXTENSION_HOOK.lock().unwrap() {
+        (*h)(&mut e)
+    }
+    e
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::extensions::{new_extensions, set_extension_hook};
+    use better_any::{Tid, TidAble};
+    use move_vm_runtime::native_extensions::NativeContextExtensions;
+
+    /// A test that extension hooks work as expected.
+    #[test]
+    fn test_extension_hook() {
+        set_extension_hook(Box::new(my_hook));
+        let ext = new_extensions();
+        let _e = ext.get::<TestExtension>();
+    }
+
+    #[derive(Tid)]
+    struct TestExtension();
+
+    fn my_hook(ext: &mut NativeContextExtensions) {
+        ext.add(TestExtension())
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/src/lib.rs b/vendors/move/crates/move-unit-test/src/lib.rs
new file mode 100644
index 000000000..adf64ef49
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/lib.rs
@@ -0,0 +1,234 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod cargo_runner;
+pub mod extensions;
+pub mod test_reporter;
+pub mod test_runner;
+
+use crate::test_runner::TestRunner;
+use clap::*;
+use move_command_line_common::files::verify_and_create_named_address_mapping;
+use move_compiler::{
+    self,
+    diagnostics::{self},
+    shared::{self, NumericalAddress},
+    unit_test::{self, TestPlan},
+    Compiler, Flags, PASS_CFGIR,
+};
+use move_core_types::language_storage::ModuleId;
+use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    collections::BTreeMap,
+    io::{Result, Write},
+    marker::Send,
+    sync::Mutex,
+};
+
+/// The default value bounding the amount of gas consumed in a test.
+const DEFAULT_EXECUTION_BOUND: u64 = 1_000_000;
+
+#[derive(Debug, Parser, Clone)]
+#[clap(author, version, about)]
+pub struct UnitTestingConfig {
+    /// Bound the gas limit for any one test. If using custom gas table, this is the max number of instructions.
+    #[clap(name = "gas-limit", short = 'i', long = "gas-limit")]
+    pub gas_limit: Option<u64>,
+
+    /// A filter string to determine which unit tests to run
+    #[clap(name = "filter", short = 'f', long = "filter")]
+    pub filter: Option<String>,
+
+    /// List all tests
+    #[clap(name = "list", short = 'l', long = "list")]
+    pub list: bool,
+
+    /// Number of threads to use for running tests.
+    #[clap(
+        name = "num-threads",
+        default_value = "8",
+        short = 't',
+        long = "threads"
+    )]
+    pub num_threads: usize,
+
+    /// Dependency files
+    #[clap(
+        name = "dependencies",
+        long = "dependencies",
+        short = 'd',
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub dep_files: Vec<String>,
+
+    /// Report test statistics at the end of testing. CSV report generated if 'csv' passed
+    #[clap(name = "report-statistics", short = 's', long = "statistics")]
+    pub report_statistics: Option<Option<String>>,
+
+    #[clap(
+        name = "report_stacktrace_on_abort",
+        short = 'r',
+        long = "stacktrace_on_abort"
+    )]
+    pub report_stacktrace_on_abort: bool,
+
+    /// Named address mapping
+    #[clap(
+        name = "NAMED_ADDRESSES",
+        short = 'a',
+        long = "addresses",
+        value_parser = shared::parse_named_address,
+    )]
+    pub named_address_values: Vec<(String, NumericalAddress)>,
+
+    /// Source files
+    #[clap(
+        name = "sources",
+        num_args(1..),
+        action = clap::ArgAction::Append,
+    )]
+    pub source_files: Vec<String>,
+
+    /// Use the stackless bytecode interpreter to run the tests and cross check its results with
+    /// the execution result from Move VM.
+    #[clap(long = "stackless")]
+    pub check_stackless_vm: bool,
+
+    /// Verbose mode
+    #[clap(short = 'v', long = "verbose")]
+    pub verbose: bool,
+}
+
+fn format_module_id(module_id: &ModuleId) -> String {
+    format!(
+        "0x{}::{}",
+        module_id.address().short_str_lossless(),
+        module_id.name()
+    )
+}
+
+impl UnitTestingConfig {
+    /// Create a unit testing config for use with `register_move_unit_tests`
+    pub fn default_with_bound(bound: Option<u64>) -> Self {
+        Self {
+            gas_limit: bound.or(Some(DEFAULT_EXECUTION_BOUND)),
+            filter: None,
+            num_threads: 8,
+            report_statistics: None,
+            report_stacktrace_on_abort: false,
+            source_files: vec![],
+            dep_files: vec![],
+            check_stackless_vm: false,
+            verbose: false,
+            list: false,
+            named_address_values: vec![],
+        }
+    }
+
+    pub fn with_named_addresses(
+        mut self,
+        named_address_values: BTreeMap<String, NumericalAddress>,
+    ) -> Self {
+        assert!(self.named_address_values.is_empty());
+        self.named_address_values = named_address_values.into_iter().collect();
+        self
+    }
+
+    fn compile_to_test_plan(
+        &self,
+        source_files: Vec<String>,
+        deps: Vec<String>,
+    ) -> Option<TestPlan> {
+        let addresses =
+            verify_and_create_named_address_mapping(self.named_address_values.clone()).ok()?;
+        let flags = Flags::testing();
+        let (files, comments_and_compiler_res) =
+            Compiler::from_files(source_files, deps, addresses)
+                .set_flags(flags)
+                .run::<PASS_CFGIR>()
+                .unwrap();
+        let (_, compiler) =
+            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
+
+        let (mut compiler, cfgir) = compiler.into_ast();
+        let compilation_env = compiler.compilation_env();
+        let test_plan = unit_test::plan_builder::construct_test_plan(compilation_env, None, &cfgir);
+
+        let compilation_result = compiler.at_cfgir(cfgir).build();
+        let (units, warnings) =
+            diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
+        diagnostics::report_warnings(&files, warnings);
+        test_plan.map(|tests| TestPlan::new(tests, files, units))
+    }
+
+    /// Build a test plan from a unit test config
+    pub fn build_test_plan(&self) -> Option<TestPlan> {
+        let deps = self.dep_files.clone();
+
+        let TestPlan {
+            files, module_info, ..
+        } = self.compile_to_test_plan(deps.clone(), vec![])?;
+
+        let mut test_plan = self.compile_to_test_plan(self.source_files.clone(), deps)?;
+        test_plan.module_info.extend(module_info);
+        test_plan.files.extend(files);
+        Some(test_plan)
+    }
+
+    /// Public entry point to Move unit testing as a library
+    /// Returns `true` if all unit tests passed. Otherwise, returns `false`.
+    pub fn run_and_report_unit_tests<W: Write + Send>(
+        &self,
+        test_plan: TestPlan,
+        native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
+        writer: W,
+    ) -> Result<(W, bool)> {
+        let shared_writer = Mutex::new(writer);
+
+        if self.list {
+            for (module_id, test_plan) in &test_plan.module_tests {
+                for test_name in test_plan.tests.keys() {
+                    writeln!(
+                        shared_writer.lock().unwrap(),
+                        "{}::{}: test",
+                        format_module_id(module_id),
+                        test_name
+                    )?;
+                }
+            }
+            return Ok((shared_writer.into_inner().unwrap(), true));
+        }
+
+        writeln!(shared_writer.lock().unwrap(), "Running Move unit tests")?;
+        let mut test_runner = TestRunner::new(
+            self.gas_limit.unwrap_or(DEFAULT_EXECUTION_BOUND),
+            self.num_threads,
+            self.check_stackless_vm,
+            self.verbose,
+            self.report_stacktrace_on_abort,
+            test_plan,
+            native_function_table,
+            cost_table,
+            verify_and_create_named_address_mapping(self.named_address_values.clone()).unwrap(),
+        )
+        .unwrap();
+
+        if let Some(filter_str) = &self.filter {
+            test_runner.filter(filter_str)
+        }
+
+        let test_results = test_runner.run(&shared_writer).unwrap();
+        if let Some(report_type) = &self.report_statistics {
+            test_results.report_statistics(&shared_writer, report_type)?;
+        }
+
+        let ok = test_results.summarize(&shared_writer)?;
+
+        let writer = shared_writer.into_inner().unwrap();
+        Ok((writer, ok))
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/src/main.rs b/vendors/move/crates/move-unit-test/src/main.rs
new file mode 100644
index 000000000..f3521bcc2
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/main.rs
@@ -0,0 +1,16 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::*;
+use move_unit_test::UnitTestingConfig;
+
+pub fn main() {
+    let args = UnitTestingConfig::parse();
+
+    let test_plan = args.build_test_plan();
+    if let Some(test_plan) = test_plan {
+        args.run_and_report_unit_tests(test_plan, None, None, std::io::stdout())
+            .unwrap();
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/src/test_reporter.rs b/vendors/move/crates/move-unit-test/src/test_reporter.rs
new file mode 100644
index 000000000..449ead559
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/test_reporter.rs
@@ -0,0 +1,589 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::format_module_id;
+use codespan_reporting::files::{Files, SimpleFiles};
+use colored::{control, Colorize};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{ExecutionState, Location, VMError, VMResult},
+};
+use move_command_line_common::files::FileHash;
+use move_compiler::{
+    diagnostics::{self, Diagnostic, Diagnostics},
+    unit_test::{ModuleTestPlan, TestName, TestPlan},
+};
+use move_core_types::{language_storage::ModuleId, vm_status::StatusType};
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    io::{Result, Write},
+    sync::Mutex,
+    time::Duration,
+};
+
+pub use move_compiler::unit_test::ExpectedMoveError as MoveError;
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub enum FailureReason {
+    // Expected to error, but it didn't
+    NoError(String),
+    // Aborted with the wrong code
+    WrongError(String, MoveError, MoveError),
+    // Aborted with the wrong code, without location specified
+    WrongAbortDEPRECATED(String, u64, MoveError),
+    // Error wasn't expected, but it did
+    UnexpectedError(String, MoveError),
+    // Test timed out
+    Timeout(String),
+    // The execution results of the Move VM and stackless VM does not match
+    Mismatch {
+        move_vm_return_values: Box<VMResult<Vec<Vec<u8>>>>,
+        stackless_vm_return_values: Box<VMResult<Vec<Vec<u8>>>>,
+    },
+    // Property checking failed
+    Property(String),
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct TestFailure {
+    pub test_run_info: TestRunInfo,
+    pub vm_error: Option<VMError>,
+    pub failure_reason: FailureReason,
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct TestRunInfo {
+    pub function_ident: String,
+    pub elapsed_time: Duration,
+    pub instructions_executed: u64,
+}
+
+#[derive(Debug, Clone)]
+pub struct TestStatistics {
+    passed: BTreeMap<ModuleId, BTreeSet<TestRunInfo>>,
+    failed: BTreeMap<ModuleId, BTreeSet<TestFailure>>,
+    output: BTreeMap<ModuleId, BTreeMap<TestName, String>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct TestResults {
+    final_statistics: TestStatistics,
+    test_plan: TestPlan,
+}
+
+impl TestRunInfo {
+    pub fn new(function_ident: String, elapsed_time: Duration, instructions_executed: u64) -> Self {
+        Self {
+            function_ident,
+            elapsed_time,
+            instructions_executed,
+        }
+    }
+}
+
+impl FailureReason {
+    pub fn no_error() -> Self {
+        FailureReason::NoError("Test did not error as expected".to_string())
+    }
+
+    pub fn wrong_error(expected: MoveError, actual: MoveError) -> Self {
+        FailureReason::WrongError(
+            "Test did not error as expected".to_string(),
+            expected,
+            actual,
+        )
+    }
+
+    pub fn wrong_abort_deprecated(expected: u64, actual: MoveError) -> Self {
+        FailureReason::WrongAbortDEPRECATED(
+            "Test did not abort with expected code".to_string(),
+            expected,
+            actual,
+        )
+    }
+
+    pub fn unexpected_error(error: MoveError) -> Self {
+        FailureReason::UnexpectedError("Test was not expected to error".to_string(), error)
+    }
+
+    pub fn timeout() -> Self {
+        FailureReason::Timeout("Test timed out".to_string())
+    }
+
+    pub fn mismatch(
+        move_vm_return_values: VMResult<Vec<Vec<u8>>>,
+        stackless_vm_return_values: VMResult<Vec<Vec<u8>>>,
+    ) -> Self {
+        FailureReason::Mismatch {
+            move_vm_return_values: Box::new(move_vm_return_values),
+            stackless_vm_return_values: Box::new(stackless_vm_return_values),
+        }
+    }
+
+    pub fn property(details: String) -> Self {
+        FailureReason::Property(details)
+    }
+}
+
+impl TestFailure {
+    pub fn new(
+        failure_reason: FailureReason,
+        test_run_info: TestRunInfo,
+        vm_error: Option<VMError>,
+    ) -> Self {
+        Self {
+            test_run_info,
+            vm_error,
+            failure_reason,
+        }
+    }
+
+    pub fn render_error(&self, test_plan: &TestPlan) -> String {
+        match &self.failure_reason {
+            FailureReason::NoError(message) => message.to_string(),
+            FailureReason::Timeout(message) => message.to_string(),
+            FailureReason::WrongError(message, expected, actual) => {
+                let base_message = format!(
+                    "{message}. Expected test {} but instead it {} rooted here",
+                    expected.verbiage(/* is_past_tense */ false),
+                    actual.verbiage(/* is_past_tense */ true),
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            }
+            FailureReason::WrongAbortDEPRECATED(message, expected_code, actual) => {
+                let base_message = format!(
+                    "{}. \
+                    Expected test to abort with code {}, but instead it {} rooted here",
+                    message,
+                    expected_code,
+                    actual.verbiage(/* is_past_tense */ true),
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            }
+            FailureReason::UnexpectedError(message, error) => {
+                let prefix = match error.0.status_type() {
+                    StatusType::Validation => "INTERNAL TEST ERROR: Unexpected Validation Error\n",
+                    StatusType::Verification => {
+                        "INTERNAL TEST ERROR: Unexpected Verification Error\n"
+                    }
+                    StatusType::InvariantViolation => {
+                        "INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION.\n"
+                    }
+                    StatusType::Deserialization => {
+                        "INTERNAL TEST ERROR: Unexpected Deserialization Error\n"
+                    }
+                    StatusType::Unknown => "INTERNAL TEST ERROR: UNKNOWN ERROR.\n",
+                    // execution errors are expected, so no message
+                    StatusType::Execution => "",
+                };
+                let base_message = format!(
+                    "{}{}, but it {} rooted here",
+                    prefix,
+                    message,
+                    error.verbiage(/* is_past_tense */ true)
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            }
+            FailureReason::Mismatch {
+                move_vm_return_values,
+                stackless_vm_return_values,
+            } => {
+                format!(
+                    "Executions via Move VM [M] and stackless VM [S] yield different results.\n\
+                    [M] - return values: {:?}\n\
+                    [S] - return values: {:?}\n\
+                    ",
+                    move_vm_return_values, stackless_vm_return_values,
+                )
+            }
+            FailureReason::Property(message) => message.clone(),
+        }
+    }
+
+    fn get_line_number(
+        loc: &Loc,
+        files: &SimpleFiles<Symbol, &str>,
+        file_mapping: &HashMap<FileHash, usize>,
+    ) -> String {
+        Self::get_line_number_internal(loc, files, file_mapping)
+            .unwrap_or_else(|_| "no_source_line".to_string())
+    }
+
+    fn get_line_number_internal(
+        loc: &Loc,
+        files: &SimpleFiles<Symbol, &str>,
+        file_mapping: &HashMap<FileHash, usize>,
+    ) -> std::result::Result<String, codespan_reporting::files::Error> {
+        let id = file_mapping
+            .get(&loc.file_hash())
+            .ok_or(codespan_reporting::files::Error::FileMissing)?;
+        let start_line_index = files.line_index(*id, loc.start() as usize)?;
+        let start_line_number = files.line_number(*id, start_line_index)?;
+        let end_line_index = files.line_index(*id, loc.end() as usize)?;
+        let end_line_number = files.line_number(*id, end_line_index)?;
+        if start_line_number == end_line_number {
+            Ok(start_line_number.to_string())
+        } else {
+            Ok(format!("{}-{}", start_line_number, end_line_number))
+        }
+    }
+
+    fn report_exec_state(test_plan: &TestPlan, exec_state: &ExecutionState) -> String {
+        let stack_trace = exec_state.stack_trace();
+        let mut buf = String::new();
+        if !stack_trace.is_empty() {
+            buf.push_str("stack trace\n");
+            let mut files = SimpleFiles::new();
+            let mut file_mapping = HashMap::new();
+            for (fhash, (fname, source)) in &test_plan.files {
+                let id = files.add(*fname, source.as_str());
+                file_mapping.insert(*fhash, id);
+            }
+
+            for frame in stack_trace {
+                let module_id = match &frame.0 {
+                    Some(v) => v,
+                    None => return "\tmalformed stack trace (no module ID)".to_string(),
+                };
+                let named_module = match test_plan.module_info.get(module_id) {
+                    Some(v) => v,
+                    None => return "\tmalformed stack trace (no module)".to_string(),
+                };
+                let function_source_map =
+                    match named_module.source_map.get_function_source_map(frame.1) {
+                        Ok(v) => v,
+                        Err(_) => return "\tmalformed stack trace (no source map)".to_string(),
+                    };
+                // unwrap here is a mirror of the same unwrap in report_error_with_location
+                let loc = function_source_map.get_code_location(frame.2).unwrap();
+                let fn_handle_idx = named_module.module.function_def_at(frame.1).function;
+                let fn_id_idx = named_module.module.function_handle_at(fn_handle_idx).name;
+                let fn_name = named_module.module.identifier_at(fn_id_idx).as_str();
+                let file_name = match test_plan.files.get(&loc.file_hash()) {
+                    Some(v) => format!("{}", v.0),
+                    None => "unknown_source".to_string(),
+                };
+                buf.push_str(
+                    &format!(
+                        "\t{}::{}({}:{})\n",
+                        module_id.name(),
+                        fn_name,
+                        file_name,
+                        Self::get_line_number(&loc, &files, &file_mapping)
+                    )
+                    .to_string(),
+                );
+            }
+        }
+        buf
+    }
+
+    fn report_error_with_location(
+        test_plan: &TestPlan,
+        base_message: String,
+        vm_error: &Option<VMError>,
+    ) -> String {
+        let report_diagnostics = if control::SHOULD_COLORIZE.should_colorize() {
+            diagnostics::report_diagnostics_to_color_buffer
+        } else {
+            diagnostics::report_diagnostics_to_buffer
+        };
+
+        let vm_error = match vm_error {
+            None => return base_message,
+            Some(vm_error) => vm_error,
+        };
+
+        let diags = match vm_error.location() {
+            Location::Module(module_id) => {
+                let diag_opt = vm_error.offsets().first().and_then(|(fdef_idx, offset)| {
+                    let function_source_map = test_plan
+                        .module_info
+                        .get(module_id)?
+                        .source_map
+                        .get_function_source_map(*fdef_idx)
+                        .ok()?;
+                    let loc = function_source_map.get_code_location(*offset).unwrap();
+                    let msg = format!("In this function in {}", format_module_id(module_id));
+                    // TODO(tzakian) maybe migrate off of move-langs diagnostics?
+                    Some(Diagnostic::new(
+                        diagnostics::codes::Tests::TestFailed,
+                        (loc, base_message.clone()),
+                        vec![(function_source_map.definition_location, msg)],
+                        std::iter::empty::<String>(),
+                    ))
+                });
+                match diag_opt {
+                    None => base_message,
+                    Some(diag) => String::from_utf8(report_diagnostics(
+                        &test_plan.files,
+                        Diagnostics::from(vec![diag]),
+                    ))
+                    .unwrap(),
+                }
+            }
+            _ => base_message,
+        };
+
+        match vm_error.exec_state() {
+            None => diags,
+            Some(exec_state) => {
+                let exec_state_str = Self::report_exec_state(test_plan, exec_state);
+                if exec_state_str.is_empty() {
+                    diags
+                } else {
+                    format!("{}\n{}", diags, exec_state_str)
+                }
+            }
+        }
+    }
+}
+
+impl TestStatistics {
+    pub fn new() -> Self {
+        Self {
+            passed: BTreeMap::new(),
+            failed: BTreeMap::new(),
+            output: BTreeMap::new(),
+        }
+    }
+
+    pub fn test_failure(&mut self, test_failure: TestFailure, test_plan: &ModuleTestPlan) {
+        self.failed
+            .entry(test_plan.module_id.clone())
+            .or_default()
+            .insert(test_failure);
+    }
+
+    pub fn test_success(&mut self, test_info: TestRunInfo, test_plan: &ModuleTestPlan) {
+        self.passed
+            .entry(test_plan.module_id.clone())
+            .or_default()
+            .insert(test_info);
+    }
+
+    pub fn test_output(&mut self, test_name: TestName, test_plan: &ModuleTestPlan, output: String) {
+        self.output
+            .entry(test_plan.module_id.clone())
+            .or_default()
+            .insert(test_name, output);
+    }
+
+    pub fn combine(mut self, other: Self) -> Self {
+        for (module_id, test_result) in other.passed {
+            let entry = self.passed.entry(module_id).or_default();
+            entry.extend(test_result.into_iter());
+        }
+        for (module_id, test_result) in other.failed {
+            let entry = self.failed.entry(module_id).or_default();
+            entry.extend(test_result.into_iter());
+        }
+        for (module_id, test_output) in other.output {
+            let entry = self.output.entry(module_id).or_default();
+            entry.extend(test_output.into_iter());
+        }
+        self
+    }
+}
+
+impl TestResults {
+    pub fn new(final_statistics: TestStatistics, test_plan: TestPlan) -> Self {
+        Self {
+            final_statistics,
+            test_plan,
+        }
+    }
+
+    pub fn report_goldens<W: Write>(&self, writer: &Mutex<W>) -> Result<()> {
+        for (module_name, test_outputs) in self.final_statistics.output.iter() {
+            for (test_name, write_set) in test_outputs.iter() {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "{}::{}",
+                    format_module_id(module_name),
+                    test_name
+                )?;
+                writeln!(writer.lock().unwrap(), "Output: {}", write_set)?;
+            }
+        }
+        Ok(())
+    }
+
+    pub fn report_statistics<W: Write>(
+        &self,
+        writer: &Mutex<W>,
+        report_format: &Option<String>,
+    ) -> Result<()> {
+        if let Some(report_type) = report_format {
+            if report_type == "csv" {
+                writeln!(writer.lock().unwrap(), "name,nanos,gas")?;
+                for (module_id, test_results) in self.final_statistics.passed.iter() {
+                    for test_result in test_results {
+                        let qualified_function_name = format!(
+                            "{}::{}",
+                            format_module_id(module_id),
+                            test_result.function_ident
+                        );
+                        writeln!(
+                            writer.lock().unwrap(),
+                            "{},{},{}",
+                            qualified_function_name,
+                            test_result.elapsed_time.as_nanos(),
+                            test_result.instructions_executed
+                        )?;
+                    }
+                }
+                return Ok(());
+            } else {
+                writeln!(
+                    std::io::stderr(),
+                    "Unknown output format '{report_type}' provided. Defaulting to basic format."
+                )?
+            }
+        }
+
+        writeln!(writer.lock().unwrap(), "\nTest Statistics:\n")?;
+
+        let mut max_function_name_size = 0;
+        let mut stats = Vec::new();
+
+        for (module_id, test_results) in self.final_statistics.passed.iter() {
+            for test_result in test_results {
+                let qualified_function_name = format!(
+                    "{}::{}",
+                    format_module_id(module_id),
+                    test_result.function_ident
+                );
+                max_function_name_size =
+                    std::cmp::max(max_function_name_size, qualified_function_name.len());
+                stats.push((
+                    qualified_function_name,
+                    test_result.elapsed_time.as_secs_f32(),
+                    test_result.instructions_executed,
+                ))
+            }
+        }
+
+        for (module_id, test_failures) in self.final_statistics.failed.iter() {
+            for test_failure in test_failures {
+                let qualified_function_name = format!(
+                    "{}::{}",
+                    format_module_id(module_id),
+                    test_failure.test_run_info.function_ident
+                );
+                max_function_name_size =
+                    std::cmp::max(max_function_name_size, qualified_function_name.len());
+                stats.push((
+                    qualified_function_name,
+                    test_failure.test_run_info.elapsed_time.as_secs_f32(),
+                    test_failure.test_run_info.instructions_executed,
+                ));
+            }
+        }
+
+        if !stats.is_empty() {
+            writeln!(
+                writer.lock().unwrap(),
+                "┌─{:─^width$}─┬─{:─^10}─┬─{:─^25}─┐",
+                "",
+                "",
+                "",
+                width = max_function_name_size,
+            )?;
+            writeln!(
+                writer.lock().unwrap(),
+                "│ {name:^width$} │ {time:^10} │ {instructions:^25} │",
+                width = max_function_name_size,
+                name = "Test Name",
+                time = "Time",
+                instructions = "Gas Used"
+            )?;
+
+            for (qualified_function_name, time, instructions) in stats {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "├─{:─^width$}─┼─{:─^10}─┼─{:─^25}─┤",
+                    "",
+                    "",
+                    "",
+                    width = max_function_name_size,
+                )?;
+                writeln!(
+                    writer.lock().unwrap(),
+                    "│ {name:<width$} │ {time:^10.3} │ {instructions:^25} │",
+                    name = qualified_function_name,
+                    width = max_function_name_size,
+                    time = time,
+                    instructions = instructions,
+                )?;
+            }
+
+            writeln!(
+                writer.lock().unwrap(),
+                "└─{:─^width$}─┴─{:─^10}─┴─{:─^25}─┘",
+                "",
+                "",
+                "",
+                width = max_function_name_size,
+            )?;
+        }
+
+        writeln!(writer.lock().unwrap())
+    }
+
+    /// Returns `true` if all tests passed, `false` if there was a test failure/timeout
+    pub fn summarize<W: Write>(self, writer: &Mutex<W>) -> Result<bool> {
+        let num_failed_tests = self
+            .final_statistics
+            .failed
+            .iter()
+            .fold(0, |acc, (_, fns)| acc + fns.len()) as u64;
+        let num_passed_tests = self
+            .final_statistics
+            .passed
+            .iter()
+            .fold(0, |acc, (_, fns)| acc + fns.len()) as u64;
+        if !self.final_statistics.failed.is_empty() {
+            writeln!(writer.lock().unwrap(), "\nTest failures:\n")?;
+            for (module_id, test_failures) in &self.final_statistics.failed {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "Failures in {}:",
+                    format_module_id(module_id)
+                )?;
+                for test_failure in test_failures {
+                    writeln!(
+                        writer.lock().unwrap(),
+                        "\n┌── {} ──────",
+                        test_failure.test_run_info.function_ident.bold()
+                    )?;
+                    writeln!(
+                        writer.lock().unwrap(),
+                        "│ {}",
+                        test_failure
+                            .render_error(&self.test_plan)
+                            .replace('\n', "\n│ ")
+                    )?;
+                    writeln!(writer.lock().unwrap(), "└──────────────────\n")?;
+                }
+            }
+        }
+
+        writeln!(
+            writer.lock().unwrap(),
+            "Test result: {}. Total tests: {}; passed: {}; failed: {}",
+            if num_failed_tests == 0 {
+                "OK".bold().bright_green()
+            } else {
+                "FAILED".bold().bright_red()
+            },
+            num_passed_tests + num_failed_tests,
+            num_passed_tests,
+            num_failed_tests
+        )?;
+        Ok(num_failed_tests == 0)
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/src/test_runner.rs b/vendors/move/crates/move-unit-test/src/test_runner.rs
new file mode 100644
index 000000000..c21fd3914
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/src/test_runner.rs
@@ -0,0 +1,501 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    extensions, format_module_id,
+    test_reporter::{
+        FailureReason, MoveError, TestFailure, TestResults, TestRunInfo, TestStatistics,
+    },
+};
+use anyhow::Result;
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{ColorChoice, StandardStream},
+};
+use colored::*;
+
+use move_binary_format::{errors::VMResult, file_format::CompiledModule};
+use move_bytecode_utils::Modules;
+use move_compiler::{
+    diagnostics::WarningFilters,
+    shared::{Flags, NumericalAddress, PackagePaths},
+    unit_test::{ExpectedFailure, ModuleTestPlan, TestCase, TestPlan},
+};
+use move_core_types::{
+    account_address::AccountAddress, effects::ChangeSet, identifier::IdentStr,
+    runtime_value::serialize_values, vm_status::StatusCode,
+};
+use move_model::{
+    model::GlobalEnv, options::ModelBuilderOptions,
+    run_model_builder_with_options_and_compilation_flags,
+};
+use move_stackless_bytecode_interpreter::{
+    concrete::{settings::InterpreterSettings, value::GlobalState},
+    shared::bridge::adapt_move_vm_result,
+    StacklessBytecodeInterpreter,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_runtime::{move_vm::MoveVM, native_functions::NativeFunctionTable};
+use move_vm_test_utils::{
+    gas_schedule::{unit_cost_schedule, CostTable, Gas, GasStatus},
+    InMemoryStorage,
+};
+#[cfg(debug_assertions)]
+use move_vm_types::gas::GasMeter;
+use rayon::prelude::*;
+use std::{collections::BTreeMap, io::Write, marker::Send, sync::Mutex, time::Instant};
+
+use move_vm_runtime::native_extensions::NativeContextExtensions;
+
+/// Test state common to all tests
+pub struct SharedTestingConfig {
+    report_stacktrace_on_abort: bool,
+    execution_bound: u64,
+    cost_table: CostTable,
+    native_function_table: NativeFunctionTable,
+    starting_storage_state: InMemoryStorage,
+    source_files: Vec<String>,
+    named_address_values: BTreeMap<String, NumericalAddress>,
+    check_stackless_vm: bool,
+    verbose: bool,
+}
+
+pub struct TestRunner {
+    num_threads: usize,
+    testing_config: SharedTestingConfig,
+    tests: TestPlan,
+}
+
+/// Setup storage state with the set of modules that will be needed for all tests
+fn setup_test_storage<'a>(
+    modules: impl Iterator<Item = &'a CompiledModule>,
+) -> Result<InMemoryStorage> {
+    let mut storage = InMemoryStorage::new();
+    let modules = Modules::new(modules);
+    for module in modules
+        .compute_dependency_graph()
+        .compute_topological_order()?
+    {
+        let module_id = module.self_id();
+        let mut module_bytes = Vec::new();
+        module.serialize(&mut module_bytes)?;
+        storage.publish_or_overwrite_module(module_id, module_bytes);
+    }
+
+    Ok(storage)
+}
+
+impl TestRunner {
+    pub fn new(
+        execution_bound: u64,
+        num_threads: usize,
+        check_stackless_vm: bool,
+        verbose: bool,
+        report_stacktrace_on_abort: bool,
+        tests: TestPlan,
+        // TODO: maybe we should require the clients to always pass in a list of native functions so
+        // we don't have to make assumptions about their gas parameters.
+        native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
+        named_address_values: BTreeMap<String, NumericalAddress>,
+    ) -> Result<Self> {
+        let source_files = tests
+            .files
+            .values()
+            .map(|(filepath, _)| filepath.to_string())
+            .collect();
+        let modules = tests.module_info.values().map(|info| &info.module);
+        let starting_storage_state = setup_test_storage(modules)?;
+        let native_function_table = native_function_table.unwrap_or_else(|| {
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            )
+        });
+        Ok(Self {
+            testing_config: SharedTestingConfig {
+                report_stacktrace_on_abort,
+                starting_storage_state,
+                execution_bound,
+                native_function_table,
+                // TODO: our current implementation uses a unit cost table to prevent programs from
+                // running indefinitely. This should probably be done in a different way, like halting
+                // after executing a certain number of instructions or setting a timer.
+                //
+                // From the API standpoint, we should let the client specify the cost table.
+                cost_table: cost_table.unwrap_or_else(unit_cost_schedule),
+                source_files,
+                check_stackless_vm,
+                verbose,
+                named_address_values,
+            },
+            num_threads,
+            tests,
+        })
+    }
+
+    pub fn run<W: Write + Send>(self, writer: &Mutex<W>) -> Result<TestResults> {
+        rayon::ThreadPoolBuilder::new()
+            .num_threads(self.num_threads)
+            .build()
+            .unwrap()
+            .install(|| {
+                let final_statistics = self
+                    .tests
+                    .module_tests
+                    .par_iter()
+                    .map(|(_, test_plan)| self.testing_config.exec_module_tests(test_plan, writer))
+                    .reduce(TestStatistics::new, |acc, stats| acc.combine(stats));
+
+                Ok(TestResults::new(final_statistics, self.tests))
+            })
+    }
+
+    pub fn filter(&mut self, test_name_slice: &str) {
+        for (module_id, module_test) in self.tests.module_tests.iter_mut() {
+            if module_id.name().as_str().contains(test_name_slice) {
+                continue;
+            } else {
+                let tests = std::mem::take(&mut module_test.tests);
+                module_test.tests = tests
+                    .into_iter()
+                    .filter(|(test_name, _)| {
+                        let full_name =
+                            format!("{}::{}", module_id.name().as_str(), test_name.as_str());
+                        full_name.contains(test_name_slice)
+                    })
+                    .collect();
+            }
+        }
+    }
+}
+
+// TODO: do not expose this to backend implementations
+struct TestOutput<'a, 'b, W> {
+    test_plan: &'a ModuleTestPlan,
+    writer: &'b Mutex<W>,
+}
+
+impl<'a, 'b, W: Write> TestOutput<'a, 'b, W> {
+    fn pass(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {}    ] {}::{}",
+            "PASS".bold().bright_green(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name
+        )
+        .unwrap()
+    }
+
+    fn fail(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {}    ] {}::{}",
+            "FAIL".bold().bright_red(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name,
+        )
+        .unwrap()
+    }
+
+    fn timeout(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {} ] {}::{}",
+            "TIMEOUT".bold().bright_yellow(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name,
+        )
+        .unwrap();
+    }
+}
+
+impl SharedTestingConfig {
+    fn execute_via_move_vm(
+        &self,
+        test_plan: &ModuleTestPlan,
+        function_name: &str,
+        test_info: &TestCase,
+    ) -> (
+        VMResult<ChangeSet>,
+        VMResult<NativeContextExtensions>,
+        VMResult<Vec<Vec<u8>>>,
+        TestRunInfo,
+    ) {
+        let move_vm = MoveVM::new(self.native_function_table.clone()).unwrap();
+        let extensions = extensions::new_extensions();
+        let mut session =
+            move_vm.new_session_with_extensions(&self.starting_storage_state, extensions);
+        let mut gas_meter = GasStatus::new(&self.cost_table, Gas::new(self.execution_bound));
+        #[cfg(debug_assertions)]
+        gas_meter.set_profiler(GasProfiler::init_default_cfg(
+            function_name.to_owned(),
+            self.execution_bound,
+        ));
+
+        // TODO: collect VM logs if the verbose flag (i.e, `self.verbose`) is set
+
+        let now = Instant::now();
+        let serialized_return_values_result = session.execute_function_bypass_visibility(
+            &test_plan.module_id,
+            IdentStr::new(function_name).unwrap(),
+            vec![], // no ty args, at least for now
+            serialize_values(test_info.arguments.iter()),
+            &mut gas_meter,
+        );
+        let mut return_result = serialized_return_values_result.map(|res| {
+            res.return_values
+                .into_iter()
+                .map(|(bytes, _layout)| bytes)
+                .collect()
+        });
+        if !self.report_stacktrace_on_abort {
+            if let Err(err) = &mut return_result {
+                err.remove_exec_state();
+            }
+        }
+        let test_run_info = TestRunInfo::new(
+            function_name.to_string(),
+            now.elapsed(),
+            // TODO(Gas): This doesn't look quite right...
+            //            We're not computing the number of instructions executed even with a unit gas schedule.
+            Gas::new(self.execution_bound)
+                .checked_sub(gas_meter.remaining_gas())
+                .unwrap()
+                .into(),
+        );
+        match session.finish_with_extensions().0 {
+            Ok((cs, _, extensions)) => (Ok(cs), Ok(extensions), return_result, test_run_info),
+            Err(err) => (Err(err.clone()), Err(err), return_result, test_run_info),
+        }
+    }
+
+    fn execute_via_stackless_vm(
+        &self,
+        env: &GlobalEnv,
+        test_plan: &ModuleTestPlan,
+        function_name: &str,
+        test_info: &TestCase,
+    ) -> (VMResult<Vec<Vec<u8>>>, TestRunInfo, Option<String>) {
+        let now = Instant::now();
+
+        let settings = if self.verbose {
+            InterpreterSettings::verbose_default()
+        } else {
+            InterpreterSettings::default()
+        };
+        let interpreter = StacklessBytecodeInterpreter::new(env, None, settings);
+
+        // NOTE: as of now, `self.starting_storage_state` contains modules only and no resources.
+        // The modules are captured by `env: &GlobalEnv` and the default GlobalState captures the
+        // empty-resource state.
+        let global_state = GlobalState::default();
+        let (return_result, _, _) = interpreter.interpret(
+            &test_plan.module_id,
+            IdentStr::new(function_name).unwrap(),
+            &[], // no ty args, at least for now
+            &test_info.arguments,
+            &global_state,
+        );
+        let prop_check_result = interpreter.report_property_checking_results();
+
+        let test_run_info = TestRunInfo::new(
+            function_name.to_string(),
+            now.elapsed(),
+            // NOTE (mengxu) instruction counting on stackless VM might not be very useful because
+            // gas is not charged against stackless VM instruction.
+            0,
+        );
+        (return_result, test_run_info, prop_check_result)
+    }
+
+    fn exec_module_tests_move_vm_and_stackless_vm(
+        &self,
+        test_plan: &ModuleTestPlan,
+        output: &TestOutput<impl Write>,
+    ) -> TestStatistics {
+        // TODO: Somehow, paths of some temporary Move interface files are being passed in after those files
+        // have been removed. This is a dirty hack to work around the problem while we investigate the root
+        // cause.
+        let filtered_sources = self
+            .source_files
+            .iter()
+            .filter(|s| !s.contains("mv_interfaces"))
+            .cloned()
+            .collect::<Vec<_>>();
+
+        let stackless_model = if self.check_stackless_vm {
+            let model = run_model_builder_with_options_and_compilation_flags(
+                vec![PackagePaths {
+                    name: None,
+                    paths: filtered_sources,
+                    named_address_map: self.named_address_values.clone(),
+                }],
+                vec![],
+                ModelBuilderOptions::default(),
+                Flags::testing(),
+                Some(WarningFilters::unused_warnings_filter_for_test()),
+            )
+            .unwrap_or_else(|e| panic!("Unable to build stackless bytecode: {}", e));
+
+            if model.has_errors() {
+                let mut stderr = StandardStream::stderr(ColorChoice::Always);
+                model.report_diag(&mut stderr, Severity::Error);
+                panic!("Move model has errors");
+            }
+
+            Some(model)
+        } else {
+            None
+        };
+
+        let mut stats = TestStatistics::new();
+
+        for (function_name, test_info) in &test_plan.tests {
+            let (_cs_result, _ext_result, exec_result, test_run_info) =
+                self.execute_via_move_vm(test_plan, function_name, test_info);
+
+            if self.check_stackless_vm {
+                let (stackless_vm_result, _, prop_check_result) = self.execute_via_stackless_vm(
+                    stackless_model.as_ref().unwrap(),
+                    test_plan,
+                    function_name,
+                    test_info,
+                );
+                let move_vm_result = adapt_move_vm_result(exec_result.clone());
+                if stackless_vm_result != move_vm_result {
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(
+                            FailureReason::mismatch(move_vm_result, stackless_vm_result),
+                            test_run_info,
+                            None,
+                        ),
+                        test_plan,
+                    );
+                    continue;
+                }
+                if let Some(prop_failure) = prop_check_result {
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(
+                            FailureReason::property(prop_failure),
+                            test_run_info,
+                            None,
+                        ),
+                        test_plan,
+                    );
+                    continue;
+                }
+            }
+
+            match exec_result {
+                Err(err) => {
+                    let actual_err =
+                        MoveError(err.major_status(), err.sub_status(), err.location().clone());
+                    assert!(err.major_status() != StatusCode::EXECUTED);
+                    match test_info.expected_failure.as_ref() {
+                        Some(ExpectedFailure::Expected) => {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        Some(ExpectedFailure::ExpectedWithError(expected_err))
+                            if expected_err == &actual_err =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(code))
+                            if actual_err.0 == StatusCode::ABORTED
+                                && actual_err.1.is_some()
+                                && actual_err.1.unwrap() == *code =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        // incorrect cases
+                        Some(ExpectedFailure::ExpectedWithError(expected_err)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_error(expected_err.clone(), actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(expected_code)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_abort_deprecated(
+                                        *expected_code,
+                                        actual_err,
+                                    ),
+                                    test_run_info,
+                                    Some(err),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        None if err.major_status() == StatusCode::OUT_OF_GAS => {
+                            // Ran out of ticks, report a test timeout and log a test failure
+                            output.timeout(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::timeout(),
+                                    test_run_info,
+                                    Some(err),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        None => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::unexpected_error(actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                ),
+                                test_plan,
+                            )
+                        }
+                    }
+                }
+                Ok(_) => {
+                    // Expected the test to fail, but it executed
+                    if test_info.expected_failure.is_some() {
+                        output.fail(function_name);
+                        stats.test_failure(
+                            TestFailure::new(FailureReason::no_error(), test_run_info, None),
+                            test_plan,
+                        )
+                    } else {
+                        // Expected the test to execute fully and it did
+                        output.pass(function_name);
+                        stats.test_success(test_run_info, test_plan);
+                    }
+                }
+            }
+        }
+
+        stats
+    }
+
+    // TODO: comparison of results via different backends
+
+    fn exec_module_tests(
+        &self,
+        test_plan: &ModuleTestPlan,
+        writer: &Mutex<impl Write>,
+    ) -> TestStatistics {
+        let output = TestOutput { test_plan, writer };
+
+        self.exec_module_tests_move_vm_and_stackless_vm(test_plan, &output)
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/tests/.gitattributes b/vendors/move/crates/move-unit-test/tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/move-unit-test/tests/move_unit_test_testsuite.rs b/vendors/move/crates/move-unit-test/tests/move_unit_test_testsuite.rs
new file mode 100644
index 000000000..9c406d26f
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/move_unit_test_testsuite.rs
@@ -0,0 +1,91 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_command_line_common::testing::{
+    add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT,
+};
+use move_unit_test::{self, UnitTestingConfig};
+use regex::RegexBuilder;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+fn run_test_with_modifiers(
+    unit_test_config: UnitTestingConfig,
+    path: &Path,
+) -> anyhow::Result<Vec<((Vec<u8>, bool), PathBuf)>> {
+    let mut results = Vec::new();
+
+    let buffer = Vec::new();
+    let test_plan = unit_test_config.build_test_plan();
+    if test_plan.is_none() {
+        anyhow::bail!("No test plan constructed for {:?}", path);
+    }
+
+    results.push((
+        unit_test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, buffer)?,
+        path.with_extension(EXP_EXT),
+    ));
+
+    Ok(results)
+}
+
+// Runs all tests under the test/test_sources directory.
+fn run_test_impl(path: &Path) -> anyhow::Result<()> {
+    std::env::set_var("NO_COLOR", "1");
+    let update_baseline = read_env_update_baseline();
+    let source_files = vec![path.to_str().unwrap().to_owned()];
+    let unit_test_config = UnitTestingConfig {
+        num_threads: 1,
+        gas_limit: Some(1000),
+        source_files,
+        dep_files: move_stdlib::move_stdlib_files(),
+        named_address_values: move_stdlib::move_stdlib_named_addresses()
+            .into_iter()
+            .collect(),
+        report_stacktrace_on_abort: true,
+
+        ..UnitTestingConfig::default_with_bound(None)
+    };
+
+    let regex = RegexBuilder::new(r"(┌─ ).+/([^/]+)$")
+        .multi_line(true)
+        .build()
+        .unwrap();
+
+    for ((buffer, _), exp_path) in run_test_with_modifiers(unit_test_config, path)? {
+        let base_output = String::from_utf8(buffer)?;
+        let cleaned_output = regex.replacen(&base_output, 0, r"$1$2");
+        if update_baseline {
+            fs::write(&exp_path, &*cleaned_output)?
+        }
+
+        let exp_exists = exp_path.is_file();
+
+        if exp_exists {
+            let expected = fs::read_to_string(&exp_path)?;
+            if expected != cleaned_output {
+                let msg = format!(
+                    "Expected outputs differ for {:?}:\n{}",
+                    exp_path,
+                    format_diff(expected, cleaned_output)
+                );
+                anyhow::bail!(add_update_baseline_fix(msg));
+            }
+        } else {
+            let msg = format!("No expected output found for {:?}", path);
+            anyhow::bail!(add_update_baseline_fix(msg));
+        }
+    }
+
+    Ok(())
+}
+
+fn run_test(path: &Path) -> datatest_stable::Result<()> {
+    run_test_impl(path)?;
+    Ok(())
+}
+
+datatest_stable::harness!(run_test, "tests/test_sources", r".*\.move$");
diff --git a/vendors/move/crates/move-unit-test/tests/sources/A.move b/vendors/move/crates/move-unit-test/tests/sources/A.move
new file mode 100644
index 000000000..75d32f134
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/sources/A.move
@@ -0,0 +1,9 @@
+module 0x1::A {
+    #[test]
+    fun a() { }
+
+    #[test_only]
+    public fun a_call() {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/tests/sources/B.move b/vendors/move/crates/move-unit-test/tests/sources/B.move
new file mode 100644
index 000000000..8e37c3b60
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/sources/B.move
@@ -0,0 +1,24 @@
+module 0x1::B {
+    #[test_only]
+    use 0x1::A;
+
+    #[test]
+    fun b() { }
+
+    #[test]
+    public fun b_other() {
+        A::a_call()
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location=0x1::A)]
+    public fun b_other0() {
+        A::a_call()
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 1, location=0x1::A)]
+    public fun b_other1() {
+        A::a_call()
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_deps.rs b/vendors/move/crates/move-unit-test/tests/test_deps.rs
new file mode 100644
index 000000000..50437e043
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_deps.rs
@@ -0,0 +1,35 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+};
+use move_unit_test::{self, UnitTestingConfig};
+use std::path::PathBuf;
+
+// Make sure the compiled bytecode for dependencies is included, but the tests in them are not run.
+#[test]
+fn test_deps_arent_tested() {
+    let mut testing_config = UnitTestingConfig::default_with_bound(None)
+        .with_named_addresses(move_stdlib::move_stdlib_named_addresses());
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    let a_path = path.join("tests/sources/A.move");
+    let b_path = path.join("tests/sources/B.move");
+    let mut deps = move_stdlib::move_stdlib_files();
+    deps.push(a_path.to_string_lossy().to_string());
+
+    testing_config.source_files = vec![b_path.to_str().unwrap().to_owned()];
+    testing_config.dep_files = deps;
+
+    let test_plan = testing_config.build_test_plan().unwrap();
+
+    let mut iter = test_plan.module_tests.into_iter();
+    let (mod_id, _) = iter.next().unwrap();
+    let expected_mod_id = ModuleId::new(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        Identifier::new("B").unwrap(),
+    );
+    assert!(mod_id == expected_mod_id);
+    assert!(iter.next().is_none());
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/address_args.exp b/vendors/move/crates/move-unit-test/tests/test_sources/address_args.exp
new file mode 100644
index 000000000..f259c8e26
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/address_args.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_address
+[ PASS    ] 0x1::M::correct_addresses
+[ PASS    ] 0x1::M::wrong_address
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/address_args.move b/vendors/move/crates/move-unit-test/tests/test_sources/address_args.move
new file mode 100644
index 000000000..4faabd02d
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/address_args.move
@@ -0,0 +1,22 @@
+address 0x1 {
+module M {
+    const ErrorCode: u64 = 100;
+
+    #[test(a = @0x42)]
+    fun correct_address(a: address) {
+        assert!(a == @0x42, 100);
+    }
+
+    #[test(a = @0x42, b = @0x43)]
+    fun correct_addresses(a: address, b: address) {
+        assert!(a == @0x42, 100);
+        assert!(b == @0x43, 101);
+    }
+
+    #[test(a = @0x42)]
+    #[expected_failure(abort_code = ErrorCode)]
+    fun wrong_address(a: address) {
+        assert!(a == @0x43, 100);
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.exp b/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.exp
new file mode 100644
index 000000000..bdcc00dec
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.exp
@@ -0,0 +1,6 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::u64_add_overflow
+[ PASS    ] 0x1::M::u64_div_by_zero
+[ PASS    ] 0x1::M::u64_mul_overflow
+[ PASS    ] 0x1::M::u64_sub_underflow
+Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.move b/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.move
new file mode 100644
index 000000000..74185c75d
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/arithmetic_errors.move
@@ -0,0 +1,27 @@
+address 0x1 {
+module M {
+    #[test]
+    #[expected_failure]
+    fun u64_sub_underflow() {
+        0 - 1;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_add_overflow() {
+        18446744073709551615 + 1;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_div_by_zero() {
+        1/0;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_mul_overflow() {
+        4294967296 * 4294967296;
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.exp b/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.exp
new file mode 100644
index 000000000..06604b213
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.exp
@@ -0,0 +1,4 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::make_sure_not_other_number
+[ PASS    ] 0x1::M::make_sure_number_matches
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.move b/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.move
new file mode 100644
index 000000000..7a6da03ba
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/construct_data.move
@@ -0,0 +1,33 @@
+address 0x1 {
+module B {
+    #[test_only]
+    struct TestingStruct has drop { x: u64 }
+
+    #[test_only]
+    public fun construct_with_number(x: u64): TestingStruct {
+        TestingStruct { x }
+    }
+
+    #[test_only]
+    public fun get_struct_x_field(s: &TestingStruct): u64 {
+        s.x
+    }
+}
+
+module M {
+    #[test_only]
+    use 0x1::B;
+
+    #[test]
+    fun make_sure_number_matches() {
+        let s = B::construct_with_number(0);
+        assert!(B::get_struct_x_field(&s) == 0, 0);
+    }
+
+    #[test, expected_failure]
+    fun make_sure_not_other_number() {
+        let s = B::construct_with_number(0);
+        assert!(B::get_struct_x_field(&s) != 0, 0);
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.exp b/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.exp
new file mode 100644
index 000000000..e814ce334
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.exp
@@ -0,0 +1,24 @@
+Running Move unit tests
+[ FAIL    ] 0x1::B::failing_test
+[ PASS    ] 0x1::M::dummy_test
+
+Test failures:
+
+Failures in 0x1::B:
+
+┌── failing_test ──────
+│ error[E11001]: test failure
+│   ┌─ cross_module_aborts.move:5:9
+│   │
+│ 4 │     public fun this_aborts() {
+│   │                ----------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	B::failing_test(tests/test_sources/cross_module_aborts.move:19)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.move b/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.move
new file mode 100644
index 000000000..519690185
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/cross_module_aborts.move
@@ -0,0 +1,22 @@
+address 0x1 {
+module M {
+    #[test_only]
+    public fun this_aborts() {
+        abort 0
+    }
+
+    #[test]
+    fun dummy_test() { }
+}
+
+module B {
+
+    #[test_only]
+    use 0x1::M;
+
+    #[test]
+    fun failing_test() {
+        M::this_aborts()
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.exp b/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.exp
new file mode 100644
index 000000000..3a1e8fabf
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::do_nothing
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.move b/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.move
new file mode 100644
index 000000000..8aa9bb708
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/do_nothing.move
@@ -0,0 +1,6 @@
+address 0x1 {
+module M {
+    #[test]
+    fun do_nothing() {}
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.exp b/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
new file mode 100644
index 000000000..feefbb173
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
@@ -0,0 +1,18 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::fail
+[ FAIL    ] 0x1::M::fail_with_code
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── fail_with_code ──────
+│ Test did not error as expected
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.move b/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.move
new file mode 100644
index 000000000..e7c022e83
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/expected_abort_no_abort.move
@@ -0,0 +1,9 @@
+address 0x1 {
+module M {
+    #[test, expected_failure]
+    fun fail() { }
+
+    #[test, expected_failure(abort_code=0, location=0x1::M)]
+    fun fail_with_code() { }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.exp b/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.exp
new file mode 100644
index 000000000..b60d1451f
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.exp
@@ -0,0 +1,35 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::native_abort_good_right_code
+[ FAIL    ] 0x1::A::native_abort_good_wrong_code
+[ FAIL    ] 0x1::A::native_abort_unexpected_abort
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── native_abort_good_wrong_code ──────
+│ error[E11001]: test failure
+│    ┌─ native_abort.move:12:9
+│    │
+│ 11 │     fun native_abort_good_wrong_code() {
+│    │         ---------------------------- In this function in 0x1::A
+│ 12 │         vector::borrow(&vector::empty<u64>(), 1);
+│    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test did not error as expected. Expected test to give a vector operation error with sub-status 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A but instead it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── native_abort_unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ native_abort.move:6:9
+│   │
+│ 5 │     fun native_abort_unexpected_abort() {
+│   │         ----------------------------- In this function in 0x1::A
+│ 6 │         vector::borrow(&vector::empty<u64>(), 1);
+│   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 1; failed: 2
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.move b/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.move
new file mode 100644
index 000000000..ca5ec24c1
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/native_abort.move
@@ -0,0 +1,20 @@
+module 0x1::A {
+    use std::vector;
+
+    #[test]
+    fun native_abort_unexpected_abort() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=0, location=0x1::A)]
+    fun native_abort_good_wrong_code() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=1, location=0x1::A)]
+    fun native_abort_good_right_code() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.exp b/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.exp
new file mode 100644
index 000000000..fc120b0c4
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.exp
@@ -0,0 +1,13 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::non_existent_native
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── non_existent_native ──────
+│ INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION.
+│ Test was not expected to error, but it gave a UNEXPECTED_VERIFIER_ERROR (code 2017) error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 1; passed: 0; failed: 1
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.move b/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.move
new file mode 100644
index 000000000..2dd99823a
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/non_exsistent_native.move
@@ -0,0 +1,10 @@
+address 0x1 {
+module M {
+    native fun foo();
+
+    #[test]
+    fun non_existent_native() {
+        foo()
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.exp b/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.exp
new file mode 100644
index 000000000..994920785
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.exp
@@ -0,0 +1,7 @@
+Running Move unit tests
+[ PASS    ] 0x42::m::t0
+[ PASS    ] 0x42::m::t1
+[ PASS    ] 0x42::m::t2
+[ PASS    ] 0x42::m::t3
+[ PASS    ] 0x42::m::t4
+Test result: OK. Total tests: 5; passed: 5; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.move b/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.move
new file mode 100644
index 000000000..c0a81b502
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/other_expected_failures.move
@@ -0,0 +1,32 @@
+module 0x42::m {
+    #[test]
+    #[expected_failure(vector_error, minor_status=1, location=Self)]
+    fun t0() {
+        std::vector::borrow(&vector[0], 2);
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t1() {
+        1 / 0;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t2() {
+        0 - 1;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t3() {
+        1 % 0;
+    }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self)]
+    fun t4() {
+        loop {}
+    }
+
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.exp b/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.exp
new file mode 100644
index 000000000..92c4e1bc5
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.exp
@@ -0,0 +1,40 @@
+Running Move unit tests
+[ FAIL    ] 0x42::m::t0
+[ FAIL    ] 0x42::m::t1
+[ FAIL    ] 0x42::m::t2
+
+Test failures:
+
+Failures in 0x42::m:
+
+┌── t0 ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── t1 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:10:10
+│    │
+│  9 │ fun t1() {
+│    │     -- In this function in 0x42::m
+│ 10 │     loop {}
+│    │          ^^ Test did not error as expected. Expected test to give an arithmetic error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it ran out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── t2 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:16:7
+│    │
+│ 15 │ fun t2() {
+│    │     -- In this function in 0x42::m
+│ 16 │     0 - 1;
+│    │       ^ Test did not error as expected. Expected test to run out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it gave an arithmetic error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.move b/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.move
new file mode 100644
index 000000000..78e171ae3
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/out_of_gas.move
@@ -0,0 +1,19 @@
+module 0x42::m {
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t0() {}
+
+#[test]
+#[expected_failure(arithmetic_error, location=Self)]
+fun t1() {
+    loop {}
+}
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t2() {
+    0 - 1;
+}
+
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.exp b/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.exp
new file mode 100644
index 000000000..74debdf69
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::Module::other_module_aborts
+[ PASS    ] 0x1::Module::tests_a
+[ PASS    ] 0x1::Module::tests_aborts
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.move b/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.move
new file mode 100644
index 000000000..4c5b0c42c
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/proposal_test.move
@@ -0,0 +1,50 @@
+// This is a test based on the example in the unit testing proposal
+address 0x1 {
+module TestonlyModule {
+    #[test_only]
+    public fun aborts() {
+        abort 42
+    }
+}
+
+module Module {
+    fun a(a: u64): bool {
+        a == 10
+    }
+
+    fun aborts() {
+       abort 10
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // unit tests
+    ///////////////////////////////////////////////////////////////////////////
+
+    // A test-only module import
+    #[test_only]
+    use 0x1::TestonlyModule;
+
+    // A test only struct. This will only be included in test mode.
+    #[test_only, allow(unused_field)]
+    struct C<T> has drop, key, store { x: T }
+
+    #[test] // test entry point.
+    fun tests_a() { // an actual test that will be run
+        assert!(a(0) == false, 0);
+        assert!(a(10), 1);
+    }
+
+    // check that this test aborts with the expected error code
+    #[test]
+    #[expected_failure(abort_code=10, location=Self)]
+    fun tests_aborts() {
+       aborts()
+    }
+
+    #[test]
+    #[expected_failure(abort_code=42, location=0x1::TestonlyModule)]
+    fun other_module_aborts() {
+       TestonlyModule::aborts()
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.exp b/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.exp
new file mode 100644
index 000000000..e3e6f09ff
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.exp
@@ -0,0 +1,30 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::multi_signer_fail
+[ PASS    ] 0x1::M::multi_signer_pass
+[ PASS    ] 0x1::M::multi_signer_pass_expected_failure
+[ FAIL    ] 0x1::M::single_signer_fail
+[ PASS    ] 0x1::M::single_signer_pass
+[ PASS    ] 0x1::M::test_correct_signer_arg_addrs
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── multi_signer_fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── single_signer_fail ──────
+│ error[E11001]: test failure
+│   ┌─ signer_args.move:9:9
+│   │
+│ 8 │     fun single_signer_fail(_a: signer) {
+│   │         ------------------ In this function in 0x1::M
+│ 9 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 4; failed: 2
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.move b/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.move
new file mode 100644
index 000000000..7b8edcb5d
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/signer_args.move
@@ -0,0 +1,32 @@
+address 0x1 {
+module M {
+
+    #[test(_a=@0x1)]
+    fun single_signer_pass(_a: signer) { }
+
+    #[test(_a=@0x1)]
+    fun single_signer_fail(_a: signer) {
+        abort 0
+    }
+
+    #[test(_a=@0x1, _b=@0x2)]
+    fun multi_signer_pass(_a: signer, _b: signer) { }
+
+    #[test(_a=@0x1, _b=@0x2), expected_failure]
+    fun multi_signer_fail(_a: signer, _b: signer) { }
+
+    #[test(_a=@0x1, _b=@0x2), expected_failure]
+    fun multi_signer_pass_expected_failure(_a: signer, _b: signer) {
+            abort 0
+    }
+
+    #[test_only]
+    use std::signer;
+
+    #[test(a=@0x1, b=@0x2)]
+    fun test_correct_signer_arg_addrs(a: signer, b: signer) {
+        assert!(signer::address_of(&a) == @0x1, 0);
+        assert!(signer::address_of(&b) == @0x2, 1);
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/timeout.exp b/vendors/move/crates/move-unit-test/tests/test_sources/timeout.exp
new file mode 100644
index 000000000..fd4a496f3
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/timeout.exp
@@ -0,0 +1,29 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::no_timeout
+[ FAIL    ] 0x1::M::no_timeout_fail
+[ PASS    ] 0x1::M::no_timeout_while_loop
+[ TIMEOUT ] 0x1::M::timeout_fail
+[ PASS    ] 0x1::M::timeout_fail_with_expected_failure
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── no_timeout_fail ──────
+│ error[E11001]: test failure
+│    ┌─ timeout.move:18:29
+│    │
+│ 18 │     fun no_timeout_fail() { abort 0 }
+│    │         ---------------     ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│    │         │                    
+│    │         In this function in 0x1::M
+│ 
+│ 
+└──────────────────
+
+
+┌── timeout_fail ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/timeout.move b/vendors/move/crates/move-unit-test/tests/test_sources/timeout.move
new file mode 100644
index 000000000..1c0458302
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/timeout.move
@@ -0,0 +1,28 @@
+address 0x1 {
+module M {
+    #[test]
+    fun timeout_fail() {
+        while (true) {}
+    }
+
+    #[test]
+    #[expected_failure]
+    fun timeout_fail_with_expected_failure() {
+        while (true) {}
+    }
+
+    #[test]
+    fun no_timeout() { }
+
+    #[test]
+    fun no_timeout_fail() { abort 0 }
+
+    #[test]
+    fun no_timeout_while_loop() {
+        let i = 0;
+        while (i < 10) {
+            i = i + 1;
+        };
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.exp b/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.exp
new file mode 100644
index 000000000..f86d8033e
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.exp
@@ -0,0 +1,72 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_abort_code
+[ PASS    ] 0x1::M::just_test_failure
+[ FAIL    ] 0x1::M::unexpected_abort
+[ FAIL    ] 0x1::M::unexpected_abort_in_native_function
+[ FAIL    ] 0x1::M::unexpected_abort_in_other_function
+[ FAIL    ] 0x1::M::wrong_abort_code
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ unexpected_abort.move:5:9
+│   │
+│ 4 │     public fun unexpected_abort() {
+│   │                ---------------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── unexpected_abort_in_native_function ──────
+│ error[E11001]: test failure
+│    ┌─ string.move:92:16
+│    │
+│ 92 │     native fun internal_sub_string(v: &vector<u8>, i: u64, j: u64): vector<u8>;
+│    │                ^^^^^^^^^^^^^^^^^^^
+│    │                │
+│    │                Test was not expected to error, but it aborted with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::string rooted here
+│    │                In this function in 0x1::string
+│ 
+│ 
+│ stack trace
+│ 	M::abort_in_native(tests/test_sources/unexpected_abort.move:43)
+│ 	M::unexpected_abort_in_native_function(tests/test_sources/unexpected_abort.move:39)
+│ 
+└──────────────────
+
+
+┌── unexpected_abort_in_other_function ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:28:9
+│    │
+│ 27 │     fun abort_in_other_function() {
+│    │         ----------------------- In this function in 0x1::M
+│ 28 │         abort 1
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	M::unexpected_abort_in_other_function(tests/test_sources/unexpected_abort.move:33)
+│ 
+└──────────────────
+
+
+┌── wrong_abort_code ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:11:9
+│    │
+│ 10 │     public fun wrong_abort_code() {
+│    │                ---------------- In this function in 0x1::M
+│ 11 │         abort 0
+│    │         ^^^^^^^ Test did not error as expected. Expected test to abort with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M but instead it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 2; failed: 4
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.move b/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.move
new file mode 100644
index 000000000..2eaa062d0
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/unexpected_abort.move
@@ -0,0 +1,46 @@
+address 0x1 {
+module M {
+    #[test]
+    public fun unexpected_abort() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure(abort_code=1, location=0x1::M)]
+    public fun wrong_abort_code() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure(abort_code=0, location=0x1::M)]
+    public fun correct_abort_code() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure]
+    public fun just_test_failure() {
+        abort 0
+    }
+
+    #[test_only]
+    fun abort_in_other_function() {
+        abort 1
+    }
+
+    #[test]
+    fun unexpected_abort_in_other_function() {
+        abort_in_other_function()
+    }
+
+
+    #[test]
+    fun unexpected_abort_in_native_function() {
+        abort_in_native()
+    }
+
+    fun abort_in_native() {
+        std::string::internal_sub_string_for_testing(&vector[0], 1, 0);
+    }
+}
+}
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.exp b/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.exp
new file mode 100644
index 000000000..fd927d6fd
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::poison_call
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.move b/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.move
new file mode 100644
index 000000000..ab7ddd8db
--- /dev/null
+++ b/vendors/move/crates/move-unit-test/tests/test_sources/use_unit_test_module.move
@@ -0,0 +1,8 @@
+module 0x1::M {
+    use std::unit_test;
+
+    #[test]
+    fun poison_call() {
+        unit_test::create_signers_for_testing(0);
+    }
+}
diff --git a/vendors/move/crates/move-vm-config/Cargo.toml b/vendors/move/crates/move-vm-config/Cargo.toml
new file mode 100644
index 000000000..333d6b111
--- /dev/null
+++ b/vendors/move/crates/move-vm-config/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "move-vm-config"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+repository = "https://github.com/move-language/move"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+move-binary-format.workspace = true
diff --git a/vendors/move/crates/move-vm-config/src/lib.rs b/vendors/move/crates/move-vm-config/src/lib.rs
new file mode 100644
index 000000000..3842116f3
--- /dev/null
+++ b/vendors/move/crates/move-vm-config/src/lib.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod runtime;
+pub mod verifier;
diff --git a/vendors/move/crates/move-vm-config/src/runtime.rs b/vendors/move/crates/move-vm-config/src/runtime.rs
new file mode 100644
index 000000000..7934026d9
--- /dev/null
+++ b/vendors/move/crates/move-vm-config/src/runtime.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::verifier::{VerifierConfig, DEFAULT_MAX_CONSTANT_VECTOR_LEN};
+use move_binary_format::file_format_common::VERSION_MAX;
+
+pub const DEFAULT_MAX_VALUE_NEST_DEPTH: u64 = 128;
+
+/// Dynamic config options for the Move VM.
+pub struct VMConfig {
+    pub verifier: VerifierConfig,
+    pub max_binary_format_version: u32,
+    // When this flag is set to true, MoveVM will perform type check at every instruction
+    // execution to ensure that type safety cannot be violated at runtime.
+    pub paranoid_type_checks: bool,
+    pub runtime_limits_config: VMRuntimeLimitsConfig,
+    // When this flag is set to true, MoveVM will check invariant violation in swap_loc
+    pub enable_invariant_violation_check_in_swap_loc: bool,
+    // When this flag is set to true, MoveVM will check that there are no trailing bytes after
+    // deserializing and check for no metadata bytes
+    pub check_no_extraneous_bytes_during_deserialization: bool,
+    // Configs for profiling VM
+    #[cfg(debug_assertions)]
+    pub profiler_config: VMProfilerConfig,
+    // When this flag is set to true, errors from the VM will be augmented with execution state
+    // (stacktrace etc.)
+    pub error_execution_state: bool,
+}
+
+impl Default for VMConfig {
+    fn default() -> Self {
+        Self {
+            verifier: VerifierConfig::default(),
+            max_binary_format_version: VERSION_MAX,
+            paranoid_type_checks: false,
+            runtime_limits_config: VMRuntimeLimitsConfig::default(),
+            enable_invariant_violation_check_in_swap_loc: true,
+            check_no_extraneous_bytes_during_deserialization: false,
+            #[cfg(debug_assertions)]
+            profiler_config: VMProfilerConfig::default(),
+            error_execution_state: true,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct VMRuntimeLimitsConfig {
+    /// Maximum number of items that can be pushed into a vec
+    pub vector_len_max: u64,
+    /// Maximum value nest depth for structs
+    pub max_value_nest_depth: Option<u64>,
+}
+
+impl Default for VMRuntimeLimitsConfig {
+    fn default() -> Self {
+        Self {
+            vector_len_max: DEFAULT_MAX_CONSTANT_VECTOR_LEN,
+            max_value_nest_depth: Some(DEFAULT_MAX_VALUE_NEST_DEPTH),
+        }
+    }
+}
+
+#[cfg(debug_assertions)]
+#[derive(Clone, Debug)]
+pub struct VMProfilerConfig {
+    /// Base path for files
+    pub base_path: std::path::PathBuf,
+    /// Whether or not to track bytecode instructions
+    pub track_bytecode_instructions: bool,
+    /// Whether or not to use the long name for functions
+    pub use_long_function_name: bool,
+}
+
+#[cfg(debug_assertions)]
+impl std::default::Default for VMProfilerConfig {
+    fn default() -> Self {
+        Self {
+            base_path: std::path::PathBuf::from("."),
+            track_bytecode_instructions: false,
+            use_long_function_name: false,
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm-config/src/verifier.rs b/vendors/move/crates/move-vm-config/src/verifier.rs
new file mode 100644
index 000000000..1c0a5985b
--- /dev/null
+++ b/vendors/move/crates/move-vm-config/src/verifier.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const DEFAULT_MAX_CONSTANT_VECTOR_LEN: u64 = 1024 * 1024;
+pub const DEFAULT_MAX_IDENTIFIER_LENGTH: u64 = 128;
+
+#[derive(Debug, Clone)]
+pub struct VerifierConfig {
+    pub max_loop_depth: Option<usize>,
+    pub max_function_parameters: Option<usize>,
+    pub max_generic_instantiation_length: Option<usize>,
+    pub max_basic_blocks: Option<usize>,
+    pub max_value_stack_size: usize,
+    pub max_type_nodes: Option<usize>,
+    pub max_push_size: Option<usize>,
+    pub max_dependency_depth: Option<usize>,
+    pub max_struct_definitions: Option<usize>,
+    pub max_fields_in_struct: Option<usize>,
+    pub max_function_definitions: Option<usize>,
+    pub max_constant_vector_len: Option<u64>,
+    pub max_back_edges_per_function: Option<usize>,
+    pub max_back_edges_per_module: Option<usize>,
+    pub max_basic_blocks_in_script: Option<usize>,
+    pub max_per_fun_meter_units: Option<u128>,
+    pub max_per_mod_meter_units: Option<u128>,
+    pub max_idenfitier_len: Option<u64>,
+}
+
+impl Default for VerifierConfig {
+    fn default() -> Self {
+        Self {
+            max_loop_depth: None,
+            max_function_parameters: None,
+            max_generic_instantiation_length: None,
+            max_basic_blocks: None,
+            max_type_nodes: None,
+            // Max size set to 1024 to match the size limit in the interpreter.
+            max_value_stack_size: 1024,
+            // Max number of pushes in one function
+            max_push_size: None,
+            // Max depth in dependency tree for both direct and friend dependencies
+            max_dependency_depth: None,
+            // Max count of structs in a module
+            max_struct_definitions: None,
+            // Max count of fields in a struct
+            max_fields_in_struct: None,
+            // Max count of functions in a module
+            max_function_definitions: None,
+            // Max size set to 10000 to restrict number of pushes in one function
+            // max_push_size: Some(10000),
+            // max_dependency_depth: Some(100),
+            // max_struct_definitions: Some(200),
+            // max_fields_in_struct: Some(30),
+            // max_function_definitions: Some(1000),
+            max_back_edges_per_function: None,
+            max_back_edges_per_module: None,
+            max_basic_blocks_in_script: None,
+            /// General metering for the verifier. This defaults to a bound which should align
+            /// with production, so all existing test cases apply it.
+            max_per_fun_meter_units: Some(1000 * 8000),
+            max_per_mod_meter_units: Some(1000 * 8000),
+            max_constant_vector_len: Some(DEFAULT_MAX_CONSTANT_VECTOR_LEN),
+            max_idenfitier_len: Some(DEFAULT_MAX_IDENTIFIER_LENGTH),
+        }
+    }
+}
+
+impl VerifierConfig {
+    /// Returns truly unbounded config, even relaxing metering.
+    pub fn unbounded() -> Self {
+        Self {
+            max_per_fun_meter_units: None,
+            max_per_mod_meter_units: None,
+            ..VerifierConfig::default()
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/Cargo.toml b/vendors/move/crates/move-vm-integration-tests/Cargo.toml
new file mode 100644
index 000000000..387343701
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "move-vm-integration-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move VM Integration Tests"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.71"
+fail = { workspace = true, features = ["failpoints"] }
+tempfile.workspace = true
+memory-stats = "1.0.0"
+
+move-core-types.workspace = true
+move-binary-format.workspace = true
+move-bytecode-verifier.workspace = true
+move-compiler.workspace = true
+move-vm-config.workspace = true
+move-vm-runtime.workspace = true
+move-vm-profiler.workspace = true
+move-vm-types.workspace = true
+move-vm-test-utils.workspace = true
+move-stdlib.workspace = true
+
+[features]
+default = []
+
+[[bin]]
+name = "instantiation"
+path = "src/tests/instantiation_tests.rs"
diff --git a/vendors/move/crates/move-vm-integration-tests/src/compiler.rs b/vendors/move/crates/move-vm-integration-tests/src/compiler.rs
new file mode 100644
index 000000000..1f1f3c645
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/compiler.rs
@@ -0,0 +1,69 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler as MoveCompiler};
+use std::{fs::File, io::Write, path::Path};
+use tempfile::tempdir;
+
+pub fn compile_units(s: &str) -> Result<Vec<AnnotatedCompiledUnit>> {
+    let dir = tempdir()?;
+
+    let file_path = dir.path().join("modules.move");
+    {
+        let mut file = File::create(&file_path)?;
+        writeln!(file, "{}", s)?;
+    }
+
+    let (_, units) = MoveCompiler::from_files(
+        vec![file_path.to_str().unwrap().to_string()],
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()?;
+
+    dir.close()?;
+
+    Ok(units)
+}
+
+pub fn expect_modules(
+    units: impl IntoIterator<Item = AnnotatedCompiledUnit>,
+) -> impl Iterator<Item = Result<CompiledModule>> {
+    units.into_iter().map(|unit| match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => Ok(annot_module.named_module.module),
+        AnnotatedCompiledUnit::Script(_) => bail!("expected modules got script"),
+    })
+}
+
+pub fn compile_modules_in_file(path: &Path) -> Result<Vec<CompiledModule>> {
+    let (_, units) = MoveCompiler::from_files(
+        vec![path.to_str().unwrap().to_string()],
+        vec![],
+        std::collections::BTreeMap::<String, _>::new(),
+    )
+    .build_and_report()?;
+
+    expect_modules(units).collect()
+}
+
+#[allow(dead_code)]
+pub fn compile_modules(s: &str) -> Result<Vec<CompiledModule>> {
+    expect_modules(compile_units(s)?).collect()
+}
+
+pub fn as_module(unit: AnnotatedCompiledUnit) -> CompiledModule {
+    match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => annot_module.named_module.module,
+        AnnotatedCompiledUnit::Script(_) => panic!("expected module got script"),
+    }
+}
+
+pub fn as_script(unit: AnnotatedCompiledUnit) -> CompiledScript {
+    match unit {
+        AnnotatedCompiledUnit::Module(_) => panic!("expected script got module"),
+        AnnotatedCompiledUnit::Script(annot_script) => annot_script.named_script.script,
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/lib.rs b/vendors/move/crates/move-vm-integration-tests/src/lib.rs
new file mode 100644
index 000000000..ed93b8f6f
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/lib.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![cfg(test)]
+
+mod compiler;
+mod tests;
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/bad_entry_point_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/bad_entry_point_tests.rs
new file mode 100644
index 000000000..bde1cfa1b
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/bad_entry_point_tests.rs
@@ -0,0 +1,73 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::ModuleId,
+    runtime_value::{serialize_values, MoveValue},
+    vm_status::StatusType,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{BlankStorage, InMemoryStorage};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn call_non_existent_module() {
+    let vm = MoveVM::new(vec![]).unwrap();
+    let storage = BlankStorage;
+
+    let mut sess = vm.new_session(&storage);
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let err = sess
+        .execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap_err();
+
+    assert_eq!(err.status_type(), StatusType::Verification);
+}
+
+#[test]
+fn call_non_existent_function() {
+    let code = r#"
+        module {{ADDR}}::M {}
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let err = sess
+        .execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap_err();
+
+    assert_eq!(err.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/bad_storage_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/bad_storage_tests.rs
new file mode 100644
index 000000000..923b50e4b
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/bad_storage_tests.rs
@@ -0,0 +1,439 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::{Location, PartialVMError, VMError};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn test_malformed_module() {
+    // Compile module M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+    "#;
+
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    // Publish M and call M::foo. No errors should be thrown.
+    {
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(m.self_id(), blob.clone());
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Start over with a fresh storage and publish a corrupted version of M.
+    // A fresh VM needs to be used whenever the storage has been modified or otherwise the
+    // loader cache gets out of sync.
+    //
+    // Try to call M::foo again and the module should fail to load, causing an
+    // invariant violation error.
+    {
+        blob[0] = 0xde;
+        blob[1] = 0xad;
+        blob[2] = 0xbe;
+        blob[3] = 0xef;
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_unverifiable_module() {
+    // Compile module M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+    "#;
+
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    // Publish M and call M::foo to make sure it works.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        let mut blob = vec![];
+        m.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Erase the body of M::foo to make it fail verification.
+    // Publish this modified version of M and the VM should fail to load it.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        let mut m = m;
+        m.function_defs[0].code.as_mut().unwrap().code = vec![];
+        let mut blob = vec![];
+        m.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_missing_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_m = vec![];
+    m.serialize(&mut blob_m).unwrap();
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish only N and try to call N::bar. The VM should fail to find M and raise
+    // an invariant violation.
+    {
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_malformed_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_m = vec![];
+    m.serialize(&mut blob_m).unwrap();
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m.clone());
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish N and a corrupted version of M and try to call N::bar, the VM should fail to load M.
+    {
+        blob_m[0] = 0xde;
+        blob_m[1] = 0xad;
+        blob_m[2] = 0xbe;
+        blob_m[3] = 0xef;
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_unverifiable_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut blob_m = vec![];
+        m.serialize(&mut blob_m).unwrap();
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish N and an unverifiable version of M and try to call N::bar, the VM should fail to load M.
+    {
+        let mut m = m;
+        m.function_defs[0].code.as_mut().unwrap().code = vec![];
+        let mut blob_m = vec![];
+        m.serialize(&mut blob_m).unwrap();
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+struct BogusStorage {
+    bad_status_code: StatusCode,
+}
+
+impl LinkageResolver for BogusStorage {
+    type Error = VMError;
+
+    /// Don't do any relocation so module and resource loading can produce errors
+    fn relocate(&self, module_id: &ModuleId) -> Result<ModuleId, Self::Error> {
+        Ok(module_id.clone())
+    }
+}
+
+impl ModuleResolver for BogusStorage {
+    type Error = VMError;
+
+    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        Err(PartialVMError::new(self.bad_status_code).finish(Location::Undefined))
+    }
+}
+
+impl ResourceResolver for BogusStorage {
+    type Error = VMError;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        Err(PartialVMError::new(self.bad_status_code).finish(Location::Undefined))
+    }
+}
+
+const LIST_OF_ERROR_CODES: &[StatusCode] = &[
+    StatusCode::UNKNOWN_VALIDATION_STATUS,
+    StatusCode::INVALID_SIGNATURE,
+    StatusCode::UNKNOWN_VERIFICATION_ERROR,
+    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    StatusCode::UNKNOWN_BINARY_ERROR,
+    StatusCode::UNKNOWN_RUNTIME_STATUS,
+    StatusCode::UNKNOWN_STATUS,
+];
+
+#[test]
+fn test_storage_returns_bogus_error_when_loading_module() {
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    for error_code in LIST_OF_ERROR_CODES {
+        let storage = BogusStorage {
+            bad_status_code: *error_code,
+        };
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/binary_format_version.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/binary_format_version.rs
new file mode 100644
index 000000000..615ed55ba
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/binary_format_version.rs
@@ -0,0 +1,140 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{basic_test_module, basic_test_script},
+    file_format_common::VERSION_MAX,
+};
+use move_core_types::{account_address::AccountAddress, vm_status::StatusCode};
+use move_vm_config::runtime::VMConfig;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+#[test]
+fn test_publish_module_with_custom_max_binary_format_version() {
+    let m = basic_test_module();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    m.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    m.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.publish_module(
+            b_new.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        assert_eq!(
+            sess.publish_module(
+                b_new.clone(),
+                *m.self_id().address(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err()
+            .major_status(),
+            StatusCode::UNKNOWN_VERSION
+        );
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+}
+
+#[test]
+fn test_run_script_with_custom_max_binary_format_version() {
+    let s = basic_test_script();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    s.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    s.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+            .unwrap();
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        assert_eq!(
+            sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+                .unwrap_err()
+                .major_status(),
+            StatusCode::CODE_DESERIALIZATION_ERROR
+        );
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/depth_tests_modules.move b/vendors/move/crates/move-vm-integration-tests/src/tests/depth_tests_modules.move
new file mode 100644
index 000000000..22f0c4c9f
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/depth_tests_modules.move
@@ -0,0 +1,113 @@
+address 0x2 {
+module A {
+    struct S has copy, drop {
+        f1: 0x2::B::S,
+        f2: 0x2::C::S,
+    }
+
+      struct Box<T> has copy, drop, store { x: T }
+      struct Box3<T> has copy, drop, store { x: Box<Box<T>> }
+      struct Box7<T> has copy, drop, store { x: Box3<Box3<T>> }
+      struct Box15<T> has copy, drop, store { x: Box7<Box7<T>> }
+      struct Box31<T> has copy, drop, store { x: Box15<Box15<T>> }
+      struct Box63<T> has copy, drop, store { x: Box31<Box31<T>> }
+      struct Box127<T> has copy, drop, store { x: Box63<Box63<T>> }
+}
+
+module B {
+    struct S has copy, drop {
+        f1: u64,
+        f2: u128,
+    }
+}
+module C {
+    struct S has copy, drop {
+        f1: address,
+        f2: bool,
+    }
+}
+
+module D {
+    struct S has copy, drop {
+        f1: 0x2::B::S,
+    }
+}
+
+module E {
+    struct S<T> has copy, drop {
+        f1: 0x2::F::S<T>,
+        f2: u64,
+    }
+}
+
+module F {
+    struct S<T> has copy, drop {
+        f1: T,
+        f2: u64,
+    }
+}
+
+module G {
+    struct S<A, B> has copy, drop {
+        f1: 0x2::H::S<B, A>,
+        f2: u64,
+    }
+}
+
+module H {
+    struct S<A, B> has copy, drop {
+        f1: 0x2::F::S<A>,
+        f2: 0x2::E::S<B>,
+        f3: 0x2::E::S<0x2::F::S<B>>,
+        f4: A,
+        f5: B,
+        f6: u64,
+    }
+}
+
+module I {
+    struct S<A, B> {
+        f1: F<A>,
+        f2: E<B>,
+        f3: E<F<B>>,
+        f4: E<F<F<B>>>,
+        f5: E<F<F<LL<A, B>>>>,
+        f6: A,
+        f7: B,
+        f8: u64,
+    }
+
+    struct E<T> {
+        f1: F<T>,
+        f2: u64,
+    }
+
+    struct F<T> {
+        f1: T,
+        f2: u64,
+    }
+
+    struct H<T> {
+        f1: T,
+        f2: u64,
+    }
+
+    struct G<phantom T> {
+        f: H<u64>,
+    }
+
+    struct L<T> {
+        g1: G<T>,
+        g2: H<T>,
+    }
+
+    struct LL<phantom A, B> {
+        g1: G<A>,
+        g2: H<B>,
+    }
+
+    struct N<phantom Y> {
+        f: u64
+    }
+}
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs
new file mode 100644
index 000000000..44d59dcd1
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs
@@ -0,0 +1,139 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::convert::TryInto;
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event},
+    identifier::Identifier,
+    language_storage::ModuleId,
+    runtime_value::{serialize_values, MoveValue},
+    u256::U256,
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+const TEST_MODULE_ID: &str = "M";
+const EXPECT_MUTREF_OUT_VALUE: u64 = 90;
+const USE_MUTREF_LABEL: &str = "use_mutref";
+const USE_REF_LABEL: &str = "use_ref";
+const FUN_NAMES: [&str; 2] = [USE_MUTREF_LABEL, USE_REF_LABEL];
+
+// ensure proper errors are returned when ref & mut ref args fail to deserialize
+#[test]
+fn fail_arg_deserialize() {
+    let mod_code = setup_module();
+    // all of these should fail to deserialize because the functions expect u64 args
+    let values = vec![
+        MoveValue::U8(16),
+        MoveValue::U16(1006),
+        MoveValue::U32(16000),
+        MoveValue::U128(512),
+        MoveValue::U256(U256::from(12345u32)),
+        MoveValue::Bool(true),
+    ];
+    for value in values {
+        for name in FUN_NAMES {
+            let err = run(&mod_code, name, value.clone())
+                .map(|_| ())
+                .expect_err("Should have failed to deserialize non-u64 type to u64");
+            assert_eq!(
+                err.major_status(),
+                StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+            );
+        }
+    }
+}
+
+// check happy path for writing to mut ref args - may be unecessary / covered by other tests
+#[test]
+fn mutref_output_success() {
+    let mod_code = setup_module();
+    let result = run(&mod_code, USE_MUTREF_LABEL, MoveValue::U64(1));
+    let (_, _, ret_values) = result.unwrap();
+    assert_eq!(1, ret_values.mutable_reference_outputs.len());
+    let parsed = parse_u64_arg(&ret_values.mutable_reference_outputs.first().unwrap().1);
+    assert_eq!(EXPECT_MUTREF_OUT_VALUE, parsed);
+}
+
+// TODO - how can we cause serialization errors in values returned from Move ?
+// that would allow us to test error paths for outputs as well
+
+fn setup_module() -> ModuleCode {
+    // first function takes a mutable ref & writes to it, the other takes immutable ref, so we exercise both paths
+    let code = format!(
+        r#"
+        module 0x{}::{} {{
+            fun {}(a: &mut u64) {{ *a = {}; }}
+            fun {}(_a: & u64) {{ }}
+        }}
+    "#,
+        TEST_ADDR, TEST_MODULE_ID, USE_MUTREF_LABEL, EXPECT_MUTREF_OUT_VALUE, USE_REF_LABEL
+    );
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new(TEST_MODULE_ID).unwrap());
+    (module_id, code)
+}
+
+fn run(
+    module: &ModuleCode,
+    fun_name: &str,
+    arg_val0: MoveValue,
+) -> VMResult<(ChangeSet, Vec<Event>, SerializedReturnValues)> {
+    let module_id = &module.0;
+    let modules = vec![module.clone()];
+    let (vm, storage) = setup_vm(&modules);
+    let mut session = vm.new_session(&storage);
+
+    let fun_name = Identifier::new(fun_name).unwrap();
+
+    session
+        .execute_function_bypass_visibility(
+            module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![arg_val0]),
+            &mut UnmeteredGasMeter,
+        )
+        .and_then(|ret_values| {
+            let (change_set, events) = session.finish().0?;
+            Ok((change_set, events, ret_values))
+        })
+}
+
+type ModuleCode = (ModuleId, String);
+
+// TODO - move some utility functions to where test infra lives, see about unifying with similar code
+fn setup_vm(modules: &[ModuleCode]) -> (MoveVM, InMemoryStorage) {
+    let mut storage = InMemoryStorage::new();
+    compile_modules(&mut storage, modules);
+    (MoveVM::new(vec![]).unwrap(), storage)
+}
+
+fn compile_modules(storage: &mut InMemoryStorage, modules: &[ModuleCode]) {
+    modules.iter().for_each(|(id, code)| {
+        compile_module(storage, id, code);
+    });
+}
+
+fn compile_module(storage: &mut InMemoryStorage, mod_id: &ModuleId, code: &str) {
+    let mut units = compile_units(code).unwrap();
+    let module = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    module.serialize(&mut blob).unwrap();
+    storage.publish_or_overwrite_module(mod_id.clone(), blob);
+}
+
+fn parse_u64_arg(arg: &[u8]) -> u64 {
+    let as_arr: [u8; 8] = arg[..8]
+        .try_into()
+        .expect("wrong u64 length, must be 8 bytes");
+    u64::from_le_bytes(as_arr)
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/function_arg_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/function_arg_tests.rs
new file mode 100644
index 000000000..1f11fa737
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/function_arg_tests.rs
@@ -0,0 +1,291 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, TypeTag},
+    runtime_value::{MoveStruct, MoveValue},
+    u256::U256,
+    vm_status::StatusCode,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+fn run(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_arg_tags: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) -> VMResult<()> {
+    let ty_params = ty_params
+        .iter()
+        .map(|var| format!("{}: copy + drop", var))
+        .collect::<Vec<_>>()
+        .join(", ");
+    let params = params
+        .iter()
+        .enumerate()
+        .map(|(idx, ty)| format!("_x{}: {}", idx, ty))
+        .collect::<Vec<_>>()
+        .join(", ");
+
+    let code = format!(
+        r#"
+        module 0x{}::M {{
+            struct Foo has copy, drop {{ x: u64 }}
+            struct Bar<T> has copy, drop {{ x: T }}
+
+            fun foo<{}>({}) {{ }}
+        }}
+    "#,
+        TEST_ADDR, ty_params, params
+    );
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let ty_args: Vec<_> = ty_arg_tags
+        .into_iter()
+        .map(|tag| sess.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    let args: Vec<_> = args
+        .into_iter()
+        .map(|val| val.simple_serialize().unwrap())
+        .collect();
+
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &fun_name,
+        ty_args,
+        args,
+        &mut UnmeteredGasMeter,
+    )?;
+
+    Ok(())
+}
+
+fn expect_err(params: &[&str], args: Vec<MoveValue>, expected_status: StatusCode) {
+    assert!(run(&[], params, vec![], args).unwrap_err().major_status() == expected_status);
+}
+
+fn expect_err_generic(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+    expected_status: StatusCode,
+) {
+    assert!(
+        run(ty_params, params, ty_args, args)
+            .unwrap_err()
+            .major_status()
+            == expected_status
+    );
+}
+
+fn expect_ok(params: &[&str], args: Vec<MoveValue>) {
+    run(&[], params, vec![], args).unwrap()
+}
+
+fn expect_ok_generic(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) {
+    run(ty_params, params, ty_args, args).unwrap()
+}
+
+#[test]
+fn expected_0_args_got_0() {
+    expect_ok(&[], vec![])
+}
+
+#[test]
+fn expected_0_args_got_1() {
+    expect_err(
+        &[],
+        vec![MoveValue::U64(0)],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_1_arg_got_0() {
+    expect_err(&["u64"], vec![], StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH)
+}
+
+#[test]
+fn expected_2_arg_got_1() {
+    expect_err(
+        &["u64", "bool"],
+        vec![MoveValue::U64(0)],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_2_arg_got_3() {
+    expect_err(
+        &["u64", "bool"],
+        vec![
+            MoveValue::U64(0),
+            MoveValue::Bool(true),
+            MoveValue::Bool(false),
+        ],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_u64_got_u64() {
+    expect_ok(&["u64"], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_Foo_got_Foo() {
+    expect_ok(
+        &["Foo"],
+        vec![MoveValue::Struct(MoveStruct::new(vec![MoveValue::U64(0)]))],
+    )
+}
+
+#[test]
+fn expected_signer_ref_got_signer() {
+    expect_ok(&["&signer"], vec![MoveValue::Signer(TEST_ADDR)])
+}
+
+#[test]
+fn expected_u64_signer_ref_got_u64_signer() {
+    expect_ok(
+        &["u64", "&signer"],
+        vec![MoveValue::U64(0), MoveValue::Signer(TEST_ADDR)],
+    )
+}
+
+#[test]
+fn expected_u64_got_bool() {
+    expect_err(
+        &["u64"],
+        vec![MoveValue::Bool(false)],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
+
+#[test]
+fn param_type_u64_ref() {
+    expect_ok(&["&u64"], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_u64__u64() {
+    expect_ok_generic(&["T"], &["T"], vec![TypeTag::U64], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_A_B__A_u64_vector_B_got_u8_u128__u8_u64_vector_u128() {
+    expect_ok_generic(
+        &["A", "B"],
+        &["A", "u64", "vector<B>"],
+        vec![TypeTag::U8, TypeTag::U128],
+        vec![
+            MoveValue::U8(0),
+            MoveValue::U64(0),
+            MoveValue::Vector(vec![MoveValue::U128(0), MoveValue::U128(0)]),
+        ],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_A_B__A_u32_vector_B_got_u16_u256__u16_u32_vector_u256() {
+    expect_ok_generic(
+        &["A", "B"],
+        &["A", "u32", "vector<B>"],
+        vec![TypeTag::U16, TypeTag::U256],
+        vec![
+            MoveValue::U16(0),
+            MoveValue::U32(0),
+            MoveValue::Vector(vec![
+                MoveValue::U256(U256::from(0u8)),
+                MoveValue::U256(U256::from(0u8)),
+            ]),
+        ],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__Bar_T_got_bool__Bar_bool() {
+    expect_ok_generic(
+        &["T"],
+        &["Bar<T>"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::Struct(MoveStruct::new(vec![MoveValue::Bool(
+            false,
+        )]))],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_bool__bool() {
+    expect_ok_generic(
+        &["T"],
+        &["T"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::Bool(false)],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_bool__u64() {
+    expect_err_generic(
+        &["T"],
+        &["T"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::U64(0)],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_ref_got_u64__u64() {
+    expect_ok_generic(&["T"], &["&T"], vec![TypeTag::U64], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__Bar_T_got_bool__Bar_u64() {
+    expect_err_generic(
+        &["T"],
+        &["Bar<T>"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::Struct(MoveStruct::new(vec![MoveValue::U64(0)]))],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/instantiation_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/instantiation_tests.rs
new file mode 100644
index 000000000..0e04ec590
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/instantiation_tests.rs
@@ -0,0 +1,1061 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(dead_code)]
+#![allow(unused_must_use)]
+#![allow(unused_imports)]
+
+use move_binary_format::{
+    errors::VMResult,
+    file_format::{
+        AbilitySet, AddressIdentifierIndex, Bytecode, Bytecode::*, CodeUnit, CompiledModule,
+        Constant, ConstantPoolIndex, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, FunctionInstantiation, FunctionInstantiationIndex, IdentifierIndex,
+        ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+        SignatureToken::*, StructDefInstantiation, StructDefInstantiationIndex, StructDefinition,
+        StructDefinitionIndex, StructFieldInformation, StructHandle, StructHandleIndex,
+        StructTypeParameter, TypeSignature,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    vm_status::StatusCode,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_runtime::{
+    move_vm::MoveVM,
+    session::{SerializedReturnValues, Session},
+};
+use move_vm_test_utils::{
+    gas_schedule::{Gas, GasStatus, INITIAL_COST_SCHEDULE},
+    InMemoryStorage,
+};
+#[cfg(debug_assertions)]
+use move_vm_types::gas::GasMeter;
+use std::time::Instant;
+
+const MODULE_NAME: &str = "Mod";
+const STRUCT_NAME: &str = "S";
+const FIELD_NAME: &str = "field";
+const ENTRY_POINT_NAME: &str = "entry_point";
+const RECURSIVE_NAME: &str = "recursive";
+const EMPTY_NAME: &str = "empty";
+
+fn main() {
+    main_run(10000);
+}
+
+// Get a `GasStatus` to be used when running code.
+// A `gas_val` of 0 returns an unmetered `GasStatus` which means code in this test will
+// run forever (we always and only generate infinite loops)
+fn get_gas_meter<'a>(gas_val: u64) -> GasStatus<'a> {
+    if gas_val == 0 {
+        GasStatus::new_unmetered()
+    } else {
+        GasStatus::new(&INITIAL_COST_SCHEDULE, Gas::new(gas_val))
+    }
+}
+
+// With proper gas_val units this function can be used to profile the VM.
+// All code generated is an infinite loop and with 0 unit we run forever which
+// can be used for profiling
+fn main_run(gas_val: u64) {
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), load_pop);
+    println!(
+        "* load_pop: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_instantiated);
+    println!(
+        "* vec_pack_instantiated: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_simple);
+    println!(
+        "* vec_pack_gen_simple: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep);
+    println!(
+        "* vec_pack_gen_deep: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep_50);
+    println!(
+        "* vec_pack_gen_deep_50: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep_500);
+    println!(
+        "* vec_pack_gen_deep_500: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), instantiated_gen_call);
+    println!(
+        "* instantiated_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), simple_gen_call);
+    println!(
+        "* simple_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call);
+    println!(
+        "* deep_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call_50);
+    println!(
+        "* deep_gen_call_50: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call_500);
+    println!(
+        "* deep_gen_call_500: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), instantiated_rec_gen_call);
+    println!(
+        "* instantiated_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), simple_rec_gen_call);
+    println!(
+        "* simple_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_rec_gen_call);
+    println!(
+        "* deep_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+}
+
+#[test]
+fn test_instantiation_no_instantiation() {
+    let (res, ref_time) = run_with_module(&mut get_gas_meter(1000), load_pop);
+    let err = res.err().unwrap().major_status();
+    println!("* load_pop: {} - Status: {:?}", ref_time, err);
+    assert_eq!(err, StatusCode::OUT_OF_GAS, "Must finish OutOfGas");
+}
+
+// Common runner for all tests.
+// Run a control test (load_pop) and an instantiation test which is then
+// compared against the control.
+// Ensure that tests complete with "out of gas" and withing a given time range.
+fn test_runner(
+    gas_val: u64,
+    test_name: &str,
+    entry_spec: fn(
+        AccountAddress,
+        &mut Session<&'_ InMemoryStorage>,
+    ) -> (ModuleId, Identifier, Vec<TypeTag>),
+    check_result: fn(u128, u128) -> bool,
+) {
+    assert!(gas_val > 0, "Must provide a positive gas budget");
+    let mut gas: GasStatus = get_gas_meter(gas_val);
+    let (res, ref_time) = run_with_module(&mut gas, load_pop);
+    assert_eq!(
+        res.err().unwrap().major_status(),
+        StatusCode::OUT_OF_GAS,
+        "Must finish OutOfGas"
+    );
+    let mut gas: GasStatus = get_gas_meter(gas_val);
+    let (res, time) = run_with_module(&mut gas, entry_spec);
+    let err = res.err().unwrap().major_status();
+    println!("* {}: {}ms - Status: {:?}", test_name, time, err);
+    // assert_eq!(err, StatusCode::OUT_OF_GAS, "Must finish OutOfGas");
+    assert!(
+        check_result(time, ref_time),
+        "Instantion test taking too long {}",
+        time
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_instantiated() {
+    test_runner(
+        1000,
+        "vec_pack_instantiated",
+        vec_pack_instantiated,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_gen_simple() {
+    test_runner(
+        1000,
+        "vec_pack_gen_simple",
+        vec_pack_gen_simple,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_gen_deep() {
+    test_runner(
+        1000,
+        "vec_pack_gen_deep",
+        vec_pack_gen_deep,
+        |time, ref_time| time < ref_time * 1000,
+    );
+    test_runner(
+        1000,
+        "vec_pack_gen_deep_50",
+        vec_pack_gen_deep_50,
+        |time, ref_time| time < ref_time * 1000,
+    );
+    test_runner(
+        1000,
+        "vec_pack_gen_deep_500",
+        vec_pack_gen_deep_500,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+#[test]
+fn test_instantiation_instantiated_gen_call() {
+    test_runner(
+        1000,
+        "instantiated_gen_call",
+        instantiated_gen_call,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+#[test]
+fn test_instantiation_simple_gen_call() {
+    test_runner(
+        1000,
+        "simple_gen_call",
+        simple_gen_call,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+#[test]
+fn test_instantiation_deep_gen_call() {
+    test_runner(1000, "deep_gen_call", deep_gen_call, |time, ref_time| {
+        time < ref_time * 100
+    });
+    test_runner(
+        1000,
+        "deep_gen_call_50",
+        deep_gen_call_50,
+        |time, ref_time| time < ref_time * 100,
+    );
+    test_runner(
+        1000,
+        "deep_gen_call_500",
+        deep_gen_call_500,
+        |time, ref_time| time < ref_time * 100,
+    );
+}
+
+#[test]
+fn test_instantiation_simple_rec_gen_call() {
+    test_runner(
+        1000,
+        "simple_rec_gen_call",
+        simple_rec_gen_call,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_deep_rec_gen_call() {
+    test_runner(
+        1000,
+        "deep_rec_gen_call",
+        deep_rec_gen_call,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+// Generate a verifiable module with a snippet of code that can be used to test instantiations.
+// The code is a block (so balanced stack) passed via `snippet` and it's repeated
+// `snippet_rep` times. It is then completed with a `Branch(0)` to form an infinite
+// loop. That can be used with no gas charge to profile the code executed (an executable),
+// or with some gas to determine how long it takes to go OutOfGas.
+// The code has to work on a `void(void)` function (so to speak) that has
+// a number of type parameters defined via `func_type_params_count`.
+// It can define a number of locals through `locals_sig`. The locals are added
+// after the "default" `Signature` provided (look at that for the indexes that can be used).
+// A struct is defined that uses `struct_type_params_count` to define the number of
+// type parameters.
+// A set of `Signature` can be provided for the code snippet to use besides the default
+// and the locals.
+// `struct_inst_signatures` and `func_inst_signatures` can be used to generate
+// `StructDefInstantiation` and `FunctionInstantiation` that can be used by related bytecodes.
+//
+// Notice: this is not a particularly easy function to use. See example below on how to use it.
+fn make_module(
+    session: &mut Session<&'_ InMemoryStorage>,
+    addr: AccountAddress,
+    func_type_params_count: usize,
+    locals_sig: Option<Signature>,
+    snippet: Vec<Bytecode>,
+    snippet_rep: usize,
+    mut code_inst_signatures: Vec<Signature>,
+    struct_type_params_count: usize,
+    mut struct_inst_signatures: Vec<Signature>,
+    func_handle_idxs: Vec<u16>,
+    mut func_inst_signatures: Vec<Signature>,
+) -> (ModuleId, Identifier) {
+    // default signatures
+    let mut signatures = vec![
+        Signature(vec![]),
+        Signature(vec![U64]),
+        Signature(vec![TypeParameter(0)]),
+    ];
+    let locals_idx = if let Some(sig) = locals_sig {
+        signatures.push(sig);
+        signatures.len() - 1
+    } else {
+        0
+    };
+    signatures.append(&mut code_inst_signatures);
+    let struct_inst_start = signatures.len();
+    signatures.append(&mut struct_inst_signatures);
+    let func_inst_start = signatures.len();
+    signatures.append(&mut func_inst_signatures);
+
+    let func_type_params = vec![AbilitySet::VECTOR; func_type_params_count];
+    let rec_func_type_params = if func_type_params_count == 0 {
+        vec![AbilitySet::VECTOR]
+    } else {
+        func_type_params.clone()
+    };
+    let struct_type_parameters = vec![
+        StructTypeParameter {
+            constraints: AbilitySet::EMPTY,
+            is_phantom: false,
+        };
+        struct_type_params_count
+    ];
+
+    // create the code for the single entry point
+    let mut code = vec![];
+    for _ in 0..snippet_rep {
+        code.append(&mut snippet.clone())
+    }
+    code.push(Branch(0));
+
+    // struct definition instantiations
+    let mut struct_def_instantiations = vec![];
+    for idx in struct_inst_start..func_inst_start {
+        struct_def_instantiations.push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(idx as u16),
+        });
+    }
+
+    // function instantiations
+    let entry_point = Identifier::new(ENTRY_POINT_NAME).unwrap();
+    let mut function_instantiations = vec![FunctionInstantiation {
+        handle: FunctionHandleIndex(1),
+        type_parameters: SignatureIndex(2),
+    }];
+    for idx in func_inst_start..signatures.len() {
+        function_instantiations.push(FunctionInstantiation {
+            handle: FunctionHandleIndex(func_handle_idxs[idx - func_inst_start]),
+            type_parameters: SignatureIndex(idx as u16),
+        });
+    }
+
+    let module = CompiledModule {
+        version: 6,
+        // Module definition
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        // struct definition
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: struct_type_parameters,
+        }],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(2),
+                signature: TypeSignature(U8),
+            }]),
+        }],
+        // function definition
+        function_handles: vec![
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(3),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: func_type_params,
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(4),
+                parameters: SignatureIndex(1),
+                return_: SignatureIndex(0),
+                type_parameters: rec_func_type_params,
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(5),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::VECTOR],
+            },
+        ],
+        function_defs: vec![
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code,
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code: vec![
+                        CopyLoc(0),
+                        LdU64(1),
+                        Add,
+                        StLoc(0),
+                        CopyLoc(0),
+                        LdU64(10),
+                        Ge,
+                        BrTrue(10),
+                        CopyLoc(0),
+                        CallGeneric(FunctionInstantiationIndex(0)),
+                        Ret,
+                    ],
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(2),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code: vec![Ret],
+                }),
+            },
+        ],
+        // addresses
+        address_identifiers: vec![addr],
+        // identifiers
+        identifiers: vec![
+            // Module name
+            Identifier::new(MODULE_NAME).unwrap(),
+            // Struct name
+            Identifier::new(STRUCT_NAME).unwrap(),
+            // Field name
+            Identifier::new(FIELD_NAME).unwrap(),
+            // Entry point
+            entry_point.clone(),
+            // recursive fun name
+            Identifier::new(RECURSIVE_NAME).unwrap(),
+            // empty fun name
+            Identifier::new(EMPTY_NAME).unwrap(),
+        ],
+        // constants
+        constant_pool: vec![Constant {
+            type_: Address,
+            data: addr.to_vec(),
+        }],
+        // signatures
+        signatures,
+        // struct instantiations
+        struct_def_instantiations,
+        // function instantiations
+        function_instantiations,
+        // unused...
+        field_handles: vec![],
+        friend_decls: vec![],
+        field_instantiations: vec![],
+        metadata: vec![],
+    };
+    // uncomment to see the module generated
+    // println!("Module: {:#?}", module);
+    move_bytecode_verifier::verify_module_unmetered(&module).expect("verification failed");
+
+    let mut mod_bytes = vec![];
+    module
+        .serialize(&mut mod_bytes)
+        .expect("Module must serialize");
+    session
+        .publish_module(mod_bytes, addr, &mut GasStatus::new_unmetered())
+        .expect("Module must publish");
+    (module.self_id(), entry_point)
+}
+
+// Generic function to run some code. Take the gas to use and a closure
+// that can return an entry point to call.
+// This function creates a VM, invokes the closure, and on return it builds the call
+// for the entry point.
+// Report time spent, if it terminates (no gas it will never end; use for profiling).
+fn run_with_module(
+    gas: &mut GasStatus,
+    entry_spec: fn(
+        AccountAddress,
+        &mut Session<&'_ InMemoryStorage>,
+    ) -> (ModuleId, Identifier, Vec<TypeTag>),
+) -> (VMResult<SerializedReturnValues>, u128) {
+    let addr = AccountAddress::from_hex_literal("0xcafe").unwrap();
+
+    //
+    // Start VM
+    let vm = MoveVM::new(vec![]).unwrap();
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+
+    let (module_id, entry_name, type_arg_tags) = entry_spec(addr, &mut session);
+
+    let now = Instant::now();
+
+    let type_args = type_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<Vec<_>>>();
+
+    #[cfg(debug_assertions)]
+    gas.set_profiler(GasProfiler::init(
+        &session.vm_config().profiler_config,
+        entry_name.to_string(),
+        gas.remaining_gas().into(),
+    ));
+    let res = type_args.and_then(|type_args| {
+        session.execute_entry_function(
+            &module_id,
+            entry_name.as_ref(),
+            type_args,
+            Vec::<Vec<u8>>::new(),
+            gas,
+        )
+    });
+
+    let time = now.elapsed().as_millis();
+    (res, time)
+}
+
+// Call a simple load u8 and pop loop
+fn load_pop(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_load_pop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Code for LdU8 and Pop
+fn get_load_pop() -> Vec<Bytecode> {
+    vec![LdU8(0), Pop]
+}
+
+// Call a vector<T> pack empty and pop with full instantiation
+fn vec_pack_instantiated(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let snippet_rep = 1;
+    let struct_type_params_count = 1;
+    let code_inst_signatures = vec![Signature(vec![U8])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call a vector<T> pack empty and pop with simple generic instantiation
+fn vec_pack_gen_simple(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let snippet_rep = 1;
+    let struct_type_params_count = 5;
+    let code_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call a vector<T> pack empty and pop with deep generic instantiation
+fn vec_pack_gen_deep(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 1)
+}
+
+fn vec_pack_gen_deep_50(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 50)
+}
+
+fn vec_pack_gen_deep_500(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 500)
+}
+
+fn vec_pack_gen_deep_it(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+    snippet_rep: usize,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let code_inst_signatures = vec![Signature(vec![big_ty])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `VecPack` and `Pop` code
+fn get_vec_pack(idx: u16) -> Vec<Bytecode> {
+    vec![VecPack(SignatureIndex(idx), 0), Pop]
+}
+
+// Call an instantiated generic function
+fn instantiated_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(U64))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call simple generic function
+fn simple_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call deep instantiation generic function
+fn deep_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 1)
+}
+
+fn deep_gen_call_50(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 50)
+}
+
+fn deep_gen_call_500(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 500)
+}
+
+fn deep_gen_call_it(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+    snippet_rep: usize,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![big_ty])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `CallGeneric` tests
+fn get_generic_call_loop() -> Vec<Bytecode> {
+    vec![CallGeneric(FunctionInstantiationIndex(1))]
+}
+
+// Call an instantiated generic function
+fn instantiated_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(U64))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call simple generic function
+fn simple_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call deep instantiation generic function
+fn deep_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<&'_ InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![big_ty])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `CallGeneric` tests
+fn get_generic_call() -> Vec<Bytecode> {
+    vec![LdU64(0), CallGeneric(FunctionInstantiationIndex(1))]
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/invariant_violation_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/invariant_violation_tests.rs
new file mode 100644
index 000000000..be0b2a0ee
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/invariant_violation_tests.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Constant, ConstantPoolIndex, Signature, SignatureIndex,
+    SignatureToken::*,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn merge_borrow_states_infinite_loop() {
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                U64,
+                Vector(Box::new(U8)),
+                U64,
+                Vector(Box::new(U8)),
+                MutableReference(Box::new(Vector(Box::new(U8)))),
+                MutableReference(Box::new(U64)),
+            ]),
+        ],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![Constant {
+            type_: Vector(Box::new(U8)),
+            data: vec![0],
+        }],
+        metadata: vec![],
+        // The bytecode verifier should reject this code but it doesn't.
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                LdU64(0),
+                StLoc(0), // { 0 => 0 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(1), // { 0 => 0, 1 => [] }
+                LdU64(0),
+                StLoc(2), // { 0 => 0, 1 => [], 2 => 0 }
+                MutBorrowLoc(2),
+                StLoc(5), // { 0 => 0, 1 => [], 2 => 0, 5 => &2 }
+                LdU64(1),
+                CopyLoc(5),
+                WriteRef, // { 0 => 0, 1 => [], 2 => 1, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(3), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 5 => &2 }
+                MutBorrowLoc(3),
+                StLoc(4), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 4 => &3, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                CopyLoc(4),
+                WriteRef,
+                CopyLoc(5),
+                ReadRef,
+                LdU64(1),
+                Eq,
+                BrTrue(11),
+                Ret,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script_unmetered(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    let err = session
+        .execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        )
+        .unwrap_err();
+
+    assert_eq!(
+        err.major_status(),
+        StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR
+    );
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/leak_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/leak_tests.rs
new file mode 100644
index 000000000..7f9378cca
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/leak_tests.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Signature, SignatureIndex, SignatureToken::*,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn leak_with_abort() {
+    let mut locals = vec![U128, MutableReference(Box::new(U128))];
+    // Make locals bigger so each leak is bigger
+    // 128 is limit for aptos
+    for _ in 0..100 {
+        locals.push(U128);
+    }
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(locals)],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                // leak
+                LdU128(0),
+                StLoc(0),
+                MutBorrowLoc(0),
+                StLoc(1),
+                // abort
+                LdU64(0),
+                Abort,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script_unmetered(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    for _ in 0..100_000 {
+        let _ = session.execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        );
+    }
+
+    let mem_stats = memory_stats::memory_stats().unwrap();
+    assert!(mem_stats.physical_mem < 200000000);
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests.rs
new file mode 100644
index 000000000..ac8d1b052
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests.rs
@@ -0,0 +1,1307 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Simplifies logic around re-using ModuleIds.
+#![allow(clippy::redundant_clone)]
+
+use crate::compiler::{compile_modules_in_file, expect_modules};
+use move_binary_format::{
+    file_format::{
+        empty_module, AddressIdentifierIndex, IdentifierIndex, ModuleHandle, TableIndex,
+    },
+    CompiledModule,
+};
+use move_compiler::Compiler;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::ChangeSet,
+    ident_str,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+    runtime_value::MoveValue,
+};
+use move_vm_config::{runtime::VMConfig, verifier::VerifierConfig};
+use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::{
+    gas::UnmeteredGasMeter,
+    loaded_data::runtime_types::{DepthFormula, StructType, Type},
+};
+
+use std::{collections::BTreeMap, path::PathBuf, str::FromStr, sync::Arc, thread};
+
+const DEFAULT_ACCOUNT: AccountAddress = AccountAddress::TWO;
+const UPGRADE_ACCOUNT: AccountAddress = {
+    let mut address = [0u8; AccountAddress::LENGTH];
+    address[AccountAddress::LENGTH - 1] = 3u8;
+    AccountAddress::new(address)
+};
+const UPGRADE_ACCOUNT_2: AccountAddress = {
+    let mut address = [0u8; AccountAddress::LENGTH];
+    address[AccountAddress::LENGTH - 1] = 4u8;
+    AccountAddress::new(address)
+};
+
+struct Adapter {
+    store: RelinkingStore,
+    vm: Arc<MoveVM>,
+    functions: Vec<(ModuleId, Identifier)>,
+}
+
+#[derive(Clone)]
+struct RelinkingStore {
+    store: InMemoryStorage,
+    context: AccountAddress,
+    linkage: BTreeMap<ModuleId, ModuleId>,
+    type_origin: BTreeMap<(ModuleId, Identifier), ModuleId>,
+}
+
+impl Adapter {
+    fn new(store: InMemoryStorage) -> Self {
+        let functions = vec![
+            (
+                ModuleId::new(DEFAULT_ACCOUNT, Identifier::new("A").unwrap()),
+                Identifier::new("entry_a").unwrap(),
+            ),
+            (
+                ModuleId::new(DEFAULT_ACCOUNT, Identifier::new("D").unwrap()),
+                Identifier::new("entry_d").unwrap(),
+            ),
+            (
+                ModuleId::new(DEFAULT_ACCOUNT, Identifier::new("E").unwrap()),
+                Identifier::new("entry_e").unwrap(),
+            ),
+            (
+                ModuleId::new(DEFAULT_ACCOUNT, Identifier::new("F").unwrap()),
+                Identifier::new("entry_f").unwrap(),
+            ),
+            (
+                ModuleId::new(DEFAULT_ACCOUNT, Identifier::new("C").unwrap()),
+                Identifier::new("just_c").unwrap(),
+            ),
+        ];
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+        Self {
+            store: RelinkingStore::new(store),
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            functions,
+        }
+    }
+
+    fn fresh(self) -> Self {
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+        Self {
+            store: self.store,
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            functions: self.functions,
+        }
+    }
+
+    fn relink(
+        self,
+        context: AccountAddress,
+        linkage: BTreeMap<ModuleId, ModuleId>,
+        type_origin: BTreeMap<(ModuleId, Identifier), ModuleId>,
+    ) -> Self {
+        Self {
+            store: self.store.relink(context, linkage, type_origin),
+            vm: self.vm,
+            functions: self.functions,
+        }
+    }
+
+    fn publish_modules(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+
+        for module in modules {
+            let mut binary = vec![];
+            module.serialize(&mut binary).unwrap_or_else(|e| {
+                panic!("failure in module serialization: {e:?}\n{:#?}", module)
+            });
+            session
+                .publish_module(binary, DEFAULT_ACCOUNT, &mut UnmeteredGasMeter)
+                .unwrap_or_else(|e| panic!("failure publishing module: {e:?}\n{:#?}", module));
+        }
+        let (changeset, _) = session.finish().0.expect("failure getting write set");
+        self.store
+            .apply(changeset)
+            .expect("failure applying write set");
+    }
+
+    fn publish_modules_with_error(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+
+        for module in modules {
+            let mut binary = vec![];
+            module.serialize(&mut binary).unwrap_or_else(|e| {
+                panic!("failure in module serialization: {e:?}\n{:#?}", module)
+            });
+            session
+                .publish_module(binary, DEFAULT_ACCOUNT, &mut UnmeteredGasMeter)
+                .expect_err("publishing must fail");
+        }
+    }
+
+    fn publish_module_bundle(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+        let binaries: Vec<_> = modules
+            .into_iter()
+            .map(|module| {
+                let mut binary = vec![];
+                module.serialize(&mut binary).unwrap_or_else(|e| {
+                    panic!("failure in module serialization: {e:?}\n{:#?}", module)
+                });
+                binary
+            })
+            .collect();
+
+        session
+            .publish_module_bundle(binaries, DEFAULT_ACCOUNT, &mut UnmeteredGasMeter)
+            .unwrap_or_else(|e| panic!("failure publishing module bundle: {e:?}"));
+
+        let (changeset, _) = session.finish().0.expect("failure getting write set");
+        self.store
+            .apply(changeset)
+            .expect("failure applying write set");
+    }
+
+    fn publish_module_bundle_with_error(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+        let binaries: Vec<_> = modules
+            .into_iter()
+            .map(|module| {
+                let mut binary = vec![];
+                module.serialize(&mut binary).unwrap_or_else(|e| {
+                    panic!("failure in module serialization: {e:?}\n{:#?}", module)
+                });
+                binary
+            })
+            .collect();
+
+        session
+            .publish_module_bundle(binaries, DEFAULT_ACCOUNT, &mut UnmeteredGasMeter)
+            .expect_err("publishing bundle must fail");
+    }
+
+    fn load_type(&self, type_tag: &TypeTag) -> Type {
+        let session = self.vm.new_session(&self.store);
+        session
+            .load_type(type_tag)
+            .expect("Loading type should succeed")
+    }
+
+    fn load_struct(&self, module_id: &ModuleId, struct_name: &IdentStr) -> Arc<StructType> {
+        let session = self.vm.new_session(&self.store);
+        session
+            .load_struct(module_id, struct_name)
+            .expect("Loading struct should succeed")
+            .1
+    }
+
+    fn get_type_tag(&self, ty: &Type) -> TypeTag {
+        let session = self.vm.new_session(&self.store);
+        session
+            .get_type_tag(ty)
+            .expect("Converting to type tag should succeed")
+    }
+
+    fn call_functions(&self) {
+        for (module_id, name) in &self.functions {
+            self.call_function(module_id, name);
+        }
+    }
+
+    fn call_functions_async(&self, reps: usize) {
+        let mut children = vec![];
+        for _ in 0..reps {
+            for (module_id, name) in self.functions.clone() {
+                let vm = self.vm.clone();
+                let data_store = self.store.clone();
+                children.push(thread::spawn(move || {
+                    let mut session = vm.new_session(&data_store);
+                    session
+                        .execute_function_bypass_visibility(
+                            &module_id,
+                            &name,
+                            vec![],
+                            Vec::<Vec<u8>>::new(),
+                            &mut UnmeteredGasMeter,
+                        )
+                        .unwrap_or_else(|_| {
+                            panic!("Failure executing {:?}::{:?}", module_id, name)
+                        });
+                }));
+            }
+        }
+        for child in children {
+            let _ = child.join();
+        }
+    }
+
+    fn call_function_with_return(&self, module: &ModuleId, name: &IdentStr) -> Vec<MoveValue> {
+        self.call_function(module, name)
+            .return_values
+            .into_iter()
+            .map(|(bytes, ty)| {
+                MoveValue::simple_deserialize(&bytes[..], &ty)
+                    .expect("Can't deserialize return value")
+            })
+            .collect()
+    }
+
+    fn call_function_with_error(&self, module: &ModuleId, name: &IdentStr) {
+        let mut session = self.vm.new_session(&self.store);
+        session
+            .execute_function_bypass_visibility(
+                module,
+                name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .expect_err("calling function must fail");
+    }
+
+    fn call_function(&self, module: &ModuleId, name: &IdentStr) -> SerializedReturnValues {
+        let mut session = self.vm.new_session(&self.store);
+        session
+            .execute_function_bypass_visibility(
+                module,
+                name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_or_else(|e| panic!("Failure executing {module:?}::{name:?}: {e:#?}"))
+    }
+}
+
+impl RelinkingStore {
+    fn new(store: InMemoryStorage) -> Self {
+        Self {
+            store,
+            context: AccountAddress::ZERO,
+            linkage: BTreeMap::new(),
+            type_origin: BTreeMap::new(),
+        }
+    }
+
+    fn relink(
+        self,
+        context: AccountAddress,
+        linkage: BTreeMap<ModuleId, ModuleId>,
+        type_origin: BTreeMap<(ModuleId, Identifier), ModuleId>,
+    ) -> Self {
+        let Self { store, .. } = self;
+        Self {
+            store,
+            context,
+            linkage,
+            type_origin,
+        }
+    }
+
+    fn apply(&mut self, changeset: ChangeSet) -> anyhow::Result<()> {
+        self.store.apply(changeset)
+    }
+}
+
+/// Implemented by referencing the store's built-in data structures
+impl LinkageResolver for RelinkingStore {
+    type Error = ();
+
+    fn link_context(&self) -> AccountAddress {
+        self.context
+    }
+
+    /// Remaps `module_id` if it exists in the current linkage table, or returns it unchanged
+    /// otherwise.
+    fn relocate(&self, module_id: &ModuleId) -> Result<ModuleId, Self::Error> {
+        Ok(self.linkage.get(module_id).unwrap_or(module_id).clone())
+    }
+
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> Result<ModuleId, Self::Error> {
+        Ok(self
+            .type_origin
+            .get(&(module_id.clone(), struct_.to_owned()))
+            .unwrap_or(module_id)
+            .clone())
+    }
+}
+
+/// Implement by forwarding to the underlying in memory storage
+impl ModuleResolver for RelinkingStore {
+    type Error = ();
+
+    fn get_module(&self, id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        self.store.get_module(id)
+    }
+}
+
+/// Implement by forwarding to the underlying in memory storage
+impl ResourceResolver for RelinkingStore {
+    type Error = ();
+
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        typ: &move_core_types::language_storage::StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        self.store.get_resource(address, typ)
+    }
+}
+
+fn get_fixture(fixture: &str) -> PathBuf {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.extend(["src", "tests", fixture]);
+    path
+}
+
+fn get_loader_tests_modules() -> Vec<CompiledModule> {
+    compile_modules_in_file(&get_fixture("loader_tests_modules.move")).unwrap()
+}
+
+fn get_depth_tests_modules() -> Vec<CompiledModule> {
+    compile_modules_in_file(&get_fixture("depth_tests_modules.move")).unwrap()
+}
+
+fn get_relinker_tests_modules_with_deps<'s>(
+    module: &'s str,
+    deps: impl IntoIterator<Item = &'s str>,
+) -> anyhow::Result<Vec<CompiledModule>> {
+    fn fixture_string_path(module: &str) -> String {
+        get_fixture(&format!("relinking_tests_{module}.move"))
+            .to_str()
+            .unwrap()
+            .to_string()
+    }
+
+    let (_, units) = Compiler::from_files(
+        vec![fixture_string_path(module)],
+        deps.into_iter().map(fixture_string_path).collect(),
+        BTreeMap::<String, _>::new(),
+    )
+    .build_and_report()?;
+
+    expect_modules(units).collect()
+}
+
+#[test]
+fn load() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_loader_tests_modules();
+    adapter.publish_modules(modules);
+    // calls all functions sequentially
+    adapter.call_functions();
+}
+
+#[test]
+fn test_depth() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_depth_tests_modules();
+    let structs = vec![
+        (
+            "A",
+            "Box",
+            Some(DepthFormula {
+                terms: vec![(0, 1)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box3",
+            Some(DepthFormula {
+                terms: vec![(0, 3)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box7",
+            Some(DepthFormula {
+                terms: vec![(0, 7)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box15",
+            Some(DepthFormula {
+                terms: vec![(0, 15)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box31",
+            Some(DepthFormula {
+                terms: vec![(0, 31)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box63",
+            Some(DepthFormula {
+                terms: vec![(0, 63)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "Box127",
+            Some(DepthFormula {
+                terms: vec![(0, 127)],
+                constant: None,
+            }),
+        ),
+        (
+            "A",
+            "S",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(3),
+            }),
+        ),
+        (
+            "B",
+            "S",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(2),
+            }),
+        ),
+        (
+            "C",
+            "S",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(2),
+            }),
+        ),
+        (
+            "D",
+            "S",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(3),
+            }),
+        ),
+        (
+            "E",
+            "S",
+            Some(DepthFormula {
+                terms: vec![(0, 2)],
+                constant: Some(3),
+            }),
+        ),
+        (
+            "F",
+            "S",
+            Some(DepthFormula {
+                terms: vec![(0, 1)],
+                constant: Some(2),
+            }),
+        ),
+        (
+            "G",
+            "S",
+            Some(DepthFormula {
+                terms: vec![(0, 5), (1, 3)],
+                constant: Some(6),
+            }),
+        ),
+        (
+            "H",
+            "S",
+            Some(DepthFormula {
+                terms: vec![(0, 2), (1, 4)],
+                constant: Some(5),
+            }),
+        ),
+        (
+            "I",
+            "L",
+            Some(DepthFormula {
+                terms: vec![(0, 2)],
+                constant: Some(4),
+            }),
+        ),
+        (
+            "I",
+            "G",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(3),
+            }),
+        ),
+        (
+            "I",
+            "H",
+            Some(DepthFormula {
+                terms: vec![(0, 1)],
+                constant: Some(2),
+            }),
+        ),
+        (
+            "I",
+            "E",
+            Some(DepthFormula {
+                terms: vec![(0, 2)],
+                constant: Some(3),
+            }),
+        ),
+        (
+            "I",
+            "F",
+            Some(DepthFormula {
+                terms: vec![(0, 1)],
+                constant: Some(2),
+            }),
+        ),
+        (
+            "I",
+            "S",
+            Some(DepthFormula {
+                terms: vec![(0, 2), (1, 7)],
+                constant: Some(9),
+            }),
+        ),
+        (
+            "I",
+            "LL",
+            Some(DepthFormula {
+                terms: vec![(1, 2)],
+                constant: Some(4),
+            }),
+        ),
+        (
+            "I",
+            "N",
+            Some(DepthFormula {
+                terms: vec![],
+                constant: Some(2),
+            }),
+        ),
+    ];
+    adapter.publish_modules(modules);
+    // loads all structs sequentially
+    for (module_name, struct_name, expected_depth) in structs.iter() {
+        let computed_depth = &adapter
+            .load_struct(
+                &ModuleId::new(
+                    DEFAULT_ACCOUNT,
+                    Identifier::new(module_name.to_string()).unwrap(),
+                ),
+                ident_str!(struct_name),
+            )
+            .depth;
+        assert_eq!(computed_depth, expected_depth);
+    }
+}
+
+#[test]
+fn load_concurrent() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_loader_tests_modules();
+    adapter.publish_modules(modules);
+    // makes 15 threads
+    adapter.call_functions_async(3);
+}
+
+#[test]
+fn load_concurrent_many() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_loader_tests_modules();
+    adapter.publish_modules(modules);
+    // makes 150 threads
+    adapter.call_functions_async(30);
+}
+
+#[test]
+fn relink() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let a0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("a").to_owned());
+    let b0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("b").to_owned());
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let c1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("c").to_owned());
+
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let b0_modules = get_relinker_tests_modules_with_deps("b_v0", ["c_v0"]).unwrap();
+    let a0_modules = get_relinker_tests_modules_with_deps("a_v0", ["b_v0", "c_v1"]).unwrap();
+
+    // Publish the first version of C, and B which is published depending on it.
+    adapter.publish_modules(c0_modules);
+    adapter.publish_modules(b0_modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(42 + 1)],
+        adapter.call_function_with_return(&b0, ident_str!("b")),
+    );
+
+    let mut adapter = adapter.relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */ BTreeMap::from_iter([(c0.clone(), c1.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c1.clone(), ident_str!("R").to_owned()), c1.clone()),
+        ]),
+    );
+
+    // Publish the next version of C, and then A which depends on the new version of C, but also B.
+    // B will be relinked to use C when executed in the adapter relinking against A.
+    adapter.publish_modules(c1_modules);
+    adapter.publish_modules(a0_modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(44 + 43 + 1)],
+        adapter.call_function_with_return(&a0, ident_str!("a")),
+    );
+}
+
+#[test]
+fn relink_publish_err() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let b1_modules = get_relinker_tests_modules_with_deps("b_v1", ["c_v1"]).unwrap();
+
+    // B was built against the later version of C but published against the earlier version,
+    // which should fail because a function is missing.
+    adapter.publish_modules(c0_modules);
+    adapter.publish_modules_with_error(b1_modules);
+}
+
+#[test]
+fn relink_load_err() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let b0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("b").to_owned());
+    let b1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("b").to_owned());
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let c1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("c").to_owned());
+
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let b0_modules = get_relinker_tests_modules_with_deps("b_v0", ["c_v0"]).unwrap();
+    let b1_modules = get_relinker_tests_modules_with_deps("b_v1", ["c_v1"]).unwrap();
+
+    // B v0 works with C v0
+    adapter.publish_modules(c0_modules);
+    adapter.publish_modules(b0_modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(42 + 1)],
+        adapter.call_function_with_return(&b0, ident_str!("b")),
+    );
+
+    let mut adapter = adapter.relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */
+        BTreeMap::from_iter([(b0.clone(), b1.clone()), (c0.clone(), c1.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c0.clone(), ident_str!("R").to_owned()), c1.clone()),
+        ]),
+    );
+
+    // B v1 works with C v1
+    adapter.publish_modules(c1_modules);
+    adapter.publish_modules(b1_modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(44 * 43)],
+        adapter.call_function_with_return(&b0, ident_str!("b")),
+    );
+
+    let adapter = adapter.relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */
+        BTreeMap::from_iter([(b0.clone(), b1.clone()), (c0.clone(), c0.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((b0.clone(), ident_str!("S").to_owned()), b1.clone()),
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+        ]),
+    );
+
+    // But B v1 *does not* work with C v0
+    adapter.call_function_with_error(&b0, ident_str!("b0"));
+}
+
+#[test]
+fn relink_type_identity() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let b0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("b").to_owned());
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let b1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("b").to_owned());
+    let c1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("c").to_owned());
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let b1_modules = get_relinker_tests_modules_with_deps("b_v1", ["c_v1"]).unwrap();
+
+    adapter.publish_modules(c0_modules);
+    let c0_s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+
+    let mut adapter = adapter.relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */
+        BTreeMap::from_iter([(b0.clone(), b1.clone()), (c0.clone(), c1.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((b0.clone(), ident_str!("S").to_owned()), b1.clone()),
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c0.clone(), ident_str!("R").to_owned()), c1.clone()),
+        ]),
+    );
+
+    adapter.publish_modules(c1_modules);
+    adapter.publish_modules(b1_modules);
+
+    let c1_s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+    let b1_s = adapter.load_type(&TypeTag::from_str("0x2::b::S").unwrap());
+
+    assert_eq!(c0_s, c1_s);
+    assert_ne!(c1_s, b1_s);
+}
+
+#[test]
+fn relink_defining_module_successive() {
+    // This test simulates building up a sequence of upgraded packages over a number of publishes
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let c1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("c").to_owned());
+    let c2 = ModuleId::new(UPGRADE_ACCOUNT_2, ident_str!("c").to_owned());
+
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let c2_modules = get_relinker_tests_modules_with_deps("c_v2", []).unwrap();
+
+    adapter.publish_modules(c0_modules);
+    let c0_s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+
+    let mut adapter = adapter.relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */ BTreeMap::from_iter([(c0.clone(), c1.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c0.clone(), ident_str!("R").to_owned()), c1.clone()),
+        ]),
+    );
+
+    adapter.publish_modules(c1_modules);
+    let c1_s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+    let c1_r = adapter.load_type(&TypeTag::from_str("0x2::c::R").unwrap());
+
+    let mut adapter = adapter.relink(
+        UPGRADE_ACCOUNT_2,
+        /* linkage */ BTreeMap::from_iter([(c0.clone(), c2.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c0.clone(), ident_str!("R").to_owned()), c1.clone()),
+            ((c0.clone(), ident_str!("Q").to_owned()), c2.clone()),
+        ]),
+    );
+
+    adapter.publish_modules(c2_modules);
+    let c2_s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+    let c2_r = adapter.load_type(&TypeTag::from_str("0x2::c::R").unwrap());
+    let c2_q = adapter.load_type(&TypeTag::from_str("0x2::c::Q").unwrap());
+
+    for s in &[c0_s, c1_s, c2_s] {
+        let TypeTag::Struct(st) = adapter.get_type_tag(s) else {
+            panic!("Not a struct: {s:?}")
+        };
+
+        assert_eq!(st.module_id(), c0);
+    }
+
+    for r in &[c1_r, c2_r] {
+        let TypeTag::Struct(st) = adapter.get_type_tag(r) else {
+            panic!("Not a struct: {r:?}")
+        };
+
+        assert_eq!(st.module_id(), c1);
+    }
+
+    let TypeTag::Struct(st) = adapter.get_type_tag(&c2_q) else {
+        panic!("Not a struct: {c2_q:?}")
+    };
+
+    assert_eq!(st.module_id(), c2);
+}
+
+#[test]
+fn relink_defining_module_oneshot() {
+    // Simulates the loader being made aware of the final package in a sequence of upgrades (perhaps
+    // a previous instance of the VM and loader participated in the publishing of previous versions)
+    // but still needing to correctly set-up the defining modules for the types in the latest
+    // version of the package, based on the linkage table at the time of loading/publishing:
+
+    let data_store = InMemoryStorage::new();
+
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let c1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("c").to_owned());
+    let c2 = ModuleId::new(UPGRADE_ACCOUNT_2, ident_str!("c").to_owned());
+
+    let c2_modules = get_relinker_tests_modules_with_deps("c_v2", []).unwrap();
+
+    let mut adapter = Adapter::new(data_store).relink(
+        UPGRADE_ACCOUNT_2,
+        /* linkage */ BTreeMap::from_iter([(c0.clone(), c2.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((c0.clone(), ident_str!("R").to_owned()), c1.clone()),
+            ((c0.clone(), ident_str!("Q").to_owned()), c2.clone()),
+        ]),
+    );
+
+    adapter.publish_modules(c2_modules);
+    let s = adapter.load_type(&TypeTag::from_str("0x2::c::S").unwrap());
+    let r = adapter.load_type(&TypeTag::from_str("0x2::c::R").unwrap());
+    let q = adapter.load_type(&TypeTag::from_str("0x2::c::Q").unwrap());
+
+    let TypeTag::Struct(s) = adapter.get_type_tag(&s) else {
+        panic!("Not a struct: {s:?}")
+    };
+
+    let TypeTag::Struct(r) = adapter.get_type_tag(&r) else {
+        panic!("Not a struct: {r:?}")
+    };
+
+    let TypeTag::Struct(q) = adapter.get_type_tag(&q) else {
+        panic!("Not a struct: {q:?}")
+    };
+
+    assert_eq!(s.module_id(), c0);
+    assert_eq!(r.module_id(), c1);
+    assert_eq!(q.module_id(), c2);
+}
+
+#[test]
+fn relink_defining_module_cleanup() {
+    // If loading fails for a module that pulls in a module that was defined at an earlier version
+    // of the package, roll-back should occur cleanly.
+    let data_store = InMemoryStorage::new();
+
+    let c0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("c").to_owned());
+    let b0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("b").to_owned());
+    let b1 = ModuleId::new(UPGRADE_ACCOUNT, ident_str!("b").to_owned());
+
+    let mut adapter = Adapter::new(data_store).relink(
+        UPGRADE_ACCOUNT,
+        /* linkage */
+        BTreeMap::from_iter([(b0.clone(), b1.clone()), (c0.clone(), c0.clone())]),
+        /* type origin */
+        BTreeMap::from_iter([
+            ((c0.clone(), ident_str!("S").to_owned()), c0.clone()),
+            ((b0.clone(), ident_str!("S").to_owned()), b1.clone()),
+        ]),
+    );
+
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let b1_modules = get_relinker_tests_modules_with_deps("b_v1", ["c_v1"]).unwrap();
+
+    // B was built against the later version of C but published against the earlier version,
+    // which should fail because a function is missing.
+    adapter.publish_modules(c0_modules);
+
+    // Somehow dependency verification fails, and the publish succeeds.
+    fail::cfg("verifier-failpoint-4", "100%return").unwrap();
+    adapter.publish_modules(b1_modules);
+
+    // This call should fail to load the module and rollback cleanly
+    adapter.call_function_with_error(&b0, ident_str!("b"));
+
+    // Restore old behavior of failpoint
+    fail::cfg("verifier-failpoint-4", "off").unwrap();
+}
+
+#[test]
+fn publish_bundle_and_load() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let a0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("a").to_owned());
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let b0_modules = get_relinker_tests_modules_with_deps("b_v0", ["c_v0"]).unwrap();
+    let a0_modules = get_relinker_tests_modules_with_deps("a_v0", ["b_v0", "c_v1"]).unwrap();
+
+    let mut modules = vec![];
+    modules.extend(c1_modules);
+    modules.extend(b0_modules);
+    modules.extend(a0_modules);
+
+    // Publish all the modules together
+    adapter.publish_module_bundle(modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(44 + 43 + 1)],
+        adapter.call_function_with_return(&a0, ident_str!("a")),
+    );
+}
+
+#[test]
+fn publish_bundle_with_err_retry() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let a0 = ModuleId::new(DEFAULT_ACCOUNT, ident_str!("a").to_owned());
+    let c0_modules = get_relinker_tests_modules_with_deps("c_v0", []).unwrap();
+    let c1_modules = get_relinker_tests_modules_with_deps("c_v1", []).unwrap();
+    let b0_modules = get_relinker_tests_modules_with_deps("b_v0", ["c_v0"]).unwrap();
+    let a0_modules = get_relinker_tests_modules_with_deps("a_v0", ["b_v0", "c_v1"]).unwrap();
+
+    let mut modules = vec![];
+    modules.extend(c0_modules);
+    modules.extend(b0_modules.clone());
+    modules.extend(a0_modules.clone());
+
+    // Publishing the bundle should fail, because `a0` should not link with `c0`.
+    adapter.publish_module_bundle_with_error(modules);
+
+    let mut modules = vec![];
+    modules.extend(c1_modules);
+    modules.extend(b0_modules);
+    modules.extend(a0_modules);
+
+    // Try again and everything should publish successfully (in particular, the failed publish
+    // will not leave behind modules in the loader).
+    adapter.publish_module_bundle(modules);
+
+    assert_eq!(
+        vec![MoveValue::U64(44 + 43 + 1)],
+        adapter.call_function_with_return(&a0, ident_str!("a")),
+    );
+}
+
+#[test]
+fn deep_dependency_list_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 350u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 101u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 5u64;
+    let height = 101u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 350u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 10u64;
+    let height = 20u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 100u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = DEFAULT_ACCOUNT;
+    module
+}
+
+// Create a list of dependent modules
+fn dependency_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_dependencies(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a tree (well a forest or DAG really) of dependent modules
+fn dependency_tree(width: u64, height: u64, modules: &mut Vec<CompiledModule>) {
+    let mut deps = vec![];
+    for i in 0..width {
+        let name = format!("A_{}_{}", 0, i);
+        let module = leaf_module(name.as_str());
+        deps.push(name);
+        modules.push(module);
+    }
+    for i in 1..height {
+        let mut new_deps = vec![];
+        for j in 0..width {
+            let name = format!("A_{}_{}", i, j);
+            let module = empty_module_with_dependencies(name.clone(), deps.clone());
+            new_deps.push(name);
+            modules.push(module);
+        }
+        deps = new_deps;
+    }
+}
+
+// Create a module that uses (depends on) the list of given modules
+fn empty_module_with_dependencies(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = DEFAULT_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.module_handles.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
+
+// Create a list of friends modules
+fn friend_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_friends(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a module that uses (friends on) the list of given modules
+fn empty_module_with_friends(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = DEFAULT_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.friend_decls.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests_modules.move b/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests_modules.move
new file mode 100644
index 000000000..dcdc5a476
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/loader_tests_modules.move
@@ -0,0 +1,173 @@
+address 0x2 {
+    module A {
+        struct S has copy, drop {
+            f1: 0x2::B::S,
+            f2: 0x2::C::S,
+        }
+
+        public fun new(f1: 0x2::B::S, f2: 0x2::C::S): S {
+            Self::S { f1, f2 }
+        }
+
+        public fun destroy(v: S): (0x2::B::S, 0x2::C::S) {
+            let S { f1: v1, f2: v2 } = v;
+            (v1, v2)
+        }
+
+        public fun entry_a() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x42, true);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x42, false);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            }
+        }
+
+        public fun get_field_1(s: &S): 0x2::B::S {
+            *&s.f1
+        }
+    }
+
+    module B {
+        struct S has copy, drop {
+            f1: u64,
+            f2: u128,
+        }
+
+        public fun new(v1: u64, v2: u128): S { S { f1: v1, f2: v2 } }
+
+        public fun destroy(v: S): (u64, u128) {
+            let S { f1: val1, f2: val2 } = v;
+            (val1, val2)
+        }
+
+        public fun b_and_c(b: &S, c: 0x2::C::S): S {
+            let _ = 0x2::C::destroy(c);
+            let another_b = S {
+                f1: 0,
+                f2: b.f2,
+            };
+            another_b
+        }
+    }
+
+    module C {
+        struct S has copy, drop {
+            f1: address,
+            f2: bool,
+        }
+
+        public fun new(v1: address, v2: bool): S {
+            Self::S {
+                f1: v1,
+                f2: v2,
+            }
+        }
+
+        public fun destroy(v: S): address {
+            let S { f1: v1, f2: _ } = v;
+            v1
+        }
+
+        public fun just_c() {
+            let i = 0;
+            while (i < 10) {
+                let c = new(@0x0, false);
+                let S { f1: _, f2: _ } = c;
+                i = i + 1;
+            }
+        }
+    }
+
+
+    module D {
+        struct S has copy, drop {
+            f1: 0x2::B::S,
+        }
+
+        public fun new(): 0x2::D::S {
+            Self::S {
+                f1: 0x2::B::new(20, 100),
+            }
+        }
+
+        public fun entry_d() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x45, false);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x46, true);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            }
+        }
+    }
+
+    module E {
+        struct S {
+            f1: u64,
+        }
+
+        public fun new(): 0x2::E::S { Self::S { f1: 20 } }
+
+        public fun entry_e() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x100, false);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x101, true);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            };
+        }
+    }
+
+    module F {
+        struct S {
+            f1: u64,
+        }
+
+        public fun new(): 0x2::F::S { Self::S { f1: 20 } }
+
+        public fun entry_f() {
+            0x2::A::entry_a();
+        }
+    }
+
+    module G {
+        struct S has copy, drop {
+            f1: u64,
+            f2: u128,
+            f3: u16,
+            f4: u32,
+            f5: u256
+        }
+
+        public fun new(v1: u64, v2: u128, v3: u16, v4: u32, v5: u256): S { S { f1: v1, f2: v2, f3: v3, f4: v4, f5: v5 } }
+
+        public fun destroy(v: S): (u64, u128, u16, u32, u256) {
+            let S { f1: val1, f2: val2, f3: val3, f4: val4, f5: val5 } = v;
+            (val1, val2, val3, val4, val5)
+        }
+
+        public fun b_and_c(b: &S, c: 0x2::C::S): S {
+            let _ = 0x2::C::destroy(c);
+            let another_b = S {
+                f1: 0,
+                f2: b.f2,
+                f3: b.f3 + (b.f2 as u16),
+                f4: (b.f1 as u32),
+                f5: b.f5
+            };
+            another_b
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/mod.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/mod.rs
new file mode 100644
index 000000000..c50953488
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/mod.rs
@@ -0,0 +1,15 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod bad_entry_point_tests;
+mod bad_storage_tests;
+mod binary_format_version;
+mod exec_func_effects_tests;
+mod function_arg_tests;
+mod instantiation_tests;
+mod invariant_violation_tests;
+mod leak_tests;
+mod loader_tests;
+mod nested_loop_tests;
+mod return_value_tests;
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/nested_loop_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/nested_loop_tests.rs
new file mode 100644
index 000000000..83584d8e4
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/nested_loop_tests.rs
@@ -0,0 +1,157 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, as_script, compile_units};
+use move_core_types::account_address::AccountAddress;
+use move_vm_config::{runtime::VMConfig, verifier::VerifierConfig};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn test_publish_module_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        module {{ADDR}}::M {
+            fun foo() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let m = as_module(units.pop().unwrap());
+    let mut m_blob = vec![];
+    m.serialize(&mut m_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob.clone(), TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob, TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
+
+#[test]
+fn test_run_script_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        script {
+            fun main() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let s = as_script(units.pop().unwrap());
+    let mut s_blob: Vec<u8> = vec![];
+    s.serialize(&mut s_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob, vec![], args, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_a_v0.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_a_v0.move
new file mode 100644
index 000000000..270ccc213
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_a_v0.move
@@ -0,0 +1,6 @@
+/// Dependencies: [B v0+, C v1+]
+module 0x2::a {
+    public fun a(): u64 {
+        0x2::b::b() + 0x2::c::d()
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v0.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v0.move
new file mode 100644
index 000000000..abbc19add
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v0.move
@@ -0,0 +1,6 @@
+/// Dependencies: [C v0+]
+module 0x2::b {
+    public fun b(): u64 {
+        0x2::c::c() + 1
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v1.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v1.move
new file mode 100644
index 000000000..2adcb5bdb
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_b_v1.move
@@ -0,0 +1,8 @@
+/// Dependencies: [C v0+]
+module 0x2::b {
+    struct S { x: u64 }
+
+    public fun b(): u64 {
+        0x2::c::c() * 0x2::c::d()
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v0.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v0.move
new file mode 100644
index 000000000..f099f126c
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v0.move
@@ -0,0 +1,8 @@
+/// Dependencies: []
+module 0x2::c {
+    struct S { x: u64 }
+
+    public fun c(): u64 {
+        42
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v1.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v1.move
new file mode 100644
index 000000000..fecfe8694
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v1.move
@@ -0,0 +1,13 @@
+/// Dependencies: []
+module 0x2::c {
+    struct S { x: u64 }
+    struct R { x: u64, y: u64 }
+
+    public fun c(): u64 {
+        43
+    }
+
+    public fun d(): u64 {
+        44
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v2.move b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v2.move
new file mode 100644
index 000000000..2660fbbe6
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/relinking_tests_c_v2.move
@@ -0,0 +1,14 @@
+/// Dependencies: []
+module 0x2::c {
+    struct S { x: u64 }
+    struct R { x: u64, y: u64 }
+    struct Q { x: u64, y: u64, z: u64 }
+
+    public fun c(): u64 {
+        45
+    }
+
+    public fun d(): u64 {
+        46
+    }
+}
diff --git a/vendors/move/crates/move-vm-integration-tests/src/tests/return_value_tests.rs b/vendors/move/crates/move-vm-integration-tests/src/tests/return_value_tests.rs
new file mode 100644
index 000000000..2a13acbdd
--- /dev/null
+++ b/vendors/move/crates/move-vm-integration-tests/src/tests/return_value_tests.rs
@@ -0,0 +1,130 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, TypeTag},
+    runtime_value::{MoveTypeLayout, MoveValue},
+};
+use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+fn run(
+    structs: &[&str],
+    fun_sig: &str,
+    fun_body: &str,
+    ty_arg_tags: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) -> VMResult<Vec<Vec<u8>>> {
+    let structs = structs.to_vec().join("\n");
+
+    let code = format!(
+        r#"
+        module 0x{}::M {{
+            {}
+
+            fun foo{} {{
+                {}
+            }}
+        }}
+    "#,
+        TEST_ADDR, structs, fun_sig, fun_body
+    );
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let ty_args: Vec<_> = ty_arg_tags
+        .into_iter()
+        .map(|tag| sess.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    let args: Vec<_> = args
+        .into_iter()
+        .map(|val| val.simple_serialize().unwrap())
+        .collect();
+
+    let SerializedReturnValues {
+        return_values,
+        mutable_reference_outputs: _,
+    } = sess.execute_function_bypass_visibility(
+        &module_id,
+        &fun_name,
+        ty_args,
+        args,
+        &mut UnmeteredGasMeter,
+    )?;
+
+    Ok(return_values
+        .into_iter()
+        .map(|(bytes, _layout)| bytes)
+        .collect())
+}
+
+fn expect_success(
+    structs: &[&str],
+    fun_sig: &str,
+    fun_body: &str,
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+    expected_layouts: &[MoveTypeLayout],
+) {
+    let return_vals = run(structs, fun_sig, fun_body, ty_args, args).unwrap();
+    assert!(return_vals.len() == expected_layouts.len());
+
+    for (blob, layout) in return_vals.iter().zip(expected_layouts.iter()) {
+        MoveValue::simple_deserialize(blob, layout).unwrap();
+    }
+}
+
+#[test]
+fn return_nothing() {
+    expect_success(&[], "()", "", vec![], vec![], &[])
+}
+
+#[test]
+fn return_u64() {
+    expect_success(&[], "(): u64", "42", vec![], vec![], &[MoveTypeLayout::U64])
+}
+
+#[test]
+fn return_u64_bool() {
+    expect_success(
+        &[],
+        "(): (u64, bool)",
+        "(42, true)",
+        vec![],
+        vec![],
+        &[MoveTypeLayout::U64, MoveTypeLayout::Bool],
+    )
+}
+
+#[test]
+fn return_signer_ref() {
+    expect_success(
+        &[],
+        "(s: &signer): &signer",
+        "s",
+        vec![],
+        vec![MoveValue::Signer(TEST_ADDR)],
+        &[MoveTypeLayout::Signer],
+    )
+}
diff --git a/vendors/move/crates/move-vm-profiler/Cargo.toml b/vendors/move/crates/move-vm-profiler/Cargo.toml
new file mode 100644
index 000000000..e331b8d16
--- /dev/null
+++ b/vendors/move/crates/move-vm-profiler/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "move-vm-profiler"
+version = "0.1.0"
+authors = ["Mysten Labs <build@mystenlabs.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+serde.workspace = true
+serde_json.workspace = true
+once_cell.workspace = true
+
+move-vm-config.workspace = true
diff --git a/vendors/move/crates/move-vm-profiler/src/lib.rs b/vendors/move/crates/move-vm-profiler/src/lib.rs
new file mode 100644
index 000000000..dc2f4155c
--- /dev/null
+++ b/vendors/move/crates/move-vm-profiler/src/lib.rs
@@ -0,0 +1,325 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(debug_assertions)]
+use move_vm_config::runtime::VMProfilerConfig;
+#[cfg(debug_assertions)]
+use once_cell::sync::Lazy;
+#[cfg(debug_assertions)]
+use serde::Serialize;
+#[cfg(debug_assertions)]
+use std::collections::BTreeMap;
+
+#[cfg(debug_assertions)]
+const MOVE_VM_PROFILER_ENV_VAR_NAME: &str = "MOVE_VM_PROFILE";
+
+#[cfg(debug_assertions)]
+static PROFILER_ENABLED: Lazy<bool> =
+    Lazy::new(|| std::env::var(MOVE_VM_PROFILER_ENV_VAR_NAME).is_ok());
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Serialize)]
+pub struct FrameName {
+    name: String,
+    file: String,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Serialize)]
+pub struct Shared {
+    frames: Vec<FrameName>,
+
+    #[serde(skip)]
+    frame_table: BTreeMap<String, usize>,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Serialize)]
+pub struct Event {
+    #[serde(rename(serialize = "type"))]
+    ty: String,
+    frame: u64,
+    at: u64,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Profile {
+    #[serde(rename(serialize = "type"))]
+    ty: String,
+    name: String,
+    unit: String,
+    start_value: u64,
+    end_value: u64,
+    events: Vec<Event>,
+}
+
+#[cfg(debug_assertions)]
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GasProfiler {
+    exporter: String,
+    name: String,
+    active_profile_index: u64,
+    #[serde(rename(serialize = "$schema"))]
+    schema: String,
+    shared: Shared,
+    profiles: Vec<Profile>,
+
+    #[serde(skip)]
+    pub start_gas: u64,
+    #[serde(skip)]
+    pub config: VMProfilerConfig,
+    #[serde(skip)]
+    finished: bool,
+}
+
+#[cfg(debug_assertions)]
+impl GasProfiler {
+    // Used by profiler viz tool
+    const OPEN_FRAME_IDENT: &str = "O";
+    const CLOSE_FRAME_IDENT: &str = "C";
+
+    const TOP_LEVEL_FRAME_NAME: &str = "root";
+
+    pub fn init(config: &VMProfilerConfig, name: String, start_gas: u64) -> Self {
+        let mut prof = GasProfiler {
+            exporter: "speedscope@1.15.2".to_string(),
+            name: name.clone(),
+            active_profile_index: 0,
+            schema: "https://www.speedscope.app/file-format-schema.json".to_string(),
+            shared: Shared {
+                frames: vec![],
+                frame_table: BTreeMap::new(),
+            },
+            profiles: vec![Profile {
+                ty: "evented".to_string(),
+                name,
+                unit: "none".to_string(),
+                start_value: 0,
+                end_value: 0,
+                events: vec![],
+            }],
+            start_gas,
+            config: config.clone(),
+            finished: false,
+        };
+        profile_open_frame_impl!(
+            Some(&mut prof),
+            Self::TOP_LEVEL_FRAME_NAME.to_string(),
+            start_gas
+        );
+        prof
+    }
+
+    pub fn init_default_cfg(name: String, start_gas: u64) -> Self {
+        Self::init(&VMProfilerConfig::default(), name, start_gas)
+    }
+
+    fn profile_name(&self) -> String {
+        self.name.clone()
+    }
+
+    pub fn short_name(s: &String) -> String {
+        s.split("::").last().unwrap_or(s).to_string()
+    }
+
+    fn is_metered(&self) -> bool {
+        (self.profiles[0].end_value != 0) && (self.start_gas != 0)
+    }
+
+    fn start_gas(&self) -> u64 {
+        self.start_gas
+    }
+
+    fn add_frame(
+        &mut self,
+        frame_name: String,
+        frame_display_name: String,
+        metadata: String,
+    ) -> u64 {
+        match self.shared.frame_table.get(frame_name.as_str()) {
+            Some(idx) => *idx as u64,
+            None => {
+                let val = self.shared.frames.len() as u64;
+                self.shared.frames.push(FrameName {
+                    name: frame_display_name,
+                    file: metadata,
+                });
+                self.shared.frame_table.insert(frame_name, val as usize);
+                val
+            }
+        }
+    }
+
+    pub fn open_frame(&mut self, frame_name: String, metadata: String, gas_start: u64) {
+        if !*PROFILER_ENABLED || self.start_gas == 0 {
+            return;
+        }
+
+        let frame_idx = self.add_frame(metadata.clone(), frame_name, metadata);
+        let start = self.start_gas();
+
+        self.profiles[0].events.push(Event {
+            ty: Self::OPEN_FRAME_IDENT.to_string(),
+            frame: frame_idx,
+            at: start - gas_start,
+        });
+    }
+
+    pub fn close_frame(&mut self, frame_name: String, metadata: String, gas_end: u64) {
+        if !*PROFILER_ENABLED || self.start_gas == 0 {
+            return;
+        }
+        let frame_idx = self.add_frame(metadata.clone(), frame_name, metadata);
+        let start = self.start_gas();
+
+        self.profiles[0].events.push(Event {
+            ty: Self::CLOSE_FRAME_IDENT.to_string(),
+            frame: frame_idx,
+            at: start - gas_end,
+        });
+        self.profiles[0].end_value = start - gas_end;
+    }
+
+    pub fn to_file(&self) {
+        if !*PROFILER_ENABLED || !self.is_metered() {
+            return;
+        }
+        // Get the unix timestamp
+        let now = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .expect("Clock may have gone backwards")
+            .as_nanos();
+
+        let mut p = self.config.base_path.clone();
+        p.push(format!("gas_profile_{}_{}.json", self.profile_name(), now));
+        let path_str = p.as_os_str().to_string_lossy().to_string();
+        let mut file = std::fs::File::create(p).expect("Unable to create file");
+
+        let json = serde_json::to_string_pretty(&self).expect("Unable to serialize profile");
+        std::io::Write::write_all(&mut file, json.as_bytes()).expect("Unable to write to file");
+        println!("Gas profile written to file: {}", path_str);
+    }
+
+    pub fn finish(&mut self) {
+        if self.finished {
+            return;
+        }
+        self.finished = true;
+        let end_gas = self.start_gas() - self.profiles[0].end_value;
+        let mut q = Some(self);
+        profile_close_frame_impl!(&mut q, Self::TOP_LEVEL_FRAME_NAME.to_string(), end_gas);
+        profile_dump_file!(q.unwrap());
+    }
+}
+
+#[cfg(debug_assertions)]
+impl Drop for GasProfiler {
+    fn drop(&mut self) {
+        self.finish();
+    }
+}
+
+#[macro_export]
+macro_rules! profile_open_frame {
+    ($gas_meter:expr, $frame_name:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            let gas_rem = $gas_meter.remaining_gas().into();
+            move_vm_profiler::profile_open_frame_impl!(
+                $gas_meter.get_profiler_mut(),
+                $frame_name,
+                gas_rem
+            )
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_open_frame_impl {
+    ($profiler:expr, $frame_name:expr, $gas_rem:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            if let Some(profiler) = $profiler {
+                let name = if !profiler.config.use_long_function_name {
+                    GasProfiler::short_name(&$frame_name)
+                } else {
+                    $frame_name
+                };
+                profiler.open_frame(name, $frame_name, $gas_rem)
+            }
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_close_frame {
+    ($gas_meter:expr, $frame_name:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            let gas_rem = $gas_meter.remaining_gas().into();
+            move_vm_profiler::profile_close_frame_impl!(
+                $gas_meter.get_profiler_mut(),
+                $frame_name,
+                gas_rem
+            )
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_close_frame_impl {
+    ($profiler:expr, $frame_name:expr, $gas_rem:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            if let Some(profiler) = $profiler {
+                let name = if !profiler.config.use_long_function_name {
+                    GasProfiler::short_name(&$frame_name)
+                } else {
+                    $frame_name.clone()
+                };
+                profiler.close_frame(name, $frame_name, $gas_rem)
+            }
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_open_instr {
+    ($gas_meter:expr, $frame_name:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            let gas_rem = $gas_meter.remaining_gas().into();
+            if let Some(profiler) = $gas_meter.get_profiler_mut() {
+                if profiler.config.track_bytecode_instructions {
+                    profiler.open_frame($frame_name.clone(), $frame_name, gas_rem)
+                }
+            }
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_close_instr {
+    ($gas_meter:expr, $frame_name:expr) => {
+        #[cfg(debug_assertions)]
+        {
+            let gas_rem = $gas_meter.remaining_gas().into();
+            if let Some(profiler) = $gas_meter.get_profiler_mut() {
+                if profiler.config.track_bytecode_instructions {
+                    profiler.close_frame($frame_name.clone(), $frame_name, gas_rem)
+                }
+            }
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! profile_dump_file {
+    ($profiler:expr) => {
+        #[cfg(debug_assertions)]
+        $profiler.to_file()
+    };
+}
diff --git a/vendors/move/crates/move-vm-runtime/Cargo.toml b/vendors/move/crates/move-vm-runtime/Cargo.toml
new file mode 100644
index 000000000..81e4d4428
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "move-vm-runtime"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core Move execution logic"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+better_any.workspace = true
+fail.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+sha3.workspace = true
+tracing.workspace = true
+smallvec.workspace = true
+
+move-bytecode-verifier = { path = "../move-bytecode-verifier" }
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-vm-profiler.workspace = true
+
+[dev-dependencies]
+anyhow = "1.0.71"
+hex.workspace = true
+proptest.workspace = true
+move-ir-compiler.workspace = true
+move-compiler.workspace = true
+
+[features]
+default = []
+fuzzing = ["move-vm-types/fuzzing"]
+failpoints = ["fail/failpoints"]
+# Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds.
+debugging = []
+testing = []
+lazy_natives = []
diff --git a/vendors/move/crates/move-vm-runtime/src/data_cache.rs b/vendors/move/crates/move-vm-runtime/src/data_cache.rs
new file mode 100644
index 000000000..cd46dd7a6
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/data_cache.rs
@@ -0,0 +1,304 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::loader::Loader;
+
+use move_binary_format::errors::*;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Event, Op},
+    gas_algebra::NumBytes,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::Type,
+    values::{GlobalValue, Value},
+};
+use std::collections::btree_map::BTreeMap;
+
+pub struct AccountDataCache {
+    data_map: BTreeMap<Type, (MoveTypeLayout, GlobalValue)>,
+    module_map: BTreeMap<Identifier, Vec<u8>>,
+}
+
+impl AccountDataCache {
+    fn new() -> Self {
+        Self {
+            data_map: BTreeMap::new(),
+            module_map: BTreeMap::new(),
+        }
+    }
+}
+
+/// Transaction data cache. Keep updates within a transaction so they can all be published at
+/// once when the transaction succeeds.
+///
+/// It also provides an implementation for the opcodes that refer to storage and gives the
+/// proper guarantees of reference lifetime.
+///
+/// Dirty objects are serialized and returned in make_write_set.
+///
+/// It is a responsibility of the client to publish changes once the transaction is executed.
+///
+/// The Move VM takes a `DataStore` in input and this is the default and correct implementation
+/// for a data store related to a transaction. Clients should create an instance of this type
+/// and pass it to the Move VM.
+pub(crate) struct TransactionDataCache<'l, S> {
+    remote: S,
+    loader: &'l Loader,
+    account_map: BTreeMap<AccountAddress, AccountDataCache>,
+    event_data: Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)>,
+}
+
+impl<'l, S: MoveResolver> TransactionDataCache<'l, S> {
+    /// Create a `TransactionDataCache` with a `RemoteCache` that provides access to data
+    /// not updated in the transaction.
+    pub(crate) fn new(remote: S, loader: &'l Loader) -> Self {
+        TransactionDataCache {
+            remote,
+            loader,
+            account_map: BTreeMap::new(),
+            event_data: vec![],
+        }
+    }
+
+    /// Make a write set from the updated (dirty, deleted) global resources along with
+    /// published modules.
+    ///
+    /// Gives all proper guarantees on lifetime of global data as well.
+    pub(crate) fn into_effects(mut self) -> (PartialVMResult<(ChangeSet, Vec<Event>)>, S) {
+        (self.impl_into_effects(), self.remote)
+    }
+    fn impl_into_effects(&mut self) -> PartialVMResult<(ChangeSet, Vec<Event>)> {
+        let mut change_set = ChangeSet::new();
+        for (addr, account_data_cache) in std::mem::take(&mut self.account_map).into_iter() {
+            let mut modules = BTreeMap::new();
+            for (module_name, module_blob) in account_data_cache.module_map {
+                modules.insert(module_name, Op::New(module_blob));
+            }
+
+            let mut resources = BTreeMap::new();
+            for (ty, (layout, gv)) in account_data_cache.data_map {
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                let struct_tag = match self.loader.type_to_type_tag(&ty)? {
+                    TypeTag::Struct(struct_tag) => *struct_tag,
+                    _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::New(resource_blob));
+                    }
+                    Op::Modify(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::Modify(resource_blob));
+                    }
+                    Op::Delete => {
+                        resources.insert(struct_tag, Op::Delete);
+                    }
+                }
+            }
+            if !modules.is_empty() || !resources.is_empty() {
+                change_set
+                    .add_account_changeset(
+                        addr,
+                        AccountChangeSet::from_modules_resources(modules, resources),
+                    )
+                    .expect("accounts should be unique");
+            }
+        }
+
+        let mut events = vec![];
+        for (guid, seq_num, ty, ty_layout, val) in std::mem::take(&mut self.event_data) {
+            let ty_tag = self.loader.type_to_type_tag(&ty)?;
+            let blob = val
+                .simple_serialize(&ty_layout)
+                .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+            events.push((guid, seq_num, ty_tag, blob))
+        }
+
+        Ok((change_set, events))
+    }
+
+    pub(crate) fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        // The sender's account will always be mutated.
+        let mut total_mutated_accounts: u64 = 1;
+        for (addr, entry) in self.account_map.iter() {
+            if addr != sender && entry.data_map.values().any(|(_, v)| v.is_mutated()) {
+                total_mutated_accounts += 1;
+            }
+        }
+        total_mutated_accounts
+    }
+
+    pub(crate) fn get_remote_resolver(&self) -> &S {
+        &self.remote
+    }
+
+    pub(crate) fn get_remote_resolver_mut(&mut self) -> &mut S {
+        &mut self.remote
+    }
+}
+
+// `DataStore` implementation for the `TransactionDataCache`
+impl<'l, S: MoveResolver> DataStore for TransactionDataCache<'l, S> {
+    // Retrieve data from the local cache or loads it from the remote cache into the local cache.
+    // All operations on the global data are based on this API and they all load the data
+    // into the cache.
+    fn load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        let account_cache = self
+            .account_map
+            .entry(addr)
+            .or_insert_with(AccountDataCache::new);
+
+        let mut load_res = None;
+        if !account_cache.data_map.contains_key(ty) {
+            let ty_tag = match self.loader.type_to_type_tag(ty)? {
+                TypeTag::Struct(s_tag) => s_tag,
+                _ =>
+                // non-struct top-level value; can't happen
+                {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))
+                }
+            };
+            // TODO(Gas): Shall we charge for this?
+            let ty_layout = self.loader.type_to_type_layout(ty)?;
+
+            let gv = match self.remote.get_resource(&addr, &ty_tag) {
+                Ok(Some(blob)) => {
+                    load_res = Some(Some(NumBytes::new(blob.len() as u64)));
+                    let val = match Value::simple_deserialize(&blob, &ty_layout) {
+                        Some(val) => val,
+                        None => {
+                            let msg =
+                                format!("Failed to deserialize resource {} at {}!", ty_tag, addr);
+                            return Err(PartialVMError::new(
+                                StatusCode::FAILED_TO_DESERIALIZE_RESOURCE,
+                            )
+                            .with_message(msg));
+                        }
+                    };
+
+                    GlobalValue::cached(val)?
+                }
+                Ok(None) => {
+                    load_res = Some(None);
+                    GlobalValue::none()
+                }
+                Err(err) => {
+                    let msg = format!("Unexpected storage error: {:?}", err);
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(msg),
+                    );
+                }
+            };
+
+            account_cache.data_map.insert(ty.clone(), (ty_layout, gv));
+        }
+
+        Ok((
+            account_cache
+                .data_map
+                .get_mut(ty)
+                .map(|(_ty_layout, gv)| gv)
+                .expect("global value must exist"),
+            load_res,
+        ))
+    }
+
+    fn link_context(&self) -> AccountAddress {
+        self.remote.link_context()
+    }
+
+    fn relocate(&self, module_id: &ModuleId) -> PartialVMResult<ModuleId> {
+        self.remote.relocate(module_id).map_err(|err| {
+            PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Error relocating {module_id}: {err:?}"))
+        })
+    }
+
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> PartialVMResult<ModuleId> {
+        self.remote
+            .defining_module(module_id, struct_)
+            .map_err(|err| {
+                PartialVMError::new(StatusCode::LINKER_ERROR).with_message(format!(
+                    "Error finding defining module for {module_id}::{struct_}: {err:?}"
+                ))
+            })
+    }
+
+    fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
+        if let Some(account_cache) = self.account_map.get(module_id.address()) {
+            if let Some(blob) = account_cache.module_map.get(module_id.name()) {
+                return Ok(blob.clone());
+            }
+        }
+        match self.remote.get_module(module_id) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Cannot find {:?} in data cache", module_id))
+                .finish(Location::Undefined)),
+            Err(err) => {
+                let msg = format!("Unexpected storage error: {:?}", err);
+                Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(msg)
+                        .finish(Location::Undefined),
+                )
+            }
+        }
+    }
+
+    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()> {
+        let account_cache = self
+            .account_map
+            .entry(*module_id.address())
+            .or_insert_with(AccountDataCache::new);
+
+        account_cache
+            .module_map
+            .insert(module_id.name().to_owned(), blob);
+
+        Ok(())
+    }
+
+    fn emit_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<()> {
+        let ty_layout = self.loader.type_to_type_layout(&ty)?;
+        self.event_data.push((guid, seq_num, ty, ty_layout, val));
+        Ok(())
+    }
+
+    fn events(&self) -> &Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)> {
+        &self.event_data
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/debug.rs b/vendors/move/crates/move-vm-runtime/src/debug.rs
new file mode 100644
index 000000000..9be306b09
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/debug.rs
@@ -0,0 +1,195 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+use move_binary_format::file_format::Bytecode;
+use move_vm_types::values::{self, Locals};
+use std::{
+    collections::BTreeSet,
+    io::{self, Write},
+    str::FromStr,
+};
+
+#[derive(Debug)]
+enum DebugCommand {
+    PrintStack,
+    Step,
+    Continue,
+    Breakpoint(String),
+    DeleteBreakpoint(String),
+    PrintBreakpoints,
+}
+
+impl DebugCommand {
+    pub fn debug_string(&self) -> &str {
+        match self {
+            Self::PrintStack => "stack",
+            Self::Step => "step",
+            Self::Continue => "continue",
+            Self::Breakpoint(_) => "breakpoint ",
+            Self::DeleteBreakpoint(_) => "delete ",
+            Self::PrintBreakpoints => "breakpoints",
+        }
+    }
+
+    pub fn commands() -> Vec<DebugCommand> {
+        vec![
+            Self::PrintStack,
+            Self::Step,
+            Self::Continue,
+            Self::Breakpoint("".to_string()),
+            Self::DeleteBreakpoint("".to_string()),
+            Self::PrintBreakpoints,
+        ]
+    }
+}
+
+impl FromStr for DebugCommand {
+    type Err = String;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use DebugCommand::*;
+        let s = s.trim();
+        if s.starts_with(PrintStack.debug_string()) {
+            return Ok(PrintStack);
+        }
+        if s.starts_with(Step.debug_string()) {
+            return Ok(Step);
+        }
+        if s.starts_with(Continue.debug_string()) {
+            return Ok(Continue);
+        }
+        if let Some(breakpoint) = s.strip_prefix(Breakpoint("".to_owned()).debug_string()) {
+            return Ok(Breakpoint(breakpoint.to_owned()));
+        }
+        if let Some(breakpoint) = s.strip_prefix(DeleteBreakpoint("".to_owned()).debug_string()) {
+            return Ok(DeleteBreakpoint(breakpoint.to_owned()));
+        }
+        if s.starts_with(PrintBreakpoints.debug_string()) {
+            return Ok(PrintBreakpoints);
+        }
+        Err(format!(
+            "Unrecognized command: {}\nAvailable commands: {}",
+            s,
+            Self::commands()
+                .iter()
+                .map(|command| command.debug_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        ))
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct DebugContext {
+    breakpoints: BTreeSet<String>,
+    should_take_input: bool,
+}
+
+impl DebugContext {
+    pub(crate) fn new() -> Self {
+        Self {
+            breakpoints: BTreeSet::new(),
+            should_take_input: true,
+        }
+    }
+
+    pub(crate) fn debug_loop(
+        &mut self,
+        function_desc: &Function,
+        locals: &Locals,
+        pc: u16,
+        instr: &Bytecode,
+        resolver: &Loader,
+        interp: &Interpreter,
+    ) {
+        let instr_string = format!("{:?}", instr);
+        let function_string = function_desc.pretty_string();
+        let breakpoint_hit = self.breakpoints.contains(&function_string)
+            || self
+                .breakpoints
+                .iter()
+                .any(|bp| instr_string[..].starts_with(bp.as_str()));
+
+        if self.should_take_input || breakpoint_hit {
+            self.should_take_input = true;
+            if breakpoint_hit {
+                let bp_match = self
+                    .breakpoints
+                    .iter()
+                    .find(|bp| instr_string.starts_with(bp.as_str()))
+                    .unwrap()
+                    .clone();
+                println!(
+                    "Breakpoint {} hit with instruction {}",
+                    bp_match, instr_string
+                );
+            }
+            println!(
+                "function >> {}\ninstruction >> {:?}\nprogram counter >> {}",
+                function_string, instr, pc
+            );
+            loop {
+                print!("> ");
+                std::io::stdout().flush().unwrap();
+                let mut input = String::new();
+                match io::stdin().read_line(&mut input) {
+                    Ok(_) => match input.parse::<DebugCommand>() {
+                        Err(err) => println!("{}", err),
+                        Ok(command) => match command {
+                            DebugCommand::Step => {
+                                self.should_take_input = true;
+                                break;
+                            }
+                            DebugCommand::Continue => {
+                                self.should_take_input = false;
+                                break;
+                            }
+                            DebugCommand::Breakpoint(breakpoint) => {
+                                self.breakpoints.insert(breakpoint.to_string());
+                            }
+                            DebugCommand::DeleteBreakpoint(breakpoint) => {
+                                self.breakpoints.remove(&breakpoint);
+                            }
+                            DebugCommand::PrintBreakpoints => self
+                                .breakpoints
+                                .iter()
+                                .enumerate()
+                                .for_each(|(i, bp)| println!("[{}] {}", i, bp)),
+                            DebugCommand::PrintStack => {
+                                let mut s = String::new();
+                                interp.debug_print_stack_trace(&mut s, resolver).unwrap();
+                                println!("{}", s);
+                                println!("Current frame: {}\n", function_string);
+                                let code = function_desc.code();
+                                println!("        Code:");
+                                for (i, instr) in code.iter().enumerate() {
+                                    if i as u16 == pc {
+                                        println!("          > [{}] {:?}", pc, instr);
+                                    } else {
+                                        println!("            [{}] {:?}", i, instr);
+                                    }
+                                }
+                                println!("        Locals:");
+                                if function_desc.local_count() > 0 {
+                                    let mut s = String::new();
+                                    values::debug::print_locals(&mut s, locals).unwrap();
+                                    println!("{}", s);
+                                } else {
+                                    println!("            (none)");
+                                }
+                            }
+                        },
+                    },
+                    Err(err) => {
+                        println!("Error reading input: {}", err);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/interpreter.rs b/vendors/move/crates/move-vm-runtime/src/interpreter.rs
new file mode 100644
index 000000000..8ddc2ca35
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/interpreter.rs
@@ -0,0 +1,1727 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    loader::{Function, Loader, Resolver},
+    native_functions::NativeContext,
+    trace,
+};
+use fail::fail_point;
+use move_binary_format::{
+    errors::*,
+    file_format::{Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{NumArgs, NumBytes},
+    language_storage::TypeTag,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_profiler::{
+    profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    gas::{GasMeter, SimpleInstruction},
+    loaded_data::runtime_types::Type,
+    values::{
+        self, GlobalValue, IntegerValue, Locals, Reference, Struct, StructRef, VMValueCast, Value,
+        Vector, VectorRef,
+    },
+    views::TypeView,
+};
+use smallvec::SmallVec;
+
+use crate::native_extensions::NativeContextExtensions;
+use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc};
+use tracing::error;
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! set_err_info {
+    ($frame:ident, $e:expr) => {{
+        $e.at_code_offset($frame.function.index(), $frame.pc)
+            .finish($frame.location())
+    }};
+}
+
+enum InstrRet {
+    Ok,
+    ExitCode(ExitCode),
+    Branch,
+}
+
+/// `Interpreter` instances can execute Move functions.
+///
+/// An `Interpreter` instance is a stand alone execution context for a function.
+/// It mimics execution on a single thread, with an call stack and an operand stack.
+pub(crate) struct Interpreter {
+    /// Operand stack, where Move `Value`s are stored for stack operations.
+    operand_stack: Stack,
+    /// The stack of active functions.
+    call_stack: CallStack,
+    /// Limits imposed at runtime
+    runtime_limits_config: VMRuntimeLimitsConfig,
+}
+
+struct TypeWithLoader<'a, 'b> {
+    ty: &'a Type,
+    loader: &'b Loader,
+}
+
+impl<'a, 'b> TypeView for TypeWithLoader<'a, 'b> {
+    fn to_type_tag(&self) -> TypeTag {
+        self.loader.type_to_type_tag(self.ty).unwrap()
+    }
+}
+
+impl Interpreter {
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        &self.runtime_limits_config
+    }
+    /// Entrypoint into the interpreter. All external calls need to be routed through this
+    /// function.
+    pub(crate) fn entrypoint(
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        loader: &Loader,
+    ) -> VMResult<Vec<Value>> {
+        let mut interpreter = Interpreter {
+            operand_stack: Stack::new(),
+            call_stack: CallStack::new(),
+            runtime_limits_config: loader.vm_config().runtime_limits_config.clone(),
+        };
+
+        profile_open_frame!(gas_meter, function.pretty_string());
+
+        if function.is_native() {
+            for arg in args {
+                interpreter
+                    .operand_stack
+                    .push(arg)
+                    .map_err(|e| e.finish(Location::Undefined))?;
+            }
+            let link_context = data_store.link_context();
+            let resolver = function.get_resolver(link_context, loader);
+
+            let return_values = interpreter
+                .call_native_return_values(
+                    &resolver,
+                    data_store,
+                    gas_meter,
+                    extensions,
+                    function.clone(),
+                    &ty_args,
+                )
+                .map_err(|e| match function.module_id() {
+                    Some(id) => e
+                        .at_code_offset(function.index(), 0)
+                        .finish(Location::Module(id.clone())),
+                    None => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(
+                            "Unexpected native function not located in a module".to_owned(),
+                        )
+                        .finish(Location::Undefined),
+                })?;
+
+            profile_close_frame!(gas_meter, function.pretty_string());
+
+            Ok(return_values.into_iter().collect())
+        } else {
+            interpreter.execute_main(
+                loader, data_store, gas_meter, extensions, function, ty_args, args,
+            )
+        }
+    }
+
+    /// Main loop for the execution of a function.
+    ///
+    /// This function sets up a `Frame` and calls `execute_code_unit` to execute code of the
+    /// function represented by the frame. Control comes back to this function on return or
+    /// on call. When that happens the frame is changes to a new one (call) or to the one
+    /// at the top of the stack (return). If the call stack is empty execution is completed.
+    fn execute_main(
+        mut self,
+        loader: &Loader,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+    ) -> VMResult<Vec<Value>> {
+        let mut locals = Locals::new(function.local_count());
+        for (i, value) in args.into_iter().enumerate() {
+            locals
+                .store_loc(
+                    i,
+                    value,
+                    loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )
+                .map_err(|e| self.set_location(e))?;
+        }
+
+        let link_context = data_store.link_context();
+        let mut current_frame = self
+            .make_new_frame(function, ty_args, locals)
+            .map_err(|err| self.set_location(err))?;
+        loop {
+            let resolver = current_frame.resolver(link_context, loader);
+            let exit_code =
+                current_frame //self
+                    .execute_code(&resolver, &mut self, data_store, gas_meter)
+                    .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+            match exit_code {
+                ExitCode::Return => {
+                    let non_ref_vals = current_frame
+                        .locals
+                        .drop_all_values()
+                        .map(|(_idx, val)| val);
+
+                    // TODO: Check if the error location is set correctly.
+                    gas_meter
+                        .charge_drop_frame(non_ref_vals.into_iter())
+                        .map_err(|e| self.set_location(e))?;
+
+                    profile_close_frame!(gas_meter, current_frame.function.pretty_string());
+                    if let Some(frame) = self.call_stack.pop() {
+                        // Note: the caller will find the callee's return values at the top of the shared operand stack
+                        current_frame = frame;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                    } else {
+                        // end of execution. `self` should no longer be used afterward
+                        return Ok(self.operand_stack.value);
+                    }
+                }
+                ExitCode::Call(fh_idx) => {
+                    let func = resolver.function_from_handle(fh_idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call(
+                            module_id,
+                            func.name(),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver,
+                            data_store,
+                            gas_meter,
+                            extensions,
+                            func,
+                            vec![],
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+
+                        profile_close_frame!(gas_meter, func_name);
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(loader, func, vec![])
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    // Note: the caller will find the the callee's return values at the top of the shared operand stack
+                    current_frame = frame;
+                }
+                ExitCode::CallGeneric(idx) => {
+                    // TODO(Gas): We should charge gas as we do type substitution...
+                    let ty_args = resolver
+                        .instantiate_generic_function(idx, current_frame.ty_args())
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    let func = resolver.function_from_instantiation(idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call_generic(
+                            module_id,
+                            func.name(),
+                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver, data_store, gas_meter, extensions, func, ty_args,
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+
+                        profile_close_frame!(gas_meter, func_name);
+
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(loader, func, ty_args)
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    current_frame = frame;
+                }
+            }
+        }
+    }
+
+    /// Returns a `Frame` if the call is to a Move function. Calls to native functions are
+    /// "inlined" and this returns `None`.
+    ///
+    /// Native functions do not push a frame at the moment and as such errors from a native
+    /// function are incorrectly attributed to the caller.
+    fn make_call_frame(
+        &mut self,
+        loader: &Loader,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<Frame> {
+        let mut locals = Locals::new(func.local_count());
+        let arg_count = func.arg_count();
+        for i in 0..arg_count {
+            locals.store_loc(
+                arg_count - i - 1,
+                self.operand_stack.pop()?,
+                loader
+                    .vm_config()
+                    .enable_invariant_violation_check_in_swap_loc,
+            )?;
+        }
+        self.make_new_frame(func, ty_args, locals)
+    }
+
+    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    ///
+    /// The locals must be loaded before calling this.
+    fn make_new_frame(
+        &self,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        locals: Locals,
+    ) -> PartialVMResult<Frame> {
+        Ok(Frame {
+            pc: 0,
+            locals,
+            function,
+            ty_args,
+        })
+    }
+
+    /// Call a native functions.
+    fn call_native(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> VMResult<()> {
+        // Note: refactor if native functions push a frame on the stack
+        self.call_native_impl(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            ty_args,
+        )
+        .map_err(|e| match function.module_id() {
+            Some(id) => {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(self.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(function.index(), 0)
+                    .finish(Location::Module(id.clone()))
+            }
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Unexpected native function not located in a module".to_owned());
+                self.set_location(err)
+            }
+        })
+    }
+
+    fn call_native_impl(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<()> {
+        let return_values = self.call_native_return_values(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            &ty_args,
+        )?;
+        // Put return values on the top of the operand stack, where the caller will find them.
+        // This is one of only two times the operand stack is shared across call stack frames; the other is in handling
+        // the Return instruction for normal calls
+        for value in return_values {
+            self.operand_stack.push(value)?;
+        }
+
+        Ok(())
+    }
+
+    fn call_native_return_values(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: &[Type],
+    ) -> PartialVMResult<SmallVec<[Value; 1]>> {
+        let return_type_count = function.return_type_count();
+        let mut args = VecDeque::new();
+        let expected_args = function.arg_count();
+        for _ in 0..expected_args {
+            args.push_front(self.operand_stack.pop()?);
+        }
+
+        let mut native_context = NativeContext::new(
+            self,
+            data_store,
+            resolver,
+            extensions,
+            gas_meter.remaining_gas(),
+        );
+        let native_function = function.get_native()?;
+
+        gas_meter.charge_native_function_before_execution(
+            ty_args.iter().map(|ty| TypeWithLoader {
+                ty,
+                loader: resolver.loader(),
+            }),
+            args.iter(),
+        )?;
+
+        let result = native_function(&mut native_context, ty_args.to_vec(), args)?;
+
+        // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
+        //            here or otherwise it becomes an incompatible change!!!
+        let return_values = match result.result {
+            Ok(vals) => {
+                gas_meter.charge_native_function(result.cost, Some(vals.iter()))?;
+                vals
+            }
+            Err(code) => {
+                gas_meter.charge_native_function(
+                    result.cost,
+                    Option::<std::iter::Empty<&Value>>::None,
+                )?;
+                return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(code));
+            }
+        };
+
+        // Paranoid check to protect us against incorrect native function implementations. A native function that
+        // returns a different number of values than its declared types will trigger this check
+        if return_values.len() != return_type_count {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Arity mismatch: return value count does not match return type count"
+                        .to_string(),
+                ),
+            );
+        }
+        Ok(return_values)
+    }
+
+    /// Perform a binary operation to two values at the top of the stack.
+    fn binop<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<Value>,
+    {
+        let rhs = self.operand_stack.pop_as::<T>()?;
+        let lhs = self.operand_stack.pop_as::<T>()?;
+        let result = f(lhs, rhs)?;
+        self.operand_stack.push(result)
+    }
+
+    /// Perform a binary operation for integer values.
+    fn binop_int<F>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        F: FnOnce(IntegerValue, IntegerValue) -> PartialVMResult<IntegerValue>,
+    {
+        self.binop(|lhs, rhs| {
+            Ok(match f(lhs, rhs)? {
+                IntegerValue::U8(x) => Value::u8(x),
+                IntegerValue::U16(x) => Value::u16(x),
+                IntegerValue::U32(x) => Value::u32(x),
+                IntegerValue::U64(x) => Value::u64(x),
+                IntegerValue::U128(x) => Value::u128(x),
+                IntegerValue::U256(x) => Value::u256(x),
+            })
+        })
+    }
+
+    /// Perform a binary operation for boolean values.
+    fn binop_bool<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<bool>,
+    {
+        self.binop(|lhs, rhs| Ok(Value::bool(f(lhs, rhs)?)))
+    }
+
+    /// Loads a resource from the data store and return the number of bytes read from the storage.
+    fn load_resource<'b>(
+        gas_meter: &mut impl GasMeter,
+        data_store: &'b mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<&'b mut GlobalValue> {
+        match data_store.load_resource(addr, ty) {
+            Ok((gv, load_res)) => {
+                if let Some(loaded) = load_res {
+                    let opt = match loaded {
+                        Some(num_bytes) => {
+                            let view = gv.view().ok_or_else(|| {
+                                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                    .with_message(
+                                        "Failed to create view for global value".to_owned(),
+                                    )
+                            })?;
+
+                            Some((num_bytes, view))
+                        }
+                        None => None,
+                    };
+                    gas_meter.charge_load_resource(opt)?;
+                }
+                Ok(gv)
+            }
+            Err(e) => {
+                error!(
+                    "[VM] error loading resource at ({}, {:?}): {:?} from data store",
+                    addr, ty, e
+                );
+                Err(e)
+            }
+        }
+    }
+
+    /// BorrowGlobal (mutable and not) opcode.
+    fn borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let res = Self::load_resource(gas_meter, data_store, addr, ty)?.borrow_global();
+        gas_meter.charge_borrow_global(
+            is_mut,
+            is_generic,
+            TypeWithLoader { ty, loader },
+            res.is_ok(),
+        )?;
+        self.operand_stack.push(res?)?;
+        Ok(())
+    }
+
+    /// Exists opcode.
+    fn exists(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        let exists = gv.exists()?;
+        gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
+        self.operand_stack.push(Value::bool(exists))?;
+        Ok(())
+    }
+
+    /// MoveFrom opcode.
+    fn move_from(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let resource = match Self::load_resource(gas_meter, data_store, addr, ty)?.move_from() {
+            Ok(resource) => {
+                gas_meter.charge_move_from(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    Some(&resource),
+                )?;
+                resource
+            }
+            Err(err) => {
+                let val: Option<&Value> = None;
+                gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                return Err(err);
+            }
+        };
+        self.operand_stack.push(resource)?;
+        Ok(())
+    }
+
+    /// MoveTo opcode.
+    fn move_to(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+        resource: Value,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
+        //            the move_to operation.
+        match gv.move_to(resource) {
+            Ok(()) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    gv.view().unwrap(),
+                    true,
+                )?;
+                Ok(())
+            }
+            Err((err, resource)) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    &resource,
+                    false,
+                )?;
+                Err(err)
+            }
+        }
+    }
+
+    //
+    // Debugging and logging helpers.
+    //
+
+    /// Given an `VMStatus` generate a core dump if the error is an `InvariantViolation`.
+    fn maybe_core_dump(&self, mut err: VMError, current_frame: &Frame) -> VMError {
+        // a verification error cannot happen at runtime so change it into an invariant violation.
+        if err.status_type() == StatusType::Verification {
+            error!("Verification error during runtime: {:?}", err);
+            let new_err = PartialVMError::new(StatusCode::VERIFICATION_ERROR);
+            let new_err = match err.message() {
+                None => new_err,
+                Some(msg) => new_err.with_message(msg.to_owned()),
+            };
+            err = new_err.finish(err.location().clone())
+        }
+        if err.status_type() == StatusType::InvariantViolation {
+            let state = self.internal_state_str(current_frame);
+
+            error!(
+                "Error: {:?}\nCORE DUMP: >>>>>>>>>>>>\n{}\n<<<<<<<<<<<<\n",
+                err, state,
+            );
+        }
+        err
+    }
+
+    #[allow(dead_code)]
+    fn debug_print_frame<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+        idx: usize,
+        frame: &Frame,
+    ) -> PartialVMResult<()> {
+        // Print out the function name with type arguments.
+        let func = &frame.function;
+
+        debug_write!(buf, "    [{}] ", idx)?;
+        if let Some(module) = func.module_id() {
+            debug_write!(buf, "{}::{}::", module.address(), module.name(),)?;
+        }
+        debug_write!(buf, "{}", func.name())?;
+        let ty_args = frame.ty_args();
+        let mut ty_tags = vec![];
+        for ty in ty_args {
+            ty_tags.push(loader.type_to_type_tag(ty)?);
+        }
+        if !ty_tags.is_empty() {
+            debug_write!(buf, "<")?;
+            let mut it = ty_tags.iter();
+            if let Some(tag) = it.next() {
+                debug_write!(buf, "{}", tag)?;
+                for tag in it {
+                    debug_write!(buf, ", ")?;
+                    debug_write!(buf, "{}", tag)?;
+                }
+            }
+            debug_write!(buf, ">")?;
+        }
+        debug_writeln!(buf)?;
+
+        // Print out the current instruction.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Code:")?;
+        let pc = frame.pc as usize;
+        let code = func.code();
+        let before = if pc > 3 { pc - 3 } else { 0 };
+        let after = min(code.len(), pc + 4);
+        for (idx, instr) in code.iter().enumerate().take(pc).skip(before) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+        debug_writeln!(buf, "          > [{}] {:?}", pc, &code[pc])?;
+        for (idx, instr) in code.iter().enumerate().take(after).skip(pc + 1) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+
+        // Print out the locals.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Locals:")?;
+        if func.local_count() > 0 {
+            values::debug::print_locals(buf, &frame.locals)?;
+            debug_writeln!(buf)?;
+        } else {
+            debug_writeln!(buf, "            (none)")?;
+        }
+
+        debug_writeln!(buf)?;
+        Ok(())
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn debug_print_stack_trace<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+    ) -> PartialVMResult<()> {
+        debug_writeln!(buf, "Call Stack:")?;
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            self.debug_print_frame(buf, loader, i, frame)?;
+        }
+        debug_writeln!(buf, "Operand Stack:")?;
+        for (idx, val) in self.operand_stack.value.iter().enumerate() {
+            // TODO: Currently we do not know the types of the values on the operand stack.
+            // Revisit.
+            debug_write!(buf, "    [{}] ", idx)?;
+            values::debug::print_value(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    /// Generate a string which is the status of the interpreter: call stack, current bytecode
+    /// stream, locals and operand stack.
+    ///
+    /// It is used when generating a core dump but can be used for debugging of the interpreter.
+    /// It will be exposed via a debug module to give developers a way to print the internals
+    /// of an execution.
+    fn internal_state_str(&self, current_frame: &Frame) -> String {
+        let mut internal_state = "Call stack:\n".to_string();
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            internal_state.push_str(
+                format!(
+                    " frame #{}: {} [pc = {}]\n",
+                    i,
+                    frame.function.pretty_string(),
+                    frame.pc,
+                )
+                .as_str(),
+            );
+        }
+        internal_state.push_str(
+            format!(
+                "*frame #{}: {} [pc = {}]:\n",
+                self.call_stack.0.len(),
+                current_frame.function.pretty_string(),
+                current_frame.pc,
+            )
+            .as_str(),
+        );
+        let code = current_frame.function.code();
+        let pc = current_frame.pc as usize;
+        if pc < code.len() {
+            let mut i = 0;
+            for bytecode in &code[..pc] {
+                internal_state.push_str(format!("{}> {:?}\n", i, bytecode).as_str());
+                i += 1;
+            }
+            internal_state.push_str(format!("{}* {:?}\n", i, code[pc]).as_str());
+        }
+        internal_state.push_str(
+            format!(
+                "Locals ({:x}):\n{}\n",
+                current_frame.locals.raw_address(),
+                current_frame.locals
+            )
+            .as_str(),
+        );
+        internal_state.push_str("Operand Stack:\n");
+        for value in &self.operand_stack.value {
+            internal_state.push_str(format!("{}\n", value).as_str());
+        }
+        internal_state
+    }
+
+    fn set_location(&self, err: PartialVMError) -> VMError {
+        err.finish(self.call_stack.current_location())
+    }
+
+    fn get_internal_state(&self) -> ExecutionState {
+        self.get_stack_frames(usize::MAX)
+    }
+
+    /// Get count stack frames starting from the top of the stack.
+    pub(crate) fn get_stack_frames(&self, count: usize) -> ExecutionState {
+        // collect frames in the reverse order as this is what is
+        // normally expected from the stack trace (outermost frame
+        // is the last one)
+        let stack_trace = self
+            .call_stack
+            .0
+            .iter()
+            .rev()
+            .take(count)
+            .map(|frame| {
+                (
+                    frame.function.module_id().cloned(),
+                    frame.function.index(),
+                    frame.pc,
+                )
+            })
+            .collect();
+        ExecutionState::new(stack_trace)
+    }
+}
+
+// TODO Determine stack size limits based on gas limit
+const OPERAND_STACK_SIZE_LIMIT: usize = 1024;
+const CALL_STACK_SIZE_LIMIT: usize = 1024;
+
+/// The operand stack.
+struct Stack {
+    value: Vec<Value>,
+}
+
+impl Stack {
+    /// Create a new empty operand stack.
+    fn new() -> Self {
+        Stack { value: vec![] }
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push(&mut self, value: Value) -> PartialVMResult<()> {
+        if self.value.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.value.push(value);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop(&mut self) -> PartialVMResult<Value> {
+        self.value
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop a `Value` of a given type off the stack. Abort if the value is not of the given
+    /// type or if the stack is empty.
+    fn pop_as<T>(&mut self) -> PartialVMResult<T>
+    where
+        Value: VMValueCast<T>,
+    {
+        self.pop()?.value_as()
+    }
+
+    /// Pop n values off the stack.
+    fn popn(&mut self, n: u16) -> PartialVMResult<Vec<Value>> {
+        let remaining_stack_size = self
+            .value
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.value.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn last_n(&self, n: usize) -> PartialVMResult<impl ExactSizeIterator<Item = &Value>> {
+        if self.value.len() < n {
+            return Err(PartialVMError::new(StatusCode::EMPTY_VALUE_STACK)
+                .with_message("Failed to get last n arguments on the argument stack".to_string()));
+        }
+        Ok(self.value[(self.value.len() - n)..].iter())
+    }
+}
+
+/// A call stack.
+// #[derive(Debug)]
+struct CallStack(Vec<Frame>);
+
+impl CallStack {
+    /// Create a new empty call stack.
+    fn new() -> Self {
+        CallStack(vec![])
+    }
+
+    /// Push a `Frame` on the call stack.
+    fn push(&mut self, frame: Frame) -> ::std::result::Result<(), Frame> {
+        if self.0.len() < CALL_STACK_SIZE_LIMIT {
+            self.0.push(frame);
+            Ok(())
+        } else {
+            Err(frame)
+        }
+    }
+
+    /// Pop a `Frame` off the call stack.
+    fn pop(&mut self) -> Option<Frame> {
+        self.0.pop()
+    }
+
+    fn current_location(&self) -> Location {
+        let location_opt = self.0.last().map(|frame| frame.location());
+        location_opt.unwrap_or(Location::Undefined)
+    }
+}
+
+/// A `Frame` is the execution context for a function. It holds the locals of the function and
+/// the function itself.
+// #[derive(Debug)]
+struct Frame {
+    pc: u16,
+    locals: Locals,
+    function: Arc<Function>,
+    ty_args: Vec<Type>,
+}
+
+/// An `ExitCode` from `execute_code_unit`.
+#[derive(Debug)]
+enum ExitCode {
+    Return,
+    Call(FunctionHandleIndex),
+    CallGeneric(FunctionInstantiationIndex),
+}
+
+impl Frame {
+    /// Execute a Move function until a return or a call opcode is found.
+    fn execute_code(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<ExitCode> {
+        self.execute_code_impl(resolver, interpreter, data_store, gas_meter)
+            .map_err(|e| {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(interpreter.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(self.function.index(), self.pc)
+                    .finish(self.location())
+            })
+    }
+
+    fn execute_instruction(
+        pc: &mut u16,
+        locals: &mut Locals,
+        ty_args: &[Type],
+        function: &Arc<Function>,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<InstrRet> {
+        use SimpleInstruction as S;
+
+        macro_rules! make_ty {
+            ($ty: expr) => {
+                TypeWithLoader {
+                    ty: $ty,
+                    loader: resolver.loader(),
+                }
+            };
+        }
+
+        match instruction {
+            Bytecode::Pop => {
+                let popped_val = interpreter.operand_stack.pop()?;
+                gas_meter.charge_pop(popped_val)?;
+            }
+            Bytecode::Ret => {
+                gas_meter.charge_simple_instr(S::Ret)?;
+                return Ok(InstrRet::ExitCode(ExitCode::Return));
+            }
+            Bytecode::BrTrue(offset) => {
+                gas_meter.charge_simple_instr(S::BrTrue)?;
+                if interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::BrFalse(offset) => {
+                gas_meter.charge_simple_instr(S::BrFalse)?;
+                if !interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::Branch(offset) => {
+                gas_meter.charge_simple_instr(S::Branch)?;
+                *pc = *offset;
+                return Ok(InstrRet::Branch);
+            }
+            Bytecode::LdU8(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU8)?;
+                interpreter.operand_stack.push(Value::u8(*int_const))?;
+            }
+            Bytecode::LdU16(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU16)?;
+                interpreter.operand_stack.push(Value::u16(*int_const))?;
+            }
+            Bytecode::LdU32(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU32)?;
+                interpreter.operand_stack.push(Value::u32(*int_const))?;
+            }
+            Bytecode::LdU64(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU64)?;
+                interpreter.operand_stack.push(Value::u64(*int_const))?;
+            }
+            Bytecode::LdU128(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU128)?;
+                interpreter.operand_stack.push(Value::u128(*int_const))?;
+            }
+            Bytecode::LdU256(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU256)?;
+                interpreter.operand_stack.push(Value::u256(*int_const))?;
+            }
+            Bytecode::LdConst(idx) => {
+                let constant = resolver.constant_at(*idx);
+                gas_meter.charge_ld_const(NumBytes::new(constant.data.len() as u64))?;
+
+                let val = Value::deserialize_constant(constant).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                        "Verifier failed to verify the deserialization of constants".to_owned(),
+                    )
+                })?;
+
+                gas_meter.charge_ld_const_after_deserialization(&val)?;
+
+                interpreter.operand_stack.push(val)?
+            }
+            Bytecode::LdTrue => {
+                gas_meter.charge_simple_instr(S::LdTrue)?;
+                interpreter.operand_stack.push(Value::bool(true))?;
+            }
+            Bytecode::LdFalse => {
+                gas_meter.charge_simple_instr(S::LdFalse)?;
+                interpreter.operand_stack.push(Value::bool(false))?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                // TODO(Gas): We should charge gas before copying the value.
+                let local = locals.copy_loc(*idx as usize)?;
+                gas_meter.charge_copy_loc(&local)?;
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let local = locals.move_loc(
+                    *idx as usize,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                gas_meter.charge_move_loc(&local)?;
+
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::StLoc(idx) => {
+                let value_to_store = interpreter.operand_stack.pop()?;
+                gas_meter.charge_store_loc(&value_to_store)?;
+                locals.store_loc(
+                    *idx as usize,
+                    value_to_store,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+            }
+            Bytecode::Call(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::Call(*idx)));
+            }
+            Bytecode::CallGeneric(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::CallGeneric(*idx)));
+            }
+            Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowLoc(_) => S::MutBorrowLoc,
+                    _ => S::ImmBorrowLoc,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+                interpreter
+                    .operand_stack
+                    .push(locals.borrow_loc(*idx as usize)?)?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) | Bytecode::MutBorrowField(fh_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowField,
+                    _ => S::ImmBorrowField,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_offset(*fh_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(fi_idx) | Bytecode::MutBorrowFieldGeneric(fi_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowFieldGeneric,
+                    _ => S::ImmBorrowFieldGeneric,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_instantiation_offset(*fi_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::Pack(sd_idx) => {
+                let field_count = resolver.field_count(*sd_idx);
+                let struct_type = resolver.get_struct_type(*sd_idx);
+                Self::check_depth_of_type(resolver, &struct_type)?;
+                gas_meter.charge_pack(
+                    false,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::PackGeneric(si_idx) => {
+                let field_count = resolver.field_instantiation_count(*si_idx);
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_pack(
+                    true,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::Unpack(_sd_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(false, struct_.field_views())?;
+
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::UnpackGeneric(_si_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(true, struct_.field_views())?;
+
+                // TODO: Whether or not we want this gas metering in the loop is
+                // questionable.  However, if we don't have it in the loop we could wind up
+                // doing a fair bit of work before charging for it.
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                gas_meter.charge_read_ref(reference.value_view())?;
+                let value = reference.read_ref()?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::WriteRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                let value = interpreter.operand_stack.pop()?;
+                gas_meter.charge_write_ref(&value, reference.value_view())?;
+                reference.write_ref(value)?;
+            }
+            Bytecode::CastU8 => {
+                gas_meter.charge_simple_instr(S::CastU8)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u8(integer_value.cast_u8()?))?;
+            }
+            Bytecode::CastU16 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u16(integer_value.cast_u16()?))?;
+            }
+            Bytecode::CastU32 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u32(integer_value.cast_u32()?))?;
+            }
+            Bytecode::CastU64 => {
+                gas_meter.charge_simple_instr(S::CastU64)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u64(integer_value.cast_u64()?))?;
+            }
+            Bytecode::CastU128 => {
+                gas_meter.charge_simple_instr(S::CastU128)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u128(integer_value.cast_u128()?))?;
+            }
+            Bytecode::CastU256 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u256(integer_value.cast_u256()?))?;
+            }
+            // Arithmetic Operations
+            Bytecode::Add => {
+                gas_meter.charge_simple_instr(S::Add)?;
+                interpreter.binop_int(IntegerValue::add_checked)?
+            }
+            Bytecode::Sub => {
+                gas_meter.charge_simple_instr(S::Sub)?;
+                interpreter.binop_int(IntegerValue::sub_checked)?
+            }
+            Bytecode::Mul => {
+                gas_meter.charge_simple_instr(S::Mul)?;
+                interpreter.binop_int(IntegerValue::mul_checked)?
+            }
+            Bytecode::Mod => {
+                gas_meter.charge_simple_instr(S::Mod)?;
+                interpreter.binop_int(IntegerValue::rem_checked)?
+            }
+            Bytecode::Div => {
+                gas_meter.charge_simple_instr(S::Div)?;
+                interpreter.binop_int(IntegerValue::div_checked)?
+            }
+            Bytecode::BitOr => {
+                gas_meter.charge_simple_instr(S::BitOr)?;
+                interpreter.binop_int(IntegerValue::bit_or)?
+            }
+            Bytecode::BitAnd => {
+                gas_meter.charge_simple_instr(S::BitAnd)?;
+                interpreter.binop_int(IntegerValue::bit_and)?
+            }
+            Bytecode::Xor => {
+                gas_meter.charge_simple_instr(S::Xor)?;
+                interpreter.binop_int(IntegerValue::bit_xor)?
+            }
+            Bytecode::Shl => {
+                gas_meter.charge_simple_instr(S::Shl)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shl_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Shr => {
+                gas_meter.charge_simple_instr(S::Shr)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shr_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Or => {
+                gas_meter.charge_simple_instr(S::Or)?;
+                interpreter.binop_bool(|l, r| Ok(l || r))?
+            }
+            Bytecode::And => {
+                gas_meter.charge_simple_instr(S::And)?;
+                interpreter.binop_bool(|l, r| Ok(l && r))?
+            }
+            Bytecode::Lt => {
+                gas_meter.charge_simple_instr(S::Lt)?;
+                interpreter.binop_bool(IntegerValue::lt)?
+            }
+            Bytecode::Gt => {
+                gas_meter.charge_simple_instr(S::Gt)?;
+                interpreter.binop_bool(IntegerValue::gt)?
+            }
+            Bytecode::Le => {
+                gas_meter.charge_simple_instr(S::Le)?;
+                interpreter.binop_bool(IntegerValue::le)?
+            }
+            Bytecode::Ge => {
+                gas_meter.charge_simple_instr(S::Ge)?;
+                interpreter.binop_bool(IntegerValue::ge)?
+            }
+            Bytecode::Abort => {
+                gas_meter.charge_simple_instr(S::Abort)?;
+                let error_code = interpreter.operand_stack.pop_as::<u64>()?;
+                let error = PartialVMError::new(StatusCode::ABORTED)
+                    .with_sub_status(error_code)
+                    .with_message(format!("{} at offset {}", function.pretty_string(), *pc,));
+                return Err(error);
+            }
+            Bytecode::Eq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_eq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(lhs.equals(&rhs)?))?;
+            }
+            Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_neq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(!lhs.equals(&rhs)?))?;
+            }
+            Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.borrow_global(
+                    is_mut,
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(si_idx) | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.borrow_global(
+                    is_mut,
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::Exists(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.exists(false, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::ExistsGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.exists(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveFrom(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.move_from(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MoveFromGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_from(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveTo(sd_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                // REVIEW: Can we simplify Interpreter::move_to?
+                interpreter.move_to(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::MoveToGeneric(si_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_to(
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::FreezeRef => {
+                gas_meter.charge_simple_instr(S::FreezeRef)?;
+                // FreezeRef should just be a null op as we don't distinguish between mut
+                // and immut ref at runtime.
+            }
+            Bytecode::Not => {
+                gas_meter.charge_simple_instr(S::Not)?;
+                let value = !interpreter.operand_stack.pop_as::<bool>()?;
+                interpreter.operand_stack.push(Value::bool(value))?;
+            }
+            Bytecode::Nop => {
+                gas_meter.charge_simple_instr(S::Nop)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_vec_pack(
+                    make_ty!(&ty),
+                    interpreter.operand_stack.last_n(*num as usize)?,
+                )?;
+                let elements = interpreter.operand_stack.popn(*num as u16)?;
+                let value = Vector::pack(&ty, elements)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecLen(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_len(TypeWithLoader {
+                    ty,
+                    loader: resolver.loader(),
+                })?;
+                let value = vec_ref.len(ty)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, &ty);
+                gas_meter.charge_vec_borrow(false, make_ty!(&ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, ty);
+                gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let elem = interpreter.operand_stack.pop()?;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
+                vec_ref.push_back(elem, ty, interpreter.runtime_limits_config().vector_len_max)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.pop(ty);
+                gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_unpack(
+                    make_ty!(ty),
+                    NumArgs::new(*num),
+                    vec_val.elem_views(),
+                )?;
+                let elements = vec_val.unpack(ty, *num)?;
+                for value in elements {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::VecSwap(si) => {
+                let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_swap(make_ty!(ty))?;
+                vec_ref.swap(idx1, idx2, ty)?;
+            }
+        }
+
+        Ok(InstrRet::Ok)
+    }
+    fn execute_code_impl(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> PartialVMResult<ExitCode> {
+        let code = self.function.code();
+        loop {
+            for instruction in &code[self.pc as usize..] {
+                trace!(
+                    &self.function,
+                    &self.locals,
+                    self.pc,
+                    instruction,
+                    resolver,
+                    interpreter
+                );
+
+                fail_point!("move_vm::interpreter_loop", |_| {
+                    Err(
+                        PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                            "Injected move_vm::interpreter verifier failure".to_owned(),
+                        ),
+                    )
+                });
+
+                profile_open_instr!(gas_meter, format!("{:?}", instruction));
+
+                let r = Self::execute_instruction(
+                    &mut self.pc,
+                    &mut self.locals,
+                    &self.ty_args,
+                    &self.function,
+                    resolver,
+                    interpreter,
+                    data_store,
+                    gas_meter,
+                    instruction,
+                )?;
+
+                profile_close_instr!(gas_meter, format!("{:?}", instruction));
+
+                match r {
+                    InstrRet::Ok => (),
+                    InstrRet::ExitCode(exit_code) => {
+                        return Ok(exit_code);
+                    }
+                    InstrRet::Branch => break,
+                };
+
+                // invariant: advance to pc +1 is iff instruction at pc executed without aborting
+                self.pc += 1;
+            }
+            // ok we are out, it's a branch, check the pc for good luck
+            // TODO: re-work the logic here. Tests should have a more
+            // natural way to plug in
+            if self.pc as usize >= code.len() {
+                if cfg!(test) {
+                    // In order to test the behavior of an instruction stream, hitting end of the
+                    // code should report no error so that we can check the
+                    // locals.
+                    return Ok(ExitCode::Return);
+                } else {
+                    return Err(PartialVMError::new(StatusCode::PC_OVERFLOW));
+                }
+            }
+        }
+    }
+
+    fn ty_args(&self) -> &[Type] {
+        &self.ty_args
+    }
+
+    fn resolver<'a>(&self, link_context: AccountAddress, loader: &'a Loader) -> Resolver<'a> {
+        self.function.get_resolver(link_context, loader)
+    }
+
+    fn location(&self) -> Location {
+        match self.function.module_id() {
+            None => Location::Script,
+            Some(id) => Location::Module(id.clone()),
+        }
+    }
+
+    fn check_depth_of_type(resolver: &Resolver, ty: &Type) -> PartialVMResult<u64> {
+        let Some(max_depth) = resolver
+            .loader()
+            .vm_config()
+            .runtime_limits_config
+            .max_value_nest_depth
+        else {
+            return Ok(1);
+        };
+        Self::check_depth_of_type_impl(resolver, ty, 0, max_depth)
+    }
+
+    fn check_depth_of_type_impl(
+        resolver: &Resolver,
+        ty: &Type,
+        current_depth: u64,
+        max_depth: u64,
+    ) -> PartialVMResult<u64> {
+        macro_rules! check_depth {
+            ($additional_depth:expr) => {
+                if current_depth.saturating_add($additional_depth) > max_depth {
+                    return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+                } else {
+                    current_depth.saturating_add($additional_depth)
+                }
+            };
+        }
+
+        // Calculate depth of the type itself
+        let ty_depth = match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address
+            | Type::Signer => check_depth!(1),
+            // Even though this is recursive this is OK since the depth of this recursion is
+            // bounded by the depth of the type arguments, which we have already checked.
+            Type::Reference(ty) | Type::MutableReference(ty) | Type::Vector(ty) => {
+                Self::check_depth_of_type_impl(resolver, ty, check_depth!(1), max_depth)?
+            }
+            Type::Struct(si) => {
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&[])?)
+            }
+            Type::StructInstantiation(si, ty_args) => {
+                // Calculate depth of all type arguments, and make sure they themselves are not too deep.
+                let ty_arg_depths = ty_args
+                    .iter()
+                    .map(|ty| {
+                        // Ty args should be fully resolved and not need any type arguments
+                        Self::check_depth_of_type_impl(resolver, ty, check_depth!(0), max_depth)
+                    })
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&ty_arg_depths)?)
+            }
+            // NB: substitution must be performed before calling this function
+            Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Type parameter should be fully resolved".to_string()),
+                )
+            }
+        };
+
+        Ok(ty_depth)
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/lib.rs b/vendors/move/crates/move-vm-runtime/src/lib.rs
new file mode 100644
index 000000000..5aadd80fb
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/lib.rs
@@ -0,0 +1,30 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! The core Move VM logic.
+//!
+//! It is a design goal for the Move VM to be independent of the Diem blockchain, so that
+//! other blockchains can use it as well. The VM isn't there yet, but hopefully will be there
+//! soon.
+
+pub mod data_cache;
+mod interpreter;
+mod loader;
+pub mod logging;
+pub mod move_vm;
+pub mod native_extensions;
+pub mod native_functions;
+pub mod runtime;
+pub mod session;
+#[macro_use]
+mod tracing;
+
+// Only include debugging functionality in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+mod debug;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/crates/move-vm-runtime/src/loader.rs b/vendors/move/crates/move-vm-runtime/src/loader.rs
new file mode 100644
index 000000000..76e618559
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/loader.rs
@@ -0,0 +1,2661 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    logging::expect_no_verification_errors,
+    native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
+    session::LoadedFunctionInstantiation,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CompiledModule, CompiledScript, Constant, ConstantPoolIndex,
+        FieldHandleIndex, FieldInstantiationIndex, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+        TypeParameterIndex,
+    },
+    IndexKind,
+};
+use move_bytecode_verifier::{self, cyclic_dependencies, dependencies};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    metadata::Metadata,
+    runtime_value as R,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::{CachedStructIndex, DepthFormula, StructType, Type},
+};
+use parking_lot::RwLock;
+use sha3::{Digest, Sha3_256};
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    fmt::Debug,
+    hash::Hash,
+    sync::Arc,
+};
+use tracing::error;
+
+type ScriptHash = [u8; 32];
+
+// A simple cache that offers both a HashMap and a Vector lookup.
+// Values are forced into a `Arc` so they can be used from multiple thread.
+// Access to this cache is always under a `RwLock`.
+struct BinaryCache<K, V> {
+    id_map: HashMap<K, usize>,
+    binaries: Vec<Arc<V>>,
+}
+
+impl<K, V> BinaryCache<K, V>
+where
+    K: Eq + Hash,
+{
+    fn new() -> Self {
+        Self {
+            id_map: HashMap::new(),
+            binaries: vec![],
+        }
+    }
+
+    fn insert(&mut self, key: K, binary: V) -> PartialVMResult<&Arc<V>> {
+        let idx = self.binaries.len();
+        // Last write wins in the binary cache -- it's up to the callee to not make conflicting
+        // writes.
+        self.id_map.insert(key, idx);
+        self.binaries.push(Arc::new(binary));
+        Ok(&self.binaries[idx])
+    }
+
+    fn get_with_idx(&self, key: &K) -> Option<(usize, &Arc<V>)> {
+        let idx = self.id_map.get(key)?;
+        Some((*idx, self.binaries.get(*idx)?))
+    }
+
+    fn get(&self, key: &K) -> Option<&Arc<V>> {
+        Some(self.get_with_idx(key)?.1)
+    }
+
+    fn contains(&self, key: &K) -> bool {
+        self.id_map.contains_key(key)
+    }
+
+    fn len(&self) -> usize {
+        self.binaries.len()
+    }
+}
+
+// A script cache is a map from the hash value of a script and the `Script` itself.
+// Script are added in the cache once verified and so getting a script out the cache
+// does not require further verification (except for parameters and type parameters)
+struct ScriptCache {
+    scripts: BinaryCache<ScriptHash, LoadedScript>,
+}
+
+impl ScriptCache {
+    fn new() -> Self {
+        Self {
+            scripts: BinaryCache::new(),
+        }
+    }
+
+    fn get(&self, hash: &ScriptHash) -> Option<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        self.scripts.get(hash).map(|script| {
+            (
+                script.entry_point(),
+                script.parameter_tys.clone(),
+                script.return_tys.clone(),
+            )
+        })
+    }
+
+    fn insert(
+        &mut self,
+        hash: ScriptHash,
+        script: LoadedScript,
+    ) -> PartialVMResult<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        match self.get(&hash) {
+            Some(cached) => Ok(cached),
+            None => {
+                let script = self.scripts.insert(hash, script)?;
+                Ok((
+                    script.entry_point(),
+                    script.parameter_tys.clone(),
+                    script.return_tys.clone(),
+                ))
+            }
+        }
+    }
+}
+
+/// The ModuleCache holds all verified modules as well as loaded modules, structs, and functions.
+/// Structs and functions are pushed into a global structure, handles in compiled modules are
+/// replaced with indices into these global structures in loaded modules.  All access to the
+/// ModuleCache via the Loader is under an RWLock.
+pub struct ModuleCache {
+    /// Compiled modules go in this cache once they have been individually verified.
+    compiled_modules: BinaryCache<ModuleId, CompiledModule>,
+    /// Modules whose dependencies have been verified already (during publishing or loading).
+    verified_dependencies: BTreeSet<(AccountAddress, ModuleId)>,
+    /// Loaded modules go in this cache once their compiled modules have been link-checked, and
+    /// structs and functions have populated `structs` and `functions` below.
+    ///
+    /// The `AccountAddress` in the key is the "link context", and the `ModuleId` is the ID of the
+    /// module whose load was requested. A mapping `(ctx, id) => module` means that when `id` was
+    /// requested in context `ctx`, `module` was loaded.
+    loaded_modules: BinaryCache<(AccountAddress, ModuleId), LoadedModule>,
+
+    /// Global cache of loaded structs, shared among all modules.
+    structs: BinaryCache<(ModuleId, Identifier), StructType>,
+    /// Global list of loaded functions, shared among all modules.
+    functions: Vec<Arc<Function>>,
+}
+
+/// Tracks the current end point of the `ModuleCache`'s `struct`s and `function`s, so that we can
+/// roll-back to that point in case of error.
+struct CacheCursor {
+    last_struct: usize,
+    last_function: usize,
+}
+
+impl ModuleCache {
+    fn new() -> Self {
+        Self {
+            compiled_modules: BinaryCache::new(),
+            verified_dependencies: BTreeSet::new(),
+            loaded_modules: BinaryCache::new(),
+            structs: BinaryCache::new(),
+            functions: vec![],
+        }
+    }
+
+    //
+    // Common "get" operations
+    //
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn compiled_module_at(&self, id: &ModuleId) -> Option<Arc<CompiledModule>> {
+        self.compiled_modules.get(id).map(Arc::clone)
+    }
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn loaded_module_at(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> Option<Arc<LoadedModule>> {
+        self.loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .map(Arc::clone)
+    }
+
+    // Retrieve a function by index
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        Arc::clone(&self.functions[idx])
+    }
+
+    // Retrieve a struct by index
+    fn struct_at(&self, idx: CachedStructIndex) -> Arc<StructType> {
+        Arc::clone(&self.structs.binaries[idx.0])
+    }
+
+    //
+    // Insertion is under lock and it's a pretty heavy operation.
+    // The VM is pretty much stopped waiting for this to finish
+    //
+
+    fn insert(
+        &mut self,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> VMResult<Arc<LoadedModule>> {
+        let runtime_id = module.self_id();
+        if let Some(cached) = self.loaded_module_at(data_store.link_context(), &runtime_id) {
+            return Ok(cached);
+        }
+
+        // Make sure the modules of dependencies are in the cache.
+        for runtime_dep in module.immediate_dependencies() {
+            let storage_dep = data_store
+                .relocate(&runtime_dep)
+                .map_err(|e| e.finish(Location::Undefined))?;
+            let compiled_dep = self.compiled_module_at(&storage_dep).ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!(
+                        "Cannot load dependency {runtime_dep} of {storage_id} from {storage_dep}"
+                    ))
+                    .finish(Location::Undefined)
+            })?;
+
+            self.insert(natives, data_store, storage_dep, compiled_dep.as_ref())?;
+        }
+
+        let cursor = self.cursor();
+        match self.add_module(&cursor, natives, data_store, storage_id, module) {
+            Ok(module) => Ok(Arc::clone(module)),
+            Err(err) => {
+                // we need this operation to be transactional, if an error occurs we must
+                // leave a clean state
+                self.reset(cursor);
+                Err(err.finish(Location::Undefined))
+            }
+        }
+    }
+
+    fn add_module(
+        &mut self,
+        cursor: &CacheCursor,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> PartialVMResult<&Arc<LoadedModule>> {
+        let link_context = data_store.link_context();
+        let runtime_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        // Add new structs and collect their field signatures
+        let mut field_signatures = vec![];
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            let name = module.identifier_at(struct_handle.name);
+            let struct_key = (runtime_id.clone(), name.to_owned());
+
+            if self.structs.contains(&struct_key) {
+                continue;
+            }
+
+            let field_names = match &struct_def.field_information {
+                StructFieldInformation::Native => vec![],
+                StructFieldInformation::Declared(field_info) => field_info
+                    .iter()
+                    .map(|f| module.identifier_at(f.name).to_owned())
+                    .collect(),
+            };
+
+            let defining_id = data_store.defining_module(&runtime_id, name)?;
+
+            self.structs.insert(
+                struct_key,
+                StructType {
+                    fields: vec![],
+                    field_names,
+                    abilities: struct_handle.abilities,
+                    type_parameters: struct_handle.type_parameters.clone(),
+                    name: name.to_owned(),
+                    defining_id,
+                    runtime_id: runtime_id.clone(),
+                    struct_def: StructDefinitionIndex(idx as u16),
+                    depth: None,
+                },
+            )?;
+
+            let StructFieldInformation::Declared(fields) = &struct_def.field_information else {
+                unreachable!("native structs have been removed");
+            };
+
+            let signatures: Vec<_> = fields.iter().map(|f| &f.signature.0).collect();
+            field_signatures.push(signatures)
+        }
+
+        // Convert field signatures into types after adding all structs because field types might
+        // refer to structs in the same module.
+        let mut field_types = vec![];
+        for signature in field_signatures {
+            let tys: Vec<_> = signature
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<_>>()?;
+            field_types.push(tys);
+        }
+
+        let field_types_len = field_types.len();
+
+        // Add the field types to the newly added structs, processing them in reverse, to line them
+        // up with the structs we added at the end of the global cache.
+        for (fields, struct_type) in field_types
+            .into_iter()
+            .rev()
+            .zip(self.structs.binaries.iter_mut().rev())
+        {
+            match Arc::get_mut(struct_type) {
+                Some(struct_type) => struct_type.fields = fields,
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we just rewrite the entire `Arc`
+                    // over and log the issue.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                    let mut struct_copy = (**struct_type).clone();
+                    struct_copy.fields = fields;
+                    *struct_type = Arc::new(struct_copy);
+                }
+            }
+        }
+
+        let mut depth_cache = BTreeMap::new();
+        for struct_type in self.structs.binaries.iter().rev().take(field_types_len) {
+            self.calculate_depth_of_struct(struct_type, &mut depth_cache)?;
+        }
+
+        debug_assert!(depth_cache.len() == field_types_len);
+        for (cache_idx, depth) in depth_cache {
+            match Arc::get_mut(self.structs.binaries.get_mut(cache_idx.0).unwrap()) {
+                Some(struct_type) => struct_type.depth = Some(depth),
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we log the issue and move on leaving the
+                    // structs depth as `None` -- if we try to access it later we will treat this
+                    // as too deep.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                }
+            }
+        }
+
+        for (idx, func) in module.function_defs().iter().enumerate() {
+            let findex = FunctionDefinitionIndex(idx as TableIndex);
+            let function = Function::new(natives, findex, func, module);
+            self.functions.push(Arc::new(function));
+        }
+
+        let loaded_module = LoadedModule::new(cursor, link_context, storage_id, module, self)?;
+        self.loaded_modules
+            .insert((link_context, runtime_id), loaded_module)
+    }
+
+    // `make_type` is the entry point to "translate" a `SignatureToken` to a `Type`
+    fn make_type(&self, module: BinaryIndexedView, tok: &SignatureToken) -> PartialVMResult<Type> {
+        let res = match tok {
+            SignatureToken::Bool => Type::Bool,
+            SignatureToken::U8 => Type::U8,
+            SignatureToken::U16 => Type::U16,
+            SignatureToken::U32 => Type::U32,
+            SignatureToken::U64 => Type::U64,
+            SignatureToken::U128 => Type::U128,
+            SignatureToken::U256 => Type::U256,
+            SignatureToken::Address => Type::Address,
+            SignatureToken::Signer => Type::Signer,
+            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx),
+            SignatureToken::Vector(inner_tok) => {
+                Type::Vector(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Reference(inner_tok) => {
+                Type::Reference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::MutableReference(inner_tok) => {
+                Type::MutableReference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Struct(sh_idx) => {
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::Struct(def_idx)
+            }
+            SignatureToken::StructInstantiation(sh_idx, tys) => {
+                let type_parameters: Vec<_> = tys
+                    .iter()
+                    .map(|tok| self.make_type(module, tok))
+                    .collect::<PartialVMResult<_>>()?;
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::StructInstantiation(def_idx, type_parameters)
+            }
+        };
+        Ok(res)
+    }
+
+    fn calculate_depth_of_struct(
+        &self,
+        struct_type: &StructType,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let def_idx = self
+            .resolve_struct_by_name(&struct_type.name, &struct_type.runtime_id)?
+            .0;
+
+        // If we've already computed this structs depth, no more work remains to be done.
+        if let Some(form) = &struct_type.depth {
+            return Ok(form.clone());
+        }
+        if let Some(form) = depth_cache.get(&def_idx) {
+            return Ok(form.clone());
+        }
+
+        let formulas = struct_type
+            .fields
+            .iter()
+            .map(|field_type| self.calculate_depth_of_type(field_type, depth_cache))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let mut formula = DepthFormula::normalize(formulas);
+        // add 1 for the struct itself
+        formula.add(1);
+        let prev = depth_cache.insert(def_idx, formula.clone());
+        if prev.is_some() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Recursive type?".to_owned()),
+            );
+        }
+        Ok(formula)
+    }
+
+    fn calculate_depth_of_type(
+        &self,
+        ty: &Type,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        Ok(match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U64
+            | Type::U128
+            | Type::Address
+            | Type::Signer
+            | Type::U16
+            | Type::U32
+            | Type::U256 => DepthFormula::constant(1),
+            // we should not see the reference here, we could instead give an invariant violation
+            Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                let mut inner = self.calculate_depth_of_type(ty, depth_cache)?;
+                // add 1 for the vector itself
+                inner.add(1);
+                inner
+            }
+            Type::TyParam(ty_idx) => DepthFormula::type_parameter(*ty_idx),
+            Type::Struct(cache_idx) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+                debug_assert!(struct_formula.terms.is_empty());
+                struct_formula
+            }
+            Type::StructInstantiation(cache_idx, ty_args) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let ty_arg_map = ty_args
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, ty)| {
+                        let var = idx as TypeParameterIndex;
+                        Ok((var, self.calculate_depth_of_type(ty, depth_cache)?))
+                    })
+                    .collect::<PartialVMResult<BTreeMap<_, _>>>()?;
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+
+                struct_formula.subst(ty_arg_map)?
+            }
+        })
+    }
+
+    // Given a ModuleId::struct_name, retrieve the `StructType` and the index associated.
+    // Return and error if the type has not been loaded
+    fn resolve_struct_by_name(
+        &self,
+        struct_name: &IdentStr,
+        runtime_id: &ModuleId,
+    ) -> PartialVMResult<(CachedStructIndex, Arc<StructType>)> {
+        match self
+            .structs
+            .get_with_idx(&(runtime_id.clone(), struct_name.to_owned()))
+        {
+            Some((idx, struct_)) => Ok((CachedStructIndex(idx), Arc::clone(struct_))),
+            None => Err(PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE)
+                .with_message(format!("Cannot find {runtime_id}::{struct_name} in cache",))),
+        }
+    }
+
+    // Given a ModuleId::func_name, retrieve the `Function` and the index associated.
+    // Return and error if the function has not been loaded
+    fn resolve_function_by_name(
+        &self,
+        func_name: &IdentStr,
+        runtime_id: &ModuleId,
+        link_context: AccountAddress,
+    ) -> PartialVMResult<usize> {
+        match self
+            .loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .and_then(|module| module.function_map.get(func_name))
+        {
+            Some(func_idx) => Ok(*func_idx),
+            None => Err(
+                PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find {:?}::{:?} in cache for context {:?}",
+                    runtime_id, func_name, link_context,
+                )),
+            ),
+        }
+    }
+
+    /// Return the current high watermark of structs and functions in the cache.
+    fn cursor(&self) -> CacheCursor {
+        CacheCursor {
+            last_struct: self.structs.len(),
+            last_function: self.functions.len(),
+        }
+    }
+
+    /// Rollback the cache's structs and functions to the point at which the cache cursor was
+    /// created.
+    fn reset(
+        &mut self,
+        CacheCursor {
+            last_struct,
+            last_function,
+        }: CacheCursor,
+    ) {
+        // Remove entries from `structs.id_map` corresponding to the newly added structs.
+        for (idx, struct_) in self.structs.binaries.iter().enumerate().rev() {
+            if idx < last_struct {
+                break;
+            }
+
+            let key = (struct_.runtime_id.clone(), struct_.name.clone());
+            match self.structs.id_map.remove(&key) {
+                Some(jdx) if jdx == idx => {
+                    continue;
+                }
+                Some(jdx) => unreachable!(
+                    "Expected to find {}::{} at index {idx} but found at {jdx}.",
+                    struct_.defining_id, struct_.name,
+                ),
+                None => unreachable!(
+                    "Expected to find {}::{} at index {idx} but not found.",
+                    struct_.defining_id, struct_.name,
+                ),
+            }
+        }
+
+        self.structs.binaries.truncate(last_struct);
+        self.functions.truncate(last_function);
+    }
+}
+
+//
+// Loader
+//
+
+// A Loader is responsible to load scripts and modules and holds the cache of all loaded
+// entities. Each cache is protected by a `RwLock`. Operation in the Loader must be thread safe
+// (operating on values on the stack) and when cache needs updating the mutex must be taken.
+// The `pub(crate)` API is what a Loader offers to the runtime.
+pub(crate) struct Loader {
+    scripts: RwLock<ScriptCache>,
+    module_cache: RwLock<ModuleCache>,
+    type_cache: RwLock<TypeCache>,
+    natives: NativeFunctions,
+    vm_config: VMConfig,
+}
+
+impl Loader {
+    pub(crate) fn new(natives: NativeFunctions, vm_config: VMConfig) -> Self {
+        Self {
+            scripts: RwLock::new(ScriptCache::new()),
+            module_cache: RwLock::new(ModuleCache::new()),
+            type_cache: RwLock::new(TypeCache::new()),
+            natives,
+            vm_config,
+        }
+    }
+
+    pub(crate) fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    /// Copies metadata out of a modules bytecode if available.
+    pub(crate) fn get_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        let cache = self.module_cache.read();
+        cache
+            .compiled_modules
+            .get(&module)
+            .and_then(|module| module.metadata.iter().find(|md| md.key == key))
+            .cloned()
+    }
+
+    //
+    // Script verification and loading
+    //
+
+    // Scripts are verified and dependencies are loaded.
+    // Effectively that means modules are cached from leaf to root in the dependency DAG.
+    // If a dependency error is found, loading stops and the error is returned.
+    // However all modules cached up to that point stay loaded.
+
+    // Entry point for script execution (`MoveVM::execute_script`).
+    // Verifies the script if it is not in the cache of scripts loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_script(
+        &self,
+        script_blob: &[u8],
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<Function>, LoadedFunctionInstantiation)> {
+        // retrieve or load the script
+        let mut sha3_256 = Sha3_256::new();
+        sha3_256.update(script_blob);
+        let hash_value: [u8; 32] = sha3_256.finalize().into();
+
+        let link_context = data_store.link_context();
+        let mut scripts = self.scripts.write();
+        let (main, parameters, return_) = match scripts.get(&hash_value) {
+            Some(cached) => cached,
+            None => {
+                let ver_script = self.deserialize_and_verify_script(script_blob, data_store)?;
+                let script = LoadedScript::new(
+                    ver_script,
+                    link_context,
+                    &hash_value,
+                    &self.module_cache.read(),
+                )?;
+                scripts
+                    .insert(hash_value, script)
+                    .map_err(|e| e.finish(Location::Script))?
+            }
+        };
+
+        // verify type arguments
+        self.verify_ty_args(main.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Script))?;
+        let instantiation = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((main, instantiation))
+    }
+
+    // The process of deserialization and verification is not and it must not be under lock.
+    // So when publishing modules through the dependency DAG it may happen that a different
+    // thread had loaded the module after this process fetched it from storage.
+    // Caching will take care of that by asking for each dependency module again under lock.
+    fn deserialize_and_verify_script(
+        &self,
+        script: &[u8],
+        data_store: &impl DataStore,
+    ) -> VMResult<CompiledScript> {
+        let script = match CompiledScript::deserialize_with_max_version(
+            script,
+            self.vm_config.max_binary_format_version,
+        ) {
+            Ok(script) => script,
+            Err(err) => {
+                error!("[VM] deserializer for script returned error: {:?}", err,);
+                let msg = format!("Deserialization error: {:?}", err);
+                return Err(PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                    .with_message(msg)
+                    .finish(Location::Script));
+            }
+        };
+
+        match self.verify_script(&script) {
+            Ok(_) => {
+                // verify and load dependencies, fetching the verified compiled module.
+                let deps: VMResult<Vec<_>> = script
+                    .immediate_dependencies()
+                    .into_iter()
+                    .map(|dep| Ok(self.load_module(&dep, data_store)?.0))
+                    .collect();
+
+                // verify script linkage
+                dependencies::verify_script(&script, deps?.iter().map(Arc::as_ref))?;
+
+                Ok(script)
+            }
+            Err(err) => {
+                error!(
+                    "[VM] bytecode verifier returned errors for script: {:?}",
+                    err
+                );
+                Err(err)
+            }
+        }
+    }
+
+    // Script verification steps.
+    // See `verify_module()` for module verification steps.
+    fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
+        move_bytecode_verifier::verify_script_with_config_unmetered(
+            &self.vm_config.verifier,
+            script,
+        )
+    }
+
+    //
+    // Module verification and loading
+    //
+
+    // Entry point for function execution (`MoveVM::execute_function`).
+    // Loading verifies the module if it was never loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_function(
+        &self,
+        runtime_id: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(
+        Arc<CompiledModule>,
+        Arc<LoadedModule>,
+        Arc<Function>,
+        LoadedFunctionInstantiation,
+    )> {
+        let link_context = data_store.link_context();
+        let (compiled, loaded) = self.load_module(runtime_id, data_store)?;
+        let compiled_view = BinaryIndexedView::Module(compiled.as_ref());
+        let idx = self
+            .module_cache
+            .read()
+            .resolve_function_by_name(function_name, runtime_id, link_context)
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let func = self.module_cache.read().function_at(idx);
+
+        let parameters = compiled
+            .signature_at(func.parameters)
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_ = compiled
+            .signature_at(func.return_)
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        // verify type arguments
+        self.verify_ty_args(func.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Module(runtime_id.clone())))?;
+
+        let inst = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((compiled, loaded, func, inst))
+    }
+
+    // Entry point for module publishing (`MoveVM::publish_module_bundle`).
+    //
+    // All modules in the bundle to be published must be loadable. This function performs all
+    // verification steps to load these modules without actually loading them into the code cache.
+    pub(crate) fn verify_module_bundle_for_publication(
+        &self,
+        modules: &[CompiledModule],
+        data_store: &mut impl DataStore,
+    ) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-1", |_| { Ok(()) });
+
+        let mut bundle_verified = BTreeMap::new();
+        for module in modules {
+            let module_id = module.self_id();
+
+            self.verify_module_for_publication(module, &bundle_verified, data_store)?;
+            bundle_verified.insert(module_id.clone(), module.clone());
+        }
+        Ok(())
+    }
+
+    // A module to be published must be loadable.
+    //
+    // This step performs all verification steps to load the module without loading it.
+    // The module is not added to the code cache. It is simply published to the data cache.
+    // See `verify_script()` for script verification steps.
+    //
+    // If a module `M` is published together with a bundle of modules (i.e., a vector of modules),
+    // the `bundle_verified` argument tracks the modules that have already been verified in the
+    // bundle. Basically, this represents the modules appears before `M` in the bundle vector.
+    fn verify_module_for_publication(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        // Performs all verification steps to load the module without loading it, i.e., the new
+        // module will NOT show up in `module_cache`.
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            module,
+        )?;
+        self.check_natives(module)?;
+
+        let mut visiting = BTreeSet::new();
+        visiting.insert(module.self_id());
+
+        // downward exploration of the module's dependency graph. Since we know nothing about this
+        // target module, we don't know what the module may specify as its dependencies and hence,
+        // we allow the loading of dependencies and the subsequent linking to fail.
+        self.verify_dependencies(
+            module,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            /* allow_dependency_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // make sure there is no cyclic dependency
+        self.verify_module_cyclic_relations(module, bundle_verified, data_store)
+    }
+
+    fn verify_module_cyclic_relations(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        let module_cache = self.module_cache.read();
+        cyclic_dependencies::verify_module(module, |runtime_id| {
+            let module = if let Some(bundled) = bundle_verified.get(runtime_id) {
+                Some(bundled)
+            } else {
+                let storage_id = data_store.relocate(runtime_id)?;
+                module_cache
+                    .compiled_modules
+                    .get(&storage_id)
+                    .map(Arc::as_ref)
+            };
+
+            module
+                .map(|m| m.immediate_dependencies())
+                .ok_or_else(|| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+        })
+    }
+
+    // All native functions must be known to the loader, unless we are compiling with feature
+    // `lazy_natives`.
+    fn check_natives(&self, module: &CompiledModule) -> VMResult<()> {
+        fn check_natives_impl(loader: &Loader, module: &CompiledModule) -> PartialVMResult<()> {
+            if !cfg!(feature = "lazy_natives") {
+                for (idx, native_function) in module
+                    .function_defs()
+                    .iter()
+                    .filter(|fdv| fdv.is_native())
+                    .enumerate()
+                {
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    loader
+                        .natives
+                        .resolve(
+                            module.address_identifier_at(mh.address),
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str(),
+                        )
+                        .ok_or_else(|| {
+                            verification_error(
+                                StatusCode::MISSING_DEPENDENCY,
+                                IndexKind::FunctionHandle,
+                                idx as TableIndex,
+                            )
+                        })?;
+                }
+            }
+            // TODO: fix check and error code if we leave something around for native structs.
+            // For now this generates the only error test cases care about...
+            for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+                if struct_def.field_information == StructFieldInformation::Native {
+                    return Err(verification_error(
+                        StatusCode::MISSING_DEPENDENCY,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            Ok(())
+        }
+        check_natives_impl(self, module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    //
+    // Helpers for loading and verification
+    //
+
+    pub(crate) fn load_struct_by_name(
+        &self,
+        name: &IdentStr,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.load_module(runtime_id, data_store)?;
+        self.module_cache
+            .read()
+            // Should work if the type exists, because module was loaded above.
+            .resolve_struct_by_name(name, runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn load_type(
+        &self,
+        type_tag: &TypeTag,
+        data_store: &impl DataStore,
+    ) -> VMResult<Type> {
+        Ok(match type_tag {
+            TypeTag::Bool => Type::Bool,
+            TypeTag::U8 => Type::U8,
+            TypeTag::U16 => Type::U16,
+            TypeTag::U32 => Type::U32,
+            TypeTag::U64 => Type::U64,
+            TypeTag::U128 => Type::U128,
+            TypeTag::U256 => Type::U256,
+            TypeTag::Address => Type::Address,
+            TypeTag::Signer => Type::Signer,
+            TypeTag::Vector(tt) => Type::Vector(Box::new(self.load_type(tt, data_store)?)),
+            TypeTag::Struct(struct_tag) => {
+                let runtime_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
+                let (idx, struct_type) =
+                    self.load_struct_by_name(&struct_tag.name, &runtime_id, data_store)?;
+                if struct_type.type_parameters.is_empty() && struct_tag.type_params.is_empty() {
+                    Type::Struct(idx)
+                } else {
+                    let mut type_params = vec![];
+                    for ty_param in &struct_tag.type_params {
+                        type_params.push(self.load_type(ty_param, data_store)?);
+                    }
+                    self.verify_ty_args(struct_type.type_param_constraints(), &type_params)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    Type::StructInstantiation(idx, type_params)
+                }
+            }
+        })
+    }
+
+    // The interface for module loading. Aligned with `load_type` and `load_function`, this function
+    // verifies that the module is OK instead of expect it.
+    pub(crate) fn load_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        self.load_module_internal(runtime_id, &BTreeMap::new(), data_store)
+    }
+
+    // Load the transitive closure of the target module first, and then verify that the modules in
+    // the closure do not have cyclic dependencies.
+    fn load_module_internal(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        let link_context = data_store.link_context();
+
+        {
+            let locked_cache = self.module_cache.read();
+            if let Some(loaded) = locked_cache.loaded_module_at(link_context, runtime_id) {
+                let Some(compiled) = locked_cache.compiled_module_at(&loaded.id) else {
+                    unreachable!(
+                        "Loaded module without verified compiled module.\n\
+                         Context:    {link_context}\n\
+                         Runtime ID: {runtime_id}\n\
+                         Loaded module: {loaded:#?}"
+                    );
+                };
+
+                return Ok((compiled, loaded));
+            }
+        }
+
+        // otherwise, load the transitive closure of the target module
+        let mut visiting = BTreeSet::new();
+        let allow_module_loading_failure = true;
+        let dependencies_depth = 0;
+        let (storage_id, compiled) = self.verify_module_and_dependencies(
+            runtime_id,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            allow_module_loading_failure,
+            dependencies_depth,
+        )?;
+
+        // verify that the transitive closure does not have cycles
+        self.verify_module_cyclic_relations(compiled.as_ref(), bundle_verified, data_store)
+            .map_err(expect_no_verification_errors)?;
+
+        // load the compiled module
+        let loaded = self.module_cache.write().insert(
+            &self.natives,
+            data_store,
+            storage_id,
+            compiled.as_ref(),
+        )?;
+
+        Ok((compiled, loaded))
+    }
+
+    /// Read the module that will be referred to at runtime as `runtime_id`, but is found in the
+    /// store at `storage_id`.  Verify it without linking or interacting with caches, and return
+    /// the deserialized module on success.
+    fn read_module_from_store(
+        &self,
+        runtime_id: &ModuleId,
+        storage_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<CompiledModule> {
+        // bytes fetching, allow loading to fail if the flag is set
+        let bytes = match data_store.load_module(storage_id) {
+            Ok(bytes) => bytes,
+            Err(err) if allow_loading_failure => return Err(err),
+            Err(err) => {
+                error!(
+                    "[VM] Error fetching module with id {runtime_id:?} from storage at \
+                     {storage_id:?}",
+                );
+                return Err(expect_no_verification_errors(err));
+            }
+        };
+
+        // for bytes obtained from the data store, they should always deserialize and verify.
+        // It is an invariant violation if they don't.
+        let module = CompiledModule::deserialize_with_config(
+            &bytes,
+            self.vm_config.max_binary_format_version,
+            self.vm_config()
+                .check_no_extraneous_bytes_during_deserialization,
+        )
+        .map_err(|err| {
+            let msg = format!("Deserialization error: {:?}", err);
+            PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                .with_message(msg)
+                .finish(Location::Module(storage_id.clone()))
+        })
+        .map_err(expect_no_verification_errors)?;
+
+        fail::fail_point!("verifier-failpoint-2", |_| { Ok(module.clone()) });
+
+        // bytecode verifier checks that can be performed with the module itself
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            &module,
+        )
+        .map_err(expect_no_verification_errors)?;
+        self.check_natives(&module)
+            .map_err(expect_no_verification_errors)?;
+
+        Ok(module)
+    }
+
+    /// Deserialize and check the module with the bytecode verifier, without linking.  Cache the
+    /// `CompiledModule` on success, and return a reference to it.
+    fn verify_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        let storage_id = data_store
+            .relocate(runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        if let Some(cached) = self.module_cache.read().compiled_module_at(&storage_id) {
+            return Ok((storage_id, cached));
+        }
+
+        let module = self.read_module_from_store(
+            runtime_id,
+            &storage_id,
+            data_store,
+            allow_loading_failure,
+        )?;
+
+        let cached = self
+            .module_cache
+            .write()
+            .compiled_modules
+            .insert(storage_id.clone(), module)
+            .map_err(|e| e.finish(Location::Module(storage_id.clone())))?
+            .clone();
+
+        Ok((storage_id, cached))
+    }
+
+    /// Recursively read the module at ID and its transitive dependencies, verify them individually
+    /// and verify that they link together.  Returns the `CompiledModule` for `runtime_id`, written
+    /// to the module cache, on success, as well as the `ModuleId` it was read from, in storage.
+    fn verify_module_and_dependencies(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_module_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        // dependency loading does not permit cycles
+        if !visiting.insert(runtime_id.clone()) {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY)
+                .finish(Location::Undefined));
+        }
+
+        // module self-check
+        let (storage_id, module) =
+            self.verify_module(runtime_id, data_store, allow_module_loading_failure)?;
+
+        // If this module is already in the "verified dependencies" cache, then no need to check it
+        // again -- it has already been verified against its dependencies in this link context.
+        let cache_key = (data_store.link_context(), runtime_id.clone());
+        if !self
+            .module_cache
+            .read()
+            .verified_dependencies
+            .contains(&cache_key)
+        {
+            // downward exploration of the module's dependency graph. For a module that is loaded from
+            // the data_store, we should never allow its dependencies to fail to load.
+            let allow_dependency_loading_failure = false;
+            self.verify_dependencies(
+                module.as_ref(),
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth,
+            )?;
+
+            self.module_cache
+                .write()
+                .verified_dependencies
+                .insert(cache_key);
+        }
+
+        visiting.remove(runtime_id);
+        Ok((storage_id, module))
+    }
+
+    // downward exploration of the module's dependency graph
+    fn verify_dependencies(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_dependency_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+
+        // all immediate dependencies of the module being verified should be in one of the locations
+        // - the verified portion of the bundle (e.g., verified before this module)
+        // - the compiled module cache (i.e., module has been self-checked but not link checked)
+        // - the data store (i.e., not self-checked yet)
+        let mut bundle_deps = vec![];
+        let mut cached_deps = vec![];
+        for runtime_dep in module.immediate_dependencies() {
+            if let Some(cached) = bundle_verified.get(&runtime_dep) {
+                bundle_deps.push(cached);
+                continue;
+            }
+
+            let (_, loaded) = self.verify_module_and_dependencies(
+                &runtime_dep,
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth + 1,
+            )?;
+
+            cached_deps.push(loaded);
+        }
+
+        fail::fail_point!("verifier-failpoint-4", |_| { Ok(()) });
+
+        // once all dependencies are loaded, do the linking check
+        let deps = bundle_deps
+            .into_iter()
+            .chain(cached_deps.iter().map(Arc::as_ref));
+        let result = dependencies::verify_module(module, deps);
+
+        // if dependencies loading is not allowed to fail, the linking should not fail as well
+        if allow_dependency_loading_failure {
+            result
+        } else {
+            result.map_err(expect_no_verification_errors)
+        }?;
+
+        Ok(())
+    }
+
+    // Return an instantiated type given a generic and an instantiation.
+    // Stopgap to avoid a recursion that is either taking too long or using too
+    // much memory
+    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        if let Type::StructInstantiation(_, struct_inst) = ty {
+            let mut sum_nodes = 1u64;
+            for ty in ty_args.iter().chain(struct_inst.iter()) {
+                sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
+                if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                }
+            }
+        }
+        ty.subst(ty_args)
+    }
+
+    // Verify the kind (constraints) of an instantiation.
+    // Both function and script invocation use this function to verify correctness
+    // of type arguments provided
+    fn verify_ty_args<'a, I>(&self, constraints: I, ty_args: &[Type]) -> PartialVMResult<()>
+    where
+        I: IntoIterator<Item = &'a AbilitySet>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let constraints = constraints.into_iter();
+        if constraints.len() != ty_args.len() {
+            return Err(PartialVMError::new(
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+            ));
+        }
+        for (ty, expected_k) in ty_args.iter().zip(constraints) {
+            if !expected_k.is_subset(self.abilities(ty)?) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Internal helpers
+    //
+
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        self.module_cache.read().function_at(idx)
+    }
+
+    fn get_module(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> (Arc<CompiledModule>, Arc<LoadedModule>) {
+        let locked_cache = self.module_cache.read();
+        let loaded = locked_cache
+            .loaded_module_at(link_context, runtime_id)
+            .expect("ModuleId on Function must exist");
+        let compiled = locked_cache
+            .compiled_module_at(&loaded.id)
+            .expect("ModuleId on Function must exist");
+        (compiled, loaded)
+    }
+
+    fn get_script(&self, hash: &ScriptHash) -> Arc<LoadedScript> {
+        Arc::clone(
+            self.scripts
+                .read()
+                .scripts
+                .get(hash)
+                .expect("Script hash on Function must exist"),
+        )
+    }
+
+    pub(crate) fn get_struct_type(&self, idx: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.module_cache
+            .read()
+            .structs
+            .binaries
+            .get(idx.0)
+            .map(Arc::clone)
+    }
+
+    pub(crate) fn abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
+        match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address => Ok(AbilitySet::PRIMITIVES),
+
+            // Technically unreachable but, no point in erroring if we don't have to
+            Type::Reference(_) | Type::MutableReference(_) => Ok(AbilitySet::REFERENCES),
+            Type::Signer => Ok(AbilitySet::SIGNER),
+
+            Type::TyParam(_) => Err(PartialVMError::new(StatusCode::UNREACHABLE).with_message(
+                "Unexpected TyParam type after translating from TypeTag to Type".to_string(),
+            )),
+
+            Type::Vector(ty) => AbilitySet::polymorphic_abilities(
+                AbilitySet::VECTOR,
+                vec![false],
+                vec![self.abilities(ty)?],
+            ),
+            Type::Struct(idx) => Ok(self.module_cache.read().struct_at(*idx).abilities),
+            Type::StructInstantiation(idx, type_args) => {
+                let struct_type = self.module_cache.read().struct_at(*idx);
+                let declared_phantom_parameters = struct_type
+                    .type_parameters
+                    .iter()
+                    .map(|param| param.is_phantom);
+                let type_argument_abilities = type_args
+                    .iter()
+                    .map(|arg| self.abilities(arg))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                AbilitySet::polymorphic_abilities(
+                    struct_type.abilities,
+                    declared_phantom_parameters,
+                    type_argument_abilities,
+                )
+            }
+        }
+    }
+}
+
+//
+// Resolver
+//
+
+// A simple wrapper for a `Module` or a `Script` in the `Resolver`
+enum BinaryType {
+    Module {
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    },
+    Script(Arc<LoadedScript>),
+}
+
+// A Resolver is a simple and small structure allocated on the stack and used by the
+// interpreter. It's the only API known to the interpreter and it's tailored to the interpreter
+// needs.
+pub(crate) struct Resolver<'a> {
+    loader: &'a Loader,
+    binary: BinaryType,
+}
+
+impl<'a> Resolver<'a> {
+    fn for_module(
+        loader: &'a Loader,
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    ) -> Self {
+        let binary = BinaryType::Module { compiled, loaded };
+        Self { loader, binary }
+    }
+
+    fn for_script(loader: &'a Loader, script: Arc<LoadedScript>) -> Self {
+        let binary = BinaryType::Script(script);
+        Self { loader, binary }
+    }
+
+    //
+    // Constant resolution
+    //
+
+    pub(crate) fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        match &self.binary {
+            BinaryType::Module { compiled, .. } => compiled.constant_at(idx),
+            BinaryType::Script(script) => script.script.constant_at(idx),
+        }
+    }
+
+    //
+    // Function resolution
+    //
+
+    pub(crate) fn function_from_handle(&self, idx: FunctionHandleIndex) -> Arc<Function> {
+        let idx = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_at(idx.0),
+            BinaryType::Script(script) => script.function_at(idx.0),
+        };
+        self.loader.function_at(idx)
+    }
+
+    pub(crate) fn function_from_instantiation(
+        &self,
+        idx: FunctionInstantiationIndex,
+    ) -> Arc<Function> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        self.loader.function_at(func_inst.handle)
+    }
+
+    pub(crate) fn instantiate_generic_function(
+        &self,
+        idx: FunctionInstantiationIndex,
+        type_params: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        let mut instantiation = vec![];
+        for ty in &func_inst.instantiation {
+            instantiation.push(self.subst(ty, type_params)?);
+        }
+        // Check if the function instantiation over all generics is larger
+        // than MAX_TYPE_INSTANTIATION_NODES.
+        let mut sum_nodes = 1u64;
+        for ty in type_params.iter().chain(instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(instantiation)
+    }
+
+    //
+    // Type resolution
+    //
+
+    pub(crate) fn get_struct_type(&self, idx: StructDefinitionIndex) -> Type {
+        let struct_def = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Type::Struct(struct_def)
+    }
+
+    pub(crate) fn instantiate_generic_type(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and larger types via struct instantiation.
+        let mut sum_nodes = 1u64;
+        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+
+        Ok(Type::StructInstantiation(
+            struct_inst.def,
+            struct_inst
+                .instantiation
+                .iter()
+                .map(|ty| self.subst(ty, ty_args))
+                .collect::<PartialVMResult<_>>()?,
+        ))
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.single_type_at(idx),
+            BinaryType::Script(script) => script.single_type_at(idx),
+        }
+    }
+
+    pub(crate) fn instantiate_single_type(
+        &self,
+        idx: SignatureIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let ty = self.single_type_at(idx);
+        if !ty_args.is_empty() {
+            self.subst(ty, ty_args)
+        } else {
+            Ok(ty.clone())
+        }
+    }
+
+    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.loader.subst(ty, ty_args)
+    }
+
+    //
+    // Fields resolution
+    //
+
+    pub(crate) fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_count(&self, idx: StructDefinitionIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_count(&self, idx: StructDefInstantiationIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        self.loader.type_to_type_layout(ty)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        self.loader.type_to_fully_annotated_layout(ty)
+    }
+
+    // get the loader
+    pub(crate) fn loader(&self) -> &Loader {
+        self.loader
+    }
+}
+
+// A LoadedModule is very similar to a CompiledModule but data is "transformed" to a representation
+// more appropriate to execution.
+// When code executes indexes in instructions are resolved against those runtime structure
+// so that any data needed for execution is immediately available
+#[derive(Debug)]
+pub(crate) struct LoadedModule {
+    #[allow(dead_code)]
+    id: ModuleId,
+
+    //
+    // types as indexes into the Loader type list
+    //
+
+    // struct references carry the index into the global vector of types.
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of types. No instantiation of generic types is saved into the global table.
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+    structs: Vec<StructDef>,
+    // materialized instantiations, whether partial or not
+    struct_instantiations: Vec<StructInstantiation>,
+
+    // functions as indexes into the Loader function list
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of functions. No instantiation of generic functions is saved into
+    // the global table.
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // fields as a pair of index, first to the type, second to the field position in that type
+    field_handles: Vec<FieldHandle>,
+    // materialized instantiations, whether partial or not
+    field_instantiations: Vec<FieldInstantiation>,
+
+    // function name to index into the Loader function list.
+    // This allows a direct access from function name to `Function`
+    function_map: HashMap<Identifier, usize>,
+
+    // a map of single-token signature indices to type.
+    // Single-token signatures are usually indexed by the `SignatureIndex` in bytecode. For example,
+    // `VecMutBorrow(SignatureIndex)`, the `SignatureIndex` maps to a single `SignatureToken`, and
+    // hence, a single type.
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedModule {
+    fn new(
+        cursor: &CacheCursor,
+        link_context: AccountAddress,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+        cache: &ModuleCache,
+    ) -> Result<Self, PartialVMError> {
+        let self_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        let mut struct_refs = vec![];
+        let mut structs = vec![];
+        let mut struct_instantiations = vec![];
+        let mut function_refs = vec![];
+        let mut function_instantiations = vec![];
+        let mut field_handles = vec![];
+        let mut field_instantiations: Vec<FieldInstantiation> = vec![];
+        let mut function_map = HashMap::new();
+        let mut single_signature_token_map = BTreeMap::new();
+
+        for struct_handle in module.struct_handles() {
+            let struct_name = module.identifier_at(struct_handle.name);
+            let module_handle = module.module_handle_at(struct_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            struct_refs.push(cache.resolve_struct_by_name(struct_name, &runtime_id)?.0);
+        }
+
+        for struct_def in module.struct_defs() {
+            let idx = struct_refs[struct_def.struct_handle.0 as usize];
+            let field_count = cache.structs.binaries[idx.0].fields.len() as u16;
+            structs.push(StructDef { field_count, idx });
+        }
+
+        for struct_inst in module.struct_instantiations() {
+            let def = struct_inst.def.0 as usize;
+            let struct_def = &structs[def];
+            let field_count = struct_def.field_count;
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(struct_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            struct_instantiations.push(StructInstantiation {
+                field_count,
+                def: struct_def.idx,
+                instantiation,
+            });
+        }
+
+        for func_handle in module.function_handles() {
+            let func_name = module.identifier_at(func_handle.name);
+            let module_handle = module.module_handle_at(func_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            if runtime_id == self_id {
+                // module has not been published yet, loop through the functions
+                for (idx, function) in cache.functions.iter().enumerate().rev() {
+                    if idx < cursor.last_function {
+                        return Err(PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE)
+                            .with_message(format!(
+                                "Cannot find {:?}::{:?} in publishing module",
+                                runtime_id, func_name
+                            )));
+                    }
+                    if function.name.as_ident_str() == func_name {
+                        function_refs.push(idx);
+                        break;
+                    }
+                }
+            } else {
+                function_refs.push(cache.resolve_function_by_name(
+                    func_name,
+                    &runtime_id,
+                    link_context,
+                )?);
+            }
+        }
+
+        for func_def in module.function_defs() {
+            let idx = function_refs[func_def.function.0 as usize];
+            let name = module.identifier_at(module.function_handle_at(func_def.function).name);
+            function_map.insert(name.to_owned(), idx);
+
+            if let Some(code_unit) = &func_def.code {
+                for bc in &code_unit.code {
+                    match bc {
+                        Bytecode::VecPack(si, _)
+                        | Bytecode::VecLen(si)
+                        | Bytecode::VecImmBorrow(si)
+                        | Bytecode::VecMutBorrow(si)
+                        | Bytecode::VecPushBack(si)
+                        | Bytecode::VecPopBack(si)
+                        | Bytecode::VecUnpack(si, _)
+                        | Bytecode::VecSwap(si) => {
+                            if !single_signature_token_map.contains_key(si) {
+                                let ty = match module.signature_at(*si).0.get(0) {
+                                    None => {
+                                        return Err(PartialVMError::new(
+                                            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                        )
+                                        .with_message(
+                                            "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                                .to_owned(),
+                                        ));
+                                    }
+                                    Some(sig_token) => sig_token,
+                                };
+                                single_signature_token_map
+                                    .insert(*si, cache.make_type(module_view, ty)?);
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+
+        for func_inst in module.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        for f_handle in module.field_handles() {
+            let def_idx = f_handle.owner;
+            let owner = structs[def_idx.0 as usize].idx;
+            let offset = f_handle.field as usize;
+            field_handles.push(FieldHandle { offset, owner });
+        }
+
+        for f_inst in module.field_instantiations() {
+            let fh_idx = f_inst.handle;
+            let owner = field_handles[fh_idx.0 as usize].owner;
+            let offset = field_handles[fh_idx.0 as usize].offset;
+
+            field_instantiations.push(FieldInstantiation { offset, owner });
+        }
+
+        Ok(Self {
+            id: storage_id,
+            struct_refs,
+            structs,
+            struct_instantiations,
+            function_refs,
+            function_instantiations,
+            field_handles,
+            field_instantiations,
+            function_map,
+            single_signature_token_map,
+        })
+    }
+
+    fn struct_at(&self, idx: StructDefinitionIndex) -> CachedStructIndex {
+        self.structs[idx.0 as usize].idx
+    }
+
+    fn struct_instantiation_at(&self, idx: u16) -> &StructInstantiation {
+        &self.struct_instantiations[idx as usize]
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn field_count(&self, idx: u16) -> u16 {
+        self.structs[idx as usize].field_count
+    }
+
+    fn field_instantiation_count(&self, idx: u16) -> u16 {
+        self.struct_instantiations[idx as usize].field_count
+    }
+
+    fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        self.field_handles[idx.0 as usize].offset
+    }
+
+    fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        self.field_instantiations[idx.0 as usize].offset
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+/// A `LoadedScript` is very similar to a `CompiledScript` but data is "transformed" to a
+/// representation more appropriate to execution.
+/// When code executes, indexes in instructions are resolved against runtime structures
+/// (rather then "compiled") to make available data needed for execution
+/// #[derive(Debug)]
+struct LoadedScript {
+    // primitive pools
+    script: CompiledScript,
+
+    // types as indexes into the Loader type list
+    // REVIEW: why is this unused?
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+
+    // functions as indexes into the Loader function list
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // entry point
+    main: Arc<Function>,
+
+    // parameters of main
+    parameter_tys: Vec<Type>,
+
+    // return values
+    return_tys: Vec<Type>,
+
+    // a map of single-token signature indices to type
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedScript {
+    fn new(
+        script: CompiledScript,
+        link_context: AccountAddress,
+        script_hash: &ScriptHash,
+        cache: &ModuleCache,
+    ) -> VMResult<Self> {
+        let script_view = BinaryIndexedView::Script(&script);
+        let mut struct_refs = vec![];
+        for struct_handle in script.struct_handles() {
+            let struct_name = script.identifier_at(struct_handle.name);
+            let module_handle = script.module_handle_at(struct_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            struct_refs.push(
+                cache
+                    .resolve_struct_by_name(struct_name, &module_id)
+                    .map_err(|e| e.finish(Location::Script))?
+                    .0,
+            );
+        }
+
+        let mut function_refs = vec![];
+        for func_handle in script.function_handles().iter() {
+            let func_name = script.identifier_at(func_handle.name);
+            let module_handle = script.module_handle_at(func_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            let ref_idx = cache
+                .resolve_function_by_name(func_name, &module_id, link_context)
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function_refs.push(ref_idx);
+        }
+
+        let mut function_instantiations = vec![];
+        for func_inst in script.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &script.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(
+                    cache
+                        .make_type(script_view, ty)
+                        .map_err(|e| e.finish(Location::Script))?,
+                );
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        let scope = Scope::Script(*script_hash);
+
+        let code: Vec<Bytecode> = script.code.code.clone();
+        let parameters = script.parameters;
+        let parameters_len = script_view.signature_at(parameters).0.len();
+        let locals_len = parameters_len + script_view.signature_at(script.code.locals).0.len();
+        let parameter_tys = script_view
+            .signature_at(parameters)
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let return_ = SignatureIndex(0);
+        let return_len = 0;
+        let return_tys = Signature(vec![])
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let type_parameters = script.type_parameters.clone();
+        // TODO: main does not have a name. Revisit.
+        let name = Identifier::new("main").unwrap();
+        let (native, def_is_native) = (None, false); // Script entries cannot be native
+        let main: Arc<Function> = Arc::new(Function {
+            file_format_version: script.version(),
+            index: FunctionDefinitionIndex(0),
+            code,
+            parameters,
+            return_,
+            type_parameters,
+            native,
+            def_is_native,
+            scope,
+            name,
+            parameters_len,
+            locals_len,
+            return_len,
+        });
+
+        let mut single_signature_token_map = BTreeMap::new();
+        for bc in &script.code.code {
+            match bc {
+                Bytecode::VecPack(si, _)
+                | Bytecode::VecLen(si)
+                | Bytecode::VecImmBorrow(si)
+                | Bytecode::VecMutBorrow(si)
+                | Bytecode::VecPushBack(si)
+                | Bytecode::VecPopBack(si)
+                | Bytecode::VecUnpack(si, _)
+                | Bytecode::VecSwap(si) => {
+                    if !single_signature_token_map.contains_key(si) {
+                        let ty = match script.signature_at(*si).0.get(0) {
+                            None => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                )
+                                .with_message(
+                                    "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                        .to_owned(),
+                                )
+                                .finish(Location::Script));
+                            }
+                            Some(sig_token) => sig_token,
+                        };
+                        single_signature_token_map.insert(
+                            *si,
+                            cache
+                                .make_type(script_view, ty)
+                                .map_err(|e| e.finish(Location::Script))?,
+                        );
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        Ok(Self {
+            script,
+            struct_refs,
+            function_refs,
+            function_instantiations,
+            main,
+            parameter_tys,
+            return_tys,
+            single_signature_token_map,
+        })
+    }
+
+    fn entry_point(&self) -> Arc<Function> {
+        self.main.clone()
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+// A simple wrapper for the "owner" of the function (Module or Script)
+#[derive(Debug)]
+enum Scope {
+    Module(ModuleId),
+    Script(ScriptHash),
+}
+
+// A runtime function
+// #[derive(Debug)]
+// https://github.com/rust-lang/rust/issues/70263
+pub(crate) struct Function {
+    #[allow(unused)]
+    file_format_version: u32,
+    index: FunctionDefinitionIndex,
+    code: Vec<Bytecode>,
+    parameters: SignatureIndex,
+    return_: SignatureIndex,
+    type_parameters: Vec<AbilitySet>,
+    native: Option<NativeFunction>,
+    def_is_native: bool,
+    scope: Scope,
+    name: Identifier,
+    parameters_len: usize,
+    locals_len: usize,
+    return_len: usize,
+}
+
+impl Function {
+    fn new(
+        natives: &NativeFunctions,
+        index: FunctionDefinitionIndex,
+        def: &FunctionDefinition,
+        module: &CompiledModule,
+    ) -> Self {
+        let handle = module.function_handle_at(def.function);
+        let name = module.identifier_at(handle.name).to_owned();
+        let module_id = module.self_id();
+        let (native, def_is_native) = if def.is_native() {
+            (
+                natives.resolve(
+                    module_id.address(),
+                    module_id.name().as_str(),
+                    name.as_str(),
+                ),
+                true,
+            )
+        } else {
+            (None, false)
+        };
+        let scope = Scope::Module(module_id);
+        let parameters = handle.parameters;
+        let parameters_len = module.signature_at(parameters).0.len();
+        // Native functions do not have a code unit
+        let (code, locals_len) = match &def.code {
+            Some(code) => (
+                code.code.clone(),
+                parameters_len + module.signature_at(code.locals).0.len(),
+            ),
+            None => (vec![], 0),
+        };
+        let return_ = handle.return_;
+        let return_len = module.signature_at(return_).0.len();
+        let type_parameters = handle.type_parameters.clone();
+        Self {
+            file_format_version: module.version(),
+            index,
+            code,
+            parameters,
+            return_,
+            type_parameters,
+            native,
+            def_is_native,
+            scope,
+            name,
+            parameters_len,
+            locals_len,
+            return_len,
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn file_format_version(&self) -> u32 {
+        self.file_format_version
+    }
+
+    pub(crate) fn module_id(&self) -> Option<&ModuleId> {
+        match &self.scope {
+            Scope::Module(module_id) => Some(module_id),
+            Scope::Script(_) => None,
+        }
+    }
+
+    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
+        self.index
+    }
+
+    pub(crate) fn get_resolver<'a>(
+        &self,
+        link_context: AccountAddress,
+        loader: &'a Loader,
+    ) -> Resolver<'a> {
+        match &self.scope {
+            Scope::Module(module_id) => {
+                let (compiled, loaded) = loader.get_module(link_context, module_id);
+                Resolver::for_module(loader, compiled, loaded)
+            }
+            Scope::Script(script_hash) => {
+                let script = loader.get_script(script_hash);
+                Resolver::for_script(loader, script)
+            }
+        }
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals_len
+    }
+
+    pub(crate) fn arg_count(&self) -> usize {
+        self.parameters_len
+    }
+
+    pub(crate) fn return_type_count(&self) -> usize {
+        self.return_len
+    }
+
+    pub(crate) fn name(&self) -> &str {
+        self.name.as_str()
+    }
+
+    pub(crate) fn code(&self) -> &[Bytecode] {
+        &self.code
+    }
+
+    pub(crate) fn type_parameters(&self) -> &[AbilitySet] {
+        &self.type_parameters
+    }
+
+    pub(crate) fn pretty_string(&self) -> String {
+        match &self.scope {
+            Scope::Script(_) => "Script::main".into(),
+            Scope::Module(id) => format!(
+                "0x{}::{}::{}",
+                id.address(),
+                id.name().as_str(),
+                self.name.as_str()
+            ),
+        }
+    }
+
+    pub(crate) fn is_native(&self) -> bool {
+        self.def_is_native
+    }
+
+    pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        if cfg!(feature = "lazy_natives") {
+            // If lazy_natives is configured, this is a MISSING_DEPENDENCY error, as we skip
+            // checking those at module loading time.
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!("Missing Native Function `{}`", self.name))
+            })
+        } else {
+            // Otherwise this error should not happen, hence UNREACHABLE
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNREACHABLE)
+                    .with_message("Missing Native Function".to_string())
+            })
+        }
+    }
+}
+
+//
+// Internal structures that are saved at the proper index in the proper tables to access
+// execution information (interpreter).
+// The following structs are internal to the loader and never exposed out.
+// The `Loader` will create those struct and the proper table when loading a module.
+// The `Resolver` uses those structs to return information to the `Interpreter`.
+//
+
+// A function instantiation.
+#[derive(Debug)]
+struct FunctionInstantiation {
+    // index to `ModuleCache::functions` global table
+    handle: usize,
+    instantiation: Vec<Type>,
+}
+
+#[derive(Debug)]
+struct StructDef {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index
+    idx: CachedStructIndex,
+}
+
+#[derive(Debug)]
+struct StructInstantiation {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    def: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+// A field handle. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldHandle {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    owner: CachedStructIndex,
+}
+
+// A field instantiation. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldInstantiation {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    #[allow(unused)]
+    owner: CachedStructIndex,
+}
+
+//
+// Cache for data associated to a Struct, used for de/serialization and more
+//
+
+struct StructInfo {
+    runtime_struct_tag: Option<StructTag>,
+    defining_struct_tag: Option<StructTag>,
+    struct_layout: Option<R::MoveStructLayout>,
+    annotated_struct_layout: Option<A::MoveStructLayout>,
+    node_count: Option<u64>,
+    annotated_node_count: Option<u64>,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+enum StructTagType {
+    Runtime,
+    Defining,
+}
+
+impl StructInfo {
+    fn new() -> Self {
+        Self {
+            runtime_struct_tag: None,
+            defining_struct_tag: None,
+            struct_layout: None,
+            annotated_struct_layout: None,
+            node_count: None,
+            annotated_node_count: None,
+        }
+    }
+}
+
+pub(crate) struct TypeCache {
+    structs: HashMap<CachedStructIndex, HashMap<Vec<Type>, StructInfo>>,
+}
+
+impl TypeCache {
+    fn new() -> Self {
+        Self {
+            structs: HashMap::new(),
+        }
+    }
+}
+
+/// Maximal depth of a value in terms of type depth.
+pub const VALUE_DEPTH_MAX: u64 = 128;
+
+/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// fields for struct types.
+const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
+
+/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
+/// field types of structs.
+const MAX_TYPE_INSTANTIATION_NODES: u64 = 128;
+
+impl Loader {
+    fn read_cached_struct_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> Option<StructTag> {
+        let cache = self.type_cache.read();
+        let map = cache.structs.get(&gidx)?;
+        let info = map.get(ty_args)?;
+
+        match tag_type {
+            StructTagType::Runtime => info.runtime_struct_tag.clone(),
+            StructTagType::Defining => info.defining_struct_tag.clone(),
+        }
+    }
+
+    fn struct_gidx_to_type_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> PartialVMResult<StructTag> {
+        if let Some(cached) = self.read_cached_struct_tag(gidx, ty_args, tag_type) {
+            return Ok(cached);
+        }
+
+        let ty_arg_tags = ty_args
+            .iter()
+            .map(|ty| self.type_to_type_tag_impl(ty, tag_type))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+
+        match tag_type {
+            StructTagType::Runtime => {
+                let tag = StructTag {
+                    address: *struct_type.runtime_id.address(),
+                    module: struct_type.runtime_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.runtime_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+
+            StructTagType::Defining => {
+                let tag = StructTag {
+                    address: *struct_type.defining_id.address(),
+                    module: struct_type.defining_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.defining_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+        }
+    }
+
+    fn type_to_type_tag_impl(
+        &self,
+        ty: &Type,
+        tag_type: StructTagType,
+    ) -> PartialVMResult<TypeTag> {
+        Ok(match ty {
+            Type::Bool => TypeTag::Bool,
+            Type::U8 => TypeTag::U8,
+            Type::U16 => TypeTag::U16,
+            Type::U32 => TypeTag::U32,
+            Type::U64 => TypeTag::U64,
+            Type::U128 => TypeTag::U128,
+            Type::U256 => TypeTag::U256,
+            Type::Address => TypeTag::Address,
+            Type::Signer => TypeTag::Signer,
+            Type::Vector(ty) => {
+                TypeTag::Vector(Box::new(self.type_to_type_tag_impl(ty, tag_type)?))
+            }
+            Type::Struct(gidx) => TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(
+                *gidx,
+                &[],
+                tag_type,
+            )?)),
+            Type::StructInstantiation(gidx, ty_args) => TypeTag::Struct(Box::new(
+                self.struct_gidx_to_type_tag(*gidx, ty_args, tag_type)?,
+            )),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type tag for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn count_type_nodes(&self, ty: &Type) -> u64 {
+        let mut todo = vec![ty];
+        let mut result = 0;
+        while let Some(ty) = todo.pop() {
+            match ty {
+                Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                    result += 1;
+                    todo.push(ty);
+                }
+                Type::StructInstantiation(_, ty_args) => {
+                    result += 1;
+                    todo.extend(ty_args.iter())
+                }
+                _ => {
+                    result += 1;
+                }
+            }
+        }
+        result
+    }
+
+    fn struct_gidx_to_type_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(node_count) = &struct_info.node_count {
+                    *count += *node_count
+                }
+                if let Some(layout) = &struct_info.struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let count_before = *count;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        let field_tys = struct_type
+            .fields
+            .iter()
+            .map(|ty| self.subst(ty, ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_layouts = field_tys
+            .iter()
+            .map(|ty| self.type_to_type_layout_impl(ty, count, depth + 1))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_node_count = *count - count_before;
+
+        let struct_layout = R::MoveStructLayout::new(field_layouts);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.struct_layout = Some(struct_layout.clone());
+        info.node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_type_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => R::MoveTypeLayout::Bool,
+            Type::U8 => R::MoveTypeLayout::U8,
+            Type::U16 => R::MoveTypeLayout::U16,
+            Type::U32 => R::MoveTypeLayout::U32,
+            Type::U64 => R::MoveTypeLayout::U64,
+            Type::U128 => R::MoveTypeLayout::U128,
+            Type::U256 => R::MoveTypeLayout::U256,
+            Type::Address => R::MoveTypeLayout::Address,
+            Type::Signer => R::MoveTypeLayout::Signer,
+            Type::Vector(ty) => R::MoveTypeLayout::Vector(Box::new(
+                self.type_to_type_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => R::MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(
+                *gidx,
+                &[],
+                count,
+                depth,
+            )?),
+            Type::StructInstantiation(gidx, ty_args) => R::MoveTypeLayout::Struct(
+                self.struct_gidx_to_type_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn struct_gidx_to_fully_annotated_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(annotated_node_count) = &struct_info.annotated_node_count {
+                    *count += *annotated_node_count
+                }
+                if let Some(layout) = &struct_info.annotated_struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        if struct_type.fields.len() != struct_type.field_names.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Field types did not match the length of field names in loaded struct"
+                        .to_owned(),
+                ),
+            );
+        }
+        let count_before = *count;
+        let struct_tag = self.struct_gidx_to_type_tag(gidx, ty_args, StructTagType::Defining)?;
+        let field_layouts = struct_type
+            .field_names
+            .iter()
+            .zip(&struct_type.fields)
+            .map(|(n, ty)| {
+                let ty = self.subst(ty, ty_args)?;
+                let l = self.type_to_fully_annotated_layout_impl(&ty, count, depth + 1)?;
+                Ok(A::MoveFieldLayout::new(n.clone(), l))
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_layout = A::MoveStructLayout::new(struct_tag, field_layouts);
+        let field_node_count = *count - count_before;
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.annotated_struct_layout = Some(struct_layout.clone());
+        info.annotated_node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_fully_annotated_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => A::MoveTypeLayout::Bool,
+            Type::U8 => A::MoveTypeLayout::U8,
+            Type::U16 => A::MoveTypeLayout::U16,
+            Type::U32 => A::MoveTypeLayout::U32,
+            Type::U64 => A::MoveTypeLayout::U64,
+            Type::U128 => A::MoveTypeLayout::U128,
+            Type::U256 => A::MoveTypeLayout::U256,
+            Type::Address => A::MoveTypeLayout::Address,
+            Type::Signer => A::MoveTypeLayout::Signer,
+            Type::Vector(ty) => A::MoveTypeLayout::Vector(Box::new(
+                self.type_to_fully_annotated_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, &[], count, depth)?,
+            ),
+            Type::StructInstantiation(gidx, ty_args) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    pub(crate) fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Defining)
+    }
+
+    pub(crate) fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Runtime)
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_type_layout_impl(ty, &mut count, 1)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_fully_annotated_layout_impl(ty, &mut count, 1)
+    }
+}
+
+// Public APIs for external uses.
+impl Loader {
+    pub(crate) fn get_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<R::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_type_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<A::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_fully_annotated_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/logging.rs b/vendors/move/crates/move-vm-runtime/src/logging.rs
new file mode 100644
index 000000000..0359b7388
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/logging.rs
@@ -0,0 +1,44 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, VMError};
+use move_core_types::vm_status::{StatusCode, StatusType};
+use tracing::error;
+//
+// Utility functions
+//
+
+pub fn expect_no_verification_errors(err: VMError) -> VMError {
+    match err.status_type() {
+        status_type @ StatusType::Deserialization | status_type @ StatusType::Verification => {
+            let message = format!(
+                "Unexpected verifier/deserialization error! This likely means there is code \
+                stored on chain that is unverifiable!\nError: {:?}",
+                &err
+            );
+            let (
+                _old_status,
+                _old_sub_status,
+                _old_message,
+                _stacktrace,
+                location,
+                indices,
+                offsets,
+            ) = err.all_data();
+            let major_status = match status_type {
+                StatusType::Deserialization => StatusCode::UNEXPECTED_DESERIALIZATION_ERROR,
+                StatusType::Verification => StatusCode::UNEXPECTED_VERIFIER_ERROR,
+                _ => unreachable!(),
+            };
+
+            error!("[VM] {}", message);
+            PartialVMError::new(major_status)
+                .with_message(message)
+                .at_indices(indices)
+                .at_code_offsets(offsets)
+                .finish(location)
+        }
+        _ => err,
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/move_vm.rs b/vendors/move/crates/move-vm-runtime/src/move_vm.rs
new file mode 100644
index 000000000..1fb027bc2
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/move_vm.rs
@@ -0,0 +1,108 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    native_functions::NativeFunction, runtime::VMRuntime, session::Session,
+};
+use move_binary_format::{
+    errors::{Location, VMResult},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    metadata::Metadata, resolver::MoveResolver,
+};
+use move_vm_config::runtime::VMConfig;
+
+pub struct MoveVM {
+    runtime: VMRuntime,
+}
+
+impl MoveVM {
+    pub fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    ) -> VMResult<Self> {
+        Self::new_with_config(natives, VMConfig::default())
+    }
+
+    pub fn new_with_config(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> VMResult<Self> {
+        Ok(Self {
+            runtime: VMRuntime::new(natives, vm_config)
+                .map_err(|err| err.finish(Location::Undefined))?,
+        })
+    }
+
+    pub fn config(&self) -> &VMConfig {
+        self.runtime.loader().vm_config()
+    }
+
+    /// Create a new Session backed by the given storage.
+    ///
+    /// Right now it is the caller's responsibility to ensure cache coherence of the Move VM Loader
+    ///   - When a module gets published in a Move VM Session, and then gets used by another
+    ///     transaction, it will be loaded into the code cache and stay there even if the resulted
+    ///     effects do not get committed back to the storage when the Session ends.
+    ///   - As a result, if one wants to have multiple sessions at a time, one needs to make sure
+    ///     none of them will try to publish a module. In other words, if there is a module publishing
+    ///     Session it must be the only Session existing.
+    ///   - In general, a new Move VM needs to be created whenever the storage gets modified by an
+    ///     outer envrionment, or otherwise the states may be out of sync. There are a few exceptional
+    ///     cases where this may not be necessary, with the most notable one being the common module
+    ///     publishing flow: you can keep using the same Move VM if you publish some modules in a Session
+    ///     and apply the effects to the storage when the Session ends.
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.runtime.new_session(remote)
+    }
+
+    /// Create a new session, as in `new_session`, but provide native context extensions.
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        self.runtime.new_session_with_extensions(remote, extensions)
+    }
+
+    /// Load a module into VM's code cache
+    pub fn load_module<S: MoveResolver>(
+        &self,
+        module_id: &ModuleId,
+        remote: S,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.runtime
+            .loader()
+            .load_module(
+                module_id,
+                &TransactionDataCache::new(remote, self.runtime.loader()),
+            )
+            .map(|(compiled, _)| compiled)
+    }
+
+    /// Attempts to discover metadata in a given module with given key. Availability
+    /// of this data may depend on multiple aspects. In general, no hard assumptions of
+    /// availability should be made, but typically, one can expect that
+    /// the modules which have been involved in the execution of the last session are available.
+    ///
+    /// This is called by an adapter to extract, for example, debug information out of
+    /// the metadata section of the code for post mortem analysis. Notice that because
+    /// of ownership of the underlying binary representation of modules hidden behind an rwlock,
+    /// this actually has to hand back a copy of the associated metadata, so metadata should
+    /// be organized keeping this in mind.
+    ///
+    /// TODO: in the new loader architecture, as the loader is visible to the adapter, one would
+    ///   call this directly via the loader instead of the VM.
+    pub fn get_module_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        self.runtime.loader().get_metadata(module, key)
+    }
+
+    pub fn get_runtime(&self) -> &VMRuntime {
+        &self.runtime
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/native_extensions.rs b/vendors/move/crates/move-vm-runtime/src/native_extensions.rs
new file mode 100644
index 000000000..e75c50c8d
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/native_extensions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use better_any::{Tid, TidAble, TidExt};
+use std::{any::TypeId, collections::HashMap};
+
+/// A data type to represent a heterogeneous collection of extensions which are available to
+/// native functions. A value to this is passed into the session function execution.
+///
+/// The implementation uses the crate `better_any` which implements a version of the `Any`
+/// type, called `Tid<`a>`, which allows for up to one lifetime parameter. This
+/// avoids that extensions need to have `'static` lifetime, which `Any` requires. In order to make a
+/// struct suitable to be a 'Tid', use `#[derive(Tid)]` in the struct declaration. (See also
+/// tests at the end of this module.)
+#[derive(Default)]
+pub struct NativeContextExtensions<'a> {
+    map: HashMap<TypeId, Box<dyn Tid<'a>>>,
+}
+
+impl<'a> NativeContextExtensions<'a> {
+    pub fn add<T: TidAble<'a>>(&mut self, ext: T) {
+        assert!(
+            self.map.insert(T::id(), Box::new(ext)).is_none(),
+            "multiple extensions of the same type not allowed"
+        )
+    }
+
+    pub fn get<T: TidAble<'a>>(&self) -> &T {
+        self.map
+            .get(&T::id())
+            .expect("extension unknown")
+            .as_ref()
+            .downcast_ref::<T>()
+            .unwrap()
+    }
+
+    pub fn get_mut<T: TidAble<'a>>(&mut self) -> &mut T {
+        self.map
+            .get_mut(&T::id())
+            .expect("extension unknown")
+            .as_mut()
+            .downcast_mut::<T>()
+            .unwrap()
+    }
+
+    pub fn remove<T: TidAble<'a>>(&mut self) -> T {
+        // can't use expect below because it requires `T: Debug`.
+        match self
+            .map
+            .remove(&T::id())
+            .expect("extension unknown")
+            .downcast_box::<T>()
+        {
+            Ok(val) => *val,
+            Err(_) => panic!("downcast error"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::native_extensions::NativeContextExtensions;
+    use better_any::{Tid, TidAble};
+
+    #[derive(Tid)]
+    struct Ext<'a> {
+        a: &'a mut u64,
+    }
+
+    #[test]
+    fn non_static_ext() {
+        let mut v: u64 = 23;
+        let e = Ext { a: &mut v };
+        let mut exts = NativeContextExtensions::default();
+        exts.add(e);
+        *exts.get_mut::<Ext>().a += 1;
+        assert_eq!(*exts.get_mut::<Ext>().a, 24);
+        *exts.get_mut::<Ext>().a += 1;
+        let e1 = exts.remove::<Ext>();
+        assert_eq!(*e1.a, 25)
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/native_functions.rs b/vendors/move/crates/move-vm-runtime/src/native_functions.rs
new file mode 100644
index 000000000..c6406ae04
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/native_functions.rs
@@ -0,0 +1,237 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter, loader::Resolver, native_extensions::NativeContextExtensions,
+};
+use move_binary_format::errors::{ExecutionState, PartialVMError, PartialVMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    gas_algebra::InternalGas,
+    identifier::Identifier,
+    language_storage::TypeTag,
+    runtime_value as R,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+use move_vm_types::{
+    data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult,
+    values::Value,
+};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, VecDeque},
+    fmt::Write,
+    sync::Arc,
+};
+
+pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>
+    + Send
+    + Sync
+    + 'static;
+
+pub type NativeFunction = Arc<UnboxedNativeFunction>;
+
+pub type NativeFunctionTable = Vec<(AccountAddress, Identifier, Identifier, NativeFunction)>;
+
+pub fn make_table(
+    addr: AccountAddress,
+    elems: &[(&str, &str, NativeFunction)],
+) -> NativeFunctionTable {
+    make_table_from_iter(addr, elems.iter().cloned())
+}
+
+pub fn make_table_from_iter<S: Into<Box<str>>>(
+    addr: AccountAddress,
+    elems: impl IntoIterator<Item = (S, S, NativeFunction)>,
+) -> NativeFunctionTable {
+    elems
+        .into_iter()
+        .map(|(module_name, func_name, func)| {
+            (
+                addr,
+                Identifier::new(module_name).unwrap(),
+                Identifier::new(func_name).unwrap(),
+                func,
+            )
+        })
+        .collect()
+}
+
+pub(crate) struct NativeFunctions(
+    HashMap<AccountAddress, HashMap<String, HashMap<String, NativeFunction>>>,
+);
+
+impl NativeFunctions {
+    pub fn resolve(
+        &self,
+        addr: &AccountAddress,
+        module_name: &str,
+        func_name: &str,
+    ) -> Option<NativeFunction> {
+        self.0.get(addr)?.get(module_name)?.get(func_name).cloned()
+    }
+
+    pub fn new<I>(natives: I) -> PartialVMResult<Self>
+    where
+        I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    {
+        let mut map = HashMap::new();
+        for (addr, module_name, func_name, func) in natives.into_iter() {
+            let modules = map.entry(addr).or_insert_with(HashMap::new);
+            let funcs = modules
+                .entry(module_name.into_string())
+                .or_insert_with(HashMap::new);
+
+            if funcs.insert(func_name.into_string(), func).is_some() {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_NATIVE_FUNCTION));
+            }
+        }
+        Ok(Self(map))
+    }
+}
+
+pub struct NativeContext<'a, 'b> {
+    interpreter: &'a mut Interpreter,
+    data_store: &'a mut dyn DataStore,
+    resolver: &'a Resolver<'a>,
+    extensions: &'a mut NativeContextExtensions<'b>,
+    gas_left: RefCell<InternalGas>,
+    gas_budget: InternalGas,
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub(crate) fn new(
+        interpreter: &'a mut Interpreter,
+        data_store: &'a mut dyn DataStore,
+        resolver: &'a Resolver<'a>,
+        extensions: &'a mut NativeContextExtensions<'b>,
+        gas_budget: InternalGas,
+    ) -> Self {
+        Self {
+            interpreter,
+            data_store,
+            resolver,
+            extensions,
+            gas_left: RefCell::new(gas_budget),
+            gas_budget,
+        }
+    }
+
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        self.interpreter.runtime_limits_config()
+    }
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub fn print_stack_trace<B: Write>(&self, buf: &mut B) -> PartialVMResult<()> {
+        self.interpreter
+            .debug_print_stack_trace(buf, self.resolver.loader())
+    }
+
+    pub fn save_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<bool> {
+        match self.data_store.emit_event(guid, seq_num, ty, val) {
+            Ok(()) => Ok(true),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(false),
+        }
+    }
+
+    pub fn events(&self) -> &Vec<(Vec<u8>, u64, Type, R::MoveTypeLayout, Value)> {
+        self.data_store.events()
+    }
+
+    pub fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_type_tag(ty)
+    }
+
+    pub fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_runtime_type_tag(ty)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<Option<R::MoveTypeLayout>> {
+        match self.resolver.type_to_type_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<Option<A::MoveTypeLayout>> {
+        match self.resolver.type_to_fully_annotated_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn extensions(&self) -> &NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    pub fn extensions_mut(&mut self) -> &mut NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    /// Get count stack frames, including the one of the called native function. This
+    /// allows a native function to reflect about its caller.
+    pub fn stack_frames(&self, count: usize) -> ExecutionState {
+        self.interpreter.get_stack_frames(count)
+    }
+
+    pub fn charge_gas(&self, amount: InternalGas) -> bool {
+        let mut gas_left = self.gas_left.borrow_mut();
+
+        match gas_left.checked_sub(amount) {
+            Some(x) => {
+                *gas_left = x;
+                true
+            }
+            None => false,
+        }
+    }
+
+    pub fn gas_budget(&self) -> InternalGas {
+        self.gas_budget
+    }
+
+    pub fn gas_used(&self) -> InternalGas {
+        self.gas_budget.saturating_sub(*self.gas_left.borrow())
+    }
+}
+
+/// Charge gas during a native call. If the charging fails, return early
+#[macro_export]
+macro_rules! native_charge_gas_early_exit {
+    ($native_context:ident, $cost:expr) => {{
+        use move_core_types::vm_status::sub_status::NFE_OUT_OF_GAS;
+        if !$native_context.charge_gas($cost) {
+            // Exhausted all in budget. terminate early
+            return Ok(NativeResult::err(
+                $native_context.gas_budget(),
+                NFE_OUT_OF_GAS,
+            ));
+        }
+    }};
+}
+
+/// Total cost of a native call so far
+#[macro_export]
+macro_rules! native_gas_total_cost {
+    ($native_context:ident, $gas_left:ident) => {{
+        // Its okay to unwrap because the budget can never be less than the gas left
+        $native_context.gas_budget().checked_sub($gas_left).unwrap()
+    }};
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/runtime.rs b/vendors/move/crates/move-vm-runtime/src/runtime.rs
new file mode 100644
index 000000000..5fb3d3445
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/runtime.rs
@@ -0,0 +1,580 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache,
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+    native_extensions::NativeContextExtensions,
+    native_functions::{NativeFunction, NativeFunctions},
+    session::{LoadedFunctionInstantiation, SerializedReturnValues, Session},
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{AbilitySet, LocalIndex},
+    CompiledModule, IndexKind,
+};
+use move_bytecode_verifier::script_signature;
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+    values::{Locals, Reference, VMValueCast, Value},
+};
+use std::{borrow::Borrow, collections::BTreeSet, sync::Arc};
+use tracing::warn;
+
+/// An instantiation of the MoveVM.
+pub struct VMRuntime {
+    loader: Loader,
+}
+
+impl VMRuntime {
+    pub(crate) fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> PartialVMResult<Self> {
+        Ok(VMRuntime {
+            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
+        })
+    }
+
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.new_session_with_extensions(remote, NativeContextExtensions::default())
+    }
+
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        native_extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        Session {
+            runtime: self,
+            data_cache: TransactionDataCache::new(remote, &self.loader),
+            native_extensions,
+        }
+    }
+
+    pub fn publish_module_bundle(
+        &self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        data_store: &mut impl DataStore,
+        _gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        // deserialize the modules. Perform bounds check. After this indexes can be
+        // used with the `[]` operator
+        let compiled_modules = match modules
+            .iter()
+            .map(|blob| {
+                CompiledModule::deserialize_with_config(
+                    blob,
+                    self.loader.vm_config().max_binary_format_version,
+                    self.loader
+                        .vm_config()
+                        .check_no_extraneous_bytes_during_deserialization,
+                )
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+        {
+            Ok(modules) => modules,
+            Err(err) => {
+                warn!("[VM] module deserialization failed {:?}", err);
+                return Err(err.finish(Location::Undefined));
+            }
+        };
+
+        // Make sure all modules' self addresses matches the transaction sender. The self address is
+        // where the module will actually be published. If we did not check this, the sender could
+        // publish a module under anyone's account.
+        for module in &compiled_modules {
+            if module.address() != &sender {
+                return Err(verification_error(
+                    StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER,
+                    IndexKind::AddressIdentifier,
+                    module.self_handle_idx().0,
+                )
+                .finish(Location::Undefined));
+            }
+        }
+
+        // Collect ids for modules that are published together
+        let mut bundle_unverified = BTreeSet::new();
+        for module in &compiled_modules {
+            if !bundle_unverified.insert(module.self_id()) {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
+                    .finish(Location::Undefined));
+            }
+        }
+
+        // Perform bytecode and loading verification. Modules must be sorted in topological order.
+        self.loader
+            .verify_module_bundle_for_publication(&compiled_modules, data_store)?;
+
+        // NOTE: we want to (informally) argue that all modules pass the linking check before being
+        // published to the data store.
+        //
+        // The linking check consists of two checks actually
+        // - dependencies::verify_module(module, all_imm_deps)
+        // - cyclic_dependencies::verify_module(module, fn_imm_deps, fn_imm_friends)
+        //
+        // [Claim 1]
+        // We show that the `dependencies::verify_module` check is always satisfied whenever a
+        // module M is published or updated and the `all_imm_deps` contains the actual modules
+        // required by M.
+        //
+        // Suppose M depends on D, and we now consider the following scenarios:
+        // 1) D does not appear in the bundle together with M
+        // -- In this case, D must be either in the code cache or in the data store which can be
+        //    loaded into the code cache (and pass all checks on D).
+        //    - If D is missing, the linking will fail and return an error.
+        //    - If D exists, D will be added to the `all_imm_deps` arg when checking M.
+        //
+        // 2) D appears in the bundle *before* M
+        // -- In this case, regardless of whether D is in code cache or not, D will be put into the
+        //    `bundle_verified` argument and modules in `bundle_verified` will be prioritized before
+        //    returning a module in code cache.
+        //
+        // 3) D appears in the bundle *after* M
+        // -- This technically should be discouraged but this is user input so we cannot have this
+        //    assumption here. But nevertheless, we can still make the claim 1 even in this case.
+        //    When M is verified, flow 1) is effectively activated, which means:
+        //    - If the code cache or the data store does not contain a D' which has the same name
+        //      with D, then the linking will fail and return an error.
+        //    - If D' exists, and M links against D', then when verifying D in a later time point,
+        //      a compatibility check will be invoked to ensure that D is compatible with D',
+        //      meaning, whichever module that links against D' will have to link against D as well.
+        //
+        // [Claim 2]
+        // We show that the `cyclic_dependencies::verify_module` check is always satisfied whenever
+        // a module M is published or updated and the dep/friend modules returned by the transitive
+        // dependency closure functions are valid.
+        //
+        // Currently, the code is written in a way that, from the view point of the
+        // `cyclic_dependencies::verify_module` check, modules checked prior to module M in the same
+        // bundle looks as if they have already been published and loaded to the code cache.
+        //
+        // Therefore, if M forms a cyclic dependency with module A in the same bundle that is
+        // checked prior to M, such an error will be detected. However, if M forms a cyclic
+        // dependency with a module X that appears in the same bundle *after* M. The cyclic
+        // dependency can only be caught when X is verified.
+        //
+        // In summary: the code is written in a way that, certain checks are skipped while checking
+        // each individual module in the bundle in order. But if every module in the bundle pass
+        // all the checks, then the whole bundle can be published/upgraded together. Otherwise,
+        // none of the module can be published/updated.
+        for (module, blob) in compiled_modules.into_iter().zip(modules.into_iter()) {
+            let runtime_id = module.self_id();
+            let storage_id = data_store
+                .relocate(&runtime_id)
+                .map_err(|e| e.finish(Location::Module(runtime_id)))?;
+
+            data_store.publish_module(&storage_id, blob)?;
+        }
+
+        Ok(())
+    }
+
+    fn deserialize_value(&self, ty: &Type, arg: impl Borrow<[u8]>) -> PartialVMResult<Value> {
+        let layout = match self.loader.type_to_type_layout(ty) {
+            Ok(layout) => layout,
+            Err(_err) => {
+                warn!("[VM] failed to get layout from type");
+                return Err(PartialVMError::new(
+                    StatusCode::INVALID_PARAM_TYPE_FOR_DESERIALIZATION,
+                ));
+            }
+        };
+
+        match Value::simple_deserialize(arg.borrow(), &layout) {
+            Some(val) => Ok(val),
+            None => {
+                warn!("[VM] failed to deserialize argument");
+                Err(PartialVMError::new(
+                    StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+                ))
+            }
+        }
+    }
+
+    fn deserialize_args(
+        &self,
+        arg_tys: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+    ) -> PartialVMResult<(Locals, Vec<Value>)> {
+        if arg_tys.len() != serialized_args.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "argument length mismatch: expected {} got {}",
+                        arg_tys.len(),
+                        serialized_args.len()
+                    ),
+                ),
+            );
+        }
+
+        // Create a list of dummy locals. Each value stored will be used be borrowed and passed
+        // by reference to the invoked function
+        let mut dummy_locals = Locals::new(arg_tys.len());
+        // Arguments for the invoked function. These can be owned values or references
+        let deserialized_args = arg_tys
+            .into_iter()
+            .zip(serialized_args)
+            .enumerate()
+            .map(|(idx, (arg_ty, arg_bytes))| match &arg_ty {
+                Type::MutableReference(inner_t) | Type::Reference(inner_t) => {
+                    dummy_locals.store_loc(
+                        idx,
+                        self.deserialize_value(inner_t, arg_bytes)?,
+                        self.loader
+                            .vm_config()
+                            .enable_invariant_violation_check_in_swap_loc,
+                    )?;
+                    dummy_locals.borrow_loc(idx)
+                }
+                _ => self.deserialize_value(&arg_ty, arg_bytes),
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        Ok((dummy_locals, deserialized_args))
+    }
+
+    fn serialize_return_value(
+        &self,
+        ty: &Type,
+        value: Value,
+    ) -> PartialVMResult<(Vec<u8>, MoveTypeLayout)> {
+        let (ty, value) = match ty {
+            Type::Reference(inner) | Type::MutableReference(inner) => {
+                let ref_value: Reference = value.cast().map_err(|_err| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "non reference value given for a reference typed return value".to_string(),
+                    )
+                })?;
+                let inner_value = ref_value.read_ref()?;
+                (&**inner, inner_value)
+            }
+            _ => (ty, value),
+        };
+
+        let layout = self.loader.type_to_type_layout(ty).map_err(|_err| {
+            PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
+                "entry point functions cannot have non-serializable return types".to_string(),
+            )
+        })?;
+        let bytes = value.simple_serialize(&layout).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to serialize return values".to_string())
+        })?;
+        Ok((bytes, layout))
+    }
+
+    fn serialize_return_values(
+        &self,
+        return_types: &[Type],
+        return_values: Vec<Value>,
+    ) -> PartialVMResult<Vec<(Vec<u8>, MoveTypeLayout)>> {
+        if return_types.len() != return_values.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "declared {} return types, but got {} return values",
+                        return_types.len(),
+                        return_values.len()
+                    ),
+                ),
+            );
+        }
+
+        return_types
+            .iter()
+            .zip(return_values)
+            .map(|(ty, value)| self.serialize_return_value(ty, value))
+            .collect()
+    }
+
+    fn execute_function_impl(
+        &self,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+        param_types: Vec<Type>,
+        return_types: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        let arg_types = param_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let mut_ref_args = arg_types
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, ty)| match ty {
+                Type::MutableReference(inner) => Some((idx, inner.clone())),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        let (mut dummy_locals, deserialized_args) = self
+            .deserialize_args(arg_types, serialized_args)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let return_types = return_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_values = Interpreter::entrypoint(
+            func,
+            ty_args,
+            deserialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+            &self.loader,
+        )?;
+
+        let serialized_return_values = self
+            .serialize_return_values(&return_types, return_values)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let serialized_mut_ref_outputs = mut_ref_args
+            .into_iter()
+            .map(|(idx, ty)| {
+                // serialize return values first in the case that a value points into this local
+                let local_val = dummy_locals.move_loc(
+                    idx,
+                    self.loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                let (bytes, layout) = self.serialize_return_value(&ty, local_val)?;
+                Ok((idx as LocalIndex, bytes, layout))
+            })
+            .collect::<PartialVMResult<_>>()
+            .map_err(|e| e.finish(Location::Undefined))?;
+
+        // locals should not be dropped until all return values are serialized
+        std::mem::drop(dummy_locals);
+
+        Ok(SerializedReturnValues {
+            mutable_reference_outputs: serialized_mut_ref_outputs,
+            return_values: serialized_return_values,
+        })
+    }
+
+    pub(crate) fn execute_function(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        bypass_declared_entry_check: bool,
+    ) -> VMResult<SerializedReturnValues> {
+        use move_binary_format::{binary_views::BinaryIndexedView, file_format::SignatureIndex};
+        fn check_is_entry(
+            _resolver: &BinaryIndexedView,
+            is_entry: bool,
+            _parameters_idx: SignatureIndex,
+            _return_idx: Option<SignatureIndex>,
+        ) -> PartialVMResult<()> {
+            if is_entry {
+                Ok(())
+            } else {
+                Err(PartialVMError::new(
+                    StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
+                ))
+            }
+        }
+
+        let additional_signature_checks = if bypass_declared_entry_check {
+            move_bytecode_verifier::no_additional_script_signature_checks
+        } else {
+            check_is_entry
+        };
+        // load the function
+        let (
+            compiled,
+            _,
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_function(module, function_name, &type_arguments, data_store)?;
+
+        script_signature::verify_module_function_signature_by_name(
+            compiled.as_ref(),
+            function_name,
+            additional_signature_checks,
+        )?;
+
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    // See Session::execute_script for what contracts to follow.
+    pub(crate) fn execute_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the script, perform verification
+        let (
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_script(script.borrow(), &type_arguments, data_store)?;
+        #[cfg(debug_assertions)]
+        {
+            let rem = gas_meter.remaining_gas().into();
+            gas_meter.set_profiler(GasProfiler::init_default_cfg(func.pretty_string(), rem));
+        }
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    pub(crate) fn loader(&self) -> &Loader {
+        &self.loader
+    }
+
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.loader
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.loader
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.loader.get_struct_type(index)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> VMResult<MoveTypeLayout> {
+        self.loader
+            .type_to_type_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn load_struct(
+        &self,
+        module_id: &ModuleId,
+        struct_name: &IdentStr,
+        data_store: &impl DataStore,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.loader
+            .load_struct_by_name(struct_name, module_id, data_store)
+    }
+
+    pub fn execute_function_bypass_visibility(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        #[cfg(debug_assertions)]
+        {
+            if gas_meter.get_profiler_mut().is_none() {
+                gas_meter.set_profiler(GasProfiler::init_default_cfg(
+                    function_name.to_string(),
+                    gas_meter.remaining_gas().into(),
+                ));
+            }
+        }
+
+        let bypass_declared_entry_check = true;
+        self.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            data_store,
+            gas_meter,
+            extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    pub fn type_to_fully_annotated_layout(&self, ty: &Type) -> VMResult<A::MoveTypeLayout> {
+        self.loader
+            .type_to_fully_annotated_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[Type],
+        data_store: &mut impl DataStore,
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, _, instantiation) =
+            self.loader
+                .load_function(module_id, function_name, type_arguments, data_store)?;
+        Ok(instantiation)
+    }
+
+    pub fn load_module(
+        &self,
+        module_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.loader
+            .load_module(module_id, data_store)
+            .map(|(compiled, _)| compiled)
+    }
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/session.rs b/vendors/move/crates/move-vm-runtime/src/session.rs
new file mode 100644
index 000000000..5a8f513e5
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/session.rs
@@ -0,0 +1,359 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    runtime::VMRuntime,
+};
+use move_binary_format::{
+    errors::*,
+    file_format::{AbilitySet, LocalIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    effects::{ChangeSet, Event},
+    identifier::IdentStr,
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+};
+use std::{borrow::Borrow, sync::Arc};
+
+pub struct Session<'r, 'l, S> {
+    pub(crate) runtime: &'l VMRuntime,
+    pub(crate) data_cache: TransactionDataCache<'l, S>,
+    pub(crate) native_extensions: NativeContextExtensions<'r>,
+}
+
+/// Serialized return values from function/script execution
+/// Simple struct is designed just to convey meaning behind serialized values
+#[derive(Debug)]
+pub struct SerializedReturnValues {
+    /// The value of any arguments that were mutably borrowed.
+    /// Non-mut borrowed values are not included
+    pub mutable_reference_outputs: Vec<(LocalIndex, Vec<u8>, MoveTypeLayout)>,
+    /// The return values from the function
+    pub return_values: Vec<(Vec<u8>, MoveTypeLayout)>,
+}
+
+impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
+    /// Execute a Move function with the given arguments. This is mainly designed for an external
+    /// environment to invoke system logic written in Move.
+    ///
+    /// NOTE: There are NO checks on the `args` except that they can deserialize into the provided
+    /// types.
+    /// The ability to deserialize `args` into arbitrary types is *very* powerful, e.g. it can
+    /// used to manufacture `signer`'s or `Coin`'s from raw bytes. It is the responsibility of the
+    /// caller (e.g. adapter) to ensure that this power is used responsibly/securely for its
+    /// use-case.
+    ///
+    /// The caller MUST ensure
+    ///   - All types and modules referred to by the type arguments exist.
+    ///   - The signature is valid for the rules of the adapter
+    ///
+    /// The Move VM MUST return an invariant violation if the caller fails to follow any of the
+    /// rules above.
+    ///
+    /// The VM will check that the function is marked as an 'entry' function.
+    ///
+    /// Currently if any other error occurs during execution, the Move VM will simply propagate that
+    /// error back to the outer environment without handling/translating it. This behavior may be
+    /// revised in the future.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_entry_function(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = false;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Similar to execute_entry_function, but it bypasses visibility checks
+    pub fn execute_function_bypass_visibility(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        #[cfg(debug_assertions)]
+        {
+            if gas_meter.get_profiler_mut().is_none() {
+                gas_meter.set_profiler(GasProfiler::init_default_cfg(
+                    function_name.to_string(),
+                    gas_meter.remaining_gas().into(),
+                ));
+            }
+        }
+
+        let bypass_declared_entry_check = true;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Execute a transaction script.
+    ///
+    /// The Move VM MUST return a user error (in other words, an error that's not an invariant
+    /// violation) if
+    ///   - The script fails to deserialize or verify. Not all expressible signatures are valid.
+    ///     See `move_bytecode_verifier::script_signature` for the rules.
+    ///   - Type arguments refer to a non-existent type.
+    ///   - Arguments (senders included) fail to deserialize or fail to match the signature of the
+    ///     script function.
+    ///
+    /// If any other error occurs during execution, the Move VM MUST propagate that error back to
+    /// the caller.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_script(
+        &mut self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        self.runtime.execute_script(
+            script,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+        )
+    }
+
+    /// Publish the given module.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    ///   - The module fails to deserialize or verify.
+    ///   - The sender address does not match that of the module.
+    ///
+    /// The Move VM should not be able to produce other user errors.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module(
+        &mut self,
+        module: Vec<u8>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.publish_module_bundle(vec![module], sender, gas_meter)
+    }
+
+    /// Publish a series of modules.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    /// any module fails to deserialize or verify (see the full list of  failing conditions in the
+    /// `publish_module` API). The publishing of the module series is an all-or-nothing action:
+    /// either all modules are published to the data store or none is.
+    ///
+    /// Similar to the `publish_module` API, the Move VM should not be able to produce other user
+    /// errors. Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module_bundle(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime
+            .publish_module_bundle(modules, sender, &mut self.data_cache, gas_meter)
+    }
+
+    pub fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        self.data_cache.num_mutated_accounts(sender)
+    }
+
+    /// Finish up the session and produce the side effects.
+    ///
+    /// This function should always succeed with no user errors returned, barring invariant violations.
+    ///
+    /// This MUST NOT be called if there is a previous invocation that failed with an invariant violation.
+    pub fn finish(self) -> (VMResult<(ChangeSet, Vec<Event>)>, S) {
+        let (res, remote) = self.data_cache.into_effects();
+        (res.map_err(|e| e.finish(Location::Undefined)), remote)
+    }
+
+    pub fn vm_config(&self) -> &move_vm_config::runtime::VMConfig {
+        self.runtime.loader().vm_config()
+    }
+
+    /// Same like `finish`, but also extracts the native context extensions from the session.
+    pub fn finish_with_extensions(
+        self,
+    ) -> (
+        VMResult<(ChangeSet, Vec<Event>, NativeContextExtensions<'r>)>,
+        S,
+    ) {
+        let Session {
+            data_cache,
+            native_extensions,
+            ..
+        } = self;
+        let (res, remote) = data_cache.into_effects();
+        (
+            res.map(|(change_set, events)| (change_set, events, native_extensions))
+                .map_err(|e| e.finish(Location::Undefined)),
+            remote,
+        )
+    }
+
+    /// Load a script and all of its types into cache
+    pub fn load_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        ty_args: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, instantiation) =
+            self.runtime
+                .loader()
+                .load_script(script.borrow(), ty_args, &self.data_cache)?;
+        Ok(instantiation)
+    }
+
+    /// Load a module, a function, and all of its types into cache
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, _, instantiation) = self.runtime.loader().load_function(
+            module_id,
+            function_name,
+            type_arguments,
+            &self.data_cache,
+        )?;
+        Ok(instantiation)
+    }
+
+    /// Load a struct by its name to get the global index that it is referenced by within the
+    /// loader, and the loaded struct information.  This operation also ensures the defining module
+    /// is loaded from the data store and will fail if the type does not exist in that module.
+    pub fn load_struct(
+        &self,
+        module_id: &ModuleId,
+        struct_name: &IdentStr,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.runtime
+            .loader()
+            .load_struct_by_name(struct_name, module_id, &self.data_cache)
+    }
+
+    pub fn load_type(&self, type_tag: &TypeTag) -> VMResult<Type> {
+        self.runtime.loader().load_type(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_layout(&self, type_tag: &TypeTag) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+    ) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_fully_annotated_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_type_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn type_to_fully_annotated_layout(&self, ty: &Type) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_fully_annotated_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.runtime
+            .loader()
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Fetch a struct type from cache, if the index is in bounds
+    /// Helpful when paired with load_type, or any other API that returns 'Type'
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.runtime.loader().get_struct_type(index)
+    }
+
+    /// Gets the abilities for this type, at it's particular instantiation
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.runtime
+            .loader()
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Gets the remote resolver used by the data store
+    pub fn get_resolver(&self) -> &S {
+        self.data_cache.get_remote_resolver()
+    }
+
+    pub fn get_resolver_mut(&mut self) -> &mut S {
+        self.data_cache.get_remote_resolver_mut()
+    }
+
+    /// Gets the underlying data store
+    pub fn get_data_store(&mut self) -> &mut dyn DataStore {
+        &mut self.data_cache
+    }
+
+    /// Gets the underlying native extensions.
+    pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
+        &mut self.native_extensions
+    }
+}
+
+pub struct LoadedFunctionInstantiation {
+    pub parameters: Vec<Type>,
+    pub return_: Vec<Type>,
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/tracing.rs b/vendors/move/crates/move-vm-runtime/src/tracing.rs
new file mode 100644
index 000000000..b016879c9
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/tracing.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::debug::DebugContext;
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use ::{
+    move_binary_format::file_format::Bytecode,
+    move_vm_types::values::Locals,
+    once_cell::sync::Lazy,
+    std::{
+        env,
+        fs::{File, OpenOptions},
+        io::Write,
+        process,
+        sync::Mutex,
+        thread,
+    },
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_STEPPING_ENV_VAR_NAME: &str = "MOVE_VM_STEP";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static FILE_PATH: Lazy<String> = Lazy::new(|| {
+    env::var(MOVE_VM_TRACING_ENV_VAR_NAME).unwrap_or_else(|_| "move_vm_trace.trace".to_string())
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static TRACING_ENABLED: Lazy<bool> = Lazy::new(|| env::var(MOVE_VM_TRACING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUGGING_ENABLED: Lazy<bool> =
+    Lazy::new(|| env::var(MOVE_VM_STEPPING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
+    Mutex::new(
+        OpenOptions::new()
+            .write(true)
+            .create(true)
+            .append(true)
+            .open(&*FILE_PATH)
+            .unwrap(),
+    )
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUG_CONTEXT: Lazy<Mutex<DebugContext>> = Lazy::new(|| Mutex::new(DebugContext::new()));
+
+// Only include in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+pub(crate) fn trace(
+    function_desc: &Function,
+    locals: &Locals,
+    pc: u16,
+    instr: &Bytecode,
+    loader: &Loader,
+    interp: &Interpreter,
+) {
+    if *TRACING_ENABLED {
+        let f = &mut *LOGGING_FILE.lock().unwrap();
+        writeln!(
+            f,
+            "{}-{:?},{},{},{:?}",
+            process::id(),
+            thread::current().id(),
+            function_desc.pretty_string(),
+            pc,
+            instr,
+        )
+        .unwrap();
+    }
+    if *DEBUGGING_ENABLED {
+        DEBUG_CONTEXT
+            .lock()
+            .unwrap()
+            .debug_loop(function_desc, locals, pc, instr, loader, interp);
+    }
+}
+
+#[macro_export]
+macro_rules! trace {
+    ($function_desc:expr, $locals:expr, $pc:expr, $instr:tt, $resolver:expr, $interp:expr) => {
+        // Only include this code in debug releases
+        #[cfg(any(debug_assertions, feature = "debugging"))]
+        $crate::tracing::trace(
+            &$function_desc,
+            $locals,
+            $pc,
+            &$instr,
+            $resolver.loader(),
+            $interp,
+        )
+    };
+}
diff --git a/vendors/move/crates/move-vm-runtime/src/unit_tests/mod.rs b/vendors/move/crates/move-vm-runtime/src/unit_tests/mod.rs
new file mode 100644
index 000000000..d42522a38
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/unit_tests/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod vm_arguments_tests;
diff --git a/vendors/move/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs b/vendors/move/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs
new file mode 100644
index 000000000..72a1e68dd
--- /dev/null
+++ b/vendors/move/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs
@@ -0,0 +1,855 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+
+use crate::move_vm::MoveVM;
+use move_binary_format::{
+    errors::{VMError, VMResult},
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex, Bytecode, CodeUnit, CompiledModule,
+        CompiledScript, FieldDefinition, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+        IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
+        TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+    runtime_value::{serialize_values, MoveValue},
+    u256::U256,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+// make a script with a given signature for main.
+fn make_script(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+// make a script with an external function that has the same signature as
+// the main. That allows us to pass resources and make the verifier happy that
+// they are consumed.
+// Dependencies check happens after main signature check, so we should expect
+// a signature check error.
+fn make_script_with_non_linking_structs(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("one").unwrap(),
+            Identifier::new("two").unwrap(),
+            Identifier::new("three").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+fn make_module_with_function(
+    visibility: Visibility,
+    is_entry: bool,
+    parameters: Signature,
+    return_: Signature,
+    type_parameters: Vec<AbilitySet>,
+) -> (CompiledModule, Identifier) {
+    let function_name = Identifier::new("foo").unwrap();
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let return_idx = match signatures.iter().enumerate().find(|(_, s)| *s == &return_) {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(return_);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let module = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: parameters_idx,
+            return_: return_idx,
+            type_parameters,
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("M").unwrap(),
+            Identifier::new("X").unwrap(),
+            function_name.clone(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(1),
+                signature: TypeSignature(SignatureToken::Bool),
+            }]),
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility,
+            is_entry,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+            }),
+        }],
+    };
+    (module, function_name)
+}
+
+// make a script function with a given signature for main.
+fn make_script_function(signature: Signature) -> (CompiledModule, Identifier) {
+    make_module_with_function(
+        Visibility::Public,
+        true,
+        signature,
+        Signature(vec![]),
+        vec![],
+    )
+}
+
+struct RemoteStore {
+    modules: HashMap<ModuleId, Vec<u8>>,
+}
+
+impl RemoteStore {
+    fn new() -> Self {
+        Self {
+            modules: HashMap::new(),
+        }
+    }
+
+    fn add_module(&mut self, compiled_module: CompiledModule) {
+        let id = compiled_module.self_id();
+        let mut bytes = vec![];
+        compiled_module.serialize(&mut bytes).unwrap();
+        self.modules.insert(id, bytes);
+    }
+}
+
+impl LinkageResolver for RemoteStore {
+    type Error = VMError;
+}
+
+impl ModuleResolver for RemoteStore {
+    type Error = VMError;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(self.modules.get(module_id).cloned())
+    }
+}
+
+impl ResourceResolver for RemoteStore {
+    type Error = VMError;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(None)
+    }
+}
+
+fn combine_signers_and_args(
+    signers: Vec<AccountAddress>,
+    non_signer_args: Vec<Vec<u8>>,
+) -> Vec<Vec<u8>> {
+    signers
+        .into_iter()
+        .map(|s| MoveValue::Signer(s).simple_serialize().unwrap())
+        .chain(non_signer_args)
+        .collect()
+}
+
+fn call_script_with_args_ty_args_signers(
+    script: Vec<u8>,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session
+        .execute_script(
+            script,
+            ty_args,
+            combine_signers_and_args(signers, non_signer_args),
+            &mut UnmeteredGasMeter,
+        )
+        .map(|_| ())
+}
+
+fn call_script(script: Vec<u8>, args: Vec<Vec<u8>>) -> VMResult<()> {
+    call_script_with_args_ty_args_signers(script, args, vec![], vec![])
+}
+
+fn call_script_function_with_args_ty_args_signers(
+    module: CompiledModule,
+    function_name: Identifier,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let id = module.self_id();
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session.execute_function_bypass_visibility(
+        &id,
+        function_name.as_ident_str(),
+        ty_args,
+        combine_signers_and_args(signers, non_signer_args),
+        &mut UnmeteredGasMeter,
+    )?;
+    Ok(())
+}
+
+fn call_script_function(
+    module: CompiledModule,
+    function_name: Identifier,
+    args: Vec<Vec<u8>>,
+) -> VMResult<()> {
+    call_script_function_with_args_ty_args_signers(module, function_name, args, vec![], vec![])
+}
+
+// these signatures used to be bad, but there are no bad signatures for scripts at the VM
+fn deprecated_bad_signatures() -> Vec<Signature> {
+    vec![
+        // struct in signature
+        Signature(vec![SignatureToken::Struct(StructHandleIndex(0))]),
+        // struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Struct(StructHandleIndex(0)),
+            SignatureToken::U64,
+        ]),
+        // reference to struct in signature
+        Signature(vec![
+            SignatureToken::Address,
+            SignatureToken::MutableReference(Box::new(SignatureToken::Struct(StructHandleIndex(
+                0,
+            )))),
+        ]),
+        // vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+            SignatureToken::U64,
+        ]),
+        // vector of vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                SignatureToken::Struct(StructHandleIndex(0)),
+            )))),
+            SignatureToken::U64,
+        ]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+        ))]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U64,
+        ))]),
+        // `&Signer` in signature (not `Signer`)
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // vector of `Signer` in signature
+        Signature(vec![SignatureToken::Vector(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // `Signer` ref not first arg
+        Signature(vec![SignatureToken::Bool, SignatureToken::Signer]),
+    ]
+}
+
+fn good_signatures_and_arguments() -> Vec<(Signature, Vec<MoveValue>)> {
+    vec![
+        // U128 arg
+        (
+            Signature(vec![SignatureToken::U128]),
+            vec![MoveValue::U128(0)],
+        ),
+        // U8 arg
+        (Signature(vec![SignatureToken::U8]), vec![MoveValue::U8(0)]),
+        // U16 arg
+        (
+            Signature(vec![SignatureToken::U16]),
+            vec![MoveValue::U16(0)],
+        ),
+        // U32 arg
+        (
+            Signature(vec![SignatureToken::U32]),
+            vec![MoveValue::U32(0)],
+        ),
+        // U256 arg
+        (
+            Signature(vec![SignatureToken::U256]),
+            vec![MoveValue::U256(U256::zero())],
+        ),
+        // All constants
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(SignatureToken::Bool))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(true),
+            ])],
+        ),
+        // All constants
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+        ),
+        // vector<vector<address>>
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::Address,
+                )))),
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Vector(vec![
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                ]),
+            ],
+        ),
+        //
+        // Vector arguments
+        //
+        // empty vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // one elem vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Address(
+                AccountAddress::random(),
+            )])],
+        ),
+        // multiple elems vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+            ])],
+        ),
+        // empty vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // multiple element vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::vector_u8(vec![2, 3]),
+                MoveValue::vector_u8(vec![4, 5]),
+            ])],
+        ),
+    ]
+}
+
+fn mismatched_cases() -> Vec<(Signature, Vec<MoveValue>, StatusCode)> {
+    vec![
+        // Too few args
+        (
+            Signature(vec![SignatureToken::U64]),
+            vec![],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Too many args
+        (
+            Signature(vec![SignatureToken::Bool]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+            ],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Vec<bool> passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Bool(true)])],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u128 passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::U128(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u8 passed for vector<vector<u8>>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::U8(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+    ]
+}
+
+fn general_cases() -> Vec<(
+    Signature,
+    Vec<MoveValue>,
+    Vec<AccountAddress>,
+    Option<StatusCode>,
+)> {
+    vec![
+        // too few signers (0)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (1)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (3)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![
+                AccountAddress::random(),
+                AccountAddress::random(),
+                AccountAddress::random(),
+            ],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // correct number of signers (2)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random(), AccountAddress::random()],
+            None,
+        ),
+        // too many signers (1) in a script that expects 0 is no longer ok
+        (
+            Signature(vec![SignatureToken::U8]),
+            vec![MoveValue::U8(0)],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // signer
+        (
+            Signature(vec![
+                SignatureToken::Signer,
+                SignatureToken::Bool,
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+            vec![AccountAddress::random()],
+            None,
+        ),
+    ]
+}
+
+#[test]
+fn check_script() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let script = make_script_with_non_linking_structs(signature);
+        let status = call_script(script, serialize_values(&dummy_args))
+            .err()
+            .unwrap()
+            .major_status();
+        assert_eq!(status, StatusCode::LINKER_ERROR);
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let script = make_script(signature);
+        assert_eq!(
+            call_script_with_args_ty_args_signers(script, serialize_values(&args), vec![], signers)
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        );
+    }
+}
+
+#[test]
+fn check_script_function() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let (module, function_name) = make_script_function(signature);
+        let res = call_script_function(module, function_name, serialize_values(&dummy_args))
+            .err()
+            .unwrap();
+        // either the dummy arg matches so abort, or it fails to match
+        // but the important thing is that the signature was accepted
+        assert!(
+            res.major_status() == StatusCode::ABORTED
+                || res.major_status() == StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+        )
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function_with_args_ty_args_signers(
+                module,
+                function_name,
+                serialize_values(&args),
+                vec![],
+                signers
+            )
+            .err()
+            .unwrap()
+            .major_status(),
+            expected_status
+        );
+    }
+
+    //
+    // Non script visible
+    // DEPRECATED this check must now be done by the adapter
+    //
+    // public
+    let (module, function_name) = make_module_with_function(
+        Visibility::Public,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+    // private
+    let (module, function_name) = make_module_with_function(
+        Visibility::Private,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+}
+
+#[test]
+fn call_missing_item() {
+    let module = empty_module();
+    let id = &module.self_id();
+    let function_name = IdentStr::new("foo").unwrap();
+    // mising module
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(error.major_status(), StatusCode::LINKER_ERROR);
+    assert_eq!(error.status_type(), StatusType::Verification);
+    drop(session);
+
+    // missing function
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(
+        error.major_status(),
+        StatusCode::FUNCTION_RESOLUTION_FAILURE
+    );
+    assert_eq!(error.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/crates/move-vm-test-utils/Cargo.toml b/vendors/move/crates/move-vm-test-utils/Cargo.toml
new file mode 100644
index 000000000..9c7c953cb
--- /dev/null
+++ b/vendors/move/crates/move-vm-test-utils/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-vm-test-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move VM Test Utils"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.71"
+once_cell.workspace = true
+serde = { workspace = true, features = ["derive", "rc"] }
+
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-types.workspace = true
+move-vm-profiler.workspace = true
+
+[features]
+default = [ ]
+tiered-gas = []
diff --git a/vendors/move/crates/move-vm-test-utils/src/gas_schedule.rs b/vendors/move/crates/move-vm-test-utils/src/gas_schedule.rs
new file mode 100644
index 000000000..b1fd2359a
--- /dev/null
+++ b/vendors/move/crates/move-vm-test-utils/src/gas_schedule.rs
@@ -0,0 +1,867 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module lays out the basic abstract costing schedule for bytecode instructions.
+//!
+//! It is important to note that the cost schedule defined in this file does not track hashing
+//! operations or other native operations; the cost of each native operation will be returned by the
+//! native function itself.
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, ConstantPoolIndex, FieldHandleIndex, FieldInstantiationIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
+        StructDefInstantiationIndex, StructDefinitionIndex,
+    },
+    file_format_common::{instruction_key, Opcodes},
+};
+use move_core_types::{
+    gas_algebra::{
+        AbstractMemorySize, GasQuantity, InternalGas, InternalGasPerAbstractMemoryUnit,
+        InternalGasUnit, NumArgs, NumBytes, ToUnit, ToUnitFractional,
+    },
+    language_storage::ModuleId,
+    u256,
+    vm_status::StatusCode,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    gas::{GasMeter, SimpleInstruction},
+    views::{TypeView, ValueView},
+};
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    ops::{Add, Mul},
+    u64,
+};
+pub enum GasUnit {}
+
+pub type Gas = GasQuantity<GasUnit>;
+
+impl ToUnit<InternalGasUnit> for GasUnit {
+    const MULTIPLIER: u64 = 1000;
+}
+
+impl ToUnitFractional<GasUnit> for InternalGasUnit {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1000;
+}
+
+/// The size in bytes for a non-string or address constant on the stack
+pub const CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub const REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub const STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+/// For exists checks on data that doesn't exists this is the multiplier that is used.
+pub const MIN_EXISTS_DATA_SIZE: AbstractMemorySize = AbstractMemorySize::new(100);
+
+/// The cost tables, keyed by the serialized form of the bytecode instruction.  We use the
+/// serialized form as opposed to the instruction enum itself as the key since this will be the
+/// on-chain representation of bytecode instructions in the future.
+#[derive(Clone, Debug, Serialize, PartialEq, Eq, Deserialize)]
+pub struct CostTable {
+    pub instruction_table: Vec<GasCost>,
+}
+
+impl CostTable {
+    #[inline]
+    pub fn instruction_cost(&self, instr_index: u8) -> &GasCost {
+        debug_assert!(instr_index > 0 && instr_index <= (self.instruction_table.len() as u8));
+        &self.instruction_table[(instr_index - 1) as usize]
+    }
+}
+
+/// The  `GasCost` tracks:
+/// - instruction cost: how much time/computational power is needed to perform the instruction
+/// - memory cost: how much memory is required for the instruction, and storage overhead
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct GasCost {
+    pub instruction_gas: u64,
+    pub memory_gas: u64,
+}
+
+impl GasCost {
+    pub fn new(instruction_gas: u64, memory_gas: u64) -> Self {
+        Self {
+            instruction_gas,
+            memory_gas,
+        }
+    }
+
+    /// Convert a GasCost to a total gas charge in `InternalGas`.
+    #[inline]
+    pub fn total(&self) -> u64 {
+        self.instruction_gas.add(self.memory_gas)
+    }
+}
+
+static ZERO_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(zero_cost_schedule);
+
+/// The Move VM implementation of state for gas metering.
+///
+/// Initialize with a `CostTable` and the gas provided to the transaction.
+/// Provide all the proper guarantees about gas metering in the Move VM.
+///
+/// Every client must use an instance of this type to interact with the Move VM.
+pub struct GasStatus<'a> {
+    cost_table: &'a CostTable,
+    gas_left: InternalGas,
+    charge: bool,
+    #[cfg(debug_assertions)]
+    profiler: Option<GasProfiler>,
+}
+
+impl<'a> GasStatus<'a> {
+    /// Initialize the gas state with metering enabled.
+    ///
+    /// Charge for every operation and fail when there is no more gas to pay for operations.
+    /// This is the instantiation that must be used when executing a user script.
+    pub fn new(cost_table: &'a CostTable, gas_left: Gas) -> Self {
+        Self {
+            gas_left: gas_left.to_unit(),
+            cost_table,
+            charge: true,
+            #[cfg(debug_assertions)]
+            profiler: None,
+        }
+    }
+
+    /// Initialize the gas state with metering disabled.
+    ///
+    /// It should be used by clients in very specific cases and when executing system
+    /// code that does not have to charge the user.
+    pub fn new_unmetered() -> Self {
+        Self {
+            gas_left: InternalGas::new(0),
+            cost_table: &ZERO_COST_SCHEDULE,
+            charge: false,
+            #[cfg(debug_assertions)]
+            profiler: None,
+        }
+    }
+
+    /// Return the `CostTable` behind this `GasStatus`.
+    pub fn cost_table(&self) -> &CostTable {
+        self.cost_table
+    }
+
+    /// Return the gas left.
+    pub fn remaining_gas(&self) -> Gas {
+        self.gas_left.to_unit_round_down()
+    }
+
+    /// Charge a given amount of gas and fail if not enough gas units are left.
+    pub fn deduct_gas(&mut self, amount: InternalGas) -> PartialVMResult<()> {
+        if !self.charge {
+            return Ok(());
+        }
+
+        match self.gas_left.checked_sub(amount) {
+            Some(gas_left) => {
+                self.gas_left = gas_left;
+                Ok(())
+            }
+            None => {
+                self.gas_left = InternalGas::new(0);
+                Err(PartialVMError::new(StatusCode::OUT_OF_GAS))
+            }
+        }
+    }
+
+    fn charge_instr(&mut self, opcode: Opcodes) -> PartialVMResult<()> {
+        self.deduct_gas(
+            self.cost_table
+                .instruction_cost(opcode as u8)
+                .total()
+                .into(),
+        )
+    }
+
+    /// Charge an instruction over data with a given size and fail if not enough gas units are left.
+    fn charge_instr_with_size(
+        &mut self,
+        opcode: Opcodes,
+        size: AbstractMemorySize,
+    ) -> PartialVMResult<()> {
+        // Make sure that the size is always non-zero
+        let size = std::cmp::max(1.into(), size);
+        debug_assert!(size > 0.into());
+        self.deduct_gas(
+            InternalGasPerAbstractMemoryUnit::new(
+                self.cost_table.instruction_cost(opcode as u8).total(),
+            )
+            .mul(size),
+        )
+    }
+
+    pub fn set_metering(&mut self, enabled: bool) {
+        self.charge = enabled
+    }
+}
+
+fn get_simple_instruction_opcode(instr: SimpleInstruction) -> Opcodes {
+    use Opcodes::*;
+    use SimpleInstruction::*;
+
+    match instr {
+        Nop => NOP,
+        Ret => RET,
+
+        BrTrue => BR_TRUE,
+        BrFalse => BR_FALSE,
+        Branch => BRANCH,
+
+        LdU8 => LD_U8,
+        LdU64 => LD_U64,
+        LdU128 => LD_U128,
+        LdTrue => LD_TRUE,
+        LdFalse => LD_FALSE,
+
+        FreezeRef => FREEZE_REF,
+        MutBorrowLoc => MUT_BORROW_LOC,
+        ImmBorrowLoc => IMM_BORROW_LOC,
+        ImmBorrowField => IMM_BORROW_FIELD,
+        MutBorrowField => MUT_BORROW_FIELD,
+        ImmBorrowFieldGeneric => IMM_BORROW_FIELD_GENERIC,
+        MutBorrowFieldGeneric => MUT_BORROW_FIELD_GENERIC,
+
+        CastU8 => CAST_U8,
+        CastU64 => CAST_U64,
+        CastU128 => CAST_U128,
+
+        Add => ADD,
+        Sub => SUB,
+        Mul => MUL,
+        Mod => MOD,
+        Div => DIV,
+
+        BitOr => BIT_OR,
+        BitAnd => BIT_AND,
+        Xor => XOR,
+        Shl => SHL,
+        Shr => SHR,
+
+        Or => OR,
+        And => AND,
+        Not => NOT,
+
+        Lt => LT,
+        Gt => GT,
+        Le => LE,
+        Ge => GE,
+
+        Abort => ABORT,
+        LdU16 => LD_U16,
+        LdU32 => LD_U32,
+        LdU256 => LD_U256,
+        CastU16 => CAST_U16,
+        CastU32 => CAST_U32,
+        CastU256 => CAST_U256,
+    }
+}
+
+impl<'b> GasMeter for GasStatus<'b> {
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()> {
+        self.charge_instr(get_simple_instruction_opcode(instr))
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::POP)
+    }
+
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        self.deduct_gas(amount)
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::CALL, (args.len() as u64 + 1).into())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::CALL_GENERIC,
+            ((ty_args.len() + args.len() + 1) as u64).into(),
+        )
+    }
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::LD_CONST, u64::from(size).into())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::COPY_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::MOVE_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::ST_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::PACK_GENERIC
+            } else {
+                Opcodes::PACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::UNPACK_GENERIC
+            } else {
+                Opcodes::UNPACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_read_ref(&mut self, ref_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::READ_REF, ref_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::WRITE_REF, new_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::EQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::NEQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        _ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if is_success {
+            let op = match (is_mut, is_generic) {
+                (false, false) => IMM_BORROW_GLOBAL,
+                (false, true) => IMM_BORROW_GLOBAL_GENERIC,
+                (true, false) => MUT_BORROW_GLOBAL,
+                (true, true) => MUT_BORROW_GLOBAL_GENERIC,
+            };
+
+            self.charge_instr_with_size(op, REFERENCE_SIZE)?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { EXISTS_GENERIC } else { EXISTS };
+        self.charge_instr_with_size(
+            op,
+            if exists {
+                REFERENCE_SIZE
+            } else {
+                MIN_EXISTS_DATA_SIZE
+            },
+        )
+    }
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if let Some(val) = val {
+            let op = if is_generic {
+                MOVE_FROM_GENERIC
+            } else {
+                MOVE_FROM
+            };
+
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { MOVE_TO_GENERIC } else { MOVE_TO };
+
+        if is_success {
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PACK, (args.len() as u64).into())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_LEN)
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        self.charge_instr(if is_mut {
+            VEC_MUT_BORROW
+        } else {
+            VEC_IMM_BORROW
+        })
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PUSH_BACK, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_POP_BACK)
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::VEC_PUSH_BACK,
+            u64::from(expect_num_elements).into(),
+        )
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_SWAP)
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    /// Returns the gas left
+    fn remaining_gas(&self) -> InternalGas {
+        self.gas_left
+    }
+
+    #[cfg(debug_assertions)]
+    fn get_profiler_mut(&mut self) -> Option<&mut GasProfiler> {
+        self.profiler.as_mut()
+    }
+
+    #[cfg(debug_assertions)]
+    fn set_profiler(&mut self, profiler: GasProfiler) {
+        self.profiler = Some(profiler);
+    }
+}
+
+pub fn new_from_instructions(mut instrs: Vec<(Bytecode, GasCost)>) -> CostTable {
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    if cfg!(debug_assertions) {
+        let mut instructions_covered = 0;
+        for (index, (instr, _)) in instrs.iter().enumerate() {
+            let key = instruction_key(instr);
+            if index == (key - 1) as usize {
+                instructions_covered += 1;
+            }
+        }
+        debug_assert!(
+            instructions_covered == Bytecode::VARIANT_COUNT,
+            "all instructions must be in the cost table"
+        );
+    }
+    let instruction_table = instrs
+        .into_iter()
+        .map(|(_, cost)| cost)
+        .collect::<Vec<GasCost>>();
+    CostTable { instruction_table }
+}
+
+pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (MoveFrom(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BrTrue(0), GasCost::new(0, 0)),
+        (WriteRef, GasCost::new(0, 0)),
+        (Mul, GasCost::new(0, 0)),
+        (MoveLoc(0), GasCost::new(0, 0)),
+        (And, GasCost::new(0, 0)),
+        (Pop, GasCost::new(0, 0)),
+        (BitAnd, GasCost::new(0, 0)),
+        (ReadRef, GasCost::new(0, 0)),
+        (Sub, GasCost::new(0, 0)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Add, GasCost::new(0, 0)),
+        (CopyLoc(0), GasCost::new(0, 0)),
+        (StLoc(0), GasCost::new(0, 0)),
+        (Ret, GasCost::new(0, 0)),
+        (Lt, GasCost::new(0, 0)),
+        (LdU8(0), GasCost::new(0, 0)),
+        (LdU64(0), GasCost::new(0, 0)),
+        (LdU128(0), GasCost::new(0, 0)),
+        (CastU8, GasCost::new(0, 0)),
+        (CastU64, GasCost::new(0, 0)),
+        (CastU128, GasCost::new(0, 0)),
+        (Abort, GasCost::new(0, 0)),
+        (MutBorrowLoc(0), GasCost::new(0, 0)),
+        (ImmBorrowLoc(0), GasCost::new(0, 0)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(0, 0)),
+        (Ge, GasCost::new(0, 0)),
+        (Xor, GasCost::new(0, 0)),
+        (Shl, GasCost::new(0, 0)),
+        (Shr, GasCost::new(0, 0)),
+        (Neq, GasCost::new(0, 0)),
+        (Not, GasCost::new(0, 0)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Le, GasCost::new(0, 0)),
+        (Branch(0), GasCost::new(0, 0)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Or, GasCost::new(0, 0)),
+        (LdFalse, GasCost::new(0, 0)),
+        (LdTrue, GasCost::new(0, 0)),
+        (Mod, GasCost::new(0, 0)),
+        (BrFalse(0), GasCost::new(0, 0)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BitOr, GasCost::new(0, 0)),
+        (FreezeRef, GasCost::new(0, 0)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Div, GasCost::new(0, 0)),
+        (Eq, GasCost::new(0, 0)),
+        (Gt, GasCost::new(0, 0)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Nop, GasCost::new(0, 0)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (LdU16(0), GasCost::new(0, 0)),
+        (LdU32(0), GasCost::new(0, 0)),
+        (LdU256(u256::U256::zero()), GasCost::new(0, 0)),
+        (CastU16, GasCost::new(0, 0)),
+        (CastU32, GasCost::new(0, 0)),
+        (CastU256, GasCost::new(0, 0)),
+    ]
+}
+
+// Only used for genesis and for tests where we need a cost table and
+// don't have a genesis storage state.
+pub fn zero_cost_schedule() -> CostTable {
+    // The actual costs for the instructions in this table _DO NOT MATTER_. This is only used
+    // for genesis and testing, and for these cases we don't need to worry
+    // about the actual gas for instructions.  The only thing we care about is having an entry
+    // in the gas schedule for each instruction.
+    let instrs = zero_cost_instruction_table();
+    new_from_instructions(instrs)
+}
+
+pub fn unit_cost_schedule() -> CostTable {
+    new_from_instructions(
+        zero_cost_instruction_table()
+            .into_iter()
+            .map(|(bytecode, _)| (bytecode, GasCost::new(1, 1)))
+            .collect(),
+    )
+}
+
+pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(13, 1)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(27, 1),
+        ),
+        (
+            MoveFrom(StructDefinitionIndex::new(0)),
+            GasCost::new(459, 1),
+        ),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(13, 1),
+        ),
+        (BrTrue(0), GasCost::new(1, 1)),
+        (WriteRef, GasCost::new(1, 1)),
+        (Mul, GasCost::new(1, 1)),
+        (MoveLoc(0), GasCost::new(1, 1)),
+        (And, GasCost::new(1, 1)),
+        (Pop, GasCost::new(1, 1)),
+        (BitAnd, GasCost::new(2, 1)),
+        (ReadRef, GasCost::new(1, 1)),
+        (Sub, GasCost::new(1, 1)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (Add, GasCost::new(1, 1)),
+        (CopyLoc(0), GasCost::new(1, 1)),
+        (StLoc(0), GasCost::new(1, 1)),
+        (Ret, GasCost::new(638, 1)),
+        (Lt, GasCost::new(1, 1)),
+        (LdU8(0), GasCost::new(1, 1)),
+        (LdU64(0), GasCost::new(1, 1)),
+        (LdU128(0), GasCost::new(1, 1)),
+        (CastU8, GasCost::new(2, 1)),
+        (CastU64, GasCost::new(1, 1)),
+        (CastU128, GasCost::new(1, 1)),
+        (Abort, GasCost::new(1, 1)),
+        (MutBorrowLoc(0), GasCost::new(2, 1)),
+        (ImmBorrowLoc(0), GasCost::new(1, 1)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(1, 1)),
+        (Ge, GasCost::new(1, 1)),
+        (Xor, GasCost::new(1, 1)),
+        (Shl, GasCost::new(2, 1)),
+        (Shr, GasCost::new(1, 1)),
+        (Neq, GasCost::new(1, 1)),
+        (Not, GasCost::new(1, 1)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(1132, 1)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(582, 1),
+        ),
+        (Le, GasCost::new(2, 1)),
+        (Branch(0), GasCost::new(1, 1)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Or, GasCost::new(2, 1)),
+        (LdFalse, GasCost::new(1, 1)),
+        (LdTrue, GasCost::new(1, 1)),
+        (Mod, GasCost::new(1, 1)),
+        (BrFalse(0), GasCost::new(1, 1)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(41, 1)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(34, 1),
+        ),
+        (BitOr, GasCost::new(2, 1)),
+        (FreezeRef, GasCost::new(1, 1)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(21, 1),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(15, 1),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(23, 1),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(14, 1),
+        ),
+        (Div, GasCost::new(3, 1)),
+        (Eq, GasCost::new(1, 1)),
+        (Gt, GasCost::new(1, 1)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Nop, GasCost::new(1, 1)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(84, 1)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(98, 1)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(1334, 1)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(1902, 1)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(53, 1)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(227, 1)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(572, 1)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(1436, 1)),
+        (LdU16(0), GasCost::new(1, 1)),
+        (LdU32(0), GasCost::new(1, 1)),
+        (LdU256(u256::U256::zero()), GasCost::new(1, 1)),
+        (CastU16, GasCost::new(2, 1)),
+        (CastU32, GasCost::new(2, 1)),
+        (CastU256, GasCost::new(2, 1)),
+    ]
+}
+
+pub static INITIAL_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(|| {
+    let mut instrs = bytecode_instruction_costs();
+    // Note that the DiemVM is expecting the table sorted by instruction order.
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    new_from_instructions(instrs)
+});
diff --git a/vendors/move/crates/move-vm-test-utils/src/lib.rs b/vendors/move/crates/move-vm-test-utils/src/lib.rs
new file mode 100644
index 000000000..06c91c0f3
--- /dev/null
+++ b/vendors/move/crates/move-vm-test-utils/src/lib.rs
@@ -0,0 +1,18 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(clippy::new_without_default)]
+
+mod storage;
+
+#[cfg(not(feature = "tiered-gas"))]
+pub mod gas_schedule;
+
+#[cfg(feature = "tiered-gas")]
+pub mod tiered_gas_schedule;
+
+#[cfg(feature = "tiered-gas")]
+pub use tiered_gas_schedule as gas_schedule;
+
+pub use storage::{BlankStorage, DeltaStorage, InMemoryStorage};
diff --git a/vendors/move/crates/move-vm-test-utils/src/storage.rs b/vendors/move/crates/move-vm-test-utils/src/storage.rs
new file mode 100644
index 000000000..caa8baef8
--- /dev/null
+++ b/vendors/move/crates/move-vm-test-utils/src/storage.rs
@@ -0,0 +1,241 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Op},
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag},
+    resolver::{LinkageResolver, ModuleResolver, MoveResolver, ResourceResolver},
+};
+use std::{
+    collections::{btree_map, BTreeMap},
+    fmt::Debug,
+};
+
+/// A dummy storage containing no modules or resources.
+#[derive(Debug, Clone)]
+pub struct BlankStorage;
+
+impl BlankStorage {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+impl LinkageResolver for BlankStorage {
+    type Error = ();
+}
+
+impl ModuleResolver for BlankStorage {
+    type Error = ();
+
+    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(None)
+    }
+}
+
+impl ResourceResolver for BlankStorage {
+    type Error = ();
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(None)
+    }
+}
+
+/// A storage adapter created by stacking a change set on top of an existing storage backend.
+/// This can be used for additional computations without modifying the base.
+#[derive(Debug, Clone)]
+pub struct DeltaStorage<'a, 'b, S> {
+    base: &'a S,
+    delta: &'b ChangeSet,
+}
+
+impl<'a, 'b, S: LinkageResolver> LinkageResolver for DeltaStorage<'a, 'b, S> {
+    type Error = S::Error;
+
+    fn link_context(&self) -> AccountAddress {
+        self.base.link_context()
+    }
+
+    fn relocate(&self, module_id: &ModuleId) -> std::result::Result<ModuleId, Self::Error> {
+        self.base.relocate(module_id)
+    }
+}
+
+impl<'a, 'b, S: ModuleResolver> ModuleResolver for DeltaStorage<'a, 'b, S> {
+    type Error = S::Error;
+
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        if let Some(account_storage) = self.delta.accounts().get(module_id.address()) {
+            if let Some(blob_opt) = account_storage.modules().get(module_id.name()) {
+                return Ok(blob_opt.clone().ok());
+            }
+        }
+
+        self.base.get_module(module_id)
+    }
+}
+
+impl<'a, 'b, S: ResourceResolver> ResourceResolver for DeltaStorage<'a, 'b, S> {
+    type Error = S::Error;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, S::Error> {
+        unreachable!()
+    }
+}
+
+impl<'a, 'b, S: MoveResolver> DeltaStorage<'a, 'b, S> {
+    pub fn new(base: &'a S, delta: &'b ChangeSet) -> Self {
+        Self { base, delta }
+    }
+}
+
+/// Simple in-memory storage for modules and resources under an account.
+#[derive(Debug, Clone)]
+struct InMemoryAccountStorage {
+    modules: BTreeMap<Identifier, Vec<u8>>,
+}
+
+/// Simple in-memory storage that can be used as a Move VM storage backend for testing purposes.
+#[derive(Debug, Clone)]
+pub struct InMemoryStorage {
+    accounts: BTreeMap<AccountAddress, InMemoryAccountStorage>,
+}
+
+fn apply_changes<K, V>(
+    map: &mut BTreeMap<K, V>,
+    changes: impl IntoIterator<Item = (K, Op<V>)>,
+) -> Result<()>
+where
+    K: Ord + Debug,
+{
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (k, op) in changes.into_iter() {
+        match (map.entry(k), op) {
+            (Occupied(entry), New(_)) => {
+                bail!(
+                    "Failed to apply changes -- key {:?} already exists",
+                    entry.key()
+                )
+            }
+            (Occupied(entry), Delete) => {
+                entry.remove();
+            }
+            (Occupied(entry), Modify(val)) => {
+                *entry.into_mut() = val;
+            }
+            (Vacant(entry), New(val)) => {
+                entry.insert(val);
+            }
+            (Vacant(entry), Delete | Modify(_)) => bail!(
+                "Failed to apply changes -- key {:?} does not exist",
+                entry.key()
+            ),
+        }
+    }
+    Ok(())
+}
+
+fn get_or_insert<K, V, F>(map: &mut BTreeMap<K, V>, key: K, make_val: F) -> &mut V
+where
+    K: Ord,
+    F: FnOnce() -> V,
+{
+    use btree_map::Entry::*;
+
+    match map.entry(key) {
+        Occupied(entry) => entry.into_mut(),
+        Vacant(entry) => entry.insert(make_val()),
+    }
+}
+
+impl InMemoryAccountStorage {
+    fn apply(&mut self, account_changeset: AccountChangeSet) -> Result<()> {
+        let (modules, _resources) = account_changeset.into_inner();
+        apply_changes(&mut self.modules, modules)?;
+        Ok(())
+    }
+
+    fn new() -> Self {
+        Self {
+            modules: BTreeMap::new(),
+        }
+    }
+}
+
+impl InMemoryStorage {
+    pub fn apply_extended(&mut self, changeset: ChangeSet) -> Result<()> {
+        for (addr, account_changeset) in changeset.into_inner() {
+            match self.accounts.entry(addr) {
+                btree_map::Entry::Occupied(entry) => {
+                    entry.into_mut().apply(account_changeset)?;
+                }
+                btree_map::Entry::Vacant(entry) => {
+                    let mut account_storage = InMemoryAccountStorage::new();
+                    account_storage.apply(account_changeset)?;
+                    entry.insert(account_storage);
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn apply(&mut self, changeset: ChangeSet) -> Result<()> {
+        self.apply_extended(changeset)
+    }
+
+    pub fn new() -> Self {
+        Self {
+            accounts: BTreeMap::new(),
+        }
+    }
+
+    pub fn publish_or_overwrite_module(&mut self, module_id: ModuleId, blob: Vec<u8>) {
+        let account = get_or_insert(&mut self.accounts, *module_id.address(), || {
+            InMemoryAccountStorage::new()
+        });
+        account.modules.insert(module_id.name().to_owned(), blob);
+    }
+}
+
+/// Use all default implementations for InMemoryStorage implementation of LinkageResolver
+impl LinkageResolver for InMemoryStorage {
+    type Error = ();
+}
+
+impl ModuleResolver for InMemoryStorage {
+    type Error = ();
+
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        if let Some(account_storage) = self.accounts.get(module_id.address()) {
+            return Ok(account_storage.modules.get(module_id.name()).cloned());
+        }
+        Ok(None)
+    }
+}
+
+impl ResourceResolver for InMemoryStorage {
+    type Error = ();
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        unreachable!()
+    }
+}
diff --git a/vendors/move/crates/move-vm-test-utils/src/tiered_gas_schedule.rs b/vendors/move/crates/move-vm-test-utils/src/tiered_gas_schedule.rs
new file mode 100644
index 000000000..68fef9873
--- /dev/null
+++ b/vendors/move/crates/move-vm-test-utils/src/tiered_gas_schedule.rs
@@ -0,0 +1,833 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module lays out the basic abstract costing schedule for bytecode instructions.
+//!
+//! It is important to note that the cost schedule defined in this file does not track hashing
+//! operations or other native operations; the cost of each native operation will be returned by the
+//! native function itself.
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::{
+    gas_algebra::{
+        AbstractMemorySize, GasQuantity, InternalGas, InternalGasUnit, NumArgs, NumBytes, ToUnit,
+        ToUnitFractional,
+    },
+    language_storage::ModuleId,
+    vm_status::StatusCode,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    gas::{GasMeter, SimpleInstruction},
+    loaded_data::runtime_types::Type,
+    views::{TypeView, ValueView},
+};
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::BTreeMap,
+    ops::{Add, Bound},
+    u64,
+};
+
+pub enum GasUnit {}
+
+pub type Gas = GasQuantity<GasUnit>;
+
+impl ToUnit<InternalGasUnit> for GasUnit {
+    const MULTIPLIER: u64 = 1000;
+}
+
+impl ToUnitFractional<GasUnit> for InternalGasUnit {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1000;
+}
+
+/// The size in bytes for a non-string or address constant on the stack
+pub const CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub const REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub const STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+/// The size of a vector (without its containing data) in bytes
+pub const VEC_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// For exists checks on data that doesn't exists this is the multiplier that is used.
+pub const MIN_EXISTS_DATA_SIZE: AbstractMemorySize = AbstractMemorySize::new(100);
+
+pub const INSTRUCTION_TIER_DEFAULT: u64 = 1;
+
+pub const STACK_HEIGHT_TIER_DEFAULT: u64 = 1;
+pub const STACK_SIZE_TIER_DEFAULT: u64 = 1;
+
+// The cost table holds the tiers and curves for instruction costs.
+#[derive(Clone, Debug, Serialize, PartialEq, Eq, Deserialize)]
+pub struct CostTable {
+    pub instruction_tiers: BTreeMap<u64, u64>,
+    pub stack_height_tiers: BTreeMap<u64, u64>,
+    pub stack_size_tiers: BTreeMap<u64, u64>,
+}
+
+impl CostTable {
+    fn get_current_and_future_tier(
+        tiers: &BTreeMap<u64, u64>,
+        current: u64,
+        default: u64,
+    ) -> (u64, Option<u64>) {
+        let current_cost = tiers
+            .get(&current)
+            .or_else(|| tiers.range(..current).next_back().map(|(_, v)| v))
+            .unwrap_or(&default);
+        let next_tier_start = tiers
+            .range::<u64, _>((Bound::Excluded(current), Bound::Unbounded))
+            .next()
+            .map(|(next_tier_start, _)| *next_tier_start);
+        (*current_cost, next_tier_start)
+    }
+
+    pub fn instruction_tier(&self, instr_count: u64) -> (u64, Option<u64>) {
+        Self::get_current_and_future_tier(
+            &self.instruction_tiers,
+            instr_count,
+            INSTRUCTION_TIER_DEFAULT,
+        )
+    }
+
+    pub fn stack_height_tier(&self, stack_height: u64) -> (u64, Option<u64>) {
+        Self::get_current_and_future_tier(
+            &self.stack_height_tiers,
+            stack_height,
+            STACK_HEIGHT_TIER_DEFAULT,
+        )
+    }
+
+    pub fn stack_size_tier(&self, stack_size: u64) -> (u64, Option<u64>) {
+        Self::get_current_and_future_tier(
+            &self.stack_size_tiers,
+            stack_size,
+            STACK_SIZE_TIER_DEFAULT,
+        )
+    }
+}
+
+/// The  `GasCost` tracks:
+/// - instruction cost: how much time/computational power is needed to perform the instruction
+/// - memory cost: how much memory is required for the instruction, and storage overhead
+/// - stack height: how high is the stack growing (regardless of size in bytes)
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct GasCost {
+    pub instruction_gas: u64,
+    pub memory_gas: u64,
+    pub stack_height_gas: u64,
+}
+
+impl GasCost {
+    pub fn new(instruction_gas: u64, memory_gas: u64, stack_height_gas: u64) -> Self {
+        Self {
+            instruction_gas,
+            memory_gas,
+            stack_height_gas,
+        }
+    }
+
+    /// Convert a GasCost to a total gas charge in `InternalGas`.
+    #[inline]
+    pub fn total(&self) -> u64 {
+        self.instruction_gas
+            .add(self.memory_gas)
+            .add(self.stack_height_gas)
+    }
+
+    #[inline]
+    pub fn total_internal(&self) -> InternalGas {
+        GasQuantity::new(
+            self.instruction_gas
+                .add(self.memory_gas)
+                .add(self.stack_height_gas),
+        )
+    }
+}
+
+/// The Move VM implementation of state for gas metering.
+///
+/// Initialize with a `CostTable` and the gas provided to the transaction.
+/// Provide all the proper guarantees about gas metering in the Move VM.
+///
+/// Every client must use an instance of this type to interact with the Move VM.
+pub struct GasStatus<'a> {
+    cost_table: &'a CostTable,
+    gas_left: InternalGas,
+    charge: bool,
+
+    // The current height of the operand stack, and the maximal height that it has reached.
+    stack_height_high_water_mark: u64,
+    stack_height_current: u64,
+    stack_height_next_tier_start: Option<u64>,
+    stack_height_current_tier_mult: u64,
+
+    // The current (abstract) size  of the operand stack and the maximal size that it has reached.
+    stack_size_high_water_mark: u64,
+    stack_size_current: u64,
+    stack_size_next_tier_start: Option<u64>,
+    stack_size_current_tier_mult: u64,
+
+    // The total number of bytecode instructions that have been executed in the transaction.
+    instructions_executed: u64,
+    instructions_next_tier_start: Option<u64>,
+    instructions_current_tier_mult: u64,
+
+    #[cfg(debug_assertions)]
+    profiler: Option<GasProfiler>,
+}
+
+impl<'a> GasStatus<'a> {
+    /// Initialize the gas state with metering enabled.
+    ///
+    /// Charge for every operation and fail when there is no more gas to pay for operations.
+    /// This is the instantiation that must be used when executing a user script.
+    pub fn new(cost_table: &'a CostTable, gas_left: Gas) -> Self {
+        let (stack_height_current_tier_mult, stack_height_next_tier_start) =
+            cost_table.stack_height_tier(0);
+        let (stack_size_current_tier_mult, stack_size_next_tier_start) =
+            cost_table.stack_size_tier(0);
+        let (instructions_current_tier_mult, instructions_next_tier_start) =
+            cost_table.instruction_tier(0);
+        Self {
+            gas_left: gas_left.to_unit(),
+            cost_table,
+            charge: true,
+            stack_height_high_water_mark: 0,
+            stack_height_current: 0,
+            stack_size_high_water_mark: 0,
+            stack_size_current: 0,
+            instructions_executed: 0,
+            stack_height_current_tier_mult,
+            stack_size_current_tier_mult,
+            instructions_current_tier_mult,
+            stack_height_next_tier_start,
+            stack_size_next_tier_start,
+            instructions_next_tier_start,
+            #[cfg(debug_assertions)]
+            profiler: None,
+        }
+    }
+
+    /// Initialize the gas state with metering disabled.
+    ///
+    /// It should be used by clients in very specific cases and when executing system
+    /// code that does not have to charge the user.
+    pub fn new_unmetered() -> Self {
+        Self {
+            gas_left: InternalGas::new(0),
+            cost_table: &ZERO_COST_SCHEDULE,
+            charge: false,
+            stack_height_high_water_mark: 0,
+            stack_height_current: 0,
+            stack_size_high_water_mark: 0,
+            stack_size_current: 0,
+            instructions_executed: 0,
+            stack_height_current_tier_mult: 0,
+            stack_size_current_tier_mult: 0,
+            instructions_current_tier_mult: 0,
+            stack_height_next_tier_start: None,
+            stack_size_next_tier_start: None,
+            instructions_next_tier_start: None,
+            #[cfg(debug_assertions)]
+            profiler: None,
+        }
+    }
+
+    pub fn push_stack(&mut self, pushes: u64) -> PartialVMResult<()> {
+        match self.stack_height_current.checked_add(pushes) {
+            // We should never hit this.
+            None => return Err(PartialVMError::new(StatusCode::ARITHMETIC_OVERFLOW)),
+            Some(new_height) => {
+                if new_height > self.stack_height_high_water_mark {
+                    self.stack_height_high_water_mark = new_height;
+                }
+                self.stack_height_current = new_height;
+            }
+        }
+
+        if let Some(stack_height_tier_next) = self.stack_height_next_tier_start {
+            if self.stack_height_current > stack_height_tier_next {
+                let (next_mul, next_tier) =
+                    self.cost_table.stack_height_tier(self.stack_height_current);
+                self.stack_height_current_tier_mult = next_mul;
+                self.stack_height_next_tier_start = next_tier;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn pop_stack(&mut self, pops: u64) {
+        self.stack_height_current = self.stack_height_current.saturating_sub(pops);
+    }
+
+    pub fn increase_instruction_count(&mut self, amount: u64) -> PartialVMResult<()> {
+        match self.instructions_executed.checked_add(amount) {
+            None => return Err(PartialVMError::new(StatusCode::PC_OVERFLOW)),
+            Some(new_pc) => {
+                self.instructions_executed = new_pc;
+            }
+        }
+
+        if let Some(instr_tier_next) = self.instructions_next_tier_start {
+            if self.instructions_executed > instr_tier_next {
+                let (instr_cost, next_tier) =
+                    self.cost_table.instruction_tier(self.instructions_executed);
+                self.instructions_current_tier_mult = instr_cost;
+                self.instructions_next_tier_start = next_tier;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn increase_stack_size(&mut self, size_amount: u64) -> PartialVMResult<()> {
+        match self.stack_size_current.checked_add(size_amount) {
+            None => return Err(PartialVMError::new(StatusCode::ARITHMETIC_OVERFLOW)),
+            Some(new_size) => {
+                if new_size > self.stack_size_high_water_mark {
+                    self.stack_size_high_water_mark = new_size;
+                }
+                self.stack_size_current = new_size;
+            }
+        }
+
+        if let Some(stack_size_tier_next) = self.stack_size_next_tier_start {
+            if self.stack_size_current > stack_size_tier_next {
+                let (next_mul, next_tier) =
+                    self.cost_table.stack_size_tier(self.stack_size_current);
+                self.stack_size_current_tier_mult = next_mul;
+                self.stack_size_next_tier_start = next_tier;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn decrease_stack_size(&mut self, size_amount: u64) {
+        let new_size = self.stack_size_current.saturating_sub(size_amount);
+        if new_size > self.stack_size_high_water_mark {
+            self.stack_size_high_water_mark = new_size;
+        }
+        self.stack_size_current = new_size;
+    }
+
+    /// Given: pushes + pops + increase + decrease in size for an instruction charge for the
+    /// execution of the instruction.
+    pub fn charge(
+        &mut self,
+        num_instructions: u64,
+        pushes: u64,
+        pops: u64,
+        incr_size: u64,
+        _decr_size: u64,
+    ) -> PartialVMResult<()> {
+        self.push_stack(pushes)?;
+        self.increase_instruction_count(num_instructions)?;
+        self.increase_stack_size(incr_size)?;
+
+        self.deduct_gas(
+            GasCost::new(
+                self.instructions_current_tier_mult
+                    .checked_mul(num_instructions)
+                    .ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_OVERFLOW))?,
+                self.stack_size_current_tier_mult
+                    .checked_mul(incr_size)
+                    .ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_OVERFLOW))?,
+                self.stack_height_current_tier_mult
+                    .checked_mul(pushes)
+                    .ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_OVERFLOW))?,
+            )
+            .total_internal(),
+        )?;
+
+        // self.decrease_stack_size(decr_size);
+        self.pop_stack(pops);
+        Ok(())
+    }
+
+    /// Return the `CostTable` behind this `GasStatus`.
+    pub fn cost_table(&self) -> &CostTable {
+        self.cost_table
+    }
+
+    /// Return the gas left.
+    pub fn remaining_gas(&self) -> Gas {
+        self.gas_left.to_unit_round_down()
+    }
+
+    /// Charge a given amount of gas and fail if not enough gas units are left.
+    pub fn deduct_gas(&mut self, amount: InternalGas) -> PartialVMResult<()> {
+        if !self.charge {
+            return Ok(());
+        }
+
+        match self.gas_left.checked_sub(amount) {
+            Some(gas_left) => {
+                self.gas_left = gas_left;
+                Ok(())
+            }
+            None => {
+                self.gas_left = InternalGas::new(0);
+                Err(PartialVMError::new(StatusCode::OUT_OF_GAS))
+            }
+        }
+    }
+
+    pub fn set_metering(&mut self, enabled: bool) {
+        self.charge = enabled
+    }
+}
+
+/// Returns a tuple of (<pops>, <pushes>, <stack_size_decrease>, <stack_size_increase>)
+fn get_simple_instruction_stack_change(
+    instr: SimpleInstruction,
+) -> (u64, u64, AbstractMemorySize, AbstractMemorySize) {
+    use SimpleInstruction::*;
+
+    match instr {
+        // NB: The `Ret` pops are accounted for in `Call` instructions, so we say `Ret` has no pops.
+        Nop | Ret => (0, 0, 0.into(), 0.into()),
+        BrTrue | BrFalse => (1, 0, Type::Bool.size(), 0.into()),
+        Branch => (0, 0, 0.into(), 0.into()),
+        LdU8 => (0, 1, 0.into(), Type::U8.size()),
+        LdU16 => (0, 1, 0.into(), Type::U16.size()),
+        LdU32 => (0, 1, 0.into(), Type::U32.size()),
+        LdU64 => (0, 1, 0.into(), Type::U64.size()),
+        LdU128 => (0, 1, 0.into(), Type::U128.size()),
+        LdU256 => (0, 1, 0.into(), Type::U256.size()),
+        LdTrue | LdFalse => (0, 1, 0.into(), Type::Bool.size()),
+        FreezeRef => (1, 1, REFERENCE_SIZE, REFERENCE_SIZE),
+        ImmBorrowLoc | MutBorrowLoc => (0, 1, 0.into(), REFERENCE_SIZE),
+        ImmBorrowField | MutBorrowField | ImmBorrowFieldGeneric | MutBorrowFieldGeneric => {
+            (1, 1, REFERENCE_SIZE, REFERENCE_SIZE)
+        }
+        // Since we don't have the size of the value being cast here we take a conservative
+        // over-approximation: it is _always_ getting cast from the smallest integer type.
+        CastU8 => (1, 1, Type::U8.size(), Type::U8.size()),
+        CastU16 => (1, 1, Type::U8.size(), Type::U16.size()),
+        CastU32 => (1, 1, Type::U8.size(), Type::U32.size()),
+        CastU64 => (1, 1, Type::U8.size(), Type::U64.size()),
+        CastU128 => (1, 1, Type::U8.size(), Type::U128.size()),
+        CastU256 => (1, 1, Type::U8.size(), Type::U256.size()),
+        // NB: We don't know the size of what integers we're dealing with, so we conservatively
+        // over-approximate by popping the smallest integers, and push the largest.
+        Add | Sub | Mul | Mod | Div => (2, 1, Type::U8.size() + Type::U8.size(), Type::U256.size()),
+        BitOr | BitAnd | Xor => (2, 1, Type::U8.size() + Type::U8.size(), Type::U256.size()),
+        Shl | Shr => (2, 1, Type::U8.size() + Type::U8.size(), Type::U256.size()),
+        Or | And => (
+            2,
+            1,
+            Type::Bool.size() + Type::Bool.size(),
+            Type::Bool.size(),
+        ),
+        Lt | Gt | Le | Ge => (2, 1, Type::U8.size() + Type::U8.size(), Type::Bool.size()),
+        Not => (1, 1, Type::Bool.size(), Type::Bool.size()),
+        Abort => (1, 0, Type::U64.size(), 0.into()),
+    }
+}
+
+impl<'b> GasMeter for GasStatus<'b> {
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()> {
+        let (pops, pushes, pop_size, push_size) = get_simple_instruction_stack_change(instr);
+        self.charge(1, pushes, pops, push_size.into(), pop_size.into())
+    }
+
+    fn charge_pop(&mut self, popped_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge(1, 0, 1, 0, popped_val.legacy_abstract_memory_size().into())
+    }
+
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        // Charge for the number of pushes on to the stack that the return of this function is
+        // going to cause.
+        let pushes = ret_vals
+            .as_ref()
+            .map(|ret_vals| ret_vals.len())
+            .unwrap_or(0) as u64;
+        // Calculate the number of bytes that are getting pushed onto the stack.
+        let size_increase = ret_vals
+            .map(|ret_vals| {
+                ret_vals.fold(AbstractMemorySize::zero(), |acc, elem| {
+                    acc + elem.legacy_abstract_memory_size()
+                })
+            })
+            .unwrap_or_else(AbstractMemorySize::zero);
+        // Charge for the stack operations. We don't count this as an "instruction" since we
+        // already accounted for the `Call` instruction in the
+        // `charge_native_function_before_execution` call.
+        self.charge(0, pushes, 0, size_increase.into(), 0)?;
+        // Now charge the gas that the native function told us to charge.
+        self.deduct_gas(amount)
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        // Determine the number of pops that are going to be needed for this function call, and
+        // charge for them.
+        let pops = args.len() as u64;
+        // Calculate the size decrease of the stack from the above pops.
+        let stack_reduction_size = args.fold(AbstractMemorySize::new(pops), |acc, elem| {
+            acc + elem.legacy_abstract_memory_size()
+        });
+        // Track that this is going to be popping from the operand stack. We also increment the
+        // instruction count as we need to account for the `Call` bytecode that initiated this
+        // native call.
+        self.charge(1, 0, pops, 0, stack_reduction_size.into())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        // We will have to perform this many pops for the call.
+        let pops = args.len() as u64;
+        // Size stays the same -- we're just moving it from the operand stack to the locals. But
+        // the size on the operand stack is reduced by sum_{args} arg.size().
+        let stack_reduction_size = args.fold(AbstractMemorySize::new(0), |acc, elem| {
+            acc + elem.legacy_abstract_memory_size()
+        });
+        self.charge(1, 0, pops, 0, stack_reduction_size.into())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        // We have to perform this many pops from the operand stack for this function call.
+        let pops = args.len() as u64;
+        // Calculate the size reduction on the operand stack.
+        let stack_reduction_size = args.fold(AbstractMemorySize::new(0), |acc, elem| {
+            acc + elem.legacy_abstract_memory_size()
+        });
+        // Charge for the pops, no pushes, and account for the stack size decrease. Also track the
+        // `CallGeneric` instruction we must have encountered for this.
+        self.charge(1, 0, pops, 0, stack_reduction_size.into())
+    }
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()> {
+        // Charge for the load from the locals onto the stack.
+        self.charge(1, 1, 0, u64::from(size), 0)
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        // We already charged for this based on the bytes that we're loading so don't charge again.
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        // Charge for the copy of the local onto the stack.
+        self.charge(1, 1, 0, val.legacy_abstract_memory_size().into(), 0)
+    }
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        // Charge for the move of the local on to the stack. Note that we charge here since we
+        // aren't tracking the local size (at least not yet). If we were, this should be a net-zero
+        // operation in terms of memory usage.
+        self.charge(1, 1, 0, val.legacy_abstract_memory_size().into(), 0)
+    }
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        // Charge for the storing of the value on the stack into a local. Note here that if we were
+        // also accounting for the size of the locals that this would be a net-zero operation in
+        // terms of memory.
+        self.charge(1, 0, 1, 0, val.legacy_abstract_memory_size().into())
+    }
+
+    fn charge_pack(
+        &mut self,
+        _is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        // We perform `num_fields` number of pops.
+        let num_fields = args.len() as u64;
+        // The actual amount of memory on the stack is staying the same with the addition of some
+        // extra size for the struct, so the size doesn't really change much.
+        self.charge(1, 1, num_fields, STRUCT_SIZE.into(), 0)
+    }
+
+    fn charge_unpack(
+        &mut self,
+        _is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        // We perform `num_fields` number of pushes.
+        let num_fields = args.len() as u64;
+        self.charge(1, num_fields, 1, 0, STRUCT_SIZE.into())
+    }
+
+    fn charge_read_ref(&mut self, ref_val: impl ValueView) -> PartialVMResult<()> {
+        // We read the the reference so we are decreasing the size of the stack by the size of the
+        // reference, and adding to it the size of the value that has been read from that
+        // reference.
+        self.charge(
+            1,
+            1,
+            1,
+            ref_val.legacy_abstract_memory_size().into(),
+            REFERENCE_SIZE.into(),
+        )
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        // TODO(tzakian): We should account for this elsewhere as the owner of data the the
+        // reference points to won't be on the stack. For now though, we treat it as adding to the
+        // stack size.
+        self.charge(
+            1,
+            1,
+            2,
+            new_val.legacy_abstract_memory_size().into(),
+            old_val.legacy_abstract_memory_size().into(),
+        )
+    }
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        let size_reduction = lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size();
+        self.charge(
+            1,
+            1,
+            2,
+            (Type::Bool.size() + size_reduction).into(),
+            size_reduction.into(),
+        )
+    }
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        let size_reduction = lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size();
+        self.charge(1, 1, 2, Type::Bool.size().into(), size_reduction.into())
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        // We don't have resource loading so don't need to account for it.
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        _is_mut: bool,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        self.charge(1, 1, 1, REFERENCE_SIZE.into(), Type::Address.size().into())
+    }
+
+    fn charge_exists(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        _exists: bool,
+    ) -> PartialVMResult<()> {
+        self.charge(
+            1,
+            1,
+            1,
+            Type::Bool.size().into(),
+            Type::Address.size().into(),
+        )
+    }
+
+    fn charge_move_from(
+        &mut self,
+        _is_generic: bool,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let size = val
+            .map(|val| val.legacy_abstract_memory_size())
+            .unwrap_or_else(|| ty.to_type_tag().abstract_size_for_gas_metering());
+        self.charge(1, 1, 1, size.into(), Type::Address.size().into())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        self.charge(1, 0, 2, 0, Type::Address.size().into())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        // We will perform `num_args` number of pops.
+        let num_args = args.len() as u64;
+        // The amount of data on the stack stays contstant except we have some extra metadata for
+        // the vector to hold the length of the vector.
+        self.charge(1, 1, num_args, VEC_SIZE.into(), 0)
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge(1, 1, 1, Type::U64.size().into(), REFERENCE_SIZE.into())
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        _is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        self.charge(
+            1,
+            1,
+            2,
+            REFERENCE_SIZE.into(),
+            (REFERENCE_SIZE + Type::U64.size()).into(),
+        )
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        // The value was already on the stack, so we aren't increasing the number of bytes on the stack.
+        self.charge(1, 0, 2, 0, REFERENCE_SIZE.into())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge(1, 1, 1, 0, REFERENCE_SIZE.into())
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        // Charge for the pushes
+        let pushes = u64::from(expect_num_elements);
+        // The stack size stays pretty much the same modulo the additional vector size
+        self.charge(1, pushes, 1, 0, VEC_SIZE.into())
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        let size_decrease = REFERENCE_SIZE + Type::U64.size() + Type::U64.size();
+        self.charge(1, 1, 1, 0, size_decrease.into())
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn remaining_gas(&self) -> InternalGas {
+        self.gas_left
+    }
+
+    #[cfg(debug_assertions)]
+    fn get_profiler_mut(&mut self) -> Option<&mut GasProfiler> {
+        self.profiler.as_mut()
+    }
+
+    #[cfg(debug_assertions)]
+    fn set_profiler(&mut self, profiler: GasProfiler) {
+        self.profiler = Some(profiler);
+    }
+}
+
+pub fn zero_cost_schedule() -> CostTable {
+    let mut zero_tier = BTreeMap::new();
+    zero_tier.insert(0, 0);
+    CostTable {
+        instruction_tiers: zero_tier.clone(),
+        stack_size_tiers: zero_tier.clone(),
+        stack_height_tiers: zero_tier,
+    }
+}
+
+pub fn unit_cost_schedule() -> CostTable {
+    let mut unit_tier = BTreeMap::new();
+    unit_tier.insert(0, 1);
+    CostTable {
+        instruction_tiers: unit_tier.clone(),
+        stack_size_tiers: unit_tier.clone(),
+        stack_height_tiers: unit_tier,
+    }
+}
+
+pub fn initial_cost_schedule() -> CostTable {
+    let instruction_tiers: BTreeMap<u64, u64> = vec![
+        (0, 1),
+        (1000, 2),
+        (2000, 4),
+        (2500, 16),
+        (3000, 256), // After this all instructions get charged this amount.
+    ]
+    .into_iter()
+    .collect();
+
+    let stack_height_tiers: BTreeMap<u64, u64> = vec![
+        (0, 1),
+        (200, 2),
+        (400, 4),
+        (800, 16),
+        (1200, 256), // After this all increases to the stack height get charged this amount.
+    ]
+    .into_iter()
+    .collect();
+
+    let stack_size_tiers: BTreeMap<u64, u64> = vec![
+        (0, 1),
+        (5000, 2),
+        (7000, 4),
+        (10000, 16),
+        (15000, 256), // After this all increases to the stack height get charged this amount.
+    ]
+    .into_iter()
+    .collect();
+
+    CostTable {
+        instruction_tiers,
+        stack_size_tiers,
+        stack_height_tiers,
+    }
+}
+
+static ZERO_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(zero_cost_schedule);
+
+pub static INITIAL_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(initial_cost_schedule);
diff --git a/vendors/move/crates/move-vm-transactional-tests/Cargo.toml b/vendors/move/crates/move-vm-transactional-tests/Cargo.toml
new file mode 100644
index 000000000..7acff73ec
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "move-vm-transactional-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable.workspace = true
+move-transactional-test-runner.workspace = true
+
+[[test]]
+name = "tests"
+harness = false
+
+[dependencies]
diff --git a/vendors/move/crates/move-vm-transactional-tests/src/lib.rs b/vendors/move/crates/move-vm-transactional-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.mvir
new file mode 100644
index 000000000..3bc4def5f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/get_txn_sender.mvir
@@ -0,0 +1,14 @@
+//# run --signers 0x1
+module 0x42.m {
+import 0x1.signer;
+
+entry foo(account: signer) {
+    let sender: address;
+    let addr: address;
+label b0:
+    sender = signer.address_of(&account);
+    addr = 0x1;
+    assert(copy(sender) == copy(addr), 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.mvir
new file mode 100644
index 000000000..f4ca49985
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/signer_runtime_dummy.mvir
@@ -0,0 +1,27 @@
+//# run --signers 0x1
+module 0x1.m {
+
+entry foo(s: signer) {
+label b0:
+    return;
+}
+
+}
+//# run --signers 0x1 --args 0
+module 0x2.m {
+
+entry foo(s: signer, u: u64) {
+label b0:
+    return;
+}
+
+}
+//# run --signers 0x1 --args 0 @0x1
+module 0x3.m {
+
+entry foo(s: signer, u: u64, b: address) {
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.mvir
new file mode 100644
index 000000000..85033dc4c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_borrow_and_modify.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    public new(): vector<u64> {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        return move(v);
+    }
+
+    public borrow_and_modify(v: &mut vector<u64>) {
+    label b0:
+        *vector.borrow_mut<u64>(move(v), 0) = 300;
+        return;
+    }
+
+    public verify_effects(v: &vector<u64>) {
+    label b0:
+        assert(*vector.borrow<u64>(move(v), 0) == 300, 1000);
+        return;
+    }
+}
+
+//# publish
+module 0x2.test {
+    import 0x1.M;
+    public test() {
+        let v: vector<u64>;
+    label b0:
+        v = M.new();
+        M.borrow_and_modify(&mut v);
+        M.verify_effects(& v);
+        return;
+    }
+}
+
+//# run 0x2::test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.mvir
new file mode 100644
index 000000000..55c59d417
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_pop.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    public new(): vector<u64> {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        return move(v);
+    }
+
+    public borrow_and_pop(v: &mut vector<u64>)  {
+    label b0:
+        assert(vector.pop_back<u64>(move(v)) == 200, 1000);
+        return;
+    }
+
+    public verify_effects(v: &vector<u64>) {
+    label b0:
+        assert(vector.length<u64>(move(v)) == 1, 1001);
+        return;
+    }
+}
+
+//# publish
+module 0x2.test {
+    import 0x1.M;
+    public test() {
+        let v: vector<u64>;
+    label b0:
+        v = M.new();
+        M.borrow_and_pop(&mut v);
+        M.verify_effects(&v);
+        return;
+    }
+}
+
+//# run 0x2::test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.mvir
new file mode 100644
index 000000000..de00433ef
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_push.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    public new(): vector<u64> {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        return move(v);
+    }
+
+    public borrow_and_push(v: &mut vector<u64>) {
+    label b0:
+        vector.push_back<u64>(move(v), 42);
+        return;
+    }
+
+    public verify_effects(v: &vector<u64>) {
+    label b0:
+        assert(vector.length<u64>(move(v)) == 1, 1000);
+        return;
+    }
+}
+
+//# publish
+module 0x2.test {
+    import 0x1.M;
+    public test() {
+        let v: vector<u64>;
+    label b0:
+        v = M.new();
+        M.borrow_and_push(&mut v);
+        M.verify_effects(&v);
+        return;
+    }
+}
+
+//# run 0x2::test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.mvir
new file mode 100644
index 000000000..2532ed559
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vec_swap.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    public new(): vector<u64> {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        return move(v);
+    }
+
+    public borrow_and_swap(v: &mut vector<u64>)  {
+    label b0:
+        vector.swap<u64>(move(v), 0, 1);
+        return;
+    }
+
+    public verify_effects(v: &vector<u64>) {
+    label b0:
+        assert(*vector.borrow<u64>(copy(v), 0) == 200, 1000);
+        assert(*vector.borrow<u64>(move(v), 1) == 100, 1001);
+        return;
+    }
+}
+
+//# publish
+module 0x2.test {
+    import 0x1.M;
+    public test() {
+        let v: vector<u64>;
+    label b0:
+        v = M.new();
+        M.borrow_and_swap(&mut v);
+        M.verify_effects(&v);
+        return;
+    }
+}
+
+//# run 0x2::test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.mvir
new file mode 100644
index 000000000..632f5fe3d
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_all_ok.mvir
@@ -0,0 +1,48 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: vector<u64>;
+    let v_imm: &vector<u64>;
+    let v_mut: &mut vector<u64>;
+    let v_len: u64;
+    let e_imm: &u64;
+    let e_mut: &mut u64;
+    let e_val: u64;
+label b0:
+    v = vec_pack_0<u64>();
+    v_imm = &v;
+    v_len = vec_len<u64>(copy(v_imm));
+    assert(move(v_len) == 0, 1);
+    _ = move(v_imm);
+
+    v_mut = &mut v;
+    vec_push_back<u64>(copy(v_mut), 0);
+    vec_push_back<u64>(copy(v_mut), 1);
+
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 2, 2);
+
+    e_imm = vec_imm_borrow<u64>(copy(v_mut), 0);
+    _ = move(e_imm);
+    e_mut = vec_mut_borrow<u64>(copy(v_mut), 1);
+    _ = move(e_mut);
+
+    vec_swap<u64>(copy(v_mut), 0, 1);
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 2, 3);
+
+    e_val = vec_pop_back<u64>(copy(v_mut));
+    assert(move(e_val) == 0, 4);
+    e_val = vec_pop_back<u64>(copy(v_mut));
+    assert(move(e_val) == 1, 5);
+
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 0, 6);
+    _ = move(v_mut);
+
+    vec_unpack_0<u64>(move(v));
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir
new file mode 100644
index 000000000..692081b64
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x1.M {
+
+    public new(): vector<u64> {
+        let v: vector<u64>;
+    label b0:
+        v = vec_pack_1<u64>(100);
+        vec_push_back<u64>(&mut v, 200);
+        return move(v);
+    }
+
+    public borrow_and_modify(v: &mut vector<u64>) {
+    label b0:
+        *vec_mut_borrow<u64>(move(v), 0) = 300;
+        return;
+    }
+
+    public verify_effects(v: &vector<u64>) {
+    label b0:
+        assert(*vec_imm_borrow<u64>(move(v), 0) == 300, 1000);
+        return;
+    }
+}
+
+//# publish
+module 0x2.test {
+    import 0x1.M;
+    public test() {
+        let v: vector<u64>;
+    label b0:
+        v = M.new();
+        M.borrow_and_modify(&mut v);
+        M.verify_effects(& v);
+        return;
+    }
+}
+
+//# run 0x2::test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.mvir
new file mode 100644
index 000000000..9e82c815f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_bound_ok.mvir
@@ -0,0 +1,81 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_imm_borrow<u64>(&v, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_imm_borrow<u64>(&v, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x4.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    vec_swap<u64>(&mut v, 0, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x6.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_swap<u64>(&mut v, 0, 0);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.mvir
new file mode 100644
index 000000000..578ea3dfe
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_len_ok.mvir
@@ -0,0 +1,39 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    assert(vec_len<u64>(&v) == 0, 0);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    assert(vec_len<u64>(&v) == 1, 1);
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    assert(vec_len<u64>(&v) == 2, 2);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.exp
new file mode 100644
index 000000000..f17c63f99
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-14:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 1 'run'. lines 15-28:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 2 'run'. lines 29-41:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir
new file mode 100644
index 000000000..8ee3e8c82
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir
@@ -0,0 +1,41 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_imm_borrow<u64>(&v, 1);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_mut_borrow<u64>(&mut v, 1);
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_swap<u64>(&mut v, 0, 1);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir
new file mode 100644
index 000000000..c22505d68
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir
@@ -0,0 +1,36 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v1: vector<u64>;
+    let v2: vector<u64>;
+    let e: u64;
+label b0:
+    v1 = vec_pack_1<u64>(42);
+    e = vec_unpack_1<u64>(move(v1));
+    v2 = vec_pack_1<u64>(move(e));
+    assert(*vec_imm_borrow<u64>(&v2, 0) == 42, 42);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v1: vector<u64>;
+    let v2: vector<u64>;
+    let e1: u64;
+    let e2: u64;
+label b0:
+    v1 = vec_pack_2<u64>(42, 43);
+    e1, e2 = vec_unpack_2<u64>(move(v1));
+    v2 = vec_pack_2<u64>(move(e1), move(e2));
+    assert(*vec_imm_borrow<u64>(&v2, 0) == 42, 42);
+    assert(*vec_imm_borrow<u64>(&v2, 1) == 43, 43);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.exp
new file mode 100644
index 000000000..667d21272
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-13:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 14-27:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.mvir
new file mode 100644
index 000000000..3f8598520
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_empty.mvir
@@ -0,0 +1,27 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.mvir
new file mode 100644
index 000000000..e3c5ef62f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_pop_ok.mvir
@@ -0,0 +1,27 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.exp
new file mode 100644
index 000000000..821e03cc7
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-13:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'run'. lines 14-26:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'run'. lines 27-40:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.mvir
new file mode 100644
index 000000000..ea0d0a56b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_less.mvir
@@ -0,0 +1,40 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_unpack_0<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_push_back<u64>(&mut v, 43);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.exp
new file mode 100644
index 000000000..07dcd8f34
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-13:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 14-26:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'run'. lines 27-40:
+Error: Function execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.mvir
new file mode 100644
index 000000000..1435bd8a8
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_more.mvir
@@ -0,0 +1,40 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir
new file mode 100644
index 000000000..a9112e3c8
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir
@@ -0,0 +1,55 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_push_back<u64>(&mut v, 43);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+}
+
+//# run
+module 0x4.m {
+
+entry foo() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    vec_unpack_0<u64>(move(v));
+
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.mvir
new file mode 100644
index 000000000..0ca2584aa
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/vector_ops_using_generics.mvir
@@ -0,0 +1,24 @@
+//# publish
+
+module 0x42.Tests {
+
+    public test<T: copy + drop>(x: T) {
+        let v: vector<T>;
+        label l0:
+        v = vec_pack_0<T>();
+        assert(vec_len<T>(&v) == 0, 42);
+        vec_push_back<T>(&mut v, copy(x));
+        vec_push_back<T>(&mut v, copy(x));
+        vec_swap<T>(&mut v, 0, 1);
+        _ = vec_imm_borrow<T>(&v, 0);
+        _ = vec_mut_borrow<T>(&mut v, 0);
+        _ = vec_pop_back<T>(&mut v);
+        _ = vec_pop_back<T>(&mut v);
+        vec_unpack_0<T>(move(v));
+        return;
+    }
+}
+
+//# run 0x42::Tests::test --type-args u64 --args 0
+
+//# run 0x42::Tests::test --type-args vector<u8> --args b"hello"
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.exp b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.mvir
new file mode 100644
index 000000000..c597aa756
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/builtins/verify_valid_bytearray.mvir
@@ -0,0 +1,12 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let byte_array: vector<u8>;
+label b0:
+    byte_array = h"deadbeefdeadbeef";
+    assert(move(byte_array) == h"deadbeefdeadbeef", 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.exp b/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.exp
new file mode 100644
index 000000000..72f0c3345
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-20:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(22),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.mvir
new file mode 100644
index 000000000..014f4d67c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/commands/abort_in_module.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.M {
+    public foo() {
+    label b0:
+        abort 22;
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+label b0:
+    // should abort and point to the module
+    M.foo();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.exp b/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.mvir
new file mode 100644
index 000000000..e54af5a5f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/commands/local_assigned_many_times.mvir
@@ -0,0 +1,38 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let x_ref: &u64;
+    let y_ref: &u64;
+label b0:
+    x = 5;
+    y = 2;
+
+    x_ref = &x;
+    y_ref = &y;
+    _ = move(y_ref);
+    _ = move(x_ref);
+
+    x_ref = &x;
+    y_ref = move(x_ref);
+
+    jump_if (true) b2;
+label b1:
+    _ = move(y_ref);
+    x_ref = &x;
+    y_ref = &y;
+    jump b3;
+label b2:
+    _ = move(y_ref);
+    x_ref = &y;
+    y_ref = &x;
+    jump b3;
+label b3:
+    assert(*move(x_ref) == 2, 42);
+    _ = move(y_ref);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.mvir
new file mode 100644
index 000000000..6728edaef
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_accumulator.mvir
@@ -0,0 +1,22 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    jump_if_false (copy(x) >= 5) while_b2;
+label while_b1:
+    jump while_cont;
+label while_b2:
+    x = move(x) + 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.mvir
new file mode 100644
index 000000000..aa53ff215
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_simple.mvir
@@ -0,0 +1,24 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    jump_if_false (copy(x) >= 5) while_b2;
+label while_b1:
+    jump while_cont;
+label while_b2:
+    x = move(x) + 1;
+    jump while;
+    assert(false, 9);
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 11);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir
new file mode 100644
index 000000000..a0bee117f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir
@@ -0,0 +1,27 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    y = 0;
+label loop:
+    jump_if (copy(x) < 10) loop_b1;
+label loop_b0:
+    jump loop_cont;
+label loop_b1:
+    x = move(x) + 1;
+    jump_if_false (copy(x) % 2 == 0) loop_b3;
+label loop_b2:
+    jump loop;
+label loop_b3:
+    y = move(y) + copy(x);
+    jump loop;
+label loop_cont:
+    assert(move(y) == 25, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.exp
new file mode 100644
index 000000000..af9888180
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 19-28:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.mvir
new file mode 100644
index 000000000..9d65194b5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/fields_packed_in_order.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x1.M {
+    struct T has drop {
+        b: u64,
+        a: u64
+    }
+    public error(code: u64): u64 {
+    label b0:
+        abort(move(code));
+        return 0;
+    }
+    public new(): Self.T {
+    label b0:
+        return T { b: Self.error(42), a: Self.error(100) };
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.M;
+entry foo() {
+  let m: M.T;
+label b0:
+  m = M.new();
+  return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.mvir
new file mode 100644
index 000000000..f99285824
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_1.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if_false (move(ret_if_val)) b2;
+label b1:
+    return;
+label b2:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.mvir
new file mode 100644
index 000000000..13a71e3d5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_10.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.mvir
new file mode 100644
index 000000000..13a71e3d5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_2.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.mvir
new file mode 100644
index 000000000..630452d37
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_3.mvir
@@ -0,0 +1,19 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    jump b3;
+label b2:
+    return;
+label b3:
+    assert(false, 43);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.mvir
new file mode 100644
index 000000000..94e00fd59
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_4.mvir
@@ -0,0 +1,20 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    jump_if (true) b4;
+label b3:
+    return;
+label b4:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.mvir
new file mode 100644
index 000000000..d8466e95c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_7.mvir
@@ -0,0 +1,20 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if_false (move(ret_if_val)) loop_cont;
+label loop:
+    jump_if (true) loop_b1;
+label loop_b0:
+    jump loop;
+label loop_b1:
+    return;
+label loop_cont:
+    assert(false, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.mvir
new file mode 100644
index 000000000..c8cf2e642
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/if_branch_diverges_9.mvir
@@ -0,0 +1,22 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let b: bool;
+label b0:
+    b = false;
+label loop:
+    jump_if_false (copy(b)) loop_b3;
+label loop_b0:
+    jump_if_false (copy(b)) loop_b2;
+label loop_b1:
+    jump loop;
+label loop_b2:
+    jump loop;
+label loop_b3:
+    jump loop_cont;
+label loop_cont:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.mvir
new file mode 100644
index 000000000..311bd94a6
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_nested_breaks.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label outer_loop:
+label inner_loop:
+    jump inner_loop_cont;
+    assert(false, 42);
+    jump inner_loop;
+label inner_loop_cont:
+    jump outer_loop_cont;
+    assert(false, 42);
+    jump outer_loop;
+label outer_loop_cont:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.mvir
new file mode 100644
index 000000000..20f915a77
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_return.mvir
@@ -0,0 +1,11 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label loop:
+    return;
+    assert(false, 42);
+    jump loop;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.mvir
new file mode 100644
index 000000000..13ec04053
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/loop_simple.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label loop:
+    x = move(x) + 1;
+    jump loop_cont;
+label loop_cont:
+    assert(move(x) == 1, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir
new file mode 100644
index 000000000..cd9253e1f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x1.Test {
+    public t(): u64 {
+        let x: u64;
+    label b0:
+        jump_if (true) b2;
+    label b1:
+        x = 0;
+        return copy(x);
+    label b2:
+        return 100;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = Test.t();
+    assert(copy(x) == 100, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir
new file mode 100644
index 000000000..5c14a949f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+label b2:
+    return;
+label b3:
+    assert(false, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir
new file mode 100644
index 000000000..98c2d0449
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir
@@ -0,0 +1,24 @@
+//# publish
+module 0x1.Test {
+    public t(): u64 {
+    label b0:
+        jump_if_false (true) b2;
+    label b1:
+        return 100;
+    label b2:
+        return 0;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = Test.t();
+    assert(copy(x) == 100, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.mvir
new file mode 100644
index 000000000..5f2a542f1
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_false.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (false) while_cont;
+label while_body:
+    x = 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.mvir
new file mode 100644
index 000000000..ccbe53418
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested.mvir
@@ -0,0 +1,29 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x = 0;
+    z = 0;
+label outer_while:
+    jump_if_false (copy(x) < 3) outer_while_cont;
+label outer_while_b0:
+    x = move(x) + 1;
+    y = 0;
+label inner_while:
+    jump_if_false (copy(y) < 7) inner_while_cont;
+label inner_while_b0:
+    y = move(y) + 1;
+    z = move(z) + 1;
+    jump inner_while;
+label inner_while_cont:
+    jump outer_while;
+label outer_while_cont:
+    assert(move(z) == 21, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.mvir
new file mode 100644
index 000000000..645289018
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_nested_return.mvir
@@ -0,0 +1,22 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label outer_while:
+    jump_if_false (true) outer_while_cont;
+label outer_while_b0:
+label inner_while:
+    jump_if_false (true) inner_while_cont;
+label inner_while_b0:
+    return;
+    assert(false, 2);
+    jump inner_while;
+label inner_while_cont:
+    assert(false, 3);
+    jump outer_while;
+label outer_while_cont:
+    assert(false, 4);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.mvir
new file mode 100644
index 000000000..00b6fea1f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_return.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    return;
+    assert(false, 42);
+    jump while;
+label while_cont:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.exp b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.mvir
new file mode 100644
index 000000000..0fa761a6d
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/control_flow/while_simple.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (copy(x) < 5) while_cont;
+label while_b0:
+    x = copy(x) + 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir
new file mode 100644
index 000000000..8ab5af8cd
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir
@@ -0,0 +1,19 @@
+//# run --args @0x1
+module 0x1.m {
+
+entry foo(s: signer) {
+label b0:
+    return;
+}
+
+}// DEPRECATED signers can now be passed in as addrs
+
+//# run --args @0x0 @0x2
+module 0x2.m {
+
+entry foo(s: signer, s2: signer) {
+label b0:
+    return;
+}
+
+}// DEPRECATED signers can now be passed in as addrs
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.move
new file mode 100644
index 000000000..b9e171764
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/all_possible_param_types.move
@@ -0,0 +1,5 @@
+//# run --args 10u8 10 10u64 10u128 true false @0x123 b"deadbeef" 340u16 3456789u32 1234567890123456789123456723456u256
+module 0x42::m {
+fun main(_a: u8, _b: u64, _c: u64, _d: u128, _e: bool, _f: bool, _g: address, _h: vector<u8>, _i: u16, _j: u32, _k: u256) {
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.exp
new file mode 100644
index 000000000..3282ed635
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 0 'run'. lines 2-2:
+return values: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+
+task 1 'run'. lines 4-4:
+return values: 00000000000000000000000000000000000000000000000000000000deadbeef
+
+task 2 'run'. lines 6-6:
+return values: { { [118, 101, 99, 116, 111, 114, 60, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 58, 58, 116, 121, 112, 101, 95, 110, 97, 109, 101, 58, 58, 84, 121, 112, 101, 78, 97, 109, 101, 62] } }
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.move
new file mode 100644
index 000000000..11de68abe
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/call_native.move
@@ -0,0 +1,6 @@
+
+//# run std::bcs::to_bytes --type-args u256 --args 0u256
+
+//# run std::signer::borrow_address --args @3735928559
+
+//# run std::type_name::get --type-args vector<std::type_name::TypeName>
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.move
new file mode 100644
index 000000000..ab0164d6c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_0.move
@@ -0,0 +1,5 @@
+//# run
+
+module 0x42::m {
+fun main() {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.exp
new file mode 100644
index 000000000..830e7165a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.move
new file mode 100644
index 000000000..6fb1cca06
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_args_got_1.move
@@ -0,0 +1,6 @@
+//# run --args 0
+// should fail, extra arg
+module 0x42::m {
+fun main() {
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp
new file mode 100644
index 000000000..e9104138c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move
new file mode 100644
index 000000000..00fb62db6
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move
@@ -0,0 +1,5 @@
+//# run --signers 0x1
+// DEPRECATED now will fail. signer args same as other args
+module 0x42::m {
+fun main() {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.exp
new file mode 100644
index 000000000..830e7165a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.move
new file mode 100644
index 000000000..c4e5ee26b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_0.move
@@ -0,0 +1,6 @@
+//# run
+// should fail, missing arg
+module 0x42::m {
+fun main(_x: u64) {
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.exp
new file mode 100644
index 000000000..e9104138c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.move
new file mode 100644
index 000000000..94f824a34
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_arg_got_2.move
@@ -0,0 +1,5 @@
+//# run --args 1 2
+// should faill, extra arg
+module 0x42::m {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move
new file mode 100644
index 000000000..16a86e5a0
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move
@@ -0,0 +1,5 @@
+//# run --signers 0x1
+
+module 0x42::m {
+fun main(_s: signer) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.exp
new file mode 100644
index 000000000..e9104138c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.move
new file mode 100644
index 000000000..c18abc94f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_args_got_3.move
@@ -0,0 +1,5 @@
+//# run --args 42 0x1 42
+// should fail, too many args
+module 0x42::m {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp
new file mode 100644
index 000000000..830e7165a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move
new file mode 100644
index 000000000..32c12bd69
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move
@@ -0,0 +1,6 @@
+//# run --signers 0x1
+// should fail, missing signer
+module 0x42::m {
+fun main(_s1: signer, _s2: signer) {
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp
new file mode 100644
index 000000000..e9104138c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move
new file mode 100644
index 000000000..93689f4a4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move
@@ -0,0 +1,5 @@
+//# run --args 0x1
+// should fail, missing arg
+module 0x42::m {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp
new file mode 100644
index 000000000..11bbbea0a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move
new file mode 100644
index 000000000..1d7302175
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move
@@ -0,0 +1,5 @@
+//# run --args 0x1 42
+// should fail, flipped arguments
+module 0x42::m {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move
new file mode 100644
index 000000000..3e65a691a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move
@@ -0,0 +1,5 @@
+//# run --args 42 @0x1
+
+module 0x42::m {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp
new file mode 100644
index 000000000..11bbbea0a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move
new file mode 100644
index 000000000..f530491b0
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move
@@ -0,0 +1,5 @@
+//# run --args 42 42
+// should fail for mismatched types
+module 0x42::m {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.exp
new file mode 100644
index 000000000..11bbbea0a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Function execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.move
new file mode 100644
index 000000000..045cd5632
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_address.move
@@ -0,0 +1,5 @@
+//# run --args @0x1
+// should fail with mismatched types
+module 0x42::m {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.move
new file mode 100644
index 000000000..f3372a35e
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_got_u64.move
@@ -0,0 +1,5 @@
+//# run --args 42
+
+module 0x42::m {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move
new file mode 100644
index 000000000..073f38378
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move
@@ -0,0 +1,4 @@
+//# run --args 3 5 @0x42
+module 0x42::m {
+fun main(_x: u64, _y: u64, _z: address) {}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.exp
new file mode 100644
index 000000000..5045f1700
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.exp
@@ -0,0 +1,49 @@
+processed 17 tasks
+
+task 1 'run'. lines 25-25:
+return values: 0
+
+task 2 'run'. lines 27-27:
+return values: 0
+
+task 3 'run'. lines 29-29:
+return values: [119, 97, 116]
+
+task 4 'run'. lines 31-31:
+return values: { 0 }
+
+task 5 'run'. lines 35-35:
+return values: [0]
+
+task 6 'run'. lines 37-37:
+return values: [0]
+
+task 7 'run'. lines 39-39:
+return values: [[119, 97, 116]]
+
+task 8 'run'. lines 41-41:
+return values: [{ 0 }]
+
+task 9 'run'. lines 45-45:
+return values: { 0 }
+
+task 10 'run'. lines 47-47:
+return values: { 0 }
+
+task 11 'run'. lines 49-49:
+return values: { [119, 97, 116] }
+
+task 12 'run'. lines 51-51:
+return values: { { 0 } }
+
+task 13 'run'. lines 55-55:
+return values: 0, 0
+
+task 14 'run'. lines 57-57:
+return values: false, 0
+
+task 15 'run'. lines 59-59:
+return values: { 0 }, [119, 97, 116]
+
+task 16 'run'. lines 61-61:
+return values: 0000000000000000000000000000000000000000000000000000000000000042, { 0 }
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.move
new file mode 100644
index 000000000..4952b9839
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/generic_return_values.move
@@ -0,0 +1,61 @@
+//# publish
+
+module 0x42::Test {
+
+    struct Cup<T> { value: T }
+
+    public fun t1<T>(x: T): T {
+        x
+    }
+
+    public fun t2<T>(x: T): vector<T> {
+        vector[x]
+    }
+
+    public fun t3<T>(x: T): Cup<T> {
+        Cup { value: x }
+    }
+
+    public fun t4<T,U>(x: T, y: U): (U, T) {
+        (y, x)
+    }
+
+}
+
+//# run 0x42::Test::t1 --type-args u64 --args 0
+
+//# run 0x42::Test::t1 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t1 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t1 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t2 --type-args u64 --args 0
+
+//# run 0x42::Test::t2 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t2 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t2 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t3 --type-args u64 --args 0
+
+//# run 0x42::Test::t3 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t3 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t3 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t4 --type-args u64 u8 --args 0 0u8
+
+//# run 0x42::Test::t4 --type-args u8 bool --args 0u8 false
+
+//# run 0x42::Test::t4 --type-args vector<u8> 0x42::Test::Cup<u64> --args b"wat" 0
+
+//# run 0x42::Test::t4 --type-args 0x42::Test::Cup<u64> address --args 0 @0x42
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir
new file mode 100644
index 000000000..a55e7a71e
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir
@@ -0,0 +1,28 @@
+//# publish
+
+// tests various mixed usage of signer in function arguments
+
+module 0x42.M {
+
+public main1(s1: signer, s2: &signer, s3: signer) {
+    label l0:
+    return;
+}
+
+public main2(s1: &signer, u: u64, s2: signer, f: bool, s3: &signer) {
+    label l0:
+    return;
+}
+
+public main3(u: u64, f: bool, a: address, s1: signer, s2: &signer) {
+    label l0:
+    return;
+}
+
+}
+
+//# run 0x42::M::main1 --args @0x1 @0x1 @0x1
+
+//# run 0x42::M::main2 --args @0x1 0 @0x1 false @0x1
+
+//# run 0x42::M::main3 --args 0 false @0x1 @0x2 @0x3
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir
new file mode 100644
index 000000000..a6cb00ffc
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir
@@ -0,0 +1,28 @@
+//# run --args @0x1 @0x1 @0x1
+module 0x1.m {
+// tests various mixed usage of signer in script arguments
+
+entry foo(s1: signer, s2: &signer, s3: signer) {
+    label l0:
+    return;
+}
+}
+
+//# run --args @0x1 0 @0x1 false @0x1
+module 0x2.m {
+
+entry foo(s1: &signer, u: u64, s2: signer, f: bool, s3: &signer) {
+    label l0:
+    return;
+}
+
+}
+//# run --args 0 false @0x1 @0x2 @0x3
+module 0x3.m {
+
+entry foo(u: u64, f: bool, a: address, s1: signer, s2: &signer) {
+    label l0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp
new file mode 100644
index 000000000..273163544
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp
@@ -0,0 +1,7 @@
+processed 3 tasks
+
+task 1 'run'. lines 28-42:
+mutable inputs after call: local#0: 112, local#1: { 224 }, local#2: [120, 0, 122]
+
+task 2 'run'. lines 44-44:
+mutable inputs after call: local#0: 112, local#1: { 224 }, local#2: [120, 0, 122]
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir
new file mode 100644
index 000000000..7fb30e4fa
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir
@@ -0,0 +1,44 @@
+//# publish
+
+// the VM will provide the values for mutable inputs after the function returns
+// modifications should be observable
+
+module 0x42.M {
+    struct S { f: u64 }
+
+    public set_f(s: &mut Self.S, f: u64) {
+        label l0:
+        *(&mut move(s).S::f) = move(f);
+        return;
+    }
+
+    public t(
+        u: &mut u64,
+        s: &mut Self.S,
+        v: &mut vector<u8>,
+    ) {
+        label l0:
+        *move(u) = 112;
+        *(&mut move(s).S::f) = 224;
+        *(vec_mut_borrow<u8>(move(v), 1)) = 0u8;
+        return;
+    }
+}
+
+//# run --args 0 1 b"xyz"
+module 0x1.m {
+import 0x42.M;
+entry foo(
+    u: &mut u64,
+    s: &mut M.S,
+    v: &mut vector<u8>,
+) {
+    label l0:
+    *move(u) = 112;
+    M.set_f(move(s), 224);
+    *(vec_mut_borrow<u8>(move(v), 1)) = 0u8;
+    return;
+}
+}
+
+//# run 0x42::M::t --args 0 1 b"xyz"
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.exp
new file mode 100644
index 000000000..bf0c49a61
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.exp
@@ -0,0 +1,19 @@
+processed 9 tasks
+
+task 2 'run'. lines 38-46:
+mutable inputs after call: local#0: false
+
+task 3 'run'. lines 47-54:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 4 'run'. lines 56-64:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 6 'run'. lines 67-67:
+mutable inputs after call: local#0: false
+
+task 7 'run'. lines 69-69:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 8 'run'. lines 71-71:
+mutable inputs after call: local#1: false, local#3: { 0 }
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.mvir
new file mode 100644
index 000000000..80d481d2b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/ref_inputs.mvir
@@ -0,0 +1,71 @@
+//# publish
+
+// ref arguments are now allowed
+
+module 0x42.M {
+    struct S has drop { f: u64 }
+
+    public t1(r1: &u64) {
+        label l0:
+        return;
+    }
+
+    public t2(r1: &mut bool) {
+        label l0:
+        return;
+    }
+
+    public t3(r1: &u64, r2: &mut bool, r3: &Self.S, r4: &mut Self.S) {
+        label l0:
+        return;
+    }
+
+    public tgen<T1, T2, T3, T4>(r1: &T1, r2: &mut T2, r3: &T3, r4: &mut T4) {
+        label l0:
+        return;
+    }
+}
+
+//# run --args 0
+module 0x2.m {
+
+entry foo(r1: &u64) {
+    label l0:
+    return;
+}
+
+}
+//# run --args false
+module 0x3.m {
+
+entry foo(r1: &mut bool) {
+    label l0:
+    return;
+}
+
+}
+//# run --args 0 false 0 0
+module 0x5.m {
+import 0x42.M;
+entry foo(r1: &u64, r2: &mut bool, r3: &M.S, r4: &mut M.S) {
+    label l0:
+    return;
+}
+}
+
+//# run --type-args u64 bool 0x42::M::S 0x42::M::S --args 0 false 0 0
+module 0x6.m {
+
+entry foo<T1, T2, T3, T4>(r1: &T1, r2: &mut T2, r3: &T3, r4: &mut T4) {
+    label l0:
+    return;
+}
+
+}
+//# run 0x42::M::t1 --args 0
+
+//# run 0x42::M::t2 --args false
+
+//# run 0x42::M::t3 --args 0 false 0 0
+
+//# run 0x42::M::tgen --type-args u64 bool 0x42::M::S 0x42::M::S --args 0 false 0 0
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.exp
new file mode 100644
index 000000000..13f10dcbd
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.exp
@@ -0,0 +1,5 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-20:
+mutable inputs after call: local#4: { 4 }
+return values: 0, { 0000000000000000000000000000000000000000000000000000000000000001 }, { 2 }, { 3 }, 3, 4
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.mvir
new file mode 100644
index 000000000..875876e59
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/return_values.mvir
@@ -0,0 +1,20 @@
+//# publish
+
+// entry points can now return values
+
+module 0x42.M {
+    struct S { f: u64 }
+
+    public t(
+        x: u64,
+        a: signer,
+        s: Self.S,
+        r1: &Self.S,
+        r2: &mut Self.S
+    ): u64 * signer * Self.S * &Self.S * &u64 * &mut u64 {
+        label l0:
+        return move(x), move(a), move(s), copy(r1), &move(r1).S::f, &mut move(r2).S::f;
+    }
+}
+
+//# run 0x42::M::t --args 0 @0x1 2 3 4
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.exp
new file mode 100644
index 000000000..0a4591876
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.mvir
new file mode 100644
index 000000000..2344bd498
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args.mvir
@@ -0,0 +1,9 @@
+//# run
+module 0x42.m {
+
+entry foo<T>() { // too few type arguments
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp
new file mode 100644
index 000000000..2a4a7fe32
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-14:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir
new file mode 100644
index 000000000..ba93f6dd4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    struct Ex<T> { flag: bool }
+}
+
+//# run --type-args 0x1::M::Ex
+module 0x42.m {
+
+entry foo<T>() { // too few type args for inner type
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.exp
new file mode 100644
index 000000000..0a4591876
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.mvir
new file mode 100644
index 000000000..b37e6177d
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args.mvir
@@ -0,0 +1,9 @@
+//# run --type-args u64
+module 0x42.m {
+
+entry foo() { // too many type args
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp
new file mode 100644
index 000000000..2a4a7fe32
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-14:
+Error: Function execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir
new file mode 100644
index 000000000..e399c8730
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x1.M {
+    struct Ex<T> { flag: bool }
+}
+
+//# run --type-args 0x1::M::Ex<bool,u64>
+module 0x42.m {
+
+entry foo<T>() { // too many type args
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp
new file mode 100644
index 000000000..be2432897
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-28:
+Error: Function execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir
new file mode 100644
index 000000000..334277b0f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# run --type-args 0x1::Coin::Coin
+module 0x42.m {
+
+entry foo<T: copy + drop>() { // coin does not have copy or drop
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp
new file mode 100644
index 000000000..aa09ee4fd
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-9:
+Error: Function execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir
new file mode 100644
index 000000000..336817742
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir
@@ -0,0 +1,9 @@
+//# run --type-args bool
+module 0x42.m {
+
+entry foo<T: key>() { // bool does not have key
+label b0:
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.exp
new file mode 100644
index 000000000..1aaafb530
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.exp
@@ -0,0 +1,4 @@
+processed 3 tasks
+
+task 1 'run'. lines 37-37:
+return values: { 128, 32768, 2147483648, 9223372036854775808, 170141183460469231731687303715884105728, 57896044618658097711785492504343953926634992332820282019728792003956564819968 }
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.move b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.move
new file mode 100644
index 000000000..cf8cdc226
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/serializer_deserializer.move
@@ -0,0 +1,39 @@
+//# publish
+module 0x42::t {
+
+    struct Ints has key, drop {
+        f8: u8,
+        f16: u16,
+        f32: u32,
+        f64: u64,
+        f128: u128,
+        f256: u256,
+    }
+
+    public fun new(): Ints {
+        Ints {
+            f8:   0x80,
+            f16:  0x8000,
+            f32:  0x80000000,
+            f64:  0x8000000000000000,
+            f128: 0x80000000000000000000000000000000,
+            f256: 0x8000000000000000000000000000000000000000000000000000000000000000,
+        }
+    }
+
+    public fun check(ints: Ints) {
+        let Ints { f8, f16, f32, f64, f128, f256} = ints;
+        assert!(f8   == 0x80u8, 0);
+        assert!(f16  == 0x8000u16, 0);
+        assert!(f32  == 0x80000000u32, 0);
+        assert!(f64  == 0x8000000000000000u64, 0);
+        assert!(f128 == 0x80000000000000000000000000000000u128, 0);
+        assert!(f256 == 0x8000000000000000000000000000000000000000000000000000000000000000u256, 0);
+
+    }
+
+}
+
+//# run 0x42::t::new
+
+//# run 0x42::t::check --args struct(0x80u8,0x8000u16,0x80000000u32,0x8000000000000000u64,0x80000000000000000000000000000000u128,0x8000000000000000000000000000000000000000000000000000000000000000u256)
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.exp b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.exp
new file mode 100644
index 000000000..15206c2bc
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.exp
@@ -0,0 +1,13 @@
+processed 5 tasks
+
+task 1 'run'. lines 19-26:
+mutable inputs after call: local#2: { 0 }
+
+task 2 'run'. lines 28-34:
+mutable inputs after call: local#2: { 0 }
+
+task 3 'run'. lines 36-36:
+mutable inputs after call: local#2: { 0 }
+
+task 4 'run'. lines 38-38:
+mutable inputs after call: local#2: { 0 }
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.mvir
new file mode 100644
index 000000000..dba8e75bc
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/entry_points/struct_arguments.mvir
@@ -0,0 +1,38 @@
+//# publish
+
+// struct and struct ref arguments are now allowed
+
+module 0x42.M {
+    struct S has drop { f: u64 }
+
+    public entry foo(s: Self.S, i: &Self.S, m: &mut Self.S) {
+        label l0:
+        return;
+    }
+
+    public entry foo_gen<T: drop>(s:T, i: &T, m: &mut T) {
+        label l0:
+        return;
+    }
+}
+
+//# run --args 0 0 0
+module 0x1.m {
+import 0x42.M;
+entry foo(s: M.S, i: &M.S, m: &mut M.S) {
+    label l0:
+    return;
+}
+}
+
+//# run --type-args 0x42::M::S --args 0 0 0
+module 0x2.m {
+entry foo<T:drop>(s: T, i: &T, m: &mut T) {
+    label l0:
+    return;
+}
+}
+
+//# run 0x42::M::foo --args 0 0 0
+
+//# run 0x42::M::foo_gen --type-args 0x42::M::S --args 0 0 0
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.mvir
new file mode 100644
index 000000000..e82ba4891
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/address_equality.mvir
@@ -0,0 +1,30 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let a1: address;
+    let a2: address;
+    let a3: address;
+    let a4: address;
+    let a5: address;
+    let a6: address;
+    let a7: address;
+label b0:
+    a1 = 0x1;
+    a2 = 0x01;
+    a3 = 0x0001;
+    a4 = 0x00000001;
+    a5 = 0x0000000000000001;
+    a6 = 0x0000000000000000000000000000001;
+    a7 = 0x00000000000000000000000000000001;
+
+    assert(copy(a1) == copy(a2), 42);
+    assert(copy(a2) == copy(a3), 43);
+    assert(copy(a3) == copy(a4), 44);
+    assert(copy(a4) == copy(a5), 45);
+    assert(copy(a5) == copy(a6), 46);
+    assert(copy(a6) == copy(a7), 47);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.exp
new file mode 100644
index 000000000..26bdcb9a2
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 99-108:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 109-118:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 139-148:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 149-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 161-170:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 190-199:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 200-209:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 210-219:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.mvir
new file mode 100644
index 000000000..6fc272a35
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u128.mvir
@@ -0,0 +1,219 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u128 + 0u128 == 0u128, 1000);
+    assert(0u128 + 1u128 == 1u128, 1001);
+    assert(1u128 + 1u128 == 2u128, 1002);
+
+    assert(13u128 + 67u128 == 80u128, 1100);
+    assert(100u128 + 10u128 == 110u128, 1101);
+
+    assert(0u128 + 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211455u128, 1200);
+    assert(1u128 + 340282366920938463463374607431768211454u128 == 340282366920938463463374607431768211455u128, 1201);
+    assert(5u128 + 340282366920938463463374607431768211450u128 == 340282366920938463463374607431768211455u128, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u128 + 340282366920938463463374607431768211455u128;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 264235234643575437864589745863652363451u128 + 98731747836156137656137643716471364731u128;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u128 - 0u128 == 0u128, 2000);
+    assert(1u128 - 0u128 == 1u128, 2001);
+    assert(1u128 - 1u128 == 0u128, 2002);
+
+    assert(52u128 - 13u128 == 39u128, 2100);
+    assert(100u128 - 10u128 == 90u128, 2101);
+
+    assert(340282366920938463463374607431768211455u128 - 340282366920938463463374607431768211455u128 == 0u128, 2200);
+    assert(5u128 - 1u128 - 4u128 == 0u128, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 - 1u128;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u128 - 100u128;
+    return;
+}
+
+}
+
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u128 * 0u128 == 0u128, 3000);
+    assert(1u128 * 0u128 == 0u128, 3001);
+    assert(1u128 * 1u128 == 1u128, 3002);
+
+    assert(6u128 * 7u128 == 42u128, 3100);
+    assert(10u128 * 10u128 == 100u128, 3101);
+
+    assert(170141183460469231731687303715884105727u128 * 2u128 == 340282366920938463463374607431768211454u128, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 18446744073709551616u128 * 18446744073709551616u128;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 170141183460469231731687303715884105728u128 * 2u128;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u128 / 1u128 == 0u128, 4000);
+    assert(1u128 / 1u128 == 1u128, 4001);
+    assert(1u128 / 2u128 == 0u128, 4002);
+
+    assert(6u128 / 3u128 == 2u128, 4100);
+    assert(340282366920938463463374607431768211455u128 / 4315342637u128 == 78854078469537403609736727246u128, 4101);
+
+    assert(340282366920938463463374607431768211454u128 / 340282366920938463463374607431768211455u128 == 0u128, 4200);
+    assert(340282366920938463463374607431768211455u128 / 340282366920938463463374607431768211455u128 == 1u128, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 / 0u128;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u128 / 0u128;
+    return;
+}
+
+}
+
+
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 340282366920938463463374607431768211455u128 / 0u128;
+    return;
+}
+
+}
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u128 % 1u128 == 0u128, 5000);
+    assert(1u128 % 1u128 == 0u128, 5001);
+    assert(1u128 % 2u128 == 1u128, 5002);
+
+    assert(8u128 % 3u128 == 2u128, 5100);
+    assert(340282366920938463463374607431768211455u128 % 4315342637u128 == 2264823753u128, 5101);
+
+    assert(340282366920938463463374607431768211454u128 % 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211454u128, 5200);
+    assert(340282366920938463463374607431768211455u128 % 340282366920938463463374607431768211455u128 == 0u128, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 % 0u128;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u128 % 0u128;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 340282366920938463463374607431768211455u128 % 0u128;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.exp
new file mode 100644
index 000000000..c82d903d4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 98-107:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 108-117:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 138-147:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 148-157:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 158-167:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 187-196:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 197-206:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 207-216:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
new file mode 100644
index 000000000..d84cdb4aa
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
@@ -0,0 +1,216 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u16 + 0u16 == 0u16, 1000);
+    assert(0u16 + 1u16 == 1u16, 1001);
+    assert(1u16 + 1u16 == 2u16, 1002);
+
+    assert(13u16 + 67u16 == 80u16, 1100);
+    assert(100u16 + 10u16 == 110u16, 1101);
+
+    assert(0u16 + 65535u16 == 65535u16, 1200);
+    assert(1u16 + 65534u16 == 65535u16, 1201);
+    assert(5u16 + 65530u16 == 65535u16, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u16 + 65535u16;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 65500u16 + 65500u16;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u16 - 0u16 == 0u16, 2000);
+    assert(1u16 - 0u16 == 1u16, 2001);
+    assert(1u16 - 1u16 == 0u16, 2002);
+
+    assert(52u16 - 13u16 == 39u16, 2100);
+    assert(100u16 - 10u16 == 90u16, 2101);
+
+    assert(65535u16 - 65535u16 == 0u16, 2200);
+    assert(5u16 - 1u16 - 4u16 == 0u16, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u16 - 1u16;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u16 - 100u16;
+    return;
+}
+
+}
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u16 * 0u16 == 0u16, 3000);
+    assert(1u16 * 0u16 == 0u16, 3001);
+    assert(1u16 * 1u16 == 1u16, 3002);
+
+    assert(6u16 * 7u16 == 42u16, 3100);
+    assert(10u16 * 10u16 == 100u16, 3101);
+
+    assert(32767u16 * 2u16 == 65534u16, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 256u16 * 256u16;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 32768u16 * 2u16;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u16 / 1u16 == 0u16, 4000);
+    assert(1u16 / 1u16 == 1u16, 4001);
+    assert(1u16 / 2u16 == 0u16, 4002);
+
+    assert(6u16 / 3u16 == 2u16, 4100);
+    assert(65535u16 / 121u16 == 541u16, 4101);
+
+    assert(65534u16 / 65535u16 == 0u16, 4200);
+    assert(65535u16 / 65535u16 == 1u16, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u16 / 0u16;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u16 / 0u16;
+    return;
+}
+
+}
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 65535u16 / 0u16;
+    return;
+}
+
+}
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u16 % 1u16 == 0u16, 5000);
+    assert(1u16 % 1u16 == 0u16, 5001);
+    assert(1u16 % 2u16 == 1u16, 5002);
+
+    assert(8u16 % 3u16 == 2u16, 5100);
+    assert(65535u16 % 131u16 == 35u16, 5101);
+
+    assert(65534u16 % 65535u16 == 65534u16, 5200);
+    assert(65535u16 % 65535u16 == 0u16, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u16 % 0u16;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u16 % 0u16;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 65535u16 % 0u16;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.exp
new file mode 100644
index 000000000..26bdcb9a2
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 99-108:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 109-118:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 139-148:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 149-158:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 161-170:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 190-199:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 200-209:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 210-219:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
new file mode 100644
index 000000000..b555ef550
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
@@ -0,0 +1,219 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u256 + 0u256 == 0u256, 1000);
+    assert(0u256 + 1u256 == 1u256, 1001);
+    assert(1u256 + 1u256 == 2u256, 1002);
+
+    assert(13u256 + 67u256 == 80u256, 1100);
+    assert(100u256 + 10u256 == 110u256, 1101);
+
+    assert(0u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1200);
+    assert(1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1201);
+    assert(5u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639930u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639932u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639931u256;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u256 - 0u256 == 0u256, 2000);
+    assert(1u256 - 0u256 == 1u256, 2001);
+    assert(1u256 - 1u256 == 0u256, 2002);
+
+    assert(52u256 - 13u256 == 39u256, 2100);
+    assert(100u256 - 10u256 == 90u256, 2101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 - 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 2200);
+    assert(5u256 - 1u256 - 4u256 == 0u256, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u256 - 1u256;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u256 - 100u256;
+    return;
+}
+
+}
+
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u256 * 0u256 == 0u256, 3000);
+    assert(1u256 * 0u256 == 0u256, 3001);
+    assert(1u256 * 1u256 == 1u256, 3002);
+
+    assert(6u256 * 7u256 == 42u256, 3100);
+    assert(10u256 * 10u256 == 100u256, 3101);
+
+    assert(57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 57896044618658097711785492504343953926634992332820282019728792003956564819967u256;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819968u256 * 2u256;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u256 / 1u256 == 0u256, 4000);
+    assert(1u256 / 1u256 == 1u256, 4001);
+    assert(1u256 / 2u256 == 0u256, 4002);
+
+    assert(6u256 / 3u256 == 2u256, 4100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 4315342637539806u256 == 26832652459627105301847093122056309129973091557185267691720404u256, 4101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 4200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 1u256, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u256 / 0u256;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u256 / 0u256;
+    return;
+}
+
+}
+
+
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 0u256;
+    return;
+}
+
+}
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u256 % 1u256 == 0u256, 5000);
+    assert(1u256 % 1u256 == 0u256, 5001);
+    assert(1u256 % 2u256 == 1u256, 5002);
+
+    assert(8u256 % 3u256 == 2u256, 5100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 4315342637539806u256 == 2132250957238311u256, 5101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 5200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u256 % 0u256;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u256 % 0u256;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 0u256;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.exp
new file mode 100644
index 000000000..c82d903d4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 98-107:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 108-117:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 138-147:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 148-157:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 158-167:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 187-196:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 197-206:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 207-216:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
new file mode 100644
index 000000000..0c3aace54
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
@@ -0,0 +1,216 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u32 + 0u32 == 0u32, 1000);
+    assert(0u32 + 1u32 == 1u32, 1001);
+    assert(1u32 + 1u32 == 2u32, 1002);
+
+    assert(13u32 + 67u32 == 80u32, 1100);
+    assert(100u32 + 10u32 == 110u32, 1101);
+
+    assert(0u32 + 4294967295u32 == 4294967295u32, 1200);
+    assert(1u32 + 4294967294u32 == 4294967295u32, 1201);
+    assert(5u32 + 4294967290u32 == 4294967295u32, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u32 + 4294967295u32;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 4294000000u32 + 4294000000u32;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u32 - 0u32 == 0u32, 2000);
+    assert(1u32 - 0u32 == 1u32, 2001);
+    assert(1u32 - 1u32 == 0u32, 2002);
+
+    assert(52u32 - 13u32 == 39u32, 2100);
+    assert(100u32 - 10u32 == 90u32, 2101);
+
+    assert(4294967295u32 - 4294967295u32 == 0u32, 2200);
+    assert(5u32 - 1u32 - 4u32 == 0u32, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u32 - 1u32;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u32 - 100u32;
+    return;
+}
+
+}
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u32 * 0u32 == 0u32, 3000);
+    assert(1u32 * 0u32 == 0u32, 3001);
+    assert(1u32 * 1u32 == 1u32, 3002);
+
+    assert(6u32 * 7u32 == 42u32, 3100);
+    assert(10u32 * 10u32 == 100u32, 3101);
+
+    assert(2147483647u32 * 2u32 == 4294967294u32, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 429496u32 * 429496u32;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 2147483648u32 * 2u32;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u32 / 1u32 == 0u32, 4000);
+    assert(1u32 / 1u32 == 1u32, 4001);
+    assert(1u32 / 2u32 == 0u32, 4002);
+
+    assert(6u32 / 3u32 == 2u32, 4100);
+    assert(4294967295u32 / 131u32 == 32786009u32, 4101);
+
+    assert(4294967294u32 / 4294967295u32 == 0u32, 4200);
+    assert(4294967295u32 / 4294967295u32 == 1u32, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u32 / 0u32;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u32 / 0u32;
+    return;
+}
+
+}
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 4294967295u32 / 0u32;
+    return;
+}
+
+}
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u32 % 1u32 == 0u32, 5000);
+    assert(1u32 % 1u32 == 0u32, 5001);
+    assert(1u32 % 2u32 == 1u32, 5002);
+
+    assert(8u32 % 3u32 == 2u32, 5100);
+    assert(4294967295u32 % 131u32 == 116u32, 5101);
+
+    assert(4294967294u32 % 4294967295u32 == 4294967294u32, 5200);
+    assert(4294967295u32 % 4294967295u32 == 0u32, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u32 % 0u32;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u32 % 0u32;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 4294967295u32 % 0u32;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.exp
new file mode 100644
index 000000000..c82d903d4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 98-107:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 108-117:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 138-147:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 148-157:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 158-167:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 187-196:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 197-206:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 207-216:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.mvir
new file mode 100644
index 000000000..3d6dcfa32
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u64.mvir
@@ -0,0 +1,216 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u64 + 0u64 == 0u64, 1000);
+    assert(0u64 + 1u64 == 1u64, 1001);
+    assert(1u64 + 1u64 == 2u64, 1002);
+
+    assert(13u64 + 67u64 == 80u64, 1100);
+    assert(100u64 + 10u64 == 110u64, 1101);
+
+    assert(0u64 + 18446744073709551615u64 == 18446744073709551615u64, 1200);
+    assert(1u64 + 18446744073709551614u64 == 18446744073709551615u64, 1201);
+    assert(5u64 + 18446744073709551610u64 == 18446744073709551615u64, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u64 + 18446744073709551615u64;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 12000000000000000000u64 + 10000000000000000000u64;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u64 - 0u64 == 0u64, 2000);
+    assert(1u64 - 0u64 == 1u64, 2001);
+    assert(1u64 - 1u64 == 0u64, 2002);
+
+    assert(52u64 - 13u64 == 39u64, 2100);
+    assert(100u64 - 10u64 == 90u64, 2101);
+
+    assert(18446744073709551615u64 - 18446744073709551615u64 == 0u64, 2200);
+    assert(5u64 - 1u64 - 4u64 == 0u64, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 - 1u64;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u64 - 100u64;
+    return;
+}
+
+}
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u64 * 0u64 == 0u64, 3000);
+    assert(1u64 * 0u64 == 0u64, 3001);
+    assert(1u64 * 1u64 == 1u64, 3002);
+
+    assert(6u64 * 7u64 == 42u64, 3100);
+    assert(10u64 * 10u64 == 100u64, 3101);
+
+    assert(9223372036854775807u64 * 2u64 == 18446744073709551614u64, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 4294967296u64 * 4294967296u64;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 9223372036854775808 * 2u64;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u64 / 1u64 == 0u64, 4000);
+    assert(1u64 / 1u64 == 1u64, 4001);
+    assert(1u64 / 2u64 == 0u64, 4002);
+
+    assert(6u64 / 3u64 == 2u64, 4100);
+    assert(18446744073709551615u64 / 13131u64 == 1404824009878116u64, 4101);
+
+    assert(18446744073709551614u64 / 18446744073709551615u64 == 0u64, 4200);
+    assert(18446744073709551615u64 / 18446744073709551615u64 == 1u64, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 / 0u64;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u64 / 0u64;
+    return;
+}
+
+}
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 18446744073709551615u64 / 0u64;
+    return;
+}
+
+}
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u64 % 1u64 == 0u64, 5000);
+    assert(1u64 % 1u64 == 0u64, 5001);
+    assert(1u64 % 2u64 == 1u64, 5002);
+
+    assert(8u64 % 3u64 == 2u64, 5100);
+    assert(18446744073709551615u64 % 13131u64 == 10419u64, 5101);
+
+    assert(18446744073709551614u64 % 18446744073709551615u64 == 18446744073709551614u64, 5200);
+    assert(18446744073709551615u64 % 18446744073709551615u64 == 0u64, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 % 0u64;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u64 % 0u64;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 18446744073709551615u64 % 0u64;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.exp
new file mode 100644
index 000000000..a6416112b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 20-29:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 30-39:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 60-69:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 70-79:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 98-107:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 108-117:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 138-147:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 148-157:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 158-167:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 188-197:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 198-207:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 208-217:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.mvir
new file mode 100644
index 000000000..0111987aa
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/arithmetic_operators_u8.mvir
@@ -0,0 +1,217 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u8 + 0u8 == 0u8, 1000);
+    assert(0u8 + 1u8 == 1u8, 1001);
+    assert(1u8 + 1u8 == 2u8, 1002);
+
+    assert(13u8 + 67u8 == 80u8, 1100);
+    assert(100u8 + 10u8 == 110u8, 1101);
+
+    assert(0u8 + 255u8 == 255u8, 1200);
+    assert(1u8 + 254u8 == 255u8, 1201);
+    assert(5u8 + 250u8 == 255u8, 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 1u8 + 255u8;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 215u8 + 156u8;
+    return;
+}
+
+}
+
+
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(0u8 - 0u8 == 0u8, 2000);
+    assert(1u8 - 0u8 == 1u8, 2001);
+    assert(1u8 - 1u8 == 0u8, 2002);
+
+    assert(52u8 - 13u8 == 39u8, 2100);
+    assert(100u8 - 10u8 == 90u8, 2101);
+
+    assert(255u8 - 255u8 == 0u8, 2200);
+    assert(5u8 - 1u8 - 4u8 == 0u8, 2201);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 - 1u8;
+    return;
+}
+
+}
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    _ = 54u8 - 100u8;
+    return;
+}
+
+}
+
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(0u8 * 0u8 == 0u8, 3000);
+    assert(1u8 * 0u8 == 0u8, 3001);
+    assert(1u8 * 1u8 == 1u8, 3002);
+
+    assert(6u8 * 7u8 == 42u8, 3100);
+    assert(10u8 * 10u8 == 100u8, 3101);
+
+    assert(127u8 * 2u8 == 254u8, 3200);
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 16u8 * 16u8;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 128u8 * 2u8;
+    return;
+}
+
+}
+
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    assert(0u8 / 1u8 == 0u8, 4000);
+    assert(1u8 / 1u8 == 1u8, 4001);
+    assert(1u8 / 2u8 == 0u8, 4002);
+
+    assert(6u8 / 3u8 == 2u8, 4100);
+    assert(255u8 / 7u8 == 36u8, 4101);
+
+    assert(254u8 / 255u8 == 0u8, 4200);
+    assert(255u8 / 255u8 == 1u8, 4201);
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 / 0u8;
+    return;
+}
+
+}
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = 1u8 / 0u8;
+    return;
+}
+
+}
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = 255u8 / 0u8;
+    return;
+}
+
+}
+
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(0u8 % 1u8 == 0u8, 5000);
+    assert(1u8 % 1u8 == 0u8, 5001);
+    assert(1u8 % 2u8 == 1u8, 5002);
+
+    assert(8u8 % 3u8 == 2u8, 5100);
+    assert(255u8 % 7u8 == 3u8, 5101);
+
+    assert(254u8 % 255u8 == 254u8, 5200);
+    assert(255u8 % 255u8 == 0u8, 5201);
+    return;
+}
+
+}
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 % 0u8;
+    return;
+}
+
+}
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = 1u8 % 0u8;
+    return;
+}
+
+}
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = 255u8 % 0u8;
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.exp
new file mode 100644
index 000000000..269996037
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 27-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 19)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.mvir
new file mode 100644
index 000000000..5f12d7f9c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/assign_struct_field.mvir
@@ -0,0 +1,49 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public update(t: &mut Self.T) {
+        let vref: &mut u64;
+    label b0:
+        vref = &mut move(t).T::v;
+        *move(vref) = 1;
+        return;
+    }
+
+    public vref(this: &mut Self.T): &u64 {
+        let r: &u64;
+    label b0:
+        r = &copy(this).T::v;
+        _ = move(this);
+        return move(r);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Tester;
+
+entry foo() {
+    let t: Tester.T;
+    let tt: &mut Tester.T;
+    let vref_before: &u64;
+    let ref_t: &mut Tester.T;
+    let vref_after: &u64;
+label b0:
+    t = Tester.new(0);
+    tt = &mut t;
+    vref_before = Tester.vref(move(tt));
+    assert(*copy(vref_before) == 0, 42);
+    ref_t = &mut t;
+    Tester.update(copy(ref_t));
+    vref_after = Tester.vref(move(ref_t));
+    assert(*move(vref_before) == 1, 42);
+    assert(*move(vref_after) == 1, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.mvir
new file mode 100644
index 000000000..bfa04d896
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/bitwise_operators.mvir
@@ -0,0 +1,166 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u8 & 0u8 == 0u8, 1000);
+    assert(0u64 & 0u64 == 0u64, 1001);
+    assert(0u128 & 0u128 == 0u128, 1002);
+    assert(0u8 & 42u8 == 0u8, 1003);
+    assert(0u64 & 42u64 == 0u64, 1004);
+    assert(0u128 & 42u128 == 0u128, 1005);
+    assert(0u16 & 0u16 == 0u16, 1000);
+    assert(0u32 & 0u32 == 0u32, 1001);
+    assert(0u256 & 0u256 == 0u256, 1002);
+    assert(0u16 & 42u16 == 0u16, 1003);
+    assert(0u32 & 42u32 == 0u32, 1004);
+    assert(0u256 & 42u256 == 0u256, 1005);
+
+    assert(43u8 & 43u8 == 43u8, 1100);
+    assert(856776467654u64 & 856776467654u64 == 856776467654u64, 1101);
+    assert(4125423653474658754976595u128 & 4125423653474658754976595u128 == 4125423653474658754976595u128, 1102);
+    assert(43u16 & 43u16 == 43u16, 1100);
+    assert(42967295u32 & 42967295u32 == 42967295u32, 1101);
+    assert(4125423653474658754976595u256 & 4125423653474658754976595u256 == 4125423653474658754976595u256, 1102);
+
+
+    assert(255u8 & 255u8 == 255u8, 1200);
+    assert(18446744073709551615u64 & 18446744073709551615u64 == 18446744073709551615u64, 1201);
+    assert(
+        340282366920938463463374607431768211455u128 &
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        1202
+    );
+    assert(65535u16 & 65535u16 == 65535u16, 1200);
+    assert(4294967295u32 & 4294967295u32 == 4294967295u32, 1201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 &
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
+
+    assert(101u8 & 77u8 == 69u8, 1300);
+    assert(675437u64 & 14235u64 == 1545u64, 1301);
+    assert(534263574563786485434889u128 & 3141524387653489576893u128 == 632665710869872675337u128, 1302);
+    assert(101u16 & 77u16 == 69u16, 1300);
+    assert(65437u32 & 14235u32 == 14233u32, 1301);
+    assert(534263574563786485434889u256 & 3141524387653489576893u256 == 632665710869872675337u256, 1302);
+    return;
+}
+
+}
+
+//# run
+module 0x22.m {
+
+entry foo() {
+label b0:
+    assert(0u8 | 0u8 == 0u8, 2000);
+    assert(0u64 | 0u64 == 0u64, 2001);
+    assert(0u128 | 0u128 == 0u128, 2002);
+    assert(42u8 | 0u8 == 42u8, 2003);
+    assert(42u64 | 0u64 == 42u64, 2004);
+    assert(42u128 | 0u128 == 42u128, 2005);
+    assert(0u16 | 0u16 == 0u16, 2000);
+    assert(0u32 | 0u32 == 0u32, 2001);
+    assert(0u256 | 0u256 == 0u256, 2002);
+    assert(42u16 | 0u16 == 42u16, 2003);
+    assert(42u32 | 0u32 == 42u32, 2004);
+    assert(42u256 | 0u256 == 42u256, 2005);
+
+    assert(43u8 | 43u8 == 43u8, 2100);
+    assert(856776467654u64 | 856776467654u64 == 856776467654u64, 2101);
+    assert(4125423653474658754976595u128 | 4125423653474658754976595u128 == 4125423653474658754976595u128, 2102);
+    assert(43u16 | 43u16 == 43u16, 2100);
+    assert(85677646u32 | 85677646u32 == 85677646u32, 2101);
+    assert(4125423653474658754976595u256 | 4125423653474658754976595u256 == 4125423653474658754976595u256, 2102);
+
+    assert(255u8 | 255u8 == 255u8, 2200);
+    assert(18446744073709551615u64 | 18446744073709551615u64 == 18446744073709551615u64, 2201);
+    assert(
+        340282366920938463463374607431768211455u128 |
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        2202
+    );
+    assert(65535u16 | 65535u16 == 65535u16, 2200);
+    assert(4294967295u32 | 4294967295u32 == 4294967295u32, 2201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 |
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        2202
+    );
+
+    assert(101u8 | 77u8 == 109u8, 2300);
+    assert(675437u64 | 14235u64 == 688127u64, 2301);
+    assert(534263574563786485434889u128 | 3141524387653489576893u128 == 536772433240570102336445u128, 2302);
+    assert(101u16 | 77u16 == 109u16, 2300);
+    assert(65437u32 | 14235u32 == 65439u32, 2301);
+    assert(534263574563786485434889u256 | 3141524387653489576893u256 == 536772433240570102336445u256, 2302);
+    return;
+}
+
+}
+
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    assert(0u8 ^ 0u8 == 0u8, 3000);
+    assert(0u64 ^ 0u64 == 0u64, 3001);
+    assert(0u128 ^ 0u128 == 0u128, 3002);
+    assert(13u8 ^ 0u8 == 13u8, 3003);
+    assert(13u64 ^ 0u64 == 13u64, 3004);
+    assert(13u128 ^ 0u128 == 13u128, 3005);
+    assert(0u16 ^ 0u16 == 0u16, 3000);
+    assert(0u32 ^ 0u32 == 0u32, 3001);
+    assert(0u256 ^ 0u256 == 0u256, 3002);
+    assert(13u16 ^ 0u16 == 13u16, 3003);
+    assert(13u32 ^ 0u32 == 13u32, 3004);
+    assert(13u256 ^ 0u256 == 13u256, 3005);
+
+    assert(43u8 ^ 43u8 == 0u8, 3100);
+    assert(856776467654u64 ^ 856776467654u64 == 0u64, 3101);
+    assert(4125423653474658754976595u128 ^ 4125423653474658754976595u128 == 0u128, 3102);
+    assert(43u16 ^ 43u16 == 0u16, 3100);
+    assert(85677646u32 ^ 85677646u32 == 0u32, 3101);
+    assert(4125423653474658754976595u256 ^ 4125423653474658754976595u256 == 0u256, 3102);
+
+    assert(255u8 ^ 255u8 == 0u8, 3200);
+    assert(18446744073709551615u64 ^ 18446744073709551615u64 == 0u64, 3201);
+    assert(
+        340282366920938463463374607431768211455u128 ^
+        340282366920938463463374607431768211455u128 ==
+        0u128,
+        3202
+    );
+    assert(65535u16 ^ 65535u16 == 0u16, 3200);
+    assert(4294967295u32 ^ 4294967295u32 == 0u32, 3201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ^
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        0u256,
+        3202
+    );
+
+    assert(101u8 ^ 77u8 == 40u8, 3300);
+    assert(675437u64 ^ 14235u64 == 686582u64, 3301);
+    assert(534263574563786485434889u128 ^ 3141524387653489576893u128 == 536139767529700229661108u128, 3302);
+    assert(101u16 ^ 77u16 == 40u16, 3300);
+    assert(675437u32 ^ 14235u32 == 686582u32, 3301);
+    assert(534263574563786485434889u256 ^ 3141524387653489576893u256 == 536139767529700229661108u256, 3302);
+
+    assert(13u8 ^ 1u8 == 12u8, 3400);
+    assert(13u64 ^ 1u64 == 12u64, 3401);
+    assert(13u128 ^ 1u128 == 12u128, 3402);
+    assert(13u16 ^ 1u16 == 12u16, 3400);
+    assert(13u32 ^ 1u32 == 12u32, 3401);
+    assert(13u256 ^ 1u256 == 12u256, 3402);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.mvir
new file mode 100644
index 000000000..0c2ec67fd
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/boolean_operators.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+  assert((true && false) == false, 99);
+  assert((true || false) == true, 100);
+  assert(!true == false, 101);
+  assert(!false == true, 102);
+  assert(!!true == true, 103);
+  assert(!!false == false, 104);
+
+  return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.exp
new file mode 100644
index 000000000..d7b0de319
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.exp
@@ -0,0 +1,289 @@
+processed 38 tasks
+
+task 6 'run'. lines 193-202:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 204-213:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 215-224:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 226-235:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 237-246:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x11::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 248-257:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x12::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'run'. lines 259-268:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x13::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 13 'run'. lines 270-279:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x14::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 14 'run'. lines 281-290:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x15::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 292-301:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x16::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 303-312:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x17::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 314-325:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x18::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 326-335:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x19::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 337-346:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x20::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 348-357:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x21::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 359-368:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x22::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 370-379:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x23::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 381-392:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x24::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 393-402:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x25::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 404-413:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x26::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 26 'run'. lines 415-424:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x27::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 426-435:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x28::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 437-446:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x29::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 448-457:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x30::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 459-468:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x31::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 470-481:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x32::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 482-491:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x33::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 493-502:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x34::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 504-513:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x35::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 35 'run'. lines 515-524:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x36::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 36 'run'. lines 526-535:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x37::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 37 'run'. lines 537-546:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x38::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.mvir
new file mode 100644
index 000000000..dfa2dab42
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/casting_operators.mvir
@@ -0,0 +1,546 @@
+//# run
+module 0x1.m {
+
+// Casting to u8.
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u8(0u8) == 0u8, 1000);
+    assert(to_u8(0u64) == 0u8, 1001);
+    assert(to_u8(0u128) == 0u8, 1002);
+    assert(to_u8(0u16) == 0u8, 1000);
+    assert(to_u8(0u32) == 0u8, 1001);
+    assert(to_u8(0u256) == 0u8, 1002);
+
+    // Random small number unchanged.
+    assert(to_u8(21u8) == 21u8, 1100);
+    assert(to_u8(21u64) == 21u8, 1101);
+    assert(to_u8(21u128) == 21u8, 1102);
+    assert(to_u8(21u16) == 21u8, 1100);
+    assert(to_u8(21u32) == 21u8, 1101);
+    assert(to_u8(21u256) == 21u8, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u8(255u8) == 255u8, 1200);
+    assert(to_u8(255u64) == 255u8, 1201);
+    assert(to_u8(255u128) == 255u8, 1202);
+    assert(to_u8(255u16) == 255u8, 1200);
+    assert(to_u8(255u32) == 255u8, 1201);
+    assert(to_u8(255u256) == 255u8, 1202);
+
+    return;
+}
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u16.
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u16(0u8) == 0u16, 1000);
+    assert(to_u16(0u64) == 0u16, 1001);
+    assert(to_u16(0u128) == 0u16, 1002);
+    assert(to_u16(0u16) == 0u16, 1000);
+    assert(to_u16(0u32) == 0u16, 1001);
+    assert(to_u16(0u256) == 0u16, 1002);
+
+    // Random small number unchanged.
+    assert(to_u16(21u8) == 21u16, 1100);
+    assert(to_u16(21u64) == 21u16, 1101);
+    assert(to_u16(21u128) == 21u16, 1102);
+    assert(to_u16(21u16) == 21u16, 1100);
+    assert(to_u16(21u32) == 21u16, 1101);
+    assert(to_u16(21u256) == 21u16, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u16(255u8) == 255u16, 1200);
+    assert(to_u16(65535u64) == 65535u16, 1201);
+    assert(to_u16(65535u128) == 65535u16, 1202);
+    assert(to_u16(65535u16) == 65535u16, 1200);
+    assert(to_u16(65535u32) == 65535u16, 1201);
+    assert(to_u16(65535u256) == 65535u16, 1202);
+
+    return;
+}
+
+}// check: "Keep(EXECUTED)"
+
+// Casting to u32.
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u32(0u8) == 0u32, 1000);
+    assert(to_u32(0u64) == 0u32, 1001);
+    assert(to_u32(0u128) == 0u32, 1002);
+    assert(to_u32(0u16) == 0u32, 1000);
+    assert(to_u32(0u32) == 0u32, 1001);
+    assert(to_u32(0u256) == 0u32, 1002);
+
+    // Random small number unchanged.
+    assert(to_u32(21u8) == 21u32, 1100);
+    assert(to_u32(21u64) == 21u32, 1101);
+    assert(to_u32(21u128) == 21u32, 1102);
+    assert(to_u32(21u16) == 21u32, 1100);
+    assert(to_u32(21u32) == 21u32, 1101);
+    assert(to_u32(21u256) == 21u32, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u32(255u8) == 255u32, 1200);
+    assert(to_u32(4294967295u64) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u128) == 4294967295u32, 1202);
+    assert(to_u32(65535u16) == 65535u32, 1200);
+    assert(to_u32(4294967295u32) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u256) == 4294967295u32, 1202);
+
+    return;
+}
+
+}// check: "Keep(EXECUTED)"
+
+// Casting to u64.
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u64(0u8) == 0u64, 2000);
+    assert(to_u64(0u64) == 0u64, 2001);
+    assert(to_u64(0u128) == 0u64, 2002);
+
+    // Random small number unchanged.
+    assert(to_u64(21u8) == 21u64, 2100);
+    assert(to_u64(21u64) == 21u64, 2101);
+    assert(to_u64(21u128) == 21u64, 2102);
+
+    // Max representable values remain unchanged.
+    assert(to_u64(255u8) == 255u64, 2200);
+    assert(to_u64(18446744073709551615u64) == 18446744073709551615u64, 2201);
+    assert(to_u64(18446744073709551615u128) == 18446744073709551615u64, 2202);
+    return;
+}
+
+}// check: "Keep(EXECUTED)"
+
+// Casting to u128.
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u128(0u8) == 0u128, 3000);
+    assert(to_u128(0u64) == 0u128, 3001);
+    assert(to_u128(0u128) == 0u128, 3002);
+
+    // Random small number unchanged.
+    assert(to_u128(21u8) == 21u128, 3100);
+    assert(to_u128(21u64) == 21u128, 3101);
+    assert(to_u128(21u128) == 21u128, 3102);
+
+    // Max representable values remain unchanged.
+    assert(to_u128(255u8) == 255u128, 3200);
+    assert(to_u128(18446744073709551615u64) == 18446744073709551615u128, 3201);
+    assert(to_u128(340282366920938463463374607431768211455u128) == 340282366920938463463374607431768211455u128, 3202);
+    return;
+}
+
+}// check: "Keep(EXECUTED)"
+
+
+// Casting to u256.
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u256(0u8) == 0u256, 1000);
+    assert(to_u256(0u64) == 0u256, 1001);
+    assert(to_u256(0u128) == 0u256, 1002);
+    assert(to_u256(0u16) == 0u256, 1000);
+    assert(to_u256(0u32) == 0u256, 1001);
+    assert(to_u256(0u256) == 0u256, 1002);
+
+    // Random small number unchanged.
+    assert(to_u256(21u8) == 21u256, 1100);
+    assert(to_u256(21u64) == 21u256, 1101);
+    assert(to_u256(21u128) == 21u256, 1102);
+    assert(to_u256(21u16) == 21u256, 1100);
+    assert(to_u256(21u32) == 21u256, 1101);
+    assert(to_u256(21u256) == 21u256, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u256(255u8) == 255u256, 1200);
+    assert(to_u256(18446744073709551615u64) == 18446744073709551615u256, 1201);
+    assert(to_u256(340282366920938463463374607431768211455u128) == 340282366920938463463374607431768211455u256, 1202);
+    assert(to_u256(65535u16) == 65535u256, 1200);
+    assert(to_u256(4294967295u32) == 4294967295u256, 1201);
+    assert(to_u256(115792089237316195423570985008687907853269984665640564039457584007913129639935u256) == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+
+    return;
+}
+
+}// check: "Keep(EXECUTED)"
+
+// Casting to u8, overflowing.
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(256u64);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(303u64);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(256u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(56432u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(256u16);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(303u16);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(256u32);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(303u32);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(18446744073709551615u64);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(340282366920938463463374607431768211455u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x17.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(65535u16);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x18.m {
+
+entry foo() {
+label b0:
+    _ = to_u8(4294967295u32);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+// Casting to u64, overflowing.
+//# run
+module 0x19.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(18446744073709551616u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x20.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x21.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(340282366920938463463374607431768211455u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x22.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(18446744073709551647u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x23.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x24.m {
+
+entry foo() {
+label b0:
+    _ = to_u64(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+// Casting to u16, overflowing.
+//# run
+module 0x25.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(18446744073709551616u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x26.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x27.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(340282366920938463463374607431768211455u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x28.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(18446744073709551647u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x29.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x30.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x31.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(2561233u32);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x32.m {
+
+entry foo() {
+label b0:
+    _ = to_u16(4294967295u32);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+// Casting to u32, overflowing.
+//# run
+module 0x33.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(18446744073709551616u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x34.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x35.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(340282366920938463463374607431768211455u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x36.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(18446744073709551647u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x37.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
+
+//# run
+module 0x38.m {
+
+entry foo() {
+label b0:
+    _ = to_u32(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+
+}// check: ARITHMETIC_ERROR
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.mvir
new file mode 100644
index 000000000..6a296632c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/comparison_operators.mvir
@@ -0,0 +1,120 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+label b0:
+    assert(0u8 == 0u8, 1000);
+    assert(0u64 == 0u64, 1001);
+    assert(0u128 == 0u128, 1002);
+
+    assert(!(0u8 == 1u8), 1100);
+    assert(!(0u64 == 1u64), 1101);
+    assert(!(0u128 == 1u128), 1102);
+
+    assert(!(1u8 == 0u8), 1200);
+    assert(!(1u64 == 0u64), 1201);
+    assert(!(1u128 == 0u128), 1202);
+    return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    assert(0u8 != 1u8, 2000);
+    assert(0u64 != 1u64, 2001);
+    assert(0u128 != 1u128, 2001);
+
+    assert(1u8 != 0u8, 2100);
+    assert(1u64 != 0u64, 2101);
+    assert(1u128 != 0u128, 2101);
+
+    assert(!(0u8 != 0u8), 2200);
+    assert(!(0u64 != 0u64), 2201);
+    assert(!(0u128 != 0u128), 2201);
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    assert(0u8 < 1u8, 3000);
+    assert(0u64 < 1u64, 3001);
+    assert(0u128 < 1u128, 3002);
+
+    assert(!(1u8 < 0u8), 3100);
+    assert(!(1u64 < 0u64), 3101);
+    assert(!(1u128 < 0u128), 3102);
+
+    assert(!(0u8 < 0u8), 3200);
+    assert(!(0u64 < 0u64), 3201);
+    assert(!(0u128 < 0u128), 3202);
+    return;
+}
+
+}
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    assert(1u8 > 0u8, 4000);
+    assert(1u64 > 0u64, 4001);
+    assert(1u128 > 0u128, 4002);
+
+    assert(!(0u8 > 1u8), 4100);
+    assert(!(0u64 > 1u64), 4101);
+    assert(!(0u128 > 1u128), 4102);
+
+    assert(!(0u8 > 0u8), 4200);
+    assert(!(0u64 > 0u64), 4201);
+    assert(!(0u128 > 0u128), 4202);
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    assert(0u8 <= 1u8, 5000);
+    assert(0u64 <= 1u64, 5001);
+    assert(0u128 <= 1u128, 5002);
+
+    assert(!(1u8 <= 0u8), 5100);
+    assert(!(1u64 <= 0u64), 5101);
+    assert(!(1u128 <= 0u128), 5102);
+
+    assert(0u8 <= 0u8, 5200);
+    assert(0u64 <= 0u64, 5201);
+    assert(0u128 <= 0u128, 5202);
+    return;
+}
+
+}
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    assert(1u8 >= 0u8, 6000);
+    assert(1u64 >= 0u64, 6001);
+    assert(1u128 >= 0u128, 6002);
+
+    assert(!(0u8 >= 1u8), 6100);
+    assert(!(0u64 >= 1u64), 6101);
+    assert(!(0u128 >= 1u128), 6102);
+
+    assert(0u8 >= 0u8, 6200);
+    assert(0u64 >= 0u64, 6201);
+    assert(0u128 >= 0u128, 6202);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.mvir
new file mode 100644
index 000000000..a08368208
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x1.A {
+    struct T has drop {f: u64}
+
+    public new(f: u64): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &Self.T) {
+        let f: &u64;
+        let y: u64;
+    label b0:
+        f = &copy(this).T::f;
+        y = *move(f);
+        assert(copy(y) == 2, 42);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let x: A.T;
+    let x_ref: &A.T;
+label b0:
+    x = A.new(2);
+    x_ref = &x;
+    A.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.mvir
new file mode 100644
index 000000000..f2fdef33f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/deref_value_nested.mvir
@@ -0,0 +1,56 @@
+//# publish
+module 0x1.B {
+    struct T has drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &Self.T) {
+        let g: &u64;
+        let y: u64;
+    label b0:
+        g = &move(this).T::g;
+        y = *move(g);
+        assert(copy(y) == 2, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    import 0x1.B;
+
+    struct T has drop {f: B.T}
+
+    public new(f: B.T): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &Self.T) {
+        let f: &B.T;
+    label b0:
+        f = &move(this).T::f;
+        B.t(move(f));
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x1.A;
+import 0x1.B;
+entry foo() {
+    let b: B.T;
+    let x: A.T;
+    let x_ref: &A.T;
+label b0:
+    b = B.new(2);
+    x = A.new(move(b));
+    x_ref = &x;
+    A.t(move(x_ref));
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.exp
new file mode 100644
index 000000000..ad203a875
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.exp
@@ -0,0 +1,13 @@
+processed 3 tasks
+
+task 1 'run'. lines 15-15:
+mutable inputs after call: local#0: 0
+
+task 2 'run'. lines 17-17:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x1::test,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.mvir
new file mode 100644
index 000000000..83b4bbfa1
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/equality_reference_value.mvir
@@ -0,0 +1,17 @@
+//# publish
+module 0x1.test {
+    public test(external: &mut u64) {
+        let local: u64;
+        let local_ref: &mut u64;
+    label b0:
+        local = 0;
+        local_ref = &mut local;
+        // make sure refs are equal even if one is in global storage and one is local
+        assert(move(external) == move(local_ref), 42);
+        return;
+    }
+}
+
+//# run 0x1::test::test --args 0
+
+//# run 0x1::test::test --args 1
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.mvir
new file mode 100644
index 000000000..066dbdfb3
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_reads.mvir
@@ -0,0 +1,114 @@
+//# publish
+module 0x42.VTest {
+    struct T has drop {fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t2(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t3(this: &Self.T): bool {
+        let x: &bool;
+    label b0:
+        x = &copy(this).T::fv;
+        _ = move(this);
+        return *move(x);
+    }
+}
+
+//# publish
+
+module 0x42.RTest {
+    struct T{fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t2(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t3(this: &Self.T): bool {
+        let x: &bool;
+    label b0:
+        x = &copy(this).T::fv;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public destroy_t(t: Self.T) {
+        let fint: u64;
+        let fv: bool;
+    label b0:
+        T{ fint, fv } = move(t);
+        return;
+    }
+}
+
+//# run
+
+module 0x42.m {
+import 0x42.RTest;
+import 0x42.VTest;
+
+entry foo() {
+    let vt: VTest.T;
+    let vref: &VTest.T;
+    let rt: RTest.T;
+    let rref: &RTest.T;
+    let r1: u64;
+    let r2: u64;
+    let r3: u64;
+    let r4: u64;
+    let r5: bool;
+    let r6: bool;
+label b0:
+    vt = VTest.new(0, false);
+    vref = &vt;
+    rt = RTest.new(0, false);
+    rref = &rt;
+
+    r1 = VTest.t1(copy(vref));
+    r2 = RTest.t1(copy(rref));
+
+    r3 = VTest.t2(copy(vref));
+    r4 = RTest.t2(copy(rref));
+
+    r5 = VTest.t3(move(vref));
+    r6 = RTest.t3(move(rref));
+
+    RTest.destroy_t(move(rt));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.mvir
new file mode 100644
index 000000000..8f024050c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/field_writes.mvir
@@ -0,0 +1,129 @@
+//# publish
+module 0x42.VTest {
+    struct T has drop {fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &mut Self.T) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = 0;
+        return;
+    }
+
+    public t2(this: &mut Self.T, i: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = move(i);
+        return;
+    }
+
+    public t3(this: &mut Self.T) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fv;
+        *move(x) = *copy(x);
+        return;
+    }
+
+    public t4(this: &mut Self.T, i: bool) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fv;
+        *move(x) = move(i);
+        return;
+    }
+}
+
+//# publish
+
+module 0x42.RTest {
+    struct T{fint: u64, fr: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fr: move(y)};
+    }
+
+    public t1(this: &mut Self.T) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = 0;
+        return;
+    }
+
+    public t2(this: &mut Self.T, i: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = move(i);
+        return;
+    }
+
+    public t3(this: &mut Self.T) {
+        let x: &mut bool;
+        let z: bool;
+    label b0:
+        x = &mut move(this).T::fr;
+        z = true;
+        *move(x) = move(z);
+        return;
+    }
+
+    public t4(this: &mut Self.T, i: bool) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fr;
+        *move(x) = move(i);
+        return;
+    }
+
+    public destroy_t(t: Self.T) {
+        let fint: u64;
+        let fr: bool;
+    label b0:
+        T{ fint, fr } = move(t);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+
+import 0x42.RTest;
+import 0x42.VTest;
+
+entry foo() {
+    let vt: VTest.T;
+    let vref: &mut VTest.T;
+    let rt: RTest.T;
+    let rref: &mut RTest.T;
+label b0:
+    vt = VTest.new(0, false);
+    vref = &mut vt;
+    rt = RTest.new(0, false);
+    rref = &mut rt;
+
+    VTest.t1(copy(vref));
+    RTest.t1(copy(rref));
+
+    VTest.t2(copy(vref), 0);
+    RTest.t2(copy(rref), 0);
+
+    VTest.t3(copy(vref));
+    RTest.t3(copy(rref));
+
+    VTest.t4(move(vref), false);
+    RTest.t4(move(rref), false);
+
+    RTest.destroy_t(move(rt));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.mvir
new file mode 100644
index 000000000..8f450d189
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/inaccessible_borrowed_local.mvir
@@ -0,0 +1,34 @@
+//# run
+module 0x1.m {
+
+entry foo() {
+    let x: vector<u64>;
+    let r: &vector<u64>;
+    label start:
+        jump_if_false (true) end;
+    label if_true:
+        x = vec_pack_0<u64>();
+        r = &x;
+    label end:
+        x = vec_pack_0<u64>();
+        return;
+}
+
+}
+//# run
+module 0x2.m {
+
+entry foo() {
+    let x: vector<u64>;
+    let r: &vector<u64>;
+    label start:
+        x = vec_pack_0<u64>();
+        jump_if_false (true) end;
+    label if_true:
+        r = &x;
+    label end:
+        _ = move(x);
+        return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.mvir
new file mode 100644
index 000000000..a7aa33c4a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/operator_precedence.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+label b0:
+    assert(true || true && false, 99); // "&&" has precedence over "||"
+    assert(true != false && false != true, 100); // "&&" has precedence over comparisons
+    assert(1 | 3 ^ 1 == 3, 101); // binary XOR has precedence over OR
+    assert(2 ^ 3 & 1 == 3, 102); // binary AND has precedence over XOR
+    assert(3 & 3 + 1 == 0, 103); // addition has precedence over binary AND
+    assert(1 + 2 * 3 == 7, 104); // multiplication has precedence over addition
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.mvir
new file mode 100644
index 000000000..bf604e969
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/pack_unpack.mvir
@@ -0,0 +1,31 @@
+//# publish
+module 0x42.Test {
+    struct T { i: u64, b: bool }
+
+    public new_t(): Self.T {
+    label b0:
+        return T { i: 0, b: false };
+    }
+
+    public unpack_t(t: Self.T) {
+        let i: u64;
+        let flag: bool;
+    label b0:
+        T { i, b: flag } = move(t);
+        return;
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x42.Test;
+entry foo() {
+    let t: Test.T;
+label b0:
+    t = Test.new_t();
+    Test.unpack_t(move(t));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.exp
new file mode 100644
index 000000000..893e0f539
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.exp
@@ -0,0 +1,91 @@
+processed 16 tasks
+
+task 0 'run'. lines 1-9:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x1::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x2::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x3::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 31-40:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x4::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 41-50:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x5::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 51-60:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x6::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 61-70:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x7::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 71-80:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x8::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 81-90:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x9::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 91-102:
+Error: Function execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: 0x10::m,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.mvir
new file mode 100644
index 000000000..f68a77337
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/shift_operators.mvir
@@ -0,0 +1,248 @@
+//# run
+module 0x1.m {
+// Number of bits shifted >= total number of bits in the number.
+entry foo() {
+label b0:
+    _ = 0u8 << 8u8;
+    return;
+}
+}
+
+//# run
+module 0x2.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 << 64u8;
+    return;
+}
+
+}
+//# run
+module 0x3.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 << 128u8;
+    return;
+}
+
+}
+//# run
+module 0x4.m {
+
+entry foo() {
+label b0:
+    _ = 0u16 << 16u8;
+    return;
+}
+
+}
+//# run
+module 0x5.m {
+
+entry foo() {
+label b0:
+    _ = 0u32 << 32u8;
+    return;
+}
+
+}
+//# run
+module 0x6.m {
+
+entry foo() {
+label b0:
+    _ = 0u8 >> 8u8;
+    return;
+}
+
+}
+//# run
+module 0x7.m {
+
+entry foo() {
+label b0:
+    _ = 0u64 >> 64u8;
+    return;
+}
+
+}
+//# run
+module 0x8.m {
+
+entry foo() {
+label b0:
+    _ = 0u128 >> 128u8;
+    return;
+}
+
+}
+//# run
+module 0x9.m {
+
+entry foo() {
+label b0:
+    _ = 0u16 >> 16u8;
+    return;
+}
+
+}
+//# run
+module 0x10.m {
+
+entry foo() {
+label b0:
+    _ = 0u32 >> 32u8;
+    return;
+}
+
+}
+
+// Shifting 0 results in 0.
+//# run
+module 0x11.m {
+
+entry foo() {
+label b0:
+    assert(0u8 << 4u8 == 0u8, 1000);
+    assert(0u64 << 1u8 == 0u64, 1001);
+    assert(0u128 << 127u8 == 0u128, 1002);
+    assert(0u16 << 14u8 == 0u16, 1003);
+    assert(0u32 << 31u8 == 0u32, 1004);
+    assert(0u256 << 249u8 == 0u256, 1005);
+
+    assert(0u8 >> 4u8 == 0u8, 1100);
+    assert(0u64 >> 1u8 == 0u64, 1101);
+    assert(0u128 >> 127u8 == 0u128, 1102);
+    assert(0u16 >> 14u8 == 0u16, 1103);
+    assert(0u32 >> 31u8 == 0u32, 1104);
+    assert(0u256 >> 249u8 == 0u256, 1105);
+    return;
+}
+
+}
+
+
+// Shifting by 0 bits results in the same number.
+//# run
+module 0x12.m {
+
+entry foo() {
+label b0:
+    assert(100u8 << 0u8 == 100u8, 2000);
+    assert(43u64 << 0u8 == 43u64, 2001);
+    assert(57348765484584586725315342563424u128 << 0u8 == 57348765484584586725315342563424u128, 2002);
+    assert(1000u16 << 0u8 == 1000u16, 2003);
+    assert(10000u32 << 0u8 == 10000u32, 2004);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 << 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2005);
+
+    assert(100u8 >> 0u8 == 100u8, 2100);
+    assert(43u64 >> 0u8 == 43u64, 2101);
+    assert(57348765484584586725315342563424u128 >> 0u8 == 57348765484584586725315342563424u128, 2102);
+    assert(1000u16 >> 0u8 == 1000u16, 2103);
+    assert(10000u32 >> 0u8 == 10000u32, 2104);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 >> 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2105);
+    return;
+}
+
+}
+
+
+// shl/shr by 1 equivalent to mul/div by 2.
+//# run
+module 0x13.m {
+
+entry foo() {
+label b0:
+    assert(1u8 << 1u8 == 2u8, 3000);
+    assert(7u64 << 1u8 == 14u64, 3001);
+    assert(1000u128 << 1u8 == 2000u128, 3002);
+    assert(3u16 << 1u8 == 6u16, 3003);
+    assert(7u32 << 1u8 == 14u32, 3004);
+    assert(1000u256 << 1u8 == 2000u256, 3005);
+
+    assert(1u8 >>1u8 == 0u8, 3100);
+    assert(7u64 >> 1u8 == 3u64, 3101);
+    assert(1000u128 >> 1u8 == 500u128, 3102);
+    assert(3u16 >> 1u8 == 1u16, 3103);
+    assert(7u32 >> 1u8 == 3u32, 3104);
+    assert(1000u256 >> 1u8 == 500u256, 3105);
+    return;
+}
+
+}
+
+
+// Underflowing results in 0.
+//# run
+module 0x14.m {
+
+entry foo() {
+label b0:
+    assert(1234u64 >> 63u8 == 0u64, 4000);
+    assert(3u8 >> 5u8 == 0u8, 4001);
+    assert(43152365326753472145312542634526753u128 >> 127u8 == 0u128, 4002);
+    assert(1234u16 >> 15u8 == 0u16, 4003);
+    assert(123456u32 >> 31u8 == 0u32, 4004);
+    assert(11579208923731619542357098500868790785326998466564056403945758400791312963993u256 >> 255u8 == 0u256, 4005);
+    return;
+}
+
+}
+
+
+// Overflowing results are truncated.
+//# run
+module 0x15.m {
+
+entry foo() {
+label b0:
+    assert(7u8 << 7u8 == 128u8, 5000);
+    assert(7u64 << 62u8 == 13835058055282163712u64, 5001);
+    assert(2u128 << 127u8 == 0u128, 5002);
+    assert(7u16 << 15u8 == 32768u16, 5003);
+    assert(17u32 << 30u8 == 1073741824u32, 5004);
+    assert(7u256 << 254u8 == 86844066927987146567678238756515930889952488499230423029593188005934847229952u256, 5005);
+    return;
+}
+
+}
+
+
+// Some random tests.
+//# run
+module 0x16.m {
+
+entry foo() {
+label b0:
+    assert(54u8 << 3u8 == 176u8, 6000);
+    assert(5u8 << 2u8 == 20u8, 6001);
+    assert(124u8 << 5u8 == 128u8, 6002);
+
+    assert(326348456u64 << 13u8 == 2673446551552u64, 6100);
+    assert(218u64 << 30u8 == 234075717632u64, 6101);
+    assert(345325745376476456u64 << 47u8 == 2203386117691015168u64, 6102);
+
+    assert(95712896789423756892376u128 << 4u8 == 1531406348630780110278016u128, 6200);
+    assert(8629035907847368941279654523567912314u128 << 77u8 == 317056859699765342273530379836650946560u128, 6201);
+    assert(5742389768935678297185789157531u128 << 10u8 == 5880207123390134576318248097311744u128, 6202);
+    assert(295429678238907658936718926478967892769u128 << 83u8 == 78660438169199498567214234129963941888u128, 6203);
+
+    assert(12u16 << 4u8 == 192u16, 6300);
+    assert(1234u16 << 12u8 == 8192u16, 6301);
+    assert(6553u16 << 15u8 == 32768u16, 6302);
+
+    assert(1234567u32 << 12u8 == 761819136u32, 6400);
+    assert(1234567u32 << 17u8 == 2903375872u32, 6401);
+    assert(12345671u32 << 27u8 == 939524096u32, 6402);
+
+    assert(123u256 << 1u8 == 246u256, 6500);
+    assert(123453u256 << 13u8 == 1011326976u256, 6501);
+    assert(123453678909u256 << 76u8 == 9327896247469005265829994770202624u256, 6502);
+    assert(1234536789093546757803u256 << 168u8 == 461895049882996264654333091841553462264195467433049741837793730775482368u256, 6503);
+    assert(1234536789093546757803786604381691994985672142341299639418u256 << 202u8 == 33658913632735705985908889087832028406806276615240336691180752852867975479296u256, 6504);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.mvir
new file mode 100644
index 000000000..5098385b0
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/simple_arithmetic.mvir
@@ -0,0 +1,15 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let a: u64;
+    let b: u64;
+label b0:
+    a = 2 + 3;
+    assert(copy(a) == 5, 42);
+    b = copy(a) - 1;
+    assert(copy(b) == 4, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.exp b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.mvir
new file mode 100644
index 000000000..c207849e0
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/instructions/vec_copy_nested.mvir
@@ -0,0 +1,112 @@
+//# publish
+module 0x42.DeepCopy {
+    import 0x1.vector;
+
+    struct Config has copy, drop, store { i: u64 }
+    struct Nested has copy, drop, store { c: Self.Config }
+
+    public test_struct_shallow() {
+        let c1: Self.Config;
+        let c2: Self.Config;
+    label b0:
+        c1 = Config { i: 0 };
+        c2 = copy(c1);
+
+        // mutate c1.i to 1
+        *(&mut (&mut c1).Config::i) = 1;
+        // c2.i should still be 0
+        assert(*&(&c2).Config::i == 0, 77);
+
+        // mutate c2.i to 2
+        *(&mut (&mut c2).Config::i) = 2;
+        // c1.i should still be 1
+        assert(*&(&c1).Config::i == 1, 78);
+
+        return;
+    }
+
+    public test_struct_deep() {
+        let n1: Self.Nested;
+        let n2: Self.Nested;
+    label b0:
+        n1 = Nested { c: Config { i: 0 } };
+        n2 = copy(n1);
+
+        // mutate n1.c.i to 1
+        *(&mut (&mut (&mut n1).Nested::c).Config::i) = 1;
+        // n2.c.i should still be 0
+        assert(*&(&(&n2).Nested::c).Config::i == 0, 79);
+        // n1.c.i is 1
+        assert(*&(&(&n1).Nested::c).Config::i == 1, 80);
+
+        // mutate n2.c.i to 2
+        *(&mut (&mut (&mut n2).Nested::c).Config::i) = 2;
+        // n1.c.i should still be 1
+        assert(*&(&(&n1).Nested::c).Config::i == 1, 81);
+        // n2.c.i is 2
+        assert(*&(&(&n2).Nested::c).Config::i == 2, 82);
+
+        return;
+    }
+
+    public test_vector() {
+        let v1: vector<u64>;
+        let v2: vector<u64>;
+    label b0:
+        v1 = vector.empty<u64>();
+        vector.push_back<u64>(&mut v1, 0);
+        v2 = copy(v1);
+        *vector.borrow_mut<u64>(&mut v1, 0) = 1;
+        assert(*vector.borrow<u64>(&v2, 0) == 0, 83);
+
+        *vector.borrow_mut<u64>(&mut v2, 0) = 2;
+        assert(*vector.borrow<u64>(&v1, 0) == 1, 84);
+
+        return;
+    }
+
+    public test_vector_to_struct() {
+        let v1: vector<Self.Config>;
+        let v2: vector<Self.Config>;
+        let c1: Self.Config;
+        let c2: Self.Config;
+        let r1: &mut Self.Config;
+        let r2: &mut Self.Config;
+        let ri1: &mut u64;
+    label b0:
+        c1 = Config { i: 0 };
+        c2 = copy(c1);
+        *(&mut (&mut c2).Config::i) = 1;
+
+        v1 = vector.empty<Self.Config>();
+        vector.push_back<Self.Config>(&mut v1, move(c1));
+        vector.push_back<Self.Config>(&mut v1, move(c2));
+        v2 = copy(v1);
+
+        r1 = vector.borrow_mut<Self.Config>(&mut v1, 0);
+        r2 = vector.borrow_mut<Self.Config>(&mut v2, 0);
+        assert(*&copy(r1).Config::i == 0, 90);
+        assert(*&copy(r1).Config::i == *&move(r2).Config::i, 91);
+        r2 = vector.borrow_mut<Self.Config>(&mut v2, 1);
+        assert(*&copy(r2).Config::i == 1, 91);
+        assert(*&copy(r1).Config::i != *&copy(r2).Config::i, 91);
+        *&mut copy(r1).Config::i = 1;
+        assert(*&copy(r1).Config::i == *&copy(r2).Config::i, 92);
+
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.DeepCopy;
+
+entry foo() {
+label b0:
+    DeepCopy.test_struct_shallow();
+    DeepCopy.test_struct_deep();
+    DeepCopy.test_vector();
+    DeepCopy.test_vector_to_struct();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.mvir
new file mode 100644
index 000000000..aa7c37474
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use.mvir
@@ -0,0 +1,70 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x42.MoneyHolder {
+    import 0x1.Coin;
+
+    struct T { money: Coin.Coin }
+
+    public new(m: Coin.Coin): Self.T {
+    label b0:
+        return T{ money: move(m) };
+    }
+
+    public value(this :&Self.T): u64 {
+        let ref: &Coin.Coin;
+        let val: u64;
+    label b0:
+        ref = &copy(this).T::money;
+        val = Coin.value(move(ref));
+        _ = move(this);
+        return move(val);
+    }
+
+    public destroy_t(t: Self.T) {
+        let money: Coin.Coin;
+    label b0:
+        T{ money } = move(t);
+        Coin.destroy_zero(move(money));
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.MoneyHolder;
+import 0x1.Coin;
+
+entry foo() {
+    let coin: Coin.Coin;
+    let money_holder: MoneyHolder.T;
+    let money_holder_ref: &MoneyHolder.T;
+    let value: u64;
+label b0:
+    coin = Coin.zero();
+    money_holder = MoneyHolder.new(move(coin));
+    money_holder_ref = &money_holder;
+    value = MoneyHolder.value(move(money_holder_ref));
+    assert(copy(value) == 0, 42);
+    MoneyHolder.destroy_t(move(money_holder));
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir
new file mode 100644
index 000000000..d2e5c0a16
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x42.M {
+    public max(a: u64, b: u64): u64 {
+    label b0:
+        jump_if (copy(a) > copy(b)) b2;
+    label b1:
+        return copy(b);
+    label b2:
+        return copy(a);
+    }
+
+    public sum(a: u64, b: u64): u64 {
+        let c: u64;
+    label b0:
+        c = copy(a) + copy(b);
+        return copy(c);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let a: u64;
+    let b: u64;
+    let c: u64;
+    let d: u64;
+label b0:
+    a = 10;
+    b = 2;
+    c = M.max(copy(a), copy(b));
+    d = M.sum(copy(a), copy(b));
+    assert(copy(c) == 10, 42);
+    assert(copy(d) == 12, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir
new file mode 100644
index 000000000..6ddeb8dba
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x42.M {
+    public case(a: u64, b: bool): u64 {
+    label b0:
+        jump_if (copy(b)) b2;
+    label b1:
+        return 42;
+    label b2:
+        return copy(a);
+    label b3:
+        return 112;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let a: u64;
+label b0:
+    a = 10;
+    a = M.case(move(a), false);
+    assert(copy(a) == 42, 41);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir
new file mode 100644
index 000000000..d4047b58f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x42.M {
+    public id3(a: u64, b: bool, c: address): u64 * bool * address {
+    label b0:
+        return move(a), move(b), move(c);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+    let a: u64;
+    let b: bool;
+    let c: address;
+label b0:
+    a = 10;
+    b = false;
+    c = 0x0;
+
+    a, b, c = M.id3(move(a), move(b), move(c));
+    assert(move(a) == 10, 42);
+    assert(move(b) == false, 43);
+    assert(move(c) == 0x0, 44);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.mvir
new file mode 100644
index 000000000..8f0d93870
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/publish_two_modules.mvir
@@ -0,0 +1,96 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x42.MoneyHolder {
+    import 0x1.Coin;
+
+    struct T { money: Coin.Coin }
+
+    public new(m: Coin.Coin): Self.T {
+    label b0:
+        return T{ money: move(m) };
+    }
+
+    public value(this :&Self.T): u64 {
+        let ref: &Coin.Coin;
+        let val: u64;
+    label b0:
+        ref = &copy(this).T::money;
+        val = Coin.value(move(ref));
+        _ = move(this);
+        return move(val);
+    }
+
+    public destroy_t(t: Self.T) {
+        let money: Coin.Coin;
+    label b0:
+        T{ money } = move(t);
+        Coin.destroy_zero(move(money));
+        return;
+    }
+}
+
+//# publish
+module 0x42.Bar {
+        struct T has drop {baz: u64}
+        public new(m: u64): Self.T {
+        label b0:
+            return T{baz: move(m)};
+        }
+        public value(this: &Self.T): u64 {
+            let ref: &u64;
+        label b0:
+            ref = &move(this).T::baz;
+            return *move(ref);
+        }
+}
+
+//# run
+module 0x42.m {
+import 0x42.MoneyHolder;
+import 0x42.Bar;
+import 0x1.Coin;
+
+entry foo() {
+    let coin: Coin.Coin;
+    let money_holder: MoneyHolder.T;
+    let money_holder_ref: &MoneyHolder.T;
+    let value: u64;
+    let v: u64;
+    let bar: Bar.T;
+    let bar_ref: &Bar.T;
+    let v2: u64;
+label b0:
+    coin = Coin.zero();
+    money_holder = MoneyHolder.new(move(coin));
+    money_holder_ref = &money_holder;
+
+    value = MoneyHolder.value(move(money_holder_ref));
+    assert(copy(value) == 0, 42);
+    MoneyHolder.destroy_t(move(money_holder));
+
+    v = 1;
+    bar = Bar.new(copy(v));
+    bar_ref = &bar;
+    v2 = Bar.value(move(bar_ref));
+    assert(copy(v) == copy(v2), 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.exp b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.exp
new file mode 100644
index 000000000..c6e31f3df
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 2 'publish'. lines 17-31:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000043.M.foo
+
+task 3 'run'. lines 33-42:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000042.M.run
+
+task 5 'run'. lines 52-69:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000044.M
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.mvir
new file mode 100644
index 000000000..dcdebd065
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/module_publishing/use_modules_published.mvir
@@ -0,0 +1,69 @@
+//# publish
+module 0x42.M {
+    public foo(): u64 {
+    label b0:
+        return 5;
+    }
+}
+
+//# publish
+module 0x43.M {
+    public bar(): u64 {
+    label b0:
+        return 7;
+    }
+}
+
+//# publish
+module 0x44.M {
+    import 0x43.M as M1;
+    import 0x44.M as M2;
+
+    public run() {
+        let x: u64;
+    label b0:
+        x = M1.foo();
+        assert(move(x) == 5, 42);
+        x = M2.bar();
+        assert(move(x) == 7, 42);
+        return;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M;
+
+entry foo() {
+label b0:
+    M.run();
+    return;
+}
+}
+
+//# publish
+module 0x45.M {
+    public baz(): u64 {
+    label b0:
+        return 9;
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.M as M1;
+import 0x43.M as M2;
+import 0x44.M as M3;
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = M1.foo();
+    assert(move(x) == 5, 42);
+    x = M2.bar();
+    assert(move(x) == 7, 42);
+    x = M3.baz();
+    assert(move(x) == 9, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.exp
new file mode 100644
index 000000000..a00d200ac
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Hash'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::Hash,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 7-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000043::Hash'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x43::Hash,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 12-15:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000044::Hash'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x44::Hash,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir
new file mode 100644
index 000000000..22406543c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir
@@ -0,0 +1,15 @@
+//# publish
+module 0x42.Hash {
+    native public sha2_256(data: vector<u8>): vector<u8>;
+    native public sha3_256(data: vector<u8>): vector<u8>;
+}
+
+//# publish
+module 0x43.Hash {
+    native public sha2_256(data: vector<u8>): vector<u8>;
+}
+
+//# publish
+module 0x44.Hash {
+    native public sha3_256(data: vector<u8>): vector<u8>;
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.exp
new file mode 100644
index 000000000..58c537005
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-5:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::No'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::No,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.mvir
new file mode 100644
index 000000000..a147519a1
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/non_existant_native_function.mvir
@@ -0,0 +1,5 @@
+//# publish
+module 0x42.No {
+    // error as there is no native function to link against
+    native public made_up(x: u64): u64;
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.mvir
new file mode 100644
index 000000000..a34e16223
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_module.mvir
@@ -0,0 +1,72 @@
+//# publish
+module 0x1.Coin {
+    struct Coin has store { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        _ = ();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    import 0x1.Coin;
+    import 0x1.vector;
+
+    struct Coins has key { f: vector<Coin.Coin> }
+
+    public new(): Self.Coins {
+        let coin_vec: vector<Coin.Coin>;
+        let coins: Self.Coins;
+    label b0:
+        coin_vec = vector.empty<Coin.Coin>();
+        return Coins { f: move(coin_vec) };
+    }
+
+    public put_coin(coins: &mut Self.Coins, coin: Coin.Coin) {
+        let v_ref: &mut vector<Coin.Coin>;
+    label b0:
+        v_ref = &mut move(coins).Coins::f;
+        vector.push_back<Coin.Coin>(move(v_ref), move(coin));
+        return;
+    }
+
+    public destroy(coins: Self.Coins) {
+        let f: vector<Coin.Coin>;
+    label b0:
+        Coins { f: f } = move(coins);
+    label loop:
+        jump_if (vec_len<Coin.Coin>(&f) == 0) end;
+        Coin.destroy(vec_pop_back<Coin.Coin>(&mut f));
+        jump loop;
+    label end:
+        vec_unpack_0<Coin.Coin>(move(f));
+        return;
+    }
+
+}
+
+//# publish
+module 0x42.Test {
+    import 0x42.M;
+    import 0x1.Coin;
+    test() {
+        let coins: M.Coins;
+    label b0:
+        coins = M.new();
+        M.put_coin(&mut coins, Coin.zero());
+        M.destroy(move(coins));
+        return;
+    }
+}
+
+//# run 0x42::Test::test
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp
new file mode 100644
index 000000000..c7ff68dbe
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir
new file mode 100644
index 000000000..24461b545
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x42.M {
+    import 0x1.vector;
+
+    struct R has store { b: bool}
+
+    f() {
+        let v: vector<Self.R>;
+    label b0:
+        v = vector.empty<Self.R>();
+        // error even though vector is empty, doesn't have drop
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir
new file mode 100644
index 000000000..15e0a92a2
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.M {
+    import 0x1.vector;
+
+    f() {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.exp b/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.exp
new file mode 100644
index 000000000..966d133be
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.mvir
new file mode 100644
index 000000000..9d12bf2d5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/native_structs/non_existant_native_struct.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x42.M {
+    // error, missing dep
+    native struct T;
+    native struct T2;
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.exp b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.mvir
new file mode 100644
index 000000000..e08ad0438
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/direct_recursion.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x42.Math {
+
+    public sum_(n: u64, acc: u64): u64 {
+        let new_n: u64;
+        let new_acc: u64;
+        let new_sum: u64;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return move(acc);
+    label b2:
+        new_n = copy(n) - 1;
+        new_acc = move(acc) + move(n);
+        new_sum = Self.sum_(move(new_n), move(new_acc));
+        return move(new_sum);
+    }
+
+    public sum(n: u64): u64 {
+        let result: u64;
+    label b0:
+        result = Self.sum_(move(n), 0);
+        return move(result);
+    }
+
+}
+
+//# run
+module 0x42.m {
+import 0x42.Math;
+
+entry foo() {
+    let sum1: u64;
+    let sum2: u64;
+label b0:
+    sum1 = Math.sum(5);
+    assert(move(sum1) == 15, 66);
+
+    sum2 = Math.sum(7);
+    assert(move(sum2) == 28, 67);
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.exp b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.mvir
new file mode 100644
index 000000000..d10b4ba60
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/mutual_recursion.mvir
@@ -0,0 +1,51 @@
+//# publish
+module 0x42.Math {
+
+    public even(n: u64): bool {
+        let is_pred_odd: bool;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return true;
+    label b2:
+        is_pred_odd = Self.odd(move(n) - 1);
+        return move(is_pred_odd);
+    }
+
+    public odd(n: u64): bool {
+        let is_pred_even: bool;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        is_pred_even = Self.even(move(n) - 1);
+        return move(is_pred_even);
+    }
+}
+
+//# run
+module 0x42.m {
+import 0x42.Math;
+
+entry foo() {
+    let zero_even: bool;
+    let zero_odd: bool;
+    let ten_even: bool;
+    let ten_odd: bool;
+label b0:
+    zero_even = Math.even(0);
+    assert(move(zero_even), 50);
+
+    zero_odd = Math.odd(0);
+    assert(!move(zero_odd), 51);
+
+    ten_even = Math.even(10);
+    assert(move(ten_even), 52);
+
+    ten_odd = Math.odd(10);
+    assert(!move(ten_odd), 53);
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
new file mode 100644
index 000000000..0eb72733a
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
@@ -0,0 +1,31 @@
+processed 5 tasks
+
+task 1 'run'. lines 75-75:
+return values: { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { { true } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } } }
+
+task 2 'run'. lines 77-77:
+Error: Function execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 2)],
+}
+
+task 3 'run'. lines 79-79:
+Error: Function execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 4 'run'. lines 81-81:
+Error: Function execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
new file mode 100644
index 000000000..8b9f4b38e
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
@@ -0,0 +1,81 @@
+//# publish
+module 0x42.M {
+    struct Box<T> has key, store { x: T }
+    struct Box3<T> has store { x: Self.Box<Self.Box<T>> }
+    struct Box7<T> has store { x: Self.Box3<Self.Box3<T>> }
+    struct Box15<T> has store { x: Self.Box7<Self.Box7<T>> }
+    struct Box31<T> has store { x: Self.Box15<Self.Box15<T>> }
+    struct Box63<T> has store { x: Self.Box31<Self.Box31<T>> }
+    struct Box127<T> has key, store { x: Self.Box63<Self.Box63<T>> }
+    struct Box128<T> has key, store { x: Self.Box127<T> }
+    struct Box255<T> has key, store { x: Self.Box127<Self.Box127<T>> }
+
+    public box3<T>(x: T): Self.Box3<T> {
+    label b0:
+        return Box3<T> { x: Box<Self.Box<T>> { x: Box<T> { x: move(x) } } };
+    }
+
+    public box7<T>(x: T): Self.Box7<T> {
+    label b0:
+        return Box7<T> { x: Self.box3<Self.Box3<T>>(Self.box3<T>(move(x))) };
+    }
+
+    public box15<T>(x: T): Self.Box15<T> {
+    label b0:
+        return Box15<T> { x: Self.box7<Self.Box7<T>>(Self.box7<T>(move(x))) };
+    }
+
+    public box31<T>(x: T): Self.Box31<T> {
+    label b0:
+        return Box31<T> { x: Self.box15<Self.Box15<T>>(Self.box15<T>(move(x))) };
+    }
+
+    public box63<T>(x: T): Self.Box63<T> {
+    label b0:
+        return Box63<T> { x: Self.box31<Self.Box31<T>>(Self.box31<T>(move(x))) };
+    }
+
+    public box127<T>(x: T): Self.Box127<T> {
+    label b0:
+        return Box127<T> { x: Self.box63<Self.Box63<T>>(Self.box63<T>(move(x))) };
+    }
+
+    public box128<T>(x: T): Self.Box128<T> {
+    label b0:
+        return Box128<T> { x: Self.box127<T>(move(x)) };
+    }
+
+    public box255<T>(x: T): Self.Box255<T> {
+    label b0:
+        return Box255<T> { x: Self.box127<Self.Box127<T>>(Self.box127<T>(move(x))) };
+    }
+
+    public publish_127(): Self.Box127<bool> {
+    label b0:
+        return Self.box127<bool>(true);
+    }
+
+
+    public publish_128(): Self.Box128<bool> {
+    label b0:
+        return Self.box128<bool>(true);
+    }
+
+    public publish_256(): Self.Box255<bool> {
+    label b0:
+        return Self.box255<bool>(true);
+    }
+
+    public publish_257(): Self.Box<Self.Box255<bool>> {
+    label b0:
+        return Box<Self.Box255<bool>> { x: Self.box255<bool>(true) };
+    }
+}
+
+//# run 0x42::M::publish_127
+
+//# run 0x42::M::publish_128
+
+//# run 0x42::M::publish_256
+
+//# run 0x42::M::publish_257
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.exp b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
new file mode 100644
index 000000000..a6db25896
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 72-81:
+Error: Function execution failed with VMError: {
+    major_status: TOO_MANY_TYPE_NODES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(48), 0)],
+}
+
+task 2 'run'. lines 83-93:
+Error: Function execution failed with VMError: {
+    major_status: TOO_MANY_TYPE_NODES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(49), 0)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir
new file mode 100644
index 000000000..66a7ce007
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir
@@ -0,0 +1,93 @@
+//# publish
+module 0x42.M {
+    struct Foo<T> { x: bool }
+    public f0<T>() { label b0: return; }
+    public f3<T>() { label b0: Self.f0<Self.Foo<Self.Foo<Self.Foo<T>>>>(); return; }
+    public f7<T>() { label b0: Self.f3<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f11<T>() { label b0: Self.f7<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f15<T>() { label b0: Self.f11<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f19<T>() { label b0: Self.f15<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f23<T>() { label b0: Self.f19<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f27<T>() { label b0: Self.f23<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f31<T>() { label b0: Self.f27<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f35<T>() { label b0: Self.f31<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f39<T>() { label b0: Self.f35<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f43<T>() { label b0: Self.f39<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f47<T>() { label b0: Self.f43<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f51<T>() { label b0: Self.f47<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f55<T>() { label b0: Self.f51<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f59<T>() { label b0: Self.f55<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f63<T>() { label b0: Self.f59<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f67<T>() { label b0: Self.f63<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f71<T>() { label b0: Self.f67<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f75<T>() { label b0: Self.f71<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f79<T>() { label b0: Self.f75<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f83<T>() { label b0: Self.f79<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f87<T>() { label b0: Self.f83<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f91<T>() { label b0: Self.f87<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f95<T>() { label b0: Self.f91<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f99<T>() { label b0: Self.f95<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f103<T>() { label b0: Self.f99<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f107<T>() { label b0: Self.f103<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f111<T>() { label b0: Self.f107<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f115<T>() { label b0: Self.f111<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f119<T>() { label b0: Self.f115<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f123<T>() { label b0: Self.f119<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f127<T>() { label b0: Self.f123<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f131<T>() { label b0: Self.f127<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f135<T>() { label b0: Self.f131<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f139<T>() { label b0: Self.f135<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f143<T>() { label b0: Self.f139<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f147<T>() { label b0: Self.f143<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f151<T>() { label b0: Self.f147<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f155<T>() { label b0: Self.f151<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f159<T>() { label b0: Self.f155<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f163<T>() { label b0: Self.f159<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f167<T>() { label b0: Self.f163<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f171<T>() { label b0: Self.f167<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f175<T>() { label b0: Self.f171<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f179<T>() { label b0: Self.f175<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f183<T>() { label b0: Self.f179<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f187<T>() { label b0: Self.f183<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f191<T>() { label b0: Self.f187<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f195<T>() { label b0: Self.f191<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f199<T>() { label b0: Self.f195<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f203<T>() { label b0: Self.f199<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f207<T>() { label b0: Self.f203<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f211<T>() { label b0: Self.f207<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f215<T>() { label b0: Self.f211<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f219<T>() { label b0: Self.f215<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f223<T>() { label b0: Self.f219<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f227<T>() { label b0: Self.f223<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f231<T>() { label b0: Self.f227<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f235<T>() { label b0: Self.f231<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f239<T>() { label b0: Self.f235<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f243<T>() { label b0: Self.f239<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f247<T>() { label b0: Self.f243<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f251<T>() { label b0: Self.f247<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f255<T>() { label b0: Self.f251<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+}
+// check: "Keep(EXECUTED)"
+
+//# run
+module 0x1.m {
+import 0x42.M;
+
+entry foo() {
+label b0:
+    M.f255<u8>();
+    return;
+}
+}
+
+//# run
+module 0x2.m {
+import 0x42.M;
+
+entry foo() {
+label b0:
+    // hits VM_MAX_TYPE_DEPTH_REACH
+    M.f255<M.Foo<u8>>();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.exp
new file mode 100644
index 000000000..756baf943
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 1 'run'. lines 25-25:
+Error: Function execution failed with VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 27-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.mvir
new file mode 100644
index 000000000..fd08cbacc
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/borrow_in_loop.mvir
@@ -0,0 +1,45 @@
+//# publish
+module 0x42.m {
+
+struct S has copy, drop { f: u64 }
+public foo() {
+    let x: Self.S;
+    let y: Self.S;
+    let z: u64;
+    let r: &Self.S;
+    let f: &u64;
+    label l0:
+        x = S { f: 0 };
+        z = 0;
+        r = &x;
+        f = &z;
+    label l1:
+        y = S { f: 1 };
+        _ = *copy(r);
+        r = &y;
+        f = &copy(r).S::f;
+        jump l1;
+}
+}
+
+//# run 0x42::m::foo --gas-budget 100000
+
+//# run --gas-budget 100000
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+    let r: &u64;
+    label l0:
+        x = 0;
+        r = &x;
+    label l1:
+        y = 0;
+        z = *copy(r);
+        r = &y;
+        jump l1;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.mvir
new file mode 100644
index 000000000..e0d0a1fea
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_borrow_local_ok.mvir
@@ -0,0 +1,12 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+label b0:
+    x = 5;
+    assert(*&mut x == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.mvir
new file mode 100644
index 000000000..b4e165448
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_module_ok.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x1.M {
+    struct T has drop {v : u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public value (this: &mut Self.T) : u64 {
+        let b: &u64;
+    label b0:
+        b = &move(this).T::v;
+        return *move(b);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let x: M.T;
+    let y: &mut M.T;
+    let z: u64;
+label b0:
+    x = M.new(5);
+    y = &mut x;
+    z = M.value(move(y));
+    assert(move(z) == 5, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.mvir
new file mode 100644
index 000000000..26be14a6c
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_move_ok.mvir
@@ -0,0 +1,14 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &x;
+    assert(*move(x_ref) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.mvir
new file mode 100644
index 000000000..6c6d636c4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/deref_parens_ok.mvir
@@ -0,0 +1,16 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let x_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &x;
+    assert(*(copy(x_ref)) == 5, 42);
+    assert(*(move(x_ref)) == 5, 42);
+    assert(*(&mut x) == 5, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.mvir
new file mode 100644
index 000000000..95c3f9e37
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/drop_ref.mvir
@@ -0,0 +1,13 @@
+//# run --signers 0x1
+module 0x42.m {
+
+entry foo(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&mut u);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.mvir
new file mode 100644
index 000000000..73af8a208
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mixed_lvalue.mvir
@@ -0,0 +1,57 @@
+//# publish
+module 0x1.A {
+
+    struct S { f: u64 }
+
+    four(): u64 * u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2, 3;
+    }
+
+    public mixed() {
+        let x: u64;
+        let r: u64;
+        let r_ref: &mut u64;
+        let s: Self.S;
+    label b0:
+        r = 0;
+        r_ref = &mut r;
+        s = S { f: 0 };
+
+        _, x, *copy(r_ref), *&mut (&mut s).S::f = Self.four();
+        assert(move(x) == 1, 42);
+        assert(*copy(r_ref) == 2, 42);
+        assert(*&(&s).S::f == 3, 42);
+
+        *&mut (&mut s).S::f, _, x, *copy(r_ref) = Self.four();
+        assert(move(x) == 2, 42);
+        assert(*copy(r_ref) == 3, 42);
+        assert(*&(&s).S::f == 0, 42);
+
+        *copy(r_ref), *&mut (&mut s).S::f, _, x = Self.four();
+        assert(move(x) == 3, 42);
+        assert(*copy(r_ref) == 0, 42);
+        assert(*&(&s).S::f == 1, 42);
+
+        x, *copy(r_ref), *&mut (&mut s).S::f, _ = Self.four();
+        assert(move(x) == 0, 42);
+        assert(*move(r_ref) == 1, 42);
+        assert(*&(&s).S::f == 2, 42);
+
+        S { f: r } = move(s);
+
+        return;
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+label b0:
+    A.mixed();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.mvir
new file mode 100644
index 000000000..1661b1cc1
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_borrow_local_ok.mvir
@@ -0,0 +1,13 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+label b0:
+    v = 5;
+    *&mut v = 0;
+    assert(copy(v) == 0, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.mvir
new file mode 100644
index 000000000..4ab212322
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_copy_ok.mvir
@@ -0,0 +1,17 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &mut u64;
+label b0:
+    v = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    *copy(ref_v) = 42;
+    assert(*move(ref_v) == 42, 42);
+    assert(copy(v) == 42, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.mvir
new file mode 100644
index 000000000..e50393645
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_move_ok.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.B {
+    struct T has drop {g: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{g: move(v)};
+    }
+
+    public change(this: &mut Self.T) {
+        let g: &mut u64;
+    label b0:
+        g = &mut move(this).T::g;
+        *move(g) = 3;
+        return;
+    }
+
+    public get(this: &mut Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &move(this).T::g;
+        return *move(x);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.B;
+
+entry foo() {
+    let x: B.T;
+    let y: u64;
+label b0:
+    x = B.new(1);
+    B.change(&mut x);
+    y = B.get(&mut x);
+    assert(move(y) == 3, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.exp b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.mvir
new file mode 100644
index 000000000..2f1a768c5
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/references/mutate_parens_ok.mvir
@@ -0,0 +1,18 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let v: u64;
+    let ref_v: &mut u64;
+label b0:
+    v = 0;
+    *(&mut v) = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    *(copy(ref_v)) = 42;
+    assert(*move(ref_v) == 42, 42);
+    assert(copy(v) == 42, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir
new file mode 100644
index 000000000..638dc3d01
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x1.M {
+    public foo(u: u64): u64 * u64 * u64 {
+        let twice: u64;
+        let quadruple: u64;
+    label b0:
+        twice = 2 * copy(u);
+        quadruple = 4 * copy(u);
+        return move(u), move(twice), move(quadruple);
+    }
+
+    public bar(): u64 {
+    label b0:
+        return 2;
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.M;
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x, y, z = M.foo(5) + M.bar();
+    assert(move(x) == 5, 42);
+    assert(move(y) == 10, 42);
+    assert(move(z) == 22, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir
new file mode 100644
index 000000000..b6e85a162
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir
@@ -0,0 +1,21 @@
+//# run
+module 0x42.m {
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+    let z_var: u64;
+label b0:
+    x, y = (4, 5);
+    z = (6);
+    z_var = 6;
+
+    assert(move(x) == 4, 42);
+    assert(move(y) == 5, 42);
+    assert(move(z) == 6, 42);
+    assert(move(z_var) == 6, 42);
+    return;
+}
+
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir
new file mode 100644
index 000000000..23de15701
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x1.A {
+    public ones_tens(f: u64): u64 * u64 {
+        let k: u64;
+        let m: u64;
+    label b0:
+        k = copy(f) % 10;
+        m = (move(f) % 100) - copy(k);
+        return move(k), move(m);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x = 143;
+    y, z = A.ones_tens(move(x));
+    assert(move(y) == 3, 42);
+    assert(move(z) == 40, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir
new file mode 100644
index 000000000..a5ab28c31
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.A {
+    public div_by_two(v: u64): bool {
+    label b0:
+        jump_if (move(v) % 2 == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        return true;
+    }
+
+    public div_by_three(k: u64): bool {
+    label b0:
+        jump_if (move(k) % 3 == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        return true;
+    }
+
+    public div_by_six(b: bool): bool {
+    label b0:
+        return move(b);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let x: u64;
+    let y: bool;
+label b0:
+    x = 42;
+    y = A.div_by_six(A.div_by_two(copy(x)) && A.div_by_three(move(x)));
+    assert(move(y) == true, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.mvir
new file mode 100644
index 000000000..9e2d582a4
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/function_composition.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x1.Test {
+    public foo(v: u64): u64 * u64 {
+        let one_less: u64;
+        let one_more: u64;
+    label b0:
+        one_less = copy(v) - 1;
+        one_more = move(v) + 1;
+        return move(one_less), move(one_more);
+    }
+
+    public baz(k: u64, l: u64, m: u64) : u64 {
+        let z: u64;
+    label b0:
+        z =  move(k) + move(l) + move(m);
+        return move(z);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.Test;
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+    let x0: u64;
+    let x1 : u64;
+label b0:
+    x = 7;
+    x0, x1 = Test.foo(copy(x));
+    assert(move(x0) == 6, 42);
+    assert(move(x1) == 8, 42);
+
+    y = Test.baz(Test.foo(move(x)), 0);
+    assert(move(y) == 14, 42);
+
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir
new file mode 100644
index 000000000..7c91b3b26
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir
@@ -0,0 +1,57 @@
+//# publish
+module 0x1.A {
+    struct T has drop {value: u64, even: bool}
+
+    public new(): Self.T {
+    label b0:
+        return T {value: 0, even: true};
+    }
+
+    public get_value(this: &mut Self.T): u64 {
+        let v: &u64;
+    label b0:
+        v = &move(this).T::value;
+        return *move(v);
+    }
+
+    public get_parity(this: &mut Self.T): bool {
+        let b: &bool;
+    label b0:
+        b = &move(this).T::even;
+        return *move(b);
+    }
+
+    public change_parity(number: u64, parity: bool): u64 * bool {
+        let n: u64;
+        let p: bool;
+    label b0:
+        n = move(number) + 1;
+        jump_if (move(parity)) b2;
+    label b1:
+        p = true;
+        jump b3;
+    label b2:
+        p = false;
+        jump b3;
+    label b3:
+        return move(n), move(p);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let x: A.T;
+    let y: u64;
+    let z: bool;
+label b0:
+    x = A.new();
+    y, z = A.change_parity(A.get_value(&mut x), A.get_parity(&mut x));
+    assert(move(y) == 1, 42);
+    assert(move(z) == false, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir
new file mode 100644
index 000000000..95159be8b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x1.A {
+    struct T has drop {value: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{value: move(v)};
+    }
+
+    public add_one(this: &mut Self.T): u64 {
+        let b: &u64;
+    label b0:
+        b = &move(this).T::value;
+        return *move(b) + 1;
+    }
+
+    public add_two(v: u64): u64 {
+    label b0:
+        return move(v) + 2;
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let z: u64;
+    let x: A.T;
+label b0:
+    x = A.new(5);
+    z = A.add_two(A.add_two(A.add_one(&mut x)));
+    assert(move(z) == 10, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir
new file mode 100644
index 000000000..fc5e86cf6
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.A {
+    public sum(o: u64, k: u64, t: u64): u64 {
+    label b0:
+        return move(o) + move(k) + move(t);
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+    let s: u64;
+label b0:
+    (3, 4, 3);
+    s = A.sum();
+    assert(move(s) == 10, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.mvir
new file mode 100644
index 000000000..ae5a2d1e0
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/pop_weird.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x1.A {
+    three(): u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2;
+    }
+
+    public pop() {
+    label b0:
+        Self.three();
+        _, _ = ();
+        _ = ();
+        return;
+    }
+}
+
+
+//# run
+module 0x42.m {
+import 0x1.A;
+
+entry foo() {
+label b0:
+    A.pop();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir
new file mode 100644
index 000000000..3e0ad2170
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x1.A {
+    public push_u64(): u64  {
+    label b0:
+        return 42;
+    }
+
+    public push_bool(): bool {
+    label b0:
+        return true;
+    }
+
+    public foo(u: u64, b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return move(u) + 1;
+    }
+}
+
+
+//# run
+module 0x42.m {
+
+import 0x1.A;
+
+entry foo() {
+    let ans: u64;
+label b0:
+    (A.push_u64(), A.push_bool());
+    ans = A.foo();
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir
new file mode 100644
index 000000000..98e21227b
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x1.A {
+    public push_u64(): u64  {
+    label b0:
+        return 42;
+    }
+
+    public parity(u: u64): bool {
+    label b0:
+        return (move(u) % 2 == 0);
+    }
+
+    public foo(u: u64, b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return move(u) + 1;
+    }
+}
+
+
+//# run
+module 0x42.m {
+
+import 0x1.A;
+
+entry foo() {
+    let k: u64;
+    let ans: u64;
+label b0:
+    k = 101;
+    (A.push_u64());
+    ans = A.foo(A.parity(move(k)));
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir
new file mode 100644
index 000000000..a70661289
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x1.A {
+    public foo(t: u64): u64 * u64 {
+        let k: u64;
+    label b0:
+        jump_if (copy(t) % 2 == 0) b2;
+    label b1:
+        k = 3 * copy(t);
+        jump b3;
+    label b2:
+        k = 2 * copy(t);
+        jump b3;
+    label b3:
+        return (move(t), move(k) + 1);
+    }
+}
+
+
+//# run
+module 0x42.m {
+
+import 0x1.A;
+
+entry foo() {
+    let y: u64;
+    let z: u64;
+label b0:
+    y, z = A.foo(10);
+    assert(move(y) == 10, 42);
+    assert(move(z) == 21, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir
new file mode 100644
index 000000000..8c6f8b6da
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x1.A {
+    public foo(t: u64): u64 * u64 {
+    label b0:
+       return (copy(t), 2 * move(t));
+    }
+
+    public bar(k: u64): u64 * u64 {
+    label b0:
+        jump_if (copy(k) != 1) b2;
+    label b1:
+        return 3 * Self.foo(move(k));
+    label b2:
+        return Self.foo(copy(k));
+    }
+}
+
+
+//# run
+module 0x1.m {
+
+import 0x1.A;
+
+entry foo() {
+    let x: u64;
+    let y: u64;
+
+    let u: u64;
+    let v: u64;
+label b0:
+    x, y = A.bar(10);
+    u, v = A.bar(1);
+
+    assert(move(x) == 10, 42);
+    assert(move(y) == 20, 42);
+    assert(move(u) == 3, 42);
+    assert(move(v) == 2, 42);
+    return;
+}
+}
diff --git a/vendors/move/crates/move-vm-transactional-tests/tests/tests.rs b/vendors/move/crates/move-vm-transactional-tests/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/move-vm-transactional-tests/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/move-vm-types/Cargo.toml b/vendors/move/crates/move-vm-types/Cargo.toml
new file mode 100644
index 000000000..103f10ecb
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "move-vm-types"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Types for Move VM"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+proptest = { workspace = true, optional = true }
+serde = { workspace = true, features = ["derive", "rc"] }
+smallvec.workspace = true
+
+bcs.workspace = true
+
+move-core-types.workspace = true
+move-binary-format.workspace = true
+move-vm-profiler.workspace = true
+
+[dev-dependencies]
+proptest.workspace = true
+
+[features]
+default = []
+fuzzing = ["proptest", "move-binary-format/fuzzing"]
diff --git a/vendors/move/crates/move-vm-types/src/data_store.rs b/vendors/move/crates/move-vm-types/src/data_store.rs
new file mode 100644
index 000000000..716ccc600
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/data_store.rs
@@ -0,0 +1,71 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    loaded_data::runtime_types::Type,
+    values::{GlobalValue, Value},
+};
+use move_binary_format::errors::{PartialVMResult, VMResult};
+use move_core_types::{
+    account_address::AccountAddress, gas_algebra::NumBytes, identifier::IdentStr,
+    language_storage::ModuleId, runtime_value::MoveTypeLayout,
+};
+
+/// Provide an implementation for bytecodes related to data with a given data store.
+///
+/// The `DataStore` is a generic concept that includes both data and events.
+/// A default implementation of the `DataStore` is `TransactionDataCache` which provides
+/// an in memory cache for a given transaction and the atomic transactional changes
+/// proper of a script execution (transaction).
+pub trait DataStore {
+    // ---
+    // StateStore operations
+    // ---
+
+    /// Try to load a resource from remote storage and create a corresponding GlobalValue
+    /// that is owned by the data store.
+    fn load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)>;
+
+    /// The link context identifies the mapping from runtime `ModuleId`s to the `ModuleId`s in
+    /// storage that they are loaded from as returned by `relocate`.  Implementors of `DataStore`
+    /// are required to keep the link context stable for the duration of
+    /// `Interpreter::execute_main`.
+    fn link_context(&self) -> AccountAddress;
+
+    /// Translate the runtime `module_id` to the on-chain `ModuleId` that it should be loaded from.
+    fn relocate(&self, module_id: &ModuleId) -> PartialVMResult<ModuleId>;
+
+    /// Translate the runtime fully-qualified struct name to the on-chain `ModuleId` that originally
+    /// defined that type.
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> PartialVMResult<ModuleId>;
+
+    /// Get the serialized format of a `CompiledModule` given a `ModuleId`.
+    fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>>;
+
+    /// Publish a module.
+    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()>;
+
+    // ---
+    // EventStore operations
+    // ---
+
+    /// Emit an event to the EventStore
+    fn emit_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<()>;
+
+    fn events(&self) -> &Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)>;
+}
diff --git a/vendors/move/crates/move-vm-types/src/gas.rs b/vendors/move/crates/move-vm-types/src/gas.rs
new file mode 100644
index 000000000..bb79e4285
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/gas.rs
@@ -0,0 +1,468 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::views::{TypeView, ValueView};
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    gas_algebra::{InternalGas, NumArgs, NumBytes},
+    language_storage::ModuleId,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+
+/// Enum of instructions that do not need extra information for gas metering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum SimpleInstruction {
+    Nop,
+    Ret,
+
+    BrTrue,
+    BrFalse,
+    Branch,
+
+    LdU8,
+    LdU64,
+    LdU128,
+    LdTrue,
+    LdFalse,
+
+    FreezeRef,
+    MutBorrowLoc,
+    ImmBorrowLoc,
+    ImmBorrowField,
+    MutBorrowField,
+    ImmBorrowFieldGeneric,
+    MutBorrowFieldGeneric,
+
+    CastU8,
+    CastU64,
+    CastU128,
+
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+
+    BitOr,
+    BitAnd,
+    Xor,
+    Shl,
+    Shr,
+
+    Or,
+    And,
+    Not,
+
+    Lt,
+    Gt,
+    Le,
+    Ge,
+
+    Abort,
+
+    LdU16,
+    LdU32,
+    LdU256,
+    CastU16,
+    CastU32,
+    CastU256,
+}
+
+/// Trait that defines a generic gas meter interface, allowing clients of the Move VM to implement
+/// their own metering scheme.
+pub trait GasMeter {
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()>;
+
+    fn charge_pop(&mut self, popped_val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_call(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_call_generic(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()>;
+
+    fn charge_ld_const_after_deserialization(&mut self, val: impl ValueView)
+        -> PartialVMResult<()>;
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_read_ref(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        old_val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_len(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_push_back(
+        &mut self,
+        ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pop_back(
+        &mut self,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the elements
+    fn charge_vec_unpack(
+        &mut self,
+        ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the two elements
+    fn charge_vec_swap(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    /// Charges for loading a resource from storage. This is only called when the resource is not
+    /// cached.
+    /// - `Some(n)` means `n` bytes are loaded.
+    /// - `None` means a load operation is performed but the resource does not exist.
+    ///
+    /// WARNING: This can be dangerous if you execute multiple user transactions in the same
+    /// session -- identical transactions can have different gas costs. Use at your own risk.
+    fn charge_load_resource(
+        &mut self,
+        loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()>;
+
+    /// Charge for executing a native function.
+    /// The cost is calculated returned by the native function implementation.
+    /// Should fail if not enough gas units are left.
+    ///
+    /// In the future, we may want to remove this and directly pass a reference to the GasMeter
+    /// instance to the native functions to allow gas to be deducted during computation.
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_drop_frame(
+        &mut self,
+        locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    /// Returns the gas left
+    fn remaining_gas(&self) -> InternalGas;
+
+    #[cfg(debug_assertions)]
+    fn get_profiler_mut(&mut self) -> Option<&mut GasProfiler>;
+
+    #[cfg(debug_assertions)]
+    fn set_profiler(&mut self, profiler: GasProfiler);
+}
+
+/// A dummy gas meter that does not meter anything.
+/// Charge operations will always succeed.
+pub struct UnmeteredGasMeter;
+
+impl GasMeter for UnmeteredGasMeter {
+    fn charge_simple_instr(&mut self, _instr: SimpleInstruction) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _args: impl IntoIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const(&mut self, _size: NumBytes) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_store_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_unpack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_read_ref(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        _new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_eq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_neq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        _is_mut: bool,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _exists: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_from(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        _is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        _expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function(
+        &mut self,
+        _amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn remaining_gas(&self) -> InternalGas {
+        InternalGas::new(u64::MAX)
+    }
+
+    #[cfg(debug_assertions)]
+    fn get_profiler_mut(&mut self) -> Option<&mut GasProfiler> {
+        None
+    }
+
+    #[cfg(debug_assertions)]
+    fn set_profiler(&mut self, _profiler: GasProfiler) {}
+}
diff --git a/vendors/move/crates/move-vm-types/src/lib.rs b/vendors/move/crates/move-vm-types/src/lib.rs
new file mode 100644
index 000000000..e90386c0d
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/lib.rs
@@ -0,0 +1,33 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+pub mod data_store;
+pub mod gas;
+pub mod loaded_data;
+pub mod natives;
+pub mod values;
+pub mod views;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/crates/move-vm-types/src/loaded_data/mod.rs b/vendors/move/crates/move-vm-types/src/loaded_data/mod.rs
new file mode 100644
index 000000000..f9c2369ea
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/loaded_data/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+//! Loaded definition of code data used in runtime.
+//!
+//! This module contains the loaded definition of code data used in runtime.
+
+pub mod runtime_types;
diff --git a/vendors/move/crates/move-vm-types/src/loaded_data/runtime_types.rs b/vendors/move/crates/move-vm-types/src/loaded_data/runtime_types.rs
new file mode 100644
index 000000000..4cd185c7b
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/loaded_data/runtime_types.rs
@@ -0,0 +1,333 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        AbilitySet, SignatureToken, StructDefinitionIndex, StructTypeParameter, TypeParameterIndex,
+    },
+};
+use move_core_types::{
+    gas_algebra::AbstractMemorySize, identifier::Identifier, language_storage::ModuleId,
+    vm_status::StatusCode,
+};
+use std::fmt::Debug;
+use std::{cmp::max, collections::BTreeMap};
+
+pub const TYPE_DEPTH_MAX: usize = 256;
+
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug)]
+/// A formula for the maximum depth of the value for a type
+/// max(Ti + Ci, ..., CBase)
+pub struct DepthFormula {
+    /// The terms for each type parameter, if present.
+    /// Ti + Ci
+    pub terms: Vec<(TypeParameterIndex, u64)>,
+    /// The depth for any non type parameter term, if one exists.
+    /// CBase
+    pub constant: Option<u64>,
+}
+
+impl DepthFormula {
+    /// A value with no type parameters
+    pub fn constant(constant: u64) -> Self {
+        Self {
+            terms: vec![],
+            constant: Some(constant),
+        }
+    }
+
+    /// A stand alone type parameter value
+    pub fn type_parameter(tparam: TypeParameterIndex) -> Self {
+        Self {
+            terms: vec![(tparam, 0)],
+            constant: None,
+        }
+    }
+
+    /// We `max` over a list of formulas, and we normalize it to deal with duplicate terms, e.g.
+    /// `max(max(t1 + 1, t2 + 2, 2), max(t1 + 3, t2 + 1, 4))` becomes
+    /// `max(t1 + 3, t2 + 2, 4)`
+    pub fn normalize(formulas: Vec<Self>) -> Self {
+        let mut var_map = BTreeMap::new();
+        let mut constant_acc = None;
+        for formula in formulas {
+            let Self { terms, constant } = formula;
+            for (var, cur_factor) in terms {
+                var_map
+                    .entry(var)
+                    .and_modify(|prev_factor| *prev_factor = max(cur_factor, *prev_factor))
+                    .or_insert(cur_factor);
+            }
+            match (constant_acc, constant) {
+                (_, None) => (),
+                (None, Some(_)) => constant_acc = constant,
+                (Some(c1), Some(c2)) => constant_acc = Some(max(c1, c2)),
+            }
+        }
+        Self {
+            terms: var_map.into_iter().collect(),
+            constant: constant_acc,
+        }
+    }
+
+    /// Substitute in formulas for each type parameter and normalize the final formula
+    pub fn subst(
+        &self,
+        mut map: BTreeMap<TypeParameterIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let Self { terms, constant } = self;
+        let mut formulas = vec![];
+        if let Some(constant) = constant {
+            formulas.push(DepthFormula::constant(*constant))
+        }
+        for (t_i, c_i) in terms {
+            let Some(mut u_form) = map.remove(t_i) else {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("{t_i:?} missing mapping")),
+                );
+            };
+            u_form.add(*c_i);
+            formulas.push(u_form)
+        }
+        Ok(DepthFormula::normalize(formulas))
+    }
+
+    /// Given depths for each type parameter, solve the formula giving the max depth for the type
+    pub fn solve(&self, tparam_depths: &[u64]) -> PartialVMResult<u64> {
+        let Self { terms, constant } = self;
+        let mut depth = constant.as_ref().copied().unwrap_or(0);
+        for (t_i, c_i) in terms {
+            match tparam_depths.get(*t_i as usize) {
+                None => {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(format!("{t_i:?} missing mapping")),
+                    )
+                }
+                Some(ty_depth) => depth = max(depth, ty_depth.saturating_add(*c_i)),
+            }
+        }
+        Ok(depth)
+    }
+
+    // `max(t_0 + c_0, ..., t_n + c_n, c_base) + c`. But our representation forces us to distribute
+    // the addition, so it becomes `max(t_0 + c_0 + c, ..., t_n + c_n + c, c_base + c)`
+    pub fn add(&mut self, c: u64) {
+        let Self { terms, constant } = self;
+        for (_t_i, c_i) in terms {
+            *c_i = (*c_i).saturating_add(c);
+        }
+        if let Some(cbase) = constant.as_mut() {
+            *cbase = (*cbase).saturating_add(c);
+        }
+    }
+}
+
+#[derive(Debug, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct StructType {
+    pub fields: Vec<Type>,
+    pub field_names: Vec<Identifier>,
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub name: Identifier,
+    pub defining_id: ModuleId,
+    pub runtime_id: ModuleId,
+    pub struct_def: StructDefinitionIndex,
+    pub depth: Option<DepthFormula>,
+}
+
+impl StructType {
+    pub fn type_param_constraints(&self) -> impl ExactSizeIterator<Item = &AbilitySet> {
+        self.type_parameters.iter().map(|param| &param.constraints)
+    }
+}
+
+#[derive(Debug, Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct CachedStructIndex(pub usize);
+
+#[derive(Debug, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub enum Type {
+    Bool,
+    U8,
+    U64,
+    U128,
+    Address,
+    Signer,
+    Vector(Box<Type>),
+    Struct(CachedStructIndex),
+    StructInstantiation(CachedStructIndex, Vec<Type>),
+    Reference(Box<Type>),
+    MutableReference(Box<Type>),
+    TyParam(u16),
+    U16,
+    U32,
+    U256,
+}
+
+impl Type {
+    fn clone_impl(&self, depth: usize) -> PartialVMResult<Type> {
+        self.apply_subst(|idx, _| Ok(Type::TyParam(idx)), depth)
+    }
+
+    fn apply_subst<F>(&self, subst: F, depth: usize) -> PartialVMResult<Type>
+    where
+        F: Fn(u16, usize) -> PartialVMResult<Type> + Copy,
+    {
+        if depth > TYPE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_TYPE_DEPTH_REACHED));
+        }
+        let res = match self {
+            Type::TyParam(idx) => subst(*idx, depth)?,
+            Type::Bool => Type::Bool,
+            Type::U8 => Type::U8,
+            Type::U16 => Type::U16,
+            Type::U32 => Type::U32,
+            Type::U64 => Type::U64,
+            Type::U128 => Type::U128,
+            Type::U256 => Type::U256,
+            Type::Address => Type::Address,
+            Type::Signer => Type::Signer,
+            Type::Vector(ty) => Type::Vector(Box::new(ty.apply_subst(subst, depth + 1)?)),
+            Type::Reference(ty) => Type::Reference(Box::new(ty.apply_subst(subst, depth + 1)?)),
+            Type::MutableReference(ty) => {
+                Type::MutableReference(Box::new(ty.apply_subst(subst, depth + 1)?))
+            }
+            Type::Struct(def_idx) => Type::Struct(*def_idx),
+            Type::StructInstantiation(def_idx, instantiation) => {
+                let mut inst = vec![];
+                for ty in instantiation {
+                    inst.push(ty.apply_subst(subst, depth + 1)?)
+                }
+                Type::StructInstantiation(*def_idx, inst)
+            }
+        };
+        Ok(res)
+    }
+
+    pub fn subst(&self, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.apply_subst(
+            |idx, depth| match ty_args.get(idx as usize) {
+                Some(ty) => ty.clone_impl(depth),
+                None => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "type substitution failed: index out of bounds -- len {} got {}",
+                            ty_args.len(),
+                            idx
+                        )),
+                ),
+            },
+            1,
+        )
+    }
+
+    #[allow(deprecated)]
+    const LEGACY_BASE_MEMORY_SIZE: AbstractMemorySize = AbstractMemorySize::new(1);
+
+    /// Returns the abstract memory size the data structure occupies.
+    ///
+    /// This kept only for legacy reasons.
+    /// New applications should not use this.
+    pub fn size(&self) -> AbstractMemorySize {
+        use Type::*;
+
+        match self {
+            TyParam(_) | Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => {
+                Self::LEGACY_BASE_MEMORY_SIZE
+            }
+            Vector(ty) | Reference(ty) | MutableReference(ty) => {
+                Self::LEGACY_BASE_MEMORY_SIZE + ty.size()
+            }
+            Struct(_) => Self::LEGACY_BASE_MEMORY_SIZE,
+            StructInstantiation(_, tys) => tys
+                .iter()
+                .fold(Self::LEGACY_BASE_MEMORY_SIZE, |acc, ty| acc + ty.size()),
+        }
+    }
+
+    pub fn from_const_signature(constant_signature: &SignatureToken) -> PartialVMResult<Self> {
+        use SignatureToken as S;
+        use Type as L;
+
+        Ok(match constant_signature {
+            S::Bool => L::Bool,
+            S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
+            S::U64 => L::U64,
+            S::U128 => L::U128,
+            S::U256 => L::U256,
+            S::Address => L::Address,
+            S::Vector(inner) => L::Vector(Box::new(Self::from_const_signature(inner)?)),
+            // Not yet supported
+            S::Struct(_) | S::StructInstantiation(_, _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            }
+            // Not allowed/Not meaningful
+            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) | S::Signer => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            }
+        })
+    }
+
+    pub fn check_vec_ref(&self, inner_ty: &Type, is_mut: bool) -> PartialVMResult<Type> {
+        match self {
+            Type::MutableReference(inner) => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                }
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            Type::Reference(inner) if !is_mut => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                }
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
+
+    pub fn check_eq(&self, other: &Self) -> PartialVMResult<()> {
+        if self != other {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!("Type mismatch: expected {:?}, got {:?}", self, other),
+                ),
+            );
+        }
+        Ok(())
+    }
+
+    pub fn check_ref_eq(&self, expected_inner: &Self) -> PartialVMResult<()> {
+        match self {
+            Type::MutableReference(inner) | Type::Reference(inner) => {
+                inner.check_eq(expected_inner)
+            }
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm-types/src/natives/function.rs b/vendors/move/crates/move-vm-types/src/natives/function.rs
new file mode 100644
index 000000000..d6bf71a28
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/natives/function.rs
@@ -0,0 +1,123 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Native Function Support
+//!
+//! All Move native functions have the following signature:
+//!
+//! `pub fn native_function(
+//!     context: &mut impl NativeContext,
+//!     ty_args: Vec<Type>,
+//!     mut arguments: VecDeque<Value>,
+//! ) -> PartialVMResult<NativeResult>;`
+//!
+//! arguments are passed with first argument at position 0 and so forth.
+//! Popping values from `arguments` gives the aguments in reverse order (last first).
+//! This module contains the declarations and utilities to implement a native
+//! function.
+
+use crate::values::Value;
+use smallvec::{smallvec, SmallVec};
+
+pub use move_binary_format::errors::{PartialVMError, PartialVMResult};
+pub use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode};
+
+/// Result of a native function execution requires charges for execution cost.
+///
+/// An execution that causes an invariant violation would not return a `NativeResult` but
+/// return a `PartialVMError` error directly.
+/// All native functions must return a `PartialVMResult<NativeResult>` where an `Err` is returned
+/// when an error condition is met that should not charge for the execution. A common example
+/// is a VM invariant violation which should have been forbidden by the verifier.
+/// Errors (typically user errors and aborts) that are logically part of the function execution
+/// must be expressed in a `NativeResult` with a cost and a VMStatus.
+pub struct NativeResult {
+    /// Result of execution. This is either the return values or the error to report.
+    pub cost: InternalGas,
+    pub result: Result<SmallVec<[Value; 1]>, u64>,
+}
+
+impl NativeResult {
+    /// Return values of a successful execution.
+    pub fn ok(cost: InternalGas, values: SmallVec<[Value; 1]>) -> Self {
+        NativeResult {
+            cost,
+            result: Ok(values),
+        }
+    }
+
+    /// Failed execution. The failure is a runtime failure in the function and not an invariant
+    /// failure of the VM which would raise a `PartialVMError` error directly.
+    /// The only thing the funciton can specify is its abort code, as if it had invoked the `Abort`
+    /// bytecode instruction
+    pub fn err(cost: InternalGas, abort_code: u64) -> Self {
+        NativeResult {
+            cost,
+            result: Err(abort_code),
+        }
+    }
+
+    /// Convert a PartialVMResult<()> into a PartialVMResult<NativeResult>
+    pub fn map_partial_vm_result_empty(
+        cost: InternalGas,
+        res: PartialVMResult<()>,
+    ) -> PartialVMResult<Self> {
+        let result = match res {
+            Ok(_) => NativeResult::ok(cost, smallvec![]),
+            Err(err) if err.major_status() == StatusCode::ABORTED => {
+                let (_, abort_code, _, _, _, _) = err.all_data();
+                NativeResult::err(
+                    cost,
+                    abort_code.unwrap_or(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR as u64),
+                )
+            }
+            Err(err) => {
+                return Err(err);
+            }
+        };
+        Ok(result)
+    }
+
+    /// Convert a PartialVMResult<Value> into a PartialVMResult<NativeResult>
+    pub fn map_partial_vm_result_one(
+        cost: InternalGas,
+        res: PartialVMResult<Value>,
+    ) -> PartialVMResult<Self> {
+        let result = match res {
+            Ok(val) => NativeResult::ok(cost, smallvec![val]),
+            Err(err) if err.major_status() == StatusCode::ABORTED => {
+                let (_, abort_code, _, _, _, _) = err.all_data();
+                NativeResult::err(
+                    cost,
+                    abort_code.unwrap_or(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR as u64),
+                )
+            }
+            Err(err) => {
+                return Err(err);
+            }
+        };
+        Ok(result)
+    }
+}
+
+/// Return the argument at the top of the stack.
+///
+/// Arguments are passed to a native as a stack with first arg at the bottom of the stack.
+/// Calling this API can help in making the code more readable.
+/// It's good practice to pop all arguments in locals of the native function on function entry.
+#[macro_export]
+macro_rules! pop_arg {
+    ($arguments:ident, $t:ty) => {{
+        use $crate::natives::function::{NativeResult, PartialVMError, StatusCode};
+        match $arguments.pop_back().map(|v| v.value_as::<$t>()) {
+            None => {
+                return Err(PartialVMError::new(
+                    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                ))
+            }
+            Some(Err(e)) => return Err(e),
+            Some(Ok(v)) => v,
+        }
+    }};
+}
diff --git a/vendors/move/crates/move-vm-types/src/natives/mod.rs b/vendors/move/crates/move-vm-types/src/natives/mod.rs
new file mode 100644
index 000000000..ccaf1d72a
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/natives/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod function;
diff --git a/vendors/move/crates/move-vm-types/src/unit_tests/identifier_prop_tests.rs b/vendors/move/crates/move-vm-types/src/unit_tests/identifier_prop_tests.rs
new file mode 100644
index 000000000..61fa67e2a
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/unit_tests/identifier_prop_tests.rs
@@ -0,0 +1,18 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn identifier_serializer_roundtrip(module in CompiledModule::valid_strategy(20)) {
+        let module_id = module.self_id();
+        let deserialized_module_id = {
+            let serialized_key = bcs::to_bytes(&module_id).unwrap();
+            bcs::from_bytes(&serialized_key).expect("Deserialize should work")
+        };
+        prop_assert_eq!(module_id, deserialized_module_id);
+    }
+}
diff --git a/vendors/move/crates/move-vm-types/src/unit_tests/mod.rs b/vendors/move/crates/move-vm-types/src/unit_tests/mod.rs
new file mode 100644
index 000000000..bb36fe00c
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/unit_tests/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(feature = "fuzzing")]
+mod identifier_prop_tests;
diff --git a/vendors/move/crates/move-vm-types/src/values/mod.rs b/vendors/move/crates/move-vm-types/src/values/mod.rs
new file mode 100644
index 000000000..9ce8415cb
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/values/mod.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod values_impl;
+
+#[cfg(test)]
+mod value_tests;
+
+#[cfg(all(test, feature = "fuzzing"))]
+mod value_prop_tests;
+
+pub use values_impl::*;
diff --git a/vendors/move/crates/move-vm-types/src/values/value_prop_tests.rs b/vendors/move/crates/move-vm-types/src/values/value_prop_tests.rs
new file mode 100644
index 000000000..cd612bac7
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/values/value_prop_tests.rs
@@ -0,0 +1,24 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::values::{prop::layout_and_value_strategy, Value};
+use move_core_types::value::MoveValue;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn serializer_round_trip((layout, value) in layout_and_value_strategy()) {
+        let blob = value.simple_serialize(&layout).expect("must serialize");
+        let value_deserialized = Value::simple_deserialize(&blob, &layout).expect("must deserialize");
+        assert!(value.equals(&value_deserialized).unwrap());
+
+        let move_value = value.as_move_value(&layout);
+
+        let blob2 = move_value.simple_serialize().expect("must serialize");
+        assert_eq!(blob, blob2);
+
+        let move_value_deserialized = MoveValue::simple_deserialize(&blob2, &layout).expect("must deserialize.");
+        assert_eq!(move_value, move_value_deserialized);
+    }
+}
diff --git a/vendors/move/crates/move-vm-types/src/values/value_tests.rs b/vendors/move/crates/move-vm-types/src/values/value_tests.rs
new file mode 100644
index 000000000..6f7155838
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/values/value_tests.rs
@@ -0,0 +1,228 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{loaded_data::runtime_types::Type, values::*, views::*};
+use move_binary_format::errors::*;
+use move_core_types::{account_address::AccountAddress, u256::U256};
+
+#[test]
+fn locals() -> PartialVMResult<()> {
+    const LEN: usize = 4;
+    let mut locals = Locals::new(LEN);
+    for i in 0..LEN {
+        assert!(locals.copy_loc(i).is_err());
+        assert!(locals.move_loc(i, true).is_err());
+        assert!(locals.borrow_loc(i).is_err());
+    }
+    locals.store_loc(1, Value::u64(42), true)?;
+
+    assert!(locals.copy_loc(1)?.equals(&Value::u64(42))?);
+    let r = locals.borrow_loc(1)?.value_as::<Reference>()?;
+    assert!(r.read_ref()?.equals(&Value::u64(42))?);
+    assert!(locals.move_loc(1, true)?.equals(&Value::u64(42))?);
+
+    assert!(locals.copy_loc(1).is_err());
+    assert!(locals.move_loc(1, true).is_err());
+    assert!(locals.borrow_loc(1).is_err());
+
+    assert!(locals.copy_loc(LEN + 1).is_err());
+    assert!(locals.move_loc(LEN + 1, true).is_err());
+    assert!(locals.borrow_loc(LEN + 1).is_err());
+
+    Ok(())
+}
+
+#[test]
+fn struct_pack_and_unpack() -> PartialVMResult<()> {
+    let vals = vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ];
+    let s = Struct::pack(vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ]);
+    let unpacked: Vec<_> = s.unpack()?.collect();
+
+    assert!(vals.len() == unpacked.len());
+    for (v1, v2) in vals.iter().zip(unpacked.iter()) {
+        assert!(v1.equals(v2)?);
+    }
+
+    Ok(())
+}
+
+#[test]
+fn struct_borrow_field() -> PartialVMResult<()> {
+    let mut locals = Locals::new(1);
+    locals.store_loc(
+        0,
+        Value::struct_(Struct::pack(vec![Value::u8(10), Value::bool(false)])),
+        true,
+    )?;
+    let r: StructRef = locals.borrow_loc(0)?.value_as()?;
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        assert!(f.read_ref()?.equals(&Value::bool(false))?);
+    }
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        f.write_ref(Value::bool(true))?;
+    }
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        assert!(f.read_ref()?.equals(&Value::bool(true))?);
+    }
+
+    Ok(())
+}
+
+#[test]
+fn struct_borrow_nested() -> PartialVMResult<()> {
+    let mut locals = Locals::new(1);
+
+    fn inner(x: u64) -> Value {
+        Value::struct_(Struct::pack(vec![Value::u64(x)]))
+    }
+    fn outer(x: u64) -> Value {
+        Value::struct_(Struct::pack(vec![Value::u8(10), inner(x)]))
+    }
+
+    locals.store_loc(0, outer(20), true)?;
+    let r1: StructRef = locals.borrow_loc(0)?.value_as()?;
+    let r2: StructRef = r1.borrow_field(1)?.value_as()?;
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        assert!(r3.read_ref()?.equals(&Value::u64(20))?);
+    }
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        r3.write_ref(Value::u64(30))?;
+    }
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        assert!(r3.read_ref()?.equals(&Value::u64(30))?);
+    }
+
+    assert!(r2.read_ref()?.equals(&inner(30))?);
+    assert!(r1.read_ref()?.equals(&outer(30))?);
+
+    Ok(())
+}
+
+#[test]
+fn global_value_non_struct() -> PartialVMResult<()> {
+    assert!(GlobalValue::cached(Value::u64(100)).is_err());
+    assert!(GlobalValue::cached(Value::bool(false)).is_err());
+
+    let mut locals = Locals::new(1);
+    locals.store_loc(0, Value::u8(0), true)?;
+    let r = locals.borrow_loc(0)?;
+    assert!(GlobalValue::cached(r).is_err());
+
+    Ok(())
+}
+
+#[test]
+fn leagacy_ref_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let mut locals = Locals::new(10);
+
+    locals.store_loc(0, Value::u128(0), true)?;
+    let r = locals.borrow_loc(0)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(1, Value::vector_u8([1, 2, 3]), true)?;
+    let r = locals.borrow_loc(1)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    let r: VectorRef = r.value_as()?;
+    let r = r.borrow_elem(0, &Type::U8)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(2, Value::struct_(Struct::pack([])), true)?;
+    let r: Reference = locals.borrow_loc(2)?.value_as()?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    Ok(())
+}
+
+#[test]
+fn legacy_struct_abstract_memory_size_consistenty() -> PartialVMResult<()> {
+    let structs = [
+        Struct::pack([]),
+        Struct::pack([Value::struct_(Struct::pack([Value::u8(0), Value::u64(0)]))]),
+    ];
+
+    for s in &structs {
+        assert_eq!(s.legacy_abstract_memory_size(), s.legacy_size());
+    }
+
+    Ok(())
+}
+
+#[test]
+fn legacy_val_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let vals = [
+        Value::u8(0),
+        Value::u16(0),
+        Value::u32(0),
+        Value::u64(0),
+        Value::u128(0),
+        Value::u256(U256::zero()),
+        Value::bool(true),
+        Value::address(AccountAddress::ZERO),
+        Value::vector_u8([0, 1, 2]),
+        Value::vector_u16([0, 1, 2]),
+        Value::vector_u32([0, 1, 2]),
+        Value::vector_u64([]),
+        Value::vector_u128([1, 2, 3, 4]),
+        Value::vector_u256([1, 2, 3, 4].iter().map(|q| U256::from(*q as u64))),
+        Value::struct_(Struct::pack([])),
+        Value::struct_(Struct::pack([Value::u8(0), Value::bool(false)])),
+        Value::vector_for_testing_only([]),
+        Value::vector_for_testing_only([Value::u8(0), Value::u8(1)]),
+    ];
+
+    let mut locals = Locals::new(vals.len());
+    for (idx, val) in vals.iter().enumerate() {
+        locals.store_loc(idx, val.copy_value()?, true)?;
+
+        let val_size_new = val.legacy_abstract_memory_size();
+        let val_size_old = val.legacy_size();
+
+        assert_eq!(val_size_new, val_size_old);
+
+        let val_size_through_ref = locals
+            .borrow_loc(idx)?
+            .value_as::<Reference>()?
+            .value_view()
+            .legacy_abstract_memory_size();
+
+        assert_eq!(val_size_through_ref, val_size_old)
+    }
+
+    Ok(())
+}
+
+#[test]
+fn test_vm_value_vector_u64_casting() {
+    assert_eq!(
+        vec![1, 2, 3],
+        Value::vector_u64([1, 2, 3]).value_as::<Vec<u64>>().unwrap()
+    );
+}
diff --git a/vendors/move/crates/move-vm-types/src/values/values_impl.rs b/vendors/move/crates/move-vm-types/src/values/values_impl.rs
new file mode 100644
index 000000000..d958236f8
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/values/values_impl.rs
@@ -0,0 +1,3716 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    loaded_data::runtime_types::Type,
+    views::{ValueView, ValueVisitor},
+};
+use move_binary_format::{
+    errors::*,
+    file_format::{Constant, SignatureToken},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::Op,
+    gas_algebra::AbstractMemorySize,
+    runtime_value::{MoveStructLayout, MoveTypeLayout},
+    u256,
+    vm_status::{sub_status::NFE_VECTOR_ERROR_BASE, StatusCode},
+};
+use std::{
+    cell::RefCell,
+    fmt::{self, Debug, Display},
+    iter,
+    rc::Rc,
+};
+
+/***************************************************************************************
+ *
+ * Internal Types
+ *
+ *   Internal representation of the Move value calculus. These types are abstractions
+ *   over the concrete Move concepts and may carry additional information that is not
+ *   defined by the language, but required by the implementation.
+ *
+ **************************************************************************************/
+
+/// Runtime representation of a Move value.
+#[derive(Debug)]
+enum ValueImpl {
+    Invalid,
+
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    U128(u128),
+    U256(u256::U256),
+    Bool(bool),
+    Address(AccountAddress),
+
+    Container(Container),
+
+    ContainerRef(ContainerRef),
+    IndexedRef(IndexedRef),
+}
+
+/// A container is a collection of values. It is used to represent data structures like a
+/// Move vector or struct.
+///
+/// There is one general container that can be used to store an array of any values, same
+/// type or not, and a few specialized flavors to offer compact memory layout for small
+/// primitive types.
+///
+/// Except when not owned by the VM stack, a container always lives inside an Rc<RefCell<>>,
+/// making it possible to be shared by references.
+#[derive(Debug, Clone)]
+enum Container {
+    Locals(Rc<RefCell<Vec<ValueImpl>>>),
+    Vec(Rc<RefCell<Vec<ValueImpl>>>),
+    Struct(Rc<RefCell<Vec<ValueImpl>>>),
+    VecU8(Rc<RefCell<Vec<u8>>>),
+    VecU64(Rc<RefCell<Vec<u64>>>),
+    VecU128(Rc<RefCell<Vec<u128>>>),
+    VecBool(Rc<RefCell<Vec<bool>>>),
+    VecAddress(Rc<RefCell<Vec<AccountAddress>>>),
+    VecU16(Rc<RefCell<Vec<u16>>>),
+    VecU32(Rc<RefCell<Vec<u32>>>),
+    VecU256(Rc<RefCell<Vec<u256::U256>>>),
+}
+
+/// A ContainerRef is a direct reference to a container, which could live either in the frame
+/// or in global storage. In the latter case, it also keeps a status flag indicating whether
+/// the container has been possibly modified.
+#[derive(Debug)]
+enum ContainerRef {
+    Local(Container),
+    Global {
+        status: Rc<RefCell<GlobalDataStatus>>,
+        container: Container,
+    },
+}
+
+/// Status for global (on-chain) data:
+/// Clean - the data was only read.
+/// Dirty - the data was possibly modified.
+#[derive(Debug, Clone, Copy)]
+enum GlobalDataStatus {
+    Clean,
+    Dirty,
+}
+
+/// A Move reference pointing to an element in a container.
+#[derive(Debug)]
+struct IndexedRef {
+    idx: usize,
+    container_ref: ContainerRef,
+}
+
+/// An umbrella enum for references. It is used to hide the internals of the public type
+/// Reference.
+#[derive(Debug)]
+enum ReferenceImpl {
+    IndexedRef(IndexedRef),
+    ContainerRef(ContainerRef),
+}
+
+/***************************************************************************************
+ *
+ * Public Types
+ *
+ *   Types visible from outside the module. They are almost exclusively wrappers around
+ *   the internal representation, acting as public interfaces. The methods they provide
+ *   closely resemble the Move concepts their names suggest: move_local, borrow_field,
+ *   pack, unpack, etc.
+ *
+ *   They are opaque to an external caller by design -- no knowledge about the internal
+ *   representation is given and they can only be manipulated via the public methods,
+ *   which is to ensure no arbitrary invalid states can be created unless some crucial
+ *   internal invariants are violated.
+ *
+ **************************************************************************************/
+/// A Move value -- a wrapper around `ValueImpl` which can be created only through valid
+/// means.
+#[derive(Debug)]
+pub struct Value(ValueImpl);
+
+/// An integer value in Move.
+#[derive(Debug)]
+pub enum IntegerValue {
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    U128(u128),
+    U256(u256::U256),
+}
+
+/// A Move struct.
+#[derive(Debug)]
+pub struct Struct {
+    fields: Vec<ValueImpl>,
+}
+
+// A vector. This is an alias for a Container for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a vector and operate on that.
+// There is an impl for Vector which implements the API private to this module.
+#[derive(Debug)]
+pub struct Vector(Container);
+
+/// A reference to a Move struct that allows you to take a reference to one of its fields.
+#[derive(Debug)]
+pub struct StructRef(ContainerRef);
+
+/// A generic Move reference that offers two functionalities: read_ref & write_ref.
+#[derive(Debug)]
+pub struct Reference(ReferenceImpl);
+
+// A reference to a signer. Clients can attempt a cast to this struct if they are
+// expecting a Signer on the stack or as an argument.
+#[derive(Debug)]
+pub struct SignerRef(ContainerRef);
+
+// A reference to a vector. This is an alias for a ContainerRef for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a reference to a vector and operate on that.
+// There is an impl for VectorRef which implements the API private to this module.
+#[derive(Debug)]
+pub struct VectorRef(ContainerRef);
+
+/// A special "slot" in global storage that can hold a resource. It also keeps track of the status
+/// of the resource relative to the global state, which is necessary to compute the effects to emit
+/// at the end of transaction execution.
+#[derive(Debug)]
+enum GlobalValueImpl {
+    /// No resource resides in this slot or in storage.
+    None,
+    /// A resource has been published to this slot and it did not previously exist in storage.
+    Fresh { fields: Rc<RefCell<Vec<ValueImpl>>> },
+    /// A resource resides in this slot and also in storage. The status flag indicates whether
+    /// it has potentially been altered.
+    Cached {
+        fields: Rc<RefCell<Vec<ValueImpl>>>,
+        status: Rc<RefCell<GlobalDataStatus>>,
+    },
+    /// A resource used to exist in storage but has been deleted by the current transaction.
+    Deleted,
+}
+
+/// A wrapper around `GlobalValueImpl`, representing a "slot" in global storage that can
+/// hold a resource.
+#[derive(Debug)]
+pub struct GlobalValue(GlobalValueImpl);
+
+/// The locals for a function frame. It allows values to be read, written or taken
+/// reference from.
+#[derive(Debug)]
+pub struct Locals(Rc<RefCell<Vec<ValueImpl>>>);
+
+/***************************************************************************************
+ *
+ * Misc
+ *
+ *   Miscellaneous helper functions.
+ *
+ **************************************************************************************/
+
+impl Container {
+    fn len(&self) -> usize {
+        match self {
+            Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => r.borrow().len(),
+            Self::VecU8(r) => r.borrow().len(),
+            Self::VecU16(r) => r.borrow().len(),
+            Self::VecU32(r) => r.borrow().len(),
+            Self::VecU64(r) => r.borrow().len(),
+            Self::VecU128(r) => r.borrow().len(),
+            Self::VecU256(r) => r.borrow().len(),
+            Self::VecBool(r) => r.borrow().len(),
+            Self::VecAddress(r) => r.borrow().len(),
+        }
+    }
+
+    fn rc_count(&self) -> usize {
+        match self {
+            Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => Rc::strong_count(r),
+            Self::VecU8(r) => Rc::strong_count(r),
+            Self::VecU16(r) => Rc::strong_count(r),
+            Self::VecU32(r) => Rc::strong_count(r),
+            Self::VecU64(r) => Rc::strong_count(r),
+            Self::VecU128(r) => Rc::strong_count(r),
+            Self::VecU256(r) => Rc::strong_count(r),
+            Self::VecBool(r) => Rc::strong_count(r),
+            Self::VecAddress(r) => Rc::strong_count(r),
+        }
+    }
+
+    fn signer(x: AccountAddress) -> Self {
+        Container::Struct(Rc::new(RefCell::new(vec![ValueImpl::Address(x)])))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Borrows (Internal)
+ *
+ *   Helper functions to handle Rust borrows. When borrowing from a RefCell, we want
+ *   to return an error instead of panicking.
+ *
+ **************************************************************************************/
+
+fn take_unique_ownership<T: Debug>(r: Rc<RefCell<T>>) -> PartialVMResult<T> {
+    match Rc::try_unwrap(r) {
+        Ok(cell) => Ok(cell.into_inner()),
+        Err(r) => Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("moving value {:?} with dangling references", r)),
+        ),
+    }
+}
+
+impl ContainerRef {
+    fn container(&self) -> &Container {
+        match self {
+            Self::Local(container) | Self::Global { container, .. } => container,
+        }
+    }
+
+    fn mark_dirty(&self) {
+        if let Self::Global { status, .. } = self {
+            *status.borrow_mut() = GlobalDataStatus::Dirty
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Reference Conversions (Internal)
+ *
+ *   Helpers to obtain a Rust reference to a value via a VM reference. Required for
+ *   equalities.
+ *
+ **************************************************************************************/
+trait VMValueRef<T> {
+    fn value_ref(&self) -> PartialVMResult<&T>;
+}
+
+macro_rules! impl_vm_value_ref {
+    ($ty: ty, $tc: ident) => {
+        impl VMValueRef<$ty> for ValueImpl {
+            fn value_ref(&self) -> PartialVMResult<&$ty> {
+                match self {
+                    ValueImpl::$tc(x) => Ok(x),
+                    _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message(format!("cannot take {:?} as &{}", self, stringify!($ty)))),
+                }
+            }
+        }
+    };
+}
+
+impl_vm_value_ref!(u8, U8);
+impl_vm_value_ref!(u16, U16);
+impl_vm_value_ref!(u32, U32);
+impl_vm_value_ref!(u64, U64);
+impl_vm_value_ref!(u128, U128);
+impl_vm_value_ref!(u256::U256, U256);
+impl_vm_value_ref!(bool, Bool);
+impl_vm_value_ref!(AccountAddress, Address);
+
+impl ValueImpl {
+    fn as_value_ref<T>(&self) -> PartialVMResult<&T>
+    where
+        Self: VMValueRef<T>,
+    {
+        VMValueRef::value_ref(self)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Copy Value
+ *
+ *   Implementation of Move copy. Extra care needs to be taken when copying references.
+ *   It is intentional we avoid implementing the standard library trait Clone, to prevent
+ *   surprising behaviors from happening.
+ *
+ **************************************************************************************/
+impl ValueImpl {
+    fn copy_value(&self) -> PartialVMResult<Self> {
+        use ValueImpl::*;
+
+        Ok(match self {
+            Invalid => Invalid,
+
+            U8(x) => U8(*x),
+            U16(x) => U16(*x),
+            U32(x) => U32(*x),
+            U64(x) => U64(*x),
+            U128(x) => U128(*x),
+            U256(x) => U256(*x),
+            Bool(x) => Bool(*x),
+            Address(x) => Address(*x),
+
+            ContainerRef(r) => ContainerRef(r.copy_value()),
+            IndexedRef(r) => IndexedRef(r.copy_value()),
+
+            // When cloning a container, we need to make sure we make a deep
+            // copy of the data instead of a shallow copy of the Rc.
+            Container(c) => Container(c.copy_value()?),
+        })
+    }
+}
+
+impl Container {
+    fn copy_value(&self) -> PartialVMResult<Self> {
+        let copy_rc_ref_vec_val = |r: &Rc<RefCell<Vec<ValueImpl>>>| {
+            Ok(Rc::new(RefCell::new(
+                r.borrow()
+                    .iter()
+                    .map(|v| v.copy_value())
+                    .collect::<PartialVMResult<_>>()?,
+            )))
+        };
+
+        Ok(match self {
+            Self::Vec(r) => Self::Vec(copy_rc_ref_vec_val(r)?),
+            Self::Struct(r) => Self::Struct(copy_rc_ref_vec_val(r)?),
+
+            Self::VecU8(r) => Self::VecU8(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU16(r) => Self::VecU16(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU32(r) => Self::VecU32(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU64(r) => Self::VecU64(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU128(r) => Self::VecU128(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU256(r) => Self::VecU256(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecBool(r) => Self::VecBool(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecAddress(r) => Self::VecAddress(Rc::new(RefCell::new(r.borrow().clone()))),
+
+            Self::Locals(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("cannot copy a Locals container".to_string()),
+                )
+            }
+        })
+    }
+
+    fn copy_by_ref(&self) -> Self {
+        match self {
+            Self::Vec(r) => Self::Vec(Rc::clone(r)),
+            Self::Struct(r) => Self::Struct(Rc::clone(r)),
+            Self::VecU8(r) => Self::VecU8(Rc::clone(r)),
+            Self::VecU16(r) => Self::VecU16(Rc::clone(r)),
+            Self::VecU32(r) => Self::VecU32(Rc::clone(r)),
+            Self::VecU64(r) => Self::VecU64(Rc::clone(r)),
+            Self::VecU128(r) => Self::VecU128(Rc::clone(r)),
+            Self::VecU256(r) => Self::VecU256(Rc::clone(r)),
+            Self::VecBool(r) => Self::VecBool(Rc::clone(r)),
+            Self::VecAddress(r) => Self::VecAddress(Rc::clone(r)),
+            Self::Locals(r) => Self::Locals(Rc::clone(r)),
+        }
+    }
+}
+
+impl IndexedRef {
+    fn copy_value(&self) -> Self {
+        Self {
+            idx: self.idx,
+            container_ref: self.container_ref.copy_value(),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn copy_value(&self) -> Self {
+        match self {
+            Self::Local(container) => Self::Local(container.copy_by_ref()),
+            Self::Global { status, container } => Self::Global {
+                status: Rc::clone(status),
+                container: container.copy_by_ref(),
+            },
+        }
+    }
+}
+
+impl Value {
+    pub fn copy_value(&self) -> PartialVMResult<Self> {
+        Ok(Self(self.0.copy_value()?))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Equality
+ *
+ *   Equality tests of Move values. Errors are raised when types mismatch.
+ *
+ *   It is intended to NOT use or even implement the standard library traits Eq and
+ *   Partial Eq due to:
+ *     1. They do not allow errors to be returned.
+ *     2. They can be invoked without the user being noticed thanks to operator
+ *        overloading.
+ *
+ *   Eq and Partial Eq must also NOT be derived for the reasons above plus that the
+ *   derived implementation differs from the semantics we want.
+ *
+ **************************************************************************************/
+
+impl ValueImpl {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use ValueImpl::*;
+
+        let res = match (self, other) {
+            (U8(l), U8(r)) => l == r,
+            (U16(l), U16(r)) => l == r,
+            (U32(l), U32(r)) => l == r,
+            (U64(l), U64(r)) => l == r,
+            (U128(l), U128(r)) => l == r,
+            (U256(l), U256(r)) => l == r,
+            (Bool(l), Bool(r)) => l == r,
+            (Address(l), Address(r)) => l == r,
+
+            (Container(l), Container(r)) => l.equals(r)?,
+
+            (ContainerRef(l), ContainerRef(r)) => l.equals(r)?,
+            (IndexedRef(l), IndexedRef(r)) => l.equals(r)?,
+            (Invalid, _)
+            | (U8(_), _)
+            | (U16(_), _)
+            | (U32(_), _)
+            | (U64(_), _)
+            | (U128(_), _)
+            | (U256(_), _)
+            | (Bool(_), _)
+            | (Address(_), _)
+            | (Container(_), _)
+            | (ContainerRef(_), _)
+            | (IndexedRef(_), _) => {
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                    .with_message(format!("cannot compare values: {:?}, {:?}", self, other)))
+            }
+        };
+
+        Ok(res)
+    }
+}
+
+impl Container {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use Container::*;
+
+        let res = match (self, other) {
+            (Vec(l), Vec(r)) | (Struct(l), Struct(r)) => {
+                let l = &l.borrow();
+                let r = &r.borrow();
+
+                if l.len() != r.len() {
+                    return Ok(false);
+                }
+                for (v1, v2) in l.iter().zip(r.iter()) {
+                    if !v1.equals(v2)? {
+                        return Ok(false);
+                    }
+                }
+                true
+            }
+            (VecU8(l), VecU8(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU16(l), VecU16(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU32(l), VecU32(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU64(l), VecU64(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU128(l), VecU128(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU256(l), VecU256(r)) => l.borrow().eq(&*r.borrow()),
+            (VecBool(l), VecBool(r)) => l.borrow().eq(&*r.borrow()),
+            (VecAddress(l), VecAddress(r)) => l.borrow().eq(&*r.borrow()),
+
+            (Locals(_), _)
+            | (Vec(_), _)
+            | (Struct(_), _)
+            | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
+            | (VecU64(_), _)
+            | (VecU128(_), _)
+            | (VecU256(_), _)
+            | (VecBool(_), _)
+            | (VecAddress(_), _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                        "cannot compare container values: {:?}, {:?}",
+                        self, other
+                    )),
+                )
+            }
+        };
+
+        Ok(res)
+    }
+}
+
+impl ContainerRef {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        self.container().equals(other.container())
+    }
+}
+
+impl IndexedRef {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use Container::*;
+
+        let res = match (
+            self.container_ref.container(),
+            other.container_ref.container(),
+        ) {
+            // VecC <=> VecR impossible
+            (Vec(r1), Vec(r2))
+            | (Vec(r1), Struct(r2))
+            | (Vec(r1), Locals(r2))
+            | (Struct(r1), Vec(r2))
+            | (Struct(r1), Struct(r2))
+            | (Struct(r1), Locals(r2))
+            | (Locals(r1), Vec(r2))
+            | (Locals(r1), Struct(r2))
+            | (Locals(r1), Locals(r2)) => r1.borrow()[self.idx].equals(&r2.borrow()[other.idx])?,
+
+            (VecU8(r1), VecU8(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU16(r1), VecU16(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU32(r1), VecU32(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU64(r1), VecU64(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU128(r1), VecU128(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU256(r1), VecU256(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecBool(r1), VecBool(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecAddress(r1), VecAddress(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+
+            // Equality between a generic and a specialized container.
+            (Locals(r1), VecU8(r2)) | (Struct(r1), VecU8(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u8>()? == r2.borrow()[other.idx]
+            }
+            (VecU8(r1), Locals(r2)) | (VecU8(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u8>()?
+            }
+
+            (Locals(r1), VecU16(r2)) | (Struct(r1), VecU16(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u16>()? == r2.borrow()[other.idx]
+            }
+            (VecU16(r1), Locals(r2)) | (VecU16(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u16>()?
+            }
+
+            (Locals(r1), VecU32(r2)) | (Struct(r1), VecU32(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u32>()? == r2.borrow()[other.idx]
+            }
+            (VecU32(r1), Locals(r2)) | (VecU32(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u32>()?
+            }
+
+            (Locals(r1), VecU64(r2)) | (Struct(r1), VecU64(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u64>()? == r2.borrow()[other.idx]
+            }
+            (VecU64(r1), Locals(r2)) | (VecU64(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u64>()?
+            }
+
+            (Locals(r1), VecU128(r2)) | (Struct(r1), VecU128(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u128>()? == r2.borrow()[other.idx]
+            }
+            (VecU128(r1), Locals(r2)) | (VecU128(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u128>()?
+            }
+
+            (Locals(r1), VecU256(r2)) | (Struct(r1), VecU256(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u256::U256>()? == r2.borrow()[other.idx]
+            }
+            (VecU256(r1), Locals(r2)) | (VecU256(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u256::U256>()?
+            }
+
+            (Locals(r1), VecBool(r2)) | (Struct(r1), VecBool(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<bool>()? == r2.borrow()[other.idx]
+            }
+            (VecBool(r1), Locals(r2)) | (VecBool(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<bool>()?
+            }
+
+            (Locals(r1), VecAddress(r2)) | (Struct(r1), VecAddress(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<AccountAddress>()? == r2.borrow()[other.idx]
+            }
+            (VecAddress(r1), Locals(r2)) | (VecAddress(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<AccountAddress>()?
+            }
+
+            // All other combinations are illegal.
+            (Vec(_), _)
+            | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
+            | (VecU64(_), _)
+            | (VecU128(_), _)
+            | (VecU256(_), _)
+            | (VecBool(_), _)
+            | (VecAddress(_), _) => {
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                    .with_message(format!("cannot compare references {:?}, {:?}", self, other)))
+            }
+        };
+        Ok(res)
+    }
+}
+
+impl Value {
+    pub fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        self.0.equals(&other.0)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Read Ref
+ *
+ *   Implementation of the Move operation read ref.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        Ok(Value(ValueImpl::Container(self.container().copy_value()?)))
+    }
+}
+
+impl IndexedRef {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        use Container::*;
+
+        let res = match self.container_ref.container() {
+            Locals(r) | Vec(r) | Struct(r) => r.borrow()[self.idx].copy_value()?,
+            VecU8(r) => ValueImpl::U8(r.borrow()[self.idx]),
+            VecU16(r) => ValueImpl::U16(r.borrow()[self.idx]),
+            VecU32(r) => ValueImpl::U32(r.borrow()[self.idx]),
+            VecU64(r) => ValueImpl::U64(r.borrow()[self.idx]),
+            VecU128(r) => ValueImpl::U128(r.borrow()[self.idx]),
+            VecU256(r) => ValueImpl::U256(r.borrow()[self.idx]),
+            VecBool(r) => ValueImpl::Bool(r.borrow()[self.idx]),
+            VecAddress(r) => ValueImpl::Address(r.borrow()[self.idx]),
+        };
+
+        Ok(Value(res))
+    }
+}
+
+impl ReferenceImpl {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        match self {
+            Self::ContainerRef(r) => r.read_ref(),
+            Self::IndexedRef(r) => r.read_ref(),
+        }
+    }
+}
+
+impl StructRef {
+    pub fn read_ref(self) -> PartialVMResult<Value> {
+        self.0.read_ref()
+    }
+}
+
+impl Reference {
+    pub fn read_ref(self) -> PartialVMResult<Value> {
+        self.0.read_ref()
+    }
+}
+
+/***************************************************************************************
+ *
+ * Write Ref
+ *
+ *   Implementation of the Move operation write ref.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn write_ref(self, v: Value) -> PartialVMResult<()> {
+        match v.0 {
+            ValueImpl::Container(c) => {
+                macro_rules! assign {
+                    ($r1: expr, $tc: ident) => {{
+                        let r = match c {
+                            Container::$tc(v) => v,
+                            _ => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                                )
+                                .with_message(
+                                    "failed to write_ref: container type mismatch".to_string(),
+                                ))
+                            }
+                        };
+                        *$r1.borrow_mut() = take_unique_ownership(r)?;
+                    }};
+                }
+
+                match self.container() {
+                    Container::Struct(r) => assign!(r, Struct),
+                    Container::Vec(r) => assign!(r, Vec),
+                    Container::VecU8(r) => assign!(r, VecU8),
+                    Container::VecU16(r) => assign!(r, VecU16),
+                    Container::VecU32(r) => assign!(r, VecU32),
+                    Container::VecU64(r) => assign!(r, VecU64),
+                    Container::VecU128(r) => assign!(r, VecU128),
+                    Container::VecU256(r) => assign!(r, VecU256),
+                    Container::VecBool(r) => assign!(r, VecBool),
+                    Container::VecAddress(r) => assign!(r, VecAddress),
+                    Container::Locals(_) => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("cannot overwrite Container::Locals".to_string()))
+                    }
+                }
+                self.mark_dirty();
+            }
+            _ => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "cannot write value {:?} to container ref {:?}",
+                            v, self
+                        )),
+                )
+            }
+        }
+        Ok(())
+    }
+}
+
+impl IndexedRef {
+    fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        match &x.0 {
+            ValueImpl::IndexedRef(_)
+            | ValueImpl::ContainerRef(_)
+            | ValueImpl::Invalid
+            | ValueImpl::Container(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "cannot write value {:?} to indexed ref {:?}",
+                            x, self
+                        )),
+                )
+            }
+            _ => (),
+        }
+
+        match (self.container_ref.container(), &x.0) {
+            (Container::Locals(r), _) | (Container::Vec(r), _) | (Container::Struct(r), _) => {
+                let mut v = r.borrow_mut();
+                v[self.idx] = x.0;
+            }
+            (Container::VecU8(r), ValueImpl::U8(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU16(r), ValueImpl::U16(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU32(r), ValueImpl::U32(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU64(r), ValueImpl::U64(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU128(r), ValueImpl::U128(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU256(r), ValueImpl::U256(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecBool(r), ValueImpl::Bool(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecAddress(r), ValueImpl::Address(x)) => r.borrow_mut()[self.idx] = *x,
+
+            (Container::VecU8(_), _)
+            | (Container::VecU16(_), _)
+            | (Container::VecU32(_), _)
+            | (Container::VecU64(_), _)
+            | (Container::VecU128(_), _)
+            | (Container::VecU256(_), _)
+            | (Container::VecBool(_), _)
+            | (Container::VecAddress(_), _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                        "cannot write value {:?} to indexed ref {:?}",
+                        x, self
+                    )),
+                )
+            }
+        }
+        self.container_ref.mark_dirty();
+        Ok(())
+    }
+}
+
+impl ReferenceImpl {
+    fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        match self {
+            Self::ContainerRef(r) => r.write_ref(x),
+            Self::IndexedRef(r) => r.write_ref(x),
+        }
+    }
+}
+
+impl Reference {
+    pub fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        self.0.write_ref(x)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Borrows (Move)
+ *
+ *   Implementation of borrowing in Move: borrow field, borrow local and infrastructure
+ *   to support borrowing an element from a vector.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn borrow_elem(&self, idx: usize) -> PartialVMResult<ValueImpl> {
+        let len = self.container().len();
+        if idx >= len {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "index out of bounds when borrowing container element: got: {}, len: {}",
+                        idx, len
+                    ),
+                ),
+            );
+        }
+
+        let res = match self.container() {
+            Container::Locals(r) | Container::Vec(r) | Container::Struct(r) => {
+                let v = r.borrow();
+                match &v[idx] {
+                    // TODO: check for the impossible combinations.
+                    ValueImpl::Container(container) => {
+                        let r = match self {
+                            Self::Local(_) => Self::Local(container.copy_by_ref()),
+                            Self::Global { status, .. } => Self::Global {
+                                status: Rc::clone(status),
+                                container: container.copy_by_ref(),
+                            },
+                        };
+                        ValueImpl::ContainerRef(r)
+                    }
+                    _ => ValueImpl::IndexedRef(IndexedRef {
+                        idx,
+                        container_ref: self.copy_value(),
+                    }),
+                }
+            }
+
+            Container::VecU8(_)
+            | Container::VecU16(_)
+            | Container::VecU32(_)
+            | Container::VecU64(_)
+            | Container::VecU128(_)
+            | Container::VecU256(_)
+            | Container::VecAddress(_)
+            | Container::VecBool(_) => ValueImpl::IndexedRef(IndexedRef {
+                idx,
+                container_ref: self.copy_value(),
+            }),
+        };
+
+        Ok(res)
+    }
+}
+
+impl StructRef {
+    pub fn borrow_field(&self, idx: usize) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_elem(idx)?))
+    }
+}
+
+impl Locals {
+    pub fn borrow_loc(&self, idx: usize) -> PartialVMResult<Value> {
+        // TODO: this is very similar to SharedContainer::borrow_elem. Find a way to
+        // reuse that code?
+
+        let v = self.0.borrow();
+        if idx >= v.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "index out of bounds when borrowing local: got: {}, len: {}",
+                        idx,
+                        v.len()
+                    ),
+                ),
+            );
+        }
+
+        match &v[idx] {
+            ValueImpl::Container(c) => Ok(Value(ValueImpl::ContainerRef(ContainerRef::Local(
+                c.copy_by_ref(),
+            )))),
+
+            ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
+            | ValueImpl::U64(_)
+            | ValueImpl::U128(_)
+            | ValueImpl::U256(_)
+            | ValueImpl::Bool(_)
+            | ValueImpl::Address(_) => Ok(Value(ValueImpl::IndexedRef(IndexedRef {
+                container_ref: ContainerRef::Local(Container::Locals(Rc::clone(&self.0))),
+                idx,
+            }))),
+
+            ValueImpl::ContainerRef(_) | ValueImpl::Invalid | ValueImpl::IndexedRef(_) => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("cannot borrow local {:?}", &v[idx])),
+            ),
+        }
+    }
+}
+
+impl SignerRef {
+    pub fn borrow_signer(&self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_elem(0)?))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Locals
+ *
+ *   Public APIs for Locals to support reading, writing and moving of values.
+ *
+ **************************************************************************************/
+impl Locals {
+    pub fn new(n: usize) -> Self {
+        Self(Rc::new(RefCell::new(
+            iter::repeat_with(|| ValueImpl::Invalid).take(n).collect(),
+        )))
+    }
+
+    pub fn copy_loc(&self, idx: usize) -> PartialVMResult<Value> {
+        let v = self.0.borrow();
+        match v.get(idx) {
+            Some(ValueImpl::Invalid) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message(format!("cannot copy invalid value at index {}", idx))),
+            Some(v) => Ok(Value(v.copy_value()?)),
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+
+    fn swap_loc(&mut self, idx: usize, x: Value, violation_check: bool) -> PartialVMResult<Value> {
+        let mut v = self.0.borrow_mut();
+        match v.get_mut(idx) {
+            Some(v) => {
+                if violation_check {
+                    if let ValueImpl::Container(c) = v {
+                        if c.rc_count() > 1 {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "moving container with dangling references".to_string(),
+                            ));
+                        }
+                    }
+                }
+                Ok(Value(std::mem::replace(v, x.0)))
+            }
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+
+    pub fn move_loc(&mut self, idx: usize, violation_check: bool) -> PartialVMResult<Value> {
+        match self.swap_loc(idx, Value(ValueImpl::Invalid), violation_check)? {
+            Value(ValueImpl::Invalid) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message(format!("cannot move invalid value at index {}", idx))),
+            v => Ok(v),
+        }
+    }
+
+    pub fn store_loc(
+        &mut self,
+        idx: usize,
+        x: Value,
+        violation_check: bool,
+    ) -> PartialVMResult<()> {
+        self.swap_loc(idx, x, violation_check)?;
+        Ok(())
+    }
+
+    /// Drop all Move values onto a different Vec to avoid leaking memory.
+    /// References are excluded since they may point to invalid data.
+    pub fn drop_all_values(&mut self) -> impl Iterator<Item = (usize, Value)> {
+        let mut locals = self.0.borrow_mut();
+        let mut res = vec![];
+
+        for idx in 0..locals.len() {
+            match &locals[idx] {
+                ValueImpl::Invalid => (),
+                ValueImpl::ContainerRef(_) | ValueImpl::IndexedRef(_) => {
+                    locals[idx] = ValueImpl::Invalid;
+                }
+                _ => res.push((
+                    idx,
+                    Value(std::mem::replace(&mut locals[idx], ValueImpl::Invalid)),
+                )),
+            }
+        }
+
+        res.into_iter()
+    }
+
+    pub fn is_invalid(&self, idx: usize) -> PartialVMResult<bool> {
+        let v = self.0.borrow();
+        match v.get(idx) {
+            Some(ValueImpl::Invalid) => Ok(true),
+            Some(_) => Ok(false),
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Public Value Constructors
+ *
+ *   Constructors to allow values to be created outside this module.
+ *
+ **************************************************************************************/
+impl Value {
+    pub fn u8(x: u8) -> Self {
+        Self(ValueImpl::U8(x))
+    }
+
+    pub fn u16(x: u16) -> Self {
+        Self(ValueImpl::U16(x))
+    }
+
+    pub fn u32(x: u32) -> Self {
+        Self(ValueImpl::U32(x))
+    }
+
+    pub fn u64(x: u64) -> Self {
+        Self(ValueImpl::U64(x))
+    }
+
+    pub fn u128(x: u128) -> Self {
+        Self(ValueImpl::U128(x))
+    }
+
+    pub fn u256(x: u256::U256) -> Self {
+        Self(ValueImpl::U256(x))
+    }
+
+    pub fn bool(x: bool) -> Self {
+        Self(ValueImpl::Bool(x))
+    }
+
+    pub fn address(x: AccountAddress) -> Self {
+        Self(ValueImpl::Address(x))
+    }
+
+    pub fn signer(x: AccountAddress) -> Self {
+        Self(ValueImpl::Container(Container::signer(x)))
+    }
+
+    /// Create a "unowned" reference to a signer value (&signer) for populating the &signer in
+    /// execute function
+    pub fn signer_reference(x: AccountAddress) -> Self {
+        Self(ValueImpl::ContainerRef(ContainerRef::Local(
+            Container::signer(x),
+        )))
+    }
+
+    pub fn struct_(s: Struct) -> Self {
+        Self(ValueImpl::Container(Container::Struct(Rc::new(
+            RefCell::new(s.fields),
+        ))))
+    }
+
+    // TODO: consider whether we want to replace these with fn vector(v: Vec<Value>).
+    pub fn vector_u8(it: impl IntoIterator<Item = u8>) -> Self {
+        Self(ValueImpl::Container(Container::VecU8(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u16(it: impl IntoIterator<Item = u16>) -> Self {
+        Self(ValueImpl::Container(Container::VecU16(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u32(it: impl IntoIterator<Item = u32>) -> Self {
+        Self(ValueImpl::Container(Container::VecU32(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u64(it: impl IntoIterator<Item = u64>) -> Self {
+        Self(ValueImpl::Container(Container::VecU64(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u128(it: impl IntoIterator<Item = u128>) -> Self {
+        Self(ValueImpl::Container(Container::VecU128(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u256(it: impl IntoIterator<Item = u256::U256>) -> Self {
+        Self(ValueImpl::Container(Container::VecU256(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_bool(it: impl IntoIterator<Item = bool>) -> Self {
+        Self(ValueImpl::Container(Container::VecBool(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_address(it: impl IntoIterator<Item = AccountAddress>) -> Self {
+        Self(ValueImpl::Container(Container::VecAddress(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    // REVIEW: This API can break
+    pub fn vector_for_testing_only(it: impl IntoIterator<Item = Value>) -> Self {
+        Self(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+            it.into_iter().map(|v| v.0).collect(),
+        )))))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Casting
+ *
+ *   Due to the public value types being opaque to an external user, the following
+ *   public APIs are required to enable conversion between types in order to gain access
+ *   to specific operations certain more refined types offer.
+ *   For example, one must convert a `Value` to a `Struct` before unpack can be called.
+ *
+ *   It is expected that the caller will keep track of the invariants and guarantee
+ *   the conversion will succeed. An error will be raised in case of a violation.
+ *
+ **************************************************************************************/
+pub trait VMValueCast<T> {
+    fn cast(self) -> PartialVMResult<T>;
+}
+
+macro_rules! impl_vm_value_cast {
+    ($ty: ty, $tc: ident) => {
+        impl VMValueCast<$ty> for Value {
+            fn cast(self) -> PartialVMResult<$ty> {
+                match self.0 {
+                    ValueImpl::$tc(x) => Ok(x),
+                    v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message(format!("cannot cast {:?} to {}", v, stringify!($ty)))),
+                }
+            }
+        }
+    };
+}
+
+impl_vm_value_cast!(u8, U8);
+impl_vm_value_cast!(u16, U16);
+impl_vm_value_cast!(u32, U32);
+impl_vm_value_cast!(u64, U64);
+impl_vm_value_cast!(u128, U128);
+impl_vm_value_cast!(u256::U256, U256);
+impl_vm_value_cast!(bool, Bool);
+impl_vm_value_cast!(AccountAddress, Address);
+impl_vm_value_cast!(ContainerRef, ContainerRef);
+impl_vm_value_cast!(IndexedRef, IndexedRef);
+
+impl VMValueCast<IntegerValue> for Value {
+    fn cast(self) -> PartialVMResult<IntegerValue> {
+        match self.0 {
+            ValueImpl::U8(x) => Ok(IntegerValue::U8(x)),
+            ValueImpl::U16(x) => Ok(IntegerValue::U16(x)),
+            ValueImpl::U32(x) => Ok(IntegerValue::U32(x)),
+            ValueImpl::U64(x) => Ok(IntegerValue::U64(x)),
+            ValueImpl::U128(x) => Ok(IntegerValue::U128(x)),
+            ValueImpl::U256(x) => Ok(IntegerValue::U256(x)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to integer", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Reference> for Value {
+    fn cast(self) -> PartialVMResult<Reference> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(Reference(ReferenceImpl::ContainerRef(r))),
+            ValueImpl::IndexedRef(r) => Ok(Reference(ReferenceImpl::IndexedRef(r))),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Container> for Value {
+    fn cast(self) -> PartialVMResult<Container> {
+        match self.0 {
+            ValueImpl::Container(c) => Ok(c),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to container", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Struct> for Value {
+    fn cast(self) -> PartialVMResult<Struct> {
+        match self.0 {
+            ValueImpl::Container(Container::Struct(r)) => Ok(Struct {
+                fields: take_unique_ownership(r)?,
+            }),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to struct", v,))),
+        }
+    }
+}
+
+impl VMValueCast<StructRef> for Value {
+    fn cast(self) -> PartialVMResult<StructRef> {
+        Ok(StructRef(VMValueCast::cast(self)?))
+    }
+}
+
+impl VMValueCast<Vec<u8>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<u8>> {
+        match self.0 {
+            ValueImpl::Container(Container::VecU8(r)) => take_unique_ownership(r),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector<u8>", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vec<u64>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<u64>> {
+        match self.0 {
+            ValueImpl::Container(Container::VecU64(r)) => take_unique_ownership(r),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector<u64>", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vec<Value>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<Value>> {
+        match self.0 {
+            ValueImpl::Container(Container::Vec(c)) => {
+                Ok(take_unique_ownership(c)?.into_iter().map(Value).collect())
+            }
+            ValueImpl::Address(_)
+            | ValueImpl::Bool(_)
+            | ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
+            | ValueImpl::U64(_)
+            | ValueImpl::U128(_)
+            | ValueImpl::U256(_) => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(
+                    "cannot cast a specialized vector into a non-specialized one".to_string(),
+                )),
+            v => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                    "cannot cast {:?} to vector<non-specialized-type>",
+                    v,
+                )),
+            ),
+        }
+    }
+}
+
+impl VMValueCast<SignerRef> for Value {
+    fn cast(self) -> PartialVMResult<SignerRef> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(SignerRef(r)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to Signer reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<VectorRef> for Value {
+    fn cast(self) -> PartialVMResult<VectorRef> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(VectorRef(r)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vector> for Value {
+    fn cast(self) -> PartialVMResult<Vector> {
+        match self.0 {
+            ValueImpl::Container(c) => Ok(Vector(c)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector", v,))),
+        }
+    }
+}
+
+impl Value {
+    pub fn value_as<T>(self) -> PartialVMResult<T>
+    where
+        Self: VMValueCast<T>,
+    {
+        VMValueCast::cast(self)
+    }
+}
+
+impl VMValueCast<u8> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u8> {
+        match self {
+            Self::U8(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u8", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u16> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u16> {
+        match self {
+            Self::U16(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u16", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u32> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u32> {
+        match self {
+            Self::U32(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u32", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u64> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u64> {
+        match self {
+            Self::U64(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u64", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u128> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u128> {
+        match self {
+            Self::U128(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u128", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u256::U256> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u256::U256> {
+        match self {
+            Self::U256(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u256", v,))),
+        }
+    }
+}
+
+impl IntegerValue {
+    pub fn value_as<T>(self) -> PartialVMResult<T>
+    where
+        Self: VMValueCast<T>,
+    {
+        VMValueCast::cast(self)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Integer Operations
+ *
+ *   Arithmetic operations and conversions for integer values.
+ *
+ **************************************************************************************/
+impl IntegerValue {
+    pub fn add_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_add(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_add(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_add(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_add(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_add(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_add(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot add {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn sub_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_sub(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_sub(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_sub(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_sub(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_sub(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_sub(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot sub {:?} from {:?}", r, l);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn mul_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_mul(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_mul(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_mul(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_mul(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_mul(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_mul(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot mul {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn div_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_div(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_div(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_div(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_div(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_div(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_div(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot div {:?} by {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn rem_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_rem(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_rem(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_rem(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_rem(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_rem(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_rem(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot rem {:?} by {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn bit_or(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l | r),
+            (U16(l), U16(r)) => IntegerValue::U16(l | r),
+            (U32(l), U32(r)) => IntegerValue::U32(l | r),
+            (U64(l), U64(r)) => IntegerValue::U64(l | r),
+            (U128(l), U128(r)) => IntegerValue::U128(l | r),
+            (U256(l), U256(r)) => IntegerValue::U256(l | r),
+            (l, r) => {
+                let msg = format!("Cannot bit_or {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn bit_and(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l & r),
+            (U16(l), U16(r)) => IntegerValue::U16(l & r),
+            (U32(l), U32(r)) => IntegerValue::U32(l & r),
+            (U64(l), U64(r)) => IntegerValue::U64(l & r),
+            (U128(l), U128(r)) => IntegerValue::U128(l & r),
+            (U256(l), U256(r)) => IntegerValue::U256(l & r),
+            (l, r) => {
+                let msg = format!("Cannot bit_and {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn bit_xor(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l ^ r),
+            (U16(l), U16(r)) => IntegerValue::U16(l ^ r),
+            (U32(l), U32(r)) => IntegerValue::U32(l ^ r),
+            (U64(l), U64(r)) => IntegerValue::U64(l ^ r),
+            (U128(l), U128(r)) => IntegerValue::U128(l ^ r),
+            (U256(l), U256(r)) => IntegerValue::U256(l ^ r),
+            (l, r) => {
+                let msg = format!("Cannot bit_xor {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn shl_checked(self, n_bits: u8) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => {
+                if n_bits >= 8 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U8(x << n_bits)
+            }
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x << n_bits)
+            }
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x << n_bits)
+            }
+            U64(x) => {
+                if n_bits >= 64 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U64(x << n_bits)
+            }
+            U128(x) => {
+                if n_bits >= 128 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U128(x << n_bits)
+            }
+            U256(x) => IntegerValue::U256(x << n_bits),
+        })
+    }
+
+    pub fn shr_checked(self, n_bits: u8) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => {
+                if n_bits >= 8 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U8(x >> n_bits)
+            }
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x >> n_bits)
+            }
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x >> n_bits)
+            }
+            U64(x) => {
+                if n_bits >= 64 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U64(x >> n_bits)
+            }
+            U128(x) => {
+                if n_bits >= 128 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U128(x >> n_bits)
+            }
+            U256(x) => IntegerValue::U256(x >> n_bits),
+        })
+    }
+
+    pub fn lt(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l < r,
+            (U16(l), U16(r)) => l < r,
+            (U32(l), U32(r)) => l < r,
+            (U64(l), U64(r)) => l < r,
+            (U128(l), U128(r)) => l < r,
+            (U256(l), U256(r)) => l < r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn le(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l <= r,
+            (U16(l), U16(r)) => l <= r,
+            (U32(l), U32(r)) => l <= r,
+            (U64(l), U64(r)) => l <= r,
+            (U128(l), U128(r)) => l <= r,
+            (U256(l), U256(r)) => l <= r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn gt(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l > r,
+            (U16(l), U16(r)) => l > r,
+            (U32(l), U32(r)) => l > r,
+            (U64(l), U64(r)) => l > r,
+            (U128(l), U128(r)) => l > r,
+            (U256(l), U256(r)) => l > r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn ge(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l >= r,
+            (U16(l), U16(r)) => l >= r,
+            (U32(l), U32(r)) => l >= r,
+            (U64(l), U64(r)) => l >= r,
+            (U128(l), U128(r)) => l >= r,
+            (U256(l), U256(r)) => l >= r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            }
+        })
+    }
+
+    pub fn into_value(self) -> Value {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Value::u8(x),
+            U16(x) => Value::u16(x),
+            U32(x) => Value::u32(x),
+            U64(x) => Value::u64(x),
+            U128(x) => Value::u128(x),
+            U256(x) => Value::u256(x),
+        }
+    }
+}
+
+impl IntegerValue {
+    pub fn cast_u8(self) -> PartialVMResult<u8> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x),
+            U16(x) => {
+                if x > (std::u8::MAX as u16) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u16({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
+            U32(x) => {
+                if x > (std::u8::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
+            U64(x) => {
+                if x > (std::u8::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
+            U128(x) => {
+                if x > (std::u8::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u8::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u8", x)))
+                } else {
+                    Ok(x.unchecked_as_u8())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u16(self) -> PartialVMResult<u16> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u16),
+            U16(x) => Ok(x),
+            U32(x) => {
+                if x > (std::u16::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U64(x) => {
+                if x > (std::u16::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U128(x) => {
+                if x > (std::u16::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u16::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u16", x)))
+                } else {
+                    Ok(x.unchecked_as_u16())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u32(self) -> PartialVMResult<u32> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u32),
+            U16(x) => Ok(x as u32),
+            U32(x) => Ok(x),
+            U64(x) => {
+                if x > (std::u32::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            }
+            U128(x) => {
+                if x > (std::u32::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u32::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x.unchecked_as_u32())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u64(self) -> PartialVMResult<u64> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u64),
+            U16(x) => Ok(x as u64),
+            U32(x) => Ok(x as u64),
+            U64(x) => Ok(x),
+            U128(x) => {
+                if x > (std::u64::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u64", x)))
+                } else {
+                    Ok(x as u64)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u64::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u64", x)))
+                } else {
+                    Ok(x.unchecked_as_u64())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u128(self) -> PartialVMResult<u128> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u128),
+            U16(x) => Ok(x as u128),
+            U32(x) => Ok(x as u128),
+            U64(x) => Ok(x as u128),
+            U128(x) => Ok(x),
+            U256(x) => {
+                if x > (u256::U256::from(std::u128::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u128", x)))
+                } else {
+                    Ok(x.unchecked_as_u128())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u256(self) -> PartialVMResult<u256::U256> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => u256::U256::from(x),
+            U16(x) => u256::U256::from(x),
+            U32(x) => u256::U256::from(x),
+            U64(x) => u256::U256::from(x),
+            U128(x) => u256::U256::from(x),
+            U256(x) => x,
+        })
+    }
+}
+
+/***************************************************************************************
+*
+* Vector
+*
+*   Implemented as a built-in data type.
+*
+**************************************************************************************/
+
+pub const INDEX_OUT_OF_BOUNDS: u64 = NFE_VECTOR_ERROR_BASE + 1;
+pub const POP_EMPTY_VEC: u64 = NFE_VECTOR_ERROR_BASE + 2;
+pub const VEC_UNPACK_PARITY_MISMATCH: u64 = NFE_VECTOR_ERROR_BASE + 3;
+pub const VEC_SIZE_LIMIT_REACHED: u64 = NFE_VECTOR_ERROR_BASE + 4;
+
+fn check_elem_layout(ty: &Type, v: &Container) -> PartialVMResult<()> {
+    match (ty, v) {
+        (Type::U8, Container::VecU8(_))
+        | (Type::U64, Container::VecU64(_))
+        | (Type::U16, Container::VecU16(_))
+        | (Type::U32, Container::VecU32(_))
+        | (Type::U128, Container::VecU128(_))
+        | (Type::U256, Container::VecU256(_))
+        | (Type::Bool, Container::VecBool(_))
+        | (Type::Address, Container::VecAddress(_))
+        | (Type::Signer, Container::Struct(_)) => Ok(()),
+
+        (Type::Vector(_), Container::Vec(_)) => Ok(()),
+
+        (Type::Struct(_), Container::Vec(_))
+        | (Type::Signer, Container::Vec(_))
+        | (Type::StructInstantiation(_, _), Container::Vec(_)) => Ok(()),
+
+        (Type::Reference(_), _) | (Type::MutableReference(_), _) | (Type::TyParam(_), _) => Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("invalid type param for vector: {:?}", ty)),
+        ),
+
+        (Type::U8, _)
+        | (Type::U64, _)
+        | (Type::U16, _)
+        | (Type::U32, _)
+        | (Type::U128, _)
+        | (Type::U256, _)
+        | (Type::Bool, _)
+        | (Type::Address, _)
+        | (Type::Signer, _)
+        | (Type::Vector(_), _)
+        | (Type::Struct(_), _)
+        | (Type::StructInstantiation(_, _), _) => Err(PartialVMError::new(
+            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+        )
+        .with_message(format!(
+            "vector elem layout mismatch, expected {:?}, got {:?}",
+            ty, v
+        ))),
+    }
+}
+
+impl VectorRef {
+    pub fn len(&self, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        let len = match c {
+            Container::VecU8(r) => r.borrow().len(),
+            Container::VecU16(r) => r.borrow().len(),
+            Container::VecU32(r) => r.borrow().len(),
+            Container::VecU64(r) => r.borrow().len(),
+            Container::VecU128(r) => r.borrow().len(),
+            Container::VecU256(r) => r.borrow().len(),
+            Container::VecBool(r) => r.borrow().len(),
+            Container::VecAddress(r) => r.borrow().len(),
+            Container::Vec(r) => r.borrow().len(),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+        Ok(Value::u64(len as u64))
+    }
+
+    pub fn push_back(&self, e: Value, type_param: &Type, capacity: u64) -> PartialVMResult<()> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        let size = match c {
+            Container::VecU8(r) => r.borrow().len(),
+            Container::VecU16(r) => r.borrow().len(),
+            Container::VecU32(r) => r.borrow().len(),
+            Container::VecU64(r) => r.borrow().len(),
+            Container::VecU128(r) => r.borrow().len(),
+            Container::VecU256(r) => r.borrow().len(),
+            Container::VecBool(r) => r.borrow().len(),
+            Container::VecAddress(r) => r.borrow().len(),
+            Container::Vec(r) => r.borrow().len(),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+        if size >= (capacity as usize) {
+            return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                .with_sub_status(VEC_SIZE_LIMIT_REACHED)
+                .with_message(format!("vector size limit is {capacity}",)));
+        }
+
+        match c {
+            Container::VecU8(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU16(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU32(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU64(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU128(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU256(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecBool(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecAddress(r) => r.borrow_mut().push(e.value_as()?),
+            Container::Vec(r) => r.borrow_mut().push(e.0),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        }
+
+        self.0.mark_dirty();
+        Ok(())
+    }
+
+    pub fn borrow_elem(&self, idx: usize, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+        if idx >= c.len() {
+            return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                .with_sub_status(INDEX_OUT_OF_BOUNDS));
+        }
+        Ok(Value(self.0.borrow_elem(idx)?))
+    }
+
+    /// Returns a RefCell reference to the underlying vector of a `&vector<u8>` value.
+    pub fn as_bytes_ref(&self) -> std::cell::Ref<'_, Vec<u8>> {
+        let c = self.0.container();
+        match c {
+            Container::VecU8(r) => r.borrow(),
+            _ => panic!("can only be called on vector<u8>"),
+        }
+    }
+
+    pub fn pop(&self, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        macro_rules! err_pop_empty_vec {
+            () => {
+                return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                    .with_sub_status(POP_EMPTY_VEC))
+            };
+        }
+
+        let res = match c {
+            Container::VecU8(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u8(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU16(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u16(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU32(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u32(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU64(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u64(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU128(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u128(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU256(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u256(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecBool(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::bool(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecAddress(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::address(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::Vec(r) => match r.borrow_mut().pop() {
+                Some(x) => Value(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+
+        self.0.mark_dirty();
+        Ok(res)
+    }
+
+    pub fn swap(&self, idx1: usize, idx2: usize, type_param: &Type) -> PartialVMResult<()> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        macro_rules! swap {
+            ($v: expr) => {{
+                let mut v = $v.borrow_mut();
+                if idx1 >= v.len() || idx2 >= v.len() {
+                    return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                        .with_sub_status(INDEX_OUT_OF_BOUNDS));
+                }
+                v.swap(idx1, idx2);
+            }};
+        }
+
+        match c {
+            Container::VecU8(r) => swap!(r),
+            Container::VecU16(r) => swap!(r),
+            Container::VecU32(r) => swap!(r),
+            Container::VecU64(r) => swap!(r),
+            Container::VecU128(r) => swap!(r),
+            Container::VecU256(r) => swap!(r),
+            Container::VecBool(r) => swap!(r),
+            Container::VecAddress(r) => swap!(r),
+            Container::Vec(r) => swap!(r),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        }
+
+        self.0.mark_dirty();
+        Ok(())
+    }
+}
+
+impl Vector {
+    pub fn pack(type_param: &Type, elements: Vec<Value>) -> PartialVMResult<Value> {
+        let container = match type_param {
+            Type::U8 => Value::vector_u8(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U16 => Value::vector_u16(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U32 => Value::vector_u32(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U64 => Value::vector_u64(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U128 => Value::vector_u128(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U256 => Value::vector_u256(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::Bool => Value::vector_bool(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::Address => Value::vector_address(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+
+            Type::Signer | Type::Vector(_) | Type::Struct(_) | Type::StructInstantiation(_, _) => {
+                Value(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+                    elements.into_iter().map(|v| v.0).collect(),
+                )))))
+            }
+
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("invalid type param for vector: {:?}", type_param)),
+                )
+            }
+        };
+
+        Ok(container)
+    }
+
+    pub fn empty(type_param: &Type) -> PartialVMResult<Value> {
+        Self::pack(type_param, vec![])
+    }
+
+    pub fn unpack(self, type_param: &Type, expected_num: u64) -> PartialVMResult<Vec<Value>> {
+        check_elem_layout(type_param, &self.0)?;
+        let elements: Vec<_> = match self.0 {
+            Container::VecU8(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u8)
+                .collect(),
+            Container::VecU16(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u16)
+                .collect(),
+            Container::VecU32(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u32)
+                .collect(),
+            Container::VecU64(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u64)
+                .collect(),
+            Container::VecU128(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u128)
+                .collect(),
+            Container::VecU256(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u256)
+                .collect(),
+            Container::VecBool(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::bool)
+                .collect(),
+            Container::VecAddress(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::address)
+                .collect(),
+            Container::Vec(r) => take_unique_ownership(r)?.into_iter().map(Value).collect(),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+        if expected_num as usize == elements.len() {
+            Ok(elements)
+        } else {
+            Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                .with_sub_status(VEC_UNPACK_PARITY_MISMATCH))
+        }
+    }
+
+    pub fn destroy_empty(self, type_param: &Type) -> PartialVMResult<()> {
+        self.unpack(type_param, 0)?;
+        Ok(())
+    }
+
+    pub fn to_vec_u8(self) -> PartialVMResult<Vec<u8>> {
+        check_elem_layout(&Type::U8, &self.0)?;
+        if let Container::VecU8(r) = self.0 {
+            Ok(take_unique_ownership(r)?.into_iter().collect())
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("expected vector<u8>".to_string()),
+            )
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Abstract Memory Size
+ *
+ *   TODO(Gas): This is the oldest implementation of abstract memory size.
+ *              It is now kept only as a reference impl, which is used to ensure
+ *              the new implementation is fully backward compatible.
+ *              We should be able to get this removed after we use the new impl
+ *              for a while and gain enough confidence in that.
+ *
+ **************************************************************************************/
+
+/// The size in bytes for a non-string or address constant on the stack
+pub(crate) const LEGACY_CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub(crate) const LEGACY_REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub(crate) const LEGACY_STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+impl Container {
+    fn legacy_size(&self) -> AbstractMemorySize {
+        match self {
+            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
+                Struct::legacy_size_impl(&r.borrow())
+            }
+            Self::VecU8(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u8>()) as u64)
+            }
+            Self::VecU16(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u16>()) as u64)
+            }
+            Self::VecU32(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u32>()) as u64)
+            }
+            Self::VecU64(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u64>()) as u64)
+            }
+            Self::VecU128(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u128>()) as u64)
+            }
+            Self::VecU256(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<u256::U256>()) as u64,
+            ),
+            Self::VecBool(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<bool>()) as u64)
+            }
+            Self::VecAddress(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<AccountAddress>()) as u64,
+            ),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
+    }
+}
+
+impl IndexedRef {
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
+    }
+}
+
+impl ValueImpl {
+    fn legacy_size(&self) -> AbstractMemorySize {
+        use ValueImpl::*;
+
+        match self {
+            Invalid | U8(_) | U16(_) | U32(_) | U64(_) | U128(_) | U256(_) | Bool(_) => {
+                LEGACY_CONST_SIZE
+            }
+            Address(_) => AbstractMemorySize::new(AccountAddress::LENGTH as u64),
+            ContainerRef(r) => r.legacy_size(),
+            IndexedRef(r) => r.legacy_size(),
+            // TODO: in case the borrow fails the VM will panic.
+            Container(c) => c.legacy_size(),
+        }
+    }
+}
+
+impl Struct {
+    fn legacy_size_impl(fields: &[ValueImpl]) -> AbstractMemorySize {
+        fields
+            .iter()
+            .fold(LEGACY_STRUCT_SIZE, |acc, v| acc + v.legacy_size())
+    }
+
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        Self::legacy_size_impl(&self.fields)
+    }
+}
+
+impl Value {
+    pub fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
+    }
+}
+
+#[cfg(test)]
+impl ReferenceImpl {
+    fn legacy_size(&self) -> AbstractMemorySize {
+        match self {
+            Self::ContainerRef(r) => r.legacy_size(),
+            Self::IndexedRef(r) => r.legacy_size(),
+        }
+    }
+}
+
+#[cfg(test)]
+impl Reference {
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
+    }
+}
+
+/***************************************************************************************
+ *
+ * Struct Operations
+ *
+ *   Public APIs for Struct.
+ *
+ **************************************************************************************/
+impl Struct {
+    pub fn pack<I: IntoIterator<Item = Value>>(vals: I) -> Self {
+        Self {
+            fields: vals.into_iter().map(|v| v.0).collect(),
+        }
+    }
+
+    pub fn unpack(self) -> PartialVMResult<impl Iterator<Item = Value>> {
+        Ok(self.fields.into_iter().map(Value))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Global Value Operations
+ *
+ *   Public APIs for GlobalValue. They allow global values to be created from external
+ *   source (a.k.a. storage), and references to be taken from them. At the end of the
+ *   transaction execution the dirty ones can be identified and wrote back to storage.
+ *
+ **************************************************************************************/
+#[allow(clippy::unnecessary_wraps)]
+impl GlobalValueImpl {
+    fn cached(
+        val: ValueImpl,
+        status: GlobalDataStatus,
+    ) -> Result<Self, (PartialVMError, ValueImpl)> {
+        match val {
+            ValueImpl::Container(Container::Struct(fields)) => {
+                let status = Rc::new(RefCell::new(status));
+                Ok(Self::Cached { fields, status })
+            }
+            val => Err((
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("failed to publish cached: not a resource".to_string()),
+                val,
+            )),
+        }
+    }
+
+    fn fresh(val: ValueImpl) -> Result<Self, (PartialVMError, ValueImpl)> {
+        match val {
+            ValueImpl::Container(Container::Struct(fields)) => Ok(Self::Fresh { fields }),
+            val => Err((
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("failed to publish fresh: not a resource".to_string()),
+                val,
+            )),
+        }
+    }
+
+    fn move_from(&mut self) -> PartialVMResult<ValueImpl> {
+        let fields = match self {
+            Self::None | Self::Deleted => {
+                return Err(PartialVMError::new(StatusCode::MISSING_DATA))
+            }
+            Self::Fresh { .. } => match std::mem::replace(self, Self::None) {
+                Self::Fresh { fields } => fields,
+                _ => unreachable!(),
+            },
+            Self::Cached { .. } => match std::mem::replace(self, Self::Deleted) {
+                Self::Cached { fields, .. } => fields,
+                _ => unreachable!(),
+            },
+        };
+        if Rc::strong_count(&fields) != 1 {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("moving global resource with dangling reference".to_string()),
+            );
+        }
+        Ok(ValueImpl::Container(Container::Struct(fields)))
+    }
+
+    fn move_to(&mut self, val: ValueImpl) -> Result<(), (PartialVMError, ValueImpl)> {
+        match self {
+            Self::Fresh { .. } | Self::Cached { .. } => {
+                return Err((
+                    PartialVMError::new(StatusCode::RESOURCE_ALREADY_EXISTS),
+                    val,
+                ))
+            }
+            Self::None => *self = Self::fresh(val)?,
+            Self::Deleted => *self = Self::cached(val, GlobalDataStatus::Dirty)?,
+        }
+        Ok(())
+    }
+
+    fn exists(&self) -> PartialVMResult<bool> {
+        match self {
+            Self::Fresh { .. } | Self::Cached { .. } => Ok(true),
+            Self::None | Self::Deleted => Ok(false),
+        }
+    }
+
+    fn borrow_global(&self) -> PartialVMResult<ValueImpl> {
+        match self {
+            Self::None | Self::Deleted => Err(PartialVMError::new(StatusCode::MISSING_DATA)),
+            Self::Fresh { fields } => Ok(ValueImpl::ContainerRef(ContainerRef::Local(
+                Container::Struct(Rc::clone(fields)),
+            ))),
+            Self::Cached { fields, status } => Ok(ValueImpl::ContainerRef(ContainerRef::Global {
+                container: Container::Struct(Rc::clone(fields)),
+                status: Rc::clone(status),
+            })),
+        }
+    }
+
+    fn into_effect(self) -> Option<Op<ValueImpl>> {
+        match self {
+            Self::None => None,
+            Self::Deleted => Some(Op::Delete),
+            Self::Fresh { fields } => {
+                Some(Op::New(ValueImpl::Container(Container::Struct(fields))))
+            }
+            Self::Cached { fields, status } => match &*status.borrow() {
+                GlobalDataStatus::Dirty => {
+                    Some(Op::Modify(ValueImpl::Container(Container::Struct(fields))))
+                }
+                GlobalDataStatus::Clean => None,
+            },
+        }
+    }
+
+    fn is_mutated(&self) -> bool {
+        match self {
+            Self::None => false,
+            Self::Deleted => true,
+            Self::Fresh { fields: _ } => true,
+            Self::Cached { fields: _, status } => match &*status.borrow() {
+                GlobalDataStatus::Dirty => true,
+                GlobalDataStatus::Clean => false,
+            },
+        }
+    }
+}
+
+impl GlobalValue {
+    pub fn none() -> Self {
+        Self(GlobalValueImpl::None)
+    }
+
+    pub fn cached(val: Value) -> PartialVMResult<Self> {
+        Ok(Self(
+            GlobalValueImpl::cached(val.0, GlobalDataStatus::Clean).map_err(|(err, _val)| err)?,
+        ))
+    }
+
+    pub fn move_from(&mut self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.move_from()?))
+    }
+
+    pub fn move_to(&mut self, val: Value) -> Result<(), (PartialVMError, Value)> {
+        self.0
+            .move_to(val.0)
+            .map_err(|(err, val)| (err, Value(val)))
+    }
+
+    pub fn borrow_global(&self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_global()?))
+    }
+
+    pub fn exists(&self) -> PartialVMResult<bool> {
+        self.0.exists()
+    }
+
+    pub fn into_effect(self) -> Option<Op<Value>> {
+        self.0.into_effect().map(|op| op.map(Value))
+    }
+
+    pub fn is_mutated(&self) -> bool {
+        self.0.is_mutated()
+    }
+}
+
+/***************************************************************************************
+*
+* Display
+*
+*   Implementation of the Display trait for VM Values. These are supposed to be more
+*   friendly & readable than the generated Debug dump.
+*
+**************************************************************************************/
+
+impl Display for ValueImpl {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Invalid => write!(f, "Invalid"),
+
+            Self::U8(x) => write!(f, "U8({})", x),
+            Self::U16(x) => write!(f, "U16({})", x),
+            Self::U32(x) => write!(f, "U32({})", x),
+            Self::U64(x) => write!(f, "U64({})", x),
+            Self::U128(x) => write!(f, "U128({})", x),
+            Self::U256(x) => write!(f, "U256({})", x),
+            Self::Bool(x) => write!(f, "{}", x),
+            Self::Address(addr) => write!(f, "Address({})", addr.short_str_lossless()),
+
+            Self::Container(r) => write!(f, "{}", r),
+
+            Self::ContainerRef(r) => write!(f, "{}", r),
+            Self::IndexedRef(r) => write!(f, "{}", r),
+        }
+    }
+}
+
+fn display_list_of_items<T, I>(items: I, f: &mut fmt::Formatter) -> fmt::Result
+where
+    T: Display,
+    I: IntoIterator<Item = T>,
+{
+    write!(f, "[")?;
+    let mut items = items.into_iter();
+    if let Some(x) = items.next() {
+        write!(f, "{}", x)?;
+        for x in items {
+            write!(f, ", {}", x)?;
+        }
+    }
+    write!(f, "]")
+}
+
+impl Container {
+    fn raw_address(&self) -> usize {
+        use Container::*;
+
+        match self {
+            Locals(r) => r.as_ptr() as usize,
+            Vec(r) => r.as_ptr() as usize,
+            Struct(r) => r.as_ptr() as usize,
+            VecU8(r) => r.as_ptr() as usize,
+            VecU16(r) => r.as_ptr() as usize,
+            VecU32(r) => r.as_ptr() as usize,
+            VecU64(r) => r.as_ptr() as usize,
+            VecU128(r) => r.as_ptr() as usize,
+            VecU256(r) => r.as_ptr() as usize,
+            VecBool(r) => r.as_ptr() as usize,
+            VecAddress(r) => r.as_ptr() as usize,
+        }
+    }
+}
+
+impl Locals {
+    pub fn raw_address(&self) -> usize {
+        self.0.as_ptr() as usize
+    }
+}
+
+impl Display for ContainerRef {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Local(c) => write!(f, "(&container {:x})", c.raw_address()),
+            Self::Global { status, container } => write!(
+                f,
+                "(&container {:x} -- {:?})",
+                container.raw_address(),
+                &*status.borrow(),
+            ),
+        }
+    }
+}
+
+impl Display for IndexedRef {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}[{}]", self.container_ref, self.idx)
+    }
+}
+
+impl Display for Container {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "(container {:x}: ", self.raw_address())?;
+
+        match self {
+            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
+                display_list_of_items(r.borrow().iter(), f)
+            }
+            Self::VecU8(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU16(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU32(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU64(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU128(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU256(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecBool(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecAddress(r) => display_list_of_items(r.borrow().iter(), f),
+        }?;
+
+        write!(f, ")")
+    }
+}
+
+impl Display for Value {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Display::fmt(&self.0, f)
+    }
+}
+
+impl Display for Locals {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            self.0
+                .borrow()
+                .iter()
+                .enumerate()
+                .map(|(idx, val)| format!("[{}] {}", idx, val))
+                .collect::<Vec<_>>()
+                .join("\n")
+        )
+    }
+}
+
+#[allow(dead_code)]
+pub mod debug {
+    use super::*;
+    use std::fmt::Write;
+
+    fn print_invalid<B: Write>(buf: &mut B) -> PartialVMResult<()> {
+        debug_write!(buf, "-")
+    }
+
+    fn print_u8<B: Write>(buf: &mut B, x: &u8) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u16<B: Write>(buf: &mut B, x: &u16) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u32<B: Write>(buf: &mut B, x: &u32) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u64<B: Write>(buf: &mut B, x: &u64) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u128<B: Write>(buf: &mut B, x: &u128) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u256<B: Write>(buf: &mut B, x: &u256::U256) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_bool<B: Write>(buf: &mut B, x: &bool) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_address<B: Write>(buf: &mut B, x: &AccountAddress) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_value_impl<B: Write>(buf: &mut B, val: &ValueImpl) -> PartialVMResult<()> {
+        match val {
+            ValueImpl::Invalid => print_invalid(buf),
+
+            ValueImpl::U8(x) => print_u8(buf, x),
+            ValueImpl::U16(x) => print_u16(buf, x),
+            ValueImpl::U32(x) => print_u32(buf, x),
+            ValueImpl::U64(x) => print_u64(buf, x),
+            ValueImpl::U128(x) => print_u128(buf, x),
+            ValueImpl::U256(x) => print_u256(buf, x),
+            ValueImpl::Bool(x) => print_bool(buf, x),
+            ValueImpl::Address(x) => print_address(buf, x),
+
+            ValueImpl::Container(c) => print_container(buf, c),
+
+            ValueImpl::ContainerRef(r) => print_container_ref(buf, r),
+            ValueImpl::IndexedRef(r) => print_indexed_ref(buf, r),
+        }
+    }
+
+    fn print_list<'a, B, I, X, F>(
+        buf: &mut B,
+        begin: &str,
+        items: I,
+        print: F,
+        end: &str,
+    ) -> PartialVMResult<()>
+    where
+        B: Write,
+        X: 'a,
+        I: IntoIterator<Item = &'a X>,
+        F: Fn(&mut B, &X) -> PartialVMResult<()>,
+    {
+        debug_write!(buf, "{}", begin)?;
+        let mut it = items.into_iter();
+        if let Some(x) = it.next() {
+            print(buf, x)?;
+            for x in it {
+                debug_write!(buf, ", ")?;
+                print(buf, x)?;
+            }
+        }
+        debug_write!(buf, "{}", end)?;
+        Ok(())
+    }
+
+    fn print_container<B: Write>(buf: &mut B, c: &Container) -> PartialVMResult<()> {
+        match c {
+            Container::Vec(r) => print_list(buf, "[", r.borrow().iter(), print_value_impl, "]"),
+
+            Container::Struct(r) => {
+                print_list(buf, "{ ", r.borrow().iter(), print_value_impl, " }")
+            }
+
+            Container::VecU8(r) => print_list(buf, "[", r.borrow().iter(), print_u8, "]"),
+            Container::VecU16(r) => print_list(buf, "[", r.borrow().iter(), print_u16, "]"),
+            Container::VecU32(r) => print_list(buf, "[", r.borrow().iter(), print_u32, "]"),
+            Container::VecU64(r) => print_list(buf, "[", r.borrow().iter(), print_u64, "]"),
+            Container::VecU128(r) => print_list(buf, "[", r.borrow().iter(), print_u128, "]"),
+            Container::VecU256(r) => print_list(buf, "[", r.borrow().iter(), print_u256, "]"),
+            Container::VecBool(r) => print_list(buf, "[", r.borrow().iter(), print_bool, "]"),
+            Container::VecAddress(r) => print_list(buf, "[", r.borrow().iter(), print_address, "]"),
+
+            Container::Locals(_) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message("debug print - invalid container: Locals".to_string())),
+        }
+    }
+
+    fn print_container_ref<B: Write>(buf: &mut B, r: &ContainerRef) -> PartialVMResult<()> {
+        debug_write!(buf, "(&) ")?;
+        print_container(buf, r.container())
+    }
+
+    fn print_slice_elem<B, X, F>(buf: &mut B, v: &[X], idx: usize, print: F) -> PartialVMResult<()>
+    where
+        B: Write,
+        F: FnOnce(&mut B, &X) -> PartialVMResult<()>,
+    {
+        match v.get(idx) {
+            Some(x) => print(buf, x),
+            None => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("ref index out of bounds".to_string()),
+            ),
+        }
+    }
+
+    fn print_indexed_ref<B: Write>(buf: &mut B, r: &IndexedRef) -> PartialVMResult<()> {
+        let idx = r.idx;
+        match r.container_ref.container() {
+            Container::Locals(r) | Container::Vec(r) | Container::Struct(r) => {
+                print_slice_elem(buf, &r.borrow(), idx, print_value_impl)
+            }
+
+            Container::VecU8(r) => print_slice_elem(buf, &r.borrow(), idx, print_u8),
+            Container::VecU16(r) => print_slice_elem(buf, &r.borrow(), idx, print_u16),
+            Container::VecU32(r) => print_slice_elem(buf, &r.borrow(), idx, print_u32),
+            Container::VecU64(r) => print_slice_elem(buf, &r.borrow(), idx, print_u64),
+            Container::VecU128(r) => print_slice_elem(buf, &r.borrow(), idx, print_u128),
+            Container::VecU256(r) => print_slice_elem(buf, &r.borrow(), idx, print_u256),
+            Container::VecBool(r) => print_slice_elem(buf, &r.borrow(), idx, print_bool),
+            Container::VecAddress(r) => print_slice_elem(buf, &r.borrow(), idx, print_address),
+        }
+    }
+
+    // TODO: This function was used in an old implementation of std::debug::print, and can probably be removed.
+    pub fn print_reference<B: Write>(buf: &mut B, r: &Reference) -> PartialVMResult<()> {
+        match &r.0 {
+            ReferenceImpl::ContainerRef(r) => print_container_ref(buf, r),
+            ReferenceImpl::IndexedRef(r) => print_indexed_ref(buf, r),
+        }
+    }
+
+    pub fn print_locals<B: Write>(buf: &mut B, locals: &Locals) -> PartialVMResult<()> {
+        // REVIEW: The number of spaces in the indent is currently hard coded.
+        for (idx, val) in locals.0.borrow().iter().enumerate() {
+            debug_write!(buf, "            [{}] ", idx)?;
+            print_value_impl(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    pub fn print_value<B: Write>(buf: &mut B, val: &Value) -> PartialVMResult<()> {
+        print_value_impl(buf, &val.0)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Serialization & Deserialization
+ *
+ *   BCS implementation for VM values. Note although values are represented as Rust
+ *   enums that carry type info in the tags, we should NOT rely on them for
+ *   serialization:
+ *     1) Depending on the specific internal representation, it may be impossible to
+ *        reconstruct the layout from a value. For example, one cannot tell if a general
+ *        container is a struct or a value.
+ *     2) Even if 1) is not a problem at a certain time, we may change to a different
+ *        internal representation that breaks the 1-1 mapping. Extremely speaking, if
+ *        we switch to untagged unions one day, none of the type info will be carried
+ *        by the value.
+ *
+ *   Therefore the appropriate & robust way to implement serialization & deserialization
+ *   is to involve an explicit representation of the type layout.
+ *
+ **************************************************************************************/
+use serde::{
+    de::Error as DeError,
+    ser::{Error as SerError, SerializeSeq, SerializeTuple},
+    Deserialize,
+};
+
+impl Value {
+    pub fn simple_deserialize(blob: &[u8], layout: &MoveTypeLayout) -> Option<Value> {
+        bcs::from_bytes_seed(SeedWrapper { layout }, blob).ok()
+    }
+
+    pub fn simple_serialize(&self, layout: &MoveTypeLayout) -> Option<Vec<u8>> {
+        bcs::to_bytes(&AnnotatedValue {
+            layout,
+            val: &self.0,
+        })
+        .ok()
+    }
+}
+
+impl Struct {
+    pub fn simple_deserialize(blob: &[u8], layout: &MoveStructLayout) -> Option<Struct> {
+        bcs::from_bytes_seed(SeedWrapper { layout }, blob).ok()
+    }
+
+    pub fn simple_serialize(&self, layout: &MoveStructLayout) -> Option<Vec<u8>> {
+        bcs::to_bytes(&AnnotatedValue {
+            layout,
+            val: &self.fields,
+        })
+        .ok()
+    }
+}
+
+struct AnnotatedValue<'a, 'b, T1, T2> {
+    layout: &'a T1,
+    val: &'b T2,
+}
+
+fn invariant_violation<S: serde::Serializer>(message: String) -> S::Error {
+    S::Error::custom(
+        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(message),
+    )
+}
+
+impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveTypeLayout, ValueImpl> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match (self.layout, self.val) {
+            (MoveTypeLayout::U8, ValueImpl::U8(x)) => serializer.serialize_u8(*x),
+            (MoveTypeLayout::U16, ValueImpl::U16(x)) => serializer.serialize_u16(*x),
+            (MoveTypeLayout::U32, ValueImpl::U32(x)) => serializer.serialize_u32(*x),
+            (MoveTypeLayout::U64, ValueImpl::U64(x)) => serializer.serialize_u64(*x),
+            (MoveTypeLayout::U128, ValueImpl::U128(x)) => serializer.serialize_u128(*x),
+            (MoveTypeLayout::U256, ValueImpl::U256(x)) => x.serialize(serializer),
+            (MoveTypeLayout::Bool, ValueImpl::Bool(x)) => serializer.serialize_bool(*x),
+            (MoveTypeLayout::Address, ValueImpl::Address(x)) => x.serialize(serializer),
+
+            (MoveTypeLayout::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
+                (AnnotatedValue {
+                    layout: struct_layout,
+                    val: &*r.borrow(),
+                })
+                .serialize(serializer)
+            }
+
+            (MoveTypeLayout::Vector(layout), ValueImpl::Container(c)) => {
+                let layout = &**layout;
+                match (layout, c) {
+                    (MoveTypeLayout::U8, Container::VecU8(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U16, Container::VecU16(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U32, Container::VecU32(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U64, Container::VecU64(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U128, Container::VecU128(r)) => {
+                        r.borrow().serialize(serializer)
+                    }
+                    (MoveTypeLayout::U256, Container::VecU256(r)) => {
+                        r.borrow().serialize(serializer)
+                    }
+                    (MoveTypeLayout::Bool, Container::VecBool(r)) => {
+                        r.borrow().serialize(serializer)
+                    }
+                    (MoveTypeLayout::Address, Container::VecAddress(r)) => {
+                        r.borrow().serialize(serializer)
+                    }
+
+                    (_, Container::Vec(r)) => {
+                        let v = r.borrow();
+                        let mut t = serializer.serialize_seq(Some(v.len()))?;
+                        for val in v.iter() {
+                            t.serialize_element(&AnnotatedValue { layout, val })?;
+                        }
+                        t.end()
+                    }
+
+                    (layout, container) => Err(invariant_violation::<S>(format!(
+                        "cannot serialize container {:?} as {:?}",
+                        container, layout
+                    ))),
+                }
+            }
+
+            (MoveTypeLayout::Signer, ValueImpl::Container(Container::Struct(r))) => {
+                let v = r.borrow();
+                if v.len() != 1 {
+                    return Err(invariant_violation::<S>(format!(
+                        "cannot serialize container as a signer -- expected 1 field got {}",
+                        v.len()
+                    )));
+                }
+                (AnnotatedValue {
+                    layout: &MoveTypeLayout::Address,
+                    val: &v[0],
+                })
+                .serialize(serializer)
+            }
+
+            (ty, val) => Err(invariant_violation::<S>(format!(
+                "cannot serialize value {:?} as {:?}",
+                val, ty
+            ))),
+        }
+    }
+}
+
+impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveStructLayout, Vec<ValueImpl>> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let values = &self.val;
+        let fields = self.layout.fields();
+        if fields.len() != values.len() {
+            return Err(invariant_violation::<S>(format!(
+                "cannot serialize struct value {:?} as {:?} -- number of fields mismatch",
+                self.val, self.layout
+            )));
+        }
+        let mut t = serializer.serialize_tuple(values.len())?;
+        for (field_layout, val) in fields.iter().zip(values.iter()) {
+            t.serialize_element(&AnnotatedValue {
+                layout: field_layout,
+                val,
+            })?;
+        }
+        t.end()
+    }
+}
+
+#[derive(Clone)]
+struct SeedWrapper<L> {
+    layout: L,
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveTypeLayout> {
+    type Value = Value;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        use MoveTypeLayout as L;
+
+        match self.layout {
+            L::Bool => bool::deserialize(deserializer).map(Value::bool),
+            L::U8 => u8::deserialize(deserializer).map(Value::u8),
+            L::U16 => u16::deserialize(deserializer).map(Value::u16),
+            L::U32 => u32::deserialize(deserializer).map(Value::u32),
+            L::U64 => u64::deserialize(deserializer).map(Value::u64),
+            L::U128 => u128::deserialize(deserializer).map(Value::u128),
+            L::U256 => u256::U256::deserialize(deserializer).map(Value::u256),
+            L::Address => AccountAddress::deserialize(deserializer).map(Value::address),
+            L::Signer => AccountAddress::deserialize(deserializer).map(Value::signer),
+
+            L::Struct(struct_layout) => Ok(Value::struct_(
+                SeedWrapper {
+                    layout: struct_layout,
+                }
+                .deserialize(deserializer)?,
+            )),
+
+            L::Vector(layout) => {
+                let container = match &**layout {
+                    L::U8 => {
+                        Container::VecU8(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U16 => {
+                        Container::VecU16(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U32 => {
+                        Container::VecU32(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U64 => {
+                        Container::VecU64(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U128 => {
+                        Container::VecU128(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U256 => {
+                        Container::VecU256(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::Bool => {
+                        Container::VecBool(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::Address => Container::VecAddress(Rc::new(RefCell::new(Vec::deserialize(
+                        deserializer,
+                    )?))),
+                    layout => {
+                        let v = deserializer
+                            .deserialize_seq(VectorElementVisitor(SeedWrapper { layout }))?;
+                        Container::Vec(Rc::new(RefCell::new(v)))
+                    }
+                };
+                Ok(Value(ValueImpl::Container(container)))
+            }
+        }
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveStructLayout> {
+    type Value = Struct;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        let field_layouts = self.layout.fields();
+        let fields = deserializer
+            .deserialize_tuple(field_layouts.len(), StructFieldVisitor(field_layouts))?;
+        Ok(Struct::pack(fields))
+    }
+}
+
+struct VectorElementVisitor<'a>(SeedWrapper<&'a MoveTypeLayout>);
+
+impl<'d, 'a> serde::de::Visitor<'d> for VectorElementVisitor<'a> {
+    type Value = Vec<ValueImpl>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Vector")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        while let Some(elem) = seq.next_element_seed(self.0.clone())? {
+            vals.push(elem.0)
+        }
+        Ok(vals)
+    }
+}
+
+struct StructFieldVisitor<'a>(&'a [MoveTypeLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
+    type Value = Vec<Value>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut val = Vec::new();
+        for (i, field_layout) in self.0.iter().enumerate() {
+            if let Some(elem) = seq.next_element_seed(SeedWrapper {
+                layout: field_layout,
+            })? {
+                val.push(elem)
+            } else {
+                return Err(A::Error::invalid_length(i, &self));
+            }
+        }
+        Ok(val)
+    }
+}
+
+/***************************************************************************************
+*
+* Constants
+*
+*   Implementation of deserialization of constant data into a runtime value
+*
+**************************************************************************************/
+
+impl Value {
+    fn constant_sig_token_to_layout(constant_signature: &SignatureToken) -> Option<MoveTypeLayout> {
+        use MoveTypeLayout as L;
+        use SignatureToken as S;
+
+        Some(match constant_signature {
+            S::Bool => L::Bool,
+            S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
+            S::U64 => L::U64,
+            S::U128 => L::U128,
+            S::U256 => L::U256,
+            S::Address => L::Address,
+            S::Signer => return None,
+            S::Vector(inner) => L::Vector(Box::new(Self::constant_sig_token_to_layout(inner)?)),
+            // Not yet supported
+            S::Struct(_) | S::StructInstantiation(_, _) => return None,
+            // Not allowed/Not meaningful
+            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) => return None,
+        })
+    }
+
+    pub fn deserialize_constant(constant: &Constant) -> Option<Value> {
+        let layout = Self::constant_sig_token_to_layout(&constant.type_)?;
+        Value::simple_deserialize(&constant.data, &layout)
+    }
+}
+
+/***************************************************************************************
+*
+* Destructors
+*
+**************************************************************************************/
+// Locals may contain reference values that points to the same cotnainer through Rc, hencing forming
+// a cycle. Therefore values need to be manually taken out of the Locals in order to not leak memory.
+impl Drop for Locals {
+    fn drop(&mut self) {
+        _ = self.drop_all_values();
+    }
+}
+
+/***************************************************************************************
+*
+* Views
+*
+**************************************************************************************/
+impl Container {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use Container::*;
+
+        match self {
+            Locals(_) => unreachable!("Should not ba able to visit a Locals container directly"),
+            Vec(r) => {
+                let r = r.borrow();
+                if visitor.visit_vec(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            }
+            Struct(r) => {
+                let r = r.borrow();
+                if visitor.visit_struct(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            }
+            VecU8(r) => visitor.visit_vec_u8(depth, &r.borrow()),
+            VecU16(r) => visitor.visit_vec_u16(depth, &r.borrow()),
+            VecU32(r) => visitor.visit_vec_u32(depth, &r.borrow()),
+            VecU64(r) => visitor.visit_vec_u64(depth, &r.borrow()),
+            VecU128(r) => visitor.visit_vec_u128(depth, &r.borrow()),
+            VecU256(r) => visitor.visit_vec_u256(depth, &r.borrow()),
+            VecBool(r) => visitor.visit_vec_bool(depth, &r.borrow()),
+            VecAddress(r) => visitor.visit_vec_address(depth, &r.borrow()),
+        }
+    }
+
+    fn visit_indexed(&self, visitor: &mut impl ValueVisitor, depth: usize, idx: usize) {
+        use Container::*;
+
+        match self {
+            Locals(r) | Vec(r) | Struct(r) => r.borrow()[idx].visit_impl(visitor, depth + 1),
+            VecU8(vals) => visitor.visit_u8(depth + 1, vals.borrow()[idx]),
+            VecU16(vals) => visitor.visit_u16(depth + 1, vals.borrow()[idx]),
+            VecU32(vals) => visitor.visit_u32(depth + 1, vals.borrow()[idx]),
+            VecU64(vals) => visitor.visit_u64(depth + 1, vals.borrow()[idx]),
+            VecU128(vals) => visitor.visit_u128(depth + 1, vals.borrow()[idx]),
+            VecU256(vals) => visitor.visit_u256(depth + 1, vals.borrow()[idx]),
+            VecBool(vals) => visitor.visit_bool(depth + 1, vals.borrow()[idx]),
+            VecAddress(vals) => visitor.visit_address(depth + 1, vals.borrow()[idx]),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match self {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_impl(visitor, depth + 1);
+        }
+    }
+}
+
+impl IndexedRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match &self.container_ref {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_indexed(visitor, depth, self.idx)
+        }
+    }
+}
+
+impl ValueImpl {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ValueImpl::*;
+
+        match self {
+            Invalid => unreachable!("Should not be able to visit an invalid value"),
+
+            U8(val) => visitor.visit_u8(depth, *val),
+            U16(val) => visitor.visit_u16(depth, *val),
+            U32(val) => visitor.visit_u32(depth, *val),
+            U64(val) => visitor.visit_u64(depth, *val),
+            U128(val) => visitor.visit_u128(depth, *val),
+            U256(val) => visitor.visit_u256(depth, *val),
+            Bool(val) => visitor.visit_bool(depth, *val),
+            Address(val) => visitor.visit_address(depth, *val),
+
+            Container(c) => c.visit_impl(visitor, depth),
+
+            ContainerRef(r) => r.visit_impl(visitor, depth),
+            IndexedRef(r) => r.visit_impl(visitor, depth),
+        }
+    }
+}
+
+impl ValueView for ValueImpl {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for Value {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit(visitor)
+    }
+}
+
+impl ValueView for Struct {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        if visitor.visit_struct(0, self.fields.len()) {
+            for val in self.fields.iter() {
+                val.visit_impl(visitor, 1);
+            }
+        }
+    }
+}
+
+impl ValueView for Vector {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for IntegerValue {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use IntegerValue::*;
+
+        match self {
+            U8(val) => visitor.visit_u8(0, *val),
+            U16(val) => visitor.visit_u16(0, *val),
+            U32(val) => visitor.visit_u32(0, *val),
+            U64(val) => visitor.visit_u64(0, *val),
+            U128(val) => visitor.visit_u128(0, *val),
+            U256(val) => visitor.visit_u256(0, *val),
+        }
+    }
+}
+
+impl ValueView for Reference {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use ReferenceImpl::*;
+
+        match &self.0 {
+            ContainerRef(r) => r.visit_impl(visitor, 0),
+            IndexedRef(r) => r.visit_impl(visitor, 0),
+        }
+    }
+}
+
+impl ValueView for VectorRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for StructRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for SignerRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+// Note: We may want to add more helpers to retrieve value views behind references here.
+
+impl Struct {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn field_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> {
+        self.fields.iter()
+    }
+}
+
+impl Vector {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn elem_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> {
+        struct ElemView<'b> {
+            container: &'b Container,
+            idx: usize,
+        }
+
+        impl<'b> ValueView for ElemView<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                self.container.visit_indexed(visitor, 0, self.idx)
+            }
+        }
+
+        let len = self.0.len();
+
+        (0..len).map(|idx| ElemView {
+            container: &self.0,
+            idx,
+        })
+    }
+}
+
+impl Reference {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn value_view<'a>(&'a self) -> impl ValueView + 'a {
+        struct ValueBehindRef<'b>(&'b ReferenceImpl);
+
+        impl<'b> ValueView for ValueBehindRef<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                use ReferenceImpl::*;
+
+                match self.0 {
+                    ContainerRef(r) => r.container().visit_impl(visitor, 0),
+                    IndexedRef(r) => r.container_ref.container().visit_indexed(visitor, 0, r.idx),
+                }
+            }
+        }
+
+        ValueBehindRef(&self.0)
+    }
+}
+
+impl GlobalValue {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn view<'a>(&'a self) -> Option<impl ValueView + 'a> {
+        use GlobalValueImpl as G;
+
+        struct Wrapper<'b>(&'b Rc<RefCell<Vec<ValueImpl>>>);
+
+        impl<'b> ValueView for Wrapper<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                let r = self.0.borrow();
+                if visitor.visit_struct(0, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, 1);
+                    }
+                }
+            }
+        }
+
+        match &self.0 {
+            G::None | G::Deleted => None,
+            G::Cached { fields, .. } | G::Fresh { fields } => Some(Wrapper(fields)),
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Prop Testing
+ *
+ *   Random generation of values that fit into a given layout.
+ *
+ **************************************************************************************/
+#[cfg(feature = "fuzzing")]
+pub mod prop {
+    use super::*;
+    use proptest::{collection::vec, prelude::*};
+
+    pub fn value_strategy_with_layout(layout: &MoveTypeLayout) -> impl Strategy<Value = Value> {
+        use MoveTypeLayout as L;
+
+        match layout {
+            L::U8 => any::<u8>().prop_map(Value::u8).boxed(),
+            L::U16 => any::<u16>().prop_map(Value::u16).boxed(),
+            L::U32 => any::<u32>().prop_map(Value::u32).boxed(),
+            L::U64 => any::<u64>().prop_map(Value::u64).boxed(),
+            L::U128 => any::<u128>().prop_map(Value::u128).boxed(),
+            L::U256 => any::<u256::U256>().prop_map(Value::u256).boxed(),
+            L::Bool => any::<bool>().prop_map(Value::bool).boxed(),
+            L::Address => any::<AccountAddress>().prop_map(Value::address).boxed(),
+            L::Signer => any::<AccountAddress>().prop_map(Value::signer).boxed(),
+
+            L::Vector(layout) => match &**layout {
+                L::U8 => vec(any::<u8>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU8(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U16 => vec(any::<u16>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU16(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U32 => vec(any::<u32>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU32(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U64 => vec(any::<u64>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU64(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U128 => vec(any::<u128>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU128(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U256 => vec(any::<u256::U256>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU256(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::Bool => vec(any::<bool>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecBool(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::Address => vec(any::<AccountAddress>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecAddress(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                layout => vec(value_strategy_with_layout(layout), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+                            vals.into_iter().map(|val| val.0).collect(),
+                        )))))
+                    })
+                    .boxed(),
+            },
+
+            L::Struct(struct_layout) => struct_layout
+                .fields()
+                .iter()
+                .map(|layout| value_strategy_with_layout(layout))
+                .collect::<Vec<_>>()
+                .prop_map(move |vals| Value::struct_(Struct::pack(vals)))
+                .boxed(),
+        }
+    }
+
+    pub fn layout_strategy() -> impl Strategy<Value = MoveTypeLayout> {
+        use MoveTypeLayout as L;
+
+        let leaf = prop_oneof![
+            1 => Just(L::U8),
+            1 => Just(L::U16),
+            1 => Just(L::U32),
+            1 => Just(L::U64),
+            1 => Just(L::U128),
+            1 => Just(L::U256),
+            1 => Just(L::Bool),
+            1 => Just(L::Address),
+            1 => Just(L::Signer),
+        ];
+
+        leaf.prop_recursive(8, 32, 2, |inner| {
+            prop_oneof![
+                1 => inner.clone().prop_map(|layout| L::Vector(Box::new(layout))),
+                1 => vec(inner, 0..1).prop_map(|f_layouts| {
+                     L::Struct(MoveStructLayout::new(f_layouts))}),
+            ]
+        })
+    }
+
+    pub fn layout_and_value_strategy() -> impl Strategy<Value = (MoveTypeLayout, Value)> {
+        layout_strategy().no_shrink().prop_flat_map(|layout| {
+            let value_strategy = value_strategy_with_layout(&layout);
+            (Just(layout), value_strategy)
+        })
+    }
+}
+
+use move_core_types::runtime_value::{MoveStruct, MoveValue};
+
+impl ValueImpl {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        use MoveTypeLayout as L;
+
+        match (layout, &self) {
+            (L::U8, ValueImpl::U8(x)) => MoveValue::U8(*x),
+            (L::U16, ValueImpl::U16(x)) => MoveValue::U16(*x),
+            (L::U32, ValueImpl::U32(x)) => MoveValue::U32(*x),
+            (L::U64, ValueImpl::U64(x)) => MoveValue::U64(*x),
+            (L::U128, ValueImpl::U128(x)) => MoveValue::U128(*x),
+            (L::U256, ValueImpl::U256(x)) => MoveValue::U256(*x),
+            (L::Bool, ValueImpl::Bool(x)) => MoveValue::Bool(*x),
+            (L::Address, ValueImpl::Address(x)) => MoveValue::Address(*x),
+
+            (L::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
+                let mut fields = vec![];
+                for (v, field_layout) in r.borrow().iter().zip(struct_layout.fields().iter()) {
+                    fields.push(v.as_move_value(field_layout));
+                }
+                MoveValue::Struct(MoveStruct::new(fields))
+            }
+
+            (L::Vector(inner_layout), ValueImpl::Container(c)) => MoveValue::Vector(match c {
+                Container::VecU8(r) => r.borrow().iter().map(|u| MoveValue::U8(*u)).collect(),
+                Container::VecU16(r) => r.borrow().iter().map(|u| MoveValue::U16(*u)).collect(),
+                Container::VecU32(r) => r.borrow().iter().map(|u| MoveValue::U32(*u)).collect(),
+                Container::VecU64(r) => r.borrow().iter().map(|u| MoveValue::U64(*u)).collect(),
+                Container::VecU128(r) => r.borrow().iter().map(|u| MoveValue::U128(*u)).collect(),
+                Container::VecU256(r) => r.borrow().iter().map(|u| MoveValue::U256(*u)).collect(),
+                Container::VecBool(r) => r.borrow().iter().map(|u| MoveValue::Bool(*u)).collect(),
+                Container::VecAddress(r) => {
+                    r.borrow().iter().map(|u| MoveValue::Address(*u)).collect()
+                }
+                Container::Vec(r) => r
+                    .borrow()
+                    .iter()
+                    .map(|v| v.as_move_value(inner_layout.as_ref()))
+                    .collect(),
+                Container::Struct(_) => {
+                    panic!("got struct container when converting vec")
+                }
+                Container::Locals(_) => panic!("got locals container when converting vec"),
+            }),
+
+            (L::Signer, ValueImpl::Container(Container::Struct(r))) => {
+                let v = r.borrow();
+                if v.len() != 1 {
+                    panic!("Unexpected signer layout: {:?}", v);
+                }
+                match &v[0] {
+                    ValueImpl::Address(a) => MoveValue::Signer(*a),
+                    v => panic!("Unexpected non-address while converting signer: {:?}", v),
+                }
+            }
+
+            (layout, val) => panic!("Cannot convert value {:?} as {:?}", val, layout),
+        }
+    }
+}
+
+impl Value {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        self.0.as_move_value(layout)
+    }
+}
diff --git a/vendors/move/crates/move-vm-types/src/views.rs b/vendors/move/crates/move-vm-types/src/views.rs
new file mode 100644
index 000000000..6f249a3a0
--- /dev/null
+++ b/vendors/move/crates/move-vm-types/src/views.rs
@@ -0,0 +1,316 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    account_address::AccountAddress, gas_algebra::AbstractMemorySize, language_storage::TypeTag,
+};
+use std::mem::size_of;
+
+/// Trait that provides an abstract view into a Move type.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait TypeView {
+    /// Returns the `TypeTag` (fully qualified name) of the type.
+    fn to_type_tag(&self) -> TypeTag;
+}
+
+/// Trait that provides an abstract view into a Move Value.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait ValueView {
+    fn visit(&self, visitor: &mut impl ValueVisitor);
+
+    /// Returns the abstract memory size of the value.
+    ///
+    /// This version of abstract memory size is not well-defined and is only kept for backward
+    /// compatibility.  New applications should avoid using this.
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        use crate::values::{LEGACY_CONST_SIZE, LEGACY_REFERENCE_SIZE, LEGACY_STRUCT_SIZE};
+
+        struct Acc(AbstractMemorySize);
+
+        impl ValueVisitor for Acc {
+            fn visit_u8(&mut self, _depth: usize, _val: u8) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u16(&mut self, _depth: usize, _val: u16) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u32(&mut self, _depth: usize, _val: u32) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u64(&mut self, _depth: usize, _val: u64) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u128(&mut self, _depth: usize, _val: u128) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u256(&mut self, _depth: usize, _val: move_core_types::u256::U256) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_bool(&mut self, _depth: usize, _val: bool) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_address(&mut self, _depth: usize, _val: AccountAddress) {
+                self.0 += AbstractMemorySize::new(AccountAddress::LENGTH as u64);
+            }
+
+            fn visit_struct(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec_u8(&mut self, _depth: usize, vals: &[u8]) {
+                self.0 += ((size_of::<u8>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u16(&mut self, _depth: usize, vals: &[u16]) {
+                self.0 += ((size_of::<u16>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u32(&mut self, _depth: usize, vals: &[u32]) {
+                self.0 += ((size_of::<u32>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u64(&mut self, _depth: usize, vals: &[u64]) {
+                self.0 += ((size_of::<u64>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u128(&mut self, _depth: usize, vals: &[u128]) {
+                self.0 += ((size_of::<u128>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u256(&mut self, _depth: usize, vals: &[move_core_types::u256::U256]) {
+                self.0 += ((size_of::<move_core_types::u256::U256>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_bool(&mut self, _depth: usize, vals: &[bool]) {
+                self.0 += ((size_of::<bool>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_address(&mut self, _depth: usize, vals: &[AccountAddress]) {
+                self.0 += ((size_of::<AccountAddress>() * vals.len()) as u64).into();
+            }
+
+            fn visit_ref(&mut self, _depth: usize, _is_global: bool) -> bool {
+                self.0 += LEGACY_REFERENCE_SIZE;
+                false
+            }
+        }
+
+        let mut acc = Acc(0.into());
+        self.visit(&mut acc);
+
+        acc.0
+    }
+
+    /// Returns the abstract memory size of the value.
+    fn abstract_memory_size(&self) -> AbstractMemorySize {
+        use crate::values::{LEGACY_CONST_SIZE, LEGACY_REFERENCE_SIZE, LEGACY_STRUCT_SIZE};
+
+        struct Acc(AbstractMemorySize);
+
+        impl ValueVisitor for Acc {
+            fn visit_u8(&mut self, _depth: usize, _val: u8) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u16(&mut self, _depth: usize, _val: u16) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u32(&mut self, _depth: usize, _val: u32) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u64(&mut self, _depth: usize, _val: u64) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u128(&mut self, _depth: usize, _val: u128) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u256(&mut self, _depth: usize, _val: move_core_types::u256::U256) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_bool(&mut self, _depth: usize, _val: bool) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_address(&mut self, _depth: usize, _val: AccountAddress) {
+                self.0 += AbstractMemorySize::new(AccountAddress::LENGTH as u64);
+            }
+
+            fn visit_struct(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec_u8(&mut self, _depth: usize, vals: &[u8]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<u8>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u16(&mut self, _depth: usize, vals: &[u16]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<u16>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u32(&mut self, _depth: usize, vals: &[u32]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<u32>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u64(&mut self, _depth: usize, vals: &[u64]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<u64>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u128(&mut self, _depth: usize, vals: &[u128]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<u128>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u256(&mut self, _depth: usize, vals: &[move_core_types::u256::U256]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<move_core_types::u256::U256>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_bool(&mut self, _depth: usize, vals: &[bool]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<bool>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_address(&mut self, _depth: usize, vals: &[AccountAddress]) {
+                self.0 += LEGACY_STRUCT_SIZE;
+                self.0 += ((size_of::<AccountAddress>() * vals.len()) as u64).into();
+            }
+
+            fn visit_ref(&mut self, _depth: usize, _is_global: bool) -> bool {
+                self.0 += LEGACY_REFERENCE_SIZE;
+                false
+            }
+        }
+
+        let mut acc = Acc(0.into());
+        self.visit(&mut acc);
+
+        acc.0
+    }
+}
+
+/// Trait that defines a visitor that could be used to traverse a value recursively.
+pub trait ValueVisitor {
+    fn visit_u8(&mut self, depth: usize, val: u8);
+    fn visit_u16(&mut self, depth: usize, val: u16);
+    fn visit_u32(&mut self, depth: usize, val: u32);
+    fn visit_u64(&mut self, depth: usize, val: u64);
+    fn visit_u128(&mut self, depth: usize, val: u128);
+    fn visit_u256(&mut self, depth: usize, val: move_core_types::u256::U256);
+    fn visit_bool(&mut self, depth: usize, val: bool);
+    fn visit_address(&mut self, depth: usize, val: AccountAddress);
+
+    fn visit_struct(&mut self, depth: usize, len: usize) -> bool;
+    fn visit_vec(&mut self, depth: usize, len: usize) -> bool;
+
+    fn visit_ref(&mut self, depth: usize, is_global: bool) -> bool;
+
+    fn visit_vec_u8(&mut self, depth: usize, vals: &[u8]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u8(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u16(&mut self, depth: usize, vals: &[u16]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u16(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u32(&mut self, depth: usize, vals: &[u32]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u32(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u64(&mut self, depth: usize, vals: &[u64]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u64(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u128(&mut self, depth: usize, vals: &[u128]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u128(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u256(&mut self, depth: usize, vals: &[move_core_types::u256::U256]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u256(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_bool(&mut self, depth: usize, vals: &[bool]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_bool(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_address(&mut self, depth: usize, vals: &[AccountAddress]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_address(depth + 1, *val);
+        }
+    }
+}
+
+impl<T> ValueView for &T
+where
+    T: ValueView,
+{
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        <T as ValueView>::legacy_abstract_memory_size(*self)
+    }
+
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        <T as ValueView>::visit(*self, visitor)
+    }
+}
+
+impl<T> TypeView for &T
+where
+    T: TypeView,
+{
+    fn to_type_tag(&self) -> TypeTag {
+        <T as TypeView>::to_type_tag(*self)
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/Cargo.toml b/vendors/move/crates/move-vm/integration-tests/Cargo.toml
new file mode 100644
index 000000000..46061346c
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "move-vm-integration-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move VM Integration Tests"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.52"
+memory-stats = "1.0.0"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-compiler = { path = "../../move-compiler" }
+tempfile = "3.2.0"
+
+move-core-types = { path = "../../move-core-types" }
+move-stdlib = { path = "../../move-stdlib" }
+move-table-extension = { path = "../../extensions/move-table-extension", optional = true }
+move-vm-runtime = { path = "../runtime" }
+move-vm-test-utils = { path = "../test-utils" }
+move-vm-types = { path = "../types" }
+
+[features]
+default = []
+table-extension = [
+    "move-table-extension",
+    "move-vm-test-utils/table-extension"
+]
diff --git a/vendors/move/crates/move-vm/integration-tests/src/compiler.rs b/vendors/move/crates/move-vm/integration-tests/src/compiler.rs
new file mode 100644
index 000000000..5441bfa04
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/compiler.rs
@@ -0,0 +1,90 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler as MoveCompiler};
+use std::{fs::File, io::Write, path::Path};
+use tempfile::tempdir;
+
+pub fn compile_units(s: &str) -> Result<Vec<AnnotatedCompiledUnit>> {
+    let dir = tempdir()?;
+
+    let file_path = dir.path().join("modules.move");
+    {
+        let mut file = File::create(&file_path)?;
+        writeln!(file, "{}", s)?;
+    }
+
+    let (_, units) = MoveCompiler::from_files(
+        vec![file_path.to_str().unwrap().to_string()],
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()?;
+
+    dir.close()?;
+
+    Ok(units)
+}
+
+pub fn compile_units_with_stdlib(s: &str) -> Result<Vec<AnnotatedCompiledUnit>> {
+    let dir = tempdir()?;
+
+    let file_path = dir.path().join("modules.move");
+    {
+        let mut file = File::create(&file_path)?;
+        writeln!(file, "{}", s)?;
+    }
+
+    let (_, units) = MoveCompiler::from_files(
+        vec![file_path.to_str().unwrap().to_string()],
+        move_stdlib::move_stdlib_files(),
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()?;
+
+    dir.close()?;
+
+    Ok(units)
+}
+
+fn expect_modules(
+    units: impl IntoIterator<Item = AnnotatedCompiledUnit>,
+) -> impl Iterator<Item = Result<CompiledModule>> {
+    units.into_iter().map(|unit| match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => Ok(annot_module.named_module.module),
+        AnnotatedCompiledUnit::Script(_) => bail!("expected modules got script"),
+    })
+}
+
+pub fn compile_modules_in_file(path: &Path) -> Result<Vec<CompiledModule>> {
+    let (_, units) = MoveCompiler::from_files(
+        vec![path.to_str().unwrap().to_string()],
+        vec![],
+        std::collections::BTreeMap::<String, _>::new(),
+    )
+    .build_and_report()?;
+
+    expect_modules(units).collect()
+}
+
+#[allow(dead_code)]
+pub fn compile_modules(s: &str) -> Result<Vec<CompiledModule>> {
+    expect_modules(compile_units(s)?).collect()
+}
+
+pub fn as_module(unit: AnnotatedCompiledUnit) -> CompiledModule {
+    match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => annot_module.named_module.module,
+        AnnotatedCompiledUnit::Script(_) => panic!("expected module got script"),
+    }
+}
+
+pub fn as_script(unit: AnnotatedCompiledUnit) -> CompiledScript {
+    match unit {
+        AnnotatedCompiledUnit::Module(_) => panic!("expected script got module"),
+        AnnotatedCompiledUnit::Script(annot_script) => annot_script.named_script.script,
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/lib.rs b/vendors/move/crates/move-vm/integration-tests/src/lib.rs
new file mode 100644
index 000000000..ed93b8f6f
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/lib.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![cfg(test)]
+
+mod compiler;
+mod tests;
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
new file mode 100644
index 000000000..128786186
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
@@ -0,0 +1,73 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::ModuleId,
+    value::{serialize_values, MoveValue},
+    vm_status::StatusType,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{BlankStorage, InMemoryStorage};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn call_non_existent_module() {
+    let vm = MoveVM::new(vec![]).unwrap();
+    let storage = BlankStorage;
+
+    let mut sess = vm.new_session(&storage);
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let err = sess
+        .execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap_err();
+
+    assert_eq!(err.status_type(), StatusType::Verification);
+}
+
+#[test]
+fn call_non_existent_function() {
+    let code = r#"
+        module {{ADDR}}::M {}
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let err = sess
+        .execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap_err();
+
+    assert_eq!(err.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/bad_storage_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/bad_storage_tests.rs
new file mode 100644
index 000000000..354ca8496
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/bad_storage_tests.rs
@@ -0,0 +1,642 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, as_script, compile_units};
+use move_binary_format::errors::{Location, PartialVMError};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag},
+    resolver::{ModuleResolver, ResourceResolver},
+    value::{serialize_values, MoveValue},
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn test_malformed_resource() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        address std {
+            module signer {
+                native public fun borrow_address(s: &signer): &address;
+
+                public fun address_of(s: &signer): address {
+                    *borrow_address(s)
+                }
+            }
+        }
+
+        module {{ADDR}}::M {
+            use std::signer;
+
+            struct Foo has key { x: u64, y: bool }
+
+            public fun publish(s: &signer) {
+                move_to(s, Foo { x: 123, y : false });
+            }
+
+            public fun check(s: &signer) acquires Foo {
+                let foo = borrow_global<Foo>(signer::address_of(s));
+                assert!(foo.x == 123 && foo.y == false, 42);
+            }
+        }
+
+        script {
+            use {{ADDR}}::M;
+
+            fun main(s: signer) {
+                M::publish(&s);
+            }
+        }
+
+        script {
+            use {{ADDR}}::M;
+
+            fun main(s: signer) {
+                M::check(&s);
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let s2 = as_script(units.pop().unwrap());
+    let s1 = as_script(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+    let ms = as_module(units.pop().unwrap());
+
+    let mut storage = InMemoryStorage::new();
+
+    // Publish module Signer and module M.
+    let mut blob = vec![];
+    ms.serialize(&mut blob).unwrap();
+    storage.publish_or_overwrite_module(ms.self_id(), blob);
+
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+    storage.publish_or_overwrite_module(m.self_id(), blob);
+
+    let vm = MoveVM::new(move_stdlib::natives::all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
+    ))
+    .unwrap();
+
+    // Execute the first script to publish a resource Foo.
+    let mut script_blob = vec![];
+    s1.serialize(&mut script_blob).unwrap();
+    let mut sess = vm.new_session(&storage);
+    sess.execute_script(
+        script_blob,
+        vec![],
+        vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
+        &mut UnmeteredGasMeter,
+    )
+    .map(|_| ())
+    .unwrap();
+    let (changeset, _) = sess.finish().unwrap();
+    storage.apply(changeset).unwrap();
+
+    // Execut the second script and make sure it succeeds. This script simply checks
+    // that the published resource is what we expect it to be. This inital run is to ensure
+    // the testing environment is indeed free of errors without external interference.
+    let mut script_blob = vec![];
+    s2.serialize(&mut script_blob).unwrap();
+    {
+        let mut sess = vm.new_session(&storage);
+        sess.execute_script(
+            script_blob.clone(),
+            vec![],
+            vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
+            &mut UnmeteredGasMeter,
+        )
+        .map(|_| ())
+        .unwrap();
+    }
+
+    // Corrupt the resource in the storage.
+    storage.publish_or_overwrite_resource(
+        TEST_ADDR,
+        StructTag {
+            address: TEST_ADDR,
+            module: Identifier::new("M").unwrap(),
+            name: Identifier::new("Foo").unwrap(),
+            type_params: vec![],
+        },
+        vec![0x3, 0x4, 0x5],
+    );
+
+    // Run the second script again.
+    // The test will be successful if it fails with an invariant violation.
+    {
+        let mut sess = vm.new_session(&storage);
+        let err = sess
+            .execute_script(
+                script_blob,
+                vec![],
+                vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
+                &mut UnmeteredGasMeter,
+            )
+            .map(|_| ())
+            .unwrap_err();
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_malformed_module() {
+    // Compile module M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+    "#;
+
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    // Publish M and call M::foo. No errors should be thrown.
+    {
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(m.self_id(), blob.clone());
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Start over with a fresh storage and publish a corrupted version of M.
+    // A fresh VM needs to be used whenever the storage has been modified or otherwise the
+    // loader cache gets out of sync.
+    //
+    // Try to call M::foo again and the module should fail to load, causing an
+    // invariant violation error.
+    {
+        blob[0] = 0xDE;
+        blob[1] = 0xAD;
+        blob[2] = 0xBE;
+        blob[3] = 0xEF;
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_unverifiable_module() {
+    // Compile module M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+    "#;
+
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    let fun_name = Identifier::new("foo").unwrap();
+
+    // Publish M and call M::foo to make sure it works.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        let mut blob = vec![];
+        m.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Erase the body of M::foo to make it fail verification.
+    // Publish this modified version of M and the VM should fail to load it.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        let mut m = m;
+        m.function_defs[0].code.as_mut().unwrap().code = vec![];
+        let mut blob = vec![];
+        m.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(m.self_id(), blob);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_missing_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_m = vec![];
+    m.serialize(&mut blob_m).unwrap();
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish only N and try to call N::bar. The VM should fail to find M and raise
+    // an invariant violation.
+    {
+        let mut storage = InMemoryStorage::new();
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_malformed_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_m = vec![];
+    m.serialize(&mut blob_m).unwrap();
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m.clone());
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish N and a corrupted version of M and try to call N::bar, the VM should fail to load M.
+    {
+        blob_m[0] = 0xDE;
+        blob_m[1] = 0xAD;
+        blob_m[2] = 0xBE;
+        blob_m[3] = 0xEF;
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_unverifiable_module_dependency() {
+    // Compile two modules M, N where N depends on M.
+    let code = r#"
+        module {{ADDR}}::M {
+            public fun foo() {}
+        }
+
+        module {{ADDR}}::N {
+            use {{ADDR}}::M;
+
+            public fun bar() { M::foo(); }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let n = as_module(units.pop().unwrap());
+    let m = as_module(units.pop().unwrap());
+
+    let mut blob_n = vec![];
+    n.serialize(&mut blob_n).unwrap();
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    // Publish M and N and call N::bar. Everything should work.
+    {
+        let mut blob_m = vec![];
+        m.serialize(&mut blob_m).unwrap();
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n.clone());
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            &fun_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Publish N and an unverifiable version of M and try to call N::bar, the VM should fail to load M.
+    {
+        let mut m = m;
+        m.function_defs[0].code.as_mut().unwrap().code = vec![];
+        let mut blob_m = vec![];
+        m.serialize(&mut blob_m).unwrap();
+
+        let mut storage = InMemoryStorage::new();
+
+        storage.publish_or_overwrite_module(m.self_id(), blob_m);
+        storage.publish_or_overwrite_module(n.self_id(), blob_n);
+
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+struct BogusStorage {
+    bad_status_code: StatusCode,
+}
+
+impl ModuleResolver for BogusStorage {
+    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        Ok(Err(
+            PartialVMError::new(self.bad_status_code).finish(Location::Undefined)
+        )?)
+    }
+}
+
+impl ResourceResolver for BogusStorage {
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        Ok(Err(
+            PartialVMError::new(self.bad_status_code).finish(Location::Undefined)
+        )?)
+    }
+}
+
+const LIST_OF_ERROR_CODES: &[StatusCode] = &[
+    StatusCode::UNKNOWN_VALIDATION_STATUS,
+    StatusCode::INVALID_SIGNATURE,
+    StatusCode::UNKNOWN_VERIFICATION_ERROR,
+    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    StatusCode::UNKNOWN_BINARY_ERROR,
+    StatusCode::UNKNOWN_RUNTIME_STATUS,
+    StatusCode::UNKNOWN_STATUS,
+];
+
+#[test]
+fn test_storage_returns_bogus_error_when_loading_module() {
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
+    let fun_name = Identifier::new("bar").unwrap();
+
+    for error_code in LIST_OF_ERROR_CODES {
+        let storage = BogusStorage {
+            bad_status_code: *error_code,
+        };
+        let vm = MoveVM::new(vec![]).unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &module_id,
+                &fun_name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
+
+#[test]
+fn test_storage_returns_bogus_error_when_loading_resource() {
+    let code = r#"
+        address std {
+            module signer {
+                native public fun borrow_address(s: &signer): &address;
+
+                public fun address_of(s: &signer): address {
+                    *borrow_address(s)
+                }
+            }
+        }
+
+        module {{ADDR}}::M {
+            use std::signer;
+
+            struct R has key {}
+
+            public fun foo() {}
+
+            public fun bar(sender: &signer) acquires R {
+                _ = borrow_global<R>(signer::address_of(sender));
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let s = as_module(units.pop().unwrap());
+    let mut m_blob = vec![];
+    let mut s_blob = vec![];
+    m.serialize(&mut m_blob).unwrap();
+    s.serialize(&mut s_blob).unwrap();
+    let mut delta = ChangeSet::new();
+    delta.add_module_op(m.self_id(), Op::New(m_blob)).unwrap();
+    delta.add_module_op(s.self_id(), Op::New(s_blob)).unwrap();
+
+    let m_id = m.self_id();
+    let foo_name = Identifier::new("foo").unwrap();
+    let bar_name = Identifier::new("bar").unwrap();
+
+    for error_code in LIST_OF_ERROR_CODES {
+        let storage = BogusStorage {
+            bad_status_code: *error_code,
+        };
+        let storage = DeltaStorage::new(&storage, &delta);
+
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.execute_function_bypass_visibility(
+            &m_id,
+            &foo_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+
+        let err = sess
+            .execute_function_bypass_visibility(
+                &m_id,
+                &bar_name,
+                vec![],
+                serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err();
+
+        assert_eq!(err.status_type(), StatusType::InvariantViolation);
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/binary_format_version.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/binary_format_version.rs
new file mode 100644
index 000000000..bacba7ec2
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/binary_format_version.rs
@@ -0,0 +1,139 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{basic_test_module, basic_test_script},
+    file_format_common::VERSION_MAX,
+};
+use move_core_types::{account_address::AccountAddress, vm_status::StatusCode};
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+#[test]
+fn test_publish_module_with_custom_max_binary_format_version() {
+    let m = basic_test_module();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    m.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    m.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.publish_module(
+            b_new.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        assert_eq!(
+            sess.publish_module(
+                b_new.clone(),
+                *m.self_id().address(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err()
+            .major_status(),
+            StatusCode::UNKNOWN_VERSION
+        );
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+}
+
+#[test]
+fn test_run_script_with_custom_max_binary_format_version() {
+    let s = basic_test_script();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    s.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    s.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+            .unwrap();
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        assert_eq!(
+            sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+                .unwrap_err()
+                .major_status(),
+            StatusCode::CODE_DESERIALIZATION_ERROR
+        );
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
new file mode 100644
index 000000000..cfe8db77e
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
@@ -0,0 +1,138 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event},
+    identifier::Identifier,
+    language_storage::ModuleId,
+    u256::U256,
+    value::{serialize_values, MoveValue},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+use std::convert::TryInto;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+const TEST_MODULE_ID: &str = "M";
+const EXPECT_MUTREF_OUT_VALUE: u64 = 90;
+const USE_MUTREF_LABEL: &str = "use_mutref";
+const USE_REF_LABEL: &str = "use_ref";
+const FUN_NAMES: [&str; 2] = [USE_MUTREF_LABEL, USE_REF_LABEL];
+
+// ensure proper errors are returned when ref & mut ref args fail to deserialize
+#[test]
+fn fail_arg_deserialize() {
+    let mod_code = setup_module();
+    // all of these should fail to deserialize because the functions expect u64 args
+    let values = vec![
+        MoveValue::U8(16),
+        MoveValue::U16(1006),
+        MoveValue::U32(16000),
+        MoveValue::U128(512),
+        MoveValue::U256(U256::from(12345u32)),
+        MoveValue::Bool(true),
+    ];
+    for value in values {
+        for name in FUN_NAMES {
+            let err = run(&mod_code, name, value.clone())
+                .map(|_| ())
+                .expect_err("Should have failed to deserialize non-u64 type to u64");
+            assert_eq!(
+                err.major_status(),
+                StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+            );
+        }
+    }
+}
+
+// check happy path for writing to mut ref args - may be unecessary / covered by other tests
+#[test]
+fn mutref_output_success() {
+    let mod_code = setup_module();
+    let result = run(&mod_code, USE_MUTREF_LABEL, MoveValue::U64(1));
+    let (_, _, ret_values) = result.unwrap();
+    assert_eq!(1, ret_values.mutable_reference_outputs.len());
+    let parsed = parse_u64_arg(&ret_values.mutable_reference_outputs.first().unwrap().1);
+    assert_eq!(EXPECT_MUTREF_OUT_VALUE, parsed);
+}
+
+// TODO - how can we cause serialization errors in values returned from Move ?
+// that would allow us to test error paths for outputs as well
+
+fn setup_module() -> ModuleCode {
+    // first function takes a mutable ref & writes to it, the other takes immutable ref, so we exercise both paths
+    let code = format!(
+        r#"
+        module 0x{}::{} {{
+            fun {}(a: &mut u64) {{ *a = {}; }}
+            fun {}(_a: & u64) {{ }}
+        }}
+    "#,
+        TEST_ADDR, TEST_MODULE_ID, USE_MUTREF_LABEL, EXPECT_MUTREF_OUT_VALUE, USE_REF_LABEL
+    );
+
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new(TEST_MODULE_ID).unwrap());
+    (module_id, code)
+}
+
+fn run(
+    module: &ModuleCode,
+    fun_name: &str,
+    arg_val0: MoveValue,
+) -> VMResult<(ChangeSet, Vec<Event>, SerializedReturnValues)> {
+    let module_id = &module.0;
+    let modules = vec![module.clone()];
+    let (vm, storage) = setup_vm(&modules);
+    let mut session = vm.new_session(&storage);
+
+    let fun_name = Identifier::new(fun_name).unwrap();
+
+    session
+        .execute_function_bypass_visibility(
+            module_id,
+            &fun_name,
+            vec![],
+            serialize_values(&vec![arg_val0]),
+            &mut UnmeteredGasMeter,
+        )
+        .and_then(|ret_values| {
+            let (change_set, events) = session.finish()?;
+            Ok((change_set, events, ret_values))
+        })
+}
+
+type ModuleCode = (ModuleId, String);
+
+// TODO - move some utility functions to where test infra lives, see about unifying with similar code
+fn setup_vm(modules: &[ModuleCode]) -> (MoveVM, InMemoryStorage) {
+    let mut storage = InMemoryStorage::new();
+    compile_modules(&mut storage, modules);
+    (MoveVM::new(vec![]).unwrap(), storage)
+}
+
+fn compile_modules(storage: &mut InMemoryStorage, modules: &[ModuleCode]) {
+    modules.iter().for_each(|(id, code)| {
+        compile_module(storage, id, code);
+    });
+}
+
+fn compile_module(storage: &mut InMemoryStorage, mod_id: &ModuleId, code: &str) {
+    let mut units = compile_units(code).unwrap();
+    let module = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    module.serialize(&mut blob).unwrap();
+    storage.publish_or_overwrite_module(mod_id.clone(), blob);
+}
+
+fn parse_u64_arg(arg: &[u8]) -> u64 {
+    let as_arr: [u8; 8] = arg[..8]
+        .try_into()
+        .expect("wrong u64 length, must be 8 bytes");
+    u64::from_le_bytes(as_arr)
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/function_arg_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/function_arg_tests.rs
new file mode 100644
index 000000000..54c22405c
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/function_arg_tests.rs
@@ -0,0 +1,277 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, TypeTag},
+    u256::U256,
+    value::{MoveStruct, MoveValue},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+fn run(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) -> VMResult<()> {
+    let ty_params = ty_params
+        .iter()
+        .map(|var| format!("{}: copy + drop", var))
+        .collect::<Vec<_>>()
+        .join(", ");
+    let params = params
+        .iter()
+        .enumerate()
+        .map(|(idx, ty)| format!("_x{}: {}", idx, ty))
+        .collect::<Vec<_>>()
+        .join(", ");
+
+    let code = format!(
+        r#"
+        module 0x{}::M {{
+            struct Foo has copy, drop {{ x: u64 }}
+            struct Bar<T> has copy, drop {{ x: T }}
+
+            fun foo<{}>({}) {{ }}
+        }}
+    "#,
+        TEST_ADDR, ty_params, params
+    );
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let args: Vec<_> = args
+        .into_iter()
+        .map(|val| val.simple_serialize().unwrap())
+        .collect();
+
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &fun_name,
+        ty_args,
+        args,
+        &mut UnmeteredGasMeter,
+    )?;
+
+    Ok(())
+}
+
+fn expect_err(params: &[&str], args: Vec<MoveValue>, expected_status: StatusCode) {
+    assert!(run(&[], params, vec![], args).unwrap_err().major_status() == expected_status);
+}
+
+fn expect_err_generic(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+    expected_status: StatusCode,
+) {
+    assert!(
+        run(ty_params, params, ty_args, args)
+            .unwrap_err()
+            .major_status()
+            == expected_status
+    );
+}
+
+fn expect_ok(params: &[&str], args: Vec<MoveValue>) {
+    run(&[], params, vec![], args).unwrap()
+}
+
+fn expect_ok_generic(
+    ty_params: &[&str],
+    params: &[&str],
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) {
+    run(ty_params, params, ty_args, args).unwrap()
+}
+
+#[test]
+fn expected_0_args_got_0() {
+    expect_ok(&[], vec![])
+}
+
+#[test]
+fn expected_0_args_got_1() {
+    expect_err(
+        &[],
+        vec![MoveValue::U64(0)],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_1_arg_got_0() {
+    expect_err(&["u64"], vec![], StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH)
+}
+
+#[test]
+fn expected_2_arg_got_1() {
+    expect_err(
+        &["u64", "bool"],
+        vec![MoveValue::U64(0)],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_2_arg_got_3() {
+    expect_err(
+        &["u64", "bool"],
+        vec![
+            MoveValue::U64(0),
+            MoveValue::Bool(true),
+            MoveValue::Bool(false),
+        ],
+        StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+    )
+}
+
+#[test]
+fn expected_u64_got_u64() {
+    expect_ok(&["u64"], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_Foo_got_Foo() {
+    expect_ok(&["Foo"], vec![MoveValue::Struct(MoveStruct::new(vec![
+        MoveValue::U64(0),
+    ]))])
+}
+
+#[test]
+fn expected_signer_ref_got_signer() {
+    expect_ok(&["&signer"], vec![MoveValue::Signer(TEST_ADDR)])
+}
+
+#[test]
+fn expected_u64_signer_ref_got_u64_signer() {
+    expect_ok(&["u64", "&signer"], vec![
+        MoveValue::U64(0),
+        MoveValue::Signer(TEST_ADDR),
+    ])
+}
+
+#[test]
+fn expected_u64_got_bool() {
+    expect_err(
+        &["u64"],
+        vec![MoveValue::Bool(false)],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
+
+#[test]
+fn param_type_u64_ref() {
+    expect_ok(&["&u64"], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_u64__u64() {
+    expect_ok_generic(&["T"], &["T"], vec![TypeTag::U64], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_A_B__A_u64_vector_B_got_u8_u128__u8_u64_vector_u128() {
+    expect_ok_generic(
+        &["A", "B"],
+        &["A", "u64", "vector<B>"],
+        vec![TypeTag::U8, TypeTag::U128],
+        vec![
+            MoveValue::U8(0),
+            MoveValue::U64(0),
+            MoveValue::Vector(vec![MoveValue::U128(0), MoveValue::U128(0)]),
+        ],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_A_B__A_u32_vector_B_got_u16_u256__u16_u32_vector_u256() {
+    expect_ok_generic(
+        &["A", "B"],
+        &["A", "u32", "vector<B>"],
+        vec![TypeTag::U16, TypeTag::U256],
+        vec![
+            MoveValue::U16(0),
+            MoveValue::U32(0),
+            MoveValue::Vector(vec![
+                MoveValue::U256(U256::from(0u8)),
+                MoveValue::U256(U256::from(0u8)),
+            ]),
+        ],
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__Bar_T_got_bool__Bar_bool() {
+    expect_ok_generic(&["T"], &["Bar<T>"], vec![TypeTag::Bool], vec![
+        MoveValue::Struct(MoveStruct::new(vec![MoveValue::Bool(false)])),
+    ])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_bool__bool() {
+    expect_ok_generic(&["T"], &["T"], vec![TypeTag::Bool], vec![MoveValue::Bool(
+        false,
+    )])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_got_bool__u64() {
+    expect_err_generic(
+        &["T"],
+        &["T"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::U64(0)],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__T_ref_got_u64__u64() {
+    expect_ok_generic(&["T"], &["&T"], vec![TypeTag::U64], vec![MoveValue::U64(0)])
+}
+
+#[test]
+#[allow(non_snake_case)]
+fn expected_T__Bar_T_got_bool__Bar_u64() {
+    expect_err_generic(
+        &["T"],
+        &["Bar<T>"],
+        vec![TypeTag::Bool],
+        vec![MoveValue::Struct(MoveStruct::new(vec![MoveValue::U64(0)]))],
+        StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+    )
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/instantiation_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/instantiation_tests.rs
new file mode 100644
index 000000000..256189610
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/instantiation_tests.rs
@@ -0,0 +1,136 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    AbilitySet, AddressIdentifierIndex, Bytecode::*, CodeUnit, CompiledModule, FieldDefinition,
+    FunctionDefinition, FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandle,
+    ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, SignatureToken::*,
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, StructTypeParameter,
+    TypeSignature,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    ident_str,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn instantiation_err() {
+    let addr = AccountAddress::from_hex_literal("0xcafe").unwrap();
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+
+    const N: usize = 7;
+    for _ in 0..2 {
+        let mut ty_args = vec![];
+        for _ in 0..N {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    let cm = CompiledModule {
+        version: 6,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![
+                StructTypeParameter {
+                    constraints: AbilitySet::EMPTY,
+                    is_phantom: false,
+                };
+                N
+            ],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![AbilitySet::PRIMITIVES],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![big_ty])],
+        identifiers: vec![
+            Identifier::new("m").unwrap(),
+            Identifier::new("s").unwrap(),
+            Identifier::new("f").unwrap(),
+            Identifier::new("field").unwrap(),
+        ],
+        address_identifiers: vec![addr],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(0),
+                signature: TypeSignature(U8),
+            }]),
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: move_binary_format::file_format::Visibility::Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![
+                    VecPack(SignatureIndex(1), 0),
+                    // LdU8(0),
+                    Pop,
+                    Branch(0),
+                ],
+            }),
+        }],
+    };
+
+    move_bytecode_verifier::verify_module(&cm).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut mod_bytes = vec![];
+    cm.serialize(&mut mod_bytes).unwrap();
+
+    session
+        .publish_module(mod_bytes, addr, &mut GasStatus::new_unmetered())
+        .expect("Module must publish");
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..4 {
+        // ty_arg = TypeTag::Vector(Box::new(ty_arg));
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new("m").unwrap(),
+            name: Identifier::new("s").unwrap(),
+            type_params: vec![ty_arg; N],
+        }));
+    }
+
+    let err = session.execute_entry_function(
+        &cm.self_id(),
+        ident_str!("f"),
+        vec![ty_arg],
+        Vec::<Vec<u8>>::new(),
+        &mut GasStatus::new_unmetered(),
+    );
+    assert!(err.is_err(), "Instantiation must fail at runtime");
+    assert_eq!(
+        err.err().unwrap().major_status(),
+        StatusCode::VERIFICATION_ERROR
+    );
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/invariant_violation_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
new file mode 100644
index 000000000..b91f72ac4
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Constant, ConstantPoolIndex, Signature, SignatureIndex,
+    SignatureToken::*,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn merge_borrow_states_infinite_loop() {
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                U64,
+                Vector(Box::new(U8)),
+                U64,
+                Vector(Box::new(U8)),
+                MutableReference(Box::new(Vector(Box::new(U8)))),
+                MutableReference(Box::new(U64)),
+            ]),
+        ],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![Constant {
+            type_: Vector(Box::new(U8)),
+            data: vec![0],
+        }],
+        metadata: vec![],
+        // The bytecode verifier should reject this code but it doesn't.
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                LdU64(0),
+                StLoc(0), // { 0 => 0 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(1), // { 0 => 0, 1 => [] }
+                LdU64(0),
+                StLoc(2), // { 0 => 0, 1 => [], 2 => 0 }
+                MutBorrowLoc(2),
+                StLoc(5), // { 0 => 0, 1 => [], 2 => 0, 5 => &2 }
+                LdU64(1),
+                CopyLoc(5),
+                WriteRef, // { 0 => 0, 1 => [], 2 => 1, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(3), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 5 => &2 }
+                MutBorrowLoc(3),
+                StLoc(4), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 4 => &3, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                CopyLoc(4),
+                WriteRef,
+                CopyLoc(5),
+                ReadRef,
+                LdU64(1),
+                Eq,
+                BrTrue(11),
+                Ret,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    let err = session
+        .execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        )
+        .unwrap_err();
+
+    assert_eq!(
+        err.major_status(),
+        StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR
+    );
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/leak_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/leak_tests.rs
new file mode 100644
index 000000000..6a23b8055
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/leak_tests.rs
@@ -0,0 +1,70 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Signature, SignatureIndex, SignatureToken::*,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[ignore] // TODO: figure whether to reactive this test
+#[test]
+fn leak_with_abort() {
+    let mut locals = vec![U128, MutableReference(Box::new(U128))];
+    // Make locals bigger so each leak is bigger
+    // 128 is limit for aptos
+    for _ in 0..100 {
+        locals.push(U128);
+    }
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(locals)],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                // leak
+                LdU128(0),
+                StLoc(0),
+                MutBorrowLoc(0),
+                StLoc(1),
+                // abort
+                LdU64(0),
+                Abort,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    for _ in 0..100_000 {
+        let _ = session.execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        );
+    }
+
+    let mem_stats = memory_stats::memory_stats().unwrap();
+    assert!(
+        mem_stats.virtual_mem < 200000000,
+        "actual is {}",
+        mem_stats.virtual_mem
+    );
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests.rs
new file mode 100644
index 000000000..8ccd0fa2e
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests.rs
@@ -0,0 +1,531 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::compile_modules_in_file;
+use move_binary_format::{
+    file_format::{
+        empty_module, AddressIdentifierIndex, IdentifierIndex, ModuleHandle, TableIndex,
+    },
+    CompiledModule,
+};
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+};
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+use std::{path::PathBuf, sync::Arc, thread};
+
+const WORKING_ACCOUNT: AccountAddress = AccountAddress::TWO;
+
+struct Adapter {
+    store: InMemoryStorage,
+    vm: Arc<MoveVM>,
+    functions: Vec<(ModuleId, Identifier)>,
+}
+
+impl Adapter {
+    fn new(store: InMemoryStorage) -> Self {
+        let functions = vec![
+            (
+                ModuleId::new(WORKING_ACCOUNT, Identifier::new("A").unwrap()),
+                Identifier::new("entry_a").unwrap(),
+            ),
+            (
+                ModuleId::new(WORKING_ACCOUNT, Identifier::new("D").unwrap()),
+                Identifier::new("entry_d").unwrap(),
+            ),
+            (
+                ModuleId::new(WORKING_ACCOUNT, Identifier::new("E").unwrap()),
+                Identifier::new("entry_e").unwrap(),
+            ),
+            (
+                ModuleId::new(WORKING_ACCOUNT, Identifier::new("F").unwrap()),
+                Identifier::new("entry_f").unwrap(),
+            ),
+            (
+                ModuleId::new(WORKING_ACCOUNT, Identifier::new("C").unwrap()),
+                Identifier::new("just_c").unwrap(),
+            ),
+        ];
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+        Self {
+            store,
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            functions,
+        }
+    }
+
+    fn fresh(self) -> Self {
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+        Self {
+            store: self.store,
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            functions: self.functions,
+        }
+    }
+
+    fn publish_modules(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+
+        for module in modules {
+            let mut binary = vec![];
+            module
+                .serialize(&mut binary)
+                .unwrap_or_else(|_| panic!("failure in module serialization: {:#?}", module));
+            session
+                .publish_module(binary, WORKING_ACCOUNT, &mut UnmeteredGasMeter)
+                .unwrap_or_else(|_| panic!("failure publishing module: {:#?}", module));
+        }
+        let (changeset, _) = session.finish().expect("failure getting write set");
+        self.store
+            .apply(changeset)
+            .expect("failure applying write set");
+    }
+
+    fn publish_modules_with_error(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+
+        for module in modules {
+            let mut binary = vec![];
+            module
+                .serialize(&mut binary)
+                .unwrap_or_else(|_| panic!("failure in module serialization: {:#?}", module));
+            session
+                .publish_module(binary, WORKING_ACCOUNT, &mut UnmeteredGasMeter)
+                .expect_err("publishing must fail");
+        }
+    }
+
+    fn call_functions(&self) {
+        for (module_id, name) in &self.functions {
+            self.call_function(module_id, name);
+        }
+    }
+
+    fn call_functions_async(&self, reps: usize) {
+        let mut children = vec![];
+        for _ in 0..reps {
+            for (module_id, name) in self.functions.clone() {
+                let vm = self.vm.clone();
+                let data_store = self.store.clone();
+                children.push(thread::spawn(move || {
+                    let mut session = vm.new_session(&data_store);
+                    session
+                        .execute_function_bypass_visibility(
+                            &module_id,
+                            &name,
+                            vec![],
+                            Vec::<Vec<u8>>::new(),
+                            &mut UnmeteredGasMeter,
+                        )
+                        .unwrap_or_else(|_| {
+                            panic!("Failure executing {:?}::{:?}", module_id, name)
+                        });
+                }));
+            }
+        }
+        for child in children {
+            let _ = child.join();
+        }
+    }
+
+    fn call_function(&self, module: &ModuleId, name: &IdentStr) {
+        let mut session = self.vm.new_session(&self.store);
+        session
+            .execute_function_bypass_visibility(
+                module,
+                name,
+                vec![],
+                Vec::<Vec<u8>>::new(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_or_else(|_| panic!("Failure executing {:?}::{:?}", module, name));
+    }
+}
+
+fn get_modules() -> Vec<CompiledModule> {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push("src/tests/loader_tests_modules.move");
+    compile_modules_in_file(&path).unwrap()
+}
+
+#[test]
+fn load() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_modules();
+    adapter.publish_modules(modules);
+    // calls all functions sequentially
+    adapter.call_functions();
+}
+
+#[test]
+fn load_concurrent() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_modules();
+    adapter.publish_modules(modules);
+    // makes 15 threads
+    adapter.call_functions_async(3);
+}
+
+#[test]
+fn load_concurrent_many() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+    let modules = get_modules();
+    adapter.publish_modules(modules);
+    // makes 150 threads
+    adapter.call_functions_async(30);
+}
+
+#[test]
+fn deep_dependency_list_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 350u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 101u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 5u64;
+    let height = 101u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 350u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 10u64;
+    let height = 20u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 100u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 1000u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 101u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module
+}
+
+// Create a list of dependent modules
+fn dependency_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_dependencies(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a tree (well a forest or DAG really) of dependent modules
+fn dependency_tree(width: u64, height: u64, modules: &mut Vec<CompiledModule>) {
+    let mut deps = vec![];
+    for i in 0..width {
+        let name = format!("A_{}_{}", 0, i);
+        let module = leaf_module(name.as_str());
+        deps.push(name);
+        modules.push(module);
+    }
+    for i in 1..height {
+        let mut new_deps = vec![];
+        for j in 0..width {
+            let name = format!("A_{}_{}", i, j);
+            let module = empty_module_with_dependencies(name.clone(), deps.clone());
+            new_deps.push(name);
+            modules.push(module);
+        }
+        deps = new_deps;
+    }
+}
+
+// Create a module that uses (depends on) the list of given modules
+fn empty_module_with_dependencies(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.module_handles.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
+
+// Create a list of friends modules
+fn friend_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_friends(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a module that uses (friends on) the list of given modules
+fn empty_module_with_friends(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.friend_decls.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests_modules.move b/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests_modules.move
new file mode 100644
index 000000000..dcdc5a476
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/loader_tests_modules.move
@@ -0,0 +1,173 @@
+address 0x2 {
+    module A {
+        struct S has copy, drop {
+            f1: 0x2::B::S,
+            f2: 0x2::C::S,
+        }
+
+        public fun new(f1: 0x2::B::S, f2: 0x2::C::S): S {
+            Self::S { f1, f2 }
+        }
+
+        public fun destroy(v: S): (0x2::B::S, 0x2::C::S) {
+            let S { f1: v1, f2: v2 } = v;
+            (v1, v2)
+        }
+
+        public fun entry_a() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x42, true);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x42, false);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            }
+        }
+
+        public fun get_field_1(s: &S): 0x2::B::S {
+            *&s.f1
+        }
+    }
+
+    module B {
+        struct S has copy, drop {
+            f1: u64,
+            f2: u128,
+        }
+
+        public fun new(v1: u64, v2: u128): S { S { f1: v1, f2: v2 } }
+
+        public fun destroy(v: S): (u64, u128) {
+            let S { f1: val1, f2: val2 } = v;
+            (val1, val2)
+        }
+
+        public fun b_and_c(b: &S, c: 0x2::C::S): S {
+            let _ = 0x2::C::destroy(c);
+            let another_b = S {
+                f1: 0,
+                f2: b.f2,
+            };
+            another_b
+        }
+    }
+
+    module C {
+        struct S has copy, drop {
+            f1: address,
+            f2: bool,
+        }
+
+        public fun new(v1: address, v2: bool): S {
+            Self::S {
+                f1: v1,
+                f2: v2,
+            }
+        }
+
+        public fun destroy(v: S): address {
+            let S { f1: v1, f2: _ } = v;
+            v1
+        }
+
+        public fun just_c() {
+            let i = 0;
+            while (i < 10) {
+                let c = new(@0x0, false);
+                let S { f1: _, f2: _ } = c;
+                i = i + 1;
+            }
+        }
+    }
+
+
+    module D {
+        struct S has copy, drop {
+            f1: 0x2::B::S,
+        }
+
+        public fun new(): 0x2::D::S {
+            Self::S {
+                f1: 0x2::B::new(20, 100),
+            }
+        }
+
+        public fun entry_d() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x45, false);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x46, true);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            }
+        }
+    }
+
+    module E {
+        struct S {
+            f1: u64,
+        }
+
+        public fun new(): 0x2::E::S { Self::S { f1: 20 } }
+
+        public fun entry_e() {
+            let i = 0;
+            while (i < 10) {
+                let b = 0x2::B::new(20, 100);
+                let c = 0x2::C::new(@0x100, false);
+                let another_b = 0x2::B::b_and_c(&b, c);
+                let (_, _) = 0x2::B::destroy(another_b);
+                let another_c = 0x2::C::new(@0x101, true);
+                0x2::C::destroy(another_c);
+                i = i + 1;
+            };
+        }
+    }
+
+    module F {
+        struct S {
+            f1: u64,
+        }
+
+        public fun new(): 0x2::F::S { Self::S { f1: 20 } }
+
+        public fun entry_f() {
+            0x2::A::entry_a();
+        }
+    }
+
+    module G {
+        struct S has copy, drop {
+            f1: u64,
+            f2: u128,
+            f3: u16,
+            f4: u32,
+            f5: u256
+        }
+
+        public fun new(v1: u64, v2: u128, v3: u16, v4: u32, v5: u256): S { S { f1: v1, f2: v2, f3: v3, f4: v4, f5: v5 } }
+
+        public fun destroy(v: S): (u64, u128, u16, u32, u256) {
+            let S { f1: val1, f2: val2, f3: val3, f4: val4, f5: val5 } = v;
+            (val1, val2, val3, val4, val5)
+        }
+
+        public fun b_and_c(b: &S, c: 0x2::C::S): S {
+            let _ = 0x2::C::destroy(c);
+            let another_b = S {
+                f1: 0,
+                f2: b.f2,
+                f3: b.f3 + (b.f2 as u16),
+                f4: (b.f1 as u32),
+                f5: b.f5
+            };
+            another_b
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/mod.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/mod.rs
new file mode 100644
index 000000000..c990b267e
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/mod.rs
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod bad_entry_point_tests;
+mod bad_storage_tests;
+mod binary_format_version;
+mod exec_func_effects_tests;
+mod function_arg_tests;
+mod instantiation_tests;
+mod invariant_violation_tests;
+mod leak_tests;
+mod loader_tests;
+mod mutated_accounts_tests;
+mod nested_loop_tests;
+mod regression_tests;
+mod return_value_tests;
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
new file mode 100644
index 000000000..ad9d9188d
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::ModuleId,
+    value::{serialize_values, MoveValue},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn mutated_accounts() {
+    let code = r#"
+        module {{ADDR}}::M {
+            struct Foo has key { a: bool }
+            public fun get(addr: address): bool acquires Foo {
+                borrow_global<Foo>(addr).a
+            }
+            public fun flip(addr: address) acquires Foo {
+                let f_ref = borrow_global_mut<Foo>(addr);
+                f_ref.a = !f_ref.a;
+            }
+            public fun publish(addr: &signer) {
+                move_to(addr, Foo { a: true} )
+            }
+        }
+    "#;
+
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let publish = Identifier::new("publish").unwrap();
+    let flip = Identifier::new("flip").unwrap();
+    let get = Identifier::new("get").unwrap();
+
+    let account1 = AccountAddress::random();
+
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &publish,
+        vec![],
+        serialize_values(&vec![MoveValue::Signer(account1)]),
+        &mut UnmeteredGasMeter,
+    )
+    .unwrap();
+
+    // The resource was published to "account1" and the sender's account
+    // (TEST_ADDR) is assumed to be mutated as well (e.g., in a subsequent
+    // transaction epilogue).
+    assert_eq!(sess.num_mutated_accounts(&TEST_ADDR), 2);
+
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &get,
+        vec![],
+        serialize_values(&vec![MoveValue::Address(account1)]),
+        &mut UnmeteredGasMeter,
+    )
+    .unwrap();
+
+    assert_eq!(sess.num_mutated_accounts(&TEST_ADDR), 2);
+
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &flip,
+        vec![],
+        serialize_values(&vec![MoveValue::Address(account1)]),
+        &mut UnmeteredGasMeter,
+    )
+    .unwrap();
+    assert_eq!(sess.num_mutated_accounts(&TEST_ADDR), 2);
+
+    let (changes, _) = sess.finish().unwrap();
+    storage.apply(changes).unwrap();
+
+    let mut sess = vm.new_session(&storage);
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &get,
+        vec![],
+        serialize_values(&vec![MoveValue::Address(account1)]),
+        &mut UnmeteredGasMeter,
+    )
+    .unwrap();
+
+    // Only the sender's account (TEST_ADDR) should have been modified.
+    assert_eq!(sess.num_mutated_accounts(&TEST_ADDR), 1);
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/nested_loop_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/nested_loop_tests.rs
new file mode 100644
index 000000000..60f0d3a55
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/nested_loop_tests.rs
@@ -0,0 +1,157 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, as_script, compile_units};
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn test_publish_module_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        module {{ADDR}}::M {
+            fun foo() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let m = as_module(units.pop().unwrap());
+    let mut m_blob = vec![];
+    m.serialize(&mut m_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob.clone(), TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob, TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
+
+#[test]
+fn test_run_script_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        script {
+            fun main() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let s = as_script(units.pop().unwrap());
+    let mut s_blob: Vec<u8> = vec![];
+    s.serialize(&mut s_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob, vec![], args, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/regression_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/regression_tests.rs
new file mode 100644
index 000000000..498b9bfbe
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/regression_tests.rs
@@ -0,0 +1,145 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, as_script, compile_units_with_stdlib};
+use move_binary_format::file_format::{Bytecode, CompiledModule, CompiledScript, SignatureIndex};
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+use std::time::Instant;
+
+fn get_nested_struct_type(
+    depth: usize,
+    num_type_args: usize,
+    module_address: AccountAddress,
+    module_identifier: Identifier,
+    struct_identifier: Identifier,
+) -> TypeTag {
+    let mut ret = TypeTag::Bool;
+    for _ in 0..depth {
+        let type_params = std::iter::repeat(ret).take(num_type_args).collect();
+        ret = TypeTag::Struct(Box::new(StructTag {
+            address: module_address,
+            module: module_identifier.clone(),
+            name: struct_identifier.clone(),
+            type_params,
+        }))
+    }
+    ret
+}
+#[test]
+fn script_large_ty() {
+    let test_str = r#"
+    script {
+        use std::vector;
+        use 0x42::pwn::Struct30TyArgs;
+
+        use 0x42::pwn::Struct2TyArgs;
+        fun f<A:drop> () {
+            let v: vector<A> = vector::empty();
+            let vv: vector<vector<Struct2TyArgs<Struct30TyArgs<A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A>, Struct30TyArgs<A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A>>>> = vector::empty();
+        }
+    }
+
+    module 0x42::pwn {
+        struct Struct2TyArgs<A1, A2> has drop {}
+
+        struct Struct25TyArgs<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25> has drop {}
+
+        struct Struct30TyArgs<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30> has drop {}
+    }
+    "#;
+
+    let mut units = compile_units_with_stdlib(test_str).unwrap();
+
+    let mut decompiled_script = as_script(units.pop().unwrap());
+    let decompiled_module = as_module(units.pop().unwrap());
+
+    let verifier_config = VerifierConfig {
+        max_loop_depth: Some(5),
+        max_generic_instantiation_length: Some(32),
+        max_function_parameters: Some(128),
+        max_basic_blocks: Some(1024),
+        max_value_stack_size: 1024,
+        max_type_nodes: Some(256),
+        max_push_size: Some(10000),
+        max_dependency_depth: Some(100),
+        max_struct_definitions: Some(200),
+        max_fields_in_struct: Some(30),
+        max_function_definitions: Some(1000),
+        ..Default::default()
+    };
+
+    let script_code = &mut decompiled_script.code.code;
+    script_code.clear();
+    let num_vecpacks = 1000;
+    for _ in 0..num_vecpacks {
+        script_code.push(Bytecode::VecPack(SignatureIndex(2), 0));
+    }
+    for _ in 0..num_vecpacks {
+        script_code.push(Bytecode::Pop);
+    }
+    script_code.push(Bytecode::Ret);
+
+    move_bytecode_verifier::verify_module_with_config(&verifier_config, &decompiled_module)
+        .unwrap();
+
+    let start = Instant::now();
+    move_bytecode_verifier::verify_script_with_config(&verifier_config, &decompiled_script)
+        .unwrap();
+    println!("script verification time: {:?}", start.elapsed());
+
+    let mut script = vec![];
+    decompiled_script.serialize(&mut script).unwrap();
+    println!("Serialized len: {}", script.len());
+    CompiledScript::deserialize(&script).unwrap();
+
+    let mut module = vec![];
+    decompiled_module.serialize(&mut module).unwrap();
+    println!("Serialized len: {}", script.len());
+    CompiledModule::deserialize(&module).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let move_vm = MoveVM::new_with_config(vec![], VMConfig {
+        verifier: verifier_config,
+        paranoid_type_checks: true,
+        type_size_limit: true,
+        ..Default::default()
+    })
+    .unwrap();
+
+    let module_address = AccountAddress::from_hex_literal("0x42").unwrap();
+    let module_identifier = Identifier::new("pwn").unwrap();
+
+    storage.publish_or_overwrite_module(decompiled_module.self_id(), module.to_vec());
+
+    // constructs a type with about 25^3 nodes
+    let num_type_args = 25;
+    let struct_name = Identifier::new(format!("Struct{}TyArgs", num_type_args)).unwrap();
+    let input_type = get_nested_struct_type(
+        3,
+        num_type_args,
+        module_address,
+        module_identifier,
+        struct_name,
+    );
+
+    let mut session = move_vm.new_session(&storage);
+    let res = session
+        .execute_script(
+            script.as_ref(),
+            vec![input_type],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap_err();
+
+    assert_eq!(res.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+}
diff --git a/vendors/move/crates/move-vm/integration-tests/src/tests/return_value_tests.rs b/vendors/move/crates/move-vm/integration-tests/src/tests/return_value_tests.rs
new file mode 100644
index 000000000..5ce428407
--- /dev/null
+++ b/vendors/move/crates/move-vm/integration-tests/src/tests/return_value_tests.rs
@@ -0,0 +1,121 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, compile_units};
+use move_binary_format::errors::VMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, TypeTag},
+    value::{MoveTypeLayout, MoveValue},
+};
+use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+fn run(
+    structs: &[&str],
+    fun_sig: &str,
+    fun_body: &str,
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+) -> VMResult<Vec<Vec<u8>>> {
+    let structs = structs.to_vec().join("\n");
+
+    let code = format!(
+        r#"
+        module 0x{}::M {{
+            {}
+
+            fun foo{} {{
+                {}
+            }}
+        }}
+    "#,
+        TEST_ADDR, structs, fun_sig, fun_body
+    );
+
+    let mut units = compile_units(&code).unwrap();
+    let m = as_module(units.pop().unwrap());
+    let mut blob = vec![];
+    m.serialize(&mut blob).unwrap();
+
+    let mut storage = InMemoryStorage::new();
+    let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
+    storage.publish_or_overwrite_module(module_id.clone(), blob);
+
+    let vm = MoveVM::new(vec![]).unwrap();
+    let mut sess = vm.new_session(&storage);
+
+    let fun_name = Identifier::new("foo").unwrap();
+
+    let args: Vec<_> = args
+        .into_iter()
+        .map(|val| val.simple_serialize().unwrap())
+        .collect();
+
+    let SerializedReturnValues {
+        return_values,
+        mutable_reference_outputs: _,
+    } = sess.execute_function_bypass_visibility(
+        &module_id,
+        &fun_name,
+        ty_args,
+        args,
+        &mut UnmeteredGasMeter,
+    )?;
+
+    Ok(return_values
+        .into_iter()
+        .map(|(bytes, _layout)| bytes)
+        .collect())
+}
+
+fn expect_success(
+    structs: &[&str],
+    fun_sig: &str,
+    fun_body: &str,
+    ty_args: Vec<TypeTag>,
+    args: Vec<MoveValue>,
+    expected_layouts: &[MoveTypeLayout],
+) {
+    let return_vals = run(structs, fun_sig, fun_body, ty_args, args).unwrap();
+    assert!(return_vals.len() == expected_layouts.len());
+
+    for (blob, layout) in return_vals.iter().zip(expected_layouts.iter()) {
+        MoveValue::simple_deserialize(blob, layout).unwrap();
+    }
+}
+
+#[test]
+fn return_nothing() {
+    expect_success(&[], "()", "", vec![], vec![], &[])
+}
+
+#[test]
+fn return_u64() {
+    expect_success(&[], "(): u64", "42", vec![], vec![], &[MoveTypeLayout::U64])
+}
+
+#[test]
+fn return_u64_bool() {
+    expect_success(&[], "(): (u64, bool)", "(42, true)", vec![], vec![], &[
+        MoveTypeLayout::U64,
+        MoveTypeLayout::Bool,
+    ])
+}
+
+#[test]
+fn return_signer_ref() {
+    expect_success(
+        &[],
+        "(s: &signer): &signer",
+        "s",
+        vec![],
+        vec![MoveValue::Signer(TEST_ADDR)],
+        &[MoveTypeLayout::Signer],
+    )
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/Cargo.toml b/vendors/move/crates/move-vm/paranoid-tests/Cargo.toml
new file mode 100644
index 000000000..5442a6597
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "move-vm-paranoid-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+fail = { version = "0.4.0", features = ['failpoints'] }
+move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner", features = ['failpoints'] }
+
+[[test]]
+name = "tests"
+harness = false
diff --git a/vendors/move/crates/move-vm/paranoid-tests/src/lib.rs b/vendors/move/crates/move-vm/paranoid-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp
new file mode 100644
index 000000000..c16d1fd66
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 27-33:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
new file mode 100644
index 000000000..f2a7cde74
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v2 = copy(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
new file mode 100644
index 000000000..a1548d00a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has copy, drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v2 = copy(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp
new file mode 100644
index 000000000..d9bd4b7fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
new file mode 100644
index 000000000..7f819a88e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public test_copy() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        v2 = *move(v_ref);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.test_copy();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
new file mode 100644
index 000000000..1efd1fbb9
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has copy, drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public test_copy() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        v2 = *move(v_ref);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.test_copy();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.exp
new file mode 100644
index 000000000..76fb2e332
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
new file mode 100644
index 000000000..4d8c4949f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) == move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
new file mode 100644
index 000000000..d1d515469
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) == move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
new file mode 100644
index 000000000..bd9b0572d
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 17-27:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
new file mode 100644
index 000000000..0142099fa
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x2.B {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+    let c: B.C;
+    let d: B.D;
+label b0:
+    c = B.make_c();
+    d = B.make_d();
+    _ = move(c) == move(d);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp
new file mode 100644
index 000000000..27eb21b11
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 24-30:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
new file mode 100644
index 000000000..b53f76325
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
@@ -0,0 +1,30 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
new file mode 100644
index 000000000..b1324c355
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
@@ -0,0 +1,30 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.exp
new file mode 100644
index 000000000..76fb2e332
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
new file mode 100644
index 000000000..d6a1335e2
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) != move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
new file mode 100644
index 000000000..98825cf84
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) != move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.exp
new file mode 100644
index 000000000..3a254de5b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 23-29:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
new file mode 100644
index 000000000..b81d2c2ae
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+    label b0:
+        _ = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
new file mode 100644
index 000000000..b6ce3705a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+    label b0:
+        _ = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp
new file mode 100644
index 000000000..eb10b139a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-39:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
new file mode 100644
index 000000000..380d3edbc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.D>;
+    let a: A.D;
+
+label b0:
+    a = A.make_d();
+    v = vec_pack_1<A.D>(move(a));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.exp
new file mode 100644
index 000000000..dd8e2e182
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.mvir
new file mode 100644
index 000000000..6c577c799
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        v = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
new file mode 100644
index 000000000..c498ff8d7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        v = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp
new file mode 100644
index 000000000..e2a43afd6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 30-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
new file mode 100644
index 000000000..65620d8f7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+        let v_ref: &mut A.C;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        v_ref = &mut v;
+        *move(v_ref) = move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
new file mode 100644
index 000000000..20b213e8a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+        let v_ref: &mut A.C;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        v_ref = &mut v;
+        *move(v_ref) = move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
new file mode 100644
index 000000000..6199c5255
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x2.A {
+    struct HotPotato has store {}
+    struct X has store { h: Self.HotPotato }
+    struct G has key { x: Self.X }
+
+    public make_g(): Self.G {
+    label b0:
+        return G { x: X { h: HotPotato {} }};
+    }
+
+    public store(account: &signer, g: Self.G) {
+    label b0:
+        move_to<G>(move(account), move(g));
+        return;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.G;
+label b0:
+    a = A.make_g();
+    A.store(&account, move(a));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp
new file mode 100644
index 000000000..eaa960b97
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 28-34:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
new file mode 100644
index 000000000..c6436132b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C has key { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
new file mode 100644
index 000000000..464c8ce1d
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C has key { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp
new file mode 100644
index 000000000..cf37d02f6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 31-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
new file mode 100644
index 000000000..2ef0a1bc7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public mut_field() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let x: &mut u64;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        x = &mut move(v_ref).C::x;
+        *move(x) = 10;
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.mut_field();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
new file mode 100644
index 000000000..52efe94b9
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
@@ -0,0 +1,43 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public mutate(c: &mut Self.C) {
+    let c_ref: &mut u64;
+  label b0:
+    c_ref = &mut move(c).C::x;
+    *move(c_ref) = 10;
+    return;
+  }
+
+  public value(c: &Self.C): u64 {
+    let c_ref: &u64;
+  label b0:
+    c_ref = &move(c).C::x;
+    return *move(c_ref);
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let c_ref_mut: &mut A.C;
+    let c_ref: &A.C;
+    let v: u64;
+
+label b0:
+    c = A.make();
+    c_ref_mut = &mut c;
+    A.mutate(move(c_ref_mut));
+    c_ref = &c;
+    v = A.value(move(c_ref));
+    assert(move(v) == 10, 1);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp
new file mode 100644
index 000000000..d83377a79
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 31-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
new file mode 100644
index 000000000..525fbc7ca
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public mut_field() {
+        let v: A.C<u64>;
+        let v_ref: &mut A.C<u64>;
+        let x: &mut u64;
+
+    label b0:
+        v = A.make<u64>(20u64);
+        v_ref = &mut v;
+        x = &mut move(v_ref).C::x;
+        *move(x) = 10;
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.mut_field();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp
new file mode 100644
index 000000000..2355ce3a2
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 24-31:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
new file mode 100644
index 000000000..28c6d2a13
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
@@ -0,0 +1,31 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x3.B {
+    import 0x2.A;
+
+    public make(): A.C {
+        let v: A.C;
+    label b0:
+        v = A.make();
+
+        return move(v);
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x3.B;
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = B.make();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp
new file mode 100644
index 000000000..dc82e72d6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-19:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
new file mode 100644
index 000000000..81af2b9cd
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x2.A {
+  import 0x1.string;
+  public test() {
+    let b: vector<u8>;
+  label b0:
+    b = vec_pack_0<u8>();
+    _ = string.internal_check_utf8(&b);
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp
new file mode 100644
index 000000000..0e3a5396c
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
new file mode 100644
index 000000000..f6c90dcb2
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public store(account: &signer) {
+        let v: A.C;
+    label b0:
+        v = A.make();
+        move_to<C>(move(account), move(v));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp
new file mode 100644
index 000000000..d9c77ee3c
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
new file mode 100644
index 000000000..c90e4b92a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C<T> { x: T }
+
+    public store(account: &signer) {
+        let v: A.C<u64>;
+    label b0:
+        v = A.make<u64>(10);
+        move_to<C<u64>>(move(account), move(v));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp
new file mode 100644
index 000000000..c6379127b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 2 'run'. lines 36-42:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
new file mode 100644
index 000000000..6237cc903
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
@@ -0,0 +1,52 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public unpack(c: Self.C) {
+    let x: u64;
+  label b0:
+    C { x } = move(c);
+    return;
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: u64 }
+
+    public drop() {
+        let v: A.C;
+        let x: u64;
+
+    label b0:
+        v = A.make();
+        C { x } = move(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.C;
+label b0:
+    a = A.make();
+    A.unpack(move(a));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp
new file mode 100644
index 000000000..eaa960b97
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 28-34:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
new file mode 100644
index 000000000..0f843b239
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public unpack() {
+        let v: A.C<u64>;
+        let x: u64;
+
+    label b0:
+        v = A.make<u64>(20u64);
+        C { x } = move(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.unpack();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
new file mode 100644
index 000000000..b6a8ed36e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+
+  public unpack<T>(c: Self.C<T>) {
+    let x: T;
+  label b0:
+    C<T> { x } = move(c);
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<u64>;
+label b0:
+    c = A.make<u64>(10);
+    A.unpack<u64>(move(c));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/tests.rs b/vendors/move/crates/move-vm/paranoid-tests/tests/tests.rs
new file mode 100644
index 000000000..c5cf1eb09
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/tests.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use fail::FailScenario;
+use move_transactional_test_runner::vm_test_harness::run_test;
+use std::path::Path;
+
+fn run_test_(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
+    let scenario = FailScenario::setup();
+    fail::cfg("verifier-failpoint-1", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-2", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-3", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-4", "100%return").unwrap();
+    run_test(path)?;
+    scenario.teardown();
+    Ok(())
+}
+
+datatest_stable::harness!(run_test_, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp
new file mode 100644
index 000000000..32d10958c
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
new file mode 100644
index 000000000..5a89699b9
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x), y: 0 };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(10u64);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp
new file mode 100644
index 000000000..60b9c2af7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp
@@ -0,0 +1,28 @@
+processed 5 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'run'. lines 41-50:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'run'. lines 52-61:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
new file mode 100644
index 000000000..8548f3683
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
@@ -0,0 +1,61 @@
+//# publish
+module 0x2.A {
+  struct A has key { b: Self.B }
+  struct B has store { x: u64 }
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public store(x: Self.B, s: &signer) {
+  label b0:
+    move_to<A>(move(s), A { b: move(x)});
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x2 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: u64;
+
+label b0:
+    v = 0;
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x2
+import 0x2.A;
+main(account: signer) {
+    let v: u64;
+
+label b0:
+    v = 0;
+    A.store(move(v), &account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp
new file mode 100644
index 000000000..d7cac06c3
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp
@@ -0,0 +1,28 @@
+processed 6 tasks
+
+task 2 'run'. lines 30-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'run'. lines 38-44:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 5 'run'. lines 56-64:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
new file mode 100644
index 000000000..1e7e09db2
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
@@ -0,0 +1,64 @@
+//# publish
+module 0x2.A {
+  struct A has drop { v: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { v: 10 };
+  }
+
+  public call(a: u64, b: bool, c: u8) {
+  label b0:
+    return;
+  }
+
+  public call_a(a: Self.A, b: bool, c: u8) {
+  label b0:
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(10, true, 8u8);
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(true, true, 8u8);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(10, true, true);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.call_a(move(a), true, 8u8);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.call_a(8, true, move(a));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp
new file mode 100644
index 000000000..3d3d18a2e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
new file mode 100644
index 000000000..9b53923e6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x2.A {
+  struct A has key { x: u64 }
+  struct B has store { x: u64 }
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public store(x: &Self.B, s: &signer) {
+  label b0:
+    move_to<A>(move(s), A { x: 0 });
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(&v, &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(&v, &account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp
new file mode 100644
index 000000000..d13ec65a9
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 36-48:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
new file mode 100644
index 000000000..44639e1fb
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
@@ -0,0 +1,48 @@
+//# publish
+module 0x2.A {
+  struct B has drop { x: u64 }
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_b(): Self.B {
+  label b0:
+    return B { x: 0};
+  }
+
+  public run(x: &vector<Self.C>) {
+  label b0:
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+
+    A.run(&v);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.B;
+
+label b0:
+    a = A.make_b();
+    v = vec_pack_1<A.C>(move(a));
+
+    A.run(&v);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp
new file mode 100644
index 000000000..b7c83b348
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 30-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x1::bcs,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
new file mode 100644
index 000000000..7fc26783e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+  struct B has drop { x: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x : 0 };
+  }
+
+  public make_b(): Self.B {
+  label b0:
+    return B { x : 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.bcs;
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+
+label b0:
+    a = A.make_a();
+    _ = bcs.to_bytes<A.A>(&a);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.bcs;
+import 0x2.A;
+main(account: signer) {
+    let a: A.B;
+
+label b0:
+    a = A.make_b();
+    _ = bcs.to_bytes<A.A>(&a);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp
new file mode 100644
index 000000000..125f1f52c
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-8:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
new file mode 100644
index 000000000..7d249a601
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
@@ -0,0 +1,8 @@
+//# run --signers 0x1  --check-runtime-types
+import 0x1.signer;
+main(account: signer) {
+    let u: &address;
+label b0:
+    u = signer.address_of(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
new file mode 100644
index 000000000..05be2e5ca
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.type_name;
+import 0x1.ascii;
+import 0x2.A;
+main(account: signer) {
+    let v: type_name.TypeName;
+    let s: ascii.String;
+
+label b0:
+    v = type_name.get<A.A>();
+    s = type_name.into_string(move(v));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
new file mode 100644
index 000000000..aadcf424f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
@@ -0,0 +1,37 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 3 'run'. lines 43-53:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
new file mode 100644
index 000000000..229aaa5fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: address }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0x1 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 0x1;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<address>;
+    let b: &mut address;
+label b0:
+    a = vec_pack_0<address>();
+    vec_push_back<address>(&mut a, true);
+    b = vec_mut_borrow<address>(&mut a, 0);
+    *move(b) = 0x1;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<address>;
+    let b: &mut address;
+label b0:
+    a = vec_pack_0<address>();
+    vec_push_back<address>(&mut a, true);
+    b = vec_mut_borrow<address>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: address;
+    let b: &mut address;
+label b0:
+    a = 0x2;
+    b = &mut a;
+    *move(b) = 0x1;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: address;
+    let b: &mut address;
+label b0:
+    a = 0x2;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
new file mode 100644
index 000000000..b2d41085e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: bool }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: true };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = true;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<bool>;
+    let b: &mut bool;
+label b0:
+    a = vec_pack_0<bool>();
+    vec_push_back<bool>(&mut a, true);
+    b = vec_mut_borrow<bool>(&mut a, 0);
+    *move(b) = false;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<bool>;
+    let b: &mut bool;
+label b0:
+    a = vec_pack_0<bool>();
+    vec_push_back<bool>(&mut a, true);
+    b = vec_mut_borrow<bool>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: bool;
+    let b: &mut bool;
+label b0:
+    a = false;
+    b = &mut a;
+    *move(b) = true;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: bool;
+    let b: &mut bool;
+label b0:
+    a = false;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
new file mode 100644
index 000000000..0ef992946
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u128 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u128 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u128;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u128>;
+    let b: &mut u128;
+label b0:
+    a = vec_pack_0<u128>();
+    vec_push_back<u128>(&mut a, 1u128);
+    b = vec_mut_borrow<u128>(&mut a, 0);
+    *move(b) = 5u128;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u128>;
+    let b: &mut u128;
+label b0:
+    a = vec_pack_0<u128>();
+    vec_push_back<u128>(&mut a, 1u128);
+    b = vec_mut_borrow<u128>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u128;
+    let b: &mut u128;
+label b0:
+    a = 0u128;
+    b = &mut a;
+    *move(b) = 10u128;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u128;
+    let b: &mut u128;
+label b0:
+    a = 0u128;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
new file mode 100644
index 000000000..d3a898045
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u16 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u16 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u16;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u16>;
+    let b: &mut u16;
+label b0:
+    a = vec_pack_0<u16>();
+    vec_push_back<u16>(&mut a, 1u16);
+    b = vec_mut_borrow<u16>(&mut a, 0);
+    *move(b) = 5u16;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u16>;
+    let b: &mut u16;
+label b0:
+    a = vec_pack_0<u16>();
+    vec_push_back<u16>(&mut a, 1u16);
+    b = vec_mut_borrow<u16>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u16;
+    let b: &mut u16;
+label b0:
+    a = 0u16;
+    b = &mut a;
+    *move(b) = 10u16;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u16;
+    let b: &mut u16;
+label b0:
+    a = 0u16;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
new file mode 100644
index 000000000..d3a770d68
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u256 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u256 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u256;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u256>;
+    let b: &mut u256;
+label b0:
+    a = vec_pack_0<u256>();
+    vec_push_back<u256>(&mut a, 1u256);
+    b = vec_mut_borrow<u256>(&mut a, 0);
+    *move(b) = 5u256;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u256>;
+    let b: &mut u256;
+label b0:
+    a = vec_pack_0<u256>();
+    vec_push_back<u256>(&mut a, 1u256);
+    b = vec_mut_borrow<u256>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u256;
+    let b: &mut u256;
+label b0:
+    a = 0u256;
+    b = &mut a;
+    *move(b) = 10u256;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u256;
+    let b: &mut u256;
+label b0:
+    a = 0u256;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
new file mode 100644
index 000000000..92f135996
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u32 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u32 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u32;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u32>;
+    let b: &mut u32;
+label b0:
+    a = vec_pack_0<u32>();
+    vec_push_back<u32>(&mut a, 1u32);
+    b = vec_mut_borrow<u32>(&mut a, 0);
+    *move(b) = 5u32;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u32>;
+    let b: &mut u32;
+label b0:
+    a = vec_pack_0<u32>();
+    vec_push_back<u32>(&mut a, 1u32);
+    b = vec_mut_borrow<u32>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u32;
+    let b: &mut u32;
+label b0:
+    a = 0u32;
+    b = &mut a;
+    *move(b) = 10u32;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u32;
+    let b: &mut u32;
+label b0:
+    a = 0u32;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
new file mode 100644
index 000000000..486c8e802
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u64 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u64>;
+    let b: &mut u64;
+label b0:
+    a = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut a, 1u64);
+    b = vec_mut_borrow<u64>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u64>;
+    let b: &mut u64;
+label b0:
+    a = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut a, 1u64);
+    b = vec_mut_borrow<u64>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u64;
+    let b: &mut u64;
+label b0:
+    a = 0u64;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u64;
+    let b: &mut u64;
+label b0:
+    a = 0u64;
+    b = &mut a;
+    *move(b) = 10u8;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
new file mode 100644
index 000000000..11fc136fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
new file mode 100644
index 000000000..bbff4c6de
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u8 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u8 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u8>;
+    let b: &mut u8;
+label b0:
+    a = vec_pack_0<u8>();
+    vec_push_back<u8>(&mut a, 1u8);
+    b = vec_mut_borrow<u8>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u8>;
+    let b: &mut u8;
+label b0:
+    a = vec_pack_0<u8>();
+    vec_push_back<u8>(&mut a, 1u8);
+    b = vec_mut_borrow<u8>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u8;
+    let b: &mut u8;
+label b0:
+    a = 0u8;
+    b = &mut a;
+    *move(b) = 10u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u8;
+    let b: &mut u8;
+label b0:
+    a = 0u8;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
new file mode 100644
index 000000000..43df17fec
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 2 'run'. lines 34-45:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 47-58:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
new file mode 100644
index 000000000..b675f91f0
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
@@ -0,0 +1,71 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public make_g(): Self.G {
+    label b0:
+        return G {x: 1};
+    }
+
+    public borrow(g: &Self.G): &u64 {
+    label b0:
+        return &(move(g)).G::x;
+    }
+
+    public borrow_mut(g: &mut Self.G): &mut u64 {
+    label b0:
+        return &mut (move(g)).G::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    *move(u_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &mut u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    *move(u_ref) = 10;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
new file mode 100644
index 000000000..43df17fec
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 2 'run'. lines 34-45:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 47-58:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
new file mode 100644
index 000000000..2e26f2519
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
@@ -0,0 +1,71 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public make_g(): Self.G<u64> {
+    label b0:
+        return G<u64> { x: 1 };
+    }
+
+    public borrow(g: &Self.G<u64>): &u64 {
+    label b0:
+        return &(move(g)).G<u64>::x;
+    }
+
+    public borrow_mut(g: &mut Self.G<u64>): &mut u64 {
+    label b0:
+        return &mut (move(g)).G<u64>::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    *move(u_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &mut u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    *move(u_ref) = 10;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
new file mode 100644
index 000000000..5af0f1360
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
@@ -0,0 +1,28 @@
+processed 8 tasks
+
+task 2 'run'. lines 59-71:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 73-86:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 6 'run'. lines 116-127:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
new file mode 100644
index 000000000..19aa6ac5a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
@@ -0,0 +1,140 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public make_g(): Self.G {
+    label b0:
+        return G {x: 1};
+    }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public borrow(addr: address): &Self.G {
+    label b0:
+        return borrow_global<G>(move(addr));
+    }
+
+    public borrow_mut(addr: address): &mut u64 {
+    label b0:
+        return borrow_global_mut<G>(move(addr));
+    }
+
+    public borrow_field(addr: address): &u64 {
+        let g_ref: &Self.G;
+    label b0:
+        g_ref = borrow_global<G>(move(addr));
+        return &(move(g_ref)).G::x;
+    }
+
+    public borrow_field_2(addr: address): &u64 {
+        let g_ref: &mut Self.G;
+    label b0:
+        g_ref = borrow_global_mut<G>(move(addr));
+        return &(freeze(move(g_ref))).G::x;
+    }
+
+    public borrow_field_mut(addr: address): &mut u64 {
+        let g_ref: &mut Self.G;
+    label b0:
+        g_ref = borrow_global_mut<G>(move(addr));
+        return &mut (move(g_ref)).G::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G;
+    let g: A.G;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G;
+    let g: A.G;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = A.make_g();
+    *move(g_ref) = move(g);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_2(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    *move(g_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &mut u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_mut(move(a));
+    *move(g_ref) = 10;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
new file mode 100644
index 000000000..5af0f1360
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
@@ -0,0 +1,28 @@
+processed 8 tasks
+
+task 2 'run'. lines 59-71:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 73-86:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 6 'run'. lines 116-127:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
new file mode 100644
index 000000000..aaffa9cb6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
@@ -0,0 +1,140 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public make_g(): Self.G<u64> {
+    label b0:
+        return G<u64> {x: 1};
+    }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public borrow(addr: address): &Self.G<u64> {
+    label b0:
+        return borrow_global<G<u64>>(move(addr));
+    }
+
+    public borrow_mut(addr: address): &mut u64 {
+    label b0:
+        return borrow_global_mut<G<u64>>(move(addr));
+    }
+
+    public borrow_field(addr: address): &u64 {
+        let g_ref: &Self.G<u64>;
+    label b0:
+        g_ref = borrow_global<G<u64>>(move(addr));
+        return &(move(g_ref)).G<u64>::x;
+    }
+
+    public borrow_field_2(addr: address): &u64 {
+        let g_ref: &mut Self.G<u64>;
+    label b0:
+        g_ref = borrow_global_mut<G<u64>>(move(addr));
+        return &(freeze(move(g_ref))).G<u64>::x;
+    }
+
+    public borrow_field_mut(addr: address): &mut u64 {
+        let g_ref: &mut Self.G<u64>;
+    label b0:
+        g_ref = borrow_global_mut<G<u64>>(move(addr));
+        return &mut (move(g_ref)).G<u64>::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G<u64>;
+    let g: A.G<u64>;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G<u64>;
+    let g: A.G<u64>;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = A.make_g();
+    *move(g_ref) = move(g);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_2(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    *move(g_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &mut u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_mut(move(a));
+    *move(g_ref) = 10;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp
new file mode 100644
index 000000000..a9e7a33b0
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
new file mode 100644
index 000000000..04ef18ab3
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
@@ -0,0 +1,21 @@
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &mut u64;
+label b0:
+    u = 10;
+    u_ref = &mut u;
+    *move(u_ref) = 20;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &mut u64;
+label b0:
+    u = 10;
+    u_ref = &u;
+    *move(u_ref) = 20;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
new file mode 100644
index 000000000..e34a174fa
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-22:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'run'. lines 24-31:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
new file mode 100644
index 000000000..d227f3fb1
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
@@ -0,0 +1,31 @@
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&mut u);
+    _ = move(u_ref);
+    return;
+}
+
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&u);
+    _ = move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+label b0:
+    u = 10;
+    _ = freeze(move(u));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp
new file mode 100644
index 000000000..b4d46f6ec
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-21:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
new file mode 100644
index 000000000..6d1e18267
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
@@ -0,0 +1,21 @@
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: u64;
+    let a: u64;
+label b0:
+    c = 10;
+    a = *&c;
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: u64;
+    let a: u64;
+label b0:
+    c = 10;
+    a = *move(c);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
new file mode 100644
index 000000000..b8e60303e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 47-53:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 10)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
new file mode 100644
index 000000000..508bb5753
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
@@ -0,0 +1,53 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+  struct A has drop { c: Self.C }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+
+  public test_mutate() {
+    let a: Self.A;
+    let c_ref: &mut Self.C;
+    let c: Self.C;
+  label b0:
+    a = A { c: C { x: 0 }};
+    c_ref =  &mut (&mut a).A::c;
+    *copy(c_ref) = C { x: 20u64 };
+    return;
+  }
+
+  public test_invalid_mutate() {
+    let a: Self.A;
+    let c_ref: &mut Self.C;
+  label b0:
+    a = A { c: C { x: 0 }};
+    c_ref =  &mut (&mut a).A::c;
+    *move(c_ref) = D { x: 20 };
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test_mutate();
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test_invalid_mutate();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
new file mode 100644
index 000000000..e22a99a18
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 35-50:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
new file mode 100644
index 000000000..67ed0ce9b
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
@@ -0,0 +1,50 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+  struct A has drop { c: Self.C }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let v: vector<A.C>;
+    let c_ref: &mut A.C;
+label b0:
+    c = A.make_c();
+    v = vec_pack_1<A.C>(move(c));
+    c_ref = vec_mut_borrow<A.C>(&mut v, 0);
+
+    c = A.make_c();
+    *move(c_ref) = move(c);
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let d: A.D;
+    let v: vector<A.C>;
+    let c_ref: &mut A.C;
+label b0:
+    c = A.make_c();
+    v = vec_pack_1<A.C>(move(c));
+    c_ref = vec_mut_borrow<A.C>(&mut v, 0);
+
+    d = A.make_d();
+    *move(c_ref) = move(d);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
new file mode 100644
index 000000000..871b116a6
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
@@ -0,0 +1,22 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: bool;
+label b0:
+    c = true;
+    jump_if (move(c)) b1;
+label b1:
+    jump b2;
+label b2:
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: bool;
+label b0:
+    c = false;
+    jump_if (move(c)) b1;
+label b1:
+label b2:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp
new file mode 100644
index 000000000..d6ce3c444
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
new file mode 100644
index 000000000..cf0a2d406
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public get(account: address): bool {
+    label b0:
+        return exists<G>(move(account));
+    }
+
+    public get_invalid(account: &signer): bool {
+    label b0:
+        return exists<G>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp
new file mode 100644
index 000000000..d6ce3c444
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
new file mode 100644
index 000000000..b7f60e465
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public get(account: address): bool {
+    label b0:
+        return exists<G<u64>>(move(account));
+    }
+
+    public get_invalid(account: &signer): bool {
+    label b0:
+        return exists<G<u64>>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp
new file mode 100644
index 000000000..d6ce3c444
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
new file mode 100644
index 000000000..c74f302be
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public get(account: address): Self.G {
+    label b0:
+        return move_from<G>(move(account));
+    }
+
+    public get_invalid(account: &signer): Self.G {
+    label b0:
+        return move_from<G>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp
new file mode 100644
index 000000000..d6ce3c444
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
new file mode 100644
index 000000000..bbd2a03a5
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public get(account: address): Self.G<u64> {
+    label b0:
+        return move_from<G<u64>>(move(account));
+    }
+
+    public get_invalid(account: &signer): Self.G<u64> {
+    label b0:
+        return move_from<G<u64>>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp
new file mode 100644
index 000000000..96a435837
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 34-40:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
new file mode 100644
index 000000000..4bfa45508
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+  struct D { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.D;
+
+    label b0:
+        v = A.make_d();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp
new file mode 100644
index 000000000..18cf98ede
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 45-51:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
new file mode 100644
index 000000000..e4602ff1f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
@@ -0,0 +1,51 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+  struct D { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+
+  public take_c(c: Self.C) {
+    let x: u64;
+  label b0:
+    C { x } = move(c);
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.D;
+        let c: Self.C;
+        let x: A.C;
+
+    label b0:
+        v = A.make_d();
+        c = C { x: move(v) };
+
+        C { x } = move(c);
+        A.take_c(move(x));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
new file mode 100644
index 000000000..1f373ced3
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x), y: 0 };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(move(d));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp
new file mode 100644
index 000000000..1c2f5ba2f
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 27-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
new file mode 100644
index 000000000..9e3777c69
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: 0, y: move(x) };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<u64>;
+label b0:
+    c = A.make<u64>(10u64);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(move(d));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp
new file mode 100644
index 000000000..630ac016c
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-22:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
new file mode 100644
index 000000000..0c698c712
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
@@ -0,0 +1,22 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_imm_borrow<u64>(&v, 0);
+    _ = vec_imm_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_imm_borrow<u32>(&v, 0);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp
new file mode 100644
index 000000000..ae165f7c1
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 32-44:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
new file mode 100644
index 000000000..8037e4a55
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    _ = vec_len<A.C>(&v);
+    _ = vec_len<A.C>(&mut v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    _ = vec_len<u64>(&v);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp
new file mode 100644
index 000000000..7181063fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'run'. lines 23-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
new file mode 100644
index 000000000..bb767142d
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
@@ -0,0 +1,32 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u64>(&v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u32>(&mut v, 0);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp
new file mode 100644
index 000000000..949ad81e8
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 2 'run'. lines 27-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::Math,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
new file mode 100644
index 000000000..e60e127e2
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
@@ -0,0 +1,49 @@
+//# publish
+module 0x2.A {
+  struct Password has key { x: u64 }
+
+  public store(x: Self.Password, s: &signer) {
+  label b0:
+    move_to<Password>(move(s), move(x));
+    return;
+  }
+}
+
+//# publish
+module 0x2.Math {
+  import 0x2.A;
+
+  struct R { v: u64 }
+
+  public test(): A.Password {
+      let v1: vector<A.Password>;
+
+  label b0:
+      v1 = vec_pack_1<A.Password>(R { v: 0 });
+      return vec_unpack_1<A.Password>(move(v1));
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.Math;
+import 0x2.A;
+main(account: signer) {
+    let v: A.Password;
+
+label b0:
+    v = Math.test();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.Math;
+import 0x2.A;
+main(account: signer) {
+    let v: A.Password;
+
+label b0:
+    v = Math.test();
+    A.store(move(v), &account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp
new file mode 100644
index 000000000..8c337707a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-23:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'run'. lines 25-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
new file mode 100644
index 000000000..fa120970e
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
@@ -0,0 +1,35 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u64>(&v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u32;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u32>(&v);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp
new file mode 100644
index 000000000..3170601e7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 32-48:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
new file mode 100644
index 000000000..3ea0065ad
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
@@ -0,0 +1,48 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    v = vec_pack_0<A.C>();
+    a = A.make();
+
+    vec_push_back<A.C>(&mut v, move(a));
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+    let b: A.D;
+
+label b0:
+    v = vec_pack_0<A.C>();
+    a = A.make();
+    b = A.make_d();
+
+    vec_push_back<A.C>(&mut v, move(a));
+    vec_push_back<A.C>(&mut v, move(b));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp
new file mode 100644
index 000000000..bc961001a
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-23:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 2 'run'. lines 25-35:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
new file mode 100644
index 000000000..89cff4847
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
@@ -0,0 +1,35 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&mut v, 0, 1);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&v, 0, 1);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&v, true, 1);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp
new file mode 100644
index 000000000..1c6130868
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 22-33:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
new file mode 100644
index 000000000..6d1decdd7
--- /dev/null
+++ b/vendors/move/crates/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<u64>;
+    let c: A.C;
+
+label b0:
+    c = A.make();
+    _ = vec_unpack_1<u64>(move(c));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/runtime/Cargo.toml b/vendors/move/crates/move-vm/runtime/Cargo.toml
new file mode 100644
index 000000000..376da5466
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "move-vm-runtime"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core Move execution logic"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+better_any = "0.1.1"
+fail = "0.4.0"
+move-binary-format = { path = "../../move-binary-format" }
+once_cell = "1.7.2"
+parking_lot = "0.11.1"
+sha3 = "0.9.1"
+tracing = "0.1.26"
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-core-types = { path = "../../move-core-types" }
+move-vm-types = { path = "../types" }
+
+[dev-dependencies]
+anyhow = "1.0.52"
+hex = "0.4.3"
+move-compiler = { path = "../../move-compiler" }
+move-ir-compiler = { path = "../../move-ir-compiler" }
+proptest = "1.0.0"
+
+[features]
+default = []
+fuzzing = ["move-vm-types/fuzzing"]
+failpoints = ["fail/failpoints"]
+# Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds.
+debugging = []
+testing = []
+stacktrace = []
diff --git a/vendors/move/crates/move-vm/runtime/src/config.rs b/vendors/move/crates/move-vm/runtime/src/config.rs
new file mode 100644
index 000000000..faa54c80c
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/config.rs
@@ -0,0 +1,38 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format_common::VERSION_MAX;
+use move_bytecode_verifier::VerifierConfig;
+
+/// Dynamic config options for the Move VM.
+pub struct VMConfig {
+    pub verifier: VerifierConfig,
+    pub max_binary_format_version: u32,
+    // When this flag is set to true, MoveVM will perform type check at every instruction
+    // execution to ensure that type safety cannot be violated at runtime.
+    pub paranoid_type_checks: bool,
+    // When this flag is set to true, MoveVM will check invariant violation in swap_loc
+    pub enable_invariant_violation_check_in_swap_loc: bool,
+    pub type_size_limit: bool,
+}
+
+impl Default for VMConfig {
+    fn default() -> Self {
+        Self {
+            verifier: VerifierConfig::default(),
+            max_binary_format_version: VERSION_MAX,
+            paranoid_type_checks: false,
+            enable_invariant_violation_check_in_swap_loc: true,
+            type_size_limit: false,
+        }
+    }
+}
+
+impl VMConfig {
+    pub fn production() -> Self {
+        Self {
+            verifier: VerifierConfig::production(),
+            ..Self::default()
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/data_cache.rs b/vendors/move/crates/move-vm/runtime/src/data_cache.rs
new file mode 100644
index 000000000..2751b8122
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/data_cache.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::loader::Loader;
+use move_binary_format::errors::*;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Event, Op},
+    gas_algebra::NumBytes,
+    identifier::Identifier,
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    values::{GlobalValue, Value},
+};
+use std::collections::btree_map::BTreeMap;
+
+pub struct AccountDataCache {
+    data_map: BTreeMap<Type, (MoveTypeLayout, GlobalValue)>,
+    module_map: BTreeMap<Identifier, (Vec<u8>, bool)>,
+}
+
+impl AccountDataCache {
+    fn new() -> Self {
+        Self {
+            data_map: BTreeMap::new(),
+            module_map: BTreeMap::new(),
+        }
+    }
+}
+
+/// Transaction data cache. Keep updates within a transaction so they can all be published at
+/// once when the transaction succeeds.
+///
+/// It also provides an implementation for the opcodes that refer to storage and gives the
+/// proper guarantees of reference lifetime.
+///
+/// Dirty objects are serialized and returned in make_write_set.
+///
+/// It is a responsibility of the client to publish changes once the transaction is executed.
+///
+/// The Move VM takes a `DataStore` in input and this is the default and correct implementation
+/// for a data store related to a transaction. Clients should create an instance of this type
+/// and pass it to the Move VM.
+pub(crate) struct TransactionDataCache<'r> {
+    remote: &'r dyn MoveResolver,
+    account_map: BTreeMap<AccountAddress, AccountDataCache>,
+    event_data: Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)>,
+}
+
+impl<'r> TransactionDataCache<'r> {
+    /// Create a `TransactionDataCache` with a `RemoteCache` that provides access to data
+    /// not updated in the transaction.
+    pub(crate) fn new(remote: &'r dyn MoveResolver) -> Self {
+        TransactionDataCache {
+            remote,
+            account_map: BTreeMap::new(),
+            event_data: vec![],
+        }
+    }
+
+    /// Make a write set from the updated (dirty, deleted) global resources along with
+    /// published modules.
+    ///
+    /// Gives all proper guarantees on lifetime of global data as well.
+    pub(crate) fn into_effects(self, loader: &Loader) -> PartialVMResult<(ChangeSet, Vec<Event>)> {
+        let mut change_set = ChangeSet::new();
+        for (addr, account_data_cache) in self.account_map.into_iter() {
+            let mut modules = BTreeMap::new();
+            for (module_name, (module_blob, is_republishing)) in account_data_cache.module_map {
+                let op = if is_republishing {
+                    Op::Modify(module_blob)
+                } else {
+                    Op::New(module_blob)
+                };
+                modules.insert(module_name, op);
+            }
+
+            let mut resources = BTreeMap::new();
+            for (ty, (layout, gv)) in account_data_cache.data_map {
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                let struct_tag = match loader.type_to_type_tag(&ty)? {
+                    TypeTag::Struct(struct_tag) => *struct_tag,
+                    _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::New(resource_blob));
+                    },
+                    Op::Modify(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::Modify(resource_blob));
+                    },
+                    Op::Delete => {
+                        resources.insert(struct_tag, Op::Delete);
+                    },
+                }
+            }
+            if !modules.is_empty() || !resources.is_empty() {
+                change_set
+                    .add_account_changeset(
+                        addr,
+                        AccountChangeSet::from_modules_resources(modules, resources),
+                    )
+                    .expect("accounts should be unique");
+            }
+        }
+
+        let mut events = vec![];
+        for (guid, seq_num, ty, ty_layout, val) in self.event_data {
+            let ty_tag = loader.type_to_type_tag(&ty)?;
+            let blob = val
+                .simple_serialize(&ty_layout)
+                .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+            events.push((guid, seq_num, ty_tag, blob))
+        }
+
+        Ok((change_set, events))
+    }
+
+    pub(crate) fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        // The sender's account will always be mutated.
+        let mut total_mutated_accounts: u64 = 1;
+        for (addr, entry) in self.account_map.iter() {
+            if addr != sender && entry.data_map.values().any(|(_, v)| v.is_mutated()) {
+                total_mutated_accounts += 1;
+            }
+        }
+        total_mutated_accounts
+    }
+
+    fn get_mut_or_insert_with<'a, K, V, F>(map: &'a mut BTreeMap<K, V>, k: &K, gen: F) -> &'a mut V
+    where
+        F: FnOnce() -> (K, V),
+        K: Ord,
+    {
+        if !map.contains_key(k) {
+            let (k, v) = gen();
+            map.insert(k, v);
+        }
+        map.get_mut(k).unwrap()
+    }
+
+    // Retrieve data from the local cache or loads it from the remote cache into the local cache.
+    // All operations on the global data are based on this API and they all load the data
+    // into the cache.
+    pub(crate) fn load_resource(
+        &mut self,
+        loader: &Loader,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        let account_cache = Self::get_mut_or_insert_with(&mut self.account_map, &addr, || {
+            (addr, AccountDataCache::new())
+        });
+
+        let mut load_res = None;
+        if !account_cache.data_map.contains_key(ty) {
+            let ty_tag = match loader.type_to_type_tag(ty)? {
+                TypeTag::Struct(s_tag) => s_tag,
+                _ =>
+                // non-struct top-level value; can't happen
+                {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))
+                },
+            };
+            // TODO(Gas): Shall we charge for this?
+            let ty_layout = loader.type_to_type_layout(ty)?;
+
+            let gv = match self.remote.get_resource(&addr, &ty_tag) {
+                Ok(Some(blob)) => {
+                    load_res = Some(Some(NumBytes::new(blob.len() as u64)));
+                    let val = match Value::simple_deserialize(&blob, &ty_layout) {
+                        Some(val) => val,
+                        None => {
+                            let msg =
+                                format!("Failed to deserialize resource {} at {}!", ty_tag, addr);
+                            return Err(PartialVMError::new(
+                                StatusCode::FAILED_TO_DESERIALIZE_RESOURCE,
+                            )
+                            .with_message(msg));
+                        },
+                    };
+
+                    GlobalValue::cached(val)?
+                },
+                Ok(None) => {
+                    load_res = Some(None);
+                    GlobalValue::none()
+                },
+                Err(err) => {
+                    let msg = format!("Unexpected storage error: {:?}", err);
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(msg),
+                    );
+                },
+            };
+
+            account_cache.data_map.insert(ty.clone(), (ty_layout, gv));
+        }
+
+        Ok((
+            account_cache
+                .data_map
+                .get_mut(ty)
+                .map(|(_ty_layout, gv)| gv)
+                .expect("global value must exist"),
+            load_res,
+        ))
+    }
+
+    pub(crate) fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
+        if let Some(account_cache) = self.account_map.get(module_id.address()) {
+            if let Some((blob, _is_republishing)) = account_cache.module_map.get(module_id.name()) {
+                return Ok(blob.clone());
+            }
+        }
+        match self.remote.get_module(module_id) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Cannot find {:?} in data cache", module_id))
+                .finish(Location::Undefined)),
+            Err(err) => {
+                let msg = format!("Unexpected storage error: {:?}", err);
+                Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(msg)
+                        .finish(Location::Undefined),
+                )
+            },
+        }
+    }
+
+    pub(crate) fn publish_module(
+        &mut self,
+        module_id: &ModuleId,
+        blob: Vec<u8>,
+        is_republishing: bool,
+    ) -> VMResult<()> {
+        let account_cache =
+            Self::get_mut_or_insert_with(&mut self.account_map, module_id.address(), || {
+                (*module_id.address(), AccountDataCache::new())
+            });
+
+        account_cache
+            .module_map
+            .insert(module_id.name().to_owned(), (blob, is_republishing));
+
+        Ok(())
+    }
+
+    pub(crate) fn exists_module(&self, module_id: &ModuleId) -> VMResult<bool> {
+        if let Some(account_cache) = self.account_map.get(module_id.address()) {
+            if account_cache.module_map.contains_key(module_id.name()) {
+                return Ok(true);
+            }
+        }
+        Ok(self
+            .remote
+            .get_module(module_id)
+            .map_err(|_| {
+                PartialVMError::new(StatusCode::STORAGE_ERROR).finish(Location::Undefined)
+            })?
+            .is_some())
+    }
+
+    #[allow(clippy::unit_arg)]
+    pub(crate) fn emit_event(
+        &mut self,
+        loader: &Loader,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<()> {
+        let ty_layout = loader.type_to_type_layout(&ty)?;
+        Ok(self.event_data.push((guid, seq_num, ty, ty_layout, val)))
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/debug.rs b/vendors/move/crates/move-vm/runtime/src/debug.rs
new file mode 100644
index 000000000..5eacb3743
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/debug.rs
@@ -0,0 +1,196 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+use move_binary_format::file_format::Bytecode;
+use move_vm_types::values::{self, Locals};
+use std::{
+    collections::BTreeSet,
+    io::{self, Write},
+    str::FromStr,
+};
+
+#[derive(Debug)]
+enum DebugCommand {
+    PrintStack,
+    Step,
+    Continue,
+    Breakpoint(String),
+    DeleteBreakpoint(String),
+    PrintBreakpoints,
+}
+
+impl DebugCommand {
+    pub fn debug_string(&self) -> &str {
+        match self {
+            Self::PrintStack => "stack",
+            Self::Step => "step",
+            Self::Continue => "continue",
+            Self::Breakpoint(_) => "breakpoint ",
+            Self::DeleteBreakpoint(_) => "delete ",
+            Self::PrintBreakpoints => "breakpoints",
+        }
+    }
+
+    pub fn commands() -> Vec<DebugCommand> {
+        vec![
+            Self::PrintStack,
+            Self::Step,
+            Self::Continue,
+            Self::Breakpoint("".to_string()),
+            Self::DeleteBreakpoint("".to_string()),
+            Self::PrintBreakpoints,
+        ]
+    }
+}
+
+impl FromStr for DebugCommand {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use DebugCommand::*;
+        let s = s.trim();
+        if s.starts_with(PrintStack.debug_string()) {
+            return Ok(PrintStack);
+        }
+        if s.starts_with(Step.debug_string()) {
+            return Ok(Step);
+        }
+        if s.starts_with(Continue.debug_string()) {
+            return Ok(Continue);
+        }
+        if let Some(breakpoint) = s.strip_prefix(Breakpoint("".to_owned()).debug_string()) {
+            return Ok(Breakpoint(breakpoint.to_owned()));
+        }
+        if let Some(breakpoint) = s.strip_prefix(DeleteBreakpoint("".to_owned()).debug_string()) {
+            return Ok(DeleteBreakpoint(breakpoint.to_owned()));
+        }
+        if s.starts_with(PrintBreakpoints.debug_string()) {
+            return Ok(PrintBreakpoints);
+        }
+        Err(format!(
+            "Unrecognized command: {}\nAvailable commands: {}",
+            s,
+            Self::commands()
+                .iter()
+                .map(|command| command.debug_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        ))
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct DebugContext {
+    breakpoints: BTreeSet<String>,
+    should_take_input: bool,
+}
+
+impl DebugContext {
+    pub(crate) fn new() -> Self {
+        Self {
+            breakpoints: BTreeSet::new(),
+            should_take_input: true,
+        }
+    }
+
+    pub(crate) fn debug_loop(
+        &mut self,
+        function_desc: &Function,
+        locals: &Locals,
+        pc: u16,
+        instr: &Bytecode,
+        resolver: &Loader,
+        interp: &Interpreter,
+    ) {
+        let instr_string = format!("{:?}", instr);
+        let function_string = function_desc.pretty_string();
+        let breakpoint_hit = self.breakpoints.contains(&function_string)
+            || self
+                .breakpoints
+                .iter()
+                .any(|bp| instr_string[..].starts_with(bp.as_str()));
+
+        if self.should_take_input || breakpoint_hit {
+            self.should_take_input = true;
+            if breakpoint_hit {
+                let bp_match = self
+                    .breakpoints
+                    .iter()
+                    .find(|bp| instr_string.starts_with(bp.as_str()))
+                    .unwrap()
+                    .clone();
+                println!(
+                    "Breakpoint {} hit with instruction {}",
+                    bp_match, instr_string
+                );
+            }
+            println!(
+                "function >> {}\ninstruction >> {:?}\nprogram counter >> {}",
+                function_string, instr, pc
+            );
+            loop {
+                print!("> ");
+                std::io::stdout().flush().unwrap();
+                let mut input = String::new();
+                match io::stdin().read_line(&mut input) {
+                    Ok(_) => match input.parse::<DebugCommand>() {
+                        Err(err) => println!("{}", err),
+                        Ok(command) => match command {
+                            DebugCommand::Step => {
+                                self.should_take_input = true;
+                                break;
+                            },
+                            DebugCommand::Continue => {
+                                self.should_take_input = false;
+                                break;
+                            },
+                            DebugCommand::Breakpoint(breakpoint) => {
+                                self.breakpoints.insert(breakpoint.to_string());
+                            },
+                            DebugCommand::DeleteBreakpoint(breakpoint) => {
+                                self.breakpoints.remove(&breakpoint);
+                            },
+                            DebugCommand::PrintBreakpoints => self
+                                .breakpoints
+                                .iter()
+                                .enumerate()
+                                .for_each(|(i, bp)| println!("[{}] {}", i, bp)),
+                            DebugCommand::PrintStack => {
+                                let mut s = String::new();
+                                interp.debug_print_stack_trace(&mut s, resolver).unwrap();
+                                println!("{}", s);
+                                println!("Current frame: {}\n", function_string);
+                                let code = function_desc.code();
+                                println!("        Code:");
+                                for (i, instr) in code.iter().enumerate() {
+                                    if i as u16 == pc {
+                                        println!("          > [{}] {:?}", pc, instr);
+                                    } else {
+                                        println!("            [{}] {:?}", i, instr);
+                                    }
+                                }
+                                println!("        Locals:");
+                                if function_desc.local_count() > 0 {
+                                    let mut s = String::new();
+                                    values::debug::print_locals(&mut s, locals).unwrap();
+                                    println!("{}", s);
+                                } else {
+                                    println!("            (none)");
+                                }
+                            },
+                        },
+                    },
+                    Err(err) => {
+                        println!("Error reading input: {}", err);
+                        break;
+                    },
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/interpreter.rs b/vendors/move/crates/move-vm/runtime/src/interpreter.rs
new file mode 100644
index 000000000..641e4385f
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/interpreter.rs
@@ -0,0 +1,2315 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache,
+    loader::{Function, Loader, Resolver},
+    native_extensions::NativeContextExtensions,
+    native_functions::NativeContext,
+    trace,
+};
+use fail::fail_point;
+use move_binary_format::{
+    errors::*,
+    file_format::{Ability, AbilitySet, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{NumArgs, NumBytes},
+    language_storage::TypeTag,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::{
+    gas::{GasMeter, SimpleInstruction},
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    values::{
+        self, GlobalValue, IntegerValue, Locals, Reference, Struct, StructRef, VMValueCast, Value,
+        Vector, VectorRef,
+    },
+    views::TypeView,
+};
+use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc};
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! set_err_info {
+    ($frame:ident, $e:expr) => {{
+        $e.at_code_offset($frame.function.index(), $frame.pc)
+            .finish($frame.location())
+    }};
+}
+
+/// `Interpreter` instances can execute Move functions.
+///
+/// An `Interpreter` instance is a stand alone execution context for a function.
+/// It mimics execution on a single thread, with an call stack and an operand stack.
+pub(crate) struct Interpreter {
+    /// Operand stack, where Move `Value`s are stored for stack operations.
+    operand_stack: Stack,
+    /// The stack of active functions.
+    call_stack: CallStack,
+    /// Whether to perform a paranoid type safety checks at runtime.
+    paranoid_type_checks: bool,
+}
+
+struct TypeWithLoader<'a, 'b> {
+    ty: &'a Type,
+    loader: &'b Loader,
+}
+
+impl<'a, 'b> TypeView for TypeWithLoader<'a, 'b> {
+    fn to_type_tag(&self) -> TypeTag {
+        self.loader.type_to_type_tag(self.ty).unwrap()
+    }
+}
+
+impl Interpreter {
+    /// Entrypoint into the interpreter. All external calls need to be routed through this
+    /// function.
+    pub(crate) fn entrypoint(
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        loader: &Loader,
+    ) -> VMResult<Vec<Value>> {
+        Interpreter {
+            operand_stack: Stack::new(),
+            call_stack: CallStack::new(),
+            paranoid_type_checks: loader.vm_config().paranoid_type_checks,
+        }
+        .execute_main(
+            loader, data_store, gas_meter, extensions, function, ty_args, args,
+        )
+    }
+
+    /// Main loop for the execution of a function.
+    ///
+    /// This function sets up a `Frame` and calls `execute_code_unit` to execute code of the
+    /// function represented by the frame. Control comes back to this function on return or
+    /// on call. When that happens the frame is changes to a new one (call) or to the one
+    /// at the top of the stack (return). If the call stack is empty execution is completed.
+    fn execute_main(
+        mut self,
+        loader: &Loader,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+    ) -> VMResult<Vec<Value>> {
+        let mut locals = Locals::new(function.local_count());
+        for (i, value) in args.into_iter().enumerate() {
+            locals
+                .store_loc(
+                    i,
+                    value,
+                    loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )
+                .map_err(|e| self.set_location(e))?;
+        }
+
+        let mut current_frame = self
+            .make_new_frame(loader, function, ty_args, locals)
+            .map_err(|err| self.set_location(err))?;
+        loop {
+            let resolver = current_frame.resolver(loader);
+            let exit_code =
+                current_frame //self
+                    .execute_code(&resolver, &mut self, data_store, gas_meter)
+                    .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+            match exit_code {
+                ExitCode::Return => {
+                    let non_ref_vals = current_frame
+                        .locals
+                        .drop_all_values()
+                        .map(|(_idx, val)| val)
+                        .collect::<Vec<_>>();
+
+                    // TODO: Check if the error location is set correctly.
+                    gas_meter
+                        .charge_drop_frame(non_ref_vals.iter())
+                        .map_err(|e| self.set_location(e))?;
+
+                    if let Some(frame) = self.call_stack.pop() {
+                        // Note: the caller will find the callee's return values at the top of the shared operand stack
+                        current_frame = frame;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                    } else {
+                        // end of execution. `self` should no longer be used afterward
+                        return Ok(self.operand_stack.value);
+                    }
+                },
+                ExitCode::Call(fh_idx) => {
+                    let func = resolver.function_from_handle(fh_idx);
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call(
+                            module_id,
+                            func.name(),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver,
+                            data_store,
+                            gas_meter,
+                            extensions,
+                            func,
+                            vec![],
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(loader, func, vec![])
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    // Note: the caller will find the the callee's return values at the top of the shared operand stack
+                    current_frame = frame;
+                },
+                ExitCode::CallGeneric(idx) => {
+                    // TODO(Gas): We should charge gas as we do type substitution...
+                    let ty_args = resolver
+                        .instantiate_generic_function(idx, current_frame.ty_args())
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    let func = resolver.function_from_instantiation(idx);
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call_generic(
+                            module_id,
+                            func.name(),
+                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver, data_store, gas_meter, extensions, func, ty_args,
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(loader, func, ty_args)
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    current_frame = frame;
+                },
+            }
+        }
+    }
+
+    /// Returns a `Frame` if the call is to a Move function. Calls to native functions are
+    /// "inlined" and this returns `None`.
+    ///
+    /// Native functions do not push a frame at the moment and as such errors from a native
+    /// function are incorrectly attributed to the caller.
+    fn make_call_frame(
+        &mut self,
+        loader: &Loader,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<Frame> {
+        let mut locals = Locals::new(func.local_count());
+        let arg_count = func.arg_count();
+        let is_generic = !ty_args.is_empty();
+        for i in 0..arg_count {
+            locals.store_loc(
+                arg_count - i - 1,
+                self.operand_stack.pop()?,
+                loader
+                    .vm_config()
+                    .enable_invariant_violation_check_in_swap_loc,
+            )?;
+
+            if self.paranoid_type_checks {
+                let ty = self.operand_stack.pop_ty()?;
+                let resolver = func.get_resolver(loader);
+                if is_generic {
+                    ty.check_eq(
+                        &resolver.subst(&func.local_types()[arg_count - i - 1], &ty_args)?,
+                    )?;
+                } else {
+                    // Directly check against the expected type to save a clone here.
+                    ty.check_eq(&func.local_types()[arg_count - i - 1])?;
+                }
+            }
+        }
+        self.make_new_frame(loader, func, ty_args, locals)
+    }
+
+    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    ///
+    /// The locals must be loaded before calling this.
+    fn make_new_frame(
+        &self,
+        loader: &Loader,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        locals: Locals,
+    ) -> PartialVMResult<Frame> {
+        let local_tys = if self.paranoid_type_checks {
+            if ty_args.is_empty() {
+                function.local_types().to_vec()
+            } else {
+                let resolver = function.get_resolver(loader);
+                function
+                    .local_types()
+                    .iter()
+                    .map(|ty| resolver.subst(ty, &ty_args))
+                    .collect::<PartialVMResult<Vec<_>>>()?
+            }
+        } else {
+            vec![]
+        };
+        Ok(Frame {
+            pc: 0,
+            locals,
+            function,
+            ty_args,
+            local_tys,
+        })
+    }
+
+    /// Call a native functions.
+    fn call_native(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> VMResult<()> {
+        // Note: refactor if native functions push a frame on the stack
+        self.call_native_impl(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            ty_args,
+        )
+        .map_err(|e| match function.module_id() {
+            Some(id) => e
+                .at_code_offset(function.index(), 0)
+                .finish(Location::Module(id.clone())),
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Unexpected native function not located in a module".to_owned());
+                self.set_location(err)
+            },
+        })
+    }
+
+    fn call_native_impl(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<()> {
+        let return_type_count = function.return_type_count();
+        let mut args = VecDeque::new();
+        let expected_args = function.arg_count();
+        for _ in 0..expected_args {
+            args.push_front(self.operand_stack.pop()?);
+        }
+
+        if self.paranoid_type_checks {
+            for i in 0..expected_args {
+                let expected_ty =
+                    resolver.subst(&function.parameter_types()[expected_args - i - 1], &ty_args)?;
+                let ty = self.operand_stack.pop_ty()?;
+                ty.check_eq(&expected_ty)?;
+            }
+        }
+
+        let mut native_context = NativeContext::new(
+            self,
+            data_store,
+            resolver,
+            extensions,
+            gas_meter.balance_internal(),
+        );
+        let native_function = function.get_native()?;
+
+        gas_meter.charge_native_function_before_execution(
+            ty_args.iter().map(|ty| TypeWithLoader {
+                ty,
+                loader: resolver.loader(),
+            }),
+            args.iter(),
+        )?;
+
+        let result = native_function(&mut native_context, ty_args.clone(), args)?;
+
+        // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
+        //            here or otherwise it becomes an incompatible change!!!
+        let return_values = match result {
+            NativeResult::Success { cost, ret_vals } => {
+                gas_meter.charge_native_function(cost, Some(ret_vals.iter()))?;
+                ret_vals
+            },
+            NativeResult::Abort { cost, abort_code } => {
+                gas_meter.charge_native_function(cost, Option::<std::iter::Empty<&Value>>::None)?;
+                return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(abort_code));
+            },
+            NativeResult::OutOfGas { partial_cost } => {
+                let err = match gas_meter.charge_native_function(
+                    partial_cost,
+                    Option::<std::iter::Empty<&Value>>::None,
+                ) {
+                    Err(err) if err.major_status() == StatusCode::OUT_OF_GAS => err,
+                    Ok(_) | Err(_) => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                        "The partial cost returned by the native function did not cause the gas meter to trigger an OutOfGas error, at least one of them is violating the contract".to_string()
+                    ),
+                };
+
+                return Err(err);
+            },
+        };
+
+        // Paranoid check to protect us against incorrect native function implementations. A native function that
+        // returns a different number of values than its declared types will trigger this check
+        if return_values.len() != return_type_count {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Arity mismatch: return value count does not match return type count"
+                        .to_string(),
+                ),
+            );
+        }
+        // Put return values on the top of the operand stack, where the caller will find them.
+        // This is one of only two times the operand stack is shared across call stack frames; the other is in handling
+        // the Return instruction for normal calls
+        for value in return_values {
+            self.operand_stack.push(value)?;
+        }
+
+        if self.paranoid_type_checks {
+            for ty in function.return_types() {
+                self.operand_stack.push_ty(resolver.subst(ty, &ty_args)?)?;
+            }
+        }
+        Ok(())
+    }
+
+    /// Make sure only private/friend function can only be invoked by modules under the same address.
+    fn check_friend_or_private_call(
+        &self,
+        caller: &Arc<Function>,
+        callee: &Arc<Function>,
+    ) -> VMResult<()> {
+        if callee.is_friend_or_private() {
+            match (caller.module_id(), callee.module_id()) {
+                (Some(caller_id), Some(callee_id)) => {
+                    if caller_id.address() == callee_id.address() {
+                        Ok(())
+                    } else {
+                        Err(self.set_location(PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message(
+                                    format!("Private/Friend function invokation error, caller: {:?}::{:?}, callee: {:?}::{:?}", caller_id, caller.name(), callee_id, callee.name()),
+                                )))
+                    }
+                },
+                _ => Err(self.set_location(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "Private/Friend function invokation error caller: {:?}, callee {:?}",
+                            caller.name(),
+                            callee.name()
+                        )),
+                )),
+            }
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Perform a binary operation to two values at the top of the stack.
+    fn binop<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<Value>,
+    {
+        let rhs = self.operand_stack.pop_as::<T>()?;
+        let lhs = self.operand_stack.pop_as::<T>()?;
+        let result = f(lhs, rhs)?;
+        self.operand_stack.push(result)
+    }
+
+    /// Perform a binary operation for integer values.
+    fn binop_int<F>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        F: FnOnce(IntegerValue, IntegerValue) -> PartialVMResult<IntegerValue>,
+    {
+        self.binop(|lhs, rhs| {
+            Ok(match f(lhs, rhs)? {
+                IntegerValue::U8(x) => Value::u8(x),
+                IntegerValue::U16(x) => Value::u16(x),
+                IntegerValue::U32(x) => Value::u32(x),
+                IntegerValue::U64(x) => Value::u64(x),
+                IntegerValue::U128(x) => Value::u128(x),
+                IntegerValue::U256(x) => Value::u256(x),
+            })
+        })
+    }
+
+    /// Perform a binary operation for boolean values.
+    fn binop_bool<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<bool>,
+    {
+        self.binop(|lhs, rhs| Ok(Value::bool(f(lhs, rhs)?)))
+    }
+
+    /// Loads a resource from the data store and return the number of bytes read from the storage.
+    fn load_resource<'c>(
+        loader: &Loader,
+        data_store: &'c mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<&'c mut GlobalValue> {
+        match data_store.load_resource(loader, addr, ty) {
+            Ok((gv, load_res)) => {
+                if let Some(loaded) = load_res {
+                    let opt = match loaded {
+                        Some(num_bytes) => {
+                            let view = gv.view().ok_or_else(|| {
+                                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                    .with_message(
+                                        "Failed to create view for global value".to_owned(),
+                                    )
+                            })?;
+
+                            Some((num_bytes, view))
+                        },
+                        None => None,
+                    };
+                    gas_meter.charge_load_resource(addr, TypeWithLoader { ty, loader }, opt)?;
+                }
+                Ok(gv)
+            },
+            Err(e) => Err(e),
+        }
+    }
+
+    /// BorrowGlobal (mutable and not) opcode.
+    fn borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        loader: &Loader,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let res = Self::load_resource(loader, data_store, gas_meter, addr, ty)?.borrow_global();
+        gas_meter.charge_borrow_global(
+            is_mut,
+            is_generic,
+            TypeWithLoader { ty, loader },
+            res.is_ok(),
+        )?;
+        self.operand_stack.push(res?)?;
+        Ok(())
+    }
+
+    /// Exists opcode.
+    fn exists(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(loader, data_store, gas_meter, addr, ty)?;
+        let exists = gv.exists()?;
+        gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
+        self.operand_stack.push(Value::bool(exists))?;
+        Ok(())
+    }
+
+    /// MoveFrom opcode.
+    fn move_from(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let resource =
+            match Self::load_resource(loader, data_store, gas_meter, addr, ty)?.move_from() {
+                Ok(resource) => {
+                    gas_meter.charge_move_from(
+                        is_generic,
+                        TypeWithLoader { ty, loader },
+                        Some(&resource),
+                    )?;
+                    resource
+                },
+                Err(err) => {
+                    let val: Option<&Value> = None;
+                    gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                    return Err(err);
+                },
+            };
+        self.operand_stack.push(resource)?;
+        Ok(())
+    }
+
+    /// MoveTo opcode.
+    fn move_to(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        addr: AccountAddress,
+        ty: &Type,
+        resource: Value,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(loader, data_store, gas_meter, addr, ty)?;
+        // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
+        //            the move_to operation.
+        match gv.move_to(resource) {
+            Ok(()) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    gv.view().unwrap(),
+                    true,
+                )?;
+                Ok(())
+            },
+            Err((err, resource)) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    &resource,
+                    false,
+                )?;
+                Err(err)
+            },
+        }
+    }
+
+    //
+    // Debugging and logging helpers.
+    //
+
+    /// Given an `VMStatus` generate a core dump if the error is an `InvariantViolation`.
+    fn maybe_core_dump(&self, mut err: VMError, current_frame: &Frame) -> VMError {
+        // a verification error cannot happen at runtime so change it into an invariant violation.
+        if err.status_type() == StatusType::Verification {
+            let new_err = PartialVMError::new(StatusCode::VERIFICATION_ERROR);
+            let new_err = match err.message() {
+                None => new_err,
+                Some(msg) => new_err.with_message(msg.to_owned()),
+            };
+            err = new_err.finish(err.location().clone())
+        }
+        if err.status_type() == StatusType::InvariantViolation {
+            let location = err.location().clone();
+            let state = self.internal_state_str(current_frame);
+            err = err
+                .to_partial()
+                .append_message_with_separator(
+                    '\n',
+                    format!("CORE DUMP: >>>>>>>>>>>>\n{}\n<<<<<<<<<<<<\n", state),
+                )
+                .finish(location);
+        }
+        err
+    }
+
+    #[allow(dead_code)]
+    fn debug_print_frame<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+        idx: usize,
+        frame: &Frame,
+    ) -> PartialVMResult<()> {
+        // Print out the function name with type arguments.
+        let func = &frame.function;
+
+        debug_write!(buf, "    [{}] ", idx)?;
+        if let Some(module) = func.module_id() {
+            debug_write!(buf, "{}::{}::", module.address(), module.name(),)?;
+        }
+        debug_write!(buf, "{}", func.name())?;
+        let ty_args = frame.ty_args();
+        let mut ty_tags = vec![];
+        for ty in ty_args {
+            ty_tags.push(loader.type_to_type_tag(ty)?);
+        }
+        if !ty_tags.is_empty() {
+            debug_write!(buf, "<")?;
+            let mut it = ty_tags.iter();
+            if let Some(tag) = it.next() {
+                debug_write!(buf, "{}", tag)?;
+                for tag in it {
+                    debug_write!(buf, ", ")?;
+                    debug_write!(buf, "{}", tag)?;
+                }
+            }
+            debug_write!(buf, ">")?;
+        }
+        debug_writeln!(buf)?;
+
+        // Print out the current instruction.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Code:")?;
+        let pc = frame.pc as usize;
+        let code = func.code();
+        let before = if pc > 3 { pc - 3 } else { 0 };
+        let after = min(code.len(), pc + 4);
+        for (idx, instr) in code.iter().enumerate().take(pc).skip(before) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+        debug_writeln!(buf, "          > [{}] {:?}", pc, &code[pc])?;
+        for (idx, instr) in code.iter().enumerate().take(after).skip(pc + 1) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+
+        // Print out the locals.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Locals:")?;
+        if func.local_count() > 0 {
+            values::debug::print_locals(buf, &frame.locals)?;
+            debug_writeln!(buf)?;
+        } else {
+            debug_writeln!(buf, "            (none)")?;
+        }
+
+        debug_writeln!(buf)?;
+        Ok(())
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn debug_print_stack_trace<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+    ) -> PartialVMResult<()> {
+        debug_writeln!(buf, "Call Stack:")?;
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            self.debug_print_frame(buf, loader, i, frame)?;
+        }
+        debug_writeln!(buf, "Operand Stack:")?;
+        for (idx, val) in self.operand_stack.value.iter().enumerate() {
+            // TODO: Currently we do not know the types of the values on the operand stack.
+            // Revisit.
+            debug_write!(buf, "    [{}] ", idx)?;
+            values::debug::print_value(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    /// Generate a string which is the status of the interpreter: call stack, current bytecode
+    /// stream, locals and operand stack.
+    ///
+    /// It is used when generating a core dump but can be used for debugging of the interpreter.
+    /// It will be exposed via a debug module to give developers a way to print the internals
+    /// of an execution.
+    fn internal_state_str(&self, current_frame: &Frame) -> String {
+        let mut internal_state = "Call stack:\n".to_string();
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            internal_state.push_str(
+                format!(
+                    " frame #{}: {} [pc = {}]\n",
+                    i,
+                    frame.function.pretty_string(),
+                    frame.pc,
+                )
+                .as_str(),
+            );
+        }
+        internal_state.push_str(
+            format!(
+                "*frame #{}: {} [pc = {}]:\n",
+                self.call_stack.0.len(),
+                current_frame.function.pretty_string(),
+                current_frame.pc,
+            )
+            .as_str(),
+        );
+        let code = current_frame.function.code();
+        let pc = current_frame.pc as usize;
+        if pc < code.len() {
+            let mut i = 0;
+            for bytecode in &code[..pc] {
+                internal_state.push_str(format!("{}> {:?}\n", i, bytecode).as_str());
+                i += 1;
+            }
+            internal_state.push_str(format!("{}* {:?}\n", i, code[pc]).as_str());
+        }
+        internal_state.push_str(
+            format!(
+                "Locals ({:x}):\n{}\n",
+                current_frame.locals.raw_address(),
+                current_frame.locals
+            )
+            .as_str(),
+        );
+        internal_state.push_str("Operand Stack:\n");
+        for value in &self.operand_stack.value {
+            internal_state.push_str(format!("{}\n", value).as_str());
+        }
+        internal_state
+    }
+
+    fn set_location(&self, err: PartialVMError) -> VMError {
+        err.finish(self.call_stack.current_location())
+    }
+
+    fn get_internal_state(&self) -> ExecutionState {
+        self.get_stack_frames(usize::MAX)
+    }
+
+    /// Get count stack frames starting from the top of the stack.
+    pub(crate) fn get_stack_frames(&self, count: usize) -> ExecutionState {
+        // collect frames in the reverse order as this is what is
+        // normally expected from the stack trace (outermost frame
+        // is the last one)
+        let stack_trace = self
+            .call_stack
+            .0
+            .iter()
+            .rev()
+            .take(count)
+            .map(|frame| {
+                (
+                    frame.function.module_id().cloned(),
+                    frame.function.index(),
+                    frame.pc,
+                )
+            })
+            .collect();
+        ExecutionState::new(stack_trace)
+    }
+}
+
+// TODO Determine stack size limits based on gas limit
+const OPERAND_STACK_SIZE_LIMIT: usize = 1024;
+const CALL_STACK_SIZE_LIMIT: usize = 1024;
+
+/// The operand stack.
+struct Stack {
+    value: Vec<Value>,
+    types: Vec<Type>,
+}
+
+impl Stack {
+    /// Create a new empty operand stack.
+    fn new() -> Self {
+        Stack {
+            value: vec![],
+            types: vec![],
+        }
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push(&mut self, value: Value) -> PartialVMResult<()> {
+        if self.value.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.value.push(value);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop(&mut self) -> PartialVMResult<Value> {
+        self.value
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop a `Value` of a given type off the stack. Abort if the value is not of the given
+    /// type or if the stack is empty.
+    fn pop_as<T>(&mut self) -> PartialVMResult<T>
+    where
+        Value: VMValueCast<T>,
+    {
+        self.pop()?.value_as()
+    }
+
+    /// Pop n values off the stack.
+    fn popn(&mut self, n: u16) -> PartialVMResult<Vec<Value>> {
+        let remaining_stack_size = self
+            .value
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.value.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn last_n(&self, n: usize) -> PartialVMResult<impl ExactSizeIterator<Item = &Value> + Clone> {
+        if self.value.len() < n {
+            return Err(PartialVMError::new(StatusCode::EMPTY_VALUE_STACK)
+                .with_message("Failed to get last n arguments on the argument stack".to_string()));
+        }
+        Ok(self.value[(self.value.len() - n)..].iter())
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push_ty(&mut self, ty: Type) -> PartialVMResult<()> {
+        if self.types.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.types.push(ty);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop_ty(&mut self) -> PartialVMResult<Type> {
+        self.types
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop n values off the stack.
+    fn popn_tys(&mut self, n: u16) -> PartialVMResult<Vec<Type>> {
+        let remaining_stack_size = self
+            .types
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.types.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn check_balance(&self) -> PartialVMResult<()> {
+        if self.types.len() != self.value.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Paranoid Mode: Type and value stack need to be balanced".to_string(),
+                ),
+            );
+        }
+        Ok(())
+    }
+}
+
+/// A call stack.
+// #[derive(Debug)]
+struct CallStack(Vec<Frame>);
+
+impl CallStack {
+    /// Create a new empty call stack.
+    fn new() -> Self {
+        CallStack(vec![])
+    }
+
+    /// Push a `Frame` on the call stack.
+    fn push(&mut self, frame: Frame) -> ::std::result::Result<(), Frame> {
+        if self.0.len() < CALL_STACK_SIZE_LIMIT {
+            self.0.push(frame);
+            Ok(())
+        } else {
+            Err(frame)
+        }
+    }
+
+    /// Pop a `Frame` off the call stack.
+    fn pop(&mut self) -> Option<Frame> {
+        self.0.pop()
+    }
+
+    fn current_location(&self) -> Location {
+        let location_opt = self.0.last().map(|frame| frame.location());
+        location_opt.unwrap_or(Location::Undefined)
+    }
+}
+
+/// A `Frame` is the execution context for a function. It holds the locals of the function and
+/// the function itself.
+// #[derive(Debug)]
+struct Frame {
+    pc: u16,
+    locals: Locals,
+    function: Arc<Function>,
+    ty_args: Vec<Type>,
+    local_tys: Vec<Type>,
+}
+
+/// An `ExitCode` from `execute_code_unit`.
+#[derive(Debug)]
+enum ExitCode {
+    Return,
+    Call(FunctionHandleIndex),
+    CallGeneric(FunctionInstantiationIndex),
+}
+
+fn check_ability(has_ability: bool) -> PartialVMResult<()> {
+    if has_ability {
+        Ok(())
+    } else {
+        Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Paranoid Mode: Expected ability mismatch".to_string()),
+        )
+    }
+}
+
+impl Frame {
+    /// Execute a Move function until a return or a call opcode is found.
+    fn execute_code(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<ExitCode> {
+        self.execute_code_impl(resolver, interpreter, data_store, gas_meter)
+            .map_err(|e| {
+                let e = if cfg!(feature = "testing") || cfg!(feature = "stacktrace") {
+                    e.with_exec_state(interpreter.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(self.function.index(), self.pc)
+                    .finish(self.location())
+            })
+    }
+
+    /// Paranoid type checks to perform before instruction execution.
+    ///
+    /// Note that most of the checks should happen after instruction execution, because gas charging will happen during
+    /// instruction execution and we want to avoid running code without charging proper gas as much as possible.
+    fn pre_execution_type_stack_transition(
+        local_tys: &[Type],
+        locals: &Locals,
+        _ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            // Call instruction will be checked at execute_main.
+            Bytecode::Call(_) | Bytecode::CallGeneric(_) => (),
+            Bytecode::BrFalse(_) | Bytecode::BrTrue(_) => {
+                interpreter.operand_stack.pop_ty()?;
+            },
+            Bytecode::Branch(_) => (),
+            Bytecode::Ret => {
+                for (idx, ty) in local_tys.iter().enumerate() {
+                    if !locals.is_invalid(idx)? {
+                        check_ability(resolver.loader().abilities(ty)?.has_drop())?;
+                    }
+                }
+            },
+            Bytecode::Abort => {
+                interpreter.operand_stack.pop_ty()?;
+            },
+            // StLoc needs to check before execution as we need to check the drop ability of values.
+            Bytecode::StLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                ty.check_eq(&val_ty)?;
+                if !locals.is_invalid(*idx as usize)? {
+                    check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+                }
+            },
+            // We will check the rest of the instructions after execution phase.
+            Bytecode::Pop
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Lt
+            | Bytecode::Le
+            | Bytecode::Gt
+            | Bytecode::Ge
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::FreezeRef
+            | Bytecode::Nop
+            | Bytecode::Not
+            | Bytecode::VecPack(_, _)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(_, _)
+            | Bytecode::VecSwap(_) => (),
+        };
+        Ok(())
+    }
+
+    /// Paranoid type checks to perform after instruction execution.
+    ///
+    /// This function and `pre_execution_type_stack_transition` should constitute the full type stack transition for the paranoid mode.
+    fn post_execution_type_stack_transition(
+        local_tys: &[Type],
+        ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => (),
+            Bytecode::Branch(_)
+            | Bytecode::Ret
+            | Bytecode::Call(_)
+            | Bytecode::CallGeneric(_)
+            | Bytecode::Abort => {
+                // Invariants hold because all of the instructions above will force VM to break from the interpreter loop and thus not hit this code path.
+                unreachable!("control flow instruction encountered during type check")
+            },
+            Bytecode::Pop => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+            },
+            Bytecode::LdU8(_) => interpreter.operand_stack.push_ty(Type::U8)?,
+            Bytecode::LdU16(_) => interpreter.operand_stack.push_ty(Type::U16)?,
+            Bytecode::LdU32(_) => interpreter.operand_stack.push_ty(Type::U32)?,
+            Bytecode::LdU64(_) => interpreter.operand_stack.push_ty(Type::U64)?,
+            Bytecode::LdU128(_) => interpreter.operand_stack.push_ty(Type::U128)?,
+            Bytecode::LdU256(_) => interpreter.operand_stack.push_ty(Type::U256)?,
+            Bytecode::LdTrue | Bytecode::LdFalse => {
+                interpreter.operand_stack.push_ty(Type::Bool)?
+            },
+            Bytecode::LdConst(i) => {
+                let constant = resolver.constant_at(*i);
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::from_const_signature(&constant.type_)?)?;
+            },
+            Bytecode::CopyLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                check_ability(resolver.loader().abilities(&ty)?.has_copy())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            },
+            Bytecode::MoveLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter.operand_stack.push_ty(ty)?;
+            },
+            Bytecode::StLoc(_) => (),
+            Bytecode::MutBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            },
+            Bytecode::ImmBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            },
+            Bytecode::ImmBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(resolver.get_field_type(*fh_idx)?)))?;
+            },
+            Bytecode::MutBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.get_field_type(*fh_idx)?,
+                    )))?;
+            },
+            Bytecode::ImmBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter.operand_stack.push_ty(Type::Reference(Box::new(
+                    resolver.instantiate_generic_field(*idx, ty_args)?,
+                )))?;
+            },
+            Bytecode::MutBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.instantiate_generic_field(*idx, ty_args)?,
+                    )))?;
+            },
+            Bytecode::Pack(idx) => {
+                let field_count = resolver.field_count(*idx);
+                let args_ty = resolver.get_struct_fields(*idx)?;
+                let output_ty = resolver.get_struct_type(*idx);
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.fields.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.fields.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            },
+            Bytecode::PackGeneric(idx) => {
+                let field_count = resolver.field_instantiation_count(*idx);
+                let args_ty = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                let output_ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            },
+            Bytecode::Unpack(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.get_struct_type(*idx))?;
+                let struct_decl = resolver.get_struct_fields(*idx)?;
+                for ty in struct_decl.fields.iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            },
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+
+                let struct_decl = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                for ty in struct_decl.into_iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            },
+            Bytecode::ReadRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::Reference(inner) | Type::MutableReference(inner) => {
+                        check_ability(resolver.loader().abilities(&inner)?.has_copy())?;
+                        interpreter.operand_stack.push_ty(inner.as_ref().clone())?;
+                    },
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("ReadRef expecting a value of reference type".to_string()))
+                    },
+                }
+            },
+            Bytecode::WriteRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::MutableReference(inner) => {
+                        if *inner == val_ty {
+                            check_ability(resolver.loader().abilities(&inner)?.has_drop())?;
+                        } else {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "WriteRef tried to write references of different types".to_string(),
+                            ));
+                        }
+                    },
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message(
+                            "WriteRef expecting a value of mutable reference type".to_string(),
+                        ))
+                    },
+                }
+            },
+            Bytecode::CastU8 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U8)?;
+            },
+            Bytecode::CastU16 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U16)?;
+            },
+            Bytecode::CastU32 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U32)?;
+            },
+            Bytecode::CastU64 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            },
+            Bytecode::CastU128 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U128)?;
+            },
+            Bytecode::CastU256 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U256)?;
+            },
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(lhs)?;
+            },
+            Bytecode::Shl | Bytecode::Shr => {
+                interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(rhs)?;
+            },
+            Bytecode::Lt | Bytecode::Le | Bytecode::Gt | Bytecode::Ge => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            },
+            Bytecode::Eq | Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                if lhs != rhs {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(
+                                "Integer binary operation expecting values of same type"
+                                    .to_string(),
+                            ),
+                    );
+                }
+                check_ability(resolver.loader().abilities(&lhs)?.has_drop())?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            },
+            Bytecode::MutBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            },
+            Bytecode::ImmBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            },
+            Bytecode::MutBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            },
+            Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            },
+            Bytecode::Exists(_) | Bytecode::ExistsGeneric(_) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            },
+            Bytecode::MoveTo(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.get_struct_type(*idx))?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            },
+            Bytecode::MoveToGeneric(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            },
+            Bytecode::MoveFrom(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            },
+            Bytecode::MoveFromGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            },
+            Bytecode::FreezeRef => {
+                match interpreter.operand_stack.pop_ty()? {
+                    Type::MutableReference(ty) => {
+                        interpreter.operand_stack.push_ty(Type::Reference(ty))?
+                    },
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("FreezeRef expects a mutable reference".to_string()))
+                    },
+                };
+            },
+            Bytecode::Nop => (),
+            Bytecode::Not => {
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::Bool)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            },
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let elem_tys = interpreter.operand_stack.popn_tys(*num as u16)?;
+                for elem_ty in elem_tys.iter() {
+                    elem_ty.check_eq(&ty)?;
+                }
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Vector(Box::new(ty)))?;
+            },
+            Bytecode::VecLen(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            },
+            Bytecode::VecImmBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(inner_ty)))?;
+            },
+            Bytecode::VecMutBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(inner_ty)))?;
+            },
+            Bytecode::VecPushBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&ty)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            },
+            Bytecode::VecPopBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter.operand_stack.push_ty(inner_ty)?;
+            },
+            Bytecode::VecUnpack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let vec_ty = interpreter.operand_stack.pop_ty()?;
+                match vec_ty {
+                    Type::Vector(v) => {
+                        v.check_eq(&ty)?;
+                        for _ in 0..*num {
+                            interpreter.operand_stack.push_ty(v.as_ref().clone())?;
+                        }
+                    },
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("VecUnpack expect a vector type".to_string()))
+                    },
+                };
+            },
+            Bytecode::VecSwap(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            },
+        }
+        Ok(())
+    }
+
+    fn execute_code_impl(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+    ) -> PartialVMResult<ExitCode> {
+        use SimpleInstruction as S;
+
+        macro_rules! make_ty {
+            ($ty:expr) => {
+                TypeWithLoader {
+                    ty: $ty,
+                    loader: resolver.loader(),
+                }
+            };
+        }
+
+        let code = self.function.code();
+        loop {
+            for instruction in &code[self.pc as usize..] {
+                trace!(
+                    &self.function,
+                    &self.locals,
+                    self.pc,
+                    instruction,
+                    resolver,
+                    interpreter
+                );
+
+                fail_point!("move_vm::interpreter_loop", |_| {
+                    Err(
+                        PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                            "Injected move_vm::interpreter verifier failure".to_owned(),
+                        ),
+                    )
+                });
+
+                // Paranoid Mode: Perform the type stack transition check to make sure all type safety requirements has been met.
+                //
+                // We will run the checks for only the control flow instructions and StLoc here. The majority of checks will be
+                // performed after the instruction execution, i.e: the big match block below.
+                //
+                // The reason for this design is we charge gas during instruction execution and we want to perform checks only after
+                // proper gas has been charged for each instruction.
+
+                if interpreter.paranoid_type_checks {
+                    interpreter.operand_stack.check_balance()?;
+                    Self::pre_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.locals,
+                        self.ty_args(),
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+                }
+
+                match instruction {
+                    Bytecode::Pop => {
+                        let popped_val = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_pop(popped_val)?;
+                    },
+                    Bytecode::Ret => {
+                        gas_meter.charge_simple_instr(S::Ret)?;
+                        return Ok(ExitCode::Return);
+                    },
+                    Bytecode::BrTrue(offset) => {
+                        if interpreter.operand_stack.pop_as::<bool>()? {
+                            gas_meter.charge_br_true(Some(*offset))?;
+                            self.pc = *offset;
+                            break;
+                        } else {
+                            gas_meter.charge_br_true(None)?;
+                        }
+                    },
+                    Bytecode::BrFalse(offset) => {
+                        if !interpreter.operand_stack.pop_as::<bool>()? {
+                            gas_meter.charge_br_false(Some(*offset))?;
+                            self.pc = *offset;
+                            break;
+                        } else {
+                            gas_meter.charge_br_false(None)?;
+                        }
+                    },
+                    Bytecode::Branch(offset) => {
+                        gas_meter.charge_branch(*offset)?;
+                        self.pc = *offset;
+                        break;
+                    },
+                    Bytecode::LdU8(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU8)?;
+                        interpreter.operand_stack.push(Value::u8(*int_const))?;
+                    },
+                    Bytecode::LdU16(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU16)?;
+                        interpreter.operand_stack.push(Value::u16(*int_const))?;
+                    },
+                    Bytecode::LdU32(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU32)?;
+                        interpreter.operand_stack.push(Value::u32(*int_const))?;
+                    },
+                    Bytecode::LdU64(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU64)?;
+                        interpreter.operand_stack.push(Value::u64(*int_const))?;
+                    },
+                    Bytecode::LdU128(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU128)?;
+                        interpreter.operand_stack.push(Value::u128(*int_const))?;
+                    },
+                    Bytecode::LdU256(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU256)?;
+                        interpreter.operand_stack.push(Value::u256(*int_const))?;
+                    },
+                    Bytecode::LdConst(idx) => {
+                        let constant = resolver.constant_at(*idx);
+                        gas_meter.charge_ld_const(NumBytes::new(constant.data.len() as u64))?;
+
+                        let val = Value::deserialize_constant(constant).ok_or_else(|| {
+                            PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION)
+                                .with_message(
+                                    "Verifier failed to verify the deserialization of constants"
+                                        .to_owned(),
+                                )
+                        })?;
+
+                        gas_meter.charge_ld_const_after_deserialization(&val)?;
+
+                        interpreter.operand_stack.push(val)?
+                    },
+                    Bytecode::LdTrue => {
+                        gas_meter.charge_simple_instr(S::LdTrue)?;
+                        interpreter.operand_stack.push(Value::bool(true))?;
+                    },
+                    Bytecode::LdFalse => {
+                        gas_meter.charge_simple_instr(S::LdFalse)?;
+                        interpreter.operand_stack.push(Value::bool(false))?;
+                    },
+                    Bytecode::CopyLoc(idx) => {
+                        // TODO(Gas): We should charge gas before copying the value.
+                        let local = self.locals.copy_loc(*idx as usize)?;
+                        gas_meter.charge_copy_loc(&local)?;
+                        interpreter.operand_stack.push(local)?;
+                    },
+                    Bytecode::MoveLoc(idx) => {
+                        let local = self.locals.move_loc(
+                            *idx as usize,
+                            resolver
+                                .loader()
+                                .vm_config()
+                                .enable_invariant_violation_check_in_swap_loc,
+                        )?;
+                        gas_meter.charge_move_loc(&local)?;
+
+                        interpreter.operand_stack.push(local)?;
+                    },
+                    Bytecode::StLoc(idx) => {
+                        let value_to_store = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_store_loc(&value_to_store)?;
+                        self.locals.store_loc(
+                            *idx as usize,
+                            value_to_store,
+                            resolver
+                                .loader()
+                                .vm_config()
+                                .enable_invariant_violation_check_in_swap_loc,
+                        )?;
+                    },
+                    Bytecode::Call(idx) => {
+                        return Ok(ExitCode::Call(*idx));
+                    },
+                    Bytecode::CallGeneric(idx) => {
+                        return Ok(ExitCode::CallGeneric(*idx));
+                    },
+                    Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+                        let instr = match instruction {
+                            Bytecode::MutBorrowLoc(_) => S::MutBorrowLoc,
+                            _ => S::ImmBorrowLoc,
+                        };
+                        gas_meter.charge_simple_instr(instr)?;
+                        interpreter
+                            .operand_stack
+                            .push(self.locals.borrow_loc(*idx as usize)?)?;
+                    },
+                    Bytecode::ImmBorrowField(fh_idx) | Bytecode::MutBorrowField(fh_idx) => {
+                        let instr = match instruction {
+                            Bytecode::MutBorrowField(_) => S::MutBorrowField,
+                            _ => S::ImmBorrowField,
+                        };
+                        gas_meter.charge_simple_instr(instr)?;
+
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                        let offset = resolver.field_offset(*fh_idx);
+                        let field_ref = reference.borrow_field(offset)?;
+                        interpreter.operand_stack.push(field_ref)?;
+                    },
+                    Bytecode::ImmBorrowFieldGeneric(fi_idx)
+                    | Bytecode::MutBorrowFieldGeneric(fi_idx) => {
+                        let instr = match instruction {
+                            Bytecode::MutBorrowField(_) => S::MutBorrowFieldGeneric,
+                            _ => S::ImmBorrowFieldGeneric,
+                        };
+                        gas_meter.charge_simple_instr(instr)?;
+
+                        let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                        let offset = resolver.field_instantiation_offset(*fi_idx);
+                        let field_ref = reference.borrow_field(offset)?;
+                        interpreter.operand_stack.push(field_ref)?;
+                    },
+                    Bytecode::Pack(sd_idx) => {
+                        let field_count = resolver.field_count(*sd_idx);
+                        gas_meter.charge_pack(
+                            false,
+                            interpreter.operand_stack.last_n(field_count as usize)?,
+                        )?;
+                        let args = interpreter.operand_stack.popn(field_count)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::struct_(Struct::pack(args)))?;
+                    },
+                    Bytecode::PackGeneric(si_idx) => {
+                        let field_count = resolver.field_instantiation_count(*si_idx);
+                        gas_meter.charge_pack(
+                            true,
+                            interpreter.operand_stack.last_n(field_count as usize)?,
+                        )?;
+                        let args = interpreter.operand_stack.popn(field_count)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::struct_(Struct::pack(args)))?;
+                    },
+                    Bytecode::Unpack(_sd_idx) => {
+                        let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                        gas_meter.charge_unpack(false, struct_.field_views())?;
+
+                        for value in struct_.unpack()? {
+                            interpreter.operand_stack.push(value)?;
+                        }
+                    },
+                    Bytecode::UnpackGeneric(_si_idx) => {
+                        let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                        gas_meter.charge_unpack(true, struct_.field_views())?;
+
+                        // TODO: Whether or not we want this gas metering in the loop is
+                        // questionable.  However, if we don't have it in the loop we could wind up
+                        // doing a fair bit of work before charging for it.
+                        for value in struct_.unpack()? {
+                            interpreter.operand_stack.push(value)?;
+                        }
+                    },
+                    Bytecode::ReadRef => {
+                        let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                        gas_meter.charge_read_ref(reference.value_view())?;
+                        let value = reference.read_ref()?;
+                        interpreter.operand_stack.push(value)?;
+                    },
+                    Bytecode::WriteRef => {
+                        let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                        let value = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_write_ref(&value, reference.value_view())?;
+                        reference.write_ref(value)?;
+                    },
+                    Bytecode::CastU8 => {
+                        gas_meter.charge_simple_instr(S::CastU8)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u8(integer_value.cast_u8()?))?;
+                    },
+                    Bytecode::CastU16 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u16(integer_value.cast_u16()?))?;
+                    },
+                    Bytecode::CastU32 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u32(integer_value.cast_u32()?))?;
+                    },
+                    Bytecode::CastU64 => {
+                        gas_meter.charge_simple_instr(S::CastU64)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u64(integer_value.cast_u64()?))?;
+                    },
+                    Bytecode::CastU128 => {
+                        gas_meter.charge_simple_instr(S::CastU128)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u128(integer_value.cast_u128()?))?;
+                    },
+                    Bytecode::CastU256 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u256(integer_value.cast_u256()?))?;
+                    },
+                    // Arithmetic Operations
+                    Bytecode::Add => {
+                        gas_meter.charge_simple_instr(S::Add)?;
+                        interpreter.binop_int(IntegerValue::add_checked)?
+                    },
+                    Bytecode::Sub => {
+                        gas_meter.charge_simple_instr(S::Sub)?;
+                        interpreter.binop_int(IntegerValue::sub_checked)?
+                    },
+                    Bytecode::Mul => {
+                        gas_meter.charge_simple_instr(S::Mul)?;
+                        interpreter.binop_int(IntegerValue::mul_checked)?
+                    },
+                    Bytecode::Mod => {
+                        gas_meter.charge_simple_instr(S::Mod)?;
+                        interpreter.binop_int(IntegerValue::rem_checked)?
+                    },
+                    Bytecode::Div => {
+                        gas_meter.charge_simple_instr(S::Div)?;
+                        interpreter.binop_int(IntegerValue::div_checked)?
+                    },
+                    Bytecode::BitOr => {
+                        gas_meter.charge_simple_instr(S::BitOr)?;
+                        interpreter.binop_int(IntegerValue::bit_or)?
+                    },
+                    Bytecode::BitAnd => {
+                        gas_meter.charge_simple_instr(S::BitAnd)?;
+                        interpreter.binop_int(IntegerValue::bit_and)?
+                    },
+                    Bytecode::Xor => {
+                        gas_meter.charge_simple_instr(S::Xor)?;
+                        interpreter.binop_int(IntegerValue::bit_xor)?
+                    },
+                    Bytecode::Shl => {
+                        gas_meter.charge_simple_instr(S::Shl)?;
+                        let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                        let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(lhs.shl_checked(rhs)?.into_value())?;
+                    },
+                    Bytecode::Shr => {
+                        gas_meter.charge_simple_instr(S::Shr)?;
+                        let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                        let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(lhs.shr_checked(rhs)?.into_value())?;
+                    },
+                    Bytecode::Or => {
+                        gas_meter.charge_simple_instr(S::Or)?;
+                        interpreter.binop_bool(|l, r| Ok(l || r))?
+                    },
+                    Bytecode::And => {
+                        gas_meter.charge_simple_instr(S::And)?;
+                        interpreter.binop_bool(|l, r| Ok(l && r))?
+                    },
+                    Bytecode::Lt => {
+                        gas_meter.charge_simple_instr(S::Lt)?;
+                        interpreter.binop_bool(IntegerValue::lt)?
+                    },
+                    Bytecode::Gt => {
+                        gas_meter.charge_simple_instr(S::Gt)?;
+                        interpreter.binop_bool(IntegerValue::gt)?
+                    },
+                    Bytecode::Le => {
+                        gas_meter.charge_simple_instr(S::Le)?;
+                        interpreter.binop_bool(IntegerValue::le)?
+                    },
+                    Bytecode::Ge => {
+                        gas_meter.charge_simple_instr(S::Ge)?;
+                        interpreter.binop_bool(IntegerValue::ge)?
+                    },
+                    Bytecode::Abort => {
+                        gas_meter.charge_simple_instr(S::Abort)?;
+                        let error_code = interpreter.operand_stack.pop_as::<u64>()?;
+                        let error = PartialVMError::new(StatusCode::ABORTED)
+                            .with_sub_status(error_code)
+                            .with_message(format!(
+                                "{} at offset {}",
+                                self.function.pretty_string(),
+                                self.pc,
+                            ));
+                        return Err(error);
+                    },
+                    Bytecode::Eq => {
+                        let lhs = interpreter.operand_stack.pop()?;
+                        let rhs = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_eq(&lhs, &rhs)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::bool(lhs.equals(&rhs)?))?;
+                    },
+                    Bytecode::Neq => {
+                        let lhs = interpreter.operand_stack.pop()?;
+                        let rhs = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_neq(&lhs, &rhs)?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::bool(!lhs.equals(&rhs)?))?;
+                    },
+                    Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
+                        let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.get_struct_type(*sd_idx);
+                        interpreter.borrow_global(
+                            is_mut,
+                            false,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::MutBorrowGlobalGeneric(si_idx)
+                    | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
+                        let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
+                        interpreter.borrow_global(
+                            is_mut,
+                            true,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::Exists(sd_idx) => {
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.get_struct_type(*sd_idx);
+                        interpreter.exists(
+                            false,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::ExistsGeneric(si_idx) => {
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
+                        interpreter.exists(
+                            true,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::MoveFrom(sd_idx) => {
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.get_struct_type(*sd_idx);
+                        interpreter.move_from(
+                            false,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::MoveFromGeneric(si_idx) => {
+                        let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                        let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
+                        interpreter.move_from(
+                            true,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                        )?;
+                    },
+                    Bytecode::MoveTo(sd_idx) => {
+                        let resource = interpreter.operand_stack.pop()?;
+                        let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        let addr = signer_reference
+                            .borrow_field(0)?
+                            .value_as::<Reference>()?
+                            .read_ref()?
+                            .value_as::<AccountAddress>()?;
+                        let ty = resolver.get_struct_type(*sd_idx);
+                        // REVIEW: Can we simplify Interpreter::move_to?
+                        interpreter.move_to(
+                            false,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                            resource,
+                        )?;
+                    },
+                    Bytecode::MoveToGeneric(si_idx) => {
+                        let resource = interpreter.operand_stack.pop()?;
+                        let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                        let addr = signer_reference
+                            .borrow_field(0)?
+                            .value_as::<Reference>()?
+                            .read_ref()?
+                            .value_as::<AccountAddress>()?;
+                        let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
+                        interpreter.move_to(
+                            true,
+                            resolver.loader(),
+                            data_store,
+                            gas_meter,
+                            addr,
+                            &ty,
+                            resource,
+                        )?;
+                    },
+                    Bytecode::FreezeRef => {
+                        gas_meter.charge_simple_instr(S::FreezeRef)?;
+                        // FreezeRef should just be a null op as we don't distinguish between mut
+                        // and immut ref at runtime.
+                    },
+                    Bytecode::Not => {
+                        gas_meter.charge_simple_instr(S::Not)?;
+                        let value = !interpreter.operand_stack.pop_as::<bool>()?;
+                        interpreter.operand_stack.push(Value::bool(value))?;
+                    },
+                    Bytecode::Nop => {
+                        gas_meter.charge_simple_instr(S::Nop)?;
+                    },
+                    Bytecode::VecPack(si, num) => {
+                        let ty = resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_pack(
+                            make_ty!(&ty),
+                            interpreter.operand_stack.last_n(*num as usize)?,
+                        )?;
+                        let elements = interpreter.operand_stack.popn(*num as u16)?;
+                        let value = Vector::pack(&ty, elements)?;
+                        interpreter.operand_stack.push(value)?;
+                    },
+                    Bytecode::VecLen(si) => {
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_len(TypeWithLoader {
+                            ty,
+                            loader: resolver.loader(),
+                        })?;
+                        let value = vec_ref.len(ty)?;
+                        interpreter.operand_stack.push(value)?;
+                    },
+                    Bytecode::VecImmBorrow(si) => {
+                        let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.borrow_elem(idx, &ty);
+                        gas_meter.charge_vec_borrow(false, make_ty!(&ty), res.is_ok())?;
+                        interpreter.operand_stack.push(res?)?;
+                    },
+                    Bytecode::VecMutBorrow(si) => {
+                        let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.borrow_elem(idx, ty);
+                        gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
+                        interpreter.operand_stack.push(res?)?;
+                    },
+                    Bytecode::VecPushBack(si) => {
+                        let elem = interpreter.operand_stack.pop()?;
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
+                        vec_ref.push_back(elem, ty)?;
+                    },
+                    Bytecode::VecPopBack(si) => {
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.pop(ty);
+                        gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
+                        interpreter.operand_stack.push(res?)?;
+                    },
+                    Bytecode::VecUnpack(si, num) => {
+                        let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_unpack(
+                            make_ty!(ty),
+                            NumArgs::new(*num),
+                            vec_val.elem_views(),
+                        )?;
+                        let elements = vec_val.unpack(ty, *num)?;
+                        for value in elements {
+                            interpreter.operand_stack.push(value)?;
+                        }
+                    },
+                    Bytecode::VecSwap(si) => {
+                        let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                        let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                        let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_swap(make_ty!(ty))?;
+                        vec_ref.swap(idx1, idx2, ty)?;
+                    },
+                }
+                if interpreter.paranoid_type_checks {
+                    Self::post_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.ty_args,
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+
+                    interpreter.operand_stack.check_balance()?;
+                }
+
+                // invariant: advance to pc +1 is iff instruction at pc executed without aborting
+                self.pc += 1;
+            }
+            // ok we are out, it's a branch, check the pc for good luck
+            // TODO: re-work the logic here. Tests should have a more
+            // natural way to plug in
+            if self.pc as usize >= code.len() {
+                if cfg!(test) {
+                    // In order to test the behavior of an instruction stream, hitting end of the
+                    // code should report no error so that we can check the
+                    // locals.
+                    return Ok(ExitCode::Return);
+                } else {
+                    return Err(PartialVMError::new(StatusCode::PC_OVERFLOW));
+                }
+            }
+        }
+    }
+
+    fn ty_args(&self) -> &[Type] {
+        &self.ty_args
+    }
+
+    fn resolver<'a>(&self, loader: &'a Loader) -> Resolver<'a> {
+        self.function.get_resolver(loader)
+    }
+
+    fn location(&self) -> Location {
+        match self.function.module_id() {
+            None => Location::Script,
+            Some(id) => Location::Module(id.clone()),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/lib.rs b/vendors/move/crates/move-vm/runtime/src/lib.rs
new file mode 100644
index 000000000..24558c0c5
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/lib.rs
@@ -0,0 +1,31 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! The core Move VM logic.
+//!
+//! It is a design goal for the Move VM to be independent of the Diem blockchain, so that
+//! other blockchains can use it as well. The VM isn't there yet, but hopefully will be there
+//! soon.
+
+pub mod data_cache;
+mod interpreter;
+mod loader;
+pub mod logging;
+pub mod move_vm;
+pub mod native_extensions;
+pub mod native_functions;
+mod runtime;
+pub mod session;
+#[macro_use]
+mod tracing;
+pub mod config;
+
+// Only include debugging functionality in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+mod debug;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/crates/move-vm/runtime/src/loader.rs b/vendors/move/crates/move-vm/runtime/src/loader.rs
new file mode 100644
index 000000000..5e954eec7
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/loader.rs
@@ -0,0 +1,2989 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    config::VMConfig,
+    data_cache::TransactionDataCache,
+    logging::expect_no_verification_errors,
+    native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
+    session::LoadedFunctionInstantiation,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CompiledModule, CompiledScript, Constant, ConstantPoolIndex,
+        FieldHandleIndex, FieldInstantiationIndex, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinition, StructDefinitionIndex,
+        StructFieldInformation, TableIndex, Visibility,
+    },
+    IndexKind,
+};
+use move_bytecode_verifier::{self, cyclic_dependencies, dependencies};
+use move_core_types::{
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    metadata::Metadata,
+    value::{MoveFieldLayout, MoveStructLayout, MoveTypeLayout},
+    vm_status::StatusCode,
+};
+use move_vm_types::loaded_data::runtime_types::{CachedStructIndex, StructType, Type};
+use parking_lot::RwLock;
+use sha3::{Digest, Sha3_256};
+use std::{
+    collections::{btree_map, BTreeMap, BTreeSet, HashMap},
+    fmt::Debug,
+    hash::Hash,
+    sync::Arc,
+};
+use tracing::error;
+
+type ScriptHash = [u8; 32];
+
+// A simple cache that offers both a HashMap and a Vector lookup.
+// Values are forced into a `Arc` so they can be used from multiple thread.
+// Access to this cache is always under a `RwLock`.
+struct BinaryCache<K, V> {
+    id_map: HashMap<K, usize>,
+    binaries: Vec<Arc<V>>,
+}
+
+impl<K, V> BinaryCache<K, V>
+where
+    K: Eq + Hash,
+{
+    fn new() -> Self {
+        Self {
+            id_map: HashMap::new(),
+            binaries: vec![],
+        }
+    }
+
+    fn insert(&mut self, key: K, binary: V) -> &Arc<V> {
+        self.binaries.push(Arc::new(binary));
+        let idx = self.binaries.len() - 1;
+        self.id_map.insert(key, idx);
+        self.binaries
+            .last()
+            .expect("BinaryCache: last() after push() impossible failure")
+    }
+
+    fn get(&self, key: &K) -> Option<&Arc<V>> {
+        let index = self.id_map.get(key)?;
+        self.binaries.get(*index)
+    }
+}
+
+// A script cache is a map from the hash value of a script and the `Script` itself.
+// Script are added in the cache once verified and so getting a script out the cache
+// does not require further verification (except for parameters and type parameters)
+struct ScriptCache {
+    scripts: BinaryCache<ScriptHash, Script>,
+}
+
+impl ScriptCache {
+    fn new() -> Self {
+        Self {
+            scripts: BinaryCache::new(),
+        }
+    }
+
+    fn get(&self, hash: &ScriptHash) -> Option<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        self.scripts.get(hash).map(|script| {
+            (
+                script.entry_point(),
+                script.parameter_tys.clone(),
+                script.return_tys.clone(),
+            )
+        })
+    }
+
+    fn insert(
+        &mut self,
+        hash: ScriptHash,
+        script: Script,
+    ) -> (Arc<Function>, Vec<Type>, Vec<Type>) {
+        match self.get(&hash) {
+            Some(cached) => cached,
+            None => {
+                let script = self.scripts.insert(hash, script);
+                (
+                    script.entry_point(),
+                    script.parameter_tys.clone(),
+                    script.return_tys.clone(),
+                )
+            },
+        }
+    }
+}
+
+// A ModuleCache is the core structure in the Loader.
+// It holds all Modules, Types and Functions loaded.
+// Types and Functions are pushed globally to the ModuleCache.
+// All accesses to the ModuleCache are under lock (exclusive).
+pub struct ModuleCache {
+    modules: BinaryCache<ModuleId, Module>,
+    structs: Vec<Arc<StructType>>,
+    functions: Vec<Arc<Function>>,
+}
+
+impl ModuleCache {
+    fn new() -> Self {
+        Self {
+            modules: BinaryCache::new(),
+            structs: vec![],
+            functions: vec![],
+        }
+    }
+
+    //
+    // Common "get" operations
+    //
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn module_at(&self, id: &ModuleId) -> Option<Arc<Module>> {
+        self.modules.get(id).map(Arc::clone)
+    }
+
+    // Retrieve a function by index
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        Arc::clone(&self.functions[idx])
+    }
+
+    // Retrieve a struct by index
+    fn struct_at(&self, idx: CachedStructIndex) -> Arc<StructType> {
+        Arc::clone(&self.structs[idx.0])
+    }
+
+    //
+    // Insertion is under lock and it's a pretty heavy operation.
+    // The VM is pretty much stopped waiting for this to finish
+    //
+
+    fn insert(
+        &mut self,
+        natives: &NativeFunctions,
+        id: ModuleId,
+        module: CompiledModule,
+    ) -> VMResult<Arc<Module>> {
+        if let Some(cached) = self.module_at(&id) {
+            return Ok(cached);
+        }
+
+        // we need this operation to be transactional, if an error occurs we must
+        // leave a clean state
+        self.add_module(natives, &module)?;
+        match Module::new(module, self) {
+            Ok(module) => Ok(Arc::clone(self.modules.insert(id, module))),
+            Err((err, module)) => {
+                // remove all structs and functions that have been pushed
+                let strut_def_count = module.struct_defs().len();
+                self.structs.truncate(self.structs.len() - strut_def_count);
+                let function_count = module.function_defs().len();
+                self.functions
+                    .truncate(self.functions.len() - function_count);
+                Err(err.finish(Location::Undefined))
+            },
+        }
+    }
+
+    fn add_module(&mut self, natives: &NativeFunctions, module: &CompiledModule) -> VMResult<()> {
+        let starting_idx = self.structs.len();
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let st = self.make_struct_type(module, struct_def, StructDefinitionIndex(idx as u16));
+            self.structs.push(Arc::new(st));
+        }
+        self.load_field_types(module, starting_idx).map_err(|err| {
+            // clean up the structs that were cached
+            self.structs.truncate(starting_idx);
+            err.finish(Location::Undefined)
+        })?;
+        for (idx, func) in module.function_defs().iter().enumerate() {
+            let findex = FunctionDefinitionIndex(idx as TableIndex);
+            let mut function = Function::new(natives, findex, func, module);
+            function.return_types = function
+                .return_
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function.local_types = function
+                .locals
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function.parameter_types = function
+                .parameters
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
+            self.functions.push(Arc::new(function));
+        }
+        Ok(())
+    }
+
+    fn make_struct_type(
+        &self,
+        module: &CompiledModule,
+        struct_def: &StructDefinition,
+        idx: StructDefinitionIndex,
+    ) -> StructType {
+        let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+        let field_names = match &struct_def.field_information {
+            StructFieldInformation::Native => vec![],
+            StructFieldInformation::Declared(field_info) => field_info
+                .iter()
+                .map(|f| module.identifier_at(f.name).to_owned())
+                .collect(),
+        };
+        let abilities = struct_handle.abilities;
+        let name = module.identifier_at(struct_handle.name).to_owned();
+        let type_parameters = struct_handle.type_parameters.clone();
+        let module = module.self_id();
+        StructType {
+            fields: vec![],
+            field_names,
+            abilities,
+            type_parameters,
+            name,
+            module,
+            struct_def: idx,
+        }
+    }
+
+    fn load_field_types(
+        &mut self,
+        module: &CompiledModule,
+        starting_idx: usize,
+    ) -> PartialVMResult<()> {
+        let mut field_types = vec![];
+        for struct_def in module.struct_defs() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => unreachable!("native structs have been removed"),
+                StructFieldInformation::Declared(fields) => fields,
+            };
+
+            let mut field_tys = vec![];
+            for field in fields {
+                let ty = self.make_type_while_loading(module, &field.signature.0)?;
+                debug_assert!(field_tys.len() < usize::max_value());
+                field_tys.push(ty);
+            }
+
+            field_types.push(field_tys);
+        }
+        let mut struct_idx = starting_idx;
+        for fields in field_types {
+            match Arc::get_mut(&mut self.structs[struct_idx]) {
+                Some(struct_type) => struct_type.fields = fields,
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we just rewrite the entire `Arc`
+                    // over and log the issue.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                    let mut struct_type = (*self.structs[struct_idx]).clone();
+                    struct_type.fields = fields;
+                    self.structs[struct_idx] = Arc::new(struct_type);
+                },
+            }
+            struct_idx += 1;
+        }
+        Ok(())
+    }
+
+    // `make_type` is the entry point to "translate" a `SignatureToken` to a `Type`
+    fn make_type(&self, module: BinaryIndexedView, tok: &SignatureToken) -> PartialVMResult<Type> {
+        Self::make_type_internal(module, tok, &|struct_name, module_id| {
+            Ok(self.resolve_struct_by_name(struct_name, module_id)?.0)
+        })
+    }
+
+    // While in the process of loading, and before a `Module` is saved into the cache the loader
+    // needs to resolve type references to the module itself (self) "manually"; that is,
+    // looping through the types of the module itself
+    fn make_type_while_loading(
+        &self,
+        module: &CompiledModule,
+        tok: &SignatureToken,
+    ) -> PartialVMResult<Type> {
+        let self_id = module.self_id();
+        Self::make_type_internal(
+            BinaryIndexedView::Module(module),
+            tok,
+            &|struct_name, module_id| {
+                if module_id == &self_id {
+                    // module has not been published yet, loop through the types
+                    for (idx, struct_type) in self.structs.iter().enumerate().rev() {
+                        if &struct_type.module != module_id {
+                            break;
+                        }
+                        if struct_type.name.as_ident_str() == struct_name {
+                            return Ok(CachedStructIndex(idx));
+                        }
+                    }
+                    Err(
+                        PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE).with_message(
+                            format!(
+                                "Cannot find {:?}::{:?} in publishing module",
+                                module_id, struct_name
+                            ),
+                        ),
+                    )
+                } else {
+                    Ok(self.resolve_struct_by_name(struct_name, module_id)?.0)
+                }
+            },
+        )
+    }
+
+    // `make_type_internal` returns a `Type` given a signature and a resolver which
+    // is resonsible to map a local struct index to a global one
+    fn make_type_internal<F>(
+        module: BinaryIndexedView,
+        tok: &SignatureToken,
+        resolver: &F,
+    ) -> PartialVMResult<Type>
+    where
+        F: Fn(&IdentStr, &ModuleId) -> PartialVMResult<CachedStructIndex>,
+    {
+        let res = match tok {
+            SignatureToken::Bool => Type::Bool,
+            SignatureToken::U8 => Type::U8,
+            SignatureToken::U16 => Type::U16,
+            SignatureToken::U32 => Type::U32,
+            SignatureToken::U64 => Type::U64,
+            SignatureToken::U128 => Type::U128,
+            SignatureToken::U256 => Type::U256,
+            SignatureToken::Address => Type::Address,
+            SignatureToken::Signer => Type::Signer,
+            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx as usize),
+            SignatureToken::Vector(inner_tok) => {
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
+                Type::Vector(Box::new(inner_type))
+            },
+            SignatureToken::Reference(inner_tok) => {
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
+                Type::Reference(Box::new(inner_type))
+            },
+            SignatureToken::MutableReference(inner_tok) => {
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
+                Type::MutableReference(Box::new(inner_type))
+            },
+            SignatureToken::Struct(sh_idx) => {
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let module_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = resolver(struct_name, &module_id)?;
+                Type::Struct(def_idx)
+            },
+            SignatureToken::StructInstantiation(sh_idx, tys) => {
+                let type_parameters: Vec<_> = tys
+                    .iter()
+                    .map(|tok| Self::make_type_internal(module, tok, resolver))
+                    .collect::<PartialVMResult<_>>()?;
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let module_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = resolver(struct_name, &module_id)?;
+                Type::StructInstantiation(def_idx, type_parameters)
+            },
+        };
+        Ok(res)
+    }
+
+    // Given a module id, returns whether the module cache has the module or not
+    fn has_module(&self, module_id: &ModuleId) -> bool {
+        self.modules.id_map.contains_key(module_id)
+    }
+
+    // Given a ModuleId::struct_name, retrieve the `StructType` and the index associated.
+    // Return and error if the type has not been loaded
+    fn resolve_struct_by_name(
+        &self,
+        struct_name: &IdentStr,
+        module_id: &ModuleId,
+    ) -> PartialVMResult<(CachedStructIndex, Arc<StructType>)> {
+        match self
+            .modules
+            .get(module_id)
+            .and_then(|module| module.struct_map.get(struct_name))
+        {
+            Some(struct_idx) => Ok((*struct_idx, Arc::clone(&self.structs[struct_idx.0]))),
+            None => Err(
+                PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find {:?}::{:?} in cache",
+                    module_id, struct_name
+                )),
+            ),
+        }
+    }
+
+    // Given a ModuleId::func_name, retrieve the `StructType` and the index associated.
+    // Return and error if the function has not been loaded
+    fn resolve_function_by_name(
+        &self,
+        func_name: &IdentStr,
+        module_id: &ModuleId,
+    ) -> PartialVMResult<usize> {
+        match self
+            .modules
+            .get(module_id)
+            .and_then(|module| module.function_map.get(func_name))
+        {
+            Some(func_idx) => Ok(*func_idx),
+            None => Err(
+                PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find {:?}::{:?} in cache",
+                    module_id, func_name
+                )),
+            ),
+        }
+    }
+}
+
+//
+// Loader
+//
+
+// A Loader is responsible to load scripts and modules and holds the cache of all loaded
+// entities. Each cache is protected by a `RwLock`. Operation in the Loader must be thread safe
+// (operating on values on the stack) and when cache needs updating the mutex must be taken.
+// The `pub(crate)` API is what a Loader offers to the runtime.
+pub(crate) struct Loader {
+    scripts: RwLock<ScriptCache>,
+    module_cache: RwLock<ModuleCache>,
+    type_cache: RwLock<TypeCache>,
+    natives: NativeFunctions,
+
+    // The below field supports a hack to workaround well-known issues with the
+    // loader cache. This cache is not designed to support module upgrade or deletion.
+    // This leads to situations where the cache does not reflect the state of storage:
+    //
+    // 1. On module upgrade, the upgraded module is in storage, but the old one still in the cache.
+    // 2. On an abandoned code publishing transaction, the cache may contain a module which was
+    //    never committed to storage by the adapter.
+    //
+    // The solution is to add a flag to Loader marking it as 'invalidated'. For scenario (1),
+    // the VM sets the flag itself. For scenario (2), a public API allows the adapter to set
+    // the flag.
+    //
+    // If the cache is invalidated, it can (and must) still be used until there are no more
+    // sessions alive which are derived from a VM with this loader. This is because there are
+    // internal data structures derived from the loader which can become inconsistent. Therefore
+    // the adapter must explicitly call a function to flush the invalidated loader.
+    //
+    // This code (the loader) needs a complete refactoring. The new loader should
+    //
+    // - support upgrade and deletion of modules, while still preserving max cache lookup
+    //   performance. This is essential for a cache like this in a multi-tenant execution
+    //   environment.
+    // - should delegate lifetime ownership to the adapter. Code loading (including verification)
+    //   is a major execution bottleneck. We should be able to reuse a cache for the lifetime of
+    //   the adapter/node, not just a VM or even session (as effectively today).
+    invalidated: RwLock<bool>,
+
+    // Collects the cache hits on module loads. This information can be read and reset by
+    // an adapter to reason about read/write conflicts of code publishing transactions and
+    // other transactions.
+    module_cache_hits: RwLock<BTreeSet<ModuleId>>,
+
+    vm_config: VMConfig,
+}
+
+impl Loader {
+    pub(crate) fn new(natives: NativeFunctions, vm_config: VMConfig) -> Self {
+        Self {
+            scripts: RwLock::new(ScriptCache::new()),
+            module_cache: RwLock::new(ModuleCache::new()),
+            type_cache: RwLock::new(TypeCache::new()),
+            natives,
+            invalidated: RwLock::new(false),
+            module_cache_hits: RwLock::new(BTreeSet::new()),
+            vm_config,
+        }
+    }
+
+    pub(crate) fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    /// Gets and clears module cache hits. A cache hit may also be caused indirectly by
+    /// loading a function or a type. This not only returns the direct hit, but also
+    /// indirect ones, that is all dependencies.
+    pub(crate) fn get_and_clear_module_cache_hits(&self) -> BTreeSet<ModuleId> {
+        let mut result = BTreeSet::new();
+        let hits: BTreeSet<ModuleId> = std::mem::take(&mut self.module_cache_hits.write());
+        for id in hits {
+            self.transitive_dep_closure(&id, &mut result)
+        }
+        result
+    }
+
+    fn transitive_dep_closure(&self, id: &ModuleId, visited: &mut BTreeSet<ModuleId>) {
+        if !visited.insert(id.clone()) {
+            return;
+        }
+        let deps = self
+            .module_cache
+            .read()
+            .modules
+            .get(id)
+            .unwrap()
+            .module
+            .immediate_dependencies();
+        for dep in deps {
+            self.transitive_dep_closure(&dep, visited)
+        }
+    }
+
+    /// Flush this cache if it is marked as invalidated.
+    pub(crate) fn flush_if_invalidated(&self) {
+        let mut invalidated = self.invalidated.write();
+        if *invalidated {
+            *self.scripts.write() = ScriptCache::new();
+            *self.module_cache.write() = ModuleCache::new();
+            *self.type_cache.write() = TypeCache::new();
+            *invalidated = false;
+        }
+    }
+
+    /// Mark this cache as invalidated.
+    pub(crate) fn mark_as_invalid(&self) {
+        *self.invalidated.write() = true;
+    }
+
+    /// Check whether this cache is invalidated.
+    pub(crate) fn is_invalidated(&self) -> bool {
+        *self.invalidated.read()
+    }
+
+    /// Copies metadata out of a modules bytecode if available.
+    pub(crate) fn get_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        let cache = self.module_cache.read();
+        cache
+            .modules
+            .get(&module)?
+            .module
+            .metadata
+            .iter()
+            .find(|md| md.key == key)
+            .cloned()
+    }
+
+    //
+    // Script verification and loading
+    //
+
+    // Scripts are verified and dependencies are loaded.
+    // Effectively that means modules are cached from leaf to root in the dependency DAG.
+    // If a dependency error is found, loading stops and the error is returned.
+    // However all modules cached up to that point stay loaded.
+
+    // Entry point for script execution (`MoveVM::execute_script`).
+    // Verifies the script if it is not in the cache of scripts loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_script(
+        &self,
+        script_blob: &[u8],
+        ty_args: &[TypeTag],
+        data_store: &TransactionDataCache,
+    ) -> VMResult<(Arc<Function>, LoadedFunctionInstantiation)> {
+        // retrieve or load the script
+        let mut sha3_256 = Sha3_256::new();
+        sha3_256.update(script_blob);
+        let hash_value: [u8; 32] = sha3_256.finalize().into();
+
+        let mut scripts = self.scripts.write();
+        let (main, parameters, return_) = match scripts.get(&hash_value) {
+            Some(cached) => cached,
+            None => {
+                let ver_script = self.deserialize_and_verify_script(script_blob, data_store)?;
+                let script = Script::new(ver_script, &hash_value, &self.module_cache.read())?;
+                scripts.insert(hash_value, script)
+            },
+        };
+
+        // verify type arguments
+        let mut type_arguments = vec![];
+        for ty in ty_args {
+            type_arguments.push(self.load_type(ty, data_store)?);
+        }
+
+        if self.vm_config.type_size_limit
+            && type_arguments
+                .iter()
+                .map(|loaded_ty| self.count_type_nodes(loaded_ty))
+                .sum::<usize>()
+                > MAX_TYPE_INSTANTIATION_NODES
+        {
+            return Err(
+                PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES).finish(Location::Script)
+            );
+        };
+
+        self.verify_ty_args(main.type_parameters(), &type_arguments)
+            .map_err(|e| e.finish(Location::Script))?;
+        let instantiation = LoadedFunctionInstantiation {
+            type_arguments,
+            parameters,
+            return_,
+        };
+        Ok((main, instantiation))
+    }
+
+    // The process of deserialization and verification is not and it must not be under lock.
+    // So when publishing modules through the dependency DAG it may happen that a different
+    // thread had loaded the module after this process fetched it from storage.
+    // Caching will take care of that by asking for each dependency module again under lock.
+    fn deserialize_and_verify_script(
+        &self,
+        script: &[u8],
+        data_store: &TransactionDataCache,
+    ) -> VMResult<CompiledScript> {
+        let script = match CompiledScript::deserialize_with_max_version(
+            script,
+            self.vm_config.max_binary_format_version,
+        ) {
+            Ok(script) => script,
+            Err(err) => {
+                let msg = format!("[VM] deserializer for script returned error: {:?}", err);
+                return Err(PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                    .with_message(msg)
+                    .finish(Location::Script));
+            },
+        };
+
+        match self.verify_script(&script) {
+            Ok(_) => {
+                // verify dependencies
+                let loaded_deps = script
+                    .immediate_dependencies()
+                    .into_iter()
+                    .map(|module_id| self.load_module(&module_id, data_store))
+                    .collect::<VMResult<_>>()?;
+                self.verify_script_dependencies(&script, loaded_deps)?;
+                Ok(script)
+            },
+            Err(err) => Err(err),
+        }
+    }
+
+    // Script verification steps.
+    // See `verify_module()` for module verification steps.
+    fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
+        move_bytecode_verifier::verify_script_with_config(&self.vm_config.verifier, script)
+    }
+
+    fn verify_script_dependencies(
+        &self,
+        script: &CompiledScript,
+        dependencies: Vec<Arc<Module>>,
+    ) -> VMResult<()> {
+        let mut deps = vec![];
+        for dep in &dependencies {
+            deps.push(dep.module());
+        }
+        dependencies::verify_script(script, deps)
+    }
+
+    //
+    // Module verification and loading
+    //
+
+    // Loading verifies the module if it was never loaded.
+    fn load_function_without_type_args(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<(Arc<Module>, Arc<Function>, Vec<Type>, Vec<Type>)> {
+        let module = self.load_module(module_id, data_store)?;
+        let idx = self
+            .module_cache
+            .read()
+            .resolve_function_by_name(function_name, module_id)
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let func = self.module_cache.read().function_at(idx);
+
+        let parameters = func
+            .parameters
+            .0
+            .iter()
+            .map(|tok| {
+                self.module_cache
+                    .read()
+                    .make_type(BinaryIndexedView::Module(module.module()), tok)
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_ = func
+            .return_
+            .0
+            .iter()
+            .map(|tok| {
+                self.module_cache
+                    .read()
+                    .make_type(BinaryIndexedView::Module(module.module()), tok)
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        Ok((module, func, parameters, return_))
+    }
+
+    // Matches the actual returned type to the expected type, binding any type args to the
+    // necessary type as stored in the map. The expected type must be a concrete type (no TyParam).
+    // Returns true if a successful match is made.
+    fn match_return_type<'a>(
+        returned: &Type,
+        expected: &'a Type,
+        map: &mut BTreeMap<usize, &'a Type>,
+    ) -> bool {
+        match (returned, expected) {
+            // The important case, deduce the type params
+            (Type::TyParam(idx), _) => match map.entry(*idx) {
+                btree_map::Entry::Vacant(vacant_entry) => {
+                    vacant_entry.insert(expected);
+                    true
+                },
+                btree_map::Entry::Occupied(occupied_entry) => *occupied_entry.get() == expected,
+            },
+            // Recursive types we need to recurse the matching types
+            (Type::Reference(ret_inner), Type::Reference(expected_inner))
+            | (Type::MutableReference(ret_inner), Type::MutableReference(expected_inner))
+            | (Type::Vector(ret_inner), Type::Vector(expected_inner)) => {
+                Self::match_return_type(ret_inner, expected_inner, map)
+            },
+            // For structs the both need to be the same struct.
+            (Type::Struct(ret_idx), Type::Struct(expected_idx)) => *ret_idx == *expected_idx,
+            // For struct instantiations we need to additionally match all type arguments
+            (
+                Type::StructInstantiation(ret_idx, ret_fields),
+                Type::StructInstantiation(expected_idx, expected_fields),
+            ) => {
+                *ret_idx == *expected_idx
+                    && ret_fields.len() == expected_fields.len()
+                    && ret_fields
+                        .iter()
+                        .zip(expected_fields.iter())
+                        .all(|types| Self::match_return_type(types.0, types.1, map))
+            },
+            // For primitive types we need to assure the types match
+            (Type::U8, Type::U8)
+            | (Type::U16, Type::U16)
+            | (Type::U32, Type::U32)
+            | (Type::U64, Type::U64)
+            | (Type::U128, Type::U128)
+            | (Type::U256, Type::U256)
+            | (Type::Bool, Type::Bool)
+            | (Type::Address, Type::Address)
+            | (Type::Signer, Type::Signer) => true,
+            // Otherwise the types do not match and we can't match return type to the expected type.
+            // Note we don't use the _ pattern but spell out all cases, so that the compiler will
+            // bark when a case is missed upon future updates to the types.
+            (Type::U8, _)
+            | (Type::U16, _)
+            | (Type::U32, _)
+            | (Type::U64, _)
+            | (Type::U128, _)
+            | (Type::U256, _)
+            | (Type::Bool, _)
+            | (Type::Address, _)
+            | (Type::Signer, _)
+            | (Type::Struct(_), _)
+            | (Type::StructInstantiation(_, _), _)
+            | (Type::Vector(_), _)
+            | (Type::MutableReference(_), _)
+            | (Type::Reference(_), _) => false,
+        }
+    }
+
+    // Loading verifies the module if it was never loaded.
+    // Type parameters are inferred from the expected return type. Returns an error if it's not
+    // possible to infer the type parameters or return type cannot be matched.
+    // The type parameters are verified with capabilities.
+    pub(crate) fn load_function_with_type_arg_inference(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        expected_return_type: &Type,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<(LoadedFunction, LoadedFunctionInstantiation)> {
+        let (module, func, parameters, return_vec) =
+            self.load_function_without_type_args(module_id, function_name, data_store)?;
+
+        if return_vec.len() != 1 {
+            // For functions that are marked constructor this should not happen.
+            return Err(PartialVMError::new(StatusCode::ABORTED).finish(Location::Undefined));
+        }
+        let return_type = &return_vec[0];
+
+        let mut map = BTreeMap::new();
+        if !Self::match_return_type(return_type, expected_return_type, &mut map) {
+            // For functions that are marked constructor this should not happen.
+            return Err(
+                PartialVMError::new(StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE)
+                    .finish(Location::Undefined),
+            );
+        }
+
+        // Construct the type arguments from the match
+        let mut type_arguments = vec![];
+        let type_param_len = func.type_parameters().len();
+        for i in 0..type_param_len {
+            if let Option::Some(t) = map.get(&i) {
+                type_arguments.push((*t).clone());
+            } else {
+                // Unknown type argument we are not able to infer the type arguments.
+                // For functions that are marked constructor this should not happen.
+                return Err(
+                    PartialVMError::new(StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+
+        // verify type arguments for capability constraints
+        self.verify_ty_args(func.type_parameters(), &type_arguments)
+            .map_err(|e| e.finish(Location::Module(module_id.clone())))?;
+
+        let loaded = LoadedFunctionInstantiation {
+            type_arguments,
+            parameters,
+            return_: return_vec,
+        };
+        Ok((
+            LoadedFunction {
+                module,
+                function: func,
+            },
+            loaded,
+        ))
+    }
+
+    // Entry point for function execution (`MoveVM::execute_function`).
+    // Loading verifies the module if it was never loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: &[TypeTag],
+        data_store: &TransactionDataCache,
+    ) -> VMResult<(Arc<Module>, Arc<Function>, LoadedFunctionInstantiation)> {
+        let (module, func, parameters, return_) =
+            self.load_function_without_type_args(module_id, function_name, data_store)?;
+
+        let type_arguments = ty_args
+            .iter()
+            .map(|ty| self.load_type(ty, data_store))
+            .collect::<VMResult<Vec<_>>>()?;
+
+        // verify type arguments
+        self.verify_ty_args(func.type_parameters(), &type_arguments)
+            .map_err(|e| e.finish(Location::Module(module_id.clone())))?;
+
+        let loaded = LoadedFunctionInstantiation {
+            type_arguments,
+            parameters,
+            return_,
+        };
+        Ok((module, func, loaded))
+    }
+
+    // Entry point for module publishing (`MoveVM::publish_module_bundle`).
+    //
+    // All modules in the bundle to be published must be loadable. This function performs all
+    // verification steps to load these modules without actually loading them into the code cache.
+    pub(crate) fn verify_module_bundle_for_publication(
+        &self,
+        modules: &[CompiledModule],
+        data_store: &mut TransactionDataCache,
+    ) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-1", |_| { Ok(()) });
+
+        let mut bundle_unverified: BTreeSet<_> = modules.iter().map(|m| m.self_id()).collect();
+        let mut bundle_verified = BTreeMap::new();
+        for module in modules {
+            let module_id = module.self_id();
+            bundle_unverified.remove(&module_id);
+
+            self.verify_module_for_publication(
+                module,
+                &bundle_verified,
+                &bundle_unverified,
+                data_store,
+            )?;
+            bundle_verified.insert(module_id.clone(), module.clone());
+        }
+        Ok(())
+    }
+
+    // A module to be published must be loadable.
+    //
+    // This step performs all verification steps to load the module without loading it.
+    // The module is not added to the code cache. It is simply published to the data cache.
+    // See `verify_script()` for script verification steps.
+    //
+    // If a module `M` is published together with a bundle of modules (i.e., a vector of modules),
+    // - the `bundle_verified` argument tracks the modules that have already been verified in the
+    //   bundle. Basically, this represents the modules appears before `M` in the bundle vector.
+    // - the `bundle_unverified` argument tracks the modules that have not been verified when `M`
+    //   is being verified, i.e., the modules appears after `M` in the bundle vector.
+    fn verify_module_for_publication(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        bundle_unverified: &BTreeSet<ModuleId>,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<()> {
+        // Performs all verification steps to load the module without loading it, i.e., the new
+        // module will NOT show up in `module_cache`. In the module republishing case, it means
+        // that the old module is still in the `module_cache`, unless a new Loader is created,
+        // which means that a new MoveVM instance needs to be created.
+        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, module)?;
+        self.check_natives(module)?;
+
+        let mut visited = BTreeSet::new();
+        let mut friends_discovered = BTreeSet::new();
+        visited.insert(module.self_id());
+        friends_discovered.extend(module.immediate_friends());
+
+        // downward exploration of the module's dependency graph. Since we know nothing about this
+        // target module, we don't know what the module may specify as its dependencies and hence,
+        // we allow the loading of dependencies and the subsequent linking to fail.
+        self.load_and_verify_dependencies(
+            module,
+            bundle_verified,
+            data_store,
+            &mut visited,
+            &mut friends_discovered,
+            /* allow_dependency_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // upward exploration of the modules's dependency graph. Similar to dependency loading, as
+        // we know nothing about this target module, we don't know what the module may specify as
+        // its friends and hence, we allow the loading of friends to fail.
+        self.load_and_verify_friends(
+            friends_discovered,
+            bundle_verified,
+            bundle_unverified,
+            data_store,
+            /* allow_friend_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // make sure there is no cyclic dependency
+        self.verify_module_cyclic_relations(module, bundle_verified, bundle_unverified)
+    }
+
+    fn verify_module_cyclic_relations(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        bundle_unverified: &BTreeSet<ModuleId>,
+    ) -> VMResult<()> {
+        let module_cache = self.module_cache.read();
+        cyclic_dependencies::verify_module(
+            module,
+            |module_id| {
+                bundle_verified
+                    .get(module_id)
+                    .or_else(|| module_cache.modules.get(module_id).map(|m| m.module()))
+                    .map(|m| m.immediate_dependencies())
+                    .ok_or_else(|| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+            },
+            |module_id| {
+                if bundle_unverified.contains(module_id) {
+                    // If the module under verification declares a friend which is also in the
+                    // bundle (and positioned after this module in the bundle), we defer the cyclic
+                    // relation checking when we verify that module.
+                    Ok(vec![])
+                } else {
+                    // Otherwise, we get all the information we need to verify whether this module
+                    // creates a cyclic relation.
+                    bundle_verified
+                        .get(module_id)
+                        .or_else(|| module_cache.modules.get(module_id).map(|m| m.module()))
+                        .map(|m| m.immediate_friends())
+                        .ok_or_else(|| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+                }
+            },
+        )
+    }
+
+    fn check_natives(&self, module: &CompiledModule) -> VMResult<()> {
+        fn check_natives_impl(_loader: &Loader, module: &CompiledModule) -> PartialVMResult<()> {
+            // TODO: fix check and error code if we leave something around for native structs.
+            // For now this generates the only error test cases care about...
+            for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+                if struct_def.field_information == StructFieldInformation::Native {
+                    return Err(verification_error(
+                        StatusCode::MISSING_DEPENDENCY,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            Ok(())
+        }
+        check_natives_impl(self, module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    //
+    // Helpers for loading and verification
+    //
+
+    pub(crate) fn load_type(
+        &self,
+        type_tag: &TypeTag,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<Type> {
+        Ok(match type_tag {
+            TypeTag::Bool => Type::Bool,
+            TypeTag::U8 => Type::U8,
+            TypeTag::U16 => Type::U16,
+            TypeTag::U32 => Type::U32,
+            TypeTag::U64 => Type::U64,
+            TypeTag::U128 => Type::U128,
+            TypeTag::U256 => Type::U256,
+            TypeTag::Address => Type::Address,
+            TypeTag::Signer => Type::Signer,
+            TypeTag::Vector(tt) => Type::Vector(Box::new(self.load_type(tt, data_store)?)),
+            TypeTag::Struct(struct_tag) => {
+                let module_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
+                self.load_module(&module_id, data_store)?;
+                let (idx, struct_type) = self
+                    .module_cache
+                    .read()
+                    // GOOD module was loaded above
+                    .resolve_struct_by_name(&struct_tag.name, &module_id)
+                    .map_err(|e| e.finish(Location::Undefined))?;
+                if struct_type.type_parameters.is_empty() && struct_tag.type_params.is_empty() {
+                    Type::Struct(idx)
+                } else {
+                    let mut type_params = vec![];
+                    for ty_param in &struct_tag.type_params {
+                        type_params.push(self.load_type(ty_param, data_store)?);
+                    }
+                    self.verify_ty_args(struct_type.type_param_constraints(), &type_params)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    Type::StructInstantiation(idx, type_params)
+                }
+            },
+        })
+    }
+
+    // The interface for module loading. Aligned with `load_type` and `load_function`, this function
+    // verifies that the module is OK instead of expect it.
+    pub(crate) fn load_module(
+        &self,
+        id: &ModuleId,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<Arc<Module>> {
+        self.load_module_internal(id, &BTreeMap::new(), &BTreeSet::new(), data_store)
+    }
+
+    // Load the transitive closure of the target module first, and then verify that the modules in
+    // the closure do not have cyclic dependencies.
+    fn load_module_internal(
+        &self,
+        id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        bundle_unverified: &BTreeSet<ModuleId>,
+        data_store: &TransactionDataCache,
+    ) -> VMResult<Arc<Module>> {
+        // if the module is already in the code cache, load the cached version
+        if let Some(cached) = self.module_cache.read().module_at(id) {
+            self.module_cache_hits.write().insert(id.clone());
+            return Ok(cached);
+        }
+
+        // otherwise, load the transitive closure of the target module
+        let module_ref = self.load_and_verify_module_and_dependencies_and_friends(
+            id,
+            bundle_verified,
+            bundle_unverified,
+            data_store,
+            /* allow_module_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // verify that the transitive closure does not have cycles
+        self.verify_module_cyclic_relations(
+            module_ref.module(),
+            bundle_verified,
+            bundle_unverified,
+        )
+        .map_err(expect_no_verification_errors)?;
+        Ok(module_ref)
+    }
+
+    // Load, deserialize, and check the module with the bytecode verifier, without linking
+    fn load_and_verify_module(
+        &self,
+        id: &ModuleId,
+        data_store: &TransactionDataCache,
+        allow_loading_failure: bool,
+    ) -> VMResult<CompiledModule> {
+        // bytes fetching, allow loading to fail if the flag is set
+        let bytes = match data_store.load_module(id) {
+            Ok(bytes) => bytes,
+            Err(err) if allow_loading_failure => return Err(err),
+            Err(err) => {
+                return Err(expect_no_verification_errors(err));
+            },
+        };
+
+        // for bytes obtained from the data store, they should always deserialize and verify.
+        // It is an invariant violation if they don't.
+        let module = CompiledModule::deserialize_with_max_version(
+            &bytes,
+            self.vm_config.max_binary_format_version,
+        )
+        .map_err(|err| {
+            let msg = format!("Deserialization error: {:?}", err);
+            PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                .with_message(msg)
+                .finish(Location::Module(id.clone()))
+        })
+        .map_err(expect_no_verification_errors)?;
+
+        fail::fail_point!("verifier-failpoint-2", |_| { Ok(module.clone()) });
+
+        if self.vm_config.paranoid_type_checks && &module.self_id() != id {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Module self id mismatch with storage".to_string())
+                    .finish(Location::Module(id.clone())),
+            );
+        }
+
+        // bytecode verifier checks that can be performed with the module itself
+        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, &module)
+            .map_err(expect_no_verification_errors)?;
+        self.check_natives(&module)
+            .map_err(expect_no_verification_errors)?;
+        Ok(module)
+    }
+
+    // Everything in `load_and_verify_module` and also recursively load and verify all the
+    // dependencies of the target module.
+    fn load_and_verify_module_and_dependencies(
+        &self,
+        id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &TransactionDataCache,
+        visited: &mut BTreeSet<ModuleId>,
+        friends_discovered: &mut BTreeSet<ModuleId>,
+        allow_module_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<Arc<Module>> {
+        // dependency loading does not permit cycles
+        if visited.contains(id) {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY)
+                .finish(Location::Undefined));
+        }
+
+        // module self-check
+        let module = self.load_and_verify_module(id, data_store, allow_module_loading_failure)?;
+        visited.insert(id.clone());
+        friends_discovered.extend(module.immediate_friends());
+
+        // downward exploration of the module's dependency graph. For a module that is loaded from
+        // the data_store, we should never allow its dependencies to fail to load.
+        self.load_and_verify_dependencies(
+            &module,
+            bundle_verified,
+            data_store,
+            visited,
+            friends_discovered,
+            /* allow_dependency_loading_failure */ false,
+            dependencies_depth,
+        )?;
+
+        // if linking goes well, insert the module to the code cache
+        let mut locked_cache = self.module_cache.write();
+        let module_ref = locked_cache.insert(&self.natives, id.clone(), module)?;
+        drop(locked_cache); // explicit unlock
+
+        Ok(module_ref)
+    }
+
+    // downward exploration of the module's dependency graph
+    fn load_and_verify_dependencies(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &TransactionDataCache,
+        visited: &mut BTreeSet<ModuleId>,
+        friends_discovered: &mut BTreeSet<ModuleId>,
+        allow_dependency_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+        // all immediate dependencies of the module being verified should be in one of the locations
+        // - the verified portion of the bundle (e.g., verified before this module)
+        // - the code cache (i.e., loaded already)
+        // - the data store (i.e., not loaded to code cache yet)
+        let mut bundle_deps = vec![];
+        let mut cached_deps = vec![];
+        for module_id in module.immediate_dependencies() {
+            if let Some(cached) = bundle_verified.get(&module_id) {
+                bundle_deps.push(cached);
+            } else {
+                let locked_cache = self.module_cache.read();
+                let loaded = match locked_cache.module_at(&module_id) {
+                    None => {
+                        drop(locked_cache); // explicit unlock
+                        self.load_and_verify_module_and_dependencies(
+                            &module_id,
+                            bundle_verified,
+                            data_store,
+                            visited,
+                            friends_discovered,
+                            allow_dependency_loading_failure,
+                            dependencies_depth + 1,
+                        )?
+                    },
+                    Some(cached) => cached,
+                };
+                cached_deps.push(loaded);
+            }
+        }
+
+        // once all dependencies are loaded, do the linking check
+        let all_imm_deps = bundle_deps
+            .into_iter()
+            .chain(cached_deps.iter().map(|m| m.module()));
+
+        fail::fail_point!("verifier-failpoint-4", |_| { Ok(()) });
+
+        let result = dependencies::verify_module(module, all_imm_deps);
+
+        // if dependencies loading is not allowed to fail, the linking should not fail as well
+        if allow_dependency_loading_failure {
+            result
+        } else {
+            result.map_err(expect_no_verification_errors)
+        }
+    }
+
+    // Everything in `load_and_verify_module_and_dependencies` and also recursively load and verify
+    // all the friends modules of the newly loaded modules, until the friends frontier covers the
+    // whole closure.
+    fn load_and_verify_module_and_dependencies_and_friends(
+        &self,
+        id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        bundle_unverified: &BTreeSet<ModuleId>,
+        data_store: &TransactionDataCache,
+        allow_module_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<Arc<Module>> {
+        // load the closure of the module in terms of dependency relation
+        let mut visited = BTreeSet::new();
+        let mut friends_discovered = BTreeSet::new();
+        let module_ref = self.load_and_verify_module_and_dependencies(
+            id,
+            bundle_verified,
+            data_store,
+            &mut visited,
+            &mut friends_discovered,
+            allow_module_loading_failure,
+            0,
+        )?;
+
+        // upward exploration of the module's friendship graph and expand the friendship frontier.
+        // For a module that is loaded from the data_store, we should never allow that its friends
+        // fail to load.
+        self.load_and_verify_friends(
+            friends_discovered,
+            bundle_verified,
+            bundle_unverified,
+            data_store,
+            /* allow_friend_loading_failure */ false,
+            dependencies_depth,
+        )?;
+        Ok(module_ref)
+    }
+
+    // upward exploration of the module's dependency graph
+    fn load_and_verify_friends(
+        &self,
+        friends_discovered: BTreeSet<ModuleId>,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        bundle_unverified: &BTreeSet<ModuleId>,
+        data_store: &TransactionDataCache,
+        allow_friend_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+        // for each new module discovered in the frontier, load them fully and expand the frontier.
+        // apply three filters to the new friend modules discovered
+        // - `!locked_cache.has_module(mid)`
+        //   If we friend a module that is already in the code cache, then we know that the
+        //   transitive closure of that module is loaded into the cache already, skip the loading
+        // - `!bundle_verified.contains_key(mid)`
+        //   In the case of publishing a bundle, we don't actually put the published module into
+        //   code cache. This `bundle_verified` cache is a temporary extension of the code cache
+        //   in the bundle publication scenario. If a module is already verified, we don't need to
+        //   re-load it again.
+        // - `!bundle_unverified.contains(mid)
+        //   If the module under verification declares a friend which is also in the bundle (and
+        //   positioned after this module in the bundle), we defer the loading of that module when
+        //   it is the module's turn in the bundle.
+        let locked_cache = self.module_cache.read();
+        let new_imm_friends: Vec<_> = friends_discovered
+            .into_iter()
+            .filter(|mid| {
+                !locked_cache.has_module(mid)
+                    && !bundle_verified.contains_key(mid)
+                    && !bundle_unverified.contains(mid)
+            })
+            .collect();
+        drop(locked_cache); // explicit unlock
+
+        for module_id in new_imm_friends {
+            self.load_and_verify_module_and_dependencies_and_friends(
+                &module_id,
+                bundle_verified,
+                bundle_unverified,
+                data_store,
+                allow_friend_loading_failure,
+                dependencies_depth + 1,
+            )?;
+        }
+        Ok(())
+    }
+
+    // Return an instantiated type given a generic and an instantiation.
+    // Stopgap to avoid a recursion that is either taking too long or using too
+    // much memory
+    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        match ty {
+            Type::MutableReference(_) | Type::Reference(_) | Type::Vector(_) => {
+                if self.vm_config.type_size_limit
+                    && self.count_type_nodes(ty) > MAX_TYPE_INSTANTIATION_NODES
+                {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                }
+            },
+            Type::StructInstantiation(_, struct_inst) => {
+                let mut sum_nodes: usize = 1;
+                for ty in ty_args.iter().chain(struct_inst.iter()) {
+                    sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
+                    if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                        return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                    }
+                }
+            },
+            Type::Address
+            | Type::Bool
+            | Type::Signer
+            | Type::Struct(_)
+            | Type::TyParam(_)
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256 => (),
+        };
+        ty.subst(ty_args)
+    }
+
+    // Verify the kind (constraints) of an instantiation.
+    // Both function and script invocation use this function to verify correctness
+    // of type arguments provided
+    fn verify_ty_args<'a, I>(&self, constraints: I, ty_args: &[Type]) -> PartialVMResult<()>
+    where
+        I: IntoIterator<Item = &'a AbilitySet>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let constraints = constraints.into_iter();
+        if constraints.len() != ty_args.len() {
+            return Err(PartialVMError::new(
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+            ));
+        }
+        for (ty, expected_k) in ty_args.iter().zip(constraints) {
+            if !expected_k.is_subset(self.abilities(ty)?) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Internal helpers
+    //
+
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        self.module_cache.read().function_at(idx)
+    }
+
+    fn get_module(&self, idx: &ModuleId) -> Arc<Module> {
+        Arc::clone(
+            self.module_cache
+                .read()
+                .modules
+                .get(idx)
+                .expect("ModuleId on Function must exist"),
+        )
+    }
+
+    fn get_script(&self, hash: &ScriptHash) -> Arc<Script> {
+        Arc::clone(
+            self.scripts
+                .read()
+                .scripts
+                .get(hash)
+                .expect("Script hash on Function must exist"),
+        )
+    }
+
+    pub(crate) fn get_struct_type(&self, idx: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.module_cache.read().structs.get(idx.0).map(Arc::clone)
+    }
+
+    pub(crate) fn abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
+        match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address => Ok(AbilitySet::PRIMITIVES),
+
+            // Technically unreachable but, no point in erroring if we don't have to
+            Type::Reference(_) | Type::MutableReference(_) => Ok(AbilitySet::REFERENCES),
+            Type::Signer => Ok(AbilitySet::SIGNER),
+
+            Type::TyParam(_) => Err(PartialVMError::new(StatusCode::UNREACHABLE).with_message(
+                "Unexpected TyParam type after translating from TypeTag to Type".to_string(),
+            )),
+
+            Type::Vector(ty) => {
+                AbilitySet::polymorphic_abilities(AbilitySet::VECTOR, vec![false], vec![
+                    self.abilities(ty)?
+                ])
+            },
+            Type::Struct(idx) => Ok(self.module_cache.read().struct_at(*idx).abilities),
+            Type::StructInstantiation(idx, type_args) => {
+                let struct_type = self.module_cache.read().struct_at(*idx);
+                let declared_phantom_parameters = struct_type
+                    .type_parameters
+                    .iter()
+                    .map(|param| param.is_phantom);
+                let type_argument_abilities = type_args
+                    .iter()
+                    .map(|arg| self.abilities(arg))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                AbilitySet::polymorphic_abilities(
+                    struct_type.abilities,
+                    declared_phantom_parameters,
+                    type_argument_abilities,
+                )
+            },
+        }
+    }
+}
+
+//
+// Resolver
+//
+
+// A simple wrapper for a `Module` or a `Script` in the `Resolver`
+enum BinaryType {
+    Module(Arc<Module>),
+    Script(Arc<Script>),
+}
+
+// A Resolver is a simple and small structure allocated on the stack and used by the
+// interpreter. It's the only API known to the interpreter and it's tailored to the interpreter
+// needs.
+pub(crate) struct Resolver<'a> {
+    loader: &'a Loader,
+    binary: BinaryType,
+}
+
+impl<'a> Resolver<'a> {
+    fn for_module(loader: &'a Loader, module: Arc<Module>) -> Self {
+        let binary = BinaryType::Module(module);
+        Self { loader, binary }
+    }
+
+    fn for_script(loader: &'a Loader, script: Arc<Script>) -> Self {
+        let binary = BinaryType::Script(script);
+        Self { loader, binary }
+    }
+
+    //
+    // Constant resolution
+    //
+
+    pub(crate) fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        match &self.binary {
+            BinaryType::Module(module) => module.module.constant_at(idx),
+            BinaryType::Script(script) => script.script.constant_at(idx),
+        }
+    }
+
+    //
+    // Function resolution
+    //
+
+    pub(crate) fn function_from_handle(&self, idx: FunctionHandleIndex) -> Arc<Function> {
+        let idx = match &self.binary {
+            BinaryType::Module(module) => module.function_at(idx.0),
+            BinaryType::Script(script) => script.function_at(idx.0),
+        };
+        self.loader.function_at(idx)
+    }
+
+    pub(crate) fn function_from_instantiation(
+        &self,
+        idx: FunctionInstantiationIndex,
+    ) -> Arc<Function> {
+        let func_inst = match &self.binary {
+            BinaryType::Module(module) => module.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        self.loader.function_at(func_inst.handle)
+    }
+
+    pub(crate) fn instantiate_generic_function(
+        &self,
+        idx: FunctionInstantiationIndex,
+        type_params: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let func_inst = match &self.binary {
+            BinaryType::Module(module) => module.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        let mut instantiation = vec![];
+        for ty in &func_inst.instantiation {
+            instantiation.push(self.subst(ty, type_params)?);
+        }
+        // Check if the function instantiation over all generics is larger
+        // than MAX_TYPE_INSTANTIATION_NODES.
+        let mut sum_nodes: usize = 1;
+        for ty in type_params.iter().chain(instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(instantiation)
+    }
+
+    #[allow(unused)]
+    pub(crate) fn type_params_count(&self, idx: FunctionInstantiationIndex) -> usize {
+        let func_inst = match &self.binary {
+            BinaryType::Module(module) => module.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        func_inst.instantiation.len()
+    }
+
+    //
+    // Type resolution
+    //
+
+    pub(crate) fn get_struct_type(&self, idx: StructDefinitionIndex) -> Type {
+        let struct_def = match &self.binary {
+            BinaryType::Module(module) => module.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Type::Struct(struct_def)
+    }
+
+    pub(crate) fn instantiate_generic_type(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module(module) => module.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        let mut sum_nodes: usize = 1;
+        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+
+        Ok(Type::StructInstantiation(
+            struct_inst.def,
+            struct_inst
+                .instantiation
+                .iter()
+                .map(|ty| self.subst(ty, ty_args))
+                .collect::<PartialVMResult<_>>()?,
+        ))
+    }
+
+    pub(crate) fn get_field_type(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+        let handle = match &self.binary {
+            BinaryType::Module(module) => &module.field_handles[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Ok(self
+            .loader
+            .get_struct_type(handle.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?
+            .fields[handle.offset]
+            .clone())
+    }
+
+    pub(crate) fn instantiate_generic_field(
+        &self,
+        idx: FieldInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let field_instantiation = match &self.binary {
+            BinaryType::Module(module) => &module.field_instantiations[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(field_instantiation.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = field_instantiation
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type.fields[field_instantiation.offset].subst(&instantiation_types)
+    }
+
+    pub(crate) fn get_struct_fields(
+        &self,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<Arc<StructType>> {
+        let idx = match &self.binary {
+            BinaryType::Module(module) => module.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        self.loader.get_struct_type(idx).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Struct Definition not resolved".to_string())
+        })
+    }
+
+    pub(crate) fn instantiate_generic_struct_fields(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module(module) => module.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(struct_inst.def)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = struct_inst
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type
+            .fields
+            .iter()
+            .map(|ty| ty.subst(&instantiation_types))
+            .collect::<PartialVMResult<Vec<_>>>()
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        match &self.binary {
+            BinaryType::Module(module) => module.single_type_at(idx),
+            BinaryType::Script(script) => script.single_type_at(idx),
+        }
+    }
+
+    pub(crate) fn instantiate_single_type(
+        &self,
+        idx: SignatureIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let ty = self.single_type_at(idx);
+        if !ty_args.is_empty() {
+            self.subst(ty, ty_args)
+        } else {
+            Ok(ty.clone())
+        }
+    }
+
+    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.loader.subst(ty, ty_args)
+    }
+
+    //
+    // Fields resolution
+    //
+
+    pub(crate) fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module(module) => module.field_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module(module) => module.field_instantiation_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_count(&self, idx: StructDefinitionIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module(module) => module.field_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_count(&self, idx: StructDefInstantiationIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module(module) => module.field_instantiation_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> Type {
+        match &self.binary {
+            BinaryType::Module(module) => Type::Struct(module.field_handles[idx.0 as usize].owner),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_to_struct(
+        &self,
+        idx: FieldInstantiationIndex,
+        args: &[Type],
+    ) -> PartialVMResult<Type> {
+        match &self.binary {
+            BinaryType::Module(module) => Ok(Type::StructInstantiation(
+                module.field_instantiations[idx.0 as usize].owner,
+                module.field_instantiations[idx.0 as usize]
+                    .instantiation
+                    .iter()
+                    .map(|ty| ty.subst(args))
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            )),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
+        self.loader.type_to_type_layout(ty)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        self.loader.type_to_fully_annotated_layout(ty)
+    }
+
+    // get the loader
+    pub(crate) fn loader(&self) -> &Loader {
+        self.loader
+    }
+}
+
+// A Module is very similar to a binary Module but data is "transformed" to a representation
+// more appropriate to execution.
+// When code executes indexes in instructions are resolved against those runtime structure
+// so that any data needed for execution is immediately available
+#[derive(Debug)]
+pub(crate) struct Module {
+    #[allow(dead_code)]
+    id: ModuleId,
+    // primitive pools
+    module: Arc<CompiledModule>,
+
+    //
+    // types as indexes into the Loader type list
+    //
+
+    // struct references carry the index into the global vector of types.
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of types. No instantiation of generic types is saved into the global table.
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+    structs: Vec<StructDef>,
+    // materialized instantiations, whether partial or not
+    struct_instantiations: Vec<StructInstantiation>,
+
+    // functions as indexes into the Loader function list
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of functions. No instantiation of generic functions is saved into
+    // the global table.
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // fields as a pair of index, first to the type, second to the field position in that type
+    field_handles: Vec<FieldHandle>,
+    // materialized instantiations, whether partial or not
+    field_instantiations: Vec<FieldInstantiation>,
+
+    // function name to index into the Loader function list.
+    // This allows a direct access from function name to `Function`
+    function_map: HashMap<Identifier, usize>,
+    // struct name to index into the Loader type list
+    // This allows a direct access from struct name to `Struct`
+    struct_map: HashMap<Identifier, CachedStructIndex>,
+
+    // a map of single-token signature indices to type.
+    // Single-token signatures are usually indexed by the `SignatureIndex` in bytecode. For example,
+    // `VecMutBorrow(SignatureIndex)`, the `SignatureIndex` maps to a single `SignatureToken`, and
+    // hence, a single type.
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl Module {
+    fn new(
+        module: CompiledModule,
+        cache: &ModuleCache,
+    ) -> Result<Self, (PartialVMError, CompiledModule)> {
+        let id = module.self_id();
+
+        let mut struct_refs = vec![];
+        let mut structs = vec![];
+        let mut struct_instantiations = vec![];
+        let mut function_refs = vec![];
+        let mut function_instantiations = vec![];
+        let mut field_handles = vec![];
+        let mut field_instantiations: Vec<FieldInstantiation> = vec![];
+        let mut function_map = HashMap::new();
+        let mut struct_map = HashMap::new();
+        let mut single_signature_token_map = BTreeMap::new();
+
+        let mut create = || {
+            for struct_handle in module.struct_handles() {
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let module_id = module.module_id_for_handle(module_handle);
+                if module_id == id {
+                    // module has not been published yet, loop through the types in reverse order.
+                    // At this point all the types of the module are in the type list but not yet
+                    // exposed through the module cache. The implication is that any resolution
+                    // to types of the module being loaded is going to fail.
+                    // So we manually go through the types and find the proper index
+                    for (idx, struct_type) in cache.structs.iter().enumerate().rev() {
+                        if struct_type.module != module_id {
+                            return Err(PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE)
+                                .with_message(format!(
+                                    "Cannot find {:?}::{:?} in publishing module",
+                                    module_id, struct_name
+                                )));
+                        }
+                        if struct_type.name.as_ident_str() == struct_name {
+                            struct_refs.push(CachedStructIndex(idx));
+                            break;
+                        }
+                    }
+                } else {
+                    struct_refs.push(cache.resolve_struct_by_name(struct_name, &module_id)?.0);
+                }
+            }
+
+            for struct_def in module.struct_defs() {
+                let idx = struct_refs[struct_def.struct_handle.0 as usize];
+                let field_count = cache.structs[idx.0].fields.len() as u16;
+                structs.push(StructDef { field_count, idx });
+                let name =
+                    module.identifier_at(module.struct_handle_at(struct_def.struct_handle).name);
+                struct_map.insert(name.to_owned(), idx);
+            }
+
+            for struct_inst in module.struct_instantiations() {
+                let def = struct_inst.def.0 as usize;
+                let struct_def = &structs[def];
+                let field_count = struct_def.field_count;
+                let mut instantiation = vec![];
+                for ty in &module.signature_at(struct_inst.type_parameters).0 {
+                    instantiation.push(cache.make_type_while_loading(&module, ty)?);
+                }
+                struct_instantiations.push(StructInstantiation {
+                    field_count,
+                    def: struct_def.idx,
+                    instantiation,
+                });
+            }
+
+            for func_handle in module.function_handles() {
+                let func_name = module.identifier_at(func_handle.name);
+                let module_handle = module.module_handle_at(func_handle.module);
+                let module_id = module.module_id_for_handle(module_handle);
+                if module_id == id {
+                    // module has not been published yet, loop through the functions
+                    for (idx, function) in cache.functions.iter().enumerate().rev() {
+                        if function.module_id() != Some(&module_id) {
+                            return Err(PartialVMError::new(
+                                StatusCode::FUNCTION_RESOLUTION_FAILURE,
+                            )
+                            .with_message(format!(
+                                "Cannot find {:?}::{:?} in publishing module",
+                                module_id, func_name
+                            )));
+                        }
+                        if function.name.as_ident_str() == func_name {
+                            function_refs.push(idx);
+                            break;
+                        }
+                    }
+                } else {
+                    function_refs.push(cache.resolve_function_by_name(func_name, &module_id)?);
+                }
+            }
+
+            for func_def in module.function_defs() {
+                let idx = function_refs[func_def.function.0 as usize];
+                let name = module.identifier_at(module.function_handle_at(func_def.function).name);
+                function_map.insert(name.to_owned(), idx);
+
+                if let Some(code_unit) = &func_def.code {
+                    for bc in &code_unit.code {
+                        match bc {
+                            Bytecode::VecPack(si, _)
+                            | Bytecode::VecLen(si)
+                            | Bytecode::VecImmBorrow(si)
+                            | Bytecode::VecMutBorrow(si)
+                            | Bytecode::VecPushBack(si)
+                            | Bytecode::VecPopBack(si)
+                            | Bytecode::VecUnpack(si, _)
+                            | Bytecode::VecSwap(si) => {
+                                if !single_signature_token_map.contains_key(si) {
+                                    let ty = match module.signature_at(*si).0.get(0) {
+                                        None => {
+                                            return Err(PartialVMError::new(
+                                                StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                            )
+                                            .with_message(
+                                                "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                                    .to_owned(),
+                                            ));
+                                        },
+                                        Some(sig_token) => sig_token,
+                                    };
+                                    single_signature_token_map
+                                        .insert(*si, cache.make_type_while_loading(&module, ty)?);
+                                }
+                            },
+                            _ => {},
+                        }
+                    }
+                }
+            }
+
+            for func_inst in module.function_instantiations() {
+                let handle = function_refs[func_inst.handle.0 as usize];
+                let mut instantiation = vec![];
+                for ty in &module.signature_at(func_inst.type_parameters).0 {
+                    instantiation.push(cache.make_type_while_loading(&module, ty)?);
+                }
+                function_instantiations.push(FunctionInstantiation {
+                    handle,
+                    instantiation,
+                });
+            }
+
+            for f_handle in module.field_handles() {
+                let def_idx = f_handle.owner;
+                let owner = structs[def_idx.0 as usize].idx;
+                let offset = f_handle.field as usize;
+                field_handles.push(FieldHandle { offset, owner });
+            }
+
+            for f_inst in module.field_instantiations() {
+                let fh_idx = f_inst.handle;
+                let owner = field_handles[fh_idx.0 as usize].owner;
+                let offset = field_handles[fh_idx.0 as usize].offset;
+                let mut instantiation = vec![];
+                for ty in &module.signature_at(f_inst.type_parameters).0 {
+                    instantiation.push(cache.make_type_while_loading(&module, ty)?);
+                }
+                field_instantiations.push(FieldInstantiation {
+                    offset,
+                    owner,
+                    instantiation,
+                });
+            }
+
+            Ok(())
+        };
+
+        match create() {
+            Ok(_) => Ok(Self {
+                id,
+                module: Arc::new(module),
+                struct_refs,
+                structs,
+                struct_instantiations,
+                function_refs,
+                function_instantiations,
+                field_handles,
+                field_instantiations,
+                function_map,
+                struct_map,
+                single_signature_token_map,
+            }),
+            Err(err) => Err((err, module)),
+        }
+    }
+
+    fn struct_at(&self, idx: StructDefinitionIndex) -> CachedStructIndex {
+        self.structs[idx.0 as usize].idx
+    }
+
+    fn struct_instantiation_at(&self, idx: u16) -> &StructInstantiation {
+        &self.struct_instantiations[idx as usize]
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn field_count(&self, idx: u16) -> u16 {
+        self.structs[idx as usize].field_count
+    }
+
+    fn field_instantiation_count(&self, idx: u16) -> u16 {
+        self.struct_instantiations[idx as usize].field_count
+    }
+
+    pub(crate) fn module(&self) -> &CompiledModule {
+        &self.module
+    }
+
+    pub(crate) fn arc_module(&self) -> Arc<CompiledModule> {
+        self.module.clone()
+    }
+
+    fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        self.field_handles[idx.0 as usize].offset
+    }
+
+    fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        self.field_instantiations[idx.0 as usize].offset
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+// A Script is very similar to a `CompiledScript` but data is "transformed" to a representation
+// more appropriate to execution.
+// When code executes, indexes in instructions are resolved against runtime structures
+// (rather then "compiled") to make available data needed for execution
+// #[derive(Debug)]
+struct Script {
+    // primitive pools
+    script: CompiledScript,
+
+    // types as indexes into the Loader type list
+    // REVIEW: why is this unused?
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+
+    // functions as indexes into the Loader function list
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // entry point
+    main: Arc<Function>,
+
+    // parameters of main
+    parameter_tys: Vec<Type>,
+
+    // return values
+    return_tys: Vec<Type>,
+
+    // a map of single-token signature indices to type
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl Script {
+    fn new(
+        script: CompiledScript,
+        script_hash: &ScriptHash,
+        cache: &ModuleCache,
+    ) -> VMResult<Self> {
+        let mut struct_refs = vec![];
+        for struct_handle in script.struct_handles() {
+            let struct_name = script.identifier_at(struct_handle.name);
+            let module_handle = script.module_handle_at(struct_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            struct_refs.push(
+                cache
+                    .resolve_struct_by_name(struct_name, &module_id)
+                    .map_err(|e| e.finish(Location::Script))?
+                    .0,
+            );
+        }
+
+        let mut function_refs = vec![];
+        for func_handle in script.function_handles().iter() {
+            let func_name = script.identifier_at(func_handle.name);
+            let module_handle = script.module_handle_at(func_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            let ref_idx = cache
+                .resolve_function_by_name(func_name, &module_id)
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function_refs.push(ref_idx);
+        }
+
+        let mut function_instantiations = vec![];
+        for func_inst in script.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &script.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(
+                    cache
+                        .make_type(BinaryIndexedView::Script(&script), ty)
+                        .map_err(|e| e.finish(Location::Script))?,
+                );
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        let scope = Scope::Script(*script_hash);
+
+        let code: Vec<Bytecode> = script.code.code.clone();
+        let parameters = script.signature_at(script.parameters).clone();
+
+        let parameter_tys = parameters
+            .0
+            .iter()
+            .map(|tok| cache.make_type(BinaryIndexedView::Script(&script), tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let locals = Signature(
+            parameters
+                .0
+                .iter()
+                .chain(script.signature_at(script.code.locals).0.iter())
+                .cloned()
+                .collect(),
+        );
+        let local_tys = locals
+            .0
+            .iter()
+            .map(|tok| cache.make_type(BinaryIndexedView::Script(&script), tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let return_ = Signature(vec![]);
+        let return_tys = return_
+            .0
+            .iter()
+            .map(|tok| cache.make_type(BinaryIndexedView::Script(&script), tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let type_parameters = script.type_parameters.clone();
+        // TODO: main does not have a name. Revisit.
+        let name = Identifier::new("main").unwrap();
+        let (native, def_is_native) = (None, false); // Script entries cannot be native
+        let main: Arc<Function> = Arc::new(Function {
+            file_format_version: script.version(),
+            index: FunctionDefinitionIndex(0),
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private: false,
+            scope,
+            name,
+            return_types: return_tys.clone(),
+            local_types: local_tys,
+            parameter_types: parameter_tys.clone(),
+        });
+
+        let mut single_signature_token_map = BTreeMap::new();
+        for bc in &script.code.code {
+            match bc {
+                Bytecode::VecPack(si, _)
+                | Bytecode::VecLen(si)
+                | Bytecode::VecImmBorrow(si)
+                | Bytecode::VecMutBorrow(si)
+                | Bytecode::VecPushBack(si)
+                | Bytecode::VecPopBack(si)
+                | Bytecode::VecUnpack(si, _)
+                | Bytecode::VecSwap(si) => {
+                    if !single_signature_token_map.contains_key(si) {
+                        let ty = match script.signature_at(*si).0.get(0) {
+                            None => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                )
+                                .with_message(
+                                    "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                        .to_owned(),
+                                )
+                                .finish(Location::Script));
+                            },
+                            Some(sig_token) => sig_token,
+                        };
+                        single_signature_token_map.insert(
+                            *si,
+                            cache
+                                .make_type(BinaryIndexedView::Script(&script), ty)
+                                .map_err(|e| e.finish(Location::Script))?,
+                        );
+                    }
+                },
+                _ => {},
+            }
+        }
+
+        Ok(Self {
+            script,
+            struct_refs,
+            function_refs,
+            function_instantiations,
+            main,
+            parameter_tys,
+            return_tys,
+            single_signature_token_map,
+        })
+    }
+
+    fn entry_point(&self) -> Arc<Function> {
+        self.main.clone()
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+// A simple wrapper for the "owner" of the function (Module or Script)
+#[derive(Debug)]
+enum Scope {
+    Module(ModuleId),
+    Script(ScriptHash),
+}
+
+// A runtime function
+// #[derive(Debug)]
+// https://github.com/rust-lang/rust/issues/70263
+pub(crate) struct Function {
+    #[allow(unused)]
+    file_format_version: u32,
+    index: FunctionDefinitionIndex,
+    code: Vec<Bytecode>,
+    parameters: Signature,
+    return_: Signature,
+    locals: Signature,
+    type_parameters: Vec<AbilitySet>,
+    native: Option<NativeFunction>,
+    def_is_native: bool,
+    def_is_friend_or_private: bool,
+    scope: Scope,
+    name: Identifier,
+    return_types: Vec<Type>,
+    local_types: Vec<Type>,
+    parameter_types: Vec<Type>,
+}
+
+// This struct must be treated as an identifier for a function and not somehow relying on
+// the internal implementation.
+pub struct LoadedFunction {
+    pub(crate) module: Arc<Module>,
+    pub(crate) function: Arc<Function>,
+}
+
+impl Function {
+    fn new(
+        natives: &NativeFunctions,
+        index: FunctionDefinitionIndex,
+        def: &FunctionDefinition,
+        module: &CompiledModule,
+    ) -> Self {
+        let handle = module.function_handle_at(def.function);
+        let name = module.identifier_at(handle.name).to_owned();
+        let module_id = module.self_id();
+        let def_is_friend_or_private = match def.visibility {
+            Visibility::Friend | Visibility::Private => true,
+            Visibility::Public => false,
+        };
+        let (native, def_is_native) = if def.is_native() {
+            (
+                natives.resolve(
+                    module_id.address(),
+                    module_id.name().as_str(),
+                    name.as_str(),
+                ),
+                true,
+            )
+        } else {
+            (None, false)
+        };
+        let scope = Scope::Module(module_id);
+        let parameters = module.signature_at(handle.parameters).clone();
+        // Native functions do not have a code unit
+        let (code, locals) = match &def.code {
+            Some(code) => (
+                code.code.clone(),
+                Signature(
+                    parameters
+                        .0
+                        .iter()
+                        .chain(module.signature_at(code.locals).0.iter())
+                        .cloned()
+                        .collect(),
+                ),
+            ),
+            None => (vec![], Signature(vec![])),
+        };
+        let return_ = module.signature_at(handle.return_).clone();
+        let type_parameters = handle.type_parameters.clone();
+        Self {
+            file_format_version: module.version(),
+            index,
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private,
+            scope,
+            name,
+            local_types: vec![],
+            return_types: vec![],
+            parameter_types: vec![],
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn file_format_version(&self) -> u32 {
+        self.file_format_version
+    }
+
+    pub(crate) fn module_id(&self) -> Option<&ModuleId> {
+        match &self.scope {
+            Scope::Module(module_id) => Some(module_id),
+            Scope::Script(_) => None,
+        }
+    }
+
+    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
+        self.index
+    }
+
+    pub(crate) fn get_resolver<'a>(&self, loader: &'a Loader) -> Resolver<'a> {
+        match &self.scope {
+            Scope::Module(module_id) => {
+                let module = loader.get_module(module_id);
+                Resolver::for_module(loader, module)
+            },
+            Scope::Script(script_hash) => {
+                let script = loader.get_script(script_hash);
+                Resolver::for_script(loader, script)
+            },
+        }
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn arg_count(&self) -> usize {
+        self.parameters.len()
+    }
+
+    pub(crate) fn return_type_count(&self) -> usize {
+        self.return_.len()
+    }
+
+    pub(crate) fn name(&self) -> &str {
+        self.name.as_str()
+    }
+
+    pub(crate) fn code(&self) -> &[Bytecode] {
+        &self.code
+    }
+
+    pub(crate) fn type_parameters(&self) -> &[AbilitySet] {
+        &self.type_parameters
+    }
+
+    pub(crate) fn local_types(&self) -> &[Type] {
+        &self.local_types
+    }
+
+    pub(crate) fn return_types(&self) -> &[Type] {
+        &self.return_types
+    }
+
+    pub(crate) fn parameter_types(&self) -> &[Type] {
+        &self.parameter_types
+    }
+
+    pub(crate) fn pretty_string(&self) -> String {
+        match &self.scope {
+            Scope::Script(_) => "Script::main".into(),
+            Scope::Module(id) => format!(
+                "0x{}::{}::{}",
+                id.address(),
+                id.name().as_str(),
+                self.name.as_str()
+            ),
+        }
+    }
+
+    pub(crate) fn is_native(&self) -> bool {
+        self.def_is_native
+    }
+
+    pub(crate) fn is_friend_or_private(&self) -> bool {
+        self.def_is_friend_or_private
+    }
+
+    pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        self.native.as_deref().ok_or_else(|| {
+            PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                .with_message(format!("Missing Native Function `{}`", self.name))
+        })
+    }
+}
+
+//
+// Internal structures that are saved at the proper index in the proper tables to access
+// execution information (interpreter).
+// The following structs are internal to the loader and never exposed out.
+// The `Loader` will create those struct and the proper table when loading a module.
+// The `Resolver` uses those structs to return information to the `Interpreter`.
+//
+
+// A function instantiation.
+#[derive(Debug)]
+struct FunctionInstantiation {
+    // index to `ModuleCache::functions` global table
+    handle: usize,
+    instantiation: Vec<Type>,
+}
+
+#[derive(Debug)]
+struct StructDef {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index
+    idx: CachedStructIndex,
+}
+
+#[derive(Debug)]
+struct StructInstantiation {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    def: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+// A field handle. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldHandle {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    owner: CachedStructIndex,
+}
+
+// A field instantiation. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldInstantiation {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    #[allow(unused)]
+    owner: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+//
+// Cache for data associated to a Struct, used for de/serialization and more
+//
+
+struct StructInfo {
+    struct_tag: Option<StructTag>,
+    struct_layout: Option<MoveStructLayout>,
+    annotated_struct_layout: Option<MoveStructLayout>,
+    node_count: Option<usize>,
+    annotated_node_count: Option<usize>,
+}
+
+impl StructInfo {
+    fn new() -> Self {
+        Self {
+            struct_tag: None,
+            struct_layout: None,
+            annotated_struct_layout: None,
+            node_count: None,
+            annotated_node_count: None,
+        }
+    }
+}
+
+pub(crate) struct TypeCache {
+    structs: HashMap<CachedStructIndex, HashMap<Vec<Type>, StructInfo>>,
+}
+
+impl TypeCache {
+    fn new() -> Self {
+        Self {
+            structs: HashMap::new(),
+        }
+    }
+}
+
+/// Maximal depth of a value in terms of type depth.
+const VALUE_DEPTH_MAX: usize = 128;
+
+/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// fields for struct types.
+const MAX_TYPE_TO_LAYOUT_NODES: usize = 256;
+
+/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
+/// field types of structs.
+const MAX_TYPE_INSTANTIATION_NODES: usize = 128;
+
+impl Loader {
+    fn struct_gidx_to_type_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<StructTag> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(struct_tag) = &struct_info.struct_tag {
+                    return Ok(struct_tag.clone());
+                }
+            }
+        }
+
+        let ty_arg_tags = ty_args
+            .iter()
+            .map(|ty| self.type_to_type_tag(ty))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        let struct_tag = StructTag {
+            address: *struct_type.module.address(),
+            module: struct_type.module.name().to_owned(),
+            name: struct_type.name.clone(),
+            type_params: ty_arg_tags,
+        };
+
+        self.type_cache
+            .write()
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new)
+            .struct_tag = Some(struct_tag.clone());
+
+        Ok(struct_tag)
+    }
+
+    fn type_to_type_tag_impl(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        Ok(match ty {
+            Type::Bool => TypeTag::Bool,
+            Type::U8 => TypeTag::U8,
+            Type::U16 => TypeTag::U16,
+            Type::U32 => TypeTag::U32,
+            Type::U64 => TypeTag::U64,
+            Type::U128 => TypeTag::U128,
+            Type::U256 => TypeTag::U256,
+            Type::Address => TypeTag::Address,
+            Type::Signer => TypeTag::Signer,
+            Type::Vector(ty) => TypeTag::Vector(Box::new(self.type_to_type_tag(ty)?)),
+            Type::Struct(gidx) => {
+                TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(*gidx, &[])?))
+            },
+            Type::StructInstantiation(gidx, ty_args) => {
+                TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(*gidx, ty_args)?))
+            },
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type tag for {:?}", ty)),
+                );
+            },
+        })
+    }
+
+    fn count_type_nodes(&self, ty: &Type) -> usize {
+        let mut todo = vec![ty];
+        let mut result = 0;
+        while let Some(ty) = todo.pop() {
+            match ty {
+                Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                    result += 1;
+                    todo.push(ty);
+                },
+                Type::StructInstantiation(_, ty_args) => {
+                    result += 1;
+                    todo.extend(ty_args.iter())
+                },
+                _ => {
+                    result += 1;
+                },
+            }
+        }
+        result
+    }
+
+    fn struct_gidx_to_type_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut usize,
+        depth: usize,
+    ) -> PartialVMResult<MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(node_count) = &struct_info.node_count {
+                    *count += *node_count
+                }
+                if let Some(layout) = &struct_info.struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let count_before = *count;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        let field_tys = struct_type
+            .fields
+            .iter()
+            .map(|ty| self.subst(ty, ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_layouts = field_tys
+            .iter()
+            .map(|ty| self.type_to_type_layout_impl(ty, count, depth + 1))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_node_count = *count - count_before;
+
+        let struct_layout = MoveStructLayout::new(field_layouts);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.struct_layout = Some(struct_layout.clone());
+        info.node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_type_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut usize,
+        depth: usize,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        Ok(match ty {
+            Type::Bool => {
+                *count += 1;
+                MoveTypeLayout::Bool
+            },
+            Type::U8 => {
+                *count += 1;
+                MoveTypeLayout::U8
+            },
+            Type::U16 => {
+                *count += 1;
+                MoveTypeLayout::U16
+            },
+            Type::U32 => {
+                *count += 1;
+                MoveTypeLayout::U32
+            },
+            Type::U64 => {
+                *count += 1;
+                MoveTypeLayout::U64
+            },
+            Type::U128 => {
+                *count += 1;
+                MoveTypeLayout::U128
+            },
+            Type::U256 => {
+                *count += 1;
+                MoveTypeLayout::U256
+            },
+            Type::Address => {
+                *count += 1;
+                MoveTypeLayout::Address
+            },
+            Type::Signer => {
+                *count += 1;
+                MoveTypeLayout::Signer
+            },
+            Type::Vector(ty) => {
+                *count += 1;
+                MoveTypeLayout::Vector(Box::new(self.type_to_type_layout_impl(
+                    ty,
+                    count,
+                    depth + 1,
+                )?))
+            },
+            Type::Struct(gidx) => {
+                *count += 1;
+                MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(*gidx, &[], count, depth)?)
+            },
+            Type::StructInstantiation(gidx, ty_args) => {
+                *count += 1;
+                MoveTypeLayout::Struct(
+                    self.struct_gidx_to_type_layout(*gidx, ty_args, count, depth)?,
+                )
+            },
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            },
+        })
+    }
+
+    fn struct_gidx_to_fully_annotated_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut usize,
+        depth: usize,
+    ) -> PartialVMResult<MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(annotated_node_count) = &struct_info.annotated_node_count {
+                    *count += *annotated_node_count
+                }
+                if let Some(layout) = &struct_info.annotated_struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        if struct_type.fields.len() != struct_type.field_names.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Field types did not match the length of field names in loaded struct"
+                        .to_owned(),
+                ),
+            );
+        }
+        let count_before = *count;
+        let struct_tag = self.struct_gidx_to_type_tag(gidx, ty_args)?;
+        let field_layouts = struct_type
+            .field_names
+            .iter()
+            .zip(&struct_type.fields)
+            .map(|(n, ty)| {
+                let ty = self.subst(ty, ty_args)?;
+                let l = self.type_to_fully_annotated_layout_impl(&ty, count, depth + 1)?;
+                Ok(MoveFieldLayout::new(n.clone(), l))
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_layout = MoveStructLayout::with_types(struct_tag, field_layouts);
+        let field_node_count = *count - count_before;
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.annotated_struct_layout = Some(struct_layout.clone());
+        info.annotated_node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_fully_annotated_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut usize,
+        depth: usize,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        Ok(match ty {
+            Type::Bool => MoveTypeLayout::Bool,
+            Type::U8 => MoveTypeLayout::U8,
+            Type::U16 => MoveTypeLayout::U16,
+            Type::U32 => MoveTypeLayout::U32,
+            Type::U64 => MoveTypeLayout::U64,
+            Type::U128 => MoveTypeLayout::U128,
+            Type::U256 => MoveTypeLayout::U256,
+            Type::Address => MoveTypeLayout::Address,
+            Type::Signer => MoveTypeLayout::Signer,
+            Type::Vector(ty) => MoveTypeLayout::Vector(Box::new(
+                self.type_to_fully_annotated_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, &[], count, depth)?,
+            ),
+            Type::StructInstantiation(gidx, ty_args) => MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            },
+        })
+    }
+
+    pub(crate) fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty)
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_type_layout_impl(ty, &mut count, 1)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_fully_annotated_layout_impl(ty, &mut count, 1)
+    }
+}
+
+// Public APIs for external uses.
+impl Loader {
+    pub(crate) fn get_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &TransactionDataCache,
+    ) -> VMResult<MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_type_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &TransactionDataCache,
+    ) -> VMResult<MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_fully_annotated_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/logging.rs b/vendors/move/crates/move-vm/runtime/src/logging.rs
new file mode 100644
index 000000000..8f4388417
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/logging.rs
@@ -0,0 +1,42 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, VMError};
+use move_core_types::vm_status::{StatusCode, StatusType};
+//
+// Utility functions
+//
+
+pub fn expect_no_verification_errors(err: VMError) -> VMError {
+    match err.status_type() {
+        status_type @ StatusType::Deserialization | status_type @ StatusType::Verification => {
+            let message = format!(
+                "Unexpected verifier/deserialization error! This likely means there is code \
+                stored on chain that is unverifiable!\nError: {:?}",
+                &err
+            );
+            let (
+                _old_status,
+                _old_sub_status,
+                _old_message,
+                _stacktrace,
+                location,
+                indices,
+                offsets,
+            ) = err.all_data();
+            let major_status = match status_type {
+                StatusType::Deserialization => StatusCode::UNEXPECTED_DESERIALIZATION_ERROR,
+                StatusType::Verification => StatusCode::UNEXPECTED_VERIFIER_ERROR,
+                _ => unreachable!(),
+            };
+
+            PartialVMError::new(major_status)
+                .with_message(message)
+                .at_indices(indices)
+                .at_code_offsets(offsets)
+                .finish(location)
+        },
+        _ => err,
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/move_vm.rs b/vendors/move/crates/move-vm/runtime/src/move_vm.rs
new file mode 100644
index 000000000..c10388dfb
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/move_vm.rs
@@ -0,0 +1,126 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    config::VMConfig, data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    native_functions::NativeFunction, runtime::VMRuntime, session::Session,
+};
+use move_binary_format::{
+    errors::{Location, VMResult},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    metadata::Metadata, resolver::MoveResolver,
+};
+use std::{collections::BTreeSet, sync::Arc};
+
+pub struct MoveVM {
+    runtime: VMRuntime,
+}
+
+impl MoveVM {
+    pub fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    ) -> VMResult<Self> {
+        Self::new_with_config(natives, VMConfig::default())
+    }
+
+    pub fn new_with_config(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> VMResult<Self> {
+        Ok(Self {
+            runtime: VMRuntime::new(natives, vm_config)
+                .map_err(|err| err.finish(Location::Undefined))?,
+        })
+    }
+
+    /// Create a new Session backed by the given storage.
+    ///
+    /// Right now it is the caller's responsibility to ensure cache coherence of the Move VM Loader
+    ///   - When a module gets published in a Move VM Session, and then gets used by another
+    ///     transaction, it will be loaded into the code cache and stay there even if the resulted
+    ///     effects do not get commited back to the storage when the Session ends.
+    ///   - As a result, if one wants to have multiple sessions at a time, one needs to make sure
+    ///     none of them will try to publish a module. In other words, if there is a module publishing
+    ///     Session it must be the only Session existing.
+    ///   - In general, a new Move VM needs to be created whenever the storage gets modified by an
+    ///     outer envrionment, or otherwise the states may be out of sync. There are a few exceptional
+    ///     cases where this may not be necessary, with the most notable one being the common module
+    ///     publishing flow: you can keep using the same Move VM if you publish some modules in a Session
+    ///     and apply the effects to the storage when the Session ends.
+    pub fn new_session<'r>(&self, remote: &'r dyn MoveResolver) -> Session<'r, '_> {
+        self.runtime.new_session(remote)
+    }
+
+    /// Create a new session, as in `new_session`, but provide native context extensions.
+    pub fn new_session_with_extensions<'r>(
+        &self,
+        remote: &'r dyn MoveResolver,
+        extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_> {
+        self.runtime.new_session_with_extensions(remote, extensions)
+    }
+
+    /// Load a module into VM's code cache
+    pub fn load_module<'r>(
+        &self,
+        module_id: &ModuleId,
+        remote: &'r dyn MoveResolver,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.runtime
+            .loader()
+            .load_module(module_id, &TransactionDataCache::new(remote))
+            .map(|arc_module| arc_module.arc_module())
+    }
+
+    /// Allows the adapter to announce to the VM that the code loading cache should be considered
+    /// outdated. This can happen if the adapter executed a particular code publishing transaction
+    /// but decided to not commit the result to the data store. Because the code cache currently
+    /// does not support deletion, the cache will, incorrectly, still contain this module.
+    /// TODO: new loader architecture
+    pub fn mark_loader_cache_as_invalid(&self) {
+        self.runtime.loader().mark_as_invalid()
+    }
+
+    /// Returns true if the loader cache has been invalidated (either by explicit call above
+    /// or by the runtime)
+    pub fn is_loader_cache_invalidated(&self) -> bool {
+        self.runtime.loader().is_invalidated()
+    }
+
+    /// If the loader cache has been invalidated (either by the above call or by internal logic)
+    /// flush it so it is valid again. Notice that should only be called if there are no
+    /// outstanding sessions created from this VM.
+    /// TODO: new loader architecture
+    pub fn flush_loader_cache_if_invalidated(&self) {
+        self.runtime.loader().flush_if_invalidated()
+    }
+
+    /// Gets and clears module cache hits. This is hack which allows the adapter to see module
+    /// reads if executing multiple transactions in a VM. Without this, the adapter only sees
+    /// the first load of a module.
+    /// TODO: new loader architecture
+    pub fn get_and_clear_module_cache_hits(&self) -> BTreeSet<ModuleId> {
+        self.runtime.loader().get_and_clear_module_cache_hits()
+    }
+
+    /// Attempts to discover metadata in a given module with given key. Availability
+    /// of this data may depend on multiple aspects. In general, no hard assumptions of
+    /// availability should be made, but typically, one can expect that
+    /// the modules which have been involved in the execution of the last session are available.
+    ///
+    /// This is called by an adapter to extract, for example, debug information out of
+    /// the metadata section of the code for post mortem analysis. Notice that because
+    /// of ownership of the underlying binary representation of modules hidden behind an rwlock,
+    /// this actually has to hand back a copy of the associated metadata, so metadata should
+    /// be organized keeping this in mind.
+    ///
+    /// TODO: in the new loader architecture, as the loader is visible to the adapter, one would
+    ///   call this directly via the loader instead of the VM.
+    pub fn get_module_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        self.runtime.loader().get_metadata(module, key)
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/native_extensions.rs b/vendors/move/crates/move-vm/runtime/src/native_extensions.rs
new file mode 100644
index 000000000..e75c50c8d
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/native_extensions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use better_any::{Tid, TidAble, TidExt};
+use std::{any::TypeId, collections::HashMap};
+
+/// A data type to represent a heterogeneous collection of extensions which are available to
+/// native functions. A value to this is passed into the session function execution.
+///
+/// The implementation uses the crate `better_any` which implements a version of the `Any`
+/// type, called `Tid<`a>`, which allows for up to one lifetime parameter. This
+/// avoids that extensions need to have `'static` lifetime, which `Any` requires. In order to make a
+/// struct suitable to be a 'Tid', use `#[derive(Tid)]` in the struct declaration. (See also
+/// tests at the end of this module.)
+#[derive(Default)]
+pub struct NativeContextExtensions<'a> {
+    map: HashMap<TypeId, Box<dyn Tid<'a>>>,
+}
+
+impl<'a> NativeContextExtensions<'a> {
+    pub fn add<T: TidAble<'a>>(&mut self, ext: T) {
+        assert!(
+            self.map.insert(T::id(), Box::new(ext)).is_none(),
+            "multiple extensions of the same type not allowed"
+        )
+    }
+
+    pub fn get<T: TidAble<'a>>(&self) -> &T {
+        self.map
+            .get(&T::id())
+            .expect("extension unknown")
+            .as_ref()
+            .downcast_ref::<T>()
+            .unwrap()
+    }
+
+    pub fn get_mut<T: TidAble<'a>>(&mut self) -> &mut T {
+        self.map
+            .get_mut(&T::id())
+            .expect("extension unknown")
+            .as_mut()
+            .downcast_mut::<T>()
+            .unwrap()
+    }
+
+    pub fn remove<T: TidAble<'a>>(&mut self) -> T {
+        // can't use expect below because it requires `T: Debug`.
+        match self
+            .map
+            .remove(&T::id())
+            .expect("extension unknown")
+            .downcast_box::<T>()
+        {
+            Ok(val) => *val,
+            Err(_) => panic!("downcast error"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::native_extensions::NativeContextExtensions;
+    use better_any::{Tid, TidAble};
+
+    #[derive(Tid)]
+    struct Ext<'a> {
+        a: &'a mut u64,
+    }
+
+    #[test]
+    fn non_static_ext() {
+        let mut v: u64 = 23;
+        let e = Ext { a: &mut v };
+        let mut exts = NativeContextExtensions::default();
+        exts.add(e);
+        *exts.get_mut::<Ext>().a += 1;
+        assert_eq!(*exts.get_mut::<Ext>().a, 24);
+        *exts.get_mut::<Ext>().a += 1;
+        let e1 = exts.remove::<Ext>();
+        assert_eq!(*e1.a, 25)
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/native_functions.rs b/vendors/move/crates/move-vm/runtime/src/native_functions.rs
new file mode 100644
index 000000000..3446e6e4f
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/native_functions.rs
@@ -0,0 +1,199 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache, interpreter::Interpreter, loader::Resolver,
+    native_extensions::NativeContextExtensions,
+};
+use move_binary_format::errors::{
+    ExecutionState, Location, PartialVMError, PartialVMResult, VMResult,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, NumBytes},
+    identifier::Identifier,
+    language_storage::TypeTag,
+    value::MoveTypeLayout,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value,
+};
+use std::{
+    collections::{HashMap, VecDeque},
+    fmt::Write,
+    sync::Arc,
+};
+
+pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>
+    + Send
+    + Sync
+    + 'static;
+
+pub type NativeFunction = Arc<UnboxedNativeFunction>;
+
+pub type NativeFunctionTable = Vec<(AccountAddress, Identifier, Identifier, NativeFunction)>;
+
+pub fn make_table(
+    addr: AccountAddress,
+    elems: &[(&str, &str, NativeFunction)],
+) -> NativeFunctionTable {
+    make_table_from_iter(addr, elems.iter().cloned())
+}
+
+pub fn make_table_from_iter<S: Into<Box<str>>>(
+    addr: AccountAddress,
+    elems: impl IntoIterator<Item = (S, S, NativeFunction)>,
+) -> NativeFunctionTable {
+    elems
+        .into_iter()
+        .map(|(module_name, func_name, func)| {
+            (
+                addr,
+                Identifier::new(module_name).unwrap(),
+                Identifier::new(func_name).unwrap(),
+                func,
+            )
+        })
+        .collect()
+}
+
+pub(crate) struct NativeFunctions(
+    HashMap<AccountAddress, HashMap<String, HashMap<String, NativeFunction>>>,
+);
+
+impl NativeFunctions {
+    pub fn resolve(
+        &self,
+        addr: &AccountAddress,
+        module_name: &str,
+        func_name: &str,
+    ) -> Option<NativeFunction> {
+        self.0.get(addr)?.get(module_name)?.get(func_name).cloned()
+    }
+
+    pub fn new<I>(natives: I) -> PartialVMResult<Self>
+    where
+        I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    {
+        let mut map = HashMap::new();
+        for (addr, module_name, func_name, func) in natives.into_iter() {
+            let modules = map.entry(addr).or_insert_with(HashMap::new);
+            let funcs = modules
+                .entry(module_name.into_string())
+                .or_insert_with(HashMap::new);
+
+            if funcs.insert(func_name.into_string(), func).is_some() {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_NATIVE_FUNCTION));
+            }
+        }
+        Ok(Self(map))
+    }
+}
+
+pub struct NativeContext<'a, 'b, 'c> {
+    interpreter: &'a mut Interpreter,
+    data_store: &'a mut TransactionDataCache<'c>,
+    resolver: &'a Resolver<'a>,
+    extensions: &'a mut NativeContextExtensions<'b>,
+    gas_balance: InternalGas,
+}
+
+impl<'a, 'b, 'c> NativeContext<'a, 'b, 'c> {
+    pub(crate) fn new(
+        interpreter: &'a mut Interpreter,
+        data_store: &'a mut TransactionDataCache<'c>,
+        resolver: &'a Resolver<'a>,
+        extensions: &'a mut NativeContextExtensions<'b>,
+        gas_balance: InternalGas,
+    ) -> Self {
+        Self {
+            interpreter,
+            data_store,
+            resolver,
+            extensions,
+            gas_balance,
+        }
+    }
+}
+
+impl<'a, 'b, 'c> NativeContext<'a, 'b, 'c> {
+    pub fn print_stack_trace<B: Write>(&self, buf: &mut B) -> PartialVMResult<()> {
+        self.interpreter
+            .debug_print_stack_trace(buf, self.resolver.loader())
+    }
+
+    pub fn exists_at(
+        &mut self,
+        address: AccountAddress,
+        type_: &Type,
+    ) -> VMResult<(bool, Option<Option<NumBytes>>)> {
+        let (value, num_bytes) = self
+            .data_store
+            .load_resource(self.resolver.loader(), address, type_)
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let exists = value
+            .exists()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        Ok((exists, num_bytes))
+    }
+
+    pub fn save_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<bool> {
+        match self
+            .data_store
+            .emit_event(self.resolver.loader(), guid, seq_num, ty, val)
+        {
+            Ok(()) => Ok(true),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(false),
+        }
+    }
+
+    pub fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_type_tag(ty)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<Option<MoveTypeLayout>> {
+        match self.resolver.type_to_type_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<Option<MoveTypeLayout>> {
+        match self.resolver.type_to_fully_annotated_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn extensions(&self) -> &NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    pub fn extensions_mut(&mut self) -> &mut NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    /// Get count stack frames, including the one of the called native function. This
+    /// allows a native function to reflect about its caller.
+    pub fn stack_frames(&self, count: usize) -> ExecutionState {
+        self.interpreter.get_stack_frames(count)
+    }
+
+    pub fn gas_balance(&self) -> InternalGas {
+        self.gas_balance
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/runtime.rs b/vendors/move/crates/move-vm/runtime/src/runtime.rs
new file mode 100644
index 000000000..2a51e68f2
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/runtime.rs
@@ -0,0 +1,520 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    config::VMConfig,
+    data_cache::TransactionDataCache,
+    interpreter::Interpreter,
+    loader::{Function, LoadedFunction, Loader},
+    native_extensions::NativeContextExtensions,
+    native_functions::{NativeFunction, NativeFunctions},
+    session::{LoadedFunctionInstantiation, SerializedReturnValues, Session},
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    compatibility::Compatibility,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::LocalIndex,
+    normalized, CompiledModule, IndexKind,
+};
+use move_bytecode_verifier::script_signature;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    gas::GasMeter,
+    loaded_data::runtime_types::Type,
+    values::{Locals, Reference, VMValueCast, Value},
+};
+use std::{borrow::Borrow, collections::BTreeSet, sync::Arc};
+
+/// An instantiation of the MoveVM.
+pub(crate) struct VMRuntime {
+    loader: Loader,
+}
+
+impl VMRuntime {
+    pub(crate) fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> PartialVMResult<Self> {
+        Ok(VMRuntime {
+            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
+        })
+    }
+
+    pub fn new_session<'r>(&self, remote: &'r dyn MoveResolver) -> Session<'r, '_> {
+        self.new_session_with_extensions(remote, NativeContextExtensions::default())
+    }
+
+    pub fn new_session_with_extensions<'r>(
+        &self,
+        remote: &'r dyn MoveResolver,
+        native_extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_> {
+        Session {
+            runtime: self,
+            data_cache: TransactionDataCache::new(remote),
+            native_extensions,
+        }
+    }
+
+    pub(crate) fn publish_module_bundle(
+        &self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        data_store: &mut TransactionDataCache,
+        _gas_meter: &mut impl GasMeter,
+        compat: Compatibility,
+    ) -> VMResult<()> {
+        // deserialize the modules. Perform bounds check. After this indexes can be
+        // used with the `[]` operator
+        let compiled_modules = match modules
+            .iter()
+            .map(|blob| {
+                CompiledModule::deserialize_with_max_version(
+                    blob,
+                    self.loader.vm_config().max_binary_format_version,
+                )
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+        {
+            Ok(modules) => modules,
+            Err(err) => {
+                return Err(err
+                    .append_message_with_separator(
+                        '\n',
+                        "[VM] module deserialization failed".to_string(),
+                    )
+                    .finish(Location::Undefined));
+            },
+        };
+
+        // Make sure all modules' self addresses matches the transaction sender. The self address is
+        // where the module will actually be published. If we did not check this, the sender could
+        // publish a module under anyone's account.
+        for module in &compiled_modules {
+            if module.address() != &sender {
+                return Err(verification_error(
+                    StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER,
+                    IndexKind::AddressIdentifier,
+                    module.self_handle_idx().0,
+                )
+                .finish(Location::Undefined));
+            }
+        }
+
+        // Collect ids for modules that are published together
+        let mut bundle_unverified = BTreeSet::new();
+
+        // For now, we assume that all modules can be republished, as long as the new module is
+        // backward compatible with the old module.
+        //
+        // TODO: in the future, we may want to add restrictions on module republishing, possibly by
+        // changing the bytecode format to include an `is_upgradable` flag in the CompiledModule.
+        for module in &compiled_modules {
+            let module_id = module.self_id();
+
+            if data_store.exists_module(&module_id)? && compat.need_check_compat() {
+                let old_module_ref = self.loader.load_module(&module_id, data_store)?;
+                let old_module = old_module_ref.module();
+                let old_m = normalized::Module::new(old_module);
+                let new_m = normalized::Module::new(module);
+                compat
+                    .check(&old_m, &new_m)
+                    .map_err(|e| e.finish(Location::Undefined))?;
+            }
+            if !bundle_unverified.insert(module_id) {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
+                    .finish(Location::Undefined));
+            }
+        }
+
+        // Perform bytecode and loading verification. Modules must be sorted in topological order.
+        self.loader
+            .verify_module_bundle_for_publication(&compiled_modules, data_store)?;
+
+        // NOTE: we want to (informally) argue that all modules pass the linking check before being
+        // published to the data store.
+        //
+        // The linking check consists of two checks actually
+        // - dependencies::verify_module(module, all_imm_deps)
+        // - cyclic_dependencies::verify_module(module, fn_imm_deps, fn_imm_friends)
+        //
+        // [Claim 1]
+        // We show that the `dependencies::verify_module` check is always satisfied whenever a
+        // module M is published or updated and the `all_imm_deps` contains the actual modules
+        // required by M.
+        //
+        // Suppose M depends on D, and we now consider the following scenarios:
+        // 1) D does not appear in the bundle together with M
+        // -- In this case, D must be either in the code cache or in the data store which can be
+        //    loaded into the code cache (and pass all checks on D).
+        //    - If D is missing, the linking will fail and return an error.
+        //    - If D exists, D will be added to the `all_imm_deps` arg when checking M.
+        //
+        // 2) D appears in the bundle *before* M
+        // -- In this case, regardless of whether D is in code cache or not, D will be put into the
+        //    `bundle_verified` argument and modules in `bundle_verified` will be prioritized before
+        //    returning a module in code cache.
+        //
+        // 3) D appears in the bundle *after* M
+        // -- This technically should be discouraged but this is user input so we cannot have this
+        //    assumption here. But nevertheless, we can still make the claim 1 even in this case.
+        //    When M is verified, flow 1) is effectively activated, which means:
+        //    - If the code cache or the data store does not contain a D' which has the same name
+        //      with D, then the linking will fail and return an error.
+        //    - If D' exists, and M links against D', then when verifying D in a later time point,
+        //      a compatibility check will be invoked to ensure that D is compatible with D',
+        //      meaning, whichever module that links against D' will have to link against D as well.
+        //
+        // [Claim 2]
+        // We show that the `cyclic_dependencies::verify_module` check is always satisfied whenever
+        // a module M is published or updated and the dep/friend modules returned by the transitive
+        // dependency closure functions are valid.
+        //
+        // Currently, the code is written in a way that, from the view point of the
+        // `cyclic_dependencies::verify_module` check, modules checked prior to module M in the same
+        // bundle looks as if they have already been published and loaded to the code cache.
+        //
+        // Therefore, if M forms a cyclic dependency with module A in the same bundle that is
+        // checked prior to M, such an error will be detected. However, if M forms a cyclic
+        // dependency with a module X that appears in the same bundle *after* M. The cyclic
+        // dependency can only be caught when X is verified.
+        //
+        // In summary: the code is written in a way that, certain checks are skipped while checking
+        // each individual module in the bundle in order. But if every module in the bundle pass
+        // all the checks, then the whole bundle can be published/upgraded together. Otherwise,
+        // none of the module can be published/updated.
+
+        // All modules verified, publish them to data cache
+        for (module, blob) in compiled_modules.into_iter().zip(modules.into_iter()) {
+            let is_republishing = data_store.exists_module(&module.self_id())?;
+            if is_republishing {
+                // This is an upgrade, so invalidate the loader cache, which still contains the
+                // old module.
+                self.loader.mark_as_invalid();
+            }
+            data_store.publish_module(&module.self_id(), blob, is_republishing)?;
+        }
+        Ok(())
+    }
+
+    fn deserialize_value(&self, ty: &Type, arg: impl Borrow<[u8]>) -> PartialVMResult<Value> {
+        let layout = match self.loader.type_to_type_layout(ty) {
+            Ok(layout) => layout,
+            Err(_err) => {
+                return Err(PartialVMError::new(
+                    StatusCode::INVALID_PARAM_TYPE_FOR_DESERIALIZATION,
+                )
+                .with_message("[VM] failed to get layout from type".to_string()));
+            },
+        };
+
+        match Value::simple_deserialize(arg.borrow(), &layout) {
+            Some(val) => Ok(val),
+            None => Err(
+                PartialVMError::new(StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT)
+                    .with_message("[VM] failed to deserialize argument".to_string()),
+            ),
+        }
+    }
+
+    fn deserialize_args(
+        &self,
+        arg_tys: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+    ) -> PartialVMResult<(Locals, Vec<Value>)> {
+        if arg_tys.len() != serialized_args.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "argument length mismatch: expected {} got {}",
+                        arg_tys.len(),
+                        serialized_args.len()
+                    ),
+                ),
+            );
+        }
+
+        // Create a list of dummy locals. Each value stored will be used be borrowed and passed
+        // by reference to the invoked function
+        let mut dummy_locals = Locals::new(arg_tys.len());
+        // Arguments for the invoked function. These can be owned values or references
+        let deserialized_args = arg_tys
+            .into_iter()
+            .zip(serialized_args)
+            .enumerate()
+            .map(|(idx, (arg_ty, arg_bytes))| match &arg_ty {
+                Type::MutableReference(inner_t) | Type::Reference(inner_t) => {
+                    dummy_locals.store_loc(
+                        idx,
+                        self.deserialize_value(inner_t, arg_bytes)?,
+                        self.loader
+                            .vm_config()
+                            .enable_invariant_violation_check_in_swap_loc,
+                    )?;
+                    dummy_locals.borrow_loc(idx)
+                },
+                _ => self.deserialize_value(&arg_ty, arg_bytes),
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        Ok((dummy_locals, deserialized_args))
+    }
+
+    fn serialize_return_value(
+        &self,
+        ty: &Type,
+        value: Value,
+    ) -> PartialVMResult<(Vec<u8>, MoveTypeLayout)> {
+        let (ty, value) = match ty {
+            Type::Reference(inner) | Type::MutableReference(inner) => {
+                let ref_value: Reference = value.cast().map_err(|_err| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "non reference value given for a reference typed return value".to_string(),
+                    )
+                })?;
+                let inner_value = ref_value.read_ref()?;
+                (&**inner, inner_value)
+            },
+            _ => (ty, value),
+        };
+
+        let layout = self.loader.type_to_type_layout(ty).map_err(|_err| {
+            PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
+                "entry point functions cannot have non-serializable return types".to_string(),
+            )
+        })?;
+        let bytes = value.simple_serialize(&layout).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to serialize return values".to_string())
+        })?;
+        Ok((bytes, layout))
+    }
+
+    fn serialize_return_values(
+        &self,
+        return_types: &[Type],
+        return_values: Vec<Value>,
+    ) -> PartialVMResult<Vec<(Vec<u8>, MoveTypeLayout)>> {
+        if return_types.len() != return_values.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "declared {} return types, but got {} return values",
+                        return_types.len(),
+                        return_values.len()
+                    ),
+                ),
+            );
+        }
+
+        return_types
+            .iter()
+            .zip(return_values)
+            .map(|(ty, value)| self.serialize_return_value(ty, value))
+            .collect()
+    }
+
+    #[allow(clippy::needless_collect)]
+    fn execute_function_impl(
+        &self,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+        param_types: Vec<Type>,
+        return_types: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        let arg_types = param_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let mut_ref_args = arg_types
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, ty)| match ty {
+                Type::MutableReference(inner) => Some((idx, inner.clone())),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        let (mut dummy_locals, deserialized_args) = self
+            .deserialize_args(arg_types, serialized_args)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let return_types = return_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_values = Interpreter::entrypoint(
+            func,
+            ty_args,
+            deserialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+            &self.loader,
+        )?;
+
+        let serialized_return_values = self
+            .serialize_return_values(&return_types, return_values)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let serialized_mut_ref_outputs = mut_ref_args
+            .into_iter()
+            .map(|(idx, ty)| {
+                // serialize return values first in the case that a value points into this local
+                let local_val = dummy_locals.move_loc(
+                    idx,
+                    self.loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                let (bytes, layout) = self.serialize_return_value(&ty, local_val)?;
+                Ok((idx as LocalIndex, bytes, layout))
+            })
+            .collect::<PartialVMResult<_>>()
+            .map_err(|e| e.finish(Location::Undefined))?;
+
+        // locals should not be dropped until all return values are serialized
+        std::mem::drop(dummy_locals);
+
+        Ok(SerializedReturnValues {
+            mutable_reference_outputs: serialized_mut_ref_outputs,
+            return_values: serialized_return_values,
+        })
+    }
+
+    pub(crate) fn execute_function(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<TypeTag>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        bypass_declared_entry_check: bool,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the function
+        let (module, function, instantiation) =
+            self.loader
+                .load_function(module, function_name, &ty_args, data_store)?;
+
+        self.execute_function_instantiation(
+            LoadedFunction { module, function },
+            instantiation,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    pub(crate) fn execute_function_instantiation(
+        &self,
+        func: LoadedFunction,
+        function_instantiation: LoadedFunctionInstantiation,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        bypass_declared_entry_check: bool,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the function
+        let LoadedFunctionInstantiation {
+            type_arguments,
+            parameters,
+            return_,
+        } = function_instantiation;
+
+        use move_binary_format::{binary_views::BinaryIndexedView, file_format::SignatureIndex};
+        fn check_is_entry(
+            _resolver: &BinaryIndexedView,
+            is_entry: bool,
+            _parameters_idx: SignatureIndex,
+            _return_idx: Option<SignatureIndex>,
+        ) -> PartialVMResult<()> {
+            if is_entry {
+                Ok(())
+            } else {
+                Err(PartialVMError::new(
+                    StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
+                ))
+            }
+        }
+        let additional_signature_checks = if bypass_declared_entry_check {
+            move_bytecode_verifier::no_additional_script_signature_checks
+        } else {
+            check_is_entry
+        };
+
+        let LoadedFunction { module, function } = func;
+
+        script_signature::verify_module_function_signature_by_name(
+            module.module(),
+            IdentStr::new(function.as_ref().name()).expect(""),
+            additional_signature_checks,
+        )?;
+
+        // execute the function
+        self.execute_function_impl(
+            function,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    // See Session::execute_script for what contracts to follow.
+    pub(crate) fn execute_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<TypeTag>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut TransactionDataCache,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the script, perform verification
+        let (
+            func,
+            LoadedFunctionInstantiation {
+                type_arguments,
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_script(script.borrow(), &ty_args, data_store)?;
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    pub(crate) fn loader(&self) -> &Loader {
+        &self.loader
+    }
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/session.rs b/vendors/move/crates/move-vm/runtime/src/session.rs
new file mode 100644
index 000000000..8ec590e7d
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/session.rs
@@ -0,0 +1,396 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache, loader::LoadedFunction,
+    native_extensions::NativeContextExtensions, runtime::VMRuntime,
+};
+use move_binary_format::{
+    compatibility::Compatibility,
+    errors::*,
+    file_format::{AbilitySet, LocalIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event},
+    gas_algebra::NumBytes,
+    identifier::IdentStr,
+    language_storage::{ModuleId, TypeTag},
+    value::MoveTypeLayout,
+};
+use move_vm_types::{
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+    values::GlobalValue,
+};
+use std::{borrow::Borrow, sync::Arc};
+
+pub struct Session<'r, 'l> {
+    pub(crate) runtime: &'l VMRuntime,
+    pub(crate) data_cache: TransactionDataCache<'r>,
+    pub(crate) native_extensions: NativeContextExtensions<'r>,
+}
+
+/// Serialized return values from function/script execution
+/// Simple struct is designed just to convey meaning behind serialized values
+#[derive(Debug)]
+pub struct SerializedReturnValues {
+    /// The value of any arguments that were mutably borrowed.
+    /// Non-mut borrowed values are not included
+    pub mutable_reference_outputs: Vec<(LocalIndex, Vec<u8>, MoveTypeLayout)>,
+    /// The return values from the function
+    pub return_values: Vec<(Vec<u8>, MoveTypeLayout)>,
+}
+
+impl<'r, 'l> Session<'r, 'l> {
+    /// Execute a Move function with the given arguments. This is mainly designed for an external
+    /// environment to invoke system logic written in Move.
+    ///
+    /// NOTE: There are NO checks on the `args` except that they can deserialize into the provided
+    /// types.
+    /// The ability to deserialize `args` into arbitrary types is *very* powerful, e.g. it can
+    /// used to manufacture `signer`'s or `Coin`'s from raw bytes. It is the responsibility of the
+    /// caller (e.g. adapter) to ensure that this power is used responsibly/securely for its
+    /// use-case.
+    ///
+    /// The caller MUST ensure
+    ///   - All types and modules referred to by the type arguments exist.
+    ///   - The signature is valid for the rules of the adapter
+    ///
+    /// The Move VM MUST return an invariant violation if the caller fails to follow any of the
+    /// rules above.
+    ///
+    /// The VM will check that the function is marked as an 'entry' function.
+    ///
+    /// Currently if any other error occurs during execution, the Move VM will simply propagate that
+    /// error back to the outer environment without handling/translating it. This behavior may be
+    /// revised in the future.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_entry_function(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<TypeTag>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = false;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Similar to execute_entry_function, but it bypasses visibility checks
+    pub fn execute_function_bypass_visibility(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<TypeTag>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = true;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    pub fn execute_instantiated_function(
+        &mut self,
+        func: LoadedFunction,
+        instantiation: LoadedFunctionInstantiation,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        self.runtime.execute_function_instantiation(
+            func,
+            instantiation,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            true,
+        )
+    }
+
+    /// Execute a transaction script.
+    ///
+    /// The Move VM MUST return a user error (in other words, an error that's not an invariant
+    /// violation) if
+    ///   - The script fails to deserialize or verify. Not all expressible signatures are valid.
+    ///     See `move_bytecode_verifier::script_signature` for the rules.
+    ///   - Type arguments refer to a non-existent type.
+    ///   - Arguments (senders included) fail to deserialize or fail to match the signature of the
+    ///     script function.
+    ///
+    /// If any other error occurs during execution, the Move VM MUST propagate that error back to
+    /// the caller.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_script(
+        &mut self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<TypeTag>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        self.runtime.execute_script(
+            script,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+        )
+    }
+
+    /// Publish the given module.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    ///   - The module fails to deserialize or verify.
+    ///   - The sender address does not match that of the module.
+    ///   - (Republishing-only) the module to be updated is not backward compatible with the old module.
+    ///   - (Republishing-only) the module to be updated introduces cyclic dependencies.
+    ///
+    /// The Move VM should not be able to produce other user errors.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module(
+        &mut self,
+        module: Vec<u8>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.publish_module_bundle(vec![module], sender, gas_meter)
+    }
+
+    /// Publish a series of modules.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    /// any module fails to deserialize or verify (see the full list of  failing conditions in the
+    /// `publish_module` API). The publishing of the module series is an all-or-nothing action:
+    /// either all modules are published to the data store or none is.
+    ///
+    /// Similar to the `publish_module` API, the Move VM should not be able to produce other user
+    /// errors. Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    ///
+    /// This operation performs compatibility checks if a module is replaced. See also
+    /// `move_binary_format::compatibility`.
+    pub fn publish_module_bundle(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            Compatibility::full_check(),
+        )
+    }
+
+    /// Same like `publish_module_bundle` but with a custom compatibility check.
+    pub fn publish_module_bundle_with_compat_config(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+        compat_config: Compatibility,
+    ) -> VMResult<()> {
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            compat_config,
+        )
+    }
+
+    pub fn publish_module_bundle_relax_compatibility(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            Compatibility::no_check(),
+        )
+    }
+
+    pub fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        self.data_cache.num_mutated_accounts(sender)
+    }
+
+    /// Finish up the session and produce the side effects.
+    ///
+    /// This function should always succeed with no user errors returned, barring invariant violations.
+    ///
+    /// This MUST NOT be called if there is a previous invocation that failed with an invariant violation.
+    pub fn finish(self) -> VMResult<(ChangeSet, Vec<Event>)> {
+        self.data_cache
+            .into_effects(self.runtime.loader())
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Same like `finish`, but also extracts the native context extensions from the session.
+    pub fn finish_with_extensions(
+        self,
+    ) -> VMResult<(ChangeSet, Vec<Event>, NativeContextExtensions<'r>)> {
+        let Session {
+            data_cache,
+            native_extensions,
+            ..
+        } = self;
+        let (change_set, events) = data_cache
+            .into_effects(self.runtime.loader())
+            .map_err(|e| e.finish(Location::Undefined))?;
+        Ok((change_set, events, native_extensions))
+    }
+
+    /// Try to load a resource from remote storage and create a corresponding GlobalValue
+    /// that is owned by the data store.
+    pub fn load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        self.data_cache
+            .load_resource(self.runtime.loader(), addr, ty)
+    }
+
+    /// Get the serialized format of a `CompiledModule` given a `ModuleId`.
+    pub fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
+        self.data_cache.load_module(module_id)
+    }
+
+    /// Check if this module exists.
+    pub fn exists_module(&self, module_id: &ModuleId) -> VMResult<bool> {
+        self.data_cache.exists_module(module_id)
+    }
+
+    /// Load a script and all of its types into cache
+    pub fn load_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<TypeTag>,
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, instantiation) =
+            self.runtime
+                .loader()
+                .load_script(script.borrow(), &ty_args, &self.data_cache)?;
+        Ok(instantiation)
+    }
+
+    /// Load a module, a function, and all of its types into cache
+    pub fn load_function_with_type_arg_inference(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        expected_return_type: &Type,
+    ) -> VMResult<(LoadedFunction, LoadedFunctionInstantiation)> {
+        let (func, instantiation) = self
+            .runtime
+            .loader()
+            .load_function_with_type_arg_inference(
+                module_id,
+                function_name,
+                expected_return_type,
+                &self.data_cache,
+            )?;
+        Ok((func, instantiation))
+    }
+
+    /// Load a module, a function, and all of its types into cache
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[TypeTag],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, instantiation) = self.runtime.loader().load_function(
+            module_id,
+            function_name,
+            type_arguments,
+            &self.data_cache,
+        )?;
+        Ok(instantiation)
+    }
+
+    pub fn load_type(&self, type_tag: &TypeTag) -> VMResult<Type> {
+        self.runtime.loader().load_type(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_layout(&self, type_tag: &TypeTag) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_fully_annotated_type_layout(&self, type_tag: &TypeTag) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_fully_annotated_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.runtime
+            .loader()
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Fetch a struct type from cache, if the index is in bounds
+    /// Helpful when paired with load_type, or any other API that returns 'Type'
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.runtime.loader().get_struct_type(index)
+    }
+
+    /// Gets the abilities for this type, at it's particular instantiation
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.runtime /**/
+            .loader()
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Gets the underlying native extensions.
+    pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
+        &mut self.native_extensions
+    }
+}
+
+pub struct LoadedFunctionInstantiation {
+    pub type_arguments: Vec<Type>,
+    pub parameters: Vec<Type>,
+    pub return_: Vec<Type>,
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/tracing.rs b/vendors/move/crates/move-vm/runtime/src/tracing.rs
new file mode 100644
index 000000000..eb6b6754e
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/tracing.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::debug::DebugContext;
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use ::{
+    move_binary_format::file_format::Bytecode,
+    move_vm_types::values::Locals,
+    once_cell::sync::Lazy,
+    std::{
+        env,
+        fs::{File, OpenOptions},
+        io::Write,
+        process,
+        sync::Mutex,
+        thread,
+    },
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_STEPPING_ENV_VAR_NAME: &str = "MOVE_VM_STEP";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static FILE_PATH: Lazy<String> = Lazy::new(|| {
+    env::var(MOVE_VM_TRACING_ENV_VAR_NAME).unwrap_or_else(|_| "move_vm_trace.trace".to_string())
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static TRACING_ENABLED: Lazy<bool> = Lazy::new(|| env::var(MOVE_VM_TRACING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUGGING_ENABLED: Lazy<bool> =
+    Lazy::new(|| env::var(MOVE_VM_STEPPING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
+    Mutex::new(
+        OpenOptions::new()
+            .write(true)
+            .create(true)
+            .append(true)
+            .open(&*FILE_PATH)
+            .unwrap(),
+    )
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUG_CONTEXT: Lazy<Mutex<DebugContext>> = Lazy::new(|| Mutex::new(DebugContext::new()));
+
+// Only include in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+pub(crate) fn trace(
+    function_desc: &Function,
+    locals: &Locals,
+    pc: u16,
+    instr: &Bytecode,
+    loader: &Loader,
+    interp: &Interpreter,
+) {
+    if *TRACING_ENABLED {
+        let f = &mut *LOGGING_FILE.lock().unwrap();
+        writeln!(
+            f,
+            "{}-{:?},{},{},{:?}",
+            process::id(),
+            thread::current().id(),
+            function_desc.pretty_string(),
+            pc,
+            instr,
+        )
+        .unwrap();
+    }
+    if *DEBUGGING_ENABLED {
+        DEBUG_CONTEXT
+            .lock()
+            .unwrap()
+            .debug_loop(function_desc, locals, pc, instr, loader, interp);
+    }
+}
+
+#[macro_export]
+macro_rules! trace {
+    ($function_desc:expr, $locals:expr, $pc:expr, $instr:tt, $resolver:expr, $interp:expr) => {
+        // Only include this code in debug releases
+        #[cfg(any(debug_assertions, feature = "debugging"))]
+        $crate::tracing::trace(
+            &$function_desc,
+            $locals,
+            $pc,
+            &$instr,
+            $resolver.loader(),
+            $interp,
+        )
+    };
+}
diff --git a/vendors/move/crates/move-vm/runtime/src/unit_tests/mod.rs b/vendors/move/crates/move-vm/runtime/src/unit_tests/mod.rs
new file mode 100644
index 000000000..d42522a38
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/unit_tests/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod vm_arguments_tests;
diff --git a/vendors/move/crates/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs b/vendors/move/crates/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
new file mode 100644
index 000000000..89bc0ec6b
--- /dev/null
+++ b/vendors/move/crates/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
@@ -0,0 +1,832 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::move_vm::MoveVM;
+use move_binary_format::{
+    errors::VMResult,
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex, Bytecode, CodeUnit, CompiledModule,
+        CompiledScript, FieldDefinition, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+        IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
+        TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    ident_str,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::{ModuleResolver, ResourceResolver},
+    u256::U256,
+    value::{serialize_values, MoveValue},
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::gas::UnmeteredGasMeter;
+use std::collections::HashMap;
+
+// make a script with a given signature for main.
+fn make_script(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        },
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+// make a script with an external function that has the same signature as
+// the main. That allows us to pass resources and make the verifier happy that
+// they are consumed.
+// Dependencies check happens after main signature check, so we should expect
+// a signature check error.
+fn make_script_with_non_linking_structs(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        },
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("one").unwrap(),
+            Identifier::new("two").unwrap(),
+            Identifier::new("three").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+fn make_module_with_function(
+    visibility: Visibility,
+    is_entry: bool,
+    parameters: Signature,
+    return_: Signature,
+    type_parameters: Vec<AbilitySet>,
+) -> (CompiledModule, Identifier) {
+    let function_name = Identifier::new("foo").unwrap();
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        },
+    };
+    let return_idx = match signatures.iter().enumerate().find(|(_, s)| *s == &return_) {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(return_);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        },
+    };
+    let module = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: parameters_idx,
+            return_: return_idx,
+            type_parameters,
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("M").unwrap(),
+            Identifier::new("X").unwrap(),
+            function_name.clone(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(1),
+                signature: TypeSignature(SignatureToken::Bool),
+            }]),
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility,
+            is_entry,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+            }),
+        }],
+    };
+    (module, function_name)
+}
+
+// make a script function with a given signature for main.
+fn make_script_function(signature: Signature) -> (CompiledModule, Identifier) {
+    make_module_with_function(
+        Visibility::Public,
+        true,
+        signature,
+        Signature(vec![]),
+        vec![],
+    )
+}
+
+struct RemoteStore {
+    modules: HashMap<ModuleId, Vec<u8>>,
+}
+
+impl RemoteStore {
+    fn new() -> Self {
+        Self {
+            modules: HashMap::new(),
+        }
+    }
+
+    fn add_module(&mut self, compiled_module: CompiledModule) {
+        let id = compiled_module.self_id();
+        let mut bytes = vec![];
+        compiled_module.serialize(&mut bytes).unwrap();
+        self.modules.insert(id, bytes);
+    }
+}
+
+impl ModuleResolver for RemoteStore {
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        Ok(self.modules.get(module_id).cloned())
+    }
+}
+
+impl ResourceResolver for RemoteStore {
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        Ok(None)
+    }
+}
+
+fn combine_signers_and_args(
+    signers: Vec<AccountAddress>,
+    non_signer_args: Vec<Vec<u8>>,
+) -> Vec<Vec<u8>> {
+    signers
+        .into_iter()
+        .map(|s| MoveValue::Signer(s).simple_serialize().unwrap())
+        .chain(non_signer_args)
+        .collect()
+}
+
+fn call_script_with_args_ty_args_signers(
+    script: Vec<u8>,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_args: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+    session
+        .execute_script(
+            script,
+            ty_args,
+            combine_signers_and_args(signers, non_signer_args),
+            &mut UnmeteredGasMeter,
+        )
+        .map(|_| ())
+}
+
+fn call_script(script: Vec<u8>, args: Vec<Vec<u8>>) -> VMResult<()> {
+    call_script_with_args_ty_args_signers(script, args, vec![], vec![])
+}
+
+fn call_script_function_with_args_ty_args_signers(
+    module: CompiledModule,
+    function_name: Identifier,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_args: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let id = module.self_id();
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+    session.execute_function_bypass_visibility(
+        &id,
+        function_name.as_ident_str(),
+        ty_args,
+        combine_signers_and_args(signers, non_signer_args),
+        &mut UnmeteredGasMeter,
+    )?;
+    Ok(())
+}
+
+fn call_script_function(
+    module: CompiledModule,
+    function_name: Identifier,
+    args: Vec<Vec<u8>>,
+) -> VMResult<()> {
+    call_script_function_with_args_ty_args_signers(module, function_name, args, vec![], vec![])
+}
+
+// these signatures used to be bad, but there are no bad signatures for scripts at the VM
+fn deprecated_bad_signatures() -> Vec<Signature> {
+    vec![
+        // struct in signature
+        Signature(vec![SignatureToken::Struct(StructHandleIndex(0))]),
+        // struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Struct(StructHandleIndex(0)),
+            SignatureToken::U64,
+        ]),
+        // reference to struct in signature
+        Signature(vec![
+            SignatureToken::Address,
+            SignatureToken::MutableReference(Box::new(SignatureToken::Struct(StructHandleIndex(
+                0,
+            )))),
+        ]),
+        // vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+            SignatureToken::U64,
+        ]),
+        // vector of vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                SignatureToken::Struct(StructHandleIndex(0)),
+            )))),
+            SignatureToken::U64,
+        ]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+        ))]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U64,
+        ))]),
+        // `&Signer` in signature (not `Signer`)
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // vector of `Signer` in signature
+        Signature(vec![SignatureToken::Vector(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // `Signer` ref not first arg
+        Signature(vec![SignatureToken::Bool, SignatureToken::Signer]),
+    ]
+}
+
+fn good_signatures_and_arguments() -> Vec<(Signature, Vec<MoveValue>)> {
+    vec![
+        // U128 arg
+        (Signature(vec![SignatureToken::U128]), vec![
+            MoveValue::U128(0),
+        ]),
+        // U8 arg
+        (Signature(vec![SignatureToken::U8]), vec![MoveValue::U8(0)]),
+        // U16 arg
+        (Signature(vec![SignatureToken::U16]), vec![MoveValue::U16(
+            0,
+        )]),
+        // U32 arg
+        (Signature(vec![SignatureToken::U32]), vec![MoveValue::U32(
+            0,
+        )]),
+        // U256 arg
+        (Signature(vec![SignatureToken::U256]), vec![
+            MoveValue::U256(U256::zero()),
+        ]),
+        // All constants
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(SignatureToken::Bool))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(true),
+            ])],
+        ),
+        // All constants
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+        ),
+        // vector<vector<address>>
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::Address,
+                )))),
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Vector(vec![
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                ]),
+            ],
+        ),
+        //
+        // Vector arguments
+        //
+        // empty vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // one elem vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Address(
+                AccountAddress::random(),
+            )])],
+        ),
+        // multiple elems vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+            ])],
+        ),
+        // empty vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // multiple element vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::vector_u8(vec![2, 3]),
+                MoveValue::vector_u8(vec![4, 5]),
+            ])],
+        ),
+    ]
+}
+
+fn mismatched_cases() -> Vec<(Signature, Vec<MoveValue>, StatusCode)> {
+    vec![
+        // Too few args
+        (
+            Signature(vec![SignatureToken::U64]),
+            vec![],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Too many args
+        (
+            Signature(vec![SignatureToken::Bool]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+            ],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Vec<bool> passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Bool(true)])],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u128 passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::U128(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u8 passed for vector<vector<u8>>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::U8(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+    ]
+}
+
+fn general_cases() -> Vec<(
+    Signature,
+    Vec<MoveValue>,
+    Vec<AccountAddress>,
+    Option<StatusCode>,
+)> {
+    vec![
+        // too few signers (0)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (1)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (3)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![
+                AccountAddress::random(),
+                AccountAddress::random(),
+                AccountAddress::random(),
+            ],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // correct number of signers (2)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random(), AccountAddress::random()],
+            None,
+        ),
+        // too many signers (1) in a script that expects 0 is no longer ok
+        (
+            Signature(vec![SignatureToken::U8]),
+            vec![MoveValue::U8(0)],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // signer
+        (
+            Signature(vec![
+                SignatureToken::Signer,
+                SignatureToken::Bool,
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+            vec![AccountAddress::random()],
+            None,
+        ),
+    ]
+}
+
+#[test]
+fn check_script() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let script = make_script_with_non_linking_structs(signature);
+        let status = call_script(script, serialize_values(&dummy_args))
+            .err()
+            .unwrap()
+            .major_status();
+        assert_eq!(status, StatusCode::LINKER_ERROR);
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let script = make_script(signature);
+        assert_eq!(
+            call_script_with_args_ty_args_signers(script, serialize_values(&args), vec![], signers)
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        );
+    }
+}
+
+#[test]
+fn check_script_function() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let (module, function_name) = make_script_function(signature);
+        let res = call_script_function(module, function_name, serialize_values(&dummy_args))
+            .err()
+            .unwrap();
+        // either the dummy arg matches so abort, or it fails to match
+        // but the important thing is that the signature was accepted
+        assert!(
+            res.major_status() == StatusCode::ABORTED
+                || res.major_status() == StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+        )
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function_with_args_ty_args_signers(
+                module,
+                function_name,
+                serialize_values(&args),
+                vec![],
+                signers
+            )
+            .err()
+            .unwrap()
+            .major_status(),
+            expected_status
+        );
+    }
+
+    //
+    // Non script visible
+    // DEPRECATED this check must now be done by the adapter
+    //
+    // public
+    let (module, function_name) = make_module_with_function(
+        Visibility::Public,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+    // private
+    let (module, function_name) = make_module_with_function(
+        Visibility::Private,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+}
+
+#[test]
+fn call_missing_item() {
+    let module = empty_module();
+    let id = &module.self_id();
+    let function_name = ident_str!("foo");
+    // missing module
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(error.major_status(), StatusCode::LINKER_ERROR);
+    assert_eq!(error.status_type(), StatusType::Verification);
+    drop(session);
+
+    // missing function
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(
+        error.major_status(),
+        StatusCode::FUNCTION_RESOLUTION_FAILURE
+    );
+    assert_eq!(error.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/crates/move-vm/test-utils/Cargo.toml b/vendors/move/crates/move-vm/test-utils/Cargo.toml
new file mode 100644
index 000000000..f38b5dee4
--- /dev/null
+++ b/vendors/move/crates/move-vm/test-utils/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "move-vm-test-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move VM Test Utils"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.52"
+once_cell = "1.7.2"
+serde = { version = "1.0.124", features = ["derive", "rc"] }
+
+move-binary-format = { path = "../../move-binary-format" }
+move-core-types = { path = "../../move-core-types" }
+move-table-extension = { path = "../../extensions/move-table-extension", optional = true }
+move-vm-types = { path = "../types" }
+
+[features]
+default = [ ]
+table-extension = ["move-table-extension"]
diff --git a/vendors/move/crates/move-vm/test-utils/src/gas_schedule.rs b/vendors/move/crates/move-vm/test-utils/src/gas_schedule.rs
new file mode 100644
index 000000000..7394a2c30
--- /dev/null
+++ b/vendors/move/crates/move-vm/test-utils/src/gas_schedule.rs
@@ -0,0 +1,796 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module lays out the basic abstract costing schedule for bytecode instructions.
+//!
+//! It is important to note that the cost schedule defined in this file does not track hashing
+//! operations or other native operations; the cost of each native operation will be returned by the
+//! native function itself.
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, ConstantPoolIndex, FieldHandleIndex, FieldInstantiationIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
+        StructDefInstantiationIndex, StructDefinitionIndex,
+    },
+    file_format_common::{instruction_key, Opcodes},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{
+        AbstractMemorySize, GasQuantity, InternalGas, InternalGasPerAbstractMemoryUnit,
+        InternalGasUnit, NumArgs, NumBytes, ToUnit, ToUnitFractional,
+    },
+    language_storage::ModuleId,
+    u256,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    gas::{GasMeter, SimpleInstruction},
+    views::{TypeView, ValueView},
+};
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    ops::{Add, Mul},
+    u64,
+};
+
+pub enum GasUnit {}
+
+pub type Gas = GasQuantity<GasUnit>;
+
+impl ToUnit<InternalGasUnit> for GasUnit {
+    const MULTIPLIER: u64 = 1000;
+}
+
+impl ToUnitFractional<GasUnit> for InternalGasUnit {
+    const DENOMINATOR: u64 = 1000;
+    const NOMINATOR: u64 = 1;
+}
+
+/// The size in bytes for a non-string or address constant on the stack
+pub const CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub const REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub const STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+/// For exists checks on data that doesn't exists this is the multiplier that is used.
+pub const MIN_EXISTS_DATA_SIZE: AbstractMemorySize = AbstractMemorySize::new(100);
+
+/// The cost tables, keyed by the serialized form of the bytecode instruction.  We use the
+/// serialized form as opposed to the instruction enum itself as the key since this will be the
+/// on-chain representation of bytecode instructions in the future.
+#[derive(Clone, Debug, Serialize, PartialEq, Eq, Deserialize)]
+pub struct CostTable {
+    pub instruction_table: Vec<GasCost>,
+}
+
+impl CostTable {
+    #[inline]
+    pub fn instruction_cost(&self, instr_index: u8) -> &GasCost {
+        debug_assert!(instr_index > 0 && instr_index <= (self.instruction_table.len() as u8));
+        &self.instruction_table[(instr_index - 1) as usize]
+    }
+}
+
+/// The  `GasCost` tracks:
+/// - instruction cost: how much time/computational power is needed to perform the instruction
+/// - memory cost: how much memory is required for the instruction, and storage overhead
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct GasCost {
+    pub instruction_gas: u64,
+    pub memory_gas: u64,
+}
+
+impl GasCost {
+    pub fn new(instruction_gas: u64, memory_gas: u64) -> Self {
+        Self {
+            instruction_gas,
+            memory_gas,
+        }
+    }
+
+    /// Convert a GasCost to a total gas charge in `InternalGas`.
+    #[inline]
+    pub fn total(&self) -> u64 {
+        self.instruction_gas.add(self.memory_gas)
+    }
+}
+
+static ZERO_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(zero_cost_schedule);
+
+/// The Move VM implementation of state for gas metering.
+///
+/// Initialize with a `CostTable` and the gas provided to the transaction.
+/// Provide all the proper guarantees about gas metering in the Move VM.
+///
+/// Every client must use an instance of this type to interact with the Move VM.
+pub struct GasStatus<'a> {
+    cost_table: &'a CostTable,
+    gas_left: InternalGas,
+    charge: bool,
+}
+
+impl<'a> GasStatus<'a> {
+    /// Initialize the gas state with metering enabled.
+    ///
+    /// Charge for every operation and fail when there is no more gas to pay for operations.
+    /// This is the instantiation that must be used when executing a user script.
+    pub fn new(cost_table: &'a CostTable, gas_left: Gas) -> Self {
+        Self {
+            gas_left: gas_left.to_unit(),
+            cost_table,
+            charge: true,
+        }
+    }
+
+    /// Initialize the gas state with metering disabled.
+    ///
+    /// It should be used by clients in very specific cases and when executing system
+    /// code that does not have to charge the user.
+    pub fn new_unmetered() -> Self {
+        Self {
+            gas_left: InternalGas::new(0),
+            cost_table: &ZERO_COST_SCHEDULE,
+            charge: false,
+        }
+    }
+
+    /// Return the `CostTable` behind this `GasStatus`.
+    pub fn cost_table(&self) -> &CostTable {
+        self.cost_table
+    }
+
+    /// Return the gas left.
+    pub fn remaining_gas(&self) -> Gas {
+        self.gas_left.to_unit_round_down()
+    }
+
+    /// Charge a given amount of gas and fail if not enough gas units are left.
+    pub fn deduct_gas(&mut self, amount: InternalGas) -> PartialVMResult<()> {
+        if !self.charge {
+            return Ok(());
+        }
+
+        match self.gas_left.checked_sub(amount) {
+            Some(gas_left) => {
+                self.gas_left = gas_left;
+                Ok(())
+            },
+            None => {
+                self.gas_left = InternalGas::new(0);
+                Err(PartialVMError::new(StatusCode::OUT_OF_GAS))
+            },
+        }
+    }
+
+    fn charge_instr(&mut self, opcode: Opcodes) -> PartialVMResult<()> {
+        self.deduct_gas(
+            self.cost_table
+                .instruction_cost(opcode as u8)
+                .total()
+                .into(),
+        )
+    }
+
+    /// Charge an instruction over data with a given size and fail if not enough gas units are left.
+    fn charge_instr_with_size(
+        &mut self,
+        opcode: Opcodes,
+        size: AbstractMemorySize,
+    ) -> PartialVMResult<()> {
+        // Make sure that the size is always non-zero
+        let size = std::cmp::max(1.into(), size);
+        debug_assert!(size > 0.into());
+        self.deduct_gas(
+            InternalGasPerAbstractMemoryUnit::new(
+                self.cost_table.instruction_cost(opcode as u8).total(),
+            )
+            .mul(size),
+        )
+    }
+
+    pub fn set_metering(&mut self, enabled: bool) {
+        self.charge = enabled
+    }
+}
+
+impl<'b> GasMeter for GasStatus<'b> {
+    fn balance_internal(&self) -> InternalGas {
+        self.gas_left
+    }
+
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()> {
+        self.charge_instr(instr.to_opcode())
+    }
+
+    fn charge_br_false(&mut self, _target_offset: Option<CodeOffset>) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::BR_FALSE)
+    }
+
+    fn charge_br_true(&mut self, _target_offset: Option<CodeOffset>) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::BR_TRUE)
+    }
+
+    fn charge_branch(&mut self, _target_offset: CodeOffset) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::BRANCH)
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::POP)
+    }
+
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        self.deduct_gas(amount)
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::CALL, (args.len() as u64 + 1).into())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::CALL_GENERIC,
+            ((ty_args.len() + args.len() + 1) as u64).into(),
+        )
+    }
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::LD_CONST, u64::from(size).into())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::COPY_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::MOVE_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::ST_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::PACK_GENERIC
+            } else {
+                Opcodes::PACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::UNPACK_GENERIC
+            } else {
+                Opcodes::UNPACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_read_ref(&mut self, ref_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::READ_REF, ref_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::WRITE_REF, new_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::EQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::NEQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _addr: AccountAddress,
+        _ty: impl TypeView,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        _ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if is_success {
+            let op = match (is_mut, is_generic) {
+                (false, false) => IMM_BORROW_GLOBAL,
+                (false, true) => IMM_BORROW_GLOBAL_GENERIC,
+                (true, false) => MUT_BORROW_GLOBAL,
+                (true, true) => MUT_BORROW_GLOBAL_GENERIC,
+            };
+
+            self.charge_instr_with_size(op, REFERENCE_SIZE)?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { EXISTS_GENERIC } else { EXISTS };
+        self.charge_instr_with_size(
+            op,
+            if exists {
+                REFERENCE_SIZE
+            } else {
+                MIN_EXISTS_DATA_SIZE
+            },
+        )
+    }
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if let Some(val) = val {
+            let op = if is_generic {
+                MOVE_FROM_GENERIC
+            } else {
+                MOVE_FROM
+            };
+
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { MOVE_TO_GENERIC } else { MOVE_TO };
+
+        if is_success {
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PACK, (args.len() as u64).into())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_LEN)
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        self.charge_instr(
+            if is_mut {
+                VEC_MUT_BORROW
+            } else {
+                VEC_IMM_BORROW
+            },
+        )
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PUSH_BACK, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_POP_BACK)
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::VEC_PUSH_BACK,
+            u64::from(expect_num_elements).into(),
+        )
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_SWAP)
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
+
+pub fn new_from_instructions(mut instrs: Vec<(Bytecode, GasCost)>) -> CostTable {
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    if cfg!(debug_assertions) {
+        let mut instructions_covered = 0;
+        for (index, (instr, _)) in instrs.iter().enumerate() {
+            let key = instruction_key(instr);
+            if index == (key - 1) as usize {
+                instructions_covered += 1;
+            }
+        }
+        debug_assert!(
+            instructions_covered == Bytecode::VARIANT_COUNT,
+            "all instructions must be in the cost table"
+        );
+    }
+    let instruction_table = instrs
+        .into_iter()
+        .map(|(_, cost)| cost)
+        .collect::<Vec<GasCost>>();
+    CostTable { instruction_table }
+}
+
+pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (MoveFrom(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BrTrue(0), GasCost::new(0, 0)),
+        (WriteRef, GasCost::new(0, 0)),
+        (Mul, GasCost::new(0, 0)),
+        (MoveLoc(0), GasCost::new(0, 0)),
+        (And, GasCost::new(0, 0)),
+        (Pop, GasCost::new(0, 0)),
+        (BitAnd, GasCost::new(0, 0)),
+        (ReadRef, GasCost::new(0, 0)),
+        (Sub, GasCost::new(0, 0)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Add, GasCost::new(0, 0)),
+        (CopyLoc(0), GasCost::new(0, 0)),
+        (StLoc(0), GasCost::new(0, 0)),
+        (Ret, GasCost::new(0, 0)),
+        (Lt, GasCost::new(0, 0)),
+        (LdU8(0), GasCost::new(0, 0)),
+        (LdU64(0), GasCost::new(0, 0)),
+        (LdU128(0), GasCost::new(0, 0)),
+        (CastU8, GasCost::new(0, 0)),
+        (CastU64, GasCost::new(0, 0)),
+        (CastU128, GasCost::new(0, 0)),
+        (Abort, GasCost::new(0, 0)),
+        (MutBorrowLoc(0), GasCost::new(0, 0)),
+        (ImmBorrowLoc(0), GasCost::new(0, 0)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(0, 0)),
+        (Ge, GasCost::new(0, 0)),
+        (Xor, GasCost::new(0, 0)),
+        (Shl, GasCost::new(0, 0)),
+        (Shr, GasCost::new(0, 0)),
+        (Neq, GasCost::new(0, 0)),
+        (Not, GasCost::new(0, 0)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Le, GasCost::new(0, 0)),
+        (Branch(0), GasCost::new(0, 0)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Or, GasCost::new(0, 0)),
+        (LdFalse, GasCost::new(0, 0)),
+        (LdTrue, GasCost::new(0, 0)),
+        (Mod, GasCost::new(0, 0)),
+        (BrFalse(0), GasCost::new(0, 0)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BitOr, GasCost::new(0, 0)),
+        (FreezeRef, GasCost::new(0, 0)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Div, GasCost::new(0, 0)),
+        (Eq, GasCost::new(0, 0)),
+        (Gt, GasCost::new(0, 0)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Nop, GasCost::new(0, 0)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (LdU16(0), GasCost::new(0, 0)),
+        (LdU32(0), GasCost::new(0, 0)),
+        (LdU256(u256::U256::zero()), GasCost::new(0, 0)),
+        (CastU16, GasCost::new(0, 0)),
+        (CastU32, GasCost::new(0, 0)),
+        (CastU256, GasCost::new(0, 0)),
+    ]
+}
+
+// Only used for genesis and for tests where we need a cost table and
+// don't have a genesis storage state.
+pub fn zero_cost_schedule() -> CostTable {
+    // The actual costs for the instructions in this table _DO NOT MATTER_. This is only used
+    // for genesis and testing, and for these cases we don't need to worry
+    // about the actual gas for instructions.  The only thing we care about is having an entry
+    // in the gas schedule for each instruction.
+    let instrs = zero_cost_instruction_table();
+    new_from_instructions(instrs)
+}
+
+pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(13, 1)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(27, 1),
+        ),
+        (
+            MoveFrom(StructDefinitionIndex::new(0)),
+            GasCost::new(459, 1),
+        ),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(13, 1),
+        ),
+        (BrTrue(0), GasCost::new(1, 1)),
+        (WriteRef, GasCost::new(1, 1)),
+        (Mul, GasCost::new(1, 1)),
+        (MoveLoc(0), GasCost::new(1, 1)),
+        (And, GasCost::new(1, 1)),
+        (Pop, GasCost::new(1, 1)),
+        (BitAnd, GasCost::new(2, 1)),
+        (ReadRef, GasCost::new(1, 1)),
+        (Sub, GasCost::new(1, 1)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (Add, GasCost::new(1, 1)),
+        (CopyLoc(0), GasCost::new(1, 1)),
+        (StLoc(0), GasCost::new(1, 1)),
+        (Ret, GasCost::new(638, 1)),
+        (Lt, GasCost::new(1, 1)),
+        (LdU8(0), GasCost::new(1, 1)),
+        (LdU64(0), GasCost::new(1, 1)),
+        (LdU128(0), GasCost::new(1, 1)),
+        (CastU8, GasCost::new(2, 1)),
+        (CastU64, GasCost::new(1, 1)),
+        (CastU128, GasCost::new(1, 1)),
+        (Abort, GasCost::new(1, 1)),
+        (MutBorrowLoc(0), GasCost::new(2, 1)),
+        (ImmBorrowLoc(0), GasCost::new(1, 1)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(1, 1)),
+        (Ge, GasCost::new(1, 1)),
+        (Xor, GasCost::new(1, 1)),
+        (Shl, GasCost::new(2, 1)),
+        (Shr, GasCost::new(1, 1)),
+        (Neq, GasCost::new(1, 1)),
+        (Not, GasCost::new(1, 1)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(1132, 1)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(582, 1),
+        ),
+        (Le, GasCost::new(2, 1)),
+        (Branch(0), GasCost::new(1, 1)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Or, GasCost::new(2, 1)),
+        (LdFalse, GasCost::new(1, 1)),
+        (LdTrue, GasCost::new(1, 1)),
+        (Mod, GasCost::new(1, 1)),
+        (BrFalse(0), GasCost::new(1, 1)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(41, 1)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(34, 1),
+        ),
+        (BitOr, GasCost::new(2, 1)),
+        (FreezeRef, GasCost::new(1, 1)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(21, 1),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(15, 1),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(23, 1),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(14, 1),
+        ),
+        (Div, GasCost::new(3, 1)),
+        (Eq, GasCost::new(1, 1)),
+        (Gt, GasCost::new(1, 1)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Nop, GasCost::new(1, 1)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(84, 1)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(98, 1)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(1334, 1)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(1902, 1)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(53, 1)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(227, 1)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(572, 1)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(1436, 1)),
+        (LdU16(0), GasCost::new(1, 1)),
+        (LdU32(0), GasCost::new(1, 1)),
+        (LdU256(u256::U256::zero()), GasCost::new(1, 1)),
+        (CastU16, GasCost::new(2, 1)),
+        (CastU32, GasCost::new(2, 1)),
+        (CastU256, GasCost::new(2, 1)),
+    ]
+}
+
+pub static INITIAL_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(|| {
+    let mut instrs = bytecode_instruction_costs();
+    // Note that the DiemVM is expecting the table sorted by instruction order.
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    new_from_instructions(instrs)
+});
diff --git a/vendors/move/crates/move-vm/test-utils/src/lib.rs b/vendors/move/crates/move-vm/test-utils/src/lib.rs
new file mode 100644
index 000000000..a56aba81a
--- /dev/null
+++ b/vendors/move/crates/move-vm/test-utils/src/lib.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(clippy::new_without_default)]
+
+mod storage;
+
+pub mod gas_schedule;
+pub use storage::{BlankStorage, DeltaStorage, InMemoryStorage};
diff --git a/vendors/move/crates/move-vm/test-utils/src/storage.rs b/vendors/move/crates/move-vm/test-utils/src/storage.rs
new file mode 100644
index 000000000..fedf13bbf
--- /dev/null
+++ b/vendors/move/crates/move-vm/test-utils/src/storage.rs
@@ -0,0 +1,302 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Error, Result};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Op},
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag},
+    resolver::{ModuleResolver, MoveResolver, ResourceResolver},
+};
+#[cfg(feature = "table-extension")]
+use move_table_extension::{TableChangeSet, TableHandle, TableResolver};
+use std::{
+    collections::{btree_map, BTreeMap},
+    fmt::Debug,
+};
+
+/// A dummy storage containing no modules or resources.
+#[derive(Debug, Clone)]
+pub struct BlankStorage;
+
+impl BlankStorage {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+impl ModuleResolver for BlankStorage {
+    fn get_module(&self, _module_id: &ModuleId) -> Result<Option<Vec<u8>>> {
+        Ok(None)
+    }
+}
+
+impl ResourceResolver for BlankStorage {
+    fn get_resource(&self, _address: &AccountAddress, _tag: &StructTag) -> Result<Option<Vec<u8>>> {
+        Ok(None)
+    }
+}
+
+#[cfg(feature = "table-extension")]
+impl TableResolver for BlankStorage {
+    fn resolve_table_entry(
+        &self,
+        _handle: &TableHandle,
+        _key: &[u8],
+    ) -> Result<Option<Vec<u8>>, Error> {
+        Ok(None)
+    }
+}
+
+/// A storage adapter created by stacking a change set on top of an existing storage backend.
+/// This can be used for additional computations without modifying the base.
+#[derive(Debug, Clone)]
+pub struct DeltaStorage<'a, 'b, S> {
+    base: &'a S,
+    delta: &'b ChangeSet,
+}
+
+impl<'a, 'b, S: ModuleResolver> ModuleResolver for DeltaStorage<'a, 'b, S> {
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Error> {
+        if let Some(account_storage) = self.delta.accounts().get(module_id.address()) {
+            if let Some(blob_opt) = account_storage.modules().get(module_id.name()) {
+                return Ok(blob_opt.clone().ok());
+            }
+        }
+
+        self.base.get_module(module_id)
+    }
+}
+
+impl<'a, 'b, S: ResourceResolver> ResourceResolver for DeltaStorage<'a, 'b, S> {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Error> {
+        if let Some(account_storage) = self.delta.accounts().get(address) {
+            if let Some(blob_opt) = account_storage.resources().get(tag) {
+                return Ok(blob_opt.clone().ok());
+            }
+        }
+
+        self.base.get_resource(address, tag)
+    }
+}
+
+#[cfg(feature = "table-extension")]
+impl<'a, 'b, S: TableResolver> TableResolver for DeltaStorage<'a, 'b, S> {
+    fn resolve_table_entry(
+        &self,
+        handle: &TableHandle,
+        key: &[u8],
+    ) -> std::result::Result<Option<Vec<u8>>, Error> {
+        // TODO: No support for table deltas
+        self.base.resolve_table_entry(handle, key)
+    }
+}
+
+impl<'a, 'b, S: MoveResolver> DeltaStorage<'a, 'b, S> {
+    pub fn new(base: &'a S, delta: &'b ChangeSet) -> Self {
+        Self { base, delta }
+    }
+}
+
+/// Simple in-memory storage for modules and resources under an account.
+#[derive(Debug, Clone)]
+struct InMemoryAccountStorage {
+    resources: BTreeMap<StructTag, Vec<u8>>,
+    modules: BTreeMap<Identifier, Vec<u8>>,
+}
+
+/// Simple in-memory storage that can be used as a Move VM storage backend for testing purposes.
+#[derive(Debug, Clone)]
+pub struct InMemoryStorage {
+    accounts: BTreeMap<AccountAddress, InMemoryAccountStorage>,
+    #[cfg(feature = "table-extension")]
+    tables: BTreeMap<TableHandle, BTreeMap<Vec<u8>, Vec<u8>>>,
+}
+
+fn apply_changes<K, V>(
+    map: &mut BTreeMap<K, V>,
+    changes: impl IntoIterator<Item = (K, Op<V>)>,
+) -> Result<()>
+where
+    K: Ord + Debug,
+{
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (k, op) in changes.into_iter() {
+        match (map.entry(k), op) {
+            (Occupied(entry), New(_)) => {
+                bail!(
+                    "Failed to apply changes -- key {:?} already exists",
+                    entry.key()
+                )
+            },
+            (Occupied(entry), Delete) => {
+                entry.remove();
+            },
+            (Occupied(entry), Modify(val)) => {
+                *entry.into_mut() = val;
+            },
+            (Vacant(entry), New(val)) => {
+                entry.insert(val);
+            },
+            (Vacant(entry), Delete | Modify(_)) => bail!(
+                "Failed to apply changes -- key {:?} does not exist",
+                entry.key()
+            ),
+        }
+    }
+    Ok(())
+}
+
+fn get_or_insert<K, V, F>(map: &mut BTreeMap<K, V>, key: K, make_val: F) -> &mut V
+where
+    K: Ord,
+    F: FnOnce() -> V,
+{
+    use btree_map::Entry::*;
+
+    match map.entry(key) {
+        Occupied(entry) => entry.into_mut(),
+        Vacant(entry) => entry.insert(make_val()),
+    }
+}
+
+impl InMemoryAccountStorage {
+    fn apply(&mut self, account_changeset: AccountChangeSet) -> Result<()> {
+        let (modules, resources) = account_changeset.into_inner();
+        apply_changes(&mut self.modules, modules)?;
+        apply_changes(&mut self.resources, resources)?;
+        Ok(())
+    }
+
+    fn new() -> Self {
+        Self {
+            modules: BTreeMap::new(),
+            resources: BTreeMap::new(),
+        }
+    }
+}
+
+impl InMemoryStorage {
+    pub fn apply_extended(
+        &mut self,
+        changeset: ChangeSet,
+        #[cfg(feature = "table-extension")] table_changes: TableChangeSet,
+    ) -> Result<()> {
+        for (addr, account_changeset) in changeset.into_inner() {
+            match self.accounts.entry(addr) {
+                btree_map::Entry::Occupied(entry) => {
+                    entry.into_mut().apply(account_changeset)?;
+                },
+                btree_map::Entry::Vacant(entry) => {
+                    let mut account_storage = InMemoryAccountStorage::new();
+                    account_storage.apply(account_changeset)?;
+                    entry.insert(account_storage);
+                },
+            }
+        }
+
+        #[cfg(feature = "table-extension")]
+        self.apply_table(table_changes)?;
+
+        Ok(())
+    }
+
+    pub fn apply(&mut self, changeset: ChangeSet) -> Result<()> {
+        self.apply_extended(
+            changeset,
+            #[cfg(feature = "table-extension")]
+            TableChangeSet::default(),
+        )
+    }
+
+    #[cfg(feature = "table-extension")]
+    fn apply_table(&mut self, changes: TableChangeSet) -> Result<()> {
+        let TableChangeSet {
+            new_tables,
+            removed_tables,
+            changes,
+        } = changes;
+        self.tables.retain(|h, _| !removed_tables.contains(h));
+        self.tables.extend(
+            new_tables
+                .keys()
+                .into_iter()
+                .map(|h| (*h, BTreeMap::default())),
+        );
+        for (h, c) in changes {
+            assert!(
+                self.tables.contains_key(&h),
+                "inconsistent table change set: stale table handle"
+            );
+            let table = self.tables.get_mut(&h).unwrap();
+            apply_changes(table, c.entries)?;
+        }
+        Ok(())
+    }
+
+    pub fn new() -> Self {
+        Self {
+            accounts: BTreeMap::new(),
+            #[cfg(feature = "table-extension")]
+            tables: BTreeMap::new(),
+        }
+    }
+
+    pub fn publish_or_overwrite_module(&mut self, module_id: ModuleId, blob: Vec<u8>) {
+        let account = get_or_insert(&mut self.accounts, *module_id.address(), || {
+            InMemoryAccountStorage::new()
+        });
+        account.modules.insert(module_id.name().to_owned(), blob);
+    }
+
+    pub fn publish_or_overwrite_resource(
+        &mut self,
+        addr: AccountAddress,
+        struct_tag: StructTag,
+        blob: Vec<u8>,
+    ) {
+        let account = get_or_insert(&mut self.accounts, addr, InMemoryAccountStorage::new);
+        account.resources.insert(struct_tag, blob);
+    }
+}
+
+impl ModuleResolver for InMemoryStorage {
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Error> {
+        if let Some(account_storage) = self.accounts.get(module_id.address()) {
+            return Ok(account_storage.modules.get(module_id.name()).cloned());
+        }
+        Ok(None)
+    }
+}
+
+impl ResourceResolver for InMemoryStorage {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Error> {
+        if let Some(account_storage) = self.accounts.get(address) {
+            return Ok(account_storage.resources.get(tag).cloned());
+        }
+        Ok(None)
+    }
+}
+
+#[cfg(feature = "table-extension")]
+impl TableResolver for InMemoryStorage {
+    fn resolve_table_entry(
+        &self,
+        handle: &TableHandle,
+        key: &[u8],
+    ) -> std::result::Result<Option<Vec<u8>>, Error> {
+        Ok(self.tables.get(handle).and_then(|t| t.get(key).cloned()))
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/Cargo.toml b/vendors/move/crates/move-vm/transactional-tests/Cargo.toml
new file mode 100644
index 000000000..d29d29703
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "move-vm-transactional-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+
+[[test]]
+name = "tests"
+harness = false
diff --git a/vendors/move/crates/move-vm/transactional-tests/src/lib.rs b/vendors/move/crates/move-vm/transactional-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.exp
new file mode 100644
index 000000000..8c37110a4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.exp
@@ -0,0 +1 @@
+processed 9 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.mvir
new file mode 100644
index 000000000..a73419b95
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/gen_move_to.mvir
@@ -0,0 +1,327 @@
+//# publish
+module 0x1.M {
+    import 0x1.signer;
+
+    // Structures
+    //
+
+    // a generic struct
+    struct Some<T> has key { v: T }
+
+    struct Value has store { val: u64 }
+
+    struct Container<T> has copy, drop, store { elem: T }
+
+    // Functions
+    //
+
+    // return a `Container<T>`
+    public new_container<T>(t: T): Self.Container<T> {
+    label b0:
+        return Container<T>{ elem: move(t) };
+    }
+
+    // change the elem of a `Container<T>` if T is copyable
+    public change_container<T: copy + drop>(c: &mut Self.Container<T>, t: T) {
+    label b0:
+        *&mut move(c).Container<T>::elem = move(t);
+        return;
+    }
+
+    // destroy a `Container` and returns the `T` wrapped by it
+    public destroy_container<T>(c: Self.Container<T>): T {
+        let t: T;
+    label b0:
+        Container<T> { elem: t } = move(c);
+        return move(t);
+    }
+
+    // return a `Value` instance (a resource)
+    public new_value(val: u64): Self.Value {
+    label b0:
+        return Value{ val: move(val) };
+    }
+
+    // change the `val` in a `Value` instance
+    public change_value(value: &mut Self.Value, val: u64) {
+    label b0:
+        *&mut move(value).Value::val = move(val);
+        return;
+    }
+
+    // destroy `Value` and return the wrapped u64
+    public destroy_value(value: Self.Value): u64 {
+        let v: u64;
+    label b0:
+        Value { val: v } = move(value);
+        return move(v);
+    }
+
+    // publish a well known `Some<Value>` struct
+    public publish_some_value(account: &signer) {
+        let value: Self.Value;
+        let some_of_value: Self.Some<Self.Value>;
+    label b0:
+        value = Value { val: 100 };
+        some_of_value = Some<Self.Value>{ v : move(value) };
+        move_to<Some<Self.Value>>(copy(account), move(some_of_value));
+        return;
+    }
+
+    // unpublish whatever was published in `publish_some_value()`
+    public unpublish_some_value(account: &signer) acquires Some {
+        let sender: address;
+        let some_of_value: Self.Some<Self.Value>;
+        let value: Self.Value;
+        let v: u64;
+    label b0:
+        sender = signer.address_of(move(account));
+        some_of_value = move_from<Some<Self.Value>>(move(sender));
+        Some<Self.Value> { v: value } = move(some_of_value);
+        Value { val: v } = move(value);
+        assert(move(v) == 100, 100);
+
+        return;
+    }
+
+    // publish a `Some` under sender account
+    public publish_some<T: store>(account: &signer, v: T) {
+        let some_of_t: Self.Some<T>;
+    label b0:
+        some_of_t = Some<T>{ v: move(v) };
+        move_to<Some<T>>(move(account), move(some_of_t));
+        return;
+    }
+
+    // unpublish a `Some<T>` under sender account
+    public unpublish_some<T: store>(account: &signer): T acquires Some {
+        let sender: address;
+        let some_of_t: Self.Some<T>;
+        let t: T;
+    label b0:
+        sender = signer.address_of(move(account));
+        some_of_t = move_from<Some<T>>(move(sender));
+        Some<T> { v: t } = move(some_of_t);
+
+        return move(t);
+    }
+
+    // whether an instance of Some<T> exists under sender account
+    public some_exists<T: store>(account: &signer): bool {
+        let sender: address;
+    label b0:
+        sender = signer.address_of(move(account));
+        return exists<Some<T>>(move(sender));
+    }
+
+    // check a `Some` under sender account
+    public check_some<T: store>(account: &signer, val: T): T * bool acquires Some {
+        let sender: address;
+        let some: &Self.Some<T>;
+        let inner_ref: &T;
+        let val_ref: &T;
+        let equal: bool;
+    label b0:
+        sender = signer.address_of(move(account));
+        some = borrow_global<Some<T>>(move(sender));
+        inner_ref = &move(some).Some<T>::v;
+        val_ref = &val;
+        equal = (move(inner_ref) == move(val_ref));
+        return move(val), move(equal);
+    }
+
+    // publish a `Some` under sender account
+    public change_some<T: drop + store>(account: &signer, val: T) acquires Some {
+        let sender: address;
+        let some: &mut Self.Some<T>;
+    label b0:
+        sender = signer.address_of(move(account));
+        some = borrow_global_mut<Some<T>>(move(sender));
+        *(&mut move(some).Some<T>::v) = move(val);
+        return;
+    }
+
+}
+
+//
+// From here on there are a set of transactions over a set of published
+// resources Some<T>.
+// It is best followed going line by line. They are effectively a single transaction
+// that publishes, uses and destroys resources but it's spread across multiple
+// transaction to test the MoveValue <-> byte[] conversions of the serializer
+// (effectively the publishing to store)
+//
+
+//
+// create, publish and exists
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    assert(M.some_exists<M.Value>(&account) == false, 1010);
+    assert(M.some_exists<address>(&account) == false, 1011);
+
+    M.publish_some_value(&account);
+
+    assert(M.some_exists<M.Value>(&account) == true, 1012);
+    return;
+}
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    assert(M.some_exists<M.Value>(&account) == true, 1020);
+    assert(M.some_exists<u64>(&account) == false, 1021);
+
+    M.publish_some<u64>(&account, 100);
+    M.publish_some<bool>(&account, true);
+
+    assert(M.some_exists<u64>(&account) == true, 1022);
+    assert(M.some_exists<bool>(&account) == true, 1023);
+    assert(M.some_exists<address>(&account) == false, 1024);
+    return;
+}
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    assert(M.some_exists<M.Value>(&account) == true, 1030);
+    assert(M.some_exists<bool>(&account) == true, 1031);
+    assert(M.some_exists<address>(&account) == false, 1032);
+    assert(M.some_exists<M.Container<u64>>(&account) == false, 1033);
+
+    M.publish_some<address>(&account, 0x0);
+    M.publish_some<M.Container<u64>>(
+        &account,
+        M.new_container<u64>(7)
+    );
+
+    assert(M.some_exists<address>(&account) == true, 1034);
+    assert(M.some_exists<M.Container<u64>>(&account) == true, 1035);
+    assert(M.some_exists<M.Container<u8>>(&account) == false, 1036);
+    assert(M.some_exists<M.Value>(&account) == true, 1037);
+
+    M.publish_some<M.Container<M.Value>>(
+        &account,
+        M.new_container<M.Value>(
+            M.new_value(5)
+        )
+    );
+    return;
+}
+
+//
+// borrows and mutations
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+    let eq: bool;
+    let val: M.Value;
+label b0:
+    _, eq = M.check_some<bool>(&account, true);
+    assert(move(eq), 2010);
+    _, eq = M.check_some<u64>(&account, 100);
+    assert(move(eq), 2011);
+    _, eq = M.check_some<address>(&account, 0x0);
+    assert(move(eq), 2012);
+    _, eq = M.check_some<M.Container<u64>>(&account, M.new_container<u64>(7));
+    assert(move(eq), 2013);
+    _, eq = M.check_some<M.Container<u64>>(&account, M.new_container<u64>(10));
+    assert(!move(eq), 2014);
+    val = M.new_value(5);
+    val, eq = M.check_some<M.Value>(&account, move(val));
+    assert(!move(eq), 2015);
+    _ = M.destroy_value(move(val));
+    return;
+}
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+    let eq: bool;
+label b0:
+    M.change_some<bool>(&account, false);
+    M.change_some<u64>(&account, 1);
+    M.change_some<address>(&account, 0x01);
+    M.change_some<M.Container<u64>>(&account, M.new_container<u64>(20));
+    _, eq = M.check_some<M.Container<u64>>(&account, M.new_container<u64>(20));
+    assert(move(eq), 2020);
+    _, eq = M.check_some<address>(&account, 0x1);
+    assert(move(eq), 2021);
+    return;
+}
+
+//
+// unpublish, destroy and exists
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    M.unpublish_some_value(&account);
+
+    assert(M.some_exists<M.Value>(&account) == false, 3010);
+    assert(M.some_exists<address>(&account) == true, 3011);
+    assert(M.some_exists<M.Container<u64>>(&account) == true, 3012);
+    assert(M.some_exists<M.Container<u8>>(&account) == false, 3013);
+    return;
+}
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    assert(M.some_exists<M.Container<M.Value>>(&account) == true, 3020);
+    assert(M.some_exists<M.Value>(&account) == false, 3021);
+    assert(M.some_exists<address>(&account) == true, 3022);
+
+    assert(M.unpublish_some<u64>(&account) == 1, 3023);
+    assert(!M.unpublish_some<bool>(&account), 3024);
+    assert(
+        M.destroy_container<u64>(
+            M.unpublish_some<M.Container<u64>>(&account)
+        ) == 20,
+        3025
+    );
+    assert(M.unpublish_some<address>(&account) == 0x01, 3026);
+
+    assert(M.some_exists<u64>(&account) == false, 3027);
+    assert(M.some_exists<address>(&account) == false, 3028);
+    assert(M.some_exists<M.Container<u64>>(&account) == false, 3029);
+    return;
+}
+
+
+//# run --args @0x1
+import 0x1.M;
+
+main(account: signer) {
+label b0:
+    assert(
+        M.destroy_value(
+            M.destroy_container<M.Value>(
+                M.unpublish_some<M.Container<M.Value>>(&account)
+            )
+        ) == 5,
+        3030
+    );
+
+    assert(M.some_exists<u64>(&account) == false, 3031);
+    assert(M.some_exists<address>(&account) == false, 3032);
+    assert(M.some_exists<bool>(&account) == false, 3033);
+    assert(M.some_exists<M.Container<u64>>(&account) == false, 3034);
+    assert(M.some_exists<M.Container<M.Value>>(&account) == false, 3035);
+    assert(M.some_exists<M.Value>(&account) == false, 3036);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.exp
new file mode 100644
index 000000000..bf7479ee9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 31-38:
+Error: Script execution failed with VMError: {
+    major_status: MISSING_DATA,
+    sub_status: None,
+    location: 0x1::Token,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.mvir
new file mode 100644
index 000000000..3e9bfe02a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_missing_struct.mvir
@@ -0,0 +1,38 @@
+//# publish
+module 0x1.Token {
+    struct T has key { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T{ b: true };
+    }
+
+    public has(addr: address): bool {
+        let yes: bool;
+    label b0:
+        yes = exists<T>(move(addr));
+        return move(yes);
+    }
+
+    public test() acquires T {
+        let addr1: address;
+        let struct1: &mut Self.T;
+    label b0:
+        addr1 = 0x01111111111111110;
+        // shoudl fail with missing data
+        struct1 = borrow_global_mut<T>(move(addr1));
+        _ = move(struct1);
+
+        return;
+    }
+
+}
+
+//# run
+import 0x1.Token;
+
+main() {
+label b0:
+    Token.test();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.mvir
new file mode 100644
index 000000000..abf000454
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_published_resource.mvir
@@ -0,0 +1,60 @@
+//# publish
+module 0x1.Token {
+    import 0x1.signer;
+
+    struct T has key {v: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public value(this: &Self.T): u64 {
+        let vref: &u64;
+    label b0:
+        vref = &copy(this).T::v;
+        _ = move(this);
+        return *move(vref);
+    }
+
+    public has(addr: address): bool {
+        let yes: bool;
+    label b0:
+        yes = exists<T>(move(addr));
+        return move(yes);
+    }
+
+    public publish(account: &signer, t: Self.T) {
+    label b0:
+        move_to<T>(move(account), move(t));
+        return;
+    }
+
+    public test(account: &signer) acquires T {
+        let z: Self.T;
+        let addr1: address;
+        let struct1: &mut Self.T;
+        let imms1: &Self.T;
+        let struct1_original_balance: u64;
+    label b0:
+        z = Self.new(0);
+        Self.publish(copy(account), move(z));
+
+        addr1 = signer.address_of(copy(account));
+        struct1 = borrow_global_mut<T>(move(addr1));
+        imms1 = freeze(move(struct1));
+
+        struct1_original_balance = Self.value(move(imms1));
+        assert(copy(struct1_original_balance) == 0, 42);
+
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.Token;
+main(account: signer) {
+label b0:
+    Token.test(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.mvir
new file mode 100644
index 000000000..82e1405c0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/get_txn_sender.mvir
@@ -0,0 +1,12 @@
+//# run --signers 0x1
+import 0x1.signer;
+
+main(account: signer) {
+    let sender: address;
+    let addr: address;
+label b0:
+    sender = signer.address_of(&account);
+    addr = 0x1;
+    assert(copy(sender) == copy(addr), 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.mvir
new file mode 100644
index 000000000..729b4c274
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/has_published_struct.mvir
@@ -0,0 +1,45 @@
+//# publish
+module 0x1.Token {
+    struct T has key { b: bool }
+
+    public new(): Self.T {
+    label b0:
+        return T{ b: true };
+    }
+
+    public has(addr: address): bool {
+        let yes: bool;
+    label b0:
+        yes = exists<T>(move(addr));
+        return move(yes);
+    }
+
+    public publish(account: &signer, t: Self.T) {
+    label b0:
+        move_to<T>(move(account), move(t));
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.signer;
+import 0x1.Token;
+main(account: signer) {
+    let z: Token.T;
+    let sender: address;
+    let exists1: bool;
+    let addr1: address;
+    let exists2: bool;
+label b0:
+    z = Token.new();
+    Token.publish(&account, move(z));
+    sender = signer.address_of(&account);
+    exists1 = Token.has(copy(sender));
+    assert(copy(exists1), 42);
+
+    addr1 = 0x0111111111111111111111110;
+    exists2 = Token.has(copy(addr1));
+    assert(!copy(exists2), 42);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.mvir
new file mode 100644
index 000000000..71204b403
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_from.mvir
@@ -0,0 +1,52 @@
+//# publish
+module 0x1.M {
+    struct R has key { x: bool }
+
+    public publish(s: &signer) {
+    label b0:
+        move_to<R>(move(s), R { x: false });
+        return;
+    }
+
+    public take_off_and_consume(addr: address) acquires R {
+        let x: bool;
+    label b0:
+        R { x: x } = move_from<R>(move(addr));
+        return;
+    }
+
+    public verify_effects(addr: address) {
+    label b0:
+        assert(!exists<R>(move(addr)), 1000);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.take_off_and_consume(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.mvir
new file mode 100644
index 000000000..32ba34295
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_published_resource.mvir
@@ -0,0 +1,72 @@
+//# publish
+module 0x42.TestMoveFrom {
+    import 0x1.signer;
+
+    struct Counter has key { i: u64 }
+
+    public has(account: &signer): bool {
+        let sender_address: address;
+        let yes: bool;
+    label b0:
+        sender_address = signer.address_of(move(account));
+        yes = exists<Counter>(move(sender_address));
+        return move(yes);
+    }
+
+    public increment(account: &signer) acquires Counter {
+        let sender_address: address;
+        let t_ref: &mut Self.Counter;
+        let counter_ref: &mut u64;
+    label b0:
+        sender_address = signer.address_of(move(account));
+        t_ref = borrow_global_mut<Counter>(move(sender_address));
+        counter_ref = &mut copy(t_ref).Counter::i;
+        _ = move(t_ref);
+        *move(counter_ref) = *copy(counter_ref) + 1;
+
+        return;
+    }
+
+    public publish(account: &signer) {
+        let t: Self.Counter;
+    label b0:
+        t = Counter { i: 0 };
+        move_to<Counter>(move(account), move(t));
+
+        return;
+    }
+
+    public unpublish(account: &signer) acquires Counter {
+        let sender_address: address;
+        let counter: Self.Counter;
+        let i: u64;
+    label b0:
+        sender_address = signer.address_of(move(account));
+        counter = move_from<Counter>(move(sender_address));
+        Counter { i } = move(counter);
+
+        return;
+    }
+
+}
+
+//# run --signers 0x1
+import 0x42.TestMoveFrom;
+
+main(account: signer) {
+    let has1: bool;
+    let has2: bool;
+label b0:
+    TestMoveFrom.publish(&account);
+    TestMoveFrom.increment(&account);
+
+    has1 = TestMoveFrom.has(&account);
+    assert(move(has1), 77);
+
+    TestMoveFrom.unpublish(&account);
+
+    has2 = TestMoveFrom.has(&account);
+    assert(!move(has2), 88);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move
new file mode 100644
index 000000000..4ee520695
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move
@@ -0,0 +1,93 @@
+//# publish
+module 0x42::m {
+
+struct Foo has key {
+    f1: bool,
+    f2: address,
+    f3: u8,
+    f4: u16,
+    f5: u32,
+    f6: u64,
+    f7: u128,
+    f8: u256,
+    v1: vector<bool>,
+    v2: vector<address>,
+    v3: vector<u8>,
+    v4: vector<u16>,
+    v5: vector<u32>,
+    v6: vector<u64>,
+    v7: vector<u128>,
+    v8: vector<u256>,
+}
+
+entry fun mt(s: signer) {
+    move_to(&s, Foo {
+        f1: false,
+        f2: @0,
+        f3: 10,
+        f4: 100,
+        f5: 1000,
+        f6: 10000,
+        f7: 100000,
+        f8: 1000000,
+        v1: vector[false],
+        v2: vector[@0],
+        v3: vector[10],
+        v4: vector[100],
+        v5: vector[1000],
+        v6: vector[10000],
+        v7: vector[100000],
+        v8: vector[1000000],
+    })
+}
+
+entry fun mf(a: address) acquires Foo {
+    let Foo {
+        f1,
+        f2,
+        f3,
+        f4,
+        f5,
+        f6,
+        f7,
+        f8,
+        v1,
+        v2,
+        v3,
+        v4,
+        v5,
+        v6,
+        v7,
+        v8,
+    } = move_from(a);
+    assert!(f1 == f1, 0);
+    assert!(f2 == f2, 0);
+    assert!(f3 == f3, 0);
+    assert!(f4 == f4, 0);
+    assert!(f5 == f5, 0);
+    assert!(f6 == f6, 0);
+    assert!(f7 == f7, 0);
+    assert!(f8 == f8, 0);
+    assert!(v1 == v1, 0);
+    assert!(v2 == v2, 0);
+    assert!(v3 == v3, 0);
+    assert!(v4 == v4, 0);
+    assert!(v5 == v5, 0);
+    assert!(v6 == v6, 0);
+    assert!(v7 == v7, 0);
+    assert!(v8 == v8, 0);
+    assert!(f1 == *std::vector::borrow(&v1, 0), 0);
+    assert!(f2 == *std::vector::borrow(&v2, 0), 0);
+    assert!(f3 == *std::vector::borrow(&v3, 0), 0);
+    assert!(f4 == *std::vector::borrow(&v4, 0), 0);
+    assert!(f5 == *std::vector::borrow(&v5, 0), 0);
+    assert!(f6 == *std::vector::borrow(&v6, 0), 0);
+    assert!(f7 == *std::vector::borrow(&v7, 0), 0);
+    assert!(f8 == *std::vector::borrow(&v8, 0), 0);
+}
+
+}
+
+//# run 0x42::m::mt --signers 0x1
+
+//# run 0x42::m::mf --args @0x1
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.mvir
new file mode 100644
index 000000000..aaa71e9c0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u128_field.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct Foo has key {
+        x: u128,
+    }
+
+    public foo(account: &signer) {
+    label b0:
+        move_to<Foo>(move(account),Foo {x: 100u128});
+        return;
+    }
+
+    public bar(account: &signer): u128 acquires Foo {
+        let x: u128;
+    label b0:
+        Foo { x } = move_from<Foo>(signer.address_of(move(account)));
+        return move(x);
+    }
+}
+
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    M.foo(&account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    assert(M.bar(&account) == 100u128, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.mvir
new file mode 100644
index 000000000..3ebde2437
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u64_field.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct Foo has key {
+        x: u64,
+    }
+
+    public foo(account: &signer) {
+    label b0:
+        move_to<Foo>(move(account), Foo {x: 100u64});
+        return;
+    }
+
+    public bar(account: &signer): u64 acquires Foo {
+        let x: u64;
+    label b0:
+        Foo { x } = move_from<Foo>(signer.address_of(move(account)));
+        return move(x);
+    }
+}
+
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    M.foo(&account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    assert(M.bar(&account) == 100u64, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.mvir
new file mode 100644
index 000000000..f05fbcd5c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_u8_field.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct Foo has key {
+        x: u8,
+    }
+
+    public foo(account: &signer) {
+    label b0:
+        move_to<Foo>(move(account), Foo {x: 100u8});
+        return;
+    }
+
+    public bar(account: &signer): u8 acquires Foo {
+        let x: u8;
+    label b0:
+        Foo { x } = move_from<Foo>(signer.address_of(move(account)));
+        return move(x);
+    }
+}
+
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    M.foo(&account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    assert(M.bar(&account) == 100u8, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.exp
new file mode 100644
index 000000000..dfc967956
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.exp
@@ -0,0 +1,4 @@
+processed 3 tasks
+
+task 2 'view'. lines 25-25:
+[No Resource Exists]
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.mvir
new file mode 100644
index 000000000..2cf554c05
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/publish_then_unpublish.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x1.M {
+    import 0x1.signer;
+
+    struct R has key { x: bool }
+
+    public test(s: &signer) acquires R {
+        let x: bool;
+    label b0:
+        move_to<R>(copy(s), R { x: false });
+        R { x } = move_from<R>(signer.address_of(move(s)));
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.test(&s);
+    return;
+}
+
+//# view --address 0x1 --resource 0x1::M::R
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.mvir
new file mode 100644
index 000000000..44732aeae
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/read_and_dont_write_to_global_storage.mvir
@@ -0,0 +1,69 @@
+//# publish
+module 0x42.Test {
+    import 0x1.signer;
+
+    struct Config has copy, drop, store { b: bool }
+
+    // A current or prospective validator should publish one of these under their address
+    struct T has key, store {
+        config: Self.Config,
+    }
+
+    public publish_config(account: &signer, b: bool) {
+    label b0:
+        move_to<T>(move(account), T { config: Config { b: move(b) } });
+        return;
+    }
+
+    // Retrieve a read-only instance of a specific accounts ValidatorConfig.ValidatorConfig.config
+    public config(addr: address): Self.Config acquires T {
+        let t_ref: &Self.T;
+    label b0:
+        t_ref = borrow_global<T>(move(addr));
+        return *&move(t_ref).T::config;
+    }
+
+    public value(config: &Self.Config): bool {
+    label b0:
+        return *&move(config).Config::b;
+    }
+
+    public set(account: &signer, b: bool) acquires T {
+        let t_ref: &mut Self.T;
+        let config_ref: &mut Self.Config;
+        let b_ref: &mut bool;
+    label b0:
+        t_ref = borrow_global_mut<T>(signer.address_of(move(account)));
+        config_ref = &mut move(t_ref).T::config;
+        b_ref = &mut move(config_ref).Config::b;
+        *move(b_ref) = move(b);
+
+        return;
+    }
+
+}
+
+
+//# run --signers 0x1
+import 0x42.Test;
+import 0x1.signer;
+
+main(account: signer) {
+    let sender: address;
+    let config: Test.Config;
+    let config1: Test.Config;
+label b0:
+    Test.publish_config(&account, false);
+
+    sender = signer.address_of(&account);
+    config = Test.config(copy(sender));
+    assert(Test.value(&config) == false, 77);
+
+    Test.set(&account, true); // shouldn't affect local config variable
+    assert(Test.value(&config) == false, 88);
+
+    config1 = Test.config(move(sender));
+    assert(Test.value(&config1) == true, 99);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.exp
new file mode 100644
index 000000000..3439c5eeb
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.exp
@@ -0,0 +1,7 @@
+processed 2 tasks
+
+task 0 'publish'. lines 1-50:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000001.Account
+
+task 1 'run'. lines 52-59:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000042.Account
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.mvir
new file mode 100644
index 000000000..b7665aad6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/resources_are_distinct_by_published_account.mvir
@@ -0,0 +1,59 @@
+//# publish
+module 0x42.Account {
+    import 0x1.Account;
+    import 0x1.signer;
+
+    struct T has key {sequence_number: u64}
+
+    public new(m: u64): Self.T {
+    label b0:
+        return T{sequence_number: move(m)};
+    }
+
+    public sequence_number(this: &Self.T): u64 {
+        let ref: &u64;
+    label b0:
+        ref = &copy(this).T::sequence_number;
+        _ = move(this);
+        return *move(ref);
+    }
+
+    public publish(account: &signer, r: Self.T) {
+    label b0:
+        move_to<T>(copy(account), move(r));
+        return;
+    }
+
+    public test(account: &signer) acquires T {
+        let c1: Self.T;
+        let sender: address;
+        let sequence_number: u64;
+        let fake_ref: &mut Self.T;
+        let fake_ref_frozen: &Self.T;
+        let fake_value: u64;
+    label b0:
+        c1 = Self.new(112);
+        Self.publish(copy(account), move(c1));
+
+        sender = signer.address_of(copy(account));
+
+        sequence_number = Account.sequence_number(copy(sender));
+        assert(copy(sequence_number) == 1, 42);
+
+        fake_ref = borrow_global_mut<T>(copy(sender));
+        fake_ref_frozen = freeze(move(fake_ref));
+        fake_value = Self.sequence_number(move(fake_ref_frozen));
+        assert(copy(fake_value) == 112, 43);
+
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x42.Account as MyAccount;
+
+main(account: signer) {
+label b0:
+  MyAccount.test(&account);
+  return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.mvir
new file mode 100644
index 000000000..09288bf8d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_dummy.mvir
@@ -0,0 +1,17 @@
+//# run --signers 0x1
+main(s: signer) {
+label b0:
+    return;
+}
+
+//# run --signers 0x1 --args 0
+main(s: signer, u: u64) {
+label b0:
+    return;
+}
+
+//# run --signers 0x1 --args 0 @0x1
+main(s: signer, u: u64, b: address) {
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.mvir
new file mode 100644
index 000000000..32d32c71b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/signer_runtime_move_to.mvir
@@ -0,0 +1,65 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct R1 has key { f: bool }
+    struct R2<T> has key { f: T }
+
+    public store(sender: &signer, f: bool) {
+    label b0:
+        move_to<R1>(copy(sender), R1 { f: move(f) });
+        return;
+    }
+
+    public store_gen<T: store>(sender: &signer, t: T) {
+    label b0:
+        move_to<R2<T>>(copy(sender), R2<T> { f: move(t) });
+        return;
+    }
+
+    public read(s: &signer): bool acquires R1 {
+    label b0:
+        return *&(borrow_global<R1>(signer.address_of(move(s)))).R1::f;
+    }
+
+    public read_gen<T: copy + drop + store>(s: &signer): T acquires R2 {
+    label b0:
+        return *&(borrow_global<R2<T>>(signer.address_of(move(s)))).R2<T>::f; // problem is here
+    }
+}
+
+//# run --signers 0x42
+import 0x42.M;
+main(sender: signer) {
+label b0:
+    M.store(&sender, false);
+    assert((M.read(&sender) == false), 42);
+
+    M.store_gen<bool>(&sender, true);
+    assert((M.read_gen<bool>(&sender) == true), 42);
+
+    M.store_gen<u64>(&sender, 112);
+    assert((M.read_gen<u64>(&sender) == 112), 42);
+
+    return;
+}
+
+//# run --signers 0xA
+import 0x42.M;
+main(sender: signer) {
+label b0:
+    M.store(&sender, false);
+    M.store_gen<bool>(&sender, true);
+    M.store_gen<u64>(&sender, 112);
+    return;
+}
+
+//# run --signers 0xA
+import 0x42.M;
+main(sender: signer) {
+label b0:
+    assert((M.read(&sender) == false), 42);
+    assert((M.read_gen<bool>(&sender) == true), 42);
+    assert((M.read_gen<u64>(&sender) == 112), 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.mvir
new file mode 100644
index 000000000..1c2274b9d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/struct_borrow_and_modify.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x1.M {
+    struct Y has store { x: u64 }
+    struct R has key { x: bool, y: Self.Y }
+
+    public publish(s: &signer) {
+    label b0:
+        move_to<R>(move(s), R { x: false, y: Y { x: 0 } });
+        return;
+    }
+
+    public modify_x(addr: address) acquires R {
+    label b0:
+        *&mut borrow_global_mut<R>(move(addr)).R::x = true;
+        return;
+    }
+
+    public verify_x(addr: address) acquires R {
+    label b0:
+        assert(*&borrow_global<R>(move(addr)).R::x == true, 1000);
+        return;
+    }
+
+    public modify_y_x(addr: address) acquires R {
+    label b0:
+        *&mut ((&mut borrow_global_mut<R>(move(addr)).R::y)).Y::x = 42;
+        return;
+    }
+
+    public verify_y_x(addr: address) acquires R {
+    label b0:
+        assert(*&(&borrow_global<R>(move(addr)).R::y).Y::x == 42, 1001);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.modify_x(signer.address_of(&s));
+    return;
+}
+
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_x(signer.address_of(&s));
+    return;
+}
+
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.modify_y_x(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_y_x(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.exp
new file mode 100644
index 000000000..0c10038ae
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.exp
@@ -0,0 +1,11 @@
+processed 5 tasks
+
+task 2 'view'. lines 31-31:
+key 0x1::M::R {
+    x: false
+}
+
+task 4 'view'. lines 42-42:
+key 0x1::M::R {
+    x: false
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.mvir
new file mode 100644
index 000000000..c284b3ad4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/unpublish_then_publish.mvir
@@ -0,0 +1,42 @@
+//# publish
+module 0x1.M {
+    import 0x1.signer;
+
+    struct R has key { x: bool }
+
+    public init(s: &signer) {
+    label b0:
+        move_to<R>(move(s), R { x: false });
+        return;
+    }
+
+    public test(s: &signer) acquires R {
+        let r: Self.R;
+    label b0:
+        r = move_from<R>(signer.address_of(copy(s)));
+        move_to<R>(move(s), move(r));
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.init(&s);
+    return;
+}
+
+//# view --address 0x1 --resource 0x1::M::R
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.test(&s);
+    return;
+}
+
+//# view --address 0x1 --resource 0x1::M::R
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.mvir
new file mode 100644
index 000000000..527c83714
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_borrow_and_modify.mvir
@@ -0,0 +1,57 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    struct R has key { v: vector<u64> }
+
+    public publish(s: &signer) {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        move_to<R>(move(s), R { v: move(v) });
+        return;
+    }
+
+    public borrow_and_modify(addr: address) acquires R {
+    label b0:
+        *vector.borrow_mut<u64>(&mut borrow_global_mut<R>(move(addr)).R::v, 0) = 300;
+        return;
+    }
+
+    public verify_effects(addr: address) acquires R {
+    label b0:
+        assert(*vector.borrow<u64>(&borrow_global<R>(move(addr)).R::v, 0) == 300, 1000);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.borrow_and_modify(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.mvir
new file mode 100644
index 000000000..9e2314919
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_pop.mvir
@@ -0,0 +1,58 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    struct R has key { v: vector<u64> }
+
+    public publish(s: &signer) {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        move_to<R>(move(s), R { v: move(v) });
+        return;
+    }
+
+    public borrow_and_pop(addr: address) acquires R {
+    label b0:
+        assert(vector.pop_back<u64>(&mut borrow_global_mut<R>(move(addr)).R::v) == 200, 1000);
+        return;
+    }
+
+    public verify_effects(addr: address) acquires R {
+    label b0:
+        assert(vector.length<u64>(&borrow_global<R>(move(addr)).R::v) == 1, 1001);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.borrow_and_pop(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.mvir
new file mode 100644
index 000000000..8e0e07193
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_push.mvir
@@ -0,0 +1,57 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    struct R has key { v: vector<u64> }
+
+    public publish(s: &signer) {
+    label b0:
+        move_to<R>(move(s), R { v: vector.empty<u64>() });
+        return;
+    }
+
+    public borrow_and_push(addr: address) acquires R {
+        let r: &mut Self.R;
+    label b0:
+        r = borrow_global_mut<R>(move(addr));
+        vector.push_back<u64>(&mut move(r).R::v, 42);
+        return;
+    }
+
+    public verify_effects(addr: address) acquires R {
+        let r: &Self.R;
+    label b0:
+        r = borrow_global<R>(move(addr));
+        assert(vector.length<u64>(& move(r).R::v) == 1, 1000);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.borrow_and_push(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.mvir
new file mode 100644
index 000000000..124da1df9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vec_swap.mvir
@@ -0,0 +1,62 @@
+//# publish
+module 0x1.M {
+    import 0x1.vector;
+
+    struct R has key { v: vector<u64> }
+
+    public publish(s: &signer) {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        vector.push_back<u64>(&mut v, 100);
+        vector.push_back<u64>(&mut v, 200);
+        move_to<R>(move(s), R { v: move(v) });
+        return;
+    }
+
+    public borrow_and_swap(addr: address) acquires R {
+        let r: &mut Self.R;
+    label b0:
+        r = borrow_global_mut<R>(move(addr));
+        vector.swap<u64>(&mut move(r).R::v, 0, 1);
+        return;
+    }
+
+    public verify_effects(addr: address) acquires R {
+        let v: &vector<u64>;
+    label b0:
+        v = & borrow_global<R>(move(addr)).R::v;
+        assert(*vector.borrow<u64>(copy(v), 0) == 200, 1000);
+        assert(*vector.borrow<u64>(move(v), 1) == 100, 1001);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.borrow_and_swap(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.mvir
new file mode 100644
index 000000000..66f34ae79
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_all_ok.mvir
@@ -0,0 +1,44 @@
+//# run
+main() {
+    let v: vector<u64>;
+    let v_imm: &vector<u64>;
+    let v_mut: &mut vector<u64>;
+    let v_len: u64;
+    let e_imm: &u64;
+    let e_mut: &mut u64;
+    let e_val: u64;
+label b0:
+    v = vec_pack_0<u64>();
+    v_imm = &v;
+    v_len = vec_len<u64>(copy(v_imm));
+    assert(move(v_len) == 0, 1);
+    _ = move(v_imm);
+
+    v_mut = &mut v;
+    vec_push_back<u64>(copy(v_mut), 0);
+    vec_push_back<u64>(copy(v_mut), 1);
+
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 2, 2);
+
+    e_imm = vec_imm_borrow<u64>(copy(v_mut), 0);
+    _ = move(e_imm);
+    e_mut = vec_mut_borrow<u64>(copy(v_mut), 1);
+    _ = move(e_mut);
+
+    vec_swap<u64>(copy(v_mut), 0, 1);
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 2, 3);
+
+    e_val = vec_pop_back<u64>(copy(v_mut));
+    assert(move(e_val) == 0, 4);
+    e_val = vec_pop_back<u64>(copy(v_mut));
+    assert(move(e_val) == 1, 5);
+
+    v_len = vec_len<u64>(copy(v_mut));
+    assert(move(v_len) == 0, 6);
+    _ = move(v_mut);
+
+    vec_unpack_0<u64>(move(v));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir
new file mode 100644
index 000000000..872cd78a1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_borrow_and_modify_ok.mvir
@@ -0,0 +1,62 @@
+//# publish
+module 0x1.M {
+    struct R has key { v: vector<u64> }
+
+    public publish(s: &signer) {
+        let v: vector<u64>;
+    label b0:
+        v = vec_pack_1<u64>(100);
+        vec_push_back<u64>(&mut v, 200);
+        move_to<R>(move(s), R { v: move(v) });
+        return;
+    }
+
+    public borrow_and_modify(addr: address) acquires R {
+        let r: &mut Self.R;
+        let v: &mut vector<u64>;
+    label b0:
+        r = borrow_global_mut<R>(move(addr));
+        v = &mut move(r).R::v;
+        *vec_mut_borrow<u64>(move(v), 0) = 300;
+        return;
+    }
+
+    public verify_effects(addr: address) acquires R {
+        let r: &Self.R;
+        let v: &vector<u64>;
+    label b0:
+        r = borrow_global<R>(move(addr));
+        v = &move(r).R::v;
+        assert(*vec_imm_borrow<u64>(move(v), 0) == 300, 1000);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+
+main(s: signer) {
+label b0:
+    M.publish(&s);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.borrow_and_modify(signer.address_of(&s));
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.signer;
+
+main(s: signer) {
+label b0:
+    M.verify_effects(signer.address_of(&s));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.mvir
new file mode 100644
index 000000000..182637d7b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_bound_ok.mvir
@@ -0,0 +1,62 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_imm_borrow<u64>(&v, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_imm_borrow<u64>(&v, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    vec_swap<u64>(&mut v, 0, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_swap<u64>(&mut v, 0, 0);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.mvir
new file mode 100644
index 000000000..e3a2f56a4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_len_ok.mvir
@@ -0,0 +1,29 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    assert(vec_len<u64>(&v) == 0, 0);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    assert(vec_len<u64>(&v) == 1, 1);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    assert(vec_len<u64>(&v) == 2, 2);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.exp
new file mode 100644
index 000000000..49e618b56
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-10:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 2 'run'. lines 23-31:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(1),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir
new file mode 100644
index 000000000..f4450a6e1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_out_of_bound.mvir
@@ -0,0 +1,31 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_imm_borrow<u64>(&v, 1);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut v, 0);
+    _ = vec_mut_borrow<u64>(&mut v, 1);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    vec_swap<u64>(&mut v, 0, 1);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir
new file mode 100644
index 000000000..ff4c683aa
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pack_unpack_ok.mvir
@@ -0,0 +1,29 @@
+//# run
+main() {
+    let v1: vector<u64>;
+    let v2: vector<u64>;
+    let e: u64;
+label b0:
+    v1 = vec_pack_1<u64>(42);
+    e = vec_unpack_1<u64>(move(v1));
+    v2 = vec_pack_1<u64>(move(e));
+    assert(*vec_imm_borrow<u64>(&v2, 0) == 42, 42);
+
+    return;
+}
+
+//# run
+main() {
+    let v1: vector<u64>;
+    let v2: vector<u64>;
+    let e1: u64;
+    let e2: u64;
+label b0:
+    v1 = vec_pack_2<u64>(42, 43);
+    e1, e2 = vec_unpack_2<u64>(move(v1));
+    v2 = vec_pack_2<u64>(move(e1), move(e2));
+    assert(*vec_imm_borrow<u64>(&v2, 0) == 42, 42);
+    assert(*vec_imm_borrow<u64>(&v2, 1) == 43, 43);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.exp
new file mode 100644
index 000000000..84163a170
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.exp
@@ -0,0 +1,19 @@
+processed 2 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 11-20:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(2),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.mvir
new file mode 100644
index 000000000..cf7cdb062
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_empty.mvir
@@ -0,0 +1,20 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.mvir
new file mode 100644
index 000000000..9f8ff85de
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_pop_ok.mvir
@@ -0,0 +1,20 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_pop_back<u64>(&mut v);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.exp
new file mode 100644
index 000000000..d9de2df4a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.mvir
new file mode 100644
index 000000000..f819f8a02
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_less.mvir
@@ -0,0 +1,30 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_unpack_0<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_push_back<u64>(&mut v, 43);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.exp
new file mode 100644
index 000000000..84831f9a5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'run'. lines 1-9:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 1 'run'. lines 11-19:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'run'. lines 21-30:
+Error: Script execution failed with VMError: {
+    major_status: VECTOR_OPERATION_ERROR,
+    sub_status: Some(3),
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.mvir
new file mode 100644
index 000000000..2f59a663a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_more.mvir
@@ -0,0 +1,30 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_0<u64>();
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir
new file mode 100644
index 000000000..3f7fff5d5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_unpack_ok.mvir
@@ -0,0 +1,42 @@
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_2<u64>(42, 43);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    vec_push_back<u64>(&mut v, 43);
+    _, _ = vec_unpack_2<u64>(move(v));
+
+    return;
+}
+
+
+//# run
+main() {
+    let v: vector<u64>;
+label b0:
+    v = vec_pack_1<u64>(42);
+    _ = vec_pop_back<u64>(&mut v);
+    vec_unpack_0<u64>(move(v));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.mvir
new file mode 100644
index 000000000..0ca2584aa
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/vector_ops_using_generics.mvir
@@ -0,0 +1,24 @@
+//# publish
+
+module 0x42.Tests {
+
+    public test<T: copy + drop>(x: T) {
+        let v: vector<T>;
+        label l0:
+        v = vec_pack_0<T>();
+        assert(vec_len<T>(&v) == 0, 42);
+        vec_push_back<T>(&mut v, copy(x));
+        vec_push_back<T>(&mut v, copy(x));
+        vec_swap<T>(&mut v, 0, 1);
+        _ = vec_imm_borrow<T>(&v, 0);
+        _ = vec_mut_borrow<T>(&mut v, 0);
+        _ = vec_pop_back<T>(&mut v);
+        _ = vec_pop_back<T>(&mut v);
+        vec_unpack_0<T>(move(v));
+        return;
+    }
+}
+
+//# run 0x42::Tests::test --type-args u64 --args 0
+
+//# run 0x42::Tests::test --type-args vector<u8> --args b"hello"
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.exp b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.mvir
new file mode 100644
index 000000000..078cc6225
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/builtins/verify_valid_bytearray.mvir
@@ -0,0 +1,8 @@
+//# run
+main() {
+    let byte_array: vector<u8>;
+label b0:
+    byte_array = h"deadbeefdeadbeef";
+    assert(move(byte_array) == h"deadbeefdeadbeef", 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.exp b/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.exp
new file mode 100644
index 000000000..19c425b4f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 10-18:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(22),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.mvir
new file mode 100644
index 000000000..86694bbfe
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/commands/abort_in_module.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x1.M {
+    public foo() {
+    label b0:
+        abort 22;
+    }
+
+}
+
+//# run
+import 0x1.M;
+
+main() {
+label b0:
+    // should abort and point to the module
+    M.foo();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.exp b/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.mvir
new file mode 100644
index 000000000..15b53dec3
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/commands/local_assigned_many_times.mvir
@@ -0,0 +1,34 @@
+//# run
+main() {
+    let x: u64;
+    let y: u64;
+    let x_ref: &u64;
+    let y_ref: &u64;
+label b0:
+    x = 5;
+    y = 2;
+
+    x_ref = &x;
+    y_ref = &y;
+    _ = move(y_ref);
+    _ = move(x_ref);
+
+    x_ref = &x;
+    y_ref = move(x_ref);
+
+    jump_if (true) b2;
+label b1:
+    _ = move(y_ref);
+    x_ref = &x;
+    y_ref = &y;
+    jump b3;
+label b2:
+    _ = move(y_ref);
+    x_ref = &y;
+    y_ref = &x;
+    jump b3;
+label b3:
+    assert(*move(x_ref) == 2, 42);
+    _ = move(y_ref);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.mvir
new file mode 100644
index 000000000..1e864f6db
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_accumulator.mvir
@@ -0,0 +1,18 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    jump_if_false (copy(x) >= 5) while_b2;
+label while_b1:
+    jump while_cont;
+label while_b2:
+    x = move(x) + 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.mvir
new file mode 100644
index 000000000..960b91f02
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_simple.mvir
@@ -0,0 +1,20 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    jump_if_false (copy(x) >= 5) while_b2;
+label while_b1:
+    jump while_cont;
+label while_b2:
+    x = move(x) + 1;
+    jump while;
+    assert(false, 9);
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 11);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir
new file mode 100644
index 000000000..cf82d978d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/break_continue_sum_of_odds.mvir
@@ -0,0 +1,23 @@
+//# run
+main() {
+    let x: u64;
+    let y: u64;
+label b0:
+    x = 0;
+    y = 0;
+label loop:
+    jump_if (copy(x) < 10) loop_b1;
+label loop_b0:
+    jump loop_cont;
+label loop_b1:
+    x = move(x) + 1;
+    jump_if_false (copy(x) % 2 == 0) loop_b3;
+label loop_b2:
+    jump loop;
+label loop_b3:
+    y = move(y) + copy(x);
+    jump loop;
+label loop_cont:
+    assert(move(y) == 25, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.exp
new file mode 100644
index 000000000..208303ad6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 19-26:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(42),
+    location: 0x1::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.mvir
new file mode 100644
index 000000000..53e44d331
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/fields_packed_in_order.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x1.M {
+    struct T has drop {
+        b: u64,
+        a: u64
+    }
+    public error(code: u64): u64 {
+    label b0:
+        abort(move(code));
+        return 0;
+    }
+    public new(): Self.T {
+    label b0:
+        return T { b: Self.error(42), a: Self.error(100) };
+    }
+}
+
+
+//# run
+import 0x1.M;
+main() {
+  let m: M.T;
+label b0:
+  m = M.new();
+  return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.mvir
new file mode 100644
index 000000000..990b91726
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_1.mvir
@@ -0,0 +1,11 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if_false (move(ret_if_val)) b2;
+label b1:
+    return;
+label b2:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.mvir
new file mode 100644
index 000000000..3c16dbb5b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_10.mvir
@@ -0,0 +1,12 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.mvir
new file mode 100644
index 000000000..3c16dbb5b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_2.mvir
@@ -0,0 +1,12 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.mvir
new file mode 100644
index 000000000..5f30680a7
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_3.mvir
@@ -0,0 +1,15 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    jump b3;
+label b2:
+    return;
+label b3:
+    assert(false, 43);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.mvir
new file mode 100644
index 000000000..765ddc65a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_4.mvir
@@ -0,0 +1,16 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if (move(ret_if_val)) b2;
+label b1:
+    assert(false, 42);
+    return;
+label b2:
+    jump_if (true) b4;
+label b3:
+    return;
+label b4:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.mvir
new file mode 100644
index 000000000..45a202039
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_7.mvir
@@ -0,0 +1,16 @@
+//# run
+main() {
+    let ret_if_val: bool;
+label b0:
+    ret_if_val = true;
+    jump_if_false (move(ret_if_val)) loop_cont;
+label loop:
+    jump_if (true) loop_b1;
+label loop_b0:
+    jump loop;
+label loop_b1:
+    return;
+label loop_cont:
+    assert(false, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.mvir
new file mode 100644
index 000000000..b2ee847fc
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/if_branch_diverges_9.mvir
@@ -0,0 +1,18 @@
+//# run
+main() {
+    let b: bool;
+label b0:
+    b = false;
+label loop:
+    jump_if_false (copy(b)) loop_b3;
+label loop_b0:
+    jump_if_false (copy(b)) loop_b2;
+label loop_b1:
+    jump loop;
+label loop_b2:
+    jump loop;
+label loop_b3:
+    jump loop_cont;
+label loop_cont:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.mvir
new file mode 100644
index 000000000..6d9cfcfb6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_nested_breaks.mvir
@@ -0,0 +1,14 @@
+//# run
+main() {
+label outer_loop:
+label inner_loop:
+    jump inner_loop_cont;
+    assert(false, 42);
+    jump inner_loop;
+label inner_loop_cont:
+    jump outer_loop_cont;
+    assert(false, 42);
+    jump outer_loop;
+label outer_loop_cont:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.mvir
new file mode 100644
index 000000000..755fea973
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_return.mvir
@@ -0,0 +1,7 @@
+//# run
+main() {
+label loop:
+    return;
+    assert(false, 42);
+    jump loop;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.mvir
new file mode 100644
index 000000000..c80531617
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/loop_simple.mvir
@@ -0,0 +1,12 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 0;
+label loop:
+    x = move(x) + 1;
+    jump loop_cont;
+label loop_cont:
+    assert(move(x) == 1, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir
new file mode 100644
index 000000000..515a5a956
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken.mvir
@@ -0,0 +1,24 @@
+//# publish
+module 0x1.Test {
+    public t(): u64 {
+        let x: u64;
+    label b0:
+        jump_if (true) b2;
+    label b1:
+        x = 0;
+        return copy(x);
+    label b2:
+        return 100;
+    }
+}
+
+//# run
+import 0x1.Test;
+
+main() {
+    let x: u64;
+label b0:
+    x = Test.t();
+    assert(copy(x) == 100, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir
new file mode 100644
index 000000000..7c8d4bcc2
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_local.mvir
@@ -0,0 +1,13 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    jump_if (true) b2;
+label b1:
+    x = 0;
+label b2:
+    return;
+label b3:
+    assert(false, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir
new file mode 100644
index 000000000..078c5f0c2
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/return_in_if_branch_taken_no_else.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x1.Test {
+    public t(): u64 {
+    label b0:
+        jump_if_false (true) b2;
+    label b1:
+        return 100;
+    label b2:
+        return 0;
+    }
+}
+
+//# run
+import 0x1.Test;
+
+main() {
+    let x: u64;
+label b0:
+    x = Test.t();
+    assert(copy(x) == 100, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.mvir
new file mode 100644
index 000000000..c3b471e7a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_false.mvir
@@ -0,0 +1,14 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (false) while_cont;
+label while_body:
+    x = 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 0, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.mvir
new file mode 100644
index 000000000..b7eec2d41
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested.mvir
@@ -0,0 +1,25 @@
+//# run
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x = 0;
+    z = 0;
+label outer_while:
+    jump_if_false (copy(x) < 3) outer_while_cont;
+label outer_while_b0:
+    x = move(x) + 1;
+    y = 0;
+label inner_while:
+    jump_if_false (copy(y) < 7) inner_while_cont;
+label inner_while_b0:
+    y = move(y) + 1;
+    z = move(z) + 1;
+    jump inner_while;
+label inner_while_cont:
+    jump outer_while;
+label outer_while_cont:
+    assert(move(z) == 21, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.mvir
new file mode 100644
index 000000000..3f5ea2f52
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_nested_return.mvir
@@ -0,0 +1,18 @@
+//# run
+main() {
+label outer_while:
+    jump_if_false (true) outer_while_cont;
+label outer_while_b0:
+label inner_while:
+    jump_if_false (true) inner_while_cont;
+label inner_while_b0:
+    return;
+    assert(false, 2);
+    jump inner_while;
+label inner_while_cont:
+    assert(false, 3);
+    jump outer_while;
+label outer_while_cont:
+    assert(false, 4);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.mvir
new file mode 100644
index 000000000..1f50f1910
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_return.mvir
@@ -0,0 +1,11 @@
+//# run
+main() {
+label while:
+    jump_if_false (true) while_cont;
+label while_b0:
+    return;
+    assert(false, 42);
+    jump while;
+label while_cont:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.exp b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.mvir
new file mode 100644
index 000000000..fbd4732c0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/control_flow/while_simple.mvir
@@ -0,0 +1,14 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 0;
+label while:
+    jump_if_false (copy(x) < 5) while_cont;
+label while_b0:
+    x = copy(x) + 1;
+    jump while;
+label while_cont:
+    assert(move(x) == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir
new file mode 100644
index 000000000..dd04d0efb
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/address_arg_is_not_signer.mvir
@@ -0,0 +1,13 @@
+//# run --args @0x1
+main(s: signer) {
+label b0:
+    return;
+}
+// DEPRECATED signers can now be passed in as addrs
+
+//# run --args @0x0 @0x2
+main(s: signer, s2: signer) {
+label b0:
+    return;
+}
+// DEPRECATED signers can now be passed in as addrs
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move
new file mode 100644
index 000000000..2f600306a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move
@@ -0,0 +1,5 @@
+//# run --args 10u8 10 10u64 10u128 true false @0x123 b"deadbeef" 340u16 3456789u32 1234567890123456789123456723456u256
+script {
+fun main(_a: u8, _b: u64, _c: u64, _d: u128, _e: bool, _f: bool, _g: address, _h: vector<u8>, _i: u16, _j: u32, _k: u256) {
+}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.move
new file mode 100644
index 000000000..bce904d5a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_0.move
@@ -0,0 +1,5 @@
+//# run
+
+script {
+fun main() {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.exp
new file mode 100644
index 000000000..9ac9e5ab0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.move
new file mode 100644
index 000000000..03432a50b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_args_got_1.move
@@ -0,0 +1,6 @@
+//# run --args 0
+// should fail, extra arg
+script {
+fun main() {
+}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp
new file mode 100644
index 000000000..301fd72bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move
new file mode 100644
index 000000000..687f5c329
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_0_signer_args_got_1_ok.move
@@ -0,0 +1,5 @@
+//# run --signers 0x1
+// DEPRECATED now will fail. signer args same as other args
+script {
+fun main() {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.exp
new file mode 100644
index 000000000..9ac9e5ab0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.move
new file mode 100644
index 000000000..760959162
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_0.move
@@ -0,0 +1,6 @@
+//# run
+// should fail, missing arg
+script {
+fun main(_x: u64) {
+}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.exp
new file mode 100644
index 000000000..301fd72bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.move
new file mode 100644
index 000000000..95294622f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_arg_got_2.move
@@ -0,0 +1,5 @@
+//# run --args 1 2
+// should faill, extra arg
+script {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move
new file mode 100644
index 000000000..00bed5121
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_1_signer_arg_got_1.move
@@ -0,0 +1,5 @@
+//# run --signers 0x1
+
+script {
+fun main(_s: signer) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.exp
new file mode 100644
index 000000000..301fd72bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.move
new file mode 100644
index 000000000..e6d99d768
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_args_got_3.move
@@ -0,0 +1,5 @@
+//# run --args 42 0x1 42
+// should fail, too many args
+script {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp
new file mode 100644
index 000000000..9ac9e5ab0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move
new file mode 100644
index 000000000..4f644aefc
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_2_signer_args_got_1.move
@@ -0,0 +1,6 @@
+//# run --signers 0x1
+// should fail, missing signer
+script {
+fun main(_s1: signer, _s2: signer) {
+}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp
new file mode 100644
index 000000000..301fd72bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move
new file mode 100644
index 000000000..40e5aff3d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr.move
@@ -0,0 +1,5 @@
+//# run --args 0x1
+// should fail, missing arg
+script {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp
new file mode 100644
index 000000000..3c2908c16
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move
new file mode 100644
index 000000000..d669df859
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_addr_u64.move
@@ -0,0 +1,5 @@
+//# run --args 0x1 42
+// should fail, flipped arguments
+script {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move
new file mode 100644
index 000000000..f27a90316
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_addr.move
@@ -0,0 +1,5 @@
+//# run --args 42 @0x1
+
+script {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp
new file mode 100644
index 000000000..3c2908c16
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move
new file mode 100644
index 000000000..be1b69dd1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_addr_got_u64_u64.move
@@ -0,0 +1,5 @@
+//# run --args 42 42
+// should fail for mismatched types
+script {
+fun main(_x: u64, _y: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.exp
new file mode 100644
index 000000000..3c2908c16
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: FAILED_TO_DESERIALIZE_ARGUMENT,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.move
new file mode 100644
index 000000000..524bfafc8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_address.move
@@ -0,0 +1,5 @@
+//# run --args @0x1
+// should fail with mismatched types
+script {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.move
new file mode 100644
index 000000000..40b809770
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_got_u64.move
@@ -0,0 +1,5 @@
+//# run --args 42
+
+script {
+fun main(_x: u64) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move
new file mode 100644
index 000000000..f37ce39fb
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/expected_u64_u64_address_got_u64_u64_address.move
@@ -0,0 +1,4 @@
+//# run --args 3 5 @0x42
+script {
+fun main(_x: u64, _y: u64, _z: address) {}
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.exp
new file mode 100644
index 000000000..5045f1700
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.exp
@@ -0,0 +1,49 @@
+processed 17 tasks
+
+task 1 'run'. lines 25-25:
+return values: 0
+
+task 2 'run'. lines 27-27:
+return values: 0
+
+task 3 'run'. lines 29-29:
+return values: [119, 97, 116]
+
+task 4 'run'. lines 31-31:
+return values: { 0 }
+
+task 5 'run'. lines 35-35:
+return values: [0]
+
+task 6 'run'. lines 37-37:
+return values: [0]
+
+task 7 'run'. lines 39-39:
+return values: [[119, 97, 116]]
+
+task 8 'run'. lines 41-41:
+return values: [{ 0 }]
+
+task 9 'run'. lines 45-45:
+return values: { 0 }
+
+task 10 'run'. lines 47-47:
+return values: { 0 }
+
+task 11 'run'. lines 49-49:
+return values: { [119, 97, 116] }
+
+task 12 'run'. lines 51-51:
+return values: { { 0 } }
+
+task 13 'run'. lines 55-55:
+return values: 0, 0
+
+task 14 'run'. lines 57-57:
+return values: false, 0
+
+task 15 'run'. lines 59-59:
+return values: { 0 }, [119, 97, 116]
+
+task 16 'run'. lines 61-61:
+return values: 0000000000000000000000000000000000000000000000000000000000000042, { 0 }
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.move
new file mode 100644
index 000000000..4952b9839
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/generic_return_values.move
@@ -0,0 +1,61 @@
+//# publish
+
+module 0x42::Test {
+
+    struct Cup<T> { value: T }
+
+    public fun t1<T>(x: T): T {
+        x
+    }
+
+    public fun t2<T>(x: T): vector<T> {
+        vector[x]
+    }
+
+    public fun t3<T>(x: T): Cup<T> {
+        Cup { value: x }
+    }
+
+    public fun t4<T,U>(x: T, y: U): (U, T) {
+        (y, x)
+    }
+
+}
+
+//# run 0x42::Test::t1 --type-args u64 --args 0
+
+//# run 0x42::Test::t1 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t1 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t1 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t2 --type-args u64 --args 0
+
+//# run 0x42::Test::t2 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t2 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t2 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t3 --type-args u64 --args 0
+
+//# run 0x42::Test::t3 --type-args u8 --args 0u8
+
+//# run 0x42::Test::t3 --type-args vector<u8> --args b"wat"
+
+//# run 0x42::Test::t3 --type-args 0x42::Test::Cup<u64> --args 0
+
+
+
+//# run 0x42::Test::t4 --type-args u64 u8 --args 0 0u8
+
+//# run 0x42::Test::t4 --type-args u8 bool --args 0u8 false
+
+//# run 0x42::Test::t4 --type-args vector<u8> 0x42::Test::Cup<u64> --args b"wat" 0
+
+//# run 0x42::Test::t4 --type-args 0x42::Test::Cup<u64> address --args 0 @0x42
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir
new file mode 100644
index 000000000..a55e7a71e
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_function.mvir
@@ -0,0 +1,28 @@
+//# publish
+
+// tests various mixed usage of signer in function arguments
+
+module 0x42.M {
+
+public main1(s1: signer, s2: &signer, s3: signer) {
+    label l0:
+    return;
+}
+
+public main2(s1: &signer, u: u64, s2: signer, f: bool, s3: &signer) {
+    label l0:
+    return;
+}
+
+public main3(u: u64, f: bool, a: address, s1: signer, s2: &signer) {
+    label l0:
+    return;
+}
+
+}
+
+//# run 0x42::M::main1 --args @0x1 @0x1 @0x1
+
+//# run 0x42::M::main2 --args @0x1 0 @0x1 false @0x1
+
+//# run 0x42::M::main3 --args 0 false @0x1 @0x2 @0x3
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir
new file mode 100644
index 000000000..7892f86cc
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/mixed_signer_inputs_scripts.mvir
@@ -0,0 +1,21 @@
+//# run --args @0x1 @0x1 @0x1
+
+// tests various mixed usage of signer in script arguments
+
+main(s1: signer, s2: &signer, s3: signer) {
+    label l0:
+    return;
+}
+
+
+//# run --args @0x1 0 @0x1 false @0x1
+main(s1: &signer, u: u64, s2: signer, f: bool, s3: &signer) {
+    label l0:
+    return;
+}
+
+//# run --args 0 false @0x1 @0x2 @0x3
+main(u: u64, f: bool, a: address, s1: signer, s2: &signer) {
+    label l0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp
new file mode 100644
index 000000000..edbdf5490
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.exp
@@ -0,0 +1,7 @@
+processed 3 tasks
+
+task 1 'run'. lines 28-40:
+mutable inputs after call: local#0: 112, local#1: { 224 }, local#2: [120, 0, 122]
+
+task 2 'run'. lines 42-42:
+mutable inputs after call: local#0: 112, local#1: { 224 }, local#2: [120, 0, 122]
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir
new file mode 100644
index 000000000..09cbef087
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/modify_mutable_ref_inputs.mvir
@@ -0,0 +1,42 @@
+//# publish
+
+// the VM will provide the values for mutable inputs after the function returns
+// modifications should be observable
+
+module 0x42.M {
+    struct S { f: u64 }
+
+    public set_f(s: &mut Self.S, f: u64) {
+        label l0:
+        *(&mut move(s).S::f) = move(f);
+        return;
+    }
+
+    public t(
+        u: &mut u64,
+        s: &mut Self.S,
+        v: &mut vector<u8>,
+    ) {
+        label l0:
+        *move(u) = 112;
+        *(&mut move(s).S::f) = 224;
+        *(vec_mut_borrow<u8>(move(v), 1)) = 0u8;
+        return;
+    }
+}
+
+//# run --args 0 1 b"xyz"
+import 0x42.M;
+main(
+    u: &mut u64,
+    s: &mut M.S,
+    v: &mut vector<u8>,
+) {
+    label l0:
+    *move(u) = 112;
+    M.set_f(move(s), 224);
+    *(vec_mut_borrow<u8>(move(v), 1)) = 0u8;
+    return;
+}
+
+//# run 0x42::M::t --args 0 1 b"xyz"
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.exp
new file mode 100644
index 000000000..1eb93334f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.exp
@@ -0,0 +1,19 @@
+processed 9 tasks
+
+task 2 'run'. lines 35-39:
+mutable inputs after call: local#0: false
+
+task 3 'run'. lines 41-46:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 4 'run'. lines 48-52:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 6 'run'. lines 56-56:
+mutable inputs after call: local#0: false
+
+task 7 'run'. lines 58-58:
+mutable inputs after call: local#1: false, local#3: { 0 }
+
+task 8 'run'. lines 60-60:
+mutable inputs after call: local#1: false, local#3: { 0 }
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.mvir
new file mode 100644
index 000000000..3d20a96e4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/ref_inputs.mvir
@@ -0,0 +1,60 @@
+//# publish
+
+// ref arguments are now allowed
+
+module 0x42.M {
+    struct S has drop { f: u64 }
+
+    public t1(r1: &u64) {
+        label l0:
+        return;
+    }
+
+    public t2(r1: &mut bool) {
+        label l0:
+        return;
+    }
+
+    public t3(r1: &u64, r2: &mut bool, r3: &Self.S, r4: &mut Self.S) {
+        label l0:
+        return;
+    }
+
+    public tgen<T1, T2, T3, T4>(r1: &T1, r2: &mut T2, r3: &T3, r4: &mut T4) {
+        label l0:
+        return;
+    }
+}
+
+//# run --args 0
+main(r1: &u64) {
+    label l0:
+    return;
+}
+
+//# run --args false
+main(r1: &mut bool) {
+    label l0:
+    return;
+}
+
+//# run --args 0 false 0 0
+import 0x42.M;
+main(r1: &u64, r2: &mut bool, r3: &M.S, r4: &mut M.S) {
+    label l0:
+    return;
+}
+
+//# run --type-args u64 bool 0x42::M::S 0x42::M::S --args 0 false 0 0
+main<T1, T2, T3, T4>(r1: &T1, r2: &mut T2, r3: &T3, r4: &mut T4) {
+    label l0:
+    return;
+}
+
+//# run 0x42::M::t1 --args 0
+
+//# run 0x42::M::t2 --args false
+
+//# run 0x42::M::t3 --args 0 false 0 0
+
+//# run 0x42::M::tgen --type-args u64 bool 0x42::M::S 0x42::M::S --args 0 false 0 0
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.exp
new file mode 100644
index 000000000..13f10dcbd
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.exp
@@ -0,0 +1,5 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-20:
+mutable inputs after call: local#4: { 4 }
+return values: 0, { 0000000000000000000000000000000000000000000000000000000000000001 }, { 2 }, { 3 }, 3, 4
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.mvir
new file mode 100644
index 000000000..875876e59
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/return_values.mvir
@@ -0,0 +1,20 @@
+//# publish
+
+// entry points can now return values
+
+module 0x42.M {
+    struct S { f: u64 }
+
+    public t(
+        x: u64,
+        a: signer,
+        s: Self.S,
+        r1: &Self.S,
+        r2: &mut Self.S
+    ): u64 * signer * Self.S * &Self.S * &u64 * &mut u64 {
+        label l0:
+        return move(x), move(a), move(s), copy(r1), &move(r1).S::f, &mut move(r2).S::f;
+    }
+}
+
+//# run 0x42::M::t --args 0 @0x1 2 3 4
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.exp
new file mode 100644
index 000000000..b478f8ff0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.mvir
new file mode 100644
index 000000000..3c3370eb9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args.mvir
@@ -0,0 +1,5 @@
+//# run
+main<T>() { // too few type arguments
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp
new file mode 100644
index 000000000..8bfde526b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-10:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir
new file mode 100644
index 000000000..f8eee9fd8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_few_type_args_inner.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x1.M {
+    struct Ex<T> { flag: bool }
+}
+
+//# run --type-args 0x1::M::Ex
+main<T>() { // too few type args for inner type
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.exp
new file mode 100644
index 000000000..b478f8ff0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.mvir
new file mode 100644
index 000000000..b8072d380
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args.mvir
@@ -0,0 +1,5 @@
+//# run --type-args u64
+main() { // too many type args
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp
new file mode 100644
index 000000000..8bfde526b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 6-10:
+Error: Script execution failed with VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir
new file mode 100644
index 000000000..dad1db44f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_too_many_type_args_inner.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x1.M {
+    struct Ex<T> { flag: bool }
+}
+
+//# run --type-args 0x1::M::Ex<bool,u64>
+main<T>() { // too many type args
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp
new file mode 100644
index 000000000..1dddbff45
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 20-24:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir
new file mode 100644
index 000000000..f02d946cb
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_1.mvir
@@ -0,0 +1,24 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# run --type-args 0x1::Coin::Coin
+main<T: copy + drop>() { // coin does not have copy or drop
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp
new file mode 100644
index 000000000..3c37d5fbf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5:
+Error: Script execution failed with VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir
new file mode 100644
index 000000000..3bd605db3
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_arg_kind_mismatch_2.mvir
@@ -0,0 +1,5 @@
+//# run --type-args bool
+main<T: key>() { // bool does not have key
+label b0:
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.mvir
new file mode 100644
index 000000000..303be015f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/script_type_args_type_eq.mvir
@@ -0,0 +1,54 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct Item has store { _dummy: bool }
+    struct Cup<T> has store { _dummy: bool }
+    struct Box<T> has key { _dummy: bool }
+
+    public type_eq<T1: store, T2: store>(account: &signer): bool acquires Box {
+        let sender: address;
+        let r: bool;
+        let b: bool;
+    label b0:
+        sender = signer.address_of(copy(account));
+        move_to<Box<T1>>(move(account), Box<T1> { _dummy: false });
+        r = exists<Box<T2>>(copy(sender));
+        Box<T1> { _dummy: b } = move_from<Box<T1>>(move(sender));
+        return move(r);
+    }
+}
+// check: "Keep(EXECUTED)"
+
+//# run --type-args u64 --args @0x1
+import 0x42.M;
+
+main<T: store>(account: signer) {
+label b0:
+    assert(M.type_eq<T, u64>(&account), 100);
+    assert(!M.type_eq<T, u8>(&account), 101);
+    return;
+}
+
+
+
+//# run --type-args 0x42::M::Item --args @0x2
+import 0x42.M;
+
+main<T: store>(account: signer) {
+label b0:
+    assert(M.type_eq<T, M.Item>(&account), 100);
+    assert(!M.type_eq<T, u8>(&account), 101);
+    return;
+}
+
+
+//# run --type-args 0x42::M::Cup<0x42::M::Cup<vector<u64>>> --args @0x3
+import 0x42.M;
+
+main<T: store>(account: signer) {
+label b0:
+    assert(M.type_eq<T, M.Cup<M.Cup<vector<u64>>>>(&account), 100);
+    assert(!M.type_eq<T,  M.Cup<M.Cup<vector<u8>>>>(&account), 101);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp
new file mode 100644
index 000000000..9e6ada76f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp
@@ -0,0 +1,11 @@
+processed 4 tasks
+
+task 2 'view'. lines 42-42:
+drop key 0x42::t::Ints {
+    f8: 128u8
+    f16: 32768u16
+    f32: 2147483648u32
+    f64: 9223372036854775808
+    f128: 170141183460469231731687303715884105728u128
+    f256: 57896044618658097711785492504343953926634992332820282019728792003956564819968u256
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move
new file mode 100644
index 000000000..85e996fad
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move
@@ -0,0 +1,44 @@
+//# publish
+module 0x42::t {
+
+    struct Ints has key, drop {
+        f8: u8,
+        f16: u16,
+        f32: u32,
+        f64: u64,
+        f128: u128,
+        f256: u256,
+    }
+
+    public entry fun add(s: signer) {
+        move_to<Ints>(
+            &s,
+            Ints {
+                f8:   0x80,
+                f16:  0x8000,
+                f32:  0x80000000,
+                f64:  0x8000000000000000,
+                f128: 0x80000000000000000000000000000000,
+                f256: 0x8000000000000000000000000000000000000000000000000000000000000000,
+            }
+        )
+    }
+
+    public entry fun remove(a: address) acquires Ints {
+        let Ints { f8, f16, f32, f64, f128, f256} = move_from<Ints>(a);
+        assert!(f8   == 0x80u8, 0);
+        assert!(f16  == 0x8000u16, 0);
+        assert!(f32  == 0x80000000u32, 0);
+        assert!(f64  == 0x8000000000000000u64, 0);
+        assert!(f128 == 0x80000000000000000000000000000000u128, 0);
+        assert!(f256 == 0x8000000000000000000000000000000000000000000000000000000000000000u256, 0);
+
+    }
+
+}
+
+//# run 0x42::t::add --args @0x42
+
+//# view --address 0x42 --resource 0x42::t::Ints
+
+//# run 0x42::t::remove --args @0x42
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.exp b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.exp
new file mode 100644
index 000000000..303d65647
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.exp
@@ -0,0 +1,13 @@
+processed 5 tasks
+
+task 1 'run'. lines 19-24:
+mutable inputs after call: local#2: { 0 }
+
+task 2 'run'. lines 26-30:
+mutable inputs after call: local#2: { 0 }
+
+task 3 'run'. lines 32-32:
+mutable inputs after call: local#2: { 0 }
+
+task 4 'run'. lines 34-34:
+mutable inputs after call: local#2: { 0 }
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.mvir
new file mode 100644
index 000000000..1c9d6bc1c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/entry_points/struct_arguments.mvir
@@ -0,0 +1,34 @@
+//# publish
+
+// struct and struct ref arguments are now allowed
+
+module 0x42.M {
+    struct S has drop { f: u64 }
+
+    public entry foo(s: Self.S, i: &Self.S, m: &mut Self.S) {
+        label l0:
+        return;
+    }
+
+    public entry foo_gen<T: drop>(s:T, i: &T, m: &mut T) {
+        label l0:
+        return;
+    }
+}
+
+//# run --args 0 0 0
+import 0x42.M;
+main(s: M.S, i: &M.S, m: &mut M.S) {
+    label l0:
+    return;
+}
+
+//# run --type-args 0x42::M::S --args 0 0 0
+main<T:drop>(s: T, i: &T, m: &mut T) {
+    label l0:
+    return;
+}
+
+//# run 0x42::M::foo --args 0 0 0
+
+//# run 0x42::M::foo_gen --type-args 0x42::M::S --args 0 0 0
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.exp b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.mvir
new file mode 100644
index 000000000..c31b967b2
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/coin_wrapper.mvir
@@ -0,0 +1,150 @@
+//# publish
+module 0x1.Coin {
+    struct Coin<phantom CoinType> has store { value: u64 }
+
+    public zero<CoinType>(): Self.Coin<CoinType> {
+    label b0:
+        return Coin<CoinType> { value: 0 };
+    }
+
+    public value<CoinType>(c: &Self.Coin<CoinType>): u64 {
+    label b0:
+        return *&move(c).Coin<CoinType>::value;
+    }
+
+    public destroy_zero<CoinType>(c: Self.Coin<CoinType>) {
+    label b0:
+        Coin<CoinType> { } = move(c);
+        _ = ();
+        return;
+    }
+}
+
+//# publish
+module 0x1.YYZ {
+    struct YYZ { unused: bool }
+}
+
+
+//# publish
+module 0x1.M {
+    import 0x1.Coin;
+    import 0x1.signer;
+    import 0x1.YYZ;
+
+    struct Foo<T> has store { x: T }
+    struct CoinWrapper has key { f: Self.Foo<Coin.Coin<YYZ.YYZ>> }
+    struct InnerWrapper has key { f: Self.Foo<Self.Inner>}
+    struct Inner has store { b: vector<u8> }
+
+
+    public coin_wrapper(account: &signer, c: Coin.Coin<YYZ.YYZ>) {
+        let foo: Self.Foo<Coin.Coin<YYZ.YYZ>>;
+        let coin_wrapper: Self.CoinWrapper;
+    label b0:
+        foo = Foo<Coin.Coin<YYZ.YYZ>> {x: move(c)};
+        coin_wrapper = CoinWrapper {f: move(foo)};
+        move_to<CoinWrapper>(move(account), move(coin_wrapper));
+        return;
+    }
+
+    public inner_wrapper(account: &signer, b: vector<u8>) {
+        let foo: Self.Foo<Self.Inner>;
+        let inner_wrapper: Self.InnerWrapper;
+        let inner: Self.Inner;
+    label b0:
+        inner = Inner { b: move(b) };
+        foo = Foo<Self.Inner> {x: move(inner)};
+        inner_wrapper = InnerWrapper {f: move(foo)};
+        move_to<InnerWrapper>(move(account), move(inner_wrapper));
+        return;
+    }
+
+    public get_coin_value(account: &signer): u64 acquires CoinWrapper {
+        let sender: address;
+        let coin_wrapper_ref: &Self.CoinWrapper;
+        let foo_ref: &Self.Foo<Coin.Coin<YYZ.YYZ>>;
+        let coin_ref: &Coin.Coin<YYZ.YYZ>;
+    label b0:
+        sender = signer.address_of(copy(account));
+        coin_wrapper_ref = borrow_global<CoinWrapper>(move(sender));
+        foo_ref = &move(coin_wrapper_ref).CoinWrapper::f;
+        coin_ref = &move(foo_ref).Foo<Coin.Coin<YYZ.YYZ>>::x;
+
+        return Coin.value<YYZ.YYZ>(move(coin_ref));
+    }
+
+    public get_inner(account: &signer): vector<u8> acquires InnerWrapper {
+        let sender: address;
+        let inner_wrapper_ref: &Self.InnerWrapper;
+        let foo_ref: &Self.Foo<Self.Inner>;
+        let inner_ref: &Self.Inner;
+    label b0:
+        sender = signer.address_of(copy(account));
+        inner_wrapper_ref = borrow_global<InnerWrapper>(move(sender));
+        foo_ref = &move(inner_wrapper_ref).InnerWrapper::f;
+        inner_ref = &move(foo_ref).Foo<Self.Inner>::x;
+
+        return *(&move(inner_ref).Inner::b);
+    }
+
+
+    public destroy(account: &signer): Coin.Coin<YYZ.YYZ> acquires CoinWrapper {
+        let sender: address;
+        let coin_wrapper: Self.CoinWrapper;
+        let f: Self.Foo<Coin.Coin<YYZ.YYZ>>;
+        let x: Coin.Coin<YYZ.YYZ>;
+    label b0:
+        sender = signer.address_of(copy(account));
+        coin_wrapper = move_from<CoinWrapper>(move(sender));
+        CoinWrapper {f} = move(coin_wrapper);
+        Foo<Coin.Coin<YYZ.YYZ>> {x} = move(f);
+        return move(x);
+    }
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.YYZ;
+import 0x1.Coin;
+
+main(account: signer) {
+    let coin: Coin.Coin<YYZ.YYZ>;
+    let byte: vector<u8>;
+label b0:
+    byte = h"bac1ac";
+    coin = Coin.zero<YYZ.YYZ>();
+
+    M.coin_wrapper(&account, move(coin));
+    M.inner_wrapper(&account, move(byte));
+
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.YYZ;
+import 0x1.Coin;
+
+main(account: signer) {
+    let coin: Coin.Coin<YYZ.YYZ>;
+    let byte: vector<u8>;
+label b0:
+    byte = h"bac1ac";
+    assert(M.get_coin_value(&account) == 0, 4);
+    assert(M.get_inner(&account) == move(byte), 4);
+    return;
+}
+
+//# run --signers 0x1
+import 0x1.M;
+import 0x1.YYZ;
+import 0x1.Coin;
+
+main(account: signer) {
+    let coin: Coin.Coin<YYZ.YYZ>;
+label b0:
+    coin = M.destroy(&account);
+    Coin.destroy_zero<YYZ.YYZ>(move(coin));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.exp b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.exp
new file mode 100644
index 000000000..e20d099e0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.exp
@@ -0,0 +1,136 @@
+processed 26 tasks
+
+task 2 'run'. lines 246-254:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(1),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 9)],
+}
+
+task 4 'run'. lines 265-273:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(3),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 9)],
+}
+
+task 5 'run'. lines 275-283:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(7),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 61)],
+}
+
+task 7 'run'. lines 294-302:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(6),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 52)],
+}
+
+task 9 'run'. lines 313-321:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(5),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 15)],
+}
+
+task 10 'run'. lines 323-331:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(6),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 52)],
+}
+
+task 11 'run'. lines 333-341:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(3),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(4), 9)],
+}
+
+task 14 'run'. lines 361-369:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(11),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 8)],
+}
+
+task 17 'run'. lines 389-397:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(11),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 8)],
+}
+
+task 18 'run'. lines 399-407:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(15),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 27)],
+}
+
+task 19 'run'. lines 409-417:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(14),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 12)],
+}
+
+task 20 'run'. lines 419-427:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(12),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 15)],
+}
+
+task 21 'run'. lines 429-437:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(9),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(5), 32)],
+}
+
+task 22 'run'. lines 439-450:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(14),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(7), 12)],
+}
+
+task 23 'run'. lines 452-463:
+Error: Script execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(12),
+    location: 0x1::SortedLinkedList,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(6), 15)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.mvir
new file mode 100644
index 000000000..4c942060c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/example_programs/sorted-linked-list.mvir
@@ -0,0 +1,484 @@
+//# publish
+// Implements a sorted linked list in which 0xEryone can insert a new node (e.g. for DNS)
+// but only the list owner/node owner can remove a node
+module 0x1.SortedLinkedList {
+    import 0x1.signer;
+
+    struct Node has key {
+        prev: address, // account address where the previous node is stored (head if no previous node exists)
+        next: address, // account address where the next node is stored (head if no next node exists)
+        head: address, // account address where current list's head is stored -- who0xEr stores head is the owner of the whole list
+        value: u64 //TODO: make generic
+    }
+
+    public node_exists(node_address: address): bool {
+    label b0:
+        return exists<Node>(move(node_address));
+    }
+
+    public get_value_of_node(node_address: address): u64 acquires Node {
+        let node_ref: & Self.Node;
+        let result: u64;
+    label b0:
+        assert(exists<Node>(copy(node_address)), 20);
+
+        node_ref = borrow_global<Node>(move(node_address));
+        result = *&move(node_ref).Node::value;
+
+        return move(result);
+    }
+
+    //checks whether this address is the head of a list -- fails if there is no node here
+    public is_head_node(current_node_address: address): bool acquires Node {
+        let current_node_ref: & Self.Node;
+        let head_node_address: address;
+        let result: bool;
+    label b0:
+        // check that a node exists
+        assert(exists<Node>(copy(current_node_address)), 19);
+
+        // find the head node
+        current_node_ref = borrow_global<Node>(copy(current_node_address));
+        head_node_address = *&move(current_node_ref).Node::head;
+
+        // check if this is the head node
+        result = (move(head_node_address) == move(current_node_address));
+
+        return move(result);
+    }
+
+    //creates a new list whose head is at txn_sender (is owned by the caller)
+    public create_new_list(account: &signer) {
+        let sender_address: address;
+        let head: Self.Node;
+    label b0:
+        sender_address = signer.address_of(copy(account));
+
+        // make sure no node/list is already stored in this account
+        assert(!exists<Node>(copy(sender_address)), 1);
+
+        head = Node {
+            prev: copy(sender_address),
+            next: copy(sender_address),
+            head: move(sender_address),
+            value: 0
+        };
+        move_to<Node>(move(account), move(head));
+
+
+        return;
+    }
+
+    // adds a node that is stored in txn_sender's account and whose location in the list is right after prev_node_address
+    public add_node(account: &signer, value: u64, prev_node_address: address) acquires Node { // TODO: make value generic
+        let sender_address: address;
+        let prev_node_ref: & Self.Node;
+        let prev_node_mut_ref: &mut Self.Node;
+        let next_node_address: address;
+        let next_node_mut_ref: &mut Self.Node;
+        let next_node_ref: & Self.Node;
+        let prev_is_head: bool;
+        let next_is_head: bool;
+        let prev_value: u64; //TODO: make generic
+        let next_value: u64; //TODO: make generic
+        let current_node: Self.Node;
+        let head_address: address;
+    label b0:
+        sender_address = signer.address_of(copy(account));
+
+        // make sure no node is already stored in this account
+        assert(!exists<Node>(copy(sender_address)), 3);
+
+        // make sure a node exists in prev_node_address
+        assert(exists<Node>(copy(prev_node_address)), 5);
+
+        // get a reference to prev_node and find the address and reference to next_node, head
+        prev_node_ref = borrow_global<Node>(copy(prev_node_address));
+        next_node_address = *&copy(prev_node_ref).Node::next;
+        next_node_ref = borrow_global<Node>(copy(next_node_address));
+        head_address = *&copy(next_node_ref).Node::head;
+
+        // see if either prev or next are the head and get their values
+        prev_value = *&move(prev_node_ref).Node::value;
+        next_value = *&move(next_node_ref).Node::value;
+        prev_is_head = Self.is_head_node(copy(prev_node_address));
+        next_is_head = Self.is_head_node(copy(next_node_address));
+
+        // check the order -- the list must be sorted
+        assert(move(prev_is_head) || (move(prev_value) < copy(value)), 6);
+        assert(move(next_is_head) || (move(next_value) > copy(value)), 7);
+
+        // create the new node
+        current_node = Node {
+            prev: copy(prev_node_address),
+            next: copy(next_node_address),
+            head: move(head_address),
+            value: move(value)
+        };
+        move_to<Node>(copy(account), move(current_node));
+
+        // fix the pointers at prev
+        prev_node_mut_ref = borrow_global_mut<Node>(move(prev_node_address));
+        *&mut move(prev_node_mut_ref).Node::next = copy(sender_address);
+
+        // fix the pointers at next
+        next_node_mut_ref = borrow_global_mut<Node>(move(next_node_address));
+        *&mut move(next_node_mut_ref).Node::prev = copy(sender_address);
+
+        return;
+    }
+
+    //can only called by the list owner (head) -- removes the list if it is empty, fails if it is non-empty or if no list is owned by the caller
+    public remove_list(account: &signer) acquires Node {
+        let sender_address: address;
+        let current_node_ref: & Self.Node;
+        let next_node_address: address;
+        let prev_node_address: address;
+        let temp_address: address;
+        let temp_value: u64; //TODO: make generic
+        let temp_bool: bool;
+    label b0:
+        sender_address = signer.address_of(move(account));
+
+        // fail if the caller does not own a list
+        assert(Self.is_head_node(copy(sender_address)), 18);
+
+        assert(exists<Node>(copy(sender_address)), 8);
+        current_node_ref = borrow_global<Node>(copy(sender_address));
+
+        // check that the list is empty
+        next_node_address = *&copy(current_node_ref).Node::next;
+        prev_node_address = *&move(current_node_ref).Node::prev;
+        assert(move(next_node_address) == copy(sender_address), 9);
+        assert(move(prev_node_address) == copy(sender_address), 10);
+
+        // destroy the Node
+        Node{temp_address, temp_address, temp_address, temp_value} = move_from<Node>(copy(sender_address));
+
+        return;
+    }
+
+    // removes the current non-head node -- fails if the passed node is the head of a list
+    public remove_node_by_node_owner(account: &signer) acquires Node {
+        let sender_address: address;
+    label b0:
+        sender_address = signer.address_of(move(account));
+
+        // make sure a node exists
+        assert(exists<Node>(copy(sender_address)), 11);
+
+        // make sure it is not a head node (heads can be removed using remove_list)
+        assert(!Self.is_head_node(copy(sender_address)),12);
+
+        // remove it
+        Self.remove_node(move(sender_address));
+
+        return;
+    }
+
+    public remove_node_by_list_owner(account: &signer, node_address: address) acquires Node {
+        let node_ref: & Self.Node;
+        let list_owner: address;
+    label b0:
+        // make sure the node exists
+        assert(exists<Node>(copy(node_address)), 13);
+
+        // make sure it is not a head node
+        assert(!Self.is_head_node(copy(node_address)), 14);
+
+        // make sure the caller owns the list
+        node_ref = borrow_global<Node>(copy(node_address));
+        list_owner = *&move(node_ref).Node::head;
+        assert(move(list_owner) == signer.address_of(move(account)), 15);
+
+        // remove it
+        Self.remove_node(move(node_address));
+
+        return;
+    }
+
+    //private function used for removing a non-head node -- does not check permissions
+    remove_node(node_address: address) acquires Node {
+        let current_node_ref: & Self.Node;
+        let next_node_address: address;
+        let next_node_mut_ref: &mut Self.Node;
+        let prev_node_address: address;
+        let prev_node_mut_ref: &mut Self.Node;
+        let temp_address: address;
+        let temp_value: u64; //TODO: make generic
+    label b0:
+        // make sure the node exists
+        assert(exists<Node>(copy(node_address)),16);
+
+        // find prev and next
+        current_node_ref = borrow_global<Node>(copy(node_address));
+        next_node_address = *&copy(current_node_ref).Node::next;
+        prev_node_address = *&move(current_node_ref).Node::prev;
+
+
+        //update next
+        next_node_mut_ref = borrow_global_mut<Node>(copy(next_node_address));
+        *&mut move(next_node_mut_ref).Node::prev = copy(prev_node_address);
+
+        //update prev
+        prev_node_mut_ref = borrow_global_mut<Node>(move(prev_node_address));
+        *&mut move(prev_node_mut_ref).Node::next = move(next_node_address);
+
+        //destroy the current node
+        Node {temp_address,temp_address,temp_address,temp_value} = move_from<Node>(move(node_address));
+
+        return;
+    }
+
+
+}
+
+
+//# run --signers 0xA
+//creating a new list _@0xA
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.create_new_list(&account);
+    return;
+}
+
+//# run --signers 0xA
+// attempting to create another list with the same head
+// should abort with code 1
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.create_new_list(&account);
+    return;
+}
+
+//# run --signers 0xB
+// adding a new element to 0xA's list _@0xA -> 10@0xB
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 10, 0xA);
+    return;
+}
+
+//# run --signers 0xB
+// adding another 0xB node
+// should abort with 3
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 12, 0xA);
+    return;
+}
+
+//# run --signers 0xC
+// adding a node that does not satisfy the order between 0xA and 0xB _@0xA -> 15@0xC -> 10@0xB
+// should abort with 7
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 15, 0xA);
+    return;
+}
+
+//# run --signers 0xC
+// adding a node between 0xA and 0xB _@0xA -> 5@0xC -> 10@0xB
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 5, 0xA);
+    return;
+}
+
+//# run --signers 0xD
+// adding a node that does not satisfy order after 0xB _@0xA -> 5@0xC -> 10@0xB -> 4@0xD
+// should abort with 6
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 4, 0xB);
+    return;
+}
+
+//# run --signers 0xD
+// adding a node after 0xB _@0xA -> 5@0xC -> 10@0xB -> 15@0xD
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 15, 0xB);
+    return;
+}
+
+//# run --signers 0xF
+// adding a node after a non-existent node
+// should abort with 5
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 15, 0xE);
+    return;
+}
+
+//# run --signers 0xE
+// adding a node after 0xC with the same value _@0xA -> 5@0xC -> 5@0xE -> 10@0xB -> 15@0xD
+// should abort with 6
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 5, 0xC);
+    return;
+}
+
+//# run --signers 0xC
+// adding a node after itself
+// should abort with 3
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 5, 0xC);
+    return;
+}
+
+//# run --signers 0xE
+// adding a node between 0xC and 0xB _@0xA -> 5@0xC -> 7@0xE -> 10@0xB -> 15@0xD
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 7, 0xC);
+    return;
+}
+
+//# run --signers 0xC
+// remove node  _@0xA -> 7@0xE -> 10@0xB -> 15@0xD
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_node_owner(&account);
+    return;
+}
+
+//# run --signers 0xC
+// remove node again
+// should abort with 11
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_node_owner(&account);
+    return;
+}
+
+//# run --signers 0xC
+// add a new 0xC node elsewhere in the list _@0xA -> 7@0xE -> 9@0xC -> 10@0xB -> 15@0xD
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.add_node(&account, 9, 0xE);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA removes 0xB's node _@0xA -> 7@0xE -> 9@0xC -> 15@0xD
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xB);
+    return;
+}
+
+//# run --signers 0xB
+// 0xB tries to remove his now-non-existent node
+// should abort with 11
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_node_owner(&account);
+    return;
+}
+
+//# run --signers 0xB
+//A non-owner tries to remove a node
+// should abort with 15
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xD);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA attempts to remove her head node
+// should abort with 14
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xA);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA attempts to remove her head node
+// should abort with 12
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_node_owner(&account);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA attempts to remove her list while it is not empty
+// should abort with 9
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_list(&account);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA empties her list and removes it using the wrong method
+// should abort with 14
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xC);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xD);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xE);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xA);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA empties her list and removes it using the wrong method
+// should abort with 12
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xD);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xC);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xE);
+    SortedLinkedList.remove_node_by_node_owner(&account);
+    return;
+}
+
+//# run --signers 0xA
+// 0xA empties her list and removes it
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xE);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xD);
+    SortedLinkedList.remove_node_by_list_owner(&account, 0xC);
+    SortedLinkedList.remove_list(&account);
+    return;
+}
+
+//# run --signers 0xB
+//0xB creates a new list _@0xB
+import 0x1.SortedLinkedList;
+main(account: signer) {
+label b0:
+    SortedLinkedList.create_new_list(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.mvir
new file mode 100644
index 000000000..0ab50c6e8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/address_equality.mvir
@@ -0,0 +1,26 @@
+//# run
+main() {
+    let a1: address;
+    let a2: address;
+    let a3: address;
+    let a4: address;
+    let a5: address;
+    let a6: address;
+    let a7: address;
+label b0:
+    a1 = 0x1;
+    a2 = 0x01;
+    a3 = 0x0001;
+    a4 = 0x00000001;
+    a5 = 0x0000000000000001;
+    a6 = 0x0000000000000000000000000000001;
+    a7 = 0x00000000000000000000000000000001;
+
+    assert(copy(a1) == copy(a2), 42);
+    assert(copy(a2) == copy(a3), 43);
+    assert(copy(a3) == copy(a4), 44);
+    assert(copy(a4) == copy(a5), 45);
+    assert(copy(a5) == copy(a6), 46);
+    assert(copy(a6) == copy(a7), 47);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.exp
new file mode 100644
index 000000000..894e25371
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 85-90:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 109-114:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 116-121:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 125-130:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 148-153:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 155-160:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 162-167:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.mvir
new file mode 100644
index 000000000..6fd0fe48d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u128.mvir
@@ -0,0 +1,167 @@
+//# run
+main() {
+label b0:
+    assert(0u128 + 0u128 == 0u128, 1000);
+    assert(0u128 + 1u128 == 1u128, 1001);
+    assert(1u128 + 1u128 == 2u128, 1002);
+
+    assert(13u128 + 67u128 == 80u128, 1100);
+    assert(100u128 + 10u128 == 110u128, 1101);
+
+    assert(0u128 + 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211455u128, 1200);
+    assert(1u128 + 340282366920938463463374607431768211454u128 == 340282366920938463463374607431768211455u128, 1201);
+    assert(5u128 + 340282366920938463463374607431768211450u128 == 340282366920938463463374607431768211455u128, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u128 + 340282366920938463463374607431768211455u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 264235234643575437864589745863652363451u128 + 98731747836156137656137643716471364731u128;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u128 - 0u128 == 0u128, 2000);
+    assert(1u128 - 0u128 == 1u128, 2001);
+    assert(1u128 - 1u128 == 0u128, 2002);
+
+    assert(52u128 - 13u128 == 39u128, 2100);
+    assert(100u128 - 10u128 == 90u128, 2101);
+
+    assert(340282366920938463463374607431768211455u128 - 340282366920938463463374607431768211455u128 == 0u128, 2200);
+    assert(5u128 - 1u128 - 4u128 == 0u128, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u128 - 1u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u128 - 100u128;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u128 * 0u128 == 0u128, 3000);
+    assert(1u128 * 0u128 == 0u128, 3001);
+    assert(1u128 * 1u128 == 1u128, 3002);
+
+    assert(6u128 * 7u128 == 42u128, 3100);
+    assert(10u128 * 10u128 == 100u128, 3101);
+
+    assert(170141183460469231731687303715884105727u128 * 2u128 == 340282366920938463463374607431768211454u128, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 18446744073709551616u128 * 18446744073709551616u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 170141183460469231731687303715884105728u128 * 2u128;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u128 / 1u128 == 0u128, 4000);
+    assert(1u128 / 1u128 == 1u128, 4001);
+    assert(1u128 / 2u128 == 0u128, 4002);
+
+    assert(6u128 / 3u128 == 2u128, 4100);
+    assert(340282366920938463463374607431768211455u128 / 4315342637u128 == 78854078469537403609736727246u128, 4101);
+
+    assert(340282366920938463463374607431768211454u128 / 340282366920938463463374607431768211455u128 == 0u128, 4200);
+    assert(340282366920938463463374607431768211455u128 / 340282366920938463463374607431768211455u128 == 1u128, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u128 / 0u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u128 / 0u128;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    _ = 340282366920938463463374607431768211455u128 / 0u128;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u128 % 1u128 == 0u128, 5000);
+    assert(1u128 % 1u128 == 0u128, 5001);
+    assert(1u128 % 2u128 == 1u128, 5002);
+
+    assert(8u128 % 3u128 == 2u128, 5100);
+    assert(340282366920938463463374607431768211455u128 % 4315342637u128 == 2264823753u128, 5101);
+
+    assert(340282366920938463463374607431768211454u128 % 340282366920938463463374607431768211455u128 == 340282366920938463463374607431768211454u128, 5200);
+    assert(340282366920938463463374607431768211455u128 % 340282366920938463463374607431768211455u128 == 0u128, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u128 % 0u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u128 % 0u128;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 340282366920938463463374607431768211455u128 % 0u128;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp
new file mode 100644
index 000000000..1ee584a38
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
new file mode 100644
index 000000000..5be851bc6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
@@ -0,0 +1,164 @@
+//# run
+main() {
+label b0:
+    assert(0u16 + 0u16 == 0u16, 1000);
+    assert(0u16 + 1u16 == 1u16, 1001);
+    assert(1u16 + 1u16 == 2u16, 1002);
+
+    assert(13u16 + 67u16 == 80u16, 1100);
+    assert(100u16 + 10u16 == 110u16, 1101);
+
+    assert(0u16 + 65535u16 == 65535u16, 1200);
+    assert(1u16 + 65534u16 == 65535u16, 1201);
+    assert(5u16 + 65530u16 == 65535u16, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 + 65535u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65500u16 + 65500u16;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 - 0u16 == 0u16, 2000);
+    assert(1u16 - 0u16 == 1u16, 2001);
+    assert(1u16 - 1u16 == 0u16, 2002);
+
+    assert(52u16 - 13u16 == 39u16, 2100);
+    assert(100u16 - 10u16 == 90u16, 2101);
+
+    assert(65535u16 - 65535u16 == 0u16, 2200);
+    assert(5u16 - 1u16 - 4u16 == 0u16, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 - 1u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u16 - 100u16;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 * 0u16 == 0u16, 3000);
+    assert(1u16 * 0u16 == 0u16, 3001);
+    assert(1u16 * 1u16 == 1u16, 3002);
+
+    assert(6u16 * 7u16 == 42u16, 3100);
+    assert(10u16 * 10u16 == 100u16, 3101);
+
+    assert(32767u16 * 2u16 == 65534u16, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 256u16 * 256u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 32768u16 * 2u16;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 / 1u16 == 0u16, 4000);
+    assert(1u16 / 1u16 == 1u16, 4001);
+    assert(1u16 / 2u16 == 0u16, 4002);
+
+    assert(6u16 / 3u16 == 2u16, 4100);
+    assert(65535u16 / 121u16 == 541u16, 4101);
+
+    assert(65534u16 / 65535u16 == 0u16, 4200);
+    assert(65535u16 / 65535u16 == 1u16, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 / 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 / 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65535u16 / 0u16;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 % 1u16 == 0u16, 5000);
+    assert(1u16 % 1u16 == 0u16, 5001);
+    assert(1u16 % 2u16 == 1u16, 5002);
+
+    assert(8u16 % 3u16 == 2u16, 5100);
+    assert(65535u16 % 131u16 == 35u16, 5101);
+
+    assert(65534u16 % 65535u16 == 65534u16, 5200);
+    assert(65535u16 % 65535u16 == 0u16, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 % 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 % 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65535u16 % 0u16;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp
new file mode 100644
index 000000000..894e25371
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 85-90:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 109-114:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 116-121:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 125-130:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 148-153:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 155-160:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 162-167:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
new file mode 100644
index 000000000..3365a7cc8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
@@ -0,0 +1,167 @@
+//# run
+main() {
+label b0:
+    assert(0u256 + 0u256 == 0u256, 1000);
+    assert(0u256 + 1u256 == 1u256, 1001);
+    assert(1u256 + 1u256 == 2u256, 1002);
+
+    assert(13u256 + 67u256 == 80u256, 1100);
+    assert(100u256 + 10u256 == 110u256, 1101);
+
+    assert(0u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1200);
+    assert(1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1201);
+    assert(5u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639930u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639932u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639931u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 - 0u256 == 0u256, 2000);
+    assert(1u256 - 0u256 == 1u256, 2001);
+    assert(1u256 - 1u256 == 0u256, 2002);
+
+    assert(52u256 - 13u256 == 39u256, 2100);
+    assert(100u256 - 10u256 == 90u256, 2101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 - 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 2200);
+    assert(5u256 - 1u256 - 4u256 == 0u256, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 - 1u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u256 - 100u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 * 0u256 == 0u256, 3000);
+    assert(1u256 * 0u256 == 0u256, 3001);
+    assert(1u256 * 1u256 == 1u256, 3002);
+
+    assert(6u256 * 7u256 == 42u256, 3100);
+    assert(10u256 * 10u256 == 100u256, 3101);
+
+    assert(57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 57896044618658097711785492504343953926634992332820282019728792003956564819967u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819968u256 * 2u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 / 1u256 == 0u256, 4000);
+    assert(1u256 / 1u256 == 1u256, 4001);
+    assert(1u256 / 2u256 == 0u256, 4002);
+
+    assert(6u256 / 3u256 == 2u256, 4100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 4315342637539806u256 == 26832652459627105301847093122056309129973091557185267691720404u256, 4101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 4200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 1u256, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 / 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 / 0u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 0u256;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 % 1u256 == 0u256, 5000);
+    assert(1u256 % 1u256 == 0u256, 5001);
+    assert(1u256 % 2u256 == 1u256, 5002);
+
+    assert(8u256 % 3u256 == 2u256, 5100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 4315342637539806u256 == 2132250957238311u256, 5101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 5200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 % 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 % 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 0u256;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp
new file mode 100644
index 000000000..1ee584a38
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
new file mode 100644
index 000000000..dc54ffd2b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
@@ -0,0 +1,164 @@
+//# run
+main() {
+label b0:
+    assert(0u32 + 0u32 == 0u32, 1000);
+    assert(0u32 + 1u32 == 1u32, 1001);
+    assert(1u32 + 1u32 == 2u32, 1002);
+
+    assert(13u32 + 67u32 == 80u32, 1100);
+    assert(100u32 + 10u32 == 110u32, 1101);
+
+    assert(0u32 + 4294967295u32 == 4294967295u32, 1200);
+    assert(1u32 + 4294967294u32 == 4294967295u32, 1201);
+    assert(5u32 + 4294967290u32 == 4294967295u32, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 + 4294967295u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294000000u32 + 4294000000u32;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 - 0u32 == 0u32, 2000);
+    assert(1u32 - 0u32 == 1u32, 2001);
+    assert(1u32 - 1u32 == 0u32, 2002);
+
+    assert(52u32 - 13u32 == 39u32, 2100);
+    assert(100u32 - 10u32 == 90u32, 2101);
+
+    assert(4294967295u32 - 4294967295u32 == 0u32, 2200);
+    assert(5u32 - 1u32 - 4u32 == 0u32, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 - 1u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u32 - 100u32;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 * 0u32 == 0u32, 3000);
+    assert(1u32 * 0u32 == 0u32, 3001);
+    assert(1u32 * 1u32 == 1u32, 3002);
+
+    assert(6u32 * 7u32 == 42u32, 3100);
+    assert(10u32 * 10u32 == 100u32, 3101);
+
+    assert(2147483647u32 * 2u32 == 4294967294u32, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 429496u32 * 429496u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 2147483648u32 * 2u32;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 / 1u32 == 0u32, 4000);
+    assert(1u32 / 1u32 == 1u32, 4001);
+    assert(1u32 / 2u32 == 0u32, 4002);
+
+    assert(6u32 / 3u32 == 2u32, 4100);
+    assert(4294967295u32 / 131u32 == 32786009u32, 4101);
+
+    assert(4294967294u32 / 4294967295u32 == 0u32, 4200);
+    assert(4294967295u32 / 4294967295u32 == 1u32, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 / 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 / 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294967295u32 / 0u32;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 % 1u32 == 0u32, 5000);
+    assert(1u32 % 1u32 == 0u32, 5001);
+    assert(1u32 % 2u32 == 1u32, 5002);
+
+    assert(8u32 % 3u32 == 2u32, 5100);
+    assert(4294967295u32 % 131u32 == 116u32, 5101);
+
+    assert(4294967294u32 % 4294967295u32 == 4294967294u32, 5200);
+    assert(4294967295u32 % 4294967295u32 == 0u32, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 % 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 % 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294967295u32 % 0u32;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.exp
new file mode 100644
index 000000000..1ee584a38
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.mvir
new file mode 100644
index 000000000..ccbc3e25c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u64.mvir
@@ -0,0 +1,164 @@
+//# run
+main() {
+label b0:
+    assert(0u64 + 0u64 == 0u64, 1000);
+    assert(0u64 + 1u64 == 1u64, 1001);
+    assert(1u64 + 1u64 == 2u64, 1002);
+
+    assert(13u64 + 67u64 == 80u64, 1100);
+    assert(100u64 + 10u64 == 110u64, 1101);
+
+    assert(0u64 + 18446744073709551615u64 == 18446744073709551615u64, 1200);
+    assert(1u64 + 18446744073709551614u64 == 18446744073709551615u64, 1201);
+    assert(5u64 + 18446744073709551610u64 == 18446744073709551615u64, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u64 + 18446744073709551615u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 12000000000000000000u64 + 10000000000000000000u64;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u64 - 0u64 == 0u64, 2000);
+    assert(1u64 - 0u64 == 1u64, 2001);
+    assert(1u64 - 1u64 == 0u64, 2002);
+
+    assert(52u64 - 13u64 == 39u64, 2100);
+    assert(100u64 - 10u64 == 90u64, 2101);
+
+    assert(18446744073709551615u64 - 18446744073709551615u64 == 0u64, 2200);
+    assert(5u64 - 1u64 - 4u64 == 0u64, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u64 - 1u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u64 - 100u64;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u64 * 0u64 == 0u64, 3000);
+    assert(1u64 * 0u64 == 0u64, 3001);
+    assert(1u64 * 1u64 == 1u64, 3002);
+
+    assert(6u64 * 7u64 == 42u64, 3100);
+    assert(10u64 * 10u64 == 100u64, 3101);
+
+    assert(9223372036854775807u64 * 2u64 == 18446744073709551614u64, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294967296u64 * 4294967296u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 9223372036854775808 * 2u64;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u64 / 1u64 == 0u64, 4000);
+    assert(1u64 / 1u64 == 1u64, 4001);
+    assert(1u64 / 2u64 == 0u64, 4002);
+
+    assert(6u64 / 3u64 == 2u64, 4100);
+    assert(18446744073709551615u64 / 13131u64 == 1404824009878116u64, 4101);
+
+    assert(18446744073709551614u64 / 18446744073709551615u64 == 0u64, 4200);
+    assert(18446744073709551615u64 / 18446744073709551615u64 == 1u64, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u64 / 0u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u64 / 0u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 18446744073709551615u64 / 0u64;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u64 % 1u64 == 0u64, 5000);
+    assert(1u64 % 1u64 == 0u64, 5001);
+    assert(1u64 % 2u64 == 1u64, 5002);
+
+    assert(8u64 % 3u64 == 2u64, 5100);
+    assert(18446744073709551615u64 % 13131u64 == 10419u64, 5101);
+
+    assert(18446744073709551614u64 % 18446744073709551615u64 == 18446744073709551614u64, 5200);
+    assert(18446744073709551615u64 % 18446744073709551615u64 == 0u64, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u64 % 0u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u64 % 0u64;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 18446744073709551615u64 % 0u64;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.exp
new file mode 100644
index 000000000..4dfdee1a5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 146-151:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 153-158:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 160-165:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.mvir
new file mode 100644
index 000000000..2dac2f16a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u8.mvir
@@ -0,0 +1,165 @@
+//# run
+main() {
+label b0:
+    assert(0u8 + 0u8 == 0u8, 1000);
+    assert(0u8 + 1u8 == 1u8, 1001);
+    assert(1u8 + 1u8 == 2u8, 1002);
+
+    assert(13u8 + 67u8 == 80u8, 1100);
+    assert(100u8 + 10u8 == 110u8, 1101);
+
+    assert(0u8 + 255u8 == 255u8, 1200);
+    assert(1u8 + 254u8 == 255u8, 1201);
+    assert(5u8 + 250u8 == 255u8, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u8 + 255u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 215u8 + 156u8;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 - 0u8 == 0u8, 2000);
+    assert(1u8 - 0u8 == 1u8, 2001);
+    assert(1u8 - 1u8 == 0u8, 2002);
+
+    assert(52u8 - 13u8 == 39u8, 2100);
+    assert(100u8 - 10u8 == 90u8, 2101);
+
+    assert(255u8 - 255u8 == 0u8, 2200);
+    assert(5u8 - 1u8 - 4u8 == 0u8, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u8 - 1u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u8 - 100u8;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 * 0u8 == 0u8, 3000);
+    assert(1u8 * 0u8 == 0u8, 3001);
+    assert(1u8 * 1u8 == 1u8, 3002);
+
+    assert(6u8 * 7u8 == 42u8, 3100);
+    assert(10u8 * 10u8 == 100u8, 3101);
+
+    assert(127u8 * 2u8 == 254u8, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 16u8 * 16u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 128u8 * 2u8;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 / 1u8 == 0u8, 4000);
+    assert(1u8 / 1u8 == 1u8, 4001);
+    assert(1u8 / 2u8 == 0u8, 4002);
+
+    assert(6u8 / 3u8 == 2u8, 4100);
+    assert(255u8 / 7u8 == 36u8, 4101);
+
+    assert(254u8 / 255u8 == 0u8, 4200);
+    assert(255u8 / 255u8 == 1u8, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u8 / 0u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u8 / 0u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 255u8 / 0u8;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 % 1u8 == 0u8, 5000);
+    assert(1u8 % 1u8 == 0u8, 5001);
+    assert(1u8 % 2u8 == 1u8, 5002);
+
+    assert(8u8 % 3u8 == 2u8, 5100);
+    assert(255u8 % 7u8 == 3u8, 5101);
+
+    assert(254u8 % 255u8 == 254u8, 5200);
+    assert(255u8 % 255u8 == 0u8, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u8 % 0u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u8 % 0u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 255u8 % 0u8;
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.exp
new file mode 100644
index 000000000..acfa04e68
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 27-47:
+Error: Script execution failed with VMError: {
+    major_status: CALL_BORROWED_MUTABLE_REFERENCE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 19)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.mvir
new file mode 100644
index 000000000..94b52dded
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/assign_struct_field.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x42.Tester {
+    struct T has drop {v: u64}
+
+    public new(v: u64): Self.T  {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public update(t: &mut Self.T) {
+        let vref: &mut u64;
+    label b0:
+        vref = &mut move(t).T::v;
+        *move(vref) = 1;
+        return;
+    }
+
+    public vref(this: &mut Self.T): &u64 {
+        let r: &u64;
+    label b0:
+        r = &copy(this).T::v;
+        _ = move(this);
+        return move(r);
+    }
+}
+
+//# run
+import 0x42.Tester;
+
+main() {
+    let t: Tester.T;
+    let tt: &mut Tester.T;
+    let vref_before: &u64;
+    let ref_t: &mut Tester.T;
+    let vref_after: &u64;
+label b0:
+    t = Tester.new(0);
+    tt = &mut t;
+    vref_before = Tester.vref(move(tt));
+    assert(*copy(vref_before) == 0, 42);
+    ref_t = &mut t;
+    Tester.update(copy(ref_t));
+    vref_after = Tester.vref(move(ref_t));
+    assert(*move(vref_before) == 1, 42);
+    assert(*move(vref_after) == 1, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir
new file mode 100644
index 000000000..995db30c9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir
@@ -0,0 +1,156 @@
+//# run
+main() {
+label b0:
+    assert(0u8 & 0u8 == 0u8, 1000);
+    assert(0u64 & 0u64 == 0u64, 1001);
+    assert(0u128 & 0u128 == 0u128, 1002);
+    assert(0u8 & 42u8 == 0u8, 1003);
+    assert(0u64 & 42u64 == 0u64, 1004);
+    assert(0u128 & 42u128 == 0u128, 1005);
+    assert(0u16 & 0u16 == 0u16, 1000);
+    assert(0u32 & 0u32 == 0u32, 1001);
+    assert(0u256 & 0u256 == 0u256, 1002);
+    assert(0u16 & 42u16 == 0u16, 1003);
+    assert(0u32 & 42u32 == 0u32, 1004);
+    assert(0u256 & 42u256 == 0u256, 1005);
+
+    assert(43u8 & 43u8 == 43u8, 1100);
+    assert(856776467654u64 & 856776467654u64 == 856776467654u64, 1101);
+    assert(4125423653474658754976595u128 & 4125423653474658754976595u128 == 4125423653474658754976595u128, 1102);
+    assert(43u16 & 43u16 == 43u16, 1100);
+    assert(42967295u32 & 42967295u32 == 42967295u32, 1101);
+    assert(4125423653474658754976595u256 & 4125423653474658754976595u256 == 4125423653474658754976595u256, 1102);
+
+
+    assert(255u8 & 255u8 == 255u8, 1200);
+    assert(18446744073709551615u64 & 18446744073709551615u64 == 18446744073709551615u64, 1201);
+    assert(
+        340282366920938463463374607431768211455u128 &
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        1202
+    );
+    assert(65535u16 & 65535u16 == 65535u16, 1200);
+    assert(4294967295u32 & 4294967295u32 == 4294967295u32, 1201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 &
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
+
+    assert(101u8 & 77u8 == 69u8, 1300);
+    assert(675437u64 & 14235u64 == 1545u64, 1301);
+    assert(534263574563786485434889u128 & 3141524387653489576893u128 == 632665710869872675337u128, 1302);
+    assert(101u16 & 77u16 == 69u16, 1300);
+    assert(65437u32 & 14235u32 == 14233u32, 1301);
+    assert(534263574563786485434889u256 & 3141524387653489576893u256 == 632665710869872675337u256, 1302);
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 | 0u8 == 0u8, 2000);
+    assert(0u64 | 0u64 == 0u64, 2001);
+    assert(0u128 | 0u128 == 0u128, 2002);
+    assert(42u8 | 0u8 == 42u8, 2003);
+    assert(42u64 | 0u64 == 42u64, 2004);
+    assert(42u128 | 0u128 == 42u128, 2005);
+    assert(0u16 | 0u16 == 0u16, 2000);
+    assert(0u32 | 0u32 == 0u32, 2001);
+    assert(0u256 | 0u256 == 0u256, 2002);
+    assert(42u16 | 0u16 == 42u16, 2003);
+    assert(42u32 | 0u32 == 42u32, 2004);
+    assert(42u256 | 0u256 == 42u256, 2005);
+
+    assert(43u8 | 43u8 == 43u8, 2100);
+    assert(856776467654u64 | 856776467654u64 == 856776467654u64, 2101);
+    assert(4125423653474658754976595u128 | 4125423653474658754976595u128 == 4125423653474658754976595u128, 2102);
+    assert(43u16 | 43u16 == 43u16, 2100);
+    assert(85677646u32 | 85677646u32 == 85677646u32, 2101);
+    assert(4125423653474658754976595u256 | 4125423653474658754976595u256 == 4125423653474658754976595u256, 2102);
+
+    assert(255u8 | 255u8 == 255u8, 2200);
+    assert(18446744073709551615u64 | 18446744073709551615u64 == 18446744073709551615u64, 2201);
+    assert(
+        340282366920938463463374607431768211455u128 |
+        340282366920938463463374607431768211455u128 ==
+        340282366920938463463374607431768211455u128,
+        2202
+    );
+    assert(65535u16 | 65535u16 == 65535u16, 2200);
+    assert(4294967295u32 | 4294967295u32 == 4294967295u32, 2201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 |
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        2202
+    );
+
+    assert(101u8 | 77u8 == 109u8, 2300);
+    assert(675437u64 | 14235u64 == 688127u64, 2301);
+    assert(534263574563786485434889u128 | 3141524387653489576893u128 == 536772433240570102336445u128, 2302);
+    assert(101u16 | 77u16 == 109u16, 2300);
+    assert(65437u32 | 14235u32 == 65439u32, 2301);
+    assert(534263574563786485434889u256 | 3141524387653489576893u256 == 536772433240570102336445u256, 2302);
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u8 ^ 0u8 == 0u8, 3000);
+    assert(0u64 ^ 0u64 == 0u64, 3001);
+    assert(0u128 ^ 0u128 == 0u128, 3002);
+    assert(13u8 ^ 0u8 == 13u8, 3003);
+    assert(13u64 ^ 0u64 == 13u64, 3004);
+    assert(13u128 ^ 0u128 == 13u128, 3005);
+    assert(0u16 ^ 0u16 == 0u16, 3000);
+    assert(0u32 ^ 0u32 == 0u32, 3001);
+    assert(0u256 ^ 0u256 == 0u256, 3002);
+    assert(13u16 ^ 0u16 == 13u16, 3003);
+    assert(13u32 ^ 0u32 == 13u32, 3004);
+    assert(13u256 ^ 0u256 == 13u256, 3005);
+
+    assert(43u8 ^ 43u8 == 0u8, 3100);
+    assert(856776467654u64 ^ 856776467654u64 == 0u64, 3101);
+    assert(4125423653474658754976595u128 ^ 4125423653474658754976595u128 == 0u128, 3102);
+    assert(43u16 ^ 43u16 == 0u16, 3100);
+    assert(85677646u32 ^ 85677646u32 == 0u32, 3101);
+    assert(4125423653474658754976595u256 ^ 4125423653474658754976595u256 == 0u256, 3102);
+
+    assert(255u8 ^ 255u8 == 0u8, 3200);
+    assert(18446744073709551615u64 ^ 18446744073709551615u64 == 0u64, 3201);
+    assert(
+        340282366920938463463374607431768211455u128 ^
+        340282366920938463463374607431768211455u128 ==
+        0u128,
+        3202
+    );
+    assert(65535u16 ^ 65535u16 == 0u16, 3200);
+    assert(4294967295u32 ^ 4294967295u32 == 0u32, 3201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ^
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        0u256,
+        3202
+    );
+
+    assert(101u8 ^ 77u8 == 40u8, 3300);
+    assert(675437u64 ^ 14235u64 == 686582u64, 3301);
+    assert(534263574563786485434889u128 ^ 3141524387653489576893u128 == 536139767529700229661108u128, 3302);
+    assert(101u16 ^ 77u16 == 40u16, 3300);
+    assert(675437u32 ^ 14235u32 == 686582u32, 3301);
+    assert(534263574563786485434889u256 ^ 3141524387653489576893u256 == 536139767529700229661108u256, 3302);
+
+    assert(13u8 ^ 1u8 == 12u8, 3400);
+    assert(13u64 ^ 1u64 == 12u64, 3401);
+    assert(13u128 ^ 1u128 == 12u128, 3402);
+    assert(13u16 ^ 1u16 == 12u16, 3400);
+    assert(13u32 ^ 1u32 == 12u32, 3401);
+    assert(13u256 ^ 1u256 == 12u256, 3402);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.mvir
new file mode 100644
index 000000000..5783402b3
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/boolean_operators.mvir
@@ -0,0 +1,12 @@
+//# run
+main() {
+label b0:
+  assert((true && false) == false, 99);
+  assert((true || false) == true, 100);
+  assert(!true == false, 101);
+  assert(!false == true, 102);
+  assert(!!true == true, 103);
+  assert(!!false == false, 104);
+
+  return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.exp
new file mode 100644
index 000000000..2f4f39f7e
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.exp
@@ -0,0 +1,289 @@
+processed 38 tasks
+
+task 6 'run'. lines 175-181:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 183-189:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 191-197:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 199-205:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 207-213:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 215-221:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'run'. lines 223-229:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 13 'run'. lines 231-237:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 14 'run'. lines 239-245:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 247-253:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 255-261:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 263-271:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 272-278:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 280-286:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 288-294:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 296-302:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 304-310:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 312-320:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 321-327:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 329-335:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 26 'run'. lines 337-343:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 345-351:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 353-359:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 361-367:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 369-375:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 377-385:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 386-392:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 394-400:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 402-408:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 35 'run'. lines 410-416:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 36 'run'. lines 418-424:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 37 'run'. lines 426-432:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.mvir
new file mode 100644
index 000000000..414f563fd
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/casting_operators.mvir
@@ -0,0 +1,432 @@
+//# run
+// Casting to u8.
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u8(0u8) == 0u8, 1000);
+    assert(to_u8(0u64) == 0u8, 1001);
+    assert(to_u8(0u128) == 0u8, 1002);
+    assert(to_u8(0u16) == 0u8, 1000);
+    assert(to_u8(0u32) == 0u8, 1001);
+    assert(to_u8(0u256) == 0u8, 1002);
+
+    // Random small number unchanged.
+    assert(to_u8(21u8) == 21u8, 1100);
+    assert(to_u8(21u64) == 21u8, 1101);
+    assert(to_u8(21u128) == 21u8, 1102);
+    assert(to_u8(21u16) == 21u8, 1100);
+    assert(to_u8(21u32) == 21u8, 1101);
+    assert(to_u8(21u256) == 21u8, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u8(255u8) == 255u8, 1200);
+    assert(to_u8(255u64) == 255u8, 1201);
+    assert(to_u8(255u128) == 255u8, 1202);
+    assert(to_u8(255u16) == 255u8, 1200);
+    assert(to_u8(255u32) == 255u8, 1201);
+    assert(to_u8(255u256) == 255u8, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u16.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u16(0u8) == 0u16, 1000);
+    assert(to_u16(0u64) == 0u16, 1001);
+    assert(to_u16(0u128) == 0u16, 1002);
+    assert(to_u16(0u16) == 0u16, 1000);
+    assert(to_u16(0u32) == 0u16, 1001);
+    assert(to_u16(0u256) == 0u16, 1002);
+
+    // Random small number unchanged.
+    assert(to_u16(21u8) == 21u16, 1100);
+    assert(to_u16(21u64) == 21u16, 1101);
+    assert(to_u16(21u128) == 21u16, 1102);
+    assert(to_u16(21u16) == 21u16, 1100);
+    assert(to_u16(21u32) == 21u16, 1101);
+    assert(to_u16(21u256) == 21u16, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u16(255u8) == 255u16, 1200);
+    assert(to_u16(65535u64) == 65535u16, 1201);
+    assert(to_u16(65535u128) == 65535u16, 1202);
+    assert(to_u16(65535u16) == 65535u16, 1200);
+    assert(to_u16(65535u32) == 65535u16, 1201);
+    assert(to_u16(65535u256) == 65535u16, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u32.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u32(0u8) == 0u32, 1000);
+    assert(to_u32(0u64) == 0u32, 1001);
+    assert(to_u32(0u128) == 0u32, 1002);
+    assert(to_u32(0u16) == 0u32, 1000);
+    assert(to_u32(0u32) == 0u32, 1001);
+    assert(to_u32(0u256) == 0u32, 1002);
+
+    // Random small number unchanged.
+    assert(to_u32(21u8) == 21u32, 1100);
+    assert(to_u32(21u64) == 21u32, 1101);
+    assert(to_u32(21u128) == 21u32, 1102);
+    assert(to_u32(21u16) == 21u32, 1100);
+    assert(to_u32(21u32) == 21u32, 1101);
+    assert(to_u32(21u256) == 21u32, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u32(255u8) == 255u32, 1200);
+    assert(to_u32(4294967295u64) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u128) == 4294967295u32, 1202);
+    assert(to_u32(65535u16) == 65535u32, 1200);
+    assert(to_u32(4294967295u32) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u256) == 4294967295u32, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u64.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u64(0u8) == 0u64, 2000);
+    assert(to_u64(0u64) == 0u64, 2001);
+    assert(to_u64(0u128) == 0u64, 2002);
+
+    // Random small number unchanged.
+    assert(to_u64(21u8) == 21u64, 2100);
+    assert(to_u64(21u64) == 21u64, 2101);
+    assert(to_u64(21u128) == 21u64, 2102);
+
+    // Max representable values remain unchanged.
+    assert(to_u64(255u8) == 255u64, 2200);
+    assert(to_u64(18446744073709551615u64) == 18446744073709551615u64, 2201);
+    assert(to_u64(18446744073709551615u128) == 18446744073709551615u64, 2202);
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u128.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u128(0u8) == 0u128, 3000);
+    assert(to_u128(0u64) == 0u128, 3001);
+    assert(to_u128(0u128) == 0u128, 3002);
+
+    // Random small number unchanged.
+    assert(to_u128(21u8) == 21u128, 3100);
+    assert(to_u128(21u64) == 21u128, 3101);
+    assert(to_u128(21u128) == 21u128, 3102);
+
+    // Max representable values remain unchanged.
+    assert(to_u128(255u8) == 255u128, 3200);
+    assert(to_u128(18446744073709551615u64) == 18446744073709551615u128, 3201);
+    assert(to_u128(340282366920938463463374607431768211455u128) == 340282366920938463463374607431768211455u128, 3202);
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+
+// Casting to u256.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u256(0u8) == 0u256, 1000);
+    assert(to_u256(0u64) == 0u256, 1001);
+    assert(to_u256(0u128) == 0u256, 1002);
+    assert(to_u256(0u16) == 0u256, 1000);
+    assert(to_u256(0u32) == 0u256, 1001);
+    assert(to_u256(0u256) == 0u256, 1002);
+
+    // Random small number unchanged.
+    assert(to_u256(21u8) == 21u256, 1100);
+    assert(to_u256(21u64) == 21u256, 1101);
+    assert(to_u256(21u128) == 21u256, 1102);
+    assert(to_u256(21u16) == 21u256, 1100);
+    assert(to_u256(21u32) == 21u256, 1101);
+    assert(to_u256(21u256) == 21u256, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u256(255u8) == 255u256, 1200);
+    assert(to_u256(18446744073709551615u64) == 18446744073709551615u256, 1201);
+    assert(to_u256(340282366920938463463374607431768211455u128) == 340282366920938463463374607431768211455u256, 1202);
+    assert(to_u256(65535u16) == 65535u256, 1200);
+    assert(to_u256(4294967295u32) == 4294967295u256, 1201);
+    assert(to_u256(115792089237316195423570985008687907853269984665640564039457584007913129639935u256) == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u8, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u8(256u64);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(303u64);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(256u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(56432u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(256u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(303u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(256u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(303u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(18446744073709551615u64);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(65535u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(4294967295u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+// Casting to u64, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551616u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+// Casting to u16, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551616u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(2561233u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(4294967295u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+// Casting to u32, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551616u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.mvir
new file mode 100644
index 000000000..c12d57825
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/comparison_operators.mvir
@@ -0,0 +1,101 @@
+//# run
+main() {
+label b0:
+    assert(0u8 == 0u8, 1000);
+    assert(0u64 == 0u64, 1001);
+    assert(0u128 == 0u128, 1002);
+
+    assert(!(0u8 == 1u8), 1100);
+    assert(!(0u64 == 1u64), 1101);
+    assert(!(0u128 == 1u128), 1102);
+
+    assert(!(1u8 == 0u8), 1200);
+    assert(!(1u64 == 0u64), 1201);
+    assert(!(1u128 == 0u128), 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    assert(0u8 != 1u8, 2000);
+    assert(0u64 != 1u64, 2001);
+    assert(0u128 != 1u128, 2001);
+
+    assert(1u8 != 0u8, 2100);
+    assert(1u64 != 0u64, 2101);
+    assert(1u128 != 0u128, 2101);
+
+    assert(!(0u8 != 0u8), 2200);
+    assert(!(0u64 != 0u64), 2201);
+    assert(!(0u128 != 0u128), 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    assert(0u8 < 1u8, 3000);
+    assert(0u64 < 1u64, 3001);
+    assert(0u128 < 1u128, 3002);
+
+    assert(!(1u8 < 0u8), 3100);
+    assert(!(1u64 < 0u64), 3101);
+    assert(!(1u128 < 0u128), 3102);
+
+    assert(!(0u8 < 0u8), 3200);
+    assert(!(0u64 < 0u64), 3201);
+    assert(!(0u128 < 0u128), 3202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    assert(1u8 > 0u8, 4000);
+    assert(1u64 > 0u64, 4001);
+    assert(1u128 > 0u128, 4002);
+
+    assert(!(0u8 > 1u8), 4100);
+    assert(!(0u64 > 1u64), 4101);
+    assert(!(0u128 > 1u128), 4102);
+
+    assert(!(0u8 > 0u8), 4200);
+    assert(!(0u64 > 0u64), 4201);
+    assert(!(0u128 > 0u128), 4202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    assert(0u8 <= 1u8, 5000);
+    assert(0u64 <= 1u64, 5001);
+    assert(0u128 <= 1u128, 5002);
+
+    assert(!(1u8 <= 0u8), 5100);
+    assert(!(1u64 <= 0u64), 5101);
+    assert(!(1u128 <= 0u128), 5102);
+
+    assert(0u8 <= 0u8, 5200);
+    assert(0u64 <= 0u64, 5201);
+    assert(0u128 <= 0u128, 5202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    assert(1u8 >= 0u8, 6000);
+    assert(1u64 >= 0u64, 6001);
+    assert(1u128 >= 0u128, 6002);
+
+    assert(!(0u8 >= 1u8), 6100);
+    assert(!(0u64 >= 1u64), 6101);
+    assert(!(0u128 >= 1u128), 6102);
+
+    assert(0u8 >= 0u8, 6200);
+    assert(0u64 >= 0u64, 6201);
+    assert(0u128 >= 0u128, 6202);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.mvir
new file mode 100644
index 000000000..b40872762
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x1.A {
+    struct T has drop {f: u64}
+
+    public new(f: u64): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &Self.T) {
+        let f: &u64;
+        let y: u64;
+    label b0:
+        f = &copy(this).T::f;
+        y = *move(f);
+        assert(copy(y) == 2, 42);
+        _ = move(this);
+        return;
+    }
+}
+
+//# run
+import 0x1.A;
+
+main() {
+    let x: A.T;
+    let x_ref: &A.T;
+label b0:
+    x = A.new(2);
+    x_ref = &x;
+    A.t(move(x_ref));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.mvir
new file mode 100644
index 000000000..a18986c89
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/deref_value_nested.mvir
@@ -0,0 +1,54 @@
+//# publish
+module 0x1.B {
+    struct T has drop {g: u64}
+
+    public new(g: u64): Self.T {
+    label b0:
+        return T{g: move(g)};
+    }
+
+    public t(this: &Self.T) {
+        let g: &u64;
+        let y: u64;
+    label b0:
+        g = &move(this).T::g;
+        y = *move(g);
+        assert(copy(y) == 2, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    import 0x1.B;
+
+    struct T has drop {f: B.T}
+
+    public new(f: B.T): Self.T {
+    label b0:
+        return T{f: move(f)};
+    }
+
+    public t(this: &Self.T) {
+        let f: &B.T;
+    label b0:
+        f = &move(this).T::f;
+        B.t(move(f));
+        return;
+    }
+}
+
+//# run
+import 0x1.A;
+import 0x1.B;
+main() {
+    let b: B.T;
+    let x: A.T;
+    let x_ref: &A.T;
+label b0:
+    b = B.new(2);
+    x = A.new(move(b));
+    x_ref = &x;
+    A.t(move(x_ref));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.mvir
new file mode 100644
index 000000000..49e9f84fb
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/equality_reference_value.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x1.Token {
+    import 0x1.signer;
+
+    struct T has key { count: u64 }
+
+    public test(account: &signer) acquires T {
+        let t_ref: &mut Self.T;
+        let count_ref: &mut u64;
+        let local: u64;
+        let local_ref: &mut u64;
+        let sender: address;
+    label b0:
+        move_to<T>(copy(account), T { count: 0 });
+        sender = signer.address_of(move(account));
+        t_ref = borrow_global_mut<T>(move(sender));
+        count_ref = &mut move(t_ref).T::count;
+        local = 0;
+        local_ref = &mut local;
+        // make sure refs are equal even if one is in global storage and one is local
+        assert(move(count_ref) == move(local_ref), 42);
+        return;
+    }
+}
+
+//# run --signers 0x1
+import 0x1.Token;
+
+main(account: signer) {
+label b0:
+    Token.test(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.mvir
new file mode 100644
index 000000000..d6fe2dbe9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_reads.mvir
@@ -0,0 +1,112 @@
+//# publish
+module 0x42.VTest {
+    struct T has drop {fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t2(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t3(this: &Self.T): bool {
+        let x: &bool;
+    label b0:
+        x = &copy(this).T::fv;
+        _ = move(this);
+        return *move(x);
+    }
+}
+
+//# publish
+
+module 0x42.RTest {
+    struct T{fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t2(this: &Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &copy(this).T::fint;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public t3(this: &Self.T): bool {
+        let x: &bool;
+    label b0:
+        x = &copy(this).T::fv;
+        _ = move(this);
+        return *move(x);
+    }
+
+    public destroy_t(t: Self.T) {
+        let fint: u64;
+        let fv: bool;
+    label b0:
+        T{ fint, fv } = move(t);
+        return;
+    }
+}
+
+//# run
+
+import 0x42.RTest;
+import 0x42.VTest;
+
+main() {
+    let vt: VTest.T;
+    let vref: &VTest.T;
+    let rt: RTest.T;
+    let rref: &RTest.T;
+    let r1: u64;
+    let r2: u64;
+    let r3: u64;
+    let r4: u64;
+    let r5: bool;
+    let r6: bool;
+label b0:
+    vt = VTest.new(0, false);
+    vref = &vt;
+    rt = RTest.new(0, false);
+    rref = &rt;
+
+    r1 = VTest.t1(copy(vref));
+    r2 = RTest.t1(copy(rref));
+
+    r3 = VTest.t2(copy(vref));
+    r4 = RTest.t2(copy(rref));
+
+    r5 = VTest.t3(move(vref));
+    r6 = RTest.t3(move(rref));
+
+    RTest.destroy_t(move(rt));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.mvir
new file mode 100644
index 000000000..cf514a161
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/field_writes.mvir
@@ -0,0 +1,127 @@
+//# publish
+module 0x42.VTest {
+    struct T has drop {fint: u64, fv: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fv: move(y)};
+    }
+
+    public t1(this: &mut Self.T) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = 0;
+        return;
+    }
+
+    public t2(this: &mut Self.T, i: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = move(i);
+        return;
+    }
+
+    public t3(this: &mut Self.T) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fv;
+        *move(x) = *copy(x);
+        return;
+    }
+
+    public t4(this: &mut Self.T, i: bool) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fv;
+        *move(x) = move(i);
+        return;
+    }
+}
+
+//# publish
+
+module 0x42.RTest {
+    struct T{fint: u64, fr: bool}
+
+    public new(x: u64, y: bool): Self.T {
+    label b0:
+        return T{fint: move(x), fr: move(y)};
+    }
+
+    public t1(this: &mut Self.T) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = 0;
+        return;
+    }
+
+    public t2(this: &mut Self.T, i: u64) {
+        let x: &mut u64;
+    label b0:
+        x = &mut move(this).T::fint;
+        *move(x) = move(i);
+        return;
+    }
+
+    public t3(this: &mut Self.T) {
+        let x: &mut bool;
+        let z: bool;
+    label b0:
+        x = &mut move(this).T::fr;
+        z = true;
+        *move(x) = move(z);
+        return;
+    }
+
+    public t4(this: &mut Self.T, i: bool) {
+        let x: &mut bool;
+    label b0:
+        x = &mut move(this).T::fr;
+        *move(x) = move(i);
+        return;
+    }
+
+    public destroy_t(t: Self.T) {
+        let fint: u64;
+        let fr: bool;
+    label b0:
+        T{ fint, fr } = move(t);
+        return;
+    }
+}
+
+//# run
+
+import 0x42.RTest;
+import 0x42.VTest;
+
+main() {
+    let vt: VTest.T;
+    let vref: &mut VTest.T;
+    let rt: RTest.T;
+    let rref: &mut RTest.T;
+label b0:
+    vt = VTest.new(0, false);
+    vref = &mut vt;
+    rt = RTest.new(0, false);
+    rref = &mut rt;
+
+    VTest.t1(copy(vref));
+    RTest.t1(copy(rref));
+
+    VTest.t2(copy(vref), 0);
+    RTest.t2(copy(rref), 0);
+
+    VTest.t3(copy(vref));
+    RTest.t3(copy(rref));
+
+    VTest.t4(move(vref), false);
+    RTest.t4(move(rref), false);
+
+    RTest.destroy_t(move(rt));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.mvir
new file mode 100644
index 000000000..da817ef04
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/operator_precedence.mvir
@@ -0,0 +1,11 @@
+//# run
+main() {
+label b0:
+    assert(true || true && false, 99); // "&&" has precedence over "||"
+    assert(true != false && false != true, 100); // "&&" has precedence over comparisons
+    assert(1 | 3 ^ 1 == 3, 101); // binary XOR has precedence over OR
+    assert(2 ^ 3 & 1 == 3, 102); // binary AND has precedence over XOR
+    assert(3 & 3 + 1 == 0, 103); // addition has precedence over binary AND
+    assert(1 + 2 * 3 == 7, 104); // multiplication has precedence over addition
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.mvir
new file mode 100644
index 000000000..ba267c82a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/pack_unpack.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x42.Test {
+    struct T { i: u64, b: bool }
+
+    public new_t(): Self.T {
+    label b0:
+        return T { i: 0, b: false };
+    }
+
+    public unpack_t(t: Self.T) {
+        let i: u64;
+        let flag: bool;
+    label b0:
+        T { i, b: flag } = move(t);
+        return;
+    }
+
+}
+
+//# run
+import 0x42.Test;
+main() {
+    let t: Test.T;
+label b0:
+    t = Test.new_t();
+    Test.unpack_t(move(t));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.exp
new file mode 100644
index 000000000..6736be6c1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.exp
@@ -0,0 +1,91 @@
+processed 16 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 1 'run'. lines 9-14:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 16-21:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 3 'run'. lines 23-28:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 30-35:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 37-42:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 44-49:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 51-56:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 58-63:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 65-73:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.mvir
new file mode 100644
index 000000000..6efa002ea
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/shift_operators.mvir
@@ -0,0 +1,200 @@
+//# run
+// Number of bits shifted >= total number of bits in the number.
+main() {
+label b0:
+    _ = 0u8 << 8u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u64 << 64u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u128 << 128u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 << 16u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 << 32u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u8 >> 8u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u64 >> 64u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u128 >> 128u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 >> 16u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 >> 32u8;
+    return;
+}
+
+
+// Shifting 0 results in 0.
+//# run
+main() {
+label b0:
+    assert(0u8 << 4u8 == 0u8, 1000);
+    assert(0u64 << 1u8 == 0u64, 1001);
+    assert(0u128 << 127u8 == 0u128, 1002);
+    assert(0u16 << 14u8 == 0u16, 1003);
+    assert(0u32 << 31u8 == 0u32, 1004);
+    assert(0u256 << 249u8 == 0u256, 1005);
+
+    assert(0u8 >> 4u8 == 0u8, 1100);
+    assert(0u64 >> 1u8 == 0u64, 1101);
+    assert(0u128 >> 127u8 == 0u128, 1102);
+    assert(0u16 >> 14u8 == 0u16, 1103);
+    assert(0u32 >> 31u8 == 0u32, 1104);
+    assert(0u256 >> 249u8 == 0u256, 1105);
+    return;
+}
+
+
+
+// Shifting by 0 bits results in the same number.
+//# run
+main() {
+label b0:
+    assert(100u8 << 0u8 == 100u8, 2000);
+    assert(43u64 << 0u8 == 43u64, 2001);
+    assert(57348765484584586725315342563424u128 << 0u8 == 57348765484584586725315342563424u128, 2002);
+    assert(1000u16 << 0u8 == 1000u16, 2003);
+    assert(10000u32 << 0u8 == 10000u32, 2004);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 << 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2005);
+
+    assert(100u8 >> 0u8 == 100u8, 2100);
+    assert(43u64 >> 0u8 == 43u64, 2101);
+    assert(57348765484584586725315342563424u128 >> 0u8 == 57348765484584586725315342563424u128, 2102);
+    assert(1000u16 >> 0u8 == 1000u16, 2103);
+    assert(10000u32 >> 0u8 == 10000u32, 2104);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 >> 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2105);
+    return;
+}
+
+
+
+// shl/shr by 1 equivalent to mul/div by 2.
+//# run
+main() {
+label b0:
+    assert(1u8 << 1u8 == 2u8, 3000);
+    assert(7u64 << 1u8 == 14u64, 3001);
+    assert(1000u128 << 1u8 == 2000u128, 3002);
+    assert(3u16 << 1u8 == 6u16, 3003);
+    assert(7u32 << 1u8 == 14u32, 3004);
+    assert(1000u256 << 1u8 == 2000u256, 3005);
+
+    assert(1u8 >>1u8 == 0u8, 3100);
+    assert(7u64 >> 1u8 == 3u64, 3101);
+    assert(1000u128 >> 1u8 == 500u128, 3102);
+    assert(3u16 >> 1u8 == 1u16, 3103);
+    assert(7u32 >> 1u8 == 3u32, 3104);
+    assert(1000u256 >> 1u8 == 500u256, 3105);
+    return;
+}
+
+
+
+// Underflowing results in 0.
+//# run
+main() {
+label b0:
+    assert(1234u64 >> 63u8 == 0u64, 4000);
+    assert(3u8 >> 5u8 == 0u8, 4001);
+    assert(43152365326753472145312542634526753u128 >> 127u8 == 0u128, 4002);
+    assert(1234u16 >> 15u8 == 0u16, 4003);
+    assert(123456u32 >> 31u8 == 0u32, 4004);
+    assert(11579208923731619542357098500868790785326998466564056403945758400791312963993u256 >> 255u8 == 0u256, 4005);
+    return;
+}
+
+
+
+// Overflowing results are truncated.
+//# run
+main() {
+label b0:
+    assert(7u8 << 7u8 == 128u8, 5000);
+    assert(7u64 << 62u8 == 13835058055282163712u64, 5001);
+    assert(2u128 << 127u8 == 0u128, 5002);
+    assert(7u16 << 15u8 == 32768u16, 5003);
+    assert(17u32 << 30u8 == 1073741824u32, 5004);
+    assert(7u256 << 254u8 == 86844066927987146567678238756515930889952488499230423029593188005934847229952u256, 5005);
+    return;
+}
+
+
+
+// Some random tests.
+//# run
+main() {
+label b0:
+    assert(54u8 << 3u8 == 176u8, 6000);
+    assert(5u8 << 2u8 == 20u8, 6001);
+    assert(124u8 << 5u8 == 128u8, 6002);
+
+    assert(326348456u64 << 13u8 == 2673446551552u64, 6100);
+    assert(218u64 << 30u8 == 234075717632u64, 6101);
+    assert(345325745376476456u64 << 47u8 == 2203386117691015168u64, 6102);
+
+    assert(95712896789423756892376u128 << 4u8 == 1531406348630780110278016u128, 6200);
+    assert(8629035907847368941279654523567912314u128 << 77u8 == 317056859699765342273530379836650946560u128, 6201);
+    assert(5742389768935678297185789157531u128 << 10u8 == 5880207123390134576318248097311744u128, 6202);
+    assert(295429678238907658936718926478967892769u128 << 83u8 == 78660438169199498567214234129963941888u128, 6203);
+
+    assert(12u16 << 4u8 == 192u16, 6300);
+    assert(1234u16 << 12u8 == 8192u16, 6301);
+    assert(6553u16 << 15u8 == 32768u16, 6302);
+
+    assert(1234567u32 << 12u8 == 761819136u32, 6400);
+    assert(1234567u32 << 17u8 == 2903375872u32, 6401);
+    assert(12345671u32 << 27u8 == 939524096u32, 6402);
+
+    assert(123u256 << 1u8 == 246u256, 6500);
+    assert(123453u256 << 13u8 == 1011326976u256, 6501);
+    assert(123453678909u256 << 76u8 == 9327896247469005265829994770202624u256, 6502);
+    assert(1234536789093546757803u256 << 168u8 == 461895049882996264654333091841553462264195467433049741837793730775482368u256, 6503);
+    assert(1234536789093546757803786604381691994985672142341299639418u256 << 202u8 == 33658913632735705985908889087832028406806276615240336691180752852867975479296u256, 6504);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.mvir
new file mode 100644
index 000000000..f000bd98d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/simple_arithmetic.mvir
@@ -0,0 +1,11 @@
+//# run
+main() {
+    let a: u64;
+    let b: u64;
+label b0:
+    a = 2 + 3;
+    assert(copy(a) == 5, 42);
+    b = copy(a) - 1;
+    assert(copy(b) == 4, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.exp b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.mvir
new file mode 100644
index 000000000..b8423d9bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/instructions/vec_copy_nested.mvir
@@ -0,0 +1,110 @@
+//# publish
+module 0x42.DeepCopy {
+    import 0x1.vector;
+
+    struct Config has copy, drop, store { i: u64 }
+    struct Nested has copy, drop, store { c: Self.Config }
+
+    public test_struct_shallow() {
+        let c1: Self.Config;
+        let c2: Self.Config;
+    label b0:
+        c1 = Config { i: 0 };
+        c2 = copy(c1);
+
+        // mutate c1.i to 1
+        *(&mut (&mut c1).Config::i) = 1;
+        // c2.i should still be 0
+        assert(*&(&c2).Config::i == 0, 77);
+
+        // mutate c2.i to 2
+        *(&mut (&mut c2).Config::i) = 2;
+        // c1.i should still be 1
+        assert(*&(&c1).Config::i == 1, 78);
+
+        return;
+    }
+
+    public test_struct_deep() {
+        let n1: Self.Nested;
+        let n2: Self.Nested;
+    label b0:
+        n1 = Nested { c: Config { i: 0 } };
+        n2 = copy(n1);
+
+        // mutate n1.c.i to 1
+        *(&mut (&mut (&mut n1).Nested::c).Config::i) = 1;
+        // n2.c.i should still be 0
+        assert(*&(&(&n2).Nested::c).Config::i == 0, 79);
+        // n1.c.i is 1
+        assert(*&(&(&n1).Nested::c).Config::i == 1, 80);
+
+        // mutate n2.c.i to 2
+        *(&mut (&mut (&mut n2).Nested::c).Config::i) = 2;
+        // n1.c.i should still be 1
+        assert(*&(&(&n1).Nested::c).Config::i == 1, 81);
+        // n2.c.i is 2
+        assert(*&(&(&n2).Nested::c).Config::i == 2, 82);
+
+        return;
+    }
+
+    public test_vector() {
+        let v1: vector<u64>;
+        let v2: vector<u64>;
+    label b0:
+        v1 = vector.empty<u64>();
+        vector.push_back<u64>(&mut v1, 0);
+        v2 = copy(v1);
+        *vector.borrow_mut<u64>(&mut v1, 0) = 1;
+        assert(*vector.borrow<u64>(&v2, 0) == 0, 83);
+
+        *vector.borrow_mut<u64>(&mut v2, 0) = 2;
+        assert(*vector.borrow<u64>(&v1, 0) == 1, 84);
+
+        return;
+    }
+
+    public test_vector_to_struct() {
+        let v1: vector<Self.Config>;
+        let v2: vector<Self.Config>;
+        let c1: Self.Config;
+        let c2: Self.Config;
+        let r1: &mut Self.Config;
+        let r2: &mut Self.Config;
+        let ri1: &mut u64;
+    label b0:
+        c1 = Config { i: 0 };
+        c2 = copy(c1);
+        *(&mut (&mut c2).Config::i) = 1;
+
+        v1 = vector.empty<Self.Config>();
+        vector.push_back<Self.Config>(&mut v1, move(c1));
+        vector.push_back<Self.Config>(&mut v1, move(c2));
+        v2 = copy(v1);
+
+        r1 = vector.borrow_mut<Self.Config>(&mut v1, 0);
+        r2 = vector.borrow_mut<Self.Config>(&mut v2, 0);
+        assert(*&copy(r1).Config::i == 0, 90);
+        assert(*&copy(r1).Config::i == *&move(r2).Config::i, 91);
+        r2 = vector.borrow_mut<Self.Config>(&mut v2, 1);
+        assert(*&copy(r2).Config::i == 1, 91);
+        assert(*&copy(r1).Config::i != *&copy(r2).Config::i, 91);
+        *&mut copy(r1).Config::i = 1;
+        assert(*&copy(r1).Config::i == *&copy(r2).Config::i, 92);
+
+        return;
+    }
+}
+
+//# run
+import 0x42.DeepCopy;
+
+main() {
+label b0:
+    DeepCopy.test_struct_shallow();
+    DeepCopy.test_struct_deep();
+    DeepCopy.test_vector();
+    DeepCopy.test_vector_to_struct();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.mvir
new file mode 100644
index 000000000..e6467b8f6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use.mvir
@@ -0,0 +1,68 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x42.MoneyHolder {
+    import 0x1.Coin;
+
+    struct T { money: Coin.Coin }
+
+    public new(m: Coin.Coin): Self.T {
+    label b0:
+        return T{ money: move(m) };
+    }
+
+    public value(this :&Self.T): u64 {
+        let ref: &Coin.Coin;
+        let val: u64;
+    label b0:
+        ref = &copy(this).T::money;
+        val = Coin.value(move(ref));
+        _ = move(this);
+        return move(val);
+    }
+
+    public destroy_t(t: Self.T) {
+        let money: Coin.Coin;
+    label b0:
+        T{ money } = move(t);
+        Coin.destroy_zero(move(money));
+        return;
+    }
+}
+
+//# run
+import 0x42.MoneyHolder;
+import 0x1.Coin;
+
+main() {
+    let coin: Coin.Coin;
+    let money_holder: MoneyHolder.T;
+    let money_holder_ref: &MoneyHolder.T;
+    let value: u64;
+label b0:
+    coin = Coin.zero();
+    money_holder = MoneyHolder.new(move(coin));
+    money_holder_ref = &money_holder;
+    value = MoneyHolder.value(move(money_holder_ref));
+    assert(copy(value) == 0, 42);
+    MoneyHolder.destroy_t(move(money_holder));
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir
new file mode 100644
index 000000000..38a26c462
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_2.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x42.M {
+    public max(a: u64, b: u64): u64 {
+    label b0:
+        jump_if (copy(a) > copy(b)) b2;
+    label b1:
+        return copy(b);
+    label b2:
+        return copy(a);
+    }
+
+    public sum(a: u64, b: u64): u64 {
+        let c: u64;
+    label b0:
+        c = copy(a) + copy(b);
+        return copy(c);
+    }
+}
+
+//# run
+import 0x42.M;
+
+main() {
+    let a: u64;
+    let b: u64;
+    let c: u64;
+    let d: u64;
+label b0:
+    a = 10;
+    b = 2;
+    c = M.max(copy(a), copy(b));
+    d = M.sum(copy(a), copy(b));
+    assert(copy(c) == 10, 42);
+    assert(copy(d) == 12, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir
new file mode 100644
index 000000000..f0903a934
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_3.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x42.M {
+    public case(a: u64, b: bool): u64 {
+    label b0:
+        jump_if (copy(b)) b2;
+    label b1:
+        return 42;
+    label b2:
+        return copy(a);
+    label b3:
+        return 112;
+    }
+}
+
+//# run
+import 0x42.M;
+
+main() {
+    let a: u64;
+label b0:
+    a = 10;
+    a = M.case(move(a), false);
+    assert(copy(a) == 42, 41);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir
new file mode 100644
index 000000000..9e2792960
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_module_and_use_with_multiple_return_values.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x42.M {
+    public id3(a: u64, b: bool, c: address): u64 * bool * address {
+    label b0:
+        return move(a), move(b), move(c);
+    }
+}
+
+//# run
+import 0x42.M;
+
+main() {
+    let a: u64;
+    let b: bool;
+    let c: address;
+label b0:
+    a = 10;
+    b = false;
+    c = 0x0;
+
+    a, b, c = M.id3(move(a), move(b), move(c));
+    assert(move(a) == 10, 42);
+    assert(move(b) == false, 43);
+    assert(move(c) == 0x0, 44);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.mvir
new file mode 100644
index 000000000..5500ac427
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/publish_two_modules.mvir
@@ -0,0 +1,94 @@
+//# publish
+module 0x1.Coin {
+    struct Coin { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+    public destroy_zero(c: Self.Coin) {
+    label b0:
+        Coin {} = move(c);
+        assert(() == 0, 42);
+        return;
+    }
+}
+
+//# publish
+module 0x42.MoneyHolder {
+    import 0x1.Coin;
+
+    struct T { money: Coin.Coin }
+
+    public new(m: Coin.Coin): Self.T {
+    label b0:
+        return T{ money: move(m) };
+    }
+
+    public value(this :&Self.T): u64 {
+        let ref: &Coin.Coin;
+        let val: u64;
+    label b0:
+        ref = &copy(this).T::money;
+        val = Coin.value(move(ref));
+        _ = move(this);
+        return move(val);
+    }
+
+    public destroy_t(t: Self.T) {
+        let money: Coin.Coin;
+    label b0:
+        T{ money } = move(t);
+        Coin.destroy_zero(move(money));
+        return;
+    }
+}
+
+//# publish
+module 0x42.Bar {
+        struct T has drop {baz: u64}
+        public new(m: u64): Self.T {
+        label b0:
+            return T{baz: move(m)};
+        }
+        public value(this: &Self.T): u64 {
+            let ref: &u64;
+        label b0:
+            ref = &move(this).T::baz;
+            return *move(ref);
+        }
+}
+
+//# run
+import 0x42.MoneyHolder;
+import 0x42.Bar;
+import 0x1.Coin;
+
+main() {
+    let coin: Coin.Coin;
+    let money_holder: MoneyHolder.T;
+    let money_holder_ref: &MoneyHolder.T;
+    let value: u64;
+    let v: u64;
+    let bar: Bar.T;
+    let bar_ref: &Bar.T;
+    let v2: u64;
+label b0:
+    coin = Coin.zero();
+    money_holder = MoneyHolder.new(move(coin));
+    money_holder_ref = &money_holder;
+
+    value = MoneyHolder.value(move(money_holder_ref));
+    assert(copy(value) == 0, 42);
+    MoneyHolder.destroy_t(move(money_holder));
+
+    v = 1;
+    bar = Bar.new(copy(v));
+    bar_ref = &bar;
+    v2 = Bar.value(move(bar_ref));
+    assert(copy(v) == copy(v2), 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.mvir
new file mode 100644
index 000000000..edc254fdf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible.mvir
@@ -0,0 +1,8 @@
+//# publish
+// Publishing a compatible module should be allowed
+module 0x42.Currency {
+}
+
+//# publish
+module 0x42.Currency {
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.exp
new file mode 100644
index 000000000..2301000e5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.mvir
new file mode 100644
index 000000000..9129d77a8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_entry.mvir
@@ -0,0 +1,49 @@
+// entry can be added to functions
+
+//# publish
+module 0x42.Priv {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Priv {
+    entry foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Pub {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Pub {
+    public entry foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Fr {
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Fr {
+    public(friend) entry foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.mvir
new file mode 100644
index 000000000..73a6556a8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_add_friend.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x42.A {
+}
+
+//# publish
+module 0x42.B {
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.A;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.A;
+    friend 0x42.B;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.exp
new file mode 100644
index 000000000..457ace9c4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.exp
@@ -0,0 +1 @@
+processed 4 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.mvir
new file mode 100644
index 000000000..49e6f487e
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_compatible_friend_fn_to_public.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x42.N {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // okay to increase visibility
+    public foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp
new file mode 100644
index 000000000..1c2f44bd4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'publish'. lines 39-46:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir
new file mode 100644
index 000000000..c8e1d2341
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir
@@ -0,0 +1,46 @@
+//# publish
+module 0x42.A {
+    public foo(): u64 {
+    label b0:
+        return 5;
+    }
+}
+
+//# publish
+module 0x43.B {
+    import 0x42.A;
+    public foo(): u64 {
+    label b0:
+        return A.foo();
+    }
+}
+
+//# publish
+module 0x44.C {
+    import 0x43.B;
+    public foo(): u64 {
+    label b0:
+        return B.foo();
+    }
+}
+
+//# run
+import 0x44.C;
+
+main() {
+    let f: u64;
+label b0:
+    f = C.foo();
+    assert(move(f) == 5, 42);
+    return;
+}
+
+
+//# publish
+module 0x42.A {
+    import 0x44.C;
+    public foo(): u64 {
+    label b0:
+        return C.foo();
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp
new file mode 100644
index 000000000..bf028fa1b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 15-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_FRIENDSHIP,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir
new file mode 100644
index 000000000..f007fe9ce
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x42.A {
+}
+
+//# publish
+module 0x42.B {
+   friend 0x42.A;
+}
+
+//# publish
+module 0x42.C {
+    friend 0x42.B;
+}
+
+//# publish
+module 0x42.A {
+    friend 0x42.C;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp
new file mode 100644
index 000000000..7784f42b4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 24-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir
new file mode 100644
index 000000000..18b9bc107
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x42.A {
+    struct A has store{
+        f: u64,
+    }
+}
+
+//# publish
+module 0x43.B {
+    import 0x42.A;
+    struct B has store{
+        a: A.A,
+    }
+}
+
+//# publish
+module 0x44.C {
+    import 0x43.B;
+    struct C has store{
+        b: B.B,
+    }
+}
+
+//# publish
+module 0x42.A {
+    import 0x44.C;
+    struct A has store{
+        f: u64,
+    }
+    struct A2 has store{
+        c: C.C,
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp
new file mode 100644
index 000000000..156da5f25
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.mvir
new file mode 100644
index 000000000..e16993d55
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_friend_fn.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x42.N {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // cannot change signature
+    public(friend) foo(): bool {
+    label b0:
+        return false;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp
new file mode 100644
index 000000000..ac509ab72
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-22:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.mvir
new file mode 100644
index 000000000..361a74a8c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_change_unused_friend_fn.mvir
@@ -0,0 +1,22 @@
+//# publish
+module 0x42.N {
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // cannot change function signature
+    public(friend) foo(): bool {
+    label b0:
+        return false;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp
new file mode 100644
index 000000000..9e16630ca
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.mvir
new file mode 100644
index 000000000..bda8f580d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_friend_fn.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x42.N {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // cannot remove visible function
+}
+// check: BACKWARD_INCOMPATIBLE_MODULE_UPDATE
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp
new file mode 100644
index 000000000..ca8f6fa76
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-18:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.mvir
new file mode 100644
index 000000000..b2b224b8f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_delete_unused_friend_fn.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x42.N {
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // cannot remove non internal functions
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp
new file mode 100644
index 000000000..4a7cab0d8
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-35:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.mvir
new file mode 100644
index 000000000..efca87c8d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_friend.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x42.N {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    // cannot drop friends
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp
new file mode 100644
index 000000000..9c9188a9c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'publish'. lines 14-21:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.mvir
new file mode 100644
index 000000000..6405ebd9f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_drop_unlinked_friend.mvir
@@ -0,0 +1,21 @@
+//# publish
+module 0x42.N {
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    // cannot remove friends
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp
new file mode 100644
index 000000000..e1799772e
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.exp
@@ -0,0 +1,28 @@
+processed 6 tasks
+
+task 1 'publish'. lines 11-17:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Priv'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 27-33:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Pub'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 5 'publish'. lines 43-49:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Fr'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.mvir
new file mode 100644
index 000000000..0997ad361
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_entry_removed.mvir
@@ -0,0 +1,49 @@
+// entry cannot be removed from functions
+
+//# publish
+module 0x42.Priv {
+    entry foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Priv {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Pub {
+    public entry foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Pub {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Fr {
+    public(friend) entry foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.Fr {
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp
new file mode 100644
index 000000000..256b0148c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 39-39:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir
new file mode 100644
index 000000000..88af6c2f0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x42.N {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    public foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish --skip-check-friend-linking
+module 0x42.M {
+    friend 0x42.N;
+    // `--skip-check-friend-linking` allow make `friend` visibility more restrictive
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+/// `--skip-check-friend-linking` upgrade will break the caller.
+//# run 0x42::N::foo
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp
new file mode 100644
index 000000000..5453beaf0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 34-34:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir
new file mode 100644
index 000000000..047f1e94c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x42.N {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    public foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish --skip-check-friend-linking
+module 0x42.M {
+    // `--skip-check-friend-linking` allow remove `friend` function
+}
+
+/// `--skip-check-friend-linking` upgrade will break the caller.
+//# run 0x42::N::foo
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp
new file mode 100644
index 000000000..156da5f25
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 28-36:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.mvir
new file mode 100644
index 000000000..05811249b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_to_private.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x42.N {
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    // cannot make visibility more restrictive
+    foo() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp
new file mode 100644
index 000000000..d04d7f5ea
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 6-10:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.mvir
new file mode 100644
index 000000000..77940191b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout.mvir
@@ -0,0 +1,10 @@
+//# publish
+module 0x42.Duplicate {
+  struct T { f: u64 }
+}
+
+//# publish
+module 0x42.Duplicate {
+  struct T { f: u64, g: bool }
+  // cannot add fields to public types
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
new file mode 100644
index 000000000..675f71e25
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 7-13:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir
new file mode 100644
index 000000000..96b26cc62
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x42.Duplicate {
+  struct U { f: u64 }
+  struct T { f: Self.U }
+}
+
+//# publish
+module 0x42.Duplicate {
+  struct U { f: u64 }
+  struct U2 { f: u64 }
+  struct T { f: Self.U2 }
+  // cannot change fields type
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp
new file mode 100644
index 000000000..2a53da927
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 7-11:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::Duplicate'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.mvir
new file mode 100644
index 000000000..daa711bb0
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_linking.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.Duplicate {
+  public f() { label b0: return; }
+  public g() { label b0: return; }
+}
+
+//# publish
+module 0x42.Duplicate {
+  public f() { label b0: return; }
+  // cannot drop public functions
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp
new file mode 100644
index 000000000..ddb83526e
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 5 'run'. lines 69-69:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x43::B,
+    indices: [(FunctionHandle, 2)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir
new file mode 100644
index 000000000..94756f3a9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir
@@ -0,0 +1,69 @@
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  public new(f: u64): Self.A {
+  label b0:
+    return A { f: move(f) };
+  }
+  public f(a: &Self.A) :u64 {
+  label b0:
+      return *&move(a).A::f;
+  }
+}
+
+//# publish
+module 0x43.B {
+  import 0x42.A;
+  public f(a: &A.A) :u64 {
+  label b0:
+    return A.f(move(a));
+  }
+
+  public m(){
+    let a: A.A;
+    let f: u64;
+  label b0:
+    a = A.new(1);
+    f = Self.f(&a);
+    assert(move(f) == 1, 42);
+    return;
+  }
+}
+
+//# publish
+module 0x44.C {
+  import 0x43.B;
+
+  public entry m(){
+  label b0:
+    B.m();
+    return;
+  }
+}
+
+//# run 0x44::C::m
+
+
+//# publish --skip-check-struct-and-pub-function-linking
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct A1 has store,drop {
+        f: u64,
+  }
+  public new(f: u64): Self.A {
+  label b0:
+    return A { f: move(f) };
+  }
+  // change the origin function signature
+  public f(a: &Self.A1) :u64 {
+  label b0:
+      return *&move(a).A1::f;
+  }
+}
+
+
+//# run 0x44::C::m
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
new file mode 100644
index 000000000..a0ea749d9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
@@ -0,0 +1,28 @@
+processed 5 tasks
+
+task 2 'publish'. lines 18-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 25-45:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::A'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'run'. lines 47-47:
+Error: Function execution failed with VMError: {
+    major_status: FUNCTION_RESOLUTION_FAILURE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
new file mode 100644
index 000000000..00f2d8f21
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct K has key, store,drop {
+        a: Self.A,
+  }
+  public entry make_save_k(sender: signer){
+  label b0:
+    move_to<K>(&sender, K { a: A { f: 100 } });
+    return;
+  }
+}
+
+//# run 0x42::A::make_save_k --signers 0x42
+
+//# publish --skip-check-struct-and-pub-function-linking
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+}
+
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct B has store,drop {
+        f: u64,
+  }
+  struct K has key, store,drop {
+        a: Self.B,
+  }
+  public entry take_check_k() acquires K {
+    let a: Self.B;
+    let f: u64;
+  label b0:
+    K { a } = move_from<K>(0x42);
+    B { f } = move(a);
+    assert(move(f) == 100, 42);
+    return;
+  }
+}
+
+//# run 0x42::A::take_check_k
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.exp b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.exp
new file mode 100644
index 000000000..82b221907
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 2 'publish'. lines 17-31:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000043.M.foo
+
+task 3 'run'. lines 33-40:
+Error: Unbound function 0000000000000000000000000000000000000000000000000000000000000042.M.run
+
+task 5 'run'. lines 50-65:
+Error: Dependency not provided for 0000000000000000000000000000000000000000000000000000000000000044.M
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.mvir
new file mode 100644
index 000000000..e6dc83f22
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/module_publishing/use_modules_published.mvir
@@ -0,0 +1,65 @@
+//# publish
+module 0x42.M {
+    public foo(): u64 {
+    label b0:
+        return 5;
+    }
+}
+
+//# publish
+module 0x43.M {
+    public bar(): u64 {
+    label b0:
+        return 7;
+    }
+}
+
+//# publish
+module 0x44.M {
+    import 0x43.M as M1;
+    import 0x44.M as M2;
+
+    public run() {
+        let x: u64;
+    label b0:
+        x = M1.foo();
+        assert(move(x) == 5, 42);
+        x = M2.bar();
+        assert(move(x) == 7, 42);
+        return;
+    }
+}
+
+//# run
+import 0x42.M;
+
+main() {
+label b0:
+    M.run();
+    return;
+}
+
+//# publish
+module 0x45.M {
+    public baz(): u64 {
+    label b0:
+        return 9;
+    }
+}
+
+//# run
+import 0x42.M as M1;
+import 0x43.M as M2;
+import 0x44.M as M3;
+
+main() {
+    let x: u64;
+label b0:
+    x = M1.foo();
+    assert(move(x) == 5, 42);
+    x = M2.bar();
+    assert(move(x) == 7, 42);
+    x = M3.baz();
+    assert(move(x) == 9, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir
new file mode 100644
index 000000000..22406543c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/clever_non_existant_native_function.mvir
@@ -0,0 +1,15 @@
+//# publish
+module 0x42.Hash {
+    native public sha2_256(data: vector<u8>): vector<u8>;
+    native public sha3_256(data: vector<u8>): vector<u8>;
+}
+
+//# publish
+module 0x43.Hash {
+    native public sha2_256(data: vector<u8>): vector<u8>;
+}
+
+//# publish
+module 0x44.Hash {
+    native public sha3_256(data: vector<u8>): vector<u8>;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.mvir
new file mode 100644
index 000000000..a147519a1
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/non_existant_native_function.mvir
@@ -0,0 +1,5 @@
+//# publish
+module 0x42.No {
+    // error as there is no native function to link against
+    native public made_up(x: u64): u64;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.mvir
new file mode 100644
index 000000000..8b1184e55
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_module.mvir
@@ -0,0 +1,74 @@
+//# publish
+module 0x1.Coin {
+    struct Coin has store { value: u64 }
+    public value(c: &Self.Coin): u64 {
+    label b0:
+        return *&move(c).Coin::value;
+    }
+    public zero(): Self.Coin {
+    label b0:
+        return Coin { value: 0 };
+    }
+}
+
+//# publish
+module 0x42.M {
+    import 0x1.Coin;
+    import 0x1.vector;
+    import 0x1.signer;
+    struct Coins has key { f: vector<Coin.Coin> }
+
+    public new(account: &signer) {
+        let coin_vec: vector<Coin.Coin>;
+        let coins: Self.Coins;
+    label b0:
+        coin_vec = vector.empty<Coin.Coin>();
+        coins = Coins { f: move(coin_vec)};
+
+        move_to<Coins>(move(account), move(coins));
+        return;
+    }
+
+    public put_coin(account: &signer, coin: Coin.Coin) acquires Coins {
+        let coins_ref: &mut Self.Coins;
+        let v_ref: &mut vector<Coin.Coin>;
+    label b0:
+        coins_ref = borrow_global_mut<Coins>(signer.address_of(move(account)));
+        v_ref = &mut move(coins_ref).Coins::f;
+        vector.push_back<Coin.Coin>(move(v_ref), move(coin));
+        return;
+    }
+
+    public get_value(account: &signer, i: u64): u64 acquires Coins {
+        let coins_ref: &Self.Coins;
+        let v_ref: &vector<Coin.Coin>;
+        let coin_ref: &Coin.Coin;
+    label b0:
+        coins_ref = borrow_global<Coins>(signer.address_of(move(account)));
+        v_ref = &move(coins_ref).Coins::f;
+        coin_ref = vector.borrow<Coin.Coin>(move(v_ref), move(i));
+
+        return Coin.value(move(coin_ref));
+    }
+
+    public pop(account: &signer): Coin.Coin acquires Coins {
+        let coins_ref: &mut Self.Coins;
+        let v_ref: &mut vector<Coin.Coin>;
+    label b0:
+        coins_ref = borrow_global_mut<Coins>(signer.address_of(move(account)));
+        v_ref = &mut move(coins_ref).Coins::f;
+        return vector.pop_back<Coin.Coin>(move(v_ref));
+    }
+}
+
+//# run --signers 0x1
+import 0x42.M;
+import 0x1.Coin;
+
+main(account: signer) {
+label b0:
+    M.new(&account);
+    M.put_coin(&account, Coin.zero());
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp
new file mode 100644
index 000000000..c7ff68dbe
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir
new file mode 100644
index 000000000..24461b545
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_resource_not_destroyed_at_return.mvir
@@ -0,0 +1,14 @@
+//# publish
+module 0x42.M {
+    import 0x1.vector;
+
+    struct R has store { b: bool}
+
+    f() {
+        let v: vector<Self.R>;
+    label b0:
+        v = vector.empty<Self.R>();
+        // error even though vector is empty, doesn't have drop
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir
new file mode 100644
index 000000000..15e0a92a2
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_functions/vector_unrestricted_not_destroyed_at_return_ok.mvir
@@ -0,0 +1,11 @@
+//# publish
+module 0x42.M {
+    import 0x1.vector;
+
+    f() {
+        let v: vector<u64>;
+    label b0:
+        v = vector.empty<u64>();
+        return;
+    }
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.exp b/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.exp
new file mode 100644
index 000000000..966d133be
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 1-6:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::M'. Got VMError: {
+    major_status: MISSING_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.mvir
new file mode 100644
index 000000000..9d12bf2d5
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/native_structs/non_existant_native_struct.mvir
@@ -0,0 +1,6 @@
+//# publish
+module 0x42.M {
+    // error, missing dep
+    native struct T;
+    native struct T2;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.exp b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.mvir
new file mode 100644
index 000000000..598b7afe4
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/direct_recursion.mvir
@@ -0,0 +1,42 @@
+//# publish
+module 0x42.Math {
+
+    public sum_(n: u64, acc: u64): u64 {
+        let new_n: u64;
+        let new_acc: u64;
+        let new_sum: u64;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return move(acc);
+    label b2:
+        new_n = copy(n) - 1;
+        new_acc = move(acc) + move(n);
+        new_sum = Self.sum_(move(new_n), move(new_acc));
+        return move(new_sum);
+    }
+
+    public sum(n: u64): u64 {
+        let result: u64;
+    label b0:
+        result = Self.sum_(move(n), 0);
+        return move(result);
+    }
+
+}
+
+//# run
+import 0x42.Math;
+
+main() {
+    let sum1: u64;
+    let sum2: u64;
+label b0:
+    sum1 = Math.sum(5);
+    assert(move(sum1) == 15, 66);
+
+    sum2 = Math.sum(7);
+    assert(move(sum2) == 28, 67);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.exp b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.mvir
new file mode 100644
index 000000000..fd9e7c09b
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/mutual_recursion.mvir
@@ -0,0 +1,49 @@
+//# publish
+module 0x42.Math {
+
+    public even(n: u64): bool {
+        let is_pred_odd: bool;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return true;
+    label b2:
+        is_pred_odd = Self.odd(move(n) - 1);
+        return move(is_pred_odd);
+    }
+
+    public odd(n: u64): bool {
+        let is_pred_even: bool;
+    label b0:
+        jump_if_false (copy(n) == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        is_pred_even = Self.even(move(n) - 1);
+        return move(is_pred_even);
+    }
+}
+
+//# run
+import 0x42.Math;
+
+main() {
+    let zero_even: bool;
+    let zero_odd: bool;
+    let ten_even: bool;
+    let ten_odd: bool;
+label b0:
+    zero_even = Math.even(0);
+    assert(move(zero_even), 50);
+
+    zero_odd = Math.odd(0);
+    assert(!move(zero_odd), 51);
+
+    ten_even = Math.even(10);
+    assert(move(ten_even), 52);
+
+    ten_odd = Math.odd(10);
+    assert(!move(ten_odd), 53);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
new file mode 100644
index 000000000..a7ad26739
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
@@ -0,0 +1,19 @@
+processed 4 tasks
+
+task 2 'run'. lines 79-86:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(8), 3)],
+}
+
+task 3 'run'. lines 89-97:
+Error: Script execution failed with VMError: {
+    major_status: VM_MAX_VALUE_DEPTH_REACHED,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(9), 4)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
new file mode 100644
index 000000000..7f2bc48e6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
@@ -0,0 +1,97 @@
+//# publish
+module 0x42.M {
+    import 0x1.signer;
+
+    struct Box<T> has key, store { x: T }
+    struct Box3<T> has store { x: Self.Box<Self.Box<T>> }
+    struct Box7<T> has store { x: Self.Box3<Self.Box3<T>> }
+    struct Box15<T> has store { x: Self.Box7<Self.Box7<T>> }
+    struct Box31<T> has store { x: Self.Box15<Self.Box15<T>> }
+    struct Box63<T> has store { x: Self.Box31<Self.Box31<T>> }
+    struct Box127<T> has key, store { x: Self.Box63<Self.Box63<T>> }
+    struct Box255<T> has key, store { x: Self.Box127<Self.Box127<T>> }
+
+    public box3<T>(x: T): Self.Box3<T> {
+    label b0:
+        return Box3<T> { x: Box<Self.Box<T>> { x: Box<T> { x: move(x) } } };
+    }
+
+    public box7<T>(x: T): Self.Box7<T> {
+    label b0:
+        return Box7<T> { x: Self.box3<Self.Box3<T>>(Self.box3<T>(move(x))) };
+    }
+
+    public box15<T>(x: T): Self.Box15<T> {
+    label b0:
+        return Box15<T> { x: Self.box7<Self.Box7<T>>(Self.box7<T>(move(x))) };
+    }
+
+    public box31<T>(x: T): Self.Box31<T> {
+    label b0:
+        return Box31<T> { x: Self.box15<Self.Box15<T>>(Self.box15<T>(move(x))) };
+    }
+
+    public box63<T>(x: T): Self.Box63<T> {
+    label b0:
+        return Box63<T> { x: Self.box31<Self.Box31<T>>(Self.box31<T>(move(x))) };
+    }
+
+    public box127<T>(x: T): Self.Box127<T> {
+    label b0:
+        return Box127<T> { x: Self.box63<Self.Box63<T>>(Self.box63<T>(move(x))) };
+    }
+
+    public box255<T>(x: T): Self.Box255<T> {
+    label b0:
+        return Box255<T> { x: Self.box127<Self.Box127<T>>(Self.box127<T>(move(x))) };
+    }
+
+    public publish_128(account: &signer) {
+    label b0:
+        move_to<Box127<bool>>(move(account), Self.box127<bool>(true));
+        return;
+    }
+
+    public publish_256(account: &signer) {
+    label b0:
+        move_to<Box255<bool>>(move(account), Self.box255<bool>(true));
+        return;
+    }
+
+    public publish_257(account: &signer) {
+    label b0:
+        move_to<Box<Self.Box255<bool>>>(move(account), Box<Self.Box255<bool>> { x: Self.box255<bool>(true) });
+        return;
+    }
+}
+
+
+//# run --args @0x1
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    M.publish_128(&account);
+    return;
+}
+
+
+//# run --args @0x2
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    M.publish_256(&account);
+    return;
+}
+
+
+//# run --args @0x3
+import 0x42.M;
+
+main(account: signer) {
+label b0:
+    // hits VM_MAX_VALUE_DEPTH_REACHED
+    M.publish_257(&account);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
new file mode 100644
index 000000000..b37da7a44
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 72-79:
+Error: Script execution failed with VMError: {
+    major_status: TOO_MANY_TYPE_NODES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(48), 0)],
+}
+
+task 2 'run'. lines 81-89:
+Error: Script execution failed with VMError: {
+    major_status: TOO_MANY_TYPE_NODES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(49), 0)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir
new file mode 100644
index 000000000..a958ef44c
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.mvir
@@ -0,0 +1,89 @@
+//# publish
+module 0x42.M {
+    struct Foo<T> { x: bool }
+    public f0<T>() { label b0: return; }
+    public f3<T>() { label b0: Self.f0<Self.Foo<Self.Foo<Self.Foo<T>>>>(); return; }
+    public f7<T>() { label b0: Self.f3<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f11<T>() { label b0: Self.f7<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f15<T>() { label b0: Self.f11<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f19<T>() { label b0: Self.f15<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f23<T>() { label b0: Self.f19<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f27<T>() { label b0: Self.f23<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f31<T>() { label b0: Self.f27<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f35<T>() { label b0: Self.f31<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f39<T>() { label b0: Self.f35<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f43<T>() { label b0: Self.f39<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f47<T>() { label b0: Self.f43<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f51<T>() { label b0: Self.f47<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f55<T>() { label b0: Self.f51<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f59<T>() { label b0: Self.f55<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f63<T>() { label b0: Self.f59<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f67<T>() { label b0: Self.f63<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f71<T>() { label b0: Self.f67<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f75<T>() { label b0: Self.f71<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f79<T>() { label b0: Self.f75<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f83<T>() { label b0: Self.f79<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f87<T>() { label b0: Self.f83<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f91<T>() { label b0: Self.f87<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f95<T>() { label b0: Self.f91<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f99<T>() { label b0: Self.f95<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f103<T>() { label b0: Self.f99<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f107<T>() { label b0: Self.f103<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f111<T>() { label b0: Self.f107<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f115<T>() { label b0: Self.f111<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f119<T>() { label b0: Self.f115<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f123<T>() { label b0: Self.f119<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f127<T>() { label b0: Self.f123<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f131<T>() { label b0: Self.f127<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f135<T>() { label b0: Self.f131<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f139<T>() { label b0: Self.f135<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f143<T>() { label b0: Self.f139<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f147<T>() { label b0: Self.f143<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f151<T>() { label b0: Self.f147<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f155<T>() { label b0: Self.f151<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f159<T>() { label b0: Self.f155<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f163<T>() { label b0: Self.f159<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f167<T>() { label b0: Self.f163<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f171<T>() { label b0: Self.f167<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f175<T>() { label b0: Self.f171<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f179<T>() { label b0: Self.f175<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f183<T>() { label b0: Self.f179<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f187<T>() { label b0: Self.f183<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f191<T>() { label b0: Self.f187<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f195<T>() { label b0: Self.f191<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f199<T>() { label b0: Self.f195<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f203<T>() { label b0: Self.f199<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f207<T>() { label b0: Self.f203<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f211<T>() { label b0: Self.f207<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f215<T>() { label b0: Self.f211<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f219<T>() { label b0: Self.f215<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f223<T>() { label b0: Self.f219<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f227<T>() { label b0: Self.f223<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f231<T>() { label b0: Self.f227<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f235<T>() { label b0: Self.f231<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f239<T>() { label b0: Self.f235<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f243<T>() { label b0: Self.f239<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f247<T>() { label b0: Self.f243<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f251<T>() { label b0: Self.f247<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+    public f255<T>() { label b0: Self.f251<Self.Foo<Self.Foo<Self.Foo<Self.Foo<T>>>>>(); return; }
+}
+// check: "Keep(EXECUTED)"
+
+//# run
+import 0x42.M;
+
+main() {
+label b0:
+    M.f255<u8>();
+    return;
+}
+
+//# run
+import 0x42.M;
+
+main() {
+label b0:
+    // hits VM_MAX_TYPE_DEPTH_REACH
+    M.f255<M.Foo<u8>>();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.exp
new file mode 100644
index 000000000..a479dc573
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 1 'run'. lines 25-25:
+Error: Function execution failed with VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 27-41:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir
new file mode 100644
index 000000000..286b6d4cf
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x42.m {
+
+struct S has copy, drop { f: u64 }
+public foo() {
+    let x: Self.S;
+    let y: Self.S;
+    let z: u64;
+    let r: &Self.S;
+    let f: &u64;
+    label l0:
+        x = S { f: 0 };
+        z = 0;
+        r = &x;
+        f = &z;
+    label l1:
+        y = S { f: 1 };
+        _ = *copy(r);
+        r = &y;
+        f = &copy(r).S::f;
+        jump l1;
+}
+}
+
+//# run 0x42::m::foo --gas-budget 100000
+
+//# run --gas-budget 100000
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+    let r: &u64;
+    label l0:
+        x = 0;
+        r = &x;
+    label l1:
+        y = 0;
+        z = *copy(r);
+        r = &y;
+        jump l1;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.mvir
new file mode 100644
index 000000000..ca717f84f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_borrow_local_ok.mvir
@@ -0,0 +1,8 @@
+//# run
+main() {
+    let x: u64;
+label b0:
+    x = 5;
+    assert(*&mut x == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.mvir
new file mode 100644
index 000000000..bd53d8d59
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_module_ok.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x1.M {
+    struct T has drop {v : u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{v: move(v)};
+    }
+
+    public value (this: &mut Self.T) : u64 {
+        let b: &u64;
+    label b0:
+        b = &move(this).T::v;
+        return *move(b);
+    }
+}
+
+
+//# run
+import 0x1.M;
+
+main() {
+    let x: M.T;
+    let y: &mut M.T;
+    let z: u64;
+label b0:
+    x = M.new(5);
+    y = &mut x;
+    z = M.value(move(y));
+    assert(move(z) == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.mvir
new file mode 100644
index 000000000..63dd628b9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_move_ok.mvir
@@ -0,0 +1,10 @@
+//# run
+main() {
+    let x: u64;
+    let x_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &x;
+    assert(*move(x_ref) == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.mvir
new file mode 100644
index 000000000..1345e89a7
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/deref_parens_ok.mvir
@@ -0,0 +1,12 @@
+//# run
+main() {
+    let x: u64;
+    let x_ref: &u64;
+label b0:
+    x = 5;
+    x_ref = &x;
+    assert(*(copy(x_ref)) == 5, 42);
+    assert(*(move(x_ref)) == 5, 42);
+    assert(*(&mut x) == 5, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.mvir
new file mode 100644
index 000000000..8f855d8a6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/drop_ref.mvir
@@ -0,0 +1,9 @@
+//# run --signers 0x1
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&mut u);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.mvir
new file mode 100644
index 000000000..d59e1e005
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mixed_lvalue.mvir
@@ -0,0 +1,55 @@
+//# publish
+module 0x1.A {
+
+    struct S { f: u64 }
+
+    four(): u64 * u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2, 3;
+    }
+
+    public mixed() {
+        let x: u64;
+        let r: u64;
+        let r_ref: &mut u64;
+        let s: Self.S;
+    label b0:
+        r = 0;
+        r_ref = &mut r;
+        s = S { f: 0 };
+
+        _, x, *copy(r_ref), *&mut (&mut s).S::f = Self.four();
+        assert(move(x) == 1, 42);
+        assert(*copy(r_ref) == 2, 42);
+        assert(*&(&s).S::f == 3, 42);
+
+        *&mut (&mut s).S::f, _, x, *copy(r_ref) = Self.four();
+        assert(move(x) == 2, 42);
+        assert(*copy(r_ref) == 3, 42);
+        assert(*&(&s).S::f == 0, 42);
+
+        *copy(r_ref), *&mut (&mut s).S::f, _, x = Self.four();
+        assert(move(x) == 3, 42);
+        assert(*copy(r_ref) == 0, 42);
+        assert(*&(&s).S::f == 1, 42);
+
+        x, *copy(r_ref), *&mut (&mut s).S::f, _ = Self.four();
+        assert(move(x) == 0, 42);
+        assert(*move(r_ref) == 1, 42);
+        assert(*&(&s).S::f == 2, 42);
+
+        S { f: r } = move(s);
+
+        return;
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+label b0:
+    A.mixed();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.mvir
new file mode 100644
index 000000000..c4a5a884d
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_borrow_local_ok.mvir
@@ -0,0 +1,9 @@
+//# run
+main() {
+    let v: u64;
+label b0:
+    v = 5;
+    *&mut v = 0;
+    assert(copy(v) == 0, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.mvir
new file mode 100644
index 000000000..accc0b4a6
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_copy_ok.mvir
@@ -0,0 +1,13 @@
+//# run
+main() {
+    let v: u64;
+    let ref_v: &mut u64;
+label b0:
+    v = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    *copy(ref_v) = 42;
+    assert(*move(ref_v) == 42, 42);
+    assert(copy(v) == 42, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.mvir
new file mode 100644
index 000000000..9dfa18381
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_move_ok.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x1.B {
+    struct T has drop {g: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{g: move(v)};
+    }
+
+    public change(this: &mut Self.T) {
+        let g: &mut u64;
+    label b0:
+        g = &mut move(this).T::g;
+        *move(g) = 3;
+        return;
+    }
+
+    public get(this: &mut Self.T): u64 {
+        let x: &u64;
+    label b0:
+        x = &move(this).T::g;
+        return *move(x);
+    }
+}
+
+
+//# run
+import 0x1.B;
+
+main() {
+    let x: B.T;
+    let y: u64;
+label b0:
+    x = B.new(1);
+    B.change(&mut x);
+    y = B.get(&mut x);
+    assert(move(y) == 3, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.exp b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.mvir
new file mode 100644
index 000000000..1465392b9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/references/mutate_parens_ok.mvir
@@ -0,0 +1,14 @@
+//# run
+main() {
+    let v: u64;
+    let ref_v: &mut u64;
+label b0:
+    v = 0;
+    *(&mut v) = 5;
+    ref_v = &mut v;
+    assert(*copy(ref_v) == 5, 42);
+    *(copy(ref_v)) = 42;
+    assert(*move(ref_v) == 42, 42);
+    assert(copy(v) == 42, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir
new file mode 100644
index 000000000..6b4e5f727
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/add_function_calls.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x1.M {
+    public foo(u: u64): u64 * u64 * u64 {
+        let twice: u64;
+        let quadruple: u64;
+    label b0:
+        twice = 2 * copy(u);
+        quadruple = 4 * copy(u);
+        return move(u), move(twice), move(quadruple);
+    }
+
+    public bar(): u64 {
+    label b0:
+        return 2;
+    }
+}
+
+
+//# run
+import 0x1.M;
+
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x, y, z = M.foo(5) + M.bar();
+    assert(move(x) == 5, 42);
+    assert(move(y) == 10, 42);
+    assert(move(z) == 22, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir
new file mode 100644
index 000000000..b40848901
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_expression_list.mvir
@@ -0,0 +1,17 @@
+//# run
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+    let z_var: u64;
+label b0:
+    x, y = (4, 5);
+    z = (6);
+    z_var = 6;
+
+    assert(move(x) == 4, 42);
+    assert(move(y) == 5, 42);
+    assert(move(z) == 6, 42);
+    assert(move(z_var) == 6, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir
new file mode 100644
index 000000000..8eff492f7
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/assign_function_call.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x1.A {
+    public ones_tens(f: u64): u64 * u64 {
+        let k: u64;
+        let m: u64;
+    label b0:
+        k = copy(f) % 10;
+        m = (move(f) % 100) - copy(k);
+        return move(k), move(m);
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+label b0:
+    x = 143;
+    y, z = A.ones_tens(move(x));
+    assert(move(y) == 3, 42);
+    assert(move(z) == 40, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir
new file mode 100644
index 000000000..09831b578
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/binop_function_calls_as_args.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x1.A {
+    public div_by_two(v: u64): bool {
+    label b0:
+        jump_if (move(v) % 2 == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        return true;
+    }
+
+    public div_by_three(k: u64): bool {
+    label b0:
+        jump_if (move(k) % 3 == 0) b2;
+    label b1:
+        return false;
+    label b2:
+        return true;
+    }
+
+    public div_by_six(b: bool): bool {
+    label b0:
+        return move(b);
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let x: u64;
+    let y: bool;
+label b0:
+    x = 42;
+    y = A.div_by_six(A.div_by_two(copy(x)) && A.div_by_three(move(x)));
+    assert(move(y) == true, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.mvir
new file mode 100644
index 000000000..f286210fa
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/function_composition.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x1.Test {
+    public foo(v: u64): u64 * u64 {
+        let one_less: u64;
+        let one_more: u64;
+    label b0:
+        one_less = copy(v) - 1;
+        one_more = move(v) + 1;
+        return move(one_less), move(one_more);
+    }
+
+    public baz(k: u64, l: u64, m: u64) : u64 {
+        let z: u64;
+    label b0:
+        z =  move(k) + move(l) + move(m);
+        return move(z);
+    }
+}
+
+
+//# run
+import 0x1.Test;
+
+main() {
+    let x: u64;
+    let y: u64;
+    let x0: u64;
+    let x1 : u64;
+label b0:
+    x = 7;
+    x0, x1 = Test.foo(copy(x));
+    assert(move(x0) == 6, 42);
+    assert(move(x1) == 8, 42);
+
+    y = Test.baz(Test.foo(move(x)), 0);
+    assert(move(y) == 14, 42);
+
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir
new file mode 100644
index 000000000..70b52ac58
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/many_function_calls_as_args.mvir
@@ -0,0 +1,55 @@
+//# publish
+module 0x1.A {
+    struct T has drop {value: u64, even: bool}
+
+    public new(): Self.T {
+    label b0:
+        return T {value: 0, even: true};
+    }
+
+    public get_value(this: &mut Self.T): u64 {
+        let v: &u64;
+    label b0:
+        v = &move(this).T::value;
+        return *move(v);
+    }
+
+    public get_parity(this: &mut Self.T): bool {
+        let b: &bool;
+    label b0:
+        b = &move(this).T::even;
+        return *move(b);
+    }
+
+    public change_parity(number: u64, parity: bool): u64 * bool {
+        let n: u64;
+        let p: bool;
+    label b0:
+        n = move(number) + 1;
+        jump_if (move(parity)) b2;
+    label b1:
+        p = true;
+        jump b3;
+    label b2:
+        p = false;
+        jump b3;
+    label b3:
+        return move(n), move(p);
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let x: A.T;
+    let y: u64;
+    let z: bool;
+label b0:
+    x = A.new();
+    y, z = A.change_parity(A.get_value(&mut x), A.get_parity(&mut x));
+    assert(move(y) == 1, 42);
+    assert(move(z) == false, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir
new file mode 100644
index 000000000..55c5acc28
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/multiple_composite_functions.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x1.A {
+    struct T has drop {value: u64}
+
+    public new(v: u64): Self.T {
+    label b0:
+        return T{value: move(v)};
+    }
+
+    public add_one(this: &mut Self.T): u64 {
+        let b: &u64;
+    label b0:
+        b = &move(this).T::value;
+        return *move(b) + 1;
+    }
+
+    public add_two(v: u64): u64 {
+    label b0:
+        return move(v) + 2;
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let z: u64;
+    let x: A.T;
+label b0:
+    x = A.new(5);
+    z = A.add_two(A.add_two(A.add_one(&mut x)));
+    assert(move(z) == 10, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir
new file mode 100644
index 000000000..61fcd3e8a
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pass_args_on_stack_as_expressions.mvir
@@ -0,0 +1,20 @@
+//# publish
+module 0x1.A {
+    public sum(o: u64, k: u64, t: u64): u64 {
+    label b0:
+        return move(o) + move(k) + move(t);
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let s: u64;
+label b0:
+    (3, 4, 3);
+    s = A.sum();
+    assert(move(s) == 10, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.mvir
new file mode 100644
index 000000000..de662ff99
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/pop_weird.mvir
@@ -0,0 +1,25 @@
+//# publish
+module 0x1.A {
+    three(): u64 * u64 * u64 {
+    label b0:
+        return 0, 1, 2;
+    }
+
+    public pop() {
+    label b0:
+        Self.three();
+        _, _ = ();
+        _ = ();
+        return;
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+label b0:
+    A.pop();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir
new file mode 100644
index 000000000..b51a0e0ab
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_call.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x1.A {
+    public push_u64(): u64  {
+    label b0:
+        return 42;
+    }
+
+    public push_bool(): bool {
+    label b0:
+        return true;
+    }
+
+    public foo(u: u64, b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return move(u) + 1;
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let ans: u64;
+label b0:
+    (A.push_u64(), A.push_bool());
+    ans = A.foo();
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir
new file mode 100644
index 000000000..640ab0418
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/push_args_before_function_composition.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x1.A {
+    public push_u64(): u64  {
+    label b0:
+        return 42;
+    }
+
+    public parity(u: u64): bool {
+    label b0:
+        return (move(u) % 2 == 0);
+    }
+
+    public foo(u: u64, b: bool): u64 {
+    label b0:
+        jump_if (move(b)) b2;
+    label b1:
+        return 0;
+    label b2:
+        return move(u) + 1;
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let k: u64;
+    let ans: u64;
+label b0:
+    k = 101;
+    (A.push_u64());
+    ans = A.foo(A.parity(move(k)));
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir
new file mode 100644
index 000000000..4d7414159
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_expression_lists.mvir
@@ -0,0 +1,30 @@
+//# publish
+module 0x1.A {
+    public foo(t: u64): u64 * u64 {
+        let k: u64;
+    label b0:
+        jump_if (copy(t) % 2 == 0) b2;
+    label b1:
+        k = 3 * copy(t);
+        jump b3;
+    label b2:
+        k = 2 * copy(t);
+        jump b3;
+    label b3:
+        return (move(t), move(k) + 1);
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let y: u64;
+    let z: u64;
+label b0:
+    y, z = A.foo(10);
+    assert(move(y) == 10, 42);
+    assert(move(z) == 21, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp
new file mode 100644
index 000000000..5d92c423f
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir
new file mode 100644
index 000000000..b10953394
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/stack_and_function_calls/return_function_in_if_binop_in_else.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x1.A {
+    public foo(t: u64): u64 * u64 {
+    label b0:
+       return (copy(t), 2 * move(t));
+    }
+
+    public bar(k: u64): u64 * u64 {
+    label b0:
+        jump_if (copy(k) != 1) b2;
+    label b1:
+        return 3 * Self.foo(move(k));
+    label b2:
+        return Self.foo(copy(k));
+    }
+}
+
+
+//# run
+import 0x1.A;
+
+main() {
+    let x: u64;
+    let y: u64;
+
+    let u: u64;
+    let v: u64;
+label b0:
+    x, y = A.bar(10);
+    u, v = A.bar(1);
+
+    assert(move(x) == 10, 42);
+    assert(move(y) == 20, 42);
+    assert(move(u) == 3, 42);
+    assert(move(v) == 2, 42);
+    return;
+}
diff --git a/vendors/move/crates/move-vm/transactional-tests/tests/tests.rs b/vendors/move/crates/move-vm/transactional-tests/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/move-vm/transactional-tests/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/move-vm/types/Cargo.toml b/vendors/move/crates/move-vm/types/Cargo.toml
new file mode 100644
index 000000000..43c49e8bf
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "move-vm-types"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Types for Move VM"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+once_cell = "1.7.2"
+proptest = { version = "1.0.0", optional = true }
+serde = { version = "1.0.124", features = ["derive", "rc"] }
+smallvec = "1.6.1"
+
+bcs = { workspace = true }
+move-binary-format = { path = "../../move-binary-format" }
+
+move-core-types = { path = "../../move-core-types" }
+
+[dev-dependencies]
+proptest = "1.0.0"
+
+[features]
+default = []
+fuzzing = ["proptest", "move-binary-format/fuzzing"]
diff --git a/vendors/move/crates/move-vm/types/src/gas.rs b/vendors/move/crates/move-vm/types/src/gas.rs
new file mode 100644
index 000000000..9afb608d2
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/gas.rs
@@ -0,0 +1,531 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::views::{TypeView, ValueView};
+use move_binary_format::{
+    errors::PartialVMResult, file_format::CodeOffset, file_format_common::Opcodes,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, NumArgs, NumBytes},
+    language_storage::ModuleId,
+};
+
+/// Enum of instructions that do not need extra information for gas metering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum SimpleInstruction {
+    Nop,
+    Ret,
+
+    LdU8,
+    LdU64,
+    LdU128,
+    LdTrue,
+    LdFalse,
+
+    FreezeRef,
+    MutBorrowLoc,
+    ImmBorrowLoc,
+    ImmBorrowField,
+    MutBorrowField,
+    ImmBorrowFieldGeneric,
+    MutBorrowFieldGeneric,
+
+    CastU8,
+    CastU64,
+    CastU128,
+
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+
+    BitOr,
+    BitAnd,
+    Xor,
+    Shl,
+    Shr,
+
+    Or,
+    And,
+    Not,
+
+    Lt,
+    Gt,
+    Le,
+    Ge,
+
+    Abort,
+
+    LdU16,
+    LdU32,
+    LdU256,
+    CastU16,
+    CastU32,
+    CastU256,
+}
+
+impl SimpleInstruction {
+    pub fn to_opcode(&self) -> Opcodes {
+        use Opcodes::*;
+        use SimpleInstruction::*;
+
+        match self {
+            Nop => NOP,
+            Ret => RET,
+
+            LdU8 => LD_U8,
+            LdU64 => LD_U64,
+            LdU128 => LD_U128,
+            LdTrue => LD_TRUE,
+            LdFalse => LD_FALSE,
+
+            FreezeRef => FREEZE_REF,
+            MutBorrowLoc => MUT_BORROW_LOC,
+            ImmBorrowLoc => IMM_BORROW_LOC,
+            ImmBorrowField => IMM_BORROW_FIELD,
+            MutBorrowField => MUT_BORROW_FIELD,
+            ImmBorrowFieldGeneric => IMM_BORROW_FIELD_GENERIC,
+            MutBorrowFieldGeneric => MUT_BORROW_FIELD_GENERIC,
+
+            CastU8 => CAST_U8,
+            CastU64 => CAST_U64,
+            CastU128 => CAST_U128,
+
+            Add => ADD,
+            Sub => SUB,
+            Mul => MUL,
+            Mod => MOD,
+            Div => DIV,
+
+            BitOr => BIT_OR,
+            BitAnd => BIT_AND,
+            Xor => XOR,
+            Shl => SHL,
+            Shr => SHR,
+
+            Or => OR,
+            And => AND,
+            Not => NOT,
+
+            Lt => LT,
+            Gt => GT,
+            Le => LE,
+            Ge => GE,
+
+            Abort => ABORT,
+            LdU16 => LD_U16,
+            LdU32 => LD_U32,
+            LdU256 => LD_U256,
+            CastU16 => CAST_U16,
+            CastU32 => CAST_U32,
+            CastU256 => CAST_U256,
+        }
+    }
+}
+
+/// Trait that defines a generic gas meter interface, allowing clients of the Move VM to implement
+/// their own metering scheme.
+pub trait GasMeter {
+    fn balance_internal(&self) -> InternalGas;
+
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()>;
+
+    fn charge_br_true(&mut self, target_offset: Option<CodeOffset>) -> PartialVMResult<()>;
+
+    fn charge_br_false(&mut self, target_offset: Option<CodeOffset>) -> PartialVMResult<()>;
+
+    fn charge_branch(&mut self, target_offset: CodeOffset) -> PartialVMResult<()>;
+
+    fn charge_pop(&mut self, popped_val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_call(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_call_generic(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView> + Clone,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()>;
+
+    fn charge_ld_const_after_deserialization(&mut self, val: impl ValueView)
+        -> PartialVMResult<()>;
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+
+    fn charge_read_ref(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        old_val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_len(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_push_back(
+        &mut self,
+        ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pop_back(
+        &mut self,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the elements
+    fn charge_vec_unpack(
+        &mut self,
+        ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        elems: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the two elements
+    fn charge_vec_swap(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    /// Charges for loading a resource from storage. This is only called when the resource is not
+    /// cached.
+    /// - `Some(n)` means `n` bytes are loaded.
+    /// - `None` means a load operation is performed but the resource does not exist.
+    ///
+    /// WARNING: This can be dangerous if you execute multiple user transactions in the same
+    /// session -- identical transactions can have different gas costs. Use at your own risk.
+    fn charge_load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: impl TypeView,
+        loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()>;
+
+    /// Charge for executing a native function.
+    /// The cost is calculated returned by the native function implementation.
+    /// Should fail if not enough gas units are left.
+    ///
+    /// In the future, we may want to remove this and directly pass a reference to the GasMeter
+    /// instance to the native functions to allow gas to be deducted during computation.
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView> + Clone>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView> + Clone,
+        args: impl ExactSizeIterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+
+    fn charge_drop_frame(
+        &mut self,
+        locals: impl Iterator<Item = impl ValueView> + Clone,
+    ) -> PartialVMResult<()>;
+}
+
+/// A dummy gas meter that does not meter anything.
+/// Charge operations will always succeed.
+pub struct UnmeteredGasMeter;
+
+impl GasMeter for UnmeteredGasMeter {
+    fn balance_internal(&self) -> InternalGas {
+        u64::MAX.into()
+    }
+
+    fn charge_simple_instr(&mut self, _instr: SimpleInstruction) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_br_false(&mut self, _target_offset: Option<CodeOffset>) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_br_true(&mut self, _target_offset: Option<CodeOffset>) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_branch(&mut self, _target_offset: CodeOffset) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _args: impl IntoIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const(&mut self, _size: NumBytes) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_store_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_unpack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_read_ref(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        _new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_eq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_neq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        _is_mut: bool,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _exists: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_from(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        _is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        _expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _addr: AccountAddress,
+        _ty: impl TypeView,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function(
+        &mut self,
+        _amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/move-vm/types/src/lib.rs b/vendors/move/crates/move-vm/types/src/lib.rs
new file mode 100644
index 000000000..4204e4a15
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/lib.rs
@@ -0,0 +1,32 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+pub mod gas;
+pub mod loaded_data;
+pub mod natives;
+pub mod values;
+pub mod views;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/crates/move-vm/types/src/loaded_data/mod.rs b/vendors/move/crates/move-vm/types/src/loaded_data/mod.rs
new file mode 100644
index 000000000..f9c2369ea
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/loaded_data/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+//! Loaded definition of code data used in runtime.
+//!
+//! This module contains the loaded definition of code data used in runtime.
+
+pub mod runtime_types;
diff --git a/vendors/move/crates/move-vm/types/src/loaded_data/runtime_types.rs b/vendors/move/crates/move-vm/types/src/loaded_data/runtime_types.rs
new file mode 100644
index 000000000..d8c9a9969
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/loaded_data/runtime_types.rs
@@ -0,0 +1,218 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, SignatureToken, StructDefinitionIndex, StructTypeParameter},
+};
+use move_core_types::{
+    gas_algebra::AbstractMemorySize, identifier::Identifier, language_storage::ModuleId,
+    vm_status::StatusCode,
+};
+
+pub const TYPE_DEPTH_MAX: usize = 256;
+
+#[derive(Debug, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct StructType {
+    pub fields: Vec<Type>,
+    pub field_names: Vec<Identifier>,
+    pub abilities: AbilitySet,
+    pub type_parameters: Vec<StructTypeParameter>,
+    pub name: Identifier,
+    pub module: ModuleId,
+    pub struct_def: StructDefinitionIndex,
+}
+
+impl StructType {
+    pub fn type_param_constraints(&self) -> impl ExactSizeIterator<Item = &AbilitySet> {
+        self.type_parameters.iter().map(|param| &param.constraints)
+    }
+}
+
+#[derive(Debug, Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct CachedStructIndex(pub usize);
+
+#[derive(Debug, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub enum Type {
+    Bool,
+    U8,
+    U64,
+    U128,
+    Address,
+    Signer,
+    Vector(Box<Type>),
+    Struct(CachedStructIndex),
+    StructInstantiation(CachedStructIndex, Vec<Type>),
+    Reference(Box<Type>),
+    MutableReference(Box<Type>),
+    TyParam(usize),
+    U16,
+    U32,
+    U256,
+}
+
+impl Type {
+    #[allow(deprecated)]
+    const LEGACY_BASE_MEMORY_SIZE: AbstractMemorySize = AbstractMemorySize::new(1);
+
+    fn clone_impl(&self, depth: usize) -> PartialVMResult<Type> {
+        self.apply_subst(|idx, _| Ok(Type::TyParam(idx)), depth)
+    }
+
+    fn apply_subst<F>(&self, subst: F, depth: usize) -> PartialVMResult<Type>
+    where
+        F: Fn(usize, usize) -> PartialVMResult<Type> + Copy,
+    {
+        if depth > TYPE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_TYPE_DEPTH_REACHED));
+        }
+        let res = match self {
+            Type::TyParam(idx) => subst(*idx, depth)?,
+            Type::Bool => Type::Bool,
+            Type::U8 => Type::U8,
+            Type::U16 => Type::U16,
+            Type::U32 => Type::U32,
+            Type::U64 => Type::U64,
+            Type::U128 => Type::U128,
+            Type::U256 => Type::U256,
+            Type::Address => Type::Address,
+            Type::Signer => Type::Signer,
+            Type::Vector(ty) => Type::Vector(Box::new(ty.apply_subst(subst, depth + 1)?)),
+            Type::Reference(ty) => Type::Reference(Box::new(ty.apply_subst(subst, depth + 1)?)),
+            Type::MutableReference(ty) => {
+                Type::MutableReference(Box::new(ty.apply_subst(subst, depth + 1)?))
+            },
+            Type::Struct(def_idx) => Type::Struct(*def_idx),
+            Type::StructInstantiation(def_idx, instantiation) => {
+                let mut inst = vec![];
+                for ty in instantiation {
+                    inst.push(ty.apply_subst(subst, depth + 1)?)
+                }
+                Type::StructInstantiation(*def_idx, inst)
+            },
+        };
+        Ok(res)
+    }
+
+    pub fn subst(&self, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.apply_subst(
+            |idx, depth| match ty_args.get(idx) {
+                Some(ty) => ty.clone_impl(depth),
+                None => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "type substitution failed: index out of bounds -- len {} got {}",
+                            ty_args.len(),
+                            idx
+                        )),
+                ),
+            },
+            1,
+        )
+    }
+
+    /// Returns the abstract memory size the data structure occupies.
+    ///
+    /// This kept only for legacy reasons.
+    /// New applications should not use this.
+    pub fn size(&self) -> AbstractMemorySize {
+        use Type::*;
+
+        match self {
+            TyParam(_) | Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => {
+                Self::LEGACY_BASE_MEMORY_SIZE
+            },
+            Vector(ty) | Reference(ty) | MutableReference(ty) => {
+                Self::LEGACY_BASE_MEMORY_SIZE + ty.size()
+            },
+            Struct(_) => Self::LEGACY_BASE_MEMORY_SIZE,
+            StructInstantiation(_, tys) => tys
+                .iter()
+                .fold(Self::LEGACY_BASE_MEMORY_SIZE, |acc, ty| acc + ty.size()),
+        }
+    }
+
+    pub fn from_const_signature(constant_signature: &SignatureToken) -> PartialVMResult<Self> {
+        use SignatureToken as S;
+        use Type as L;
+
+        Ok(match constant_signature {
+            S::Bool => L::Bool,
+            S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
+            S::U64 => L::U64,
+            S::U128 => L::U128,
+            S::U256 => L::U256,
+            S::Address => L::Address,
+            S::Vector(inner) => L::Vector(Box::new(Self::from_const_signature(inner)?)),
+            // Not yet supported
+            S::Struct(_) | S::StructInstantiation(_, _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            },
+            // Not allowed/Not meaningful
+            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) | S::Signer => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            },
+        })
+    }
+
+    pub fn check_vec_ref(&self, inner_ty: &Type, is_mut: bool) -> PartialVMResult<Type> {
+        match self {
+            Type::MutableReference(inner) => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                },
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            Type::Reference(inner) if !is_mut => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                },
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
+
+    pub fn check_eq(&self, other: &Self) -> PartialVMResult<()> {
+        if self != other {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!("Type mismatch: expected {:?}, got {:?}", self, other),
+                ),
+            );
+        }
+        Ok(())
+    }
+
+    pub fn check_ref_eq(&self, expected_inner: &Self) -> PartialVMResult<()> {
+        match self {
+            Type::MutableReference(inner) | Type::Reference(inner) => {
+                inner.check_eq(expected_inner)
+            },
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
+}
diff --git a/vendors/move/crates/move-vm/types/src/natives/function.rs b/vendors/move/crates/move-vm/types/src/natives/function.rs
new file mode 100644
index 000000000..3afef8beb
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/natives/function.rs
@@ -0,0 +1,140 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Native Function Support
+//!
+//! All Move native functions have the following signature:
+//!
+//! `pub fn native_function(
+//!     context: &mut impl NativeContext,
+//!     ty_args: Vec<Type>,
+//!     mut arguments: VecDeque<Value>,
+//! ) -> PartialVMResult<NativeResult>;`
+//!
+//! arguments are passed with first argument at position 0 and so forth.
+//! Popping values from `arguments` gives the aguments in reverse order (last first).
+//! This module contains the declarations and utilities to implement a native
+//! function.
+
+use crate::values::Value;
+pub use move_binary_format::errors::{PartialVMError, PartialVMResult};
+pub use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode};
+use smallvec::{smallvec, SmallVec};
+
+/// Result of a native function execution requires charges for execution cost.
+///
+/// An execution that causes an invariant violation would not return a `NativeResult` but
+/// return a `PartialVMError` error directly.
+/// All native functions must return a `PartialVMResult<NativeResult>` where an `Err` is returned
+/// when an error condition is met that should not charge for the execution. A common example
+/// is a VM invariant violation which should have been forbidden by the verifier.
+/// Errors (typically user errors and aborts) that are logically part of the function execution
+/// must be expressed in a `NativeResult` with a cost and a VMStatus.
+pub enum NativeResult {
+    Success {
+        cost: InternalGas,
+        ret_vals: SmallVec<[Value; 1]>,
+    },
+    Abort {
+        cost: InternalGas,
+        abort_code: u64,
+    },
+    OutOfGas {
+        partial_cost: InternalGas,
+    },
+}
+
+impl NativeResult {
+    /// Return values of a successful execution.
+    pub fn ok(cost: InternalGas, values: SmallVec<[Value; 1]>) -> Self {
+        NativeResult::Success {
+            cost,
+            ret_vals: values,
+        }
+    }
+
+    /// Failed execution. The failure is a runtime failure in the function and not an invariant
+    /// failure of the VM which would raise a `PartialVMError` error directly.
+    /// The only thing the funciton can specify is its abort code, as if it had invoked the `Abort`
+    /// bytecode instruction
+    pub fn err(cost: InternalGas, abort_code: u64) -> Self {
+        NativeResult::Abort { cost, abort_code }
+    }
+
+    /// A special variant indicating that the native has determined there is not enough
+    /// balance to cover the full cost to get all the work done.
+    ///
+    /// Along with the ability to get the gas balance from the native context, this offers
+    /// natives a way to emulate incremental gas metering, avoiding doing expensive operations
+    /// before charging for gas.
+    ///
+    /// The natives are still required to return a partial cost, which the VM will pass
+    /// to the gas meter for proper bookkeeping.
+    pub fn out_of_gas(partial_cost: InternalGas) -> Self {
+        NativeResult::OutOfGas { partial_cost }
+    }
+
+    /// Convert a `PartialVMResult<()>` into a `PartialVMResult<NativeResult>`
+    pub fn map_partial_vm_result_empty(
+        cost: InternalGas,
+        res: PartialVMResult<()>,
+    ) -> PartialVMResult<Self> {
+        let result = match res {
+            Ok(_) => NativeResult::ok(cost, smallvec![]),
+            Err(err) if err.major_status() == StatusCode::ABORTED => {
+                let (_, abort_code, _, _, _, _) = err.all_data();
+                NativeResult::err(
+                    cost,
+                    abort_code.unwrap_or(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR as u64),
+                )
+            },
+            Err(err) => {
+                return Err(err);
+            },
+        };
+        Ok(result)
+    }
+
+    /// Convert a `PartialVMResult<Value>` into a `PartialVMResult<NativeResult>`
+    pub fn map_partial_vm_result_one(
+        cost: InternalGas,
+        res: PartialVMResult<Value>,
+    ) -> PartialVMResult<Self> {
+        let result = match res {
+            Ok(val) => NativeResult::ok(cost, smallvec![val]),
+            Err(err) if err.major_status() == StatusCode::ABORTED => {
+                let (_, abort_code, _, _, _, _) = err.all_data();
+                NativeResult::err(
+                    cost,
+                    abort_code.unwrap_or(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR as u64),
+                )
+            },
+            Err(err) => {
+                return Err(err);
+            },
+        };
+        Ok(result)
+    }
+}
+
+/// Return the argument at the top of the stack.
+///
+/// Arguments are passed to a native as a stack with first arg at the bottom of the stack.
+/// Calling this API can help in making the code more readable.
+/// It's good practice to pop all arguments in locals of the native function on function entry.
+#[macro_export]
+macro_rules! pop_arg {
+    ($arguments:ident, $t:ty) => {{
+        use $crate::natives::function::{NativeResult, PartialVMError, StatusCode};
+        match $arguments.pop_back().map(|v| v.value_as::<$t>()) {
+            None => {
+                return Err(PartialVMError::new(
+                    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                ))
+            },
+            Some(Err(e)) => return Err(e),
+            Some(Ok(v)) => v,
+        }
+    }};
+}
diff --git a/vendors/move/crates/move-vm/types/src/natives/mod.rs b/vendors/move/crates/move-vm/types/src/natives/mod.rs
new file mode 100644
index 000000000..ccaf1d72a
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/natives/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod function;
diff --git a/vendors/move/crates/move-vm/types/src/unit_tests/identifier_prop_tests.rs b/vendors/move/crates/move-vm/types/src/unit_tests/identifier_prop_tests.rs
new file mode 100644
index 000000000..61fa67e2a
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/unit_tests/identifier_prop_tests.rs
@@ -0,0 +1,18 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn identifier_serializer_roundtrip(module in CompiledModule::valid_strategy(20)) {
+        let module_id = module.self_id();
+        let deserialized_module_id = {
+            let serialized_key = bcs::to_bytes(&module_id).unwrap();
+            bcs::from_bytes(&serialized_key).expect("Deserialize should work")
+        };
+        prop_assert_eq!(module_id, deserialized_module_id);
+    }
+}
diff --git a/vendors/move/crates/move-vm/types/src/unit_tests/mod.rs b/vendors/move/crates/move-vm/types/src/unit_tests/mod.rs
new file mode 100644
index 000000000..bb36fe00c
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/unit_tests/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(feature = "fuzzing")]
+mod identifier_prop_tests;
diff --git a/vendors/move/crates/move-vm/types/src/values/mod.rs b/vendors/move/crates/move-vm/types/src/values/mod.rs
new file mode 100644
index 000000000..9ce8415cb
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/values/mod.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod values_impl;
+
+#[cfg(test)]
+mod value_tests;
+
+#[cfg(all(test, feature = "fuzzing"))]
+mod value_prop_tests;
+
+pub use values_impl::*;
diff --git a/vendors/move/crates/move-vm/types/src/values/value_prop_tests.rs b/vendors/move/crates/move-vm/types/src/values/value_prop_tests.rs
new file mode 100644
index 000000000..cd612bac7
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/values/value_prop_tests.rs
@@ -0,0 +1,24 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::values::{prop::layout_and_value_strategy, Value};
+use move_core_types::value::MoveValue;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn serializer_round_trip((layout, value) in layout_and_value_strategy()) {
+        let blob = value.simple_serialize(&layout).expect("must serialize");
+        let value_deserialized = Value::simple_deserialize(&blob, &layout).expect("must deserialize");
+        assert!(value.equals(&value_deserialized).unwrap());
+
+        let move_value = value.as_move_value(&layout);
+
+        let blob2 = move_value.simple_serialize().expect("must serialize");
+        assert_eq!(blob, blob2);
+
+        let move_value_deserialized = MoveValue::simple_deserialize(&blob2, &layout).expect("must deserialize.");
+        assert_eq!(move_value, move_value_deserialized);
+    }
+}
diff --git a/vendors/move/crates/move-vm/types/src/values/value_tests.rs b/vendors/move/crates/move-vm/types/src/values/value_tests.rs
new file mode 100644
index 000000000..ff3715624
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/values/value_tests.rs
@@ -0,0 +1,228 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{loaded_data::runtime_types::Type, values::*, views::*};
+use move_binary_format::errors::*;
+use move_core_types::{account_address::AccountAddress, u256::U256};
+
+#[test]
+fn locals() -> PartialVMResult<()> {
+    const LEN: usize = 4;
+    let mut locals = Locals::new(LEN);
+    for i in 0..LEN {
+        assert!(locals.copy_loc(i).is_err());
+        assert!(locals.move_loc(i, false).is_err());
+        assert!(locals.borrow_loc(i).is_err());
+    }
+    locals.store_loc(1, Value::u64(42), false)?;
+
+    assert!(locals.copy_loc(1)?.equals(&Value::u64(42))?);
+    let r = locals.borrow_loc(1)?.value_as::<Reference>()?;
+    assert!(r.read_ref()?.equals(&Value::u64(42))?);
+    assert!(locals.move_loc(1, false)?.equals(&Value::u64(42))?);
+
+    assert!(locals.copy_loc(1).is_err());
+    assert!(locals.move_loc(1, false).is_err());
+    assert!(locals.borrow_loc(1).is_err());
+
+    assert!(locals.copy_loc(LEN + 1).is_err());
+    assert!(locals.move_loc(LEN + 1, false).is_err());
+    assert!(locals.borrow_loc(LEN + 1).is_err());
+
+    Ok(())
+}
+
+#[test]
+fn struct_pack_and_unpack() -> PartialVMResult<()> {
+    let vals = vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ];
+    let s = Struct::pack(vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ]);
+    let unpacked: Vec<_> = s.unpack()?.collect();
+
+    assert!(vals.len() == unpacked.len());
+    for (v1, v2) in vals.iter().zip(unpacked.iter()) {
+        assert!(v1.equals(v2)?);
+    }
+
+    Ok(())
+}
+
+#[test]
+fn struct_borrow_field() -> PartialVMResult<()> {
+    let mut locals = Locals::new(1);
+    locals.store_loc(
+        0,
+        Value::struct_(Struct::pack(vec![Value::u8(10), Value::bool(false)])),
+        false,
+    )?;
+    let r: StructRef = locals.borrow_loc(0)?.value_as()?;
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        assert!(f.read_ref()?.equals(&Value::bool(false))?);
+    }
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        f.write_ref(Value::bool(true))?;
+    }
+
+    {
+        let f: Reference = r.borrow_field(1)?.value_as()?;
+        assert!(f.read_ref()?.equals(&Value::bool(true))?);
+    }
+
+    Ok(())
+}
+
+#[test]
+fn struct_borrow_nested() -> PartialVMResult<()> {
+    let mut locals = Locals::new(1);
+
+    fn inner(x: u64) -> Value {
+        Value::struct_(Struct::pack(vec![Value::u64(x)]))
+    }
+    fn outer(x: u64) -> Value {
+        Value::struct_(Struct::pack(vec![Value::u8(10), inner(x)]))
+    }
+
+    locals.store_loc(0, outer(20), false)?;
+    let r1: StructRef = locals.borrow_loc(0)?.value_as()?;
+    let r2: StructRef = r1.borrow_field(1)?.value_as()?;
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        assert!(r3.read_ref()?.equals(&Value::u64(20))?);
+    }
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        r3.write_ref(Value::u64(30))?;
+    }
+
+    {
+        let r3: Reference = r2.borrow_field(0)?.value_as()?;
+        assert!(r3.read_ref()?.equals(&Value::u64(30))?);
+    }
+
+    assert!(r2.read_ref()?.equals(&inner(30))?);
+    assert!(r1.read_ref()?.equals(&outer(30))?);
+
+    Ok(())
+}
+
+#[test]
+fn global_value_non_struct() -> PartialVMResult<()> {
+    assert!(GlobalValue::cached(Value::u64(100)).is_err());
+    assert!(GlobalValue::cached(Value::bool(false)).is_err());
+
+    let mut locals = Locals::new(1);
+    locals.store_loc(0, Value::u8(0), false)?;
+    let r = locals.borrow_loc(0)?;
+    assert!(GlobalValue::cached(r).is_err());
+
+    Ok(())
+}
+
+#[test]
+fn leagacy_ref_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let mut locals = Locals::new(10);
+
+    locals.store_loc(0, Value::u128(0), false)?;
+    let r = locals.borrow_loc(0)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(1, Value::vector_u8([1, 2, 3]), false)?;
+    let r = locals.borrow_loc(1)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    let r: VectorRef = r.value_as()?;
+    let r = r.borrow_elem(0, &Type::U8)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(2, Value::struct_(Struct::pack([])), false)?;
+    let r: Reference = locals.borrow_loc(2)?.value_as()?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    Ok(())
+}
+
+#[test]
+fn legacy_struct_abstract_memory_size_consistenty() -> PartialVMResult<()> {
+    let structs = [
+        Struct::pack([]),
+        Struct::pack([Value::struct_(Struct::pack([Value::u8(0), Value::u64(0)]))]),
+    ];
+
+    for s in &structs {
+        assert_eq!(s.legacy_abstract_memory_size(), s.legacy_size());
+    }
+
+    Ok(())
+}
+
+#[test]
+fn legacy_val_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let vals = [
+        Value::u8(0),
+        Value::u16(0),
+        Value::u32(0),
+        Value::u64(0),
+        Value::u128(0),
+        Value::u256(U256::zero()),
+        Value::bool(true),
+        Value::address(AccountAddress::ZERO),
+        Value::vector_u8([0, 1, 2]),
+        Value::vector_u16([0, 1, 2]),
+        Value::vector_u32([0, 1, 2]),
+        Value::vector_u64([]),
+        Value::vector_u128([1, 2, 3, 4]),
+        Value::vector_u256([1, 2, 3, 4].iter().map(|q| U256::from(*q as u64))),
+        Value::struct_(Struct::pack([])),
+        Value::struct_(Struct::pack([Value::u8(0), Value::bool(false)])),
+        Value::vector_for_testing_only([]),
+        Value::vector_for_testing_only([Value::u8(0), Value::u8(1)]),
+    ];
+
+    let mut locals = Locals::new(vals.len());
+    for (idx, val) in vals.iter().enumerate() {
+        locals.store_loc(idx, val.copy_value()?, false)?;
+
+        let val_size_new = val.legacy_abstract_memory_size();
+        let val_size_old = val.legacy_size();
+
+        assert_eq!(val_size_new, val_size_old);
+
+        let val_size_through_ref = locals
+            .borrow_loc(idx)?
+            .value_as::<Reference>()?
+            .value_view()
+            .legacy_abstract_memory_size();
+
+        assert_eq!(val_size_through_ref, val_size_old)
+    }
+
+    Ok(())
+}
+
+#[test]
+fn test_vm_value_vector_u64_casting() {
+    assert_eq!(
+        vec![1, 2, 3],
+        Value::vector_u64([1, 2, 3]).value_as::<Vec<u64>>().unwrap()
+    );
+}
diff --git a/vendors/move/crates/move-vm/types/src/values/values_impl.rs b/vendors/move/crates/move-vm/types/src/values/values_impl.rs
new file mode 100644
index 000000000..cfae431d9
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/values/values_impl.rs
@@ -0,0 +1,3710 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    loaded_data::runtime_types::Type,
+    views::{ValueView, ValueVisitor},
+};
+use move_binary_format::{
+    errors::*,
+    file_format::{Constant, SignatureToken},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::Op,
+    gas_algebra::AbstractMemorySize,
+    u256,
+    value::{MoveStructLayout, MoveTypeLayout},
+    vm_status::{sub_status::NFE_VECTOR_ERROR_BASE, StatusCode},
+};
+use std::{
+    cell::RefCell,
+    fmt::{self, Debug, Display},
+    iter,
+    rc::Rc,
+};
+
+/***************************************************************************************
+ *
+ * Internal Types
+ *
+ *   Internal representation of the Move value calculus. These types are abstractions
+ *   over the concrete Move concepts and may carry additional information that is not
+ *   defined by the language, but required by the implementation.
+ *
+ **************************************************************************************/
+
+/// Runtime representation of a Move value.
+#[derive(Debug)]
+enum ValueImpl {
+    Invalid,
+
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    U128(u128),
+    U256(u256::U256),
+    Bool(bool),
+    Address(AccountAddress),
+
+    Container(Container),
+
+    ContainerRef(ContainerRef),
+    IndexedRef(IndexedRef),
+}
+
+/// A container is a collection of values. It is used to represent data structures like a
+/// Move vector or struct.
+///
+/// There is one general container that can be used to store an array of any values, same
+/// type or not, and a few specialized flavors to offer compact memory layout for small
+/// primitive types.
+///
+/// Except when not owned by the VM stack, a container always lives inside an Rc<RefCell<>>,
+/// making it possible to be shared by references.
+#[derive(Debug, Clone)]
+enum Container {
+    Locals(Rc<RefCell<Vec<ValueImpl>>>),
+    Vec(Rc<RefCell<Vec<ValueImpl>>>),
+    Struct(Rc<RefCell<Vec<ValueImpl>>>),
+    VecU8(Rc<RefCell<Vec<u8>>>),
+    VecU64(Rc<RefCell<Vec<u64>>>),
+    VecU128(Rc<RefCell<Vec<u128>>>),
+    VecBool(Rc<RefCell<Vec<bool>>>),
+    VecAddress(Rc<RefCell<Vec<AccountAddress>>>),
+    VecU16(Rc<RefCell<Vec<u16>>>),
+    VecU32(Rc<RefCell<Vec<u32>>>),
+    VecU256(Rc<RefCell<Vec<u256::U256>>>),
+}
+
+/// A ContainerRef is a direct reference to a container, which could live either in the frame
+/// or in global storage. In the latter case, it also keeps a status flag indicating whether
+/// the container has been possibly modified.
+#[derive(Debug)]
+enum ContainerRef {
+    Local(Container),
+    Global {
+        status: Rc<RefCell<GlobalDataStatus>>,
+        container: Container,
+    },
+}
+
+/// Status for global (on-chain) data:
+/// Clean - the data was only read.
+/// Dirty - the data was possibly modified.
+#[derive(Debug, Clone, Copy)]
+enum GlobalDataStatus {
+    Clean,
+    Dirty,
+}
+
+/// A Move reference pointing to an element in a container.
+#[derive(Debug)]
+struct IndexedRef {
+    idx: usize,
+    container_ref: ContainerRef,
+}
+
+/// An umbrella enum for references. It is used to hide the internals of the public type
+/// Reference.
+#[derive(Debug)]
+enum ReferenceImpl {
+    IndexedRef(IndexedRef),
+    ContainerRef(ContainerRef),
+}
+
+/***************************************************************************************
+ *
+ * Public Types
+ *
+ *   Types visible from outside the module. They are almost exclusively wrappers around
+ *   the internal representation, acting as public interfaces. The methods they provide
+ *   closely resemble the Move concepts their names suggest: move_local, borrow_field,
+ *   pack, unpack, etc.
+ *
+ *   They are opaque to an external caller by design -- no knowledge about the internal
+ *   representation is given and they can only be manipulated via the public methods,
+ *   which is to ensure no arbitrary invalid states can be created unless some crucial
+ *   internal invariants are violated.
+ *
+ **************************************************************************************/
+/// A Move value -- a wrapper around `ValueImpl` which can be created only through valid
+/// means.
+#[derive(Debug)]
+pub struct Value(ValueImpl);
+
+/// An integer value in Move.
+#[derive(Debug)]
+pub enum IntegerValue {
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    U128(u128),
+    U256(u256::U256),
+}
+
+/// A Move struct.
+#[derive(Debug)]
+pub struct Struct {
+    fields: Vec<ValueImpl>,
+}
+
+// A vector. This is an alias for a Container for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a vector and operate on that.
+// There is an impl for Vector which implements the API private to this module.
+#[derive(Debug)]
+pub struct Vector(Container);
+
+/// A reference to a Move struct that allows you to take a reference to one of its fields.
+#[derive(Debug)]
+pub struct StructRef(ContainerRef);
+
+/// A generic Move reference that offers two functionalities: read_ref & write_ref.
+#[derive(Debug)]
+pub struct Reference(ReferenceImpl);
+
+// A reference to a signer. Clients can attempt a cast to this struct if they are
+// expecting a Signer on the stack or as an argument.
+#[derive(Debug)]
+pub struct SignerRef(ContainerRef);
+
+// A reference to a vector. This is an alias for a ContainerRef for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a reference to a vector and operate on that.
+// There is an impl for VectorRef which implements the API private to this module.
+#[derive(Debug)]
+pub struct VectorRef(ContainerRef);
+
+/// A special "slot" in global storage that can hold a resource. It also keeps track of the status
+/// of the resource relative to the global state, which is necessary to compute the effects to emit
+/// at the end of transaction execution.
+#[derive(Debug)]
+enum GlobalValueImpl {
+    /// No resource resides in this slot or in storage.
+    None,
+    /// A resource has been published to this slot and it did not previously exist in storage.
+    Fresh { fields: Rc<RefCell<Vec<ValueImpl>>> },
+    /// A resource resides in this slot and also in storage. The status flag indicates whether
+    /// it has potentially been altered.
+    Cached {
+        fields: Rc<RefCell<Vec<ValueImpl>>>,
+        status: Rc<RefCell<GlobalDataStatus>>,
+    },
+    /// A resource used to exist in storage but has been deleted by the current transaction.
+    Deleted,
+}
+
+/// A wrapper around `GlobalValueImpl`, representing a "slot" in global storage that can
+/// hold a resource.
+#[derive(Debug)]
+pub struct GlobalValue(GlobalValueImpl);
+
+/// The locals for a function frame. It allows values to be read, written or taken
+/// reference from.
+#[derive(Debug)]
+pub struct Locals(Rc<RefCell<Vec<ValueImpl>>>);
+
+/***************************************************************************************
+ *
+ * Misc
+ *
+ *   Miscellaneous helper functions.
+ *
+ **************************************************************************************/
+
+impl Container {
+    fn len(&self) -> usize {
+        match self {
+            Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => r.borrow().len(),
+            Self::VecU8(r) => r.borrow().len(),
+            Self::VecU16(r) => r.borrow().len(),
+            Self::VecU32(r) => r.borrow().len(),
+            Self::VecU64(r) => r.borrow().len(),
+            Self::VecU128(r) => r.borrow().len(),
+            Self::VecU256(r) => r.borrow().len(),
+            Self::VecBool(r) => r.borrow().len(),
+            Self::VecAddress(r) => r.borrow().len(),
+        }
+    }
+
+    fn rc_count(&self) -> usize {
+        match self {
+            Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => Rc::strong_count(r),
+            Self::VecU8(r) => Rc::strong_count(r),
+            Self::VecU16(r) => Rc::strong_count(r),
+            Self::VecU32(r) => Rc::strong_count(r),
+            Self::VecU64(r) => Rc::strong_count(r),
+            Self::VecU128(r) => Rc::strong_count(r),
+            Self::VecU256(r) => Rc::strong_count(r),
+            Self::VecBool(r) => Rc::strong_count(r),
+            Self::VecAddress(r) => Rc::strong_count(r),
+        }
+    }
+
+    fn signer(x: AccountAddress) -> Self {
+        Container::Struct(Rc::new(RefCell::new(vec![ValueImpl::Address(x)])))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Borrows (Internal)
+ *
+ *   Helper functions to handle Rust borrows. When borrowing from a RefCell, we want
+ *   to return an error instead of panicking.
+ *
+ **************************************************************************************/
+
+fn take_unique_ownership<T: Debug>(r: Rc<RefCell<T>>) -> PartialVMResult<T> {
+    match Rc::try_unwrap(r) {
+        Ok(cell) => Ok(cell.into_inner()),
+        Err(r) => Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("moving value {:?} with dangling references", r)),
+        ),
+    }
+}
+
+impl ContainerRef {
+    fn container(&self) -> &Container {
+        match self {
+            Self::Local(container) | Self::Global { container, .. } => container,
+        }
+    }
+
+    fn mark_dirty(&self) {
+        if let Self::Global { status, .. } = self {
+            *status.borrow_mut() = GlobalDataStatus::Dirty
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Reference Conversions (Internal)
+ *
+ *   Helpers to obtain a Rust reference to a value via a VM reference. Required for
+ *   equalities.
+ *
+ **************************************************************************************/
+trait VMValueRef<T> {
+    fn value_ref(&self) -> PartialVMResult<&T>;
+}
+
+macro_rules! impl_vm_value_ref {
+    ($ty:ty, $tc:ident) => {
+        impl VMValueRef<$ty> for ValueImpl {
+            fn value_ref(&self) -> PartialVMResult<&$ty> {
+                match self {
+                    ValueImpl::$tc(x) => Ok(x),
+                    _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message(format!("cannot take {:?} as &{}", self, stringify!($ty)))),
+                }
+            }
+        }
+    };
+}
+
+impl_vm_value_ref!(u8, U8);
+impl_vm_value_ref!(u16, U16);
+impl_vm_value_ref!(u32, U32);
+impl_vm_value_ref!(u64, U64);
+impl_vm_value_ref!(u128, U128);
+impl_vm_value_ref!(u256::U256, U256);
+impl_vm_value_ref!(bool, Bool);
+impl_vm_value_ref!(AccountAddress, Address);
+
+impl ValueImpl {
+    fn as_value_ref<T>(&self) -> PartialVMResult<&T>
+    where
+        Self: VMValueRef<T>,
+    {
+        VMValueRef::value_ref(self)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Copy Value
+ *
+ *   Implementation of Move copy. Extra care needs to be taken when copying references.
+ *   It is intentional we avoid implementing the standard library trait Clone, to prevent
+ *   surprising behaviors from happening.
+ *
+ **************************************************************************************/
+impl ValueImpl {
+    fn copy_value(&self) -> PartialVMResult<Self> {
+        use ValueImpl::*;
+
+        Ok(match self {
+            Invalid => Invalid,
+
+            U8(x) => U8(*x),
+            U16(x) => U16(*x),
+            U32(x) => U32(*x),
+            U64(x) => U64(*x),
+            U128(x) => U128(*x),
+            U256(x) => U256(*x),
+            Bool(x) => Bool(*x),
+            Address(x) => Address(*x),
+
+            ContainerRef(r) => ContainerRef(r.copy_value()),
+            IndexedRef(r) => IndexedRef(r.copy_value()),
+
+            // When cloning a container, we need to make sure we make a deep
+            // copy of the data instead of a shallow copy of the Rc.
+            Container(c) => Container(c.copy_value()?),
+        })
+    }
+}
+
+impl Container {
+    fn copy_value(&self) -> PartialVMResult<Self> {
+        let copy_rc_ref_vec_val = |r: &Rc<RefCell<Vec<ValueImpl>>>| {
+            Ok(Rc::new(RefCell::new(
+                r.borrow()
+                    .iter()
+                    .map(|v| v.copy_value())
+                    .collect::<PartialVMResult<_>>()?,
+            )))
+        };
+
+        Ok(match self {
+            Self::Vec(r) => Self::Vec(copy_rc_ref_vec_val(r)?),
+            Self::Struct(r) => Self::Struct(copy_rc_ref_vec_val(r)?),
+
+            Self::VecU8(r) => Self::VecU8(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU16(r) => Self::VecU16(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU32(r) => Self::VecU32(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU64(r) => Self::VecU64(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU128(r) => Self::VecU128(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU256(r) => Self::VecU256(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecBool(r) => Self::VecBool(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecAddress(r) => Self::VecAddress(Rc::new(RefCell::new(r.borrow().clone()))),
+
+            Self::Locals(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("cannot copy a Locals container".to_string()),
+                )
+            },
+        })
+    }
+
+    fn copy_by_ref(&self) -> Self {
+        match self {
+            Self::Vec(r) => Self::Vec(Rc::clone(r)),
+            Self::Struct(r) => Self::Struct(Rc::clone(r)),
+            Self::VecU8(r) => Self::VecU8(Rc::clone(r)),
+            Self::VecU16(r) => Self::VecU16(Rc::clone(r)),
+            Self::VecU32(r) => Self::VecU32(Rc::clone(r)),
+            Self::VecU64(r) => Self::VecU64(Rc::clone(r)),
+            Self::VecU128(r) => Self::VecU128(Rc::clone(r)),
+            Self::VecU256(r) => Self::VecU256(Rc::clone(r)),
+            Self::VecBool(r) => Self::VecBool(Rc::clone(r)),
+            Self::VecAddress(r) => Self::VecAddress(Rc::clone(r)),
+            Self::Locals(r) => Self::Locals(Rc::clone(r)),
+        }
+    }
+}
+
+impl IndexedRef {
+    fn copy_value(&self) -> Self {
+        Self {
+            idx: self.idx,
+            container_ref: self.container_ref.copy_value(),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn copy_value(&self) -> Self {
+        match self {
+            Self::Local(container) => Self::Local(container.copy_by_ref()),
+            Self::Global { status, container } => Self::Global {
+                status: Rc::clone(status),
+                container: container.copy_by_ref(),
+            },
+        }
+    }
+}
+
+impl Value {
+    pub fn copy_value(&self) -> PartialVMResult<Self> {
+        Ok(Self(self.0.copy_value()?))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Equality
+ *
+ *   Equality tests of Move values. Errors are raised when types mismatch.
+ *
+ *   It is intended to NOT use or even implement the standard library traits Eq and
+ *   Partial Eq due to:
+ *     1. They do not allow errors to be returned.
+ *     2. They can be invoked without the user being noticed thanks to operator
+ *        overloading.
+ *
+ *   Eq and Partial Eq must also NOT be derived for the reasons above plus that the
+ *   derived implementation differs from the semantics we want.
+ *
+ **************************************************************************************/
+
+impl ValueImpl {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use ValueImpl::*;
+
+        let res = match (self, other) {
+            (U8(l), U8(r)) => l == r,
+            (U16(l), U16(r)) => l == r,
+            (U32(l), U32(r)) => l == r,
+            (U64(l), U64(r)) => l == r,
+            (U128(l), U128(r)) => l == r,
+            (U256(l), U256(r)) => l == r,
+            (Bool(l), Bool(r)) => l == r,
+            (Address(l), Address(r)) => l == r,
+
+            (Container(l), Container(r)) => l.equals(r)?,
+
+            (ContainerRef(l), ContainerRef(r)) => l.equals(r)?,
+            (IndexedRef(l), IndexedRef(r)) => l.equals(r)?,
+            (Invalid, _)
+            | (U8(_), _)
+            | (U16(_), _)
+            | (U32(_), _)
+            | (U64(_), _)
+            | (U128(_), _)
+            | (U256(_), _)
+            | (Bool(_), _)
+            | (Address(_), _)
+            | (Container(_), _)
+            | (ContainerRef(_), _)
+            | (IndexedRef(_), _) => {
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                    .with_message(format!("cannot compare values: {:?}, {:?}", self, other)))
+            },
+        };
+
+        Ok(res)
+    }
+}
+
+impl Container {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use Container::*;
+
+        let res = match (self, other) {
+            (Vec(l), Vec(r)) | (Struct(l), Struct(r)) => {
+                let l = &l.borrow();
+                let r = &r.borrow();
+
+                if l.len() != r.len() {
+                    return Ok(false);
+                }
+                for (v1, v2) in l.iter().zip(r.iter()) {
+                    if !v1.equals(v2)? {
+                        return Ok(false);
+                    }
+                }
+                true
+            },
+            (VecU8(l), VecU8(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU16(l), VecU16(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU32(l), VecU32(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU64(l), VecU64(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU128(l), VecU128(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU256(l), VecU256(r)) => l.borrow().eq(&*r.borrow()),
+            (VecBool(l), VecBool(r)) => l.borrow().eq(&*r.borrow()),
+            (VecAddress(l), VecAddress(r)) => l.borrow().eq(&*r.borrow()),
+
+            (Locals(_), _)
+            | (Vec(_), _)
+            | (Struct(_), _)
+            | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
+            | (VecU64(_), _)
+            | (VecU128(_), _)
+            | (VecU256(_), _)
+            | (VecBool(_), _)
+            | (VecAddress(_), _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                        "cannot compare container values: {:?}, {:?}",
+                        self, other
+                    )),
+                )
+            },
+        };
+
+        Ok(res)
+    }
+}
+
+impl ContainerRef {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        self.container().equals(other.container())
+    }
+}
+
+impl IndexedRef {
+    fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        use Container::*;
+
+        let res = match (
+            self.container_ref.container(),
+            other.container_ref.container(),
+        ) {
+            // VecC <=> VecR impossible
+            (Vec(r1), Vec(r2))
+            | (Vec(r1), Struct(r2))
+            | (Vec(r1), Locals(r2))
+            | (Struct(r1), Vec(r2))
+            | (Struct(r1), Struct(r2))
+            | (Struct(r1), Locals(r2))
+            | (Locals(r1), Vec(r2))
+            | (Locals(r1), Struct(r2))
+            | (Locals(r1), Locals(r2)) => r1.borrow()[self.idx].equals(&r2.borrow()[other.idx])?,
+
+            (VecU8(r1), VecU8(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU16(r1), VecU16(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU32(r1), VecU32(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU64(r1), VecU64(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU128(r1), VecU128(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU256(r1), VecU256(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecBool(r1), VecBool(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecAddress(r1), VecAddress(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+
+            // Equality between a generic and a specialized container.
+            (Locals(r1), VecU8(r2)) | (Struct(r1), VecU8(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u8>()? == r2.borrow()[other.idx]
+            },
+            (VecU8(r1), Locals(r2)) | (VecU8(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u8>()?
+            },
+
+            (Locals(r1), VecU16(r2)) | (Struct(r1), VecU16(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u16>()? == r2.borrow()[other.idx]
+            },
+            (VecU16(r1), Locals(r2)) | (VecU16(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u16>()?
+            },
+
+            (Locals(r1), VecU32(r2)) | (Struct(r1), VecU32(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u32>()? == r2.borrow()[other.idx]
+            },
+            (VecU32(r1), Locals(r2)) | (VecU32(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u32>()?
+            },
+
+            (Locals(r1), VecU64(r2)) | (Struct(r1), VecU64(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u64>()? == r2.borrow()[other.idx]
+            },
+            (VecU64(r1), Locals(r2)) | (VecU64(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u64>()?
+            },
+
+            (Locals(r1), VecU128(r2)) | (Struct(r1), VecU128(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u128>()? == r2.borrow()[other.idx]
+            },
+            (VecU128(r1), Locals(r2)) | (VecU128(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u128>()?
+            },
+
+            (Locals(r1), VecU256(r2)) | (Struct(r1), VecU256(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u256::U256>()? == r2.borrow()[other.idx]
+            },
+            (VecU256(r1), Locals(r2)) | (VecU256(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u256::U256>()?
+            },
+
+            (Locals(r1), VecBool(r2)) | (Struct(r1), VecBool(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<bool>()? == r2.borrow()[other.idx]
+            },
+            (VecBool(r1), Locals(r2)) | (VecBool(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<bool>()?
+            },
+
+            (Locals(r1), VecAddress(r2)) | (Struct(r1), VecAddress(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<AccountAddress>()? == r2.borrow()[other.idx]
+            },
+            (VecAddress(r1), Locals(r2)) | (VecAddress(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<AccountAddress>()?
+            },
+
+            // All other combinations are illegal.
+            (Vec(_), _)
+            | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
+            | (VecU64(_), _)
+            | (VecU128(_), _)
+            | (VecU256(_), _)
+            | (VecBool(_), _)
+            | (VecAddress(_), _) => {
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                    .with_message(format!("cannot compare references {:?}, {:?}", self, other)))
+            },
+        };
+        Ok(res)
+    }
+}
+
+impl Value {
+    pub fn equals(&self, other: &Self) -> PartialVMResult<bool> {
+        self.0.equals(&other.0)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Read Ref
+ *
+ *   Implementation of the Move operation read ref.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        Ok(Value(ValueImpl::Container(self.container().copy_value()?)))
+    }
+}
+
+impl IndexedRef {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        use Container::*;
+
+        let res = match self.container_ref.container() {
+            Locals(r) | Vec(r) | Struct(r) => r.borrow()[self.idx].copy_value()?,
+            VecU8(r) => ValueImpl::U8(r.borrow()[self.idx]),
+            VecU16(r) => ValueImpl::U16(r.borrow()[self.idx]),
+            VecU32(r) => ValueImpl::U32(r.borrow()[self.idx]),
+            VecU64(r) => ValueImpl::U64(r.borrow()[self.idx]),
+            VecU128(r) => ValueImpl::U128(r.borrow()[self.idx]),
+            VecU256(r) => ValueImpl::U256(r.borrow()[self.idx]),
+            VecBool(r) => ValueImpl::Bool(r.borrow()[self.idx]),
+            VecAddress(r) => ValueImpl::Address(r.borrow()[self.idx]),
+        };
+
+        Ok(Value(res))
+    }
+}
+
+impl ReferenceImpl {
+    fn read_ref(self) -> PartialVMResult<Value> {
+        match self {
+            Self::ContainerRef(r) => r.read_ref(),
+            Self::IndexedRef(r) => r.read_ref(),
+        }
+    }
+}
+
+impl StructRef {
+    pub fn read_ref(self) -> PartialVMResult<Value> {
+        self.0.read_ref()
+    }
+}
+
+impl Reference {
+    pub fn read_ref(self) -> PartialVMResult<Value> {
+        self.0.read_ref()
+    }
+}
+
+/***************************************************************************************
+ *
+ * Write Ref
+ *
+ *   Implementation of the Move operation write ref.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn write_ref(self, v: Value) -> PartialVMResult<()> {
+        match v.0 {
+            ValueImpl::Container(c) => {
+                macro_rules! assign {
+                    ($r1:expr, $tc:ident) => {{
+                        let r = match c {
+                            Container::$tc(v) => v,
+                            _ => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                                )
+                                .with_message(
+                                    "failed to write_ref: container type mismatch".to_string(),
+                                ))
+                            },
+                        };
+                        *$r1.borrow_mut() = take_unique_ownership(r)?;
+                    }};
+                }
+
+                match self.container() {
+                    Container::Struct(r) => assign!(r, Struct),
+                    Container::Vec(r) => assign!(r, Vec),
+                    Container::VecU8(r) => assign!(r, VecU8),
+                    Container::VecU16(r) => assign!(r, VecU16),
+                    Container::VecU32(r) => assign!(r, VecU32),
+                    Container::VecU64(r) => assign!(r, VecU64),
+                    Container::VecU128(r) => assign!(r, VecU128),
+                    Container::VecU256(r) => assign!(r, VecU256),
+                    Container::VecBool(r) => assign!(r, VecBool),
+                    Container::VecAddress(r) => assign!(r, VecAddress),
+                    Container::Locals(_) => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("cannot overwrite Container::Locals".to_string()))
+                    },
+                }
+                self.mark_dirty();
+            },
+            _ => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "cannot write value {:?} to container ref {:?}",
+                            v, self
+                        )),
+                )
+            },
+        }
+        Ok(())
+    }
+}
+
+impl IndexedRef {
+    fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        match &x.0 {
+            ValueImpl::IndexedRef(_)
+            | ValueImpl::ContainerRef(_)
+            | ValueImpl::Invalid
+            | ValueImpl::Container(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "cannot write value {:?} to indexed ref {:?}",
+                            x, self
+                        )),
+                )
+            },
+            _ => (),
+        }
+
+        match (self.container_ref.container(), &x.0) {
+            (Container::Locals(r), _) | (Container::Vec(r), _) | (Container::Struct(r), _) => {
+                let mut v = r.borrow_mut();
+                v[self.idx] = x.0;
+            },
+            (Container::VecU8(r), ValueImpl::U8(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU16(r), ValueImpl::U16(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU32(r), ValueImpl::U32(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU64(r), ValueImpl::U64(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU128(r), ValueImpl::U128(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU256(r), ValueImpl::U256(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecBool(r), ValueImpl::Bool(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecAddress(r), ValueImpl::Address(x)) => r.borrow_mut()[self.idx] = *x,
+
+            (Container::VecU8(_), _)
+            | (Container::VecU16(_), _)
+            | (Container::VecU32(_), _)
+            | (Container::VecU64(_), _)
+            | (Container::VecU128(_), _)
+            | (Container::VecU256(_), _)
+            | (Container::VecBool(_), _)
+            | (Container::VecAddress(_), _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                        "cannot write value {:?} to indexed ref {:?}",
+                        x, self
+                    )),
+                )
+            },
+        }
+        self.container_ref.mark_dirty();
+        Ok(())
+    }
+}
+
+impl ReferenceImpl {
+    fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        match self {
+            Self::ContainerRef(r) => r.write_ref(x),
+            Self::IndexedRef(r) => r.write_ref(x),
+        }
+    }
+}
+
+impl Reference {
+    pub fn write_ref(self, x: Value) -> PartialVMResult<()> {
+        self.0.write_ref(x)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Borrows (Move)
+ *
+ *   Implementation of borrowing in Move: borrow field, borrow local and infrastructure
+ *   to support borrowing an element from a vector.
+ *
+ **************************************************************************************/
+
+impl ContainerRef {
+    fn borrow_elem(&self, idx: usize) -> PartialVMResult<ValueImpl> {
+        let len = self.container().len();
+        if idx >= len {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "index out of bounds when borrowing container element: got: {}, len: {}",
+                        idx, len
+                    ),
+                ),
+            );
+        }
+
+        let res = match self.container() {
+            Container::Locals(r) | Container::Vec(r) | Container::Struct(r) => {
+                let v = r.borrow();
+                match &v[idx] {
+                    // TODO: check for the impossible combinations.
+                    ValueImpl::Container(container) => {
+                        let r = match self {
+                            Self::Local(_) => Self::Local(container.copy_by_ref()),
+                            Self::Global { status, .. } => Self::Global {
+                                status: Rc::clone(status),
+                                container: container.copy_by_ref(),
+                            },
+                        };
+                        ValueImpl::ContainerRef(r)
+                    },
+                    _ => ValueImpl::IndexedRef(IndexedRef {
+                        idx,
+                        container_ref: self.copy_value(),
+                    }),
+                }
+            },
+
+            Container::VecU8(_)
+            | Container::VecU16(_)
+            | Container::VecU32(_)
+            | Container::VecU64(_)
+            | Container::VecU128(_)
+            | Container::VecU256(_)
+            | Container::VecAddress(_)
+            | Container::VecBool(_) => ValueImpl::IndexedRef(IndexedRef {
+                idx,
+                container_ref: self.copy_value(),
+            }),
+        };
+
+        Ok(res)
+    }
+}
+
+impl StructRef {
+    pub fn borrow_field(&self, idx: usize) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_elem(idx)?))
+    }
+}
+
+impl Locals {
+    pub fn borrow_loc(&self, idx: usize) -> PartialVMResult<Value> {
+        // TODO: this is very similar to SharedContainer::borrow_elem. Find a way to
+        // reuse that code?
+
+        let v = self.0.borrow();
+        if idx >= v.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "index out of bounds when borrowing local: got: {}, len: {}",
+                        idx,
+                        v.len()
+                    ),
+                ),
+            );
+        }
+
+        match &v[idx] {
+            ValueImpl::Container(c) => Ok(Value(ValueImpl::ContainerRef(ContainerRef::Local(
+                c.copy_by_ref(),
+            )))),
+
+            ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
+            | ValueImpl::U64(_)
+            | ValueImpl::U128(_)
+            | ValueImpl::U256(_)
+            | ValueImpl::Bool(_)
+            | ValueImpl::Address(_) => Ok(Value(ValueImpl::IndexedRef(IndexedRef {
+                container_ref: ContainerRef::Local(Container::Locals(Rc::clone(&self.0))),
+                idx,
+            }))),
+
+            ValueImpl::ContainerRef(_) | ValueImpl::Invalid | ValueImpl::IndexedRef(_) => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("cannot borrow local {:?}", &v[idx])),
+            ),
+        }
+    }
+}
+
+impl SignerRef {
+    pub fn borrow_signer(&self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_elem(0)?))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Locals
+ *
+ *   Public APIs for Locals to support reading, writing and moving of values.
+ *
+ **************************************************************************************/
+impl Locals {
+    pub fn new(n: usize) -> Self {
+        Self(Rc::new(RefCell::new(
+            iter::repeat_with(|| ValueImpl::Invalid).take(n).collect(),
+        )))
+    }
+
+    pub fn copy_loc(&self, idx: usize) -> PartialVMResult<Value> {
+        let v = self.0.borrow();
+        match v.get(idx) {
+            Some(ValueImpl::Invalid) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message(format!("cannot copy invalid value at index {}", idx))),
+            Some(v) => Ok(Value(v.copy_value()?)),
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+
+    fn swap_loc(&mut self, idx: usize, x: Value, violation_check: bool) -> PartialVMResult<Value> {
+        let mut v = self.0.borrow_mut();
+        match v.get_mut(idx) {
+            Some(v) => {
+                if violation_check {
+                    if let ValueImpl::Container(c) = v {
+                        if c.rc_count() > 1 {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "moving container with dangling references".to_string(),
+                            ));
+                        }
+                    }
+                }
+                Ok(Value(std::mem::replace(v, x.0)))
+            },
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+
+    pub fn move_loc(&mut self, idx: usize, violation_check: bool) -> PartialVMResult<Value> {
+        match self.swap_loc(idx, Value(ValueImpl::Invalid), violation_check)? {
+            Value(ValueImpl::Invalid) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message(format!("cannot move invalid value at index {}", idx))),
+            v => Ok(v),
+        }
+    }
+
+    pub fn store_loc(
+        &mut self,
+        idx: usize,
+        x: Value,
+        violation_check: bool,
+    ) -> PartialVMResult<()> {
+        self.swap_loc(idx, x, violation_check)?;
+        Ok(())
+    }
+
+    /// Drop all Move values onto a different Vec to avoid leaking memory.
+    /// References are excluded since they may point to invalid data.
+    pub fn drop_all_values(&mut self) -> impl Iterator<Item = (usize, Value)> {
+        let mut locals = self.0.borrow_mut();
+        let mut res = vec![];
+
+        for idx in 0..locals.len() {
+            match &locals[idx] {
+                ValueImpl::Invalid => (),
+                ValueImpl::ContainerRef(_) | ValueImpl::IndexedRef(_) => {
+                    locals[idx] = ValueImpl::Invalid;
+                },
+                _ => res.push((
+                    idx,
+                    Value(std::mem::replace(&mut locals[idx], ValueImpl::Invalid)),
+                )),
+            }
+        }
+
+        res.into_iter()
+    }
+
+    pub fn is_invalid(&self, idx: usize) -> PartialVMResult<bool> {
+        let v = self.0.borrow();
+        match v.get(idx) {
+            Some(ValueImpl::Invalid) => Ok(true),
+            Some(_) => Ok(false),
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Public Value Constructors
+ *
+ *   Constructors to allow values to be created outside this module.
+ *
+ **************************************************************************************/
+impl Value {
+    pub fn u8(x: u8) -> Self {
+        Self(ValueImpl::U8(x))
+    }
+
+    pub fn u16(x: u16) -> Self {
+        Self(ValueImpl::U16(x))
+    }
+
+    pub fn u32(x: u32) -> Self {
+        Self(ValueImpl::U32(x))
+    }
+
+    pub fn u64(x: u64) -> Self {
+        Self(ValueImpl::U64(x))
+    }
+
+    pub fn u128(x: u128) -> Self {
+        Self(ValueImpl::U128(x))
+    }
+
+    pub fn u256(x: u256::U256) -> Self {
+        Self(ValueImpl::U256(x))
+    }
+
+    pub fn bool(x: bool) -> Self {
+        Self(ValueImpl::Bool(x))
+    }
+
+    pub fn address(x: AccountAddress) -> Self {
+        Self(ValueImpl::Address(x))
+    }
+
+    pub fn signer(x: AccountAddress) -> Self {
+        Self(ValueImpl::Container(Container::signer(x)))
+    }
+
+    /// Create a "unowned" reference to a signer value (&signer) for populating the &signer in
+    /// execute function
+    pub fn signer_reference(x: AccountAddress) -> Self {
+        Self(ValueImpl::ContainerRef(ContainerRef::Local(
+            Container::signer(x),
+        )))
+    }
+
+    pub fn struct_(s: Struct) -> Self {
+        Self(ValueImpl::Container(Container::Struct(Rc::new(
+            RefCell::new(s.fields),
+        ))))
+    }
+
+    // TODO: consider whether we want to replace these with fn vector(v: Vec<Value>).
+    pub fn vector_u8(it: impl IntoIterator<Item = u8>) -> Self {
+        Self(ValueImpl::Container(Container::VecU8(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u16(it: impl IntoIterator<Item = u16>) -> Self {
+        Self(ValueImpl::Container(Container::VecU16(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u32(it: impl IntoIterator<Item = u32>) -> Self {
+        Self(ValueImpl::Container(Container::VecU32(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u64(it: impl IntoIterator<Item = u64>) -> Self {
+        Self(ValueImpl::Container(Container::VecU64(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u128(it: impl IntoIterator<Item = u128>) -> Self {
+        Self(ValueImpl::Container(Container::VecU128(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u256(it: impl IntoIterator<Item = u256::U256>) -> Self {
+        Self(ValueImpl::Container(Container::VecU256(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_bool(it: impl IntoIterator<Item = bool>) -> Self {
+        Self(ValueImpl::Container(Container::VecBool(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_address(it: impl IntoIterator<Item = AccountAddress>) -> Self {
+        Self(ValueImpl::Container(Container::VecAddress(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    // REVIEW: This API can break
+    pub fn vector_for_testing_only(it: impl IntoIterator<Item = Value>) -> Self {
+        Self(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+            it.into_iter().map(|v| v.0).collect(),
+        )))))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Casting
+ *
+ *   Due to the public value types being opaque to an external user, the following
+ *   public APIs are required to enable conversion between types in order to gain access
+ *   to specific operations certain more refined types offer.
+ *   For example, one must convert a `Value` to a `Struct` before unpack can be called.
+ *
+ *   It is expected that the caller will keep track of the invariants and guarantee
+ *   the conversion will succeed. An error will be raised in case of a violation.
+ *
+ **************************************************************************************/
+pub trait VMValueCast<T> {
+    fn cast(self) -> PartialVMResult<T>;
+}
+
+macro_rules! impl_vm_value_cast {
+    ($ty:ty, $tc:ident) => {
+        impl VMValueCast<$ty> for Value {
+            fn cast(self) -> PartialVMResult<$ty> {
+                match self.0 {
+                    ValueImpl::$tc(x) => Ok(x),
+                    v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message(format!("cannot cast {:?} to {}", v, stringify!($ty)))),
+                }
+            }
+        }
+    };
+}
+
+impl_vm_value_cast!(u8, U8);
+impl_vm_value_cast!(u16, U16);
+impl_vm_value_cast!(u32, U32);
+impl_vm_value_cast!(u64, U64);
+impl_vm_value_cast!(u128, U128);
+impl_vm_value_cast!(u256::U256, U256);
+impl_vm_value_cast!(bool, Bool);
+impl_vm_value_cast!(AccountAddress, Address);
+impl_vm_value_cast!(ContainerRef, ContainerRef);
+impl_vm_value_cast!(IndexedRef, IndexedRef);
+
+impl VMValueCast<IntegerValue> for Value {
+    fn cast(self) -> PartialVMResult<IntegerValue> {
+        match self.0 {
+            ValueImpl::U8(x) => Ok(IntegerValue::U8(x)),
+            ValueImpl::U16(x) => Ok(IntegerValue::U16(x)),
+            ValueImpl::U32(x) => Ok(IntegerValue::U32(x)),
+            ValueImpl::U64(x) => Ok(IntegerValue::U64(x)),
+            ValueImpl::U128(x) => Ok(IntegerValue::U128(x)),
+            ValueImpl::U256(x) => Ok(IntegerValue::U256(x)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to integer", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Reference> for Value {
+    fn cast(self) -> PartialVMResult<Reference> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(Reference(ReferenceImpl::ContainerRef(r))),
+            ValueImpl::IndexedRef(r) => Ok(Reference(ReferenceImpl::IndexedRef(r))),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Container> for Value {
+    fn cast(self) -> PartialVMResult<Container> {
+        match self.0 {
+            ValueImpl::Container(c) => Ok(c),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to container", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Struct> for Value {
+    fn cast(self) -> PartialVMResult<Struct> {
+        match self.0 {
+            ValueImpl::Container(Container::Struct(r)) => Ok(Struct {
+                fields: take_unique_ownership(r)?,
+            }),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to struct", v,))),
+        }
+    }
+}
+
+impl VMValueCast<StructRef> for Value {
+    fn cast(self) -> PartialVMResult<StructRef> {
+        Ok(StructRef(VMValueCast::cast(self)?))
+    }
+}
+
+impl VMValueCast<Vec<u8>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<u8>> {
+        match self.0 {
+            ValueImpl::Container(Container::VecU8(r)) => take_unique_ownership(r),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector<u8>", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vec<u64>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<u64>> {
+        match self.0 {
+            ValueImpl::Container(Container::VecU64(r)) => take_unique_ownership(r),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector<u64>", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vec<Value>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<Value>> {
+        match self.0 {
+            ValueImpl::Container(Container::Vec(c)) => {
+                Ok(take_unique_ownership(c)?.into_iter().map(Value).collect())
+            },
+            ValueImpl::Address(_)
+            | ValueImpl::Bool(_)
+            | ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
+            | ValueImpl::U64(_)
+            | ValueImpl::U128(_)
+            | ValueImpl::U256(_) => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(
+                    "cannot cast a specialized vector into a non-specialized one".to_string(),
+                )),
+            v => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                    "cannot cast {:?} to vector<non-specialized-type>",
+                    v,
+                )),
+            ),
+        }
+    }
+}
+
+impl VMValueCast<SignerRef> for Value {
+    fn cast(self) -> PartialVMResult<SignerRef> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(SignerRef(r)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to Signer reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<VectorRef> for Value {
+    fn cast(self) -> PartialVMResult<VectorRef> {
+        match self.0 {
+            ValueImpl::ContainerRef(r) => Ok(VectorRef(r)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector reference", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vector> for Value {
+    fn cast(self) -> PartialVMResult<Vector> {
+        match self.0 {
+            ValueImpl::Container(c) => Ok(Vector(c)),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector", v,))),
+        }
+    }
+}
+
+impl Value {
+    pub fn value_as<T>(self) -> PartialVMResult<T>
+    where
+        Self: VMValueCast<T>,
+    {
+        VMValueCast::cast(self)
+    }
+}
+
+impl VMValueCast<u8> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u8> {
+        match self {
+            Self::U8(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u8", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u16> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u16> {
+        match self {
+            Self::U16(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u16", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u32> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u32> {
+        match self {
+            Self::U32(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u32", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u64> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u64> {
+        match self {
+            Self::U64(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u64", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u128> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u128> {
+        match self {
+            Self::U128(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u128", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u256::U256> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u256::U256> {
+        match self {
+            Self::U256(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u256", v,))),
+        }
+    }
+}
+
+impl IntegerValue {
+    pub fn value_as<T>(self) -> PartialVMResult<T>
+    where
+        Self: VMValueCast<T>,
+    {
+        VMValueCast::cast(self)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Integer Operations
+ *
+ *   Arithmetic operations and conversions for integer values.
+ *
+ **************************************************************************************/
+impl IntegerValue {
+    pub fn add_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_add(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_add(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_add(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_add(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_add(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_add(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot add {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn sub_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_sub(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_sub(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_sub(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_sub(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_sub(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_sub(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot sub {:?} from {:?}", r, l);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn mul_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_mul(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_mul(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_mul(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_mul(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_mul(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_mul(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot mul {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn div_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_div(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_div(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_div(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_div(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_div(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_div(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot div {:?} by {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn rem_checked(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        let res = match (self, other) {
+            (U8(l), U8(r)) => u8::checked_rem(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_rem(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_rem(l, r).map(IntegerValue::U32),
+            (U64(l), U64(r)) => u64::checked_rem(l, r).map(IntegerValue::U64),
+            (U128(l), U128(r)) => u128::checked_rem(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_rem(l, r).map(IntegerValue::U256),
+            (l, r) => {
+                let msg = format!("Cannot rem {:?} by {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        };
+        res.ok_or_else(|| PartialVMError::new(StatusCode::ARITHMETIC_ERROR))
+    }
+
+    pub fn bit_or(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l | r),
+            (U16(l), U16(r)) => IntegerValue::U16(l | r),
+            (U32(l), U32(r)) => IntegerValue::U32(l | r),
+            (U64(l), U64(r)) => IntegerValue::U64(l | r),
+            (U128(l), U128(r)) => IntegerValue::U128(l | r),
+            (U256(l), U256(r)) => IntegerValue::U256(l | r),
+            (l, r) => {
+                let msg = format!("Cannot bit_or {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn bit_and(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l & r),
+            (U16(l), U16(r)) => IntegerValue::U16(l & r),
+            (U32(l), U32(r)) => IntegerValue::U32(l & r),
+            (U64(l), U64(r)) => IntegerValue::U64(l & r),
+            (U128(l), U128(r)) => IntegerValue::U128(l & r),
+            (U256(l), U256(r)) => IntegerValue::U256(l & r),
+            (l, r) => {
+                let msg = format!("Cannot bit_and {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn bit_xor(self, other: Self) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => IntegerValue::U8(l ^ r),
+            (U16(l), U16(r)) => IntegerValue::U16(l ^ r),
+            (U32(l), U32(r)) => IntegerValue::U32(l ^ r),
+            (U64(l), U64(r)) => IntegerValue::U64(l ^ r),
+            (U128(l), U128(r)) => IntegerValue::U128(l ^ r),
+            (U256(l), U256(r)) => IntegerValue::U256(l ^ r),
+            (l, r) => {
+                let msg = format!("Cannot bit_xor {:?} and {:?}", l, r);
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn shl_checked(self, n_bits: u8) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => {
+                if n_bits >= 8 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U8(x << n_bits)
+            },
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x << n_bits)
+            },
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x << n_bits)
+            },
+            U64(x) => {
+                if n_bits >= 64 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U64(x << n_bits)
+            },
+            U128(x) => {
+                if n_bits >= 128 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U128(x << n_bits)
+            },
+            U256(x) => IntegerValue::U256(x << n_bits),
+        })
+    }
+
+    pub fn shr_checked(self, n_bits: u8) -> PartialVMResult<Self> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => {
+                if n_bits >= 8 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U8(x >> n_bits)
+            },
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x >> n_bits)
+            },
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x >> n_bits)
+            },
+            U64(x) => {
+                if n_bits >= 64 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U64(x >> n_bits)
+            },
+            U128(x) => {
+                if n_bits >= 128 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U128(x >> n_bits)
+            },
+            U256(x) => IntegerValue::U256(x >> n_bits),
+        })
+    }
+
+    pub fn lt(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l < r,
+            (U16(l), U16(r)) => l < r,
+            (U32(l), U32(r)) => l < r,
+            (U64(l), U64(r)) => l < r,
+            (U128(l), U128(r)) => l < r,
+            (U256(l), U256(r)) => l < r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn le(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l <= r,
+            (U16(l), U16(r)) => l <= r,
+            (U32(l), U32(r)) => l <= r,
+            (U64(l), U64(r)) => l <= r,
+            (U128(l), U128(r)) => l <= r,
+            (U256(l), U256(r)) => l <= r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn gt(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l > r,
+            (U16(l), U16(r)) => l > r,
+            (U32(l), U32(r)) => l > r,
+            (U64(l), U64(r)) => l > r,
+            (U128(l), U128(r)) => l > r,
+            (U256(l), U256(r)) => l > r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn ge(self, other: Self) -> PartialVMResult<bool> {
+        use IntegerValue::*;
+
+        Ok(match (self, other) {
+            (U8(l), U8(r)) => l >= r,
+            (U16(l), U16(r)) => l >= r,
+            (U32(l), U32(r)) => l >= r,
+            (U64(l), U64(r)) => l >= r,
+            (U128(l), U128(r)) => l >= r,
+            (U256(l), U256(r)) => l >= r,
+            (l, r) => {
+                let msg = format!(
+                    "Cannot compare {:?} and {:?}: incompatible integer types",
+                    l, r
+                );
+                return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
+            },
+        })
+    }
+
+    pub fn into_value(self) -> Value {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Value::u8(x),
+            U16(x) => Value::u16(x),
+            U32(x) => Value::u32(x),
+            U64(x) => Value::u64(x),
+            U128(x) => Value::u128(x),
+            U256(x) => Value::u256(x),
+        }
+    }
+}
+
+impl IntegerValue {
+    pub fn cast_u8(self) -> PartialVMResult<u8> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x),
+            U16(x) => {
+                if x > (std::u8::MAX as u16) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u16({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            },
+            U32(x) => {
+                if x > (std::u8::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            },
+            U64(x) => {
+                if x > (std::u8::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            },
+            U128(x) => {
+                if x > (std::u8::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            },
+            U256(x) => {
+                if x > (u256::U256::from(std::u8::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u8", x)))
+                } else {
+                    Ok(x.unchecked_as_u8())
+                }
+            },
+        }
+    }
+
+    pub fn cast_u16(self) -> PartialVMResult<u16> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u16),
+            U16(x) => Ok(x),
+            U32(x) => {
+                if x > (std::u16::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            },
+            U64(x) => {
+                if x > (std::u16::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            },
+            U128(x) => {
+                if x > (std::u16::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            },
+            U256(x) => {
+                if x > (u256::U256::from(std::u16::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u16", x)))
+                } else {
+                    Ok(x.unchecked_as_u16())
+                }
+            },
+        }
+    }
+
+    pub fn cast_u32(self) -> PartialVMResult<u32> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u32),
+            U16(x) => Ok(x as u32),
+            U32(x) => Ok(x),
+            U64(x) => {
+                if x > (std::u32::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            },
+            U128(x) => {
+                if x > (std::u32::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            },
+            U256(x) => {
+                if x > (u256::U256::from(std::u32::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x.unchecked_as_u32())
+                }
+            },
+        }
+    }
+
+    pub fn cast_u64(self) -> PartialVMResult<u64> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u64),
+            U16(x) => Ok(x as u64),
+            U32(x) => Ok(x as u64),
+            U64(x) => Ok(x),
+            U128(x) => {
+                if x > (std::u64::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u64", x)))
+                } else {
+                    Ok(x as u64)
+                }
+            },
+            U256(x) => {
+                if x > (u256::U256::from(std::u64::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u64", x)))
+                } else {
+                    Ok(x.unchecked_as_u64())
+                }
+            },
+        }
+    }
+
+    pub fn cast_u128(self) -> PartialVMResult<u128> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u128),
+            U16(x) => Ok(x as u128),
+            U32(x) => Ok(x as u128),
+            U64(x) => Ok(x as u128),
+            U128(x) => Ok(x),
+            U256(x) => {
+                if x > (u256::U256::from(std::u128::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u128", x)))
+                } else {
+                    Ok(x.unchecked_as_u128())
+                }
+            },
+        }
+    }
+
+    pub fn cast_u256(self) -> PartialVMResult<u256::U256> {
+        use IntegerValue::*;
+
+        Ok(match self {
+            U8(x) => u256::U256::from(x),
+            U16(x) => u256::U256::from(x),
+            U32(x) => u256::U256::from(x),
+            U64(x) => u256::U256::from(x),
+            U128(x) => u256::U256::from(x),
+            U256(x) => x,
+        })
+    }
+}
+
+/***************************************************************************************
+*
+* Vector
+*
+*   Implemented as a built-in data type.
+*
+**************************************************************************************/
+
+pub const INDEX_OUT_OF_BOUNDS: u64 = NFE_VECTOR_ERROR_BASE + 1;
+pub const POP_EMPTY_VEC: u64 = NFE_VECTOR_ERROR_BASE + 2;
+pub const VEC_UNPACK_PARITY_MISMATCH: u64 = NFE_VECTOR_ERROR_BASE + 3;
+
+fn check_elem_layout(ty: &Type, v: &Container) -> PartialVMResult<()> {
+    match (ty, v) {
+        (Type::U8, Container::VecU8(_))
+        | (Type::U64, Container::VecU64(_))
+        | (Type::U16, Container::VecU16(_))
+        | (Type::U32, Container::VecU32(_))
+        | (Type::U128, Container::VecU128(_))
+        | (Type::U256, Container::VecU256(_))
+        | (Type::Bool, Container::VecBool(_))
+        | (Type::Address, Container::VecAddress(_))
+        | (Type::Signer, Container::Struct(_)) => Ok(()),
+
+        (Type::Vector(_), Container::Vec(_)) => Ok(()),
+
+        (Type::Struct(_), Container::Vec(_))
+        | (Type::Signer, Container::Vec(_))
+        | (Type::StructInstantiation(_, _), Container::Vec(_)) => Ok(()),
+
+        (Type::Reference(_), _) | (Type::MutableReference(_), _) | (Type::TyParam(_), _) => Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("invalid type param for vector: {:?}", ty)),
+        ),
+
+        (Type::U8, _)
+        | (Type::U64, _)
+        | (Type::U16, _)
+        | (Type::U32, _)
+        | (Type::U128, _)
+        | (Type::U256, _)
+        | (Type::Bool, _)
+        | (Type::Address, _)
+        | (Type::Signer, _)
+        | (Type::Vector(_), _)
+        | (Type::Struct(_), _)
+        | (Type::StructInstantiation(_, _), _) => Err(PartialVMError::new(
+            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+        )
+        .with_message(format!(
+            "vector elem layout mismatch, expected {:?}, got {:?}",
+            ty, v
+        ))),
+    }
+}
+
+impl VectorRef {
+    pub fn len(&self, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        let len = match c {
+            Container::VecU8(r) => r.borrow().len(),
+            Container::VecU16(r) => r.borrow().len(),
+            Container::VecU32(r) => r.borrow().len(),
+            Container::VecU64(r) => r.borrow().len(),
+            Container::VecU128(r) => r.borrow().len(),
+            Container::VecU256(r) => r.borrow().len(),
+            Container::VecBool(r) => r.borrow().len(),
+            Container::VecAddress(r) => r.borrow().len(),
+            Container::Vec(r) => r.borrow().len(),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+        Ok(Value::u64(len as u64))
+    }
+
+    pub fn push_back(&self, e: Value, type_param: &Type) -> PartialVMResult<()> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        match c {
+            Container::VecU8(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU16(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU32(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU64(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU128(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU256(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecBool(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecAddress(r) => r.borrow_mut().push(e.value_as()?),
+            Container::Vec(r) => r.borrow_mut().push(e.0),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        }
+
+        self.0.mark_dirty();
+        Ok(())
+    }
+
+    pub fn borrow_elem(&self, idx: usize, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+        if idx >= c.len() {
+            return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                .with_sub_status(INDEX_OUT_OF_BOUNDS));
+        }
+        Ok(Value(self.0.borrow_elem(idx)?))
+    }
+
+    /// Returns a RefCell reference to the underlying vector of a `&vector<u8>` value.
+    pub fn as_bytes_ref(&self) -> std::cell::Ref<'_, Vec<u8>> {
+        let c = self.0.container();
+        match c {
+            Container::VecU8(r) => r.borrow(),
+            _ => panic!("can only be called on vector<u8>"),
+        }
+    }
+
+    pub fn pop(&self, type_param: &Type) -> PartialVMResult<Value> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        macro_rules! err_pop_empty_vec {
+            () => {
+                return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                    .with_sub_status(POP_EMPTY_VEC))
+            };
+        }
+
+        let res = match c {
+            Container::VecU8(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u8(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU16(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u16(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU32(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u32(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU64(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u64(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU128(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u128(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU256(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u256(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecBool(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::bool(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecAddress(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::address(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::Vec(r) => match r.borrow_mut().pop() {
+                Some(x) => Value(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+
+        self.0.mark_dirty();
+        Ok(res)
+    }
+
+    pub fn swap(&self, idx1: usize, idx2: usize, type_param: &Type) -> PartialVMResult<()> {
+        let c = self.0.container();
+        check_elem_layout(type_param, c)?;
+
+        macro_rules! swap {
+            ($v:expr) => {{
+                let mut v = $v.borrow_mut();
+                if idx1 >= v.len() || idx2 >= v.len() {
+                    return Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                        .with_sub_status(INDEX_OUT_OF_BOUNDS));
+                }
+                v.swap(idx1, idx2);
+            }};
+        }
+
+        match c {
+            Container::VecU8(r) => swap!(r),
+            Container::VecU16(r) => swap!(r),
+            Container::VecU32(r) => swap!(r),
+            Container::VecU64(r) => swap!(r),
+            Container::VecU128(r) => swap!(r),
+            Container::VecU256(r) => swap!(r),
+            Container::VecBool(r) => swap!(r),
+            Container::VecAddress(r) => swap!(r),
+            Container::Vec(r) => swap!(r),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        }
+
+        self.0.mark_dirty();
+        Ok(())
+    }
+}
+
+impl Vector {
+    pub fn pack(type_param: &Type, elements: Vec<Value>) -> PartialVMResult<Value> {
+        let container = match type_param {
+            Type::U8 => Value::vector_u8(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U16 => Value::vector_u16(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U32 => Value::vector_u32(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U64 => Value::vector_u64(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U128 => Value::vector_u128(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U256 => Value::vector_u256(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::Bool => Value::vector_bool(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::Address => Value::vector_address(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+
+            Type::Signer | Type::Vector(_) | Type::Struct(_) | Type::StructInstantiation(_, _) => {
+                Value(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+                    elements.into_iter().map(|v| v.0).collect(),
+                )))))
+            },
+
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("invalid type param for vector: {:?}", type_param)),
+                )
+            },
+        };
+
+        Ok(container)
+    }
+
+    pub fn empty(type_param: &Type) -> PartialVMResult<Value> {
+        Self::pack(type_param, vec![])
+    }
+
+    pub fn unpack_unchecked(self) -> PartialVMResult<Vec<Value>> {
+        let elements: Vec<_> = match self.0 {
+            Container::VecU8(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u8)
+                .collect(),
+            Container::VecU16(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u16)
+                .collect(),
+            Container::VecU32(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u32)
+                .collect(),
+            Container::VecU64(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u64)
+                .collect(),
+            Container::VecU128(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u128)
+                .collect(),
+            Container::VecU256(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u256)
+                .collect(),
+            Container::VecBool(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::bool)
+                .collect(),
+            Container::VecAddress(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::address)
+                .collect(),
+            Container::Vec(r) => take_unique_ownership(r)?.into_iter().map(Value).collect(),
+            Container::Locals(_) | Container::Struct(_) => unreachable!(),
+        };
+        Ok(elements)
+    }
+
+    pub fn unpack(self, type_param: &Type, expected_num: u64) -> PartialVMResult<Vec<Value>> {
+        check_elem_layout(type_param, &self.0)?;
+        let elements = self.unpack_unchecked()?;
+        if expected_num as usize == elements.len() {
+            Ok(elements)
+        } else {
+            Err(PartialVMError::new(StatusCode::VECTOR_OPERATION_ERROR)
+                .with_sub_status(VEC_UNPACK_PARITY_MISMATCH))
+        }
+    }
+
+    pub fn destroy_empty(self, type_param: &Type) -> PartialVMResult<()> {
+        self.unpack(type_param, 0)?;
+        Ok(())
+    }
+
+    pub fn to_vec_u8(self) -> PartialVMResult<Vec<u8>> {
+        check_elem_layout(&Type::U8, &self.0)?;
+        if let Container::VecU8(r) = self.0 {
+            Ok(take_unique_ownership(r)?.into_iter().collect())
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("expected vector<u8>".to_string()),
+            )
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Abstract Memory Size
+ *
+ *   TODO(Gas): This is the oldest implementation of abstract memory size.
+ *              It is now kept only as a reference impl, which is used to ensure
+ *              the new implementation is fully backward compatible.
+ *              We should be able to get this removed after we use the new impl
+ *              for a while and gain enough confidence in that.
+ *
+ **************************************************************************************/
+
+/// The size in bytes for a non-string or address constant on the stack
+pub(crate) const LEGACY_CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub(crate) const LEGACY_REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub(crate) const LEGACY_STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+impl Container {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        match self {
+            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
+                Struct::legacy_size_impl(&r.borrow())
+            },
+            Self::VecU8(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u8>()) as u64)
+            },
+            Self::VecU16(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u16>()) as u64)
+            },
+            Self::VecU32(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u32>()) as u64)
+            },
+            Self::VecU64(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u64>()) as u64)
+            },
+            Self::VecU128(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u128>()) as u64)
+            },
+            Self::VecU256(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<u256::U256>()) as u64,
+            ),
+            Self::VecBool(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<bool>()) as u64)
+            },
+            Self::VecAddress(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<AccountAddress>()) as u64,
+            ),
+        }
+    }
+}
+
+impl ContainerRef {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
+    }
+}
+
+impl IndexedRef {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
+    }
+}
+
+impl ValueImpl {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        use ValueImpl::*;
+
+        match self {
+            Invalid | U8(_) | U16(_) | U32(_) | U64(_) | U128(_) | U256(_) | Bool(_) => {
+                LEGACY_CONST_SIZE
+            },
+            Address(_) => AbstractMemorySize::new(AccountAddress::LENGTH as u64),
+            ContainerRef(r) => r.legacy_size(),
+            IndexedRef(r) => r.legacy_size(),
+            // TODO: in case the borrow fails the VM will panic.
+            Container(c) => c.legacy_size(),
+        }
+    }
+}
+
+impl Struct {
+    #[cfg(test)]
+    fn legacy_size_impl(fields: &[ValueImpl]) -> AbstractMemorySize {
+        fields
+            .iter()
+            .fold(LEGACY_STRUCT_SIZE, |acc, v| acc + v.legacy_size())
+    }
+
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        Self::legacy_size_impl(&self.fields)
+    }
+}
+
+impl Value {
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
+    }
+}
+
+impl ReferenceImpl {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        match self {
+            Self::ContainerRef(r) => r.legacy_size(),
+            Self::IndexedRef(r) => r.legacy_size(),
+        }
+    }
+}
+
+impl Reference {
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
+    }
+}
+
+/***************************************************************************************
+ *
+ * Struct Operations
+ *
+ *   Public APIs for Struct.
+ *
+ **************************************************************************************/
+impl Struct {
+    pub fn pack<I: IntoIterator<Item = Value>>(vals: I) -> Self {
+        Self {
+            fields: vals.into_iter().map(|v| v.0).collect(),
+        }
+    }
+
+    pub fn unpack(self) -> PartialVMResult<impl Iterator<Item = Value>> {
+        Ok(self.fields.into_iter().map(Value))
+    }
+}
+
+/***************************************************************************************
+ *
+ * Global Value Operations
+ *
+ *   Public APIs for GlobalValue. They allow global values to be created from external
+ *   source (a.k.a. storage), and references to be taken from them. At the end of the
+ *   transaction execution the dirty ones can be identified and wrote back to storage.
+ *
+ **************************************************************************************/
+#[allow(clippy::unnecessary_wraps)]
+impl GlobalValueImpl {
+    fn cached(
+        val: ValueImpl,
+        status: GlobalDataStatus,
+    ) -> Result<Self, (PartialVMError, ValueImpl)> {
+        match val {
+            ValueImpl::Container(Container::Struct(fields)) => {
+                let status = Rc::new(RefCell::new(status));
+                Ok(Self::Cached { fields, status })
+            },
+            val => Err((
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("failed to publish cached: not a resource".to_string()),
+                val,
+            )),
+        }
+    }
+
+    fn fresh(val: ValueImpl) -> Result<Self, (PartialVMError, ValueImpl)> {
+        match val {
+            ValueImpl::Container(Container::Struct(fields)) => Ok(Self::Fresh { fields }),
+            val => Err((
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("failed to publish fresh: not a resource".to_string()),
+                val,
+            )),
+        }
+    }
+
+    fn move_from(&mut self) -> PartialVMResult<ValueImpl> {
+        let fields = match self {
+            Self::None | Self::Deleted => {
+                return Err(PartialVMError::new(StatusCode::MISSING_DATA))
+            },
+            Self::Fresh { .. } => match std::mem::replace(self, Self::None) {
+                Self::Fresh { fields } => fields,
+                _ => unreachable!(),
+            },
+            Self::Cached { .. } => match std::mem::replace(self, Self::Deleted) {
+                Self::Cached { fields, .. } => fields,
+                _ => unreachable!(),
+            },
+        };
+        if Rc::strong_count(&fields) != 1 {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("moving global resource with dangling reference".to_string()),
+            );
+        }
+        Ok(ValueImpl::Container(Container::Struct(fields)))
+    }
+
+    fn move_to(&mut self, val: ValueImpl) -> Result<(), (PartialVMError, ValueImpl)> {
+        match self {
+            Self::Fresh { .. } | Self::Cached { .. } => {
+                return Err((
+                    PartialVMError::new(StatusCode::RESOURCE_ALREADY_EXISTS),
+                    val,
+                ))
+            },
+            Self::None => *self = Self::fresh(val)?,
+            Self::Deleted => *self = Self::cached(val, GlobalDataStatus::Dirty)?,
+        }
+        Ok(())
+    }
+
+    fn exists(&self) -> PartialVMResult<bool> {
+        match self {
+            Self::Fresh { .. } | Self::Cached { .. } => Ok(true),
+            Self::None | Self::Deleted => Ok(false),
+        }
+    }
+
+    fn borrow_global(&self) -> PartialVMResult<ValueImpl> {
+        match self {
+            Self::None | Self::Deleted => Err(PartialVMError::new(StatusCode::MISSING_DATA)),
+            Self::Fresh { fields } => Ok(ValueImpl::ContainerRef(ContainerRef::Local(
+                Container::Struct(Rc::clone(fields)),
+            ))),
+            Self::Cached { fields, status } => Ok(ValueImpl::ContainerRef(ContainerRef::Global {
+                container: Container::Struct(Rc::clone(fields)),
+                status: Rc::clone(status),
+            })),
+        }
+    }
+
+    fn into_effect(self) -> Option<Op<ValueImpl>> {
+        match self {
+            Self::None => None,
+            Self::Deleted => Some(Op::Delete),
+            Self::Fresh { fields } => {
+                Some(Op::New(ValueImpl::Container(Container::Struct(fields))))
+            },
+            Self::Cached { fields, status } => match &*status.borrow() {
+                GlobalDataStatus::Dirty => {
+                    Some(Op::Modify(ValueImpl::Container(Container::Struct(fields))))
+                },
+                GlobalDataStatus::Clean => None,
+            },
+        }
+    }
+
+    fn is_mutated(&self) -> bool {
+        match self {
+            Self::None => false,
+            Self::Deleted => true,
+            Self::Fresh { fields: _ } => true,
+            Self::Cached { fields: _, status } => match &*status.borrow() {
+                GlobalDataStatus::Dirty => true,
+                GlobalDataStatus::Clean => false,
+            },
+        }
+    }
+}
+
+impl GlobalValue {
+    pub fn none() -> Self {
+        Self(GlobalValueImpl::None)
+    }
+
+    pub fn cached(val: Value) -> PartialVMResult<Self> {
+        Ok(Self(
+            GlobalValueImpl::cached(val.0, GlobalDataStatus::Clean).map_err(|(err, _val)| err)?,
+        ))
+    }
+
+    pub fn move_from(&mut self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.move_from()?))
+    }
+
+    pub fn move_to(&mut self, val: Value) -> Result<(), (PartialVMError, Value)> {
+        self.0
+            .move_to(val.0)
+            .map_err(|(err, val)| (err, Value(val)))
+    }
+
+    pub fn borrow_global(&self) -> PartialVMResult<Value> {
+        Ok(Value(self.0.borrow_global()?))
+    }
+
+    pub fn exists(&self) -> PartialVMResult<bool> {
+        self.0.exists()
+    }
+
+    pub fn into_effect(self) -> Option<Op<Value>> {
+        self.0.into_effect().map(|op| op.map(Value))
+    }
+
+    pub fn is_mutated(&self) -> bool {
+        self.0.is_mutated()
+    }
+}
+
+/***************************************************************************************
+*
+* Display
+*
+*   Implementation of the Display trait for VM Values. These are supposed to be more
+*   friendly & readable than the generated Debug dump.
+*
+**************************************************************************************/
+
+impl Display for ValueImpl {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Invalid => write!(f, "Invalid"),
+
+            Self::U8(x) => write!(f, "U8({})", x),
+            Self::U16(x) => write!(f, "U16({})", x),
+            Self::U32(x) => write!(f, "U32({})", x),
+            Self::U64(x) => write!(f, "U64({})", x),
+            Self::U128(x) => write!(f, "U128({})", x),
+            Self::U256(x) => write!(f, "U256({})", x),
+            Self::Bool(x) => write!(f, "{}", x),
+            Self::Address(addr) => write!(f, "Address({})", addr.short_str_lossless()),
+
+            Self::Container(r) => write!(f, "{}", r),
+
+            Self::ContainerRef(r) => write!(f, "{}", r),
+            Self::IndexedRef(r) => write!(f, "{}", r),
+        }
+    }
+}
+
+fn display_list_of_items<T, I>(items: I, f: &mut fmt::Formatter) -> fmt::Result
+where
+    T: Display,
+    I: IntoIterator<Item = T>,
+{
+    write!(f, "[")?;
+    let mut items = items.into_iter();
+    if let Some(x) = items.next() {
+        write!(f, "{}", x)?;
+        for x in items {
+            write!(f, ", {}", x)?;
+        }
+    }
+    write!(f, "]")
+}
+
+impl Container {
+    fn raw_address(&self) -> usize {
+        use Container::*;
+
+        match self {
+            Locals(r) => r.as_ptr() as usize,
+            Vec(r) => r.as_ptr() as usize,
+            Struct(r) => r.as_ptr() as usize,
+            VecU8(r) => r.as_ptr() as usize,
+            VecU16(r) => r.as_ptr() as usize,
+            VecU32(r) => r.as_ptr() as usize,
+            VecU64(r) => r.as_ptr() as usize,
+            VecU128(r) => r.as_ptr() as usize,
+            VecU256(r) => r.as_ptr() as usize,
+            VecBool(r) => r.as_ptr() as usize,
+            VecAddress(r) => r.as_ptr() as usize,
+        }
+    }
+}
+
+impl Locals {
+    pub fn raw_address(&self) -> usize {
+        self.0.as_ptr() as usize
+    }
+}
+
+impl Display for ContainerRef {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Local(c) => write!(f, "(&container {:x})", c.raw_address()),
+            Self::Global { status, container } => write!(
+                f,
+                "(&container {:x} -- {:?})",
+                container.raw_address(),
+                &*status.borrow(),
+            ),
+        }
+    }
+}
+
+impl Display for IndexedRef {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}[{}]", self.container_ref, self.idx)
+    }
+}
+
+impl Display for Container {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "(container {:x}: ", self.raw_address())?;
+
+        match self {
+            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
+                display_list_of_items(r.borrow().iter(), f)
+            },
+            Self::VecU8(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU16(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU32(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU64(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU128(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU256(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecBool(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecAddress(r) => display_list_of_items(r.borrow().iter(), f),
+        }?;
+
+        write!(f, ")")
+    }
+}
+
+impl Display for Value {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Display::fmt(&self.0, f)
+    }
+}
+
+impl Display for Locals {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            self.0
+                .borrow()
+                .iter()
+                .enumerate()
+                .map(|(idx, val)| format!("[{}] {}", idx, val))
+                .collect::<Vec<_>>()
+                .join("\n")
+        )
+    }
+}
+
+#[allow(dead_code)]
+pub mod debug {
+    use super::*;
+    use std::fmt::Write;
+
+    fn print_invalid<B: Write>(buf: &mut B) -> PartialVMResult<()> {
+        debug_write!(buf, "-")
+    }
+
+    fn print_u8<B: Write>(buf: &mut B, x: &u8) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u16<B: Write>(buf: &mut B, x: &u16) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u32<B: Write>(buf: &mut B, x: &u32) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u64<B: Write>(buf: &mut B, x: &u64) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u128<B: Write>(buf: &mut B, x: &u128) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u256<B: Write>(buf: &mut B, x: &u256::U256) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_bool<B: Write>(buf: &mut B, x: &bool) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_address<B: Write>(buf: &mut B, x: &AccountAddress) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_value_impl<B: Write>(buf: &mut B, val: &ValueImpl) -> PartialVMResult<()> {
+        match val {
+            ValueImpl::Invalid => print_invalid(buf),
+
+            ValueImpl::U8(x) => print_u8(buf, x),
+            ValueImpl::U16(x) => print_u16(buf, x),
+            ValueImpl::U32(x) => print_u32(buf, x),
+            ValueImpl::U64(x) => print_u64(buf, x),
+            ValueImpl::U128(x) => print_u128(buf, x),
+            ValueImpl::U256(x) => print_u256(buf, x),
+            ValueImpl::Bool(x) => print_bool(buf, x),
+            ValueImpl::Address(x) => print_address(buf, x),
+
+            ValueImpl::Container(c) => print_container(buf, c),
+
+            ValueImpl::ContainerRef(r) => print_container_ref(buf, r),
+            ValueImpl::IndexedRef(r) => print_indexed_ref(buf, r),
+        }
+    }
+
+    fn print_list<'a, B, I, X, F>(
+        buf: &mut B,
+        begin: &str,
+        items: I,
+        print: F,
+        end: &str,
+    ) -> PartialVMResult<()>
+    where
+        B: Write,
+        X: 'a,
+        I: IntoIterator<Item = &'a X>,
+        F: Fn(&mut B, &X) -> PartialVMResult<()>,
+    {
+        debug_write!(buf, "{}", begin)?;
+        let mut it = items.into_iter();
+        if let Some(x) = it.next() {
+            print(buf, x)?;
+            for x in it {
+                debug_write!(buf, ", ")?;
+                print(buf, x)?;
+            }
+        }
+        debug_write!(buf, "{}", end)?;
+        Ok(())
+    }
+
+    fn print_container<B: Write>(buf: &mut B, c: &Container) -> PartialVMResult<()> {
+        match c {
+            Container::Vec(r) => print_list(buf, "[", r.borrow().iter(), print_value_impl, "]"),
+
+            Container::Struct(r) => {
+                print_list(buf, "{ ", r.borrow().iter(), print_value_impl, " }")
+            },
+
+            Container::VecU8(r) => print_list(buf, "[", r.borrow().iter(), print_u8, "]"),
+            Container::VecU16(r) => print_list(buf, "[", r.borrow().iter(), print_u16, "]"),
+            Container::VecU32(r) => print_list(buf, "[", r.borrow().iter(), print_u32, "]"),
+            Container::VecU64(r) => print_list(buf, "[", r.borrow().iter(), print_u64, "]"),
+            Container::VecU128(r) => print_list(buf, "[", r.borrow().iter(), print_u128, "]"),
+            Container::VecU256(r) => print_list(buf, "[", r.borrow().iter(), print_u256, "]"),
+            Container::VecBool(r) => print_list(buf, "[", r.borrow().iter(), print_bool, "]"),
+            Container::VecAddress(r) => print_list(buf, "[", r.borrow().iter(), print_address, "]"),
+
+            Container::Locals(_) => Err(PartialVMError::new(
+                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+            )
+            .with_message("debug print - invalid container: Locals".to_string())),
+        }
+    }
+
+    fn print_container_ref<B: Write>(buf: &mut B, r: &ContainerRef) -> PartialVMResult<()> {
+        debug_write!(buf, "(&) ")?;
+        print_container(buf, r.container())
+    }
+
+    fn print_slice_elem<B, X, F>(buf: &mut B, v: &[X], idx: usize, print: F) -> PartialVMResult<()>
+    where
+        B: Write,
+        F: FnOnce(&mut B, &X) -> PartialVMResult<()>,
+    {
+        match v.get(idx) {
+            Some(x) => print(buf, x),
+            None => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("ref index out of bounds".to_string()),
+            ),
+        }
+    }
+
+    fn print_indexed_ref<B: Write>(buf: &mut B, r: &IndexedRef) -> PartialVMResult<()> {
+        let idx = r.idx;
+        match r.container_ref.container() {
+            Container::Locals(r) | Container::Vec(r) | Container::Struct(r) => {
+                print_slice_elem(buf, &r.borrow(), idx, print_value_impl)
+            },
+
+            Container::VecU8(r) => print_slice_elem(buf, &r.borrow(), idx, print_u8),
+            Container::VecU16(r) => print_slice_elem(buf, &r.borrow(), idx, print_u16),
+            Container::VecU32(r) => print_slice_elem(buf, &r.borrow(), idx, print_u32),
+            Container::VecU64(r) => print_slice_elem(buf, &r.borrow(), idx, print_u64),
+            Container::VecU128(r) => print_slice_elem(buf, &r.borrow(), idx, print_u128),
+            Container::VecU256(r) => print_slice_elem(buf, &r.borrow(), idx, print_u256),
+            Container::VecBool(r) => print_slice_elem(buf, &r.borrow(), idx, print_bool),
+            Container::VecAddress(r) => print_slice_elem(buf, &r.borrow(), idx, print_address),
+        }
+    }
+
+    // TODO: This function was used in an old implementation of std::debug::print, and can probably be removed.
+    pub fn print_reference<B: Write>(buf: &mut B, r: &Reference) -> PartialVMResult<()> {
+        match &r.0 {
+            ReferenceImpl::ContainerRef(r) => print_container_ref(buf, r),
+            ReferenceImpl::IndexedRef(r) => print_indexed_ref(buf, r),
+        }
+    }
+
+    pub fn print_locals<B: Write>(buf: &mut B, locals: &Locals) -> PartialVMResult<()> {
+        // REVIEW: The number of spaces in the indent is currently hard coded.
+        for (idx, val) in locals.0.borrow().iter().enumerate() {
+            debug_write!(buf, "            [{}] ", idx)?;
+            print_value_impl(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    pub fn print_value<B: Write>(buf: &mut B, val: &Value) -> PartialVMResult<()> {
+        print_value_impl(buf, &val.0)
+    }
+}
+
+/***************************************************************************************
+ *
+ * Serialization & Deserialization
+ *
+ *   BCS implementation for VM values. Note although values are represented as Rust
+ *   enums that carry type info in the tags, we should NOT rely on them for
+ *   serialization:
+ *     1) Depending on the specific internal representation, it may be impossible to
+ *        reconstruct the layout from a value. For example, one cannot tell if a general
+ *        container is a struct or a value.
+ *     2) Even if 1) is not a problem at a certain time, we may change to a different
+ *        internal representation that breaks the 1-1 mapping. Extremely speaking, if
+ *        we switch to untagged unions one day, none of the type info will be carried
+ *        by the value.
+ *
+ *   Therefore the appropriate & robust way to implement serialization & deserialization
+ *   is to involve an explicit representation of the type layout.
+ *
+ **************************************************************************************/
+use serde::{
+    de::Error as DeError,
+    ser::{Error as SerError, SerializeSeq, SerializeTuple},
+    Deserialize,
+};
+
+impl Value {
+    pub fn simple_deserialize(blob: &[u8], layout: &MoveTypeLayout) -> Option<Value> {
+        bcs::from_bytes_seed(SeedWrapper { layout }, blob).ok()
+    }
+
+    pub fn simple_serialize(&self, layout: &MoveTypeLayout) -> Option<Vec<u8>> {
+        bcs::to_bytes(&AnnotatedValue {
+            layout,
+            val: &self.0,
+        })
+        .ok()
+    }
+}
+
+impl Struct {
+    pub fn simple_deserialize(blob: &[u8], layout: &MoveStructLayout) -> Option<Struct> {
+        bcs::from_bytes_seed(SeedWrapper { layout }, blob).ok()
+    }
+
+    pub fn simple_serialize(&self, layout: &MoveStructLayout) -> Option<Vec<u8>> {
+        bcs::to_bytes(&AnnotatedValue {
+            layout,
+            val: &self.fields,
+        })
+        .ok()
+    }
+}
+
+struct AnnotatedValue<'a, 'b, T1, T2> {
+    layout: &'a T1,
+    val: &'b T2,
+}
+
+fn invariant_violation<S: serde::Serializer>(message: String) -> S::Error {
+    S::Error::custom(
+        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(message),
+    )
+}
+
+impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveTypeLayout, ValueImpl> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        match (self.layout, self.val) {
+            (MoveTypeLayout::U8, ValueImpl::U8(x)) => serializer.serialize_u8(*x),
+            (MoveTypeLayout::U16, ValueImpl::U16(x)) => serializer.serialize_u16(*x),
+            (MoveTypeLayout::U32, ValueImpl::U32(x)) => serializer.serialize_u32(*x),
+            (MoveTypeLayout::U64, ValueImpl::U64(x)) => serializer.serialize_u64(*x),
+            (MoveTypeLayout::U128, ValueImpl::U128(x)) => serializer.serialize_u128(*x),
+            (MoveTypeLayout::U256, ValueImpl::U256(x)) => x.serialize(serializer),
+            (MoveTypeLayout::Bool, ValueImpl::Bool(x)) => serializer.serialize_bool(*x),
+            (MoveTypeLayout::Address, ValueImpl::Address(x)) => x.serialize(serializer),
+
+            (MoveTypeLayout::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
+                (AnnotatedValue {
+                    layout: struct_layout,
+                    val: &*r.borrow(),
+                })
+                .serialize(serializer)
+            },
+
+            (MoveTypeLayout::Vector(layout), ValueImpl::Container(c)) => {
+                let layout = &**layout;
+                match (layout, c) {
+                    (MoveTypeLayout::U8, Container::VecU8(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U16, Container::VecU16(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U32, Container::VecU32(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U64, Container::VecU64(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U128, Container::VecU128(r)) => {
+                        r.borrow().serialize(serializer)
+                    },
+                    (MoveTypeLayout::U256, Container::VecU256(r)) => {
+                        r.borrow().serialize(serializer)
+                    },
+                    (MoveTypeLayout::Bool, Container::VecBool(r)) => {
+                        r.borrow().serialize(serializer)
+                    },
+                    (MoveTypeLayout::Address, Container::VecAddress(r)) => {
+                        r.borrow().serialize(serializer)
+                    },
+
+                    (_, Container::Vec(r)) => {
+                        let v = r.borrow();
+                        let mut t = serializer.serialize_seq(Some(v.len()))?;
+                        for val in v.iter() {
+                            t.serialize_element(&AnnotatedValue { layout, val })?;
+                        }
+                        t.end()
+                    },
+
+                    (layout, container) => Err(invariant_violation::<S>(format!(
+                        "cannot serialize container {:?} as {:?}",
+                        container, layout
+                    ))),
+                }
+            },
+
+            (MoveTypeLayout::Signer, ValueImpl::Container(Container::Struct(r))) => {
+                let v = r.borrow();
+                if v.len() != 1 {
+                    return Err(invariant_violation::<S>(format!(
+                        "cannot serialize container as a signer -- expected 1 field got {}",
+                        v.len()
+                    )));
+                }
+                (AnnotatedValue {
+                    layout: &MoveTypeLayout::Address,
+                    val: &v[0],
+                })
+                .serialize(serializer)
+            },
+
+            (ty, val) => Err(invariant_violation::<S>(format!(
+                "cannot serialize value {:?} as {:?}",
+                val, ty
+            ))),
+        }
+    }
+}
+
+impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveStructLayout, Vec<ValueImpl>> {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let values = &self.val;
+        let fields = self.layout.fields();
+        if fields.len() != values.len() {
+            return Err(invariant_violation::<S>(format!(
+                "cannot serialize struct value {:?} as {:?} -- number of fields mismatch",
+                self.val, self.layout
+            )));
+        }
+        let mut t = serializer.serialize_tuple(values.len())?;
+        for (field_layout, val) in fields.iter().zip(values.iter()) {
+            t.serialize_element(&AnnotatedValue {
+                layout: field_layout,
+                val,
+            })?;
+        }
+        t.end()
+    }
+}
+
+#[derive(Clone)]
+struct SeedWrapper<L> {
+    layout: L,
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveTypeLayout> {
+    type Value = Value;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        use MoveTypeLayout as L;
+
+        match self.layout {
+            L::Bool => bool::deserialize(deserializer).map(Value::bool),
+            L::U8 => u8::deserialize(deserializer).map(Value::u8),
+            L::U16 => u16::deserialize(deserializer).map(Value::u16),
+            L::U32 => u32::deserialize(deserializer).map(Value::u32),
+            L::U64 => u64::deserialize(deserializer).map(Value::u64),
+            L::U128 => u128::deserialize(deserializer).map(Value::u128),
+            L::U256 => u256::U256::deserialize(deserializer).map(Value::u256),
+            L::Address => AccountAddress::deserialize(deserializer).map(Value::address),
+            L::Signer => AccountAddress::deserialize(deserializer).map(Value::signer),
+
+            L::Struct(struct_layout) => Ok(Value::struct_(
+                SeedWrapper {
+                    layout: struct_layout,
+                }
+                .deserialize(deserializer)?,
+            )),
+
+            L::Vector(layout) => {
+                let container = match &**layout {
+                    L::U8 => {
+                        Container::VecU8(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::U16 => {
+                        Container::VecU16(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::U32 => {
+                        Container::VecU32(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::U64 => {
+                        Container::VecU64(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::U128 => {
+                        Container::VecU128(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::U256 => {
+                        Container::VecU256(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::Bool => {
+                        Container::VecBool(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    },
+                    L::Address => Container::VecAddress(Rc::new(RefCell::new(Vec::deserialize(
+                        deserializer,
+                    )?))),
+                    layout => {
+                        let v = deserializer
+                            .deserialize_seq(VectorElementVisitor(SeedWrapper { layout }))?;
+                        Container::Vec(Rc::new(RefCell::new(v)))
+                    },
+                };
+                Ok(Value(ValueImpl::Container(container)))
+            },
+        }
+    }
+}
+
+impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveStructLayout> {
+    type Value = Struct;
+
+    fn deserialize<D: serde::de::Deserializer<'d>>(
+        self,
+        deserializer: D,
+    ) -> Result<Self::Value, D::Error> {
+        let field_layouts = self.layout.fields();
+        let fields = deserializer
+            .deserialize_tuple(field_layouts.len(), StructFieldVisitor(field_layouts))?;
+        Ok(Struct::pack(fields))
+    }
+}
+
+struct VectorElementVisitor<'a>(SeedWrapper<&'a MoveTypeLayout>);
+
+impl<'d, 'a> serde::de::Visitor<'d> for VectorElementVisitor<'a> {
+    type Value = Vec<ValueImpl>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Vector")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut vals = Vec::new();
+        while let Some(elem) = seq.next_element_seed(self.0.clone())? {
+            vals.push(elem.0)
+        }
+        Ok(vals)
+    }
+}
+
+struct StructFieldVisitor<'a>(&'a [MoveTypeLayout]);
+
+impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
+    type Value = Vec<Value>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Struct")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'d>,
+    {
+        let mut val = Vec::new();
+        for (i, field_layout) in self.0.iter().enumerate() {
+            if let Some(elem) = seq.next_element_seed(SeedWrapper {
+                layout: field_layout,
+            })? {
+                val.push(elem)
+            } else {
+                return Err(A::Error::invalid_length(i, &self));
+            }
+        }
+        Ok(val)
+    }
+}
+
+/***************************************************************************************
+*
+* Constants
+*
+*   Implementation of deserialization of constant data into a runtime value
+*
+**************************************************************************************/
+
+impl Value {
+    fn constant_sig_token_to_layout(constant_signature: &SignatureToken) -> Option<MoveTypeLayout> {
+        use MoveTypeLayout as L;
+        use SignatureToken as S;
+
+        Some(match constant_signature {
+            S::Bool => L::Bool,
+            S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
+            S::U64 => L::U64,
+            S::U128 => L::U128,
+            S::U256 => L::U256,
+            S::Address => L::Address,
+            S::Signer => return None,
+            S::Vector(inner) => L::Vector(Box::new(Self::constant_sig_token_to_layout(inner)?)),
+            // Not yet supported
+            S::Struct(_) | S::StructInstantiation(_, _) => return None,
+            // Not allowed/Not meaningful
+            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) => return None,
+        })
+    }
+
+    pub fn deserialize_constant(constant: &Constant) -> Option<Value> {
+        let layout = Self::constant_sig_token_to_layout(&constant.type_)?;
+        Value::simple_deserialize(&constant.data, &layout)
+    }
+}
+
+/***************************************************************************************
+*
+* Destructors
+*
+**************************************************************************************/
+// Locals may contain reference values that points to the same cotnainer through Rc, hencing forming
+// a cycle. Therefore values need to be manually taken out of the Locals in order to not leak memory.
+impl Drop for Locals {
+    fn drop(&mut self) {
+        _ = self.drop_all_values();
+    }
+}
+
+/***************************************************************************************
+*
+* Views
+*
+**************************************************************************************/
+impl Container {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use Container::*;
+
+        match self {
+            Locals(_) => unreachable!("Should not ba able to visit a Locals container directly"),
+            Vec(r) => {
+                let r = r.borrow();
+                if visitor.visit_vec(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            },
+            Struct(r) => {
+                let r = r.borrow();
+                if visitor.visit_struct(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            },
+            VecU8(r) => visitor.visit_vec_u8(depth, &r.borrow()),
+            VecU16(r) => visitor.visit_vec_u16(depth, &r.borrow()),
+            VecU32(r) => visitor.visit_vec_u32(depth, &r.borrow()),
+            VecU64(r) => visitor.visit_vec_u64(depth, &r.borrow()),
+            VecU128(r) => visitor.visit_vec_u128(depth, &r.borrow()),
+            VecU256(r) => visitor.visit_vec_u256(depth, &r.borrow()),
+            VecBool(r) => visitor.visit_vec_bool(depth, &r.borrow()),
+            VecAddress(r) => visitor.visit_vec_address(depth, &r.borrow()),
+        }
+    }
+
+    fn visit_indexed(&self, visitor: &mut impl ValueVisitor, depth: usize, idx: usize) {
+        use Container::*;
+
+        match self {
+            Locals(r) | Vec(r) | Struct(r) => r.borrow()[idx].visit_impl(visitor, depth + 1),
+            VecU8(vals) => visitor.visit_u8(depth + 1, vals.borrow()[idx]),
+            VecU16(vals) => visitor.visit_u16(depth + 1, vals.borrow()[idx]),
+            VecU32(vals) => visitor.visit_u32(depth + 1, vals.borrow()[idx]),
+            VecU64(vals) => visitor.visit_u64(depth + 1, vals.borrow()[idx]),
+            VecU128(vals) => visitor.visit_u128(depth + 1, vals.borrow()[idx]),
+            VecU256(vals) => visitor.visit_u256(depth + 1, vals.borrow()[idx]),
+            VecBool(vals) => visitor.visit_bool(depth + 1, vals.borrow()[idx]),
+            VecAddress(vals) => visitor.visit_address(depth + 1, vals.borrow()[idx]),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match self {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_impl(visitor, depth + 1);
+        }
+    }
+}
+
+impl IndexedRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match &self.container_ref {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_indexed(visitor, depth, self.idx)
+        }
+    }
+}
+
+impl ValueImpl {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ValueImpl::*;
+
+        match self {
+            Invalid => unreachable!("Should not be able to visit an invalid value"),
+
+            U8(val) => visitor.visit_u8(depth, *val),
+            U16(val) => visitor.visit_u16(depth, *val),
+            U32(val) => visitor.visit_u32(depth, *val),
+            U64(val) => visitor.visit_u64(depth, *val),
+            U128(val) => visitor.visit_u128(depth, *val),
+            U256(val) => visitor.visit_u256(depth, *val),
+            Bool(val) => visitor.visit_bool(depth, *val),
+            Address(val) => visitor.visit_address(depth, *val),
+
+            Container(c) => c.visit_impl(visitor, depth),
+
+            ContainerRef(r) => r.visit_impl(visitor, depth),
+            IndexedRef(r) => r.visit_impl(visitor, depth),
+        }
+    }
+}
+
+impl ValueView for ValueImpl {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for Value {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit(visitor)
+    }
+}
+
+impl ValueView for Struct {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        if visitor.visit_struct(0, self.fields.len()) {
+            for val in self.fields.iter() {
+                val.visit_impl(visitor, 1);
+            }
+        }
+    }
+}
+
+impl ValueView for Vector {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for IntegerValue {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use IntegerValue::*;
+
+        match self {
+            U8(val) => visitor.visit_u8(0, *val),
+            U16(val) => visitor.visit_u16(0, *val),
+            U32(val) => visitor.visit_u32(0, *val),
+            U64(val) => visitor.visit_u64(0, *val),
+            U128(val) => visitor.visit_u128(0, *val),
+            U256(val) => visitor.visit_u256(0, *val),
+        }
+    }
+}
+
+impl ValueView for Reference {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use ReferenceImpl::*;
+
+        match &self.0 {
+            ContainerRef(r) => r.visit_impl(visitor, 0),
+            IndexedRef(r) => r.visit_impl(visitor, 0),
+        }
+    }
+}
+
+impl ValueView for VectorRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for StructRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for SignerRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+// Note: We may want to add more helpers to retrieve value views behind references here.
+
+impl Struct {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn field_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> + Clone {
+        self.fields.iter()
+    }
+}
+
+impl Vector {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn elem_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> + Clone {
+        struct ElemView<'b> {
+            container: &'b Container,
+            idx: usize,
+        }
+
+        impl<'b> ValueView for ElemView<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                self.container.visit_indexed(visitor, 0, self.idx)
+            }
+        }
+
+        let len = self.0.len();
+
+        (0..len).map(|idx| ElemView {
+            container: &self.0,
+            idx,
+        })
+    }
+}
+
+impl Reference {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn value_view<'a>(&'a self) -> impl ValueView + 'a {
+        struct ValueBehindRef<'b>(&'b ReferenceImpl);
+
+        impl<'b> ValueView for ValueBehindRef<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                use ReferenceImpl::*;
+
+                match self.0 {
+                    ContainerRef(r) => r.container().visit_impl(visitor, 0),
+                    IndexedRef(r) => r.container_ref.container().visit_indexed(visitor, 0, r.idx),
+                }
+            }
+        }
+
+        ValueBehindRef(&self.0)
+    }
+}
+
+impl GlobalValue {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn view<'a>(&'a self) -> Option<impl ValueView + 'a> {
+        use GlobalValueImpl as G;
+
+        struct Wrapper<'b>(&'b Rc<RefCell<Vec<ValueImpl>>>);
+
+        impl<'b> ValueView for Wrapper<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                let r = self.0.borrow();
+                if visitor.visit_struct(0, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, 1);
+                    }
+                }
+            }
+        }
+
+        match &self.0 {
+            G::None | G::Deleted => None,
+            G::Cached { fields, .. } | G::Fresh { fields } => Some(Wrapper(fields)),
+        }
+    }
+}
+
+/***************************************************************************************
+ *
+ * Prop Testing
+ *
+ *   Random generation of values that fit into a given layout.
+ *
+ **************************************************************************************/
+#[cfg(feature = "fuzzing")]
+pub mod prop {
+    use super::*;
+    #[allow(unused_imports)]
+    use move_core_types::value::{MoveStruct, MoveValue};
+    use proptest::{collection::vec, prelude::*};
+
+    pub fn value_strategy_with_layout(layout: &MoveTypeLayout) -> impl Strategy<Value = Value> {
+        use MoveTypeLayout as L;
+
+        match layout {
+            L::U8 => any::<u8>().prop_map(Value::u8).boxed(),
+            L::U16 => any::<u16>().prop_map(Value::u16).boxed(),
+            L::U32 => any::<u32>().prop_map(Value::u32).boxed(),
+            L::U64 => any::<u64>().prop_map(Value::u64).boxed(),
+            L::U128 => any::<u128>().prop_map(Value::u128).boxed(),
+            L::U256 => any::<u256::U256>().prop_map(Value::u256).boxed(),
+            L::Bool => any::<bool>().prop_map(Value::bool).boxed(),
+            L::Address => any::<AccountAddress>().prop_map(Value::address).boxed(),
+            L::Signer => any::<AccountAddress>().prop_map(Value::signer).boxed(),
+
+            L::Vector(layout) => match &**layout {
+                L::U8 => vec(any::<u8>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU8(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U16 => vec(any::<u16>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU16(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U32 => vec(any::<u32>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU32(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U64 => vec(any::<u64>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU64(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U128 => vec(any::<u128>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU128(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U256 => vec(any::<u256::U256>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU256(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::Bool => vec(any::<bool>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecBool(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::Address => vec(any::<AccountAddress>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecAddress(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                layout => vec(value_strategy_with_layout(layout), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::Vec(Rc::new(RefCell::new(
+                            vals.into_iter().map(|val| val.0).collect(),
+                        )))))
+                    })
+                    .boxed(),
+            },
+
+            L::Struct(struct_layout) => struct_layout
+                .fields()
+                .iter()
+                .map(value_strategy_with_layout)
+                .collect::<Vec<_>>()
+                .prop_map(move |vals| Value::struct_(Struct::pack(vals)))
+                .boxed(),
+        }
+    }
+
+    pub fn layout_strategy() -> impl Strategy<Value = MoveTypeLayout> {
+        use MoveTypeLayout as L;
+
+        let leaf = prop_oneof![
+            1 => Just(L::U8),
+            1 => Just(L::U16),
+            1 => Just(L::U32),
+            1 => Just(L::U64),
+            1 => Just(L::U128),
+            1 => Just(L::U256),
+            1 => Just(L::Bool),
+            1 => Just(L::Address),
+            1 => Just(L::Signer),
+        ];
+
+        leaf.prop_recursive(8, 32, 2, |inner| {
+            prop_oneof![
+                1 => inner.clone().prop_map(|layout| L::Vector(Box::new(layout))),
+                1 => vec(inner, 0..1).prop_map(|f_layouts| {
+                     L::Struct(MoveStructLayout::new(f_layouts))}),
+            ]
+        })
+    }
+
+    pub fn layout_and_value_strategy() -> impl Strategy<Value = (MoveTypeLayout, Value)> {
+        layout_strategy().no_shrink().prop_flat_map(|layout| {
+            let value_strategy = value_strategy_with_layout(&layout);
+            (Just(layout), value_strategy)
+        })
+    }
+}
+
+use move_core_types::value::{MoveStruct, MoveValue};
+
+impl ValueImpl {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        use MoveTypeLayout as L;
+
+        match (layout, &self) {
+            (L::U8, ValueImpl::U8(x)) => MoveValue::U8(*x),
+            (L::U16, ValueImpl::U16(x)) => MoveValue::U16(*x),
+            (L::U32, ValueImpl::U32(x)) => MoveValue::U32(*x),
+            (L::U64, ValueImpl::U64(x)) => MoveValue::U64(*x),
+            (L::U128, ValueImpl::U128(x)) => MoveValue::U128(*x),
+            (L::U256, ValueImpl::U256(x)) => MoveValue::U256(*x),
+            (L::Bool, ValueImpl::Bool(x)) => MoveValue::Bool(*x),
+            (L::Address, ValueImpl::Address(x)) => MoveValue::Address(*x),
+
+            (L::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
+                let mut fields = vec![];
+                for (v, field_layout) in r.borrow().iter().zip(struct_layout.fields().iter()) {
+                    fields.push(v.as_move_value(field_layout));
+                }
+                MoveValue::Struct(MoveStruct::new(fields))
+            },
+
+            (L::Vector(inner_layout), ValueImpl::Container(c)) => MoveValue::Vector(match c {
+                Container::VecU8(r) => r.borrow().iter().map(|u| MoveValue::U8(*u)).collect(),
+                Container::VecU16(r) => r.borrow().iter().map(|u| MoveValue::U16(*u)).collect(),
+                Container::VecU32(r) => r.borrow().iter().map(|u| MoveValue::U32(*u)).collect(),
+                Container::VecU64(r) => r.borrow().iter().map(|u| MoveValue::U64(*u)).collect(),
+                Container::VecU128(r) => r.borrow().iter().map(|u| MoveValue::U128(*u)).collect(),
+                Container::VecU256(r) => r.borrow().iter().map(|u| MoveValue::U256(*u)).collect(),
+                Container::VecBool(r) => r.borrow().iter().map(|u| MoveValue::Bool(*u)).collect(),
+                Container::VecAddress(r) => {
+                    r.borrow().iter().map(|u| MoveValue::Address(*u)).collect()
+                },
+                Container::Vec(r) => r
+                    .borrow()
+                    .iter()
+                    .map(|v| v.as_move_value(inner_layout.as_ref()))
+                    .collect(),
+                Container::Struct(_) => {
+                    panic!("got struct container when converting vec")
+                },
+                Container::Locals(_) => panic!("got locals container when converting vec"),
+            }),
+
+            (L::Signer, ValueImpl::Container(Container::Struct(r))) => {
+                let v = r.borrow();
+                if v.len() != 1 {
+                    panic!("Unexpected signer layout: {:?}", v);
+                }
+                match &v[0] {
+                    ValueImpl::Address(a) => MoveValue::Signer(*a),
+                    v => panic!("Unexpected non-address while converting signer: {:?}", v),
+                }
+            },
+
+            (layout, val) => panic!("Cannot convert value {:?} as {:?}", val, layout),
+        }
+    }
+}
+
+impl Value {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        self.0.as_move_value(layout)
+    }
+}
diff --git a/vendors/move/crates/move-vm/types/src/views.rs b/vendors/move/crates/move-vm/types/src/views.rs
new file mode 100644
index 000000000..29a87e326
--- /dev/null
+++ b/vendors/move/crates/move-vm/types/src/views.rs
@@ -0,0 +1,218 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    account_address::AccountAddress, gas_algebra::AbstractMemorySize, language_storage::TypeTag,
+};
+use std::mem::size_of;
+
+/// Trait that provides an abstract view into a Move type.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait TypeView {
+    /// Returns the `TypeTag` (fully qualified name) of the type.
+    fn to_type_tag(&self) -> TypeTag;
+}
+
+/// Trait that provides an abstract view into a Move Value.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait ValueView {
+    fn visit(&self, visitor: &mut impl ValueVisitor);
+
+    /// Returns the abstract memory size of the value.
+    ///
+    /// The concept of abstract memory size is not well-defined and is only kept for backward compatibility.
+    /// New applications should avoid using this.
+    ///
+    /// TODO(Gas): Encourage clients to replicate this in their own repo and get this removed once
+    ///            they are done.
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        use crate::values::{LEGACY_CONST_SIZE, LEGACY_REFERENCE_SIZE, LEGACY_STRUCT_SIZE};
+
+        struct Acc(AbstractMemorySize);
+
+        impl ValueVisitor for Acc {
+            fn visit_u8(&mut self, _depth: usize, _val: u8) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u16(&mut self, _depth: usize, _val: u16) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u32(&mut self, _depth: usize, _val: u32) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u64(&mut self, _depth: usize, _val: u64) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u128(&mut self, _depth: usize, _val: u128) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u256(&mut self, _depth: usize, _val: move_core_types::u256::U256) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_bool(&mut self, _depth: usize, _val: bool) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_address(&mut self, _depth: usize, _val: AccountAddress) {
+                self.0 += AbstractMemorySize::new(AccountAddress::LENGTH as u64);
+            }
+
+            fn visit_struct(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec_u8(&mut self, _depth: usize, vals: &[u8]) {
+                self.0 += ((size_of::<u8>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u16(&mut self, _depth: usize, vals: &[u16]) {
+                self.0 += ((size_of::<u16>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u32(&mut self, _depth: usize, vals: &[u32]) {
+                self.0 += ((size_of::<u32>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u64(&mut self, _depth: usize, vals: &[u64]) {
+                self.0 += ((size_of::<u64>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u128(&mut self, _depth: usize, vals: &[u128]) {
+                self.0 += ((size_of::<u128>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u256(&mut self, _depth: usize, vals: &[move_core_types::u256::U256]) {
+                self.0 += ((size_of::<move_core_types::u256::U256>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_bool(&mut self, _depth: usize, vals: &[bool]) {
+                self.0 += ((size_of::<bool>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_address(&mut self, _depth: usize, vals: &[AccountAddress]) {
+                self.0 += ((size_of::<AccountAddress>() * vals.len()) as u64).into();
+            }
+
+            fn visit_ref(&mut self, _depth: usize, _is_global: bool) -> bool {
+                self.0 += LEGACY_REFERENCE_SIZE;
+                false
+            }
+        }
+
+        let mut acc = Acc(0.into());
+        self.visit(&mut acc);
+
+        acc.0
+    }
+}
+
+/// Trait that defines a visitor that could be used to traverse a value recursively.
+pub trait ValueVisitor {
+    fn visit_u8(&mut self, depth: usize, val: u8);
+    fn visit_u16(&mut self, depth: usize, val: u16);
+    fn visit_u32(&mut self, depth: usize, val: u32);
+    fn visit_u64(&mut self, depth: usize, val: u64);
+    fn visit_u128(&mut self, depth: usize, val: u128);
+    fn visit_u256(&mut self, depth: usize, val: move_core_types::u256::U256);
+    fn visit_bool(&mut self, depth: usize, val: bool);
+    fn visit_address(&mut self, depth: usize, val: AccountAddress);
+
+    fn visit_struct(&mut self, depth: usize, len: usize) -> bool;
+    fn visit_vec(&mut self, depth: usize, len: usize) -> bool;
+
+    fn visit_ref(&mut self, depth: usize, is_global: bool) -> bool;
+
+    fn visit_vec_u8(&mut self, depth: usize, vals: &[u8]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u8(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u16(&mut self, depth: usize, vals: &[u16]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u16(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u32(&mut self, depth: usize, vals: &[u32]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u32(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u64(&mut self, depth: usize, vals: &[u64]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u64(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u128(&mut self, depth: usize, vals: &[u128]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u128(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u256(&mut self, depth: usize, vals: &[move_core_types::u256::U256]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u256(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_bool(&mut self, depth: usize, vals: &[bool]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_bool(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_address(&mut self, depth: usize, vals: &[AccountAddress]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_address(depth + 1, *val);
+        }
+    }
+}
+
+impl<T> ValueView for &T
+where
+    T: ValueView,
+{
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        <T as ValueView>::legacy_abstract_memory_size(*self)
+    }
+
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        <T as ValueView>::visit(*self, visitor)
+    }
+}
+
+impl<T> TypeView for &T
+where
+    T: TypeView,
+{
+    fn to_type_tag(&self) -> TypeTag {
+        <T as TypeView>::to_type_tag(*self)
+    }
+}
diff --git a/vendors/move/crates/prover-mutation/Cargo.toml b/vendors/move/crates/prover-mutation/Cargo.toml
new file mode 100644
index 000000000..6fca7cd38
--- /dev/null
+++ b/vendors/move/crates/prover-mutation/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "prover-mutation"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+# diem dependencies
+move-compiler.workspace = true
+move-model.workspace = true
+move-prover.workspace = true
+move-stackless-bytecode.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+clap.workspace = true
+codespan-reporting.workspace = true
+itertools.workspace = true
+log.workspace = true
diff --git a/vendors/move/crates/prover-mutation/README.md b/vendors/move/crates/prover-mutation/README.md
new file mode 100644
index 000000000..2dc869f6f
--- /dev/null
+++ b/vendors/move/crates/prover-mutation/README.md
@@ -0,0 +1,3 @@
+This crate contains tools for applying mutation testing to an instance of move prover code.
+
+The `src` directory contains supporting Rust code.
diff --git a/vendors/move/crates/prover-mutation/src/lib.rs b/vendors/move/crates/prover-mutation/src/lib.rs
new file mode 100644
index 000000000..49dc3e068
--- /dev/null
+++ b/vendors/move/crates/prover-mutation/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod mutator;
diff --git a/vendors/move/crates/prover-mutation/src/main.rs b/vendors/move/crates/prover-mutation/src/main.rs
new file mode 100644
index 000000000..cda4424f6
--- /dev/null
+++ b/vendors/move/crates/prover-mutation/src/main.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use itertools::Itertools;
+use prover_mutation::mutator;
+
+fn main() {
+    let args = std::env::args().collect_vec();
+    mutator::mutate(&args[1..]);
+}
diff --git a/vendors/move/crates/prover-mutation/src/mutator.rs b/vendors/move/crates/prover-mutation/src/mutator.rs
new file mode 100644
index 000000000..46820927b
--- /dev/null
+++ b/vendors/move/crates/prover-mutation/src/mutator.rs
@@ -0,0 +1,316 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Functions for running move programs with mutations and reporting errors if found
+
+use clap::{Arg, Command};
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use itertools::Itertools;
+use log::LevelFilter;
+use move_compiler::shared::PackagePaths;
+use move_model::{
+    model::{FunctionEnv, GlobalEnv, VerificationScope},
+    options::ModelBuilderOptions,
+    parse_addresses_from_options, run_model_builder_with_options,
+};
+use move_prover::{
+    check_errors, cli::Options, create_and_process_bytecode, generate_boogie, verify_boogie,
+};
+use move_stackless_bytecode::{mutation_tester::MutationManager, options::ProverOptions};
+use std::{
+    io::Write,
+    path::PathBuf,
+    time::{Duration, Instant},
+};
+
+// ============================================================================================
+// Command line interface for running a mutation
+
+struct Runner {
+    options: Options,
+    error_writer: StandardStream,
+}
+
+pub fn mutate(args: &[String]) {
+    let cmd_line_parser = Command::new("mutation")
+        .version("0.1.0")
+        .about("Mutation tool for the move prover")
+        .author("The Diem Core Contributors")
+        .arg(
+            Arg::new("addresses")
+                .long("address")
+                .short('a')
+                .action(clap::ArgAction::Append)
+                .number_of_values(1)
+                .num_args(1)
+                .value_name("ADDRESS")
+                .help("Address specified for the move prover"),
+        )
+        .arg(
+            Arg::new("config")
+                .short('c')
+                .long("config")
+                .num_args(1)
+                .action(clap::ArgAction::Append)
+                .number_of_values(1)
+                .value_name("CONFIG_PATH")
+                .help(
+                    "path to a prover toml configuration file. The mutation output will be \
+                          stored at `CONFIG_PATH.data. This can be repeated so different \
+                          configurations can be checked against the same set of input modules.",
+                ),
+        )
+        .arg(
+            Arg::new("dependencies")
+                .long("dependency")
+                .short('d')
+                .action(clap::ArgAction::Append)
+                .number_of_values(1)
+                .num_args(1)
+                .value_name("PATH_TO_DEPENDENCY")
+                .help(
+                    "path to a Move file, or a directory which will be searched for \
+                    Move files, containing dependencies which will not be verified",
+                ),
+        )
+        .arg(
+            Arg::new("sources")
+                .action(clap::ArgAction::Append)
+                .value_name("PATH_TO_SOURCE_FILE")
+                .num_args(1..)
+                .help("the source files to verify"),
+        );
+    let matches = cmd_line_parser.get_matches_from(args);
+    let get_vec = |s: &str| -> Vec<String> {
+        match matches.get_many::<String>(s) {
+            Some(vs) => vs.map(|v| v.to_string()).collect(),
+            _ => vec![],
+        }
+    };
+    let addresses = get_vec("addresses");
+    let sources = get_vec("sources");
+    let deps = get_vec("dependencies");
+    let configs: Vec<Option<String>> = if matches.contains_id("config") {
+        get_vec("config").into_iter().map(Some).collect_vec()
+    } else {
+        vec![None]
+    };
+
+    for config_spec in configs {
+        let (config, out) = if let Some(config_file) = &config_spec {
+            let extension = "mod_data";
+            let out = PathBuf::from(config_file)
+                .with_extension(extension)
+                .to_string_lossy()
+                .to_string();
+            (config_spec, out)
+        } else {
+            (None, "mutation.data".to_string())
+        };
+        if let Err(s) = apply_mutation(config.as_ref(), &addresses, &sources, &deps) {
+            println!("ERROR: execution failed: {}", s);
+        } else {
+            println!("results stored at `{}`", out);
+        }
+    }
+}
+
+fn apply_mutation(
+    config_file_opt: Option<&String>,
+    addresses: &[String],
+    modules: &[String],
+    dep_dirs: &[String],
+) -> anyhow::Result<()> {
+    println!("building model");
+    let addrs = parse_addresses_from_options(addresses.to_owned())?;
+    let env = run_model_builder_with_options(
+        vec![PackagePaths {
+            name: None,
+            paths: modules.to_vec(),
+            named_address_map: addrs.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: dep_dirs.to_vec(),
+            named_address_map: addrs,
+        }],
+        ModelBuilderOptions::default(),
+        None,
+    )?;
+    let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+    let mut options = if let Some(config_file) = config_file_opt {
+        Options::create_from_toml_file(config_file)?
+    } else {
+        Options::default()
+    };
+
+    // Do not allow any mutation to run longer than 100 seconds to avoid extremely long use times
+    options.backend.hard_timeout_secs = 100;
+
+    options.verbosity_level = LevelFilter::Error;
+
+    options.prover.mutation = true;
+    options.backend.derive_options();
+    options.setup_logging();
+    check_errors(&env, &options, &mut error_writer, "unexpected build errors")?;
+
+    let config_descr = "default".to_string();
+
+    println!("Starting mutations with config `{}`.", config_descr);
+
+    let mut i = 0;
+    let mut mutation_applied = true;
+
+    let mut runner = Runner {
+        options,
+        error_writer,
+    };
+
+    while mutation_applied {
+        i += 1;
+        println!("Applying add-sub mutation {}", i);
+        runner.options.prover.mutation_add_sub = i;
+        env.set_extension(MutationManager {
+            mutated: false,
+            add_sub: i,
+            sub_add: 0,
+            mul_div: 0,
+            div_mul: 0,
+        });
+        mutation_applied = runner.mutate(&env)?;
+        if !mutation_applied {
+            println!("No mutations applied");
+        }
+    }
+    i = 0;
+    mutation_applied = true;
+    while mutation_applied {
+        i += 1;
+        println!("Applying sub-add mutation {}", i);
+        runner.options.prover.mutation_sub_add = i;
+        env.set_extension(MutationManager {
+            mutated: false,
+            add_sub: 0,
+            sub_add: i,
+            mul_div: 0,
+            div_mul: 0,
+        });
+        mutation_applied = runner.mutate(&env)?;
+        if !mutation_applied {
+            println!("No mutations applied");
+        }
+    }
+    i = 0;
+    mutation_applied = true;
+    while mutation_applied {
+        i += 1;
+        println!("Applying mul-div mutation {}", i);
+        runner.options.prover.mutation_mul_div = i;
+        env.set_extension(MutationManager {
+            mutated: false,
+            add_sub: 0,
+            sub_add: 0,
+            mul_div: i,
+            div_mul: 0,
+        });
+        mutation_applied = runner.mutate(&env)?;
+        if !mutation_applied {
+            println!("No mutations applied");
+        }
+    }
+    i = 0;
+    mutation_applied = true;
+    while mutation_applied {
+        i += 1;
+        println!("Applying div-mul mutation {}", i);
+        runner.options.prover.mutation_div_mul = i;
+        env.set_extension(MutationManager {
+            mutated: false,
+            add_sub: 0,
+            sub_add: 0,
+            mul_div: 0,
+            div_mul: i,
+        });
+        mutation_applied = runner.mutate(&env)?;
+        if !mutation_applied {
+            println!("No mutations applied");
+        }
+    }
+    Ok(())
+}
+
+impl Runner {
+    fn mutate(&mut self, env: &GlobalEnv) -> anyhow::Result<bool> {
+        let mut mutated = false;
+        for module in env.get_modules() {
+            if module.is_target() {
+                for fun in module.get_functions() {
+                    mutated = self.mutate_function(fun)?;
+                    if mutated {
+                        break;
+                    }
+                }
+            }
+        }
+        Ok(mutated)
+    }
+
+    fn mutate_function(&mut self, fun: FunctionEnv<'_>) -> anyhow::Result<bool> {
+        // Scope verification to the given function
+        let env = fun.module_env.env;
+        self.options.prover.verify_scope = VerificationScope::Only(fun.get_full_name_str());
+        ProverOptions::set(env, self.options.prover.clone());
+        let (duration, status) = self.run_mutated_function(fun.module_env.env)?;
+
+        let mutated = env
+            .get_extension::<MutationManager>()
+            .map(|e| e.mutated)
+            .unwrap_or(false);
+        if mutated {
+            print!("mutated function {} ..", fun.get_full_name_str());
+            std::io::stdout().flush()?;
+            println!("\x08\x08{:.3}s {}.", duration.as_secs_f64(), status);
+        }
+        Ok(mutated)
+    }
+
+    fn run_mutated_function(&mut self, env: &GlobalEnv) -> anyhow::Result<(Duration, String)> {
+        // Create and process bytecode.
+        let targets = create_and_process_bytecode(&self.options, env);
+
+        check_errors(
+            env,
+            &self.options,
+            &mut self.error_writer,
+            "unexpected transformation errors",
+        )?;
+
+        // Generate boogie code.
+        let code_writer = generate_boogie(env, &self.options, &targets)?;
+        check_errors(
+            env,
+            &self.options,
+            &mut self.error_writer,
+            "unexpected boogie generation errors",
+        )?;
+
+        // Verify boogie, measuring duration.
+        let now = Instant::now();
+        verify_boogie(env, &self.options, &targets, code_writer)?;
+
+        // Determine result status.
+        let status = if env.error_count() > 0 {
+            if env.has_diag("timeout") {
+                "timeout"
+            } else {
+                "errors"
+            }
+        } else {
+            "ok"
+        };
+        env.clear_diag();
+
+        Ok((now.elapsed(), status.to_string()))
+    }
+}
diff --git a/vendors/move/crates/serializer-tests/Cargo.toml b/vendors/move/crates/serializer-tests/Cargo.toml
new file mode 100644
index 000000000..7928c1ffe
--- /dev/null
+++ b/vendors/move/crates/serializer-tests/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "serializer-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem serializer tests"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+proptest.workspace = true
+proptest-derive.workspace = true
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+
+[features]
+fuzzing = ["move-binary-format/fuzzing"]
+
+[dependencies]
diff --git a/vendors/move/crates/serializer-tests/src/lib.rs b/vendors/move/crates/serializer-tests/src/lib.rs
new file mode 100644
index 000000000..0cd3c22c1
--- /dev/null
+++ b/vendors/move/crates/serializer-tests/src/lib.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/vendors/move/crates/serializer-tests/tests/serializer_tests.proptest-regressions b/vendors/move/crates/serializer-tests/tests/serializer_tests.proptest-regressions
new file mode 100644
index 000000000..988ff09ce
--- /dev/null
+++ b/vendors/move/crates/serializer-tests/tests/serializer_tests.proptest-regressions
@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 3d00be1cbcb9f344e7bce080015d7a755f6e69acd37dbde62e449732af226fe4 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, flags: 0x0, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit), 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] }
+cc 7b1bb969b87bfcdbb0f635eb46212f8437d21bcd1ba754de84d66bb552e6aec2 # shrinks to module = CompiledModule { module_handles: [], struct_handles: [], function_handles: [], type_signatures: [], function_signatures: [], locals_signatures: [], string_pool: [], byte_array_pool: [], address_pool: [0000000000000000000000000000000000000000000000000000000000000000, 0000000000000000000000000000000000000000000000000000000000000000], struct_defs: [], field_defs: [], function_defs: [] }
+cc 4118fc247fb7d48382876de931d47a8999a6e42658bbecc93afff9245ade141b # shrinks to module = CompiledModule { module_handles: [], struct_handles: [], function_handles: [], type_signatures: [], function_signatures: [], locals_signatures: [], string_pool: [], byte_array_pool: [], address_pool: [], struct_defs: [], field_defs: [FieldDefinition { struct_: StructHandleIndex(0), name: IdentifierIndex(0), signature: TypeSignatureIndex(0) }], function_defs: [] }
diff --git a/vendors/move/crates/serializer-tests/tests/serializer_tests.rs b/vendors/move/crates/serializer-tests/tests/serializer_tests.rs
new file mode 100644
index 000000000..7798ec3e6
--- /dev/null
+++ b/vendors/move/crates/serializer-tests/tests/serializer_tests.rs
@@ -0,0 +1,36 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn serializer_roundtrip(module in CompiledModule::valid_strategy(20)) {
+        let mut serialized = Vec::with_capacity(2048);
+        module.serialize(&mut serialized).expect("serialization should work");
+
+        let deserialized_module = CompiledModule::deserialize_with_defaults(&serialized)
+            .expect("deserialization should work");
+
+        prop_assert_eq!(module, deserialized_module);
+    }
+}
+
+proptest! {
+    // Generating arbitrary compiled modules is really slow, possibly because of
+    // https://github.com/AltSysrq/proptest/issues/143.
+    #![proptest_config(ProptestConfig::with_cases(16))]
+
+    /// Make sure that garbage inputs don't crash the serializer and deserializer.
+    #[test]
+    fn garbage_inputs(module in any_with::<CompiledModule>(16)) {
+        let mut serialized = Vec::with_capacity(65536);
+        module.serialize(&mut serialized).expect("serialization should work");
+
+        let deserialized_module = CompiledModule::deserialize_no_check_bounds(&serialized)
+            .expect("deserialization should work");
+        prop_assert_eq!(module, deserialized_module);
+    }
+}
diff --git a/vendors/move/crates/spec-flatten/Cargo.toml b/vendors/move/crates/spec-flatten/Cargo.toml
new file mode 100644
index 000000000..52501f82f
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "spec-flatten"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Formal specification flattening tool"
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+
+# move dependencies
+move-stackless-bytecode.workspace = true
+move-compiler.workspace = true
+move-model.workspace = true
+move-prover.workspace = true
+
+# external dependencies
+anyhow = "1.0.71"
+itertools.workspace = true
+pretty.workspace = true
+clap.workspace = true
diff --git a/vendors/move/crates/spec-flatten/src/ast_print.rs b/vendors/move/crates/spec-flatten/src/ast_print.rs
new file mode 100644
index 000000000..32a06b207
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/src/ast_print.rs
@@ -0,0 +1,635 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use itertools::Itertools;
+use pretty::RcDoc;
+use std::rc::Rc;
+
+use move_model::{
+    ast::{Condition, ConditionKind, Exp, ExpData, Operation, QuantKind, SpecBlockTarget, Value},
+    model::{AbilityConstraint, AbilitySet, GlobalEnv, TypeParameter},
+    symbol::Symbol,
+    ty::{PrimitiveType, Type},
+};
+
+/// A type alias for the way how we use crate `pretty`'s document type.
+///
+/// `pretty` is a Wadler-style pretty printer. Our simple usage doesn't require
+/// any lifetime management.
+type Doc = RcDoc<'static, ()>;
+
+const PRETTY_WIDTH: usize = 80;
+
+pub struct SpecPrinter<'env> {
+    env: &'env GlobalEnv,
+    ctxt: &'env SpecBlockTarget,
+}
+
+impl<'env> SpecPrinter<'env> {
+    pub fn new(env: &'env GlobalEnv, ctxt: &'env SpecBlockTarget) -> Self {
+        Self { env, ctxt }
+    }
+}
+
+impl SpecPrinter<'_> {
+    fn print_sym(&self, sym: Symbol) -> Doc {
+        Self::doc(self.sym_str(sym))
+    }
+
+    pub fn print_value(&self, val: &Value) -> Doc {
+        match val {
+            Value::Address(v) => Self::doc(format!("@{:#x}", v)),
+            Value::Number(v) => Self::doc(v),
+            Value::Bool(v) => Self::doc(v),
+            Value::ByteArray(v) => match std::str::from_utf8(v) {
+                Ok(vstr) => Self::doc(format!("b\"{}\"", vstr)),
+                Err(_) => Self::doc(format!(
+                    "x\"{}\"",
+                    v.iter().map(|e| format!("{:02x}", e)).join(""),
+                )),
+            },
+            Value::AddressArray(v) => Self::doc(format!(
+                "x\"{}\"",
+                v.iter().map(|e| format!("@{:#x}", e)).join(""),
+            )),
+            Value::Vector(v) => Self::doc(v.iter().map(|e| format!("{}", e)).join(",")),
+        }
+    }
+
+    pub fn print_type(&self, ty: &Type, ty_params: &[TypeParameter]) -> Doc {
+        match ty {
+            Type::Primitive(PrimitiveType::Bool) => Self::doc("bool"),
+            Type::Primitive(PrimitiveType::U8) => Self::doc("u8"),
+            Type::Primitive(PrimitiveType::U16) => Self::doc("u16"),
+            Type::Primitive(PrimitiveType::U32) => Self::doc("u32"),
+            Type::Primitive(PrimitiveType::U64) => Self::doc("u64"),
+            Type::Primitive(PrimitiveType::U128) => Self::doc("u128"),
+            Type::Primitive(PrimitiveType::U256) => Self::doc("u256"),
+            Type::Primitive(PrimitiveType::Address) => Self::doc("address"),
+            Type::Primitive(PrimitiveType::Signer) => Self::doc("signer"),
+            Type::Primitive(PrimitiveType::Num) => Self::doc("num"),
+            Type::Tuple(tys) => Self::mk_tuple(tys, |t| self.print_type(t, ty_params)),
+            Type::Vector(ty) => Self::mk_inst(Self::doc("vector"), [ty.as_ref()], |t| {
+                self.print_type(t, ty_params)
+            }),
+            Type::Struct(mid, sid, tys) => {
+                let struct_env = self.env.get_struct(mid.qualified(*sid));
+                let base = Self::doc(format!(
+                    "{}::{}",
+                    struct_env.module_env.get_full_name_str(),
+                    self.sym_str(struct_env.get_name())
+                ));
+                if tys.is_empty() {
+                    base
+                } else {
+                    Self::mk_inst(base, tys, |t| self.print_type(t, ty_params))
+                }
+            }
+            Type::TypeParameter(idx) => self.print_sym(ty_params.get(*idx as usize).unwrap().0),
+            Type::Reference(false, ty) => {
+                Self::concat([Self::doc("&"), self.print_type(ty, ty_params)])
+            }
+            Type::Reference(true, ty) => {
+                Self::concat([Self::doc("&mut"), self.print_type(ty, ty_params)])
+            }
+            Type::Fun(arg_tys, ret_ty) => {
+                let doc_args = Self::mk_tuple(arg_tys, |t| self.print_type(t, ty_params));
+                let doc_retn = self.print_type(ret_ty, ty_params);
+                Self::sep_colon_space([doc_args, doc_retn])
+            }
+            Type::TypeDomain(ty) => self.print_type(ty, ty_params),
+            Type::ResourceDomain(mid, sid, tys_opt) => {
+                let struct_env = self.env.get_struct(mid.qualified(*sid));
+                let base = Self::doc(format!(
+                    "{}::{}",
+                    struct_env.module_env.get_full_name_str(),
+                    self.sym_str(struct_env.get_name())
+                ));
+                match tys_opt {
+                    None => base,
+                    Some(tys) => Self::mk_inst(base, tys, |t| self.print_type(t, ty_params)),
+                }
+            }
+            // these types can't be declared in move/spec language
+            Type::Primitive(PrimitiveType::Range) => Self::doc("<range>"),
+            Type::Primitive(PrimitiveType::EventStore) => Self::doc("<event-store>"),
+            Type::Var(idx) => Self::doc(format!("<var-{}>", *idx)),
+            Type::Error => Self::doc("<error>"),
+        }
+    }
+
+    pub fn print_exp(&self, exp: &Exp, ty_params: &[TypeParameter]) -> Doc {
+        use Operation::*;
+
+        match exp.as_ref() {
+            ExpData::Invalid(_) => Self::doc("<invalid>"),
+            ExpData::Value(_, val) => self.print_value(val),
+            ExpData::LocalVar(_, sym) => self.print_sym(*sym),
+            ExpData::Temporary(_, idx) => {
+                let fun_id = match self.ctxt {
+                    SpecBlockTarget::Function(mid, fid)
+                    | SpecBlockTarget::FunctionCode(mid, fid, _) => mid.qualified(*fid),
+                    _ => unreachable!(
+                        "Only spec expressions in a function spec or inlined spec are allowed to \
+                        refer to a temporary variable"
+                    ),
+                };
+                let fun_env = self.env.get_function(fun_id);
+                let fun_params = fun_env.get_parameters();
+                match fun_params.get(*idx) {
+                    None => Self::doc(format!("$t{}", idx)),
+                    Some(param) => self.print_sym(param.0),
+                }
+            }
+            ExpData::Invoke(_, lambda, args) => Self::sep_space([
+                Self::wrap("(", self.print_exp(lambda, ty_params), ")"),
+                Self::mk_tuple(args, |e| self.print_exp(e, ty_params)),
+            ]),
+            ExpData::Lambda(_, vars, body) => {
+                let doc_head = Self::doc("fun");
+                let doc_args = Self::mk_tuple(vars, |v| {
+                    Self::sep_colon_space([
+                        self.print_sym(v.name),
+                        self.print_type(&self.env.get_node_type(v.id), ty_params),
+                    ])
+                });
+                let doc_body = self.print_exp(body, ty_params);
+                Self::sep_space([doc_head, doc_args, doc_body])
+            }
+            ExpData::Quant(_, kind, vars, _triggers, cond_opt, body) => {
+                let doc_head = match kind {
+                    QuantKind::Exists => Self::doc("exists"),
+                    QuantKind::Forall => Self::doc("forall"),
+                    QuantKind::Choose => Self::doc("choose"),
+                    QuantKind::ChooseMin => {
+                        Self::sep_space([Self::doc("choose"), Self::doc("min")])
+                    }
+                };
+                let doc_vars = Self::sep_comma_space(vars.iter().map(|(v, e)| {
+                    Self::sep_colon_space([self.print_sym(v.name), self.print_exp(e, ty_params)])
+                }));
+                // TODO: add triggers
+                let doc_cond = match cond_opt {
+                    None => Doc::nil(),
+                    Some(cond) => {
+                        Self::sep_space([Self::doc("where"), self.print_exp(cond, ty_params)])
+                    }
+                };
+                let doc_body = self.print_exp(body, ty_params);
+                Self::sep_space([doc_head, doc_vars, doc_cond, doc_body])
+            }
+            ExpData::Block(_, vars, body) => Self::sep_semicolon_line(
+                vars.iter()
+                    .map(|v| {
+                        let decl_doc = Self::mk_binary_op(
+                            self.print_sym(v.name),
+                            ":",
+                            self.print_type(&self.env.get_node_type(v.id), ty_params),
+                        );
+                        let bind_doc = match &v.binding {
+                            None => decl_doc,
+                            Some(binding) => Self::mk_binary_op(
+                                decl_doc,
+                                "=",
+                                self.print_exp(binding, ty_params),
+                            ),
+                        };
+                        Self::sep_space([Self::doc("let"), bind_doc])
+                    })
+                    .chain(std::iter::once(self.print_exp(body, ty_params))),
+            ),
+            ExpData::IfElse(_, cond, then_exp, else_exp) => Self::sep_space([
+                Self::doc("if"),
+                Self::wrap("(", self.print_exp(cond, ty_params), ")"),
+                Self::doc("{"),
+                self.print_exp(then_exp, ty_params),
+                Self::doc("}"),
+                Self::doc("{"),
+                self.print_exp(else_exp, ty_params),
+                Self::doc("}"),
+            ]),
+            ExpData::Call(node_id, op, args) => {
+                // utilities
+                let print_call_unary = |op_repr: &str| -> Doc {
+                    Self::mk_unary_op(op_repr, self.print_exp(&args[0], ty_params))
+                };
+                let print_call_binary = |op_repr: &str| -> Doc {
+                    Self::mk_binary_op(
+                        self.print_exp(&args[0], ty_params),
+                        op_repr,
+                        self.print_exp(&args[1], ty_params),
+                    )
+                };
+                let print_call_fun = |fun_name: &str| -> Doc {
+                    let doc_args = Self::mk_tuple(args, |e| self.print_exp(e, ty_params));
+                    Self::concat([Self::doc(fun_name), doc_args])
+                };
+                let print_call_fun_inst = |fun_name: &str| -> Doc {
+                    let doc_inst = Self::mk_inst(
+                        Self::doc(fun_name),
+                        self.env.get_node_instantiation(*node_id),
+                        |t| self.print_type(&t, ty_params),
+                    );
+                    let doc_args = Self::mk_tuple(args, |e| self.print_exp(e, ty_params));
+                    Self::concat([doc_inst, doc_args])
+                };
+
+                match op {
+                    // spec function calls
+                    Function(mid, fid, _label_opt) => {
+                        let callee_menv = self.env.get_module(*mid);
+                        let callee_decl = callee_menv.get_spec_fun(*fid);
+                        let callee_name = format!(
+                            "{}::{}",
+                            callee_menv.get_full_name_str(),
+                            self.sym_str(callee_decl.name),
+                        );
+                        print_call_fun(&callee_name)
+                    }
+                    // primitive operations
+                    Pack(mid, sid) => {
+                        let struct_env = self.env.get_struct(mid.qualified(*sid));
+                        let doc_head = Self::doc(format!(
+                            "{}::{}",
+                            struct_env.module_env.get_full_name_str(),
+                            self.sym_str(struct_env.get_name())
+                        ));
+                        let doc_body = Self::sep_comma_space(
+                            struct_env.get_fields().zip(args.iter()).map(|(f, e)| {
+                                Self::sep_colon_space([
+                                    self.print_sym(f.get_name()),
+                                    self.print_exp(e, ty_params),
+                                ])
+                            }),
+                        );
+                        Self::sep_space([doc_head, Self::doc("{"), doc_body, Self::doc("}")])
+                    }
+                    Tuple => Self::mk_tuple(args, |e| self.print_exp(e, ty_params)),
+                    Select(mid, sid, fid) => {
+                        let struct_env = self.env.get_struct(mid.qualified(*sid));
+                        let field_env = struct_env.get_field(*fid);
+                        Self::sep_dot([
+                            self.print_exp(&args[0], ty_params),
+                            self.print_sym(field_env.get_name()),
+                        ])
+                    }
+                    Result(idx) => Self::sep_dot([Self::doc("result"), Self::doc(*idx)]),
+                    Index => Self::concat([
+                        self.print_exp(&args[0], ty_params),
+                        Self::wrap("[", self.print_exp(&args[1], ty_params), "]"),
+                    ]),
+                    Slice => Self::concat([
+                        self.print_exp(&args[0], ty_params),
+                        Self::wrap("[", self.print_exp(&args[1], ty_params), "]"),
+                    ]),
+                    // binary operators
+                    Range => Self::concat([
+                        self.print_exp(&args[0], ty_params),
+                        Self::doc(".."),
+                        self.print_exp(&args[1], ty_params),
+                    ]),
+                    Add => print_call_binary("+"),
+                    Sub => print_call_binary("-"),
+                    Mul => print_call_binary("*"),
+                    Div => print_call_binary("/"),
+                    Mod => print_call_binary("%"),
+                    BitOr => print_call_binary("|"),
+                    BitAnd => print_call_binary("&"),
+                    Xor => print_call_binary("^"),
+                    Shl => print_call_binary("<<"),
+                    Shr => print_call_binary(">>"),
+                    Implies => print_call_binary("==>"),
+                    Iff => print_call_binary("<==>"),
+                    And => print_call_binary("&&"),
+                    Or => print_call_binary("||"),
+                    Eq => print_call_binary("=="),
+                    Identical => print_call_binary("==="),
+                    Neq => print_call_binary("!="),
+                    Lt => print_call_binary("<"),
+                    Gt => print_call_binary(">"),
+                    Le => print_call_binary("<="),
+                    Ge => print_call_binary(">="),
+                    // unary operators
+                    Not => print_call_unary("!"),
+                    Cast => print_call_unary("cast"),
+                    Int2Bv => print_call_unary("int2bv"),
+                    Bv2Int => print_call_unary("bv2int"),
+                    // built-in functions
+                    Len => print_call_fun("len"),
+                    Old => print_call_fun("old"),
+                    Trace(_) => print_call_fun("TRACE"),
+                    Global(_label_opt) => print_call_fun_inst("global"),
+                    Exists(_label_opt) => print_call_fun_inst("exists"),
+                    EmptyVec => print_call_fun_inst("vec"),
+                    SingleVec => print_call_fun("vec"),
+                    UpdateVec => print_call_fun("update"),
+                    ConcatVec => print_call_fun("concat"),
+                    IndexOfVec => print_call_fun("index_of"),
+                    ContainsVec => print_call_fun("contains"),
+                    RangeVec => print_call_fun("range"),
+                    UpdateField(..) => print_call_fun("update_field"),
+                    InRangeRange => print_call_fun("in_range"),
+                    InRangeVec => print_call_fun("in_range"),
+                    TypeDomain => self.print_type(&self.env.get_node_type(*node_id), ty_params),
+                    ResourceDomain => self.print_type(&self.env.get_node_type(*node_id), ty_params),
+                    MaxU8 => Self::doc("MAX_U8"),
+                    MaxU16 => Self::doc("MAX_U16"),
+                    MaxU32 => Self::doc("MAX_U32"),
+                    MaxU64 => Self::doc("MAX_U64"),
+                    MaxU128 => Self::doc("MAX_U128"),
+                    MaxU256 => Self::doc("MAX_U256"),
+                    // unable to be specified by users
+                    CanModify | AbortFlag | AbortCode | WellFormed | BoxValue | UnboxValue
+                    | EmptyEventStore | ExtendEventStore | EventStoreIncludes
+                    | EventStoreIncludedIn | NoOp => Doc::nil(),
+                    // unexpected
+                    TypeValue => unreachable!("TypeValue is not currently supported"),
+                }
+            }
+        }
+    }
+
+    pub fn print_condition(&self, cond: &Condition) -> Doc {
+        // collect type parameter
+        let ty_params = match &cond.kind {
+            ConditionKind::LetPre(..)
+            | ConditionKind::LetPost(..)
+            | ConditionKind::Requires
+            | ConditionKind::AbortsIf
+            | ConditionKind::AbortsWith
+            | ConditionKind::SucceedsIf
+            | ConditionKind::Ensures
+            | ConditionKind::Modifies
+            | ConditionKind::Emits
+            | ConditionKind::Update
+            | ConditionKind::FunctionInvariant => match &self.ctxt {
+                SpecBlockTarget::Function(mid, fid) => {
+                    let fun_env = self.env.get_function(mid.qualified(*fid));
+                    fun_env.get_type_parameters()
+                }
+                _ => unreachable!(
+                    "Condition kind `{}` is not allowed in the function spec context",
+                    cond.kind
+                ),
+            },
+            ConditionKind::Assert
+            | ConditionKind::Assume
+            | ConditionKind::LoopInvariant
+            | ConditionKind::Decreases => match &self.ctxt {
+                SpecBlockTarget::FunctionCode(mid, fid, _) => {
+                    let fun_env = self.env.get_function(mid.qualified(*fid));
+                    fun_env.get_type_parameters()
+                }
+                _ => unreachable!(
+                    "Condition kind `{}` is not allowed in the inlined spec context",
+                    cond.kind
+                ),
+            },
+            ConditionKind::StructInvariant => match &self.ctxt {
+                SpecBlockTarget::Struct(mid, sid) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    struct_env.get_type_parameters()
+                }
+                _ => unreachable!(
+                    "Condition kind `{}` is not allowed in the inlined spec context",
+                    cond.kind
+                ),
+            },
+            ConditionKind::GlobalInvariant(syms)
+            | ConditionKind::GlobalInvariantUpdate(syms)
+            | ConditionKind::Axiom(syms) => {
+                assert!(matches!(self.ctxt, SpecBlockTarget::Module));
+                syms.iter()
+                    .map(|s| TypeParameter(*s, AbilityConstraint(AbilitySet::EMPTY)))
+                    .collect()
+            }
+            // not expected
+            ConditionKind::SchemaInvariant => {
+                unreachable!("The `invariant` conditions in schema should have been flattened");
+            }
+        };
+
+        // produce the expression
+        let doc_stmt = match &cond.kind {
+            ConditionKind::LetPre(sym) => {
+                let bind_doc = Self::mk_binary_op(
+                    self.print_sym(*sym),
+                    "=",
+                    self.print_exp(&cond.exp, &ty_params),
+                );
+                Self::sep_space([Self::doc("let"), bind_doc])
+            }
+            ConditionKind::LetPost(sym) => {
+                let bind_doc = Self::mk_binary_op(
+                    self.print_sym(*sym),
+                    "=",
+                    self.print_exp(&cond.exp, &ty_params),
+                );
+                Self::sep_space([Self::doc("let"), Self::doc("post"), bind_doc])
+            }
+            ConditionKind::Assert => {
+                Self::sep_space([Self::doc("assert"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::Assume => {
+                Self::sep_space([Self::doc("assume"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::Requires => {
+                Self::sep_space([Self::doc("requires"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::AbortsIf => {
+                let base_doc = Self::sep_space([
+                    Self::doc("aborts_if"),
+                    self.print_exp(&cond.exp, &ty_params),
+                ]);
+                if cond.additional_exps.is_empty() {
+                    base_doc
+                } else {
+                    Self::sep_space([
+                        base_doc,
+                        Self::doc("with"),
+                        self.print_exp(&cond.additional_exps[0], &ty_params),
+                    ])
+                }
+            }
+            ConditionKind::AbortsWith => Self::sep_space([
+                Self::doc("aborts_with"),
+                self.print_exp(&cond.exp, &ty_params),
+            ]),
+            ConditionKind::Ensures => {
+                Self::sep_space([Self::doc("ensures"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::Modifies => {
+                Self::sep_space([Self::doc("modifies"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::Emits => {
+                Self::sep_space([Self::doc("emits"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::StructInvariant
+            | ConditionKind::FunctionInvariant
+            | ConditionKind::LoopInvariant => Self::sep_space([
+                Self::doc("invariant"),
+                self.print_exp(&cond.exp, &ty_params),
+            ]),
+            ConditionKind::GlobalInvariant(syms) => {
+                let base_doc = Self::doc("invariant");
+                let head_doc = if syms.is_empty() {
+                    base_doc
+                } else {
+                    Self::mk_inst(base_doc, syms, |s| self.print_sym(*s))
+                };
+                Self::sep_space([head_doc, self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::GlobalInvariantUpdate(syms) => {
+                let base_doc = Self::doc("invariant");
+                let head_doc = if syms.is_empty() {
+                    base_doc
+                } else {
+                    Self::mk_inst(base_doc, syms, |s| self.print_sym(*s))
+                };
+                Self::sep_space([
+                    head_doc,
+                    Self::doc("update"),
+                    self.print_exp(&cond.exp, &ty_params),
+                ])
+            }
+            ConditionKind::Axiom(syms) => {
+                let base_doc = Self::doc("axiom");
+                let head_doc = if syms.is_empty() {
+                    base_doc
+                } else {
+                    Self::mk_inst(base_doc, syms, |s| self.print_sym(*s))
+                };
+                Self::sep_space([head_doc, self.print_exp(&cond.exp, &ty_params)])
+            }
+            ConditionKind::Update => {
+                Self::sep_space([Self::doc("update"), self.print_exp(&cond.exp, &ty_params)])
+            }
+            // not really supported
+            ConditionKind::Decreases => Self::sep_space([
+                Self::doc("decreases"),
+                self.print_exp(&cond.exp, &ty_params),
+            ]),
+            ConditionKind::SucceedsIf => Self::sep_space([
+                Self::doc("succeeds_if"),
+                self.print_exp(&cond.exp, &ty_params),
+            ]),
+            // should not see any more
+            ConditionKind::SchemaInvariant => {
+                unreachable!("The `invariant` conditions in schema should have been flattened");
+            }
+        };
+        Self::mk_stmt(doc_stmt)
+    }
+}
+
+impl SpecPrinter<'_> {
+    pub fn convert(doc: Doc) -> String {
+        doc.pretty(PRETTY_WIDTH).to_string()
+    }
+}
+
+//
+// High-level utilities for Doc
+//
+
+impl SpecPrinter<'_> {
+    fn mk_tuple<E, I, F>(items: I, func: F) -> Doc
+    where
+        I: IntoIterator<Item = E>,
+        F: Fn(E) -> Doc,
+    {
+        Self::wrap("(", Self::sep_comma_space(items.into_iter().map(func)), ")")
+    }
+
+    fn mk_inst<E, I, F>(base: Doc, items: I, func: F) -> Doc
+    where
+        I: IntoIterator<Item = E>,
+        F: Fn(E) -> Doc,
+    {
+        Self::concat([
+            base,
+            Self::wrap('<', Self::sep_comma_space(items.into_iter().map(func)), ">"),
+        ])
+    }
+
+    fn mk_stmt(base: Doc) -> Doc {
+        base.append(Self::doc(";"))
+    }
+
+    fn mk_unary_op(op: &str, val: Doc) -> Doc {
+        Self::concat([Self::doc(op), val])
+    }
+
+    fn mk_binary_op(lhs: Doc, op: &str, rhs: Doc) -> Doc {
+        Self::sep_space([lhs, Self::doc(op), rhs])
+    }
+}
+
+//
+// Low-level utilities for Doc
+//
+
+impl SpecPrinter<'_> {
+    fn doc<S: ToString>(txt: S) -> Doc {
+        Doc::text(txt.to_string())
+    }
+
+    fn sym_str(&self, sym: Symbol) -> Rc<String> {
+        self.env.symbol_pool().string(sym)
+    }
+}
+
+impl SpecPrinter<'_> {
+    fn concat<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::concat(tokens)
+    }
+
+    fn sep_space<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::intersperse(tokens, Doc::space())
+    }
+
+    fn sep_dot<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::intersperse(tokens, Doc::text("."))
+    }
+
+    fn sep_comma_space<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::intersperse(tokens, Doc::text(",").append(Doc::space()))
+    }
+
+    fn sep_colon_space<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::intersperse(tokens, Doc::text(":").append(Doc::space()))
+    }
+
+    fn sep_semicolon_line<I>(tokens: I) -> Doc
+    where
+        I: IntoIterator<Item = Doc>,
+    {
+        Doc::intersperse(tokens, Doc::text(";").append(Doc::line()))
+    }
+
+    fn wrap<S1, S2>(before: S1, content: Doc, after: S2) -> Doc
+    where
+        S1: ToString,
+        S2: ToString,
+    {
+        Doc::text(before.to_string())
+            .append(content)
+            .append(Doc::text(after.to_string()))
+    }
+}
diff --git a/vendors/move/crates/spec-flatten/src/exp_trimming.rs b/vendors/move/crates/spec-flatten/src/exp_trimming.rs
new file mode 100644
index 000000000..b5fb1581a
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/src/exp_trimming.rs
@@ -0,0 +1,95 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use std::collections::BTreeMap;
+
+use move_model::{
+    ast::{ConditionKind, Spec},
+    model::{FunId, QualifiedId},
+};
+use move_stackless_bytecode::function_target::FunctionTarget;
+
+use crate::workflow::{prepare_with_override, prove, WorkflowOptions};
+
+pub(crate) fn trim_aborts_ifs(
+    options: &WorkflowOptions,
+    target: FunctionTarget,
+    spec: Spec,
+) -> Result<Spec> {
+    let fun_env = target.func_env;
+    let mut fun_options = options.clone();
+    fun_options.target = Some(fun_env.get_simple_name_string().to_string());
+
+    let new_spec =
+        remove_redundant_aborts_ifs_since(&fun_options, fun_env.get_qualified_id(), spec, 0)?;
+    Ok(new_spec)
+}
+
+fn remove_first_aborts_if_since(spec: &Spec, pos: usize) -> (Spec, bool) {
+    let Spec {
+        loc,
+        conditions,
+        properties,
+        on_impl,
+    } = spec.clone();
+
+    let mut new_conditions = vec![];
+    let mut changed = false;
+    for (i, cond) in conditions.into_iter().enumerate() {
+        if changed || i < pos || !matches!(cond.kind, ConditionKind::AbortsIf) {
+            new_conditions.push(cond);
+        } else {
+            changed = true;
+        }
+    }
+
+    let new_spec = Spec {
+        loc,
+        conditions: new_conditions,
+        properties,
+        on_impl,
+    };
+    (new_spec, changed)
+}
+
+fn remove_first_aborts_if_and_prove_since(
+    options: &WorkflowOptions,
+    fun_id: QualifiedId<FunId>,
+    spec: &Spec,
+    pos: usize,
+) -> Result<Option<(Spec, bool)>> {
+    let (new_spec, changed) = remove_first_aborts_if_since(spec, pos);
+    if !changed {
+        return Ok(None);
+    }
+
+    let mut spec_override = BTreeMap::new();
+    spec_override.insert(fun_id, new_spec.clone());
+    let (env, targets) = prepare_with_override(options, spec_override)?;
+    let proved = prove(options, &env, &targets)?;
+    Ok(Some((new_spec, proved)))
+}
+
+fn remove_redundant_aborts_ifs_since(
+    options: &WorkflowOptions,
+    fun_id: QualifiedId<FunId>,
+    spec: Spec,
+    pos: usize,
+) -> Result<Spec> {
+    match remove_first_aborts_if_and_prove_since(options, fun_id, &spec, pos)? {
+        None => {
+            // no more aborts_if conditions to remove
+            Ok(spec)
+        }
+        Some((new_spec, true)) => {
+            // removing one aborts_if does not affect the proving
+            remove_redundant_aborts_ifs_since(options, fun_id, new_spec, pos)
+        }
+        Some((_, false)) => {
+            // removing one aborts_if makes the proving failed
+            remove_redundant_aborts_ifs_since(options, fun_id, spec, pos + 1)
+        }
+    }
+}
diff --git a/vendors/move/crates/spec-flatten/src/lib.rs b/vendors/move/crates/spec-flatten/src/lib.rs
new file mode 100644
index 000000000..0a522af3b
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/src/lib.rs
@@ -0,0 +1,168 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Result};
+use clap::Parser;
+use std::{collections::BTreeMap, str::FromStr};
+
+use move_model::ast::SpecBlockTarget;
+use move_stackless_bytecode::function_target_pipeline::{FunctionVariant, VerificationFlavor};
+
+mod ast_print;
+mod workflow;
+
+// spec flattening pass
+mod exp_trimming;
+
+use ast_print::SpecPrinter;
+use workflow::WorkflowOptions;
+
+/// List of simplification passes available
+#[derive(Clone, Debug)]
+pub enum FlattenPass {
+    TrimAbortsIf,
+}
+
+impl FromStr for FlattenPass {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let r = match s {
+            "trim_aborts_if" => FlattenPass::TrimAbortsIf,
+            _ => return Err(s.to_string()),
+        };
+        Ok(r)
+    }
+}
+
+/// Options passed into the specification flattening tool.
+#[derive(Parser, Clone)]
+#[clap(author, version, about)]
+pub struct FlattenOptions {
+    /// Options common and shared by the proving workflow and all passes
+    #[clap(flatten)]
+    pub workflow: WorkflowOptions,
+
+    /// Spec flattening pipeline
+    #[clap(
+        short = 'f',
+        long = "flatten",
+        num_args(1..),
+    )]
+    pub flattening_pipeline: Vec<FlattenPass>,
+
+    /// Dump stepwise result
+    #[clap(long = "dump-stepwise")]
+    pub dump_stepwise: bool,
+
+    /// Dump stepwise result in raw exp printing format
+    #[clap(long = "dump-stepwise-raw", requires = "dump-stepwise")]
+    pub dump_stepwise_raw: bool,
+}
+
+//**************************************************************************************************
+// Entrypoint
+//**************************************************************************************************
+
+pub fn run(options: &FlattenOptions) -> Result<()> {
+    let workflow_options = &options.workflow;
+    let (env, targets) = workflow::prepare(workflow_options)?;
+
+    // make sure the original verification works
+    let proved = workflow::prove(workflow_options, &env, &targets)?;
+    if !proved {
+        return Err(anyhow!("Original proof is not successful"));
+    }
+
+    // flatten spec in target modules
+    let mut simplified_specs = BTreeMap::new();
+    for (fun_id, variant) in targets.get_funs_and_variants() {
+        if !matches!(
+            variant,
+            FunctionVariant::Verification(VerificationFlavor::Regular)
+        ) {
+            // only care for functions that have the regular verification variant
+            continue;
+        }
+
+        let fun_env = env.get_function(fun_id);
+        if !fun_env.module_env.is_target() {
+            // only run on specs in target module
+            continue;
+        }
+        match &workflow_options.target {
+            None => {
+                if !fun_env.has_unknown_callers() {
+                    // only run on specs for external-facing functions
+                    continue;
+                }
+            }
+            Some(target) => {
+                if fun_env.get_simple_name_string().as_ref() != target {
+                    // only run on matched function name
+                    continue;
+                }
+            }
+        }
+
+        // get a copy of the original spec
+        let fun_target = targets.get_target(&fun_env, &variant);
+        let mut fun_spec = Some(fun_target.get_spec().clone());
+
+        // prepare for stepwise result printing
+        let fun_scope = SpecBlockTarget::Function(fun_id.module_id, fun_id.id);
+        let printer = SpecPrinter::new(&env, &fun_scope);
+        if options.dump_stepwise {
+            println!(
+                "================ fun {} ================",
+                fun_env.get_full_name_str()
+            );
+        }
+
+        // pass the spec through the simplification pipeline
+        for (i, pass) in options.flattening_pipeline.iter().enumerate() {
+            let target = fun_target.clone();
+            let old_spec = fun_spec.take().unwrap();
+            let new_spec = match pass {
+                FlattenPass::TrimAbortsIf => {
+                    exp_trimming::trim_aborts_ifs(workflow_options, target, old_spec)
+                }
+            }?;
+
+            // dump stepwise results if requested
+            if options.dump_stepwise {
+                println!("step {} - {:?} {{", i, pass);
+                for cond in &new_spec.conditions {
+                    if options.dump_stepwise_raw {
+                        println!("\t{:?} {}", cond.kind, cond.exp.display(&env));
+                    } else {
+                        println!("\t{}", SpecPrinter::convert(printer.print_condition(cond)));
+                    }
+                }
+                println!("}}");
+            }
+
+            fun_spec = Some(new_spec);
+        }
+
+        simplified_specs.insert(fun_id, fun_spec.unwrap());
+    }
+
+    // dump the final result
+    for (fun_id, spec) in simplified_specs {
+        let fun_env = env.get_function(fun_id);
+        let fun_scope = SpecBlockTarget::Function(fun_id.module_id, fun_id.id);
+        let printer = SpecPrinter::new(&env, &fun_scope);
+        if !spec.conditions.is_empty() {
+            println!("fun {}{{", fun_env.get_full_name_str());
+            for cond in &spec.conditions {
+                println!("\t{}", SpecPrinter::convert(printer.print_condition(cond)));
+            }
+            println!("}}");
+        }
+    }
+
+    // everything is OK
+    Ok(())
+}
diff --git a/vendors/move/crates/spec-flatten/src/main.rs b/vendors/move/crates/spec-flatten/src/main.rs
new file mode 100644
index 000000000..96bb53685
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/src/main.rs
@@ -0,0 +1,13 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use clap::Parser;
+
+use spec_flatten::{run, FlattenOptions};
+
+fn main() -> Result<()> {
+    let options = FlattenOptions::parse();
+    run(&options)
+}
diff --git a/vendors/move/crates/spec-flatten/src/workflow.rs b/vendors/move/crates/spec-flatten/src/workflow.rs
new file mode 100644
index 000000000..4c4ca18d1
--- /dev/null
+++ b/vendors/move/crates/spec-flatten/src/workflow.rs
@@ -0,0 +1,176 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Result};
+use clap::Parser;
+use std::collections::BTreeMap;
+
+use move_compiler::shared::{parse_named_address, NumericalAddress, PackagePaths};
+use move_model::{
+    ast::Spec,
+    model::{FunId, GlobalEnv, QualifiedId, VerificationScope},
+    options::ModelBuilderOptions,
+    run_model_builder_with_options,
+    simplifier::SimplificationPass,
+};
+use move_prover::{cli::Options as CliOptions, generate_boogie, verify_boogie};
+use move_stackless_bytecode::{
+    function_target_pipeline::FunctionTargetsHolder, options::ProverOptions,
+    pipeline_factory::default_pipeline_with_options,
+};
+
+/// Options passed into the workflow pipeline.
+#[derive(Parser, Clone)]
+pub struct WorkflowOptions {
+    /// Sources of the target modules
+    pub srcs: Vec<String>,
+
+    /// Dependencies
+    #[clap(
+        short = 'd',
+        long = "dependency",
+        num_args(1..),
+    )]
+    pub deps: Vec<String>,
+
+    /// Target function
+    #[clap(short, long)]
+    pub target: Option<String>,
+
+    /// Do not include default named address
+    #[clap(long = "no-default-named-addresses")]
+    pub no_default_named_addresses: bool,
+
+    /// Extra mappings for named address
+    #[clap(
+        short = 'a',
+        long = "address",
+        value_parser = parse_named_address,
+        num_args(1..),
+    )]
+    pub named_addresses_extra: Option<Vec<(String, NumericalAddress)>>,
+
+    /// Simplification pipeline at the Move model end
+    #[clap(
+        short = 's',
+        long = "simplify",
+        num_args(1..),
+    )]
+    pub simplification_pipeline: Vec<SimplificationPass>,
+
+    /// Verbose mode
+    #[clap(short, long)]
+    pub verbose: bool,
+}
+
+pub(crate) fn prepare(options: &WorkflowOptions) -> Result<(GlobalEnv, FunctionTargetsHolder)> {
+    prepare_with_override(options, BTreeMap::new())
+}
+
+pub(crate) fn prepare_with_override(
+    options: &WorkflowOptions,
+    spec_override: BTreeMap<QualifiedId<FunId>, Spec>,
+) -> Result<(GlobalEnv, FunctionTargetsHolder)> {
+    // build mapping for named addresses
+    let mut named_addresses = BTreeMap::new();
+    if !options.no_default_named_addresses {
+        let default_mapping = [("std", "0x1"), ("VMReserved", "0x0")];
+        named_addresses.extend(
+            default_mapping
+                .iter()
+                .map(|(name, addr)| (name.to_string(), NumericalAddress::parse_str(addr).unwrap())),
+        );
+    }
+
+    // run move model builder
+    let mut env = run_model_builder_with_options(
+        vec![PackagePaths {
+            name: None,
+            paths: options.srcs.clone(),
+            named_address_map: named_addresses.clone(),
+        }],
+        vec![PackagePaths {
+            name: None,
+            paths: options.deps.clone(),
+            named_address_map: named_addresses.clone(),
+        }],
+        get_model_options(options),
+        None,
+    )?;
+    if env.has_errors() {
+        return Err(anyhow!("Error in model building"));
+    }
+
+    // override the spec for functions (if requested)
+    for (fun_id, spec) in spec_override {
+        env.override_function_spec(fun_id, spec);
+    }
+
+    // run bytecode transformation pipeline
+    let prover_options = get_prover_options(options);
+    let pipeline = default_pipeline_with_options(&prover_options);
+    env.set_extension(prover_options);
+
+    let mut targets = FunctionTargetsHolder::default();
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            targets.add_target(&func_env)
+        }
+    }
+    pipeline.run(&env, &mut targets);
+    if env.has_errors() {
+        return Err(anyhow!("Error in bytecode transformation"));
+    }
+
+    // return the GlobalEnv
+    Ok((env, targets))
+}
+
+pub(crate) fn prove(
+    options: &WorkflowOptions,
+    env: &GlobalEnv,
+    targets: &FunctionTargetsHolder,
+) -> Result<bool> {
+    let cli_options = get_cli_options(options);
+
+    let code_writer = generate_boogie(env, &cli_options, targets)?;
+    if env.has_errors() {
+        return Err(anyhow!("Error in boogie translation"));
+    }
+
+    verify_boogie(env, &cli_options, targets, code_writer)?;
+    Ok(!env.has_errors())
+}
+
+//
+// utilities
+//
+
+fn get_prover_options(options: &WorkflowOptions) -> ProverOptions {
+    let verify_scope = match &options.target {
+        None => VerificationScope::All,
+        Some(target) => VerificationScope::Only(target.clone()),
+    };
+    ProverOptions {
+        verify_scope,
+        ..Default::default()
+    }
+}
+
+fn get_model_options(options: &WorkflowOptions) -> ModelBuilderOptions {
+    ModelBuilderOptions {
+        simplification_pipeline: options.simplification_pipeline.clone(),
+        ..Default::default()
+    }
+}
+
+fn get_cli_options(options: &WorkflowOptions) -> CliOptions {
+    CliOptions {
+        move_sources: options.srcs.clone(),
+        move_deps: options.deps.clone(),
+        model_builder: get_model_options(options),
+        prover: get_prover_options(options),
+        ..Default::default()
+    }
+}
diff --git a/vendors/move/crates/test-generation/Cargo.toml b/vendors/move/crates/test-generation/Cargo.toml
new file mode 100644
index 000000000..89c0b7eea
--- /dev/null
+++ b/vendors/move/crates/test-generation/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "test-generation"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Tool for generating tests for the bytecode verifier and Move VM runtime"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+rand.workspace = true
+num_cpus.workspace = true
+clap.workspace = true
+itertools.workspace = true
+hex.workspace = true
+getrandom.workspace = true
+crossbeam-channel.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+once_cell.workspace = true
+
+move-bytecode-verifier.workspace = true
+move-core-types.workspace = true
+move-vm-runtime.workspace = true
+move-vm-test-utils.workspace = true
+move-vm-types.workspace = true
+module-generation.workspace = true
+move-binary-format.workspace = true
+move-stdlib.workspace = true
+move-compiler.workspace = true
diff --git a/vendors/move/crates/test-generation/README.md b/vendors/move/crates/test-generation/README.md
new file mode 100644
index 000000000..547ea2fe2
--- /dev/null
+++ b/vendors/move/crates/test-generation/README.md
@@ -0,0 +1,107 @@
+---
+id: bytecode-test-generation
+title: Bytecode Test Generation Tool
+custom_edit_url: https://github.com/move-language/move/edit/main/language/testing-infra/test-generation/README.md
+---
+
+# Bytecode Test Generation Tool
+
+## Overview
+
+This tool can generate known-valid or known-invalid Move bytecode programs.
+Known-valid means that the program is valid by construction; it was constructed
+according to a formal specification of the Move bytecode language. Known-invalid
+bytecode programs are those that diverge from the specification in a controlled way.
+
+The generated modules are checked by the Move bytecode verifier and then run on the VM runtime.
+If the module contains known-valid bytecode, we should expect that the program will
+pass the bytecode verifier. If it does not pass the verifier then this indicates that either
+there is a bug in the bytecode verifier or the formal specification of the failing
+instruction is incorrect. Likewise, it should also run successfully on the VM runtime.
+
+If the module contains known-invalid bytecode, we should expect that the verifier will
+reject the module. If the verifier does not reject the module this indicates again
+that either there is a bug in the bytecode verifier or the formal specification is
+incorrect. Likewise for the VM runtime.
+
+## Usage
+
+### Building and Configuration
+
+To build the tool
+- `cargo build`
+
+There are configuration options (and explanations for their behavior) in `src/config.rs`.
+Most of the time these should be left as the provided defaults.
+
+### Running
+
+The tool expects up to two arguments:
+- `--iterations`: The number of programs that should be generated and tested
+- `--output`: (Optional) If provided, this is the path to which modules that result in errors will be serialied and saved. If not provided, failing cases will be logged to the console.
+
+Additionally, there is an optional flag `RUST_LOG` that controls the verbosity of debug
+information. It goes from `error`, the least information, to `debug` the most information.
+The most common setting for this flag is `info` which will print stats such as the number
+of iterations, the number of verified and executed programs, etc.
+
+To run the tool
+- `RUST_LOG=info cargo run -- --iterations N --output PATH`
+
+## Architecture
+
+This tool works by modeling the state of the VM abstractly, and by modeling the bytecode
+instructions in terms of that abstract state. The abstract state is defined in
+`abstact_state.rs`. It consists of type-level modeling of the VM stack, locals, and borrow
+graph.
+
+Instructions are defined in terms of their preconditions and effects. These definitions are
+found in `summaries.rs` and use macros defined in `transitions.rs`. The preconditions of
+an instruction are predicates that are true or false for a given abstract state. For example
+the `Bytecode::Add` instruction requires the stack to contain two integers. This is modeled
+by saying that the preconditions of `Bytecode::Add` are
+- `state_stack_has!(0, Some(SignatureToken::U64))`
+- `state_stack_has!(1, Some(SignatureToken::U64))`
+where indexes 0 and 1 refer to the top two elements of the stack.
+
+The effects of an instruction describe how the instruction modifies the abstract state. For
+`Bytecode::Add` the effects are that it performs two pops on the stack and pushes a
+`SignatureToken::U64` to the stack.
+
+In this way, we are able to fully capture what each instruction needs and does.
+This information is used to generate valid bytecode programs.
+
+Generation of bytecode programs proceeds as follows:
+1. In `lib.rs` the generator loop begins by initializing a `ModuleBuilder`
+2. The `ModuleBuilder`, defined in `../utils/src/module_generator.rs`, generates a module definition
+3. The `ModuleBuilder` calls the `generator` defined in `bytecode_generator.rs` to fill in function bodies within the module
+4. The `generator` builds a control flow graph (CFG) in `control_flow_graph.rs`. Each block of the CFG is assigned a valid starting and ending abstract state.
+5. The `generator` fills in blocks of the CFG according to the following algorithm:
+    1. Given starting abstract state `AS1`, let `candidates` be the list of all instructions whose preconditions are all satisfied in `AS1`
+        - If invalid generation is desired, then let `x` preconditions be `false`
+    2. Select candidate `instr` from `candidates` according to the stack height heuristic
+        - The stack height heuristic selects instructions that add to the stack when the height is small, and instructions that subtract from the stack when the height is large
+    3. Apply the effects of `instr` to `AS1`, producing `AS2`
+    4. If the stack is empty, terminate, otherwise repeat from step a with `AS2`
+
+This results in the generation of one module. The module is then given to the bytecode
+verifier and the bytecode verifier's behavior (i.e. no verification errors, some verification
+errors, panic, crash) is recorded. Likewise with the VM runtime (except with runtime errors
+rather than verification errors). Depending on the configuration that this tool is built
+with, if the module caused a verification error, panic, or crash the module will then be
+printed out or serialized to disk.
+
+This will continue for the number of iterations specified when invoking the tool.
+
+Other files:
+- `error.rs` defines an error struct which is used to pass error messages.
+- `tests/` contains a set of files that test the preconditions and effects of each bytecode instruction
+
+## Extending the tool
+
+The most common change or extension to this tool will probably be changing instruction
+preconditions and effects. To do that follow these steps:
+1. See if there already a macro defined in `transitions.rs` that captures your desired precondition/effect
+2. If the macro is already defined, just add it to the summary of the instruction being changed in `summaries.rs`
+3. If a suitable macro does not exist, define it in `transitions.rs`. Look at other macros in that file for examples.
+4. Macros in `transitions.rs` have access to the public fields and functions of the `AbstractState`. If your macro needs access to something more, add a new helper method in `abstract_state.rs` and then invoke it in the macro.
diff --git a/vendors/move/crates/test-generation/measure-coverage.sh b/vendors/move/crates/test-generation/measure-coverage.sh
new file mode 100755
index 000000000..09738f8bc
--- /dev/null
+++ b/vendors/move/crates/test-generation/measure-coverage.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# Check that the test directory and report path arguments are provided
+if [ $# -lt 1 ]
+then
+	echo "Usage: $0 <outdir> [--batch]"
+	echo "The resulting coverage report will be stored in <outdir>."
+	echo "--batch will skip all prompts."
+	exit 1
+fi
+
+# User prompts will be skipped if '--batch' is given as the third argument
+SKIP_PROMPTS=0
+if [ $# -eq 2 -a "$2" == "--batch" ]
+then
+	SKIP_PROMPTS=1
+fi
+
+# Set the directory to which the report will be saved
+COVERAGE_DIR=$1
+
+# This needs to run in test-generation
+TOOL_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+if [ $(pwd) != $TOOL_DIR  ]
+then
+	echo "Error: This needs to run from test-generation/, not in $(pwd)" >&2
+	exit 1
+fi
+
+set -e
+
+# Check that grcov is installed
+if ! [ -x "$(command -v grcov)" ]; then
+	echo "Error: grcov is not installed." >&2
+	if [ $SKIP_PROMPTS -eq 0 ]
+	then
+		read -p "Install grcov? [yY/*] " -n 1 -r
+		echo ""
+		if [[ ! $REPLY =~ ^[Yy]$ ]]
+		then
+			[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+		fi
+		cargo install grcov
+	else
+		exit 1
+	fi
+fi
+
+# Check that lcov is installed
+if ! [ -x "$(command -v lcov)" ]; then
+	echo "Error: lcov is not installed." >&2
+	echo "Documentation for lcov can be found at http://ltp.sourceforge.net/coverage/lcov.php"
+	echo "If on macOS and using homebrew, run 'brew install lcov'"
+	exit 1
+fi
+
+# Warn that cargo clean will happen
+if [ $SKIP_PROMPTS -eq 0 ]
+then
+	read -p "Generate coverage report? This will run cargo clean. [yY/*] " -n 1 -r
+	echo ""
+	if [[ ! $REPLY =~ ^[Yy]$ ]]
+	then
+		[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+	fi
+fi
+
+# Set flags for coverage generation
+export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Zno-landing-pads"
+export CARGO_INCREMENTAL=0
+
+# Clean the project
+echo "Cleaning project..."
+cargo clean
+
+# Run bytecode test generator
+echo "Running bytecode test generator..."
+RUST_LOG=info cargo run -- --iterations 1000
+
+# Make the coverage directory if it doesn't exist
+if [ ! -d $COVERAGE_DIR ]; then
+	mkdir $COVERAGE_DIR;
+fi
+
+# Generate lcov report
+echo "Generating lcov report at ${COVERAGE_DIR}/lcov.info..."
+grcov $TOOL_DIR/../../../target/ -t lcov --llvm --branch --ignore-dir "/*" -o $COVERAGE_DIR/lcov.info
+
+# Generate HTML report
+echo "Generating report at ${COVERAGE_DIR}..."
+# Flag "--ignore-errors source" ignores missing source files
+(cd $TOOL_DIR/../../../; genhtml -o $COVERAGE_DIR --show-details --highlight --ignore-errors source --legend --branch-coverage $COVERAGE_DIR/lcov.info)
+
+echo "Done. Please view report at ${COVERAGE_DIR}/index.html"
diff --git a/vendors/move/crates/test-generation/src/abstract_state.rs b/vendors/move/crates/test-generation/src/abstract_state.rs
new file mode 100644
index 000000000..8bddb42d4
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/abstract_state.rs
@@ -0,0 +1,719 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{borrow_graph::BorrowGraph, error::VMError};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        empty_module, Ability, AbilitySet, CompiledModule, FieldInstantiation,
+        FieldInstantiationIndex, FunctionHandleIndex, FunctionInstantiation,
+        FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiation, StructDefInstantiationIndex, StructDefinitionIndex, TableIndex,
+    },
+};
+use std::{
+    collections::{HashMap, HashSet},
+    fmt,
+};
+
+/// The BorrowState denotes whether a local is `Available` or
+/// has been moved and is `Unavailable`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum BorrowState {
+    Available,
+    Unavailable,
+}
+
+/// This models a value on the stack or in the locals
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AbstractValue {
+    /// Represents the type of the value
+    pub token: SignatureToken,
+
+    /// Represents the abilities of the value
+    pub abilities: AbilitySet,
+}
+
+/// This models the mutability of a reference
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Mutability {
+    /// Represents a mutable reference
+    Mutable,
+
+    /// Represents an immutable reference
+    Immutable,
+
+    /// When we don't need to specify whether
+    /// the reference is mutable or immutable
+    Either,
+}
+
+impl AbstractValue {
+    /// Create a new primitive `AbstractValue` given its type; the kind will be `Copyable`
+    pub fn new_primitive(token: SignatureToken) -> AbstractValue {
+        assert!(
+            match token {
+                SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::Reference(_)
+                | SignatureToken::MutableReference(_)
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::TypeParameter(_) => false,
+                SignatureToken::Bool
+                | SignatureToken::Address
+                | SignatureToken::U8
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::U256 => true,
+            },
+            "AbstractValue::new_primitive must be applied with primitive type"
+        );
+        AbstractValue {
+            token,
+            abilities: AbilitySet::PRIMITIVES,
+        }
+    }
+
+    /// Create a new reference `AbstractValue` given its type and kind
+    pub fn new_reference(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        assert!(
+            matches!(
+                token,
+                SignatureToken::Reference(_) | SignatureToken::MutableReference(_)
+            ),
+            "AbstractValue::new_reference must be applied with a reference type"
+        );
+        AbstractValue { token, abilities }
+    }
+
+    /// Create a new struct `AbstractValue` given its type and kind
+    pub fn new_struct(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        assert!(
+            matches!(token, SignatureToken::Struct(_)),
+            "AbstractValue::new_struct must be applied with a struct type"
+        );
+        AbstractValue { token, abilities }
+    }
+
+    pub fn new_value(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        AbstractValue { token, abilities }
+    }
+
+    /// Predicate on whether the type of the abstract value is generic -- it is if it contains a
+    /// type parameter.
+    pub fn is_generic(&self) -> bool {
+        Self::is_generic_token(&self.token)
+    }
+
+    fn is_generic_token(token: &SignatureToken) -> bool {
+        match token {
+            SignatureToken::TypeParameter(_) => true,
+            SignatureToken::StructInstantiation(_, _) => true,
+            SignatureToken::Reference(tok) | SignatureToken::MutableReference(tok) => {
+                Self::is_generic_token(tok)
+            }
+            _ => false,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct CallGraph {
+    calls: HashMap<FunctionHandleIndex, HashSet<FunctionHandleIndex>>,
+    max_function_handle_index: usize,
+}
+
+impl CallGraph {
+    pub fn new(max_function_handle_index: usize) -> Self {
+        Self {
+            calls: HashMap::new(),
+            max_function_handle_index,
+        }
+    }
+
+    pub fn add_call(&mut self, caller: FunctionHandleIndex, callee: FunctionHandleIndex) {
+        self.calls.entry(caller).or_default().insert(callee);
+    }
+
+    pub fn can_call(&self, my_index: FunctionHandleIndex) -> Vec<FunctionHandleIndex> {
+        // We want the set of function handles that don't lead to a recursive call-graph
+        (0..self.max_function_handle_index)
+            .filter(|index| {
+                self.call_depth(my_index, FunctionHandleIndex(*index as TableIndex))
+                    .is_some()
+            })
+            .map(|i| FunctionHandleIndex(i as TableIndex))
+            .collect()
+    }
+
+    pub fn max_calling_depth(&self, index: FunctionHandleIndex) -> usize {
+        let mut instantiation_depth = 0;
+        for (caller, callees) in self.calls.iter() {
+            for callee in callees.iter() {
+                if *callee == index {
+                    let depth = self.max_calling_depth(*caller) + 1;
+                    instantiation_depth = std::cmp::max(depth, instantiation_depth);
+                }
+            }
+        }
+        instantiation_depth
+    }
+
+    /// None if recursive, Some(index) if non-recursive, and index is the length of the maximal call
+    /// graph path originating at caller, and calling through callee.
+    pub fn call_depth(
+        &self,
+        caller: FunctionHandleIndex,
+        callee: FunctionHandleIndex,
+    ) -> Option<usize> {
+        if caller == callee {
+            return None;
+        }
+        match self.calls.get(&callee) {
+            None => Some(1),
+            Some(callee_callees) => {
+                if callee_callees.contains(&caller) {
+                    return None;
+                }
+                let call_depths = callee_callees
+                    .iter()
+                    .filter_map(|callee_callee| self.call_depth(caller, *callee_callee))
+                    .collect::<Vec<_>>();
+                if call_depths.len() < callee_callees.len() {
+                    // We found a recursive call
+                    None
+                } else {
+                    let max = call_depths.iter().max().unwrap();
+                    Some(max + 1)
+                }
+            }
+        }
+    }
+}
+
+/// During the generation of a bytecode sequence, specific instantiations may need to be made, that
+/// may not yet exist in the underlying module. Instead of mutating the underlying module in order to record these instantiations in the
+/// locals signature table, we instead build wrapper around the underlying module containing the
+/// type instantiations, and at the end materialize this updated signature pool into a module. We
+/// also need the ability to quickly determine if an instantiation has already been created, and if
+/// so, at which index. So this also keeps a reverse lookup table of instantiation to
+/// SignatureIndex.
+#[derive(Debug, Clone)]
+pub struct InstantiableModule {
+    // A reverse lookup table for instantiations.
+    sig_instance_for_offset: Vec<Vec<SignatureToken>>,
+    instantiations: HashMap<Vec<SignatureToken>, SignatureIndex>,
+
+    struct_instance_for_offset: Vec<StructDefInstantiation>,
+    struct_instantiations: HashMap<StructDefInstantiation, StructDefInstantiationIndex>,
+
+    func_instance_for_offset: Vec<FunctionInstantiation>,
+    function_instantiations: HashMap<FunctionInstantiation, FunctionInstantiationIndex>,
+
+    field_instance_for_offset: Vec<FieldInstantiation>,
+    field_instantiations: HashMap<FieldInstantiation, FieldInstantiationIndex>,
+
+    pub module: CompiledModule,
+}
+
+impl InstantiableModule {
+    pub fn new(module: CompiledModule) -> Self {
+        Self {
+            instantiations: module
+                .signatures()
+                .iter()
+                .enumerate()
+                .map(|(index, sig)| (sig.0.clone(), SignatureIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            sig_instance_for_offset: module
+                .signatures()
+                .iter()
+                .map(|loc_sig| loc_sig.0.clone())
+                .collect(),
+
+            struct_instantiations: module
+                .struct_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, si)| (si.clone(), StructDefInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            struct_instance_for_offset: module.struct_instantiations().to_vec(),
+
+            function_instantiations: module
+                .function_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, fi)| (fi.clone(), FunctionInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            func_instance_for_offset: module.function_instantiations().to_vec(),
+
+            field_instantiations: module
+                .field_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, fi)| (fi.clone(), FieldInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            field_instance_for_offset: module.field_instantiations().to_vec(),
+            module,
+        }
+    }
+
+    /// If the `instantiant` is not in the `instantiations` table, this adds the instantiant to the
+    /// `instance_for_offset` for table, and adds the index to the reverse lookup table. Returns
+    /// the SignatureIndex for the `instantiant`.
+    pub fn add_instantiation(&mut self, instantiant: Vec<SignatureToken>) -> SignatureIndex {
+        match self.instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    SignatureIndex(self.sig_instance_for_offset.len() as TableIndex);
+                self.instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.sig_instance_for_offset.push(instantiant);
+                current_index
+            }
+        }
+    }
+
+    /// If the `instantiant` is not in the `struct_instantiations` table, this adds the
+    /// instantiant to the `struct_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_struct_instantiation(
+        &mut self,
+        instantiant: StructDefInstantiation,
+    ) -> StructDefInstantiationIndex {
+        match self.struct_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index = StructDefInstantiationIndex(
+                    self.struct_instance_for_offset.len() as TableIndex,
+                );
+                self.struct_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.struct_instance_for_offset.push(instantiant);
+                current_index
+            }
+        }
+    }
+
+    /// If the `instantiant` is not in the `function_instantiations` table, this adds the
+    /// instantiant to the `func_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_function_instantiation(
+        &mut self,
+        instantiant: FunctionInstantiation,
+    ) -> FunctionInstantiationIndex {
+        match self.function_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    FunctionInstantiationIndex(self.func_instance_for_offset.len() as TableIndex);
+                self.function_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.func_instance_for_offset.push(instantiant);
+                current_index
+            }
+        }
+    }
+
+    /// If the `instantiant` is not in the `field_instantiations` table, this adds the
+    /// instantiant to the `field_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_field_instantiation(
+        &mut self,
+        instantiant: FieldInstantiation,
+    ) -> FieldInstantiationIndex {
+        match self.field_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    FieldInstantiationIndex(self.field_instance_for_offset.len() as TableIndex);
+                self.field_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.field_instance_for_offset.push(instantiant);
+                current_index
+            }
+        }
+    }
+
+    /// Returns the type instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn instantiantiation_at(&self, index: SignatureIndex) -> &Vec<SignatureToken> {
+        match self.sig_instance_for_offset.get(index.0 as usize) {
+            Some(vec) => vec,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            }
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn struct_instantiantiation_at(
+        &self,
+        index: StructDefInstantiationIndex,
+    ) -> &StructDefInstantiation {
+        match self.struct_instance_for_offset.get(index.0 as usize) {
+            Some(struct_inst) => struct_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            }
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn function_instantiantiation_at(
+        &self,
+        index: FunctionInstantiationIndex,
+    ) -> &FunctionInstantiation {
+        match self.func_instance_for_offset.get(index.0 as usize) {
+            Some(func_inst) => func_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            }
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn field_instantiantiation_at(
+        &self,
+        index: FieldInstantiationIndex,
+    ) -> &FieldInstantiation {
+        match self.field_instance_for_offset.get(index.0 as usize) {
+            Some(field_inst) => field_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            }
+        }
+    }
+
+    /// Consumes self, and adds the instantiations that have been built up to the underlying
+    /// module, and returns the resultant compiled module.
+    pub fn instantiate(self) -> CompiledModule {
+        let mut module = self.module;
+        module.signatures = self
+            .sig_instance_for_offset
+            .into_iter()
+            .map(Signature)
+            .collect();
+        module.struct_def_instantiations = self.struct_instance_for_offset;
+        module.function_instantiations = self.func_instance_for_offset;
+        module.field_instantiations = self.field_instance_for_offset;
+        module
+    }
+}
+
+/// An AbstractState represents an abstract view of the execution of the
+/// Move VM. Rather than considering values of items on the stack or in
+/// the locals, we only consider their type, represented by a `AbstractValue`
+/// and their availibility, represented by the `BorrowState`.
+#[derive(Debug, Clone)]
+pub struct AbstractState {
+    /// A Vector of `AbstractValue`s representing the VM value stack
+    stack: Vec<AbstractValue>,
+
+    /// A vector of type kinds for any generic function type parameters of the function that we are
+    /// in.
+    pub instantiation: Vec<AbilitySet>,
+
+    /// A HashMap mapping local indicies to `AbstractValue`s and `BorrowState`s
+    locals: HashMap<usize, (AbstractValue, BorrowState)>,
+
+    /// Temporary location for storing the results of instruction effects for
+    /// access by subsequent instructions' effects
+    register: Option<AbstractValue>,
+
+    /// The module state
+    pub module: InstantiableModule,
+
+    /// The global resources acquired by the function corresponding to this abstract state
+    pub acquires_global_resources: Vec<StructDefinitionIndex>,
+
+    /// This flag is set when applying an instruction that should result in an error
+    /// in the VM runtime.
+    aborted: bool,
+
+    /// This flag controls whether or not control flow operators are allowed to be applied to the
+    /// abstract state.
+    control_flow_allowed: bool,
+
+    /// This graph stores borrow information needed to ensure that bytecode instructions
+    /// are memory safe
+    #[allow(dead_code)]
+    borrow_graph: BorrowGraph,
+
+    pub call_graph: CallGraph,
+}
+
+impl AbstractState {
+    /// Create a new AbstractState with empty stack, locals, and register
+    pub fn new() -> AbstractState {
+        let compiled_module = empty_module();
+        AbstractState {
+            stack: Vec::new(),
+            instantiation: Vec::new(),
+            locals: HashMap::new(),
+            register: None,
+            module: InstantiableModule::new(compiled_module),
+            acquires_global_resources: Vec::new(),
+            aborted: false,
+            control_flow_allowed: false,
+            borrow_graph: BorrowGraph::new(0),
+            call_graph: CallGraph::new(0),
+        }
+    }
+
+    /// Create a new AbstractState given a list of `SignatureTokens` that will be
+    /// the (available) locals that the state will have, as well as the module state
+    pub fn from_locals(
+        module: CompiledModule,
+        locals: HashMap<usize, (AbstractValue, BorrowState)>,
+        instantiation: Vec<AbilitySet>,
+        acquires_global_resources: Vec<StructDefinitionIndex>,
+        call_graph: CallGraph,
+    ) -> AbstractState {
+        let locals_len = locals.len();
+        let module = InstantiableModule::new(module);
+        AbstractState {
+            stack: Vec::new(),
+            instantiation,
+            locals,
+            module,
+            register: None,
+            acquires_global_resources,
+            aborted: false,
+            control_flow_allowed: false,
+            borrow_graph: BorrowGraph::new(locals_len as u8),
+            call_graph,
+        }
+    }
+
+    /// Get the register value
+    pub fn register_copy(&self) -> Option<AbstractValue> {
+        self.register.clone()
+    }
+
+    /// Get the register value and set it to `None`
+    pub fn register_move(&mut self) -> Option<AbstractValue> {
+        let value = self.register.clone();
+        self.register = None;
+        value
+    }
+
+    /// Set the register value and set it to `None`
+    pub fn register_set(&mut self, value: AbstractValue) {
+        self.register = Some(value);
+    }
+
+    /// Add a `AbstractValue` to the stack
+    pub fn stack_push(&mut self, item: AbstractValue) {
+        // Programs that are large enough to exceed this bound
+        // will not be generated
+        debug_assert!(self.stack.len() < usize::max_value());
+        self.stack.push(item);
+    }
+
+    /// Add a `AbstractValue` to the stack from the register
+    /// If the register is `None` return a `VMError`
+    pub fn stack_push_register(&mut self) -> Result<(), VMError> {
+        if let Some(abstract_value) = self.register_move() {
+            // Programs that are large enough to exceed this bound
+            // will not be generated
+            debug_assert!(self.stack.len() < usize::max_value());
+            self.stack.push(abstract_value);
+            Ok(())
+        } else {
+            Err(VMError::new("Error: No value in register".to_string()))
+        }
+    }
+
+    /// Remove an `AbstractValue` from the stack if it exists to the register
+    /// If it does not exist return a `VMError`.
+    pub fn stack_pop(&mut self) -> Result<(), VMError> {
+        if self.stack.is_empty() {
+            Err(VMError::new("Pop attempted on empty stack".to_string()))
+        } else {
+            self.register = self.stack.pop();
+            Ok(())
+        }
+    }
+
+    /// Get the `AbstractValue` at index `index` on the stack if it exists.
+    /// Index 0 is the top of the stack.
+    pub fn stack_peek(&self, index: usize) -> Option<AbstractValue> {
+        if index < self.stack.len() {
+            Some(self.stack[self.stack.len() - 1 - index].clone())
+        } else {
+            None
+        }
+    }
+
+    /// Get the length of the stack.
+    pub fn stack_len(&self) -> usize {
+        self.stack.len()
+    }
+
+    /// Check if the local at index `i` exists
+    pub fn local_exists(&self, i: usize) -> bool {
+        self.locals.get(&i).is_some()
+    }
+
+    /// Get the local at index `i` if it exists
+    pub fn local_get(&self, i: usize) -> Option<&(AbstractValue, BorrowState)> {
+        self.locals.get(&i)
+    }
+
+    /// Place the local at index `i` if it exists into the register
+    /// If it does not exist return a `VMError`.
+    pub fn local_take(&mut self, i: usize) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            self.register = Some(abstract_value.clone());
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Place a reference to the local at index `i` if it exists into the register
+    /// If it does not exist return a `VMError`.
+    pub fn local_take_borrow(&mut self, i: usize, mutability: Mutability) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            let ref_token = match mutability {
+                Mutability::Mutable => {
+                    SignatureToken::MutableReference(Box::new(abstract_value.token.clone()))
+                }
+                Mutability::Immutable => {
+                    SignatureToken::Reference(Box::new(abstract_value.token.clone()))
+                }
+                Mutability::Either => {
+                    return Err(VMError::new("Mutability cannot be Either".to_string()))
+                }
+            };
+            self.register = Some(AbstractValue::new_reference(
+                ref_token,
+                abstract_value.abilities,
+            ));
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Set the availability of the local at index `i`
+    /// If it does not exist return a `VMError`.
+    pub fn local_set(&mut self, i: usize, availability: BorrowState) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.clone().get(&i) {
+            self.locals
+                .insert(i, (abstract_value.clone(), availability));
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Check whether a local is in a particular `BorrowState`
+    /// If the local does not exist return a `VMError`.
+    pub fn local_availability_is(
+        &self,
+        i: usize,
+        availability: BorrowState,
+    ) -> Result<bool, VMError> {
+        if let Some((_, availability1)) = self.locals.get(&i) {
+            Ok(availability == *availability1)
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Check whether a local has a particular `Ability`
+    /// If the local does not exist return a `VMError`.
+    pub fn local_has_ability(&self, i: usize, ability: Ability) -> Result<bool, VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            Ok(abstract_value.abilities.has_ability(ability))
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Insert a local at index `i` as `Available`
+    pub fn local_insert(
+        &mut self,
+        i: usize,
+        abstract_value: AbstractValue,
+        availability: BorrowState,
+    ) {
+        self.locals.insert(i, (abstract_value, availability));
+    }
+
+    /// Insert a local at index `i` as `Available` from the register
+    /// If the register value is `None` return a `VMError`.
+    pub fn local_place(&mut self, i: usize) -> Result<(), VMError> {
+        if let Some(abstract_value) = self.register_move() {
+            self.locals
+                .insert(i, (abstract_value, BorrowState::Available));
+            Ok(())
+        } else {
+            Err(VMError::new(
+                "Could not insert local, register is empty".to_string(),
+            ))
+        }
+    }
+
+    /// Get all of the locals
+    pub fn get_locals(&self) -> &HashMap<usize, (AbstractValue, BorrowState)> {
+        &self.locals
+    }
+
+    /// Set the abstract state to be `aborted` when a precondition of an instruction
+    /// fails. (This will happen if `NEGATE_PRECONDITIONs` is true).
+    pub fn abort(&mut self) {
+        self.aborted = true;
+    }
+
+    /// Whether the state is aborted
+    pub fn has_aborted(&self) -> bool {
+        self.aborted
+    }
+
+    /// Set the abstract state to allow generation of control flow operations.
+    pub fn allow_control_flow(&mut self) {
+        self.control_flow_allowed = true;
+    }
+
+    /// Predicate determining if control flow instructions can be generated.
+    pub fn is_control_flow_allowed(&self) -> bool {
+        self.control_flow_allowed
+    }
+
+    /// The final state is one where the stack is empty
+    pub fn is_final(&self) -> bool {
+        self.stack.is_empty()
+    }
+}
+
+impl fmt::Display for AbstractState {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "Stack: {:?} | Locals: {:?} | Instantiation: {:?}",
+            self.stack, self.locals, self.instantiation
+        )
+    }
+}
+
+impl Default for AbstractState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl fmt::Display for AbstractValue {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "({:?}: {:?})", self.token, self.abilities)
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/borrow_graph.rs b/vendors/move/crates/test-generation/src/borrow_graph.rs
new file mode 100644
index 000000000..df1ea3fde
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/borrow_graph.rs
@@ -0,0 +1,135 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::abstract_state::Mutability;
+use std::collections::HashMap;
+
+/// Each partition is associated with a (unique) ID
+type PartitionID = u16;
+
+/// A nonce represents a runtime reference. It has a unique identifier and a mutability
+type Nonce = (u16, Mutability);
+
+/// A set of nonces
+type NonceSet = Vec<Nonce>;
+
+/// A path representing field accesses of a struct
+type Path = Vec<u8>;
+
+/// An edge in the graph. It consists of two partition IDs, a `Path` which
+/// may be empty, and an `EdgeType`
+type Edge = (PartitionID, PartitionID, Path, EdgeType);
+
+/// The `EdgeType` is either weak or strong. A weak edge represents imprecise information
+/// on the path along which the borrow takes place. A strong edge is precise.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EdgeType {
+    Weak,
+    Strong,
+}
+
+/// The `BorrowGraph` stores information sufficient to determine whether the instruction
+/// of a bytecode instruction that interacts with references is memory safe.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BorrowGraph {
+    /// All of the partitions that make up the graph
+    partitions: Vec<PartitionID>,
+
+    /// A mapping from partitions to the associated with them
+    partition_map: HashMap<PartitionID, NonceSet>,
+
+    /// The edges of the graph
+    edges: Vec<Edge>,
+
+    /// A counter for determining what the next partition ID should be
+    partition_counter: u16,
+}
+
+impl BorrowGraph {
+    /// Construct a new `BorrowGraph` given the number of locals it has
+    pub fn new(num_locals: u8) -> BorrowGraph {
+        BorrowGraph {
+            partitions: Vec::with_capacity(num_locals as usize),
+            partition_map: HashMap::new(),
+            edges: Vec::new(),
+            partition_counter: u16::from(num_locals),
+        }
+    }
+
+    /// Add a new partition to the graph containing nonce `n`
+    /// This operation may fail with an error a fresh partition ID
+    /// cannot be chosen.
+    pub fn fresh_partition(&mut self, n: Nonce) -> Result<(), String> {
+        if self.partition_counter.checked_add(1).is_some() {
+            if self.partition_map.get(&self.partition_counter).is_some() {
+                return Err("Partition map already contains ID".to_string());
+            }
+            self.partition_map.insert(self.partition_counter, vec![n]);
+            // Implication of `checked_add`
+            debug_assert!(self.partitions.len() < usize::max_value());
+            self.partitions.push(self.partition_counter);
+            Ok(())
+        } else {
+            Err("Partition map is full".to_string())
+        }
+    }
+
+    /// Determine whether a partition is mutable, immutable, or either.
+    /// This operation may fail with an error if the given partition does
+    /// not exist in the graph.
+    pub fn partition_mutability(&self, partition_id: PartitionID) -> Result<Mutability, String> {
+        if let Some(nonce_set) = self.partition_map.get(&partition_id) {
+            if nonce_set
+                .iter()
+                .all(|(_, mutability)| *mutability == Mutability::Mutable)
+            {
+                Ok(Mutability::Mutable)
+            } else if nonce_set
+                .iter()
+                .all(|(_, mutability)| *mutability == Mutability::Immutable)
+            {
+                Ok(Mutability::Immutable)
+            } else {
+                Ok(Mutability::Either)
+            }
+        } else {
+            Err("Partition map does not contain given partition ID".to_string())
+        }
+    }
+
+    /// Determine whether the given partition is freezable. This operation may fail
+    /// with an error if the given partition ID is not in the graph.
+    pub fn partition_freezable(&self, partition_id: PartitionID) -> Result<bool, String> {
+        let mut freezable = true;
+        if self.partition_map.get(&partition_id).is_some() {
+            for (p1, p2, _, _) in self.edges.iter() {
+                if *p1 == partition_id && self.partition_mutability(*p2)? == Mutability::Mutable {
+                    freezable = false;
+                }
+            }
+            Ok(freezable)
+        } else {
+            Err("Partition map does not contain given partition ID".to_string())
+        }
+    }
+
+    /// Determine whether the `path_1` is a prefix of `path_2`
+    fn path_is_prefix(&self, path_1: Path, path_2: Path) -> bool {
+        let mut prefix = true;
+        for (i, field) in path_1.iter().enumerate() {
+            if *field != path_2[i] {
+                prefix = false;
+            }
+        }
+        prefix
+    }
+
+    /// Determine whether two edges are consistent; i.e. whether the path of the
+    /// first edge is a prefix of the second or vice versa.
+    pub fn edges_consistent(&self, edge_1: Edge, edge_2: Edge) -> bool {
+        let path_1 = edge_1.2;
+        let path_2 = edge_2.2;
+        self.path_is_prefix(path_1.clone(), path_2.clone()) || self.path_is_prefix(path_2, path_1)
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/bytecode_generator.rs b/vendors/move/crates/test-generation/src/bytecode_generator.rs
new file mode 100644
index 000000000..0235ae2c7
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/bytecode_generator.rs
@@ -0,0 +1,985 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abstract_state::{AbstractState, BorrowState, CallGraph, InstantiableModule},
+    config::{
+        CALL_STACK_LIMIT, INHABITATION_INSTRUCTION_LIMIT, MAX_CFG_BLOCKS, MUTATION_TOLERANCE,
+        NEGATE_PRECONDITIONS, NEGATION_PROBABILITY, VALUE_STACK_LIMIT,
+    },
+    control_flow_graph::CFG,
+    substitute, summaries,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, ConstantPoolIndex, FieldHandleIndex,
+        FieldInstantiationIndex, FunctionHandle, FunctionHandleIndex, FunctionInstantiation,
+        FunctionInstantiationIndex, LocalIndex, SignatureToken, StructDefInstantiation,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+    },
+};
+use move_core_types::u256::U256;
+use rand::{rngs::StdRng, Rng};
+use tracing::{debug, error, warn};
+
+/// This type represents bytecode instructions that take a `LocalIndex`
+type LocalIndexToBytecode = fn(LocalIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u16`
+type CodeOffsetToBytecode = fn(CodeOffset) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u8`
+type U8ToBytecode = fn(u8) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u16`
+type U16ToBytecode = fn(u16) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u32`
+type U32ToBytecode = fn(u32) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u64`
+type U64ToBytecode = fn(u64) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u128`
+type U128ToBytecode = fn(u128) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u256`
+type U256ToBytecode = fn(U256) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `AddressPoolIndex`
+type ConstantPoolIndexToBytecode = fn(ConstantPoolIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `StructDefinitionIndex`
+type StructIndexToBytecode = fn(StructDefinitionIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FieldHandleIndex`
+type FieldHandleIndexToBytecode = fn(FieldHandleIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FunctionHandleIndex`
+type FunctionIndexToBytecode = fn(FunctionHandleIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `StructDefInstantiationIndex`
+type StructInstIndexToBytecode = fn(StructDefInstantiationIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FieldInstantiationIndex`
+type FieldInstIndexToBytecode = fn(FieldInstantiationIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FunctionInstantiationIndex`
+type FunctionInstIndexToBytecode = fn(FunctionInstantiationIndex) -> Bytecode;
+
+/// There are six types of bytecode instructions
+#[derive(Debug, Clone)]
+enum BytecodeType {
+    /// Instructions that do not take an argument
+    NoArg(Bytecode),
+
+    /// Instructions that take a `LocalIndex`
+    LocalIndex(LocalIndexToBytecode),
+
+    /// Instructions that take a `CodeOffset`
+    CodeOffset(CodeOffsetToBytecode),
+
+    /// Instructions that take a `u8`
+    U8(U8ToBytecode),
+
+    /// Instructions that take a `u16`
+    U16(U16ToBytecode),
+
+    /// Instructions that take a `u32`
+    U32(U32ToBytecode),
+
+    /// Instructions that take a `u64`
+    U64(U64ToBytecode),
+
+    /// Instructions that take a `u128`
+    U128(U128ToBytecode),
+
+    /// Instructions that take a `u256`
+    U256(U256ToBytecode),
+
+    /// Instructions that take an `ConstantPoolIndex`
+    ConstantPoolIndex(ConstantPoolIndexToBytecode),
+
+    /// Instructions that take a `StructDefinitionIndex`
+    StructIndex(StructIndexToBytecode),
+
+    /// Instructions that take a `FieldHandleIndex`
+    FieldHandleIndex(FieldHandleIndexToBytecode),
+
+    /// Instructions that take a `FunctionHandleIndex`
+    FunctionIndex(FunctionIndexToBytecode),
+
+    /// Instructions that take a `StructInstantiationIndex`
+    StructInstantiationIndex(StructInstIndexToBytecode),
+
+    /// Instructions that take a `FieldInstantiationIndex`
+    FieldInstantiationIndex(FieldInstIndexToBytecode),
+
+    /// Instructions that take a `FunctionInstantiationIndex`
+    FunctionInstantiationIndex(FunctionInstIndexToBytecode),
+}
+
+/// Abstraction for change to the stack size
+#[derive(Debug, Copy, Clone, PartialEq)]
+enum StackEffect {
+    /// Represents an increase in stack size
+    Add,
+
+    /// Represents a decrease in stack size
+    Sub,
+
+    /// Represents no change in stack size
+    Nop,
+}
+
+/// Context containing information about a function
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct FunctionGenerationContext {
+    pub function_handle_index: FunctionHandleIndex,
+    pub starting_call_height: usize,
+    pub locals_len: usize,
+    pub bytecode_len: u64,
+}
+
+impl FunctionGenerationContext {
+    pub fn new(
+        function_handle_index: FunctionHandleIndex,
+        starting_call_height: usize,
+        locals_len: usize,
+        bytecode_len: u64,
+    ) -> Self {
+        Self {
+            function_handle_index,
+            starting_call_height,
+            locals_len,
+            bytecode_len,
+        }
+    }
+
+    pub fn incr_instruction_count(&mut self) -> Option<()> {
+        self.bytecode_len += 1;
+        if self.bytecode_len >= (u16::max_value() - 1) as u64 {
+            return None;
+        }
+        Some(())
+    }
+}
+
+/// Generates a sequence of bytecode instructions.
+/// This generator has:
+/// - `instructions`: A list of bytecode instructions to use for generation
+/// - `rng`: A random number generator for uniform random choice of next instruction
+#[derive(Debug)]
+pub struct BytecodeGenerator<'a> {
+    instructions: Vec<(StackEffect, BytecodeType)>,
+    rng: &'a mut StdRng,
+}
+
+impl<'a> BytecodeGenerator<'a> {
+    /// The `BytecodeGenerator` is instantiated with a seed to use with
+    /// its random number generator.
+    pub fn new(rng: &'a mut StdRng) -> Self {
+        let instructions: Vec<(StackEffect, BytecodeType)> = vec![
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Pop)),
+            (StackEffect::Add, BytecodeType::U8(Bytecode::LdU8)),
+            (StackEffect::Add, BytecodeType::U16(Bytecode::LdU16)),
+            (StackEffect::Add, BytecodeType::U32(Bytecode::LdU32)),
+            (StackEffect::Add, BytecodeType::U64(Bytecode::LdU64)),
+            (StackEffect::Add, BytecodeType::U128(Bytecode::LdU128)),
+            (StackEffect::Add, BytecodeType::U256(Bytecode::LdU256)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU8)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU16)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU32)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU64)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU128)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU256)),
+            (
+                StackEffect::Add,
+                BytecodeType::ConstantPoolIndex(Bytecode::LdConst),
+            ),
+            (StackEffect::Add, BytecodeType::NoArg(Bytecode::LdTrue)),
+            (StackEffect::Add, BytecodeType::NoArg(Bytecode::LdFalse)),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::CopyLoc),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::MoveLoc),
+            ),
+            (StackEffect::Sub, BytecodeType::LocalIndex(Bytecode::StLoc)),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::MutBorrowLoc),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::ImmBorrowLoc),
+            ),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::ReadRef)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::WriteRef)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::FreezeRef)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Add)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Sub)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Mul)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Div)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Mod)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::BitAnd)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::BitOr)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Xor)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Or)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::And)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::Not)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Eq)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Neq)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Lt)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Gt)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Le)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Ge)),
+            (StackEffect::Nop, BytecodeType::StructIndex(Bytecode::Pack)),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::PackGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::Unpack),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::UnpackGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::Exists),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::ExistsGeneric),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::StructIndex(Bytecode::MoveFrom),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::StructInstantiationIndex(Bytecode::MoveFromGeneric),
+            ),
+            (
+                StackEffect::Sub,
+                BytecodeType::StructIndex(Bytecode::MoveTo),
+            ),
+            (
+                StackEffect::Sub,
+                BytecodeType::StructInstantiationIndex(Bytecode::MoveToGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::MutBorrowGlobal),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::MutBorrowGlobalGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::ImmBorrowGlobal),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::ImmBorrowGlobalGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldHandleIndex(Bytecode::MutBorrowField),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldInstantiationIndex(Bytecode::MutBorrowFieldGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldHandleIndex(Bytecode::ImmBorrowField),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldInstantiationIndex(Bytecode::ImmBorrowFieldGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FunctionIndex(Bytecode::Call),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FunctionInstantiationIndex(Bytecode::CallGeneric),
+            ),
+            (StackEffect::Nop, BytecodeType::CodeOffset(Bytecode::Branch)),
+            (StackEffect::Sub, BytecodeType::CodeOffset(Bytecode::BrTrue)),
+            (
+                StackEffect::Sub,
+                BytecodeType::CodeOffset(Bytecode::BrFalse),
+            ),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Abort)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::Ret)),
+        ];
+        Self { instructions, rng }
+    }
+
+    fn index_or_none<T>(table: &[T], rng: &mut StdRng) -> Option<TableIndex> {
+        if table.is_empty() {
+            None
+        } else {
+            Some(rng.gen_range(0..table.len()) as TableIndex)
+        }
+    }
+
+    // Soft cutoff: We starting making it less likely for the stack size to be increased once it
+    // becomes greater than VALUE_STACK_LIMIT - 24. Once we reach the stack limit then we have a
+    // hard cutoff.
+    fn value_backpressure(state: &AbstractState, probability: f32) -> f32 {
+        let len = state.stack_len();
+
+        if len <= VALUE_STACK_LIMIT - 24 {
+            return probability;
+        }
+
+        if len > VALUE_STACK_LIMIT - 24 {
+            return probability * 0.5;
+        }
+
+        0.0
+    }
+
+    // Tight cutoff: calls can be generated as long as it's less than the max call stack height. If
+    // the call would cause the call stack to overflow then it can't be generated.
+    fn call_stack_backpressure(
+        state: &AbstractState,
+        fn_context: &FunctionGenerationContext,
+        call: FunctionHandleIndex,
+    ) -> Option<FunctionHandleIndex> {
+        if let Some(call_size) = state
+            .call_graph
+            .call_depth(fn_context.function_handle_index, call)
+        {
+            if call_size + fn_context.starting_call_height <= CALL_STACK_LIMIT {
+                return Some(call);
+            }
+        }
+        None
+    }
+
+    /// Given an `AbstractState`, `state`, and a the number of locals the function has,
+    /// this function returns a list of instructions whose preconditions are satisfied for
+    /// the state.
+    fn candidate_instructions(
+        &mut self,
+        fn_context: &FunctionGenerationContext,
+        state: AbstractState,
+        module: CompiledModule,
+    ) -> Vec<(StackEffect, Bytecode)> {
+        let mut matches: Vec<(StackEffect, Bytecode)> = Vec::new();
+        let instructions = &self.instructions;
+        for (stack_effect, instruction) in instructions.iter() {
+            let instruction: Option<Bytecode> = match instruction {
+                BytecodeType::NoArg(instruction) => Some(instruction.clone()),
+                BytecodeType::LocalIndex(instruction) => {
+                    // Generate a random index into the locals
+                    if fn_context.locals_len > 0 {
+                        Some(instruction(
+                            self.rng.gen_range(0..fn_context.locals_len) as LocalIndex
+                        ))
+                    } else {
+                        None
+                    }
+                }
+                BytecodeType::CodeOffset(instruction) => {
+                    // Set 0 as the offset. This will be set correctly during serialization
+                    Some(instruction(0))
+                }
+                BytecodeType::U8(instruction) => {
+                    // Generate a random u8 constant to load
+                    Some(instruction(self.rng.gen_range(0..u8::max_value())))
+                }
+                BytecodeType::U16(instruction) => {
+                    // Generate a random u16 constant to load
+                    Some(instruction(self.rng.gen_range(0..u16::max_value())))
+                }
+                BytecodeType::U32(instruction) => {
+                    // Generate a random u32 constant to load
+                    Some(instruction(self.rng.gen_range(0..u32::max_value())))
+                }
+                BytecodeType::U64(instruction) => {
+                    // Generate a random u64 constant to load
+                    Some(instruction(self.rng.gen_range(0..u64::max_value())))
+                }
+                BytecodeType::U128(instruction) => {
+                    // Generate a random u128 constant to load
+                    Some(instruction(self.rng.gen_range(0..u128::max_value())))
+                }
+                BytecodeType::U256(instruction) => {
+                    // Generate a random u256 constant to load
+                    Some(instruction(
+                        self.rng.gen_range(U256::zero()..U256::max_value()),
+                    ))
+                }
+                BytecodeType::ConstantPoolIndex(instruction) => {
+                    // Select a random address from the module's address pool
+                    Self::index_or_none(&module.constant_pool, self.rng)
+                        .map(|x| instruction(ConstantPoolIndex::new(x)))
+                }
+                BytecodeType::StructIndex(instruction) => {
+                    // Select a random struct definition and local signature
+                    Self::index_or_none(&module.struct_defs, self.rng)
+                        .map(|x| instruction(StructDefinitionIndex::new(x)))
+                }
+                BytecodeType::FieldHandleIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.field_handles, self.rng)
+                        .map(|x| instruction(FieldHandleIndex::new(x)))
+                }
+                BytecodeType::FunctionIndex(instruction) => {
+                    // Select a random function handle and local signature
+                    let callable_fns = &state.call_graph.can_call(fn_context.function_handle_index);
+                    Self::index_or_none(callable_fns, self.rng)
+                        .and_then(|handle_idx| {
+                            Self::call_stack_backpressure(
+                                &state,
+                                fn_context,
+                                callable_fns[handle_idx as usize],
+                            )
+                        })
+                        .map(instruction)
+                }
+                BytecodeType::StructInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.struct_def_instantiations, self.rng)
+                        .map(|x| instruction(StructDefInstantiationIndex::new(x)))
+                }
+                BytecodeType::FunctionInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.function_instantiations, self.rng)
+                        .map(|x| instruction(FunctionInstantiationIndex::new(x)))
+                }
+                BytecodeType::FieldInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.field_instantiations, self.rng)
+                        .map(|x| instruction(FieldInstantiationIndex::new(x)))
+                }
+            };
+            if let Some(instruction) = instruction {
+                let summary = summaries::instruction_summary(instruction.clone(), false);
+                let unsatisfied_preconditions = summary
+                    .preconditions
+                    .iter()
+                    .filter(|precondition| !precondition(&state))
+                    .count();
+                if (NEGATE_PRECONDITIONS
+                    && !summary.preconditions.is_empty()
+                    && unsatisfied_preconditions
+                        > self.rng.gen_range(0..summary.preconditions.len())
+                    && self.rng.gen_range(0..101) > 100 - (NEGATION_PROBABILITY * 100.0) as u8)
+                    || unsatisfied_preconditions == 0
+                {
+                    // The size of matches cannot be greater than the number of bytecode instructions
+                    debug_assert!(matches.len() < usize::max_value());
+                    matches.push((*stack_effect, instruction));
+                }
+            }
+        }
+        matches
+    }
+
+    /// Select an instruction from the list of candidates based on the current state's
+    /// stack size and the expected number of function return parameters.
+    fn select_candidate(
+        &mut self,
+        return_len: usize,
+        state: &AbstractState,
+        candidates: &[(StackEffect, Bytecode)],
+    ) -> Result<Bytecode, String> {
+        debug!("Candidates: {:?}", candidates);
+        let stack_len = state.stack_len();
+        let prob_add = if stack_len > return_len {
+            MUTATION_TOLERANCE / (stack_len as f32)
+        } else {
+            1.0
+        };
+        let prob_add = Self::value_backpressure(state, prob_add);
+        debug!("Pr[add] = {:?}", prob_add);
+        let next_instruction_index;
+        if self.rng.gen_range(0.0..1.0) <= prob_add {
+            let add_candidates: Vec<Bytecode> = candidates
+                .iter()
+                .filter(|(stack_effect, _)| {
+                    *stack_effect == StackEffect::Add || *stack_effect == StackEffect::Nop
+                })
+                .map(|(_, candidate)| candidate)
+                .cloned()
+                .collect();
+            // Add candidates should not be empty unless the list of bytecode instructions is
+            // changed
+            if add_candidates.is_empty() {
+                return Err("Could not find valid add candidate".to_string());
+            }
+            next_instruction_index = self.rng.gen_range(0..add_candidates.len());
+            Ok(add_candidates[next_instruction_index].clone())
+        } else {
+            let sub_candidates: Vec<Bytecode> = candidates
+                .iter()
+                .filter(|(stack_effect, _)| {
+                    *stack_effect == StackEffect::Sub || *stack_effect == StackEffect::Nop
+                })
+                .map(|(_, candidate)| candidate)
+                .cloned()
+                .collect();
+            // Sub candidates should not be empty unless the list of bytecode instructions is
+            // changed
+            if sub_candidates.is_empty() {
+                return Err("Could not find sub valid candidate".to_string());
+            }
+            next_instruction_index = self.rng.gen_range(0..sub_candidates.len());
+            Ok(sub_candidates[next_instruction_index].clone())
+        }
+    }
+
+    /// Transition an abstract state, `state` to the next state by applying all of the effects
+    /// of a particular bytecode instruction, `instruction`.
+    fn abstract_step(
+        &self,
+        mut state: AbstractState,
+        instruction: Bytecode,
+        exact: bool,
+    ) -> (AbstractState, Bytecode) {
+        let summary = summaries::instruction_summary(instruction.clone(), exact);
+        let should_error = summary
+            .preconditions
+            .iter()
+            .any(|precondition| !precondition(&state));
+        if should_error {
+            debug!("Reached abort state");
+            state.abort();
+        }
+        let apply_effects = |state, effects: Vec<Box<summaries::NonInstantiableEffect>>| {
+            effects.iter().fold(state, |acc, effect| {
+                effect(&acc).unwrap_or_else(|err| {
+                    if NEGATE_PRECONDITIONS {
+                        // Ignore the effect
+                        acc
+                    } else {
+                        unreachable!("Error applying instruction effect: {}", err);
+                    }
+                })
+            })
+        };
+        match summary.effects {
+            summaries::Effects::TyParams(instantiation, effect, instantiation_application) => {
+                let (struct_idx, instantiation) = instantiation(&state);
+                let index = state.module.add_instantiation(instantiation);
+                let struct_inst = StructDefInstantiation {
+                    def: struct_idx,
+                    type_parameters: index,
+                };
+                let str_inst_idx = state.module.add_struct_instantiation(struct_inst);
+                let effects = effect(str_inst_idx);
+                let instruction = instantiation_application(str_inst_idx);
+                (apply_effects(state, effects), instruction)
+            }
+            summaries::Effects::TyParamsCall(instantiation, effect, instantiation_application) => {
+                let (fh_idx, instantiation) = instantiation(&state);
+                let index = state.module.add_instantiation(instantiation);
+                let func_inst = FunctionInstantiation {
+                    handle: fh_idx,
+                    type_parameters: index,
+                };
+                let func_inst_idx = state.module.add_function_instantiation(func_inst);
+                let effects = effect(func_inst_idx);
+                let instruction = instantiation_application(func_inst_idx);
+                (apply_effects(state, effects), instruction)
+            }
+            summaries::Effects::NoTyParams(effects) => (apply_effects(state, effects), instruction),
+        }
+    }
+
+    /// Transition an abstract state, `state` to the next state and add the instruction
+    /// to the bytecode sequence
+    pub fn apply_instruction(
+        &self,
+        fn_context: &mut FunctionGenerationContext,
+        mut state: AbstractState,
+        bytecode: &mut Vec<Bytecode>,
+        instruction: Bytecode,
+        exact: bool,
+    ) -> Option<AbstractState> {
+        // Bytecode will never be generated this large
+        debug_assert!(bytecode.len() < usize::max_value());
+        debug!("**********************");
+        debug!("State1: {}", state);
+        debug!("Next instr: {:?}", instruction);
+        let step = self.abstract_step(state, instruction, exact);
+        state = step.0;
+        let instruction = step.1;
+        debug!("Affected: {}", state);
+        debug!("Actual instr: {:?}", instruction);
+        if let Bytecode::Call(index) = instruction {
+            state
+                .call_graph
+                .add_call(fn_context.function_handle_index, index);
+        }
+        bytecode.push(instruction);
+        fn_context.incr_instruction_count()?;
+        debug!("**********************\n");
+        Some(state)
+    }
+
+    /// Given a valid starting state `abstract_state_in`, generate a valid sequence of
+    /// bytecode instructions such that `abstract_state_out` is reached.
+    pub fn generate_block(
+        &mut self,
+        fn_context: &mut FunctionGenerationContext,
+        abstract_state_in: AbstractState,
+        abstract_state_out: AbstractState,
+        module: &CompiledModule,
+    ) -> Option<(Vec<Bytecode>, AbstractState)> {
+        debug!("Abstract state in: {}", abstract_state_in);
+        debug!("Abstract state out: {}", abstract_state_out);
+        let mut bytecode: Vec<Bytecode> = Vec::new();
+        let mut state = abstract_state_in.clone();
+        // Generate block body
+        loop {
+            let candidates = self.candidate_instructions(fn_context, state.clone(), module.clone());
+            if candidates.is_empty() {
+                warn!("No candidates found for state: [{:?}]", state);
+                break;
+            }
+            match self.select_candidate(0, &state, &candidates) {
+                Ok(next_instruction) => {
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        next_instruction,
+                        false,
+                    )?;
+                    if state.is_final() {
+                        break;
+                    } else if state.has_aborted() {
+                        state = self.apply_instruction(
+                            fn_context,
+                            state,
+                            &mut bytecode,
+                            Bytecode::LdU64(0),
+                            true,
+                        )?;
+                        state = self.apply_instruction(
+                            fn_context,
+                            state,
+                            &mut bytecode,
+                            Bytecode::Abort,
+                            true,
+                        )?;
+                        return Some((bytecode, state));
+                    }
+                }
+                Err(err) => {
+                    // Could not complete the bytecode sequence; reset to empty
+                    error!("{}", err);
+                    return Some((Vec::new(), abstract_state_in));
+                }
+            }
+        }
+        // Fix local availability
+        for (i, (abstract_value, target_availability)) in abstract_state_out.get_locals().iter() {
+            if let Some((_, current_availability)) = state.local_get(*i) {
+                if *target_availability == BorrowState::Available
+                    && *current_availability == BorrowState::Unavailable
+                {
+                    let next_instructions =
+                        Self::inhabit_with_bytecode_seq(&mut state.module, &abstract_value.token);
+                    debug!(
+                        "local availability instructions: {:#?} for token {:#?}",
+                        next_instructions, &abstract_value.token
+                    );
+                    if next_instructions.len() >= INHABITATION_INSTRUCTION_LIMIT {
+                        return None;
+                    }
+                    state =
+                        next_instructions
+                            .into_iter()
+                            .try_fold(state, |state, instruction| {
+                                self.apply_instruction(
+                                    fn_context,
+                                    state,
+                                    &mut bytecode,
+                                    instruction,
+                                    true,
+                                )
+                            })?;
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::StLoc(*i as u8),
+                        true,
+                    )?;
+                } else if *target_availability == BorrowState::Unavailable
+                    && *current_availability == BorrowState::Available
+                {
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::MoveLoc(*i as u8),
+                        true,
+                    )?;
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::Pop,
+                        true,
+                    )?;
+                }
+            } else {
+                unreachable!("Target locals out contains new local");
+            }
+        }
+        // Update the module to be the module that we've been building in our abstract state
+        Some((bytecode, state))
+    }
+
+    /// Generate the body of a function definition given a set of starting `locals` and a target
+    /// return `signature`. The sequence should contain at least `target_min` and at most
+    /// `target_max` instructions.
+    pub fn generate(
+        &mut self,
+        fn_context: &mut FunctionGenerationContext,
+        locals: &[SignatureToken],
+        fh: &FunctionHandle,
+        acquires_global_resources: &[StructDefinitionIndex],
+        module: &mut CompiledModule,
+        call_graph: &mut CallGraph,
+    ) -> Option<Vec<Bytecode>> {
+        let number_of_blocks = self.rng.gen_range(1..=MAX_CFG_BLOCKS);
+        // The number of basic blocks must be at least one based on the
+        // generation range.
+        debug_assert!(number_of_blocks > 0);
+        let mut cfg = CFG::new(
+            self.rng,
+            locals,
+            &module.signatures[fh.parameters.0 as usize],
+            number_of_blocks,
+        );
+        let cfg_copy = cfg.clone();
+        for (block_id, block) in cfg.get_basic_blocks_mut().iter_mut() {
+            debug!(
+                "+++++++++++++++++ Starting new block: {} +++++++++++++++++",
+                block_id
+            );
+            let state1 = AbstractState::from_locals(
+                module.clone(),
+                block.get_locals_in().clone(),
+                fh.type_parameters.clone(),
+                acquires_global_resources.to_vec(),
+                call_graph.clone(),
+            );
+            let state2 = AbstractState::from_locals(
+                module.clone(),
+                block.get_locals_out().clone(),
+                fh.type_parameters.clone(),
+                acquires_global_resources.to_vec(),
+                call_graph.clone(),
+            );
+            let (mut bytecode, mut state_f) =
+                self.generate_block(fn_context, state1, state2.clone(), module)?;
+            state_f.allow_control_flow();
+            if !state_f.has_aborted() {
+                state_f = if cfg_copy.num_children(*block_id) == 2 {
+                    // BrTrue, BrFalse: Add bool and branching instruction randomly
+                    state_f = self.apply_instruction(
+                        fn_context,
+                        state_f,
+                        &mut bytecode,
+                        Bytecode::LdFalse,
+                        true,
+                    )?;
+                    if self.rng.gen_bool(0.5) {
+                        self.apply_instruction(
+                            fn_context,
+                            state_f,
+                            &mut bytecode,
+                            Bytecode::BrTrue(0),
+                            true,
+                        )?
+                    } else {
+                        self.apply_instruction(
+                            fn_context,
+                            state_f,
+                            &mut bytecode,
+                            Bytecode::BrFalse(0),
+                            true,
+                        )?
+                    }
+                } else if cfg_copy.num_children(*block_id) == 1 {
+                    // Branch: Add branch instruction
+                    self.apply_instruction(
+                        fn_context,
+                        state_f,
+                        &mut bytecode,
+                        Bytecode::Branch(0),
+                        true,
+                    )?
+                } else if cfg_copy.num_children(*block_id) == 0 {
+                    // Return: Add return types to last block
+                    for token_type in module.signatures[fh.return_.0 as usize].0.iter() {
+                        let next_instructions =
+                            Self::inhabit_with_bytecode_seq(&mut state_f.module, token_type);
+                        debug!(
+                            "Return value instructions: {:#?} for token {:#?}",
+                            next_instructions, &token_type
+                        );
+                        state_f = next_instructions.into_iter().try_fold(
+                            state_f,
+                            |state_f, instruction| {
+                                self.apply_instruction(
+                                    fn_context,
+                                    state_f,
+                                    &mut bytecode,
+                                    instruction,
+                                    true,
+                                )
+                            },
+                        )?;
+                    }
+                    self.apply_instruction(fn_context, state_f, &mut bytecode, Bytecode::Ret, true)?
+                } else {
+                    state_f
+                };
+            }
+            block.set_instructions(bytecode);
+            *module = state_f.module.instantiate();
+            *call_graph = state_f.call_graph;
+        }
+        // The CFG will be non-empty if we set the number of basic blocks to generate
+        // to be non-zero
+        debug_assert!(number_of_blocks > 0 || cfg.get_basic_blocks().is_empty());
+        Some(cfg.serialize())
+    }
+
+    pub fn generate_module(&mut self, mut module: CompiledModule) -> Option<CompiledModule> {
+        let mut fdefs = module.function_defs.clone();
+        let mut call_graph = CallGraph::new(module.function_handles.len());
+        for fdef in fdefs.iter_mut() {
+            if let Some(code) = &mut fdef.code {
+                let f_handle = &module.function_handles[fdef.function.0 as usize].clone();
+                let locals_sigs = module.signatures[code.locals.0 as usize].0.clone();
+                let mut fn_context = FunctionGenerationContext::new(
+                    fdef.function,
+                    call_graph.max_calling_depth(fdef.function),
+                    locals_sigs.len(),
+                    0,
+                );
+                code.code = self.generate(
+                    &mut fn_context,
+                    &locals_sigs,
+                    f_handle,
+                    &fdef.acquires_global_resources,
+                    &mut module,
+                    &mut call_graph,
+                )?;
+            }
+        }
+        module.function_defs = fdefs;
+        Some(module)
+    }
+
+    /// Generate a sequence of instructions whose overall effect is to push a single value of type token
+    /// on the stack, specifically without consuming any values that existed on the stack prior to the
+    /// execution of the instruction sequence.
+    pub fn inhabit_with_bytecode_seq(
+        module: &mut InstantiableModule,
+        token: &SignatureToken,
+    ) -> Vec<Bytecode> {
+        match token {
+            SignatureToken::Address => vec![Bytecode::LdConst(ConstantPoolIndex(0))],
+            SignatureToken::U64 => vec![Bytecode::LdU64(0)],
+            SignatureToken::U8 => vec![Bytecode::LdU8(0)],
+            SignatureToken::U128 => vec![Bytecode::LdU128(0)],
+            SignatureToken::U16 => vec![Bytecode::LdU16(0)],
+            SignatureToken::U32 => vec![Bytecode::LdU32(0)],
+            SignatureToken::U256 => vec![Bytecode::LdU256(U256::zero())],
+            SignatureToken::Bool => vec![Bytecode::LdFalse],
+            SignatureToken::Struct(handle_idx) => {
+                let struct_def_idx = module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .position(|struct_def| struct_def.struct_handle == *handle_idx)
+                    .expect(
+                        "struct def should exist for every struct handle in the test generator",
+                    );
+                let struct_def = module
+                    .module
+                    .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
+                let fields = match &struct_def.field_information {
+                    StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::Declared(fields) => fields.clone(),
+                };
+                let mut bytecodes: Vec<Bytecode> = fields
+                    .iter()
+                    .flat_map(|field| {
+                        let field_sig_tok = &field.signature.0;
+                        Self::inhabit_with_bytecode_seq(module, field_sig_tok)
+                    })
+                    .collect();
+                bytecodes.push(Bytecode::Pack(StructDefinitionIndex(
+                    struct_def_idx as TableIndex,
+                )));
+                bytecodes
+            }
+            SignatureToken::StructInstantiation(handle_idx, instantiation) => {
+                let struct_def_idx = module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .position(|struct_def| struct_def.struct_handle == *handle_idx)
+                    .expect(
+                        "struct def should exist for every struct handle in the test generator",
+                    );
+                let struct_def = module
+                    .module
+                    .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
+                let fields = match &struct_def.field_information {
+                    StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::Declared(fields) => fields.clone(),
+                };
+                let mut bytecodes: Vec<Bytecode> = fields
+                    .iter()
+                    .flat_map(|field| {
+                        let field_sig_tok = &field.signature.0;
+                        let reified_field_sig_tok = substitute(field_sig_tok, instantiation);
+                        Self::inhabit_with_bytecode_seq(module, &reified_field_sig_tok)
+                    })
+                    .collect();
+                let instantiation_index = module.add_instantiation(instantiation.clone());
+                let struct_inst = StructDefInstantiation {
+                    def: StructDefinitionIndex(struct_def_idx as TableIndex),
+                    type_parameters: instantiation_index,
+                };
+                let si_idx = module.add_struct_instantiation(struct_inst);
+                bytecodes.push(Bytecode::PackGeneric(StructDefInstantiationIndex(
+                    si_idx.0 as TableIndex,
+                )));
+                bytecodes
+            }
+            SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => {
+                unimplemented!("Unsupported inhabitation. Type: {:#?}", token)
+            }
+        }
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/config.rs b/vendors/move/crates/test-generation/src/config.rs
new file mode 100644
index 000000000..f513dee9d
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/config.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Parser;
+use module_generation::ModuleGeneratorOptions;
+
+/// This defines how tolerant the generator will be about deviating from
+/// the starting stack height.
+/// Default is `0.9`
+pub const MUTATION_TOLERANCE: f32 = 0.9;
+
+/// This defines the maximum number of blocks that will be generated for
+/// a function body's CFG. During generation, a random number of blocks from
+/// 1 to this constant will be created.
+/// Default is `10`
+pub const MAX_CFG_BLOCKS: u16 = 10;
+
+/// Whether preconditions will be negated to generate invalid programs
+/// in order to test error paths.
+/// Default is `false`
+pub const NEGATE_PRECONDITIONS: bool = false;
+
+/// The probability that preconditions will be negated for a pariticular
+/// bytecode instruction.
+/// Default is `0.1`
+pub const NEGATION_PROBABILITY: f64 = 0.1;
+
+/// Whether generation of instructions that require borrow checking will
+/// be allowed. (Note that if `NEGATE_PRECONDITIONS` is true then these
+/// instructions can still come up).
+/// Default is `false`
+pub const ALLOW_MEMORY_UNSAFE: bool = false;
+
+/// Whether the generated programs should be run on the VM
+/// Default is `true`
+pub const RUN_ON_VM: bool = true;
+
+/// Whether generated modules will be executed even if they fail the
+/// the bytecode verifier.
+/// Default is `false`
+pub const EXECUTE_UNVERIFIED_MODULE: bool = false;
+
+/// Whether gas will be metered when running generated programs. The default
+/// is `true` to bound the execution time.
+/// Default is `true`
+pub const GAS_METERING: bool = true;
+
+/// Call stack height limit. This is defined in the VM, and is replicated here. This should track
+/// that constant.
+pub const CALL_STACK_LIMIT: usize = 1024;
+
+/// The value stack size limit. This is defined in the VM and is replicated here. This should
+/// remain in sync with the constant for this defined in the VM.
+pub const VALUE_STACK_LIMIT: usize = 1024;
+
+/// Certain randomly generated types can lead to extremely long instruction sequences. This can
+/// lead to test generation taking quite a while in order to handle all of these. This parameter
+/// bounds the maximum allowable instruction length for a type. If the instruction sequence is
+/// larger then this, a new module and bytecode generation will be attempted.
+pub const INHABITATION_INSTRUCTION_LIMIT: usize = 1000;
+
+/// The module generation settings that are used for generation module scaffolding for bytecode
+/// generation.
+pub fn module_generation_settings() -> ModuleGeneratorOptions {
+    ModuleGeneratorOptions {
+        min_table_size: 10,
+        // The more structs, and the larger the number of type parameters the more complex the
+        // functions and bytecode sequences generated. Be careful about setting these parameters too
+        // large -- this can lead to expontial increases in the size and number of struct
+        // instantiations that can be generated.
+        max_ty_params: 4,
+        max_functions: 6,
+        max_fields: 10,
+        max_structs: 6,
+        args_for_ty_params: true,
+        references_allowed: false,
+        // Test generation cannot currently cope with resources
+        add_resources: false,
+        ..Default::default()
+    }
+}
+
+/// Command line arguments for the tool
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+pub struct Args {
+    /// The optional number of programs that will be generated. If not specified, program
+    /// generation will run infinitely.
+    #[clap(short = 'i', long = "iterations")]
+    pub num_iterations: Option<u64>,
+
+    /// Path where a serialized module should be saved.
+    /// If `None`, then the module will just be printed out.
+    #[clap(short = 'o', long = "output")]
+    pub output_path: Option<String>,
+
+    /// The optional seed used for test generation.
+    #[clap(short = 's', long = "seed")]
+    pub seed: Option<String>,
+
+    /// The optional number of threads to use for test generation.
+    #[clap(short = 't', long = "threads")]
+    pub num_threads: Option<u64>,
+}
diff --git a/vendors/move/crates/test-generation/src/control_flow_graph.rs b/vendors/move/crates/test-generation/src/control_flow_graph.rs
new file mode 100644
index 000000000..78100aa71
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/control_flow_graph.rs
@@ -0,0 +1,390 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::abstract_state::{AbstractValue, BorrowState};
+use move_binary_format::file_format::{AbilitySet, Bytecode, Signature, SignatureToken};
+use rand::{rngs::StdRng, Rng};
+use std::collections::{HashMap, VecDeque};
+use tracing::debug;
+
+/// This type holds basic block identifiers
+type BlockIDSize = u16;
+
+/// This type represents the locals that a basic block has
+type BlockLocals = HashMap<usize, (AbstractValue, BorrowState)>;
+
+/// This represents a basic block in a control flow graph
+#[derive(Debug, Default, Clone)]
+pub struct BasicBlock {
+    /// The starting locals
+    locals_in: BlockLocals,
+
+    /// The locals at the end of the block
+    locals_out: BlockLocals,
+
+    /// The instructions that comprise the block
+    instructions: Vec<Bytecode>,
+}
+
+impl BasicBlock {
+    pub fn new() -> BasicBlock {
+        BasicBlock {
+            locals_in: HashMap::new(),
+            locals_out: HashMap::new(),
+            instructions: Vec::new(),
+        }
+    }
+
+    /// Get the locals coming into the block
+    pub fn get_locals_in(&self) -> &BlockLocals {
+        &self.locals_in
+    }
+
+    /// Get the locals going out of the block
+    pub fn get_locals_out(&self) -> &BlockLocals {
+        &self.locals_out
+    }
+
+    /// Set the list of instructions that comprise the block
+    pub fn set_instructions(&mut self, instructions: Vec<Bytecode>) {
+        self.instructions = instructions
+    }
+}
+
+/// A control flow graph
+#[derive(Debug, Clone)]
+pub struct CFG {
+    /// The set of basic blocks that make up the graph, mapped to `BlockIDSize`'s used
+    /// as their identifiers
+    basic_blocks: HashMap<BlockIDSize, BasicBlock>,
+
+    /// The directed edges of the graph represented by pairs of basic block identifiers
+    edges: Vec<(BlockIDSize, BlockIDSize)>,
+}
+
+impl CFG {
+    /// Construct a control flow graph that contains empty basic blocks with set incoming
+    /// and outgoing locals.
+    /// Currently the control flow graph is acyclic.
+    pub fn new(
+        rng: &mut StdRng,
+        locals: &[SignatureToken],
+        parameters: &Signature,
+        target_blocks: BlockIDSize,
+    ) -> CFG {
+        assert!(target_blocks > 0, "The CFG must haave at least one block");
+        let mut basic_blocks: HashMap<BlockIDSize, BasicBlock> = HashMap::new();
+        // Generate basic blocks
+        for i in 0..target_blocks {
+            basic_blocks.insert(i, BasicBlock::new());
+        }
+        // Generate control flow edges
+        let mut edges: Vec<(BlockIDSize, BlockIDSize)> = Vec::new();
+        let mut block_queue: VecDeque<BlockIDSize> = VecDeque::new();
+        let mut current_block_id = 0;
+
+        block_queue.push_back(current_block_id);
+        current_block_id += 1;
+
+        while current_block_id < target_blocks && !block_queue.is_empty() {
+            let front_block = block_queue.pop_front();
+            // `front_block` will be `Some` because the block queue is not empty
+            debug_assert!(front_block.is_some());
+            let parent_block_id = front_block.unwrap();
+            // The number of edges will be at most `2*target_blocks``
+            // Since target blocks is at most a `u16`, this will not overflow even if
+            // `usize` is a `u32`
+            debug_assert!(edges.len() < usize::max_value());
+            edges.push((parent_block_id, current_block_id));
+            block_queue.push_back(current_block_id);
+            // `current_block_id` is bound by the max og `target_block_size`
+            debug_assert!(current_block_id < u16::max_value());
+            current_block_id += 1;
+            // Generate a second child edge with prob = 1/2
+            if rng.gen_bool(0.5) && current_block_id < target_blocks {
+                // The number of edges will be at most `2*target_blocks``
+                // Since target blocks is at most a `u16`, this will not overflow even if
+                // `usize` is a `u32`
+                debug_assert!(edges.len() < usize::max_value());
+                edges.push((parent_block_id, current_block_id));
+                block_queue.push_back(current_block_id);
+                // `current_block_id` is bound by the max og `target_block_size`
+                debug_assert!(current_block_id < u16::max_value());
+                current_block_id += 1;
+            }
+        }
+
+        // Connect remaining blocks to return
+        while !block_queue.is_empty() {
+            let front_block = block_queue.pop_front();
+            // `front_block` will be `Some` because the block queue is not empty
+            debug_assert!(front_block.is_some());
+            let parent_block_id = front_block.unwrap();
+            // By the precondition of the function
+            debug_assert!(target_blocks > 0);
+            if parent_block_id != target_blocks - 1 {
+                edges.push((parent_block_id, target_blocks - 1));
+            }
+        }
+        debug!("Edges: {:?}", edges);
+
+        // Build the CFG
+        let mut cfg = CFG {
+            basic_blocks,
+            edges,
+        };
+        // Assign locals to basic blocks
+        debug_assert!(target_blocks == 0 || !cfg.basic_blocks.is_empty());
+        CFG::add_locals(&mut cfg, rng, locals, parameters.0.len());
+        cfg
+    }
+
+    /// Get a reference to all of the basic blocks of the CFG
+    pub fn get_basic_blocks(&self) -> &HashMap<BlockIDSize, BasicBlock> {
+        &self.basic_blocks
+    }
+
+    /// Get a mutable reference to all of the basic blocks of the CFG
+    pub fn get_basic_blocks_mut(&mut self) -> &mut HashMap<BlockIDSize, BasicBlock> {
+        &mut self.basic_blocks
+    }
+
+    /// Retrieve the block IDs of all children of the given basic block `block_id`
+    pub fn get_children_ids(&self, block_id: BlockIDSize) -> Vec<BlockIDSize> {
+        let mut children_ids: Vec<BlockIDSize> = Vec::new();
+        for (parent, child) in self.edges.iter() {
+            if *parent == block_id {
+                // Length is bound by iteration on `self.edges`
+                debug_assert!(children_ids.len() < usize::max_value());
+                children_ids.push(*child);
+            }
+        }
+        children_ids
+    }
+
+    /// Retrieve the number of children the given basic block `block_id`
+    pub fn num_children(&self, block_id: BlockIDSize) -> u8 {
+        // A `u8` is sufficient; blocks will have at most two children
+        self.get_children_ids(block_id).len() as u8
+    }
+
+    /// Retrieve the block IDs of all parents of the given basic block `block_id`
+    pub fn get_parent_ids(&self, block_id: BlockIDSize) -> Vec<BlockIDSize> {
+        let mut parent_ids: Vec<BlockIDSize> = Vec::new();
+        for (parent, child) in self.edges.iter() {
+            if *child == block_id {
+                // Iteration is bound by the self.edges vector length
+                debug_assert!(parent_ids.len() < usize::max_value());
+                parent_ids.push(*parent);
+            }
+        }
+        parent_ids
+    }
+
+    /// Retrieve the number of parents the given basic block `block_id`
+    pub fn num_parents(&self, block_id: BlockIDSize) -> u8 {
+        // A `u8` is sufficient; blocks will have at most two children
+        self.get_parent_ids(block_id).len() as u8
+    }
+
+    /// Merge the outgoing locals of a set of blocks
+    fn merge_locals(&self, block_ids: Vec<BlockIDSize>) -> BlockLocals {
+        assert!(
+            !block_ids.is_empty(),
+            "Cannot merge locals of empty block list"
+        );
+        let first_basic_block = self.basic_blocks.get(&block_ids[0]);
+        // Implication of preconditon
+        debug_assert!(first_basic_block.is_some());
+        let first_basic_block_locals_out = &first_basic_block.unwrap().locals_out;
+        let locals_len = first_basic_block_locals_out.len();
+        let mut locals_out = BlockLocals::new();
+        for local_index in 0..locals_len {
+            let abstract_value = first_basic_block_locals_out[&local_index].0.clone();
+            let mut availability = BorrowState::Available;
+            for block_id in block_ids.iter() {
+                // A local is available for a block if it is available in every
+                // parent's outgoing locals
+                let basic_block = self.basic_blocks.get(block_id);
+                // Every block ID in the sequence should be valid
+                debug_assert!(basic_block.is_some());
+                if basic_block.unwrap().locals_out[&local_index].1 == BorrowState::Unavailable {
+                    availability = BorrowState::Unavailable;
+                }
+            }
+            locals_out.insert(local_index, (abstract_value, availability));
+        }
+        locals_out
+    }
+
+    /// Randomly vary the availability of locals
+    fn vary_locals(rng: &mut StdRng, locals: BlockLocals) -> BlockLocals {
+        let mut locals = locals;
+        for (_, (abstr_val, availability)) in locals.iter_mut() {
+            if rng.gen_bool(0.5) {
+                if *availability == BorrowState::Available {
+                    *availability = BorrowState::Unavailable;
+                } else {
+                    *availability = BorrowState::Available;
+                }
+            }
+
+            if abstr_val.is_generic() {
+                *availability = BorrowState::Unavailable;
+            }
+        }
+        locals
+    }
+
+    /// Add the incoming and outgoing locals for each basic block in the control flow graph.
+    /// Currently the incoming and outgoing locals are the same for each block.
+    fn add_locals(cfg: &mut CFG, rng: &mut StdRng, locals: &[SignatureToken], args_len: usize) {
+        debug_assert!(
+            !cfg.basic_blocks.is_empty(),
+            "Cannot add locals to empty cfg"
+        );
+        debug!("add locals: {:#?}", locals);
+        for block_id in 0..cfg.basic_blocks.len() {
+            let cfg_copy = cfg.clone();
+            let basic_block = cfg
+                .basic_blocks
+                .get_mut(&(block_id as BlockIDSize))
+                .unwrap();
+            if cfg_copy.num_parents(block_id as BlockIDSize) == 0 {
+                basic_block.locals_in = locals
+                    .iter()
+                    .enumerate()
+                    .map(|(i, token)| {
+                        let borrow_state = if i < args_len {
+                            BorrowState::Available
+                        } else {
+                            BorrowState::Unavailable
+                        };
+                        (
+                            i,
+                            (
+                                AbstractValue::new_value(token.clone(), AbilitySet::PRIMITIVES),
+                                borrow_state,
+                            ),
+                        )
+                    })
+                    .collect();
+            } else {
+                // Implication of precondition
+                debug_assert!(!cfg_copy.basic_blocks.is_empty());
+                basic_block.locals_in =
+                    cfg_copy.merge_locals(cfg_copy.get_parent_ids(block_id as BlockIDSize));
+            }
+            basic_block.locals_out = CFG::vary_locals(rng, basic_block.locals_in.clone());
+        }
+    }
+
+    /// Decide the serialization order of the blocks in the CFG
+    pub fn serialize_block_order(&self) -> Vec<BlockIDSize> {
+        let mut block_order: Vec<BlockIDSize> = Vec::new();
+        let mut block_queue: VecDeque<BlockIDSize> = VecDeque::new();
+        block_queue.push_back(0);
+        while !block_queue.is_empty() {
+            let block_id_front = block_queue.pop_front();
+            // The queue is non-empty so the front block id will not be none
+            debug_assert!(block_id_front.is_some());
+            let block_id = block_id_front.unwrap();
+            let child_ids = self.get_children_ids(block_id);
+            if child_ids.len() == 2 {
+                block_queue.push_front(child_ids[0]);
+                block_queue.push_back(child_ids[1]);
+            } else if child_ids.len() == 1 {
+                block_queue.push_back(child_ids[0]);
+            } else if !child_ids.is_empty() {
+                // We construct the CFG such that blocks have either 0, 1, or 2
+                // children.
+                unreachable!(
+                    "Invalid number of children for basic block {:?}",
+                    child_ids.len()
+                );
+            }
+            // This operation is expensive but is performed just when
+            // serializing the module.
+            if !block_order.contains(&block_id) {
+                block_order.push(block_id);
+            }
+        }
+        debug!("Block order: {:?}", block_order);
+        block_order
+    }
+
+    /// Get the serialized code offset of a basic block based on its position in the serialized
+    /// instruction sequence.
+    fn get_block_offset(cfg: &CFG, block_order: &[BlockIDSize], block_id: BlockIDSize) -> u16 {
+        assert!(
+            (0..block_id).all(|id| cfg.basic_blocks.get(&id).is_some()),
+            "Error: Invalid block_id given"
+        );
+        let mut offset: u16 = 0;
+        for i in block_order {
+            if *i == block_id {
+                break;
+            }
+            if let Some(block) = cfg.basic_blocks.get(i) {
+                offset += block.instructions.len() as u16;
+            }
+        }
+        offset
+    }
+
+    /// Serialize the control flow graph into a sequence of instructions. Set the offsets of branch
+    /// instructions appropriately.
+    pub fn serialize(&mut self) -> Vec<Bytecode> {
+        assert!(
+            !self.basic_blocks.is_empty(),
+            "Error: CFG has no basic blocks"
+        );
+        let cfg_copy = self.clone();
+        let mut bytecode: Vec<Bytecode> = Vec::new();
+        let block_order = self.serialize_block_order();
+        for block_id in &block_order {
+            let block = self.basic_blocks.get_mut(block_id);
+            // The generated block order contains every block
+            debug_assert!(block.is_some());
+            let block = block.unwrap();
+            // All basic blocks should have instructions filled in at this point
+            assert!(
+                !block.instructions.is_empty(),
+                "Error: block created with no instructions",
+            );
+            let last_instruction_index = block.instructions.len() - 1;
+            let child_ids = cfg_copy.get_children_ids(*block_id);
+            if child_ids.len() == 2 {
+                // The left child (fallthrough) is serialized before the right (jump)
+                let offset = CFG::get_block_offset(&cfg_copy, &block_order, child_ids[1]);
+                match block.instructions.last() {
+                    Some(Bytecode::BrTrue(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::BrTrue(offset);
+                    }
+                    Some(Bytecode::BrFalse(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::BrFalse(offset);
+                    }
+                    _ => unreachable!(
+                        "Error: unsupported two target jump instruction, {:#?}",
+                        block.instructions.last()
+                    ),
+                };
+            } else if child_ids.len() == 1 {
+                let offset = CFG::get_block_offset(&cfg_copy, &block_order, child_ids[0]);
+                match block.instructions.last() {
+                    Some(Bytecode::Branch(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::Branch(offset);
+                    }
+                    _ => unreachable!(
+                        "Error: unsupported one target jump instruction, {:#?}",
+                        block.instructions.last()
+                    ),
+                }
+            }
+            bytecode.extend(block.instructions.clone());
+        }
+        debug!("Final bytecode: {:#?}", bytecode);
+        bytecode
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/error.rs b/vendors/move/crates/test-generation/src/error.rs
new file mode 100644
index 000000000..5c06c1a33
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/error.rs
@@ -0,0 +1,24 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt;
+
+/// This struct represents an error that is returned during the
+/// testcase generation process.
+#[derive(Debug)]
+pub struct VMError {
+    message: String,
+}
+
+impl VMError {
+    pub fn new(message: String) -> VMError {
+        VMError { message }
+    }
+}
+
+impl fmt::Display for VMError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/lib.rs b/vendors/move/crates/test-generation/src/lib.rs
new file mode 100644
index 000000000..221fa03e8
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/lib.rs
@@ -0,0 +1,497 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod abstract_state;
+pub mod borrow_graph;
+pub mod bytecode_generator;
+pub mod config;
+pub mod control_flow_graph;
+pub mod error;
+pub mod summaries;
+pub mod transitions;
+
+use crate::config::{Args, EXECUTE_UNVERIFIED_MODULE, RUN_ON_VM};
+use bytecode_generator::BytecodeGenerator;
+use crossbeam_channel::{bounded, unbounded, Receiver, Sender};
+use getrandom::getrandom;
+use module_generation::generate_module;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken, StructHandleIndex,
+    },
+};
+use move_bytecode_verifier::verify_module_unmetered;
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    language_storage::TypeTag,
+    resolver::MoveResolver,
+    runtime_value::MoveValue,
+    vm_status::{StatusCode, VMStatus},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
+use move_vm_types::gas::UnmeteredGasMeter;
+use once_cell::sync::Lazy;
+use rand::{rngs::StdRng, Rng, SeedableRng};
+use std::{fs, io::Write, panic, thread};
+use tracing::{debug, error, info};
+
+/// This function calls the Bytecode verifier to test it
+fn run_verifier(module: CompiledModule) -> Result<CompiledModule, String> {
+    match verify_module_unmetered(&module) {
+        Ok(_) => Ok(module),
+        Err(err) => Err(format!("Module verification failed: {:#?}", err)),
+    }
+}
+
+static STORAGE_WITH_MOVE_STDLIB: Lazy<InMemoryStorage> = Lazy::new(|| {
+    let mut storage = InMemoryStorage::new();
+    let (_, compiled_units) = Compiler::from_files(
+        move_stdlib::move_stdlib_files(),
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()
+    .unwrap();
+    let compiled_modules = compiled_units.into_iter().map(|unit| match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => annot_module.named_module.module,
+        AnnotatedCompiledUnit::Script(_) => panic!("Unexpected Script in stdlib"),
+    });
+    for module in compiled_modules {
+        let mut blob = vec![];
+        module.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(module.self_id(), blob);
+    }
+    storage
+});
+
+/// This function runs a verified module in the VM runtime
+fn run_vm(module: CompiledModule) -> Result<(), VMStatus> {
+    // By convention the 0'th index function definition is the entrypoint to the module (i.e. that
+    // will contain only simply-typed arguments).
+    let entry_idx = FunctionDefinitionIndex::new(0);
+    let function_signature = {
+        let handle = module.function_def_at(entry_idx).function;
+        let sig_idx = module.function_handle_at(handle).parameters;
+        module.signature_at(sig_idx).clone()
+    };
+    let main_args: Vec<Vec<u8>> = function_signature
+        .0
+        .iter()
+        .map(|sig_tok| match sig_tok {
+            SignatureToken::Address => MoveValue::Address(AccountAddress::ZERO)
+                .simple_serialize()
+                .unwrap(),
+            SignatureToken::U64 => MoveValue::U64(0).simple_serialize().unwrap(),
+            SignatureToken::Bool => MoveValue::Bool(true).simple_serialize().unwrap(),
+            SignatureToken::Vector(inner_tok) if **inner_tok == SignatureToken::U8 => {
+                MoveValue::Vector(vec![]).simple_serialize().unwrap()
+            }
+            SignatureToken::Vector(_)
+            | SignatureToken::U8
+            | SignatureToken::U128
+            | SignatureToken::Signer
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => unimplemented!("Unsupported argument type: {:#?}", sig_tok),
+        })
+        .collect();
+
+    execute_function_in_module(
+        module,
+        entry_idx,
+        vec![],
+        main_args,
+        &*STORAGE_WITH_MOVE_STDLIB,
+    )
+}
+
+/// Execute the first function in a module
+fn execute_function_in_module(
+    module: CompiledModule,
+    idx: FunctionDefinitionIndex,
+    ty_arg_tags: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    storage: &impl MoveResolver,
+) -> Result<(), VMStatus> {
+    let module_id = module.self_id();
+    let entry_name = {
+        let entry_func_idx = module.function_def_at(idx).function;
+        let entry_name_idx = module.function_handle_at(entry_func_idx).name;
+        module.identifier_at(entry_name_idx)
+    };
+    {
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+
+        let mut changeset = ChangeSet::new();
+        let mut blob = vec![];
+        module.serialize(&mut blob).unwrap();
+        changeset
+            .add_module_op(module_id.clone(), Op::New(blob))
+            .unwrap();
+        let delta_storage = DeltaStorage::new(storage, &changeset);
+        let mut sess = vm.new_session(&delta_storage);
+
+        let ty_args = ty_arg_tags
+            .into_iter()
+            .map(|tag| sess.load_type(&tag))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            entry_name,
+            ty_args,
+            args,
+            &mut UnmeteredGasMeter,
+        )?;
+
+        Ok(())
+    }
+}
+
+/// Serialize a module to `path` if `output_path` is `Some(path)`. If `output_path` is `None`
+/// print the module out as debug output.
+fn output_error_case(module: CompiledModule, output_path: Option<String>, case_id: u64, tid: u64) {
+    match output_path {
+        Some(path) => {
+            let mut out = vec![];
+            module
+                .serialize(&mut out)
+                .expect("Unable to serialize module");
+            let output_file = format!("{}/case{}_{}.module", path, tid, case_id);
+            let mut f = fs::File::create(output_file)
+                .unwrap_or_else(|err| panic!("Unable to open output file {}: {}", &path, err));
+            f.write_all(&out)
+                .unwrap_or_else(|err| panic!("Unable to write to output file {}: {}", &path, err));
+        }
+        None => {
+            debug!("{:#?}", module);
+        }
+    }
+}
+
+fn seed(seed: Option<String>) -> [u8; 32] {
+    let mut array = [0u8; 32];
+    match seed {
+        Some(string) => {
+            let vec = hex::decode(string).unwrap();
+            if vec.len() != 32 {
+                panic!("Invalid seed supplied, the length must be 32.");
+            }
+            for (i, byte) in vec.into_iter().enumerate() {
+                array[i] = byte;
+            }
+        }
+        None => {
+            getrandom(&mut array).unwrap();
+        }
+    };
+    array
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Status {
+    VerificationFailure,
+    ExecutionFailure,
+    Valid,
+}
+
+fn bytecode_module(rng: &mut StdRng, module: CompiledModule) -> CompiledModule {
+    let mut generated_module = BytecodeGenerator::new(rng).generate_module(module.clone());
+    // Module generation can retry under certain circumstances
+    while generated_module.is_none() {
+        generated_module = BytecodeGenerator::new(rng).generate_module(module.clone());
+    }
+    generated_module.unwrap()
+}
+
+pub fn module_frame_generation(
+    num_iters: Option<u64>,
+    seed: [u8; 32],
+    sender: Sender<CompiledModule>,
+    stats: Receiver<Status>,
+) {
+    let mut verification_failures: u128 = 0;
+    let mut execution_failures: u128 = 0;
+    let mut generated: u128 = 1;
+
+    let generation_options = config::module_generation_settings();
+    let mut rng = StdRng::from_seed(seed);
+    let mut module = generate_module(&mut rng, generation_options.clone());
+    // Either get the number of iterations provided by the user, or iterate "infinitely"--up to
+    // u128::MAX number of times.
+    let iters = num_iters
+        .map(|x| x as u128)
+        .unwrap_or_else(|| std::u128::MAX);
+
+    while generated < iters && sender.send(module).is_ok() {
+        module = generate_module(&mut rng, generation_options.clone());
+        generated += 1;
+        while let Ok(stat) = stats.try_recv() {
+            match stat {
+                Status::VerificationFailure => verification_failures += 1,
+                Status::ExecutionFailure => execution_failures += 1,
+                _ => (),
+            };
+        }
+
+        if generated > 0 && generated % 100 == 0 {
+            info!(
+                "Generated: {} Verified: {} Executed: {}",
+                generated,
+                (generated - verification_failures),
+                (generated - execution_failures)
+            );
+        }
+    }
+
+    // Drop the sender channel to signal to the consumers that they should expect no more modules,
+    // and should finish up.
+    drop(sender);
+
+    // Gather final stats from the consumers.
+    while let Ok(stat) = stats.recv() {
+        match stat {
+            Status::VerificationFailure => verification_failures += 1,
+            Status::ExecutionFailure => execution_failures += 1,
+            _ => (),
+        };
+    }
+    info!(
+        "Final stats: Generated: {} Verified: {} Executed: {}",
+        generated,
+        (generated - verification_failures),
+        (generated - execution_failures)
+    );
+}
+
+pub fn bytecode_generation(
+    output_path: Option<String>,
+    tid: u64,
+    mut rng: StdRng,
+    receiver: Receiver<CompiledModule>,
+    stats: Sender<Status>,
+) {
+    while let Ok(module) = receiver.recv() {
+        let mut status = Status::VerificationFailure;
+        debug!("Generating module");
+        let module = bytecode_module(&mut rng, module);
+
+        debug!("Done...Running module on verifier...");
+        let verified_module = match run_verifier(module.clone()) {
+            Ok(verified_module) => {
+                status = Status::ExecutionFailure;
+                Some(verified_module)
+            }
+            Err(e) => {
+                error!("{}", e);
+                let uid = rng.gen::<u64>();
+                output_error_case(module.clone(), output_path.clone(), uid, tid);
+                if EXECUTE_UNVERIFIED_MODULE {
+                    Some(module.clone())
+                } else {
+                    None
+                }
+            }
+        };
+
+        if let Some(verified_module) = verified_module {
+            if RUN_ON_VM {
+                debug!("Done...Running module on VM...");
+                let execution_result = run_vm(verified_module);
+                match execution_result {
+                    Ok(_) => {
+                        status = Status::Valid;
+                    }
+                    Err(e) => match e.status_code() {
+                        StatusCode::ARITHMETIC_ERROR | StatusCode::OUT_OF_GAS => {
+                            status = Status::Valid;
+                        }
+                        _ => {
+                            error!("{}", e);
+                            let uid = rng.gen::<u64>();
+                            output_error_case(module.clone(), output_path.clone(), uid, tid);
+                        }
+                    },
+                }
+            } else {
+                status = Status::Valid;
+            }
+        };
+        stats.send(status).unwrap();
+    }
+
+    drop(stats);
+}
+
+/// Run generate_bytecode for the range passed in and test each generated module
+/// on the bytecode verifier.
+pub fn run_generation(args: Args) {
+    let num_threads = if let Some(num_threads) = args.num_threads {
+        num_threads as usize
+    } else {
+        num_cpus::get()
+    };
+    assert!(
+        num_threads > 0,
+        "Number of worker threads must be greater than 0"
+    );
+
+    let (sender, receiver) = bounded(num_threads);
+    let (stats_sender, stats_receiver) = unbounded();
+    let seed = seed(args.seed);
+
+    let mut threads = Vec::new();
+    for tid in 0..num_threads {
+        let receiver = receiver.clone();
+        let stats_sender = stats_sender.clone();
+        let rng = StdRng::from_seed(seed);
+        let output_path = args.output_path.clone();
+        threads.push(thread::spawn(move || {
+            bytecode_generation(output_path, tid as u64, rng, receiver, stats_sender)
+        }));
+    }
+
+    // Need to drop this channel otherwise we'll get infinite blocking since the other channels are
+    // cloned; this one will remain open unless we close it and other threads are going to block
+    // waiting for more stats.
+    drop(stats_sender);
+
+    let num_iters = args.num_iterations;
+    threads.push(thread::spawn(move || {
+        module_frame_generation(num_iters, seed, sender, stats_receiver)
+    }));
+
+    for thread in threads {
+        thread.join().unwrap();
+    }
+}
+
+pub(crate) fn substitute(token: &SignatureToken, tys: &[SignatureToken]) -> SignatureToken {
+    use SignatureToken::*;
+
+    match token {
+        Bool => Bool,
+        U8 => U8,
+        U16 => U16,
+        U32 => U32,
+        U64 => U64,
+        U128 => U128,
+        U256 => U256,
+        Address => Address,
+        Signer => Signer,
+        Vector(ty) => Vector(Box::new(substitute(ty, tys))),
+        Struct(idx) => Struct(*idx),
+        StructInstantiation(idx, type_params) => StructInstantiation(
+            *idx,
+            type_params.iter().map(|ty| substitute(ty, tys)).collect(),
+        ),
+        Reference(ty) => Reference(Box::new(substitute(ty, tys))),
+        MutableReference(ty) => MutableReference(Box::new(substitute(ty, tys))),
+        TypeParameter(idx) => {
+            // Assume that the caller has previously parsed and verified the structure of the
+            // file and that this guarantees that type parameter indices are always in bounds.
+            debug_assert!((*idx as usize) < tys.len());
+            tys[*idx as usize].clone()
+        }
+    }
+}
+
+pub fn abilities(
+    module: &impl ModuleAccess,
+    ty: &SignatureToken,
+    constraints: &[AbilitySet],
+) -> AbilitySet {
+    use SignatureToken::*;
+
+    match ty {
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => AbilitySet::PRIMITIVES,
+
+        Reference(_) | MutableReference(_) => AbilitySet::REFERENCES,
+        Signer => AbilitySet::SIGNER,
+        TypeParameter(idx) => constraints[*idx as usize],
+        Vector(ty) => AbilitySet::polymorphic_abilities(
+            AbilitySet::VECTOR,
+            vec![false],
+            vec![abilities(module, ty, constraints)],
+        )
+        .unwrap(),
+        Struct(idx) => {
+            let sh = module.struct_handle_at(*idx);
+            sh.abilities
+        }
+        StructInstantiation(idx, type_args) => {
+            let sh = module.struct_handle_at(*idx);
+            let declared_abilities = sh.abilities;
+            let declared_phantom_parameters =
+                sh.type_parameters.iter().map(|param| param.is_phantom);
+            let type_arguments = type_args
+                .iter()
+                .map(|arg| abilities(module, arg, constraints));
+            AbilitySet::polymorphic_abilities(
+                declared_abilities,
+                declared_phantom_parameters,
+                type_arguments,
+            )
+            .unwrap()
+        }
+    }
+}
+
+pub(crate) fn get_struct_handle_from_reference(
+    reference_signature: &SignatureToken,
+) -> Option<StructHandleIndex> {
+    match reference_signature {
+        SignatureToken::Reference(signature) => match **signature {
+            SignatureToken::StructInstantiation(idx, _) | SignatureToken::Struct(idx) => Some(idx),
+            _ => None,
+        },
+        SignatureToken::MutableReference(signature) => match **signature {
+            SignatureToken::StructInstantiation(idx, _) | SignatureToken::Struct(idx) => Some(idx),
+            _ => None,
+        },
+        _ => None,
+    }
+}
+
+pub(crate) fn get_type_actuals_from_reference(
+    token: &SignatureToken,
+) -> Option<Vec<SignatureToken>> {
+    use SignatureToken::*;
+
+    match token {
+        Reference(box_) | MutableReference(box_) => match &**box_ {
+            StructInstantiation(_, tys) => Some(tys.clone()),
+            Struct(_) => Some(vec![]),
+            _ => None,
+        },
+        Bool
+        | U8
+        | U64
+        | U128
+        | Address
+        | Signer
+        | Vector(_)
+        | Struct(_)
+        | StructInstantiation(_, _)
+        | TypeParameter(_)
+        | U16
+        | U32
+        | U256 => None,
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/main.rs b/vendors/move/crates/test-generation/src/main.rs
new file mode 100644
index 000000000..31a820a9e
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/main.rs
@@ -0,0 +1,18 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use test_generation::{config::Args, run_generation};
+
+fn setup_log() {
+    tracing::subscriber::set_global_default(tracing_subscriber::FmtSubscriber::new()).unwrap();
+}
+
+pub fn main() {
+    setup_log();
+    let args = Args::parse();
+    run_generation(args);
+}
diff --git a/vendors/move/crates/test-generation/src/summaries.rs b/vendors/move/crates/test-generation/src/summaries.rs
new file mode 100644
index 000000000..2376e6576
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/summaries.rs
@@ -0,0 +1,621 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abstract_state::{AbstractState, AbstractValue, BorrowState, Mutability},
+    error::VMError,
+    function_instantiation_for_state, state_control_flow, state_create_struct,
+    state_create_struct_from_inst, state_function_can_acquire_resource,
+    state_local_availability_is, state_local_exists, state_local_has_ability, state_local_place,
+    state_local_set, state_local_take, state_local_take_borrow, state_memory_safe, state_never,
+    state_register_dereference, state_stack_bin_op, state_stack_function_call,
+    state_stack_function_inst_call, state_stack_function_inst_popn, state_stack_function_popn,
+    state_stack_has, state_stack_has_ability, state_stack_has_integer,
+    state_stack_has_polymorphic_eq, state_stack_has_reference, state_stack_has_struct,
+    state_stack_has_struct_inst, state_stack_is_castable, state_stack_local_polymorphic_eq,
+    state_stack_pop, state_stack_push, state_stack_push_register, state_stack_push_register_borrow,
+    state_stack_ref_polymorphic_eq, state_stack_satisfies_function_inst_signature,
+    state_stack_satisfies_function_signature, state_stack_satisfies_struct_signature,
+    state_stack_struct_borrow_field, state_stack_struct_borrow_field_inst,
+    state_stack_struct_has_field, state_stack_struct_has_field_inst, state_stack_struct_inst_popn,
+    state_stack_struct_popn, state_stack_unpack_struct, state_stack_unpack_struct_inst,
+    state_struct_has_key, state_struct_inst_has_key, struct_instantiation_for_state,
+    transitions::*,
+    unpack_instantiation_for_state, with_ty_param,
+};
+use move_binary_format::file_format::{
+    Ability, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex, SignatureToken,
+    StructDefInstantiationIndex, StructDefinitionIndex,
+};
+
+/// A `Precondition` is a boolean predicate on an `AbstractState`.
+pub type Precondition = dyn Fn(&AbstractState) -> bool;
+
+/// A `Effect` is a function that transforms on `AbstractState` to another
+pub type NonInstantiableEffect = dyn Fn(&AbstractState) -> Result<AbstractState, VMError>;
+pub type InstantiableEffect =
+    dyn Fn(StructDefInstantiationIndex) -> Vec<Box<NonInstantiableEffect>>;
+pub type FunctionInstantiableEffect =
+    dyn Fn(FunctionInstantiationIndex) -> Vec<Box<NonInstantiableEffect>>;
+
+type Instantiation = dyn Fn(&AbstractState) -> (StructDefinitionIndex, Vec<SignatureToken>);
+type FunctionInstantiation = dyn Fn(&AbstractState) -> (FunctionHandleIndex, Vec<SignatureToken>);
+type InstantiableInstruction = dyn Fn(StructDefInstantiationIndex) -> Bytecode;
+type FunctionInstantiableInstruction = dyn Fn(FunctionInstantiationIndex) -> Bytecode;
+
+pub enum Effects {
+    NoTyParams(Vec<Box<NonInstantiableEffect>>),
+    TyParams(
+        Box<Instantiation>,
+        Box<InstantiableEffect>,
+        Box<InstantiableInstruction>,
+    ),
+    TyParamsCall(
+        Box<FunctionInstantiation>,
+        Box<FunctionInstantiableEffect>,
+        Box<FunctionInstantiableInstruction>,
+    ),
+}
+
+/// The `Summary` of a bytecode instruction contains a list of `Precondition`s
+/// and a list of `Effect`s.
+pub struct Summary {
+    pub preconditions: Vec<Box<Precondition>>,
+    pub effects: Effects,
+}
+
+/// Return the `Summary` for a bytecode instruction, `instruction`
+pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
+    match instruction {
+        Bytecode::Pop => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_stack_has_ability!(0, Ability::Copy),
+                state_memory_safe!(Some(0)),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::LdU8(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U8
+            ))]),
+        },
+        Bytecode::LdU16(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U16
+            ))]),
+        },
+        Bytecode::LdU32(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U32
+            ))]),
+        },
+        Bytecode::LdU64(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U64
+            ))]),
+        },
+        Bytecode::LdU128(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U128
+            ))]),
+        },
+        Bytecode::LdU256(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U256
+            ))]),
+        },
+        Bytecode::CastU8 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U8)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U8)),
+            ]),
+        },
+        Bytecode::CastU16 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U16)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U16)),
+            ]),
+        },
+        Bytecode::CastU32 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U32)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U32)),
+            ]),
+        },
+        Bytecode::CastU64 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U64)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U64)),
+            ]),
+        },
+        Bytecode::CastU128 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U128)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U128)),
+            ]),
+        },
+        Bytecode::CastU256 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U256)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U256)),
+            ]),
+        },
+        // TODO actual constant generation
+        Bytecode::LdConst(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Address
+            ))]),
+        },
+        Bytecode::LdTrue => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Bool,
+            ))]),
+        },
+        Bytecode::LdFalse => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Bool
+            ))]),
+        },
+        Bytecode::CopyLoc(i) => Summary {
+            preconditions: vec![
+                state_local_exists!(i),
+                state_local_has_ability!(i, Ability::Copy),
+                state_local_availability_is!(i, BorrowState::Available),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_local_take!(i), state_stack_push_register!()]),
+        },
+        Bytecode::MoveLoc(i) => Summary {
+            preconditions: vec![
+                state_local_exists!(i),
+                state_local_availability_is!(i, BorrowState::Available),
+                // TODO: We need to track borrowing of locals. Add this in when we allow the borrow
+                // graph.
+                // state_memory_safe!(Some(i as usize)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_local_take!(i),
+                state_stack_push_register!(),
+                state_local_set!(i, BorrowState::Unavailable),
+            ]),
+        },
+        Bytecode::StLoc(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_local_exists!(i),
+                // TODO: This covers storing on an copyable local only
+                state_local_has_ability!(i, Ability::Drop),
+                state_stack_local_polymorphic_eq!(0, i as usize),
+                state_memory_safe!(Some(0)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_local_place!(i),
+                state_local_set!(i, BorrowState::Available),
+            ]),
+        },
+        Bytecode::MutBorrowLoc(i) => Summary {
+            // TODO: Add these back in when borrow graph is added
+            // preconditions: vec![
+            //     state_local_exists!(i),
+            //     state_local_availability_is!(i, BorrowState::Available),
+            //     state_memory_safe!(None),
+            // ],
+            preconditions: vec![state_never!()],
+            effects: Effects::NoTyParams(vec![
+                state_local_take_borrow!(i, Mutability::Mutable),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::ImmBorrowLoc(i) => Summary {
+            // TODO: Add these back in when the borrow graph is added
+            //preconditions: vec![
+            //    state_local_exists!(i),
+            //    state_local_availability_is!(i, BorrowState::Available),
+            //    state_memory_safe!(None),
+            //],
+            preconditions: vec![state_never!()],
+            effects: Effects::NoTyParams(vec![
+                state_local_take_borrow!(i, Mutability::Immutable),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::ReadRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Either),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_register_dereference!(),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::WriteRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_has!(1, None),
+                state_stack_ref_polymorphic_eq!(0, 1),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::FreezeRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_register_dereference!(),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Div
+        | Bytecode::Mod
+        | Bytecode::BitAnd
+        | Bytecode::BitOr
+        | Bytecode::Xor => Summary {
+            preconditions: vec![
+                state_stack_has_integer!(0),
+                state_stack_has_integer!(1),
+                state_stack_has_polymorphic_eq!(0, 1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Shl | Bytecode::Shr => Summary {
+            preconditions: vec![
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::U8))),
+                state_stack_has_integer!(1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Or | Bytecode::And => Summary {
+            preconditions: vec![
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+                state_stack_has!(1, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Not => Summary {
+            preconditions: vec![state_stack_has!(
+                0,
+                Some(AbstractValue::new_primitive(SignatureToken::Bool))
+            )],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::Eq | Bytecode::Neq => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_stack_has!(1, None),
+                state_stack_has_ability!(0, Ability::Copy),
+                state_stack_has_polymorphic_eq!(0, 1),
+                state_memory_safe!(Some(0)),
+                state_memory_safe!(Some(1)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => Summary {
+            preconditions: vec![
+                state_stack_has_integer!(0),
+                state_stack_has_integer!(1),
+                state_stack_has_polymorphic_eq!(0, 1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!(AbstractValue::new_primitive(
+                SignatureToken::Bool
+            ))]),
+        },
+        Bytecode::Pack(i) => Summary {
+            preconditions: vec![state_stack_satisfies_struct_signature!(i)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_struct_popn!(i),
+                state_create_struct!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::PackGeneric(idx) => Summary {
+            preconditions: vec![state_stack_satisfies_struct_signature!(idx, exact)],
+            effects: Effects::TyParams(
+                struct_instantiation_for_state!(idx, exact),
+                with_ty_param!((exact, idx) => inst,
+                    vec![
+                        state_stack_struct_inst_popn!(idx),
+                        state_create_struct_from_inst!(inst),
+                        state_stack_push_register!(),
+                    ]
+                ),
+                with_ty_param!((exact, idx) => inst, Bytecode::PackGeneric(inst)),
+            ),
+        },
+        Bytecode::Unpack(i) => Summary {
+            preconditions: vec![state_stack_has_struct!(i)],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_unpack_struct!(i)]),
+        },
+        Bytecode::UnpackGeneric(i) => Summary {
+            preconditions: vec![state_stack_has_struct_inst!(i)],
+            effects: Effects::TyParams(
+                unpack_instantiation_for_state!(),
+                with_ty_param!((exact, i) => inst,
+                    vec![
+                        state_stack_pop!(),
+                        state_stack_unpack_struct_inst!(inst),
+                    ]
+                ),
+                with_ty_param!((exact, i) => inst, Bytecode::UnpackGeneric(inst)),
+            ),
+        },
+        Bytecode::Exists(i) => Summary {
+            // The result of `state_struct_is_resource` is represented abstractly
+            // so concrete execution may differ
+            preconditions: vec![
+                state_struct_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::ExistsGeneric(i) => Summary {
+            // The result of `state_struct_is_resource` is represented abstractly
+            // so concrete execution may differ
+            preconditions: vec![
+                state_struct_inst_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::MutBorrowField(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_struct_has_field!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field!(i),
+            ]),
+        },
+        Bytecode::MutBorrowFieldGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_struct_has_field_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field_inst!(i),
+            ]),
+        },
+        Bytecode::ImmBorrowField(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Immutable),
+                state_stack_struct_has_field!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field!(i),
+            ]),
+        },
+        Bytecode::ImmBorrowFieldGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Immutable),
+                state_stack_struct_has_field_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field_inst!(i),
+            ]),
+        },
+        Bytecode::MutBorrowGlobal(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register_borrow!(Mutability::Mutable),
+            ]),
+        },
+        Bytecode::MutBorrowGlobalGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_inst_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register_borrow!(Mutability::Mutable),
+            ]),
+        },
+        Bytecode::ImmBorrowGlobal(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::ImmBorrowGlobalGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_inst_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::MoveFrom(i) => Summary {
+            preconditions: vec![
+                state_function_can_acquire_resource!(),
+                state_struct_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::MoveFromGeneric(i) => Summary {
+            preconditions: vec![
+                state_function_can_acquire_resource!(),
+                state_struct_inst_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::MoveTo(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(1, Mutability::Immutable),
+                state_struct_has_key!(i),
+                state_stack_has_struct!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::MoveToGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(1, Mutability::Immutable),
+                state_struct_inst_has_key!(i),
+                state_stack_has_struct_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::Call(i) => Summary {
+            preconditions: vec![state_stack_satisfies_function_signature!(i)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_function_popn!(i),
+                state_stack_function_call!(i),
+            ]),
+        },
+        Bytecode::CallGeneric(i) => Summary {
+            preconditions: vec![state_stack_satisfies_function_inst_signature!(i)],
+            effects: Effects::TyParamsCall(
+                function_instantiation_for_state!(i),
+                with_ty_param!((exact, i) => inst,
+                    vec![
+                        state_stack_function_inst_popn!(inst),
+                        state_stack_function_inst_call!(i),
+                    ]
+                ),
+                with_ty_param!((exact, i) => inst, Bytecode::CallGeneric(inst)),
+            ),
+        },
+        // Control flow instructions are called manually and thus have
+        // `state_control_flow!()` as their precondition
+        Bytecode::Branch(_) => Summary {
+            preconditions: vec![state_control_flow!()],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        Bytecode::BrTrue(_) => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::BrFalse(_) => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::Ret => Summary {
+            preconditions: vec![state_control_flow!()],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        Bytecode::Abort => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::U64))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::Nop => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        // TODO: implement summaries for vector-related instructions
+        Bytecode::VecPack(..)
+        | Bytecode::VecLen(_)
+        | Bytecode::VecImmBorrow(_)
+        | Bytecode::VecMutBorrow(_)
+        | Bytecode::VecPushBack(_)
+        | Bytecode::VecPopBack(_)
+        | Bytecode::VecUnpack(..)
+        | Bytecode::VecSwap(_) => unimplemented!("Vector bytecode not supported yet"),
+    }
+}
diff --git a/vendors/move/crates/test-generation/src/transitions.rs b/vendors/move/crates/test-generation/src/transitions.rs
new file mode 100644
index 000000000..4b35fdcc5
--- /dev/null
+++ b/vendors/move/crates/test-generation/src/transitions.rs
@@ -0,0 +1,1553 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abilities,
+    abstract_state::{AbstractState, AbstractValue, BorrowState, Mutability},
+    config::ALLOW_MEMORY_UNSAFE,
+    error::VMError,
+    get_struct_handle_from_reference, get_type_actuals_from_reference, substitute,
+};
+use move_binary_format::{
+    access::*,
+    file_format::{
+        Ability, AbilitySet, FieldHandleIndex, FieldInstantiationIndex, FunctionHandleIndex,
+        FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation,
+    },
+    views::{FunctionHandleView, StructDefinitionView, ViewInternals},
+};
+
+use move_binary_format::file_format::TableIndex;
+use std::collections::{hash_map::Entry, HashMap};
+
+//---------------------------------------------------------------------------
+// Type Instantiations from Unification with the Abstract Stack
+//---------------------------------------------------------------------------
+
+/// A substitution is a mapping from type formal index to the `SignatureToken` representing the
+/// type instantiation for that index.
+#[derive(Default)]
+pub struct Subst {
+    pub subst: HashMap<usize, SignatureToken>,
+}
+
+impl Subst {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// NB that the position of arguments here matters. We can build a substitution if the `instr_sig`
+    /// is a type parameter, and the `stack_sig` is a concrete type. But, if the instruction signature is a
+    /// concrete type, but the stack signature is a type parameter, they cannot unify and no
+    /// substitution is created.
+    pub fn check_and_add(&mut self, stack_sig: SignatureToken, instr_sig: SignatureToken) -> bool {
+        match (stack_sig, instr_sig) {
+            (tok, SignatureToken::TypeParameter(idx)) => {
+                if let Some(other_type) = self.subst.get(&(idx as usize)).cloned() {
+                    // If we have already defined a subtitution for this type parameter, then make
+                    // sure the signature token on the stack is amenable with the type selection.
+                    tok == other_type
+                } else {
+                    // Otherwise record that the type parameter maps to this signature token.
+                    self.subst.insert(idx as usize, tok);
+                    true
+                }
+            }
+            // A type parameter on the stack _cannot_ be unified with a non type parameter. But
+            // that case has already been taken care of above. This case is added for explicitness,
+            // but it could be rolled into the catch-all at the bottom of this match.
+            (SignatureToken::TypeParameter(_), _) => false,
+            (SignatureToken::Struct(sig1), SignatureToken::Struct(sig2)) => sig1 == sig2,
+            // Build a substitution from recursing into structs
+            (
+                SignatureToken::StructInstantiation(sig1, params1),
+                SignatureToken::StructInstantiation(sig2, params2),
+            ) => {
+                if sig1 != sig2 {
+                    return false;
+                }
+                assert!(params1.len() == params2.len());
+                for (s1, s2) in params1.into_iter().zip(params2.into_iter()) {
+                    if !self.check_and_add(s1, s2) {
+                        return false;
+                    }
+                }
+                true
+            }
+            (x, y) => x == y,
+        }
+    }
+
+    /// Return the instantiation from the substitution that has been built.
+    pub fn instantiation(self) -> Vec<SignatureToken> {
+        let mut vec = self.subst.into_iter().collect::<Vec<_>>();
+        vec.sort_by(|a, b| a.0.cmp(&b.0));
+        vec.into_iter().map(|x| x.1).collect()
+    }
+}
+
+//---------------------------------------------------------------------------
+// Kind Operations
+//---------------------------------------------------------------------------
+
+/// Given a signature token, returns the abilities of this token in the module context, and
+/// instantiation for the function.
+pub fn abilities_for_token(
+    state: &AbstractState,
+    token: &SignatureToken,
+    type_paramters: &[AbilitySet],
+) -> AbilitySet {
+    abilities(&state.module.module, token, type_paramters)
+}
+
+/// Given a locals signature index, determine the abilities for each signature token. Restricted for
+/// determining abilities at the top-level only. This is reflected in the use of
+/// `state.instantiation[..]` as the kind context.
+pub fn abilities_for_instantiation(
+    state: &AbstractState,
+    instantiation: &[SignatureToken],
+) -> Vec<AbilitySet> {
+    instantiation
+        .iter()
+        .map(|token| abilities(&state.module.module, token, &state.instantiation[..]))
+        .collect()
+}
+
+/// Determine whether the stack contains an integer value at given index.
+pub fn stack_has_integer(state: &AbstractState, index: usize) -> bool {
+    index < state.stack_len()
+        && match state.stack_peek(index) {
+            Some(AbstractValue { token, .. }) => token.is_integer(),
+            None => false,
+        }
+}
+
+pub fn stack_top_is_castable_to(state: &AbstractState, typ: SignatureToken) -> bool {
+    stack_has_integer(state, 0)
+        && match typ {
+            SignatureToken::U8 => stack_has(
+                state,
+                0,
+                Some(AbstractValue::new_primitive(SignatureToken::U8)),
+            ),
+            SignatureToken::U64 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                )
+            }
+            SignatureToken::U16 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                )
+            }
+            SignatureToken::U32 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                )
+            }
+            SignatureToken::U128 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                )
+            }
+            SignatureToken::U256 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U256)),
+                )
+            }
+            SignatureToken::Bool
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => false,
+        }
+}
+
+/// Determine the abstract value at `index` is of the given kind, if it exists.
+/// If it does not exist, return `false`.
+pub fn stack_has_ability(state: &AbstractState, index: usize, ability: Ability) -> bool {
+    if index < state.stack_len() {
+        match state.stack_peek(index) {
+            Some(abstract_value) => {
+                return abstract_value.abilities.has_ability(ability);
+            }
+            None => return false,
+        }
+    }
+    false
+}
+
+pub fn stack_has_all_abilities(state: &AbstractState, index: usize, abilities: AbilitySet) -> bool {
+    if !stack_has(state, index, None) {
+        return false;
+    }
+    let stack_value = state.stack_peek(index).unwrap();
+    abilities.is_subset(stack_value.abilities)
+}
+
+/// Check whether the local at `index` has the given ability
+pub fn local_has_ability(state: &AbstractState, index: u8, ability: Ability) -> bool {
+    state
+        .local_has_ability(index as usize, ability)
+        .unwrap_or(false)
+}
+
+//---------------------------------------------------------------------------
+// Stack & Local Predicates
+//---------------------------------------------------------------------------
+
+/// Determine whether the stack is at least of size `index`. If the optional `abstract_value`
+/// argument is some `AbstractValue`, check whether the type at `index` is that abstract_value.
+pub fn stack_has(
+    state: &AbstractState,
+    index: usize,
+    abstract_value: Option<AbstractValue>,
+) -> bool {
+    match abstract_value {
+        Some(abstract_value) => {
+            index < state.stack_len() && state.stack_peek(index) == Some(abstract_value)
+        }
+        None => index < state.stack_len(),
+    }
+}
+
+/// Determine whether two tokens on the stack have the same type
+pub fn stack_has_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index2, None) {
+        state.stack_peek(index1) == state.stack_peek(index2)
+            && stack_has_ability(state, index1, Ability::Drop)
+    } else {
+        false
+    }
+}
+
+/// Determine whether an abstract value on the stack and a abstract value in the locals have the
+/// same type
+pub fn stack_local_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index1, None) {
+        if let Some((abstract_value, _)) = state.local_get(index2) {
+            return state.stack_peek(index1) == Some(abstract_value.clone());
+        }
+    }
+    false
+}
+
+/// Check whether the local at `index` exists
+pub fn local_exists(state: &AbstractState, index: u8) -> bool {
+    state.local_exists(index as usize)
+}
+
+/// Check whether the local at `index` is of the given availability
+pub fn local_availability_is(state: &AbstractState, index: u8, availability: BorrowState) -> bool {
+    state
+        .local_availability_is(index as usize, availability)
+        .unwrap_or(false)
+}
+
+/// Determine whether an abstract value on the stack that is a reference points to something of the
+/// same type as another abstract value on the stack
+pub fn stack_ref_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index2, None) {
+        if let Some(abstract_value) = state.stack_peek(index1) {
+            match abstract_value.token {
+                SignatureToken::MutableReference(token) | SignatureToken::Reference(token) => {
+                    let abstract_value_inner = AbstractValue {
+                        token: (*token).clone(),
+                        abilities: abilities_for_token(state, &token, &state.instantiation[..]),
+                    };
+                    return Some(abstract_value_inner) == state.stack_peek(index2);
+                }
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+//---------------------------------------------------------------------------
+// Stack and Local Operations
+//---------------------------------------------------------------------------
+
+/// Pop from the top of the stack.
+pub fn stack_pop(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_pop()?;
+    Ok(state)
+}
+
+pub enum StackBinOpResult {
+    Left,
+    Right,
+    Other(AbstractValue),
+}
+
+/// Perform a binary operation using the top two values on the stack as operands.
+pub fn stack_bin_op(
+    state: &AbstractState,
+    res: StackBinOpResult,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    let right = {
+        state.stack_pop()?;
+        state.register_move().unwrap()
+    };
+    let left = {
+        state.stack_pop()?;
+        state.register_move().unwrap()
+    };
+    state.stack_push(match res {
+        StackBinOpResult::Left => left,
+        StackBinOpResult::Right => right,
+        StackBinOpResult::Other(val) => val,
+    });
+    Ok(state)
+}
+
+/// Push given abstract_value to the top of the stack.
+pub fn stack_push(
+    state: &AbstractState,
+    abstract_value: AbstractValue,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_push(abstract_value);
+    Ok(state)
+}
+
+/// Push to the top of the stack from the register.
+pub fn stack_push_register(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_push_register()?;
+    Ok(state)
+}
+
+/// Set the availability of local at `index`
+pub fn local_set(
+    state: &AbstractState,
+    index: u8,
+    availability: BorrowState,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_set(index as usize, availability)?;
+    Ok(state)
+}
+
+/// Put copy of the local at `index` in register
+pub fn local_take(state: &AbstractState, index: u8) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_take(index as usize)?;
+    Ok(state)
+}
+
+/// Put reference to local at `index` in register
+pub fn local_take_borrow(
+    state: &AbstractState,
+    index: u8,
+    mutability: Mutability,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_take_borrow(index as usize, mutability)?;
+    Ok(state)
+}
+
+/// Insert the register value into the locals at `index`
+pub fn local_place(state: &AbstractState, index: u8) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_place(index as usize)?;
+    Ok(state)
+}
+
+//---------------------------------------------------------------------------
+// Struct Predicates and Operations
+//---------------------------------------------------------------------------
+
+pub fn stack_satisfies_struct_instantiation(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+    exact: bool,
+) -> (bool, Subst) {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    if exact {
+        stack_satisfies_struct_signature(state, struct_inst.def, Some(struct_inst.type_parameters))
+    } else {
+        stack_satisfies_struct_signature(state, struct_inst.def, None)
+    }
+}
+
+/// Determine whether the struct at the given index can be constructed from the values on
+/// the stack.
+/// Note that this function is bidirectional; if there is an instantiation, we check it. Otherwise,
+/// we infer the types that are needed.
+pub fn stack_satisfies_struct_signature(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> (bool, Subst) {
+    let instantiation = instantiation.map(|index| state.module.instantiantiation_at(index));
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_def = StructDefinitionView::new(&state.module.module, struct_def);
+    // Get the type formals for the struct, and the kinds that they expect.
+    let type_parameters = struct_def.type_parameters();
+    let field_token_views = struct_def
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token());
+    let mut satisfied = true;
+    let mut substitution = Subst::new();
+    for (i, token_view) in field_token_views.rev().enumerate() {
+        let ty = if let Some(subst) = &instantiation {
+            substitute(token_view.as_inner(), subst)
+        } else {
+            token_view.as_inner().clone()
+        };
+        let has = if let SignatureToken::TypeParameter(idx) = &ty {
+            if stack_has_all_abilities(state, i, type_parameters[*idx as usize].constraints) {
+                let stack_tok = state.stack_peek(i).unwrap();
+                substitution.check_and_add(stack_tok.token, ty)
+            } else {
+                false
+            }
+        } else {
+            let abstract_value = AbstractValue {
+                token: ty,
+                abilities: abilities(
+                    &state.module.module,
+                    token_view.as_inner(),
+                    &type_parameters
+                        .iter()
+                        .map(|param| param.constraints)
+                        .collect::<Vec<_>>(),
+                ),
+            };
+            stack_has(state, i, Some(abstract_value))
+        };
+
+        if !has {
+            satisfied = false;
+        }
+    }
+    (satisfied, substitution)
+}
+
+pub fn get_struct_instantiation_for_state(
+    state: &AbstractState,
+    struct_inst_idx: StructDefInstantiationIndex,
+    exact: bool,
+) -> (StructDefinitionIndex, Vec<SignatureToken>) {
+    let struct_inst = state.module.struct_instantiantiation_at(struct_inst_idx);
+    if exact {
+        return (
+            struct_inst.def,
+            state
+                .module
+                .instantiantiation_at(struct_inst.type_parameters)
+                .clone(),
+        );
+    }
+    let struct_index = struct_inst.def;
+    let mut partial_instantiation = stack_satisfies_struct_signature(state, struct_index, None).1;
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_def = StructDefinitionView::new(&state.module.module, struct_def);
+    let typs = struct_def.type_parameters();
+    for (index, type_param) in typs.iter().enumerate() {
+        if let Entry::Vacant(e) = partial_instantiation.subst.entry(index) {
+            if type_param.constraints.has_key() {
+                unimplemented!("[Struct Instantiation] Need to fill in resource type params");
+            } else {
+                e.insert(SignatureToken::U64);
+            }
+        }
+    }
+    (struct_index, partial_instantiation.instantiation())
+}
+
+/// Determine if a struct (of the given signature) is at the top of the stack
+/// The `struct_index` can be `Some(index)` to check for a particular struct,
+/// or `None` to just check that there is a a struct.
+pub fn stack_has_struct(state: &AbstractState, struct_index: StructDefinitionIndex) -> bool {
+    if state.stack_len() > 0 {
+        if let Some(struct_value) = state.stack_peek(0) {
+            match struct_value.token {
+                SignatureToken::Struct(struct_handle)
+                | SignatureToken::StructInstantiation(struct_handle, _) => {
+                    let struct_def = state.module.module.struct_def_at(struct_index);
+                    return struct_handle == struct_def.struct_handle;
+                }
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Reference(_)
+                | SignatureToken::MutableReference(_)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+pub fn stack_has_struct_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> bool {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    stack_has_struct(state, struct_inst.def)
+}
+
+/// Determine if a struct at the given index is a resource
+pub fn struct_abilities(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    type_args: &Signature,
+) -> AbilitySet {
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_handle = state
+        .module
+        .module
+        .struct_handle_at(struct_def.struct_handle);
+    let declared_phantom_parameters = struct_handle
+        .type_parameters
+        .iter()
+        .map(|param| param.is_phantom);
+    let type_argument_abilities = abilities_for_instantiation(state, &type_args.0);
+    AbilitySet::polymorphic_abilities(
+        struct_handle.abilities,
+        declared_phantom_parameters,
+        type_argument_abilities,
+    )
+    .unwrap()
+}
+
+pub fn struct_inst_abilities(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> AbilitySet {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    let type_args = state
+        .module
+        .module
+        .signature_at(struct_inst.type_parameters);
+    struct_abilities(state, struct_inst.def, type_args)
+}
+
+pub fn stack_struct_has_field_inst(
+    state: &AbstractState,
+    field_index: FieldInstantiationIndex,
+) -> bool {
+    let field_inst = state.module.module.field_instantiation_at(field_index);
+    stack_struct_has_field(state, field_inst.handle)
+}
+
+pub fn stack_struct_has_field(state: &AbstractState, field_index: FieldHandleIndex) -> bool {
+    let field_handle = state.module.module.field_handle_at(field_index);
+    if let Some(struct_handle_index) = state
+        .stack_peek(0)
+        .and_then(|abstract_value| get_struct_handle_from_reference(&abstract_value.token))
+    {
+        let struct_def = state.module.module.struct_def_at(field_handle.owner);
+        return struct_handle_index == struct_def.struct_handle;
+    }
+    false
+}
+
+/// Determine whether the stack has a reference at `index` with the given mutability.
+/// If `mutable` is `Either` then the reference can be either mutable or immutable
+pub fn stack_has_reference(state: &AbstractState, index: usize, mutability: Mutability) -> bool {
+    if state.stack_len() > index {
+        if let Some(abstract_value) = state.stack_peek(index) {
+            match abstract_value.token {
+                SignatureToken::MutableReference(_) => {
+                    if mutability == Mutability::Mutable || mutability == Mutability::Either {
+                        return true;
+                    }
+                }
+                SignatureToken::Reference(_) => {
+                    if mutability == Mutability::Immutable || mutability == Mutability::Either {
+                        return true;
+                    }
+                }
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+pub fn stack_struct_inst_popn(
+    state: &AbstractState,
+    struct_inst_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state
+        .module
+        .module
+        .struct_instantiation_at(struct_inst_index);
+    stack_struct_popn(state, struct_inst.def)
+}
+
+/// Pop the number of stack values required to construct the struct
+/// at `struct_index`
+pub fn stack_struct_popn(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    let struct_def_view = StructDefinitionView::new(&state_copy.module.module, struct_def);
+    for _ in struct_def_view.fields().unwrap() {
+        state.stack_pop()?;
+    }
+    Ok(state)
+}
+
+pub fn create_struct_from_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    create_struct(state, struct_inst.def, Some(struct_inst.type_parameters))
+}
+
+/// Construct a struct from abstract values on the stack
+/// The struct is stored in the register after creation
+pub fn create_struct(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    // Get the type, and kind of this struct
+    let sig_tok = match instantiation {
+        None => SignatureToken::Struct(struct_def.struct_handle),
+        Some(inst) => {
+            let ty_instantiation = state.module.instantiantiation_at(inst);
+            SignatureToken::StructInstantiation(struct_def.struct_handle, ty_instantiation.clone())
+        }
+    };
+    let struct_kind = abilities_for_token(&state, &sig_tok, &state.instantiation);
+    let struct_value = AbstractValue::new_struct(sig_tok, struct_kind);
+    state.register_set(struct_value);
+    Ok(state)
+}
+
+pub fn stack_unpack_struct_instantiation(
+    state: &AbstractState,
+) -> (StructDefinitionIndex, Vec<SignatureToken>) {
+    if let Some(av) = state.stack_peek(0) {
+        match av.token {
+            SignatureToken::StructInstantiation(handle, toks) => {
+                let mut def_filter = state
+                    .module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, struct_def)| struct_def.struct_handle == handle);
+                match def_filter.next() {
+                    Some((idx, _)) => (StructDefinitionIndex(idx as TableIndex), toks),
+                    None => panic!("Invalid unpack -- non-struct def value found at top of stack"),
+                }
+            }
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => {
+                panic!("Invalid unpack -- non-struct value found at top of stack")
+            }
+        }
+    } else {
+        panic!("Invalid unpack -- precondition not satisfied");
+    }
+}
+
+pub fn stack_unpack_struct_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    stack_unpack_struct(state, struct_inst.def, Some(struct_inst.type_parameters))
+}
+
+/// Push the fields of a struct as `AbstractValue`s to the stack
+pub fn stack_unpack_struct(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let ty_instantiation = match instantiation {
+        Some(inst) => state.module.instantiantiation_at(inst).clone(),
+        None => vec![],
+    };
+    let abilities = abilities_for_instantiation(&state_copy, &ty_instantiation);
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    let struct_def_view = StructDefinitionView::new(&state_copy.module.module, struct_def);
+    let token_views = struct_def_view
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token());
+    for token_view in token_views {
+        let abstract_value = AbstractValue {
+            token: substitute(token_view.as_inner(), &ty_instantiation),
+            abilities: abilities_for_token(&state, token_view.as_inner(), &abilities),
+        };
+        state = stack_push(&state, abstract_value)?;
+    }
+    Ok(state)
+}
+
+pub fn struct_ref_instantiation(state: &mut AbstractState) -> Result<Vec<SignatureToken>, VMError> {
+    let token = state.register_move().unwrap().token;
+    if let Some(type_actuals) = get_type_actuals_from_reference(&token) {
+        Ok(type_actuals)
+    } else {
+        Err(VMError::new("Invalid field borrow".to_string()))
+    }
+}
+
+/// Push the field at `field_index` of a struct as an `AbstractValue` to the stack
+pub fn stack_struct_borrow_field(
+    state: &AbstractState,
+    field_index: FieldHandleIndex,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    let typs = struct_ref_instantiation(&mut state)?;
+    let abilities = abilities_for_instantiation(&state, &typs);
+    let field_handle = state.module.module.field_handle_at(field_index);
+    let struct_def = state.module.module.struct_def_at(field_handle.owner);
+    let field_signature = match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            return Err(VMError::new("Borrow field on a native struct".to_string()));
+        }
+        StructFieldInformation::Declared(fields) => {
+            let field_def = &fields[field_handle.field as usize];
+            &field_def.signature.0
+        }
+    };
+    let reified_field_sig = substitute(field_signature, &typs);
+    // NB: We determine the kind on the non-reified_field_sig; we want any local references to
+    // type parameters to point to (struct) local type parameters. We could possibly also use the
+    // reified_field_sig coupled with the top-level instantiation, but I need to convince myself of
+    // the correctness of this.
+    let abstract_value = AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(reified_field_sig)),
+        abilities: abilities_for_token(&state, field_signature, &abilities),
+    };
+    state = stack_push(&state, abstract_value)?;
+    Ok(state)
+}
+
+pub fn stack_struct_borrow_field_inst(
+    state: &AbstractState,
+    field_index: FieldInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let field_inst = state.module.module.field_instantiation_at(field_index);
+    stack_struct_borrow_field(state, field_inst.handle)
+}
+
+/// Dereference the value stored in the register. If the value is not a reference, or
+/// the register is empty, return an error.
+pub fn register_dereference(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    if let Some(abstract_value) = state.register_move() {
+        match abstract_value.token {
+            SignatureToken::MutableReference(token) => {
+                state.register_set(AbstractValue {
+                    token: *token,
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            }
+            SignatureToken::Reference(token) => {
+                state.register_set(AbstractValue {
+                    token: *token,
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            }
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => Err(VMError::new(
+                "Register does not contain a reference".to_string(),
+            )),
+        }
+    } else {
+        println!("{:?}", state);
+        Err(VMError::new("Register is empty".to_string()))
+    }
+}
+
+/// Push a reference to a register value with the given mutability.
+pub fn stack_push_register_borrow(
+    state: &AbstractState,
+    mutability: Mutability,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    if let Some(abstract_value) = state.register_move() {
+        match mutability {
+            Mutability::Mutable => {
+                state.stack_push(AbstractValue {
+                    token: SignatureToken::MutableReference(Box::new(abstract_value.token)),
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            }
+            Mutability::Immutable => {
+                state.stack_push(AbstractValue {
+                    token: SignatureToken::Reference(Box::new(abstract_value.token)),
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            }
+            Mutability::Either => Err(VMError::new("Mutability must be specified".to_string())),
+        }
+    } else {
+        Err(VMError::new("Register is empty".to_string()))
+    }
+}
+
+//---------------------------------------------------------------------------
+// Function Call Predicates and Operations
+//---------------------------------------------------------------------------
+
+/// Determine whether the function at the given index can be constructed from the values on
+/// the stack.
+pub fn stack_satisfies_function_signature(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+) -> (bool, Subst) {
+    let state_copy = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let type_parameters = &function_handle.type_parameters;
+    let mut satisfied = true;
+    let mut substitution = Subst::new();
+    let parameters = &state_copy.module.module.signatures()[function_handle.parameters.0 as usize];
+    for (i, parameter) in parameters.0.iter().rev().enumerate() {
+        let has = if let SignatureToken::TypeParameter(idx) = parameter {
+            if stack_has_all_abilities(state, i, type_parameters[*idx as usize]) {
+                let stack_tok = state.stack_peek(i).unwrap();
+                substitution.check_and_add(stack_tok.token, parameter.clone())
+            } else {
+                false
+            }
+        } else {
+            let abilities = abilities(&state.module.module, parameter, type_parameters);
+            let abstract_value = AbstractValue {
+                token: parameter.clone(),
+                abilities,
+            };
+            stack_has(state, i, Some(abstract_value))
+        };
+        if !has {
+            satisfied = false;
+        }
+    }
+    (satisfied, substitution)
+}
+
+pub fn stack_satisfies_function_inst_signature(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> (bool, Subst) {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_satisfies_function_signature(state, func_inst.handle)
+}
+
+/// Whether the function acquires any global resources or not
+pub fn function_can_acquire_resource(state: &AbstractState) -> bool {
+    !state.acquires_global_resources.is_empty()
+}
+
+/// Simulate calling the function at `function_index`
+pub fn stack_function_call(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let return_ = &state_copy.module.module.signatures()[function_handle.return_.0 as usize];
+    let mut ty_instantiation = &vec![];
+    if let Some(inst) = instantiation {
+        ty_instantiation = state_copy.module.instantiantiation_at(inst)
+    }
+    let abilities = abilities_for_instantiation(&state_copy, ty_instantiation);
+    for return_type in return_.0.iter() {
+        let abstract_value = AbstractValue {
+            token: substitute(return_type, ty_instantiation),
+            abilities: abilities_for_token(&state, return_type, &abilities),
+        };
+        state = stack_push(&state, abstract_value)?;
+    }
+    Ok(state)
+}
+
+pub fn stack_function_inst_call(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_function_call(state, func_inst.handle, Some(func_inst.type_parameters))
+}
+
+pub fn get_function_instantiation_for_state(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> (FunctionHandleIndex, Vec<SignatureToken>) {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    let mut partial_instantiation = stack_satisfies_function_signature(state, func_inst.handle).1;
+    let function_handle = state.module.module.function_handle_at(func_inst.handle);
+    let function_handle = FunctionHandleView::new(&state.module.module, function_handle);
+    let typs = function_handle.type_parameters();
+    for (index, abilities) in typs.iter().enumerate() {
+        if let Entry::Vacant(e) = partial_instantiation.subst.entry(index) {
+            if abilities.has_key() {
+                unimplemented!("[Struct Instantiation] Need to fill in resource type params");
+            } else {
+                e.insert(SignatureToken::U64);
+            }
+        }
+    }
+    (func_inst.handle, partial_instantiation.instantiation())
+}
+
+/// Pop the number of stack values required to call the function
+/// at `function_index`
+pub fn stack_function_popn(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let parameters = &state_copy.module.module.signatures()[function_handle.parameters.0 as usize];
+    let number_of_pops = parameters.0.iter().len();
+    for _ in 0..number_of_pops {
+        state.stack_pop()?;
+    }
+    Ok(state)
+}
+
+pub fn stack_function_inst_popn(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_function_popn(state, func_inst.handle)
+}
+
+/// TODO: This is a temporary function that represents memory
+/// safety for a reference. This should be removed and replaced
+/// with appropriate memory safety premises when the borrow checking
+/// infrastructure is fully implemented.
+/// `index` is `Some(i)` if the instruction can be memory safe when operating
+/// on non-reference types.
+pub fn memory_safe(state: &AbstractState, index: Option<usize>) -> bool {
+    match index {
+        Some(index) => {
+            if stack_has_reference(state, index, Mutability::Either) {
+                ALLOW_MEMORY_UNSAFE
+            } else {
+                true
+            }
+        }
+        None => ALLOW_MEMORY_UNSAFE,
+    }
+}
+
+//---------------------------------------------------------------------------
+// Macros
+//---------------------------------------------------------------------------
+
+/// Wrapper for enclosing the arguments of `stack_has` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has {
+    ($e1: expr, $e2: expr) => {
+        Box::new(move |state| stack_has(state, $e1, $e2))
+    };
+}
+
+/// Determines if the type at the top of the abstract stack is castable to the given type.
+#[macro_export]
+macro_rules! state_stack_is_castable {
+    ($e1: expr) => {
+        Box::new(move |state| stack_top_is_castable_to(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_integer` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has_integer {
+    ($e1: expr) => {
+        Box::new(move |state| stack_has_integer(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_kind_is` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has_ability {
+    ($e: expr, $a: expr) => {
+        Box::new(move |state| stack_has_ability(state, $e, $a))
+    };
+}
+
+/// Wrapper for for enclosing the arguments of `stack_has_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_polymorphic_eq {
+    ($e1: expr, $e2: expr) => {
+        Box::new(move |state| stack_has_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_pop` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_pop {
+    () => {
+        Box::new(move |state| stack_pop(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_push {
+    ($e: expr) => {
+        Box::new(move |state| stack_push(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push_register` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_push_register {
+    () => {
+        Box::new(move |state| stack_push_register(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_local_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_local_polymorphic_eq {
+    ($e1: expr, $e2: expr) => {
+        Box::new(move |state| stack_local_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_exists` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_exists {
+    ($e: expr) => {
+        Box::new(move |state| local_exists(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_availability_is` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_availability_is {
+    ($e: expr, $a: expr) => {
+        Box::new(move |state| local_availability_is(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `state_local_has_ability` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_has_ability {
+    ($e: expr, $a: expr) => {
+        Box::new(move |state| local_has_ability(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_set` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_set {
+    ($e: expr, $a: expr) => {
+        Box::new(move |state| local_set(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_take` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_take {
+    ($e: expr) => {
+        Box::new(move |state| local_take(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_take_borrow` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_take_borrow {
+    ($e: expr, $mutable: expr) => {
+        Box::new(move |state| local_take_borrow(state, $e, $mutable))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_palce` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_place {
+    ($e: expr) => {
+        Box::new(move |state| local_place(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_ref_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_ref_polymorphic_eq {
+    ($e1: expr, $e2: expr) => {
+        Box::new(move |state| stack_ref_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_satisfies_struct_signature` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_satisfies_struct_signature {
+    ($e: expr) => {
+        Box::new(move |state| stack_satisfies_struct_signature(state, $e, None).0)
+    };
+    ($e: expr, $is_exact: expr) => {
+        Box::new(move |state| stack_satisfies_struct_instantiation(state, $e, $is_exact).0)
+    };
+}
+
+/// Wrapper for enclosing the arguments of `state_stack_struct_inst_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_inst_popn {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_inst_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_struct_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_popn {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_pack_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_create_struct {
+    ($e1: expr) => {
+        Box::new(move |state| create_struct(state, $e1, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_create_struct_from_inst {
+    ($e1: expr) => {
+        Box::new(move |state| create_struct_from_inst(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_struct {
+    ($e: expr) => {
+        Box::new(move |state| stack_has_struct(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_has_struct_inst {
+    ($e: expr) => {
+        Box::new(move |state| stack_has_struct_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_unpack_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_unpack_struct {
+    ($e: expr) => {
+        Box::new(move |state| stack_unpack_struct(state, $e, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_unpack_struct_inst {
+    ($e: expr) => {
+        Box::new(move |state| stack_unpack_struct_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `struct_abilities` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_struct_has_key {
+    ($e: expr) => {
+        Box::new(move |state| {
+            struct_abilities(
+                state,
+                $e,
+                &move_binary_format::file_format::Signature(vec![]),
+            )
+            .has_key()
+        })
+    };
+}
+
+#[macro_export]
+macro_rules! state_struct_inst_has_key {
+    ($e: expr) => {
+        Box::new(move |state| struct_inst_abilities(state, $e).has_key())
+    };
+}
+
+/// Wrapper for enclosing the arguments of `struct_has_field` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_has_field {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_has_field(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_struct_has_field_inst {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_has_field_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_struct_borrow_field` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_borrow_field {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_borrow_field(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_struct_borrow_field_inst {
+    ($e: expr) => {
+        Box::new(move |state| stack_struct_borrow_field_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_reference` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_reference {
+    ($e1: expr, $e2: expr) => {
+        Box::new(move |state| stack_has_reference(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `register_dereference` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_register_dereference {
+    () => {
+        Box::new(move |state| register_dereference(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push_register_borrow` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_push_register_borrow {
+    ($e: expr) => {
+        Box::new(move |state| stack_push_register_borrow(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_satisfies_function_signature` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_satisfies_function_signature {
+    ($e: expr) => {
+        Box::new(move |state| stack_satisfies_function_signature(state, $e).0)
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_satisfies_function_inst_signature {
+    ($e: expr) => {
+        Box::new(move |state| stack_satisfies_function_inst_signature(state, $e).0)
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_function_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_function_popn {
+    ($e: expr) => {
+        Box::new(move |state| stack_function_popn(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_function_inst_popn {
+    ($e: expr) => {
+        Box::new(move |state| stack_function_inst_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_function_call` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_function_call {
+    ($e: expr) => {
+        Box::new(move |state| stack_function_call(state, $e, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_function_inst_call {
+    ($e: expr) => {
+        Box::new(move |state| stack_function_inst_call(state, $e))
+    };
+}
+
+/// Determine the proper type instantiation for function call in the current state.
+#[macro_export]
+macro_rules! function_instantiation_for_state {
+    ($e: expr) => {
+        Box::new(move |state| get_function_instantiation_for_state(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `function_can_acquire_resource` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_function_can_acquire_resource {
+    () => {
+        Box::new(move |state| function_can_acquire_resource(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `memory_safe` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_memory_safe {
+    ($e: expr) => {
+        Box::new(move |state| memory_safe(state, $e))
+    };
+}
+
+/// Predicate that is false for every state.
+#[macro_export]
+macro_rules! state_never {
+    () => {
+        Box::new(|_| (false))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_bin_op {
+    (#left) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Left))
+    };
+    (#right) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Right))
+    };
+    () => {
+        state_stack_bin_op!(#left)
+    };
+    ($e: expr) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Other($e)))
+    }
+}
+
+/// Predicate that is false for every state, unless control operations are allowed.
+#[macro_export]
+macro_rules! state_control_flow {
+    () => {
+        Box::new(|state| state.is_control_flow_allowed())
+    };
+}
+
+/// Determine the proper type instantiation for struct in the current state.
+#[macro_export]
+macro_rules! struct_instantiation_for_state {
+    ($e: expr, $is_exact: expr) => {
+        Box::new(move |state| get_struct_instantiation_for_state(state, $e, $is_exact))
+    };
+}
+
+/// Determine the proper type instantiation for struct in the current state.
+#[macro_export]
+macro_rules! unpack_instantiation_for_state {
+    () => {
+        Box::new(move |state| stack_unpack_struct_instantiation(state))
+    };
+}
+
+/// A wrapper around type instantiation, that allows specifying an "exact" instantiation index, or
+/// if the instantiation should be inferred from the current state.
+#[macro_export]
+macro_rules! with_ty_param {
+    (($is_exact: expr, $struct_inst_idx: expr) => $s_inst_idx:ident, $body:expr) => {
+        Box::new(move |$s_inst_idx| {
+            let $s_inst_idx = if $is_exact {
+                $struct_inst_idx
+            } else {
+                $s_inst_idx
+            };
+            $body
+        })
+    };
+}
diff --git a/vendors/move/crates/test-generation/tests/boolean_instructions.rs b/vendors/move/crates/test-generation/tests/boolean_instructions.rs
new file mode 100644
index 000000000..573ae4e1b
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/boolean_instructions.rs
@@ -0,0 +1,48 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_and() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::And, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_or() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Or, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_not() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Not, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/test-generation/tests/call_graph.rs b/vendors/move/crates/test-generation/tests/call_graph.rs
new file mode 100644
index 000000000..989176108
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/call_graph.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::FunctionHandleIndex;
+use test_generation::abstract_state::CallGraph;
+
+#[test]
+fn call_graph_no_self_call_recursive() {
+    let call_graph = CallGraph::new(10);
+    let can_call = call_graph.can_call(FunctionHandleIndex(0));
+    assert!(can_call.len() == 9);
+    assert!(!can_call.iter().any(|fh| *fh == FunctionHandleIndex(0)));
+}
+
+#[test]
+fn call_graph_simple_recursive_call() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    let can_call0 = call_graph.can_call(FunctionHandleIndex(0));
+    let can_call1 = call_graph.can_call(FunctionHandleIndex(1));
+    assert!(can_call0.len() == 9);
+    assert!(can_call1.len() == 8);
+    assert!(!can_call0.iter().any(|fh| *fh == FunctionHandleIndex(0)));
+    assert!(!can_call1
+        .iter()
+        .any(|fh| *fh == FunctionHandleIndex(0) || *fh == FunctionHandleIndex(1)));
+}
+
+#[test]
+fn call_graph_transitive_recursive_call() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(2), FunctionHandleIndex(0));
+    let can_call0 = call_graph.can_call(FunctionHandleIndex(0));
+    assert!(can_call0.len() == 7);
+}
+
+#[test]
+fn call_graph_call_graph_depth() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(3));
+    call_graph.add_call(FunctionHandleIndex(3), FunctionHandleIndex(2));
+    assert!(
+        call_graph
+            .call_depth(FunctionHandleIndex(0), FunctionHandleIndex(1))
+            .unwrap()
+            == 3
+    );
+}
+
+#[test]
+fn call_graph_call_call_into_graph_depth() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(3));
+    call_graph.add_call(FunctionHandleIndex(3), FunctionHandleIndex(2));
+    assert!(call_graph.max_calling_depth(FunctionHandleIndex(2)) == 3);
+}
diff --git a/vendors/move/crates/test-generation/tests/common.rs b/vendors/move/crates/test-generation/tests/common.rs
new file mode 100644
index 000000000..bc9c3670d
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/common.rs
@@ -0,0 +1,113 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, FunctionInstantiation, StructDefInstantiation};
+use test_generation::{
+    abstract_state::AbstractState,
+    config::ALLOW_MEMORY_UNSAFE,
+    summaries::{instruction_summary, Effects},
+};
+
+pub fn run_instruction(
+    instruction: Bytecode,
+    mut initial_state: AbstractState,
+) -> (AbstractState, Bytecode) {
+    let summary = instruction_summary(instruction.clone(), false);
+    // The following is temporary code. If ALLOW_MEMORY_UNSAFE is false,
+    // we have to ignore that precondition so that we can test the instructions.
+    // When memory safety is implemented, only the false branch should be used.
+    let unsatisfied_preconditions = if !ALLOW_MEMORY_UNSAFE {
+        match instruction {
+            Bytecode::Pop
+            //| Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::StLoc(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_) => {
+                let len = summary.preconditions.len();
+                summary.preconditions[..(len - 1)]
+                    .iter()
+                    .any(|precondition| !precondition(&initial_state))
+            }
+            Bytecode::Eq | Bytecode::Neq => {
+                let len = summary.preconditions.len();
+                summary.preconditions[..(len - 2)]
+                    .iter()
+                    .any(|precondition| !precondition(&initial_state))
+            }
+            _ => summary
+                .preconditions
+                .iter()
+                .any(|precondition| !precondition(&initial_state)),
+        }
+    } else {
+        summary
+            .preconditions
+            .iter()
+            .any(|precondition| !precondition(&initial_state))
+    };
+    assert_eq!(
+        unsatisfied_preconditions, false,
+        "preconditions of instruction not satisfied"
+    );
+    match summary.effects {
+        Effects::TyParams(instantiation, effect, instantiation_application) => {
+            let (struct_idx, instantiation) = instantiation(&initial_state);
+            let index = initial_state.module.add_instantiation(instantiation);
+            let struct_inst = StructDefInstantiation {
+                def: struct_idx,
+                type_parameters: index,
+            };
+            let str_inst_idx = initial_state.module.add_struct_instantiation(struct_inst);
+            let effects = effect(str_inst_idx);
+            let instruction = instantiation_application(str_inst_idx);
+            (
+                effects.iter().fold(initial_state, |acc, effect| {
+                    effect(&acc)
+                        .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+                }),
+                instruction,
+            )
+        }
+        Effects::TyParamsCall(instantiation, effect, instantiation_application) => {
+            let (fh_idx, instantiation) = instantiation(&initial_state);
+            let index = initial_state.module.add_instantiation(instantiation);
+            let func_inst = FunctionInstantiation {
+                handle: fh_idx,
+                type_parameters: index,
+            };
+            let func_inst_idx = initial_state.module.add_function_instantiation(func_inst);
+            let effects = effect(func_inst_idx);
+            let instruction = instantiation_application(func_inst_idx);
+            (
+                effects.iter().fold(initial_state, |acc, effect| {
+                    effect(&acc)
+                        .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+                }),
+                instruction,
+            )
+        }
+        Effects::NoTyParams(effects) => (
+            effects.iter().fold(initial_state, |acc, effect| {
+                effect(&acc)
+                    .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+            }),
+            instruction,
+        ),
+    }
+}
diff --git a/vendors/move/crates/test-generation/tests/comparison_instructions.rs b/vendors/move/crates/test-generation/tests/comparison_instructions.rs
new file mode 100644
index 000000000..fe32abb2d
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/comparison_instructions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use itertools::Itertools;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+const INTEGER_TYPES: &[SignatureToken] = &[
+    SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
+    SignatureToken::U64,
+    SignatureToken::U128,
+    SignatureToken::U256,
+];
+
+#[test]
+fn bytecode_comparison_integers() {
+    for (op, ty) in [
+        Bytecode::Lt,
+        Bytecode::Gt,
+        Bytecode::Le,
+        Bytecode::Ge,
+        Bytecode::Eq,
+        Bytecode::Neq,
+    ]
+    .iter()
+    .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_eq_bool() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Eq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_neq_u64() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    let (state2, _) = common::run_instruction(Bytecode::Neq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_neq_bool() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Neq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/test-generation/tests/control_flow_instructions.rs b/vendors/move/crates/test-generation/tests/control_flow_instructions.rs
new file mode 100644
index 000000000..c26cc56dc
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/control_flow_instructions.rs
@@ -0,0 +1,72 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CompiledModule, FunctionHandle, FunctionHandleIndex, IdentifierIndex,
+    ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+};
+use move_core_types::identifier::Identifier;
+use std::collections::HashMap;
+use test_generation::abstract_state::{AbstractState, AbstractValue, CallGraph};
+
+mod common;
+
+fn generate_module_with_function() -> CompiledModule {
+    let mut module = empty_module();
+
+    let offset = module.identifiers.len();
+    module.identifiers.push(Identifier::new("func0").unwrap());
+
+    module.signatures = vec![
+        Signature(vec![]),
+        Signature(vec![SignatureToken::U64, SignatureToken::Bool]),
+        Signature(vec![SignatureToken::Address]),
+    ];
+
+    module.function_handles = vec![FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(offset as u16),
+        parameters: SignatureIndex::new(1),
+        return_: SignatureIndex::new(2),
+        type_parameters: vec![],
+    }];
+    module
+}
+
+#[test]
+fn bytecode_call() {
+    let module = generate_module_with_function();
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Address)),
+        "stack type postcondition not satisfied",
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_call_function_signature_not_satisfied() {
+    let module = generate_module_with_function();
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_call_return_not_pushed() {
+    let module = generate_module_with_function();
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+    assert_eq!(state2.stack_len(), 0,);
+}
diff --git a/vendors/move/crates/test-generation/tests/generic_instructions.rs b/vendors/move/crates/test-generation/tests/generic_instructions.rs
new file mode 100644
index 000000000..66eb17078
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/generic_instructions.rs
@@ -0,0 +1,95 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::SignatureToken;
+use test_generation::transitions::Subst;
+
+//---------------------------------------------------------------------------
+// Substitution tests
+//---------------------------------------------------------------------------
+
+#[test]
+fn unify_no_subst() {
+    use SignatureToken::*;
+    let tys = vec![Bool, U64, Vector(Box::new(U8)), Address];
+    for tok1 in tys.iter() {
+        for tok2 in tys.iter() {
+            let should_unify = tok1.clone() == tok2.clone();
+            let mut s = Subst::new();
+            assert!(s.check_and_add(tok1.clone(), tok2.clone()) == should_unify);
+            assert!(s.instantiation().is_empty());
+        }
+    }
+}
+
+#[test]
+fn unify_ty_param_empty_subst1() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    // Even if a type parameter can map to an instantiantion (due to a ground type on the stack) a
+    // non-grounded type on the stack cannot be unified with a particular instantiation.
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(subst.instantiation().len() == 2);
+}
+
+#[test]
+fn unify_ty_param_empty_subst2() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(!subst.check_and_add(TypeParameter(2), Bool));
+
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(1)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(2)));
+    assert!(!subst.check_and_add(TypeParameter(1), TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(1)));
+    assert!(subst.instantiation().len() == 3);
+}
+
+#[test]
+fn unify_ty_params_infinite() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(TypeParameter(0), TypeParameter(1)));
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
+    // These should both return false.
+    assert!(!subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), Bool));
+}
+
+#[test]
+fn unify_ty_param_empty_subst3() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
+    assert!(subst.instantiation().len() == 1);
+}
+
+#[test]
+fn unify_ty_param_empty_subst4() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(U64, TypeParameter(2)));
+}
diff --git a/vendors/move/crates/test-generation/tests/integer_instructions.rs b/vendors/move/crates/test-generation/tests/integer_instructions.rs
new file mode 100644
index 000000000..0e4bda13f
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/integer_instructions.rs
@@ -0,0 +1,138 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use itertools::Itertools;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+const INTEGER_TYPES: &[SignatureToken] = &[
+    SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
+    SignatureToken::U64,
+    SignatureToken::U128,
+    SignatureToken::U256,
+];
+
+#[test]
+fn bytecode_bin_ops() {
+    for (op, ty) in [
+        Bytecode::Add,
+        Bytecode::Sub,
+        Bytecode::Mul,
+        Bytecode::Div,
+        Bytecode::Mod,
+        Bytecode::BitAnd,
+        Bytecode::BitOr,
+        Bytecode::Xor,
+    ]
+    .iter()
+    .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_shl_shr() {
+    for (op, ty) in [Bytecode::Shl, Bytecode::Shr]
+        .iter()
+        .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(SignatureToken::U8));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_casting_ops() {
+    for (op, ty1, ty2) in [
+        (Bytecode::CastU8, SignatureToken::U8, SignatureToken::U8),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U16),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U32),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U16),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U8),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U16),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U32),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U64),
+        (Bytecode::CastU128, SignatureToken::U128, SignatureToken::U8),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U32,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U64,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U128,
+        ),
+        (Bytecode::CastU256, SignatureToken::U256, SignatureToken::U8),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U32,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U64,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U128,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U256,
+        ),
+    ]
+    .iter()
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty2.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty1.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
diff --git a/vendors/move/crates/test-generation/tests/load_instructions.rs b/vendors/move/crates/test-generation/tests/load_instructions.rs
new file mode 100644
index 000000000..5409ce26c
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/load_instructions.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, ConstantPoolIndex, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_ldu64() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdU64(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldtrue() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdTrue, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldfalse() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdFalse, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldconst() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdConst(ConstantPoolIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Address)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/test-generation/tests/local_instructions.rs b/vendors/move/crates/test-generation/tests/local_instructions.rs
new file mode 100644
index 000000000..9cb0174ef
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/local_instructions.rs
@@ -0,0 +1,188 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{AbilitySet, Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue, BorrowState};
+
+mod common;
+
+#[test]
+fn bytecode_copyloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::CopyLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_copyloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::CopyLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_copyloc_local_unavailable() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Unavailable,
+    );
+    common::run_instruction(Bytecode::CopyLoc(0), state1);
+}
+
+#[test]
+fn bytecode_moveloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::MoveLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Unavailable
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::MoveLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveloc_local_unavailable() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Unavailable,
+    );
+    common::run_instruction(Bytecode::MoveLoc(0), state1);
+}
+
+#[test]
+fn bytecode_mutborrowloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_immborrowloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::Reference(Box::new(SignatureToken::U64),),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+}
+
+// TODO: Turn back on when borrow graph and references are allowed
+// #[test]
+// #[should_panic]
+// fn bytecode_mutborrowloc_local_unavailable() {
+//     let mut state1 = AbstractState::new();
+//     state1.local_insert(
+//         0,
+//         AbstractValue::new_primitive(SignatureToken::U64),
+//         BorrowState::Unavailable,
+//     );
+//     common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+// }
+//
+// #[test]
+// #[should_panic]
+// fn bytecode_immborrowloc_local_unavailable() {
+//     let mut state1 = AbstractState::new();
+//     state1.local_insert(
+//         0,
+//         AbstractValue::new_primitive(SignatureToken::U64),
+//         BorrowState::Unavailable,
+//     );
+//     common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+// }
diff --git a/vendors/move/crates/test-generation/tests/reference_instructions.rs b/vendors/move/crates/test-generation/tests/reference_instructions.rs
new file mode 100644
index 000000000..5a62db777
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/reference_instructions.rs
@@ -0,0 +1,120 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{AbilitySet, Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_readref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::ReadRef, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_readref_no_ref() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::ReadRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_readref_wrong_dereference() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::ReadRef, state1);
+    assert!(
+        state2.stack_peek(0) != Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_writeref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::WriteRef, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+#[should_panic]
+fn bytecode_writeref_type_mismatch() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    common::run_instruction(Bytecode::WriteRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_writeref_stack_len_mismatch() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::WriteRef, state1);
+    assert!(state2.stack_len() != 0, "stack type postcondition not met");
+}
+
+#[test]
+fn bytecode_feezeref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::FreezeRef, state1);
+    assert_eq!(state2.stack_len(), 1, "stack len postcondition not met");
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::Reference(Box::new(SignatureToken::U64)),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_feezeref_no_ref() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::FreezeRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_feezeref_already_immutable() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    common::run_instruction(Bytecode::FreezeRef, state1);
+}
diff --git a/vendors/move/crates/test-generation/tests/special_instructions.rs b/vendors/move/crates/test-generation/tests/special_instructions.rs
new file mode 100644
index 000000000..f409f0d2b
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/special_instructions.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_pop() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    let (state2, _) = common::run_instruction(Bytecode::Pop, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+fn bytecode_createaccount() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) = common::run_instruction(Bytecode::Pop, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
diff --git a/vendors/move/crates/test-generation/tests/struct_instructions.rs b/vendors/move/crates/test-generation/tests/struct_instructions.rs
new file mode 100644
index 000000000..13dd66777
--- /dev/null
+++ b/vendors/move/crates/test-generation/tests/struct_instructions.rs
@@ -0,0 +1,451 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        empty_module, Ability, AbilitySet, Bytecode, CompiledModule, FieldDefinition, FieldHandle,
+        FieldHandleIndex, IdentifierIndex, ModuleHandleIndex, SignatureToken, StructDefinition,
+        StructDefinitionIndex, StructFieldInformation, StructHandle, StructHandleIndex, TableIndex,
+        TypeSignature,
+    },
+    views::{StructDefinitionView, ViewInternals},
+};
+use move_core_types::identifier::Identifier;
+use std::collections::HashMap;
+use test_generation::{
+    abilities,
+    abstract_state::{AbstractState, AbstractValue, CallGraph},
+};
+
+mod common;
+
+fn generate_module_with_struct(resource: bool) -> CompiledModule {
+    let mut module: CompiledModule = empty_module();
+
+    let struct_index = 0;
+    let num_fields = 5;
+    let offset = module.identifiers.len() as TableIndex;
+    module.identifiers.push(Identifier::new("struct0").unwrap());
+
+    let mut fields = vec![];
+    for i in 0..num_fields {
+        module
+            .identifiers
+            .push(Identifier::new(format!("string{}", i)).unwrap());
+        let str_pool_idx = IdentifierIndex::new(i + 1);
+        fields.push(FieldDefinition {
+            name: str_pool_idx,
+            signature: TypeSignature(SignatureToken::Bool),
+        });
+    }
+    let struct_def = StructDefinition {
+        struct_handle: StructHandleIndex(struct_index),
+        field_information: StructFieldInformation::Declared(fields),
+    };
+    module.struct_defs.push(struct_def);
+    module.struct_handles = vec![StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new((struct_index + offset) as TableIndex),
+        abilities: if resource {
+            AbilitySet::EMPTY | Ability::Key | Ability::Store
+        } else {
+            AbilitySet::PRIMITIVES
+        },
+        type_parameters: vec![],
+    }];
+    module
+}
+
+fn create_struct_value(module: &CompiledModule) -> (AbstractValue, Vec<SignatureToken>) {
+    let struct_def = module.struct_def_at(StructDefinitionIndex::new(0));
+    let struct_def_view = StructDefinitionView::new(module, struct_def);
+    let tokens: Vec<SignatureToken> = struct_def_view
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token().as_inner().clone())
+        .collect();
+    let struct_abilities = struct_def_view.abilities();
+
+    let type_argument_abilities = tokens.iter().map(|arg| abilities(module, arg, &[]));
+    let declared_phantom_parameters = [false].repeat(type_argument_abilities.len());
+    let abilities = AbilitySet::polymorphic_abilities(
+        struct_abilities,
+        declared_phantom_parameters,
+        type_argument_abilities,
+    )
+    .unwrap();
+    (
+        AbstractValue::new_struct(SignatureToken::Struct(struct_def.struct_handle), abilities),
+        tokens,
+    )
+}
+
+fn get_field_signature<'a>(module: &'a CompiledModule, handle: &FieldHandle) -> &'a SignatureToken {
+    let struct_def = &module.struct_defs[handle.owner.0 as usize];
+    match &struct_def.field_information {
+        StructFieldInformation::Native => panic!("borrow field on a native struct"),
+        StructFieldInformation::Declared(fields) => &fields[handle.field as usize].signature.0,
+    }
+}
+
+#[test]
+#[should_panic]
+fn bytecode_pack_signature_not_satisfied() {
+    let module = generate_module_with_struct(false);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Pack(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_pack() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let (struct_value1, tokens) = create_struct_value(&state1.module.module);
+    for token in tokens {
+        let abstract_value = AbstractValue {
+            token: token.clone(),
+            abilities: abilities(&state1.module.module, &token, &[]),
+        };
+        state1.stack_push(abstract_value);
+    }
+    let (state2, _) =
+        common::run_instruction(Bytecode::Pack(StructDefinitionIndex::new(0)), state1);
+    let struct_value2 = state2.stack_peek(0).expect("struct not added to stack");
+    assert_eq!(
+        struct_value1, struct_value2,
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_unpack_signature_not_satisfied() {
+    let module = generate_module_with_struct(false);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Unpack(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_unpack() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let (struct_value, tokens) = create_struct_value(&state1.module.module);
+    state1.stack_push(struct_value);
+    let (state2, _) =
+        common::run_instruction(Bytecode::Unpack(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_len(),
+        tokens.len(),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_exists() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) =
+        common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_exists_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_exists_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_movefrom() {
+    let module = generate_module_with_struct(true);
+    let mut state1 = AbstractState::from_locals(
+        module,
+        HashMap::new(),
+        vec![],
+        vec![StructDefinitionIndex::new(0)],
+        CallGraph::new(0),
+    );
+    let state1_copy = state1.clone();
+    let struct_def = state1_copy
+        .module
+        .module
+        .struct_def_at(StructDefinitionIndex::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) =
+        common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+    let struct_value = state2.stack_peek(0).expect("struct not added to stack");
+    assert!(
+        matches!(struct_value.token, SignatureToken::Struct(struct_handle) if struct_handle == struct_def.struct_handle),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_movefrom_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_movefrom_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_moveto() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    state1.stack_push(create_struct_value(&state1.module.module).0);
+    let (state2, _) =
+        common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveto_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    state1.stack_push(create_struct_value(&state1.module.module).0);
+    common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveto_no_struct_on_stack() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_mutborrowfield() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+    let field_signature =
+        get_field_signature(&module, &module.field_handles[field_handle_idx.0 as usize]).clone();
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    let (state2, _) = common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+    let abilities = abilities(&state2.module.module, &field_signature, &[]);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(field_signature)),
+            abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowfield_stack_has_no_reference() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowfield_ref_is_immutable() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::Reference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+fn bytecode_immborrowfield() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+    let field_signature =
+        get_field_signature(&module, &module.field_handles[field_handle_idx.0 as usize]).clone();
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::Reference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    let (state2, _) = common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+    let abilities = abilities(&state2.module.module, &field_signature, &[]);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(field_signature)),
+            abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowfield_stack_has_no_reference() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowfield_ref_is_mutable() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+fn bytecode_borrowglobal() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) = common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+            abilities: struct_value.abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_borrowglobal_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_borrowglobal_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+}
diff --git a/vendors/move/crates/testing-infra/module-generation/Cargo.toml b/vendors/move/crates/testing-infra/module-generation/Cargo.toml
new file mode 100644
index 000000000..b573f8c59
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "module-generation"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem binary module generation"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+move-binary-format = { path = "../../move-binary-format" }
+rand = "0.8.3"
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-core-types = { path = "../../move-core-types" }
+move-ir-to-bytecode = { path = "../../move-ir-compiler/move-ir-to-bytecode" }
+move-ir-types = { path = "../../move-ir/types" }
+move-symbol-pool = { path = "../../move-symbol-pool" }
+
+[features]
+default = []
diff --git a/vendors/move/crates/testing-infra/module-generation/src/generator.rs b/vendors/move/crates/testing-infra/module-generation/src/generator.rs
new file mode 100644
index 000000000..d12c1dcef
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/src/generator.rs
@@ -0,0 +1,354 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{options::ModuleGeneratorOptions, padding::Pad, utils::random_string};
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::verify_module;
+use move_core_types::account_address::AccountAddress;
+use move_ir_to_bytecode::compiler::compile_module;
+use move_ir_types::{ast::*, location::*};
+use move_symbol_pool::Symbol;
+use rand::{rngs::StdRng, Rng};
+use std::{
+    collections::{BTreeSet, VecDeque},
+    iter::FromIterator,
+};
+
+type Set<K> = BTreeSet<K>;
+
+macro_rules! init {
+    ($len:expr, $e:expr) => {
+        (0..$len).map(|_| $e).collect()
+    };
+}
+
+pub fn generate_module(rng: &mut StdRng, options: ModuleGeneratorOptions) -> CompiledModule {
+    generate_modules(rng, 1, options).0
+}
+
+/// Generate a `number - 1` modules. Then generate a root module that imports all of these modules.
+pub fn generate_modules(
+    rng: &mut StdRng,
+    number: usize,
+    options: ModuleGeneratorOptions,
+) -> (CompiledModule, Vec<CompiledModule>) {
+    assert!(number > 0, "We cannot generate zero modules");
+
+    let table_size = options.min_table_size;
+    let (callee_names, callees): (Set<Symbol>, Vec<ModuleDefinition>) = (0..(number - 1))
+        .map(|_| {
+            let module = ModuleGenerator::create(rng, options.clone(), &Set::new());
+            let module_name = module.identifier.name.0;
+            (module_name, module)
+        })
+        .unzip();
+
+    let root_module = ModuleGenerator::create(rng, options.clone(), &callee_names);
+    let empty_deps: Vec<CompiledModule> = Vec::new();
+    let compiled_callees = callees
+        .into_iter()
+        .map(|module| {
+            let mut module = compile_module(module, &empty_deps).unwrap().0;
+            Pad::pad(table_size, &mut module, options.clone());
+            module
+        })
+        .collect();
+
+    // TODO: for friend visibility, maybe we could generate a module that friend all other modules...
+
+    let mut compiled_root = compile_module(root_module, &compiled_callees).unwrap().0;
+    Pad::pad(table_size, &mut compiled_root, options);
+    (compiled_root, compiled_callees)
+}
+
+pub fn generate_verified_modules(
+    rng: &mut StdRng,
+    number: usize,
+    options: ModuleGeneratorOptions,
+) -> (CompiledModule, Vec<CompiledModule>) {
+    let (root, callees) = generate_modules(rng, number, options);
+    for callee in &callees {
+        verify_module(callee).unwrap()
+    }
+    verify_module(&root).unwrap();
+    (root, callees)
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Generation of IR-level modules
+///////////////////////////////////////////////////////////////////////////
+
+pub struct ModuleGenerator<'a> {
+    options: ModuleGeneratorOptions,
+    current_module: ModuleDefinition,
+    gen: &'a mut StdRng,
+}
+
+impl<'a> ModuleGenerator<'a> {
+    fn index(&mut self, bound: usize) -> usize {
+        self.gen.gen_range(0..bound)
+    }
+
+    fn identifier(&mut self) -> String {
+        let len = self.gen.gen_range(10..self.options.max_string_size);
+        random_string(self.gen, len)
+    }
+
+    fn base_type(&mut self, ty_param_context: &[&TypeVar]) -> Type {
+        // TODO: Don't generate nested resources for now. Once we allow functions to take resources
+        // (and have type parameters of kind Resource or All) then we should revisit this here.
+        let structs: Vec<_> = self
+            .current_module
+            .structs
+            .iter()
+            .filter(|s| !s.value.abilities.contains(&Ability::Key))
+            .cloned()
+            .collect();
+
+        let mut end = 5;
+        if !ty_param_context.is_empty() {
+            end += 1;
+        };
+        if !structs.is_empty() {
+            end += 1;
+        };
+
+        match self.index(end) {
+            0 => Type::Address,
+            1 => Type::U8,
+            2 => Type::U64,
+            3 => Type::U128,
+            4 => Type::Bool,
+            5 if !structs.is_empty() => {
+                let index = self.index(structs.len());
+                let struct_def = structs[index].value.clone();
+                let ty_instants = {
+                    let num_typ_params = struct_def.type_formals.len();
+                    // NB: Relying on randomness for termination here
+                    init!(num_typ_params, self.base_type(ty_param_context))
+                };
+                let struct_ident = {
+                    let struct_name = struct_def.name;
+                    let module_name = ModuleName::module_self();
+                    QualifiedStructIdent::new(module_name, struct_name)
+                };
+                Type::Struct(struct_ident, ty_instants)
+            },
+            6 => Type::U16,
+            7 => Type::U32,
+            8 => Type::U256,
+            _ => {
+                let index = self.index(ty_param_context.len());
+                let ty_var = ty_param_context[index].value.clone();
+                Type::TypeParameter(ty_var)
+            },
+        }
+    }
+
+    fn typ(&mut self, ty_param_context: &[(TypeVar, BTreeSet<Ability>)]) -> Type {
+        let typ = self.base_type(
+            &ty_param_context
+                .iter()
+                .map(|(tv, _)| tv)
+                .collect::<Vec<_>>(),
+        );
+        // TODO: Always change the base type to a reference if it's resource type. Then we can
+        // allow functions to take resources.
+        // if typ.is_nominal_resource { .... }
+        if self.options.references_allowed && self.gen.gen_bool(0.25) {
+            let is_mutable = self.gen.gen_bool(0.25);
+            Type::Reference(is_mutable, Box::new(typ))
+        } else {
+            typ
+        }
+    }
+
+    fn fun_type_parameters(&mut self) -> Vec<(TypeVar, BTreeSet<Ability>)> {
+        // Don't generate type parameters if we're generating simple types only
+        if self.options.simple_types_only {
+            vec![]
+        } else {
+            let num_ty_params = self.index(self.options.max_ty_params);
+            let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop]);
+            init!(num_ty_params, {
+                let name = Spanned::unsafe_no_loc(TypeVar_(self.identifier().into()));
+                (name, abilities.clone())
+            })
+        }
+    }
+
+    fn struct_type_parameters(&mut self) -> Vec<StructTypeParameter> {
+        // Don't generate type parameters if we're generating simple types only
+        if self.options.simple_types_only {
+            vec![]
+        } else {
+            let is_phantom = self.index(1) != 0;
+            let num_ty_params = self.index(self.options.max_ty_params);
+            let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop]);
+            init!(num_ty_params, {
+                let name = Spanned::unsafe_no_loc(TypeVar_(self.identifier().into()));
+                (is_phantom, name, abilities.clone())
+            })
+        }
+    }
+
+    // All functions will have unit return type, and an empty body with the exception of a return.
+    // We'll scoop this out and replace it later on in the compiled module that we generate.
+    fn function_signature(&mut self) -> FunctionSignature {
+        let ty_params = self.fun_type_parameters();
+        let number_of_args = self.index(self.options.max_function_call_size);
+        let mut formals: Vec<(Var, Type)> = init!(number_of_args, {
+            let param_name = Spanned::unsafe_no_loc(Var_(self.identifier().into()));
+            let ty = self.typ(&ty_params);
+            (param_name, ty)
+        });
+
+        if self.options.args_for_ty_params {
+            let mut ty_formals = ty_params
+                .iter()
+                .map(|(ty_var_, _)| {
+                    let param_name = Spanned::unsafe_no_loc(Var_(self.identifier().into()));
+                    let ty = Type::TypeParameter(ty_var_.value.clone());
+                    (param_name, ty)
+                })
+                .collect();
+
+            formals.append(&mut ty_formals);
+        }
+
+        FunctionSignature::new(formals, vec![], ty_params)
+    }
+
+    fn struct_fields(&mut self, ty_params: &[StructTypeParameter]) -> StructDefinitionFields {
+        let num_fields = self
+            .gen
+            .gen_range(self.options.min_fields..self.options.max_fields);
+        let fields: Fields<Type> = init!(num_fields, {
+            (
+                Spanned::unsafe_no_loc(Field_(self.identifier().into())),
+                self.base_type(&ty_params.iter().map(|(_, tv, _)| tv).collect::<Vec<_>>()),
+            )
+        });
+
+        StructDefinitionFields::Move { fields }
+    }
+
+    fn function_def(&mut self) {
+        let signature = self.function_signature();
+        let num_locals = self.index(self.options.max_locals);
+        let locals = init!(num_locals, {
+            (
+                Spanned::unsafe_no_loc(Var_(self.identifier().into())),
+                self.typ(&signature.type_formals),
+            )
+        });
+        let fun = Function_ {
+            visibility: FunctionVisibility::Public,
+            is_entry: false,
+            acquires: Vec::new(),
+            specifications: Vec::new(),
+            signature,
+            body: FunctionBody::Move {
+                locals,
+                code: vec![Spanned::unsafe_no_loc(Block_ {
+                    label: Spanned::unsafe_no_loc(BlockLabel_(Symbol::from("b0"))),
+                    statements: VecDeque::from(vec![Spanned::unsafe_no_loc(
+                        Statement_::return_empty(),
+                    )]),
+                })],
+            },
+        };
+        let fun_name = FunctionName(self.identifier().into());
+        self.current_module
+            .functions
+            .push((fun_name, Spanned::unsafe_no_loc(fun)));
+    }
+
+    fn struct_def(&mut self, abilities: BTreeSet<Ability>) {
+        let name = StructName(self.identifier().into());
+        let type_parameters = self.struct_type_parameters();
+        let fields = self.struct_fields(&type_parameters);
+        let strct = StructDefinition_ {
+            abilities,
+            name,
+            type_formals: type_parameters,
+            fields,
+            invariants: vec![],
+        };
+        self.current_module
+            .structs
+            .push(Spanned::unsafe_no_loc(strct))
+    }
+
+    fn imports(callees: &Set<Symbol>) -> Vec<ImportDefinition> {
+        callees
+            .iter()
+            .map(|ident| {
+                let module_name = ModuleName(*ident);
+                let qualified_mod_ident = ModuleIdent::new(module_name, AccountAddress::ZERO);
+                ImportDefinition::new(qualified_mod_ident, None)
+            })
+            .collect()
+    }
+
+    fn gen(mut self) -> ModuleDefinition {
+        let num_structs = self.index(self.options.max_structs) + 1;
+        let num_functions = self.index(self.options.max_functions) + 1;
+        // TODO: the order of generation here means that functions can't take resources as arguments.
+        // We will need to generate (valid) bytecode bodies for these functions before we allow
+        // resources.
+        {
+            // We generate a function at this point as an "entry point" into the module: since we
+            // haven't generated any structs yet, this function will only take base types as its input
+            // parameters. Likewise we can't take references since there isn't any value stack.
+            let simple_types = self.options.simple_types_only;
+            self.options.simple_types_only = true;
+            self.function_def();
+            self.options.simple_types_only = simple_types;
+        }
+        // TODO generate abilities
+        let abilities = BTreeSet::from_iter(vec![Ability::Copy, Ability::Drop, Ability::Store]);
+        (0..num_structs).for_each(|_| self.struct_def(abilities.clone()));
+        // TODO/XXX: We can allow references to resources here
+        (0..num_functions).for_each(|_| self.function_def());
+        if self.options.add_resources {
+            // TODO generate abilities
+            let abilities = BTreeSet::from_iter(vec![Ability::Key, Ability::Store]);
+            (0..num_structs).for_each(|_| self.struct_def(abilities.clone()));
+        }
+        self.current_module
+    }
+
+    pub fn create(
+        gen: &'a mut StdRng,
+        options: ModuleGeneratorOptions,
+        callable_modules: &Set<Symbol>,
+    ) -> ModuleDefinition {
+        // TODO: Generation of struct and function handles to the `callable_modules`
+        let module_name = {
+            let len = gen.gen_range(10..options.max_string_size);
+            random_string(gen, len)
+        };
+        let current_module = ModuleDefinition {
+            loc: Spanned::unsafe_no_loc(0).loc,
+            identifier: ModuleIdent {
+                name: ModuleName(module_name.into()),
+                address: AccountAddress::random(),
+            },
+            friends: Vec::new(),
+            imports: Self::imports(callable_modules),
+            explicit_dependency_declarations: Vec::new(),
+            structs: Vec::new(),
+            functions: Vec::new(),
+            constants: Vec::new(),
+            synthetics: Vec::new(),
+        };
+        Self {
+            options,
+            current_module,
+            gen,
+        }
+        .gen()
+    }
+}
diff --git a/vendors/move/crates/testing-infra/module-generation/src/lib.rs b/vendors/move/crates/testing-infra/module-generation/src/lib.rs
new file mode 100644
index 000000000..e6783cf00
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/src/lib.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod generator;
+mod options;
+mod padding;
+mod utils;
+
+pub use generator::{
+    generate_module, generate_modules, generate_verified_modules, ModuleGenerator,
+};
+pub use options::ModuleGeneratorOptions;
+pub use padding::Pad;
diff --git a/vendors/move/crates/testing-infra/module-generation/src/options.rs b/vendors/move/crates/testing-infra/module-generation/src/options.rs
new file mode 100644
index 000000000..eaedc6061
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/src/options.rs
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Defines constants and options that are used for module generation
+
+#[derive(Clone, Debug)]
+pub struct ModuleGeneratorOptions {
+    /// The maximum number of locals that can be defined within a generated function definition.
+    pub max_locals: usize,
+    /// The maximum number of fields that will be generated for any struct.
+    pub max_fields: usize,
+    pub min_fields: usize,
+    /// The maximum number of structs that can be generated for a module
+    pub max_structs: usize,
+    /// The maximum number of functions that can be generated for a module.
+    pub max_functions: usize,
+    /// The maximum number of type parameters functions and structs.
+    pub max_ty_params: usize,
+    /// The maximum size that generated byte arrays can be.
+    pub byte_array_max_size: usize,
+    /// The maximum size that a generated string can be.
+    pub max_string_size: usize,
+    /// The maximum number of arguments to generated function definitions.
+    pub max_function_call_size: usize,
+    /// The maximum number of return types of generated function definitions.
+    pub max_ret_types_size: usize,
+    /// Whether or not generate modules should only contain simple (non-reference, or nested
+    /// struct) types.
+    pub simple_types_only: bool,
+    /// Whether references are allowed to be generated for e.g. function parameters, locals.
+    pub references_allowed: bool,
+    /// Whether the generated modules should have any resources declared.
+    pub add_resources: bool,
+    /// The minimum number of entries in any table
+    pub min_table_size: usize,
+    /// If set, all functions with type parameters will have arguments of those types as well.
+    pub args_for_ty_params: bool,
+}
+
+impl Default for ModuleGeneratorOptions {
+    fn default() -> Self {
+        Self {
+            min_fields: 1,
+            max_locals: 10,
+            max_fields: 20,
+            max_structs: 100,
+            max_functions: 100,
+            max_ty_params: 5,
+            byte_array_max_size: 64,
+            max_string_size: 32,
+            max_function_call_size: 23,
+            max_ret_types_size: 4,
+            simple_types_only: false,
+            references_allowed: true,
+            add_resources: true,
+            min_table_size: 1,
+            args_for_ty_params: false,
+        }
+    }
+}
diff --git a/vendors/move/crates/testing-infra/module-generation/src/padding.rs b/vendors/move/crates/testing-infra/module-generation/src/padding.rs
new file mode 100644
index 000000000..10d0defe9
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/src/padding.rs
@@ -0,0 +1,75 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{options::ModuleGeneratorOptions, utils::random_string};
+use move_binary_format::file_format::{Bytecode, CompiledModule, Signature};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use rand::{rngs::StdRng, Rng, SeedableRng};
+
+///////////////////////////////////////////////////////////////////////////
+// Padding of tables in compiled modules
+///////////////////////////////////////////////////////////////////////////
+
+pub struct Pad {
+    gen: StdRng,
+    table_size: usize,
+    options: ModuleGeneratorOptions,
+}
+
+impl Pad {
+    pub fn pad(table_size: usize, module: &mut CompiledModule, options: ModuleGeneratorOptions) {
+        let seed: [u8; 32] = [1; 32];
+        let mut slf = Self {
+            gen: StdRng::from_seed(seed),
+            table_size,
+            options,
+        };
+        slf.pad_cosntant_table(module);
+        slf.pad_identifier_table(module);
+        slf.pad_address_identifier_table(module);
+        slf.pad_signatures(module);
+        slf.pad_function_bodies(module);
+    }
+
+    fn pad_cosntant_table(&mut self, module: &mut CompiledModule) {
+        // TODO actual constant generation
+        module.constant_pool = vec![]
+    }
+
+    fn pad_identifier_table(&mut self, module: &mut CompiledModule) {
+        module.identifiers = (0..(self.table_size + module.identifiers.len()))
+            .map(|_| {
+                let len = self.gen.gen_range(10..self.options.max_string_size);
+                Identifier::new(random_string(&mut self.gen, len)).unwrap()
+            })
+            .collect()
+    }
+
+    fn pad_address_identifier_table(&mut self, module: &mut CompiledModule) {
+        module.address_identifiers = (0..(self.table_size + module.address_identifiers.len()))
+            .map(|_| AccountAddress::random())
+            .collect()
+    }
+
+    fn pad_function_bodies(&mut self, module: &mut CompiledModule) {
+        for fdef in module.function_defs.iter_mut() {
+            if let Some(code) = &mut fdef.code {
+                code.code = vec![
+                    Bytecode::LdTrue,
+                    Bytecode::LdTrue,
+                    Bytecode::Pop,
+                    Bytecode::Pop,
+                    Bytecode::Ret,
+                ]
+            }
+        }
+    }
+
+    // Ensure that locals signatures always contain an empty signature
+    fn pad_signatures(&mut self, module: &mut CompiledModule) {
+        if module.signatures.iter().all(|v| !v.is_empty()) {
+            module.signatures.push(Signature(Vec::new()));
+        }
+    }
+}
diff --git a/vendors/move/crates/testing-infra/module-generation/src/utils.rs b/vendors/move/crates/testing-infra/module-generation/src/utils.rs
new file mode 100644
index 000000000..07a03ee6e
--- /dev/null
+++ b/vendors/move/crates/testing-infra/module-generation/src/utils.rs
@@ -0,0 +1,15 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use rand::{distributions::Alphanumeric, rngs::StdRng, Rng};
+
+pub fn random_string(rng: &mut StdRng, len: usize) -> String {
+    if len == 0 {
+        "".to_string()
+    } else {
+        let mut string = "a".to_string();
+        (1..len).for_each(|_| string.push(char::from(rng.sample(Alphanumeric))));
+        string
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/Cargo.toml b/vendors/move/crates/testing-infra/test-generation/Cargo.toml
new file mode 100644
index 000000000..7e9bd849b
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "test-generation"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Tool for generating tests for the bytecode verifier and Move VM runtime"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+clap = { version = "3.1.8", features = ["derive"] }
+crossbeam-channel = "0.5.0"
+getrandom = "0.2.2"
+hex = "0.4.3"
+itertools = "0.10.0"
+module-generation = { path = "../module-generation" }
+move-binary-format = { path = "../../move-binary-format" }
+num_cpus = "1.13.0"
+once_cell = "1.7.2"
+rand = "0.8.3"
+tracing = "0.1.26"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-stdlib = { path = "../../move-stdlib" }
+move-vm-runtime = { path = "../../move-vm/runtime" }
+move-vm-test-utils = { path = "../../move-vm/test-utils" }
+move-vm-types = { path = "../../move-vm/types" }
diff --git a/vendors/move/crates/testing-infra/test-generation/README.md b/vendors/move/crates/testing-infra/test-generation/README.md
new file mode 100644
index 000000000..547ea2fe2
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/README.md
@@ -0,0 +1,107 @@
+---
+id: bytecode-test-generation
+title: Bytecode Test Generation Tool
+custom_edit_url: https://github.com/move-language/move/edit/main/language/testing-infra/test-generation/README.md
+---
+
+# Bytecode Test Generation Tool
+
+## Overview
+
+This tool can generate known-valid or known-invalid Move bytecode programs.
+Known-valid means that the program is valid by construction; it was constructed
+according to a formal specification of the Move bytecode language. Known-invalid
+bytecode programs are those that diverge from the specification in a controlled way.
+
+The generated modules are checked by the Move bytecode verifier and then run on the VM runtime.
+If the module contains known-valid bytecode, we should expect that the program will
+pass the bytecode verifier. If it does not pass the verifier then this indicates that either
+there is a bug in the bytecode verifier or the formal specification of the failing
+instruction is incorrect. Likewise, it should also run successfully on the VM runtime.
+
+If the module contains known-invalid bytecode, we should expect that the verifier will
+reject the module. If the verifier does not reject the module this indicates again
+that either there is a bug in the bytecode verifier or the formal specification is
+incorrect. Likewise for the VM runtime.
+
+## Usage
+
+### Building and Configuration
+
+To build the tool
+- `cargo build`
+
+There are configuration options (and explanations for their behavior) in `src/config.rs`.
+Most of the time these should be left as the provided defaults.
+
+### Running
+
+The tool expects up to two arguments:
+- `--iterations`: The number of programs that should be generated and tested
+- `--output`: (Optional) If provided, this is the path to which modules that result in errors will be serialied and saved. If not provided, failing cases will be logged to the console.
+
+Additionally, there is an optional flag `RUST_LOG` that controls the verbosity of debug
+information. It goes from `error`, the least information, to `debug` the most information.
+The most common setting for this flag is `info` which will print stats such as the number
+of iterations, the number of verified and executed programs, etc.
+
+To run the tool
+- `RUST_LOG=info cargo run -- --iterations N --output PATH`
+
+## Architecture
+
+This tool works by modeling the state of the VM abstractly, and by modeling the bytecode
+instructions in terms of that abstract state. The abstract state is defined in
+`abstact_state.rs`. It consists of type-level modeling of the VM stack, locals, and borrow
+graph.
+
+Instructions are defined in terms of their preconditions and effects. These definitions are
+found in `summaries.rs` and use macros defined in `transitions.rs`. The preconditions of
+an instruction are predicates that are true or false for a given abstract state. For example
+the `Bytecode::Add` instruction requires the stack to contain two integers. This is modeled
+by saying that the preconditions of `Bytecode::Add` are
+- `state_stack_has!(0, Some(SignatureToken::U64))`
+- `state_stack_has!(1, Some(SignatureToken::U64))`
+where indexes 0 and 1 refer to the top two elements of the stack.
+
+The effects of an instruction describe how the instruction modifies the abstract state. For
+`Bytecode::Add` the effects are that it performs two pops on the stack and pushes a
+`SignatureToken::U64` to the stack.
+
+In this way, we are able to fully capture what each instruction needs and does.
+This information is used to generate valid bytecode programs.
+
+Generation of bytecode programs proceeds as follows:
+1. In `lib.rs` the generator loop begins by initializing a `ModuleBuilder`
+2. The `ModuleBuilder`, defined in `../utils/src/module_generator.rs`, generates a module definition
+3. The `ModuleBuilder` calls the `generator` defined in `bytecode_generator.rs` to fill in function bodies within the module
+4. The `generator` builds a control flow graph (CFG) in `control_flow_graph.rs`. Each block of the CFG is assigned a valid starting and ending abstract state.
+5. The `generator` fills in blocks of the CFG according to the following algorithm:
+    1. Given starting abstract state `AS1`, let `candidates` be the list of all instructions whose preconditions are all satisfied in `AS1`
+        - If invalid generation is desired, then let `x` preconditions be `false`
+    2. Select candidate `instr` from `candidates` according to the stack height heuristic
+        - The stack height heuristic selects instructions that add to the stack when the height is small, and instructions that subtract from the stack when the height is large
+    3. Apply the effects of `instr` to `AS1`, producing `AS2`
+    4. If the stack is empty, terminate, otherwise repeat from step a with `AS2`
+
+This results in the generation of one module. The module is then given to the bytecode
+verifier and the bytecode verifier's behavior (i.e. no verification errors, some verification
+errors, panic, crash) is recorded. Likewise with the VM runtime (except with runtime errors
+rather than verification errors). Depending on the configuration that this tool is built
+with, if the module caused a verification error, panic, or crash the module will then be
+printed out or serialized to disk.
+
+This will continue for the number of iterations specified when invoking the tool.
+
+Other files:
+- `error.rs` defines an error struct which is used to pass error messages.
+- `tests/` contains a set of files that test the preconditions and effects of each bytecode instruction
+
+## Extending the tool
+
+The most common change or extension to this tool will probably be changing instruction
+preconditions and effects. To do that follow these steps:
+1. See if there already a macro defined in `transitions.rs` that captures your desired precondition/effect
+2. If the macro is already defined, just add it to the summary of the instruction being changed in `summaries.rs`
+3. If a suitable macro does not exist, define it in `transitions.rs`. Look at other macros in that file for examples.
+4. Macros in `transitions.rs` have access to the public fields and functions of the `AbstractState`. If your macro needs access to something more, add a new helper method in `abstract_state.rs` and then invoke it in the macro.
diff --git a/vendors/move/crates/testing-infra/test-generation/measure-coverage.sh b/vendors/move/crates/testing-infra/test-generation/measure-coverage.sh
new file mode 100644
index 000000000..09738f8bc
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/measure-coverage.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# Check that the test directory and report path arguments are provided
+if [ $# -lt 1 ]
+then
+	echo "Usage: $0 <outdir> [--batch]"
+	echo "The resulting coverage report will be stored in <outdir>."
+	echo "--batch will skip all prompts."
+	exit 1
+fi
+
+# User prompts will be skipped if '--batch' is given as the third argument
+SKIP_PROMPTS=0
+if [ $# -eq 2 -a "$2" == "--batch" ]
+then
+	SKIP_PROMPTS=1
+fi
+
+# Set the directory to which the report will be saved
+COVERAGE_DIR=$1
+
+# This needs to run in test-generation
+TOOL_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+if [ $(pwd) != $TOOL_DIR  ]
+then
+	echo "Error: This needs to run from test-generation/, not in $(pwd)" >&2
+	exit 1
+fi
+
+set -e
+
+# Check that grcov is installed
+if ! [ -x "$(command -v grcov)" ]; then
+	echo "Error: grcov is not installed." >&2
+	if [ $SKIP_PROMPTS -eq 0 ]
+	then
+		read -p "Install grcov? [yY/*] " -n 1 -r
+		echo ""
+		if [[ ! $REPLY =~ ^[Yy]$ ]]
+		then
+			[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+		fi
+		cargo install grcov
+	else
+		exit 1
+	fi
+fi
+
+# Check that lcov is installed
+if ! [ -x "$(command -v lcov)" ]; then
+	echo "Error: lcov is not installed." >&2
+	echo "Documentation for lcov can be found at http://ltp.sourceforge.net/coverage/lcov.php"
+	echo "If on macOS and using homebrew, run 'brew install lcov'"
+	exit 1
+fi
+
+# Warn that cargo clean will happen
+if [ $SKIP_PROMPTS -eq 0 ]
+then
+	read -p "Generate coverage report? This will run cargo clean. [yY/*] " -n 1 -r
+	echo ""
+	if [[ ! $REPLY =~ ^[Yy]$ ]]
+	then
+		[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+	fi
+fi
+
+# Set flags for coverage generation
+export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Coverflow-checks=off -Zno-landing-pads"
+export CARGO_INCREMENTAL=0
+
+# Clean the project
+echo "Cleaning project..."
+cargo clean
+
+# Run bytecode test generator
+echo "Running bytecode test generator..."
+RUST_LOG=info cargo run -- --iterations 1000
+
+# Make the coverage directory if it doesn't exist
+if [ ! -d $COVERAGE_DIR ]; then
+	mkdir $COVERAGE_DIR;
+fi
+
+# Generate lcov report
+echo "Generating lcov report at ${COVERAGE_DIR}/lcov.info..."
+grcov $TOOL_DIR/../../../target/ -t lcov --llvm --branch --ignore-dir "/*" -o $COVERAGE_DIR/lcov.info
+
+# Generate HTML report
+echo "Generating report at ${COVERAGE_DIR}..."
+# Flag "--ignore-errors source" ignores missing source files
+(cd $TOOL_DIR/../../../; genhtml -o $COVERAGE_DIR --show-details --highlight --ignore-errors source --legend --branch-coverage $COVERAGE_DIR/lcov.info)
+
+echo "Done. Please view report at ${COVERAGE_DIR}/index.html"
diff --git a/vendors/move/crates/testing-infra/test-generation/src/abstract_state.rs b/vendors/move/crates/testing-infra/test-generation/src/abstract_state.rs
new file mode 100644
index 000000000..4aa3ad0f9
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/abstract_state.rs
@@ -0,0 +1,722 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{borrow_graph::BorrowGraph, error::VMError};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        empty_module, Ability, AbilitySet, CompiledModule, FieldInstantiation,
+        FieldInstantiationIndex, FunctionHandleIndex, FunctionInstantiation,
+        FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiation, StructDefInstantiationIndex, StructDefinitionIndex, TableIndex,
+    },
+};
+use std::{
+    collections::{HashMap, HashSet},
+    fmt,
+};
+
+/// The BorrowState denotes whether a local is `Available` or
+/// has been moved and is `Unavailable`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum BorrowState {
+    Available,
+    Unavailable,
+}
+
+/// This models a value on the stack or in the locals
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AbstractValue {
+    /// Represents the type of the value
+    pub token: SignatureToken,
+
+    /// Represents the abilities of the value
+    pub abilities: AbilitySet,
+}
+
+/// This models the mutability of a reference
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Mutability {
+    /// Represents a mutable reference
+    Mutable,
+
+    /// Represents an immutable reference
+    Immutable,
+
+    /// When we don't need to specify whether
+    /// the reference is mutable or immutable
+    Either,
+}
+
+impl AbstractValue {
+    /// Create a new primitive `AbstractValue` given its type; the kind will be `Copyable`
+    pub fn new_primitive(token: SignatureToken) -> AbstractValue {
+        assert!(
+            match token {
+                SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::Reference(_)
+                | SignatureToken::MutableReference(_)
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::TypeParameter(_) => false,
+                SignatureToken::Bool
+                | SignatureToken::Address
+                | SignatureToken::U8
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::U256 => true,
+            },
+            "AbstractValue::new_primitive must be applied with primitive type"
+        );
+        AbstractValue {
+            token,
+            abilities: AbilitySet::PRIMITIVES,
+        }
+    }
+
+    /// Create a new reference `AbstractValue` given its type and kind
+    pub fn new_reference(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        assert!(
+            matches!(
+                token,
+                SignatureToken::Reference(_) | SignatureToken::MutableReference(_)
+            ),
+            "AbstractValue::new_reference must be applied with a reference type"
+        );
+        AbstractValue { token, abilities }
+    }
+
+    /// Create a new struct `AbstractValue` given its type and kind
+    pub fn new_struct(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        assert!(
+            matches!(token, SignatureToken::Struct(_)),
+            "AbstractValue::new_struct must be applied with a struct type"
+        );
+        AbstractValue { token, abilities }
+    }
+
+    pub fn new_value(token: SignatureToken, abilities: AbilitySet) -> AbstractValue {
+        AbstractValue { token, abilities }
+    }
+
+    /// Predicate on whether the type of the abstract value is generic -- it is if it contains a
+    /// type parameter.
+    pub fn is_generic(&self) -> bool {
+        Self::is_generic_token(&self.token)
+    }
+
+    fn is_generic_token(token: &SignatureToken) -> bool {
+        match token {
+            SignatureToken::TypeParameter(_) => true,
+            SignatureToken::StructInstantiation(_, _) => true,
+            SignatureToken::Reference(tok) | SignatureToken::MutableReference(tok) => {
+                Self::is_generic_token(tok)
+            },
+            _ => false,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct CallGraph {
+    calls: HashMap<FunctionHandleIndex, HashSet<FunctionHandleIndex>>,
+    max_function_handle_index: usize,
+}
+
+impl CallGraph {
+    pub fn new(max_function_handle_index: usize) -> Self {
+        Self {
+            calls: HashMap::new(),
+            max_function_handle_index,
+        }
+    }
+
+    pub fn add_call(&mut self, caller: FunctionHandleIndex, callee: FunctionHandleIndex) {
+        self.calls
+            .entry(caller)
+            .or_insert_with(HashSet::new)
+            .insert(callee);
+    }
+
+    pub fn can_call(&self, my_index: FunctionHandleIndex) -> Vec<FunctionHandleIndex> {
+        // We want the set of function handles that don't lead to a recursive call-graph
+        (0..self.max_function_handle_index)
+            .filter(|index| {
+                self.call_depth(my_index, FunctionHandleIndex(*index as TableIndex))
+                    .is_some()
+            })
+            .map(|i| FunctionHandleIndex(i as TableIndex))
+            .collect()
+    }
+
+    pub fn max_calling_depth(&self, index: FunctionHandleIndex) -> usize {
+        let mut instantiation_depth = 0;
+        for (caller, callees) in self.calls.iter() {
+            for callee in callees.iter() {
+                if *callee == index {
+                    let depth = self.max_calling_depth(*caller) + 1;
+                    instantiation_depth = std::cmp::max(depth, instantiation_depth);
+                }
+            }
+        }
+        instantiation_depth
+    }
+
+    /// None if recursive, Some(index) if non-recursive, and index is the length of the maximal call
+    /// graph path originating at caller, and calling through callee.
+    pub fn call_depth(
+        &self,
+        caller: FunctionHandleIndex,
+        callee: FunctionHandleIndex,
+    ) -> Option<usize> {
+        if caller == callee {
+            return None;
+        }
+        match self.calls.get(&callee) {
+            None => Some(1),
+            Some(callee_callees) => {
+                if callee_callees.contains(&caller) {
+                    return None;
+                }
+                let call_depths = callee_callees
+                    .iter()
+                    .filter_map(|callee_callee| self.call_depth(caller, *callee_callee))
+                    .collect::<Vec<_>>();
+                if call_depths.len() < callee_callees.len() {
+                    // We found a recursive call
+                    None
+                } else {
+                    let max = call_depths.iter().max().unwrap();
+                    Some(max + 1)
+                }
+            },
+        }
+    }
+}
+
+/// During the generation of a bytecode sequence, specific instantiations may need to be made, that
+/// may not yet exist in the underlying module. Instead of mutating the underlying module in order to record these instantiations in the
+/// locals signature table, we instead build wrapper around the underlying module containing the
+/// type instantiations, and at the end materialize this updated signature pool into a module. We
+/// also need the ability to quickly determine if an instantiation has already been created, and if
+/// so, at which index. So this also keeps a reverse lookup table of instantiation to
+/// SignatureIndex.
+#[derive(Debug, Clone)]
+pub struct InstantiableModule {
+    // A reverse lookup table for instantiations.
+    sig_instance_for_offset: Vec<Vec<SignatureToken>>,
+    instantiations: HashMap<Vec<SignatureToken>, SignatureIndex>,
+
+    struct_instance_for_offset: Vec<StructDefInstantiation>,
+    struct_instantiations: HashMap<StructDefInstantiation, StructDefInstantiationIndex>,
+
+    func_instance_for_offset: Vec<FunctionInstantiation>,
+    function_instantiations: HashMap<FunctionInstantiation, FunctionInstantiationIndex>,
+
+    field_instance_for_offset: Vec<FieldInstantiation>,
+    field_instantiations: HashMap<FieldInstantiation, FieldInstantiationIndex>,
+
+    pub module: CompiledModule,
+}
+
+impl InstantiableModule {
+    pub fn new(module: CompiledModule) -> Self {
+        Self {
+            instantiations: module
+                .signatures()
+                .iter()
+                .enumerate()
+                .map(|(index, sig)| (sig.0.clone(), SignatureIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            sig_instance_for_offset: module
+                .signatures()
+                .iter()
+                .map(|loc_sig| loc_sig.0.clone())
+                .collect(),
+
+            struct_instantiations: module
+                .struct_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, si)| (si.clone(), StructDefInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            struct_instance_for_offset: module.struct_instantiations().to_vec(),
+
+            function_instantiations: module
+                .function_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, fi)| (fi.clone(), FunctionInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            func_instance_for_offset: module.function_instantiations().to_vec(),
+
+            field_instantiations: module
+                .field_instantiations()
+                .iter()
+                .enumerate()
+                .map(|(index, fi)| (fi.clone(), FieldInstantiationIndex(index as TableIndex)))
+                .collect::<HashMap<_, _>>(),
+            field_instance_for_offset: module.field_instantiations().to_vec(),
+            module,
+        }
+    }
+
+    /// If the `instantiant` is not in the `instantiations` table, this adds the instantiant to the
+    /// `instance_for_offset` for table, and adds the index to the reverse lookup table. Returns
+    /// the SignatureIndex for the `instantiant`.
+    pub fn add_instantiation(&mut self, instantiant: Vec<SignatureToken>) -> SignatureIndex {
+        match self.instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    SignatureIndex(self.sig_instance_for_offset.len() as TableIndex);
+                self.instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.sig_instance_for_offset.push(instantiant);
+                current_index
+            },
+        }
+    }
+
+    /// If the `instantiant` is not in the `struct_instantiations` table, this adds the
+    /// instantiant to the `struct_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_struct_instantiation(
+        &mut self,
+        instantiant: StructDefInstantiation,
+    ) -> StructDefInstantiationIndex {
+        match self.struct_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index = StructDefInstantiationIndex(
+                    self.struct_instance_for_offset.len() as TableIndex,
+                );
+                self.struct_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.struct_instance_for_offset.push(instantiant);
+                current_index
+            },
+        }
+    }
+
+    /// If the `instantiant` is not in the `function_instantiations` table, this adds the
+    /// instantiant to the `func_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_function_instantiation(
+        &mut self,
+        instantiant: FunctionInstantiation,
+    ) -> FunctionInstantiationIndex {
+        match self.function_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    FunctionInstantiationIndex(self.func_instance_for_offset.len() as TableIndex);
+                self.function_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.func_instance_for_offset.push(instantiant);
+                current_index
+            },
+        }
+    }
+
+    /// If the `instantiant` is not in the `field_instantiations` table, this adds the
+    /// instantiant to the `field_instance_for_offset` for table, and adds the index to the
+    /// reverse lookup table.
+    /// Returns the SignatureIndex for the `instantiant`.
+    pub fn add_field_instantiation(
+        &mut self,
+        instantiant: FieldInstantiation,
+    ) -> FieldInstantiationIndex {
+        match self.field_instantiations.get(&instantiant) {
+            Some(index) => *index,
+            None => {
+                let current_index =
+                    FieldInstantiationIndex(self.field_instance_for_offset.len() as TableIndex);
+                self.field_instantiations
+                    .insert(instantiant.clone(), current_index);
+                self.field_instance_for_offset.push(instantiant);
+                current_index
+            },
+        }
+    }
+
+    /// Returns the type instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn instantiantiation_at(&self, index: SignatureIndex) -> &Vec<SignatureToken> {
+        match self.sig_instance_for_offset.get(index.0 as usize) {
+            Some(vec) => vec,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            },
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn struct_instantiantiation_at(
+        &self,
+        index: StructDefInstantiationIndex,
+    ) -> &StructDefInstantiation {
+        match self.struct_instance_for_offset.get(index.0 as usize) {
+            Some(struct_inst) => struct_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            },
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn function_instantiantiation_at(
+        &self,
+        index: FunctionInstantiationIndex,
+    ) -> &FunctionInstantiation {
+        match self.func_instance_for_offset.get(index.0 as usize) {
+            Some(func_inst) => func_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            },
+        }
+    }
+
+    /// Returns the struct instantiation at `index`. Errors if the instantiation does not exist.
+    pub fn field_instantiantiation_at(
+        &self,
+        index: FieldInstantiationIndex,
+    ) -> &FieldInstantiation {
+        match self.field_instance_for_offset.get(index.0 as usize) {
+            Some(field_inst) => field_inst,
+            None => {
+                panic!("Unable to get instantiation at offset: {:#?}", index);
+            },
+        }
+    }
+
+    /// Consumes self, and adds the instantiations that have been built up to the underlying
+    /// module, and returns the resultant compiled module.
+    pub fn instantiate(self) -> CompiledModule {
+        let mut module = self.module;
+        module.signatures = self
+            .sig_instance_for_offset
+            .into_iter()
+            .map(Signature)
+            .collect();
+        module.struct_def_instantiations = self.struct_instance_for_offset;
+        module.function_instantiations = self.func_instance_for_offset;
+        module.field_instantiations = self.field_instance_for_offset;
+        module
+    }
+}
+
+/// An AbstractState represents an abstract view of the execution of the
+/// Move VM. Rather than considering values of items on the stack or in
+/// the locals, we only consider their type, represented by a `AbstractValue`
+/// and their availibility, represented by the `BorrowState`.
+#[derive(Debug, Clone)]
+pub struct AbstractState {
+    /// A Vector of `AbstractValue`s representing the VM value stack
+    stack: Vec<AbstractValue>,
+
+    /// A vector of type kinds for any generic function type parameters of the function that we are
+    /// in.
+    pub instantiation: Vec<AbilitySet>,
+
+    /// A HashMap mapping local indicies to `AbstractValue`s and `BorrowState`s
+    locals: HashMap<usize, (AbstractValue, BorrowState)>,
+
+    /// Temporary location for storing the results of instruction effects for
+    /// access by subsequent instructions' effects
+    register: Option<AbstractValue>,
+
+    /// The module state
+    pub module: InstantiableModule,
+
+    /// The global resources acquired by the function corresponding to this abstract state
+    pub acquires_global_resources: Vec<StructDefinitionIndex>,
+
+    /// This flag is set when applying an instruction that should result in an error
+    /// in the VM runtime.
+    aborted: bool,
+
+    /// This flag controls whether or not control flow operators are allowed to be applied to the
+    /// abstract state.
+    control_flow_allowed: bool,
+
+    /// This graph stores borrow information needed to ensure that bytecode instructions
+    /// are memory safe
+    #[allow(dead_code)]
+    borrow_graph: BorrowGraph,
+
+    pub call_graph: CallGraph,
+}
+
+impl AbstractState {
+    /// Create a new AbstractState with empty stack, locals, and register
+    pub fn new() -> AbstractState {
+        let compiled_module = empty_module();
+        AbstractState {
+            stack: Vec::new(),
+            instantiation: Vec::new(),
+            locals: HashMap::new(),
+            register: None,
+            module: InstantiableModule::new(compiled_module),
+            acquires_global_resources: Vec::new(),
+            aborted: false,
+            control_flow_allowed: false,
+            borrow_graph: BorrowGraph::new(0),
+            call_graph: CallGraph::new(0),
+        }
+    }
+
+    /// Create a new AbstractState given a list of `SignatureTokens` that will be
+    /// the (available) locals that the state will have, as well as the module state
+    pub fn from_locals(
+        module: CompiledModule,
+        locals: HashMap<usize, (AbstractValue, BorrowState)>,
+        instantiation: Vec<AbilitySet>,
+        acquires_global_resources: Vec<StructDefinitionIndex>,
+        call_graph: CallGraph,
+    ) -> AbstractState {
+        let locals_len = locals.len();
+        let module = InstantiableModule::new(module);
+        AbstractState {
+            stack: Vec::new(),
+            instantiation,
+            locals,
+            module,
+            register: None,
+            acquires_global_resources,
+            aborted: false,
+            control_flow_allowed: false,
+            borrow_graph: BorrowGraph::new(locals_len as u8),
+            call_graph,
+        }
+    }
+
+    /// Get the register value
+    pub fn register_copy(&self) -> Option<AbstractValue> {
+        self.register.clone()
+    }
+
+    /// Get the register value and set it to `None`
+    pub fn register_move(&mut self) -> Option<AbstractValue> {
+        let value = self.register.clone();
+        self.register = None;
+        value
+    }
+
+    /// Set the register value and set it to `None`
+    pub fn register_set(&mut self, value: AbstractValue) {
+        self.register = Some(value);
+    }
+
+    /// Add a `AbstractValue` to the stack
+    pub fn stack_push(&mut self, item: AbstractValue) {
+        // Programs that are large enough to exceed this bound
+        // will not be generated
+        debug_assert!(self.stack.len() < usize::max_value());
+        self.stack.push(item);
+    }
+
+    /// Add a `AbstractValue` to the stack from the register
+    /// If the register is `None` return a `VMError`
+    pub fn stack_push_register(&mut self) -> Result<(), VMError> {
+        if let Some(abstract_value) = self.register_move() {
+            // Programs that are large enough to exceed this bound
+            // will not be generated
+            debug_assert!(self.stack.len() < usize::max_value());
+            self.stack.push(abstract_value);
+            Ok(())
+        } else {
+            Err(VMError::new("Error: No value in register".to_string()))
+        }
+    }
+
+    /// Remove an `AbstractValue` from the stack if it exists to the register
+    /// If it does not exist return a `VMError`.
+    pub fn stack_pop(&mut self) -> Result<(), VMError> {
+        if self.stack.is_empty() {
+            Err(VMError::new("Pop attempted on empty stack".to_string()))
+        } else {
+            self.register = self.stack.pop();
+            Ok(())
+        }
+    }
+
+    /// Get the `AbstractValue` at index `index` on the stack if it exists.
+    /// Index 0 is the top of the stack.
+    pub fn stack_peek(&self, index: usize) -> Option<AbstractValue> {
+        if index < self.stack.len() {
+            Some(self.stack[self.stack.len() - 1 - index].clone())
+        } else {
+            None
+        }
+    }
+
+    /// Get the length of the stack.
+    pub fn stack_len(&self) -> usize {
+        self.stack.len()
+    }
+
+    /// Check if the local at index `i` exists
+    pub fn local_exists(&self, i: usize) -> bool {
+        self.locals.get(&i).is_some()
+    }
+
+    /// Get the local at index `i` if it exists
+    pub fn local_get(&self, i: usize) -> Option<&(AbstractValue, BorrowState)> {
+        self.locals.get(&i)
+    }
+
+    /// Place the local at index `i` if it exists into the register
+    /// If it does not exist return a `VMError`.
+    pub fn local_take(&mut self, i: usize) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            self.register = Some(abstract_value.clone());
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Place a reference to the local at index `i` if it exists into the register
+    /// If it does not exist return a `VMError`.
+    pub fn local_take_borrow(&mut self, i: usize, mutability: Mutability) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            let ref_token = match mutability {
+                Mutability::Mutable => {
+                    SignatureToken::MutableReference(Box::new(abstract_value.token.clone()))
+                },
+                Mutability::Immutable => {
+                    SignatureToken::Reference(Box::new(abstract_value.token.clone()))
+                },
+                Mutability::Either => {
+                    return Err(VMError::new("Mutability cannot be Either".to_string()))
+                },
+            };
+            self.register = Some(AbstractValue::new_reference(
+                ref_token,
+                abstract_value.abilities,
+            ));
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Set the availability of the local at index `i`
+    /// If it does not exist return a `VMError`.
+    pub fn local_set(&mut self, i: usize, availability: BorrowState) -> Result<(), VMError> {
+        if let Some((abstract_value, _)) = self.locals.clone().get(&i) {
+            self.locals
+                .insert(i, (abstract_value.clone(), availability));
+            Ok(())
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Check whether a local is in a particular `BorrowState`
+    /// If the local does not exist return a `VMError`.
+    pub fn local_availability_is(
+        &self,
+        i: usize,
+        availability: BorrowState,
+    ) -> Result<bool, VMError> {
+        if let Some((_, availability1)) = self.locals.get(&i) {
+            Ok(availability == *availability1)
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Check whether a local has a particular `Ability`
+    /// If the local does not exist return a `VMError`.
+    pub fn local_has_ability(&self, i: usize, ability: Ability) -> Result<bool, VMError> {
+        if let Some((abstract_value, _)) = self.locals.get(&i) {
+            Ok(abstract_value.abilities.has_ability(ability))
+        } else {
+            Err(VMError::new(format!("Local does not exist at index {}", i)))
+        }
+    }
+
+    /// Insert a local at index `i` as `Available`
+    pub fn local_insert(
+        &mut self,
+        i: usize,
+        abstract_value: AbstractValue,
+        availability: BorrowState,
+    ) {
+        self.locals.insert(i, (abstract_value, availability));
+    }
+
+    /// Insert a local at index `i` as `Available` from the register
+    /// If the register value is `None` return a `VMError`.
+    pub fn local_place(&mut self, i: usize) -> Result<(), VMError> {
+        if let Some(abstract_value) = self.register_move() {
+            self.locals
+                .insert(i, (abstract_value, BorrowState::Available));
+            Ok(())
+        } else {
+            Err(VMError::new(
+                "Could not insert local, register is empty".to_string(),
+            ))
+        }
+    }
+
+    /// Get all of the locals
+    pub fn get_locals(&self) -> &HashMap<usize, (AbstractValue, BorrowState)> {
+        &self.locals
+    }
+
+    /// Set the abstract state to be `aborted` when a precondition of an instruction
+    /// fails. (This will happen if `NEGATE_PRECONDITIONs` is true).
+    pub fn abort(&mut self) {
+        self.aborted = true;
+    }
+
+    /// Whether the state is aborted
+    pub fn has_aborted(&self) -> bool {
+        self.aborted
+    }
+
+    /// Set the abstract state to allow generation of control flow operations.
+    pub fn allow_control_flow(&mut self) {
+        self.control_flow_allowed = true;
+    }
+
+    /// Predicate determining if control flow instructions can be generated.
+    pub fn is_control_flow_allowed(&self) -> bool {
+        self.control_flow_allowed
+    }
+
+    /// The final state is one where the stack is empty
+    pub fn is_final(&self) -> bool {
+        self.stack.is_empty()
+    }
+}
+
+impl fmt::Display for AbstractState {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "Stack: {:?} | Locals: {:?} | Instantiation: {:?}",
+            self.stack, self.locals, self.instantiation
+        )
+    }
+}
+
+impl Default for AbstractState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl fmt::Display for AbstractValue {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "({:?}: {:?})", self.token, self.abilities)
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/borrow_graph.rs b/vendors/move/crates/testing-infra/test-generation/src/borrow_graph.rs
new file mode 100644
index 000000000..df1ea3fde
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/borrow_graph.rs
@@ -0,0 +1,135 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::abstract_state::Mutability;
+use std::collections::HashMap;
+
+/// Each partition is associated with a (unique) ID
+type PartitionID = u16;
+
+/// A nonce represents a runtime reference. It has a unique identifier and a mutability
+type Nonce = (u16, Mutability);
+
+/// A set of nonces
+type NonceSet = Vec<Nonce>;
+
+/// A path representing field accesses of a struct
+type Path = Vec<u8>;
+
+/// An edge in the graph. It consists of two partition IDs, a `Path` which
+/// may be empty, and an `EdgeType`
+type Edge = (PartitionID, PartitionID, Path, EdgeType);
+
+/// The `EdgeType` is either weak or strong. A weak edge represents imprecise information
+/// on the path along which the borrow takes place. A strong edge is precise.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EdgeType {
+    Weak,
+    Strong,
+}
+
+/// The `BorrowGraph` stores information sufficient to determine whether the instruction
+/// of a bytecode instruction that interacts with references is memory safe.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BorrowGraph {
+    /// All of the partitions that make up the graph
+    partitions: Vec<PartitionID>,
+
+    /// A mapping from partitions to the associated with them
+    partition_map: HashMap<PartitionID, NonceSet>,
+
+    /// The edges of the graph
+    edges: Vec<Edge>,
+
+    /// A counter for determining what the next partition ID should be
+    partition_counter: u16,
+}
+
+impl BorrowGraph {
+    /// Construct a new `BorrowGraph` given the number of locals it has
+    pub fn new(num_locals: u8) -> BorrowGraph {
+        BorrowGraph {
+            partitions: Vec::with_capacity(num_locals as usize),
+            partition_map: HashMap::new(),
+            edges: Vec::new(),
+            partition_counter: u16::from(num_locals),
+        }
+    }
+
+    /// Add a new partition to the graph containing nonce `n`
+    /// This operation may fail with an error a fresh partition ID
+    /// cannot be chosen.
+    pub fn fresh_partition(&mut self, n: Nonce) -> Result<(), String> {
+        if self.partition_counter.checked_add(1).is_some() {
+            if self.partition_map.get(&self.partition_counter).is_some() {
+                return Err("Partition map already contains ID".to_string());
+            }
+            self.partition_map.insert(self.partition_counter, vec![n]);
+            // Implication of `checked_add`
+            debug_assert!(self.partitions.len() < usize::max_value());
+            self.partitions.push(self.partition_counter);
+            Ok(())
+        } else {
+            Err("Partition map is full".to_string())
+        }
+    }
+
+    /// Determine whether a partition is mutable, immutable, or either.
+    /// This operation may fail with an error if the given partition does
+    /// not exist in the graph.
+    pub fn partition_mutability(&self, partition_id: PartitionID) -> Result<Mutability, String> {
+        if let Some(nonce_set) = self.partition_map.get(&partition_id) {
+            if nonce_set
+                .iter()
+                .all(|(_, mutability)| *mutability == Mutability::Mutable)
+            {
+                Ok(Mutability::Mutable)
+            } else if nonce_set
+                .iter()
+                .all(|(_, mutability)| *mutability == Mutability::Immutable)
+            {
+                Ok(Mutability::Immutable)
+            } else {
+                Ok(Mutability::Either)
+            }
+        } else {
+            Err("Partition map does not contain given partition ID".to_string())
+        }
+    }
+
+    /// Determine whether the given partition is freezable. This operation may fail
+    /// with an error if the given partition ID is not in the graph.
+    pub fn partition_freezable(&self, partition_id: PartitionID) -> Result<bool, String> {
+        let mut freezable = true;
+        if self.partition_map.get(&partition_id).is_some() {
+            for (p1, p2, _, _) in self.edges.iter() {
+                if *p1 == partition_id && self.partition_mutability(*p2)? == Mutability::Mutable {
+                    freezable = false;
+                }
+            }
+            Ok(freezable)
+        } else {
+            Err("Partition map does not contain given partition ID".to_string())
+        }
+    }
+
+    /// Determine whether the `path_1` is a prefix of `path_2`
+    fn path_is_prefix(&self, path_1: Path, path_2: Path) -> bool {
+        let mut prefix = true;
+        for (i, field) in path_1.iter().enumerate() {
+            if *field != path_2[i] {
+                prefix = false;
+            }
+        }
+        prefix
+    }
+
+    /// Determine whether two edges are consistent; i.e. whether the path of the
+    /// first edge is a prefix of the second or vice versa.
+    pub fn edges_consistent(&self, edge_1: Edge, edge_2: Edge) -> bool {
+        let path_1 = edge_1.2;
+        let path_2 = edge_2.2;
+        self.path_is_prefix(path_1.clone(), path_2.clone()) || self.path_is_prefix(path_2, path_1)
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/bytecode_generator.rs b/vendors/move/crates/testing-infra/test-generation/src/bytecode_generator.rs
new file mode 100644
index 000000000..1e84289de
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/bytecode_generator.rs
@@ -0,0 +1,989 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abstract_state::{AbstractState, BorrowState, CallGraph, InstantiableModule},
+    config::{
+        CALL_STACK_LIMIT, INHABITATION_INSTRUCTION_LIMIT, MAX_CFG_BLOCKS, MUTATION_TOLERANCE,
+        NEGATE_PRECONDITIONS, NEGATION_PROBABILITY, VALUE_STACK_LIMIT,
+    },
+    control_flow_graph::CFG,
+    substitute, summaries,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, ConstantPoolIndex, FieldHandleIndex,
+        FieldInstantiationIndex, FunctionHandle, FunctionHandleIndex, FunctionInstantiation,
+        FunctionInstantiationIndex, LocalIndex, SignatureToken, StructDefInstantiation,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+    },
+};
+use move_core_types::u256::U256;
+use rand::{rngs::StdRng, Rng};
+use tracing::{debug, error, warn};
+
+/// This type represents bytecode instructions that take a `LocalIndex`
+type LocalIndexToBytecode = fn(LocalIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u16`
+type CodeOffsetToBytecode = fn(CodeOffset) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u8`
+type U8ToBytecode = fn(u8) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u16`
+type U16ToBytecode = fn(u16) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u32`
+type U32ToBytecode = fn(u32) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u64`
+type U64ToBytecode = fn(u64) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u128`
+type U128ToBytecode = fn(u128) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u256`
+type U256ToBytecode = fn(U256) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `AddressPoolIndex`
+type ConstantPoolIndexToBytecode = fn(ConstantPoolIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `StructDefinitionIndex`
+type StructIndexToBytecode = fn(StructDefinitionIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FieldHandleIndex`
+type FieldHandleIndexToBytecode = fn(FieldHandleIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FunctionHandleIndex`
+type FunctionIndexToBytecode = fn(FunctionHandleIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `StructDefInstantiationIndex`
+type StructInstIndexToBytecode = fn(StructDefInstantiationIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FieldInstantiationIndex`
+type FieldInstIndexToBytecode = fn(FieldInstantiationIndex) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `FunctionInstantiationIndex`
+type FunctionInstIndexToBytecode = fn(FunctionInstantiationIndex) -> Bytecode;
+
+/// There are six types of bytecode instructions
+#[derive(Debug, Clone)]
+enum BytecodeType {
+    /// Instructions that do not take an argument
+    NoArg(Bytecode),
+
+    /// Instructions that take a `LocalIndex`
+    LocalIndex(LocalIndexToBytecode),
+
+    /// Instructions that take a `CodeOffset`
+    CodeOffset(CodeOffsetToBytecode),
+
+    /// Instructions that take a `u8`
+    U8(U8ToBytecode),
+
+    /// Instructions that take a `u16`
+    U16(U16ToBytecode),
+
+    /// Instructions that take a `u32`
+    U32(U32ToBytecode),
+
+    /// Instructions that take a `u64`
+    U64(U64ToBytecode),
+
+    /// Instructions that take a `u128`
+    U128(U128ToBytecode),
+
+    /// Instructions that take a `u256`
+    U256(U256ToBytecode),
+
+    /// Instructions that take an `ConstantPoolIndex`
+    ConstantPoolIndex(ConstantPoolIndexToBytecode),
+
+    /// Instructions that take a `StructDefinitionIndex`
+    StructIndex(StructIndexToBytecode),
+
+    /// Instructions that take a `FieldHandleIndex`
+    FieldHandleIndex(FieldHandleIndexToBytecode),
+
+    /// Instructions that take a `FunctionHandleIndex`
+    FunctionIndex(FunctionIndexToBytecode),
+
+    /// Instructions that take a `StructInstantiationIndex`
+    StructInstantiationIndex(StructInstIndexToBytecode),
+
+    /// Instructions that take a `FieldInstantiationIndex`
+    FieldInstantiationIndex(FieldInstIndexToBytecode),
+
+    /// Instructions that take a `FunctionInstantiationIndex`
+    FunctionInstantiationIndex(FunctionInstIndexToBytecode),
+}
+
+/// Abstraction for change to the stack size
+#[derive(Debug, Copy, Clone, PartialEq)]
+enum StackEffect {
+    /// Represents an increase in stack size
+    Add,
+
+    /// Represents a decrease in stack size
+    Sub,
+
+    /// Represents no change in stack size
+    Nop,
+}
+
+/// Context containing information about a function
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct FunctionGenerationContext {
+    pub function_handle_index: FunctionHandleIndex,
+    pub starting_call_height: usize,
+    pub locals_len: usize,
+    pub bytecode_len: u64,
+}
+
+impl FunctionGenerationContext {
+    pub fn new(
+        function_handle_index: FunctionHandleIndex,
+        starting_call_height: usize,
+        locals_len: usize,
+        bytecode_len: u64,
+    ) -> Self {
+        Self {
+            function_handle_index,
+            starting_call_height,
+            locals_len,
+            bytecode_len,
+        }
+    }
+
+    pub fn incr_instruction_count(&mut self) -> Option<()> {
+        self.bytecode_len += 1;
+        if self.bytecode_len >= (u16::max_value() - 1) as u64 {
+            return None;
+        }
+        Some(())
+    }
+}
+
+/// Generates a sequence of bytecode instructions.
+/// This generator has:
+/// - `instructions`: A list of bytecode instructions to use for generation
+/// - `rng`: A random number generator for uniform random choice of next instruction
+#[derive(Debug)]
+pub struct BytecodeGenerator<'a> {
+    instructions: Vec<(StackEffect, BytecodeType)>,
+    rng: &'a mut StdRng,
+}
+
+impl<'a> BytecodeGenerator<'a> {
+    /// The `BytecodeGenerator` is instantiated with a seed to use with
+    /// its random number generator.
+    pub fn new(rng: &'a mut StdRng) -> Self {
+        let instructions: Vec<(StackEffect, BytecodeType)> = vec![
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Pop)),
+            (StackEffect::Add, BytecodeType::U8(Bytecode::LdU8)),
+            (StackEffect::Add, BytecodeType::U16(Bytecode::LdU16)),
+            (StackEffect::Add, BytecodeType::U32(Bytecode::LdU32)),
+            (StackEffect::Add, BytecodeType::U64(Bytecode::LdU64)),
+            (StackEffect::Add, BytecodeType::U128(Bytecode::LdU128)),
+            (StackEffect::Add, BytecodeType::U256(Bytecode::LdU256)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU8)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU16)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU32)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU64)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU128)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU256)),
+            (
+                StackEffect::Add,
+                BytecodeType::ConstantPoolIndex(Bytecode::LdConst),
+            ),
+            (StackEffect::Add, BytecodeType::NoArg(Bytecode::LdTrue)),
+            (StackEffect::Add, BytecodeType::NoArg(Bytecode::LdFalse)),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::CopyLoc),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::MoveLoc),
+            ),
+            (StackEffect::Sub, BytecodeType::LocalIndex(Bytecode::StLoc)),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::MutBorrowLoc),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::LocalIndex(Bytecode::ImmBorrowLoc),
+            ),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::ReadRef)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::WriteRef)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::FreezeRef)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Add)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Sub)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Mul)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Div)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Mod)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::BitAnd)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::BitOr)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Xor)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Or)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::And)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::Not)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Eq)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Neq)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Lt)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Gt)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Le)),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Ge)),
+            (StackEffect::Nop, BytecodeType::StructIndex(Bytecode::Pack)),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::PackGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::Unpack),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::UnpackGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::Exists),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::ExistsGeneric),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::StructIndex(Bytecode::MoveFrom),
+            ),
+            (
+                StackEffect::Add,
+                BytecodeType::StructInstantiationIndex(Bytecode::MoveFromGeneric),
+            ),
+            (
+                StackEffect::Sub,
+                BytecodeType::StructIndex(Bytecode::MoveTo),
+            ),
+            (
+                StackEffect::Sub,
+                BytecodeType::StructInstantiationIndex(Bytecode::MoveToGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::MutBorrowGlobal),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::MutBorrowGlobalGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructIndex(Bytecode::ImmBorrowGlobal),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::StructInstantiationIndex(Bytecode::ImmBorrowGlobalGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldHandleIndex(Bytecode::MutBorrowField),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldInstantiationIndex(Bytecode::MutBorrowFieldGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldHandleIndex(Bytecode::ImmBorrowField),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FieldInstantiationIndex(Bytecode::ImmBorrowFieldGeneric),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FunctionIndex(Bytecode::Call),
+            ),
+            (
+                StackEffect::Nop,
+                BytecodeType::FunctionInstantiationIndex(Bytecode::CallGeneric),
+            ),
+            (StackEffect::Nop, BytecodeType::CodeOffset(Bytecode::Branch)),
+            (StackEffect::Sub, BytecodeType::CodeOffset(Bytecode::BrTrue)),
+            (
+                StackEffect::Sub,
+                BytecodeType::CodeOffset(Bytecode::BrFalse),
+            ),
+            (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Abort)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::Ret)),
+        ];
+        Self { instructions, rng }
+    }
+
+    fn index_or_none<T>(table: &[T], rng: &mut StdRng) -> Option<TableIndex> {
+        if table.is_empty() {
+            None
+        } else {
+            Some(rng.gen_range(0..table.len()) as TableIndex)
+        }
+    }
+
+    // Soft cutoff: We starting making it less likely for the stack size to be increased once it
+    // becomes greater than VALUE_STACK_LIMIT - 24. Once we reach the stack limit then we have a
+    // hard cutoff.
+    fn value_backpressure(state: &AbstractState, probability: f32) -> f32 {
+        let len = state.stack_len();
+
+        if len <= VALUE_STACK_LIMIT - 24 {
+            return probability;
+        }
+
+        if len > VALUE_STACK_LIMIT - 24 {
+            return probability * 0.5;
+        }
+
+        0.0
+    }
+
+    // Tight cutoff: calls can be generated as long as it's less than the max call stack height. If
+    // the call would cause the call stack to overflow then it can't be generated.
+    fn call_stack_backpressure(
+        state: &AbstractState,
+        fn_context: &FunctionGenerationContext,
+        call: FunctionHandleIndex,
+    ) -> Option<FunctionHandleIndex> {
+        if let Some(call_size) = state
+            .call_graph
+            .call_depth(fn_context.function_handle_index, call)
+        {
+            if call_size + fn_context.starting_call_height <= CALL_STACK_LIMIT {
+                return Some(call);
+            }
+        }
+        None
+    }
+
+    /// Given an `AbstractState`, `state`, and a the number of locals the function has,
+    /// this function returns a list of instructions whose preconditions are satisfied for
+    /// the state.
+    fn candidate_instructions(
+        &mut self,
+        fn_context: &FunctionGenerationContext,
+        state: AbstractState,
+        module: CompiledModule,
+    ) -> Vec<(StackEffect, Bytecode)> {
+        let mut matches: Vec<(StackEffect, Bytecode)> = Vec::new();
+        let instructions = &self.instructions;
+        for (stack_effect, instruction) in instructions.iter() {
+            let instruction: Option<Bytecode> = match instruction {
+                BytecodeType::NoArg(instruction) => Some(instruction.clone()),
+                BytecodeType::LocalIndex(instruction) => {
+                    // Generate a random index into the locals
+                    if fn_context.locals_len > 0 {
+                        Some(instruction(
+                            self.rng.gen_range(0..fn_context.locals_len) as LocalIndex
+                        ))
+                    } else {
+                        None
+                    }
+                },
+                BytecodeType::CodeOffset(instruction) => {
+                    // Set 0 as the offset. This will be set correctly during serialization
+                    Some(instruction(0))
+                },
+                BytecodeType::U8(instruction) => {
+                    // Generate a random u8 constant to load
+                    Some(instruction(self.rng.gen_range(0..u8::max_value())))
+                },
+                BytecodeType::U16(instruction) => {
+                    // Generate a random u16 constant to load
+                    Some(instruction(self.rng.gen_range(0..u16::max_value())))
+                },
+                BytecodeType::U32(instruction) => {
+                    // Generate a random u32 constant to load
+                    Some(instruction(self.rng.gen_range(0..u32::max_value())))
+                },
+                BytecodeType::U64(instruction) => {
+                    // Generate a random u64 constant to load
+                    Some(instruction(self.rng.gen_range(0..u64::max_value())))
+                },
+                BytecodeType::U128(instruction) => {
+                    // Generate a random u128 constant to load
+                    Some(instruction(self.rng.gen_range(0..u128::max_value())))
+                },
+                BytecodeType::U256(instruction) => {
+                    // Generate a random u256 constant to load
+                    Some(instruction(
+                        self.rng.gen_range(U256::zero()..U256::max_value()),
+                    ))
+                },
+                BytecodeType::ConstantPoolIndex(instruction) => {
+                    // Select a random address from the module's address pool
+                    Self::index_or_none(&module.constant_pool, self.rng)
+                        .map(|x| instruction(ConstantPoolIndex::new(x)))
+                },
+                BytecodeType::StructIndex(instruction) => {
+                    // Select a random struct definition and local signature
+                    Self::index_or_none(&module.struct_defs, self.rng)
+                        .map(|x| instruction(StructDefinitionIndex::new(x)))
+                },
+                BytecodeType::FieldHandleIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.field_handles, self.rng)
+                        .map(|x| instruction(FieldHandleIndex::new(x)))
+                },
+                BytecodeType::FunctionIndex(instruction) => {
+                    // Select a random function handle and local signature
+                    let callable_fns = &state.call_graph.can_call(fn_context.function_handle_index);
+                    Self::index_or_none(callable_fns, self.rng)
+                        .and_then(|handle_idx| {
+                            Self::call_stack_backpressure(
+                                &state,
+                                fn_context,
+                                callable_fns[handle_idx as usize],
+                            )
+                        })
+                        .map(instruction)
+                },
+                BytecodeType::StructInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.struct_def_instantiations, self.rng)
+                        .map(|x| instruction(StructDefInstantiationIndex::new(x)))
+                },
+                BytecodeType::FunctionInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.function_instantiations, self.rng)
+                        .map(|x| instruction(FunctionInstantiationIndex::new(x)))
+                },
+                BytecodeType::FieldInstantiationIndex(instruction) => {
+                    // Select a field definition from the module's field definitions
+                    Self::index_or_none(&module.field_instantiations, self.rng)
+                        .map(|x| instruction(FieldInstantiationIndex::new(x)))
+                },
+            };
+            if let Some(instruction) = instruction {
+                let summary = summaries::instruction_summary(instruction.clone(), false);
+                let unsatisfied_preconditions = summary
+                    .preconditions
+                    .iter()
+                    .filter(|precondition| !precondition(&state))
+                    .count();
+                if (NEGATE_PRECONDITIONS
+                    && !summary.preconditions.is_empty()
+                    && unsatisfied_preconditions
+                        > self.rng.gen_range(0..summary.preconditions.len())
+                    && self.rng.gen_range(0..101) > 100 - (NEGATION_PROBABILITY * 100.0) as u8)
+                    || unsatisfied_preconditions == 0
+                {
+                    // The size of matches cannot be greater than the number of bytecode instructions
+                    debug_assert!(matches.len() < usize::max_value());
+                    matches.push((*stack_effect, instruction));
+                }
+            }
+        }
+        matches
+    }
+
+    /// Select an instruction from the list of candidates based on the current state's
+    /// stack size and the expected number of function return parameters.
+    fn select_candidate(
+        &mut self,
+        return_len: usize,
+        state: &AbstractState,
+        candidates: &[(StackEffect, Bytecode)],
+    ) -> Result<Bytecode, String> {
+        debug!("Candidates: {:?}", candidates);
+        let stack_len = state.stack_len();
+        let prob_add = if stack_len > return_len {
+            MUTATION_TOLERANCE / (stack_len as f32)
+        } else {
+            1.0
+        };
+        let prob_add = Self::value_backpressure(state, prob_add);
+        debug!("Pr[add] = {:?}", prob_add);
+        let next_instruction_index;
+        if self.rng.gen_range(0.0..1.0) <= prob_add {
+            let add_candidates: Vec<Bytecode> = candidates
+                .iter()
+                .filter(|(stack_effect, _)| {
+                    *stack_effect == StackEffect::Add || *stack_effect == StackEffect::Nop
+                })
+                .map(|(_, candidate)| candidate)
+                .cloned()
+                .collect();
+            // Add candidates should not be empty unless the list of bytecode instructions is
+            // changed
+            if add_candidates.is_empty() {
+                return Err("Could not find valid add candidate".to_string());
+            }
+            next_instruction_index = self.rng.gen_range(0..add_candidates.len());
+            Ok(add_candidates[next_instruction_index].clone())
+        } else {
+            let sub_candidates: Vec<Bytecode> = candidates
+                .iter()
+                .filter(|(stack_effect, _)| {
+                    *stack_effect == StackEffect::Sub || *stack_effect == StackEffect::Nop
+                })
+                .map(|(_, candidate)| candidate)
+                .cloned()
+                .collect();
+            // Sub candidates should not be empty unless the list of bytecode instructions is
+            // changed
+            if sub_candidates.is_empty() {
+                return Err("Could not find sub valid candidate".to_string());
+            }
+            next_instruction_index = self.rng.gen_range(0..sub_candidates.len());
+            Ok(sub_candidates[next_instruction_index].clone())
+        }
+    }
+
+    /// Transition an abstract state, `state` to the next state by applying all of the effects
+    /// of a particular bytecode instruction, `instruction`.
+    fn abstract_step(
+        &self,
+        mut state: AbstractState,
+        instruction: Bytecode,
+        exact: bool,
+    ) -> (AbstractState, Bytecode) {
+        let summary = summaries::instruction_summary(instruction.clone(), exact);
+        let should_error = summary
+            .preconditions
+            .iter()
+            .any(|precondition| !precondition(&state));
+        if should_error {
+            debug!("Reached abort state");
+            state.abort();
+        }
+        let apply_effects = |state, effects: Vec<Box<summaries::NonInstantiableEffect>>| {
+            effects.iter().fold(state, |acc, effect| {
+                effect(&acc).unwrap_or_else(|err| {
+                    if NEGATE_PRECONDITIONS {
+                        // Ignore the effect
+                        acc
+                    } else {
+                        unreachable!("Error applying instruction effect: {}", err);
+                    }
+                })
+            })
+        };
+        match summary.effects {
+            summaries::Effects::TyParams(instantiation, effect, instantiation_application) => {
+                let (struct_idx, instantiation) = instantiation(&state);
+                let index = state.module.add_instantiation(instantiation);
+                let struct_inst = StructDefInstantiation {
+                    def: struct_idx,
+                    type_parameters: index,
+                };
+                let str_inst_idx = state.module.add_struct_instantiation(struct_inst);
+                let effects = effect(str_inst_idx);
+                let instruction = instantiation_application(str_inst_idx);
+                (apply_effects(state, effects), instruction)
+            },
+            summaries::Effects::TyParamsCall(instantiation, effect, instantiation_application) => {
+                let (fh_idx, instantiation) = instantiation(&state);
+                let index = state.module.add_instantiation(instantiation);
+                let func_inst = FunctionInstantiation {
+                    handle: fh_idx,
+                    type_parameters: index,
+                };
+                let func_inst_idx = state.module.add_function_instantiation(func_inst);
+                let effects = effect(func_inst_idx);
+                let instruction = instantiation_application(func_inst_idx);
+                (apply_effects(state, effects), instruction)
+            },
+            summaries::Effects::NoTyParams(effects) => (apply_effects(state, effects), instruction),
+        }
+    }
+
+    /// Transition an abstract state, `state` to the next state and add the instruction
+    /// to the bytecode sequence
+    pub fn apply_instruction(
+        &self,
+        fn_context: &mut FunctionGenerationContext,
+        mut state: AbstractState,
+        bytecode: &mut Vec<Bytecode>,
+        instruction: Bytecode,
+        exact: bool,
+    ) -> Option<AbstractState> {
+        // Bytecode will never be generated this large
+        debug_assert!(bytecode.len() < usize::max_value());
+        debug!("**********************");
+        debug!("State1: {}", state);
+        debug!("Next instr: {:?}", instruction);
+        let step = self.abstract_step(state, instruction, exact);
+        state = step.0;
+        let instruction = step.1;
+        debug!("Affected: {}", state);
+        debug!("Actual instr: {:?}", instruction);
+        if let Bytecode::Call(index) = instruction {
+            state
+                .call_graph
+                .add_call(fn_context.function_handle_index, index);
+        }
+        bytecode.push(instruction);
+        fn_context.incr_instruction_count()?;
+        debug!("**********************\n");
+        Some(state)
+    }
+
+    /// Given a valid starting state `abstract_state_in`, generate a valid sequence of
+    /// bytecode instructions such that `abstract_state_out` is reached.
+    pub fn generate_block(
+        &mut self,
+        fn_context: &mut FunctionGenerationContext,
+        abstract_state_in: AbstractState,
+        abstract_state_out: AbstractState,
+        module: &CompiledModule,
+    ) -> Option<(Vec<Bytecode>, AbstractState)> {
+        debug!("Abstract state in: {}", abstract_state_in);
+        debug!("Abstract state out: {}", abstract_state_out);
+        let mut bytecode: Vec<Bytecode> = Vec::new();
+        let mut state = abstract_state_in.clone();
+        // Generate block body
+        loop {
+            let candidates = self.candidate_instructions(fn_context, state.clone(), module.clone());
+            if candidates.is_empty() {
+                warn!("No candidates found for state: [{:?}]", state);
+                break;
+            }
+            match self.select_candidate(0, &state, &candidates) {
+                Ok(next_instruction) => {
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        next_instruction,
+                        false,
+                    )?;
+                    if state.is_final() {
+                        break;
+                    } else if state.has_aborted() {
+                        state = self.apply_instruction(
+                            fn_context,
+                            state,
+                            &mut bytecode,
+                            Bytecode::LdU64(0),
+                            true,
+                        )?;
+                        state = self.apply_instruction(
+                            fn_context,
+                            state,
+                            &mut bytecode,
+                            Bytecode::Abort,
+                            true,
+                        )?;
+                        return Some((bytecode, state));
+                    }
+                },
+                Err(err) => {
+                    // Could not complete the bytecode sequence; reset to empty
+                    error!("{}", err);
+                    return Some((Vec::new(), abstract_state_in));
+                },
+            }
+        }
+        // Fix local availability
+        for (i, (abstract_value, target_availability)) in abstract_state_out.get_locals().iter() {
+            if let Some((_, current_availability)) = state.local_get(*i) {
+                if *target_availability == BorrowState::Available
+                    && *current_availability == BorrowState::Unavailable
+                {
+                    let next_instructions =
+                        Self::inhabit_with_bytecode_seq(&mut state.module, &abstract_value.token);
+                    debug!(
+                        "local availability instructions: {:#?} for token {:#?}",
+                        next_instructions, &abstract_value.token
+                    );
+                    if next_instructions.len() >= INHABITATION_INSTRUCTION_LIMIT {
+                        return None;
+                    }
+                    state =
+                        next_instructions
+                            .into_iter()
+                            .fold(Some(state), |state, instruction| {
+                                state.and_then(|state| {
+                                    self.apply_instruction(
+                                        fn_context,
+                                        state,
+                                        &mut bytecode,
+                                        instruction,
+                                        true,
+                                    )
+                                })
+                            })?;
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::StLoc(*i as u8),
+                        true,
+                    )?;
+                } else if *target_availability == BorrowState::Unavailable
+                    && *current_availability == BorrowState::Available
+                {
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::MoveLoc(*i as u8),
+                        true,
+                    )?;
+                    state = self.apply_instruction(
+                        fn_context,
+                        state,
+                        &mut bytecode,
+                        Bytecode::Pop,
+                        true,
+                    )?;
+                }
+            } else {
+                unreachable!("Target locals out contains new local");
+            }
+        }
+        // Update the module to be the module that we've been building in our abstract state
+        Some((bytecode, state))
+    }
+
+    /// Generate the body of a function definition given a set of starting `locals` and a target
+    /// return `signature`. The sequence should contain at least `target_min` and at most
+    /// `target_max` instructions.
+    pub fn generate(
+        &mut self,
+        fn_context: &mut FunctionGenerationContext,
+        locals: &[SignatureToken],
+        fh: &FunctionHandle,
+        acquires_global_resources: &[StructDefinitionIndex],
+        module: &mut CompiledModule,
+        call_graph: &mut CallGraph,
+    ) -> Option<Vec<Bytecode>> {
+        let number_of_blocks = self.rng.gen_range(1..=MAX_CFG_BLOCKS);
+        // The number of basic blocks must be at least one based on the
+        // generation range.
+        debug_assert!(number_of_blocks > 0);
+        let mut cfg = CFG::new(
+            self.rng,
+            locals,
+            &module.signatures[fh.parameters.0 as usize],
+            number_of_blocks,
+        );
+        let cfg_copy = cfg.clone();
+        for (block_id, block) in cfg.get_basic_blocks_mut().iter_mut() {
+            debug!(
+                "+++++++++++++++++ Starting new block: {} +++++++++++++++++",
+                block_id
+            );
+            let state1 = AbstractState::from_locals(
+                module.clone(),
+                block.get_locals_in().clone(),
+                fh.type_parameters.clone(),
+                acquires_global_resources.to_vec(),
+                call_graph.clone(),
+            );
+            let state2 = AbstractState::from_locals(
+                module.clone(),
+                block.get_locals_out().clone(),
+                fh.type_parameters.clone(),
+                acquires_global_resources.to_vec(),
+                call_graph.clone(),
+            );
+            let (mut bytecode, mut state_f) =
+                self.generate_block(fn_context, state1, state2.clone(), module)?;
+            state_f.allow_control_flow();
+            if !state_f.has_aborted() {
+                state_f = if cfg_copy.num_children(*block_id) == 2 {
+                    // BrTrue, BrFalse: Add bool and branching instruction randomly
+                    state_f = self.apply_instruction(
+                        fn_context,
+                        state_f,
+                        &mut bytecode,
+                        Bytecode::LdFalse,
+                        true,
+                    )?;
+                    if self.rng.gen_bool(0.5) {
+                        self.apply_instruction(
+                            fn_context,
+                            state_f,
+                            &mut bytecode,
+                            Bytecode::BrTrue(0),
+                            true,
+                        )?
+                    } else {
+                        self.apply_instruction(
+                            fn_context,
+                            state_f,
+                            &mut bytecode,
+                            Bytecode::BrFalse(0),
+                            true,
+                        )?
+                    }
+                } else if cfg_copy.num_children(*block_id) == 1 {
+                    // Branch: Add branch instruction
+                    self.apply_instruction(
+                        fn_context,
+                        state_f,
+                        &mut bytecode,
+                        Bytecode::Branch(0),
+                        true,
+                    )?
+                } else if cfg_copy.num_children(*block_id) == 0 {
+                    // Return: Add return types to last block
+                    for token_type in module.signatures[fh.return_.0 as usize].0.iter() {
+                        let next_instructions =
+                            Self::inhabit_with_bytecode_seq(&mut state_f.module, token_type);
+                        debug!(
+                            "Return value instructions: {:#?} for token {:#?}",
+                            next_instructions, &token_type
+                        );
+                        state_f = next_instructions.into_iter().fold(
+                            Some(state_f),
+                            |state_f, instruction| {
+                                state_f.and_then(|state_f| {
+                                    self.apply_instruction(
+                                        fn_context,
+                                        state_f,
+                                        &mut bytecode,
+                                        instruction,
+                                        true,
+                                    )
+                                })
+                            },
+                        )?;
+                    }
+                    self.apply_instruction(fn_context, state_f, &mut bytecode, Bytecode::Ret, true)?
+                } else {
+                    state_f
+                };
+            }
+            block.set_instructions(bytecode);
+            *module = state_f.module.instantiate();
+            *call_graph = state_f.call_graph;
+        }
+        // The CFG will be non-empty if we set the number of basic blocks to generate
+        // to be non-zero
+        debug_assert!(number_of_blocks > 0 || cfg.get_basic_blocks().is_empty());
+        Some(cfg.serialize())
+    }
+
+    pub fn generate_module(&mut self, mut module: CompiledModule) -> Option<CompiledModule> {
+        let mut fdefs = module.function_defs.clone();
+        let mut call_graph = CallGraph::new(module.function_handles.len());
+        for fdef in fdefs.iter_mut() {
+            if let Some(code) = &mut fdef.code {
+                let f_handle = &module.function_handles[fdef.function.0 as usize].clone();
+                let locals_sigs = module.signatures[code.locals.0 as usize].0.clone();
+                let mut fn_context = FunctionGenerationContext::new(
+                    fdef.function,
+                    call_graph.max_calling_depth(fdef.function),
+                    locals_sigs.len(),
+                    0,
+                );
+                code.code = self.generate(
+                    &mut fn_context,
+                    &locals_sigs,
+                    f_handle,
+                    &fdef.acquires_global_resources,
+                    &mut module,
+                    &mut call_graph,
+                )?;
+            }
+        }
+        module.function_defs = fdefs;
+        Some(module)
+    }
+
+    /// Generate a sequence of instructions whose overall effect is to push a single value of type token
+    /// on the stack, specifically without consuming any values that existed on the stack prior to the
+    /// execution of the instruction sequence.
+    pub fn inhabit_with_bytecode_seq(
+        module: &mut InstantiableModule,
+        token: &SignatureToken,
+    ) -> Vec<Bytecode> {
+        match token {
+            SignatureToken::Address => vec![Bytecode::LdConst(ConstantPoolIndex(0))],
+            SignatureToken::U64 => vec![Bytecode::LdU64(0)],
+            SignatureToken::U8 => vec![Bytecode::LdU8(0)],
+            SignatureToken::U128 => vec![Bytecode::LdU128(0)],
+            SignatureToken::U16 => vec![Bytecode::LdU16(0)],
+            SignatureToken::U32 => vec![Bytecode::LdU32(0)],
+            SignatureToken::U256 => vec![Bytecode::LdU256(U256::zero())],
+            SignatureToken::Bool => vec![Bytecode::LdFalse],
+            SignatureToken::Struct(handle_idx) => {
+                let struct_def_idx = module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .position(|struct_def| struct_def.struct_handle == *handle_idx)
+                    .expect(
+                        "struct def should exist for every struct handle in the test generator",
+                    );
+                let struct_def = module
+                    .module
+                    .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
+                let fields = match &struct_def.field_information {
+                    StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::Declared(fields) => fields.clone(),
+                };
+                let mut bytecodes: Vec<Bytecode> = fields
+                    .iter()
+                    .flat_map(|field| {
+                        let field_sig_tok = &field.signature.0;
+                        Self::inhabit_with_bytecode_seq(module, field_sig_tok)
+                    })
+                    .collect();
+                bytecodes.push(Bytecode::Pack(StructDefinitionIndex(
+                    struct_def_idx as TableIndex,
+                )));
+                bytecodes
+            },
+            SignatureToken::StructInstantiation(handle_idx, instantiation) => {
+                let struct_def_idx = module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .position(|struct_def| struct_def.struct_handle == *handle_idx)
+                    .expect(
+                        "struct def should exist for every struct handle in the test generator",
+                    );
+                let struct_def = module
+                    .module
+                    .struct_def_at(StructDefinitionIndex(struct_def_idx as TableIndex));
+                let fields = match &struct_def.field_information {
+                    StructFieldInformation::Native => panic!("Can't inhabit native structs"),
+                    StructFieldInformation::Declared(fields) => fields.clone(),
+                };
+                let mut bytecodes: Vec<Bytecode> = fields
+                    .iter()
+                    .flat_map(|field| {
+                        let field_sig_tok = &field.signature.0;
+                        let reified_field_sig_tok = substitute(field_sig_tok, instantiation);
+                        Self::inhabit_with_bytecode_seq(module, &reified_field_sig_tok)
+                    })
+                    .collect();
+                let instantiation_index = module.add_instantiation(instantiation.clone());
+                let struct_inst = StructDefInstantiation {
+                    def: StructDefinitionIndex(struct_def_idx as TableIndex),
+                    type_parameters: instantiation_index,
+                };
+                let si_idx = module.add_struct_instantiation(struct_inst);
+                bytecodes.push(Bytecode::PackGeneric(StructDefInstantiationIndex(
+                    si_idx.0 as TableIndex,
+                )));
+                bytecodes
+            },
+            SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => {
+                unimplemented!("Unsupported inhabitation. Type: {:#?}", token)
+            },
+        }
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/config.rs b/vendors/move/crates/testing-infra/test-generation/src/config.rs
new file mode 100644
index 000000000..f513dee9d
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/config.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Parser;
+use module_generation::ModuleGeneratorOptions;
+
+/// This defines how tolerant the generator will be about deviating from
+/// the starting stack height.
+/// Default is `0.9`
+pub const MUTATION_TOLERANCE: f32 = 0.9;
+
+/// This defines the maximum number of blocks that will be generated for
+/// a function body's CFG. During generation, a random number of blocks from
+/// 1 to this constant will be created.
+/// Default is `10`
+pub const MAX_CFG_BLOCKS: u16 = 10;
+
+/// Whether preconditions will be negated to generate invalid programs
+/// in order to test error paths.
+/// Default is `false`
+pub const NEGATE_PRECONDITIONS: bool = false;
+
+/// The probability that preconditions will be negated for a pariticular
+/// bytecode instruction.
+/// Default is `0.1`
+pub const NEGATION_PROBABILITY: f64 = 0.1;
+
+/// Whether generation of instructions that require borrow checking will
+/// be allowed. (Note that if `NEGATE_PRECONDITIONS` is true then these
+/// instructions can still come up).
+/// Default is `false`
+pub const ALLOW_MEMORY_UNSAFE: bool = false;
+
+/// Whether the generated programs should be run on the VM
+/// Default is `true`
+pub const RUN_ON_VM: bool = true;
+
+/// Whether generated modules will be executed even if they fail the
+/// the bytecode verifier.
+/// Default is `false`
+pub const EXECUTE_UNVERIFIED_MODULE: bool = false;
+
+/// Whether gas will be metered when running generated programs. The default
+/// is `true` to bound the execution time.
+/// Default is `true`
+pub const GAS_METERING: bool = true;
+
+/// Call stack height limit. This is defined in the VM, and is replicated here. This should track
+/// that constant.
+pub const CALL_STACK_LIMIT: usize = 1024;
+
+/// The value stack size limit. This is defined in the VM and is replicated here. This should
+/// remain in sync with the constant for this defined in the VM.
+pub const VALUE_STACK_LIMIT: usize = 1024;
+
+/// Certain randomly generated types can lead to extremely long instruction sequences. This can
+/// lead to test generation taking quite a while in order to handle all of these. This parameter
+/// bounds the maximum allowable instruction length for a type. If the instruction sequence is
+/// larger then this, a new module and bytecode generation will be attempted.
+pub const INHABITATION_INSTRUCTION_LIMIT: usize = 1000;
+
+/// The module generation settings that are used for generation module scaffolding for bytecode
+/// generation.
+pub fn module_generation_settings() -> ModuleGeneratorOptions {
+    ModuleGeneratorOptions {
+        min_table_size: 10,
+        // The more structs, and the larger the number of type parameters the more complex the
+        // functions and bytecode sequences generated. Be careful about setting these parameters too
+        // large -- this can lead to expontial increases in the size and number of struct
+        // instantiations that can be generated.
+        max_ty_params: 4,
+        max_functions: 6,
+        max_fields: 10,
+        max_structs: 6,
+        args_for_ty_params: true,
+        references_allowed: false,
+        // Test generation cannot currently cope with resources
+        add_resources: false,
+        ..Default::default()
+    }
+}
+
+/// Command line arguments for the tool
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+pub struct Args {
+    /// The optional number of programs that will be generated. If not specified, program
+    /// generation will run infinitely.
+    #[clap(short = 'i', long = "iterations")]
+    pub num_iterations: Option<u64>,
+
+    /// Path where a serialized module should be saved.
+    /// If `None`, then the module will just be printed out.
+    #[clap(short = 'o', long = "output")]
+    pub output_path: Option<String>,
+
+    /// The optional seed used for test generation.
+    #[clap(short = 's', long = "seed")]
+    pub seed: Option<String>,
+
+    /// The optional number of threads to use for test generation.
+    #[clap(short = 't', long = "threads")]
+    pub num_threads: Option<u64>,
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/control_flow_graph.rs b/vendors/move/crates/testing-infra/test-generation/src/control_flow_graph.rs
new file mode 100644
index 000000000..6b9a19cbf
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/control_flow_graph.rs
@@ -0,0 +1,390 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::abstract_state::{AbstractValue, BorrowState};
+use move_binary_format::file_format::{AbilitySet, Bytecode, Signature, SignatureToken};
+use rand::{rngs::StdRng, Rng};
+use std::collections::{HashMap, VecDeque};
+use tracing::debug;
+
+/// This type holds basic block identifiers
+type BlockIDSize = u16;
+
+/// This type represents the locals that a basic block has
+type BlockLocals = HashMap<usize, (AbstractValue, BorrowState)>;
+
+/// This represents a basic block in a control flow graph
+#[derive(Debug, Default, Clone)]
+pub struct BasicBlock {
+    /// The starting locals
+    locals_in: BlockLocals,
+
+    /// The locals at the end of the block
+    locals_out: BlockLocals,
+
+    /// The instructions that comprise the block
+    instructions: Vec<Bytecode>,
+}
+
+impl BasicBlock {
+    pub fn new() -> BasicBlock {
+        BasicBlock {
+            locals_in: HashMap::new(),
+            locals_out: HashMap::new(),
+            instructions: Vec::new(),
+        }
+    }
+
+    /// Get the locals coming into the block
+    pub fn get_locals_in(&self) -> &BlockLocals {
+        &self.locals_in
+    }
+
+    /// Get the locals going out of the block
+    pub fn get_locals_out(&self) -> &BlockLocals {
+        &self.locals_out
+    }
+
+    /// Set the list of instructions that comprise the block
+    pub fn set_instructions(&mut self, instructions: Vec<Bytecode>) {
+        self.instructions = instructions
+    }
+}
+
+/// A control flow graph
+#[derive(Debug, Clone)]
+pub struct CFG {
+    /// The set of basic blocks that make up the graph, mapped to `BlockIDSize`'s used
+    /// as their identifiers
+    basic_blocks: HashMap<BlockIDSize, BasicBlock>,
+
+    /// The directed edges of the graph represented by pairs of basic block identifiers
+    edges: Vec<(BlockIDSize, BlockIDSize)>,
+}
+
+impl CFG {
+    /// Construct a control flow graph that contains empty basic blocks with set incoming
+    /// and outgoing locals.
+    /// Currently the control flow graph is acyclic.
+    pub fn new(
+        rng: &mut StdRng,
+        locals: &[SignatureToken],
+        parameters: &Signature,
+        target_blocks: BlockIDSize,
+    ) -> CFG {
+        assert!(target_blocks > 0, "The CFG must haave at least one block");
+        let mut basic_blocks: HashMap<BlockIDSize, BasicBlock> = HashMap::new();
+        // Generate basic blocks
+        for i in 0..target_blocks {
+            basic_blocks.insert(i, BasicBlock::new());
+        }
+        // Generate control flow edges
+        let mut edges: Vec<(BlockIDSize, BlockIDSize)> = Vec::new();
+        let mut block_queue: VecDeque<BlockIDSize> = VecDeque::new();
+        let mut current_block_id = 0;
+
+        block_queue.push_back(current_block_id);
+        current_block_id += 1;
+
+        while current_block_id < target_blocks && !block_queue.is_empty() {
+            let front_block = block_queue.pop_front();
+            // `front_block` will be `Some` because the block queue is not empty
+            debug_assert!(front_block.is_some());
+            let parent_block_id = front_block.unwrap();
+            // The number of edges will be at most `2*target_blocks``
+            // Since target blocks is at most a `u16`, this will not overflow even if
+            // `usize` is a `u32`
+            debug_assert!(edges.len() < usize::max_value());
+            edges.push((parent_block_id, current_block_id));
+            block_queue.push_back(current_block_id);
+            // `current_block_id` is bound by the max og `target_block_size`
+            debug_assert!(current_block_id < u16::max_value());
+            current_block_id += 1;
+            // Generate a second child edge with prob = 1/2
+            if rng.gen_bool(0.5) && current_block_id < target_blocks {
+                // The number of edges will be at most `2*target_blocks``
+                // Since target blocks is at most a `u16`, this will not overflow even if
+                // `usize` is a `u32`
+                debug_assert!(edges.len() < usize::max_value());
+                edges.push((parent_block_id, current_block_id));
+                block_queue.push_back(current_block_id);
+                // `current_block_id` is bound by the max og `target_block_size`
+                debug_assert!(current_block_id < u16::max_value());
+                current_block_id += 1;
+            }
+        }
+
+        // Connect remaining blocks to return
+        while !block_queue.is_empty() {
+            let front_block = block_queue.pop_front();
+            // `front_block` will be `Some` because the block queue is not empty
+            debug_assert!(front_block.is_some());
+            let parent_block_id = front_block.unwrap();
+            // By the precondition of the function
+            debug_assert!(target_blocks > 0);
+            if parent_block_id != target_blocks - 1 {
+                edges.push((parent_block_id, target_blocks - 1));
+            }
+        }
+        debug!("Edges: {:?}", edges);
+
+        // Build the CFG
+        let mut cfg = CFG {
+            basic_blocks,
+            edges,
+        };
+        // Assign locals to basic blocks
+        debug_assert!(target_blocks == 0 || !cfg.basic_blocks.is_empty());
+        CFG::add_locals(&mut cfg, rng, locals, parameters.0.len());
+        cfg
+    }
+
+    /// Get a reference to all of the basic blocks of the CFG
+    pub fn get_basic_blocks(&self) -> &HashMap<BlockIDSize, BasicBlock> {
+        &self.basic_blocks
+    }
+
+    /// Get a mutable reference to all of the basic blocks of the CFG
+    pub fn get_basic_blocks_mut(&mut self) -> &mut HashMap<BlockIDSize, BasicBlock> {
+        &mut self.basic_blocks
+    }
+
+    /// Retrieve the block IDs of all children of the given basic block `block_id`
+    pub fn get_children_ids(&self, block_id: BlockIDSize) -> Vec<BlockIDSize> {
+        let mut children_ids: Vec<BlockIDSize> = Vec::new();
+        for (parent, child) in self.edges.iter() {
+            if *parent == block_id {
+                // Length is bound by iteration on `self.edges`
+                debug_assert!(children_ids.len() < usize::max_value());
+                children_ids.push(*child);
+            }
+        }
+        children_ids
+    }
+
+    /// Retrieve the number of children the given basic block `block_id`
+    pub fn num_children(&self, block_id: BlockIDSize) -> u8 {
+        // A `u8` is sufficient; blocks will have at most two children
+        self.get_children_ids(block_id).len() as u8
+    }
+
+    /// Retrieve the block IDs of all parents of the given basic block `block_id`
+    pub fn get_parent_ids(&self, block_id: BlockIDSize) -> Vec<BlockIDSize> {
+        let mut parent_ids: Vec<BlockIDSize> = Vec::new();
+        for (parent, child) in self.edges.iter() {
+            if *child == block_id {
+                // Iteration is bound by the self.edges vector length
+                debug_assert!(parent_ids.len() < usize::max_value());
+                parent_ids.push(*parent);
+            }
+        }
+        parent_ids
+    }
+
+    /// Retrieve the number of parents the given basic block `block_id`
+    pub fn num_parents(&self, block_id: BlockIDSize) -> u8 {
+        // A `u8` is sufficient; blocks will have at most two children
+        self.get_parent_ids(block_id).len() as u8
+    }
+
+    /// Merge the outgoing locals of a set of blocks
+    fn merge_locals(&self, block_ids: Vec<BlockIDSize>) -> BlockLocals {
+        assert!(
+            !block_ids.is_empty(),
+            "Cannot merge locals of empty block list"
+        );
+        let first_basic_block = self.basic_blocks.get(&block_ids[0]);
+        // Implication of preconditon
+        debug_assert!(first_basic_block.is_some());
+        let first_basic_block_locals_out = &first_basic_block.unwrap().locals_out;
+        let locals_len = first_basic_block_locals_out.len();
+        let mut locals_out = BlockLocals::new();
+        for local_index in 0..locals_len {
+            let abstract_value = first_basic_block_locals_out[&local_index].0.clone();
+            let mut availability = BorrowState::Available;
+            for block_id in block_ids.iter() {
+                // A local is available for a block if it is available in every
+                // parent's outgoing locals
+                let basic_block = self.basic_blocks.get(block_id);
+                // Every block ID in the sequence should be valid
+                debug_assert!(basic_block.is_some());
+                if basic_block.unwrap().locals_out[&local_index].1 == BorrowState::Unavailable {
+                    availability = BorrowState::Unavailable;
+                }
+            }
+            locals_out.insert(local_index, (abstract_value, availability));
+        }
+        locals_out
+    }
+
+    /// Randomly vary the availability of locals
+    fn vary_locals(rng: &mut StdRng, locals: BlockLocals) -> BlockLocals {
+        let mut locals = locals;
+        for (_, (abstr_val, availability)) in locals.iter_mut() {
+            if rng.gen_bool(0.5) {
+                if *availability == BorrowState::Available {
+                    *availability = BorrowState::Unavailable;
+                } else {
+                    *availability = BorrowState::Available;
+                }
+            }
+
+            if abstr_val.is_generic() {
+                *availability = BorrowState::Unavailable;
+            }
+        }
+        locals
+    }
+
+    /// Add the incoming and outgoing locals for each basic block in the control flow graph.
+    /// Currently the incoming and outgoing locals are the same for each block.
+    fn add_locals(cfg: &mut CFG, rng: &mut StdRng, locals: &[SignatureToken], args_len: usize) {
+        debug_assert!(
+            !cfg.basic_blocks.is_empty(),
+            "Cannot add locals to empty cfg"
+        );
+        debug!("add locals: {:#?}", locals);
+        for block_id in 0..cfg.basic_blocks.len() {
+            let cfg_copy = cfg.clone();
+            let basic_block = cfg
+                .basic_blocks
+                .get_mut(&(block_id as BlockIDSize))
+                .unwrap();
+            if cfg_copy.num_parents(block_id as BlockIDSize) == 0 {
+                basic_block.locals_in = locals
+                    .iter()
+                    .enumerate()
+                    .map(|(i, token)| {
+                        let borrow_state = if i < args_len {
+                            BorrowState::Available
+                        } else {
+                            BorrowState::Unavailable
+                        };
+                        (
+                            i,
+                            (
+                                AbstractValue::new_value(token.clone(), AbilitySet::PRIMITIVES),
+                                borrow_state,
+                            ),
+                        )
+                    })
+                    .collect();
+            } else {
+                // Implication of precondition
+                debug_assert!(!cfg_copy.basic_blocks.is_empty());
+                basic_block.locals_in =
+                    cfg_copy.merge_locals(cfg_copy.get_parent_ids(block_id as BlockIDSize));
+            }
+            basic_block.locals_out = CFG::vary_locals(rng, basic_block.locals_in.clone());
+        }
+    }
+
+    /// Decide the serialization order of the blocks in the CFG
+    pub fn serialize_block_order(&self) -> Vec<BlockIDSize> {
+        let mut block_order: Vec<BlockIDSize> = Vec::new();
+        let mut block_queue: VecDeque<BlockIDSize> = VecDeque::new();
+        block_queue.push_back(0);
+        while !block_queue.is_empty() {
+            let block_id_front = block_queue.pop_front();
+            // The queue is non-empty so the front block id will not be none
+            debug_assert!(block_id_front.is_some());
+            let block_id = block_id_front.unwrap();
+            let child_ids = self.get_children_ids(block_id);
+            if child_ids.len() == 2 {
+                block_queue.push_front(child_ids[0]);
+                block_queue.push_back(child_ids[1]);
+            } else if child_ids.len() == 1 {
+                block_queue.push_back(child_ids[0]);
+            } else if !child_ids.is_empty() {
+                // We construct the CFG such that blocks have either 0, 1, or 2
+                // children.
+                unreachable!(
+                    "Invalid number of children for basic block {:?}",
+                    child_ids.len()
+                );
+            }
+            // This operation is expensive but is performed just when
+            // serializing the module.
+            if !block_order.contains(&block_id) {
+                block_order.push(block_id);
+            }
+        }
+        debug!("Block order: {:?}", block_order);
+        block_order
+    }
+
+    /// Get the serialized code offset of a basic block based on its position in the serialized
+    /// instruction sequence.
+    fn get_block_offset(cfg: &CFG, block_order: &[BlockIDSize], block_id: BlockIDSize) -> u16 {
+        assert!(
+            (0..block_id).all(|id| cfg.basic_blocks.get(&id).is_some()),
+            "Error: Invalid block_id given"
+        );
+        let mut offset: u16 = 0;
+        for i in block_order {
+            if *i == block_id {
+                break;
+            }
+            if let Some(block) = cfg.basic_blocks.get(i) {
+                offset += block.instructions.len() as u16;
+            }
+        }
+        offset
+    }
+
+    /// Serialize the control flow graph into a sequence of instructions. Set the offsets of branch
+    /// instructions appropriately.
+    pub fn serialize(&mut self) -> Vec<Bytecode> {
+        assert!(
+            !self.basic_blocks.is_empty(),
+            "Error: CFG has no basic blocks"
+        );
+        let cfg_copy = self.clone();
+        let mut bytecode: Vec<Bytecode> = Vec::new();
+        let block_order = self.serialize_block_order();
+        for block_id in &block_order {
+            let block = self.basic_blocks.get_mut(block_id);
+            // The generated block order contains every block
+            debug_assert!(block.is_some());
+            let block = block.unwrap();
+            // All basic blocks should have instructions filled in at this point
+            assert!(
+                !block.instructions.is_empty(),
+                "Error: block created with no instructions",
+            );
+            let last_instruction_index = block.instructions.len() - 1;
+            let child_ids = cfg_copy.get_children_ids(*block_id);
+            if child_ids.len() == 2 {
+                // The left child (fallthrough) is serialized before the right (jump)
+                let offset = CFG::get_block_offset(&cfg_copy, &block_order, child_ids[1]);
+                match block.instructions.last() {
+                    Some(Bytecode::BrTrue(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::BrTrue(offset);
+                    },
+                    Some(Bytecode::BrFalse(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::BrFalse(offset);
+                    },
+                    _ => unreachable!(
+                        "Error: unsupported two target jump instruction, {:#?}",
+                        block.instructions.last()
+                    ),
+                };
+            } else if child_ids.len() == 1 {
+                let offset = CFG::get_block_offset(&cfg_copy, &block_order, child_ids[0]);
+                match block.instructions.last() {
+                    Some(Bytecode::Branch(_)) => {
+                        block.instructions[last_instruction_index] = Bytecode::Branch(offset);
+                    },
+                    _ => unreachable!(
+                        "Error: unsupported one target jump instruction, {:#?}",
+                        block.instructions.last()
+                    ),
+                }
+            }
+            bytecode.extend(block.instructions.clone());
+        }
+        debug!("Final bytecode: {:#?}", bytecode);
+        bytecode
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/error.rs b/vendors/move/crates/testing-infra/test-generation/src/error.rs
new file mode 100644
index 000000000..5c06c1a33
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/error.rs
@@ -0,0 +1,24 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt;
+
+/// This struct represents an error that is returned during the
+/// testcase generation process.
+#[derive(Debug)]
+pub struct VMError {
+    message: String,
+}
+
+impl VMError {
+    pub fn new(message: String) -> VMError {
+        VMError { message }
+    }
+}
+
+impl fmt::Display for VMError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/lib.rs b/vendors/move/crates/testing-infra/test-generation/src/lib.rs
new file mode 100644
index 000000000..bd8624374
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/lib.rs
@@ -0,0 +1,504 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod abstract_state;
+pub mod borrow_graph;
+pub mod bytecode_generator;
+pub mod config;
+pub mod control_flow_graph;
+pub mod error;
+pub mod summaries;
+pub mod transitions;
+
+use crate::config::{Args, EXECUTE_UNVERIFIED_MODULE, RUN_ON_VM};
+use bytecode_generator::BytecodeGenerator;
+use crossbeam_channel::{bounded, unbounded, Receiver, Sender};
+use getrandom::getrandom;
+use module_generation::generate_module;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken, StructHandleIndex,
+    },
+};
+use move_bytecode_verifier::verify_module;
+use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    language_storage::TypeTag,
+    resolver::MoveResolver,
+    value::MoveValue,
+    vm_status::{StatusCode, VMStatus},
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
+use move_vm_types::gas::UnmeteredGasMeter;
+use once_cell::sync::Lazy;
+use rand::{rngs::StdRng, Rng, SeedableRng};
+use std::{fs, io::Write, panic, thread};
+use tracing::{debug, error, info};
+
+/// This function calls the Bytecode verifier to test it
+fn run_verifier(module: CompiledModule) -> Result<CompiledModule, String> {
+    match panic::catch_unwind(|| verify_module(&module)) {
+        Ok(res) => match res {
+            Ok(_) => Ok(module),
+            Err(err) => Err(format!("Module verification failed: {:#?}", err)),
+        },
+        Err(err) => Err(format!("Verifier panic: {:#?}", err)),
+    }
+}
+
+static STORAGE_WITH_MOVE_STDLIB: Lazy<InMemoryStorage> = Lazy::new(|| {
+    let mut storage = InMemoryStorage::new();
+    let (_, compiled_units) = Compiler::from_files(
+        move_stdlib::move_stdlib_files(),
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build_and_report()
+    .unwrap();
+    let compiled_modules = compiled_units.into_iter().map(|unit| match unit {
+        AnnotatedCompiledUnit::Module(annot_module) => annot_module.named_module.module,
+        AnnotatedCompiledUnit::Script(_) => panic!("Unexpected Script in stdlib"),
+    });
+    for module in compiled_modules {
+        let mut blob = vec![];
+        module.serialize(&mut blob).unwrap();
+        storage.publish_or_overwrite_module(module.self_id(), blob);
+    }
+    storage
+});
+
+/// This function runs a verified module in the VM runtime
+fn run_vm(module: CompiledModule) -> Result<(), VMStatus> {
+    // By convention the 0'th index function definition is the entrypoint to the module (i.e. that
+    // will contain only simply-typed arguments).
+    let entry_idx = FunctionDefinitionIndex::new(0);
+    let function_signature = {
+        let handle = module.function_def_at(entry_idx).function;
+        let sig_idx = module.function_handle_at(handle).parameters;
+        module.signature_at(sig_idx).clone()
+    };
+    let main_args: Vec<Vec<u8>> = function_signature
+        .0
+        .iter()
+        .map(|sig_tok| match sig_tok {
+            SignatureToken::Address => MoveValue::Address(AccountAddress::ZERO)
+                .simple_serialize()
+                .unwrap(),
+            SignatureToken::U64 => MoveValue::U64(0).simple_serialize().unwrap(),
+            SignatureToken::Bool => MoveValue::Bool(true).simple_serialize().unwrap(),
+            SignatureToken::Vector(inner_tok) if **inner_tok == SignatureToken::U8 => {
+                MoveValue::Vector(vec![]).simple_serialize().unwrap()
+            },
+            SignatureToken::Vector(_)
+            | SignatureToken::U8
+            | SignatureToken::U128
+            | SignatureToken::Signer
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => unimplemented!("Unsupported argument type: {:#?}", sig_tok),
+        })
+        .collect();
+
+    execute_function_in_module(
+        module,
+        entry_idx,
+        vec![],
+        main_args,
+        &*STORAGE_WITH_MOVE_STDLIB,
+    )
+}
+
+/// Execute the first function in a module
+fn execute_function_in_module(
+    module: CompiledModule,
+    idx: FunctionDefinitionIndex,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    storage: &impl MoveResolver,
+) -> Result<(), VMStatus> {
+    let module_id = module.self_id();
+    let entry_name = {
+        let entry_func_idx = module.function_def_at(idx).function;
+        let entry_name_idx = module.function_handle_at(entry_func_idx).name;
+        module.identifier_at(entry_name_idx)
+    };
+    {
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+
+        let mut changeset = ChangeSet::new();
+        let mut blob = vec![];
+        module.serialize(&mut blob).unwrap();
+        changeset
+            .add_module_op(module_id.clone(), Op::New(blob))
+            .unwrap();
+        let delta_storage = DeltaStorage::new(storage, &changeset);
+        let mut sess = vm.new_session(&delta_storage);
+
+        sess.execute_function_bypass_visibility(
+            &module_id,
+            entry_name,
+            ty_args,
+            args,
+            &mut UnmeteredGasMeter,
+        )?;
+
+        Ok(())
+    }
+}
+
+/// Serialize a module to `path` if `output_path` is `Some(path)`. If `output_path` is `None`
+/// print the module out as debug output.
+fn output_error_case(module: CompiledModule, output_path: Option<String>, case_id: u64, tid: u64) {
+    match output_path {
+        Some(path) => {
+            let mut out = vec![];
+            module
+                .serialize(&mut out)
+                .expect("Unable to serialize module");
+            let output_file = format!("{}/case{}_{}.module", path, tid, case_id);
+            let mut f = fs::File::create(output_file)
+                .unwrap_or_else(|err| panic!("Unable to open output file {}: {}", &path, err));
+            f.write_all(&out)
+                .unwrap_or_else(|err| panic!("Unable to write to output file {}: {}", &path, err));
+        },
+        None => {
+            debug!("{:#?}", module);
+        },
+    }
+}
+
+fn seed(seed: Option<String>) -> [u8; 32] {
+    let mut array = [0u8; 32];
+    match seed {
+        Some(string) => {
+            let vec = hex::decode(string).unwrap();
+            if vec.len() != 32 {
+                panic!("Invalid seed supplied, the length must be 32.");
+            }
+            for (i, byte) in vec.into_iter().enumerate() {
+                array[i] = byte;
+            }
+        },
+        None => {
+            getrandom(&mut array).unwrap();
+        },
+    };
+    array
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Status {
+    VerificationFailure,
+    ExecutionFailure,
+    Valid,
+}
+
+fn bytecode_module(rng: &mut StdRng, module: CompiledModule) -> CompiledModule {
+    let mut generated_module = BytecodeGenerator::new(rng).generate_module(module.clone());
+    // Module generation can retry under certain circumstances
+    while generated_module.is_none() {
+        generated_module = BytecodeGenerator::new(rng).generate_module(module.clone());
+    }
+    generated_module.unwrap()
+}
+
+pub fn module_frame_generation(
+    num_iters: Option<u64>,
+    seed: [u8; 32],
+    sender: Sender<CompiledModule>,
+    stats: Receiver<Status>,
+) {
+    let mut verification_failures: u128 = 0;
+    let mut execution_failures: u128 = 0;
+    let mut generated: u128 = 1;
+
+    let generation_options = config::module_generation_settings();
+    let mut rng = StdRng::from_seed(seed);
+    let mut module = generate_module(&mut rng, generation_options.clone());
+    // Either get the number of iterations provided by the user, or iterate "infinitely"--up to
+    // u128::MAX number of times.
+    let iters = num_iters
+        .map(|x| x as u128)
+        .unwrap_or_else(|| std::u128::MAX);
+
+    while generated < iters && sender.send(module).is_ok() {
+        module = generate_module(&mut rng, generation_options.clone());
+        generated += 1;
+        while let Ok(stat) = stats.try_recv() {
+            match stat {
+                Status::VerificationFailure => verification_failures += 1,
+                Status::ExecutionFailure => execution_failures += 1,
+                _ => (),
+            };
+        }
+
+        if generated > 0 && generated % 100 == 0 {
+            info!(
+                "Generated: {} Verified: {} Executed: {}",
+                generated,
+                (generated - verification_failures),
+                (generated - execution_failures)
+            );
+        }
+    }
+
+    // Drop the sender channel to signal to the consumers that they should expect no more modules,
+    // and should finish up.
+    drop(sender);
+
+    // Gather final stats from the consumers.
+    while let Ok(stat) = stats.recv() {
+        match stat {
+            Status::VerificationFailure => verification_failures += 1,
+            Status::ExecutionFailure => execution_failures += 1,
+            _ => (),
+        };
+    }
+    info!(
+        "Final stats: Generated: {} Verified: {} Executed: {}",
+        generated,
+        (generated - verification_failures),
+        (generated - execution_failures)
+    );
+}
+
+pub fn bytecode_generation(
+    output_path: Option<String>,
+    tid: u64,
+    mut rng: StdRng,
+    receiver: Receiver<CompiledModule>,
+    stats: Sender<Status>,
+) {
+    while let Ok(module) = receiver.recv() {
+        let mut status = Status::VerificationFailure;
+        debug!("Generating module");
+        let module = bytecode_module(&mut rng, module);
+
+        debug!("Done...Running module on verifier...");
+        let verified_module = match run_verifier(module.clone()) {
+            Ok(verified_module) => {
+                status = Status::ExecutionFailure;
+                Some(verified_module)
+            },
+            Err(e) => {
+                error!("{}", e);
+                let uid = rng.gen::<u64>();
+                output_error_case(module.clone(), output_path.clone(), uid, tid);
+                if EXECUTE_UNVERIFIED_MODULE {
+                    Some(module.clone())
+                } else {
+                    None
+                }
+            },
+        };
+
+        if let Some(verified_module) = verified_module {
+            if RUN_ON_VM {
+                debug!("Done...Running module on VM...");
+                let execution_result = panic::catch_unwind(|| run_vm(verified_module));
+                match execution_result {
+                    Ok(execution_result) => match execution_result {
+                        Ok(_) => {
+                            status = Status::Valid;
+                        },
+                        Err(e) => match e.status_code() {
+                            StatusCode::ARITHMETIC_ERROR | StatusCode::OUT_OF_GAS => {
+                                status = Status::Valid;
+                            },
+                            _ => {
+                                error!("{}", e);
+                                let uid = rng.gen::<u64>();
+                                output_error_case(module.clone(), output_path.clone(), uid, tid);
+                            },
+                        },
+                    },
+                    Err(_) => {
+                        // Save modules that cause the VM runtime to panic
+                        let uid = rng.gen::<u64>();
+                        output_error_case(module.clone(), output_path.clone(), uid, tid);
+                    },
+                }
+            } else {
+                status = Status::Valid;
+            }
+        };
+        stats.send(status).unwrap();
+    }
+
+    drop(stats);
+}
+
+/// Run generate_bytecode for the range passed in and test each generated module
+/// on the bytecode verifier.
+pub fn run_generation(args: Args) {
+    let num_threads = if let Some(num_threads) = args.num_threads {
+        num_threads as usize
+    } else {
+        num_cpus::get()
+    };
+    assert!(
+        num_threads > 0,
+        "Number of worker threads must be greater than 0"
+    );
+
+    let (sender, receiver) = bounded(num_threads);
+    let (stats_sender, stats_reciever) = unbounded();
+    let seed = seed(args.seed);
+
+    let mut threads = Vec::new();
+    for tid in 0..num_threads {
+        let receiver = receiver.clone();
+        let stats_sender = stats_sender.clone();
+        let rng = StdRng::from_seed(seed);
+        let output_path = args.output_path.clone();
+        threads.push(thread::spawn(move || {
+            bytecode_generation(output_path, tid as u64, rng, receiver, stats_sender)
+        }));
+    }
+
+    // Need to drop this channel otherwise we'll get infinite blocking since the other channels are
+    // cloned; this one will remain open unless we close it and other threads are going to block
+    // waiting for more stats.
+    drop(stats_sender);
+
+    let num_iters = args.num_iterations;
+    threads.push(thread::spawn(move || {
+        module_frame_generation(num_iters, seed, sender, stats_reciever)
+    }));
+
+    for thread in threads {
+        thread.join().unwrap();
+    }
+}
+
+pub(crate) fn substitute(token: &SignatureToken, tys: &[SignatureToken]) -> SignatureToken {
+    use SignatureToken::*;
+
+    match token {
+        Bool => Bool,
+        U8 => U8,
+        U16 => U16,
+        U32 => U32,
+        U64 => U64,
+        U128 => U128,
+        U256 => U256,
+        Address => Address,
+        Signer => Signer,
+        Vector(ty) => Vector(Box::new(substitute(ty, tys))),
+        Struct(idx) => Struct(*idx),
+        StructInstantiation(idx, type_params) => StructInstantiation(
+            *idx,
+            type_params.iter().map(|ty| substitute(ty, tys)).collect(),
+        ),
+        Reference(ty) => Reference(Box::new(substitute(ty, tys))),
+        MutableReference(ty) => MutableReference(Box::new(substitute(ty, tys))),
+        TypeParameter(idx) => {
+            // Assume that the caller has previously parsed and verified the structure of the
+            // file and that this guarantees that type parameter indices are always in bounds.
+            debug_assert!((*idx as usize) < tys.len());
+            tys[*idx as usize].clone()
+        },
+    }
+}
+
+pub fn abilities(
+    module: &impl ModuleAccess,
+    ty: &SignatureToken,
+    constraints: &[AbilitySet],
+) -> AbilitySet {
+    use SignatureToken::*;
+
+    match ty {
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => AbilitySet::PRIMITIVES,
+
+        Reference(_) | MutableReference(_) => AbilitySet::REFERENCES,
+        Signer => AbilitySet::SIGNER,
+        TypeParameter(idx) => constraints[*idx as usize],
+        Vector(ty) => {
+            AbilitySet::polymorphic_abilities(AbilitySet::VECTOR, vec![false], vec![abilities(
+                module,
+                ty,
+                constraints,
+            )])
+            .unwrap()
+        },
+        Struct(idx) => {
+            let sh = module.struct_handle_at(*idx);
+            sh.abilities
+        },
+        StructInstantiation(idx, type_args) => {
+            let sh = module.struct_handle_at(*idx);
+            let declared_abilities = sh.abilities;
+            let declared_phantom_parameters =
+                sh.type_parameters.iter().map(|param| param.is_phantom);
+            let type_arguments = type_args
+                .iter()
+                .map(|arg| abilities(module, arg, constraints));
+            AbilitySet::polymorphic_abilities(
+                declared_abilities,
+                declared_phantom_parameters,
+                type_arguments,
+            )
+            .unwrap()
+        },
+    }
+}
+
+pub(crate) fn get_struct_handle_from_reference(
+    reference_signature: &SignatureToken,
+) -> Option<StructHandleIndex> {
+    match reference_signature {
+        SignatureToken::Reference(signature) => match **signature {
+            SignatureToken::StructInstantiation(idx, _) | SignatureToken::Struct(idx) => Some(idx),
+            _ => None,
+        },
+        SignatureToken::MutableReference(signature) => match **signature {
+            SignatureToken::StructInstantiation(idx, _) | SignatureToken::Struct(idx) => Some(idx),
+            _ => None,
+        },
+        _ => None,
+    }
+}
+
+pub(crate) fn get_type_actuals_from_reference(
+    token: &SignatureToken,
+) -> Option<Vec<SignatureToken>> {
+    use SignatureToken::*;
+
+    match token {
+        Reference(box_) | MutableReference(box_) => match &**box_ {
+            StructInstantiation(_, tys) => Some(tys.clone()),
+            Struct(_) => Some(vec![]),
+            _ => None,
+        },
+        Bool
+        | U8
+        | U64
+        | U128
+        | Address
+        | Signer
+        | Vector(_)
+        | Struct(_)
+        | StructInstantiation(_, _)
+        | TypeParameter(_)
+        | U16
+        | U32
+        | U256 => None,
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/main.rs b/vendors/move/crates/testing-infra/test-generation/src/main.rs
new file mode 100644
index 000000000..31a820a9e
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/main.rs
@@ -0,0 +1,18 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use test_generation::{config::Args, run_generation};
+
+fn setup_log() {
+    tracing::subscriber::set_global_default(tracing_subscriber::FmtSubscriber::new()).unwrap();
+}
+
+pub fn main() {
+    setup_log();
+    let args = Args::parse();
+    run_generation(args);
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/summaries.rs b/vendors/move/crates/testing-infra/test-generation/src/summaries.rs
new file mode 100644
index 000000000..2376e6576
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/summaries.rs
@@ -0,0 +1,621 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abstract_state::{AbstractState, AbstractValue, BorrowState, Mutability},
+    error::VMError,
+    function_instantiation_for_state, state_control_flow, state_create_struct,
+    state_create_struct_from_inst, state_function_can_acquire_resource,
+    state_local_availability_is, state_local_exists, state_local_has_ability, state_local_place,
+    state_local_set, state_local_take, state_local_take_borrow, state_memory_safe, state_never,
+    state_register_dereference, state_stack_bin_op, state_stack_function_call,
+    state_stack_function_inst_call, state_stack_function_inst_popn, state_stack_function_popn,
+    state_stack_has, state_stack_has_ability, state_stack_has_integer,
+    state_stack_has_polymorphic_eq, state_stack_has_reference, state_stack_has_struct,
+    state_stack_has_struct_inst, state_stack_is_castable, state_stack_local_polymorphic_eq,
+    state_stack_pop, state_stack_push, state_stack_push_register, state_stack_push_register_borrow,
+    state_stack_ref_polymorphic_eq, state_stack_satisfies_function_inst_signature,
+    state_stack_satisfies_function_signature, state_stack_satisfies_struct_signature,
+    state_stack_struct_borrow_field, state_stack_struct_borrow_field_inst,
+    state_stack_struct_has_field, state_stack_struct_has_field_inst, state_stack_struct_inst_popn,
+    state_stack_struct_popn, state_stack_unpack_struct, state_stack_unpack_struct_inst,
+    state_struct_has_key, state_struct_inst_has_key, struct_instantiation_for_state,
+    transitions::*,
+    unpack_instantiation_for_state, with_ty_param,
+};
+use move_binary_format::file_format::{
+    Ability, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex, SignatureToken,
+    StructDefInstantiationIndex, StructDefinitionIndex,
+};
+
+/// A `Precondition` is a boolean predicate on an `AbstractState`.
+pub type Precondition = dyn Fn(&AbstractState) -> bool;
+
+/// A `Effect` is a function that transforms on `AbstractState` to another
+pub type NonInstantiableEffect = dyn Fn(&AbstractState) -> Result<AbstractState, VMError>;
+pub type InstantiableEffect =
+    dyn Fn(StructDefInstantiationIndex) -> Vec<Box<NonInstantiableEffect>>;
+pub type FunctionInstantiableEffect =
+    dyn Fn(FunctionInstantiationIndex) -> Vec<Box<NonInstantiableEffect>>;
+
+type Instantiation = dyn Fn(&AbstractState) -> (StructDefinitionIndex, Vec<SignatureToken>);
+type FunctionInstantiation = dyn Fn(&AbstractState) -> (FunctionHandleIndex, Vec<SignatureToken>);
+type InstantiableInstruction = dyn Fn(StructDefInstantiationIndex) -> Bytecode;
+type FunctionInstantiableInstruction = dyn Fn(FunctionInstantiationIndex) -> Bytecode;
+
+pub enum Effects {
+    NoTyParams(Vec<Box<NonInstantiableEffect>>),
+    TyParams(
+        Box<Instantiation>,
+        Box<InstantiableEffect>,
+        Box<InstantiableInstruction>,
+    ),
+    TyParamsCall(
+        Box<FunctionInstantiation>,
+        Box<FunctionInstantiableEffect>,
+        Box<FunctionInstantiableInstruction>,
+    ),
+}
+
+/// The `Summary` of a bytecode instruction contains a list of `Precondition`s
+/// and a list of `Effect`s.
+pub struct Summary {
+    pub preconditions: Vec<Box<Precondition>>,
+    pub effects: Effects,
+}
+
+/// Return the `Summary` for a bytecode instruction, `instruction`
+pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
+    match instruction {
+        Bytecode::Pop => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_stack_has_ability!(0, Ability::Copy),
+                state_memory_safe!(Some(0)),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::LdU8(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U8
+            ))]),
+        },
+        Bytecode::LdU16(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U16
+            ))]),
+        },
+        Bytecode::LdU32(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U32
+            ))]),
+        },
+        Bytecode::LdU64(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U64
+            ))]),
+        },
+        Bytecode::LdU128(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U128
+            ))]),
+        },
+        Bytecode::LdU256(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U256
+            ))]),
+        },
+        Bytecode::CastU8 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U8)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U8)),
+            ]),
+        },
+        Bytecode::CastU16 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U16)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U16)),
+            ]),
+        },
+        Bytecode::CastU32 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U32)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U32)),
+            ]),
+        },
+        Bytecode::CastU64 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U64)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U64)),
+            ]),
+        },
+        Bytecode::CastU128 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U128)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U128)),
+            ]),
+        },
+        Bytecode::CastU256 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U256)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U256)),
+            ]),
+        },
+        // TODO actual constant generation
+        Bytecode::LdConst(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Address
+            ))]),
+        },
+        Bytecode::LdTrue => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Bool,
+            ))]),
+        },
+        Bytecode::LdFalse => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::Bool
+            ))]),
+        },
+        Bytecode::CopyLoc(i) => Summary {
+            preconditions: vec![
+                state_local_exists!(i),
+                state_local_has_ability!(i, Ability::Copy),
+                state_local_availability_is!(i, BorrowState::Available),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_local_take!(i), state_stack_push_register!()]),
+        },
+        Bytecode::MoveLoc(i) => Summary {
+            preconditions: vec![
+                state_local_exists!(i),
+                state_local_availability_is!(i, BorrowState::Available),
+                // TODO: We need to track borrowing of locals. Add this in when we allow the borrow
+                // graph.
+                // state_memory_safe!(Some(i as usize)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_local_take!(i),
+                state_stack_push_register!(),
+                state_local_set!(i, BorrowState::Unavailable),
+            ]),
+        },
+        Bytecode::StLoc(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_local_exists!(i),
+                // TODO: This covers storing on an copyable local only
+                state_local_has_ability!(i, Ability::Drop),
+                state_stack_local_polymorphic_eq!(0, i as usize),
+                state_memory_safe!(Some(0)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_local_place!(i),
+                state_local_set!(i, BorrowState::Available),
+            ]),
+        },
+        Bytecode::MutBorrowLoc(i) => Summary {
+            // TODO: Add these back in when borrow graph is added
+            // preconditions: vec![
+            //     state_local_exists!(i),
+            //     state_local_availability_is!(i, BorrowState::Available),
+            //     state_memory_safe!(None),
+            // ],
+            preconditions: vec![state_never!()],
+            effects: Effects::NoTyParams(vec![
+                state_local_take_borrow!(i, Mutability::Mutable),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::ImmBorrowLoc(i) => Summary {
+            // TODO: Add these back in when the borrow graph is added
+            //preconditions: vec![
+            //    state_local_exists!(i),
+            //    state_local_availability_is!(i, BorrowState::Available),
+            //    state_memory_safe!(None),
+            //],
+            preconditions: vec![state_never!()],
+            effects: Effects::NoTyParams(vec![
+                state_local_take_borrow!(i, Mutability::Immutable),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::ReadRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Either),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_register_dereference!(),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::WriteRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_has!(1, None),
+                state_stack_ref_polymorphic_eq!(0, 1),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::FreezeRef => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_register_dereference!(),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Div
+        | Bytecode::Mod
+        | Bytecode::BitAnd
+        | Bytecode::BitOr
+        | Bytecode::Xor => Summary {
+            preconditions: vec![
+                state_stack_has_integer!(0),
+                state_stack_has_integer!(1),
+                state_stack_has_polymorphic_eq!(0, 1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Shl | Bytecode::Shr => Summary {
+            preconditions: vec![
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::U8))),
+                state_stack_has_integer!(1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Or | Bytecode::And => Summary {
+            preconditions: vec![
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+                state_stack_has!(1, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!()]),
+        },
+        Bytecode::Not => Summary {
+            preconditions: vec![state_stack_has!(
+                0,
+                Some(AbstractValue::new_primitive(SignatureToken::Bool))
+            )],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::Eq | Bytecode::Neq => Summary {
+            preconditions: vec![
+                state_stack_has!(0, None),
+                state_stack_has!(1, None),
+                state_stack_has_ability!(0, Ability::Copy),
+                state_stack_has_polymorphic_eq!(0, 1),
+                state_memory_safe!(Some(0)),
+                state_memory_safe!(Some(1)),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => Summary {
+            preconditions: vec![
+                state_stack_has_integer!(0),
+                state_stack_has_integer!(1),
+                state_stack_has_polymorphic_eq!(0, 1),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_bin_op!(AbstractValue::new_primitive(
+                SignatureToken::Bool
+            ))]),
+        },
+        Bytecode::Pack(i) => Summary {
+            preconditions: vec![state_stack_satisfies_struct_signature!(i)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_struct_popn!(i),
+                state_create_struct!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::PackGeneric(idx) => Summary {
+            preconditions: vec![state_stack_satisfies_struct_signature!(idx, exact)],
+            effects: Effects::TyParams(
+                struct_instantiation_for_state!(idx, exact),
+                with_ty_param!((exact, idx) => inst,
+                    vec![
+                        state_stack_struct_inst_popn!(idx),
+                        state_create_struct_from_inst!(inst),
+                        state_stack_push_register!(),
+                    ]
+                ),
+                with_ty_param!((exact, idx) => inst, Bytecode::PackGeneric(inst)),
+            ),
+        },
+        Bytecode::Unpack(i) => Summary {
+            preconditions: vec![state_stack_has_struct!(i)],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_unpack_struct!(i)]),
+        },
+        Bytecode::UnpackGeneric(i) => Summary {
+            preconditions: vec![state_stack_has_struct_inst!(i)],
+            effects: Effects::TyParams(
+                unpack_instantiation_for_state!(),
+                with_ty_param!((exact, i) => inst,
+                    vec![
+                        state_stack_pop!(),
+                        state_stack_unpack_struct_inst!(inst),
+                    ]
+                ),
+                with_ty_param!((exact, i) => inst, Bytecode::UnpackGeneric(inst)),
+            ),
+        },
+        Bytecode::Exists(i) => Summary {
+            // The result of `state_struct_is_resource` is represented abstractly
+            // so concrete execution may differ
+            preconditions: vec![
+                state_struct_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::ExistsGeneric(i) => Summary {
+            // The result of `state_struct_is_resource` is represented abstractly
+            // so concrete execution may differ
+            preconditions: vec![
+                state_struct_inst_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::Bool)),
+            ]),
+        },
+        Bytecode::MutBorrowField(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_struct_has_field!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field!(i),
+            ]),
+        },
+        Bytecode::MutBorrowFieldGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Mutable),
+                state_stack_struct_has_field_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field_inst!(i),
+            ]),
+        },
+        Bytecode::ImmBorrowField(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Immutable),
+                state_stack_struct_has_field!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field!(i),
+            ]),
+        },
+        Bytecode::ImmBorrowFieldGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(0, Mutability::Immutable),
+                state_stack_struct_has_field_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_struct_borrow_field_inst!(i),
+            ]),
+        },
+        Bytecode::MutBorrowGlobal(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register_borrow!(Mutability::Mutable),
+            ]),
+        },
+        Bytecode::MutBorrowGlobalGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_inst_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register_borrow!(Mutability::Mutable),
+            ]),
+        },
+        Bytecode::ImmBorrowGlobal(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::ImmBorrowGlobalGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+                state_struct_inst_has_key!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register_borrow!(Mutability::Immutable),
+            ]),
+        },
+        Bytecode::MoveFrom(i) => Summary {
+            preconditions: vec![
+                state_function_can_acquire_resource!(),
+                state_struct_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::MoveFromGeneric(i) => Summary {
+            preconditions: vec![
+                state_function_can_acquire_resource!(),
+                state_struct_inst_has_key!(i),
+                state_stack_has!(
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::Address))
+                ),
+            ],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_create_struct_from_inst!(i),
+                state_stack_push_register!(),
+            ]),
+        },
+        Bytecode::MoveTo(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(1, Mutability::Immutable),
+                state_struct_has_key!(i),
+                state_stack_has_struct!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::MoveToGeneric(i) => Summary {
+            preconditions: vec![
+                state_stack_has_reference!(1, Mutability::Immutable),
+                state_struct_inst_has_key!(i),
+                state_stack_has_struct_inst!(i),
+                state_memory_safe!(None),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!(), state_stack_pop!()]),
+        },
+        Bytecode::Call(i) => Summary {
+            preconditions: vec![state_stack_satisfies_function_signature!(i)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_function_popn!(i),
+                state_stack_function_call!(i),
+            ]),
+        },
+        Bytecode::CallGeneric(i) => Summary {
+            preconditions: vec![state_stack_satisfies_function_inst_signature!(i)],
+            effects: Effects::TyParamsCall(
+                function_instantiation_for_state!(i),
+                with_ty_param!((exact, i) => inst,
+                    vec![
+                        state_stack_function_inst_popn!(inst),
+                        state_stack_function_inst_call!(i),
+                    ]
+                ),
+                with_ty_param!((exact, i) => inst, Bytecode::CallGeneric(inst)),
+            ),
+        },
+        // Control flow instructions are called manually and thus have
+        // `state_control_flow!()` as their precondition
+        Bytecode::Branch(_) => Summary {
+            preconditions: vec![state_control_flow!()],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        Bytecode::BrTrue(_) => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::BrFalse(_) => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::Bool))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::Ret => Summary {
+            preconditions: vec![state_control_flow!()],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        Bytecode::Abort => Summary {
+            preconditions: vec![
+                state_control_flow!(),
+                state_stack_has!(0, Some(AbstractValue::new_primitive(SignatureToken::U64))),
+            ],
+            effects: Effects::NoTyParams(vec![state_stack_pop!()]),
+        },
+        Bytecode::Nop => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![]),
+        },
+        // TODO: implement summaries for vector-related instructions
+        Bytecode::VecPack(..)
+        | Bytecode::VecLen(_)
+        | Bytecode::VecImmBorrow(_)
+        | Bytecode::VecMutBorrow(_)
+        | Bytecode::VecPushBack(_)
+        | Bytecode::VecPopBack(_)
+        | Bytecode::VecUnpack(..)
+        | Bytecode::VecSwap(_) => unimplemented!("Vector bytecode not supported yet"),
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/src/transitions.rs b/vendors/move/crates/testing-infra/test-generation/src/transitions.rs
new file mode 100644
index 000000000..43706bd36
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/src/transitions.rs
@@ -0,0 +1,1551 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    abilities,
+    abstract_state::{AbstractState, AbstractValue, BorrowState, Mutability},
+    config::ALLOW_MEMORY_UNSAFE,
+    error::VMError,
+    get_struct_handle_from_reference, get_type_actuals_from_reference, substitute,
+};
+use move_binary_format::{
+    access::*,
+    file_format::{
+        Ability, AbilitySet, FieldHandleIndex, FieldInstantiationIndex, FunctionHandleIndex,
+        FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+    },
+    views::{FunctionHandleView, StructDefinitionView, ViewInternals},
+};
+use std::collections::{hash_map::Entry, HashMap};
+
+//---------------------------------------------------------------------------
+// Type Instantiations from Unification with the Abstract Stack
+//---------------------------------------------------------------------------
+
+/// A substitution is a mapping from type formal index to the `SignatureToken` representing the
+/// type instantiation for that index.
+#[derive(Default)]
+pub struct Subst {
+    pub subst: HashMap<usize, SignatureToken>,
+}
+
+impl Subst {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    /// NB that the position of arguments here matters. We can build a substitution if the `instr_sig`
+    /// is a type parameter, and the `stack_sig` is a concrete type. But, if the instruction signature is a
+    /// concrete type, but the stack signature is a type parameter, they cannot unify and no
+    /// substitution is created.
+    pub fn check_and_add(&mut self, stack_sig: SignatureToken, instr_sig: SignatureToken) -> bool {
+        match (stack_sig, instr_sig) {
+            (tok, SignatureToken::TypeParameter(idx)) => {
+                if let Some(other_type) = self.subst.get(&(idx as usize)).cloned() {
+                    // If we have already defined a subtitution for this type parameter, then make
+                    // sure the signature token on the stack is amenable with the type selection.
+                    tok == other_type
+                } else {
+                    // Otherwise record that the type parameter maps to this signature token.
+                    self.subst.insert(idx as usize, tok);
+                    true
+                }
+            },
+            // A type parameter on the stack _cannot_ be unified with a non type parameter. But
+            // that case has already been taken care of above. This case is added for explicitness,
+            // but it could be rolled into the catch-all at the bottom of this match.
+            (SignatureToken::TypeParameter(_), _) => false,
+            (SignatureToken::Struct(sig1), SignatureToken::Struct(sig2)) => sig1 == sig2,
+            // Build a substitution from recursing into structs
+            (
+                SignatureToken::StructInstantiation(sig1, params1),
+                SignatureToken::StructInstantiation(sig2, params2),
+            ) => {
+                if sig1 != sig2 {
+                    return false;
+                }
+                assert!(params1.len() == params2.len());
+                for (s1, s2) in params1.into_iter().zip(params2.into_iter()) {
+                    if !self.check_and_add(s1, s2) {
+                        return false;
+                    }
+                }
+                true
+            },
+            (x, y) => x == y,
+        }
+    }
+
+    /// Return the instantiation from the substitution that has been built.
+    pub fn instantiation(self) -> Vec<SignatureToken> {
+        let mut vec = self.subst.into_iter().collect::<Vec<_>>();
+        vec.sort_by(|a, b| a.0.cmp(&b.0));
+        vec.into_iter().map(|x| x.1).collect()
+    }
+}
+
+//---------------------------------------------------------------------------
+// Kind Operations
+//---------------------------------------------------------------------------
+
+/// Given a signature token, returns the abilities of this token in the module context, and
+/// instantiation for the function.
+pub fn abilities_for_token(
+    state: &AbstractState,
+    token: &SignatureToken,
+    type_paramters: &[AbilitySet],
+) -> AbilitySet {
+    abilities(&state.module.module, token, type_paramters)
+}
+
+/// Given a locals signature index, determine the abilities for each signature token. Restricted for
+/// determining abilities at the top-level only. This is reflected in the use of
+/// `state.instantiation[..]` as the kind context.
+pub fn abilities_for_instantiation(
+    state: &AbstractState,
+    instantiation: &[SignatureToken],
+) -> Vec<AbilitySet> {
+    instantiation
+        .iter()
+        .map(|token| abilities(&state.module.module, token, &state.instantiation[..]))
+        .collect()
+}
+
+/// Determine whether the stack contains an integer value at given index.
+pub fn stack_has_integer(state: &AbstractState, index: usize) -> bool {
+    index < state.stack_len()
+        && match state.stack_peek(index) {
+            Some(AbstractValue { token, .. }) => token.is_integer(),
+            None => false,
+        }
+}
+
+pub fn stack_top_is_castable_to(state: &AbstractState, typ: SignatureToken) -> bool {
+    stack_has_integer(state, 0)
+        && match typ {
+            SignatureToken::U8 => stack_has(
+                state,
+                0,
+                Some(AbstractValue::new_primitive(SignatureToken::U8)),
+            ),
+            SignatureToken::U64 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                )
+            },
+            SignatureToken::U16 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                )
+            },
+            SignatureToken::U32 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                )
+            },
+            SignatureToken::U128 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                )
+            },
+            SignatureToken::U256 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U256)),
+                )
+            },
+            SignatureToken::Bool
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => false,
+        }
+}
+
+/// Determine the abstract value at `index` is of the given kind, if it exists.
+/// If it does not exist, return `false`.
+pub fn stack_has_ability(state: &AbstractState, index: usize, ability: Ability) -> bool {
+    if index < state.stack_len() {
+        match state.stack_peek(index) {
+            Some(abstract_value) => {
+                return abstract_value.abilities.has_ability(ability);
+            },
+            None => return false,
+        }
+    }
+    false
+}
+
+pub fn stack_has_all_abilities(state: &AbstractState, index: usize, abilities: AbilitySet) -> bool {
+    if !stack_has(state, index, None) {
+        return false;
+    }
+    let stack_value = state.stack_peek(index).unwrap();
+    abilities.is_subset(stack_value.abilities)
+}
+
+/// Check whether the local at `index` has the given ability
+pub fn local_has_ability(state: &AbstractState, index: u8, ability: Ability) -> bool {
+    state
+        .local_has_ability(index as usize, ability)
+        .unwrap_or(false)
+}
+
+//---------------------------------------------------------------------------
+// Stack & Local Predicates
+//---------------------------------------------------------------------------
+
+/// Determine whether the stack is at least of size `index`. If the optional `abstract_value`
+/// argument is some `AbstractValue`, check whether the type at `index` is that abstract_value.
+pub fn stack_has(
+    state: &AbstractState,
+    index: usize,
+    abstract_value: Option<AbstractValue>,
+) -> bool {
+    match abstract_value {
+        Some(abstract_value) => {
+            index < state.stack_len() && state.stack_peek(index) == Some(abstract_value)
+        },
+        None => index < state.stack_len(),
+    }
+}
+
+/// Determine whether two tokens on the stack have the same type
+pub fn stack_has_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index2, None) {
+        state.stack_peek(index1) == state.stack_peek(index2)
+            && stack_has_ability(state, index1, Ability::Drop)
+    } else {
+        false
+    }
+}
+
+/// Determine whether an abstract value on the stack and a abstract value in the locals have the
+/// same type
+pub fn stack_local_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index1, None) {
+        if let Some((abstract_value, _)) = state.local_get(index2) {
+            return state.stack_peek(index1) == Some(abstract_value.clone());
+        }
+    }
+    false
+}
+
+/// Check whether the local at `index` exists
+pub fn local_exists(state: &AbstractState, index: u8) -> bool {
+    state.local_exists(index as usize)
+}
+
+/// Check whether the local at `index` is of the given availability
+pub fn local_availability_is(state: &AbstractState, index: u8, availability: BorrowState) -> bool {
+    state
+        .local_availability_is(index as usize, availability)
+        .unwrap_or(false)
+}
+
+/// Determine whether an abstract value on the stack that is a reference points to something of the
+/// same type as another abstract value on the stack
+pub fn stack_ref_polymorphic_eq(state: &AbstractState, index1: usize, index2: usize) -> bool {
+    if stack_has(state, index2, None) {
+        if let Some(abstract_value) = state.stack_peek(index1) {
+            match abstract_value.token {
+                SignatureToken::MutableReference(token) | SignatureToken::Reference(token) => {
+                    let abstract_value_inner = AbstractValue {
+                        token: (*token).clone(),
+                        abilities: abilities_for_token(state, &token, &state.instantiation[..]),
+                    };
+                    return Some(abstract_value_inner) == state.stack_peek(index2);
+                },
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+//---------------------------------------------------------------------------
+// Stack and Local Operations
+//---------------------------------------------------------------------------
+
+/// Pop from the top of the stack.
+pub fn stack_pop(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_pop()?;
+    Ok(state)
+}
+
+pub enum StackBinOpResult {
+    Left,
+    Right,
+    Other(AbstractValue),
+}
+
+/// Perform a binary operation using the top two values on the stack as operands.
+pub fn stack_bin_op(
+    state: &AbstractState,
+    res: StackBinOpResult,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    let right = {
+        state.stack_pop()?;
+        state.register_move().unwrap()
+    };
+    let left = {
+        state.stack_pop()?;
+        state.register_move().unwrap()
+    };
+    state.stack_push(match res {
+        StackBinOpResult::Left => left,
+        StackBinOpResult::Right => right,
+        StackBinOpResult::Other(val) => val,
+    });
+    Ok(state)
+}
+
+/// Push given abstract_value to the top of the stack.
+pub fn stack_push(
+    state: &AbstractState,
+    abstract_value: AbstractValue,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_push(abstract_value);
+    Ok(state)
+}
+
+/// Push to the top of the stack from the register.
+pub fn stack_push_register(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.stack_push_register()?;
+    Ok(state)
+}
+
+/// Set the availability of local at `index`
+pub fn local_set(
+    state: &AbstractState,
+    index: u8,
+    availability: BorrowState,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_set(index as usize, availability)?;
+    Ok(state)
+}
+
+/// Put copy of the local at `index` in register
+pub fn local_take(state: &AbstractState, index: u8) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_take(index as usize)?;
+    Ok(state)
+}
+
+/// Put reference to local at `index` in register
+pub fn local_take_borrow(
+    state: &AbstractState,
+    index: u8,
+    mutability: Mutability,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_take_borrow(index as usize, mutability)?;
+    Ok(state)
+}
+
+/// Insert the register value into the locals at `index`
+pub fn local_place(state: &AbstractState, index: u8) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    state.local_place(index as usize)?;
+    Ok(state)
+}
+
+//---------------------------------------------------------------------------
+// Struct Predicates and Operations
+//---------------------------------------------------------------------------
+
+pub fn stack_satisfies_struct_instantiation(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+    exact: bool,
+) -> (bool, Subst) {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    if exact {
+        stack_satisfies_struct_signature(state, struct_inst.def, Some(struct_inst.type_parameters))
+    } else {
+        stack_satisfies_struct_signature(state, struct_inst.def, None)
+    }
+}
+
+/// Determine whether the struct at the given index can be constructed from the values on
+/// the stack.
+/// Note that this function is bidirectional; if there is an instantiation, we check it. Otherwise,
+/// we infer the types that are needed.
+pub fn stack_satisfies_struct_signature(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> (bool, Subst) {
+    let instantiation = instantiation.map(|index| state.module.instantiantiation_at(index));
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_def = StructDefinitionView::new(&state.module.module, struct_def);
+    // Get the type formals for the struct, and the kinds that they expect.
+    let type_parameters = struct_def.type_parameters();
+    let field_token_views = struct_def
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token());
+    let mut satisfied = true;
+    let mut substitution = Subst::new();
+    for (i, token_view) in field_token_views.rev().enumerate() {
+        let ty = if let Some(subst) = &instantiation {
+            substitute(token_view.as_inner(), subst)
+        } else {
+            token_view.as_inner().clone()
+        };
+        let has = if let SignatureToken::TypeParameter(idx) = &ty {
+            if stack_has_all_abilities(state, i, type_parameters[*idx as usize].constraints) {
+                let stack_tok = state.stack_peek(i).unwrap();
+                substitution.check_and_add(stack_tok.token, ty)
+            } else {
+                false
+            }
+        } else {
+            let abstract_value = AbstractValue {
+                token: ty,
+                abilities: abilities(
+                    &state.module.module,
+                    token_view.as_inner(),
+                    &type_parameters
+                        .iter()
+                        .map(|param| param.constraints)
+                        .collect::<Vec<_>>(),
+                ),
+            };
+            stack_has(state, i, Some(abstract_value))
+        };
+
+        if !has {
+            satisfied = false;
+        }
+    }
+    (satisfied, substitution)
+}
+
+pub fn get_struct_instantiation_for_state(
+    state: &AbstractState,
+    struct_inst_idx: StructDefInstantiationIndex,
+    exact: bool,
+) -> (StructDefinitionIndex, Vec<SignatureToken>) {
+    let struct_inst = state.module.struct_instantiantiation_at(struct_inst_idx);
+    if exact {
+        return (
+            struct_inst.def,
+            state
+                .module
+                .instantiantiation_at(struct_inst.type_parameters)
+                .clone(),
+        );
+    }
+    let struct_index = struct_inst.def;
+    let mut partial_instantiation = stack_satisfies_struct_signature(state, struct_index, None).1;
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_def = StructDefinitionView::new(&state.module.module, struct_def);
+    let typs = struct_def.type_parameters();
+    for (index, type_param) in typs.iter().enumerate() {
+        if let Entry::Vacant(e) = partial_instantiation.subst.entry(index) {
+            if type_param.constraints.has_key() {
+                unimplemented!("[Struct Instantiation] Need to fill in resource type params");
+            } else {
+                e.insert(SignatureToken::U64);
+            }
+        }
+    }
+    (struct_index, partial_instantiation.instantiation())
+}
+
+/// Determine if a struct (of the given signature) is at the top of the stack
+/// The `struct_index` can be `Some(index)` to check for a particular struct,
+/// or `None` to just check that there is a a struct.
+pub fn stack_has_struct(state: &AbstractState, struct_index: StructDefinitionIndex) -> bool {
+    if state.stack_len() > 0 {
+        if let Some(struct_value) = state.stack_peek(0) {
+            match struct_value.token {
+                SignatureToken::Struct(struct_handle)
+                | SignatureToken::StructInstantiation(struct_handle, _) => {
+                    let struct_def = state.module.module.struct_def_at(struct_index);
+                    return struct_handle == struct_def.struct_handle;
+                },
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Reference(_)
+                | SignatureToken::MutableReference(_)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+pub fn stack_has_struct_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> bool {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    stack_has_struct(state, struct_inst.def)
+}
+
+/// Determine if a struct at the given index is a resource
+pub fn struct_abilities(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    type_args: &Signature,
+) -> AbilitySet {
+    let struct_def = state.module.module.struct_def_at(struct_index);
+    let struct_handle = state
+        .module
+        .module
+        .struct_handle_at(struct_def.struct_handle);
+    let declared_phantom_parameters = struct_handle
+        .type_parameters
+        .iter()
+        .map(|param| param.is_phantom);
+    let type_argument_abilities = abilities_for_instantiation(state, &type_args.0);
+    AbilitySet::polymorphic_abilities(
+        struct_handle.abilities,
+        declared_phantom_parameters,
+        type_argument_abilities,
+    )
+    .unwrap()
+}
+
+pub fn struct_inst_abilities(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> AbilitySet {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    let type_args = state
+        .module
+        .module
+        .signature_at(struct_inst.type_parameters);
+    struct_abilities(state, struct_inst.def, type_args)
+}
+
+pub fn stack_struct_has_field_inst(
+    state: &AbstractState,
+    field_index: FieldInstantiationIndex,
+) -> bool {
+    let field_inst = state.module.module.field_instantiation_at(field_index);
+    stack_struct_has_field(state, field_inst.handle)
+}
+
+pub fn stack_struct_has_field(state: &AbstractState, field_index: FieldHandleIndex) -> bool {
+    let field_handle = state.module.module.field_handle_at(field_index);
+    if let Some(struct_handle_index) = state
+        .stack_peek(0)
+        .and_then(|abstract_value| get_struct_handle_from_reference(&abstract_value.token))
+    {
+        let struct_def = state.module.module.struct_def_at(field_handle.owner);
+        return struct_handle_index == struct_def.struct_handle;
+    }
+    false
+}
+
+/// Determine whether the stack has a reference at `index` with the given mutability.
+/// If `mutable` is `Either` then the reference can be either mutable or immutable
+pub fn stack_has_reference(state: &AbstractState, index: usize, mutability: Mutability) -> bool {
+    if state.stack_len() > index {
+        if let Some(abstract_value) = state.stack_peek(index) {
+            match abstract_value.token {
+                SignatureToken::MutableReference(_) => {
+                    if mutability == Mutability::Mutable || mutability == Mutability::Either {
+                        return true;
+                    }
+                },
+                SignatureToken::Reference(_) => {
+                    if mutability == Mutability::Immutable || mutability == Mutability::Either {
+                        return true;
+                    }
+                },
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
+            }
+        }
+    }
+    false
+}
+
+pub fn stack_struct_inst_popn(
+    state: &AbstractState,
+    struct_inst_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state
+        .module
+        .module
+        .struct_instantiation_at(struct_inst_index);
+    stack_struct_popn(state, struct_inst.def)
+}
+
+/// Pop the number of stack values required to construct the struct
+/// at `struct_index`
+pub fn stack_struct_popn(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    let struct_def_view = StructDefinitionView::new(&state_copy.module.module, struct_def);
+    for _ in struct_def_view.fields().unwrap() {
+        state.stack_pop()?;
+    }
+    Ok(state)
+}
+
+pub fn create_struct_from_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    create_struct(state, struct_inst.def, Some(struct_inst.type_parameters))
+}
+
+/// Construct a struct from abstract values on the stack
+/// The struct is stored in the register after creation
+pub fn create_struct(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    // Get the type, and kind of this struct
+    let sig_tok = match instantiation {
+        None => SignatureToken::Struct(struct_def.struct_handle),
+        Some(inst) => {
+            let ty_instantiation = state.module.instantiantiation_at(inst);
+            SignatureToken::StructInstantiation(struct_def.struct_handle, ty_instantiation.clone())
+        },
+    };
+    let struct_kind = abilities_for_token(&state, &sig_tok, &state.instantiation);
+    let struct_value = AbstractValue::new_struct(sig_tok, struct_kind);
+    state.register_set(struct_value);
+    Ok(state)
+}
+
+pub fn stack_unpack_struct_instantiation(
+    state: &AbstractState,
+) -> (StructDefinitionIndex, Vec<SignatureToken>) {
+    if let Some(av) = state.stack_peek(0) {
+        match av.token {
+            SignatureToken::StructInstantiation(handle, toks) => {
+                let mut def_filter = state
+                    .module
+                    .module
+                    .struct_defs()
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, struct_def)| struct_def.struct_handle == handle);
+                match def_filter.next() {
+                    Some((idx, _)) => (StructDefinitionIndex(idx as TableIndex), toks),
+                    None => panic!("Invalid unpack -- non-struct def value found at top of stack"),
+                }
+            },
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => {
+                panic!("Invalid unpack -- non-struct value found at top of stack")
+            },
+        }
+    } else {
+        panic!("Invalid unpack -- precondition not satisfied");
+    }
+}
+
+pub fn stack_unpack_struct_inst(
+    state: &AbstractState,
+    struct_index: StructDefInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let struct_inst = state.module.module.struct_instantiation_at(struct_index);
+    stack_unpack_struct(state, struct_inst.def, Some(struct_inst.type_parameters))
+}
+
+/// Push the fields of a struct as `AbstractValue`s to the stack
+pub fn stack_unpack_struct(
+    state: &AbstractState,
+    struct_index: StructDefinitionIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let ty_instantiation = match instantiation {
+        Some(inst) => state.module.instantiantiation_at(inst).clone(),
+        None => vec![],
+    };
+    let abilities = abilities_for_instantiation(&state_copy, &ty_instantiation);
+    let struct_def = state_copy.module.module.struct_def_at(struct_index);
+    let struct_def_view = StructDefinitionView::new(&state_copy.module.module, struct_def);
+    let token_views = struct_def_view
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token());
+    for token_view in token_views {
+        let abstract_value = AbstractValue {
+            token: substitute(token_view.as_inner(), &ty_instantiation),
+            abilities: abilities_for_token(&state, token_view.as_inner(), &abilities),
+        };
+        state = stack_push(&state, abstract_value)?;
+    }
+    Ok(state)
+}
+
+pub fn struct_ref_instantiation(state: &mut AbstractState) -> Result<Vec<SignatureToken>, VMError> {
+    let token = state.register_move().unwrap().token;
+    if let Some(type_actuals) = get_type_actuals_from_reference(&token) {
+        Ok(type_actuals)
+    } else {
+        Err(VMError::new("Invalid field borrow".to_string()))
+    }
+}
+
+/// Push the field at `field_index` of a struct as an `AbstractValue` to the stack
+pub fn stack_struct_borrow_field(
+    state: &AbstractState,
+    field_index: FieldHandleIndex,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    let typs = struct_ref_instantiation(&mut state)?;
+    let abilities = abilities_for_instantiation(&state, &typs);
+    let field_handle = state.module.module.field_handle_at(field_index);
+    let struct_def = state.module.module.struct_def_at(field_handle.owner);
+    let field_signature = match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            return Err(VMError::new("Borrow field on a native struct".to_string()));
+        },
+        StructFieldInformation::Declared(fields) => {
+            let field_def = &fields[field_handle.field as usize];
+            &field_def.signature.0
+        },
+    };
+    let reified_field_sig = substitute(field_signature, &typs);
+    // NB: We determine the kind on the non-reified_field_sig; we want any local references to
+    // type parameters to point to (struct) local type parameters. We could possibly also use the
+    // reified_field_sig coupled with the top-level instantiation, but I need to convince myself of
+    // the correctness of this.
+    let abstract_value = AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(reified_field_sig)),
+        abilities: abilities_for_token(&state, field_signature, &abilities),
+    };
+    state = stack_push(&state, abstract_value)?;
+    Ok(state)
+}
+
+pub fn stack_struct_borrow_field_inst(
+    state: &AbstractState,
+    field_index: FieldInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let field_inst = state.module.module.field_instantiation_at(field_index);
+    stack_struct_borrow_field(state, field_inst.handle)
+}
+
+/// Dereference the value stored in the register. If the value is not a reference, or
+/// the register is empty, return an error.
+pub fn register_dereference(state: &AbstractState) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    if let Some(abstract_value) = state.register_move() {
+        match abstract_value.token {
+            SignatureToken::MutableReference(token) => {
+                state.register_set(AbstractValue {
+                    token: *token,
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            },
+            SignatureToken::Reference(token) => {
+                state.register_set(AbstractValue {
+                    token: *token,
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            },
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => Err(VMError::new(
+                "Register does not contain a reference".to_string(),
+            )),
+        }
+    } else {
+        println!("{:?}", state);
+        Err(VMError::new("Register is empty".to_string()))
+    }
+}
+
+/// Push a reference to a register value with the given mutability.
+pub fn stack_push_register_borrow(
+    state: &AbstractState,
+    mutability: Mutability,
+) -> Result<AbstractState, VMError> {
+    let mut state = state.clone();
+    if let Some(abstract_value) = state.register_move() {
+        match mutability {
+            Mutability::Mutable => {
+                state.stack_push(AbstractValue {
+                    token: SignatureToken::MutableReference(Box::new(abstract_value.token)),
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            },
+            Mutability::Immutable => {
+                state.stack_push(AbstractValue {
+                    token: SignatureToken::Reference(Box::new(abstract_value.token)),
+                    abilities: abstract_value.abilities,
+                });
+                Ok(state)
+            },
+            Mutability::Either => Err(VMError::new("Mutability must be specified".to_string())),
+        }
+    } else {
+        Err(VMError::new("Register is empty".to_string()))
+    }
+}
+
+//---------------------------------------------------------------------------
+// Function Call Predicates and Operations
+//---------------------------------------------------------------------------
+
+/// Determine whether the function at the given index can be constructed from the values on
+/// the stack.
+pub fn stack_satisfies_function_signature(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+) -> (bool, Subst) {
+    let state_copy = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let type_parameters = &function_handle.type_parameters;
+    let mut satisfied = true;
+    let mut substitution = Subst::new();
+    let parameters = &state_copy.module.module.signatures()[function_handle.parameters.0 as usize];
+    for (i, parameter) in parameters.0.iter().rev().enumerate() {
+        let has = if let SignatureToken::TypeParameter(idx) = parameter {
+            if stack_has_all_abilities(state, i, type_parameters[*idx as usize]) {
+                let stack_tok = state.stack_peek(i).unwrap();
+                substitution.check_and_add(stack_tok.token, parameter.clone())
+            } else {
+                false
+            }
+        } else {
+            let abilities = abilities(&state.module.module, parameter, type_parameters);
+            let abstract_value = AbstractValue {
+                token: parameter.clone(),
+                abilities,
+            };
+            stack_has(state, i, Some(abstract_value))
+        };
+        if !has {
+            satisfied = false;
+        }
+    }
+    (satisfied, substitution)
+}
+
+pub fn stack_satisfies_function_inst_signature(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> (bool, Subst) {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_satisfies_function_signature(state, func_inst.handle)
+}
+
+/// Whether the function acquires any global resources or not
+pub fn function_can_acquire_resource(state: &AbstractState) -> bool {
+    !state.acquires_global_resources.is_empty()
+}
+
+/// Simulate calling the function at `function_index`
+pub fn stack_function_call(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+    instantiation: Option<SignatureIndex>,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let return_ = &state_copy.module.module.signatures()[function_handle.return_.0 as usize];
+    let mut ty_instantiation = &vec![];
+    if let Some(inst) = instantiation {
+        ty_instantiation = state_copy.module.instantiantiation_at(inst)
+    }
+    let abilities = abilities_for_instantiation(&state_copy, ty_instantiation);
+    for return_type in return_.0.iter() {
+        let abstract_value = AbstractValue {
+            token: substitute(return_type, ty_instantiation),
+            abilities: abilities_for_token(&state, return_type, &abilities),
+        };
+        state = stack_push(&state, abstract_value)?;
+    }
+    Ok(state)
+}
+
+pub fn stack_function_inst_call(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_function_call(state, func_inst.handle, Some(func_inst.type_parameters))
+}
+
+pub fn get_function_instantiation_for_state(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> (FunctionHandleIndex, Vec<SignatureToken>) {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    let mut partial_instantiation = stack_satisfies_function_signature(state, func_inst.handle).1;
+    let function_handle = state.module.module.function_handle_at(func_inst.handle);
+    let function_handle = FunctionHandleView::new(&state.module.module, function_handle);
+    let typs = function_handle.type_parameters();
+    for (index, abilities) in typs.iter().enumerate() {
+        if let Entry::Vacant(e) = partial_instantiation.subst.entry(index) {
+            if abilities.has_key() {
+                unimplemented!("[Struct Instantiation] Need to fill in resource type params");
+            } else {
+                e.insert(SignatureToken::U64);
+            }
+        }
+    }
+    (func_inst.handle, partial_instantiation.instantiation())
+}
+
+/// Pop the number of stack values required to call the function
+/// at `function_index`
+pub fn stack_function_popn(
+    state: &AbstractState,
+    function_index: FunctionHandleIndex,
+) -> Result<AbstractState, VMError> {
+    let state_copy = state.clone();
+    let mut state = state.clone();
+    let function_handle = state_copy.module.module.function_handle_at(function_index);
+    let parameters = &state_copy.module.module.signatures()[function_handle.parameters.0 as usize];
+    let number_of_pops = parameters.0.iter().len();
+    for _ in 0..number_of_pops {
+        state.stack_pop()?;
+    }
+    Ok(state)
+}
+
+pub fn stack_function_inst_popn(
+    state: &AbstractState,
+    function_index: FunctionInstantiationIndex,
+) -> Result<AbstractState, VMError> {
+    let func_inst = state
+        .module
+        .module
+        .function_instantiation_at(function_index);
+    stack_function_popn(state, func_inst.handle)
+}
+
+/// TODO: This is a temporary function that represents memory
+/// safety for a reference. This should be removed and replaced
+/// with appropriate memory safety premises when the borrow checking
+/// infrastructure is fully implemented.
+/// `index` is `Some(i)` if the instruction can be memory safe when operating
+/// on non-reference types.
+pub fn memory_safe(state: &AbstractState, index: Option<usize>) -> bool {
+    match index {
+        Some(index) => {
+            if stack_has_reference(state, index, Mutability::Either) {
+                ALLOW_MEMORY_UNSAFE
+            } else {
+                true
+            }
+        },
+        None => ALLOW_MEMORY_UNSAFE,
+    }
+}
+
+//---------------------------------------------------------------------------
+// Macros
+//---------------------------------------------------------------------------
+
+/// Wrapper for enclosing the arguments of `stack_has` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has {
+    ($e1:expr, $e2:expr) => {
+        Box::new(move |state| stack_has(state, $e1, $e2))
+    };
+}
+
+/// Determines if the type at the top of the abstract stack is castable to the given type.
+#[macro_export]
+macro_rules! state_stack_is_castable {
+    ($e1:expr) => {
+        Box::new(move |state| stack_top_is_castable_to(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_integer` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has_integer {
+    ($e1:expr) => {
+        Box::new(move |state| stack_has_integer(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_kind_is` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_has_ability {
+    ($e:expr, $a:expr) => {
+        Box::new(move |state| stack_has_ability(state, $e, $a))
+    };
+}
+
+/// Wrapper for for enclosing the arguments of `stack_has_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_polymorphic_eq {
+    ($e1:expr, $e2:expr) => {
+        Box::new(move |state| stack_has_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_pop` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_pop {
+    () => {
+        Box::new(move |state| stack_pop(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_push {
+    ($e:expr) => {
+        Box::new(move |state| stack_push(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push_register` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_stack_push_register {
+    () => {
+        Box::new(move |state| stack_push_register(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_local_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_local_polymorphic_eq {
+    ($e1:expr, $e2:expr) => {
+        Box::new(move |state| stack_local_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_exists` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_exists {
+    ($e:expr) => {
+        Box::new(move |state| local_exists(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_availability_is` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_availability_is {
+    ($e:expr, $a:expr) => {
+        Box::new(move |state| local_availability_is(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `state_local_has_ability` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_has_ability {
+    ($e:expr, $a:expr) => {
+        Box::new(move |state| local_has_ability(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_set` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_set {
+    ($e:expr, $a:expr) => {
+        Box::new(move |state| local_set(state, $e, $a))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_take` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_take {
+    ($e:expr) => {
+        Box::new(move |state| local_take(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_take_borrow` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_take_borrow {
+    ($e:expr, $mutable:expr) => {
+        Box::new(move |state| local_take_borrow(state, $e, $mutable))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `local_palce` so that only the `state` needs
+/// to be given.
+#[macro_export]
+macro_rules! state_local_place {
+    ($e:expr) => {
+        Box::new(move |state| local_place(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_ref_polymorphic_eq` so that only the `state`
+/// needs to be given.
+#[macro_export]
+macro_rules! state_stack_ref_polymorphic_eq {
+    ($e1:expr, $e2:expr) => {
+        Box::new(move |state| stack_ref_polymorphic_eq(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_satisfies_struct_signature` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_satisfies_struct_signature {
+    ($e:expr) => {
+        Box::new(move |state| stack_satisfies_struct_signature(state, $e, None).0)
+    };
+    ($e:expr, $is_exact:expr) => {
+        Box::new(move |state| stack_satisfies_struct_instantiation(state, $e, $is_exact).0)
+    };
+}
+
+/// Wrapper for enclosing the arguments of `state_stack_struct_inst_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_inst_popn {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_inst_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_struct_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_popn {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_pack_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_create_struct {
+    ($e1:expr) => {
+        Box::new(move |state| create_struct(state, $e1, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_create_struct_from_inst {
+    ($e1:expr) => {
+        Box::new(move |state| create_struct_from_inst(state, $e1))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_struct {
+    ($e:expr) => {
+        Box::new(move |state| stack_has_struct(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_has_struct_inst {
+    ($e:expr) => {
+        Box::new(move |state| stack_has_struct_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_unpack_struct` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_unpack_struct {
+    ($e:expr) => {
+        Box::new(move |state| stack_unpack_struct(state, $e, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_unpack_struct_inst {
+    ($e:expr) => {
+        Box::new(move |state| stack_unpack_struct_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `struct_abilities` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_struct_has_key {
+    ($e:expr) => {
+        Box::new(move |state| {
+            struct_abilities(
+                state,
+                $e,
+                &move_binary_format::file_format::Signature(vec![]),
+            )
+            .has_key()
+        })
+    };
+}
+
+#[macro_export]
+macro_rules! state_struct_inst_has_key {
+    ($e:expr) => {
+        Box::new(move |state| struct_inst_abilities(state, $e).has_key())
+    };
+}
+
+/// Wrapper for enclosing the arguments of `struct_has_field` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_has_field {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_has_field(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_struct_has_field_inst {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_has_field_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_struct_borrow_field` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_struct_borrow_field {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_borrow_field(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_struct_borrow_field_inst {
+    ($e:expr) => {
+        Box::new(move |state| stack_struct_borrow_field_inst(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_has_reference` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_has_reference {
+    ($e1:expr, $e2:expr) => {
+        Box::new(move |state| stack_has_reference(state, $e1, $e2))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `register_dereference` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_register_dereference {
+    () => {
+        Box::new(move |state| register_dereference(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_push_register_borrow` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_push_register_borrow {
+    ($e:expr) => {
+        Box::new(move |state| stack_push_register_borrow(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_satisfies_function_signature` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_satisfies_function_signature {
+    ($e:expr) => {
+        Box::new(move |state| stack_satisfies_function_signature(state, $e).0)
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_satisfies_function_inst_signature {
+    ($e:expr) => {
+        Box::new(move |state| stack_satisfies_function_inst_signature(state, $e).0)
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_function_popn` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_function_popn {
+    ($e:expr) => {
+        Box::new(move |state| stack_function_popn(state, $e))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_function_inst_popn {
+    ($e:expr) => {
+        Box::new(move |state| stack_function_inst_popn(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `stack_function_call` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_stack_function_call {
+    ($e:expr) => {
+        Box::new(move |state| stack_function_call(state, $e, None))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_function_inst_call {
+    ($e:expr) => {
+        Box::new(move |state| stack_function_inst_call(state, $e))
+    };
+}
+
+/// Determine the proper type instantiation for function call in the current state.
+#[macro_export]
+macro_rules! function_instantiation_for_state {
+    ($e:expr) => {
+        Box::new(move |state| get_function_instantiation_for_state(state, $e))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `function_can_acquire_resource` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_function_can_acquire_resource {
+    () => {
+        Box::new(move |state| function_can_acquire_resource(state))
+    };
+}
+
+/// Wrapper for enclosing the arguments of `memory_safe` so that only the
+/// `state` needs to be given.
+#[macro_export]
+macro_rules! state_memory_safe {
+    ($e:expr) => {
+        Box::new(move |state| memory_safe(state, $e))
+    };
+}
+
+/// Predicate that is false for every state.
+#[macro_export]
+macro_rules! state_never {
+    () => {
+        Box::new(|_| (false))
+    };
+}
+
+#[macro_export]
+macro_rules! state_stack_bin_op {
+    (#left) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Left))
+    };
+    (#right) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Right))
+    };
+    () => {
+        state_stack_bin_op!(#left)
+    };
+    ($e: expr) => {
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Other($e)))
+    }
+}
+
+/// Predicate that is false for every state, unless control operations are allowed.
+#[macro_export]
+macro_rules! state_control_flow {
+    () => {
+        Box::new(|state| state.is_control_flow_allowed())
+    };
+}
+
+/// Determine the proper type instantiation for struct in the current state.
+#[macro_export]
+macro_rules! struct_instantiation_for_state {
+    ($e:expr, $is_exact:expr) => {
+        Box::new(move |state| get_struct_instantiation_for_state(state, $e, $is_exact))
+    };
+}
+
+/// Determine the proper type instantiation for struct in the current state.
+#[macro_export]
+macro_rules! unpack_instantiation_for_state {
+    () => {
+        Box::new(move |state| stack_unpack_struct_instantiation(state))
+    };
+}
+
+/// A wrapper around type instantiation, that allows specifying an "exact" instantiation index, or
+/// if the instantiation should be inferred from the current state.
+#[macro_export]
+macro_rules! with_ty_param {
+    (($is_exact:expr, $struct_inst_idx:expr) => $s_inst_idx:ident, $body:expr) => {
+        Box::new(move |$s_inst_idx| {
+            let $s_inst_idx = if $is_exact {
+                $struct_inst_idx
+            } else {
+                $s_inst_idx
+            };
+            $body
+        })
+    };
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/boolean_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/boolean_instructions.rs
new file mode 100644
index 000000000..573ae4e1b
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/boolean_instructions.rs
@@ -0,0 +1,48 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_and() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::And, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_or() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Or, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_not() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Not, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/call_graph.rs b/vendors/move/crates/testing-infra/test-generation/tests/call_graph.rs
new file mode 100644
index 000000000..989176108
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/call_graph.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::FunctionHandleIndex;
+use test_generation::abstract_state::CallGraph;
+
+#[test]
+fn call_graph_no_self_call_recursive() {
+    let call_graph = CallGraph::new(10);
+    let can_call = call_graph.can_call(FunctionHandleIndex(0));
+    assert!(can_call.len() == 9);
+    assert!(!can_call.iter().any(|fh| *fh == FunctionHandleIndex(0)));
+}
+
+#[test]
+fn call_graph_simple_recursive_call() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    let can_call0 = call_graph.can_call(FunctionHandleIndex(0));
+    let can_call1 = call_graph.can_call(FunctionHandleIndex(1));
+    assert!(can_call0.len() == 9);
+    assert!(can_call1.len() == 8);
+    assert!(!can_call0.iter().any(|fh| *fh == FunctionHandleIndex(0)));
+    assert!(!can_call1
+        .iter()
+        .any(|fh| *fh == FunctionHandleIndex(0) || *fh == FunctionHandleIndex(1)));
+}
+
+#[test]
+fn call_graph_transitive_recursive_call() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(2), FunctionHandleIndex(0));
+    let can_call0 = call_graph.can_call(FunctionHandleIndex(0));
+    assert!(can_call0.len() == 7);
+}
+
+#[test]
+fn call_graph_call_graph_depth() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(3));
+    call_graph.add_call(FunctionHandleIndex(3), FunctionHandleIndex(2));
+    assert!(
+        call_graph
+            .call_depth(FunctionHandleIndex(0), FunctionHandleIndex(1))
+            .unwrap()
+            == 3
+    );
+}
+
+#[test]
+fn call_graph_call_call_into_graph_depth() {
+    let mut call_graph = CallGraph::new(10);
+    call_graph.add_call(FunctionHandleIndex(0), FunctionHandleIndex(1));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(2));
+    call_graph.add_call(FunctionHandleIndex(1), FunctionHandleIndex(3));
+    call_graph.add_call(FunctionHandleIndex(3), FunctionHandleIndex(2));
+    assert!(call_graph.max_calling_depth(FunctionHandleIndex(2)) == 3);
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/common.rs b/vendors/move/crates/testing-infra/test-generation/tests/common.rs
new file mode 100644
index 000000000..732aa3476
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/common.rs
@@ -0,0 +1,113 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, FunctionInstantiation, StructDefInstantiation};
+use test_generation::{
+    abstract_state::AbstractState,
+    config::ALLOW_MEMORY_UNSAFE,
+    summaries::{instruction_summary, Effects},
+};
+
+pub fn run_instruction(
+    instruction: Bytecode,
+    mut initial_state: AbstractState,
+) -> (AbstractState, Bytecode) {
+    let summary = instruction_summary(instruction.clone(), false);
+    // The following is temporary code. If ALLOW_MEMORY_UNSAFE is false,
+    // we have to ignore that precondition so that we can test the instructions.
+    // When memory safety is implemented, only the false branch should be used.
+    let unsatisfied_preconditions = if !ALLOW_MEMORY_UNSAFE {
+        match instruction {
+            Bytecode::Pop
+            //| Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::StLoc(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_) => {
+                let len = summary.preconditions.len();
+                summary.preconditions[..(len - 1)]
+                    .iter()
+                    .any(|precondition| !precondition(&initial_state))
+            }
+            Bytecode::Eq | Bytecode::Neq => {
+                let len = summary.preconditions.len();
+                summary.preconditions[..(len - 2)]
+                    .iter()
+                    .any(|precondition| !precondition(&initial_state))
+            }
+            _ => summary
+                .preconditions
+                .iter()
+                .any(|precondition| !precondition(&initial_state)),
+        }
+    } else {
+        summary
+            .preconditions
+            .iter()
+            .any(|precondition| !precondition(&initial_state))
+    };
+    assert!(
+        !unsatisfied_preconditions,
+        "preconditions of instruction not satisfied"
+    );
+    match summary.effects {
+        Effects::TyParams(instantiation, effect, instantiation_application) => {
+            let (struct_idx, instantiation) = instantiation(&initial_state);
+            let index = initial_state.module.add_instantiation(instantiation);
+            let struct_inst = StructDefInstantiation {
+                def: struct_idx,
+                type_parameters: index,
+            };
+            let str_inst_idx = initial_state.module.add_struct_instantiation(struct_inst);
+            let effects = effect(str_inst_idx);
+            let instruction = instantiation_application(str_inst_idx);
+            (
+                effects.iter().fold(initial_state, |acc, effect| {
+                    effect(&acc)
+                        .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+                }),
+                instruction,
+            )
+        },
+        Effects::TyParamsCall(instantiation, effect, instantiation_application) => {
+            let (fh_idx, instantiation) = instantiation(&initial_state);
+            let index = initial_state.module.add_instantiation(instantiation);
+            let func_inst = FunctionInstantiation {
+                handle: fh_idx,
+                type_parameters: index,
+            };
+            let func_inst_idx = initial_state.module.add_function_instantiation(func_inst);
+            let effects = effect(func_inst_idx);
+            let instruction = instantiation_application(func_inst_idx);
+            (
+                effects.iter().fold(initial_state, |acc, effect| {
+                    effect(&acc)
+                        .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+                }),
+                instruction,
+            )
+        },
+        Effects::NoTyParams(effects) => (
+            effects.iter().fold(initial_state, |acc, effect| {
+                effect(&acc)
+                    .unwrap_or_else(|err| panic!("Error applying instruction effect: {}", err))
+            }),
+            instruction,
+        ),
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/comparison_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/comparison_instructions.rs
new file mode 100644
index 000000000..fe32abb2d
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/comparison_instructions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use itertools::Itertools;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+const INTEGER_TYPES: &[SignatureToken] = &[
+    SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
+    SignatureToken::U64,
+    SignatureToken::U128,
+    SignatureToken::U256,
+];
+
+#[test]
+fn bytecode_comparison_integers() {
+    for (op, ty) in [
+        Bytecode::Lt,
+        Bytecode::Gt,
+        Bytecode::Le,
+        Bytecode::Ge,
+        Bytecode::Eq,
+        Bytecode::Neq,
+    ]
+    .iter()
+    .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_eq_bool() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Eq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_neq_u64() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    let (state2, _) = common::run_instruction(Bytecode::Neq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_neq_bool() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Neq, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/control_flow_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/control_flow_instructions.rs
new file mode 100644
index 000000000..c26cc56dc
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/control_flow_instructions.rs
@@ -0,0 +1,72 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CompiledModule, FunctionHandle, FunctionHandleIndex, IdentifierIndex,
+    ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+};
+use move_core_types::identifier::Identifier;
+use std::collections::HashMap;
+use test_generation::abstract_state::{AbstractState, AbstractValue, CallGraph};
+
+mod common;
+
+fn generate_module_with_function() -> CompiledModule {
+    let mut module = empty_module();
+
+    let offset = module.identifiers.len();
+    module.identifiers.push(Identifier::new("func0").unwrap());
+
+    module.signatures = vec![
+        Signature(vec![]),
+        Signature(vec![SignatureToken::U64, SignatureToken::Bool]),
+        Signature(vec![SignatureToken::Address]),
+    ];
+
+    module.function_handles = vec![FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(offset as u16),
+        parameters: SignatureIndex::new(1),
+        return_: SignatureIndex::new(2),
+        type_parameters: vec![],
+    }];
+    module
+}
+
+#[test]
+fn bytecode_call() {
+    let module = generate_module_with_function();
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Address)),
+        "stack type postcondition not satisfied",
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_call_function_signature_not_satisfied() {
+    let module = generate_module_with_function();
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_call_return_not_pushed() {
+    let module = generate_module_with_function();
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    let (state2, _) = common::run_instruction(Bytecode::Call(FunctionHandleIndex::new(0)), state1);
+    assert_eq!(state2.stack_len(), 0,);
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/generic_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/generic_instructions.rs
new file mode 100644
index 000000000..66eb17078
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/generic_instructions.rs
@@ -0,0 +1,95 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::SignatureToken;
+use test_generation::transitions::Subst;
+
+//---------------------------------------------------------------------------
+// Substitution tests
+//---------------------------------------------------------------------------
+
+#[test]
+fn unify_no_subst() {
+    use SignatureToken::*;
+    let tys = vec![Bool, U64, Vector(Box::new(U8)), Address];
+    for tok1 in tys.iter() {
+        for tok2 in tys.iter() {
+            let should_unify = tok1.clone() == tok2.clone();
+            let mut s = Subst::new();
+            assert!(s.check_and_add(tok1.clone(), tok2.clone()) == should_unify);
+            assert!(s.instantiation().is_empty());
+        }
+    }
+}
+
+#[test]
+fn unify_ty_param_empty_subst1() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    // Even if a type parameter can map to an instantiantion (due to a ground type on the stack) a
+    // non-grounded type on the stack cannot be unified with a particular instantiation.
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(subst.instantiation().len() == 2);
+}
+
+#[test]
+fn unify_ty_param_empty_subst2() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(!subst.check_and_add(TypeParameter(2), Bool));
+
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(1)));
+
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(2)));
+    assert!(!subst.check_and_add(TypeParameter(1), TypeParameter(2)));
+
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(1)));
+    assert!(subst.instantiation().len() == 3);
+}
+
+#[test]
+fn unify_ty_params_infinite() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(TypeParameter(0), TypeParameter(1)));
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
+    // These should both return false.
+    assert!(!subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), Bool));
+}
+
+#[test]
+fn unify_ty_param_empty_subst3() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
+    assert!(subst.instantiation().len() == 1);
+}
+
+#[test]
+fn unify_ty_param_empty_subst4() {
+    use SignatureToken::*;
+    let mut subst = Subst::new();
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(U64, TypeParameter(2)));
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/integer_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/integer_instructions.rs
new file mode 100644
index 000000000..0e4bda13f
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/integer_instructions.rs
@@ -0,0 +1,138 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use itertools::Itertools;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+const INTEGER_TYPES: &[SignatureToken] = &[
+    SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
+    SignatureToken::U64,
+    SignatureToken::U128,
+    SignatureToken::U256,
+];
+
+#[test]
+fn bytecode_bin_ops() {
+    for (op, ty) in [
+        Bytecode::Add,
+        Bytecode::Sub,
+        Bytecode::Mul,
+        Bytecode::Div,
+        Bytecode::Mod,
+        Bytecode::BitAnd,
+        Bytecode::BitOr,
+        Bytecode::Xor,
+    ]
+    .iter()
+    .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_shl_shr() {
+    for (op, ty) in [Bytecode::Shl, Bytecode::Shr]
+        .iter()
+        .cartesian_product(INTEGER_TYPES.iter())
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty.clone()));
+        state1.stack_push(AbstractValue::new_primitive(SignatureToken::U8));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
+
+#[test]
+fn bytecode_casting_ops() {
+    for (op, ty1, ty2) in [
+        (Bytecode::CastU8, SignatureToken::U8, SignatureToken::U8),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U16),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U32),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U16),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U8),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U16),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U32),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U64),
+        (Bytecode::CastU128, SignatureToken::U128, SignatureToken::U8),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U32,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U64,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U128,
+        ),
+        (Bytecode::CastU256, SignatureToken::U256, SignatureToken::U8),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U32,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U64,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U128,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U256,
+        ),
+    ]
+    .iter()
+    {
+        let mut state1 = AbstractState::new();
+        state1.stack_push(AbstractValue::new_primitive(ty2.clone()));
+        let (state2, _) = common::run_instruction(op.clone(), state1);
+        assert_eq!(
+            state2.stack_peek(0),
+            Some(AbstractValue::new_primitive(ty1.clone())),
+            "stack type postcondition not met"
+        );
+    }
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/load_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/load_instructions.rs
new file mode 100644
index 000000000..5409ce26c
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/load_instructions.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, ConstantPoolIndex, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_ldu64() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdU64(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldtrue() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdTrue, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldfalse() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdFalse, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_ldconst() {
+    let state1 = AbstractState::new();
+    let (state2, _) = common::run_instruction(Bytecode::LdConst(ConstantPoolIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Address)),
+        "stack type postcondition not met"
+    );
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/local_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/local_instructions.rs
new file mode 100644
index 000000000..9cb0174ef
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/local_instructions.rs
@@ -0,0 +1,188 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{AbilitySet, Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue, BorrowState};
+
+mod common;
+
+#[test]
+fn bytecode_copyloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::CopyLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_copyloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::CopyLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_copyloc_local_unavailable() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Unavailable,
+    );
+    common::run_instruction(Bytecode::CopyLoc(0), state1);
+}
+
+#[test]
+fn bytecode_moveloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::MoveLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Unavailable
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::MoveLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveloc_local_unavailable() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Unavailable,
+    );
+    common::run_instruction(Bytecode::MoveLoc(0), state1);
+}
+
+#[test]
+fn bytecode_mutborrowloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_immborrowloc() {
+    let mut state1 = AbstractState::new();
+    state1.local_insert(
+        0,
+        AbstractValue::new_primitive(SignatureToken::U64),
+        BorrowState::Available,
+    );
+    let (state2, _) = common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::Reference(Box::new(SignatureToken::U64),),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+    assert_eq!(
+        state2.local_get(0),
+        Some(&(
+            AbstractValue::new_primitive(SignatureToken::U64),
+            BorrowState::Available
+        )),
+        "locals signature postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowloc_no_local() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+}
+
+// TODO: Turn back on when borrow graph and references are allowed
+// #[test]
+// #[should_panic]
+// fn bytecode_mutborrowloc_local_unavailable() {
+//     let mut state1 = AbstractState::new();
+//     state1.local_insert(
+//         0,
+//         AbstractValue::new_primitive(SignatureToken::U64),
+//         BorrowState::Unavailable,
+//     );
+//     common::run_instruction(Bytecode::MutBorrowLoc(0), state1);
+// }
+//
+// #[test]
+// #[should_panic]
+// fn bytecode_immborrowloc_local_unavailable() {
+//     let mut state1 = AbstractState::new();
+//     state1.local_insert(
+//         0,
+//         AbstractValue::new_primitive(SignatureToken::U64),
+//         BorrowState::Unavailable,
+//     );
+//     common::run_instruction(Bytecode::ImmBorrowLoc(0), state1);
+// }
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/reference_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/reference_instructions.rs
new file mode 100644
index 000000000..5a62db777
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/reference_instructions.rs
@@ -0,0 +1,120 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{AbilitySet, Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_readref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::ReadRef, state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_readref_no_ref() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::ReadRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_readref_wrong_dereference() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::ReadRef, state1);
+    assert!(
+        state2.stack_peek(0) != Some(AbstractValue::new_primitive(SignatureToken::U64)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_writeref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::WriteRef, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+#[should_panic]
+fn bytecode_writeref_type_mismatch() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Bool));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    common::run_instruction(Bytecode::WriteRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_writeref_stack_len_mismatch() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::WriteRef, state1);
+    assert!(state2.stack_len() != 0, "stack type postcondition not met");
+}
+
+#[test]
+fn bytecode_feezeref() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    let (state2, _) = common::run_instruction(Bytecode::FreezeRef, state1);
+    assert_eq!(state2.stack_len(), 1, "stack len postcondition not met");
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_reference(
+            SignatureToken::Reference(Box::new(SignatureToken::U64)),
+            AbilitySet::PRIMITIVES
+        )),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_feezeref_no_ref() {
+    let state1 = AbstractState::new();
+    common::run_instruction(Bytecode::FreezeRef, state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_feezeref_already_immutable() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::U64)),
+        AbilitySet::PRIMITIVES,
+    ));
+    common::run_instruction(Bytecode::FreezeRef, state1);
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/special_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/special_instructions.rs
new file mode 100644
index 000000000..f409f0d2b
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/special_instructions.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::file_format::{Bytecode, SignatureToken};
+use test_generation::abstract_state::{AbstractState, AbstractValue};
+
+mod common;
+
+#[test]
+fn bytecode_pop() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::U64));
+    let (state2, _) = common::run_instruction(Bytecode::Pop, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+fn bytecode_createaccount() {
+    let mut state1 = AbstractState::new();
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) = common::run_instruction(Bytecode::Pop, state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
diff --git a/vendors/move/crates/testing-infra/test-generation/tests/struct_instructions.rs b/vendors/move/crates/testing-infra/test-generation/tests/struct_instructions.rs
new file mode 100644
index 000000000..13dd66777
--- /dev/null
+++ b/vendors/move/crates/testing-infra/test-generation/tests/struct_instructions.rs
@@ -0,0 +1,451 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+extern crate test_generation;
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{
+        empty_module, Ability, AbilitySet, Bytecode, CompiledModule, FieldDefinition, FieldHandle,
+        FieldHandleIndex, IdentifierIndex, ModuleHandleIndex, SignatureToken, StructDefinition,
+        StructDefinitionIndex, StructFieldInformation, StructHandle, StructHandleIndex, TableIndex,
+        TypeSignature,
+    },
+    views::{StructDefinitionView, ViewInternals},
+};
+use move_core_types::identifier::Identifier;
+use std::collections::HashMap;
+use test_generation::{
+    abilities,
+    abstract_state::{AbstractState, AbstractValue, CallGraph},
+};
+
+mod common;
+
+fn generate_module_with_struct(resource: bool) -> CompiledModule {
+    let mut module: CompiledModule = empty_module();
+
+    let struct_index = 0;
+    let num_fields = 5;
+    let offset = module.identifiers.len() as TableIndex;
+    module.identifiers.push(Identifier::new("struct0").unwrap());
+
+    let mut fields = vec![];
+    for i in 0..num_fields {
+        module
+            .identifiers
+            .push(Identifier::new(format!("string{}", i)).unwrap());
+        let str_pool_idx = IdentifierIndex::new(i + 1);
+        fields.push(FieldDefinition {
+            name: str_pool_idx,
+            signature: TypeSignature(SignatureToken::Bool),
+        });
+    }
+    let struct_def = StructDefinition {
+        struct_handle: StructHandleIndex(struct_index),
+        field_information: StructFieldInformation::Declared(fields),
+    };
+    module.struct_defs.push(struct_def);
+    module.struct_handles = vec![StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new((struct_index + offset) as TableIndex),
+        abilities: if resource {
+            AbilitySet::EMPTY | Ability::Key | Ability::Store
+        } else {
+            AbilitySet::PRIMITIVES
+        },
+        type_parameters: vec![],
+    }];
+    module
+}
+
+fn create_struct_value(module: &CompiledModule) -> (AbstractValue, Vec<SignatureToken>) {
+    let struct_def = module.struct_def_at(StructDefinitionIndex::new(0));
+    let struct_def_view = StructDefinitionView::new(module, struct_def);
+    let tokens: Vec<SignatureToken> = struct_def_view
+        .fields()
+        .into_iter()
+        .flatten()
+        .map(|field| field.type_signature().token().as_inner().clone())
+        .collect();
+    let struct_abilities = struct_def_view.abilities();
+
+    let type_argument_abilities = tokens.iter().map(|arg| abilities(module, arg, &[]));
+    let declared_phantom_parameters = [false].repeat(type_argument_abilities.len());
+    let abilities = AbilitySet::polymorphic_abilities(
+        struct_abilities,
+        declared_phantom_parameters,
+        type_argument_abilities,
+    )
+    .unwrap();
+    (
+        AbstractValue::new_struct(SignatureToken::Struct(struct_def.struct_handle), abilities),
+        tokens,
+    )
+}
+
+fn get_field_signature<'a>(module: &'a CompiledModule, handle: &FieldHandle) -> &'a SignatureToken {
+    let struct_def = &module.struct_defs[handle.owner.0 as usize];
+    match &struct_def.field_information {
+        StructFieldInformation::Native => panic!("borrow field on a native struct"),
+        StructFieldInformation::Declared(fields) => &fields[handle.field as usize].signature.0,
+    }
+}
+
+#[test]
+#[should_panic]
+fn bytecode_pack_signature_not_satisfied() {
+    let module = generate_module_with_struct(false);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Pack(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_pack() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let (struct_value1, tokens) = create_struct_value(&state1.module.module);
+    for token in tokens {
+        let abstract_value = AbstractValue {
+            token: token.clone(),
+            abilities: abilities(&state1.module.module, &token, &[]),
+        };
+        state1.stack_push(abstract_value);
+    }
+    let (state2, _) =
+        common::run_instruction(Bytecode::Pack(StructDefinitionIndex::new(0)), state1);
+    let struct_value2 = state2.stack_peek(0).expect("struct not added to stack");
+    assert_eq!(
+        struct_value1, struct_value2,
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_unpack_signature_not_satisfied() {
+    let module = generate_module_with_struct(false);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Unpack(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_unpack() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let (struct_value, tokens) = create_struct_value(&state1.module.module);
+    state1.stack_push(struct_value);
+    let (state2, _) =
+        common::run_instruction(Bytecode::Unpack(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_len(),
+        tokens.len(),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+fn bytecode_exists() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) =
+        common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue::new_primitive(SignatureToken::Bool)),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_exists_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_exists_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::Exists(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_movefrom() {
+    let module = generate_module_with_struct(true);
+    let mut state1 = AbstractState::from_locals(
+        module,
+        HashMap::new(),
+        vec![],
+        vec![StructDefinitionIndex::new(0)],
+        CallGraph::new(0),
+    );
+    let state1_copy = state1.clone();
+    let struct_def = state1_copy
+        .module
+        .module
+        .struct_def_at(StructDefinitionIndex::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) =
+        common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+    let struct_value = state2.stack_peek(0).expect("struct not added to stack");
+    assert!(
+        matches!(struct_value.token, SignatureToken::Struct(struct_handle) if struct_handle == struct_def.struct_handle),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_movefrom_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_movefrom_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::MoveFrom(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_moveto() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    state1.stack_push(create_struct_value(&state1.module.module).0);
+    let (state2, _) =
+        common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+    assert_eq!(state2.stack_len(), 0, "stack type postcondition not met");
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveto_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    state1.stack_push(create_struct_value(&state1.module.module).0);
+    common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_moveto_no_struct_on_stack() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_reference(
+        SignatureToken::Reference(Box::new(SignatureToken::Signer)),
+        AbilitySet::EMPTY | Ability::Drop,
+    ));
+    common::run_instruction(Bytecode::MoveTo(StructDefinitionIndex::new(0)), state1);
+}
+
+#[test]
+fn bytecode_mutborrowfield() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+    let field_signature =
+        get_field_signature(&module, &module.field_handles[field_handle_idx.0 as usize]).clone();
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    let (state2, _) = common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+    let abilities = abilities(&state2.module.module, &field_signature, &[]);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(field_signature)),
+            abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowfield_stack_has_no_reference() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_mutborrowfield_ref_is_immutable() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::Reference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    common::run_instruction(Bytecode::MutBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+fn bytecode_immborrowfield() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+    let field_signature =
+        get_field_signature(&module, &module.field_handles[field_handle_idx.0 as usize]).clone();
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::Reference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    let (state2, _) = common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+    let abilities = abilities(&state2.module.module, &field_signature, &[]);
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(field_signature)),
+            abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowfield_stack_has_no_reference() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+#[should_panic]
+fn bytecode_immborrowfield_ref_is_mutable() {
+    let mut module: CompiledModule = generate_module_with_struct(false);
+    let struct_def_idx = StructDefinitionIndex((module.struct_defs.len() - 1) as u16);
+    module.field_handles.push(FieldHandle {
+        owner: struct_def_idx,
+        field: 0,
+    });
+    let field_handle_idx = FieldHandleIndex((module.field_handles.len() - 1) as u16);
+
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue {
+        token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+        abilities: struct_value.abilities,
+    });
+    common::run_instruction(Bytecode::ImmBorrowField(field_handle_idx), state1);
+}
+
+#[test]
+fn bytecode_borrowglobal() {
+    let module = generate_module_with_struct(true);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    let struct_value = create_struct_value(&state1.module.module).0;
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    let (state2, _) = common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+    assert_eq!(
+        state2.stack_peek(0),
+        Some(AbstractValue {
+            token: SignatureToken::MutableReference(Box::new(struct_value.token)),
+            abilities: struct_value.abilities,
+        }),
+        "stack type postcondition not met"
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_borrowglobal_struct_is_not_resource() {
+    let module = generate_module_with_struct(false);
+    let mut state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    state1.stack_push(AbstractValue::new_primitive(SignatureToken::Address));
+    common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+}
+
+#[test]
+#[should_panic]
+fn bytecode_borrowglobal_no_address_on_stack() {
+    let module = generate_module_with_struct(true);
+    let state1 =
+        AbstractState::from_locals(module, HashMap::new(), vec![], vec![], CallGraph::new(0));
+    common::run_instruction(
+        Bytecode::MutBorrowGlobal(StructDefinitionIndex::new(0)),
+        state1,
+    );
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/Cargo.toml b/vendors/move/crates/testing-infra/transactional-test-runner/Cargo.toml
new file mode 100644
index 000000000..5c7fe0122
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "move-transactional-test-runner"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Transactional testing framework for Move"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+clap = { version = "3.1.8", features = ["derive"] }
+colored = "2.0.0"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-source-map = { path = "../../move-bytecode-source-map" }
+move-bytecode-utils = { path = "../../move-bytecode-utils" }
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-cli = { path = "../../move-cli" }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-disassembler = { path = "../../move-disassembler" }
+move-ir-compiler = { path = "../../move-ir-compiler" }
+move-ir-types = { path = "../../move-ir/types" }
+move-resource-viewer = { path = "../../tools/move-resource-viewer" }
+once_cell = "1.7.2"
+rayon = "1.5.0"
+regex = "1.1.9"
+tempfile = "3.2.0"
+
+move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
+move-symbol-pool = { path = "../../move-symbol-pool" }
+move-vm-runtime = { path = "../../move-vm/runtime" }
+move-vm-test-utils = { path = "../../move-vm/test-utils" }
+move-vm-types = { path = "../../move-vm/types" }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+difference = "2.0.0"
+
+[[test]]
+name = "tests"
+harness = false
+
+[features]
+failpoints = ['move-vm-runtime/failpoints']
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/src/framework.rs b/vendors/move/crates/testing-infra/transactional-test-runner/src/framework.rs
new file mode 100644
index 000000000..9b0982c68
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/src/framework.rs
@@ -0,0 +1,759 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::tasks::{
+    taskify, InitCommand, PrintBytecodeCommand, PrintBytecodeInputChoice, PublishCommand,
+    RunCommand, SyntaxChoice, TaskCommand, TaskInput, ViewCommand,
+};
+use anyhow::{anyhow, Result};
+use clap::Parser;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_source_map::mapping::SourceMapping;
+use move_command_line_common::{
+    address::ParsedAddress,
+    env::read_bool_env_var,
+    files::{MOVE_EXTENSION, MOVE_IR_EXTENSION},
+    testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT},
+    types::ParsedType,
+    values::{ParsableValue, ParsedValue},
+};
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit,
+    diagnostics::{Diagnostics, FilesSourceText},
+    shared::NumericalAddress,
+    FullyCompiledProgram,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+};
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use move_ir_types::location::Spanned;
+use move_symbol_pool::Symbol;
+use move_vm_runtime::session::SerializedReturnValues;
+use rayon::iter::Either;
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt::{Debug, Write as FmtWrite},
+    io::Write,
+    path::Path,
+};
+use tempfile::NamedTempFile;
+
+pub struct ProcessedModule {
+    module: CompiledModule,
+    source_file: Option<(String, NamedTempFile)>,
+}
+
+pub struct CompiledState<'a> {
+    pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+    pre_compiled_ids: BTreeSet<(AccountAddress, String)>,
+    compiled_module_named_address_mapping: BTreeMap<ModuleId, Symbol>,
+    pub named_address_mapping: BTreeMap<String, NumericalAddress>,
+    default_named_address_mapping: Option<NumericalAddress>,
+    modules: BTreeMap<ModuleId, ProcessedModule>,
+}
+
+impl<'a> CompiledState<'a> {
+    pub fn resolve_named_address(&self, s: &str) -> AccountAddress {
+        if let Some(addr) = self
+            .named_address_mapping
+            .get(s)
+            .or(self.default_named_address_mapping.as_ref())
+        {
+            return AccountAddress::new(addr.into_bytes());
+        }
+        panic!("Failed to resolve named address '{}'", s)
+    }
+
+    pub fn resolve_address(&self, addr: &ParsedAddress) -> AccountAddress {
+        match addr {
+            ParsedAddress::Named(named_addr) => self.resolve_named_address(named_addr.as_str()),
+            ParsedAddress::Numerical(addr) => addr.into_inner(),
+        }
+    }
+
+    pub fn resolve_args<Extra: ParsableValue>(
+        &self,
+        args: Vec<ParsedValue<Extra>>,
+    ) -> Result<Vec<Extra::ConcreteValue>> {
+        args.into_iter()
+            .map(|arg| arg.into_concrete_value(&|s| Some(self.resolve_named_address(s))))
+            .collect()
+    }
+
+    pub fn resolve_type_args(&self, type_args: Vec<ParsedType>) -> Result<Vec<TypeTag>> {
+        type_args
+            .into_iter()
+            .map(|arg| arg.into_type_tag(&|s| Some(self.resolve_named_address(s))))
+            .collect()
+    }
+}
+
+fn merge_output(left: Option<String>, right: Option<String>) -> Option<String> {
+    match (left, right) {
+        (None, right) => right,
+        (left, None) => left,
+        (Some(mut left), Some(right)) => {
+            left.push_str(&right);
+            Some(left)
+        },
+    }
+}
+
+pub trait MoveTestAdapter<'a>: Sized {
+    type ExtraPublishArgs: Parser;
+    type ExtraValueArgs: ParsableValue;
+    type ExtraRunArgs: Parser;
+    type Subcommand: Parser;
+    type ExtraInitArgs: Parser;
+
+    fn compiled_state(&mut self) -> &mut CompiledState<'a>;
+    fn default_syntax(&self) -> SyntaxChoice;
+    fn init(
+        default_syntax: SyntaxChoice,
+        option: Option<&'a FullyCompiledProgram>,
+        init_data: Option<TaskInput<(InitCommand, Self::ExtraInitArgs)>>,
+    ) -> (Self, Option<String>);
+    fn publish_module(
+        &mut self,
+        module: CompiledModule,
+        named_addr_opt: Option<Identifier>,
+        gas_budget: Option<u64>,
+        extra: Self::ExtraPublishArgs,
+    ) -> Result<(Option<String>, CompiledModule)>;
+    fn execute_script(
+        &mut self,
+        script: CompiledScript,
+        type_args: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        args: Vec<<<Self as MoveTestAdapter<'a>>::ExtraValueArgs as ParsableValue>::ConcreteValue>,
+        gas_budget: Option<u64>,
+        extra: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)>;
+    fn call_function(
+        &mut self,
+        module: &ModuleId,
+        function: &IdentStr,
+        type_args: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        args: Vec<<<Self as MoveTestAdapter<'a>>::ExtraValueArgs as ParsableValue>::ConcreteValue>,
+        gas_budget: Option<u64>,
+        extra: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)>;
+    fn view_data(
+        &mut self,
+        address: AccountAddress,
+        module: &ModuleId,
+        resource: &IdentStr,
+        type_args: Vec<TypeTag>,
+    ) -> Result<String>;
+
+    fn handle_subcommand(
+        &mut self,
+        subcommand: TaskInput<Self::Subcommand>,
+    ) -> Result<Option<String>>;
+
+    fn handle_command(
+        &mut self,
+        task: TaskInput<
+            TaskCommand<
+                Self::ExtraInitArgs,
+                Self::ExtraPublishArgs,
+                Self::ExtraValueArgs,
+                Self::ExtraRunArgs,
+                Self::Subcommand,
+            >,
+        >,
+    ) -> Result<Option<String>> {
+        let TaskInput {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        } = task;
+        match command {
+            TaskCommand::Init { .. } => {
+                panic!("The 'init' command is optional. But if used, it must be the first command")
+            },
+            TaskCommand::PrintBytecode(PrintBytecodeCommand { input }) => {
+                let state = self.compiled_state();
+                let data = match data {
+                    Some(f) => f,
+                    None => panic!(
+                        "Expected a Move IR module text block following 'print-bytecode' starting on lines {}-{}",
+                        start_line, command_lines_stop
+                    ),
+                };
+                let data_path = data.path().to_str().unwrap();
+                let compiled = match input {
+                    PrintBytecodeInputChoice::Script => {
+                        Either::Left(compile_ir_script(state.dep_modules(), data_path)?)
+                    },
+                    PrintBytecodeInputChoice::Module => {
+                        Either::Right(compile_ir_module(state.dep_modules(), data_path)?)
+                    },
+                };
+                let source_mapping = SourceMapping::new_from_view(
+                    match &compiled {
+                        Either::Left(script) => BinaryIndexedView::Script(script),
+                        Either::Right(module) => BinaryIndexedView::Module(module),
+                    },
+                    Spanned::unsafe_no_loc(()).loc,
+                )
+                .expect("Unable to build dummy source mapping");
+                let disassembler = Disassembler::new(source_mapping, DisassemblerOptions::new());
+                Ok(Some(disassembler.disassemble()?))
+            },
+            TaskCommand::Publish(PublishCommand { gas_budget, syntax }, extra_args) => {
+                let syntax = syntax.unwrap_or_else(|| self.default_syntax());
+                let data = match data {
+                    Some(f) => f,
+                    None => panic!(
+                        "Expected a module text block following 'publish' starting on lines {}-{}",
+                        start_line, command_lines_stop
+                    ),
+                };
+                let data_path = data.path().to_str().unwrap();
+                let state = self.compiled_state();
+                let (named_addr_opt, module, warnings_opt) = match syntax {
+                    SyntaxChoice::Source => {
+                        let (unit, warnings_opt) = compile_source_unit(
+                            state.pre_compiled_deps,
+                            state.named_address_mapping.clone(),
+                            &state.source_files().cloned().collect::<Vec<_>>(),
+                            data_path.to_owned(),
+                        )?;
+                        let (named_addr_opt, module) = match unit {
+                            AnnotatedCompiledUnit::Module(annot_module) => {
+                                let (named_addr_opt, _id) = annot_module.module_id();
+                                (
+                                    named_addr_opt.map(|n| n.value),
+                                    annot_module.named_module.module,
+                                )
+                            },
+                            AnnotatedCompiledUnit::Script(_) => panic!(
+                                "Expected a module text block, not a script, following 'publish' \
+                                starting on lines {}-{}",
+                                start_line, command_lines_stop
+                            ),
+                        };
+                        (named_addr_opt, module, warnings_opt)
+                    },
+                    SyntaxChoice::IR => {
+                        let module = compile_ir_module(state.dep_modules(), data_path)?;
+                        (None, module, None)
+                    },
+                };
+                let (output, module) = self.publish_module(
+                    module,
+                    named_addr_opt.map(|s| Identifier::new(s.as_str()).unwrap()),
+                    gas_budget,
+                    extra_args,
+                )?;
+                match syntax {
+                    SyntaxChoice::Source => self.compiled_state().add_with_source_file(
+                        named_addr_opt,
+                        module,
+                        (data_path.to_owned(), data),
+                    ),
+                    SyntaxChoice::IR => {
+                        self.compiled_state()
+                            .add_and_generate_interface_file(module);
+                    },
+                };
+                Ok(merge_output(warnings_opt, output))
+            },
+            TaskCommand::Run(
+                RunCommand {
+                    signers,
+                    args,
+                    type_args,
+                    gas_budget,
+                    syntax,
+                    name: None,
+                },
+                extra_args,
+            ) => {
+                let syntax = syntax.unwrap_or_else(|| self.default_syntax());
+                let data = match data {
+                    Some(f) => f,
+                    None => panic!(
+                        "Expected a script text block following 'run' starting on lines {}-{}",
+                        start_line, command_lines_stop
+                    ),
+                };
+                let data_path = data.path().to_str().unwrap();
+                let state = self.compiled_state();
+                let (script, warning_opt) = match syntax {
+                    SyntaxChoice::Source => {
+                        let (unit, warning_opt) = compile_source_unit(
+                            state.pre_compiled_deps,
+                            state.named_address_mapping.clone(),
+                            &state.source_files().cloned().collect::<Vec<_>>(),
+                            data_path.to_owned(),
+                        )?;
+                        match unit {
+                        AnnotatedCompiledUnit::Script(annot_script) => (annot_script.named_script.script, warning_opt),
+                        AnnotatedCompiledUnit::Module(_) => panic!(
+                            "Expected a script text block, not a module, following 'run' starting on lines {}-{}",
+                            start_line, command_lines_stop
+                        ),
+                    }
+                    },
+                    SyntaxChoice::IR => (compile_ir_script(state.dep_modules(), data_path)?, None),
+                };
+                let args = self.compiled_state().resolve_args(args)?;
+                let type_args = self.compiled_state().resolve_type_args(type_args)?;
+                let (output, return_values) =
+                    self.execute_script(script, type_args, signers, args, gas_budget, extra_args)?;
+                let rendered_return_value = display_return_values(return_values);
+                Ok(merge_output(
+                    warning_opt,
+                    merge_output(output, rendered_return_value),
+                ))
+            },
+            TaskCommand::Run(
+                RunCommand {
+                    signers,
+                    args,
+                    type_args,
+                    gas_budget,
+                    syntax,
+                    name: Some((raw_addr, module_name, name)),
+                },
+                extra_args,
+            ) => {
+                assert!(
+                    syntax.is_none(),
+                    "syntax flag meaningless with function execution"
+                );
+                let addr = self.compiled_state().resolve_address(&raw_addr);
+                let module_id = ModuleId::new(addr, module_name);
+                let type_args = self.compiled_state().resolve_type_args(type_args)?;
+                let args = self.compiled_state().resolve_args(args)?;
+                let (output, return_values) = self.call_function(
+                    &module_id,
+                    name.as_ident_str(),
+                    type_args,
+                    signers,
+                    args,
+                    gas_budget,
+                    extra_args,
+                )?;
+                let rendered_return_value = display_return_values(return_values);
+                Ok(merge_output(output, rendered_return_value))
+            },
+            TaskCommand::View(ViewCommand { address, resource }) => {
+                let state: &CompiledState = self.compiled_state();
+                let StructTag {
+                    address: module_addr,
+                    module,
+                    name,
+                    type_params: type_arguments,
+                } = resource
+                    .into_struct_tag(&|s| Some(state.resolve_named_address(s)))
+                    .unwrap();
+                let module_id = ModuleId::new(module_addr, module);
+                let address = self.compiled_state().resolve_address(&address);
+                Ok(Some(self.view_data(
+                    address,
+                    &module_id,
+                    name.as_ident_str(),
+                    type_arguments,
+                )?))
+            },
+            TaskCommand::Subcommand(c) => self.handle_subcommand(TaskInput {
+                command: c,
+                name,
+                number,
+                start_line,
+                command_lines_stop,
+                stop_line,
+                data,
+            }),
+        }
+    }
+}
+
+fn display_return_values(return_values: SerializedReturnValues) -> Option<String> {
+    let SerializedReturnValues {
+        mutable_reference_outputs,
+        return_values,
+    } = return_values;
+    let mut output = vec![];
+    if !mutable_reference_outputs.is_empty() {
+        let values = mutable_reference_outputs
+            .iter()
+            .map(|(idx, bytes, layout)| {
+                let value =
+                    move_vm_types::values::Value::simple_deserialize(bytes, layout).unwrap();
+                (idx, value)
+            })
+            .collect::<Vec<_>>();
+        let printed = values
+            .iter()
+            .map(|(idx, v)| {
+                let mut buf = String::new();
+                move_vm_types::values::debug::print_value(&mut buf, v).unwrap();
+                format!("local#{}: {}", idx, buf)
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+        output.push(format!("mutable inputs after call: {}", printed))
+    };
+    if !return_values.is_empty() {
+        let values = return_values
+            .iter()
+            .map(|(bytes, layout)| {
+                move_vm_types::values::Value::simple_deserialize(bytes, layout).unwrap()
+            })
+            .collect::<Vec<_>>();
+        let printed = values
+            .iter()
+            .map(|v| {
+                let mut buf = String::new();
+                move_vm_types::values::debug::print_value(&mut buf, v).unwrap();
+                buf
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+        output.push(format!("return values: {}", printed))
+    };
+    if output.is_empty() {
+        None
+    } else {
+        Some(output.join("\n"))
+    }
+}
+
+impl<'a> CompiledState<'a> {
+    pub fn new(
+        named_address_mapping: BTreeMap<String, NumericalAddress>,
+        pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+        default_named_address_mapping: Option<NumericalAddress>,
+    ) -> Self {
+        let pre_compiled_ids = match pre_compiled_deps {
+            None => BTreeSet::new(),
+            Some(pre_compiled) => pre_compiled
+                .cfgir
+                .modules
+                .key_cloned_iter()
+                .map(|(ident, _)| {
+                    (
+                        ident.value.address.into_addr_bytes().into_inner(),
+                        ident.value.module.to_string(),
+                    )
+                })
+                .collect(),
+        };
+        let mut state = Self {
+            pre_compiled_deps,
+            pre_compiled_ids,
+            modules: BTreeMap::new(),
+            compiled_module_named_address_mapping: BTreeMap::new(),
+            named_address_mapping,
+            default_named_address_mapping,
+        };
+        if let Some(pcd) = pre_compiled_deps {
+            for unit in &pcd.compiled {
+                if let AnnotatedCompiledUnit::Module(annot_module) = unit {
+                    let (named_addr_opt, _id) = annot_module.module_id();
+                    state.add_precompiled(
+                        named_addr_opt.map(|n| n.value),
+                        annot_module.named_module.module.clone(),
+                    );
+                }
+            }
+        }
+        state
+    }
+
+    pub fn dep_modules(&self) -> impl Iterator<Item = &CompiledModule> {
+        self.modules.values().map(|pmod| &pmod.module)
+    }
+
+    pub fn source_files(&self) -> impl Iterator<Item = &String> {
+        self.modules
+            .iter()
+            .filter_map(|(_, pmod)| Some(&pmod.source_file.as_ref()?.0))
+    }
+
+    pub fn add_with_source_file(
+        &mut self,
+        named_addr_opt: Option<Symbol>,
+        module: CompiledModule,
+        source_file: (String, NamedTempFile),
+    ) {
+        let id = module.self_id();
+        self.check_not_precompiled(&id);
+        if let Some(named_addr) = named_addr_opt {
+            self.compiled_module_named_address_mapping
+                .insert(id.clone(), named_addr);
+        }
+
+        let processed = ProcessedModule {
+            module,
+            source_file: Some(source_file),
+        };
+        self.modules.insert(id, processed);
+    }
+
+    pub fn add_and_generate_interface_file(&mut self, module: CompiledModule) {
+        let id = module.self_id();
+        self.check_not_precompiled(&id);
+        let interface_file = NamedTempFile::new().unwrap();
+        let path = interface_file.path().to_str().unwrap().to_owned();
+        let (_id, interface_text) = move_compiler::interface_generator::write_module_to_string(
+            &self.compiled_module_named_address_mapping,
+            &module,
+        )
+        .unwrap();
+        interface_file
+            .reopen()
+            .unwrap()
+            .write_all(interface_text.as_bytes())
+            .unwrap();
+        let source_file = Some((path, interface_file));
+        let processed = ProcessedModule {
+            module,
+            source_file,
+        };
+        self.modules.insert(id, processed);
+    }
+
+    fn add_precompiled(&mut self, named_addr_opt: Option<Symbol>, module: CompiledModule) {
+        let id = module.self_id();
+        if let Some(named_addr) = named_addr_opt {
+            self.compiled_module_named_address_mapping
+                .insert(id.clone(), named_addr);
+        }
+        let processed = ProcessedModule {
+            module,
+            source_file: None,
+        };
+        self.modules.insert(id, processed);
+    }
+
+    pub fn is_precompiled_dep(&self, id: &ModuleId) -> bool {
+        let addr = *id.address();
+        let name = id.name().to_string();
+        self.pre_compiled_ids.contains(&(addr, name))
+    }
+
+    fn check_not_precompiled(&self, id: &ModuleId) {
+        assert!(
+            !self.is_precompiled_dep(id),
+            "Error publishing module: '{}'. \
+             Re-publishing modules in pre-compiled lib is not yet supported",
+            id
+        )
+    }
+}
+
+fn compile_source_unit(
+    pre_compiled_deps: Option<&FullyCompiledProgram>,
+    named_address_mapping: BTreeMap<String, NumericalAddress>,
+    deps: &[String],
+    path: String,
+) -> Result<(AnnotatedCompiledUnit, Option<String>)> {
+    fn rendered_diags(files: &FilesSourceText, diags: Diagnostics) -> Option<String> {
+        if diags.is_empty() {
+            return None;
+        }
+
+        let error_buffer = if read_bool_env_var(move_command_line_common::testing::PRETTY) {
+            move_compiler::diagnostics::report_diagnostics_to_color_buffer(files, diags)
+        } else {
+            move_compiler::diagnostics::report_diagnostics_to_buffer(files, diags)
+        };
+        Some(String::from_utf8(error_buffer).unwrap())
+    }
+
+    use move_compiler::PASS_COMPILATION;
+    let (mut files, comments_and_compiler_res) =
+        move_compiler::Compiler::from_files(vec![path], deps.to_vec(), named_address_mapping)
+            .set_pre_compiled_lib_opt(pre_compiled_deps)
+            .set_flags(move_compiler::Flags::empty().set_sources_shadow_deps(true))
+            .run::<PASS_COMPILATION>()?;
+    let units_or_diags = comments_and_compiler_res
+        .map(|(_comments, move_compiler)| move_compiler.into_compiled_units());
+
+    match units_or_diags {
+        Err(diags) => {
+            if let Some(pcd) = pre_compiled_deps {
+                for (file_name, text) in &pcd.files {
+                    // TODO This is bad. Rethink this when errors are redone
+                    if !files.contains_key(file_name) {
+                        files.insert(*file_name, text.clone());
+                    }
+                }
+            }
+
+            Err(anyhow!(rendered_diags(&files, diags).unwrap()))
+        },
+        Ok((mut units, warnings)) => {
+            let warnings = rendered_diags(&files, warnings);
+            let len = units.len();
+            if len != 1 {
+                panic!("Invalid input. Expected 1 compiled unit but got {}", len)
+            }
+            let unit = units.pop().unwrap();
+            Ok((unit, warnings))
+        },
+    }
+}
+
+fn compile_ir_module<'a>(
+    deps: impl Iterator<Item = &'a CompiledModule>,
+    file_name: &str,
+) -> Result<CompiledModule> {
+    use move_ir_compiler::Compiler as IRCompiler;
+    let code = std::fs::read_to_string(file_name).unwrap();
+    IRCompiler::new(deps.collect()).into_compiled_module(&code)
+}
+
+fn compile_ir_script<'a>(
+    deps: impl Iterator<Item = &'a CompiledModule>,
+    file_name: &str,
+) -> Result<CompiledScript> {
+    use move_ir_compiler::Compiler as IRCompiler;
+    let code = std::fs::read_to_string(file_name).unwrap();
+    let (script, _) = IRCompiler::new(deps.collect()).into_compiled_script_and_source_map(&code)?;
+    Ok(script)
+}
+
+pub fn run_test_impl<'a, Adapter>(
+    path: &Path,
+    fully_compiled_program_opt: Option<&'a FullyCompiledProgram>,
+) -> Result<(), Box<dyn std::error::Error>>
+where
+    Adapter: MoveTestAdapter<'a>,
+    Adapter::ExtraInitArgs: Debug,
+    Adapter::ExtraPublishArgs: Debug,
+    Adapter::ExtraValueArgs: Debug,
+    Adapter::ExtraRunArgs: Debug,
+    Adapter::Subcommand: Debug,
+{
+    let extension = path.extension().unwrap().to_str().unwrap();
+    let default_syntax = if extension == MOVE_IR_EXTENSION {
+        SyntaxChoice::IR
+    } else {
+        assert!(extension == MOVE_EXTENSION);
+        SyntaxChoice::Source
+    };
+    let mut output = String::new();
+    let mut tasks = taskify::<
+        TaskCommand<
+            Adapter::ExtraInitArgs,
+            Adapter::ExtraPublishArgs,
+            Adapter::ExtraValueArgs,
+            Adapter::ExtraRunArgs,
+            Adapter::Subcommand,
+        >,
+    >(path)?
+    .into_iter()
+    .collect::<VecDeque<_>>();
+    assert!(!tasks.is_empty());
+    let num_tasks = tasks.len();
+    writeln!(
+        &mut output,
+        "processed {} task{}",
+        num_tasks,
+        if num_tasks > 1 { "s" } else { "" }
+    )
+    .unwrap();
+
+    let first_task = tasks.pop_front().unwrap();
+    let init_opt = match &first_task.command {
+        TaskCommand::Init(_, _) => Some(first_task.map(|known| match known {
+            TaskCommand::Init(command, extra_args) => (command, extra_args),
+            _ => unreachable!(),
+        })),
+        _ => {
+            tasks.push_front(first_task);
+            None
+        },
+    };
+    let (mut adapter, result_opt) =
+        Adapter::init(default_syntax, fully_compiled_program_opt, init_opt);
+    if let Some(result) = result_opt {
+        writeln!(output, "\ninit:\n{}", result)?;
+    }
+    for task in tasks {
+        handle_known_task(&mut output, &mut adapter, task);
+    }
+    handle_expected_output(path, output)?;
+    Ok(())
+}
+
+fn handle_known_task<'a, Adapter: MoveTestAdapter<'a>>(
+    output: &mut String,
+    adapter: &mut Adapter,
+    task: TaskInput<
+        TaskCommand<
+            Adapter::ExtraInitArgs,
+            Adapter::ExtraPublishArgs,
+            Adapter::ExtraValueArgs,
+            Adapter::ExtraRunArgs,
+            Adapter::Subcommand,
+        >,
+    >,
+) {
+    let task_number = task.number;
+    let task_name = task.name.to_owned();
+    let start_line = task.start_line;
+    let stop_line = task.stop_line;
+    let result = adapter.handle_command(task);
+    let result_string = match result {
+        Ok(None) => return,
+        Ok(Some(s)) => s,
+        Err(e) => format!("Error: {}", e),
+    };
+    assert!(!result_string.is_empty());
+
+    writeln!(
+        output,
+        "\ntask {} '{}'. lines {}-{}:\n{}",
+        task_number, task_name, start_line, stop_line, result_string
+    )
+    .unwrap();
+}
+
+fn handle_expected_output(test_path: &Path, output: impl AsRef<str>) -> Result<()> {
+    let output = output.as_ref();
+    assert!(!output.is_empty());
+    let exp_path = test_path.with_extension(EXP_EXT);
+
+    if read_env_update_baseline() {
+        std::fs::write(exp_path, output).unwrap();
+        return Ok(());
+    }
+
+    if !exp_path.exists() {
+        std::fs::write(&exp_path, "").unwrap();
+    }
+    let expected_output = std::fs::read_to_string(&exp_path)
+        .unwrap()
+        .replace("\r\n", "\n")
+        .replace('\r', "\n");
+    if output != expected_output {
+        let msg = format!(
+            "Expected errors differ from actual errors:\n{}",
+            format_diff(expected_output, output),
+        );
+        anyhow::bail!(add_update_baseline_fix(msg))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/src/lib.rs b/vendors/move/crates/testing-infra/transactional-test-runner/src/lib.rs
new file mode 100644
index 000000000..8be1f95d5
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod framework;
+pub mod tasks;
+pub mod vm_test_harness;
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/src/tasks.rs b/vendors/move/crates/testing-infra/transactional-test-runner/src/tasks.rs
new file mode 100644
index 000000000..2db8174fd
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/src/tasks.rs
@@ -0,0 +1,425 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use anyhow::{anyhow, bail, Result};
+use clap::*;
+use move_command_line_common::{
+    address::ParsedAddress,
+    files::{MOVE_EXTENSION, MOVE_IR_EXTENSION},
+    types::{ParsedStructType, ParsedType},
+    values::{ParsableValue, ParsedValue},
+};
+use move_compiler::shared::NumericalAddress;
+use move_core_types::identifier::Identifier;
+use std::{convert::TryInto, fmt::Debug, path::Path, str::FromStr};
+use tempfile::NamedTempFile;
+
+#[derive(Debug)]
+pub struct TaskInput<Command> {
+    pub command: Command,
+    pub name: String,
+    pub number: usize,
+    pub start_line: usize,
+    pub command_lines_stop: usize,
+    pub stop_line: usize,
+    pub data: Option<NamedTempFile>,
+}
+
+#[allow(clippy::needless_collect)]
+pub fn taskify<Command: Debug + Parser>(filename: &Path) -> Result<Vec<TaskInput<Command>>> {
+    use regex::Regex;
+    use std::{
+        fs::File,
+        io::{self, BufRead, Write},
+    };
+    // checks for lines that are entirely whitespace
+    let re_whitespace = Regex::new(r"^\s*$").unwrap();
+    // checks for lines that start with // comments
+    // here the next character is whitespace or an ASCII character other than #
+    let re_comment = Regex::new(r"^\s*//(\s|[\x20-\x22]|[[\x24-\x7E]])").unwrap();
+    // checks for lines that start with //# commands
+    // cutting leading/trailing whitespace
+    // capturing the command text
+    let re_command_text = Regex::new(r"^\s*//#\s*(.*)\s*$").unwrap();
+
+    let file = File::open(filename).unwrap();
+    let lines: Vec<String> = io::BufReader::new(file)
+        .lines()
+        .map(|ln| ln.expect("Could not parse line"))
+        .collect();
+
+    let lines_iter = lines.into_iter().enumerate().map(|(idx, l)| (idx + 1, l));
+    let skipped_whitespace = lines_iter.skip_while(|(_line_number, line)| {
+        re_whitespace.is_match(line) || re_comment.is_match(line)
+    });
+    let mut bucketed_lines = vec![];
+    let mut cur_commands = vec![];
+    let mut cur_text = vec![];
+    let mut in_command = true;
+    for (line_number, line) in skipped_whitespace {
+        if let Some(captures) = re_command_text.captures(&line) {
+            if !in_command {
+                bucketed_lines.push((cur_commands, cur_text));
+                cur_commands = vec![];
+                cur_text = vec![];
+                in_command = true;
+            }
+            let command_text = match captures.len() {
+                1 => continue,
+                2 => captures.get(1).unwrap().as_str().to_string(),
+                n => panic!("COMMAND_TEXT captured {}. expected 1 or 2", n),
+            };
+            if command_text.is_empty() {
+                continue;
+            }
+            cur_commands.push((line_number, command_text))
+        } else if re_whitespace.is_match(&line) {
+            in_command = false;
+            continue;
+        } else {
+            in_command = false;
+            cur_text.push((line_number, line))
+        }
+    }
+    bucketed_lines.push((cur_commands, cur_text));
+
+    if bucketed_lines.is_empty() {
+        return Ok(vec![]);
+    }
+
+    let mut tasks = vec![];
+    for (number, (commands, text)) in bucketed_lines.into_iter().enumerate() {
+        if commands.is_empty() {
+            assert!(number == 0);
+            bail!("No initial command")
+        }
+
+        let start_line = commands.first().unwrap().0;
+        let command_lines_stop = commands.last().unwrap().0;
+        let mut command_text = "task ".to_string();
+        for (line_number, text) in commands {
+            assert!(!text.is_empty(), "{}: {}", line_number, text);
+            command_text = format!("{} {}", command_text, text);
+        }
+        let command_split = command_text.split_ascii_whitespace().collect::<Vec<_>>();
+        let name_opt = command_split.get(1).map(|s| (*s).to_owned());
+        let command = match Command::try_parse_from(command_split) {
+            Ok(command) => command,
+            Err(e) => {
+                let mut spit_iter = command_text.split_ascii_whitespace();
+                // skip 'task'
+                spit_iter.next();
+                let help_command = match spit_iter.next() {
+                    None => vec!["task", "--help"],
+                    Some(c) => vec!["task", c, "--help"],
+                };
+                let help = match Command::try_parse_from(help_command) {
+                    Ok(_) => panic!(),
+                    Err(e) => e,
+                };
+                bail!(
+                    "Invalid command. Got error {}\nLines {} - {}.\n{}",
+                    e,
+                    start_line,
+                    command_lines_stop,
+                    help
+                )
+            },
+        };
+        let name = name_opt.unwrap();
+
+        let stop_line = if text.is_empty() {
+            command_lines_stop
+        } else {
+            text[text.len() - 1].0
+        };
+
+        // Keep fucking this up somehow
+        // let last_non_whitespace = text
+        //     .iter()
+        //     .rposition(|(_, l)| !WHITESPACE.is_match(l))
+        //     .unwrap_or(0);
+        // let initial_text = text
+        //     .into_iter()
+        //     .take_while(|(i, _)| *i < last_non_whitespace)
+        //     .map(|(_, l)| l);
+        let file_text_vec = (0..command_lines_stop)
+            .map(|_| String::new())
+            .chain(text.into_iter().map(|(_ln, l)| l))
+            .collect::<Vec<String>>();
+        let data = if file_text_vec.iter().all(|s| re_whitespace.is_match(s)) {
+            None
+        } else {
+            let data = NamedTempFile::new()?;
+            data.reopen()?
+                .write_all(file_text_vec.join("\n").as_bytes())?;
+            Some(data)
+        };
+
+        tasks.push(TaskInput {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        })
+    }
+    Ok(tasks)
+}
+
+impl<T> TaskInput<T> {
+    pub fn map<U>(self, f: impl FnOnce(T) -> U) -> TaskInput<U> {
+        let Self {
+            command,
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        } = self;
+        TaskInput {
+            command: f(command),
+            name,
+            number,
+            start_line,
+            command_lines_stop,
+            stop_line,
+            data,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SyntaxChoice {
+    Source,
+    IR,
+}
+
+/// When printing bytecode, the input program must either be a script or a module.
+#[derive(Debug)]
+pub enum PrintBytecodeInputChoice {
+    Script,
+    Module,
+}
+
+/// Translates the given Move IR module or script into bytecode, then prints a textual
+/// representation of that bytecode.
+#[derive(Debug, Parser)]
+pub struct PrintBytecodeCommand {
+    /// The kind of input: either a script, or a module.
+    #[clap(long = "input", ignore_case = true, default_value = "script")]
+    pub input: PrintBytecodeInputChoice,
+}
+
+#[derive(Debug, Parser)]
+pub struct InitCommand {
+    #[clap(
+        long = "addresses",
+        parse(try_from_str = move_compiler::shared::parse_named_address),
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub named_addresses: Vec<(String, NumericalAddress)>,
+}
+
+#[derive(Debug, Parser)]
+pub struct PublishCommand {
+    #[clap(long = "gas-budget")]
+    pub gas_budget: Option<u64>,
+    #[clap(long = "syntax")]
+    pub syntax: Option<SyntaxChoice>,
+}
+
+#[derive(Debug, Parser)]
+pub struct RunCommand<ExtraValueArgs: ParsableValue> {
+    #[clap(
+        long = "signers",
+        parse(try_from_str = ParsedAddress::parse),
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub signers: Vec<ParsedAddress>,
+    #[clap(
+        long = "args",
+        parse(try_from_str = ParsedValue::parse),
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub args: Vec<ParsedValue<ExtraValueArgs>>,
+    #[clap(
+        long = "type-args",
+        parse(try_from_str = ParsedType::parse),
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub type_args: Vec<ParsedType>,
+    #[clap(long = "gas-budget")]
+    pub gas_budget: Option<u64>,
+    #[clap(long = "syntax")]
+    pub syntax: Option<SyntaxChoice>,
+    #[clap(name = "NAME", parse(try_from_str = parse_qualified_module_access))]
+    pub name: Option<(ParsedAddress, Identifier, Identifier)>,
+}
+
+#[derive(Debug, Parser)]
+pub struct ViewCommand {
+    #[clap(long = "address", parse(try_from_str = ParsedAddress::parse))]
+    pub address: ParsedAddress,
+    #[clap(long = "resource", parse(try_from_str = ParsedStructType::parse))]
+    pub resource: ParsedStructType,
+}
+
+#[derive(Debug)]
+pub enum TaskCommand<
+    ExtraInitArgs: Parser,
+    ExtraPublishArgs: Parser,
+    ExtraValueArgs: ParsableValue,
+    ExtraRunArgs: Parser,
+    SubCommands: Parser,
+> {
+    Init(InitCommand, ExtraInitArgs),
+    PrintBytecode(PrintBytecodeCommand),
+    Publish(PublishCommand, ExtraPublishArgs),
+    Run(RunCommand<ExtraValueArgs>, ExtraRunArgs),
+    View(ViewCommand),
+    Subcommand(SubCommands),
+}
+
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > FromArgMatches
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+    fn from_arg_matches(matches: &ArgMatches) -> Result<Self, Error> {
+        Ok(match matches.subcommand() {
+            Some(("init", matches)) => TaskCommand::Init(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            Some(("print-bytecode", matches)) => {
+                TaskCommand::PrintBytecode(FromArgMatches::from_arg_matches(matches)?)
+            },
+            Some(("publish", matches)) => TaskCommand::Publish(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            Some(("run", matches)) => TaskCommand::Run(
+                FromArgMatches::from_arg_matches(matches)?,
+                FromArgMatches::from_arg_matches(matches)?,
+            ),
+            Some(("view", matches)) => {
+                TaskCommand::View(FromArgMatches::from_arg_matches(matches)?)
+            },
+            _ => TaskCommand::Subcommand(SubCommands::from_arg_matches(matches)?),
+        })
+    }
+
+    fn update_from_arg_matches(&mut self, matches: &ArgMatches) -> Result<(), Error> {
+        *self = Self::from_arg_matches(matches)?;
+        Ok(())
+    }
+}
+
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > CommandFactory
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+    fn into_app<'help>() -> Command<'help> {
+        SubCommands::command()
+            .name("Task Command")
+            .subcommand(InitCommand::augment_args(ExtraInitArgs::command()).name("init"))
+            .subcommand(PrintBytecodeCommand::command().name("print-bytecode"))
+            .subcommand(PublishCommand::augment_args(ExtraPublishArgs::command()).name("publish"))
+            .subcommand(
+                RunCommand::<ExtraValueArgs>::augment_args(ExtraRunArgs::command()).name("run"),
+            )
+            .subcommand(ViewCommand::command().name("view"))
+    }
+
+    fn into_app_for_update<'help>() -> Command<'help> {
+        todo!()
+    }
+}
+// Note: this needs to be manually implemented because clap cannot handle generic tuples
+// with more than 1 element currently.
+//
+// The code is a simplified version of what `#[derive(Parser)` would generate had it worked.
+// (`cargo expand` is useful in printing out the derived code.)
+//
+impl<
+        ExtraInitArgs: Parser,
+        ExtraPublishArgs: Parser,
+        ExtraValueArgs: ParsableValue,
+        ExtraRunArgs: Parser,
+        SubCommands: Parser,
+    > Parser
+    for TaskCommand<ExtraInitArgs, ExtraPublishArgs, ExtraValueArgs, ExtraRunArgs, SubCommands>
+{
+}
+
+#[derive(Debug, Parser)]
+pub struct EmptyCommand {}
+
+fn parse_qualified_module_access(s: &str) -> Result<(ParsedAddress, Identifier, Identifier)> {
+    let [addr_str, module_str, struct_str]: [&str; 3] =
+        s.split("::").collect::<Vec<_>>().try_into().map_err(|e| {
+            anyhow!(
+                "Invalid module access. \
+                 Expected 3 distinct parts, address, module, and struct. Got error {:?}",
+                e
+            )
+        })?;
+    let addr = ParsedAddress::parse(addr_str)?;
+    let module = Identifier::new(module_str)?;
+    let struct_ = Identifier::new(struct_str)?;
+    Ok((addr, module, struct_))
+}
+
+impl FromStr for SyntaxChoice {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            MOVE_EXTENSION => Ok(SyntaxChoice::Source),
+            MOVE_IR_EXTENSION => Ok(SyntaxChoice::IR),
+            _ => Err(anyhow!(
+                "Invalid syntax choice. Expected '{}' or '{}'",
+                MOVE_EXTENSION,
+                MOVE_IR_EXTENSION
+            )),
+        }
+    }
+}
+
+impl FromStr for PrintBytecodeInputChoice {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "script" => Ok(PrintBytecodeInputChoice::Script),
+            "module" => Ok(PrintBytecodeInputChoice::Module),
+            _ => Err(anyhow!(
+                "Invalid input choice. Expected 'script' or 'module'"
+            )),
+        }
+    }
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/src/vm_test_harness.rs b/vendors/move/crates/testing-infra/transactional-test-runner/src/vm_test_harness.rs
new file mode 100644
index 000000000..2053dee45
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/src/vm_test_harness.rs
@@ -0,0 +1,433 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    framework::{run_test_impl, CompiledState, MoveTestAdapter},
+    tasks::{EmptyCommand, InitCommand, SyntaxChoice, TaskInput},
+};
+use anyhow::{anyhow, Result};
+use clap::Parser;
+use move_binary_format::{
+    compatibility::Compatibility,
+    errors::{Location, VMError, VMResult},
+    file_format::CompiledScript,
+    CompiledModule,
+};
+use move_command_line_common::{
+    address::ParsedAddress, files::verify_and_create_named_address_mapping,
+};
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit, shared::PackagePaths, FullyCompiledProgram,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::MoveResolver,
+    value::MoveValue,
+};
+use move_resource_viewer::MoveValueAnnotator;
+use move_stdlib::move_stdlib_named_addresses;
+use move_symbol_pool::Symbol;
+use move_vm_runtime::{
+    config::VMConfig,
+    move_vm::MoveVM,
+    session::{SerializedReturnValues, Session},
+};
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+use once_cell::sync::Lazy;
+use std::{collections::BTreeMap, path::Path};
+
+const STD_ADDR: AccountAddress = AccountAddress::ONE;
+
+struct SimpleVMTestAdapter<'a> {
+    compiled_state: CompiledState<'a>,
+    storage: InMemoryStorage,
+    default_syntax: SyntaxChoice,
+}
+
+pub fn view_resource_in_move_storage(
+    storage: &impl MoveResolver,
+    address: AccountAddress,
+    module: &ModuleId,
+    resource: &IdentStr,
+    type_args: Vec<TypeTag>,
+) -> Result<String> {
+    let tag = StructTag {
+        address: *module.address(),
+        module: module.name().to_owned(),
+        name: resource.to_owned(),
+        type_params: type_args,
+    };
+    match storage.get_resource(&address, &tag).unwrap() {
+        None => Ok("[No Resource Exists]".to_owned()),
+        Some(data) => {
+            let annotated = MoveValueAnnotator::new(storage).view_resource(&tag, &data)?;
+            Ok(format!("{}", annotated))
+        },
+    }
+}
+
+#[derive(Debug, Parser)]
+pub struct AdapterPublishArgs {
+    #[clap(long)]
+    /// is skip the struct_and_pub_function_linking compatibility check
+    pub skip_check_struct_and_pub_function_linking: bool,
+    #[clap(long)]
+    /// is skip the struct_layout compatibility check
+    pub skip_check_struct_layout: bool,
+    #[clap(long)]
+    /// is skip the check friend link, if true, treat `friend` as `private`
+    pub skip_check_friend_linking: bool,
+}
+
+#[derive(Debug, Parser)]
+pub struct AdapterExecuteArgs {
+    #[clap(long)]
+    pub check_runtime_types: bool,
+}
+
+impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
+    type ExtraInitArgs = EmptyCommand;
+    type ExtraPublishArgs = AdapterPublishArgs;
+    type ExtraRunArgs = AdapterExecuteArgs;
+    type ExtraValueArgs = ();
+    type Subcommand = EmptyCommand;
+
+    fn compiled_state(&mut self) -> &mut CompiledState<'a> {
+        &mut self.compiled_state
+    }
+
+    fn default_syntax(&self) -> SyntaxChoice {
+        self.default_syntax
+    }
+
+    fn init(
+        default_syntax: SyntaxChoice,
+        pre_compiled_deps: Option<&'a FullyCompiledProgram>,
+        task_opt: Option<TaskInput<(InitCommand, EmptyCommand)>>,
+    ) -> (Self, Option<String>) {
+        let additional_mapping = match task_opt.map(|t| t.command) {
+            Some((InitCommand { named_addresses }, _)) => {
+                verify_and_create_named_address_mapping(named_addresses).unwrap()
+            },
+            None => BTreeMap::new(),
+        };
+
+        let mut named_address_mapping = move_stdlib_named_addresses();
+        for (name, addr) in additional_mapping {
+            if named_address_mapping.contains_key(&name) {
+                panic!(
+                    "Invalid init. The named address '{}' is reserved by the move-stdlib",
+                    name
+                )
+            }
+            named_address_mapping.insert(name, addr);
+        }
+        let mut adapter = Self {
+            compiled_state: CompiledState::new(named_address_mapping, pre_compiled_deps, None),
+            default_syntax,
+            storage: InMemoryStorage::new(),
+        };
+
+        adapter
+            .perform_session_action(
+                None,
+                |session, gas_status| {
+                    for module in &*MOVE_STDLIB_COMPILED {
+                        let mut module_bytes = vec![];
+                        module.serialize(&mut module_bytes).unwrap();
+
+                        let id = module.self_id();
+                        let sender = *id.address();
+                        session
+                            .publish_module(module_bytes, sender, gas_status)
+                            .unwrap();
+                    }
+                    Ok(())
+                },
+                VMConfig::production(),
+            )
+            .unwrap();
+        let mut addr_to_name_mapping = BTreeMap::new();
+        for (name, addr) in move_stdlib_named_addresses() {
+            let prev = addr_to_name_mapping.insert(addr, Symbol::from(name));
+            assert!(prev.is_none());
+        }
+        for module in MOVE_STDLIB_COMPILED
+            .iter()
+            .filter(|module| !adapter.compiled_state.is_precompiled_dep(&module.self_id()))
+            .collect::<Vec<_>>()
+        {
+            adapter
+                .compiled_state
+                .add_and_generate_interface_file(module.clone());
+        }
+        (adapter, None)
+    }
+
+    fn publish_module(
+        &mut self,
+        module: CompiledModule,
+        _named_addr_opt: Option<Identifier>,
+        gas_budget: Option<u64>,
+        extra_args: Self::ExtraPublishArgs,
+    ) -> Result<(Option<String>, CompiledModule)> {
+        let mut module_bytes = vec![];
+        module.serialize(&mut module_bytes)?;
+
+        let id = module.self_id();
+        let sender = *id.address();
+        match self.perform_session_action(
+            gas_budget,
+            |session, gas_status| {
+                let compat = Compatibility::new(
+                    !extra_args.skip_check_struct_and_pub_function_linking,
+                    !extra_args.skip_check_struct_layout,
+                    !extra_args.skip_check_friend_linking,
+                );
+
+                session.publish_module_bundle_with_compat_config(
+                    vec![module_bytes],
+                    sender,
+                    gas_status,
+                    compat,
+                )
+            },
+            VMConfig::production(),
+        ) {
+            Ok(()) => Ok((None, module)),
+            Err(e) => Err(anyhow!(
+                "Unable to publish module '{}'. Got VMError: {}",
+                module.self_id(),
+                format_vm_error(&e)
+            )),
+        }
+    }
+
+    fn execute_script(
+        &mut self,
+        script: CompiledScript,
+        type_args: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        txn_args: Vec<MoveValue>,
+        gas_budget: Option<u64>,
+        extra_args: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)> {
+        let signers: Vec<_> = signers
+            .into_iter()
+            .map(|addr| self.compiled_state().resolve_address(&addr))
+            .collect();
+
+        let mut script_bytes = vec![];
+        script.serialize(&mut script_bytes)?;
+
+        let args = txn_args
+            .iter()
+            .map(|arg| arg.simple_serialize().unwrap())
+            .collect::<Vec<_>>();
+        // TODO rethink testing signer args
+        let args = signers
+            .iter()
+            .map(|a| MoveValue::Signer(*a).simple_serialize().unwrap())
+            .chain(args)
+            .collect();
+        let serialized_return_values = self
+            .perform_session_action(
+                gas_budget,
+                |session, gas_status| {
+                    session.execute_script(script_bytes, type_args, args, gas_status)
+                },
+                VMConfig::from(extra_args),
+            )
+            .map_err(|e| {
+                anyhow!(
+                    "Script execution failed with VMError: {}",
+                    format_vm_error(&e)
+                )
+            })?;
+        Ok((None, serialized_return_values))
+    }
+
+    fn call_function(
+        &mut self,
+        module: &ModuleId,
+        function: &IdentStr,
+        type_args: Vec<TypeTag>,
+        signers: Vec<ParsedAddress>,
+        txn_args: Vec<MoveValue>,
+        gas_budget: Option<u64>,
+        extra_args: Self::ExtraRunArgs,
+    ) -> Result<(Option<String>, SerializedReturnValues)> {
+        let signers: Vec<_> = signers
+            .into_iter()
+            .map(|addr| self.compiled_state().resolve_address(&addr))
+            .collect();
+
+        let args = txn_args
+            .iter()
+            .map(|arg| arg.simple_serialize().unwrap())
+            .collect::<Vec<_>>();
+        // TODO rethink testing signer args
+        let args = signers
+            .iter()
+            .map(|a| MoveValue::Signer(*a).simple_serialize().unwrap())
+            .chain(args)
+            .collect();
+        let serialized_return_values = self
+            .perform_session_action(
+                gas_budget,
+                |session, gas_status| {
+                    session.execute_function_bypass_visibility(
+                        module, function, type_args, args, gas_status,
+                    )
+                },
+                VMConfig::from(extra_args),
+            )
+            .map_err(|e| {
+                anyhow!(
+                    "Function execution failed with VMError: {}",
+                    format_vm_error(&e)
+                )
+            })?;
+        Ok((None, serialized_return_values))
+    }
+
+    fn view_data(
+        &mut self,
+        address: AccountAddress,
+        module: &ModuleId,
+        resource: &IdentStr,
+        type_args: Vec<TypeTag>,
+    ) -> Result<String> {
+        view_resource_in_move_storage(&self.storage, address, module, resource, type_args)
+    }
+
+    fn handle_subcommand(&mut self, _: TaskInput<Self::Subcommand>) -> Result<Option<String>> {
+        unreachable!()
+    }
+}
+
+pub fn format_vm_error(e: &VMError) -> String {
+    let location_string = match e.location() {
+        Location::Undefined => "undefined".to_owned(),
+        Location::Script => "script".to_owned(),
+        Location::Module(id) => format!("0x{}::{}", id.address().short_str_lossless(), id.name()),
+    };
+    format!(
+        "{{
+    major_status: {major_status:?},
+    sub_status: {sub_status:?},
+    location: {location_string},
+    indices: {indices:?},
+    offsets: {offsets:?},
+}}",
+        major_status = e.major_status(),
+        sub_status = e.sub_status(),
+        location_string = location_string,
+        // TODO maybe include source map info?
+        indices = e.indices(),
+        offsets = e.offsets(),
+    )
+}
+
+impl<'a> SimpleVMTestAdapter<'a> {
+    fn perform_session_action<Ret>(
+        &mut self,
+        gas_budget: Option<u64>,
+        f: impl FnOnce(&mut Session, &mut GasStatus) -> VMResult<Ret>,
+        vm_config: VMConfig,
+    ) -> VMResult<Ret> {
+        // start session
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                STD_ADDR,
+                // TODO: come up with a suitable gas schedule
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            vm_config,
+        )
+        .unwrap();
+        let (mut session, mut gas_status) = {
+            let gas_status = move_cli::sandbox::utils::get_gas_status(
+                &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE,
+                gas_budget,
+            )
+            .unwrap();
+            let session = vm.new_session(&self.storage);
+            (session, gas_status)
+        };
+
+        // perform op
+        let res = f(&mut session, &mut gas_status)?;
+
+        // save changeset
+        // TODO support events
+        let (changeset, _events) = session.finish()?;
+        self.storage.apply(changeset).unwrap();
+        Ok(res)
+    }
+}
+
+static PRECOMPILED_MOVE_STDLIB: Lazy<FullyCompiledProgram> = Lazy::new(|| {
+    let program_res = move_compiler::construct_pre_compiled_lib(
+        vec![PackagePaths {
+            name: None,
+            paths: move_stdlib::move_stdlib_files(),
+            named_address_map: move_stdlib::move_stdlib_named_addresses(),
+        }],
+        None,
+        move_compiler::Flags::empty(),
+    )
+    .unwrap();
+    match program_res {
+        Ok(stdlib) => stdlib,
+        Err((files, errors)) => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, errors)
+        },
+    }
+});
+
+static MOVE_STDLIB_COMPILED: Lazy<Vec<CompiledModule>> = Lazy::new(|| {
+    let (files, units_res) = move_compiler::Compiler::from_files(
+        move_stdlib::move_stdlib_files(),
+        vec![],
+        move_stdlib::move_stdlib_named_addresses(),
+    )
+    .build()
+    .unwrap();
+    match units_res {
+        Err(diags) => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, diags)
+        },
+        Ok((_, warnings)) if !warnings.is_empty() => {
+            eprintln!("!!!Standard library failed to compile!!!");
+            move_compiler::diagnostics::report_diagnostics(&files, warnings)
+        },
+        Ok((units, _warnings)) => units
+            .into_iter()
+            .filter_map(|m| match m {
+                AnnotatedCompiledUnit::Module(annot_module) => {
+                    Some(annot_module.named_module.module)
+                },
+                AnnotatedCompiledUnit::Script(_) => None,
+            })
+            .collect(),
+    }
+});
+
+pub fn run_test(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
+    run_test_impl::<SimpleVMTestAdapter>(path, Some(&*PRECOMPILED_MOVE_STDLIB))
+}
+
+impl From<AdapterExecuteArgs> for VMConfig {
+    fn from(arg: AdapterExecuteArgs) -> VMConfig {
+        VMConfig {
+            paranoid_type_checks: arg.check_runtime_types,
+            ..Self::production()
+        }
+    }
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/tests.rs b/vendors/move/crates/testing-infra/transactional-test-runner/tests/tests.rs
new file mode 100644
index 000000000..68a9a2fb9
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/tests.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use move_transactional_test_runner::vm_test_harness::run_test;
+
+datatest_stable::harness!(run_test, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.exp
new file mode 100644
index 000000000..c7f6c5828
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.exp
@@ -0,0 +1,21 @@
+processed 10 tasks
+
+task 3 'view'. lines 13-15:
+[No Resource Exists]
+
+task 5 'run'. lines 37-37:
+Error: Function execution failed with VMError: {
+    major_status: ABORTED,
+    sub_status: Some(0),
+    location: 0x42::N,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'view'. lines 47-49:
+key 0x42::N::R<u64> {
+    v: 0
+}
+
+task 9 'view'. lines 60-62:
+[No Resource Exists]
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.move
new file mode 100644
index 000000000..c76f227e3
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/example.move
@@ -0,0 +1,62 @@
+//# init --addresses A=0x42
+
+//# publish
+module A::N {
+}
+
+//# run
+
+script {
+    fun main() {}
+}
+
+//# view
+//#     --address 0x1
+//#     --resource 0x42::N::R<u64>
+
+//# publish
+module A::N {
+    struct R<V: store> has key {
+        v: V
+    }
+
+    public fun give(s: &signer) {
+        move_to(s, R { v: 0 })
+    }
+
+    public fun take(s: &signer): u64 acquires R {
+        let R { v } = move_from(std::signer::address_of(s));
+        v
+    }
+
+    public entry fun ex(_s: signer, _u: u64) {
+        abort 0
+    }
+}
+
+//# run --signers 0x1 --args 0 -- 0x42::N::ex
+
+//# run --signers 0x1
+
+script {
+    fun main(s: signer) {
+        A::N::give(&s)
+    }
+}
+
+//# view
+//#     --address 0x1
+//#     --resource 0x42::N::R<u64>
+
+//# run --signers 0x1 --syntax=mvir
+
+import 0x42.N;
+main(s: signer) {
+label b0:
+    _ = N.take(&s);
+    return;
+}
+
+//# view
+//#     --address 0x1
+//#     --resource 0x42::N::R<u64>
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.move
new file mode 100644
index 000000000..8f82a7db1
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/leading_comment.move
@@ -0,0 +1,8 @@
+// my cool copyright
+// copyright continues here
+
+// description of test
+
+//# publish
+
+module 0x42::M {}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp
new file mode 100644
index 000000000..a1c2b1fb7
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.exp
@@ -0,0 +1,6 @@
+processed 5 tasks
+
+task 4 'view'. lines 41-41:
+key 0x2a::M::Foo {
+    x: 500
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move
new file mode 100644
index 000000000..f18580477
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/named_addresses_in_commands.move
@@ -0,0 +1,41 @@
+//# init --addresses A=42
+
+
+
+//# run --signers A
+script {
+    use std::signer;
+
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @42, 1000);
+    }
+}
+
+
+
+//# publish
+module A::M {
+    struct Foo has key {
+        x: u64,
+    }
+
+    public fun publish_foo(s: &signer) {
+        move_to<Foo>(s, Foo { x: 500 })
+    }
+}
+
+
+
+//# run --signers A
+script {
+    use A::M;
+
+    fun main(s: signer) {
+        M::publish_foo(&s);
+    }
+}
+
+
+
+// Note: named addresses are not supported in resource names yet.
+//# view --address A --resource 0x2a::M::Foo
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
new file mode 100644
index 000000000..63913468d
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
@@ -0,0 +1,23 @@
+processed 2 tasks
+
+task 0 'print-bytecode'. lines 1-5:
+// Move bytecode v6
+script {
+
+
+main<Ty0, Ty1>() {
+B0:
+	0: Ret
+}
+}
+
+task 1 'print-bytecode'. lines 7-13:
+// Move bytecode v6
+module 42.M {
+
+
+f<Ty0, Ty1>() {
+B0:
+	0: Ret
+}
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.move
new file mode 100644
index 000000000..7047f844e
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.move
@@ -0,0 +1,13 @@
+//# print-bytecode
+main<T, U>() {
+label b0:
+    return;
+}
+
+//# print-bytecode --input=module
+module 0x42.M {
+    f<X, Y>() {
+    label b0:
+        return;
+    }
+}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.exp
new file mode 100644
index 000000000..fc5a4436b
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.move
new file mode 100644
index 000000000..20b305b58
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/simple_init.move
@@ -0,0 +1,9 @@
+//# init --addresses A=0x42 K=0x19
+
+//# publish
+
+module A::M {}
+
+//# publish
+
+module K::S {}
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.exp b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.exp
new file mode 100644
index 000000000..6cd67db3f
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.move b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.move
new file mode 100644
index 000000000..ab3df3c0f
--- /dev/null
+++ b/vendors/move/crates/testing-infra/transactional-test-runner/tests/vm_test_harness/single_publish.move
@@ -0,0 +1,5 @@
+//# publish
+address 0x42 {
+module N {
+}
+}
diff --git a/vendors/move/crates/tools/README.md b/vendors/move/crates/tools/README.md
new file mode 100644
index 000000000..cdcc842bd
--- /dev/null
+++ b/vendors/move/crates/tools/README.md
@@ -0,0 +1,52 @@
+---
+id: tools
+title: Move Tools
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/README.md
+---
+
+# Summary
+
+Move has a number of tools associated with it. This directory contains all,
+or almost all of them. The following crates in this directory are libraries
+that are used by the [`move-cli`](./move-cli) `package` subcommand:
+
+* `move-bytecode-viewer`
+* `move-disassembler`
+* `move-explain`
+* `move-unit-test`
+* `move-package`
+* `move-coverage`
+
+In this sense each of these crates defines the core logic for a specific
+package command, e.g., how to run and report unit tests, or collect and
+display test coverage information. However, the Move CLI is responsible for
+stitching these commands together, e.g., when running a move unit test the
+Move CLI is responsible for first making sure the package was built in
+`test` mode ( using the `move-package` library), collecting the test plan
+to feed to the `move-unit-test` library, and returning a non-zero error
+code if a test fails.
+
+Generally, if you want to see how various tools interact with each other,
+or how a normal Move user would interact with these tools, you should first
+look at the Move CLI (specifically the `package` subdirectory/command) as
+that is responsible for stitching everything together. If you are looking
+for where the logic for a specific tool is defined, this is most likely in
+the specific crate for that tool (e.g., if you want to see how TUIs are
+handled for the `move-bytecode-viewer` that's defined in the
+`move-bytecode-viewer` crate, and not the `move-cli` crate).
+
+Some of the crates mentioned above are also binaries at the moment, however
+they should all be able to be made libaries only, with the possible
+exception of the `move-coverage` crate. The primary reason for this, is
+that this tool can collect and report test coverage statistics across
+multiple packages, and multiple runs over a package. This functionality is
+important if you have a large functional test suite such as Diem's and want
+to gather coverage information across all of them.
+
+The `move-resource-viewer`, and `read-write-set` similarly are library
+crates that are used by and exposed by the Move CLI, but not through the
+`package` subcommand.
+
+The `move-bytecode-utils` crates holds general
+utilities for working with Move bytecode, e.g., computing the dependency
+order for modules.
diff --git a/vendors/move/crates/tools/move-bytecode-utils/Cargo.toml b/vendors/move/crates/tools/move-bytecode-utils/Cargo.toml
new file mode 100644
index 000000000..14e492da0
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-utils/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "move-bytecode-utils"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Libraries for working with sets of Move bytecode modules"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+move-binary-format = { path = "../../move-binary-format" }
+move-core-types = { path = "../../move-core-types" }
+petgraph = "0.5.1"
+serde-reflection = "0.3.2"
diff --git a/vendors/move/crates/tools/move-bytecode-utils/src/dependency_graph.rs b/vendors/move/crates/tools/move-bytecode-utils/src/dependency_graph.rs
new file mode 100644
index 000000000..cdb0a4763
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-utils/src/dependency_graph.rs
@@ -0,0 +1,61 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use move_binary_format::{access::ModuleAccess, file_format::CompiledModule};
+use petgraph::graphmap::DiGraphMap;
+use std::collections::BTreeMap;
+
+/// Directed graph capturing dependencies between modules
+pub struct DependencyGraph<'a> {
+    /// Set of modules guaranteed to be closed under dependencies
+    modules: Vec<&'a CompiledModule>,
+    graph: DiGraphMap<ModuleIndex, ()>,
+}
+
+#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq, PartialOrd, Ord)]
+struct ModuleIndex(usize);
+
+impl<'a> DependencyGraph<'a> {
+    /// Construct a dependency graph from a set of `modules`.
+    /// Panics if `modules` contains duplicates or is not closed under the depedency relation
+    pub fn new(module_iter: impl IntoIterator<Item = &'a CompiledModule>) -> Self {
+        let mut modules = vec![];
+        let mut reverse_modules = BTreeMap::new();
+        for (i, m) in module_iter.into_iter().enumerate() {
+            modules.push(m);
+            assert!(
+                reverse_modules
+                    .insert(m.self_id(), ModuleIndex(i))
+                    .is_none(),
+                "Duplicate module found"
+            );
+        }
+        let mut graph = DiGraphMap::new();
+        for module in &modules {
+            let module_idx: ModuleIndex = *reverse_modules.get(&module.self_id()).unwrap();
+            let deps = module.immediate_dependencies();
+            if deps.is_empty() {
+                graph.add_node(module_idx);
+            } else {
+                for dep in deps {
+                    let dep_idx = *reverse_modules
+                        .get(&dep)
+                        .unwrap_or_else(|| panic!("Missing dependency {}", dep));
+                    graph.add_edge(dep_idx, module_idx, ());
+                }
+            }
+        }
+        DependencyGraph { modules, graph }
+    }
+
+    /// Return an iterator over the modules in `self` in topological order--modules with least deps first.
+    /// Fails with an error if `self` contains circular dependencies
+    pub fn compute_topological_order(&self) -> Result<impl Iterator<Item = &CompiledModule>> {
+        match petgraph::algo::toposort(&self.graph, None) {
+            Err(_) => bail!("Circular dependency detected"),
+            Ok(ordered_idxs) => Ok(ordered_idxs.into_iter().map(move |idx| self.modules[idx.0])),
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-utils/src/layout.rs b/vendors/move/crates/tools/move-bytecode-utils/src/layout.rs
new file mode 100644
index 000000000..3ab2444b6
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-utils/src/layout.rs
@@ -0,0 +1,564 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::module_cache::GetModule;
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    file_format::{SignatureToken, StructDefinition, StructFieldInformation, StructHandleIndex},
+    normalized::{Struct, Type},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    value::{MoveFieldLayout, MoveStructLayout, MoveTypeLayout},
+};
+use serde_reflection::{ContainerFormat, Format, Named, Registry};
+use std::{
+    borrow::Borrow,
+    collections::BTreeMap,
+    convert::TryInto,
+    fmt::{Debug, Write},
+};
+
+/// Name of the Move `address` type in the serde registry
+const ADDRESS: &str = "AccountAddress";
+
+/// Name of the Move `signer` type in the serde registry
+const SIGNER: &str = "Signer";
+
+/// Name of the Move `u256` type in the serde registry
+const U256_SERDE_NAME: &str = "u256";
+
+/// Type for building a registry of serde-reflection friendly struct layouts for Move types.
+/// The layouts created by this type are intended to be passed to the serde-generate tool to create
+/// struct bindings for Move types in source languages that use Move-based services.
+pub struct SerdeLayoutBuilder<'a, T> {
+    registry: Registry,
+    module_resolver: &'a T,
+    config: SerdeLayoutConfig,
+}
+
+#[derive(Default)]
+pub struct SerdeLayoutConfig {
+    /// If separator is Some, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If separator is None, use the same syntax as Move source
+    pub separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    pub omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    pub ignore_phantom_types: bool,
+    /// The LayoutBuilder can operate in two modes: "deep" and "shallow".
+    /// In shallow mode, generate a single layout for the struct or type passed in by the user
+    /// (under the assumption that layouts for dependencies have been generated previously).
+    /// In deep mode, it generate layouts for all of the (transitive) dependencies of the type passed
+    /// in, as well as layouts for the Move ground types like `address` and `signer`. The result is a
+    /// self-contained registry with no unbound typenames
+    pub shallow: bool,
+}
+
+impl<'a, T: GetModule> SerdeLayoutBuilder<'a, T> {
+    /// Create a `LayoutBuilder` with an empty registry and deep layout resolution
+    pub fn new(module_resolver: &'a T) -> Self {
+        Self {
+            registry: Self::default_registry(),
+            module_resolver,
+            config: SerdeLayoutConfig::default(),
+        }
+    }
+
+    /// Create a `LayoutBuilder` with an empty registry and shallow layout resolution
+    pub fn new_with_config(module_resolver: &'a T, config: SerdeLayoutConfig) -> Self {
+        Self {
+            registry: Self::default_registry(),
+            module_resolver,
+            config,
+        }
+    }
+
+    /// Return a registry containing layouts for all the Move ground types (e.g., address)
+    pub fn default_registry() -> Registry {
+        let mut registry = BTreeMap::new();
+        // add Move ground types to registry (address, signer)
+        let address_layout = Box::new(Format::TupleArray {
+            content: Box::new(Format::U8),
+            size: AccountAddress::LENGTH,
+        });
+        registry.insert(
+            ADDRESS.to_string(),
+            ContainerFormat::NewTypeStruct(address_layout.clone()),
+        );
+        registry.insert(
+            SIGNER.to_string(),
+            ContainerFormat::NewTypeStruct(address_layout),
+        );
+
+        registry
+    }
+
+    /// Get the registry of layouts generated so far
+    pub fn registry(&self) -> &Registry {
+        &self.registry
+    }
+
+    /// Get the registry of layouts generated so far
+    pub fn into_registry(self) -> Registry {
+        self.registry
+    }
+
+    /// Add layouts for all types used in `t` to the registry
+    pub fn build_type_layout(&mut self, t: TypeTag) -> Result<Format, T::Error> {
+        self.build_normalized_type_layout(&Type::from(t), &Vec::new())
+    }
+
+    /// Add layouts for all types used in `t` to the registry
+    pub fn build_struct_layout(&mut self, s: &StructTag) -> Result<Format, T::Error> {
+        let serde_type_args = s
+            .type_params
+            .iter()
+            .map(|t| self.build_type_layout(t.clone()))
+            .collect::<Result<Vec<Format>, T::Error>>()?;
+        self.build_struct_layout_(&s.module_id(), &s.name, &serde_type_args)
+    }
+
+    fn build_normalized_type_layout(
+        &mut self,
+        t: &Type,
+        input_type_args: &[Format],
+    ) -> Result<Format, T::Error> {
+        use Type::*;
+        Ok(match t {
+            Bool => Format::Bool,
+            U8 => Format::U8,
+            U16 => Format::U16,
+            U32 => Format::U32,
+            U64 => Format::U64,
+            U128 => Format::U128,
+            U256 => Format::TypeName(U256_SERDE_NAME.to_string()),
+            Address => Format::TypeName(ADDRESS.to_string()),
+            Signer => Format::TypeName(SIGNER.to_string()),
+            Struct {
+                address,
+                module,
+                name,
+                type_arguments,
+            } => {
+                let serde_type_args = type_arguments
+                    .iter()
+                    .map(|t| self.build_normalized_type_layout(t, input_type_args))
+                    .collect::<Result<Vec<Format>, T::Error>>()?;
+                let declaring_module = ModuleId::new(*address, module.clone());
+                self.build_struct_layout_(&declaring_module, name, &serde_type_args)?
+            },
+            Vector(inner_t) => {
+                if matches!(inner_t.as_ref(), U8) {
+                    // specialize vector<u8> as bytes
+                    Format::Bytes
+                } else {
+                    Format::Seq(Box::new(
+                        self.build_normalized_type_layout(inner_t, input_type_args)?,
+                    ))
+                }
+            },
+            TypeParameter(i) => input_type_args[*i as usize].clone(),
+            Reference(_) | MutableReference(_) => unreachable!(), // structs cannot store references
+        })
+    }
+
+    fn build_struct_layout_(
+        &mut self,
+        module_id: &ModuleId,
+        name: &Identifier,
+        type_arguments: &[Format],
+    ) -> Result<Format, T::Error> {
+        // build a human-readable name for the struct type. this should do the same thing as
+        // StructTag::display(), but it's not easy to use that code here
+
+        let declaring_module = self
+            .module_resolver
+            .get_module_by_id(module_id)?
+            .expect("Failed to resolve module");
+        let def = declaring_module
+            .borrow()
+            .find_struct_def_by_name(name)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Could not find struct named {} in module {}",
+                    name,
+                    declaring_module.borrow().name()
+                )
+            });
+        let normalized_struct = Struct::new(declaring_module.borrow(), def).1;
+        assert_eq!(
+            normalized_struct.type_parameters.len(),
+            type_arguments.len(),
+            "Wrong number of type arguments for struct"
+        );
+
+        let generics: Vec<String> = type_arguments
+            .iter()
+            .zip(normalized_struct.type_parameters.iter())
+            .filter_map(|(type_arg, type_param)| {
+                if self.config.ignore_phantom_types && type_param.is_phantom {
+                    // do not include phantom type arguments in the struct key, since they do not affect the struct layout
+                    None
+                } else {
+                    Some(print_format_type(type_arg))
+                }
+            })
+            .collect();
+        let mut struct_key = String::new();
+        if !self.config.omit_addresses {
+            write!(
+                struct_key,
+                "{}{}",
+                module_id.address(),
+                self.config.separator.as_deref().unwrap_or("::")
+            )
+            .unwrap();
+        }
+        write!(
+            struct_key,
+            "{}{}{}",
+            module_id.name(),
+            self.config.separator.as_deref().unwrap_or("::"),
+            name
+        )
+        .unwrap();
+        if !generics.is_empty() {
+            write!(
+                struct_key,
+                "{}{}{}",
+                self.config.separator.as_deref().unwrap_or("<"),
+                generics.join(self.config.separator.as_deref().unwrap_or(",")),
+                self.config.separator.as_deref().unwrap_or(">")
+            )
+            .unwrap()
+        }
+        if self.config.shallow {
+            return Ok(Format::TypeName(struct_key));
+        }
+
+        if let Some(old_struct) = self.registry.get(&struct_key) {
+            if self.config.omit_addresses || self.config.separator.is_some() {
+                // check for conflicts (e.g., 0x1::M::T and 0x2::M::T that both get stripped to M::T because
+                // omit_addresses is on)
+                if old_struct.clone()
+                    != self.generate_serde_struct(normalized_struct, type_arguments)?
+                {
+                    panic!(
+                        "Name conflict: multiple structs with name {}, but different addresses",
+                        struct_key
+                    )
+                }
+            }
+        } else {
+            // not found--generate and update registry
+            let serde_struct = self.generate_serde_struct(normalized_struct, type_arguments)?;
+            self.registry.insert(struct_key.clone(), serde_struct);
+        }
+
+        Ok(Format::TypeName(struct_key))
+    }
+
+    fn generate_serde_struct(
+        &mut self,
+        normalized_struct: Struct,
+        type_arguments: &[Format],
+    ) -> Result<ContainerFormat, T::Error> {
+        let fields = normalized_struct
+            .fields
+            .iter()
+            .map(|f| {
+                self.build_normalized_type_layout(&f.type_, type_arguments)
+                    .map(|value| Named {
+                        name: f.name.to_string(),
+                        value,
+                    })
+            })
+            .collect::<Result<Vec<Named<Format>>, T::Error>>()?;
+        Ok(ContainerFormat::Struct(fields))
+    }
+}
+
+fn print_format_type(t: &Format) -> String {
+    match t {
+        Format::TypeName(s) => s.to_string(),
+        Format::Bool => "bool".to_string(),
+        Format::U8 => "u8".to_string(),
+        Format::U16 => "u16".to_string(),
+        Format::U32 => "u32".to_string(),
+        Format::U64 => "u64".to_string(),
+        Format::U128 => "u128".to_string(),
+        Format::Bytes => "vector<u8>".to_string(),
+        Format::Seq(inner) => format!("vector<{}>", print_format_type(inner)),
+        v => unimplemented!("Printing format value {:?}", v),
+    }
+}
+
+pub enum TypeLayoutBuilder {}
+pub enum StructLayoutBuilder {}
+
+#[derive(Copy, Clone, Debug)]
+enum LayoutType {
+    WithTypes,
+    WithFields,
+    Runtime,
+}
+
+impl TypeLayoutBuilder {
+    /// Construct a WithTypes `TypeLayout` with fields from `t`.
+    /// Panics if `resolver` cannot resolve a module whose types are referenced directly or
+    /// transitively by `t`
+    pub fn build_with_types(t: &TypeTag, resolver: &impl GetModule) -> Result<MoveTypeLayout> {
+        Self::build(t, resolver, LayoutType::WithTypes)
+    }
+
+    /// Construct a WithFields `TypeLayout` with fields from `t`.
+    /// Panics if `resolver` cannot resolve a module whose types are referenced directly or
+    /// transitively by `t`.
+    pub fn build_with_fields(t: &TypeTag, resolver: &impl GetModule) -> Result<MoveTypeLayout> {
+        Self::build(t, resolver, LayoutType::WithFields)
+    }
+
+    /// Construct a runtime `TypeLayout` from `t`.
+    /// Panics if `resolver` cannot resolve a module whose types are referenced directly or
+    /// transitively by `t`.
+    pub fn build_runtime(t: &TypeTag, resolver: &impl GetModule) -> Result<MoveTypeLayout> {
+        Self::build(t, resolver, LayoutType::Runtime)
+    }
+
+    fn build(
+        t: &TypeTag,
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveTypeLayout> {
+        use TypeTag::*;
+        Ok(match t {
+            Bool => MoveTypeLayout::Bool,
+            U8 => MoveTypeLayout::U8,
+            U16 => MoveTypeLayout::U16,
+            U32 => MoveTypeLayout::U32,
+            U64 => MoveTypeLayout::U64,
+            U128 => MoveTypeLayout::U128,
+            U256 => MoveTypeLayout::U256,
+            Address => MoveTypeLayout::Address,
+            Signer => bail!("Type layouts cannot contain signer"),
+            Vector(elem_t) => {
+                MoveTypeLayout::Vector(Box::new(Self::build(elem_t, resolver, layout_type)?))
+            },
+            Struct(s) => {
+                MoveTypeLayout::Struct(StructLayoutBuilder::build(s, resolver, layout_type)?)
+            },
+        })
+    }
+
+    fn build_from_signature_token(
+        m: &CompiledModule,
+        s: &SignatureToken,
+        type_arguments: &[MoveTypeLayout],
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveTypeLayout> {
+        use SignatureToken::*;
+        Ok(match s {
+            Vector(t) => MoveTypeLayout::Vector(Box::new(Self::build_from_signature_token(
+                m,
+                t,
+                type_arguments,
+                resolver,
+                layout_type,
+            )?)),
+            Struct(shi) => MoveTypeLayout::Struct(StructLayoutBuilder::build_from_handle_idx(
+                m,
+                *shi,
+                vec![],
+                resolver,
+                layout_type,
+            )?),
+            StructInstantiation(shi, type_actuals) => {
+                let actual_layouts = type_actuals
+                    .iter()
+                    .map(|t| {
+                        Self::build_from_signature_token(
+                            m,
+                            t,
+                            type_arguments,
+                            resolver,
+                            layout_type,
+                        )
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                MoveTypeLayout::Struct(StructLayoutBuilder::build_from_handle_idx(
+                    m,
+                    *shi,
+                    actual_layouts,
+                    resolver,
+                    layout_type,
+                )?)
+            },
+            TypeParameter(i) => type_arguments[*i as usize].clone(),
+            Bool => MoveTypeLayout::Bool,
+            U8 => MoveTypeLayout::U8,
+            U16 => MoveTypeLayout::U16,
+            U32 => MoveTypeLayout::U32,
+            U64 => MoveTypeLayout::U64,
+            U128 => MoveTypeLayout::U128,
+            U256 => MoveTypeLayout::U256,
+            Address => MoveTypeLayout::Address,
+            Signer => bail!("Type layouts cannot contain signer"),
+            Reference(_) | MutableReference(_) => bail!("Type layouts cannot contain references"),
+        })
+    }
+}
+
+impl StructLayoutBuilder {
+    pub fn build_runtime(s: &StructTag, resolver: &impl GetModule) -> Result<MoveStructLayout> {
+        Self::build(s, resolver, LayoutType::Runtime)
+    }
+
+    pub fn build_with_fields(s: &StructTag, resolver: &impl GetModule) -> Result<MoveStructLayout> {
+        Self::build(s, resolver, LayoutType::WithFields)
+    }
+
+    /// Construct an expanded `TypeLayout` from `s`.
+    /// Panics if `resolver` cannot resolved a module whose types are referenced directly or
+    /// transitively by `s`.
+    fn build(
+        s: &StructTag,
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveStructLayout> {
+        let type_arguments = s
+            .type_params
+            .iter()
+            .map(|t| TypeLayoutBuilder::build(t, resolver, layout_type))
+            .collect::<Result<Vec<MoveTypeLayout>>>()?;
+        Self::build_from_name(
+            &s.module_id(),
+            &s.name,
+            type_arguments,
+            resolver,
+            layout_type,
+        )
+    }
+
+    fn build_from_definition(
+        m: &CompiledModule,
+        s: &StructDefinition,
+        type_arguments: Vec<MoveTypeLayout>,
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveStructLayout> {
+        let s_handle = m.struct_handle_at(s.struct_handle);
+        if s_handle.type_parameters.len() != type_arguments.len() {
+            bail!("Wrong number of type arguments for struct")
+        }
+        match &s.field_information {
+            StructFieldInformation::Native => {
+                bail!("Can't extract fields for native struct")
+            },
+            StructFieldInformation::Declared(fields) => {
+                let layouts = fields
+                    .iter()
+                    .map(|f| {
+                        TypeLayoutBuilder::build_from_signature_token(
+                            m,
+                            &f.signature.0,
+                            &type_arguments,
+                            resolver,
+                            layout_type,
+                        )
+                    })
+                    .collect::<Result<Vec<MoveTypeLayout>>>()?;
+                Ok(match layout_type {
+                    LayoutType::Runtime => MoveStructLayout::Runtime(layouts),
+                    LayoutType::WithFields => MoveStructLayout::WithFields(
+                        fields
+                            .iter()
+                            .map(|f| m.identifier_at(f.name).to_owned())
+                            .zip(layouts)
+                            .map(|(name, layout)| MoveFieldLayout::new(name, layout))
+                            .collect(),
+                    ),
+                    LayoutType::WithTypes => {
+                        let mid = m.self_id();
+                        let type_param_res: Result<Vec<TypeTag>> =
+                            type_arguments.iter().map(|t| t.try_into()).collect();
+                        let type_params = type_param_res?;
+                        let type_ = StructTag {
+                            address: *mid.address(),
+                            module: mid.name().to_owned(),
+                            name: m.identifier_at(s_handle.name).to_owned(),
+                            type_params,
+                        };
+                        let fields = fields
+                            .iter()
+                            .map(|f| m.identifier_at(f.name).to_owned())
+                            .zip(layouts)
+                            .map(|(name, layout)| MoveFieldLayout::new(name, layout))
+                            .collect();
+                        MoveStructLayout::WithTypes { type_, fields }
+                    },
+                })
+            },
+        }
+    }
+
+    fn build_from_name(
+        declaring_module: &ModuleId,
+        name: &IdentStr,
+        type_arguments: Vec<MoveTypeLayout>,
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveStructLayout> {
+        let module = match resolver.get_module_by_id(declaring_module) {
+            Err(_) | Ok(None) => bail!("Could not find module"),
+            Ok(Some(m)) => m,
+        };
+        let def = module
+            .borrow()
+            .find_struct_def_by_name(name)
+            .ok_or_else(|| {
+                anyhow!(
+                    "Could not find struct named {} in module {}",
+                    name,
+                    declaring_module
+                )
+            })?;
+        Self::build_from_definition(module.borrow(), def, type_arguments, resolver, layout_type)
+    }
+
+    fn build_from_handle_idx(
+        m: &CompiledModule,
+        s: StructHandleIndex,
+        type_arguments: Vec<MoveTypeLayout>,
+        resolver: &impl GetModule,
+        layout_type: LayoutType,
+    ) -> Result<MoveStructLayout> {
+        if let Some(def) = m.find_struct_def(s) {
+            // declared internally
+            Self::build_from_definition(m, def, type_arguments, resolver, layout_type)
+        } else {
+            let handle = m.struct_handle_at(s);
+            let name = m.identifier_at(handle.name);
+            let declaring_module = m.module_id_for_handle(m.module_handle_at(handle.module));
+            // declared externally
+            Self::build_from_name(
+                &declaring_module,
+                name,
+                type_arguments,
+                resolver,
+                layout_type,
+            )
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-utils/src/lib.rs b/vendors/move/crates/tools/move-bytecode-utils/src/lib.rs
new file mode 100644
index 000000000..e666932fa
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-utils/src/lib.rs
@@ -0,0 +1,95 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod dependency_graph;
+pub mod layout;
+pub mod module_cache;
+
+use crate::dependency_graph::DependencyGraph;
+use anyhow::{anyhow, Result};
+use move_binary_format::{access::ModuleAccess, file_format::CompiledModule};
+use move_core_types::language_storage::ModuleId;
+use std::collections::BTreeMap;
+
+/// Set of Move modules indexed by module Id
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct Modules<'a>(BTreeMap<ModuleId, &'a CompiledModule>);
+
+impl<'a> Modules<'a> {
+    /// Construct a set of modules from a slice `modules`.
+    /// Panics if `modules` contains duplicates
+    pub fn new(modules: impl IntoIterator<Item = &'a CompiledModule>) -> Self {
+        let mut map = BTreeMap::new();
+        for m in modules {
+            assert!(
+                map.insert(m.self_id(), m).is_none(),
+                "Duplicate module found"
+            );
+        }
+        Modules(map)
+    }
+
+    /// Return all modules in this set
+    pub fn iter_modules(&self) -> Vec<&CompiledModule> {
+        self.0.values().copied().collect()
+    }
+
+    /// Return all modules in this set
+    pub fn iter_modules_owned(&self) -> Vec<CompiledModule> {
+        self.iter_modules().into_iter().cloned().collect()
+    }
+
+    /// Compute a dependency graph for `self`
+    pub fn compute_dependency_graph(&self) -> DependencyGraph {
+        DependencyGraph::new(self.0.values().copied())
+    }
+
+    /// Return the backing map of `self`
+    pub fn get_map(&self) -> &BTreeMap<ModuleId, &CompiledModule> {
+        &self.0
+    }
+
+    /// Return the bytecode for the module bound to `module_id`
+    pub fn get_module(&self, module_id: &ModuleId) -> Result<&CompiledModule> {
+        self.0
+            .get(module_id)
+            .copied()
+            .ok_or_else(|| anyhow!("Can't find module {:?}", module_id))
+    }
+
+    /// Return the immediate dependencies for `module_id`
+    pub fn get_immediate_dependencies(&self, module_id: &ModuleId) -> Result<Vec<&CompiledModule>> {
+        self.get_module(module_id)?
+            .immediate_dependencies()
+            .into_iter()
+            .map(|mid| self.get_module(&mid))
+            .collect::<Result<Vec<_>>>()
+    }
+
+    fn get_transitive_dependencies_(
+        &'a self,
+        all_deps: &mut Vec<&'a CompiledModule>,
+        module: &'a CompiledModule,
+    ) -> Result<()> {
+        let next_deps = module.immediate_dependencies();
+        all_deps.push(module);
+        for next in next_deps {
+            let next_module = self.get_module(&next)?;
+            self.get_transitive_dependencies_(all_deps, next_module)?;
+        }
+        Ok(())
+    }
+
+    /// Return the transitive dependencies for `module_id`
+    pub fn get_transitive_dependencies(
+        &self,
+        module_id: &ModuleId,
+    ) -> Result<Vec<&CompiledModule>> {
+        let mut all_deps = vec![];
+        for dep in self.get_immediate_dependencies(module_id)? {
+            self.get_transitive_dependencies_(&mut all_deps, dep)?;
+        }
+        Ok(all_deps)
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-utils/src/module_cache.rs b/vendors/move/crates/tools/move-bytecode-utils/src/module_cache.rs
new file mode 100644
index 000000000..de145a34c
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-utils/src/module_cache.rs
@@ -0,0 +1,123 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Result};
+use move_binary_format::CompiledModule;
+use move_core_types::{language_storage::ModuleId, resolver::ModuleResolver};
+use std::{
+    borrow::Borrow,
+    cell::RefCell,
+    collections::{btree_map::Entry, BTreeMap},
+    fmt::Debug,
+    sync::{Arc, RwLock},
+};
+
+/// A persistent storage that can fetch the bytecode for a given module id
+/// TODO: do we want to implement this in a way that allows clients to cache struct layouts?
+pub trait GetModule {
+    type Error: Debug;
+    type Item: Borrow<CompiledModule>;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<Self::Item>, Self::Error>;
+}
+
+/// Simple in-memory module cache
+pub struct ModuleCache<R: ModuleResolver> {
+    cache: RefCell<BTreeMap<ModuleId, CompiledModule>>,
+    resolver: R,
+}
+
+#[allow(clippy::len_without_is_empty)]
+impl<R: ModuleResolver> ModuleCache<R> {
+    pub fn new(resolver: R) -> Self {
+        ModuleCache {
+            cache: RefCell::new(BTreeMap::new()),
+            resolver,
+        }
+    }
+
+    pub fn add(&self, id: ModuleId, m: CompiledModule) {
+        self.cache.borrow_mut().insert(id, m);
+    }
+
+    pub fn len(&self) -> usize {
+        self.cache.borrow().len()
+    }
+}
+
+impl<R: ModuleResolver> GetModule for ModuleCache<R> {
+    type Error = anyhow::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(Some(match self.cache.borrow_mut().entry(id.clone()) {
+            Entry::Vacant(entry) => {
+                let module_bytes = self
+                    .resolver
+                    .get_module(id)
+                    .map_err(|_| anyhow!("Failed to get module {:?}", id))?
+                    .ok_or_else(|| anyhow!("Module {:?} doesn't exist", id))?;
+                let module = CompiledModule::deserialize(&module_bytes)
+                    .map_err(|_| anyhow!("Failure deserializing module {:?}", id))?;
+                entry.insert(module.clone());
+                module
+            },
+            Entry::Occupied(entry) => entry.get().clone(),
+        }))
+    }
+}
+
+/// Simple in-memory module cache that implements Sync
+pub struct SyncModuleCache<R: ModuleResolver> {
+    cache: RwLock<BTreeMap<ModuleId, Arc<CompiledModule>>>,
+    resolver: R,
+}
+
+#[allow(clippy::len_without_is_empty)]
+impl<R: ModuleResolver> SyncModuleCache<R> {
+    pub fn new(resolver: R) -> Self {
+        SyncModuleCache {
+            cache: RwLock::new(BTreeMap::new()),
+            resolver,
+        }
+    }
+
+    pub fn add(&self, id: ModuleId, m: CompiledModule) {
+        self.cache.write().unwrap().insert(id, Arc::new(m));
+    }
+
+    pub fn len(&self) -> usize {
+        self.cache.read().unwrap().len()
+    }
+}
+
+impl<R: ModuleResolver> GetModule for SyncModuleCache<R> {
+    type Error = anyhow::Error;
+    type Item = Arc<CompiledModule>;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<Arc<CompiledModule>>, Self::Error> {
+        if let Some(compiled_module) = self.cache.read().unwrap().get(id) {
+            return Ok(Some(compiled_module.clone()));
+        }
+
+        if let Some(module_bytes) = self
+            .resolver
+            .get_module(id)
+            .map_err(|_| anyhow!("Failed to get module {:?}", id))?
+        {
+            let module = Arc::new(
+                CompiledModule::deserialize(&module_bytes)
+                    .map_err(|_| anyhow!("Failure deserializing module {:?}", id))?,
+            );
+
+            self.cache
+                .write()
+                .unwrap()
+                .insert(id.clone(), module.clone());
+            Ok(Some(module))
+        } else {
+            Ok(None)
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/Cargo.toml b/vendors/move/crates/tools/move-bytecode-viewer/Cargo.toml
new file mode 100644
index 000000000..2a86387ea
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "move-bytecode-viewer"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Explore Move bytecode and how the source code compiles to it"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+clap = { version = "3.1.8", features = ["derive"] }
+crossterm = "0.21"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-source-map = { path = "../../move-bytecode-source-map" }
+regex = "1.5.5"
+tui = "0.17.0"
+
+move-command-line-common = { path = "../../move-command-line-common" }
+move-disassembler = { path = "../move-disassembler" }
+move-ir-types = { path = "../../move-ir/types" }
+
+[features]
+default = []
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/bytecode_viewer.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/bytecode_viewer.rs
new file mode 100644
index 000000000..3f3ae525d
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/bytecode_viewer.rs
@@ -0,0 +1,109 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::interfaces::LeftScreen;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    file_format::{CodeOffset, CompiledModule, FunctionDefinitionIndex},
+};
+use move_bytecode_source_map::{mapping::SourceMapping, source_map::SourceMap};
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use regex::Regex;
+use std::collections::HashMap;
+
+#[derive(Clone, Debug)]
+pub struct BytecodeInfo {
+    pub function_name: String,
+    pub function_index: FunctionDefinitionIndex,
+    pub code_offset: CodeOffset,
+}
+
+#[derive(Clone, Debug)]
+pub struct BytecodeViewer<'a> {
+    pub lines: Vec<String>,
+    pub view: BinaryIndexedView<'a>,
+    pub line_map: HashMap<usize, BytecodeInfo>,
+}
+
+impl<'a> BytecodeViewer<'a> {
+    pub fn new(source_map: SourceMap, module: &'a CompiledModule) -> Self {
+        let view = BinaryIndexedView::Module(module);
+        let source_mapping = SourceMapping::new(source_map, view);
+        let options = DisassemblerOptions {
+            print_code: true,
+            print_basic_blocks: true,
+            ..Default::default()
+        };
+        let disassembled_string = Disassembler::new(source_mapping, options)
+            .disassemble()
+            .unwrap();
+
+        let mut base_viewer = Self {
+            lines: disassembled_string.lines().map(|x| x.to_string()).collect(),
+            line_map: HashMap::new(),
+            view,
+        };
+        base_viewer.build_mapping();
+        base_viewer
+    }
+
+    fn build_mapping(&mut self) {
+        let regex = Regex::new(r"^(\d+):.*").unwrap();
+        let fun_regex = Regex::new(r"^public\s+([a-zA-Z_]+)\(").unwrap();
+        let mut current_fun = None;
+        let mut current_fdef_idx = None;
+        let mut line_map = HashMap::new();
+
+        let function_def_for_name: HashMap<String, u16> = self
+            .view
+            .function_defs()
+            .into_iter()
+            .flatten()
+            .enumerate()
+            .map(|(index, fdef)| {
+                (
+                    self.view
+                        .identifier_at(self.view.function_handle_at(fdef.function).name)
+                        .to_string(),
+                    index as u16,
+                )
+            })
+            .collect();
+
+        for (i, line) in self.lines.iter().enumerate() {
+            let line = line.trim();
+            if let Some(cap) = fun_regex.captures(line) {
+                let fn_name = cap.get(1).unwrap().as_str();
+                let function_definition_index = function_def_for_name[fn_name];
+                current_fun = Some(fn_name);
+                current_fdef_idx = Some(FunctionDefinitionIndex(function_definition_index));
+            }
+
+            if let Some(cap) = regex.captures(line) {
+                current_fun.map(|fname| {
+                    let d = cap.get(1).unwrap().as_str().parse::<u16>().unwrap();
+                    line_map.insert(i, BytecodeInfo {
+                        function_name: fname.to_string(),
+                        function_index: current_fdef_idx.unwrap(),
+                        code_offset: d,
+                    })
+                });
+            }
+        }
+        self.line_map = line_map;
+    }
+}
+
+impl LeftScreen for BytecodeViewer<'_> {
+    type SourceIndex = BytecodeInfo;
+
+    fn get_source_index_for_line(&self, line: usize, _column: usize) -> Option<&Self::SourceIndex> {
+        self.line_map.get(&line)
+    }
+
+    fn backing_string(&self) -> String {
+        self.lines.join("\n").replace('\t', "    ")
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/interfaces.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/interfaces.rs
new file mode 100644
index 000000000..898b29941
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/interfaces.rs
@@ -0,0 +1,50 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+
+/// There are two interfaces--the `LeftScreen` and `RightScreen`--that need to be implemented for
+/// the bytecode viewer and these can be mix-and-matched for different implementations.
+///
+/// The `LeftScreen` is the text that is displayed in the left-hand screen, and is scrollable. The
+/// scrolling in this window will output `BytecodeInfo` objects. These objects are then consumed by
+/// the `RightScreen` `source_for_code_location` function, which outputs text containing a context
+/// (`left`, `remainder`) around the source code location identified by the passed in
+/// `BytecodeInfo`.
+
+#[derive(Clone, Debug)]
+pub struct SourceContext {
+    pub left: String,
+    pub highlight: String,
+    pub remainder: String,
+}
+
+/// The `LeftScreen` trait is used to index the code.
+pub trait LeftScreen {
+    /// This is the type used for indexing the source code in the `RightScreen` trait. e.g., for
+    /// bytecode and using the source map, this would be a tuple of `(FunctionDefinitionIndex,
+    /// CodeOffset)`.
+    type SourceIndex;
+
+    /// Given a `line` and the `column` within that line, this returns a `SourceIndex` to be used
+    /// by the `RightScreen` trait.
+    fn get_source_index_for_line(&self, line: usize, column: usize) -> Option<&Self::SourceIndex>;
+
+    /// Return the backing string to be displayed on the left screen.
+    fn backing_string(&self) -> String;
+}
+
+/// The `RightScreen` trait takes the indices output by the left screen (cursor movements that have
+/// been possibly translated in some way, e.g., to (fdef_index, code_offset) pairs) and
+/// translates these indices into a `SourceContext` view of the text held by the implementor of the
+/// `RightScreen` trait.
+pub trait RightScreen<Indexer: LeftScreen> {
+    /// Take a `SourceIndex` from the `Indexer` and turn it into a context that will be diplayed on
+    /// the right screen.
+    fn source_for_code_location(
+        &self,
+        bytecode_info: &Indexer::SourceIndex,
+    ) -> Result<SourceContext>;
+    fn backing_string(&self) -> String;
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/lib.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/lib.rs
new file mode 100644
index 000000000..b6a4fdcaa
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/lib.rs
@@ -0,0 +1,62 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    bytecode_viewer::BytecodeViewer, source_viewer::ModuleViewer,
+    tui::tui_interface::start_tui_with_interface, viewer::Viewer,
+};
+use clap::Parser;
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_source_map::{source_map::SourceMap, utils::source_map_from_file};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+pub mod bytecode_viewer;
+pub mod interfaces;
+pub mod source_viewer;
+pub mod tui;
+pub mod viewer;
+
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+pub struct BytecodeViewerConfig {
+    /// The path to the module binary
+    #[clap(long = "module-path", short = 'b')]
+    pub module_binary_path: PathBuf,
+
+    /// The path to the source map for the module binary
+    #[clap(long = "source-map-path")]
+    pub module_sourcemap_path: PathBuf,
+
+    /// The path to the source file
+    #[clap(long = "source-path", short = 's')]
+    pub source_file_path: PathBuf,
+}
+
+pub fn start_viewer_in_memory(
+    compiled_module: CompiledModule,
+    source_map: SourceMap,
+    source_path: &Path,
+) {
+    let module_viewer = ModuleViewer::new(compiled_module.clone(), source_map.clone(), source_path);
+    let bytecode_viewer = BytecodeViewer::new(source_map, &compiled_module);
+    let interface = Viewer::new(module_viewer, bytecode_viewer);
+    start_tui_with_interface(interface).unwrap();
+}
+
+impl BytecodeViewerConfig {
+    pub fn start_viewer(&self) {
+        let bytecode_bytes =
+            fs::read(&self.module_binary_path).expect("Unable to read bytecode file");
+        let compiled_module = CompiledModule::deserialize(&bytecode_bytes)
+            .expect("Module blob can't be deserialized");
+
+        let source_map = source_map_from_file(&self.module_sourcemap_path).unwrap();
+
+        let source_path = Path::new(&self.source_file_path);
+        start_viewer_in_memory(compiled_module, source_map, source_path)
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/main.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/main.rs
new file mode 100644
index 000000000..33c6969d6
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/main.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_bytecode_viewer::BytecodeViewerConfig;
+
+fn main() {
+    BytecodeViewerConfig::parse().start_viewer()
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/source_viewer.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/source_viewer.rs
new file mode 100644
index 000000000..a2b41204c
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/source_viewer.rs
@@ -0,0 +1,80 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use crate::{
+    bytecode_viewer::{BytecodeInfo, BytecodeViewer},
+    interfaces::{RightScreen, SourceContext},
+};
+use anyhow::Result;
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_source_map::source_map::SourceMap;
+use std::{cmp, fs, path::Path};
+
+const CONTEXT_SIZE: usize = 1000;
+
+#[derive(Debug, Clone)]
+pub struct ModuleViewer {
+    file_index: usize,
+    source_code: Vec<String>,
+    source_map: SourceMap,
+    #[allow(unused)]
+    module: CompiledModule,
+}
+
+impl ModuleViewer {
+    pub fn new(module: CompiledModule, source_map: SourceMap, source_location: &Path) -> Self {
+        let mut source_code = vec![];
+        let file_contents = fs::read_to_string(source_location).unwrap();
+        assert!(
+            source_map.check(&file_contents),
+            "File contents are out of sync with source map"
+        );
+        source_code.push(file_contents);
+        let file_index = source_code.len() - 1;
+
+        Self {
+            file_index,
+            source_code,
+            source_map,
+            module,
+        }
+    }
+}
+
+impl<'a> RightScreen<BytecodeViewer<'a>> for ModuleViewer {
+    fn source_for_code_location(&self, bytecode_info: &BytecodeInfo) -> Result<SourceContext> {
+        let loc = self
+            .source_map
+            .get_code_location(bytecode_info.function_index, bytecode_info.code_offset)?;
+
+        let loc_start = loc.start() as usize;
+        let loc_end = loc.end() as usize;
+        let source = &self.source_code[self.file_index];
+        let source_span_end = source.len();
+
+        // Determine the context around the span that we want to show.
+        // Show either from the start of the file, or back `CONTEXT_SIZE` number of characters.
+        let context_start = loc_start.saturating_sub(CONTEXT_SIZE);
+        // Show either to the end of the file, or `CONTEXT_SIZE` number of characters after the
+        // span end.
+        let context_end = cmp::min(loc_end.checked_add(CONTEXT_SIZE).unwrap(), source_span_end);
+
+        // Create the contexts
+        let left = &source[context_start..loc_start];
+        let highlight = source[loc_start..loc_end].to_owned();
+        let remainder = &source[loc_end..context_end];
+
+        Ok(SourceContext {
+            left: left.to_string(),
+            highlight,
+            remainder: remainder.to_string(),
+        })
+    }
+
+    fn backing_string(&self) -> String {
+        self.source_code[self.file_index].clone()
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/tui/mod.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/mod.rs
new file mode 100644
index 000000000..7fc711b62
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/mod.rs
@@ -0,0 +1,144 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod text_builder;
+pub mod tui_interface;
+
+use crate::tui::tui_interface::TUIInterface;
+use crossterm::event::{self, Event, KeyCode as Key, KeyEvent};
+use std::{error::Error, io::Write};
+use tui::{
+    backend::CrosstermBackend,
+    layout::{Constraint, Direction, Layout},
+    style::Style,
+    widgets::{Block, Borders, Paragraph},
+    Frame,
+};
+
+pub struct TUI<Interface: TUIInterface> {
+    current_line_number: u16,
+    current_column: u16,
+    interface: Interface,
+}
+
+impl<Interface: TUIInterface> TUI<Interface> {
+    pub fn new(interface: Interface) -> Self {
+        Self {
+            current_line_number: 0,
+            current_column: 0,
+            interface,
+        }
+    }
+
+    pub fn redraw<W: Write>(&mut self, f: &mut Frame<CrosstermBackend<W>>) {
+        // Create a split window, each pane using 50% of the screen
+        let window = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
+            .split(f.size());
+
+        // Get the bottom offset of the window that the cursor will be displayed
+        let window_size = window[0].bottom();
+        // The window will need to be scrolled if the cursor is more than halfway down the screen.
+        let scroll = if self.current_line_number > window_size / 2 {
+            self.current_line_number
+                .checked_sub(window_size / 2)
+                .unwrap()
+        } else {
+            0
+        };
+
+        // Get the output for the current line/column of the cursore
+        let current_interface = self
+            .interface
+            .on_redraw(self.current_line_number, self.current_column);
+
+        // Left window logic
+        // Create a paragraph for our text, and scroll it if need be (by the amount computed above)
+        let input = Paragraph::new(current_interface.left_screen)
+            .style(Style::default())
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .title(Interface::LEFT_TITLE),
+            )
+            .scroll((scroll, 0));
+
+        // Set the cursor position in the left window. Numbers incremented by 1 since the screen
+        // border is at position 0 in both x and y coordinates. If we scrolled the text, we need
+        // to subtract that from the line number so that the cursor is over the correct line.
+        f.set_cursor(
+            self.current_column.checked_add(1).unwrap(),
+            self.current_line_number
+                .checked_add(1)
+                .unwrap()
+                .checked_sub(scroll)
+                .unwrap(),
+        );
+        f.render_widget(input, window[0]);
+
+        // Right window logic
+        // Render the output text. No other logic needed.
+        let output = Paragraph::new(current_interface.right_screen)
+            .style(Style::default())
+            .block(
+                Block::default()
+                    .title(Interface::RIGHT_TITLE)
+                    .borders(Borders::ALL),
+            );
+        f.render_widget(output, window[1])
+    }
+
+    /// Handles keyboard input, and updates state according to those key presses.
+    /// Down, Up => move the cursor up or down a line
+    /// Left, Right => move the cursor to the previous (resp. next) character on the current line
+    /// ESC, q => exit
+    pub fn handle_input(&mut self) -> Result<bool, Box<dyn Error>> {
+        if let Event::Key(KeyEvent { code: key, .. }) = event::read()? {
+            match key {
+                // Exit
+                Key::Esc | Key::Char('q') => {
+                    return Ok(true);
+                },
+                // Update current line number to move the cursor up a line. If the column number is
+                // past the end of the new line we're on, bound the column number so it isn't past
+                // the last character on the new line.
+                Key::Up => {
+                    self.current_line_number = self.current_line_number.saturating_sub(1);
+                    self.current_column = self
+                        .interface
+                        .bound_column(self.current_line_number, self.current_column);
+                },
+                // Update current line number to move the cursor down a line. If the column number is
+                // past the end of the new line we're on, bound the column number so it isn't past
+                // the last character on the new line.
+                Key::Down => {
+                    self.current_line_number = self
+                        .interface
+                        .bound_line(self.current_line_number.checked_add(1).unwrap());
+                    self.current_column = self
+                        .interface
+                        .bound_column(self.current_line_number, self.current_column);
+                },
+                // Move the cursor to the next character on the current line. Number is bounded by
+                // the length of the current line.
+                Key::Right => {
+                    self.current_column = self.interface.bound_column(
+                        self.current_line_number,
+                        self.current_column.checked_add(1).unwrap(),
+                    );
+                },
+                // Move the cursor to the previous character on the current line. Number is bounded by
+                // the length of the current line.
+                Key::Left => {
+                    self.current_column = self.current_column.saturating_sub(1);
+                },
+                _ => {},
+            }
+        }
+        Ok(false)
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/tui/text_builder.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/text_builder.rs
new file mode 100644
index 000000000..d6feeacfa
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/text_builder.rs
@@ -0,0 +1,70 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use tui::{
+    style::Style,
+    text::{Span, Spans},
+};
+
+/// A `TextBuilder` is used to build up a paragraph, where some parts of it may need to have
+/// different styling, and where this styling may not conform to line boundaries.
+#[derive(Debug, Clone, Default)]
+pub struct TextBuilder<'a> {
+    // A vec of "lines" each line is a vector of spans.
+    // We use Vec<Span> here instead of Spans since otherwise we wouldn't be able to join lines in
+    // the `add` function.
+    chunks: Vec<Vec<Span<'a>>>,
+}
+
+impl<'a> TextBuilder<'a> {
+    /// Create a new text builder
+    pub fn new() -> Self {
+        Self { chunks: Vec::new() }
+    }
+
+    /// Add `text` with the given `style`ing to the text builder. This functions tracks newlines in
+    /// the text already recorded (in the `chunks` field), and will splice lines between the
+    /// previous text and the new `text` being added. It respects the `style` of both the old text
+    /// and the newly added text.
+    pub fn add(&mut self, text: String, style: Style) {
+        let chunk = |string: String| {
+            string
+                .split('\n')
+                .map(|x| x.to_string())
+                .map(|x| vec![Span::styled(x, style)])
+                .collect::<Vec<Vec<Span>>>()
+        };
+        let last_chunk_ends_with_nl = self
+            .chunks
+            .last()
+            .map(|last_span| {
+                last_span
+                    .last()
+                    .map(|last_span| last_span.content.ends_with('\n'))
+                    .unwrap_or(false)
+            })
+            .unwrap_or(true);
+
+        if !last_chunk_ends_with_nl {
+            let mut iter = text.splitn(2, '\n');
+            iter.next().into_iter().for_each(|line_continuation| {
+                self.chunks
+                    .last_mut()
+                    .unwrap()
+                    .push(Span::styled(line_continuation.to_string(), style));
+            });
+            iter.next().into_iter().for_each(|remainder| {
+                self.chunks.extend(chunk(remainder.to_string()).into_iter());
+            });
+        } else {
+            self.chunks.extend(chunk(text))
+        }
+    }
+
+    /// Return back the final Spans, each `Spans` represents a line in the paragraph.
+    pub fn finish(self) -> Vec<Spans<'a>> {
+        self.chunks.into_iter().map(Spans::from).collect()
+    }
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/tui/tui_interface.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/tui_interface.rs
new file mode 100644
index 000000000..117966d8c
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/tui/tui_interface.rs
@@ -0,0 +1,101 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::tui::TUI;
+use crossterm::{
+    event::EnableMouseCapture,
+    execute,
+    terminal::{enable_raw_mode, EnterAlternateScreen},
+};
+use std::{error::Error, io};
+use tui::{backend::CrosstermBackend, text::Spans, Terminal};
+
+/// The output that will be display in the TUI. The text in the `left_screen` and `right_screen`
+/// fields will be displayed on the left screen and right screen respectively.
+#[derive(Debug, Clone)]
+pub struct TUIOutput<'a> {
+    /// The text to be displayed on the left screen. Each `Spans` in the vector is a line.
+    pub left_screen: Vec<Spans<'a>>,
+    /// The text to be displayed on the right screen. Each `Spans` in the vector is a line.
+    pub right_screen: Vec<Spans<'a>>,
+}
+
+pub trait TUIInterface {
+    /// The title to be used for the left screen
+    const LEFT_TITLE: &'static str;
+
+    /// The title to be used for the right screen
+    const RIGHT_TITLE: &'static str;
+
+    /// Function called on each redraw. The `TUIOutput` contains that updated data to display on
+    /// each pane.
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput;
+
+    /// Bounds the line number so that it does not run past the text.
+    fn bound_line(&self, line_number: u16) -> u16;
+
+    /// Bounds the column number (w.r.t. the current `line_number`) so that the cursor does not
+    /// overrun the line.
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16;
+}
+
+/// A Debugging interface for the TUI. Useful for debugging things.
+#[derive(Debug, Clone)]
+pub struct DebugInterface {
+    text: Vec<String>,
+}
+
+impl DebugInterface {
+    pub fn new(text: String) -> Self {
+        let text: Vec<_> = text.split('\n').map(|x| x.to_string()).collect();
+        Self { text }
+    }
+}
+
+impl TUIInterface for DebugInterface {
+    const LEFT_TITLE: &'static str = "Left pane";
+    const RIGHT_TITLE: &'static str = "Right pane";
+
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput {
+        TUIOutput {
+            left_screen: self.text.iter().map(|x| Spans::from(x.clone())).collect(),
+            right_screen: vec![Spans::from(format!(
+                "line number: {}   column number: {}",
+                line_number, column_number
+            ))],
+        }
+    }
+
+    fn bound_line(&self, line_number: u16) -> u16 {
+        std::cmp::min(
+            line_number,
+            (self.text.len().checked_sub(1).unwrap()) as u16,
+        )
+    }
+
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16 {
+        std::cmp::min(column_number, self.text[line_number as usize].len() as u16)
+    }
+}
+
+/// Starts a two-pane TUI using the provided `Interface` to update the screen according to cursor
+/// movements.
+pub fn start_tui_with_interface<Interface: TUIInterface>(
+    interface: Interface,
+) -> Result<(), Box<dyn Error>> {
+    enable_raw_mode()?;
+    let mut stdout = io::stdout();
+    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    let backend = CrosstermBackend::new(stdout);
+    let mut terminal = Terminal::new(backend)?;
+    let mut tui = TUI::new(interface);
+    loop {
+        terminal.draw(|frame| tui.redraw(frame))?;
+        if tui.handle_input()? {
+            break;
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-bytecode-viewer/src/viewer.rs b/vendors/move/crates/tools/move-bytecode-viewer/src/viewer.rs
new file mode 100644
index 000000000..5a59db8f8
--- /dev/null
+++ b/vendors/move/crates/tools/move-bytecode-viewer/src/viewer.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+use crate::{
+    interfaces::{LeftScreen, RightScreen},
+    tui::{
+        text_builder::TextBuilder,
+        tui_interface::{TUIInterface, TUIOutput},
+    },
+};
+use tui::{
+    style::{Color, Style},
+    text::Spans,
+};
+
+#[derive(Debug, Clone)]
+pub struct Viewer<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>> {
+    bytecode_text: Vec<String>,
+    source_viewer: SourceViewer,
+    bytecode_viewer: BytecodeViewer,
+}
+
+impl<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>>
+    Viewer<BytecodeViewer, SourceViewer>
+{
+    pub fn new(source_viewer: SourceViewer, bytecode_viewer: BytecodeViewer) -> Self {
+        Self {
+            bytecode_text: bytecode_viewer
+                .backing_string()
+                .split('\n')
+                .map(|x| x.to_string())
+                .collect(),
+            source_viewer,
+            bytecode_viewer,
+        }
+    }
+}
+
+impl<BytecodeViewer: LeftScreen, SourceViewer: RightScreen<BytecodeViewer>> TUIInterface
+    for Viewer<BytecodeViewer, SourceViewer>
+{
+    const LEFT_TITLE: &'static str = "Bytecode";
+    const RIGHT_TITLE: &'static str = "Source Code";
+
+    fn on_redraw(&mut self, line_number: u16, column_number: u16) -> TUIOutput {
+        // Highlight style
+        let style: Style = Style::default().bg(Color::Red);
+        let report = match self
+            .bytecode_viewer
+            .get_source_index_for_line(line_number as usize, column_number as usize)
+        {
+            None => {
+                let mut builder = TextBuilder::new();
+                builder.add(self.source_viewer.backing_string(), Style::default());
+                builder.finish()
+            },
+            Some(info) => {
+                let source_context = self.source_viewer.source_for_code_location(info).unwrap();
+
+                let mut builder = TextBuilder::new();
+                builder.add(source_context.left, Style::default());
+                builder.add(source_context.highlight, style);
+                builder.add(source_context.remainder, Style::default());
+                builder.finish()
+            },
+        };
+
+        TUIOutput {
+            left_screen: self
+                .bytecode_text
+                .iter()
+                .map(|x| Spans::from(x.clone()))
+                .collect(),
+            right_screen: report,
+        }
+    }
+
+    fn bound_line(&self, line_number: u16) -> u16 {
+        std::cmp::min(
+            line_number,
+            self.bytecode_text.len().checked_sub(1).unwrap() as u16,
+        )
+    }
+
+    fn bound_column(&self, line_number: u16, column_number: u16) -> u16 {
+        std::cmp::min(
+            column_number,
+            self.bytecode_text[line_number as usize].len() as u16,
+        )
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/Cargo.toml b/vendors/move/crates/tools/move-cli/Cargo.toml
new file mode 100644
index 000000000..50681f874
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/Cargo.toml
@@ -0,0 +1,88 @@
+[package]
+name = "move-cli"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "CLI frontend for the Move compiler and VM"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+clap = { version = "3.1.8", features = ["derive"] }
+codespan-reporting = "0.11.1"
+colored = "2.0.0"
+difference = "2.0.0"
+itertools = "0.10.0"
+once_cell = "1.7.2"
+reqwest = { version = "0.11.1", features = ["blocking", "json"] }
+serde = { version = "1.0.124", default-features = false }
+serde_json = "1.0"
+serde_yaml = "0.8.17"
+tempfile = "3.2.0"
+toml_edit =  { version = "0.14.3", features = ["easy"] }
+walkdir = "2.3.1"
+
+bcs = { workspace = true }
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-source-map = { path = "../../move-bytecode-source-map" }
+move-bytecode-utils = { path = "../move-bytecode-utils" }
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-bytecode-viewer = { path = "../move-bytecode-viewer" }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-coverage = { path = "../move-coverage" }
+move-disassembler = { path = "../move-disassembler" }
+move-docgen = { path = "../../move-docgen" }
+move-errmapgen = { path = "../../move-errmapgen" }
+move-ir-types = { path = "../../move-ir/types" }
+move-package = { path = "../move-package" }
+move-prover = { path = "../../move-prover" }
+move-resource-viewer = { path = "../tools/move-resource-viewer" }
+move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
+move-symbol-pool = { path = "../../move-symbol-pool" }
+move-table-extension = { path = "../../extensions/move-table-extension", optional = true }
+move-unit-test = { path = "../move-unit-test" }
+move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
+move-vm-test-utils = { path = "../../move-vm/test-utils" }
+move-vm-types = { path = "../../move-vm/types" }
+read-write-set = { path = "../read-write-set" }
+read-write-set-dynamic = { path = "../read-write-set/dynamic" }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+httpmock = "0.6.6"
+
+[[bin]]
+name = "move"
+path = "src/main.rs"
+
+[[test]]
+name = "sandbox_testsuite"
+harness = false
+
+[[test]]
+name = "move_unit_tests_move_vm_and_stackless_vm"
+harness = false
+
+[[test]]
+name = "move_unit_tests_evm"
+harness = false
+required-features = ["evm-backend"]
+
+[[test]]
+name = "build_testsuite"
+harness = false
+
+[[test]]
+name = "build_testsuite_evm"
+harness = false
+required-features = ["evm-backend"]
+
+[features]
+evm-backend = ["move-unit-test/evm-backend", "move-package/evm-backend"]
+table-extension = ["move-table-extension", "move-unit-test/table-extension"]
diff --git a/vendors/move/crates/tools/move-cli/README.md b/vendors/move/crates/tools/move-cli/README.md
new file mode 100644
index 000000000..7dae2bdb4
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/README.md
@@ -0,0 +1,576 @@
+# Move CLI
+
+The Move command-line interface (Move CLI) is a tool that provides an easy way to interact with Move, to experiment
+with writing and running Move code, and to experiment with developing new tools useful
+for Move development. To reflect this, the Move CLI commands are grouped into
+three main subcommands:
+* **package commands**: are commands to create, compile, and test Move packages, as well as perform other operations related to packages. These do not rely on a Move Adapter implementation nor an implementation of storage.
+* **sandbox commands**: are commands that allow you to write Move modules and scripts, write and run scripts and tests, and view the resulting state of execution in a local sandboxed environment.
+* **experimental commands**: are experimental commands that are currently in development.
+
+Every Move CLI command, with the exception of `package create`, is expected to be run within the context of a [Move package](https://move-language.github.io/move/packages.html).
+
+## Installation
+```shell
+$ cargo install --path move/language/tools/move-cli
+```
+or
+```shell
+$ cargo install --git https://github.com/move-language/move move-cli --branch main
+```
+
+This will install the `move` binary in your Cargo binary directory. On
+macOS and Linux this is usually `~/.cargo/bin`. You'll want to make sure
+this location is in your `PATH` environment variable.
+
+Now you should be able to run the Move CLI:
+
+```shell
+$ move
+Move 0.1.0
+CLI frontend for Move compiler and VM
+
+USAGE:
+    move [FLAGS] [OPTIONS] <SUBCOMMAND>
+  ...
+```
+
+We'll go through the most common Move CLI commands and flags here, however
+you can find the complete list of commands available by calling `move
+--help`.  Additionally, the complete list of flags and options available
+for each Move CLI command can be found by passing the `--help` flag to it,
+i.e., `move <command> --help`.
+
+## Package Commands
+
+Package commands provide wrappers with sane defaults around other commands
+that are provided either by various Move tools, compiler, or prover.
+
+The `move new` command will create a new empty Move package:
+```shell
+$ move new <package_name> # Create a Move package <package_name> under the current dir
+$ move new <package_name> -p <path> # Create a Move package <package_name> under path <path>
+```
+
+From within a package's root directory, you can build the modules and/or scripts that you have written in the package with:
+```shell
+$ move build # Builds the Move package you are currently in
+$ move build -p <path> # Builds the Move package at <path>
+```
+
+The compiled artifacts will by default be stored in the `build` directory. You
+can change where the build artifacts are saved by passing the optional `--build-dir` flag:
+
+```shell
+$ move build --build-dir <path_to_save_to> # Build current Move package and save artifacts under <path_to_save_to>
+```
+
+You can verify the specifications in a Move package using the Move Prover with the `prove` command:
+
+```shell
+$ move prove # Verify the specifications in the current package
+$ move prove -p <path> # Verify the specifications in the package at <path>
+```
+
+In order to run the Move Prover [additional tools need to be
+installed](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/install.md).
+Information on the Move Prover and its configuration options can be found
+[here](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)
+and
+[here](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md).
+
+You can also run unit tests in a package using the `test` command
+
+```shell
+$ move test # Run Move unit tests in the current package
+$ move test -p <path> # Run Move unit tests in the package at <path>
+```
+## Sandbox Commands
+
+The sandbox allows you to experiment with writing and running Move code without
+validators, a blockchain, or transactions. Persistent data is stored on-disk in
+a directory structure that mimics the Move memory model
+
+### Project structure
+
+Each sandbox command is run in the context of a Move package. So let's create a
+Move package that we'll use for the code in this README and `cd` into it:
+
+```shell
+$ move new readme
+$ cd readme
+```
+
+### Compiling and running scripts
+
+Let's first start out with a simple script that prints its [`signer`](https://move-language.github.io/move/signer.html).
+Create a file named `sources/debug_script.move` and type the following into it:
+
+```rust
+// sources/debug_script.move
+script {
+use std::debug;
+fun debug_script(account: signer) {
+    debug::print(&account)
+}
+}
+```
+
+Before we can run this however, we need to import the Move standard library
+nursery in order to have access to the `Debug` module and `Std` [named
+address](https://move-language.github.io/move/address.html#named-addresses).
+You can specify dependencies locally, or using a Git URL. Here, we will specify
+it using Git, so add the following to the `Move.toml` file in the `readme`
+directory:
+
+```toml
+[addresses]
+std = "0x1" # Specify and assign 0x1 to the named address "std"
+
+[dependencies]
+MoveNursery = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib/nursery", rev = "main" }
+#                ^                    ^                              ^                                       ^
+#            Git dependency       Git clone URL       Subdir under git repo (optional)           Git revision to use
+```
+
+Now let's try running the script -- the very first time may take some time since the package command will clone the repository at the given URL, but subsequent calls should be fast:
+
+```shell
+$ move sandbox run sources/debug_script.move --signers 0xf
+[debug] (&) { 0000000000000000000000000000000f }
+```
+
+The `--signers 0xf` argument indicates which account address(es) have signed
+off on the script. Omitting `--signers` or passing multiple signers to this
+single-`signer` script will trigger a type error.
+
+### Passing arguments
+
+The CLI supports passing non-`signer` arguments to `move sandbox run` via `--args`. The following argument types are supported:
+* `bool` literals (`true`, `false`)
+* `u64` literals (e.g., `10`, `58`)
+* `address` literals (e.g., `0x12`, `0x0000000000000000000000000000000f`)
+* hexadecimal strings (e.g., `'x"0012"'` will parse as the `vector<u8>` value `[00, 12]`)
+* ASCII strings (e.g., `'b"hi"'` will parse as the `vector<u8>` value `[68, 69]`)
+
+### Publishing new modules
+
+When executing a transaction script you'll often want to call into different
+Move modules, like in the example above with the `Debug` module. New modules can
+be added to the `sources` directory in the package where the CLI is being
+invoked. You can also add dependencies on other packages to have access to the
+modules that they define (just like we did with the `Debug` module above). The
+`move sandbox run` command will compile and publish each module in the package, and
+in each of the package's transitive dependencies, before running the given script.
+
+Try saving this code in `sources/Test.move`:
+
+```rust
+// sources/Test.move
+module 0x2::Test {
+    use std::signer;
+
+    struct Resource has key { i: u64 }
+
+    public fun publish(account: &signer) {
+        move_to(account, Resource { i: 10 })
+    }
+
+    public fun write(account: &signer, i: u64) acquires Resource {
+        borrow_global_mut<Resource>(signer::address_of(account)).i = i;
+    }
+
+    public fun unpublish(account: &signer) acquires Resource {
+        let Resource { i: _ } = move_from(signer::address_of(account));
+  }
+}
+```
+
+Now, try
+
+```shell
+$ move build
+```
+
+This will cause the CLI to compile and typecheck the modules under
+`sources`, but it won't publish the module bytecode under `storage`. You can
+compile and publish the module by running the `move sandbox publish` command
+(here we pass the `-v` or verbose flag to get a better understanding of what's
+happening):
+
+```shell
+$ move sandbox publish -v
+Found 1 modules
+Publishing a new module 00000000000000000000000000000002::Test (wrote 253 bytes)
+Wrote 253 bytes of module ID's and code
+```
+
+Now, if we take a look under `storage`, we will see the published bytecode
+for our `Test` module:
+
+```shell
+$ ls storage/0x00000000000000000000000000000002/modules
+Test.mv
+```
+
+We can also inspect the compiled bytecode in storage using `move sandbox view`:
+
+```shell
+$ move sandbox view storage/0x00000000000000000000000000000002/modules/Test.mv
+module 2.Test {
+struct Resource has key {
+  i: u64
+}
+
+public publish() {
+  0: MoveLoc[0](Arg0: &signer)
+  1: LdU64(10)
+  2: Pack[0](Resource)
+  3: MoveTo[0](Resource)
+  4: Ret
+}
+public unpublish() {
+  0: MoveLoc[0](Arg0: &signer)
+  1: Call[3](address_of(&signer): address)
+  2: MoveFrom[0](Resource)
+  3: Unpack[0](Resource)
+  4: Pop
+  5: Ret
+}
+public write() {
+  0: CopyLoc[1](Arg1: u64)
+  1: MoveLoc[0](Arg0: &signer)
+  2: Call[3](address_of(&signer): address)
+  3: MutBorrowGlobal[0](Resource)
+  4: MutBorrowField[0](Resource.i: u64)
+  5: WriteRef
+  6: Ret
+}
+}
+```
+
+You can also look at the compiled bytecode before publishing to `storage` by
+running either `move disassemble --name <module_name>` or `move
+disassemble --name <module_name> --interactive` to interactively inspect the
+bytecode and how it relates to the Move source code:
+
+```shell
+$ move disassemble --name Test --interactive # You can quit by pressing "q"
+$ move disassemble --name Test
+// Move bytecode v4
+module 2.Test {
+struct Resource has key {
+        i: u64
+}
+
+public publish() {
+B0:
+        0: MoveLoc[0](account: &signer)
+        1: LdU64(10)
+        2: Pack[0](Resource)
+        3: MoveTo[0](Resource)
+        4: Ret
+}
+public unpublish() {
+B0:
+        0: MoveLoc[0](account: &signer)
+        1: Call[3](address_of(&signer): address)
+        2: MoveFrom[0](Resource)
+        3: Unpack[0](Resource)
+        4: Pop
+        5: Ret
+}
+public write() {
+B0:
+        0: CopyLoc[1](i: u64)
+        1: MoveLoc[0](account: &signer)
+        2: Call[3](address_of(&signer): address)
+        3: MutBorrowGlobal[0](Resource)
+        4: MutBorrowField[0](Resource.i: u64)
+        5: WriteRef
+        6: Ret
+}
+}
+```
+
+### Updating state
+
+Let's exercise our new `Test` module by running the following script:
+
+```rust
+// sources/test_script.move
+script {
+use 0x2::Test;
+fun test_script(account: signer) {
+    Test::publish(&account)
+}
+}
+```
+
+This script invokes the `publish` function of our `Test` module, which will
+publish a resource of type `Test::Resource` under the signer's account.
+Let's first see what this script will change without committing those
+changes first. We can do this by passing the `--dry-run` flag:
+
+```shell
+$ move sandbox run sources/test_script.move --signers 0xf -v --dry-run
+Compiling transaction script...
+Changed resource(s) under 1 address(es):
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
+    Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
+Wrote 40 bytes of resource ID's and data
+      key 0x2::Test::Resource {
+           i: 10
+      }
+Discarding changes; re-run without --dry-run if you would like to keep them.
+```
+
+Everything looks good, so we can run this again, but this time commit the
+changes by removing the `--dry-run` flag:
+
+```shell
+$ move sandbox run sources/test_script.move --signers 0xf -v
+Compiling transaction script...
+Changed resource(s) under 1 address(es):
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
+    Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
+Wrote 40 bytes of resource ID's and data
+      key 0x2::Test::Resource {
+            i: 10
+      }
+```
+
+While the verbose flag used above (`-v`) shows resource changes, it is also
+possible to view them manually.
+We can inspect the newly published resource using `move sandbox view` since
+the change has been committed:
+
+```shell
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+key 0x2::Test::Resource {
+    i: 10
+}
+```
+
+#### Cleaning state
+
+Since state persists from one call to the Move CLI to another, there will
+frequently be times where you want to start again at a clean state.  This
+can be done using the `move sandbox clean` command which will remove the
+`storage` and `build` directories:
+
+```shell
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+resource 0x2::Test::Resource {
+        i: 10
+}
+$ move sandbox clean
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+Error: `move sandbox view <file>` must point to a valid file under storage
+```
+
+### Expected Value Testing with the Move CLI
+
+As mentioned previously, Move has a unit testing framework. However, unit tests
+cannot test everything -- in particular testing for events cannot be easily
+done. To help with writing tests that need to check for events, and expect
+specific states, the Move CLI also has a built-in expected-value testing
+framework. Each test is run independently in its own sandbox so state does not
+persist from one test to another.
+
+Each test is structured as a Move package along with an additional `args.txt` file that
+specifies a sequence of Move CLI commands that should be run in that
+directory.
+Additionally, there must be an `args.exp` file that contain the expected
+output from running the sequence of Move CLI commands specified in the
+`args.txt` file for that test.
+
+For example, if we wanted to create a Move CLI test that reran all of the
+commands that we've seen so far, we could do so by adding an `args.txt`
+to the `readme` directory that we created at the start and that we've been
+adding scripts and modules to:
+
+```
+readme/
+├── args.txt
+├── Move.toml
+└── sources
+    ├── debug_script.move
+    ├── Test.move
+    └── test_script.move
+```
+
+And, where the `args.txt` file contains the following Move CLI commands:
+
+```shell
+$ cd ..
+$ cat readme/args.txt
+## Arg files can have comments!
+sandbox run sources/debug_script.move --signers 0xf
+sandbox run sources/debug_script.move --signers 0xf
+build
+sandbox publish
+sandbox view storage/0x00000000000000000000000000000002/modules/Test.mv
+sandbox run sources/test_script.move --signers 0xf -v
+sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+```
+
+We can then use the `move sandbox test` command and point it at the `readme` directory to run each of these
+Move CLI commands for us in sequence:
+
+```shell
+$ move sandbox exp-test -p readme
+...<snipped output>
+0 / 1 test(s) passed.
+Error: 1 / 1 test(s) failed.
+```
+
+However, as we see this test will fail since there is no `args.exp` file for the test
+yet. We can generate this expectation file by setting the `UPDATE_BASELINE`
+environment variable when running the test:
+
+```shell
+$ UPDATE_BASELINE=1 move sandbox exp-test -p readme
+1 / 1 test(s) passed.
+```
+
+There should now be an `args.exp` file under the `readme` directory that
+contains the expected output of running the sequence of Move CLI commands
+in the `args.txt` file:
+
+```shell
+$ cat readme/args.exp
+Command `sandbox run sources/debug_script.move --signers 0xf`:
+[debug] (&) { 0000000000000000000000000000000f }
+Command `sandbox run sources/debug_script.move --signers 0xf --mode bare`:
+...
+```
+
+#### Testing with code coverage tracking
+
+Code coverage has been an important metric in software testing. In Move CLI expected value tests, we
+address the need for code coverage information with an additional flag,
+`--track-cov`, that can be passed to the `move sandbox exp-test` command.
+
+Note: To view coverage information, the Move CLI must be installed with the `--debug` flag;
+i.e., `cargo install --debug --path move/language/tools/move-cli`.
+
+Using our running example to illustrate:
+```shell
+$ move sandbox exp-test -p readme --track-cov
+1 / 1 test(s) passed.
+Module 00000000000000000000000000000002::Test
+        fun publish
+                total: 5
+                covered: 5
+                % coverage: 100.00
+        fun unpublish
+                total: 6
+                covered: 0
+                % coverage: 0.00
+        fun write
+                total: 7
+                covered: 0
+                % coverage: 0.00
+>>> % Module coverage: 27.78
+```
+
+The output indicates that not only the test is passed, but also that 100%
+instruction coverage is observed in the `publish` funciton. This is expected
+as the whole purpose of our `test_script.move` is to run the `publish` function.
+At the same time, the other two functions, `unpublish` and `write`, are never
+executed, making the average coverage 27.78% for the whole `Test` module.
+
+Internally, Move CLI uses the tracing feature provided by the Move VM to record
+which instructions in the compiled bytecode are executed and uses this
+information to calculate code coverage. Instruction coverage in Move can
+usually serve the purpose of line coverage in common C/C++/Rust coverage
+tracking tools.
+
+Note that the coverage information is aggregated across multiple `run` commands
+in `args.txt`. To illustrate this, suppose that we have another test script,
+`test_unpublish_script.move`, under `readme/sources` with the following
+content:
+
+```rust
+script {
+use 0x2::Test;
+fun test_unpublish_script(account: signer) {
+    Test::unpublish(&account)
+}
+}
+```
+
+We further add a new command to the end of `args.txt`
+(`args.exp` needs to be updated too).
+```shell
+sandbox run sources/test_unpublish_script.move --signers 0xf -v
+```
+
+Now we can re-test the `readme` again
+```shell
+$ move sandbox exp-test -p readme --track-cov
+1 / 1 test(s) passed.
+Module 00000000000000000000000000000002::Test
+        fun publish
+                total: 5
+                covered: 5
+                % coverage: 100.00
+        fun unpublish
+                total: 6
+                covered: 6
+                % coverage: 100.00
+        fun write
+                total: 7
+                covered: 0
+                % coverage: 0.00
+>>> % Module coverage: 61.11
+```
+
+This time, note that the `unpublish` function is 100% covered too and the
+overall module coverage is boosted to 61.11%.
+
+### Detecting breaking changes
+
+The `move sandbox publish` command automatically detects when upgrading a module may lead to a breaking change.
+There are two kinds of breaking changes:
+
+* Linking compatibility (e.g., removing or changing the signature of a public function that is invoked by other modules, removing a
+struct or resource type used by other modules)
+* Layout compatibility (e.g., adding/removing a resource or struct field)
+
+The breaking changes analysis performed by `move sandbox publish` is necessarily conservative. For example, say we `move sandbox publish` the following
+module:
+
+```
+address 0x2 {
+module M {
+    struct S has key { f: u64, g: u64 }
+}
+}
+```
+
+and then wish to upgrade it to the following:
+
+```
+address 0x2 {
+module M {
+    struct S has key { f: u64 }
+}
+}
+```
+
+Running `move sandbox publish` on this new version will fail:
+
+```
+Breaking change detected--publishing aborted. Re-run with --ignore-breaking-changes to publish anyway.
+Error: Layout API for structs of module 00000000000000000000000000000002::M has changed. Need to do a data migration of published structs
+```
+
+In this case, we know we have not published any instances of `S` in global storage, so it is safe to re-run `move sandbox publish --ignore-breaking-changes` (as recommended).
+We can double-check that this was not a breaking change by running `move sandbox doctor`.
+This handy command runs exhaustive sanity checks on global storage to detect any breaking changes that occurred in the past:
+* All modules pass the bytecode verifier
+* All modules link against their dependencies
+* All resources deserialize according to their declared types
+* All events deserialize according to their declared types
diff --git a/vendors/move/crates/tools/move-cli/src/base/build.rs b/vendors/move/crates/tools/move-cli/src/base/build.rs
new file mode 100644
index 000000000..6f305e2fd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/build.rs
@@ -0,0 +1,42 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::{Architecture, BuildConfig};
+use std::path::PathBuf;
+
+/// Build the package at `path`. If no path is provided defaults to current directory.
+#[derive(Parser)]
+#[clap(name = "build")]
+pub struct Build;
+
+impl Build {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        if config.fetch_deps_only {
+            let mut config = config;
+            if config.test_mode {
+                config.dev_mode = true;
+            }
+            config.download_deps_for_package(&rerooted_path, &mut std::io::stdout())?;
+            return Ok(());
+        }
+        let architecture = config.architecture.unwrap_or(Architecture::Move);
+
+        match architecture {
+            Architecture::Move | Architecture::AsyncMove => {
+                config.compile_package(&rerooted_path, &mut std::io::stdout())?;
+            },
+
+            Architecture::Ethereum => {
+                #[cfg(feature = "evm-backend")]
+                config.compile_package_evm(&rerooted_path, &mut std::io::stderr())?;
+
+                #[cfg(not(feature = "evm-backend"))]
+                anyhow::bail!("The Ethereum architecture is not supported because move-cli was not compiled with feature flag `evm-backend`.");
+            },
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/coverage.rs b/vendors/move/crates/tools/move-cli/src/base/coverage.rs
new file mode 100644
index 000000000..5842e1526
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/coverage.rs
@@ -0,0 +1,110 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
+use move_coverage::{
+    coverage_map::CoverageMap, format_csv_summary, format_human_summary,
+    source_coverage::SourceCoverageBuilder, summary::summarize_inst_cov,
+};
+use move_disassembler::disassembler::Disassembler;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+#[derive(Parser)]
+pub enum CoverageSummaryOptions {
+    /// Display a coverage summary for all modules in this package
+    #[clap(name = "summary")]
+    Summary {
+        /// Whether function coverage summaries should be displayed
+        #[clap(long = "summarize-functions")]
+        functions: bool,
+        /// Output CSV data of coverage
+        #[clap(long = "csv")]
+        output_csv: bool,
+    },
+    /// Display coverage information about the module against source code
+    #[clap(name = "source")]
+    Source {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+    /// Display coverage information about the module against disassembled bytecode
+    #[clap(name = "bytecode")]
+    Bytecode {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+}
+
+/// Inspect test coverage for this package. A previous test run with the `--coverage` flag must
+/// have previously been run.
+#[derive(Parser)]
+#[clap(name = "coverage")]
+pub struct Coverage {
+    #[clap(subcommand)]
+    pub options: CoverageSummaryOptions,
+}
+
+impl Coverage {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let path = reroot_path(path)?;
+        let coverage_map = CoverageMap::from_binary_file(path.join(".coverage_map.mvcov"))?;
+        let package = config.compile_package(&path, &mut Vec::new())?;
+        let modules: Vec<_> = package
+            .root_modules()
+            .filter_map(|unit| match &unit.unit {
+                CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module.clone()),
+                _ => None,
+            })
+            .collect();
+        match self.options {
+            CoverageSummaryOptions::Source { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let source_path = &unit.source_path;
+                let (module, source_map) = match &unit.unit {
+                    CompiledUnit::Module(NamedCompiledModule {
+                        module, source_map, ..
+                    }) => (module, source_map),
+                    _ => panic!("Should all be modules"),
+                };
+                let source_coverage = SourceCoverageBuilder::new(module, &coverage_map, source_map);
+                source_coverage
+                    .compute_source_coverage(source_path)
+                    .output_source_coverage(&mut std::io::stdout())
+                    .unwrap();
+            },
+            CoverageSummaryOptions::Summary {
+                functions,
+                output_csv,
+                ..
+            } => {
+                let coverage_map = coverage_map.to_unified_exec_map();
+                if output_csv {
+                    format_csv_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                    )
+                } else {
+                    format_human_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                        functions,
+                    )
+                }
+            },
+            CoverageSummaryOptions::Bytecode { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let mut disassembler = Disassembler::from_unit(&unit.unit);
+                disassembler.add_coverage_map(coverage_map.to_unified_exec_map());
+                println!("{}", disassembler.disassemble()?);
+            },
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/disassemble.rs b/vendors/move/crates/tools/move-cli/src/base/disassemble.rs
new file mode 100644
index 000000000..eda5cae69
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/disassemble.rs
@@ -0,0 +1,75 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
+use move_disassembler::disassembler::Disassembler;
+use move_package::{compilation::compiled_package::CompiledUnitWithSource, BuildConfig};
+use std::path::PathBuf;
+
+/// Disassemble the Move bytecode pointed to
+#[derive(Parser)]
+#[clap(name = "disassemble")]
+pub struct Disassemble {
+    /// Start a disassembled bytecode-to-source explorer
+    #[clap(long = "interactive")]
+    pub interactive: bool,
+    /// The package name. If not provided defaults to current package modules only
+    #[clap(long = "package")]
+    pub package_name: Option<String>,
+    /// The name of the module or script in the package to disassemble
+    #[clap(long = "name")]
+    pub module_or_script_name: String,
+}
+
+impl Disassemble {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            interactive,
+            package_name,
+            module_or_script_name,
+        } = self;
+        // Make sure the package is built
+        let package = config.compile_package(&rerooted_path, &mut Vec::new())?;
+        let needle_package = package_name
+            .as_deref()
+            .unwrap_or(package.compiled_package_info.package_name.as_str());
+        match package
+            .get_module_by_name(needle_package, &module_or_script_name)
+            .or_else(|_| package.get_script_by_name(needle_package, &module_or_script_name))
+            .ok()
+        {
+            None => anyhow::bail!(
+                "Unable to find module or script with name '{}' in package '{}'",
+                module_or_script_name,
+                needle_package,
+            ),
+            Some(unit) => {
+                // Once we find the compiled bytecode we're interested in, startup the bytecode
+                // viewer, or run the disassembler depending on if we need to run interactively
+                // or not.
+                if interactive {
+                    match unit {
+                        CompiledUnitWithSource {
+                            unit:
+                                CompiledUnit::Module(NamedCompiledModule {
+                                    module, source_map, ..
+                                }),
+                            source_path,
+                        } => move_bytecode_viewer::start_viewer_in_memory(
+                            module.clone(),
+                            source_map.clone(),
+                            source_path,
+                        ),
+                        _ => anyhow::bail!("Interactive disassembler not supported for scripts"),
+                    }
+                } else {
+                    println!("{}", Disassembler::from_unit(&unit.unit).disassemble()?);
+                }
+            },
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/docgen.rs b/vendors/move/crates/tools/move-cli/src/base/docgen.rs
new file mode 100644
index 000000000..71d5e62cf
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/docgen.rs
@@ -0,0 +1,122 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_docgen::DocgenOptions;
+use move_package::{BuildConfig, ModelConfig};
+use std::{fs, path::PathBuf};
+
+/// Generate javadoc style documentation for Move packages
+#[derive(Parser)]
+#[clap(name = "docgen")]
+pub struct Docgen {
+    /// The level where we start sectioning. Often markdown sections are rendered with
+    /// unnecessary large section fonts, setting this value high reduces the size
+    #[clap(long = "section-level-start", value_name = "HEADER_LEVEL")]
+    pub section_level_start: Option<usize>,
+    /// Whether to exclude private functions in the generated docs
+    #[clap(long = "exclude-private-fun")]
+    pub exclude_private_fun: bool,
+    /// Whether to exclude specifications in the generated docs
+    #[clap(long = "exclude-specs")]
+    pub exclude_specs: bool,
+    /// Whether to put specifications in the same section as a declaration or put them all
+    /// into an independent section
+    #[clap(long = "independent-specs")]
+    pub independent_specs: bool,
+    /// Whether to exclude Move implementations
+    #[clap(long = "exclude-impl")]
+    pub exclude_impl: bool,
+    /// Max depth to which sections are displayed in table-of-contents
+    #[clap(long = "toc-depth", value_name = "DEPTH")]
+    pub toc_depth: Option<usize>,
+    /// Do not use collapsed sections (`<details>`) for implementation and specs
+    #[clap(long = "no-collapsed-sections")]
+    pub no_collapsed_sections: bool,
+    /// In which directory to store output
+    #[clap(long = "output-directory", value_name = "PATH")]
+    pub output_directory: Option<String>,
+    /// A template for documentation generation. Can be multiple
+    #[clap(long = "template", short = 't', value_name = "FILE")]
+    pub template: Vec<String>,
+    /// An optional file containing reference definitions. The content of this file will
+    /// be added to each generated markdown doc
+    #[clap(long = "references-file", value_name = "FILE")]
+    pub references_file: Option<String>,
+    /// Whether to include dependency diagrams in the generated docs
+    #[clap(long = "include-dep-diagrams")]
+    pub include_dep_diagrams: bool,
+    /// Whether to include call diagrams in the generated docs
+    #[clap(long = "include-call-diagrams")]
+    pub include_call_diagrams: bool,
+    /// If this is being compiled relative to a different place where it will be stored (output directory)
+    #[clap(long = "compile-relative-to-output-dir")]
+    pub compile_relative_to_output_dir: bool,
+}
+
+impl Docgen {
+    /// Calling the Docgen
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let model = config.move_model_for_package(&reroot_path(path).unwrap(), ModelConfig {
+            all_files_as_targets: false,
+            target_filter: None,
+        })?;
+
+        let mut options = DocgenOptions::default();
+
+        if !self.template.is_empty() {
+            options.root_doc_templates = self.template;
+        }
+        if self.section_level_start.is_some() {
+            options.section_level_start = self.section_level_start.unwrap();
+        }
+        if self.exclude_private_fun {
+            options.include_private_fun = false;
+        }
+        if self.exclude_specs {
+            options.include_specs = false;
+        }
+        if self.independent_specs {
+            options.specs_inlined = false;
+        }
+        if self.exclude_impl {
+            options.include_impl = false;
+        }
+        if self.toc_depth.is_some() {
+            options.toc_depth = self.toc_depth.unwrap();
+        }
+        if self.no_collapsed_sections {
+            options.collapsed_sections = false;
+        }
+        if self.output_directory.is_some() {
+            options.output_directory = self.output_directory.unwrap();
+        }
+        if self.references_file.is_some() {
+            options.references_file = self.references_file;
+        }
+        if self.compile_relative_to_output_dir {
+            options.compile_relative_to_output_dir = true;
+        }
+
+        // We are using the full namespace, since we already use `Docgen` here.
+        // Docgen is the most suitable name for both: this Docgen subcommand,
+        // and the actual move_docgen::Docgen.
+        let generator = move_docgen::Docgen::new(&model, &options);
+
+        for (file, content) in generator.gen() {
+            let path = PathBuf::from(&file);
+            fs::create_dir_all(path.parent().unwrap())?;
+            fs::write(path.as_path(), content)?;
+            println!("Generated {:?}", path);
+        }
+
+        anyhow::ensure!(
+            !model.has_errors(),
+            "Errors encountered while generating documentation!"
+        );
+
+        println!("\nDocumentation generation successful!");
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/errmap.rs b/vendors/move/crates/tools/move-cli/src/base/errmap.rs
new file mode 100644
index 000000000..f619d9e55
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/errmap.rs
@@ -0,0 +1,47 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::{BuildConfig, ModelConfig};
+use std::path::PathBuf;
+
+/// Generate error map for the package and its dependencies at `path` for use by the Move
+/// explanation tool.
+#[derive(Parser)]
+#[clap(name = "errmap")]
+pub struct Errmap {
+    /// The prefix that all error reasons within modules will be prefixed with, e.g., "E" if
+    /// all error reasons are "E_CANNOT_PERFORM_OPERATION", "E_CANNOT_ACCESS", etc.
+    #[clap(long)]
+    pub error_prefix: Option<String>,
+    /// The file to serialize the generated error map to.
+    #[clap(long, default_value = "error_map", parse(from_os_str))]
+    pub output_file: PathBuf,
+}
+
+impl Errmap {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            error_prefix,
+            output_file,
+        } = self;
+        let mut errmap_options = move_errmapgen::ErrmapOptions::default();
+        if let Some(err_prefix) = error_prefix {
+            errmap_options.error_prefix = err_prefix;
+        }
+        errmap_options.output_file = output_file
+            .with_extension(move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION)
+            .to_string_lossy()
+            .to_string();
+        let model = config.move_model_for_package(&rerooted_path, ModelConfig {
+            all_files_as_targets: true,
+            target_filter: None,
+        })?;
+        let mut errmap_gen = move_errmapgen::ErrmapGen::new(&model, &errmap_options);
+        errmap_gen.gen();
+        errmap_gen.save_result();
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/info.rs b/vendors/move/crates/tools/move-cli/src/base/info.rs
new file mode 100644
index 000000000..0811f3986
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/info.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+/// Print address information.
+#[derive(Parser)]
+#[clap(name = "info")]
+pub struct Info;
+
+impl Info {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        config
+            .resolution_graph_for_package(&rerooted_path, &mut std::io::stdout())?
+            .print_info()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/mod.rs b/vendors/move/crates/tools/move-cli/src/base/mod.rs
new file mode 100644
index 000000000..c71318b82
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/mod.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod build;
+pub mod coverage;
+pub mod disassemble;
+pub mod docgen;
+pub mod errmap;
+pub mod info;
+pub mod movey_login;
+pub mod movey_upload;
+pub mod new;
+pub mod prove;
+pub mod test;
+
+use move_package::source_package::layout::SourcePackageLayout;
+use std::path::PathBuf;
+
+pub fn reroot_path(path: Option<PathBuf>) -> anyhow::Result<PathBuf> {
+    let path = path.unwrap_or_else(|| PathBuf::from("."));
+    // Always root ourselves to the package root, and then compile relative to that.
+    let rooted_path = SourcePackageLayout::try_find_root(&path.canonicalize()?)?;
+    std::env::set_current_dir(rooted_path).unwrap();
+
+    Ok(PathBuf::from("."))
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/movey_login.rs b/vendors/move/crates/tools/move-cli/src/base/movey_login.rs
new file mode 100644
index 000000000..496fb209d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/movey_login.rs
@@ -0,0 +1,227 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::utils::movey_credential::read_credential_file;
+use anyhow::{bail, Result};
+use clap::Parser;
+use move_command_line_common::{
+    env::MOVE_HOME,
+    movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL},
+};
+use std::{fs, fs::File, io, path::PathBuf};
+use toml_edit::easy::{map::Map, Value};
+
+#[derive(Parser)]
+#[clap(name = "movey-login")]
+pub struct MoveyLogin;
+
+impl MoveyLogin {
+    pub fn execute(self) -> Result<()> {
+        println!(
+            "Please paste the API Token found on {}/settings/tokens below",
+            MOVEY_URL
+        );
+        let mut line = String::new();
+        loop {
+            match io::stdin().read_line(&mut line) {
+                Ok(_) => {
+                    line = line.trim().to_string();
+                    if !line.is_empty() {
+                        break;
+                    }
+                    println!("Invalid API Token. Try again!");
+                },
+                Err(err) => {
+                    bail!("Error reading file: {}", err);
+                },
+            }
+        }
+        Self::save_credential(line, MOVE_HOME.clone())?;
+        println!("Token for Movey saved.");
+        Ok(())
+    }
+
+    pub fn save_credential(token: String, move_home: String) -> Result<()> {
+        fs::create_dir_all(&move_home)?;
+        let credential_path = move_home + MOVEY_CREDENTIAL_PATH;
+        let credential_file = PathBuf::from(&credential_path);
+        if !credential_file.exists() {
+            create_credential_file(&credential_path)?;
+        }
+
+        let mut toml: Value = read_credential_file(&credential_path)?;
+        // only update token key, keep the rest of the file intact
+        if let Some(registry) = toml.as_table_mut().unwrap().get_mut("registry") {
+            if let Some(toml_token) = registry.as_table_mut().unwrap().get_mut("token") {
+                *toml_token = Value::String(token);
+            } else {
+                registry
+                    .as_table_mut()
+                    .unwrap()
+                    .insert(String::from("token"), Value::String(token));
+            }
+        } else {
+            let mut value = Map::new();
+            value.insert(String::from("token"), Value::String(token));
+            toml.as_table_mut()
+                .unwrap()
+                .insert(String::from("registry"), Value::Table(value));
+        }
+
+        let new_contents = toml.to_string();
+        fs::write(credential_file, new_contents).expect("Unable to write file");
+        Ok(())
+    }
+}
+
+#[cfg(unix)]
+fn create_credential_file(credential_path: &str) -> Result<()> {
+    use std::os::unix::fs::PermissionsExt;
+    let credential_file = File::create(credential_path)?;
+
+    let mut perms = credential_file.metadata()?.permissions();
+    perms.set_mode(0o600);
+    credential_file.set_permissions(perms)?;
+    Ok(())
+}
+
+#[cfg(windows)]
+#[allow(unused)]
+fn create_credential_file(credential_path: &str) -> Result<()> {
+    let windows_path = credential_path.replace("/", "\\");
+    File::create(&windows_path)?;
+    Ok(())
+}
+
+#[cfg(not(any(unix, windows)))]
+#[allow(unused)]
+fn create_credential_file(credential_path: &str) -> Result<()> {
+    bail!("OS not supported")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::env;
+
+    fn setup_move_home(test_path: &str) -> (String, String) {
+        let cwd = env::current_dir().unwrap();
+        let mut move_home: String = String::from(cwd.to_string_lossy());
+        if !test_path.is_empty() {
+            move_home.push_str(test_path);
+        } else {
+            move_home.push_str("/test");
+        }
+        let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
+        (move_home, credential_path)
+    }
+
+    fn clean_up(move_home: &str) {
+        let _ = fs::remove_dir_all(move_home);
+    }
+
+    #[test]
+    fn save_credential_works_if_no_credential_file_exists() {
+        let (move_home, credential_path) =
+            setup_move_home("/save_credential_works_if_no_credential_file_exists");
+        let _ = fs::remove_dir_all(&move_home);
+        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
+
+        let contents = fs::read_to_string(credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(token.to_string().contains("test_token"));
+
+        clean_up(&move_home);
+    }
+
+    #[test]
+    fn save_credential_works_if_empty_credential_file_exists() {
+        let (move_home, credential_path) =
+            setup_move_home("/save_credential_works_if_empty_credential_file_exists");
+
+        let _ = fs::remove_dir_all(&move_home);
+        fs::create_dir_all(&move_home).unwrap();
+        File::create(&credential_path).unwrap();
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        assert!(toml.as_table_mut().unwrap().get_mut("registry").is_none());
+
+        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(token.to_string().contains("test_token"));
+
+        clean_up(&move_home);
+    }
+
+    #[test]
+    fn save_credential_works_if_token_field_exists() {
+        let (move_home, credential_path) =
+            setup_move_home("/save_credential_works_if_token_field_exists");
+
+        let _ = fs::remove_dir_all(&move_home);
+        fs::create_dir_all(&move_home).unwrap();
+        File::create(&credential_path).unwrap();
+
+        let old_content =
+            String::from("[registry]\ntoken = \"old_test_token\"\nversion = \"0.0.0\"\n");
+        fs::write(&credential_path, old_content).expect("Unable to write file");
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(token.to_string().contains("old_test_token"));
+        assert!(!token.to_string().contains("new_world"));
+
+        MoveyLogin::save_credential(String::from("new_world"), move_home.clone()).unwrap();
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(token.to_string().contains("new_world"));
+        assert!(!token.to_string().contains("old_test_token"));
+        let version = registry.as_table_mut().unwrap().get_mut("version").unwrap();
+        assert!(version.to_string().contains("0.0.0"));
+
+        clean_up(&move_home);
+    }
+
+    #[test]
+    fn save_credential_works_if_empty_token_field_exists() {
+        let (move_home, credential_path) =
+            setup_move_home("/save_credential_works_if_empty_token_field_exists");
+
+        let _ = fs::remove_dir_all(&move_home);
+        fs::create_dir_all(&move_home).unwrap();
+        File::create(&credential_path).unwrap();
+
+        let old_content = String::from("[registry]\ntoken = \"\"\nversion = \"0.0.0\"\n");
+        fs::write(&credential_path, old_content).expect("Unable to write file");
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(!token.to_string().contains("test_token"));
+
+        MoveyLogin::save_credential(String::from("test_token"), move_home.clone()).unwrap();
+
+        let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+        let mut toml: Value = contents.parse().unwrap();
+        let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+        let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+        assert!(token.to_string().contains("test_token"));
+        let version = registry.as_table_mut().unwrap().get_mut("version").unwrap();
+        assert!(version.to_string().contains("0.0.0"));
+
+        clean_up(&move_home);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/movey_upload.rs b/vendors/move/crates/tools/move-cli/src/base/movey_upload.rs
new file mode 100644
index 000000000..6530f8106
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/movey_upload.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::utils::movey_credential;
+use anyhow::bail;
+use clap::*;
+use move_command_line_common::env::MOVE_HOME;
+use reqwest::blocking::Client;
+use std::{env, fs::File, path::PathBuf, process::Command};
+
+// Metadata that will be collected by Movey
+#[derive(serde::Serialize, Default)]
+pub struct MoveyUploadRequest {
+    github_repo_url: String,
+    total_files: usize,
+    token: String,
+    subdir: String,
+}
+
+/// Upload the package metadata to Movey.net.
+#[derive(Parser)]
+#[clap(name = "movey-upload")]
+pub struct MoveyUpload;
+
+impl MoveyUpload {
+    pub fn execute(self, path: Option<PathBuf>) -> anyhow::Result<()> {
+        if let Some(path) = path {
+            if path.exists() && path.is_dir() {
+                let _ = env::set_current_dir(&path);
+            } else {
+                bail!("invalid directory")
+            }
+        }
+        // make sure it's a Move project
+        let move_toml = File::open("Move.toml");
+        if move_toml.is_err() {
+            bail!("Move.toml not found")
+        }
+        let metadata = move_toml.unwrap().metadata()?;
+        if metadata.len() == 0 {
+            bail!("Move.toml not found")
+        }
+
+        // use git command to get the repository url
+        let mut movey_upload_request: MoveyUploadRequest = Default::default();
+        let mut output = Command::new("git")
+            .current_dir(".")
+            .args(["remote", "-v"])
+            .output()
+            .unwrap();
+        if !output.status.success() || output.stdout.is_empty() {
+            bail!("invalid git repository")
+        }
+
+        let lines = String::from_utf8_lossy(output.stdout.as_slice());
+        let lines = lines.split('\n');
+        for line in lines {
+            if line.contains("github.com") {
+                let tokens: Vec<&str> = line.split(&['\t', ' '][..]).collect();
+                if tokens.len() != 3 {
+                    bail!("invalid remote url")
+                }
+                // convert ssh url to https
+                let https_url = if tokens[1].starts_with("git@github.com") {
+                    tokens[1].replace(':', "/").replace("git@", "https://")
+                } else {
+                    String::from(tokens[1])
+                };
+                movey_upload_request.github_repo_url = if https_url.ends_with(".git") {
+                    https_url[..https_url.len() - 4].to_string()
+                } else {
+                    https_url
+                };
+            }
+        }
+
+        // use git command to get the subdir if move package is not on the top level
+        output = Command::new("git")
+            .current_dir(".")
+            .args(["rev-parse", "--show-prefix"])
+            .output()
+            .unwrap();
+        let subdir = String::from_utf8_lossy(output.stdout.as_slice());
+        movey_upload_request.subdir = String::from(subdir);
+
+        // use git command to count total files
+        output = Command::new("git")
+            .current_dir(".")
+            .args(["ls-files"])
+            .output()
+            .unwrap();
+        let tracked_files = String::from_utf8_lossy(output.stdout.as_slice());
+        let tracked_files: Vec<&str> = tracked_files.split('\n').collect();
+        let mut total_files = tracked_files.len();
+        for file_path in tracked_files {
+            if file_path.is_empty() {
+                total_files -= 1;
+                continue;
+            }
+        }
+        movey_upload_request.total_files = total_files;
+        movey_upload_request.token = movey_credential::get_registry_api_token(&MOVE_HOME)?;
+        let movey_url = movey_credential::get_movey_url(&MOVE_HOME);
+        match movey_url {
+            Ok(url) => {
+                let client = Client::new();
+                let response = client
+                    .post(format!("{}/api/v1/packages/upload", &url))
+                    .json(&movey_upload_request)
+                    .send();
+                match response {
+                    Ok(response) => {
+                        if response.status().is_success() {
+                            println!(
+                                "Your package has been successfully uploaded to Movey at {}/packages/{}.",
+                                url,
+                                response.text()?
+                            );
+                        } else if response.status().is_client_error() {
+                            bail!("{}", response.text()?)
+                        } else if response.status().is_server_error() {
+                            bail!("An unexpected error occurred. Please try again later");
+                        }
+                    },
+                    Err(_) => {
+                        bail!("An unexpected error occurred. Please try again later");
+                    },
+                }
+            },
+            Err(_) => bail!("An unexpected error occurred. Please try again later"),
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/new.rs b/vendors/move/crates/tools/move-cli/src/base/new.rs
new file mode 100644
index 000000000..04c47e0b9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/new.rs
@@ -0,0 +1,86 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::*;
+use move_package::source_package::layout::SourcePackageLayout;
+use std::{
+    fmt::Display,
+    fs::create_dir_all,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+pub const MOVE_STDLIB_PACKAGE_NAME: &str = "MoveStdlib";
+pub const MOVE_STDLIB_PACKAGE_PATH: &str = "{ \
+    git = \"https://github.com/move-language/move.git\", \
+    subdir = \"language/move-stdlib\", rev = \"main\" \
+}";
+pub const MOVE_STDLIB_ADDR_NAME: &str = "std";
+pub const MOVE_STDLIB_ADDR_VALUE: &str = "0x1";
+
+/// Create a new Move package with name `name` at `path`. If `path` is not provided the package
+/// will be created in the directory `name`.
+#[derive(Parser)]
+#[clap(name = "new")]
+pub struct New {
+    /// The name of the package to be created.
+    pub name: String,
+}
+
+impl New {
+    pub fn execute_with_defaults(self, path: Option<PathBuf>) -> anyhow::Result<()> {
+        self.execute(
+            path,
+            "0.0.0",
+            [(MOVE_STDLIB_PACKAGE_NAME, MOVE_STDLIB_PACKAGE_PATH)],
+            [(MOVE_STDLIB_ADDR_NAME, MOVE_STDLIB_ADDR_VALUE)],
+            "",
+        )
+    }
+
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        version: &str,
+        deps: impl IntoIterator<Item = (impl Display, impl Display)>,
+        addrs: impl IntoIterator<Item = (impl Display, impl Display)>,
+        custom: &str, // anything else that needs to end up being in Move.toml (or empty string)
+    ) -> anyhow::Result<()> {
+        // TODO warn on build config flags
+        let Self { name } = self;
+        let p: PathBuf;
+        let path: &Path = match path {
+            Some(path) => {
+                p = path;
+                &p
+            },
+            None => Path::new(&name),
+        };
+        create_dir_all(path.join(SourcePackageLayout::Sources.path()))?;
+        let mut w = std::fs::File::create(path.join(SourcePackageLayout::Manifest.path()))?;
+        writeln!(
+            &mut w,
+            "[package]
+name = \"{name}\"
+version = \"{version}\"
+
+[dependencies]"
+        )?;
+        for (dep_name, dep_val) in deps {
+            writeln!(w, "{dep_name} = {dep_val}")?;
+        }
+
+        writeln!(
+            w,
+            "
+[addresses]"
+        )?;
+        for (addr_name, addr_val) in addrs {
+            writeln!(w, "{addr_name} =  \"{addr_val}\"")?;
+        }
+        if !custom.is_empty() {
+            writeln!(w, "{}", custom)?;
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/prove.rs b/vendors/move/crates/tools/move-cli/src/base/prove.rs
new file mode 100644
index 000000000..da0a5b816
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/prove.rs
@@ -0,0 +1,231 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use anyhow::bail;
+use clap::Parser;
+use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
+use colored::Colorize;
+use move_package::{BuildConfig, ModelConfig};
+use move_prover::run_move_prover_with_model;
+use std::{
+    io::Write,
+    path::{Path, PathBuf},
+    time::Instant,
+};
+use tempfile::TempDir;
+
+#[derive(Parser, Debug)]
+pub enum ProverOptions {
+    // Pass through unknown commands to the prover Clap parser
+    #[clap(
+        external_subcommand,
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    Options(Vec<String>),
+}
+
+/// Run the Move Prover on the package at `path`. If no path is provided defaults to current
+/// directory. Use `.. prove .. -- <options>` to pass on options to the prover.
+#[derive(Parser)]
+#[clap(name = "prove")]
+pub struct Prove {
+    /// The target filter used to prune the modules to verify. Modules with a name that contains
+    /// this string will be part of verification.
+    #[clap(short = 't', long = "target")]
+    pub target_filter: Option<String>,
+    /// Internal field indicating that this prover run is for a test.
+    #[clap(skip)]
+    pub for_test: bool,
+    /// Any options passed to the prover.
+    #[clap(subcommand)]
+    pub options: Option<ProverOptions>,
+}
+
+impl Prove {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            target_filter,
+            for_test,
+            options,
+        } = self;
+        let opts = match options {
+            Some(ProverOptions::Options(opts)) => opts,
+            _ => vec![],
+        };
+        let mut args = vec!["package".to_string()];
+        let prover_toml = Path::new(&rerooted_path).join("Prover.toml");
+        if prover_toml.exists() {
+            args.push(format!("--config={}", prover_toml.to_string_lossy()));
+        }
+        args.extend(opts.iter().cloned());
+        let options = move_prover::cli::Options::create_from_args(&args)?;
+        if for_test {
+            options.setup_logging_for_test();
+        } else {
+            options.setup_logging();
+        }
+
+        run_move_prover(config, &rerooted_path, &target_filter, for_test, options)
+    }
+}
+
+// =================================================================================================
+// API for Rust unit tests
+
+/// Data representing the configuration of a prover test.
+pub struct ProverTest {
+    path: String,
+    options: Vec<String>,
+    local_only: bool,
+}
+
+impl ProverTest {
+    /// Creates a new prover test for the Move package at path relative to crate root.
+    pub fn create(path: impl Into<String>) -> Self {
+        ProverTest {
+            path: path.into(),
+            options: vec![],
+            local_only: false,
+        }
+    }
+
+    /// Set specific prover options.
+    pub fn with_options(self, options: &[&str]) -> Self {
+        self.with_options_owned(options.iter().map(|s| s.to_string()).collect())
+    }
+
+    /// Set specific prover options, from vector of strings.
+    pub fn with_options_owned(self, options: Vec<String>) -> Self {
+        Self { options, ..self }
+    }
+
+    /// Restrict this test to only run locally (not in CI)
+    pub fn with_local_only(self) -> Self {
+        Self {
+            local_only: true,
+            ..self
+        }
+    }
+
+    /// Run the prover test.
+    pub fn run(mut self) {
+        if self.local_only && in_ci() {
+            return;
+        }
+        // Save current directory -- unfortunately the package system currently modifies it.
+        // This treatment also requires us to run prover tests sequentially.
+        // TODO: fix the side-effect in the package system, which makes it impossible to
+        //   parallelize package based tests.
+        let saved_cd = std::env::current_dir().expect("current directory");
+        let pkg_path = path_in_crate(std::mem::take(&mut self.path));
+        let cmd = Prove {
+            target_filter: None,
+            for_test: true,
+            options: Some(ProverOptions::Options(std::mem::take(&mut self.options))),
+        };
+        let res = cmd.execute(Some(pkg_path), move_package::BuildConfig::default());
+        std::env::set_current_dir(saved_cd).expect("restore current directory");
+        res.unwrap()
+    }
+}
+
+fn in_ci() -> bool {
+    get_env("ENV_TEST_ON_CI") == "1"
+}
+
+/// Determine path in this crate. We can't use CARGO_MANIFEST_DIR for this because
+/// we need the path of the caller. However, we can assume that cargo test
+/// runs in the root dir of the crate, so we can just directly use the relative path.
+fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    PathBuf::from(relative.into())
+}
+
+fn get_env(var: &str) -> String {
+    std::env::var(var).unwrap_or_else(|_| String::new())
+}
+
+// =================================================================================================
+// Running the prover as a package command
+
+pub fn run_move_prover(
+    mut config: BuildConfig,
+    path: &Path,
+    target_filter: &Option<String>,
+    for_test: bool,
+    mut options: move_prover::cli::Options,
+) -> anyhow::Result<()> {
+    // Always run the prover in dev mode, so addresses get default assignments
+    config.dev_mode = true;
+
+    if !options.move_sources.is_empty() {
+        bail!(
+            "move prover options must not specify sources as those are given \
+                     by the package system. Did you meant to prefix `{}` with `-t`?",
+            &options.move_sources[0]
+        );
+    }
+    if !options.move_deps.is_empty() {
+        bail!(
+            "move prover options must not specify dependencies as those are given \
+                     by the package system"
+        );
+    }
+    if !options.move_named_address_values.is_empty() {
+        bail!(
+            "move prover options must not specify named addresses as those are given \
+                     by the package system"
+        );
+    }
+
+    let mut message_writer = StandardStream::stdout(ColorChoice::Auto);
+    let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
+    if for_test {
+        options.set_quiet();
+    }
+    let now = Instant::now();
+    let model = config.move_model_for_package(path, ModelConfig {
+        all_files_as_targets: false,
+        target_filter: target_filter.clone(),
+    })?;
+    let _temp_dir_holder = if for_test {
+        // Need to ensure a distinct output.bpl file for concurrent execution. In non-test
+        // mode, we actually want to use the static output.bpl for debugging purposes
+        let temp_dir = TempDir::new()?;
+        std::fs::create_dir_all(temp_dir.path())?;
+        options.output_path = temp_dir
+            .path()
+            .join("output.bpl")
+            .to_string_lossy()
+            .to_string();
+        Some(temp_dir)
+    } else {
+        None
+    };
+    let res = run_move_prover_with_model(&model, &mut error_writer, options, Some(now));
+    if for_test {
+        let basedir = path
+            .file_name()
+            .map(|s| s.to_string_lossy().to_string())
+            .unwrap_or_else(String::new);
+        writeln!(
+            message_writer,
+            "{} proving {} modules from package `{}` in {:.3}s",
+            if res.is_ok() {
+                "SUCCESS".bold().green()
+            } else {
+                "FAILURE".bold().red()
+            },
+            model.get_target_modules().len(),
+            basedir,
+            now.elapsed().as_secs_f64()
+        )?;
+    }
+    res
+}
diff --git a/vendors/move/crates/tools/move-cli/src/base/test.rs b/vendors/move/crates/tools/move-cli/src/base/test.rs
new file mode 100644
index 000000000..2c464959c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/base/test.rs
@@ -0,0 +1,276 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use crate::NativeFunctionRecord;
+use anyhow::Result;
+use clap::*;
+use move_command_line_common::files::{FileHash, MOVE_COVERAGE_MAP_EXTENSION};
+use move_compiler::{
+    diagnostics::{self, codes::Severity},
+    shared::{NumberFormat, NumericalAddress},
+    unit_test::{plan_builder::construct_test_plan, TestPlan},
+    PASS_CFGIR,
+};
+use move_coverage::coverage_map::{output_map_to_file, CoverageMap};
+use move_package::{compilation::build_plan::BuildPlan, BuildConfig};
+use move_unit_test::UnitTestingConfig;
+use move_vm_test_utils::gas_schedule::CostTable;
+// if unix
+#[cfg(any(target_family = "unix"))]
+use std::os::unix::prelude::ExitStatusExt;
+// if windows
+#[cfg(target_family = "windows")]
+use std::os::windows::process::ExitStatusExt;
+use std::{
+    collections::HashMap,
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    process::ExitStatus,
+};
+// if not windows nor unix
+#[cfg(not(any(target_family = "windows", target_family = "unix")))]
+compile_error!("Unsupported OS, currently we only support windows and unix family");
+
+/// Run Move unit tests in this package.
+#[derive(Parser)]
+#[clap(name = "test")]
+pub struct Test {
+    /// Bound the amount of gas used by any one test.
+    #[clap(name = "gas_limit", short = 'i', long = "gas_limit")]
+    pub gas_limit: Option<u64>,
+    /// An optional filter string to determine which unit tests to run. A unit test will be run only if it
+    /// contains this string in its fully qualified (`<addr>::<module_name>::<fn_name>`) name.
+    #[clap(name = "filter")]
+    pub filter: Option<String>,
+    /// List all tests
+    #[clap(name = "list", short = 'l', long = "list")]
+    pub list: bool,
+    /// Number of threads to use for running tests.
+    #[clap(
+        name = "num_threads",
+        default_value = "8",
+        short = 't',
+        long = "threads"
+    )]
+    pub num_threads: usize,
+    /// Report test statistics at the end of testing
+    #[clap(name = "report_statistics", short = 's', long = "statistics")]
+    pub report_statistics: bool,
+    /// Show the storage state at the end of execution of a failing test
+    #[clap(name = "global_state_on_error", short = 'g', long = "state_on_error")]
+    pub report_storage_on_error: bool,
+
+    /// Ignore compiler's warning, and continue run tests
+    #[clap(name = "ignore_compile_warnings", long = "ignore_compile_warnings")]
+    pub ignore_compile_warnings: bool,
+
+    /// Use the stackless bytecode interpreter to run the tests and cross check its results with
+    /// the execution result from Move VM.
+    #[clap(long = "stackless")]
+    pub check_stackless_vm: bool,
+    /// Verbose mode
+    #[clap(long = "verbose")]
+    pub verbose_mode: bool,
+    /// Collect coverage information for later use with the various `move coverage` subcommands
+    #[clap(long = "coverage")]
+    pub compute_coverage: bool,
+
+    /// Use the EVM-based execution backend.
+    /// Does not work with --stackless.
+    #[cfg(feature = "evm-backend")]
+    #[structopt(long = "evm")]
+    pub evm: bool,
+}
+
+impl Test {
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        config: BuildConfig,
+        natives: Vec<NativeFunctionRecord>,
+        cost_table: Option<CostTable>,
+    ) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            report_storage_on_error,
+            ignore_compile_warnings,
+            check_stackless_vm,
+            verbose_mode,
+            compute_coverage,
+            #[cfg(feature = "evm-backend")]
+            evm,
+        } = self;
+        let unit_test_config = UnitTestingConfig {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            report_storage_on_error,
+            check_stackless_vm,
+            verbose: verbose_mode,
+            ignore_compile_warnings,
+            #[cfg(feature = "evm-backend")]
+            evm,
+
+            ..UnitTestingConfig::default_with_bound(None)
+        };
+        let result = run_move_unit_tests(
+            &rerooted_path,
+            config,
+            unit_test_config,
+            natives,
+            cost_table,
+            compute_coverage,
+            &mut std::io::stdout(),
+        )?;
+
+        // Return a non-zero exit code if any test failed
+        if let UnitTestResult::Failure = result {
+            std::process::exit(1)
+        }
+        Ok(())
+    }
+}
+
+/// Encapsulates the possible returned states when running unit tests on a move package.
+#[derive(PartialEq, Eq, Debug)]
+pub enum UnitTestResult {
+    Success,
+    Failure,
+}
+
+pub fn run_move_unit_tests<W: Write + Send>(
+    pkg_path: &Path,
+    mut build_config: move_package::BuildConfig,
+    mut unit_test_config: UnitTestingConfig,
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: Option<CostTable>,
+    compute_coverage: bool,
+    writer: &mut W,
+) -> Result<UnitTestResult> {
+    let mut test_plan = None;
+    build_config.test_mode = true;
+    build_config.dev_mode = true;
+
+    // Build the resolution graph (resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer)
+    let resolution_graph = build_config.resolution_graph_for_package(pkg_path, &mut Vec::new())?;
+
+    // Note: unit_test_config.named_address_values is always set to vec![] (the default value) before
+    // being passed in.
+    unit_test_config.named_address_values = resolution_graph
+        .extract_named_address_mapping()
+        .map(|(name, addr)| {
+            (
+                name.to_string(),
+                NumericalAddress::new(addr.into_bytes(), NumberFormat::Hex),
+            )
+        })
+        .collect();
+
+    // Get the source files for all modules. We need this in order to report source-mapped error
+    // messages.
+    let dep_file_map: HashMap<_, _> = resolution_graph
+        .package_table
+        .iter()
+        .flat_map(|(_, rpkg)| {
+            rpkg.get_sources(&resolution_graph.build_options)
+                .unwrap()
+                .iter()
+                .map(|fname| {
+                    let contents = fs::read_to_string(Path::new(fname.as_str())).unwrap();
+                    let fhash = FileHash::new(&contents);
+                    (fhash, (*fname, contents))
+                })
+                .collect::<HashMap<_, _>>()
+        })
+        .collect();
+    let root_package = resolution_graph.root_package.package.name;
+    let build_plan = BuildPlan::create(resolution_graph)?;
+    // Compile the package. We need to intercede in the compilation, process being performed by the
+    // Move package system, to first grab the compilation env, construct the test plan from it, and
+    // then save it, before resuming the rest of the compilation and returning the results and
+    // control back to the Move package system.
+    build_plan.compile_with_driver(writer, None, |compiler| {
+        let (files, comments_and_compiler_res) = compiler.run::<PASS_CFGIR>().unwrap();
+        let (_, compiler) =
+            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
+        let (mut compiler, cfgir) = compiler.into_ast();
+        let compilation_env = compiler.compilation_env();
+        let built_test_plan = construct_test_plan(compilation_env, Some(root_package), &cfgir);
+        if let Err(diags) = compilation_env.check_diags_at_or_above_severity(
+            if unit_test_config.ignore_compile_warnings {
+                Severity::NonblockingError
+            } else {
+                Severity::Warning
+            },
+        ) {
+            diagnostics::report_diagnostics(&files, diags);
+        }
+
+        let compilation_result = compiler.at_cfgir(cfgir).build();
+
+        let (units, _) = diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
+        test_plan = Some((built_test_plan, files.clone(), units.clone()));
+        Ok((files, units))
+    })?;
+
+    let (test_plan, mut files, units) = test_plan.unwrap();
+    files.extend(dep_file_map);
+    let test_plan = test_plan.unwrap();
+    let no_tests = test_plan.is_empty();
+    let test_plan = TestPlan::new(test_plan, files, units);
+
+    let trace_path = pkg_path.join(".trace");
+    let coverage_map_path = pkg_path
+        .join(".coverage_map")
+        .with_extension(MOVE_COVERAGE_MAP_EXTENSION);
+    let cleanup_trace = || {
+        if compute_coverage && trace_path.exists() {
+            std::fs::remove_file(&trace_path).unwrap();
+        }
+    };
+
+    cleanup_trace();
+
+    // If we need to compute test coverage set the VM tracking environment variable since we will
+    // need this trace to construct the coverage information.
+    if compute_coverage {
+        std::env::set_var("MOVE_VM_TRACE", &trace_path);
+    }
+
+    // Run the tests. If any of the tests fail, then we don't produce a coverage report, so cleanup
+    // the trace files.
+    if !unit_test_config
+        .run_and_report_unit_tests(test_plan, Some(natives), cost_table, writer)
+        .unwrap()
+        .1
+    {
+        cleanup_trace();
+        return Ok(UnitTestResult::Failure);
+    }
+
+    // Compute the coverage map. This will be used by other commands after this.
+    if compute_coverage && !no_tests {
+        let coverage_map = CoverageMap::from_trace_file(trace_path);
+        output_map_to_file(coverage_map_path, &coverage_map).unwrap();
+    }
+    Ok(UnitTestResult::Success)
+}
+
+impl From<UnitTestResult> for ExitStatus {
+    fn from(result: UnitTestResult) -> Self {
+        match result {
+            UnitTestResult::Success => ExitStatus::from_raw(0),
+            UnitTestResult::Failure => ExitStatus::from_raw(1),
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/experimental/cli.rs b/vendors/move/crates/tools/move-cli/src/experimental/cli.rs
new file mode 100644
index 000000000..8d4dbdcdb
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/experimental/cli.rs
@@ -0,0 +1,117 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{experimental, sandbox::utils::PackageContext, Move};
+use anyhow::Result;
+use clap::{ArgEnum, Parser};
+use move_core_types::{
+    language_storage::TypeTag, parser, transaction_argument::TransactionArgument,
+};
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+#[derive(Parser)]
+pub enum ExperimentalCommand {
+    /// Perform a read/write set analysis and print the results for
+    /// `module_file`::`script_name`.
+    #[clap(name = "read-write-set")]
+    ReadWriteSet {
+        /// Path to .mv file containing module bytecode.
+        #[clap(name = "module", parse(from_os_str))]
+        module_file: PathBuf,
+        /// A function inside `module_file`.
+        #[clap(name = "function")]
+        fun_name: String,
+        #[clap(
+            long = "signers",
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        signers: Vec<String>,
+        #[clap(
+            long = "args",
+            parse(try_from_str = parser::parse_transaction_argument),
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        args: Vec<TransactionArgument>,
+        #[clap(
+            long = "type-args",
+            parse(try_from_str = parser::parse_type_tag),
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        type_args: Vec<TypeTag>,
+        #[clap(long = "concretize", possible_values = ConcretizeMode::variants(), ignore_case = true, default_value = "dont")]
+        concretize: ConcretizeMode,
+    },
+}
+
+// Specify if/how the analysis should concretize and filter the static analysis summary
+
+// Specify if/how the analysis should concretize and filter the static analysis summary
+#[derive(Debug, Clone, Copy, ArgEnum)]
+pub enum ConcretizeMode {
+    // Show the full concretized access paths read or written (e.g. 0xA/0x1::M::S/f/g)
+    Paths,
+    // Show only the concrete resource keys that are read (e.g. 0xA/0x1::M::S)
+    Reads,
+    // Show only the concrete resource keys that are written (e.g. 0xA/0x1::M::S)
+    Writes,
+    // Do not concretize; show the results from the static analysis
+    Dont,
+}
+
+impl FromStr for ConcretizeMode {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self> {
+        match s {
+            "paths" => Ok(ConcretizeMode::Paths),
+            "reads" => Ok(ConcretizeMode::Reads),
+            "writes" => Ok(ConcretizeMode::Writes),
+            "dont" => Ok(ConcretizeMode::Dont),
+            _ => Err(anyhow::anyhow!("Invalid concretize mode: {}", s)),
+        }
+    }
+}
+
+impl ConcretizeMode {
+    fn variants() -> [&'static str; 4] {
+        ["paths", "reads", "writes", "dont"]
+    }
+}
+
+impl ExperimentalCommand {
+    pub fn handle_command(&self, move_args: &Move, storage_dir: &Path) -> Result<()> {
+        match self {
+            ExperimentalCommand::ReadWriteSet {
+                module_file,
+                fun_name,
+                signers,
+                args,
+                type_args,
+                concretize,
+            } => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(None, storage_dir)?;
+                experimental::commands::analyze_read_write_set(
+                    &state,
+                    module_file,
+                    fun_name,
+                    signers,
+                    args,
+                    type_args,
+                    *concretize,
+                    move_args.verbose,
+                )
+            },
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/experimental/commands/mod.rs b/vendors/move/crates/tools/move-cli/src/experimental/commands/mod.rs
new file mode 100644
index 000000000..3a9f762f3
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/experimental/commands/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod read_writeset_analysis;
+
+pub use read_writeset_analysis::*;
diff --git a/vendors/move/crates/tools/move-cli/src/experimental/commands/read_writeset_analysis.rs b/vendors/move/crates/tools/move-cli/src/experimental/commands/read_writeset_analysis.rs
new file mode 100644
index 000000000..0ebeb9603
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/experimental/commands/read_writeset_analysis.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    experimental::cli::ConcretizeMode, sandbox::utils::on_disk_state_view::OnDiskStateView,
+};
+use anyhow::{anyhow, Result};
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_utils::Modules;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::TypeTag,
+    transaction_argument::{convert_txn_args, TransactionArgument},
+};
+use std::{fs, path::Path};
+
+pub fn analyze_read_write_set(
+    state: &OnDiskStateView,
+    module_file: &Path,
+    function: &str,
+    signers: &[String],
+    txn_args: &[TransactionArgument],
+    type_args: &[TypeTag],
+    concretize: ConcretizeMode,
+    verbose: bool,
+) -> Result<()> {
+    let module_id = CompiledModule::deserialize(&fs::read(module_file)?)
+        .map_err(|e| anyhow!("Error deserializing module: {:?}", e))?
+        .self_id();
+    let fun_id = Identifier::new(function.to_string())?;
+    let all_modules = state.get_all_modules()?;
+    let code_cache = Modules::new(&all_modules);
+    let dep_graph = code_cache.compute_dependency_graph();
+    if verbose {
+        println!(
+            "Inferring read/write set for {:?} module(s)",
+            all_modules.len(),
+        )
+    }
+    let modules = dep_graph.compute_topological_order()?;
+    let rw = read_write_set::analyze(modules)?;
+    let normalized_rw = rw.normalize_all_scripts(vec![]);
+
+    let signer_addresses = signers
+        .iter()
+        .map(|s| AccountAddress::from_hex_literal(s))
+        .collect::<Result<Vec<AccountAddress>, _>>()?;
+    // TODO: parse Value's directly instead of going through the indirection of TransactionArgument?
+    let script_args: Vec<Vec<u8>> = convert_txn_args(txn_args);
+    // substitute given script arguments + blockchain state into abstract r/w set
+    match concretize {
+        ConcretizeMode::Paths => {
+            let results = normalized_rw.get_concretized_summary(
+                &module_id,
+                &fun_id,
+                &signer_addresses,
+                &script_args,
+                type_args,
+                state,
+            )?;
+            println!("{}", results)
+        },
+        ConcretizeMode::Reads => {
+            let results = normalized_rw.get_keys_read(
+                &module_id,
+                &fun_id,
+                &signer_addresses,
+                &script_args,
+                type_args,
+                state,
+            )?;
+            for key in results {
+                println!("{}", key)
+            }
+        },
+        ConcretizeMode::Writes => {
+            let results = normalized_rw.get_keys_written(
+                &module_id,
+                &fun_id,
+                &signer_addresses,
+                &script_args,
+                type_args,
+                state,
+            )?;
+            for key in results {
+                println!("{}", key)
+            }
+        },
+        ConcretizeMode::Dont => {
+            // don't try try to concretize; just print the R/W set
+            // safe to unwrap here because every function must be analyzed
+            let results = rw.get_summary(&module_id, &fun_id).expect(
+                "Invariant violation: couldn't resolve R/W set summary for defined function",
+            );
+            println!(
+                "{}",
+                results.display(
+                    &rw.get_function_env(&module_id, &fun_id)
+                        .expect("Invariant violation: couldn't find the env for defined function")
+                )
+            )
+        },
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-cli/src/experimental/mod.rs b/vendors/move/crates/tools/move-cli/src/experimental/mod.rs
new file mode 100644
index 000000000..46bbba3d6
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/experimental/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod cli;
+pub mod commands;
diff --git a/vendors/move/crates/tools/move-cli/src/lib.rs b/vendors/move/crates/tools/move-cli/src/lib.rs
new file mode 100644
index 000000000..e90da37d1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/lib.rs
@@ -0,0 +1,152 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use base::{
+    build::Build, coverage::Coverage, disassemble::Disassemble, docgen::Docgen, errmap::Errmap,
+    info::Info, movey_login::MoveyLogin, movey_upload::MoveyUpload, new::New, prove::Prove,
+    test::Test,
+};
+use move_package::BuildConfig;
+
+pub mod base;
+pub mod experimental;
+pub mod sandbox;
+pub mod utils;
+
+/// Default directory where saved Move resources live
+pub const DEFAULT_STORAGE_DIR: &str = "storage";
+
+/// Default directory for build output
+pub const DEFAULT_BUILD_DIR: &str = ".";
+
+/// Extension for resource and event files, which are in BCS format
+const BCS_EXTENSION: &str = "bcs";
+
+use anyhow::Result;
+use clap::Parser;
+use move_core_types::{
+    account_address::AccountAddress, errmap::ErrorMapping, identifier::Identifier,
+};
+use move_vm_runtime::native_functions::NativeFunction;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::path::PathBuf;
+
+type NativeFunctionRecord = (AccountAddress, Identifier, Identifier, NativeFunction);
+
+#[derive(Parser)]
+#[clap(author, version, about)]
+pub struct Move {
+    /// Path to a package which the command should be run with respect to.
+    #[clap(long = "path", short = 'p', global = true, parse(from_os_str))]
+    pub package_path: Option<PathBuf>,
+
+    /// Print additional diagnostics if available.
+    #[clap(short = 'v', global = true)]
+    pub verbose: bool,
+
+    /// Package build options
+    #[clap(flatten)]
+    pub build_config: BuildConfig,
+}
+
+/// MoveCLI is the CLI that will be executed by the `move-cli` command
+/// The `cmd` argument is added here rather than in `Move` to make it
+/// easier for other crates to extend `move-cli`
+#[derive(Parser)]
+pub struct MoveCLI {
+    #[clap(flatten)]
+    pub move_args: Move,
+
+    #[clap(subcommand)]
+    pub cmd: Command,
+}
+
+#[derive(Parser)]
+pub enum Command {
+    Build(Build),
+    Coverage(Coverage),
+    Disassemble(Disassemble),
+    Docgen(Docgen),
+    Errmap(Errmap),
+    Info(Info),
+    MoveyUpload(MoveyUpload),
+    New(New),
+    Prove(Prove),
+    Test(Test),
+    /// Execute a sandbox command.
+    #[clap(name = "sandbox")]
+    Sandbox {
+        /// Directory storing Move resources, events, and module bytecodes produced by module publishing
+        /// and script execution.
+        #[clap(long, default_value = DEFAULT_STORAGE_DIR, parse(from_os_str))]
+        storage_dir: PathBuf,
+        #[clap(subcommand)]
+        cmd: sandbox::cli::SandboxCommand,
+    },
+    /// (Experimental) Run static analyses on Move source or bytecode.
+    #[clap(name = "experimental")]
+    Experimental {
+        /// Directory storing Move resources, events, and module bytecodes produced by module publishing
+        /// and script execution.
+        #[clap(long, default_value = DEFAULT_STORAGE_DIR, parse(from_os_str))]
+        storage_dir: PathBuf,
+        #[clap(subcommand)]
+        cmd: experimental::cli::ExperimentalCommand,
+    },
+    #[clap(name = "movey-login")]
+    MoveyLogin(MoveyLogin),
+}
+
+pub fn run_cli(
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+    move_args: Move,
+    cmd: Command,
+) -> Result<()> {
+    // TODO: right now, the gas metering story for move-cli (as a library) is a bit of a mess.
+    //         1. It's still using the old CostTable.
+    //         2. The CostTable only affects sandbox runs, but not unit tests, which use a unit cost table.
+    match cmd {
+        Command::Build(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Coverage(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Disassemble(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Docgen(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Errmap(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Info(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::MoveyUpload(c) => c.execute(move_args.package_path),
+        Command::New(c) => c.execute_with_defaults(move_args.package_path),
+        Command::Prove(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Test(c) => c.execute(
+            move_args.package_path,
+            move_args.build_config,
+            natives,
+            Some(cost_table.clone()),
+        ),
+        Command::Sandbox { storage_dir, cmd } => cmd.handle_command(
+            natives,
+            cost_table,
+            error_descriptions,
+            &move_args,
+            &storage_dir,
+        ),
+        Command::Experimental { storage_dir, cmd } => cmd.handle_command(&move_args, &storage_dir),
+        Command::MoveyLogin(c) => c.execute(),
+    }
+}
+
+pub fn move_cli(
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+) -> Result<()> {
+    let args = MoveCLI::parse();
+    run_cli(
+        natives,
+        cost_table,
+        error_descriptions,
+        args.move_args,
+        args.cmd,
+    )
+}
diff --git a/vendors/move/crates/tools/move-cli/src/main.rs b/vendors/move/crates/tools/move-cli/src/main.rs
new file mode 100644
index 000000000..f2f29cc40
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/main.rs
@@ -0,0 +1,19 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_core_types::{account_address::AccountAddress, errmap::ErrorMapping};
+use move_stdlib::natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters};
+
+fn main() -> Result<()> {
+    let error_descriptions: ErrorMapping = bcs::from_bytes(move_stdlib::error_descriptions())?;
+    let cost_table = &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE;
+    let addr = AccountAddress::from_hex_literal("0x1").unwrap();
+    let natives = all_natives(addr, GasParameters::zeros())
+        .into_iter()
+        .chain(nursery_natives(addr, NurseryGasParameters::zeros()))
+        .collect();
+
+    move_cli::move_cli(natives, cost_table, &error_descriptions)
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/cli.rs b/vendors/move/crates/tools/move-cli/src/sandbox/cli.rs
new file mode 100644
index 000000000..52c624273
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/cli.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::{
+        self,
+        utils::{on_disk_state_view::OnDiskStateView, PackageContext},
+    },
+    Move, NativeFunctionRecord, DEFAULT_BUILD_DIR,
+};
+use anyhow::Result;
+use clap::Parser;
+use move_core_types::{
+    errmap::ErrorMapping, language_storage::TypeTag, parser,
+    transaction_argument::TransactionArgument,
+};
+use move_package::compilation::package_layout::CompiledPackageLayout;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+#[derive(Parser)]
+pub enum SandboxCommand {
+    /// Compile the modules in this package and its dependencies and publish the resulting bytecodes in global storage.
+    #[clap(name = "publish")]
+    Publish {
+        /// If set, fail when attempting to publish a module that already
+        /// exists in global storage.
+        #[clap(long = "no-republish")]
+        no_republish: bool,
+        /// By default, code that might cause breaking changes for bytecode
+        /// linking or data layout compatibility checks will not be published.
+        /// Set this flag to ignore breaking changes checks and publish anyway.
+        #[clap(long = "ignore-breaking-changes")]
+        ignore_breaking_changes: bool,
+        /// If set, publish not only the modules in this package but also
+        /// modules in all its dependencies.
+        #[clap(long = "with-deps")]
+        with_deps: bool,
+        /// If set, all modules at once as a bundle. The default is to publish
+        /// modules sequentially.
+        #[clap(long = "bundle")]
+        bundle: bool,
+        /// Manually specify the publishing order of modules.
+        #[clap(
+            long = "override-ordering",
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        override_ordering: Option<Vec<String>>,
+    },
+    /// Run a Move script that reads/writes resources stored on disk in `storage-dir`.
+    /// The script must be defined in the package.
+    #[clap(name = "run")]
+    Run {
+        /// Path to .mv file containing either script or module bytecodes. If the file is a module, the
+        /// `script_name` parameter must be set.
+        #[clap(name = "script", parse(from_os_str))]
+        script_file: PathBuf,
+        /// Name of the script function inside `script_file` to call. Should only be set if `script_file`
+        /// points to a module.
+        #[clap(name = "name")]
+        script_name: Option<String>,
+        /// Possibly-empty list of signers for the current transaction (e.g., `account` in
+        /// `main(&account: signer)`). Must match the number of signers expected by `script_file`.
+        #[clap(
+            long = "signers",
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        signers: Vec<String>,
+        /// Possibly-empty list of arguments passed to the transaction (e.g., `i` in
+        /// `main(i: u64)`). Must match the arguments types expected by `script_file`.
+        /// Supported argument types are
+        /// bool literals (`true`, `false`),
+        /// u64 literals (e.g., `10`, `58`),
+        /// address literals (e.g., `0x12`, `0x0000000000000000000000000000000f`),
+        /// hexadecimal strings (e.g., `x"0012"` will parse as the `vector<u8>` value `[00, 12]`), and
+        /// ASCII strings (e.g., `'b"hi"` will parse as the `vector<u8>` value `[68, 69]`).
+        #[clap(
+            long = "args",
+            parse(try_from_str = parser::parse_transaction_argument),
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        args: Vec<TransactionArgument>,
+        /// Possibly-empty list of type arguments passed to the transaction (e.g., `T` in
+        /// `main<T>()`). Must match the type arguments kinds expected by `script_file`.
+        #[clap(
+            long = "type-args",
+            parse(try_from_str = parser::parse_type_tag),
+            takes_value(true),
+            multiple_values(true),
+            multiple_occurrences(true)
+        )]
+        type_args: Vec<TypeTag>,
+        /// Maximum number of gas units to be consumed by execution.
+        /// When the budget is exhaused, execution will abort.
+        /// By default, no `gas-budget` is specified and gas metering is disabled.
+        #[clap(long = "gas-budget", short = 'g')]
+        gas_budget: Option<u64>,
+        /// If set, the effects of executing `script_file` (i.e., published, updated, and
+        /// deleted resources) will NOT be committed to disk.
+        #[clap(long = "dry-run", short = 'n')]
+        dry_run: bool,
+    },
+    /// Run expected value tests using the given batch file.
+    #[clap(name = "exp-test")]
+    Test {
+        /// Use an ephemeral directory to serve as the testing workspace.
+        /// By default, the directory containing the `args.txt` will be the workspace.
+        #[clap(long = "use-temp-dir")]
+        use_temp_dir: bool,
+        /// Show coverage information after tests are done.
+        /// By default, coverage will not be tracked nor shown.
+        #[clap(long = "track-cov")]
+        track_cov: bool,
+    },
+    /// View Move resources, events files, and modules stored on disk.
+    #[clap(name = "view")]
+    View {
+        /// Path to a resource, events file, or module stored on disk.
+        #[clap(name = "file", parse(from_os_str))]
+        file: PathBuf,
+    },
+    /// Delete all resources, events, and modules stored on disk under `storage-dir`.
+    /// Does *not* delete anything in `src`.
+    Clean {},
+    /// Run well-formedness checks on the `storage-dir` and `install-dir` directories.
+    #[clap(name = "doctor")]
+    Doctor {},
+    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`
+    // TODO: expand this to generate script bindings, etc.?.
+    #[clap(name = "generate")]
+    Generate {
+        #[clap(subcommand)]
+        cmd: GenerateCommand,
+    },
+}
+
+#[derive(Parser)]
+pub enum GenerateCommand {
+    /// Generate struct layout bindings for the modules stored on disk under `storage-dir`.
+    #[clap(name = "struct-layouts")]
+    StructLayouts {
+        /// Path to a module stored on disk.
+        #[clap(long, parse(from_os_str))]
+        module: PathBuf,
+        /// If set, generate bindings for the specified struct and type arguments. If unset,
+        /// generate bindings for all closed struct definitions.
+        #[clap(flatten)]
+        options: StructLayoutOptions,
+    },
+}
+#[derive(Parser)]
+pub struct StructLayoutOptions {
+    /// Generate layout bindings for this struct.
+    #[clap(long = "struct")]
+    struct_: Option<String>,
+    /// Generate layout bindings for `struct` bound to these type arguments.
+    #[clap(
+        long = "type-args",
+        parse(try_from_str = parser::parse_type_tag),
+        requires="struct",
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    type_args: Option<Vec<TypeTag>>,
+    /// If set, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If unset, use the same syntax as Move source
+    #[clap(long = "separator")]
+    separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    #[clap(long = "omit-addresses")]
+    omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    #[clap(long = "ignore-phantom-types")]
+    ignore_phantom_types: bool,
+    /// If set, generate bindings only for the struct passed in.
+    /// When unset, generates bindings for the struct and all of its transitive dependencies.
+    #[clap(long = "shallow")]
+    shallow: bool,
+}
+
+impl SandboxCommand {
+    pub fn handle_command(
+        &self,
+        natives: Vec<NativeFunctionRecord>,
+        cost_table: &CostTable,
+        error_descriptions: &ErrorMapping,
+        move_args: &Move,
+        storage_dir: &Path,
+    ) -> Result<()> {
+        let bytecode_version = None;
+        match self {
+            SandboxCommand::Publish {
+                no_republish,
+                ignore_breaking_changes,
+                with_deps,
+                bundle,
+                override_ordering,
+            } => {
+                let context =
+                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
+                let state = context.prepare_state(bytecode_version, storage_dir)?;
+                sandbox::commands::publish(
+                    natives,
+                    cost_table,
+                    &state,
+                    context.package(),
+                    bytecode_version,
+                    *no_republish,
+                    *ignore_breaking_changes,
+                    *with_deps,
+                    *bundle,
+                    override_ordering.as_ref().map(|o| o.as_slice()),
+                    move_args.verbose,
+                )
+            },
+            SandboxCommand::Run {
+                script_file,
+                script_name,
+                signers,
+                args,
+                type_args,
+                gas_budget,
+                dry_run,
+            } => {
+                let context =
+                    PackageContext::new(&move_args.package_path, &move_args.build_config)?;
+                let state = context.prepare_state(bytecode_version, storage_dir)?;
+                sandbox::commands::run(
+                    natives,
+                    cost_table,
+                    error_descriptions,
+                    &state,
+                    context.package(),
+                    script_file,
+                    script_name,
+                    signers,
+                    args,
+                    type_args.to_vec(),
+                    *gas_budget,
+                    bytecode_version,
+                    *dry_run,
+                    move_args.verbose,
+                )
+            },
+            SandboxCommand::Test {
+                use_temp_dir,
+                track_cov,
+            } => sandbox::commands::run_all(
+                move_args
+                    .package_path
+                    .as_deref()
+                    .unwrap_or_else(|| Path::new(".")),
+                &std::env::current_exe()?,
+                *use_temp_dir,
+                *track_cov,
+            ),
+            SandboxCommand::View { file } => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(bytecode_version, storage_dir)?;
+                sandbox::commands::view(&state, file)
+            },
+            SandboxCommand::Clean {} => {
+                // delete storage
+                let storage_dir = Path::new(storage_dir);
+                if storage_dir.exists() {
+                    fs::remove_dir_all(storage_dir)?;
+                }
+
+                // delete build
+                let build_dir = Path::new(
+                    &move_args
+                        .build_config
+                        .install_dir
+                        .as_ref()
+                        .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR)),
+                )
+                .join(CompiledPackageLayout::Root.path());
+                if build_dir.exists() {
+                    fs::remove_dir_all(&build_dir)?;
+                }
+                Ok(())
+            },
+            SandboxCommand::Doctor {} => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(bytecode_version, storage_dir)?;
+                sandbox::commands::doctor(&state)
+            },
+            SandboxCommand::Generate { cmd } => {
+                let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
+                    .prepare_state(bytecode_version, storage_dir)?;
+                handle_generate_commands(cmd, &state)
+            },
+        }
+    }
+}
+
+fn handle_generate_commands(cmd: &GenerateCommand, state: &OnDiskStateView) -> Result<()> {
+    match cmd {
+        GenerateCommand::StructLayouts { module, options } => {
+            sandbox::commands::generate::generate_struct_layouts(
+                module,
+                &options.struct_,
+                &options.type_args,
+                options.separator.clone(),
+                options.omit_addresses,
+                options.ignore_phantom_types,
+                options.shallow,
+                state,
+            )
+        },
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/doctor.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/doctor.rs
new file mode 100644
index 000000000..95892ceff
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/doctor.rs
@@ -0,0 +1,92 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use anyhow::{bail, Result};
+use move_binary_format::{access::ModuleAccess, errors::PartialVMError};
+use move_bytecode_utils::Modules;
+use move_core_types::vm_status::StatusCode;
+use std::{ffi::OsStr, path::Path};
+
+/// Run sanity checks on storage and build dirs. This is primarily intended for testing the CLI;
+/// doctor should never fail unless `publish --ignore-breaking changes` is used or files under
+/// `storage` or `build` are modified manually. This runs the following checks:
+/// (1) all modules pass the bytecode verifier
+/// (2) all modules pass the linker
+/// (3) all resources can be deserialized
+/// (4) all events can be deserialized
+/// (5) build/mv_interfaces is consistent with the global storage (TODO?)
+pub fn doctor(state: &OnDiskStateView) -> Result<()> {
+    fn parent_addr(p: &Path) -> &OsStr {
+        p.parent().unwrap().parent().unwrap().file_name().unwrap()
+    }
+
+    // verify and link each module
+    let all_modules = state.get_all_modules()?;
+    let code_cache = Modules::new(&all_modules);
+    for module in &all_modules {
+        if move_bytecode_verifier::verify_module(module).is_err() {
+            bail!("Failed to verify module {:?}", module.self_id())
+        }
+
+        let imm_deps = code_cache.get_immediate_dependencies(&module.self_id())?;
+        if move_bytecode_verifier::dependencies::verify_module(module, imm_deps).is_err() {
+            bail!(
+                "Failed to link module {:?} against its dependencies",
+                module.self_id()
+            )
+        }
+
+        let cyclic_check_result = move_bytecode_verifier::cyclic_dependencies::verify_module(
+            module,
+            |module_id| {
+                code_cache
+                    .get_module(module_id)
+                    .map_err(|_| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+                    .map(|m| m.immediate_dependencies())
+            },
+            |module_id| {
+                code_cache
+                    .get_module(module_id)
+                    .map_err(|_| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+                    .map(|m| m.immediate_friends())
+            },
+        );
+        if let Err(cyclic_check_error) = cyclic_check_result {
+            // the only possible error in the CLI's context is CYCLIC_MODULE_DEPENDENCY
+            assert_eq!(
+                cyclic_check_error.major_status(),
+                StatusCode::CYCLIC_MODULE_DEPENDENCY
+            );
+            bail!(
+                "Cyclic module dependencies are detected with module {} in the loop",
+                module.self_id()
+            )
+        }
+    }
+    // deserialize each resource
+    for resource_path in state.resource_paths() {
+        let resource = state.view_resource(&resource_path);
+        if resource.is_err() {
+            bail!(
+                "Failed to deserialize resource {:?} stored under address {:?}",
+                resource_path.file_name().unwrap(),
+                parent_addr(&resource_path)
+            )
+        }
+    }
+    // deserialize each event
+    for event_path in state.event_paths() {
+        let event = state.view_events(&event_path);
+        if event.is_err() {
+            bail!(
+                "Failed to deserialize event {:?} stored under address {:?}",
+                event_path.file_name().unwrap(),
+                parent_addr(&event_path)
+            )
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/generate.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/generate.rs
new file mode 100644
index 000000000..0be34b33a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/generate.rs
@@ -0,0 +1,53 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use anyhow::{bail, Result};
+use move_bytecode_utils::layout::{SerdeLayoutBuilder, SerdeLayoutConfig};
+use move_core_types::{
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+};
+use std::path::Path;
+
+pub fn generate_struct_layouts(
+    path: &Path,
+    struct_opt: &Option<String>,
+    type_params_opt: &Option<Vec<TypeTag>>,
+    separator: Option<String>,
+    omit_addresses: bool,
+    ignore_phantom_types: bool,
+    shallow: bool,
+    state: &OnDiskStateView,
+) -> Result<()> {
+    if let Some(module_id) = state.get_module_id(path) {
+        if let Some(struct_) = struct_opt {
+            // Generate for one struct
+            let type_params = type_params_opt.as_ref().cloned().unwrap_or_default();
+            let name = Identifier::new(struct_.as_str())?;
+            let struct_tag = StructTag {
+                address: *module_id.address(),
+                module: module_id.name().to_owned(),
+                name,
+                type_params,
+            };
+            let mut layout_builder =
+                SerdeLayoutBuilder::new_with_config(&state, SerdeLayoutConfig {
+                    separator,
+                    omit_addresses,
+                    ignore_phantom_types,
+                    shallow,
+                });
+            layout_builder.build_struct_layout(&struct_tag)?;
+            let layout = serde_yaml::to_string(layout_builder.registry())?;
+            state.save_struct_layouts(&layout)?;
+            println!("{}", layout);
+        } else {
+            unimplemented!("Generating layout for all structs in a module. Use the --module and --struct options")
+        }
+        Ok(())
+    } else {
+        bail!("Can't resolve module at {:?}", path)
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/mod.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/mod.rs
new file mode 100644
index 000000000..452822c35
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/mod.rs
@@ -0,0 +1,16 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod doctor;
+pub mod generate;
+pub mod publish;
+pub mod run;
+pub mod test;
+pub mod view;
+
+pub use doctor::*;
+pub use publish::*;
+pub use run::*;
+pub use test::*;
+pub use view::*;
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/publish.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/publish.rs
new file mode 100644
index 000000000..3bc7db762
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/publish.rs
@@ -0,0 +1,180 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::utils::{
+        explain_publish_changeset, explain_publish_error, get_gas_status, module,
+        on_disk_state_view::OnDiskStateView,
+    },
+    NativeFunctionRecord,
+};
+use anyhow::{bail, Result};
+use move_binary_format::errors::Location;
+use move_command_line_common::env::get_bytecode_version_from_env;
+use move_package::compilation::compiled_package::CompiledPackage;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::collections::BTreeMap;
+
+pub fn publish(
+    natives: impl IntoIterator<Item = NativeFunctionRecord>,
+    cost_table: &CostTable,
+    state: &OnDiskStateView,
+    package: &CompiledPackage,
+    bytecode_version: Option<u32>,
+    no_republish: bool,
+    ignore_breaking_changes: bool,
+    with_deps: bool,
+    bundle: bool,
+    override_ordering: Option<&[String]>,
+    verbose: bool,
+) -> Result<()> {
+    // collect all modules compiled
+    let compiled_modules = if with_deps {
+        package.all_modules().collect::<Vec<_>>()
+    } else {
+        package.root_modules().collect::<Vec<_>>()
+    };
+    if verbose {
+        println!("Found {} modules", compiled_modules.len());
+    }
+
+    // order the modules for publishing
+    let modules_to_publish = match override_ordering {
+        Some(ordering) => {
+            let module_map: BTreeMap<_, _> = compiled_modules
+                .into_iter()
+                .map(|unit| (unit.unit.name().to_string(), unit))
+                .collect();
+
+            let mut ordered_modules = vec![];
+            for name in ordering {
+                match module_map.get(name) {
+                    None => bail!("Invalid module name in publish ordering: {}", name),
+                    Some(unit) => {
+                        ordered_modules.push(*unit);
+                    },
+                }
+            }
+            ordered_modules
+        },
+        None => compiled_modules,
+    };
+
+    if no_republish {
+        let republished = modules_to_publish
+            .iter()
+            .filter_map(|unit| {
+                let id = module(&unit.unit).ok()?.self_id();
+                if state.has_module(&id) {
+                    Some(format!("{}", id))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+
+        if !republished.is_empty() {
+            eprintln!("Failed to republish modules since the --no-republish flag is set. Tried to republish the following modules: {}",
+                republished.join(", "));
+            return Ok(());
+        }
+    }
+
+    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
+
+    // use the the publish_module API from the VM if we do not allow breaking changes
+    if !ignore_breaking_changes {
+        let vm = MoveVM::new(natives).unwrap();
+        let mut gas_status = get_gas_status(cost_table, None)?;
+        let mut session = vm.new_session(state);
+        let mut has_error = false;
+
+        if bundle {
+            // publish all modules together as a bundle
+            let mut sender_opt = None;
+            let mut module_bytes_vec = vec![];
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                module_bytes_vec.push(module_bytes);
+
+                let module_address = *module(&unit.unit)?.self_id().address();
+                match &sender_opt {
+                    None => {
+                        sender_opt = Some(module_address);
+                    },
+                    Some(val) => {
+                        if val != &module_address {
+                            bail!("All modules in the bundle must share the same address");
+                        }
+                    },
+                }
+            }
+            match sender_opt {
+                None => bail!("No modules to publish"),
+                Some(sender) => {
+                    let res =
+                        session.publish_module_bundle(module_bytes_vec, sender, &mut gas_status);
+                    if let Err(err) = res {
+                        println!("Invalid multi-module publishing: {}", err);
+                        if let Location::Module(module_id) = err.location() {
+                            // find the module where error occures and explain
+                            if let Some(unit) = modules_to_publish
+                                .into_iter()
+                                .find(|&x| x.unit.name().as_str() == module_id.name().as_str())
+                            {
+                                explain_publish_error(err, state, unit)?
+                            } else {
+                                println!("Unable to locate the module in the multi-module publishing error");
+                            }
+                        }
+                        has_error = true;
+                    }
+                },
+            }
+        } else {
+            // publish modules sequentially, one module at a time
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                let id = module(&unit.unit)?.self_id();
+                let sender = *id.address();
+
+                let res = session.publish_module(module_bytes, sender, &mut gas_status);
+                if let Err(err) = res {
+                    explain_publish_error(err, state, unit)?;
+                    has_error = true;
+                    break;
+                }
+            }
+        }
+
+        if !has_error {
+            let (changeset, events) = session.finish().map_err(|e| e.into_vm_status())?;
+            assert!(events.is_empty());
+            if verbose {
+                explain_publish_changeset(&changeset);
+            }
+            let modules: Vec<_> = changeset
+                .into_modules()
+                .map(|(module_id, blob_opt)| {
+                    (module_id, blob_opt.ok().expect("must be non-deletion"))
+                })
+                .collect();
+            state.save_modules(&modules)?;
+        }
+    } else {
+        // NOTE: the VM enforces the most strict way of module republishing and does not allow
+        // backward incompatible changes, as as result, if this flag is set, we skip the VM process
+        // and force the CLI to override the on-disk state directly
+        let mut serialized_modules = vec![];
+        for unit in modules_to_publish {
+            let id = module(&unit.unit)?.self_id();
+            let module_bytes = unit.unit.serialize(bytecode_version);
+            serialized_modules.push((id, module_bytes));
+        }
+        state.save_modules(&serialized_modules)?;
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/run.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/run.rs
new file mode 100644
index 000000000..1deabfebe
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/run.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    sandbox::utils::{
+        contains_module, explain_execution_effects, explain_execution_error, get_gas_status,
+        is_bytecode_file, maybe_commit_effects, on_disk_state_view::OnDiskStateView,
+    },
+    NativeFunctionRecord,
+};
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::file_format::CompiledModule;
+use move_command_line_common::env::get_bytecode_version_from_env;
+use move_core_types::{
+    account_address::AccountAddress,
+    errmap::ErrorMapping,
+    identifier::IdentStr,
+    language_storage::TypeTag,
+    transaction_argument::{convert_txn_args, TransactionArgument},
+    value::MoveValue,
+};
+use move_package::compilation::compiled_package::CompiledPackage;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{fs, path::Path};
+
+#[allow(clippy::too_many_arguments)]
+pub fn run(
+    natives: impl IntoIterator<Item = NativeFunctionRecord>,
+    cost_table: &CostTable,
+    error_descriptions: &ErrorMapping,
+    state: &OnDiskStateView,
+    package: &CompiledPackage,
+    script_path: &Path,
+    script_name_opt: &Option<String>,
+    signers: &[String],
+    txn_args: &[TransactionArgument],
+    vm_type_args: Vec<TypeTag>,
+    gas_budget: Option<u64>,
+    bytecode_version: Option<u32>,
+    dry_run: bool,
+    verbose: bool,
+) -> Result<()> {
+    if !script_path.exists() {
+        bail!("Script file {:?} does not exist", script_path)
+    };
+    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
+
+    let bytecode = if is_bytecode_file(script_path) {
+        assert!(
+            state.is_module_path(script_path) || !contains_module(script_path),
+            "Attempting to run module {:?} outside of the `storage/` directory.
+move run` must be applied to a module inside `storage/`",
+            script_path
+        );
+        // script bytecode; read directly from file
+        fs::read(script_path)?
+    } else {
+        // TODO(tzakian): support calling scripts in transitive deps
+        let file_contents = std::fs::read_to_string(script_path)?;
+        let script_opt = package
+            .scripts()
+            .find(|unit| unit.unit.source_map().check(&file_contents));
+        // script source file; package is already compiled so load it up
+        match script_opt {
+            Some(unit) => unit.unit.serialize(bytecode_version),
+            None => bail!("Unable to find script in file {:?}", script_path),
+        }
+    };
+
+    let signer_addresses = signers
+        .iter()
+        .map(|s| AccountAddress::from_hex_literal(s))
+        .collect::<Result<Vec<AccountAddress>, _>>()?;
+    // TODO: parse Value's directly instead of going through the indirection of TransactionArgument?
+    let vm_args: Vec<Vec<u8>> = convert_txn_args(txn_args);
+
+    let vm = MoveVM::new(natives).unwrap();
+    let mut gas_status = get_gas_status(cost_table, gas_budget)?;
+    let mut session = vm.new_session(state);
+
+    let script_type_parameters = vec![];
+    let script_parameters = vec![];
+    // TODO rethink move-cli arguments for executing functions
+    let vm_args = signer_addresses
+        .iter()
+        .map(|a| {
+            MoveValue::Signer(*a)
+                .simple_serialize()
+                .expect("transaction arguments must serialize")
+        })
+        .chain(vm_args)
+        .collect();
+    let res = match script_name_opt {
+        Some(script_name) => {
+            // script fun. parse module, extract script ID to pass to VM
+            let module = CompiledModule::deserialize(&bytecode)
+                .map_err(|e| anyhow!("Error deserializing module: {:?}", e))?;
+            session.execute_entry_function(
+                &module.self_id(),
+                IdentStr::new(script_name)?,
+                vm_type_args.clone(),
+                vm_args,
+                &mut gas_status,
+            )
+        },
+        None => session.execute_script(
+            bytecode.to_vec(),
+            vm_type_args.clone(),
+            vm_args,
+            &mut gas_status,
+        ),
+    };
+
+    if let Err(err) = res {
+        explain_execution_error(
+            error_descriptions,
+            err,
+            state,
+            &script_type_parameters,
+            &script_parameters,
+            &vm_type_args,
+            &signer_addresses,
+            txn_args,
+        )
+    } else {
+        let (changeset, events) = session.finish().map_err(|e| e.into_vm_status())?;
+        if verbose {
+            explain_execution_effects(&changeset, &events, state)?
+        }
+        maybe_commit_effects(!dry_run, changeset, events, state)
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/test.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/test.rs
new file mode 100644
index 000000000..81dc118e9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/test.rs
@@ -0,0 +1,392 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{sandbox::utils::module, DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
+use move_command_line_common::{
+    env::read_bool_env_var,
+    files::{find_filenames, path_to_string},
+    testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT},
+};
+use move_compiler::command_line::COLOR_MODE_ENV_VAR;
+use move_coverage::coverage_map::{CoverageMap, ExecCoverageMapWithModules};
+use move_package::{
+    compilation::{compiled_package::OnDiskCompiledPackage, package_layout::CompiledPackageLayout},
+    resolution::resolution_graph::ResolvedGraph,
+    source_package::{layout::SourcePackageLayout, manifest_parser::parse_move_manifest_from_file},
+    BuildConfig,
+};
+use std::{
+    collections::{BTreeMap, HashMap},
+    env,
+    fmt::Write as FmtWrite,
+    fs::{self, File},
+    io::{self, BufRead, Write},
+    path::{Path, PathBuf},
+    process::Command,
+};
+use tempfile::tempdir;
+
+/// Basic datatest testing framework for the CLI. The `run_one` entrypoint expects
+/// an `args.txt` file with arguments that the `move` binary understands (one set
+/// of arguments per line). The testing framework runs the commands, compares the
+/// result to the expected output, and runs `move clean` to discard resources,
+/// modules, and event data created by running the test.
+
+/// If this env var is set, `move clean` will not be run after each test.
+/// this is useful if you want to look at the `storage` or `move_events`
+/// produced by a test. However, you'll have to manually run `move clean`
+/// before re-running the test.
+const NO_MOVE_CLEAN: &str = "NO_MOVE_CLEAN";
+
+/// The filename that contains the arguments to the Move binary.
+pub const TEST_ARGS_FILENAME: &str = "args.txt";
+
+/// Name of the environment variable we need to set in order to get tracing
+/// enabled in the move VM.
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+/// The default file name (inside the build output dir) for the runtime to
+/// dump the execution trace to. The trace will be used by the coverage tool
+/// if --track-cov is set. If --track-cov is not set, then no trace file will
+/// be produced.
+const DEFAULT_TRACE_FILE: &str = "trace";
+
+fn collect_coverage(
+    trace_file: &Path,
+    build_dir: &Path,
+) -> anyhow::Result<ExecCoverageMapWithModules> {
+    let canonical_build = build_dir.canonicalize().unwrap();
+    let package_name = parse_move_manifest_from_file(
+        &SourcePackageLayout::try_find_root(&canonical_build).unwrap(),
+    )?
+    .package
+    .name
+    .to_string();
+    let pkg = OnDiskCompiledPackage::from_path(
+        &build_dir
+            .join(package_name)
+            .join(CompiledPackageLayout::BuildInfo.path()),
+    )?
+    .into_compiled_package()?;
+    let src_modules = pkg
+        .all_modules()
+        .map(|unit| {
+            let absolute_path = path_to_string(&unit.source_path.canonicalize()?)?;
+            Ok((absolute_path, module(&unit.unit)?.clone()))
+        })
+        .collect::<anyhow::Result<HashMap<_, _>>>()?;
+
+    // build the filter
+    let mut filter = BTreeMap::new();
+    for (entry, module) in src_modules.into_iter() {
+        let module_id = module.self_id();
+        filter
+            .entry(*module_id.address())
+            .or_insert_with(BTreeMap::new)
+            .insert(module_id.name().to_owned(), (entry, module));
+    }
+
+    // collect filtered trace
+    let coverage_map = CoverageMap::from_trace_file(trace_file)
+        .to_unified_exec_map()
+        .into_coverage_map_with_modules(filter);
+
+    Ok(coverage_map)
+}
+
+fn determine_package_nest_depth(
+    resolution_graph: &ResolvedGraph,
+    pkg_dir: &Path,
+) -> anyhow::Result<usize> {
+    let mut depth = 0;
+    for (_, dep) in resolution_graph.package_table.iter() {
+        depth = std::cmp::max(
+            depth,
+            dep.package_path.strip_prefix(pkg_dir)?.components().count() + 1,
+        );
+    }
+    Ok(depth)
+}
+
+fn pad_tmp_path(tmp_dir: &Path, pad_amount: usize) -> anyhow::Result<PathBuf> {
+    let mut tmp_dir = tmp_dir.to_path_buf();
+    for i in 0..pad_amount {
+        tmp_dir.push(format!("{}", i));
+    }
+    std::fs::create_dir_all(&tmp_dir)?;
+    Ok(tmp_dir)
+}
+
+// We need to copy dependencies over (transitively) and at the same time keep the paths valid in
+// the package. To do this we compute the resolution graph for all possible dependencies (so in dev
+// mode) and then calculate the nesting under `tmp_dir` the we need to copy the root package so
+// that it, and all its dependencies reside under `tmp_dir` with the same paths as in the original
+// package manifest.
+fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
+    // Sometimes we run a test that isn't a package for metatests so if there isn't a package we
+    // don't need to nest at all. Resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer.
+    let package_resolution = match (BuildConfig {
+        dev_mode: true,
+        ..Default::default()
+    })
+    .resolution_graph_for_package(pkg_dir, &mut Vec::new())
+    {
+        Ok(pkg) => pkg,
+        Err(_) => return Ok(tmp_dir.to_path_buf()),
+    };
+    let package_nest_depth = determine_package_nest_depth(&package_resolution, pkg_dir)?;
+    let tmp_dir = pad_tmp_path(tmp_dir, package_nest_depth)?;
+    for (_, dep) in package_resolution.package_table.iter() {
+        let source_dep_path = &dep.package_path;
+        let dest_dep_path = tmp_dir.join(dep.package_path.strip_prefix(pkg_dir).unwrap());
+        if !dest_dep_path.exists() {
+            fs::create_dir_all(&dest_dep_path)?;
+        }
+        simple_copy_dir(&dest_dep_path, source_dep_path)?;
+    }
+    Ok(tmp_dir)
+}
+
+fn simple_copy_dir(dst: &Path, src: &Path) -> io::Result<()> {
+    for entry in fs::read_dir(src)? {
+        let src_entry = entry?;
+        let src_entry_path = src_entry.path();
+        let dst_entry_path = dst.join(src_entry.file_name());
+        if src_entry_path.is_dir() {
+            fs::create_dir_all(&dst_entry_path)?;
+            simple_copy_dir(&dst_entry_path, &src_entry_path)?;
+        } else {
+            fs::copy(&src_entry_path, &dst_entry_path)?;
+        }
+    }
+    Ok(())
+}
+
+/// Run the `args_path` batch file with`cli_binary`
+pub fn run_one(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<Option<ExecCoverageMapWithModules>> {
+    let args_file = io::BufReader::new(File::open(args_path)?).lines();
+    let cli_binary_path = cli_binary.canonicalize()?;
+
+    // path where we will run the binary
+    let exe_dir = args_path.parent().unwrap();
+    let temp_dir = if use_temp_dir {
+        // symlink everything in the exe_dir into the temp_dir
+        let dir = tempdir()?;
+        let padded_dir = copy_deps(dir.path(), exe_dir)?;
+        simple_copy_dir(&padded_dir, exe_dir)?;
+        Some((dir, padded_dir))
+    } else {
+        None
+    };
+    let wks_dir = temp_dir.as_ref().map_or(exe_dir, |t| &t.1);
+
+    let storage_dir = wks_dir.join(DEFAULT_STORAGE_DIR);
+    let build_output = wks_dir
+        .join(DEFAULT_BUILD_DIR)
+        .join(CompiledPackageLayout::Root.path());
+
+    // template for preparing a cli command
+    let cli_command_template = || {
+        let mut command = Command::new(cli_binary_path.clone());
+        if let Some(work_dir) = temp_dir.as_ref() {
+            command.current_dir(&work_dir.1);
+        } else {
+            command.current_dir(exe_dir);
+        }
+        command
+    };
+
+    if storage_dir.exists() || build_output.exists() {
+        // need to clean before testing
+        cli_command_template()
+            .arg("sandbox")
+            .arg("clean")
+            .output()?;
+    }
+    let mut output = "".to_string();
+
+    // always use the absolute path for the trace file as we may change dirs in the process
+    let trace_file = if track_cov {
+        Some(wks_dir.canonicalize()?.join(DEFAULT_TRACE_FILE))
+    } else {
+        None
+    };
+
+    // Disable colors in error reporting from the Move compiler
+    env::set_var(COLOR_MODE_ENV_VAR, "NONE");
+    for args_line in args_file {
+        let args_line = args_line?;
+
+        if let Some(external_cmd) = args_line.strip_prefix('>') {
+            let external_cmd = external_cmd.trim_start();
+            let mut cmd_iter = external_cmd.split_ascii_whitespace();
+
+            let external_program = cmd_iter.next().expect("empty external command");
+
+            let mut command = Command::new(external_program);
+            command.args(cmd_iter);
+            if let Some(work_dir) = temp_dir.as_ref() {
+                command.current_dir(&work_dir.1);
+            } else {
+                command.current_dir(exe_dir);
+            }
+            let cmd_output = command.output()?;
+
+            writeln!(&mut output, "External Command `{}`:", external_cmd)?;
+            output += std::str::from_utf8(&cmd_output.stdout)?;
+            output += std::str::from_utf8(&cmd_output.stderr)?;
+
+            continue;
+        }
+
+        if args_line.starts_with('#') {
+            // allow comments in args.txt
+            continue;
+        }
+        let args_iter: Vec<&str> = args_line.split_whitespace().collect();
+        if args_iter.is_empty() {
+            // allow blank lines in args.txt
+            continue;
+        }
+
+        // enable tracing in the VM by setting the env var.
+        match &trace_file {
+            None => {
+                // this check prevents cascading the coverage tracking flag.
+                // in particular, if
+                //   1. we run with move-cli test <path-to-args-A.txt> --track-cov, and
+                //   2. in this <args-A.txt>, there is another command: test <args-B.txt>
+                // then, when running <args-B.txt>, coverage will not be tracked nor printed
+                env::remove_var(MOVE_VM_TRACING_ENV_VAR_NAME);
+            },
+            Some(path) => env::set_var(MOVE_VM_TRACING_ENV_VAR_NAME, path.as_os_str()),
+        }
+
+        let cmd_output = cli_command_template().args(args_iter).output()?;
+        writeln!(&mut output, "Command `{}`:", args_line)?;
+        output += std::str::from_utf8(&cmd_output.stdout)?;
+        output += std::str::from_utf8(&cmd_output.stderr)?;
+    }
+
+    // collect coverage information
+    let cov_info = match &trace_file {
+        None => None,
+        Some(trace_path) => {
+            if trace_path.exists() {
+                Some(collect_coverage(trace_path, &build_output)?)
+            } else {
+                eprintln!(
+                    "Trace file {:?} not found: coverage is only available with at least one `run` \
+                    command in the args.txt (after a `clean`, if there is one)",
+                    trace_path
+                );
+                None
+            }
+        },
+    };
+
+    // post-test cleanup and cleanup checks
+    // check that the test command didn't create a src dir
+    let run_move_clean = !read_bool_env_var(NO_MOVE_CLEAN);
+    if run_move_clean {
+        // run the clean command to ensure that temporary state is cleaned up
+        cli_command_template()
+            .arg("sandbox")
+            .arg("clean")
+            .output()?;
+
+        // check that build and storage was deleted
+        assert!(
+            !storage_dir.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_STORAGE_DIR
+        );
+        assert!(
+            !build_output.exists(),
+            "`move clean` failed to eliminate {} directory",
+            DEFAULT_BUILD_DIR
+        );
+
+        // clean the trace file as well if it exists
+        if let Some(trace_path) = &trace_file {
+            if trace_path.exists() {
+                fs::remove_file(trace_path)?;
+            }
+        }
+    }
+
+    // release the temporary workspace explicitly
+    if let Some((t, _)) = temp_dir {
+        t.close()?;
+    }
+
+    // compare output and exp_file
+    let update_baseline = read_env_update_baseline();
+    let exp_path = args_path.with_extension(EXP_EXT);
+    if update_baseline {
+        fs::write(exp_path, &output)?;
+        return Ok(cov_info);
+    }
+
+    let expected_output = fs::read_to_string(exp_path).unwrap_or_else(|_| "".to_string());
+    if expected_output != output {
+        let msg = format!(
+            "Expected output differs from actual output:\n{}",
+            format_diff(expected_output, output)
+        );
+        anyhow::bail!(add_update_baseline_fix(msg))
+    } else {
+        Ok(cov_info)
+    }
+}
+
+pub fn run_all(
+    args_path: &Path,
+    cli_binary: &Path,
+    use_temp_dir: bool,
+    track_cov: bool,
+) -> anyhow::Result<()> {
+    let mut test_total: u64 = 0;
+    let mut test_passed: u64 = 0;
+    let mut cov_info = ExecCoverageMapWithModules::empty();
+
+    // find `args.txt` and iterate over them
+    for entry in find_filenames(&[args_path], |fpath| {
+        fpath.file_name().expect("unexpected file entry path") == TEST_ARGS_FILENAME
+    })? {
+        match run_one(Path::new(&entry), cli_binary, use_temp_dir, track_cov) {
+            Ok(cov_opt) => {
+                test_passed = test_passed.checked_add(1).unwrap();
+                if let Some(cov) = cov_opt {
+                    cov_info.merge(cov);
+                }
+            },
+            Err(ex) => eprintln!("Test {} failed with error: {}", entry, ex),
+        }
+        test_total = test_total.checked_add(1).unwrap();
+    }
+    println!("{} / {} test(s) passed.", test_passed, test_total);
+
+    // if any test fails, bail
+    let test_failed = test_total.checked_sub(test_passed).unwrap();
+    if test_failed != 0 {
+        anyhow::bail!("{} / {} test(s) failed.", test_failed, test_total)
+    }
+
+    // show coverage information if requested
+    if track_cov {
+        let mut summary_writer: Box<dyn Write> = Box::new(io::stdout());
+        for (_, module_summary) in cov_info.into_module_summaries() {
+            module_summary.summarize_human(&mut summary_writer, true)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/commands/view.rs b/vendors/move/crates/tools/move-cli/src/sandbox/commands/view.rs
new file mode 100644
index 000000000..ae4525408
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/commands/view.rs
@@ -0,0 +1,41 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::{
+    contains_module, is_bytecode_file, on_disk_state_view::OnDiskStateView,
+};
+use anyhow::{bail, Result};
+use std::path::Path;
+/// Print a module or resource stored in `file`
+pub fn view(state: &OnDiskStateView, path: &Path) -> Result<()> {
+    if state.is_resource_path(path) {
+        match state.view_resource(path)? {
+            Some(resource) => println!("{}", resource),
+            None => println!("Resource not found."),
+        }
+    } else if state.is_event_path(path) {
+        let events = state.view_events(path)?;
+        if events.is_empty() {
+            println!("Events not found.")
+        } else {
+            for event in events {
+                println!("{}", event)
+            }
+        }
+    } else if is_bytecode_file(path) {
+        let bytecode_opt = if contains_module(path) {
+            OnDiskStateView::view_module(path)?
+        } else {
+            // bytecode extension, but not a module--assume it's a script
+            OnDiskStateView::view_script(path)?
+        };
+        match bytecode_opt {
+            Some(bytecode) => println!("{}", bytecode),
+            None => println!("Bytecode not found."),
+        }
+    } else {
+        bail!("`move view <file>` must point to a valid file under storage")
+    }
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/mod.rs b/vendors/move/crates/tools/move-cli/src/sandbox/mod.rs
new file mode 100644
index 000000000..e0034473c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod cli;
+pub mod commands;
+pub mod utils;
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/utils/mod.rs b/vendors/move/crates/tools/move-cli/src/sandbox/utils/mod.rs
new file mode 100644
index 000000000..867d3322c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/utils/mod.rs
@@ -0,0 +1,575 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
+use anyhow::{bail, Result};
+use colored::Colorize;
+use difference::{Changeset, Difference};
+use move_binary_format::{
+    access::ModuleAccess,
+    compatibility::Compatibility,
+    errors::VMError,
+    file_format::{AbilitySet, CompiledModule, FunctionDefinitionIndex, SignatureToken},
+    normalized, IndexKind,
+};
+use move_bytecode_utils::Modules;
+use move_command_line_common::files::{FileHash, MOVE_COMPILED_EXTENSION};
+use move_compiler::{
+    compiled_unit::{CompiledUnit, NamedCompiledModule},
+    diagnostics::{self, report_diagnostics, Diagnostic, Diagnostics, FileName},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event, Op},
+    errmap::ErrorMapping,
+    language_storage::{ModuleId, TypeTag},
+    transaction_argument::TransactionArgument,
+    vm_status::{AbortLocation, StatusCode, VMStatus},
+};
+use move_ir_types::location::Loc;
+use move_package::compilation::compiled_package::CompiledUnitWithSource;
+use move_resource_viewer::{AnnotatedMoveStruct, MoveValueAnnotator};
+use move_vm_test_utils::gas_schedule::Gas;
+use std::{
+    collections::{BTreeMap, HashMap},
+    fs,
+    path::Path,
+};
+
+pub mod on_disk_state_view;
+pub mod package_context;
+
+use move_bytecode_utils::module_cache::GetModule;
+use move_vm_test_utils::gas_schedule::{CostTable, GasStatus};
+pub use on_disk_state_view::*;
+pub use package_context::*;
+
+pub fn get_gas_status(cost_table: &CostTable, gas_budget: Option<u64>) -> Result<GasStatus> {
+    let gas_status = if let Some(gas_budget) = gas_budget {
+        // TODO(Gas): This should not be hardcoded.
+        let max_gas_budget = u64::MAX.checked_div(1000).unwrap();
+        if gas_budget >= max_gas_budget {
+            bail!("Gas budget set too high; maximum is {}", max_gas_budget)
+        }
+        GasStatus::new(cost_table, Gas::new(gas_budget))
+    } else {
+        // no budget specified. Disable gas metering
+        GasStatus::new_unmetered()
+    };
+    Ok(gas_status)
+}
+
+pub(crate) fn module(unit: &CompiledUnit) -> Result<&CompiledModule> {
+    match unit {
+        CompiledUnit::Module(NamedCompiledModule { module, .. }) => Ok(module),
+        _ => bail!("Found script in modules -- this shouldn't happen"),
+    }
+}
+
+pub(crate) fn explain_publish_changeset(changeset: &ChangeSet) {
+    // publish effects should contain no resources
+    assert!(changeset.resources().next().is_none());
+    // total bytes written across all accounts
+    let mut total_bytes_written = 0;
+    for (addr, name, blob_op) in changeset.modules() {
+        match blob_op {
+            Op::New(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
+                println!(
+                    "Publishing a new module {} (wrote {:?} bytes)",
+                    module_id, bytes_written
+                );
+            },
+            Op::Modify(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
+                println!(
+                    "Updating an existing module {} (wrote {:?} bytes)",
+                    module_id, bytes_written
+                );
+            },
+            Op::Delete => {
+                panic!("Deleting a module is not supported")
+            },
+        }
+    }
+    println!(
+        "Wrote {:?} bytes of module ID's and code",
+        total_bytes_written
+    )
+}
+
+// Print a struct with a specified outer indent
+fn print_struct_with_indent(value: &AnnotatedMoveStruct, indent: u64) {
+    let indent_str: String = (0..indent).map(|_| " ").collect::<String>();
+    let value_str = format!("{}", value);
+    let lines = value_str.split('\n');
+    for line in lines {
+        println!("{}{}", indent_str, line)
+    }
+}
+
+// Print struct diff with a specified outer indent
+fn print_struct_diff_with_indent(
+    value1: &AnnotatedMoveStruct,
+    value2: &AnnotatedMoveStruct,
+    indent: u64,
+) {
+    let indent_str: String = (0..indent).map(|_| " ").collect::<String>();
+    let prev_str = format!("{}", value1);
+    let new_str = format!("{}", value2);
+
+    let Changeset { diffs, .. } = Changeset::new(&prev_str, &new_str, "\n");
+
+    for diff in diffs {
+        match diff {
+            Difference::Same(ref x) => {
+                let lines = x.split('\n');
+                for line in lines {
+                    println!(" {}{}", indent_str, line);
+                }
+            },
+            Difference::Add(ref x) => {
+                let lines = x.split('\n');
+                for line in lines {
+                    println!("{}{}{}", "+".green(), indent_str, line.green());
+                }
+            },
+            Difference::Rem(ref x) => {
+                let lines = x.split('\n');
+                for line in lines {
+                    println!("{}{}{}", "-".red(), indent_str, line.red());
+                }
+            },
+        }
+    }
+}
+
+pub(crate) fn explain_execution_effects(
+    changeset: &ChangeSet,
+    events: &[Event],
+    state: &OnDiskStateView,
+) -> Result<()> {
+    // execution effects should contain no modules
+    assert!(changeset.modules().next().is_none());
+    if !events.is_empty() {
+        println!("Emitted {:?} events:", events.len());
+        // TODO: better event printing
+        for (event_key, event_sequence_number, _event_type, event_data) in events {
+            println!(
+                "Emitted {:?} as the {}th event to stream {:?}",
+                event_data, event_sequence_number, event_key
+            )
+        }
+    }
+    if !changeset.accounts().is_empty() {
+        println!(
+            "Changed resource(s) under {:?} address(es):",
+            changeset.accounts().len()
+        );
+    }
+    // total bytes written across all accounts
+    let mut total_bytes_written = 0;
+    for (addr, account) in changeset.accounts() {
+        print!("  ");
+        if account.resources().is_empty() {
+            continue;
+        }
+        println!(
+            "Changed {:?} resource(s) under address {:?}:",
+            account.resources().len(),
+            addr
+        );
+        for (struct_tag, write_op) in account.resources() {
+            print!("    ");
+            let mut bytes_to_write = struct_tag.access_vector().len();
+            match write_op {
+                Op::New(blob) => {
+                    bytes_to_write += blob.len();
+                    println!(
+                        "Added type {}: {:?} (wrote {:?} bytes)",
+                        struct_tag, blob, bytes_to_write
+                    );
+                    // Print new resource
+                    let resource =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
+                    print_struct_with_indent(&resource, 6)
+                },
+                Op::Modify(blob) => {
+                    bytes_to_write += blob.len();
+                    println!(
+                        "Changed type {}: {:?} (wrote {:?} bytes)",
+                        struct_tag, blob, bytes_to_write
+                    );
+                    // Print resource diff
+                    let resource_data = state
+                        .get_resource_bytes(*addr, struct_tag.clone())?
+                        .unwrap();
+                    let resource_old =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, &resource_data)?;
+                    let resource_new =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
+
+                    print_struct_diff_with_indent(&resource_old, &resource_new, 8)
+                },
+                Op::Delete => {
+                    println!(
+                        "Deleted type {} (wrote {:?} bytes)",
+                        struct_tag, bytes_to_write
+                    );
+                    // Print deleted resource
+                    let resource_data = state
+                        .get_resource_bytes(*addr, struct_tag.clone())?
+                        .unwrap();
+                    let resource_old =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, &resource_data)?;
+                    print_struct_with_indent(&resource_old, 6);
+                },
+            };
+            total_bytes_written += bytes_to_write;
+        }
+    }
+    if total_bytes_written != 0 {
+        println!(
+            "Wrote {:?} bytes of resource ID's and data",
+            total_bytes_written
+        );
+    }
+
+    Ok(())
+}
+
+/// Commit the resources and events modified by a transaction to disk
+pub(crate) fn maybe_commit_effects(
+    commit: bool,
+    changeset: ChangeSet,
+    events: Vec<Event>,
+    state: &OnDiskStateView,
+) -> Result<()> {
+    // similar to explain effects, all module publishing happens via save_modules(), so effects
+    // shouldn't contain modules
+    if commit {
+        for (addr, account) in changeset.into_inner() {
+            for (struct_tag, blob_op) in account.into_resources() {
+                match blob_op {
+                    Op::New(blob) | Op::Modify(blob) => {
+                        state.save_resource(addr, struct_tag, &blob)?
+                    },
+                    Op::Delete => state.delete_resource(addr, struct_tag)?,
+                }
+            }
+        }
+
+        for (event_key, event_sequence_number, event_type, event_data) in events {
+            state.save_event(&event_key, event_sequence_number, event_type, event_data)?
+        }
+    } else if !(changeset.resources().next().is_none() && events.is_empty()) {
+        println!("Discarding changes; re-run without --dry-run if you would like to keep them.")
+    }
+
+    Ok(())
+}
+
+pub(crate) fn explain_type_error(
+    script_params: &[SignatureToken],
+    signers: &[AccountAddress],
+    txn_args: &[TransactionArgument],
+) {
+    use SignatureToken::*;
+    let expected_num_signers = script_params
+        .iter()
+        .filter(|t| match t {
+            Reference(r) => r.is_signer(),
+            _ => false,
+        })
+        .count();
+    if expected_num_signers != signers.len() {
+        println!(
+            "Execution failed with incorrect number of signers: script expected {:?}, but found \
+             {:?}",
+            expected_num_signers,
+            signers.len()
+        );
+        return;
+    }
+
+    // TODO: printing type(s) of missing arguments could be useful
+    let expected_num_args = script_params.len() - signers.len();
+    if expected_num_args != txn_args.len() {
+        println!(
+            "Execution failed with incorrect number of arguments: script expected {:?}, but found \
+             {:?}",
+            expected_num_args,
+            txn_args.len()
+        );
+        return;
+    }
+
+    // TODO: print more helpful error message pinpointing the (argument, type)
+    // pair that didn't match
+    println!("Execution failed with type error when binding type arguments to type parameters")
+}
+
+pub(crate) fn explain_publish_error(
+    error: VMError,
+    state: &OnDiskStateView,
+    unit: &CompiledUnitWithSource,
+) -> Result<()> {
+    use StatusCode::*;
+    let mut files = HashMap::new();
+    let file_contents = std::fs::read_to_string(&unit.source_path)?;
+    let file_hash = FileHash::new(&file_contents);
+    files.insert(
+        file_hash,
+        (
+            FileName::from(unit.source_path.to_string_lossy()),
+            file_contents,
+        ),
+    );
+
+    let module = module(&unit.unit)?;
+    let module_id = module.self_id();
+    let error_clone = error.clone();
+    match error.into_vm_status() {
+        VMStatus::Error(DUPLICATE_MODULE_NAME, _) => {
+            println!(
+                "Module {} exists already. Re-run without --no-republish to publish anyway.",
+                module_id
+            );
+        },
+        VMStatus::Error(BACKWARD_INCOMPATIBLE_MODULE_UPDATE, _) => {
+            println!("Breaking change detected--publishing aborted. Re-run with --ignore-breaking-changes to publish anyway.");
+
+            let old_module = state.get_module_by_id(&module_id)?.unwrap();
+            let old_api = normalized::Module::new(&old_module);
+            let new_api = normalized::Module::new(module);
+
+            if Compatibility::new(false, true, false)
+                .check(&old_api, &new_api)
+                .is_err()
+            {
+                // TODO: we could choose to make this more precise by walking the global state and looking for published
+                // structs of this type. but probably a bad idea
+                println!("Layout API for structs of module {} has changed. Need to do a data migration of published structs", module_id)
+            } else if Compatibility::new(true, false, false)
+                .check(&old_api, &new_api)
+                .is_err()
+            {
+                // TODO: this will report false positives if we *are* simultaneously redeploying all dependent modules.
+                // but this is not easy to check without walking the global state and looking for everything
+                println!("Linking API for structs/functions of module {} has changed. Need to redeploy all dependent modules.", module_id)
+            }
+        },
+        VMStatus::Error(CYCLIC_MODULE_DEPENDENCY, _) => {
+            println!(
+                "Publishing module {} introduces cyclic dependencies.",
+                module_id
+            );
+            // find all cycles with an iterative DFS
+            let all_modules = state.get_all_modules()?;
+            let code_cache = Modules::new(&all_modules);
+
+            let mut stack = vec![];
+            let mut state = BTreeMap::new();
+            state.insert(module_id.clone(), true);
+            for dep in module.immediate_dependencies() {
+                stack.push((code_cache.get_module(&dep)?, false));
+            }
+
+            while !stack.is_empty() {
+                let (cur, is_exit) = stack.pop().unwrap();
+                let cur_id = cur.self_id();
+                if is_exit {
+                    state.insert(cur_id, false);
+                } else {
+                    state.insert(cur_id, true);
+                    stack.push((cur, true));
+                    for next in cur.immediate_dependencies() {
+                        if let Some(is_discovered_but_not_finished) = state.get(&next) {
+                            if *is_discovered_but_not_finished {
+                                let cycle_path: Vec<_> = stack
+                                    .iter()
+                                    .filter(|(_, is_exit)| *is_exit)
+                                    .map(|(m, _)| m.self_id().to_string())
+                                    .collect();
+                                println!(
+                                    "Cycle detected: {} -> {} -> {}",
+                                    module_id,
+                                    cycle_path.join(" -> "),
+                                    module_id,
+                                );
+                            }
+                        } else {
+                            stack.push((code_cache.get_module(&next)?, false));
+                        }
+                    }
+                }
+            }
+            println!("Re-run with --ignore-breaking-changes to publish anyway.")
+        },
+        VMStatus::Error(MISSING_DEPENDENCY, _) => {
+            let err_indices = error_clone.indices();
+            let mut diags = Diagnostics::new();
+            for (ind_kind, table_ind) in err_indices {
+                if let IndexKind::FunctionHandle = ind_kind {
+                    let native_function = &(module.function_defs())[*table_ind as usize];
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    let function_source_map = unit
+                        .unit
+                        .source_map()
+                        .get_function_source_map(FunctionDefinitionIndex(*table_ind));
+                    if let Ok(map) = function_source_map {
+                        let err_string = format!(
+                            "Missing implementation for the native function {}::{}",
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str()
+                        );
+                        let diag = Diagnostic::new(
+                            diagnostics::codes::Declarations::InvalidFunction,
+                            (map.definition_location, err_string),
+                            Vec::<(Loc, String)>::new(),
+                            Vec::<String>::new(),
+                        );
+                        diags.add(diag);
+                    }
+                }
+            }
+            report_diagnostics(&files, diags)
+        },
+        VMStatus::Error(status_code, _) => {
+            println!("Publishing failed with unexpected error {:?}", status_code)
+        },
+        VMStatus::Executed | VMStatus::MoveAbort(..) | VMStatus::ExecutionFailure { .. } => {
+            unreachable!()
+        },
+    }
+
+    Ok(())
+}
+
+/// Explain an execution error
+pub(crate) fn explain_execution_error(
+    error_descriptions: &ErrorMapping,
+    error: VMError,
+    state: &OnDiskStateView,
+    script_type_parameters: &[AbilitySet],
+    script_parameters: &[SignatureToken],
+    vm_type_args: &[TypeTag],
+    signers: &[AccountAddress],
+    txn_args: &[TransactionArgument],
+) -> Result<()> {
+    use StatusCode::*;
+    match error.into_vm_status() {
+        VMStatus::MoveAbort(AbortLocation::Module(id), abort_code) => {
+            // try to use move-explain to explain the abort
+
+            print!(
+                "Execution aborted with code {} in module {}.",
+                abort_code, id
+            );
+
+            if let Some(error_desc) = error_descriptions.get_explanation(&id, abort_code) {
+                println!(
+                    " Abort code details:\nName: {}\nDescription:{}",
+                    error_desc.code_name, error_desc.code_description,
+                )
+            } else {
+                println!()
+            }
+        },
+        VMStatus::MoveAbort(AbortLocation::Script, abort_code) => {
+            // TODO: map to source code location
+            println!(
+                "Execution aborted with code {} in transaction script",
+                abort_code
+            )
+        },
+        VMStatus::ExecutionFailure {
+            status_code,
+            location,
+            function,
+            code_offset,
+            ..
+        } => {
+            let status_explanation = match status_code {
+                RESOURCE_ALREADY_EXISTS => "a RESOURCE_ALREADY_EXISTS error (i.e., \
+                                            `move_to<T>(account)` when there is already a \
+                                            resource of type `T` under `account`)"
+                    .to_string(),
+                MISSING_DATA => "a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, \
+                                 `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there \
+                                 is no resource of type `T` at address `a`)"
+                    .to_string(),
+                ARITHMETIC_ERROR => "an arithmetic error (i.e., integer overflow/underflow, \
+                                     div/mod by zero, or invalid shift)"
+                    .to_string(),
+                VECTOR_OPERATION_ERROR => "an error originated from vector operations (i.e., \
+                                           index out of bound, pop an empty vector, or unpack a \
+                                           vector with a wrong parity)"
+                    .to_string(),
+                EXECUTION_STACK_OVERFLOW => "an execution stack overflow".to_string(),
+                CALL_STACK_OVERFLOW => "a call stack overflow".to_string(),
+                OUT_OF_GAS => "an out of gas error".to_string(),
+                _ => format!("a {} error", status_code.status_type()),
+            };
+            // TODO: map to source code location
+            let location_explanation = match location {
+                AbortLocation::Module(id) => {
+                    format!(
+                        "{}::{}",
+                        id,
+                        state.resolve_function(&id, function)?.unwrap()
+                    )
+                },
+                AbortLocation::Script => "script".to_string(),
+            };
+            println!(
+                "Execution failed because of {} in {} at code offset {}",
+                status_explanation, location_explanation, code_offset
+            )
+        },
+        VMStatus::Error(NUMBER_OF_TYPE_ARGUMENTS_MISMATCH, _) => println!(
+            "Execution failed with incorrect number of type arguments: script expected {:?}, but \
+             found {:?}",
+            script_type_parameters.len(),
+            vm_type_args.len()
+        ),
+        VMStatus::Error(TYPE_MISMATCH, _) => {
+            explain_type_error(script_parameters, signers, txn_args)
+        },
+        VMStatus::Error(LINKER_ERROR, _) => {
+            // TODO: is this the only reason we can see LINKER_ERROR?
+            // Can we also see it if someone manually deletes modules in storage?
+            println!(
+                "Execution failed due to unresolved type argument(s) (i.e., `--type-args \
+                 0x1::M:T` when there is no module named M at 0x1 or no type named T in module \
+                 0x1::M)"
+            );
+        },
+        VMStatus::Error(status_code, _) => {
+            println!("Execution failed with unexpected error {:?}", status_code)
+        },
+        VMStatus::Executed => unreachable!(),
+    }
+    Ok(())
+}
+
+/// Return `true` if `path` is a Move bytecode file based on its extension
+pub(crate) fn is_bytecode_file(path: &Path) -> bool {
+    path.extension()
+        .map_or(false, |ext| ext == MOVE_COMPILED_EXTENSION)
+}
+
+/// Return `true` if path contains a valid Move bytecode module
+pub(crate) fn contains_module(path: &Path) -> bool {
+    is_bytecode_file(path)
+        && match fs::read(path) {
+            Ok(bytes) => CompiledModule::deserialize(&bytes).is_ok(),
+            Err(_) => false,
+        }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs b/vendors/move/crates/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
new file mode 100644
index 000000000..ec85f30f1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
@@ -0,0 +1,488 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{BCS_EXTENSION, DEFAULT_BUILD_DIR, DEFAULT_STORAGE_DIR};
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript, FunctionDefinitionIndex},
+};
+use move_bytecode_utils::module_cache::GetModule;
+use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    parser,
+    resolver::{ModuleResolver, ResourceResolver},
+};
+use move_disassembler::disassembler::Disassembler;
+use move_ir_types::location::Spanned;
+use move_resource_viewer::{AnnotatedMoveStruct, AnnotatedMoveValue, MoveValueAnnotator};
+use std::{
+    convert::{TryFrom, TryInto},
+    fmt::Debug,
+    fs,
+    path::{Path, PathBuf},
+};
+
+type Event = (Vec<u8>, u64, TypeTag, Vec<u8>);
+
+/// subdirectory of `DEFAULT_STORAGE_DIR/<addr>` where resources are stored
+pub const RESOURCES_DIR: &str = "resources";
+/// subdirectory of `DEFAULT_STORAGE_DIR/<addr>` where modules are stored
+pub const MODULES_DIR: &str = "modules";
+/// subdirectory of `DEFAULT_STORAGE_DIR/<addr>` where events are stored
+pub const EVENTS_DIR: &str = "events";
+
+/// file under `DEFAULT_BUILD_DIR` where a registry of generated struct layouts are stored
+pub const STRUCT_LAYOUTS_FILE: &str = "struct_layouts.yaml";
+
+#[derive(Debug)]
+pub struct OnDiskStateView {
+    build_dir: PathBuf,
+    storage_dir: PathBuf,
+}
+
+impl OnDiskStateView {
+    /// Create an `OnDiskStateView` that reads/writes resource data and modules in `storage_dir`.
+    pub fn create<P: Into<PathBuf>>(build_dir: P, storage_dir: P) -> Result<Self> {
+        let build_dir = build_dir.into();
+        if !build_dir.exists() {
+            fs::create_dir_all(&build_dir)?;
+        }
+
+        let storage_dir = storage_dir.into();
+        if !storage_dir.exists() {
+            fs::create_dir_all(&storage_dir)?;
+        }
+
+        Ok(Self {
+            build_dir,
+            // it is important to canonicalize the path here because `is_data_path()` relies on the
+            // fact that storage_dir is canonicalized.
+            storage_dir: storage_dir.canonicalize()?,
+        })
+    }
+
+    pub fn build_dir(&self) -> &PathBuf {
+        &self.build_dir
+    }
+
+    pub fn struct_layouts_file(&self) -> PathBuf {
+        self.build_dir.join(STRUCT_LAYOUTS_FILE)
+    }
+
+    fn is_data_path(&self, p: &Path, parent_dir: &str) -> bool {
+        if !p.exists() {
+            return false;
+        }
+        let p = p.canonicalize().unwrap();
+        p.starts_with(&self.storage_dir)
+            && match p.parent() {
+                Some(parent) => parent.ends_with(parent_dir),
+                None => false,
+            }
+    }
+
+    pub fn is_resource_path(&self, p: &Path) -> bool {
+        self.is_data_path(p, RESOURCES_DIR)
+    }
+
+    pub fn is_event_path(&self, p: &Path) -> bool {
+        self.is_data_path(p, EVENTS_DIR)
+    }
+
+    pub fn is_module_path(&self, p: &Path) -> bool {
+        self.is_data_path(p, MODULES_DIR)
+    }
+
+    fn get_addr_path(&self, addr: &AccountAddress) -> PathBuf {
+        let mut path = self.storage_dir.clone();
+        path.push(format!("0x{}", addr));
+        path
+    }
+
+    fn get_resource_path(&self, addr: AccountAddress, tag: StructTag) -> PathBuf {
+        let mut path = self.get_addr_path(&addr);
+        path.push(RESOURCES_DIR);
+        path.push(StructID(tag).to_string());
+        path.with_extension(BCS_EXTENSION)
+    }
+
+    // Events are stored under address/handle creation number
+    fn get_event_path(&self, key: &[u8]) -> PathBuf {
+        // TODO: this is a hacky way to get the account address and creation number from the event key.
+        // The root problem here is that the move-cli is using the Diem-specific event format.
+        // We will deal this later when we make events more generic in the Move VM.
+        let account_addr = AccountAddress::try_from(&key[8..])
+            .expect("failed to get account address from event key");
+        let creation_number = u64::from_le_bytes(key[..8].try_into().unwrap());
+        let mut path = self.get_addr_path(&account_addr);
+        path.push(EVENTS_DIR);
+        path.push(creation_number.to_string());
+        path.with_extension(BCS_EXTENSION)
+    }
+
+    fn get_module_path(&self, module_id: &ModuleId) -> PathBuf {
+        let mut path = self.get_addr_path(module_id.address());
+        path.push(MODULES_DIR);
+        path.push(module_id.name().to_string());
+        path.with_extension(MOVE_COMPILED_EXTENSION)
+    }
+
+    /// Extract a module ID from a path
+    pub fn get_module_id(&self, p: &Path) -> Option<ModuleId> {
+        if !self.is_module_path(p) {
+            return None;
+        }
+        let name = Identifier::new(p.file_stem().unwrap().to_str().unwrap()).unwrap();
+        match p.parent().and_then(|parent| parent.parent()) {
+            Some(parent) => {
+                let addr =
+                    AccountAddress::from_hex_literal(parent.file_stem().unwrap().to_str().unwrap())
+                        .unwrap();
+                Some(ModuleId::new(addr, name))
+            },
+            None => None,
+        }
+    }
+
+    /// Read the resource bytes stored on-disk at `addr`/`tag`
+    pub fn get_resource_bytes(
+        &self,
+        addr: AccountAddress,
+        tag: StructTag,
+    ) -> Result<Option<Vec<u8>>> {
+        Self::get_bytes(&self.get_resource_path(addr, tag))
+    }
+
+    /// Read the resource bytes stored on-disk at `addr`/`tag`
+    fn get_module_bytes(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>> {
+        Self::get_bytes(&self.get_module_path(module_id))
+    }
+
+    /// Check if a module at `addr`/`module_id` exists
+    pub fn has_module(&self, module_id: &ModuleId) -> bool {
+        self.get_module_path(module_id).exists()
+    }
+
+    /// Return the name of the function at `idx` in `module_id`
+    pub fn resolve_function(&self, module_id: &ModuleId, idx: u16) -> Result<Option<Identifier>> {
+        if let Some(m) = self.get_module_by_id(module_id)? {
+            Ok(Some(
+                m.identifier_at(
+                    m.function_handle_at(m.function_def_at(FunctionDefinitionIndex(idx)).function)
+                        .name,
+                )
+                .to_owned(),
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn get_bytes(path: &Path) -> Result<Option<Vec<u8>>> {
+        Ok(if path.exists() {
+            Some(fs::read(path)?)
+        } else {
+            None
+        })
+    }
+
+    /// Returns a deserialized representation of the resource value stored at `resource_path`.
+    /// Returns Err if the path does not hold a resource value or the resource cannot be deserialized
+    pub fn view_resource(&self, resource_path: &Path) -> Result<Option<AnnotatedMoveStruct>> {
+        if resource_path.is_dir() {
+            bail!(
+                "Bad resource path {:?}. Needed file, found directory",
+                resource_path
+            )
+        }
+        match resource_path.file_stem() {
+            None => bail!(
+                "Bad resource path {:?}; last component must be a file",
+                resource_path
+            ),
+            Some(name) => Ok({
+                let id = match parser::parse_type_tag(&name.to_string_lossy())? {
+                    TypeTag::Struct(s) => s,
+                    t => bail!("Expected to parse struct tag, but got {}", t),
+                };
+                match Self::get_bytes(resource_path)? {
+                    Some(resource_data) => {
+                        Some(MoveValueAnnotator::new(self).view_resource(&id, &resource_data)?)
+                    },
+                    None => None,
+                }
+            }),
+        }
+    }
+
+    fn get_events(&self, events_path: &Path) -> Result<Vec<Event>> {
+        Ok(if events_path.exists() {
+            match Self::get_bytes(events_path)? {
+                Some(events_data) => bcs::from_bytes::<Vec<Event>>(&events_data)?,
+                None => vec![],
+            }
+        } else {
+            vec![]
+        })
+    }
+
+    pub fn view_events(&self, events_path: &Path) -> Result<Vec<AnnotatedMoveValue>> {
+        let annotator = MoveValueAnnotator::new(self);
+        self.get_events(events_path)?
+            .iter()
+            .map(|(_, _, event_type, event_data)| annotator.view_value(event_type, event_data))
+            .collect()
+    }
+
+    fn view_bytecode(path: &Path, is_module: bool) -> Result<Option<String>> {
+        if path.is_dir() {
+            bail!("Bad bytecode path {:?}. Needed file, found directory", path)
+        }
+
+        Ok(match Self::get_bytes(path)? {
+            Some(bytes) => {
+                let module: CompiledModule;
+                let script: CompiledScript;
+                let view = if is_module {
+                    module = CompiledModule::deserialize(&bytes)
+                        .map_err(|e| anyhow!("Failure deserializing module: {:?}", e))?;
+                    BinaryIndexedView::Module(&module)
+                } else {
+                    script = CompiledScript::deserialize(&bytes)
+                        .map_err(|e| anyhow!("Failure deserializing script: {:?}", e))?;
+                    BinaryIndexedView::Script(&script)
+                };
+                // TODO: find or create source map and pass it to disassembler
+                let d: Disassembler =
+                    Disassembler::from_view(view, Spanned::unsafe_no_loc(()).loc)?;
+                Some(d.disassemble()?)
+            },
+            None => None,
+        })
+    }
+
+    pub fn view_module(module_path: &Path) -> Result<Option<String>> {
+        Self::view_bytecode(module_path, true)
+    }
+
+    pub fn view_script(script_path: &Path) -> Result<Option<String>> {
+        Self::view_bytecode(script_path, false)
+    }
+
+    /// Delete resource stored on disk at the path `addr`/`tag`
+    pub fn delete_resource(&self, addr: AccountAddress, tag: StructTag) -> Result<()> {
+        let path = self.get_resource_path(addr, tag);
+        fs::remove_file(path)?;
+
+        // delete addr directory if this address is now empty
+        let addr_path = self.get_addr_path(&addr);
+        if addr_path.read_dir()?.next().is_none() {
+            fs::remove_dir(addr_path)?
+        }
+        Ok(())
+    }
+
+    pub fn save_resource(
+        &self,
+        addr: AccountAddress,
+        tag: StructTag,
+        bcs_bytes: &[u8],
+    ) -> Result<()> {
+        let path = self.get_resource_path(addr, tag);
+        if !path.exists() {
+            fs::create_dir_all(path.parent().unwrap())?;
+        }
+        Ok(fs::write(path, bcs_bytes)?)
+    }
+
+    pub fn save_event(
+        &self,
+        event_key: &[u8],
+        event_sequence_number: u64,
+        event_type: TypeTag,
+        event_data: Vec<u8>,
+    ) -> Result<()> {
+        // save event data in handle_address/EVENTS_DIR/handle_number
+        let path = self.get_event_path(event_key);
+        if !path.exists() {
+            fs::create_dir_all(path.parent().unwrap())?;
+        }
+        // grab the old event log (if any) and append this event to it
+        let mut event_log = self.get_events(&path)?;
+        event_log.push((
+            event_key.to_vec(),
+            event_sequence_number,
+            event_type,
+            event_data,
+        ));
+        Ok(fs::write(path, bcs::to_bytes(&event_log)?)?)
+    }
+
+    /// Save `module` on disk under the path `module.address()`/`module.name()`
+    pub fn save_module(&self, module_id: &ModuleId, module_bytes: &[u8]) -> Result<()> {
+        let path = self.get_module_path(module_id);
+        if !path.exists() {
+            fs::create_dir_all(path.parent().unwrap())?
+        }
+        Ok(fs::write(path, module_bytes)?)
+    }
+
+    /// Save the YAML encoding `layout` on disk under `build_dir/layouts/id`.
+    pub fn save_struct_layouts(&self, layouts: &str) -> Result<()> {
+        let layouts_file = self.struct_layouts_file();
+        if !layouts_file.exists() {
+            fs::create_dir_all(layouts_file.parent().unwrap())?
+        }
+        Ok(fs::write(layouts_file, layouts)?)
+    }
+
+    /// Save all the modules in the local cache, re-generate mv_interfaces if required.
+    pub fn save_modules<'a>(
+        &self,
+        modules: impl IntoIterator<Item = &'a (ModuleId, Vec<u8>)>,
+    ) -> Result<()> {
+        for (module_id, module_bytes) in modules {
+            self.save_module(module_id, module_bytes)?;
+        }
+        Ok(())
+    }
+
+    pub fn delete_module(&self, id: &ModuleId) -> Result<()> {
+        let path = self.get_module_path(id);
+        fs::remove_file(path)?;
+
+        // delete addr directory if this address is now empty
+        let addr_path = self.get_addr_path(id.address());
+        if addr_path.read_dir()?.next().is_none() {
+            fs::remove_dir(addr_path)?
+        }
+        Ok(())
+    }
+
+    fn iter_paths<F>(&self, f: F) -> impl Iterator<Item = PathBuf>
+    where
+        F: FnOnce(&Path) -> bool + Copy,
+    {
+        walkdir::WalkDir::new(&self.storage_dir)
+            .follow_links(true)
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .map(|e| e.path().to_path_buf())
+            .filter(move |path| f(path))
+    }
+
+    pub fn resource_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
+        self.iter_paths(move |p| self.is_resource_path(p))
+    }
+
+    pub fn module_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
+        self.iter_paths(move |p| self.is_module_path(p))
+    }
+
+    pub fn event_paths(&self) -> impl Iterator<Item = PathBuf> + '_ {
+        self.iter_paths(move |p| self.is_event_path(p))
+    }
+
+    /// Build all modules in the self.storage_dir.
+    /// Returns an Err if a module does not deserialize.
+    pub fn get_all_modules(&self) -> Result<Vec<CompiledModule>> {
+        self.module_paths()
+            .map(|path| {
+                CompiledModule::deserialize(&Self::get_bytes(&path)?.unwrap())
+                    .map_err(|e| anyhow!("Failed to deserialized module: {:?}", e))
+            })
+            .collect::<Result<Vec<CompiledModule>>>()
+    }
+}
+
+impl ModuleResolver for OnDiskStateView {
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        self.get_module_bytes(module_id)
+    }
+}
+
+impl ResourceResolver for OnDiskStateView {
+    fn get_resource(
+        &self,
+        address: &AccountAddress,
+        struct_tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, anyhow::Error> {
+        self.get_resource_bytes(*address, struct_tag.clone())
+    }
+}
+
+impl GetModule for &OnDiskStateView {
+    type Error = anyhow::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        if let Some(bytes) = self.get_module_bytes(id)? {
+            let module = CompiledModule::deserialize(&bytes)
+                .map_err(|e| anyhow!("Failure deserializing module {:?}: {:?}", id, e))?;
+            Ok(Some(module))
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Default for OnDiskStateView {
+    fn default() -> Self {
+        OnDiskStateView::create(Path::new(DEFAULT_BUILD_DIR), Path::new(DEFAULT_STORAGE_DIR))
+            .expect("Failure creating OnDiskStateView")
+    }
+}
+
+// wrappers of TypeTag, StructTag, Vec<TypeTag> to allow us to implement the FromStr/ToString traits
+#[derive(Debug)]
+struct TypeID(TypeTag);
+#[derive(Debug)]
+struct StructID(StructTag);
+#[derive(Debug)]
+struct Generics(Vec<TypeTag>);
+
+impl ToString for TypeID {
+    fn to_string(&self) -> String {
+        match &self.0 {
+            TypeTag::Struct(s) => StructID(*s.clone()).to_string(),
+            TypeTag::Vector(t) => format!("vector<{}>", TypeID(*t.clone()).to_string()),
+            t => t.to_string(),
+        }
+    }
+}
+
+impl ToString for StructID {
+    fn to_string(&self) -> String {
+        let tag = &self.0;
+        // TODO: TypeTag parser insists on leading 0x for StructTag's, so we insert one here.
+        // Would be nice to expose a StructTag parser and get rid of the 0x here
+        format!(
+            "0x{}::{}::{}{}",
+            tag.address,
+            tag.module,
+            tag.name,
+            Generics(tag.type_params.clone()).to_string()
+        )
+    }
+}
+
+impl ToString for Generics {
+    fn to_string(&self) -> String {
+        if self.0.is_empty() {
+            "".to_string()
+        } else {
+            let generics: Vec<String> = self
+                .0
+                .iter()
+                .map(|t| TypeID(t.clone()).to_string())
+                .collect();
+            format!("<{}>", generics.join(","))
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/sandbox/utils/package_context.rs b/vendors/move/crates/tools/move-cli/src/sandbox/utils/package_context.rs
new file mode 100644
index 000000000..98e0c72c1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/sandbox/utils/package_context.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use crate::{sandbox::utils::OnDiskStateView, DEFAULT_BUILD_DIR};
+use anyhow::Result;
+use move_command_line_common::env::get_bytecode_version_from_env;
+use move_package::{compilation::compiled_package::CompiledPackage, BuildConfig};
+use std::path::{Path, PathBuf};
+
+/// The PackageContext controls the package that the CLI is executing with respect to, and handles the
+/// creation of the `OnDiskStateView` with the package's dependencies.
+pub struct PackageContext {
+    package: CompiledPackage,
+    build_dir: PathBuf,
+}
+
+impl PackageContext {
+    pub fn new(path: &Option<PathBuf>, build_config: &BuildConfig) -> Result<Self> {
+        let path = path.as_deref().unwrap_or_else(|| Path::new("."));
+        let build_dir = build_config
+            .install_dir
+            .as_ref()
+            .unwrap_or(&PathBuf::from(DEFAULT_BUILD_DIR))
+            .clone();
+        let package = build_config
+            .clone()
+            .compile_package(path, &mut Vec::new())?;
+        Ok(PackageContext { package, build_dir })
+    }
+
+    /// Prepare an OnDiskStateView that is ready to use. Library modules will be preloaded into the
+    /// storage if `load_libraries` is true.
+    ///
+    /// NOTE: this is the only way to get a state view in Move CLI, and thus, this function needs
+    /// to be run before every command that needs a state view, i.e., `publish`, `run`,
+    /// `view`, and `doctor`.
+    pub fn prepare_state(
+        &self,
+        bytecode_version: Option<u32>,
+        storage_dir: &Path,
+    ) -> Result<OnDiskStateView> {
+        let bytecode_version = get_bytecode_version_from_env(bytecode_version);
+        let state = OnDiskStateView::create(self.build_dir.as_path(), storage_dir)?;
+
+        // preload the storage with library modules (if such modules do not exist yet)
+        let package = self.package();
+        let new_modules = package
+            .deps_compiled_units
+            .iter()
+            .map(|(_, unit)| match &unit.unit {
+                move_compiler::compiled_unit::CompiledUnitEnum::Module(m) => &m.module,
+                _ => unreachable!(),
+            })
+            .filter(|m| !state.has_module(&m.self_id()));
+
+        let mut serialized_modules = vec![];
+        for module in new_modules {
+            let self_id = module.self_id();
+            let mut module_bytes = vec![];
+            module.serialize_for_version(bytecode_version, &mut module_bytes)?;
+            serialized_modules.push((self_id, module_bytes));
+        }
+        state.save_modules(&serialized_modules)?;
+
+        Ok(state)
+    }
+
+    pub fn package(&self) -> &CompiledPackage {
+        &self.package
+    }
+}
+
+impl Default for PackageContext {
+    fn default() -> Self {
+        Self::new(&None, &BuildConfig::default()).unwrap()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/src/utils/mod.rs b/vendors/move/crates/tools/move-cli/src/utils/mod.rs
new file mode 100644
index 000000000..e304f0120
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/utils/mod.rs
@@ -0,0 +1,4 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod movey_credential;
diff --git a/vendors/move/crates/tools/move-cli/src/utils/movey_credential.rs b/vendors/move/crates/tools/move-cli/src/utils/movey_credential.rs
new file mode 100644
index 000000000..ed03b0983
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/src/utils/movey_credential.rs
@@ -0,0 +1,192 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Context, Result};
+use move_command_line_common::movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL};
+use std::fs;
+use toml_edit::easy::Value;
+
+pub fn get_registry_api_token(move_home: &str) -> Result<String> {
+    if let Ok(content) = get_api_token(move_home) {
+        Ok(content)
+    } else {
+        bail!(
+            "There seems to be an error with your Movey API token. \
+            Please run `move movey-login` and follow the instructions."
+        )
+    }
+}
+
+pub fn get_api_token(move_home: &str) -> Result<String> {
+    let credential_path = format!("{}{}", move_home, MOVEY_CREDENTIAL_PATH);
+    let mut toml: Value = read_credential_file(&credential_path)?;
+    let token = get_registry_field(&mut toml, "token")?;
+    Ok(token.to_string().replace('\"', ""))
+}
+
+pub fn get_movey_url(move_home: &str) -> Result<String> {
+    let credential_path = format!("{}{}", move_home, MOVEY_CREDENTIAL_PATH);
+    let contents = fs::read_to_string(credential_path)?;
+    let mut toml: Value = contents.parse()?;
+
+    let movey_url = get_registry_field(&mut toml, "url");
+    if let Ok(url) = movey_url {
+        Ok(url.to_string().replace('\"', ""))
+    } else {
+        Ok(MOVEY_URL.to_string())
+    }
+}
+
+fn get_registry_field<'a>(toml: &'a mut Value, field: &'a str) -> Result<&'a mut Value> {
+    let registry = toml
+        .as_table_mut()
+        .context(format!("Error parsing {}", MOVEY_CREDENTIAL_PATH))?
+        .get_mut("registry")
+        .context(format!("Error parsing {}", MOVEY_CREDENTIAL_PATH))?;
+    let value = registry
+        .as_table_mut()
+        .context("Error parsing registry table")?
+        .get_mut(field)
+        .context("Error parsing token")?;
+    Ok(value)
+}
+
+pub fn read_credential_file(credential_path: &str) -> Result<Value> {
+    let content = match fs::read_to_string(credential_path) {
+        Ok(content) => content,
+        Err(error) => bail!("Error reading input: {}", error),
+    };
+    content.parse().map_err(|e| {
+        anyhow::Error::from(e).context(format!(
+            "could not parse input at {} as TOML",
+            &credential_path
+        ))
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::{env, fs::File};
+
+    fn setup_move_home(test_path: &str) -> (String, String) {
+        let cwd = env::current_dir().unwrap();
+        let mut move_home: String = String::from(cwd.to_string_lossy());
+        move_home.push_str(test_path);
+        let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
+
+        (move_home, credential_path)
+    }
+
+    fn clean_up(move_home: &str) {
+        let _ = fs::remove_dir_all(move_home);
+    }
+
+    #[test]
+    fn get_api_token_works() {
+        let test_path = String::from("/get_api_token_works");
+        let (move_home, credential_path) = setup_move_home(&test_path);
+        let _ = fs::create_dir_all(&move_home);
+        File::create(&credential_path).unwrap();
+
+        let content = r#"
+            [registry]
+            token = "test-token"
+            "#;
+        fs::write(&credential_path, content).unwrap();
+
+        let token = get_registry_api_token(&move_home).unwrap();
+        assert!(token.contains("test-token"));
+
+        clean_up(&move_home)
+    }
+
+    #[test]
+    fn get_api_token_fails_if_there_is_no_move_home_directory() {
+        let test_path = String::from("/get_api_token_fails_if_there_is_no_move_home_directory");
+        let (move_home, _) = setup_move_home(&test_path);
+        let _ = fs::remove_dir_all(&move_home);
+
+        let token = get_registry_api_token(&move_home);
+        assert!(token.is_err());
+
+        clean_up(&move_home)
+    }
+
+    #[test]
+    fn get_api_token_fails_if_there_is_no_credential_file() {
+        let test_path = String::from("/get_api_token_fails_if_there_is_no_credential_file");
+        let (move_home, _) = setup_move_home(&test_path);
+        let _ = fs::remove_dir_all(&move_home);
+        fs::create_dir_all(&move_home).unwrap();
+
+        let token = get_registry_api_token(&move_home);
+        assert!(token.is_err());
+
+        clean_up(&move_home)
+    }
+
+    #[test]
+    fn get_api_token_fails_if_credential_file_is_in_wrong_format() {
+        let test_path = String::from("/get_api_token_fails_if_credential_file_is_in_wrong_format");
+        let (move_home, credential_path) = setup_move_home(&test_path);
+        let _ = fs::remove_dir_all(&move_home);
+        fs::create_dir_all(&move_home).unwrap();
+        File::create(&credential_path).unwrap();
+
+        let missing_double_quote = r#"
+            [registry]
+            token = test-token
+            "#;
+        fs::write(&credential_path, missing_double_quote).unwrap();
+        let token = get_registry_api_token(&move_home);
+        assert!(token.is_err());
+
+        let wrong_token_field = r#"
+            [registry]
+            tokens = "test-token"
+            "#;
+        fs::write(&credential_path, wrong_token_field).unwrap();
+        let token = get_registry_api_token(&move_home);
+        assert!(token.is_err());
+
+        clean_up(&move_home)
+    }
+
+    #[test]
+    fn get_movey_url_works() {
+        let test_path = String::from("/get_movey_url_works");
+        let (move_home, credential_path) = setup_move_home(&test_path);
+        let _ = fs::create_dir_all(&move_home);
+        File::create(&credential_path).unwrap();
+        let content = r#"
+            [registry]
+            token = "test-token"
+            url = "test-url"
+            "#;
+        fs::write(&credential_path, content).unwrap();
+
+        let url = get_movey_url(&move_home).unwrap();
+        assert_eq!(url, "test-url");
+
+        clean_up(&move_home)
+    }
+
+    #[test]
+    fn get_movey_url_returns_default_url_if_url_field_not_existed() {
+        let test_path = String::from("/get_movey_url_returns_default_url_if_url_field_not_existed");
+        let (move_home, credential_path) = setup_move_home(&test_path);
+        let _ = fs::create_dir_all(&move_home);
+        File::create(&credential_path).unwrap();
+        let content = r#"
+            [registry]
+            token = "test-token"
+            "#;
+        fs::write(&credential_path, content).unwrap();
+
+        let url = get_movey_url(&move_home).unwrap();
+        assert_eq!(url, MOVEY_URL);
+
+        clean_up(&move_home)
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml
new file mode 100644
index 000000000..0e2ebaca6
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
+
+[dependencies]
+Foo = { local = "../C" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move
new file mode 100644
index 000000000..e12c66353
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move
@@ -0,0 +1,7 @@
+module B::Bar {
+    use C::Foo;
+
+    public fun foo(): u64 {
+        Foo::bar()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml
new file mode 100644
index 000000000..e84e2fcfa
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Foo"
+version = "0.0.0"
+
+[addresses]
+C = "0x3"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move
new file mode 100644
index 000000000..4313b3ed6
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move
@@ -0,0 +1,5 @@
+module C::Foo {
+    public fun bar(): u64 {
+        1
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml
new file mode 100644
index 000000000..a309dafc0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
+
+[dependencies]
+Bar = { local = "./B" }
+Foo = { local = "./C" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp
new file mode 100644
index 000000000..1c885dfad
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp
@@ -0,0 +1,13 @@
+Command `build -v -p ./C`:
+BUILDING Foo
+External Command `mv ./C/sources/Foo.move ./C/sources/Foo.move_old`:
+External Command `rm -rf ./C/build/Foo/sources`:
+Command `build -v -p ./B`:
+INCLUDING DEPENDENCY Foo
+BUILDING Bar
+External Command `mv ./B/sources/Bar.move ./C/sources/Bar.move_old`:
+External Command `rm -rf ./B/build/Bar/sources`:
+Command `build -v`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY Foo
+BUILDING A
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move
new file mode 100644
index 000000000..62c396ec0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move
@@ -0,0 +1,8 @@
+module A::A {
+    use B::Bar;
+    use C::Foo;
+
+    public fun foo(): u64 {
+        Bar::foo() + Foo::bar()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml
new file mode 100644
index 000000000..db3f9fb55
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Test"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/args.exp
new file mode 100644
index 000000000..05ecd0b30
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/args.exp
@@ -0,0 +1,25 @@
+Command `build`:
+BUILDING Test
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+
+Command `disassemble --package Test --name m`:
+// Move bytecode v6
+module 42.m {
+
+
+public foo(x: u64): u64 {
+B0:
+	0: LdU64(2)
+	1: Ret
+}
+}
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move
new file mode 100644
index 000000000..c892ad41e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move
new file mode 100644
index 000000000..c892ad41e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/Move.toml
new file mode 100644
index 000000000..61dc26870
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Foo"
+version = "0.0.0"
+
+[dependencies]
+Bar = { local = "bar" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp
new file mode 100644
index 000000000..a8ab51117
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp
@@ -0,0 +1,9 @@
+Command `build -v --arch ethereum`:
+Error: Unable to resolve packages for package 'Foo'
+
+Caused by:
+    0: While resolving dependency 'Bar' in package 'Foo'
+    1: Unable to resolve package dependency 'Bar'
+    2: While resolving dependency 'Foo' in package 'Bar'
+    3: Unable to resolve package dependency 'Foo'
+    4: Found cycle between packages: Foo -> Bar -> Foo
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.exp
new file mode 100644
index 000000000..2d5025aea
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/args.exp
@@ -0,0 +1,9 @@
+Command `build -v`:
+Error: Unable to resolve packages for package 'Foo'
+
+Caused by:
+    0: While resolving dependency 'Bar' in package 'Foo'
+    1: Unable to resolve package dependency 'Bar'
+    2: While resolving dependency 'Foo' in package 'Bar'
+    3: Unable to resolve package dependency 'Foo'
+    4: Found cycle between packages: Foo -> Bar -> Foo
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml
new file mode 100644
index 000000000..0a8a031e0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[dependencies]
+Foo = { local = ".." }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move
new file mode 100644
index 000000000..7905cb391
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/bar/sources/Bar.move
@@ -0,0 +1,7 @@
+module 0x1::Bar {
+    use 0x1::Foo;
+
+    public bar() {
+        Foo::foo();
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move
new file mode 100644
index 000000000..a1641e9b0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/circular_dependencies/sources/Foo.move
@@ -0,0 +1,8 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {
+    use 0x1::Bar;
+
+    public foo() {
+        Bar::bar();
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/Move.toml
new file mode 100644
index 000000000..7581be8bf
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+Foo = { local = "./foo" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp
new file mode 100644
index 000000000..65c4757ca
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp
@@ -0,0 +1,3 @@
+Command `build -v --arch ethereum`:
+COMPILING A, Bar, Foo to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.exp
new file mode 100644
index 000000000..ea1be9b5e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/args.exp
@@ -0,0 +1,4 @@
+Command `build -v`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY Foo
+BUILDING A
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/Move.toml
new file mode 100644
index 000000000..2b98d5753
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move
new file mode 100644
index 000000000..72259b9e4
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/bar/sources/A.move
@@ -0,0 +1,5 @@
+module A::Bar {
+    public fun bar(): u64 {
+        42
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/Move.toml
new file mode 100644
index 000000000..d9b78ab21
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Foo"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dependencies]
+Bar = { local = "../bar" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move
new file mode 100644
index 000000000..2c6d10d05
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/foo/sources/A.move
@@ -0,0 +1,7 @@
+module A::Foo {
+    use A::Bar;
+
+    public fun foo(): u64 {
+        Bar::bar()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/sources/A.move
new file mode 100644
index 000000000..9ce77ef88
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dependency_chain/sources/A.move
@@ -0,0 +1,8 @@
+#[evm_contract] // for passing evm test flavor
+module A::A {
+    use A::Foo;
+
+    fun f(): u64 {
+        Foo::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/Move.toml
new file mode 100644
index 000000000..bf071a290
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.evm.exp
new file mode 100644
index 000000000..0c3b17550
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.evm.exp
@@ -0,0 +1,3 @@
+Command `build -v -d --arch ethereum`:
+COMPILING A to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.exp
new file mode 100644
index 000000000..fa89fc39c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/args.exp
@@ -0,0 +1,2 @@
+Command `build -v -d`:
+BUILDING A
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/sources/A.move
new file mode 100644
index 000000000..bfb1944db
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/dev_address/sources/A.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module A::A {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/Move.toml
new file mode 100644
index 000000000..241b837f1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "disassemble_script"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/args.exp
new file mode 100644
index 000000000..bb0bf4639
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/args.exp
@@ -0,0 +1,10 @@
+Command `disassemble --name main`:
+// Move bytecode v6
+script {
+
+
+main() {
+B0:
+	0: Ret
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move
new file mode 100644
index 000000000..6aa5426fd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move
@@ -0,0 +1,7 @@
+//# run
+script {
+    fun main() {
+        let x = 420;
+        assert!(x == 420, 0);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/Move.toml
new file mode 100644
index 000000000..868b9129b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "A"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp
new file mode 100644
index 000000000..532110eb8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp
@@ -0,0 +1,3 @@
+Command `build -v --arch ethereum`:
+COMPILING A to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp
new file mode 100644
index 000000000..dffc3c3b3
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp
@@ -0,0 +1,2 @@
+Command `build -v`:
+BUILDING A
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move
new file mode 100644
index 000000000..ef31f798d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/empty_module_no_deps/sources/A.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::M {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml
new file mode 100644
index 000000000..7d092b79b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "build_include_exclude_stdlib"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp
new file mode 100644
index 000000000..d26150454
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp
@@ -0,0 +1,20 @@
+Command `build -v --arch ethereum`:
+COMPILING build_include_exclude_stdlib to Yul
+exiting with Move build errors Failed to compile Move into Yul ERROR
+error: unbound module
+  ┌─ ./sources/UseSigner.move:3:7
+  │
+3 │   use std::signer;
+  │       ^^^^^^^^^^^ Invalid 'use'. Unbound module: '(std=1)::signer'
+
+error: unbound module
+  ┌─ ./sources/UseSigner.move:6:5
+  │
+6 │     signer::address_of(account)
+  │     ^^^^^^ Unbound module alias 'signer'
+
+
+Error: exiting with Move build errors
+Command `-d -v build --arch ethereum`:
+COMPILING MoveStdlib, build_include_exclude_stdlib to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
new file mode 100644
index 000000000..ce37b1cf9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
@@ -0,0 +1,17 @@
+Command `build -v`:
+BUILDING build_include_exclude_stdlib
+error[E03002]: unbound module
+  ┌─ ./sources/UseSigner.move:3:7
+  │
+3 │   use std::signer;
+  │       ^^^^^^^^^^^ Invalid 'use'. Unbound module: '(std=0x1)::signer'
+
+error[E03002]: unbound module
+  ┌─ ./sources/UseSigner.move:6:5
+  │
+6 │     signer::address_of(account)
+  │     ^^^^^^ Unbound module alias 'signer'
+
+Command `-d -v build`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING build_include_exclude_stdlib
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move
new file mode 100644
index 000000000..192642d73
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/include_exclude_stdlib/sources/UseSigner.move
@@ -0,0 +1,8 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Example {
+  use std::signer;
+
+  public fun f(account: &signer): address {
+    signer::address_of(account)
+  }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp
new file mode 100644
index 000000000..0f9d29a14
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp
@@ -0,0 +1,7 @@
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+External Command `touch sources/Bar.move`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move
new file mode 100644
index 000000000..877d6abc7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/sources/Foo.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp
new file mode 100644
index 000000000..ebc203025
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp
@@ -0,0 +1,17 @@
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+Command `build -v --arch ethereum`:
+CACHED Foo
+External Command `rm build/evm/Foo.yul`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+External Command `rm build/evm/Foo.bin`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+External Command `rm build/evm/Foo.abi.json`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move
new file mode 100644
index 000000000..877d6abc7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/sources/Foo.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp
new file mode 100644
index 000000000..fc8d8cecf
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp
@@ -0,0 +1,7 @@
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+External Command `touch Move.toml`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move
new file mode 100644
index 000000000..877d6abc7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/sources/Foo.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp
new file mode 100644
index 000000000..792c93d58
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp
@@ -0,0 +1,7 @@
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+External Command `touch sources/Foo.move`:
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move
new file mode 100644
index 000000000..877d6abc7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_after_touching_source/sources/Foo.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/Move.toml
new file mode 100644
index 000000000..6d08009a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Foo"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp
new file mode 100644
index 000000000..2e418bb82
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp
@@ -0,0 +1,5 @@
+Command `build -v --arch ethereum`:
+COMPILING Foo to Yul
+GENERATING EVM bytecote from Yul
+Command `build -v --arch ethereum`:
+CACHED Foo
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move
new file mode 100644
index 000000000..877d6abc7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/rebuild_no_modification/sources/Foo.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::Foo {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp
new file mode 100644
index 000000000..323ab5c2a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp
@@ -0,0 +1,17 @@
+Command `new --path . Foo`:
+Command `build`:
+FETCHING GIT DEPENDENCY https://github.com/move-language/move.git
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Command `docgen --template template.md --exclude-impl --exclude-private-fun --exclude-specs --include-call-diagrams --include-dep-diagrams --independent-specs --no-collapsed-sections --output-directory doc --references-file template.md --section-level-start 3 --toc-depth 3`:
+Generated "doc/template.md"
+Generated "doc/Foo.md"
+
+Documentation generation successful!
+External Command `grep documentation doc/Foo.md`:
+Test documentation comment
+External Command `cat doc/template.md`:
+This is a test template
+
+
+This is a test template
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
new file mode 100644
index 000000000..6af365484
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
@@ -0,0 +1,5 @@
+module 0x1::Foo {
+    /// Test documentation comment
+    public fun foo() {
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md
new file mode 100644
index 000000000..a9130f91a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md
@@ -0,0 +1 @@
+This is a test template
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/simple_new/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_new/args.exp
new file mode 100644
index 000000000..fde16f52e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/simple_new/args.exp
@@ -0,0 +1,22 @@
+Command `new P1`:
+External Command `cat P1/Move.toml`:
+[package]
+name = "P1"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std =  "0x1"
+Command `new P2 -p other_dir`:
+External Command `cat other_dir/Move.toml`:
+[package]
+name = "P2"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std =  "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/Move.toml
new file mode 100644
index 000000000..0ff9093eb
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp
new file mode 100644
index 000000000..d3c437535
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp
@@ -0,0 +1,8 @@
+Command `build -v --arch ethereum`:
+Error: Unresolved addresses found: [
+Named address 'A' in package 'A'
+]
+To fix this, add an entry for each unresolved address to the [addresses] section of ./Move.toml: e.g.,
+[addresses]
+Std = "0x1"
+Alternatively, you can also define [dev-addresses] and call with the -d flag
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.exp
new file mode 100644
index 000000000..a89305d07
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/args.exp
@@ -0,0 +1,8 @@
+Command `build -v`:
+Error: Unresolved addresses found: [
+Named address 'A' in package 'A'
+]
+To fix this, add an entry for each unresolved address to the [addresses] section of ./Move.toml: e.g.,
+[addresses]
+Std = "0x1"
+Alternatively, you can also define [dev-addresses] and call with the -d flag
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/sources/A.move
new file mode 100644
index 000000000..bfb1944db
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_address/sources/A.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module A::A {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/Move.toml b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/Move.toml
new file mode 100644
index 000000000..59f0a6740
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+Foo = { local = "foo" }
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp
new file mode 100644
index 000000000..5e575847c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp
@@ -0,0 +1,7 @@
+Command `build -v --arch ethereum`:
+Error: Unable to resolve packages for package 'A'
+
+Caused by:
+    0: While resolving dependency 'Foo' in package 'A'
+    1: While processing dependency 'Foo'
+    2: Unable to find package manifest for 'Foo' at "Move.toml/./foo"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.exp b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.exp
new file mode 100644
index 000000000..8a9e48f28
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/args.exp
@@ -0,0 +1,7 @@
+Command `build -v`:
+Error: Unable to resolve packages for package 'A'
+
+Caused by:
+    0: While resolving dependency 'Foo' in package 'A'
+    1: While processing dependency 'Foo'
+    2: Unable to find package manifest for 'Foo' at "Move.toml/./foo"
diff --git a/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/sources/A.move b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/sources/A.move
new file mode 100644
index 000000000..247560386
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_tests/unbound_dependency/sources/A.move
@@ -0,0 +1,2 @@
+#[evm_contract] // for passing evm test flavor
+module 0x1::A {}
diff --git a/vendors/move/crates/tools/move-cli/tests/build_testsuite.rs b/vendors/move/crates/tools/move-cli/tests/build_testsuite.rs
new file mode 100644
index 000000000..28466684a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_testsuite.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/build_tests", r"args\.txt$");
diff --git a/vendors/move/crates/tools/move-cli/tests/build_testsuite_evm.rs b/vendors/move/crates/tools/move-cli/tests/build_testsuite_evm.rs
new file mode 100644
index 000000000..dd557df94
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/build_testsuite_evm.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/build_tests", r"args\.evm\.txt$");
diff --git a/vendors/move/crates/tools/move-cli/tests/cli_tests.rs b/vendors/move/crates/tools/move-cli/tests/cli_tests.rs
new file mode 100644
index 000000000..ab9406ab9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/cli_tests.rs
@@ -0,0 +1,380 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use httpmock::{prelude::*, Mock};
+use move_cli::sandbox::commands::test;
+use move_command_line_common::{
+    files,
+    movey_constants::{MOVEY_CREDENTIAL_PATH, MOVEY_URL},
+};
+use serde_json::json;
+#[cfg(unix)]
+use std::fs::File;
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
+use std::{
+    env, fs,
+    io::Write,
+    path::PathBuf,
+    process::{Command, Stdio},
+};
+use toml_edit::easy::Value;
+
+pub const CLI_METATEST_PATH: [&str; 3] = ["tests", "metatests", "args.txt"];
+
+fn get_cli_binary_path() -> PathBuf {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    PathBuf::from(cli_exe)
+}
+
+fn get_metatest_path() -> PathBuf {
+    CLI_METATEST_PATH.iter().collect()
+}
+
+#[test]
+fn run_metatest() {
+    let path_cli_binary = get_cli_binary_path();
+    let path_metatest = get_metatest_path();
+
+    // local workspace + with coverage
+    assert!(test::run_all(&path_metatest, path_cli_binary.as_path(), false, true).is_ok());
+
+    // temp workspace + with coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, true, true).is_ok());
+
+    // local workspace + without coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, false, false).is_ok());
+
+    // temp workspace + without coverage
+    assert!(test::run_all(&path_metatest, &path_cli_binary, true, false).is_ok());
+}
+
+#[test]
+fn cross_process_locking_git_deps() {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let handle = std::thread::spawn(move || {
+        Command::new(cli_exe)
+            .current_dir("./tests/cross_process_tests/Package1")
+            .args(["package", "build"])
+            .output()
+            .expect("Package1 failed");
+    });
+    let cli_exe = env!("CARGO_BIN_EXE_move").to_string();
+    Command::new(cli_exe)
+        .current_dir("./tests/cross_process_tests/Package2")
+        .args(["package", "build"])
+        .output()
+        .expect("Package2 failed");
+    handle.join().unwrap();
+}
+
+const UPLOAD_PACKAGE_PATH: &str = "./tests/upload_tests";
+#[test]
+#[ignore]
+fn upload_package_to_movey_works() {
+    let package_path = format!("{}/valid_package1", UPLOAD_PACKAGE_PATH);
+    init_git(&package_path, true);
+    let server = MockServer::start();
+    let server_mock = mock_movey_upload_with_response_body_and_status_code(&server, 200, None);
+    init_stub_registry_file(&package_path, &server.base_url());
+    let relative_package_path = PathBuf::from(&package_path);
+    let absolute_package_path =
+        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
+
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let output = Command::new(cli_exe)
+        .env("MOVE_HOME", &absolute_package_path)
+        .current_dir(&absolute_package_path)
+        .args(["movey-upload"])
+        .output()
+        .unwrap();
+
+    server_mock.assert();
+    assert!(output.status.success());
+    let output = String::from_utf8_lossy(output.stdout.as_slice()).to_string();
+    assert!(
+        output.contains("Your package has been successfully uploaded to Movey"),
+        "{}",
+        output
+    );
+
+    clean_up(&absolute_package_path);
+}
+
+#[test]
+#[ignore]
+fn upload_package_to_movey_prints_error_message_if_server_respond_4xx() {
+    let package_path = format!("{}/valid_package2", UPLOAD_PACKAGE_PATH);
+    init_git(&package_path, true);
+    let server = MockServer::start();
+    let server_mock = mock_movey_upload_with_response_body_and_status_code(
+        &server,
+        400,
+        Some("Invalid Api token"),
+    );
+    init_stub_registry_file(&package_path, &server.base_url());
+    let relative_package_path = PathBuf::from(&package_path);
+    let absolute_package_path =
+        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
+
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let output = Command::new(cli_exe)
+        .env("MOVE_HOME", &absolute_package_path)
+        .current_dir(&absolute_package_path)
+        .args(["movey-upload"])
+        .output()
+        .unwrap();
+
+    server_mock.assert();
+    assert!(!output.status.success());
+    let output = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
+    assert!(output.contains("Error: Invalid Api token"), "{}", output);
+
+    clean_up(&absolute_package_path);
+}
+
+#[test]
+#[ignore]
+fn upload_package_to_movey_prints_hardcoded_error_message_if_server_respond_5xx() {
+    let package_path = format!("{}/valid_package3", UPLOAD_PACKAGE_PATH);
+    init_git(&package_path, true);
+    let server = MockServer::start();
+    let server_mock = mock_movey_upload_with_response_body_and_status_code(
+        &server,
+        500,
+        Some("Invalid Api token"),
+    );
+    init_stub_registry_file(&package_path, &server.base_url());
+    let relative_package_path = PathBuf::from(&package_path);
+    let absolute_package_path =
+        files::path_to_string(&relative_package_path.canonicalize().unwrap()).unwrap();
+
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let output = Command::new(cli_exe)
+        .env("MOVE_HOME", &absolute_package_path)
+        .current_dir(&absolute_package_path)
+        .args(["movey-upload"])
+        .output()
+        .unwrap();
+
+    server_mock.assert();
+    assert!(!output.status.success());
+    let output = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
+    assert!(
+        output.contains("Error: An unexpected error occurred. Please try again later"),
+        "{}",
+        output
+    );
+
+    clean_up(&absolute_package_path);
+}
+
+#[test]
+fn upload_package_to_movey_with_no_remote_should_panic() {
+    let package_path = format!("{}/no_git_remote_package", UPLOAD_PACKAGE_PATH);
+    init_git(&package_path, false);
+
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let output = Command::new(cli_exe)
+        .current_dir(&package_path)
+        .args(["movey-upload"])
+        .output()
+        .unwrap();
+
+    assert!(!output.status.success());
+    let error = String::from_utf8_lossy(output.stderr.as_slice()).to_string();
+    assert!(error.contains("invalid git repository"));
+
+    clean_up(&package_path);
+}
+
+// is_valid == true: all git commands are run
+// is_valid == false: missing git remote add command
+fn init_git(package_path: &str, is_valid: bool) {
+    Command::new("git")
+        .current_dir(package_path)
+        .args(["init"])
+        .output()
+        .unwrap();
+    Command::new("git")
+        .current_dir(package_path)
+        .args(["add", "."])
+        .output()
+        .unwrap();
+    if is_valid {
+        Command::new("git")
+            .current_dir(package_path)
+            .args([
+                "remote",
+                "add",
+                "test-origin",
+                "git@github.com:move-language/move.git",
+            ])
+            .output()
+            .unwrap();
+        Command::new("git")
+            .current_dir(package_path)
+            .args(["config", "user.email", "\"you@example.com\""])
+            .output()
+            .unwrap();
+        Command::new("git")
+            .current_dir(package_path)
+            .args(["config", "user.name", "\"Your Name\""])
+            .output()
+            .unwrap();
+        Command::new("git")
+            .current_dir(package_path)
+            .args(["commit", "--allow-empty", "-m", "initial commit"])
+            .output()
+            .unwrap();
+    }
+}
+#[test]
+fn save_credential_works() {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let (move_home, credential_path) = setup_move_home("/save_credential_works");
+    assert!(fs::read_to_string(&credential_path).is_err());
+
+    match Command::new(cli_exe)
+        .env("MOVE_HOME", &move_home)
+        .current_dir(".")
+        .args(["movey-login"])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()
+    {
+        Ok(child) => {
+            let token = "test_token";
+            child
+                .stdin
+                .as_ref()
+                .unwrap()
+                .write_all(token.as_bytes())
+                .unwrap();
+            match child.wait_with_output() {
+                Ok(output) => {
+                    assert!(String::from_utf8_lossy(&output.stdout).contains(&format!(
+                        "Please paste the API Token found on {}/settings/tokens below",
+                        MOVEY_URL
+                    )));
+                    Ok(())
+                },
+                Err(error) => Err(error),
+            }
+        },
+        Err(error) => Err(error),
+    }
+    .unwrap();
+
+    let contents = fs::read_to_string(&credential_path).expect("Unable to read file");
+    let mut toml: Value = contents.parse().unwrap();
+    let registry = toml.as_table_mut().unwrap().get_mut("registry").unwrap();
+    let token = registry.as_table_mut().unwrap().get_mut("token").unwrap();
+    assert!(token.to_string().contains("test_token"));
+
+    let _ = fs::remove_dir_all(move_home);
+}
+
+#[cfg(unix)]
+#[test]
+fn save_credential_fails_if_undeletable_credential_file_exists() {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let (move_home, credential_path) =
+        setup_move_home("/save_credential_fails_if_undeletable_credential_file_exists");
+    let file = File::create(&credential_path).unwrap();
+    let mut perms = file.metadata().unwrap().permissions();
+    perms.set_mode(0o000);
+    file.set_permissions(perms).unwrap();
+
+    match std::process::Command::new(cli_exe)
+        .env("MOVE_HOME", &move_home)
+        .current_dir(".")
+        .args(["movey-login"])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+    {
+        Ok(child) => {
+            let token = "test_token";
+            child
+                .stdin
+                .as_ref()
+                .unwrap()
+                .write_all(token.as_bytes())
+                .unwrap();
+            match child.wait_with_output() {
+                Ok(output) => {
+                    assert!(String::from_utf8_lossy(&output.stdout).contains(&format!(
+                        "Please paste the API Token found on {}/settings/tokens below",
+                        MOVEY_URL
+                    )));
+                    assert!(String::from_utf8_lossy(&output.stderr)
+                        .contains("Error: Error reading input: Permission denied (os error 13)"));
+                    Ok(())
+                },
+                Err(error) => Err(error),
+            }
+        },
+        Err(error) => Err(error),
+    }
+    .unwrap();
+
+    let mut perms = file.metadata().unwrap().permissions();
+    perms.set_mode(0o600);
+    file.set_permissions(perms).unwrap();
+    let _ = fs::remove_file(&credential_path);
+
+    let _ = fs::remove_dir_all(move_home);
+}
+
+fn setup_move_home(test_path: &str) -> (String, String) {
+    let cwd = env::current_dir().unwrap();
+    let mut move_home: String = String::from(cwd.to_string_lossy());
+    move_home.push_str(test_path);
+    let _ = fs::remove_dir_all(&move_home);
+    fs::create_dir_all(&move_home).unwrap();
+    let credential_path = move_home.clone() + MOVEY_CREDENTIAL_PATH;
+    (move_home, credential_path)
+}
+
+fn clean_up(package_path: &str) {
+    fs::remove_dir_all(format!("{}/.git", package_path)).unwrap();
+    let credential_path = format!("{}{}", package_path, MOVEY_CREDENTIAL_PATH);
+    let _ = fs::remove_file(credential_path);
+}
+
+// create a dummy move_credential.toml file for testing
+fn init_stub_registry_file(package_path: &str, base_url: &str) {
+    let credential_path = format!("{}{}", package_path, MOVEY_CREDENTIAL_PATH);
+    let content = format!(
+        r#"
+        [registry]
+        token = "test-token"
+        url = "{}"
+        "#,
+        base_url
+    );
+    fs::write(credential_path, content).expect("Unable to write file");
+}
+
+// create a mock server to check if the request is sent or not, also returns a stub response for testing
+fn mock_movey_upload_with_response_body_and_status_code<'a>(
+    server: &'a MockServer,
+    status_code: u16,
+    response_body: Option<&str>,
+) -> Mock<'a> {
+    server.mock(|when, then| {
+        when.method(POST)
+            .path("/api/v1/packages/upload")
+            .header("content-type", "application/json")
+            .json_body(json!({
+            "github_repo_url": "https://github.com/move-language/move",
+            "total_files": 2,
+            "token": "test-token",
+            "subdir": '\n'
+            }));
+        then.status(status_code).body(response_body.unwrap_or(""));
+    })
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/Move.toml b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/Move.toml
new file mode 100644
index 000000000..adb1224f7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/Move.toml b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/Move.toml
new file mode 100644
index 000000000..779b56687
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package2"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/cross_process_tests/Package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/args.exp
new file mode 100644
index 000000000..f5e631547
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/args.exp
@@ -0,0 +1,36 @@
+Command `sandbox exp-test -p dummy/test_1/args.txt`:
+1 / 1 test(s) passed.
+Command `sandbox exp-test -p dummy/test_2`:
+1 / 1 test(s) passed.
+Command `sandbox exp-test -p dummy`:
+2 / 2 test(s) passed.
+Command `sandbox exp-test -p cov/plain --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Command `sandbox exp-test -p cov/two-runs-same-module --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M
+	fun test
+		total: 6
+		covered: 6
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Command `sandbox exp-test -p cov/two-runs-diff-module --track-cov`:
+1 / 1 test(s) passed.
+Module 0000000000000000000000000000000000000000000000000000000000000042::M1
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
+Module 0000000000000000000000000000000000000000000000000000000000000042::M2
+	fun test
+		total: 1
+		covered: 1
+		% coverage: 100.00
+>>> % Module coverage: 100.00
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/Move.toml b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/Move.toml
new file mode 100644
index 000000000..4ee420a10
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "plain"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/args.exp
new file mode 100644
index 000000000..913e418e4
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --dry-run`:
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/scripts/test.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/scripts/test.move
new file mode 100644
index 000000000..d63dd6c53
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/scripts/test.move
@@ -0,0 +1,7 @@
+script {
+    use 0x42::M;
+
+    fun test() {
+        M::test();
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/sources/M.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/sources/M.move
new file mode 100644
index 000000000..48502e76c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/plain/sources/M.move
@@ -0,0 +1,3 @@
+module 0x42::M {
+    public fun test() {}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
new file mode 100644
index 000000000..c960e3829
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "two-runs-diff-module"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
new file mode 100644
index 000000000..f06a082ec
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
+Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
new file mode 100644
index 000000000..fb8e286c8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/scripts/test.move
@@ -0,0 +1,12 @@
+script {
+    use 0x42::M1;
+    use 0x42::M2;
+
+    fun test(x: u8) {
+        if (x == 0) {
+            M1::test();
+        } else {
+            M2::test();
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
new file mode 100644
index 000000000..e0526a316
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M1.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M1 {
+    public fun test() {}
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
new file mode 100644
index 000000000..31554319d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-diff-module/sources/M2.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M2 {
+    public fun test() {}
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
new file mode 100644
index 000000000..d57bc0714
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "two-runs-same-module"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
new file mode 100644
index 000000000..f06a082ec
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/test.move --args 0u8 --dry-run`:
+Command `sandbox run scripts/test.move --args 1u8 --dry-run`:
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
new file mode 100644
index 000000000..ae8115e56
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/scripts/test.move
@@ -0,0 +1,7 @@
+script {
+    use 0x42::M;
+
+    fun test(x: u8) {
+        M::test(x);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
new file mode 100644
index 000000000..356473bcc
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/metatests/cov/two-runs-same-module/sources/M.move
@@ -0,0 +1,11 @@
+address 0x42 {
+module M {
+    public fun test(x: u8) {
+        if (x == 0) {
+            return ()
+        } else {
+            return ()
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/dummy/test_1/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/dummy/test_1/args.exp
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-cli/tests/metatests/dummy/test_2/args.exp b/vendors/move/crates/tools/move-cli/tests/metatests/dummy/test_2/args.exp
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml
new file mode 100644
index 000000000..4413d2c55
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/Move.toml
@@ -0,0 +1,15 @@
+[package]
+name = "Foo"
+version = "1.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+std = "0x1"
+A = "0x2"
+B = "0x3"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
+Bar = { local = "dep" }
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp
new file mode 100644
index 000000000..74e5bcd7e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp
@@ -0,0 +1,7 @@
+Command `test --evm`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Running Move unit tests
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
new file mode 100644
index 000000000..1a336b71f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Running Move unit tests
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
new file mode 100644
index 000000000..f3f295152
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Running Move unit tests
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml
new file mode 100644
index 000000000..93e13bbc3
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Bar"
+version = "1.0.0"
+
+[addresses]
+B = "_"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move
new file mode 100644
index 000000000..ed6280681
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/dep/sources/M.move
@@ -0,0 +1,3 @@
+module B::N {
+    public fun nop() {}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move
new file mode 100644
index 000000000..3a2a7d9ad
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/sources/M.move
@@ -0,0 +1,8 @@
+module A::M {
+    use B::N;
+
+    #[test]
+    fun nop() {
+        N::nop()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml
new file mode 100644
index 000000000..15c1e0d57
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "StandaloneModule"
+version = "1.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+std = "0x1"
+A = "0x2"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp
new file mode 100644
index 000000000..fd030cbf8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp
@@ -0,0 +1,7 @@
+Command `test --evm`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
new file mode 100644
index 000000000..3b23eb8ca
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
new file mode 100644
index 000000000..ae0c6469e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move
new file mode 100644
index 000000000..bb34e95da
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/sources/M.move
@@ -0,0 +1,10 @@
+module A::M {
+    #[test]
+    fun nop() {}
+
+    #[test]
+    #[expected_failure]
+    fun explicit_abort_expect_failure() {
+        abort 42
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml
new file mode 100644
index 000000000..1a38bb53f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/Move.toml
@@ -0,0 +1,12 @@
+[package]
+name = "StandaloneModule"
+version = "1.0.0"
+
+[addresses]
+A = "0x2"
+
+[dev-addresses]
+std = "0x1"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp
new file mode 100644
index 000000000..fd030cbf8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp
@@ -0,0 +1,7 @@
+Command `test --evm`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
new file mode 100644
index 000000000..3b23eb8ca
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
@@ -0,0 +1,7 @@
+Command `test`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
new file mode 100644
index 000000000..ae0c6469e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
@@ -0,0 +1,7 @@
+Command `test --stackless`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING StandaloneModule
+Running Move unit tests
+[ PASS    ] 0x2::M::explicit_abort_expect_failure
+[ PASS    ] 0x2::M::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move
new file mode 100644
index 000000000..bb34e95da
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/sources/M.move
@@ -0,0 +1,10 @@
+module A::M {
+    #[test]
+    fun nop() {}
+
+    #[test]
+    #[expected_failure]
+    fun explicit_abort_expect_failure() {
+        abort 42
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests_evm.rs b/vendors/move/crates/tools/move-cli/tests/move_unit_tests_evm.rs
new file mode 100644
index 000000000..cb286c262
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests_evm.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/move_unit_tests", r"args\.evm\.txt$");
diff --git a/vendors/move/crates/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs b/vendors/move/crates/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
new file mode 100644
index 000000000..4c665792b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/move_unit_tests_move_vm_and_stackless_vm.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(
+    run_all,
+    "tests/move_unit_tests",
+    r"args(\.stackless)?\.txt$"
+);
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/.gitattributes b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
new file mode 100644
index 000000000..77a58870f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "build_modules_and_scripts"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
new file mode 100644
index 000000000..8a9cdeb80
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/args.exp
@@ -0,0 +1,4 @@
+Command `-v sandbox publish`:
+Found 1 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
+Wrote 88 bytes of module ID's and code
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
new file mode 100644
index 000000000..2aad422f7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script1.move
@@ -0,0 +1,4 @@
+script {
+    fun script1() {
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
new file mode 100644
index 000000000..705487768
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/scripts/script2.move
@@ -0,0 +1,5 @@
+script {
+    fun script1() {
+        _ = 1 + 3;
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
new file mode 100644
index 000000000..323f521c5
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/build_modules_and_scripts/sources/M.move
@@ -0,0 +1,4 @@
+address 0x42 {
+module M {
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/Move.toml
new file mode 100644
index 000000000..8a46addd8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "concretize_read_write_set"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp
new file mode 100644
index 000000000..bc8190642
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp
@@ -0,0 +1,25 @@
+Command `sandbox publish`:
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv read_indirect`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv read_indirect --concretize paths --args 0xA`:
+Error: No such file or directory (os error 2)
+Command `sandbox run storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv publish_addr --signers 0xA --args 0xB`:
+Error: Script file "storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv" does not exist
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv read_indirect --concretize paths --args 0xA`:
+Error: No such file or directory (os error 2)
+Command `sandbox run storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv publish --signers 0xB`:
+Error: Script file "storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv" does not exist
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv read_indirect --concretize paths --args 0xA`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeSecondaryIndexes.mv multi_arg --concretize paths --signers 0x1 --args 0xA 2`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv read_vec`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv read_vec --concretize paths --args 0x1`:
+Error: No such file or directory (os error 2)
+Command `sandbox run storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv publish --signers 0x1 0x2`:
+Error: Script file "storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv" does not exist
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv read_vec --concretize paths --args 0x1`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv write_vec --concretize paths --args 0x1 2`:
+Error: No such file or directory (os error 2)
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeSecondaryIndexes.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeSecondaryIndexes.move
new file mode 100644
index 000000000..c683578e6
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeSecondaryIndexes.move
@@ -0,0 +1,22 @@
+module 0x1::ConcretizeSecondaryIndexes {
+    struct Addr has key { a: address }
+    struct S has key { f: u64 }
+
+    public entry fun publish_addr(account: signer, a: address) {
+        move_to(&account, Addr { a })
+    }
+
+    public entry fun publish(account: signer) {
+        move_to(&account, S { f: 10 })
+    }
+
+    public entry fun read_indirect(a: address) acquires Addr, S {
+        let addr = *&borrow_global<Addr>(a).a;
+        borrow_global<S>(addr).f;
+    }
+
+    public entry fun multi_arg(_s: signer, a: address, _i: u64) acquires Addr, S {
+        let addr = *&borrow_global<Addr>(a).a;
+        borrow_global<S>(addr).f;
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeVector.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeVector.move
new file mode 100644
index 000000000..170ab4b37
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/sources/ConcretizeVector.move
@@ -0,0 +1,35 @@
+module 0x1::ConcretizeVector {
+    use std::signer;
+    use std::vector;
+
+    struct S has key { v: vector<address> }
+    struct T has key { f: u64 }
+
+    public entry fun publish(account1: signer, account2: signer) {
+        assert!(signer::address_of(&account1) == @0x1, 1);
+        assert!(signer::address_of(&account2) == @0x2, 2);
+        move_to(&account1, T { f: 1 });
+        move_to(&account2, T { f: 2 });
+
+        // There is a T resource at 0x1 and 0x2, but not 0x3
+        let addrs = vector::empty();
+        vector::push_back(&mut addrs, @0x1);
+        vector::push_back(&mut addrs, @0x2);
+        vector::push_back(&mut addrs, @0x3);
+
+        move_to(&account1, S { v: addrs });
+    }
+
+    public entry fun read_vec(a: address) acquires S, T {
+        let addrs = &borrow_global<S>(a).v;
+        let addr = *vector::borrow(addrs, 1);
+        borrow_global<T>(addr).f;
+    }
+
+    public entry fun write_vec(a: address, x: u64) acquires S, T {
+        let addrs = &borrow_global<S>(a).v;
+        let addr = *vector::borrow(addrs, 1);
+        *&mut borrow_global_mut<T>(addr).f = x
+    }
+
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md
new file mode 100644
index 000000000..376d5b6cd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/README.md
@@ -0,0 +1,26 @@
+## Test Case Explanation
+
+The goal of this test case is to check that the VM properly rejects a module
+with cyclic dependencies even in the multi-module publishing setting.
+
+Here is the procedure:
+
+1. publish two modules with dependencies `B --depends_on--> A`.
+
+   (See the code in package `p1`)
+
+
+2. compile a set of modules with dependencies `A --may_use--> C --depends_on--> B'`
+
+   (See the code in package `p2`)
+
+   NOTE that module `B'` is an update to module `B` with dependency to module
+   `A` removed.  We need this tweak here, otherwise, the compiler will flag the
+   cyclic dependency and we can never reach the publishing step to test the VM.
+
+
+3. publish the modules compiled in step 2, but only module `A` and `C` with the
+   `--override-ordering` flag. Without this flag, all modules will be published.
+
+   This will trigger the check on the VM side and the VM aborts correctly with
+   `INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES`.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
new file mode 100644
index 000000000..d8de26f5d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
@@ -0,0 +1,9 @@
+Command `-p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::A (wrote 114 bytes)
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000003::B (wrote 125 bytes)
+Wrote 239 bytes of module ID's and code
+Command `-p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v`:
+Found 3 modules
+Invalid multi-module publishing: VMError with status INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES at location Module ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000003, name: Identifier("C") } and message At least one module, 0000000000000000000000000000000000000000000000000000000000000003::A, appears in both the dependency set and the friend set
+Publishing failed with unexpected error INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml
new file mode 100644
index 000000000..8122f5f26
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "cyclic_multi_module_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move
new file mode 100644
index 000000000..3a68b35b5
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p1/sources/CyclicFriendsPart1.move
@@ -0,0 +1,7 @@
+module 0x3::A {
+    public fun foo() {}
+}
+
+module 0x3::B {
+    public fun foo() { 0x3::A::foo() }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml
new file mode 100644
index 000000000..8122f5f26
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "cyclic_multi_module_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move
new file mode 100644
index 000000000..4636c5691
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/p2/sources/CyclicFriendsPart2.move
@@ -0,0 +1,12 @@
+module 0x3::A {
+    public fun foo() {}
+}
+
+module 0x3::B {
+    public fun foo() {}
+}
+
+module 0x3::C {
+    friend 0x3::A;
+    public fun foo() { 0x3::B::foo() }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
new file mode 100644
index 000000000..b493d2708
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "doctor_with_stdlib"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
new file mode 100644
index 000000000..2716d857b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox doctor`:
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
new file mode 100644
index 000000000..1e7f6b8cd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/doctor_with_stdlib/sources/M.move
@@ -0,0 +1,9 @@
+address 0x2 {
+module M {
+    use std::debug;
+
+    fun f() {
+        debug::print(&7);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml
new file mode 100644
index 000000000..25a260f20
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "examples_published_dev_mode"
+version = "0.0.0"
+
+[addresses]
+Addr = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp
new file mode 100644
index 000000000..93aff9811
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/args.exp
@@ -0,0 +1,9 @@
+Command `sandbox publish -v`:
+Found 1 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 98 bytes)
+Wrote 98 bytes of module ID's and code
+Command `-d sandbox publish -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000001::Example (wrote 100 bytes)
+Updating an existing module 0000000000000000000000000000000000000000000000000000000000000001::Module (wrote 98 bytes)
+Wrote 198 bytes of module ID's and code
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move
new file mode 100644
index 000000000..3243baffd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/examples/Example.move
@@ -0,0 +1,2 @@
+module Addr::Example {
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move
new file mode 100644
index 000000000..95105893d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/examples_published_dev_mode/sources/Module.move
@@ -0,0 +1 @@
+module Addr::Module { }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
new file mode 100644
index 000000000..63e2701b7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_arithmetic_failure"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
new file mode 100644
index 000000000..f729dfdcb
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/script.move`:
+Execution failed because of an arithmetic error (i.e., integer overflow/underflow, div/mod by zero, or invalid shift) in script at code offset 2
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
new file mode 100644
index 000000000..c50366914
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_arithmetic_failure/sources/script.move
@@ -0,0 +1,5 @@
+script {
+    fun main() {
+        1 - 2; // will cause integer underflow
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml
new file mode 100644
index 000000000..a5a7d46e9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_missing_resource"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp
new file mode 100644
index 000000000..6bbfb33e9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/missing_resource.move`:
+Execution failed because of a RESOURCE_DOES_NOT_EXIST error (i.e., `move_from<T>(a)`, `borrow_global<T>(a)`, or `borrow_global_mut<T>(a)` when there is no resource of type `T` at address `a`) in 0000000000000000000000000000000000000000000000000000000000000002::MissingResource::f at code offset 1
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move
new file mode 100644
index 000000000..3e2d78519
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/scripts/missing_resource.move
@@ -0,0 +1,6 @@
+script {
+    use 0x2::MissingResource;
+    fun missing_resource() {
+        MissingResource::f();
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move
new file mode 100644
index 000000000..ab202a5b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_missing_resource/sources/MissingResource.move
@@ -0,0 +1,9 @@
+address 0x2 {
+module MissingResource {
+    struct R has key { }
+
+    public fun f() acquires R {
+        borrow_global<R>(@0x0);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml
new file mode 100644
index 000000000..217d4854f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_resource_already_exists"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp
new file mode 100644
index 000000000..2cf7a69ee
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/resource_already_exists.move --signers 0xA`:
+Execution failed because of a RESOURCE_ALREADY_EXISTS error (i.e., `move_to<T>(account)` when there is already a resource of type `T` under `account`) in 0000000000000000000000000000000000000000000000000000000000000002::ResourceExists::f at code offset 7
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move
new file mode 100644
index 000000000..ca46a0e39
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/scripts/resource_already_exists.move
@@ -0,0 +1,6 @@
+script {
+    use 0x2::ResourceExists;
+    fun resource_already_exists(account: signer) {
+        ResourceExists::f(&account);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move
new file mode 100644
index 000000000..c298a3ef0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_resource_already_exists/sources/ResourceExists.move
@@ -0,0 +1,10 @@
+address 0x2 {
+module ResourceExists {
+    struct R has key { }
+
+    public fun f(account: &signer) {
+        move_to<R>(account, R {});
+        move_to<R>(account, R {}); // will fail here
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
new file mode 100644
index 000000000..f3b9482f6
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "explain_stdlib_abort"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
new file mode 100644
index 000000000..639dbbd0e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/bad_borrow.move`:
+Execution failed because of an error originated from vector operations (i.e., index out of bound, pop an empty vector, or unpack a vector with a wrong parity) in script at code offset 4
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
new file mode 100644
index 000000000..40beeef53
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_stdlib_abort/sources/bad_borrow.move
@@ -0,0 +1,7 @@
+script {
+    use std::vector;
+    fun bad_borrow() {
+        let v = vector::empty<bool>();
+        let _ref = vector::borrow(&v, 0);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
new file mode 100644
index 000000000..0a336b3de
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_user_module_abort"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
new file mode 100644
index 000000000..e6721ea17
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/args.exp
@@ -0,0 +1,3 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/fail_script.move`:
+Execution aborted with code 77 in module 0000000000000000000000000000000000000000000000000000000000000002::Fail.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
new file mode 100644
index 000000000..369f8b216
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/scripts/fail_script.move
@@ -0,0 +1,6 @@
+script {
+    use 0x2::Fail;
+    fun fail_script() {
+        Fail::f();
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
new file mode 100644
index 000000000..955eb18c7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_module_abort/sources/Fail.move
@@ -0,0 +1,7 @@
+address 0x2 {
+module Fail {
+    public fun f() {
+        abort 77
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
new file mode 100644
index 000000000..56019a3fc
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "explain_user_tx_script_abort"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
new file mode 100644
index 000000000..3e9f0ecf8
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/abort_script.move`:
+Execution aborted with code 17 in transaction script
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
new file mode 100644
index 000000000..754f4d4e0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/explain_user_tx_script_abort/sources/abort_script.move
@@ -0,0 +1,5 @@
+script {
+    fun abort_script() {
+        abort 17
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml
new file mode 100644
index 000000000..166d65b67
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "gas_metering"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp
new file mode 100644
index 000000000..b3b52aa34
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox run sources/looper.move --gas-budget 100`:
+Execution failed because of an out of gas error in script at code offset 0
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
new file mode 100644
index 000000000..b2cbcdd58
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/gas_metering/sources/looper.move
@@ -0,0 +1,5 @@
+script {
+    fun looper() {
+        loop {}
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
new file mode 100644
index 000000000..f8dbe44ab
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "generate_struct_layout"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
new file mode 100644
index 000000000..49e2fd0f3
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
@@ -0,0 +1,41 @@
+Command `sandbox publish`:
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args u64`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args address`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args vector<u8>`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>>`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M2.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/M1.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __`:
+Error: Can't resolve module at "storage/0x00000000000000000000000000000001/modules/phantoms.mv"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
new file mode 100644
index 000000000..a12e3be55
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M1.move
@@ -0,0 +1,11 @@
+module 0x1::M1 {
+    use 0x1::M2::C;
+
+    struct A<T> { f: u64, v: vector<u8>, b: B<T> }
+
+    struct B<T> { a: address, c: C<T>, t: T }
+
+    struct S<T> { t: T }
+
+    struct G { x: u64, s: S<bool> }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
new file mode 100644
index 000000000..17e03489f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/M2.move
@@ -0,0 +1,4 @@
+module 0x1::M2 {
+
+    struct C<T> { t: T, b: bool }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
new file mode 100644
index 000000000..592b8eeb9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
@@ -0,0 +1,19 @@
+module 0x1::phantoms {
+    struct A<phantom T> {}
+
+    struct B<phantom T1, phantom T2> {}
+
+    struct C<phantom T1, phantom T2, phantom T3> {
+        a: A<T1>,
+        b: B<T2, T3>
+    }
+
+    struct D<phantom T1, T2: store> {
+        v: vector<T2>
+    }
+
+    struct E<T1, phantom T2: store, T3> {
+        v1: vector<T1>,
+        v2: vector<T3>
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
new file mode 100644
index 000000000..3540e09a0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "module_publish_view"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
+Deps1 = { local = "deps1" }
+Deps2 = { local = "deps2" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
new file mode 100644
index 000000000..4565e2163
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
@@ -0,0 +1,9 @@
+Command `sandbox publish -v`:
+Found 2 modules
+Publishing a new module 000000000000000000000000000000000000000000000000000000000000000a::M1 (wrote 247 bytes)
+Publishing a new module 000000000000000000000000000000000000000000000000000000000000000c::M (wrote 297 bytes)
+Wrote 544 bytes of module ID's and code
+Command `sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv`:
+Bytecode not found.
+Command `sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv`:
+Bytecode not found.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
new file mode 100644
index 000000000..1ef5af725
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps1"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
new file mode 100644
index 000000000..fb8f12e6c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xa::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
new file mode 100644
index 000000000..6884c72ab
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xA::A {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
new file mode 100644
index 000000000..73b27bc13
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps2"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
new file mode 100644
index 000000000..3b0ef36d2
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xb::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
new file mode 100644
index 000000000..25170afeb
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xB::B {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
new file mode 100644
index 000000000..c62537c59
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
@@ -0,0 +1,14 @@
+module 0xa::M1 {
+    use std::vector;
+
+    struct S { i: u64 }
+
+    public fun foo(x: u64): vector<u64> {
+        let y = bar();
+        vector::singleton(x + y)
+    }
+
+    public fun bar(): u64 {
+        7
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
new file mode 100644
index 000000000..658fca02b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
@@ -0,0 +1,18 @@
+module 0xc::M {
+
+    public fun f(): u64 {
+        7
+    }
+
+    public fun g(): u64 {
+        12
+    }
+
+    public fun call_f(): u64 {
+        f() + 0xa::M::f() + 0xb::M::f()
+    }
+
+    public fun call_g(): u64 {
+        g() + 0xa::A::g() + 0xb::B::g()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
new file mode 100644
index 000000000..c737ec728
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "module_publish_view"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
new file mode 100644
index 000000000..8a5628e89
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
@@ -0,0 +1,6 @@
+Command `sandbox publish -v`:
+Found 1 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::Module (wrote 152 bytes)
+Wrote 152 bytes of module ID's and code
+Command `sandbox view storage/0x00000000000000000000000000000042/modules/Module.mv`:
+Bytecode not found.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
new file mode 100644
index 000000000..3bde7f18c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/module_publish_view/sources/Module.move
@@ -0,0 +1,9 @@
+address 0x42 {
+module Module {
+    struct S { i: u64 }
+
+    public fun foo(i: u64): S {
+        S { i }
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
new file mode 100644
index 000000000..63d7cf4b9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "multi_module_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
new file mode 100644
index 000000000..22638bb3d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
@@ -0,0 +1,18 @@
+Command `sandbox publish --bundle --override-ordering A -v`:
+Found 2 modules
+Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("B") } in data cache
+Command `sandbox publish --bundle --override-ordering B -v`:
+Found 2 modules
+Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
+Command `sandbox publish --bundle --override-ordering B --override-ordering A -v`:
+Found 2 modules
+Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 0000000000000000000000000000000000000000000000000000000000000002, name: Identifier("A") } in data cache
+Command `sandbox publish --bundle --override-ordering A --override-ordering B -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::A (wrote 121 bytes)
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000002::B (wrote 129 bytes)
+Wrote 250 bytes of module ID's and code
+Command `sandbox view storage/0x00000000000000000000000000000002/modules/A.mv`:
+Bytecode not found.
+Command `sandbox view storage/0x00000000000000000000000000000002/modules/B.mv`:
+Bytecode not found.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
new file mode 100644
index 000000000..272fe9b21
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/multi_module_publish/sources/GoodFriends.move
@@ -0,0 +1,8 @@
+module 0x2::A {
+    friend 0x2::B;
+    public(friend) fun foo() {}
+}
+
+module 0x2::B {
+    fun bar() { 0x2::A::foo() }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml
new file mode 100644
index 000000000..13feeae8c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "build_include_exclude_stdlib"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
new file mode 100644
index 000000000..5051cf46c
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
@@ -0,0 +1,14 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/create_offer.move --signers 0xA11CE`:
+Command `sandbox run scripts/redeem_offer.move --signers 0xCA21`:
+Execution aborted with code 65536 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
+Command `sandbox run scripts/redeem_offer_bob.move --signers 0xB0B`:
+Command `sandbox run scripts/reclaim_offer.move --signers 0xB0B`:
+Command `sandbox clean`:
+Command `sandbox run scripts/self_offer_create.move --signers 0xA11CE`:
+Command `sandbox clean`:
+Command `sandbox run scripts/multi_offer.move --signers 0xA11CE`:
+Execution aborted with code 524289 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
+Command `sandbox clean`:
+Command `sandbox run scripts/non_existent_offer.move --signers 0xA11CE`:
+Execution aborted with code 393218 in module 0000000000000000000000000000000000000000000000000000000000000001::offer.
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move
new file mode 100644
index 000000000..909448d5a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/create_offer.move
@@ -0,0 +1,14 @@
+// 1
+script {
+use 0x1::M;
+use std::offer;
+use std::signer;
+
+// Alice creates an offer for Bob that contains an M::T resource
+fun create_offer(account: signer) {
+    let sender = signer::address_of(&account);
+    offer::create(&account, M::create(), @0xB0B);
+    assert!(offer::exists_at<M::T>(sender), 77);
+    assert!(offer::address_of<M::T>(sender) == @0xB0B , 78);
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move
new file mode 100644
index 000000000..2702012df
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/multi_offer.move
@@ -0,0 +1,8 @@
+// Script 1, sender: alice
+script {
+use std::offer;
+fun multi_offer(account: signer) {
+    offer::create(&account, 0, @0xA11CE);
+    offer::create(&account, 0, @0x4);
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move
new file mode 100644
index 000000000..61613cc99
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/non_existent_offer.move
@@ -0,0 +1,7 @@
+script {
+use std::offer;
+fun non_existent_offer(account: signer) {
+    offer::redeem<u64>(&account, @0xA11CE);
+    offer::address_of<u64>(@0xA11CE);
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move
new file mode 100644
index 000000000..5fd8aec06
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/reclaim_offer.move
@@ -0,0 +1,10 @@
+// script 4, sender: bob
+script {
+use 0x1::M;
+use std::offer;
+
+// Bob should be able to reclaim his own offer for Carl
+fun reclaim_offer(account: signer) {
+    M::publish(&account, offer::redeem<M::T>(&account, @0xB0B));
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move
new file mode 100644
index 000000000..082c9dfff
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer.move
@@ -0,0 +1,10 @@
+// script 2: sender: Carl
+script {
+use 0x1::M;
+use std::offer;
+
+// Carl should *not* be able to claim Alice's offer for Bob
+fun redeem_offer(account: signer) {
+    M::publish(&account, offer::redeem(&account, @0xA11CE));
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move
new file mode 100644
index 000000000..491b6e99a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/redeem_offer_bob.move
@@ -0,0 +1,17 @@
+// script 3, sender: bob
+script {
+use 0x1::M;
+use std::offer;
+
+// Bob should be able to claim Alice's offer for him
+fun redeem_offer_bob(account: signer) {
+    // claimed successfully
+    let redeemed: M::T = offer::redeem(&account, @0xA11CE);
+
+    // offer should not longer exist
+    assert!(!offer::exists_at<M::T>(@0xA11CE), 79);
+
+    // create a new offer for Carl
+    offer::create(&account, redeemed, @0xCA21);
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move
new file mode 100644
index 000000000..9c8905365
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/scripts/self_offer_create.move
@@ -0,0 +1,13 @@
+// Script 1, seder: alice
+script {
+use std::offer;
+use std::signer;
+
+// Create a self offer containing a u64
+fun self_offer_create(account: signer) {
+    let sender = signer::address_of(&account);
+    offer::create(&account, 7, @0xA11CE);
+    assert!(offer::address_of<u64>(sender) == @0xA11CE , 100);
+    assert!(offer::redeem(&account, @0xA11CE) == 7, 101);
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move
new file mode 100644
index 000000000..6ed3177bb
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/offer_smoke/sources/M.move
@@ -0,0 +1,14 @@
+// Just a dummy module with a test resource
+address 0x1 {
+module M {
+    struct T has key, store { b: bool }
+
+    public fun create(): T {
+        T { b: true }
+    }
+
+    public fun publish(account: &signer, t: T) {
+        move_to(account,  t);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml
new file mode 100644
index 000000000..3a0e252b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "PackageBasics"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
new file mode 100644
index 000000000..c5176df6b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
@@ -0,0 +1,104 @@
+Command `build`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Command `test --coverage --threads 1`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModule::double_three
+[ PASS    ] 0x1::AModule::double_two
+[ PASS    ] 0x1::AModuleTests::double_one_one
+[ PASS    ] 0x1::AModuleTests::double_three
+[ PASS    ] 0x1::AModuleTests::double_zero_zero
+[ PASS    ] 0x1::AModuleTests::double_zero_zero_wrong
+Test result: OK. Total tests: 6; passed: 6; failed: 0
+Command `coverage summary --summarize-functions`:
++-------------------------+
+| Move Coverage Summary   |
++-------------------------+
+Module 0000000000000000000000000000000000000000000000000000000000000001::AModule
+	fun double_except_three
+		total: 11
+		covered: 11
+		% coverage: 100.00
+>>> % Module coverage: 100.00
++-------------------------+
+| % Move Coverage: 100.00  |
++-------------------------+
+Command `coverage source --module AModule`:
+module std::AModule {
+
+    /// x was three
+    const E_IS_THREE: u64 = 0;
+
+    public fun double_except_three(x: u64): u64 {
+        assert!(x != 3, E_IS_THREE);
+        x * x
+    }
+
+    #[test]
+    fun double_two() {
+        assert!(double_except_three(4) == 16, 0)
+    }
+
+    #[test]
+    #[expected_failure]
+    fun double_three() {
+        double_except_three(3);
+    }
+}
+Command `coverage bytecode --module AModule`:
+// Move bytecode v6
+module 1.AModule {
+
+
+public double_except_three(x: u64): u64 {
+B0:
+[6]	0: CopyLoc[0](x: u64)
+[6]	1: LdU64(3)
+[6]	2: Neq
+[6]	3: BrFalse(5)
+B1:
+[4]	4: Branch(7)
+B2:
+[2]	5: LdConst[0](U64: [0, 0, 0, 0, 0, 0, 0, 0])
+[2]	6: Abort
+B3:
+[4]	7: CopyLoc[0](x: u64)
+[4]	8: MoveLoc[0](x: u64)
+[4]	9: Mul
+[4]	10: Ret
+}
+}
+Command `disassemble --package MoveStdlib --name signer`:
+// Move bytecode v6
+module 1.signer {
+
+
+public address_of(s: &signer): address {
+B0:
+	0: MoveLoc[0](s: &signer)
+	1: Call borrow_address(&signer): &address
+	2: ReadRef
+	3: Ret
+}
+native public borrow_address(s: &signer): &address
+}
+Command `errmap`:
+Command `info`:
+PackageBasics
+├─ std:0x1
+└─ MoveStdlib
+   └─ std:0x1
+Command `test double_two`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModule::double_two
+Test result: OK. Total tests: 1; passed: 1; failed: 0
+Command `test one_one`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModuleTests::double_one_one
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap
new file mode 100644
index 000000000..9aee442b1
Binary files /dev/null and b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap differ
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
new file mode 100644
index 000000000..4c186804d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/sources/AModule.move
@@ -0,0 +1,21 @@
+module std::AModule {
+
+    /// x was three
+    const E_IS_THREE: u64 = 0;
+
+    public fun double_except_three(x: u64): u64 {
+        assert!(x != 3, E_IS_THREE);
+        x * x
+    }
+
+    #[test]
+    fun double_two() {
+        assert!(double_except_three(4) == 16, 0)
+    }
+
+    #[test]
+    #[expected_failure]
+    fun double_three() {
+        double_except_three(3);
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
new file mode 100644
index 000000000..a1bebfeee
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
@@ -0,0 +1,26 @@
+#[test_only]
+module std::AModuleTests {
+    use std::AModule;
+
+    #[test]
+    fun double_zero_zero() {
+        assert!(AModule::double_except_three(0) == 0, 0)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location = std::AModule)]
+    fun double_three() {
+        AModule::double_except_three(3);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location = Self)]
+    fun double_zero_zero_wrong() {
+        assert!(AModule::double_except_three(0) == 1, 0)
+    }
+
+    #[test]
+    fun double_one_one() {
+        assert!(AModule::double_except_three(1) == 1, 0)
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
new file mode 100644
index 000000000..1530886a0
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "print_stack_trace"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
new file mode 100644
index 000000000..145843946
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
@@ -0,0 +1,178 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/print_stack_trace.move --dry-run`:
+Call Stack:
+    [0] main
+
+        Code:
+            [10] LdU64(1)
+            [11] VecImmBorrow(2)
+            [12] StLoc(0)
+          > [13] CallGeneric(0)
+            [14] StLoc(2)
+            [15] ImmBorrowLoc(2)
+            [16] CallGeneric(1)
+
+        Locals:
+            [0] false
+            [1] [true, false]
+            [2] -
+
+
+    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<bool, u64>
+
+        Code:
+            [2] MutBorrowLoc(0)
+            [3] StLoc(1)
+            [4] LdU64(4)
+          > [5] Call(1)
+            [6] StLoc(2)
+            [7] MoveLoc(1)
+            [8] Pop
+
+        Locals:
+            [0] 3
+            [1] 3
+            [2] -
+
+
+    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+Operand Stack:
+    [0] 4
+    [1] 3
+    [2] 2
+
+[debug] 10
+Call Stack:
+    [0] main
+
+        Code:
+            [16] CallGeneric(1)
+            [17] MoveLoc(0)
+            [18] Pop
+          > [19] CallGeneric(2)
+            [20] Pop
+            [21] Ret
+
+        Locals:
+            [0] -
+            [1] [true, false]
+            [2] 10
+
+
+    [1] 0000000000000000000000000000000000000000000000000000000000000002::N::foo<u8, bool>
+
+        Code:
+            [2] MutBorrowLoc(0)
+            [3] StLoc(1)
+            [4] LdU64(4)
+          > [5] Call(1)
+            [6] StLoc(2)
+            [7] MoveLoc(1)
+            [8] Pop
+
+        Locals:
+            [0] 3
+            [1] 3
+            [2] -
+
+
+    [2] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [3] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+    [4] 0000000000000000000000000000000000000000000000000000000000000002::M::sum
+
+        Code:
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
+
+        Locals:
+            [0] -
+            [1] -
+
+
+Operand Stack:
+    [0] 4
+    [1] 3
+    [2] 2
+
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
new file mode 100644
index 000000000..5b89a5361
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/scripts/print_stack_trace.move
@@ -0,0 +1,16 @@
+script {
+use std::debug;
+use std::vector;
+use 0x2::N;
+
+fun print_stack_trace() {
+    let v = vector::empty();
+    vector::push_back(&mut v, true);
+    vector::push_back(&mut v, false);
+    let r = vector::borrow(&mut v, 1);
+    let x = N::foo<bool, u64>();
+    debug::print(&x);
+    _ = r;
+    N::foo<u8,bool>();
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
new file mode 100644
index 000000000..3cc1425e2
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/M.move
@@ -0,0 +1,14 @@
+address 0x2 {
+module M {
+    use std::debug;
+
+    public fun sum(n: u64): u64 {
+        if (n < 2) {
+            debug::print_stack_trace();
+            n
+        } else {
+            n + sum(n - 1)
+        }
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
new file mode 100644
index 000000000..92e494a15
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_stack_trace/sources/N.move
@@ -0,0 +1,13 @@
+address 0x2 {
+module N {
+    use 0x2::M;
+
+    public fun foo<T1, T2>(): u64 {
+        let x = 3;
+        let y = &mut x;
+        let z = M::sum(4);
+        _ = y;
+        z
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/Move.toml
new file mode 100644
index 000000000..6d7495809
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "print_values"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+
+[dependencies]
+MoveNursery = { local = "../../../../../move-stdlib/nursery" }
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/args.exp
new file mode 100644
index 000000000..c6d94de4f
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/args.exp
@@ -0,0 +1,170 @@
+Command `sandbox publish`:
+Command `test`:
+INCLUDING DEPENDENCY MoveNursery
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING print_values
+Running Move unit tests
+[debug] 42
+[debug] [ 100, 200, 300 ]
+[debug] 0x2::M::Foo {
+  dummy_field: false
+}
+[debug] 0x2::M::Bar {
+  x: 404,
+  y: 0x2::M::Foo {
+    dummy_field: false
+  },
+  z: true
+}
+[debug] 0x2::M::Box<0x2::M::Foo> {
+  x: 0x2::M::Foo {
+    dummy_field: false
+  }
+}
+[debug] "test_print_quoted_string"
+[debug] "Can you say \"Hel\\lo\"?"
+[debug] "test_print_string"
+[debug] 0x48656c6c6f2c2073616e65204d6f766520646562756767696e6721
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_ascii_string"
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_primitive_types"
+[debug] 255
+[debug] 65535
+[debug] 4294967295
+[debug] 18446744073709551615
+[debug] 340282366920938463463374607431768211455
+[debug] 115792089237316195423570985008687907853269984665640564039457584007913129639935
+[debug] false
+[debug] true
+[debug] @0x1234c0ffee
+[debug] signer(0x0)
+[debug] "test_print_struct"
+[debug] 0x2::M::TestInner {
+  val: 100,
+  vec: [ 200, 400 ],
+  msgs: [
+    0x616263646566,
+    0x313233343536
+  ]
+}
+[debug] 0x2::M::TestInner {
+  val: 10,
+  vec: [],
+  msgs: []
+}
+[debug] "test_print_vectors"
+[debug] 0xffabcdef
+[debug] [ 16, 17, 18, 19 ]
+[debug] [ 32, 33, 34, 35 ]
+[debug] [ 64, 65, 66, 67 ]
+[debug] [ 128, 129, 130, 131 ]
+[debug] [ 256, 257, 258, 259 ]
+[debug] [ true, false ]
+[debug] [ @0x1234, @0x5678, @0xabcdef ]
+[debug] [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000), signer(0x200000000000000000000000000000000000000000000000000000000000000), signer(0x300000000000000000000000000000000000000000000000000000000000000) ]
+[debug] [
+  0x2::M::TestInner {
+    val: 4,
+    vec: [ 127, 128 ],
+    msgs: [
+      0x00ff,
+      0xabcd
+    ]
+  },
+  0x2::M::TestInner {
+    val: 8,
+    vec: [ 128, 129 ],
+    msgs: [
+      0x0000
+    ]
+  }
+]
+[debug] "test_print_vector_of_vectors"
+[debug] [
+  0xffab,
+  0xcdef
+]
+[debug] [
+  [ 16, 17 ],
+  [ 18, 19 ]
+]
+[debug] [
+  [ 32, 33 ],
+  [ 34, 35 ]
+]
+[debug] [
+  [ 64, 65 ],
+  [ 66, 67 ]
+]
+[debug] [
+  [ 128, 129 ],
+  [ 130, 131 ]
+]
+[debug] [
+  [ 256, 257 ],
+  [ 258, 259 ]
+]
+[debug] [
+  [ true, false ],
+  [ false, true ]
+]
+[debug] [
+  [ @0x1234, @0x5678 ],
+  [ @0xabcdef, @0x9999 ]
+]
+[debug] [
+  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ],
+  [ signer(0x0), signer(0x100000000000000000000000000000000000000000000000000000000000000) ]
+]
+[debug] [
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ],
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ]
+]
+[debug] "test_print_nested_struct"
+[debug] 0x2::M::TestStruct {
+  addr: @0x1,
+  number: 255,
+  bytes: 0xc0ffee,
+  name: "He\"llo",
+  vec: [
+    0x2::M::TestInner {
+      val: 1,
+      vec: [ 130, 131 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 2,
+      vec: [ 132, 133 ],
+      msgs: []
+    }
+  ]
+}
+[debug] "test_print_generic_struct"
+[debug] 0x2::M::GenericStruct<0x2::M::Foo> {
+  val: 60
+}
+[ PASS    ] 0x2::M::test
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
new file mode 100644
index 000000000..3b65890ac
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
@@ -0,0 +1,276 @@
+address 0x2 {
+module M {
+    #[test_only]
+    use std::ascii;
+    #[test_only]
+    use std::debug::print;
+    #[test_only]
+    use std::debug::print_string;
+    use std::string;
+    #[test_only]
+    use std::unit_test::create_signers_for_testing;
+    #[test_only]
+    use std::vector;
+
+    struct Foo has drop {}
+    struct Bar has drop { x: u128, y: Foo, z: bool }
+    struct Box<T> has drop { x: T }
+
+    struct GenericStruct<phantom T> has drop {
+        val: u64,
+    }
+
+    struct TestInner has drop {
+        val: u128,
+        vec: vector<u128>,
+        msgs: vector<vector<u8>>
+    }
+
+    struct TestStruct has drop {
+        addr: address,
+        number: u8,
+        bytes: vector<u8>,
+        name: string::String,
+        vec: vector<TestInner>,
+    }
+
+    #[test]
+    public fun test()  {
+        let x = 42;
+        print(&x);
+
+        let v = vector::empty();
+        vector::push_back(&mut v, 100);
+        vector::push_back(&mut v, 200);
+        vector::push_back(&mut v, 300);
+        print(&v);
+
+        let foo = Foo {};
+        print(&foo);
+
+        let bar = Bar { x: 404, y: Foo {}, z: true };
+        print(&bar);
+
+        let box = Box { x: Foo {} };
+        print(&box);
+
+        test_print_quoted_string();
+        test_print_string();
+        test_print_ascii_string();
+        test_print_primitive_types();
+        test_print_struct();
+        test_print_vectors();
+        test_print_vector_of_vectors();
+        test_print_nested_struct();
+        test_print_generic_struct();
+    }
+
+    #[test_only]
+    fun test_print_string() {
+        print_string(b"test_print_string");
+
+        let str_bytes = b"Hello, sane Move debugging!";
+
+        print(&str_bytes);
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_ascii_string() {
+        print_string(b"test_print_ascii_string");
+        print(&ascii::string(b"Hello, sane Move debugging!"));
+    }
+
+    #[test_only]
+    fun test_print_quoted_string() {
+        print_string(b"test_print_quoted_string");
+
+        let str_bytes = b"Can you say \"Hel\\lo\"?";
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_primitive_types() {
+        print_string(b"test_print_primitive_types");
+
+        let u8 = 255u8;
+        print(&u8);
+
+        let u16 = 65535u16;
+        print(&u16);
+
+        let u32 = 4294967295u32;
+        print(&u32);
+
+        let u64 = 18446744073709551615u64;
+        print(&u64);
+
+        let u128 = 340282366920938463463374607431768211455u128;
+        print(&u128);
+
+        let u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+        print(&u256);
+
+        let bool = false;
+        print(&bool);
+
+        let bool = true;
+        print(&bool);
+
+        let a = @0x1234c0ffee;
+        print(&a);
+
+        // print a signer
+        let senders = create_signers_for_testing(1);
+        let sender = vector::pop_back(&mut senders);
+        print(&sender);
+    }
+
+    const MSG_1 : vector<u8> = b"abcdef";
+    const MSG_2 : vector<u8> = b"123456";
+
+    #[test_only]
+    fun test_print_struct() {
+        print_string(b"test_print_struct");
+
+        let obj = TestInner {
+            val: 100,
+            vec: vector[200u128, 400u128],
+            msgs: vector[MSG_1, MSG_2],
+        };
+
+        print(&obj);
+
+        let obj = TestInner {
+            val: 10,
+            vec: vector[],
+            msgs: vector[],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_vectors() {
+        print_string(b"test_print_vectors");
+
+        let v_u8 = x"ffabcdef";
+        print(&v_u8);
+
+        let v_u16 = vector[16u16, 17u16, 18u16, 19u16];
+        print(&v_u16);
+
+        let v_u32 = vector[32u32, 33u32, 34u32, 35u32];
+        print(&v_u32);
+
+        let v_u64 = vector[64u64, 65u64, 66u64, 67u64];
+        print(&v_u64);
+
+        let v_u128 = vector[128u128, 129u128, 130u128, 131u128];
+        print(&v_u128);
+
+        let v_u256 = vector[256u256, 257u256, 258u256, 259u256];
+        print(&v_u256);
+
+        let v_bool = vector[true, false];
+        print(&v_bool);
+
+        let v_addr = vector[@0x1234, @0x5678, @0xabcdef];
+        print(&v_addr);
+
+        let v_signer = create_signers_for_testing(4);
+        print(&v_signer);
+
+        let v = vector[
+            TestInner {
+                val: 4u128,
+                vec: vector[127u128, 128u128],
+                msgs: vector[x"00ff", x"abcd"],
+            },
+            TestInner {
+                val: 8u128 ,
+                vec: vector[128u128, 129u128],
+                msgs: vector[x"0000"],
+            }
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_vector_of_vectors() {
+        print_string(b"test_print_vector_of_vectors");
+
+        let v_u8 = vector[x"ffab", x"cdef"];
+        print(&v_u8);
+
+        let v_u16 = vector[vector[16u16, 17u16], vector[18u16, 19u16]];
+        print(&v_u16);
+
+        let v_u32 = vector[vector[32u32, 33u32], vector[34u32, 35u32]];
+        print(&v_u32);
+
+        let v_u64 = vector[vector[64u64, 65u64], vector[66u64, 67u64]];
+        print(&v_u64);
+
+        let v_u128 = vector[vector[128u128, 129u128], vector[130u128, 131u128]];
+        print(&v_u128);
+
+        let v_u256 = vector[vector[256u256, 257u256], vector[258u256, 259u256]];
+        print(&v_u256);
+
+        let v_bool = vector[vector[true, false], vector[false, true]];
+        print(&v_bool);
+
+        let v_addr = vector[vector[@0x1234, @0x5678], vector[@0xabcdef, @0x9999]];
+        print(&v_addr);
+
+        let v_signer = vector[create_signers_for_testing(2), create_signers_for_testing(2)];
+        print(&v_signer);
+
+        let v = vector[
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ],
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ]
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_nested_struct() {
+        print_string(b"test_print_nested_struct");
+
+        let obj = TestStruct {
+            addr: @0x1,
+            number: 255u8,
+            bytes: x"c0ffee",
+            name: string::utf8(b"He\"llo"),
+            vec: vector[
+                TestInner { val: 1, vec: vector[130u128, 131u128], msgs: vector[] },
+                TestInner { val: 2, vec: vector[132u128, 133u128], msgs: vector[] }
+            ],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_generic_struct() {
+        print_string(b"test_print_generic_struct");
+
+        let obj = GenericStruct<Foo> {
+        val: 60u64,
+        };
+
+        print(&obj);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
new file mode 100644
index 000000000..65548f920
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "publish_then_run"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp
new file mode 100644
index 000000000..d7b74549e
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox run scripts/main.move`:
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
new file mode 100644
index 000000000..9bed1bc40
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/scripts/main.move
@@ -0,0 +1,3 @@
+script {
+fun main() {}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
new file mode 100644
index 000000000..aac8c3531
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/publish_then_run/sources/M.move
@@ -0,0 +1,5 @@
+address 0x2 {
+module M {
+    public fun f() {}
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/Move.toml
new file mode 100644
index 000000000..69e16e4f9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "read_write_set"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/args.exp
new file mode 100644
index 000000000..27dfddbb1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/args.exp
@@ -0,0 +1,5 @@
+Command `sandbox publish`:
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/RWSet.mv read_f -v`:
+Error: No such file or directory (os error 2)
+Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/RWSet.mv write_f -v`:
+Error: No such file or directory (os error 2)
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/sources/RWSet.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/sources/RWSet.move
new file mode 100644
index 000000000..3f25681ea
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/read_write_set/sources/RWSet.move
@@ -0,0 +1,13 @@
+address 0x1 {
+module RWSet {
+    struct S { f: u64 }
+
+    public fun read_f(s: &S): u64 {
+        s.f
+    }
+
+    public fun write_f(s: &mut S) {
+        s.f = 7;
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/Move.toml
new file mode 100644
index 000000000..3169eb4c5
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "republish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/args.exp
new file mode 100644
index 000000000..185b372c2
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/args.exp
@@ -0,0 +1,21 @@
+Command `sandbox publish -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
+Publishing a new module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 88 bytes)
+Wrote 176 bytes of module ID's and code
+Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
+Bytecode not found.
+Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
+Bytecode not found.
+Command `sandbox publish -v`:
+Found 2 modules
+Updating an existing module 0000000000000000000000000000000000000000000000000000000000000042::M (wrote 88 bytes)
+Updating an existing module 0000000000000000000000000000000000000000000000000000000000000043::N (wrote 88 bytes)
+Wrote 176 bytes of module ID's and code
+Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
+Bytecode not found.
+Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
+Bytecode not found.
+Command `sandbox publish -v --no-republish`:
+Found 2 modules
+Failed to republish modules since the --no-republish flag is set. Tried to republish the following modules: 0000000000000000000000000000000000000000000000000000000000000042::M, 0000000000000000000000000000000000000000000000000000000000000043::N
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/M.move
new file mode 100644
index 000000000..4c50013da
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/M.move
@@ -0,0 +1,5 @@
+address 0x42 {
+module M {
+
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/N.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/N.move
new file mode 100644
index 000000000..cfac5ac3b
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish/sources/N.move
@@ -0,0 +1,4 @@
+address 0x43 {
+module N {
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml
new file mode 100644
index 000000000..754b8df90
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "republish_module"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/args.exp
new file mode 100644
index 000000000..a0896d016
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/args.exp
@@ -0,0 +1,2 @@
+Command `sandbox publish`:
+Command `sandbox publish`:
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move
new file mode 100644
index 000000000..aac8c3531
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/republish_module/sources/M.move
@@ -0,0 +1,5 @@
+address 0x2 {
+module M {
+    public fun f() {}
+}
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml
new file mode 100644
index 000000000..cfdde9f41
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "use_named_address"
+version = "0.0.0"
+
+[addresses]
+A = "0x42"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp
new file mode 100644
index 000000000..fd9fe2618
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/args.exp
@@ -0,0 +1,12 @@
+Command `sandbox publish`:
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ ./sources/M_no_named.move:1:14
+  │
+1 │ module 0x42::M {
+  │              ^ Duplicate definition for module '0x42::M'
+  │
+  ┌─ ./sources/M.move:1:11
+  │
+1 │ module A::M {
+  │           - Module previously defined here, with '(A=0x42)::M'
+
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
new file mode 100644
index 000000000..a4c0e1174
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M.move
@@ -0,0 +1,4 @@
+module A::M {
+    public fun useless() {
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
new file mode 100644
index 000000000..5892ff62d
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/M_no_named.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    public fun useless() {
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
new file mode 100644
index 000000000..be69510de
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/use_named_address/sources/N.move
@@ -0,0 +1,6 @@
+
+module A::N {
+    public fun useless() {
+        A::M::useless()
+    }
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
new file mode 100644
index 000000000..25d4f10fd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "verify_native_functions_in_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
new file mode 100644
index 000000000..ef5d34e02
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
@@ -0,0 +1 @@
+Command `sandbox publish --bundle --override-ordering M --override-ordering N`:
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
new file mode 100644
index 000000000..916813c8a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    native fun create_signer(addr: address): signer;
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
new file mode 100644
index 000000000..62eccfb87
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
@@ -0,0 +1,4 @@
+module 0x42::N {
+    native fun create_signer(addr: address): signer;
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
new file mode 100644
index 000000000..25d4f10fd
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "verify_native_functions_in_publish"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
new file mode 100644
index 000000000..64ff72dc9
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/args.exp
@@ -0,0 +1 @@
+Command `sandbox publish`:
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
new file mode 100644
index 000000000..916813c8a
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_publish/sources/example.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    native fun create_signer(addr: address): signer;
+    native fun create_nothing();
+}
diff --git a/vendors/move/crates/tools/move-cli/tests/sandbox_testsuite.rs b/vendors/move/crates/tools/move-cli/tests/sandbox_testsuite.rs
new file mode 100644
index 000000000..1cd24cfa7
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/sandbox_testsuite.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_cli::sandbox::commands::test;
+use std::path::{Path, PathBuf};
+
+fn run_all(args_path: &Path) -> datatest_stable::Result<()> {
+    let cli_exe = env!("CARGO_BIN_EXE_move");
+    let use_temp_dir = !args_path.parent().unwrap().join("NO_TEMPDIR").exists();
+    test::run_one(
+        args_path,
+        &PathBuf::from(cli_exe),
+        /* use_temp_dir */ use_temp_dir,
+        /* track_cov */ false,
+    )?;
+    Ok(())
+}
+
+// runs all the tests
+datatest_stable::harness!(run_all, "tests/sandbox_tests", r"args\.txt$");
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml b/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/Move.toml b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/Move.toml b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/Move.toml b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
new file mode 100644
index 000000000..637d99d85
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
new file mode 100644
index 000000000..45646f1b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/vendors/move/crates/tools/move-disassembler/Cargo.toml b/vendors/move/crates/tools/move-disassembler/Cargo.toml
new file mode 100644
index 000000000..fedcbc650
--- /dev/null
+++ b/vendors/move/crates/tools/move-disassembler/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-disassembler"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Print a human-readable version of Move bytecode (.mv files)"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+colored = "2.0.0"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-source-map = { path = "../../move-bytecode-source-map" }
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-coverage = { path = "../move-coverage" }
+move-ir-types = { path = "../../move-ir/types" }
+
+clap = { version = "3.1.8", features = ["derive"] }
+
+[features]
+default = []
diff --git a/vendors/move/crates/tools/move-disassembler/src/disassembler.rs b/vendors/move/crates/tools/move-disassembler/src/disassembler.rs
new file mode 100644
index 000000000..95b4c9462
--- /dev/null
+++ b/vendors/move/crates/tools/move-disassembler/src/disassembler.rs
@@ -0,0 +1,1321 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, format_err, Error, Result};
+use clap::Parser;
+use colored::*;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
+    file_format::{
+        Ability, AbilitySet, Bytecode, CodeUnit, FieldHandleIndex, FunctionDefinition,
+        FunctionDefinitionIndex, FunctionHandle, ModuleHandle, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructDefinitionIndex, StructFieldInformation,
+        StructTypeParameter, TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_bytecode_source_map::{
+    mapping::SourceMapping,
+    source_map::{FunctionSourceMap, SourceName},
+};
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule, NamedCompiledScript};
+use move_core_types::{ident_str, identifier::IdentStr, language_storage::ModuleId};
+use move_coverage::coverage_map::{ExecCoverageMap, FunctionCoverage};
+use move_ir_types::location::Loc;
+use std::collections::HashMap;
+
+/// Holds the various options that we support while disassembling code.
+#[derive(Debug, Default, Parser)]
+pub struct DisassemblerOptions {
+    /// Only print non-private functions
+    #[clap(long = "only-public")]
+    pub only_externally_visible: bool,
+
+    /// Print the bytecode for the instructions within the function.
+    #[clap(long = "print-code")]
+    pub print_code: bool,
+
+    /// Print the basic blocks of the bytecode.
+    #[clap(long = "print-basic-blocks")]
+    pub print_basic_blocks: bool,
+
+    /// Print the locals inside each function body.
+    #[clap(long = "print-locals")]
+    pub print_locals: bool,
+}
+
+impl DisassemblerOptions {
+    pub fn new() -> Self {
+        Self {
+            only_externally_visible: false,
+            print_code: true,
+            print_basic_blocks: true,
+            print_locals: true,
+        }
+    }
+}
+
+pub struct Disassembler<'a> {
+    source_mapper: SourceMapping<'a>,
+    // The various options that we can set for disassembly.
+    options: DisassemblerOptions,
+    // Optional coverage map for use in displaying code coverage
+    coverage_map: Option<ExecCoverageMap>,
+    /// If the code being disassembled imports multiple modules of the form (a, SameModuleName)
+    /// `module_alias` will contain an entry for each distinct a
+    /// e.g., for `use 0xA::M; use 0xB::M`, this will contain [(0xA, M) -> M, (0xB, M) -> 1M]
+    module_aliases: HashMap<ModuleId, String>,
+}
+
+impl<'a> Disassembler<'a> {
+    pub fn new(source_mapper: SourceMapping<'a>, options: DisassemblerOptions) -> Self {
+        let mut module_names = HashMap::new();
+        let mut module_aliases = HashMap::new();
+        module_names.extend(
+            source_mapper
+                .bytecode
+                .self_id()
+                .map(|id| (id.name().to_string(), 0)),
+        );
+        for h in source_mapper.bytecode.module_handles() {
+            let id = source_mapper.bytecode.module_id_for_handle(h);
+            let module_name = id.name().to_string();
+            module_names
+                .entry(module_name.clone())
+                .and_modify(|name_count| {
+                    // This module imports >1 modules named `name`--add alias <count><module_name> for `id`.
+                    // Move identifiers cannot begin with an integer,
+                    // so this is guaranteed not to conflict with other module names.
+                    module_aliases.insert(id, format!("{}{}", name_count, module_name));
+                    *name_count += 1;
+                })
+                .or_insert(0);
+        }
+        Self {
+            source_mapper,
+            options,
+            coverage_map: None,
+            module_aliases,
+        }
+    }
+
+    pub fn from_view(view: BinaryIndexedView<'a>, default_loc: Loc) -> Result<Self> {
+        let mut options = DisassemblerOptions::new();
+        options.print_code = true;
+        Ok(Self::new(
+            SourceMapping::new_from_view(view, default_loc)?,
+            options,
+        ))
+    }
+
+    pub fn from_unit(unit: &'a CompiledUnit) -> Self {
+        let options = DisassemblerOptions::new();
+        let source_map = unit.source_map().clone();
+        let index_view = match unit {
+            CompiledUnit::Module(NamedCompiledModule { module, .. }) => {
+                BinaryIndexedView::Module(module)
+            },
+            CompiledUnit::Script(NamedCompiledScript { script, .. }) => {
+                BinaryIndexedView::Script(script)
+            },
+        };
+
+        let source_mapping = SourceMapping::new(source_map, index_view);
+        Disassembler::new(source_mapping, options)
+    }
+
+    pub fn add_coverage_map(&mut self, coverage_map: ExecCoverageMap) {
+        self.coverage_map = Some(coverage_map);
+    }
+
+    //***************************************************************************
+    // Helpers
+    //***************************************************************************
+
+    fn get_function_string(
+        &self,
+        module_handle: &ModuleHandle,
+        function_handle: &FunctionHandle,
+    ) -> String {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        let function_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(function_handle.name)
+            .to_string();
+        if self.is_self_id(&module_id) {
+            // this is the "self" module. Omit the "module_name::" prefix
+            function_name
+        } else {
+            let module_name = self
+                .module_aliases
+                .get(&module_id)
+                .cloned()
+                .unwrap_or_else(|| module_id.name().to_string());
+            format!("{}::{}", module_name, function_name)
+        }
+    }
+
+    fn get_import_string(&self, module_handle: &ModuleHandle) -> Option<String> {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        if self.is_self_id(&module_id) {
+            // No need to import self handle
+            None
+        } else if let Some(alias) = self.module_aliases.get(&module_id) {
+            Some(format!(
+                "use {}::{} as {};",
+                module_id.address(),
+                module_id.name(),
+                alias
+            ))
+        } else {
+            Some(format!(
+                "use {}::{};",
+                module_id.address(),
+                module_id.name()
+            ))
+        }
+    }
+
+    fn is_self_id(&self, mid: &ModuleId) -> bool {
+        self.source_mapper
+            .bytecode
+            .self_id()
+            .map(|id| &id == mid)
+            .unwrap_or(false)
+    }
+
+    fn get_function_def(
+        &self,
+        function_definition_index: FunctionDefinitionIndex,
+    ) -> Result<&FunctionDefinition> {
+        if function_definition_index.0 as usize
+            >= self
+                .source_mapper
+                .bytecode
+                .function_defs()
+                .map_or(0, |f| f.len())
+        {
+            bail!("Invalid function definition index supplied when marking function")
+        }
+        match self
+            .source_mapper
+            .bytecode
+            .function_def_at(function_definition_index)
+        {
+            Ok(definition) => Ok(definition),
+            Err(err) => Err(Error::new(err)),
+        }
+    }
+
+    fn get_struct_def(
+        &self,
+        struct_definition_index: StructDefinitionIndex,
+    ) -> Result<&StructDefinition> {
+        if struct_definition_index.0 as usize
+            >= self
+                .source_mapper
+                .bytecode
+                .struct_defs()
+                .map_or(0, |d| d.len())
+        {
+            bail!("Invalid struct definition index supplied when marking struct")
+        }
+        match self
+            .source_mapper
+            .bytecode
+            .struct_def_at(struct_definition_index)
+        {
+            Ok(definition) => Ok(definition),
+            Err(err) => Err(Error::new(err)),
+        }
+    }
+
+    //***************************************************************************
+    // Code Coverage Helpers
+    //***************************************************************************
+
+    fn get_function_coverage(&self, function_name: &IdentStr) -> Option<&FunctionCoverage> {
+        self.source_mapper
+            .source_map
+            .module_name_opt
+            .as_ref()
+            .and_then(|module| {
+                self.coverage_map.as_ref().and_then(|coverage_map| {
+                    coverage_map
+                        .module_maps
+                        .get(module)
+                        .and_then(|module_map| module_map.get_function_coverage(function_name))
+                })
+            })
+    }
+
+    fn is_function_called(&self, function_name: &IdentStr) -> bool {
+        self.get_function_coverage(function_name).is_some()
+    }
+
+    fn format_function_coverage(&self, name: &IdentStr, function_body: String) -> String {
+        if self.coverage_map.is_none() {
+            return function_body;
+        }
+        if self.is_function_called(name) {
+            function_body.green()
+        } else {
+            function_body.red()
+        }
+        .to_string()
+    }
+
+    fn format_with_instruction_coverage(
+        &self,
+        pc: usize,
+        function_coverage_map: Option<&FunctionCoverage>,
+        instruction: String,
+    ) -> String {
+        if self.coverage_map.is_none() {
+            return format!("\t{}: {}", pc, instruction);
+        }
+        let coverage = function_coverage_map.and_then(|map| map.get(&(pc as u64)));
+        match coverage {
+            Some(coverage) => format!("[{}]\t{}: {}", coverage, pc, instruction).green(),
+            None => format!("\t{}: {}", pc, instruction).red(),
+        }
+        .to_string()
+    }
+
+    //***************************************************************************
+    // Formatting Helpers
+    //***************************************************************************
+
+    fn name_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
+        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
+        let struct_def = self
+            .source_mapper
+            .bytecode
+            .struct_def_at(field_handle.owner)?;
+        let field_def = match &struct_def.field_information {
+            StructFieldInformation::Native => {
+                return Err(format_err!("Attempt to access field on a native struct"));
+            },
+            StructFieldInformation::Declared(fields) => fields
+                .get(field_handle.field as usize)
+                .ok_or_else(|| format_err!("Bad field index"))?,
+        };
+        let field_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(field_def.name)
+            .to_string();
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_def.struct_handle);
+        let struct_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+        Ok(format!("{}.{}", struct_name, field_name))
+    }
+
+    fn type_for_field(&self, field_idx: FieldHandleIndex) -> Result<String> {
+        let field_handle = self.source_mapper.bytecode.field_handle_at(field_idx)?;
+        let struct_def = self
+            .source_mapper
+            .bytecode
+            .struct_def_at(field_handle.owner)?;
+        let field_def = match &struct_def.field_information {
+            StructFieldInformation::Native => {
+                return Err(format_err!("Attempt to access field on a native struct"));
+            },
+            StructFieldInformation::Declared(fields) => fields
+                .get(field_handle.field as usize)
+                .ok_or_else(|| format_err!("Bad field index"))?,
+        };
+        let struct_source_info = self
+            .source_mapper
+            .source_map
+            .get_struct_source_map(field_handle.owner)?;
+        let field_type_sig = field_def.signature.0.clone();
+        let ty = self.disassemble_sig_tok(field_type_sig, &struct_source_info.type_parameters)?;
+        Ok(ty)
+    }
+
+    fn struct_type_info(
+        &self,
+        struct_idx: StructDefinitionIndex,
+        signature: &Signature,
+        type_param_context: &[SourceName],
+    ) -> Result<(String, String)> {
+        let struct_definition = self.get_struct_def(struct_idx)?;
+        let type_arguments = signature
+            .0
+            .iter()
+            .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), type_param_context))
+            .collect::<Result<Vec<String>>>()?;
+
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_definition.struct_handle);
+        let name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+        Ok((name, Self::format_type_params(&type_arguments)))
+    }
+
+    fn name_for_parameter_or_local(
+        &self,
+        local_idx: usize,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let name = function_source_map
+                .get_parameter_or_local_name(local_idx as u64)
+                .ok_or_else(|| {
+                    format_err!(
+                        "Unable to get local name at index {} while disassembling location-based instruction", local_idx
+                    )
+                })?
+                .0;
+        Ok(name)
+    }
+
+    fn type_for_parameter_or_local(
+        &self,
+        idx: usize,
+        parameters: &Signature,
+        locals: &Signature,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let sig_tok = if idx < parameters.len() {
+            &parameters.0[idx]
+        } else if idx < parameters.len() + locals.len() {
+            &locals.0[idx - parameters.len()]
+        } else {
+            bail!("Unable to get type for parameter or local at index {}", idx)
+        };
+        self.disassemble_sig_tok(sig_tok.clone(), &function_source_map.type_parameters)
+    }
+
+    fn type_for_local(
+        &self,
+        local_idx: usize,
+        locals: &Signature,
+        function_source_map: &FunctionSourceMap,
+    ) -> Result<String> {
+        let sig_tok = locals
+            .0
+            .get(local_idx)
+            .ok_or_else(|| format_err!("Unable to get type for local at index {}", local_idx))?;
+        self.disassemble_sig_tok(sig_tok.clone(), &function_source_map.type_parameters)
+    }
+
+    fn format_ability(a: Ability) -> String {
+        match a {
+            Ability::Copy => "copy",
+            Ability::Drop => "drop",
+            Ability::Store => "store",
+            Ability::Key => "key",
+        }
+        .to_string()
+    }
+
+    fn format_type_params(ty_params: &[String]) -> String {
+        if ty_params.is_empty() {
+            "".to_string()
+        } else {
+            format!("<{}>", ty_params.join(", "))
+        }
+    }
+
+    fn format_ret_type(ty_rets: &[String]) -> String {
+        if ty_rets.is_empty() {
+            "".to_string()
+        } else {
+            format!(": {}", ty_rets.join(" * "))
+        }
+    }
+
+    fn format_function_body(locals: Vec<String>, bytecode: Vec<String>) -> String {
+        if locals.is_empty() && bytecode.is_empty() {
+            "".to_string()
+        } else {
+            let body_iter: Vec<String> = locals
+                .into_iter()
+                .enumerate()
+                .map(|(local_idx, local)| format!("L{}:\t{}", local_idx, local))
+                .chain(bytecode.into_iter())
+                .collect();
+            format!(" {{\n{}\n}}", body_iter.join("\n"))
+        }
+    }
+
+    //***************************************************************************
+    // Disassemblers
+    //***************************************************************************
+
+    // These need to be in the context of a function or a struct definition since type parameters
+    // can refer to function/struct type parameters.
+    fn disassemble_sig_tok(
+        &self,
+        sig_tok: SignatureToken,
+        type_param_context: &[SourceName],
+    ) -> Result<String> {
+        Ok(match sig_tok {
+            SignatureToken::Bool => "bool".to_string(),
+            SignatureToken::U8 => "u8".to_string(),
+            SignatureToken::U16 => "u16".to_string(),
+            SignatureToken::U32 => "u32".to_string(),
+            SignatureToken::U64 => "u64".to_string(),
+            SignatureToken::U128 => "u128".to_string(),
+            SignatureToken::U256 => "u256".to_string(),
+            SignatureToken::Address => "address".to_string(),
+            SignatureToken::Signer => "signer".to_string(),
+            SignatureToken::Struct(struct_handle_idx) => self
+                .source_mapper
+                .bytecode
+                .identifier_at(
+                    self.source_mapper
+                        .bytecode
+                        .struct_handle_at(struct_handle_idx)
+                        .name,
+                )
+                .to_string(),
+            SignatureToken::StructInstantiation(struct_handle_idx, instantiation) => {
+                let instantiation = instantiation
+                    .into_iter()
+                    .map(|tok| self.disassemble_sig_tok(tok, type_param_context))
+                    .collect::<Result<Vec<_>>>()?;
+                let formatted_instantiation = Self::format_type_params(&instantiation);
+                let name = self
+                    .source_mapper
+                    .bytecode
+                    .identifier_at(
+                        self.source_mapper
+                            .bytecode
+                            .struct_handle_at(struct_handle_idx)
+                            .name,
+                    )
+                    .to_string();
+                format!("{}{}", name, formatted_instantiation)
+            },
+            SignatureToken::Vector(sig_tok) => format!(
+                "vector<{}>",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::Reference(sig_tok) => format!(
+                "&{}",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::MutableReference(sig_tok) => format!(
+                "&mut {}",
+                self.disassemble_sig_tok(*sig_tok, type_param_context)?
+            ),
+            SignatureToken::TypeParameter(ty_param_index) => type_param_context
+                .get(ty_param_index as usize)
+                .ok_or_else(|| {
+                    format_err!(
+                        "Type parameter index {} out of bounds while disassembling type signature",
+                        ty_param_index
+                    )
+                })?
+                .0
+                .to_string(),
+        })
+    }
+
+    fn disassemble_instruction(
+        &self,
+        parameters: &Signature,
+        instruction: &Bytecode,
+        locals_sigs: &Signature,
+        function_source_map: &FunctionSourceMap,
+        default_location: &Loc,
+    ) -> Result<String> {
+        match instruction {
+            Bytecode::LdConst(idx) => {
+                let constant = self.source_mapper.bytecode.constant_at(*idx);
+                Ok(format!(
+                    "LdConst[{}]({:?}: {:?})",
+                    idx, &constant.type_, &constant.data
+                ))
+            },
+            Bytecode::CopyLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("CopyLoc[{}]({}: {})", local_idx, name, ty))
+            },
+            Bytecode::MoveLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("MoveLoc[{}]({}: {})", local_idx, name, ty))
+            },
+            Bytecode::StLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("StLoc[{}]({}: {})", local_idx, name, ty))
+            },
+            Bytecode::MutBorrowLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("MutBorrowLoc[{}]({}: {})", local_idx, name, ty))
+            },
+            Bytecode::ImmBorrowLoc(local_idx) => {
+                let name =
+                    self.name_for_parameter_or_local(usize::from(*local_idx), function_source_map)?;
+                let ty = self.type_for_parameter_or_local(
+                    usize::from(*local_idx),
+                    parameters,
+                    locals_sigs,
+                    function_source_map,
+                )?;
+                Ok(format!("ImmBorrowLoc[{}]({}: {})", local_idx, name, ty))
+            },
+            Bytecode::MutBorrowField(field_idx) => {
+                let name = self.name_for_field(*field_idx)?;
+                let ty = self.type_for_field(*field_idx)?;
+                Ok(format!("MutBorrowField[{}]({}: {})", field_idx, name, ty))
+            },
+            Bytecode::MutBorrowFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .field_instantiation_at(*field_idx)?;
+                let name = self.name_for_field(field_inst.handle)?;
+                let ty = self.type_for_field(field_inst.handle)?;
+                Ok(format!(
+                    "MutBorrowFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
+            Bytecode::ImmBorrowField(field_idx) => {
+                let name = self.name_for_field(*field_idx)?;
+                let ty = self.type_for_field(*field_idx)?;
+                Ok(format!("ImmBorrowField[{}]({}: {})", field_idx, name, ty))
+            },
+            Bytecode::ImmBorrowFieldGeneric(field_idx) => {
+                let field_inst = self
+                    .source_mapper
+                    .bytecode
+                    .field_instantiation_at(*field_idx)?;
+                let name = self.name_for_field(field_inst.handle)?;
+                let ty = self.type_for_field(field_inst.handle)?;
+                Ok(format!(
+                    "ImmBorrowFieldGeneric[{}]({}: {})",
+                    field_idx, name, ty
+                ))
+            },
+            Bytecode::Pack(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Pack[{}]({}{})", struct_idx, name, ty_params))
+            },
+            Bytecode::PackGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "PackGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::Unpack(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Unpack[{}]({}{})", struct_idx, name, ty_params))
+            },
+            Bytecode::UnpackGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "UnpackGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::Exists(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("Exists[{}]({}{})", struct_idx, name, ty_params))
+            },
+            Bytecode::ExistsGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ExistsGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::MutBorrowGlobal(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MutBorrowGlobal[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::MutBorrowGlobalGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MutBorrowGlobalGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::ImmBorrowGlobal(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ImmBorrowGlobal[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::ImmBorrowGlobalGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "ImmBorrowGlobalGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::MoveFrom(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("MoveFrom[{}]({}{})", struct_idx, name, ty_params))
+            },
+            Bytecode::MoveFromGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MoveFromGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::MoveTo(struct_idx) => {
+                let (name, ty_params) = self.struct_type_info(
+                    *struct_idx,
+                    &Signature(vec![]),
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!("MoveTo[{}]({}{})", struct_idx, name, ty_params))
+            },
+            Bytecode::MoveToGeneric(struct_idx) => {
+                let struct_inst = self
+                    .source_mapper
+                    .bytecode
+                    .struct_instantiation_at(*struct_idx)?;
+                let type_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(struct_inst.type_parameters);
+                let (name, ty_params) = self.struct_type_info(
+                    struct_inst.def,
+                    type_params,
+                    &function_source_map.type_parameters,
+                )?;
+                Ok(format!(
+                    "MoveToGeneric[{}]({}{})",
+                    struct_idx, name, ty_params
+                ))
+            },
+            Bytecode::Call(method_idx) => {
+                let function_handle = self.source_mapper.bytecode.function_handle_at(*method_idx);
+                let module_handle = self
+                    .source_mapper
+                    .bytecode
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
+                let type_arguments = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &[]))
+                    .collect::<Result<Vec<String>>>()?
+                    .join(", ");
+                let type_rets = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.return_)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &[]))
+                    .collect::<Result<Vec<String>>>()?;
+                Ok(format!(
+                    "Call {}({}){}",
+                    fcall_name,
+                    type_arguments,
+                    Self::format_ret_type(&type_rets)
+                ))
+            },
+            Bytecode::CallGeneric(method_idx) => {
+                let func_inst = self
+                    .source_mapper
+                    .bytecode
+                    .function_instantiation_at(*method_idx);
+                let function_handle = self
+                    .source_mapper
+                    .bytecode
+                    .function_handle_at(func_inst.handle);
+                let module_handle = self
+                    .source_mapper
+                    .bytecode
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
+                let ty_params = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(func_inst.type_parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| {
+                        Ok((
+                            self.disassemble_sig_tok(
+                                sig_tok.clone(),
+                                &function_source_map.type_parameters,
+                            )?,
+                            *default_location,
+                        ))
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                let type_arguments = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &ty_params))
+                    .collect::<Result<Vec<String>>>()?
+                    .join(", ");
+                let type_rets = self
+                    .source_mapper
+                    .bytecode
+                    .signature_at(function_handle.return_)
+                    .0
+                    .iter()
+                    .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &ty_params))
+                    .collect::<Result<Vec<String>>>()?;
+                Ok(format!(
+                    "Call {}{}({}){}",
+                    fcall_name,
+                    Self::format_type_params(
+                        &ty_params.into_iter().map(|(s, _)| s).collect::<Vec<_>>()
+                    ),
+                    type_arguments,
+                    Self::format_ret_type(&type_rets)
+                ))
+            },
+            // All other instructions are OK to be printed using the standard debug print.
+            x => Ok(format!("{:#?}", x)),
+        }
+    }
+
+    fn disassemble_bytecode(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        function_name: &IdentStr,
+        parameters: SignatureIndex,
+        code: &CodeUnit,
+    ) -> Result<Vec<String>> {
+        if !self.options.print_code {
+            return Ok(vec!["".to_string()]);
+        }
+
+        let parameters = self.source_mapper.bytecode.signature_at(parameters);
+        let locals_sigs = self.source_mapper.bytecode.signature_at(code.locals);
+
+        let function_code_coverage_map = self.get_function_coverage(function_name);
+
+        let decl_location = &function_source_map.definition_location;
+        let instrs: Vec<String> = code
+            .code
+            .iter()
+            .map(|instruction| {
+                self.disassemble_instruction(
+                    parameters,
+                    instruction,
+                    locals_sigs,
+                    function_source_map,
+                    decl_location,
+                )
+            })
+            .collect::<Result<Vec<String>>>()?;
+
+        let mut instrs: Vec<String> = instrs
+            .into_iter()
+            .enumerate()
+            .map(|(instr_index, dis_instr)| {
+                self.format_with_instruction_coverage(
+                    instr_index,
+                    function_code_coverage_map,
+                    dis_instr,
+                )
+            })
+            .collect();
+
+        if self.options.print_basic_blocks {
+            let cfg = VMControlFlowGraph::new(&code.code);
+            for (block_number, block_id) in cfg.blocks().iter().enumerate() {
+                instrs.insert(
+                    *block_id as usize + block_number,
+                    format!("B{}:", block_number),
+                );
+            }
+        }
+
+        Ok(instrs)
+    }
+
+    fn disassemble_struct_type_formals(
+        source_map_ty_params: &[SourceName],
+        type_parameters: &[StructTypeParameter],
+    ) -> String {
+        let ty_params: Vec<String> = source_map_ty_params
+            .iter()
+            .zip(type_parameters)
+            .map(|((name, _), ty_param)| {
+                let abilities_str = if ty_param.constraints == AbilitySet::EMPTY {
+                    "".to_string()
+                } else {
+                    let ability_vec: Vec<_> = ty_param
+                        .constraints
+                        .into_iter()
+                        .map(Self::format_ability)
+                        .collect();
+                    format!(": {}", ability_vec.join(" + "))
+                };
+                format!(
+                    "{}{}{}",
+                    if ty_param.is_phantom { "phantom " } else { "" },
+                    name.as_str(),
+                    abilities_str
+                )
+            })
+            .collect();
+        Self::format_type_params(&ty_params)
+    }
+
+    fn disassemble_fun_type_formals(
+        source_map_ty_params: &[SourceName],
+        ablities: &[AbilitySet],
+    ) -> String {
+        let ty_params: Vec<String> = source_map_ty_params
+            .iter()
+            .zip(ablities)
+            .map(|((name, _), abs)| {
+                let abilities_str = if *abs == AbilitySet::EMPTY {
+                    "".to_string()
+                } else {
+                    let ability_vec: Vec<_> = abs.into_iter().map(Self::format_ability).collect();
+                    format!(": {}", ability_vec.join(" + "))
+                };
+                format!("{}{}", name.as_str(), abilities_str)
+            })
+            .collect();
+        Self::format_type_params(&ty_params)
+    }
+
+    fn disassemble_locals(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        locals_idx: SignatureIndex,
+        parameter_len: usize,
+    ) -> Result<Vec<String>> {
+        if !self.options.print_locals {
+            return Ok(vec![]);
+        }
+
+        let signature = self.source_mapper.bytecode.signature_at(locals_idx);
+        let locals_names_tys = function_source_map
+            .locals
+            .iter()
+            .skip(parameter_len)
+            .enumerate()
+            .map(|(local_idx, (name, _))| {
+                let ty =
+                    self.type_for_local(parameter_len + local_idx, signature, function_source_map)?;
+                Ok(format!("{}: {}", name, ty))
+            })
+            .collect::<Result<Vec<String>>>()?;
+        Ok(locals_names_tys)
+    }
+
+    /// Translates a compiled "function definition" into a disassembled bytecode string.
+    ///
+    /// Because a "function definition" can refer to either a function defined in a module or to a
+    /// script's "main" function (which is not represented by a function definition in the binary
+    /// format), this method takes a function definition and handle as optional arguments. These are
+    /// `None` when disassembling a script's "main" function.
+    pub fn disassemble_function_def(
+        &self,
+        function_source_map: &FunctionSourceMap,
+        function: Option<(&FunctionDefinition, &FunctionHandle)>,
+        name: &IdentStr,
+        type_parameters: &[AbilitySet],
+        parameters: SignatureIndex,
+        code: Option<&CodeUnit>,
+    ) -> Result<String> {
+        debug_assert_eq!(
+            function_source_map.parameters.len(),
+            self.source_mapper.bytecode.signature_at(parameters).len(),
+            "Arity mismatch between function source map and bytecode for function {}",
+            name
+        );
+
+        let entry_modifier = if function.map(|(f, _)| f.is_entry).unwrap_or(false) {
+            "entry "
+        } else {
+            ""
+        };
+        let visibility_modifier = match function {
+            Some(function) => match function.0.visibility {
+                Visibility::Private => {
+                    if self.options.only_externally_visible {
+                        return Ok("".to_string());
+                    } else {
+                        ""
+                    }
+                },
+                Visibility::Friend => "public(friend) ",
+                Visibility::Public => "public ",
+            },
+            None => "",
+        };
+
+        let native_modifier = match function {
+            Some(function) if function.0.is_native() => "native ",
+            _ => "",
+        };
+
+        let ty_params = Self::disassemble_fun_type_formals(
+            &function_source_map.type_parameters,
+            type_parameters,
+        );
+        let params = &self
+            .source_mapper
+            .bytecode
+            .signature_at(parameters)
+            .0
+            .iter()
+            .zip(function_source_map.parameters.iter())
+            .map(|(tok, (name, _))| {
+                Ok(format!(
+                    "{}: {}",
+                    name,
+                    self.disassemble_sig_tok(tok.clone(), &function_source_map.type_parameters)?
+                ))
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        let ret_type = match function {
+            Some(function) => self
+                .source_mapper
+                .bytecode
+                .signature_at(function.1.return_)
+                .0
+                .iter()
+                .cloned()
+                .map(|sig_token| {
+                    let sig_tok_str =
+                        self.disassemble_sig_tok(sig_token, &function_source_map.type_parameters)?;
+                    Ok(sig_tok_str)
+                })
+                .collect::<Result<Vec<String>>>()?,
+            None => vec![],
+        };
+
+        let body = match code {
+            Some(code) => {
+                let locals =
+                    self.disassemble_locals(function_source_map, code.locals, params.len())?;
+                let bytecode =
+                    self.disassemble_bytecode(function_source_map, name, parameters, code)?;
+                Self::format_function_body(locals, bytecode)
+            },
+            None => "".to_string(),
+        };
+        Ok(self.format_function_coverage(
+            name,
+            format!(
+                "{entry_modifier}{native_modifier}{visibility_modifier}{name}{ty_params}({params}){ret_type}{body}",
+                params = &params.join(", "),
+                ret_type = Self::format_ret_type(&ret_type),
+            ),
+        ))
+    }
+
+    // The struct defs will filter out the structs that we print to only be the ones that are
+    // defined in the module in question.
+    pub fn disassemble_struct_def(&self, struct_def_idx: StructDefinitionIndex) -> Result<String> {
+        let struct_definition = self.get_struct_def(struct_def_idx)?;
+        let struct_handle = self
+            .source_mapper
+            .bytecode
+            .struct_handle_at(struct_definition.struct_handle);
+        let struct_source_map = self
+            .source_mapper
+            .source_map
+            .get_struct_source_map(struct_def_idx)?;
+
+        let field_info: Option<Vec<(&IdentStr, &TypeSignature)>> =
+            match &struct_definition.field_information {
+                StructFieldInformation::Native => None,
+                StructFieldInformation::Declared(fields) => Some(
+                    fields
+                        .iter()
+                        .map(|field_definition| {
+                            let type_sig = &field_definition.signature;
+                            let field_name = self
+                                .source_mapper
+                                .bytecode
+                                .identifier_at(field_definition.name);
+                            (field_name, type_sig)
+                        })
+                        .collect(),
+                ),
+            };
+
+        let native = if field_info.is_none() { "native " } else { "" };
+
+        let abilities = if struct_handle.abilities == AbilitySet::EMPTY {
+            String::new()
+        } else {
+            let ability_vec: Vec<_> = struct_handle
+                .abilities
+                .into_iter()
+                .map(Self::format_ability)
+                .collect();
+            format!(" has {}", ability_vec.join(", "))
+        };
+
+        let name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(struct_handle.name)
+            .to_string();
+
+        let ty_params = Self::disassemble_struct_type_formals(
+            &struct_source_map.type_parameters,
+            &struct_handle.type_parameters,
+        );
+        let mut fields = match field_info {
+            None => vec![],
+            Some(field_info) => field_info
+                .iter()
+                .map(|(name, ty)| {
+                    let ty_str =
+                        self.disassemble_sig_tok(ty.0.clone(), &struct_source_map.type_parameters)?;
+                    Ok(format!("{}: {}", name, ty_str))
+                })
+                .collect::<Result<Vec<String>>>()?,
+        };
+
+        if let Some(first_elem) = fields.first_mut() {
+            first_elem.insert_str(0, "{\n\t");
+        }
+
+        if let Some(last_elem) = fields.last_mut() {
+            last_elem.push_str("\n}");
+        }
+
+        Ok(format!(
+            "{native}struct {name}{ty_params}{abilities} {fields}",
+            native = native,
+            name = name,
+            ty_params = ty_params,
+            abilities = abilities,
+            fields = &fields.join(",\n\t"),
+        ))
+    }
+
+    pub fn disassemble(&self) -> Result<String> {
+        let name_opt = self.source_mapper.source_map.module_name_opt.as_ref();
+        let name = name_opt.map(|(addr, n)| format!("{}.{}", addr.short_str_lossless(), n));
+        let version = format!("{}", self.source_mapper.bytecode.version());
+        let header = match name {
+            Some(s) => format!("module {}", s),
+            None => "script".to_owned(),
+        };
+
+        let imports = self
+            .source_mapper
+            .bytecode
+            .module_handles()
+            .iter()
+            .filter_map(|h| self.get_import_string(h))
+            .collect::<Vec<String>>();
+        let struct_defs: Vec<String> = (0..self
+            .source_mapper
+            .bytecode
+            .struct_defs()
+            .map_or(0, |d| d.len()))
+            .map(|i| self.disassemble_struct_def(StructDefinitionIndex(i as TableIndex)))
+            .collect::<Result<Vec<String>>>()?;
+
+        let function_defs: Vec<String> = match self.source_mapper.bytecode {
+            BinaryIndexedView::Script(script) => {
+                vec![self.disassemble_function_def(
+                    self.source_mapper
+                        .source_map
+                        .get_function_source_map(FunctionDefinitionIndex(0_u16))?,
+                    None,
+                    ident_str!("main"),
+                    &script.type_parameters,
+                    script.parameters,
+                    Some(&script.code),
+                )?]
+            },
+            BinaryIndexedView::Module(module) => (0..module.function_defs.len())
+                .map(|i| {
+                    let function_definition_index = FunctionDefinitionIndex(i as TableIndex);
+                    let function_definition = self.get_function_def(function_definition_index)?;
+                    let function_handle = self
+                        .source_mapper
+                        .bytecode
+                        .function_handle_at(function_definition.function);
+                    self.disassemble_function_def(
+                        self.source_mapper
+                            .source_map
+                            .get_function_source_map(function_definition_index)?,
+                        Some((function_definition, function_handle)),
+                        self.source_mapper
+                            .bytecode
+                            .identifier_at(function_handle.name),
+                        &function_handle.type_parameters,
+                        function_handle.parameters,
+                        function_definition.code.as_ref(),
+                    )
+                })
+                .collect::<Result<Vec<String>>>()?,
+        };
+        let imports_str = if imports.is_empty() {
+            "".to_string()
+        } else {
+            format!("\n{}\n\n", imports.join("\n"))
+        };
+        Ok(format!(
+            "// Move bytecode v{version}\n{header} {{{imports}\n{struct_defs}\n\n{function_defs}\n}}",
+            version = version,
+            header = header,
+            imports = &imports_str,
+            struct_defs = &struct_defs.join("\n"),
+            function_defs = &function_defs.join("\n")
+        ))
+    }
+}
diff --git a/vendors/move/crates/tools/move-disassembler/src/lib.rs b/vendors/move/crates/tools/move-disassembler/src/lib.rs
new file mode 100644
index 000000000..3e8002d01
--- /dev/null
+++ b/vendors/move/crates/tools/move-disassembler/src/lib.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod disassembler;
diff --git a/vendors/move/crates/tools/move-disassembler/src/main.rs b/vendors/move/crates/tools/move-disassembler/src/main.rs
new file mode 100644
index 000000000..076a4b550
--- /dev/null
+++ b/vendors/move/crates/tools/move-disassembler/src/main.rs
@@ -0,0 +1,129 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+use clap::Parser;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_bytecode_source_map::{mapping::SourceMapping, utils::source_map_from_file};
+use move_command_line_common::files::{
+    MOVE_COMPILED_EXTENSION, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
+};
+use move_coverage::coverage_map::CoverageMap;
+use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
+use move_ir_types::location::Spanned;
+use std::{fs, path::Path};
+
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// Skip printing of private functions.
+    #[clap(long = "skip-private")]
+    pub skip_private: bool,
+
+    /// Do not print the disassembled bytecodes of each function.
+    #[clap(long = "skip-code")]
+    pub skip_code: bool,
+
+    /// Do not print locals of each function.
+    #[clap(long = "skip-locals")]
+    pub skip_locals: bool,
+
+    /// Do not print the basic blocks of each function.
+    #[clap(long = "skip-basic-blocks")]
+    pub skip_basic_blocks: bool,
+
+    /// Treat input file as a script (default is to treat file as a module)
+    #[clap(short = 's', long = "script")]
+    pub is_script: bool,
+
+    /// The path to the bytecode file to disassemble; let's call it file.mv. We assume that two
+    /// other files reside under the same directory: a source map file.mvsm (possibly) and the Move
+    /// source code file.move.
+    #[clap(short = 'b', long = "bytecode")]
+    pub bytecode_file_path: String,
+
+    /// (Optional) Path to a coverage file for the VM in order to print trace information in the
+    /// disassembled output.
+    #[clap(short = 'c', long = "move-coverage-path")]
+    pub code_coverage_path: Option<String>,
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let move_extension = MOVE_EXTENSION;
+    let mv_bytecode_extension = MOVE_COMPILED_EXTENSION;
+    let source_map_extension = SOURCE_MAP_EXTENSION;
+
+    let source_path = Path::new(&args.bytecode_file_path);
+    let extension = source_path
+        .extension()
+        .expect("Missing file extension for bytecode file");
+    if extension != mv_bytecode_extension {
+        println!(
+            "Bad source file extension {:?}; expected {}",
+            extension, mv_bytecode_extension
+        );
+        std::process::exit(1);
+    }
+
+    let bytecode_bytes = fs::read(&args.bytecode_file_path).expect("Unable to read bytecode file");
+
+    let source_path = Path::new(&args.bytecode_file_path).with_extension(move_extension);
+    let source = fs::read_to_string(&source_path).ok();
+    let source_map = source_map_from_file(
+        &Path::new(&args.bytecode_file_path).with_extension(source_map_extension),
+    );
+
+    let mut disassembler_options = DisassemblerOptions::new();
+    disassembler_options.print_code = !args.skip_code;
+    disassembler_options.only_externally_visible = args.skip_private;
+    disassembler_options.print_basic_blocks = !args.skip_basic_blocks;
+    disassembler_options.print_locals = !args.skip_locals;
+
+    // TODO: make source mapping work with the Move source language
+    let no_loc = Spanned::unsafe_no_loc(()).loc;
+    let module: CompiledModule;
+    let script: CompiledScript;
+    let bytecode = if args.is_script {
+        script = CompiledScript::deserialize(&bytecode_bytes)
+            .expect("Script blob can't be deserialized");
+        BinaryIndexedView::Script(&script)
+    } else {
+        module = CompiledModule::deserialize(&bytecode_bytes)
+            .expect("Module blob can't be deserialized");
+        BinaryIndexedView::Module(&module)
+    };
+
+    let mut source_mapping = {
+        if let Ok(s) = source_map {
+            SourceMapping::new(s, bytecode)
+        } else {
+            SourceMapping::new_from_view(bytecode, no_loc)
+                .expect("Unable to build dummy source mapping")
+        }
+    };
+
+    if let Some(source_code) = source {
+        source_mapping.with_source_code((source_path.to_str().unwrap().to_string(), source_code));
+    }
+
+    let mut disassembler = Disassembler::new(source_mapping, disassembler_options);
+
+    if let Some(file_path) = &args.code_coverage_path {
+        disassembler.add_coverage_map(
+            CoverageMap::from_binary_file(file_path)
+                .unwrap()
+                .to_unified_exec_map(),
+        );
+    }
+
+    let dissassemble_string = disassembler.disassemble().expect("Unable to dissassemble");
+
+    println!("{}", dissassemble_string);
+}
diff --git a/vendors/move/crates/tools/move-explain/Cargo.toml b/vendors/move/crates/tools/move-explain/Cargo.toml
new file mode 100644
index 000000000..a628f6391
--- /dev/null
+++ b/vendors/move/crates/tools/move-explain/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "move-explain"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Explain Move abort codes. Errors are defined as a global category + module-specific reason for the error"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+clap = { version = "3.1.8", features = ["derive"] }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-core-types = { path = "../../move-core-types" }
+
+bcs = { workspace = true }
+
+[features]
+default = []
diff --git a/vendors/move/crates/tools/move-explain/src/main.rs b/vendors/move/crates/tools/move-explain/src/main.rs
new file mode 100644
index 000000000..c8bf95a64
--- /dev/null
+++ b/vendors/move/crates/tools/move-explain/src/main.rs
@@ -0,0 +1,56 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::Parser;
+use move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION;
+use move_core_types::{
+    account_address::AccountAddress, errmap::ErrorMapping, identifier::Identifier,
+    language_storage::ModuleId,
+};
+#[derive(Debug, Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// The location (module id) returned with a `MoveAbort` error
+    #[clap(long = "location", short = 'l')]
+    location: String,
+    /// The abort code returned with a `MoveAbort` error
+    #[clap(long = "abort-code", short = 'a')]
+    abort_code: u64,
+    /// Path to the error code mapping file
+    #[clap(long = MOVE_ERROR_DESC_EXTENSION, short = 'e')]
+    errmap_path: String,
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let mut location = args.location.trim().split("::");
+    let mut address_literal = location.next().expect("Could not find address").to_string();
+    let module_name = location
+        .next()
+        .expect("Could not find module name")
+        .to_string();
+    if !address_literal.starts_with("0x") {
+        address_literal = format!("0x{}", address_literal);
+    }
+    let module_id = ModuleId::new(
+        AccountAddress::from_hex_literal(&address_literal).expect("Unable to parse module address"),
+        Identifier::new(module_name).expect("Invalid module name encountered"),
+    );
+
+    let errmap_bytes = std::fs::read(&args.errmap_path).expect("Could not load errmap from file");
+    let errmap: ErrorMapping =
+        bcs::from_bytes(&errmap_bytes).expect("Failed to deserialize errmap");
+
+    match errmap.get_explanation(&module_id, args.abort_code) {
+        None => println!(
+            "Unable to find a description for {}::{}",
+            args.location, args.abort_code
+        ),
+        Some(error_desc) => println!(
+            "Name: {}\nDescription: {}",
+            error_desc.code_name, error_desc.code_description,
+        ),
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/Cargo.toml b/vendors/move/crates/tools/move-package/Cargo.toml
new file mode 100644
index 000000000..a1018ec7f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+name = "move-package"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Package and build system for Move code"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+clap = { version = "3.1.8", features = ["derive"] }
+colored = "2.0.0"
+dirs-next = "2.0.0"
+itertools = "0.10.0"
+named-lock = "0.2.0"
+once_cell = "1.7.2"
+petgraph = "0.5.1"
+ptree = "0.4.0"
+regex = "1.1.9"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.8.17"
+sha2 = "0.9.3"
+tempfile = "3.2.0"
+toml = "0.5.8"
+walkdir = "2.3.1"
+
+bcs = { workspace = true }
+evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
+hex = { version = "0.4.3", optional = true }
+move-abigen = { path = "../../move-abigen" }
+
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-source-map = { path = "../../move-bytecode-source-map" }
+move-bytecode-utils = { path = "../move-bytecode-utils" }
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-docgen = { path = "../../move-docgen" }
+move-model = { path = "../../move-model" }
+move-symbol-pool = { path = "../../move-symbol-pool" }
+
+move-to-yul = { path = "../../evm/move-to-yul", optional = true }
+reqwest = { version = "0.11.1", features = ["blocking", "json"] }
+termcolor = { version = "1.1.2", optional = true }
+
+whoami = { version = "1.2.1" }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+
+[[test]]
+name = "test_runner"
+harness = false
+
+[features]
+evm-backend = ["move-to-yul", "evm-exec-utils", "termcolor", "hex"]
diff --git a/vendors/move/crates/tools/move-package/README.md b/vendors/move/crates/tools/move-package/README.md
new file mode 100644
index 000000000..58ac5334e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/README.md
@@ -0,0 +1,96 @@
+---
+id: move-package
+title: Move Package
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/move-package/README.md
+---
+
+# Summary
+
+The Move package crate contains the logic for parsing, resolving, and
+building Move packages. It is meant to be used as a library, both for
+building packages (e.g., by the Move CLI), or by other applications that
+may be working with Move packages. The package system is split into three
+main phases: parsing, resolution, and compilation.
+
+## Parsing and Manifest Layout
+
+The parsing and manifest layout logic is defined in the
+[`./src/source_package`](./src/source_package) directory. This defines the
+layout and the set of required and optional directories for a Move package
+in [`./src/source_package/layout.rs`](./src/source_package/layout.rs), it
+defines the format of the parsed Move package manifest ("`Move.toml`") in
+[`./src/source_package/parsed_manifest.rs`](./src/source_package/parsed_manifest.rs),
+and it defines the parser for the Move package manifest in
+[`./src/source_package/manifest_parser.rs`](./src/source_package/manifest_parser.rs).
+Note that we don't have a tokenizer/lexer as we use the TOML lexer. This
+also resolves git dependencies to where they will live on the local file
+system (but does not clone them).
+
+## Resolution
+
+The resolution phase is responsible for resolving all packages and building
+the package graph which represents the dependency relations between
+packages. It is also responsible for ensuring that all named addresses have
+a value assigned to them, and that there are no conflicting assignments.
+The package graph is rooted at the package being built and is a DAG.
+
+When building the package graph we do the following conceptual operations:
+verify that dependencies exist at the declared locations, that their
+package names and source digests match (if applicable), clone git
+dependencies if they don't already exist locally, build a dependency graph
+of Move packages and ensure this forms a DAG, compute an
+assignment for each named address in each Move package in the package
+graph, and ensure that the resulting named address assignment is valid.
+
+All of the above steps are fairly straightforward, with the possible
+exception of named addresses: each package will have a set of in-scope
+named addresses. The set of in-scope named addresses for a package `P` is
+defined as the transitive closure of all named addresses in the
+dependencies of `P`. Additionally, a package can rename named addresses
+that are in-scope as long as the final assignment of a value to the set of
+named addresses can be unified. To ensure that named addresses are
+unifiable across renamings, resolution performs unification across named
+addresses using a `Rc<RefCell<Opton<Address>>>`: when a named address first
+enters scope in the package graph a `Rc<RefCell<..>>` is created for it.
+This refcell is then shared to all uses of the named address _even across
+renamings_ and when a value is assigned to it, the value must (1) match the
+current value contained within the `Option`, or (2) the `Option` is `None`,
+and the value is placed into the refcell.
+
+## Compilation
+
+The final stage of the package system is compilation. All logic relating to
+the final build artifacts, or global environment creation, is contained in
+the [`./src/compilation`](./src/compilation) directory. The package layout
+for compiled Move packages is defined in
+[`./src/compilation/package_layout.rs`](./src/compilation/package_layout.rs).
+
+The [`./src/compilation/build_plan.rs`](./src/compilation/build_plan.rs)
+contains the logic for driving the compilation of a package and the
+compilation of all of the package's dependencies given a valid resolution
+graph. The logic in
+[`./src/compilation/compiled_package.rs`](./src/compilation/compiled_package.rs)
+contains the definition of the in-memory representation of compiled Move
+packages and other data structures and APIs relating to compiled Move
+packages, along with the logic for compiling a _single_ Move package
+assuming all of its dependencies are already compiled and saved to disk.
+This is driven by the logic in
+[`./src/compilation/build_plan.rs`](./src/compilation/build_plan.rs). The
+compilation process is also responsible for generating documentation, ABIs
+and the like, along with determining if a cached version of the
+to-be-built package already exists and if so, if the cached version
+can be used or if the cached copy is invalid and needs to be recompiled.
+
+One important thing to note here is that depending on the compilation
+flags, the caching policy may need to be updated and the `compiler_driver`
+function that is passed into the compilation process may change. However,
+what this function should be is determined by the client of the Move
+package library. In particular, when testing even if we are recompiling
+with the same flags we cannot cache the root package as we need to compile
+it to generate the test plan that will be used by the unit test runner
+later on. This gathering of the test plan is inserted into the compilation
+process via the `compiler_driver` function that is passed in by the client.
+In this case, the [`../move-cli/src/package`](../move-cli/src/package) is
+the client and it is responsible for supplying the correct function as the
+compiler driver to collect the test plan and to later pass that to the unit
+test runner.
diff --git a/vendors/move/crates/tools/move-package/src/compilation/build_plan.rs b/vendors/move/crates/tools/move-package/src/compilation/build_plan.rs
new file mode 100644
index 000000000..b683cf386
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/compilation/build_plan.rs
@@ -0,0 +1,435 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::package_layout::CompiledPackageLayout;
+use crate::{
+    compilation::compiled_package::CompiledPackage, resolution::resolution_graph::ResolvedGraph,
+    source_package::parsed_manifest::PackageName,
+};
+use anyhow::Result;
+use move_compiler::{
+    compiled_unit::AnnotatedCompiledUnit,
+    diagnostics::{report_diagnostics_to_color_buffer, report_warnings, FilesSourceText},
+    Compiler,
+};
+use petgraph::algo::toposort;
+use std::{collections::BTreeSet, io::Write, path::Path};
+#[cfg(feature = "evm-backend")]
+use {
+    colored::Colorize,
+    move_to_yul::{options::Options as MoveToYulOptions, run_to_yul},
+    std::{fs, io},
+    termcolor::Buffer,
+    walkdir::WalkDir,
+};
+
+#[derive(Debug, Clone)]
+pub struct BuildPlan {
+    root: PackageName,
+    sorted_deps: Vec<PackageName>,
+    resolution_graph: ResolvedGraph,
+}
+
+#[cfg(feature = "evm-backend")]
+fn should_recompile(
+    source_paths: impl IntoIterator<Item = impl AsRef<Path>>,
+    output_paths: impl IntoIterator<Item = impl AsRef<Path>>,
+) -> Result<bool> {
+    let mut earliest_output_mod_time = None;
+    for output_path in output_paths.into_iter() {
+        match fs::metadata(output_path) {
+            Ok(meta) => {
+                let mod_time = meta
+                    .modified()
+                    .expect("failed to get file modification time");
+
+                match &mut earliest_output_mod_time {
+                    None => earliest_output_mod_time = Some(mod_time),
+                    Some(earliest_mod_time) => *earliest_mod_time = mod_time,
+                }
+            },
+            Err(err) => {
+                if let io::ErrorKind::NotFound = err.kind() {
+                    return Ok(true);
+                }
+                return Err(err.into());
+            },
+        }
+    }
+
+    let earliest_output_mod_time = match earliest_output_mod_time {
+        Some(mod_time) => mod_time,
+        None => panic!("no output files given -- this should not happen"),
+    };
+
+    for source_path in source_paths.into_iter() {
+        for entry in WalkDir::new(source_path) {
+            let entry = entry?;
+
+            let mod_time = entry
+                .metadata()?
+                .modified()
+                .expect("failed to get file modification time");
+
+            if mod_time > earliest_output_mod_time {
+                return Ok(true);
+            }
+        }
+    }
+
+    Ok(false)
+}
+
+impl BuildPlan {
+    pub fn create(resolution_graph: ResolvedGraph) -> Result<Self> {
+        let mut sorted_deps = match toposort(&resolution_graph.graph, None) {
+            Ok(nodes) => nodes,
+            Err(err) => {
+                // Is a DAG after resolution otherwise an error should be raised from that.
+                anyhow::bail!("IPE: Cyclic dependency found after resolution {:?}", err)
+            },
+        };
+
+        sorted_deps.reverse();
+
+        Ok(Self {
+            root: resolution_graph.root_package.package.name,
+            sorted_deps,
+            resolution_graph,
+        })
+    }
+
+    /// Compilation results in the process exit upon warning/failure
+    pub fn compile<W: Write>(
+        &self,
+        bytecode_version: Option<u32>,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, bytecode_version, |compiler| {
+            compiler.build_and_report()
+        })
+    }
+
+    /// Compilation process does not exit even if warnings/failures are encountered
+    pub fn compile_no_exit<W: Write>(
+        &self,
+        bytecode_version: Option<u32>,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, bytecode_version, |compiler| {
+            let (files, units_res) = compiler.build()?;
+            match units_res {
+                Ok((units, warning_diags)) => {
+                    report_warnings(&files, warning_diags);
+                    Ok((files, units))
+                },
+                Err(error_diags) => {
+                    assert!(!error_diags.is_empty());
+                    let diags_buf = report_diagnostics_to_color_buffer(&files, error_diags);
+                    if let Err(err) = std::io::stdout().write_all(&diags_buf) {
+                        anyhow::bail!("Cannot output compiler diagnostics: {}", err);
+                    }
+                    anyhow::bail!("Compilation error");
+                },
+            }
+        })
+    }
+
+    pub fn compile_with_driver<W: Write>(
+        &self,
+        writer: &mut W,
+        bytecode_version: Option<u32>,
+        mut compiler_driver: impl FnMut(
+            Compiler,
+        )
+            -> anyhow::Result<(FilesSourceText, Vec<AnnotatedCompiledUnit>)>,
+    ) -> Result<CompiledPackage> {
+        let root_package = &self.resolution_graph.package_table[&self.root];
+        let project_root = match &self.resolution_graph.build_options.install_dir {
+            Some(under_path) => under_path.clone(),
+            None => self.resolution_graph.root_package_path.clone(),
+        };
+        let immediate_dependencies_names =
+            root_package.immediate_dependencies(&self.resolution_graph);
+        let transitive_dependencies = root_package
+            .transitive_dependencies(&self.resolution_graph)
+            .into_iter()
+            .map(|package_name| {
+                let dep_package = self
+                    .resolution_graph
+                    .package_table
+                    .get(&package_name)
+                    .unwrap();
+                let mut dep_source_paths = dep_package
+                    .get_sources(&self.resolution_graph.build_options)
+                    .unwrap();
+                let mut source_available = true;
+                // If source is empty, search bytecode(mv) files
+                if dep_source_paths.is_empty() {
+                    dep_source_paths = dep_package.get_bytecodes().unwrap();
+                    source_available = false;
+                }
+                (
+                    package_name,
+                    immediate_dependencies_names.contains(&package_name),
+                    dep_source_paths,
+                    &dep_package.resolution_table,
+                    source_available,
+                )
+            })
+            .collect();
+
+        let compiled = CompiledPackage::build_all(
+            writer,
+            &project_root,
+            root_package.clone(),
+            transitive_dependencies,
+            bytecode_version,
+            &self.resolution_graph,
+            &mut compiler_driver,
+        )?;
+
+        Self::clean(
+            &project_root.join(CompiledPackageLayout::Root.path()),
+            self.sorted_deps.iter().copied().collect(),
+        )?;
+        Ok(compiled)
+    }
+
+    #[cfg(feature = "evm-backend")]
+    pub fn compile_evm<W: Write>(&self, writer: &mut W) -> Result<()> {
+        let root_package = &self.resolution_graph.package_table[&self.root];
+        let project_root = match &self.resolution_graph.build_options.install_dir {
+            Some(under_path) => under_path.clone(),
+            None => self.resolution_graph.root_package_path.clone(),
+        };
+        let build_root_path = project_root
+            .join(CompiledPackageLayout::Root.path())
+            .join("evm");
+
+        // Step 1: Compile Move into Yul
+        //   Step 1a: Gather command line arguments for move-to-yul
+        let dependencies = self
+            .resolution_graph
+            .package_table
+            .iter()
+            .filter_map(|(name, package)| {
+                if name == &root_package.source_package.package.name {
+                    None
+                } else {
+                    Some(format!(
+                        "{}/sources",
+                        package.package_path.to_string_lossy()
+                    ))
+                }
+            })
+            .collect::<Vec<_>>();
+
+        let sources = vec![format!(
+            "{}/sources",
+            root_package.package_path.to_string_lossy()
+        )];
+
+        let bytecode_output = format!(
+            "{}/{}.bin",
+            build_root_path.to_string_lossy(),
+            root_package.source_package.package.name
+        );
+
+        let yul_output = format!(
+            "{}/{}.yul",
+            build_root_path.to_string_lossy(),
+            root_package.source_package.package.name
+        );
+        let abi_output = format!(
+            "{}/{}.abi.json",
+            build_root_path.to_string_lossy(),
+            root_package.source_package.package.name
+        );
+
+        let output_paths = [&bytecode_output, &yul_output, &abi_output];
+
+        let package_names = self
+            .resolution_graph
+            .package_table
+            .iter()
+            .map(|(name, _)| name.to_string())
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        let named_address_mapping = self
+            .resolution_graph
+            .extract_named_address_mapping()
+            .map(|(name, addr)| format!("{}={}", name.as_str(), addr))
+            .collect();
+
+        //   Step 1b: Check if a fresh compilation is really needed. Only recompile if either
+        //              a) Some of the output artifacts are missing
+        //              b) Any source files have been modified since last compile
+        let manifests = self
+            .resolution_graph
+            .package_table
+            .iter()
+            .map(|(_name, package)| format!("{}/Move.toml", package.package_path.to_string_lossy()))
+            .collect::<Vec<_>>();
+
+        let all_sources = manifests
+            .iter()
+            .chain(sources.iter())
+            .chain(dependencies.iter());
+
+        if !should_recompile(all_sources, output_paths)? {
+            writeln!(writer, "{} {}", "CACHED".bold().green(), package_names)?;
+            return Ok(());
+        }
+
+        //   Step 1c: Call move-to-yul
+        writeln!(
+            writer,
+            "{} {} to Yul",
+            "COMPILING".bold().green(),
+            package_names
+        )?;
+
+        if let Err(err) = std::fs::remove_dir_all(&build_root_path) {
+            match err.kind() {
+                io::ErrorKind::NotFound => (),
+                _ => {
+                    writeln!(
+                        writer,
+                        "{} Failed to remove build dir {}: {}",
+                        "ERROR".bold().red(),
+                        build_root_path.to_string_lossy(),
+                        err,
+                    )?;
+
+                    return Err(err.into());
+                },
+            }
+        }
+        if let Err(err) = std::fs::create_dir_all(&build_root_path) {
+            writeln!(
+                writer,
+                "{} Failed to create build dir {}",
+                "ERROR".bold().red(),
+                build_root_path.to_string_lossy(),
+            )?;
+
+            return Err(err.into());
+        }
+
+        // TODO: should inherit color settings from current shell
+        let mut error_buffer = Buffer::ansi();
+        if let Err(err) = run_to_yul(&mut error_buffer, MoveToYulOptions {
+            dependencies,
+            named_address_mapping,
+            sources,
+            output: yul_output.clone(),
+            abi_output,
+
+            ..MoveToYulOptions::default()
+        }) {
+            writeln!(
+                writer,
+                "{} Failed to compile Move into Yul {}",
+                err,
+                "ERROR".bold().red()
+            )?;
+
+            writeln!(
+                writer,
+                "{}",
+                std::str::from_utf8(error_buffer.as_slice()).unwrap()
+            )?;
+
+            let mut source = err.source();
+            while let Some(s) = source {
+                writeln!(writer, "{}", s)?;
+                source = s.source();
+            }
+
+            return Err(err);
+        }
+
+        // Step 2: Compile Yul into bytecode using solc
+
+        let yul_source = match std::fs::read_to_string(&yul_output) {
+            Ok(yul_source) => yul_source,
+            Err(err) => {
+                writeln!(
+                    writer,
+                    "{} Failed to read from {}",
+                    "ERROR".bold().red(),
+                    yul_output,
+                )?;
+
+                return Err(err.into());
+            },
+        };
+
+        writeln!(
+            writer,
+            "{} EVM bytecote from Yul",
+            "GENERATING".bold().green(),
+        )?;
+
+        match evm_exec_utils::compile::solc_yul(&yul_source, false) {
+            Ok((bytecode, _)) => {
+                let mut bytecode_file = match std::fs::File::create(&bytecode_output) {
+                    Ok(file) => file,
+                    Err(err) => {
+                        writeln!(
+                            writer,
+                            "{} Failed to create bytecode output {}",
+                            "ERROR".bold().red(),
+                            bytecode_output,
+                        )?;
+
+                        return Err(err.into());
+                    },
+                };
+
+                if let Err(err) = bytecode_file.write_all(hex::encode(&bytecode).as_bytes()) {
+                    writeln!(
+                        writer,
+                        "{} Failed to write bytecode to file {}",
+                        "ERROR".bold().red(),
+                        bytecode_output,
+                    )?;
+
+                    return Err(err.into());
+                }
+            },
+            Err(err) => {
+                writeln!(
+                    writer,
+                    "{} Failed to generate EVM bytecote",
+                    "ERROR".bold().red()
+                )?;
+
+                let mut source = err.source();
+                while let Some(s) = source {
+                    writeln!(writer, "{}", s)?;
+                    source = s.source();
+                }
+
+                return Err(err);
+            },
+        }
+
+        Ok(())
+    }
+
+    // Clean out old packages that are no longer used, or no longer used under the current
+    // compilation flags
+    fn clean(build_root: &Path, keep_paths: BTreeSet<PackageName>) -> Result<()> {
+        for dir in std::fs::read_dir(build_root)? {
+            let path = dir?.path();
+            if !keep_paths.iter().any(|name| path.ends_with(name.as_str())) {
+                std::fs::remove_dir_all(&path)?;
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/compilation/compiled_package.rs b/vendors/move/crates/tools/move-package/src/compilation/compiled_package.rs
new file mode 100644
index 000000000..f36e34873
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/compilation/compiled_package.rs
@@ -0,0 +1,964 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compilation::package_layout::CompiledPackageLayout,
+    resolution::resolution_graph::{Renaming, ResolvedGraph, ResolvedPackage, ResolvedTable},
+    source_package::{
+        layout::{SourcePackageLayout, REFERENCE_TEMPLATE_FILENAME},
+        parsed_manifest::{FileName, PackageDigest, PackageName},
+    },
+    BuildConfig,
+};
+use anyhow::{ensure, Result};
+use colored::Colorize;
+use itertools::{Either, Itertools};
+use move_abigen::{Abigen, AbigenOptions};
+use move_binary_format::file_format::{CompiledModule, CompiledScript};
+use move_bytecode_source_map::utils::source_map_from_file;
+use move_bytecode_utils::Modules;
+use move_command_line_common::{
+    env::get_bytecode_version_from_env,
+    files::{
+        extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION,
+        SOURCE_MAP_EXTENSION,
+    },
+};
+use move_compiler::{
+    compiled_unit::{
+        self, AnnotatedCompiledUnit, CompiledUnit, NamedCompiledModule, NamedCompiledScript,
+    },
+    diagnostics::FilesSourceText,
+    shared::{Flags, NamedAddressMap, NumericalAddress, PackagePaths},
+    Compiler,
+};
+use move_docgen::{Docgen, DocgenOptions};
+use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
+use move_symbol_pool::Symbol;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+#[derive(Debug, Clone)]
+pub enum CompilationCachingStatus {
+    /// The package and all if its dependencies were cached
+    Cached,
+    /// At least this package and/or one of its dependencies needed to be rebuilt
+    Recompiled,
+}
+
+#[derive(Debug, Clone)]
+pub struct CompiledUnitWithSource {
+    pub unit: CompiledUnit,
+    pub source_path: PathBuf,
+}
+
+/// Represents meta information about a package and the information it was compiled with. Shared
+/// across both the `CompiledPackage` and `OnDiskCompiledPackage` structs.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompiledPackageInfo {
+    /// The name of the compiled package
+    pub package_name: PackageName,
+    /// The instantiations for all named addresses that were used for compilation
+    pub address_alias_instantiation: ResolvedTable,
+    /// The hash of the source directory at the time of compilation. `None` if the source for this
+    /// package is not available/this package was not compiled.
+    pub source_digest: Option<PackageDigest>,
+    /// The build flags that were used when compiling this package.
+    pub build_flags: BuildConfig,
+}
+
+/// Represents a compiled package in memory.
+#[derive(Debug, Clone)]
+pub struct CompiledPackage {
+    /// Meta information about the compilation of this `CompiledPackage`
+    pub compiled_package_info: CompiledPackageInfo,
+    /// The output compiled bytecode in the root package (both module, and scripts) along with its
+    /// source file
+    pub root_compiled_units: Vec<CompiledUnitWithSource>,
+    /// The output compiled bytecode for dependencies
+    pub deps_compiled_units: Vec<(PackageName, CompiledUnitWithSource)>,
+
+    // Optional artifacts from compilation
+    //
+    /// filename -> doctext
+    pub compiled_docs: Option<Vec<(String, String)>>,
+    /// filename -> json bytes for ScriptABI. Can then be used to generate transaction builders in
+    /// various languages.
+    pub compiled_abis: Option<Vec<(String, Vec<u8>)>>,
+}
+
+/// Represents a compiled package that has been saved to disk. This holds only the minimal metadata
+/// needed to reconstruct a `CompiledPackage` package from it and to determine whether or not a
+/// recompilation of the package needs to be performed or not.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OnDiskPackage {
+    /// Information about the package and the specific compilation that was done.
+    pub compiled_package_info: CompiledPackageInfo,
+    /// Dependency names for this package.
+    pub dependencies: Vec<PackageName>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OnDiskCompiledPackage {
+    /// Path to the root of the package and its data on disk. Relative to/rooted at the directory
+    /// containing the `Move.toml` file for this package.
+    pub root_path: PathBuf,
+    pub package: OnDiskPackage,
+}
+
+impl CompilationCachingStatus {
+    /// Returns `true` if this package and all dependencies are cached
+    pub fn is_cached(&self) -> bool {
+        matches!(self, Self::Cached)
+    }
+
+    /// Returns `true` if this package or one of its dependencies was rebuilt
+    pub fn is_rebuilt(&self) -> bool {
+        !self.is_cached()
+    }
+}
+
+impl OnDiskCompiledPackage {
+    pub fn from_path(p: &Path) -> Result<Self> {
+        let (buf, build_path) = if p.exists() && extension_equals(p, "yaml") {
+            (std::fs::read(p)?, p.parent().unwrap().parent().unwrap())
+        } else {
+            (
+                std::fs::read(p.join(CompiledPackageLayout::BuildInfo.path()))?,
+                p.parent().unwrap(),
+            )
+        };
+        let package = serde_yaml::from_slice::<OnDiskPackage>(&buf)?;
+        assert!(build_path.ends_with(CompiledPackageLayout::Root.path()));
+        let root_path = build_path.join(package.compiled_package_info.package_name.as_str());
+        Ok(Self { root_path, package })
+    }
+
+    pub fn into_compiled_package(&self) -> Result<CompiledPackage> {
+        let root_name = self.package.compiled_package_info.package_name;
+        assert!(self.root_path.ends_with(root_name.as_str()));
+        let root_compiled_units = self.get_compiled_units_paths(root_name)?;
+        let root_compiled_units = root_compiled_units
+            .into_iter()
+            .map(|bytecode_path| self.decode_unit(root_name, &bytecode_path))
+            .collect::<Result<Vec<_>>>()?;
+        let mut deps_compiled_units = vec![];
+        for dep_name in self.package.dependencies.iter().copied() {
+            let compiled_units = self.get_compiled_units_paths(dep_name)?;
+            for bytecode_path in compiled_units {
+                deps_compiled_units.push((dep_name, self.decode_unit(dep_name, &bytecode_path)?))
+            }
+        }
+
+        let docs_path = self
+            .root_path
+            .join(self.package.compiled_package_info.package_name.as_str())
+            .join(CompiledPackageLayout::CompiledDocs.path());
+        let compiled_docs = if docs_path.is_dir() {
+            Some(
+                find_filenames(&[docs_path.to_string_lossy().to_string()], |path| {
+                    extension_equals(path, "md")
+                })?
+                .into_iter()
+                .map(|path| {
+                    let contents = std::fs::read_to_string(&path).unwrap();
+                    (path, contents)
+                })
+                .collect(),
+            )
+        } else {
+            None
+        };
+
+        let abi_path = self
+            .root_path
+            .join(self.package.compiled_package_info.package_name.as_str())
+            .join(CompiledPackageLayout::CompiledABIs.path());
+        let compiled_abis = if abi_path.is_dir() {
+            Some(
+                find_filenames(&[abi_path.to_string_lossy().to_string()], |path| {
+                    extension_equals(path, "abi")
+                })?
+                .into_iter()
+                .map(|path| {
+                    let contents = std::fs::read(&path).unwrap();
+                    (path, contents)
+                })
+                .collect(),
+            )
+        } else {
+            None
+        };
+
+        Ok(CompiledPackage {
+            compiled_package_info: self.package.compiled_package_info.clone(),
+            root_compiled_units,
+            deps_compiled_units,
+            compiled_docs,
+            compiled_abis,
+        })
+    }
+
+    fn decode_unit(
+        &self,
+        package_name: Symbol,
+        bytecode_path_str: &str,
+    ) -> Result<CompiledUnitWithSource> {
+        let package_name_opt = Some(package_name);
+        let bytecode_path = Path::new(bytecode_path_str);
+        let path_to_file = CompiledPackageLayout::path_to_file_after_category(bytecode_path);
+        let bytecode_bytes = std::fs::read(bytecode_path)?;
+        let source_map = source_map_from_file(
+            &self
+                .root_path
+                .join(CompiledPackageLayout::SourceMaps.path())
+                .join(&path_to_file)
+                .with_extension(SOURCE_MAP_EXTENSION),
+        )?;
+        let source_path = self
+            .root_path
+            .join(CompiledPackageLayout::Sources.path())
+            .join(path_to_file)
+            .with_extension(MOVE_EXTENSION);
+        ensure!(
+            source_path.is_file(),
+            "Error decoding package: {}. \
+            Unable to find corresponding source file for '{}' in package {}",
+            self.package.compiled_package_info.package_name,
+            bytecode_path_str,
+            package_name
+        );
+        match CompiledScript::deserialize(&bytecode_bytes) {
+            Ok(script) => {
+                let name = FileName::from(
+                    bytecode_path
+                        .file_stem()
+                        .unwrap()
+                        .to_string_lossy()
+                        .to_string(),
+                );
+                let unit = CompiledUnit::Script(NamedCompiledScript {
+                    package_name: package_name_opt,
+                    name,
+                    script,
+                    source_map,
+                });
+                Ok(CompiledUnitWithSource { unit, source_path })
+            },
+            Err(_) => {
+                let module = CompiledModule::deserialize(&bytecode_bytes)?;
+                let (address_bytes, module_name) = {
+                    let id = module.self_id();
+                    let parsed_addr = NumericalAddress::new(
+                        id.address().into_bytes(),
+                        move_compiler::shared::NumberFormat::Hex,
+                    );
+                    let module_name = FileName::from(id.name().as_str());
+                    (parsed_addr, module_name)
+                };
+                let unit = CompiledUnit::Module(NamedCompiledModule {
+                    package_name: package_name_opt,
+                    address: address_bytes,
+                    name: module_name,
+                    module,
+                    source_map,
+                });
+                Ok(CompiledUnitWithSource { unit, source_path })
+            },
+        }
+    }
+
+    /// Save `bytes` under `path_under` relative to the package on disk
+    pub(crate) fn save_under(&self, file: impl AsRef<Path>, bytes: &[u8]) -> Result<()> {
+        let path_to_save = self.root_path.join(file);
+        let parent = path_to_save.parent().unwrap();
+        std::fs::create_dir_all(parent)?;
+        std::fs::write(path_to_save, bytes).map_err(|err| err.into())
+    }
+
+    #[allow(unused)]
+    pub(crate) fn has_source_changed_since_last_compile(
+        &self,
+        resolved_package: &ResolvedPackage,
+    ) -> bool {
+        match &self.package.compiled_package_info.source_digest {
+            // Don't have source available to us
+            None => false,
+            Some(digest) => digest != &resolved_package.source_digest,
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn are_build_flags_different(&self, build_config: &BuildConfig) -> bool {
+        build_config != &self.package.compiled_package_info.build_flags
+    }
+
+    fn get_compiled_units_paths(&self, package_name: Symbol) -> Result<Vec<String>> {
+        let package_dir = if self.package.compiled_package_info.package_name == package_name {
+            self.root_path.clone()
+        } else {
+            self.root_path
+                .join(CompiledPackageLayout::Dependencies.path())
+                .join(package_name.as_str())
+        };
+        let mut compiled_unit_paths = vec![];
+        let module_path = package_dir.join(CompiledPackageLayout::CompiledModules.path());
+        if module_path.exists() {
+            compiled_unit_paths.push(module_path);
+        }
+        let script_path = package_dir.join(CompiledPackageLayout::CompiledScripts.path());
+        if script_path.exists() {
+            compiled_unit_paths.push(script_path);
+        }
+        find_filenames(&compiled_unit_paths, |path| {
+            extension_equals(path, MOVE_COMPILED_EXTENSION)
+        })
+    }
+
+    fn save_compiled_unit(
+        &self,
+        package_name: Symbol,
+        compiled_unit: &CompiledUnitWithSource,
+        bytecode_version: Option<u32>,
+    ) -> Result<()> {
+        let root_package = self.package.compiled_package_info.package_name;
+        assert!(self.root_path.ends_with(root_package.as_str()));
+        let category_dir = match &compiled_unit.unit {
+            CompiledUnit::Script(_) => CompiledPackageLayout::CompiledScripts.path(),
+            CompiledUnit::Module(_) => CompiledPackageLayout::CompiledModules.path(),
+        };
+        let file_path = if root_package == package_name {
+            PathBuf::new()
+        } else {
+            CompiledPackageLayout::Dependencies
+                .path()
+                .join(package_name.as_str())
+        }
+        .join(match &compiled_unit.unit {
+            CompiledUnit::Script(named) => named.name.as_str(),
+            CompiledUnit::Module(named) => named.name.as_str(),
+        });
+
+        self.save_under(
+            category_dir
+                .join(&file_path)
+                .with_extension(MOVE_COMPILED_EXTENSION),
+            compiled_unit
+                .unit
+                .serialize(get_bytecode_version_from_env(bytecode_version))
+                .as_slice(),
+        )?;
+        self.save_under(
+            CompiledPackageLayout::SourceMaps
+                .path()
+                .join(&file_path)
+                .with_extension(SOURCE_MAP_EXTENSION),
+            compiled_unit.unit.serialize_source_map().as_slice(),
+        )?;
+        self.save_under(
+            CompiledPackageLayout::Sources
+                .path()
+                .join(&file_path)
+                .with_extension(MOVE_EXTENSION),
+            std::fs::read_to_string(&compiled_unit.source_path)?.as_bytes(),
+        )
+    }
+}
+
+impl CompiledPackage {
+    /// Returns all compiled units with sources for this package in transitive dependencies. Order
+    /// is not guaranteed.
+    pub fn all_compiled_units_with_source(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .chain(self.deps_compiled_units.iter().map(|(_, unit)| unit))
+    }
+
+    /// Returns all compiled units for this package in transitive dependencies. Order is not
+    /// guaranteed.
+    pub fn all_compiled_units(&self) -> impl Iterator<Item = &CompiledUnit> {
+        self.all_compiled_units_with_source().map(|unit| &unit.unit)
+    }
+
+    /// Returns compiled modules for this package and its transitive dependencies
+    pub fn all_modules_map(&self) -> Modules {
+        Modules::new(
+            self.all_compiled_units()
+                .filter_map(|unit| match unit {
+                    CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module),
+                    CompiledUnit::Script(_) => None,
+                })
+                .collect::<Vec<_>>(),
+        )
+    }
+
+    pub fn root_modules_map(&self) -> Modules {
+        Modules::new(
+            self.root_compiled_units
+                .iter()
+                .filter_map(|unit| match &unit.unit {
+                    CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module),
+                    CompiledUnit::Script(_) => None,
+                }),
+        )
+    }
+
+    /// `all_compiled_units_with_source` filtered over `CompiledUnit::Module`
+    pub fn all_modules(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.all_compiled_units_with_source()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Module(_)))
+    }
+
+    /// `root_compiled_units` filtered over `CompiledUnit::Module`
+    pub fn root_modules(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Module(_)))
+    }
+
+    pub fn get_module_by_name(
+        &self,
+        package_name: &str,
+        module_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        if self.compiled_package_info.package_name.as_str() == package_name {
+            return self.get_module_by_name_from_root(module_name);
+        }
+
+        self.deps_compiled_units
+            .iter()
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Module(_))
+            })
+            .map(|(_, unit)| unit)
+            .find(|unit| unit.unit.name().as_str() == module_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find module with name '{}' in package {}",
+                    module_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_script_by_name(
+        &self,
+        package_name: &str,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        if self.compiled_package_info.package_name.as_str() == package_name {
+            return self.get_script_by_name_from_root(script_name);
+        }
+
+        self.deps_compiled_units
+            .iter()
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Script(_))
+            })
+            .map(|(_, unit)| unit)
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_module_by_name_from_root(
+        &self,
+        module_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        self.root_modules()
+            .find(|unit| unit.unit.name().as_str() == module_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find module with name '{}' in package {}",
+                    module_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn get_script_by_name_from_root(
+        &self,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        self.scripts()
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
+    pub fn scripts(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
+        self.root_compiled_units
+            .iter()
+            .filter(|unit| matches!(unit.unit, CompiledUnit::Script(_)))
+    }
+
+    #[allow(unused)]
+    fn can_load_cached(
+        package: &OnDiskCompiledPackage,
+        resolution_graph: &ResolvedGraph,
+        resolved_package: &ResolvedPackage,
+        is_root_package: bool,
+    ) -> bool {
+        // TODO: add more tests for the different caching cases
+        !(package.has_source_changed_since_last_compile(resolved_package) // recompile if source has changed
+            // Recompile if the flags are different
+                || package.are_build_flags_different(&resolution_graph.build_options)
+                // Force root package recompilation in test mode
+                || resolution_graph.build_options.test_mode && is_root_package
+                // Recompile if force recompilation is set
+                || resolution_graph.build_options.force_recompilation) &&
+                // Dive deeper to make sure that instantiations haven't changed since that
+                // can be changed by other packages above us in the dependency graph possibly
+                package.package.compiled_package_info.address_alias_instantiation
+                    == resolved_package.resolution_table
+    }
+
+    pub(crate) fn build_all<W: Write>(
+        w: &mut W,
+        project_root: &Path,
+        resolved_package: ResolvedPackage,
+        transitive_dependencies: Vec<(
+            /* name */ Symbol,
+            /* is immediate */ bool,
+            /* source paths */ Vec<Symbol>,
+            /* address mapping */ &ResolvedTable,
+            /* whether source is available */ bool,
+        )>,
+        bytecode_version: Option<u32>,
+        resolution_graph: &ResolvedGraph,
+        mut compiler_driver: impl FnMut(
+            Compiler,
+        )
+            -> Result<(FilesSourceText, Vec<AnnotatedCompiledUnit>)>,
+    ) -> Result<CompiledPackage> {
+        let immediate_dependencies = transitive_dependencies
+            .iter()
+            .filter(|(_, is_immediate, _, _, _)| *is_immediate)
+            .map(|(name, _, _, _, _)| *name)
+            .collect::<Vec<_>>();
+        let transitive_dependencies = transitive_dependencies
+            .into_iter()
+            .map(
+                |(name, _is_immediate, source_paths, address_mapping, src_flag)| {
+                    (name, source_paths, address_mapping, src_flag)
+                },
+            )
+            .collect::<Vec<_>>();
+        for (dep_package_name, _, _, _) in &transitive_dependencies {
+            writeln!(
+                w,
+                "{} {}",
+                "INCLUDING DEPENDENCY".bold().green(),
+                dep_package_name
+            )?;
+        }
+        let root_package_name = resolved_package.source_package.package.name;
+        writeln!(w, "{} {}", "BUILDING".bold().green(), root_package_name)?;
+        // gather source/dep files with their address mappings
+        let (sources_package_paths, deps_package_paths) = make_source_and_deps_for_compiler(
+            resolution_graph,
+            &resolved_package,
+            transitive_dependencies,
+        )?;
+        let flags = if resolution_graph.build_options.test_mode {
+            Flags::testing()
+        } else {
+            Flags::empty()
+        };
+        // Partition deps_package according whether src is available
+        let (src_deps, bytecode_deps): (Vec<_>, Vec<_>) = deps_package_paths
+            .clone()
+            .into_iter()
+            .partition_map(|(p, b)| if b { Either::Left(p) } else { Either::Right(p) });
+        // If bytecode dependency is not empty, do not allow renaming
+        if !bytecode_deps.is_empty() {
+            if let Some(pkg_name) = resolution_graph.contains_renaming() {
+                anyhow::bail!(
+                    "Found address renaming in package '{}' when \
+                    building with bytecode dependencies -- this is currently not supported",
+                    pkg_name
+                )
+            }
+        }
+
+        // invoke the compiler
+        let mut paths = src_deps;
+        paths.push(sources_package_paths.clone());
+
+        let compiler = Compiler::from_package_paths(paths, bytecode_deps).set_flags(flags);
+        let (file_map, all_compiled_units) = compiler_driver(compiler)?;
+        let mut root_compiled_units = vec![];
+        let mut deps_compiled_units = vec![];
+        for annot_unit in all_compiled_units {
+            let source_path = PathBuf::from(file_map[&annot_unit.loc().file_hash()].0.as_str());
+            let package_name = match &annot_unit {
+                compiled_unit::CompiledUnitEnum::Module(m) => m.named_module.package_name.unwrap(),
+                compiled_unit::CompiledUnitEnum::Script(s) => s.named_script.package_name.unwrap(),
+            };
+            let unit = CompiledUnitWithSource {
+                unit: annot_unit.into_compiled_unit(),
+                source_path,
+            };
+            if package_name == root_package_name {
+                root_compiled_units.push(unit)
+            } else {
+                deps_compiled_units.push((package_name, unit))
+            }
+        }
+        let bytecode_version = get_bytecode_version_from_env(bytecode_version);
+
+        let mut compiled_docs = None;
+        let mut compiled_abis = None;
+        if resolution_graph.build_options.generate_docs
+            || resolution_graph.build_options.generate_abis
+        {
+            let model = run_model_builder_with_options(
+                vec![sources_package_paths],
+                deps_package_paths.into_iter().map(|(p, _)| p).collect_vec(),
+                ModelBuilderOptions::default(),
+            )?;
+
+            if resolution_graph.build_options.generate_docs {
+                compiled_docs = Some(Self::build_docs(
+                    resolved_package.source_package.package.name,
+                    &model,
+                    &resolved_package.package_path,
+                    &immediate_dependencies,
+                    &resolution_graph.build_options.install_dir,
+                ));
+            }
+
+            if resolution_graph.build_options.generate_abis {
+                compiled_abis = Some(Self::build_abis(
+                    bytecode_version,
+                    &model,
+                    &root_compiled_units,
+                ));
+            }
+        };
+
+        let compiled_package = CompiledPackage {
+            compiled_package_info: CompiledPackageInfo {
+                package_name: resolved_package.source_package.package.name,
+                address_alias_instantiation: resolved_package.resolution_table,
+                source_digest: Some(resolved_package.source_digest),
+                build_flags: resolution_graph.build_options.clone(),
+            },
+            root_compiled_units,
+            deps_compiled_units,
+            compiled_docs,
+            compiled_abis,
+        };
+
+        compiled_package.save_to_disk(
+            project_root.join(CompiledPackageLayout::Root.path()),
+            bytecode_version,
+        )?;
+
+        Ok(compiled_package)
+    }
+
+    // We take the (restrictive) view that all filesystems are case insensitive to maximize
+    // portability of packages.
+    fn check_filepaths_ok(&self) -> Result<()> {
+        // A mapping of (lowercase_name => [info_for_each_occurence]
+        let mut insensitive_mapping = BTreeMap::new();
+        for compiled_unit in &self.root_compiled_units {
+            let is_module = matches!(&compiled_unit.unit, CompiledUnit::Module(_));
+            let name = match &compiled_unit.unit {
+                CompiledUnit::Script(named) => named.name.as_str(),
+                CompiledUnit::Module(named) => named.name.as_str(),
+            };
+            let entry = insensitive_mapping
+                .entry(name.to_lowercase())
+                .or_insert_with(Vec::new);
+            entry.push((
+                name,
+                is_module,
+                compiled_unit.source_path.to_string_lossy().to_string(),
+            ));
+        }
+        let errs = insensitive_mapping
+            .into_iter()
+            .filter_map(|(insensitive_name, occurence_infos)| {
+                if occurence_infos.len() > 1 {
+                    let name_conflict_error_msg = occurence_infos
+                        .into_iter()
+                        .map(|(name, is_module, fpath)| {
+                                format!(
+                                    "\t{} '{}' at path '{}'",
+                                    if is_module { "Module" } else { "Script" },
+                                    name,
+                                    fpath
+                                )
+                        })
+                        .collect::<Vec<_>>()
+                        .join("\n");
+                    Some(format!(
+                        "The following modules and/or scripts would collide as '{}' on the file system:\n{}",
+                        insensitive_name, name_conflict_error_msg
+                    ))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+        if !errs.is_empty() {
+            anyhow::bail!("Module and/or script names found that would cause failures on case insensitive \
+                file systems when compiling package '{}':\n{}\nPlease rename these scripts and/or modules to resolve these conflicts.",
+                self.compiled_package_info.package_name,
+                errs.join("\n"),
+            )
+        }
+        Ok(())
+    }
+
+    pub(crate) fn save_to_disk(
+        &self,
+        under_path: PathBuf,
+        bytecode_version: Option<u32>,
+    ) -> Result<OnDiskCompiledPackage> {
+        self.check_filepaths_ok()?;
+        assert!(under_path.ends_with(CompiledPackageLayout::Root.path()));
+        let root_package = self.compiled_package_info.package_name;
+        let on_disk_package = OnDiskCompiledPackage {
+            root_path: under_path.join(root_package.as_str()),
+            package: OnDiskPackage {
+                compiled_package_info: self.compiled_package_info.clone(),
+                dependencies: self
+                    .deps_compiled_units
+                    .iter()
+                    .map(|(package_name, _)| *package_name)
+                    .collect::<BTreeSet<_>>()
+                    .into_iter()
+                    .collect(),
+            },
+        };
+
+        // Clear out the build dir for this package so we don't keep artifacts from previous
+        // compilations
+        if on_disk_package.root_path.is_dir() {
+            std::fs::remove_dir_all(&on_disk_package.root_path)?;
+        }
+
+        std::fs::create_dir_all(&on_disk_package.root_path)?;
+
+        for compiled_unit in &self.root_compiled_units {
+            on_disk_package.save_compiled_unit(root_package, compiled_unit, bytecode_version)?;
+        }
+        for (dep_name, compiled_unit) in &self.deps_compiled_units {
+            on_disk_package.save_compiled_unit(*dep_name, compiled_unit, bytecode_version)?;
+        }
+
+        if let Some(docs) = &self.compiled_docs {
+            for (doc_filename, doc_contents) in docs {
+                on_disk_package.save_under(
+                    CompiledPackageLayout::CompiledDocs
+                        .path()
+                        .join(doc_filename)
+                        .with_extension("md"),
+                    doc_contents.clone().as_bytes(),
+                )?;
+            }
+        }
+
+        if let Some(abis) = &self.compiled_abis {
+            for (filename, abi_bytes) in abis {
+                on_disk_package.save_under(
+                    CompiledPackageLayout::CompiledABIs
+                        .path()
+                        .join(filename)
+                        .with_extension("abi"),
+                    abi_bytes,
+                )?;
+            }
+        }
+
+        on_disk_package.save_under(
+            CompiledPackageLayout::BuildInfo.path(),
+            serde_yaml::to_string(&on_disk_package.package)?.as_bytes(),
+        )?;
+
+        Ok(on_disk_package)
+    }
+
+    fn build_abis(
+        bytecode_version: Option<u32>,
+        model: &GlobalEnv,
+        compiled_units: &[CompiledUnitWithSource],
+    ) -> Vec<(String, Vec<u8>)> {
+        let bytecode_map: BTreeMap<_, _> = compiled_units
+            .iter()
+            .map(|unit| match &unit.unit {
+                CompiledUnit::Script(script) => (
+                    script.name.to_string(),
+                    unit.unit.serialize(bytecode_version),
+                ),
+                CompiledUnit::Module(module) => (
+                    module.name.to_string(),
+                    unit.unit.serialize(bytecode_version),
+                ),
+            })
+            .collect();
+        let abi_options = AbigenOptions {
+            in_memory_bytes: Some(bytecode_map),
+            output_directory: "".to_string(),
+            ..AbigenOptions::default()
+        };
+        let mut abigen = Abigen::new(model, &abi_options);
+        abigen.gen();
+        abigen.into_result()
+    }
+
+    fn build_docs(
+        package_name: PackageName,
+        model: &GlobalEnv,
+        package_root: &Path,
+        deps: &[PackageName],
+        install_dir: &Option<PathBuf>,
+    ) -> Vec<(String, String)> {
+        let root_doc_templates = find_filenames(
+            &[package_root
+                .join(SourcePackageLayout::DocTemplates.path())
+                .to_string_lossy()
+                .to_string()],
+            |path| extension_equals(path, "md"),
+        )
+        .unwrap_or_else(|_| vec![]);
+        let root_for_docs = if let Some(install_dir) = install_dir {
+            install_dir.join(CompiledPackageLayout::Root.path())
+        } else {
+            CompiledPackageLayout::Root.path().to_path_buf()
+        };
+        let dep_paths = deps
+            .iter()
+            .map(|dep_name| {
+                root_for_docs
+                    .join(dep_name.as_str())
+                    .join(CompiledPackageLayout::CompiledDocs.path())
+                    .to_string_lossy()
+                    .to_string()
+            })
+            .collect();
+        let in_pkg_doc_path = root_for_docs
+            .join(package_name.as_str())
+            .join(CompiledPackageLayout::CompiledDocs.path());
+        let references_path = package_root
+            .join(SourcePackageLayout::DocTemplates.path())
+            .join(REFERENCE_TEMPLATE_FILENAME);
+        let references_file = if references_path.exists() {
+            Some(references_path.to_string_lossy().to_string())
+        } else {
+            None
+        };
+        let doc_options = DocgenOptions {
+            doc_path: dep_paths,
+            output_directory: in_pkg_doc_path.to_string_lossy().to_string(),
+            root_doc_templates,
+            compile_relative_to_output_dir: true,
+            references_file,
+            ..DocgenOptions::default()
+        };
+        let docgen = Docgen::new(model, &doc_options);
+        docgen.gen()
+    }
+}
+
+pub(crate) fn named_address_mapping_for_compiler(
+    resolution_table: &ResolvedTable,
+) -> BTreeMap<Symbol, NumericalAddress> {
+    resolution_table
+        .iter()
+        .map(|(ident, addr)| {
+            let parsed_addr =
+                NumericalAddress::new(addr.into_bytes(), move_compiler::shared::NumberFormat::Hex);
+            (*ident, parsed_addr)
+        })
+        .collect::<BTreeMap<_, _>>()
+}
+
+pub(crate) fn apply_named_address_renaming(
+    current_package_name: Symbol,
+    address_resolution: BTreeMap<Symbol, NumericalAddress>,
+    renaming: &Renaming,
+) -> NamedAddressMap {
+    let package_renamings = renaming
+        .iter()
+        .filter_map(|(rename_to, (package_name, from_name))| {
+            if package_name == &current_package_name {
+                Some((from_name, *rename_to))
+            } else {
+                None
+            }
+        })
+        .collect::<BTreeMap<_, _>>();
+
+    address_resolution
+        .into_iter()
+        .map(|(name, value)| {
+            let new_name = package_renamings.get(&name).copied();
+            (new_name.unwrap_or(name), value)
+        })
+        .collect()
+}
+
+pub(crate) fn make_source_and_deps_for_compiler(
+    resolution_graph: &ResolvedGraph,
+    root: &ResolvedPackage,
+    deps: Vec<(
+        /* name */ Symbol,
+        /* source paths */ Vec<Symbol>,
+        /* address mapping */ &ResolvedTable,
+        /* whether src is available */ bool,
+    )>,
+) -> Result<(
+    /* sources */ PackagePaths,
+    /* deps */ Vec<(PackagePaths, bool)>,
+)> {
+    let deps_package_paths = deps
+        .into_iter()
+        .map(|(name, source_paths, resolved_table, src_flag)| {
+            let paths = source_paths
+                .into_iter()
+                .collect::<BTreeSet<_>>()
+                .into_iter()
+                .collect::<Vec<_>>();
+            let named_address_map = named_address_mapping_for_compiler(resolved_table);
+            Ok((
+                PackagePaths {
+                    name: Some(name),
+                    paths,
+                    named_address_map,
+                },
+                src_flag,
+            ))
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let root_named_addrs = apply_named_address_renaming(
+        root.source_package.package.name,
+        named_address_mapping_for_compiler(&root.resolution_table),
+        &root.renaming,
+    );
+    let sources = root.get_sources(&resolution_graph.build_options)?;
+    let source_package_paths = PackagePaths {
+        name: Some(root.source_package.package.name),
+        paths: sources,
+        named_address_map: root_named_addrs,
+    };
+    Ok((source_package_paths, deps_package_paths))
+}
diff --git a/vendors/move/crates/tools/move-package/src/compilation/mod.rs b/vendors/move/crates/tools/move-package/src/compilation/mod.rs
new file mode 100644
index 000000000..ad1035bf9
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/compilation/mod.rs
@@ -0,0 +1,8 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod build_plan;
+pub mod compiled_package;
+pub mod model_builder;
+pub mod package_layout;
diff --git a/vendors/move/crates/tools/move-package/src/compilation/model_builder.rs b/vendors/move/crates/tools/move-package/src/compilation/model_builder.rs
new file mode 100644
index 000000000..0710ed955
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/compilation/model_builder.rs
@@ -0,0 +1,120 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    compilation::compiled_package::make_source_and_deps_for_compiler,
+    resolution::resolution_graph::ResolvedGraph, ModelConfig,
+};
+use anyhow::Result;
+use itertools::Itertools;
+use move_compiler::shared::PackagePaths;
+use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
+
+#[derive(Debug, Clone)]
+pub struct ModelBuilder {
+    resolution_graph: ResolvedGraph,
+    model_config: ModelConfig,
+}
+
+impl ModelBuilder {
+    pub fn create(resolution_graph: ResolvedGraph, model_config: ModelConfig) -> Self {
+        Self {
+            resolution_graph,
+            model_config,
+        }
+    }
+
+    // NOTE: If there are now renamings, then the root package has the global resolution of all named
+    // addresses in the package graph in scope. So we can simply grab all of the source files
+    // across all packages and build the Move model from that.
+    // TODO: In the future we will need a better way to do this to support renaming in packages
+    // where we want to support building a Move model.
+    pub fn build_model(&self) -> Result<GlobalEnv> {
+        // Make sure no renamings have been performed
+        if let Some(pkg_name) = self.resolution_graph.contains_renaming() {
+            anyhow::bail!(
+                "Found address renaming in package '{}' when \
+                    building Move model -- this is currently not supported",
+                pkg_name
+            )
+        }
+
+        // Targets are all files in the root package
+        let root_name = &self.resolution_graph.root_package.package.name;
+        let root_package = self.resolution_graph.get_package(root_name).clone();
+        let deps_source_info = self
+            .resolution_graph
+            .package_table
+            .iter()
+            .filter_map(|(nm, pkg)| {
+                if nm == root_name {
+                    return None;
+                }
+                let mut dep_source_paths = pkg
+                    .get_sources(&self.resolution_graph.build_options)
+                    .unwrap();
+                let mut source_available = true;
+                // If source is empty, search bytecode
+                if dep_source_paths.is_empty() {
+                    dep_source_paths = pkg.get_bytecodes().unwrap();
+                    source_available = false;
+                }
+                Some(Ok((
+                    *nm,
+                    dep_source_paths,
+                    &pkg.resolution_table,
+                    source_available,
+                )))
+            })
+            .collect::<Result<Vec<_>>>()?;
+        let (target, deps) = make_source_and_deps_for_compiler(
+            &self.resolution_graph,
+            &root_package,
+            deps_source_info,
+        )?;
+        let (all_targets, all_deps) = if self.model_config.all_files_as_targets {
+            let mut targets = vec![target];
+            targets.extend(deps.into_iter().map(|(p, _)| p).collect_vec());
+            (targets, vec![])
+        } else {
+            (vec![target], deps)
+        };
+        let (all_targets, all_deps) = match &self.model_config.target_filter {
+            Some(filter) => {
+                let mut new_targets = vec![];
+                let mut new_deps = all_deps.into_iter().map(|(p, _)| p).collect_vec();
+                for PackagePaths {
+                    name,
+                    paths,
+                    named_address_map,
+                } in all_targets
+                {
+                    let (true_targets, false_targets): (Vec<_>, Vec<_>) =
+                        paths.into_iter().partition(|t| t.contains(filter));
+                    if !true_targets.is_empty() {
+                        new_targets.push(PackagePaths {
+                            name,
+                            paths: true_targets,
+                            named_address_map: named_address_map.clone(),
+                        })
+                    }
+                    if !false_targets.is_empty() {
+                        new_deps.push(PackagePaths {
+                            name,
+                            paths: false_targets,
+                            named_address_map,
+                        })
+                    }
+                }
+                (new_targets, new_deps)
+            },
+            None => (
+                all_targets,
+                all_deps.into_iter().map(|(p, _)| p).collect_vec(),
+            ),
+        };
+
+        run_model_builder_with_options(all_targets, all_deps, ModelBuilderOptions::default())
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/compilation/package_layout.rs b/vendors/move/crates/tools/move-package/src/compilation/package_layout.rs
new file mode 100644
index 000000000..fb6ef8a2b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/compilation/package_layout.rs
@@ -0,0 +1,55 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, Clone)]
+pub enum CompiledPackageLayout {
+    BuildInfo,
+    Root,
+    Dependencies,
+    Sources,
+    SourceMaps,
+    CompiledModules,
+    CompiledScripts,
+    CompiledDocs,
+    CompiledABIs,
+}
+
+impl CompiledPackageLayout {
+    pub fn path(&self) -> &Path {
+        let path = match self {
+            Self::BuildInfo => "BuildInfo.yaml",
+            Self::Root => "build",
+            Self::Dependencies => "dependencies",
+            Self::Sources => "sources",
+            Self::SourceMaps => "source_maps",
+            Self::CompiledModules => "bytecode_modules",
+            Self::CompiledScripts => "bytecode_scripts",
+            Self::CompiledDocs => "docs",
+            Self::CompiledABIs => "abis",
+        };
+        Path::new(path)
+    }
+
+    pub fn path_to_file_after_category(path: &Path) -> PathBuf {
+        let mut suffix_components = vec![];
+        // reverse iterate until Root is found
+        for component in path.components().rev() {
+            let component_path: &Path = component.as_ref();
+            if component_path == Self::Root.path() {
+                break;
+            }
+            suffix_components.push(component);
+        }
+        // pop root package name
+        suffix_components.pop();
+        // pop category
+        suffix_components.pop();
+        // put the components back in order
+        suffix_components.reverse();
+        // make the path
+        suffix_components.into_iter().collect()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/lib.rs b/vendors/move/crates/tools/move-package/src/lib.rs
new file mode 100644
index 000000000..0208124c7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/lib.rs
@@ -0,0 +1,246 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod package_lock;
+
+pub mod compilation;
+pub mod package_hooks;
+pub mod resolution;
+pub mod source_package;
+
+use crate::{
+    compilation::{
+        build_plan::BuildPlan, compiled_package::CompiledPackage, model_builder::ModelBuilder,
+    },
+    package_lock::PackageLock,
+    resolution::resolution_graph::{ResolutionGraph, ResolvedGraph},
+    source_package::manifest_parser,
+};
+use anyhow::{bail, Result};
+use clap::*;
+use move_core_types::account_address::AccountAddress;
+use move_model::model::GlobalEnv;
+use serde::{Deserialize, Serialize};
+use source_package::layout::SourcePackageLayout;
+use std::{
+    collections::BTreeMap,
+    fmt,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum Architecture {
+    Move,
+
+    AsyncMove,
+
+    Ethereum,
+}
+
+impl fmt::Display for Architecture {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Move => write!(f, "move"),
+
+            Self::AsyncMove => write!(f, "async-move"),
+
+            Self::Ethereum => write!(f, "ethereum"),
+        }
+    }
+}
+
+impl Architecture {
+    fn all() -> impl Iterator<Item = Self> {
+        IntoIterator::into_iter([
+            Self::Move,
+            Self::AsyncMove,
+            #[cfg(feature = "evm-backend")]
+            Self::Ethereum,
+        ])
+    }
+
+    fn try_parse_from_str(s: &str) -> Result<Self> {
+        Ok(match s {
+            "move" => Self::Move,
+
+            "async-move" => Self::AsyncMove,
+
+            "ethereum" => Self::Ethereum,
+
+            _ => {
+                let supported_architectures = Self::all()
+                    .map(|arch| format!("\"{}\"", arch))
+                    .collect::<Vec<_>>();
+                let be = if supported_architectures.len() == 1 {
+                    "is"
+                } else {
+                    "are"
+                };
+                bail!(
+                    "Unrecognized architecture {} -- only {} {} supported",
+                    s,
+                    supported_architectures.join(", "),
+                    be
+                )
+            },
+        })
+    }
+}
+
+#[derive(Debug, Parser, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Default)]
+#[clap(author, version, about)]
+pub struct BuildConfig {
+    /// Compile in 'dev' mode. The 'dev-addresses' and 'dev-dependencies' fields will be used if
+    /// this flag is set. This flag is useful for development of packages that expose named
+    /// addresses that are not set to a specific value.
+    #[clap(name = "dev-mode", short = 'd', long = "dev", global = true)]
+    pub dev_mode: bool,
+
+    /// Compile in 'test' mode. The 'dev-addresses' and 'dev-dependencies' fields will be used
+    /// along with any code in the 'tests' directory.
+    #[clap(name = "test-mode", long = "test", global = true)]
+    pub test_mode: bool,
+
+    /// Generate documentation for packages
+    #[clap(name = "generate-docs", long = "doc", global = true)]
+    pub generate_docs: bool,
+
+    /// Generate ABIs for packages
+    #[clap(name = "generate-abis", long = "abi", global = true)]
+    pub generate_abis: bool,
+
+    /// Installation directory for compiled artifacts. Defaults to current directory.
+    #[clap(long = "install-dir", parse(from_os_str), global = true)]
+    pub install_dir: Option<PathBuf>,
+
+    /// Force recompilation of all packages
+    #[clap(name = "force-recompilation", long = "force", global = true)]
+    pub force_recompilation: bool,
+
+    /// Additional named address mapping. Useful for tools in rust
+    #[clap(skip)]
+    pub additional_named_addresses: BTreeMap<String, AccountAddress>,
+
+    #[clap(long = "arch", global = true, parse(try_from_str = Architecture::try_parse_from_str))]
+    pub architecture: Option<Architecture>,
+
+    /// Only fetch dependency repos to MOVE_HOME
+    #[clap(long = "fetch-deps-only", global = true)]
+    pub fetch_deps_only: bool,
+
+    /// Skip fetching latest git dependencies
+    #[clap(long = "skip-fetch-latest-git-deps", global = true)]
+    pub skip_fetch_latest_git_deps: bool,
+
+    /// Bytecode version to compile move code
+    #[clap(long = "bytecode-version", global = true)]
+    pub bytecode_version: Option<u32>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+pub struct ModelConfig {
+    /// If set, also files which are in dependent packages are considered as targets.
+    pub all_files_as_targets: bool,
+    /// If set, a string how targets are filtered. A target is included if its file name
+    /// contains this string. This is similar as the `cargo test <string>` idiom.
+    pub target_filter: Option<String>,
+}
+
+impl BuildConfig {
+    /// Compile the package at `path` or the containing Move package. Exit process on warning or
+    /// failure.
+    pub fn compile_package<W: Write>(self, path: &Path, writer: &mut W) -> Result<CompiledPackage> {
+        let bytecode_version = self.bytecode_version;
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
+        let mutx = PackageLock::lock();
+        let ret = BuildPlan::create(resolved_graph)?.compile(bytecode_version, writer);
+        mutx.unlock();
+        ret
+    }
+
+    /// Compile the package at `path` or the containing Move package. Do not exit process on warning
+    /// or failure.
+    pub fn compile_package_no_exit<W: Write>(
+        self,
+        path: &Path,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        let bytecode_version = self.bytecode_version;
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
+        let mutx = PackageLock::lock();
+        let ret = BuildPlan::create(resolved_graph)?.compile_no_exit(bytecode_version, writer);
+        mutx.unlock();
+        ret
+    }
+
+    #[cfg(feature = "evm-backend")]
+    pub fn compile_package_evm<W: Write>(self, path: &Path, writer: &mut W) -> Result<()> {
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolved_graph = self.resolution_graph_for_package(path, &mut Vec::new())?;
+        let mutx = PackageLock::lock();
+        let ret = BuildPlan::create(resolved_graph)?.compile_evm(writer);
+        mutx.unlock();
+        ret
+    }
+
+    // NOTE: If there are no renamings, then the root package has the global resolution of all named
+    // addresses in the package graph in scope. So we can simply grab all of the source files
+    // across all packages and build the Move model from that.
+    // TODO: In the future we will need a better way to do this to support renaming in packages
+    // where we want to support building a Move model.
+    pub fn move_model_for_package(
+        self,
+        path: &Path,
+        model_config: ModelConfig,
+    ) -> Result<GlobalEnv> {
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolved_graph = self.resolution_graph_for_package(path, &mut Vec::new())?;
+        let mutx = PackageLock::lock();
+        let ret = ModelBuilder::create(resolved_graph, model_config).build_model();
+        mutx.unlock();
+        ret
+    }
+
+    pub fn download_deps_for_package<W: Write>(&self, path: &Path, writer: &mut W) -> Result<()> {
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let mutx = PackageLock::lock();
+        // This should be locked as it inspects the environment for `MOVE_HOME` which could
+        // possibly be set by a different process in parallel.
+        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
+        ResolutionGraph::download_dependency_repos(&manifest, self, &path, writer)?;
+        mutx.unlock();
+        Ok(())
+    }
+
+    pub fn resolution_graph_for_package<W: Write>(
+        mut self,
+        path: &Path,
+        writer: &mut W,
+    ) -> Result<ResolvedGraph> {
+        if self.test_mode {
+            self.dev_mode = true;
+        }
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let mutx = PackageLock::lock();
+        // This should be locked as it inspects the environment for `MOVE_HOME` which could
+        // possibly be set by a different process in parallel.
+        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
+        let resolution_graph = ResolutionGraph::new(manifest, path, self, writer)?;
+        let ret = resolution_graph.resolve();
+        mutx.unlock();
+        ret
+    }
+
+    fn parse_toml_manifest(&self, path: PathBuf) -> Result<toml::Value> {
+        let manifest_string = std::fs::read_to_string(path)?;
+        manifest_parser::parse_move_manifest_string(manifest_string)
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/package_hooks.rs b/vendors/move/crates/tools/move-package/src/package_hooks.rs
new file mode 100644
index 000000000..cefabdb52
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/package_hooks.rs
@@ -0,0 +1,66 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::source_package::parsed_manifest::CustomDepInfo;
+use anyhow::bail;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use std::sync::Mutex;
+
+// TODO: remove static hooks and refactor this crate for better customizability
+
+/// A trait providing hooks to customize the package system for a particular Move application.
+/// An instance of the trait can be registered globally.
+pub trait PackageHooks {
+    /// Returns custom fields allowed in `PackageInfo`.
+    fn custom_package_info_fields(&self) -> Vec<String>;
+
+    /// Returns a custom key for dependencies, if available. This is the string used
+    /// in dependencies `{ <key> = value, address = addr }`.
+    fn custom_dependency_key(&self) -> Option<String>;
+
+    /// A resolver for custom dependencies in the manifest. This is called to download the
+    /// dependency from the dependency into the `info.local_path` location, similar as with git
+    /// dependencies.
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()>;
+}
+static HOOKS: Lazy<Mutex<Option<Box<dyn PackageHooks + Send + Sync>>>> =
+    Lazy::new(|| Mutex::new(None));
+
+/// Registers package hooks for the process in which the package system is used.
+pub fn register_package_hooks(hooks: Box<dyn PackageHooks + Send + Sync>) {
+    *HOOKS.lock().unwrap() = Some(hooks)
+}
+
+/// Calls any registered hook to resolve a node dependency. Bails if none is registered.
+pub(crate) fn resolve_custom_dependency(
+    dep_name: Symbol,
+    info: &CustomDepInfo,
+) -> anyhow::Result<()> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.resolve_custom_dependency(dep_name, info)
+    } else {
+        bail!("use of unsupported custom dependency in package manifest")
+    }
+}
+
+pub(crate) fn custom_dependency_key() -> Option<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_dependency_key()
+    } else {
+        None
+    }
+}
+
+/// Calls any registered hook to return custom package fields.
+pub(crate) fn custom_package_info_fields() -> Vec<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_package_info_fields()
+    } else {
+        vec![]
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/package_lock.rs b/vendors/move/crates/tools/move-package/src/package_lock.rs
new file mode 100644
index 000000000..b275bf792
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/package_lock.rs
@@ -0,0 +1,49 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use named_lock::{NamedLock, NamedLockGuard};
+use once_cell::sync::Lazy;
+use std::sync::{Mutex, MutexGuard};
+use whoami::username;
+
+const PACKAGE_LOCK_NAME: &str = "move_pkg_lock";
+static PACKAGE_THREAD_MUTEX: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
+static PACKAGE_PROCESS_MUTEX: Lazy<NamedLock> = Lazy::new(|| {
+    let user_lock_file = format!("{}_{}", PACKAGE_LOCK_NAME, username());
+    NamedLock::create(user_lock_file.as_str()).unwrap()
+});
+
+/// The package lock is a lock held across threads and processes. This lock is held to ensure that
+/// the Move package manager has a consistent (read: serial) view of the file system. Without this
+/// lock we can easily get into race conditions around caching and overwriting of packages (e.g.,
+/// thread 1 and thread 2 compete to build package P in the same location), as well as downloading
+/// of git dependencies (thread 1 starts downloading git dependency, meanwhile thread 2 sees the
+/// git directory before it has been fully populated but assumes it has been fully downloaded and
+/// starts building the package before the git dependency has been fully downloaded by thread 1.
+/// This will then lead to file not found errors). These same issues could occur across processes,
+/// this is why we grab both a thread lock and process lock.
+pub(crate) struct PackageLock {
+    thread_lock: MutexGuard<'static, ()>,
+    process_lock: NamedLockGuard<'static>,
+}
+
+impl PackageLock {
+    pub(crate) fn lock() -> PackageLock {
+        let thread_lock = PACKAGE_THREAD_MUTEX.lock().unwrap();
+        let process_lock = PACKAGE_PROCESS_MUTEX.lock().unwrap();
+        Self {
+            thread_lock,
+            process_lock,
+        }
+    }
+
+    pub(crate) fn unlock(self) {
+        let Self {
+            thread_lock,
+            process_lock,
+        } = self;
+        drop(process_lock);
+        drop(thread_lock);
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/resolution/digest.rs b/vendors/move/crates/tools/move-package/src/resolution/digest.rs
new file mode 100644
index 000000000..5c247b182
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/resolution/digest.rs
@@ -0,0 +1,51 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::source_package::{layout::SourcePackageLayout, parsed_manifest::PackageDigest};
+use anyhow::Result;
+use move_command_line_common::files::MOVE_EXTENSION;
+use sha2::{Digest, Sha256};
+use std::path::{Path, PathBuf};
+
+pub fn compute_digest(paths: &[PathBuf]) -> Result<PackageDigest> {
+    let mut hashed_files = Vec::new();
+    let mut hash = |path: &Path| {
+        let contents = std::fs::read(path)?;
+        hashed_files.push(format!("{:X}", Sha256::digest(&contents)));
+        Ok(())
+    };
+    let mut maybe_hash_file = |path: &Path| -> Result<()> {
+        match path.extension() {
+            Some(x) if MOVE_EXTENSION == x => hash(path),
+            _ if path.ends_with(SourcePackageLayout::Manifest.path()) => hash(path),
+            _ => Ok(()),
+        }
+    };
+
+    for path in paths {
+        if path.is_file() {
+            maybe_hash_file(path)?;
+        } else {
+            for entry in walkdir::WalkDir::new(path)
+                .follow_links(true)
+                .into_iter()
+                .filter_map(|e| e.ok())
+            {
+                if entry.file_type().is_file() {
+                    maybe_hash_file(entry.path())?
+                }
+            }
+        }
+    }
+
+    // Sort the hashed files to ensure that the order of files is always stable
+    hashed_files.sort();
+
+    let mut hasher = Sha256::new();
+    for file_hash in hashed_files.into_iter() {
+        hasher.update(file_hash.as_bytes());
+    }
+
+    Ok(PackageDigest::from(format!("{:X}", hasher.finalize())))
+}
diff --git a/vendors/move/crates/tools/move-package/src/resolution/mod.rs b/vendors/move/crates/tools/move-package/src/resolution/mod.rs
new file mode 100644
index 000000000..a21506c6e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/resolution/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod digest;
+pub mod resolution_graph;
diff --git a/vendors/move/crates/tools/move-package/src/resolution/resolution_graph.rs b/vendors/move/crates/tools/move-package/src/resolution/resolution_graph.rs
new file mode 100644
index 000000000..56927eff3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/resolution/resolution_graph.rs
@@ -0,0 +1,991 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    package_hooks,
+    resolution::digest::compute_digest,
+    source_package::{
+        layout::SourcePackageLayout,
+        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+        parsed_manifest::{
+            Dependencies, Dependency, FileName, NamedAddress, PackageDigest, PackageName,
+            SourceManifest, SubstOrRename,
+        },
+    },
+    BuildConfig,
+};
+use anyhow::{bail, Context, Result};
+use colored::Colorize;
+use move_command_line_common::files::{
+    extension_equals, find_filenames, find_move_filenames, FileHash, MOVE_COMPILED_EXTENSION,
+};
+use move_compiler::command_line::DEFAULT_OUTPUT_DIR;
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::Symbol;
+use petgraph::{algo, graphmap::DiGraphMap, Outgoing};
+use ptree::{print_tree, TreeBuilder};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet},
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    process::{Command, Stdio},
+    rc::Rc,
+};
+
+pub type ResolvedTable = ResolutionTable<AccountAddress>;
+pub type ResolvedPackage = ResolutionPackage<AccountAddress>;
+pub type ResolvedGraph = ResolutionGraph<AccountAddress>;
+
+// rename_to => (from_package name, from_address_name)
+pub type Renaming = BTreeMap<NamedAddress, (PackageName, NamedAddress)>;
+pub type GraphIndex = PackageName;
+
+type ResolutionTable<T> = BTreeMap<NamedAddress, T>;
+type ResolvingTable = ResolutionTable<ResolvingNamedAddress>;
+type ResolvingGraph = ResolutionGraph<ResolvingNamedAddress>;
+type ResolvingPackage = ResolutionPackage<ResolvingNamedAddress>;
+
+#[derive(Debug, Clone)]
+pub struct ResolvingNamedAddress {
+    value: Rc<RefCell<Option<AccountAddress>>>,
+}
+
+/// A `ResolutionGraph` comes in two flavors:
+/// 1. a `ResolutionGraph` during resolution (some named addresses may yet be instantiated)
+/// 2. a `ResolvedGraph` which is a graph after resolution in which all named addresses have been
+///    assigned a value.
+///
+/// Named addresses can be assigned values in a couple different ways:
+/// 1. They can be assigned a value in the declaring package. In this case the value of that
+///    named address will always be that value.
+/// 2. Can be left unassigned in the declaring package. In this case it can receive its value
+///    through unification across the package graph.
+///
+/// Named addresses can also be renamed in a package and will be re-exported under thes new names in this case.
+#[derive(Debug, Clone)]
+pub struct ResolutionGraph<T> {
+    pub root_package_path: PathBuf,
+    /// Build options
+    pub build_options: BuildConfig,
+    /// Root package
+    pub root_package: SourceManifest,
+    /// Dependency graph
+    pub graph: DiGraphMap<PackageName, ()>,
+    /// A mapping of package name to its resolution
+    pub package_table: BTreeMap<PackageName, ResolutionPackage<T>>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct ResolutionPackage<T> {
+    /// Pointer into the `ResolutionGraph.graph`
+    pub resolution_graph_index: GraphIndex,
+    /// source manifest for this package
+    pub source_package: SourceManifest,
+    /// Where this package is located on the filesystem
+    pub package_path: PathBuf,
+    /// The renaming of addresses performed by this package
+    pub renaming: Renaming,
+    /// The mapping of addresses for this package (and that are in scope for it)
+    pub resolution_table: ResolutionTable<T>,
+    /// The digest of the contents of all source files and manifest under the package root
+    pub source_digest: PackageDigest,
+}
+
+impl ResolvingGraph {
+    pub fn new<W: Write>(
+        root_package: SourceManifest,
+        root_package_path: PathBuf,
+        mut build_options: BuildConfig,
+        writer: &mut W,
+    ) -> Result<ResolvingGraph> {
+        if build_options.architecture.is_none() {
+            if let Some(info) = &root_package.build {
+                build_options.architecture = info.architecture;
+            }
+        }
+        let mut resolution_graph = Self {
+            root_package_path: root_package_path.clone(),
+            build_options,
+            root_package: root_package.clone(),
+            graph: DiGraphMap::new(),
+            package_table: BTreeMap::new(),
+        };
+
+        resolution_graph
+            .build_resolution_graph(root_package.clone(), root_package_path, true, writer)
+            .with_context(|| {
+                format!(
+                    "Unable to resolve packages for package '{}'",
+                    root_package.package.name
+                )
+            })?;
+        Ok(resolution_graph)
+    }
+
+    pub fn resolve(self) -> Result<ResolvedGraph> {
+        let ResolvingGraph {
+            root_package_path,
+            build_options,
+            root_package,
+            graph,
+            package_table,
+        } = self;
+
+        let mut unresolved_addresses = Vec::new();
+
+        let resolved_package_table = package_table
+            .into_iter()
+            .map(|(name, package)| {
+                let ResolutionPackage {
+                    resolution_graph_index,
+                    source_package,
+                    package_path,
+                    renaming,
+                    resolution_table,
+                    source_digest,
+                } = package;
+
+                let resolved_table = resolution_table
+                    .into_iter()
+                    .filter_map(|(addr_name, instantiation_opt)| {
+                        match *instantiation_opt.value.borrow() {
+                            None => {
+                                unresolved_addresses.push(format!(
+                                    "Named address '{}' in package '{}'",
+                                    addr_name, name
+                                ));
+                                None
+                            },
+                            Some(addr) => Some((addr_name, addr)),
+                        }
+                    })
+                    .collect::<BTreeMap<_, _>>();
+                let resolved_pkg = ResolvedPackage {
+                    resolution_graph_index,
+                    source_package,
+                    package_path,
+                    renaming,
+                    resolution_table: resolved_table,
+                    source_digest,
+                };
+                (name, resolved_pkg)
+            })
+            .collect::<BTreeMap<_, _>>();
+
+        if !unresolved_addresses.is_empty() {
+            bail!(
+                "Unresolved addresses found: [\n{}\n]\n\
+                To fix this, add an entry for each unresolved address to the [addresses] section of {}/Move.toml: \
+                e.g.,\n[addresses]\nStd = \"0x1\"\n\
+                Alternatively, you can also define [dev-addresses] and call with the -d flag",
+                unresolved_addresses.join("\n"),
+                root_package_path.to_string_lossy()
+            )
+        }
+
+        Ok(ResolvedGraph {
+            root_package_path,
+            build_options,
+            root_package,
+            graph,
+            package_table: resolved_package_table,
+        })
+    }
+
+    fn build_resolution_graph<W: Write>(
+        &mut self,
+        package: SourceManifest,
+        package_path: PathBuf,
+        is_root_package: bool,
+        writer: &mut W,
+    ) -> Result<()> {
+        let package_name = package.package.name;
+        let package_node_id = match self.package_table.get(&package_name) {
+            None => self.get_or_add_node(package_name)?,
+            // Same package and we've already resolved it: OK, return early
+            Some(other) if other.source_package == package => return Ok(()),
+            // Different packages, with same name: Not OK
+            Some(other) => {
+                bail!(
+                    "Conflicting dependencies found: package '{}' conflicts with '{}'",
+                    other.source_package.package.name,
+                    package.package.name,
+                )
+            },
+        };
+
+        let mut renaming = BTreeMap::new();
+        let mut resolution_table = self
+            .build_options
+            .additional_named_addresses
+            .clone()
+            .into_iter()
+            .map(|(name, addr)| {
+                (
+                    NamedAddress::from(name),
+                    ResolvingNamedAddress::new(Some(addr)),
+                )
+            })
+            .collect();
+
+        // include dev dependencies if in dev mode
+        let additional_deps = if self.build_options.dev_mode {
+            package.dev_dependencies.clone()
+        } else {
+            BTreeMap::new()
+        };
+
+        for (dep_name, dep) in package
+            .dependencies
+            .clone()
+            .into_iter()
+            .chain(additional_deps.into_iter())
+        {
+            let dep_node_id = self.get_or_add_node(dep_name).with_context(|| {
+                format!(
+                    "Cycle between packages {} and {} found",
+                    package_name, dep_name
+                )
+            })?;
+            self.graph.add_edge(package_node_id, dep_node_id, ());
+
+            let (dep_renaming, dep_resolution_table) = self
+                .process_dependency(dep_name, dep, package_path.clone(), writer)
+                .with_context(|| {
+                    format!(
+                        "While resolving dependency '{}' in package '{}'",
+                        dep_name, package_name
+                    )
+                })?;
+
+            ResolutionPackage::extend_renaming(&mut renaming, &dep_name, dep_renaming.clone())
+                .with_context(|| {
+                    format!(
+                        "While resolving address renames in dependency '{}' in package '{}'",
+                        dep_name, package_name
+                    )
+                })?;
+
+            ResolutionPackage::extend_resolution_table(
+                &mut resolution_table,
+                &dep_name,
+                dep_resolution_table,
+                dep_renaming,
+            )
+            .with_context(|| {
+                format!(
+                    "Resolving named addresses for dependency '{}' in package '{}'",
+                    dep_name, package_name
+                )
+            })?;
+        }
+
+        self.unify_addresses_in_package(&package, &mut resolution_table, is_root_package)?;
+
+        let source_digest =
+            ResolvingPackage::get_package_digest_for_config(&package_path, &self.build_options)?;
+
+        let resolved_package = ResolutionPackage {
+            resolution_graph_index: package_node_id,
+            source_package: package,
+            package_path,
+            renaming,
+            resolution_table,
+            source_digest,
+        };
+
+        self.package_table.insert(package_name, resolved_package);
+        Ok(())
+    }
+
+    fn unify_addresses_in_package(
+        &mut self,
+        package: &SourceManifest,
+        resolution_table: &mut ResolvingTable,
+        is_root_package: bool,
+    ) -> Result<()> {
+        let package_name = &package.package.name;
+        for (name, addr_opt) in package.addresses.clone().unwrap_or_default().into_iter() {
+            match resolution_table.get(&name) {
+                Some(other) => {
+                    other.unify(addr_opt).with_context(|| {
+                        format!(
+                            "Unable to resolve named address '{}' in \
+                             package '{}' when resolving dependencies",
+                            name, package_name
+                        )
+                    })?;
+                },
+                None => {
+                    resolution_table.insert(name, ResolvingNamedAddress::new(addr_opt));
+                },
+            }
+        }
+
+        if self.build_options.dev_mode && is_root_package {
+            let mut addr_to_name_mapping = BTreeMap::new();
+            for (name, addr) in resolution_table
+                .iter()
+                .filter(|(_name, addr)| addr.value.borrow().is_some())
+            {
+                let names = addr_to_name_mapping
+                    .entry(addr.value.borrow().unwrap())
+                    .or_insert_with(Vec::new);
+                names.push(*name);
+            }
+
+            for (name, addr) in package
+                .dev_address_assignments
+                .clone()
+                .unwrap_or_default()
+                .into_iter()
+            {
+                match resolution_table.get(&name) {
+                    Some(other) => {
+                        other.unify(Some(addr)).with_context(|| {
+                            format!(
+                                "Unable to resolve named address '{}' in\
+                                    package '{}' when resolving dependencies in dev mode",
+                                name, package_name
+                            )
+                        })?;
+                    },
+                    None => {
+                        bail!(
+                            "Found unbound dev address assignment '{} = 0x{}' in root package '{}'. \
+                             Dev addresses cannot introduce new named addresses",
+                            name,
+                            addr.short_str_lossless(),
+                            package_name
+                        );
+                    },
+                }
+
+                if let Some(conflicts) = addr_to_name_mapping.insert(addr, vec![name]) {
+                    bail!(
+                        "Found non-unique dev address assignment '{name} = 0x{addr}' in root \
+                        package '{pkg}'. Dev address assignments must not conflict with any other \
+                        assignments in order to ensure that the package will compile with any \
+                        possible address assignment. \
+                        Assignment conflicts with previous assignments: {conflicts} = 0x{addr}",
+                        name = name,
+                        addr = addr.short_str_lossless(),
+                        pkg = package_name,
+                        conflicts = conflicts
+                            .into_iter()
+                            .map(|n| n.to_string())
+                            .collect::<Vec<_>>()
+                            .join(", "),
+                    )
+                }
+            }
+        }
+        Ok(())
+    }
+
+    // Process a dependency. `dep_name_in_pkg` is the name assigned to the dependent package `dep`
+    // in the source manifest, and we check that this name matches the name of the dependency it is
+    // assigned to.
+    fn process_dependency<W: Write>(
+        &mut self,
+        dep_name_in_pkg: PackageName,
+        dep: Dependency,
+        root_path: PathBuf,
+        writer: &mut W,
+    ) -> Result<(Renaming, ResolvingTable)> {
+        Self::download_and_update_if_remote(
+            dep_name_in_pkg,
+            &dep,
+            self.build_options.skip_fetch_latest_git_deps,
+            writer,
+        )?;
+        let (dep_package, dep_package_dir) =
+            Self::parse_package_manifest(&dep, &dep_name_in_pkg, root_path)
+                .with_context(|| format!("While processing dependency '{}'", dep_name_in_pkg))?;
+        self.build_resolution_graph(dep_package.clone(), dep_package_dir, false, writer)
+            .with_context(|| {
+                format!("Unable to resolve package dependency '{}'", dep_name_in_pkg)
+            })?;
+
+        if dep_name_in_pkg != dep_package.package.name {
+            bail!("Name of dependency declared in package '{}' does not match dependency's package name '{}'",
+                dep_name_in_pkg,
+                dep_package.package.name
+            );
+        }
+
+        match dep.digest {
+            None => (),
+            Some(fixed_digest) => {
+                let resolved_pkg = self
+                    .package_table
+                    .get(&dep_name_in_pkg)
+                    .context("Unable to find resolved package by name")?;
+                if fixed_digest != resolved_pkg.source_digest {
+                    bail!(
+                        "Source digest mismatch in dependency '{}'. Expected '{}' but got '{}'.",
+                        dep_name_in_pkg,
+                        fixed_digest,
+                        resolved_pkg.source_digest
+                    )
+                }
+            },
+        }
+
+        let resolving_dep = &self.package_table[&dep_name_in_pkg];
+        let mut renaming = BTreeMap::new();
+        let mut resolution_table = resolving_dep.resolution_table.clone();
+
+        // check that address being renamed exists in the dep that is being renamed/imported
+        if let Some(dep_subst) = dep.subst {
+            for (name, rename_from_or_assign) in dep_subst.into_iter() {
+                match rename_from_or_assign {
+                    SubstOrRename::RenameFrom(ident) => {
+                        // Make sure dep has the address that we're importing
+                        if !resolving_dep.resolution_table.contains_key(&ident) {
+                            bail!(
+                                "Tried to rename named address {0} from package '{1}'.\
+                                However, {1} does not contain that address",
+                                ident,
+                                dep_name_in_pkg
+                            );
+                        }
+
+                        // Apply the substitution, NB that the refcell for the address's value is kept!
+                        if let Some(other_val) = resolution_table.remove(&ident) {
+                            resolution_table.insert(name, other_val);
+                        }
+
+                        if renaming.insert(name, (dep_name_in_pkg, ident)).is_some() {
+                            bail!("Duplicate renaming of named address '{0}' found for dependency {1}",
+                                name,
+                                dep_name_in_pkg,
+                            );
+                        }
+                    },
+                    SubstOrRename::Assign(value) => {
+                        resolution_table
+                            .get(&name)
+                            .map(|named_addr| named_addr.unify(Some(value)))
+                            .transpose()
+                            .with_context(|| {
+                                format!(
+                                    "Unable to assign value to named address {} in dependency {}",
+                                    name, dep_name_in_pkg
+                                )
+                            })?;
+                    },
+                }
+            }
+        }
+
+        Ok((renaming, resolution_table))
+    }
+
+    fn get_or_add_node(&mut self, package_name: PackageName) -> Result<GraphIndex> {
+        if self.graph.contains_node(package_name) {
+            // If we encounter a node that we've already added we should check for cycles
+            if algo::is_cyclic_directed(&self.graph) {
+                // get the first cycle. Exists because we found a cycle above.
+                let mut cycle = algo::kosaraju_scc(&self.graph)[0]
+                    .iter()
+                    .map(|node| node.as_str().to_string())
+                    .collect::<Vec<_>>();
+                // Add offending node at end to complete the cycle for display
+                cycle.push(package_name.as_str().to_string());
+                bail!("Found cycle between packages: {}", cycle.join(" -> "));
+            }
+            Ok(package_name)
+        } else {
+            Ok(self.graph.add_node(package_name))
+        }
+    }
+
+    fn parse_package_manifest(
+        dep: &Dependency,
+        dep_name: &PackageName,
+        mut root_path: PathBuf,
+    ) -> Result<(SourceManifest, PathBuf)> {
+        root_path.push(&dep.local);
+        match fs::read_to_string(root_path.join(SourcePackageLayout::Manifest.path())) {
+            Ok(contents) => {
+                let source_package: SourceManifest =
+                    parse_move_manifest_string(contents).and_then(parse_source_manifest)?;
+                Ok((source_package, root_path))
+            },
+            Err(_) => Err(anyhow::format_err!(
+                "Unable to find package manifest for '{}' at {:?}",
+                dep_name,
+                SourcePackageLayout::Manifest.path().join(root_path),
+            )),
+        }
+    }
+
+    pub fn download_dependency_repos<W: Write>(
+        manifest: &SourceManifest,
+        build_options: &BuildConfig,
+        root_path: &Path,
+        writer: &mut W,
+    ) -> Result<()> {
+        // include dev dependencies if in dev mode
+        let empty_deps;
+        let additional_deps = if build_options.dev_mode {
+            &manifest.dev_dependencies
+        } else {
+            empty_deps = Dependencies::new();
+            &empty_deps
+        };
+
+        for (dep_name, dep) in manifest.dependencies.iter().chain(additional_deps.iter()) {
+            Self::download_and_update_if_remote(
+                *dep_name,
+                dep,
+                build_options.skip_fetch_latest_git_deps,
+                writer,
+            )?;
+
+            let (dep_manifest, _) =
+                Self::parse_package_manifest(dep, dep_name, root_path.to_path_buf())
+                    .with_context(|| format!("While processing dependency '{}'", *dep_name))?;
+            // download dependencies of dependencies
+            Self::download_dependency_repos(&dep_manifest, build_options, root_path, writer)?;
+        }
+        Ok(())
+    }
+
+    fn download_and_update_if_remote<W: Write>(
+        dep_name: PackageName,
+        dep: &Dependency,
+        skip_fetch_latest_git_deps: bool,
+        writer: &mut W,
+    ) -> Result<()> {
+        if let Some(git_info) = &dep.git_info {
+            let git_url = git_info.git_url.as_str();
+            let git_rev = git_info.git_rev.as_str();
+            let git_path = &git_info.download_to.display().to_string();
+
+            // If there is no cached dependency, download it
+            if !git_info.download_to.exists() {
+                writeln!(
+                    writer,
+                    "{} {}",
+                    "FETCHING GIT DEPENDENCY".bold().green(),
+                    git_url,
+                )?;
+
+                // Confirm git is available.
+                confirm_git_available()?;
+
+                // If the cached folder does not exist, download and clone accordingly
+                Command::new("git")
+                    .args(["clone", git_url, git_path])
+                    .output()
+                    .map_err(|_| {
+                        anyhow::anyhow!("Failed to clone Git repository for package '{}'", dep_name)
+                    })?;
+                Command::new("git")
+                    .args(["-C", git_path, "checkout", git_rev])
+                    .output()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to checkout Git reference '{}' for package '{}'",
+                            git_rev,
+                            dep_name
+                        )
+                    })?;
+            } else if !skip_fetch_latest_git_deps {
+                // Confirm git is available.
+                confirm_git_available()?;
+
+                // Update the git dependency
+                // Check first that it isn't a git rev (if it doesn't work, just continue with the fetch)
+                if let Ok(rev) = Command::new("git")
+                    .args(["-C", git_path, "rev-parse", "--verify", git_rev])
+                    .output()
+                {
+                    if let Ok(parsable_version) = String::from_utf8(rev.stdout) {
+                        // If it's exactly the same, then it's a git rev
+                        if parsable_version.trim().starts_with(git_rev) {
+                            return Ok(());
+                        }
+                    }
+                }
+
+                let tag = Command::new("git")
+                    .args(["-C", git_path, "tag", "--list", git_rev])
+                    .output();
+
+                if let Ok(tag) = tag {
+                    if let Ok(parsable_version) = String::from_utf8(tag.stdout) {
+                        // If it's exactly the same, then it's a git tag, for now tags won't be updated
+                        // Tags don't easily update locally and you can't use reset --hard to cleanup
+                        // any extra files
+                        if parsable_version.trim().starts_with(git_rev) {
+                            return Ok(());
+                        }
+                    }
+                }
+
+                writeln!(
+                    writer,
+                    "{} {}",
+                    "UPDATING GIT DEPENDENCY".bold().green(),
+                    git_url,
+                )?;
+                // If the current folder exists, do a fetch and reset to ensure that the branch
+                // is up to date
+                // NOTE: this means that you must run the package system with a working network connection
+                let status = Command::new("git")
+                    .args([
+                        "-C",
+                        git_path,
+                        "fetch",
+                        "origin",
+                    ])
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to fetch latest Git state for package '{}', to skip set --skip-fetch-latest-git-deps",
+                            dep_name
+                        )
+                    })?;
+
+                if !status.success() {
+                    return Err(anyhow::anyhow!(
+                            "Failed to fetch to latest Git state for package '{}', to skip set --skip-fetch-latest-git-deps | Exit status: {}",
+                            dep_name,
+                        status
+                        ));
+                }
+                let status = Command::new("git")
+                    .args([
+                        "-C",
+                        git_path,
+                        "reset",
+                        "--hard",
+                        &format!("origin/{}", git_rev)
+                    ])
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to reset to latest Git state '{}' for package '{}', to skip set --skip-fetch-latest-git-deps",
+                            git_rev,
+                            dep_name
+                        )
+                    })?;
+                if !status.success() {
+                    return Err(anyhow::anyhow!(
+                            "Failed to reset to latest Git state '{}' for package '{}', to skip set --skip-fetch-latest-git-deps | Exit status: {}",
+                            git_rev,
+                            dep_name,
+                        status
+                        ));
+                }
+            }
+        }
+        if let Some(node_info) = &dep.node_info {
+            package_hooks::resolve_custom_dependency(dep_name, node_info)?
+        }
+        Ok(())
+    }
+}
+
+impl ResolvingPackage {
+    // Extend and check for duplicate names in rename_to
+    fn extend_renaming(
+        renaming: &mut Renaming,
+        dep_name: &PackageName,
+        dep_renaming: Renaming,
+    ) -> Result<()> {
+        for (rename_to, rename_from) in dep_renaming.into_iter() {
+            // We cannot rename multiple named addresses to the same name. In the future we'll want
+            // to support this.
+            if renaming.insert(rename_to, rename_from).is_some() {
+                bail!(
+                    "Duplicate renaming of named address '{}' found in dependency '{}'",
+                    rename_to,
+                    dep_name
+                );
+            }
+        }
+        Ok(())
+    }
+
+    // The resolution table contains the transitive closure of addresses that are known in that
+    // package. Extends the package's resolution table and checks for duplicate renamings that
+    // conflict during this process.
+    fn extend_resolution_table(
+        resolution_table: &mut ResolvingTable,
+        dep_name: &PackageName,
+        dep_resolution_table: ResolvingTable,
+        dep_renaming: Renaming,
+    ) -> Result<()> {
+        let renames = dep_renaming
+            .into_iter()
+            .map(|(rename_to, (_, rename_from))| (rename_from, rename_to))
+            .collect::<BTreeMap<_, _>>();
+
+        for (addr_name, addr_value) in dep_resolution_table.into_iter() {
+            let addr_name = renames.get(&addr_name).cloned().unwrap_or(addr_name);
+            if let Some(other) = resolution_table.insert(addr_name, addr_value.clone()) {
+                // They need to be the same refcell so resolve to the same location if there are any
+                // possible reassignments
+                if other.value != addr_value.value {
+                    bail!(
+                        "Named address '{}' in dependency '{}' is already set to '{}' but was then reassigned to '{}'",
+                        &addr_name,
+                        dep_name,
+                        match other.value.take() {
+                            None => "unassigned".to_string(),
+                            Some(addr) => format!("0x{}", addr.short_str_lossless()),
+                        },
+                        match addr_value.value.take() {
+                            None => "unassigned".to_string(),
+                            Some(addr) => format!("0x{}", addr.short_str_lossless()),
+                        }
+                    );
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn get_source_paths_for_config(
+        package_path: &Path,
+        config: &BuildConfig,
+    ) -> Result<Vec<PathBuf>> {
+        let mut places_to_look = Vec::new();
+        let mut add_path = |layout_path: SourcePackageLayout| {
+            let path = package_path.join(layout_path.path());
+            if layout_path.is_optional() && !path.exists() {
+                return;
+            }
+            places_to_look.push(path)
+        };
+
+        add_path(SourcePackageLayout::Sources);
+        add_path(SourcePackageLayout::Scripts);
+
+        if config.dev_mode {
+            add_path(SourcePackageLayout::Examples);
+            add_path(SourcePackageLayout::Tests);
+        }
+        Ok(places_to_look)
+    }
+
+    fn get_build_paths(package_path: &Path) -> Result<Vec<PathBuf>> {
+        let mut places_to_look = Vec::new();
+        let path = package_path.join(Path::new(DEFAULT_OUTPUT_DIR));
+        if path.exists() {
+            places_to_look.push(path);
+        }
+        Ok(places_to_look)
+    }
+
+    fn get_package_digest_for_config(
+        package_path: &Path,
+        config: &BuildConfig,
+    ) -> Result<PackageDigest> {
+        let mut source_paths = Self::get_source_paths_for_config(package_path, config)?;
+        source_paths.push(package_path.join(SourcePackageLayout::Manifest.path()));
+        compute_digest(source_paths.as_slice())
+    }
+}
+
+impl ResolvingNamedAddress {
+    pub fn new(address_opt: Option<AccountAddress>) -> Self {
+        Self {
+            value: Rc::new(RefCell::new(address_opt)),
+        }
+    }
+
+    pub fn unify(&self, address_opt: Option<AccountAddress>) -> Result<()> {
+        match address_opt {
+            None => Ok(()),
+            Some(addr_val) => match &mut *self.value.borrow_mut() {
+                Some(current_value) if current_value != &addr_val =>
+                    bail!("Attempted to assign a different value '0x{}' to an a already-assigned named address '0x{}'",
+                        addr_val.short_str_lossless(), current_value.short_str_lossless()
+                    ),
+                Some(_) => Ok(()),
+                x @ None => {
+                    *x = Some(addr_val);
+                    Ok(())
+                }
+            },
+        }
+    }
+}
+
+impl ResolvedGraph {
+    pub fn get_package(&self, package_ident: &PackageName) -> &ResolvedPackage {
+        self.package_table.get(package_ident).unwrap()
+    }
+
+    fn print_info_dfs(&self, current_node: &PackageName, tree: &mut TreeBuilder) -> Result<()> {
+        let pkg = self.package_table.get(current_node).unwrap();
+
+        for (name, addr) in &pkg.resolution_table {
+            tree.add_empty_child(format!("{}:0x{}", name, addr.short_str_lossless()));
+        }
+
+        for node in self.graph.neighbors_directed(*current_node, Outgoing) {
+            tree.begin_child(node.to_string());
+            self.print_info_dfs(&node, tree)?;
+            tree.end_child();
+        }
+        Ok(())
+    }
+
+    pub fn print_info(&self) -> Result<()> {
+        let root = self.root_package.package.name;
+        let mut tree = TreeBuilder::new(root.to_string());
+        self.print_info_dfs(&root, &mut tree)?;
+        let tree = tree.build();
+        print_tree(&tree)?;
+        Ok(())
+    }
+
+    pub fn extract_named_address_mapping(
+        &self,
+    ) -> impl Iterator<Item = (Symbol, AccountAddress)> + '_ {
+        let rooot_package_name = &self.root_package.package.name;
+        let root_package = self
+            .package_table
+            .get(rooot_package_name)
+            .expect("Failed to find root package in package table -- this should never happen");
+
+        root_package
+            .resolution_table
+            .iter()
+            .map(|(name, addr)| (*name, *addr))
+    }
+
+    pub fn file_sources(&self) -> BTreeMap<FileHash, (Symbol, String)> {
+        self.package_table
+            .iter()
+            .flat_map(|(_, rpkg)| {
+                rpkg.get_sources(&self.build_options)
+                    .unwrap()
+                    .iter()
+                    .map(|fname| {
+                        let contents = fs::read_to_string(Path::new(fname.as_str())).unwrap();
+                        let fhash = FileHash::new(&contents);
+                        (fhash, (*fname, contents))
+                    })
+                    .collect::<BTreeMap<_, _>>()
+            })
+            .collect()
+    }
+
+    pub fn contains_renaming(&self) -> Option<PackageName> {
+        // Make sure no renamings have been performed
+        for (pkg_name, pkg) in self.package_table.iter() {
+            if !pkg.renaming.is_empty() {
+                return Some(*pkg_name);
+            }
+        }
+        None
+    }
+}
+
+impl ResolvedPackage {
+    pub fn get_sources(&self, config: &BuildConfig) -> Result<Vec<FileName>> {
+        let places_to_look =
+            ResolvingPackage::get_source_paths_for_config(&self.package_path, config)?
+                .into_iter()
+                .map(|p| p.to_string_lossy().to_string())
+                .collect::<Vec<_>>();
+        Ok(find_move_filenames(&places_to_look, false)?
+            .into_iter()
+            .map(Symbol::from)
+            .collect())
+    }
+
+    pub fn get_bytecodes(&self) -> Result<Vec<FileName>> {
+        let path = ResolvingPackage::get_build_paths(&self.package_path)?;
+        let places_to_look = path
+            .into_iter()
+            .map(|p| p.to_string_lossy().to_string())
+            .collect::<Vec<_>>();
+        Ok(find_filenames(&places_to_look, |path| {
+            extension_equals(path, MOVE_COMPILED_EXTENSION)
+        })?
+        .into_iter()
+        .map(Symbol::from)
+        .collect())
+    }
+
+    /// Returns the transitive dependencies of this package in dependency order
+    #[allow(clippy::needless_collect)]
+    pub fn transitive_dependencies(&self, resolved_graph: &ResolvedGraph) -> BTreeSet<PackageName> {
+        let mut seen = BTreeSet::new();
+        let resolve_package = |package_name: PackageName| {
+            let mut package_deps = resolved_graph
+                .package_table
+                .get(&package_name)
+                .unwrap()
+                .transitive_dependencies(resolved_graph);
+            package_deps.insert(package_name);
+            package_deps
+        };
+
+        let immediate_deps = self.immediate_dependencies(resolved_graph);
+        let transitive_deps: Vec<_> = immediate_deps
+            .into_iter()
+            .flat_map(resolve_package)
+            .collect();
+
+        transitive_deps
+            .into_iter()
+            .filter(|ident| {
+                if !seen.contains(ident) {
+                    seen.insert(*ident);
+                    true
+                } else {
+                    false
+                }
+            })
+            .collect()
+    }
+
+    pub fn immediate_dependencies(&self, resolved_graph: &ResolvedGraph) -> BTreeSet<PackageName> {
+        if resolved_graph.build_options.dev_mode {
+            self.source_package
+                .dependencies
+                .keys()
+                .chain(self.source_package.dev_dependencies.keys())
+                .copied()
+                .collect()
+        } else {
+            self.source_package.dependencies.keys().copied().collect()
+        }
+    }
+}
+
+fn confirm_git_available() -> Result<()> {
+    match Command::new("git").arg("--version").output() {
+        Ok(_) => Ok(()),
+        Err(e) => {
+            if let std::io::ErrorKind::NotFound = e.kind() {
+                bail!(
+                    "git was not found, confirm you have git installed and it is on your PATH. \
+                    Alternatively, skip with --skip-fetch-latest-git-deps"
+                );
+            } else {
+                bail!(
+                    "Unexpected error occured when checking for presence of `git`: {:#}",
+                    e
+                );
+            }
+        },
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/source_package/layout.rs b/vendors/move/crates/tools/move-package/src/source_package/layout.rs
new file mode 100644
index 000000000..662cecd9b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/source_package/layout.rs
@@ -0,0 +1,73 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Result};
+use std::path::{Path, PathBuf};
+
+/// References file for documentation generation
+pub const REFERENCE_TEMPLATE_FILENAME: &str = "references.md";
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum SourcePackageLayout {
+    Sources,
+    Specifications,
+    Tests,
+    Scripts,
+    Examples,
+    Manifest,
+    DocTemplates,
+}
+
+impl SourcePackageLayout {
+    /// A Move source package is laid out on-disk as
+    /// a_move_package
+    /// ├── Move.toml      (required)
+    /// ├── sources        (required)
+    /// ├── examples       (optional, dev mode)
+    /// ├── scripts        (optional)
+    /// ├── specifications (optional)
+    /// ├── doc_templates      (optional)
+    /// └── tests          (optional, test mode)
+    pub fn path(&self) -> &Path {
+        Path::new(self.location_str())
+    }
+
+    pub fn try_find_root(starting_path: &Path) -> Result<PathBuf> {
+        let mut current_path = starting_path.to_path_buf();
+        loop {
+            if current_path.join(Self::Manifest.path()).is_file() {
+                break Ok(current_path);
+            }
+            if !current_path.pop() {
+                bail!(
+                    "Unable to find package manifest in '{}' or in its parents",
+                    starting_path.to_string_lossy()
+                )
+            }
+        }
+    }
+
+    pub fn location_str(&self) -> &'static str {
+        match self {
+            Self::Sources => "sources",
+            Self::Manifest => "Move.toml",
+            Self::Tests => "tests",
+            Self::Scripts => "scripts",
+            Self::Examples => "examples",
+            Self::Specifications => "specifications",
+            Self::DocTemplates => "doc_templates",
+        }
+    }
+
+    pub fn is_optional(&self) -> bool {
+        match self {
+            Self::Sources | Self::Manifest => false,
+            Self::Tests
+            | Self::Scripts
+            | Self::Examples
+            | Self::Specifications
+            | Self::DocTemplates => true,
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/src/source_package/manifest_parser.rs b/vendors/move/crates/tools/move-package/src/source_package/manifest_parser.rs
new file mode 100644
index 000000000..9a6bb2322
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/source_package/manifest_parser.rs
@@ -0,0 +1,573 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::layout::SourcePackageLayout;
+use crate::{package_hooks, source_package::parsed_manifest as PM, Architecture};
+use anyhow::{bail, format_err, Context, Result};
+use move_command_line_common::env::MOVE_HOME;
+use move_core_types::account_address::{AccountAddress, AccountAddressParseError};
+use move_symbol_pool::symbol::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    path::{Path, PathBuf},
+};
+use toml::Value as TV;
+
+const EMPTY_ADDR_STR: &str = "_";
+
+const PACKAGE_NAME: &str = "package";
+const BUILD_NAME: &str = "build";
+const ADDRESSES_NAME: &str = "addresses";
+const DEV_ADDRESSES_NAME: &str = "dev-addresses";
+const DEPENDENCY_NAME: &str = "dependencies";
+const DEV_DEPENDENCY_NAME: &str = "dev-dependencies";
+
+const KNOWN_NAMES: &[&str] = &[
+    PACKAGE_NAME,
+    BUILD_NAME,
+    ADDRESSES_NAME,
+    DEV_ADDRESSES_NAME,
+    DEPENDENCY_NAME,
+    DEV_DEPENDENCY_NAME,
+];
+
+const REQUIRED_FIELDS: &[&str] = &[PACKAGE_NAME];
+
+pub fn parse_move_manifest_from_file(path: &Path) -> Result<PM::SourceManifest> {
+    let file_contents = if path.is_file() {
+        std::fs::read_to_string(path)?
+    } else {
+        std::fs::read_to_string(path.join(SourcePackageLayout::Manifest.path()))?
+    };
+    parse_source_manifest(parse_move_manifest_string(file_contents)?)
+}
+
+pub fn parse_move_manifest_string(manifest_string: String) -> Result<TV> {
+    toml::from_str::<TV>(&manifest_string).context("Unable to parse Move package manifest")
+}
+
+pub fn parse_source_manifest(tval: TV) -> Result<PM::SourceManifest> {
+    match tval {
+        TV::Table(mut table) => {
+            check_for_required_field_names(&table, REQUIRED_FIELDS)
+                .context("Error parsing package manifest")?;
+            warn_if_unknown_field_names(&table, KNOWN_NAMES);
+            let addresses = table
+                .remove(ADDRESSES_NAME)
+                .map(parse_addresses)
+                .transpose()
+                .context("Error parsing '[addresses]' section of manifest")?;
+            let dev_address_assignments = table
+                .remove(DEV_ADDRESSES_NAME)
+                .map(parse_dev_addresses)
+                .transpose()
+                .context("Error parsing '[dev-addresses]' section of manifest")?;
+            let package = table
+                .remove(PACKAGE_NAME)
+                .map(parse_package_info)
+                .transpose()
+                .context("Error parsing '[package]' section of manifest")?
+                .unwrap();
+            let build = table
+                .remove(BUILD_NAME)
+                .map(parse_build_info)
+                .transpose()
+                .context("Error parsing '[build]' section of manifest")?;
+            let dependencies = table
+                .remove(DEPENDENCY_NAME)
+                .map(parse_dependencies)
+                .transpose()
+                .context("Error parsing '[dependencies]' section of manifest")?
+                .unwrap_or_default();
+            let dev_dependencies = table
+                .remove(DEV_DEPENDENCY_NAME)
+                .map(parse_dependencies)
+                .transpose()
+                .context("Error parsing '[dev-dependencies]' section of manifest")?
+                .unwrap_or_default();
+            Ok(PM::SourceManifest {
+                package,
+                addresses,
+                dev_address_assignments,
+                build,
+                dependencies,
+                dev_dependencies,
+            })
+        },
+        x => {
+            bail!(
+                "Malformed package manifest {}. Expected a table at top level, but encountered a {}",
+                x,
+                x.type_str()
+            )
+        },
+    }
+}
+
+pub fn parse_package_info(tval: TV) -> Result<PM::PackageInfo> {
+    match tval {
+        TV::Table(mut table) => {
+            check_for_required_field_names(&table, &["name", "version"])?;
+            let hook_names = package_hooks::custom_package_info_fields();
+            let known_names = ["name", "version", "authors", "license"]
+                .into_iter()
+                .chain(hook_names.iter().map(|s| s.as_str()))
+                .collect::<Vec<_>>();
+            warn_if_unknown_field_names(&table, known_names.as_slice());
+            let name = table
+                .remove("name")
+                .ok_or_else(|| format_err!("'name' is a required field but was not found",))?;
+            let version = table
+                .remove("version")
+                .ok_or_else(|| format_err!("'version' is a required field but was not found",))?;
+            let name = name
+                .as_str()
+                .ok_or_else(|| format_err!("Package name must be a string"))?;
+            let name = PM::PackageName::from(name);
+            let version = parse_version(version)?;
+            let license = table.remove("license").map(|x| Symbol::from(x.to_string()));
+            let authors = match table.remove("authors") {
+                None => Vec::new(),
+                Some(arr) => {
+                    let unparsed_vec = arr
+                        .as_array()
+                        .ok_or_else(|| format_err!("Invalid author(s) list"))?;
+                    unparsed_vec
+                        .iter()
+                        .map(|tval| {
+                            tval.as_str()
+                                .map(|x| Symbol::from(x.to_string()))
+                                .ok_or_else(|| {
+                                    format_err!(
+                                        "Invalid author '{}' of type {} found. Expected a string.",
+                                        tval.to_string(),
+                                        tval.type_str()
+                                    )
+                                })
+                        })
+                        .collect::<Result<_>>()?
+                },
+            };
+            // Turn the remaining entries into custom properties. For those which are not
+            // supported (also in the presence of hooks) we have warned above.
+            let mut custom_properties: BTreeMap<Symbol, String> = Default::default();
+            for (name, val) in table {
+                let val_str = val
+                    .as_str()
+                    .ok_or_else(|| format_err!("Field `{}` value must be a string", name))?;
+                custom_properties.insert(Symbol::from(name), val_str.to_owned());
+            }
+
+            Ok(PM::PackageInfo {
+                name,
+                version,
+                authors,
+                license,
+                custom_properties,
+            })
+        },
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_dependencies(tval: TV) -> Result<PM::Dependencies> {
+    match tval {
+        TV::Table(table) => {
+            let mut deps = BTreeMap::new();
+            for (dep_name, dep) in table.into_iter() {
+                let dep_name_ident = PM::PackageName::from(dep_name.clone());
+                let dep = parse_dependency(&dep_name, dep)?;
+                deps.insert(dep_name_ident, dep);
+            }
+            Ok(deps)
+        },
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_build_info(tval: TV) -> Result<PM::BuildInfo> {
+    match tval {
+        TV::Table(mut table) => {
+            warn_if_unknown_field_names(&table, &["language_version", "arch"]);
+            Ok(PM::BuildInfo {
+                language_version: table
+                    .remove("language_version")
+                    .map(parse_version)
+                    .transpose()?,
+                architecture: table.remove("arch").map(parse_architecture).transpose()?,
+            })
+        },
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_addresses(tval: TV) -> Result<PM::AddressDeclarations> {
+    match tval {
+        TV::Table(table) => {
+            let mut addresses = BTreeMap::new();
+            for (addr_name, entry) in table.into_iter() {
+                let ident = PM::NamedAddress::from(addr_name);
+                match entry.as_str() {
+                    Some(entry_str) => {
+                        if entry_str == EMPTY_ADDR_STR {
+                            if addresses.insert(ident, None).is_some() {
+                                bail!("Duplicate address name '{}' found.", ident);
+                            }
+                        } else if addresses
+                            .insert(
+                                ident,
+                                Some(parse_address_literal(entry_str).context(format!(
+                                    "Invalid address '{}' encountered.",
+                                    entry_str
+                                ))?),
+                            )
+                            .is_some()
+                        {
+                            bail!("Duplicate address name '{}' found.", ident);
+                        }
+                    },
+                    None => bail!(
+                        "Invalid address name {} encountered. Expected a string but found a {}",
+                        entry,
+                        entry.type_str()
+                    ),
+                }
+            }
+            Ok(addresses)
+        },
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+pub fn parse_dev_addresses(tval: TV) -> Result<PM::DevAddressDeclarations> {
+    match tval {
+        TV::Table(table) => {
+            let mut addresses = BTreeMap::new();
+            for (addr_name, entry) in table.into_iter() {
+                let ident = PM::NamedAddress::from(addr_name);
+                match entry.as_str() {
+                    Some(entry_str) => {
+                        if entry_str == EMPTY_ADDR_STR {
+                            bail!("Found uninstantiated named address '{}'. All addresses in the '{}' field must be instantiated.",
+                            ident, DEV_ADDRESSES_NAME);
+                        } else if addresses
+                            .insert(
+                                ident,
+                                parse_address_literal(entry_str).context(format!(
+                                    "Invalid address '{}' encountered.",
+                                    entry_str
+                                ))?,
+                            )
+                            .is_some()
+                        {
+                            bail!("Duplicate address name '{}' found.", ident);
+                        }
+                    },
+                    None => bail!(
+                        "Invalid address name {} encountered. Expected a string but found a {}",
+                        entry,
+                        entry.type_str()
+                    ),
+                }
+            }
+            Ok(addresses)
+        },
+        x => bail!(
+            "Malformed section in manifest {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+// Safely parses address for both the 0x and non prefixed hex format.
+fn parse_address_literal(address_str: &str) -> Result<AccountAddress, AccountAddressParseError> {
+    if !address_str.starts_with("0x") {
+        return AccountAddress::from_hex(address_str);
+    }
+    AccountAddress::from_hex_literal(address_str)
+}
+
+fn parse_dependency(dep_name: &str, tval: TV) -> Result<PM::Dependency> {
+    match tval {
+        TV::Table(mut table) => {
+            let mut known_fields = vec![
+                "addr_subst",
+                "version",
+                "local",
+                "digest",
+                "git",
+                "rev",
+                "subdir",
+                "address",
+            ];
+            let custom_key_opt = &package_hooks::custom_dependency_key();
+            if let Some(key) = custom_key_opt {
+                known_fields.push(key.as_ref())
+            }
+            warn_if_unknown_field_names(&table, known_fields.as_slice());
+            let subst = table
+                .remove("addr_subst")
+                .map(parse_substitution)
+                .transpose()?;
+            let version = table.remove("version").map(parse_version).transpose()?;
+            let digest = table.remove("digest").map(parse_digest).transpose()?;
+            let mut git_info = None;
+            let mut node_info = None;
+            match (
+                table.remove("local"),
+                table.remove("git"),
+                if let Some(key) = custom_key_opt {
+                    table.remove(key)
+                } else {
+                    None
+                },
+            ) {
+                (Some(local), None, None) => {
+                    let local_str = local
+                        .as_str()
+                        .ok_or_else(|| format_err!("Local source path not a string"))?;
+                    let local_path = PathBuf::from(local_str);
+                    Ok(PM::Dependency {
+                        subst,
+                        version,
+                        digest,
+                        local: local_path,
+                        git_info,
+                        node_info,
+                    })
+                },
+                (None, Some(git), None) => {
+                    let move_home = MOVE_HOME.clone();
+                    let rev_name = match table.remove("rev") {
+                        None => bail!("Git revision not supplied for dependency"),
+                        Some(r) => Symbol::from(
+                            r.as_str()
+                                .ok_or_else(|| format_err!("Git revision not a string"))?,
+                        ),
+                    };
+                    // Downloaded packages are of the form <sanitized_git_url>_<rev_name>
+                    let git_url = git
+                        .as_str()
+                        .ok_or_else(|| anyhow::anyhow!("Git URL not a string"))?;
+                    let local_path = PathBuf::from(move_home).join(format!(
+                        "{}_{}",
+                        url_to_file_name(git_url),
+                        rev_name.replace('/', "__")
+                    ));
+                    let subdir = PathBuf::from(match table.remove("subdir") {
+                        None => "".to_string(),
+                        Some(path) => path
+                            .as_str()
+                            .ok_or_else(|| format_err!("'subdir' not a string"))?
+                            .to_string(),
+                    });
+                    git_info = Some(PM::GitInfo {
+                        git_url: Symbol::from(git_url),
+                        git_rev: rev_name,
+                        subdir: subdir.clone(),
+                        download_to: local_path.clone(),
+                    });
+
+                    Ok(PM::Dependency {
+                        subst,
+                        version,
+                        digest,
+                        local: local_path.join(subdir),
+                        git_info,
+                        node_info,
+                    })
+                },
+                (None, None, Some(custom_key)) => {
+                    let package_name = Symbol::from(dep_name);
+                    let address = match table.remove("address") {
+                        None => bail!("Address not supplied for 'node' dependency"),
+                        Some(r) => Symbol::from(
+                            r.as_str()
+                                .ok_or_else(|| format_err!("Node address not a string"))?,
+                        ),
+                    };
+                    // Downloaded packages are of the form <sanitized_node_url>_<address>_<package>
+                    let node_url = custom_key
+                        .as_str()
+                        .ok_or_else(|| anyhow::anyhow!("Git URL not a string"))?;
+                    let local_path = PathBuf::from(MOVE_HOME.clone()).join(format!(
+                        "{}_{}_{}",
+                        url_to_file_name(node_url),
+                        address,
+                        package_name
+                    ));
+                    node_info = Some(PM::CustomDepInfo {
+                        node_url: Symbol::from(node_url),
+                        package_address: address,
+                        package_name,
+                        download_to: local_path.clone(),
+                    });
+                    Ok(PM::Dependency {
+                        subst,
+                        version,
+                        digest,
+                        local: local_path,
+                        git_info,
+                        node_info,
+                    })
+                },
+                _ => {
+                    let mut keys = vec!["local", "git"];
+                    if let Some(k) = custom_key_opt {
+                        keys.push(k.as_str())
+                    }
+                    let keys = keys
+                        .into_iter()
+                        .map(|s| format!("'{}'", s))
+                        .collect::<Vec<_>>();
+                    bail!(
+                        "must provide exactly one of {} for dependency.",
+                        keys.join(" or ")
+                    )
+                },
+            }
+        },
+        x => bail!("Malformed dependency {}", x),
+    }
+}
+
+fn url_to_file_name(url: &str) -> String {
+    regex::Regex::new(r"/|:|\.|@")
+        .unwrap()
+        .replace_all(url, "_")
+        .to_string()
+}
+
+fn parse_substitution(tval: TV) -> Result<PM::Substitution> {
+    match tval {
+        TV::Table(table) => {
+            let mut subst = BTreeMap::new();
+            for (addr_name, tval) in table.into_iter() {
+                let addr_ident = PM::NamedAddress::from(addr_name.as_str());
+                match tval {
+                    TV::String(addr_or_name) => {
+                        if let Ok(addr) = AccountAddress::from_hex_literal(&addr_or_name) {
+                            subst.insert(addr_ident, PM::SubstOrRename::Assign(addr));
+                        } else {
+                            let rename_from = PM::NamedAddress::from(addr_or_name.as_str());
+                            subst.insert(addr_ident, PM::SubstOrRename::RenameFrom(rename_from));
+                        }
+                    }
+                    x => bail!(
+                        "Malformed dependency substitution {}. Expected a string, but encountered a {}",
+                        x,
+                        x.type_str()
+                    ),
+                }
+            }
+            Ok(subst)
+        },
+        x => bail!(
+            "Malformed dependency substitution {}. Expected a table, but encountered a {}",
+            x,
+            x.type_str()
+        ),
+    }
+}
+
+fn parse_version(tval: TV) -> Result<PM::Version> {
+    let version_str = tval.as_str().unwrap();
+    let version_parts = version_str.split('.').collect::<Vec<_>>();
+    if version_parts.len() != 3 {
+        bail!(
+            "Version is malformed. Versions must be of the form <u64>.<u64>.<u64>, but found '{}'",
+            version_str
+        );
+    }
+
+    Ok((
+        version_parts[0]
+            .parse::<u64>()
+            .context("Invalid major version")?,
+        version_parts[1]
+            .parse::<u64>()
+            .context("Invalid minor version")?,
+        version_parts[2]
+            .parse::<u64>()
+            .context("Invalid bugfix version")?,
+    ))
+}
+
+fn parse_architecture(tval: TV) -> Result<Architecture> {
+    Architecture::try_parse_from_str(tval.as_str().unwrap())
+}
+
+fn parse_digest(tval: TV) -> Result<PM::PackageDigest> {
+    let digest_str = tval
+        .as_str()
+        .ok_or_else(|| format_err!("Invalid package digest"))?;
+    Ok(PM::PackageDigest::from(digest_str))
+}
+
+// check that only recognized names are provided at the top-level
+fn warn_if_unknown_field_names(table: &toml::map::Map<String, TV>, known_names: &[&str]) {
+    let mut unknown_names = BTreeSet::new();
+    for key in table.keys() {
+        if !known_names.contains(&key.as_str()) {
+            unknown_names.insert(key.to_string());
+        }
+    }
+
+    if !unknown_names.is_empty() {
+        eprintln!(
+            "Warning: unknown field name{} found. Expected one of [{}], but found {}",
+            if unknown_names.len() > 1 { "s" } else { "" },
+            known_names.join(", "),
+            unknown_names
+                .into_iter()
+                .map(|x| format!("'{}'", x))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+    }
+}
+
+fn check_for_required_field_names(
+    table: &toml::map::Map<String, TV>,
+    required_fields: &[&str],
+) -> Result<()> {
+    let mut missing_fields = BTreeSet::new();
+
+    for field_name in required_fields {
+        if !table.contains_key(*field_name) {
+            missing_fields.insert(field_name.to_string());
+        }
+    }
+
+    if !missing_fields.is_empty() {
+        bail!(
+            "Required field name{} {} not found",
+            if missing_fields.len() > 1 { "s" } else { "" },
+            missing_fields
+                .into_iter()
+                .map(|x| format!("'{}'", x))
+                .collect::<Vec<_>>()
+                .join(", "),
+        )
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/crates/tools/move-package/src/source_package/mod.rs b/vendors/move/crates/tools/move-package/src/source_package/mod.rs
new file mode 100644
index 000000000..a3829eaea
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/source_package/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod layout;
+pub mod manifest_parser;
+pub mod parsed_manifest;
diff --git a/vendors/move/crates/tools/move-package/src/source_package/parsed_manifest.rs b/vendors/move/crates/tools/move-package/src/source_package/parsed_manifest.rs
new file mode 100644
index 000000000..606fca700
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/src/source_package/parsed_manifest.rs
@@ -0,0 +1,86 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::Architecture;
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::symbol::Symbol;
+use std::{collections::BTreeMap, path::PathBuf};
+
+pub type NamedAddress = Symbol;
+pub type PackageName = Symbol;
+pub type FileName = Symbol;
+pub type PackageDigest = Symbol;
+
+pub type AddressDeclarations = BTreeMap<NamedAddress, Option<AccountAddress>>;
+pub type DevAddressDeclarations = BTreeMap<NamedAddress, AccountAddress>;
+pub type Version = (u64, u64, u64);
+pub type Dependencies = BTreeMap<PackageName, Dependency>;
+pub type Substitution = BTreeMap<NamedAddress, SubstOrRename>;
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct SourceManifest {
+    pub package: PackageInfo,
+    pub addresses: Option<AddressDeclarations>,
+    pub dev_address_assignments: Option<DevAddressDeclarations>,
+    pub build: Option<BuildInfo>,
+    pub dependencies: Dependencies,
+    pub dev_dependencies: Dependencies,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct PackageInfo {
+    pub name: PackageName,
+    pub version: Version,
+    pub authors: Vec<Symbol>,
+    pub license: Option<Symbol>,
+    pub custom_properties: BTreeMap<Symbol, String>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct Dependency {
+    pub local: PathBuf,
+    pub subst: Option<Substitution>,
+    pub version: Option<Version>,
+    pub digest: Option<PackageDigest>,
+    pub git_info: Option<GitInfo>,
+    pub node_info: Option<CustomDepInfo>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct GitInfo {
+    /// The git clone url to download from
+    pub git_url: Symbol,
+    /// The git revision, AKA, a commit SHA
+    pub git_rev: Symbol,
+    /// The path under this repo where the move package can be found -- e.g.,
+    /// 'language/move-stdlib`
+    pub subdir: PathBuf,
+    /// Where the git repo is downloaded to.
+    pub download_to: PathBuf,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct CustomDepInfo {
+    /// The url of the node to download from
+    pub node_url: Symbol,
+    /// The address where the package is published. The representation depends
+    /// on the registered node resolver.
+    pub package_address: Symbol,
+    /// The address where the package is published.
+    pub package_name: Symbol,
+    /// Where the package is downloaded to.
+    pub download_to: PathBuf,
+}
+
+#[derive(Default, Debug, Clone, Eq, PartialEq)]
+pub struct BuildInfo {
+    pub language_version: Option<Version>,
+    pub architecture: Option<Architecture>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum SubstOrRename {
+    RenameFrom(NamedAddress),
+    Assign(AccountAddress),
+}
diff --git a/vendors/move/crates/tools/move-package/tests/.gitattributes b/vendors/move/crates/tools/move-package/tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/tools/move-package/tests/package_hash_skips_non_move_files.rs b/vendors/move/crates/tools/move-package/tests/package_hash_skips_non_move_files.rs
new file mode 100644
index 000000000..ce0c282e2
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/package_hash_skips_non_move_files.rs
@@ -0,0 +1,45 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_package::BuildConfig;
+use std::{io::Write, path::Path};
+use tempfile::tempdir;
+
+#[test]
+fn package_hash_skips_non_move_files() {
+    let path = Path::new("tests/test_sources/resolution/dep_good_digest");
+
+    // resolution graph diagnostics are only needed for CLI commands so ignore them in both cases by
+    // passing a vector as the writer
+
+    let pkg1 = BuildConfig {
+        install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+        ..Default::default()
+    }
+    .resolution_graph_for_package(path, &mut Vec::new())
+    .unwrap();
+
+    let dummy_path = path.join("deps_only/other_dep/sources/dummy_text");
+    std::fs::File::create(&dummy_path)
+        .unwrap()
+        .write_all("hello".as_bytes())
+        .unwrap();
+
+    let pkg2 = BuildConfig {
+        install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+        ..Default::default()
+    }
+    .resolution_graph_for_package(path, &mut Vec::new())
+    .unwrap();
+
+    std::fs::remove_file(&dummy_path).unwrap();
+    for (pkg, res_pkg) in pkg1.package_table {
+        let other_res_pkg = pkg2.get_package(&pkg);
+        assert_eq!(
+            res_pkg.source_digest, other_res_pkg.source_digest,
+            "source digests differ for {}",
+            pkg
+        )
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_additional_addresses.rs b/vendors/move/crates/tools/move-package/tests/test_additional_addresses.rs
new file mode 100644
index 000000000..0c628f4cd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_additional_addresses.rs
@@ -0,0 +1,101 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::account_address::AccountAddress;
+use move_package::{
+    resolution::resolution_graph as RG, source_package::manifest_parser as MP, BuildConfig,
+};
+use std::{collections::BTreeMap, path::Path};
+use tempfile::tempdir;
+
+#[test]
+fn test_additonal_addresses() {
+    let path = Path::new(
+        "tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment",
+    );
+    let pm = MP::parse_move_manifest_from_file(path).unwrap();
+
+    let mut additional_named_addresses = BTreeMap::new();
+    additional_named_addresses.insert(
+        "A".to_string(),
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+    );
+
+    assert!(RG::ResolutionGraph::new(
+        pm.clone(),
+        path.parent().unwrap().to_path_buf(),
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses,
+            ..Default::default()
+        },
+        &mut Vec::new() /* empty writer as no diags needed */
+    )
+    .unwrap()
+    .resolve()
+    .is_ok());
+
+    assert!(RG::ResolutionGraph::new(
+        pm,
+        path.parent().unwrap().to_path_buf(),
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            ..Default::default()
+        },
+        &mut Vec::new() /* empty writer as no diags needed */
+    )
+    .unwrap()
+    .resolve()
+    .is_err());
+}
+
+#[test]
+fn test_additonal_addresses_already_assigned_same_value() {
+    let path = Path::new("tests/test_sources/resolution/basic_no_deps_address_assigned");
+    let pm = MP::parse_move_manifest_from_file(path).unwrap();
+
+    let mut additional_named_addresses = BTreeMap::new();
+    additional_named_addresses.insert(
+        "A".to_string(),
+        AccountAddress::from_hex_literal("0x0").unwrap(),
+    );
+
+    assert!(RG::ResolutionGraph::new(
+        pm,
+        path.parent().unwrap().to_path_buf(),
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses,
+            ..Default::default()
+        },
+        &mut Vec::new() /* empty writer as no diags needed */
+    )
+    .unwrap()
+    .resolve()
+    .is_ok());
+}
+
+#[test]
+fn test_additonal_addresses_already_assigned_different_value() {
+    let path = Path::new("tests/test_sources/resolution/basic_no_deps_address_assigned");
+    let pm = MP::parse_move_manifest_from_file(path).unwrap();
+
+    let mut additional_named_addresses = BTreeMap::new();
+    additional_named_addresses.insert(
+        "A".to_string(),
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+    );
+
+    assert!(RG::ResolutionGraph::new(
+        pm,
+        path.parent().unwrap().to_path_buf(),
+        BuildConfig {
+            install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+            additional_named_addresses,
+            ..Default::default()
+        },
+        &mut Vec::new() /* empty writer as no diags needed */
+    )
+    .is_err());
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_removal_second_compilation.rs b/vendors/move/crates/tools/move-package/tests/test_removal_second_compilation.rs
new file mode 100644
index 000000000..1868f56a9
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_removal_second_compilation.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_package::{compilation::package_layout::CompiledPackageLayout, BuildConfig};
+use std::path::Path;
+use tempfile::tempdir;
+
+#[test]
+fn test_that_second_build_artifacts_removed() {
+    let path = Path::new("tests/test_sources/compilation/basic_no_deps_test_mode");
+    let dir = tempdir().unwrap().path().to_path_buf();
+
+    BuildConfig {
+        dev_mode: true,
+        test_mode: true,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    let expected_stdlib_path = dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join(CompiledPackageLayout::Dependencies.path())
+        .join("MoveStdlib");
+    assert!(expected_stdlib_path.is_dir());
+
+    assert!(dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+
+    // Now make sure the MoveStdlib still exists, but that the test-only code is removed
+    BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    // The MoveStdlib dep should still exist, but the MTest module should go away
+    assert!(expected_stdlib_path.is_dir());
+    assert!(!dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+
+    BuildConfig {
+        dev_mode: false,
+        test_mode: false,
+        install_dir: Some(dir.clone()),
+        ..Default::default()
+    }
+    .compile_package(path, &mut Vec::new())
+    .unwrap();
+
+    // The MoveStdlib dep should no longer exist, and the MTest module shouldn't exist either
+    assert!(!expected_stdlib_path.is_dir());
+    assert!(!dir
+        .join(CompiledPackageLayout::Root.path())
+        .join("test")
+        .join(CompiledPackageLayout::CompiledModules.path())
+        .join("MTest.mv")
+        .exists());
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_runner.rs b/vendors/move/crates/tools/move-package/tests/test_runner.rs
new file mode 100644
index 000000000..783c963d7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_runner.rs
@@ -0,0 +1,160 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::bail;
+use move_command_line_common::testing::{
+    add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT,
+};
+use move_package::{
+    compilation::{build_plan::BuildPlan, model_builder::ModelBuilder},
+    package_hooks,
+    package_hooks::PackageHooks,
+    resolution::resolution_graph as RG,
+    source_package::{
+        manifest_parser as MP,
+        parsed_manifest::{CustomDepInfo, PackageDigest},
+    },
+    BuildConfig, ModelConfig,
+};
+use move_symbol_pool::Symbol;
+use std::{
+    ffi::OsStr,
+    fs,
+    path::{Component, Path, PathBuf},
+};
+use tempfile::tempdir;
+
+const COMPILE_EXT: &str = "compile";
+const MODEL_EXT: &str = "model";
+
+pub fn run_test(path: &Path) -> datatest_stable::Result<()> {
+    package_hooks::register_package_hooks(Box::new(TestHooks()));
+    let update_baseline = read_env_update_baseline();
+    if path
+        .components()
+        .any(|component| component == Component::Normal(OsStr::new("deps_only")))
+    {
+        return Ok(());
+    }
+    let exp_path = path.with_extension(EXP_EXT);
+    let should_compile = path.with_extension(COMPILE_EXT).is_file();
+    let should_model = path.with_extension(MODEL_EXT).is_file();
+
+    let exp_exists = exp_path.is_file();
+
+    let contents = fs::read_to_string(path)?;
+    let output = match MP::parse_move_manifest_string(contents)
+        .and_then(MP::parse_source_manifest)
+        .and_then(|parsed_manifest| {
+            RG::ResolutionGraph::new(
+                parsed_manifest,
+                path.parent().unwrap().to_path_buf(),
+                BuildConfig {
+                    dev_mode: true,
+                    test_mode: false,
+                    generate_docs: false,
+                    generate_abis: false,
+                    install_dir: Some(tempdir().unwrap().path().to_path_buf()),
+                    force_recompilation: false,
+                    ..Default::default()
+                },
+                &mut Vec::new(), /* empty writer as no diags needed */
+            )
+        })
+        .and_then(|rg| rg.resolve())
+    {
+        Ok(mut resolved_package) => match (should_compile, should_model) {
+            (true, true) => {
+                return Err(anyhow::format_err!(
+                    "Cannot have compile and model flags set for same package"
+                )
+                .into())
+            },
+            (true, _) => match BuildPlan::create(resolved_package)
+                .and_then(|bp| bp.compile(None, &mut Vec::new()))
+            {
+                Ok(mut pkg) => {
+                    pkg.compiled_package_info.source_digest =
+                        Some(PackageDigest::from("ELIDED_FOR_TEST"));
+                    pkg.compiled_package_info.build_flags.install_dir =
+                        Some(PathBuf::from("ELIDED_FOR_TEST"));
+                    format!("{:#?}\n", pkg.compiled_package_info)
+                },
+                Err(error) => format!("{:#}\n", error),
+            },
+            (_, true) => match ModelBuilder::create(resolved_package, ModelConfig {
+                all_files_as_targets: false,
+                target_filter: None,
+            })
+            .build_model()
+            {
+                Ok(_) => "Built model".to_string(),
+                Err(error) => format!("{:#}\n", error),
+            },
+            (_, _) => {
+                for (_, package) in resolved_package.package_table.iter_mut() {
+                    package.package_path = PathBuf::from("ELIDED_FOR_TEST");
+                    package.source_digest = PackageDigest::from("ELIDED_FOR_TEST");
+                }
+                resolved_package.build_options.install_dir = Some(PathBuf::from("ELIDED_FOR_TEST"));
+                format!("{:#?}\n", resolved_package)
+            },
+        },
+        Err(error) => format!("{:#}\n", error),
+    };
+
+    if update_baseline {
+        fs::write(&exp_path, &output)?;
+        return Ok(());
+    }
+
+    if exp_exists {
+        let expected = fs::read_to_string(&exp_path)?;
+        if expected != output {
+            let msg = format!(
+                "Expected outputs differ for {:?}:\n{}",
+                exp_path,
+                format_diff(expected, output)
+            );
+            return Err(anyhow::format_err!(add_update_baseline_fix(msg)).into());
+        }
+    } else {
+        return Err(anyhow::format_err!(
+            "No expected output found for {:?}.\
+                    You probably want to rerun with `env UPDATE_BASELINE=1`",
+            path
+        )
+        .into());
+    }
+    Ok(())
+}
+
+/// Some dummy hooks for testing the hook mechanism
+struct TestHooks();
+
+impl PackageHooks for TestHooks {
+    fn custom_package_info_fields(&self) -> Vec<String> {
+        vec!["test_hooks_field".to_owned()]
+    }
+
+    fn custom_dependency_key(&self) -> Option<String> {
+        Some("custom".to_owned())
+    }
+
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()> {
+        bail!(
+            "TestHooks resolve dep {} = {} {} {}",
+            dep_name,
+            info.node_url,
+            info.package_name,
+            info.package_address
+        )
+    }
+}
+
+datatest_stable::harness!(run_test, "tests/test_sources", r".*\.toml$");
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
new file mode 100644
index 000000000..cb5253d17
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
@@ -0,0 +1,22 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {},
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.toml
new file mode 100644
index 000000000..b5b93588f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "test"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/sources/A.move
new file mode 100644
index 000000000..925cbe1fe
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps/sources/A.move
@@ -0,0 +1,3 @@
+module 0x1::M {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
new file mode 100644
index 000000000..6ee4f9b85
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.toml
new file mode 100644
index 000000000..f36925b4d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/sources/M.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/sources/M.move
new file mode 100644
index 000000000..a291ea997
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/sources/M.move
@@ -0,0 +1,3 @@
+module A::M {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
new file mode 100644
index 000000000..7a2e6343a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
new file mode 100644
index 000000000..982d4b55a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
new file mode 100644
index 000000000..a291ea997
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
@@ -0,0 +1,3 @@
+module A::M {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
new file mode 100644
index 000000000..0f8b1e0a0
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "std": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml
new file mode 100644
index 000000000..eed632d19
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../../move-stdlib", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/A.move
new file mode 100644
index 000000000..925cbe1fe
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/A.move
@@ -0,0 +1,3 @@
+module 0x1::M {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/ATest.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/ATest.move
new file mode 100644
index 000000000..63f212d0e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/ATest.move
@@ -0,0 +1,4 @@
+#[test_only]
+module 0x1::MTest {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp
new file mode 100644
index 000000000..029b5e26a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp
@@ -0,0 +1,10 @@
+Module and/or script names found that would cause failures on case insensitive file systems when compiling package 'case_insensitive_check':
+The following modules and/or scripts would collide as 'a' on the file system:
+	Module 'A' at path 'tests/test_sources/compilation/case_insensitive_check/sources/a.move'
+	Script 'a' at path 'tests/test_sources/compilation/case_insensitive_check/sources/a_script.move'
+The following modules and/or scripts would collide as 'set' on the file system:
+	Module 'Set' at path 'tests/test_sources/compilation/case_insensitive_check/sources/Set.move'
+	Module 'set' at path 'tests/test_sources/compilation/case_insensitive_check/sources/foo.move'
+	Module 'seT' at path 'tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move'
+	Script 'sEt' at path 'tests/test_sources/compilation/case_insensitive_check/sources/script.move'
+Please rename these scripts and/or modules to resolve these conflicts.
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.toml
new file mode 100644
index 000000000..ca480b301
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "case_insensitive_check"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/Set.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/Set.move
new file mode 100644
index 000000000..be1b43445
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/Set.move
@@ -0,0 +1,3 @@
+module 0x1::Set {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a.move
new file mode 100644
index 000000000..da5a1b5ec
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a.move
@@ -0,0 +1 @@
+module 0x1::A { }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a_script.move
new file mode 100644
index 000000000..be3ada6da
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/foo.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/foo.move
new file mode 100644
index 000000000..e8c3657af
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/foo.move
@@ -0,0 +1,3 @@
+module 0x1::set {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move
new file mode 100644
index 000000000..1e6c517d0
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move
@@ -0,0 +1,2 @@
+module 0x2::seT {
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/script.move
new file mode 100644
index 000000000..d6103c7b5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/script.move
@@ -0,0 +1,3 @@
+script {
+    fun sEt() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
new file mode 100644
index 000000000..fe3846c31
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
@@ -0,0 +1,25 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+        "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml
new file mode 100644
index 000000000..57c10cbb2
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml
@@ -0,0 +1,24 @@
+# Tests that resolved addresses can backflow in the resolution graph and that we compile this correctly
+#                    +---- 0x1  -----+
+#                    |               |
+#                    v               |
+#                 +----+            0x1
+#           +---->| A  |----+        |
+#           |     +----+    |        |
+#           ?               ?        |
+# +----+    |               |     +----+
+# |Root|----+               +---->| C  |
+# +----+    |               |     +----+
+#          0x1             0x1
+#           |     +----+    |
+#           +---->| B  +----+
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should be resolved to 0x1 by backflow from the BA instantiation
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
new file mode 100644
index 000000000..b17d57dbb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
@@ -0,0 +1,3 @@
+module AA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
new file mode 100644
index 000000000..411a75ce7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
@@ -0,0 +1,3 @@
+module 0x1::AAA {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
new file mode 100644
index 000000000..82c778259
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
@@ -0,0 +1,3 @@
+module BA::B {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/sources/C.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
new file mode 100644
index 000000000..77ce3af35
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
@@ -0,0 +1,3 @@
+module A::C {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/sources/Root.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/sources/Root.move
new file mode 100644
index 000000000..b3d738219
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/sources/Root.move
@@ -0,0 +1,11 @@
+module AA::Root {
+    use AA::A;
+    use BA::B;
+    use BA::C;
+
+    public fun foo() {
+        A::foo();
+        B::foo();
+        C::foo();
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
new file mode 100644
index 000000000..fe3846c31
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
@@ -0,0 +1,25 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+        "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.toml
new file mode 100644
index 000000000..1b9714b18
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/sources/A.move
new file mode 100644
index 000000000..b17d57dbb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/sources/A.move
@@ -0,0 +1,3 @@
+module AA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/AA.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/AA.move
new file mode 100644
index 000000000..411a75ce7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/AA.move
@@ -0,0 +1,3 @@
+module 0x1::AAA {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/B.move
new file mode 100644
index 000000000..82c778259
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/B.move
@@ -0,0 +1,3 @@
+module BA::B {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/sources/C.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/sources/C.move
new file mode 100644
index 000000000..77ce3af35
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/sources/C.move
@@ -0,0 +1,3 @@
+module A::C {
+    public fun foo() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/sources/Root.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/sources/Root.move
new file mode 100644
index 000000000..b3d738219
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/sources/Root.move
@@ -0,0 +1,11 @@
+module AA::Root {
+    use AA::A;
+    use BA::B;
+    use BA::C;
+
+    public fun foo() {
+        A::foo();
+        B::foo();
+        C::foo();
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
new file mode 100644
index 000000000..da8ed9338
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
@@ -0,0 +1,26 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000003,
+        "CA": 0000000000000000000000000000000000000000000000000000000000000001,
+        "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.toml
new file mode 100644
index 000000000..a13ae9d9e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/sources/Root.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/sources/Root.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/sources/Root.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
new file mode 100644
index 000000000..bb13331e5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
@@ -0,0 +1,26 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+        "C": 0000000000000000000000000000000000000000000000000000000000000003,
+        "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.toml
new file mode 100644
index 000000000..423f3f880
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.toml
@@ -0,0 +1,12 @@
+# Test that address stays in scope if you don't rename it away
+
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/Move.toml
new file mode 100644
index 000000000..d8942384f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+C = "0x3"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/sources/A.move
new file mode 100644
index 000000000..d66d01a88
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module C::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/sources/Root.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/sources/Root.move
new file mode 100644
index 000000000..aaa8560f6
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/sources/Root.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use C::A as CA;
+
+    public fun foo() {
+        DAA::foo();
+        CA::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
new file mode 100644
index 000000000..04d6d3c40
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.toml
new file mode 100644
index 000000000..a3d12e5cd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/Move.toml
@@ -0,0 +1,10 @@
+# Tests that renamed addresses are resolved at only one level
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/sources/OneDep.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/sources/OneDep.move
new file mode 100644
index 000000000..41fd77fec
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep/sources/OneDep.move
@@ -0,0 +1,6 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
new file mode 100644
index 000000000..5da411f35
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000002,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml
new file mode 100644
index 000000000..0b4c3a809
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml
@@ -0,0 +1,9 @@
+# Tests that renamed addresses are picked up and can be used at one level deep
+# of dependencies.
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..1cf4e4c22
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/sources/OneDep.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/sources/OneDep.move
new file mode 100644
index 000000000..41fd77fec
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/sources/OneDep.move
@@ -0,0 +1,6 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
new file mode 100644
index 000000000..04d6d3c40
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/sources/T.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/sources/T.move
new file mode 100644
index 000000000..876b71679
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/sources/T.move
@@ -0,0 +1,3 @@
+module B::T {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/sources/M.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/sources/M.move
new file mode 100644
index 000000000..5658f751c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_renamed/sources/M.move
@@ -0,0 +1,6 @@
+module A::M {
+    use A::T;
+    public fun foo() {
+        T::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
new file mode 100644
index 000000000..04d6d3c40
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml
new file mode 100644
index 000000000..a3d12e5cd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml
@@ -0,0 +1,10 @@
+# Tests that renamed addresses are resolved at only one level
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
new file mode 100644
index 000000000..9ed665bc5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
@@ -0,0 +1,3 @@
+script {
+    fun b_script() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/B.move
new file mode 100644
index 000000000..e49d69453
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/B.move
@@ -0,0 +1,3 @@
+module B::B {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
new file mode 100644
index 000000000..08dde04e7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/doc_templates/script_template.md b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/doc_templates/script_template.md
new file mode 100644
index 000000000..a7cd0e705
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/doc_templates/script_template.md
@@ -0,0 +1,12 @@
+# Overview of Scripts
+
+> {{move-toc}}
+
+
+This is some documentation
+
+> {{move-include OneDep}}
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/examples/Example.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/examples/Example.move
new file mode 100644
index 000000000..b8d5093c3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/examples/Example.move
@@ -0,0 +1,3 @@
+module A::Example {
+    public fun example_fun() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/OneDep.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/OneDep.move
new file mode 100644
index 000000000..38f7ffe2d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/OneDep.move
@@ -0,0 +1,7 @@
+module A::OneDep {
+    use A::B;
+    public fun do_b() {
+        B::foo()
+    }
+    public entry fun aa() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/a_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/a_script.move
new file mode 100644
index 000000000..08dde04e7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() {}
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/b_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/b_script.move
new file mode 100644
index 000000000..9ed665bc5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/b_script.move
@@ -0,0 +1,3 @@
+script {
+    fun b_script() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.compile b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.compile
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
new file mode 100644
index 000000000..6ee4f9b85
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
@@ -0,0 +1,24 @@
+CompiledPackageInfo {
+    package_name: "test",
+    address_alias_instantiation: {
+        "A": 0000000000000000000000000000000000000000000000000000000000000000,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.toml
new file mode 100644
index 000000000..f36925b4d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/A.move
new file mode 100644
index 000000000..47880c2e1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/A.move
@@ -0,0 +1,6 @@
+module A::A {
+    use A::M;
+    public fun foo() {
+        M::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/M.move b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/M.move
new file mode 100644
index 000000000..5d8366740
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/M.move
@@ -0,0 +1 @@
+../../basic_no_deps_address_assigned/sources/M.move
\ No newline at end of file
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/vendors/move/crates/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
new file mode 100644
index 000000000..a03f88d78
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
@@ -0,0 +1,305 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/dep_dev_dep_diamond",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "A": Dependency {
+                kind: Local(
+                    "./deps_only/A",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+            "C": Dependency {
+                kind: Local(
+                    "./deps_only/C",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+        dev_dependencies: {
+            "B": Dependency {
+                kind: Local(
+                    "./deps_only/B",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+    },
+    graph: {
+        "Root": [
+            (
+                "A",
+                Outgoing,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+        ],
+        "A": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+            (
+                "D",
+                Outgoing,
+            ),
+        ],
+        "B": [
+            (
+                "A",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+        "C": [
+            (
+                "B",
+                Incoming,
+            ),
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+        "D": [
+            (
+                "A",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "A": ResolutionPackage {
+            resolution_graph_index: "A",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "B": Dependency {
+                        kind: Local(
+                            "../B",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {
+                    "D": Dependency {
+                        kind: Local(
+                            "../D",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": ResolutionPackage {
+            resolution_graph_index: "B",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {
+                    "C": Dependency {
+                        kind: Local(
+                            "../C",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": ResolutionPackage {
+            resolution_graph_index: "C",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": ResolutionPackage {
+            resolution_graph_index: "D",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Dependency {
+                        kind: Local(
+                            "./deps_only/A",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                    "C": Dependency {
+                        kind: Local(
+                            "./deps_only/C",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {
+                    "B": Dependency {
+                        kind: Local(
+                            "./deps_only/B",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp
new file mode 100644
index 000000000..b076a40c3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp
@@ -0,0 +1 @@
+Built model
\ No newline at end of file
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.model b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.model
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml
new file mode 100644
index 000000000..b5b93588f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "test"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move
new file mode 100644
index 000000000..925cbe1fe
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move
@@ -0,0 +1,3 @@
+module 0x1::M {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/a_script.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/a_script.move
new file mode 100644
index 000000000..8cc7a6c24
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/basic_no_deps/sources/a_script.move
@@ -0,0 +1,3 @@
+script {
+    fun a_script() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp
new file mode 100644
index 000000000..b076a40c3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp
@@ -0,0 +1 @@
+Built model
\ No newline at end of file
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.model b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.model
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.toml
new file mode 100644
index 000000000..23c00176a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..ab8189aad
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+CA = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/sources/A.move
new file mode 100644
index 000000000..49f9680bb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module CA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..a36956a76
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+DA = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/sources/A.move
new file mode 100644
index 000000000..bbe597ce8
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module DA::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/sources/A.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/sources/A.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.exp
new file mode 100644
index 000000000..c0a70e4cc
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.exp
@@ -0,0 +1 @@
+Found address renaming in package 'test' when building Move model -- this is currently not supported
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.model b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.model
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml
new file mode 100644
index 000000000..a13ae9d9e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x3"
+
+[dependencies]
+C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move
new file mode 100644
index 000000000..9d42ff170
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move
@@ -0,0 +1,3 @@
+module A::A {
+    public fun foo() { }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move
new file mode 100644
index 000000000..93f1c1cdd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move
@@ -0,0 +1,9 @@
+module A::A {
+    use DA::A as DAA;
+    use CA::A as CAA;
+
+    public fun foo() {
+        DAA::foo();
+        CAA::foo()
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/vendors/move/crates/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
new file mode 100644
index 000000000..f3650404d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
@@ -0,0 +1,205 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/nested_deps_git_local",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "NestedDeps",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "std": Some(
+                    00000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "MoveNursery": Dependency {
+                kind: Git(
+                    GitInfo {
+                        git_url: "https://github.com/move-language/move",
+                        git_rev: "781c844",
+                        subdir: "language/move-stdlib/nursery",
+                    },
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "NestedDeps": [
+            (
+                "MoveNursery",
+                Outgoing,
+            ),
+        ],
+        "MoveNursery": [
+            (
+                "NestedDeps",
+                Incoming,
+            ),
+            (
+                "MoveStdlib",
+                Outgoing,
+            ),
+        ],
+        "MoveStdlib": [
+            (
+                "MoveNursery",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "MoveNursery": ResolutionPackage {
+            resolution_graph_index: "MoveNursery",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveNursery",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: Some(
+                    {
+                        "std": 00000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {
+                    "MoveStdlib": Dependency {
+                        kind: Local(
+                            "..",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "MoveStdlib": ResolutionPackage {
+            resolution_graph_index: "MoveStdlib",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveStdlib",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": None,
+                    },
+                ),
+                dev_address_assignments: Some(
+                    {
+                        "std": 00000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "NestedDeps": ResolutionPackage {
+            resolution_graph_index: "NestedDeps",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "NestedDeps",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": Some(
+                            00000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "MoveNursery": Dependency {
+                        kind: Git(
+                            GitInfo {
+                                git_url: "https://github.com/move-language/move",
+                                git_rev: "781c844",
+                                subdir: "language/move-stdlib/nursery",
+                            },
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.exp
new file mode 100644
index 000000000..946069e40
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.exp
@@ -0,0 +1 @@
+Unable to parse Move package manifest: duplicate key: `a` for key `addresses` at line 5 column 1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.toml
new file mode 100644
index 000000000..c70531e81
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a = "0x1"
+a = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.exp
new file mode 100644
index 000000000..c74ce542f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.exp
@@ -0,0 +1 @@
+Unable to parse Move package manifest: redefinition of table `package` for key `package` at line 5 column 1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.toml
new file mode 100644
index 000000000..962d02326
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.toml
@@ -0,0 +1,5 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[package]
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp
new file mode 100644
index 000000000..c60acf56d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/full_manifest/../a"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.toml
new file mode 100644
index 000000000..eedeae5bd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest/Move.toml
@@ -0,0 +1,28 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", d = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp
new file mode 100644
index 000000000..6f6b481e8
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/full_manifest_with_extra_field/../a"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.toml
new file mode 100644
index 000000000..9ad97675b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.toml
@@ -0,0 +1,29 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+extra_field = true
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "d" = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.exp
new file mode 100644
index 000000000..8be887f25
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.exp
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Malformed dependency substitution 1. Expected a string, but encountered a integer
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.toml
new file mode 100644
index 000000000..25d271196
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "A" = 1 } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.exp
new file mode 100644
index 000000000..afbeab3fb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid author '1' of type integer found. Expected a string.
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.toml
new file mode 100644
index 000000000..f9753bd38
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_author/Move.toml
@@ -0,0 +1,4 @@
+[package]
+name = "name"
+version = "0.1.2"
+authors = [1]
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.exp
new file mode 100644
index 000000000..112af012e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid author(s) list
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.toml
new file mode 100644
index 000000000..17c0f62fb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.toml
@@ -0,0 +1,4 @@
+[package]
+name = "name"
+version = "0.1.2"
+authors = "nope"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp
new file mode 100644
index 000000000..472e2ca85
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/invalid_hex_address_in_subst/a"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.toml
new file mode 100644
index 000000000..042edca57
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "A" = "0xG" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
new file mode 100644
index 000000000..21da7cb04
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
@@ -0,0 +1,66 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/parsing/invalid_identifier_package_name",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "®´∑œ",
+            version: (
+                0,
+                1,
+                2,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {},
+        dev_dependencies: {},
+    },
+    graph: {
+        "®´∑œ": [],
+    },
+    package_table: {
+        "®´∑œ": ResolutionPackage {
+            resolution_graph_index: "®´∑œ",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "®´∑œ",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.toml
new file mode 100644
index 000000000..e344c6440
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "®´∑œ"
+version = "0.1.2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
new file mode 100644
index 000000000..902cee960
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
@@ -0,0 +1,66 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/parsing/minimal_manifest",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "name",
+            version: (
+                0,
+                1,
+                2,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {},
+        dev_dependencies: {},
+    },
+    graph: {
+        "name": [],
+    },
+    package_table: {
+        "name": ResolutionPackage {
+            resolution_graph_index: "name",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "name",
+                    version: (
+                        0,
+                        1,
+                        2,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.toml
new file mode 100644
index 000000000..d3e2cae1b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "0.1.2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.exp
new file mode 100644
index 000000000..3cbdcf2fe
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Required field name 'version' not found
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.toml
new file mode 100644
index 000000000..24bc6aaf5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.toml
@@ -0,0 +1,2 @@
+[package]
+name = "name"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.exp
new file mode 100644
index 000000000..69b3f28ad
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Required field name 'name' not found
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.toml
new file mode 100644
index 000000000..928558548
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.toml
@@ -0,0 +1,2 @@
+[package]
+version = "0.1.1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.exp
new file mode 100644
index 000000000..eebb49f8b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.exp
@@ -0,0 +1 @@
+Error parsing package manifest: Required field name 'package' not found
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.toml
new file mode 100644
index 000000000..cd253c74c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.toml
@@ -0,0 +1,27 @@
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", d = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", C = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp
new file mode 100644
index 000000000..8c3567f85
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: must provide exactly one of 'local' or 'git' or 'custom' for dependency.
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.toml
new file mode 100644
index 000000000..dbd552736
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp
new file mode 100644
index 000000000..fd881cca3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/non_identifier_address_name_in_subst/a"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.toml
new file mode 100644
index 000000000..8b78acf0a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { "©" = "A"  } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.exp
new file mode 100644
index 000000000..d84d0e1a6
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.exp
@@ -0,0 +1,2 @@
+Error parsing '[addresses]' section of manifest: Invalid address name b = "0x1"
+ encountered. Expected a string but found a table
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.toml
new file mode 100644
index 000000000..6f04f6bac
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a.b = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.exp
new file mode 100644
index 000000000..9ee507408
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.exp
@@ -0,0 +1 @@
+Error parsing '[addresses]' section of manifest: Invalid address name 1 encountered. Expected a string but found a integer
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.toml
new file mode 100644
index 000000000..c40353fb9
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[addresses]
+a = 0x1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.exp
new file mode 100644
index 000000000..8c0e1821e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.exp
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Local source path not a string
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.toml
new file mode 100644
index 000000000..cbe6cc5dd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = 1 }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.exp
new file mode 100644
index 000000000..adaeaaa26
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Package name must be a string
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.toml
new file mode 100644
index 000000000..30f9e1b3b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = 1
+version = "0.1.2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.exp
new file mode 100644
index 000000000..b6a6cc50d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.exp
@@ -0,0 +1,3 @@
+Error parsing '[dependencies]' section of manifest: Malformed dependency substitution B = "0x1"
+R = "0x2"
+. Expected a string, but encountered a table
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.toml
new file mode 100644
index 000000000..84a3cd97c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dependencies]
+A = { local = "a", addr_subst = { A = { B = "0x1", R = "0x2" } } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.exp
new file mode 100644
index 000000000..02abbcc82
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.exp
@@ -0,0 +1 @@
+Error parsing '[dev-addresses]' section of manifest: Found uninstantiated named address 'b'. All addresses in the 'dev-addresses' field must be instantiated.
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.toml
new file mode 100644
index 000000000..4652b00b1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "name"
+version = "0.1.2"
+
+[dev-addresses]
+a = "0x1"
+b = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp
new file mode 100644
index 000000000..973224a2b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/unknown_toplevel_field/../a"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.toml
new file mode 100644
index 000000000..e53941506
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.toml
@@ -0,0 +1,30 @@
+[package]
+name = "name"
+version = "0.1.2"
+license = "license"
+authors = ["some author"]
+
+[unknown_field]
+
+[addresses]
+std = "_"
+CoreAddr = "0x1"
+C = "0x1"
+OtherD = "_"
+
+[dev-addresses]
+DevStd = "0x2"
+DevCoreAddr = "0x1"
+
+[build]
+language_version = "0.0.0"
+
+[dependencies]
+A = { local = "../a" }
+B = { local = "../b", addr_subst = { "a" = "0xDEADBEEF" }, version = "0.0.1" }
+C = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "d" = "0x4" }, version = "0.0.2" }
+D = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B" }, version = "0.0.2" }
+E = { local = "../some_path", addr_subst = { "a" = "0xCAFE", "C" = "B", "OtherD" = "d" }, version = "0.0.2" }
+
+[dev-dependencies]
+F = { local = "../some_path", addr_subst = { "a" = "0xCAFE" }, version = "0.0.2" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.exp
new file mode 100644
index 000000000..6a7795f55
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.exp
@@ -0,0 +1 @@
+Unable to parse Move package manifest: expected newline, found a period at line 3 column 14
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.toml
new file mode 100644
index 000000000..79437fee0
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = 0.1.2
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.exp
new file mode 100644
index 000000000..5f188067a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Version is malformed. Versions must be of the form <u64>.<u64>.<u64>, but found '00.2'
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.toml
new file mode 100644
index 000000000..a335f687b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "00.2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.exp
new file mode 100644
index 000000000..c244801b5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.exp
@@ -0,0 +1 @@
+Error parsing '[package]' section of manifest: Invalid major version: invalid digit found in string
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.toml
new file mode 100644
index 000000000..8419ede99
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "name"
+version = "a.1.2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
new file mode 100644
index 000000000..79e181224
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
@@ -0,0 +1,66 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/basic_no_deps",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "test",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {},
+        dev_dependencies: {},
+    },
+    graph: {
+        "test": [],
+    },
+    package_table: {
+        "test": ResolutionPackage {
+            resolution_graph_index: "test",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml
new file mode 100644
index 000000000..b5b93588f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "test"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
new file mode 100644
index 000000000..2ab48f290
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
@@ -0,0 +1,80 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/basic_no_deps_address_assigned",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "test",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": Some(
+                    0000000000000000000000000000000000000000000000000000000000000000,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {},
+        dev_dependencies: {},
+    },
+    graph: {
+        "test": [],
+    },
+    package_table: {
+        "test": ResolutionPackage {
+            resolution_graph_index: "test",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000000,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000000,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml
new file mode 100644
index 000000000..f36925b4d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "0x0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp
new file mode 100644
index 000000000..3b4833fd9
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp
@@ -0,0 +1,7 @@
+Unresolved addresses found: [
+Named address 'A' in package 'test'
+]
+To fix this, add an entry for each unresolved address to the [addresses] section of tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml: e.g.,
+[addresses]
+Std = "0x1"
+Alternatively, you can also define [dev-addresses] and call with the -d flag
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml
new file mode 100644
index 000000000..f4ad16526
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
new file mode 100644
index 000000000..93c1ba97c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
@@ -0,0 +1,84 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "test",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": None,
+            },
+        ),
+        dev_address_assignments: Some(
+            {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+        ),
+        build: None,
+        dependencies: {},
+        dev_dependencies: {},
+    },
+    graph: {
+        "test": [],
+    },
+    package_table: {
+        "test": ResolutionPackage {
+            resolution_graph_index: "test",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: Some(
+                    {
+                        "A": 0000000000000000000000000000000000000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
new file mode 100644
index 000000000..982d4b55a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.exp
new file mode 100644
index 000000000..d2746086e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'test': Found unbound dev address assignment 'B = 0x1' in root package 'test'. Dev addresses cannot introduce new named addresses
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.toml
new file mode 100644
index 000000000..391efd1ba
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+B = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.exp
new file mode 100644
index 000000000..c194bad02
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.exp
@@ -0,0 +1 @@
+Unable to parse Move package manifest: duplicate key: `OtherDep` for key `dependencies` at line 5 column 1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.toml
new file mode 100644
index 000000000..e63ba72e5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep" }
+OtherDep = { local = "./deps_only/different_dep" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/different_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/different_dep/Move.toml
new file mode 100644
index 000000000..a0cd2f45f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/different_dep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..a0cd2f45f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/other_dep/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.exp
new file mode 100644
index 000000000..f04022e46
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.toml
new file mode 100644
index 000000000..b2858a297
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.toml
@@ -0,0 +1,12 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "_"
+
+[dev-addresses]
+B = "0x1"
+
+[dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..9bdb074d9
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.exp
new file mode 100644
index 000000000..f04022e46
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.toml
new file mode 100644
index 000000000..280161f31
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "_"
+A = "0x1"
+
+[dev-addresses]
+B = "0x1"
+
+[dev-dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..bf071a290
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dev-addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.exp
new file mode 100644
index 000000000..f04022e46
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': Found non-unique dev address assignment 'B = 0x1' in root package 'Root'. Dev address assignments must not conflict with any other assignments in order to ensure that the package will compile with any possible address assignment. Assignment conflicts with previous assignments: A = 0x1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.toml
new file mode 100644
index 000000000..9908ce56c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.toml
@@ -0,0 +1,11 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+B = "_"
+
+[dev-addresses]
+A = "0x1"
+B = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
new file mode 100644
index 000000000..1692ad324
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
@@ -0,0 +1,161 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/dep_good_digest",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": Some(
+                    0000000000000000000000000000000000000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: Some(
+                    "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8",
+                ),
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: Some(
+                            "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8",
+                        ),
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.toml
new file mode 100644
index 000000000..adfaac538
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" }, digest = "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8"}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/sources/A.move b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/sources/A.move
new file mode 100644
index 000000000..e52668348
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/sources/A.move
@@ -0,0 +1 @@
+module B::A { }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
new file mode 100644
index 000000000..cf5e6e183
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
@@ -0,0 +1,279 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/diamond_problem_backflow_resolution",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "A": Dependency {
+                local: "./deps_only/A",
+                subst: None,
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+            "B": Dependency {
+                local: "./deps_only/B",
+                subst: Some(
+                    {
+                        "BA": Assign(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "A",
+                Outgoing,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+        ],
+        "A": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+        ],
+        "C": [
+            (
+                "A",
+                Incoming,
+            ),
+            (
+                "B",
+                Incoming,
+            ),
+        ],
+        "B": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+        ],
+    },
+    package_table: {
+        "A": ResolutionPackage {
+            resolution_graph_index: "A",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Dependency {
+                        local: "../C",
+                        subst: Some(
+                            {
+                                "AA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "AA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolution_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": ResolutionPackage {
+            resolution_graph_index: "B",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Dependency {
+                        local: "../C",
+                        subst: Some(
+                            {
+                                "BA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "BA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolution_table: {
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": ResolutionPackage {
+            resolution_graph_index: "C",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Dependency {
+                        local: "./deps_only/A",
+                        subst: None,
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                    "B": Dependency {
+                        local: "./deps_only/B",
+                        subst: Some(
+                            {
+                                "BA": Assign(
+                                    0000000000000000000000000000000000000000000000000000000000000001,
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.toml
new file mode 100644
index 000000000..728105bc2
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.toml
@@ -0,0 +1,24 @@
+# Tests that resolved addresses can backflow in the resolution graph
+#                    +---- 0x1  -----+
+#                    |               |
+#                    v               |
+#                 +----+            0x1
+#           +---->| A  |----+        |
+#           |     +----+    |        |
+#           ?               ?        |
+# +----+    |               |     +----+
+# |Root|----+               +---->| C  |
+# +----+    |               |     +----+
+#          0x1             0x1
+#           |     +----+    |
+#           +---->| B  +----+
+#                 +----+
+
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+# This should be resolved to 0x1 by backflow from the BA instantiation
+A = { local = "./deps_only/A" }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.exp
new file mode 100644
index 000000000..69488171f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': While resolving dependency 'B' in package 'Root': Unable to assign value to named address BA in dependency B: Attempted to assign a different value '0x2' to an a already-assigned named address '0x1'
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.toml
new file mode 100644
index 000000000..bc483704f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x2" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
new file mode 100644
index 000000000..a55b45985
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
@@ -0,0 +1,291 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/diamond_problem_no_conflict",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "A": Dependency {
+                local: "./deps_only/A",
+                subst: Some(
+                    {
+                        "AA": Assign(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+            "B": Dependency {
+                local: "./deps_only/B",
+                subst: Some(
+                    {
+                        "BA": Assign(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "A",
+                Outgoing,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+        ],
+        "A": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+        ],
+        "C": [
+            (
+                "A",
+                Incoming,
+            ),
+            (
+                "B",
+                Incoming,
+            ),
+        ],
+        "B": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+        ],
+    },
+    package_table: {
+        "A": ResolutionPackage {
+            resolution_graph_index: "A",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Dependency {
+                        local: "../C",
+                        subst: Some(
+                            {
+                                "AA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "AA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolution_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": ResolutionPackage {
+            resolution_graph_index: "B",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Dependency {
+                        local: "../C",
+                        subst: Some(
+                            {
+                                "BA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "BA": (
+                    "C",
+                    "A",
+                ),
+            },
+            resolution_table: {
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": ResolutionPackage {
+            resolution_graph_index: "C",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Dependency {
+                        local: "./deps_only/A",
+                        subst: Some(
+                            {
+                                "AA": Assign(
+                                    0000000000000000000000000000000000000000000000000000000000000001,
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                    "B": Dependency {
+                        local: "./deps_only/B",
+                        subst: Some(
+                            {
+                                "BA": Assign(
+                                    0000000000000000000000000000000000000000000000000000000000000001,
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "AA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "BA": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml
new file mode 100644
index 000000000..1b9714b18
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
+B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml
new file mode 100644
index 000000000..888b3327a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml
new file mode 100644
index 000000000..371dcbcd3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml
new file mode 100644
index 000000000..d7f129c71
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp
new file mode 100644
index 000000000..9fb19a1e1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': While resolving dependency 'Other' in package 'Root': Unable to resolve package dependency 'Other': While resolving dependency 'Root' in package 'Other': Unable to resolve package dependency 'Root': Found cycle between packages: Root -> Other -> Root
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.toml
new file mode 100644
index 000000000..5d870c4f4
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+Other = { local = "./deps_only/other" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/deps_only/other/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/deps_only/other/Move.toml
new file mode 100644
index 000000000..62227696e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/deps_only/other/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Other"
+version = "0.0.0"
+
+[dependencies]
+Root = { local = "../.." }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp
new file mode 100644
index 000000000..2cb6025bd
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': While resolving dependency 'A' in package 'Root': Unable to resolve package dependency 'A': While resolving dependency 'B' in package 'A': Unable to resolve package dependency 'B': While resolving dependency 'Root' in package 'B': Unable to resolve package dependency 'Root': Found cycle between packages: Root -> A -> B -> Root
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.toml
new file mode 100644
index 000000000..486592f7a
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/A/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/A/Move.toml
new file mode 100644
index 000000000..0c88016be
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/A/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/B/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/B/Move.toml
new file mode 100644
index 000000000..84328b4f2
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dependencies]
+Root = { local = "../.." }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.exp
new file mode 100644
index 000000000..c77dcdaf2
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'test': Resolving named addresses for dependency 'D' in package 'test': Named address 'A' in dependency 'D' is already set to '0x1' but was then reassigned to '0x2'
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.toml
new file mode 100644
index 000000000..a52d02b7b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "./deps_only/C" }
+D = { local = "./deps_only/D" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
new file mode 100644
index 000000000..3e792236e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
@@ -0,0 +1,223 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/multiple_deps_rename",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "test",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "C": Dependency {
+                local: "./deps_only/C",
+                subst: Some(
+                    {
+                        "CA": RenameFrom(
+                            "A",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+            "D": Dependency {
+                local: "./deps_only/D",
+                subst: Some(
+                    {
+                        "DA": RenameFrom(
+                            "A",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "test": [
+            (
+                "C",
+                Outgoing,
+            ),
+            (
+                "D",
+                Outgoing,
+            ),
+        ],
+        "C": [
+            (
+                "test",
+                Incoming,
+            ),
+        ],
+        "D": [
+            (
+                "test",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "C": ResolutionPackage {
+            resolution_graph_index: "C",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": ResolutionPackage {
+            resolution_graph_index: "D",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000002,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "test": ResolutionPackage {
+            resolution_graph_index: "test",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "test",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "C": Dependency {
+                        local: "./deps_only/C",
+                        subst: Some(
+                            {
+                                "CA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                    "D": Dependency {
+                        local: "./deps_only/D",
+                        subst: Some(
+                            {
+                                "DA": RenameFrom(
+                                    "A",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "CA": (
+                    "C",
+                    "A",
+                ),
+                "DA": (
+                    "D",
+                    "A",
+                ),
+            },
+            resolution_table: {
+                "CA": 0000000000000000000000000000000000000000000000000000000000000001,
+                "DA": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml
new file mode 100644
index 000000000..6bac3c7ef
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml
@@ -0,0 +1,7 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
+D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml
new file mode 100644
index 000000000..a5bcadbfb
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "C"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml
new file mode 100644
index 000000000..f12fed32c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "D"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.exp
new file mode 100644
index 000000000..5d40ccafa
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.exp
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: Git revision not supplied for dependency
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.toml
new file mode 100644
index 000000000..247d3a3f0
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { git = "url doesnt matter" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
new file mode 100644
index 000000000..78e15d8a0
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
@@ -0,0 +1,157 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/one_dep",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": Some(
+                    0000000000000000000000000000000000000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
new file mode 100644
index 000000000..e1d4eaab3
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
@@ -0,0 +1,147 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/one_dep_assigned_address",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.toml
new file mode 100644
index 000000000..ac917b897
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..325b79ca1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.exp
new file mode 100644
index 000000000..17a4ec715
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': While resolving dependency 'OtherDep' in package 'Root': Source digest mismatch in dependency 'OtherDep'. Expected 'BAD_DIGEST' but got '0B4B841390F30CACBA194AD650968D2A362349F65D8EB2BF354AA4F95ED0B909'.
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.toml
new file mode 100644
index 000000000..bb8f33a3b
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" }, digest = "BAD_DIGEST"}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
new file mode 100644
index 000000000..0540c0701
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
@@ -0,0 +1,157 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/one_dep_multiple_of_same_name",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": Some(
+                    0000000000000000000000000000000000000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
new file mode 100644
index 000000000..a590010df
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
@@ -0,0 +1,160 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/one_dep_reassigned_address",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "B": Some(
+                    0000000000000000000000000000000000000000000000000000000000000002,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": Some(
+                            0000000000000000000000000000000000000000000000000000000000000002,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+                "B": 0000000000000000000000000000000000000000000000000000000000000002,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.toml
new file mode 100644
index 000000000..9e3383e0e
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..325b79ca1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x1"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
new file mode 100644
index 000000000..8dc604a4d
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
@@ -0,0 +1,157 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/resolution/one_dep_unification_across_local_renamings",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "A": Some(
+                    0000000000000000000000000000000000000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "OtherDep": Dependency {
+                local: "./deps_only/other_dep",
+                subst: Some(
+                    {
+                        "A": RenameFrom(
+                            "B",
+                        ),
+                    },
+                ),
+                version: None,
+                digest: None,
+                git_info: None,
+                node_info: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "Root": [
+            (
+                "OtherDep",
+                Outgoing,
+            ),
+        ],
+        "OtherDep": [
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "OtherDep": ResolutionPackage {
+            resolution_graph_index: "OtherDep",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "OtherDep",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "B": None,
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "B": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "A": Some(
+                            0000000000000000000000000000000000000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "OtherDep": Dependency {
+                        local: "./deps_only/other_dep",
+                        subst: Some(
+                            {
+                                "A": RenameFrom(
+                                    "B",
+                                ),
+                            },
+                        ),
+                        version: None,
+                        digest: None,
+                        git_info: None,
+                        node_info: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {
+                "A": (
+                    "OtherDep",
+                    "B",
+                ),
+            },
+            resolution_table: {
+                "A": 0000000000000000000000000000000000000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp
new file mode 100644
index 000000000..fbde59a90
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': Unable to resolve named address 'A' in package 'Root' when resolving dependencies: Attempted to assign a different value '0x1' to an a already-assigned named address '0x2'
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.toml
new file mode 100644
index 000000000..38bfe184c
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "0x1"
+
+[dependencies]
+OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..1cf4e4c22
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp
new file mode 100644
index 000000000..99b2c1ac4
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': While resolving dependency 'WrongNameForDep' in package 'Root': Name of dependency declared in package 'WrongNameForDep' does not match dependency's package name 'OtherDep'
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.toml
new file mode 100644
index 000000000..dd2c5d0c7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[addresses]
+A = "_"
+
+[dependencies]
+WrongNameForDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml
new file mode 100644
index 000000000..e0af1caa5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "OtherDep"
+version = "0.0.0"
+
+[addresses]
+B = "_"
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.exp b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.exp
new file mode 100644
index 000000000..9ff0f0e38
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.exp
@@ -0,0 +1 @@
+Unable to resolve packages for package 'test': While resolving dependency 'Pkg' in package 'test': TestHooks resolve dep Pkg = localhost:8080 Pkg 0x1
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.toml b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.toml
new file mode 100644
index 000000000..44b7370a1
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/package_hooks/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { custom = "localhost:8080", address = "0x1", package = "framework" }
diff --git a/vendors/move/crates/tools/move-package/tests/test_sources/resolution/sources/B.move b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/sources/B.move
new file mode 100644
index 000000000..91b559be8
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_sources/resolution/sources/B.move
@@ -0,0 +1,7 @@
+module B::M {
+    struct S has drop {}
+    fun foo(_: S) {}
+    fun bar() {
+        foo(A::M::S {})
+    }
+}
diff --git a/vendors/move/crates/tools/move-package/tests/test_thread_safety.rs b/vendors/move/crates/tools/move-package/tests/test_thread_safety.rs
new file mode 100644
index 000000000..dd62eb16f
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/test_thread_safety.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_package::BuildConfig;
+use std::path::Path;
+
+#[test]
+fn cross_thread_synchronization() {
+    let handle = std::thread::spawn(|| {
+        BuildConfig::default()
+            .compile_package(
+                Path::new("./tests/thread_safety_package_test_sources/Package1"),
+                &mut std::io::stdout(),
+            )
+            .unwrap()
+    });
+
+    BuildConfig::default()
+        .compile_package(
+            Path::new("./tests/thread_safety_package_test_sources/Package2"),
+            &mut std::io::stdout(),
+        )
+        .unwrap();
+    handle.join().unwrap();
+}
diff --git a/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml
new file mode 100644
index 000000000..adb1224f7
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move
new file mode 100644
index 000000000..a62a377b5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy { }
diff --git a/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml
new file mode 100644
index 000000000..779b56687
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Package2"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
diff --git a/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move
new file mode 100644
index 000000000..a62a377b5
--- /dev/null
+++ b/vendors/move/crates/tools/move-package/tests/thread_safety_package_test_sources/Package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy { }
diff --git a/vendors/move/crates/tools/move-resource-viewer/Cargo.toml b/vendors/move/crates/tools/move-resource-viewer/Cargo.toml
new file mode 100644
index 000000000..90f7d1408
--- /dev/null
+++ b/vendors/move/crates/tools/move-resource-viewer/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "move-resource-viewer"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem genesis viewer"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-utils = { path = "../move-bytecode-utils" }
+move-core-types = { path = "../../move-core-types" }
+serde = { version = "1.0.124", features = ["derive", "rc"] }
+
+bcs = { workspace = true }
+
+anyhow = "1.0.52"
+hex = "0.4.3"
+once_cell = "1.7.2"
diff --git a/vendors/move/crates/tools/move-resource-viewer/src/fat_type.rs b/vendors/move/crates/tools/move-resource-viewer/src/fat_type.rs
new file mode 100644
index 000000000..770fdd34c
--- /dev/null
+++ b/vendors/move/crates/tools/move-resource-viewer/src/fat_type.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+//! Loaded representation for runtime types.
+
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::AbilitySet,
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{StructTag, TypeTag},
+    value::{MoveStructLayout, MoveTypeLayout},
+    vm_status::StatusCode,
+};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::convert::TryInto;
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct WrappedAbilitySet(pub AbilitySet);
+
+impl Serialize for WrappedAbilitySet {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.0.into_u8().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for WrappedAbilitySet {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let byte = u8::deserialize(deserializer)?;
+        Ok(WrappedAbilitySet(AbilitySet::from_u8(byte).ok_or_else(
+            || serde::de::Error::custom(format!("Invalid ability set: {:X}", byte)),
+        )?))
+    }
+}
+
+/// VM representation of a struct type in Move.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub(crate) struct FatStructType {
+    pub address: AccountAddress,
+    pub module: Identifier,
+    pub name: Identifier,
+    pub abilities: WrappedAbilitySet,
+    pub ty_args: Vec<FatType>,
+    pub layout: Vec<FatType>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub(crate) enum FatType {
+    Bool,
+    U8,
+    U64,
+    U128,
+    Address,
+    Signer,
+    Vector(Box<FatType>),
+    Struct(Box<FatStructType>),
+    Reference(Box<FatType>),
+    MutableReference(Box<FatType>),
+    TyParam(usize),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16,
+    U32,
+    U256,
+}
+
+impl FatStructType {
+    pub fn subst(&self, ty_args: &[FatType]) -> PartialVMResult<FatStructType> {
+        Ok(Self {
+            address: self.address,
+            module: self.module.clone(),
+            name: self.name.clone(),
+            abilities: self.abilities,
+            ty_args: self
+                .ty_args
+                .iter()
+                .map(|ty| ty.subst(ty_args))
+                .collect::<PartialVMResult<_>>()?,
+            layout: self
+                .layout
+                .iter()
+                .map(|ty| ty.subst(ty_args))
+                .collect::<PartialVMResult<_>>()?,
+        })
+    }
+
+    pub fn struct_tag(&self) -> PartialVMResult<StructTag> {
+        let ty_args = self
+            .ty_args
+            .iter()
+            .map(|ty| ty.type_tag())
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        Ok(StructTag {
+            address: self.address,
+            module: self.module.clone(),
+            name: self.name.clone(),
+            type_params: ty_args,
+        })
+    }
+}
+
+impl FatType {
+    pub fn subst(&self, ty_args: &[FatType]) -> PartialVMResult<FatType> {
+        use FatType::*;
+
+        let res = match self {
+            TyParam(idx) => match ty_args.get(*idx) {
+                Some(ty) => ty.clone(),
+                None => {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(format!(
+                            "fat type substitution failed: index out of bounds -- len {} got {}",
+                            ty_args.len(),
+                            idx
+                        )),
+                    );
+                },
+            },
+
+            Bool => Bool,
+            U8 => U8,
+            U16 => U16,
+            U32 => U32,
+            U64 => U64,
+            U128 => U128,
+            U256 => U256,
+            Address => Address,
+            Signer => Signer,
+            Vector(ty) => Vector(Box::new(ty.subst(ty_args)?)),
+            Reference(ty) => Reference(Box::new(ty.subst(ty_args)?)),
+            MutableReference(ty) => MutableReference(Box::new(ty.subst(ty_args)?)),
+
+            Struct(struct_ty) => Struct(Box::new(struct_ty.subst(ty_args)?)),
+        };
+
+        Ok(res)
+    }
+
+    pub fn type_tag(&self) -> PartialVMResult<TypeTag> {
+        use FatType::*;
+
+        let res = match self {
+            Bool => TypeTag::Bool,
+            U8 => TypeTag::U8,
+            U16 => TypeTag::U16,
+            U32 => TypeTag::U32,
+            U64 => TypeTag::U64,
+            U128 => TypeTag::U128,
+            U256 => TypeTag::U256,
+            Address => TypeTag::Address,
+            Signer => TypeTag::Signer,
+            Vector(ty) => TypeTag::Vector(Box::new(ty.type_tag()?)),
+            Struct(struct_ty) => TypeTag::Struct(Box::new(struct_ty.struct_tag()?)),
+
+            Reference(_) | MutableReference(_) | TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("cannot derive type tag for {:?}", self)),
+                )
+            },
+        };
+
+        Ok(res)
+    }
+}
+
+impl From<&TypeTag> for FatType {
+    fn from(tag: &TypeTag) -> FatType {
+        use FatType::*;
+        match tag {
+            TypeTag::Bool => Bool,
+            TypeTag::U8 => U8,
+            TypeTag::U16 => U16,
+            TypeTag::U32 => U32,
+            TypeTag::U64 => U64,
+            TypeTag::U128 => U128,
+            TypeTag::Address => Address,
+            TypeTag::Signer => Signer,
+            TypeTag::Vector(inner) => Vector(Box::new(inner.as_ref().into())),
+            TypeTag::Struct(inner) => Struct(Box::new(inner.as_ref().into())),
+            TypeTag::U256 => U256,
+        }
+    }
+}
+
+impl From<&StructTag> for FatStructType {
+    fn from(struct_tag: &StructTag) -> FatStructType {
+        FatStructType {
+            address: struct_tag.address,
+            module: struct_tag.module.clone(),
+            name: struct_tag.name.clone(),
+            abilities: WrappedAbilitySet(AbilitySet::EMPTY), // We can't get abilities from a struct tag
+            ty_args: struct_tag
+                .type_params
+                .iter()
+                .map(|inner| inner.into())
+                .collect(),
+            layout: vec![], // We can't get field types from struct tag
+        }
+    }
+}
+
+impl TryInto<MoveStructLayout> for &FatStructType {
+    type Error = PartialVMError;
+
+    fn try_into(self) -> Result<MoveStructLayout, Self::Error> {
+        Ok(MoveStructLayout::new(
+            self.layout
+                .iter()
+                .map(|ty| ty.try_into())
+                .collect::<PartialVMResult<Vec<_>>>()?,
+        ))
+    }
+}
+
+impl TryInto<MoveTypeLayout> for &FatType {
+    type Error = PartialVMError;
+
+    fn try_into(self) -> Result<MoveTypeLayout, Self::Error> {
+        Ok(match self {
+            FatType::Address => MoveTypeLayout::Address,
+            FatType::U8 => MoveTypeLayout::U8,
+            FatType::U16 => MoveTypeLayout::U16,
+            FatType::U32 => MoveTypeLayout::U32,
+            FatType::U64 => MoveTypeLayout::U64,
+            FatType::U128 => MoveTypeLayout::U128,
+            FatType::U256 => MoveTypeLayout::U256,
+            FatType::Bool => MoveTypeLayout::Bool,
+            FatType::Vector(v) => MoveTypeLayout::Vector(Box::new(v.as_ref().try_into()?)),
+            FatType::Struct(s) => MoveTypeLayout::Struct(MoveStructLayout::new(
+                s.layout
+                    .iter()
+                    .map(|ty| ty.try_into())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            )),
+            FatType::Signer => MoveTypeLayout::Signer,
+            FatType::Reference(_) | FatType::MutableReference(_) | FatType::TyParam(_) => {
+                return Err(PartialVMError::new(StatusCode::ABORT_TYPE_MISMATCH_ERROR))
+            },
+        })
+    }
+}
diff --git a/vendors/move/crates/tools/move-resource-viewer/src/lib.rs b/vendors/move/crates/tools/move-resource-viewer/src/lib.rs
new file mode 100644
index 000000000..33efe0f31
--- /dev/null
+++ b/vendors/move/crates/tools/move-resource-viewer/src/lib.rs
@@ -0,0 +1,415 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    fat_type::{FatStructType, FatType},
+    resolver::Resolver,
+};
+use anyhow::{anyhow, Result};
+use move_binary_format::{
+    errors::{Location, PartialVMError},
+    file_format::{Ability, AbilitySet},
+    CompiledModule,
+};
+use move_bytecode_utils::layout::TypeLayoutBuilder;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::MoveResolver,
+    u256,
+    value::{MoveStruct, MoveTypeLayout, MoveValue},
+    vm_status::VMStatus,
+};
+use serde::ser::{SerializeMap, SerializeSeq};
+use std::{
+    convert::{TryFrom, TryInto},
+    fmt::{Display, Formatter},
+    rc::Rc,
+};
+
+mod fat_type;
+mod module_cache;
+mod resolver;
+
+#[derive(Clone, Debug)]
+pub struct AnnotatedMoveStruct {
+    pub abilities: AbilitySet,
+    pub type_: StructTag,
+    pub value: Vec<(Identifier, AnnotatedMoveValue)>,
+}
+
+/// AnnotatedMoveValue is a fully expanded version of on chain Move data. This should only be used
+/// for debugging/client purpose right now and just for a better visualization of on chain data. In
+/// the long run, we would like to transform this struct to a Json value so that we can have a cross
+/// platform interpretation of the on chain data.
+#[derive(Clone, Debug)]
+pub enum AnnotatedMoveValue {
+    U8(u8),
+    U64(u64),
+    U128(u128),
+    Bool(bool),
+    Address(AccountAddress),
+    Vector(TypeTag, Vec<AnnotatedMoveValue>),
+    Bytes(Vec<u8>),
+    Struct(AnnotatedMoveStruct),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
+}
+
+impl AnnotatedMoveValue {
+    pub fn get_type(&self) -> TypeTag {
+        use AnnotatedMoveValue::*;
+        match self {
+            U8(_) => TypeTag::U8,
+            U16(_) => TypeTag::U16,
+            U32(_) => TypeTag::U32,
+            U64(_) => TypeTag::U64,
+            U128(_) => TypeTag::U128,
+            U256(_) => TypeTag::U256,
+            Bool(_) => TypeTag::Bool,
+            Address(_) => TypeTag::Address,
+            Vector(t, _) => t.clone(),
+            Bytes(_) => TypeTag::Vector(Box::new(TypeTag::U8)),
+            Struct(s) => TypeTag::Struct(Box::new(s.type_.clone())),
+        }
+    }
+}
+
+pub struct MoveValueAnnotator<'a, T: ?Sized> {
+    cache: Resolver<'a, T>,
+}
+
+impl<'a, T: MoveResolver + ?Sized> MoveValueAnnotator<'a, T> {
+    pub fn new(view: &'a T) -> Self {
+        Self {
+            cache: Resolver::new(view),
+        }
+    }
+
+    pub fn get_resource_bytes(&self, addr: &AccountAddress, tag: &StructTag) -> Option<Vec<u8>> {
+        self.cache.state.get_resource(addr, tag).ok()?
+    }
+
+    pub fn get_module(&self, module: &ModuleId) -> Result<Rc<CompiledModule>> {
+        self.cache.get_module_by_id_or_err(module)
+    }
+
+    pub fn get_type_layout_runtime(&self, type_tag: &TypeTag) -> Result<MoveTypeLayout> {
+        TypeLayoutBuilder::build_runtime(type_tag, &self.cache)
+    }
+
+    pub fn get_type_layout_with_fields(&self, type_tag: &TypeTag) -> Result<MoveTypeLayout> {
+        TypeLayoutBuilder::build_with_fields(type_tag, &self.cache)
+    }
+
+    pub fn get_type_layout_with_types(&self, type_tag: &TypeTag) -> Result<MoveTypeLayout> {
+        TypeLayoutBuilder::build_with_types(type_tag, &self.cache)
+    }
+
+    pub fn view_function_arguments(
+        &self,
+        module: &ModuleId,
+        function: &IdentStr,
+        ty_args: &[TypeTag],
+        args: &[Vec<u8>],
+    ) -> Result<Vec<AnnotatedMoveValue>> {
+        let types: Vec<FatType> = self
+            .cache
+            .resolve_function_arguments(module, function)?
+            .into_iter()
+            .filter(|t| match t {
+                FatType::Signer => false,
+                FatType::Reference(inner) => !matches!(&**inner, FatType::Signer),
+                FatType::Bool
+                | FatType::U8
+                | FatType::U64
+                | FatType::U128
+                | FatType::Address
+                | FatType::Vector(_)
+                | FatType::Struct(_)
+                | FatType::MutableReference(_)
+                | FatType::TyParam(_)
+                | FatType::U16
+                | FatType::U32
+                | FatType::U256 => true,
+            })
+            .collect();
+        anyhow::ensure!(
+            types.len() == args.len(),
+            "unexpected error: argument types({}) and values({}) are not matched",
+            types.len(),
+            args.len(),
+        );
+
+        // Make an approximation at the fat types for the type arguments
+        let ty_args: Vec<FatType> = ty_args.iter().map(|inner| inner.into()).collect();
+
+        types
+            .iter()
+            .enumerate()
+            .map(|(i, ty)| {
+                ty.subst(&ty_args)
+                    .map_err(anyhow::Error::from)
+                    .and_then(|fat_type| self.view_value_by_fat_type(&fat_type, &args[i]))
+            })
+            .collect::<Result<Vec<AnnotatedMoveValue>>>()
+    }
+
+    pub fn view_resource(&self, tag: &StructTag, blob: &[u8]) -> Result<AnnotatedMoveStruct> {
+        let ty = self.cache.resolve_struct(tag)?;
+        let struct_def = (&ty).try_into().map_err(into_vm_status)?;
+        let move_struct = MoveStruct::simple_deserialize(blob, &struct_def)?;
+        self.annotate_struct(&move_struct, &ty)
+    }
+
+    pub fn move_struct_fields(
+        &self,
+        tag: &StructTag,
+        blob: &[u8],
+    ) -> Result<Vec<(Identifier, MoveValue)>> {
+        let ty = self.cache.resolve_struct(tag)?;
+        let struct_def = (&ty).try_into().map_err(into_vm_status)?;
+        Ok(match MoveStruct::simple_deserialize(blob, &struct_def)? {
+            MoveStruct::Runtime(runtime) => self
+                .cache
+                .get_field_names(&ty)?
+                .into_iter()
+                .zip(runtime.into_iter())
+                .collect(),
+            MoveStruct::WithFields(fields) | MoveStruct::WithTypes { fields, .. } => fields,
+        })
+    }
+
+    pub fn view_value(&self, ty_tag: &TypeTag, blob: &[u8]) -> Result<AnnotatedMoveValue> {
+        let ty = self.cache.resolve_type(ty_tag)?;
+        self.view_value_by_fat_type(&ty, blob)
+    }
+
+    fn view_value_by_fat_type(&self, ty: &FatType, blob: &[u8]) -> Result<AnnotatedMoveValue> {
+        let layout = ty.try_into().map_err(into_vm_status)?;
+        let move_value = MoveValue::simple_deserialize(blob, &layout)?;
+        self.annotate_value(&move_value, ty)
+    }
+
+    fn annotate_struct(
+        &self,
+        move_struct: &MoveStruct,
+        ty: &FatStructType,
+    ) -> Result<AnnotatedMoveStruct> {
+        let struct_tag = ty
+            .struct_tag()
+            .map_err(|e| e.finish(Location::Undefined).into_vm_status())?;
+        let field_names = self.cache.get_field_names(ty)?;
+        let mut annotated_fields = vec![];
+        for (ty, v) in ty.layout.iter().zip(move_struct.fields().iter()) {
+            annotated_fields.push(self.annotate_value(v, ty)?);
+        }
+        Ok(AnnotatedMoveStruct {
+            abilities: ty.abilities.0,
+            type_: struct_tag,
+            value: field_names
+                .into_iter()
+                .zip(annotated_fields.into_iter())
+                .collect(),
+        })
+    }
+
+    fn annotate_value(&self, value: &MoveValue, ty: &FatType) -> Result<AnnotatedMoveValue> {
+        Ok(match (value, ty) {
+            (MoveValue::Bool(b), FatType::Bool) => AnnotatedMoveValue::Bool(*b),
+            (MoveValue::U8(i), FatType::U8) => AnnotatedMoveValue::U8(*i),
+            (MoveValue::U16(i), FatType::U16) => AnnotatedMoveValue::U16(*i),
+            (MoveValue::U32(i), FatType::U32) => AnnotatedMoveValue::U32(*i),
+            (MoveValue::U64(i), FatType::U64) => AnnotatedMoveValue::U64(*i),
+            (MoveValue::U128(i), FatType::U128) => AnnotatedMoveValue::U128(*i),
+            (MoveValue::U256(i), FatType::U256) => AnnotatedMoveValue::U256(*i),
+            (MoveValue::Address(a), FatType::Address) => AnnotatedMoveValue::Address(*a),
+            (MoveValue::Vector(a), FatType::Vector(ty)) => match ty.as_ref() {
+                FatType::U8 => AnnotatedMoveValue::Bytes(
+                    a.iter()
+                        .map(|v| match v {
+                            MoveValue::U8(i) => Ok(*i),
+                            _ => Err(anyhow!("unexpected value type")),
+                        })
+                        .collect::<Result<_>>()?,
+                ),
+                _ => AnnotatedMoveValue::Vector(
+                    ty.type_tag().unwrap(),
+                    a.iter()
+                        .map(|v| self.annotate_value(v, ty.as_ref()))
+                        .collect::<Result<_>>()?,
+                ),
+            },
+            (MoveValue::Struct(s), FatType::Struct(ty)) => {
+                AnnotatedMoveValue::Struct(self.annotate_struct(s, ty.as_ref())?)
+            },
+            (MoveValue::U8(_), _)
+            | (MoveValue::U64(_), _)
+            | (MoveValue::U128(_), _)
+            | (MoveValue::Bool(_), _)
+            | (MoveValue::Address(_), _)
+            | (MoveValue::Vector(_), _)
+            | (MoveValue::Struct(_), _)
+            | (MoveValue::Signer(_), _)
+            | (MoveValue::U16(_), _)
+            | (MoveValue::U32(_), _)
+            | (MoveValue::U256(_), _) => {
+                return Err(anyhow!(
+                    "Cannot annotate value {:?} with type {:?}",
+                    value,
+                    ty
+                ));
+            },
+        })
+    }
+}
+
+fn into_vm_status(e: PartialVMError) -> VMStatus {
+    e.finish(Location::Undefined).into_vm_status()
+}
+
+fn write_indent(f: &mut Formatter, indent: u64) -> std::fmt::Result {
+    for _i in 0..indent {
+        write!(f, " ")?;
+    }
+    Ok(())
+}
+
+fn pretty_print_value(
+    f: &mut Formatter,
+    value: &AnnotatedMoveValue,
+    indent: u64,
+) -> std::fmt::Result {
+    match value {
+        AnnotatedMoveValue::Bool(b) => write!(f, "{}", b),
+        AnnotatedMoveValue::U8(v) => write!(f, "{}u8", v),
+        AnnotatedMoveValue::U16(v) => write!(f, "{}u16", v),
+        AnnotatedMoveValue::U32(v) => write!(f, "{}u32", v),
+        AnnotatedMoveValue::U64(v) => write!(f, "{}", v),
+        AnnotatedMoveValue::U128(v) => write!(f, "{}u128", v),
+        AnnotatedMoveValue::U256(v) => write!(f, "{}u256", v),
+        AnnotatedMoveValue::Address(a) => write!(f, "{}", a.short_str_lossless()),
+        AnnotatedMoveValue::Vector(_, v) => {
+            writeln!(f, "[")?;
+            for value in v.iter() {
+                write_indent(f, indent + 4)?;
+                pretty_print_value(f, value, indent + 4)?;
+                writeln!(f, ",")?;
+            }
+            write_indent(f, indent)?;
+            write!(f, "]")
+        },
+        AnnotatedMoveValue::Bytes(v) => write!(f, "{}", hex::encode(v)),
+        AnnotatedMoveValue::Struct(s) => pretty_print_struct(f, s, indent),
+    }
+}
+
+fn pretty_print_struct(
+    f: &mut Formatter,
+    value: &AnnotatedMoveStruct,
+    indent: u64,
+) -> std::fmt::Result {
+    pretty_print_ability_modifiers(f, value.abilities)?;
+    writeln!(f, "{} {{", value.type_)?;
+    for (field_name, v) in value.value.iter() {
+        write_indent(f, indent + 4)?;
+        write!(f, "{}: ", field_name)?;
+        pretty_print_value(f, v, indent + 4)?;
+        writeln!(f)?;
+    }
+    write_indent(f, indent)?;
+    write!(f, "}}")
+}
+
+fn pretty_print_ability_modifiers(f: &mut Formatter, abilities: AbilitySet) -> std::fmt::Result {
+    for ability in abilities {
+        match ability {
+            Ability::Copy => write!(f, "copy ")?,
+            Ability::Drop => write!(f, "drop ")?,
+            Ability::Store => write!(f, "store ")?,
+            Ability::Key => write!(f, "key ")?,
+        }
+    }
+    Ok(())
+}
+
+impl serde::Serialize for AnnotatedMoveStruct {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut s = serializer.serialize_map(Some(self.value.len()))?;
+        for (f, v) in &self.value {
+            s.serialize_entry(f, v)?
+        }
+        s.end()
+    }
+}
+
+impl serde::Serialize for AnnotatedMoveValue {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        use AnnotatedMoveValue::*;
+        match self {
+            U8(n) => serializer.serialize_u8(*n),
+            U16(n) => serializer.serialize_u16(*n),
+            U32(n) => serializer.serialize_u32(*n),
+            U64(n) => serializer.serialize_u64(*n),
+            U128(n) => {
+                // TODO: we could use serializer.serialize_u128 here, but it requires the serde_json
+                // arbitrary_precision, which breaks some existing json-rpc test. figure
+                // out what's going on or come up with a better workaround
+                if let Ok(i) = u64::try_from(*n) {
+                    serializer.serialize_u64(i)
+                } else {
+                    serializer.serialize_bytes(&n.to_le_bytes())
+                }
+            },
+            U256(n) => {
+                // Copying logic & reasoning from above because if u128 is needs arb precision, u256 should too
+                if let Ok(i) = u64::try_from(*n) {
+                    serializer.serialize_u64(i)
+                } else {
+                    serializer.serialize_bytes(&n.to_le_bytes())
+                }
+            },
+            Bool(b) => serializer.serialize_bool(*b),
+            Address(a) => a.short_str_lossless().serialize(serializer),
+            Vector(t, vals) => {
+                assert_ne!(t, &TypeTag::U8);
+                let mut vec = serializer.serialize_seq(Some(vals.len()))?;
+                for v in vals {
+                    vec.serialize_element(v)?;
+                }
+                vec.end()
+            },
+            Bytes(v) => {
+                // try to deserialize as utf8, fall back to hex with if we can't
+                let utf8_str = std::str::from_utf8(v);
+                if let Ok(s) = utf8_str {
+                    if s.chars().any(|c| c.is_ascii_control()) {
+                        // has control characters; probably bytes
+                        serializer.serialize_str(&hex::encode(v))
+                    } else {
+                        serializer.serialize_str(s)
+                    }
+                } else {
+                    serializer.serialize_str(&hex::encode(v))
+                }
+            },
+            Struct(s) => s.serialize(serializer),
+        }
+    }
+}
+
+impl Display for AnnotatedMoveValue {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        pretty_print_value(f, self, 0)
+    }
+}
+
+impl Display for AnnotatedMoveStruct {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        pretty_print_struct(f, self, 0)
+    }
+}
diff --git a/vendors/move/crates/tools/move-resource-viewer/src/module_cache.rs b/vendors/move/crates/tools/move-resource-viewer/src/module_cache.rs
new file mode 100644
index 000000000..a63f34e25
--- /dev/null
+++ b/vendors/move/crates/tools/move-resource-viewer/src/module_cache.rs
@@ -0,0 +1,44 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::CompiledModule;
+use move_core_types::language_storage::ModuleId;
+use std::{cell::RefCell, collections::hash_map::HashMap, hash::Hash, rc::Rc};
+
+pub struct ModuleCacheImpl<K, V> {
+    id_map: RefCell<HashMap<K, usize>>,
+    modules: RefCell<Vec<Rc<V>>>,
+}
+
+impl<K, V> ModuleCacheImpl<K, V>
+where
+    K: Eq + Hash,
+{
+    pub fn new() -> Self {
+        Self {
+            id_map: RefCell::new(HashMap::new()),
+            modules: RefCell::new(vec![]),
+        }
+    }
+
+    pub fn insert(&self, key: K, module: V) -> Rc<V> {
+        self.modules.borrow_mut().push(Rc::new(module));
+        let idx = self.modules.borrow().len() - 1;
+        self.id_map.borrow_mut().insert(key, idx);
+        self.modules
+            .borrow()
+            .last()
+            .expect("ModuleCache: last() after push() impossible failure")
+            .clone()
+    }
+
+    pub fn get(&self, key: &K) -> Option<Rc<V>> {
+        self.id_map
+            .borrow()
+            .get(key)
+            .and_then(|idx| self.modules.borrow().get(*idx).cloned())
+    }
+}
+
+pub type ModuleCache = ModuleCacheImpl<ModuleId, CompiledModule>;
diff --git a/vendors/move/crates/tools/move-resource-viewer/src/resolver.rs b/vendors/move/crates/tools/move-resource-viewer/src/resolver.rs
new file mode 100644
index 000000000..857d2bcdb
--- /dev/null
+++ b/vendors/move/crates/tools/move-resource-viewer/src/resolver.rs
@@ -0,0 +1,248 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    fat_type::{FatStructType, FatType, WrappedAbilitySet},
+    module_cache::ModuleCache,
+};
+use anyhow::{anyhow, Error, Result};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::PartialVMError,
+    file_format::{
+        SignatureToken, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+    },
+    views::FunctionHandleView,
+    CompiledModule,
+};
+use move_bytecode_utils::module_cache::GetModule;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::MoveResolver,
+};
+use std::rc::Rc;
+
+pub(crate) struct Resolver<'a, T: ?Sized> {
+    pub state: &'a T,
+    cache: ModuleCache,
+}
+
+impl<'a, T: MoveResolver + ?Sized> GetModule for Resolver<'a, T> {
+    type Error = Error;
+    type Item = Rc<CompiledModule>;
+
+    fn get_module_by_id(&self, module_id: &ModuleId) -> Result<Option<Self::Item>, Self::Error> {
+        if let Some(module) = self.cache.get(module_id) {
+            return Ok(Some(module));
+        }
+        let blob = self
+            .state
+            .get_module(module_id)
+            .map_err(|e| anyhow!("Error retrieving module {:?}: {:?}", module_id, e))?
+            .ok_or_else(|| anyhow!("Module {:?} can't be found", module_id))?;
+        let compiled_module = CompiledModule::deserialize(&blob).map_err(|status| {
+            anyhow!(
+                "Module {:?} deserialize with error code {:?}",
+                module_id,
+                status
+            )
+        })?;
+        Ok(Some(self.cache.insert(module_id.clone(), compiled_module)))
+    }
+}
+
+impl<'a, T: MoveResolver + ?Sized> Resolver<'a, T> {
+    pub fn new(state: &'a T) -> Self {
+        Resolver {
+            state,
+            cache: ModuleCache::new(),
+        }
+    }
+
+    fn get_module(&self, address: &AccountAddress, name: &IdentStr) -> Result<Rc<CompiledModule>> {
+        let module_id = ModuleId::new(*address, name.to_owned());
+        self.get_module_by_id_or_err(&module_id)
+    }
+
+    pub fn get_module_by_id_or_err(&self, module_id: &ModuleId) -> Result<Rc<CompiledModule>> {
+        self.get_module_by_id(module_id)
+            .map(|opt| opt.expect("My GetModule impl always returns Some."))
+    }
+
+    pub fn resolve_function_arguments(
+        &self,
+        module: &ModuleId,
+        function: &IdentStr,
+    ) -> Result<Vec<FatType>> {
+        let m = self.get_module_by_id_or_err(module)?;
+        for def in m.function_defs.iter() {
+            let fhandle = m.function_handle_at(def.function);
+            let fhandle_view = FunctionHandleView::new(m.as_ref(), fhandle);
+            if fhandle_view.name() == function {
+                return fhandle_view
+                    .parameters()
+                    .0
+                    .iter()
+                    .map(|signature| self.resolve_signature(m.clone(), signature))
+                    .collect::<Result<_>>();
+            }
+        }
+        Err(anyhow!("Function {:?} not found in {:?}", function, module))
+    }
+
+    pub fn resolve_type(&self, type_tag: &TypeTag) -> Result<FatType> {
+        Ok(match type_tag {
+            TypeTag::Address => FatType::Address,
+            TypeTag::Signer => FatType::Signer,
+            TypeTag::Bool => FatType::Bool,
+            TypeTag::Struct(st) => FatType::Struct(Box::new(self.resolve_struct(st)?)),
+            TypeTag::U8 => FatType::U8,
+            TypeTag::U16 => FatType::U16,
+            TypeTag::U32 => FatType::U32,
+            TypeTag::U64 => FatType::U64,
+            TypeTag::U256 => FatType::U256,
+            TypeTag::U128 => FatType::U128,
+            TypeTag::Vector(ty) => FatType::Vector(Box::new(self.resolve_type(ty)?)),
+        })
+    }
+
+    pub fn resolve_struct(&self, struct_tag: &StructTag) -> Result<FatStructType> {
+        let module = self.get_module(&struct_tag.address, &struct_tag.module)?;
+        let struct_def = find_struct_def_in_module(module.clone(), struct_tag.name.as_ident_str())?;
+        let ty_args = struct_tag
+            .type_params
+            .iter()
+            .map(|ty| self.resolve_type(ty))
+            .collect::<Result<Vec<_>>>()?;
+        let ty_body = self.resolve_struct_definition(module, struct_def)?;
+        ty_body.subst(&ty_args).map_err(|e: PartialVMError| {
+            anyhow!("StructTag {:?} cannot be resolved: {:?}", struct_tag, e)
+        })
+    }
+
+    pub fn get_field_names(&self, ty: &FatStructType) -> Result<Vec<Identifier>> {
+        let module = self.get_module(&ty.address, ty.module.as_ident_str())?;
+        let struct_def_idx = find_struct_def_in_module(module.clone(), ty.name.as_ident_str())?;
+        let struct_def = module.struct_def_at(struct_def_idx);
+
+        match &struct_def.field_information {
+            StructFieldInformation::Native => Err(anyhow!("Unexpected Native Struct")),
+            StructFieldInformation::Declared(defs) => Ok(defs
+                .iter()
+                .map(|field_def| module.identifier_at(field_def.name).to_owned())
+                .collect()),
+        }
+    }
+
+    fn resolve_signature(
+        &self,
+        module: Rc<CompiledModule>,
+        sig: &SignatureToken,
+    ) -> Result<FatType> {
+        Ok(match sig {
+            SignatureToken::Bool => FatType::Bool,
+            SignatureToken::U8 => FatType::U8,
+            SignatureToken::U16 => FatType::U16,
+            SignatureToken::U32 => FatType::U32,
+            SignatureToken::U64 => FatType::U64,
+            SignatureToken::U128 => FatType::U128,
+            SignatureToken::U256 => FatType::U256,
+            SignatureToken::Address => FatType::Address,
+            SignatureToken::Signer => FatType::Signer,
+            SignatureToken::Vector(ty) => {
+                FatType::Vector(Box::new(self.resolve_signature(module, ty)?))
+            },
+            SignatureToken::Struct(idx) => {
+                FatType::Struct(Box::new(self.resolve_struct_handle(module, *idx)?))
+            },
+            SignatureToken::StructInstantiation(idx, toks) => {
+                let struct_ty = self.resolve_struct_handle(module.clone(), *idx)?;
+                let args = toks
+                    .iter()
+                    .map(|tok| self.resolve_signature(module.clone(), tok))
+                    .collect::<Result<Vec<_>>>()?;
+                FatType::Struct(Box::new(
+                    struct_ty
+                        .subst(&args)
+                        .map_err(|status| anyhow!("Substitution failure: {:?}", status))?,
+                ))
+            },
+            SignatureToken::TypeParameter(idx) => FatType::TyParam(*idx as usize),
+            SignatureToken::MutableReference(_) => return Err(anyhow!("Unexpected Reference")),
+            SignatureToken::Reference(inner) => match **inner {
+                SignatureToken::Signer => FatType::Reference(Box::new(FatType::Signer)),
+                _ => return Err(anyhow!("Unexpected Reference")),
+            },
+        })
+    }
+
+    fn resolve_struct_handle(
+        &self,
+        module: Rc<CompiledModule>,
+        idx: StructHandleIndex,
+    ) -> Result<FatStructType> {
+        let struct_handle = module.struct_handle_at(idx);
+        let target_module = {
+            let module_handle = module.module_handle_at(struct_handle.module);
+            self.get_module(
+                module.address_identifier_at(module_handle.address),
+                module.identifier_at(module_handle.name),
+            )?
+        };
+        let target_idx = find_struct_def_in_module(
+            target_module.clone(),
+            module.identifier_at(struct_handle.name),
+        )?;
+        self.resolve_struct_definition(target_module, target_idx)
+    }
+
+    fn resolve_struct_definition(
+        &self,
+        module: Rc<CompiledModule>,
+        idx: StructDefinitionIndex,
+    ) -> Result<FatStructType> {
+        let struct_def = module.struct_def_at(idx);
+        let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+        let address = *module.address();
+        let module_name = module.name().to_owned();
+        let name = module.identifier_at(struct_handle.name).to_owned();
+        let abilities = struct_handle.abilities;
+        let ty_args = (0..struct_handle.type_parameters.len())
+            .map(FatType::TyParam)
+            .collect();
+        match &struct_def.field_information {
+            StructFieldInformation::Native => Err(anyhow!("Unexpected Native Struct")),
+            StructFieldInformation::Declared(defs) => Ok(FatStructType {
+                address,
+                module: module_name,
+                name,
+                abilities: WrappedAbilitySet(abilities),
+                ty_args,
+                layout: defs
+                    .iter()
+                    .map(|field_def| self.resolve_signature(module.clone(), &field_def.signature.0))
+                    .collect::<Result<_>>()?,
+            }),
+        }
+    }
+}
+
+fn find_struct_def_in_module(
+    module: Rc<CompiledModule>,
+    name: &IdentStr,
+) -> Result<StructDefinitionIndex> {
+    for (i, defs) in module.struct_defs().iter().enumerate() {
+        let st_handle = module.struct_handle_at(defs.struct_handle);
+        if module.identifier_at(st_handle.name) == name {
+            return Ok(StructDefinitionIndex::new(i as u16));
+        }
+    }
+    Err(anyhow!(
+        "Struct {:?} not found in {:?}",
+        name,
+        module.self_id()
+    ))
+}
diff --git a/vendors/move/crates/tools/move-unit-test/Cargo.toml b/vendors/move/crates/tools/move-unit-test/Cargo.toml
new file mode 100644
index 000000000..e57e4ea41
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/Cargo.toml
@@ -0,0 +1,62 @@
+[package]
+name = "move-unit-test"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Unit testing framework for Move code"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+better_any = "0.1.1"
+clap = { version = "3.1.8", features = ["derive"] }
+codespan-reporting = "0.11.1"
+colored = "2.0.0"
+evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
+itertools = "0.10.1"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-utils = { path = "../move-bytecode-utils" }
+once_cell = "1.7.2"
+rayon = "1.5.0"
+regex = "1.5.5"
+
+move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
+move-core-types = { path = "../../move-core-types" }
+move-ir-types = { path = "../../move-ir/types" }
+move-model = { path = "../../move-model" }
+move-resource-viewer = { path = "../tools/move-resource-viewer" }
+move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
+move-symbol-pool = { path = "../../move-symbol-pool" }
+move-table-extension = { path = "../../extensions/move-table-extension" }
+move-vm-runtime = { path = "../../move-vm/runtime", features = ["testing"] }
+move-vm-test-utils = { path = "../../move-vm/test-utils" }
+move-vm-types = { path = "../../move-vm/types" }
+
+# EVM-specific dependencies
+move-to-yul = { path = "../../evm/move-to-yul", optional = true }
+
+evm = { version = "0.33.1", optional = true }
+primitive-types = { version = "0.10.1", optional = true }
+
+[dev-dependencies]
+datatest-stable = "0.1.1"
+difference = "2.0.0"
+
+[[bin]]
+name = "move-unit-test"
+path = "src/main.rs"
+
+[[test]]
+name = "move_unit_test_testsuite"
+harness = false
+
+[features]
+evm-backend = ["move-to-yul", "evm-exec-utils", "evm", "primitive-types"]
+table-extension = [
+ "move-vm-test-utils/table-extension"
+]
+debugging = ["move-vm-runtime/debugging"]
diff --git a/vendors/move/crates/tools/move-unit-test/README.md b/vendors/move/crates/tools/move-unit-test/README.md
new file mode 100644
index 000000000..40e4b2cd2
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/README.md
@@ -0,0 +1,64 @@
+---
+id: move-unit-test
+title: Move Unit Testing Framework
+custom_edit_url: https://github.com/move-language/move/edit/main/language/tools/move-unit-test/README.md
+---
+
+# Summary
+
+This crate defines the core logic for running and reporting Move unit
+tests. Move unit testing is made up of two main components; a test runner,
+and a test reporter.
+
+It's important to also note here that unit tests can be run using the
+[stackless bytecode interpreter](../../move-prover/interpreter). If the
+unit tests are run with the stackless bytecode interpreter and the test
+returns a value, then the result of executing the unit test with the Move
+VM and the result of the interpreter will be compared and an error will
+be raised if they are not equal.
+
+Detailed information on how to use unit tests as a user of Move can be
+found [here](https://move-language.github.io/move/unit-testing.html).
+
+## Test Runner
+
+The test runner consumes a
+[`TestPlan`](../../move-compiler/src/unit_test/mod.rs): this is a
+datastructure that is built by the Move compiler, based on source `#[test]`
+attributes. At a high level, this test plan consists of:
+1. A list of `ModuleTestPlan`s for each non-dependency module. A
+   `ModuleTestPlan` consists of a list of unit tests declared in a module,
+   along with its arguments and whether the unit test is an expected
+   failure or not.
+2. Compiled modules for each source module, along with compiled modules for
+   all transitive dependencies.
+3. The source text and source maps for every source and transitive dependency.
+
+The test runner takes this `TestPlan` along with various configuration
+options (e.g., number of threads). From this information the test runner
+creates an initial test state consisting solely of the modules in bullet
+(2) above. This will be the same initial state for all unit tests.
+
+After constructing this initial state, a work queue of `ModuleTestPlan`s is
+passed to a [`rayon`](https://docs.rs/rayon/latest/rayon/) threadpool to
+execute.  After the execution of each test a `PASS`, `FAIL` or `TIMEOUT` is
+reported to the writer (usually `std::io::stdout`) as soon as the test's
+result is known. The result of running tests in a `ModuleTestPlan` is a
+mapping of failing and passing tests (where failing means that the tests
+failed when it was expected to fail, or vis versa) along with profiling
+information and failure information if applicable. These test statistics
+for each module are combined in parallel and produce a `TestResults` data
+structure.
+
+## Test Reporter
+
+After all of the unit tests have been run and a `TestResults` data
+structure has been created, the test reporter will iterate through the test
+results, and will use the data in the `TestFailure` info along with the
+source maps and source text in the test plan to display source-level error
+messages for any failing tests.
+
+Depending on the options passed to the unit testing framework, additional
+info, such as the global storage state at the point of error for each
+failing test, or the execution time and number of instructions for each
+test may be display at the end of a test run.
diff --git a/vendors/move/crates/tools/move-unit-test/src/cargo_runner.rs b/vendors/move/crates/tools/move-unit-test/src/cargo_runner.rs
new file mode 100644
index 000000000..139db8d09
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/cargo_runner.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::UnitTestingConfig;
+use move_command_line_common::files::find_filenames;
+use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
+
+pub fn run_tests_with_config_and_filter(
+    mut config: UnitTestingConfig,
+    root_path: &str,
+    source_pattern: &str,
+    dep_root: Option<&str>,
+    native_function_table: Option<NativeFunctionTable>,
+    cost_table: Option<CostTable>,
+) {
+    let get_files = |root_path, pat| {
+        let source_re = regex::Regex::new(pat)
+            .unwrap_or_else(|_| panic!("Invalid regular expression: '{}'", pat));
+        find_filenames(&[root_path], |path| {
+            source_re.is_match(&path.to_string_lossy())
+        })
+        .unwrap()
+    };
+
+    let sources = get_files(root_path, source_pattern);
+    let deps = dep_root
+        .map(|root| get_files(root, r".*\.move$"))
+        .unwrap_or_default();
+
+    config.source_files = sources;
+    config.dep_files = deps;
+    let test_plan = config.build_test_plan().expect("Unable to build test plan");
+
+    let (_, all_tests_passed) = config
+        .run_and_report_unit_tests(
+            test_plan,
+            native_function_table,
+            cost_table,
+            std::io::stdout(),
+        )
+        .expect("Failed to execute tests");
+
+    // If all tests passed, exit with 0 otherwise with a non-zero exit code.
+    if all_tests_passed {
+        std::process::exit(0)
+    } else {
+        std::process::exit(1)
+    }
+}
+
+#[macro_export]
+macro_rules! register_move_unit_tests {
+    ($config:expr, $root:expr, $pattern:expr) => {
+        #[test]
+        fn move_unit_tests() {
+            $crate::cargo_runner::run_tests_with_config_and_filter(
+                $config, $root, $pattern, None, None,
+            )
+        }
+    };
+    (
+        $config:expr, $root:expr, $source_pattern:expr, $dep_root:expr, $native_function_table:expr
+    ) => {
+        #[test]
+        fn move_unit_tests() {
+            $crate::cargo_runner::run_tests_with_config_and_filter(
+                $config,
+                $root,
+                $source_pattern,
+                Some($dep_root),
+                $native_function_table,
+            )
+        }
+    };
+}
diff --git a/vendors/move/crates/tools/move-unit-test/src/extensions.rs b/vendors/move/crates/tools/move-unit-test/src/extensions.rs
new file mode 100644
index 000000000..09771d4f8
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/extensions.rs
@@ -0,0 +1,121 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module manages native extensions supported by the unit testing framework.
+//! Such extensions are enabled by cfg features and must be compiled into the test
+//! to be usable.
+
+#[cfg(feature = "table-extension")]
+use itertools::Itertools;
+#[cfg(feature = "table-extension")]
+use move_table_extension::NativeTableContext;
+use move_vm_runtime::native_extensions::NativeContextExtensions;
+#[cfg(feature = "table-extension")]
+use move_vm_test_utils::BlankStorage;
+use once_cell::sync::Lazy;
+use std::{fmt::Write, sync::Mutex};
+
+static EXTENSION_HOOK: Lazy<
+    Mutex<Option<Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>>>,
+> = Lazy::new(|| Mutex::new(None));
+
+/// Sets a hook which is called to populate additional native extensions. This can be used to
+/// get extensions living outside of the Move repo into the unit testing environment.
+///
+/// This need to be called with the extensions of the custom Move environment at two places:
+///
+/// (a) At start of a custom Move CLI, to enable unit testing with the additional
+/// extensions;
+/// (b) Before `cli::run_move_unit_tests` if unit tests are called programmatically from Rust.
+/// You may want to define a new function `my_cli::run_move_unit_tests` which does this.
+///
+/// Note that the table extension is handled already internally, and does not need to added via
+/// this hook.
+pub fn set_extension_hook(p: Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>) {
+    *EXTENSION_HOOK.lock().unwrap() = Some(p)
+}
+
+/// Create all available native context extensions.
+#[allow(unused_mut, clippy::let_and_return)]
+pub(crate) fn new_extensions<'a>() -> NativeContextExtensions<'a> {
+    let mut e = NativeContextExtensions::default();
+    if let Some(h) = &*EXTENSION_HOOK.lock().unwrap() {
+        (*h)(&mut e)
+    }
+    #[cfg(feature = "table-extension")]
+    create_table_extension(&mut e);
+    e
+}
+
+/// Print the change sets for available native context extensions.
+#[allow(unused)]
+pub(crate) fn print_change_sets<W: Write>(_w: &mut W, mut extensions: NativeContextExtensions) {
+    #[cfg(feature = "table-extension")]
+    print_table_extension(_w, &mut extensions);
+}
+
+// =============================================================================================
+// Table Extensions
+
+#[cfg(feature = "table-extension")]
+fn create_table_extension(extensions: &mut NativeContextExtensions) {
+    extensions.add(NativeTableContext::new([0u8; 32], &*DUMMY_RESOLVER));
+}
+
+#[cfg(feature = "table-extension")]
+fn print_table_extension<W: Write>(w: &mut W, extensions: &mut NativeContextExtensions) {
+    let cs = extensions.remove::<NativeTableContext>().into_change_set();
+    if let Ok(cs) = cs {
+        if !cs.new_tables.is_empty() {
+            writeln!(
+                w,
+                "new tables {}",
+                cs.new_tables
+                    .iter()
+                    .map(|(k, v)| format!("{}<{},{}>", k, v.key_type, v.value_type))
+                    .join(", ")
+            )
+            .unwrap();
+        }
+        if !cs.removed_tables.is_empty() {
+            writeln!(
+                w,
+                "removed tables {}",
+                cs.removed_tables.iter().map(|h| h.to_string()).join(", ")
+            )
+            .unwrap();
+        }
+        for (h, c) in cs.changes {
+            writeln!(w, "for {}", h).unwrap();
+            for (k, v) in c.entries {
+                writeln!(w, "  {:X?} := {:X?}", k, v).unwrap();
+            }
+        }
+    }
+}
+
+#[cfg(feature = "table-extension")]
+static DUMMY_RESOLVER: Lazy<BlankStorage> = Lazy::new(|| BlankStorage);
+
+#[cfg(test)]
+mod tests {
+    use crate::extensions::{new_extensions, set_extension_hook};
+    use better_any::{Tid, TidAble};
+    use move_vm_runtime::native_extensions::NativeContextExtensions;
+
+    /// A test that extension hooks work as expected.
+    #[test]
+    fn test_extension_hook() {
+        set_extension_hook(Box::new(my_hook));
+        let ext = new_extensions();
+        let _e = ext.get::<TestExtension>();
+    }
+
+    #[derive(Tid)]
+    struct TestExtension();
+
+    fn my_hook(ext: &mut NativeContextExtensions) {
+        ext.add(TestExtension())
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/src/lib.rs b/vendors/move/crates/tools/move-unit-test/src/lib.rs
new file mode 100644
index 000000000..f7a51d458
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/lib.rs
@@ -0,0 +1,275 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod cargo_runner;
+pub mod extensions;
+pub mod test_reporter;
+pub mod test_runner;
+
+use crate::test_runner::TestRunner;
+use clap::*;
+use move_command_line_common::files::verify_and_create_named_address_mapping;
+use move_compiler::{
+    self,
+    diagnostics::{self, codes::Severity},
+    shared::{self, NumericalAddress},
+    unit_test::{self, TestPlan},
+    Compiler, Flags, PASS_CFGIR,
+};
+use move_core_types::language_storage::ModuleId;
+use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    collections::BTreeMap,
+    io::{Result, Write},
+    marker::Send,
+    sync::Mutex,
+};
+
+/// The default value bounding the amount of gas consumed in a test.
+const DEFAULT_EXECUTION_BOUND: u64 = 1_000_000;
+
+#[derive(Debug, Parser, Clone)]
+#[clap(author, version, about)]
+pub struct UnitTestingConfig {
+    /// Bound the gas limit for any one test. If using custom gas table, this is the max number of instructions.
+    #[clap(name = "gas_limit", short = 'i', long = "gas_limit")]
+    pub gas_limit: Option<u64>,
+
+    /// A filter string to determine which unit tests to run
+    #[clap(name = "filter", short = 'f', long = "filter")]
+    pub filter: Option<String>,
+
+    /// List all tests
+    #[clap(name = "list", short = 'l', long = "list")]
+    pub list: bool,
+
+    /// Number of threads to use for running tests.
+    #[clap(
+        name = "num_threads",
+        default_value = "8",
+        short = 't',
+        long = "threads"
+    )]
+    pub num_threads: usize,
+
+    /// Dependency files
+    #[clap(
+        name = "dependencies",
+        long = "dependencies",
+        short = 'd',
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub dep_files: Vec<String>,
+
+    /// Report test statistics at the end of testing
+    #[clap(name = "report_statistics", short = 's', long = "statistics")]
+    pub report_statistics: bool,
+
+    /// Show the storage state at the end of execution of a failing test
+    #[clap(name = "global_state_on_error", short = 'g', long = "state_on_error")]
+    pub report_storage_on_error: bool,
+
+    #[clap(
+        name = "report_stacktrace_on_abort",
+        short = 'r',
+        long = "stacktrace_on_abort"
+    )]
+    pub report_stacktrace_on_abort: bool,
+
+    /// Ignore compiler's warning, and continue run tests
+    #[clap(name = "ignore_compile_warnings", long = "ignore_compile_warnings")]
+    pub ignore_compile_warnings: bool,
+
+    /// Named address mapping
+    #[clap(
+        name = "NAMED_ADDRESSES",
+        short = 'a',
+        long = "addresses",
+        parse(try_from_str = shared::parse_named_address)
+    )]
+    pub named_address_values: Vec<(String, NumericalAddress)>,
+
+    /// Source files
+    #[clap(
+        name = "sources",
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    pub source_files: Vec<String>,
+
+    /// Use the stackless bytecode interpreter to run the tests and cross check its results with
+    /// the execution result from Move VM.
+    #[clap(long = "stackless")]
+    pub check_stackless_vm: bool,
+
+    /// Verbose mode
+    #[clap(short = 'v', long = "verbose")]
+    pub verbose: bool,
+
+    /// Whether the test output need to be printed out.
+    #[clap(short = 'v', long = "verbose")]
+    pub report_writeset: bool,
+
+    /// Use the EVM-based execution backend.
+    /// Does not work with --stackless.
+    #[cfg(feature = "evm-backend")]
+    #[clap(long = "evm")]
+    pub evm: bool,
+}
+
+fn format_module_id(module_id: &ModuleId) -> String {
+    format!(
+        "0x{}::{}",
+        module_id.address().short_str_lossless(),
+        module_id.name()
+    )
+}
+
+impl UnitTestingConfig {
+    /// Create a unit testing config for use with `register_move_unit_tests`
+    pub fn default_with_bound(bound: Option<u64>) -> Self {
+        Self {
+            gas_limit: bound.or(Some(DEFAULT_EXECUTION_BOUND)),
+            filter: None,
+            num_threads: 8,
+            report_statistics: false,
+            report_storage_on_error: false,
+            report_stacktrace_on_abort: false,
+            ignore_compile_warnings: false,
+            source_files: vec![],
+            dep_files: vec![],
+            check_stackless_vm: false,
+            verbose: false,
+            list: false,
+            named_address_values: vec![],
+            report_writeset: false,
+
+            #[cfg(feature = "evm-backend")]
+            evm: false,
+        }
+    }
+
+    pub fn with_named_addresses(
+        mut self,
+        named_address_values: BTreeMap<String, NumericalAddress>,
+    ) -> Self {
+        assert!(self.named_address_values.is_empty());
+        self.named_address_values = named_address_values.into_iter().collect();
+        self
+    }
+
+    fn compile_to_test_plan(
+        &self,
+        source_files: Vec<String>,
+        deps: Vec<String>,
+    ) -> Option<TestPlan> {
+        let addresses =
+            verify_and_create_named_address_mapping(self.named_address_values.clone()).ok()?;
+        let (files, comments_and_compiler_res) =
+            Compiler::from_files(source_files, deps, addresses)
+                .set_flags(Flags::testing())
+                .run::<PASS_CFGIR>()
+                .unwrap();
+        let (_, compiler) =
+            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
+
+        let (mut compiler, cfgir) = compiler.into_ast();
+        let compilation_env = compiler.compilation_env();
+        let test_plan = unit_test::plan_builder::construct_test_plan(compilation_env, None, &cfgir);
+
+        if let Err(diags) = compilation_env.check_diags_at_or_above_severity(
+            if self.ignore_compile_warnings {
+                Severity::NonblockingError
+            } else {
+                Severity::Warning
+            },
+        ) {
+            diagnostics::report_diagnostics(&files, diags);
+        }
+
+        let compilation_result = compiler.at_cfgir(cfgir).build();
+
+        let (units, warnings) =
+            diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
+        diagnostics::report_warnings(&files, warnings);
+        test_plan.map(|tests| TestPlan::new(tests, files, units))
+    }
+
+    /// Build a test plan from a unit test config
+    pub fn build_test_plan(&self) -> Option<TestPlan> {
+        let deps = self.dep_files.clone();
+
+        let TestPlan {
+            files, module_info, ..
+        } = self.compile_to_test_plan(deps.clone(), vec![])?;
+
+        let mut test_plan = self.compile_to_test_plan(self.source_files.clone(), deps)?;
+        test_plan.module_info.extend(module_info.into_iter());
+        test_plan.files.extend(files.into_iter());
+        Some(test_plan)
+    }
+
+    /// Public entry point to Move unit testing as a library
+    /// Returns `true` if all unit tests passed. Otherwise, returns `false`.
+    pub fn run_and_report_unit_tests<W: Write + Send>(
+        &self,
+        test_plan: TestPlan,
+        native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
+        writer: W,
+    ) -> Result<(W, bool)> {
+        let shared_writer = Mutex::new(writer);
+
+        if self.list {
+            for (module_id, test_plan) in &test_plan.module_tests {
+                for test_name in test_plan.tests.keys() {
+                    writeln!(
+                        shared_writer.lock().unwrap(),
+                        "{}::{}: test",
+                        format_module_id(module_id),
+                        test_name
+                    )?;
+                }
+            }
+            return Ok((shared_writer.into_inner().unwrap(), true));
+        }
+
+        writeln!(shared_writer.lock().unwrap(), "Running Move unit tests")?;
+        let mut test_runner = TestRunner::new(
+            self.gas_limit.unwrap_or(DEFAULT_EXECUTION_BOUND),
+            self.num_threads,
+            self.report_storage_on_error,
+            self.report_stacktrace_on_abort,
+            test_plan,
+            native_function_table,
+            cost_table,
+            self.report_writeset,
+            #[cfg(feature = "evm-backend")]
+            self.evm,
+        )
+        .unwrap();
+
+        if let Some(filter_str) = &self.filter {
+            test_runner.filter(filter_str)
+        }
+
+        let test_results = test_runner.run(&shared_writer).unwrap();
+        if self.report_statistics {
+            test_results.report_statistics(&shared_writer)?;
+        }
+
+        if self.report_writeset {
+            test_results.report_goldens(&shared_writer)?;
+        }
+
+        let ok = test_results.summarize(&shared_writer)?;
+
+        let writer = shared_writer.into_inner().unwrap();
+        Ok((writer, ok))
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/src/main.rs b/vendors/move/crates/tools/move-unit-test/src/main.rs
new file mode 100644
index 000000000..f3521bcc2
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/main.rs
@@ -0,0 +1,16 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::*;
+use move_unit_test::UnitTestingConfig;
+
+pub fn main() {
+    let args = UnitTestingConfig::parse();
+
+    let test_plan = args.build_test_plan();
+    if let Some(test_plan) = test_plan {
+        args.run_and_report_unit_tests(test_plan, None, None, std::io::stdout())
+            .unwrap();
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/src/test_reporter.rs b/vendors/move/crates/tools/move-unit-test/src/test_reporter.rs
new file mode 100644
index 000000000..52918c1a6
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/test_reporter.rs
@@ -0,0 +1,605 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::format_module_id;
+use codespan_reporting::files::{Files, SimpleFiles};
+use colored::{control, Colorize};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{ExecutionState, Location, VMError, VMResult},
+};
+use move_command_line_common::files::FileHash;
+pub use move_compiler::unit_test::ExpectedMoveError as MoveError;
+use move_compiler::{
+    diagnostics::{self, Diagnostic, Diagnostics},
+    unit_test::{ModuleTestPlan, TestName, TestPlan},
+};
+use move_core_types::{effects::ChangeSet, language_storage::ModuleId, vm_status::StatusType};
+use move_ir_types::location::Loc;
+use move_symbol_pool::Symbol;
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    io::{Result, Write},
+    sync::Mutex,
+    time::Duration,
+};
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub enum FailureReason {
+    // Expected to error, but it didn't
+    NoError(String),
+    // Aborted with the wrong code
+    WrongError(String, MoveError, MoveError),
+    // Aborted with the wrong code, without location specified
+    WrongAbortDEPRECATED(String, u64, MoveError),
+    // Error wasn't expected, but it did
+    UnexpectedError(String, MoveError),
+    // Test timed out
+    Timeout(String),
+    // The execution results of the Move VM and stackless VM does not match
+    Mismatch {
+        move_vm_return_values: Box<VMResult<Vec<Vec<u8>>>>,
+        move_vm_change_set: Box<VMResult<ChangeSet>>,
+        stackless_vm_return_values: Box<VMResult<Vec<Vec<u8>>>>,
+        stackless_vm_change_set: Box<VMResult<ChangeSet>>,
+    },
+    // Property checking failed
+    Property(String),
+
+    // Failed to compile Move code into EVM bytecode.
+    #[cfg(feature = "evm-backend")]
+    MoveToEVMError(String),
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct TestFailure {
+    pub test_run_info: TestRunInfo,
+    pub vm_error: Option<VMError>,
+    pub failure_reason: FailureReason,
+    pub storage_state: Option<String>,
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct TestRunInfo {
+    pub function_ident: String,
+    pub elapsed_time: Duration,
+    pub instructions_executed: u64,
+}
+
+#[derive(Debug, Clone)]
+pub struct TestStatistics {
+    passed: BTreeMap<ModuleId, BTreeSet<TestRunInfo>>,
+    failed: BTreeMap<ModuleId, BTreeSet<TestFailure>>,
+    output: BTreeMap<ModuleId, BTreeMap<TestName, String>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct TestResults {
+    final_statistics: TestStatistics,
+    test_plan: TestPlan,
+}
+
+impl TestRunInfo {
+    pub fn new(function_ident: String, elapsed_time: Duration, instructions_executed: u64) -> Self {
+        Self {
+            function_ident,
+            elapsed_time,
+            instructions_executed,
+        }
+    }
+}
+
+impl FailureReason {
+    pub fn no_error() -> Self {
+        FailureReason::NoError("Test did not error as expected".to_string())
+    }
+
+    pub fn wrong_error(expected: MoveError, actual: MoveError) -> Self {
+        FailureReason::WrongError(
+            "Test did not error as expected".to_string(),
+            expected,
+            actual,
+        )
+    }
+
+    pub fn wrong_abort_deprecated(expected: u64, actual: MoveError) -> Self {
+        FailureReason::WrongAbortDEPRECATED(
+            "Test did not abort with expected code".to_string(),
+            expected,
+            actual,
+        )
+    }
+
+    pub fn unexpected_error(error: MoveError) -> Self {
+        FailureReason::UnexpectedError("Test was not expected to error".to_string(), error)
+    }
+
+    pub fn timeout() -> Self {
+        FailureReason::Timeout("Test timed out".to_string())
+    }
+
+    pub fn mismatch(
+        move_vm_return_values: VMResult<Vec<Vec<u8>>>,
+        move_vm_change_set: VMResult<ChangeSet>,
+        stackless_vm_return_values: VMResult<Vec<Vec<u8>>>,
+        stackless_vm_change_set: VMResult<ChangeSet>,
+    ) -> Self {
+        FailureReason::Mismatch {
+            move_vm_return_values: Box::new(move_vm_return_values),
+            move_vm_change_set: Box::new(move_vm_change_set),
+            stackless_vm_return_values: Box::new(stackless_vm_return_values),
+            stackless_vm_change_set: Box::new(stackless_vm_change_set),
+        }
+    }
+
+    pub fn property(details: String) -> Self {
+        FailureReason::Property(details)
+    }
+
+    #[cfg(feature = "evm-backend")]
+    pub fn move_to_evm_error(diagnostics: String) -> Self {
+        FailureReason::MoveToEVMError(diagnostics)
+    }
+}
+
+impl TestFailure {
+    pub fn new(
+        failure_reason: FailureReason,
+        test_run_info: TestRunInfo,
+        vm_error: Option<VMError>,
+        storage_state: Option<String>,
+    ) -> Self {
+        Self {
+            test_run_info,
+            vm_error,
+            failure_reason,
+            storage_state,
+        }
+    }
+
+    pub fn render_error(&self, test_plan: &TestPlan) -> String {
+        let error_string = match &self.failure_reason {
+            FailureReason::NoError(message) => message.to_string(),
+            FailureReason::Timeout(message) => message.to_string(),
+            FailureReason::WrongError(message, expected, actual) => {
+                let base_message = format!(
+                    "{message}. Expected test {} but instead it {} rooted here",
+                    expected.verbiage(/* is_past_tense */ false),
+                    actual.verbiage(/* is_past_tense */ true),
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            },
+            FailureReason::WrongAbortDEPRECATED(message, expected_code, actual) => {
+                let base_message = format!(
+                    "{}. \
+                    Expected test to abort with code {}, but instead it {} rooted here",
+                    message,
+                    expected_code,
+                    actual.verbiage(/* is_past_tense */ true),
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            },
+            FailureReason::UnexpectedError(message, error) => {
+                let prefix = match error.0.status_type() {
+                    StatusType::Validation => "INTERNAL TEST ERROR: Unexpected Validation Error\n",
+                    StatusType::Verification => {
+                        "INTERNAL TEST ERROR: Unexpected Verification Error\n"
+                    },
+                    StatusType::InvariantViolation => {
+                        "INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION.\n"
+                    },
+                    StatusType::Deserialization => {
+                        "INTERNAL TEST ERROR: Unexpected Deserialization Error\n"
+                    },
+                    StatusType::Unknown => "INTERNAL TEST ERROR: UNKNOWN ERROR.\n",
+                    // execution errors are expected, so no message
+                    StatusType::Execution => "",
+                };
+                let base_message = format!(
+                    "{}{}, but it {} rooted here",
+                    prefix,
+                    message,
+                    error.verbiage(/* is_past_tense */ true)
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            },
+            FailureReason::Mismatch {
+                move_vm_return_values,
+                move_vm_change_set,
+                stackless_vm_return_values,
+                stackless_vm_change_set,
+            } => {
+                format!(
+                    "Executions via Move VM [M] and stackless VM [S] yield different results.\n\
+                    [M] - return values: {:?}\n\
+                    [S] - return values: {:?}\n\
+                    [M] - change set: {:?}\n\
+                    [S] - change set: {:?}\n\
+                    ",
+                    move_vm_return_values,
+                    stackless_vm_return_values,
+                    move_vm_change_set,
+                    stackless_vm_change_set
+                )
+            },
+            FailureReason::Property(message) => message.clone(),
+
+            #[cfg(feature = "evm-backend")]
+            FailureReason::MoveToEVMError(diagnostics) => {
+                format!(
+                    "Failed to compile Move code into EVM bytecode.\n\n{}",
+                    diagnostics
+                )
+            },
+        };
+
+        match &self.storage_state {
+            None => error_string,
+            Some(storage_state) => {
+                format!(
+                    "{}\n────── Storage state at point of failure ──────\n{}",
+                    error_string,
+                    if storage_state.is_empty() {
+                        "<empty>"
+                    } else {
+                        storage_state
+                    }
+                )
+            },
+        }
+    }
+
+    fn get_line_number(
+        loc: &Loc,
+        files: &SimpleFiles<Symbol, &str>,
+        file_mapping: &HashMap<FileHash, usize>,
+    ) -> String {
+        Self::get_line_number_internal(loc, files, file_mapping)
+            .unwrap_or_else(|_| "no_source_line".to_string())
+    }
+
+    fn get_line_number_internal(
+        loc: &Loc,
+        files: &SimpleFiles<Symbol, &str>,
+        file_mapping: &HashMap<FileHash, usize>,
+    ) -> std::result::Result<String, codespan_reporting::files::Error> {
+        let id = file_mapping
+            .get(&loc.file_hash())
+            .ok_or(codespan_reporting::files::Error::FileMissing)?;
+        let start_line_index = files.line_index(*id, loc.start() as usize)?;
+        let start_line_number = files.line_number(*id, start_line_index)?;
+        let end_line_index = files.line_index(*id, loc.end() as usize)?;
+        let end_line_number = files.line_number(*id, end_line_index)?;
+        if start_line_number == end_line_number {
+            Ok(start_line_number.to_string())
+        } else {
+            Ok(format!("{}-{}", start_line_number, end_line_number))
+        }
+    }
+
+    fn report_exec_state(test_plan: &TestPlan, exec_state: &ExecutionState) -> String {
+        let stack_trace = exec_state.stack_trace();
+        let mut buf = String::new();
+        if !stack_trace.is_empty() {
+            buf.push_str("stack trace\n");
+            let mut files = SimpleFiles::new();
+            let mut file_mapping = HashMap::new();
+            for (fhash, (fname, source)) in &test_plan.files {
+                let id = files.add(*fname, source.as_str());
+                file_mapping.insert(*fhash, id);
+            }
+
+            for frame in stack_trace {
+                let module_id = match &frame.0 {
+                    Some(v) => v,
+                    None => return "\tmalformed stack trace (no module ID)".to_string(),
+                };
+                let named_module = match test_plan.module_info.get(module_id) {
+                    Some(v) => v,
+                    None => return "\tmalformed stack trace (no module)".to_string(),
+                };
+                let function_source_map =
+                    match named_module.source_map.get_function_source_map(frame.1) {
+                        Ok(v) => v,
+                        Err(_) => return "\tmalformed stack trace (no source map)".to_string(),
+                    };
+                // unwrap here is a mirror of the same unwrap in report_error_with_location
+                let loc = function_source_map.get_code_location(frame.2).unwrap();
+                let fn_handle_idx = named_module.module.function_def_at(frame.1).function;
+                let fn_id_idx = named_module.module.function_handle_at(fn_handle_idx).name;
+                let fn_name = named_module.module.identifier_at(fn_id_idx).as_str();
+                let file_name = match test_plan.files.get(&loc.file_hash()) {
+                    Some(v) => format!("{}", v.0),
+                    None => "unknown_source".to_string(),
+                };
+                buf.push_str(
+                    &format!(
+                        "\t{}::{}({}:{})\n",
+                        module_id.name(),
+                        fn_name,
+                        file_name,
+                        Self::get_line_number(&loc, &files, &file_mapping)
+                    )
+                    .to_string(),
+                );
+            }
+        }
+        buf
+    }
+
+    fn report_error_with_location(
+        test_plan: &TestPlan,
+        base_message: String,
+        vm_error: &Option<VMError>,
+    ) -> String {
+        let report_diagnostics = if control::SHOULD_COLORIZE.should_colorize() {
+            diagnostics::report_diagnostics_to_color_buffer
+        } else {
+            diagnostics::report_diagnostics_to_buffer
+        };
+
+        let vm_error = match vm_error {
+            None => return base_message,
+            Some(vm_error) => vm_error,
+        };
+
+        let diags = match vm_error.location() {
+            Location::Module(module_id) => {
+                let diag_opt = vm_error.offsets().first().and_then(|(fdef_idx, offset)| {
+                    let function_source_map = test_plan
+                        .module_info
+                        .get(module_id)?
+                        .source_map
+                        .get_function_source_map(*fdef_idx)
+                        .ok()?;
+                    let loc = function_source_map.get_code_location(*offset).unwrap();
+                    let msg = format!("In this function in {}", format_module_id(module_id));
+                    // TODO(tzakian) maybe migrate off of move-langs diagnostics?
+                    Some(Diagnostic::new(
+                        diagnostics::codes::Tests::TestFailed,
+                        (loc, base_message.clone()),
+                        vec![(function_source_map.definition_location, msg)],
+                        std::iter::empty::<String>(),
+                    ))
+                });
+                match diag_opt {
+                    None => base_message,
+                    Some(diag) => String::from_utf8(report_diagnostics(
+                        &test_plan.files,
+                        Diagnostics::from(vec![diag]),
+                    ))
+                    .unwrap(),
+                }
+            },
+            _ => base_message,
+        };
+
+        match vm_error.exec_state() {
+            None => diags,
+            Some(exec_state) => {
+                let exec_state_str = Self::report_exec_state(test_plan, exec_state);
+                if exec_state_str.is_empty() {
+                    diags
+                } else {
+                    format!("{}\n{}", diags, exec_state_str)
+                }
+            },
+        }
+    }
+}
+
+impl TestStatistics {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            passed: BTreeMap::new(),
+            failed: BTreeMap::new(),
+            output: BTreeMap::new(),
+        }
+    }
+
+    pub fn test_failure(&mut self, test_failure: TestFailure, test_plan: &ModuleTestPlan) {
+        self.failed
+            .entry(test_plan.module_id.clone())
+            .or_insert_with(BTreeSet::new)
+            .insert(test_failure);
+    }
+
+    pub fn test_success(&mut self, test_info: TestRunInfo, test_plan: &ModuleTestPlan) {
+        self.passed
+            .entry(test_plan.module_id.clone())
+            .or_insert_with(BTreeSet::new)
+            .insert(test_info);
+    }
+
+    pub fn test_output(&mut self, test_name: TestName, test_plan: &ModuleTestPlan, output: String) {
+        self.output
+            .entry(test_plan.module_id.clone())
+            .or_insert_with(BTreeMap::new)
+            .insert(test_name, output);
+    }
+
+    pub fn combine(mut self, other: Self) -> Self {
+        for (module_id, test_result) in other.passed {
+            let entry = self.passed.entry(module_id).or_default();
+            entry.extend(test_result.into_iter());
+        }
+        for (module_id, test_result) in other.failed {
+            let entry = self.failed.entry(module_id).or_default();
+            entry.extend(test_result.into_iter());
+        }
+        for (module_id, test_output) in other.output {
+            let entry = self.output.entry(module_id).or_default();
+            entry.extend(test_output.into_iter());
+        }
+        self
+    }
+}
+
+impl TestResults {
+    pub fn new(final_statistics: TestStatistics, test_plan: TestPlan) -> Self {
+        Self {
+            final_statistics,
+            test_plan,
+        }
+    }
+
+    pub fn report_goldens<W: Write>(&self, writer: &Mutex<W>) -> Result<()> {
+        for (module_name, test_outputs) in self.final_statistics.output.iter() {
+            for (test_name, write_set) in test_outputs.iter() {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "{}::{}",
+                    format_module_id(module_name),
+                    test_name
+                )?;
+                writeln!(writer.lock().unwrap(), "Output: {}", write_set)?;
+            }
+        }
+        Ok(())
+    }
+
+    pub fn report_statistics<W: Write>(&self, writer: &Mutex<W>) -> Result<()> {
+        writeln!(writer.lock().unwrap(), "\nTest Statistics:\n")?;
+
+        let mut max_function_name_size = 0;
+        let mut stats = Vec::new();
+
+        for (module_id, test_results) in self.final_statistics.passed.iter() {
+            for test_result in test_results {
+                let qualified_function_name = format!(
+                    "{}::{}",
+                    format_module_id(module_id),
+                    test_result.function_ident
+                );
+                max_function_name_size =
+                    std::cmp::max(max_function_name_size, qualified_function_name.len());
+                stats.push((
+                    qualified_function_name,
+                    test_result.elapsed_time.as_secs_f32(),
+                    test_result.instructions_executed,
+                ))
+            }
+        }
+
+        for (module_id, test_failures) in self.final_statistics.failed.iter() {
+            for test_failure in test_failures {
+                let qualified_function_name = format!(
+                    "{}::{}",
+                    format_module_id(module_id),
+                    test_failure.test_run_info.function_ident
+                );
+                max_function_name_size =
+                    std::cmp::max(max_function_name_size, qualified_function_name.len());
+                stats.push((
+                    qualified_function_name,
+                    test_failure.test_run_info.elapsed_time.as_secs_f32(),
+                    test_failure.test_run_info.instructions_executed,
+                ));
+            }
+        }
+
+        if !stats.is_empty() {
+            writeln!(
+                writer.lock().unwrap(),
+                "┌─{:─^width$}─┬─{:─^10}─┬─{:─^25}─┐",
+                "",
+                "",
+                "",
+                width = max_function_name_size,
+            )?;
+            writeln!(
+                writer.lock().unwrap(),
+                "│ {name:^width$} │ {time:^10} │ {instructions:^25} │",
+                width = max_function_name_size,
+                name = "Test Name",
+                time = "Time",
+                instructions = "Gas Used"
+            )?;
+
+            for (qualified_function_name, time, instructions) in stats {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "├─{:─^width$}─┼─{:─^10}─┼─{:─^25}─┤",
+                    "",
+                    "",
+                    "",
+                    width = max_function_name_size,
+                )?;
+                writeln!(
+                    writer.lock().unwrap(),
+                    "│ {name:<width$} │ {time:^10.3} │ {instructions:^25} │",
+                    name = qualified_function_name,
+                    width = max_function_name_size,
+                    time = time,
+                    instructions = instructions,
+                )?;
+            }
+
+            writeln!(
+                writer.lock().unwrap(),
+                "└─{:─^width$}─┴─{:─^10}─┴─{:─^25}─┘",
+                "",
+                "",
+                "",
+                width = max_function_name_size,
+            )?;
+        }
+
+        writeln!(writer.lock().unwrap())
+    }
+
+    /// Returns `true` if all tests passed, `false` if there was a test failure/timeout
+    pub fn summarize<W: Write>(self, writer: &Mutex<W>) -> Result<bool> {
+        let num_failed_tests = self
+            .final_statistics
+            .failed
+            .iter()
+            .fold(0, |acc, (_, fns)| acc + fns.len()) as u64;
+        let num_passed_tests = self
+            .final_statistics
+            .passed
+            .iter()
+            .fold(0, |acc, (_, fns)| acc + fns.len()) as u64;
+        if !self.final_statistics.failed.is_empty() {
+            writeln!(writer.lock().unwrap(), "\nTest failures:\n")?;
+            for (module_id, test_failures) in &self.final_statistics.failed {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "Failures in {}:",
+                    format_module_id(module_id)
+                )?;
+                for test_failure in test_failures {
+                    writeln!(
+                        writer.lock().unwrap(),
+                        "\n┌── {} ──────",
+                        test_failure.test_run_info.function_ident.bold()
+                    )?;
+                    writeln!(
+                        writer.lock().unwrap(),
+                        "│ {}",
+                        test_failure
+                            .render_error(&self.test_plan)
+                            .replace('\n', "\n│ ")
+                    )?;
+                    writeln!(writer.lock().unwrap(), "└──────────────────\n")?;
+                }
+            }
+        }
+
+        writeln!(
+            writer.lock().unwrap(),
+            "Test result: {}. Total tests: {}; passed: {}; failed: {}",
+            if num_failed_tests == 0 {
+                "OK".bold().bright_green()
+            } else {
+                "FAILED".bold().bright_red()
+            },
+            num_passed_tests + num_failed_tests,
+            num_passed_tests,
+            num_failed_tests
+        )?;
+        Ok(num_failed_tests == 0)
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/src/test_runner.rs b/vendors/move/crates/tools/move-unit-test/src/test_runner.rs
new file mode 100644
index 000000000..08d427bf8
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/src/test_runner.rs
@@ -0,0 +1,674 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    extensions, format_module_id,
+    test_reporter::{
+        FailureReason, MoveError, TestFailure, TestResults, TestRunInfo, TestStatistics,
+    },
+};
+use anyhow::Result;
+use colored::*;
+use move_binary_format::{errors::VMResult, file_format::CompiledModule};
+use move_bytecode_utils::Modules;
+use move_compiler::unit_test::{ExpectedFailure, ModuleTestPlan, TestCase, TestPlan};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Op},
+    identifier::IdentStr,
+    value::serialize_values,
+    vm_status::StatusCode,
+};
+use move_resource_viewer::MoveValueAnnotator;
+use move_vm_runtime::{
+    move_vm::MoveVM, native_extensions::NativeContextExtensions,
+    native_functions::NativeFunctionTable,
+};
+use move_vm_test_utils::{
+    gas_schedule::{zero_cost_schedule, CostTable, Gas, GasCost, GasStatus},
+    InMemoryStorage,
+};
+use rayon::prelude::*;
+use std::{io::Write, marker::Send, sync::Mutex, time::Instant};
+#[cfg(feature = "evm-backend")]
+use {
+    evm::{backend::MemoryVicinity, ExitReason},
+    evm_exec_utils::exec::{ExecuteResult, Executor},
+    move_to_yul,
+    primitive_types::{H160, U256},
+    std::convert::TryInto,
+    std::time::Duration,
+};
+
+/// Test state common to all tests
+pub struct SharedTestingConfig {
+    save_storage_state_on_failure: bool,
+    report_stacktrace_on_abort: bool,
+    execution_bound: u64,
+    cost_table: CostTable,
+    native_function_table: NativeFunctionTable,
+    starting_storage_state: InMemoryStorage,
+    #[allow(dead_code)] // used by some features
+    source_files: Vec<String>,
+    record_writeset: bool,
+
+    #[cfg(feature = "evm-backend")]
+    evm: bool,
+}
+
+pub struct TestRunner {
+    num_threads: usize,
+    testing_config: SharedTestingConfig,
+    tests: TestPlan,
+}
+
+/// A gas schedule where every instruction has a cost of "1". This is used to bound execution of a
+/// test to a certain number of ticks.
+fn unit_cost_table() -> CostTable {
+    let mut cost_schedule = zero_cost_schedule();
+    cost_schedule.instruction_table.iter_mut().for_each(|cost| {
+        *cost = GasCost::new(1, 1);
+    });
+    cost_schedule
+}
+
+/// Setup storage state with the set of modules that will be needed for all tests
+fn setup_test_storage<'a>(
+    modules: impl Iterator<Item = &'a CompiledModule>,
+) -> Result<InMemoryStorage> {
+    let mut storage = InMemoryStorage::new();
+    let modules = Modules::new(modules);
+    for module in modules
+        .compute_dependency_graph()
+        .compute_topological_order()?
+    {
+        let module_id = module.self_id();
+        let mut module_bytes = Vec::new();
+        module.serialize(&mut module_bytes)?;
+        storage.publish_or_overwrite_module(module_id, module_bytes);
+    }
+
+    Ok(storage)
+}
+
+/// Print the updates to storage represented by `cs` in the context of the starting storage state
+/// `storage`.
+fn print_resources_and_extensions(
+    cs: &ChangeSet,
+    extensions: NativeContextExtensions,
+    storage: &InMemoryStorage,
+) -> Result<String> {
+    use std::fmt::Write;
+    let mut buf = String::new();
+    let annotator = MoveValueAnnotator::new(storage);
+    for (account_addr, account_state) in cs.accounts() {
+        writeln!(&mut buf, "0x{}:", account_addr.short_str_lossless())?;
+
+        for (tag, resource_op) in account_state.resources() {
+            if let Op::New(resource) | Op::Modify(resource) = resource_op {
+                writeln!(
+                    &mut buf,
+                    "\t{}",
+                    format!("=> {}", annotator.view_resource(tag, resource)?).replace('\n', "\n\t")
+                )?;
+            }
+        }
+    }
+    extensions::print_change_sets(&mut buf, extensions);
+
+    Ok(buf)
+}
+
+impl TestRunner {
+    pub fn new(
+        execution_bound: u64,
+        num_threads: usize,
+        save_storage_state_on_failure: bool,
+        report_stacktrace_on_abort: bool,
+        tests: TestPlan,
+        // TODO: maybe we should require the clients to always pass in a list of native functions so
+        // we don't have to make assumptions about their gas parameters.
+        native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
+        record_writeset: bool,
+        #[cfg(feature = "evm-backend")] evm: bool,
+    ) -> Result<Self> {
+        let source_files = tests
+            .files
+            .values()
+            .map(|(filepath, _)| filepath.to_string())
+            .collect();
+        let modules = tests.module_info.values().map(|info| &info.module);
+        let starting_storage_state = setup_test_storage(modules)?;
+        let native_function_table = native_function_table.unwrap_or_else(|| {
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            )
+        });
+        Ok(Self {
+            testing_config: SharedTestingConfig {
+                save_storage_state_on_failure,
+                report_stacktrace_on_abort,
+                starting_storage_state,
+                execution_bound,
+                native_function_table,
+                // TODO: our current implementation uses a unit cost table to prevent programs from
+                // running indefinitely. This should probably be done in a different way, like halting
+                // after executing a certain number of instructions or setting a timer.
+                //
+                // From the API standpoint, we should let the client specify the cost table.
+                cost_table: cost_table.unwrap_or_else(unit_cost_table),
+                source_files,
+                record_writeset,
+                #[cfg(feature = "evm-backend")]
+                evm,
+            },
+            num_threads,
+            tests,
+        })
+    }
+
+    pub fn run<W: Write + Send>(self, writer: &Mutex<W>) -> Result<TestResults> {
+        rayon::ThreadPoolBuilder::new()
+            .num_threads(self.num_threads)
+            .build()
+            .unwrap()
+            .install(|| {
+                let final_statistics = self
+                    .tests
+                    .module_tests
+                    .par_iter()
+                    .map(|(_, test_plan)| self.testing_config.exec_module_tests(test_plan, writer))
+                    .reduce(TestStatistics::new, |acc, stats| acc.combine(stats));
+
+                Ok(TestResults::new(final_statistics, self.tests))
+            })
+    }
+
+    pub fn filter(&mut self, test_name_slice: &str) {
+        for (module_id, module_test) in self.tests.module_tests.iter_mut() {
+            if module_id.name().as_str().contains(test_name_slice) {
+                continue;
+            } else {
+                let tests = std::mem::take(&mut module_test.tests);
+                module_test.tests = tests
+                    .into_iter()
+                    .filter(|(test_name, _)| {
+                        let full_name =
+                            format!("{}::{}", module_id.name().as_str(), test_name.as_str());
+                        full_name.contains(test_name_slice)
+                    })
+                    .collect();
+            }
+        }
+    }
+}
+
+// TODO: do not expose this to backend implementations
+struct TestOutput<'a, 'b, W> {
+    test_plan: &'a ModuleTestPlan,
+    writer: &'b Mutex<W>,
+}
+
+impl<'a, 'b, W: Write> TestOutput<'a, 'b, W> {
+    fn pass(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {}    ] {}::{}",
+            "PASS".bold().bright_green(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name
+        )
+        .unwrap()
+    }
+
+    fn fail(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {}    ] {}::{}",
+            "FAIL".bold().bright_red(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name,
+        )
+        .unwrap()
+    }
+
+    fn timeout(&self, fn_name: &str) {
+        writeln!(
+            self.writer.lock().unwrap(),
+            "[ {} ] {}::{}",
+            "TIMEOUT".bold().bright_yellow(),
+            format_module_id(&self.test_plan.module_id),
+            fn_name,
+        )
+        .unwrap();
+    }
+}
+
+impl SharedTestingConfig {
+    fn execute_via_move_vm(
+        &self,
+        test_plan: &ModuleTestPlan,
+        function_name: &str,
+        test_info: &TestCase,
+    ) -> (
+        VMResult<ChangeSet>,
+        VMResult<NativeContextExtensions>,
+        VMResult<Vec<Vec<u8>>>,
+        TestRunInfo,
+    ) {
+        let move_vm = MoveVM::new(self.native_function_table.clone()).unwrap();
+        let extensions = extensions::new_extensions();
+        let mut session =
+            move_vm.new_session_with_extensions(&self.starting_storage_state, extensions);
+        let mut gas_meter = GasStatus::new(&self.cost_table, Gas::new(self.execution_bound));
+        // TODO: collect VM logs if the verbose flag (i.e, `self.verbose`) is set
+
+        let now = Instant::now();
+        let serialized_return_values_result = session.execute_function_bypass_visibility(
+            &test_plan.module_id,
+            IdentStr::new(function_name).unwrap(),
+            vec![], // no ty args, at least for now
+            serialize_values(test_info.arguments.iter()),
+            &mut gas_meter,
+        );
+        let mut return_result = serialized_return_values_result.map(|res| {
+            res.return_values
+                .into_iter()
+                .map(|(bytes, _layout)| bytes)
+                .collect()
+        });
+        if !self.report_stacktrace_on_abort {
+            if let Err(err) = &mut return_result {
+                err.remove_exec_state();
+            }
+        }
+        let test_run_info = TestRunInfo::new(
+            function_name.to_string(),
+            now.elapsed(),
+            // TODO(Gas): This doesn't look quite right...
+            //            We're not computing the number of instructions executed even with a unit gas schedule.
+            Gas::new(self.execution_bound)
+                .checked_sub(gas_meter.remaining_gas())
+                .unwrap()
+                .into(),
+        );
+        match session.finish_with_extensions() {
+            Ok((cs, _, extensions)) => (Ok(cs), Ok(extensions), return_result, test_run_info),
+            Err(err) => (Err(err.clone()), Err(err), return_result, test_run_info),
+        }
+    }
+
+    fn exec_module_tests_move_vm_and_stackless_vm(
+        &self,
+        test_plan: &ModuleTestPlan,
+        output: &TestOutput<impl Write>,
+    ) -> TestStatistics {
+        let mut stats = TestStatistics::new();
+
+        for (function_name, test_info) in &test_plan.tests {
+            let (cs_result, ext_result, exec_result, test_run_info) =
+                self.execute_via_move_vm(test_plan, function_name, test_info);
+
+            if self.record_writeset {
+                stats.test_output(
+                    function_name.to_string(),
+                    test_plan,
+                    format!("{:?}", cs_result),
+                );
+            }
+
+            let save_session_state = || {
+                if self.save_storage_state_on_failure {
+                    cs_result.ok().and_then(|changeset| {
+                        ext_result.ok().and_then(|extensions| {
+                            print_resources_and_extensions(
+                                &changeset,
+                                extensions,
+                                &self.starting_storage_state,
+                            )
+                            .ok()
+                        })
+                    })
+                } else {
+                    None
+                }
+            };
+            match exec_result {
+                Err(err) => {
+                    let actual_err =
+                        MoveError(err.major_status(), err.sub_status(), err.location().clone());
+                    assert!(err.major_status() != StatusCode::EXECUTED);
+                    match test_info.expected_failure.as_ref() {
+                        Some(ExpectedFailure::Expected) => {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        },
+                        Some(ExpectedFailure::ExpectedWithError(expected_err))
+                            if expected_err == &actual_err =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        },
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(code))
+                            if actual_err.0 == StatusCode::ABORTED
+                                && actual_err.1.is_some()
+                                && actual_err.1.unwrap() == *code =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        },
+                        // incorrect cases
+                        Some(ExpectedFailure::ExpectedWithError(expected_err)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_error(expected_err.clone(), actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        },
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(expected_code)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_abort_deprecated(
+                                        *expected_code,
+                                        actual_err,
+                                    ),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        },
+                        None if err.major_status() == StatusCode::OUT_OF_GAS => {
+                            // Ran out of ticks, report a test timeout and log a test failure
+                            output.timeout(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::timeout(),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        },
+                        None => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::unexpected_error(actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        },
+                    }
+                },
+                Ok(_) => {
+                    // Expected the test to fail, but it executed
+                    if test_info.expected_failure.is_some() {
+                        output.fail(function_name);
+                        stats.test_failure(
+                            TestFailure::new(
+                                FailureReason::no_error(),
+                                test_run_info,
+                                None,
+                                save_session_state(),
+                            ),
+                            test_plan,
+                        )
+                    } else {
+                        // Expected the test to execute fully and it did
+                        output.pass(function_name);
+                        stats.test_success(test_run_info, test_plan);
+                    }
+                },
+            }
+        }
+
+        stats
+    }
+
+    #[cfg(feature = "evm-backend")]
+    fn execute_via_evm(&self, yul_source: &str) -> (ExecuteResult, Duration) {
+        let (code, _) = evm_exec_utils::compile::solc_yul(yul_source, false).expect(
+            "Failed to compile yul source into EVM bytecode. This should not have happened.",
+        );
+
+        let vicinity = MemoryVicinity {
+            gas_price: 0.into(),
+            origin: H160::zero(),
+            chain_id: 0.into(),
+            block_hashes: vec![],
+            block_number: 0.into(),
+            block_coinbase: H160::zero(),
+            block_timestamp: 0.into(),
+            block_difficulty: 0.into(),
+            block_gas_limit: U256::MAX,
+            block_base_fee_per_gas: 0.into(),
+        };
+
+        let mut exec = Executor::new(&vicinity);
+
+        let now = Instant::now();
+        let res = exec.execute_custom_code(H160::zero(), H160::zero(), code, vec![]);
+        let elapsed = now.elapsed();
+
+        (res, elapsed)
+    }
+
+    #[cfg(feature = "evm-backend")]
+    fn exec_module_tests_evm(
+        &self,
+        test_plan: &ModuleTestPlan,
+        output: &TestOutput<impl Write>,
+    ) -> TestStatistics {
+        use move_binary_format::errors::Location;
+
+        let mut stats = TestStatistics::new();
+
+        // TODO: Somehow, paths of some temporary Move interface files are being passed in after those files
+        // have been removed. This is a dirty hack to work around the problem while we investigate the root
+        // cause.
+        let filtered_sources = self
+            .source_files
+            .iter()
+            .filter(|s| !s.contains("mv_interfaces"))
+            .cloned()
+            .collect::<Vec<_>>();
+
+        let model = run_model_builder_with_options_and_compilation_flags(
+            vec![PackagePaths {
+                name: None,
+                paths: filtered_sources,
+                named_address_map: self.named_address_values.clone(),
+            }],
+            vec![],
+            ModelBuilderOptions::default(),
+            Flags::testing(),
+        )
+        .unwrap_or_else(|e| panic!("Unable to build move model: {}", e));
+
+        if model.has_errors() {
+            panic!("Move model has errors");
+        }
+
+        let gen_options = move_to_yul::options::Options::default();
+        for (function_name, test_info) in &test_plan.tests {
+            let yul_code = match move_to_yul::generator::Generator::run_for_unit_test(
+                &gen_options,
+                &model,
+                &test_plan.module_id,
+                IdentStr::new(function_name).unwrap(),
+                &test_info.arguments,
+            ) {
+                Ok(yul_code) => yul_code,
+                Err(diagnostics) => {
+                    // Failed to generate yul code due to some user errors.
+                    // Mark test as failed.
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(
+                            FailureReason::move_to_evm_error(diagnostics),
+                            TestRunInfo::new(function_name.to_string(), Duration::ZERO, 0),
+                            None,
+                            None,
+                        ),
+                        test_plan,
+                    );
+                    return stats;
+                },
+            };
+
+            let (res, duration) = self.execute_via_evm(&yul_code);
+
+            let abort_code = || -> u64 {
+                assert!(res.return_value.len() == 8);
+
+                u64::from_be_bytes(res.return_value.as_slice().try_into().unwrap())
+            };
+
+            let test_run_info =
+                || -> TestRunInfo { TestRunInfo::new(function_name.to_string(), duration, 0) };
+
+            // TODO: gas/timeout
+            // TODO: arguments
+            // TODO: locations
+
+            match (test_info.expected_failure.as_ref(), &res.exit_reason) {
+                // Test expected to succeed or abort with a specific abort code, but ran into an internal error.
+                (
+                    None
+                    | Some(
+                        ExpectedFailure::ExpectedWithCodeDEPRECATED(_)
+                        | ExpectedFailure::ExpectedWithError(_),
+                    ),
+                    ExitReason::Revert(_),
+                ) if abort_code() == u64::MAX => {
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(
+                            FailureReason::unexpected_error(MoveError(
+                                StatusCode::UNKNOWN_STATUS,
+                                None,
+                                Location::Undefined,
+                            )),
+                            test_run_info(),
+                            None,
+                            None,
+                        ),
+                        test_plan,
+                    );
+                },
+
+                // Test expected to succeed, but aborted.
+                (None, ExitReason::Revert(_)) => {
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(
+                            FailureReason::unexpected_error(MoveError(
+                                StatusCode::ABORTED,
+                                Some(abort_code()),
+                                Location::Undefined,
+                            )),
+                            test_run_info(),
+                            None,
+                            None,
+                        ),
+                        test_plan,
+                    )
+                },
+
+                // Expect the test to abort with a specific code.
+                (
+                    Some(
+                        ExpectedFailure::ExpectedWithError(MoveError(_, Some(exp_abort_code), _))
+                        | ExpectedFailure::ExpectedWithCodeDEPRECATED(exp_abort_code),
+                    ),
+                    ExitReason::Revert(_),
+                ) => {
+                    let abort_code = abort_code();
+                    if abort_code == *exp_abort_code {
+                        output.pass(function_name);
+                        stats.test_success(test_run_info(), test_plan);
+                    } else {
+                        output.fail(function_name);
+                        stats.test_failure(
+                            TestFailure::new(
+                                FailureReason::wrong_abort_deprecated(
+                                    *exp_abort_code,
+                                    MoveError(
+                                        StatusCode::ABORTED,
+                                        Some(abort_code),
+                                        Location::Undefined,
+                                    ),
+                                ),
+                                test_run_info(),
+                                None,
+                                None,
+                            ),
+                            test_plan,
+                        );
+                    }
+                },
+
+                // Test expected to abort but succeeded.
+                (
+                    Some(
+                        ExpectedFailure::Expected
+                        | ExpectedFailure::ExpectedWithCodeDEPRECATED(_)
+                        | ExpectedFailure::ExpectedWithError(_),
+                    ),
+                    ExitReason::Succeed(_),
+                ) => {
+                    output.fail(function_name);
+                    stats.test_failure(
+                        TestFailure::new(FailureReason::no_error(), test_run_info(), None, None),
+                        test_plan,
+                    )
+                },
+
+                // Test succeeded or failed as expected.
+                (None, ExitReason::Succeed(_))
+                | (Some(ExpectedFailure::Expected), ExitReason::Revert(_)) => {
+                    output.pass(function_name);
+                    stats.test_success(test_run_info(), test_plan);
+                },
+
+                (exp, reason) => {
+                    unreachable!("Unexpected (exp, exit reason) pair: ({:?}, {:?}). This should not have happened.", exp, reason)
+                },
+            }
+        }
+
+        stats
+    }
+
+    // TODO: comparison of results via different backends
+
+    fn exec_module_tests(
+        &self,
+        test_plan: &ModuleTestPlan,
+        writer: &Mutex<impl Write>,
+    ) -> TestStatistics {
+        let output = TestOutput { test_plan, writer };
+
+        #[cfg(feature = "evm-backend")]
+        if self.evm {
+            return self.exec_module_tests_evm(test_plan, &output);
+        }
+
+        self.exec_module_tests_move_vm_and_stackless_vm(test_plan, &output)
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/.gitattributes b/vendors/move/crates/tools/move-unit-test/tests/.gitattributes
new file mode 100644
index 000000000..d1bcf2682
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/.gitattributes
@@ -0,0 +1 @@
+*.exp text -whitespace
diff --git a/vendors/move/crates/tools/move-unit-test/tests/move_unit_test_testsuite.rs b/vendors/move/crates/tools/move-unit-test/tests/move_unit_test_testsuite.rs
new file mode 100644
index 000000000..1d8da1e9d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/move_unit_test_testsuite.rs
@@ -0,0 +1,135 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_command_line_common::testing::{
+    add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT,
+};
+use move_unit_test::{self, UnitTestingConfig};
+use regex::RegexBuilder;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+// We don't support statistics tests as that includes times which are variable and will make these
+// tests flaky.
+const TEST_MODIFIER_STRS: &[&str] = &[
+    "storage",
+    #[cfg(feature = "evm-backend")]
+    "evm",
+];
+
+pub fn modify(mut base_config: UnitTestingConfig, modifier_str: &str) -> Option<UnitTestingConfig> {
+    // Add future test modifiers here
+    match modifier_str {
+        "storage" => base_config.report_storage_on_error = true,
+        #[cfg(feature = "evm-backend")]
+        "evm" => base_config.evm = true,
+        _ => return None,
+    };
+    Some(base_config)
+}
+
+fn run_test_with_modifiers(
+    unit_test_config: UnitTestingConfig,
+    path: &Path,
+) -> anyhow::Result<Vec<((Vec<u8>, bool), PathBuf)>> {
+    let mut results = Vec::new();
+
+    for modifier in TEST_MODIFIER_STRS.iter() {
+        let modified_exp_path = path.with_extension(format!("{}.{}", modifier, EXP_EXT));
+        if let (Some(test_config), true) = (
+            modify(unit_test_config.clone(), modifier),
+            modified_exp_path.exists(),
+        ) {
+            let buffer = Vec::new();
+            let test_plan = test_config.build_test_plan();
+            if test_plan.is_none() {
+                anyhow::bail!(
+                    "No test plan constructed for {:?} with modifier {}",
+                    path,
+                    modifier
+                );
+            }
+
+            results.push((
+                test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, buffer)?,
+                modified_exp_path,
+            ))
+        }
+    }
+
+    // Now run with no modifiers
+    let buffer = Vec::new();
+    let test_plan = unit_test_config.build_test_plan();
+    if test_plan.is_none() {
+        anyhow::bail!("No test plan constructed for {:?}", path);
+    }
+
+    results.push((
+        unit_test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, buffer)?,
+        path.with_extension(EXP_EXT),
+    ));
+
+    Ok(results)
+}
+
+// Runs all tests under the test/test_sources directory.
+fn run_test_impl(path: &Path) -> anyhow::Result<()> {
+    std::env::set_var("NO_COLOR", "1");
+    let update_baseline = read_env_update_baseline();
+    let source_files = vec![path.to_str().unwrap().to_owned()];
+    let unit_test_config = UnitTestingConfig {
+        num_threads: 1,
+        gas_limit: Some(1000),
+        source_files,
+        dep_files: move_stdlib::move_stdlib_files(),
+        named_address_values: move_stdlib::move_stdlib_named_addresses()
+            .into_iter()
+            .collect(),
+        report_writeset: true,
+        report_stacktrace_on_abort: true,
+
+        ..UnitTestingConfig::default_with_bound(None)
+    };
+
+    let regex = RegexBuilder::new(r"(┌─ ).+/([^/]+)$")
+        .multi_line(true)
+        .build()
+        .unwrap();
+
+    for ((buffer, _), exp_path) in run_test_with_modifiers(unit_test_config, path)? {
+        let base_output = String::from_utf8(buffer)?;
+        let cleaned_output = regex.replacen(&base_output, 0, r"$1$2");
+        if update_baseline {
+            fs::write(&exp_path, &*cleaned_output)?
+        }
+
+        let exp_exists = exp_path.is_file();
+
+        if exp_exists {
+            let expected = fs::read_to_string(&exp_path)?;
+            if expected != cleaned_output {
+                let msg = format!(
+                    "Expected outputs differ for {:?}:\n{}",
+                    exp_path,
+                    format_diff(expected, cleaned_output)
+                );
+                anyhow::bail!(add_update_baseline_fix(msg));
+            }
+        } else {
+            let msg = format!("No expected output found for {:?}", path);
+            anyhow::bail!(add_update_baseline_fix(msg));
+        }
+    }
+
+    Ok(())
+}
+
+fn run_test(path: &Path) -> datatest_stable::Result<()> {
+    run_test_impl(path)?;
+    Ok(())
+}
+
+datatest_stable::harness!(run_test, "tests/test_sources", r".*\.move$");
diff --git a/vendors/move/crates/tools/move-unit-test/tests/sources/A.move b/vendors/move/crates/tools/move-unit-test/tests/sources/A.move
new file mode 100644
index 000000000..75d32f134
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/sources/A.move
@@ -0,0 +1,9 @@
+module 0x1::A {
+    #[test]
+    fun a() { }
+
+    #[test_only]
+    public fun a_call() {
+        abort 0
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/sources/B.move b/vendors/move/crates/tools/move-unit-test/tests/sources/B.move
new file mode 100644
index 000000000..8e37c3b60
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/sources/B.move
@@ -0,0 +1,24 @@
+module 0x1::B {
+    #[test_only]
+    use 0x1::A;
+
+    #[test]
+    fun b() { }
+
+    #[test]
+    public fun b_other() {
+        A::a_call()
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0, location=0x1::A)]
+    public fun b_other0() {
+        A::a_call()
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 1, location=0x1::A)]
+    public fun b_other1() {
+        A::a_call()
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_deps.rs b/vendors/move/crates/tools/move-unit-test/tests/test_deps.rs
new file mode 100644
index 000000000..50437e043
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_deps.rs
@@ -0,0 +1,35 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+};
+use move_unit_test::{self, UnitTestingConfig};
+use std::path::PathBuf;
+
+// Make sure the compiled bytecode for dependencies is included, but the tests in them are not run.
+#[test]
+fn test_deps_arent_tested() {
+    let mut testing_config = UnitTestingConfig::default_with_bound(None)
+        .with_named_addresses(move_stdlib::move_stdlib_named_addresses());
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    let a_path = path.join("tests/sources/A.move");
+    let b_path = path.join("tests/sources/B.move");
+    let mut deps = move_stdlib::move_stdlib_files();
+    deps.push(a_path.to_string_lossy().to_string());
+
+    testing_config.source_files = vec![b_path.to_str().unwrap().to_owned()];
+    testing_config.dep_files = deps;
+
+    let test_plan = testing_config.build_test_plan().unwrap();
+
+    let mut iter = test_plan.module_tests.into_iter();
+    let (mod_id, _) = iter.next().unwrap();
+    let expected_mod_id = ModuleId::new(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        Identifier::new("B").unwrap(),
+    );
+    assert!(mod_id == expected_mod_id);
+    assert!(iter.next().is_none());
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.evm.exp
new file mode 100644
index 000000000..f259c8e26
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.evm.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_address
+[ PASS    ] 0x1::M::correct_addresses
+[ PASS    ] 0x1::M::wrong_address
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.exp
new file mode 100644
index 000000000..88ad6f1f2
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.exp
@@ -0,0 +1,11 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_address
+[ PASS    ] 0x1::M::correct_addresses
+[ PASS    ] 0x1::M::wrong_address
+0x1::M::correct_address
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::correct_addresses
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::wrong_address
+Output: Ok(ChangeSet { accounts: {} })
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.move
new file mode 100644
index 000000000..4faabd02d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/address_args.move
@@ -0,0 +1,22 @@
+address 0x1 {
+module M {
+    const ErrorCode: u64 = 100;
+
+    #[test(a = @0x42)]
+    fun correct_address(a: address) {
+        assert!(a == @0x42, 100);
+    }
+
+    #[test(a = @0x42, b = @0x43)]
+    fun correct_addresses(a: address, b: address) {
+        assert!(a == @0x42, 100);
+        assert!(b == @0x43, 101);
+    }
+
+    #[test(a = @0x42)]
+    #[expected_failure(abort_code = ErrorCode)]
+    fun wrong_address(a: address) {
+        assert!(a == @0x43, 100);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.evm.exp
new file mode 100644
index 000000000..bdcc00dec
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.evm.exp
@@ -0,0 +1,6 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::u64_add_overflow
+[ PASS    ] 0x1::M::u64_div_by_zero
+[ PASS    ] 0x1::M::u64_mul_overflow
+[ PASS    ] 0x1::M::u64_sub_underflow
+Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp
new file mode 100644
index 000000000..9c7dd5539
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp
@@ -0,0 +1,14 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::u64_add_overflow
+[ PASS    ] 0x1::M::u64_div_by_zero
+[ PASS    ] 0x1::M::u64_mul_overflow
+[ PASS    ] 0x1::M::u64_sub_underflow
+0x1::M::u64_add_overflow
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_div_by_zero
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_mul_overflow
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_sub_underflow
+Output: Ok(ChangeSet { accounts: {} })
+Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.move
new file mode 100644
index 000000000..74185c75d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/arithmetic_errors.move
@@ -0,0 +1,27 @@
+address 0x1 {
+module M {
+    #[test]
+    #[expected_failure]
+    fun u64_sub_underflow() {
+        0 - 1;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_add_overflow() {
+        18446744073709551615 + 1;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_div_by_zero() {
+        1/0;
+    }
+
+    #[test]
+    #[expected_failure]
+    fun u64_mul_overflow() {
+        4294967296 * 4294967296;
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.evm.exp
new file mode 100644
index 000000000..06604b213
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.evm.exp
@@ -0,0 +1,4 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::make_sure_not_other_number
+[ PASS    ] 0x1::M::make_sure_number_matches
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.exp
new file mode 100644
index 000000000..5f250ba28
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.exp
@@ -0,0 +1,8 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::make_sure_not_other_number
+[ PASS    ] 0x1::M::make_sure_number_matches
+0x1::M::make_sure_not_other_number
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::make_sure_number_matches
+Output: Ok(ChangeSet { accounts: {} })
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.move
new file mode 100644
index 000000000..7a6da03ba
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/construct_data.move
@@ -0,0 +1,33 @@
+address 0x1 {
+module B {
+    #[test_only]
+    struct TestingStruct has drop { x: u64 }
+
+    #[test_only]
+    public fun construct_with_number(x: u64): TestingStruct {
+        TestingStruct { x }
+    }
+
+    #[test_only]
+    public fun get_struct_x_field(s: &TestingStruct): u64 {
+        s.x
+    }
+}
+
+module M {
+    #[test_only]
+    use 0x1::B;
+
+    #[test]
+    fun make_sure_number_matches() {
+        let s = B::construct_with_number(0);
+        assert!(B::get_struct_x_field(&s) == 0, 0);
+    }
+
+    #[test, expected_failure]
+    fun make_sure_not_other_number() {
+        let s = B::construct_with_number(0);
+        assert!(B::get_struct_x_field(&s) != 0, 0);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp
new file mode 100644
index 000000000..aa52b3fdf
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp
@@ -0,0 +1,13 @@
+Running Move unit tests
+[ FAIL    ] 0x1::B::failing_test
+[ PASS    ] 0x1::M::dummy_test
+
+Test failures:
+
+Failures in 0x1::B:
+
+┌── failing_test ──────
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp
new file mode 100644
index 000000000..f8f2d2a45
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp
@@ -0,0 +1,28 @@
+Running Move unit tests
+[ FAIL    ] 0x1::B::failing_test
+[ PASS    ] 0x1::M::dummy_test
+0x1::B::failing_test
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::dummy_test
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::B:
+
+┌── failing_test ──────
+│ error[E11001]: test failure
+│   ┌─ cross_module_aborts.move:5:9
+│   │
+│ 4 │     public fun this_aborts() {
+│   │                ----------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	B::failing_test(tests/test_sources/cross_module_aborts.move:19)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.move
new file mode 100644
index 000000000..519690185
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/cross_module_aborts.move
@@ -0,0 +1,22 @@
+address 0x1 {
+module M {
+    #[test_only]
+    public fun this_aborts() {
+        abort 0
+    }
+
+    #[test]
+    fun dummy_test() { }
+}
+
+module B {
+
+    #[test_only]
+    use 0x1::M;
+
+    #[test]
+    fun failing_test() {
+        M::this_aborts()
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.evm.exp
new file mode 100644
index 000000000..3a1e8fabf
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.evm.exp
@@ -0,0 +1,3 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::do_nothing
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.exp
new file mode 100644
index 000000000..dbeabdb66
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::do_nothing
+0x1::M::do_nothing
+Output: Ok(ChangeSet { accounts: {} })
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.move
new file mode 100644
index 000000000..8aa9bb708
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/do_nothing.move
@@ -0,0 +1,6 @@
+address 0x1 {
+module M {
+    #[test]
+    fun do_nothing() {}
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp
new file mode 100644
index 000000000..feefbb173
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp
@@ -0,0 +1,18 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::fail
+[ FAIL    ] 0x1::M::fail_with_code
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── fail_with_code ──────
+│ Test did not error as expected
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
new file mode 100644
index 000000000..f3ad7bc7d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
@@ -0,0 +1,22 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::fail
+[ FAIL    ] 0x1::M::fail_with_code
+0x1::M::fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::fail_with_code
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── fail_with_code ──────
+│ Test did not error as expected
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move
new file mode 100644
index 000000000..e7c022e83
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move
@@ -0,0 +1,9 @@
+address 0x1 {
+module M {
+    #[test, expected_failure]
+    fun fail() { }
+
+    #[test, expected_failure(abort_code=0, location=0x1::M)]
+    fun fail_with_code() { }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.evm.exp
new file mode 100644
index 000000000..6085cf6a8
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.evm.exp
@@ -0,0 +1,28 @@
+Running Move unit tests
+[ FAIL    ] 0x1::MissingData::missing_data
+[ PASS    ] 0x1::MissingData::missing_data_captured
+[ FAIL    ] 0x1::MissingData::missing_data_exact
+[ FAIL    ] 0x1::MissingData::missing_data_from_other_function
+
+Test failures:
+
+Failures in 0x1::MissingData:
+
+┌── missing_data ──────
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
+└──────────────────
+
+
+┌── missing_data_exact ──────
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
+└──────────────────
+
+
+┌── missing_data_from_other_function ──────
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 1; failed: 3
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.exp
new file mode 100644
index 000000000..d7b978315
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.exp
@@ -0,0 +1,47 @@
+Running Move unit tests
+[ FAIL    ] 0x1::MissingData::missing_data
+[ PASS    ] 0x1::MissingData::missing_data_captured
+[ PASS    ] 0x1::MissingData::missing_data_exact
+[ FAIL    ] 0x1::MissingData::missing_data_from_other_function
+0x1::MissingData::missing_data
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_captured
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_exact
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_from_other_function
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::MissingData:
+
+┌── missing_data ──────
+│ error[E11001]: test failure
+│   ┌─ missing_data.move:6:9
+│   │
+│ 5 │     fun missing_data() acquires Missing {
+│   │         ------------ In this function in 0x1::MissingData
+│ 6 │         borrow_global<Missing>(@0x0);
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::MissingData rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── missing_data_from_other_function ──────
+│ error[E11001]: test failure
+│   ┌─ missing_data.move:6:9
+│   │
+│ 5 │     fun missing_data() acquires Missing {
+│   │         ------------ In this function in 0x1::MissingData
+│ 6 │         borrow_global<Missing>(@0x0);
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::MissingData rooted here
+│ 
+│ 
+│ stack trace
+│ 	MissingData::missing_data_from_other_function(tests/test_sources/missing_data.move:12)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 2; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.move
new file mode 100644
index 000000000..f44c7a5ff
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/missing_data.move
@@ -0,0 +1,26 @@
+module 0x1::MissingData {
+    struct Missing has key { }
+
+    #[test]
+    fun missing_data() acquires Missing {
+        borrow_global<Missing>(@0x0);
+    }
+
+    #[test]
+    fun missing_data_from_other_function() acquires Missing {
+        // This call should create a stack trace entry
+        missing_data()
+    }
+
+    #[test]
+    #[expected_failure]
+    fun missing_data_captured() acquires Missing {
+        borrow_global<Missing>(@0x0);
+    }
+
+    #[test]
+    #[expected_failure(major_status=4008, location=Self)]
+    fun missing_data_exact() acquires Missing {
+        borrow_global<Missing>(@0x0);
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.exp
new file mode 100644
index 000000000..f52e98eae
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.exp
@@ -0,0 +1,41 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::native_abort_good_right_code
+[ FAIL    ] 0x1::A::native_abort_good_wrong_code
+[ FAIL    ] 0x1::A::native_abort_unexpected_abort
+0x1::A::native_abort_good_right_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::native_abort_good_wrong_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::native_abort_unexpected_abort
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── native_abort_good_wrong_code ──────
+│ error[E11001]: test failure
+│    ┌─ native_abort.move:12:9
+│    │
+│ 11 │     fun native_abort_good_wrong_code() {
+│    │         ---------------------------- In this function in 0x1::A
+│ 12 │         vector::borrow(&vector::empty<u64>(), 1);
+│    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test did not error as expected. Expected test to give a vector operation error with sub-status 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A but instead it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── native_abort_unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ native_abort.move:6:9
+│   │
+│ 5 │     fun native_abort_unexpected_abort() {
+│   │         ----------------------------- In this function in 0x1::A
+│ 6 │         vector::borrow(&vector::empty<u64>(), 1);
+│   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it gave a vector operation error with sub-status 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 1; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.move
new file mode 100644
index 000000000..ca5ec24c1
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_abort.move
@@ -0,0 +1,20 @@
+module 0x1::A {
+    use std::vector;
+
+    #[test]
+    fun native_abort_unexpected_abort() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=0, location=0x1::A)]
+    fun native_abort_good_wrong_code() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=1, location=0x1::A)]
+    fun native_abort_good_right_code() {
+        vector::borrow(&vector::empty<u64>(), 1);
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.exp
new file mode 100644
index 000000000..2f46b63ad
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.exp
@@ -0,0 +1,29 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::test_determinisim
+[ FAIL    ] 0x1::M::test_doesnt_exist
+[ PASS    ] 0x1::M::test_exists
+0x1::M::test_determinisim
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_doesnt_exist
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::M::test_exists
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── test_doesnt_exist ──────
+│ error[E11001]: test failure
+│    ┌─ native_signer_creation.move:47:9
+│    │
+│ 36 │     fun test_doesnt_exist() {
+│    │         ----------------- In this function in 0x1::M
+│    ·
+│ 47 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 2; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.move
new file mode 100644
index 000000000..1b1919a62
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.move
@@ -0,0 +1,67 @@
+module 0x1::M {
+    use std::unit_test;
+    use std::vector;
+    use std::signer;
+
+    struct A has key {}
+
+    fun has_a(a: address): bool {
+        exists<A>(a)
+    }
+
+    #[test_only]
+    fun setup_storage(sig: &signer) {
+        move_to(sig, A { })
+    }
+
+    #[test]
+    fun test_exists() {
+        let num_signers = 10;
+        let i = 0;
+
+        let signers = unit_test::create_signers_for_testing(num_signers);
+        while (i < num_signers) {
+            setup_storage(vector::borrow(&signers, i));
+            i = i + 1;
+        };
+
+        i = 0;
+        while (i < num_signers) {
+            assert!(has_a(signer::address_of(vector::borrow(&signers, i))), 0);
+            i = i + 1;
+        }
+    }
+
+    #[test]
+    fun test_doesnt_exist() {
+        let num_signers = 10;
+        let i = 0;
+
+        let signers = unit_test::create_signers_for_testing(num_signers);
+        while (i < num_signers) {
+            setup_storage(vector::borrow(&signers, i));
+            i = i + 1;
+        };
+
+        // abort to trigger a dump of storage state to make sure this is getting populated correctly
+        abort 0
+
+    }
+
+    #[test]
+    fun test_determinisim() {
+        let num_signers = 10;
+        let i = 0;
+        let signers = unit_test::create_signers_for_testing(num_signers);
+        let other_signers = unit_test::create_signers_for_testing(num_signers);
+
+        while (i < num_signers) {
+            assert!(
+                signer::address_of(vector::borrow(&signers, i)) ==
+                  signer::address_of(vector::borrow(&other_signers, i)),
+                i
+            );
+            i = i + 1;
+        };
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp
new file mode 100644
index 000000000..665ea3cfc
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp
@@ -0,0 +1,71 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::test_determinisim
+[ FAIL    ] 0x1::M::test_doesnt_exist
+[ PASS    ] 0x1::M::test_exists
+0x1::M::test_determinisim
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_doesnt_exist
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::M::test_exists
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0100000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0200000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0300000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0400000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0500000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0600000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0700000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0800000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 0900000000000000000000000000000000000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── test_doesnt_exist ──────
+│ error[E11001]: test failure
+│    ┌─ native_signer_creation.move:47:9
+│    │
+│ 36 │     fun test_doesnt_exist() {
+│    │         ----------------- In this function in 0x1::M
+│    ·
+│ 47 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ ────── Storage state at point of failure ──────
+│ 0x0:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x100000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x200000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x300000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x400000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x500000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x600000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x700000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x800000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 0x900000000000000000000000000000000000000000000000000000000000000:
+│ 	=> key 0x1::M::A {
+│ 	    dummy_field: false
+│ 	}
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 2; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.evm.exp
new file mode 100644
index 000000000..29633bb57
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.evm.exp
@@ -0,0 +1,20 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::non_existent_native
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── non_existent_native ──────
+│ Failed to compile Move code into EVM bytecode.
+│ 
+│ error: native function M::foo not implemented (w/ signature `[]`)
+│   ┌─ <unknown>:1:1
+│   │
+│ 1 │ <unknown>
+│   │ ^
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 1; passed: 0; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp
new file mode 100644
index 000000000..5b8f1c595
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp
@@ -0,0 +1,24 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::non_existent_native
+0x1::M::non_existent_native
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── non_existent_native ──────
+│ error[E11001]: test failure
+│   ┌─ non_exsistent_native.move:3:16
+│   │
+│ 3 │     native fun foo();
+│   │                ^^^
+│   │                │
+│   │                INTERNAL TEST ERROR: Unexpected Verification Error
+│ Test was not expected to error, but it gave a MISSING_DEPENDENCY (code 1021) error originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│   │                In this function in 0x1::M
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 1; passed: 0; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.move
new file mode 100644
index 000000000..2dd99823a
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/non_exsistent_native.move
@@ -0,0 +1,10 @@
+address 0x1 {
+module M {
+    native fun foo();
+
+    #[test]
+    fun non_existent_native() {
+        foo()
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.exp
new file mode 100644
index 000000000..f3164f9a4
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.exp
@@ -0,0 +1,20 @@
+Running Move unit tests
+[ PASS    ] 0x42::m::t0
+[ PASS    ] 0x42::m::t1
+[ PASS    ] 0x42::m::t2
+[ PASS    ] 0x42::m::t3
+[ PASS    ] 0x42::m::t4
+[ PASS    ] 0x42::m::t5
+0x42::m::t0
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t1
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t2
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t3
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t4
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t5
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000042, module: Identifier("m"), name: Identifier("R"), type_params: [] }: New([0])} }} })
+Test result: OK. Total tests: 6; passed: 6; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.move
new file mode 100644
index 000000000..d661c8435
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/other_expected_failures.move
@@ -0,0 +1,41 @@
+module 0x42::m {
+    #[test]
+    #[expected_failure(vector_error, minor_status=1, location=Self)]
+    fun t0() {
+        std::vector::borrow(&vector[0], 2);
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t1() {
+        1 / 0;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t2() {
+        0 - 1;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t3() {
+        1 % 0;
+    }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self)]
+    fun t4() {
+        loop {}
+    }
+
+    struct R has key { }
+
+    #[test(a=@1)]
+    #[expected_failure(major_status=4004, location=Self)]
+    fun t5(a: signer) {
+        move_to(&a, R {});
+        move_to(&a, R {});
+    }
+
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.exp
new file mode 100644
index 000000000..a71de499c
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.exp
@@ -0,0 +1,46 @@
+Running Move unit tests
+[ FAIL    ] 0x42::m::t0
+[ FAIL    ] 0x42::m::t1
+[ FAIL    ] 0x42::m::t2
+0x42::m::t0
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t1
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t2
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x42::m:
+
+┌── t0 ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── t1 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:10:10
+│    │
+│  9 │ fun t1() {
+│    │     -- In this function in 0x42::m
+│ 10 │     loop {}
+│    │          ^^ Test did not error as expected. Expected test to give an arithmetic error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it ran out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── t2 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:16:7
+│    │
+│ 15 │ fun t2() {
+│    │     -- In this function in 0x42::m
+│ 16 │     0 - 1;
+│    │       ^ Test did not error as expected. Expected test to run out of gas in the module 0000000000000000000000000000000000000000000000000000000000000042::m but instead it gave an arithmetic error originating in the module 0000000000000000000000000000000000000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.move
new file mode 100644
index 000000000..78e171ae3
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/out_of_gas.move
@@ -0,0 +1,19 @@
+module 0x42::m {
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t0() {}
+
+#[test]
+#[expected_failure(arithmetic_error, location=Self)]
+fun t1() {
+    loop {}
+}
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t2() {
+    0 - 1;
+}
+
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp
new file mode 100644
index 000000000..b93352318
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp
@@ -0,0 +1,17 @@
+Running Move unit tests
+[ PASS    ] 0x1::Module::other_module_aborts
+[ PASS    ] 0x1::Module::tests_a
+[ PASS    ] 0x1::Module::tests_aborts
+[ PASS    ] 0x1::Module::tests_b
+[ PASS    ] 0x1::Module::tests_c
+[ FAIL    ] 0x1::Module::tests_d
+
+Test failures:
+
+Failures in 0x1::Module:
+
+┌── tests_d ──────
+│ Test was not expected to error, but it aborted with code 3 originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 5; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.exp
new file mode 100644
index 000000000..755c05560
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.exp
@@ -0,0 +1,38 @@
+Running Move unit tests
+[ PASS    ] 0x1::Module::other_module_aborts
+[ PASS    ] 0x1::Module::tests_a
+[ PASS    ] 0x1::Module::tests_aborts
+[ PASS    ] 0x1::Module::tests_b
+[ PASS    ] 0x1::Module::tests_c
+[ FAIL    ] 0x1::Module::tests_d
+0x1::Module::other_module_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_c
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_d
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Bool] }: New([6, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Struct(StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("C"), type_params: [U64] })] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+
+Test failures:
+
+Failures in 0x1::Module:
+
+┌── tests_d ──────
+│ error[E11001]: test failure
+│     ┌─ proposal_test.move:102:9
+│     │
+│  95 │     fun tests_d(a1: signer, a2: signer)
+│     │         ------- In this function in 0x1::Module
+│     ·
+│ 102 │         assert!(d<u64>(@0x2, 6), 3);
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it aborted with code 3 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::Module rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 5; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.move
new file mode 100644
index 000000000..48babea2c
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.move
@@ -0,0 +1,118 @@
+// This is a test based on the example in the unit testing proposal
+address 0x1 {
+module TestonlyModule {
+    #[test_only]
+    public fun aborts() {
+        abort 42
+    }
+}
+
+module Module {
+    struct B<phantom T> has key { t: u64 }
+    struct A has key {t: u64}
+
+    fun a(a: u64): bool {
+        a == 10
+    }
+
+    fun b(a: address): bool {
+        exists<A>(a)
+    }
+
+    fun c(a: address, x: u64): bool
+    acquires A {
+        exists<A>(a) && borrow_global<A>(a).t == x
+    }
+
+    fun d<T: store>(a: address, x: u64): bool
+    acquires B {
+        exists<B<T>>(a) && borrow_global<B<T>>(a).t == x
+    }
+
+    fun aborts() {
+       abort 10
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // unit tests
+    ///////////////////////////////////////////////////////////////////////////
+
+    // A test-only module import
+    #[test_only]
+    use 0x1::TestonlyModule;
+
+    // A test only struct. This will only be included in test mode.
+    #[test_only]
+    struct C<T> has drop, key, store { x: T }
+
+    // Not a test entrypoint, can only be called from #[test] and #[test_only] functions
+    #[test_only]
+    fun setup_storage_tests_b(a1: &signer, a2: &signer) {
+        move_to(a1, A{t : 5});
+        move_to(a2, A{t : 5});
+    }
+
+    #[test_only]
+    fun setup_storage_tests_c(a1: &signer, a2: &signer) {
+        move_to(a1, A{t : 5});
+        move_to(a2, A{t : 6});
+    }
+
+    #[test_only]
+    fun setup_storage_tests_d(a1: &signer, a2: &signer) {
+        move_to(a1, B<u64>{t : 5});
+        move_to(a2, B<u64>{t : 5});
+        move_to(a2, B<bool>{t : 6});
+        move_to(a2, B<C<u64>> {t: 5 });
+    }
+
+    #[test] // test entry point.
+    fun tests_a() { // an actual test that will be run
+        assert!(a(0) == false, 0);
+        assert!(a(10), 1);
+    }
+
+    #[test(a1=@0x1, a2=@0x2)] // testing framework will create and pass-in signers with these addresses
+    fun tests_b(a1: signer, a2: signer) {
+        assert!(b(@0x1) == false, 0);
+        setup_storage_tests_b(&a1, &a2);
+        assert!(b(@0x1), 1);
+        assert!(b(@0x2), 2);
+        assert!(!b(@0x3), 3);
+    }
+
+    #[test(a1=@0x1, a2=@0x2)]
+    fun tests_c(a1: signer, a2: signer)
+    acquires A {
+        setup_storage_tests_c(&a1, &a2);
+        assert!(c(@0x1, 5), 0);
+        assert!(!c(@0x1, 6), 1);
+        assert!(!c(@0x2, 5), 2);
+        assert!(c(@0x2, 6), 3);
+    }
+
+    #[test(a1=@0x1, a2=@0x2)]
+    fun tests_d(a1: signer, a2: signer)
+    acquires B {
+        setup_storage_tests_d(&a1, &a2);
+        assert!(d<u64>(@0x1, 5), 0);
+        assert!(!d<u64>(@0x1, 6), 1);
+        assert!(!d<bool>(@0x2, 5), 2);
+        // This should fail, and the error should be reported against the source
+        assert!(d<u64>(@0x2, 6), 3);
+    }
+
+    // check that this test aborts with the expected error code
+    #[test]
+    #[expected_failure(abort_code=10, location=Self)]
+    fun tests_aborts() {
+       aborts()
+    }
+
+    #[test]
+    #[expected_failure(abort_code=42, location=0x1::TestonlyModule)]
+    fun other_module_aborts() {
+       TestonlyModule::aborts()
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp
new file mode 100644
index 000000000..d419f2c1d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp
@@ -0,0 +1,54 @@
+Running Move unit tests
+[ PASS    ] 0x1::Module::other_module_aborts
+[ PASS    ] 0x1::Module::tests_a
+[ PASS    ] 0x1::Module::tests_aborts
+[ PASS    ] 0x1::Module::tests_b
+[ PASS    ] 0x1::Module::tests_c
+[ FAIL    ] 0x1::Module::tests_d
+0x1::Module::other_module_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_c
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_d
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Bool] }: New([6, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Struct(StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("Module"), name: Identifier("C"), type_params: [U64] })] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+
+Test failures:
+
+Failures in 0x1::Module:
+
+┌── tests_d ──────
+│ error[E11001]: test failure
+│     ┌─ proposal_test.move:102:9
+│     │
+│  95 │     fun tests_d(a1: signer, a2: signer)
+│     │         ------- In this function in 0x1::Module
+│     ·
+│ 102 │         assert!(d<u64>(@0x2, 6), 3);
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it aborted with code 3 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::Module rooted here
+│ 
+│ 
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│ 	=> key 0x1::Module::B<u64> {
+│ 	    t: 5
+│ 	}
+│ 0x2:
+│ 	=> key 0x1::Module::B<bool> {
+│ 	    t: 6
+│ 	}
+│ 	=> key 0x1::Module::B<u64> {
+│ 	    t: 5
+│ 	}
+│ 	=> key 0x1::Module::B<0x1::Module::C<u64>> {
+│ 	    t: 5
+│ 	}
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 5; failed: 1
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.evm.exp
new file mode 100644
index 000000000..b60641dac
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.evm.exp
@@ -0,0 +1,22 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::multi_signer_fail
+[ PASS    ] 0x1::M::multi_signer_pass
+[ PASS    ] 0x1::M::multi_signer_pass_expected_failure
+[ FAIL    ] 0x1::M::single_signer_fail
+[ PASS    ] 0x1::M::single_signer_pass
+[ PASS    ] 0x1::M::test_correct_signer_arg_addrs
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── multi_signer_fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── single_signer_fail ──────
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 4; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.exp
new file mode 100644
index 000000000..0b55d6eb1
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.exp
@@ -0,0 +1,42 @@
+Running Move unit tests
+[ FAIL    ] 0x1::M::multi_signer_fail
+[ PASS    ] 0x1::M::multi_signer_pass
+[ PASS    ] 0x1::M::multi_signer_pass_expected_failure
+[ FAIL    ] 0x1::M::single_signer_fail
+[ PASS    ] 0x1::M::single_signer_pass
+[ PASS    ] 0x1::M::test_correct_signer_arg_addrs
+0x1::M::multi_signer_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::multi_signer_pass
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::multi_signer_pass_expected_failure
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::single_signer_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::single_signer_pass
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_correct_signer_arg_addrs
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── multi_signer_fail ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── single_signer_fail ──────
+│ error[E11001]: test failure
+│   ┌─ signer_args.move:9:9
+│   │
+│ 8 │     fun single_signer_fail(_a: signer) {
+│   │         ------------------ In this function in 0x1::M
+│ 9 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 6; passed: 4; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.move
new file mode 100644
index 000000000..7b8edcb5d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/signer_args.move
@@ -0,0 +1,32 @@
+address 0x1 {
+module M {
+
+    #[test(_a=@0x1)]
+    fun single_signer_pass(_a: signer) { }
+
+    #[test(_a=@0x1)]
+    fun single_signer_fail(_a: signer) {
+        abort 0
+    }
+
+    #[test(_a=@0x1, _b=@0x2)]
+    fun multi_signer_pass(_a: signer, _b: signer) { }
+
+    #[test(_a=@0x1, _b=@0x2), expected_failure]
+    fun multi_signer_fail(_a: signer, _b: signer) { }
+
+    #[test(_a=@0x1, _b=@0x2), expected_failure]
+    fun multi_signer_pass_expected_failure(_a: signer, _b: signer) {
+            abort 0
+    }
+
+    #[test_only]
+    use std::signer;
+
+    #[test(a=@0x1, b=@0x2)]
+    fun test_correct_signer_arg_addrs(a: signer, b: signer) {
+        assert!(signer::address_of(&a) == @0x1, 0);
+        assert!(signer::address_of(&b) == @0x2, 1);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp
new file mode 100644
index 000000000..df12481d0
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp
@@ -0,0 +1,48 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::a
+[ PASS    ] 0x1::A::b
+[ PASS    ] 0x1::A::c
+[ FAIL    ] 0x1::A::x
+[ FAIL    ] 0x1::A::y
+0x1::A::a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::c
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::x
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::y
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── x ──────
+│ error[E11001]: test failure
+│   ┌─ storage_on_error_empty_and_non_empty.move:6:9
+│   │
+│ 5 │     fun x() {
+│   │         - In this function in 0x1::A
+│ 6 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── y ──────
+│ error[E11001]: test failure
+│    ┌─ storage_on_error_empty_and_non_empty.move:12:9
+│    │
+│ 10 │     fun y(a: signer) {
+│    │         - In this function in 0x1::A
+│ 11 │         move_to(&a, A {});
+│ 12 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move
new file mode 100644
index 000000000..135473901
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move
@@ -0,0 +1,34 @@
+module 0x1::A {
+    struct A has key { }
+
+    #[test]
+    fun x() {
+        abort 0
+    }
+
+    #[test(a=@0x1)]
+    fun y(a: signer) {
+        move_to(&a, A {});
+        abort 0
+    }
+
+    // make sure that we only show storage state for failed tests
+
+    #[test]
+    #[expected_failure(abort_code = 0, location = 0x1::A)]
+    fun a() {
+        abort 0
+    }
+
+    #[test(a=@0x1)]
+    #[expected_failure(abort_code = 0, location = 0x1::A)]
+    fun b(a: signer) {
+        move_to(&a, A {});
+        abort 0
+    }
+
+    #[test(a=@0x1)]
+    fun c(a: signer) {
+        move_to(&a, A {});
+    }
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp
new file mode 100644
index 000000000..ddd1ad39a
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp
@@ -0,0 +1,56 @@
+Running Move unit tests
+[ PASS    ] 0x1::A::a
+[ PASS    ] 0x1::A::b
+[ PASS    ] 0x1::A::c
+[ FAIL    ] 0x1::A::x
+[ FAIL    ] 0x1::A::y
+0x1::A::a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::c
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::x
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::y
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+
+Test failures:
+
+Failures in 0x1::A:
+
+┌── x ──────
+│ error[E11001]: test failure
+│   ┌─ storage_on_error_empty_and_non_empty.move:6:9
+│   │
+│ 5 │     fun x() {
+│   │         - In this function in 0x1::A
+│ 6 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+│ ────── Storage state at point of failure ──────
+│ <empty>
+└──────────────────
+
+
+┌── y ──────
+│ error[E11001]: test failure
+│    ┌─ storage_on_error_empty_and_non_empty.move:12:9
+│    │
+│ 10 │     fun y(a: signer) {
+│    │         - In this function in 0x1::A
+│ 11 │         move_to(&a, A {});
+│ 12 │         abort 0
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::A rooted here
+│ 
+│ 
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│ 	=> key 0x1::A::A {
+│ 	    dummy_field: false
+│ 	}
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.exp
new file mode 100644
index 000000000..e81f48edc
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.exp
@@ -0,0 +1,8 @@
+Running Move unit tests
+[ PASS    ] 0x1::B::tests_a
+[ PASS    ] 0x1::B::tests_b
+0x1::B::tests_a
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [Bool] }: New([0])} }} })
+0x1::B::tests_b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.move
new file mode 100644
index 000000000..1b68faeb2
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.move
@@ -0,0 +1,48 @@
+address 0x1 {
+module B {
+    struct A<T> has key { t: T }
+
+    fun a<T: store>(a: address): bool {
+        exists<A<T>>(a)
+    }
+
+    fun b(a: address, x: u64): bool
+    acquires A {
+        exists<A<u64>>(a) && borrow_global<A<u64>>(a).t == x
+    }
+
+
+    #[test_only]
+    fun setup_storage_tests_a(a1: &signer, a2: &signer) {
+        move_to(a1, A<u64>{t : 5});
+        move_to(a2, A<bool>{t : false});
+    }
+
+    #[test_only]
+    fun setup_storage_tests_b(a1: &signer, a2: &signer) {
+        move_to(a1, A{t : 5});
+        move_to(a2, A{t : 6});
+    }
+
+    #[test(a1=@0x1, a2=@0x2)] // testing framework will create and pass-in signers with these addresses
+    fun tests_a(a1: signer, a2: signer) {
+        assert!(!a<u64>(@0x1), 0);
+        setup_storage_tests_a(&a1, &a2);
+        assert!(a<u64>(@0x1), 1);
+        assert!(a<bool>(@0x2), 2);
+        assert!(!a<u64>(@0x3), 3);
+        assert!(!a<bool>(@0x3), 4);
+        assert!(!a<address>(@0x1), 5);
+    }
+
+    #[test(a1=@0x1, a2=@0x2)]
+    fun tests_b(a1: signer, a2: signer)
+    acquires A {
+        setup_storage_tests_b(&a1, &a2);
+        assert!(b(@0x1, 5), 0);
+        assert!(!b(@0x1, 6), 1);
+        assert!(!b(@0x2, 5), 2);
+        assert!(b(@0x2, 6), 3);
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.storage.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.storage.exp
new file mode 100644
index 000000000..e81f48edc
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/storage_test.storage.exp
@@ -0,0 +1,8 @@
+Running Move unit tests
+[ PASS    ] 0x1::B::tests_a
+[ PASS    ] 0x1::B::tests_b
+0x1::B::tests_a
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [Bool] }: New([0])} }} })
+0x1::B::tests_b
+Output: Ok(ChangeSet { accounts: {0000000000000000000000000000000000000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 0000000000000000000000000000000000000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 0000000000000000000000000000000000000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.exp
new file mode 100644
index 000000000..930f6f541
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.exp
@@ -0,0 +1,39 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::no_timeout
+[ FAIL    ] 0x1::M::no_timeout_fail
+[ PASS    ] 0x1::M::no_timeout_while_loop
+[ TIMEOUT ] 0x1::M::timeout_fail
+[ PASS    ] 0x1::M::timeout_fail_with_expected_failure
+0x1::M::no_timeout
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::no_timeout_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::no_timeout_while_loop
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::timeout_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::timeout_fail_with_expected_failure
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── no_timeout_fail ──────
+│ error[E11001]: test failure
+│    ┌─ timeout.move:18:29
+│    │
+│ 18 │     fun no_timeout_fail() { abort 0 }
+│    │         ---------------     ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│    │         │                    
+│    │         In this function in 0x1::M
+│ 
+│ 
+└──────────────────
+
+
+┌── timeout_fail ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.move
new file mode 100644
index 000000000..1c0458302
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/timeout.move
@@ -0,0 +1,28 @@
+address 0x1 {
+module M {
+    #[test]
+    fun timeout_fail() {
+        while (true) {}
+    }
+
+    #[test]
+    #[expected_failure]
+    fun timeout_fail_with_expected_failure() {
+        while (true) {}
+    }
+
+    #[test]
+    fun no_timeout() { }
+
+    #[test]
+    fun no_timeout_fail() { abort 0 }
+
+    #[test]
+    fun no_timeout_while_loop() {
+        let i = 0;
+        while (i < 10) {
+            i = i + 1;
+        };
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp
new file mode 100644
index 000000000..ed0acd3e9
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp
@@ -0,0 +1,26 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_abort_code
+[ PASS    ] 0x1::M::just_test_failure
+[ FAIL    ] 0x1::M::unexpected_abort
+[ FAIL    ] 0x1::M::unexpected_abort_in_other_function
+[ FAIL    ] 0x1::M::wrong_abort_code
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── unexpected_abort ──────
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
+└──────────────────
+
+
+┌── unexpected_abort_in_other_function ──────
+│ Test was not expected to error, but it aborted with code 1 originating in an unknown location rooted here
+└──────────────────
+
+
+┌── wrong_abort_code ──────
+│ Test did not abort with expected code. Expected test to abort with code 1, but instead it aborted with code 0 originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 2; failed: 3
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.exp
new file mode 100644
index 000000000..ceeedd5f8
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.exp
@@ -0,0 +1,63 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::correct_abort_code
+[ PASS    ] 0x1::M::just_test_failure
+[ FAIL    ] 0x1::M::unexpected_abort
+[ FAIL    ] 0x1::M::unexpected_abort_in_other_function
+[ FAIL    ] 0x1::M::wrong_abort_code
+0x1::M::correct_abort_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::just_test_failure
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::unexpected_abort
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::unexpected_abort_in_other_function
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::wrong_abort_code
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x1::M:
+
+┌── unexpected_abort ──────
+│ error[E11001]: test failure
+│   ┌─ unexpected_abort.move:5:9
+│   │
+│ 4 │     public fun unexpected_abort() {
+│   │                ---------------- In this function in 0x1::M
+│ 5 │         abort 0
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── unexpected_abort_in_other_function ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:28:9
+│    │
+│ 27 │     fun abort_in_other_function() {
+│    │         ----------------------- In this function in 0x1::M
+│ 28 │         abort 1
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+│ stack trace
+│ 	M::unexpected_abort_in_other_function(tests/test_sources/unexpected_abort.move:33)
+│ 
+└──────────────────
+
+
+┌── wrong_abort_code ──────
+│ error[E11001]: test failure
+│    ┌─ unexpected_abort.move:11:9
+│    │
+│ 10 │     public fun wrong_abort_code() {
+│    │                ---------------- In this function in 0x1::M
+│ 11 │         abort 0
+│    │         ^^^^^^^ Test did not error as expected. Expected test to abort with code 1 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M but instead it aborted with code 0 originating in the module 0000000000000000000000000000000000000000000000000000000000000001::M rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 5; passed: 2; failed: 3
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.move
new file mode 100644
index 000000000..ede7bba80
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/unexpected_abort.move
@@ -0,0 +1,36 @@
+address 0x1 {
+module M {
+    #[test]
+    public fun unexpected_abort() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure(abort_code=1, location=0x1::M)]
+    public fun wrong_abort_code() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure(abort_code=0, location=0x1::M)]
+    public fun correct_abort_code() {
+        abort 0
+    }
+
+    #[test]
+    #[expected_failure]
+    public fun just_test_failure() {
+        abort 0
+    }
+
+    #[test_only]
+    fun abort_in_other_function() {
+        abort 1
+    }
+
+    #[test]
+    fun unexpected_abort_in_other_function() {
+        abort_in_other_function()
+    }
+}
+}
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp b/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp
new file mode 100644
index 000000000..f148ff28d
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x1::M::poison_call
+0x1::M::poison_call
+Output: Ok(ChangeSet { accounts: {} })
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.move b/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.move
new file mode 100644
index 000000000..ab7ddd8db
--- /dev/null
+++ b/vendors/move/crates/tools/move-unit-test/tests/test_sources/use_unit_test_module.move
@@ -0,0 +1,8 @@
+module 0x1::M {
+    use std::unit_test;
+
+    #[test]
+    fun poison_call() {
+        unit_test::create_signers_for_testing(0);
+    }
+}
diff --git a/vendors/move/crates/tools/read-write-set/Cargo.toml b/vendors/move/crates/tools/read-write-set/Cargo.toml
new file mode 100644
index 000000000..d0e20ce2a
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "read-write-set"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Read/write set inference for Move bytecode programs"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-utils = { path = "../move-bytecode-utils" }
+move-core-types = { path = "../../move-core-types" }
+move-model = { path = "../../move-model" }
+move-read-write-set-types = { path = "types" }
+prover_bytecode = { path = "../../move-stackless-bytecode", package = "move-stackless-bytecode" }
+read-write-set-dynamic = { path = "dynamic" }
diff --git a/vendors/move/crates/tools/read-write-set/dynamic/Cargo.toml b/vendors/move/crates/tools/read-write-set/dynamic/Cargo.toml
new file mode 100644
index 000000000..76ed4f1b5
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/dynamic/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "read-write-set-dynamic"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Read/write set inference for Move bytecode programs by concretizing the static analysis result"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+move-binary-format = { path = "../../../move-binary-format" }
+move-bytecode-utils = { path = "../../move-bytecode-utils" }
+move-core-types = { path = "../../../move-core-types" }
+move-read-write-set-types = { path = "../types" }
diff --git a/vendors/move/crates/tools/read-write-set/dynamic/src/dynamic_analysis.rs b/vendors/move/crates/tools/read-write-set/dynamic/src/dynamic_analysis.rs
new file mode 100644
index 000000000..b491ecdd4
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/dynamic/src/dynamic_analysis.rs
@@ -0,0 +1,349 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, bail, Result};
+use move_binary_format::normalized::{Function, Type};
+use move_bytecode_utils::{
+    layout::TypeLayoutBuilder,
+    module_cache::{GetModule, ModuleCache},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::IdentStr,
+    language_storage::{ModuleId, ResourceKey, TypeTag},
+    resolver::MoveResolver,
+    value::MoveValue,
+};
+use move_read_write_set_types::{Access, AccessPath, Offset, ReadWriteSet, RootAddress};
+use std::{
+    borrow::Borrow,
+    fmt::{self, Formatter},
+    ops::Deref,
+};
+
+/// A read/write set state with no unbound formals or type variables
+#[derive(Debug)]
+pub struct ConcretizedFormals(ReadWriteSet);
+
+/// A read/write set state with no secondary indexes and no unbound formals or type variables
+#[derive(Debug)]
+pub struct ConcretizedSecondaryIndexes(ConcretizedFormals);
+
+impl ConcretizedFormals {
+    /// Return a `Self` that accesses nothing.
+    pub fn empty() -> Self {
+        Self(ReadWriteSet::new())
+    }
+
+    /// Return the `ResourceKey`'s that may be written by `self`.
+    /// For example: if `self` is 0x7/0x1::AModule::AResource/f/g -> ReadWrite, this will return
+    /// 0x7/0x1::AModule.
+    pub fn get_keys_written(&self) -> Option<Vec<ResourceKey>> {
+        self.0.get_keys_written()
+    }
+
+    /// Return the `ResourceKey`'s read by `self`.
+    pub fn get_keys_read(&self) -> Option<Vec<ResourceKey>> {
+        self.0.get_keys_read()
+    }
+
+    /// Concretize all secondary indexes in `self` using `blockchain_view` and return the result. For
+    /// example: if `self` is 0x7/0x1::AModule::AResource/addr_field/0x2::M2::R/f -> Write and the
+    /// value of 0x7/0x1::AModule::AResource/addr_field is 0xA in `blockchain_view`, this will
+    /// return { 0x7/0x1::AModule::AResource/addr_field -> Read, 0xA/0x2::M2::R/f -> Write }
+    pub fn concretize_secondary_indexes<R: MoveResolver>(
+        self,
+        blockchain_view: &R,
+    ) -> Option<ConcretizedSecondaryIndexes> {
+        // TODO: check if there are no secondary indexes and return accesses if so
+        let mut acc = ReadWriteSet::new();
+        let module_cache = ModuleCache::new(blockchain_view);
+        self.0.iter_paths(|access_path, access| {
+            Self::concretize_secondary_indexes_(
+                &module_cache,
+                blockchain_view,
+                access_path,
+                access,
+                &mut acc,
+            )
+            .ok()
+        })?;
+        Some(ConcretizedSecondaryIndexes(ConcretizedFormals(acc)))
+    }
+
+    /// Construct a `ConcretizedFormals` from `accesses` by binding the formals and type variables in
+    /// `accesses` to `actuals` and `type_actuals`.
+    fn from_args_(
+        read_write_set: &ReadWriteSet,
+        actuals: &[Option<AccountAddress>],
+        type_actuals: &[TypeTag],
+    ) -> ConcretizedFormals {
+        ConcretizedFormals(read_write_set.sub_actuals(actuals, type_actuals))
+    }
+
+    /// Construct a `ConcretizedFormals` from `accesses` by binding the formals and type variables in
+    /// `accesses` to `signers`/`actuals` and `type_actuals`.
+    /// For example: if `accesses` is Formal(0)/0x1::M::S<TypeVar(0)>/f -> Read, `signers` is 0xA
+    /// and type_actuals is 0x2::M2::S2, this will return  0xA/0x1::M::S<0x2::M2::S@>/f -> Read
+    pub fn from_args(
+        read_write_set: &ReadWriteSet,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        formal_types: &[TypeTag],
+        type_actuals: &[TypeTag],
+    ) -> Result<ConcretizedFormals> {
+        let mut new_actuals = signers
+            .iter()
+            .map(|addr| Some(*addr))
+            .collect::<Vec<Option<_>>>();
+        assert_eq!(
+            formal_types.len(),
+            actuals.len() + signers.len(),
+            "Formal/actual arity mismatch"
+        );
+        // Deserialize the address actuals, use an None for the rest
+        let num_signers = signers.len();
+        // formal_types includes all formal types (including signers), but actuals is only
+        // the non-signer actuals.
+        for (actual_index, ty) in formal_types[num_signers..].iter().enumerate() {
+            let actual = if let TypeTag::Address = ty {
+                Some(AccountAddress::from_bytes(&actuals[actual_index])?)
+            } else {
+                None
+            };
+            new_actuals.push(actual);
+        }
+        Ok(Self::from_args_(
+            read_write_set,
+            new_actuals.as_slice(),
+            type_actuals,
+        ))
+    }
+
+    /// Concretize the secondary in `offsets` -> `access` using `annotator` and add the results to
+    /// `acc`.
+    fn concretize_offsets<R: MoveResolver>(
+        module_cache: &ModuleCache<&R>,
+        blockchain_view: &R,
+        access_path: AccessPath,
+        mut next_value: MoveValue,
+        next_offset_index: usize,
+        access: &Access,
+        acc: &mut ReadWriteSet,
+    ) -> Result<()> {
+        let offsets = access_path.offset();
+        for next_offset_index in next_offset_index..offsets.len() {
+            let next_offset = &offsets[next_offset_index];
+            match next_offset {
+                Offset::Field(index) => {
+                    if let MoveValue::Struct(s) = next_value {
+                        let fields = s.fields();
+                        next_value = fields[*index].clone();
+                    } else {
+                        bail!("Malformed access path {:?}; expected struct value as prefix to field offset {:?}, but got {:?}",
+                               access_path, next_offset, next_value)
+                    }
+                },
+                Offset::Global(g_offset) => {
+                    // secondary index. previous offset should have been an address value
+                    if let MoveValue::Address(a) = next_value {
+                        let mut new_ap = AccessPath::new_global_constant(a, g_offset.clone());
+                        for o in offsets[next_offset_index + 1..].iter() {
+                            new_ap.add_offset(o.clone())
+                        }
+                        return Self::concretize_secondary_indexes_(
+                            module_cache,
+                            blockchain_view,
+                            &new_ap,
+                            access,
+                            acc,
+                        );
+                    } else {
+                        bail!(
+                            "Malformed access path {:?}: expected address value before Global offset, but found {:?}",
+                            access_path,
+                            next_value
+                        );
+                    }
+                },
+                Offset::VectorIndex => {
+                    if let MoveValue::Vector(v_contents) = &next_value {
+                        // concretize offsets for each element in the vector
+                        for val in v_contents {
+                            Self::concretize_offsets(
+                                module_cache,
+                                blockchain_view,
+                                access_path.clone(),
+                                val.clone(),
+                                next_offset_index + 1,
+                                access,
+                                acc,
+                            )?;
+                        }
+                        return Ok(());
+                    } else {
+                        bail!(
+                            "Malformed access path {:?}: expected vector value before VectorIndex offset, but found {:?}",
+                            access_path,
+                            next_value
+                        );
+                    }
+                },
+            }
+        }
+        // Got to the end of the concrete access path. Add it to the accumulator
+        acc.add_access_path(access_path, *access);
+
+        Ok(())
+    }
+
+    /// Concretize the secondary indexes in `access_path` and add the result to `acc`. For example
+    fn concretize_secondary_indexes_<R: MoveResolver>(
+        module_cache: &ModuleCache<&R>,
+        blockchain_view: &R,
+        access_path: &AccessPath,
+        access: &Access,
+        acc: &mut ReadWriteSet,
+    ) -> Result<()> {
+        if let RootAddress::Const(g) = &access_path.root.root {
+            let tag = access_path
+                .root
+                .type_
+                .clone()
+                .into_struct_tag()
+                .ok_or_else(|| {
+                    anyhow!("Unbound type variable found: {:?}", access_path.root.type_)
+                })?;
+            if let Some(resource_bytes) = blockchain_view
+                .get_resource(g, &tag)
+                .map_err(|_| anyhow!("Failed to get resource for {:?}::{:?}", g, tag))?
+            {
+                let layout =
+                    TypeLayoutBuilder::build_runtime(&TypeTag::Struct(Box::new(tag)), module_cache)
+                        .map_err(|_| {
+                            anyhow!("Failed to resolve type: {:?}", access_path.root.type_)
+                        })?;
+
+                let resource =
+                    MoveValue::simple_deserialize(&resource_bytes, &layout).map_err(|_| {
+                        anyhow!(
+                            "Failed to deserialize move value of type: {:?}",
+                            access_path.root.type_
+                        )
+                    })?;
+                Self::concretize_offsets(
+                    module_cache,
+                    blockchain_view,
+                    access_path.clone(),
+                    resource,
+                    0,
+                    access,
+                    acc,
+                )?;
+            } // else, resource not present. this can happen/is expected because the R/W set is overapproximate
+        }
+        Ok(())
+    }
+}
+
+/// Bind all formals and type variables in `accesses` using `signers`, `actuals`, and
+/// `type_actuals`.
+pub fn bind_formals<R: GetModule>(
+    accesses: &ReadWriteSet,
+    module: &ModuleId,
+    fun: &IdentStr,
+    signers: &[AccountAddress],
+    actuals: &[Vec<u8>],
+    type_actuals: &[TypeTag],
+    module_cache: &R,
+) -> Result<ConcretizedFormals> {
+    let subst_map = type_actuals
+        .iter()
+        .map(|ty| Type::from(ty.clone()))
+        .collect::<Vec<_>>();
+
+    let compiled_module = module_cache
+        .get_module_by_id(module)
+        .map_err(|_| anyhow!("Failed to get module from storage"))?
+        .ok_or_else(|| anyhow!("Failed to get module"))?;
+
+    let func_sig = Function::new_from_name(compiled_module.borrow(), fun)
+        .ok_or_else(|| anyhow!("Failed to find function"))?;
+
+    // Check arity before binding. Otherwise we might get out-of-bound errors.
+    if func_sig.parameters.len() != actuals.len() + signers.len()
+        || func_sig.type_parameters.len() != type_actuals.len()
+    {
+        bail!("Script arity doesn't match");
+    }
+
+    let func_type = func_sig
+        .parameters
+        .iter()
+        .map(|ty| ty.subst(&subst_map).into_type_tag())
+        .collect::<Option<Vec<_>>>()
+        .ok_or_else(|| anyhow!("Failed to substitute types"))?;
+
+    ConcretizedFormals::from_args(
+        accesses,
+        signers,
+        actuals,
+        func_type.as_slice(),
+        type_actuals,
+    )
+}
+
+/// Bind all formals and type variables in `accesses` using `signers`, `actuals`, and
+/// `type_actuals`. In addition, concretize all secondary indexes in `accesses` against the state in
+/// `blockchain_view`.
+pub fn concretize(
+    accesses: &ReadWriteSet,
+    module: &ModuleId,
+    fun: &IdentStr,
+    signers: &[AccountAddress],
+    actuals: &[Vec<u8>],
+    type_actuals: &[TypeTag],
+    blockchain_view: &impl MoveResolver,
+) -> Result<ConcretizedSecondaryIndexes> {
+    let module_cache = ModuleCache::new(blockchain_view);
+    bind_formals(
+        accesses,
+        module,
+        fun,
+        signers,
+        actuals,
+        type_actuals,
+        &module_cache,
+    )?
+    .concretize_secondary_indexes(blockchain_view)
+    .ok_or_else(|| anyhow!("Failed to concretize secondary index"))
+}
+
+impl Deref for ConcretizedFormals {
+    type Target = ReadWriteSet;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl Deref for ConcretizedSecondaryIndexes {
+    type Target = ConcretizedFormals;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl fmt::Display for ConcretizedFormals {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        writeln!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Display for ConcretizedSecondaryIndexes {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        writeln!(f, "{}", self.0)
+    }
+}
diff --git a/vendors/move/crates/tools/read-write-set/dynamic/src/lib.rs b/vendors/move/crates/tools/read-write-set/dynamic/src/lib.rs
new file mode 100644
index 000000000..988ac0b1e
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/dynamic/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod dynamic_analysis;
+mod normalize;
+
+pub use dynamic_analysis::{ConcretizedFormals, ConcretizedSecondaryIndexes};
+pub use normalize::NormalizedReadWriteSetAnalysis;
diff --git a/vendors/move/crates/tools/read-write-set/dynamic/src/normalize.rs b/vendors/move/crates/tools/read-write-set/dynamic/src/normalize.rs
new file mode 100644
index 000000000..dd52590af
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/dynamic/src/normalize.rs
@@ -0,0 +1,216 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::dynamic_analysis::{
+    bind_formals, concretize, ConcretizedFormals, ConcretizedSecondaryIndexes,
+};
+use anyhow::{anyhow, bail, Result};
+use move_bytecode_utils::module_cache::GetModule;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, ResourceKey, TypeTag},
+    resolver::MoveResolver,
+};
+use move_read_write_set_types::ReadWriteSet;
+use std::collections::BTreeMap;
+
+pub struct NormalizedReadWriteSetAnalysis(BTreeMap<ModuleId, BTreeMap<Identifier, ReadWriteSet>>);
+
+impl NormalizedReadWriteSetAnalysis {
+    pub fn new(inner: BTreeMap<ModuleId, BTreeMap<Identifier, ReadWriteSet>>) -> Self {
+        Self(inner)
+    }
+
+    /// Trim the analysis result by dropping all the results in the trie. This should not affect the
+    /// correctness for those non secondary index access as all relevant info should be stored in
+    /// the root node already. Trimming the result will yield a higher inference speed at runtime.
+    pub fn trim(&self) -> Self {
+        Self(
+            self.0
+                .iter()
+                .map(|(module_id, func_map)| {
+                    (
+                        module_id.clone(),
+                        func_map
+                            .iter()
+                            .map(|(func_name, analysis_result)| {
+                                (func_name.clone(), analysis_result.trim())
+                            })
+                            .collect(),
+                    )
+                })
+                .collect(),
+        )
+    }
+
+    fn get_summary(&self, module: &ModuleId, fun: &IdentStr) -> Option<&ReadWriteSet> {
+        self.0.get(module)?.get(fun)
+    }
+
+    /// Returns an overapproximation of the `ResourceKey`'s in global storage that will be written
+    /// by `module::fun` if called with arguments `signers`, `actuals`, `type_actuals` in state
+    /// `blockchain_view`.
+    pub fn get_keys_written(
+        &self,
+        module: &ModuleId,
+        fun: &IdentStr,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        type_actuals: &[TypeTag],
+        blockchain_view: &impl MoveResolver,
+    ) -> Result<Vec<ResourceKey>> {
+        self.get_concretized_keys(
+            module,
+            fun,
+            signers,
+            actuals,
+            type_actuals,
+            blockchain_view,
+            true,
+        )
+    }
+
+    /// Returns an overapproximation of the `ResourceKey`'s in global storage that will be read by
+    /// `module::fun` if called with arguments `signers`, `actuals`, `type_actuals` in state
+    /// `blockchain_view`.
+    pub fn get_keys_read(
+        &self,
+        module: &ModuleId,
+        fun: &IdentStr,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        type_actuals: &[TypeTag],
+        blockchain_view: &impl MoveResolver,
+    ) -> Result<Vec<ResourceKey>> {
+        self.get_concretized_keys(
+            module,
+            fun,
+            signers,
+            actuals,
+            type_actuals,
+            blockchain_view,
+            false,
+        )
+    }
+
+    /// Returns an overapproximation of the `ResourceKey`'s in global storage that will be accesses
+    /// by module::fun` if called with arguments `signers`, `actuals`, `type_actuals` in state
+    /// `blockchain_view`.
+    /// If `is_write` is true, only ResourceKey's written will be returned; otherwise, only
+    /// ResourceKey's read will be returned.
+    pub fn get_concretized_keys(
+        &self,
+        module: &ModuleId,
+        fun: &IdentStr,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        type_actuals: &[TypeTag],
+        blockchain_view: &impl MoveResolver,
+        is_write: bool,
+    ) -> Result<Vec<ResourceKey>> {
+        if let Some(state) = self.get_summary(module, fun) {
+            let results = concretize(
+                state,
+                module,
+                fun,
+                signers,
+                actuals,
+                type_actuals,
+                blockchain_view,
+            )?;
+            Ok(if is_write {
+                results
+                    .get_keys_written()
+                    .ok_or_else(|| anyhow!("Failed to get keys written"))?
+            } else {
+                results
+                    .get_keys_read()
+                    .ok_or_else(|| anyhow!("Failed to get keys read"))?
+            })
+        } else {
+            bail!("Couldn't resolve function {:?}::{:?}", module, fun)
+        }
+    }
+
+    /// Returns an overapproximation of the access paths in global storage that will be read/written
+    /// by `module::fun` if called with arguments `signers`, `actuals`, `type_actuals` in state
+    /// `blockchain_view`.
+    pub fn get_concretized_summary(
+        &self,
+        module: &ModuleId,
+        fun: &IdentStr,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        type_actuals: &[TypeTag],
+        blockchain_view: &impl MoveResolver,
+    ) -> Result<ConcretizedSecondaryIndexes> {
+        let state = self
+            .get_summary(module, fun)
+            .ok_or_else(|| anyhow!("Function {}::{} to found", module, fun))?;
+        concretize(
+            state,
+            module,
+            fun,
+            signers,
+            actuals,
+            type_actuals,
+            blockchain_view,
+        )
+    }
+
+    pub fn get_canonical_summary(&self, module: &ModuleId, fun: &IdentStr) -> Option<ReadWriteSet> {
+        self.get_summary(module, fun).cloned()
+    }
+
+    /// Returns the access paths in global storage that will be read/written by `module::fun` if called with arguments `signers`, `actuals`, `type_actuals`. This will be an overapproximation if `module::fun` contains no secondary indexes; otherwise it is neither an overapproximation nor an underapproximation
+    /// by `module::fun` if called with arguments `signers`, `actuals`, `type_actuals`.
+    ///
+    /// We say "partially concretized" because the summary may contain secondary indexes that require reads from the current blockchain state to be concretized. If desired, the caller can concretized them using `<add API for this>`
+    /// be resolved or not.
+    pub fn get_partially_concretized_summary<R: GetModule>(
+        &self,
+        module: &ModuleId,
+        fun: &IdentStr,
+        signers: &[AccountAddress],
+        actuals: &[Vec<u8>],
+        type_actuals: &[TypeTag],
+        module_cache: &R,
+    ) -> Result<ConcretizedFormals> {
+        let state = self
+            .get_summary(module, fun)
+            .ok_or_else(|| anyhow!("Function {}::{} not found", module, fun))?;
+        bind_formals(
+            state,
+            module,
+            fun,
+            signers,
+            actuals,
+            type_actuals,
+            module_cache,
+        )
+    }
+
+    /// Return `true` if `module`::`fun` may read an address from the blockchain state and
+    /// subsequently read/write a resource stored at that address. Return `false` if the function
+    /// will not do this in any possible concrete execution. Return an error if `module`::`fun` does
+    /// not exist.
+    pub fn may_have_secondary_indexes(&self, module: &ModuleId, fun: &IdentStr) -> Result<bool> {
+        let state = self
+            .get_summary(module, fun)
+            .ok_or_else(|| anyhow!("Function {}::{} to found", module, fun))?;
+        let mut has_secondary_index = false;
+        state.iter_paths(|offset, _| {
+            if offset.has_secondary_index() {
+                has_secondary_index = true;
+            }
+            Some(())
+        });
+        Ok(has_secondary_index)
+    }
+
+    pub fn into_inner(self) -> BTreeMap<ModuleId, BTreeMap<Identifier, ReadWriteSet>> {
+        self.0
+    }
+}
diff --git a/vendors/move/crates/tools/read-write-set/src/lib.rs b/vendors/move/crates/tools/read-write-set/src/lib.rs
new file mode 100644
index 000000000..f0bc4c30a
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/src/lib.rs
@@ -0,0 +1,104 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::Result;
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_utils::Modules;
+use move_core_types::{
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+};
+use move_model::model::{FunctionEnv, GlobalEnv};
+use move_read_write_set_types::ReadWriteSet;
+use prover_bytecode::{
+    function_target_pipeline::{FunctionTargetPipeline, FunctionTargetsHolder, FunctionVariant},
+    read_write_set_analysis::{ReadWriteSetProcessor, ReadWriteSetState},
+};
+use read_write_set_dynamic::NormalizedReadWriteSetAnalysis;
+use std::collections::BTreeMap;
+
+pub struct ReadWriteSetAnalysis {
+    targets: FunctionTargetsHolder,
+    env: GlobalEnv,
+}
+
+/// Infer read/write set results for `modules`.
+/// The `modules` list must be topologically sorted by the dependency relation
+/// (i.e., a child node in the dependency graph should appear earlier in the
+/// vector than its parents), and all dependencies of each module must be
+/// included.
+pub fn analyze<'a>(
+    modules: impl IntoIterator<Item = &'a CompiledModule>,
+) -> Result<ReadWriteSetAnalysis> {
+    let module_map = Modules::new(modules);
+    let dep_graph = module_map.compute_dependency_graph();
+    let topo_order = dep_graph.compute_topological_order()?;
+    analyze_sorted(topo_order)
+}
+
+/// Like analyze_unsorted, but assumes that `modules` is already topologically sorted
+pub fn analyze_sorted<'a>(
+    modules: impl IntoIterator<Item = &'a CompiledModule>,
+) -> Result<ReadWriteSetAnalysis> {
+    let env = move_model::run_bytecode_model_builder(modules)?;
+    let mut pipeline = FunctionTargetPipeline::default();
+    pipeline.add_processor(ReadWriteSetProcessor::new());
+    let mut targets = FunctionTargetsHolder::default();
+    for module_env in env.get_modules() {
+        for func_env in module_env.get_functions() {
+            targets.add_target(&func_env)
+        }
+    }
+    pipeline.run(&env, &mut targets);
+
+    Ok(ReadWriteSetAnalysis { targets, env })
+}
+
+impl ReadWriteSetAnalysis {
+    /// Return an overapproximation access paths read/written by `module`::`fun`.
+    /// Returns `None` if the function or module does not exist.
+    pub fn get_summary(&self, module: &ModuleId, fun: &IdentStr) -> Option<&ReadWriteSetState> {
+        self.get_function_env(module, fun).and_then(|fenv| {
+            self.targets
+                .get_data(&fenv.get_qualified_id(), &FunctionVariant::Baseline)
+                .and_then(|data| data.annotations.get::<ReadWriteSetState>())
+        })
+    }
+
+    /// Returns the FunctionEnv for `module`::`fun`
+    /// Returns `None` if this function does not exist
+    pub fn get_function_env(&self, module: &ModuleId, fun: &IdentStr) -> Option<FunctionEnv> {
+        self.env
+            .find_function_by_language_storage_id_name(module, fun)
+    }
+
+    /// Normalize the analysis result computed from the move-prover pipeline.
+    ///
+    /// This will include all the script functions and the list function names provided in `add_ons`
+    /// that are required by the adapter, such as prologues, epilogues, etc.
+    pub fn normalize_all_scripts(
+        &self,
+        add_ons: Vec<(ModuleId, Identifier)>,
+    ) -> NormalizedReadWriteSetAnalysis {
+        let mut result: BTreeMap<ModuleId, BTreeMap<Identifier, ReadWriteSet>> = BTreeMap::new();
+        for module in self.env.get_modules() {
+            let module_id = module.get_verified_module().self_id();
+            let module_entry = result.entry(module_id.clone()).or_default();
+            for func in module.get_functions() {
+                let func_name = func.get_identifier();
+                if func.is_script() || add_ons.contains(&(module_id.clone(), func_name.clone())) {
+                    module_entry.insert(
+                        func.get_identifier(),
+                        self.targets
+                            .get_data(&func.get_qualified_id(), &FunctionVariant::Baseline)
+                            .and_then(|data| data.annotations.get::<ReadWriteSetState>())
+                            .unwrap()
+                            .normalize(&self.env),
+                    );
+                }
+            }
+        }
+        NormalizedReadWriteSetAnalysis::new(result)
+    }
+}
diff --git a/vendors/move/crates/tools/read-write-set/types/Cargo.toml b/vendors/move/crates/tools/read-write-set/types/Cargo.toml
new file mode 100644
index 000000000..d4867eee9
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/types/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "move-read-write-set-types"
+version = "0.0.3"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Type definition for read/write set inference for Move bytecode programs"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = ["crates-io"]
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.52"
+move-binary-format = { path = "../../../move-binary-format", version = "0.0.3" }
+move-core-types = { path = "../../../move-core-types", version = "0.0.4" }
+serde = { version = "1.0.124", default-features = false }
diff --git a/vendors/move/crates/tools/read-write-set/types/src/access.rs b/vendors/move/crates/tools/read-write-set/types/src/access.rs
new file mode 100644
index 000000000..69624e390
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/types/src/access.rs
@@ -0,0 +1,46 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+
+/// An access to local or global state
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+pub enum Access {
+    /// Read via RHS * or exists
+    Read,
+    /// Written via LHS *, move_to, or move_from
+    Write,
+    /// Could be read or written
+    ReadWrite,
+}
+
+impl Access {
+    pub fn is_read(&self) -> bool {
+        match self {
+            Access::Read | Access::ReadWrite => true,
+            Access::Write => false,
+        }
+    }
+
+    pub fn is_write(&self) -> bool {
+        match self {
+            Access::Write | Access::ReadWrite => true,
+            Access::Read => false,
+        }
+    }
+}
+
+impl PartialOrd for Access {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self == other {
+            return Some(Ordering::Equal);
+        }
+        match (self, other) {
+            (Access::ReadWrite, _) => Some(Ordering::Greater),
+            (_, Access::ReadWrite) => Some(Ordering::Less),
+            _ => None,
+        }
+    }
+}
diff --git a/vendors/move/crates/tools/read-write-set/types/src/lib.rs b/vendors/move/crates/tools/read-write-set/types/src/lib.rs
new file mode 100644
index 000000000..c7a89510a
--- /dev/null
+++ b/vendors/move/crates/tools/read-write-set/types/src/lib.rs
@@ -0,0 +1,325 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod access;
+
+pub use access::Access;
+use move_binary_format::normalized::Type;
+use move_core_types::{
+    account_address::AccountAddress,
+    language_storage::{ResourceKey, TypeTag},
+};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::btree_map::BTreeMap,
+    fmt::{self, Formatter},
+};
+
+/// Offset of an access path: either a field, vector index, or global key
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum Offset {
+    /// Index into contents of a struct by field offset
+    Field(usize),
+    /// Unknown index into a vector
+    VectorIndex,
+    /// A type index into global storage. Only follows a field or vector index of type address
+    Global(Type),
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct TrieNode {
+    /// Optional data associated with the parent in the trie
+    data: Option<Access>,
+    /// Child pointers labeled by offsets
+    children: BTreeMap<Offset, TrieNode>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum RootAddress {
+    Const(AccountAddress),
+    Formal(usize),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Root {
+    pub root: RootAddress,
+    pub type_: Type,
+}
+
+#[derive(Debug, Clone)]
+pub struct AccessPath {
+    pub root: Root,
+    pub offsets: Vec<Offset>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct ReadWriteSet(BTreeMap<Root, TrieNode>);
+
+impl Root {
+    fn subst_actuals(&self, type_actuals: &[Type], actuals: &[Option<AccountAddress>]) -> Self {
+        let root_address = match &self.root {
+            RootAddress::Const(addr) => RootAddress::Const(*addr),
+            RootAddress::Formal(i) => {
+                if let Some(addr) = actuals.get(*i).and_then(|v| *v) {
+                    RootAddress::Const(addr)
+                } else {
+                    panic!("Type parameter index out of bound")
+                }
+            },
+        };
+        Self {
+            root: root_address,
+            type_: self.type_.subst(type_actuals),
+        }
+    }
+}
+
+impl AccessPath {
+    pub fn offset(&self) -> &[Offset] {
+        self.offsets.as_slice()
+    }
+
+    pub fn root(&self) -> &Root {
+        &self.root
+    }
+
+    pub fn add_offset(&mut self, offset: Offset) {
+        self.offsets.push(offset)
+    }
+
+    pub fn new_global_constant(addr: AccountAddress, ty: Type) -> Self {
+        Self {
+            root: Root {
+                root: RootAddress::Const(addr),
+                type_: ty,
+            },
+            offsets: vec![],
+        }
+    }
+
+    pub fn has_secondary_index(&self) -> bool {
+        self.offsets.iter().any(|offset| match offset {
+            Offset::Global(_) => true,
+            Offset::Field(_) | Offset::VectorIndex => false,
+        })
+    }
+}
+
+impl Offset {
+    fn sub_type_actuals(&self, type_actuals: &[Type]) -> Self {
+        match self {
+            Offset::Global(s) => Offset::Global(s.subst(type_actuals)),
+            Offset::Field(_) | Offset::VectorIndex => self.clone(),
+        }
+    }
+}
+
+impl TrieNode {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            data: None,
+            children: BTreeMap::new(),
+        }
+    }
+
+    fn iter_paths_opt<F>(&self, access_path: &AccessPath, f: &mut F)
+    where
+        F: FnMut(&AccessPath, &Access),
+    {
+        if let Some(access) = &self.data {
+            f(access_path, access);
+        }
+        for (k, v) in self.children.iter() {
+            let mut new_ap = access_path.clone();
+            new_ap.offsets.push(k.clone());
+            v.iter_paths_opt(&new_ap, f)
+        }
+    }
+
+    fn sub_type_actuals(&self, type_actuals: &[Type]) -> Self {
+        Self {
+            data: self.data,
+            children: self
+                .children
+                .iter()
+                .map(|(offset, node)| {
+                    (
+                        offset.sub_type_actuals(type_actuals),
+                        node.sub_type_actuals(type_actuals),
+                    )
+                })
+                .collect::<BTreeMap<_, _>>(),
+        }
+    }
+
+    fn get_access(&self) -> Option<Access> {
+        self.get_access_impl(None)
+    }
+
+    fn get_access_impl(&self, mut acc: Option<Access>) -> Option<Access> {
+        acc = match (self.data, acc) {
+            (Some(lhs), Some(rhs)) => {
+                if lhs != rhs {
+                    Some(Access::ReadWrite)
+                } else {
+                    Some(lhs)
+                }
+            },
+            (Some(_), None) => self.data,
+            (None, _) => acc,
+        };
+        for (_, children) in self.children.iter() {
+            acc = children.get_access_impl(acc)
+        }
+        acc
+    }
+}
+
+impl ReadWriteSet {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    pub fn trim(&self) -> Self {
+        Self(
+            self.0
+                .iter()
+                .map(|(root, node)| {
+                    (root.clone(), TrieNode {
+                        data: node.get_access(),
+                        children: BTreeMap::new(),
+                    })
+                })
+                .collect(),
+        )
+    }
+
+    pub fn add_access_path(&mut self, access_path: AccessPath, access: Access) {
+        let mut node = self.0.entry(access_path.root).or_insert_with(TrieNode::new);
+        for offset in access_path.offsets {
+            node = node.children.entry(offset).or_insert_with(TrieNode::new);
+        }
+        node.data = Some(access);
+    }
+
+    fn iter_paths_impl<F>(&self, mut f: F) -> Option<()>
+    where
+        F: FnMut(&AccessPath, &Access) -> Option<()>,
+    {
+        let mut result = Some(());
+        for (key, node) in self.0.iter() {
+            let access_path = AccessPath {
+                root: key.clone(),
+                offsets: vec![],
+            };
+            node.iter_paths_opt(&access_path, &mut |access_path, access| {
+                if result.is_none() {
+                    return;
+                }
+                result = f(access_path, access);
+            });
+        }
+        result
+    }
+
+    pub fn iter_paths<F>(&self, f: F) -> Option<()>
+    where
+        F: FnMut(&AccessPath, &Access) -> Option<()>,
+    {
+        self.iter_paths_impl(f)
+    }
+
+    fn get_keys_(&self, is_write: bool) -> Option<Vec<ResourceKey>> {
+        let mut results = vec![];
+        for (key, node) in self.0.iter() {
+            let keep = match node.get_access() {
+                Some(access) => {
+                    if is_write {
+                        access.is_write()
+                    } else {
+                        access.is_read()
+                    }
+                },
+                None => false,
+            };
+            if keep {
+                match key.root {
+                    RootAddress::Const(addr) => {
+                        results.push(ResourceKey::new(addr, key.type_.clone().into_struct_tag()?))
+                    },
+                    RootAddress::Formal(_) => return None,
+                }
+            }
+        }
+        Some(results)
+    }
+
+    pub fn get_keys_written(&self) -> Option<Vec<ResourceKey>> {
+        self.get_keys_(true)
+    }
+
+    pub fn get_keys_read(&self) -> Option<Vec<ResourceKey>> {
+        self.get_keys_(false)
+    }
+
+    pub fn sub_actuals(
+        &self,
+        actuals: &[Option<AccountAddress>],
+        type_actuals: &[TypeTag],
+    ) -> Self {
+        let types: Vec<_> = type_actuals
+            .iter()
+            .map(|ty| Type::from(ty.clone()))
+            .collect();
+        Self(
+            self.0
+                .iter()
+                .map(|(root, node)| {
+                    (
+                        root.subst_actuals(&types, actuals),
+                        node.sub_type_actuals(&types),
+                    )
+                })
+                .collect::<BTreeMap<_, _>>(),
+        )
+    }
+}
+
+impl fmt::Display for Root {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.root {
+            RootAddress::Const(addr) => write!(f, "0x{}", addr.short_str_lossless())?,
+            RootAddress::Formal(i) => write!(f, "Formal({})", i)?,
+        };
+        write!(f, "/{}", self.type_)
+    }
+}
+impl fmt::Display for Offset {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            Offset::Global(ty) => write!(f, "{}", ty),
+            Offset::VectorIndex => write!(f, "[_]"),
+            Offset::Field(i) => write!(f, "{:?}", i),
+        }
+    }
+}
+impl fmt::Display for AccessPath {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.root)?;
+        for offset in &self.offsets {
+            f.write_str("/")?;
+            write!(f, "{}", offset)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Display for ReadWriteSet {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        self.iter_paths(|path, v| writeln!(f, "{}: {:?}", path, v).ok());
+        Ok(())
+    }
+}
diff --git a/vendors/move/documentation/book/.gitignore b/vendors/move/documentation/book/.gitignore
new file mode 100644
index 000000000..5a0bf0317
--- /dev/null
+++ b/vendors/move/documentation/book/.gitignore
@@ -0,0 +1 @@
+/book
diff --git a/vendors/move/documentation/book/README.md b/vendors/move/documentation/book/README.md
new file mode 100644
index 000000000..6398c472d
--- /dev/null
+++ b/vendors/move/documentation/book/README.md
@@ -0,0 +1,38 @@
+---
+id: move-book
+title: Move Book
+custom_edit_url: https://github.com/move-language/move/edit/main/language/documentation/book/README.md
+---
+
+In order to update the Move book and preview changes to it you'll need to
+install
+[`mdbook`](https://rust-lang.github.io/mdBook/guide/installation.html). You
+can do this via `cargo install mdbook`.
+
+After installing mdbook, you can preview changes via either `mdbook serve`,
+or if you want the output to change as you make changes to the book you can
+use `mdbook watch`. More information on options can be found at the [mdbook
+website](https://rust-lang.github.io/mdBook/).
+
+Once you are happy with your changes to the Move book, you can create a PR to
+update the Move book website. This is the process that has been used in
+the past and is known to work, but there may be a better way:
+
+1. Run `mdbook build` in this directory. This will create a directory
+called `book`. Copy this to some location `L` outside of the Move git tree.
+
+2. Make sure your upstream is up-to-date and checkout to `upstream/gh-pages`.
+
+3. Once you have checked out to `upstream/gh-pages`, make sure you are at the
+root of the repo. You should see a number of `.html` files. You can now
+move all contents in `L` to this location: `mv L/* .`
+
+4. Once this is done inspect things to make sure the book looks the way you
+want. If everything looks good submit a PR to the **`gh-pages`** branch of the
+main Move repo.
+
+After this the normal PR process is followed. Once the PR has been accepted and
+lands the updated Move book should be visible immediately.
+
+**NB:** When adding a new (sub)section to the book you _must_ include the new
+file in the `SUMMARY.md` file otherwise it will not appear in the updated book.
diff --git a/vendors/move/documentation/book/book.toml b/vendors/move/documentation/book/book.toml
new file mode 100644
index 000000000..8ead41f87
--- /dev/null
+++ b/vendors/move/documentation/book/book.toml
@@ -0,0 +1,12 @@
+[book]
+title = "The Move Book"
+description = "Move book maintained by the Move core team."
+authors = ["The Move Contributors"]
+language = "en"
+multilingual = false
+src = "src"
+
+[output.html]
+git-repository-url = "https://github.com/move-language/move"
+git-repository-icon = "fa-github"
+edit-url-template = "https://github.com/move-language/move/edit/main/language/documentation/book/{path}"
diff --git a/vendors/move/documentation/book/src/SUMMARY.md b/vendors/move/documentation/book/src/SUMMARY.md
new file mode 100644
index 000000000..1ed9cbc12
--- /dev/null
+++ b/vendors/move/documentation/book/src/SUMMARY.md
@@ -0,0 +1,45 @@
+# The Move Programming Language
+
+[Introduction](introduction.md)
+
+## Getting Started
+
+- [Modules and Scripts](modules-and-scripts.md)
+- [Move Tutorial](creating-coins.md)
+
+## Primitive Types
+
+- [Integers](integers.md)
+- [Bool](bool.md)
+- [Address](address.md)
+- [Vector](vector.md)
+- [Signer](signer.md)
+- [References](references.md)
+- [Tuples and Unit](tuples.md)
+
+## Basic Concepts
+
+- [Local Variables and Scopes](variables.md)
+- [Equality](equality.md)
+- [Abort and Assert](abort-and-assert.md)
+- [Conditionals](conditionals.md)
+- [While and Loop](loops.md)
+- [Functions](functions.md)
+- [Structs and Resources](structs-and-resources.md)
+- [Constants](constants.md)
+- [Generics](generics.md)
+- [Type Abilities](abilities.md)
+- [Uses and Aliases](uses.md)
+- [Friends](friends.md)
+- [Packages](packages.md)
+- [Unit Tests](unit-testing.md)
+
+## Global Storage
+
+- [Global Storage Structure](global-storage-structure.md)
+- [Global Storage Operators](global-storage-operators.md)
+
+## Reference
+
+- [Standard Library](standard-library.md)
+- [Coding Conventions](coding-conventions.md)
diff --git a/vendors/move/documentation/book/src/abilities.md b/vendors/move/documentation/book/src/abilities.md
new file mode 100644
index 000000000..2abe21b8e
--- /dev/null
+++ b/vendors/move/documentation/book/src/abilities.md
@@ -0,0 +1,244 @@
+# Abilities
+
+Abilities are a typing feature in Move that control what actions are permissible for values of a given type. This system grants fine grained control over the "linear" typing behavior of values, as well as if and how values are used in global storage. This is implemented by gating access to certain bytecode instructions so that for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+<!-- TODO future section on detailed walk through maybe. We have some examples at the end but it might be helpful to explain why we have precisely this set of abilities
+
+If you are already somewhat familiar with abilities from writing Move programs, but are still confused as to what is going on, it might be helpful to skip to the [motivating walkthrough](#motivating-walkthrough) section to get an idea of what the system is setup in the way that it is. -->
+
+## The Four Abilities
+
+The four abilities are:
+
+* [`copy`](#copy)
+    * Allows values of types with this ability to be copied.
+* [`drop`](#drop)
+    * Allows values of types with this ability to be popped/dropped.
+* [`store`](#store)
+    * Allows values of types with this ability to exist inside a struct in global storage.
+* [`key`](#key)
+    * Allows the type to serve as a key for global storage operations.
+
+### `copy`
+
+The `copy` ability allows values of types with that ability to be copied. It gates the ability to copy values out of local variables with the [`copy`](./variables.md#move-and-copy) operator and to copy values via references with [dereference `*e`](./references.md#reading-and-writing-through-references).
+
+If a value has `copy`, all values contained inside of that value have `copy`.
+
+### `drop`
+
+The `drop` ability allows values of types with that ability to be dropped. By dropped, we mean that value is not transferred and is effectively destroyed as the Move program executes. As such, this ability gates the ability to ignore values in a multitude of locations, including:
+* not using the value in a local variable or parameter
+* not using the value in a [sequence via `;`](./variables.md#expression-blocks)
+* overwriting values in variables in [assignments](./variables.md#assignments)
+* overwriting values via references when [writing `*e1 = e2`](./references.md#reading-and-writing-through-references).
+
+If a value has `drop`, all values contained inside of that value have `drop`.
+
+### `store`
+
+The `store` ability allows values of types with this ability to exist inside of a struct (resource) in global storage, *but* not necessarily as a top-level resource in global storage. This is the only ability that does not directly gate an operation. Instead it gates the existence in global storage when used in tandem with `key`.
+
+If a value has `store`, all values contained inside of that value have `store`
+
+### `key`
+
+The `key` ability allows the type to serve as a key for [global storage operations](./global-storage-operators.md). It gates all global storage operations, so in order for a type to be used with `move_to`, `borrow_global`, `move_from`, etc., the type must have the `key` ability. Note that the operations still must be used in the module where the `key` type is defined (in a sense, the operations are private to the defining module).
+
+If a value has `key`, all values contained inside of that value have `store`. This is the only ability with this sort of asymmetry.
+
+## Builtin Types
+
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `drop`
+
+* `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities and Generic Types](#conditional-abilities-and-generic-types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+None of the primitive types have `key`, meaning none of them can be used directly with the [global storage operations](./global-storage-operators.md).
+
+## Annotating Structs
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+```move
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case: `Ignorable` has the `drop` ability. `Pair` has `copy`, `drop`, and `store`.
+
+
+All of these abilities have strong guarantees over these gated operations. The operation can be performed on the value only if it has that ability; even if the value is deeply nested inside of some other collection!
+
+As such: when declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for the abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`.
+* `drop`, all fields must have `drop`.
+* `store`, all fields must have `store`.
+* `key`, all fields must have `store`.
+    * `key` is the only ability currently that doesn’t require itself.
+
+For example:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+## Conditional Abilities and Generic Types
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+```
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+It might be very helpful if `Cup` could hold any type, regardless of its abilities. The type system can *see* the type parameter, so it should be able to remove abilities from `Cup` if it *sees* a type parameter that would violate the guarantees for that ability.
+
+This behavior might sound a bit confusing at first, but it might be more understandable if we think about collection types. We could consider the builtin type `vector` to have the following type declaration:
+
+```
+vector<T> has copy, drop, store;
+```
+
+We want `vector`s to work with any type. We don't want separate `vector` types for different abilities. So what are the rules we would want? Precisely the same that we would want with the field rules above.  So, it would be safe to copy a `vector` value only if the inner elements can be copied. It would be safe to ignore a `vector` value only if the inner elements can be ignored/dropped. And, it would be safe to put a `vector` in global storage only if the inner elements can be in global storage.
+
+To have this extra expressiveness, a type might not have all the abilities it was declared with depending on the instantiation of that type; instead, the abilities a type will have depends on both its declaration **and** its type arguments. For any type, type parameters are pessimistically assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. Taking `Cup` from above as an example:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+Here are examples for this conditional system for each ability:
+
+### Example: conditional `copy`
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'copy' because 'S' has 'copy'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'copy'
+    // because 'NoAbilities' does not have 'copy'
+    let c_n2 = copy c_n;
+}
+```
+
+### Example: conditional `drop`
+
+```
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+}
+```
+
+### Example: conditional `store`
+
+```
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+### Example: conditional `key`
+
+```
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
diff --git a/vendors/move/documentation/book/src/abort-and-assert.md b/vendors/move/documentation/book/src/abort-and-assert.md
new file mode 100644
index 000000000..ce3e87478
--- /dev/null
+++ b/vendors/move/documentation/book/src/abort-and-assert.md
@@ -0,0 +1,207 @@
+# Abort and Assert
+
+[`return`](./functions.md) and `abort` are two control flow constructs that end execution, one for
+the current function and one for the entire transaction.
+
+More information on [`return` can be found in the linked section](./functions.md)
+
+## `abort`
+
+`abort` is an expression that takes one argument: an **abort code** of type `u64`. For example:
+
+```move
+abort 42
+```
+
+The `abort` expression halts execution the current function and reverts all changes made to global
+state by the current transaction. There is no mechanism for "catching" or otherwise handling an
+`abort`.
+
+Luckily, in Move transactions are all or nothing, meaning any changes to global storage are made all
+at once only if the transaction succeeds. Because of this transactional commitment of changes, after
+an abort there is no need to worry about backing out changes. While this approach is lacking in
+flexibility, it is incredibly simple and predictable.
+
+Similar to [`return`](./functions.md), `abort` is useful for exiting control flow when some
+condition cannot be met.
+
+In this example, the function will pop two items off of the vector, but will abort early if the
+vector does not have two items
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    if (vector::length(v) < 2) abort 42;
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+This is even more useful deep inside a control-flow construct. For example, this function checks
+that all numbers in the vector are less than the specified `bound`. And aborts otherwise
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        if (cur > bound) abort 42;
+        i = i + 1;
+    }
+}
+```
+
+### `assert`
+
+`assert` is a builtin, macro-like operation provided by the Move compiler. It takes two arguments, a
+condition of type `bool` and a code of type `u64`
+
+```move
+assert!(condition: bool, code: u64)
+```
+
+Since the operation is a macro, it must be invoked with the `!`. This is to convey that the
+arguments to `assert` are call-by-expression. In other words, `assert` is not a normal function and
+does not exist at the bytecode level. It is replaced inside the compiler with
+
+```move
+if (condition) () else abort code
+```
+
+`assert` is more commonly used than just `abort` by itself. The `abort` examples above can be
+rewritten using `assert`
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    assert!(vector::length(v) >= 2, 42); // Now uses 'assert'
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+and
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        assert!(cur <= bound, 42); // Now uses 'assert'
+        i = i + 1;
+    }
+}
+```
+
+Note that because the operation is replaced with this `if-else`, the argument for the `code` is not
+always evaluated. For example:
+
+```move
+assert!(true, 1 / 0)
+```
+
+Will not result in an arithmetic error, it is equivalent to
+
+```move
+if (true) () else (1 / 0)
+```
+
+So the arithmetic expression is never evaluated!
+
+### Abort codes in the Move VM
+
+When using `abort`, it is important to understand how the `u64` code will be used by the VM.
+
+Normally, after successful execution, the Move VM produces a change-set for the changes made to
+global storage (added/removed resources, updates to existing resources, etc).
+
+If an `abort` is reached, the VM will instead indicate an error. Included in that error will be two
+pieces of information:
+
+- The module that produced the abort (address and name)
+- The abort code.
+
+For example
+
+```move=
+address 0x2 {
+module example {
+    public fun aborts() {
+        abort 42
+    }
+}
+}
+
+script {
+    fun always_aborts() {
+        0x2::example::aborts()
+    }
+}
+```
+
+If a transaction, such as the script `always_aborts` above, calls `0x2::example::aborts`, the VM
+would produce an error that indicated the module `0x2::example` and the code `42`.
+
+This can be useful for having multiple aborts being grouped together inside a module.
+
+In this example, the module has two separate error codes used in multiple functions
+
+```move=
+address 0x42 {
+module example {
+
+    use std::vector;
+
+    const EMPTY_VECTOR: u64 = 0;
+    const INDEX_OUT_OF_BOUNDS: u64 = 1;
+
+    // move i to j, move j to k, move k to i
+    public fun rotate_three<T>(v: &mut vector<T>, i: u64, j: u64, k: u64) {
+        let n = vector::length(v);
+        assert!(n > 0, EMPTY_VECTOR);
+        assert!(i < n, INDEX_OUT_OF_BOUNDS);
+        assert!(j < n, INDEX_OUT_OF_BOUNDS);
+        assert!(k < n, INDEX_OUT_OF_BOUNDS);
+
+        vector::swap(v, i, k);
+        vector::swap(v, j, k);
+    }
+
+    public fun remove_twice<T>(v: &mut vector<T>, i: u64, j: u64): (T, T) {
+        let n = vector::length(v);
+        assert!(n > 0, EMPTY_VECTOR);
+        assert!(i < n, INDEX_OUT_OF_BOUNDS);
+        assert!(j < n, INDEX_OUT_OF_BOUNDS);
+        assert!(i > j, INDEX_OUT_OF_BOUNDS);
+
+        (vector::remove<T>(v, i), vector::remove<T>(v, j))
+    }
+}
+}
+```
+
+## The type of `abort`
+
+The `abort i` expression can have any type! This is because both constructs break from the normal
+control flow, so they never need to evaluate to the value of that type.
+
+The following are not useful, but they will type check
+
+```move
+let y: address = abort 0;
+```
+
+This behavior can be helpful in situations where you have a branching instruction that produces a
+value on some branches, but not all. For example:
+
+```move
+let b =
+    if (x == 0) false
+    else if (x == 1) true
+    else abort 42;
+//       ^^^^^^^^ `abort 42` has type `bool`
+```
diff --git a/vendors/move/documentation/book/src/address.md b/vendors/move/documentation/book/src/address.md
new file mode 100644
index 000000000..88d8b3f5e
--- /dev/null
+++ b/vendors/move/documentation/book/src/address.md
@@ -0,0 +1,73 @@
+# Address
+
+`address` is a built-in type in Move that is used to represent locations (sometimes called accounts) in global storage. An `address` value is a 128-bit (16 byte) identifier. At a given address, two things can be stored: [Modules](./modules-and-scripts.md) and [Resources](./structs-and-resources.md).
+
+Although an `address` is a 128 bit integer under the hood, Move addresses are intentionally opaque---they cannot be created from integers, they do not support arithmetic operations, and they cannot be modified. Even though there might be interesting programs that would use such a feature (e.g., pointer arithmetic in C fills a similar niche), Move does not allow this dynamic behavior because it has been designed from the ground up to support static verification.
+
+You can use runtime address values (values of type `address`) to access resources at that address. You *cannot* access modules at runtime via address values.
+
+## Addresses and Their Syntax
+
+Addresses come in two flavors, named or numerical. The syntax for a named address follows the
+same rules for any named identifier in Move. The syntax of a numerical address is not restricted
+to hex-encoded values, and any valid [`u128` numerical value](./integers.md) can be used as an
+address value, e.g., `42`, `0xCAFE`, and `2021` are all valid numerical address
+literals.
+
+To distinguish when an address is being used in an expression context or not, the
+syntax when using an address differs depending on the context where it's used:
+* When an address is used as an expression the address must be prefixed by the `@` character, i.e., [`@<numerical_value>`](./integers.md) or `@<named_address_identifier>`.
+* Outside of expression contexts, the address may be written without the leading `@` character, i.e., [`<numerical_value>`](./integers.md) or `<named_address_identifier>`.
+
+In general, you can think of `@` as an operator that takes an address from being a namespace item to being an expression item.
+
+## Named Addresses
+
+Named addresses are a feature that allow identifiers to be used in place of
+numerical values in any spot where addresses are used, and not just at the
+value level.  Named addresses are declared and bound as top level elements
+(outside of modules and scripts) in Move Packages, or passed as arguments
+to the Move compiler.
+
+Named addresses only exist at the source language level and will be fully
+substituted for their value at the bytecode level. Because of this, modules
+and module members _must_ be accessed through the module's named address
+and not through the numerical value assigned to the named address during
+compilation, e.g., `use my_addr::foo` is _not_ equivalent to `use 0x2::foo`
+even if the Move program is compiled with `my_addr` set to `0x2`. This
+distinction is discussed in more detail in the section on [Modules and
+Scripts](./modules-and-scripts.md).
+
+### Examples
+
+```move
+let a1: address = @0x1; // shorthand for 0x00000000000000000000000000000001
+let a2: address = @0x42; // shorthand for 0x00000000000000000000000000000042
+let a3: address = @0xDEADBEEF; // shorthand for 0x000000000000000000000000DEADBEEF
+let a4: address = @0x0000000000000000000000000000000A;
+let a5: address = @std; // Assigns `a5` the value of the named address `std`
+let a6: address = @66;
+let a7: address = @0x42;
+
+module 66::some_module {   // Not in expression context, so no @ needed
+    use 0x1::other_module; // Not in expression context so no @ needed
+    use std::vector;       // Can use a named address as a namespace item when using other modules
+    ...
+}
+
+module std::other_module {  // Can use a named address as a namespace item to declare a module
+    ...
+}
+```
+
+## Global Storage Operations
+
+The primary purpose of `address` values are to interact with the global storage operations.
+
+`address` values are used with the `exists`, `borrow_global`, `borrow_global_mut`, and `move_from` [operations](./global-storage-operators.md).
+
+The only global storage operation that *does not* use `address` is `move_to`, which uses [`signer`](./signer.md).
+
+## Ownership
+
+As with the other scalar values built-in to the language, `address` values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/documentation/book/src/bool.md b/vendors/move/documentation/book/src/bool.md
new file mode 100644
index 000000000..6423a8c63
--- /dev/null
+++ b/vendors/move/documentation/book/src/bool.md
@@ -0,0 +1,33 @@
+# Bool
+
+`bool` is Move's primitive type for boolean `true` and `false` values.
+
+## Literals
+
+Literals for `bool` are either `true` or `false`.
+
+## Operations
+
+### Logical
+
+`bool` supports three logical operations:
+
+| Syntax                    | Description                  | Equivalent Expression                                               |
+| ------------------------- | ---------------------------- | ------------------------------------------------------------------- |
+| `&&`                      | short-circuiting logical and | `p && q` is equivalent to `if (p) q else false`                     |
+| <code>&vert;&vert;</code> | short-circuiting logical or  | <code>p &vert;&vert; q</code> is equivalent to `if (p) true else q` |
+| `!`                       | logical negation             | `!p` is equivalent to `if (p) false else true`                      |
+
+### Control Flow
+
+`bool` values are used in several of Move's control-flow constructs:
+
+- [`if (bool) { ... }`](./conditionals.md)
+- [`while (bool) { .. }`](./loops.md)
+- [`assert!(bool, u64)`](./abort-and-assert.md)
+
+## Ownership
+
+As with the other scalar values built-in to the language, boolean values are implicitly copyable,
+meaning they can be copied without an explicit instruction such as
+[`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/documentation/book/src/coding-conventions.md b/vendors/move/documentation/book/src/coding-conventions.md
new file mode 100644
index 000000000..caea845e4
--- /dev/null
+++ b/vendors/move/documentation/book/src/coding-conventions.md
@@ -0,0 +1,77 @@
+# Move Coding Conventions
+
+This section lays out some basic coding conventions for Move that the Move team has found helpful. These are only recommendations, and you should feel free to use other formatting guidelines and conventions if you have a preference for them.
+
+## Naming
+
+- **Module names**: should be lower snake case, e.g., `fixed_point32`, `vector`.
+- **Type names**: should be camel case if they are not a native type, e.g., `Coin`, `RoleId`.
+- **Function names**: should be lower snake case, e.g., `destroy_empty`.
+- **Constant names**: should be upper camel case and begin with an `E` if they represent error codes (e.g., `EIndexOutOfBounds`) and upper snake case if they represent a non-error value (e.g., `MIN_STAKE`).
+-
+- **Generic type names**: should be descriptive, or anti-descriptive where appropriate, e.g., `T` or `Element` for the Vector generic type parameter. Most of the time the "main" type in a module should be the same name as the module e.g., `option::Option`, `fixed_point32::FixedPoint32`.
+- **Module file names**: should be the same as the module name e.g., `Option.move`.
+- **Script file names**: should be lower snake case and should match the name of the “main” function in the script.
+- **Mixed file names**: If the file contains multiple modules and/or scripts, the file name should be lower snake case, where the name does not match any particular module/script inside.
+
+## Imports
+
+- All module `use` statements should be at the top of the module.
+- Functions should be imported and used fully qualified from the module in which they are declared, and not imported at the top level.
+- Types should be imported at the top-level. Where there are name clashes, `as` should be used to rename the type locally as appropriate.
+
+For example, if there is a module:
+
+```move
+module 0x1::foo {
+    struct Foo { }
+    const CONST_FOO: u64 = 0;
+    public fun do_foo(): Foo { Foo{} }
+    ...
+}
+```
+
+this would be imported and used as:
+
+```move
+module 0x1::bar {
+    use 0x1::foo::{Self, Foo};
+
+    public fun do_bar(x: u64): Foo {
+        if (x == 10) {
+            foo::do_foo()
+        } else {
+            abort 0
+        }
+    }
+    ...
+}
+```
+
+And, if there is a local name-clash when importing two modules:
+
+```move
+module other_foo {
+    struct Foo {}
+    ...
+}
+
+module 0x1::importer {
+    use 0x1::other_foo::Foo as OtherFoo;
+    use 0x1::foo::Foo;
+    ...
+}
+```
+
+## Comments
+
+- Each module, struct, and public function declaration should be commented.
+- Move has doc comments `///`, regular single-line comments `//`, block comments `/* */`, and block doc comments `/** */`.
+
+## Formatting
+
+The Move team plans to write an autoformatter to enforce formatting conventions. However, in the meantime:
+
+- Four space indentation should be used except for `script` and `address` blocks whose contents should not be indented.
+- Lines should be broken if they are longer than 100 characters.
+- Structs and constants should be declared before all functions in a module.
diff --git a/vendors/move/documentation/book/src/conditionals.md b/vendors/move/documentation/book/src/conditionals.md
new file mode 100644
index 000000000..35a7188b9
--- /dev/null
+++ b/vendors/move/documentation/book/src/conditionals.md
@@ -0,0 +1,61 @@
+# Conditionals
+
+An `if` expression specifies that some code should only be evaluated if a certain condition is true. For example:
+
+```move
+if (x > 5) x = x - 5
+```
+
+The condition must be an expression of type `bool`.
+
+An `if` expression can optionally include an `else` clause to specify another expression to evaluate when the condition is false.
+
+```move
+if (y <= 10) y = y + 1 else y = 10
+```
+
+Either the "true" branch or the "false" branch will be evaluated, but not both. Either branch can be a single expression or an expression block.
+
+The conditional expressions may produce values so that the `if` expression has a result.
+
+```move
+let z = if (x < 100) x else 100;
+```
+
+The expressions in the true and false branches must have compatible types. For example:
+
+```move=
+// x and y must be u64 integers
+let maximum: u64 = if (x > y) x else y;
+
+// ERROR! branches different types
+let z = if (maximum < 10) 10u8 else 100u64;
+
+// ERROR! branches different types, as default false-branch is () not u64
+if (maximum >= 10) maximum;
+```
+
+If the `else` clause is not specified, the false branch defaults to the unit value. The following are equivalent:
+
+```move
+if (condition) true_branch // implied default: else ()
+if (condition) true_branch else ()
+```
+
+Commonly, [`if` expressions](./conditionals.md) are used in conjunction with expression blocks.
+
+```move
+let maximum = if (x > y) x else y;
+if (maximum < 10) {
+    x = x + 10;
+    y = y + 10;
+} else if (x >= 10 && y >= 10) {
+    x = x - 10;
+    y = y - 10;
+}
+```
+
+## Grammar for Conditionals
+
+> *if-expression* → **if (** *expression* **)** *expression* *else-clause*<sub>*opt*</sub>
+> *else-clause* → **else** *expression*
diff --git a/vendors/move/documentation/book/src/constants.md b/vendors/move/documentation/book/src/constants.md
new file mode 100644
index 000000000..c59f0107c
--- /dev/null
+++ b/vendors/move/documentation/book/src/constants.md
@@ -0,0 +1,112 @@
+# Constants
+
+Constants are a way of giving a name to shared, static values inside of a `module` or `script`.
+
+The constant's must be known at compilation. The constant's value is stored in the compiled module
+or script. And each time the constant is used, a new copy of that value is made.
+
+## Declaration
+
+Constant declarations begin with the `const` keyword, followed by a name, a type, and a value. They
+can exist in either a script or module
+
+```text
+const <name>: <type> = <expression>;
+```
+
+For example
+
+```move=
+script {
+
+    const MY_ERROR_CODE: u64 = 0;
+
+    fun main(input: u64) {
+        assert!(input > 0, MY_ERROR_CODE);
+    }
+
+}
+
+address 0x42 {
+module example {
+
+    const MY_ADDRESS: address = @0x42;
+
+    public fun permissioned(s: &signer) {
+        assert!(std::signer::address_of(s) == MY_ADDRESS, 0);
+    }
+
+}
+}
+```
+
+## Naming
+
+Constants must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+const FLAG: bool = false;
+const MY_ERROR_CODE: u64 = 0;
+const ADDRESS_42: address = @0x42;
+```
+
+Even though you can use letters `a` to `z` in a constant. The
+[general style guidelines](./coding-conventions.md) are to use just uppercase letters `A` to `Z`,
+with underscores `_` between each word.
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+## Visibility
+
+`public` constants are not currently supported. `const` values can be used only in the declaring
+module.
+
+## Valid Expressions
+
+Currently, constants are limited to the primitive types `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, `address`, and
+`vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will
+come later.
+
+### Values
+
+Commonly, `const`s are assigned a simple value, or literal, of their type. For example
+
+```move
+const MY_BOOL: bool = false;
+const MY_ADDRESS: address = @0x70DD;
+const BYTES: vector<u8> = b"hello world";
+const HEX_BYTES: vector<u8> = x"DEADBEEF";
+```
+
+### Complex Expressions
+
+In addition to literals, constants can include more complex expressions, as long as the compiler is
+able to reduce the expression to a value at compile time.
+
+Currently, equality operations, all boolean operations, all bitwise operations, and all arithmetic
+operations can be used.
+
+```move
+const RULE: bool = true && false;
+const CAP: u64 = 10 * 100 + 1;
+const SHIFTY: u8 = {
+  (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
+};
+const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const REM: u256 = 57896044618658097711785492504343953926634992332820282019728792003956564819968 % 654321;
+const EQUAL: bool = 1 == 1;
+```
+
+If the operation would result in a runtime exception, the compiler will give an error that it is
+unable to generate the constant's value
+
+```move
+const DIV_BY_ZERO: u64 = 1 / 0; // error!
+const SHIFT_BY_A_LOT: u64 = 1 << 100; // error!
+const NEGATIVE_U64: u64 = 0 - 1; // error!
+```
+
+Note that constants cannot currently refer to other constants. This feature, along with support for
+other expressions, will be added in the future.
diff --git a/vendors/move/documentation/book/src/creating-coins.md b/vendors/move/documentation/book/src/creating-coins.md
new file mode 100644
index 000000000..b62b4f0d7
--- /dev/null
+++ b/vendors/move/documentation/book/src/creating-coins.md
@@ -0,0 +1,3 @@
+# Move Tutorial
+
+Please refer to the [Move Tutorial](https://github.com/move-language/move/tree/main/language/documentation/tutorial).
diff --git a/vendors/move/documentation/book/src/equality.md b/vendors/move/documentation/book/src/equality.md
new file mode 100644
index 000000000..dbabfa66c
--- /dev/null
+++ b/vendors/move/documentation/book/src/equality.md
@@ -0,0 +1,164 @@
+# Equality
+
+Move supports two equality operations `==` and `!=`
+
+## Operations
+
+| Syntax | Operation | Description                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | equal     | Returns `true` if the two operands have the same value, `false` otherwise   |
+| `!=`   | not equal | Returns `true` if the two operands have different values, `false` otherwise |
+
+### Typing
+
+Both the equal (`==`) and not-equal (`!=`) operations only work if both operands are the same type
+
+```move
+0 == 0; // `true`
+1u128 == 2u128; // `false`
+b"hello" != x"00"; // `true`
+```
+
+Equality and non-equality also work over user defined types!
+
+```move=
+address 0x42 {
+module example {
+    struct S has copy, drop { f: u64, s: vector<u8> }
+
+    fun always_true(): bool {
+        let s = S { f: 0, s: b"" };
+        // parens are not needed but added for clarity in this example
+        (copy s) == s
+    }
+
+    fun always_false(): bool {
+        let s = S { f: 0, s: b"" };
+        // parens are not needed but added for clarity in this example
+        (copy s) != s
+    }
+}
+}
+```
+
+If the operands have different types, there is a type checking error
+
+```move
+1u8 == 1u128; // ERROR!
+//     ^^^^^ expected an argument of type 'u8'
+b"" != 0; // ERROR!
+//     ^ expected an argument of type 'vector<u8>'
+```
+
+### Typing with references
+
+When comparing [references](./references.md), the type of the reference (immutable or mutable) does
+not matter. This means that you can compare an immutable `&` reference with a mutable one `&mut` of
+the same underlying type.
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == m; // `false`
+m == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+The above is equivalent to applying an explicit freeze to each mutable reference where needed
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == freeze(m); // `false`
+freeze(m) == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+But again, the underlying type must be the same type
+
+```move
+let i = &0;
+let s = &b"";
+
+i == s; // ERROR!
+//   ^ expected an argument of type '&u64'
+```
+
+## Restrictions
+
+Both `==` and `!=` consume the value when comparing them. As a result, the type system enforces that
+the type must have [`drop`](./abilities.md). Recall that without the
+[`drop` ability](./abilities.md), ownership must be transferred by the end of the function, and such
+values can only be explicitly destroyed within their declaring module. If these were used directly
+with either equality `==` or non-equality `!=`, the value would be destroyed which would break
+[`drop` ability](./abilities.md) safety guarantees!
+
+```move=
+address 0x42 {
+module example {
+    struct Coin has store { value: u64 }
+    fun invalid(c1: Coin, c2: Coin) {
+        c1 == c2 // ERROR!
+//      ^^    ^^ These resources would be destroyed!
+    }
+}
+}
+```
+
+But, a programmer can _always_ borrow the value first instead of directly comparing the value, and
+reference types have the [`drop` ability](./abilities.md). For example
+
+```move=
+address 0x42 {
+module example {
+    struct Coin as store { value: u64 }
+    fun swap_if_equal(c1: Coin, c2: Coin): (Coin, Coin) {
+        let are_equal = &c1 == &c2; // valid
+        if (are_equal) (c2, c1) else (c1, c2)
+    }
+}
+}
+```
+
+## Avoid Extra Copies
+
+While a programmer _can_ compare any value whose type has [`drop`](./abilities.md), a programmer
+should often compare by reference to avoid expensive copies.
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(copy v1 == copy v2, 42);
+//     ^^^^       ^^^^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(copy s1 == copy s2, 42);
+//     ^^^^       ^^^^
+use_two_foos(s1, s2);
+```
+
+This code is perfectly acceptable (assuming `Foo` has [`drop`](./abilities.md)), just not efficient.
+The highlighted copies can be removed and replaced with borrows
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(&v1 == &v2, 42);
+//     ^      ^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(&s1 == &s2, 42);
+//     ^      ^
+use_two_foos(s1, s2);
+```
+
+The efficiency of the `==` itself remains the same, but the `copy`s are removed and thus the program
+is more efficient.
diff --git a/vendors/move/documentation/book/src/friends.md b/vendors/move/documentation/book/src/friends.md
new file mode 100644
index 000000000..1dab74fe4
--- /dev/null
+++ b/vendors/move/documentation/book/src/friends.md
@@ -0,0 +1,131 @@
+# Friends
+
+The `friend` syntax is used to declare modules that are trusted by the current module.
+A trusted module is allowed to call any function defined in the current module that have the `public(friend)` visibility.
+For details on function visibilities, please refer to the *Visibility* section in [Functions](./functions.md).
+
+## Friend declaration
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+- `friend <address::name>` — friend declaration using fully qualified module name like the example below, or
+
+  ```move
+  address 0x42 {
+  module a {
+      friend 0x42::b;
+  }
+  }
+  ```
+
+- `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+
+  ```move
+  address 0x42 {
+  module a {
+      use 0x42::b;
+      friend b;
+  }
+  }
+  ```
+
+A module may have multiple friend declarations, and the union of all the friend modules forms the friend list.
+In the example below, both `0x42::B` and `0x42::C` are considered as friends of `0x42::A`.
+
+```move
+address 0x42 {
+module a {
+    friend 0x42::b;
+    friend 0x42::c;
+}
+}
+```
+
+Unlike `use` statements, `friend` can only be declared in the module scope and not in the expression block scope.
+`friend` declarations may be located anywhere a top-level construct (e.g., `use`, `function`, `struct`, etc.) is allowed.
+However, for readability, it is advised to place friend declarations near the beginning of the module definition.
+
+Note that the concept of friendship does not apply to Move scripts:
+- A Move script cannot declare `friend` modules as doing so is considered meaningless: there is no mechanism to call the function defined in a script.
+- A Move module cannot declare `friend` scripts as well because scripts are ephemeral code snippets that are never published to global storage.
+
+### Friend declaration rules
+Friend declarations are subject to the following rules:
+
+- A module cannot declare itself as a friend.
+
+  ```move=
+  address 0x42 {
+  module m { friend Self; // ERROR! }
+  //                ^^^^ Cannot declare the module itself as a friend
+  }
+
+  address 0x43 {
+  module m { friend 0x43::M; // ERROR! }
+  //                ^^^^^^^ Cannot declare the module itself as a friend
+  }
+  ```
+
+- Friend modules must be known by the compiler
+
+  ```move=
+  address 0x42 {
+  module m { friend 0x42::nonexistent; // ERROR! }
+  //                ^^^^^^^^^^^^^^^^^ Unbound module '0x42::nonexistent'
+  }
+  ```
+
+- Friend modules must be within the same account address. (Note: this is not a technical requirement but rather a policy decision which *may* be relaxed later.)
+
+  ```move=
+  address 0x42 {
+  module m {}
+  }
+
+  address 0x43 {
+  module n { friend 0x42::m; // ERROR! }
+  //                ^^^^^^^ Cannot declare modules out of the current address as a friend
+  }
+  ```
+
+- Friends relationships cannot create cyclic module dependencies.
+
+  Cycles are not allowed in the friend relationships, e.g., the relation `0x2::a` friends `0x2::b` friends `0x2::c` friends `0x2::a` is not allowed.
+More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module).
+If that friend module is already used, either directly or transitively, a cycle of dependencies would be created.
+  ```move=
+  address 0x2 {
+  module a {
+      use 0x2::c;
+      friend 0x2::b;
+
+      public fun a() {
+          c::c()
+      }
+  }
+
+  module b {
+      friend 0x2::c; // ERROR!
+  //         ^^^^^^ This friend relationship creates a dependency cycle: '0x2::b' is a friend of '0x2::a' uses '0x2::c' is a friend of '0x2::b'
+  }
+
+  module c {
+      public fun c() {}
+  }
+  }
+  ```
+
+- The friend list for a module cannot contain duplicates.
+
+  ```move=
+  address 0x42 {
+  module a {}
+
+  module m {
+      use 0x42::a as aliased_a;
+      friend 0x42::A;
+      friend aliased_a; // ERROR!
+  //         ^^^^^^^^^ Duplicate friend declaration '0x42::a'. Friend declarations in a module must be unique
+  }
+  }
+  ```
diff --git a/vendors/move/documentation/book/src/functions.md b/vendors/move/documentation/book/src/functions.md
new file mode 100644
index 000000000..23d3070f9
--- /dev/null
+++ b/vendors/move/documentation/book/src/functions.md
@@ -0,0 +1,511 @@
+# Functions
+
+Function syntax in Move is shared between module functions and script functions. Functions inside of modules are reusable, whereas script functions are only used once to invoke a transaction.
+
+## Declaration
+
+Functions are declared with the `fun` keyword followed by the function name, type parameters, parameters, a return type, acquires annotations, and finally the function body.
+
+```text
+fun <identifier><[type_parameters: constraint],*>([identifier: type],*): <return_type> <acquires [identifier],*> <function_body>
+```
+
+For example
+
+```move
+fun foo<T1, T2>(x: u64, y: T1, z: T2): (T2, T1, u64) { (z, y, x) }
+```
+
+### Visibility
+
+Module functions, by default, can only be called within the same module. These internal (sometimes called private) functions cannot be called from other modules or from scripts.
+
+```move=
+address 0x42 {
+module m {
+    fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+To allow access from other modules or from scripts, the function must be declared `public` or `public(friend)`.
+
+#### `public` visibility
+
+A `public` function can be called by *any* function defined in *any* module or script. As shown in the following example, a `public` function can be called by:
+- other functions defined in the same module,
+- functions defined in another module, or
+- the function defined in a script.
+
+```move=
+address 0x42 {
+module m {
+    public fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+```
+
+#### `public(friend)` visibility
+
+The `public(friend)` visibility modifier is a more restricted form of the `public` modifier to give more control about where a function can be used. A `public(friend)` function can be called by:
+- other functions defined in the same module, or
+- functions defined in modules which are explicitly specified in the **friend list** (see [Friends](./friends.md) on how to specify the friend list).
+
+Note that since we cannot declare a script to be a friend of a module, the functions defined in scripts can never call a `public(friend)` function.
+
+```move=
+address 0x42 {
+module m {
+    friend 0x42::n;  // friend declaration
+    public(friend) fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+
+module other {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+```
+
+### `entry` modifier
+
+The `entry` modifier is designed to allow module functions to be safely and directly invoked much like scripts. This allows module writers to specify which functions can be to begin execution. The module writer then knows that any non-`entry` function will be called from a Move program already in execution.
+
+Essentially, `entry` functions are the "main" functions of a module, and they specify where Move programs start executing.
+
+Note though, an `entry` function _can_ still be called by other Move functions. So while they _can_ serve as the start of a Move program, they aren't restricted to that case.
+
+For example:
+
+```move=
+address 0x42 {
+module m {
+    public entry fun foo(): u64 { 0 }
+    fun calls_foo(): u64 { foo() } // valid!
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+
+module other {
+    public entry fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+```
+
+Even internal functions can be marked as `entry`! This lets you guarantee that the function is called only at the beginning of execution (assuming you do not call it elsewhere in your module)
+
+```move=
+address 0x42 {
+module m {
+    entry fun foo(): u64 { 0 } // valid! entry functions do not have to be public
+}
+
+module n {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+
+module other {
+    public entry fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+### Name
+
+Function names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, function names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+fun FOO() {}
+fun bar_42() {}
+fun _bAZ19() {}
+```
+
+### Type Parameters
+
+After the name, functions can have type parameters
+
+```move
+fun id<T>(x: T): T { x }
+fun example<T1: copy, T2>(x: T1, y: T2): (T1, T1, T2) { (copy x, x, y) }
+```
+
+For more details, see [Move generics](./generics.md).
+
+### Parameters
+
+Functions parameters are declared with a local variable name followed by a type annotation
+
+```move
+fun add(x: u64, y: u64): u64 { x + y }
+```
+
+We read this as `x` has type `u64`
+
+A function does not have to have any parameters at all.
+
+```move
+fun useless() { }
+```
+
+This is very common for functions that create new or empty data structures
+
+```move=
+address 0x42 {
+module example {
+  struct Counter { count: u64 }
+
+  fun new_counter(): Counter {
+      Counter { count: 0 }
+  }
+
+}
+}
+```
+
+### Acquires
+
+When a function accesses a resource using `move_from`, `borrow_global`, or `borrow_global_mut`, the function must indicate that it `acquires` that resource. This is then used by Move's type system to ensure the references into global storage are safe, specifically that there are no dangling references into global storage.
+
+```move=
+address 0x42 {
+module example {
+
+    struct Balance has key { value: u64 }
+
+    public fun add_balance(s: &signer, value: u64) {
+        move_to(s, Balance { value })
+    }
+
+    public fun extract_balance(addr: address): u64 acquires Balance {
+        let Balance { value } = move_from(addr); // acquires needed
+        value
+    }
+}
+}
+```
+
+`acquires` annotations must also be added for transitive calls within the module. Calls to these functions from another module do not need to annotated with these acquires because one module cannot access resources declared in another module--so the annotation is not needed to ensure reference safety.
+
+```move=
+address 0x42 {
+module example {
+
+    struct Balance has key { value: u64 }
+
+    public fun add_balance(s: &signer, value: u64) {
+        move_to(s, Balance { value })
+    }
+
+    public fun extract_balance(addr: address): u64 acquires Balance {
+        let Balance { value } = move_from(addr); // acquires needed
+        value
+    }
+
+    public fun extract_and_add(sender: address, receiver: &signer) acquires Balance {
+        let value = extract_balance(sender); // acquires needed here
+        add_balance(receiver, value)
+    }
+}
+}
+
+address 0x42 {
+module other {
+    fun extract_balance(addr: address): u64 {
+        0x42::example::extract_balance(addr) // no acquires needed
+    }
+}
+}
+```
+
+A function can `acquire` as many resources as it needs to
+
+```move=
+address 0x42 {
+module example {
+    use std::vector;
+
+    struct Balance has key { value: u64 }
+    struct Box<T> has key { items: vector<T> }
+
+    public fun store_two<Item1: store, Item2: store>(
+        addr: address,
+        item1: Item1,
+        item2: Item2,
+    ) acquires Balance, Box {
+        let balance = borrow_global_mut<Balance>(addr); // acquires needed
+        balance.value = balance.value - 2;
+        let box1 = borrow_global_mut<Box<Item1>>(addr); // acquires needed
+        vector::push_back(&mut box1.items, item1);
+        let box2 = borrow_global_mut<Box<Item2>>(addr); // acquires needed
+        vector::push_back(&mut box2.items, item2);
+    }
+}
+}
+```
+
+### Return type
+
+After the parameters, a function specifies its return type.
+
+```move
+fun zero(): u64 { 0 }
+```
+
+Here `: u64` indicates that the function's return type is `u64`.
+
+Using tuples, a function can return multiple values:
+
+```move
+fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
+```
+
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent:
+
+```move
+fun just_unit(): () { () }
+fun just_unit() { () }
+fun just_unit() { }
+```
+
+`script` functions must have a return type of unit `()`:
+
+```move
+script {
+    fun do_nothing() {
+    }
+}
+```
+
+As mentioned in the [tuples section](./tuples.md), these tuple "values" are virtual and do not exist at runtime. So for a function that returns unit `()`, it will not be returning any value at all during execution.
+
+### Function body
+
+A function's body is an expression block. The return value of the function is the last value in the sequence
+
+```move=
+fun example(): u64 {
+    let x = 0;
+    x = x + 1;
+    x // returns 'x'
+}
+```
+
+See [the section below for more information on returns](#returning-values)
+
+For more information on expression blocks, see [Move variables](./variables.md).
+
+### Native Functions
+
+Some functions do not have a body specified, and instead have the body provided by the VM. These functions are marked `native`.
+
+Without modifying the VM source code, a programmer cannot add new native functions. Furthermore, it is the intent that `native` functions are used for either standard library code or for functionality needed for the given Move environment.
+
+Most `native` functions you will likely see are in standard library code such as `vector`
+
+```move=
+module std::vector {
+    native public fun empty<Element>(): vector<Element>;
+    ...
+}
+```
+
+## Calling
+
+When calling a function, the name can be specified either through an alias or fully qualified
+
+```move=
+address 0x42 {
+module example {
+    public fun zero(): u64 { 0 }
+}
+}
+
+script {
+    use 0x42::example::{Self, zero};
+    fun call_zero() {
+        // With the `use` above all of these calls are equivalent
+        0x42::example::zero();
+        example::zero();
+        zero();
+    }
+}
+```
+
+When calling a function, an argument must be given for every parameter.
+
+```move=
+address 0x42 {
+module example {
+    public fun takes_none(): u64 { 0 }
+    public fun takes_one(x: u64): u64 { x }
+    public fun takes_two(x: u64, y: u64): u64 { x + y }
+    public fun takes_three(x: u64, y: u64, z: u64): u64 { x + y + z }
+}
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::takes_none();
+        example::takes_one(0);
+        example::takes_two(0, 1);
+        example::takes_three(0, 1, 2);
+    }
+}
+```
+
+Type arguments can be either specified or inferred. Both calls are equivalent.
+
+```move=
+address 0x42 {
+module example {
+    public fun id<T>(x: T): T { x }
+}
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::id(0);
+        example::id<u64>(0);
+    }
+}
+```
+
+For more details, see [Move generics](./generics.md).
+
+
+## Returning values
+
+The result of a function, its "return value", is the final value of its function body. For example
+
+```move=
+fun add(x: u64, y: u64): u64 {
+    x + y
+}
+```
+
+[As mentioned above](#function-body), the function's body is an [expression block](./variables.md). The expression block can sequence various statements, and the final expression in the block will be be the value of that block
+
+```move=
+fun double_and_add(x: u64, y: u64): u64 {
+    let double_x = x * 2;
+    let double_y = y * 2;
+    double_x + double_y
+}
+```
+
+The return value here is `double_x + double_y`
+
+### `return` expression
+
+A function implicitly returns the value that its body evaluates to. However, functions can also use the explicit `return` expression:
+
+```move
+fun f1(): u64 { return 0 }
+fun f2(): u64 { 0 }
+```
+
+These two functions are equivalent. In this slightly more involved example, the function subtracts two `u64` values, but returns early with `0` if the second value is too large:
+
+```move=
+fun safe_sub(x: u64, y: u64): u64 {
+    if (y > x) return 0;
+    x - y
+}
+```
+
+Note that the body of this function could also have been written as `if (y > x) 0 else x - y`.
+
+However `return` really shines is in exiting deep within other control flow constructs. In this example, the function iterates through a vector to find the index of a given value:
+
+```move=
+use std::vector;
+use std::option::{Self, Option};
+fun index_of<T>(v: &vector<T>, target: &T): Option<u64> {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        if (vector::borrow(v, i) == target) return option::some(i);
+        i = i + 1
+    };
+
+    option::none()
+}
+```
+
+Using `return` without an argument is shorthand for `return ()`. That is, the following two functions are equivalent:
+
+```move
+fun foo() { return }
+fun foo() { return () }
+```
diff --git a/vendors/move/documentation/book/src/generics.md b/vendors/move/documentation/book/src/generics.md
new file mode 100644
index 000000000..9377c498f
--- /dev/null
+++ b/vendors/move/documentation/book/src/generics.md
@@ -0,0 +1,482 @@
+# Generics
+
+Generics can be used to define functions and structs over different input data types. This language feature is sometimes referred to as *parametric polymorphism*. In Move, we will often use the term generics interchangeably with type parameters and type arguments.
+
+Generics are commonly used in library code, such as in vector, to declare code that works over any possible instantiation (that satisfies the specified constraints). In other frameworks, generic code can sometimes be used to interact with global storage many different ways that all still share the same implementation.
+
+## Declaring Type Parameters
+
+Both functions and structs can take a list of type parameters in their signatures, enclosed by a pair of angle brackets `<...>`.
+
+### Generic Functions
+
+Type parameters for functions are placed after the function name and before the (value) parameter list. The following code defines a generic identity function that takes a value of any type and returns that value unchanged.
+
+```move
+fun id<T>(x: T): T {
+    // this type annotation is unnecessary but valid
+    (x: T)
+}
+```
+
+Once defined, the type parameter `T` can be used in parameter types, return types, and inside the function body.
+
+### Generic Structs
+
+Type parameters for structs are placed after the struct name, and can be used to name the types of the fields.
+
+```move
+struct Foo<T> has copy, drop { x: T }
+
+struct Bar<T1, T2> has copy, drop {
+    x: T1,
+    y: vector<T2>,
+}
+```
+
+Note that [type parameters do not have to be used](#unused-type-parameters)
+
+## Type Arguments
+
+### Calling Generic Functions
+
+When calling a generic function, one can specify the type arguments for the function's type parameters in a list enclosed by a pair of angle brackets.
+
+```move
+fun foo() {
+    let x = id<bool>(true);
+}
+```
+
+If you do not specify the type arguments, Move's [type inference](#type-inference) will supply them for you.
+
+### Using Generic Structs
+
+Similarly, one can attach a list of type arguments for the struct's type parameters when constructing or destructing values of generic types.
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: true };
+    let Foo<bool> { x } = foo;
+}
+```
+
+If you do not specify the type arguments, Move's [type inference](#type-inference) will supply them for you.
+
+### Type Argument Mismatch
+
+If you specify the type arguments and they conflict with the actual values supplied, an error will be given:
+
+```move
+fun foo() {
+    let x = id<u64>(true); // error! true is not a u64
+}
+```
+
+and similarly:
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: 0 }; // error! 0 is not a bool
+    let Foo<address> { x } = foo; // error! bool is incompatible with address
+}
+```
+
+## Type Inference
+
+In most cases, the Move compiler will be able to infer the type arguments so you don't have to write them down explicitly. Here's what the examples above would look like if we omit the type arguments:
+
+```move
+fun foo() {
+    let x = id(true);
+    //        ^ <bool> is inferred
+
+    let foo = Foo { x: true };
+    //           ^ <bool> is inferred
+
+    let Foo { x } = foo;
+    //     ^ <bool> is inferred
+}
+```
+
+Note: when the compiler is unable to infer the types, you'll need annotate them manually. A common scenario is to call a function with type parameters appearing only at return positions.
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        // let v = vector::new();
+        //                    ^ The compiler cannot figure out the element type.
+
+        let v = vector::new<u64>();
+        //                 ^~~~~ Must annotate manually.
+    }
+}
+}
+```
+
+However, the compiler will be able to infer the type if that return value is used later in that function:
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        let v = vector::new();
+        //                 ^ <u64> is inferred
+        vector::push_back(&mut v, 42);
+    }
+}
+}
+```
+
+## Unused Type Parameters
+
+For a struct definition,
+an unused type parameter is one that
+does not appear in any field defined in the struct,
+but is checked statically at compile time.
+Move allows unused type parameters so the following struct definition is valid:
+
+```move
+struct Foo<T> {
+    foo: u64
+}
+```
+
+This can be convenient when modeling certain concepts. Here is an example:
+
+```move
+address 0x2 {
+module m {
+    // Currency Specifiers
+    struct Currency1 {}
+    struct Currency2 {}
+
+    // A generic coin type that can be instantiated using a currency
+    // specifier type.
+    //   e.g. Coin<Currency1>, Coin<Currency2> etc.
+    struct Coin<Currency> has store {
+        value: u64
+    }
+
+    // Write code generically about all currencies
+    public fun mint_generic<Currency>(value: u64): Coin<Currency> {
+        Coin { value }
+    }
+
+    // Write code concretely about one currency
+    public fun mint_concrete(value: u64): Coin<Currency1> {
+        Coin { value }
+    }
+}
+}
+```
+
+In this example,
+`struct Coin<Currency>` is generic on the `Currency` type parameter,
+which specifies the currency of the coin and
+allows code to be written either
+generically on any currency or
+concretely on a specific currency.
+This genericity applies even when the `Currency` type parameter
+does not appear in any of the fields defined in `Coin`.
+
+### Phantom Type Parameters
+
+In the example above,
+although `struct Coin` asks for the `store` ability,
+neither `Coin<Currency1>` nor `Coin<Currency2>` will have the `store` ability.
+This is because of the rules for
+[Conditional Abilities and Generic Types](./abilities.md#conditional-abilities-and-generic-types)
+and the fact that `Currency1` and `Currency2` don't have the `store` ability,
+despite the fact that they are not even used in the body of `struct Coin`.
+This might cause some unpleasant consequences.
+For example, we are unable to put `Coin<Currency1>` into a wallet in the global storage.
+
+One possible solution would be to
+add spurious ability annotations to `Currency1` and `Currency2`
+(i.e., `struct Currency1 has store {}`).
+But, this might lead to bugs or security vulnerabilities
+because it weakens the types with unnecessary ability declarations.
+For example, we would never expect a resource in the global storage to have a field in type `Currency1`,
+but this would be possible with the spurious `store` ability.
+Moreover, the spurious annotations would be infectious,
+requiring many functions generic on the unused type parameter to also include the necessary constraints.
+
+Phantom type parameters solve this problem.
+Unused type parameters can be marked as *phantom* type parameters,
+which do not participate in the ability derivation for structs.
+In this way,
+arguments to phantom type parameters are not considered when deriving the abilities for generic types,
+thus avoiding the need for spurious ability annotations.
+For this relaxed rule to be sound,
+Move's type system guarantees that a parameter declared as `phantom` is either
+not used at all in the struct definition, or
+it is only used as an argument to type parameters also declared as `phantom`.
+
+#### Declaration
+
+In a struct definition
+a type parameter can be declared as phantom by adding the `phantom` keyword before its declaration.
+If a type parameter is declared as phantom we say it is a phantom type parameter.
+When defining a struct, Move's type checker ensures that every phantom type parameter is either
+not used inside the struct definition or
+it is only used as an argument to a phantom type parameter.
+
+More formally,
+if a type is used as an argument to a phantom type parameter
+we say the type appears in _phantom position_.
+With this definition in place,
+the rule for the correct use of phantom parameters can be specified as follows:
+**A phantom type parameter can only appear in phantom position**.
+
+The following two examples show valid uses of phantom parameters.
+In the first one,
+the parameter `T1` is not used at all inside the struct definition.
+In the second one, the parameter `T1` is only used as an argument to a phantom type parameter.
+
+```move
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 does not appear inside the struct definition
+
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 appears in phantom position
+```
+
+The following code shows examples of violations of the rule:
+
+```move
+struct S1<phantom T> { f: T }
+                          ^
+                          Error: Not a phantom position
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             Error: Not a phantom position
+```
+
+#### Instantiation
+
+When instantiating a struct,
+the arguments to phantom parameters are excluded when deriving the struct abilities.
+For example, consider the following code:
+
+```move
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+Consider now the type `S<HasCopy, NoCopy>`.
+Since `S` is defined with `copy` and all non-phantom arguments have `copy`
+then `S<HasCopy, NoCopy>` also has `copy`.
+
+#### Phantom Type Parameters with Ability Constraints
+
+Ability constraints and phantom type parameters are orthogonal features in the sense that
+phantom parameters can be declared with ability constraints.
+When instantiating a phantom type parameter with an ability constraint,
+the type argument has to satisfy that constraint,
+even though the parameter is phantom.
+For example, the following definition is perfectly valid:
+
+```move
+struct S<phantom T: copy> {}
+```
+
+The usual restrictions apply and `T` can only be instantiated with arguments having `copy`.
+
+## Constraints
+
+In the examples above, we have demonstrated how one can use type parameters to define "unknown" types that can be plugged in by callers at a later time. This however means the type system has little information about the type and has to perform checks in a very conservative way. In some sense, the type system must assume the worst case scenario for an unconstrained generic. Simply put, by default generic type parameters have no [abilities](./abilities.md).
+
+This is where constraints come into play: they offer a way to specify what properties these unknown types have so the type system can allow operations that would otherwise be unsafe.
+
+### Declaring Constraints
+
+Constraints can be imposed on type parameters using the following syntax.
+
+```move
+// T is the name of the type parameter
+T: <ability> (+ <ability>)*
+```
+
+The `<ability>` can be any of the four [abilities](./abilities.md), and a type parameter can be constrained with multiple abilities at once. So all of the following would be valid type parameter declarations:
+
+```move
+T: copy
+T: copy + drop
+T: copy + drop + store + key
+```
+
+### Verifying Constraints
+
+Constraints are checked at call sites so the following code won't compile.
+
+```move
+struct Foo<T: key> { x: T }
+
+struct Bar { x: Foo<u8> }
+//                  ^ error! u8 does not have 'key'
+
+struct Baz<T> { x: Foo<T> }
+//                     ^ error! T does not have 'key'
+```
+
+```move
+struct R {}
+
+fun unsafe_consume<T>(x: T) {
+    // error! x does not have 'drop'
+}
+
+fun consume<T: drop>(x: T) {
+    // valid!
+    // x will be dropped automatically
+}
+
+fun foo() {
+    let r = R {};
+    consume<R>(r);
+    //      ^ error! R does not have 'drop'
+}
+```
+
+```move
+struct R {}
+
+fun unsafe_double<T>(x: T) {
+    (copy x, x)
+    // error! x does not have 'copy'
+}
+
+fun double<T: copy>(x: T) {
+    (copy x, x) // valid!
+}
+
+fun foo(): (R, R) {
+    let r = R {};
+    double<R>(r)
+    //     ^ error! R does not have 'copy'
+}
+```
+
+For more information, see the abilities section on [conditional abilities and generic types](./abilities.html#conditional-abilities-and-generic-types).
+
+## Limitations on Recursions
+
+### Recursive Structs
+
+Generic structs can not contain fields of the same type, either directly or indirectly, even with different type arguments. All of the following struct definitions are invalid:
+
+```move
+struct Foo<T> {
+    x: Foo<u64> // error! 'Foo' containing 'Foo'
+}
+
+struct Bar<T> {
+    x: Bar<T> // error! 'Bar' containing 'Bar'
+}
+
+// error! 'A' and 'B' forming a cycle, which is not allowed either.
+struct A<T> {
+    x: B<T, u64>
+}
+
+struct B<T1, T2> {
+    x: A<T1>
+    y: A<T2>
+}
+```
+
+### Advanced Topic: Type-level Recursions
+
+Move allows generic functions to be called recursively. However, when used in combination with generic structs, this could create an infinite number of types in certain cases, and allowing this means adding unnecessary complexity to the compiler, vm and other language components. Therefore, such recursions are forbidden.
+
+Allowed:
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // Finitely many types -- allowed.
+    // foo<T> -> foo<T> -> foo<T> -> ... is valid
+    fun foo<T>() {
+        foo<T>();
+    }
+
+    // Finitely many types -- allowed.
+    // foo<T> -> foo<A<u64>> -> foo<A<u64>> -> ... is valid
+    fun foo<T>() {
+        foo<A<u64>>();
+    }
+}
+}
+```
+
+Not allowed:
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // Infinitely many types -- NOT allowed.
+    // error!
+    // foo<T> -> foo<A<T>> -> foo<A<A<T>>> -> ...
+    fun foo<T>() {
+        foo<Foo<T>>();
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module n {
+    struct A<T> {}
+
+    // Infinitely many types -- NOT allowed.
+    // error!
+    // foo<T1, T2> -> bar<T2, T1> -> foo<T2, A<T1>>
+    //   -> bar<A<T1>, T2> -> foo<A<T1>, A<T2>>
+    //   -> bar<A<T2>, A<T1>> -> foo<A<T2>, A<A<T1>>>
+    //   -> ...
+    fun foo<T1, T2>() {
+        bar<T2, T1>();
+    }
+
+    fun bar<T1, T2> {
+        foo<T1, A<T2>>();
+    }
+}
+}
+```
+
+Note, the check for type level recursions is based on a conservative analysis on the call sites and does NOT take control flow or runtime values into account.
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    fun foo<T>(n: u64) {
+        if (n > 0) {
+            foo<A<T>>(n - 1);
+        };
+    }
+}
+}
+```
+
+The function in the example above will technically terminate for any given input and therefore only creating finitely many types, but it is still considered invalid by Move's type system.
diff --git a/vendors/move/documentation/book/src/global-storage-operators.md b/vendors/move/documentation/book/src/global-storage-operators.md
new file mode 100644
index 000000000..19fd9d4f9
--- /dev/null
+++ b/vendors/move/documentation/book/src/global-storage-operators.md
@@ -0,0 +1,250 @@
+# Global Storage - Operators
+
+Move programs can create, delete, and update [resources](./structs-and-resources.md) in global storage using the following five instructions:
+
+
+| Operation                              | Description                                                     | Aborts?                                 |
+---------------------------------------- |---------------------------------------------------------------- |---------------------------------------- |
+|`move_to<T>(&signer,T)`                 | Publish `T` under `signer.address`                              | If `signer.address` already holds a `T` |
+|`move_from<T>(address): T`              | Remove `T` from `address` and return it                         | If `address` does not hold a `T`        |
+|`borrow_global_mut<T>(address): &mut T` | Return a mutable reference to the `T` stored under `address`    | If `address` does not hold a `T`        |
+|`borrow_global<T>(address): &T`         | Return an immutable reference to the `T` stored under `address` | If `address` does not hold a `T`        |
+|`exists<T>(address): bool`              | Return `true` if a `T` is stored under `address`                |  Never                                  |
+
+
+Each of these instructions is parameterized by a type `T` with the [`key` ability](./abilities.md). However, each type `T` *must be declared in the current module*. This ensures that a resource can only be manipulated via the API exposed by its defining module. The instructions also take either an [`address`](./address.md) or [`&signer`](./signer.md) representing the account address where the resource of type `T` is stored.
+
+## References to resources
+
+References to global resources returned by `borrow_global` or `borrow_global_mut` mostly behave like references to local storage: they can be extended, read, and written using ordinary [reference operators](./references.md) and passed as arguments to other function. However, there is one important difference between local and global references: **a function cannot return a reference that points into global storage**. For example, these two functions will each fail to compile:
+
+```move
+struct R has key { f: u64 }
+// will not compile
+fun ret_direct_resource_ref_bad(a: address): &R {
+    borrow_global<R>(a) // error!
+}
+// also will not compile
+fun ret_resource_field_ref_bad(a: address): &u64 {
+    &borrow_global<R>(a).f // error!
+}
+```
+
+Move must enforce this restriction to guarantee absence of dangling references to global storage. [This](#reference-safety-for-global-resources) section contains much more detail for the interested reader.
+
+## Global storage operators with generics
+
+Global storage operations can be applied to generic resources with both instantiated and uninstantiated generic type parameters:
+
+```move
+struct Container<T> has key { t: T }
+
+// Publish a Container storing a type T of the caller's choosing
+fun publish_generic_container<T>(account: &signer, t: T) {
+    move_to<Container<T>>(account, Container { t })
+}
+
+/// Publish a container storing a u64
+fun publish_instantiated_generic_container(account: &signer, t: u64) {
+    move_to<Container<u64>>(account, Container { t })
+}
+```
+
+The ability to index into global storage via a type parameter chosen at runtime is a powerful Move feature known as *storage polymorphism*. For more on the design patterns enabled by this feature, see [Move generics](./generics.md).
+
+## Example: `Counter`
+
+The simple `Counter` module below exercises each of the five global storage operators. The API exposed by this module allows:
+
+- Anyone to publish a `Counter` resource under their account
+- Anyone to check if a `Counter` exists under any address
+- Anyone to read or increment the value of a `Counter` resource under any address
+- An account that stores a `Counter` resource to reset it to zero
+- An account that stores a `Counter` resource to remove and delete it
+
+```move
+address 0x42 {
+module counter {
+    use std::signer;
+
+    /// Resource that wraps an integer counter
+    struct Counter has key { i: u64 }
+
+    /// Publish a `Counter` resource with value `i` under the given `account`
+    public fun publish(account: &signer, i: u64) {
+      // "Pack" (create) a Counter resource. This is a privileged operation that
+      // can only be done inside the module that declares the `Counter` resource
+      move_to(account, Counter { i })
+    }
+
+    /// Read the value in the `Counter` resource stored at `addr`
+    public fun get_count(addr: address): u64 acquires Counter {
+        borrow_global<Counter>(addr).i
+    }
+
+    /// Increment the value of `addr`'s `Counter` resource
+    public fun increment(addr: address) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(addr).i;
+        *c_ref = *c_ref + 1
+    }
+
+    /// Reset the value of `account`'s `Counter` to 0
+    public fun reset(account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(signer::address_of(account)).i;
+        *c_ref = 0
+    }
+
+    /// Delete the `Counter` resource under `account` and return its value
+    public fun delete(account: &signer): u64 acquires Counter {
+        // remove the Counter resource
+        let c = move_from<Counter>(signer::address_of(account));
+        // "Unpack" the `Counter` resource into its fields. This is a
+        // privileged operation that can only be done inside the module
+        // that declares the `Counter` resource
+        let Counter { i } = c;
+        i
+    }
+
+    /// Return `true` if `addr` contains a `Counter` resource
+    public fun exists(addr: address): bool {
+        exists<Counter>(addr)
+    }
+}
+}
+```
+
+## Annotating functions with `acquires`
+
+In the `counter` example, you might have noticed that the `get_count`, `increment`, `reset`, and `delete` functions are annotated with `acquires Counter`. A Move function `m::f` must be annotated with `acquires T` if and only if:
+
+- The body of `m::f` contains a `move_from<T>`, `borrow_global_mut<T>`, or `borrow_global<T>` instruction, or
+- The body of `m::f` invokes a function `m::g` declared in the same module that is annotated with `acquires`
+
+For example, the following function inside `Counter` would need an `acquires` annotation:
+
+```move
+// Needs `acquires` because `increment` is annotated with `acquires`
+fun call_increment(addr: address): u64 acquires Counter {
+    counter::increment(addr)
+}
+```
+
+However, the same function *outside* `Counter` would not need an annotation:
+
+```move
+address 0x43 {
+module m {
+   use 0x42::counter;
+
+   // Ok. Only need annotation when resource acquired by callee is declared
+   // in the same module
+   fun call_increment(addr: address): u64 {
+       counter::increment(addr)
+   }
+}
+}
+```
+
+If a function touches multiple resources, it needs multiple `acquires`:
+
+```move=
+address 0x42 {
+module two_resources {
+    struct R1 has key { f: u64 }
+    struct R2 has key { g: u64 }
+
+    fun double_acquires(a: address): u64 acquires R1, R2 {
+        borrow_global<R1>(a).f + borrow_global<R2>.g
+    }
+}
+}
+```
+
+The `acquires` annotation does not take generic type parameters into account:
+
+```move=
+address 0x42 {
+module m {
+    struct R<T> has key { t: T }
+
+    // `acquires R`, not `acquires R<T>`
+    fun acquire_generic_resource<T: store>(a: addr) acquires R {
+        let _ = borrow_global<R<T>>(a);
+    }
+
+    // `acquires R`, not `acquires R<u64>
+    fun acquire_instantiated_generic_resource(a: addr) acquires R {
+        let _ = borrow_global<R<u64>>(a);
+    }
+}
+}
+```
+
+Finally: redundant `acquires` are not allowed. Adding this function inside `Counter` will result in a compilation error:
+
+```move
+// This code will not compile because the body of the function does not use a global
+// storage instruction or invoke a function with `acquires`
+fun redundant_acquires_bad() acquires Counter {}
+```
+
+For more information on `acquires`, see [Move functions](./functions.md).
+
+## Reference Safety For Global Resources
+
+Move prohibits returning global references and requires the `acquires` annotation to prevent dangling references. This allows Move to live up to its promise of static reference safety (i.e., no dangling references, no `null` or `nil` dereferences) for all [reference](./references.md) types.
+
+This example illustrates how the Move type system uses `acquires` to prevent a dangling reference:
+
+```move=
+address 0x42 {
+module dangling {
+    struct T has key { f: u64 }
+
+    fun borrow_then_remove_bad(a: address) acquires T {
+        let t_ref: &mut T = borrow_global_mut<T>(a);
+        let t = remove_t(a); // type system complains here
+        // t_ref now dangling!
+        let uh_oh = *&t_ref.f
+    }
+
+    fun remove_t(a: address): T acquires T {
+        move_from<T>(a)
+    }
+
+}
+}
+```
+
+In this code, line 6 acquires a reference to the `T` stored at address `a` in global storage. The callee `remove_t` then removes the value, which makes `t_ref` a dangling reference.
+
+Fortunately, this cannot happen because the type system will reject this program. The `acquires` annotation on `remove_t` lets the type system know that line 7 is dangerous, without having to recheck or introspect the body of `remove_t` separately!
+
+The restriction on returning global references prevents a similar, but even more insidious problem:
+
+```move=
+address 0x42 {
+module m1 {
+    struct T has key {}
+
+    public fun ret_t_ref(a: address): &T acquires T {
+        borrow_global<T>(a) // error! type system complains here
+    }
+
+    public fun remove_t(a: address) acquires T {
+        let T {} = move_from<T>(a);
+    }
+}
+
+module m2 {
+    fun borrow_then_remove_bad(a: address) {
+        let t_ref = m1::ret_t_ref(a);
+        let t = m1::remove_t(a); // t_ref now dangling!
+    }
+}
+}
+```
+
+Line 16 acquires a reference to a global resource `m1::T`, then line 17 removes that same resource, which makes `t_ref` dangle. In this case, `acquires` annotations do not help us because the `borrow_then_remove_bad` function is outside of the `m1` module that declares `T` (recall that `acquires` annotations can only be used for resources declared in the current module). Instead, the type system avoids this problem by preventing the return of a global reference at line 6.
+
+Fancier type systems that would allow returning global references without sacrificing reference safety are possible, and we may consider them in future iterations of Move. We chose the current design because it strikes a good balance between expressivity, annotation burden, and type system complexity.
diff --git a/vendors/move/documentation/book/src/global-storage-structure.md b/vendors/move/documentation/book/src/global-storage-structure.md
new file mode 100644
index 000000000..dc624e60c
--- /dev/null
+++ b/vendors/move/documentation/book/src/global-storage-structure.md
@@ -0,0 +1,14 @@
+# Global Storage - Structure
+
+The purpose of Move programs is to [read from and write to](./global-storage-operators.md) tree-shaped persistent global storage. Programs cannot access the filesystem, network, or any other data outside of this tree.
+
+In pseudocode, the global storage looks something like:
+
+```move
+struct GlobalStorage {
+  resources: Map<(address, ResourceType), ResourceValue>
+  modules: Map<(address, ModuleName), ModuleBytecode>
+}
+```
+
+Structurally, global storage is a [forest](https://en.wikipedia.org/wiki/Tree_(graph_theory)) consisting of trees rooted at an account [`address`](./address.md). Each address can store both [resource](./structs-and-resources.md) data values and [module](./modules-and-scripts.md) code values. As the pseudocode above indicates, each `address` can store at most one resource value of a given type and at most one module with a given name.
diff --git a/vendors/move/documentation/book/src/integers.md b/vendors/move/documentation/book/src/integers.md
new file mode 100644
index 000000000..4864d2eff
--- /dev/null
+++ b/vendors/move/documentation/book/src/integers.md
@@ -0,0 +1,153 @@
+# Integers
+
+Move supports six unsigned integer types: `u8`, `u16`, `u32`, `u64`, `u128`, and `u256`. Values of these types range from 0 to a maximum that depends on the size of the type.
+
+| Type                             | Value Range              |
+| -------------------------------- | ------------------------ |
+| Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 16-bit integer, `u16`   | 0 to 2<sup>16</sup> - 1  |
+| Unsigned 32-bit integer, `u32`   | 0 to 2<sup>32</sup> - 1  |
+| Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+| Unsigned 256-bit integer, `u256` | 0 to 2<sup>256</sup> - 1 |
+
+## Literals
+
+Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
+
+Number literals can be separated by underscores for grouping and readability. (e.g.,`1_234_5678`, `1_000u128`, `0xAB_CD_12_35`).
+
+If a literal is too large for its specified (or inferred) size range, an error is reported.
+
+### Examples
+
+```move
+// literals with explicit annotations;
+let explicit_u8 = 1u8;
+let explicit_u16 = 1u16;
+let explicit_u32 = 1u32;
+let explicit_u64 = 2u64;
+let explicit_u128 = 3u128;
+let explicit_u256 = 1u256;
+let explicit_u64_underscored = 154_322_973u64;
+
+// literals with simple inference
+let simple_u8: u8 = 1;
+let simple_u16: u16 = 1;
+let simple_u32: u32 = 1;
+let simple_u64: u64 = 2;
+let simple_u128: u128 = 3;
+let simple_u256: u256 = 1;
+
+// literals with more complex inference
+let complex_u8 = 1; // inferred: u8
+// right hand argument to shift must be u8
+let _unused = 10 << complex_u8;
+
+let x: u8 = 38;
+let complex_u8 = 2; // inferred: u8
+// arguments to `+` must have the same type
+let _unused = x + complex_u8;
+
+let complex_u128 = 133_876; // inferred: u128
+// inferred from function argument type
+function_that_takes_u128(complex_u128);
+
+// literals can be written in hex
+let hex_u8: u8 = 0x1;
+let hex_u16: u16 = 0x1BAE;
+let hex_u32: u32 = 0xDEAD80;
+let hex_u64: u64 = 0xCAFE;
+let hex_u128: u128 = 0xDEADBEEF;
+let hex_u256: u256 = 0x1123_456A_BCDE_F;
+```
+
+## Operations
+
+### Arithmetic
+
+Each of these types supports the same set of checked arithmetic operations. For all of these operations, both arguments (the left and right side operands) *must* be of the same type. If you need to operate over values of different types, you will need to first perform a [cast](#casting). Similarly, if you expect the result of the operation to be too large for the integer type, perform a [cast](#casting) to a larger size before performing the operation.
+
+All arithmetic operations abort instead of behaving in a way that mathematical integers would not (e.g., overflow, underflow, divide-by-zero).
+
+| Syntax | Operation | Aborts If
+|--------|-----------|-------------------------------------
+| `+` |addition | Result is too large for the integer type
+| `-` | subtraction | Result is less than zero
+| `*` | multiplication | Result is too large for the integer type
+| `%` | modular division | The divisor is `0`
+| `/` | truncating division | The divisor is `0`
+
+### Bitwise
+
+The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
+
+Bitwise operations do not abort.
+
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
+
+### Bit Shifts
+
+Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
+
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `16`, `32`, `64`, `128` or `256` for `u8`, `u16`, `u32`, `u64`, `u128` and `u256` respectively.
+
+| Syntax | Operation  | Aborts if
+|--------|------------|----------
+|`<<`    | shift left | Number of bits to shift by is greater than the size of the integer type
+|`>>`    | shift right| Number of bits to shift by is greater than the size of the integer type
+
+### Comparisons
+
+Integer types are the *only* types in Move that can use the comparison operators. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](#casting) one of them first.
+
+Comparison operations do not abort.
+
+| Syntax | Operation
+|--------|-----------
+| `<`    | less than
+| `>`    | greater than
+| `<=`   | less than or equal to
+| `>=`   | greater than or equal to
+
+### Equality
+
+Like all types with [`drop`](./abilities.md) in Move, all integer types support the ["equal"](./equality.md) and ["not equal"](./equality.md)  operations. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](#casting) one of them first.
+
+Equality operations do not abort.
+
+| Syntax | Operation
+|--------|----------
+| `==`   | equal
+| `!=`   | not equal
+
+For more details see the section on [equality](./equality.md)
+
+## Casting
+
+Integer types of one size can be cast to integer types of another size. Integers are the only types in Move that support casting.
+
+Casts *do not* truncate. Casting will abort if the result is too large for the specified type
+
+| Syntax     | Operation                                                                       | Aborts if
+|------------|---------------------------------------------------------------------------------|---------------------------------------
+| `(e as T)`| Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T`
+
+Here, the type of `e` must be `8`, `16`, `32`, `64`, `128` or `256` and `T` must be `u8`, `u16`, `u32`, `u64`, `u128` oe `u256`.
+
+For example:
+
+- `(x as u8)`
+- `(y as u16)`
+- `(873u16 as u32)`
+- `(2u8 as u64)`
+- `(1 + 3 as u128)`
+- `(4/2 + 12345 as u256)`
+
+## Ownership
+
+As with the other scalar values built-in to the language, integer values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](./variables.md#move-and-copy).
diff --git a/vendors/move/documentation/book/src/introduction.md b/vendors/move/documentation/book/src/introduction.md
new file mode 100644
index 000000000..c2417c517
--- /dev/null
+++ b/vendors/move/documentation/book/src/introduction.md
@@ -0,0 +1,27 @@
+# Introduction
+
+Welcome to Move, a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. Move allows developers to write programs that flexibly manage and transfer assets, while providing the security and protections against attacks on those assets. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource types with move (hence the name) semantics as an explicit representation of digital assets, such as currency.
+
+## Who is Move for?
+
+Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
+
+The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
+
+### Hobbyists
+
+Understanding that the capability to create custom modules on the Diem Payment Network will not be available at launch, the hobbyist Move Developer is interested in learning the intricacies of the language. She will understand the basic syntax, the standard libraries available, and write example code that can be executed using the Move CLI. The Move Developer may even want to dig into understanding how the Move Virtual Machine executes the code she writes.
+
+### Core Contributor
+
+Beyond a hobbyist wanting to stay ahead of the curve for the core programming language is someone who may want to [contribute](https://diem.com/en-US/cla-sign/) directly to Move. Whether this includes submitting language improvements or even, in the future, adding core modules available on the Diem Payment Network, the core contributor will understand Move at a deep level.
+
+### Who Move is currently not targeting
+
+Currently, Move is not targeting developers who wish to create custom modules and contracts for use on the Diem Payment Network. We are also not targeting novice developers who expect a completely polished developer experience even in testing the language.
+
+## Where Do I Start?
+
+Begin with understanding [modules and scripts](./modules-and-scripts.md) and then work through the [Move Tutorial](./creating-coins.md).
diff --git a/vendors/move/documentation/book/src/loops.md b/vendors/move/documentation/book/src/loops.md
new file mode 100644
index 000000000..2dfac3fdd
--- /dev/null
+++ b/vendors/move/documentation/book/src/loops.md
@@ -0,0 +1,184 @@
+# While and Loop
+
+Move offers two constructs for looping: `while` and `loop`.
+
+## `while` loops
+
+The `while` construct repeats the body (an expression of type unit) until the condition (an expression of type `bool`) evaluates to `false`.
+
+Here is an example of simple `while` loop that computes the sum of the numbers from `1` to `n`:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 1;
+    while (i <= n) {
+        sum = sum + i;
+        i = i + 1
+    };
+
+    sum
+}
+```
+
+Infinite loops are allowed:
+
+```move=
+fun foo() {
+    while (true) { }
+}
+```
+
+### `break`
+
+The `break` expression can be used to exit a loop before the condition evaluates to `false`. For example, this loop uses `break` to find the smallest factor of `n` that's greater than 1:
+
+```move
+fun smallest_factor(n: u64): u64 {
+    // assuming the input is not 0 or 1
+    let i = 2;
+    while (i <= n) {
+        if (n % i == 0) break;
+        i = i + 1
+    };
+
+    i
+}
+```
+
+The `break` expression cannot be used outside of a loop.
+
+### `continue`
+
+The `continue` expression skips the rest of the loop and continues to the next iteration. This loop uses `continue` to compute the sum of `1, 2, ..., n`, except when the number is divisible by 10:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    while (i < n) {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        sum = sum + i;
+    };
+
+    sum
+}
+```
+
+The `continue` expression cannot be used outside of a loop.
+
+### The type of `break` and `continue`
+
+`break` and `continue`, much like `return` and `abort`, can have any type. The following examples illustrate where this flexible typing can be helpful:
+
+```move
+fun pop_smallest_while_not_equal(
+    v1: vector<u64>,
+    v2: vector<u64>,
+): vector<u64> {
+    let result = vector::empty();
+    while (!vector::is_empty(&v1) && !vector::is_empty(&v2)) {
+        let u1 = *vector::borrow(&v1, vector::length(&v1) - 1);
+        let u2 = *vector::borrow(&v2, vector::length(&v2) - 1);
+        let popped =
+            if (u1 < u2) vector::pop_back(&mut v1)
+            else if (u2 < u1) vector::pop_back(&mut v2)
+            else break; // Here, `break` has type `u64`
+        vector::push_back(&mut result, popped);
+    };
+
+    result
+}
+```
+
+```move
+fun pick(
+    indexes: vector<u64>,
+    v1: &vector<address>,
+    v2: &vector<address>
+): vector<address> {
+    let len1 = vector::length(v1);
+    let len2 = vector::length(v2);
+    let result = vector::empty();
+    while (!vector::is_empty(&indexes)) {
+        let index = vector::pop_back(&mut indexes);
+        let chosen_vector =
+            if (index < len1) v1
+            else if (index < len2) v2
+            else continue; // Here, `continue` has type `&vector<address>`
+        vector::push_back(&mut result, *vector::borrow(chosen_vector, index))
+    };
+
+    result
+}
+```
+
+## The `loop` expression
+
+The `loop` expression repeats the loop body (an expression with type `()`) until it hits a `break`
+
+Without a `break`, the loop will continue forever
+
+```move
+fun foo() {
+    let i = 0;
+    loop { i = i + 1 }
+}
+```
+
+Here is an example that uses `loop` to write the `sum` function:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+As you might expect, `continue` can also be used inside a `loop`. Here is `sum_intermediate` from above rewritten using `loop` instead of `while`
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+## The type of `while` and `loop`
+
+Move loops are typed expressions. A `while` expression always has type `()`.
+
+```move
+let () = while (i < 10) { i = i + 1 };
+```
+
+If a `loop` contains a `break`, the expression has type unit `()`
+
+```move
+(loop { if (i < 10) i = i + 1 else break }: ());
+let () = loop { if (i < 10) i = i + 1 else break };
+```
+
+If `loop` does not have a `break`, `loop` can have any type much like `return`, `abort`, `break`, and `continue`.
+
+```move
+(loop (): u64);
+(loop (): address);
+(loop (): &vector<vector<u8>>);
+```
diff --git a/vendors/move/documentation/book/src/modules-and-scripts.md b/vendors/move/documentation/book/src/modules-and-scripts.md
new file mode 100644
index 000000000..f3580e4de
--- /dev/null
+++ b/vendors/move/documentation/book/src/modules-and-scripts.md
@@ -0,0 +1,131 @@
+# Modules and Scripts
+
+Move has two different types of programs: ***Modules*** and ***Scripts***. Modules are libraries that define struct types along with functions that operate on these types. Struct types define the schema of Move's [global storage](./global-storage-structure.md), and module functions define the rules for updating storage. Modules themselves are also stored in global storage. Scripts are executable entrypoints similar to a `main` function in a conventional language. A script typically calls functions of a published module that perform updates to global storage. Scripts are ephemeral code snippets that are not published in global storage.
+
+A Move source file (or **compilation unit**) may contain multiple modules and scripts. However, publishing a module or executing a script are separate VM operations.
+
+## Syntax
+
+### Scripts
+
+A script has the following structure:
+
+```text
+script {
+    <use>*
+    <constants>*
+    fun <identifier><[type parameters: constraint]*>([identifier: type]*) <function_body>
+}
+```
+
+A `script` block must start with all of its [`use`](./uses.md) declarations, followed by any [constants](./constants.md) and (finally) the main
+[function](./functions.md) declaration.
+The main function can have any name (i.e., it need not be called `main`), is the only function in a script block, can have any number of
+arguments, and must not return a value. Here is an example with each of these components:
+
+```move
+script {
+    // Import the debug module published at the named account address std.
+    use std::debug;
+
+    const ONE: u64 = 1;
+
+    fun main(x: u64) {
+        let sum = x + ONE;
+        debug::print(&sum)
+    }
+}
+```
+
+Scripts have very limited power—they cannot declare friends, struct types or access global storage. Their primary purpose is to invoke module functions.
+
+### Modules
+
+A module has the following syntax:
+
+```text
+module <address>::<identifier> {
+    (<use> | <friend> | <type> | <function> | <constant>)*
+}
+```
+
+where `<address>` is a valid [named or literal address](./address.md).
+
+For example:
+
+```move
+module 0x42::test {
+    struct Example has copy, drop { i: u64 }
+
+    use std::debug;
+    friend 0x42::another_test;
+
+    const ONE: u64 = 1;
+
+    public fun print(x: u64) {
+        let sum = x + ONE;
+        let example = Example { i: sum };
+        debug::print(&sum)
+    }
+}
+```
+
+The `module 0x42::test` part specifies that the module `test` will be published under the [account address](./address.md) `0x42` in [global storage](./global-storage-structure.md).
+
+Modules can also be declared using [named addresses](./address.md). For example:
+
+```move
+module test_addr::test {
+    struct Example has copy, drop { a: address }
+
+    use std::debug;
+    friend test_addr::another_test;
+
+    public fun print() {
+        let example = Example { a: @test_addr };
+        debug::print(&example)
+    }
+}
+```
+
+Because named addresses only exist at the source language level and during compilation,
+named addresses will be fully substituted for their value at the bytecode
+level. For example if we had the following code:
+
+```move
+script {
+    fun example() {
+        my_addr::m::foo(@my_addr);
+    }
+}
+```
+
+and we compiled it with `my_addr` set to `0xC0FFEE`, then it would be equivalent
+to the following operationally:
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::m::foo(@0xC0FFEE);
+    }
+}
+```
+
+However at the source level, these _are not equivalent_—the function
+`m::foo` _must_ be accessed through the `my_addr` named address, and not through
+the numerical value assigned to that address.
+
+Module names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, module names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+module my_module {}
+module foo_bar_42 {}
+```
+
+Typically, module names start with an lowercase letter. A module named `my_module` should be stored in a source file named `my_module.move`.
+
+All elements inside a `module` block can appear in any order.
+Fundamentally, a module is a collection of [`types`](./structs-and-resources.md) and [`functions`](./functions.md).
+The [`use`](./uses.md) keyword is used to import types from other modules.
+The [`friend`](./friends.md) keyword specifies a list of trusted modules.
+The [`const`](./constants.md) keyword defines private constants that can be used in the functions of a module.
diff --git a/vendors/move/documentation/book/src/overview.md b/vendors/move/documentation/book/src/overview.md
new file mode 100644
index 000000000..d08bf4352
--- /dev/null
+++ b/vendors/move/documentation/book/src/overview.md
@@ -0,0 +1,200 @@
+---
+id: overview
+title: Overview
+sidebar_label: Move
+---
+
+Move is a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+### Start Here
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/introduction-to-move.svg"
+    iconDark="img/introduction-to-move-dark.svg"
+    overlay="Understand Move’s background, current status and architecture"
+    title="Introduction"
+    to="/docs/move/move-introduction"
+  />
+  <SimpleTextCard
+    icon="img/modules-and-scripts.svg"
+    iconDark="img/modules-and-scripts-dark.svg"
+    overlay="Understand Move’s two different types of programs: Modules and Scripts"
+    title="Modules and Scripts"
+    to="/docs/move/move-modules-and-scripts"
+  />
+  <SimpleTextCard
+    icon="img/placeholder.svg"
+    iconDark="img/placeholder-dark.svg"
+    overlay="Play with Move directly as you create coins with the language"
+    title="First Tutorial: Creating Coins"
+    to="/docs/move/move-tutorial-creating-coins"
+  />
+</CardsWrapper>
+
+### Primitive Types
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="Move supports three unsigned integer types: u8, u64, and u128"
+    title="Integers"
+    to="/docs/move/move-integers"
+  />
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="bool is Move's primitive type for boolean true and false values."
+    title="Bool"
+    to="/docs/move/move-bool"
+  />
+  <SimpleTextCard
+    icon="img/address.svg"
+    iconDark="img/address-dark.svg"
+    overlay="address is a built-in type in Move that is used to represent locations in global storage"
+    title="Address"
+    to="/docs/move/move-address"
+  />
+  <SimpleTextCard
+    icon="img/vector.svg"
+    iconDark="img/vector-dark.svg"
+    overlay="vector<T> is the only primitive collection type provided by Move"
+    title="Vector"
+    to="/docs/move/move-vector"
+  />
+  <SimpleTextCard
+    icon="img/signer.svg"
+    iconDark="img/signer-dark.svg"
+    overlay="signer is a built-in Move resource type. A signer is a capability that allows the holder to act on behalf of a particular address"
+    title="Signer"
+    to="/docs/move/move-signer"
+  />
+  <SimpleTextCard
+    icon="img/move-references.svg"
+    iconDark="img/move-references-dark.svg"
+    overlay="Move has two types of references: immutable & and mutable &mut"
+    title="References"
+    to="/docs/move/move-references"
+  />
+  <SimpleTextCard
+    icon="img/tuples.svg"
+    iconDark="img/tuples-dark.svg"
+    overlay="In order to support multiple return values, Move has tuple-like expressions. We can consider unit() to be an empty tuple"
+    title="Tuples and Unit"
+    to="/docs/move/move-tuples-and-unit"
+  />
+</CardsWrapper>
+
+### Basic Concepts
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/local-variables-and-scopes.svg"
+    iconDark="img/local-variables-and-scopes-dark.svg"
+    overlay="Local variables in Move are lexically (statically) scoped"
+    title="Local Variables and Scopes"
+    to="/docs/move/move-variables"
+  />
+  <SimpleTextCard
+    icon="img/abort-and-return.svg"
+    iconDark="img/abort-and-return-dark.svg"
+    overlay="return and abort are two control flow constructs that end execution, one for the current function and one for the entire transaction"
+    title="Abort & Assert"
+    to="/docs/move/move-abort-and-assert"
+  />
+  <SimpleTextCard
+    icon="img/conditionals.svg"
+    iconDark="img/conditionals-dark.svg"
+    overlay="An if expression specifies that some code should only be evaluated if a certain condition is true"
+    title="Conditionals"
+    to="/docs/move/move-conditionals"
+  />
+  <SimpleTextCard
+    icon="img/loops.svg"
+    iconDark="img/loops-dark.svg"
+    overlay="Move offers two constructs for looping: while and loop"
+    title="While and Loop"
+    to="/docs/move/move-while-and-loop"
+  />
+  <SimpleTextCard
+    icon="img/functions.svg"
+    iconDark="img/functions-dark.svg"
+    overlay="Function syntax in Move is shared between module functions and script functions"
+    title="Functions"
+    to="/docs/move/move-functions"
+  />
+  <SimpleTextCard
+    icon="img/structs-and-resources.svg"
+    iconDark="img/structs-and-resources-dark.svg"
+    overlay="A struct is a user-defined data structure containing typed fields. A resource is a kind of struct that cannot be copied and cannot be dropped"
+    title="Structs and Resources"
+    to="/docs/move/move-structs-and-resources"
+  />
+  <SimpleTextCard
+    icon="img/constants.svg"
+    iconDark="img/constants-dark.svg"
+    overlay="Constants are a way of giving a name to shared, static values inside of a module or script"
+    title="Constants"
+    to="/docs/move/move-constants"
+  />
+  <SimpleTextCard
+    icon="img/generics.svg"
+    iconDark="img/generics-dark.svg"
+    overlay="Generics can be used to define functions and structs over different input data types"
+    title="Generics"
+    to="/docs/move/move-generics"
+  />
+  <SimpleTextCard
+    icon="img/equality.svg"
+    iconDark="img/equality-dark.svg"
+    overlay="Move supports two equality operations == and !="
+    title="Equality"
+    to="/docs/move/move-equality"
+  />
+  <SimpleTextCard
+    icon="img/uses-and-aliases.svg"
+    iconDark="img/uses-and-aliases-dark.svg"
+    overlay="The use syntax can be used to create aliases to members in other modules"
+    title="Uses & Aliases"
+    to="/docs/move/move-uses-and-aliases"
+  />
+</CardsWrapper>
+
+### Global Storage
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="The purpose of Move programs is to read from and write to persistent global storage"
+    title="Global Storage Structure"
+    to="/docs/move/move-global-storage-structure"
+  />
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="Move programs can create, delete, and update resources in global storage using five instructions"
+    title="Global Storage Operators"
+    to="/docs/move/move-global-storage-operators"
+  />
+</CardsWrapper>
+
+### Reference
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/standard-library.svg"
+    iconDark="img/standard-library-dark.svg"
+    overlay="The Move standard library exposes interfaces that implement functionality on vectors, option types, error codes and fixed-point numbers"
+    title="Standard Library"
+    to="/docs/move/move-standard-library"
+  />
+  <SimpleTextCard
+    icon="img/coding-conventions.svg"
+    iconDark="img/coding-conventions-dark.svg"
+    overlay="There are basic coding conventions when writing Move code"
+    title="Coding Conventions"
+    to="/docs/move/move-coding-conventions"
+  />
+</CardsWrapper>
diff --git a/vendors/move/documentation/book/src/packages.md b/vendors/move/documentation/book/src/packages.md
new file mode 100644
index 000000000..c4abace5c
--- /dev/null
+++ b/vendors/move/documentation/book/src/packages.md
@@ -0,0 +1,292 @@
+# Packages
+
+Packages allow Move programmers to more easily re-use code and share it
+across projects. The Move package system allows programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by [named addresses](./address.md);
+* Import and use packages in other Move code and instantiate named addresses;
+* Build packages and generate associated compilation artifacts from packages; and
+* Work with a common interface around compiled Move artifacts.
+
+## Package Layout and Manifest Syntax
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+```
+a_move_package
+├── Move.toml      (required)
+├── sources        (required)
+├── examples       (optional, test & dev mode)
+├── scripts        (optional)
+├── doc_templates  (optional)
+└── tests          (optional, test mode)
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any documentation templates present in
+the `doc_templates` directory.
+
+### Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+```
+[package]
+name = <string>                  # e.g., "MoveStdlib"
+version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+[addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+# One or more lines declaring named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+[dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+# One or more lines declaring dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # local dependencies
+<string> = { git = <URL ending in .git>, subdir=<path to dir containing Move.toml inside git repo>, rev=<git commit hash>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # git dependencies
+
+[dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev named addresses in the following format
+<addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+[dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+# One or more lines declaring dev dependencies in the following format
+<string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+
+An example of a minimal package manifest with one local dependency and one git dependency:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+```
+[package]
+name = "AName"
+version = "0.0.0"
+license = "Apache 2.0"
+
+[addresses]
+address_to_be_filled_in = "_"
+specified_address = "0xB0B"
+
+[dependencies]
+# Local dependency
+LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
+# Git dependency
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b" }
+
+[dev-addresses] # For use when developing this module
+address_to_be_filled_in = "0x101010101"
+```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+## Named Addresses During Compilation
+
+Recall that Move has [named addresses](./address.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+### Declaration
+
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
+```move
+module named_addr::A {
+    public fun x(): address { @named_addr }
+}
+```
+
+We could in `example_pkg/Move.toml` declare the named address `named_addr` in
+two different ways. The first:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+```
+
+Declares `named_addr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `named_addr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `named_addr`, and the package can then be
+instantiated later on by an importing package.
+
+`named_addr` can also be declared as:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "0xCAFE"
+```
+
+which states that the named address `named_addr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+## Scoping and Renaming of Named Addresses
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `named_addr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+```
+[package]
+name = "P"
+...
+[dependencies]
+P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+P2 = { local = "some_path_to_P2"  }
+```
+
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+```
+module N::A {
+    public fun x(): address { @P1N }
+}
+```
+
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+### Instantiation
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `named_addr` would be uninstantiated:
+
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+
+[dev-addresses]
+named_addr = "0xC0FFEE"
+```
+
+## Usage, Artifacts, and Data Structures
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+### Usage
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
diff --git a/vendors/move/documentation/book/src/references.md b/vendors/move/documentation/book/src/references.md
new file mode 100644
index 000000000..57a5b99e1
--- /dev/null
+++ b/vendors/move/documentation/book/src/references.md
@@ -0,0 +1,235 @@
+# References
+
+Move has two types of references: immutable `&` and mutable `&mut`. Immutable references are read
+only, and cannot modify the underlying value (or any of its fields). Mutable references allow for
+modifications via a write through that reference. Move's type system enforces an ownership
+discipline that prevents reference errors.
+
+For more details on the rules of references, see [Structs and Resources](./structs-and-resources.md)
+
+## Reference Operators
+
+Move provides operators for creating and extending references as well as converting a mutable
+reference to an immutable one. Here and elsewhere, we use the notation `e: T` for "expression `e`
+has type `T`".
+
+| Syntax      | Type                                                  | Description                                                    |
+| ----------- | ----------------------------------------------------- | -------------------------------------------------------------- |
+| `&e`        | `&T` where `e: T` and `T` is a non-reference type     | Create an immutable reference to `e`                           |
+| `&mut e`    | `&mut T` where `e: T` and `T` is a non-reference type | Create a mutable reference to `e`.                             |
+| `&e.f`      | `&T` where `e.f: T`                                   | Create an immutable reference to field `f` of struct `e`.      |
+| `&mut e.f`  | `&mut T` where `e.f: T`                               | Create a mutable reference to field `f` of struct`e`.          |
+| `freeze(e)` | `&T` where `e: &mut T`                                | Convert the mutable reference `e` into an immutable reference. |
+
+The `&e.f` and `&mut e.f` operators can be used both to create a new reference into a struct or to
+extend an existing reference:
+
+```move
+let s = S { f: 10 };
+let f_ref1: &u64 = &s.f; // works
+let s_ref: &S = &s;
+let f_ref2: &u64 = &s_ref.f // also works
+```
+
+A reference expression with multiple fields works as long as both structs are in the same module:
+
+```move
+struct A { b: B }
+struct B { c : u64 }
+fun f(a: &A): &u64 {
+  &a.b.c
+}
+```
+
+Finally, note that references to references are not allowed:
+
+```move
+let x = 7;
+let y: &u64 = &x;
+let z: &&u64 = &y; // will not compile
+```
+
+## Reading and Writing Through References
+
+Both mutable and immutable references can be read to produce a copy of the referenced value.
+
+Only mutable references can be written. A write `*x = v` discards the value previously stored in `x`
+and updates it with `v`.
+
+Both operations use the C-like `*` syntax. However, note that a read is an expression, whereas a
+write is a mutation that must occur on the left hand side of an equals.
+
+| Syntax     | Type                                | Description                         |
+| ---------- | ----------------------------------- | ----------------------------------- |
+| `*e`       | `T` where `e` is `&T` or `&mut T`   | Read the value pointed to by `e`    |
+| `*e1 = e2` | `()` where `e1: &mut T` and `e2: T` | Update the value in `e1` with `e2`. |
+
+In order for a reference to be read, the underlying type must have the
+[`copy` ability](./abilities.md) as reading the reference creates a new copy of the value. This rule
+prevents the copying of resource values:
+
+```move=
+fun copy_resource_via_ref_bad(c: Coin) {
+    let c_ref = &c;
+    let counterfeit: Coin = *c_ref; // not allowed!
+    pay(c);
+    pay(counterfeit);
+}
+```
+
+Dually: in order for a reference to be written to, the underlying type must have the
+[`drop` ability](./abilities.md) as writing to the reference will discard (or "drop") the old value.
+This rule prevents the destruction of resource values:
+
+```move=
+fun destroy_resource_via_ref_bad(ten_coins: Coin, c: Coin) {
+    let ref = &mut ten_coins;
+    *ref = c; // not allowed--would destroy 10 coins!
+}
+```
+
+## `freeze` inference
+
+A mutable reference can be used in a context where an immutable reference is expected:
+
+```move
+let x = 7;
+let y: &u64 = &mut x;
+```
+
+This works because the under the hood, the compiler inserts `freeze` instructions where they are
+needed. Here are a few more examples of `freeze` inference in action:
+
+```move=
+fun takes_immut_returns_immut(x: &u64): &u64 { x }
+
+// freeze inference on return value
+fun takes_mut_returns_immut(x: &mut u64): &u64 { x }
+
+fun expression_examples() {
+    let x = 0;
+    let y = 0;
+    takes_immut_returns_immut(&x); // no inference
+    takes_immut_returns_immut(&mut x); // inferred freeze(&mut x)
+    takes_mut_returns_immut(&mut x); // no inference
+
+    assert!(&x == &mut y, 42); // inferred freeze(&mut y)
+}
+
+fun assignment_examples() {
+    let x = 0;
+    let y = 0;
+    let imm_ref: &u64 = &x;
+
+    imm_ref = &x; // no inference
+    imm_ref = &mut y; // inferred freeze(&mut y)
+}
+```
+
+### Subtyping
+
+With this `freeze` inference, the Move type checker can view `&mut T` as a subtype of `&T`. As shown
+above, this means that anywhere for any expression where a `&T` value is used, a `&mut T` value can
+also be used. This terminology is used in error messages to concisely indicate that a `&mut T` was
+needed where a `&T` was supplied. For example
+
+```move=
+address 0x42 {
+module example {
+    fun read_and_assign(store: &mut u64, new_value: &u64) {
+        *store = *new_value
+    }
+
+    fun subtype_examples() {
+        let x: &u64 = &0;
+        let y: &mut u64 = &mut 1;
+
+        x = &mut 1; // valid
+        y = &2; // invalid!
+
+        read_and_assign(y, x); // valid
+        read_and_assign(x, y); // invalid!
+    }
+}
+}
+```
+
+will yield the following error messages
+
+```text
+error:
+
+    ┌── example.move:12:9 ───
+    │
+ 12 │         y = &2; // invalid!
+    │         ^ Invalid assignment to local 'y'
+    ·
+ 12 │         y = &2; // invalid!
+    │             -- The type: '&{integer}'
+    ·
+  9 │         let y: &mut u64 = &mut 1;
+    │                -------- Is not a subtype of: '&mut u64'
+    │
+
+error:
+
+    ┌── example.move:15:9 ───
+    │
+ 15 │         read_and_assign(x, y); // invalid!
+    │         ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x42::example::read_and_assign'. Invalid argument for parameter 'store'
+    ·
+  8 │         let x: &u64 = &0;
+    │                ---- The type: '&u64'
+    ·
+  3 │     fun read_and_assign(store: &mut u64, new_value: &u64) {
+    │                                -------- Is not a subtype of: '&mut u64'
+    │
+```
+
+The only other types currently that has subtyping are [tuples](./tuples.md)
+
+## Ownership
+
+Both mutable and immutable references can always be copied and extended _even if there are existing
+copies or extensions of the same reference_:
+
+```move
+fun reference_copies(s: &mut S) {
+  let s_copy1 = s; // ok
+  let s_extension = &mut s.f; // also ok
+  let s_copy2 = s; // still ok
+  ...
+}
+```
+
+This might be surprising for programmers familiar with Rust's ownership system, which would reject
+the code above. Move's type system is more permissive in its treatment of
+[copies](./variables.md#move-and-copy), but equally strict in ensuring unique ownership of mutable
+references before writes.
+
+### References Cannot Be Stored
+
+References and tuples are the _only_ types that cannot be stored as a field value of structs, which
+also means that they cannot exist in global storage. All references created during program execution
+will be destroyed when a Move program terminates; they are entirely ephemeral. This invariant is
+also true for values of types without the `store` [ability](./abilities.md), but note that
+references and tuples go a step further by never being allowed in structs in the first place.
+
+This is another difference between Move and Rust, which allows references to be stored inside of
+structs.
+
+Currently, Move cannot support this because references cannot be
+[serialized](https://en.wikipedia.org/wiki/Serialization), but _every Move value must be
+serializable_. This requirement comes from Move's
+[persistent global storage](./global-storage-structure.md), which needs to serialize values to
+persist them across program executions. Structs can be written to global storage, and thus they must
+be serializable.
+
+One could imagine a fancier, more expressive, type system that would allow references to be stored
+in structs _and_ ban those structs from existing in global storage. We could perhaps allow
+references inside of structs that do not have the `store` [ability](./abilities.md), but that would
+not completely solve the problem: Move has a fairly complex system for tracking static reference
+safety, and this aspect of the type system would also have to be extended to support storing
+references inside of structs. In short, Move's type system (particularly the aspects around
+reference safety) would have to expand to support stored references. But it is something we are
+keeping an eye on as the language evolves.
diff --git a/vendors/move/documentation/book/src/signer.md b/vendors/move/documentation/book/src/signer.md
new file mode 100644
index 000000000..820963c8b
--- /dev/null
+++ b/vendors/move/documentation/book/src/signer.md
@@ -0,0 +1,73 @@
+# Signer
+
+`signer` is a built-in Move resource type. A `signer` is a
+[capability](https://en.wikipedia.org/wiki/Object-capability_model) that allows the holder to act on
+behalf of a particular `address`. You can think of the native implementation as being:
+
+```move
+struct signer has drop { a: address }
+```
+
+A `signer` is somewhat similar to a Unix [UID](https://en.wikipedia.org/wiki/User_identifier) in
+that it represents a user authenticated by code _outside_ of Move (e.g., by checking a cryptographic
+signature or password).
+
+## Comparison to `address`
+
+A Move program can create any `address` value without special permission using address literals:
+
+```move
+let a1 = @0x1;
+let a2 = @0x2;
+// ... and so on for every other possible address
+```
+
+However, `signer` values are special because they cannot be created via literals or
+instructions--only by the Move VM. Before the VM runs a script with parameters of type `signer`, it
+will automatically create `signer` values and pass them into the script:
+
+```move
+script {
+    use std::signer;
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @0x42, 0);
+    }
+}
+```
+
+This script will abort with code `0` if the script is sent from any address other than `0x42`.
+
+A transaction script can have an arbitrary number of `signer`s as long as the `signer`s are a prefix
+to any other arguments. In other words, all of the `signer` arguments must come first:
+
+```move
+script {
+    use std::signer;
+    fun main(s1: signer, s2: signer, x: u64, y: u8) {
+        // ...
+    }
+}
+```
+
+This is useful for implementing _multi-signer scripts_ that atomically act with the authority of
+multiple parties. For example, an extension of the script above could perform an atomic currency
+swap between `s1` and `s2`.
+
+## `signer` Operators
+
+The `std::signer` standard library module provides two utility functions over `signer` values:
+
+| Function                                    | Description                                                    |
+| ------------------------------------------- | -------------------------------------------------------------  |
+| `signer::address_of(&signer): address`      | Return the `address` wrapped by this `&signer`.                |
+| `signer::borrow_address(&signer): &address` | Return a reference to the `address` wrapped by this `&signer`. |
+
+In addition, the `move_to<T>(&signer, T)` [global storage operator](./global-storage-operators.md)
+requires a `&signer` argument to publish a resource `T` under `signer.address`'s account. This
+ensures that only an authenticated user can elect to publish a resource under their `address`.
+
+## Ownership
+
+Unlike simple scalar values, `signer` values are not copyable, meaning they cannot be copied (from
+any operation whether it be through an explicit [`copy`](./variables.md#move-and-copy) instruction
+or through a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/vendors/move/documentation/book/src/standard-library.md b/vendors/move/documentation/book/src/standard-library.md
new file mode 100644
index 000000000..7dcd8f225
--- /dev/null
+++ b/vendors/move/documentation/book/src/standard-library.md
@@ -0,0 +1,542 @@
+# Standard Library
+
+The Move standard library exposes interfaces that implement the following functionality:
+* [Basic operations on vectors](#vector).
+* [Option types and operations on`Option` types](#option).
+* [A common error encoding code interface for abort codes](#errors).
+* [32-bit precision fixed-point numbers](#fixed_point32).
+
+## vector
+
+The `vector` module defines a number of operations over the primitive
+[`vector`](./vector.md) type. The module is published under the
+named address `Std` and consists of a number of native functions, as
+well as functions defined in Move. The API for this module is as follows.
+
+### Functions
+
+---------------------------------------------------------------------------
+
+Create an empty [`vector`](./vector.md).
+The `Element` type can be both a `resource` or `copyable` type.
+
+```move
+    native public fun empty<Element>(): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a vector of length `1` containing the passed in `element`.
+
+```move
+    public fun singleton<Element>(e: Element): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Destroy (deallocate) the vector `v`. Will abort if `v` is non-empty.
+*Note*: The emptiness restriction is due to the fact that `Element` can be a
+resource type, and destruction of a non-empty vector would violate
+[resource conservation](./structs-and-resources.md).
+
+```move
+    native public fun destroy_empty<Element>(v: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Acquire an [immutable reference](./references.md) to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+```move
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Acquire a [mutable reference](./references.md)
+to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+```move
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Empty and destroy the `other` vector, and push each of the elements in
+the `other` vector onto the `lhs` vector in the same order as they occurred in `other`.
+
+```move
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Push an element `e` of type `Element` onto the end of the vector `v`. May
+trigger a resizing of the underlying vector's memory.
+
+```move
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Pop an element from the end of the vector `v` in-place and return the owned
+value. Will abort if `v` is empty.
+
+```move
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Remove the element at index `i` in the vector `v` and return the owned value
+that was previously stored at `i` in `v`. All elements occurring at indices
+greater than `i` will be shifted down by 1. Will abort if `i` is out of bounds
+for `v`.
+
+```move
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the `i`th element of the vector `v` with the last element and then pop
+this element off of the back of the vector and return the owned value that
+was previously stored at index `i`.
+This operation is O(1), but does not preserve ordering of elements in the vector.
+Aborts if the index `i` is out of bounds for the vector `v`.
+
+```move
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the elements at the `i`'th and `j`'th indices in the vector `v`. Will
+abort if either of `i` or `j` are out of bounds for `v`.
+
+```move
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+```
+
+---------------------------------------------------------------------------
+
+Reverse the order of the elements in the vector `v` in-place.
+
+```move
+    public fun reverse<Element>(v: &mut vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Return the index of the first occurrence of an element in `v` that is
+equal to `e`. Returns `(true, index)` if such an element was found, and
+`(false, 0)` otherwise.
+
+```move
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64);
+```
+
+---------------------------------------------------------------------------
+
+Return if an element equal to `e` exists in the vector `v`.
+
+```move
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return the length of a `vector`.
+
+```move
+    native public fun length<Element>(v: &vector<Element>): u64;
+```
+
+---------------------------------------------------------------------------
+
+Return whether the vector `v` is empty.
+
+```move
+    public fun is_empty<Element>(v: &vector<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+## option
+
+The `option` module defines a generic option type `Option<T>` that represents a
+value of type `T` that may, or may not, be present. It is published under the named address `Std`.
+
+The Move option type is internally represented as a singleton vector, and may
+contain a value of `resource` or `copyable` kind.  If you are familiar with option
+types in other languages, the Move `Option` behaves similarly to those with a
+couple notable exceptions since the option can contain a value of kind `resource`.
+Particularly, certain operations such as `get_with_default` and
+`destroy_with_default` require that the element type `T` be of `copyable` kind.
+
+The API for the `option` module is as as follows
+
+### Types
+
+Generic type abstraction of a value that may, or may not, be present. Can contain
+a value of either `resource` or `copyable` kind.
+
+```move
+    struct Option<T>;
+```
+
+### Functions
+
+Create an empty `Option` of that can contain a value of `Element` type.
+
+```move
+    public fun none<Element>(): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a non-empty `Option` type containing a value `e` of type `Element`.
+
+```move
+    public fun some<Element>(e: T): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Return an immutable reference to the value inside the option `opt_elem`
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun borrow<Element>(opt_elem: &Option<Element>): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a reference to the value inside `opt_elem` if it contains one. If
+`opt_elem` does not contain a value the passed in `default_ref` reference will be returned.
+Does not abort.
+
+```move
+    public fun borrow_with_default<Element>(opt_elem: &Option<Element>, default_ref: &Element): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a mutable reference to the value inside `opt_elem`. Will abort if
+`opt_elem` does not contain a value.
+
+```move
+    public fun borrow_mut<Element>(opt_elem: &mut Option<Element>): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an option value that contains a value to one that is empty in-place by
+removing and returning the value stored inside `opt_elem`.
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun extract<Element>(opt_elem: &mut Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return the value contained inside the option `opt_elem` if it contains one.
+Will return the passed in `default` value if `opt_elem` does not contain a
+value. The `Element` type that the `Option` type is instantiated with must be
+of `copyable` kind in order for this function to be callable.
+
+```move
+    public fun get_with_default<Element: copyable>(opt_elem: &Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an empty option `opt_elem` to an option value that contains the value `e`.
+Will abort if `opt_elem` already contains a value.
+
+```move
+    public fun fill<Element>(opt_elem: &mut Option<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Swap the value currently contained in `opt_elem` with `new_elem` and return the
+previously contained value. Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun swap<Element>(opt_elem: &mut Option<Element>, e: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return true if `opt_elem` contains a value equal to the value of `e_ref`.
+Otherwise, `false` will be returned.
+
+```move
+    public fun contains<Element>(opt_elem: &Option<Element>, e_ref: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` does not contain a value.
+
+```move
+    public fun is_none<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` contains a value.
+
+```move
+    public fun is_some<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Unpack `opt_elem` and return the value that it contained.
+Will abort if `opt_elem` does not contain a value.
+
+```move
+    public fun destroy_some<Element>(opt_elem: Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in. If `opt_elem` contained a value it
+will be returned otherwise, the passed in `default` value will be returned.
+
+```move
+    public fun destroy_with_default<Element: copyable>(opt_elem: Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in, `opt_elem` must be empty and not
+contain a value. Will abort if `opt_elem` contains a value.
+
+```move
+    public fun destroy_none<Element>(opt_elem: Option<Element>);
+```
+
+## errors
+
+Recall that each abort code in Move is represented as an unsigned 64-bit integer. The `errors` module defines a common interface that can be used to "tag" each of these abort codes so that they can represent both the error **category** along with an error **reason**.
+
+Error categories are declared as constants in the `errors` module and are globally unique with respect to this module. Error reasons on the other hand are module-specific error codes, and can provide greater detail (perhaps, even a particular _reason_) about the specific error condition. This representation of a category and reason for each error code is done by dividing the abort code into two sections.
+
+The lower 8 bits of the abort code hold the *error category*. The remaining 56 bits of the abort code hold the *error reason*.
+The reason should be a unique number relative to the module which raised the error and can be used to obtain more information about the error at hand. It should mostly be used for diagnostic purposes as error reasons may change over time if the module is updated.
+
+| Category | Reason |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+Since error categories are globally stable, these present the most stable API and should in general be what is used by clients to determine the messages they may present to users (whereas the reason is useful for diagnostic purposes). There are public functions in the `errors` module for creating an abort code of each error category with a specific `reason` number (represented as a `u64`).
+
+### Constants
+
+The system is in a state where the performed operation is not allowed.
+
+```move
+    const INVALID_STATE: u8 = 1;
+```
+
+---------------------------------------------------------------------------
+A specific account address was required to perform an operation, but a different address from what was expected was encounterd.
+
+```move
+    const REQUIRES_ADDRESS: u8 = 2;
+```
+
+---------------------------------------------------------------------------
+An account did not have the expected  role for this operation. Useful for Role Based Access Control (RBAC) error conditions.
+
+```move
+    const REQUIRES_ROLE: u8 = 3;
+```
+
+---------------------------------------------------------------------------
+An account did not not have a required capability. Useful for RBAC error conditions.
+
+```move
+    const REQUIRES_CAPABILITY: u8 = 4;
+```
+
+---------------------------------------------------------------------------
+A resource was expected, but did not exist under an address.
+
+```move
+    const NOT_PUBLISHED: u8 = 5;
+```
+
+---------------------------------------------------------------------------
+Attempted to publish a resource under an address where one was already published.
+
+```move
+    const ALREADY_PUBLISHED: u8 = 6;
+```
+
+---------------------------------------------------------------------------
+An argument provided for an operation was invalid.
+
+```move
+    const INVALID_ARGUMENT: u8 = 7;
+```
+
+---------------------------------------------------------------------------
+A limit on a value was exceeded.
+
+```move
+    const LIMIT_EXCEEDED: u8 = 8;
+```
+
+---------------------------------------------------------------------------
+An internal error (bug) has occurred.
+
+```move
+    const INTERNAL: u8 = 10;
+```
+
+---------------------------------------------------------------------------
+A custom error category for extension points.
+
+```move
+    const CUSTOM: u8 = 255;
+```
+
+---------------------------------------------------------------------------
+
+### Functions
+
+ Should be used in the case where invalid (global) state is encountered. Constructs an abort code with specified `reason` and category `INVALID_STATE`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun invalid_state(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account's address does not match a specific address. Constructs an abort code with specified `reason` and category `REQUIRES_ADDRESS`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_address(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a role did not match a required role when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_ROLE`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_role(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account did not have a required capability when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_CAPABILITY`. Should be Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun requires_capability(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource did not exist where one was expected. Constructs an abort code with specified `reason` and category `NOT_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun not_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource already existed where one was about to be published. Constructs an abort code with specified `reason` and category `ALREADY_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun already_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an invalid argument was passed to a function/operation. Constructs an abort code with specified `reason` and category `INVALID_ARGUMENT`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun invalid_argument(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a limit on a specific value is reached, e.g., subtracting 1 from a value of 0. Constructs an abort code with specified `reason` and category `LIMIT_EXCEEDED`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun limit_exceeded(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an internal error or bug was encountered. Constructs an abort code with specified `reason` and category `INTERNAL`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun internal(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Used for extension points, should be not used under most circumstances. Constructs an abort code with specified `reason` and category `CUSTOM`. Will abort if `reason` does not fit in 56 bits.
+
+```move
+    public fun custom(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+
+## fixed_point32
+
+The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
+
+### Types
+
+Represents a fixed-point numeric number with 32 fractional bits.
+
+```move
+    struct FixedPoint32;
+```
+
+### Functions
+
+Multiply a u64 integer by a fixed-point number, truncating any fractional part of the product. This will abort if the product overflows.
+
+```move
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Divide a u64 integer by a fixed-point number, truncating any fractional part of the quotient. This will abort if the divisor is zero or if the quotient overflows.
+
+```move
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Create a fixed-point value from a rational number specified by its numerator and denominator. Calling this function should be preferred for using `fixed_point32::create_from_raw_value` which is also available. This will abort if the denominator is zero. It will also abort if the numerator is nonzero and the ratio is not in the range $2^{-32}\ldots2^{32}-1$. When specifying decimal fractions, be careful about rounding errors: if you round to display $N$ digits after the decimal point, you can use a denominator of $10^N$ to avoid numbers where the very small imprecision in the binary representation could change the rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+```move
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Create a fixedpoint value from a raw `u64` value.
+
+```move
+    public fun create_from_raw_value(value: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Returns `true` if the decimal value of `num` is equal to zero.
+
+```move
+    public fun is_zero(num: FixedPoint32): bool;
+```
+
+---------------------------------------------------------------------------
+Accessor for the raw `u64` value. Other less common operations, such as adding or subtracting `FixedPoint32` values, can be done using the raw values directly.
+
+```move
+    public fun get_raw_value(num: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
diff --git a/vendors/move/documentation/book/src/structs-and-resources.md b/vendors/move/documentation/book/src/structs-and-resources.md
new file mode 100644
index 000000000..a073a44cd
--- /dev/null
+++ b/vendors/move/documentation/book/src/structs-and-resources.md
@@ -0,0 +1,527 @@
+# Structs and Resources
+
+A _struct_ is a user-defined data structure containing typed fields. Structs can store any
+non-reference type, including other structs.
+
+We often refer to struct values as _resources_ if they cannot be copied and cannot be dropped. In
+this case, resource values must have ownership transferred by the end of the function. This property
+makes resources particularly well served for defining global storage schemas or for representing
+important values (such as a token).
+
+By default, structs are linear and ephemeral. By this we mean that they: cannot be copied, cannot be
+dropped, and cannot be stored in global storage. This means that all values have to have ownership
+transferred (linear) and the values must be dealt with by the end of the program's execution
+(ephemeral). We can relax this behavior by giving the struct [abilities](./abilities.md) which allow
+values to be copied or dropped and also to be stored in global storage or to define global storage
+schemas.
+
+## Defining Structs
+
+Structs must be defined inside a module:
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar {}
+    struct Baz { foo: Foo, }
+    //                   ^ note: it is fine to have a trailing comma
+}
+}
+```
+
+Structs cannot be recursive, so the following definition is invalid:
+
+```move
+struct Foo { x: Foo }
+//              ^ error! Foo cannot contain Foo
+```
+
+As mentioned above: by default, a struct declaration is linear and ephemeral. So to allow the value
+to be used with certain operations (that copy it, drop it, store it in global storage, or use it as
+a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
+`has <ability>`:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64, y: bool }
+}
+}
+```
+
+For more details, see the [annotating structs](./abilities.md#annotating-structs) section.
+
+### Naming
+
+Structs must start with a capital letter `A` to `Z`. After the first letter, struct names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+```move
+struct Foo {}
+struct BAR {}
+struct B_a_z_4_2 {}
+```
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+## Using Structs
+
+### Creating Structs
+
+Values of a struct type can be created (or "packed") by indicating the struct name, followed by
+value for each field:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64, y: bool }
+    struct Baz has drop { foo: Foo }
+
+    fun example() {
+        let foo = Foo { x: 0, y: false };
+        let baz = Baz { foo: foo };
+    }
+}
+}
+```
+
+If you initialize a struct field with a local variable whose name is the same as the field, you can
+use the following shorthand:
+
+```move
+let baz = Baz { foo: foo };
+// is equivalent to
+let baz = Baz { foo };
+```
+
+This is called sometimes called "field name punning".
+
+### Destroying Structs via Pattern Matching
+
+Struct values can be destroyed by binding or assigning them patterns.
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar { foo: Foo }
+    struct Baz {}
+
+    fun example_destroy_foo() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: foo_y } = foo;
+        //        ^ shorthand for `x: x`
+
+        // two new bindings
+        //   x: u64 = 3
+        //   foo_y: bool = false
+    }
+
+    fun example_destroy_foo_wildcard() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: _ } = foo;
+
+        // only one new binding since y was bound to a wildcard
+        //   x: u64 = 3
+    }
+
+    fun example_destroy_foo_assignment() {
+        let x: u64;
+        let y: bool;
+        Foo { x, y } = Foo { x: 3, y: false };
+
+        // mutating existing variables x & y
+        //   x = 3, y = false
+    }
+
+    fun example_foo_ref() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &foo;
+
+        // two new bindings
+        //   x: &u64
+        //   y: &bool
+    }
+
+    fun example_foo_ref_mut() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &mut foo;
+
+        // two new bindings
+        //   x: &mut u64
+        //   y: &mut bool
+    }
+
+    fun example_destroy_bar() {
+        let bar = Bar { foo: Foo { x: 3, y: false } };
+        let Bar { foo: Foo { x, y } } = bar;
+        //             ^ nested pattern
+
+        // two new bindings
+        //   x: u64 = 3
+        //   y: bool = false
+    }
+
+    fun example_destroy_baz() {
+        let baz = Baz {};
+        let Baz {} = baz;
+    }
+}
+}
+```
+
+### Borrowing Structs and Fields
+
+The `&` and `&mut` operator can be used to create references to structs or fields. These examples
+include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref: &Foo = &foo;
+let y: bool = foo_ref.y;          // reading a field via a reference to the struct
+let x_ref: &u64 = &foo.x;
+
+let x_ref_mut: &mut u64 = &mut foo.x;
+*x_ref_mut = 42;            // modifying a field via a mutable reference
+```
+
+It is possible to borrow inner fields of nested structs:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+
+let x_ref = &bar.foo.x;
+```
+
+You can also borrow a field via a reference to a struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &foo;
+let x_ref = &foo_ref.x;
+// this has the same effect as let x_ref = &foo.x
+```
+
+### Reading and Writing Fields
+
+If you need to read and copy a field's value, you can then dereference the borrowed field:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo: copy foo };
+let x: u64 = *&foo.x;
+let y: bool = *&foo.y;
+let foo2: Foo = *&bar.foo;
+```
+
+If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
+any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
+
+```move
+let foo = Foo { x: 3, y: true };
+let x = foo.x;  // x == 3
+let y = foo.y;  // y == true
+```
+
+Dot operators can be chained to access nested fields:
+
+```move
+let baz = Baz { foo: Foo { x: 3, y: true } };
+let x = baz.foo.x; // x = 3;
+```
+
+However, this is not permitted for fields that contain non-primitive types, such a vector or another
+struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+let foo2: Foo = *&bar.foo;
+let foo3: Foo = bar.foo; // error! must add an explicit copy with *&
+```
+
+The reason behind this design decision is that copying a vector or another struct might be an
+expensive operation. It is important for a programmer to be aware of this copy and make others aware
+with the explicit syntax `*&`.
+
+In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
+field being a primitive type or some other struct.
+
+```move
+let foo = Foo { x: 3, y: true };
+foo.x = 42;     // foo = Foo { x: 42, y: true }
+foo.y = !foo.y; // foo = Foo { x: 42, y: false }
+let bar = Bar { foo };            // bar = Bar { foo: Foo { x: 42, y: false } }
+bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
+bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
+```
+
+The dot syntax also works via a reference to a struct:
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &mut foo;
+foo_ref.x = foo_ref.x + 1;
+```
+
+## Privileged Struct Operations
+
+Most struct operations on a struct type `T` can only be performed inside the module that declares
+`T`:
+
+- Struct types can only be created ("packed"), destroyed ("unpacked") inside the module that defines
+  the struct.
+- The fields of a struct are only accessible inside the module that defines the struct.
+
+Following these rules, if you want to modify your struct outside the module, you will need to
+provide public APIs for them. The end of the chapter contains some examples of this.
+
+However, struct _types_ are always visible to another module or script:
+
+```move
+// m.move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64 }
+
+    public fun new_foo(): Foo {
+        Foo { x: 42 }
+    }
+}
+}
+```
+
+```move
+// n.move
+address 0x2 {
+module n {
+    use 0x2::m;
+
+    struct Wrapper has drop {
+        foo: m::Foo
+    }
+
+    fun f1(foo: m::Foo) {
+        let x = foo.x;
+        //      ^ error! cannot access fields of `foo` here
+    }
+
+    fun f2() {
+        let foo_wrapper = Wrapper { foo: m::new_foo() };
+    }
+}
+}
+```
+
+Note that structs do not have visibility modifiers (e.g., `public` or `private`).
+
+## Ownership
+
+As mentioned above in [Defining Structs](#defining-structs), structs are by default linear and
+ephemeral. This means they cannot be copied or dropped. This property can be very useful when
+modeling real world resources like money, as you do not want money to be duplicated or get lost in
+circulation.
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun copying_resource() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo; // error! 'copy'-ing requires the 'copy' ability
+        let foo_ref = &foo;
+        let another_copy = *foo_ref // error! dereference requires the 'copy' ability
+    }
+
+    public fun destroying_resource1() {
+        let foo = Foo { x: 100 };
+
+        // error! when the function returns, foo still contains a value.
+        // This destruction requires the 'drop' ability
+    }
+
+    public fun destroying_resource2(f: &mut Foo) {
+        *f = Foo { x: 100 } // error!
+                            // destroying the old value via a write requires the 'drop' ability
+    }
+}
+}
+```
+
+To fix the second example (`fun destroying_resource1`), you would need to manually "unpack" the
+resource:
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun destroying_resource1_fixed() {
+        let foo = Foo { x: 100 };
+        let Foo { x: _ } = foo;
+    }
+}
+}
+```
+
+Recall that you are only able to deconstruct a resource within the module in which it is defined.
+This can be leveraged to enforce certain invariants in a system, for example, conservation of money.
+
+If on the other hand, your struct does not represent something valuable, you can add the abilities
+`copy` and `drop` to get a struct value that might feel more familiar from other programming
+languages:
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64 }
+
+    public fun run() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo;
+        // ^ this code copies foo, whereas `let x = foo` or
+        // `let x = move foo` both move foo
+
+        let x = foo.x;            // x = 100
+        let x_copy = foo_copy.x;  // x = 100
+
+        // both foo and foo_copy are implicitly discarded when the function returns
+    }
+}
+}
+```
+
+## Storing Resources in Global Storage
+
+Only structs with the `key` ability can be saved directly in
+[persistent global storage](./global-storage-operators.md). All values stored within those `key`
+structs must have the `store` ability. See the [ability](./abilities) and
+[global storage](./global-storage-operators.md) chapters for more detail.
+
+## Examples
+
+Here are two short examples of how you might use structs to represent valuable data (in the case of
+`Coin`) or more classical data (in the case of `Point` and `Circle`).
+
+### Example 1: Coin
+
+<!-- TODO link to access control for mint -->
+
+```move
+address 0x2 {
+module m {
+    // We do not want the Coin to be copied because that would be duplicating this "money",
+    // so we do not give the struct the 'copy' ability.
+    // Similarly, we do not want programmers to destroy coins, so we do not give the struct the
+    // 'drop' ability.
+    // However, we *want* users of the modules to be able to store this coin in persistent global
+    // storage, so we grant the struct the 'store' ability. This struct will only be inside of
+    // other resources inside of global storage, so we do not give the struct the 'key' ability.
+    struct Coin has store {
+        value: u64,
+    }
+
+    public fun mint(value: u64): Coin {
+        // You would want to gate this function with some form of access control to prevent
+        // anyone using this module from minting an infinite amount of coins.
+        Coin { value }
+    }
+
+    public fun withdraw(coin: &mut Coin, amount: u64): Coin {
+        assert!(coin.balance >= amount, 1000);
+        coin.value = coin.value - amount;
+        Coin { value: amount }
+    }
+
+    public fun deposit(coin: &mut Coin, other: Coin) {
+        let Coin { value } = other;
+        coin.value = coin.value + value;
+    }
+
+    public fun split(coin: Coin, amount: u64): (Coin, Coin) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun merge(coin1: Coin, coin2: Coin): Coin {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+
+    public fun destroy_zero(coin: Coin) {
+        let Coin { value } = coin;
+        assert!(value == 0, 1001);
+    }
+}
+}
+```
+
+### Example 2: Geometry
+
+```move
+address 0x2 {
+module point {
+    struct Point has copy, drop, store {
+        x: u64,
+        y: u64,
+    }
+
+    public fun new(x: u64, y: u64): Point {
+        Point {
+            x, y
+        }
+    }
+
+    public fun x(p: &Point): u64 {
+        p.x
+    }
+
+    public fun y(p: &Point): u64 {
+        p.y
+    }
+
+    fun abs_sub(a: u64, b: u64): u64 {
+        if (a < b) {
+            b - a
+        }
+        else {
+            a - b
+        }
+    }
+
+    public fun dist_squared(p1: &Point, p2: &Point): u64 {
+        let dx = abs_sub(p1.x, p2.x);
+        let dy = abs_sub(p1.y, p2.y);
+        dx*dx + dy*dy
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module circle {
+    use 0x2::point::{Self, Point};
+
+    struct Circle has copy, drop, store {
+        center: Point,
+        radius: u64,
+    }
+
+    public fun new(center: Point, radius: u64): Circle {
+        Circle { center, radius }
+    }
+
+    public fun overlaps(c1: &Circle, c2: &Circle): bool {
+        let d = point::dist_squared(&c1.center, &c2.center);
+        let r1 = c1.radius;
+        let r2 = c2.radius;
+        d*d <= r1*r1 + 2*r1*r2 + r2*r2
+    }
+}
+}
+```
diff --git a/vendors/move/documentation/book/src/tuples.md b/vendors/move/documentation/book/src/tuples.md
new file mode 100644
index 000000000..1f4575b81
--- /dev/null
+++ b/vendors/move/documentation/book/src/tuples.md
@@ -0,0 +1,137 @@
+# Tuples and Unit
+
+Move does not fully support tuples as one might expect coming from another language with them as a
+[first-class value](https://en.wikipedia.org/wiki/First-class_citizen). However, in order to support multiple return values, Move has tuple-like
+expressions. These expressions do not result in a concrete value at runtime (there are no tuples in
+the bytecode), and as a result they are very limited: they can only appear in expressions (usually
+in the return position for a function); they cannot be bound to local variables; they cannot be
+stored in structs; and tuple types cannot be used to instantiate generics.
+
+Similarly, [unit `()`](https://en.wikipedia.org/wiki/Unit_type) is a type created by the Move source language in order to be expression based.
+The unit value `()` does not result in any runtime value. We can consider unit`()` to be an empty
+tuple, and any restrictions that apply to tuples also apply to unit.
+
+It might feel weird to have tuples in the language at all given these restrictions. But one of the
+most common use cases for tuples in other languages is for functions to allow functions to return
+multiple values. Some languages work around this by forcing the users to write structs that contain
+the multiple return values. However in Move, you cannot put references inside of
+[structs](./structs-and-resources.md). This required Move to support multiple return values. These
+multiple return values are all pushed on the stack at the bytecode level. At the source level, these
+multiple return values are represented using tuples.
+
+## Literals
+
+Tuples are created by a comma separated list of expressions inside of parentheses.
+
+| Syntax          | Type                                                                         | Description                                                  |
+| --------------- | ---------------------------------------------------------------------------- | ------------------------------------------------------------ |
+| `()`            | `(): ()`                                                                     | Unit, the empty tuple, or the tuple of arity 0               |
+| `(e1, ..., en)` | `(e1, ..., en): (T1, ..., Tn)` where `e_i: Ti` s.t. `0 < i <= n` and `n > 0` | A `n`-tuple, a tuple of arity `n`, a tuple with `n` elements |
+
+Note that `(e)` does not have type `(e): (t)`, in other words there is no tuple with one element. If
+there is only a single element inside of the parentheses, the parentheses are only used for
+disambiguation and do not carry any other special meaning.
+
+Sometimes, tuples with two elements are called "pairs" and tuples with three elements are called
+"triples."
+
+### Examples
+
+```move
+address 0x42 {
+module example {
+    // all 3 of these functions are equivalent
+
+    // when no return type is provided, it is assumed to be `()`
+    fun returns_unit_1() { }
+
+    // there is an implicit () value in empty expression blocks
+    fun returns_unit_2(): () { }
+
+    // explicit version of `returns_unit_1` and `returns_unit_2`
+    fun returns_unit_3(): () { () }
+
+
+    fun returns_3_values(): (u64, bool, address) {
+        (0, false, @0x42)
+    }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) {
+        (x, 0, 1, b"foobar")
+    }
+}
+}
+```
+
+## Operations
+
+The only operation that can be done on tuples currently is destructuring.
+
+### Destructuring
+
+For tuples of any size, they can be destructured in either a `let` binding or in an assignment.
+
+For example:
+
+```move
+address 0x42 {
+module example {
+    // all 3 of these functions are equivalent
+    fun returns_unit() {}
+    fun returns_2_values(): (bool, bool) { (true, false) }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) { (x, 0, 1, b"foobar") }
+
+    fun examples(cond: bool) {
+        let () = ();
+        let (x, y): (u8, u64) = (0, 1);
+        let (a, b, c, d) = (@0x0, 0, false, b"");
+
+        () = ();
+        (x, y) = if (cond) (1, 2) else (3, 4);
+        (a, b, c, d) = (@0x1, 1, true, b"1");
+    }
+
+    fun examples_with_function_calls() {
+        let () = returns_unit();
+        let (x, y): (bool, bool) = returns_2_values();
+        let (a, b, c, d) = returns_4_values(&0);
+
+        () = returns_unit();
+        (x, y) = returns_2_values();
+        (a, b, c, d) = returns_4_values(&1);
+    }
+}
+}
+```
+
+For more details, see [Move Variables](./variables.md).
+
+## Subtyping
+
+Along with references, tuples are the only types that have [subtyping](https://en.wikipedia.org/wiki/Subtyping) in Move. Tuples do have
+subtyping only in the sense that subtype with references (in a covariant way).
+
+For example:
+
+```move
+let x: &u64 = &0;
+let y: &mut u64 = &mut 1;
+
+// (&u64, &mut u64) is a subtype of (&u64, &u64)
+// since &mut u64 is a subtype of &u64
+let (a, b): (&u64, &u64) = (x, y);
+
+// (&mut u64, &mut u64) is a subtype of (&u64, &u64)
+// since &mut u64 is a subtype of &u64
+let (c, d): (&u64, &u64) = (y, y);
+
+// error! (&u64, &mut u64) is NOT a subtype of (&mut u64, &mut u64)
+// since &u64 is NOT a subtype of &mut u64
+let (e, f): (&mut u64, &mut u64) = (x, y);
+```
+
+## Ownership
+
+As mentioned above, tuple values don't really exist at runtime. And currently they cannot be stored
+into local variables because of this (but it is likely that this feature will come soon). As such,
+tuples can only be moved currently, as copying them would require putting them into a local variable
+first.
diff --git a/vendors/move/documentation/book/src/unit-testing.md b/vendors/move/documentation/book/src/unit-testing.md
new file mode 100644
index 000000000..75649da19
--- /dev/null
+++ b/vendors/move/documentation/book/src/unit-testing.md
@@ -0,0 +1,316 @@
+# Unit Tests
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail. These annotations can be placed on a function with any visibility. Whenever a module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+## Testing Annotations: Their Meaning and Usage
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+```
+#[test] // OK
+fun this_is_a_test() { ... }
+
+#[test] // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the test should is expected to raise an error. You can ensure that a test is aborting with a specific abort code by annotating it with `#[expected_failure(abort_code = <code>)]`, if it then fails with a different abort code or with a non-abort error the test will fail. Only functions that have the `#[test]` annotation can also be annotated as an #`[expected_failure]`.
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_will_abort_and_pass() { abort 1 }
+
+#[test]
+#[expected_failure]
+public fun test_will_error_and_pass() { 1/0; }
+
+#[test]
+#[expected_failure(abort_code = 0)]
+public fun test_will_error_and_fail() { 1/0; }
+
+#[test, expected_failure] // Can have multiple in one attribute. This test will pass.
+public fun this_other_test_will_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do not have to be the same, but they must be able to be matched up with each other by name.
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+```
+#[test(arg = @0xC0FFEE)] // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// somewhere a named address is declared
+#[test_only] // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+```
+#[test, expected_failure(abort_code = 1)] // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+```
+#[test_only] // test only attributes can be attached to modules
+module abc { ... }
+
+#[test_only] // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. to uses
+use 0x1::some_other_module;
+
+#[test_only] // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+## Running Unit Tests
+
+Unit tests for a Move package can be run with the [`move test`
+command](./packages.md).
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
+
+```
+$ move -h
+```
+
+## Example
+
+A simple module using some of the unit testing features is shown in the following example:
+
+First create an empty package and change directory into it:
+
+```
+$ move new TestExample; cd TestExample
+```
+
+Next add the following to the `Move.toml`:
+
+```
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b", addr_subst = { "std" = "0x1" } }
+```
+
+Next add the following module under the `sources` directory:
+
+```
+// filename: sources/my_module.move
+module 0x1::my_module {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert!(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+        assert!(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### Running Tests
+
+You can then run these tests with the `move test` command:
+
+```
+$ move test
+BUILDING MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### Using Test Flags
+
+#### `-f <str>` or `--filter <str>`
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+```
+$ move test -f zero_coin
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` or `--gas_used <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+```
+$ move test -i 0
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ TIMEOUT ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::my_module::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::my_module::test_has_coin
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` or `--statistics`
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
+
+```
+$ move test -s
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+
+Test Statistics:
+
+┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                    │    Time    │   Gas Used   │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_zero_coin_fails      │   0.008    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::test_has_coin                  │   0.008    │             1             │
+└────────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` or `--state-on-error`
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `my_module` example:
+
+```
+module 0x1::my_module {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get the following output when running the tests:
+
+```
+$ move test -g
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+[ FAIL    ] 0x1::my_module::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── test_has_coin_bad ──────
+│ error[E11001]: test failure
+│    ┌─ /home/tzakian/TestExample/sources/my_module.move:47:10
+│    │
+│ 44 │      fun test_has_coin_bad(a: signer) {
+│    │          ----------------- In this function in 0x1::my_module
+│    ·
+│ 47 │          assert!(has_coin(@0x2), 1);
+│    │          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::my_module::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
diff --git a/vendors/move/documentation/book/src/uses.md b/vendors/move/documentation/book/src/uses.md
new file mode 100644
index 000000000..5e7edf8d9
--- /dev/null
+++ b/vendors/move/documentation/book/src/uses.md
@@ -0,0 +1,359 @@
+# Uses and Aliases
+
+The `use` syntax can be used to create aliases to members in other modules. `use` can be used to
+create aliases that last either for the entire module, or for a given expression block scope.
+
+## Syntax
+
+There are several different syntax cases for `use`. Starting with the most simple, we have the
+following for creating aliases to other modules
+
+```move
+use <address>::<module name>;
+use <address>::<module name> as <module alias name>;
+```
+
+For example
+
+```move
+use std::vector;
+use std::vector as V;
+```
+
+`use std::vector;` introduces an alias `vector` for `std::vector`. This means that anywhere you
+would want to use the module name `std::vector` (assuming this `use` is in scope), you could use
+`vector` instead. `use std::vector;` is equivalent to `use std::vector as vector;`
+
+Similarly `use std::vector as V;` would let you use `V` instead of `std::vector`
+
+```move=
+use std::vector;
+use std::vector as V;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = vector::empty();
+    let v3 = V::empty();
+    (v1, v2, v3)
+}
+```
+
+If you want to import a specific module member (such as a function, struct, or constant). You can
+use the following syntax.
+
+```move
+use <address>::<module name>::<module member>;
+use <address>::<module name>::<module member> as <member alias>;
+```
+
+For example
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+```
+
+This would let you use the function `std::vector::empty` without full qualification. Instead you
+could use `empty` and `empty_vec` respectively. Again, `use std::vector::empty;` is equivalent to
+`use std::vector::empty as empty;`
+
+```move=
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = empty();
+    let v3 = empty_vec();
+    (v1, v2, v3)
+}
+```
+
+If you want to add aliases for multiple module members at once, you can do so with the following
+syntax
+
+```move
+use <address>::<module name>::{<module member>, <module member> as <member alias> ... };
+```
+
+For example
+
+```move=
+use std::vector::{push_back, length as len, pop_back};
+
+fun swap_last_two<T>(v: &mut vector<T>) {
+    assert!(len(v) >= 2, 42);
+    let last = pop_back(v);
+    let second_to_last = pop_back(v);
+    push_back(v, last);
+    push_back(v, second_to_last)
+}
+```
+
+If you need to add an alias to the Module itself in addition to module members, you can do that in a
+single `use` using `Self`. `Self` is a member of sorts that refers to the module.
+
+```move
+use std::vector::{Self, empty};
+```
+
+For clarity, all of the following are equivalent:
+
+```move
+use std::vector;
+use std::vector as vector;
+use std::vector::Self;
+use std::vector::Self as vector;
+use std::vector::{Self};
+use std::vector::{Self as vector};
+```
+
+If needed, you can have as many aliases for any item as you like
+
+```move=
+use std::vector::{
+    Self,
+    Self as V,
+    length,
+    length as len,
+};
+
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    // all options available given the `use` above
+    assert!(vector::length(v) > 1, 42);
+    assert!(V::length(v) > 1, 42);
+    assert!(length(v) > 1, 42);
+    assert!(len(v) > 1, 42);
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+## Inside a `module`
+
+Inside of a `module` all `use` declarations are usable regardless of the order of declaration.
+
+```move=
+address 0x42 {
+module example {
+    use std::vector;
+
+    fun example(): vector<u8> {
+        let v = empty();
+        vector::push_back(&mut v, 0);
+        vector::push_back(&mut v, 10);
+        v
+    }
+
+    use std::vector::empty;
+}
+}
+```
+
+The aliases declared by `use` in the module usable within that module.
+
+Additionally, the aliases introduced cannot conflict with other module members. See
+[Uniqueness](#uniqueness) for more details
+
+## Inside an expression
+
+You can add `use` declarations to the beginning of any expression block
+
+```move=
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        use std::vector::{empty, push_back};
+
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    }
+}
+}
+```
+
+As with `let`, the aliases introduced by `use` in an expression block are removed at the end of that
+block.
+
+```move=
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        let result = {
+            use std::vector::{empty, push_back};
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 10);
+            v
+        };
+        result
+    }
+
+}
+}
+```
+
+Attempting to use the alias after the block ends will result in an error
+
+```move=
+fun example(): vector<u8> {
+    let result = {
+        use std::vector::{empty, push_back};
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    };
+    let v2 = empty(); // ERROR!
+//           ^^^^^ unbound function 'empty'
+    result
+}
+```
+
+Any `use` must be the first item in the block. If the `use` comes after any expression or `let`, it
+will result in a parsing error
+
+```move=
+{
+    let x = 0;
+    use std::vector; // ERROR!
+    let v = vector::empty();
+}
+```
+
+## Naming rules
+
+Aliases must follow the same rules as other module members. This means that aliases to structs or
+constants must start with `A` to `Z`
+
+```move=
+address 0x42 {
+module data {
+    struct S {}
+    const FLAG: bool = false;
+    fun foo() {}
+}
+module example {
+    use 0x42::data::{
+        S as s, // ERROR!
+        FLAG as fLAG, // ERROR!
+        foo as FOO,  // valid
+        foo as bar, // valid
+    };
+}
+}
+```
+
+## Uniqueness
+
+Inside a given scope, all aliases introduced by `use` declarations must be unique.
+
+For a module, this means aliases introduced by `use` cannot overlap
+
+```move=
+address 0x42 {
+module example {
+
+    use std::vector::{empty as foo, length as foo}; // ERROR!
+    //                                        ^^^ duplicate 'foo'
+
+    use std::vector::empty as bar;
+
+    use std::vector::length as bar; // ERROR!
+    //                         ^^^ duplicate 'bar'
+
+}
+}
+```
+
+And, they cannot overlap with any of the module's other members
+
+```move=
+address 0x42 {
+module data {
+    struct S {}
+}
+module example {
+    use 0x42::data::S;
+
+    struct S { value: u64 } // ERROR!
+    //     ^ conflicts with alias 'S' above
+}
+}
+```
+
+Inside of an expression block, they cannot overlap with each other, but they can
+[shadow](#shadowing) other aliases or names from an outer scope
+
+## Shadowing
+
+`use` aliases inside of an expression block can shadow names (module members or aliases) from the
+outer scope. As with shadowing of locals, the shadowing ends at the end of the expression block;
+
+```move=
+address 0x42 {
+module example {
+
+    struct WrappedVector { vec: vector<u64> }
+
+    fun empty(): WrappedVector {
+        WrappedVector { vec: std::vector::empty() }
+    }
+
+    fun example1(): (WrappedVector, WrappedVector) {
+        let vec = {
+            use std::vector::{empty, push_back};
+            // 'empty' now refers to std::vector::empty
+
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 1);
+            push_back(&mut v, 10);
+            v
+        };
+        // 'empty' now refers to Self::empty
+
+        (empty(), WrappedVector { vec })
+    }
+
+    fun example2(): (WrappedVector, WrappedVector) {
+        use std::vector::{empty, push_back};
+        let w: WrappedVector = {
+            use 0x42::example::empty;
+            empty()
+        };
+        push_back(&mut w.vec, 0);
+        push_back(&mut w.vec, 1);
+        push_back(&mut w.vec, 10);
+
+        let vec = empty();
+        push_back(&mut vec, 0);
+        push_back(&mut vec, 1);
+        push_back(&mut vec, 10);
+
+        (w, WrappedVector { vec })
+    }
+}
+}
+```
+
+## Unused Use or Alias
+
+An unused `use` will result in an error
+
+```move=
+address 0x42 {
+module example {
+    use std::vector::{empty, push_back}; // ERROR!
+    //                       ^^^^^^^^^ unused alias 'push_back'
+
+    fun example(): vector<u8> {
+        empty()
+    }
+}
+}
+```
diff --git a/vendors/move/documentation/book/src/variables.md b/vendors/move/documentation/book/src/variables.md
new file mode 100644
index 000000000..e16738adb
--- /dev/null
+++ b/vendors/move/documentation/book/src/variables.md
@@ -0,0 +1,741 @@
+# Local Variables and Scope
+
+Local variables in Move are lexically (statically) scoped. New variables are introduced with the
+keyword `let`, which will shadow any previous local with the same name. Locals are mutable and can
+be updated both directly and via a mutable reference.
+
+## Declaring Local Variables
+
+### `let` bindings
+
+Move programs use `let` to bind variable names to values:
+
+```move
+let x = 1;
+let y = x + x:
+```
+
+`let` can also be used without binding a value to the local.
+
+```move
+let x;
+```
+
+The local can then be assigned a value later.
+
+```move
+let x;
+if (cond) {
+  x = 1
+} else {
+  x = 0
+}
+```
+
+This can be very helpful when trying to extract a value from a loop when a default value cannot be
+provided.
+
+```move
+let x;
+let cond = true;
+let i = 0;
+loop {
+    (x, cond) = foo(i);
+    if (!cond) break;
+    i = i + 1;
+}
+```
+
+### Variables must be assigned before use
+
+Move's type system prevents a local variable from being used before it has been assigned.
+
+```move
+let x;
+x + x // ERROR!
+```
+
+```move
+let x;
+if (cond) x = 0;
+x + x // ERROR!
+```
+
+```move
+let x;
+while (cond) x = 0;
+x + x // ERROR!
+```
+
+### Valid variable names
+
+Variable names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, and digits `0`
+to `9`. Variable names must start with either an underscore `_` or a letter `a` through `z`. They
+_cannot_ start with uppercase letters.
+
+```move
+// all valid
+let x = e;
+let _x = e;
+let _A = e;
+let x0 = e;
+let xA = e;
+let foobar_123 = e;
+
+// all invalid
+let X = e; // ERROR!
+let Foo = e; // ERROR!
+```
+
+### Type annotations
+
+The type of a local variable can almost always be inferred by Move's type system. However, Move
+allows explicit type annotations that can be useful for readability, clarity, or debuggability. The
+syntax for adding a type annotation is:
+
+```move
+let x: T = e; // "Variable x of type T is initialized to expression e"
+```
+
+Some examples of explicit type annotations:
+
+```move
+address 0x42 {
+module example {
+
+    struct S { f: u64, g: u64 }
+
+    fun annotated() {
+        let u: u8 = 0;
+        let b: vector<u8> = b"hello";
+        let a: address = @0x0;
+        let (x, y): (&u64, &mut u64) = (&0, &mut 1);
+        let S { f, g: f2 }: S = S { f: 0, g: 1 };
+    }
+}
+}
+```
+
+Note that the type annotations must always be to the right of the pattern:
+
+```move
+let (x: &u64, y: &mut u64) = (&0, &mut 1); // ERROR! should be let (x, y): ... =
+```
+
+### When annotations are necessary
+
+In some cases, a local type annotation is required if the type system cannot infer the type. This
+commonly occurs when the type argument for a generic type cannot be inferred. For example:
+
+```move
+let _v1 = vector::empty(); // ERROR!
+//        ^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation
+let v2: vector<u64> = vector::empty(); // no error
+```
+
+In a rarer case, the type system might not be able to infer a type for divergent code (where all the
+following code is unreachable). Both `return` and [`abort`](./abort-and-assert.md) are expressions
+and can have any type. A [`loop`](./loops.md) has type `()` if it has a `break`, but if there is no
+break out of the `loop`, it could have any type. If these types cannot be inferred, a type
+annotation is required. For example, this code:
+
+```move
+let a: u8 = return ();
+let b: bool = abort 0;
+let c: signer = loop ();
+
+let x = return (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let y = abort 0; // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let z = loop (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+```
+
+Adding type annotations to this code will expose other errors about dead code or unused local
+variables, but the example is still helpful for understanding this problem.
+
+### Multiple declarations with tuples
+
+`let` can introduce more than one local at a time using tuples. The locals declared inside the
+parenthesis are initialized to the corresponding values from the tuple.
+
+```move
+let () = ();
+let (x0, x1) = (0, 1);
+let (y0, y1, y2) = (0, 1, 2);
+let (z0, z1, z2, z3) = (0, 1, 2, 3);
+```
+
+The type of the expression must match the arity of the tuple pattern exactly.
+
+```move
+let (x, y) = (0, 1, 2); // ERROR!
+let (x, y, z, q) = (0, 1, 2); // ERROR!
+```
+
+You cannot declare more than one local with the same name in a single `let`.
+
+```move
+let (x, x) = 0; // ERROR!
+```
+
+### Multiple declarations with structs
+
+`let` can also introduce more than one local at a time when destructuring (or matching against) a
+struct. In this form, the `let` creates a set of local variables that are initialized to the values
+of the fields from a struct. The syntax looks like this:
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+Here is a more complicated example:
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+    struct Y { x1: X, x2: X }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    fun example() {
+        let Y { x1: X { f }, x2 } = Y { x1: new_x(), x2: new_x() };
+        assert!(f + x2.f == 2, 42);
+
+        let Y { x1: X { f: f1 }, x2: X { f: f2 } } = Y { x1: new_x(), x2: new_x() };
+        assert!(f1 + f2 == 2, 42);
+    }
+}
+}
+```
+
+Fields of structs can serve double duty, identifying the field to bind _and_ the name of the
+variable. This is sometimes referred to as punning.
+
+```move
+let X { f } = e;
+```
+
+is equivalent to:
+
+```move
+let X { f: f } = e;
+```
+
+As shown with tuples, you cannot declare more than one local with the same name in a single `let`.
+
+```move
+let Y { x1: x, x2: x } = e; // ERROR!
+```
+
+### Destructuring against references
+
+In the examples above for structs, the bound value in the let was moved, destroying the struct value
+and binding its fields.
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+In this scenario the struct value `T { f1: 1, f2: 2 }` no longer exists after the `let`.
+
+If you wish instead to not move and destroy the struct value, you can borrow each of its fields. For
+example:
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &t;
+// local1: &u64
+// local2: &u64
+```
+
+And similarly with mutable references:
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &mut t;
+// local1: &mut u64
+// local2: &mut u64
+```
+
+This behavior can also work with nested structs.
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+    struct Y { x1: X, x2: X }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    fun example() {
+        let y = Y { x1: new_x(), x2: new_x() };
+
+        let Y { x1: X { f }, x2 } = &y;
+        assert!(*f + x2.f == 2, 42);
+
+        let Y { x1: X { f: f1 }, x2: X { f: f2 } } = &mut y;
+        *f1 = *f1 + 1;
+        *f2 = *f2 + 1;
+        assert!(*f1 + *f2 == 4, 42);
+    }
+}
+}
+```
+
+### Ignoring Values
+
+In `let` bindings, it is often helpful to ignore some values. Local variables that start with `_`
+will be ignored and not introduce a new variable
+
+```move
+fun three(): (u64, u64, u64) {
+    (0, 1, 2)
+}
+```
+
+```move
+let (x1, _, z1) = three();
+let (x2, _y, z2) = three();
+assert!(x1 + z1 == x2 + z2, 42);
+```
+
+This can be necessary at times as the compiler will error on unused local variables
+
+```move
+let (x1, y, z1) = three(); // ERROR!
+//       ^ unused local 'y'
+```
+
+### General `let` grammar
+
+All of the different structures in `let` can be combined! With that we arrive at this general
+grammar for `let` statements:
+
+> _let-binding_ → **let** _pattern-or-list_ _type-annotation_<sub>_opt_</sub>
+> _initializer_<sub>_opt_</sub> > _pattern-or-list_ → _pattern_ | **(** _pattern-list_ **)** >
+> _pattern-list_ → _pattern_ **,**<sub>_opt_</sub> | _pattern_ **,** _pattern-list_ >
+> _type-annotation_ → **:** _type_ _initializer_ → **=** _expression_
+
+The general term for the item that introduces the bindings is a _pattern_. The pattern serves to
+both destructure data (possibly recursively) and introduce the bindings. The pattern grammar is as
+follows:
+
+> _pattern_ → _local-variable_ | _struct-type_ **{** _field-binding-list_ **}** >
+> _field-binding-list_ → _field-binding_ **,**<sub>_opt_</sub> | _field-binding_ **,**
+> _field-binding-list_ > _field-binding_ → _field_ | _field_ **:** _pattern_
+
+A few concrete examples with this grammar applied:
+
+```move
+    let (x, y): (u64, u64) = (0, 1);
+//       ^                           local-variable
+//       ^                           pattern
+//          ^                        local-variable
+//          ^                        pattern
+//          ^                        pattern-list
+//       ^^^^                        pattern-list
+//      ^^^^^^                       pattern-or-list
+//            ^^^^^^^^^^^^           type-annotation
+//                         ^^^^^^^^  initializer
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding
+
+    let Foo { f, g: x } = Foo { f: 0, g: 1 };
+//      ^^^                                    struct-type
+//            ^                                field
+//            ^                                field-binding
+//               ^                             field
+//                  ^                          local-variable
+//                  ^                          pattern
+//               ^^^^                          field-binding
+//            ^^^^^^^                          field-binding-list
+//      ^^^^^^^^^^^^^^^                        pattern
+//      ^^^^^^^^^^^^^^^                        pattern-or-list
+//                      ^^^^^^^^^^^^^^^^^^^^   initializer
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding
+```
+
+## Mutations
+
+### Assignments
+
+After the local is introduced (either by `let` or as a function parameter), the local can be
+modified via an assignment:
+
+```move
+x = e
+```
+
+Unlike `let` bindings, assignments are expressions. In some languages, assignments return the value
+that was assigned, but in Move, the type of any assignment is always `()`.
+
+```move
+(x = e: ())
+```
+
+Practically, assignments being expressions means that they can be used without adding a new
+expression block with braces (`{`...`}`).
+
+```move
+let x = 0;
+if (cond) x = 1 else x = 2;
+```
+
+The assignment uses the same pattern syntax scheme as `let` bindings:
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    // This example will complain about unused variables and assignments.
+    fun example() {
+       let (x, _, z) = (0, 1, 3);
+       let (x, y, f, g);
+
+       (X { f }, X { f: x }) = (new_x(), new_x());
+       assert!(f + x == 2, 42);
+
+       (x, y, z, f, _, g) = (0, 0, 0, 0, 0, 0);
+    }
+}
+}
+```
+
+Note that a local variable can only have one type, so the type of the local cannot change between
+assignments.
+
+```move
+let x;
+x = 0;
+x = false; // ERROR!
+```
+
+### Mutating through a reference
+
+In addition to directly modifying a local with assignment, a local can be modified via a mutable
+reference `&mut`.
+
+```move
+let x = 0;
+let r = &mut x;
+*r = 1;
+assert!(x == 1, 42);
+```
+
+This is particularly useful if either:
+
+(1) You want to modify different variables depending on some condition.
+
+```move
+let x = 0;
+let y = 1;
+let r = if (cond) &mut x else &mut y;
+*r = *r + 1;
+```
+
+(2) You want another function to modify your local value.
+
+```move
+let x = 0;
+modify_ref(&mut x);
+```
+
+This sort of modification is how you modify structs and vectors!
+
+```move
+let v = vector::empty();
+vector::push_back(&mut v, 100);
+assert!(*vector::borrow(&v, 0) == 100, 42);
+```
+
+For more details, see [Move references](./references.md).
+
+## Scopes
+
+Any local declared with `let` is available for any subsequent expression, _within that scope_.
+Scopes are declared with expression blocks, `{`...`}`.
+
+Locals cannot be used outside of the declared scope.
+
+```move
+let x = 0;
+{
+    let y = 1;
+};
+x + y // ERROR!
+//  ^ unbound local 'y'
+```
+
+But, locals from an outer scope _can_ be used in a nested scope.
+
+```move
+{
+    let x = 0;
+    {
+        let y = x + 1; // valid
+    }
+}
+```
+
+Locals can be mutated in any scope where they are accessible. That mutation survives with the local,
+regardless of the scope that performed the mutation.
+
+```move
+let x = 0;
+x = x + 1;
+assert!(x == 1, 42);
+{
+    x = x + 1;
+    assert!(x == 2, 42);
+};
+assert!(x == 2, 42);
+```
+
+### Expression Blocks
+
+An expression block is a series of statements separated by semicolons (`;`). The resulting value of
+an expression block is the value of the last expression in the block.
+
+```move
+{ let x = 1; let y = 1; x + y }
+```
+
+In this example, the result of the block is `x + y`.
+
+A statement can be either a `let` declaration or an expression. Remember that assignments (`x = e`)
+are expressions of type `()`.
+
+```move
+{ let x; let y = 1; x = 1; x + y }
+```
+
+Function calls are another common expression of type `()`. Function calls that modify data are
+commonly used as statements.
+
+```move
+{ let v = vector::empty(); vector::push_back(&mut v, 1); v }
+```
+
+This is not just limited to `()` types---any expression can be used as a statement in a sequence!
+
+```move
+{
+    let x = 0;
+    x + 1; // value is discarded
+    x + 2; // value is discarded
+    b"hello"; // value is discarded
+}
+```
+
+But! If the expression contains a resource (a value without the `drop` [ability](./abilities.md)),
+you will get an error. This is because Move's type system guarantees that any value that is dropped
+has the `drop` [ability](./abilities.md). (Ownership must be transferred or the value must be
+explicitly destroyed within its declaring module.)
+
+```move
+{
+    let x = 0;
+    Coin { value: x }; // ERROR!
+//  ^^^^^^^^^^^^^^^^^ unused value without the `drop` ability
+    x
+}
+```
+
+If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
+there is an implicit [unit `()` value](https://en.wikipedia.org/wiki/Unit_type). Similarly, if the expression block is empty, there is an
+implicit unit `()` value.
+
+```move
+// Both are equivalent
+{ x = x + 1; 1 / x; }
+{ x = x + 1; 1 / x; () }
+```
+
+```move
+// Both are equivalent
+{ }
+{ () }
+```
+
+An expression block is itself an expression and can be used anyplace an expression is used. (Note:
+The body of a function is also an expression block, but the function body cannot be replaced by
+another expression.)
+
+```move
+let my_vector: vector<vector<u8>> = {
+    let v = vector::empty();
+    vector::push_back(&mut v, b"hello");
+    vector::push_back(&mut v, b"goodbye");
+    v
+};
+```
+
+(The type annotation is not needed in this example and only added for clarity.)
+
+### Shadowing
+
+If a `let` introduces a local variable with a name already in scope, that previous variable can no
+longer be accessed for the rest of this scope. This is called _shadowing_.
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = 1; // x is shadowed
+assert!(x == 1, 42);
+```
+
+When a local is shadowed, it does not need to retain the same type as before.
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = b"hello"; // x is shadowed
+assert!(x == b"hello", 42);
+```
+
+After a local is shadowed, the value stored in the local still exists, but will no longer be
+accessible. This is important to keep in mind with values of types without the
+[`drop` ability](./abilities.md), as ownership of the value must be transferred by the end of the
+function.
+
+```move
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+
+        fun unused_resource(): Coin {
+            let x = Coin { value: 0 }; // ERROR!
+//              ^ This local still contains a value without the `drop` ability
+            x.value = 1;
+            let x = Coin { value: 10 };
+            x
+//          ^ Invalid return
+        }
+    }
+}
+```
+
+When a local is shadowed inside a scope, the shadowing only remains for that scope. The shadowing is
+gone once that scope ends.
+
+```move
+let x = 0;
+{
+    let x = 1;
+    assert!(x == 1, 42);
+};
+assert!(x == 0, 42);
+```
+
+Remember, locals can change type when they are shadowed.
+
+```move
+let x = 0;
+{
+    let x = b"hello";
+    assert!(x = b"hello", 42);
+};
+assert!(x == 0, 42);
+```
+
+## Move and Copy
+
+All local variables in Move can be used in two ways, either by `move` or `copy`. If one or the other
+is not specified, the Move compiler is able to infer whether a `copy` or a `move` should be used.
+This means that in all of the examples above, a `move` or a `copy` would be inserted by the
+compiler. A local variable cannot be used without the use of `move` or `copy`.
+
+`copy` will likely feel the most familiar coming from other programming languages, as it creates a
+new copy of the value inside of the variable to use in that expression. With `copy`, the local
+variable can be used more than once.
+
+```move
+let x = 0;
+let y = copy x + 1;
+let z = copy x + 2;
+```
+
+Any value with the `copy` [ability](./abilities.md) can be copied in this way.
+
+`move` takes the value out of the local variable _without_ copying the data. After a `move` occurs,
+the local variable is unavailable.
+
+```move
+let x = 1;
+let y = move x + 1;
+//      ------ Local was moved here
+let z = move x + 2; // Error!
+//      ^^^^^^ Invalid usage of local 'x'
+y + z
+```
+
+### Safety
+
+Move's type system will prevent a value from being used after it is moved. This is the same safety
+check described in [`let` declaration](#let-bindings) that prevents local variables from being used
+before it is assigned a value.
+
+<!-- For more information, see TODO future section on ownership and move semantics. -->
+
+### Inference
+
+As mentioned above, the Move compiler will infer a `copy` or `move` if one is not indicated. The
+algorithm for doing so is quite simple:
+
+- Any scalar value with the `copy` [ability](./abilities.md) is given a `copy`.
+- Any reference (both mutable `&mut` and immutable `&`) is given a `copy`.
+  - Except under special circumstances where it is made a `move` for predictable borrow checker
+    errors.
+- Any other value is given a `move`.
+  - This means that even though other values might be have the `copy` [ability](./abilities.md), it
+    must be done _explicitly_ by the programmer.
+  - This is to prevent accidental copies of large data structures.
+
+For example:
+
+```move
+let s = b"hello";
+let foo = Foo { f: 0 };
+let coin = Coin { value: 0 };
+
+let s2 = s; // move
+let foo2 = foo; // move
+let coin2 = coin; // move
+
+let x = 0;
+let b = false;
+let addr = @0x42;
+let x_ref = &x;
+let coin_ref = &mut coin2;
+
+let x2 = x; // copy
+let b2 = b; // copy
+let addr2 = @0x42; // copy
+let x_ref2 = x_ref; // copy
+let coin_ref2 = coin_ref; // copy
+```
diff --git a/vendors/move/documentation/book/src/vector.md b/vendors/move/documentation/book/src/vector.md
new file mode 100644
index 000000000..ad18a7e91
--- /dev/null
+++ b/vendors/move/documentation/book/src/vector.md
@@ -0,0 +1,169 @@
+# Vector
+
+`vector<T>` is the only primitive collection type provided by Move. A `vector<T>` is a homogenous
+collection of `T`'s that can grow or shrink by pushing/popping values off the "end".
+
+A `vector<T>` can be instantiated with any type `T`. For example, `vector<u64>`, `vector<address>`,
+`vector<0x42::MyModule::MyResource>`, and `vector<vector<u8>>` are all valid vector types.
+
+## Literals
+
+### General `vector` Literals
+
+Vectors of any type can be created with `vector` literals.
+
+| Syntax                | Type                                                                          | Description                                |
+| --------------------- | ----------------------------------------------------------------------------- | ------------------------------------------ |
+| `vector[]`            | `vector[]: vector<T>` where `T` is any single, non-reference type             | An empty vector                            |
+| `vector[e1, ..., en]` | `vector[e1, ..., en]: vector<T>` where `e_i: T` s.t. `0 < i <= n` and `n > 0` | A vector with `n` elements (of length `n`) |
+
+In these cases, the type of the `vector` is inferred, either from the element type or from the
+vector's usage. If the type cannot be inferred, or simply for added clarity, the type can be
+specified explicitly:
+
+```move
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
+
+#### Example Vector Literals
+
+```move
+(vector[]: vector<bool>);
+(vector[0u8, 1u8, 2u8]: vector<u8>);
+(vector<u128>[]: vector<u128>);
+(vector<address>[@0x42, @0x100]: vector<address>);
+```
+
+### `vector<u8>` literals
+
+A common use-case for vectors in Move is to represent "byte arrays", which are represented with
+`vector<u8>`. These values are often used for cryptographic purposes, such as a public key or a hash
+result. These values are so common that specific syntax is provided to make the values more
+readable, as opposed to having to use `vector[]` where each individual `u8` value is specified in
+numeric form.
+
+There are currently two supported types of `vector<u8>` literals, *byte strings* and *hex strings*.
+
+#### Byte Strings
+
+Byte strings are quoted string literals prefixed by a `b`, e.g. `b"Hello!\n"`.
+
+These are ASCII encoded strings that allow for escape sequences. Currently, the supported escape
+sequences are:
+
+| Escape Sequence | Description                                    |
+| --------------- | ---------------------------------------------- |
+| `\n`            | New line (or Line feed)                        |
+| `\r`            | Carriage return                                |
+| `\t`            | Tab                                            |
+| `\\`            | Backslash                                      |
+| `\0`            | Null                                           |
+| `\"`            | Quote                                          |
+| `\xHH`          | Hex escape, inserts the hex byte sequence `HH` |
+
+#### Hex Strings
+
+Hex strings are quoted string literals prefixed by a `x`, e.g. `x"48656C6C6F210A"`.
+
+Each byte pair, ranging from `00` to `FF`, is interpreted as hex encoded `u8` value. So each byte
+pair corresponds to a single entry in the resulting `vector<u8>`.
+
+#### Example String Literals
+
+```move
+script {
+fun byte_and_hex_strings() {
+    assert!(b"" == x"", 0);
+    assert!(b"Hello!\n" == x"48656C6C6F210A", 1);
+    assert!(b"\x48\x65\x6C\x6C\x6F\x21\x0A" == x"48656C6C6F210A", 2);
+    assert!(
+        b"\"Hello\tworld!\"\n \r \\Null=\0" ==
+            x"2248656C6C6F09776F726C6421220A200D205C4E756C6C3D00",
+        3
+    );
+}
+}
+```
+
+## Operations
+
+`vector` supports the following operations via the `std::vector` module in the Move standard
+library:
+
+| Function                                                   | Description                                                                                                                                                     | Aborts?                        |
+| ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
+| `vector::empty<T>(): vector<T>`                            | Create an empty vector that can store values of type `T`                                                                                                        | Never                          |
+| `vector::singleton<T>(t: T): vector<T>`                    | Create a vector of size 1 containing `t`                                                                                                                        | Never                          |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | Add `t` to the end of `v`                                                                                                                                       | Never                          |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | Remove and return the last element in `v`                                                                                                                       | If `v` is empty                |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | Return an immutable reference to the `T` at index `i`                                                                                                           | If `i` is not in bounds        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | Return a mutable reference to the `T` at index `i`                                                                                                              | If `i` is not in bounds        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | Delete `v`                                                                                                                                                      | If `v` is not empty            |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | Add the elements in `v2` to the end of `v1`                                                                                                                     | Never                          |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | Return true if `e` is in the vector `v`. Otherwise, returns false                                                                                                | Never                          |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | Swaps the elements at the `i`th and `j`th indices in the vector `v`                                                                                             | If `i` or `j` is out of bounds |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | Reverses the order of the elements in the vector `v` in place                                                                                                   | Never                          |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | Return `(true, i)` if `e` is in the vector `v` at index `i`. Otherwise, returns `(false, 0)`                                                                    | Never                          |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | Remove the `i`th element of the vector `v`, shifting all subsequent elements. This is O(n) and preserves ordering of elements in the vector                     | If `i` is out of bounds        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | Swap the `i`th element of the vector `v` with the last element and then pop the element, This is O(1), but does not preserve ordering of elements in the vector  | If `i` is out of bounds        |
+
+More operations may be added over time.
+
+## Example
+
+```move
+use std::vector;
+
+let v = vector::empty<u64>();
+vector::push_back(&mut v, 5);
+vector::push_back(&mut v, 6);
+
+assert!(*vector::borrow(&v, 0) == 5, 42);
+assert!(*vector::borrow(&v, 1) == 6, 42);
+assert!(vector::pop_back(&mut v) == 6, 42);
+assert!(vector::pop_back(&mut v) == 5, 42);
+```
+
+## Destroying and copying `vector`s
+
+Some behaviors of `vector<T>` depend on the abilities of the element type, `T`. For example, vectors
+containing elements that do not have `drop` cannot be implicitly discarded like `v` in the example
+above--they must be explicitly destroyed with `vector::destroy_empty`.
+
+Note that `vector::destroy_empty` will abort at runtime unless `vec` contains zero elements:
+
+```move
+fun destroy_any_vector<T>(vec: vector<T>) {
+    vector::destroy_empty(vec) // deleting this line will cause a compiler error
+}
+```
+
+But no error would occur for dropping a vector that contains elements with `drop`:
+
+```move
+fun destroy_droppable_vector<T: drop>(vec: vector<T>) {
+    // valid!
+    // nothing needs to be done explicitly to destroy the vector
+}
+```
+
+Similarly, vectors cannot be copied unless the element type has `copy`. In other words, a
+`vector<T>` has `copy` if and only if `T` has `copy`. However, even copyable vectors are never
+implicitly copied:
+
+```move
+let x = vector::singleton<u64>(10);
+let y = copy x; // compiler error without the copy!
+```
+
+Copies of large vectors can be expensive, so the compiler requires explicit `copy`'s to make it
+easier to see where they are happening.
+
+For more details see the sections on [type abilities](./abilities.md) and [generics](./generics.md).
+
+## Ownership
+
+As mentioned [above](#destroying-and-copying-vectors), `vector` values can be copied only if the
+elements can be copied. In that case, the copy must be explicit via a
+[`copy`](./variables.md#move-and-copy) or a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/vendors/move/documentation/book/translations/move-book-zh/.gitignore b/vendors/move/documentation/book/translations/move-book-zh/.gitignore
new file mode 100644
index 000000000..7585238ef
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/.gitignore
@@ -0,0 +1 @@
+book
diff --git a/vendors/move/documentation/book/translations/move-book-zh/CONTRIBUTING.md b/vendors/move/documentation/book/translations/move-book-zh/CONTRIBUTING.md
new file mode 100644
index 000000000..8d7724ea5
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/CONTRIBUTING.md
@@ -0,0 +1,74 @@
+# Contributing to Move Book Chinese Version
+
+感谢您有兴趣为**《Move Book 中文版》**做出贡献！有很多方法可以做出贡献，我们感谢所有这些方式。
+
+本翻译项目由 [*Move 中文社区（MoveCC）*](https://github.com/move-cc)[发起](https://github.com/move-language/move/issues/353)，并与 [MoveDAO 社区](https://github.com/move-dao)共同初步完善。
+
+目前工作仍在进行中！
+
+欢迎所有对 Move 感兴趣的朋友一起加入到《Move Book 中文版》的翻译工作中。
+
+## 提交 PR 的 Commits 格式
+
+```text
+[move-book-zh] 关于这个 PR 的描述信息
+```
+
+## 文档规范
+
+请参考：[中文技术文档的写作规范](https://github.com/ruanyf/document-style-guide)
+
+### 断句
+
+本书使用 Markdown 作为源文件，使用 [mdBook](https://github.com/rust-lang/mdBook) 作为渲染引擎。
+
+由于中英文有所区别，换行后渲染引擎会自动追加一个空格。为了优化视觉体验，中文一个段落内不必换行，保持中文的段内容为一个物理行。
+
+英文是由空格分隔的文本，所以不存在上述问题。
+
+### 中英文混排规范
+
+文中出现中英文混排时，中文与英文之间需要添加一个空格。如果英文单词结尾，此时单词与标点符号之间不添加空格。
+
+### 数字规范
+
+数字之间需要添加一个空格，如果数字带有英文单位，那么数字与英文单位之间不能添加空格。如果数字后带有中文单位，需要添加一个空格。
+
+```text
+正确：如果一个 1s 的帧被划分为 10 个时隙，每个时隙为 100ms。
+
+错误：如果一个1s的帧被划分为10个时隙，每个时隙为100ms。
+
+错误：如果一个 1 s 的帧被划分为10个时隙，每个时隙为 100 ms。
+```
+
+### 逗号问题
+
+英文中，没有顿号这种标点符号，逗号常用分隔并列的句子成分或结构。
+
+英文中，像 `and` 并列词的前面通常会有一个 `,`，但在中文里表示对象之间的并列关系时，`和`的前面不能带逗号。
+
+```text
+War, famine, and flood are terrible.
+战争, 饥荒和洪水都是很可怕的。
+```
+
+### 冒号和逗号的使用场景规范
+
+冒号通常用在“问、答、说、指出、宣布、证明、表明、例如”一类动词后面，表示提起下文。
+如果在较短的提示句子中，需要将 `：` 改为 `，`；如果提示内容比较多，则使用 `：` 来提起下文：
+
+示例1，提起的内容短少：
+
+```text
+十六进制字符串是以 x 为前缀的带引号的字符串文字，例如x'48656C6C6F210A'
+```
+
+示例2，提起的内容多：
+
+```text
+在这些情况下，vector 的类型是从元素类型或从动态数组的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/README.md b/vendors/move/documentation/book/translations/move-book-zh/README.md
new file mode 100644
index 000000000..9de276331
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/README.md
@@ -0,0 +1,73 @@
+## 参与贡献的重要提示
+
+《Move Book 中文版》翻译工作还在持续进行中，如果你愿意贡献你的一份力量，欢迎提交 pr 或 issue。
+
+为了方便翻译工作的进行，在提交 pr 时请不要删除英文原文的内容！
+
+在贡献之前请阅读[官方的贡献指南](https://github.com/move-language/move/blob/main/CONTRIBUTING.md)和[《Move Book 中文版》的贡献指南](./CONTRIBUTING.md)。
+
+# Move Book 中文版
+
+区块链技术的发展经历了两个阶段，比特币（BTC）开启了*区块链1.0时代*，以太坊（ETH）开启了*区块链2.0时代*。
+以太坊的出现为区块链带来了*智能合约*这一关键技术，让区块链不只停留在记账这一单的目的，而是带来更多的应用拓展性。
+遗憾的是，智能合约如同一把双刃剑，在带来众多丰富功能拓展的同时，也容易让智能合约开发者无意间引入不安全的代码，让链的资产受到威胁。
+
+编写简单、安全、易部署的智能合约应该是*区块链3.0时代*应该关注的重点，**面向资源编程**的 [Move 语言](https://github.com/move-language/move)，无疑给这个问题提供了一个很好的解决方案。
+
+本书是 [Move Book](https://move-language.github.io/move/) 的中文版。
+
+## 快速开始
+
+本书使用 [mdBook](https://rust-lang.github.io/mdBook/) 构建。
+
+1. 使用 Cargo 安装 mdBook：
+
+```shell
+cargo install mdbook
+```
+
+2. 下载
+
+```shell
+git clone https://github.com/move-language/move.git
+```
+
+3. 构建并预览
+
+```shell
+cd language/documentation/book/translations/move-book-zh
+mdbook serve --open
+```
+
+## Contributors ✨
+
+[各章节译者](Translators.md)
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/Kusou1"><img src="https://avatars.githubusercontent.com/u/57334674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zhang</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Code">💻</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Documentation">📖</a> <a href="#translation-Kusou1" title="Translation">🌍</a> <a href="#infra-Kusou1" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/ruy1su"><img src="https://avatars.githubusercontent.com/u/9391802?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ruyisu</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Code">💻</a> <a href="#translation-ruy1su" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Aruy1su" title="Reviewed Pull Requests">🚇</a></td>
+    <td align="center"><a href="https://github.com/lshoo"><img src="https://avatars.githubusercontent.com/u/670440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lshoo</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Code">💻</a> <a href="#translation-lshoo" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Documentation">📖</a> <a href="#ideas-lshoo" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Alshoo" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/Container-00"><img src="https://avatars.githubusercontent.com/u/61052480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Container</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Code">💻</a> <a href="#translation-Container-00" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3AContainer-00" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/nosalt99"><img src="https://avatars.githubusercontent.com/u/22558493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nosalt</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Code">💻</a> <a href="#translation-nosalt99" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Documentation">📖</a> <a href="#infra-nosalt99" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/geometryolife"><img src="https://avatars.githubusercontent.com/u/54882546?v=4?s=100" width="100px;" alt=""/><br /><sub><b>geometryolife</b></sub></a><br /><a href="https://github.com/move-language/move/commits?author=geometryolife" title="Code">💻</a> <a href="#translation-geometryolife" title="Translation">🌍</a> <a href="#talk-geometryolife" title="Talks">📢</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/666thi"><img src="https://avatars.githubusercontent.com/u/109965699?v=4?s=100" width="100px;" alt=""/><br /><sub><b>666thi</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=666thi" title="Code">💻</a> <a href="#translation-666thi" title="Translation">🌍</a> <a href="#talk-666thi" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/MagicGordon"><img src="https://avatars.githubusercontent.com/u/19465870?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MagicGordon</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=MagicGordon" title="Code">💻</a> <a href="#translation-MagicGordon" title="Translation">🌍</a> <a href="#talk-MagicGordon" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xixifusi1984"><img src="https://avatars.githubusercontent.com/u/39210551?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xixifusi1984</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xixifusi1984" title="Code">💻</a> <a href="#translation-xixifusi1984" title="Translation">🌍</a> <a href="#talk-xixifusi1984" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/yvvw"><img src="https://avatars.githubusercontent.com/u/15168529?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yvvw</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=yvvw" title="Code">💻</a> <a href="#translation-yvvw" title="Translation">🌍</a> <a href="#talk-yvvw" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xiaochuan891102"><img src="https://avatars.githubusercontent.com/u/109952533?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xiaochuan891102</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xiaochuan891102" title="Code">💻</a> <a href="#translation-xiaochuan891102" title="Translation">🌍</a> <a href="#talk-xiaochuan891102" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/stephenLee"><img src="https://avatars.githubusercontent.com/u/1144508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stephenLee</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=stephenLee" title="Code">💻</a> <a href="#translation-stephenLee" title="Translation">🌍</a> <a href="#talk-stephenLee" title="Talks">📢</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
diff --git a/vendors/move/documentation/book/translations/move-book-zh/Translators.md b/vendors/move/documentation/book/translations/move-book-zh/Translators.md
new file mode 100644
index 000000000..35bce4ce5
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/Translators.md
@@ -0,0 +1,30 @@
+|    | 章节                       | 译者                                           | 校对                                                                                |
+|----|----------------------------|------------------------------------------------|-------------------------------------------------------------------------------------|
+| 0  | Intoduction                | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 1  | Modules and Scripts        | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 2  | Move Tutorial              | loadi、[@leego](https://github.com/leego)      | [@Joe Chen](https://github.com/geometryolife)                                       |
+| 3  | Integers                   | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 4  | Bool                       | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 5  | Address                    | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 6  | Vector                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 7  | Signer                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 8  | References                 | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 9  | Tuples and Unit            | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 10 | Local Variables and Scopes | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 11 | Equality                   | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 12 | Abort and Assert           | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 13 | Conditionals               | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 14 | While and Loop             | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 15 | Functions                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 16 | Structs and Resource       | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 17 | Constants                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 18 | Generics                   | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 19 | Type Abilities             | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 20 | Uses and Aliases           | 小川                                           | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 21 | Friends                    | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 22 | Packages                   | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 23 | Unit Test                  | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 24 | Global Storage Structure   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 25 | Global Storage Operators   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 26 | Standard Library           | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 27 | Coding Conventions         | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
diff --git a/vendors/move/documentation/book/translations/move-book-zh/book.toml b/vendors/move/documentation/book/translations/move-book-zh/book.toml
new file mode 100644
index 000000000..1f51aef58
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/book.toml
@@ -0,0 +1,7 @@
+[book]
+authors = ["The Move Contributors"]
+description = "Move book maintained by the Move Chinese contributors."
+language = "zh"
+multilingual = false
+src = "src"
+title = "Move Book 中文版"
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/SUMMARY.md b/vendors/move/documentation/book/translations/move-book-zh/src/SUMMARY.md
new file mode 100644
index 000000000..4227e3fcb
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/SUMMARY.md
@@ -0,0 +1,44 @@
+# The Move Programming Language
+
+[引言（Introduction）](introduction.md)
+
+## Getting Started
+
+- [模块和脚本（Modules and Scripts）](modules-and-scripts.md)
+
+## Primitive Types
+
+- [整数（Integers）](integers.md)
+- [布尔类型（Bool）](bool.md)
+- [地址（Address）](address.md)
+- [向量（Vector）](vector.md)
+- [签名（Signer）](signer.md)
+- [引用（References）](references.md)
+- [元组和单值（Tuples and Unit）](tuples.md)
+
+## Basic Concepts
+
+- [局部变量和作用域（Local Variables and Scopes）](variables.md)
+- [等式（Equality）](equality.md)
+- [中止和断言（Abort and Assert）](abort-and-assert.md)
+- [条件语句（Conditionals）](conditionals.md)
+- [循环（While and Loop）](loops.md)
+- [函数（Functions）](functions.md)
+- [结构体和资源（Structs and Resources）](structs-and-resources.md)
+- [常量（Constants）](constants.md)
+- [泛型（Generics）](generics.md)
+- [类型能力（Type Abilities）](abilities.md)
+- [导入和别名（Uses and Aliases）](uses.md)
+- [友元函数（Friends）](friends.md)
+- [程序包（Packages）](packages.md)
+- [单元测试（Unit Tests）](unit-testing.md)
+
+## Global Storage
+
+- [全局存储结构（Global Storage Structure）](global-storage-structure.md)
+- [全局存储操作（Global Storage Operators）](global-storage-operators.md)
+
+## Reference
+
+- [标准库（Standard Library）](standard-library.md)
+- [Move 编码约定（Coding Conventions）](coding-conventions.md)
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/abilities.md b/vendors/move/documentation/book/translations/move-book-zh/src/abilities.md
new file mode 100644
index 000000000..440362288
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/abilities.md
@@ -0,0 +1,321 @@
+# 能力 (abilities)
+
+Abilities are a typing feature in Move that control what actions are permissible for values of a given type. This system grants fine grained control over the "linear" typing behavior of values, as well as if and how values are used in global storage. This is implemented by gating access to certain bytecode instructions so that for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+能力是 Move 语言中的一种类型特性，用于控制对给定类型的值允许哪些操作。 该系统对值的“线性”类型行为以及值如何在全局存储中使用提供细粒度控制。这是通过对某些字节码指令的进行访问控制来实现的，因此对于要与字节码指令一起使用的值，它必须具有所需的能力(如果需要的话，并非每条指令都由能力控制)
+
+## 四种能力 (The Four Abilities)
+
+The four abilities are:
+
+* [`copy`](#copy)
+    * Allows values of types with this ability to be copied.
+* [`drop`](#drop)
+    * Allows values of types with this ability to be popped/dropped.
+* [`store`](#store)
+    * Allows values of types with this ability to exist inside a struct in global storage.
+* [`key`](#key)
+    * Allows the type to serve as a key for global storage operations.
+
+这四种能力分别是：
+
+* [`copy`](#copy) 复制
+  * 允许此类型的值被复制
+
+* [`drop`](#drop) 丢弃
+  * 允许此类型的值被弹出/丢弃
+
+* [`store`](#store) 存储
+  * 允许此类型的值存在于全局存储的某个结构体中
+
+* [`key`](#key) 键值
+  * 允许此类型作为全局存储中的键(具有 `key` 能力的类型才能保存到全局存储中)
+
+
+### `copy`
+
+The `copy` ability allows values of types with that ability to be copied. It gates the ability to copy values out of local variables with the [`copy`](./variables.md#move-and-copy) operator and to copy values via references with [dereference `*e`](./references.md#reading-and-writing-through-references).
+
+If a value has `copy`, all values contained inside of that value have `copy`.
+
+`copy` 能力允许具有此能力的类型的值被复制。 它限制了从本地变量通过 [`copy`](./variables.md#.move-and-copy)能力复制值以及通过 [`dereference *e`](./references.html#reading-and-writing-through-references)复制值这两种情况之外的复制操作。
+
+如果一个值具有 `copy` 能力，那么这个值内部的所有值都有 `copy` 能力。
+
+### `drop`
+
+The `drop` ability allows values of types with that ability to be dropped. By dropped, we mean that value is not transferred and is effectively destroyed as the Move program executes. As such, this ability gates the ability to ignore values in a multitude of locations, including:
+* not using the value in a local variable or parameter
+* not using the value in a [sequence via `;`](./variables.md#expression-blocks)
+* overwriting values in variables in [assignments](./variables.md#assignments)
+* overwriting values via references when [writing `*e1 = e2`](./references.md#reading-and-writing-through-references).
+
+If a value has `drop`, all values contained inside of that value have `drop`.
+
+`drop` 能力允许类型的值被丢弃。丢弃的意思程序执行后值会被有效的销毁而不必被转移。因此，这个能力限制在多个位置忽略使用值的可能性，包括：
+* 未被使用的局部变量或者参数
+* 未被使用的 [`sequence` via `;`](./variables.md#expression-blocks)中的值
+* 覆盖[赋值(assignments)](./variables.html#assignments)变量中的值
+* [写入(writing) `*e1 = e2`](https://move-language.github.io/move/references.html#reading-and-writing-through-references) 时通过引用覆盖的值。
+
+如果一个值具有 `drop` 能力，那么这个值内部的所有值都有 `drop` 能力。
+
+### `store`
+
+The `store` ability allows values of types with this ability to exist inside of a struct (resource) in global storage, *but* not necessarily as a top-level resource in global storage. This is the only ability that does not directly gate an operation. Instead it gates the existence in global storage when used in tandem with `key`.
+
+If a value has `store`, all values contained inside of that value have `store`
+
+`store` 能力允许具有这种能力的类型的值位于[全局存储](./global-storage-operators.html)中的结构体(资源)内, *但不一定是* 全局存储中的顶级资源。这是唯一不直接限制操作的能力。相反，当(`store`)与 `key` 一起使用时，它对全局存储中的可行性进行把关。。
+
+如果一个值具有 `store` 能力，那么这个值内部的所有值都有 `store` 能力。
+
+### `key`
+
+The `key` ability allows the type to serve as a key for [global storage operations](./global-storage-operators.md). It gates all global storage operations, so in order for a type to be used with `move_to`, `borrow_global`, `move_from`, etc., the type must have the `key` ability. Note that the operations still must be used in the module where the `key` type is defined (in a sense, the operations are private to the defining module).
+
+If a value has `key`, all values contained inside of that value have `store`. This is the only ability with this sort of asymmetry.
+
+`key` 能力允许此类型作为[全局存储](./global-storage-operators.html)中的键。它会限制所有[全局存储](./global-storage-operators.html)中的操作，因此一个类型如果与 `move_to`, `borrow_global`, `move_from` 等一起使用，那么这个类型必须具备 `key` 能力。请注意，这些操作仍然必须在定义 `key` 类型的模块中使用(从某种意义上说，这些操作是此模块的私有操作)。
+
+如果有一个值有 `key` 能力，那么这个值包含的所有字段值也都具有 `store` 能力，`key` 能力是唯一一个具有非对称的能力。
+
+## Builtin Types (内置类型)
+
+
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `store`
+
+* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities and Generic Types](#conditional-abilities-and-generic-types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+None of the primitive types have `key`, meaning none of them can be used directly with the [global storage operations](./global-storage-operators.md).
+
+几乎所有内置的基本类型具都有 `copy`，`drop`，以及 `store` 能力，`singer` 除外，它只有 `drop` 能力(原文是 `store` 有误，译者注)
+
+* `bool`, `u8`, `u64`, `u128`, `address` 都具有 `copy`, `drop`, 以及 `store` 能力。
+* `signer` 具有 `drop` 能力。 不能被复制以及不能被存放在全局存储中
+* `vector<T>` 可能具有 `copy`，`drop`，以及`store` 能力，这依赖于 `T` 具有的能力。 查看 [条件能力与泛型类型](#conditional-abilities-and-generic-types)获取详情
+* 不可变引用 `&` 和可变引用 `&mut` 都具有 `copy` 和 `drop` 能力。
+    * 这是指复制和删除引用本身，而不是它们所引用的内容。
+    * 引用不能出现在全局存储中，因此它们没有 `store` 能力。
+
+所有基本类型都没有 `key`，这意味着它们都不能直接用于[全局存储操作](./global-storage-operators.html)。
+
+## Annotating Structs (标注结构体)
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+要声明一个 `struct` 具有某个能力，它在结构体名称之后, 在字段之前用 `has <ability>` 声明。例如：
+
+```move
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case: `Ignorable` has the `drop` ability. `Pair` has `copy`, `drop`, and `store`.
+
+在这个例子中：`Ignorable` 具有 `drop` 能力。 `Pair` 具有 `copy`、`drop` 和 `store` 能力。
+
+All of these abilities have strong guarantees over these gated operations. The operation can be performed on the value only if it has that ability; even if the value is deeply nested inside of some other collection!
+
+所有这些能力对这些访问操作都有强有力的保证。只有具有该能力，才能对值执行对应的操作；即使该值深层嵌套在其他集合中！
+
+As such: when declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for the abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`.
+* `drop`, all fields must have `drop`.
+* `store`, all fields must have `store`.
+* `key`, all fields must have `store`.
+    * `key` is the only ability currently that doesn’t require itself.
+
+因此：在声明结构体的能力时，对字段提出了某些要求。所有字段都必须满足这些约束。这些规则是必要的，以便结构体满足上述功能的可达性规则。如果一个结构被声明为具有某能力：
+
+* `copy`， 所有的字段必须具有 `copy` 能力。
+* `drop`，所有的字段必须具有 `drop` 能力。
+* `store`，所有的字段必须具有 `store` 能力。
+* `key`，所有的字段必须具有 `store` 能力。`key` 是目前唯一不需要包含自身的能力。
+
+例如:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+类似的：
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+## Conditional Abilities and Generic Types (条件能力与泛型类型)
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+在泛型类型上标注能力时，并非该类型的所有实例都保证具有该能力。考虑这个结构体声明：
+
+```move
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+
+It might be very helpful if `Cup` could hold any type, regardless of its abilities. The type system can *see* the type parameter, so it should be able to remove abilities from `Cup` if it *sees* a type parameter that would violate the guarantees for that ability.
+
+This behavior might sound a bit confusing at first, but it might be more understandable if we think about collection types. We could consider the builtin type `vector` to have the following type declaration:
+
+如果 `Cup` 可以容纳任何类型，可能会很有帮助，不管它的能力如何。类型系统可以 *看到* 类型参数，因此，如果它 *发现* 一个类型参数违反了对该能力的保证，它应该能够从 `Cup` 中删除能力。
+
+这种行为一开始可能听起来有点令人困惑，但如果我们考虑一下集合类型，它可能会更容易理解。我们可以认为内置类型 `Vector` 具有以下类型声明：
+
+```move
+vector<T> has copy, drop, store;
+```
+
+We want `vector`s to work with any type. We don't want separate `vector` types for different abilities. So what are the rules we would want? Precisely the same that we would want with the field rules above.  So, it would be safe to copy a `vector` value only if the inner elements can be copied. It would be safe to ignore a `vector` value only if the inner elements can be ignored/dropped. And, it would be safe to put a `vector` in global storage only if the inner elements can be in global storage.
+
+To have this extra expressiveness, a type might not have all the abilities it was declared with depending on the instantiation of that type; instead, the abilities a type will have depends on both its declaration **and** its type arguments. For any type, type parameters are pessimistically assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. Taking `Cup` from above as an example:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+我们希望 `vector` 适用于任何类型。我们不希望针对不同的能力使用不同的 `vector` 类型。那么我们想要的规则是什么？与上面的字段规则完全相同。因此，仅当可以复制内部元素时，复制`vector` 值才是安全的。仅当可以忽略/丢弃内部元素时，忽略 `vector` 值才是安全的。而且，仅当内部元素可以在全局存储中时，将向量放入全局存储中才是安全的。
+
+为了具有这种额外的表现力，一个类型可能不具备它声明的所有能力，具体取决于该类型的实例化；相反，一个类型的能力取决于它的声明 **和** 它的类型参数。对于任何类型，类型参数都被悲观地假定为在结构体内部使用，因此只有在类型参数满足上述字段要求时才授予这些能力。以上面的 `Cup` 为例：
+
+* `Cup` 拥有 `copy` 能力 仅当 `T` 拥有 `copy` 能力时。
+* `Cup` 拥有 `drop` 能力 仅当 `T` 拥有 `drop` 能力时。
+* `Cup` 拥有 `store` 能力 仅当 `T` 拥有 `store` 能力时。
+* `Cup` 拥有 `key` 能力 仅当 `T` 拥有 `store` 能力时。
+
+Here are examples for this conditional system for each ability:
+
+以下是每个能力的条件系统的示例：
+
+### Example: conditional `copy`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'copy' because 'S' has 'copy'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'copy'
+    // because 'NoAbilities' does not have 'copy'
+    let c_n2 = copy c_n;
+}
+```
+
+### Example: conditional `drop`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+}
+```
+
+### Example: conditional `store`
+
+```move
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+### Example: conditional `key`
+
+```move
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/abort-and-assert.md b/vendors/move/documentation/book/translations/move-book-zh/src/abort-and-assert.md
new file mode 100644
index 000000000..314940ee1
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/abort-and-assert.md
@@ -0,0 +1,255 @@
+# 中止和断言 (Abort and Assert)
+
+[`return`](./functions.md) and `abort` are two control flow constructs that end execution, one for
+the current function and one for the entire transaction.
+
+More information on [`return` can be found in the linked section](./functions.md)
+
+[`return`](./functions.md) 和 `abort` 是两种结束程序执行的控制流结构。前者针对当前函数，后者针对整个事务。
+
+ [`return`](./functions.md)的更多信息可以参考链接中的文章。
+
+## `abort` 中止
+
+`abort` is an expression that takes one argument: an **abort code** of type `u64`. For example:
+
+`abort` 表达式只接受一个参数: 类型为 `u64` 的**中止代码**。例如：
+
+```move
+abort 42
+```
+
+The `abort` expression halts execution the current function and reverts all changes made to global
+state by the current transaction. There is no mechanism for "catching" or otherwise handling an `abort`.
+
+`abort` 表达式会中止执行当前函数并恢复当前事务对全局状态所做的所有更改。Move语言没有“捉捕”或者额外处理`abort`的机制。
+
+Luckily, in Move transactions are all or nothing, meaning any changes to global storage are made all
+at once only if the transaction succeeds. Because of this transactional commitment of changes, after
+an abort there is no need to worry about backing out changes. While this approach is lacking in
+flexibility, it is incredibly simple and predictable.
+
+幸运的是，在Move里事务的计算要么完全执行要么完全不执行。这意味着只有在事务成功时，任何对全局存储状态的改变才会被一并执行。
+由于这种对于所有更改的事务承诺，在 `abort` 之后我们不需要担心去回滚任何更改。尽管这种方法缺少灵活性，它还是非常简单和可预测的。
+
+
+Similar to [`return`](./functions.md), `abort` is useful for exiting control flow when some condition cannot be met.
+
+In this example, the function will pop two items off of the vector, but will abort early if the vector does not have two items
+
+与 [`return`](./functions.md)相似, 在一些条件无法被满足的时候，`abort` 可以被用于退出控制流(control flow)。
+
+在以下示例中，目标函数会从vector里弹出两个元素，但是如果vector中并没有两个元素，函数会提前中止。
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    if (vector::length(v) < 2) abort 42;
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+This is even more useful deep inside a control-flow construct. For example, this function checks
+that all numbers in the vector are less than the specified `bound`. And aborts otherwise
+
+这在控制流结构的深处甚至会更有用。例如，此函数检查vector中是否所有数字都小于指定的边界(`bound`)。否则函数中止：
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        if (cur > bound) abort 42;
+        i = i + 1;
+    }
+}
+```
+
+### `assert` 断言
+
+`assert` is a builtin, macro-like operation provided by the Move compiler. It takes two arguments, a condition of type `bool` and a code of type `u64`
+
+`assert` 是 Move 编译器提供的内置的类宏(macro-like)操作。它需要两个参数：一个 `bool` 类型的条件和一个 `u64` 类型的错误状态码(类似HTTP中的StatusCode: 404, 500等，译者注)
+
+```move
+assert!(condition: bool, code: u64)
+```
+
+Since the operation is a macro, it must be invoked with the `!`. This is to convey that the
+arguments to `assert` are call-by-expression. In other words, `assert` is not a normal function and
+does not exist at the bytecode level. It is replaced inside the compiler with
+
+由于该操作是一个宏，因此必须使用 `!` 调用它。这是为了表达 `assert` 的参数属于表达式调用(call-by-expression)。换句话说，`assert` 不是一个正常的函数，并且在字节码(bytecode)级别不存在。它在编译器内部被替换为以下代码：
+
+```move
+if (condition) () else abort code
+```
+
+`assert` is more commonly used than just `abort` by itself. The `abort` examples above can be rewritten using `assert`
+
+`assert` 比 `abort` 本身更常用。上面的 `abort` 示例可以使用 `assert` 重写
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    assert!(vector::length(v) >= 2, 42); // 现在使用'assert'
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+和
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        assert!(cur <= bound, 42); // 现在使用 'assert'
+        i = i + 1;
+    }
+}
+```
+
+Note that because the operation is replaced with this `if-else`, the argument for the `code` is not
+always evaluated. For example:
+
+请注意，因为此操作被替换为 `if-else`，这段 `代码` 的参数不是总是被执行(evaluated)。例如：
+
+```move
+assert!(true, 1 / 0)
+```
+
+Will not result in an arithmetic error, it is equivalent to
+
+不会导致算术错误，因为它相当于：
+
+```move
+if (true) () else (1 / 0)
+```
+
+So the arithmetic expression is never evaluated!
+
+所以这个算术表达式永远不会被执行(evaluated)！
+
+### Abort codes in the Move VM (Move虚拟机中的中止代码)
+
+When using `abort`, it is important to understand how the `u64` code will be used by the VM.
+
+Normally, after successful execution, the Move VM produces a change-set for the changes made to
+global storage (added/removed resources, updates to existing resources, etc).
+
+当使用 `abort` 时，理解虚拟机将如何使用 `u64` 代码是非常重要的。
+
+通常，在成功执行后，Move 虚拟机会为对全局存储(添加/删除资源、更新现有资源等)所做的更改生成一个更改集。
+
+If an `abort` is reached, the VM will instead indicate an error. Included in that error will be two
+pieces of information:
+
+- The module that produced the abort (address and name)
+- The abort code.
+
+For example
+
+如果执行到 `abort` 代码，虚拟机将指示错误。该错误中包含两块信息：
+
+- 发生中止的模块(地址和名称)
+- 错误状态码。
+
+例如
+
+```move=
+address 0x2 {
+    module example {
+        public fun aborts() {
+            abort 42
+        }
+    }
+}
+
+script {
+    fun always_aborts() {
+        0x2::example::aborts()
+    }
+}
+```
+
+If a transaction, such as the script `always_aborts` above, calls `0x2::example::aborts`, the VM
+would produce an error that indicated the module `0x2::example` and the code `42`.
+
+This can be useful for having multiple aborts being grouped together inside a module.
+
+In this example, the module has two separate error codes used in multiple functions
+
+如果一个事务，例如上面的脚本 `always_aborts` 调用了 `0x2::example::aborts`，虚拟机将产生一个指示模块 `0x2::example` 和错误状态码 `42` 的错误。
+
+这在一个模块内将多个中止功能组合起来会很有用。
+
+在以下示例中，模块有两个单独的错误状态码，用于多个函数
+
+```move=
+address 0x42 {
+    module example {
+
+        use std::vector;
+
+        const EMPTY_VECTOR: u64 = 0;
+        const INDEX_OUT_OF_BOUNDS: u64 = 1;
+
+        // 移动 i 到 j, 移动 j 到 k, 移动 k 到 i
+        public fun rotate_three<T>(v: &mut vector<T>, i: u64, j: u64, k: u64) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(k < n, INDEX_OUT_OF_BOUNDS);
+
+            vector::swap(v, i, k);
+            vector::swap(v, j, k);
+        }
+
+        public fun remove_twice<T>(v: &mut vector<T>, i: u64, j: u64): (T, T) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(i > j, INDEX_OUT_OF_BOUNDS);
+
+            (vector::remove<T>(v, i), vector::remove<T>(v, j))
+        }
+    }
+}
+```
+
+## The type of `abort` (`abort` 的类型)
+
+The `abort i` expression can have any type! This is because both constructs break from the normal
+control flow, so they never need to evaluate to the value of that type.
+
+The following are not useful, but they will type check
+
+`abort i` 表达式可以有任何类型！这是因为这两种构造都打破了正常控制流，因此他们永远不需要计算该类型的值。
+
+以下的示例不是特别有用，但它们会做类型检查
+
+```move
+let y: address = abort 0;
+```
+
+This behavior can be helpful in situations where you have a branching instruction that produces a
+value on some branches, but not all. For example:
+
+在您有一个分支指令，并且这个指令会产生某些分支(不是全部)的值的时候，这种行为会非常有用。例如：
+
+```move
+let b =
+    if (x == 0) false
+    else if (x == 1) true
+    else abort 42;
+//       ^^^^^^^^ `abort 42` 的类型是 `bool`
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/address.md b/vendors/move/documentation/book/translations/move-book-zh/src/address.md
new file mode 100644
index 000000000..1a5edc9d9
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/address.md
@@ -0,0 +1,58 @@
+# 地址
+
+`地址（address）`是 Move 中的内置类型，用于表示全局存储中的的位置（有时称为账户）。`地址（address）` 值是一个 128 位（16 字节）标识符。在一个给定的地址，可以存储两样东西：[模块（Module）](./modules-and-scripts.md)和[资源（Resources）](./structs-and-resources.md)。
+
+虽然`地址（address）`在底层是一个 128 位整数，但 Move 语言有意让其不透明 —— 它们不能从整数创建，不支持算术运算，也不能修改。即使可能有一些有趣的程序会使用这种特性（例如，C 中的指针算法实现了类似壁龛（niche）的功能），但 Move 语言不允许这种动态行为，因为它从头开始就被设计为支持静态验证。*（壁龛指安装在墙壁上的小格子或在墙身上留出的作为贮藏设施的空间，最早在宗教上是指排放佛像的小空间，现在多用在家庭装修上，因其不占建筑面积，使用比较方便，深受大家喜爱，Joe 注）*
+
+你可以通过运行时地址值（`address` 类型的值）来访问该地址处的资源。但*无法*在运行时通过地址值访问模块。
+
+## 地址及其语法
+
+地址有两种形式：*命名的*或*数值的*。命名地址的语法遵循 Move 命名标识符的规则。数值地址的语法不受十六进制编码值的限制，任何有效的 [`u128` 数值](./integers.md)都可以用作地址值。例如，`42`，`0xCFAE` 和 `2021` 都是合法有效的数值地址字面量（literal）。
+
+为了区分何时在表达式上下文中使用地址，使用地址时的语法根据使用地址的上下文而有所不同：
+
+* 当地址被用作表达式时，地址必须以 `@` 字符为前缀，例如：[`@<numerical_value>`](./integers.md) 或 `@<named_address_identifier>`。
+* 在表达式上下文之外，地址可以不带前缀字符 `@`。例如：[`<numerical_value>`](./integers.md) 或 `<named_address_identifier>`。
+
+通常，可以将 `@` 视为将地址从命名空间项变为表达式项的运算符。
+
+## 命名地址
+
+命名地址是一项特性，它允许在使用地址的任何地方使用标识符代替数值，而不仅仅是在值级别。命名地址被声明并绑定为 Move 包中的顶级元素（模块和脚本之外）或作为参数传递给 Move 编译器。
+
+命名地址仅存在于源语言级别，并将在字节码级别完全替代它们的值。因此，模块和模块成员*必须*通过模块的命名地址而不是编译期间分配给命名地址的数值来访问，例如：`use my_addr::foo` *不等于* `use 0x2::foo`，即使 Move 程序编译时将 `my_addr` 设置成 `0x2`。这个区别在[模块和脚本](./modules-and-scripts.md)一节中有更详细的讨论。
+
+### 例子
+
+```move
+let a1: address = @0x1; // 0x00000000000000000000000000000001 的缩写
+let a2: address = @0x42; // 0x00000000000000000000000000000042 的缩写
+let a3: address = @0xDEADBEEF; // 0x000000000000000000000000DEADBEEF 的缩写
+let a4: address = @0x0000000000000000000000000000000A;
+let a5: address = @std; // 将命名地址 `std` 的值赋给 `a5`
+let a6: address = @66;
+let a7: address = @0x42;
+
+module 66::some_module {   // 不在表达式上下文中，所以不需要 @
+    use 0x1::other_module; // 不在表达式上下文中，所以不需要 @
+    use std::vector;       // 使用其他模块时，可以使用命名地址作为命名空间项
+    ...
+}
+
+module std::other_module {  // 可以使用命名地址作为命名空间项来声明模块
+    ...
+}
+```
+
+## 全局存储操作
+
+`address` 值主要用来与全局存储操作进行交互。
+
+`address` 值与 `exists`、`borrow_global`、`borrow_global_mut` 和 `move_from` [操作（operation）](./global-storage-operators.md)一起使用。
+
+唯一*不使用* `address` 的全局存储操作是 `move_to`，它使用了 [`signer`](./signer.md)。
+
+## 所有权
+
+与 Move 语言内置的其他标量值一样，`address` 值是隐式可复制的，这意味着它们可以在没有显式指令（例如 [`copy`](./variables.md#移动和复制)）的情况下复制。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/bool.md b/vendors/move/documentation/book/translations/move-book-zh/src/bool.md
new file mode 100644
index 000000000..d49844ddb
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/bool.md
@@ -0,0 +1,49 @@
+# 布尔类型 (Bool)
+
+`bool`is Move's primitive type for boolean `true` and `false`values.
+
+`bool` 是 Move 布尔基本类型，有 `true` 和 `false` 两个值。
+
+## 字面量 (Literals)
+
+Literals for `bool` are either `true` or `false` .
+
+布尔类型字面值只能是 `true` 或者 `false`中的一个 。
+
+## 操作 (Operations)
+
+### 逻辑运算 (Logical)
+
+`bool`supports three logical operations:
+
+| Syntax                    | Description                  | Equivalent Expression                                               |
+| ------------------------- | ---------------------------- | ------------------------------------------------------------------- |
+| `&&`                      | short-circuiting logical and | `p && q` is equivalent to `if (p) q else false`                     |
+| <code>&vert;&vert;</code> | short-circuiting logical or  | <code>p &vert;&vert; q</code> is equivalent to `if (p) true else q` |
+| `!`                       | logical negation             | `!p` is equivalent to `if (p) false else true`                      |
+
+
+`bool` 支持三种逻辑运算：
+
+| 句法 | 描述                  | Equivalent Expression                           |
+| ------ | ---------------------------- | ----------------------------------------------- |
+| `&&`   | 短路逻辑与(short-circuiting logical and) | `p && q` 等价于 `if (p) q else false` |
+| <code>&vert;&vert;</code>   | 短路逻辑或(short-circuiting logical or)  | `p || q` 等价于 `if (p) true else q`  |
+| `!`    | 逻辑非(logical negation)            | `!p` 等价于 `if (p) false else true`  |
+
+
+### 控制流 (Control Flow)
+
+`bool`values are used in several of Move's control-flow constructs:
+
+布尔值用于 Move 的多个控制流结构中：
+
+- [`if (bool) { ... }`](./conditionals.html)
+- [`while (bool) { .. }`](/loops.html)
+- [`assert!(bool, u64)`](./abort-and-assert.html)
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, boolean values are implicitly copyable, meaning they can be copied without an explicit instruction such as `[copy](<https://move-language.github.io/move/variables.html#move-and-copy>).`
+
+与语言内置的其他标量值一样，布尔值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/coding-conventions.md b/vendors/move/documentation/book/translations/move-book-zh/src/coding-conventions.md
new file mode 100644
index 000000000..0ea7920b8
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/coding-conventions.md
@@ -0,0 +1,76 @@
+# Move 编码约定
+
+本节列出了 Move 团队认为有用的一些基本的 Move 编码约定。这些只是建议，如果你喜欢其他格式指南和约定，你可以随时使用它们。
+
+## 命名
+
+- **模块名称**：应该使用小写的蛇形命名法，例如：`fixed_point32`、`vector`。
+- **类型名称**：如果不是原生数据类型，则应使用驼峰命名法，例如：`Coin`、`RoleId`。
+- **函数名称**：应该使用小写的蛇形命名法，例如：`destroy_empty`。
+- **常量名称**：应该使用大写的蛇形命名法，例如：`REQUIRES_CAPABILITY`。
+- 泛型类型应该具备描述性，当然在适当的情况下也可以是反描述性的，例如：Vector 泛型类型的参数可以是 `T` 或 `Element`。大多数情况下，模块中的“主”类型命名应该与模块名相同，例如：`option::Option`，`fixed_point32::FixedPoint32`。
+- **模块文件名称**：应该与模块名相同，例如：`Option.move`。
+- **脚本文件名称**：应该使用小写的蛇形命名法，并且应该与脚本中的“主”函数名匹配。
+- **混合文件名称**：如果文件包含多个模块和/或脚本，文件命名应该使用小写的蛇形命名法，并且不需要与内部的任何特定模块/脚本名匹配。
+
+## 导入
+
+- 所有模块的 `use` 语句都应该位于模块的顶部。
+- 函数应该从声明它们的模块中完全限定地导入和使用, 而不是在顶部导入。
+- 类型应该在顶部导入。如果存在名称冲突，应使用 `as` 在本地适当地重命名类型。
+
+例如，如果有一个模块：
+
+```move
+module 0x1::foo {
+    struct Foo { }
+    const CONST_FOO: u64 = 0;
+    public fun do_foo(): Foo { Foo{} }
+    ...
+}
+```
+
+此时将被导入并使用：
+
+```move
+module 0x1::bar {
+    use 0x1::foo::{Self, Foo};
+
+    public fun do_bar(x: u64): Foo {
+        if (x == 10) {
+            foo::do_foo()
+        } else {
+            abort 0
+        }
+    }
+    ...
+}
+```
+
+并且，如果在导入两个模块时存在本地名称冲突：
+
+```move
+module other_foo {
+    struct Foo {}
+    ...
+}
+
+module 0x1::importer {
+    use 0x1::other_foo::Foo as OtherFoo;
+    use 0x1::foo::Foo;
+    ...
+}
+```
+
+## 注释
+
+- 每个模块、结构体和公共函数声明都应该有对应的注释。
+- Move 有文档注释 `///`，常规单行注释 `//`，块注释 `/* */`，和块文档注释 `/** */`。
+
+## 格式化
+
+Move 团队计划编写一个自动格式化程序来执行格式化约定。然而，在此期间：
+
+- 除 `script` 和 `address` 块外，其他的内容应使用四个空格的缩进。
+- 每行代码，如果超过 100 个字符，应该换行。
+- 结构体和常量应该在模块中的所有函数之前声明。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/conditionals.md b/vendors/move/documentation/book/translations/move-book-zh/src/conditionals.md
new file mode 100644
index 000000000..0edbb8c42
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/conditionals.md
@@ -0,0 +1,78 @@
+# 条件语句 (Conditionals)
+
+An `if` expression specifies that some code should only be evaluated if a certain condition is true. For example:
+
+`if` 语句可以用来指定一块代码块，但只在判断条件(condition)为true时才会被执行。例如:
+
+```move
+if (x > 5) x = x - 5
+```
+
+The condition must be an expression of type `bool`.
+
+An `if` expression can optionally include an `else` clause to specify another expression to evaluate when the condition is false.
+
+条件语句(condition)必须是 `bool` 类型的表达式。
+
+`if` 语句可选包含 `else` 子句，以指定当条件(condition)为 false 时要执行的另一个代码块。
+
+```move
+if (y <= 10) y = y + 1 else y = 10
+```
+
+Either the "true" branch or the "false" branch will be evaluated, but not both. Either branch can be a single expression or an expression block.
+
+The conditional expressions may produce values so that the `if` expression has a result.
+
+无论是"true"分支还是"false"分支都会被执行，但不会同时执行.其中任何一个分支都可以是单行代码或代码块。条件表达式会产生值，所以 `if` 表达式会有一个结果。
+
+```move
+let z = if (x < 100) x else 100;
+```
+
+The expressions in the true and false branches must have compatible types. For example:
+
+true 和 false 分支的表达式类型必须是一致的,例如:
+
+```move=
+// x和y必须是u64整型
+// x and y must be u64 integers
+let maximum: u64 = if (x > y) x else y;
+
+// 错误！分支的类型不一致
+// (ERROR! branches different types)
+let z = if (maximum < 10) 10u8 else 100u64;
+
+// 错误！分支的类型不一致,false-branch默认是()不是u64
+// ERROR! branches different types, as default false-branch is () not u64
+if (maximum >= 10) maximum;
+```
+
+If the `else` clause is not specified, the false branch defaults to the unit value. The following are equivalent:
+
+如果`else`子句未定义，false分支默认为 unit 。下面的例子是相等价的:
+
+```move
+if (condition) true_branch // implied default: else ()
+if (condition) true_branch else ()
+```
+
+Commonly, [`if` expressions](./conditionals.md) are used in conjunction with expression blocks.
+
+一般来说, [`if` 表达式](./conditionals.md)与多个表达式块结合使用.
+
+```move
+let maximum = if (x > y) x else y;
+if (maximum < 10) {
+    x = x + 10;
+    y = y + 10;
+} else if (x >= 10 && y >= 10) {
+    x = x - 10;
+    y = y - 10;
+}
+```
+
+## 条件语句的语法 (Grammar for Conditionals)
+
+> *if-expression* → **if (** *expression* **)** *expression* *else-clause*<sub>*opt*</sub>
+> *else-clause* → **else** *expression*
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/constants.md b/vendors/move/documentation/book/translations/move-book-zh/src/constants.md
new file mode 100644
index 000000000..380322e8f
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/constants.md
@@ -0,0 +1,136 @@
+# 常量 (Constants)
+
+Constants are a way of giving a name to shared, static values inside of a `module` or `script`.
+
+The constant's must be known at compilation. The constant's value is stored in the compiled module
+or script. And each time the constant is used, a new copy of that value is made.
+
+常量是一种对 `module` 或 `script` 内的共享静态值进行命名的方法(类似变量，但值不变，译者注)。
+
+常量必须在编译时知道。常量的值存储在编译模块或脚本中。每次使用该常量时，都会生成该值的新副本。
+
+## 声明 (Declaration)
+
+Constant declarations begin with the `const` keyword, followed by a name, a type, and a value. They
+can exist in either a script or module
+
+常量声明以 `const` 关键字开头，后跟名称、类型和值。他们可以存在于脚本或模块中
+
+```text
+const <name>: <type> = <expression>;
+```
+
+例如
+
+```move=
+script {
+
+    const MY_ERROR_CODE: u64 = 0;
+
+    fun main(input: u64) {
+        assert!(input > 0, MY_ERROR_CODE);
+    }
+
+}
+
+address 0x42 {
+    module example {
+
+        const MY_ADDRESS: address = @0x42;
+
+        public fun permissioned(s: &signer) {
+            assert!(std::signer::address_of(s) == MY_ADDRESS, 0);
+        }
+
+    }
+}
+```
+
+## 命名 (Naming)
+
+Constants must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+常量必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，常量名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+const FLAG: bool = false;
+const MY_ERROR_CODE: u64 = 0;
+const ADDRESS_42: address = @0x42;
+```
+
+Even though you can use letters `a` to `z` in a constant. The
+[general style guidelines](./coding-conventions.md) are to use just uppercase letters `A` to `Z`,
+with underscores `_` between each word.
+
+虽然你可以在常量中使用字母 `a` 到 `z`。但[通用风格指南](./coding-conventions.md) 只使用大写字母 `A` 到 `Z`，每个单词之间有下划线`_`。
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。此限制未来可能会保留或删除。
+
+## 可见性 (Visibility)
+
+`public` constants are not currently supported. `const` values can be used only in the declaring
+module.
+
+当前不支持 `public` 常量。 `const` 值只能在声明的模块中使用。
+
+## 有效表达式 (Valid Expressions)
+
+Currently, constants are limited to the primitive types `bool`, `u8`, `u64`, `u128`, `address`, and
+`vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will come later.
+
+目前，常量仅限于原始类型 `bool`、`u8`、`u64`、`u128`、`address` 和`vector<u8>`。其他 `vector` 值(除了“string”风格的字面量)将在不远的将来获得支持。
+
+### 值 (Values)
+
+Commonly, `const`s are assigned a simple value, or literal, of their type. For example
+
+通常，`const` (常量)会被分配一个对应类型的简单值或字面量。例如
+
+```move
+const MY_BOOL: bool = false;
+const MY_ADDRESS: address = @0x70DD;
+const BYTES: vector<u8> = b"hello world";
+const HEX_BYTES: vector<u8> = x"DEADBEEF";
+```
+
+### 复杂表达式 (Complex Expressions)
+
+
+In addition to literals, constants can include more complex expressions, as long as the compiler is
+able to reduce the expression to a value at compile time.
+
+Currently, equality operations, all boolean operations, all bitwise operations, and all arithmetic
+operations can be used.
+
+除了字面量，常量还可以包含更复杂的表达式，只要编译器能够在编译时将表达式归纳(reduce)为一个值。
+
+目前，相等运算、所有布尔运算、所有按位运算和所有算术运算可以使用。
+
+```move
+const RULE: bool = true && false;
+const CAP: u64 = 10 * 100 + 1;
+const SHIFTY: u8 = {
+  (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
+};
+const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const EQUAL: bool = 1 == 1;
+```
+
+If the operation would result in a runtime exception, the compiler will give an error that it is
+unable to generate the constant's value
+
+如果操作会导致运行时异常，编译器会给出无法生成常量值的错误。
+
+```move
+const DIV_BY_ZERO: u64 = 1 / 0; // error!
+const SHIFT_BY_A_LOT: u64 = 1 << 100; // error!
+const NEGATIVE_U64: u64 = 0 - 1; // error!
+```
+
+Note that constants cannot currently refer to other constants. This feature, along with support for
+other expressions, will be added in the future.
+
+请注意，常量当前不能引用其他常量。此功能会在将来和支持其他表达方式一起被补充。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/creating-coins.md b/vendors/move/documentation/book/translations/move-book-zh/src/creating-coins.md
new file mode 100644
index 000000000..1f06df9a0
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/creating-coins.md
@@ -0,0 +1,7 @@
+# Move Tutorial
+
+Please refer to the [Move Tutorial](https://github.com/move-language/move/tree/main/language/documentation/tutorial).
+
+# Move 教程
+
+请参阅 [Move 教程](https://github.com/move-language/move/tree/main/language/documentation/tutorial)。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/equality.md b/vendors/move/documentation/book/translations/move-book-zh/src/equality.md
new file mode 100644
index 000000000..2abe89623
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/equality.md
@@ -0,0 +1,192 @@
+
+# 等式 (Equality)
+
+Move supports two equality operations `==` and `!=`
+
+Move 支持两种等式操作： `==` 和 `!=`
+
+## 操作 (Operations)
+
+| Syntax | Operation | Description                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | equal     | Returns `true` if the two operands have the same value, `false` otherwise   |
+| `!=`   | not equal | Returns `true` if the two operands have different values, `false` otherwise |
+
+| 语法 | 操作 | 描述                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | 相等     | 如果两个操作数(operands)值相同，返回 `true` , 否则返回 `false`  |
+| `!=`   | 不相等 | 如果两个操作数(operands)值不相同，返回 `true` , 否则返回 `false`  |
+
+### 类型校验 (Typing)
+
+Both the equal (`==`) and not-equal (`!=`) operations only work if both operands are the same type.
+
+只有当左右两个操作数类型相同，相等操作 (`==`) 与不等操作 (`!=`) 才能正常使用。
+
+```move
+0 == 0; // `true`
+1u128 == 2u128; // `false`
+b"hello" != x"00"; // `true`
+```
+
+Equality and non-equality also work over user defined types!
+
+等式与不等式也可以在用户自定义的类型下使用！
+
+```move=
+address 0x42 {
+    module example {
+        struct S has copy, drop { f: u64, s: vector<u8> }
+
+        fun always_true(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) == s
+        }
+
+        fun always_false(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) != s
+        }
+    }
+}
+```
+
+If the operands have different types, there is a type checking error.
+
+如果两边操作数的类型不同，则会出现类型检测错误。
+
+```move
+1u8 == 1u128; // 错误!
+//     ^^^^^ 期望此变量的类型是 'u8'
+b"" != 0; // 错误!
+//     ^ 期望此变量的类型是 'vector<u8>'
+```
+
+### 引用变量的类型校验 (Typing with references)
+
+When comparing [references](./references.md), the type of the reference (immutable or mutable) does
+not matter. This means that you can compare an immutable `&` reference with a mutable one `&mut` of
+the same underlying type.
+
+当比较[引用变量](./references.md)时，引用的类别(不可变更的或可变更的(immutable or mutable))无关紧要。这意味着我们可以拿一个不可变更的 `&` 引用变量和另一个有相同相关类型的可变更的 `&mut ` 引用变量进行比较。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == m; // `false`
+m == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+The above is equivalent to applying an explicit freeze to each mutable reference where needed
+
+在需要时，对每个可变引用使用显式冻结(explicit freeze)的结果与上述情况一致。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == freeze(m); // `false`
+freeze(m) == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+But again, the underlying type must be the same type
+
+但同样的，我们需要两边操作数的类型一致
+
+```move
+let i = &0;
+let s = &b"";
+
+i == s; // 错误!
+//   ^ 期望此变量的类型是 '&u64'
+```
+
+## 限制 (Restrictions)
+
+Both `==` and `!=` consume the value when comparing them. As a result, the type system enforces that
+the type must have [`drop`](./abilities.md). Recall that without the [`drop` ability](./abilities.md),
+ownership must be transferred by the end of the function, and such values can only be explicitly destroyed
+within their declaring module. If these were used directly with either equality `==` or non-equality `!=`,
+the value would be destroyed which would break [`drop` ability](./abilities.md) safety guarantees!
+
+`==` 和 `!=` 会在比较不同变量的时候消耗 (consume)它们所包含的值，所以 Move 的类型系统会强制要求这些类型含有[`drop` 能力](./abilities.md)。回想一下，变量在没有[`drop` 能力](./abilities.md)时，所有权必须在函数结束前进行转移，而且这些值只能在其声明模块中被明确销毁(explicitly destroyed)。如果它们被直接使用于等式 `==` 或不等式 `!=` ，其值会被销毁并且这会打破[`drop` 能力](./abilities.md)的安全保证！
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+        fun invalid(c1: Coin, c2: Coin) {
+            c1 == c2 // 错误!
+    //      ^^    ^^ 这些资源将会被销毁!
+        }
+    }
+}
+```
+
+
+But, a programmer can _always_ borrow the value first instead of directly comparing the value, and
+reference types have the [`drop` ability](./abilities.md). For example
+
+然而, 程序员 _总是_ 可以优先借用变量的值，而不直接比较它们的值。这样一来，引用变量的类型将会拥有[`drop` 能力](./abilities.md)。例如：
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin as store { value: u64 }
+        fun swap_if_equal(c1: Coin, c2: Coin): (Coin, Coin) {
+            let are_equal = &c1 == &c2; // 合规范的
+            if (are_equal) (c2, c1) else (c1, c2)
+        }
+    }
+}
+```
+
+## 避免额外的复制 (Avoid Extra Copies)
+
+While a programmer _can_ compare any value whose type has [`drop`](./abilities.md), a programmer
+should often compare by reference to avoid expensive copies.
+
+当程序员 _可以_ 比较其类型含有[`drop` 能力](./abilities.md)的任意值时，他们应该尽可能多地使用引用变量来比较，以此来避免昂贵的复制。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(copy v1 == copy v2, 42);
+//     ^^^^       ^^^^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(copy s1 == copy s2, 42);
+//     ^^^^       ^^^^
+use_two_foos(s1, s2);
+```
+
+This code is perfectly acceptable (assuming `Foo` has [`drop`](./abilities.md)), just not efficient.
+The highlighted copies can be removed and replaced with borrows
+
+以上代码是完全可以接受的(假设`Foo`具备[`drop`](./abilities.md)能力)，但它不是最有效的写法。突出显示的副本可以删除并替换为借用。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(&v1 == &v2, 42);
+//     ^      ^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(&s1 == &s2, 42);
+//     ^      ^
+use_two_foos(s1, s2);
+```
+
+The efficiency of the `==` itself remains the same, but the `copy`s are removed and thus the program is more efficient.
+
+`==` 本身的效率还是和之前一样，但是 `copy` 操作被移除后整个程序会比之前更有效率。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/friends.md b/vendors/move/documentation/book/translations/move-book-zh/src/friends.md
new file mode 100644
index 000000000..238dce84f
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/friends.md
@@ -0,0 +1,154 @@
+# 友元函数（Friends）
+
+The `friend` syntax is used to declare modules that are trusted by the current module.
+A trusted module is allowed to call any function defined in the current module that have the `public(friend)` visibility.
+For details on function visibilities, please refer to the *Visibility* section in [Functions](./functions.md).
+
+友元语法用于声明当前模块信任的其它模块。受信任的模块可以调用当前模块中定义的任何具有`公开（友元）`可见性的函数。有关函数可见性的详细信息，请参阅[函数](./functions.md)中的可见性部分。
+
+## 友元声明（Friend declaration）
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+一个模块可以通过友元声明语句将其他模块声明为友元，格式为：
+
+- `friend <address::name>` — friend declaration using fully qualified module name like the example below, or
+-	`friend <address::name>—` 使用完全合格的模块名称的友元声明，如下例所示，或
+
+    ```
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+    }
+    }
+    ```
+
+- `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+- `friend <module-name-alias>—` 使用模块名称别名的友元声明，其中模块别名是通过use语句引入的。
+
+   ```move
+  address 0x42 {
+  module a {
+      use 0x42::b;
+      friend b;
+  }
+  }
+  ```
+
+A module may have multiple friend declarations, and the union of all the friend modules forms the friend list.
+In the example below, both `0x42::B` and `0x42::C` are considered as friends of `0x42::A`.
+
+一个模块可能有多个友元声明，所有好友模块的并集形成友元列表。在下面的示例中`，0x42::B`和`0x42::C`都被视为 的友元函数`0x42::A`。
+
+   ```move
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+        friend 0x42::c;
+    }
+    }
+  ```
+
+Unlike `use` statements, `friend` can only be declared in the module scope and not in the expression block scope.
+`friend` declarations may be located anywhere a top-level construct (e.g., `use`, `function`, `struct`, etc.) is allowed.
+However, for readability, it is advised to place friend declarations near the beginning of the module definition.
+
+与`use`语句不同，`friend`只能在模块作用域内声明，而不能在表达式块的作用域内声明。`friend`声明可以位于允许顶层构造的任何位置（例如， `use`， `function，struct`等）是被允许的。但是，为了可读性，建议将友元声明放在模块定义的开头附近。
+
+Note that the concept of friendship does not apply to Move scripts:
+- A Move script cannot declare `friend` modules as doing so is considered meaningless: there is no mechanism to call the function defined in a script.
+- A Move module cannot declare `friend` scripts as well because scripts are ephemeral code snippets that are never published to global storage.
+
+请注意，友元关系（friendship）的概念不适用于 Move 脚本：
+-	`Move` 脚本不能声明`friend`模块，因为这样做被认为是无意义的：没有机制可以调用脚本中定义的函数。
+-	`Move` 模块也不能声明`friend`脚本，因为脚本是永远不会发布到全局存储的临时代码片段。
+
+### 友元声明规则（Friend declaration rules）
+Friend declarations are subject to the following rules:
+友元声明须遵守以下规则：
+
+- A module cannot declare itself as a friend
+- 一个模块不能将自己声明为友元。
+
+   ```move=
+  address 0x42 {
+  module m { friend Self; // 错误! }
+  //                ^^^^ 不能将自己声明为友元
+  }
+
+  address 0x43 {
+  module m { friend 0x43::M; // 错误! }
+  //                ^^^^^^^ 不能将自己声明为友元
+  }
+  ```
+
+- Friend modules must be known by the compiler
+- 编译器必须知道友元模块
+
+   ```move=
+  address 0x42 {
+  module m { friend 0x42::nonexistent; // 错误! }
+  //                ^^^^^^^^^^^^^^^^^ 未绑定的模块 '0x42::nonexistent'
+  }
+  ```
+
+ - Friend modules must be within the same account address. (Note: this is not a technical requirement but rather a policy decision which *may* be relaxed later.)
+
+ -	友元模块必须在同一个账号地址内。（注：这不是技术要求，而是以后可能放宽的决策。)
+
+    ```move
+    address 0x42 {
+    module m {}
+    }
+
+    address 0x43 {
+    module n { friend 0x42::m; // 错误! }
+    //                ^^^^^^^ 不能声明当前地址外的模块作为友元
+    }
+    ```
+
+-	友元关系不能创建循环模块依赖关系（Friends relationships cannot create cyclic module dependencies）
+
+Cycles are not allowed in the friend relationships, e.g., the relation `0x2::a` friends `0x2::b` friends `0x2::c` friends `0x2::a` is not allowed.
+More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module).
+If that friend module is already used, either directly or transitively, a cycle of dependencies would be created.
+
+友元关系中不允许循环，例如 `0x2::a` 友元 `0x2::b` 友元 `0x2::c` 友元`0x2::a`是不允许的。更普遍地，声明一个友元模块会将对当前模块的依赖添加到友元模块（因为目的是让友元调用当前模块中的函数）。如果该友元模块已被直接或传递地使用，则将形成一个依赖循环。
+
+   ```move
+  address 0x2 {
+  module a {
+      use 0x2::c;
+      friend 0x2::b;
+
+      public fun a() {
+          c::c()
+      }
+  }
+
+  module b {
+      friend 0x2::c; // 错误!
+  //         ^^^^^^ 这个友元关系形成了一个依赖循环:  '0x2::a' 使用了 '0x2::c' 但'0x2::b' 同时是 '0x2::a'和'0x2::b' 的友元
+  }
+
+  module c {
+      public fun c() {}
+  }
+  }
+```
+
+- The friend list for a module cannot contain duplicates.
+-	模块的友元列表不能包含重复项。
+
+   ```move=
+  address 0x42 {
+  module a {}
+
+  module m {
+      use 0x42::a as aliased_a;
+      friend 0x42::A;
+      friend aliased_a; // 错误!
+  //         ^^^^^^^^^ 重复的友元声明 '0x42::a'. 模块内的友元声明必须是唯一的
+  }
+  }
+  ```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/functions.md b/vendors/move/documentation/book/translations/move-book-zh/src/functions.md
new file mode 100644
index 000000000..e0fb8d2a0
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/functions.md
@@ -0,0 +1,607 @@
+# 函数 (Functions)
+
+Function syntax in Move is shared between module functions and script functions. Functions inside of modules are reusable, whereas script functions are only used once to invoke a transaction.
+
+Move中的函数语法在模块函数和脚本函数之间是一致的。模块内部的函数可重复使用，而脚本的函数只能被使用一次用来调用事务。
+
+# 声明 (Declaration)
+
+Functions are declared with the `fun` keyword followed by the function name, type parameters, parameters, a return type, acquires annotations, and finally the function body.
+
+函数使用 `fun` 关键字声明，后跟函数名称、类型参数、参数、返回类型、获取标注(annotation)，最后是函数体。
+
+```text
+fun <identifier><[type_parameters: constraint],*>([identifier: type],*): <return_type> <acquires [identifier],*> <function_body>
+```
+
+例如
+
+```move
+fun foo<T1, T2>(x: u64, y: T1, z: T2): (T2, T1, u64) { (z, y, x) }
+```
+
+### 可见性 (Visibility)
+
+Module functions, by default, can only be called within the same module. These internal (sometimes called private) functions cannot be called from other modules or from scripts.
+
+默认情况下，模块函数只能在同一个模块内调用。这些内部(有时称为私有)函数不能从其他模块或脚本中调用。
+
+```move=
+address 0x42 {
+    module m {
+        fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+To allow access from other modules or from scripts, the function must be declared `public` or `public(friend)`.
+
+要允许从其他模块或脚本访问，该函数必须声明为 `public` 或 `public(friend)`。
+
+#### `public` 可见性 (`public` visibility)
+
+A `public` function can be called by *any* function defined in *any* module or script. As shown in the following example, a `public` function can be called by:
+- other functions defined in the same module,
+- functions defined in another module, or
+- the function defined in a script.
+
+`public` 函数可以被任何模块或脚本中定义的任何函数调用。如以下示例所示，可以通过以下方式调用 `public` 函数：
+
+- 在同一模块中定义的其他函数
+- 在另一个模块中定义的函数
+- 在脚本中定义的函数
+
+```move=
+address 0x42 {
+    module m {
+        public fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+```
+
+#### `public(friend)` 可见性 (`public(friend)` visibility)
+
+The `public(friend)` visibility modifier is a more restricted form of the `public` modifier to give more control about where a function can be used. A `public(friend)` function can be called by:
+- other functions defined in the same module, or
+- functions defined in modules which are explicitly specified in the **friend list** (see [Friends](./friends.md) on how to specify the friend list).
+
+Note that since we cannot declare a script to be a friend of a module, the functions defined in scripts can never call a `public(friend)` function.
+
+`public(friend)` 可见性修饰符是一种比 `public` 修饰符限制更严格的形式，可以更好地控制函数的使用位置。 `public(friend)` 函数可以通过以下方式调用：
+
+- 在同一模块中定义的其他函数，或者在 **friend list** 中明确指定的模块中定义的函数(请参阅 [Friends](./friends.md) 了解如何指定友元(friends)列表)。
+
+请注意，由于我们不能将脚本声明为模块的友元关系，因此脚本中定义的函数永远不能调用 `public(friend)` 函数。
+
+```move=
+address 0x42 {
+    module m {
+        friend 0x42::n;  // friend declaration
+        public(friend) fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+```
+
+### `entry` 修饰符 (`entry` modifier)
+
+The `entry` modifier is designed to allow module functions to be safely and directly invoked much like scripts. This allows module writers to specify which functions can be to begin execution. The module writer then knows that any non-`entry` function will be called from a Move program already in execution.
+
+Essentially, `entry` functions are the "main" functions of a module, and they specify where Move programs start executing.
+
+Note though, an `entry` function _can_ still be called by other Move functions. So while they _can_ serve as the start of a Move program, they aren't restricted to that case.
+
+`entry` 修饰符旨在允许像脚本一样安全直接地调用模块函数。这允许模块编写者指定哪些函数可以成为开始执行的入口。这样模块编写者就知道任何非`entry`函数都是从已经在执行的 Move 程序中被调用的。
+
+本质上，`entry` 函数是模块的“main”函数，它们指定 Move 程序开始执行的位置。
+
+但请注意，`entry` 函数仍可被其他 Move 函数调用。因此，虽然它们 _可以_ 作为 Move 程序的入口，但它们并不局限于这种用法。
+
+例如：
+
+```move=
+address 0x42 {
+    module m {
+        public entry fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid!
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+```
+
+Even internal functions can be marked as `entry`! This lets you guarantee that the function is called only at the beginning of execution (assuming you do not call it elsewhere in your module)
+
+甚至内部函数也可以标记为 `entry`！这使你可以保证仅在开始执行时调用该函数(假如你没有在模块中的其他地方调用它)
+
+```move=
+address 0x42 {
+    module m {
+        entry fun foo(): u64 { 0 } // valid! entry functions do not have to be public
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+### 函数名 (Name)
+
+Function names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, function names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+函数名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，函数名称可以包含下划线 `_`、字母 `a` 到 `z` 、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+fun FOO() {}
+fun bar_42() {}
+fun _bAZ19() {}
+```
+
+### 类型参数 (Type Parameters)
+
+After the name, functions can have type parameters
+
+函数名后可以有类型参数
+
+```move
+fun id<T>(x: T): T { x }
+fun example<T1: copy, T2>(x: T1, y: T2): (T1, T1, T2) { (copy x, x, y) }
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [移动泛型](./generics.md)。
+
+### 参数 (Parameters)
+
+Functions parameters are declared with a local variable name followed by a type annotation
+
+函数参数使用局部变量名，后跟类型标注的方式进行声明。
+
+```move
+fun add(x: u64, y: u64): u64 { x + y }
+```
+
+We read this as `x` has type `u64`
+
+A function does not have to have any parameters at all.
+
+(上面代码中的函数参数) 我们读为：`x` 参数的类型是 `u64` 。
+
+函数可以没有任何参数。
+
+```move
+fun useless() { }
+```
+
+This is very common for functions that create new or empty data structures
+
+在函数中创建新或空的数据结构是常见的用法。
+
+```move=
+address 0x42 {
+    module example {
+        struct Counter { count: u64 }
+
+        fun new_counter(): Counter {
+            Counter { count: 0 }
+        }
+
+    }
+}
+```
+
+### Acquires
+
+When a function accesses a resource using `move_from`, `borrow_global`, or `borrow_global_mut`, the function must indicate that it `acquires` that resource. This is then used by Move's type system to ensure the references into global storage are safe, specifically that there are no dangling references into global storage.
+
+当一个函数使用 `move_from`、`borrow_global` 或 `borrow_global_mut` 访问资源时，则该函数必须表明它 `获取(acquires)` 该资源。然后 Move 的类型系统使用它来确保对全局存储的引用是安全的，特别是没有对全局存储的悬垂引用(dangling references)。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+    }
+}
+```
+`acquires` annotations must also be added for transitive calls within the module. Calls to these functions from another module do not need to annotated with these acquires because one module cannot access resources declared in another module--so the annotation is not needed to ensure reference safety.
+
+`acquires` 标注也必须为模块内有传递性的调用添加。从另一个模块对这些函数的调用不需要使用 `acquires` 进行注释，因为一个模块无法访问在另一个模块中声明的资源——因此不需要用标注来确保引用安全。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+
+        public fun extract_and_add(sender: address, receiver: &signer) acquires Balance {
+            let value = extract_balance(sender); // acquires needed here
+            add_balance(receiver, value)
+        }
+    }
+}
+
+address 0x42 {
+    module other {
+        fun extract_balance(addr: address): u64 {
+            0x42::example::extract_balance(addr) // no acquires needed
+        }
+    }
+}
+```
+
+A function can `acquire` as many resources as it needs to
+
+函数可以根据需要 `acquire` 尽可能多的资源。
+
+```move=
+address 0x42 {
+    module example {
+        use std::vector;
+
+        struct Balance has key { value: u64 }
+        struct Box<T> has key { items: vector<T> }
+
+        public fun store_two<Item1: store, Item2: store>(
+            addr: address,
+            item1: Item1,
+            item2: Item2,
+        ) acquires Balance, Box {
+            let balance = borrow_global_mut<Balance>(addr); // acquires needed
+            balance.value = balance.value - 2;
+            let box1 = borrow_global_mut<Box<Item1>>(addr); // acquires needed
+            vector::push_back(&mut box1.items, item1);
+            let box2 = borrow_global_mut<Box<Item2>>(addr); // acquires needed
+            vector::push_back(&mut box2.items, item2);
+        }
+    }
+}
+```
+
+### 返回类型 (Return type)
+
+After the parameters, a function specifies its return type.
+
+在参数之后，函数指定其返回类型。
+
+```move
+fun zero(): u64 { 0 }
+```
+
+Here `: u64` indicates that the function's return type is `u64`.
+
+Using tuples, a function can return multiple values
+
+这里 `: u64` 表示函数的返回类型是 `u64`。
+
+使用元组，一个函数可以返回多个值：
+
+```move
+fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
+```
+
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent
+
+如果未指定返回类型，则该函数具有隐式返回类型单值 `()`。这些函数是等价的：
+
+```move
+fun just_unit(): () { () }
+fun just_unit() { () }
+fun just_unit() { }
+```
+
+`script` functions must have a return type of unit `()`
+
+`script` 函数的返回类型必须为单值 `()`（不能是任何其他类型，例如 `bool`、`u64` 等，注者注）：
+
+```move
+script {
+    fun do_nothing() {
+    }
+}
+```
+
+As mentioned in the [tuples section](./tuples.md), these tuple "values" are virtual and do not exist at runtime. So for a function that returns unit `()`, it will not be returning any value at all during execution.
+
+如[元组部分](./tuples.md)所述，这些元组“值”是虚拟的（virtual），且在运行时不存在。因此，对于返回单值 `()` 的函数，它在执行期间根本不会返回任何值。
+
+### Function body (函数体)
+
+A function's body is an expression block. The return value of the function is the last value in the sequence
+
+函数体是一个表达式块。函数的返回值是序列中最后一个表达式的值。
+
+```move=
+fun example(): u64 {
+    let x = 0;
+    x = x + 1;
+    x // returns 'x'
+}
+```
+
+See [the section below for more information on returns](#returning-values)
+
+请参阅[有关返回值的更多信息](#returning-values)
+
+For more information on expression blocks, see [Move variables](./variables.md).
+
+有关表达式块的更多信息，请参阅 [Move variables](./variables.md)。
+
+### Native Functions
+
+Some functions do not have a body specified, and instead have the body provided by the VM. These functions are marked `native`.
+
+Without modifying the VM source code, a programmer cannot add new native functions. Furthermore, it is the intent that `native` functions are used for either standard library code or for functionality needed for the given Move environment.
+
+Most `native` functions you will likely see are in standard library code such as `vecto
+
+有些函数没有函数体，而是由 Move VM 提供的函数体。这些函数被标记为 `native`。
+
+如果不修改 Move VM 源代码，程序员就无法添加新的 `native` 函数。此外，`native` 函数的意图是用于标准库代码或 Move 环境所需的基础功能。
+
+你看到的大多数 `native` 函数可能都在标准库代码中，例如 `vector`
+
+```move=
+module std::vector {
+    native public fun empty<Element>(): vector<Element>;
+    ...
+}
+```
+
+## 调用 (Calling)
+
+When calling a function, the name can be specified either through an alias or fully qualified
+
+调用函数时，名称可以通过别名或完全限定名指定
+
+```move=
+address 0x42 {
+    module example {
+        public fun zero(): u64 { 0 }
+    }
+}
+
+script {
+    use 0x42::example::{Self, zero};
+    fun call_zero() {
+        // With the `use` above all of these calls are equivalent
+        0x42::example::zero();
+        example::zero();
+        zero();
+    }
+}
+```
+
+When calling a function, an argument must be given for every parameter.
+
+调用函数时，每个参数必须指定一个值。
+
+```move=
+address 0x42 {
+    module example {
+        public fun takes_none(): u64 { 0 }
+        public fun takes_one(x: u64): u64 { x }
+        public fun takes_two(x: u64, y: u64): u64 { x + y }
+        public fun takes_three(x: u64, y: u64, z: u64): u64 { x + y + z }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::takes_none();
+        example::takes_one(0);
+        example::takes_two(0, 1);
+        example::takes_three(0, 1, 2);
+    }
+}
+```
+
+Type arguments can be either specified or inferred. Both calls are equivalent.
+
+函数的类型参数可以被指定或推断出来。以下两个调用是等价的。
+
+```move=
+address 0x42 {
+    module example {
+        public fun id<T>(x: T): T { x }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::id(0);
+        example::id<u64>(0);
+    }
+}
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [Move generics](./generics.md)。
+
+
+## Returning values (返回值)
+
+The result of a function, its "return value", is the final value of its function body. For example
+
+一个函数的结果，也就是它的“返回值”，是函数体的最后一个值。例如：
+
+```move=
+fun add(x: u64, y: u64): u64 {
+    x + y
+}
+```
+
+[As mentioned above](#function-body), the function's body is an [expression block](./variables.md). The expression block can sequence various statements, and the final expression in the block will be be the value of that block
+
+[如上所述](#function-body)，函数体是一个[表达式块](./variables.md)。表达式块中可以有各种各种语句，块中最后一个表达式将是该表达式块的值。
+
+```move=
+fun double_and_add(x: u64, y: u64): u64 {
+    let double_x = x * 2;
+    let double_y = y * 2;
+    double_x + double_y
+}
+```
+
+The return value here is `double_x + double_y`
+
+这里的返回值是 `double_x + double_y`
+
+###  `return` 表达式 (`return` expression)
+
+A function implicitly returns the value that its body evaluates to. However, functions can also use the explicit `return` expression:
+
+函数隐式返回其函数体计算的值。但是，函数也可以使用显式的 `return` 表达式：
+
+```move
+fun f1(): u64 { return 0 }
+fun f2(): u64 { 0 }
+```
+
+
+These two functions are equivalent. In this slightly more involved example, the function subtracts two `u64` values, but returns early with `0` if the second value is too large:
+
+这两个功能是等价的。在下面这个稍微复杂的示例中，该函数返回两个 `u64` 值相减的结果，但如果第二个值大于第一个值，则提前返回 `0` ：
+
+```move=
+fun safe_sub(x: u64, y: u64): u64 {
+    if (y > x) return 0;
+    x - y
+}
+```
+
+Note that the body of this function could also have been written as `if (y > x) 0 else x - y`.
+
+However `return` really shines is in exiting deep within other control flow constructs. In this example, the function iterates through a vector to find the index of a given value:
+
+请注意，这个函数的函数体也可以写成 `if (y > x) 0 else x - y`。
+
+然而，`return` 真正的亮点在于在其他控制流结构的深处退出。在此示例中，函数遍历数组以查找给定值的索引：
+
+```move=
+use std::vector;
+use std::option::{Self, Option};
+fun index_of<T>(v: &vector<T>, target: &T): Option<u64> {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        if (vector::borrow(v, i) == target) return option::some(i);
+        i = i + 1
+    };
+
+    option::none()
+}
+```
+
+Using `return` without an argument is shorthand for `return ()`. That is, the following two functions are equivalent:
+
+使用不带参数的 `return` 是 `return ()` 的简写。即以下两个函数是等价的：
+
+```move
+fun foo() { return }
+fun foo() { return () }
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/generics.md b/vendors/move/documentation/book/translations/move-book-zh/src/generics.md
new file mode 100644
index 000000000..c5553d269
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/generics.md
@@ -0,0 +1,422 @@
+# 泛型
+
+泛型可用于定义具有不同输入数据类型的函数和结构体。这种语言特性有时被称为*参数多态*（parametric polymorphism）。在 Move 中，我们经常将术语泛型与类型形参（type parameter）和类型实参（type argument）互换使用。*（有些书籍的中文翻译通常将 type parameter 和 type argument 不加以区别地翻译为“类型参数”，译者注）*
+
+泛型通常用于库（library）代码中，例如向量中，声明适用于任何可能的实例化（满足指定约束）的代码。在其他框架中，泛型代码有时可用多种不同的方式与全局存储进行交互，这些方式有着相同的实现。
+
+## 声明类型参数
+
+函数和结构体都可以在其签名中带上类型参数列表，由一对尖括号括起来 `<...>`。
+
+### 泛型函数
+
+函数的类型参数放在函数名称之后和（值）参数列表之前。以下代码定义了一个泛型标识函数，该函数接受任何类型的值并返回原值。
+
+```move
+fun id<T>(x: T): T {
+    // 此类型标注是不必要但有效的
+    (x: T)
+}
+```
+
+一旦定义，类型参数 `T` 就可以在参数类型、返回类型和函数体内使用。
+
+### 泛型结构体
+
+结构体的类型参数放在结构名称之后，可用于命名字段的类型。
+
+```move
+struct Foo<T> has copy, drop { x: T }
+
+struct Bar<T1, T2> has copy, drop {
+    x: T1,
+    y: vector<T2>,
+}
+```
+
+请注意，[未使用的类型参数](#未使用的类型参数)。
+
+## 类型实参
+
+### 调用泛型函数
+
+调用泛型函数时，可以在由一对尖括号括起来的列表中为函数的类型形参指定类型实参。
+
+```move
+fun foo() {
+    let x = id<bool>(true);
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 使用泛型结构体
+
+类似地，在构造或销毁泛型类型的值时，可以为结构体的类型参数附加一个类型实参列表。
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: true };
+    let Foo<bool> { x } = foo;
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 类型实参不匹配
+
+如果你指定类型实参并且它们与提供的实际值冲突，则会报错：
+
+```move
+fun foo() {
+    let x = id<u64>(true); // 错误！true 不是 u64
+}
+```
+
+同样地：
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: 0 }; // 错误！0 不是布尔值
+    let Foo<address> { x } = foo; // 错误！bool 与 address 不兼容
+}
+```
+
+## 类型推断
+
+在大多数情况下，Move 编译器能够推断类型实参，因此你不必显式地写下它们。如果我们省略类型实参，上面的例子会是这样的：
+
+```move
+fun foo() {
+    let x = id(true);
+    //        ^ 被推断为 <bool>
+
+    let foo = Foo { x: true };
+    //           ^ 被推断为 <bool>
+
+    let Foo { x } = foo;
+    //     ^ 被推断为 <bool>
+}
+```
+
+注意：当编译器无法推断类型时，你需要手动标注它们。一个常见的场景是调用一个函数，其类型参数只出现在返回位置。
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        // let v = vector::new();
+        //                    ^ 编译器无法确定元素类型。
+
+        let v = vector::new<u64>();
+        //                 ^~~~~ 必须手动标注。
+    }
+}
+}
+```
+
+但是，如果稍后在该函数中使用该返回值，编译器将能够推断其类型：
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        let v = vector::new();
+        //                 ^ 被推断为 <u64>
+        vector::push_back(&mut v, 42);
+    }
+}
+}
+```
+
+## 未使用的类型参数
+
+对于结构体定义，未使用的类型参数是没有出现在结构体定义的任何字段中，但在编译时静态检查的类型参数。Move 允许未使用的类型参数，因此以下结构体定义有效：
+
+```move
+struct Foo<T> {
+    foo: u64
+}
+```
+
+这在对某些概念建模时会很方便。这是一个例子：
+
+```move
+address 0x2 {
+module m {
+    // 货币说明符
+    struct Currency1 {}
+    struct Currency2 {}
+
+    // 可以使用货币说明符类型实例化的泛型钱币类型。
+    // 例如 Coin<Currency1>, Coin<Currency2> 等。
+    struct Coin<Currency> has store {
+        value: u64
+    }
+
+    // 泛型地编写有关所有货币的代码
+    public fun mint_generic<Currency>(value: u64): Coin<Currency> {
+        Coin { value }
+    }
+
+    // 具体编写关于一种货币的代码
+    public fun mint_concrete(value: u64): Coin<Currency1> {
+        Coin { value }
+    }
+}
+}
+```
+
+在此示例中，`struct Coin<Currency>` 是类型参数为 `Currency` 的泛型结构体，该参数指定钱币的货币（类型），并允许将代码泛型地写入任何货币或具体地写入特定货币。即使 `Currency` 类型参数未出现在 `Coin` 中定义的任何字段中，这种通用性也适用。
+
+### 虚类型参数
+
+在上面的例子中，虽然 `struct Coin` 要求有 `store` 能力，但 `Coin<Currency1>` 和 `Coin<Currency2>` 都没有 `store` 能力。这实际是因为[条件能力与泛型类型](./abilities.md#条件能力与泛型类型)的规则以及 `Currency1` 和 `Currency2` 没有 `store` 能力，尽管它们甚至没有在 `struct Coin` 的结构体中使用。这可能会导致一些不合意的后果。例如，我们无法将 `Coin<Currency1>` 放入全局存储中的钱包。
+
+一种可能的解决方案是向 `Currency1` 和 `Currency2` 添加伪能力（spurious ability）标注（例如：`struct Currency1 has store {}`）。但是，这可能会导致错误（bug）或安全漏洞，因为它削弱了类型，引入了不必要的能力声明。例如，我们永远不会期望全局存储中的资源有一个类型为 `Currency1` 的字段，但是通过伪 `store` 能力这是有可能的。此外，伪标注具有传染性，需要在许多未使用类型参数的泛型函数上也包含必要的约束。
+
+虚类型（phantom type）参数解决了这个问题。未使用的类型参数可以标记为 *phantom* 类型参数，不参与结构体的能力推导。这样，在派生泛型类型的能力时，不考虑虚类型参数的实参，从而避免了对伪能力标注的需要。为了使这个宽松的规则合理，Move 的类型系统保证声明为 `phantom` 的参数要么在结构体定义根本不使用，要么仅用作声明为 `phantom` 的类型参数的实参。
+
+#### 声明
+
+在结构定义中，可以通过在声明前添加 `phantom` 关键字来将类型参数声明为 phantom。如果一个类型参数被声明为 phantom，我们就说它是一个虚类型参数。在定义结构时，Move 的类型检查器确保每个虚类型参数要么未在结构定义中使用，要么仅用作虚类型参数的实参。
+
+更正式地说，如果一个类型被用作虚类型参数的实参，我们说该类型出现在_虚位置_。有了这个定义，正确使用虚参数的规则可以指定如下：**虚类型参数只能出现在虚位置**。
+
+以下两个示例显示了虚参数的合法使用。在第一个中，结构定义中根本没有使用参数 `T1`。在第二个中，参数 `T1` 仅用作虚类型参数的实参。
+
+```move
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 没有出现在结构定义中
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 出现在虚位置
+```
+
+以下代码展示违反规则的示例：
+
+```move
+struct S1<phantom T> { f: T }
+                          ^
+                          错误：不是虚位置
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             错误：不是虚位置
+```
+
+#### 实例化
+
+实例化结构时，在派生结构能力时排除虚参数的实参。例如，考虑以下代码：
+
+```move
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+现在考虑类型 `S<HasCopy, NoCopy>`。因为 `S` 是用 `copy` 定义的，并且所有非虚参数都有 copy 能力，所以 `S<HasCopy, NoCopy>` 也有 copy 能力。
+
+#### 具有能力约束的虚类型参数
+
+能力约束和虚类型参数是正交特征，虚参数可以用能力约束来声明。当实例化具有能力约束的虚类型参数时，类型实参必须满足该约束，即使该参数是虚的（phantom）。例如，以下定义是完全有效的：
+
+```move
+struct S<phantom T: copy> {}
+```
+
+通常用来限制应用并且 `T` 只能用具有 `copy` 的实参实例化。
+
+## 约束
+
+在上面的示例中，我们演示了如何使用类型参数来定义稍后可以由调用者插入的“未知”类型。然而，这意味着类型系统几乎没有关于类型的信息，并且必须以非常保守的方式执行检查。在某种意义上，类型系统必须为不受约束的泛型假设最坏的情况。简单地说，默认泛型类型参数没有[能力](./abilities.md)。
+
+这就是约束发挥作用的地方：它们提供了一种方法来指定这些未知类型具有哪些属性，以便类型系统可以允许在其他情况下不安全的操作。
+
+### 声明约束
+
+可以使用以下语法对类型参数施加约束。
+
+```move
+// T 是类型参数的名称
+T: <ability> (+ <ability>)*
+```
+
+`<ability>` 可以是四种[能力](./abilities.md)中的任何一种，一个类型参数可以同时被多种能力约束。因此，以下所有内容都是有效的类型参数声明：
+
+```move
+T: copy
+T: copy + drop
+T: copy + drop + store + key
+```
+
+### 验证约束
+
+在调用点检查约束，所以下面的代码不会编译。
+
+```move
+struct Foo<T: key> { x: T }
+
+struct Bar { x: Foo<u8> }
+//                  ^ 错误！u8 没有 'key'
+
+struct Baz<T> { x: Foo<T> }
+//                     ^ 错误！ t 没有 'key'
+```
+
+```move
+struct R {}
+
+fun unsafe_consume<T>(x: T) {
+    // 错误！x 没有 'drop'
+}
+
+fun consume<T: drop>(x: T) {
+    // 合法！
+    // x 会被自动删除
+}
+
+fun foo() {
+    let r = R {};
+    consume<R>(r);
+    //      ^ 错误！r 没有 'drop'
+}
+```
+
+```move
+struct R {}
+
+fun unsafe_double<T>(x: T) {
+    (copy x, x)
+    // 错误！x 没有 'copy'
+}
+
+fun double<T: copy>(x: T) {
+    (copy x, x) // 合法！
+}
+
+fun foo(): (R, R) {
+    let r = R {};
+    double<R>(r)
+    //     ^ 错误！R 没有 'error'
+}
+```
+
+有关详细信息，请参阅有关[条件能力与泛型类型](./abilities.md#conditional-abilities-and-generic-types)。
+
+## 递归的限制
+
+### 递归结构体
+
+泛型结构不能直接或间接包含相同类型的字段，即使具有不同类型的参数也是如此。以下所有结构定义均无效：
+
+```move
+struct Foo<T> {
+    x: Foo<u64> // 错误！'Foo' 包含 'Foo'
+}
+
+struct Bar<T> {
+    x: Bar<T> // 错误！'Bar' 包含 'Bar'
+}
+
+// 错误！'A' 和 'B' 形成一个循环，这也是不允许的。
+struct A<T> {
+    x: B<T, u64>
+}
+
+struct B<T1, T2> {
+    x: A<T1>
+    y: A<T2>
+}
+```
+
+### 高级主题：类型级递归
+
+Move 允许递归调用泛型函数。然而，当与泛型结构体结合使用时，在某些情况下这可能会创建无限数量的类型，这意味着会给编译器、虚拟机（mv）和其他语言组件增加不必要的复杂性。因此，这样的递归是被禁止的。
+
+被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<T> -> foo<T> -> ... is valid
+    fun foo<T>() {
+        foo<T>();
+    }
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<A<u64>> -> foo<A<u64>> -> ... is valid
+    fun foo<T>() {
+        foo<A<u64>>();
+    }
+}
+}
+```
+
+不被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T> -> foo<A<T>> -> foo<A<A<T>>> -> ...
+    fun foo<T>() {
+        foo<Foo<T>>();
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module n {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T1, T2> -> bar<T2, T1> -> foo<T2, A<T1>>
+    //   -> bar<A<T1>, T2> -> foo<A<T1>, A<T2>>
+    //   -> bar<A<T2>, A<T1>> -> foo<A<T2>, A<A<T1>>>
+    //   -> ...
+    fun foo<T1, T2>() {
+        bar<T2, T1>();
+    }
+
+    fun bar<T1, T2> {
+        foo<T1, A<T2>>();
+    }
+}
+}
+```
+
+请注意，类型级递归的检查基于对调用点的保守分析，所以不考虑控制流或运行时值。
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    fun foo<T>(n: u64) {
+        if (n > 0) {
+            foo<A<T>>(n - 1);
+        };
+    }
+}
+}
+```
+
+上面示例中的函数在技术上将终止任何给定的输入，因此只会创建有限多种类型，但它仍然被 Move 的类型系统视为无效的。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-operators.md b/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-operators.md
new file mode 100644
index 000000000..d31b2959f
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-operators.md
@@ -0,0 +1,312 @@
+# 全局存储 - 操作（Global Storage - Operators）
+
+Move programs can create, delete, and update [resources](./structs-and-resources.md) in global storage using the following five instructions:
+
+Move程序可以使用下面五种指令创建、删除、更新全局存储中的[资源](./structs-and-resources.md)：
+
+| Operation                              | Description                                                     | Aborts?                                 |
+---------------------------------------- |---------------------------------------------------------------- |---------------------------------------- |
+|`move_to<T>(&signer,T)`                 | Publish `T` under `signer.address`                              | If `signer.address` already holds a `T` |
+|`move_from<T>(address): T`              | Remove `T` from `address` and return it                         | If `address` does not hold a `T`        |
+|`borrow_global_mut<T>(address): &mut T` | Return a mutable reference to the `T` stored under `address`    | If `address` does not hold a `T`        |
+|`borrow_global<T>(address): &T`         | Return an immutable reference to the `T` stored under `address` | If `address` does not hold a `T`        |
+|`exists<T>(address): bool`              | Return `true` if a `T` is stored under `address`                |  Never
+
+| 操作符                                 | 描述                                                   | 出错                           |
+---------------------------------------- |------------------------------------------------------ |---------------------------------- |
+|`move_to<T>(&signer,T)`                 | 在 `signer.address` 下发布 `T`                         | 如果 `signer.address` 已经存在 `T` |
+|`move_from<T>(address): T`              | 从 `address` 下删除 `T` 并返回                         | 如果 `address` 下没有 `T`           |
+|`borrow_global_mut<T>(address): &mut T` | 返回 `address` 下 `T` 的可变引用 mutable reference      | 如果 `address` 下没有 `T`          |
+|`borrow_global<T>(address): &T`         | 返回 `address` 下 `T` 的不可变引用 immutable reference  | 如果 `address` 下没有 `T`          |
+|`exists<T>(address): bool`              | 返回 `address` 下的 `T`                                | 永远不会                           |
+                            |
+
+Each of these instructions is parameterized by a type `T` with the [`key` ability](./abilities.md). However, each type `T` *must be declared in the current module*. This ensures that a resource can only be manipulated via the API exposed by its defining module. The instructions also take either an [`address`](./address.md) or [`&signer`](./signer.md) representing the account address where the resource of type `T` is stored.
+
+每个指令的参数 `T` 都具有 [`key` 能力](./abilities.md)。然而，类型 `T` *必须在当前模块*中声明。这确保资源只能通过当前模块暴露的 API 来操作。指令在存储 `T` 类型资源的同时，使用 [`address`](./address.md) 或 [`&signer`](./signer.md) 表示账户地址。
+
+
+## 资源参考（References to resources）
+
+References to global resources returned by `borrow_global` or `borrow_global_mut` mostly behave like references to local storage: they can be extended, read, and written using ordinary [reference operators](./references.md) and passed as arguments to other function. However, there is one important difference between local and global references: **a function cannot return a reference that points into global storage**. For example, these two functions will each fail to compile:
+
+`borrow_global` 或 `borrow_global_mut` 指令返回的全局资源引用在大多数情况下类似本地存储的引用：它们可以通过[引用操作](./references.md)进行拓展、读和写，也可以作为其它函数的参数。然而本地引用和全局引用有个重要差异：**函数不能返回指向全局存储的引用**。例如，下面两个函数编译会失败：
+
+
+```move
+struct R has key { f: u64 }
+// 不能编译 // will not compile
+fun ret_direct_resource_ref_bad(a: address): &R {
+    borrow_global<R>(a) // error!
+}
+// 也不能编译 // also will not compile
+fun ret_resource_field_ref_bad(a: address): &u64 {
+    &borrow_global<R>(a).f // error!
+}
+```
+
+Move must enforce this restriction to guarantee absence of dangling references to global storage. [This](#reference-safety-for-global-resources) section contains much more detail for the interested reader.
+
+Move必须强制这种限制来保证全局存储引用不会出现空引用。对于感兴趣的读者，[此节](#全局资源引用安全)包含了更多的细节。
+
+
+## 使用泛型的全局存储操作（Global storage operators with generics）
+
+Global storage operations can be applied to generic resources with both instantiated and uninstantiated generic type parameters:
+
+全局存储操作可以与实例化和未实例化的泛型资源参数使用：
+
+
+```move
+struct Container<T> has key { t: T }
+
+/// 发布用于存储调用者提供 T 类型对象的 Container /// Publish a Container storing a type T of the caller's choosing
+fun publish_generic_container<T>(account: &signer, t: T) {
+    move_to<Container<T>>(account, Container { t })
+}
+
+/// 发布存储 u64 类型的 Container /// Publish a container storing a u64
+fun publish_instantiated_generic_container(account: &signer, t: u64) {
+    move_to<Container<u64>>(account, Container { t })
+}
+```
+
+The ability to index into global storage via a type parameter chosen at runtime is a powerful Move feature known as *storage polymorphism*. For more on the design patterns enabled by this feature, see [Move generics](./generics.md).
+
+能够通过参数类型在运行时中索引全局存储的能力是 Move 的强大特性，该特性称之为*存储多态性*。关于此特性更多的设计模式，请参考[Move泛型](./generics.md)这节。
+
+## 示例： `Counter` （Example: `Counter`）
+
+The simple `Counter` module below exercises each of the five global storage operators. The API exposed by this module allows:
+
+- Anyone to publish a `Counter` resource under their account
+- Anyone to check if a `Counter` exists under any address
+- Anyone to read or increment the value of a `Counter` resource under any address
+- An account that stores a `Counter` resource to reset it to zero
+- An account that stores a `Counter` resource to remove and delete it
+
+下面简单的 `Counter` 模块使用五种全局存储操作。该模块暴露的API允许：
+
+- 任何人可以在他们的账户下发布 `Counter` 资源。
+- 任何人可以检查任何地址下是否包含 `Counter`。
+- 任何人可以读或增加任何地址下的 `Counter` 值。
+- 存储 `Counter` 资源的账号可以将其重置为 0。
+- 存储 `Counter` 资源的账号可以删除该对象。
+
+```move
+address 0x42 {
+module counter {
+    use std::signer;
+
+    /// 包含整数的资源 /// Resource that wraps an integer counter
+    struct Counter has key { i: u64 }
+
+    /// 给定账户下发布带有 `i` 值的 `Counter` 资源 /// Publish a `Counter` resource with value `i` under the given `account`
+    public fun publish(account: &signer, i: u64) {
+      // “打包"（创建）Counter 资源。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Pack" (create) a Counter resource. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+      move_to(account, Counter { i })
+    }
+
+    /// 读取 `addr` 地址下 `Counter` 内的值 /// Read the value in the `Counter` resource stored at `addr`
+    public fun get_count(addr: address): u64 acquires Counter {
+        borrow_global<Counter>(addr).i
+    }
+
+    /// 增加 `addr` 地址下 `Counter` 内的值 /// Increment the value of `addr`'s `Counter` resource
+    public fun increment(addr: address) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(addr).i;
+        *c_ref = *c_ref + 1
+    }
+
+    /// 将 `account` 的 `Counter` 重置为 0 /// Reset the value of `account`'s `Counter` to 0
+    public fun reset(account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(signer::address_of(account)).i;
+        *c_ref = 0
+    }
+
+    /// 删除 `account` 的 `Counter` 资源并返回其内值 /// Delete the `Counter` resource under `account` and return its value
+    public fun delete(account: &signer): u64 acquires Counter {
+        // 删除 Counter 资源 // remove the Counter resource
+        let c = move_from<Counter>(signer::address_of(account));
+        // 将 `Counter` 资源“拆”为字段。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Unpack" the `Counter` resource into its fields. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+        let Counter { i } = c;
+        i
+    }
+
+    /// 如果 `addr` 下包含 `Counter` 资源，则返回 `true`。 /// Return `true` if `addr` contains a `Counter` resource
+    public fun exists(addr: address): bool {
+        exists<Counter>(addr)
+    }
+}
+}
+```
+
+## `acquires` 函数标注（Annotating functions with `acquires`）
+
+In the `counter` example, you might have noticed that the `get_count`, `increment`, `reset`, and `delete` functions are annotated with `acquires Counter`. A Move function `m::f` must be annotated with `acquires T` if and only if:
+
+- The body of `m::f` contains a `move_from<T>`, `borrow_global_mut<T>`, or `borrow_global<T>` instruction, or
+- The body of `m::f` invokes a function `m::g` declared in the same module that is annotated with `acquires`
+
+在 `counter` 例子中，可以注意到 `get_count`、`increment`、`reset` 和 `delete` 方法都使用 `acquires Counter` 进行标注。函数 `m::f` 在且仅在下述情况必须使用 `acquires T` 进行标注：
+
+- `m::f` 的主体包含 `move_from<T>`、`borrow_global_mut<T>` 或 `borrow_global<T>` 指令调用
+- `m::f` 的主体调用了同模块内被 `acquires` 注解的 `m::g` 的函数
+
+For example, the following function inside `Counter` would need an `acquires` annotation:
+
+例如，下面 `Counter` 内的函数需要使用 `acquires` 标注：
+
+```move
+// 由于 `increment` 使用了 `acquires` 标注，所以函数需要 `acquires` // Needs `acquires` because `increment` is annotated with `acquires`
+fun call_increment(addr: address): u64 acquires Counter {
+    counter::increment(addr)
+}
+```
+
+However, the same function *outside* `Counter` would not need an annotation:
+
+然而，在 `Counter` *外面*的函数则不需要进行标注：
+
+
+```move
+address 0x43 {
+module m {
+   use 0x42::counter;
+
+   // 可以，仅在函数声明在同一模块内时需要标注 // Ok. Only need annotation when resource acquired by callee is declared in the same module
+   fun call_increment(addr: address): u64 {
+       counter::increment(addr)
+   }
+}
+}
+```
+
+If a function touches multiple resources, it needs multiple `acquires`:
+
+如果函数需要多个资源，`acquires` 则需要多个参数：
+
+```move=
+address 0x42 {
+module two_resources {
+    struct R1 has key { f: u64 }
+    struct R2 has key { g: u64 }
+
+    fun double_acquires(a: address): u64 acquires R1, R2 {
+        borrow_global<R1>(a).f + borrow_global<R2>.g
+    }
+}
+}
+```
+
+The `acquires` annotation does not take generic type parameters into account:
+
+`acquires` 标注不会将泛型类型参数纳入声明中：
+
+
+```move=
+address 0x42 {
+module m {
+    struct R<T> has key { t: T }
+
+    // 效果为 `acquires R` 而不是 `acquires R<T>` // `acquires R`, not `acquires R<T>`
+    fun acquire_generic_resource<T: store>(a: addr) acquires R {
+        let _ = borrow_global<R<T>>(a);
+    }
+
+    // 效果为 `acquires R` 而不是 `acquiresR<u64>` // `acquires R`, not `acquires R<u64>
+    fun acquire_instantiated_generic_resource(a: addr) acquires R {
+        let _ = borrow_global<R<u64>>(a);
+    }
+}
+}
+```
+
+Finally: redundant `acquires` are not allowed. Adding this function inside `Counter` will result in a compilation error:
+
+最后：不允许使用不必要的 `acquires`。在 `Counter` 内添加下述方法将会导致编译错误：
+
+
+```move
+// 下面代码不会编译，因为函数体没有使用全局存储指令也没调用使用 `acquires` 注解的函数 // This code will not compile because the body of the function does not use a global storage instruction or invoke a function with `acquires`
+fun redundant_acquires_bad() acquires Counter {}
+```
+
+For more information on `acquires`, see [Move functions](./functions.md).
+
+关于 `acquires` 更多信息，参见 [Move 函数](./functions.md)。
+
+## 全局资源引用安全（Reference Safety For Global Resources）
+
+Move prohibits returning global references and requires the `acquires` annotation to prevent dangling references. This allows Move to live up to its promise of static reference safety (i.e., no dangling references, no `null` or `nil` dereferences) for all [reference](./references.md) types.
+
+Move 禁止返回全局引用并且需要使用 `acquires` 标注来防止空引用。这使 Move 保证了所有[引用](./references.md)类型的静态引用安全性（例如，没有空引用、不会解引用 `null` 或 `nil` 对象）。
+
+This example illustrates how the Move type system uses `acquires` to prevent a dangling reference:
+
+这个例子展示了 Move 类型系统如何通过使用 `acquires` 来防止空引用：
+
+```move=
+address 0x42 {
+module dangling {
+    struct T has key { f: u64 }
+
+    fun borrow_then_remove_bad(a: address) acquires T {
+        let t_ref: &mut T = borrow_global_mut<T>(a);
+        let t = remove_t(a); // 类型系统不允许 t_ref 这种空引用 // type system complains here
+        // t_ref now dangling!
+        let uh_oh = *&t_ref.f
+    }
+
+    fun remove_t(a: address): T acquires T {
+        move_from<T>(a)
+    }
+
+}
+}
+```
+
+In this code, line 6 acquires a reference to the `T` stored at address `a` in global storage. The callee `remove_t` then removes the value, which makes `t_ref` a dangling reference.
+
+代码中第六行获取了 `a` 地址在全局存储中 `T` 类型资源的引用。`remove_t` 调用删除了该值，使 `t_ref` 变成空引用。
+
+
+Fortunately, this cannot happen because the type system will reject this program. The `acquires` annotation on `remove_t` lets the type system know that line 7 is dangerous, without having to recheck or introspect the body of `remove_t` separately!
+
+幸运的是，由于类型系统拒绝编译程序导致这种情况不会发生。`remove_t` 方法的 `acquires` 标注让类型系统知道第七行是危险的，不需要再分析 `remove_t` 的函数体。
+
+The restriction on returning global references prevents a similar, but even more insidious problem:
+
+禁止返回全局引用的限制同时也防止了类似却更隐晦的问题：
+
+```move=
+address 0x42 {
+module m1 {
+    struct T has key {}
+
+    public fun ret_t_ref(a: address): &T acquires T {
+        borrow_global<T>(a) // 报错 类型系统在这不能继续编译 // error! type system complains here
+    }
+
+    public fun remove_t(a: address) acquires T {
+        let T {} = move_from<T>(a);
+    }
+}
+
+module m2 {
+    fun borrow_then_remove_bad(a: address) {
+        let t_ref = m1::ret_t_ref(a);
+        let t = m1::remove_t(a); // t_ref 为空引用 // t_ref now dangling!
+    }
+}
+}
+```
+
+Line 16 acquires a reference to a global resource `m1::T`, then line 17 removes that same resource, which makes `t_ref` dangle. In this case, `acquires` annotations do not help us because the `borrow_then_remove_bad` function is outside of the `m1` module that declares `T` (recall that `acquires` annotations can only be used for resources declared in the current module). Instead, the type system avoids this problem by preventing the return of a global reference at line 6.
+
+第十六行获取了全局资源 `m1::T` 类型的引用，然后第十七行删除了同一资源，这使 `t_ref` 变成空引用。在这个例子中，`acquires` 标注没有帮助到我们，因为 `borrow_then_remove_bad` 函数在声明了 `T` 类型（回顾 `acquires` 标注只用在声明此类型的模块内）的 `m1` 模块外。然而禁止返回全局引用的规则使第六行避免了这个问题。
+
+
+Fancier type systems that would allow returning global references without sacrificing reference safety are possible, and we may consider them in future iterations of Move. We chose the current design because it strikes a good balance between expressivity, annotation burden, and type system complexity.
+
+允许返回全局引用而尽可能不牺牲引用安全的高级类型系统是可行的，我们将会在 Move 未来的迭代过程中考虑此事。我们选择目前的设计方式是因为它很好的平衡了语言表现力、复杂的标注和复杂的类型系统三者的关系。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-structure.md b/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-structure.md
new file mode 100644
index 000000000..763d253d5
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/global-storage-structure.md
@@ -0,0 +1,14 @@
+# 全局存储 —— 结构
+
+Move 程序的目的是[读取和写入](./global-storage-operators.md)树形的持久全局存储。程序不能访问文件系统、网络或任何此树以外的数据。
+
+在伪代码中，全局存储看起来像：
+
+```move
+struct GlobalStorage {
+  resources: Map<(address, ResourceType), ResourceValue>
+  modules: Map<(address, ModuleName), ModuleBytecode>
+}
+```
+
+从结构上讲，全局存储是一个[森林（forest）](https://en.wikipedia.org/wiki/Tree_(graph_theory))，这个森林由以账户[地址（`address`）](./address.md)为根的树组成。每个地址可以存储[资源（resource）](./structs-and-resources.md)数据和[模块（module）](./modules-and-scripts.md)代码。如上面的伪代码所示，每个地址（`address`）最多可以存储一个给定类型的资源值，最多可以存储一个给定名称的模块。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/integers.md b/vendors/move/documentation/book/translations/move-book-zh/src/integers.md
new file mode 100644
index 000000000..a1a70430b
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/integers.md
@@ -0,0 +1,214 @@
+# 整数 (Integers)
+
+Move supports three unsigned integer types: `u8`, `u64`, and `u128`. Values of these types range from 0 to a maximum that depends on the size of the type.
+
+| Type                             | Value Range              |
+| -------------------------------- | ------------------------ |
+| Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+Move 支持三种无符号整数类型：`u8`、`u64` 和 `u128`。这些类型的值范围从 0 到最大值，最大值的具体取值取决于整数类型。
+
+| 类型                      | 取值范围                 |
+|---------------------------|--------------------------|
+| 无符号 8位 整数, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| 无符号 64位 整数, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| 无符号 128位 整数, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+## 字面值(Literal)
+
+Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
+
+If a literal is too large for its specified (or inferred) size range, an error is reported.
+
+(在Move中)这些类型的字面值指定为数字序列(例如：112)或十六进制文字(例如：0xFF), 可以选择将字面值的类型定义为后缀, 例如 `112u8`。如果未指定类型，编译器将尝试从使用字面值的上下文推断类型。如果无法推断类型，则默认为 `u64。
+
+如果字面值太大，超出其指定的(或推断的)大小范围，则会报错。
+
+### 例如：
+
+```jsx
+// literals with explicit annotations;
+let explicit_u8 = 1u8;
+let explicit_u64 = 2u64;
+let explicit_u128 = 3u128;
+
+// literals with simple inference
+let simple_u8: u8 = 1;
+let simple_u64: u64 = 2;
+let simple_u128: u128 = 3;
+
+// literals with more complex inference
+let complex_u8 = 1; // inferred: u8
+// right hand argument to shift must be u8
+let _unused = 10 << complex_u8;
+
+let x: u8 = 0;
+let complex_u8 = 2; // inferred: u8
+// arguments to `+` must have the same type
+let _unused = x + complex_u8;
+
+let complex_u128 = 3; // inferred: u128
+// inferred from function argument type
+function_that_takes_u128(complex_u128);
+
+// literals can be written in hex
+let hex_u8: u8 = 0x1;
+let hex_u64: u64 = 0xCAFE;
+let hex_u128: u128 = 0xDEADBEEF;
+```
+
+## 运算集 (Operations)
+
+### 算术运算 (Arithmetic)
+
+Each of these types supports the same set of checked arithmetic operations. For all of these operations, both arguments (the left and right side operands) must be of the same type. If you need to operate over values of different types, you will need to first perform a cast. Similarly, if you expect the result of the operation to be too large for the integer type, perform a cast to a larger size before performing the operation.
+
+每一种(无符号整数)类型都支持相同算术运算集。对于所有这些运算，两个参数(左侧和右侧操作数)必须是同一类型。如果您需要对不同类型的值进行运算，则需要首先执行强制转换。同样，如果您预计运算结果对于当下整数类型来说太大，请在执行运算之前将之转换为更大的整数类型。
+
+All arithmetic operations abort instead of behaving in a way that mathematical integers would not (e.g., overflow, underflow, divide-by-zero).
+
+| Syntax | Operation           | Aborts If                                |
+| ------ | ------------------- | ---------------------------------------- |
+| `+`    | addition            | Result is too large for the integer type |
+| `-`    | subtraction         | Result is less than zero                 |
+| `*`    | multiplication      | Result is too large for the integer type |
+| `%`    | modular division    | The divisor is `0`                       |
+| `/`    | truncating division | The divisor is `0`                       |
+
+### [Bitwise](https://move-language.github.io/move/integers.html#bitwise)
+
+算术运算在遇到异常时将会中止，而不是以上溢、下溢、被零除等数学整数未定义的的方式输出结果。
+
+| 句法 | 操作           | 中止条件                                |
+| ------ | ------------| ---------------------------------------- |
+| `+`    | 加法         | 结果对于整数类型来说太大了 |
+| `-`    | 减法         | 结果小于零                 |
+| `*`    | 乘法         | 结果对于整数类型来说太大了 |
+| `%`    | 取余运算     | 除数为 `0`                       |
+| `/`    | 截断除法     | 除数为 `0`                       |
+
+### 位运算 (Bitwise)
+
+The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
+
+Bitwise operations do not abort.
+
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
+
+整数类型支持下列位运算，即将每个数字视为一系列单独的位：0 或 1，而不是整型数值。
+
+位运算不会中止。
+
+| 语法                | 操作符   | 描述                       |
+|---------------------|----------|----------------------------|
+| `&`                 | 按位和   | 对每个位成对执行布尔值和   |
+| <code>&#124;</code> | 按位或   | 对每个位成对执行布尔值或   |
+| `^`                 | 按位异或 | 对每个位成对执行布尔值异或 |
+
+### 位移 (Bit shift)
+
+Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
+
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `64`, or `128` for `u8`, `u64`, and `u128` respectively.
+
+| Syntax | Operation   | Aborts if                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | shift left  | Number of bits to shift by is greater than the size of the integer type |
+| `>>`   | shift right | Number of bits to shift by is greater than the size of the integer type |
+
+与按位运算类似，每种整数类型都支持位移(bit shifts)。但与其他运算不同的是，右侧操作数(要移位多少位)必须始终是 `u8`  并且不需要与左侧操作数类型(您要移位的数字)匹配。
+
+如果要移位的位数分别大于或等于 `8`、`64`, `u128` 或 `128` 的 `u8`, `u64`, 则移位可以中止。
+
+| 句法 | 操作   | 中止条件                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | 左移  | 要移位的位数大于整数类型的大小 |
+| `>>`   | 右移 | 要移位的位数大于整数类型的大小 |
+
+### 比较运算 (Comparisons)
+
+Integer types are the *only* types in Move that can use the comparison operators. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Comparison operations do not abort.
+
+| Syntax | Operation                |
+| ------ | ------------------------ |
+| `<`    | less than                |
+| `>`    | greater than             |
+| `<=`   | less than or equal to    |
+| `>=`   | greater than or equal to |
+
+整数类型是 Move 中唯一可以使用比较(Comparisons)运算符的类型。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+比较操作不会中止。
+
+| 句法 | 操作                |
+| ------ | ------------------------ |
+| `<`    | 小于                |
+| `>`    | 大于             |
+| `<=`   | 小于等于    |
+| `>=`   | 大于等于 |
+
+###  相等 (Equality)
+
+Like all types with [`drop`](https://move-language.github.io/move/abilities.html) in Move, all integer types support the ["equal"](https://move-language.github.io/move/equality.html) and ["not equal"](https://move-language.github.io/move/equality.html) operations. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Equality operations do not abort.
+
+| Syntax | Operation |
+| ------ | --------- |
+| `==`   | equal     |
+| `!=`   | not equal |
+
+For more details see the section on [equality](https://move-language.github.io/move/equality.html)
+
+与 Move 中的所有具有[`drop`](./chapter_19_abilities.html)能力的类型一样，所有整数类型都支持 ["equal(等于)"](./chapter_11_equality.html) 和 ["not equal(不等于)](./chapter_11_equality.html)运算。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+相等(Equality)运算不会中止。
+
+| 句法 | 操作 |
+| ------ | --------- |
+| `==`   | 等于     |
+| `!=`   | 不等于 |
+
+更多细节可以参考[相等]([equality](https://move-language.github.io/move/equality.html))章节。
+
+## 转换 (Casting)
+
+Integer types of one size can be cast to integer types of another size. Integers are the only types in Move that support casting.
+
+Casts *do not* truncate. Casting will abort if the result is too large for the specified type
+
+| Syntax     | Operation                                            | Aborts if                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T` |
+
+Here, the type of `e` must be `u8`, `u64`, or `u128` and `T` must be `u8`, `u64`, or `u128`.
+
+For example:
+
+- `(x as u8)`
+- `(2u8 as u64)`
+- `(1 + 3 as u128)`
+
+一种大小的整数类型可以转换为另一种大小的整数类型。整数是 Move 中唯一支持强制转换的类型。
+
+强制转换不会截断。如果结果对于指定类型来说太大，则转换将中止。
+
+| Syntax     | 操作                                            | 中止条件                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | 将整数表达式 `e` 转换为整数类型 `T` | `e` 太大而不能表示为 `T` |
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, integer values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](https://move-language.github.io/move/variables.html#move-and-copy).
+
+与语言内置的其他标量值一样，整数值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/introduction.md b/vendors/move/documentation/book/translations/move-book-zh/src/introduction.md
new file mode 100644
index 000000000..5e3ea6f79
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/introduction.md
@@ -0,0 +1,47 @@
+# 引言 (Introduction)
+
+Welcome to Move, a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. Move allows developers to write programs that flexibly manage and transfer assets, while providing the security and protections against attacks on those assets. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+欢迎来到Move的世界，Move是一种安全、沙盒式和形式化验证的下一代编程语言，它的第一个用例是 Diem 区块链(当时名字叫Libra, 脸书团队开发的项目, 译者注), Move 为其实现提供了基础。 Move 允许开发人员编写灵活管理和转移数字资产的程序，同时提供安全保护，防止对那些链上资产的攻击。不仅如此，Move 也可用于区块链世界之外的开发场景。
+
+Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource types with move (hence the name) semantics as an explicit representation of digital assets, such as currency.
+
+Move 的诞生从[Rust](https://www.rust-lang.org/)中吸取了灵感，Move也是因为使用具有移动(move)语义的资源类型作为数字资产(例如货币)的显式表示而得名。
+
+## Move是为谁准备的？(Who is Move for?)
+
+Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
+
+Move语言被设计和创建为安全、可验证， 同时兼顾灵活性的编程语言。Move的第一个应用场景是用于Diem区块链的开发。现在，Move语言仍在不断发展中。Move 还有成为其他区块链，甚至非区块链用例开发语言的潜质。
+
+Given custom Move modules will not be supported at the [launch](https://diem.com/white-paper/#whats-next) of the Diem Payment Network (DPN), we are targeting an early Move Developer persona.
+
+鉴于在 Diem 支付网络 (DPN) [启动](https://diem.com/white-paper/#whats-next)时将不支持自定义 Move 模块(custom Move modules)，我们的目标是早期的 Move 开发人员。
+
+The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
+
+早期的 Move 开发人员应该是具有一定编程经验的程序员，他们愿意了解编程语言核心，并探索它的用法。
+
+### 爱好者 (Hobbyists)
+
+Understanding that the capability to create custom modules on the Diem Payment Network will not be available at launch, the hobbyist Move Developer is interested in learning the intricacies of the language. She will understand the basic syntax, the standard libraries available, and write example code that can be executed using the Move CLI. The Move Developer may even want to dig into understanding how the Move Virtual Machine executes the code she writes.
+
+作为(Move语言)爱好者角色，首先需要明白在Diem支付网络上创建自定义模块(custom modules)是不可能的，其次，你还要对探索这门语言的复杂性保持兴趣。你将了解基本语法、可用的标准库，并编写可以用的Move CLI执行的示例代码。如果可能，你甚至可以去尝试体验Move虚拟机如何执行你自己编写的代码。
+
+### 核心贡献者 (Core Contributor)
+
+Beyond a hobbyist wanting to stay ahead of the curve for the core programming language is someone who may want to [contribute](https://diem.com/en-US/cla-sign/) directly to Move. Whether this includes submitting language improvements or even, in the future, adding core modules available on the Diem Payment Network, the core contributor will understand Move at a deep level.
+
+核心贡献者指那些超越爱好者并想在核心编程语言方面保持领先，还直接为 Move 做出[贡献](https://diem.com/en-US/cla-sign/)的人。无论是提交语言改进，甚至未来添加 Diem 支付网络上可用的核心模块等，核心贡献者都将深入了解Move。
+
+### Move不适用于哪些人？(Who Move is currently not targeting)
+
+Currently, Move is not targeting developers who wish to create custom modules and contracts for use on the Diem Payment Network. We are also not targeting novice developers who expect a completely polished developer experience even in testing the language.
+
+目前，Move 并不适用那些希望在在 Diem 支付网络上创建自定义模块和合约的开发人员。我们也不针对期望在测试语言时就能获得完美开发体验的初学开发者。
+
+## 从哪里开始？(Where Do I Start?)
+
+Begin with understanding [modules and scripts](https://move-language.github.io/move/modules-and-scripts.html) and then work through the [Move Tutorial](https://move-language.github.io/move/creating-coins.html).
+
+你可以从了解模块和脚本([modules and scripts](./modules-and-scripts.html))开始，然后跟随Move教程([Move Tutorial](./move-tutorial.html))进行练习。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/loops.md b/vendors/move/documentation/book/translations/move-book-zh/src/loops.md
new file mode 100644
index 000000000..34626ed28
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/loops.md
@@ -0,0 +1,215 @@
+# While and Loop
+
+Move offers two constructs for looping: `while` and `loop`.
+
+Move 提供了两种循环结构: `while` and `loop`.
+
+## `while` 循环
+
+The `while` construct repeats the body (an expression of type unit) until the condition (an expression of type `bool`) evaluates to `false`.
+
+Here is an example of simple `while` loop that computes the sum of the numbers from `1` to `n`:
+
+`while` 会重复执行结构(一个 `unit` 类型的表达式), 直到条件语句(`bool` 类型的表达式)运算结果为 `false`。
+
+下面是一个简单的 `while` 循环的例子，计算从 `1` 到 `n` 数字之和:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 1;
+    while (i <= n) {
+        sum = sum + i;
+        i = i + 1
+    };
+
+    sum
+}
+```
+
+Infinite loops are allowed:
+
+无限循环是被允许的:
+
+```move=
+fun foo() {
+    while (true) { }
+}
+```
+
+### `break`
+
+The `break` expression can be used to exit a loop before the condition evaluates to `false`. For example, this loop uses `break` to find the smallest factor of `n` that's greater than 1:
+
+`break` 表达式可用于在条件计算结果为 `false` 之前退出循环。例如，这个循环使用 `break` 查找 `n` 大于1的最小因子:
+
+```move
+fun smallest_factor(n: u64): u64 {
+    // assuming the input is not 0 or 1
+    let i = 2;
+    while (i <= n) {
+        if (n % i == 0) break;
+        i = i + 1
+    };
+
+    i
+}
+```
+
+The `break` expression cannot be used outside of a loop.
+
+`break` 表达式不能在循环之外使用。
+
+### `continue`
+
+The `continue` expression skips the rest of the loop and continues to the next iteration. This loop uses `continue` to compute the sum of `1, 2, ..., n`, except when the number is divisible by 10:
+
+`continue` 表达式跳过当前循环的剩余部分, 并继续下一轮迭代。下面的例子, 使用 `continue` 去计算 `1, 2, ..., n` 的总和，过滤掉不能被10整除的数:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    while (i < n) {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        sum = sum + i;
+    };
+
+    sum
+}
+```
+
+The `continue` expression cannot be used outside of a loop.
+
+`continue` 表达式不能在循环之外使用。
+
+### The type of `break` and `continue`
+
+`break` and `continue`, much like `return` and `abort`, can have any type. The following examples illustrate where this flexible typing can be helpful:
+
+`break` and `continue`, 和 `return` and `abort`  很相像, 可以是任何类型。下面的例子说明了这种灵活的类型在那些方面有帮助:
+
+```move
+fun pop_smallest_while_not_equal(
+    v1: vector<u64>,
+    v2: vector<u64>,
+): vector<u64> {
+    let result = vector::empty();
+    while (!vector::is_empty(&v1) && !vector::is_empty(&v2)) {
+        let u1 = *vector::borrow(&v1, vector::length(&v1) - 1);
+        let u2 = *vector::borrow(&v2, vector::length(&v2) - 1);
+        let popped =
+            if (u1 < u2) vector::pop_back(&mut v1)
+            else if (u2 < u1) vector::pop_back(&mut v2)
+            else break; // Here, `break` has type `u64`
+        vector::push_back(&mut result, popped);
+    };
+
+    result
+}
+
+fun pick(
+    indexes: vector<u64>,
+    v1: &vector<address>,
+    v2: &vector<address>
+): vector<address> {
+    let len1 = vector::length(v1);
+    let len2 = vector::length(v2);
+    let result = vector::empty();
+    while (!vector::is_empty(&indexes)) {
+        let index = vector::pop_back(&mut indexes);
+        let chosen_vector =
+            if (index < len1) v1
+            else if (index < len2) v2
+            else continue; // Here, `continue` has type `&vector<address>`
+        vector::push_back(&mut result, *vector::borrow(chosen_vector, index))
+    };
+
+    result
+}
+```
+
+## `loop`表达式
+
+The `loop` expression repeats the loop body (an expression with type `()`) until it hits a `break`
+
+Without a `break`, the loop will continue forever
+
+`loop` 表达式重复循环体(类型为unit()的表达式) ，直到遇到 `break` 为止。
+
+(下面的代码中)没有 `break`, 循环将一直执行。
+
+```move
+fun foo() {
+    let i = 0;
+    loop { i = i + 1 }
+}
+```
+
+Here is an example that uses `loop` to write the `sum` function:
+
+这是一个使用 `loop` 编写 `sum` 函数的示例(可与 `while` 循环比较):
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+As you might expect, `continue` can also be used inside a `loop`. Here is `sum_intermediate` from above rewritten using `loop` instead of `while`
+
+正如你所料, `continue` 也可以在 `loop` 中使用。这是上面的 `sum_intermediate` 使用 `loop` 代替 `while` 重写的:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+## `while` and `loop` 的类型
+
+Move loops are typed expressions. A `while` expression always has type `()`.
+
+Move 循环是有类型化的表达式。 `while` 表达式始终具有 `()` 类型。
+
+```move
+let () = while (i < 10) { i = i + 1 };
+```
+
+If a `loop` contains a `break`, the expression has type unit `()`
+
+如果 `loop` 中包含 `break` , 这个表达式的类型则为 unit `()`
+
+
+```move
+(loop { if (i < 10) i = i + 1 else break }: ());
+let () = loop { if (i < 10) i = i + 1 else break };
+```
+
+If `loop` does not have a `break`, `loop` can have any type much like `return`, `abort`, `break`, and `continue`.
+
+如果 `loop` 不包含 `break`, `loop` 可以是任何类型, 就像`return`, `abort`, `break`, 和 `continue`。
+
+```move
+(loop (): u64);
+(loop (): address);
+(loop (): &vector<vector<u8>>);
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/modules-and-scripts.md b/vendors/move/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
new file mode 100644
index 000000000..9dbca68eb
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
@@ -0,0 +1,119 @@
+# 模块和脚本
+
+Move 有两种不同类型的程序：***模块（Module）***和***脚本（Script）***。模块是定义结构类型以及对这些类型进行操作的函数的库。*结构类型*定义了 Move 的[全局存储](./global-storage-structure.md)的模式，*模块函数*定义了更新存储的规则。模块本身也存储在全局存储中。脚本是[可执行文件](https://en.wikipedia.org/wiki/Executable)的入口点，类似于传统语言中的主函数 `main`。脚本通常调用已发布模块的函数来更新全局存储。脚本是临时代码片段，不会发布在全局存储中。
+
+一个 Move 源文件（或**编译单元**）可能包含多个模块和脚本。然而，发布模块或执行脚本都是独立的虚拟机（VM）操作。
+
+## 语法
+
+### 脚本
+
+脚本具有以下结构：
+
+```text
+script {
+    <use>*
+    <constants>*
+    fun <identifier><[type parameters: constraint]*>([identifier: type]*) <function_body>
+}
+```
+
+一个 `script` 块必须以它的所有 [`use`](./uses.md) 声明开头，然后是[常量（constant）](./constants.md)声明，最后是主[函数](./functions.md)声明。主函数的名称可以是任意的（也就是说，它不一定命名为 `main`），它是脚本块中唯一的函数，可以有任意数量的参数，并且不能有返回值。下面是每个组件的示例：
+
+```move
+script {
+    // 导入在命名账户地址 std 上发布的 debug 模块。
+    use std::debug;
+
+    const ONE: u64 = 1;
+
+    fun main(x: u64) {
+        let sum = x + ONE;
+        debug::print(&sum)
+    }
+}
+```
+
+脚本（Script）的功能非常有限 —— 它们不能声明友元（friend）、结构类型或访问全局存储。他们的主要作用主要是调用*模块函数*。
+
+### 模块
+
+模块具有以下结构：
+
+```text
+module <address>::<identifier> {
+    (<use> | <friend> | <type> | <function> | <constant>)*
+}
+```
+
+其中 `<address>` 是一个有效的[命名或字面量地址](./address.md)。
+
+例子：
+
+```move
+module 0x42::test {
+    struct Example has copy, drop { i: u64 }
+
+    use std::debug;
+    friend 0x42::another_test;
+
+    const ONE: u64 = 1;
+
+    public fun print(x: u64) {
+        let sum = x + ONE;
+        let example = Example { i: sum };
+        debug::print(&sum)
+    }
+}
+```
+
+`module 0x42::test` 这部分指定模块 `test` 将在[全局存储](./global-storage-structure.md)的[账户地址](./address.md) `0x42` 下发布。
+
+模块也可以使用[命名地址](./address.md)来声明，例如：
+
+```move
+module test_addr::test {
+    struct Example has copy, drop { a: address }
+
+    use std::debug;
+    friend test_addr::another_test;
+
+    public fun print() {
+        let example = Example { a: @test_addr };
+        debug::print(&example)
+    }
+}
+```
+
+因为命名地址只存在于源语言级别和编译期间，所以命名地址将在字节码级别彻底替换它们的值。例如，如果我们有以下代码：
+
+```move
+script {
+    fun example() {
+        my_addr::m::foo(@my_addr);
+    }
+}
+```
+
+我们在把 `my_addr` 设置为 `0xC0FFEE` 的情况下编译它，那么它在操作上等同于以下内容：
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::m::foo(@0xC0FFEE);
+    }
+}
+```
+
+然而，在源代码级别，这些是*不等价的* —— 函数 `m::foo` *必须*通过 `my_addr` 命名地址来访问，而不是通过分配给该地址的数值来访问。
+
+模块名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，模块名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+module my_module {}
+module foo_bar_42 {}
+```
+
+通常，模块名称以小写字母开头。名为 `my_module` 的模块应该存储在名为 `my_module.move` 的源文件中。
+
+`module` 块内的所有元素都可以按任意顺序出现。从根本上说，模块是[`类型（type）`](./structs-and-resources.md)和[`函数（function）`](./functions.md)的集合。[`use`](./uses.md) 关键字用来从其他模块导入类型。[`friend`](./friends.md) 关键字指定一个可信的模块列表。[`const`](./constants.md) 关键字定义了可以在模块函数中使用的私有常量。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/overview.md b/vendors/move/documentation/book/translations/move-book-zh/src/overview.md
new file mode 100644
index 000000000..d08bf4352
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/overview.md
@@ -0,0 +1,200 @@
+---
+id: overview
+title: Overview
+sidebar_label: Move
+---
+
+Move is a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+### Start Here
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/introduction-to-move.svg"
+    iconDark="img/introduction-to-move-dark.svg"
+    overlay="Understand Move’s background, current status and architecture"
+    title="Introduction"
+    to="/docs/move/move-introduction"
+  />
+  <SimpleTextCard
+    icon="img/modules-and-scripts.svg"
+    iconDark="img/modules-and-scripts-dark.svg"
+    overlay="Understand Move’s two different types of programs: Modules and Scripts"
+    title="Modules and Scripts"
+    to="/docs/move/move-modules-and-scripts"
+  />
+  <SimpleTextCard
+    icon="img/placeholder.svg"
+    iconDark="img/placeholder-dark.svg"
+    overlay="Play with Move directly as you create coins with the language"
+    title="First Tutorial: Creating Coins"
+    to="/docs/move/move-tutorial-creating-coins"
+  />
+</CardsWrapper>
+
+### Primitive Types
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="Move supports three unsigned integer types: u8, u64, and u128"
+    title="Integers"
+    to="/docs/move/move-integers"
+  />
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="bool is Move's primitive type for boolean true and false values."
+    title="Bool"
+    to="/docs/move/move-bool"
+  />
+  <SimpleTextCard
+    icon="img/address.svg"
+    iconDark="img/address-dark.svg"
+    overlay="address is a built-in type in Move that is used to represent locations in global storage"
+    title="Address"
+    to="/docs/move/move-address"
+  />
+  <SimpleTextCard
+    icon="img/vector.svg"
+    iconDark="img/vector-dark.svg"
+    overlay="vector<T> is the only primitive collection type provided by Move"
+    title="Vector"
+    to="/docs/move/move-vector"
+  />
+  <SimpleTextCard
+    icon="img/signer.svg"
+    iconDark="img/signer-dark.svg"
+    overlay="signer is a built-in Move resource type. A signer is a capability that allows the holder to act on behalf of a particular address"
+    title="Signer"
+    to="/docs/move/move-signer"
+  />
+  <SimpleTextCard
+    icon="img/move-references.svg"
+    iconDark="img/move-references-dark.svg"
+    overlay="Move has two types of references: immutable & and mutable &mut"
+    title="References"
+    to="/docs/move/move-references"
+  />
+  <SimpleTextCard
+    icon="img/tuples.svg"
+    iconDark="img/tuples-dark.svg"
+    overlay="In order to support multiple return values, Move has tuple-like expressions. We can consider unit() to be an empty tuple"
+    title="Tuples and Unit"
+    to="/docs/move/move-tuples-and-unit"
+  />
+</CardsWrapper>
+
+### Basic Concepts
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/local-variables-and-scopes.svg"
+    iconDark="img/local-variables-and-scopes-dark.svg"
+    overlay="Local variables in Move are lexically (statically) scoped"
+    title="Local Variables and Scopes"
+    to="/docs/move/move-variables"
+  />
+  <SimpleTextCard
+    icon="img/abort-and-return.svg"
+    iconDark="img/abort-and-return-dark.svg"
+    overlay="return and abort are two control flow constructs that end execution, one for the current function and one for the entire transaction"
+    title="Abort & Assert"
+    to="/docs/move/move-abort-and-assert"
+  />
+  <SimpleTextCard
+    icon="img/conditionals.svg"
+    iconDark="img/conditionals-dark.svg"
+    overlay="An if expression specifies that some code should only be evaluated if a certain condition is true"
+    title="Conditionals"
+    to="/docs/move/move-conditionals"
+  />
+  <SimpleTextCard
+    icon="img/loops.svg"
+    iconDark="img/loops-dark.svg"
+    overlay="Move offers two constructs for looping: while and loop"
+    title="While and Loop"
+    to="/docs/move/move-while-and-loop"
+  />
+  <SimpleTextCard
+    icon="img/functions.svg"
+    iconDark="img/functions-dark.svg"
+    overlay="Function syntax in Move is shared between module functions and script functions"
+    title="Functions"
+    to="/docs/move/move-functions"
+  />
+  <SimpleTextCard
+    icon="img/structs-and-resources.svg"
+    iconDark="img/structs-and-resources-dark.svg"
+    overlay="A struct is a user-defined data structure containing typed fields. A resource is a kind of struct that cannot be copied and cannot be dropped"
+    title="Structs and Resources"
+    to="/docs/move/move-structs-and-resources"
+  />
+  <SimpleTextCard
+    icon="img/constants.svg"
+    iconDark="img/constants-dark.svg"
+    overlay="Constants are a way of giving a name to shared, static values inside of a module or script"
+    title="Constants"
+    to="/docs/move/move-constants"
+  />
+  <SimpleTextCard
+    icon="img/generics.svg"
+    iconDark="img/generics-dark.svg"
+    overlay="Generics can be used to define functions and structs over different input data types"
+    title="Generics"
+    to="/docs/move/move-generics"
+  />
+  <SimpleTextCard
+    icon="img/equality.svg"
+    iconDark="img/equality-dark.svg"
+    overlay="Move supports two equality operations == and !="
+    title="Equality"
+    to="/docs/move/move-equality"
+  />
+  <SimpleTextCard
+    icon="img/uses-and-aliases.svg"
+    iconDark="img/uses-and-aliases-dark.svg"
+    overlay="The use syntax can be used to create aliases to members in other modules"
+    title="Uses & Aliases"
+    to="/docs/move/move-uses-and-aliases"
+  />
+</CardsWrapper>
+
+### Global Storage
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="The purpose of Move programs is to read from and write to persistent global storage"
+    title="Global Storage Structure"
+    to="/docs/move/move-global-storage-structure"
+  />
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="Move programs can create, delete, and update resources in global storage using five instructions"
+    title="Global Storage Operators"
+    to="/docs/move/move-global-storage-operators"
+  />
+</CardsWrapper>
+
+### Reference
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/standard-library.svg"
+    iconDark="img/standard-library-dark.svg"
+    overlay="The Move standard library exposes interfaces that implement functionality on vectors, option types, error codes and fixed-point numbers"
+    title="Standard Library"
+    to="/docs/move/move-standard-library"
+  />
+  <SimpleTextCard
+    icon="img/coding-conventions.svg"
+    iconDark="img/coding-conventions-dark.svg"
+    overlay="There are basic coding conventions when writing Move code"
+    title="Coding Conventions"
+    to="/docs/move/move-coding-conventions"
+  />
+</CardsWrapper>
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/packages.md b/vendors/move/documentation/book/translations/move-book-zh/src/packages.md
new file mode 100644
index 000000000..4ab185d12
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/packages.md
@@ -0,0 +1,348 @@
+# 程序包(packages)
+
+Packages allow Move programmers to more easily re-use code and share it
+across projects. The Move package system allows programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by [named addresses](./address.md);
+* Import and use packages in other Move code and instantiate named addresses;
+* Build packages and generate associated compilation artifacts from packages; and
+* Work with a common interface around compiled Move artifacts.
+
+包允许 `Move` 程序员更轻松地重用代码并在项目之间共享。`Move` 包系统允许程序员轻松地：
+* 定义一个包含 `Move`代码的包；
+* 通过命名地址参数化包；
+* 在其他 `Move` 代码中导入和使用包并实例化命名地址；
+* 构建包并从包中生成相关的编译源代码；
+* 使用围绕已编译 `Move` 工件的通用接口。
+
+## 包布局和清单语法（Package Layout and Manifest Syntax）
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+`Move` 包源目录包含一个`Move.toml`包清单文件以及一组子目录：
+
+```
+     a_move_package
+        ├── Move.toml      (required)（需要的）
+        ├── sources        (required)（需要的）
+        ├── examples       (optional, test & dev mode)（可选的，测试 & 开发者模式）
+        ├── scripts        (optional)（可选的）
+        ├── doc_templates  (optional)（可选的）
+        └── tests          (optional, test mode)（可选的，测试模式）
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+标记为`required` 的目录必须存在才可以将该目录作为 `Move` 包并进行编译。可选目录被视为可存在的，如果存在，将包含在编译过程里。根据使用 （`test`或`dev`）构建包的模式，`tests`和`examples` 目录也将包含在内。
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+`sources`目录可以包含 `Move` 模块和 `Move` 脚本（事务脚本和包含脚本函数的模块）。`Example`目录可以保留仅用于开发和/或用作教程目的附加代码，当在 `test` 或者`dev`模式之外时，这些附加代码编译时不会被包括进来。
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any documentation templates present in
+the `doc_templates` directory.
+
+`scripts`目录是被支持的，如果包作者需要，事物脚本可以从模块中分离。如果该`scripts`目录存在，则编译时将始终包含该目录。
+Move将使用存在于`doc_templates` 目录的任何模板构建文档。
+
+
+### 包清单 Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+Move 包清单在`Move.toml`文件中定义，并具有以下语法。可选字段标有`*`，`+`表示一个或多个元素：
+```
+    [package]
+    name = <string>                  # e.g., "MoveStdlib"
+    version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+    license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+    authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+    [addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+    # One or more lines declaring named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+    # One or more lines declaring dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # local dependencies
+    <string> = { git = <URL ending in .git>, subdir=<path to dir containing Move.toml inside git repo>, rev=<git commit hash>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # git dependencies
+
+    [dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+An example of a minimal package manifest with one local dependency and one git dependency:
+
+一个具有局部依赖项和一个 git 依赖项的最小包清单示例：
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+一个包括 Move 标准库并从中使用地址值`0x1`实例化命名地址`Std`的更标准的包清单示例：
+
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+    license = "Apache 2.0"
+
+    [addresses]
+    address_to_be_filled_in = "_"
+    specified_address = "0xB0B"
+
+    [dependencies]
+    # Local dependency
+    LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
+    # Git dependency
+    MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b" }
+
+    [dev-addresses] # For use when developing this module
+    address_to_be_filled_in = "0x101010101"
+  ```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+包清单中的大部分段落都是不言自明的，但命名地址可能有点难以理解，因此值得更详细地检查它们。
+
+## 编译期间的命名地址（Named Addresses During Compilation）
+
+Recall that Move has [named addresses](./address.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+回想一下，Move 具有命名地址，并且不能在 Move 中声明命名地址。正因为如此，到目前为止，命名地址及其值都需要在命令行上传递给编译器。但使用 Move 包系统时这将不再需要，您可以在包中声明命名地址，实例化范围内的其他命名地址，并从 Move 包系统清单文件中的其他包重命名命名地址，让我们分别来看看这些:
+
+### 声明（Declaration）
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
+假设我们有一个Move模块，`example_pkg/sources/A.move`如下所示:
+
+```move
+    module named_addr::A {
+        public fun x(): address { @named_addr }
+    }
+```
+
+We could in `example_pkg/Move.toml` declare the named address `named_addr` in
+two different ways. The first:
+
+我们可以用两种不同`example_pkg/Move.toml`的方式声明命名地址`named_addr`。首先：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "_"
+```
+
+Declares `named_addr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `named_addr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `named_addr`, and the package can then be
+instantiated later on by an importing package.
+
+声明`named_addr`为包`ExamplePkg`中的命名地址，并且 _该地址可以是任何有效的地址值_。因此，导入包可以选择命名地址的值作为`named_addr`它希望的任何地址。直观地，您可以将其视为通过命名地址`named_addr`参数化包 `ExamplePkg`，然后稍后通过导入包使包被实例化。
+
+`named_addr` can also be declared as:
+
+`named_addr`也可以声明为：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "0xCAFE"
+```
+
+which states that the named address `named_addr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+这表明命名的地址`named_addr`是准确的`0xCAFE`并且不能更改。这很有用，因此其他导入包可以使用这个命名地址，而无需担心分配给它的确切值。
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+使用这两种不同的声明方法，有关命名地址的信息可以通过两种方式在包图中流动：
+*  前者（“未分配的命名地址”）允许命名地址值从进口站点流向申报站点。
+*  后者（“分配的命名地址”）允许命名地址值从包图中的声明站点向上流动到使用站点。
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+通过这两种在整个包图中流动命名地址信息的方法，了解范围和重命名的规则变得很重要。
+
+## 命名地址的作用域和重命名（Scoping and Renaming of Named Addresses）
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+在包`P`中的命名地址`N`如果满足以下条件，则在作用域内：
+
+ 1. 它声明了一个命名地址`N`；或者
+ 2. `P`的传递依赖项之一中的包声明了命名地址`N`，并且封装图在`P`和没有重命名的声明包`N`之间有一个依赖路径。
+
+ Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `named_addr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+ 此外，包中的每个命名地址都会被导出。由于这个和上面的范围规则，每个包都可以被视为带有一组命名地址，当包被导入时，这些地址将被带入作用域，例如，如果包`ExamplePkg`被导入，则该导入会将命名地址`named_addr`带入作用域。 因此，如果`P`导入两个包`P1`并且`P2`都声明了一个命名地址`N`，在`P`中则会出现以下问题：当`N`被引用于`P`时我们指的是哪个`N`？来自`P1`或来自`P2`的`N`？ 为了防止命名地址来自哪个包的这种歧义，我们强制一个包中所有依赖项引入的范围集是不相交的，并提供一种在将命名地址带入范围的包被导入时重命名命名地址的方法。
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+导入时重命名一个命名地址可以在我们的`P`,`P1`和`P2`上面的示例中完成：
+```
+    [package]
+    name = "P"
+    ...
+    [dependencies]
+    P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+    P2 = { local = "some_path_to_P2"  }
+```
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+这种重命名`N`指的是`P2`中的`N`并且`P1N`将指 `P1`中的`N`：
+```
+    module N::A {
+        public fun x(): address { @P1N }
+    }
+```
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+重要的是要注意 _重命名不是局部的_：一旦一个命名地址`N`在一个包`P`中被重命名为`N2`，所有导入`P`的包都不会看到`N`但只会看到`N2`，除非`N`是从`P`外引入的。这就是为什么本节开头的范围规则中的规则 (2) 特别说明了“在`P`和没有重命名的声明包`N` 的封装图中的依赖路径” 。
+
+### 实例化（Instantiation）
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+只要命名地址始终具有相同的值，就可以在封装图中多次实例化命名地址。如果在整个封装图中使用不同的值实例化相同的命名地址（无论是否重命名），则会出现错误。
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `named_addr` would be uninstantiated:
+
+只有当所有命名地址都解析为一个值时，才能编译 Move 包。如果包希望公开未实例化的命名地址，则会出现问题。这就是`[dev-addresses]`段要解决的问题。此段可以设置命名地址的值，但不能引入任何命名地址。此外， `dev`模式下仅根包中的`[dev-addresses]`会被包括进来。例如，具有以下清单的根包将不会在`dev`模式之外编译，因为`named_addr`不会被实例化：
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+
+[dev-addresses]
+named_addr = "0xC0FFEE"
+```
+## 用法、源代码和数据结构（ Usage, Artifacts, and Data Structures）
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+Move 软件包系统带有一个命令行选项，作为 Move CLI 的一部分move `<flags> <command>` `<command_flags>`。除非提供特定路径，否则所有包命令都将在当前工作目录中运行。可以通过运行`move --help`找到 Move CLI 的命令和标志的完整列表。
+
+### 用法（Usage）
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+一个包可以通过 Move CLI 命令，或是当作Rust函数`compile_package`的库命令来编译。 这种编译方法将创建一个编译包`CompiledPackage` 保存已编译的字节码以及其他编译内存中的源代码（源映射、文档、ABIs）。这个`CompiledPackage`可以转换为`OnDiskPackage`，反之亦然——后者是文件系统中的编译包 `CompiledPackage`数据，它的格式如下：
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
+
+有关这些数据结构和如何将 Move 包系统用作 Rust 库的更多信息，请参阅 `move-package` 箱（crate） 。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/references.md b/vendors/move/documentation/book/translations/move-book-zh/src/references.md
new file mode 100644
index 000000000..2a23f0cb2
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/references.md
@@ -0,0 +1,289 @@
+# 引用(references)
+
+Move has two types of references: immutable `&` and mutable `&mut`. Immutable references are read
+only, and cannot modify the underlying value (or any of its fields). Mutable references allow for
+modifications via a write through that reference. Move's type system enforces an ownership
+discipline that prevents reference errors.
+
+Move 支持两种类型的引用：不可变引用 `&` 和可变引用 `&mut`。不可变引用是只读的，不能修改相关值(或其任何字段)。可变引用通过写入该引用进行修改。Move的类型系统强制执行所有权规则，以避免引用错误。
+
+For more details on the rules of references, see [Structs and Resources](./structs-and-resources.md)
+
+更多有关引用规则的详细信息，请参阅：[结构和资源](./structs-and-resources.html).
+
+## 引用运算符 (Reference Operators)
+
+Move provides operators for creating and extending references as well as converting a mutable
+reference to an immutable one. Here and elsewhere, we use the notation `e: T` for "expression `e`
+has type `T`".
+
+Move 提供了用于创建和扩展引用以及将可变引用转换为不可变引用的运算符。在这里和其他地方，我们使用符号 `e: T` 来表示“表达式 `e` 的类型是 `T` ”
+
+| Syntax      | Type                                                  | Description                                                    |
+| ----------- | ----------------------------------------------------- | -------------------------------------------------------------- |
+| `&e`        | `&T` where `e: T` and `T` is a non-reference type     | Create an immutable reference to `e`                           |
+| `&mut e`    | `&mut T` where `e: T` and `T` is a non-reference type | Create a mutable reference to `e`.                             |
+| `&e.f`      | `&T` where `e.f: T`                                   | Create an immutable reference to field `f` of struct `e`.      |
+| `&mut e.f`  | `&mut T` where `e.f: T`                               | Create a mutable reference to field `f` of struct`e`.          |
+| `freeze(e)` | `&T` where `e: &mut T`                                | Convert the mutable reference `e` into an immutable reference. |
+
+| 语法 | 类型 | 描述 |
+| ------      | ------ |------ |
+| `&e`        | `&T` 其中 `e: T` 和 `T` 是非引用类型      | 创建一个不可变的引用 `e`
+| `&mut e`    | `&mut T` 其中 `e: T` 和 `T` 是非引用类型  | 创建一个可变的引用 `e`
+| `&e.f`      | `&T` 其中 `e.f: T`                       | 创建结构 `e` 的字段 `f` 的不可变引用
+| `&mut e.f`  | `&mut T` 其中`e.f: T`                    | 创建结构 `e` 的字段 `f` 的可变引用
+| `freeze(e)` | `&T` 其中`e: &mut T`                     | 将可变引用 `e` 转换为不可变引用
+
+The `&e.f` and `&mut e.f` operators can be used both to create a new reference into a struct or to extend an existing reference:
+
+`&e.f`和`&mut e.f`运算符既可以用于在结构中创建新引用，也可以用于扩展现有引用：
+
+```move
+let s = S { f: 10 };
+let f_ref1: &u64 = &s.f; // works
+let s_ref: &S = &s;
+let f_ref2: &u64 = &s_ref.f // also works
+```
+
+A reference expression with multiple fields works as long as both structs are in the same module:
+
+只要两个结构都在同一个模块中，具有多个字段的引用表达式就可以工作：
+
+```move
+struct A { b: B }
+struct B { c : u64 }
+fun f(a: &A): &u64 {
+  &a.b.c
+}
+```
+
+Finally, note that references to references are not allowed:
+
+最后，请注意，不允许引用"引用"(Move不支持多重引用, 但Rust可以，译者注)：
+
+```move
+let x = 7;
+let y: &u64 = &x;
+let z: &&u64 = &y; // will not compile
+```
+
+## 通过引用读取和写入
+
+Both mutable and immutable references can be read to produce a copy of the referenced value.
+
+Only mutable references can be written. A write `*x = v` discards the value previously stored in `x`
+and updates it with `v`.
+
+可以读取可变和不可变引用以生成引用值的副本。
+
+只能写入可变引用。写入表达式 `*x = v` 会丢弃先前存储在x中的值，并用 `v` 更新。
+
+Both operations use the C-like `*` syntax. However, note that a read is an expression, whereas a
+write is a mutation that must occur on the left hand side of an equals.
+
+两种操作都使用类 C `*` 语法。但是请注意，读取是一个表达式，而写入是一个必须发生在等号左侧的改动。
+
+| Syntax     | Type                                | Description                         |
+| ---------- | ----------------------------------- | ----------------------------------- |
+| `*e`       | `T` where `e` is `&T` or `&mut T`   | Read the value pointed to by `e`    |
+| `*e1 = e2` | `()` where `e1: &mut T` and `e2: T` | Update the value in `e1` with `e2`. |
+
+| 语法 | 类型 | 描述 |
+| ------ | ------ |------ |
+| `*e` | `T` 其中 `e` 为 `&T` 或 `&mut T` | 读取 `e` 所指向的值
+| `*e1 = e2` | () 其中 `e1: &mut T` 和 `e2: T` | 用 `e2` 更新 `e1` 中的值
+
+In order for a reference to be read, the underlying type must have the
+[`copy` ability](./abilities.md) as reading the reference creates a new copy of the value. This rule
+prevents the copying of resource values:
+
+为了读取引用，相关类型必须具备[`copy` 能力](./abilities.html)，因为读取引用会创建值的新副本。此规则防止复制资源值：
+
+```move=
+fun copy_resource_via_ref_bad(c: Coin) {
+    let c_ref = &c;
+    let counterfeit: Coin = *c_ref; // not allowed!
+    pay(c);
+    pay(counterfeit);
+}
+```
+
+Dually: in order for a reference to be written to, the underlying type must have the
+[`drop` ability](./abilities.md) as writing to the reference will discard (or "drop") the old value.
+This rule prevents the destruction of resource values:
+
+双重性：为了写入引用，相关类型必须具备[`drop` 能力](./abilities.html)，因为写入引用将丢弃(或“删除”)旧值。此规则可防止破坏资源值：
+
+```move=
+fun destroy_resource_via_ref_bad(ten_coins: Coin, c: Coin) {
+    let ref = &mut ten_coins;
+    *ref = c; // not allowed--would destroy 10 coins!
+}
+```
+
+## `freeze` 推断 (`freeze` inference)
+
+A mutable reference can be used in a context where an immutable reference is expected:
+
+可变引用可以在预期不可变引用的上下文中使用：
+
+```move
+let x = 7;
+let y: &mut u64 = &mut x;
+```
+
+This works because the under the hood, the compiler inserts `freeze` instructions where they are
+needed. Here are a few more examples of `freeze` inference in action:
+
+这是因为编译器会在底层需要的地方插入 `freeze` 指令。以下是更多 `freeze` 实际推断行为的示例：
+
+```move=
+fun takes_immut_returns_immut(x: &u64): &u64 { x }
+
+// freeze inference on return value
+fun takes_mut_returns_immut(x: &mut u64): &u64 { x }
+
+fun expression_examples() {
+    let x = 0;
+    let y = 0;
+    takes_immut_returns_immut(&x); // no inference
+    takes_immut_returns_immut(&mut x); // inferred freeze(&mut x)
+    takes_mut_returns_immut(&mut x); // no inference
+
+    assert!(&x == &mut y, 42); // inferred freeze(&mut y)
+}
+
+fun assignment_examples() {
+    let x = 0;
+    let y = 0;
+    let imm_ref: &u64 = &x;
+
+    imm_ref = &x; // no inference
+    imm_ref = &mut y; // inferred freeze(&mut y)
+}
+```
+
+###  子类型化 (Subtyping)
+
+With this `freeze` inference, the Move type checker can view `&mut T` as a subtype of `&T`. As shown
+above, this means that anywhere for any expression where a `&T` value is used, a `&mut T` value can
+also be used. This terminology is used in error messages to concisely indicate that a `&mut T` was
+needed where a `&T` was supplied. For example
+
+通过freeze推断，Move 类型检查器可以将 `&mut T` 视为 `&T` 的子类型。 如上所示，这意味着对于使用 `&T` 值的任何表达式，也可以使用 `&mut T` 值。此术语用于错误消息中，以简明扼要地表明在提供 `&T` 的地方需要 `&mut T` 。例如:
+
+```move=
+address 0x42 {
+    module example {
+        fun read_and_assign(store: &mut u64, new_value: &u64) {
+            *store = *new_value
+        }
+
+        fun subtype_examples() {
+            let x: &u64 = &0;
+            let y: &mut u64 = &mut 1;
+
+            x = &mut 1; // valid
+            y = &2; // invalid!
+
+            read_and_assign(y, x); // valid
+            read_and_assign(x, y); // invalid!
+        }
+    }
+}
+```
+
+will yield the following error messages
+
+将产生以下错误消息
+
+```text
+error:
+    ┌── example.move:12:9 ───
+    │
+ 12 │         y = &2; // invalid!
+    │         ^ Invalid assignment to local 'y'
+    ·
+ 12 │         y = &2; // invalid!
+    │             -- The type: '&{integer}'
+    ·
+  9 │         let y: &mut u64 = &mut 1;
+    │                -------- Is not a subtype of: '&mut u64'
+    │
+
+error:
+    ┌── example.move:15:9 ───
+    │
+ 15 │         read_and_assign(x, y); // invalid!
+    │         ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x42::example::read_and_assign'. Invalid argument for parameter 'store'
+    ·
+  8 │         let x: &u64 = &0;
+    │                ---- The type: '&u64'
+    ·
+  3 │     fun read_and_assign(store: &mut u64, new_value: &u64) {
+    │                                -------- Is not a subtype of: '&mut u64'
+    │
+```
+
+The only other types currently that has subtyping are [tuples](./tuples.md)
+
+当前唯一具有子类型的其他类型是[tuple(元组)](./tuples.html)
+
+## 所有权 (Ownership)
+
+Both mutable and immutable references can always be copied and extended _even if there are existing
+copies or extensions of the same reference_:
+
+_即使同一引用存在现有副本或扩展_，可变引用和不可变引用始终可以被复制和扩展：
+
+```move
+fun reference_copies(s: &mut S) {
+  let s_copy1 = s; // ok
+  let s_extension = &mut s.f; // also ok
+  let s_copy2 = s; // still ok
+  ...
+}
+```
+
+This might be surprising for programmers familiar with Rust's ownership system, which would reject
+the code above. Move's type system is more permissive in its treatment of
+[copies](./variables.md#move-and-copy), but equally strict in ensuring unique ownership of mutable
+references before writes.
+
+对于熟悉 Rust 所有权系统的程序员来说，这可能会令人惊讶，因为他们会拒绝上面的代码。Move 的类型系统在处理[副本](./variables.html#move-and-copy)方面更加宽松 ，但在写入前确保可变引用的唯一所有权方面同样严格。
+
+### 无法存储引用 (References Cannot Be Stored)
+
+References and tuples are the _only_ types that cannot be stored as a field value of structs, which
+also means that they cannot exist in global storage. All references created during program execution
+will be destroyed when a Move program terminates; they are entirely ephemeral. This invariant is
+also true for values of types without the `store` [ability](./abilities.md), but note that
+references and tuples go a step further by never being allowed in structs in the first place.
+
+This is another difference between Move and Rust, which allows references to be stored inside of
+structs.
+
+引用和元组是唯一不能存储为结构的字段值的类型，这也意味着它们不能存在于全局存储中。当 Move 程序终止时，程序执行期间创建的所有引用都将被销毁；它们完全是短暂的。这种不变式也适用于没有[`store` 能力](./chatper_19_abilities.html)的类型的值，但请注意，引用和元组更进一步，从一开始就不允许出现在结构中。
+
+这是 Move 和 Rust 之间的另一个区别，后者允许将引用存储在结构内。
+
+Currently, Move cannot support this because references cannot be
+[serialized](https://en.wikipedia.org/wiki/Serialization), but _every Move value must be
+serializable_. This requirement comes from Move's
+[persistent global storage](./global-storage-structure.md), which needs to serialize values to
+persist them across program executions. Structs can be written to global storage, and thus they must
+be serializable.
+
+One could imagine a fancier, more expressive, type system that would allow references to be stored
+in structs _and_ ban those structs from existing in global storage. We could perhaps allow
+references inside of structs that do not have the `store` [ability](./abilities.md), but that would
+not completely solve the problem: Move has a fairly complex system for tracking static reference
+safety, and this aspect of the type system would also have to be extended to support storing
+references inside of structs. In short, Move's type system (particularly the aspects around
+reference safety) would have to expand to support stored references. But it is something we are
+keeping an eye on as the language evolves.
+
+目前，Move 无法支持这一点，因为引用无法被[序列化](https://en.wikipedia.org/wiki/Serialization)，但 _每个 Move 值都必须是可序列化的_。这个要求来自于 Move 的 [持久化全局存储](./global-storage-structure.html)，它需要在程序执行期间序列化值以持久化它们。结构体可以写入全局存储，因此它们必须是可序列化的。
+
+可以想象一种更奇特、更有表现力的类型系统，它允许将引用存储在结构中，并禁止这些结构存在于全局存储中。我们也许可以允许在没有[`store` 能力](./abilities.html)的结构内部使用引用，但这并不能完全解决问题：Move 有一个相当复杂的系统来跟踪静态引用安全性，并且类型系统的这一方面也必须扩展以支持在结构内部存储引用。简而言之，Move 的类型系统(尤其是与引用安全相关的方面)需要扩展以支持存储的引用。随着语言的发展，我们正在关注这一点。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/signer.md b/vendors/move/documentation/book/translations/move-book-zh/src/signer.md
new file mode 100644
index 000000000..2bba515c0
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/signer.md
@@ -0,0 +1,60 @@
+# 签名者
+
+`签名者（signer）`是 Move 内置的资源类型。`签名者（signer）`是一种允许持有者代表特定`地址（address）`行使权力的[能力（capability）](https://en.wikipedia.org/wiki/Object-capability_model)。你可以将原生实现（native implementation）视为：
+
+```move
+struct signer has drop { a: address }
+```
+
+`signer` 有点像 Unix [UID](https://en.wikipedia.org/wiki/User_identifier)，因为它表示一个通过 Move *之外*的代码（例如，通过检查加密签名或密码）进行身份验证的用户。
+
+## 与 `address` 的比较
+
+Move 程序可以使用地址字面量（literal）创建任何`地址（address）`值，而无需特殊许可：
+
+```move
+let a1 = @0x1;
+let a2 = @0x2;
+// ... 等等，所有其他可能的地址
+```
+
+但是，`signer` 值是特殊的，因为它们不能通过字面量或者指令创建 —— 只能通过 Move 虚拟机（VM）创建。在虚拟机运行带有 `signer` 类型参数的脚本之前，它会自动创建 `signer` 值并将它们传递给脚本：
+
+```move
+script {
+    use std::signer;
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @0x42, 0);
+    }
+}
+```
+
+如果脚本是从 `0x42` 以外的任何地址发送的，则此脚本将中止并返回代码 `0`。
+
+交易脚本可以有任意数量的 `signer`，只要 `signer` 参数排在其他参数前面。换句话说，所有 `signer` 参数都必须放在第一位。
+
+```move
+script {
+    use std::signer;
+    fun main(s1: signer, s2: signer, x: u64, y: u8) {
+        // ...
+    }
+}
+```
+
+这对于实现具有多方权限原子行为的*多重签名脚本（multi-signer scripts）*很有用。例如，上述脚本的扩展可以在 `s1` 和 `s2` 之间执行原子货币交换。
+
+## `signer` 操作符
+
+`std::signer` 标准库模块为 `signer` 提供了两个实用函数：
+
+| 函数                                        | 描述                                                          |
+| ------------------------------------------- | ------------------------------------------------------------- |
+| `signer::address_of(&signer): address`      | 返回由 `&signer` 包装的地址值。                               |
+| `signer::borrow_address(&signer): &address` | 返回由 `&signer` 包装的地址的引用。                           |
+
+此外，`move_to<T>(&signer, T)` [全局存储](./global-storage-operators.md)操作符需要一个 `&signer` 参数在 `signer.address` 的帐户下发布资源 `T`。这确保了只有经过身份验证的用户才能在其地址下发布资源。
+
+## 所有权
+
+与简单的标量值不同，`signer` 值是不可复制的，这意味着他们不能被复制（通过任何操作，无论是通过显式 [`copy`](./variables.md#移动和复制)指令还是通过[解引用（dereference）`*`](./references.md#通过引用读取和写入)）。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/standard-library.md b/vendors/move/documentation/book/translations/move-book-zh/src/standard-library.md
new file mode 100644
index 000000000..85c8d9f43
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/standard-library.md
@@ -0,0 +1,695 @@
+# 标准库（Standard Library）
+
+The Move standard library exposes interfaces that implement the following functionality:
+* [Basic operations on vectors](#vector).
+* [Option types and operations on`Option` types](#option).
+* [A common error encoding code interface for abort codes](#errors).
+* [32-bit precision fixed-point numbers](#fixed_point32).
+
+Move标准库公开了实现以下功能的接口:
+* [向量的基本操作](#向量).
+* [Option类型与基本操作](#option).
+* [终止码的常见错误编码接口](#errors).
+* [32位精确定点数字](#fixed_point32).
+
+## 向量（vector）
+
+
+The `vector` module defines a number of operations over the primitive
+[`vector`](./vector.md) type. The module is published under the
+named address `Std` and consists of a number of native functions, as
+well as functions defined in Move. The API for this module is as follows.
+
+`向量`模块在原生类型[`向量`](./vector.md)上定义了许多操作。该模块以命名地址`Std`发布，并由许多原生函数以及在Move中定义的函数组成。此模块的API如下所示:
+
+### 函数（Functions）
+
+---------------------------------------------------------------------------
+
+Create an empty [`vector`](./vector.md).
+The `Element` type can be both a `resource` or `copyable` type.
+
+创建一个空的[`向量`](./vector.md)。
+`Element`类型可以是`资源`或`可复制`类型。
+
+```move
+    native public fun empty<Element>(): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a vector of length `1` containing the passed in `element`.
+
+创建一个长度为`1`的vector，并且包含传入的`element`。
+
+```move
+    public fun singleton<Element>(e: Element): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Destroy (deallocate) the vector `v`. Will abort if `v` is non-empty.
+*Note*: The emptiness restriction is due to the fact that `Element` can be a
+resource type, and destruction of a non-empty vector would violate
+[resource conservation](./structs-and-resources.md).
+
+销毁(释放)向量`v`。如果`v`非空操作将终止。
+*注意*:空的限制是由于`Element`可以是资源类型，而销毁非空的向量会违反[资源保护机制](./structs-and-resources.md)。
+
+```move
+    native public fun destroy_empty<Element>(v: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Acquire an [immutable reference](./references.md) to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[不可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Acquire a [mutable reference](./references.md)
+to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Empty and destroy the `other` vector, and push each of the elements in
+the `other` vector onto the `lhs` vector in the same order as they occurred in `other`.
+
+清空并销毁`other`动态数组，并将`other`向量中的每个元素按顺序添加到`lhs`动态数组。
+
+```move
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Push an element `e` of type `Element` onto the end of the vector `v`. May
+trigger a resizing of the underlying vector's memory.
+
+将类型为`Element`的元素`e`添加到向量`v`的末尾。可能触发底层向量内存的大小调整。
+
+```move
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Pop an element from the end of the vector `v` in-place and return the owned
+value. Will abort if `v` is empty.
+
+从向量`v`的末尾取出一个元素并返回。如果`v`为空将终止操作。
+
+```move
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Remove the element at index `i` in the vector `v` and return the owned value
+that was previously stored at `i` in `v`. All elements occurring at indices
+greater than `i` will be shifted down by 1. Will abort if `i` is out of bounds
+for `v`.
+
+移除向量`v`中索引`i`处的元素，并返回之前存储在`v`中的`i`处的值。所有下标大于`i`的元素将向前移动1个位置。如果`i`超出了`v`的范围，操作将会终止。
+
+```move
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the `i`th element of the vector `v` with the last element and then pop
+this element off of the back of the vector and return the owned value that
+was previously stored at index `i`.
+This operation is O(1), but does not preserve ordering of elements in the vector.
+Aborts if the index `i` is out of bounds for the vector `v`.
+
+将向量`v`的第`i`个元素与最后一个元素交换，然后将这个元素从向量的后面取出，并返回之前存储在索引`i`处的所有元素的值。
+这个操作时间复杂度是O(1)，但是不保持向量容器中元素的顺序。
+如果索引`i`超出了向量`v`的边界，则操作终止。
+
+```move
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the elements at the `i`'th and `j`'th indices in the vector `v`. Will
+abort if either of `i` or `j` are out of bounds for `v`.
+
+交换向量`v`中下标为第`i`和第`j`的元素。如果`i`或`j`中的任何一个超出了`v`的范围，则操作将终止。
+
+```move
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+```
+
+---------------------------------------------------------------------------
+
+Reverse the order of the elements in the vector `v` in-place.
+
+将向量v中的元素顺序颠倒。
+
+```move
+    public fun reverse<Element>(v: &mut vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Return the index of the first occurrence of an element in `v` that is
+equal to `e`. Returns `(true, index)` if such an element was found, and
+`(false, 0)` otherwise.
+
+返回`v`中第一个与`e`相等的元素的索引。如果找到这样的元素，则返回`(true, index)`，否则返回`(false, 0)`。
+
+```move
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64);
+```
+
+---------------------------------------------------------------------------
+Return if an element equal to `e` exists in the vector `v`.
+
+如果向量`v`中存在等于`e`的元素，则返回true, 否则返回false。
+
+```move
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+Return the length of a `vector`.
+
+返回`向量`的长度。
+
+```move
+    native public fun length<Element>(v: &vector<Element>): u64;
+```
+
+---------------------------------------------------------------------------
+Return whether the vector `v` is empty.
+
+如果向量`v`中没有元素，则返回true, 否则返回false。
+
+```move
+    public fun is_empty<Element>(v: &vector<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+## 选项（option）
+
+The `option` module defines a generic option type `Option<T>` that represents a
+value of type `T` that may, or may not, be present. It is published under the named address `Std`.
+
+`option`模块定义了一个泛型option类型`Option<T>`，它表示类型为`T`的值可能存在，也可能不存在。它发布在命名地址`Std`下。
+
+The Move option type is internally represented as a singleton vector, and may
+contain a value of `resource` or `copyable` kind.  If you are familiar with option
+types in other languages, the Move `Option` behaves similarly to those with a
+couple notable exceptions since the option can contain a value of kind `resource`.
+Particularly, certain operations such as `get_with_default` and
+`destroy_with_default` require that the element type `T` be of `copyable` kind.
+
+Move option类型在内部表示为一个单例向量，可能包含`资源`或`可复制`类型的值。如果你熟悉其他语言中的option类型，Move `Option`的行为与那些类似，但有几个显著的例外，因为option可以包含一个类型为`资源`的值。
+特别地，某些操作如`get_with_default`和`destroy_with_default`要求元素类型`T`为`可复制`类型。
+
+The API for the `option` module is as as follows
+
+`option`模块的API如下所示:
+
+### 类型（Types）
+
+Generic type abstraction of a value that may, or may not, be present. Can contain
+a value of either `resource` or `copyable` kind.
+
+一个值的泛型类型的抽象，可能存在，也可能不存在。它可以包含`资源`或`可复制`类型的值。
+
+```move
+    struct Option<T>;
+```
+
+### 函数（Functions）
+
+Create an empty `Option` of that can contain a value of `Element` type.
+
+创建一个可以包含`Element`类型值的空`Option`。
+
+```move
+    public fun none<Element>(): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a non-empty `Option` type containing a value `e` of type `Element`.
+
+创建一个非空的`Option`类型，包含类型为`Element`的值`e`。
+
+```move
+    public fun some<Element>(e: T): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Return an immutable reference to the value inside the option `opt_elem`
+Will abort if `opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的不可变引用,如果`opt_elem`不包含值，则将终止操作。
+
+```move
+    public fun borrow<Element>(opt_elem: &Option<Element>): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a reference to the value inside `opt_elem` if it contains one. If
+`opt_elem` does not contain a value the passed in `default_ref` reference will be returned.
+Does not abort.
+
+如果`opt_elem`中包含值，则返回该值的引用。如果`opt_elem`不包含值，将返回传入的`default_ref`引用。不会终止操作。
+
+```move
+    public fun borrow_with_default<Element>(opt_elem: &Option<Element>, default_ref: &Element): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a mutable reference to the value inside `opt_elem`. Will abort if
+`opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的可变引用。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun borrow_mut<Element>(opt_elem: &mut Option<Element>): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an option value that contains a value to one that is empty in-place by
+removing and returning the value stored inside `opt_elem`.
+Will abort if `opt_elem` does not contain a value.
+
+通过删除并返回存储在`opt_elem`中的值，将包含值的`opt_elem`转换为空option类型。
+如果`opt_elem`不包含值，则将终止。
+
+```move
+    public fun extract<Element>(opt_elem: &mut Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return the value contained inside the option `opt_elem` if it contains one.
+Will return the passed in `default` value if `opt_elem` does not contain a
+value. The `Element` type that the `Option` type is instantiated with must be
+of `copyable` kind in order for this function to be callable.
+
+如果`opt_elem`中包含值，则返回该值。
+如果`opt_elem`不包含值，将返回传入的`default`值。`default`类型必须是`可复制`类型，这样该函数才能被调用。
+
+```move
+    public fun get_with_default<Element: copyable>(opt_elem: &Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an empty option `opt_elem` to an option value that contains the value `e`.
+Will abort if `opt_elem` already contains a value.
+
+将空option类型`opt_elem`转换为包含值`e`的option类。
+如果`opt_elem`已经包含值，则操作将终止。
+
+```move
+    public fun fill<Element>(opt_elem: &mut Option<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Swap the value currently contained in `opt_elem` with `new_elem` and return the
+previously contained value. Will abort if `opt_elem` does not contain a value.
+
+将`opt_elem`当前包含的值与`new_elem`交换，并返回先前包含的值。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun swap<Element>(opt_elem: &mut Option<Element>, e: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return true if `opt_elem` contains a value equal to the value of `e_ref`.
+Otherwise, `false` will be returned.
+
+如果`opt_elem`包含一个等于`e_ref`的值，则返回`true`。否则，将返回`false`。
+
+```move
+    public fun contains<Element>(opt_elem: &Option<Element>, e_ref: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` does not contain a value.
+
+如果`opt_elem`不包含值，则返回`true`。
+
+```move
+    public fun is_none<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` contains a value.
+
+如果`opt_elem`包含值，则返回`true`。
+
+```move
+    public fun is_some<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Unpack `opt_elem` and return the value that it contained.
+Will abort if `opt_elem` does not contain a value.
+
+解包`opt_elem`并返回它所包含的值。
+如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun destroy_some<Element>(opt_elem: Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in. If `opt_elem` contained a value it
+will be returned otherwise, the passed in `default` value will be returned.
+
+销毁传入的`opt_elem`。如果`opt_elem`包含值，它将被返回，否则将返回传入的`default`值。
+
+```move
+    public fun destroy_with_default<Element: copyable>(opt_elem: Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in, `opt_elem` must be empty and not
+contain a value. Will abort if `opt_elem` contains a value.
+
+销毁传入的`opt_elem`，`opt_elem`必须为空且不包含值。如果`opt_elem`包含一个值，则会终止操作。
+
+```move
+    public fun destroy_none<Element>(opt_elem: Option<Element>);
+```
+
+## 错误（errors）
+
+Recall that each abort code in Move is represented as an unsigned 64-bit integer. The `errors` module defines a common interface that can be used to "tag" each of these abort codes so that they can represent both the error **category** along with an error **reason**.
+
+回想一下，Move中的每个终止代码都表示为无符号64位整数。`errors`模块定义了一个通用接口，可用于"标记"每个终止代码，以便它们既可以表示错误**类别**，也可以表示错误**原因**。
+
+Error categories are declared as constants in the `errors` module and are globally unique with respect to this module. Error reasons on the other hand are module-specific error codes, and can provide greater detail (perhaps, even a particular _reason_) about the specific error condition. This representation of a category and reason for each error code is done by dividing the abort code into two sections.
+
+错误类别在`errors`模块中声明为常量，并且对该模块来说是全局唯一的。另一方面，错误原因是特定于模块的错误代码，可以提供关于特定错误条件的更详细的信息(甚至可能是一个特定的_reason_)。每个错误代码的类别和原因的这种表示是通过将终止代码分成两部分来完成的。
+
+The lower 8 bits of the abort code hold the *error category*. The remaining 56 bits of the abort code hold the *error reason*.
+The reason should be a unique number relative to the module which raised the error and can be used to obtain more information about the error at hand. It should mostly be used for diagnostic purposes as error reasons may change over time if the module is updated.
+
+| Category | Reason |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+Since error categories are globally stable, these present the most stable API and should in general be what is used by clients to determine the messages they may present to users (whereas the reason is useful for diagnostic purposes). There are public functions in the `errors` module for creating an abort code of each error category with a specific `reason` number (represented as a `u64`).
+
+终止代码的较低8位保存*错误类别*。终止代码的其余56位包含*错误原因*。
+原因应该是相对于引发错误的模块的唯一数字，并且可以用来获取关于当前错误的更多信息。它应该主要用于诊断目的，因为如果模块更新，错误原因可能会随着时间的推移而变化。
+
+| 类型 | 原因 |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+由于错误类别是全局稳定的，所以它们提供了稳定的API，通常应该由客户端用来确定它们可能向用户提供的消息(而原因则用于诊断目的)。在`errors`模块中有一些公共函数，用于创建每个错误类别的带有特定`原因`号的终止代码(表示为`u64`)。
+
+### 常量（Constants）
+
+The system is in a state where the performed operation is not allowed.
+
+系统处于不允许操作的状态。
+
+```move
+    const INVALID_STATE: u8 = 1;
+```
+
+---------------------------------------------------------------------------
+A specific account address was required to perform an operation, but a different address from what was expected was encounterd.
+
+执行操作需要一个特定的帐户地址，但遇到的地址与预期的不同。
+
+```move
+    const REQUIRES_ADDRESS: u8 = 2;
+```
+
+---------------------------------------------------------------------------
+An account did not have the expected  role for this operation. Useful for Role Based Access Control (RBAC) error conditions.
+
+帐户没有此操作的预期角色。用于基于角色访问控制(RBAC)错误。
+
+```move
+    const REQUIRES_ROLE: u8 = 3;
+```
+
+---------------------------------------------------------------------------
+An account did not not have a required capability. Useful for RBAC error conditions.
+
+帐户没有所需的能力。用于RBAC错误。
+
+```move
+    const REQUIRES_CAPABILITY: u8 = 4;
+```
+
+---------------------------------------------------------------------------
+A resource was expected, but did not exist under an address.
+
+地址下不存在期望的资源。
+
+```move
+    const NOT_PUBLISHED: u8 = 5;
+```
+
+---------------------------------------------------------------------------
+Attempted to publish a resource under an address where one was already published.
+
+试图在已发布资源的地址发布资源。
+
+```move
+    const ALREADY_PUBLISHED: u8 = 6;
+```
+
+---------------------------------------------------------------------------
+An argument provided for an operation was invalid.
+
+为操作提供的参数无效。
+
+```move
+    const INVALID_ARGUMENT: u8 = 7;
+```
+
+---------------------------------------------------------------------------
+A limit on a value was exceeded.
+
+超过了一个值的限制。
+
+```move
+    const LIMIT_EXCEEDED: u8 = 8;
+```
+
+---------------------------------------------------------------------------
+An internal error (bug) has occurred.
+
+发生了内部错误(bug)。
+
+```move
+    const INTERNAL: u8 = 10;
+```
+
+---------------------------------------------------------------------------
+A custom error category for extension points.
+
+扩展自定义错误类别。
+
+```move
+    const CUSTOM: u8 = 255;
+```
+
+---------------------------------------------------------------------------
+
+### 函数（Functions）
+
+ Should be used in the case where invalid (global) state is encountered. Constructs an abort code with specified `reason` and category `INVALID_STATE`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到无效(全局)状态的情况下应使用。构造一个具有指定的`reason`和类别`INVALID_STATE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_state(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account's address does not match a specific address. Constructs an abort code with specified `reason` and category `REQUIRES_ADDRESS`. Will abort if `reason` does not fit in 56 bits.
+
+当账户地址与特定地址不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ADDRESS`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_address(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a role did not match a required role when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_ROLE`. Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，角色与所需角色不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ROLE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_role(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account did not have a required capability when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_CAPABILITY`. Should be Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，帐户没有必要的能力时应使用。构造一个具有指定的`reason`和类别`REQUIRES_CAPABILITY`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_capability(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource did not exist where one was expected. Constructs an abort code with specified `reason` and category `NOT_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+在需要资源的地方不存在资源时应使用。构造一个具有指定的`reason`和类别`NOT_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun not_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource already existed where one was about to be published. Constructs an abort code with specified `reason` and category `ALREADY_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+要发布资源的地方已经存在资源时使用。构造一个具有指定的`reason`和类别`ALREADY_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun already_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an invalid argument was passed to a function/operation. Constructs an abort code with specified `reason` and category `INVALID_ARGUMENT`. Will abort if `reason` does not fit in 56 bits.
+
+当向函数/操作传递无效参数时使用。构造一个具有指定的`reason`和类别`INVALID_ARGUMENT`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_argument(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a limit on a specific value is reached, e.g., subtracting 1 from a value of 0. Constructs an abort code with specified `reason` and category `LIMIT_EXCEEDED`. Will abort if `reason` does not fit in 56 bits.
+
+当达到特定值的限制时应使用，例如，0减去1。构造一个具有指定的`reason`和类别`LIMIT_EXCEEDED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun limit_exceeded(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an internal error or bug was encountered. Constructs an abort code with specified `reason` and category `INTERNAL`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到内部错误或错误时使用。构造一个具有指定的`reason`和类别`INTERNAL`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun internal(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Used for extension points, should be not used under most circumstances. Constructs an abort code with specified `reason` and category `CUSTOM`. Will abort if `reason` does not fit in 56 bits.
+
+用于扩展，大多数情况下不应使用。构造一个具有指定的`reason`和类别`CUSTOM`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun custom(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+
+## 32位精确定点数字（fixed_point32）
+
+The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
+
+`fixed_point32`模块定义了一个具有32个整数位和32个小数位的定点数值类型。在内部，它被表示为一个`u64`整数，包装在一个结构中，形成一个唯一的`fixed_point32`类型。由于数字表示是二进制的，一些十进制值可能不能完全表示，但它在小数点之前和之后都提供了9位以上的十进制精度(总共18位)。为了进行比较，双精度浮点数的精度小于16位十进制数字，因此在使用浮点数将这些值转换为十进制时应该小心。
+
+### 类型（Types）
+Represents a fixed-point numeric number with 32 fractional bits.
+
+表示具有32个小数位的定点数字。
+
+```move
+    struct FixedPoint32;
+```
+
+### 函数（Functions）
+
+Multiply a u64 integer by a fixed-point number, truncating any fractional part of the product. This will abort if the product overflows.
+
+当u64整数乘以定点数，截断乘积的任何小数部分。如果乘积溢出，该操作将终止。
+
+```move
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Divide a u64 integer by a fixed-point number, truncating any fractional part of the quotient. This will abort if the divisor is zero or if the quotient overflows.
+
+当u64整数除以定点数，截断商的任何小数部分。如果除数为零或商溢出，该操作将终止。
+
+```move
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Create a fixed-point value from a rational number specified by its numerator and denominator. Calling this function should be preferred for using `fixed_point32::create_from_raw_value` which is also available. This will abort if the denominator is zero. It will also abort if the numerator is nonzero and the ratio is not in the range $2^{-32}\ldots2^{32}-1$. When specifying decimal fractions, be careful about rounding errors: if you round to display $N$ digits after the decimal point, you can use a denominator of $10^N$ to avoid numbers where the very small imprecision in the binary representation could change the rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+根据分子和分母指定的有理数创建定点值。如果`fixed_point32::create_from_raw_value`函数可用，应优先使用。如果分母为零，该操作将终止。如果分子非零且比值不在$2^{-32}\ldots2^{32}-1$范围内，该操作将终止。指定小数时，请注意四舍五入错误：如果要对小数点后$N$位进行四舍五入，则可以用$10^N$做分母，这样就能避免精确度丢失问题，例如，0.0125将四舍五入到0.012而不是0.013。
+
+```move
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Create a fixedpoint value from a raw `u64` value.
+
+通过`u64`原始值创建一个定点值。
+
+```move
+    public fun create_from_raw_value(value: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Returns `true` if the decimal value of `num` is equal to zero.
+
+如果`num`的十进制值等于0，则返回`true`。
+
+```move
+    public fun is_zero(num: FixedPoint32): bool;
+```
+
+---------------------------------------------------------------------------
+Accessor for the raw `u64` value. Other less common operations, such as adding or subtracting `FixedPoint32` values, can be done using the raw values directly.
+
+获取`u64`原始值的方法。其他不太常见的操作，例如添加或减去`FixedPoint32`值，可以直接使用原始值来完成。
+
+```move
+    public fun get_raw_value(num: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/structs-and-resources.md b/vendors/move/documentation/book/translations/move-book-zh/src/structs-and-resources.md
new file mode 100644
index 000000000..9dcf97c95
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/structs-and-resources.md
@@ -0,0 +1,591 @@
+# 结构体和资源
+
+A _struct_ is a user-defined data structure containing typed fields. Structs can store any
+non-reference type, including other structs.
+
+***结构体***（struct）是包含类型字段的自定义数据结构。结构体可以存储任何非引用类型，包括其他结构。
+
+We often refer to struct values as _resources_ if they cannot be copied and cannot be dropped. In
+this case, resource values must have ownership transferred by the end of the function. This property
+makes resources particularly well served for defining global storage schemas or for representing
+important values (such as a token).
+
+如果结构值无法复制且无法删除，我们通常将其称为***资源***（resource）。在这种情况下，资源值必须在函数结束时转移所有权。这个属性使资源特别适合定义全局存储模式或表示重要的值（如 token）。
+
+By default, structs are linear and ephemeral. By this we mean that they: cannot be copied, cannot be
+dropped, and cannot be stored in global storage. This means that all values have to have ownership
+transferred (linear) and the values must be dealt with by the end of the program's execution
+(ephemeral). We can relax this behavior by giving the struct [abilities](./abilities.md) which allow
+values to be copied or dropped and also to be stored in global storage or to define global storage
+schemas.
+
+默认情况下，结构体是线性的和临时的。我们的意思是它们：不能被复制，不能被删除，不能被存储在全局存储中。这意味着所有值都必须转移所有权（线性），并且必须在程序执行结束时处理这些值（临时）。我们可以通过赋予结构体允许复制或删除值以及将值存储在全局存储中或定义全局存储模式的[能力](./abilities.md)来放松这种行为（减轻限制）。
+
+## 定义结构体
+
+Structs must be defined inside a module:
+
+结构体必须在模块内定义：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar {}
+    struct Baz { foo: Foo, }
+    //                   ^ 注意：尾随逗号是可以的
+}
+}
+```
+
+Structs cannot be recursive, so the following definition is invalid:
+
+结构体不能递归（定义），所以下面的定义是无效的：
+
+```move
+struct Foo { x: Foo }
+//              ^ 错误！ Foo 不能包含 Foo
+```
+
+As mentioned above: by default, a struct declaration is linear and ephemeral. So to allow the value
+to be used with certain operations (that copy it, drop it, store it in global storage, or use it as
+a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
+`has <ability>`:
+
+如上所述：默认情况下，结构体声明是线性且临时的。因此，为了允许将值用于某些操作（复制、删除、将其存储在全局存储中或将其用作存储模式），可以通过使用 `has <ability>` 标注它们来授予结构体[能力](./abilities.md)：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64, y: bool }
+}
+}
+```
+
+For more details, see the [annotating structs](./abilities.md#annotating-structs) section.
+
+有关更多详细信息，请参阅[标注结构体](./abilities.md#标注结构体)部分。
+
+### 命名
+
+Structs must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+结构体必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，结构体名称可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+struct Foo {}
+struct BAR {}
+struct B_a_z_4_2 {}
+```
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。以后可能会也可能不会删除这个限制。
+
+## 使用结构体
+
+### 创建结构体
+
+Values of a struct type can be created (or "packed") by indicating the struct name, followed by
+value for each field:
+
+可以通过写明结构体名称来创建（或“打包”）结构体类型的值，然后是每个字段的值：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64, y: bool }
+    struct Baz has drop { foo: Foo }
+
+    fun example() {
+        let foo = Foo { x: 0, y: false };
+        let baz = Baz { foo: foo };
+    }
+}
+}
+```
+
+If you initialize a struct field with a local variable whose name is the same as the field, you can
+use the following shorthand:
+
+如果使用与字段名相同的局部变量初始化结构体字段，则可以使用以下简写：
+
+```move
+let baz = Baz { foo: foo };
+// 相当于
+let baz = Baz { foo };
+```
+
+This is called sometimes called "field name punning".
+
+这有时称为“字段名双关语”。
+
+### 通过模式匹配销毁结构体
+
+Struct values can be destroyed by binding or assigning them patterns.
+
+结构值可以通过绑定或赋值模式来销毁。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar { foo: Foo }
+    struct Baz {}
+
+    fun example_destroy_foo() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: foo_y } = foo;
+        //        ^ `x: x` 的简写
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   foo_y: bool = false
+    }
+
+    fun example_destroy_foo_wildcard() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: _ } = foo;
+
+        // 由于 y 绑定到通配符，因此只有一个新绑定
+        //   x: u64 = 3
+    }
+
+    fun example_destroy_foo_assignment() {
+        let x: u64;
+        let y: bool;
+        Foo { x, y } = Foo { x: 3, y: false };
+
+        // 改变现有变量 x 和 y
+        //   x = 3, y = false
+    }
+
+    fun example_foo_ref() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &foo;
+
+        // 两个新绑定
+        //   x: &u64
+        //   y: &bool
+    }
+
+    fun example_foo_ref_mut() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &mut foo;
+
+        // 两个新绑定
+        //   x: &mut u64
+        //   y: &mut bool
+    }
+
+    fun example_destroy_bar() {
+        let bar = Bar { foo: Foo { x: 3, y: false } };
+        let Bar { foo: Foo { x, y } } = bar;
+        //             ^ 嵌套模式
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   y: bool = false
+    }
+
+    fun example_destroy_baz() {
+        let baz = Baz {};
+        let Baz {} = baz;
+    }
+}
+}
+```
+
+### 借用结构体和字段
+
+The `&` and `&mut` operator can be used to create references to structs or fields. These examples
+include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
+
+`&` 和 `&mut` 运算符可用于创建对结构体或字段的引用。这些例子包括一些可选的类型标注（例如，`: &Foo`）来演示操作的类型。
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref: &Foo = &foo;
+let y: bool = foo_ref.y;          // 通过对结构体的引用读取字段
+let x_ref: &u64 = &foo.x;
+
+let x_ref_mut: &mut u64 = &mut foo.x;
+*x_ref_mut = 42;            // 通过可变引用修改字段
+```
+
+It is possible to borrow inner fields of nested structs.
+
+可以借用嵌套结构体的内部字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+
+let x_ref = &bar.foo.x;
+```
+
+You can also borrow a field via a reference to a struct.
+
+你还可以通过对结构体的引用来借用字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &foo;
+let x_ref = &foo_ref.x;
+// 这与 let x_ref = &foo.x 的效果相同
+```
+
+### 读写字段
+
+If you need to read and copy a field's value, you can then dereference the borrowed field
+
+如果你需要读取和复制字段的值，则可以解引用借用的字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo: copy foo };
+let x: u64 = *&foo.x;
+let y: bool = *&foo.y;
+let foo2: Foo = *&bar.foo;
+```
+
+If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
+any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
+
+如果该字段是隐式可复制的，则点运算符可用于读取结构体的字段而无需任何借用。（只有具有 `copy` 能力的标量值是隐式可复制的。）
+
+```move
+let foo = Foo { x: 3, y: true };
+let x = foo.x;  // x == 3
+let y = foo.y;  // y == true
+```
+
+Dot operators can be chained to access nested fields.
+
+点运算符可以链式访问嵌套字段：
+
+```move
+let baz = Baz { foo: Foo { x: 3, y: true } };
+let x = baz.foo.x; // x = 3;
+```
+
+However, this is not permitted for fields that contain non-primitive types, such a vector or another
+struct
+
+但是，对于包含非原始类型（例如向量或其他结构体）的字段，这是不允许的：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+let foo2: Foo = *&bar.foo;
+let foo3: Foo = bar.foo; // 错误！必须使用 *& 添加显式复制
+```
+
+The reason behind this design decision is that copying a vector or another struct might be an
+expensive operation. It is important for a programmer to be aware of this copy and make others aware
+with the explicit syntax `*&`
+
+In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
+field being a primitive type or some other struct
+
+这个设计决策背后的原因是复制一个向量或另一个结构体可能是一项昂贵的操作。对于程序员来说，了解这个复制（操作）并使用显式语法 `*&` 让其他人意识到是很重要的。
+
+除了从字段中读取之外，点语法还可用于修改字段，无论该字段是原始类型还是其他结构体。
+
+```move
+let foo = Foo { x: 3, y: true };
+foo.x = 42;     // foo = Foo { x: 42, y: true }
+foo.y = !foo.y; // foo = Foo { x: 42, y: false }
+let bar = Bar { foo };            // bar = Bar { foo: Foo { x: 42, y: false } }
+bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
+bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
+```
+
+The dot syntax also works via a reference to a struct
+
+点语法也适用于对结构体的引用：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &mut foo;
+foo_ref.x = foo_ref.x + 1;
+```
+
+## 私有结构体操作
+
+Most struct operations on a struct type `T` can only be performed inside the module that declares
+`T`:
+
+- Struct types can only be created ("packed"), destroyed ("unpacked") inside the module that defines
+  the struct.
+- The fields of a struct are only accessible inside the module that defines the struct.
+
+Following these rules, if you want to modify your struct outside the module, you will need to
+provide public APIs for them. The end of the chapter contains some examples of this.
+
+However, struct _types_ are always visible to another module or script:
+
+大多数对结构体类型 `T` 的结构体操作只能在声明 `T` 的模块内执行：
+
+- 结构体类型只能在定义结构体的模块内创建（“打包”）、销毁（“解包”）。
+- 结构体的字段只能在定义结构体的模块内部访问。
+
+按照这些规则，如果你想在模块之外修改你的结构体，你需要为他们提供公共 API。本章的最后包含了这方面的一些例子。
+
+但是，结构体类型始终对其他模块或脚本可见：
+
+```move
+// m.move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64 }
+
+    public fun new_foo(): Foo {
+        Foo { x: 42 }
+    }
+}
+}
+```
+
+```move
+// n.move
+address 0x2 {
+module n {
+    use 0x2::m;
+
+    struct Wrapper has drop {
+        foo: m::Foo
+    }
+
+    fun f1(foo: m::Foo) {
+        let x = foo.x;
+        //      ^ 错误！此处无法访问 `foo` 的字段
+    }
+
+    fun f2() {
+        let foo_wrapper = Wrapper { foo: m::new_foo() };
+    }
+}
+}
+```
+
+Note that structs do not have visibility modifiers (e.g., `public` or `private`).
+
+请注意，结构体没有可见性修饰符（例如，`public` 或 `private`）。
+
+## 所有权
+
+As mentioned above in [Defining Structs](#defining-structs), structs are by default linear and
+ephemeral. This means they cannot be copied or dropped. This property can be very useful when
+modeling real world resources like money, as you do not want money to be duplicated or get lost in
+circulation.
+正如上面[定义结构体](#定义结构体)中提到的，结构体默认是线性的和临时的。这意味着它们不能被复制或删除。在模拟货币等现实世界资源时，此属性非常有用，因为你不希望货币被复制或在流通中丢失。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun copying_resource() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo; // 错误！“复制”需要“复制”能力
+        let foo_ref = &foo;
+        let another_copy = *foo_ref // 错误！解引用需要“复制”能力
+    }
+
+    public fun destroying_resource1() {
+        let foo = Foo { x: 100 };
+
+        // 错误！当函数返回时，foo 仍然包含一个值。
+        // 这种销毁需要“drop”能力
+    }
+
+    public fun destroying_resource2(f: &mut Foo) {
+        *f = Foo { x: 100 } // 错误！通过写入销毁旧值需要“drop”能力
+    }
+}
+}
+```
+
+To fix the second example (`fun dropping_resource`), you would need to manually "unpack" the resource:
+
+要修复第二个示例（`fun destroying_resource1`），你需要手动“解包”资源：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun destroying_resource1_fixed() {
+        let foo = Foo { x: 100 };
+        let Foo { x: _ } = foo;
+    }
+}
+}
+```
+
+Recall that you are only able to deconstruct a resource within the module in which it is defined.
+This can be leveraged to enforce certain invariants in a system, for example, conservation of money.
+
+If on the other hand, your struct does not represent something valuable, you can add the abilities
+`copy` and `drop` to get a struct value that might feel more familiar from other programming
+languages:
+
+回想一下，你只能在定义资源的模块中解构资源。这可以用来在系统中强制执行某些不变量，例如货币守恒。
+
+另一方面，如果你的结构体不代表有价值的东西，你可以添加 `copy` 和 `drop` 能力来获取一个结构值，这感觉可能会与其他编程语言更相似。
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64 }
+
+    public fun run() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo;
+        // ^ 此代码复制 foo，而 `let x = foo` 或
+        // `let x = move foo` 都移动 foo
+
+        let x = foo.x;            // x = 100
+        let x_copy = foo_copy.x;  // x = 100
+
+        // 函数返回时 foo 和 foo_copy 都被隐式丢弃
+    }
+}
+}
+```
+
+## 在全局存储中存储资源
+
+Only structs with the `key` ability can be saved directly in
+[persistent global storage](./global-storage-operators.md). All values stored within those `key`
+structs must have the `store` abilities. See the [ability](./abilities] and
+[global storage](./global-storage-operators.md) chapters for more detail.
+
+只有具有 `key` 能力的结构体才能直接保存在[持久性全局存储](./global-storage-operators.md)中。存储在这些 `key` 结构体中的所有值都必须具有 `store` 能力。有关更多详细信息，请参阅[能力](./abilities.md)和[全局存储](./global-storage-operators.md)章节。
+
+## 示例
+
+Here are two short examples of how you might use structs to represent valuable data (in the case of
+`Coin`) or more classical data (in the case of `Point` and `Circle`)
+
+这里有两个简短的示例，说明如何使用结构体来表示有价值的数据（在 `Coin` 的情况下）或更经典的数据（在 `Point` 和 `Circle` 的情况下）。
+
+### 示例 1：Coin
+
+<!-- TODO link to access control for mint -->
+
+```move
+address 0x2 {
+module m {
+    // 我们不希望钱币（Coin）被复制，因为那会复制这个“钱”，
+    // 所以我们不会给结构体“copy”能力。
+    // 同样，我们不希望程序员销毁钱币，所以我们不会给结构体“drop”能力。
+    // 但是，我们*希望*模块的用户能够将这个钱币存储在持久的全局存储中，
+    // 所以我们授予结构体“store”能力。
+    // 这个结构体只会在全局存储内的其他资源中，因此我们不会赋予该结构体“key”能力。
+    struct Coin has store {
+        value: u64,
+    }
+
+    public fun mint(value: u64): Coin {
+        // 你可能希望通过某种形式的访问控制来关闭此（铸币）功能，以防止使用此模块的任何人铸造无限数量的钱币。
+        Coin { value }
+    }
+
+    public fun withdraw(coin: &mut Coin, amount: u64): Coin {
+        assert!(coin.balance >= amount, 1000);
+        coin.value = coin.value - amount;
+        Coin { value: amount }
+    }
+
+    public fun deposit(coin: &mut Coin, other: Coin) {
+        let Coin { value } = other;
+        coin.value = coin.value + value;
+    }
+
+    public fun split(coin: Coin, amount: u64): (Coin, Coin) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun merge(coin1: Coin, coin2: Coin): Coin {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+
+    public fun destroy_zero(coin: Coin) {
+        let Coin { value } = coin;
+        assert!(value == 0, 1001);
+    }
+}
+}
+```
+
+### 示例 2：Geometry
+
+```move
+address 0x2 {
+module point {
+    struct Point has copy, drop, store {
+        x: u64,
+        y: u64,
+    }
+
+    public fun new(x: u64, y: u64): Point {
+        Point {
+            x, y
+        }
+    }
+
+    public fun x(p: &Point): u64 {
+        p.x
+    }
+
+    public fun y(p: &Point): u64 {
+        p.y
+    }
+
+    fun abs_sub(a: u64, b: u64): u64 {
+        if (a < b) {
+            b - a
+        }
+        else {
+            a - b
+        }
+    }
+
+    public fun dist_squared(p1: &Point, p2: &Point): u64 {
+        let dx = abs_sub(p1.x, p2.x);
+        let dy = abs_sub(p1.y, p2.y);
+        dx*dx + dy*dy
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module circle {
+    use 0x2::point::{Self, Point};
+
+    struct Circle has copy, drop, store {
+        center: Point,
+        radius: u64,
+    }
+
+    public fun new(center: Point, radius: u64): Circle {
+        Circle { center, radius }
+    }
+
+    public fun overlaps(c1: &Circle, c2: &Circle): bool {
+        let d = point::dist_squared(&c1.center, &c2.center);
+        let r1 = c1.radius;
+        let r2 = c2.radius;
+        d*d <= r1*r1 + 2*r1*r2 + r2*r2
+    }
+}
+}
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/tuples.md b/vendors/move/documentation/book/translations/move-book-zh/src/tuples.md
new file mode 100644
index 000000000..b3182e8c2
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/tuples.md
@@ -0,0 +1,117 @@
+# 元组和单值
+
+Move 不完全支持元组，因为人们可能期望像来自另一种语言的元组一样将它们作为[头等值（即头等公民）](https://zh.wikipedia.org/wiki/%E9%A0%AD%E7%AD%89%E7%89%A9%E4%BB%B6)。但是，为了支持多个返回值，Move 具有类似元组的表达式。这些表达式在运行时不会产生具体的值（字节码中没有元组），因此它们非常有限：它们只能出现在表达式中（通常在函数的返回位置）；它们不能绑定到局部变量；它们不能存储在结构中；元组类型不能用于实例化泛型。
+
+类似地，[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B) 是 Move 源语言创建的一种以表达式为基础的类型。单值 `()` 不会产生任何运行时值。我们可以认为单值 `()` 是一个空元组，适用于元组的任何限制也适用于单值。
+
+考虑到这些限制，在语言中使用元组可能会感觉很奇怪。但其他语言中，元组最常见的用例之一是函数 —— 允许函数返回多个值。一些语言通过强制用户编写包含多个返回值的结构来解决这个问题。但是在 Move 中，您不能将引用放在[结构体](./structs-and-resources.md)中。这需要 Move 支持多个返回值。这些多个返回值都在字节码级别被压入到堆栈中。在源码级别，这些多个返回值使用元组表示。
+
+## 字面量
+
+元组（tuple）是由括号内以逗号分隔的表达式列表创建的。
+
+| 语法            | 类型                                                                        | 描述                                    |
+|-----------------|-----------------------------------------------------------------------------|-----------------------------------------|
+| `()`            | `(): ()`                                                                    | 单值、空元组或 0 元素元组               |
+| `(e1, ..., en)` | `(e1, ..., en): (T1, ..., Tn)` 其中 `e_i: Ti` 满足 `0 < i <= n` and `n > 0` | n 元组、n 元素元组、带有 n 个元素的元组 |
+
+注意 `(e)` 没有类型 `(e): (t)`，换句话说，没有一个元素的元组。如果括号内只有一个元素，则括号仅用于消除歧义，不带有任何其他特殊含义。
+
+有时，具有两个元素的元组称为“二元组（pairs）”，而具有三个元素的元组称为“三元组（triples）”。
+
+### 例子
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+
+    // 当没有提供返回类型时，假定为 `()`
+    fun returns_unit_1() { }
+
+    // 空表达式块中存在隐式 () 值
+    fun returns_unit_2(): () { }
+
+    // `returns_unit_1` 和 `returns_unit_2` 的显式版本
+    fun returns_unit_3(): () { () }
+
+
+    fun returns_3_values(): (u64, bool, address) {
+        (0, false, @0x42)
+    }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) {
+        (x, 0, 1, b"foobar")
+    }
+}
+}
+```
+
+## 操作
+
+目前唯一可以对元组执行的操作是解构（destructuring）。
+
+### 解构
+
+对于任何大小的元组，它们可以在 `let` 绑定或赋值中被解构。
+
+例如：
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+    fun returns_unit() {}
+    fun returns_2_values(): (bool, bool) { (true, false) }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) { (x, 0, 1, b"foobar") }
+
+    fun examples(cond: bool) {
+        let () = ();
+        let (x, y): (u8, u64) = (0, 1);
+        let (a, b, c, d) = (@0x0, 0, false, b"");
+
+        () = ();
+        (x, y) = if (cond) (1, 2) else (3, 4);
+        (a, b, c, d) = (@0x1, 1, true, b"1");
+    }
+
+    fun examples_with_function_calls() {
+        let () = returns_unit();
+        let (x, y): (bool, bool) = returns_2_values();
+        let (a, b, c, d) = returns_4_values(&0);
+
+        () = returns_unit();
+        (x, y) = returns_2_values();
+        (a, b, c, d) = returns_4_values(&1);
+    }
+}
+}
+```
+
+有关更多详细信息，请参阅 [Move 变量](./variables.md)。
+
+## 子类型
+
+除了引用，元组是唯一在 Move 中具有[子类型（subtyping）](https://zh.wikipedia.org/wiki/%E5%AD%90%E7%B1%BB%E5%9E%8B)的类型。元组只有在具有引用的子类型（以协变方式）的意义上才具有子类型。
+
+例如:
+
+```move
+let x: &u64 = &0;
+let y: &mut u64 = &mut 1;
+
+// (&u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (a, b): (&u64, &u64) = (x, y);
+
+// (&mut u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (c, d): (&u64, &u64) = (y, y);
+
+// 错误！(&u64, &mut u64) 不是 (&mut u64, &mut u64) 的子类型
+// 因为 &u64 不是 &mut u64 的子类型
+let (e, f): (&mut u64, &mut u64) = (x, y);
+```
+
+## 所有权
+
+如上所述，元组值在运行时并不真正存在。由于这个原因，目前它们不能存储到局部变量中（但这个功能很可能很快就会出现）。因此，元组目前只能移动，因为复制它们需要先将它们放入局部变量中。
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/unit-testing.md b/vendors/move/documentation/book/translations/move-book-zh/src/unit-testing.md
new file mode 100644
index 000000000..24f1fa5fc
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/unit-testing.md
@@ -0,0 +1,367 @@
+# 单元测试 (Unit Tests)
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+Move 语言中存在三种单元测试标注：
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail. These annotations can be placed on a function with any visibility. Whenever a module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+它们分别把函数、模块或模块成员（`use` 声明，函数 function，或结构体 struct）标记为只用于测试的代码，同时也标记期望失败的测试。这些标注可以用在任何可见性（visibility）函数上。无论何种情况，被标注为 `#[test_only]` 或 `#[test]` 的模块或模块成员除非用于测试，其它情况都不会被编译成字节码。
+
+## 测试注解：含义和使用方法（Testing Annotations: Their Meaning and Usage）
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+`#[test]` 和 `#[expected_failure]` 两个注解均可以在有、无参数情况下使用。
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+没有参数的 `#[test]` 标记只能用于没有参数的函数。表示该函数作为单元测试函数被运行。
+
+```
+#[test] // 正确 // OK
+fun this_is_a_test() { ... }
+
+#[test] // 编译失败，因为函数需要参数 // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the test should is expected to raise an error. You can ensure that a test is aborting with a specific abort code by annotating it with `#[expected_failure(abort_code = <code>)]`, if it then fails with a different abort code or with a non-abort error the test will fail. Only functions that have the `#[test]` annotation can also be annotated as an #`[expected_failure]`.
+
+测试也可以使用 `#[expected_failure]` 标注，表示该函数会抛出错误。你可以使用 `#[expected_failure(abort_code = <code>)]` 这种方式方式确保此测试会被指定错误码打断，如果抛出不同错误码或没有抛出错误测试将失败。只有被 `#[test]` 标注的函数才能使用 `#[expected_failure]` 标注。
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_will_abort_and_pass() { abort 1 }
+
+#[test]
+#[expected_failure]
+public fun test_will_error_and_pass() { 1/0; }
+
+#[test]
+#[expected_failure(abort_code = 0)]
+public fun test_will_error_and_fail() { 1/0; }
+
+#[test, expected_failure] // 可以合并多个属性。测试将会通过。 // Can have multiple in one attribute. This test will pass.
+public fun this_other_test_will_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do not have to be the same, but they must be able to be matched up with each other by name.
+
+测试标注可以采用 `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]` 这种形式指定参数。如果函数使用这样的标注，函数的参数则必须为 `<param_name_1>, ..., <param_name_n>` 的形式。参数在函数中的顺序不必与注解中顺序一致，但必须要能根据参数名匹配。
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+只有 `signer` 类型可以用作测试参数。使用非 `signer` 类型参数，测试将会失败。
+
+```
+#[test(arg = @0xC0FFEE)] // 正确 // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // 不正确: 参数名不匹配 // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // 正确，多参数情况下必须为每个参数提供值。 // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// 在某处声明一个命名地址（named address） // somewhere a named address is declared
+#[test_only] // 命名地址支持 test-only 注解 // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // 支持命名地址！ // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+预期失败的标注使用 `#[expected_failure(abort_code = <u64>)]` 这种形式。如果函数被这样标注，测试错误码必须为 `<u64>`。任何其它的错误或错误码都会失败。
+
+```
+#[test, expected_failure(abort_code = 1)] // 这个测试会失败 // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // 这个测试会通过 // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+模块和它的成员可以被声明为仅测试用。这种情况它们只会在测试模式下编译。此外，在非测试模式下，任何被 `#[test_only]` 标记的模块都会在编译时报错。
+
+```
+#[test_only] // test only 属性可以用于模块  // test only attributes can be attached to modules
+module abc { ... }
+
+#[test_only] // test only 属性可以用于命名地址 // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. 用于 use 声明 // .. to uses
+use 0x1::some_other_module;
+
+#[test_only] // .. 用于结构体 // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. 用于函数。只能在测试函数中调用，但自身不是测试 // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+## 运行单元测试（Running Unit Tests）
+
+Unit tests for a Move package can be run with the [`move test`
+command](./packages.md).
+
+使用 [`move test` 命令](./packages.md)运行包中的单元测试。
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+运行测试的结果包括 `PASS`、`FAIL` 或 `TIMEOUT`。如果测试失败，将会尽可能的提供执行失败的位置及函数名信息。请看下面的例子。
+
+A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+任何测试执行超过最大数量指令限制将会标记成超时。可以通过参数调整此限制，默认值为 5000 条指令。此外，虽然测试结果是确定的，但由于测试默认并行执行，所以测试结果的顺序是不确定的，除非使用单线程模式（见下述参数）。
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
+
+存在大量参数细粒度调整测试工具的行为，帮助调试失败的测试。可以通过 help 参数查看。
+
+```
+$ move -h
+```
+
+## 示例（Example）
+
+A simple module using some of the unit testing features is shown in the following example:
+
+下面例子展示了一个简单的使用了单元测试特性的模块：
+
+First create an empty package and change directory into it:
+
+首先创建一个空 package 进入目录：
+
+```
+$ move new TestExample; cd TestExample
+```
+
+Next add the following to the `Move.toml`:
+
+接下来添加下面内容到 `Move.toml` 文件：
+
+```
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b", addr_subst = { "std" = "0x1" } }
+```
+
+Next add the following module under the `sources` directory:
+
+接下来在 `sources` 目录下添加下述模块：
+
+```
+// 文件路径: sources/my_module.move // filename: sources/my_module.move
+module 0x1::my_module {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert!(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // 如果不关心错误码也可以使用 #[expected_failure] // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // 仅用作测试的帮助方法 // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+        assert!(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### 运行测试（Running Tests）
+
+You can then run these tests with the `move test` command:
+
+你可以使用 `move test` 命令运行测试。
+
+```
+$ move test
+BUILDING MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### 使用测试参数（Using Test Flags）
+
+#### `-f <str>` 或 `--filter <str>`（`-f <str>` or `--filter <str>`）
+
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+仅运行名字包含 `<str>` 字符的测试。例如只想运行名字包含 `"zero_coin"` 的测试：
+
+
+```
+$ move test -f zero_coin
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` 或 `--gas_used <bound>`（`-i <bound>` or `--gas_used <bound>`）
+
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+调整测试指令限制为 `<bound>`：
+
+```
+$ move test -i 0
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ TIMEOUT ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::my_module::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::my_module::test_has_coin
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` 或 `--statistics`（`-s` or `--statistics`）
+
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
+
+使用此参数你可以得到每个测试的运行报告及执行指令的统计信息。例如查看上述示例的统计数据：
+
+```
+$ move test -s
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+
+Test Statistics:
+
+┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                    │    Time    │   Gas Used   │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_zero_coin_fails      │   0.008    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::test_has_coin                  │   0.008    │             1             │
+└────────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` 或 `--state-on-error`（`-g` or `--state-on-error`）
+
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `my_module` example:
+
+这个参数会在测试失败情况下打印全局状态。如在 `my_module` 模块中添加下述失败测试：
+
+```
+module 0x1::my_module {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get get the following output when running the tests:
+
+当运行测试时我们将得到下面的输出：
+
+```
+$ move test -g
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+[ FAIL    ] 0x1::my_module::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── test_has_coin_bad ──────
+│ error[E11001]: test failure
+│    ┌─ /home/tzakian/TestExample/sources/my_module.move:47:10
+│    │
+│ 44 │      fun test_has_coin_bad(a: signer) {
+│    │          ----------------- In this function in 0x1::my_module
+│    ·
+│ 47 │          assert!(has_coin(@0x2), 1);
+│    │          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::my_module::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/uses.md b/vendors/move/documentation/book/translations/move-book-zh/src/uses.md
new file mode 100644
index 000000000..79918badf
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/uses.md
@@ -0,0 +1,376 @@
+# 使用与别名（Uses and Aliases）
+
+The `use` syntax can be used to create aliases to members in other modules. `use` can be used to
+create aliases that last either for the entire module, or for a given expression block scope.
+
+`use` 语法可用于为其他模块中的成员创建别名。 `use` 可用于创建持续整个模块或给定表达式块范围的别名。
+
+## 语法（Syntax）
+There are several different syntax cases for `use`. Starting with the most simple, we have the
+following for creating aliases to other modules
+
+这里有几种不同的语法案例可供使用。从最简单的开始，我们有以下例子用于为其他模块创建别名
+
+```move
+use <address>::<module name>;
+use <address>::<module name> as <module alias name>;
+```
+For example
+举例
+```move
+use std::vector;
+use std::vector as V;
+```
+
+`use std::vector;` introduces an alias `vector` for `std::vector`. This means that anywhere you
+would want to use the module name `std::vector` (assuming this `use` is in scope), you could use
+`vector` instead. `use std::vector;` is equivalent to `use std::vector as vector;`
+
+`use std::vector；`为 `std::vector` 引入别名向量。这意味着在任何您想使用模块名称 `std::vector` 的地方（假设此`use`在作用域内），您都可以使用 `vector` 代替使用`std::vector`;
+
+Similarly `use std::vector as V;` would let you use `V` instead of `std::vector`
+
+同样使用 `std::vector as V`;会让你使用 `V` 代替 `std::vector`
+
+```move
+use std::vector;
+use std::vector as V;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = vector::empty();
+    let v3 = V::empty();
+    (v1, v2, v3)
+}
+```
+If you want to import a specific module member (such as a function, struct, or constant). You can
+use the following syntax.
+
+如果要导入特定的模块成员（例如函数、结构或常量）。您可以使用以下语法。
+```move
+use <address>::<module name>::<module member>;
+use <address>::<module name>::<module member> as <member alias>;
+```
+For example
+举例
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+```
+
+This would let you use the function `std::vector::empty` without full qualification. Instead you
+could use `empty` and `empty_vec` respectively. Again, `use std::vector::empty;` is equivalent to
+`use std::vector::empty as empty;`
+
+这将允许您在没有前缀限定的情况下使用函数 `std::vector::empty`。相反，您可以分别使用 `empty` 和 `empty_vec`，使用 `std::vector::empty;`使用`empty` 相当于使用`std::vector::empty`;
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = empty();
+    let v3 = empty_vec();
+    (v1, v2, v3)
+}
+```
+If you want to add aliases for multiple module members at once, you can do so with the following
+syntax
+
+如果要一次为多个模块成员添加别名，可以使用以下语法
+```move
+use <address>::<module name>::{<module member>, <module member> as <member alias> ... };
+```
+For example
+举例
+
+```move
+use std::vector::{push_back, length as len, pop_back};
+
+fun swap_last_two<T>(v: &mut vector<T>) {
+    assert!(len(v) >= 2, 42);
+    let last = pop_back(v);
+    let second_to_last = pop_back(v);
+    push_back(v, last);
+    push_back(v, second_to_last)
+}
+```
+
+If you need to add an alias to the Module itself in addition to module members, you can do that in a
+single `use` using `Self`. `Self` is a member of sorts that refers to the module.
+
+如果除了模块成员之外，您还需要为模块本身添加别名，您可以使用 `Self` 在一次`use`中完成。 `Self` 是指模块的各种成员。
+```move
+use std::vector::{Self, empty};
+For clarity, all of the following are equivalent:
+```
+For clarity, all of the following are equivalent:
+
+为清晰起见，以下所有内容都是等效的：
+```move
+use std::vector;
+use std::vector as vector;
+use std::vector::Self;
+use std::vector::Self as vector;
+use std::vector::{Self};
+use std::vector::{Self as vector};
+```
+If needed, you can have as many aliases for any item as you like
+
+如果需要，您可以为任何项目设置任意数量的别名
+
+```move
+use std::vector::{
+    Self,
+    Self as V,
+    length,
+    length as len,
+};
+
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    // all options available given the `use` above
+    assert!(vector::length(v) > 1, 42);
+    assert!(V::length(v) > 1, 42);
+    assert!(length(v) > 1, 42);
+    assert!(len(v) > 1, 42);
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+## 模块内部（Inside a `module`）
+Inside of a `module` all `use` declarations are usable regardless of the order of declaration.
+
+在模块内部，无论声明顺序如何，所有 `use` 声明都是可用的。
+```move
+address 0x42 {
+module example {
+    use std::vector;
+
+    fun example(): vector<u8> {
+        let v = empty();
+        vector::push_back(&mut v, 0);
+        vector::push_back(&mut v, 10);
+        v
+    }
+
+    use std::vector::empty;
+}
+}
+```
+The aliases declared by `use` in the module usable within that module.
+
+在该模块中可用的模块中使用声明的别名。
+
+Additionally, the aliases introduced cannot conflict with other module members. See
+[Uniqueness](#uniqueness) for more details
+
+此外，引入的别名不能与其他模块成员冲突。有关详细信息，请参阅[唯一性](#uniqueness)。
+
+## 表达式内部（Inside an expression）
+You can add `use` declarations to the beginning of any expression block
+
+您可以将 `use` 声明添加到任何表达式块的开头
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        use std::vector::{empty, push_back};
+
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    }
+}
+}
+```
+As with `let`, the aliases introduced by `use` in an expression block are removed at the end of that
+block.
+
+与 `let` 一样，在表达式块中使用 `use` 引入的别名在该块的末尾被删除。
+
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        let result = {
+            use std::vector::{empty, push_back};
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 10);
+            v
+        };
+        result
+    }
+
+}
+}
+```
+Attempting to use the alias after the block ends will result in an error
+
+在块结束后尝试使用别名将导致错误
+```move
+fun example(): vector<u8> {
+    let result = {
+        use std::vector::{empty, push_back};
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    };
+    let v2 = empty(); // 错误!
+//           ^^^^^ 未绑定的函数 'empty'
+    结果
+}
+```
+Any `use` must be the first item in the block. If the `use` comes after any expression or `let`, it
+will result in a parsing error
+
+任何使用都必须是块中的第一项。如果 use 出现在任何表达式或 let 之后，则会导致解析错误
+```move
+{
+    let x = 0;
+    use std::vector; // 错误!
+    let v = vector::empty();
+}
+```
+
+## 命名规则（Naming rules）
+Aliases must follow the same rules as other module members. This means that aliases to structs or
+constants must start with `A` to `Z`
+
+别名必须遵循与其他模块成员相同的规则。这意味着结构或常量的别名必须以 `A` 到 `Z` 开头
+```move
+address 0x42 {
+module data {
+    struct S {}
+    const FLAG: bool = false;
+    fun foo() {}
+}
+module example {
+    use 0x42::data::{
+        S as s, // 错误!
+        FLAG as fLAG, // 错误!
+        foo as FOO,  // 有效
+        foo as bar, // 有效
+    };
+}
+}
+```
+## 唯一性（Uniqueness）
+Inside a given scope, all aliases introduced by `use` declarations must be unique.
+
+在给定范围内，所有由 use 声明引入的别名必须是唯一的。
+
+For a module, this means aliases introduced by `use` cannot overlap
+
+对于一个模块，这意味着使用引入的别名不能重复
+```move
+address 0x42 {
+module example {
+
+    use std::vector::{empty as foo, length as foo}; // ERROR!
+    //                                        ^^^ duplicate 'foo'
+
+    use std::vector::empty as bar;
+
+    use std::vector::length as bar; // 错误!
+    //                         ^^^ 重复的 'bar'
+
+}
+}
+```
+And, they cannot overlap with any of the module's other members
+
+而且，它们不能与模块的任何其他成员重复
+```move
+address 0x42 {
+module data {
+    struct S {}
+}
+module example {
+    use 0x42::data::S;
+
+    struct S { value: u64 } // ERROR!
+    //     ^ conflicts with alias 'S' above
+}
+}
+```
+Inside of an expression block, they cannot overlap with each other, but they can
+[shadow](#shadowing) other aliases or names from an outer scope
+
+在表达式块内部，它们不能相互重复，但它们可以遮蔽外部作用域中的其他别名或名称
+
+## 遮蔽（Shadowing）
+`use` aliases inside of an expression block can shadow names (module members or aliases) from the
+outer scope. As with shadowing of locals, the shadowing ends at the end of the expression block;
+
+在表达式块内使用别名可以覆盖外部作用域的名称（模块成员或别名）。当遮蔽局部变量时，遮蔽会在表达式块的末尾结束；
+```move
+address 0x42 {
+module example {
+
+    struct WrappedVector { vec: vector<u64> }
+
+    fun empty(): WrappedVector {
+        WrappedVector { vec: std::vector::empty() }
+    }
+
+    fun example1(): (WrappedVector, WrappedVector) {
+        let vec = {
+            use std::vector::{empty, push_back};
+            // 'empty' 现在指向 std::vector::empty
+
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 1);
+            push_back(&mut v, 10);
+            v
+        };
+        // 'empty' 现在指向 Self::empty
+
+        (empty(), WrappedVector { vec })
+    }
+
+    fun example2(): (WrappedVector, WrappedVector) {
+        use std::vector::{empty, push_back};
+        let w: WrappedVector = {
+            use 0x42::example::empty;
+            empty()
+        };
+        push_back(&mut w.vec, 0);
+        push_back(&mut w.vec, 1);
+        push_back(&mut w.vec, 10);
+
+        let vec = empty();
+        push_back(&mut vec, 0);
+        push_back(&mut vec, 1);
+        push_back(&mut vec, 10);
+
+        (w, WrappedVector { vec })
+    }
+}
+}
+```
+
+## 未使用的Use或别名（Unused Use or Alias）
+An unused `use` will result in an error
+
+未使用的 `use` 会导致错误
+```move
+address 0x42 {
+module example {
+    use std::vector::{empty, push_back}; // ERROR!
+    //                       ^^^^^^^^^ 未使用的别名 'push_back'
+
+    fun example(): vector<u8> {
+        empty()
+    }
+}
+}
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/variables.md b/vendors/move/documentation/book/translations/move-book-zh/src/variables.md
new file mode 100644
index 000000000..3625728ef
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/variables.md
@@ -0,0 +1,879 @@
+# 局部变量和作用域（Local Variables and Scopes）
+
+Local variables in Move are lexically (statically) scoped. New variables are introduced with the
+keyword `let`, which will shadow any previous local with the same name. Locals are mutable and can
+be updated both directly and via a mutable reference.
+
+在 Move 语言中，局部变量的解析依赖于词法作用域（lexically scoped）或静态作用域（statically scoped）。使用关键字 `let` 引入新的变量，它将隐藏任何以前的同名局部变量。局部变量是可变的（Rust 中的变量默认不可变，译者注），可以直接更新，也可以通过可变引用更新。
+
+## 声明局部变量（Declaring Local Variables）
+
+### `let` 绑定（`let` bindings）
+
+Move programs use `let` to bind variable names to values:
+
+Move 程序使用 `let` 给变量名绑定一个值：
+
+```move
+let x = 1;
+let y = x + x:
+```
+
+`let` can also be used without binding a value to the local.
+
+`let` 使用时也可以不绑定任何数值给局部变量。
+
+```move
+let x;
+```
+
+The local can then be assigned a value later.
+
+然后可以稍后为局部变量赋一个值。
+
+```move
+let x;
+if (cond) {
+  x = 1
+} else {
+  x = 0
+}
+```
+
+This can be very helpful when trying to extract a value from a loop when a default value cannot be provided.
+
+当无法提供默认值时，这在尝试从循环中提取值时非常有用。
+
+```move
+let x;
+let cond = true;
+let i = 0;
+loop {
+    (x, cond) = foo(i);
+    if (!cond) break;
+    i = i + 1;
+}
+```
+
+### 变量必须在使用前赋值（Variables must be assigned before use）
+
+Move's type system prevents a local variable from being used before it has been assigned.
+
+Move 的类型系统防止在赋值之前使用局部变量。
+
+```move
+let x;
+x + x // ERROR!
+```
+
+```move
+let x;
+if (cond) x = 0;
+x + x // ERROR!
+```
+
+```move
+let x;
+while (cond) x = 0;
+x + x // ERROR!
+```
+
+### 有效的变量名（Valid variable names）
+
+Variable names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, and digits `0`
+to `9`. Variable names must start with either an underscore `_` or a letter `a` through `z`. They
+_cannot_ start with uppercase letters.
+
+变量名可以包含下划线 `_`、小写字母 `a` 到 `z`、大写字母 `A` 到 `Z`、和数字 `0` 到 `9`。变量名必须以下划线 `_` 或者以小写字母`a`到`z`开头。它们*不能*以大写字母开头。
+
+```move
+// 全部有效
+let x = e;
+let _x = e;
+let _A = e;
+let x0 = e;
+let xA = e;
+let foobar_123 = e;
+
+// 全部无效
+let X = e; // ERROR!
+let Foo = e; // ERROR!
+```
+
+### 类型标注（Type annotations）
+
+The type of a local variable can almost always be inferred by Move's type system. However, Move
+allows explicit type annotations that can be useful for readability, clarity, or debuggability. The
+syntax for adding a type annotation is:
+
+局部变量的类型几乎总是可以通过 Move 的类型系统推断出来。但是，Move 允许显式类型标注，这对可读性、清晰性或可调试性很有用。添加类型标注的语法如下：
+
+```move
+let x: T = e; // “T 类型的变量 x 被初始化为表达式 e”
+```
+
+Some examples of explicit type annotations:
+
+一些显式类型标注的示例：
+
+```move
+address 0x42 {
+module example {
+
+    struct S { f: u64, g: u64 }
+
+    fun annotated() {
+        let u: u8 = 0;
+        let b: vector<u8> = b"hello";
+        let a: address = @0x0;
+        let (x, y): (&u64, &mut u64) = (&0, &mut 1);
+        let S { f, g: f2 }: S = S { f: 0, g: 1 };
+    }
+}
+}
+```
+
+Note that the type annotations must always be to the right of the pattern:
+
+请注意，类型标注必须始终位于变量模式的右侧：
+
+```move
+let (x: &u64, y: &mut u64) = (&0, &mut 1); // 错误！正确写法是 let (x, y): ... =
+```
+
+### 何时需要类型标注（When annotations are necessary）
+
+In some cases, a local type annotation is required if the type system cannot infer the type. This
+commonly occurs when the type argument for a generic type cannot be inferred. For example:
+
+在某些情况下，如果类型系统无法推断类型，则需要局部类型标注。这通常发生在无法推断某个泛型（generic type）的类型参数时，比如：
+
+```move
+let _v1 = vector::empty(); // 错误！
+//        ^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation （无法推断此类型。尝试添加标注）
+let v2: vector<u64> = vector::empty(); // 没有错误
+```
+
+In a rarer case, the type system might not be able to infer a type for divergent code (where all the
+following code is unreachable). Both `return` and [`abort`](./abort-and-assert.md) are expressions
+and can have any type. A [`loop`](./loops.md) has type `()` if it has a `break`, but if there is no
+break out of the `loop`, it could have any type. If these types cannot be inferred, a type
+annotation is required. For example, this code:
+
+在极少数情况下，Move 的类型系统可能无法推断出一段发散式代码（divergent code）的类型（后面所有代码无法访问）。在 Move 语言中，`return` 和 [`abort`](./abort-and-assert.md) 都属于表达式，它们可以返回任何类型。如果一段 [`loop`](./loops.md) 有 `break`，那么它的返回类型是 `()`，但是如果它不包含 `break`，它的返回类型可以是任何类型。如果无法推断出这些类型，那么类型标注是必须的。例如，这段代码：
+
+```move
+let a: u8 = return ();
+let b: bool = abort 0;
+let c: signer = loop ();
+
+let x = return (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let y = abort 0; // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let z = loop (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+```
+
+Adding type annotations to this code will expose other errors about dead code or unused local
+variables, but the example is still helpful for understanding this problem.
+
+在这段代码中添加类型标注会暴露其他关于死代码或未使用的局部变量的错误，但该示例仍然有助于理解这个问题。
+
+### 元组式的多个变量声明（Multiple declarations with tuples）
+
+`let` can introduce more than one local at a time using tuples. The locals declared inside the
+parenthesis are initialized to the corresponding values from the tuple.
+
+`let` 可以使用元组一次引入多个局部变量。在括号内声明的局部变量会被初始化为元组中的对应值。
+
+```move
+let () = ();
+let (x0, x1) = (0, 1);
+let (y0, y1, y2) = (0, 1, 2);
+let (z0, z1, z2, z3) = (0, 1, 2, 3);
+```
+
+The type of the expression must match the arity of the tuple pattern exactly.
+
+表达式的类型必须与元组模式的数量完全匹配。
+
+```move
+let (x, y) = (0, 1, 2); // 错误！
+let (x, y, z, q) = (0, 1, 2); // 错误！
+```
+
+You cannot declare more than one local with the same name in a single `let`.
+
+你不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let (x, x) = 0; // 错误！
+```
+
+### 结构体式的多个变量声明（Multiple declarations with structs）
+
+`let` can also introduce more than one local at a time when destructuring (or matching against) a
+struct. In this form, the `let` creates a set of local variables that are initialized to the values
+of the fields from a struct. The syntax looks like this:
+
+`let` 还可以在解构（或匹配）结构体时一次引入多个局部变量。在这种形式中，`let` 创建了一组局部变量，这些变量被初始化为结构体中字段的值。语法如下所示：
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+Here is a more complicated example:
+
+这是一个更复杂的示例：
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let Y { x1: X { f }, x2 } = Y { x1: new_x(), x2: new_x() };
+            assert!(f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = Y { x1: new_x(), x2: new_x() };
+            assert!(f1 + f2 == 2, 42);
+        }
+    }
+}
+```
+
+Fields of structs can serve double duty, identifying the field to bind _and_ the name of the
+variable. This is sometimes referred to as punning.
+
+结构体的字段可以起到双重作用：识别要绑定的字段*和*命名变量。这有时被称为双关语。
+
+```move
+let X { f } = e;
+```
+
+is equivalent to:
+
+等价于：
+
+```move
+let X { f: f } = e;
+```
+
+As shown with tuples, you cannot declare more than one local with the same name in a single `let`.
+
+如元组所示，您不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let Y { x1: x, x2: x } = e; // 错误！（两个 x 同名了）
+```
+
+### 针对引用进行解构（Destructuring against references）
+
+In the examples above for structs, the bound value in the let was moved, destroying the struct value
+and binding its fields.
+
+在上面的结构体示例中，`let` 中绑定的值被移动了，这销毁了结构体的值并同时绑定了它的字段（到变量）。
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+In this scenario the struct value `T { f1: 1, f2: 2 }` no longer exists after the `let`.
+
+If you wish instead to not move and destroy the struct value, you can borrow each of its fields. For
+example:
+
+在这种场景下结构体的值 `T { f1: 1, f2: 2 }` 会在 `let` 后消失。
+
+如果您希望不移动和销毁结构体的值，则可以借用其中的每个字段。例如：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &t;
+// local1: &u64
+// local2: &u64
+```
+
+And similarly with mutable references:
+
+可变引用也类似：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &mut t;
+// local1: &mut u64
+// local2: &mut u64
+```
+
+This behavior can also work with nested structs.
+
+此行为也适用于嵌套结构体。
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let y = Y { x1: new_x(), x2: new_x() };
+
+            let Y { x1: X { f }, x2 } = &y;
+            assert!(*f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = &mut y;
+            *f1 = *f1 + 1;
+            *f2 = *f2 + 1;
+            assert!(*f1 + *f2 == 4, 42);
+        }
+    }
+}
+```
+
+### 忽略值（Ignoring Values）
+
+In `let` bindings, it is often helpful to ignore some values. Local variables that start with `_`
+will be ignored and not introduce a new variable
+
+在 `let` 绑定中，忽略某些值通常很有帮助。以 `_` 开头的局部变量将被忽略并且不会引入新变量。
+
+```move
+fun three(): (u64, u64, u64) {
+    (0, 1, 2)
+}
+```
+
+```move
+let (x1, _, z1) = three();
+let (x2, _y, z2) = three();
+assert!(x1 + z1 == x2 + z2, 42);
+```
+
+This can be necessary at times as the compiler will error on unused local variables。
+
+这有时是必要的，因为编译器会在未使用的局部变量上报错。
+
+```move
+let (x1, y, z1) = three(); // 错误！
+//       ^ 未被使用的局部变量 'y'
+```
+
+### 通用的 `let` 语法（General `let` grammar）
+
+All of the different structures in `let` can be combined! With that we arrive at this general
+grammar for `let` statements:
+
+`let` 中所有不同的结构体都可以组合！这样，我们就得出了 `let` 语句的通用语法：
+
+> _let-binding_ → **let** _pattern-or-list_ _type-annotation_<sub>_opt_</sub>
+> _initializer_<sub>_opt_</sub> > _pattern-or-list_ → _pattern_ | **(** _pattern-list_ **)** >
+> _pattern-list_ → _pattern_ **,**<sub>_opt_</sub> | _pattern_ **,** _pattern-list_ >
+> _type-annotation_ → **:** _type_ _initializer_ → **=** _expression_
+
+The general term for the item that introduces the bindings is a _pattern_. The pattern serves to
+both destructure data (possibly recursively) and introduce the bindings. The pattern grammar is as
+follows:
+
+引入绑定的项的通用术语是 *模式（pattern）*。该模式用于解构数据（可能是递归的）并引入绑定。模式语法如下：
+
+> _pattern_ → _local-variable_ | _struct-type_ **{** _field-binding-list_ **}** >
+> _field-binding-list_ → _field-binding_ **,**<sub>_opt_</sub> | _field-binding_ **,**
+> _field-binding-list_ > _field-binding_ → _field_ | _field_ **:** _pattern_
+
+A few concrete examples with this grammar applied:
+
+应用此语法的一些具体示例：
+
+```move
+    let (x, y): (u64, u64) = (0, 1);
+//       ^                           local-variable（局部变量）
+//       ^                           pattern（模式）
+//          ^                        local-variable（局部变量）
+//          ^                        pattern（模式）
+//          ^                        pattern-list（模式列表）
+//       ^^^^                        pattern-list（模式列表）
+//      ^^^^^^                       pattern-or-list（模式或列表）
+//            ^^^^^^^^^^^^           type-annotation（类型标注）
+//                         ^^^^^^^^  initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+
+    let Foo { f, g: x } = Foo { f: 0, g: 1 };
+//      ^^^                                    struct-type（结构类型）
+//            ^                                field（字段）
+//            ^                                field-binding（字段绑定）
+//               ^                             field（字段）
+//                  ^                          local-variable（局部变量）
+//                  ^                          pattern（模式）
+//               ^^^^                          field-binding（字段绑定）
+//            ^^^^^^^                          field-binding-list（字段绑定列表）
+//      ^^^^^^^^^^^^^^^                        pattern（模式）
+//      ^^^^^^^^^^^^^^^                        pattern-or-list（模式或列表）
+//                      ^^^^^^^^^^^^^^^^^^^^   initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+```
+
+## 变更（Mutations）
+
+### 赋值（Assignments）
+
+After the local is introduced (either by `let` or as a function parameter), the local can be
+modified via an assignment:
+
+在引入局部变量后（通过 `let` 或作为函数参数），可以通过赋值来修改局部变量：
+
+```move
+x = e
+```
+
+Unlike `let` bindings, assignments are expressions. In some languages, assignments return the value
+that was assigned, but in Move, the type of any assignment is always `()`.
+
+与 `let` 绑定不同，赋值是表达式。在某些语言中，赋值会返回被赋予的值，但在 Move 语言中，任何赋值的返回类型始终是 `()`。
+
+```move
+(x = e: ())
+```
+
+Practically, assignments being expressions means that they can be used without adding a new
+expression block with braces (`{`...`}`).
+
+实际上，赋值作为表达式意味着它们可以在不添加带有大括号（`{`...`}`）的新表达式块（expression block）的情况下使用。
+
+```move
+let x = 0;
+if (cond) x = 1 else x = 2;
+```
+
+The assignment uses the same pattern syntax scheme as `let` bindings:
+
+赋值使用与 `let` 绑定相同的模式语法方案：
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    // 这个例子会因为存在未使用的变量和赋值而报错。
+    fun example() {
+       let (x, _, z) = (0, 1, 3);
+       let (x, y, f, g);
+
+       (X { f }, X { f: x }) = (new_x(), new_x());
+       assert!(f + x == 2, 42);
+
+       (x, y, z, f, _, g) = (0, 0, 0, 0, 0, 0);
+    }
+}
+}
+```
+
+Note that a local variable can only have one type, so the type of the local cannot change between
+assignments.
+
+注意，一个局部变量只能有一种类型，所以局部变量的类型不能在赋值之间（多次赋值）改变。
+
+```move
+let x;
+x = 0;
+x = false; // 错误！
+```
+
+### 通过引用进行变更（Mutating through a reference）
+
+In addition to directly modifying a local with assignment, a local can be modified via a mutable
+reference `&mut`.
+
+除了通过赋值直接修改局部变量外，还可以通过可变引用 `&mut` 的方式修改局部变量。
+
+```move
+let x = 0;
+let r = &mut x;
+*r = 1;
+assert!(x == 1, 42);
+```
+
+This is particularly useful if either:
+
+(1) You want to modify different variables depending on some condition.
+
+这在以下情况下特别有用：
+
+(1) 你想根据某些条件修改不同的变量。
+
+```move
+let x = 0;
+let y = 1;
+let r = if (cond) &mut x else &mut y;
+*r = *r + 1;
+```
+
+(2) You want another function to modify your local value.
+
+(2) 你想要另一个函数来修改你的局部变量值。
+
+```move
+let x = 0;
+modify_ref(&mut x);
+```
+
+This sort of modification is how you modify structs and vectors!
+
+这种修改方法就是你修改结构体和向量的方式！
+
+```move
+let v = vector::empty();
+vector::push_back(&mut v, 100);
+assert!(*vector::borrow(&v, 0) == 100, 42);
+```
+
+For more details, see [Move references](./references.md).
+
+有关更多详细信息，请参阅 [Move 引用](./references.md)。
+
+## 作用域（Scopes）
+
+Any local declared with `let` is available for any subsequent expression, _within that scope_.
+Scopes are declared with expression blocks, `{`...`}`.
+
+Locals cannot be used outside of the declared scope.
+
+使用 `let` 声明的任何局部变量都可用于*该作用域内*的任何后续表达式。作用域用表达式块（expression blocks）声明，`{`...`}`。
+
+局部变量不能在声明的作用域之外使用。
+
+```move
+let x = 0;
+{
+    let y = 1;
+};
+x + y // 错误！
+//  ^ unbound local 'y'（未绑定的局部变量“y”）
+```
+
+But, locals from an outer scope _can_ be used in a nested scope.
+
+但是，来自外部作用域的本地变量*可以*在嵌套作用域中使用。
+
+```move
+{
+    let x = 0;
+    {
+        let y = x + 1; // 有效的
+    }
+}
+```
+
+Locals can be mutated in any scope where they are accessible. That mutation survives with the local,
+regardless of the scope that performed the mutation.
+
+局部变量可以在允许访问的任何作用域内进行变更。无论执行变更的作用域如何，这种变更会跟随局部变量的生命周期。
+
+```move
+let x = 0;
+x = x + 1;
+assert!(x == 1, 42);
+{
+    x = x + 1;
+    assert!(x == 2, 42);
+};
+assert!(x == 2, 42);
+```
+
+### 表达式块（Expression Blocks）
+
+An expression block is a series of statements separated by semicolons (`;`). The resulting value of
+an expression block is the value of the last expression in the block.
+
+表达式块是由分号（`;`）分隔的一系列语句。表达式块的结果值是块中最后一个表达式的值。
+
+```move
+{ let x = 1; let y = 1; x + y }
+```
+
+In this example, the result of the block is `x + y`.
+
+A statement can be either a `let` declaration or an expression. Remember that assignments (`x = e`)
+are expressions of type `()`.
+
+在此示例中, 此区块的结果是 `x + y`.
+
+语句可以是 `let` 声明或表达式。请记住，赋值（`x = e`）是 `()` 类型的表达式。
+
+```move
+{ let x; let y = 1; x = 1; x + y }
+```
+
+Function calls are another common expression of type `()`. Function calls that modify data are
+commonly used as statements.
+
+函数调用是 `()` 类型的另一种常见表达方式。修改数据的函数调用通常被用作语句。
+
+```move
+{ let v = vector::empty(); vector::push_back(&mut v, 1); v }
+```
+
+This is not just limited to `()` types---any expression can be used as a statement in a sequence!
+
+这不仅限于 `()` 类型 —— 任何表达式都可以用作序列中的语句！
+
+```move
+{
+    let x = 0;
+    x + 1; // 值会被丢弃
+    x + 2; // 值会被丢弃
+    b"hello"; // 值会被丢弃
+}
+```
+
+But! If the expression contains a resource (a value without the `drop` [ability](./abilities.md)),
+you will get an error. This is because Move's type system guarantees that any value that is dropped
+has the `drop` [ability](./abilities.md). (Ownership must be transferred or the value must be
+explicitly destroyed within its declaring module.)
+
+但是！如果表达式包含资源（没有 `drop` [能力](./abilities.md)的值），你将收到错误消息。这是因为 Move 的类型系统保证任何被删除的值都具有 `drop` [能力](./abilities.md)。（必须转移所有权，或者必须在其声明模块中显式销毁该值。）
+
+```move
+{
+    let x = 0;
+    Coin { value: x }; // 错误！
+//  ^^^^^^^^^^^^^^^^^ unused value without the `drop` ability（未使用没有 `drop` 能力的值）
+    x
+}
+```
+
+If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
+there is an implicit unit `()` value. Similarly, if the expression block is empty, there is an
+implicit unit `()` value.
+
+如果块中不存在最终表达式 —— 也就是说，如果有一个尾随分号 `;`，则含有一个隐式的[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B)。同样，如果表达式块为空，那么也存在隐式的单值 `()`。
+
+```move
+// 两者是等价的
+{ x = x + 1; 1 / x; }
+{ x = x + 1; 1 / x; () }
+```
+
+```move
+// 两者是等价的
+{ }
+{ () }
+```
+
+An expression block is itself an expression and can be used anyplace an expression is used. (Note:
+The body of a function is also an expression block, but the function body cannot be replaced by
+another expression.)
+
+表达式块本身就是一个表达式，可以在任何使用表达式的地方使用。（注意：函数体也是一个表达式块，但函数体不能被另一个表达式替换。）
+
+```move
+let my_vector: vector<vector<u8>> = {
+    let v = vector::empty();
+    vector::push_back(&mut v, b"hello");
+    vector::push_back(&mut v, b"goodbye");
+    v
+};
+```
+
+(The type annotation is not needed in this example and only added for clarity.)
+
+（此示例中不需要类型标注，只是为了清楚起见而添加。）
+
+### 遮蔽（Shadowing）
+
+If a `let` introduces a local variable with a name already in scope, that previous variable can no
+longer be accessed for the rest of this scope. This is called _shadowing_.
+
+如果一个 `let` 引入了一个名称已经在作用域中的局部变量，则该作用域的剩余部分将无法再访问先前的变量。这称为*遮蔽（shadowing）*。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = 1; // x 被遮蔽了
+assert!(x == 1, 42);
+```
+
+When a local is shadowed, it does not need to retain the same type as before.
+
+当局部变量被遮蔽时，它不需要保留与以前相同的类型。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = b"hello"; // x 被遮蔽了
+assert!(x == b"hello", 42);
+```
+
+After a local is shadowed, the value stored in the local still exists, but will no longer be
+accessible. This is important to keep in mind with values of types without the
+[`drop` ability](./abilities.md), as ownership of the value must be transferred by the end of the
+function.
+
+在局部变量被遮蔽后，存储在局部变量的值仍然存在，但是将不再可访问。对于没有 [`drop` 能力](./abilities.md)的类型的值，请记住这一点很重要，因为值的所有权必须在函数结束时转移。
+
+```move
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+
+        fun unused_resource(): Coin {
+            let x = Coin { value: 0 }; // ERROR!
+//              ^ This local still contains a value without the `drop` ability（这个局部变量仍然包含一个没有 `drop` 能力的值）
+            x.value = 1;
+            let x = Coin { value: 10 };
+            x
+//          ^ Invalid return（无效的返回）
+        }
+    }
+}
+```
+
+When a local is shadowed inside a scope, the shadowing only remains for that scope. The shadowing is
+gone once that scope ends.
+
+当局部变量在作用域内被遮蔽时，该遮蔽作用仅保留在该作用域内。一旦该作用域结束，遮蔽作用就消失了。
+
+```move
+let x = 0;
+{
+    let x = 1;
+    assert!(x == 1, 42);
+};
+assert!(x == 0, 42);
+```
+
+Remember, locals can change type when they are shadowed.
+
+请记住，局部变量在被遮蔽时可以更改类型。
+
+```move
+let x = 0;
+{
+    let x = b"hello";
+    assert!(x = b"hello", 42);
+};
+assert!(x == 0, 42);
+```
+
+## 移动和复制（Move and Copy）
+
+All local variables in Move can be used in two ways, either by `move` or `copy`. If one or the other
+is not specified, the Move compiler is able to infer whether a `copy` or a `move` should be used.
+This means that in all of the examples above, a `move` or a `copy` would be inserted by the
+compiler. A local variable cannot be used without the use of `move` or `copy`.
+
+`copy` will likely feel the most familiar coming from other programming languages, as it creates a
+new copy of the value inside of the variable to use in that expression. With `copy`, the local
+variable can be used more than once.
+
+Move 中的所有局部变量都可以通过两种方式使用，通过 `move` 或 `copy`。如果未指定其中之一，则 Move 编译器能够推断应该使用 `copy` 还是 `move`。这意味着在上述所有示例中，编译器将插入 `move` 或 `copy`。如果不使用 `move` 或 `copy`，就不能使用局部变量。
+
+`copy` 对来自其他编程语言的开发者来说可能会觉得最熟悉，因为它会在变量内部创建一个新的副本值以在该表达式中使用。使用 `copy`，局部变量可以被多次使用。
+
+```move
+let x = 0;
+let y = copy x + 1;
+let z = copy x + 2;
+```
+
+Any value with the `copy` [ability](./abilities.md) can be copied in this way.
+
+`move` takes the value out of the local variable _without_ copying the data. After a `move` occurs,
+the local variable is unavailable.
+
+任何具有 `copy` [能力](./abilities.md)的值都可以通过这种方式复制。
+
+`move` 从局部变量中取出值*而不是*复制数据。`移动（move）`发生后，局部变量将不可用。
+
+```move
+let x = 1;
+let y = move x + 1;
+//      ------ Local was moved here（局部变量被移动到这里了）
+let z = move x + 2; // 错误！
+//      ^^^^^^ Invalid usage of local 'x'（局部变量“x”的无效使用方式）
+y + z
+```
+
+### 安全性（Safety）
+
+Move's type system will prevent a value from being used after it is moved. This is the same safety
+check described in [`let` declaration](#let-bindings) that prevents local variables from being used
+before it is assigned a value.
+
+Move 的类型系统会阻止一个值在移动后被使用。这与 [`let` 声明](#let-绑定let-bindings)中描述的防止在局部变量被赋值之前使用的安全检查相同。
+
+<!-- For more information, see TODO future section on ownership and move semantics. -->
+
+<!-- 如了解更多信息, 参阅未来所有权和移动语义的部分 (TODO )。 -->
+
+### 推断（Inference）
+
+As mentioned above, the Move compiler will infer a `copy` or `move` if one is not indicated. The
+algorithm for doing so is quite simple:
+
+- Any scalar value with the `copy` [ability](./abilities.md) is given a `copy`.
+- Any reference (both mutable `&mut` and immutable `&`) is given a `copy`.
+  - Except under special circumstances where it is made a `move` for predictable borrow checker errors.
+- Any other value is given a `move`.
+  - This means that even though other values might be have the `copy` [ability](./abilities.md), it must be done _explicitly_ by the programmer.
+  - This is to prevent accidental copies of large data structures.
+
+如上所述，如果未指明，Move 编译器将推断出 `copy` 还是 `move`。这样做的算法非常简单：
+
+- 任何带有 `copy` [能力](./abilities.md)的标量值都被赋予了 `copy`。
+- 任何引用（可变的 `&mut` 和不可变的 `&`）都被赋予 `copy`。
+  - 除非在可预测的借用检查器错误的特殊情况下，会进行 `move` 操作。
+- 任何其他值都被赋予 `move`。
+  - 这意味着即使其他值可能具有 `copy` [能力](./abilities.md)，它也必须由程序员*显式*声明。
+  - 这是为了防止意外地复制很大的数据结构。
+
+例如：
+
+```move
+let s = b"hello";
+let foo = Foo { f: 0 };
+let coin = Coin { value: 0 };
+
+let s2 = s; // 移动
+let foo2 = foo; // 移动
+let coin2 = coin; // 移动
+
+let x = 0;
+let b = false;
+let addr = @0x42;
+let x_ref = &x;
+let coin_ref = &mut coin2;
+
+let x2 = x; // 复制
+let b2 = b; // 复制
+let addr2 = @0x42; // 复制
+let x_ref2 = x_ref; // 复制
+let coin_ref2 = coin_ref; // 复制
+```
diff --git a/vendors/move/documentation/book/translations/move-book-zh/src/vector.md b/vendors/move/documentation/book/translations/move-book-zh/src/vector.md
new file mode 100644
index 000000000..286892a28
--- /dev/null
+++ b/vendors/move/documentation/book/translations/move-book-zh/src/vector.md
@@ -0,0 +1,152 @@
+# 向量
+
+`vector<T>` 是 Move 提供的唯一原始集合类型。`vector<T>` 是类型为 `T` 的同构集合，可以通过从"末端"推入/弹出（出栈/入栈，译者注）值来增长或缩小。
+*（与 Rust 一样，向量（vector）是一种可以存放任何类型的可变大小的容器，也可称为[动态数组](https://en.wikipedia.org/wiki/Dynamic_array)，与 Python 中的[列表（list）](https://computersciencewiki.org/index.php/Lists)不同，译者注）*
+
+`vector<T>` 可以用任何类型 `T` 实例化。例如，`vector<u64>`、`vector<address>`、`vector<0x42::MyModuel::MyResource>` 和 `vector<vector<u8>>` 都是有效的向量类型。
+
+## 字面量
+
+### 通用 `vector` 字面量
+
+任何类型的向量都可以通过 `vector` 字面量创建。
+
+| 语法                  | 类型                                                                          | 描述                              |
+|-----------------------|-------------------------------------------------------------------------------|-----------------------------------|
+| `vector[]`            | `vector[]: vector<T>` 其中 `T` 是任何单一的非引用类型                         | 一个空向量                        |
+| `vector[e1, ..., en]` | `vector[e1, ..., en]: vector<T>` where `e_i: T` 满足 `0 < i <= n` and `n > 0` | 带有 `n` 个元素（长度为 n）的向量 |
+
+在这些情况下，`vector` 的类型是从元素类型或从向量的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+```move
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
+
+#### 向量字面量示例
+
+```move
+(vector[]: vector<bool>);
+(vector[0u8, 1u8, 2u8]: vector<u8>);
+(vector<u128>[]: vector<u128>);
+(vector<address>[@0x42, @0x100]: vector<address>);
+```
+
+### `vector<u8>` 字面量
+
+Move 中向量的一个常见用例是表示“字节数组”，用 `vector<u8>` 表示。这些值通常用于加密目的，例如公钥或哈希结果。这些值非常常见，以至于提供了特定的语法以使值更具可读性，而不是必须使用 `vector[]`，其中每个单独的 `u8` 值都以数字形式指定。
+
+目前支持两种类型的 `vector<u8>` 字面量，*字节字符串*和*十六进制字符串*。
+
+#### 字节字符串
+
+字节字符串是带引号的字符串字面量，以 `b` 为前缀，例如，`b"Hello!\n"`。
+
+这些是允许转义序列的 ASCII 编码字符串。目前，支持的转义序列如下：
+
+| 转义序列 | 描述                                        |
+|----------|---------------------------------------------|
+| `\n`     | 换行                                        |
+| `\r`     | 回车                                        |
+| `\t`     | 制表符                                      |
+| `\\`     | 反斜杠                                      |
+| `\0`     | Null                                        |
+| `\"`     | 引号                                        |
+| `\xHH`   | 十六进制进制转义，插入十六进制字节序列 `HH` |
+
+#### 十六进制字符串
+
+十六进制字符串是以 `x` 为前缀的带引号的字符串字面量，例如，`x"48656C6C6F210A"`。
+
+每个字节对，范围从 `00` 到 `FF` 都被解析为十六进制编码的 `u8` 值。所以每个字节对对应于结果 `vector<u8>` 的单个条目。
+
+#### 字符串字面量示例
+
+```move
+script {
+    fun byte_and_hex_strings() {
+        assert!(b"" == x"", 0);
+        assert!(b"Hello!\n" == x"48656C6C6F210A", 1);
+        assert!(b"\x48\x65\x6C\x6C\x6F\x21\x0A" == x"48656C6C6F210A", 2);
+        assert!(
+            b"\"Hello\tworld!\"\n \r \\Null=\0" ==
+                x"2248656C6C6F09776F726C6421220A200D205C4E756C6C3D00",
+            3
+        );
+    }
+}
+```
+
+## 操作
+
+`vector` 通过 Move 标准库里的 `std::vector` 模块支持以下操作：
+
+| 函数                                                       | 描述                                                                                                         | 中止条件             |
+|------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|----------------------|
+| `vector::empty<T>(): vector<T>`                            | 创建一个可以存储 `T` 类型值的空向量                                                                          | 永不中止             |
+| `vector::singleton<T>(t: T): vector<T>`                    | 创建一个包含 `t` 的大小为 1 的向量                                                                           | 永不中止             |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | 将 `t` 添加到 `v` 的尾部                                                                                     | 永不中止             |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | 移除并返回 `v` 中的最后一个元素                                                                              | 如果 `v` 是空向量    |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | 返回在索引 `i` 处对 `T` 的不可变引用                                                                         | 如果 `i` 越界        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | 返回在索引 `i` 处对 `T` 的可变引用                                                                           | 如果 `i` 越界        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | 销毁 `v` 向量                                                                                                | 如果 `v` 不是空向量  |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | 将 `v2` 中的元素添加到 `v1` 的末尾                                                                           | 永不中止             |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | 如果 `e` 在向量 `v` 里返回 true，否则返回 false                                                              | 永不中止             |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | 交换向量 `v` 中第 `i` 个和第 `j` 个索引处的元素                                                              | 如果 `i` 或 `j` 越界 |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | 反转向量 `v` 中元素的顺序                                                                                    | 永不中止             |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | 如果 `e` 在索引 `i` 处的向量中，则返回 `(true, i)`。否则返回`(false, 0)`                                     | 永不中止             |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | 移除向量 `v` 中的第 `i` 个元素，移动所有后续元素。这里的时间复杂度是 O(n)，并且保留了向量中元素的顺序        | 如果 `i` 越界        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | 将向量中的第 `i` 个元素与最后一个元素交换，然后弹出该元素。这里的时间复杂度是 O(1)，但是不保留向量中的元素顺序 | 如果 `i` 越界        |
+
+随着时间的推移可能会增加更多操作。
+
+## 示例
+
+```move
+use std::vector;
+
+let v = vector::empty<u64>();
+vector::push_back(&mut v, 5);
+vector::push_back(&mut v, 6);
+
+assert!(*vector::borrow(&v, 0) == 5, 42);
+assert!(*vector::borrow(&v, 1) == 6, 42);
+assert!(vector::pop_back(&mut v) == 6, 42);
+assert!(vector::pop_back(&mut v) == 5, 42);
+```
+
+## 销毁和复制 `vector`
+
+`vector<T>` 的某些行为取决于元素类型 `T` 的能力（ability），例如：如果向量中包含不具有 `drop` 能力的元素，那么不能像上面例子中的 `v` 一样隐式丢弃 —— 它们必须用 `vector::destroy_empty` 显式销毁。
+
+请注意，除非向量 `vec` 包含零个元素，否则 `vector::destroy_empty` 将在运行时中止：
+
+```move
+fun destroy_any_vector<T>(vec: vector<T>) {
+    vector::destroy_empty(vec) // 删除此行将导致编译器错误
+}
+```
+
+但是删除包含带有 `drop` 能力的元素的向量不会发生错误：
+
+```move
+fun destroy_droppable_vector<T: drop>(vec: vector<T>) {
+    // 有效！
+    // 不需要明确地做任何事情来销毁向量
+}
+```
+
+同样，除非元素类型具有 `copy` 能力，否则无法复制向量。换句话说，当且仅当 `T` 具有 `copy` 能力时，`vector<T>` 才具有 `copy` 能力。然而，即使是可复制的向量也永远不会被隐式复制：
+
+```move
+let x = vector::singleton<u64>(10);
+let y = copy x; // 没有 copy 将导致编译器错误！
+```
+
+大向量的复制可能很昂贵，因此编译器需要显式 `copy` 以便更容易查看它们发生的位置。
+
+有关更多详细信息，请参阅[类型能力](./abilities.md)和[泛型](./generics.md)部分。
+
+## 所有权
+
+[如上所述](#销毁和复制-vector)，`vector` 值只有在元素值可以复制的时候才能复制。在这种情况下，复制必须通过显式 [`copy`](./variables.md#移动和复制) 或者[解引用 `*`](./references.md#通过引用读取和写入)。
diff --git a/vendors/move/documentation/coding_guidelines.md b/vendors/move/documentation/coding_guidelines.md
new file mode 100644
index 000000000..9df7fbd49
--- /dev/null
+++ b/vendors/move/documentation/coding_guidelines.md
@@ -0,0 +1,343 @@
+---
+id: coding-guidelines
+title: Coding Guidelines
+---
+
+This document describes the coding guidelines for the Move Rust codebase.
+
+## Code formatting
+
+All code formatting is enforced with [rustfmt](https://github.com/rust-lang/rustfmt) with a project-specific configuration.  Below is an example command to adhere to the Move project conventions.
+
+```
+$ cargo xfmt
+```
+
+## Code analysis
+
+[Clippy](https://github.com/rust-lang/rust-clippy) is used to catch common mistakes and is run as a part of continuous integration.  Before submitting your code for review, you can run clippy with our configuration:
+
+```
+$ cargo xclippy --all-targets
+```
+
+In general, we follow the recommendations from [rust-lang-nursery](https://rust-lang.github.io/api-guidelines/) and [The Rust Programming Language](https://doc.rust-lang.org/book/).  The remainder of this guide provides detailed guidelines on specific topics in order to achieve uniformity of the codebase.
+
+## Code documentation
+
+Any public fields, functions, and methods should be documented with [Rustdoc](https://doc.rust-lang.org/book/ch14-02-publishing-to-crates-io.html#making-useful-documentation-comments).
+
+ Please follow the conventions as detailed below for modules, structs, enums, and functions.  The *single line* is used as a preview when navigating Rustdoc.  As an example, see the 'Structs' and 'Enums' sections in the [collections](https://doc.rust-lang.org/std/collections/index.html) Rustdoc.
+
+ ```
+ /// [Single line] One line summary description
+ ///
+ /// [Longer description] Multiple lines, inline code
+ /// examples, invariants, purpose, usage, etc.
+ [Attributes] If attributes exist, add after Rustdoc
+ ```
+
+Example below:
+
+```rust
+/// Represents (x, y) of a 2-dimensional grid
+///
+/// A line is defined by 2 instances.
+/// A plane is defined by 3 instances.
+#[repr(C)]
+struct Point {
+    x: i32,
+    y: i32,
+}
+```
+
+### Terminology
+
+The Move codebase uses inclusive terminology (similar to other projects such as [the Linux kernel](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb)).  The terms below are recommended when appropriate.
+* allowlist - a set of entities allowed access
+* blocklist - a set of entities that are blocked from access
+* primary/leader/main - a primary entity
+* secondary/replica/follower - a secondary entity
+
+### Constants and fields
+
+Describe the purpose and definition of this data. If the unit is a measurement of time, include it, e.g., `TIMEOUT_MS` for timeout in milliseconds.
+
+### Functions and methods
+
+Document the following for each function:
+
+* The action the method performs - “This method *adds* a new transaction to the mempool.” Use *active voice* and *present tense* (i.e. adds/creates/checks/updates/deletes).
+* Describe how and why to use this method.
+* Any condition that must be met _before_ calling the method.
+* State conditions under which the function will `panic!()` or returns an `Error`
+* Brief description of return values.
+* Any special behavior that is not obvious
+
+### README.md for top-level directories and other major components
+
+Each major component of Move needs to have a `README.md` file.
+
+This file should contain:
+
+ * The *conceptual* *documentation* of the component.
+ * A link to the external API documentation for the component.
+ * A link to the main license of the project.
+ * A link to the main contributing guide for the project.
+
+A template for readmes:
+
+```markdown
+# Component Name
+
+[Summary line: Start with one sentence about this component.]
+
+## Overview
+
+* Describe the purpose of this component and how the code in
+this directory works.
+* Describe the interaction of the code in this directory with
+the other components.
+* Describe the security model and assumptions about the crates
+in this directory. Examples of how to describe the security
+assumptions will be added in the future.
+
+## Implementation Details
+
+* Describe how the component is modeled. For example, why is the
+  code organized the way it is?
+* Other relevant implementation details.
+
+## Binary, Argument, and Crate Naming
+
+Most tools that we use everyday (rustc, cargo, git, rg, etc.) use dashes `-` as
+a separator for binary names and arguments and the [GNU software
+manual](https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html)
+dictates that long options should "consist of `--` followed by a name made of
+alphanumeric characters and dashes". As such dashes `-` should be used as
+separators in both binary names and command line arguments.
+
+In addition, it is generally accepted by many in the Rust community that dashes
+`-` should be used as separators in crate names, i.e. `x25519-dalek`.
+
+## Code suggestions
+
+In the following sections, we have suggested some best practices for a uniform codebase. We will investigate and identify the practices that can be enforced using Clippy. This information will evolve and improve over time.
+
+### Attributes
+
+Make sure to use the appropriate attributes for handling dead code:
+
+```
+// For code that is intended for production usage in the future
+#[allow(dead_code)]
+// For code that is only intended for testing and
+// has no intended production use
+#[cfg(test)]
+```
+
+### Avoid Deref polymorphism
+
+Don't abuse the Deref trait to emulate inheritance between structs, and thus reuse methods.  For more information, read [here](https://github.com/rust-unofficial/patterns/blob/master/anti_patterns/deref.md).
+
+### Comments
+
+We recommend that you use `//` and `///` comments rather than block comments `/* ... */` for uniformity and simpler grepping.
+
+### Concurrent types
+
+Concurrent types such as [`CHashMap`](https://docs.rs/crate/chashmap), [`AtomicUsize`](https://doc.rust-lang.org/std/sync/atomic/struct.AtomicUsize.html), etc. have an immutable borrow on self i.e. `fn foo_mut(&self,...)` in order to support concurrent access on interior mutating methods. Good practices (such as those in the examples mentioned) avoid exposing synchronization primitives externally (e.g. `Mutex`, `RwLock`) and document the method semantics and invariants clearly.
+
+*When to use channels vs concurrent types?*
+
+Listed below are high-level suggestions based on experience:
+
+* Channels are for ownership transfer, decoupling of types, and coarse-grained messages.  They fit well for transferring ownership of data, distributing units of work, and communicating async results.  Furthermore, they help break circular dependencies (e.g. `struct Foo` contains an `Arc<Bar>` and `struct Bar` contains an `Arc<Foo>` that leads to complex initialization).
+
+* Concurrent types (e.g. such as [`CHashMap`](https://docs.rs/crate/chashmap) or structs that have interior mutability building on [`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html), [`RwLock`](https://doc.rust-lang.org/std/sync/struct.RwLock.html), etc.) are better suited for caches and states.
+
+### Error handling
+
+Error handling suggestions follow the [Rust book guidance](https://doc.rust-lang.org/book/ch09-00-error-handling.html).  Rust groups errors into two major categories: recoverable and unrecoverable errors.  Recoverable errors should be handled with [Result](https://doc.rust-lang.org/std/result/).  Our suggestions on unrecoverable errors are listed below:
+
+*Panic*
+
+* `unwrap()` - Unwrap should only be used for test code.  For all other use cases, prefer `expect()`. The only exception is if the error message is custom-generated, in which case use `.unwrap_or_else(|| panic!("error: {}", foo))`.
+* `expect()` - Expect should be invoked when a system invariant is expected to be preserved.  `expect()` is preferred over `unwrap()` and should contain a detailed error message on failure in most cases.
+* `assert!()` - This macro is kept in both debug/release and should be used to protect invariants of the system as necessary.
+* `unreachable!()` - This macro will panic on code that should not be reached (violating an invariant) and can be used where appropriate.
+
+In production (non-test) code, outside of lock management,  all unrecoverable errors should be cleanly documented describing why said event is unrecoverable. For example, if the system is now in a bad state, state what that state is and the motivation for why a crash / restart is more effective than resolving it within a running system, and what if any steps an operator would need to take to resolve the issue.
+
+### Generics
+
+Generics allow dynamic behavior (similar to [`trait`](https://doc.rust-lang.org/book/ch10-02-traits.html) methods) with static dispatch.  As the number of generic type parameters increases, the difficulty of using the type/method also increases (e.g. consider the combination of trait bounds required for this type, duplicate trait bounds on related types, etc.).  In order to avoid this complexity, we generally try to avoid using a large number of generic type parameters.  We have found that converting code with a large number of generic objects to trait objects with dynamic dispatch often simplifies our code.
+
+### Getters/setters
+
+In general, we follow naming recommendations for getters as specified [here](https://rust-lang.github.io/api-guidelines/naming.html#getter-names-follow-rust-convention-c-getter) and for setters as defined [here](https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#gettersetter-apis).
+
+Getters/setters should be avoided for [`struct`](https://doc.rust-lang.org/book/ch05-00-structs.html) types in the C spirit: compound, passive data structures without internal invariants. Adding them only increases the complexity and number of lines of code without improving the developer experience.
+
+```rust
+struct Foo {
+    size: usize,
+    key_to_value: HashMap<u32, u32>
+}
+
+impl Foo {
+    /// Simple getter follows xxx pattern
+    fn size(&self) -> usize {
+        self.size
+    }
+
+    /// Setter follows set_xxx pattern
+    fn set_foo(&mut self, size: usize){
+        self.size = size;
+    }
+
+    /// Complex getter follows get_xxx pattern
+    fn get_value(&self, key: u32) -> Option<&u32> {
+        self.key_to_value.get(&key)
+    }
+}
+```
+
+### Integer Arithmetic
+
+As every integer operation (`+`, `-`, `/`, `*`, etc.) implies edge-cases (e.g. overflows `u64::MAX + 1`, underflows `0u64 -1`, division by zero, etc.),
+we use checked arithmetic instead of directly using math symbols.
+It forces us to think of edge-cases, and handle them explicitely.
+This is a brief and simplified mini guide of the different functions that exist to handle integer arithmetic:
+
+* [checked_](https://doc.rust-lang.org/std/primitive.u32.html#method.checked_add): use this function if you want to handle overflows and underflows as a special edge-case. It returns `None` if an underflow or overflow has happened, and `Some(operation_result)` otherwise.
+* [overflowing_](https://doc.rust-lang.org/std/primitive.u32.html#method.overflowing_add): use this function if you want the result of an overflow to potentially wrap around (e.g. `u64::MAX.overflow_add(10) == (9, true)`). It returns the underflowed or overflowed result as well as a flag indicating if an overflow has occured or not.
+* [wrapping_](https://doc.rust-lang.org/std/primitive.u32.html#method.wrapping_add): this is similar to overflowing operations, except that it returns the result directly. Use this function if you are sure that you want to handle underflows and overflows by wrapping around.
+* [saturating_](https://doc.rust-lang.org/std/primitive.u32.html#method.saturating_add): if an overflow occurs, the result is kept within the boundary of the type (e.g. `u64::MAX.saturating_add(1) == u64::MAX`).
+
+### Logging
+
+We currently use [log](https://docs.rs/log/) for logging.
+
+* [error!](https://docs.rs/log/0.4.14/log/macro.error.html) - Error-level messages have the highest urgency in [log](https://docs.rs/log/).  An unexpected error has occurred (e.g. exceeded the maximum number of retries to complete an RPC or inability to store data to local storage).
+* [warn!](https://docs.rs/log/0.4.14/log/macro.warn.html) - Warn-level messages help notify admins about automatically handled issues (e.g. retrying a failed network connection or receiving the same message multiple times, etc.).
+* [info!](https://docs.rs/log/0.4.14/log/macro.info.html) - Info-level messages are well suited for "one-time" events (such as logging state on one-time startup and shutdown) or periodic events that are not frequently occurring - e.g. changing the validator set every day.
+* [debug!](https://docs.rs/log/0.4.14/log/macro.debug.html) - Debug-level messages can occur frequently (i.e. potentially > 1 message per second) and are not typically expected to be enabled in production.
+* [trace!](https://docs.rs/log/0.4.14/log/macro.trace.html) - Trace-level logging is typically only used for function entry/exit.
+
+### Testing
+
+*Unit tests*
+
+We follow the general guidance provided [here](https://doc.rust-lang.org/book/ch11-03-test-organization.html). Ideally, all code should be unit tested.  Unit tests should be in the same file as the code it is testing though in a distinct module, using the following syntax:
+
+```rust
+struct Foo {
+}
+
+impl Foo {
+  pub fn magic_number() -> u8 {
+    42
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  #test
+  fn verify_magic_number() {
+    assert_eq!(Foo::magic_number(), 42);
+  }
+}
+```
+
+*Property-based tests*
+
+Move contains [property-based tests](https://blog.jessitron.com/2013/04/25/property-based-testing-what-is-it/) written in Rust using the [`proptest` framework](https://github.com/AltSysrq/proptest). Property-based tests generate random test cases and assert that invariants, also called *properties*, hold for the code under test.
+
+Some examples of properties tested in Move:
+
+* Every serializer and deserializer pair is tested for correctness with random inputs to the serializer. Any pair of functions that are inverses of each other can be tested this way.
+* The results of executing common transactions through the VM are tested using randomly generated scenarios and verified with an *Oracle*.
+
+A tutorial for `proptest` can be found in the [`proptest` book](https://altsysrq.github.io/proptest-book/proptest/getting-started.html).
+
+References:
+
+* [What is Property Based Testing?](https://hypothesis.works/articles/what-is-property-based-testing/) (includes a comparison with fuzzing)
+* [An introduction to property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing/)
+* [Choosing properties for property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing-2/)
+
+### Conditional compilation of tests
+
+Move [conditionally
+compiles](https://doc.rust-lang.org/stable/reference/conditional-compilation.html)
+code that is *only relevant for tests, but does not consist of tests* (unitary
+or otherwise). Examples of this include proptest strategies, implementations
+and derivations of specific traits (e.g. the occasional `Clone`), helper
+functions, etc. Since Cargo is [currently not equipped for automatically activating features
+in tests/benchmarks](https://github.com/rust-lang/cargo/issues/2911), we rely on two
+conditions to perform this conditional compilation:
+- the test flag, which is activated by dependent test code in the same crate
+  as the conditional test-only code.
+- the `fuzzing` custom feature, which is used to enable fuzzing and testing
+related code in downstream crates. Note that this must be passed explicitly to
+`cargo xtest` and `cargo x bench`. Never use this in `[dependencies]` unless
+the crate is only for testing.
+
+As a consequence, it is recommended that you set up your test-only code in the following fashion.
+
+**For production crates:**
+
+Production crates are defined as the set of crates that create externally published artifacts.
+
+For the sake of example, we'll consider you are defining a test-only helper function `foo` in `foo_crate`:
+
+1. Define the `fuzzing` flag in `foo_crate/Cargo.toml` and make it non-default:
+    ```toml
+    [features]
+    default = []
+    fuzzing = []
+    ```
+2. Annotate your test-only helper `foo` with both the `test` flag (for in-crate callers) and the `"fuzzing"` custom feature (for out-of-crate callers):
+    ```rust
+    #[cfg(any(test, feature = "fuzzing"))]
+    fn foo() { ... }
+    ```
+3. (optional) Use `cfg_attr` to make test-only trait derivations conditional:
+    ```rust
+    #[cfg_attr(any(test, feature = "testing"), derive(FooTrait))]
+    #[derive(Debug, Display, ...)] // inconditional derivations
+    struct Foo { ... }
+    ```
+4. (optional) Set up feature transitivity for crates that call crates that have test-only members. Let's say it's the case of `bar_crate`, which, through its test helpers, calls into `foo_crate` to use your test-only `foo`. Here's how you would set up `bar_crate/Cargo.toml`:
+    ```toml
+    [features]
+    default = []
+    fuzzing = ["foo_crate/fuzzing"]
+    ```
+
+**For test-only crates:**
+
+Test-only crates do not create published artifacts. They consist of tests, benchmarks or other code that verifies
+the correctness or performance of published artifacts. Test-only crates are
+explicitly listed in `x.toml` under `[workspace.test-only]`.
+
+These crates do not need to use the above setup. Instead, they can enable the `fuzzing` feature in production crates
+directly.
+
+```toml
+[dependencies]
+foo_crate = { path = "...", features = ["fuzzing"] }
+```
+
+*A final note on integration tests*: All tests that use conditional test-only
+elements in another crate need to activate the "fuzzing" feature through the
+`[features]` section in their `Cargo.toml`. [Integration
+tests](https://doc.rust-lang.org/rust-by-example/testing/integration_testing.html)
+can neither rely on the `test` flag nor do they have a proper `Cargo.toml` for
+feature activation. In the Move codebase, we therefore recommend that
+*integration tests which depend on test-only code in their tested crate* be
+extracted to their own test-only crate. See `language/move-binary-format/serializer_tests`
+for an example of such an extracted integration test.
+
+*Note for developers*: The reason we use a feature re-export (in the `[features]` section of the `Cargo.toml` is that a profile is not enough to activate the `"fuzzing"` feature flag. See [cargo-issue #291](https://github.com/rust-lang/cargo/issues/2911) for details).
diff --git a/vendors/move/documentation/examples/experimental/math-puzzle/Move.toml b/vendors/move/documentation/examples/experimental/math-puzzle/Move.toml
new file mode 100644
index 000000000..981ea2118
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/math-puzzle/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "math-puzzle"
+version = "0.0.0"
diff --git a/vendors/move/documentation/examples/experimental/math-puzzle/README.md b/vendors/move/documentation/examples/experimental/math-puzzle/README.md
new file mode 100644
index 000000000..a27261429
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/math-puzzle/README.md
@@ -0,0 +1,63 @@
+# Math Puzzle
+
+This package contains an example that solves a math puzzle using Move Prover.
+
+## Puzzle description
+
+```
+Find a,b,...,h such that:
+
+1 <= a,b,...,h <= 9
+
+    a b c
+  +   d e
+  -------
+    f g h
+
+a is the double of c
+b is less than h
+c is equal to e
+d is equal to f
+e is less than or equal to 3
+f is odd
+g is even
+h is greater than or equal to 5
+```
+
+## Solving the puzzle using Move Prover
+
+In `sources/puzzlie.move`, the function `Puzzle::puzzle` is constructed to take 8 numbers (i.e., `a`, `b`, ..., `h`) and abort if the input does not satisfy any rule of the puzzle. In addition, the spec block for the function is added to assert that the function always aborts, in other words, there is no input that satisfies all the rule. The Move Prover will disprove the function specification giving a counter-example which satisfies all of the puzzle rules. It will become the solution of the puzzle.
+
+Use the following command to run Move Prover:
+```
+move prove
+```
+
+The following is the expected output of Move Prover:
+```
+    error: function does not abort under this condition
+    |- /Users/jkpark/puzzle.move:53:9
+    |
+ 36 |         aborts_if true;
+    |         ^^^^^^^^^^^^^^^
+    |
+    =     at /Users/jkpark/puzzle.move:28: puzzle
+    =         a = 6
+    =         b = 5
+    =         c = 3
+    =         d = 7
+    =         e = 3
+    =         f = 7
+    =         g = 2
+    =         h = 6
+    ...
+```
+
+## Solution
+
+```
+    a b c        6 5 3
+  +   d e      +   7 3
+  -------      -------
+    f g h        7 2 6
+```
diff --git a/vendors/move/documentation/examples/experimental/math-puzzle/sources/puzzle.move b/vendors/move/documentation/examples/experimental/math-puzzle/sources/puzzle.move
new file mode 100644
index 000000000..f2088dbd9
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/math-puzzle/sources/puzzle.move
@@ -0,0 +1,33 @@
+module 0x42::Puzzle {
+    fun assert0(b: bool) {
+        assert!(b, 0);
+    }
+
+    fun puzzle(a: u64, b: u64, c: u64, d: u64, e: u64, f: u64, g: u64, h: u64) {
+        assert0(1 <= a && a <= 9);         // 1 <= a <= 9
+        assert0(1 <= b && b <= 9);         // 1 <= b <= 9
+        assert0(1 <= c && c <= 9);         // 1 <= c <= 9
+        assert0(1 <= d && d <= 9);         // 1 <= d <= 9
+        assert0(1 <= e && e <= 9);         // 1 <= e <= 9
+        assert0(1 <= f && f <= 9);         // 1 <= f <= 9
+        assert0(1 <= g && g <= 9);         // 1 <= g <= 9
+        assert0(1 <= h && h <= 9);         // 1 <= h <= 9
+
+        assert0(a == c*2);                 // a is the double of c
+        assert0(b < h);                    // b is less than h
+        assert0(c == e);                   // c is equal to e
+        assert0(d == f);                   // d is equal to f
+        assert0(e <= 3);                   // e is less than or equal to 3
+        assert0(f % 2 == 1);               // f is odd
+        assert0(g % 2 == 0);               // g is even
+        assert0(h >= 5);                   // h is greater than or equal to 5
+
+        assert0((c+e)%10 == h);            //      a b c
+        let carry = (c+e)/10;              //    +   d e
+        assert0((b+d+carry)%10 == g);      //    -------
+        assert0(a+(b+d+carry)/10 == f);    //      f g h
+    }
+    spec puzzle {
+        aborts_if true;                    // specifies that this fun always aborts.
+    }
+}
diff --git a/vendors/move/documentation/examples/experimental/rounding-error/Move.toml b/vendors/move/documentation/examples/experimental/rounding-error/Move.toml
new file mode 100644
index 000000000..1cb26f047
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/rounding-error/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "RoundingError"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+NamedAddr = "0xCAFE"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/vendors/move/documentation/examples/experimental/rounding-error/sources/Reserve.move b/vendors/move/documentation/examples/experimental/rounding-error/sources/Reserve.move
new file mode 100644
index 000000000..aaffd36ca
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/rounding-error/sources/Reserve.move
@@ -0,0 +1,89 @@
+module NamedAddr::Reserve {
+    use std::fixed_point32::{Self, FixedPoint32};
+
+    const ADMIN: address = @NamedAddr;
+
+    struct ReserveComponent has store {
+        backing_value: u64,
+        backing_ratio: FixedPoint32,
+    }
+
+    struct Coin1Info has key {
+        total_value: u64,
+        reserve_coin2: ReserveComponent,
+    }
+
+    public fun mint_coin1(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+    spec mint_coin1 {
+        let coin1info = global<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::spec_multiply_u64(amount_to_mint, coin1info.reserve_coin2.backing_ratio) + 1;
+        aborts_if amount_to_mint == 0;
+        aborts_if backing_coin2 != coin2_amount_to_reserve;
+        aborts_if global<Coin1Info>(ADMIN).total_value + amount_to_mint > MAX_U64;
+        aborts_if coin1info.reserve_coin2.backing_value + backing_coin2 > MAX_U64;
+        aborts_if !exists<Coin1Info>(ADMIN);
+
+        ensures global<Coin1Info>(ADMIN).total_value == old(global<Coin1Info>(ADMIN).total_value) + amount_to_mint;
+        ensures global<Coin1Info>(ADMIN).reserve_coin2.backing_value == old(global<Coin1Info>(ADMIN).reserve_coin2.backing_value) + backing_coin2;
+        ensures backing_coin2 == coin2_amount_to_reserve;
+    }
+
+    public fun mint_coin1_incorrect(amount_to_mint: u64, backing_coin2: u64): u64 // returns the minted Coin1.
+    acquires Coin1Info {
+        assert!(amount_to_mint > 0, 1);
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_reserve = fixed_point32::multiply_u64(amount_to_mint, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(backing_coin2 == coin2_amount_to_reserve, 2);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value + coin2_amount_to_reserve;
+        coin1info.total_value = coin1info.total_value + amount_to_mint;
+        amount_to_mint
+    }
+
+    public fun burn_coin1(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio);
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    public fun burn_coin1_incorrect(amount_to_burn: u64): u64 // returns the Coin2 that was reserved.
+    acquires Coin1Info {
+        let coin1info = borrow_global_mut<Coin1Info>(ADMIN);
+        let coin2_amount_to_return = fixed_point32::multiply_u64(amount_to_burn, *& coin1info.reserve_coin2.backing_ratio) + 1;
+        assert!(coin1info.reserve_coin2.backing_value >= coin2_amount_to_return, 1);
+        coin1info.reserve_coin2.backing_value = coin1info.reserve_coin2.backing_value - coin2_amount_to_return;
+        coin1info.total_value = coin1info.total_value - amount_to_burn;
+        coin2_amount_to_return
+    }
+
+    fun mint_and_burn(amount_to_mint: u64, backing_coin2: u64): u64 acquires Coin1Info{
+        let coin1 = mint_coin1(amount_to_mint, backing_coin2);
+        let coin2 = burn_coin1(coin1);
+        spec {
+            assert coin2 <= backing_coin2;
+        };
+        coin2
+    }
+
+    spec module {
+        invariant exists<Coin1Info>(ADMIN) ==>
+            global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio == fixed_point32::spec_create_from_rational(1, 2);
+
+        invariant
+            exists<Coin1Info>(ADMIN) ==>
+            fixed_point32::spec_multiply_u64(global<Coin1Info>(ADMIN).total_value, global<Coin1Info>(ADMIN).reserve_coin2.backing_ratio)
+                <= global<Coin1Info>(ADMIN).reserve_coin2.backing_value;
+    }
+}
diff --git a/vendors/move/documentation/examples/experimental/rounding-error/sources/Uniswap.move b/vendors/move/documentation/examples/experimental/rounding-error/sources/Uniswap.move
new file mode 100644
index 000000000..1f24eb5ee
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/rounding-error/sources/Uniswap.move
@@ -0,0 +1,130 @@
+module NamedAddr::Uniswap {
+
+    const PoolAddr: address = @NamedAddr;
+
+    struct Pool has key {
+        coin1: u64,
+        coin2: u64,
+        total_share: u64
+    }
+
+    fun getInputPrice(input_amount: u64, input_reserve: u64, output_reserve: u64): u64 {
+        let input_amount_with_fee = input_amount * 997;
+        let numerator = input_amount_with_fee * output_reserve;
+        let denominator = (input_reserve * 1000) + input_amount_with_fee;
+        numerator / denominator
+    }
+    public fun coin1_to_coin2_swap_code(coin1_in: u64): u64 acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        let coin2_out = getInputPrice(coin1_in, pool.coin1, pool.coin2);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_code {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2; // safety property
+    }
+
+    // https://hackmd.io/@HaydenAdams/HJ9jLsfTz?type=view#ETH-%E2%87%84-ERC20-Trades
+    public fun coin1_to_coin2_swap_whitepaper(coin1_in: u64): u64 acquires Pool {
+        assert! (coin1_in > 0, 1);
+        let fee = coin1_in * 3 / 1000; // 0.3%
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+            assume pool.coin1 == 1337;
+            assume pool.coin2 == 252;
+        };
+        let inv = pool.coin1 * pool.coin2; // `inv` may need to be u128
+        let new_pool_coin1 = pool.coin1 + coin1_in;
+        let new_pool_coin2 = inv / (new_pool_coin1 - fee); // No div-by-zero because (new_pool_coin1 - fee) cannot be 0.
+        let coin2_out = pool.coin2 - new_pool_coin2;
+        pool.coin1 = new_pool_coin1;
+        pool.coin2 = new_pool_coin2;
+        coin2_out
+    }
+    spec coin1_to_coin2_swap_whitepaper {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 < new_pool.coin1;
+        ensures old_pool.coin2 >= new_pool.coin2;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    public fun add_liquidity(coin1_in: u64, coin2_in: u64): u64 // returns liquidity share
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+
+        let coin1_added = coin1_in;
+        let share_minted = (coin1_added * pool.total_share) / pool.coin1;
+        let coin2_added = (share_minted * pool.coin2) / pool.total_share;
+        // let coin2_added = (coin1_added  * pool.coin2 ) / pool.coin1; // alternatively ...
+
+        assert!(coin2_in == coin2_added, 1);
+
+        pool.coin1 = pool.coin1 + coin1_added;
+        pool.coin2 = pool.coin2 + coin2_added;
+        pool.total_share = pool.total_share + share_minted;
+
+        share_minted
+    }
+    spec add_liquidity {
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 <= new_pool.coin1;
+        ensures old_pool.coin2 <= new_pool.coin2;
+        ensures old_pool.total_share <= new_pool.total_share;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    public fun remove_liquidity(share: u64): (u64, u64) // returns (coin1, coin2)
+    acquires Pool {
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+
+        let coin1_removed = (pool.coin1 * share) / pool.total_share;
+        let coin2_removed = (pool.coin2 * share) / pool.total_share;
+
+        pool.coin1 = pool.coin1 - coin1_removed;
+        pool.coin2 = pool.coin2 - coin2_removed;
+        pool.total_share = pool.total_share - share;
+
+        (coin1_removed, coin2_removed)
+    }
+    spec remove_liquidity {
+        pragma verify=false;
+        let old_pool = global<Pool>(PoolAddr);
+        let post new_pool = global<Pool>(PoolAddr);
+        ensures old_pool.coin1 <= new_pool.coin1;
+        ensures old_pool.coin2 <= new_pool.coin2;
+        ensures old_pool.total_share <= new_pool.total_share;
+        ensures old_pool.coin1 * old_pool.coin2 <= new_pool.coin1 * new_pool.coin2;
+    }
+
+    // #[test] // TODO: cannot specify the test-only functions
+    fun no_free_money_theorem(coin1_in: u64, coin2_in: u64): (u64, u64) acquires Pool {
+        let share = add_liquidity(coin1_in, coin2_in);
+        remove_liquidity(share)
+    }
+    spec no_free_money_theorem {
+        pragma verify=false;
+        ensures result_1 <= coin1_in;
+        ensures result_2 <= coin2_in;
+    }
+
+
+    public fun coin1_to_coin2_swap_code_simple(coin1_in: u64): u64 acquires Pool {
+        assert! (coin1_in > 0, 1);
+        let pool = borrow_global_mut<Pool>(PoolAddr);
+        spec {
+            assume pool.coin1 > 0;
+            assume pool.coin2 > 0;
+        };
+        let coin2_out = (997 * coin1_in * pool.coin2) / (1000 * pool.coin1 + 997 * coin1_in);
+        pool.coin1 = pool.coin1 + coin1_in;
+        pool.coin2 = pool.coin2 - coin2_out;
+        coin2_out
+    }
+}
diff --git a/vendors/move/documentation/examples/experimental/verify-sort/Move.toml b/vendors/move/documentation/examples/experimental/verify-sort/Move.toml
new file mode 100644
index 000000000..1c74136db
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/verify-sort/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Loop"
+version = "0.0.0"
+
+[addresses]
+Loop = "0x42"
+
+[dependencies]
+MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
diff --git a/vendors/move/documentation/examples/experimental/verify-sort/sources/loop.move b/vendors/move/documentation/examples/experimental/verify-sort/sources/loop.move
new file mode 100644
index 000000000..b673830c9
--- /dev/null
+++ b/vendors/move/documentation/examples/experimental/verify-sort/sources/loop.move
@@ -0,0 +1,66 @@
+// exclude_for: cvc5
+module 0x42::VerifySort {
+
+    use std::vector;
+    // iperm is a ghost variable for verification
+    public fun verify_sort(v: &mut vector<u64>, iperm: &mut vector<u64>) {
+        let vlen = vector::length(v);
+        spec {
+            assume vlen == 42;
+            assume len(iperm) == vlen && (forall k in 0..vlen : iperm[k] == k);
+        };
+        if (vlen <= 1) return ();
+
+        let i = 0;
+        let j = 1;
+        while
+        ({
+            spec {
+                // loop invariant that proves order of output vector
+                invariant i >= 0 && i < vlen;
+                invariant j >= 1 && j <= vlen;
+                invariant j == vlen ==> i == vlen - 1;
+                invariant j >= i + 1;
+                invariant len(v) == vlen;
+                invariant forall k in 0..i, l in 0..i : k < l ==> v[k] <= v[l];
+                invariant forall k in 0..i, l in i..vlen : v[k] <= v[l];
+                invariant forall k in (i + 1)..j : v[i] <= v[k];
+
+                // loop invariant that proves output vector is a permutation of input vector
+                invariant len(iperm) == vlen &&
+                          (forall k in 0..vlen : old(v)[iperm[k]] == v[k]) &&
+                          (forall k in 0..vlen : iperm[k] >= 0 && iperm[k] < vlen) &&
+                          (forall k in 0..vlen, l in 0..vlen : k != l ==> iperm[k] != iperm[l]);
+            };
+            (i < vlen - 1)
+        })
+        {
+            if (*vector::borrow(v, i) > *vector::borrow(v, j)) {
+                vector::swap(v, i, j);
+                vector::swap(iperm, i, j);
+            };
+
+            if (j < vlen - 1 ) {
+                j = j + 1;
+            } else {
+                i = i + 1;
+                j = i + 1;
+            };
+        };
+        spec {
+            assert len(v) == vlen;
+            assert i == vlen - 1;
+            assert j == vlen;
+            assert v[0] <= v[1];
+            assert v[vlen - 2] <= v[vlen - 1];
+        };
+    }
+    spec verify_sort {
+        aborts_if false;
+        ensures forall i in 0..len(v)-1: v[i] <= v[i+1];
+        ensures exists perm : vector<u64> : len(perm) == len(v) &&
+                (forall k in 0..len(v) : old(v)[perm[k]] == v[k]) &&
+                (forall k in 0..len(v) : perm[k] >= 0 && perm[k] < len(v)) &&
+                (forall k in 0..len(v), l in 0..len(v) : k != l ==> perm[k] != perm[l]);
+    }
+}
diff --git a/vendors/move/documentation/spec/vm.md b/vendors/move/documentation/spec/vm.md
new file mode 100644
index 000000000..fea24adb6
--- /dev/null
+++ b/vendors/move/documentation/spec/vm.md
@@ -0,0 +1,649 @@
+# Move VM Specification
+
+Instantiation of a Move VM just initializes an instance of a `Loader`, that
+is, a small set of empty tables (few instances of `HashMap` and `Vec` behind
+`Mutex`). Initialization of a VM is reasonably inexpensive. The `Loader` is
+effectively the code cache. The code cache has the lifetime of the VM. Code
+is loaded at runtime when functions and scripts are executed. Once loaded,
+modules and scripts are reused in their loaded form and ready to be executed
+immediately. Loading code is expensive and the VM performs eager
+loading. When execution starts, no more loading takes place, all code through
+any possible control flow is ready to be executed and cached at load time.
+Maybe, more importantly, the eager model guarantees that no runtime errors can
+come from linking at runtime, and that a given invocation will not fail
+loading/linking because of different code paths. The consistency of the
+invocation is guaranteed before execution starts. Obviously runtime errors are
+still possible and "expected".
+
+This model fits typical blockchain requirements well:
+
+* Validation uses only few functions published at genesis. Once loaded, code is
+always fetched from the cache and immediately available.
+
+* Execution is in the context of a given data view, a stable and immutable
+view. As such code is stable too, and it is important to optimize the process
+of loading. Also, transactions are reasonably homogeneous and reuse of code
+leads to significant improvements in performance and stability.
+
+The VM has an internal implementation for a data cache that relieves the client from an
+important responsibility (data cache consistency). That abstraction is behind
+a `Session` which is the only way to talk to the runtime.
+
+The objective of a `Session` is to create and manage the data cache for a set
+of invocations into the VM. It is also intended to return side effects in a
+format that is suitable to the adapter.
+A `Session` forwards calls to the `Runtime` which is where the logic and
+implementation of the VM lives and starts.
+
+### Code Cache
+
+When loading a Module for the first time, the VM queries the data store for
+the Module. That binary is deserialized, verified, loaded and cached by the
+loader. Once loaded, a Module is never requested again for the lifetime of
+that VM instance. Code is an immutable resource in the system.
+
+The process of loading can be summarized through the following steps:
+
+1. a binary—Module in a serialized form, `Vec<u8>`—is fetched from the data store.
+This may require a network access
+2. the binary is deserialized and verified
+3. dependencies of the module are loaded (repeat 1.–4. for each dependency)
+4. the module is linked to its dependencies (transformed in a representation
+suitable for runtime) and cached by the loader.
+
+So a reference to a loaded module does not perform any fetching from the
+network, or verification, or transformations into runtime structures
+(e.g. linking).
+
+In a typical client, consistency of the code cache can be broken by a system transaction
+that performs a hard upgrade, requiring the adapter to stop processing
+transactions until a restart takes place. Other clients may have different
+"code models" (e.g. some form of versioning).
+
+Overall, a client holding an instance of a Move VM has to be aware of the
+behavior of the code cache and provide data views (`DataStore`) that are
+compatible with the loaded code. Moreover, a client is responsible to release
+and instantiate a new VM when specific conditions may alter the consistency of
+the code cache.
+
+### Publishing
+
+Clients may publish modules in the system by calling:
+
+```rust
+pub fn publish_module(
+    &mut self,
+    module: Vec<u8>,
+    sender: AccountAddress,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The `module` is in a [serialized form](#Binary-Format) and the VM performs the
+following steps:
+
+* Deserialize the module: If the module does not deserialize, an error is
+returned with a proper `StatusCode`.
+
+* Check that the module address and the `sender` address are the same: This
+check verifies that the publisher is the account that will eventually [hold
+the module](#References-to-Data-and-Code). If the two addresses do not match, an
+error with `StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER` is returned.
+
+* Check that the module is not already published: Code is immutable in
+Move. An attempt to overwrite an existing module results in an error with
+`StatusCode::DUPLICATE_MODULE_NAME`.
+
+* Verify loading: The VM performs [verification](#Verification) of the
+module to prove correctness. However, neither the module nor any of its
+dependencies are actually saved in the cache. The VM ensures that the module
+will be loadable when a reference will be found. If a module would fail to
+load an error with proper `StatusCode` is returned.
+
+* Publish: The VM writes the serialized bytes of the module
+with the [proper key](#References-to-Data-and-Code) to the storage.
+After this step any reference to the
+module is valid.
+
+## Script Execution
+
+The VM allows the execution of [scripts](#Binary-Format). A script is a
+Move function declared in a `script` block that performs
+calls into a Framework published on-chain to accomplish a
+logical transaction. A script is not saved in storage and
+it cannot be invoked by other scripts or modules.
+
+```rust
+pub fn execute_script(
+    &mut self,
+    script: Vec<u8>,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The `script` is specified in a [serialized form](#Binary-Format).
+If the script is generic, the `ty_args` vector contains the `TypeTag`
+values for the type arguments. The `signer` account addresses for the
+script are specified in the `senders` vector. Any additional arguments
+are provided in the `args` vector, where each argument is a BCS-serialized
+vector of bytes. The VM
+performs the following steps:
+
+* Load the Script and the main function:
+
+    - The `sha3_256` hash value of the `script` binary is computed.
+    - The hash is used to access the script cache to see if the script was
+      loaded. The hash is used for script identity.
+    - If not in the cache the script is [loaded](#Loading). If loading fails,
+      execution stops and an error with a proper `StatusCode` is returned.
+    - The script main function is [checked against the
+      type argument instantiation](#Verification) and if there are
+      errors, execution stops and the error returned.
+
+* Build the argument list: The first arguments are `Signer` values created by
+the VM for the account addresses in the `senders` vector. Any other arguments
+from the `args` vector are then checked against a whitelisted set of permitted
+types and added to the arguments for the script.
+The VM returns an error with `StatusCode::TYPE_MISMATCH` if
+any of the types is not permitted.
+
+* Execute the script: The VM invokes the interpreter to [execute the
+script](#Interpreter). Any error during execution is returned, and the
+transaction aborted. The VM returns whether execution succeeded or
+failed.
+
+## Script Function Execution
+
+Script functions (in version 2 and later of the Move VM) are similar to scripts
+except that the Move bytecode comes from a Move function with `script` visibility
+in an on-chain module. The script function is specified by the module and function
+name:
+
+```rust
+pub fn execute_script_function(
+    &mut self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    senders: Vec<AccountAddress>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+Execution of script functions is similar to scripts. Instead of using the Move bytecodes
+from a script, the script function is loaded from the on-chain module, and the Move VM
+checks that it has `script` visibility. The rest of the script function execution is
+the same as for scripts. If the function does not exist, execution fails with a
+`FUNCTION_RESOLUTION_FAILURE` status code. If the function does not have `script` visibility,
+it will fail with the `EXECUTE_SCRIPT_FUNCTION_CALLED_ON_NON_SCRIPT_VISIBLE` status code.
+
+## Function Execution
+
+The VM allows the execution of [any function in a module](#Binary-Format)
+through a `ModuleId` and a function name. Function names are unique within a
+module (no overloading), so the signature of the function is not
+required. Argument checking is done by the [interpreter](#Interpreter).
+
+The adapter uses this entry point to run specific system functions as
+described in [validation](#Validation) and [execution](#Execution). This is a
+very powerful entry point into the system given there are no visibility
+checks. Clients would likely use this entry point internally (e.g., for
+constructing a genesis state), or wrap and expose it with restrictions.
+
+```rust
+pub fn execute_function(
+    &mut self,
+    module: &ModuleId,
+    function_name: &IdentStr,
+    ty_args: Vec<TypeTag>,
+    args: Vec<Vec<u8>>,
+    gas_status: &mut impl GasMeter,
+) -> VMResult<()>;
+```
+
+The VM performs the following steps:
+
+* Load the function:
+
+    - The specified `module` is first [loaded](#Loading).
+      An error in loading halts execution and returns the error with a proper
+      `StatusCode`.
+    - The VM looks up the function in the module. Failure to resolve the
+      function returns an error with a proper `StatusCode`.
+    - Every type in the `ty_args` vector is [loaded](#Loading). An error
+      in loading halts execution and returns the error with a proper `StatusCode`.
+      Type arguments are checked against type parameters and an error returned
+      if there is a mismatch (i.e., argument inconsistent with generic declaration).
+
+* Build the argument list: Arguments are checked against a whitelisted set
+of permitted types (_specify which types_). The VM returns an error with
+`StatusCode::TYPE_MISMATCH` if any of the types is not permitted.
+
+* Execute the function: The VM invokes the interpreter to [execute the
+function](#Interpreter). Any error during execution aborts the interpreter
+and returns the error. The VM returns whether execution succeeded or
+failed.
+
+## Binary Format
+
+Modules and Scripts can only enter the VM in binary form, and Modules are
+saved on chain in binary form. A Module is logically a collection of
+functions and data structures. A Script is just an entry point, a single
+function with arguments and no return value.
+
+Modules can be thought as library or shared code, whereas Scripts can only
+come in input with the Transaction.
+
+Binaries are composed of headers and a set of tables. Some of
+those tables are common to both Modules and Scripts, others specific to one or
+the other. There is also data specific only to Modules or Scripts.
+
+The binary format makes a heavy use of
+[ULEB128](https://en.wikipedia.org/wiki/LEB128) to compress integers. Most of
+the data in a binary is in the form of indices, and as such compression offers
+an important saving. Integers, when used with no compression are in
+[little-endian](https://en.wikipedia.org/wiki/Endianness) form.
+
+Vectors are serialized with the size first, in ULEB128 form, followed by the
+elements contiguously.
+
+### Binary Header
+
+Every binary starts with a header that has the following format:
+
+* `Magic`: 4 bytes 0xA1, 0x1C, 0xEB, 0x0B (aka "A11CEB0B" or "AliceBob")
+* `Version`: 4 byte little-endian unsigned integer
+* `Table count`: number of tables in ULEB128 form. The current maximum number
+of tables is contained in 1 byte, so this is effectively the count of tables in
+one byte. Not all tables need to be present. Each kind of table can only be
+present once; table repetitions are not allowed. Tables can be serialized in any
+order.
+
+### Table Headers
+
+Following the binary header are the table headers. There are as many tables as
+defined in "table count". Each table header
+has the following format:
+
+* `Table Kind`: 1 byte for the [kind of table](#Tables) that is serialized at
+the location defined by the next 2 entries
+* `Table Offset`: ULEB128 offset from the end of the table headers where the
+table content starts
+* `Table Length`: ULEB128 byte count of the table content
+
+Tables must be contiguous to each other, starting from the end of the table
+headers. There must not be any gap between the content of the tables. Table
+content must not overlap.
+
+### Tables
+
+A `Table Kind` is 1 byte, and it is one of:
+
+* `0x1`: `MODULE_HANDLES` - for both Modules and Scripts
+* `0x2`: `STRUCT_HANDLES` - for both Modules and Scripts
+* `0x3`: `FUNCTION_HANDLES` - for both Modules and Scriptss
+* `0x4`: `FUNCTION_INSTANTIATIONS` - for both Modules and Scripts
+* `0x5`: `SIGNATURES` - for both Modules and Scripts
+* `0x6`: `CONSTANT_POOL` - for both Modules and Scripts
+* `0x7`: `IDENTIFIERS` - for both Modules and Scripts
+* `0x8`: `ADDRESS_IDENTIFIERS` - for both Modules and Scripts
+* `0xA`: `STRUCT_DEFINITIONS` - only for Modules
+* `0xB`: `STRUCT_DEF_INSTANTIATIONS` - only for Modules
+* `0xC`: `FUNCTION_DEFINITIONS` - only for Modules
+* `0xD`: `FIELD_HANDLES` - only for Modules
+* `0xE`: `FIELD_INSTANTIATIONS` - only for Modules
+* `0xF`: `FRIEND_DECLS` - only for Modules, version 2 and later
+
+The formats of the tables are:
+
+* `MODULE_HANDLES`: A `Module Handle` is a pair of indices that identify
+the location of a module:
+
+    * `address`: ULEB128 index into the `ADDRESS_IDENTIFIERS` table of
+    the account under which the module is published
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the module
+
+* `STRUCT_HANDLES`: A `Struct Handle` contains all the information to
+uniquely identify a user type:
+
+    * `module`: ULEB128 index in the `MODULE_HANDLES` table of the module
+    where the struct is defined
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the struct
+    * `nominal resource`: U8 bool defining whether the
+    struct is a resource (true/1) or not (false/0)
+    * `type parameters`: vector of [type parameter kinds](#Kinds) if the
+    struct is generic, an empty vector otherwise:
+        * `length`: ULEB128 length of the vector, effectively the number of type
+        parameters for the generic struct
+        * `kinds`: array of `length` U8 kind values; not present if length is 0
+
+* `FUNCTION_HANDLES`: A `Function Handle` contains all the information to uniquely
+identify a function:
+
+    * `module`: ULEB128 index in the `MODULE_HANDLES` table of the module where
+    the function is defined
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the function
+    * `parameters`: ULEB128 index into the `SIGNATURES` table for the argument types
+    of the function
+    * `return`: ULEB128 index into the `SIGNATURES` table for the return types of the function
+    * `type parameters`: vector of [type parameter kinds](#Kinds) if the function
+    is generic, an empty vector otherwise:
+        * `length`: ULEB128 length of the vector, effectively the number of type
+        parameters for the generic function
+        * `kinds`: array of `length` U8 kind values; not present if length is 0
+
+* `FUNCTION_INSTANTIATIONS`: A `Function Instantiation` describes the
+instantation of a generic function. Function Instantiation can be full or
+partial. E.g., given a generic function `f<K, V>()` a full instantiation would
+be `f<U8, Bool>()` whereas a partial instantiation would be `f<U8, Z>()` where
+`Z` is a type parameter in a given context (typically another function
+`g<Z>()`).
+
+    * `function handle`: ULEB128 index into the `FUNCTION_HANDLES` table of the
+    generic function for this instantiation (e.g., `f<K, W>()`)
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the
+    instantiation of the function
+
+* `SIGNATURES`: The set of signatures in this binary. A signature is a
+vector of [Signature Tokens](#SignatureTokens), so every signature will carry
+the length (in ULEB128 form) followed by the Signature Tokens.
+
+* `CONSTANT_POOL`: The set of constants in the binary. A constant is a
+copyable primitive value or a vector of vectors of primitives. Constants
+cannot be user types. Constants are serialized according to the rule defined
+in [Move Values](#Move-Values) and stored in the table in serialized form. A
+constant in the constant pool has the following entries:
+
+    * `type`: the [Signature Token](#SignatureTokens) (type) of the value that follows
+    * `length`: the length of the serialized value in bytes
+    * `value`: the serialized value
+
+* `IDENTIFIERS`: The set of identifiers in this binary. Identifiers are
+vectors of chars. Their format is the length of the vector in ULEB128 form
+followed by the chars. An identifier can only have characters in the ASCII set
+and specifically: must start with a letter or '\_', followed by a letter, '\_'
+or digit
+
+* `ADDRESS_IDENTIFIERS`: The set of addresses used in ModuleHandles.
+Addresses are fixed size so they are stored contiguously in this table.
+
+* `STRUCT_DEFINITIONS`: The structs or user types defined in the binary. A
+struct definition contains the following fields:
+
+    * `struct_handle`: ULEB128 index in the `STRUCT_HANDLES` table for the
+    handle of this definition
+    * `field_information`: Field Information provides information about the
+    fields of the struct or whether the struct is native
+
+        * `tag`: 1 byte, either `0x1` if the struct is native, or `0x2` if the struct
+        contains fields, in which case it is followed by:
+        * `field count`: ULEB128 number of fields for this struct
+        * `fields`: a field count of
+
+            * `name`: ULEB128 index in the `IDENTIFIERS` table containing the
+            name of the field
+            * `field type`: [SignatureToken](#SignatureTokens) - the type of
+            the field
+
+* `STRUCT_DEF_INSTANTIATIONS`: the set of instantiation for any given
+generic struct. It contains the following fields:
+
+    * `struct handle`: ULEB128 index into the `STRUCT_HANDLES` table of the
+    generic struct for this instantiation (e.g., `struct X<T>`)
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the
+    instantiation of the struct. The instantiation can be either partial or complete
+    (e.g., `X<U64>` or `X<Z>` when inside another generic function or generic struct
+    with type parameter `Z`)
+
+* `FUNCTION_DEFINITIONS`: the set of functions defined in this binary. A
+function definition contains the following fields:
+
+    * `function_handle`: ULEB128 index in the `FUNCTION_HANDLES` table for
+    the handle of this definition
+    * `visibility`: 1 byte for the function visibility (only used in version 2 and later)
+
+        * `0x0` if the function is private to the Module
+        * `0x1` if the function is public and thus visible outside this module
+        * `0x2` for a `script` function
+        * `0x3` if the function is private but also visible to `friend` modules
+
+    * `flags`: 1 byte:
+
+        * `0x0` if the function is private to the Module (version 1 only)
+        * `0x1` if the function is public and thus visible outside this module (version 1 only)
+        * `0x2` if the function is native, not implemented in Move
+
+    * `acquires_global_resources`: resources accessed by this function
+
+        * `length`: ULEB128 length of the vector, number of resources
+        acquired by this function
+        * `resources`: array of `length` ULEB128 indices into the `STRUCT_DEFS` table,
+        for the resources acquired by this function
+
+    * `code_unit`: if the function is not native, the code unit follows:
+
+        * `locals`: ULEB128 index into the `SIGNATURES` table for the types
+        of the locals of the function
+        * `code`: vector of [Bytecodes](#Bytecodes), the body of this function
+
+            * `length`: the count of bytecodes the follows
+            * `bytecodes`: Bytecodes, they are variable size
+
+* `FIELD_HANDLES`: the set of fields accessed in code. A field handle is
+composed by the following fields:
+
+    * `owner`: ULEB128 index into the `STRUCT_DEFS` table of the type that owns the field
+    * `index`: ULEB128 position of the field in the vector of fields of the `owner`
+
+* `FIELD_INSTANTIATIONS`: the set of generic fields accessed in code. A
+field instantiation is a pair of indices:
+
+    * `field_handle`: ULEB128 index into the `FIELD_HANDLES` table for the generic field
+    * `instantiation`: ULEB128 index into the `SIGNATURES` table for the instantiation of
+    the type that owns the field
+
+* `FRIEND_DECLS`: the set of declared friend modules with the following for each one:
+
+    * `address`: ULEB128 index into the `ADDRESS_IDENTIFIERS` table of
+    the account under which the module is published
+    * `name`: ULEB128 index into the `IDENTIFIERS` table of the name of the module
+
+### Kinds
+
+A `Type Parameter Kind` is 1 byte, and it is one of:
+
+* `0x1`: `ALL` - the type parameter can be substituted by either a resource, or a copyable type
+* `0x2`: `COPYABLE` - the type parameter must be substituted by a copyable type
+* `0x3`: `RESOURCE` - the type parameter must be substituted by a resource type
+
+### SignatureTokens
+
+A `SignatureToken` is 1 byte, and it is one of:
+
+* `0x1`: `BOOL` - a boolean
+* `0x2`: `U8` - a U8 (byte)
+* `0x3`: `U64` - a 64-bit unsigned integer
+* `0x4`: `U128` - a 128-bit unsigned integer
+* `0x5`: `ADDRESS` - an `AccountAddress` in the chain, may be a 16, 20, or 32 byte value
+* `0x6`: `REFERENCE` - a reference; must be followed by another SignatureToken
+representing the type referenced
+* `0x7`: `MUTABLE_REFERENCE` - a mutable reference; must be followed by another
+SignatureToken representing the type referenced
+* `0x8`: `STRUCT` - a structure; must be followed by the index into the
+`STRUCT_HANDLES` table describing the type. That index is in ULEB128 form
+* `0x9`: `TYPE_PARAMETER` - a type parameter of a generic struct or a generic
+function; must be followed by the index into the type parameters vector of its container.
+The index is in ULEB128 form
+* `0xA`: `VECTOR` - a vector - must be followed by another SignatureToken
+representing the type of the vector
+* `0xB`: `STRUCT_INST` - a struct instantiation; must be followed by an index
+into the `STRUCT_HANDLES` table for the generic type of the instantiation, and a
+vector describing the substitution types, that is, a vector of SignatureTokens
+* `0xC`: `SIGNER` - a signer type, which is a special type for the VM
+representing the "entity" that signed the transaction. Signer is a resource type
+* `0xD`: `U16` - a 16-bit unsigned integer
+* `0xE`: `U32` - a 32-bit unsigned integer
+* `0xF`: `U256` - a 256-bit unsigned integer
+
+Signature tokens examples:
+
+* `u8, u128` -> `0x2 0x2 0x4` - size(`0x2`), U8(`0x2`), u128(`0x4`)
+* `u8, u128, A` where A is a struct -> `0x3 0x2 0x4 0x8 0x10` - size(`0x3`),
+U8(`0x2`), u128(`0x4`), Struct::A
+(`0x8 0x10` assuming the struct is in the `STRUCT_HANDLES` table at position `0x10`)
+* `vector<address>, &A` where A is a struct -> `0x2 0xA 0x5 0x8 0x10` - size(`0x2`),
+vector<address>(`0xA 0x5`), &Struct::A
+(`0x6 0x8 0x10` assuming the struct is in the `STRUCT_HANDLES` table at position `0x10`)
+* `vector<A>, &A<B>` where A and B are a struct ->
+`0x2 0xA 0x8 0x10 0x6 0xB 0x10 0x1 0x8 0x11` -
+size(`0x2`), vector\<A\>(`0xA 0x8 0x10`),
+&Struct::A\<Struct::B\> (`0x6` &, `0xB 0x10` A<\_>, `0x1 0x8 0x11` B type
+instantiation; assuming the struct are in the `STRUCT_HANDLES` table at position
+`0x10` and `0x11` respectively)
+
+### Bytecodes
+
+Bytecodes are variable size instructions for the Move VM. Bytecodes are
+composed by opcodes (1 byte) followed by a possible payload which depends on
+the specific opcode and specified in "()" below:
+
+* `0x01`: `POP`
+* `0x02`: `RET`
+* `0x03`: `BR_TRUE(offset)` - offset is in ULEB128 form, and it is the target
+offset in the code stream from the beginning of the code stream
+* `0x04`: `BR_FALSE(offset)` - offset is in ULEB128 form, and it is the
+target offset in the code stream from the beginning of the code stream
+* `0x05`: `BRANCH(offset)` - offset is in ULEB128 form, and it is the target
+offset in the code stream from the beginning of the code stream
+* `0x06`: `LD_U64(value)` - value is a U64 in little-endian form
+* `0x07`: `LD_CONST(index)` - index is in ULEB128 form, and it is an index
+in the `CONSTANT_POOL` table
+* `0x08`: `LD_TRUE`
+* `0x09`: `LD_FALSE`
+* `0x0A`: `COPY_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0B`: `MOVE_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0C`: `ST_LOC(index)` - index is in ULEB128 form, and it is an index
+referring to either an argument or a local of the function. From a bytecode
+perspective arguments and locals lengths are added and the index must be in that
+range. If index is less than the length of arguments it refers to one of the
+arguments otherwise it refers to one of the locals
+* `0x0D`: `MUT_BORROW_LOC(index)` - index is in ULEB128 form, and it is an
+index referring to either an argument or a local of the function. From a
+bytecode perspective arguments and locals lengths are added and the index must
+be in that range. If index is less than the length of arguments it refers to one
+of the arguments otherwise it refers to one of the locals
+* `0x0E`: `IMM_BORROW_LOC(index)` - index is in ULEB128 form, and it is an
+index referring to either an argument or a local of the function. From a
+bytecode perspective arguments and locals lengths are added and the index must
+be in that range. If index is less than the length of arguments it refers to one
+of the arguments otherwise it refers to one of the locals
+* `0x0F`: `MUT_BORROW_FIELD(index)` - index is in ULEB128 form, and it is an
+index in the `FIELD_HANDLES` table
+* `0x10`: `IMM_BORROW_FIELD(index)` - index is in ULEB128 form, and it is an
+index in the `FIELD_HANDLES` table
+* `0x11`: `CALL(index)` - index is in ULEB128 form, and it is an index in the
+`FUNCTION_HANDLES` table
+* `0x12`: `PACK(index)` - index is in ULEB128 form, and it is an index in the
+`STRUCT_DEFINITIONS` table
+* `0x13`: `UNPACK(index)` - index is in ULEB128 form, and it is an index in
+the `STRUCT_DEFINITIONS` table
+* `0x14`: `READ_REF`
+* `0x15`: `WRITE_REF`
+* `0x16`: `ADD`
+* `0x17`: `SUB`
+* `0x18`: `MUL`
+* `0x19`: `MOD`
+* `0x1A`: `DIV`
+* `0x1B`: `BIT_OR`
+* `0x1C`: `BIT_AND`
+* `0x1D`: `XOR`
+* `0x1E`: `OR`
+* `0x1F`: `AND`
+* `0x20`: `NOT`
+* `0x21`: `EQ`
+* `0x22`: `NEQ`
+* `0x23`: `LT`
+* `0x24`: `GT`
+* `0x25`: `LE`
+* `0x26`: `GE`
+* `0x27`: `ABORT`
+* `0x28`: `NOP`
+* `0x29`: `EXISTS(index)` - index is in ULEB128 form, and it is an index in
+the `STRUCT_DEFINITIONS` table
+* `0x2A`: `MUT_BORROW_GLOBAL(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEFINITIONS` table
+* `0x2B`: `IMM_BORROW_GLOBAL(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEFINITIONS` table
+* `0x2C`: `MOVE_FROM(index)` - index is in ULEB128 form, and it is an index
+in the `STRUCT_DEFINITIONS` table
+* `0x2D`: `MOVE_TO(index)` - index is in ULEB128 form, and it is an index
+in the `STRUCT_DEFINITIONS` table
+* `0x2E`: `FREEZE_REF`
+* `0x2F`: `SHL`
+* `0x30`: `SHR`
+* `0x31`: `LD_U8(value)` - value is a U8
+* `0x32`: `LD_U128(value)` - value is a U128 in little-endian form
+* `0x33`: `CAST_U8`
+* `0x34`: `CAST_U64`
+* `0x35`: `CAST_U128`
+* `0x36`: `MUT_BORROW_FIELD_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `FIELD_INSTANTIATIONS` table
+* `0x37`: `IMM_BORROW_FIELD_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `FIELD_INSTANTIATIONS` table
+* `0x38`: `CALL_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `FUNCTION_INSTANTIATIONS` table
+* `0x39`: `PACK_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3A`: `UNPACK_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3B`: `EXISTS_GENERIC(index)` - index is in ULEB128 form, and it is an
+index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3C`: `MUT_BORROW_GLOBAL_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3D`: `IMM_BORROW_GLOBAL_GENERIC(index)` - index is in ULEB128 form,
+and it is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3E`: `MOVE_FROM_GENERIC(index)` - index is in ULEB128 form, and it
+is an index in the `STRUCT_DEF_INSTANTIATIONS` table
+* `0x3F`: `MOVE_TO_GENERIC(index)` - index is in ULEB128 form, and it is
+an index in the `STRUCT_DEF_INSTANTIATIONS` table
+
+### Module Specific Data
+
+A binary for a Module contains an index in ULEB128 form as its last
+entry. That is after all tables. That index points to the ModuleHandle table
+and it is the self module. It is where the module is stored, and a
+specification of which one of the Modules in the `MODULE_HANDLES` tables is the
+self one.
+
+### Script Specific Data
+
+A Script does not have a `FUNCTION_DEFINITIONS` table, and the entry point is
+explicitly described in the following entries, at the end of a Script
+Binary, in the order below:
+
+* `type parameters`: if the script entry point is generic, the number and
+kind of the type parameters is in this vector.
+
+    * `length`: ULEB128 length of the vector, effectively the number of
+    type parameters for the generic entry point. 0 if the script is not generic
+    * `kinds`: array of `length` U8 [kind](#Kinds) values, not present
+    if length is 0
+
+* `parameters`: ULEB128 index into the `SIGNATURES` table for the argument
+types of the entry point
+
+* `code`: vector of [Bytecodes](#Bytecodes), the body of this function
+    * `length`: the count of bytecodes
+    * `bytecodes`: Bytecodes contiguously serialized, they are variable size
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/Cargo.toml b/vendors/move/move-execution/v0/move-bytecode-verifier/Cargo.toml
new file mode 100644
index 000000000..ac5241438
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-bytecode-verifier-v0"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move bytecode verifier"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+petgraph.workspace = true
+
+move-borrow-graph.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-abstract-stack.workspace = true
+
+[dev-dependencies]
+hex-literal.workspace = true
+invalid-mutations.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/README.md b/vendors/move/move-execution/v0/move-bytecode-verifier/README.md
new file mode 100644
index 000000000..f6e3fdeae
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/README.md
@@ -0,0 +1,82 @@
+---
+id: bytecode-verifier
+title: Bytecode Verifier
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-bytecode-verifier/README.md
+---
+
+
+## Overview
+
+The bytecode verifier contains a static analysis tool for rejecting invalid Move bytecode. It checks the safety of stack usage, types, resources, and references.
+
+The body of each function in a compiled module is verified separately while trusting the correctness of function signatures in the module. Checking that each function signature matches its definition is a separate responsibility. The body of a function is a sequence of bytecode instructions. This instruction sequence is checked in several phases described below.
+
+## CFG Construction
+
+A control-flow graph is constructed by decomposing the instruction sequence into a collection of basic blocks. Each basic block contains a contiguous sequence of instructions; the set of all instructions is partitioned among the blocks. Each block ends with a branch or return instruction. The decomposition into blocks guarantees that branch targets land only at the beginning of some block. The decomposition also attempts to ensure that the generated blocks are maximal. However, the soundness of the analysis does not depend on maximality.
+
+## Stack Safety
+
+The execution of a block happens in the context of a stack and an array of local variables. The parameters of the function are a prefix of the array of local variables. Arguments and return values are passed across function calls via the stack. When a function starts executing, its arguments are already loaded into its parameters. Suppose the stack height is *n* when a function starts executing; then valid bytecode must enforce the invariant that when execution lands at the beginning of a basic block, the stack height is *n*. Furthermore, at a return instruction, the stack height must be *n*+*k* where *k*, s.t. *k*>=0 is the number of return values. The first phase of the analysis checks that this invariant is maintained by analyzing each block separately, calculating the effect of each instruction in the block on the stack height, checking that the height does not go below *n*, and that is left either at *n* or *n*+*k* (depending on the final instruction of the block and the return type of the function) at the end of the block.
+
+## Type Safety
+
+The second phase of the analysis checks that each operation, primitive or defined function, is invoked with arguments of appropriate types. The operands of an operation are values located either in a local variable or on the stack. The types of local variables of a function are already provided in the bytecode. However, the types of stack values are inferred. This inference and the type checking of each operation can be done separately for each block. Since the stack height at the beginning of each block is *n* and does not go below *n* during the execution of the block, we only need to model the suffix of the stack starting at *n* for type checking the block instructions. We model this suffix using a stack of types on which types are pushed and popped as the instruction stream in a block is processed. Only the type stack and the statically-known types of local variables are needed to type check each instruction.
+
+## Resource Safety
+
+Resources represent the assets of the blockchain. As such, there are certain restrictions on these types that do not apply to normal values. Intuitively, resource values cannot be copied and must be used by the end of the transaction (this means that they are moved to global storage or destroyed). Concretely, the following restrictions apply:
+
+* `CopyLoc` and `StLoc` require that the type of local is not of resource kind.
+* `WriteRef`, `Eq`, and `Neq` require that the type of the reference is not of resource kind.
+* At the end of a function (when `Ret` is reached), no local whose type is of resource kind must be empty, i.e., the value must have been moved out of the local.
+
+As mentioned above, this last rule around `Ret` implies that the resource *must* have been either:
+
+* Moved to global storage via `MoveTo`.
+* Destroyed via `Unpack`.
+
+Both `MoveTo` and `Unpack` are internal to the module in which the resource is declared.
+
+## Reference Safety
+
+References are first-class in the bytecode language. Fresh references become available to a function in several ways:
+
+* Inputing parameters.
+* Taking the address of the value in a local variable.
+* Taking the address of the globally published value in an address.
+* Taking the address of a field from a reference to the containing struct.
+* Returning value from a function.
+
+The goal of reference safety checking is to ensure that there are no dangling references. Here are some examples of dangling references:
+
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then moved.
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then bound to a new value.
+* Reference is taken to a local variable that has not been initialized.
+* Reference to a value in a local variable is returned from a function.
+* Reference `r` is taken to a globally published value `v`; `v` is then unpublished.
+
+References can be either exclusive or shared; the latter allow read-only access. A secondary goal of reference safety checking is to ensure that in the execution context of the bytecode program, including the entire evaluation stack and all function frames, if there are two distinct storage locations containing references `r1` and `r2` such that `r2` extends `r1`, then both of the following conditions hold:
+
+* If `r1` is tagged as exclusive, then it must be inactive, i.e. it is impossible to reach a control location where `r1` is dereferenced or mutated.
+* If `r1` is shared, then `r2` is shared.
+
+The two conditions above establish the property of referential transparency, important for scalable program verification, which looks roughly as follows: consider the piece of code `v1 = *r; S; v2 = *r`, where `S` is an arbitrary computation that does not perform any write through the syntactic reference `r` (and no writes to any `r'` that extends `r`). Then `v1 == v2`.
+
+### Analysis Setup
+
+The reference safety analysis is set up as a flow analysis (or abstract interpretation). An abstract state is defined for abstractly executing the code of a basic block. A map is maintained from basic blocks to abstract states. Given an abstract state *S* at the beginning of a basic block *B*, the abstract execution of *B* results in state *S'*. This state *S'* is propagated to all successors of *B* and recorded in the map. If a state already existed for a block, the freshly propagated state is “joined” with the existing state. If the join fails an error is reported. If the join succeeds but the abstract state remains unchanged, no further propagation is done. Otherwise, the state is updated and propagated again through the block. An error may also be reported when an instruction is processed during the propagation of abstract state through a block.
+
+**Errors.** As mentioned earlier, an error is reported by the checker in one of the following situations:
+
+* An instruction cannot be proven to be safe during the propagation of the abstract state through a block.
+* Join of abstract states propagated via different incoming edges into a block fails.
+
+## How is this module organized?
+
+```text
+*
+├── invalid-mutations  # Library used by proptests
+├── src                # Core bytecode verifier files
+├── tests              # Proptests
+```
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
new file mode 100644
index 000000000..b347f179f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "bytecode-verifier-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem bytecode verifier tests"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+petgraph.workspace = true
+proptest.workspace = true
+fail = { workspace = true, features = ['failpoints']}
+hex.workspace = true
+
+invalid-mutations.workspace = true
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier.workspace = true
+move-core-types.workspace = true
+move-vm-config.workspace = true
+
+[features]
+fuzzing = ["move-binary-format/fuzzing"]
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md
new file mode 100644
index 000000000..2f1865f6e
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md
@@ -0,0 +1,5 @@
+This testsuite can be run in a specific way to print the time until a 'complex' program is detected or accepted. Call as in:
+
+```
+cargo test --release -- --nocapture 1>/dev/null
+```
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/lib.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/lib.rs
new file mode 100644
index 000000000..211d2cd3a
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/lib.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+#[cfg(test)]
+pub mod support;
+
+#[cfg(test)]
+pub mod unit_tests;
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/support/mod.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/support/mod.rs
new file mode 100644
index 000000000..5b55cfc59
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/support/mod.rs
@@ -0,0 +1,36 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, IdentifierIndex,
+        ModuleHandleIndex, SignatureIndex,
+    },
+    CompiledModule,
+};
+
+/// Create a dummy module to wrap the bytecode program in local@code
+pub fn dummy_procedure_module(code: Vec<Bytecode>) -> CompiledModule {
+    let mut module = empty_module();
+    let code_unit = CodeUnit {
+        code,
+        ..Default::default()
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        ..Default::default()
+    };
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+    module.function_defs.push(fun_def);
+    module
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs
new file mode 100644
index 000000000..08bbdca20
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/ability_field_requirements_tests.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::ability_field_requirements;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_ability_transitivity(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(ability_field_requirements::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
new file mode 100644
index 000000000..2c506070c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
@@ -0,0 +1,77 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Tests in here are based on binary representation of modules taken from production. Those tests
+//! may fail over time if the representation becomes out of date, then they can be removed.
+//! Right now the serve to calibrate the metering working as expected. Those tests represent
+//! cases which we want to continue to succeed.
+
+use crate::unit_tests::production_config;
+use move_binary_format::{errors::VMResult, CompiledModule};
+use move_bytecode_verifier::{meter::BoundMeter, verifier};
+
+#[allow(unused)]
+fn run_binary_test(name: &str, bytes: &str) -> VMResult<()> {
+    let bytes = hex::decode(bytes).expect("invalid hex string");
+    let m = CompiledModule::deserialize_with_defaults(&bytes).expect("invalid module");
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    verifier::verify_module_with_config_for_test(name, &config, &m, &mut meter)
+}
+
+#[test]
+fn sample_price_oracle() {
+    let code =
+    "a11ceb0b050000000c01001602162003368a0104c0011405d401a80607fc07f90308f50b6006d50c9b3210f03e770ae73f170cfe3f951e0d935e060000010101020103010401050006020702080209020a000b0800000c0800080d070004170402030100010318070009190700071c0700000e000100000f0201010000100201010000110302000012030200001304020000140506000015050600080f080900071d0a0100081e080900071f0a0b0007200a010006210c01000122020f01000123020c01000424110b020300042511120203000a261314000527020f0100022803180004290219020304092a1a1b00032b1a0f00042c1c02020302020e0e0e0f0e10101110130e1016111615101810020608020201030001060c02060c0304030103010203010908060303080603010301030106080201080601060806010101020502060800080508040802010900010804020804080502060b0302090009010900010609010208050301080202080406080102080403ae010a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a02080508000708000a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050105010b030209000901010a0201080503070b0302090009010900090193010508000708000a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a02080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805010708000b03030101010301030103010b01030101010301030103010c70726963655f6f7261636c6504636f696e067369676e657206737472696e67057461626c6509747970655f696e666f046d617468036936340570726963651070726963655f6964656e74696669657204707974681250726963654964656e7469666965724d61700e54657374507269636553746f72650550726963650c666f726d61745f7072696365096765745f7072696365126765745f70726963655f666f725f746573740a696e697469616c697a6512696e697469616c697a655f746573746e6574127365745f7468726573686f6c645f73656373107369676e65645f7536345f6d696e75730f7369676e65645f7536345f706c757304696e666f055461626c6506537472696e670f50726963654964656e7469666965720e7468726573686f6c645f736563730b70726963655f7461626c6503493634196765745f6d61676e69747564655f69665f706f736974697665086765745f6578706f0f6765745f69735f6e65676174697665196765745f6d61676e69747564655f69665f6e6567617469766506706f775f31300673796d626f6c08646563696d616c7308636f6e7461696e7306626f72726f77176765745f70726963655f6e6f5f6f6c6465725f7468616e09747970655f6e616d650a616464726573735f6f66036e65770d66726f6d5f627974655f76656304757466380675707365727414812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed00000000000000000000000000000000000000000000000000000000000000017e783b349d3e89cf5931af376ebeadbfab855b3fa239b7ada8f5a92fbea6b3870308700000000000000003086d0000000000000003086e0000000000000003081000000000000000052014812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed0a0221202b9ab1e972a281585084148ba1389800799bd4be63b957507db1349314e474450a020504414156450a022120bd640cddb72063e2ede34c6a0baf6699759b9837fcb06aa0e2fbcecb9b65fde70a02040341434d0a0221202a01deaec9e51a579277b34b122399984d0bbf57e2458a7e42fecd2829867a0d0a0204034144410a022120fa17ceaf30d19ba51112fdcc750cc83454776f47fb0112e4af07f15f4bb1ebc00a020504414c474f0a0221206d0af467543fc7daedf7abed96423877560c8d03725f3e5c87516774982a679c0a020403414e430a02212015add95022ae13563a11992e727c91bdb6b55bc183d9d747436c80a483d8c8640a0204034150450a02212003ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d50a0204034150540a022120b881c6dad5dd3dc9a83222f8032fb439859288119afc742d43adc305cef151cc0a0204034153520a022120681e0eb7acf9a2a3384927684d932560fb6f67c6beb21baa0f110e993b2653860a02060541544c41530a0221208ff1200345393bb25be4f4eeb2d97234e91f7e6213f3745a694b1436e700f2710a02040341544d0a022120b00b60f88b03a6a625a8d1c048c3f66653edf217439983d037e7222c4e6128190a02050441544f4d0a0221204cbd623d7aa47003fff1cd75c3f96cb24a660014b697d91cfb7adcd204b952020a020504415553540a02212093da3352f9f1d105fdfe4971cfa80e9dd777bfc5d0f683ebb6e1294b92137bb70a020504415641580a022120b7e3904c08ddd9c0c10c6d207d390fd19e87eb6aab96304f571ed94caebdefa00a0204034158530a0221209d23a47f843f5c9284832ae6e76e4aa067dc6072a58f151d39a65a4cc792ef9f0a0204034241520a0221203dd2b63686a450ec7290df3a1e0b583c0481f651351edfa7636f39aed55cf8a30a0204034243480a0221207f981f906d7cfe93f618804f1de89e0199ead306edc022d3230b3e8305f391b00a020504424554480a0221202f95862b045670cd22bee3114c39763a4a08beeb663b145d283c31d7d1101c4f0a020403424e420a0221201ce9069708fb49e2f1b062fa4f1be0bb151475ca506939d6d8c14386d49f43dc0a02040342525a0a022120e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b430a0204034254430a022120097d687437374051c75160d648800f021086bc8edf469f11284491fda81923150a0204034254540a0221205bc91f13e412c07599167bae86f07543f076a638962b8d6017ec19dab4a828140a020504425553440a0221202dd14c7c38aa7066c7a508aac299ebcde5165b07d5d9f2d94dfbfe41f0bc5f2e0a0204034339380a0221202356af9529a1064d41e32d617e2ce1dca5733afa901daba9e2b68dee5d53ecf90a02050443414b450a02212015ecddd26d49e1a8f1de9376ebebc03916ede873447c1255d2d5891b92ce57170a02060543424554480a022120bd4dbcbfd90e6bc6c583e07ffcb5cb6d09a0c7b1221805211ace08c8378596270a0204034348520a022120e799f456b358a2534aa1b45141d454ac04b444ed23b1440b778549bb758f2b5c0a02040343485a0a0221209c479b12a2b2c1051715d4d462dd7a6abbb6dccabf3af31a53f6130a1cd88efc0a020504434954590a0221208517b35589b5f1f6ad626da2379ff592d5101b63aa661d75b7a883fdbda023f00a020504434f50450a0221204e53c6ef1f2f9952facdcf64551edb6d2a550985484ccce6a0477cae4c1bca3e0a020403434f570a0221208f218655050a1476b780185e89f19d2b1e1f49e9bd629efad6ac547a946bf6ab0a020504435553440a022120b0948a5e5313200c632b51bb5ca32f6de0d36e9950a942d19751e833f70dabfd0a0204034441490a022120dcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c0a020504444f47450a022120ca3eed9b267293f6595901c734c7525ce8ef49adafe8284606ceb307afa2ca5b0a020403444f540a022120ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace0a0204034554480a022120c80657b7f6f3eac27218d09d5a4e54e47b25768d9f5e10ac15fe2cf9008814000a020504464944410a0221202fb245b9a84554a0f15aa123cbb5f64cd263b59e9a87d80148cbffab50c69f300a020504464c4f570a0221205c6c0d2386e3352356c3ab84434fafb5ea067ac2678a38a338c4a69ddc4bdb0c0a02040346544d0a0221206c75e52531ec5fd3ef253f6062956a8508a2f03fa0a209fb7fbc51efd9d35f880a0204034654540a022120301377b122716cee1a498e7930a1836c0b1db84667cc78bbbcbad6c330ea6afb0a02040347414c0a0221200781209c28fda797616212b7f94d77af3a01f3e94a5d421760aef020cf2bcb510a02050447414c410a022120baa284eaf23edf975b371ba2818772f93dbae72836bbdea28b07d40f3cf8b4850a020403474d540a0221206034b1f68b9363dff2cf9d53b1a88fb4d0929c65f34d532db53738853efc00ad0a020504474f46580a02212095609d32c98a467a72ac419f2e64bb2b8dbd5b00b74f3a0fd72f42343af1743d0a0205044858524f0a0221207a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff5920a020403494e4a0a022120a4702f0f5818258783a1e47f453cb20b0fbec32ca67260e1d19dfcdd6a4d0ebb0a020605494e5445520a02212081a21b01c15b8d01f6cdfed65e00987cc4c901858c821b2089344987de3102e90a0204034a45540a022120ee42016c303126bd9263724e00f83a8114e84518c6e8ffc9738c001cc301daff0a0204034a53540a022120abe4f2b264560a397f38eec024369356e5c1ea4f7aab94729369f144b3d977790a0204034a55560a022120d1d95644ffc11ca502f21e067a7814144c56b37018515ced4335a886a827a3050a0206054c415a494f0a0221206e3f3fa8253588df9326580180233eb791e03b443a3ba7a1d892e73874e19a540a0204034c54430a022120e6ccd3f878cf338e6732bf59f60943e8ca2c28402fc4d9c258503b2edbe74a310a0205044c554e410a0221204456d442a152fd1f972b18459263ef467d3c29fb9d667e30c463b086691fbc790a0205044c554e430a0221205de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac520a0206054d415449430a0221201888f463c27997174f97d2a36af29bf4648b61a5f69e67c45505a80f826bb7850a0205044d424f580a02212027d108eb764c912f49d3453a21dd95516619b1c45d0b607ee58a137ac8a6f32d0a0205044d45414e0a022120dfaeafde7f8ad3cb9ddbcc85ed7ae7e53910e7ab377fd75921920f97c80a8edc0a0204034d45520a0221200b46c1c04e9c914037cc4e0561a7e6787f6db0b89b7b65281f0f6fea1ce45a740a0204034d49520a0221205b70af49d639eefe11f20df47a0c0760123291bb5bc55053faf797d1ff9059830a0205044d4e474f0a022120c2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a40a0205044d534f4c0a022120c415de8d2eba7db216527dff4b60e8f3a5311c740dadb233e13e12547e2267500a0205044e4541520a02212005934526b94a9fbe4c4ce0c3792213032f086ee4bf58f2168a7085361af9bdc10a0203024f470a022120c572690504b42b57a3f7aed6bd4aae08cbeeebdadcf130646a692fe73ec1e0090a0204034f4e450a02212037505261e557e251290b8c8899453064e8d760ed5c65a779726f2490980da74c0a0205044f5243410a0221200afa3199e0899270a74ddcf5cc960d3c6c4414b4ca71024af1a62786dd24f52a0a020504504f52540a02212088e2d5cbd2474766abffb2a67a58755a2cc19beb3b309e1ded1e357253aa36230a020605504f52544f0a0221203d253019d38099c0fe918291bd08c9b887f4306a44d7d472c8031529141f275a0a0204035053470a022120fd0690232b0fae5efdc402c1b9aac74176383ff7daf87d021554bda24a38e0ec0a020504524143410a02212091568baa8beb53db23eb3fb7f22c6e8bd303d103919e19733f2bb642d3e7987a0a0204035241590a0221206ed3c7c4427ae2f91707495fc5a891b30795d93dbb3931782ddd77a5d8cb6db70a0204035342520a0221201021a42d623ab4fe0bf8c47fd21cc10636e39e07f91e9b2478551e137d512aaa0a02070653434e534f4c0a022120f8d030e4ef460b91ad23eabbbb27aec463e3c30ecc8d5c4b71e92f54a36ccdbd0a020504534c4e440a0221209fb0bd29fe51481b61df41e650346cc374b13c2bab2e3610364cd834a592025a0a020403534e590a022120ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d0a020403534f4c0a02212023245bb74254e65a98cc3ff4a37443d79f527e44e449750ad304538b006f21bc0a02040353524d0a022120a1a6465f4c2ebf244c31d80bc95c27345a3424e428c2def33eced9e90d3f701b0a0206055354534f4c0a0221204457960559b812558bb0f8cb7912f8bcb843eb801a3133ef45be998630ff8c050a020403544c4d0a022120433faaa801ecdb6618e3897177a118b273a8e18cc3ff545aadfc207d58d028f70a020504545553440a022120eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a0a020504555344430a0221202b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b0a020504555344540a022120ef94acc2fb09eb976c6eb3000bab898cab891d5b800702cd1dc88e61d7c3c5e60a020504555354430a0221207507a4629ad0143550666bce2e7cae0b961a0f624f821feaab642fe1be632f5c0a0204035641490a022120b216f7ca372b318985903866e0b6dc44a14564828c49f36d0d363805aa76335c0a02040357494e0a022120b82449fd728133488d2d41131cffe763f9c1693b73c544d9ef6aaa371060dd250a020403574f4f0a022120831624f51c7bd4499fe5e0f16dfa2fd22584ae4bdc496bbbbe9ba831b2d9bce90a0204035856530a02212026852e2d0696e25e6adaad2d7ca3a1f2f15aab68d317ace14d41b4128a7e780f0a0204035a42430a022120d6b3bc030a8bbb7dd9de46fb564c34bb7f860dead8985eb16a49cdc62f8ab3a50a02212073dc009953c83c944690037ea477df627657f45c14f16ad3a61089c5a3f9f4f20a02212008f781a893bc9340140c5f89c8a96f438bcfae4d1474cc0f688e3a52892c73180a0221204204a764d9e0ca8db0fd43b62728265bf82671ce8a8b4bfedba13672be12de620a022120cb1743d0e3e3eace7e84b8230dc082829813e3ab04e91b503c08e9a441c0ea8b0a02212044a93dddd8effa54ea51076c4e851b6cbbfd938e82eb90197de38fe8876bb66e0a022120c11efd88a9b2c96bc84bccd6ce4aa05bebad7aa760dbe5f2f00ef90c4abd50cc0a02212061226d39beea19d334f17c2febce27e12646d84675924ebb02b9cdaea68727e30a022120d7566a3ba7f7286ed54f4ae7e983f4420ae0b1e0f3892e11f9c4ab107bbad7b90a02212030029479598797290e3638a1712c29bde2367d0eca794f778b25b5a472f192de0a022120fc309467defa4b198c6b5bd59c08db4b9dfb27ddbcc32f31560f217b4ff8fc2b0a022120ecf553770d9b10965f8fb64771e93f5690a182edc32be4a3236e0caaa6e0581a0a022120457064c555edae5b6b89267e992be4c58be5375f0e9ca9749391c7094f7d90330a022120f9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b0a022120eb3b5720301b36fa074260e6e27e2cfff3a7c6bbb47564eb218a9a7f2a8c01930a02212006c532524fabd49cc142815502d785e4f34ec3bd035480efb770568d423f46c60a022120c098773aa18ebb7e84d5ee7ea7d97105ab2015a329f670012398cd2c8f5cc6ca0a0221200d10b9ccdc9af1d65cd4bafabf4e34db01c0ce83abba190230eaf26d7592cd210a022120970541e943e11d1bf1d4d763bc8e70995f613dc682f727045a866312312a63760a02212013ac8c71e4e1c61dece57bea76163d393bf75cd0db8e52981e1564fa592698cb0a022120b59d65c2e10af17c0d6f7d10be8d64c0c13dd15d957c4c39763b4cc55e5919370a02212087a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de4120a02212031775e1d6897129e8a84eeba975778fb50015b88039e9bc140bbd839694ac0ae0a02212036032e522b810babd8e3148e9f0d588af9e95e93b97ffb58566b837fdbd31f7f0a022120ca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a60a0221206660d7629213995af8aa169ad6a1cf1a725765d3741b7e7a27825f884a701b960a022120aa67a6594d0e1578faa3bba80bec5b31e461b945e4fbab59eeab38ece09335fb0a0221209b7bfd7654cbb80099d5edc0a29159afc9e9b4636c811cf8c3b95bd11dd8e3dd0a0221200184a60a47ab7c23fcb828d727b05748ef52433fb5ae96f775cc98c9049d8c2c0a0221206354d685c247f1efc36f967617beffa2ebd5a95d8ffe17de4498505c923067b80a02212021adabf73ad61903c1872fa220f84d3b1b9990cec2047f8317e2a67efcd1764e0a022120c999fe8a75bf9528931deb832e2934dd1ac138757d7f2c1398675b6f521d556f0a02212087fd5a8d0bf026239f98b53311d2cec2ee171e853f545e1ad742e092a97ef8600a02212051ae9b785e6aeb288955720faef15f63ee3ae21af38114ade8b3fc3d3831b5ad0a0221202d9315a88f3019f8efa88dfe9c0f0843712da0bac814461e27733f6b83eb51b30a0221202245aec1db780b8dc9f710173256996164f0a65f25a975453e4202a54371d2ea0a022120077e345652cb98edba89815a63a0ede724eba12d7a10c8498e0e762d581aca6b0a022120997e0bf451cb36b4aea096e6b5c254d700922211dd933d9d17c467f0d6f343210a022120677dbbf4f68b5cb996a40dfae338b87d5efb2e12a9b2686d1ca16d69b3d7f2040a0221206de025a4cf28124f8ea6cb8085f860096dbc36d9c40002e221fc449337e065b20a022120d2c2c1f2bba8e0964f9589e060c2ee97f5e19057267ac3284caef3bd50bd2cb50a02212070bf2974182b6ebf4eac64977170074315e7a07d7b58a963758060924ee9a1920a0221209f2acb902ee5c3a8e41c643164a498ed3089c99df3477189babd3682801340750a02212052800482aa2666c0d2621f8f0a8c19ee6e5e5039a65524e268315501b3355fbb0a0221202f317bea04ce89adb8acc85a1a68d20d6e89976d5e86306570a0bb3107e4916a0a022120b5366e5ded52c3db5d81635a624a39d81eb8c639427fc79c539e5c91e17c84940a0221207f57ca775216655022daa88e41c380529211cde01a1517735dbcf30e4a02bdaa0a02212027e867f0f4f61076456d1a73b14c7edc1cf5cef4f4d6193a33424288f11bd0f40a0221209b245faf19d2f3306b58821ef60b194d7b67eb5250635059d8eaae4a36337b280a02212085dafbfa99c733fdd33649551666958ca8f82fd0d849746e093b770caab249d20a0221206b86b78584e182c61729267d73593f48b6a929f3218234769281513cbe5e87ee0a0204035041490a0221201e761bb4e6b1e4d7899b618d389516ddbdfbdb858018b71c45cb6ade57c96f620a0221207730809b4a4656325b7fbc8157fd803c3da170727c541afc4db37773246258b10a022120cb9372930932694b8a74dd5599c0f9e236575f434faf05141d95803a91f044ed0a022120341d9502b1e6bc445036fd76f57bc824c09254a754289878b52a40eb067d2a0b0a022120f9917668f24038a383e51c0b019f5d9645d6785c6bf9a0d48483edf82ba5caec0a022120dd51a67a1b4d0702abf5b5385631b7d3e586993eadacf2e0d900c0a81edcffdd0a022120b5d2cee0b86bb0571db898ae7b9f288c5e272fa486d41a5bf375b52a0249d94c0a022120fe650f0367d4a7ef9815a593ea15d36593f0643aaaf0149bb04be67ab851decd0a02212078ec25615d53d2486db101e829f77615c4408cbbd543088714b9f267da44591a0a022120b718e659619a031b41c6ea9122f146859a82d4a7edc17c55b1e5188e8b4c1d1c0a020504535445500a02212013f7925c9186b8cca50dde4bbf2d4fa9705052cceb6f2fc79df827e2b37d6f3b0a0221200adbf6463e27f60f171bcc498703a4282d1954ec3a85e1f6698b48ecde18c00e0a0221201bd1c59cd425aebf8a931c1b2a902b9a11e7d18dc68021e4a35a5cf24220a6c70a02212041f3625971ca2ed2263e78573fe5ce23e13d2558ed3f2e47ab0f84fb9e7ae7220a0221201fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c15880a022120026d1f1cf9f1c0ee92eb55696d3bd2393075b611c4f468ae5b967175edc4c25c0a022120eca4f9c5ce7cbef8a349fa9f6c12b23ac45b9ad91c4d1808c6a2dda841f95a020a022120834d3f05278b6f5c963670f437a2267c160914707328f888418902106bcd13d70a022120bf517e0f7ccfc307f0b2fa93b99a737641933989af6af769c928725989c21e660a0221206ff709bf1f0fdb46d991ae6839163df1e050d143429d737fc650b6b2143478080a02212064abe8a459058c60d55427f62be3dc4942c0ba93d1eb5cb85117b70b8e4651ad126170746f733a3a6d657461646174615f763063036d000000000000001a4552525f4e4f545f454e4f5547485f5045524d495353494f4e53006e00000000000000134552525f544f4b454e5f4e4f545f464f554e44007000000000000000174552525f414c52454144595f494e495449414c495a454400000202160b0302080408051a030102011b0b03020804030000000007440a0011080c020e0211090c080b00110a0c050600000000000000000c0a090c090b0a0b0907030911070c090c0a0e05110b0c070a07031a051e0e05110c0c0305210e0511090c030b030c060b0a0b090b060b0711070c090c0a0b0a0b090b01340911060c090c0a0b090335053c0b080b0a33110d1a0c0405420b080b0a33110d180c040b04020101000200010d26070429010304050638000238010c0338020c0007042b000c010a0110000a03380303160b01010702270a0110000b033804140c020b020b0110011411120c040e040b001100020200000101151438050c0007042b010c010a0110020a003806030e0b01010702270b0110020b0038071402030104010017a4060a00111407042103090b00010701270a00111429002003120b00010700273808063c0000000000000012000c6b0a000b6b2d000b0011142a000c6c070511160c020a6c0f00070611170b023809070711160c040a6c0f00070811170b043809070911160c060a6c0f00070a11170b063809070b11160c080a6c0f00070c11170b083809070d11160c0a0a6c0f00070e11170b0a3809070f11160c0c0a6c0f00071011170b0c3809071111160c0e0a6c0f00071211170b0e3809071311160c100a6c0f00071411170b103809071511160c120a6c0f00071611170b123809071711160c140a6c0f00071811170b143809071911160c160a6c0f00071a11170b163809071b11160c180a6c0f00071c11170b183809071d11160c1a0a6c0f00071e11170b1a3809071f11160c1c0a6c0f00072011170b1c3809072111160c1e0a6c0f00072211170b1e3809072311160c200a6c0f00072411170b203809072511160c220a6c0f00072611170b223809072711160c240a6c0f00072811170b243809072911160c260a6c0f00072a11170b263809072b11160c280a6c0f00072c11170b283809072d11160c2a0a6c0f00072e11170b2a3809072f11160c2c0a6c0f00073011170b2c3809073111160c2e0a6c0f00073211170b2e3809073311160c300a6c0f00073411170b303809073511160c320a6c0f00073611170b323809073711160c340a6c0f00073811170b343809073911160c360a6c0f00073a11170b363809073b11160c380a6c0f00073c11170b383809073d11160c3a0a6c0f00073e11170b3a3809073f11160c3c0a6c0f00074011170b3c3809074111160c3e0a6c0f00074211170b3e3809074311160c400a6c0f00074411170b403809074511160c420a6c0f00074611170b423809074711160c440a6c0f00074811170b443809074911160c460a6c0f00074a11170b463809074b11160c480a6c0f00074c11170b483809074d11160c4a0a6c0f00074e11170b4a3809074f11160c4c0a6c0f00075011170b4c3809075111160c4e0a6c0f00075211170b4e3809075311160c500a6c0f00075411170b503809075511160c520a6c0f00075611170b523809075711160c540a6c0f00075811170b543809075911160c560a6c0f00075a11170b563809075b11160c580a6c0f00075c11170b583809075d11160c5a0a6c0f00075e11170b5a3809075f11160c5c0a6c0f00076011170b5c3809076111160c5e0a6c0f00076211170b5e3809076311160c600a6c0f00076411170b603809076511160c620a6c0f00076611170b623809076711160c640a6c0f00076811170b643809076911160c660a6c0f00076a11170b663809076b11160c680a6c0f00076c11170b683809076d11160c6a0a6c0f00076e11170b6a3809076f11160c6e0a6c0f00077011170b6e3809077111160c700a6c0f00077211170b703809077311160c720a6c0f00077411170b723809077511160c740a6c0f00077611170b743809077711160c760a6c0f00077811170b763809077911160c780a6c0f00077a11170b783809077b11160c7a0a6c0f00077c11170b7a3809077d11160c7c0a6c0f00077e11170b7c3809077f11160c7e0a6c0f0007800111170b7e380907810111160c80010a6c0f0007820111170b8001380907830111160c82010a6c0f0007840111170b8201380907850111160c84010a6c0f0007860111170b8401380907870111160c86010a6c0f0007880111170b8601380907890111160c88010a6c0f00078a0111170b88013809078b0111160c8a010a6c0f00078c0111170b8a013809078d0111160c8c010a6c0f00078e0111170b8c013809078f0111160c8e010a6c0f0007900111170b8e01380907910111160c90010a6c0f0007920111170b9001380907930111160c92010a6c0f0007940111170b9201380907950111160c94010a6c0f0007960111170b9401380907970111160c96010a6c0f0007980111170b9601380907990111160c98010a6c0f00079a0111170b98013809079b0111160c9a010a6c0f00079c0111170b9a013809079d0111160c9c010a6c0f00079e0111170b9c013809079f0111160c9e010a6c0f0007a00111170b9e01380907a10111160ca0010a6c0f0007a20111170ba001380907a30111160ca2010a6c0f0007a40111170ba201380907a50111160ca4010a6c0f0007a60111170ba401380907a70111160ca6010a6c0f0007a80111170ba601380907a90111160ca8010a6c0f0007aa0111170ba801380907ab0111160caa010a6c0f0007ac0111170baa01380907ad0111160cac010a6c0f0007ae0111170bac01380907af0111160cae010b6c0f0007b00111170bae0138090204010401001da7050a0011140c010a01070421030b0b00010701270a00111429002003140b0001070027380806504600000000000012000c020b000b022d000b012a000c0307b10111160c4c0a030f00070611170b4c380907b20111160c6d0a030f00070a11170b6d380907b30111160c780a030f00070c11170b78380907b40111160c83010a030f00070e11170b8301380907b50111160c8e010a030f00071011170b8e01380907b60111160c520a030f00071211170b52380907b70111160c5d0a030f00071611170b5d380907b80111160c650a030f00071a11170b65380907b90111160c660a030f00071e11170b66380907ba0111160c670a030f00072411170b67380907bb0111160c680a030f00072611170b68380907bc0111160c690a030f00072811170b69380907bd0111160c6a0a030f00072a11170b6a380907be0111160c6b0a030f00072c11170b6b380907bf0111160c6c0a030f00072e11170b6c380907c00111160c6e0a030f00073011170b6e380907c10111160c6f0a030f00073211170b6f380907c20111160c700a030f00073811170b70380907c30111160c710a030f00073e11170b71380907c40111160c720a030f00074011170b72380907c50111160c730a030f00074211170b73380907c60111160c740a030f00074411170b74380907c70111160c750a030f00074611170b75380907c80111160c760a030f00074811170b76380907c90111160c770a030f00074a11170b77380907ca0111160c790a030f00074c11170b79380907cb0111160c7a0a030f00074e11170b7a380907cc0111160c7b0a030f00075011170b7b380907cd0111160c7c0a030f00075211170b7c380907ce0111160c7d0a030f00075411170b7d380907cf0111160c7e0a030f00075611170b7e380907d00111160c7f0a030f00075811170b7f380907d10111160c80010a030f00075a11170b8001380907d20111160c81010a030f00075c11170b8101380907d30111160c82010a030f00075e11170b8201380907d40111160c84010a030f00076211170b8401380907d50111160c85010a030f00076411170b8501380907d60111160c86010a030f00076a11170b8601380907d70111160c87010a030f00076c11170b8701380907d80111160c88010a030f00076e11170b8801380907d90111160c89010a030f00077011170b8901380907da0111160c8a010a030f00077211170b8a01380907db0111160c8b010a030f00077411170b8b01380907dc0111160c8c010a030f00077611170b8c01380907dd0111160c8d010a030f00077811170b8d01380907de0111160c8f010a030f00077a11170b8f01380907df0111160c90010a030f00077c11170b9001380907e00111160c91010a030f00077e11170b9101380907e10111160c92010a030f0007820111170b9201380907e20111160c93010a030f0007840111170b9301380907e30111160c4d0a030f0007e40111170b4d380907e50111160c4e0a030f0007860111170b4e380907e60111160c4f0a030f00078c0111170b4f380907e70111160c500a030f00078e0111170b50380907e80111160c510a030f0007900111170b51380907e90111160c530a030f0007920111170b53380907ea0111160c540a030f0007940111170b54380907eb0111160c550a030f0007960111170b55380907ec0111160c560a030f0007980111170b56380907ed0111160c570a030f00079a0111170b57380907ee0111160c580a030f0007ef0111170b58380907f00111160c590a030f00079c0111170b59380907f10111160c5a0a030f00079e0111170b5a380907f20111160c5b0a030f0007a00111170b5b380907f30111160c5c0a030f0007a20111170b5c380907f40111160c5e0a030f0007a40111170b5e380907f50111160c5f0a030f0007a60111170b5f380907f60111160c600a030f0007a80111170b60380907f70111160c610a030f0007aa0111170b61380907f80111160c620a030f0007ac0111170b62380907f90111160c630a030f0007ae0111170b63380907fa0111160c640b030f0007b00111170b6438090205010401001e120a00111407042103090b00010701270b0011142a000c020b010b020f011502060000001f5d0a010a031f0305051c0a020a0026030a05110b020b0017090c070c0405170b000b0217080c070c040b040b070c060c05055a0a01031f05230a03200c080525090c080b080328052f0b000b0216080c0e0c0d05560b01200b031f0335053c0b000b0216090c0c0c0b05520a000a0226034105480b000b0217090c0a0c09054e0b020b0017080c0a0c090b090b0a0c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060207000000205e0a010a031f03050508080c0705140a0120030c05100a03200c040512090c040b040c070b070317051e0b000b02160b010c060c05055b0b01032105250b03200c080527090c080b08032a05410a000a0224032f05360b000b0217080c0a0c09053c0b020b0017090c0a0c090b090b0a0c0e0c0d05570a020a00240346054d0b020b0017080c0c0c0b05530b000b0217090c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060200000001010000";
+    let res = run_binary_test("sample_price_oracle", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_aptosd_swap() {
+    let code = "a11ceb0b050000000c0100160216300346ee0104b4022205d602960407ec06de0708ca0e40068a0f8b01109510f9010a8e12520ce012e80e0dc821160000010101020103010401050106010700080009000a000b0700000c0700000d0800000e0700000f07000a28040207000400042b0401060102380800083a0000063c070100000010000100001102010000120101000013030100001401010000150101000016020100001701040000180506000019010700001a020100001b020100001c010100001d000100001e020100001f02010000200001000021000100092f01090009300105000a310b0c02070604320e01010607330205000934010f0009350104000936010f000a37110f020704033900010100033b02010100093d0104000a3e1617020704063f180f01000640191a01000a411b1c02070409421d010005431f040005441f0400094501200009460104000947010f0009480901000a490125020704014a022601060a4b1128020704140a150d1a0a1b121c1315141e0a1f052005210a151e290a2a0d2a142a1e2b0a1b1303060c05030001060c02060c0301030105050303030303010a050c03030303030505070b0502050803070b0502050803070802070803070b0601080401020205080303070b050209000901090009010107090101080402070b060109000900010108070b05020508030501070b06010800030107080207080302060b05020900090109000108070108080108002d0b0901050b0901050b0901050c0b0901050b0901050b0901050b0901050b090105030303030303070b06010801070b06010801070b06010801070b0601080103070803070803070803070803070b0502050803070b0502050803070b0502050803070b0502050803070b090105070b090105070b090105070b09010503030b0901050b0901050b0901050b090105070802070802070802070802070802030301060b050209000901010b0901090001060b0901090001070b0901090001090002070b0502090009010900030709010b090109000b09010900020503010801020303010c04010103030a03030303030505070b0502050803070b0502050803070803070b0901050b090105070803070b0502050803070b0901050b0901050a050a0b0502050803060c030c0b060108040c0b060108000c0b060108010c010b050209000901010b060109000c0b0901050c070b0502050803050b090105070b06010801060803070b0502050803070b0901050b090105070802060c030609010b090109000b090109000d6170746f737061645f73776170076163636f756e740a6170746f735f636f696e04636f696e056576656e74066d6174683634066f7074696f6e067369676e65720d6170746f737061645f636f696e06636f6e6669670e6974657261626c655f7461626c65104269644170746f735061644576656e7417446973747269627574654170746f737061644576656e74114c61756e636850616452656769737472790f546f6b656e446973747269627574650e57686974654c6973744576656e740c61646457686974654c6973740c6173736572745f61646d696e136173736572745f6e6f5f656d657267656e63790b6269644170746f735061640d64697374726962757465416c6c0e64697374726962757465417470701064697374726962757465536561736f6e0f67657453776170546f74616c4269640c67657457686974654c6973740d67657457686974654c697374730a696e697469616c697a650f6c61756e6368506164536561736f6e09726566756e64416c6c0b726566756e644170746f730b7265736574536561736f6e0f77686974654c697374536561736f6e0d77697468647261774170746f731077697468647261774170746f73506164036361700362696408696e766573746f72106469737472696275746564546f6b656e06726566756e6409696e766573746f72730d4974657261626c655461626c6508746f74616c426964126269646170746f737061645f6576656e74730b4576656e7448616e646c6519646973747269627574656170746f737061645f6576656e74731077686974656c6973745f6576656e74730b64697374726962757465640c676574537761705374617465126765745265736f757263654164647265737317626f72726f775f6d75745f776974685f64656661756c740a656d69745f6576656e740a616464726573735f6f660b6973456d657267656e63791467657453776170436f6e6669674861726443617011697342797061737357686974654c69737408636f6e7461696e73094170746f73436f696e087472616e736665720c4170746f73506164436f696e087265676973746572064f7074696f6e1a67657453776170436f6e666967417074546f417074745261746508686561645f6b65790769735f736f6d6507657874726163740f626f72726f775f697465725f6d75740a6d696e7441747070546f036d696e036d6178116765745265736f757263655369676e65721467657453776170436f6e666967536f66744361701967657453776170436f6e666967456e61626c65526566756e640c736574537761705374617465036e6577106e65775f6576656e745f68616e646c650b626f72726f775f6974657241376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d0000000000000000000000000000000000000000000000000000000000000001030800e87648170000000308950100000000000003089a0100000000000003089b010000000000000308930100000000000003089801000000000000030896010000000000000308970100000000000003089901000000000000020104020105020101020103020102052041376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d126170746f733a3a6d657461646174615f7630e4010893010000000000000f4552525f5045524d495353494f4e530095010000000000000d4552525f454d455247454e4359009601000000000000104552525f534541534f4e5f454e444544009701000000000000144552525f534541534f4e5f4e4f545f5245534554009801000000000000114552525f534541534f4e5f414354495645009901000000000000104552525f534541534f4e5f5354415445009a01000000000000134552525f484152444341505f52454143484544009b01000000000000144552525f4e4f545f494e5f57484954454c4953540b6572726f7220636f64657300020322032303240501020522032303250326032405020205270b050205080329032a0b060108002c0b060108012d0b06010804030206220323032e03250326032405040206220323032e032503260324050001000102083c0b0011011112070d21030807082711132a020c0c0a0c0f000c0b0b0c0f010c0e0b0b0c0a0a010c090b010c080b0a0b090600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b08120338000c0d0b020a0d0f02150b0e0a0d1002140a0d1003140a0d1004140a0d1005140a0d1005140b0d10061412043801020100000001080b001116070e210307070427020200000001061117200305070127020301000102106111021112070c2103090b000107082711180c0611132a020c0811190c040a080f000a0011160c030c020b022e0b0338020c070b040b071e03250b00010b08010703270a081007140b062503310b00010b08010702270a081007140a01160a080f07150a080f080c050a0011130a0138030a0038040b080f000a00111607000600000000000000000600000000000000000600000000000000000600000000000000000b001116120338000c090b010a090f03150b050a091002140a091003140b091006141200380502040000010215a00311180c13111d0c2b11132a020c260b261007140c2c0b2c0a13250310055c11132a020c270a270f000c180b270f090c0f0a182e38060c010d010c1c0a1c2e3807032405550a180b1c380838090c22010c140a141003140a140f0a150a14100a140a2b180a140f04150a141006140a1410041411220a0f0a141002140a141003140a141004140a141005140b141006141201380a0d220c1c051f0b1c010b18010b0f01059f030b130c0a11132a020c2a0a2a0f000c1b0b2a0f090c120a1b2e38060c040d040c1f0a1f2e3807037205c3010a1b0b1f380838090c23010c170a171002140c0d0a171003140c0b0b0d0b0b11230a0a11230c090a0906000000000000000024038c0105b4010a090a170f0a150a090a2b180a170f04150b0a0b09170c0a0a171006140a1710041411220a120a171002140a171003140a171004140a171005140b171006141201380a05b6010b17010a0a0600000000000000002503bb0105c0010b1b010b120105c3010d230c1f056d0a0a0600000000000000002403c80105b30211132a020c280a280f000c190b280f090c100a192e38060c000d000c1d0a1d2e380703dc0105b3020a190b1d380838090c24010c150a151003140a15100a141706000000000000000011240a0a11230c200a200600000000000000002403f40105a4020a15100a140a20160a150f0a150a200a2b180c210a151004140a21160a150f04150b0a0b20170c0a0a151006140b2111220a100a151002140a151003140a151004140a151005140b151006141201380a05a6020b15010a0a0600000000000000002503ab0205b0020b19010b100105b3020d240c1d05d7010b0a0600000000000000002503b90206a1860100000000002711132a020c290a290f000c1a0b290f090c110a1a2e38060c020d020c1e0a1e2e380703cd020599030a1a0b1e380838090c25010c160a161003140c0c0a16100a140c0e0a0c0a0e2603e8020b1a010b16010b1101061127000000000000270b0c0b0e1706000000000000000011240a160f05150a161005140600000000000000002403f70205940311250c030e030a161006140a16100514110d0a110a161002140a161003140a161004140a161005140b161006141201380a0596030b16010d250c1e05c8020b1e010b1a010b1101020500000102211a11260c0211132a021007140c0311270c010b01030c05110b030b02230c000513090c000b0003160518110c05191104020601000102010f0b00110111021112070c210309070827070911281105070a1128020701000102010511132b02100714020801000102222511132a020f000c090b090c080a000c070b000c060b080b070600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b06120338000c0a0a0a1002140a0a1003140a0a100a140a0a1004140b0a100514020901000102232611132a020f000c03400500000000000000000c060a032e38060c000d000c040a042e3807031105200a030b04380838090c05010c020d060b0210061444050d050c04050c0b04010b03010b06020a01000024220b00110111250c0a0e0a0c02380b0c0111250c040e04380c0c0511250c060e06380d0c0711250c080e08380e0c090b020b010600000000000000000b070b090b0512022d02070b1128020b010000010b0b0011011112070d210308070827070c1128020c00000102274a11132a020c0a0a0a0f000c070b0a0f090c050a072e38060c000d000c0811250c010e010c0b0a082e3807031805410a070b0838080c030c020b022e0b03380f0c09010c060a0b0a061006140a06100314110d0a050a061002140a061003140a061004140a061005140b061006141201380a0d090c0805130b0b010b08010b07010b0501020d00000001050b000b010b023803020e010000010b0b0011011112070a210308070627070b1128020f010000010b0b0011011112070b210308070727070d1128021001000020090b00110111250c030e030b010b023803021101000020090b00110111250c030e030b010b02381002020002040300030103030304030502010202020303020000";
+    let res = run_binary_test("sample_aptosd_swap", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_router() {
+    let code = "a11ceb0b050000000a01000e020e0603148f0104a3012805cb018f0207da03f90208d30640069307a00110b3082b0cde08db110000010101020003000400050006010a0401000100070000000008010202000000090102020000020b050600050c060700050d050200030e0207020000040f02070200000410020a0200000111020c01000612000d000113020f01000414020a0200000115100f0100031611120200000117130201000418020d0200000519140d00041a1500020000041b020a020000041c020d020000051d140d00031e111202000006080609070907080808090b0b0e0c080d0b0e080f0b100812080f0e0809090e130914091209160802040403060c030300030404043501010101010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b0001090103030303030303030404030301010404010404040503030303030301060c0105010102090009010209010900010301090001020104010901010b0001090002060c0308060c070b00010900070b00010901030301030302030302050b000109000305040106060c010303030432010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b000109010303030303030404030301010404010404040505030303030303030306726f7574657204636f696e067369676e657203616d6d0b636c6f625f6d61726b657403666565047574696c0873696d706c69667918737761705f636f696e5f666f725f65786163745f636f696e18737761705f65786163745f636f696e5f666f725f636f696e04436f696e0a616464726573735f6f660a6665655f65786973747316696e697469616c697a655f6665655f64656661756c740b706f6f6c5f6578697374730d6d61726b65745f657869737473086c6f745f73697a6508646563696d616c7303657870047a65726f0c6e5f6269645f6c6576656c730877697468647261771d636f696e5f737761705f636f696e5f666f725f65786163745f636f696e076465706f7369740b626573745f6269645f61750c73756274726163745f66656516706c6163655f6f726465725f666f725f726f757465720c6e5f61736b5f6c6576656c730b626573745f61736b5f6175076164645f6665651d636f696e5f737761705f65786163745f636f696e5f666f725f636f696e49661cd59c0b89440313af587bc99c3d38614d9a52479eb3f7c7c766d580c30b00000000000000000000000000000000000000000000000000000000000000010308c9000000000000000308ca000000000000000308c800000000000000030804000000000000000308070000000000000003086500000000000000030866000000000000000308030000000000000003080200000000000000030864000000000000000308ffffffffffffffff0308050000000000000003080100000000000000030868000000000000000308670000000000000003080600000000000000126170746f733a3a6d657461646174615f7630170104000000000000000c45544553545f4641494c4544000001000003190a000c030a010c040a01320000000000000000000000000000000022030905120b000a01190c020b010c000b020c0105040b030a001a0b040b001a020101040004ec030a0011030c310a311104200308050a0a0011053800030d0510080c03051238010c030b030c2d38020c2a38030c290a2d0b291f031d05fb0138040c27320a000000000000000000000000000000380535110a0c0e0600000000000000000c320600000000000000000c3438060c1a0a340a0223032f05340a320a01230c060536090c060b06033905eb01380706000000000000000021033e055f0a000a010a321738080c140b000d140d1a0a010a32170a020a34170906000000000000000006000000000000000038090c210c1d0a310b14380a0b320b21160c320b340b1d160c3405eb01380b0c130a310a130811110c120a020a3417350a0e180a121a340c090b090a272303750596010a000a010a321738080c180b000d180d1a0a010a32170a020a34170906000000000000000006000000000000000038090c230c1f0a310b18380a0b320b23160c320b340b1f160c3405eb010a0e0a1211000c250c2b0a000a010a321738080c190a000d190d1a0a010a32170a020a3417080b2b340b253438090c240c200a310b19380a0b320b24160c320b340b20160c340a340a022303c20105c7010a320a01230c0805c901090c080b0803cc0105ea010a020a3417350a0e180b121a340c0a0a000907060b13340b0a3200000000000000000000000000000000380c0c2e0c0d0b320b0d34160c320b340b2e34160c34052a0b320b012503f1010707270b340b022103f7010708270b310b1a380d05eb030a2d0a2a1f03800205b203380e0c28320a000000000000000000000000000000380f35110a0c0f0600000000000000000c330600000000000000000c3538060c1b0a350a02230392020597020a330a01230c04059902090c040b04039c0205a20338100600000000000000002103a10205a402080c0505aa020a020a35170a28230c050b0503ad0205ce020a000a010a331738080c150b000d150d1b0a010a33170a020a35170906000000000000000006000000000000000038090c220c1e0a310b15380a0b330b22160c330b350b1e160c3505a20338110c110a310a110811150c100b100a0f11000c260c2c0a000a010a331738080c160a000d160d1b0a010a33170a020a3517080b2c340b263438090c360c370a310b16380a0b330b36160c330b350b37160c350a350a02230381030586030a330a01230c07058803090c070b07038b0305a1030a000807060b11340a020a3517320000000000000000000000000000000038120c2f0c0b0b330b2f34160c330b350b0b34160c35058d020b330b012503a8030707270b350b022103ae030708270b310b1b380d05eb030b2d03b50305cd030a000a0138080c1738060c1c0b000d170d1c0b010b0209060000000000000000060000000000000000380901010a310b17380a0b310b1c380d05eb030b2a03d00305e7030b00080705070a0a02320000000000000000000000000000000038120c300c0c0b0c340b022103e0030707270b30340b012503eb030708270b0001070c27020201040016d1030a0011030c2b0a2b1104200308050a0a0011053800030d0510080c03051238010c030b030c2738020c2438030c230a270a231f031d05b70138040c21320a000000000000000000000000000000380535110a0c0a0600000000000000000c2d0600000000000000000c2f38060c160a2d0a0123032f05a70138070600000000000000002103340537080c04053d0a010a2d170a21230c040b040340055f0a000a010a2d1738080c100b000d100d160a010a2d170600000000000000000906000000000000000006000000000000000038130c1c0c190a2b0b10380a0b2d0b1c160c2d0b2f0b19160c2f05a701380b0c0f0a2b0a0f0811110c0e0b0e0a0a11000c1f0c250a000a010a2d1738080c140a000d140d160a010a2d17060000000000000000080b25340b1f3438130c310c330a2b0b14380a0b2d0b31160c2d0b2f0b33160c2f0a2d0a012303900105a6010a000907060b0f340a010a2d173200000000000000000000000000000000380c0c280c080b2d0b0834160c2d0b2f0b2834160c2f052a0b2d0b012103ad010707270b2f0b022603b3010708270b2b0b16380d05d0030a270b241f03bc01059403380e0c22320a000000000000000000000000000000380f35110a0c0b0600000000000000000c2e0600000000000000000c3038060c180a2e0a012303ce0105840338100600000000000000002103d30105f2010a000a010a2e1738080c150b000d150d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1d0c1a0a2b0b15380a0b2e0b1d160c2e0b300b1a160c3005840338110c0d0a2b0a0d0811150c0c0a010a2e17350a0b180a0c1a340c050b050a222303880205a7020a000a010a2e1738080c110b000d110d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1e0c1b0a2b0b11380a0b2e0b1e160c2e0b300b1b160c300584030a0b0a0c11000c200c260a000a010a2e1738080c120a000d120d180a010a2e17060000000000000000080b26340b203438130c320c340a2b0b12380a0b2e0b32160c2e0b300b34160c300a2e0a012303d1020583030a010a2e17350a0b180b0c1a340c060a000807060b0d340a06320000000000000000000000000000000038120c2a0c070a07340b062503ee020b0001061111000000000000270a2a340a010a2e172503f9020b0001062222000000000000270b2e0b2a34160c2e0b300b0734160c3005c9010b2e0b0121038a030707270b300b02260390030708270b2b0b18380d05d0030b2703970305b2030a000a0138080c1338060c170a000d130d170b010b0209060000000000000000060000000000000000381301010b0011030c2c0a2c0b17380d0b2c0b13380a05d0030b2303b50305cc030b000907050600000000000000000a013200000000000000000000000000000000380c0c290c090b09340b012103c5030707270b29340b022603d0030708270b0001070c270200";
+    let res = run_binary_test("sample_router", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_pool() {
+    let code = "a11ceb0b050000000c010020022079039901c90204e2036605c804fd0507c50aa80c08ed166006cd17c101108e19bb020ac91bd4020c9d1eb3250dd043340000010101020103010401050106010701080109010a020b000c000d000e000f0010070000110600001206000013060000140600001508000000040000160800001708000018060000190600001a0600001b0600071d07000b2707000b3a0700053c040106010344040100010245080009470402030100010b480400084e0402030100010b6c07000e7807000e7b07000e7e07000e80010700001c000100001e020100001f030100002002010000210201000022020100002300010000240201000025040100002605010000280607000029080100002a090100002b0a0100002c0b01000658050d0008590f07020300045a101000085b1213020300045c101000035d15160100035e17010100035f1810010005601a0101060b611e1c000b621f06000b632010000b64212200096524010203000a66250101000867122a0203000a682c2d01000a672e2f01000967312a0203000b69320100096a3301020300036b340101000d6d393a000c6d393a0009593b070203000b6e1c3c000b6f3d10000b703d10000b713d0d0003723e16010007733f1d000d74393a000c74393a000975013302030408654401020300087501460203040176054701060b7706100008790f490203000e7a4b4a000e7c4c4d000f7d4e0101040e7f3951000e81010e5300100e1011121114141514161417191c231d1c17261728120e1e111f2b202b12302123232324141735173617371f1c201c27232c1417403023103031303111310e17453211320e32303345333733263319333533363328334035303511384d384a3851350e385303060c04030006060c040a050a080d0a080d0a0306060c04020303030b060c020a050a080d0a080d0a03030303030201060c01080e010103060c05080d02060c0407060c03030303030302060c05040b11010812070805070806070808010502050a0402060b150209000901090001030204080602070b15020900090109000107090101081202060c03010b1101090002070b110109000b1101090001060b1101090001080202070b100109000900070708050303070806070808080f0a080f01080f01080d0405080d080d030305080d080d0205080f03060c080f0301081402080f081403070b1302090009010900090102070a09000a0900010803030708050708060708080108041a06040604030b1101081205080d070a0405020307080503030303030307080803080f0a080f0b1302080f0814040302070a04010901010402060a090006090002010302070a0900030109000208000a0402070b130209000901090002060c0814010b13020900090102050b1101090001080c01080b0108092c03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b11010812030307080503030303030303070806070b150204080603060816030503080f0a080f0503030303030602030303030302060b13020900090109000108160106081602070b1101090003010a0201080a2b03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b110108120307080503030303030303070806070b150204080603060816030503080f0a080f08070805030303070806070808080f0a080f0d01050b1101081206080d060507080507040303070808080f0a080f0b1302080f081403070b15020900090109000901010801010b150209000901010b10010900080800030403060a040608060708080a0817010609010108170d05030305080d020303020a080f0304030405080d0a040a081701081802060c09000206080607080817030303020303030303020303030303020303030303030301081902060a0407080801081a04506f6f6c076163636f756e740a6170746f735f636f696e04636f696e056572726f72056576656e74067369676e657206737472696e67057461626c65117461626c655f776974685f6c656e67746806766563746f7205746f6b656e104578706f6e656e7469616c43757276650b4c696e6561724375727665054d6f64656c04566965770c436f6c6c656374696f6e49640f437265617465506f6f6c4576656e74144465706f736974436f696e506f6f6c4576656e74154465706f736974546f6b656e506f6f6c4576656e740d45646974506f6f6c4576656e740a4576656e7453746f726508506f6f6c4775696405506f6f6c730f52656d6f7665506f6f6c4576656e7409537761704576656e74155769746864726177436f696e506f6f6c4576656e74165769746864726177546f6b656e506f6f6c4576656e740b4465706f736974436f696e06537472696e670c4465706f736974546f6b656e0845646974506f6f6c0a52656d6f7665506f6f6c1753776170436f696e466f7253706563696669634e4654730f537761704e465473466f72436f696e0c5769746864726177436f696e0d5769746864726177546f6b656e066372656174650b696e69745f6d6f64756c650b546f6b656e4461746149640a69735f6572633131353515766965775f636f6c6c656374696f6e5f706f6f6c7309766965775f706f6f6c0f766965775f70726963655f63616c630f766965775f757365725f706f6f6c7312636f6c6c656374696f6e5f63726561746f720f636f6c6c656374696f6e5f6e616d650763726561746f7207706f6f6c5f69640a73706f745f70726963650563757276650564656c7461116c705f6665655f6d756c7469706c69657204747970650673656e646572136465706f7369745f636f696e5f616d6f756e7405636f696e7309746f6b656e5f69647307546f6b656e49640b6372656174655f706f6f6c0b4576656e7448616e646c650b72656d6f76655f706f6f6c126465706f7369745f746f6b656e5f706f6f6c116465706f7369745f636f696e5f706f6f6c1377697468647261775f746f6b656e5f706f6f6c1277697468647261775f636f696e5f706f6f6c09656469745f706f6f6c047377617004436f696e094170746f73436f696e06746f6b656e730f5461626c65576974684c656e67746805546f6b656e0c7472616e73616374696f6e7317746f74616c5f7472616e73616374696f6e5f76616c75650f6c705f6665655f6561726e696e677305636f756e7405706f6f6c73055461626c650a757365725f706f6f6c7310636f6c6c656374696f6e5f706f6f6c730b636f696e5f616d6f756e740c70726f746f636f6c5f6665650e70726f746f636f6c5f70617965650b726f79616c74795f6665650d726f79616c74795f7061796565066c705f6665651477697468647261775f636f696e5f616d6f756e740a616464726573735f6f6608636f6e7461696e7310696e76616c69645f617267756d656e740a626f72726f775f6d7574117065726d697373696f6e5f64656e696564087769746864726177056d657267650576616c75650a656d69745f6576656e74136372656174655f746f6b656e5f69645f726177146372656174655f746f6b656e5f646174615f69640a62616c616e63655f6f660e77697468647261775f746f6b656e0361646406617070656e640672656d6f766508696e6465785f6f660d6465706f7369745f746f6b656e0d64657374726f795f656d707479076465706f73697407526f79616c74790a676574427579496e666f0b6765745f726f79616c7479176765745f726f79616c74795f64656e6f6d696e61746f72156765745f726f79616c74795f6e756d657261746f72116765745f726f79616c74795f7061796565076578747261637404757466380b67657453656c6c496e666f036e6577106e65775f6576656e745f68616e646c65156765745f746f6b656e646174615f6d6178696d756d08506f6f6c5669657706626f72726f7709706f6f6c5f7669657713436f6c6c656374696f6e506f6f6c735669657715636f6c6c656374696f6e5f706f6f6c735f7669657704766965770d507269636543616c63566965770f70726963655f63616c635f766965770d55736572506f6f6c73566965770f757365725f706f6f6c735f76696577ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf0940000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000303086600000000000000030869000000000000000308680000000000000003086e000000000000000308670000000000000003086a0000000000000003086b0000000000000003086c000000000000000308650000000000000003086d000000000000000520ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf09403086400000000000000052000000000000000000000000000000000000000000000000000000000000000000a0204036275790a02050473656c6c126170746f733a3a6d657461646174615f7630a6020a6500000000000000074552525f4e554d006600000000000000134552525f444946465f434f4c4c454354494f4e006700000000000000124552525f4e4f545f45584953545f504f4f4c006800000000000000154552525f494e56414c49445f504f4f4c5f54595045006900000000000000154552525f494e56414c49445f504f4f4c5f41524753006a000000000000001c4552525f4e4f545f4558495453545f544f4b454e5f494e5f504f4f4c006b00000000000000124552525f4e4f545f484156455f544f4b454e006c00000000000000144552525f4e4f545f504f4f4c5f43524541544f52006d00000000000000184552525f504f4f4c5f4e4f545f454e4f5547485f434f494e006e00000000000000114552525f49535f313135355f544f4b454e000002022d052e080d0102092f0530042d052e080d3103320233033403350202020a360530042d052e080d37033803310332023303340303020a360530042d052e080d390a080f3803310332023303340304020730042d052e080d31033202330334030502083b0b100108013d0b100108093e0b100108033f0b10010802400b1001080c410b1001080b420b10010804430b1001080a06020e2f053103380b11010812460b1302080f08142d052e080d3202330334033502390a080f49034a044b030702014c040802034d0b15020408064f0b1502050a04500b150208000a0409020c2f0530042d052e080d3103320233033403350249034a044b030a0210360530042d052e080d310332023303390a080f510352035305540355055603380335080d0b020a360530042d052e080d5703380331033202330334030c020a360530042d052e080d390a080f380331033202330334030001000205080c61070a2a080c06070a2a050c040a0610000a00110f3800040d05160b00010b06010b040107041111270a0610010a013801041c05250b00010b06010b040107041111270b060f010a0138020c050a051002140a00110f210432053b0b00010b05010b040107071113270a000a0238030c030a050f030b0338040b040f040b00110f0b010a051005140a051006140b020a05100338050a051007140a051008140a051009140b05100a1412023806020101000205081bd801070a2a080c0a070a2a050c060a0a10000a00110f3800040d05160b00010b0a010b060107041111270a0a10010a013801041c05250b00010b0a010b060107041111270b0a0f010a0138020c09401c00000000000000000c0c0a091002140a00110f210434053d0b00010b09010b060107071113270e02410d0c080600000000000000000c070a070a082304b60105470e020a07420d0a09100521044f05580b00010b09010b060107001111270e030a07421d0a09100621046005690b00010b09010b060107001111270e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0b0e020a07420d140e030a07421d140e040a07421d141119110a20048c010595010b00010b09010b060107031111270d0c0a0b441c0a00110f0a0b111a0601000000000000002604a00105a9010b00010b09010b060107061111270a090f0b0a0b0a000b0b060100000000000000111b38070b07060100000000000000160c0705420a090f0c0a0c38080b060f0d0b00110f0b010a091005140a091006140b0c0a09100338050a091007140a091008140a091009140b09100a1412033809020201000205082759070a2a080c08070a2a050c060a0810000a00110f3800040d05160b00010b08010b060107041111270a0810010a013801041c05250b00010b08010b060107041111270b080f010a0138020c070a071002140b00110f21043205390b07010b060107071113270a020a070f08150a040a070f09150a030a070f07150a050a070f0a150b060f0e0b010a071005140b071006140b030b020b040b051204380a0203010002050829dc01070a2a080c17070a2a050c100a1710000a00110f3800040d05160b00010b17010b100107041111270a170f000a00110f380b0c1f0a1710010a0138010422052d0b1f010b00010b17010b100107041111270a170f010a01380c13060c150c1c0c1d010c1e0c160c0f0c0e0c0b0c0a0c1b0c090c180c0d0a0d0a00110f21044605510b1f010b00010b17010b100107071113270a1f0e010c062e0b06380d0c12010b1f0b12380e010b170f0f0a0a0a0b1200380f0c0c0a0c0e010c072e0b07380d0c13046d05760b00010b10010b0c0107051111270b0c0b13380e010600000000000000000c110e02410d0c14401c00000000000000000c1a0a110a142304a5010586010e020a11420d140e030a11421d140e040a11421d140e050a1142101411180c190d1a0a19441c0a000d1b0b19381011220b11060100000000000000160c110581010b1b38110e0938050c080a00110f0b0938120a100f100a0d0a010a0a0a0b0b1a0600000000000000000600000000000000003100060000000000000000060000000000000000120c38130a100f110b0d0a010a0a0a0b0b080600000000000000000600000000000000003100060000000000000000060000000000000000120b38140b100f120b00110f0b010b0a0b0b0b180b0e0b0f0b160b1e0b1d0b1c0b15120938150204010002050838d502070a2a080f010c2a070a2a050c210a2a0a010c102e0b103801040f05180b00010b2a010b210107041111270e02410d0c270b2a0a0138020c290a2910081431012104380a291007140a291009140a270a29100a14070b11250c0a0c090c080c070c060c1d055a0a29100814310221043f05480b00010b29010b210107021111270a291007140a291009140a270a29100a14070b11260c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c240c2b0c1f0c250c26310021046905720b00010b29010b21010701111127070c0600000000000000000600000000000000000c2f0c2d0c2e0b260a290f07150b250a290f0915401c00000000000000000c310a000a1f38030c1e0600000000000000000c220a220a272304f401058d010e020a22420d140e030a22421d140e040a22421d140e050a2242101411180c300a29100c0e3038160c2304a60105af010b00010b29010b210107051111270a290f0c0b233817010d310a30441c0a29100b0a30381804bd0105c6010b00010b29010b210107051111270a000a290f0b0a30381011220b3011280c0b0e0b0c2c0a2c11290c200a2c112a0c280b2c112b0c2e0a200600000000000000002204ef010a1f0a271a0b28180b201a0c2d0b2f0a2d160c2f0a2e0d1e0a2d381938120b22060100000000000000160c220588010a291013140a1f35160a290f13150a29101414060100000000000000160a290f1415070a0d1e0a2b381938120a290f030b1e38040b210f150c1c0b00110f0c0c0b010c0d0a291005140c0e0a291006140c0f0a291007140c110a291008140c120a291009140c130b310c140b1f0a2b160b2d160c150b2b0c160b2f0c170b2e0c180b240c19070d112d0c1a0b29100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a02050100020508418c03070a2a080f010c29070a2a050c200a290a010c102e0b103801040f05180b00010b29010b200107041111270e02410d0c250b290a0138020c280a2810081431012104380a281007140a281009140a250a28100a14070b112e0c0a0c090c080c070c060c1d055a0a28100814310221043f05480b00010b28010b200107021111270a281007140a281009140a250a28100a14070b112f0c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c220c2a0c270c230c24310021046905720b00010b28010b20010701111127070c0600000000000000000600000000000000000c2e0c2c0c2d401c00000000000000000c300a280f030a270a2a1738190c1e0600000000000000000c210a210a2523049a020588010e020a21420d0a281005210490010599010b00010b28010b200107001111270e030a21421d0a2810062104a10105aa010b00010b28010b200107001111270e020a21420d140e030a21421d140e040a21421d140e050a2142101411180c2f0e020a21420d140e030a21421d140e040a21421d141119110a2004cd0105d6010b00010b28010b200107031111270d300a2f441c0a00110f0a2f111a0601000000000000002604e10105ea010b00010b28010b200107061111270a280f0b0a2f0a000a2f060100000000000000111b38070b2f11280c0b0e0b0c2b0a2b11290c1f0a2b112a0c260b2b112b0c2d0a1f060000000000000000220495020a270a251a0b26180b1f1a0c2c0b2e0a2c160c2e0a2d0d1e0a2c381938120b21060100000000000000160c210583010a280f0c0a303808070a0a280f030a2a381938120b240a280f07150b230a280f09150a00110f0b1e38120a281013140a270a2a170b2e1735160a280f13150a28101414060100000000000000160a280f14150b200f150c1c0b00110f0c0c0b010c0d0a281005140c0e0a281006140c0f0a281007140c110a281008140c120a281009140c130b300c140b270a2a170a2c170c150b2a0c160b2c0c170b2d0c180b220c19070e112d0c1a0b28100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a020601000205082770070a2a080c05070a2a050c030a0510000a00110f3800040d05160b00010b05010b030107041111270a0510010a013801041c05250b00010b05010b030107041111270b050f010a0138020c040a041002140a00110f210432053b0b00010b04010b030107071113270a04100338050a02260442054b0b00010b04010b030107091111270a00110f0a040f030a02381938120b030f110b00110f0b010a041005140a041006140b020a04100338050a041007140a041008140a041009140b04100a14120b38140207010002050842a901070a2a080c0b070a2a050c060a0b10000a00110f3800040d05160b00010b0b010b060107041111270a0b10010a013801041c05250b00010b0b010b060107041111270b0b0f010a0138020c0a401c00000000000000000c0d0a0a1002140a00110f210434053d0b00010b0a010b060107071113270e02410d0c090600000000000000000c070a070a0923048b0105470e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0c0a0a100c0e0c38160c08046005690b00010b0a010b060107051111270a0a0f0c0b083817010d0d0a0c441c0a0a100b0a0c381804770580010b00010b0a010b060107051111270a000a0a0f0b0b0c381011220b07060100000000000000160c0705420b060f100b00110f0b010a0a1005140a0a1006140b0d0a0a100338050a0a1007140a0a1008140a0a1009140b0a100a14120c38130208010003050708439f02070a2a080c14070a2a070f160c11070a2a050c10381b0c170e02410d0c130a13060000000000000000240414051f0b00010b14010b11010b100107081111270e02060000000000000000420d0c0f0e03060000000000000000421d0c0e0a14100f0a0f140a0e141200381c20043a0a140f0f0a0f140a0e141200402b0000000000000000381d0a140f0f0a0f140a0e141200380f0a1114442b401c00000000000000000c160600000000000000000c120a120a132304b001054e0a0f0e020a12420d21045b0a0e0e030a12421d210c0b055d090c0b0b0b0460056f0b00010b14010b11010b10010b0f010b0e0107001111270e020a12420d140e030a12421d140e040a12421d141119110a20048001058f010b00010b14010b11010b10010b0f010b0e0107031111270e020a12420d140e030a12421d140e040a12421d140e050a1242101411180c150d160a15441c0d170a150a000b15060100000000000000111b38070b12060100000000000000160c1205490a100f0d0a00110f0a11140a0f140a0e140a160a060a070a010a080a09120338090a000a0638030c0d0a100f040a00110f0a11140a0f140a0e140a060b060a070a010a080a09120238060a140f010a11140a00110f0a070b0d0b170a0f140a0e140a010a080a090a0a0b1606000000000000000032000000000000000000000000000000000600000000000000001206381e0a140f000a00110f0c0c2e0b0c38002004ff010a140f000a00110f402b0000000000000000381f0b140f000a00110f380b0a1114442b0b100f170b00110f0a11140b0f140b0e140b070b010b080b090b0a120138200a11143201000000000000000000000000000000160b11150209000000011e0a0038213822382312082d080a00320000000000000000000000000000000012072d070a000a0038240a0038250a0038260a0038270a0038280a0038290a00382a0b00382b12052d05020a00000001060601000000000000000b0011342120020b010401084876070a2a080c090a010a0212000c030a09100f0a03381c040d05130b00010b0901063f05000000000000270a09100f0b03382c0c07404a00000000000000000c0a0a07412b0c060600000000000000000c040a040a0623046b05240a070a04422b140c050a0910010a053801042f05370b00010b09010b0701063f05000000000000270a0910010b05382d0c080d0a0a081002140a081007140a08100338050a081005140a081006140a081008140a081009140a08100a140a081018140a08100c140a081014140a081013140b081019141136444a0b04060100000000000000160c04051f0b09010b000b010b020b07140b0a1137382e020c010401084f40070a2a080c030a0310010a013801040905100b00010b030107041111270b0310010b01382d0c020b000a021002140a021007140a02100338050a021005140a021006140a021008140a021009140a02100a140a021018140a02100c140a021014140a021013140b021019141136382f020d0104005087010b010600000000000000002104380a020601000000000000002104150b030b040b050b06070b11250c090c080c070c180c170c16052b0b0206020000000000000021041a051f0b000107021111270b030b040b050b06070b11260c090c080c070c180c170c160b160b170b180b070b080b090c150c140c130c120c110c10056b0a020601000000000000002104490b030b040b050b06070b112e0c0f0c0e0c0d0c0c0c0b0c0a055f0b0206020000000000000021044e05530b000107021111270b030b040b050b06070b112f0c0f0c0e0c0d0c0c0c0b0c0a0b0a0b0b0b0c0b0d0b0e0b0f0c150c140c130c120c110c100b100b110b120b130b140b150c1a0c1d0c190c1b0c1c310021047a057e0b0001064705000000000000270b000b1c0b1b0b190b1d0b1a11393830020e01040108521b070a2a080c030a0310000a0138000409050f0b00010b0301063f05000000000000270b0310000a0138310c020b000b010b0214113a383202080108000600060205030604060506010606060706080603060a050205060802050405050501060c060b0507070005000609060d00";
+    let res = run_binary_test("sample_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_farming() {
+    let code = "a11ceb0b050000000e01001e021e2603447c04c00158059802c80107e003bb04089b08a00106bb09e101109c0b780a940c3e0bd20c040cd60cd10d0da71a080eaf1a060000010101020103010401050106000700080209020a0309030a0409040a000b0800000c0e0200010001000d0c0200010001011106000513070002230401000107240000000e000100000f0201020000032104050001220607000525090a000e26010c0200000c26010c0200000a26010c0200000427001200022812140100022915160100022a17010100082b150101000d2c1a010200000b2c1a01020000092c1a010200000d2d1b010200000b2d1b01020000092d1b01020000062e011400050b050d050e050f05100511060b060d060e060f06100611070b070d070e070f0710071109130a130b1309180a180b1809190a190b190c130c180d0b0e0b0f0b0d0d0e0d0f0d0d0e0d100e0e0e100f0e0f10100b110b120b01060c0009060c0303030303030303020c080302060c0501080301060803010c2001010101010101010101030303030308040b050108060b050109000b050109010708000b0102090009010b0102090009010b020209000901070b020209000901050c0a0b0102090009010503030303010a0201080402090009010101020901090002080609000209000806020806090102090108060105010900010302060c03010b0501090002050b0501090001090101080603060c030305060c03030303010b010209000901076661726d696e67076163636f756e7404636f696e107265736f757263655f6163636f756e74067369676e657206737472696e670974696d657374616d700d6661756365745f746f6b656e73076c656e64696e6706726f7574657204737761700a4d6f64756c65446174610c506f736974696f6e496e666f0f506f736974696f6e496e666f4465780b696e69745f6d6f64756c65166c657665726167655f7969656c645f6661726d696e670a7369676e65725f636170105369676e65724361706162696c697479086465785f6e616d6506537472696e670b7369676e65725f616464720a637265617465645f617406737461747573086c657665726167650e737570706c79416d6f756e745f780e737570706c79416d6f756e745f790e737570706c79416d6f756e745f7a0e626f72726f77416d6f756e745f780e626f72726f77416d6f756e745f790e626f72726f77416d6f756e745f7a10706f736974696f6e496e666f5f70616e10706f736974696f6e496e666f5f6c697110706f736974696f6e496e666f5f6175781d72657472696576655f7265736f757263655f6163636f756e745f6361701d6372656174655f7369676e65725f776974685f6361706162696c69747904436f696e03455a4d04757466380f69735f706169725f637265617465640a616464726573735f6f660762616c616e6365087769746864726177076465706f73697406626f72726f7710737761705f65786163745f696e7075740d6164645f6c69717569646974790b6e6f775f7365636f6e64734d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf4100000000000000000000000000000000000000000000000000000000000000015e40a5bf7ab741784d3a99d96d8e2ddc6706ee06e5f509a3314a74c9e53746f5b30dd6a14dd7626ac8a37bc964914f07e3dc38d629637f1087f9f7186f1e0909c4911c40cf758ec21c0ebf0e547933ef6bb0f53ad581c08d2ecc7ad11364be1b030804000000000000000520f67b2452fd82768002ec6c28568713b9359a596585dc1a4bf85fce6b0e3754020308020000000000000003080300000000000000030801000000000000000308ffffffffffffffff0410e80300000000000000000000000000000308000000000000000005204d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf41052000000000000000000000000000000000000000000000000000000000000000000a020c0b50616e63616b65537761700a020b0a4c6971756964537761700a020d0c4155582045786368616e6765126170746f733a3a6d657461646174615f763064030100000000000000164552524f525f4e4f545f435245415445445f50414952000200000000000000184552524f525f494e53554646494349454e545f4153534554000300000000000000174552524f525f494e56414c49445f504152414d5f4445580000020110080301020b1208041405150316011703180319031a031b031c031d030202031e0a0b0102090009011f0a0b010209000901200a0b010209000901020b010b00000000030c0b00070111020c020e0211030c010e010b0212002d000201010402000208ee04070a1104010a010600000000000000002103080536070a11040c183800030e0511080c09051338010c090b0903190b00010704273802031c051f080c0b052138030c0b0b0b03270b00010704273804032a052d080c0c052f38050c0c0b0c03350b0001070427059f010a0106010000000000000021033b0569070b11040c18380603410544080c0d054638070c0d0b0d034c0b00010704273808034f0552080c0e055438090c0e0b0e035a0b0001070427380a035d0560080c0f0562380b0c0f0b0f03680b0001070427059f010a0106020000000000000021036e059b01070c11040c18380c03740577080c100579380d0c100b10037f0b0001070427380e038201058501080c11058701380f0c110b11038d010b00010704273810039001059301080c1205950138110c120b12039f010b00010704270b000107032707082a000c1c0b1c100011030c220e2211080c210a030600000000000000002403ae0105c1010a00110838120c160b160a032403ba010b00010702270a000a0338130c1a07080b1a38140a040600000000000000002403c60105d9010a00110838150c170b170a042403d2010b00010702270a000a0438160c1b07080b1b38170a050600000000000000002403de0105f1010a00110838180c150b150a052403ea010b00010702270a000a0538190c1907080b19381a0a060600000000000000002403f60105f9010e220a06381b0a070600000000000000002403fe010581020e220a07381c0a0806000000000000000024038502070838120c26070838150c280a030a06160602000000000000001a0600000000000000002403940205bd020a010600000000000000002103990205a2020e220a030a06160602000000000000001a060000000000000000381d05bd020a010601000000000000002103a70205b0020e220a030a06160602000000000000001a060000000000000000381e05bd020a010602000000000000002103b50205bd020e220a030a06160602000000000000001a060000000000000000381f0a040a07160602000000000000001a0600000000000000002403c60205ef020a010600000000000000002103cb0205d4020e220a040a07160602000000000000001a060000000000000000382005ef020a010601000000000000002103d90205e2020e220a040a07160602000000000000001a060000000000000000382105ef020a010602000000000000002103e70205ef020e220a040a07160602000000000000001a06000000000000000038220a050a08160602000000000000001a0600000000000000002403f80205b9030a010600000000000000002103fd02058e030e220a050a08160602000000000000001a06000000000000000038230e220a050a08160602000000000000001a060000000000000000382405b9030a010601000000000000002103930305a4030e220a050a08160602000000000000001a06000000000000000038250e220a050a08160602000000000000001a060000000000000000382605b9030a010602000000000000002103a90305b9030e220a050a08160602000000000000001a06000000000000000038270e220a050a08160602000000000000001a0600000000000000003828070838120c25070838150c270a030b25160b26170c130a040b27160b28170c140a130600000000000000002403d00305d5030a14060000000000000000240c0a05d703090c0a0b0a03da0305eb040a010600000000000000002103df0305e6030e220b130b14060000000000000000060000000000000000382905fd030a010601000000000000002103eb0305f2030e220b130b14060000000000000000060000000000000000382a05fd030a010602000000000000002103f70305fd030e220b130b14060000000000000000060000000000000000382b0b0011080c240a213b002003850405ba040b180b241113080b020b030b040b050b060b070b0839010c1d401c000000000000000001401c0000000000000000401c0000000000000000401c000000000000000039000c1f0a0106000000000000000021039e0405a3040d1f36000b1d441c05b6040a010601000000000000002103a80405ad040d1f36010b1d441c05b6040b010602000000000000002103b20405b6040d1f36020b1d441c0e220b1f3f0005ea040b213c000c200b180b241113080b020b030b040b050b060b070b0839010c1e0a010600000000000000002103cf0405d4040b2036000b1e441c05ea040a010601000000000000002103d90405de040b2036010b1e441c05ea040b010602000000000000002103e30405e8040b2036020b1e441c05ea040b200105ed040b0001020000020002010202010b020b030b00";
+    let res = run_binary_test("sample_farming", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_whitelist() {
+    let code = "a11ceb0b050000000c01000602060c03123a044c0805545707ab01660891024006d102988b0210e98d02d7010ac08f02090cc98f02a2470debd6020200000101010200030800020a04020301000100040001000005020100000603040000070201000008000100010b0203000204070102030002060a04020300020c010c02030402080d0e020300060607060806090602060c050001060c01050101020507080002050203070b010209000901090009010305070b010205020708000106080002060b0102090009010900010b01020502010b01020900090102070b01020900090109000109010977686974656c697374067369676e6572057461626c650957686974656c69737403616464086164645f6d616e7908636f6e7461696e730a696e697469616c697a650672656d6f766507656e7472696573055461626c650a616464726573735f6f66036e65774419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1000000000000000000000000000000000000000000000000000000000000000103082003000000000000030822030000000000000308210300000000000005204419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1052000000000000000000000000000000000000000000000000000000000000000000520000000000000000000000000000000000000000000000000000000000000000105200000000000000000000000000000000000000000000000000000000000000002052000000000000000000000000000000000000000000000000000000000000000030520000000000000000000000000000000000000000000000000000000000000000405200000000000000000000000000000000000000000000000000000000000000005052000000000000000000000000000000000000000000000000000000000000000060520000000000000000000000000000000000000000000000000000000000000000705200000000000000000000000000000000000000000000000000000000000000008052000000000000000000000000000000000000000000000000000000000000000090520000000000000000000000000000000000000000000000000000000000000001005200000000000000000000000000000000000000000000000000000000000000011052000000000000000000000000000000000000000000000000000000000000000120520000000000000000000000000000000000000000000000000000000000000001305200000000000000000000000000000000000000000000000000000000000000014052000000000000000000000000000000000000000000000000000000000000000150520000000000000000000000000000000000000000000000000000000000000001605200000000000000000000000000000000000000000000000000000000000000017052000000000000000000000000000000000000000000000000000000000000000180520000000000000000000000000000000000000000000000000000000000000001905200000000000000000000000000000000000000000000000000000000000000020052000000000000000000000000000000000000000000000000000000000000000210520000000000000000000000000000000000000000000000000000000000000002205200000000000000000000000000000000000000000000000000000000000000023052000000000000000000000000000000000000000000000000000000000000000240520000000000000000000000000000000000000000000000000000000000000002505200000000000000000000000000000000000000000000000000000000000000026052000000000000000000000000000000000000000000000000000000000000000270520000000000000000000000000000000000000000000000000000000000000002805200000000000000000000000000000000000000000000000000000000000000029052000000000000000000000000000000000000000000000000000000000000000300520000000000000000000000000000000000000000000000000000000000000003105200000000000000000000000000000000000000000000000000000000000000032052000000000000000000000000000000000000000000000000000000000000000330520000000000000000000000000000000000000000000000000000000000000003405200000000000000000000000000000000000000000000000000000000000000035052000000000000000000000000000000000000000000000000000000000000000360520000000000000000000000000000000000000000000000000000000000000003705200000000000000000000000000000000000000000000000000000000000000038052000000000000000000000000000000000000000000000000000000000000000390520000000000000000000000000000000000000000000000000000000000000004005200000000000000000000000000000000000000000000000000000000000000041052000000000000000000000000000000000000000000000000000000000000000420520000000000000000000000000000000000000000000000000000000000000004305200000000000000000000000000000000000000000000000000000000000000044052000000000000000000000000000000000000000000000000000000000000000450520000000000000000000000000000000000000000000000000000000000000004605200000000000000000000000000000000000000000000000000000000000000047052000000000000000000000000000000000000000000000000000000000000000480520000000000000000000000000000000000000000000000000000000000000004905200000000000000000000000000000000000000000000000000000000000000050052000000000000000000000000000000000000000000000000000000000000000510520000000000000000000000000000000000000000000000000000000000000005205200000000000000000000000000000000000000000000000000000000000000053052000000000000000000000000000000000000000000000000000000000000000540520000000000000000000000000000000000000000000000000000000000000005505200000000000000000000000000000000000000000000000000000000000000056052000000000000000000000000000000000000000000000000000000000000000570520000000000000000000000000000000000000000000000000000000000000005805200000000000000000000000000000000000000000000000000000000000000059052000000000000000000000000000000000000000000000000000000000000000600520000000000000000000000000000000000000000000000000000000000000006105200000000000000000000000000000000000000000000000000000000000000062052000000000000000000000000000000000000000000000000000000000000000630520000000000000000000000000000000000000000000000000000000000000006405200000000000000000000000000000000000000000000000000000000000000065052000000000000000000000000000000000000000000000000000000000000000660520000000000000000000000000000000000000000000000000000000000000006705200000000000000000000000000000000000000000000000000000000000000068052000000000000000000000000000000000000000000000000000000000000000690520000000000000000000000000000000000000000000000000000000000000007005200000000000000000000000000000000000000000000000000000000000000071052000000000000000000000000000000000000000000000000000000000000000720520000000000000000000000000000000000000000000000000000000000000007305200000000000000000000000000000000000000000000000000000000000000074052000000000000000000000000000000000000000000000000000000000000000750520000000000000000000000000000000000000000000000000000000000000007605200000000000000000000000000000000000000000000000000000000000000077052000000000000000000000000000000000000000000000000000000000000000780520000000000000000000000000000000000000000000000000000000000000007905200000000000000000000000000000000000000000000000000000000000000080052000000000000000000000000000000000000000000000000000000000000000810520000000000000000000000000000000000000000000000000000000000000008205200000000000000000000000000000000000000000000000000000000000000083052000000000000000000000000000000000000000000000000000000000000000840520000000000000000000000000000000000000000000000000000000000000008505200000000000000000000000000000000000000000000000000000000000000086052000000000000000000000000000000000000000000000000000000000000000870520000000000000000000000000000000000000000000000000000000000000008805200000000000000000000000000000000000000000000000000000000000000089052000000000000000000000000000000000000000000000000000000000000000900520000000000000000000000000000000000000000000000000000000000000009105200000000000000000000000000000000000000000000000000000000000000092052000000000000000000000000000000000000000000000000000000000000000930520000000000000000000000000000000000000000000000000000000000000009405200000000000000000000000000000000000000000000000000000000000000095052000000000000000000000000000000000000000000000000000000000000000960520000000000000000000000000000000000000000000000000000000000000009705200000000000000000000000000000000000000000000000000000000000000098052000000000000000000000000000000000000000000000000000000000000000990520000000000000000000000000000000000000000000000000000000000000010005200000000000000000000000000000000000000000000000000000000000000101052000000000000000000000000000000000000000000000000000000000000001020520000000000000000000000000000000000000000000000000000000000000010305200000000000000000000000000000000000000000000000000000000000000104052000000000000000000000000000000000000000000000000000000000000001050520000000000000000000000000000000000000000000000000000000000000010605200000000000000000000000000000000000000000000000000000000000000107052000000000000000000000000000000000000000000000000000000000000001080520000000000000000000000000000000000000000000000000000000000000010905200000000000000000000000000000000000000000000000000000000000000110052000000000000000000000000000000000000000000000000000000000000001110520000000000000000000000000000000000000000000000000000000000000011205200000000000000000000000000000000000000000000000000000000000000113052000000000000000000000000000000000000000000000000000000000000001140520000000000000000000000000000000000000000000000000000000000000011505200000000000000000000000000000000000000000000000000000000000000116052000000000000000000000000000000000000000000000000000000000000001170520000000000000000000000000000000000000000000000000000000000000011805200000000000000000000000000000000000000000000000000000000000000119052000000000000000000000000000000000000000000000000000000000000001200520000000000000000000000000000000000000000000000000000000000000012105200000000000000000000000000000000000000000000000000000000000000122052000000000000000000000000000000000000000000000000000000000000001230520000000000000000000000000000000000000000000000000000000000000012405200000000000000000000000000000000000000000000000000000000000000125052000000000000000000000000000000000000000000000000000000000000001260520000000000000000000000000000000000000000000000000000000000000012705200000000000000000000000000000000000000000000000000000000000000128052000000000000000000000000000000000000000000000000000000000000001290520000000000000000000000000000000000000000000000000000000000000013005200000000000000000000000000000000000000000000000000000000000000131052000000000000000000000000000000000000000000000000000000000000001320520000000000000000000000000000000000000000000000000000000000000013305200000000000000000000000000000000000000000000000000000000000000134052000000000000000000000000000000000000000000000000000000000000001350520000000000000000000000000000000000000000000000000000000000000013605200000000000000000000000000000000000000000000000000000000000000137052000000000000000000000000000000000000000000000000000000000000001380520000000000000000000000000000000000000000000000000000000000000013905200000000000000000000000000000000000000000000000000000000000000140052000000000000000000000000000000000000000000000000000000000000001410520000000000000000000000000000000000000000000000000000000000000014205200000000000000000000000000000000000000000000000000000000000000143052000000000000000000000000000000000000000000000000000000000000001440520000000000000000000000000000000000000000000000000000000000000014505200000000000000000000000000000000000000000000000000000000000000146052000000000000000000000000000000000000000000000000000000000000001470520000000000000000000000000000000000000000000000000000000000000014805200000000000000000000000000000000000000000000000000000000000000149052000000000000000000000000000000000000000000000000000000000000001500520000000000000000000000000000000000000000000000000000000000000015105200000000000000000000000000000000000000000000000000000000000000152052000000000000000000000000000000000000000000000000000000000000001530520000000000000000000000000000000000000000000000000000000000000015405200000000000000000000000000000000000000000000000000000000000000155052000000000000000000000000000000000000000000000000000000000000001560520000000000000000000000000000000000000000000000000000000000000015705200000000000000000000000000000000000000000000000000000000000000158052000000000000000000000000000000000000000000000000000000000000001590520000000000000000000000000000000000000000000000000000000000000016005200000000000000000000000000000000000000000000000000000000000000161052000000000000000000000000000000000000000000000000000000000000001620520000000000000000000000000000000000000000000000000000000000000016305200000000000000000000000000000000000000000000000000000000000000164052000000000000000000000000000000000000000000000000000000000000001650520000000000000000000000000000000000000000000000000000000000000016605200000000000000000000000000000000000000000000000000000000000000167052000000000000000000000000000000000000000000000000000000000000001680520000000000000000000000000000000000000000000000000000000000000016905200000000000000000000000000000000000000000000000000000000000000170052000000000000000000000000000000000000000000000000000000000000001710520000000000000000000000000000000000000000000000000000000000000017205200000000000000000000000000000000000000000000000000000000000000173052000000000000000000000000000000000000000000000000000000000000001740520000000000000000000000000000000000000000000000000000000000000017505200000000000000000000000000000000000000000000000000000000000000176052000000000000000000000000000000000000000000000000000000000000001770520000000000000000000000000000000000000000000000000000000000000017805200000000000000000000000000000000000000000000000000000000000000179052000000000000000000000000000000000000000000000000000000000000001800520000000000000000000000000000000000000000000000000000000000000018105200000000000000000000000000000000000000000000000000000000000000182052000000000000000000000000000000000000000000000000000000000000001830520000000000000000000000000000000000000000000000000000000000000018405200000000000000000000000000000000000000000000000000000000000000185052000000000000000000000000000000000000000000000000000000000000001860520000000000000000000000000000000000000000000000000000000000000018705200000000000000000000000000000000000000000000000000000000000000188052000000000000000000000000000000000000000000000000000000000000001890520000000000000000000000000000000000000000000000000000000000000019005200000000000000000000000000000000000000000000000000000000000000191052000000000000000000000000000000000000000000000000000000000000001920520000000000000000000000000000000000000000000000000000000000000019305200000000000000000000000000000000000000000000000000000000000000194052000000000000000000000000000000000000000000000000000000000000001950520000000000000000000000000000000000000000000000000000000000000019605200000000000000000000000000000000000000000000000000000000000000197052000000000000000000000000000000000000000000000000000000000000001980520000000000000000000000000000000000000000000000000000000000000019905200000000000000000000000000000000000000000000000000000000000000200052000000000000000000000000000000000000000000000000000000000000002010520000000000000000000000000000000000000000000000000000000000000020205200000000000000000000000000000000000000000000000000000000000000203052000000000000000000000000000000000000000000000000000000000000002040520000000000000000000000000000000000000000000000000000000000000020505200000000000000000000000000000000000000000000000000000000000000206052000000000000000000000000000000000000000000000000000000000000002070520000000000000000000000000000000000000000000000000000000000000020805200000000000000000000000000000000000000000000000000000000000000209052000000000000000000000000000000000000000000000000000000000000002100520000000000000000000000000000000000000000000000000000000000000021105200000000000000000000000000000000000000000000000000000000000000212052000000000000000000000000000000000000000000000000000000000000002130520000000000000000000000000000000000000000000000000000000000000021405200000000000000000000000000000000000000000000000000000000000000215052000000000000000000000000000000000000000000000000000000000000002160520000000000000000000000000000000000000000000000000000000000000021705200000000000000000000000000000000000000000000000000000000000000218052000000000000000000000000000000000000000000000000000000000000002190520000000000000000000000000000000000000000000000000000000000000022005200000000000000000000000000000000000000000000000000000000000000221052000000000000000000000000000000000000000000000000000000000000002220520000000000000000000000000000000000000000000000000000000000000022305200000000000000000000000000000000000000000000000000000000000000224052000000000000000000000000000000000000000000000000000000000000002250520000000000000000000000000000000000000000000000000000000000000022605200000000000000000000000000000000000000000000000000000000000000227052000000000000000000000000000000000000000000000000000000000000002280520000000000000000000000000000000000000000000000000000000000000022905200000000000000000000000000000000000000000000000000000000000000230052000000000000000000000000000000000000000000000000000000000000002310520000000000000000000000000000000000000000000000000000000000000023205200000000000000000000000000000000000000000000000000000000000000233052000000000000000000000000000000000000000000000000000000000000002340520000000000000000000000000000000000000000000000000000000000000023505200000000000000000000000000000000000000000000000000000000000000236052000000000000000000000000000000000000000000000000000000000000002370520000000000000000000000000000000000000000000000000000000000000023805200000000000000000000000000000000000000000000000000000000000000239052000000000000000000000000000000000000000000000000000000000000002400520000000000000000000000000000000000000000000000000000000000000024105200000000000000000000000000000000000000000000000000000000000000242052000000000000000000000000000000000000000000000000000000000000002430520000000000000000000000000000000000000000000000000000000000000024405200000000000000000000000000000000000000000000000000000000000000245052000000000000000000000000000000000000000000000000000000000000002460520000000000000000000000000000000000000000000000000000000000000024705200000000000000000000000000000000000000000000000000000000000000248052000000000000000000000000000000000000000000000000000000000000002490520000000000000000000000000000000000000000000000000000000000000025005200000000000000000000000000000000000000000000000000000000000000251052000000000000000000000000000000000000000000000000000000000000002520520000000000000000000000000000000000000000000000000000000000000025305200000000000000000000000000000000000000000000000000000000000000254052000000000000000000000000000000000000000000000000000000000000002550520000000000000000000000000000000000000000000000000000000000000025605200000000000000000000000000000000000000000000000000000000000000257052000000000000000000000000000000000000000000000000000000000000002580520000000000000000000000000000000000000000000000000000000000000025905200000000000000000000000000000000000000000000000000000000000000260052000000000000000000000000000000000000000000000000000000000000002610520000000000000000000000000000000000000000000000000000000000000026205200000000000000000000000000000000000000000000000000000000000000263052000000000000000000000000000000000000000000000000000000000000002640520000000000000000000000000000000000000000000000000000000000000026505200000000000000000000000000000000000000000000000000000000000000266052000000000000000000000000000000000000000000000000000000000000002670520000000000000000000000000000000000000000000000000000000000000026805200000000000000000000000000000000000000000000000000000000000000269052000000000000000000000000000000000000000000000000000000000000002700520000000000000000000000000000000000000000000000000000000000000027105200000000000000000000000000000000000000000000000000000000000000272052000000000000000000000000000000000000000000000000000000000000002730520000000000000000000000000000000000000000000000000000000000000027405200000000000000000000000000000000000000000000000000000000000000275052000000000000000000000000000000000000000000000000000000000000002760520000000000000000000000000000000000000000000000000000000000000027705200000000000000000000000000000000000000000000000000000000000000278052000000000000000000000000000000000000000000000000000000000000002790520000000000000000000000000000000000000000000000000000000000000028005200000000000000000000000000000000000000000000000000000000000000281052000000000000000000000000000000000000000000000000000000000000002820520000000000000000000000000000000000000000000000000000000000000028305200000000000000000000000000000000000000000000000000000000000000284052000000000000000000000000000000000000000000000000000000000000002850520000000000000000000000000000000000000000000000000000000000000028605200000000000000000000000000000000000000000000000000000000000000287052000000000000000000000000000000000000000000000000000000000000002880520000000000000000000000000000000000000000000000000000000000000028905200000000000000000000000000000000000000000000000000000000000000290052000000000000000000000000000000000000000000000000000000000000002910520000000000000000000000000000000000000000000000000000000000000029205200000000000000000000000000000000000000000000000000000000000000293052000000000000000000000000000000000000000000000000000000000000002940520000000000000000000000000000000000000000000000000000000000000029505200000000000000000000000000000000000000000000000000000000000000296052000000000000000000000000000000000000000000000000000000000000002970520000000000000000000000000000000000000000000000000000000000000029805200000000000000000000000000000000000000000000000000000000000000299052000000000000000000000000000000000000000000000000000000000000003000520000000000000000000000000000000000000000000000000000000000000030105200000000000000000000000000000000000000000000000000000000000000302052000000000000000000000000000000000000000000000000000000000000003030520000000000000000000000000000000000000000000000000000000000000030405200000000000000000000000000000000000000000000000000000000000000305052000000000000000000000000000000000000000000000000000000000000003060520000000000000000000000000000000000000000000000000000000000000030705200000000000000000000000000000000000000000000000000000000000000308052000000000000000000000000000000000000000000000000000000000000003090520000000000000000000000000000000000000000000000000000000000000031005200000000000000000000000000000000000000000000000000000000000000311052000000000000000000000000000000000000000000000000000000000000003120520000000000000000000000000000000000000000000000000000000000000031305200000000000000000000000000000000000000000000000000000000000000314052000000000000000000000000000000000000000000000000000000000000003150520000000000000000000000000000000000000000000000000000000000000031605200000000000000000000000000000000000000000000000000000000000000317052000000000000000000000000000000000000000000000000000000000000003180520000000000000000000000000000000000000000000000000000000000000031905200000000000000000000000000000000000000000000000000000000000000320052000000000000000000000000000000000000000000000000000000000000003210520000000000000000000000000000000000000000000000000000000000000032205200000000000000000000000000000000000000000000000000000000000000323052000000000000000000000000000000000000000000000000000000000000003240520000000000000000000000000000000000000000000000000000000000000032505200000000000000000000000000000000000000000000000000000000000000326052000000000000000000000000000000000000000000000000000000000000003270520000000000000000000000000000000000000000000000000000000000000032805200000000000000000000000000000000000000000000000000000000000000329052000000000000000000000000000000000000000000000000000000000000003300520000000000000000000000000000000000000000000000000000000000000033105200000000000000000000000000000000000000000000000000000000000000332052000000000000000000000000000000000000000000000000000000000000003330520000000000000000000000000000000000000000000000000000000000000033405200000000000000000000000000000000000000000000000000000000000000335052000000000000000000000000000000000000000000000000000000000000003360520000000000000000000000000000000000000000000000000000000000000033705200000000000000000000000000000000000000000000000000000000000000338052000000000000000000000000000000000000000000000000000000000000003390520000000000000000000000000000000000000000000000000000000000000034005200000000000000000000000000000000000000000000000000000000000000341052000000000000000000000000000000000000000000000000000000000000003420520000000000000000000000000000000000000000000000000000000000000034305200000000000000000000000000000000000000000000000000000000000000344052000000000000000000000000000000000000000000000000000000000000003450520000000000000000000000000000000000000000000000000000000000000034605200000000000000000000000000000000000000000000000000000000000000347052000000000000000000000000000000000000000000000000000000000000003480520000000000000000000000000000000000000000000000000000000000000034905200000000000000000000000000000000000000000000000000000000000000350052000000000000000000000000000000000000000000000000000000000000003510520000000000000000000000000000000000000000000000000000000000000035205200000000000000000000000000000000000000000000000000000000000000353052000000000000000000000000000000000000000000000000000000000000003540520000000000000000000000000000000000000000000000000000000000000035505200000000000000000000000000000000000000000000000000000000000000356052000000000000000000000000000000000000000000000000000000000000003570520000000000000000000000000000000000000000000000000000000000000035805200000000000000000000000000000000000000000000000000000000000000359052000000000000000000000000000000000000000000000000000000000000003600520000000000000000000000000000000000000000000000000000000000000036105200000000000000000000000000000000000000000000000000000000000000362052000000000000000000000000000000000000000000000000000000000000003630520000000000000000000000000000000000000000000000000000000000000036405200000000000000000000000000000000000000000000000000000000000000365052000000000000000000000000000000000000000000000000000000000000003660520000000000000000000000000000000000000000000000000000000000000036705200000000000000000000000000000000000000000000000000000000000000368052000000000000000000000000000000000000000000000000000000000000003690520000000000000000000000000000000000000000000000000000000000000037005200000000000000000000000000000000000000000000000000000000000000371052000000000000000000000000000000000000000000000000000000000000003720520000000000000000000000000000000000000000000000000000000000000037305200000000000000000000000000000000000000000000000000000000000000374052000000000000000000000000000000000000000000000000000000000000003750520000000000000000000000000000000000000000000000000000000000000037605200000000000000000000000000000000000000000000000000000000000000377052000000000000000000000000000000000000000000000000000000000000003780520000000000000000000000000000000000000000000000000000000000000037905200000000000000000000000000000000000000000000000000000000000000380052000000000000000000000000000000000000000000000000000000000000003810520000000000000000000000000000000000000000000000000000000000000038205200000000000000000000000000000000000000000000000000000000000000383052000000000000000000000000000000000000000000000000000000000000003840520000000000000000000000000000000000000000000000000000000000000038505200000000000000000000000000000000000000000000000000000000000000386052000000000000000000000000000000000000000000000000000000000000003870520000000000000000000000000000000000000000000000000000000000000038805200000000000000000000000000000000000000000000000000000000000000389052000000000000000000000000000000000000000000000000000000000000003900520000000000000000000000000000000000000000000000000000000000000039105200000000000000000000000000000000000000000000000000000000000000392052000000000000000000000000000000000000000000000000000000000000003930520000000000000000000000000000000000000000000000000000000000000039405200000000000000000000000000000000000000000000000000000000000000395052000000000000000000000000000000000000000000000000000000000000003960520000000000000000000000000000000000000000000000000000000000000039705200000000000000000000000000000000000000000000000000000000000000398052000000000000000000000000000000000000000000000000000000000000003990520000000000000000000000000000000000000000000000000000000000000040005200000000000000000000000000000000000000000000000000000000000000401052000000000000000000000000000000000000000000000000000000000000004020520000000000000000000000000000000000000000000000000000000000000040305200000000000000000000000000000000000000000000000000000000000000404052000000000000000000000000000000000000000000000000000000000000004050520000000000000000000000000000000000000000000000000000000000000040605200000000000000000000000000000000000000000000000000000000000000407052000000000000000000000000000000000000000000000000000000000000004080520000000000000000000000000000000000000000000000000000000000000040905200000000000000000000000000000000000000000000000000000000000000410052000000000000000000000000000000000000000000000000000000000000004110520000000000000000000000000000000000000000000000000000000000000041205200000000000000000000000000000000000000000000000000000000000000413052000000000000000000000000000000000000000000000000000000000000004140520000000000000000000000000000000000000000000000000000000000000041505200000000000000000000000000000000000000000000000000000000000000416052000000000000000000000000000000000000000000000000000000000000004170520000000000000000000000000000000000000000000000000000000000000041805200000000000000000000000000000000000000000000000000000000000000419052000000000000000000000000000000000000000000000000000000000000004200520000000000000000000000000000000000000000000000000000000000000042105200000000000000000000000000000000000000000000000000000000000000422052000000000000000000000000000000000000000000000000000000000000004230520000000000000000000000000000000000000000000000000000000000000042405200000000000000000000000000000000000000000000000000000000000000425052000000000000000000000000000000000000000000000000000000000000004260520000000000000000000000000000000000000000000000000000000000000042705200000000000000000000000000000000000000000000000000000000000000428052000000000000000000000000000000000000000000000000000000000000004290520000000000000000000000000000000000000000000000000000000000000043005200000000000000000000000000000000000000000000000000000000000000431052000000000000000000000000000000000000000000000000000000000000004320520000000000000000000000000000000000000000000000000000000000000043305200000000000000000000000000000000000000000000000000000000000000434052000000000000000000000000000000000000000000000000000000000000004350520000000000000000000000000000000000000000000000000000000000000043605200000000000000000000000000000000000000000000000000000000000000437052000000000000000000000000000000000000000000000000000000000000004380520000000000000000000000000000000000000000000000000000000000000043905200000000000000000000000000000000000000000000000000000000000000440052000000000000000000000000000000000000000000000000000000000000004410520000000000000000000000000000000000000000000000000000000000000044205200000000000000000000000000000000000000000000000000000000000000443052000000000000000000000000000000000000000000000000000000000000004440520000000000000000000000000000000000000000000000000000000000000044505200000000000000000000000000000000000000000000000000000000000000446052000000000000000000000000000000000000000000000000000000000000004470520000000000000000000000000000000000000000000000000000000000000044805200000000000000000000000000000000000000000000000000000000000000449052000000000000000000000000000000000000000000000000000000000000004500520000000000000000000000000000000000000000000000000000000000000045105200000000000000000000000000000000000000000000000000000000000000452052000000000000000000000000000000000000000000000000000000000000004530520000000000000000000000000000000000000000000000000000000000000045405200000000000000000000000000000000000000000000000000000000000000455052000000000000000000000000000000000000000000000000000000000000004560520000000000000000000000000000000000000000000000000000000000000045705200000000000000000000000000000000000000000000000000000000000000458052000000000000000000000000000000000000000000000000000000000000004590520000000000000000000000000000000000000000000000000000000000000046005200000000000000000000000000000000000000000000000000000000000000461052000000000000000000000000000000000000000000000000000000000000004620520000000000000000000000000000000000000000000000000000000000000046305200000000000000000000000000000000000000000000000000000000000000464052000000000000000000000000000000000000000000000000000000000000004650520000000000000000000000000000000000000000000000000000000000000046605200000000000000000000000000000000000000000000000000000000000000467052000000000000000000000000000000000000000000000000000000000000004680520000000000000000000000000000000000000000000000000000000000000046905200000000000000000000000000000000000000000000000000000000000000470052000000000000000000000000000000000000000000000000000000000000004710520000000000000000000000000000000000000000000000000000000000000047205200000000000000000000000000000000000000000000000000000000000000473052000000000000000000000000000000000000000000000000000000000000004740520000000000000000000000000000000000000000000000000000000000000047505200000000000000000000000000000000000000000000000000000000000000476052000000000000000000000000000000000000000000000000000000000000004770520000000000000000000000000000000000000000000000000000000000000047805200000000000000000000000000000000000000000000000000000000000000479052000000000000000000000000000000000000000000000000000000000000004800520000000000000000000000000000000000000000000000000000000000000048105200000000000000000000000000000000000000000000000000000000000000482052000000000000000000000000000000000000000000000000000000000000004830520000000000000000000000000000000000000000000000000000000000000048405200000000000000000000000000000000000000000000000000000000000000485052000000000000000000000000000000000000000000000000000000000000004860520000000000000000000000000000000000000000000000000000000000000048705200000000000000000000000000000000000000000000000000000000000000488052000000000000000000000000000000000000000000000000000000000000004890520000000000000000000000000000000000000000000000000000000000000049005200000000000000000000000000000000000000000000000000000000000000491052000000000000000000000000000000000000000000000000000000000000004920520000000000000000000000000000000000000000000000000000000000000049305200000000000000000000000000000000000000000000000000000000000000494052000000000000000000000000000000000000000000000000000000000000004950520000000000000000000000000000000000000000000000000000000000000049605200000000000000000000000000000000000000000000000000000000000000497052000000000000000000000000000000000000000000000000000000000000004980520000000000000000000000000000000000000000000000000000000000000049905200000000000000000000000000000000000000000000000000000000000000500052000000000000000000000000000000000000000000000000000000000000005010520000000000000000000000000000000000000000000000000000000000000050205200000000000000000000000000000000000000000000000000000000000000503052000000000000000000000000000000000000000000000000000000000000005040520000000000000000000000000000000000000000000000000000000000000050505200000000000000000000000000000000000000000000000000000000000000506052000000000000000000000000000000000000000000000000000000000000005070520000000000000000000000000000000000000000000000000000000000000050805200000000000000000000000000000000000000000000000000000000000000509052000000000000000000000000000000000000000000000000000000000000005100520000000000000000000000000000000000000000000000000000000000000051105200000000000000000000000000000000000000000000000000000000000000512052000000000000000000000000000000000000000000000000000000000000005130520000000000000000000000000000000000000000000000000000000000000051405200000000000000000000000000000000000000000000000000000000000000515052000000000000000000000000000000000000000000000000000000000000005160520000000000000000000000000000000000000000000000000000000000000051705200000000000000000000000000000000000000000000000000000000000000518052000000000000000000000000000000000000000000000000000000000000005190520000000000000000000000000000000000000000000000000000000000000052005200000000000000000000000000000000000000000000000000000000000000521052000000000000000000000000000000000000000000000000000000000000005220520000000000000000000000000000000000000000000000000000000000000052305200000000000000000000000000000000000000000000000000000000000000524052000000000000000000000000000000000000000000000000000000000000005250520000000000000000000000000000000000000000000000000000000000000052605200000000000000000000000000000000000000000000000000000000000000527052000000000000000000000000000000000000000000000000000000000000005280520000000000000000000000000000000000000000000000000000000000000052905200000000000000000000000000000000000000000000000000000000000000530052000000000000000000000000000000000000000000000000000000000000005310520000000000000000000000000000000000000000000000000000000000000053205200000000000000000000000000000000000000000000000000000000000000533052000000000000000000000000000000000000000000000000000000000000005340520000000000000000000000000000000000000000000000000000000000000053505200000000000000000000000000000000000000000000000000000000000000536052000000000000000000000000000000000000000000000000000000000000005370520000000000000000000000000000000000000000000000000000000000000053805200000000000000000000000000000000000000000000000000000000000000539052000000000000000000000000000000000000000000000000000000000000005400520000000000000000000000000000000000000000000000000000000000000054105200000000000000000000000000000000000000000000000000000000000000542052000000000000000000000000000000000000000000000000000000000000005430520000000000000000000000000000000000000000000000000000000000000054405200000000000000000000000000000000000000000000000000000000000000545052000000000000000000000000000000000000000000000000000000000000005460520000000000000000000000000000000000000000000000000000000000000054705200000000000000000000000000000000000000000000000000000000000000548052000000000000000000000000000000000000000000000000000000000000005490520000000000000000000000000000000000000000000000000000000000000055005200000000000000000000000000000000000000000000000000000000000000551052000000000000000000000000000000000000000000000000000000000000005520520000000000000000000000000000000000000000000000000000000000000055305200000000000000000000000000000000000000000000000000000000000000554052000000000000000000000000000000000000000000000000000000000000005550520000000000000000000000000000000000000000000000000000000000000055605200000000000000000000000000000000000000000000000000000000000000557052000000000000000000000000000000000000000000000000000000000000005580520000000000000000000000000000000000000000000000000000000000000055905200000000000000000000000000000000000000000000000000000000000000560052000000000000000000000000000000000000000000000000000000000000005610520000000000000000000000000000000000000000000000000000000000000056205200000000000000000000000000000000000000000000000000000000000000563052000000000000000000000000000000000000000000000000000000000000005640520000000000000000000000000000000000000000000000000000000000000056505200000000000000000000000000000000000000000000000000000000000000566052000000000000000000000000000000000000000000000000000000000000005670520000000000000000000000000000000000000000000000000000000000000056805200000000000000000000000000000000000000000000000000000000000000569052000000000000000000000000000000000000000000000000000000000000005700520000000000000000000000000000000000000000000000000000000000000057105200000000000000000000000000000000000000000000000000000000000000572052000000000000000000000000000000000000000000000000000000000000005730520000000000000000000000000000000000000000000000000000000000000057405200000000000000000000000000000000000000000000000000000000000000575052000000000000000000000000000000000000000000000000000000000000005760520000000000000000000000000000000000000000000000000000000000000057705200000000000000000000000000000000000000000000000000000000000000578052000000000000000000000000000000000000000000000000000000000000005790520000000000000000000000000000000000000000000000000000000000000058005200000000000000000000000000000000000000000000000000000000000000581052000000000000000000000000000000000000000000000000000000000000005820520000000000000000000000000000000000000000000000000000000000000058305200000000000000000000000000000000000000000000000000000000000000584052000000000000000000000000000000000000000000000000000000000000005850520000000000000000000000000000000000000000000000000000000000000058605200000000000000000000000000000000000000000000000000000000000000587052000000000000000000000000000000000000000000000000000000000000005880520000000000000000000000000000000000000000000000000000000000000058905200000000000000000000000000000000000000000000000000000000000000590052000000000000000000000000000000000000000000000000000000000000005910520000000000000000000000000000000000000000000000000000000000000059205200000000000000000000000000000000000000000000000000000000000000593052000000000000000000000000000000000000000000000000000000000000005940520000000000000000000000000000000000000000000000000000000000000059505200000000000000000000000000000000000000000000000000000000000000596052000000000000000000000000000000000000000000000000000000000000005970520000000000000000000000000000000000000000000000000000000000000059805200000000000000000000000000000000000000000000000000000000000000599052000000000000000000000000000000000000000000000000000000000000006000520000000000000000000000000000000000000000000000000000000000000060105200000000000000000000000000000000000000000000000000000000000000602052000000000000000000000000000000000000000000000000000000000000006030520000000000000000000000000000000000000000000000000000000000000060405200000000000000000000000000000000000000000000000000000000000000605052000000000000000000000000000000000000000000000000000000000000006060520000000000000000000000000000000000000000000000000000000000000060705200000000000000000000000000000000000000000000000000000000000000608052000000000000000000000000000000000000000000000000000000000000006090520000000000000000000000000000000000000000000000000000000000000061005200000000000000000000000000000000000000000000000000000000000000611052000000000000000000000000000000000000000000000000000000000000006120520000000000000000000000000000000000000000000000000000000000000061305200000000000000000000000000000000000000000000000000000000000000614052000000000000000000000000000000000000000000000000000000000000006150520000000000000000000000000000000000000000000000000000000000000061605200000000000000000000000000000000000000000000000000000000000000617052000000000000000000000000000000000000000000000000000000000000006180520000000000000000000000000000000000000000000000000000000000000061905200000000000000000000000000000000000000000000000000000000000000620052000000000000000000000000000000000000000000000000000000000000006210520000000000000000000000000000000000000000000000000000000000000062205200000000000000000000000000000000000000000000000000000000000000623052000000000000000000000000000000000000000000000000000000000000006240520000000000000000000000000000000000000000000000000000000000000062505200000000000000000000000000000000000000000000000000000000000000626052000000000000000000000000000000000000000000000000000000000000006270520000000000000000000000000000000000000000000000000000000000000062805200000000000000000000000000000000000000000000000000000000000000629052000000000000000000000000000000000000000000000000000000000000006300520000000000000000000000000000000000000000000000000000000000000063105200000000000000000000000000000000000000000000000000000000000000632052000000000000000000000000000000000000000000000000000000000000006330520000000000000000000000000000000000000000000000000000000000000063405200000000000000000000000000000000000000000000000000000000000000635052000000000000000000000000000000000000000000000000000000000000006360520000000000000000000000000000000000000000000000000000000000000063705200000000000000000000000000000000000000000000000000000000000000638052000000000000000000000000000000000000000000000000000000000000006390520000000000000000000000000000000000000000000000000000000000000064005200000000000000000000000000000000000000000000000000000000000000641052000000000000000000000000000000000000000000000000000000000000006420520000000000000000000000000000000000000000000000000000000000000064305200000000000000000000000000000000000000000000000000000000000000644052000000000000000000000000000000000000000000000000000000000000006450520000000000000000000000000000000000000000000000000000000000000064605200000000000000000000000000000000000000000000000000000000000000647052000000000000000000000000000000000000000000000000000000000000006480520000000000000000000000000000000000000000000000000000000000000064905200000000000000000000000000000000000000000000000000000000000000650052000000000000000000000000000000000000000000000000000000000000006510520000000000000000000000000000000000000000000000000000000000000065205200000000000000000000000000000000000000000000000000000000000000653052000000000000000000000000000000000000000000000000000000000000006540520000000000000000000000000000000000000000000000000000000000000065505200000000000000000000000000000000000000000000000000000000000000656052000000000000000000000000000000000000000000000000000000000000006570520000000000000000000000000000000000000000000000000000000000000065805200000000000000000000000000000000000000000000000000000000000000659052000000000000000000000000000000000000000000000000000000000000006600520000000000000000000000000000000000000000000000000000000000000066105200000000000000000000000000000000000000000000000000000000000000662052000000000000000000000000000000000000000000000000000000000000006630520000000000000000000000000000000000000000000000000000000000000066405200000000000000000000000000000000000000000000000000000000000000665052000000000000000000000000000000000000000000000000000000000000006660520000000000000000000000000000000000000000000000000000000000000066705200000000000000000000000000000000000000000000000000000000000000668052000000000000000000000000000000000000000000000000000000000000006690520000000000000000000000000000000000000000000000000000000000000067005200000000000000000000000000000000000000000000000000000000000000671052000000000000000000000000000000000000000000000000000000000000006720520000000000000000000000000000000000000000000000000000000000000067305200000000000000000000000000000000000000000000000000000000000000674052000000000000000000000000000000000000000000000000000000000000006750520000000000000000000000000000000000000000000000000000000000000067605200000000000000000000000000000000000000000000000000000000000000677052000000000000000000000000000000000000000000000000000000000000006780520000000000000000000000000000000000000000000000000000000000000067905200000000000000000000000000000000000000000000000000000000000000680052000000000000000000000000000000000000000000000000000000000000006810520000000000000000000000000000000000000000000000000000000000000068205200000000000000000000000000000000000000000000000000000000000000683052000000000000000000000000000000000000000000000000000000000000006840520000000000000000000000000000000000000000000000000000000000000068505200000000000000000000000000000000000000000000000000000000000000686052000000000000000000000000000000000000000000000000000000000000006870520000000000000000000000000000000000000000000000000000000000000068805200000000000000000000000000000000000000000000000000000000000000689052000000000000000000000000000000000000000000000000000000000000006900520000000000000000000000000000000000000000000000000000000000000069105200000000000000000000000000000000000000000000000000000000000000692052000000000000000000000000000000000000000000000000000000000000006930520000000000000000000000000000000000000000000000000000000000000069405200000000000000000000000000000000000000000000000000000000000000695052000000000000000000000000000000000000000000000000000000000000006960520000000000000000000000000000000000000000000000000000000000000069705200000000000000000000000000000000000000000000000000000000000000698052000000000000000000000000000000000000000000000000000000000000006990520000000000000000000000000000000000000000000000000000000000000070005200000000000000000000000000000000000000000000000000000000000000701052000000000000000000000000000000000000000000000000000000000000007020520000000000000000000000000000000000000000000000000000000000000070305200000000000000000000000000000000000000000000000000000000000000704052000000000000000000000000000000000000000000000000000000000000007050520000000000000000000000000000000000000000000000000000000000000070605200000000000000000000000000000000000000000000000000000000000000707052000000000000000000000000000000000000000000000000000000000000007080520000000000000000000000000000000000000000000000000000000000000070905200000000000000000000000000000000000000000000000000000000000000710052000000000000000000000000000000000000000000000000000000000000007110520000000000000000000000000000000000000000000000000000000000000071205200000000000000000000000000000000000000000000000000000000000000713052000000000000000000000000000000000000000000000000000000000000007140520000000000000000000000000000000000000000000000000000000000000071505200000000000000000000000000000000000000000000000000000000000000716052000000000000000000000000000000000000000000000000000000000000007170520000000000000000000000000000000000000000000000000000000000000071805200000000000000000000000000000000000000000000000000000000000000719052000000000000000000000000000000000000000000000000000000000000007200520000000000000000000000000000000000000000000000000000000000000072105200000000000000000000000000000000000000000000000000000000000000722052000000000000000000000000000000000000000000000000000000000000007230520000000000000000000000000000000000000000000000000000000000000072405200000000000000000000000000000000000000000000000000000000000000725052000000000000000000000000000000000000000000000000000000000000007260520000000000000000000000000000000000000000000000000000000000000072705200000000000000000000000000000000000000000000000000000000000000728052000000000000000000000000000000000000000000000000000000000000007290520000000000000000000000000000000000000000000000000000000000000073005200000000000000000000000000000000000000000000000000000000000000731052000000000000000000000000000000000000000000000000000000000000007320520000000000000000000000000000000000000000000000000000000000000073305200000000000000000000000000000000000000000000000000000000000000734052000000000000000000000000000000000000000000000000000000000000007350520000000000000000000000000000000000000000000000000000000000000073605200000000000000000000000000000000000000000000000000000000000000737052000000000000000000000000000000000000000000000000000000000000007380520000000000000000000000000000000000000000000000000000000000000073905200000000000000000000000000000000000000000000000000000000000000740052000000000000000000000000000000000000000000000000000000000000007410520000000000000000000000000000000000000000000000000000000000000074205200000000000000000000000000000000000000000000000000000000000000743052000000000000000000000000000000000000000000000000000000000000007440520000000000000000000000000000000000000000000000000000000000000074505200000000000000000000000000000000000000000000000000000000000000746052000000000000000000000000000000000000000000000000000000000000007470520000000000000000000000000000000000000000000000000000000000000074805200000000000000000000000000000000000000000000000000000000000000749052000000000000000000000000000000000000000000000000000000000000007500520000000000000000000000000000000000000000000000000000000000000075105200000000000000000000000000000000000000000000000000000000000000752052000000000000000000000000000000000000000000000000000000000000007530520000000000000000000000000000000000000000000000000000000000000075405200000000000000000000000000000000000000000000000000000000000000755052000000000000000000000000000000000000000000000000000000000000007560520000000000000000000000000000000000000000000000000000000000000075705200000000000000000000000000000000000000000000000000000000000000758052000000000000000000000000000000000000000000000000000000000000007590520000000000000000000000000000000000000000000000000000000000000076005200000000000000000000000000000000000000000000000000000000000000761052000000000000000000000000000000000000000000000000000000000000007620520000000000000000000000000000000000000000000000000000000000000076305200000000000000000000000000000000000000000000000000000000000000764052000000000000000000000000000000000000000000000000000000000000007650520000000000000000000000000000000000000000000000000000000000000076605200000000000000000000000000000000000000000000000000000000000000767052000000000000000000000000000000000000000000000000000000000000007680520000000000000000000000000000000000000000000000000000000000000076905200000000000000000000000000000000000000000000000000000000000000770052000000000000000000000000000000000000000000000000000000000000007710520000000000000000000000000000000000000000000000000000000000000077205200000000000000000000000000000000000000000000000000000000000000773052000000000000000000000000000000000000000000000000000000000000007740520000000000000000000000000000000000000000000000000000000000000077505200000000000000000000000000000000000000000000000000000000000000776052000000000000000000000000000000000000000000000000000000000000007770520000000000000000000000000000000000000000000000000000000000000077805200000000000000000000000000000000000000000000000000000000000000779052000000000000000000000000000000000000000000000000000000000000007800520000000000000000000000000000000000000000000000000000000000000078105200000000000000000000000000000000000000000000000000000000000000782052000000000000000000000000000000000000000000000000000000000000007830520000000000000000000000000000000000000000000000000000000000000078405200000000000000000000000000000000000000000000000000000000000000785052000000000000000000000000000000000000000000000000000000000000007860520000000000000000000000000000000000000000000000000000000000000078705200000000000000000000000000000000000000000000000000000000000000788052000000000000000000000000000000000000000000000000000000000000007890520000000000000000000000000000000000000000000000000000000000000079005200000000000000000000000000000000000000000000000000000000000000791052000000000000000000000000000000000000000000000000000000000000007920520000000000000000000000000000000000000000000000000000000000000079305200000000000000000000000000000000000000000000000000000000000000794052000000000000000000000000000000000000000000000000000000000000007950520000000000000000000000000000000000000000000000000000000000000079605200000000000000000000000000000000000000000000000000000000000000797052000000000000000000000000000000000000000000000000000000000000007980520000000000000000000000000000000000000000000000000000000000000079905200000000000000000000000000000000000000000000000000000000000000800052000000000000000000000000000000000000000000000000000000000000008010520000000000000000000000000000000000000000000000000000000000000080205200000000000000000000000000000000000000000000000000000000000000803052000000000000000000000000000000000000000000000000000000000000008040520000000000000000000000000000000000000000000000000000000000000080505200000000000000000000000000000000000000000000000000000000000000806052000000000000000000000000000000000000000000000000000000000000008070520000000000000000000000000000000000000000000000000000000000000080805200000000000000000000000000000000000000000000000000000000000000809052000000000000000000000000000000000000000000000000000000000000008100520000000000000000000000000000000000000000000000000000000000000081105200000000000000000000000000000000000000000000000000000000000000812052000000000000000000000000000000000000000000000000000000000000008130520000000000000000000000000000000000000000000000000000000000000081405200000000000000000000000000000000000000000000000000000000000000815052000000000000000000000000000000000000000000000000000000000000008160520000000000000000000000000000000000000000000000000000000000000081705200000000000000000000000000000000000000000000000000000000000000818052000000000000000000000000000000000000000000000000000000000000008190520000000000000000000000000000000000000000000000000000000000000082005200000000000000000000000000000000000000000000000000000000000000821052000000000000000000000000000000000000000000000000000000000000008220520000000000000000000000000000000000000000000000000000000000000082305200000000000000000000000000000000000000000000000000000000000000824052000000000000000000000000000000000000000000000000000000000000008250520000000000000000000000000000000000000000000000000000000000000082605200000000000000000000000000000000000000000000000000000000000000827052000000000000000000000000000000000000000000000000000000000000008280520000000000000000000000000000000000000000000000000000000000000082905200000000000000000000000000000000000000000000000000000000000000830052000000000000000000000000000000000000000000000000000000000000008310520000000000000000000000000000000000000000000000000000000000000083205200000000000000000000000000000000000000000000000000000000000000833052000000000000000000000000000000000000000000000000000000000000008340520000000000000000000000000000000000000000000000000000000000000083505200000000000000000000000000000000000000000000000000000000000000836052000000000000000000000000000000000000000000000000000000000000008370520000000000000000000000000000000000000000000000000000000000000083805200000000000000000000000000000000000000000000000000000000000000839052000000000000000000000000000000000000000000000000000000000000008400520000000000000000000000000000000000000000000000000000000000000084105200000000000000000000000000000000000000000000000000000000000000842052000000000000000000000000000000000000000000000000000000000000008430520000000000000000000000000000000000000000000000000000000000000084405200000000000000000000000000000000000000000000000000000000000000845052000000000000000000000000000000000000000000000000000000000000008460520000000000000000000000000000000000000000000000000000000000000084705200000000000000000000000000000000000000000000000000000000000000848052000000000000000000000000000000000000000000000000000000000000008490520000000000000000000000000000000000000000000000000000000000000085005200000000000000000000000000000000000000000000000000000000000000851052000000000000000000000000000000000000000000000000000000000000008520520000000000000000000000000000000000000000000000000000000000000085305200000000000000000000000000000000000000000000000000000000000000854052000000000000000000000000000000000000000000000000000000000000008550520000000000000000000000000000000000000000000000000000000000000085605200000000000000000000000000000000000000000000000000000000000000857052000000000000000000000000000000000000000000000000000000000000008580520000000000000000000000000000000000000000000000000000000000000085905200000000000000000000000000000000000000000000000000000000000000860052000000000000000000000000000000000000000000000000000000000000008610520000000000000000000000000000000000000000000000000000000000000086205200000000000000000000000000000000000000000000000000000000000000863052000000000000000000000000000000000000000000000000000000000000008640520000000000000000000000000000000000000000000000000000000000000086505200000000000000000000000000000000000000000000000000000000000000866052000000000000000000000000000000000000000000000000000000000000008670520000000000000000000000000000000000000000000000000000000000000086805200000000000000000000000000000000000000000000000000000000000000869052000000000000000000000000000000000000000000000000000000000000008700520000000000000000000000000000000000000000000000000000000000000087105200000000000000000000000000000000000000000000000000000000000000872052000000000000000000000000000000000000000000000000000000000000008730520000000000000000000000000000000000000000000000000000000000000087405200000000000000000000000000000000000000000000000000000000000000875052000000000000000000000000000000000000000000000000000000000000008760520000000000000000000000000000000000000000000000000000000000000087705200000000000000000000000000000000000000000000000000000000000000878052000000000000000000000000000000000000000000000000000000000000008790520000000000000000000000000000000000000000000000000000000000000088005200000000000000000000000000000000000000000000000000000000000000881052000000000000000000000000000000000000000000000000000000000000008820520000000000000000000000000000000000000000000000000000000000000088305200000000000000000000000000000000000000000000000000000000000000884052000000000000000000000000000000000000000000000000000000000000008850520000000000000000000000000000000000000000000000000000000000000088605200000000000000000000000000000000000000000000000000000000000000887052000000000000000000000000000000000000000000000000000000000000008880520000000000000000000000000000000000000000000000000000000000000088905200000000000000000000000000000000000000000000000000000000000000890052000000000000000000000000000000000000000000000000000000000000008910520000000000000000000000000000000000000000000000000000000000000089205200000000000000000000000000000000000000000000000000000000000000893052000000000000000000000000000000000000000000000000000000000000008940520000000000000000000000000000000000000000000000000000000000000089505200000000000000000000000000000000000000000000000000000000000000896052000000000000000000000000000000000000000000000000000000000000008970520000000000000000000000000000000000000000000000000000000000000089805200000000000000000000000000000000000000000000000000000000000000899052000000000000000000000000000000000000000000000000000000000000009000520000000000000000000000000000000000000000000000000000000000000090105200000000000000000000000000000000000000000000000000000000000000902052000000000000000000000000000000000000000000000000000000000000009030520000000000000000000000000000000000000000000000000000000000000090405200000000000000000000000000000000000000000000000000000000000000905052000000000000000000000000000000000000000000000000000000000000009060520000000000000000000000000000000000000000000000000000000000000090705200000000000000000000000000000000000000000000000000000000000000908052000000000000000000000000000000000000000000000000000000000000009090520000000000000000000000000000000000000000000000000000000000000091005200000000000000000000000000000000000000000000000000000000000000911052000000000000000000000000000000000000000000000000000000000000009120520000000000000000000000000000000000000000000000000000000000000091305200000000000000000000000000000000000000000000000000000000000000914052000000000000000000000000000000000000000000000000000000000000009150520000000000000000000000000000000000000000000000000000000000000091605200000000000000000000000000000000000000000000000000000000000000917052000000000000000000000000000000000000000000000000000000000000009180520000000000000000000000000000000000000000000000000000000000000091905200000000000000000000000000000000000000000000000000000000000000920052000000000000000000000000000000000000000000000000000000000000009210520000000000000000000000000000000000000000000000000000000000000092205200000000000000000000000000000000000000000000000000000000000000923052000000000000000000000000000000000000000000000000000000000000009240520000000000000000000000000000000000000000000000000000000000000092505200000000000000000000000000000000000000000000000000000000000000926052000000000000000000000000000000000000000000000000000000000000009270520000000000000000000000000000000000000000000000000000000000000092805200000000000000000000000000000000000000000000000000000000000000929052000000000000000000000000000000000000000000000000000000000000009300520000000000000000000000000000000000000000000000000000000000000093105200000000000000000000000000000000000000000000000000000000000000932052000000000000000000000000000000000000000000000000000000000000009330520000000000000000000000000000000000000000000000000000000000000093405200000000000000000000000000000000000000000000000000000000000000935052000000000000000000000000000000000000000000000000000000000000009360520000000000000000000000000000000000000000000000000000000000000093705200000000000000000000000000000000000000000000000000000000000000938052000000000000000000000000000000000000000000000000000000000000009390520000000000000000000000000000000000000000000000000000000000000094005200000000000000000000000000000000000000000000000000000000000000941052000000000000000000000000000000000000000000000000000000000000009420520000000000000000000000000000000000000000000000000000000000000094305200000000000000000000000000000000000000000000000000000000000000944052000000000000000000000000000000000000000000000000000000000000009450520000000000000000000000000000000000000000000000000000000000000094605200000000000000000000000000000000000000000000000000000000000000947052000000000000000000000000000000000000000000000000000000000000009480520000000000000000000000000000000000000000000000000000000000000094905200000000000000000000000000000000000000000000000000000000000000950052000000000000000000000000000000000000000000000000000000000000009510520000000000000000000000000000000000000000000000000000000000000095205200000000000000000000000000000000000000000000000000000000000000953052000000000000000000000000000000000000000000000000000000000000009540520000000000000000000000000000000000000000000000000000000000000095505200000000000000000000000000000000000000000000000000000000000000956052000000000000000000000000000000000000000000000000000000000000009570520000000000000000000000000000000000000000000000000000000000000095805200000000000000000000000000000000000000000000000000000000000000959052000000000000000000000000000000000000000000000000000000000000009600520000000000000000000000000000000000000000000000000000000000000096105200000000000000000000000000000000000000000000000000000000000000962052000000000000000000000000000000000000000000000000000000000000009630520000000000000000000000000000000000000000000000000000000000000096405200000000000000000000000000000000000000000000000000000000000000965052000000000000000000000000000000000000000000000000000000000000009660520000000000000000000000000000000000000000000000000000000000000096705200000000000000000000000000000000000000000000000000000000000000968052000000000000000000000000000000000000000000000000000000000000009690520000000000000000000000000000000000000000000000000000000000000097005200000000000000000000000000000000000000000000000000000000000000971052000000000000000000000000000000000000000000000000000000000000009720520000000000000000000000000000000000000000000000000000000000000097305200000000000000000000000000000000000000000000000000000000000000974052000000000000000000000000000000000000000000000000000000000000009750520000000000000000000000000000000000000000000000000000000000000097605200000000000000000000000000000000000000000000000000000000000000977052000000000000000000000000000000000000000000000000000000000000009780520000000000000000000000000000000000000000000000000000000000000097905200000000000000000000000000000000000000000000000000000000000000980052000000000000000000000000000000000000000000000000000000000000009810520000000000000000000000000000000000000000000000000000000000000098205200000000000000000000000000000000000000000000000000000000000000983052000000000000000000000000000000000000000000000000000000000000009840520000000000000000000000000000000000000000000000000000000000000098505200000000000000000000000000000000000000000000000000000000000000986052000000000000000000000000000000000000000000000000000000000000009870520000000000000000000000000000000000000000000000000000000000000098805200000000000000000000000000000000000000000000000000000000000000989052000000000000000000000000000000000000000000000000000000000000009900520000000000000000000000000000000000000000000000000000000000000099105200000000000000000000000000000000000000000000000000000000000000992052000000000000000000000000000000000000000000000000000000000000009930520000000000000000000000000000000000000000000000000000000000000099405200000000000000000000000000000000000000000000000000000000000000995052000000000000000000000000000000000000000000000000000000000000009960520000000000000000000000000000000000000000000000000000000000000099705200000000000000000000000000000000000000000000000000000000000000998052000000000000000000000000000000000000000000000000000000000000009990520e57eb8d10b6eed36a88a464538f8fcedbba7b1a71d6ed52124f77b835807d0fd05201c53ca351e7f26f963ced56cf18f9ebee56535170171b72a0addb4e1613776850520636b8e5a599cfe0833dbe141dbc093d65e0a497451ac21415fbf03698587c7b905204ea21cad94a85adb252b0a76b9826c67d7c697ca386d201752e38f19ed92a223126170746f733a3a6d657461646174615f7630c201032003000000000000134552525f414c52454144595f50524553454e542c4164647265737320697320616c72656164792070726573656e7420696e207468652077686974656c6973742e2103000000000000134552525f4e4f5f535543485f41444452455353214e6f2073756368206164647265737320696e207468652077686974656c6973742e2203000000000000134552525f4e4f545f494e495449414c495a45441d57686974656c697374206973206e6f7420696e697469616c697a65642e000201090b010205020001040100051d0b0011050c020b02070321030907012707032900030e0701270a01110220031407002707032a000c030b030f000b013101380002010104010008b01f0b0011050c010b01070321030907012707032a000c030b030f000c020a020704310138000a020705310138000a020706310138000a020707310138000a020708310138000a020709310138000a02070a310138000a02070b310138000a02070c310138000a02070d310138000a02070e310138000a02070f310138000a020710310138000a020711310138000a020712310138000a020713310138000a020714310138000a020715310138000a020716310138000a020717310138000a020718310138000a020719310138000a02071a310138000a02071b310138000a02071c310138000a02071d310138000a02071e310138000a02071f310138000a020720310138000a020721310138000a020722310138000a020723310138000a020724310138000a020725310138000a020726310138000a020727310138000a020728310138000a020729310138000a02072a310138000a02072b310138000a02072c310138000a02072d310138000a02072e310138000a02072f310138000a020730310138000a020731310138000a020732310138000a020733310138000a020734310138000a020735310138000a020736310138000a020737310138000a020738310138000a020739310138000a02073a310138000a02073b310138000a02073c310138000a02073d310138000a02073e310138000a02073f310138000a020740310138000a020741310138000a020742310138000a020743310138000a020744310138000a020745310138000a020746310138000a020747310138000a020748310138000a020749310138000a02074a310138000a02074b310138000a02074c310138000a02074d310138000a02074e310138000a02074f310138000a020750310138000a020751310138000a020752310138000a020753310138000a020754310138000a020755310138000a020756310138000a020757310138000a020758310138000a020759310138000a02075a310138000a02075b310138000a02075c310138000a02075d310138000a02075e310138000a02075f310138000a020760310138000a020761310138000a020762310138000a020763310138000a020764310138000a020765310138000a020766310138000a020767310138000a020768310138000a020769310138000a02076a310138000a02076b310138000a02076c310138000a02076d310138000a02076e310138000a02076f310138000a020770310138000a020771310138000a020772310138000a020773310138000a020774310138000a020775310138000a020776310138000a020777310138000a020778310138000a020779310138000a02077a310138000a02077b310138000a02077c310138000a02077d310138000a02077e310138000a02077f310138000a02078001310138000a02078101310138000a02078201310138000a02078301310138000a02078401310138000a02078501310138000a02078601310138000a02078701310138000a02078801310138000a02078901310138000a02078a01310138000a02078b01310138000a02078c01310138000a02078d01310138000a02078e01310138000a02078f01310138000a02079001310138000a02079101310138000a02079201310138000a02079301310138000a02079401310138000a02079501310138000a02079601310138000a02079701310138000a02079801310138000a02079901310138000a02079a01310138000a02079b01310138000a02079c01310138000a02079d01310138000a02079e01310138000a02079f01310138000a0207a001310138000a0207a101310138000a0207a201310138000a0207a301310138000a0207a401310138000a0207a501310138000a0207a601310138000a0207a701310138000a0207a801310138000a0207a901310138000a0207aa01310138000a0207ab01310138000a0207ac01310138000a0207ad01310138000a0207ae01310138000a0207af01310138000a0207b001310138000a0207b101310138000a0207b201310138000a0207b301310138000a0207b401310138000a0207b501310138000a0207b601310138000a0207b701310138000a0207b801310138000a0207b901310138000a0207ba01310138000a0207bb01310138000a0207bc01310138000a0207bd01310138000a0207be01310138000a0207bf01310138000a0207c001310138000a0207c101310138000a0207c201310138000a0207c301310138000a0207c401310138000a0207c501310138000a0207c601310138000a0207c701310138000a0207c801310138000a0207c901310138000a0207ca01310138000a0207cb01310138000a0207cc01310138000a0207cd01310138000a0207ce01310138000a0207cf01310138000a0207d001310138000a0207d101310138000a0207d201310138000a0207d301310138000a0207d401310138000a0207d501310138000a0207d601310138000a0207d701310138000a0207d801310138000a0207d901310138000a0207da01310138000a0207db01310138000a0207dc01310138000a0207dd01310138000a0207de01310138000a0207df01310138000a0207e001310138000a0207e101310138000a0207e201310138000a0207e301310138000a0207e401310138000a0207e501310138000a0207e601310138000a0207e701310138000a0207e801310138000a0207e901310138000a0207ea01310138000a0207eb01310138000a0207ec01310138000a0207ed01310138000a0207ee01310138000a0207ef01310138000a0207f001310138000a0207f101310138000a0207f201310138000a0207f301310138000a0207f401310138000a0207f501310138000a0207f601310138000a0207f701310138000a0207f801310138000a0207f901310138000a0207fa01310138000a0207fb01310138000a0207fc01310138000a0207fd01310138000a0207fe01310138000a0207ff01310138000a02078002310138000a02078102310138000a02078202310138000a02078302310138000a02078402310138000a02078502310138000a02078602310138000a02078702310138000a02078802310138000a02078902310138000a02078a02310138000a02078b02310138000a02078c02310138000a02078d02310138000a02078e02310138000a02078f02310138000a02079002310138000a02079102310138000a02079202310138000a02079302310138000a02079402310138000a02079502310138000a02079602310138000a02079702310138000a02079802310138000a02079902310138000a02079a02310138000a02079b02310138000a02079c02310138000a02079d02310138000a02079e02310138000a02079f02310138000a0207a002310138000a0207a102310138000a0207a202310138000a0207a302310138000a0207a402310138000a0207a502310138000a0207a602310138000a0207a702310138000a0207a802310138000a0207a902310138000a0207aa02310138000a0207ab02310138000a0207ac02310138000a0207ad02310138000a0207ae02310138000a0207af02310138000a0207b002310138000a0207b102310138000a0207b202310138000a0207b302310138000a0207b402310138000a0207b502310138000a0207b602310138000a0207b702310138000a0207b802310138000a0207b902310138000a0207ba02310138000a0207bb02310138000a0207bc02310138000a0207bd02310138000a0207be02310138000a0207bf02310138000a0207c002310138000a0207c102310138000a0207c202310138000a0207c302310138000a0207c402310138000a0207c502310138000a0207c602310138000a0207c702310138000a0207c802310138000a0207c902310138000a0207ca02310138000a0207cb02310138000a0207cc02310138000a0207cd02310138000a0207ce02310138000a0207cf02310138000a0207d002310138000a0207d102310138000a0207d202310138000a0207d302310138000a0207d402310138000a0207d502310138000a0207d602310138000a0207d702310138000a0207d802310138000a0207d902310138000a0207da02310138000a0207db02310138000a0207dc02310138000a0207dd02310138000a0207de02310138000a0207df02310138000a0207e002310138000a0207e102310138000a0207e202310138000a0207e302310138000a0207e402310138000a0207e502310138000a0207e602310138000a0207e702310138000a0207e802310138000a0207e902310138000a0207ea02310138000a0207eb02310138000a0207ec02310138000a0207ed02310138000a0207ee02310138000a0207ef02310138000a0207f002310138000a0207f102310138000a0207f202310138000a0207f302310138000a0207f402310138000a0207f502310138000a0207f602310138000a0207f702310138000a0207f802310138000a0207f902310138000a0207fa02310138000a0207fb02310138000a0207fc02310138000a0207fd02310138000a0207fe02310138000a0207ff02310138000a02078003310138000a02078103310138000a02078203310138000a02078303310138000a02078403310138000a02078503310138000a02078603310138000a02078703310138000a02078803310138000a02078903310138000a02078a03310138000a02078b03310138000a02078c03310138000a02078d03310138000a02078e03310138000a02078f03310138000a02079003310138000a02079103310138000a02079203310138000a02079303310138000a02079403310138000a02079503310138000a02079603310138000a02079703310138000a02079803310138000a02079903310138000a02079a03310138000a02079b03310138000a02079c03310138000a02079d03310138000a02079e03310138000a02079f03310138000a0207a003310138000a0207a103310138000a0207a203310138000a0207a303310138000a0207a403310138000a0207a503310138000a0207a603310138000a0207a703310138000a0207a803310138000a0207a903310138000a0207aa03310138000a0207ab03310138000a0207ac03310138000a0207ad03310138000a0207ae03310138000a0207af03310138000a0207b003310138000a0207b103310138000a0207b203310138000a0207b303310138000a0207b403310138000a0207b503310138000a0207b603310138000a0207b703310138000a0207b803310138000a0207b903310138000a0207ba03310138000a0207bb03310138000a0207bc03310138000a0207bd03310138000a0207be03310138000a0207bf03310138000a0207c003310138000a0207c103310138000a0207c203310138000a0207c303310138000a0207c403310138000a0207c503310138000a0207c603310138000a0207c703310138000a0207c803310138000a0207c903310138000a0207ca03310138000a0207cb03310138000a0207cc03310138000a0207cd03310138000a0207ce03310138000a0207cf03310138000a0207d003310138000a0207d103310138000a0207d203310138000a0207d303310138000a0207d403310138000a0207d503310138000a0207d603310138000a0207d703310138000a0207d803310138000a0207d903310138000a0207da03310138000a0207db03310138000a0207dc03310138000a0207dd03310138000a0207de03310138000a0207df03310138000a0207e003310138000a0207e103310138000a0207e203310138000a0207e303310138000a0207e403310138000a0207e503310138000a0207e603310138000a0207e703310138000a0207e803310138000a0207e903310138000a0207ea03310138000a0207eb03310138000a0207ec03310138000a0207ed03310138000a0207ee03310138000a0207ef03310138000a0207f003310138000a0207f103310138000a0207f203310138000a0207f303310138000a0207f403310138000a0207f503310138000a0207f603310138000a0207f703310138000a0207f803310138000a0207f903310138000a0207fa03310138000a0207fb03310138000a0207fc03310138000a0207fd03310138000a0207fe03310138000a0207ff03310138000a02078004310138000a02078104310138000a02078204310138000a02078304310138000a02078404310138000a02078504310138000a02078604310138000a02078704310138000a02078804310138000a02078904310138000a02078a04310138000a02078b04310138000a02078c04310138000a02078d04310138000a02078e04310138000a02078f04310138000a02079004310138000a02079104310138000a02079204310138000a02079304310138000a02079404310138000a02079504310138000a02079604310138000a02079704310138000a02079804310138000a02079904310138000a02079a04310138000a02079b04310138000a02079c04310138000a02079d04310138000a02079e04310138000a02079f04310138000a0207a004310138000a0207a104310138000a0207a204310138000a0207a304310138000a0207a404310138000a0207a504310138000a0207a604310138000a0207a704310138000a0207a804310138000a0207a904310138000a0207aa04310138000a0207ab04310138000a0207ac04310138000a0207ad04310138000a0207ae04310138000a0207af04310138000a0207b004310138000a0207b104310138000a0207b204310138000a0207b304310138000a0207b404310138000a0207b504310138000a0207b604310138000a0207b704310138000a0207b804310138000a0207b904310138000a0207ba04310138000a0207bb04310138000a0207bc04310138000a0207bd04310138000a0207be04310138000a0207bf04310138000a0207c004310138000a0207c104310138000a0207c204310138000a0207c304310138000a0207c404310138000a0207c504310138000a0207c604310138000a0207c704310138000a0207c804310138000a0207c904310138000a0207ca04310138000a0207cb04310138000a0207cc04310138000a0207cd04310138000a0207ce04310138000a0207cf04310138000a0207d004310138000a0207d104310138000a0207d204310138000a0207d304310138000a0207d404310138000a0207d504310138000a0207d604310138000a0207d704310138000a0207d804310138000a0207d904310138000a0207da04310138000a0207db04310138000a0207dc04310138000a0207dd04310138000a0207de04310138000a0207df04310138000a0207e004310138000a0207e104310138000a0207e204310138000a0207e304310138000a0207e404310138000a0207e504310138000a0207e604310138000a0207e704310138000a0207e804310138000a0207e904310138000a0207ea04310138000a0207eb04310138000a0207ec04310138000a0207ed04310138000a0207ee04310138000a0207ef04310138000a0207f004310138000a0207f104310138000a0207f204310138000a0207f304310138000a0207f404310138000a0207f504310138000a0207f604310138000a0207f704310138000a0207f804310138000a0207f904310138000a0207fa04310138000a0207fb04310138000a0207fc04310138000a0207fd04310138000a0207fe04310138000a0207ff04310138000a02078005310138000a02078105310138000a02078205310138000a02078305310138000a02078405310138000a02078505310138000a02078605310138000a02078705310138000a02078805310138000a02078905310138000a02078a05310138000a02078b05310138000a02078c05310138000a02078d05310138000a02078e05310138000a02078f05310138000a02079005310138000a02079105310138000a02079205310138000a02079305310138000a02079405310138000a02079505310138000a02079605310138000a02079705310138000a02079805310138000a02079905310138000a02079a05310138000a02079b05310138000a02079c05310138000a02079d05310138000a02079e05310138000a02079f05310138000a0207a005310138000a0207a105310138000a0207a205310138000a0207a305310138000a0207a405310138000a0207a505310138000a0207a605310138000a0207a705310138000a0207a805310138000a0207a905310138000a0207aa05310138000a0207ab05310138000a0207ac05310138000a0207ad05310138000a0207ae05310138000a0207af05310138000a0207b005310138000a0207b105310138000a0207b205310138000a0207b305310138000a0207b405310138000a0207b505310138000a0207b605310138000a0207b705310138000a0207b805310138000a0207b905310138000a0207ba05310138000a0207bb05310138000a0207bc05310138000a0207bd05310138000a0207be05310138000a0207bf05310138000a0207c005310138000a0207c105310138000a0207c205310138000a0207c305310138000a0207c405310138000a0207c505310138000a0207c605310138000a0207c705310138000a0207c805310138000a0207c905310138000a0207ca05310138000a0207cb05310138000a0207cc05310138000a0207cd05310138000a0207ce05310138000a0207cf05310138000a0207d005310138000a0207d105310138000a0207d205310138000a0207d305310138000a0207d405310138000a0207d505310138000a0207d605310138000a0207d705310138000a0207d805310138000a0207d905310138000a0207da05310138000a0207db05310138000a0207dc05310138000a0207dd05310138000a0207de05310138000a0207df05310138000a0207e005310138000a0207e105310138000a0207e205310138000a0207e305310138000a0207e405310138000a0207e505310138000a0207e605310138000a0207e705310138000a0207e805310138000a0207e905310138000a0207ea05310138000a0207eb05310138000a0207ec05310138000a0207ed05310138000a0207ee05310138000a0207ef05310138000a0207f005310138000a0207f105310138000a0207f205310138000a0207f305310138000a0207f405310138000a0207f505310138000a0207f605310138000a0207f705310138000a0207f805310138000a0207f905310138000a0207fa05310138000a0207fb05310138000a0207fc05310138000a0207fd05310138000a0207fe05310138000a0207ff05310138000a02078006310138000a02078106310138000a02078206310138000a02078306310138000a02078406310138000a02078506310138000a02078606310138000a02078706310138000a02078806310138000a02078906310138000a02078a06310138000a02078b06310138000a02078c06310138000a02078d06310138000a02078e06310138000a02078f06310138000a02079006310138000a02079106310138000a02079206310138000a02079306310138000a02079406310138000a02079506310138000a02079606310138000a02079706310138000a02079806310138000a02079906310138000a02079a06310138000a02079b06310138000a02079c06310138000a02079d06310138000a02079e06310138000a02079f06310138000a0207a006310138000a0207a106310138000a0207a206310138000a0207a306310138000a0207a406310138000a0207a506310138000a0207a606310138000a0207a706310138000a0207a806310138000a0207a906310138000a0207aa06310138000a0207ab06310138000a0207ac06310138000a0207ad06310138000a0207ae06310138000a0207af06310138000a0207b006310138000a0207b106310138000a0207b206310138000a0207b306310138000a0207b406310138000a0207b506310138000a0207b606310138000a0207b706310138000a0207b806310138000a0207b906310138000a0207ba06310138000a0207bb06310138000a0207bc06310138000a0207bd06310138000a0207be06310138000a0207bf06310138000a0207c006310138000a0207c106310138000a0207c206310138000a0207c306310138000a0207c406310138000a0207c506310138000a0207c606310138000a0207c706310138000a0207c806310138000a0207c906310138000a0207ca06310138000a0207cb06310138000a0207cc06310138000a0207cd06310138000a0207ce06310138000a0207cf06310138000a0207d006310138000a0207d106310138000a0207d206310138000a0207d306310138000a0207d406310138000a0207d506310138000a0207d606310138000a0207d706310138000a0207d806310138000a0207d906310138000a0207da06310138000a0207db06310138000a0207dc06310138000a0207dd06310138000a0207de06310138000a0207df06310138000a0207e006310138000a0207e106310138000a0207e206310138000a0207e306310138000a0207e406310138000a0207e506310138000a0207e606310138000a0207e706310138000a0207e806310138000a0207e906310138000a0207ea06310138000a0207eb06310138000a0207ec06310138000a0207ed06310138000a0207ee06310138000a0207ef06310138000a0207f006310138000a0207f106310138000a0207f206310138000a0207f306310138000a0207f406310138000a0207f506310138000a0207f606310138000a0207f706310138000a0207f806310138000a0207f906310138000a0207fa06310138000a0207fb06310138000a0207fc06310138000a0207fd06310138000a0207fe06310138000a0207ff06310138000a02078007310138000a02078107310138000a02078207310138000a02078307310138000a02078407310138000a02078507310138000a02078607310138000a02078707310138000a02078807310138000a02078907310138000a02078a07310138000a02078b07310138000a02078c07310138000a02078d07310138000a02078e07310138000a02078f07310138000a02079007310138000a02079107310138000a02079207310138000a02079307310138000a02079407310138000a02079507310138000a02079607310138000a02079707310138000a02079807310138000a02079907310138000a02079a07310138000a02079b07310138000a02079c07310138000a02079d07310138000a02079e07310138000a02079f07310138000a0207a007310138000a0207a107310138000a0207a207310138000a0207a307310138000a0207a407310138000a0207a507310138000a0207a607310138000a0207a707310138000a0207a807310138000a0207a907310138000a0207aa07310138000a0207ab07310138000a0207ac07310138000a0207ad07310138000a0207ae07310138000a0207af07310138000a0207b007310138000a0207b107310138000a0207b207310138000a0207b307310138000a0207b407310138000a0207b507310138000a0207b607310138000a0207b707310138000a0207b807310138000a0207b907310138000a0207ba07310138000a0207bb07310138000a0207bc07310138000a0207bd07310138000a0207be07310138000a0207bf07310138000a0207c007310138000a0207c107310138000a0207c207310138000a0207c307310138000a0207c407310138000a0207c507310138000a0207c607310138000a0207c707310138000a0207c807310138000a0207c907310138000a0207ca07310138000a0207cb07310138000a0207cc07310138000a0207cd07310138000a0207ce07310138000a0207cf07310138000a0207d007310138000a0207d107310138000a0207d207310138000a0207d307310138000a0207d407310138000a0207d507310138000a0207d607310138000a0207d707310138000a0207d807310138000a0207d907310138000a0207da07310138000a0207db07310138000a0207dc07310138000a0207dd07310138000a0207de07310138000a0207df07310138000a0207e007310138000a0207e107310138000a0207e207310138000a0207e307310138000a0207e407310138000a0207e507310138000a0207e607310138000a0207e707310138000a0207e807310138000a0207e907310138000a0207ea07310138000b0207eb0731013800020201000100090807032b000c010b0110000b00380102030100000b1f38020c010d0107ec07310138000d0107ed07310138000d0107ee07310138000d0107ef07310138000d01071a310138000d01071b310138000b000b0112002d00020401040100051c0b0011050c020b02070321030907012707032900030e0701270a011102031307022707032a000c030b030f000b0138030102000000";
+    let res = run_binary_test("sample_whitelist", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_coin_store() {
+    let code = "a11ceb0b050000000e01001e021e0c032acb0604f5065405c907a41207ed19e80908d523800206d5252c108126420ac326090bcc26040cd026fd86010dcdad01020ecfad01040000010101020103020402050306030704080509050a0607060b070c070d000e08010001011104010001000f00010200000010010201000012030101000013040103000000001404010300000000150401030000000016040103000000001704010300000000180401030000000019040103000000001a040103000000001b040103000000001c040103000000001d040103000000001e040103000000001f0401030000000020040103000000002104010300000000220401030000000023040103000000002404010300000000250401030000000026040103000000002704010300000000280401030000000029040103000000002a040103000000002b040103000000002c040103000000002d040103000000002e040103000000002f0401030000000030040103000000003104010300000000320401030000000033050103000000003405010300000000350501030000000036050103000000003705010300000000380501030000000039050103000000003a050103000000003b050103000000003c050103000000003d050103000000003e050103000000003f0501030000000040050103000000004105010300000000420501030000000043050103000000004405010300000000450501030000000046050103000000004705010300000000480501030000000049050103000000004a050103000000004b050103000000004c050103000000004d050103000000004e050103000000004f050103000000005005010300000000510601010000520701010000530801010000540901020000005509010200000056000102000000570a010200000058070102000000590a01020000005a0b01020000005b0001020000005c0c0103000000005d0c01020000005e0c01020000005f0701010000600701010000610201010000620701010000630d01010000640e010100006502030100006601030100006702030100016810020100016911010100096a0114020000046b0100020000016c16030100016d01030100090b1819020000040b1a1b020000016e030101000c6f011d0200000b70031e020000066b0100030000000771221e030000000872010202000008730102020000087424000200000e6a01140200000d0b261e020000037508400002760202000165070301000477014200057801430200000a790100020000060b1a1b03000000011226010100017a48030100580f590f5a135a155b135c0f5d175e135e1559175d0f5f155f136017611361156215600f6320632164216513661366156515671568136815691562136420671369136c0f6e136f135c17702070215817710f720f020303000103010b010109000d030403040404010101010404040d0304030404010101010404040402060c0b0101090002060c0301060c0b030403040404010104040403060c030304060c0303010a060c03040403030404010102050303060c050301090001060b0101090002070b010109000b01010900230b010109000b010109010403040b010109000403040404040b010109010403030304040b010109000b010109000b01010901070b00010900040404040b010109000b010109000b0101090104040b0101090104040209000901020404020901090002070b0101090003010901040b01010900040b0101090104040b010109000b010109010b010109000b01010901040b01010900030b0101090103020b010109000b01010901250303030403040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b000109000404040b010109000b0101090003040404030b0101090104030403030303010b0101090122040303040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404040b0101090003040b010109000404030b0101090104040309000901090203090109000902020b010109000323040404040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040b0101090004040b0101090104040805070b01010900070b01010901030301040423040404040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b00010900040405040b0101090004040b010109000404040b01010901040402050b01010900240403040403040404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b010109010b010109000b01010900040b01010900040b010109010b0101090104040b01010900200303030403030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404030b01010900040303040b010109001d040303030404030404040403030304040b010109000b010109010b01010900070b000109000b01010901040403040b0101090003040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404050b01010900040b010109000b01010901040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b0101090004040b010109002603030304030403040404040403030304040b010109010b01010900070b00010900040405030b010109000b0101090104040b01010900040b01010900030b01010901040b01010901040304200303030b010109000b010109010403030403040404040403030304040b010109010b01010900070b000109000404030b010109000b01010901040303041d0303030403030304030404040403030304040b01010900070b0001090004040303040303030421030303040404030404030404040403030304040b010109010b01010900070b000109000404050b01010900030b010109000b01010901040303041f0303030404040304030404040403030304040b010109010b01010900070b0001090004040503040403040304230403030403040404040403030304040b010109000b01010901070b0001090004040503040b01010901040b010109000b01010900040b01010900030b01010901040b0101090104041d0b010109000b01010901040303030403040404040403030304040b010109000b01010901070b00010900040403040b010109000b0101090103041e04040403030404030404040403030304040b010109000b01010901070b000109000404050b0101090003040b010109000b0101090103041c040404030304030404040403030304040b010109000b01010901070b00010900040405030404030404240404040403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b01010901040b010109010b010109000b01010900040b01010900040b010109010b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b010109010b010109000b0101090104200404030303040304030404040403030304040b010109000b01010900070b000109000404050b01010901030b010109010b01010900040303041d040404030304030404040403030304040b010109000b01010900070b000109000404050b0101090103040b010109010b0101090003041e040404040404030404040403030304040b010109000b010109010b01010900070b000109000404050b01010901040b01010900040b010109010404240404040403040404040403030304040b010109000b010109000b01010901070b00010900040405040b010109000b0101090104040b01010900040b01010900040b01010901040b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b0001090004040504040b010109000b0101090104041f0404030303040304030404040403030304040b010109000b01010900070b00010900040405040304040303041c040404030304030404040403030304040b010109000b01010900070b000109000404050403040403041f04040404040404030404040403030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040404010b0001090001050d05030403070b000109000b01010901040b01010900040303030b01010900040302010101011a0504040404070b00010900070b000109010404030303030b01010901040404040b010109000b010109000b010109000b010109000b010109010b010109010b010109010b010109010f03030305040404030b010109010b01010901040b0101090003030b010109000e04040305040404030b010109000b01010901040b010109010b010109010b010109000f030303030305040404030b010109010403030301070b01010900030b0101090003070b000109000a636f696e5f73746f726504636f696e056572726f72067369676e65720f416e696d6553776170506f6f6c563116416e696d6553776170506f6f6c56314c6962726172790e6c69717569646974795f706f6f6c06726f7574657203616d6d09546f6b656e537761700f546f6b656e53776170436f6e66696704737761700a616d6d5f726f7574657208616d6d5f737761700b4d79436f696e53746f726512616e696d65737761705f73746172737761700762616c616e636504436f696e076465706f736974066c3073307431066c3073317430066c3173307431066c3173307432066c3173307433066c3173307434066c3173307435066c3173317430066c3173317432066c3173317433066c3173317434066c3173317435066c3173327430066c3173327431066c3173327433066c3173327434066c3173327435066c3173337430066c3173337431066c3173337432066c3173337434066c3173337435066c3173347430066c3173347431066c3173347432066c3173347433066c3173347435066c3173357430066c3173357431066c3173357432066c3173357433066c3173357434066c3273307431066c3273307432066c3273307433066c3273307434066c3273307435066c3273317430066c3273317432066c3273317433066c3273317434066c3273317435066c3273327430066c3273327431066c3273327433066c3273327434066c3273327435066c3273337430066c3273337431066c3273337432066c3273337434066c3273337435066c3273347430066c3273347431066c3273347432066c3273347433066c3273347435066c3273357430066c3273357431066c3273357432066c3273357433066c3273357434036e65770d6e65775f66726f6d5f6d61696e0d6e65775f66726f6d5f7a65726f047330743104733174301073696d706c655f616e696d65737761701373696d706c655f616e696d65737761705f76320f73696d706c655f73746172737761701273696d706c655f73746172737761705f76321273696d706c655f73746172737761705f76331273746172737761705f616e696d657377617012737761705f61625f6c69717569647377617008737761705f61757810737761705f70616e63616b6573776170127472616e736665725f66726f6d5f6d61696e197472616e736665725f66726f6d5f6d61696e5f736372697074107472616e736665725f746f5f6d61696e177472616e736665725f746f5f6d61696e5f736372697074117472616e736665725f746f5f6f74686572187472616e736665725f746f5f6f746865725f7363726970740877697468647261770c77697468647261775f616c6c0c77697468647261775f616e790576616c7565056d657267650c6765745f7265736572766573116765745f72657365727665735f73697a650765787472616374047a65726f0c64657374726f795f7a65726f0e746f6b656e5f726573657276657321737761705f65786163745f785f746f5f795f6469726563745f65787465726e616c18737761705f65786163745f636f696e5f666f725f636f696e04785f617504795f61751c737761705f65786163745f636f696e5f666f725f636f696e5f6d75740a616464726573735f6f66117065726d697373696f6e5f64656e6965640e6765745f61646d696e5f6461746107636f6d70617265116765745f706f756e646167655f726174650b657874726163745f616c6cd1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac000000000000000000000000000000000000000000000000000000000000000116fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12bd35135844473187163ca197ca93b2ab014370587bb0ed3befff9e902d6bb541c755e4c8d7a6ab6d56f9289d97c43c1c94bde75ec09147c90d35cd1be61c8fb9c7efb4076dbe143cbcd98cfaaa929ecfc8f299203dfff63b95ccb6bfe19850faec42a352cc65eca17a9fa85d0fc602295897ed6b8b8af6a6c79ef490eb8f9eba0308915f0100000000000520d1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac126170746f733a3a6d657461646174615f76302e01915f010000000000234552524f525f5448455f4f55545055545f4c4553535f5448414e5f4d494e5f5245435600000201010b01010900000f001700010400010206ffffffffffffffff270101000100010507013c0037003800020201000100010607013c0036000b0038010203010400010206ffffffffffffffff2704010400010206ffffffffffffffff2705010400010206ffffffffffffffff2706010400010206ffffffffffffffff2707010400010206ffffffffffffffff2708010400010206ffffffffffffffff2709010400010206ffffffffffffffff270a010400010206ffffffffffffffff270b010400010206ffffffffffffffff270c010400010206ffffffffffffffff270d010400010206ffffffffffffffff270e010400010206ffffffffffffffff270f010400010206ffffffffffffffff2710010400010206ffffffffffffffff2711010400010206ffffffffffffffff2712010400010206ffffffffffffffff2713010400010206ffffffffffffffff2714010400010206ffffffffffffffff2715010400010206ffffffffffffffff2716010400010206ffffffffffffffff2717010400010206ffffffffffffffff2718010400010206ffffffffffffffff2719010400010206ffffffffffffffff271a010400010206ffffffffffffffff271b010400010206ffffffffffffffff271c010400010206ffffffffffffffff271d010400010206ffffffffffffffff271e010400010206ffffffffffffffff271f010400010206ffffffffffffffff2720010400010206ffffffffffffffff2721010400010206ffffffffffffffff2722010400010206ffffffffffffffff27230104010012f1010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c180c1738040c10350b10350c1f0c1e0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1f160c110a170a1f180a111a0c0f0a1e0a18180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c2f0a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2f23045e054d0a270c2f0a0f0a11180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2f0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c240b150b18180b241a320b000000000000000000000000000000170c130a130b0c180c160b1f0b0a180a16160c250b160b1e180b251a320b000000000000000000000000000000170c1a0a1a0a04170b0317010b04340c1407013c000c230a23370038000c1b0a2336000b1438050c200b0804ab010b200b133806320000000000000000000000000000000038070c190c120c2d0c2805b401380632000000000000000000000000000000000b200b1338080c120c190c280c2d0d280b1238010d2d0b1938090b2d0c220a2336000b283801380a0c290b0704cd010b220600000000000000000b290b1a34380b0c0d0c0e05d5010b290b1a340b22060000000000000000380c0c0e0c0d0b0e0b0d0c210c2a0a2336000b2138010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404ea0105ee010b1c0b1d17270b2a380d0224010401001cef010b05040638020c2c0c26050d38030c2b0c2f0b2b0c260b2f0c2c0b260b2c0c190c180b060418380e0c0f0c0e0c0d0522380f0c300c290c2d0b290b2d0b300c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c1f0c1e0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1f160c120a180a1f180a121a0c100a1e0a19180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c310a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a3123047205610a2a0c310a100a12180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055c0b310b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1f0b0a180a17160c250b170b1e180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c230a23370038000c1b0a2336000b1538050c200b0804bd010b200b143806320000000000000000000000000000000038070c1a0c130c2e0c2705c601380632000000000000000000000000000000000b200b1438080c130c1a0c270c2e0d270b1338010d2e0b1a38090b2e0c210a2336000b273801380a0c280b2138100c220a2336000b2238010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404e80105ec010b1c0b1d17270b2838110225010401001fe8010b05040638020c2a0c24050d38030c290c2d0b290c240b2d0c2a0b240b2a0c170c160b06041738120c0f0c0e051e38130c260c2b0b260c0e0b2b0c0f0b0e350b0f350c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0d0a1c0a17180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2e0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2e23046a05590a270c2e0a0d0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2e0b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2c0c2805be01380632000000000000000000000000000000000b1e0b1238080c110c180c280c2c0d280b1138010d2c0b1838090b2c0c200a2136000b283801380a0c250b2006000000000000000038140c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b25381102260104010023f8010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c170c160b06041a3815353816350c0e0c0d05203817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2f23046a05590a290c2f0a0f0a10180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b7010b1e0a123806320000000000000000000000000000000038070c180c110c2d0c2a05c001380632000000000000000000000000000000000b1e0a1238080c110c180c2a0c2d0d2a0b1138010d2d0b1838090b2d0c200a2136000b2a3801380a0c270b240d200d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404f10105f5010b1a0b1b17270b28380d02270104010025e8010b05040638020c2b0c25050d38030c2a0c2e0b2a0c250b2e0c2b0b250b2b0c170c160b060417381a0c0e0c0d051e381b0c270c2c0b270b2c0c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104700a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2f23046805570a280c2f0a0f0a10180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2d0c2905be01380632000000000000000000000000000000000b1e0b1238080c110c180c290c2d0d290b1138010d2d0b1838090b2d0c1f0a2136000b293801380a0c260b240b1f381c0c200a2136000b2038010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b26381102280104010027f20138040c0e350b0e350c150c140b06040d38020c2b0c24051438030c290c2e0b290c240b2e0c2b0b240b2b0c1b0c1a0a0432000000000000000000000000000000002104660a150a0c180a0a1a0a1b160c0f0a140a1b180a0f1a0c0d0a1a0a15180a0c180a0a1a0b0f1a0c0f0a0d0a0f180a0b180a091a0c2f0a0d0a0f180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23045e054d0a250c2f0a0d0a0f180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505480b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c210b120b15180b211a320b000000000000000000000000000000170c100a100b0c180c130b1b0b0a180a13160c220b130b1a180b221a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c230a233c000c1f0a1f370038000c170a1f36000b1138050c1c0b0804ac010b1c06000000000000000038060b1034380c0c200c3005b40138060b10340b1c060000000000000000380b0c300c200b300b200c1d0c270b0704c4010b1d0b160b27320000000000000000000000000000000038080c280c2d0c2a0c2c05cd010b2732000000000000000000000000000000000b1d0b1638070c2d0c280c2c0c2a0d2a0b2838010d2c0b2d38090b2a0c1e0b2c0c260a1f36000b1e38010b170b02160c180b1f370038000c190a190a182404e80105ec010b180b1917270b233c0136010b26380902290104010028d90138040c11350b11350c190c180b06040e380e0c0f0c0e0c0d0518380f0c2a0c260c290b260b290b2a0c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c1e0c1d0a0432000000000000000000000000000000002104700a190a0c180a0a1a0a1e160c130a180a1e180a131a0c100a1d0a19180a0c180a0a1a0b131a0c130a100a13180a0b180a091a0c2b0a100a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2b23046805570a280c2b0a100a13180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2b0b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1e0b0a180a17160c250b170b1d180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c220a22370038000c1a0a2236000b1538050c1f0b0804b2010b1f06000000000000000038060b1434380c0c230c2c05ba0138060b14340b1f060000000000000000380b0c2c0c230b2c0b230c200c270b2038100c210a2236000b2138010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404d20105d6010b1b0b1c17270b273811022a0104010029d20138040c0f350b0f350c170c160b06040d38120c100c0e051438130c240c270b240c0e0b270c100b0e350b10350c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0d0a1b0a17180a0c180a0a1a0b111a0c110a0d0a11180a0b180a091a0c280a0d0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a28230460054f0a250c280a0d0a11180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b280b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2905b20138060b12340b1d060000000000000000380b0c290c210b290b210c1e0c260b1e06000000000000000038140c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b263811022b010401002ae20138040c10350b10350c170c160b0604103815353816350c0e0c0d05163817353818350c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a29230460054f0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c26054a0b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804ac010b1d06000000000000000038060a1234380c0c210c2a05b40138060a12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240d1e0d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b1e0c280b250c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404db0105df010b190b1a17270b28380d022c010401002bd20138040c10350b10350c170c160b06040d381a0c0e0c0d0514381b0c250c280b250b280c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104660a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2923045e054d0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605480b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2a05b20138060b12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b273811022d010401002cec010b050407380e0c0f0c0e0c0d0511380f0c310c240c2c0b240b2c0b310c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c170c160b06042138020c2e0c27052838030c2a0c300b2a0c270b300c2e0b270b2e0c1d0c1c0a04320000000000000000000000000000000021047a0a170a0c180a0a1a0a1d160c120a160a1d180a121a0c100a1c0a17180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c320a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a3223047205610a280c320a100a12180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c28055c0b320b10170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a0b0c180c150b1d0b0a180a15160c220b150b1c180b221a0c180a180a04170b0317010b04340c1307010c230a233c000c200a20370038000c190a2036000b133805381d0c1e380a0c250b0704be010b1e0b180b25320000000000000000000000000000000038080c290c2f0c2b0c2d05c7010b2532000000000000000000000000000000000b1e0b1838070c2f0c290c2d0c2b0d2b0b2938010d2d0b2f38090b2b0c1f0b2d0c260a2036000b1f38010b190b02160c1a0b20370038000c1b0a1b0a1a2404e20105e6010b1a0b1b17270b233c0136010b263809022e010401002dd5010b050407380e0c0f0c0e0c0d0511380f0c2b0c260c2a0b260b2a0b2b0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c1938040c14350b14350c200c1f0a0432000000000000000000000000000000002104700a1a0a0c180a0a1a0a20160c150a190a20180a151a0c120a1f0a1a180a0c180a0a1a0b151a0c150a120a15180a0b180a091a0c2c0a120a15180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23046805570a290c2c0a120a15180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905520b2c0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c240b170b1a180b241a0b0c180c180b200b0a180a18160c250b180b1f180b251a0c1b0a1b0a04170b0317010b04340c1607013c000c230a23370038000c1c0a2336000b163805381d0c21380a0c270b0704b1010b210600000000000000000b270b1b34380b0c100c1105b9010b270b1b340b21060000000000000000380c0c110c100b110b100c220c280a2336000b2238010b1c0b02160c1d0b23370038000c1e0a1e0a1d2404ce0105d2010b1d0b1e17270b28380d022f010401002ec6010b050407380e0c0f0c0e0c0d0511380f0c280c230c260b230b260b280c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c190c180b06042138120c130c11052838130c240c270b240c110b270c130b11350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805381d06000000000000000038140c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c17270230010401002fde010b050407380e0c0f0c0e0c0d0511380f0c2c0c270c2b0b270b2b0b2c0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c190b0604243815353816350c110c10052a3817353818350c110c100b100b110c1f0c1e0a04320000000000000000000000000000000021047c0a1a0a0c180a0a1a0a1f160c140a190a1f180a141a0c120a1e0a1a180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2d0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a2d23047405630a2a0c2d0a120a14180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055e0b2d0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c230b170b1a180b231a0c150a150b0c180c180b1f0b0a180a18160c240b180b1e180b241a0a04170b0317010b04340c1607010c250a253c000c220a22370038000c1b0a2236000b163805381d0c20380a0c280b250d200d280b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b280c260b200c290b260c210a2236000b2138010b1b0b02160c1c0b22370038000c1d0a1d0a1c2404d70105db010b1c0b1d17270b29380d02310104010030c8010b050407380e0c0f0c0e0c0d0511380f0c2a0c250c280b250b280b2a0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c190c180b060421381a0c110c100528381b0c260c290b260b290c110c100b100b110c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b153805381d0c1f0b240b1f381c0c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c172702320104010031e5010b05040638120c0f0c0e050d38130c220c2a0b220c0e0b2a0c0f0b0e350b0f350c150c140b06041938020c2c0c23052038030c280c2e0b280c230b2e0c2c0b230b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0d0a1a0a15180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2f0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23046a05590a250c2f0a0d0a10180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c1f0b120b15180b1f1a0b0c180c130b1b0b0a180a13160c200b130b1a180b201a0c160a160a04170b0317010b04340c1107010c210a213c000c1e0a1e370038000c170a1e36000b113805060000000000000000381e0c1d380a0c260b0704b7010b1d0b160b26320000000000000000000000000000000038080c270c2d0c290c2b05c0010b2632000000000000000000000000000000000b1d0b1638070c2d0c270c2b0c290d290b2738010d2b0b2d38090b290c1c0b2b0c240a1e36000b1c38010b170b02160c180b1e370038000c190a190a182404db0105df010b180b1917270b213c0136010b24380902330104010032ce010b05040638120c110c10050d38130c240c280b240c100b280c110b10350b11350c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c0f0a1d0a18180a0c180a0a1a0b131a0c130a0f0a13180a0b180a091a0c290a0f0a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a29230460054f0a250c290a0f0a13180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b290b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0b0c180c160b1e0b0a180a16160c230b160b1d180b231a0c190a190a04170b0317010b04340c1407013c000c210a21370038000c1a0a2136000b143805060000000000000000381e0c20380a0c260b0704aa010b200600000000000000000b260b1934380b0c0d0c0e05b2010b260b19340b20060000000000000000380c0c0e0c0d0b0e0b0d0c1f0c270a2136000b1f38010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c70105cb010b1b0b1c17270b27380d0234010401002ec6010b05040638120c120c11050d38130c230c260b230c110b260c120b11350b12350c190c180b06041a380e0c0f0c0e0c0d0524380f0c280c240c270b240b270b280c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805060000000000000000381e38100c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c172702350104010033d7010b05040638120c110c10050d38130c250c290b250c100b290c110b10350b11350c180c170b06041c3815353816350c0e0c0d05223817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104740a180a0c180a0a1a0a1d160c120a170a1d180a121a0c0f0a1c0a18180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c2a0a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2a23046c055b0a260c2a0a0f0a12180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605560b2a0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c210b150b18180b211a0c130a130b0c180c160b1d0b0a180a16160c220b160b1c180b221a0a04170b0317010b04340c1407010c230a233c000c200a20370038000c190a2036000b143805060000000000000000381e0c1f380a0c270b230d1f0d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c240b1f0c280b240c1e0a2036000b1e38010b190b02160c1a0b20370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02360104010034c1010b05040638120c110c10050d38130c230c260b230c100b260c110b10350b11350c170c160b060419381a0c0e0c0d0520381b0c240c270b240b270c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b133805060000000000000000381e0c1e0b220b1e381c0c1d0a1f36000b1d38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a172702370104010035f9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c150c140b06041938020c2c0c24052038030c2a0c2f0b2a0c240b2f0c2c0b240b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a3023046a05590a260c300a0f0a10180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605540b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a320b000000000000000000000000000000170b0c180c130b1b0b0a180a13160c210b130b1a180b211a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000a1138050c1c38060c270a220d1c0d270b11340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c230b1c0c280b230c1e0b0704cb010b1e0b160b28320000000000000000000000000000000038080c290c2e0c2b0c2d05d4010b2832000000000000000000000000000000000b1e0b1638070c2e0c290c2d0c2b0d2b0b2938010d2d0b2e38090b2b0c1d0b2d0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404ef0105f3010b180b1917270b223c0136010b25380902380104010036e4010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b230460054f0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27054a0b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a320b000000000000000000000000000000170b0c180c160b1e0b0a180a16160c240b160b1d180b241a320b000000000000000000000000000000170c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000a1438050c1f38060c280b250d1f0d280b14340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c260b1f0c290b260c210b0704c0010b210600000000000000000b290b1934380b0c0f0c1005c8010b290b19340b21060000000000000000380c0c100c0f0b100b0f0c200c2a0a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404dd0105e1010b1b0b1c17270b2a380d02390104010037e0010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c190c180b06041a380e0c110c100c0f0524380f0c2b0c260c2a0b260b2a0b2b0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2c0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23047405630a290c2c0a120a14180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c29055e0b2c0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a320b000000000000000000000000000000170b0c180c170b1e0b0a180a17160c230b170b1d180b231a320b000000000000000000000000000000170a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000a1538050c1f38060c270b240d1f0d270b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c250b1f0c280b2538100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404d90105dd010b1b0b1c17270b283811023a0104010038d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b06041938120c110c10052038130c240c280b240c100b280c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104740a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c290a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923046c055b0a250c290a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505560b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c210b150b1b180b211a320b000000000000000000000000000000170a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000a1338050c1d38060c260b220d1d0d260b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b260c230b1d0c270b2306000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404d20105d6010b190b1a17270b273811023b0104010039d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b060419381a0c100c0f0520381b0c250c290b250b290c100c0f0b0f0b100c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c110a1b0a17180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2a0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2a23046a05590a270c2a0a110a12180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2a0b11170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c220b150b1b180b221a320b000000000000000000000000000000170a04170b0317010b04340c1307010c230a233c000c200a20370038000c180a2036000a1338050c1d38060c280a230d1d0d280b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c240b1d0c260b240c1e0b230b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404d20105d6010b190b1a17270b263811023c010401003ae5010b050406381a0c0e0c0d050d381b0c230c2b0b230b2b0c0e0c0d0b0d0b0e0c150c140b06041738020c2d0c26051e38030c290c2f0b290c260b2f0c2d0b260b2d0c1b0c1a0a0432000000000000000000000000000000002104700a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a3023046805570a270c300a0f0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705520b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a0b0c180c130b1b0b0a180a13160c210b130b1a180b211a0c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000b1138050c1c0a220b1c38200c1e380a0c240b0704b7010b1e0b160b24320000000000000000000000000000000038080c280c2e0c2a0c2c05c0010b2432000000000000000000000000000000000b1e0b1638070c2e0c280c2c0c2a0d2a0b2838010d2c0b2e38090b2a0c1d0b2c0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404db0105df010b180b1917270b223c0136010b253809023d010401003bd0010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23045e054d0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a0b0c180c160b1e0b0a180a16160c240b160b1d180b241a0c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000b1438050c1f0b250b1f38200c21380a0c280b0704ac010b210600000000000000000b280b1934380b0c0f0c1005b4010b280b19340b21060000000000000000380c0c100c0f0b100b0f0c200c290a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404c90105cd010b1b0b1c17270b29380d023e010401003cc8010b050406381a0c0e0c0d050d381b0c250c280b250b280c0e0c0d0b0d0b0e0c190c180b060418380e0c110c100c0f0522380f0c2a0c260c290b260b290b2a0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b1538050c1f0b240b1f382038100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c1727023f010401003dc1010b050406381a0c0e0c0d050d381b0c230c260b230b260c0e0c0d0b0d0b0e0c170c160b06041738120c110c10051e38130c240c270b240c100b270c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b1338050c1d0b220b1d382006000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a17270240010401003ed7010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c170b06041a3815353816350c100c0f05203817353818350c100c0f0b0f0b100c1d0c1c0a0432000000000000000000000000000000002104720a180a0c180a0a1a0a1d160c120a170a1d180a121a0c110a1c0a18180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2b0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2b23046a05590a290c2b0a110a12180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0c130a130b0c180c160b1d0b0a180a16160c230b160b1c180b231a0a04170b0317010b04340c1407010c240a243c000c210a21370038000c190a2136000b1438050c1e0a240b1e38200c20380a0c270b240d200d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02410300003f070b0139000c020b000b023f0002420104003f140a00116a0701210406050b0b0001060000000000000000116b270a000b01382139000c020b000b023f0002430104003f120a00116a0701210406050b0b0001060000000000000000116b27380a39000c010b000b013f000244010400010206ffffffffffffffff2745010400010206ffffffffffffffff27460104000102060000000000000000274701040100415b0b00116a0c030a030701210408050b060000000000000000116b270a033c000c070a0736000b0138050c0a0e0a38000c04116d0101010c0e38040c0d0c0c0b04350610270000000000000b0e1735180c050a050b0d35180c0b0b0c353210270000000000000000000000000000180b05160c090b0b0b091a340c060a060b0226043c05400b07010700273822044a0b0a06000000000000000038060b06380c0c080c0f055138060b060b0a060000000000000000380b0c0f0c080b0736000b0f38010b033c0136010b0838090248010400010206000000000000000027490104000102060000000000000000274a010401004493010b00116a0c040a040701210408050b060000000000000000116b270b03044f38020c140c1238230c0d0c0f0a01350a0d0b0f1735180c050b120b0d35180a05160c0b0b050b14180b0b1a0c070a070b023524042e05300700270a043c000c090a0936000b0138050b073806320000000000000000000000000000000038070c1c0c180c1a0c160d160b1838010d1a0b1c38090b0936000b1638010b043c0136010b1a380905920138020c130c1538230c0e0c100a01350a0e0b101735180c060b130b0e35180a06160c0c0b060b15180b0c1a0c080a080b023524047005720700270a043c010c0a0a0a36010b0138240c11380a32000000000000000000000000000000000b110b0838070c1d0c190c1b0c170d170b1938010d1b0b1d38090b0a36010b1b38090b043c0036000b173801024b010400010206ffffffffffffffff274c0104010045650b00116a0c0d0a0d0701210408050b060000000000000000116b270b08041138120c0b0c0a051838130c160c170b160c0a0b170c0b0b0a350b0b350c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000b0438050c150b0904480b1506000000000000000038060b0c38250c130c18054f38060b0c0b1506000000000000000038260c180c130b180b130c1238110e1238270c110a110a0524045b055f0b050b1117270b0d3c0136010b123809024d0104010046650b00116a0c0d0a0d0701210408050b060000000000000000116b270b0804143815353816350c0b0c0a051a3817353818350c0b0c0a0b0a0b0b0c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000a0438050c1238060c160a0d0d120d160b040600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b160c150b120c170b150c130e1338270c110a110a05240459055d0b050b1117270b0d3c0136010b1338090b173811024e0104010047590b00116a0c0f0a0f0701210408050b060000000000000000116b270b080412380e0c0c0c0b0c0a051c380f0c180c160c170b160b170b180c0c0c0b0c0a0b0a0b0b0b0c010c0d350b0d350c120c110b030b07180c100b110b06180a10160c150b100b12180b151a340c0e0a0e0a0526043c05400b050b0e17270a0f3c0036000b043805381d0c140e1438270c130a130a0524044f05530b050b1317270b0f3c0136010b143809024f03000100030a0b000b0138210c0207013c0036000b02380102500004010026170a00116a0c020a020701210408050d0b0001060000000000000000116b270b000b0138210c030b023c0036000b033801025103000100260c07010c010a013c0036000b0038050c020b010b02382802520004010026150b00116a0c020a020701210408050b060000000000000000116b270a023c0036000b0138050c030b020b033828025303000100030a07013c0036000b0138050c020b000b02382802540004010026150b00116a0c030a030701210408050b060000000000000000116b270b033c0036000b0238050c040b010b043828025503000100010607013c0036000b003805025603000100010507013c0036003829025703000100491707013c000c030a03370038000c020a000b022404110b0336000b0038050c0105150b03360038290c010b01020000000f001700";
+    let res = run_binary_test("sample_coin_store", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[test]
+fn sample_liquidity_pool() {
+    let code = "a11ceb0b050000000e0100240224ab0103cf01b6030485056405e905eb0507d40bde0d08b2196006921ab80110ca1bd8070aa223ef010b9125160ca725c9120df0372a0e9a38280000010101020103010401050106000700080009000a000b000c000d000e000f021002110012080300010001000100130003000100010001001406030001000100010015060300010001000100160803000100010001001706030001000100010018060300010001000100190800001a0603000100010001001b0603000100010001001c0603000100010001001d06030001000100010220040100010d210003000100010001033804010601024f05010001025105010001015b0600105e0700027305010001057407001185010700001e00010100001f01010300000000220203030000000023040503000000002401060300000000250107030000000026010403000000002701040300000000280107030000000029010403000000002a010403000000002b080100002c010903000000002d010903000000002e030203000000002f0a0b01000030050103000000003108010300000000320c010300000000330c010300000000340d010300000000350e030300000000360d0103000000085f010901000f6011120010611314000862010901001063151200106407120010651612000766010902000002671c0701000768011501000e691e0700026a1f200100022221010100036b230101060a6c010100046d0828000c6e0827000b2b0801000a2b0801000e6f0415000e7015070002712a010100022e2b2001000e722e070007750101010008760101010001773334000778013503000000022b36370100027938010100027a011401000e7b140700027c012001000b7d010701000b7e0107000931080103000000017f083a01060b80010128000b81010701000b82010701000983014101030000000684010107001186010444001187014415000e88010b150017101a101e1a01181f1b201b1f101f1d2210221d1618231b2422051808182c102c1d2d1b242c0f300030141824312f102f1d30303218331b341b17303510351d3710371d38303a183b393b2c3b223b3b3b313b3c3b3d3b3e2439243e243d3f18243b243c0603030404040400010b0c010b0d03090009010902020b0c0109000b0c010901020303030b0c0109000b0c0109010b010309000901090203040403010301060c010105030303030302040402060c0303070b04030900090109020303040b0c010900030b0c0109010307020208120812081204081201090004040304030108120206081206081201020104020812081201060b0403090009010902030900090109020b0103070b000309000901090204070b04030900090109020b0c01090003030b0c01090103030209000901010b0d0309000901090201060b0c0109000109010304040402070b0c01090003010b0c010900020b0c010900060b10010900010b050309000901090202070b0e01090009000601070b040309000901090203030b0c0109000b0c01090104030404060b040309000901090203060b0403090009010902030301081101050e0303070b0003090009010902030b0c010b0d0309000901090204070b04030900090109020303030303030302070b0c0109000b0c0109000203060b0f010900010b030309000901090206040404040404030303030b01070b0003090009010902070b04030900090109020303040303030403010902010b02030900090109020b0b00030900090109020b10010b0d030900090109020b13010b0d030900090109020b0f010b0d03090009010902081408140b04030900090109020c060807030301060811010c020814081405060c081408140201030b100109000b130109000b0f010900010b13010900010b0803090009010902010b0e010900010b0903090009010902010b0603090009010902010b0b03090009010902010b0a0309000901090202070b0003090009010902070b040309000901090208030303030b0c010900030b0c0109010303050b0c0109000b0c010901100103030303070b0e010b0903090009010902070b0003090009010902070b04030900090109020304030b0c0109000304030b0c01090108010103070b0003090009010902030404040108150e6c69717569646974795f706f6f6c076163636f756e7404636f696e056576656e74067369676e657206737472696e670974696d657374616d700b636f696e5f68656c706572066375727665730b64616f5f73746f7261676509656d657267656e63790d676c6f62616c5f636f6e6669670a6c705f6163636f756e74076c705f636f696e046d6174680c737461626c655f6375727665047532353607757136347836340b4576656e747353746f726509466c6173686c6f616e0e466c6173686c6f616e4576656e74134c697175696469747941646465644576656e740d4c6971756964697479506f6f6c154c697175696469747952656d6f7665644576656e74124f7261636c65557064617465644576656e7415506f6f6c4163636f756e744361706162696c69747910506f6f6c437265617465644576656e7409537761704576656e741155706461746544414f4665654576656e740e5570646174654665654576656e741c6173736572745f6c705f76616c75655f69735f696e63726561736564146173736572745f706f6f6c5f756e6c6f636b656404436f696e024c50046275726e09666c6173686c6f616e156765745f63756d756c61746976655f7072696365730b6765745f64616f5f666565136765745f64616f5f666565735f636f6e666967136765745f646563696d616c735f7363616c6573076765745f6665650f6765745f666565735f636f6e666967116765745f72657365727665735f73697a650a696e697469616c697a650e69735f706f6f6c5f6578697374730e69735f706f6f6c5f6c6f636b6564046d696e741e6e65775f72657365727665735f61667465725f666565735f7363616c65640d7061795f666c6173686c6f616e0872656769737465720b7365745f64616f5f666565077365745f6665651073706c69745f6665655f746f5f64616f04737761700d7570646174655f6f7261636c6513706f6f6c5f637265617465645f68616e646c650b4576656e7448616e646c65166c69717569646974795f61646465645f68616e646c65186c69717569646974795f72656d6f7665645f68616e646c650b737761705f68616e646c6510666c6173686c6f616e5f68616e646c65156f7261636c655f757064617465645f68616e646c65117570646174655f6665655f68616e646c65157570646174655f64616f5f6665655f68616e646c6506785f6c6f616e06795f6c6f616e04785f696e05785f6f757404795f696e05795f6f75740b61646465645f785f76616c0b61646465645f795f76616c126c705f746f6b656e735f72656365697665640e636f696e5f785f726573657276650e636f696e5f795f72657365727665146c6173745f626c6f636b5f74696d657374616d70176c6173745f70726963655f785f63756d756c6174697665176c6173745f70726963655f795f63756d756c61746976650b6c705f6d696e745f6361700e4d696e744361706162696c6974790b6c705f6275726e5f6361700e4275726e4361706162696c69747907785f7363616c6507795f7363616c65066c6f636b6564036665650764616f5f6665650e72657475726e65645f785f76616c0e72657475726e65645f795f76616c106c705f746f6b656e735f6275726e65640a7369676e65725f636170105369676e65724361706162696c6974790763726561746f72076e65775f66656504553235360969735f737461626c65086c705f76616c756507636f6d706172650f69735f756e636f7272656c617465640966726f6d5f753132380866726f6d5f753634036d756c0969735f736f727465640576616c756506737570706c790c6d756c5f6469765f7531323807657874726163740a656d69745f6576656e74136173736572745f6e6f5f656d657267656e63790a616464726573735f6f661372657472696576655f7369676e65725f6361700b6d756c5f746f5f753132380473717274056d65726765076d756c5f64697610467265657a654361706162696c69747906537472696e670e6173736572745f69735f636f696e126173736572745f76616c69645f63757276651d6372656174655f7369676e65725f776974685f6361706162696c6974791b67656e65726174655f6c705f6e616d655f616e645f73796d626f6c1264657374726f795f667265657a655f63617008646563696d616c7306706f775f3130047a65726f0f6765745f64656661756c745f666565136765745f64656661756c745f64616f5f666565106e65775f6576656e745f68616e646c650d6765745f6665655f61646d696e146173736572745f76616c69645f64616f5f666565106173736572745f76616c69645f666565076465706f7369740b6e6f775f7365636f6e64730755513634783634086672616374696f6e07746f5f753132380c6f766572666c6f775f61646449bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b00000000000000000000000000000000000000000000000000000000000000014e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81030864000000000000000308680000000000000003086e0000000000000003086a000000000000000308690000000000000003087000000000000000030866000000000000000308670000000000000003086d0000000000000003086b000000000000000308650000000000000003086f0000000000000003086c00000000000000030810270000000000000308e803000000000000052049bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b126170746f733a3a6d657461646174615f7630c3070d6400000000000000174552525f57524f4e475f504149525f4f52444552494e47335768656e20636f696e73207573656420746f20637265617465207061697220686176652077726f6e67206f72646572696e672e6500000000000000184552525f504f4f4c5f4558495354535f464f525f50414952245768656e207061697220616c726561647920657869737473206f6e206163636f756e742e6600000000000000204552525f4e4f545f454e4f5547485f494e495449414c5f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6700000000000000184552525f4e4f545f454e4f5547485f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6800000000000000114552525f454d5054595f434f494e5f494e335768656e20626f7468205820616e6420592070726f766964656420666f7220737761702061726520657175616c207a65726f2e6900000000000000124552525f494e434f52524543545f535741504b5768656e20696e636f727265637420494e732f4f55547320617267756d656e74732070617373656420647572696e67207377617020616e64206d61746820646f65736e277420776f726b2e6a00000000000000194552525f494e434f52524543545f4255524e5f56414c5545531d496e636f7272656374206c7020636f696e206275726e2076616c7565736b00000000000000174552525f504f4f4c5f444f45535f4e4f545f4558495354225768656e20706f6f6c20646f65736e27742065786973747320666f7220706169722e6c000000000000000f4552525f554e524541434841424c451353686f756c64206e65766572206f636375722e6d00000000000000284552525f4e4f545f454e4f5547485f5045524d495353494f4e535f544f5f494e495449414c495a45525768656e2060696e697469616c697a65282960207472616e73616374696f6e206973207369676e6564207769746820616e79206163636f756e74206f74686572207468616e20406c6971756964737761702e6e00000000000000134552525f454d5054595f434f494e5f4c4f414e385768656e20626f7468205820616e6420592070726f766964656420666f7220666c6173686c6f616e2061726520657175616c207a65726f2e6f00000000000000124552525f504f4f4c5f49535f4c4f434b4544145768656e20706f6f6c206973206c6f636b65642e70000000000000000d4552525f4e4f545f41444d494e165768656e2075736572206973206e6f742061646d696e000208370b0e010b0803090009010902390b0e010b03030900090109023a0b0e010b05030900090109023b0b0e010b09030900090109023c0b0e010b02030900090109023d0b0e010b06030900090109023e0b0e010b0b030900090109023f0b0e010b0a0309000901090201020240034103020204420343034403450303020346034703480304020c490b0c0109004a0b0c0109014b034c044d044e0b0f010b0d03090009010902500b10010b0d03090009010902520353035401550356030502035703580359030602024c044d040702015a08110802015c0509020442034303440345030a02015d030b02015d0304180018051801180318021808180a180b1809180618000000000f3c38000303051a0b020a000b030a0111180c0a0b040b000b050b0111180c080e080e0a11190c060b063102210319070427053b3801031d05390b020b03180c0b0b0b111b070d070d18111c111d0c0c0b04111b0b05111b111d0c090e090e0c11190c070b07310221033b070427070c27020100000104170c070f3d000c000b003700140921030b070b2702020100020004195938020304070027070f3b00030907092738030e0038040c02070f3c000c0538050c040a05370138060c070a05370238070c0a0a02350a07350a0411210c080a02350a0a350b0411210c0b0a0806000000000000000024032d05320a0b060000000000000000240c010534090c010b01033a0b05010703270a0536010a0838080c060a0536020a0b38090c090a050b070b0a380a0b000b053703380b070f3c010c030b0336040b080b0b0b023902380c0b060b0902030100020004243e112538020305070027070f3b00030a07092738030a000600000000000000002403100513080c0205170a01060000000000000000240c020b02031b070227070f3c000c030a03370138060c040a03370238070c050a0336010a0038080c060a0336020a0138090c07080a033600150b030b040b05380a0b060b070b000b013903020401000104251e112538020305070027070f3b00030a0709273803070f3d000c030a033705140c010a033706140c020b033707140c000b010b020b00020501000104171038020304070027070f3b000309070927070f3d000c000b003708140206010001040103380d0700020701000104171338020304070027070f3b000309070927070f3d000c000a003709140b00370a14020801000104171038020304070027070f3b000309070927070f3d000c000b00370b140209010001040103380e070d020a010001042619112538020305070027070f3b00030a0709273803070f3d000c000a00370138060c010b00370238070c020b010b02020b01040027150a001126070f2103090b00010708270a0011270c010a000b0112072d070a0011280b001129020c010000010738020304070027070f3b00020d01000104171038020304070027070f3b000309070927070f3d000c000b00370014020e01000200042976112538020305070027070f3b00030a070927380338050c07070f3c000c080a08370138060c0c0a08370238070c0f0e0038060c0b0e0138070c0e0a07320000000000000000000000000000000021032305350a0b0a0e112a112b0c050a05070e2403300b08010706270b05070e170c03054f0a0b350a070a0c3511210c0a0a0e350b070a0f3511210c0d0a0a0a0d230348054b0b0a0c02054d0b0d0c020b020c030b030c090a090600000000000000002403590b08010707270a0836010b00380f0a0836020b0138100a090a08370c38110c060b080b0c0b0f380a070f3c010c040b04360d0b0b0b0e0b09390438120b06020f0000002d3b38010303050c0b00070d112a0b020a04112a170c06051a38000310070c270b000b020a04070d112e17350c050b050c060b060c093801031f05280b01070d112a0b030b04112a170c0805363800032c070c270b010b030b04070d112e17350c070b070c080b080c0a0b090b0a021001000200042f6e112538020305070027070f3b00030a0709270b023a030c0b0c070e0038060c060e0138070c0a0a06060000000000000000240319051c080c0305200a0a060000000000000000240c030b030324070127070f3c000c050a05370138060c090a05370238070c0d0b090a07160c090b0d0a0b160c0d0a0536010b00380f0a0536020b0138100a05370138060a05370238070a060a0a0a05370b1438130c0c0c080a053709140a05370a140b09350b0d350b080b0c38140a050a060a0a3815090b05360015070f3c010c040b04360e0b060b070b0a0b0b390538160211010001073263112538173818380203090b00010700273819070f3b002003120b0001070a27070f2b070c090b09100f11310c08381a0c060c050e080b050b06310608381b0c040c030c020b03381c0600000000000000000c0a0600000000000000000c0b381d032e0534381e11360c0a381f11360c0b38203821060000000000000000320000000000000000000000000000000032000000000000000000000000000000000b040b020b0a0b0b093822113939000c070e080b073f000e0838230e0838240e0838250e0838260e0838270e0838280e0838290e08382a0e08382b39010c010d01360f0b0011263906382c0e080b013f01021201040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113d070f3c000c030a010b03360815070f3c010c020b0236100b013907382d021301040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113e070f3c000c030a010b03360b15070f3c010c020b0236110b013908382e0214000000403b0a00370b140c0a0a003708140c040a0a0a0418070019060000000000000000220311051a0b0a0b041807001a060100000000000000160c0305200b0a0b041807001a0c030b030c050b010a05070d112e0c060b020b05070d112e0c080a0036010b0638080c070b0036020b0838090c09070f0b070b09382f02150100020004427b112538020305070027070f3b00030a07092738030e0038060c0c0e0238070c100a0c0600000000000000002403160519080c04051d0a10060000000000000000240c040b040321070127070f3c000c0b0a0b370138060c0e0a0b370238070c120a0b36010b00380f0a0b36020b0238100a0b36010a0138080c0f0a0b36020a0338090c130a0b370138060a0b370238070a0c0a100a0b370b1438130c110c0d0a0b3709140a0b370a140a0e350a12350b0d350b113538140a0b0a0c0a1038150b0b0b0e0b12380a070f3c010c0a0b0a36120c090b0c0c050b100c060b010c070b030c080b090b050b070b060b08390938300b0f0b1302160000010043540a003707140c0711400c050a050b0717350c0a0a0a320000000000000000000000000000000024031005150a01060000000000000000220c030517090c030b03031a051f0a02060000000000000000220c040521090c040b040324054f0a020a01114111420a0a180c080b010b02114111420b0a180c090a003705140b0811430a003605150a003706140b0911430a00360615070f3c010c060b0636130a003705140a00370614390a38310b050b003607150204090400040104060002040304040402040b04070408040a04050001000407000000000700060003000500180118021803180418051806180718081809180a180b180c180d180e181018111812181318141800";
+    let res = run_binary_test("sample_liquidity_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions
new file mode 100644
index 000000000..6baf2ee61
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.proptest-regressions
@@ -0,0 +1,10 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 2beb0a0e65962432af560e626fa109d269b07db8807968413425f0bb14bb3667 # shrinks to module = CompiledModule: { struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] }
+cc c14ae393a6eefae82c0f4ede2acaa0aa0e993c1bba3fe3e5958e6e31cb5d2957 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = []
+cc 88615e15ef42d29405cd91d6d0a573ccbeb833d0c7471f718ee794bc5ba399ca # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x4, field_count: 0, fields: 0 }, 	StructDefinition { struct_handle: 2, access: 0x4, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x2, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [] } },] type_signatures: [ 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = [OutOfBoundsMutation { src_kind: StructDefinition, src_idx: Index(0), dst_kind: FieldDefinition, offset: 0 }]
+cc a34039f5d57751762a6eacf3ca3a2857781fb0bd0af0b7a06a9427f896f29aa9 # shrinks to module = CompiledModule: { module_handles: [ 	ModuleHandle { address: AddressPoolIndex(0), name: IdentifierIndex(0) },] struct_handles: [ 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false }, 	StructHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), is_resource: false },] function_handles: [ 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(0) }, 	FunctionHandle { module: ModuleHandleIndex(0), name: IdentifierIndex(0), signature: FunctionSignatureIndex(1) },] struct_defs: [ 	StructDefinition { struct_handle: 1, access: 0x2, field_count: 0, fields: 0 },] field_defs: [] function_defs: [ 	FunctionDefinition { function: 1, access: 0x0, 		code: CodeUnit { 			max_stack_size: 0, 			locals: 0 			code: [ 				BrTrue(1),] } },] type_signatures: [ 	TypeSignature(Unit), 	TypeSignature(Unit),] function_signatures: [ 	FunctionSignature { return_type: Unit, arg_types: [] }, 	FunctionSignature { return_type: Unit, arg_types: [] },] locals_signatures: [ 	LocalsSignature([]),] string_pool: [ 	"",] address_pool: [ 	Address([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),] } , oob_mutations = []
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
new file mode 100644
index 000000000..69df69c40
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
@@ -0,0 +1,464 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use invalid_mutations::bounds::{
+    ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
+    OutOfBoundsMutation,
+};
+use move_binary_format::{
+    check_bounds::BoundsChecker, file_format::*, file_format_common,
+    proptest_types::CompiledModuleStrategyGen,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use proptest::{collection::vec, prelude::*};
+
+#[test]
+fn empty_module_no_errors() {
+    BoundsChecker::verify_module(&basic_test_module()).unwrap();
+}
+
+#[test]
+fn empty_script_no_errors() {
+    BoundsChecker::verify_script(&basic_test_script()).unwrap();
+}
+
+#[test]
+fn invalid_default_module() {
+    BoundsChecker::verify_module(&CompiledModule {
+        version: file_format_common::VERSION_MAX,
+        ..Default::default()
+    })
+    .unwrap_err();
+}
+
+#[test]
+fn invalid_self_module_handle_index() {
+    let mut m = basic_test_module();
+    m.self_module_handle_idx = ModuleHandleIndex(12);
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_fn_return_() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].return_ = SignatureIndex(1);
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(m.signatures.len(), 2);
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_fn_parameters() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].parameters = SignatureIndex(1);
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_script_parameters() {
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.parameters = SignatureIndex(1);
+    s.signatures.push(Signature(vec![TypeParameter(0)]));
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_struct_in_fn_return_() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.function_handles[0].return_ = SignatureIndex(1);
+    m.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(1))]));
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 = TypeParameter(0);
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::INDEX_OUT_OF_BOUNDS
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_struct_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 = Struct(StructHandleIndex::new(3));
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::INDEX_OUT_OF_BOUNDS
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_struct_with_actuals_in_field() {
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    match &mut m.struct_defs[0].field_information {
+        StructFieldInformation::Declared(ref mut fields) => {
+            fields[0].signature.0 =
+                StructInstantiation(StructHandleIndex::new(0), vec![TypeParameter(0)]);
+            assert_eq!(
+                BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH
+            );
+        }
+        _ => panic!("attempt to change a field that does not exist"),
+    }
+}
+
+#[test]
+fn invalid_locals_id_in_call() {
+    use Bytecode::*;
+
+    let mut m = basic_test_module();
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_locals_id_in_call() {
+    use Bytecode::*;
+
+    let mut s = basic_test_script();
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_type_param_in_call() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.signatures.push(Signature(vec![TypeParameter(0)]));
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_type_param_in_call() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.signatures.push(Signature(vec![TypeParameter(0)]));
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_struct_as_type_actual_in_exists() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut m = basic_test_module();
+    m.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    m.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(m.function_instantiations.len() as u16 - 1);
+    m.function_defs[0].code.as_mut().unwrap().code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_invalid_struct_as_type_argument_in_exists() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut s = basic_test_script();
+    s.signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    s.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex::new(0),
+        type_parameters: SignatureIndex::new(1),
+    });
+    let func_inst_idx = FunctionInstantiationIndex(s.function_instantiations.len() as u16 - 1);
+    s.code.code = vec![CallGeneric(func_inst_idx)];
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_friend_module_address() {
+    let mut m = basic_test_module();
+    m.friend_decls.push(ModuleHandle {
+        address: AddressIdentifierIndex::new(m.address_identifiers.len() as TableIndex),
+        name: IdentifierIndex::new(0),
+    });
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_friend_module_name() {
+    let mut m = basic_test_module();
+    m.friend_decls.push(ModuleHandle {
+        address: AddressIdentifierIndex::new(0),
+        name: IdentifierIndex::new(m.identifiers.len() as TableIndex),
+    });
+    assert_eq!(
+        BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn script_missing_signature() {
+    // The basic test script includes parameters pointing to an empty signature.
+    let mut s = basic_test_script();
+    // Remove the empty signature from the script.
+    s.signatures.clear();
+    // Bounds-checking the script should now result in an out-of-bounds error.
+    assert_eq!(
+        BoundsChecker::verify_script(&s).unwrap_err().major_status(),
+        StatusCode::INDEX_OUT_OF_BOUNDS
+    );
+}
+
+#[test]
+fn invalid_signature_for_vector_operation() {
+    use Bytecode::*;
+
+    let skeleton = basic_test_module();
+    let sig_index = SignatureIndex(skeleton.signatures.len() as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+#[test]
+fn invalid_struct_for_vector_operation() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut skeleton = basic_test_module();
+    skeleton
+        .signatures
+        .push(Signature(vec![Struct(StructHandleIndex::new(3))]));
+    let sig_index = SignatureIndex((skeleton.signatures.len() - 1) as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+#[test]
+fn invalid_type_param_for_vector_operation() {
+    use Bytecode::*;
+    use SignatureToken::*;
+
+    let mut skeleton = basic_test_module();
+    skeleton.signatures.push(Signature(vec![TypeParameter(0)]));
+    let sig_index = SignatureIndex((skeleton.signatures.len() - 1) as u16);
+    for bytecode in vec![
+        VecPack(sig_index, 0),
+        VecLen(sig_index),
+        VecImmBorrow(sig_index),
+        VecMutBorrow(sig_index),
+        VecPushBack(sig_index),
+        VecPopBack(sig_index),
+        VecUnpack(sig_index, 0),
+        VecSwap(sig_index),
+    ] {
+        let mut m = skeleton.clone();
+        m.function_defs[0].code.as_mut().unwrap().code = vec![bytecode];
+        assert_eq!(
+            BoundsChecker::verify_module(&m).unwrap_err().major_status(),
+            StatusCode::INDEX_OUT_OF_BOUNDS
+        );
+    }
+}
+
+proptest! {
+    #[test]
+    fn valid_bounds(_module in CompiledModule::valid_strategy(20)) {
+        // valid_strategy will panic if there are any bounds check issues.
+    }
+}
+
+/// Ensure that valid modules that don't have any members (e.g. function args, struct fields) pass
+/// bounds checks.
+///
+/// There are some potentially tricky edge cases around ranges that are captured here.
+#[test]
+fn valid_bounds_no_members() {
+    let mut gen = CompiledModuleStrategyGen::new(20);
+    gen.zeros_all();
+    proptest!(|(_module in gen.generate())| {
+        // gen.generate() will panic if there are any bounds check issues.
+    });
+}
+
+proptest! {
+    #[test]
+    fn invalid_out_of_bounds(
+        module in CompiledModule::valid_strategy(20),
+        oob_mutations in vec(OutOfBoundsMutation::strategy(), 0..40),
+    ) {
+        let (module, expected_violations) = {
+            let oob_context = ApplyOutOfBoundsContext::new(module, oob_mutations);
+            oob_context.apply()
+        };
+
+        let actual_violations = BoundsChecker::verify_module(&module);
+        prop_assert_eq!(expected_violations.is_empty(), actual_violations.is_ok());
+    }
+
+    #[test]
+    fn code_unit_out_of_bounds(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec(CodeUnitBoundsMutation::strategy(), 0..40),
+    ) {
+        let expected_violations = {
+            let context = ApplyCodeUnitBoundsContext::new(&mut module, mutations);
+            context.apply()
+        };
+
+        let actual_violations = BoundsChecker::verify_module(&module);
+        prop_assert_eq!(expected_violations.is_empty(), actual_violations.is_ok());
+    }
+
+    #[test]
+    fn no_module_handles(
+        identifiers in vec(any::<Identifier>(), 0..20),
+        address_identifiers in vec(any::<AccountAddress>(), 0..20),
+    ) {
+        // If there are no module handles, the only other things that can be stored are intrinsic
+        // data.
+        let module = CompiledModule {
+            identifiers,
+            address_identifiers,
+            ..Default::default()
+        };
+
+        prop_assert_eq!(
+            BoundsChecker::verify_module(&module).map_err(|e| e.major_status()),
+            Err(StatusCode::NO_MODULE_HANDLES)
+        );
+    }
+}
+
+proptest! {
+    // Generating arbitrary compiled modules is really slow, possibly because of
+    // https://github.com/AltSysrq/proptest/issues/143.
+    #![proptest_config(ProptestConfig::with_cases(16))]
+
+    /// Make sure that garbage inputs don't crash the bounds checker.
+    #[test]
+    fn garbage_inputs(module in any_with::<CompiledModule>(16)) {
+        let _ = BoundsChecker::verify_module(&module);
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
new file mode 100644
index 000000000..c43d62580
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
@@ -0,0 +1,27 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use fail::FailScenario;
+use move_binary_format::file_format::empty_module;
+use move_core_types::{
+    state::{self, VMState},
+    vm_status::StatusCode,
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::panic::{self, PanicInfo};
+
+#[ignore]
+#[test]
+fn test_unwind() {
+    let scenario = FailScenario::setup();
+    fail::cfg("verifier-failpoint-panic", "panic").unwrap();
+
+    panic::set_hook(Box::new(move |_: &PanicInfo<'_>| {
+        assert_eq!(state::get_state(), VMState::VERIFIER);
+    }));
+
+    let m = empty_module();
+    let res = move_bytecode_verifier::verify_module_with_config(&VerifierConfig::unbounded(), &m)
+        .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VERIFIER_INVARIANT_VIOLATION);
+    scenario.teardown();
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
new file mode 100644
index 000000000..7db6dfe70
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
@@ -0,0 +1,98 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::file_format::Bytecode;
+use move_bytecode_verifier::meter::DummyMeter;
+use move_bytecode_verifier::CodeUnitVerifier;
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+#[test]
+fn invalid_fallthrough_br_true() {
+    let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_false() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+// all non-branch instructions should trigger invalid fallthrough; just check one of them
+#[test]
+fn invalid_fallthrough_non_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn valid_fallthrough_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_ret() {
+    let module = dummy_procedure_module(vec![Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_abort() {
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn test_max_number_of_bytecode() {
+    let mut nops = vec![];
+    for _ in 0..u16::MAX - 1 {
+        nops.push(Bytecode::Nop);
+    }
+    nops.push(Bytecode::Ret);
+    let module = dummy_procedure_module(nops);
+
+    let result =
+        CodeUnitVerifier::verify_module(&VerifierConfig::unbounded(), &module, &mut DummyMeter);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn test_max_basic_blocks() {
+    let mut code = (0..17)
+        .map(|idx| Bytecode::Branch(idx + 1))
+        .collect::<Vec<_>>();
+    code.push(Bytecode::Ret);
+    let module = dummy_procedure_module(code);
+
+    let result = CodeUnitVerifier::verify_module(
+        &VerifierConfig {
+            max_basic_blocks: Some(16),
+            ..Default::default()
+        },
+        &module,
+        &mut DummyMeter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_BASIC_BLOCKS
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
new file mode 100644
index 000000000..2589a8d35
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
@@ -0,0 +1,271 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use move_binary_format::file_format::{empty_module, CompiledModule, Constant, SignatureToken};
+use move_bytecode_verifier::constants;
+use move_core_types::vm_status::StatusCode;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_generated(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(constants::verify_module(&module).is_ok());
+    }
+}
+
+#[test]
+fn valid_primitives() {
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        Constant {
+            type_: SignatureToken::Bool,
+            data: vec![0],
+        },
+        Constant {
+            type_: SignatureToken::U8,
+            data: vec![0],
+        },
+        Constant {
+            type_: SignatureToken::U16,
+            data: vec![0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U32,
+            data: vec![0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U64,
+            data: vec![0, 0, 0, 0, 0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U128,
+            data: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U256,
+            data: vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
+        },
+        Constant {
+            type_: SignatureToken::Address,
+            data: vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
+        },
+    ];
+    assert!(constants::verify_module(&module).is_ok());
+}
+
+#[test]
+fn invalid_primitives() {
+    malformed(SignatureToken::U8, vec![0, 0]);
+    malformed(SignatureToken::U16, vec![0, 0, 0, 0]);
+    malformed(SignatureToken::U32, vec![0, 0, 0]);
+    malformed(SignatureToken::U64, vec![0]);
+    malformed(SignatureToken::U128, vec![0]);
+    malformed(SignatureToken::U256, vec![0, 0]);
+    let data = vec![
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0,
+    ];
+    malformed(SignatureToken::Address, data);
+}
+
+#[test]
+fn valid_vectors() {
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..0xFFFF).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        // empty
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: double_vec(vec![0]),
+        },
+        // small
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        // large
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U16),
+            data: large_vec(vec![0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U32),
+            data: large_vec(vec![0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U64),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U128),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U256),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::Address),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        // double large
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U8)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U16)),
+            data: double_vec(large_vec(vec![0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U32)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U64)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U128)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U256)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Address)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+    ];
+    assert!(constants::verify_module(&module).is_ok());
+}
+
+#[test]
+fn invalid_vectors() {
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let too_large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..(0xFFFF + 1)).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    // wrong inner
+    malformed(tvec(SignatureToken::U16), vec![1, 0]);
+    malformed(tvec(SignatureToken::U32), vec![1, 0]);
+    malformed(tvec(SignatureToken::U64), vec![1, 0]);
+    malformed(
+        tvec(SignatureToken::Address),
+        vec![
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0,
+        ],
+    );
+    // wrong lens
+    malformed(tvec(SignatureToken::U8), vec![0, 0]);
+    malformed(tvec(SignatureToken::U8), vec![0, 1]);
+    malformed(tvec(SignatureToken::U8), vec![2, 1, 1, 1]);
+    malformed(tvec(tvec(SignatureToken::U8)), double_vec(vec![0, 0]));
+    // too large
+    malformed(tvec(SignatureToken::U8), too_large_vec(vec![0]));
+}
+
+#[test]
+fn invalid_types() {
+    invalid_type(SignatureToken::TypeParameter(0), vec![0]);
+    invalid_type(SignatureToken::TypeParameter(0xFA), vec![0]);
+    invalid_type(tvec(SignatureToken::TypeParameter(0)), vec![0]);
+    invalid_type(tvec(SignatureToken::TypeParameter(0xAF)), vec![0]);
+
+    invalid_type(SignatureToken::Signer, vec![0]);
+    invalid_type(tvec(SignatureToken::Signer), vec![0]);
+
+    // TODO cannot check structs are banned currently. This can be handled by IR and source lang
+    // tests
+    // invalid_type(SignatureToken::Struct(StructHandleIndex(0)), vec![0]);
+}
+
+fn tvec(s: SignatureToken) -> SignatureToken {
+    SignatureToken::Vector(Box::new(s))
+}
+
+fn malformed(type_: SignatureToken, data: Vec<u8>) {
+    error(type_, data, StatusCode::MALFORMED_CONSTANT_DATA)
+}
+
+fn invalid_type(type_: SignatureToken, data: Vec<u8>) {
+    error(type_, data, StatusCode::INVALID_CONSTANT_TYPE)
+}
+
+fn error(type_: SignatureToken, data: Vec<u8>, code: StatusCode) {
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant { type_, data }];
+    assert!(
+        constants::verify_module(&module)
+            .unwrap_err()
+            .major_status()
+            == code
+    )
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
new file mode 100644
index 000000000..35826cd72
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
@@ -0,0 +1,240 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::PartialVMResult,
+    file_format::{Bytecode, CompiledModule, FunctionDefinitionIndex, TableIndex},
+};
+use move_bytecode_verifier::{control_flow, meter::DummyMeter};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+fn verify_module(verifier_config: &VerifierConfig, module: &CompiledModule) -> PartialVMResult<()> {
+    for (idx, function_definition) in module
+        .function_defs()
+        .iter()
+        .enumerate()
+        .filter(|(_, def)| !def.is_native())
+    {
+        let current_function = FunctionDefinitionIndex(idx as TableIndex);
+        let code = function_definition
+            .code
+            .as_ref()
+            .expect("unexpected native function");
+
+        control_flow::verify_function(
+            verifier_config,
+            module,
+            current_function,
+            function_definition,
+            code,
+            &mut DummyMeter,
+        )?;
+    }
+    Ok(())
+}
+
+//**************************************************************************************************
+// Simple cases -  Copied from code unit verifier
+//**************************************************************************************************
+
+#[test]
+fn empty_bytecode() {
+    let module = dummy_procedure_module(vec![]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
+#[test]
+fn empty_bytecode_v5() {
+    let mut module = dummy_procedure_module(vec![]);
+    module.version = 5;
+
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_true() {
+    let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn invalid_fallthrough_br_false() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+// all non-branch instructions should trigger invalid fallthrough; just check one of them
+#[test]
+fn invalid_fallthrough_non_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_FALL_THROUGH
+    );
+}
+
+#[test]
+fn valid_fallthrough_branch() {
+    let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_ret() {
+    let module = dummy_procedure_module(vec![Bytecode::Ret]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn valid_fallthrough_abort() {
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_exceed_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::LOOP_MAX_DEPTH_REACHED
+    );
+}
+
+#[test]
+fn non_loop_backward_jump() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn non_loop_backward_jump_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn irreducible_control_flow_graph() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdTrue,
+        Bytecode::BrTrue(3),
+        Bytecode::Nop,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn nested_loop_break() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loop_break_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_BREAK,
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
new file mode 100644
index 000000000..aec512c38
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/dependencies_tests.rs
@@ -0,0 +1,294 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::dependencies;
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+
+fn mk_script_function_module() -> CompiledModule {
+    let m = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("M").unwrap(),    // Module name
+            Identifier::new("fn").unwrap(),   // Function name
+            Identifier::new("g_fn").unwrap(), // Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // fun g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        function_defs: vec![
+            // public(script)  fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // public(script) fun g_fn<T>() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]), // void
+        ],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    move_bytecode_verifier::verify_module_unmetered(&m).unwrap();
+    m
+}
+
+fn mk_invoking_module(use_generic: bool, valid: bool) -> CompiledModule {
+    let call = if use_generic {
+        Bytecode::CallGeneric(FunctionInstantiationIndex(0))
+    } else {
+        Bytecode::Call(FunctionHandleIndex(1))
+    };
+    let m = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+            // other module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(2),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("Test").unwrap(),    // Module name
+            Identifier::new("test_fn").unwrap(), // test name
+            Identifier::new("M").unwrap(),       // Other Module name
+            Identifier::new("fn").unwrap(),      // Other Function name
+            Identifier::new("g_fn").unwrap(),    // Other Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // Self::test_fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(1),
+                name: IdentifierIndex(3),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(1),
+                name: IdentifierIndex(4),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        // 0::M::g_fn<u64>()
+        function_instantiations: vec![FunctionInstantiation {
+            handle: FunctionHandleIndex(2),
+            type_parameters: SignatureIndex(1),
+        }],
+        function_defs: vec![
+            // fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: valid,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![call, Bytecode::Ret],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ],
+        struct_defs: vec![],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        field_instantiations: vec![],
+    };
+    move_bytecode_verifier::verify_module_unmetered(&m).unwrap();
+    m
+}
+
+fn mk_invoking_script(use_generic: bool) -> CompiledScript {
+    let call = if use_generic {
+        Bytecode::CallGeneric(FunctionInstantiationIndex(0))
+    } else {
+        Bytecode::Call(FunctionHandleIndex(0))
+    };
+    let s = CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_4,
+        module_handles: vec![
+            // other module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        identifiers: vec![
+            Identifier::new("M").unwrap(),    // Other Module name
+            Identifier::new("fn").unwrap(),   // Other Function name
+            Identifier::new("g_fn").unwrap(), // Other Generic function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        function_handles: vec![
+            // 0::M::fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // 0::M::g_fn<T>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY],
+            },
+        ],
+        // 0::M::g_fn<u64>()
+        function_instantiations: vec![FunctionInstantiation {
+            handle: FunctionHandleIndex(1),
+            type_parameters: SignatureIndex(1),
+        }],
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![call, Bytecode::Ret],
+        },
+        signatures: vec![
+            Signature(vec![]),                    // void
+            Signature(vec![SignatureToken::U64]), // u64
+        ],
+        struct_handles: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+    };
+    move_bytecode_verifier::verify_script_unmetered(&s).unwrap();
+    s
+}
+
+#[test]
+
+// tests the deprecated Script visibility logic for < V5
+// tests correct permissible invocation of Script functions
+fn deprecated_script_visibility_checks_valid() {
+    let script_function_module = mk_script_function_module();
+    let deps = &[script_function_module];
+
+    // module uses script functions from script context
+    let is_valid = true;
+    let non_generic_call_mod = mk_invoking_module(false, is_valid);
+    let result = dependencies::verify_module(&non_generic_call_mod, deps);
+    assert!(result.is_ok());
+
+    let generic_call_mod = mk_invoking_module(true, is_valid);
+    let result = dependencies::verify_module(&generic_call_mod, deps);
+    assert!(result.is_ok());
+
+    // script uses script functions
+    let non_generic_call_script = mk_invoking_script(false);
+    let result = dependencies::verify_script(&non_generic_call_script, deps);
+    assert!(result.is_ok());
+
+    let generic_call_script = mk_invoking_script(true);
+    let result = dependencies::verify_script(&generic_call_script, deps);
+    assert!(result.is_ok());
+}
+
+#[test]
+// tests the deprecated Script visibility logic for < V5
+// tests correct non-permissible invocation of Script functions
+fn deprecated_script_visibility_checks_invalid() {
+    let script_function_module = mk_script_function_module();
+    let deps = &[script_function_module];
+
+    // module uses script functions from script context
+    let not_valid = false;
+    let non_generic_call_mod = mk_invoking_module(false, not_valid);
+    let result = dependencies::verify_module(&non_generic_call_mod, deps);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+    );
+
+    let generic_call_mod = mk_invoking_module(true, not_valid);
+    let result = dependencies::verify_module(&generic_call_mod, deps);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs
new file mode 100644
index 000000000..640af70c6
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/duplication_tests.rs
@@ -0,0 +1,26 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::DuplicationChecker;
+use proptest::prelude::*;
+
+#[test]
+fn duplicated_friend_decls() {
+    let mut m = basic_test_module();
+    let handle = ModuleHandle {
+        address: AddressIdentifierIndex::new(0),
+        name: IdentifierIndex::new(0),
+    };
+    m.friend_decls.push(handle.clone());
+    m.friend_decls.push(handle);
+    DuplicationChecker::verify_module(&m).unwrap_err();
+}
+
+proptest! {
+    #[test]
+    fn valid_duplication(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(DuplicationChecker::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
new file mode 100644
index 000000000..ef6e43bc1
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/generic_ops_tests.rs
@@ -0,0 +1,740 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::InstructionConsistency;
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+
+// Make a Module with 2 structs and 2 resources with one field each, and 2 functions.
+// One of the struct/resource and one of the function is generic, the other "normal".
+// Also make a test function whose body will be filled by given test cases.
+fn make_module() -> CompiledModule {
+    CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![
+            // only self module
+            ModuleHandle {
+                address: AddressIdentifierIndex(0),
+                name: IdentifierIndex(0),
+            },
+        ],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        identifiers: vec![
+            Identifier::new("M").unwrap(),       // Module name
+            Identifier::new("S").unwrap(),       // Struct name
+            Identifier::new("GS").unwrap(),      // Generic struct name
+            Identifier::new("R").unwrap(),       // Resource name
+            Identifier::new("GR").unwrap(),      // Generic resource name
+            Identifier::new("f").unwrap(),       // Field name
+            Identifier::new("fn").unwrap(),      // Function name
+            Identifier::new("g_fn").unwrap(),    // Generic function name
+            Identifier::new("test_fn").unwrap(), // Test function name
+        ],
+        address_identifiers: vec![
+            AccountAddress::ZERO, // Module address
+        ],
+        struct_handles: vec![
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                abilities: AbilitySet::PRIMITIVES,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(3),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![],
+            },
+            StructHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(4),
+                abilities: AbilitySet::EMPTY | Ability::Key,
+                type_parameters: vec![StructTypeParameter {
+                    constraints: AbilitySet::PRIMITIVES,
+                    is_phantom: false,
+                }],
+            },
+        ],
+        struct_defs: vec![
+            // struct S { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(0),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GS<T> { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(1),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+            // struct R has key { f: u64 }
+            StructDefinition {
+                struct_handle: StructHandleIndex(2),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::U64),
+                }]),
+            },
+            // struct GR<T> has key { f: T }
+            StructDefinition {
+                struct_handle: StructHandleIndex(3),
+                field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                    name: IdentifierIndex(5),
+                    signature: TypeSignature(SignatureToken::TypeParameter(0)),
+                }]),
+            },
+        ],
+        function_handles: vec![
+            // fun fn()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(6),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            // fun g_fn<T: key>()
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(7),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::EMPTY | Ability::Key],
+            },
+            // fun test_fn(Sender)
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(8),
+                parameters: SignatureIndex(1),
+                return_: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+        ],
+        function_defs: vec![
+            // public fun fn() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // fun g_fn<T>() { return; }
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Bytecode::Ret],
+                }),
+            },
+            // fun test_fn() { ... } - tests will fill up the code
+            FunctionDefinition {
+                function: FunctionHandleIndex(2),
+                visibility: Visibility::Private,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![],
+                }),
+            },
+        ],
+        signatures: vec![
+            Signature(vec![]),                       // void
+            Signature(vec![SignatureToken::Signer]), // Signer
+        ],
+        constant_pool: vec![
+            // an address
+            Constant {
+                type_: SignatureToken::Address,
+                data: AccountAddress::random().to_vec(),
+            },
+        ],
+        metadata: vec![],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+    }
+}
+
+#[test]
+fn generic_call_to_non_generic_func() {
+    let mut module = make_module();
+    // bogus `CallGeneric fn()`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::CallGeneric(FunctionInstantiationIndex(0)),
+            Bytecode::Ret,
+        ],
+    });
+    module.function_instantiations.push(FunctionInstantiation {
+        handle: FunctionHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("CallGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_call_to_generic_func() {
+    let mut module = make_module();
+    // bogus `Call g_fn<T>()`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Call to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_pack_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `PackGeneric S`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("PackGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_pack_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `Pack GS<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(1)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Pack to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_unpack_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `UnpackGeneric S`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::UnpackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("UnpackGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_unpack_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `Unpack GS<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Unpack(StructDefinitionIndex(1)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Unpack to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_mut_borrow_field_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowFieldGeneric S.t`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::MutBorrowFieldGeneric(FieldInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module.field_instantiations.push(FieldInstantiation {
+        handle: FieldHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(0),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowFieldGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_mut_borrow_field_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowField GS<T>.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::MutBorrowField(FieldHandleIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(1),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowField to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_borrow_field_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowFieldGeneric S.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(0)),
+            Bytecode::ImmBorrowFieldGeneric(FieldInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module.field_instantiations.push(FieldInstantiation {
+        handle: FieldHandleIndex(0),
+        type_parameters: SignatureIndex(2),
+    });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(0),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowFieldGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_borrow_field_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowField GS<T>.f`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::ImmBorrowField(FieldHandleIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(1),
+            type_parameters: SignatureIndex(2),
+        });
+    module.field_handles.push(FieldHandle {
+        owner: StructDefinitionIndex(1),
+        field: 0,
+    });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowField to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_mut_borrow_global_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowGlobalGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MutBorrowGlobalGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowGlobalGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_mut_borrow_global_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `MutBorrowGlobal GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MutBorrowGlobal(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MutBorrowGlobal to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_immut_borrow_global_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowGlobalGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ImmBorrowGlobalGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowGlobalGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_immut_borrow_global_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `ImmBorrowGlobal GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ImmBorrowGlobal(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ImmBorrowGlobal to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_exists_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `ExistsGeneric R`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::ExistsGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("ExistsGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_exists_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `Exists GR<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::Exists(StructDefinitionIndex(3)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("Exists to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_move_from_to_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveFromGeneric R`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(2));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MoveFromGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Unpack(StructDefinitionIndex(2)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveFromGeneric to non generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_move_from_to_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveFrom GR<T>`
+    module.function_defs[2]
+        .acquires_global_resources
+        .push(StructDefinitionIndex(3));
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::LdConst(ConstantPoolIndex(0)),
+            Bytecode::MoveFrom(StructDefinitionIndex(3)),
+            Bytecode::UnpackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Pop,
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(3),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveFrom to generic function must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn generic_move_to_on_non_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveToGeneric R`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::MoveLoc(0),
+            Bytecode::LdU64(10),
+            Bytecode::Pack(StructDefinitionIndex(2)),
+            Bytecode::MoveToGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(2),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveToGeneric to non generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
+
+#[test]
+fn non_generic_move_to_on_generic_struct() {
+    let mut module = make_module();
+    // bogus `MoveTo GR<T>`
+    module.function_defs[2].code = Some(CodeUnit {
+        locals: SignatureIndex(0),
+        code: vec![
+            Bytecode::MoveLoc(0),
+            Bytecode::LdU64(10),
+            Bytecode::PackGeneric(StructDefInstantiationIndex(0)),
+            Bytecode::MoveTo(StructDefinitionIndex(3)),
+            Bytecode::Ret,
+        ],
+    });
+    module
+        .struct_def_instantiations
+        .push(StructDefInstantiation {
+            def: StructDefinitionIndex(3),
+            type_parameters: SignatureIndex(2),
+        });
+    module.signatures.push(Signature(vec![SignatureToken::U64]));
+    let err = InstructionConsistency::verify_module(&module)
+        .expect_err("MoveTo to generic struct must fail");
+    assert_eq!(
+        err.major_status(),
+        StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
new file mode 100644
index 000000000..ab7e09e49
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
@@ -0,0 +1,159 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const NUM_LOCALS: u8 = 64;
+const NUM_CALLS: u16 = 77;
+const NUM_FUNCTIONS: u16 = 177;
+
+fn get_nested_vec_type(len: usize) -> SignatureToken {
+    let mut ret = SignatureToken::Bool;
+    for _ in 0..len {
+        ret = SignatureToken::Vector(Box::new(ret));
+    }
+    ret
+}
+
+#[test]
+fn test_large_types() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-37qw-jfpw-8899
+    let mut m = empty_module();
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(get_nested_vec_type(64))))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // returns_vecs
+    m.identifiers.push(Identifier::new("returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_and_returns_vecs
+    m.identifiers
+        .push(Identifier::new("takes_and_returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_vecs
+    m.identifiers.push(Identifier::new("takes_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(3),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(3),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // other fcts
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 4),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 4),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 4].code.as_mut().unwrap().code;
+        code.clear();
+        code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(3)));
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_large_types",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED,
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
new file mode 100644
index 000000000..ff0dea343
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
@@ -0,0 +1,890 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::{
+    limits::LimitsVerifier, meter::DummyMeter, verify_module_with_config_for_test,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use move_vm_config::verifier::{VerifierConfig, DEFAULT_MAX_IDENTIFIER_LENGTH};
+
+#[test]
+fn test_function_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_struct_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_function_handle_parameters() {
+    let mut m = basic_test_module();
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+}
+
+#[test]
+fn big_vec_unpacks() {
+    const N_TYPE_PARAMS: usize = 16;
+    let mut st = SignatureToken::Vector(Box::new(SignatureToken::U8));
+    let type_params = vec![st; N_TYPE_PARAMS];
+    st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    const N_VEC_PUSH: u16 = 1000;
+    let mut code = vec![];
+    // 1. CopyLoc:     ...         -> ... st
+    // 2. VecPack:     ... st      -> ... Vec<st>
+    // 3. VecUnpack:   ... Vec<st> -> ... st, st, st, ... st
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1));
+        code.push(Bytecode::VecUnpack(SignatureIndex(1), 1 << 15));
+    }
+    // 1. VecPack:   ... st, st, st, ... st -> ... Vec<st>
+    // 2. Pop:       ... Vec<st>            -> ...
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1 << 15));
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize_with_defaults(&mvbytes).unwrap();
+
+    let res = verify_module_with_config_for_test(
+        "big_vec_unpacks",
+        &VerifierConfig {
+            max_loop_depth: Some(5),
+            max_generic_instantiation_length: Some(32),
+            max_function_parameters: Some(128),
+            max_basic_blocks: Some(1024),
+            max_push_size: Some(10000),
+            ..Default::default()
+        },
+        &module,
+        &mut DummyMeter,
+    );
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::VALUE_STACK_PUSH_OVERFLOW
+    );
+}
+
+const MAX_STRUCTS: usize = 200;
+const MAX_FIELDS: usize = 30;
+const MAX_FUNCTIONS: usize = 1000;
+
+#[test]
+fn max_struct_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 0);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    multi_struct(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_fields_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, MAX_FIELDS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_fields(&mut module, MAX_FIELDS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields(&mut module, MAX_FIELDS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields_except_one(&mut module, 0, 2, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 20);
+    multi_fields_except_one(&mut module, 19, MAX_FIELDS, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields_except_one(&mut module, 50, 1, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_functions_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_functions(&mut module, MAX_FUNCTIONS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_mixed_config_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_function_definitions: None,
+        max_struct_definitions: None,
+        max_fields_in_struct: None,
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 10);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 3);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_identifier_len() {
+    let config = production_config();
+    let max_ident = "z".repeat(
+        config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let good_module = leaf_module(&max_ident);
+
+    let res = LimitsVerifier::verify_module(&config, &good_module);
+    assert!(res.is_ok());
+
+    let config = production_config();
+    let max_ident = "z".repeat(
+        (config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize)
+            / 2,
+    );
+    let good_module = leaf_module(&max_ident);
+
+    let res = LimitsVerifier::verify_module(&config, &good_module);
+    assert!(res.is_ok());
+
+    let over_max_ident = "z".repeat(
+        1 + config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let bad_module = leaf_module(&over_max_ident);
+    let res = LimitsVerifier::verify_module(&config, &bad_module);
+
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::IDENTIFIER_TOO_LONG,
+    );
+
+    let over_max_ident = "zx".repeat(
+        1 + config
+            .max_idenfitier_len
+            .unwrap_or(DEFAULT_MAX_IDENTIFIER_LENGTH) as usize,
+    );
+    let bad_module = leaf_module(&over_max_ident);
+    let res = LimitsVerifier::verify_module(&config, &bad_module);
+
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::IDENTIFIER_TOO_LONG,
+    );
+}
+
+#[test]
+fn max_vec_len() {
+    let config = VerifierConfig {
+        max_constant_vector_len: Some(0xFFFF - 1),
+        ..Default::default()
+    };
+    let double_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![2];
+        items.extend(item.clone());
+        items.extend(item);
+        items
+    };
+    let large_vec = |item: Vec<u8>| -> Vec<u8> {
+        let mut items = vec![0xFF, 0xFF, 3];
+        (0..0xFFFF).for_each(|_| items.extend(item.clone()));
+        items
+    };
+    fn tvec(s: SignatureToken) -> SignatureToken {
+        SignatureToken::Vector(Box::new(s))
+    }
+
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant {
+        type_: tvec(SignatureToken::Bool),
+        data: large_vec(vec![0]),
+    }];
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_VECTOR_ELEMENTS,
+    );
+
+    let mut module = empty_module();
+    module.constant_pool = vec![Constant {
+        type_: tvec(SignatureToken::U256),
+        data: large_vec(vec![
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0,
+        ]),
+    }];
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_VECTOR_ELEMENTS,
+    );
+
+    let config = VerifierConfig {
+        max_constant_vector_len: Some(0xFFFF),
+        ..Default::default()
+    };
+
+    let mut module = empty_module();
+    module.constant_pool = vec![
+        // empty
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: vec![0],
+        },
+        Constant {
+            type_: tvec(tvec(tvec(tvec(SignatureToken::Bool)))),
+            data: double_vec(vec![0]),
+        },
+        // small
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: vec![9, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        },
+        // large
+        Constant {
+            type_: tvec(SignatureToken::Bool),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U8),
+            data: large_vec(vec![0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U16),
+            data: large_vec(vec![0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U32),
+            data: large_vec(vec![0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U64),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U128),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U256),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::Address),
+            data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        },
+        // double large
+        Constant {
+            type_: tvec(tvec(SignatureToken::Bool)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U8)),
+            data: double_vec(large_vec(vec![0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U16)),
+            data: double_vec(large_vec(vec![0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U32)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U64)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U128)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U256)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::Address)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ])),
+        },
+    ];
+    let res = LimitsVerifier::verify_module(&config, &module);
+
+    assert!(res.is_ok());
+}
+
+fn multi_struct(module: &mut CompiledModule, count: usize) {
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("A_{}", i)).unwrap());
+        module.struct_handles.push(StructHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        });
+        module.struct_defs.push(StructDefinition {
+            struct_handle: StructHandleIndex((module.struct_handles.len() - 1) as u16),
+            field_information: StructFieldInformation::Declared(vec![]),
+        });
+    }
+}
+
+fn multi_fields(module: &mut CompiledModule, count: usize) {
+    for def in &mut module.struct_defs {
+        let mut fields = vec![];
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_fields_except_one(module: &mut CompiledModule, idx: usize, count: usize, one: usize) {
+    for (struct_idx, def) in module.struct_defs.iter_mut().enumerate() {
+        let mut fields = vec![];
+        let count = if struct_idx == idx { one } else { count };
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_functions(module: &mut CompiledModule, count: usize) {
+    module.signatures.push(Signature(vec![]));
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("func_{}", i)).unwrap());
+        module.function_handles.push(FunctionHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            parameters: SignatureIndex((module.signatures.len() - 1) as u16),
+            return_: SignatureIndex((module.signatures.len() - 1) as u16),
+            type_parameters: vec![],
+        });
+        module.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex((module.function_handles.len() - 1) as u16),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex((module.signatures.len() - 1) as u16),
+                code: vec![Bytecode::Ret],
+            }),
+        });
+    }
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = AccountAddress::ONE;
+    module
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs
new file mode 100644
index 000000000..d39afa6d0
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs
@@ -0,0 +1,124 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_locals() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-jjqw-f9pc-525j
+    let mut m = empty_module();
+
+    const MAX_BASIC_BLOCKS: u16 = 1024;
+    const MAX_LOCALS: u8 = 255;
+    const NUM_FUNCTIONS: u16 = 16;
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: true,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("pwn").unwrap());
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS / 2 - MAX_LOCALS as u16 - 3) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue((code.len() + 2) as u16));
+            code.push(Bytecode::Ret);
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_locals",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
new file mode 100644
index 000000000..819b94127
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
@@ -0,0 +1,391 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{control_flow_graph::VMControlFlowGraph, file_format::Bytecode};
+use move_bytecode_verifier::loop_summary::{LoopPartition, LoopSummary};
+
+macro_rules! assert_node {
+    ( $summary:ident, $node:expr ; $block:expr, $preds:expr, $descs:expr, $backs:expr ) => {
+        let (s, n) = (&$summary, $node);
+        assert_eq!(s.block(n), $block, "Block");
+
+        let descs = $descs;
+        for d in descs {
+            assert!(s.is_descendant(n, *d), "{:?} -> {:?}", n, d)
+        }
+
+        assert_eq!(s.pred_edges(n), $preds, "Predecessor Edges");
+        assert_eq!(s.back_edges(n), $backs, "Back Edges");
+    };
+}
+
+#[test]
+fn linear_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(2),
+            /* B2, L1 */ Nop,
+            /*        */ Branch(4),
+            /* B4, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 4,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn non_loop_back_branch_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(3),
+            /* B2, L2 */ Ret,
+            /* B3, L1 */ Branch(2),
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branching_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L2 */ Nop,
+            /* B3, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[2]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    // Although L2 -> L1 is an edge in the CFG, it's not an edge in the DFST, so L2 is said to have
+    // no descendants.
+    assert!(!summary.is_descendant(n[2], n[1]));
+}
+
+#[test]
+fn looping_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 4,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branches_in_loops_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L3 */ Nop,
+            /* B3, L1 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 4);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3]],
+        /* backs */ &[n[1]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[3]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 5,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loops_in_branches_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0,  L0 */ LdTrue,
+            /*         */ BrTrue(8),
+            /* B2,  L5   */ Nop,
+            /* B3,  L6     */ LdFalse,
+            /*             */ BrFalse(3),
+            /* B5,  L7   */ LdTrue,
+            /*           */ BrTrue(2),
+            /* B7,  L8 */ Branch(13),
+            /* B8,  L1   */ Nop,
+            /* B9,  L2   */ LdTrue,
+            /*           */ BrTrue(8),
+            /* B11, L3   */ LdFalse,
+            /*           */ BrFalse(9),
+            /* B13, L4 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 9);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3], n[4], n[5], n[6], n[7], n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 8,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2], n[3], n[4]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 9,
+        /* preds */ &[n[1]],
+        /* descs */ &[n[3], n[4]],
+        /* backs */ &[n[3]]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 11,
+        /* preds */ &[n[2]],
+        /* descs */ &[n[4]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[4];
+        /* block */ 13,
+        /* preds */ &[n[3], n[8]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[5];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[6], n[7], n[8]],
+        /* backs */ &[n[7]]
+    );
+
+    assert_node!(
+        summary, n[6];
+        /* block */ 3,
+        /* preds */ &[n[5]],
+        /* descs */ &[n[7], n[8]],
+        /* backs */ &[n[6]]
+    );
+
+    assert_node!(
+        summary, n[7];
+        /* block */ 5,
+        /* preds */ &[n[6]],
+        /* descs */ &[n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[8];
+        /* block */ 7,
+        /* preds */ &[n[7]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    for id in &n {
+        assert_eq!(*id, partition.containing_loop(*id), "Self-parent {:?}", id);
+    }
+
+    assert_eq!(partition.collapse_loop(n[0], &[n[2]].into()), 1);
+    assert_eq!(partition.containing_loop(n[0]), n[0]);
+    assert_eq!(partition.containing_loop(n[1]), n[1]);
+    assert_eq!(partition.containing_loop(n[2]), n[0]);
+}
+
+#[test]
+fn nested_loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /* B1, L1   */ LdTrue,
+            /*          */ BrTrue(1),
+            /* B3, L2 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L3 */ LdTrue,
+            /*        */ BrTrue(0),
+            /* B7, L4 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    // Self-loop is a special case -- its depth should still be bumped.
+    assert_eq!(partition.collapse_loop(n[1], &[].into()), 1);
+    assert_eq!(partition.collapse_loop(n[0], &[n[1], n[2]].into()), 2);
+    assert_eq!(partition.collapse_loop(n[0], &[n[0], n[3]].into()), 3);
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
new file mode 100644
index 000000000..7e8324021
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const MAX_BASIC_BLOCKS: u16 = 1024;
+const MAX_LOCALS: u8 = 255;
+
+const NUM_FUNCTIONS: u16 = 16;
+
+#[test]
+fn many_backedges() {
+    let mut m = empty_module();
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS - MAX_LOCALS as u16 - 2) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(0))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "many_backedges",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs
new file mode 100644
index 000000000..a9b65e033
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -0,0 +1,56 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_config::verifier::{
+    VerifierConfig, DEFAULT_MAX_CONSTANT_VECTOR_LEN, DEFAULT_MAX_IDENTIFIER_LENGTH,
+};
+
+pub mod ability_field_requirements_tests;
+pub mod binary_samples;
+pub mod bounds_tests;
+pub mod code_unit_tests;
+pub mod constants_tests;
+pub mod control_flow_tests;
+pub mod dependencies_tests;
+pub mod duplication_tests;
+pub mod generic_ops_tests;
+pub mod large_type_test;
+pub mod limit_tests;
+pub mod locals;
+pub mod loop_summary_tests;
+pub mod many_back_edges;
+pub mod multi_pass_tests;
+pub mod negative_stack_size_tests;
+pub mod reference_safety_tests;
+pub mod signature_tests;
+pub mod struct_defs_tests;
+pub mod vec_pack_tests;
+
+/// Configuration used in production.
+pub(crate) fn production_config() -> VerifierConfig {
+    VerifierConfig {
+        max_loop_depth: Some(5),
+        max_generic_instantiation_length: Some(32),
+        max_function_parameters: Some(128),
+        max_basic_blocks: Some(1024),
+        max_basic_blocks_in_script: Some(1024),
+        max_value_stack_size: 1024,
+        max_type_nodes: Some(256),
+        max_push_size: Some(10000),
+        max_dependency_depth: Some(100),
+        max_struct_definitions: Some(200),
+        max_fields_in_struct: Some(30),
+        max_function_definitions: Some(1000),
+
+        // Do not use back edge constraints as they are superseded by metering
+        max_back_edges_per_function: None,
+        max_back_edges_per_module: None,
+
+        // Same as the default.
+        max_per_fun_meter_units: Some(1000 * 8000),
+        max_per_mod_meter_units: Some(1000 * 8000),
+        max_constant_vector_len: Some(DEFAULT_MAX_CONSTANT_VECTOR_LEN),
+        max_idenfitier_len: Some(DEFAULT_MAX_IDENTIFIER_LENGTH),
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs
new file mode 100644
index 000000000..d244f6dd3
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/multi_pass_tests.rs
@@ -0,0 +1,23 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::CompiledModule;
+use move_bytecode_verifier::{
+    ability_field_requirements, constants, instantiation_loops::InstantiationLoopChecker,
+    DuplicationChecker, InstructionConsistency, RecursiveStructDefChecker, SignatureChecker,
+};
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn check_verifier_passes(module in CompiledModule::valid_strategy(20)) {
+        DuplicationChecker::verify_module(&module).expect("DuplicationChecker failure");
+        SignatureChecker::verify_module(&module).expect("SignatureChecker failure");
+        InstructionConsistency::verify_module(&module).expect("InstructionConsistency failure");
+        constants::verify_module(&module).expect("constants failure");
+        ability_field_requirements::verify_module(&module).expect("ability_field_requirements failure");
+        RecursiveStructDefChecker::verify_module(&module).expect("RecursiveStructDefChecker failure");
+        InstantiationLoopChecker::verify_module(&module).expect("InstantiationLoopChecker failure");
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
new file mode 100644
index 000000000..3b1c387e4
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
@@ -0,0 +1,51 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::support::dummy_procedure_module;
+use move_binary_format::file_format::Bytecode;
+use move_bytecode_verifier::meter::DummyMeter;
+use move_bytecode_verifier::CodeUnitVerifier;
+use move_core_types::vm_status::StatusCode;
+
+#[test]
+fn one_pop_no_push() {
+    let module = dummy_procedure_module(vec![Bytecode::Pop, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn one_pop_one_push() {
+    // Height: 0 + (-1 + 1) = 0 would have passed original usage verifier
+    let module = dummy_procedure_module(vec![Bytecode::ReadRef, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn two_pop_one_push() {
+    // Height: 0 + 1 + (-2 + 1) = 0 would have passed original usage verifier
+    let module = dummy_procedure_module(vec![Bytecode::LdU64(0), Bytecode::Add, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
+
+#[test]
+fn two_pop_no_push() {
+    let module = dummy_procedure_module(vec![Bytecode::WriteRef, Bytecode::Ret]);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
new file mode 100644
index 000000000..35ae4385f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
@@ -0,0 +1,435 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_bytecode_verifier::meter::BoundMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_bicliques() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-xm6p-ffcq-5p2v
+    const NUM_LOCALS: u8 = 128;
+    const NUM_CALLS: u16 = 76;
+    const NUM_FUNCTIONS: u16 = 1;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // create take_and_return_references
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U64)))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+    m.identifiers
+        .push(Identifier::new("take_and_return_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+    let code = &mut m.function_defs[1].code.as_mut().unwrap().code;
+    for i in 0..NUM_LOCALS {
+        code.push(Bytecode::MoveLoc(i));
+    }
+    code.push(Bytecode::Ret);
+
+    // create swallow_references
+    m.identifiers
+        .push(Identifier::new("swallow_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 2),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 2].code.as_mut().unwrap().code;
+        for j in 0..NUM_LOCALS {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_bicliques",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state_large_graph() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const N: u8 = 127;
+    const NUM_NOP_BLOCKS: u16 = 950;
+    const NUM_FUNCTIONS: u16 = 18;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(N as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    m.identifiers
+        .push(Identifier::new("take_and_return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 3),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 3),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 3].code.as_mut().unwrap().code;
+        for j in 0..N {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        for j in 0..N {
+            code.push(Bytecode::StLoc(N + j));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state_large_graph",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const NUM_NOP_BLOCKS: u16 = 965;
+    const NUM_LOCALS: u8 = 32;
+    const NUM_FUNCTIONS: u16 = 21;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U8,
+        ))]));
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(NUM_LOCALS as usize - 1)
+            .collect(),
+    ));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create a path of length NUM_LOCALS - 1 in the borrow graph
+        for j in 0..(NUM_LOCALS - 2) {
+            // create Ref(new_id) and factor in empty-path edge id -> new_id
+            code.push(Bytecode::CopyLoc(1));
+            // can't leave those references on stack since basic blocks need to be stack-neutral
+            code.push(Bytecode::StLoc(j + 2));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            // create back edge to first block
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_copyloc_pop() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-2qvr-c9qp-wch7
+    const NUM_COPYLOCS: u16 = 1880;
+    const NUM_CHILDREN: u16 = 1020;
+    const NUM_FUNCTIONS: u16 = 2;
+
+    let mut m = empty_module();
+
+    // parameters of f0, f1, ...
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::U8)),
+        ))]));
+    // locals of f0, f1, ...
+    m.signatures.push(Signature(vec![
+        SignatureToken::Reference(Box::new(SignatureToken::Vector(Box::new(
+            SignatureToken::U8,
+        )))),
+        SignatureToken::U8, // ignore this, it's just here because I don't want to fix indices and the TypeParameter after removing the collision
+    ]));
+    // for VecImmBorrow
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8).take(1).collect(),
+    ));
+    m.signatures
+        .push(Signature(vec![SignatureToken::TypeParameter(0)]));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create NUM_CHLIDREN children of id
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::LdU64(0));
+            code.push(Bytecode::VecImmBorrow(SignatureIndex(3)));
+        }
+        // then do a whole lot of copylocs on that reference
+        for _ in 0..NUM_COPYLOCS {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::Pop);
+        }
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::Pop);
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let config = production_config();
+    let mut meter = BoundMeter::new(&config);
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_copyloc_pop",
+        &config,
+        &m,
+        &mut meter,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
new file mode 100644
index 000000000..3f9989200
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -0,0 +1,227 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
+use move_binary_format::file_format::{
+    Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
+};
+use move_bytecode_verifier::{
+    meter::DummyMeter, verify_module_unmetered, verify_module_with_config_for_test,
+    SignatureChecker,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use proptest::{collection::vec, prelude::*, sample::Index as PropIndex};
+
+#[test]
+fn test_reference_of_reference() {
+    let mut m = basic_test_module();
+    m.signatures[0] = Signature(vec![Reference(Box::new(Reference(Box::new(
+        SignatureToken::Bool,
+    ))))]);
+    let errors = SignatureChecker::verify_module(&m);
+    assert!(errors.is_err());
+}
+
+proptest! {
+    #[test]
+    fn valid_signatures(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(SignatureChecker::verify_module(&module).is_ok())
+    }
+
+    #[test]
+    fn double_refs(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec((any::<PropIndex>(), any::<PropIndex>()), 0..20),
+    ) {
+        let context = SignatureRefMutation::new(&mut module, mutations);
+        let expected_violations = context.apply();
+
+        let result = SignatureChecker::verify_module(&module);
+
+        prop_assert_eq!(expected_violations, result.is_err());
+    }
+
+    #[test]
+    fn field_def_references(
+        mut module in CompiledModule::valid_strategy(20),
+        mutations in vec((any::<PropIndex>(), any::<PropIndex>()), 0..40),
+    ) {
+        let context = FieldRefMutation::new(&mut module, mutations);
+        let expected_violations = context.apply();
+
+        let result = SignatureChecker::verify_module(&module);
+
+        prop_assert_eq!(expected_violations, result.is_err());
+    }
+}
+
+#[test]
+fn no_verify_locals_good() {
+    let compiled_module_good = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        self_module_handle_idx: ModuleHandleIndex(0),
+        struct_handles: vec![],
+        signatures: vec![
+            Signature(vec![Address]),
+            Signature(vec![U64]),
+            Signature(vec![]),
+        ],
+        function_handles: vec![
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(1),
+                return_: SignatureIndex(2),
+                parameters: SignatureIndex(0),
+                type_parameters: vec![],
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(2),
+                return_: SignatureIndex(2),
+                parameters: SignatureIndex(1),
+                type_parameters: vec![],
+            },
+        ],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        identifiers: vec![
+            Identifier::new("Bad").unwrap(),
+            Identifier::new("blah").unwrap(),
+            Identifier::new("foo").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::new([0; AccountAddress::LENGTH])],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(0),
+                    code: vec![Ret],
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(1),
+                    code: vec![Ret],
+                }),
+            },
+        ],
+    };
+    assert!(verify_module_unmetered(&compiled_module_good).is_ok());
+}
+
+#[test]
+fn big_signature_test() {
+    const N_TYPE_PARAMS: usize = 5;
+    const INSTANTIATION_DEPTH: usize = 3;
+    const VECTOR_DEPTH: usize = 250;
+    let mut st = SignatureToken::U8;
+    for _ in 0..VECTOR_DEPTH {
+        st = SignatureToken::Vector(Box::new(st));
+    }
+    for _ in 0..INSTANTIATION_DEPTH {
+        let type_params = vec![st; N_TYPE_PARAMS];
+        st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    }
+
+    const N_READPOP: u16 = 7500;
+
+    let mut code = vec![];
+    // 1. ImmBorrowLoc: ... ref
+    // 2. ReadRef:      ... value
+    // 3. Pop:          ...
+    for _ in 0..N_READPOP {
+        code.push(Bytecode::ImmBorrowLoc(0));
+        code.push(Bytecode::ReadRef);
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize_with_defaults(&mvbytes).unwrap();
+
+    let res = verify_module_with_config_for_test(
+        "big_signature_test",
+        &production_config(),
+        &module,
+        &mut DummyMeter,
+    )
+    .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs
new file mode 100644
index 000000000..71fdc4660
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/struct_defs_tests.rs
@@ -0,0 +1,14 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::CompiledModule;
+use move_bytecode_verifier::RecursiveStructDefChecker;
+use proptest::prelude::*;
+
+proptest! {
+    #[test]
+    fn valid_recursive_struct_defs(module in CompiledModule::valid_strategy(20)) {
+        prop_assert!(RecursiveStructDefChecker::verify_module(&module).is_ok());
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
new file mode 100644
index 000000000..672c255c7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
@@ -0,0 +1,71 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, Visibility,
+};
+use move_bytecode_verifier::meter::DummyMeter;
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+fn vec_sig(len: usize) -> SignatureToken {
+    if len > 0 {
+        SignatureToken::Vector(Box::new(vec_sig(len - 1)))
+    } else {
+        SignatureToken::U8
+    }
+}
+
+#[test]
+fn test_vec_pack() {
+    let mut m = empty_module();
+
+    let sig = SignatureIndex(m.signatures.len() as u16);
+    m.signatures.push(Signature(vec![vec_sig(255)]));
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Private,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(m.identifiers.len() as u16),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.identifiers
+        .push(Identifier::new("foo".to_string()).unwrap());
+
+    const COUNT: usize = 3000;
+
+    m.function_defs[0].code.as_mut().unwrap().code =
+        std::iter::once(&[Bytecode::VecPack(sig, 0)][..])
+            .chain(
+                std::iter::repeat(
+                    &[Bytecode::VecUnpack(sig, 1024), Bytecode::VecPack(sig, 1024)][..],
+                )
+                .take(COUNT),
+            )
+            .chain(std::iter::once(&[Bytecode::Pop, Bytecode::Ret][..]))
+            .flatten()
+            .cloned()
+            .collect();
+
+    let res = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_vec_pack",
+        &production_config(),
+        &m,
+        &mut DummyMeter,
+    )
+    .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VALUE_STACK_PUSH_OVERFLOW);
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/.gitignore b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/.gitignore
new file mode 100644
index 000000000..a0925114d
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/.gitignore
@@ -0,0 +1,3 @@
+target
+corpus
+artifacts
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/Cargo.toml b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/Cargo.toml
new file mode 100644
index 000000000..23ba1eb8c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "bytecode-verifier-libfuzzer"
+version = "0.0.0"
+authors = ["Diem Association <opensource@diem.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys.workspace = true
+arbitrary.workspace = true
+move-bytecode-verifier.workspace = true
+move-core-types = { workspace = true, features = ["fuzzing"] }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+
+# Prevent this from interfering with workspaces
+#[workspace]
+#members = ["."]
+
+[[bin]]
+name = "code_unit"
+path = "fuzz_targets/code_unit.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "compiled_module"
+path = "fuzz_targets/compiled_module.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "mixed"
+path = "fuzz_targets/mixed.rs"
+test = false
+doc = false
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/README.md b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/README.md
new file mode 100644
index 000000000..633a4797a
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/README.md
@@ -0,0 +1,4 @@
+See the [Rust fuzzing book](https://rust-fuzz.github.io/book/)
+for how to use the fuzz targets in this directory. Notice that
+`cargo +nightly fuzz run <target>` need to be executed in the parent
+directory; nightly is required.
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs
new file mode 100644
index 000000000..7548af284
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex,
+    SignatureToken::{Address, Bool, U128, U64},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|code_unit: CodeUnit| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs
new file mode 100644
index 000000000..ea2859b19
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use libfuzzer_sys::fuzz_target;
+use move_binary_format::file_format::CompiledModule;
+
+fuzz_target!(|module: CompiledModule| {
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs
new file mode 100644
index 000000000..fb2bc6edc
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs
@@ -0,0 +1,97 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, Bytecode, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex, SignatureToken,
+    SignatureToken::{Address, Bool},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use arbitrary::Arbitrary;
+use libfuzzer_sys::fuzz_target;
+
+#[derive(Arbitrary, Debug)]
+struct Mixed {
+    code: Vec<Bytecode>,
+    abilities: AbilitySet,
+    param_types: Vec<SignatureToken>,
+    return_type: Option<SignatureToken>,
+}
+
+fuzz_target!(|mix: Mixed| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: mix.abilities,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(mix.param_types));
+    module.signatures.push(Signature(
+        mix.return_type.map(|s| vec![s]).unwrap_or_default(),
+    ));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: mix.code,
+        locals: SignatureIndex(0),
+    };
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module_unmetered(&module);
+});
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/Cargo.toml b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/Cargo.toml
new file mode 100644
index 000000000..a45f26d66
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "invalid-mutations"
+version = "0.1.0"
+edition = "2021"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem invalid mutations"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+[dependencies]
+move-core-types.workspace = true
+move-binary-format.workspace = true
+proptest.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds.rs
new file mode 100644
index 000000000..67f337e4c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds.rs
@@ -0,0 +1,364 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{bounds_error, PartialVMError},
+    file_format::{
+        AddressIdentifierIndex, CompiledModule, FunctionHandleIndex, IdentifierIndex,
+        ModuleHandleIndex, SignatureIndex, StructDefinitionIndex, StructHandleIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    views::{ModuleView, SignatureTokenView},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use proptest::{
+    prelude::*,
+    sample::{self, Index as PropIndex},
+};
+use std::collections::BTreeMap;
+
+mod code_unit;
+pub use code_unit::{ApplyCodeUnitBoundsContext, CodeUnitBoundsMutation};
+use move_binary_format::file_format::SignatureToken;
+
+/// Represents the number of pointers that exist out from a node of a particular kind.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum PointerKind {
+    /// Exactly one pointer out with this index kind as its destination.
+    One(IndexKind),
+    /// Zero or one pointer out with this index kind as its destination. Like the `?` operator in
+    /// regular expressions.
+    Optional(IndexKind),
+    /// Zero or more pointers out with this index kind as its destination. Like the `*` operator
+    /// in regular expressions.
+    Star(IndexKind),
+}
+
+impl PointerKind {
+    /// A list of what pointers (indexes) exist out from a particular kind of node within the
+    /// module.
+    ///
+    /// The only special case is `FunctionDefinition`, which contains a `CodeUnit` that can contain
+    /// one of several kinds of pointers out. That is not represented in this table.
+    #[inline]
+    pub fn pointers_from(src_kind: IndexKind) -> &'static [PointerKind] {
+        use IndexKind::*;
+        use PointerKind::*;
+
+        match src_kind {
+            ModuleHandle => &[One(AddressIdentifier), One(Identifier)],
+            StructHandle => &[One(ModuleHandle), One(Identifier)],
+            FunctionHandle => &[
+                One(ModuleHandle),
+                One(Identifier),
+                One(Signature),
+                One(Signature),
+            ],
+            StructDefinition => &[One(StructHandle), Star(StructHandle)],
+            FunctionDefinition => &[One(FunctionHandle), One(Signature)],
+            FriendDeclaration => &[One(AddressIdentifier), One(Identifier)],
+            Signature => &[Star(StructHandle)],
+            FieldHandle => &[One(StructDefinition)],
+            _ => &[],
+        }
+    }
+
+    #[inline]
+    pub fn to_index_kind(self) -> IndexKind {
+        match self {
+            PointerKind::One(idx) | PointerKind::Optional(idx) | PointerKind::Star(idx) => idx,
+        }
+    }
+}
+
+pub static VALID_POINTER_SRCS: &[IndexKind] = &[
+    IndexKind::ModuleHandle,
+    IndexKind::StructHandle,
+    IndexKind::FunctionHandle,
+    IndexKind::FieldHandle,
+    IndexKind::StructDefinition,
+    IndexKind::FunctionDefinition,
+    IndexKind::FriendDeclaration,
+    IndexKind::Signature,
+];
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn pointer_kind_sanity() {
+        for variant in IndexKind::variants() {
+            if VALID_POINTER_SRCS.iter().any(|x| x == variant) {
+                assert!(
+                    !PointerKind::pointers_from(*variant).is_empty(),
+                    "expected variant {:?} to be a valid pointer source",
+                    variant,
+                );
+            } else {
+                assert!(
+                    PointerKind::pointers_from(*variant).is_empty(),
+                    "expected variant {:?} to not be a valid pointer source",
+                    variant,
+                );
+            }
+        }
+    }
+}
+
+/// Represents a single mutation to a `CompiledModule` to produce an out-of-bounds situation.
+///
+/// Use `OutOfBoundsMutation::strategy()` to generate them, preferably using `Vec` to generate
+/// many at a time. Then use `ApplyOutOfBoundsContext` to apply those mutations.
+#[derive(Debug)]
+pub struct OutOfBoundsMutation {
+    src_kind: IndexKind,
+    src_idx: PropIndex,
+    dst_kind: IndexKind,
+    offset: usize,
+}
+
+impl OutOfBoundsMutation {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        (
+            Self::src_kind_strategy(),
+            any::<PropIndex>(),
+            any::<PropIndex>(),
+            0..16_usize,
+        )
+            .prop_map(|(src_kind, src_idx, dst_kind_idx, offset)| {
+                let dst_kind = Self::dst_kind(src_kind, dst_kind_idx);
+                Self {
+                    src_kind,
+                    src_idx,
+                    dst_kind,
+                    offset,
+                }
+            })
+    }
+
+    // Not all source kinds can be made to be out of bounds (e.g. inherent types can't.)
+    fn src_kind_strategy() -> impl Strategy<Value = IndexKind> {
+        sample::select(VALID_POINTER_SRCS)
+    }
+
+    fn dst_kind(src_kind: IndexKind, dst_kind_idx: PropIndex) -> IndexKind {
+        dst_kind_idx
+            .get(PointerKind::pointers_from(src_kind))
+            .to_index_kind()
+    }
+}
+
+/// This is used for source indexing, to work with pick_slice_idxs.
+impl AsRef<PropIndex> for OutOfBoundsMutation {
+    #[inline]
+    fn as_ref(&self) -> &PropIndex {
+        &self.src_idx
+    }
+}
+
+pub struct ApplyOutOfBoundsContext {
+    module: CompiledModule,
+    // This is an Option because it gets moved out in apply before apply_one is called. Rust
+    // doesn't let you call another con-consuming method after a partial move out.
+    mutations: Option<Vec<OutOfBoundsMutation>>,
+
+    // Some precomputations done for signatures.
+    sig_structs: Vec<(SignatureIndex, usize)>,
+}
+
+impl ApplyOutOfBoundsContext {
+    pub fn new(module: CompiledModule, mutations: Vec<OutOfBoundsMutation>) -> Self {
+        let sig_structs: Vec<_> = Self::sig_structs(&module).collect();
+
+        Self {
+            module,
+            mutations: Some(mutations),
+            sig_structs,
+        }
+    }
+
+    pub fn apply(mut self) -> (CompiledModule, Vec<PartialVMError>) {
+        // This is a map from (source kind, dest kind) to the actual mutations -- this is done to
+        // figure out how many mutations to do for a particular pair, which is required for
+        // pick_slice_idxs below.
+        let mut mutation_map = BTreeMap::new();
+        for mutation in self
+            .mutations
+            .take()
+            .expect("mutations should always be present")
+        {
+            mutation_map
+                .entry((mutation.src_kind, mutation.dst_kind))
+                .or_default()
+                .push(mutation);
+        }
+
+        let mut results = vec![];
+
+        for ((src_kind, dst_kind), mutations) in mutation_map {
+            // It would be cool to use an iterator here, if someone could figure out exactly how
+            // to get the lifetimes right :)
+            results.extend(self.apply_one(src_kind, dst_kind, mutations));
+        }
+        (self.module, results)
+    }
+
+    fn apply_one(
+        &mut self,
+        src_kind: IndexKind,
+        dst_kind: IndexKind,
+        mutations: Vec<OutOfBoundsMutation>,
+    ) -> Vec<PartialVMError> {
+        let src_count = match src_kind {
+            IndexKind::Signature => self.sig_structs.len(),
+            // For the other sorts it's always possible to change an index.
+            src_kind => self.module.kind_count(src_kind),
+        };
+        // Any signature can be a destination, not just the ones that have structs in them.
+        let dst_count = self.module.kind_count(dst_kind);
+        let to_mutate = crate::helpers::pick_slice_idxs(src_count, &mutations);
+
+        mutations
+            .iter()
+            .zip(to_mutate)
+            .map(move |(mutation, src_idx)| {
+                self.set_index(
+                    src_kind,
+                    src_idx,
+                    dst_kind,
+                    dst_count,
+                    (dst_count + mutation.offset) as TableIndex,
+                )
+            })
+            .collect()
+    }
+
+    /// Sets the particular index in the table
+    ///
+    /// For example, with `src_kind` set to `ModuleHandle` and `dst_kind` set to `AddressPool`,
+    /// this will set self.module_handles[src_idx].address to new_idx.
+    ///
+    /// This is mainly used for test generation.
+    fn set_index(
+        &mut self,
+        src_kind: IndexKind,
+        src_idx: usize,
+        dst_kind: IndexKind,
+        dst_count: usize,
+        new_idx: TableIndex,
+    ) -> PartialVMError {
+        use IndexKind::*;
+
+        // These are default values, but some of the match arms below mutate them.
+        let mut src_idx = src_idx;
+        let err = bounds_error(
+            StatusCode::INDEX_OUT_OF_BOUNDS,
+            dst_kind,
+            new_idx,
+            dst_count,
+        );
+
+        // A dynamic type system would be able to express this next block of code far more
+        // concisely. A static type system would require some sort of complicated dependent type
+        // structure that Rust doesn't have. As things stand today, every possible case needs to
+        // be listed out.
+
+        match (src_kind, dst_kind) {
+            (ModuleHandle, AddressIdentifier) => {
+                self.module.module_handles[src_idx].address = AddressIdentifierIndex(new_idx)
+            }
+            (ModuleHandle, Identifier) => {
+                self.module.module_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (StructHandle, ModuleHandle) => {
+                self.module.struct_handles[src_idx].module = ModuleHandleIndex(new_idx)
+            }
+            (StructHandle, Identifier) => {
+                self.module.struct_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (FunctionHandle, ModuleHandle) => {
+                self.module.function_handles[src_idx].module = ModuleHandleIndex(new_idx)
+            }
+            (FunctionHandle, Identifier) => {
+                self.module.function_handles[src_idx].name = IdentifierIndex(new_idx)
+            }
+            (FunctionHandle, Signature) => {
+                self.module.function_handles[src_idx].parameters = SignatureIndex(new_idx)
+            }
+            (StructDefinition, StructHandle) => {
+                self.module.struct_defs[src_idx].struct_handle = StructHandleIndex(new_idx)
+            }
+            (FunctionDefinition, FunctionHandle) => {
+                self.module.function_defs[src_idx].function = FunctionHandleIndex(new_idx)
+            }
+            (FunctionDefinition, Signature) => {
+                self.module.function_defs[src_idx]
+                    .code
+                    .as_mut()
+                    .unwrap()
+                    .locals = SignatureIndex(new_idx)
+            }
+            (Signature, StructHandle) => {
+                let (actual_src_idx, arg_idx) = self.sig_structs[src_idx];
+                src_idx = actual_src_idx.into_index();
+                self.module.signatures[src_idx].0[arg_idx]
+                    .debug_set_sh_idx(StructHandleIndex(new_idx));
+            }
+            (FieldHandle, StructDefinition) => {
+                self.module.field_handles[src_idx].owner = StructDefinitionIndex(new_idx)
+            }
+            (FriendDeclaration, AddressIdentifier) => {
+                self.module.friend_decls[src_idx].address = AddressIdentifierIndex(new_idx)
+            }
+            (FriendDeclaration, Identifier) => {
+                self.module.friend_decls[src_idx].name = IdentifierIndex(new_idx)
+            }
+            _ => panic!("Invalid pointer kind: {:?} -> {:?}", src_kind, dst_kind),
+        }
+
+        err.at_index(src_kind, src_idx as TableIndex)
+    }
+
+    /// Returns the indexes of locals signatures that contain struct handles inside them.
+    fn sig_structs(module: &CompiledModule) -> impl Iterator<Item = (SignatureIndex, usize)> + '_ {
+        let module_view = ModuleView::new(module);
+        module_view
+            .signatures()
+            .enumerate()
+            .flat_map(|(idx, signature)| {
+                let idx = SignatureIndex(idx as u16);
+                Self::find_struct_tokens(signature.tokens(), move |arg_idx| (idx, arg_idx))
+            })
+    }
+
+    #[inline]
+    fn find_struct_tokens<'b, F, T>(
+        tokens: impl IntoIterator<Item = SignatureTokenView<'b, CompiledModule>> + 'b,
+        map_fn: F,
+    ) -> impl Iterator<Item = T> + 'b
+    where
+        F: Fn(usize) -> T + 'b,
+    {
+        tokens
+            .into_iter()
+            .enumerate()
+            .filter_map(move |(arg_idx, token)| {
+                struct_handle(token.signature_token()).map(|_| map_fn(arg_idx))
+            })
+    }
+}
+
+fn struct_handle(token: &SignatureToken) -> Option<StructHandleIndex> {
+    use SignatureToken::*;
+
+    match token {
+        Struct(sh_idx) => Some(*sh_idx),
+        StructInstantiation(sh_idx, _) => Some(*sh_idx),
+        Reference(token) | MutableReference(token) => struct_handle(token),
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer | Vector(_)
+        | TypeParameter(_) => None,
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
new file mode 100644
index 000000000..f086a1ece
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
@@ -0,0 +1,544 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::{offset_out_of_bounds, PartialVMError},
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, ConstantPoolIndex, FieldHandleIndex,
+        FieldInstantiationIndex, FunctionDefinitionIndex, FunctionHandleIndex,
+        FunctionInstantiationIndex, LocalIndex, SignatureIndex, StructDefInstantiationIndex,
+        StructDefinitionIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use proptest::{prelude::*, sample::Index as PropIndex};
+use std::collections::BTreeMap;
+
+/// Represents a single mutation onto a code unit to make it out of bounds.
+#[derive(Debug)]
+pub struct CodeUnitBoundsMutation {
+    function_def: PropIndex,
+    bytecode: PropIndex,
+    offset: usize,
+}
+
+impl CodeUnitBoundsMutation {
+    pub fn strategy() -> impl Strategy<Value = Self> {
+        (any::<PropIndex>(), any::<PropIndex>(), 0..16_usize).prop_map(
+            |(function_def, bytecode, offset)| Self {
+                function_def,
+                bytecode,
+                offset,
+            },
+        )
+    }
+}
+
+impl AsRef<PropIndex> for CodeUnitBoundsMutation {
+    #[inline]
+    fn as_ref(&self) -> &PropIndex {
+        &self.bytecode
+    }
+}
+
+pub struct ApplyCodeUnitBoundsContext<'a> {
+    module: &'a mut CompiledModule,
+    // This is so apply_one can be called after mutations has been iterated on.
+    mutations: Option<Vec<CodeUnitBoundsMutation>>,
+}
+
+macro_rules! new_bytecode {
+    ($dst_len:expr, $fidx:expr, $bcidx:expr, $offset:expr, $kind:ident, $bytecode_ident:tt) => {{
+        let dst_len: usize = $dst_len;
+        let new_idx: usize = dst_len + $offset;
+        (
+            $bytecode_ident($kind::new(new_idx as TableIndex)),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $kind::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+
+    ($dst_len:expr, $fidx:expr, $bcidx:expr, $offset:expr, $kind:ident, $bytecode_ident:tt, $($others:expr),+) => {{
+        let dst_len: usize = $dst_len;
+        let new_idx: usize = dst_len + $offset;
+        (
+            $bytecode_ident($kind::new(new_idx as TableIndex), $($others),+),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $kind::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! struct_bytecode {
+    ($dst_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $idx_type: ident, $bytecode_ident: tt) => {{
+        let dst_len = $dst_len;
+        let new_idx = dst_len + $offset;
+        (
+            $bytecode_ident($idx_type::new(new_idx as TableIndex)),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                $idx_type::KIND,
+                new_idx,
+                dst_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! code_bytecode {
+    ($code_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $bytecode_ident: tt) => {{
+        let code_len = $code_len;
+        let new_idx = code_len + $offset;
+        (
+            $bytecode_ident(new_idx as CodeOffset),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::CodeDefinition,
+                new_idx,
+                code_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+macro_rules! locals_bytecode {
+    ($locals_len: expr, $fidx:expr, $bcidx: expr, $offset: expr, $bytecode_ident: tt) => {{
+        let locals_len = $locals_len;
+        let new_idx = locals_len + $offset;
+        (
+            $bytecode_ident(new_idx as LocalIndex),
+            offset_out_of_bounds(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::LocalPool,
+                new_idx,
+                locals_len,
+                $fidx,
+                $bcidx as CodeOffset,
+            ),
+        )
+    }};
+}
+
+impl<'a> ApplyCodeUnitBoundsContext<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<CodeUnitBoundsMutation>) -> Self {
+        Self {
+            module,
+            mutations: Some(mutations),
+        }
+    }
+
+    pub fn apply(mut self) -> Vec<PartialVMError> {
+        let function_def_len = self.module.function_defs.len();
+
+        let mut mutation_map = BTreeMap::new();
+        for mutation in self
+            .mutations
+            .take()
+            .expect("mutations should always be present")
+        {
+            let picked_idx = mutation.function_def.index(function_def_len);
+            mutation_map.entry(picked_idx).or_default().push(mutation);
+        }
+
+        let mut results = vec![];
+
+        for (idx, mutations) in mutation_map {
+            results.extend(self.apply_one(idx, mutations));
+        }
+        results
+    }
+
+    fn apply_one(
+        &mut self,
+        fidx: usize,
+        mutations: Vec<CodeUnitBoundsMutation>,
+    ) -> Vec<PartialVMError> {
+        // For this function def, find all the places where a bounds mutation can be applied.
+        let func_def = &mut self.module.function_defs[fidx];
+        let current_fdef = FunctionDefinitionIndex(fidx as TableIndex);
+        let func_handle = &self.module.function_handles[func_def.function.into_index()];
+        let code = func_def.code.as_mut().unwrap();
+        let locals_len = self.module.signatures[func_handle.parameters.into_index()].len()
+            + self.module.signatures[code.locals.into_index()].len();
+        let code = &mut code.code;
+        let code_len = code.len();
+
+        let interesting_offsets: Vec<usize> = (0..code.len())
+            .filter(|bytecode_idx| is_interesting(&code[*bytecode_idx]))
+            .collect();
+        let to_mutate = crate::helpers::pick_slice_idxs(interesting_offsets.len(), &mutations);
+
+        // These have to be computed upfront because self.module is being mutated below.
+        let constant_pool_len = self.module.constant_pool.len();
+        let function_handles_len = self.module.function_handles.len();
+        let field_handle_len = self.module.field_handles.len();
+        let struct_defs_len = self.module.struct_defs.len();
+        let struct_inst_len = self.module.struct_def_instantiations.len();
+        let function_inst_len = self.module.function_instantiations.len();
+        let field_inst_len = self.module.field_instantiations.len();
+        let signature_pool_len = self.module.signatures.len();
+
+        mutations
+            .iter()
+            .zip(to_mutate)
+            .map(|(mutation, interesting_offsets_idx)| {
+                let bytecode_idx = interesting_offsets[interesting_offsets_idx];
+                let offset = mutation.offset;
+                use Bytecode::*;
+
+                let (new_bytecode, err) = match code[bytecode_idx] {
+                    LdConst(_) => new_bytecode!(
+                        constant_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        ConstantPoolIndex,
+                        LdConst
+                    ),
+                    ImmBorrowField(_) => new_bytecode!(
+                        field_handle_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldHandleIndex,
+                        ImmBorrowField
+                    ),
+                    ImmBorrowFieldGeneric(_) => new_bytecode!(
+                        field_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldInstantiationIndex,
+                        ImmBorrowFieldGeneric
+                    ),
+                    MutBorrowField(_) => new_bytecode!(
+                        field_handle_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldHandleIndex,
+                        MutBorrowField
+                    ),
+                    MutBorrowFieldGeneric(_) => new_bytecode!(
+                        field_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FieldInstantiationIndex,
+                        MutBorrowFieldGeneric
+                    ),
+                    Call(_) => struct_bytecode!(
+                        function_handles_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FunctionHandleIndex,
+                        Call
+                    ),
+                    CallGeneric(_) => struct_bytecode!(
+                        function_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        FunctionInstantiationIndex,
+                        CallGeneric
+                    ),
+                    Pack(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Pack
+                    ),
+                    PackGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        PackGeneric
+                    ),
+                    Unpack(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Unpack
+                    ),
+                    UnpackGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        UnpackGeneric
+                    ),
+                    Exists(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        Exists
+                    ),
+                    ExistsGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        ExistsGeneric
+                    ),
+                    MutBorrowGlobal(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MutBorrowGlobal
+                    ),
+                    MutBorrowGlobalGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MutBorrowGlobalGeneric
+                    ),
+                    ImmBorrowGlobal(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        ImmBorrowGlobal
+                    ),
+                    ImmBorrowGlobalGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        ImmBorrowGlobalGeneric
+                    ),
+                    MoveFrom(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MoveFrom
+                    ),
+                    MoveFromGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MoveFromGeneric
+                    ),
+                    MoveTo(_) => struct_bytecode!(
+                        struct_defs_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefinitionIndex,
+                        MoveTo
+                    ),
+                    MoveToGeneric(_) => struct_bytecode!(
+                        struct_inst_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        StructDefInstantiationIndex,
+                        MoveToGeneric
+                    ),
+                    BrTrue(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, BrTrue)
+                    }
+                    BrFalse(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, BrFalse)
+                    }
+                    Branch(_) => {
+                        code_bytecode!(code_len, current_fdef, bytecode_idx, offset, Branch)
+                    }
+                    CopyLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, CopyLoc)
+                    }
+                    MoveLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, MoveLoc)
+                    }
+                    StLoc(_) => {
+                        locals_bytecode!(locals_len, current_fdef, bytecode_idx, offset, StLoc)
+                    }
+                    MutBorrowLoc(_) => locals_bytecode!(
+                        locals_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        MutBorrowLoc
+                    ),
+                    ImmBorrowLoc(_) => locals_bytecode!(
+                        locals_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        ImmBorrowLoc
+                    ),
+                    VecPack(_, num) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPack,
+                        num
+                    ),
+                    VecLen(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecLen
+                    ),
+                    VecImmBorrow(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecImmBorrow
+                    ),
+                    VecMutBorrow(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecMutBorrow
+                    ),
+                    VecPushBack(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPushBack
+                    ),
+                    VecPopBack(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecPopBack
+                    ),
+                    VecUnpack(_, num) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecUnpack,
+                        num
+                    ),
+                    VecSwap(_) => new_bytecode!(
+                        signature_pool_len,
+                        current_fdef,
+                        bytecode_idx,
+                        offset,
+                        SignatureIndex,
+                        VecSwap
+                    ),
+
+                    // List out the other options explicitly so there's a compile error if a new
+                    // bytecode gets added.
+                    FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_)
+                    | LdU128(_) | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128
+                    | CastU256 | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod
+                    | Div | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt
+                    | Gt | Le | Ge | Abort | Nop => {
+                        panic!("Bytecode has no internal index: {:?}", code[bytecode_idx])
+                    }
+                };
+
+                code[bytecode_idx] = new_bytecode;
+
+                err.at_index(IndexKind::FunctionDefinition, fidx as TableIndex)
+            })
+            .collect()
+    }
+}
+
+fn is_interesting(bytecode: &Bytecode) -> bool {
+    use Bytecode::*;
+
+    match bytecode {
+        LdConst(_)
+        | ImmBorrowField(_)
+        | ImmBorrowFieldGeneric(_)
+        | MutBorrowField(_)
+        | MutBorrowFieldGeneric(_)
+        | Call(_)
+        | CallGeneric(_)
+        | Pack(_)
+        | PackGeneric(_)
+        | Unpack(_)
+        | UnpackGeneric(_)
+        | Exists(_)
+        | ExistsGeneric(_)
+        | MutBorrowGlobal(_)
+        | MutBorrowGlobalGeneric(_)
+        | ImmBorrowGlobal(_)
+        | ImmBorrowGlobalGeneric(_)
+        | MoveFrom(_)
+        | MoveFromGeneric(_)
+        | MoveTo(_)
+        | MoveToGeneric(_)
+        | BrTrue(_)
+        | BrFalse(_)
+        | Branch(_)
+        | CopyLoc(_)
+        | MoveLoc(_)
+        | StLoc(_)
+        | MutBorrowLoc(_)
+        | ImmBorrowLoc(_)
+        | VecPack(..)
+        | VecLen(_)
+        | VecImmBorrow(_)
+        | VecMutBorrow(_)
+        | VecPushBack(_)
+        | VecPopBack(_)
+        | VecUnpack(..)
+        | VecSwap(_) => true,
+
+        // List out the other options explicitly so there's a compile error if a new
+        // bytecode gets added.
+        FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU128(_)
+        | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue
+        | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor
+        | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | Abort | Nop => false,
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/helpers.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/helpers.rs
new file mode 100644
index 000000000..c122d58c8
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/helpers.rs
@@ -0,0 +1,46 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use proptest::sample::Index as PropIndex;
+use std::{collections::BTreeSet, ops::Index as OpsIndex};
+
+/// Given a maximum value `max` and a list of [`Index`](proptest::sample::Index) instances, picks
+/// integers in the range `[0, max)` uniformly randomly and without duplication.
+///
+/// If `indexes_len` is greater than `max`, all indexes will be returned.
+///
+/// This function implements Robert Floyd's F2 algorithm for sampling without replacement.
+pub(crate) fn pick_idxs<T, P>(max: usize, indexes: &T, indexes_len: usize) -> Vec<usize>
+where
+    T: OpsIndex<usize, Output = P> + ?Sized,
+    P: AsRef<PropIndex>,
+{
+    // See https://dl.acm.org/doi/10.1145/30401.315746 (the F2 algorithm)
+    // for a longer explanation. This is a variant that works with zero-indexing.
+    let mut selected = BTreeSet::new();
+    let to_select = indexes_len.min(max);
+    for (iter_idx, choice) in ((max - to_select)..max).enumerate() {
+        // "RandInt(1, J)" in the original algorithm means a number between 1
+        // and choice, both inclusive. `PropIndex::index` picks a number between 0 and
+        // whatever's passed in, with the latter exclusive. Pass in "+1" to ensure the same
+        // range of values is picked from. (This also ensures that if choice is 0 then `index`
+        // doesn't panic.
+        let idx = indexes[iter_idx].as_ref().index(choice + 1);
+        if !selected.insert(idx) {
+            selected.insert(choice);
+        }
+    }
+    selected.into_iter().collect()
+}
+
+/// Given a maximum value `max` and a slice of [`Index`](proptest::sample::Index) instances, picks
+/// integers in the range `[0, max)` uniformly randomly and without duplication.
+///
+/// If the number of `Index` instances is greater than `max`, all indexes will be returned.
+///
+/// This function implements Robert Floyd's F2 algorithm for sampling without replacement.
+#[inline]
+pub(crate) fn pick_slice_idxs(max: usize, indexes: &[impl AsRef<PropIndex>]) -> Vec<usize> {
+    pick_idxs(max, indexes, indexes.len())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/lib.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/lib.rs
new file mode 100644
index 000000000..d65742451
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+pub mod bounds;
+mod helpers;
+pub mod signature;
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/signature.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/signature.rs
new file mode 100644
index 000000000..6181bf66d
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/invalid-mutations/src/signature.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    CompiledModule, Signature, SignatureToken, StructFieldInformation, TypeSignature,
+};
+use proptest::sample::Index as PropIndex;
+
+pub struct SignatureRefMutation<'a> {
+    module: &'a mut CompiledModule,
+    mutations: Vec<(PropIndex, PropIndex)>,
+}
+
+impl<'a> SignatureRefMutation<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<(PropIndex, PropIndex)>) -> Self {
+        Self { module, mutations }
+    }
+
+    pub fn apply(self) -> bool {
+        if self.module.signatures.is_empty() {
+            return false;
+        }
+        let module = self.module;
+        let mut mutations = false;
+        for (s_idx, t_idx) in self.mutations {
+            let sig_idx = s_idx.index(module.signatures.len());
+            let sig = &module.signatures[sig_idx];
+            if sig.is_empty() {
+                continue;
+            }
+            let token_idx = t_idx.index(sig.len());
+            let new_sig = mutate_sig(sig, token_idx);
+            module.signatures[sig_idx] = new_sig;
+            mutations = true;
+        }
+        mutations
+    }
+}
+
+/// Context for applying a list of `FieldRefMutation` instances.
+pub struct FieldRefMutation<'a> {
+    module: &'a mut CompiledModule,
+    mutations: Vec<(PropIndex, PropIndex)>,
+}
+
+impl<'a> FieldRefMutation<'a> {
+    pub fn new(module: &'a mut CompiledModule, mutations: Vec<(PropIndex, PropIndex)>) -> Self {
+        Self { module, mutations }
+    }
+
+    #[inline]
+    pub fn apply(self) -> bool {
+        if self.module.struct_defs.is_empty() {
+            return false;
+        }
+        let module = self.module;
+        let mut mutations = false;
+        for (s_idx, f_idx) in self.mutations {
+            let struct_idx = s_idx.index(module.struct_defs.len());
+            let struct_def = &mut module.struct_defs[struct_idx];
+            if let StructFieldInformation::Declared(fields) = &mut struct_def.field_information {
+                if fields.is_empty() {
+                    continue;
+                }
+                let field_idx = f_idx.index(fields.len());
+                let field_def = &mut fields[field_idx];
+                let new_ty = mutate_field(&field_def.signature.0);
+                fields[field_idx].signature = TypeSignature(new_ty);
+                mutations = true;
+            }
+        }
+        mutations
+    }
+}
+
+fn mutate_sig(sig: &Signature, token_idx: usize) -> Signature {
+    use SignatureToken::*;
+
+    Signature(
+        sig.0
+            .iter()
+            .enumerate()
+            .map(|(idx, token)| {
+                if idx == token_idx {
+                    match &token {
+                        Reference(_) | MutableReference(_) => Reference(Box::new(token.clone())),
+                        _ => Reference(Box::new(Reference(Box::new(token.clone())))),
+                    }
+                } else {
+                    token.clone()
+                }
+            })
+            .collect(),
+    )
+}
+
+fn mutate_field(token: &SignatureToken) -> SignatureToken {
+    SignatureToken::Reference(Box::new(token.clone()))
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/ability_field_requirements.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/ability_field_requirements.rs
new file mode 100644
index 000000000..4480800c7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/ability_field_requirements.rs
@@ -0,0 +1,52 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that all of the struct's fields satisfy the
+//! abilities required by the struct's abilities
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{AbilitySet, CompiledModule, StructFieldInformation, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    let view = BinaryIndexedView::Module(module);
+    for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+        let sh = module.struct_handle_at(struct_def.struct_handle);
+        let fields = match &struct_def.field_information {
+            StructFieldInformation::Native => continue,
+            StructFieldInformation::Declared(fields) => fields,
+        };
+        let required_abilities = sh
+            .abilities
+            .into_iter()
+            .map(|a| a.requires())
+            .fold(AbilitySet::EMPTY, |acc, required| acc | required);
+        // Assume type parameters have all abilities, as the struct's abilities will be dependent on
+        // them
+        let type_parameter_abilities = sh
+            .type_parameters
+            .iter()
+            .map(|_| AbilitySet::ALL)
+            .collect::<Vec<_>>();
+        for field in fields {
+            let field_abilities = view.abilities(&field.signature.0, &type_parameter_abilities)?;
+            if !required_abilities.is_subset(field_abilities) {
+                return Err(verification_error(
+                    StatusCode::FIELD_MISSING_TYPE_ABILITY,
+                    IndexKind::StructDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/absint.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/absint.rs
new file mode 100644
index 000000000..6cd169a4b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/absint.rs
@@ -0,0 +1,158 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::meter::{
+    Meter, Scope, ANALYZE_FUNCTION_BASE_COST, EXECUTE_BLOCK_BASE_COST, PER_BACKEDGE_COST,
+    PER_SUCCESSOR_COST,
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::PartialVMResult,
+    file_format::{Bytecode, CodeOffset},
+};
+use std::collections::BTreeMap;
+
+/// Trait for finite-height abstract domains. Infinite height domains would require a more complex
+/// trait with widening and a partial order.
+pub trait AbstractDomain: Clone + Sized {
+    fn join(&mut self, other: &Self, meter: &mut impl Meter) -> PartialVMResult<JoinResult>;
+}
+
+#[derive(Debug)]
+pub enum JoinResult {
+    Changed,
+    Unchanged,
+}
+
+#[allow(dead_code)]
+#[derive(Clone)]
+pub struct BlockInvariant<State> {
+    /// Precondition of the block
+    pre: State,
+}
+
+/// A map from block id's to the pre/post of each block after a fixed point is reached.
+#[allow(dead_code)]
+pub type InvariantMap<State> = BTreeMap<BlockId, BlockInvariant<State>>;
+
+/// Take a pre-state + instruction and mutate it to produce a post-state
+/// Auxiliary data can be stored in self.
+pub trait TransferFunctions {
+    type State: AbstractDomain;
+    type Error;
+
+    /// Execute local@instr found at index local@index in the current basic block from pre-state
+    /// local@pre.
+    /// Should return an AnalysisError if executing the instruction is unsuccessful, and () if
+    /// the effects of successfully executing local@instr have been reflected by mutatating
+    /// local@pre.
+    /// Auxilary data from the analysis that is not part of the abstract state can be collected by
+    /// mutating local@self.
+    /// The last instruction index in the current block is local@last_index. Knowing this
+    /// information allows clients to detect the end of a basic block and special-case appropriately
+    /// (e.g., normalizing the abstract state before a join).
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        instr: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()>;
+}
+
+pub trait AbstractInterpreter: TransferFunctions {
+    /// Analyze procedure local@function_view starting from pre-state local@initial_state.
+    fn analyze_function(
+        &mut self,
+        initial_state: Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ANALYZE_FUNCTION_BASE_COST)?;
+        let mut inv_map = InvariantMap::new();
+        let entry_block_id = function_view.cfg().entry_block_id();
+        let mut next_block = Some(entry_block_id);
+        inv_map.insert(entry_block_id, BlockInvariant { pre: initial_state });
+
+        while let Some(block_id) = next_block {
+            let block_invariant = match inv_map.get_mut(&block_id) {
+                Some(invariant) => invariant,
+                None => {
+                    // This can only happen when all predecessors have errors,
+                    // so skip the block and move on to the next one
+                    next_block = function_view.cfg().next_block(block_id);
+                    continue;
+                }
+            };
+
+            let pre_state = &block_invariant.pre;
+            // Note: this will stop analysis after the first error occurs, to avoid the risk of
+            // subsequent crashes
+            let post_state = self.execute_block(block_id, pre_state, function_view, meter)?;
+
+            let mut next_block_candidate = function_view.cfg().next_block(block_id);
+            // propagate postcondition of this block to successor blocks
+            for successor_block_id in function_view.cfg().successors(block_id) {
+                meter.add(Scope::Function, PER_SUCCESSOR_COST)?;
+                match inv_map.get_mut(successor_block_id) {
+                    Some(next_block_invariant) => {
+                        let join_result = {
+                            let old_pre = &mut next_block_invariant.pre;
+                            old_pre.join(&post_state, meter)
+                        }?;
+                        match join_result {
+                            JoinResult::Unchanged => {
+                                // Pre is the same after join. Reanalyzing this block would produce
+                                // the same post
+                            }
+                            JoinResult::Changed => {
+                                // If the cur->successor is a back edge, jump back to the beginning
+                                // of the loop, instead of the normal next block
+                                if function_view
+                                    .cfg()
+                                    .is_back_edge(block_id, *successor_block_id)
+                                {
+                                    meter.add(Scope::Function, PER_BACKEDGE_COST)?;
+                                    next_block_candidate = Some(*successor_block_id);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    None => {
+                        // Haven't visited the next block yet. Use the post of the current block as
+                        // its pre
+                        inv_map.insert(
+                            *successor_block_id,
+                            BlockInvariant {
+                                pre: post_state.clone(),
+                            },
+                        );
+                    }
+                }
+            }
+            next_block = next_block_candidate;
+        }
+        Ok(())
+    }
+
+    fn execute_block(
+        &mut self,
+        block_id: BlockId,
+        pre_state: &Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Self::State> {
+        meter.add(Scope::Function, EXECUTE_BLOCK_BASE_COST)?;
+        let mut state_acc = pre_state.clone();
+        let block_end = function_view.cfg().block_end(block_id);
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &function_view.code().code[offset as usize];
+            self.execute(&mut state_acc, instr, offset, block_end, meter)?
+        }
+        Ok(state_acc)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/acquires_list_verifier.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/acquires_list_verifier.rs
new file mode 100644
index 000000000..9bad9e573
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/acquires_list_verifier.rs
@@ -0,0 +1,226 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying properties about the acquires list on function
+//! definitions. Function definitions must annotate the global resources (declared in that module)
+//! accesssed by `BorrowGlobal`, `MoveFrom`, and any transitive function calls
+//! The list of acquired resources (stored in `FunctionDefinition`'s `acquires_global_resources`
+//! field) must have:
+//! - No duplicate resources (checked by `check_duplication`)
+//! - No missing resources (any resource acquired must be present)
+//! - No additional resources (no extraneous resources not actually acquired)
+
+use std::collections::{BTreeSet, HashMap};
+
+use crate::meter::Meter;
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandle, FunctionHandleIndex, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) struct AcquiresVerifier<'a> {
+    module: &'a CompiledModule,
+    current_function: FunctionDefinitionIndex,
+    annotated_acquires: BTreeSet<StructDefinitionIndex>,
+    actual_acquires: BTreeSet<StructDefinitionIndex>,
+    handle_to_def: HashMap<FunctionHandleIndex, &'a FunctionDefinition>,
+}
+
+impl<'a> AcquiresVerifier<'a> {
+    pub(crate) fn verify(
+        module: &'a CompiledModule,
+        index: FunctionDefinitionIndex,
+        function_definition: &'a FunctionDefinition,
+        _meter: &mut impl Meter, // currently unused
+    ) -> PartialVMResult<()> {
+        let annotated_acquires: BTreeSet<_> = function_definition
+            .acquires_global_resources
+            .iter()
+            .cloned()
+            .collect();
+        let mut handle_to_def = HashMap::new();
+        for func_def in module.function_defs() {
+            handle_to_def.insert(func_def.function, func_def);
+        }
+        let mut verifier = Self {
+            module,
+            current_function: index,
+            annotated_acquires,
+            actual_acquires: BTreeSet::new(),
+            handle_to_def,
+        };
+
+        for (offset, instruction) in safe_unwrap!(function_definition.code.as_ref())
+            .code
+            .iter()
+            .enumerate()
+        {
+            verifier.verify_instruction(instruction, offset as CodeOffset)?
+        }
+
+        for annotation in verifier.annotated_acquires {
+            if !verifier.actual_acquires.contains(&annotation) {
+                return Err(PartialVMError::new(
+                    StatusCode::EXTRANEOUS_ACQUIRES_ANNOTATION,
+                ));
+            }
+
+            let struct_def = safe_unwrap!(module.struct_defs().get(annotation.0 as usize));
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            if !struct_handle.abilities.has_key() {
+                return Err(PartialVMError::new(StatusCode::INVALID_ACQUIRES_ANNOTATION));
+            }
+        }
+
+        Ok(())
+    }
+
+    fn verify_instruction(
+        &mut self,
+        instruction: &Bytecode,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::Call(idx) => self.call_acquire(*idx, offset),
+            Bytecode::CallGeneric(idx) => {
+                let fi = self.module.function_instantiation_at(*idx);
+                self.call_acquire(fi.handle, offset)
+            }
+            Bytecode::MoveFrom(idx)
+            | Bytecode::MutBorrowGlobal(idx)
+            | Bytecode::ImmBorrowGlobal(idx) => self.struct_acquire(*idx, offset),
+            Bytecode::MoveFromGeneric(idx)
+            | Bytecode::MutBorrowGlobalGeneric(idx)
+            | Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                let si = self.module.struct_instantiation_at(*idx);
+                self.struct_acquire(si.def, offset)
+            }
+
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::Abort
+            | Bytecode::Branch(_)
+            | Bytecode::Nop
+            | Bytecode::Ret
+            | Bytecode::StLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdConst(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Not
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::VecPack(..)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(..)
+            | Bytecode::VecSwap(_) => Ok(()),
+        }
+    }
+
+    fn call_acquire(
+        &mut self,
+        fh_idx: FunctionHandleIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.module.function_handle_at(fh_idx);
+        let mut function_acquired_resources =
+            self.function_acquired_resources(function_handle, fh_idx);
+        for acquired_resource in &function_acquired_resources {
+            if !self.annotated_acquires.contains(acquired_resource) {
+                return Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset));
+            }
+        }
+        self.actual_acquires
+            .append(&mut function_acquired_resources);
+        Ok(())
+    }
+
+    fn struct_acquire(
+        &mut self,
+        sd_idx: StructDefinitionIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        if self.annotated_acquires.contains(&sd_idx) {
+            self.actual_acquires.insert(sd_idx);
+            Ok(())
+        } else {
+            Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset))
+        }
+    }
+
+    fn function_acquired_resources(
+        &self,
+        function_handle: &FunctionHandle,
+        fh_idx: FunctionHandleIndex,
+    ) -> BTreeSet<StructDefinitionIndex> {
+        if function_handle.module != self.module.self_handle_idx() {
+            return BTreeSet::new();
+        }
+        match self.handle_to_def.get(&fh_idx) {
+            Some(func_def) => func_def.acquires_global_resources.iter().cloned().collect(),
+            None => BTreeSet::new(),
+        }
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/check_duplication.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/check_duplication.rs
new file mode 100644
index 000000000..0847657f7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/check_duplication.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that each vector in a CompiledModule contains
+//! distinct values. Successful verification implies that an index in vector can be used to
+//! uniquely name the entry at that index. Additionally, the checker also verifies the
+//! following:
+//! - struct and field definitions are consistent
+//! - the handles in struct and function definitions point to the self module index
+//! - all struct and function handles pointing to the self module index have a definition
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, Constant, FunctionHandle, FunctionHandleIndex,
+        FunctionInstantiation, ModuleHandle, Signature, StructFieldInformation, StructHandle,
+        StructHandleIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use std::{collections::HashSet, hash::Hash};
+
+pub struct DuplicationChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> DuplicationChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        Self::check_identifiers(module.identifiers())?;
+        Self::check_address_identifiers(module.address_identifiers())?;
+        Self::check_constants(module.constant_pool())?;
+        Self::check_signatures(module.signatures())?;
+        Self::check_module_handles(module.module_handles())?;
+        Self::check_module_handles(module.friend_decls())?;
+        Self::check_struct_handles(module.struct_handles())?;
+        Self::check_function_handles(module.function_handles())?;
+        Self::check_function_instantiations(module.function_instantiations())?;
+
+        let checker = Self { module };
+        checker.check_field_handles()?;
+        checker.check_field_instantiations()?;
+        checker.check_function_defintions()?;
+        checker.check_struct_definitions()?;
+        checker.check_struct_instantiations()
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        Self::check_identifiers(script.identifiers())?;
+        Self::check_address_identifiers(script.address_identifiers())?;
+        Self::check_constants(script.constant_pool())?;
+        Self::check_signatures(script.signatures())?;
+        Self::check_module_handles(script.module_handles())?;
+        Self::check_struct_handles(script.struct_handles())?;
+        Self::check_function_handles(script.function_handles())?;
+        Self::check_function_instantiations(script.function_instantiations())
+    }
+
+    fn check_identifiers(identifiers: &[Identifier]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Identifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_address_identifiers(address_identifiers: &[AccountAddress]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(address_identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::AddressIdentifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_constants(constant_pool: &[Constant]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(constant_pool) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ConstantPool,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_signatures(signatures: &[Signature]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(signatures) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Signature,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_module_handles(module_handles: &[ModuleHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(module_handles) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ModuleHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // StructHandles - module and name define uniqueness
+    fn check_struct_handles(struct_handles: &[StructHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(struct_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_function_instantiations(
+        function_instantiations: &[FunctionInstantiation],
+    ) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_instantiations) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // FunctionHandles - module and name define uniqueness
+    fn check_function_handles(function_handles: &[FunctionHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    //
+    // Module only code
+    //
+
+    fn check_field_handles(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.field_handles()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_struct_instantiations(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.struct_instantiations()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_field_instantiations(&self) -> PartialVMResult<()> {
+        if let Some(idx) = Self::first_duplicate_element(self.module.field_instantiations()) {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldInstantiation,
+                idx,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_struct_definitions(&self) -> PartialVMResult<()> {
+        // StructDefinition - contained StructHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.struct_defs().iter().map(|x| x.struct_handle))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefinition,
+                idx,
+            ));
+        }
+        // Field names in structs must be unique
+        for (struct_idx, struct_def) in self.module.struct_defs().iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            if fields.is_empty() {
+                return Err(verification_error(
+                    StatusCode::ZERO_SIZED_STRUCT,
+                    IndexKind::StructDefinition,
+                    struct_idx as TableIndex,
+                ));
+            }
+            if let Some(idx) = Self::first_duplicate_element(fields.iter().map(|x| x.name)) {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ELEMENT,
+                    IndexKind::FieldDefinition,
+                    idx,
+                ));
+            }
+        }
+        // Check that each struct definition is pointing to the self module
+        if let Some(idx) = self.module.struct_defs().iter().position(|x| {
+            self.module.struct_handle_at(x.struct_handle).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::StructDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each struct handle in self module is implemented (has a declaration)
+        let implemented_struct_handles: HashSet<StructHandleIndex> = self
+            .module
+            .struct_defs()
+            .iter()
+            .map(|x| x.struct_handle)
+            .collect();
+        if let Some(idx) = (0..self.module.struct_handles().len()).position(|x| {
+            let y = StructHandleIndex::new(x as u16);
+            self.module.struct_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_struct_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::StructHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_function_defintions(&self) -> PartialVMResult<()> {
+        // FunctionDefinition - contained FunctionHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionDefinition,
+                idx,
+            ));
+        }
+        // Acquires in function declarations contain unique struct definitions
+        for (idx, function_def) in self.module.function_defs().iter().enumerate() {
+            let acquires = function_def.acquires_global_resources.iter();
+            if Self::first_duplicate_element(acquires).is_some() {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ACQUIRES_ANNOTATION,
+                    IndexKind::FunctionDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+        // Check that each function definition is pointing to the self module
+        if let Some(idx) = self.module.function_defs().iter().position(|x| {
+            self.module.function_handle_at(x.function).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::FunctionDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each function handle in self module is implemented (has a declaration)
+        let implemented_function_handles: HashSet<FunctionHandleIndex> = self
+            .module
+            .function_defs()
+            .iter()
+            .map(|x| x.function)
+            .collect();
+        if let Some(idx) = (0..self.module.function_handles().len()).position(|x| {
+            let y = FunctionHandleIndex::new(x as u16);
+            self.module.function_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_function_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::FunctionHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn first_duplicate_element<T>(iter: T) -> Option<TableIndex>
+    where
+        T: IntoIterator,
+        T::Item: Eq + Hash,
+    {
+        let mut uniq = HashSet::new();
+        for (i, x) in iter.into_iter().enumerate() {
+            if !uniq.insert(x) {
+                return Some(i as TableIndex);
+            }
+        }
+        None
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/code_unit_verifier.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/code_unit_verifier.rs
new file mode 100644
index 000000000..e313c424b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/code_unit_verifier.rs
@@ -0,0 +1,197 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements the checker for verifying correctness of function bodies.
+//! The overall verification is split between stack_usage_verifier.rs and
+//! abstract_interpreter.rs. CodeUnitVerifier simply orchestrates calls into these two files.
+use crate::{
+    acquires_list_verifier::AcquiresVerifier,
+    control_flow, locals_safety,
+    meter::{Meter, Scope},
+    reference_safety,
+    stack_usage_verifier::StackUsageVerifier,
+    type_safety,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+        IdentifierIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::HashMap;
+
+pub struct CodeUnitVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+    function_view: FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> CodeUnitVerifier<'a> {
+    pub fn verify_module(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledModule,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_module_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        verifier_config: &VerifierConfig,
+        module: &CompiledModule,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        let mut name_def_map = HashMap::new();
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            let fh = module.function_handle_at(func_def.function);
+            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
+        }
+        let mut total_back_edges = 0;
+        for (idx, function_definition) in module.function_defs().iter().enumerate() {
+            let index = FunctionDefinitionIndex(idx as TableIndex);
+            let num_back_edges = Self::verify_function(
+                verifier_config,
+                index,
+                function_definition,
+                module,
+                &name_def_map,
+                meter,
+            )
+            .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
+            total_back_edges += num_back_edges;
+        }
+        if let Some(limit) = verifier_config.max_back_edges_per_module {
+            if total_back_edges > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_script_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        verifier_config: &VerifierConfig,
+        script: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_script(verifier_config, script)?;
+        let resolver = BinaryIndexedView::Script(script);
+        let name_def_map = HashMap::new();
+
+        if let Some(limit) = verifier_config.max_basic_blocks_in_script {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS));
+            }
+        }
+
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if function_view.cfg().num_back_edges() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+
+        //verify
+        meter.enter_scope("script", Scope::Function);
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map: &name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)
+    }
+
+    fn verify_function(
+        verifier_config: &VerifierConfig,
+        index: FunctionDefinitionIndex,
+        function_definition: &FunctionDefinition,
+        module: &CompiledModule,
+        name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<usize> {
+        meter.enter_scope(
+            module
+                .identifier_at(module.function_handle_at(function_definition.function).name)
+                .as_str(),
+            Scope::Function,
+        );
+        // nothing to verify for native function
+        let code = match &function_definition.code {
+            Some(code) => code,
+            None => return Ok(0),
+        };
+
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_function(
+            verifier_config,
+            module,
+            index,
+            function_definition,
+            code,
+            meter,
+        )?;
+
+        if let Some(limit) = verifier_config.max_basic_blocks {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let num_back_edges = function_view.cfg().num_back_edges();
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if num_back_edges > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let resolver = BinaryIndexedView::Module(module);
+        // verify
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)?;
+        AcquiresVerifier::verify(module, index, function_definition, meter)?;
+
+        meter.transfer(Scope::Function, Scope::Module, 1.0)?;
+
+        Ok(num_back_edges)
+    }
+
+    fn verify_common(
+        &self,
+        verifier_config: &VerifierConfig,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        StackUsageVerifier::verify(verifier_config, &self.resolver, &self.function_view, meter)?;
+        type_safety::verify(&self.resolver, &self.function_view, meter)?;
+        locals_safety::verify(&self.resolver, &self.function_view, meter)?;
+        reference_safety::verify(
+            &self.resolver,
+            &self.function_view,
+            self.name_def_map,
+            meter,
+        )
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/constants.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/constants.rs
new file mode 100644
index 000000000..15b6afb3c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/constants.rs
@@ -0,0 +1,64 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that
+//! - a constant's type only refers to primitive types
+//! - a constant's data serializes correctly for that type
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{CompiledModule, CompiledScript, Constant, SignatureToken, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    for (idx, constant) in module.constant_pool().iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+pub fn verify_script(module: &CompiledScript) -> VMResult<()> {
+    verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+}
+
+fn verify_script_impl(script: &CompiledScript) -> PartialVMResult<()> {
+    for (idx, constant) in script.constant_pool.iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+fn verify_constant(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    verify_constant_type(idx, &constant.type_)?;
+    verify_constant_data(idx, constant)
+}
+
+fn verify_constant_type(idx: usize, type_: &SignatureToken) -> PartialVMResult<()> {
+    if type_.is_valid_for_constant() {
+        Ok(())
+    } else {
+        Err(verification_error(
+            StatusCode::INVALID_CONSTANT_TYPE,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        ))
+    }
+}
+
+fn verify_constant_data(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    match constant.deserialize_constant() {
+        Some(_) => Ok(()),
+        None => Err(verification_error(
+            StatusCode::MALFORMED_CONSTANT_DATA,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        )),
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow.rs
new file mode 100644
index 000000000..711c314d8
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow.rs
@@ -0,0 +1,182 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements control flow checks.
+//!
+//! For bytecode versions 6 and up, the following properties are ensured:
+//! - The CFG is not empty and the last block ends in an unconditional jump, so it's not possible to
+//!   fall off the end of a function.
+//! - The CFG is reducible (and optionally max loop depth is bounded), to limit the potential for
+//!   pathologically long abstract interpretation runtimes (through poor choice of loop heads and
+//!   back edges).
+//!
+//! For bytecode versions 5 and below, delegates to `control_flow_v5`.
+use crate::{
+    control_flow_v5,
+    loop_summary::{LoopPartition, LoopSummary},
+    meter::Meter,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, CodeUnit, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+    },
+    CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::BTreeSet;
+
+/// Perform control flow verification on the compiled function, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_function<'a>(
+    verifier_config: &'a VerifierConfig,
+    module: &'a CompiledModule,
+    index: FunctionDefinitionIndex,
+    function_definition: &'a FunctionDefinition,
+    code: &'a CodeUnit,
+    _meter: &mut impl Meter, // TODO: metering
+) -> PartialVMResult<FunctionView<'a>> {
+    let function_handle = module.function_handle_at(function_definition.function);
+
+    if module.version() <= 5 {
+        control_flow_v5::verify(verifier_config, Some(index), code)?;
+        Ok(FunctionView::function(module, index, code, function_handle))
+    } else {
+        verify_fallthrough(Some(index), code)?;
+        let function_view = FunctionView::function(module, index, code, function_handle);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Perform control flow verification on the compiled script, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_script<'a>(
+    verifier_config: &'a VerifierConfig,
+    script: &'a CompiledScript,
+) -> PartialVMResult<FunctionView<'a>> {
+    if script.version() <= 5 {
+        control_flow_v5::verify(verifier_config, None, &script.code)?;
+        Ok(FunctionView::script(script))
+    } else {
+        verify_fallthrough(None, &script.code)?;
+        let function_view = FunctionView::script(script);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Check to make sure that the bytecode vector is non-empty and ends with a branching instruction.
+fn verify_fallthrough(
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+    match code.code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+/// Test that `function_view`'s control-flow graph is reducible using Tarjan's algorithm [1].
+/// Optionally test loop depth bounded by `verifier_config.max_loop_depth`.
+///
+/// A CFG, `G`, with starting block `s` is reducible if and only if [2] any of the following
+/// equivalent properties hold:
+///
+///  1. G has a unique set of back-edges `u -> v` where `v` dominates `u`, that corresponds to the
+///     set of back-edges for any depth-first spanning tree of G.
+///
+///  2. Every loop in G contains a unique node `h` (the "head") which dominates all other nodes in
+///     the loop.
+///
+///  3. G has a unique maximal (in terms of number of edges) acyclic sub-graph.
+///
+///  4. G can be reduced to a CFG containing just `s` through a sequence of the following two
+///     operations:
+///      a. Delete a cyclic edge `v -> v`
+///      b. For an edge `e: u -> v` where `e` is the only incident edge to `v`, collapse `v` into `u`
+///         by deleting `e` and `v` and replacing all `v -> w` edges with `u -> w` edges.
+///
+/// Reducibility means that a control-flow graph can be decomposed into a series of nested loops
+/// (strongly connected subgraphs), which leads to more predictable abstract interpretation
+/// performance.
+///
+/// ## References
+///
+///  1. Tarjan, R.  1974.  Testing Flow Graph Reducibility.
+///  2. Hecht, M. S., Ullman J. D.  1974.  Characterizations of Reducible Flow Graphs.
+fn verify_reducibility<'a>(
+    verifier_config: &VerifierConfig,
+    function_view: &'a FunctionView<'a>,
+) -> PartialVMResult<()> {
+    let current_function = function_view.index().unwrap_or(FunctionDefinitionIndex(0));
+    let err = move |code: StatusCode, offset: CodeOffset| {
+        Err(PartialVMError::new(code).at_code_offset(current_function, offset))
+    };
+
+    let summary = LoopSummary::new(function_view.cfg());
+    let mut partition = LoopPartition::new(&summary);
+
+    // Iterate through nodes in reverse pre-order so more deeply nested loops (which would appear
+    // later in the pre-order) are processed first.
+    for head in summary.preorder().rev() {
+        // If a node has no back edges, it is not a loop head, so doesn't need to be processed.
+        let back = summary.back_edges(head);
+        if back.is_empty() {
+            continue;
+        }
+
+        // Collect the rest of the nodes in `head`'s loop, in `body`.  Start with the nodes that
+        // jump back to the head, and grow `body` by repeatedly following predecessor edges until
+        // `head` is found again.
+
+        let mut body = BTreeSet::new();
+        for node in back {
+            let node = partition.containing_loop(*node);
+
+            if node != head {
+                body.insert(node);
+            }
+        }
+
+        let mut frontier: Vec<_> = body.iter().copied().collect();
+        while let Some(node) = frontier.pop() {
+            for pred in summary.pred_edges(node) {
+                let pred = partition.containing_loop(*pred);
+
+                // `pred` can eventually jump back to `head`, so is part of its body.  If it is not
+                // a descendant of `head`, it implies that `head` does not dominate a node in its
+                // loop, therefore the CFG is not reducible, according to Property 1 (see doc
+                // comment).
+                if !summary.is_descendant(/* ancestor */ head, /* descendant */ pred) {
+                    return err(StatusCode::INVALID_LOOP_SPLIT, summary.block(pred));
+                }
+
+                let body_extended = pred != head && body.insert(pred);
+                if body_extended {
+                    frontier.push(pred);
+                }
+            }
+        }
+
+        // Collapse all the nodes in `body` into `head`, so it appears as one node when processing
+        // outer loops (this performs a sequence of Operation 4(b), followed by a 4(a)).
+        let depth = partition.collapse_loop(head, &body);
+        if let Some(max_depth) = verifier_config.max_loop_depth {
+            if depth as usize > max_depth {
+                return err(StatusCode::LOOP_MAX_DEPTH_REACHED, summary.block(head));
+            }
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow_v5.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow_v5.rs
new file mode 100644
index 000000000..b24d7aeca
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/control_flow_v5.rs
@@ -0,0 +1,283 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker to verify control flow in bytecode version 5 and below. The
+//! following properties are ensured:
+//! - All forward jumps do not enter into the middle of a loop
+//! - All "breaks" (forward, loop-exiting jumps) go to the "end" of the loop
+//! - All "continues" (back jumps in a loop) are only to the current loop
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset, CodeUnit, FunctionDefinitionIndex},
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::{collections::HashSet, convert::TryInto};
+
+pub fn verify(
+    verifier_config: &VerifierConfig,
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+
+    // check fallthrough
+    verify_fallthrough(current_function, &code.code)?;
+
+    // check jumps
+    let context = &ControlFlowVerifier {
+        current_function,
+        code: &code.code,
+    };
+    let labels = instruction_labels(context);
+    check_jumps(verifier_config, context, labels)
+}
+
+fn verify_fallthrough(
+    current_function: FunctionDefinitionIndex,
+    code: &Vec<Bytecode>,
+) -> PartialVMResult<()> {
+    // Check to make sure that the bytecode vector ends with a branching instruction.
+    match code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Label {
+    Loop { last_continue: u16 },
+    Code,
+}
+
+struct ControlFlowVerifier<'a> {
+    current_function: FunctionDefinitionIndex,
+    code: &'a Vec<Bytecode>,
+}
+
+impl<'a> ControlFlowVerifier<'a> {
+    fn code(&self) -> impl Iterator<Item = (CodeOffset, &'a Bytecode)> {
+        self.code
+            .iter()
+            .enumerate()
+            .map(|(idx, instr)| (idx.try_into().unwrap(), instr))
+    }
+
+    fn labeled_code<'b: 'a>(
+        &self,
+        labels: &'b [Label],
+    ) -> impl Iterator<Item = (CodeOffset, &'a Bytecode, &'b Label)> {
+        self.code()
+            .zip(labels)
+            .map(|((i, instr), lbl)| (i, instr, lbl))
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
+
+fn instruction_labels(context: &ControlFlowVerifier) -> Vec<Label> {
+    let mut labels: Vec<Label> = (0..context.code.len()).map(|_| Label::Code).collect();
+    let mut loop_continue = |loop_idx: CodeOffset, last_continue: CodeOffset| {
+        labels[loop_idx as usize] = Label::Loop { last_continue }
+    };
+    for (i, instr) in context.code() {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(prev) | Bytecode::BrTrue(prev) | Bytecode::BrFalse(prev)
+                if is_back_edge(i, *prev) =>
+            {
+                loop_continue(*prev, i)
+            }
+            _ => (),
+        }
+    }
+    labels
+}
+
+// Ensures the invariant:
+//   - All forward jumps do not enter into the middle of a loop
+//   - All "breaks" go to the "end" of the loop
+//   - All back jumps are only to the current loop
+//   - Nested loops do not exceed a given depth
+fn check_jumps(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: Vec<Label>,
+) -> PartialVMResult<()> {
+    // All back jumps are only to the current loop
+    check_continues(context, &labels)?;
+    // All "breaks" go to the "end" of the loop
+    check_breaks(context, &labels)?;
+
+    let loop_depth = count_loop_depth(&labels);
+
+    // All forward jumps do not enter into the middle of a loop
+    check_no_loop_splits(context, &labels, &loop_depth)?;
+    // Nested loops do not exceed a given depth
+    check_loop_depth(verifier_config, context, &labels, &loop_depth)
+}
+
+fn check_code<
+    F: FnMut(&Vec<(CodeOffset, CodeOffset)>, CodeOffset, &Bytecode) -> PartialVMResult<()>,
+>(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    mut check: F,
+) -> PartialVMResult<()> {
+    let mut loop_stack: Vec<(CodeOffset, CodeOffset)> = vec![];
+    for (cur_instr, instr, label) in context.labeled_code(labels) {
+        // Add loop to stack
+        if let Label::Loop { last_continue } = label {
+            loop_stack.push((cur_instr, *last_continue));
+        }
+
+        check(&loop_stack, cur_instr, instr)?;
+
+        // Pop if last continue
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (_cur_loop_head, last_continue) = safe_unwrap!(loop_stack.last());
+                if cur_instr == *last_continue {
+                    loop_stack.pop();
+                }
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
+
+fn is_back_edge(cur_instr: CodeOffset, target_instr: CodeOffset) -> bool {
+    target_instr <= cur_instr
+}
+
+// All back jumps are only to the current loop
+fn check_continues(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (cur_loop_head, _last_continue) = safe_unwrap!(loop_stack.last());
+                if target != cur_loop_head {
+                    // Invalid back jump. Cannot back jump outside of the current loop
+                    Err(context.error(StatusCode::INVALID_LOOP_CONTINUE, cur_instr))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_breaks(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if !is_back_edge(cur_instr, *target) =>
+            {
+                match loop_stack.last() {
+                    Some((_cur_loop_head, last_continue))
+                        if target > last_continue && *target != last_continue + 1 =>
+                    {
+                        // Invalid loop break. Must break immediately to the instruction after
+                        // the last continue
+                        Err(context.error(StatusCode::INVALID_LOOP_BREAK, cur_instr))
+                    }
+                    _ => Ok(()),
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_no_loop_splits(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let is_break = |loop_stack: &Vec<(CodeOffset, CodeOffset)>, jump_target: CodeOffset| -> bool {
+        match loop_stack.last() {
+            None => false,
+            Some((_cur_loop_head, last_continue)) => jump_target > *last_continue,
+        }
+    };
+    check_code(context, labels, |loop_stack, i, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(j) | Bytecode::BrTrue(j) | Bytecode::BrFalse(j)
+                if *j > i && !is_break(loop_stack, *j) =>
+            {
+                let j = *j;
+                let before_depth = loop_depth[i as usize];
+                let after_depth = match &labels[j as usize] {
+                    Label::Loop { .. } => loop_depth[j as usize] - 1,
+                    Label::Code => loop_depth[j as usize],
+                };
+                if before_depth != after_depth {
+                    // Invalid forward jump. Entered the middle of a loop
+                    Err(context.error(StatusCode::INVALID_LOOP_SPLIT, i))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_loop_depth(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let max_depth = match verifier_config.max_loop_depth {
+        Some(depth) => depth,
+        None => return Ok(()),
+    };
+    check_code(context, labels, |_loop_stack, i, _instr| {
+        if loop_depth[i as usize] > max_depth {
+            return Err(context.error(StatusCode::LOOP_MAX_DEPTH_REACHED, i));
+        }
+        Ok(())
+    })
+}
+
+// Only called after continues are verified, so we can assume that loops are well nested
+fn count_loop_depth(labels: &[Label]) -> Vec<usize> {
+    let last_continues: HashSet<CodeOffset> = labels
+        .iter()
+        .filter_map(|label| match label {
+            Label::Loop { last_continue } => Some(*last_continue),
+            Label::Code => None,
+        })
+        .collect();
+    let mut count = 0;
+    let mut counts = vec![];
+    for (idx, label) in labels.iter().enumerate() {
+        if let Label::Loop { .. } = label {
+            count += 1
+        }
+        counts.push(count);
+        if last_continues.contains(&idx.try_into().unwrap()) {
+            count -= 1;
+        }
+    }
+    counts
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/cyclic_dependencies.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/cyclic_dependencies.rs
new file mode 100644
index 000000000..cee7aeb40
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/cyclic_dependencies.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::{language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::BTreeSet;
+
+pub fn verify_module<D>(module: &CompiledModule, imm_deps: D) -> VMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    verify_module_impl(module, imm_deps).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+/// This function performs a depth-first traversal in the module graph, starting at `module` and
+/// recursively exploring immediate dependencies.  During the DFS,
+/// - If `module.self_id()` is encountered (again), a dependency cycle is detected and an error is
+///   returned.
+/// - Otherwise terminates without an error.
+fn verify_module_impl<D>(module: &CompiledModule, imm_deps: D) -> PartialVMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    fn detect_cycles<D>(
+        target: &ModuleId,
+        cursor: &ModuleId,
+        visited: &mut BTreeSet<ModuleId>,
+        deps: &D,
+    ) -> PartialVMResult<bool>
+    where
+        D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+    {
+        if cursor == target {
+            return Ok(true);
+        }
+
+        if !visited.insert(cursor.clone()) {
+            for dep in deps(cursor)? {
+                if detect_cycles(target, &dep, visited, deps)? {
+                    return Ok(true);
+                }
+            }
+        }
+
+        Ok(false)
+    }
+
+    let self_id = module.self_id();
+    let mut visited = BTreeSet::new();
+    for dep in module.immediate_dependencies() {
+        if detect_cycles(&self_id, &dep, &mut visited, &imm_deps)? {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY));
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/dependencies.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/dependencies.rs
new file mode 100644
index 000000000..f24b75487
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/dependencies.rs
@@ -0,0 +1,587 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules and scripts.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, CompiledModule, CompiledScript, FunctionDefinitionIndex,
+        FunctionHandleIndex, ModuleHandleIndex, SignatureToken, StructHandleIndex,
+        StructTypeParameter, TableIndex, Visibility,
+    },
+    file_format_common::VERSION_5,
+    safe_unwrap, IndexKind,
+};
+use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::{BTreeMap, BTreeSet};
+
+struct Context<'a, 'b> {
+    resolver: BinaryIndexedView<'a>,
+    // (Module -> CompiledModule) for (at least) all immediate dependencies
+    dependency_map: BTreeMap<ModuleId, &'b CompiledModule>,
+    // (Module::StructName -> handle) for all types of all dependencies
+    struct_id_to_handle_map: BTreeMap<(ModuleId, Identifier), StructHandleIndex>,
+    // (Module::FunctionName -> handle) for all functions that can ever be called by this
+    // module/script in all dependencies
+    func_id_to_handle_map: BTreeMap<(ModuleId, Identifier), FunctionHandleIndex>,
+    // (handle -> visibility) for all function handles found in the module being checked
+    function_visibilities: BTreeMap<FunctionHandleIndex, Visibility>,
+    // all function handles found in the module being checked that are script functions in <V5
+    // None if the current module/script >= V5
+    script_functions: Option<BTreeSet<FunctionHandleIndex>>,
+}
+
+impl<'a, 'b> Context<'a, 'b> {
+    fn module(
+        module: &'a CompiledModule,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Module(module), dependencies)
+    }
+
+    fn script(
+        script: &'a CompiledScript,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Script(script), dependencies)
+    }
+
+    fn new(
+        resolver: BinaryIndexedView<'a>,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        let self_module = resolver.self_id();
+        let self_module_idx = resolver.self_handle_idx();
+        let empty_defs = &vec![];
+        let self_function_defs = match &resolver {
+            BinaryIndexedView::Module(m) => m.function_defs(),
+            BinaryIndexedView::Script(_) => empty_defs,
+        };
+        let dependency_map = dependencies
+            .into_iter()
+            .filter(|d| Some(d.self_id()) != self_module)
+            .map(|d| (d.self_id(), d))
+            .collect();
+
+        let script_functions = if resolver.version() < VERSION_5 {
+            Some(BTreeSet::new())
+        } else {
+            None
+        };
+        let mut context = Self {
+            resolver,
+            dependency_map,
+            struct_id_to_handle_map: BTreeMap::new(),
+            func_id_to_handle_map: BTreeMap::new(),
+            function_visibilities: BTreeMap::new(),
+            script_functions,
+        };
+
+        let mut dependency_visibilities = BTreeMap::new();
+        for (module_id, module) in &context.dependency_map {
+            let friend_module_ids: BTreeSet<_> = module.immediate_friends().into_iter().collect();
+
+            // Module::StructName -> def handle idx
+            for struct_def in module.struct_defs() {
+                let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+                let struct_name = module.identifier_at(struct_handle.name);
+                context.struct_id_to_handle_map.insert(
+                    (module_id.clone(), struct_name.to_owned()),
+                    struct_def.struct_handle,
+                );
+            }
+            // Module::FuncName -> def handle idx
+            for func_def in module.function_defs() {
+                let func_handle = module.function_handle_at(func_def.function);
+                let func_name = module.identifier_at(func_handle.name);
+                dependency_visibilities.insert(
+                    (module_id.clone(), func_name.to_owned()),
+                    (func_def.visibility, func_def.is_entry),
+                );
+                let may_be_called = match func_def.visibility {
+                    Visibility::Public => true,
+                    Visibility::Friend => self_module
+                        .as_ref()
+                        .map_or(false, |self_id| friend_module_ids.contains(self_id)),
+                    Visibility::Private => false,
+                };
+                if may_be_called {
+                    context
+                        .func_id_to_handle_map
+                        .insert((module_id.clone(), func_name.to_owned()), func_def.function);
+                }
+            }
+        }
+
+        for function_def in self_function_defs {
+            context
+                .function_visibilities
+                .insert(function_def.function, function_def.visibility);
+            if function_def.is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(function_def.function));
+            }
+        }
+        for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+            if Some(function_handle.module) == self_module_idx {
+                continue;
+            }
+            let dep_module_id = context
+                .resolver
+                .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+            let function_name = context.resolver.identifier_at(function_handle.name);
+            let dep_file_format_version =
+                context.dependency_map.get(&dep_module_id).unwrap().version;
+            let dep_function = (dep_module_id, function_name.to_owned());
+            let (visibility, is_entry) = match dependency_visibilities.get(&dep_function) {
+                // The visibility does not need to be set here. If the function does not
+                // link, it will be reported by verify_imported_functions
+                None => continue,
+                Some(vis_entry) => *vis_entry,
+            };
+            let fhandle_idx = FunctionHandleIndex(idx as TableIndex);
+            context
+                .function_visibilities
+                .insert(fhandle_idx, visibility);
+            if dep_file_format_version < VERSION_5 && is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(fhandle_idx));
+            }
+        }
+
+        context
+    }
+}
+
+pub fn verify_module<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_module_impl(module, dependencies)
+        .map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::module(module, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+pub fn verify_script<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_script_impl(script, dependencies).map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_script_impl<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::script(script, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+fn verify_imported_modules(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, module_handle) in context.resolver.module_handles().iter().enumerate() {
+        let module_id = context.resolver.module_id_for_handle(module_handle);
+        if Some(ModuleHandleIndex(idx as u16)) != self_module
+            && !context.dependency_map.contains_key(&module_id)
+        {
+            return Err(verification_error(
+                StatusCode::MISSING_DEPENDENCY,
+                IndexKind::ModuleHandle,
+                idx as TableIndex,
+            ));
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_structs(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, struct_handle) in context.resolver.struct_handles().iter().enumerate() {
+        if Some(struct_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(struct_handle.module));
+        // TODO: remove unwrap
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        let struct_name = context.resolver.identifier_at(struct_handle.name);
+        match context
+            .struct_id_to_handle_map
+            .get(&(owner_module_id, struct_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.struct_handle_at(*def_idx);
+                if !compatible_struct_abilities(struct_handle.abilities, def_handle.abilities)
+                    || !compatible_struct_type_parameters(
+                        &struct_handle.type_parameters,
+                        &def_handle.type_parameters,
+                    )
+                {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::StructHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::StructHandle,
+                    idx as TableIndex,
+                ))
+            }
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_functions(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+        if Some(function_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+        let function_name = context.resolver.identifier_at(function_handle.name);
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        match context
+            .func_id_to_handle_map
+            .get(&(owner_module_id.clone(), function_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.function_handle_at(*def_idx);
+                // compatible type parameter constraints
+                if !compatible_fun_type_parameters(
+                    &function_handle.type_parameters,
+                    &def_handle.type_parameters,
+                ) {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+                // same parameters
+                let handle_params = context.resolver.signature_at(function_handle.parameters);
+                let def_params = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.parameters),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_params.0,
+                    &def_params.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+
+                // same return_
+                let handle_return = context.resolver.signature_at(function_handle.return_);
+                let def_return = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.return_),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_return.0,
+                    &def_return.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::FunctionHandle,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
+
+// The local view must be a subset of (or equal to) the defined set of abilities. Conceptually, the
+// local view can be more constrained than the defined one. Removing abilities locally does nothing
+// but limit the local usage.
+// (Note this works because there are no negative constraints, i.e. you cannot constrain a type
+// parameter with the absence of an ability)
+fn compatible_struct_abilities(
+    local_struct_abilities_declaration: AbilitySet,
+    defined_struct_abilities: AbilitySet,
+) -> bool {
+    local_struct_abilities_declaration.is_subset(defined_struct_abilities)
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`]
+fn compatible_fun_type_parameters(
+    local_type_parameters_declaration: &[AbilitySet],
+    defined_type_parameters: &[AbilitySet],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(
+                    local_type_parameter_constraints_declaration,
+                    defined_type_parameter_constraints,
+                )| {
+                    compatible_type_parameter_constraints(
+                        *local_type_parameter_constraints_declaration,
+                        *defined_type_parameter_constraints,
+                    )
+                },
+            )
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`] and [`compatible_type_parameter_phantom_decl`]
+fn compatible_struct_type_parameters(
+    local_type_parameters_declaration: &[StructTypeParameter],
+    defined_type_parameters: &[StructTypeParameter],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(local_type_parameter_declaration, defined_type_parameter)| {
+                    compatible_type_parameter_phantom_decl(
+                        local_type_parameter_declaration,
+                        defined_type_parameter,
+                    ) && compatible_type_parameter_constraints(
+                        local_type_parameter_declaration.constraints,
+                        defined_type_parameter.constraints,
+                    )
+                },
+            )
+}
+
+//  The local view of a type parameter must be a superset of (or equal to) the defined
+//  constraints. Conceptually, the local view can be more constrained than the defined one as the
+//  local context is only limiting usage, and cannot take advantage of the additional constraints.
+fn compatible_type_parameter_constraints(
+    local_type_parameter_constraints_declaration: AbilitySet,
+    defined_type_parameter_constraints: AbilitySet,
+) -> bool {
+    defined_type_parameter_constraints.is_subset(local_type_parameter_constraints_declaration)
+}
+
+// Adding phantom declarations relaxes the requirements for clients, thus, the local view may
+// lack a phantom declaration present in the definition.
+fn compatible_type_parameter_phantom_decl(
+    local_type_parameter_declaration: &StructTypeParameter,
+    defined_type_parameter: &StructTypeParameter,
+) -> bool {
+    // local_type_parameter_declaration.is_phantom => defined_type_parameter.is_phantom
+    !local_type_parameter_declaration.is_phantom || defined_type_parameter.is_phantom
+}
+
+fn compare_cross_module_signatures(
+    context: &Context,
+    handle_sig: &[SignatureToken],
+    def_sig: &[SignatureToken],
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    if handle_sig.len() != def_sig.len() {
+        return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+    }
+    for (handle_type, def_type) in handle_sig.iter().zip(def_sig) {
+        compare_types(context, handle_type, def_type, def_module)?;
+    }
+    Ok(())
+}
+
+fn compare_types(
+    context: &Context,
+    handle_type: &SignatureToken,
+    def_type: &SignatureToken,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    match (handle_type, def_type) {
+        (SignatureToken::Bool, SignatureToken::Bool)
+        | (SignatureToken::U8, SignatureToken::U8)
+        | (SignatureToken::U16, SignatureToken::U16)
+        | (SignatureToken::U32, SignatureToken::U32)
+        | (SignatureToken::U64, SignatureToken::U64)
+        | (SignatureToken::U128, SignatureToken::U128)
+        | (SignatureToken::U256, SignatureToken::U256)
+        | (SignatureToken::Address, SignatureToken::Address)
+        | (SignatureToken::Signer, SignatureToken::Signer) => Ok(()),
+        (SignatureToken::Vector(ty1), SignatureToken::Vector(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::Struct(idx1), SignatureToken::Struct(idx2)) => {
+            compare_structs(context, *idx1, *idx2, def_module)
+        }
+        (
+            SignatureToken::StructInstantiation(idx1, inst1),
+            SignatureToken::StructInstantiation(idx2, inst2),
+        ) => {
+            compare_structs(context, *idx1, *idx2, def_module)?;
+            compare_cross_module_signatures(context, inst1, inst2, def_module)
+        }
+        (SignatureToken::Reference(ty1), SignatureToken::Reference(ty2))
+        | (SignatureToken::MutableReference(ty1), SignatureToken::MutableReference(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::TypeParameter(idx1), SignatureToken::TypeParameter(idx2)) => {
+            if idx1 != idx2 {
+                Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+            } else {
+                Ok(())
+            }
+        }
+        (SignatureToken::Bool, _)
+        | (SignatureToken::U8, _)
+        | (SignatureToken::U64, _)
+        | (SignatureToken::U128, _)
+        | (SignatureToken::Address, _)
+        | (SignatureToken::Signer, _)
+        | (SignatureToken::Vector(_), _)
+        | (SignatureToken::Struct(_), _)
+        | (SignatureToken::StructInstantiation(_, _), _)
+        | (SignatureToken::Reference(_), _)
+        | (SignatureToken::MutableReference(_), _)
+        | (SignatureToken::TypeParameter(_), _)
+        | (SignatureToken::U16, _)
+        | (SignatureToken::U32, _)
+        | (SignatureToken::U256, _) => Err(PartialVMError::new(StatusCode::TYPE_MISMATCH)),
+    }
+}
+
+fn compare_structs(
+    context: &Context,
+    idx1: StructHandleIndex,
+    idx2: StructHandleIndex,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    // grab ModuleId and struct name for the module being verified
+    let struct_handle = context.resolver.struct_handle_at(idx1);
+    let module_handle = context.resolver.module_handle_at(struct_handle.module);
+    let module_id = context.resolver.module_id_for_handle(module_handle);
+    let struct_name = context.resolver.identifier_at(struct_handle.name);
+
+    // grab ModuleId and struct name for the definition
+    let def_struct_handle = def_module.struct_handle_at(idx2);
+    let def_module_handle = def_module.module_handle_at(def_struct_handle.module);
+    let def_module_id = def_module.module_id_for_handle(def_module_handle);
+    let def_struct_name = def_module.identifier_at(def_struct_handle.name);
+
+    if module_id != def_module_id || struct_name != def_struct_name {
+        Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+    } else {
+        Ok(())
+    }
+}
+
+fn verify_all_script_visibility_usage(context: &Context) -> PartialVMResult<()> {
+    // script visibility deprecated after V5
+    let script_functions = match &context.script_functions {
+        None => return Ok(()),
+        Some(s) => s,
+    };
+    debug_assert!(context.resolver.version() < VERSION_5);
+    match &context.resolver {
+        BinaryIndexedView::Module(m) => {
+            for (idx, fdef) in m.function_defs().iter().enumerate() {
+                let code = match &fdef.code {
+                    None => continue,
+                    Some(code) => &code.code,
+                };
+                verify_script_visibility_usage(
+                    &context.resolver,
+                    script_functions,
+                    fdef.is_entry,
+                    FunctionDefinitionIndex(idx as TableIndex),
+                    code,
+                )?
+            }
+            Ok(())
+        }
+        BinaryIndexedView::Script(s) => verify_script_visibility_usage(
+            &context.resolver,
+            script_functions,
+            true,
+            FunctionDefinitionIndex(0),
+            &s.code().code,
+        ),
+    }
+}
+
+fn verify_script_visibility_usage(
+    resolver: &BinaryIndexedView,
+    script_functions: &BTreeSet<FunctionHandleIndex>,
+    current_is_entry: bool,
+    fdef_idx: FunctionDefinitionIndex,
+    code: &[Bytecode],
+) -> PartialVMResult<()> {
+    for (idx, instr) in code.iter().enumerate() {
+        let idx = idx as CodeOffset;
+        let fhandle_idx = match instr {
+            Bytecode::Call(fhandle_idx) => fhandle_idx,
+            Bytecode::CallGeneric(finst_idx) => {
+                &resolver.function_instantiation_at(*finst_idx).handle
+            }
+            _ => continue,
+        };
+        match (current_is_entry, script_functions.contains(fhandle_idx)) {
+            (true, true) => (),
+            (_, true) => {
+                return Err(PartialVMError::new(
+                    StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+                )
+                .at_code_offset(fdef_idx, idx)
+                .with_message(
+                    "script-visible functions can only be called from scripts or other \
+                    script-visible functions"
+                        .to_string(),
+                ));
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/friends.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/friends.rs
new file mode 100644
index 000000000..7bfd9afec
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/friends.rs
@@ -0,0 +1,48 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    // cannot make friends with the module itself
+    let self_handle = module.self_handle();
+    if module.friend_decls().contains(self_handle) {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_SELF,
+        ));
+    }
+
+    // cannot make friends with modules outside of the account address
+    //
+    // NOTE: this constraint is a policy decision rather than a technical requirement. The VM and
+    // other bytecode verifier passes do not rely on the assumption that friend modules must be
+    // declared within the same account address.
+    //
+    // However, lacking a definite use case of friending modules across account boundaries, and also
+    // to minimize the associated changes on the module publishing flow, we temporarily enforce this
+    // constraint and we may consider lifting this limitation in the future.
+    let self_address =
+        module.address_identifier_at(module.module_handle_at(module.self_handle_idx()).address);
+    let has_external_friend = module
+        .friend_decls()
+        .iter()
+        .any(|handle| module.address_identifier_at(handle.address) != self_address);
+    if has_external_friend {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS,
+        ));
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/instantiation_loops.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/instantiation_loops.rs
new file mode 100644
index 000000000..9af7dff23
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/instantiation_loops.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This implements an algorithm that detects loops during the instantiation of generics.
+//!
+//! It builds a graph from the given `CompiledModule` and converts the original problem into
+//! finding strongly connected components in the graph with certain properties. Read the
+//! documentation of the types/functions below for details of how it works.
+//!
+//! Note: We're doing generics only up to specialization, and are doing a conservative check of
+//! generic call sites to eliminate those which could lead to an infinite number of specialized
+//! instances. We do reject recursive functions that create a new type upon each call but do
+//! terminate eventually.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CompiledModule, FunctionDefinition, FunctionDefinitionIndex, FunctionHandleIndex,
+        SignatureIndex, SignatureToken, TypeParameterIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{
+    algo::tarjan_scc,
+    graph::{EdgeIndex, NodeIndex},
+    visit::EdgeRef,
+    Graph,
+};
+use std::collections::{hash_map, HashMap, HashSet};
+
+/// Data attached to each node.
+/// Each node corresponds to a type formal of a generic function in the module.
+#[derive(Eq, PartialEq, Hash, Copy, Clone)]
+struct Node(FunctionDefinitionIndex, TypeParameterIndex);
+
+/// Data attached to each edge. Indicating the type of the edge.
+enum Edge<'a> {
+    /// This type of edge from type formal T1 to T2 means the type bound to T1 is used to
+    /// instantiate T2 unmodified, thus the name `Identity`.
+    ///
+    /// Example:
+    /// ```
+    /// //    foo<T>() { bar<T>(); return; }
+    /// //
+    /// //    edge: foo_T --Id--> bar_T
+    /// ```
+    Identity,
+    /// This type of edge from type formal T1 to T2 means T2 is instantiated with a type resulted
+    /// by applying one or more type constructors to T1 (potentially with other types).
+    ///
+    /// This is interesting to us as it creates a new (and bigger) type.
+    ///
+    /// Example:
+    /// ```
+    /// //    struct Baz<T> {}
+    /// //    foo<T>() { bar<Baz<T>>(); return; }
+    /// //
+    /// //    edge: foo_T --TyConApp(Baz<T>)--> bar_T
+    /// ```
+    TyConApp(&'a SignatureToken),
+}
+
+pub struct InstantiationLoopChecker<'a> {
+    module: &'a CompiledModule,
+
+    graph: Graph<Node, Edge<'a>>,
+    node_map: HashMap<Node, NodeIndex>,
+    func_handle_def_map: HashMap<FunctionHandleIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> InstantiationLoopChecker<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        Self {
+            module,
+            graph: Graph::new(),
+            node_map: HashMap::new(),
+            func_handle_def_map: module
+                .function_defs()
+                .iter()
+                .enumerate()
+                .map(|(def_idx, def)| (def.function, FunctionDefinitionIndex::new(def_idx as u16)))
+                .collect(),
+        }
+    }
+
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let mut checker = Self::new(module);
+        checker.build_graph();
+        let mut components = checker.find_non_trivial_components();
+
+        match components.pop() {
+            None => Ok(()),
+            Some((nodes, edges)) => {
+                let msg_edges = edges
+                    .into_iter()
+                    .filter_map(
+                        |edge_idx| match checker.graph.edge_weight(edge_idx).unwrap() {
+                            Edge::TyConApp(_) => Some(checker.format_edge(edge_idx)),
+                            _ => None,
+                        },
+                    )
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg_nodes = nodes
+                    .into_iter()
+                    .map(|node_idx| checker.format_node(node_idx))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg = format!(
+                    "edges with constructors: [{}], nodes: [{}]",
+                    msg_edges, msg_nodes
+                );
+                Err(PartialVMError::new(StatusCode::LOOP_IN_INSTANTIATION_GRAPH).with_message(msg))
+            }
+        }
+    }
+
+    /// Retrieves the node corresponding to the specified type formal.
+    /// If none exists in the graph yet, create one.
+    fn get_or_add_node(&mut self, node: Node) -> NodeIndex {
+        match self.node_map.entry(node) {
+            hash_map::Entry::Occupied(entry) => *entry.get(),
+            hash_map::Entry::Vacant(entry) => {
+                let idx = self.graph.add_node(node);
+                entry.insert(idx);
+                idx
+            }
+        }
+    }
+
+    /// Helper function that extracts type parameters from a given type.
+    /// Duplicated entries are removed.
+    fn extract_type_parameters(&self, ty: &SignatureToken) -> HashSet<TypeParameterIndex> {
+        use SignatureToken::*;
+
+        let mut type_params = HashSet::new();
+
+        fn rec(type_params: &mut HashSet<TypeParameterIndex>, ty: &SignatureToken) {
+            match ty {
+                Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Signer | Struct(_) => (),
+                TypeParameter(idx) => {
+                    type_params.insert(*idx);
+                }
+                Vector(ty) => rec(type_params, ty),
+                Reference(ty) | MutableReference(ty) => rec(type_params, ty),
+                StructInstantiation(_, tys) => {
+                    for ty in tys {
+                        rec(type_params, ty);
+                    }
+                }
+            }
+        }
+
+        rec(&mut type_params, ty);
+        type_params
+    }
+
+    /// Helper function that creates an edge from one given node to the other.
+    /// If a node does not exist, create one.
+    fn add_edge(&mut self, node_from: Node, node_to: Node, edge: Edge<'a>) {
+        let node_from_idx = self.get_or_add_node(node_from);
+        let node_to_idx = self.get_or_add_node(node_to);
+        self.graph.add_edge(node_from_idx, node_to_idx, edge);
+    }
+
+    /// Helper of 'fn build_graph' that inspects a function call. If type parameters of the caller
+    /// appear in the type actuals to the callee, nodes and edges are added to the graph.
+    fn build_graph_call(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        callee_idx: FunctionDefinitionIndex,
+        type_actuals_idx: SignatureIndex,
+    ) {
+        let type_actuals = &self.module.signature_at(type_actuals_idx).0;
+
+        for (formal_idx, ty) in type_actuals.iter().enumerate() {
+            let formal_idx = formal_idx as TypeParameterIndex;
+            match ty {
+                SignatureToken::TypeParameter(actual_idx) => self.add_edge(
+                    Node(caller_idx, *actual_idx),
+                    Node(callee_idx, formal_idx),
+                    Edge::Identity,
+                ),
+                _ => {
+                    for type_param in self.extract_type_parameters(ty) {
+                        self.add_edge(
+                            Node(caller_idx, type_param),
+                            Node(callee_idx, formal_idx),
+                            Edge::TyConApp(ty),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Helper of `fn build_graph` that inspects a function definition for calls between two generic
+    /// functions defined in the current module.
+    fn build_graph_function_def(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        caller_def: &FunctionDefinition,
+    ) {
+        if let Some(code) = &caller_def.code {
+            for instr in &code.code {
+                if let Bytecode::CallGeneric(callee_inst_idx) = instr {
+                    // Get the id of the definition of the function being called.
+                    // Skip if the function is not defined in the current module, as we do not
+                    // have mutual recursions across module boundaries.
+                    let callee_si = self.module.function_instantiation_at(*callee_inst_idx);
+                    if let Some(callee_idx) = self.func_handle_def_map.get(&callee_si.handle) {
+                        let callee_idx = *callee_idx;
+                        self.build_graph_call(caller_idx, callee_idx, callee_si.type_parameters)
+                    }
+                }
+            }
+        }
+    }
+
+    /// Builds a graph G such that
+    ///   - Each type formal of a generic function is a node in G.
+    ///   - There is an edge from type formal f_T to g_T if f_T is used to instantiate g_T in a
+    ///     call.
+    ///     - Each edge is labeled either `Identity` or `TyConApp`. See `Edge` for details.
+    fn build_graph(&mut self) {
+        for (def_idx, func_def) in self
+            .module
+            .function_defs()
+            .iter()
+            .enumerate()
+            .filter(|(_, def)| !def.is_native())
+        {
+            self.build_graph_function_def(FunctionDefinitionIndex::new(def_idx as u16), func_def)
+        }
+    }
+
+    /// Computes the strongly connected components of the graph built and keep the ones that
+    /// contain at least one `TyConApp` edge. Such components indicate there exists a loop such
+    /// that an input type can get "bigger" infinitely many times along the loop, also creating
+    /// infinitely many types. This is precisely the kind of constructs we want to forbid.
+    fn find_non_trivial_components(&self) -> Vec<(Vec<NodeIndex>, Vec<EdgeIndex>)> {
+        tarjan_scc(&self.graph)
+            .into_iter()
+            .filter_map(move |nodes| {
+                let node_set: HashSet<_> = nodes.iter().cloned().collect();
+
+                let edges: Vec<_> = nodes
+                    .iter()
+                    .flat_map(|node_idx| {
+                        self.graph.edges(*node_idx).filter_map(|edge| {
+                            if node_set.contains(&edge.target()) {
+                                Some(edge.id())
+                            } else {
+                                None
+                            }
+                        })
+                    })
+                    .collect();
+
+                if edges.iter().any(
+                    |edge_idx| match self.graph.edge_weight(*edge_idx).unwrap() {
+                        Edge::Identity => false,
+                        Edge::TyConApp(_) => true,
+                    },
+                ) {
+                    Some((nodes, edges))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    fn format_node(&self, node_idx: NodeIndex) -> String {
+        let Node(def_idx, param_idx) = self.graph.node_weight(node_idx).unwrap();
+        format!("f{}#{}", def_idx, param_idx)
+    }
+
+    fn format_edge(&self, edge_idx: EdgeIndex) -> String {
+        let (node_idx_1, node_idx_2) = self.graph.edge_endpoints(edge_idx).unwrap();
+        let node_1 = self.format_node(node_idx_1);
+        let node_2 = self.format_node(node_idx_2);
+
+        match self.graph.edge_weight(edge_idx).unwrap() {
+            Edge::TyConApp(ty) => format!("{} --{:?}--> {}", node_1, ty, node_2,),
+            Edge::Identity => format!("{} ----> {}", node_1, node_2),
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/instruction_consistency.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/instruction_consistency.rs
new file mode 100644
index 000000000..52cb7cd00
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/instruction_consistency.rs
@@ -0,0 +1,209 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying consistency of each bytecode
+//! instruction, in particular, for the bytecode instructions that come in both generic and
+//! non-generic flavors. It also checks constraints on instructions like VecPack/VecUnpack.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, FieldHandleIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, StructDefinitionIndex, TableIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct InstructionConsistency<'a> {
+    resolver: BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+}
+
+impl<'a> InstructionConsistency<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let resolver = BinaryIndexedView::Module(module);
+
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            match &func_def.code {
+                None => (),
+                Some(code) => {
+                    let checker = Self {
+                        resolver,
+                        current_function: Some(FunctionDefinitionIndex(idx as TableIndex)),
+                    };
+                    checker.check_instructions(code)?
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    pub fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let checker = Self {
+            resolver: BinaryIndexedView::Script(script),
+            current_function: None,
+        };
+        checker.check_instructions(&script.code)
+    }
+
+    fn check_instructions(&self, code: &CodeUnit) -> PartialVMResult<()> {
+        for (offset, instr) in code.code.iter().enumerate() {
+            use Bytecode::*;
+
+            match instr {
+                MutBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                MutBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* generic */ true)?;
+                }
+                ImmBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                ImmBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* non_ */ true)?;
+                }
+                Call(idx) => {
+                    self.check_function_op(offset, *idx, /* generic */ false)?;
+                }
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    self.check_function_op(offset, func_inst.handle, /* generic */ true)?;
+                }
+                Pack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                PackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Unpack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                UnpackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MutBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                ImmBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ImmBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Exists(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ExistsGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveFrom(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveFromGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveTo(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveToGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                VecPack(_, num) | VecUnpack(_, num) => {
+                    if *num > u16::MAX as u64 {
+                        return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                            .at_code_offset(self.current_function(), offset as CodeOffset)
+                            .with_message("VecPack/VecUnpack argument out of range".to_string()));
+                    }
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                FreezeRef | Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_)
+                | LdU32(_) | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16
+                | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | ReadRef
+                | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor | Shl | Shr
+                | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | CopyLoc(_) | MoveLoc(_)
+                | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_) | VecLen(_) | VecImmBorrow(_)
+                | VecMutBorrow(_) | VecPushBack(_) | VecPopBack(_) | VecSwap(_) | Abort | Nop => (),
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Helpers for instructions that come in a generic and non generic form.
+    // Verifies the generic form uses a generic member and the non generic form
+    // a non generic one.
+    //
+
+    fn check_field_op(
+        &self,
+        offset: usize,
+        field_handle_index: FieldHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let field_handle = self.resolver.field_handle_at(field_handle_index)?;
+        self.check_type_op(offset, field_handle.owner, generic)
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+
+    fn check_type_op(
+        &self,
+        offset: usize,
+        struct_def_index: StructDefinitionIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.resolver.struct_def_at(struct_def_index)?;
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        if struct_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+
+    fn check_function_op(
+        &self,
+        offset: usize,
+        func_handle_index: FunctionHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.resolver.function_handle_at(func_handle_index);
+        if function_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/lib.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/lib.rs
new file mode 100644
index 000000000..c232fa847
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! Verifies bytecode sanity.
+
+// Bounds checks are implemented in the `vm` crate.
+pub mod ability_field_requirements;
+pub mod absint;
+pub mod check_duplication;
+pub mod code_unit_verifier;
+pub mod constants;
+pub mod control_flow;
+pub mod control_flow_v5;
+pub mod cyclic_dependencies;
+pub mod dependencies;
+pub mod friends;
+pub mod instantiation_loops;
+pub mod instruction_consistency;
+pub mod limits;
+pub mod loop_summary;
+pub mod script_signature;
+pub mod signature;
+pub mod struct_defs;
+pub mod verifier;
+
+pub use check_duplication::DuplicationChecker;
+pub use code_unit_verifier::CodeUnitVerifier;
+pub use instruction_consistency::InstructionConsistency;
+pub use script_signature::{
+    legacy_script_signature_checks, no_additional_script_signature_checks, FnCheckScriptSignature,
+};
+pub use signature::SignatureChecker;
+pub use struct_defs::RecursiveStructDefChecker;
+pub use verifier::{
+    verify_module_unmetered, verify_module_with_config_for_test, verify_module_with_config_metered,
+    verify_module_with_config_unmetered, verify_script_unmetered,
+    verify_script_with_config_metered, verify_script_with_config_unmetered,
+};
+
+mod acquires_list_verifier;
+mod locals_safety;
+pub mod meter;
+mod reference_safety;
+mod regression_tests;
+mod stack_usage_verifier;
+mod type_safety;
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/limits.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/limits.rs
new file mode 100644
index 000000000..93fe8440f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/limits.rs
@@ -0,0 +1,223 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, SignatureToken, StructFieldInformation, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{runtime_value::MoveValue, vm_status::StatusCode};
+use move_vm_config::verifier::VerifierConfig;
+
+pub struct LimitsVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> LimitsVerifier<'a> {
+    pub fn verify_module(config: &VerifierConfig, module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        config: &VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        limit_check.verify_constants(config)?;
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)?;
+        limit_check.verify_identifiers(config)?;
+        limit_check.verify_definitions(config)
+    }
+
+    pub fn verify_script(config: &VerifierConfig, module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(config, module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        config: &VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)
+    }
+
+    fn verify_struct_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(limit) = config.max_generic_instantiation_length {
+            for (idx, struct_handle) in self.resolver.struct_handles().iter().enumerate() {
+                if struct_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::StructHandle, idx as u16));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_function_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, function_handle) in self.resolver.function_handles().iter().enumerate() {
+            if let Some(limit) = config.max_generic_instantiation_length {
+                if function_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+            if let Some(limit) = config.max_function_parameters {
+                if self
+                    .resolver
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .len()
+                    > limit
+                {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+        }
+        Ok(())
+    }
+
+    fn verify_type_nodes(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for sign in self.resolver.signatures() {
+            for ty in &sign.0 {
+                self.verify_type_node(config, ty)?
+            }
+        }
+        for cons in self.resolver.constant_pool() {
+            self.verify_type_node(config, &cons.type_)?
+        }
+        if let Some(sdefs) = self.resolver.struct_defs() {
+            for sdef in sdefs {
+                if let StructFieldInformation::Declared(fdefs) = &sdef.field_information {
+                    for fdef in fdefs {
+                        self.verify_type_node(config, &fdef.signature.0)?
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_type_node(
+        &self,
+        config: &VerifierConfig,
+        ty: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        if let Some(max) = &config.max_type_nodes {
+            // Structs and Parameters can expand to an unknown number of nodes, therefore
+            // we give them a higher size weight here.
+            const STRUCT_SIZE_WEIGHT: usize = 4;
+            const PARAM_SIZE_WEIGHT: usize = 4;
+            let mut size = 0;
+            for t in ty.preorder_traversal() {
+                // Notice that the preorder traversal will iterate all type instantiations, so we
+                // why we can ignore them below.
+                match t {
+                    SignatureToken::Struct(..) | SignatureToken::StructInstantiation(..) => {
+                        size += STRUCT_SIZE_WEIGHT
+                    }
+                    SignatureToken::TypeParameter(..) => size += PARAM_SIZE_WEIGHT,
+                    _ => size += 1,
+                }
+            }
+            if size > *max {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_definitions(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(defs) = self.resolver.function_defs() {
+            if let Some(max_function_definitions) = config.max_function_definitions {
+                if defs.len() > max_function_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+        }
+        if let Some(defs) = self.resolver.struct_defs() {
+            if let Some(max_struct_definitions) = config.max_struct_definitions {
+                if defs.len() > max_struct_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+            if let Some(max_fields_in_struct) = config.max_fields_in_struct {
+                for def in defs {
+                    match &def.field_information {
+                        StructFieldInformation::Native => (),
+                        StructFieldInformation::Declared(fields) => {
+                            if fields.len() > max_fields_in_struct {
+                                return Err(PartialVMError::new(
+                                    StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_constants(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, constant) in self.resolver.constant_pool().iter().enumerate() {
+            if let SignatureToken::Vector(_) = constant.type_ {
+                if let MoveValue::Vector(cons) =
+                    constant.deserialize_constant().ok_or_else(|| {
+                        verification_error(
+                            StatusCode::MALFORMED_CONSTANT_DATA,
+                            IndexKind::ConstantPool,
+                            idx as TableIndex,
+                        )
+                    })?
+                {
+                    if let Some(lim) = config.max_constant_vector_len {
+                        if cons.len() > lim as usize {
+                            return Err(PartialVMError::new(StatusCode::TOO_MANY_VECTOR_ELEMENTS)
+                                .with_message(format!("vector size limit is {}", lim)));
+                        }
+                    }
+                } else {
+                    return Err(verification_error(
+                        StatusCode::INVALID_CONSTANT_TYPE,
+                        IndexKind::ConstantPool,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Verifies the lengths of all identifers are valid
+    fn verify_identifiers(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(max_idenfitier_len) = config.max_idenfitier_len {
+            for (idx, identifier) in self.resolver.identifiers().iter().enumerate() {
+                if identifier.len() > (max_idenfitier_len as usize) {
+                    return Err(verification_error(
+                        StatusCode::IDENTIFIER_TOO_LONG,
+                        IndexKind::Identifier,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/abstract_state.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/abstract_state.rs
new file mode 100644
index 000000000..099a679ad
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/abstract_state.rs
@@ -0,0 +1,164 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the local safety analysis.
+
+use crate::absint::{AbstractDomain, JoinResult};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, CodeOffset, FunctionDefinitionIndex, LocalIndex},
+};
+use move_core_types::vm_status::StatusCode;
+
+/// LocalState represents the current assignment state of a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum LocalState {
+    /// The local does not have a value
+    Unavailable,
+    /// The local was assigned a non-drop value in at least one control flow path,
+    // but was `Unavailable` in at least one other path
+    MaybeAvailable,
+    /// The local has a value
+    Available,
+}
+use crate::meter::{Meter, Scope};
+use LocalState::*;
+
+pub(crate) const STEP_BASE_COST: u128 = 15;
+pub(crate) const RET_PER_LOCAL_COST: u128 = 30;
+pub(crate) const JOIN_BASE_COST: u128 = 10;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 5;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    all_local_abilities: Vec<AbilitySet>,
+    local_states: Vec<LocalState>,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(
+        resolver: &BinaryIndexedView,
+        function_view: &FunctionView,
+    ) -> PartialVMResult<Self> {
+        let num_args = function_view.parameters().len();
+        let num_locals = num_args + function_view.locals().len();
+        let local_states = (0..num_locals)
+            .map(|i| if i < num_args { Available } else { Unavailable })
+            .collect();
+
+        let all_local_abilities = function_view
+            .parameters()
+            .0
+            .iter()
+            .chain(function_view.locals().0.iter())
+            .map(|st| resolver.abilities(st, function_view.type_parameters()))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+
+        Ok(Self {
+            current_function: function_view.index(),
+            local_states,
+            all_local_abilities,
+        })
+    }
+
+    pub fn local_abilities(&self, idx: LocalIndex) -> AbilitySet {
+        self.all_local_abilities[idx as usize]
+    }
+
+    pub fn all_local_abilities(&self) -> &Vec<AbilitySet> {
+        &self.all_local_abilities
+    }
+
+    pub fn local_state(&self, idx: LocalIndex) -> LocalState {
+        self.local_states[idx as usize]
+    }
+
+    pub fn local_states(&self) -> &Vec<LocalState> {
+        &self.local_states
+    }
+
+    pub fn set_available(&mut self, idx: LocalIndex) {
+        self.local_states[idx as usize] = Available
+    }
+
+    pub fn set_unavailable(&mut self, idx: LocalIndex) {
+        assert!(self.local_states[idx as usize] == Available);
+        self.local_states[idx as usize] = Unavailable
+    }
+
+    pub fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.all_local_abilities.len() == other.all_local_abilities.len());
+        assert!(self.local_states.len() == other.local_states.len());
+        let current_function = self.current_function;
+        let all_local_abilities = self.all_local_abilities.clone();
+        let local_states = self
+            .local_states
+            .iter()
+            .zip(&other.local_states)
+            .map(|(self_state, other_state)| {
+                use LocalState::*;
+                match (self_state, other_state) {
+                    // Unavailable on both sides, nothing to add
+                    (Unavailable, Unavailable) => Unavailable,
+
+                    (MaybeAvailable, Unavailable)
+                    | (Unavailable, MaybeAvailable)
+                    | (MaybeAvailable, MaybeAvailable)
+                    | (MaybeAvailable, Available)
+                    | (Available, MaybeAvailable)
+                    | (Unavailable, Available)
+                    | (Available, Unavailable) => MaybeAvailable,
+
+                    (Available, Available) => Available,
+                }
+            })
+            .collect();
+
+        Self {
+            current_function,
+            all_local_abilities,
+            local_states,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_LOCAL_COST,
+            state.local_states.len(),
+        )?;
+        let joined = Self::join_(self, state);
+        assert!(self.local_states.len() == joined.local_states.len());
+        let locals_unchanged = self
+            .local_states
+            .iter()
+            .zip(&joined.local_states)
+            .all(|(self_state, other_state)| self_state == other_state);
+        if locals_unchanged {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/mod.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/mod.rs
new file mode 100644
index 000000000..55c80d93e
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -0,0 +1,185 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying local safety of a procedure body.
+//! It is concerned with the assignment state of a local variable at the time of usage, which is
+//! a control flow sensitive check.
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    locals_safety::abstract_state::{RET_PER_LOCAL_COST, STEP_BASE_COST},
+    meter::{Meter, Scope},
+};
+use abstract_state::{AbstractState, LocalState};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset},
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) fn verify<'a>(
+    resolver: &BinaryIndexedView,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(resolver, function_view)?;
+    LocalsSafetyAnalysis().analyze_function(initial_state, function_view, meter)
+}
+
+fn execute_inner(
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    match bytecode {
+        Bytecode::StLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Available
+                if !state.local_abilities(*idx).has_drop() =>
+            {
+                return Err(state.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            _ => state.set_available(*idx),
+        },
+
+        Bytecode::MoveLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::MOVELOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => state.set_unavailable(*idx),
+        },
+
+        Bytecode::CopyLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::COPYLOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => (),
+        },
+
+        Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+            match state.local_state(*idx) {
+                LocalState::Unavailable | LocalState::MaybeAvailable => {
+                    return Err(state.error(StatusCode::BORROWLOC_UNAVAILABLE_ERROR, offset))
+                }
+                LocalState::Available => (),
+            }
+        }
+
+        Bytecode::Ret => {
+            let local_states = state.local_states();
+            meter.add_items(Scope::Function, RET_PER_LOCAL_COST, local_states.len())?;
+            let all_local_abilities = state.all_local_abilities();
+            assert!(local_states.len() == all_local_abilities.len());
+            for (local_state, local_abilities) in local_states.iter().zip(all_local_abilities) {
+                match local_state {
+                    LocalState::MaybeAvailable | LocalState::Available
+                        if !local_abilities.has_drop() =>
+                    {
+                        return Err(
+                            state.error(StatusCode::UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP, offset)
+                        )
+                    }
+                    _ => (),
+                }
+            }
+        }
+
+        Bytecode::Pop
+        | Bytecode::BrTrue(_)
+        | Bytecode::BrFalse(_)
+        | Bytecode::Abort
+        | Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::FreezeRef
+        | Bytecode::MutBorrowField(_)
+        | Bytecode::MutBorrowFieldGeneric(_)
+        | Bytecode::ImmBorrowField(_)
+        | Bytecode::ImmBorrowFieldGeneric(_)
+        | Bytecode::LdU8(_)
+        | Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
+        | Bytecode::LdU64(_)
+        | Bytecode::LdU128(_)
+        | Bytecode::LdU256(_)
+        | Bytecode::LdConst(_)
+        | Bytecode::LdTrue
+        | Bytecode::LdFalse
+        | Bytecode::Call(_)
+        | Bytecode::CallGeneric(_)
+        | Bytecode::Pack(_)
+        | Bytecode::PackGeneric(_)
+        | Bytecode::Unpack(_)
+        | Bytecode::UnpackGeneric(_)
+        | Bytecode::ReadRef
+        | Bytecode::WriteRef
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Not
+        | Bytecode::Eq
+        | Bytecode::Neq
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge
+        | Bytecode::MutBorrowGlobal(_)
+        | Bytecode::MutBorrowGlobalGeneric(_)
+        | Bytecode::ImmBorrowGlobal(_)
+        | Bytecode::ImmBorrowGlobalGeneric(_)
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_)
+        | Bytecode::MoveFrom(_)
+        | Bytecode::MoveFromGeneric(_)
+        | Bytecode::MoveTo(_)
+        | Bytecode::MoveToGeneric(_)
+        | Bytecode::VecPack(..)
+        | Bytecode::VecLen(_)
+        | Bytecode::VecImmBorrow(_)
+        | Bytecode::VecMutBorrow(_)
+        | Bytecode::VecPushBack(_)
+        | Bytecode::VecPopBack(_)
+        | Bytecode::VecUnpack(..)
+        | Bytecode::VecSwap(_) => (),
+    };
+    Ok(())
+}
+
+struct LocalsSafetyAnalysis();
+
+impl TransferFunctions for LocalsSafetyAnalysis {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        _last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(state, bytecode, index, meter)
+    }
+}
+
+impl AbstractInterpreter for LocalsSafetyAnalysis {}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/loop_summary.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/loop_summary.rs
new file mode 100644
index 000000000..0f56382b8
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/loop_summary.rs
@@ -0,0 +1,280 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
+
+/// Dense index into nodes in the same `LoopSummary`
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId(u16);
+
+/// Alias to treat vectors as `NodeId -> T` maps.
+type NodeMap<T> = Vec<T>;
+
+/// Summarise loop information from a control-flow graph by calculating its depth-first spanning
+/// tree (DFST) and then using that to:
+///
+/// - Distinguish edges in the CFG as:
+///   - tree edges (in the spanning tree)
+///   - back edges (going backward from descendant to ancestor in the spanning tree)
+///   - ... everything else.
+/// - Calculate which node is descendant of which in the DFST
+/// - Mapping nodes in the summary back to the blocks they originate from in the CFG.
+///
+/// This is used to implement Tarjan's Loop Reducibility algorithm (Tarjan 1974).
+pub struct LoopSummary {
+    /// Original block corresponding to this node, useful for recovering code offsets, e.g. for
+    /// error messages.
+    blocks: NodeMap<BlockId>,
+
+    /// Number of transitive descendants for a node, in the depth-first spanning tree.
+    descs: NodeMap<u16>,
+
+    /// The incoming edges for a node are partitioned between `back_edges` which create cycles in
+    /// the DFS tree, and `pred_edges` which are all the rest.
+    backs: NodeMap<Vec<NodeId>>,
+    preds: NodeMap<Vec<NodeId>>,
+}
+
+/// A disjoint-set data structure used when collapsing loops down to single nodes in the summary
+/// graph while remembering their loop nesting depth (how many levels of nesting are contained
+/// within them)
+pub struct LoopPartition {
+    /// The parent relationship in the disjoint-set.  The transitive closure of this type maps a
+    /// node to its representative.
+    parents: NodeMap<NodeId>,
+
+    /// The nesting depth of (collapsed) nodes in the summary graph.  Nodes that are uncollapsed
+    /// (not in any loop) have a depth of 0.  Initially, all nodes are uncollapsed.
+    depths: NodeMap<u16>,
+}
+
+impl LoopSummary {
+    pub fn new(cfg: &VMControlFlowGraph) -> Self {
+        use Exploration::*;
+        use Frontier::*;
+
+        enum Exploration {
+            InProgress(NodeId),
+            Done(NodeId),
+        }
+
+        enum Frontier {
+            Visit {
+                from_node: NodeId,
+                to_block: BlockId,
+            },
+            Finish {
+                block: BlockId,
+                node_id: NodeId,
+                parent: NodeId,
+            },
+        }
+
+        let num_blocks = cfg.num_blocks() as usize;
+
+        // Fields in LoopSummary that are filled via a depth-first traversal of `cfg`.
+        let mut blocks = vec![0; num_blocks];
+        let mut descs = vec![0; num_blocks];
+        let mut backs = vec![vec![]; num_blocks];
+        let mut preds = vec![vec![]; num_blocks];
+
+        let mut next_node = NodeId(0);
+
+        let root_block = cfg.entry_block_id();
+        let root_node = next_node.bump();
+
+        let mut exploration = BTreeMap::new();
+        blocks[usize::from(root_node)] = root_block;
+        exploration.insert(root_block, InProgress(root_node));
+
+        let mut stack: Vec<Frontier> = cfg
+            .successors(root_block)
+            .iter()
+            .map(|succ| Visit {
+                from_node: root_node,
+                to_block: *succ,
+            })
+            .collect();
+
+        while let Some(action) = stack.pop() {
+            match action {
+                Finish {
+                    block,
+                    node_id,
+                    parent,
+                } => {
+                    descs[usize::from(parent)] += 1 + descs[usize::from(node_id)];
+                    *exploration.get_mut(&block).unwrap() = Done(node_id);
+                }
+
+                Visit {
+                    from_node,
+                    to_block,
+                } => match exploration.entry(to_block) {
+                    Entry::Occupied(entry) => match entry.get() {
+                        // Cyclic back edge detected by re-visiting `to` while still processing its
+                        // children.
+                        InProgress(to_node) => backs[usize::from(*to_node)].push(from_node),
+
+                        // Cross edge detected by re-visiting `to` after it and its children have
+                        // been processed.
+                        Done(to_node) => preds[usize::from(*to_node)].push(from_node),
+                    },
+
+                    // Visiting `to` for the first time: `from` must be its parent in the depth-
+                    // -first spanning tree, and we should continue exploring its successors.
+                    Entry::Vacant(entry) => {
+                        let to_node = next_node.bump();
+                        entry.insert(InProgress(to_node));
+                        blocks[usize::from(to_node)] = to_block;
+                        preds[usize::from(to_node)].push(from_node);
+
+                        stack.push(Finish {
+                            block: to_block,
+                            node_id: to_node,
+                            parent: from_node,
+                        });
+
+                        stack.extend(cfg.successors(to_block).iter().map(|succ| Visit {
+                            from_node: to_node,
+                            to_block: *succ,
+                        }));
+                    }
+                },
+            }
+        }
+
+        LoopSummary {
+            blocks,
+            descs,
+            backs,
+            preds,
+        }
+    }
+
+    /// Decides whether `descendant` is a descendant of `ancestor` in the depth-first spanning
+    /// tree.
+    pub fn is_descendant(&self, NodeId(ancestor): NodeId, NodeId(descendant): NodeId) -> bool {
+        // All the descendants of `ancestor` in the DFST will have the IDs immediately following it,
+        // so we can check for descendants with a bounds check on `NodeId`, given `ancestor`'s
+        // transitive descendant count in `self.descs[ancestor]`.
+        ancestor <= descendant && descendant <= ancestor + self.descs[ancestor as usize]
+    }
+
+    /// Returns an iterator over `NodeId`s in this `LoopSummary` in pre-order according to its
+    /// depth-first spanning tree.
+    pub fn preorder(&self) -> impl DoubleEndedIterator<Item = NodeId> {
+        // `LoopSummary::new` assigns `NodeId`s to blocks in preorder, so just return the natural
+        // order.
+        (0..self.blocks.len()).map(|id| NodeId(id as u16))
+    }
+
+    /// Per-node accessors
+    pub fn block(&self, l: NodeId) -> BlockId {
+        self.blocks[usize::from(l)]
+    }
+
+    pub fn back_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.backs[usize::from(l)]
+    }
+
+    pub fn pred_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.preds[usize::from(l)]
+    }
+}
+
+impl LoopPartition {
+    pub fn new(summary: &LoopSummary) -> Self {
+        let num_blocks = summary.blocks.len();
+        LoopPartition {
+            parents: (0..num_blocks).map(|id| NodeId(id as u16)).collect(),
+            depths: vec![0; num_blocks],
+        }
+    }
+
+    /// Find the head of the collapsed node containing loop `id`, use path-compression to speed up
+    /// future accesses.
+    pub fn containing_loop(&mut self, id: NodeId) -> NodeId {
+        let mut child = id;
+        let mut parent = self.parent(child);
+        let mut grandparent = self.parent(parent);
+
+        if child == parent || parent == grandparent {
+            return parent;
+        }
+
+        let mut descendants = vec![];
+        loop {
+            // Invariant: child -> parent -> grandparent
+            //       and  parent != grandparent
+            //       and  forall d in descendants. parent(d) != parent(parent(d))
+            descendants.push(child);
+            (child, parent, grandparent) = (parent, grandparent, self.parent(grandparent));
+            if parent == grandparent {
+                break;
+            }
+        }
+
+        for descendant in descendants {
+            *self.parent_mut(descendant) = parent;
+        }
+
+        parent
+    }
+
+    /// Collapse `body` of a loop down to one node, represented by its `head`.  Calculate the
+    /// nesting depth of the collapsed node and return it.
+    ///
+    /// Assumes that all the nodes involved are the heads of their corresponding sets in the
+    /// partition.
+    ///
+    /// Note that this function can be called with an empty body, meaning `head` is the only
+    /// node in the loop.  Its nesting depth will still be incremented in this case.
+    pub fn collapse_loop(&mut self, head: NodeId, body: &BTreeSet<NodeId>) -> u16 {
+        debug_assert_eq!(head, self.parent(head));
+
+        let mut depth = self.depth(head);
+        for constituent in body {
+            debug_assert_eq!(*constituent, self.parent(*constituent));
+            *self.parent_mut(*constituent) = head;
+            depth = self.depth(*constituent).max(depth);
+        }
+
+        depth += 1;
+        *self.depth_mut(head) = depth;
+        depth
+    }
+
+    /// Per-node accessors
+    fn parent(&self, l: NodeId) -> NodeId {
+        self.parents[usize::from(l)]
+    }
+
+    fn parent_mut(&mut self, l: NodeId) -> &mut NodeId {
+        &mut self.parents[usize::from(l)]
+    }
+
+    fn depth(&self, l: NodeId) -> u16 {
+        self.depths[usize::from(l)]
+    }
+
+    fn depth_mut(&mut self, l: NodeId) -> &mut u16 {
+        &mut self.depths[usize::from(l)]
+    }
+}
+
+impl NodeId {
+    /// Post-increment (e.g. `self++`).
+    fn bump(&mut self) -> NodeId {
+        let ret = *self;
+        self.0 += 1;
+        ret
+    }
+}
+
+impl From<NodeId> for usize {
+    fn from(NodeId(id): NodeId) -> usize {
+        id as usize
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/meter.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/meter.rs
new file mode 100644
index 000000000..7119bd5d0
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/meter.rs
@@ -0,0 +1,168 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::ops::Mul;
+
+/// Scope of meterinng
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Scope {
+    // Metering is for transaction level
+    Transaction,
+    // Metering is for package level
+    Package,
+    // Metering is for module level
+    Module,
+    // Metering is for function level
+    Function,
+}
+
+pub const ANALYZE_FUNCTION_BASE_COST: u128 = 10;
+pub const EXECUTE_BLOCK_BASE_COST: u128 = 10;
+pub const PER_BACKEDGE_COST: u128 = 10;
+pub const PER_SUCCESSOR_COST: u128 = 10;
+
+/// Trait for a metering verification.
+pub trait Meter {
+    /// Indicates the begin of a new scope.
+    fn enter_scope(&mut self, name: &str, scope: Scope);
+
+    /// Transfer the amount of metering from once scope to the next. If the current scope has
+    /// metered N units, the target scope will be charged with N*factor.
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()>;
+
+    /// Add the number of units to the meter, returns an error if a limit is hit.
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()>;
+
+    /// Adds the number of items.
+    fn add_items(
+        &mut self,
+        scope: Scope,
+        units_per_item: u128,
+        items: usize,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        self.add(scope, units_per_item.saturating_mul(items as u128))
+    }
+
+    /// Adds the number of items with growth factor
+    fn add_items_with_growth(
+        &mut self,
+        scope: Scope,
+        mut units_per_item: u128,
+        items: usize,
+        growth_factor: f32,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        for _ in 0..items {
+            self.add(scope, units_per_item)?;
+            units_per_item = growth_factor.mul(units_per_item as f32) as u128;
+        }
+        Ok(())
+    }
+}
+
+pub struct BoundMeter {
+    mod_bounds: Bounds,
+    fun_bounds: Bounds,
+}
+
+struct Bounds {
+    name: String,
+    units: u128,
+    max: Option<u128>,
+}
+
+impl Meter for BoundMeter {
+    fn enter_scope(&mut self, name: &str, scope: Scope) {
+        let bounds = self.get_bounds_mut(scope);
+        bounds.name = name.into();
+        bounds.units = 0;
+    }
+
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()> {
+        let units = (self.get_bounds_mut(from).units as f32 * factor) as u128;
+        self.add(to, units)
+    }
+
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()> {
+        self.get_bounds_mut(scope).add(units)
+    }
+}
+
+impl Bounds {
+    fn add(&mut self, units: u128) -> PartialVMResult<()> {
+        if let Some(max) = self.max {
+            let new_units = self.units.saturating_add(units);
+            if new_units > max {
+                // TODO: change to a new status PROGRAM_TOO_COMPLEX once this is rolled out. For
+                // now we use an existing code to avoid breaking changes on potential rollback.
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "program too complex (in `{}` with `{} current + {} new > {} max`)",
+                        self.name, self.units, units, max
+                    )));
+            }
+            self.units = new_units;
+        }
+        Ok(())
+    }
+}
+
+impl BoundMeter {
+    pub fn new(config: &VerifierConfig) -> Self {
+        Self {
+            mod_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_mod_meter_units,
+            },
+            fun_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_fun_meter_units,
+            },
+        }
+    }
+
+    fn get_bounds_mut(&mut self, scope: Scope) -> &mut Bounds {
+        if scope == Scope::Module {
+            &mut self.mod_bounds
+        } else {
+            &mut self.fun_bounds
+        }
+    }
+
+    fn get_bounds(&self, scope: Scope) -> &Bounds {
+        if scope == Scope::Module {
+            &self.mod_bounds
+        } else {
+            &self.fun_bounds
+        }
+    }
+
+    pub fn get_usage(&self, scope: Scope) -> u128 {
+        self.get_bounds(scope).units
+    }
+
+    pub fn get_limit(&self, scope: Scope) -> Option<u128> {
+        self.get_bounds(scope).max
+    }
+}
+
+pub struct DummyMeter;
+impl Meter for DummyMeter {
+    fn enter_scope(&mut self, _name: &str, _scope: Scope) {}
+    fn transfer(&mut self, _from: Scope, _to: Scope, _factor: f32) -> PartialVMResult<()> {
+        Ok(())
+    }
+    fn add(&mut self, _scope: Scope, _units: u128) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/abstract_state.rs
new file mode 100644
index 000000000..3bbbe2597
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -0,0 +1,745 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the type and memory safety analysis.
+use crate::{
+    absint::{AbstractDomain, JoinResult},
+    meter::{Meter, Scope},
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, FieldHandleIndex, FunctionDefinitionIndex, LocalIndex, Signature,
+        SignatureToken, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_borrow_graph::references::RefID;
+use move_core_types::vm_status::StatusCode;
+use std::collections::{BTreeMap, BTreeSet};
+
+type BorrowGraph = move_borrow_graph::graph::BorrowGraph<(), Label>;
+
+/// AbstractValue represents a reference or a non reference value, both on the stack and stored
+/// in a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum AbstractValue {
+    Reference(RefID),
+    NonReference,
+}
+
+impl AbstractValue {
+    /// checks if self is a reference
+    pub fn is_reference(&self) -> bool {
+        match self {
+            AbstractValue::Reference(_) => true,
+            AbstractValue::NonReference => false,
+        }
+    }
+
+    /// checks if self is a value
+    pub fn is_value(&self) -> bool {
+        !self.is_reference()
+    }
+
+    /// possibly extracts id from self
+    pub fn ref_id(&self) -> Option<RefID> {
+        match self {
+            AbstractValue::Reference(id) => Some(*id),
+            AbstractValue::NonReference => None,
+        }
+    }
+}
+
+/// Label is an element of a label on an edge in the borrow graph.
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+enum Label {
+    Local(LocalIndex),
+    Global(StructDefinitionIndex),
+    Field(FieldHandleIndex),
+}
+
+// Needed for debugging with the borrow graph
+impl std::fmt::Display for Label {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Label::Local(i) => write!(f, "local#{}", i),
+            Label::Global(i) => write!(f, "resource@{}", i),
+            Label::Field(i) => write!(f, "field#{}", i),
+        }
+    }
+}
+
+pub(crate) const STEP_BASE_COST: u128 = 10;
+pub(crate) const STEP_PER_LOCAL_COST: u128 = 20;
+pub(crate) const STEP_PER_GRAPH_ITEM_COST: u128 = 50;
+pub(crate) const JOIN_BASE_COST: u128 = 100;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 10;
+pub(crate) const JOIN_PER_GRAPH_ITEM_COST: u128 = 50;
+
+// The cost for an edge from an input reference parameter to output reference.
+pub(crate) const REF_PARAM_EDGE_COST: u128 = 100;
+pub(crate) const REF_PARAM_EDGE_COST_GROWTH: f32 = 1.5;
+
+// The cost of an acquires in a call.
+pub(crate) const CALL_PER_ACQUIRES_COST: u128 = 100;
+
+/// AbstractState is the analysis state over which abstract interpretation is performed.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    locals: Vec<AbstractValue>,
+    borrow_graph: BorrowGraph,
+    next_id: usize,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(function_view: &FunctionView) -> Self {
+        let num_locals = function_view.parameters().len() + function_view.locals().len();
+        // ids in [0, num_locals) are reserved for constructing canonical state
+        // id at num_locals is reserved for the frame root
+        let next_id = num_locals + 1;
+        let mut state = AbstractState {
+            current_function: function_view.index(),
+            locals: vec![AbstractValue::NonReference; num_locals],
+            borrow_graph: BorrowGraph::new(),
+            next_id,
+        };
+
+        for (param_idx, param_ty) in function_view.parameters().0.iter().enumerate() {
+            if param_ty.is_reference() {
+                let id = RefID::new(param_idx);
+                state
+                    .borrow_graph
+                    .new_ref(id, param_ty.is_mutable_reference());
+                state.locals[param_idx] = AbstractValue::Reference(id)
+            }
+        }
+        state.borrow_graph.new_ref(state.frame_root(), true);
+
+        assert!(state.is_canonical());
+        state
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn graph_size(&self) -> usize {
+        self.borrow_graph.graph_size()
+    }
+
+    /// returns the frame root id
+    fn frame_root(&self) -> RefID {
+        RefID::new(self.locals.len())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    //**********************************************************************************************
+    // Core API
+    //**********************************************************************************************
+
+    pub fn value_for(&mut self, s: &SignatureToken) -> AbstractValue {
+        match s {
+            SignatureToken::Reference(_) => AbstractValue::Reference(self.new_ref(false)),
+            SignatureToken::MutableReference(_) => AbstractValue::Reference(self.new_ref(true)),
+            _ => AbstractValue::NonReference,
+        }
+    }
+
+    /// adds and returns new id to borrow graph
+    fn new_ref(&mut self, mut_: bool) -> RefID {
+        let id = RefID::new(self.next_id);
+        self.borrow_graph.new_ref(id, mut_);
+        self.next_id += 1;
+        id
+    }
+
+    fn add_copy(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_strong_borrow((), parent, child)
+    }
+
+    fn add_borrow(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_weak_borrow((), parent, child)
+    }
+
+    fn add_field_borrow(&mut self, parent: RefID, field: FieldHandleIndex, child: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), parent, Label::Field(field), child)
+    }
+
+    fn add_local_borrow(&mut self, local: LocalIndex, id: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), self.frame_root(), Label::Local(local), id)
+    }
+
+    fn add_resource_borrow(&mut self, resource: StructDefinitionIndex, id: RefID) {
+        self.borrow_graph
+            .add_weak_field_borrow((), self.frame_root(), Label::Global(resource), id)
+    }
+
+    /// removes `id` from borrow graph
+    fn release(&mut self, id: RefID) {
+        self.borrow_graph.release(id);
+    }
+
+    //**********************************************************************************************
+    // Core Predicates
+    //**********************************************************************************************
+
+    /// checks if `id` is borrowed, but ignores field borrows
+    fn has_full_borrows(&self, id: RefID) -> bool {
+        let (full_borrows, _field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty()
+    }
+
+    /// Checks if `id` is borrowed
+    /// - All full/epsilon borrows are considered
+    /// - Only field borrows the specified label (or all if one isn't specified) are considered
+    fn has_consistent_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty() || {
+            match label_opt {
+                None => field_borrows.values().any(|borrows| !borrows.is_empty()),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !borrows.is_empty())
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// Checks if `id` is mutable borrowed
+    /// - All full/epsilon mutable borrows are considered
+    /// - Only field mutable borrows the specified label (or all if one isn't specified) are
+    ///   considered
+    fn has_consistent_mutable_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !self.all_immutable(&full_borrows) || {
+            match label_opt {
+                None => field_borrows
+                    .values()
+                    .any(|borrows| !self.all_immutable(borrows)),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !self.all_immutable(borrows))
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// checks if `id` is writable
+    /// - Mutable references are writable if there are no consistent borrows
+    /// - Immutable references are not writable by the typing rules
+    fn is_writable(&self, id: RefID) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_borrows(id, None)
+    }
+
+    /// checks if `id` is freezable
+    /// - Mutable references are freezable if there are no consistent mutable borrows
+    /// - Immutable references are not freezable by the typing rules
+    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::Field))
+    }
+
+    /// checks if `id` is readable
+    /// - Mutable references are readable if they are freezable
+    /// - Immutable references are always readable
+    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        let is_mutable = self.borrow_graph.is_mutable(id);
+        !is_mutable || self.is_freezable(id, at_field_opt)
+    }
+
+    /// checks if local@idx is borrowed
+    fn is_local_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if local@idx is mutably borrowed
+    fn is_local_mutably_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if global@idx is borrowed
+    fn is_global_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if global@idx is mutably borrowed
+    fn is_global_mutably_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if the stack frame of the function being analyzed can be safely destroyed.
+    /// safe destruction requires that all references in locals have already been destroyed
+    /// and all values in locals are copyable and unborrowed.
+    fn is_frame_safe_to_destroy(&self) -> bool {
+        !self.has_consistent_borrows(self.frame_root(), None)
+    }
+
+    //**********************************************************************************************
+    // Instruction Entry Points
+    //**********************************************************************************************
+
+    /// destroys local@idx
+    pub fn release_value(&mut self, value: AbstractValue) {
+        match value {
+            AbstractValue::Reference(id) => self.release(id),
+            AbstractValue::NonReference => (),
+        }
+    }
+
+    pub fn copy_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        match safe_unwrap!(self.locals.get(local as usize)) {
+            AbstractValue::Reference(id) => {
+                let id = *id;
+                let new_id = self.new_ref(self.borrow_graph.is_mutable(id));
+                self.add_copy(id, new_id);
+                Ok(AbstractValue::Reference(new_id))
+            }
+            AbstractValue::NonReference if self.is_local_mutably_borrowed(local) => {
+                Err(self.error(StatusCode::COPYLOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn move_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        let old_value = std::mem::replace(
+            safe_unwrap!(self.locals.get_mut(local as usize)),
+            AbstractValue::NonReference,
+        );
+        match old_value {
+            AbstractValue::Reference(id) => Ok(AbstractValue::Reference(id)),
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::MOVELOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn st_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+        new_value: AbstractValue,
+    ) -> PartialVMResult<()> {
+        let old_value =
+            std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value);
+        match old_value {
+            AbstractValue::Reference(id) => {
+                self.release(id);
+                Ok(())
+            }
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(()),
+        }
+    }
+
+    pub fn freeze_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_freezable(id, None) {
+            return Err(self.error(StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let frozen_id = self.new_ref(false);
+        self.add_copy(id, frozen_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(frozen_id))
+    }
+
+    pub fn comparison(
+        &mut self,
+        offset: CodeOffset,
+        v1: AbstractValue,
+        v2: AbstractValue,
+    ) -> PartialVMResult<AbstractValue> {
+        match (v1, v2) {
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2))
+                if !self.is_readable(id1, None) || !self.is_readable(id2, None) =>
+            {
+                // TODO better error code
+                return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+            }
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2)) => {
+                self.release(id1);
+                self.release(id2)
+            }
+            (v1, v2) => {
+                assert!(v1.is_value());
+                assert!(v2.is_value());
+            }
+        }
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn read_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_readable(id, None) {
+            return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn write_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<()> {
+        if !self.is_writable(id) {
+            return Err(self.error(StatusCode::WRITEREF_EXISTS_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn borrow_loc(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // nothing to check in case borrow is mutable since the frame cannot have an full borrow/
+        // epsilon outgoing edge
+        if !mut_ && self.is_local_mutably_borrowed(local) {
+            return Err(self.error(StatusCode::BORROWLOC_EXISTS_BORROW_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_local_borrow(local, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn borrow_field(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        id: RefID,
+        field: FieldHandleIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // Any field borrows will be factored out, so don't check in the mutable case
+        let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
+        // For new immutable borrow, the reference must be readable at that field
+        // This means that there could exist a mutable borrow on some other field
+        let is_imm_borrow_with_mut_borrows = || !mut_ && !self.is_readable(id, Some(field));
+
+        if is_mut_borrow_with_full_borrows() || is_imm_borrow_with_mut_borrows() {
+            // TODO improve error for mutable case
+            return Err(self.error(StatusCode::BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let field_borrow_id = self.new_ref(mut_);
+        self.add_field_borrow(id, field, field_borrow_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(field_borrow_id))
+    }
+
+    pub fn borrow_global(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if (mut_ && self.is_global_borrowed(resource)) || self.is_global_mutably_borrowed(resource)
+        {
+            return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_resource_borrow(resource, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn move_from(
+        &mut self,
+        offset: CodeOffset,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if self.is_global_borrowed(resource) {
+            Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset))
+        } else {
+            Ok(AbstractValue::NonReference)
+        }
+    }
+
+    pub fn vector_op(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<()> {
+        let id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(id) {
+            return Err(self.error(StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn vector_element_borrow(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<AbstractValue> {
+        let vec_id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(vec_id) {
+            return Err(self.error(
+                StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+                offset,
+            ));
+        }
+
+        let elem_id = self.new_ref(mut_);
+        self.add_borrow(vec_id, elem_id);
+
+        self.release(vec_id);
+        Ok(AbstractValue::Reference(elem_id))
+    }
+
+    pub fn call(
+        &mut self,
+        offset: CodeOffset,
+        arguments: Vec<AbstractValue>,
+        acquired_resources: &BTreeSet<StructDefinitionIndex>,
+        return_: &Signature,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Vec<AbstractValue>> {
+        meter.add_items(
+            Scope::Function,
+            CALL_PER_ACQUIRES_COST,
+            acquired_resources.len(),
+        )?;
+        // Check acquires
+        for acquired_resource in acquired_resources {
+            if self.is_global_borrowed(*acquired_resource) {
+                return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+            }
+        }
+
+        // Check mutable references can be transferred
+        let mut all_references_to_borrow_from = BTreeSet::new();
+        let mut mutable_references_to_borrow_from = BTreeSet::new();
+        for id in arguments.iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) {
+                if !self.is_writable(id) {
+                    return Err(
+                        self.error(StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR, offset)
+                    );
+                }
+                mutable_references_to_borrow_from.insert(id);
+            }
+            all_references_to_borrow_from.insert(id);
+        }
+
+        // Track borrow relationships of return values on inputs
+        let mut returned_refs = 0;
+        let return_values = return_
+            .0
+            .iter()
+            .map(|return_type| match return_type {
+                SignatureToken::MutableReference(_) => {
+                    let id = self.new_ref(true);
+                    for parent in &mutable_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                SignatureToken::Reference(_) => {
+                    let id = self.new_ref(false);
+                    for parent in &all_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                _ => AbstractValue::NonReference,
+            })
+            .collect();
+
+        // Meter usage of reference edges
+        meter.add_items_with_growth(
+            Scope::Function,
+            REF_PARAM_EDGE_COST,
+            all_references_to_borrow_from
+                .len()
+                .saturating_mul(returned_refs),
+            REF_PARAM_EDGE_COST_GROWTH,
+        )?;
+
+        // Release input references
+        for id in all_references_to_borrow_from {
+            self.release(id)
+        }
+        Ok(return_values)
+    }
+
+    pub fn ret(&mut self, offset: CodeOffset, values: Vec<AbstractValue>) -> PartialVMResult<()> {
+        // release all local variables
+        let mut released = BTreeSet::new();
+        for stored_value in self.locals.iter() {
+            if let AbstractValue::Reference(id) = stored_value {
+                released.insert(*id);
+            }
+        }
+        released.into_iter().for_each(|id| self.release(id));
+
+        // Check that no local or global is borrowed
+        if !self.is_frame_safe_to_destroy() {
+            return Err(self.error(
+                StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+                offset,
+            ));
+        }
+
+        // Check mutable references can be transferred
+        for id in values.into_iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) && !self.is_writable(id) {
+                return Err(self.error(StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR, offset));
+            }
+        }
+        Ok(())
+    }
+
+    //**********************************************************************************************
+    // Abstract Interpreter Entry Points
+    //**********************************************************************************************
+
+    /// returns the canonical representation of self
+    pub fn construct_canonical_state(&self) -> Self {
+        let mut id_map = BTreeMap::new();
+        id_map.insert(self.frame_root(), self.frame_root());
+        let locals = self
+            .locals
+            .iter()
+            .enumerate()
+            .map(|(local, value)| match value {
+                AbstractValue::Reference(old_id) => {
+                    let new_id = RefID::new(local);
+                    id_map.insert(*old_id, new_id);
+                    AbstractValue::Reference(new_id)
+                }
+                AbstractValue::NonReference => AbstractValue::NonReference,
+            })
+            .collect::<Vec<_>>();
+        assert!(self.locals.len() == locals.len());
+        let mut borrow_graph = self.borrow_graph.clone();
+        borrow_graph.remap_refs(&id_map);
+        let canonical_state = AbstractState {
+            locals,
+            borrow_graph,
+            current_function: self.current_function,
+            next_id: self.locals.len() + 1,
+        };
+        assert!(canonical_state.is_canonical());
+        canonical_state
+    }
+
+    fn all_immutable(&self, borrows: &BTreeMap<RefID, ()>) -> bool {
+        !borrows.keys().any(|x| self.borrow_graph.is_mutable(*x))
+    }
+
+    fn is_canonical(&self) -> bool {
+        self.locals.len() + 1 == self.next_id
+            && self.locals.iter().enumerate().all(|(local, value)| {
+                value
+                    .ref_id()
+                    .map(|id| RefID::new(local) == id)
+                    .unwrap_or(true)
+            })
+    }
+
+    pub fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.is_canonical() && other.is_canonical());
+        assert!(self.next_id == other.next_id);
+        assert!(self.locals.len() == other.locals.len());
+        let mut self_graph = self.borrow_graph.clone();
+        let mut other_graph = other.borrow_graph.clone();
+        let locals = self
+            .locals
+            .iter()
+            .zip(&other.locals)
+            .map(|(self_value, other_value)| {
+                match (self_value, other_value) {
+                    (AbstractValue::Reference(id), AbstractValue::NonReference) => {
+                        self_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    (AbstractValue::NonReference, AbstractValue::Reference(id)) => {
+                        other_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    // The local has a value on each side, add it to the state
+                    (v1, v2) => {
+                        assert!(v1 == v2);
+                        *v1
+                    }
+                }
+            })
+            .collect();
+
+        let borrow_graph = self_graph.join(&other_graph);
+        let current_function = self.current_function;
+        let next_id = self.next_id;
+
+        Self {
+            current_function,
+            locals,
+            borrow_graph,
+            next_id,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        let joined = Self::join_(self, state);
+        assert!(joined.is_canonical());
+        assert!(self.locals.len() == joined.locals.len());
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(Scope::Function, JOIN_PER_LOCAL_COST, self.locals.len())?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_GRAPH_ITEM_COST,
+            self.borrow_graph.graph_size(),
+        )?;
+        let locals_unchanged = self
+            .locals
+            .iter()
+            .zip(&joined.locals)
+            .all(|(self_value, joined_value)| self_value == joined_value);
+        // locals unchanged and borrow graph covered, return unchanged
+        // else mark as changed and update the state
+        if locals_unchanged && self.borrow_graph.leq(&joined.borrow_graph) {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/mod.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/mod.rs
new file mode 100644
index 000000000..3d01e0520
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -0,0 +1,458 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying reference safety of a procedure body.
+//! The checks include (but are not limited to)
+//! - verifying that there are no dangling references,
+//! - accesses to mutable references are safe
+//! - accesses to global storage references are safe
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    meter::{Meter, Scope},
+    reference_safety::abstract_state::{
+        STEP_BASE_COST, STEP_PER_GRAPH_ITEM_COST, STEP_PER_LOCAL_COST,
+    },
+};
+use abstract_state::{AbstractState, AbstractValue};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, IdentifierIndex,
+        SignatureIndex, SignatureToken, StructDefinition, StructFieldInformation,
+    },
+    safe_assert, safe_unwrap, safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+use std::{
+    collections::{BTreeSet, HashMap},
+    num::NonZeroU64,
+};
+
+struct ReferenceSafetyAnalysis<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    stack: AbstractStack<AbstractValue>,
+}
+
+impl<'a> ReferenceSafetyAnalysis<'a> {
+    fn new(
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView<'a>,
+        name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    ) -> Self {
+        Self {
+            resolver,
+            function_view,
+            name_def_map,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn push(&mut self, v: AbstractValue) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push(v));
+        Ok(())
+    }
+
+    fn push_n(&mut self, v: AbstractValue, n: u64) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push_n(v, n));
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &FunctionView,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(function_view);
+
+    let mut verifier = ReferenceSafetyAnalysis::new(resolver, function_view, name_def_map);
+    verifier.analyze_function(initial_state, function_view, meter)
+}
+
+fn call(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    let arguments = parameters
+        .0
+        .iter()
+        .map(|_| verifier.stack.pop().unwrap())
+        .rev()
+        .collect();
+
+    let acquired_resources = match verifier.name_def_map.get(&function_handle.name) {
+        Some(idx) => {
+            let func_def = verifier.resolver.function_def_at(*idx)?;
+            let fh = verifier.resolver.function_handle_at(func_def.function);
+            if function_handle == fh {
+                func_def.acquires_global_resources.iter().cloned().collect()
+            } else {
+                BTreeSet::new()
+            }
+        }
+        None => BTreeSet::new(),
+    };
+    let return_ = verifier.resolver.signature_at(function_handle.return_);
+    let values = state.call(offset, arguments, &acquired_resources, return_, meter)?;
+    for value in values {
+        verifier.push(value)?
+    }
+    Ok(())
+}
+
+fn num_fields(struct_def: &StructDefinition) -> usize {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => 0,
+        StructFieldInformation::Declared(fields) => fields.len(),
+    }
+}
+
+fn pack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    for _ in 0..num_fields(struct_def) {
+        safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value())
+    }
+    // TODO maybe call state.value_for
+    verifier.push(AbstractValue::NonReference)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+    // TODO maybe call state.value_for
+    verifier.push_n(AbstractValue::NonReference, num_fields(struct_def) as u64)?;
+    Ok(())
+}
+
+fn vec_element_type(
+    verifier: &mut ReferenceSafetyAnalysis,
+    idx: SignatureIndex,
+) -> PartialVMResult<SignatureToken> {
+    match verifier.resolver.signature_at(idx).0.get(0) {
+        Some(ty) => Ok(ty.clone()),
+        None => Err(PartialVMError::new(
+            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+        )),
+    }
+}
+
+fn execute_inner(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    meter.add_items(Scope::Function, STEP_PER_LOCAL_COST, state.local_count())?;
+    meter.add_items(
+        Scope::Function,
+        STEP_PER_GRAPH_ITEM_COST,
+        state.graph_size(),
+    )?;
+
+    match bytecode {
+        Bytecode::Pop => state.release_value(safe_unwrap_err!(verifier.stack.pop())),
+
+        Bytecode::CopyLoc(local) => {
+            let value = state.copy_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveLoc(local) => {
+            let value = state.move_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::StLoc(local) => {
+            state.st_loc(offset, *local, safe_unwrap_err!(verifier.stack.pop()))?
+        }
+
+        Bytecode::FreezeRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let frozen = state.freeze_ref(offset, id)?;
+            verifier.push(frozen)?
+        }
+        Bytecode::Eq | Bytecode::Neq => {
+            let v1 = safe_unwrap_err!(verifier.stack.pop());
+            let v2 = safe_unwrap_err!(verifier.stack.pop());
+            let value = state.comparison(offset, v1, v2)?;
+            verifier.push(value)?
+        }
+        Bytecode::ReadRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.read_ref(offset, id)?;
+            verifier.push(value)?
+        }
+        Bytecode::WriteRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            safe_assert!(val_operand.is_value());
+            state.write_ref(offset, id)?
+        }
+
+        Bytecode::MutBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, true, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, false, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, true, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, true, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, false, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, false, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFrom(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.move_from(offset, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFromGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.move_from(offset, struct_inst.def)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let function_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+
+        Bytecode::Ret => {
+            let mut return_values = vec![];
+            for _ in 0..verifier.function_view.return_().len() {
+                return_values.push(safe_unwrap_err!(verifier.stack.pop()));
+            }
+            return_values.reverse();
+
+            state.ret(offset, return_values)?
+        }
+
+        Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Not
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_) => (),
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) | Bytecode::Abort => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+        }
+        Bytecode::MoveTo(_) | Bytecode::MoveToGeneric(_) => {
+            // resource value
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // signer reference
+            state.release_value(safe_unwrap_err!(verifier.stack.pop()));
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(state.value_for(&SignatureToken::Bool))?
+        }
+        Bytecode::LdU8(_) => verifier.push(state.value_for(&SignatureToken::U8))?,
+        Bytecode::LdU16(_) => verifier.push(state.value_for(&SignatureToken::U16))?,
+        Bytecode::LdU32(_) => verifier.push(state.value_for(&SignatureToken::U32))?,
+        Bytecode::LdU64(_) => verifier.push(state.value_for(&SignatureToken::U64))?,
+        Bytecode::LdU128(_) => verifier.push(state.value_for(&SignatureToken::U128))?,
+        Bytecode::LdU256(_) => verifier.push(state.value_for(&SignatureToken::U256))?,
+        Bytecode::LdConst(idx) => {
+            let signature = &verifier.resolver.constant_at(*idx).type_;
+            verifier.push(state.value_for(signature))?
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // TODO maybe call state.value_for
+            verifier.push(AbstractValue::NonReference)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::Unpack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            unpack(verifier, struct_def)?
+        }
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            unpack(verifier, struct_def)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let result = verifier.stack.pop_eq_n(num_to_pop);
+                let abs_value = safe_unwrap_err!(result);
+                safe_assert!(abs_value.is_value());
+            }
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&SignatureToken::Vector(Box::new(element_type))))?
+        }
+
+        Bytecode::VecLen(_) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, false)?;
+            verifier.push(state.value_for(&SignatureToken::U64))?
+        }
+
+        Bytecode::VecImmBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, false)?;
+            verifier.push(elem_ref)?
+        }
+        Bytecode::VecMutBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, true)?;
+            verifier.push(elem_ref)?
+        }
+
+        Bytecode::VecPushBack(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&element_type))?
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push_n(state.value_for(&element_type), *num)?
+        }
+
+        Bytecode::VecSwap(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+    };
+    Ok(())
+}
+
+impl<'a> TransferFunctions for ReferenceSafetyAnalysis<'a> {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(self, state, bytecode, index, meter)?;
+        if index == last_index {
+            safe_assert!(self.stack.is_empty());
+            *state = state.construct_canonical_state()
+        }
+        Ok(())
+    }
+}
+
+impl<'a> AbstractInterpreter for ReferenceSafetyAnalysis<'a> {}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/bounds_check.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/bounds_check.rs
new file mode 100644
index 000000000..ac18d7a8a
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/bounds_check.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex_literal::hex;
+use move_binary_format::file_format::CompiledScript;
+
+#[test]
+fn script_with_too_many_locals() {
+    let bad_script = hex!("a11ceb0b05000000010500d1018701010101010705050601070101010101070505060107050505050505060107010505050601070101010101070505060107050a0101010101070505060107010101010107050506010705050505050506010701050505060107010101010107010101010c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c050c0c0c0c0c0c0c0c0c0c0c012d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c030602000000070b010c000a20010b000c010500");
+    let _ = CompiledScript::deserialize(&bad_script).unwrap_err();
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/mod.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/mod.rs
new file mode 100644
index 000000000..84a8075de
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+mod bounds_check;
+#[cfg(test)]
+mod reference_analysis;
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/reference_analysis.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
new file mode 100644
index 000000000..9ba65e5da
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
@@ -0,0 +1,323 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex,
+        Bytecode::{self, *},
+        CodeUnit, Constant, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature,
+        SignatureIndex,
+        SignatureToken::{self, *},
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructHandleIndex, TypeSignature, Visibility,
+        Visibility::*,
+    },
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::str::FromStr;
+
+#[test]
+fn unbalanced_stack_crash() {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: vec![
+            LdFalse,
+            BrTrue(13),
+            MoveLoc(3),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(6),
+            Pop,
+            MoveLoc(5),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(0),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            Pop,
+            Pop,
+            Pop,
+            Ret,
+        ],
+        locals: SignatureIndex::new(2),
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    match crate::verify_module_unmetered(&module) {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::GLOBAL_REFERENCE_ERROR),
+    }
+}
+
+#[test]
+fn too_many_locals() {
+    // Create a signature of 128 elements. This will be used both for locals and parameters,
+    // thus the overall size will be 256. If this is not intercepted in bounds checks,
+    // as a result the following iterator in abstract state
+    // would be empty, breaking reference analysis: `0..self.num_locals as LocalIndex`
+    // (since LocalIndex is u8).
+    let sign_128 = (0..128)
+        .map(|_| Reference(Box::new(U64)))
+        .collect::<Vec<_>>();
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![AbilitySet::ALL],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(sign_128)],
+        identifiers: vec![Identifier::new("x").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![CopyLoc(2), StLoc(33), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+
+    match res {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::TOO_MANY_LOCALS),
+    }
+}
+
+#[test]
+fn borrow_graph() {
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![
+            Reference(Box::new(U64)),
+            Reference(Box::new(U64)),
+        ])],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![MoveLoc(0), MoveLoc(1), StLoc(0), StLoc(1), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+    assert!(res.is_ok());
+}
+
+#[test]
+fn indirect_code() {
+    use Bytecode::*;
+    let v = 0;
+    let v_ref = 1;
+    let x = 2;
+    let x_ref = 3;
+    let vsig = SignatureIndex(2);
+    let next = 16;
+    let mut code = vec![
+        // x = 10; x_ref = &mut x;
+        LdU64(10),
+        StLoc(x),
+        MutBorrowLoc(x),
+        StLoc(x_ref),
+        // v = vector[100, 1000]; v_ref = &mut v
+        LdU64(100),
+        LdU64(1000),
+        VecPack(vsig, 2),
+        StLoc(v),
+        MutBorrowLoc(v),
+        StLoc(v_ref),
+        // if (*x_ref == 0) return;
+        CopyLoc(x_ref),
+        ReadRef,
+        LdU64(0),
+        Eq,
+        BrFalse(next),
+        Ret,
+    ];
+    assert_eq!(code.len(), next as usize);
+    code.extend(vec![
+        // creates dangling reference on second iteration
+        // _ = vec_pop_back(x_ref)
+        CopyLoc(v_ref),
+        VecPopBack(vsig),
+        Pop,
+        // *x_ref = 0
+        LdU64(0),
+        CopyLoc(x_ref),
+        WriteRef,
+        // x_ref = vec_mut_borrow(v_ref, 0);
+        CopyLoc(v_ref),
+        LdU64(0),
+        VecMutBorrow(vsig),
+        StLoc(x_ref),
+    ]);
+    let nops = vec![Nop; (u16::MAX as usize) - code.len() - 1];
+    code.extend(nops);
+    code.push(Branch(10));
+    assert_eq!(code.len(), (u16::MAX as usize));
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                SignatureToken::Vector(Box::new(SignatureToken::U64)),
+                SignatureToken::MutableReference(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::U64,
+                )))),
+                SignatureToken::U64,
+                SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            ]),
+            Signature(vec![SignatureToken::U64]),
+        ],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code,
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_with_config_unmetered(&VerifierConfig::unbounded(), &module)
+        .unwrap_err();
+    assert_eq!(
+        res.major_status(),
+        StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR
+    );
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/script_signature.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/script_signature.rs
new file mode 100644
index 000000000..85916339f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/script_signature.rs
@@ -0,0 +1,181 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that a script or entry function a valid
+//! signature, which entails
+//! - (DEPRECATED) All signer arguments are occur before non-signer arguments
+//! - (DEPRECATED) All types non-signer arguments have a type that is valid for constants
+//! - (DEPRECATED) Has an empty return type
+//! - All return types are not references
+//! - Satisfies the additional checks provided as an argument via `check_signature`
+//! `check_signature` should be used by adapters to quickly and easily verify custom signature
+//! rules for entrypoints
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinitionIndex, SignatureIndex, SignatureToken,
+        TableIndex,
+    },
+    file_format_common::{VERSION_1, VERSION_5},
+    IndexKind,
+};
+use move_core_types::{identifier::IdentStr, vm_status::StatusCode};
+
+pub type FnCheckScriptSignature = fn(
+    &BinaryIndexedView,
+    /* is_entry */ bool,
+    SignatureIndex,
+    Option<SignatureIndex>,
+) -> PartialVMResult<()>;
+
+/// This function checks the extra requirements on the signature of the main function of a script.
+pub fn verify_script(
+    script: &CompiledScript,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    if script.version >= VERSION_5 {
+        return Ok(());
+    }
+
+    let resolver = &BinaryIndexedView::Script(script);
+    let parameters = script.parameters;
+    let return_ = None;
+    verify_main_signature_impl(resolver, true, parameters, return_, check_signature)
+        .map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_module(
+    module: &CompiledModule,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    // important for not breaking old modules
+    if module.version < VERSION_5 {
+        return Ok(());
+    }
+
+    for (idx, _fdef) in module
+        .function_defs()
+        .iter()
+        .enumerate()
+        .filter(|(_idx, fdef)| fdef.is_entry)
+    {
+        verify_module_function_signature(
+            module,
+            FunctionDefinitionIndex(idx as TableIndex),
+            check_signature,
+        )?
+    }
+    Ok(())
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+pub fn verify_module_function_signature_by_name(
+    module: &CompiledModule,
+    name: &IdentStr,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef_opt = module.function_defs().iter().enumerate().find(|(_, fdef)| {
+        module.identifier_at(module.function_handle_at(fdef.function).name) == name
+    });
+    let (idx, _fdef) = fdef_opt.ok_or_else(|| {
+        PartialVMError::new(StatusCode::VERIFICATION_ERROR)
+            .with_message("function not found in verify_module_script_function".to_string())
+            .finish(Location::Module(module.self_id()))
+    })?;
+    verify_module_function_signature(
+        module,
+        FunctionDefinitionIndex(idx as TableIndex),
+        check_signature,
+    )
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+fn verify_module_function_signature(
+    module: &CompiledModule,
+    idx: FunctionDefinitionIndex,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef = module.function_def_at(idx);
+
+    let resolver = &BinaryIndexedView::Module(module);
+    let fhandle = module.function_handle_at(fdef.function);
+    let parameters = fhandle.parameters;
+    let return_ = fhandle.return_;
+    verify_main_signature_impl(
+        resolver,
+        fdef.is_entry,
+        parameters,
+        Some(return_),
+        check_signature,
+    )
+    .map_err(|e| {
+        e.at_index(IndexKind::FunctionDefinition, idx.0)
+            .finish(Location::Module(module.self_id()))
+    })
+}
+
+fn verify_main_signature_impl(
+    resolver: &BinaryIndexedView,
+    is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+    check_signature: FnCheckScriptSignature,
+) -> PartialVMResult<()> {
+    let deprecated_logic = resolver.version() < VERSION_5 && is_entry;
+
+    if deprecated_logic {
+        legacy_script_signature_checks(resolver, is_entry, parameters_idx, return_idx)?;
+    }
+    check_signature(resolver, is_entry, parameters_idx, return_idx)
+}
+
+pub fn no_additional_script_signature_checks(
+    _resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    _parameters: SignatureIndex,
+    _return_type: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    Ok(())
+}
+
+pub fn legacy_script_signature_checks(
+    resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    use SignatureToken as S;
+    let empty_vec = &vec![];
+    let parameters = &resolver.signature_at(parameters_idx).0;
+    let return_types = return_idx
+        .map(|idx| &resolver.signature_at(idx).0)
+        .unwrap_or(empty_vec);
+    // Check that all `signer` arguments occur before non-`signer` arguments
+    // signer is a type that can only be populated by the Move VM. And its value is filled
+    // based on the sender of the transaction
+    let all_args_have_valid_type = if resolver.version() <= VERSION_1 {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Reference(inner) if matches!(&**inner, S::Signer)))
+            .all(|typ| typ.is_valid_for_constant())
+    } else {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Signer))
+            .all(|typ| typ.is_valid_for_constant())
+    };
+    let has_valid_return_type = return_types.is_empty();
+    if !all_args_have_valid_type || !has_valid_return_type {
+        Err(PartialVMError::new(
+            StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE,
+        ))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/signature.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/signature.rs
new file mode 100644
index 000000000..3894b4b44
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/signature.rs
@@ -0,0 +1,402 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying signature tokens used in types of function
+//! parameters, locals, and fields of structs are well-formed. References can only occur at the
+//! top-level in all tokens.  Additionally, references cannot occur at all in field types.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FunctionDefinition,
+        FunctionHandle, Signature, SignatureIndex, SignatureToken, StructDefinition,
+        StructFieldInformation, StructTypeParameter, TableIndex,
+    },
+    file_format_common::VERSION_6,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct SignatureChecker<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> SignatureChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let sig_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        sig_check.verify_signature_pool(module.signatures())?;
+        sig_check.verify_function_signatures(module.function_handles())?;
+        sig_check.verify_fields(module.struct_defs())?;
+        sig_check.verify_code_units(module.function_defs())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let sig_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        sig_check.verify_signature_pool(script.signatures())?;
+        sig_check.verify_function_signatures(script.function_handles())?;
+        sig_check.check_instantiation(script.parameters, &script.type_parameters)?;
+        sig_check.verify_code(script.code(), &script.type_parameters)
+    }
+
+    fn verify_signature_pool(&self, signatures: &[Signature]) -> PartialVMResult<()> {
+        for i in 0..signatures.len() {
+            self.check_signature(SignatureIndex::new(i as TableIndex))?
+        }
+        Ok(())
+    }
+
+    fn verify_function_signatures(
+        &self,
+        function_handles: &[FunctionHandle],
+    ) -> PartialVMResult<()> {
+        let err_handler = |err: PartialVMError, idx| {
+            err.at_index(IndexKind::Signature, idx as TableIndex)
+                .at_index(IndexKind::FunctionHandle, idx as TableIndex)
+        };
+
+        for (idx, fh) in function_handles.iter().enumerate() {
+            self.check_signature(fh.return_)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_instantiation(fh.return_, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_signature(fh.parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_instantiation(fh.parameters, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            if !fh.type_parameters.is_empty() {}
+        }
+        Ok(())
+    }
+
+    fn verify_fields(&self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
+        for (struct_def_idx, struct_def) in struct_defs.iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+            let err_handler = |err: PartialVMError, idx| {
+                err.at_index(IndexKind::FieldDefinition, idx as TableIndex)
+                    .at_index(IndexKind::StructDefinition, struct_def_idx as TableIndex)
+            };
+            for (field_offset, field_def) in fields.iter().enumerate() {
+                self.check_signature_token(&field_def.signature.0)
+                    .map_err(|err| err_handler(err, field_offset))?;
+                let type_param_constraints: Vec<_> =
+                    struct_handle.type_param_constraints().collect();
+                self.check_type_instantiation(&field_def.signature.0, &type_param_constraints)
+                    .map_err(|err| err_handler(err, field_offset))?;
+
+                self.check_phantom_params(
+                    &field_def.signature.0,
+                    false,
+                    &struct_handle.type_parameters,
+                )
+                .map_err(|err| err_handler(err, field_offset))?;
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_code_units(&self, function_defs: &[FunctionDefinition]) -> PartialVMResult<()> {
+        for (func_def_idx, func_def) in function_defs.iter().enumerate() {
+            // skip native functions
+            let code = match &func_def.code {
+                Some(code) => code,
+                None => continue,
+            };
+            let func_handle = self.resolver.function_handle_at(func_def.function);
+            self.verify_code(code, &func_handle.type_parameters)
+                .map_err(|err| {
+                    err.at_index(IndexKind::Signature, code.locals.0)
+                        .at_index(IndexKind::FunctionDefinition, func_def_idx as TableIndex)
+                })?
+        }
+        Ok(())
+    }
+
+    fn verify_code(&self, code: &CodeUnit, type_parameters: &[AbilitySet]) -> PartialVMResult<()> {
+        self.check_signature(code.locals)?;
+        self.check_instantiation(code.locals, type_parameters)?;
+
+        // Check if the type actuals in certain bytecode instructions are well defined.
+        use Bytecode::*;
+        for (offset, instr) in code.code.iter().enumerate() {
+            let result = match instr {
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    let func_handle = self.resolver.function_handle_at(func_inst.handle);
+                    let type_arguments = &self.resolver.signature_at(func_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        func_handle.type_parameters.iter().copied(),
+                        type_parameters,
+                    )
+                }
+                PackGeneric(idx)
+                | UnpackGeneric(idx)
+                | ExistsGeneric(idx)
+                | MoveFromGeneric(idx)
+                | MoveToGeneric(idx)
+                | ImmBorrowGlobalGeneric(idx)
+                | MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    let struct_def = self.resolver.struct_def_at(struct_inst.def)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(struct_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                ImmBorrowFieldGeneric(idx) | MutBorrowFieldGeneric(idx) => {
+                    let field_inst = self.resolver.field_instantiation_at(*idx)?;
+                    let field_handle = self.resolver.field_handle_at(field_inst.handle)?;
+                    let struct_def = self.resolver.struct_def_at(field_handle.owner)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(field_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                VecPack(idx, _)
+                | VecLen(idx)
+                | VecImmBorrow(idx)
+                | VecMutBorrow(idx)
+                | VecPushBack(idx)
+                | VecPopBack(idx)
+                | VecUnpack(idx, _)
+                | VecSwap(idx) => {
+                    let type_arguments = &self.resolver.signature_at(*idx).0;
+                    if type_arguments.len() != 1 {
+                        return Err(PartialVMError::new(
+                            StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+                        )
+                        .with_message(format!(
+                            "expected 1 type token for vector operations, got {}",
+                            type_arguments.len()
+                        )));
+                    }
+                    self.check_signature_tokens(type_arguments)
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
+                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
+                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
+                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
+                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
+                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
+                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => Ok(()),
+            };
+            result.map_err(|err| {
+                err.append_message_with_separator(' ', format!("at offset {} ", offset))
+            })?
+        }
+        Ok(())
+    }
+
+    /// Checks that phantom type parameters are only used in phantom position.
+    fn check_phantom_params(
+        &self,
+        ty: &SignatureToken,
+        is_phantom_pos: bool,
+        type_parameters: &[StructTypeParameter],
+    ) -> PartialVMResult<()> {
+        match ty {
+            SignatureToken::Vector(ty) => self.check_phantom_params(ty, false, type_parameters)?,
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                let sh = self.resolver.struct_handle_at(*idx);
+                for (i, ty) in type_arguments.iter().enumerate() {
+                    self.check_phantom_params(
+                        ty,
+                        sh.type_parameters[i].is_phantom,
+                        type_parameters,
+                    )?;
+                }
+            }
+            SignatureToken::TypeParameter(idx) => {
+                if type_parameters[*idx as usize].is_phantom && !is_phantom_pos {
+                    return Err(PartialVMError::new(
+                        StatusCode::INVALID_PHANTOM_TYPE_PARAM_POSITION,
+                    )
+                    .with_message(
+                        "phantom type parameter cannot be used in non-phantom position".to_string(),
+                    ));
+                }
+            }
+
+            SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => {}
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// References are only permitted at the top level.
+    fn check_signature(&self, idx: SignatureIndex) -> PartialVMResult<()> {
+        for token in &self.resolver.signature_at(idx).0 {
+            match token {
+                SignatureToken::Reference(inner) | SignatureToken::MutableReference(inner) => {
+                    self.check_signature_token(inner)?
+                }
+                _ => self.check_signature_token(token)?,
+            }
+        }
+        Ok(())
+    }
+
+    /// Checks if the given types are well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_tokens(&self, tys: &[SignatureToken]) -> PartialVMResult<()> {
+        for ty in tys {
+            self.check_signature_token(ty)?
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_token(&self, ty: &SignatureToken) -> PartialVMResult<()> {
+        use SignatureToken::*;
+        match ty {
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => Ok(()),
+            Reference(_) | MutableReference(_) => {
+                // TODO: Prop tests expect us to NOT check the inner types.
+                // Revisit this once we rework prop tests.
+                Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
+                    .with_message("reference not allowed".to_string()))
+            }
+            Vector(ty) => self.check_signature_token(ty),
+            StructInstantiation(_, type_arguments) => self.check_signature_tokens(type_arguments),
+        }
+    }
+
+    fn check_instantiation(
+        &self,
+        idx: SignatureIndex,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        for ty in &self.resolver.signature_at(idx).0 {
+            self.check_type_instantiation(ty, type_parameters)?
+        }
+        Ok(())
+    }
+
+    fn check_type_instantiation(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if self.resolver.version() >= VERSION_6 {
+            for ty in s.preorder_traversal() {
+                self.check_type_instantiation_(ty, type_parameters)?
+            }
+            Ok(())
+        } else {
+            // preserve buggy, but harmless old behavior for backward compatibility
+            self.check_type_instantiation_(s, type_parameters)
+        }
+    }
+
+    fn check_type_instantiation_(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        match s {
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                // Check that the instantiation satisfies the `idx` struct's constraints
+                // Cannot be checked completely if we do not know the constraints of type parameters
+                // i.e. it cannot be checked unless we are inside some module member. The only case
+                // where that happens is when checking the signature pool itself
+                let sh = self.resolver.struct_handle_at(*idx);
+                self.check_generic_instance(
+                    type_arguments,
+                    sh.type_param_constraints(),
+                    type_parameters,
+                )
+            }
+            SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Vector(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => Ok(()),
+        }
+    }
+
+    // Checks if the given types are well defined and satisfy the constraints in the given context.
+    fn check_generic_instance(
+        &self,
+        type_arguments: &[SignatureToken],
+        constraints: impl ExactSizeIterator<Item = AbilitySet>,
+        global_abilities: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if type_arguments.len() != constraints.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "expected {} type argument(s), got {}",
+                        constraints.len(),
+                        type_arguments.len()
+                    ),
+                ),
+            );
+        }
+
+        for (constraint, ty) in constraints.into_iter().zip(type_arguments) {
+            let given = self.resolver.abilities(ty, global_abilities)?;
+            if !constraint.is_subset(given) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "expected type with abilities {:?} got type actual {:?} with incompatible \
+                        abilities {:?}",
+                        constraint, ty, given
+                    )));
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/stack_usage_verifier.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/stack_usage_verifier.rs
new file mode 100644
index 000000000..e4c1d5c0b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/stack_usage_verifier.rs
@@ -0,0 +1,273 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that basic blocks in the bytecode instruction
+//! sequence of a function use the evaluation stack in a balanced manner. Every basic block,
+//! except those that end in Ret (return to caller) opcode, must leave the stack height the
+//! same as at the beginning of the block. A basic block that ends in Ret opcode must increase
+//! the stack height by the number of values returned by the function as indicated in its
+//! signature. Additionally, the stack height must not dip below that at the beginning of the
+//! block for any basic block.
+use crate::meter::Meter;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeUnit, FunctionDefinitionIndex, Signature, StructFieldInformation},
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+pub(crate) struct StackUsageVerifier<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+    code: &'a CodeUnit,
+    return_: &'a Signature,
+}
+
+impl<'a> StackUsageVerifier<'a> {
+    pub(crate) fn verify(
+        config: &VerifierConfig,
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView,
+        _meter: &mut impl Meter, // TODO: metering
+    ) -> PartialVMResult<()> {
+        let verifier = Self {
+            resolver,
+            current_function: function_view.index(),
+            code: function_view.code(),
+            return_: function_view.return_(),
+        };
+
+        for block_id in function_view.cfg().blocks() {
+            verifier.verify_block(config, block_id, function_view.cfg())?
+        }
+        Ok(())
+    }
+
+    fn verify_block(
+        &self,
+        config: &VerifierConfig,
+        block_id: BlockId,
+        cfg: &dyn ControlFlowGraph,
+    ) -> PartialVMResult<()> {
+        let code = &self.code.code;
+        let mut stack_size_increment = 0;
+        let block_start = cfg.block_start(block_id);
+        let mut overall_push = 0;
+        for i in block_start..=cfg.block_end(block_id) {
+            let (num_pops, num_pushes) = self.instruction_effect(&code[i as usize])?;
+            if let Some(new_pushes) = u64::checked_add(overall_push, num_pushes) {
+                overall_push = new_pushes
+            };
+
+            // Check that the accumulated pushes does not exceed a pre-defined max size
+            if let Some(max_push_size) = config.max_push_size {
+                if overall_push > max_push_size as u64 {
+                    return Err(PartialVMError::new(StatusCode::VALUE_STACK_PUSH_OVERFLOW)
+                        .at_code_offset(self.current_function(), block_start));
+                }
+            }
+
+            // Check that the stack height is sufficient to accommodate the number
+            // of pops this instruction does
+            if stack_size_increment < num_pops {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            }
+            if let Some(new_incr) = u64::checked_sub(stack_size_increment, num_pops) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+            if let Some(new_incr) = u64::checked_add(stack_size_increment, num_pushes) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+
+            if stack_size_increment > config.max_value_stack_size as u64 {
+                return Err(PartialVMError::new(StatusCode::VALUE_STACK_OVERFLOW)
+                    .at_code_offset(self.current_function(), block_start));
+            }
+        }
+
+        if stack_size_increment == 0 {
+            Ok(())
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                    .at_code_offset(self.current_function(), block_start),
+            )
+        }
+    }
+
+    /// The effect of an instruction is a tuple where the first element
+    /// is the number of pops it does, and the second element is the number
+    /// of pushes it does
+    fn instruction_effect(&self, instruction: &Bytecode) -> PartialVMResult<(u64, u64)> {
+        Ok(match instruction {
+            // Instructions that pop, but don't push
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::StLoc(_)
+            | Bytecode::Abort => (1, 0),
+
+            // Instructions that push, but don't pop
+            Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_) => (0, 1),
+
+            // Instructions that pop and push once
+            Bytecode::Not
+            | Bytecode::FreezeRef
+            | Bytecode::ReadRef
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::VecLen(_)
+            | Bytecode::VecPopBack(_) => (1, 1),
+
+            // Binary operations (pop twice and push once)
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge => (2, 1),
+
+            // Vector packing and unpacking
+            Bytecode::VecPack(_, num) => (*num, 1),
+            Bytecode::VecUnpack(_, num) => (1, *num),
+
+            // Vector indexing operations (pop twice and push once)
+            Bytecode::VecImmBorrow(_) | Bytecode::VecMutBorrow(_) => (2, 1),
+
+            // MoveTo, WriteRef, and VecPushBack pop twice but do not push
+            Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::WriteRef
+            | Bytecode::VecPushBack(_) => (2, 0),
+
+            // VecSwap pops three times but does not push
+            Bytecode::VecSwap(_) => (3, 0),
+
+            // Branch and Nop neither pops nor pushes
+            Bytecode::Branch(_) | Bytecode::Nop => (0, 0),
+
+            // Return performs `return_count` pops
+            Bytecode::Ret => {
+                let return_count = self.return_.len();
+                (return_count as u64, 0)
+            }
+
+            // Call performs `arg_count` pops and `return_count` pushes
+            Bytecode::Call(idx) => {
+                let function_handle = self.resolver.function_handle_at(*idx);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+            Bytecode::CallGeneric(idx) => {
+                let func_inst = self.resolver.function_instantiation_at(*idx);
+                let function_handle = self.resolver.function_handle_at(func_inst.handle);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+
+            // Pack performs `num_fields` pops and one push
+            Bytecode::Pack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+            Bytecode::PackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+
+            // Unpack performs one pop and `num_fields` pushes
+            Bytecode::Unpack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+        })
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/struct_defs.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/struct_defs.rs
new file mode 100644
index 000000000..3ec9dedbd
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/struct_defs.rs
@@ -0,0 +1,146 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides a checker for verifying that struct definitions in a module are not
+//! recursive. Since the module dependency graph is acylic by construction, applying this checker to
+//! each module in isolation guarantees that there is no structural recursion globally.
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, SignatureToken, StructDefinitionIndex, StructHandleIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    views::StructDefinitionView,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{algo::toposort, graphmap::DiGraphMap};
+use std::collections::{BTreeMap, BTreeSet};
+
+pub struct RecursiveStructDefChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> RecursiveStructDefChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let checker = Self { module };
+        let graph = StructDefGraphBuilder::new(checker.module).build()?;
+
+        // toposort is iterative while petgraph::algo::is_cyclic_directed is recursive. Prefer
+        // the iterative solution here as this code may be dealing with untrusted data.
+        match toposort(&graph, None) {
+            Ok(_) => Ok(()),
+            Err(cycle) => Err(verification_error(
+                StatusCode::RECURSIVE_STRUCT_DEFINITION,
+                IndexKind::StructDefinition,
+                cycle.node_id().into_index() as TableIndex,
+            )),
+        }
+    }
+}
+
+/// Given a module, build a graph of struct definitions. This is useful when figuring out whether
+/// the struct definitions in module form a cycle.
+struct StructDefGraphBuilder<'a> {
+    module: &'a CompiledModule,
+    /// Used to follow field definitions' signatures' struct handles to their struct definitions.
+    handle_to_def: BTreeMap<StructHandleIndex, StructDefinitionIndex>,
+}
+
+impl<'a> StructDefGraphBuilder<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        let mut handle_to_def = BTreeMap::new();
+        // the mapping from struct definitions to struct handles is already checked to be 1-1 by
+        // DuplicationChecker
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let sh_idx = struct_def.struct_handle;
+            handle_to_def.insert(sh_idx, StructDefinitionIndex(idx as TableIndex));
+        }
+
+        Self {
+            module,
+            handle_to_def,
+        }
+    }
+
+    fn build(self) -> PartialVMResult<DiGraphMap<StructDefinitionIndex, ()>> {
+        let mut neighbors = BTreeMap::new();
+        for idx in 0..self.module.struct_defs().len() {
+            let sd_idx = StructDefinitionIndex::new(idx as TableIndex);
+            self.add_struct_defs(&mut neighbors, sd_idx)?
+        }
+
+        let edges = neighbors
+            .into_iter()
+            .flat_map(|(parent, children)| children.into_iter().map(move |child| (parent, child)));
+        Ok(DiGraphMap::from_edges(edges))
+    }
+
+    fn add_struct_defs(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.module.struct_def_at(idx);
+        let struct_def = StructDefinitionView::new(self.module, struct_def);
+        // The fields iterator is an option in the case of native structs. Flatten makes an empty
+        // iterator for that case
+        for field in struct_def.fields().into_iter().flatten() {
+            self.add_signature_token(neighbors, idx, field.signature_token())?
+        }
+        Ok(())
+    }
+
+    fn add_signature_token(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        cur_idx: StructDefinitionIndex,
+        token: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        use SignatureToken as T;
+        Ok(match token {
+            T::Bool
+            | T::U8
+            | T::U16
+            | T::U32
+            | T::U64
+            | T::U128
+            | T::U256
+            | T::Address
+            | T::Signer
+            | T::TypeParameter(_) => (),
+            T::Reference(_) | T::MutableReference(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Reference field when checking recursive structs".to_owned()),
+                )
+            }
+            T::Vector(inner) => self.add_signature_token(neighbors, cur_idx, inner)?,
+            T::Struct(sh_idx) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+            }
+            T::StructInstantiation(sh_idx, inners) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+                for t in inners {
+                    self.add_signature_token(neighbors, cur_idx, t)?
+                }
+            }
+        })
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/type_safety.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/type_safety.rs
new file mode 100644
index 000000000..3cbcf4ba2
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/type_safety.rs
@@ -0,0 +1,1012 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying type safety of a procedure body.
+//! It does not utilize control flow, but does check each block independently
+
+use std::num::NonZeroU64;
+
+use crate::meter::{Meter, Scope};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, FieldHandleIndex, FunctionDefinitionIndex,
+        FunctionHandle, LocalIndex, Signature, SignatureToken, SignatureToken as ST,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+    },
+    safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+
+struct Locals<'a> {
+    param_count: usize,
+    parameters: &'a Signature,
+    locals: &'a Signature,
+}
+
+const TYPE_NODE_COST: u128 = 30;
+
+impl<'a> Locals<'a> {
+    fn new(parameters: &'a Signature, locals: &'a Signature) -> Self {
+        Self {
+            param_count: parameters.len(),
+            parameters,
+            locals,
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        let idx = i as usize;
+        if idx < self.param_count {
+            &self.parameters.0[idx]
+        } else {
+            &self.locals.0[idx - self.param_count]
+        }
+    }
+}
+
+struct TypeSafetyChecker<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    locals: Locals<'a>,
+    stack: AbstractStack<SignatureToken>,
+}
+
+impl<'a> TypeSafetyChecker<'a> {
+    fn new(resolver: &'a BinaryIndexedView<'a>, function_view: &'a FunctionView<'a>) -> Self {
+        let locals = Locals::new(function_view.parameters(), function_view.locals());
+        Self {
+            resolver,
+            function_view,
+            locals,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        self.locals.local_at(i)
+    }
+
+    fn abilities(&self, t: &SignatureToken) -> PartialVMResult<AbilitySet> {
+        self.resolver
+            .abilities(t, self.function_view.type_parameters())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.function_view
+                .index()
+                .unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn push(&mut self, meter: &mut impl Meter, ty: SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push(ty));
+        Ok(())
+    }
+
+    fn push_n(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push_n(ty, n));
+        Ok(())
+    }
+
+    fn charge_ty(&mut self, meter: &mut impl Meter, ty: &SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty_(meter, ty, 1)
+    }
+
+    fn charge_ty_(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: &SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        meter.add_items(
+            Scope::Function,
+            TYPE_NODE_COST,
+            ty.preorder_traversal().count() * (n as usize),
+        )
+    }
+
+    fn charge_tys(
+        &mut self,
+        meter: &mut impl Meter,
+        tys: &[SignatureToken],
+    ) -> PartialVMResult<()> {
+        for ty in tys {
+            self.charge_ty(meter, ty)?
+        }
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let verifier = &mut TypeSafetyChecker::new(resolver, function_view);
+
+    for block_id in function_view.cfg().blocks() {
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &verifier.function_view.code().code[offset as usize];
+            verify_instr(verifier, instr, offset, meter)?
+        }
+    }
+
+    Ok(())
+}
+
+// helper for both `ImmBorrowField` and `MutBorrowField`
+fn borrow_field(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    field_handle_index: FieldHandleIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // load operand and check mutability constraints
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if mut_ && !operand.is_mutable_reference() {
+        return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    // check the reference on the stack is the expected type.
+    // Load the type that owns the field according to the instruction.
+    // For generic fields access, this step materializes that type
+    let field_handle = verifier.resolver.field_handle_at(field_handle_index)?;
+    let struct_def = verifier.resolver.struct_def_at(field_handle.owner)?;
+    let expected_type = materialize_type(struct_def.struct_handle, type_args);
+    match operand {
+        ST::Reference(inner) | ST::MutableReference(inner) if expected_type == *inner => (),
+        _ => return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)),
+    }
+
+    let field_def = match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            return Err(verifier.error(StatusCode::BORROWFIELD_BAD_FIELD_ERROR, offset));
+        }
+        StructFieldInformation::Declared(fields) => {
+            // TODO: review the whole error story here, way too much is left to chances...
+            // definition of a more proper OM for the verifier could work around the problem
+            // (maybe, maybe not..)
+            &fields[field_handle.field as usize]
+        }
+    };
+    let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(field_type)
+        } else {
+            ST::Reference(field_type)
+        },
+    )?;
+    Ok(())
+}
+
+// helper for both `ImmBorrowLoc` and `MutBorrowLoc`
+fn borrow_loc(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: LocalIndex,
+) -> PartialVMResult<()> {
+    let loc_signature = verifier.local_at(idx).clone();
+
+    if loc_signature.is_reference() {
+        return Err(verifier.error(StatusCode::BORROWLOC_REFERENCE_ERROR, offset));
+    }
+
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(loc_signature))
+        } else {
+            ST::Reference(Box::new(loc_signature))
+        },
+    )?;
+    Ok(())
+}
+
+fn borrow_global(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: StructDefinitionIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // check and consume top of stack
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let struct_def = verifier.resolver.struct_def_at(idx)?;
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(struct_type))
+        } else {
+            ST::Reference(Box::new(struct_type))
+        },
+    )?;
+    Ok(())
+}
+
+fn call(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    type_actuals: &Signature,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    for parameter in parameters.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if (type_actuals.is_empty() && &arg != parameter)
+            || (!type_actuals.is_empty() && arg != instantiate(parameter, type_actuals))
+        {
+            return Err(verifier.error(StatusCode::CALL_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+    for return_type in &verifier.resolver.signature_at(function_handle.return_).0 {
+        verifier.push(meter, instantiate(return_type, type_actuals))?
+    }
+    Ok(())
+}
+
+fn type_fields_signature(
+    verifier: &mut TypeSafetyChecker,
+    _meter: &mut impl Meter, // TODO: metering
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<Signature> {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            // TODO: this is more of "unreachable"
+            Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset))
+        }
+        StructFieldInformation::Declared(fields) => {
+            let mut field_sig = vec![];
+            for field_def in fields.iter() {
+                field_sig.push(instantiate(&field_def.signature.0, type_args));
+            }
+            Ok(Signature(field_sig))
+        }
+    }
+}
+
+fn pack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if &arg != sig {
+            return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+
+    // Pop an abstract value from the stack and check if its type is equal to the one
+    // declared.
+    let arg = safe_unwrap_err!(verifier.stack.pop());
+    if arg != struct_type {
+        return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0 {
+        verifier.push(meter, sig)?
+    }
+    Ok(())
+}
+
+fn exists(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        // TODO better error here
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    verifier.push(meter, ST::Bool)?;
+    Ok(())
+}
+
+fn move_from(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn move_to(
+    verifier: &mut TypeSafetyChecker,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVETO_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let key_struct_operand = safe_unwrap_err!(verifier.stack.pop());
+    let signer_reference_operand = safe_unwrap_err!(verifier.stack.pop());
+    if key_struct_operand != struct_type {
+        return Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset));
+    }
+    match signer_reference_operand {
+        ST::Reference(inner) => match *inner {
+            ST::Signer => Ok(()),
+            _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+        },
+        _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+    }
+}
+
+fn borrow_vector_element(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    declared_element_type: &SignatureToken,
+    offset: CodeOffset,
+    mut_ref_only: bool,
+) -> PartialVMResult<()> {
+    let operand_idx = safe_unwrap_err!(verifier.stack.pop());
+    let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+
+    // check index
+    if operand_idx != ST::U64 {
+        return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+    }
+
+    // check vector and update stack
+    let element_type = match get_vector_element_type(operand_vec, mut_ref_only) {
+        Some(ty) if &ty == declared_element_type => ty,
+        _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+    };
+    let element_ref_type = if mut_ref_only {
+        ST::MutableReference(Box::new(element_type))
+    } else {
+        ST::Reference(Box::new(element_type))
+    };
+    verifier.push(meter, element_ref_type)?;
+
+    Ok(())
+}
+
+fn verify_instr(
+    verifier: &mut TypeSafetyChecker,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    match bytecode {
+        Bytecode::Pop => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let abilities = verifier
+                .resolver
+                .abilities(&operand, verifier.function_view.type_parameters());
+            if !abilities?.has_drop() {
+                return Err(verifier.error(StatusCode::POP_WITHOUT_DROP_ABILITY, offset));
+            }
+        }
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::Bool {
+                return Err(verifier.error(StatusCode::BR_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::StLoc(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if &operand != verifier.local_at(*idx) {
+                return Err(verifier.error(StatusCode::STLOC_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Abort => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::U64 {
+                return Err(verifier.error(StatusCode::ABORT_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Ret => {
+            let return_ = &verifier.function_view.return_().0;
+            for return_type in return_.iter().rev() {
+                let operand = safe_unwrap_err!(verifier.stack.pop());
+                if &operand != return_type {
+                    return Err(verifier.error(StatusCode::RET_TYPE_MISMATCH_ERROR, offset));
+                }
+            }
+        }
+
+        Bytecode::Branch(_) | Bytecode::Nop => (),
+
+        Bytecode::FreezeRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::MutableReference(inner) => verifier.push(meter, ST::Reference(inner))?,
+                _ => return Err(verifier.error(StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::MutBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            true,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::ImmBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            false,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::LdU8(_) => {
+            verifier.push(meter, ST::U8)?;
+        }
+
+        Bytecode::LdU16(_) => {
+            verifier.push(meter, ST::U16)?;
+        }
+
+        Bytecode::LdU32(_) => {
+            verifier.push(meter, ST::U32)?;
+        }
+
+        Bytecode::LdU64(_) => {
+            verifier.push(meter, ST::U64)?;
+        }
+
+        Bytecode::LdU128(_) => {
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::LdU256(_) => {
+            verifier.push(meter, ST::U256)?;
+        }
+
+        Bytecode::LdConst(idx) => {
+            let signature = verifier.resolver.constant_at(*idx).type_.clone();
+            verifier.push(meter, signature)?;
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(meter, ST::Bool)?;
+        }
+
+        Bytecode::CopyLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            if !verifier
+                .resolver
+                .abilities(&local_signature, verifier.function_view.type_parameters())?
+                .has_copy()
+            {
+                return Err(verifier.error(StatusCode::COPYLOC_WITHOUT_COPY_ABILITY, offset));
+            }
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MoveLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MutBorrowLoc(idx) => borrow_loc(verifier, meter, offset, true, *idx)?,
+
+        Bytecode::ImmBorrowLoc(idx) => borrow_loc(verifier, meter, offset, false, *idx)?,
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, meter, offset, function_handle, &Signature(vec![]))?
+        }
+
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let func_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            let type_args = &verifier.resolver.signature_at(func_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            call(verifier, meter, offset, func_handle, type_args)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            pack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::Unpack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            unpack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::ReadRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::Reference(inner) | ST::MutableReference(inner) => {
+                    if !verifier.abilities(&inner)?.has_copy() {
+                        return Err(
+                            verifier.error(StatusCode::READREF_WITHOUT_COPY_ABILITY, offset)
+                        );
+                    }
+                    verifier.push(meter, *inner)?;
+                }
+                _ => return Err(verifier.error(StatusCode::READREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::WriteRef => {
+            let ref_operand = safe_unwrap_err!(verifier.stack.pop());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            let ref_inner_signature = match ref_operand {
+                ST::MutableReference(inner) => *inner,
+                _ => {
+                    return Err(
+                        verifier.error(StatusCode::WRITEREF_NO_MUTABLE_REFERENCE_ERROR, offset)
+                    )
+                }
+            };
+            if !verifier.abilities(&ref_inner_signature)?.has_drop() {
+                return Err(verifier.error(StatusCode::WRITEREF_WITHOUT_DROP_ABILITY, offset));
+            }
+
+            if val_operand != ref_inner_signature {
+                return Err(verifier.error(StatusCode::WRITEREF_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::CastU8 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U8)?;
+        }
+        Bytecode::CastU64 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U64)?;
+        }
+        Bytecode::CastU128 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, operand1)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Shl | Bytecode::Shr => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand2.is_integer() && operand1 == ST::U8 {
+                verifier.push(meter, operand2)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Or | Bytecode::And => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1 == ST::Bool && operand2 == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Not => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Eq | Bytecode::Neq => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if verifier.abilities(&operand1)?.has_drop() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, true, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, true, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::ImmBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, false, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, false, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::Exists(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            exists(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::ExistsGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            exists(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveFrom(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_from(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveFromGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_from(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveTo(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_to(verifier, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveToGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_to(verifier, offset, struct_def, type_args)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            let element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let is_mismatched = verifier
+                    .stack
+                    .pop_eq_n(num_to_pop)
+                    .map(|t| element_type != &t)
+                    .unwrap_or(true);
+                if is_mismatched {
+                    return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+                }
+            }
+            verifier.push(meter, ST::Vector(Box::new(element_type.clone())))?;
+        }
+
+        Bytecode::VecLen(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand, false) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, ST::U64)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecImmBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, false)?
+        }
+        Bytecode::VecMutBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, true)?
+        }
+
+        Bytecode::VecPushBack(idx) => {
+            let operand_elem = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if declared_element_type != &operand_elem {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, derived_element_type)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if operand_vec != ST::Vector(Box::new(declared_element_type.clone())) {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            verifier.push_n(meter, declared_element_type.clone(), *num)?;
+        }
+
+        Bytecode::VecSwap(idx) => {
+            let operand_idx2 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_idx1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            if operand_idx1 != ST::U64 || operand_idx2 != ST::U64 {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+        Bytecode::CastU16 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U16)?;
+        }
+        Bytecode::CastU32 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U32)?;
+        }
+        Bytecode::CastU256 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U256)?;
+        }
+    };
+    Ok(())
+}
+
+//
+// Helpers functions for types
+//
+
+fn materialize_type(struct_handle: StructHandleIndex, type_args: &Signature) -> SignatureToken {
+    if type_args.is_empty() {
+        ST::Struct(struct_handle)
+    } else {
+        ST::StructInstantiation(struct_handle, type_args.0.clone())
+    }
+}
+
+fn instantiate(token: &SignatureToken, subst: &Signature) -> SignatureToken {
+    use SignatureToken::*;
+
+    if subst.0.is_empty() {
+        return token.clone();
+    }
+
+    match token {
+        Bool => Bool,
+        U8 => U8,
+        U16 => U16,
+        U32 => U32,
+        U64 => U64,
+        U128 => U128,
+        U256 => U256,
+        Address => Address,
+        Signer => Signer,
+        Vector(ty) => Vector(Box::new(instantiate(ty, subst))),
+        Struct(idx) => Struct(*idx),
+        StructInstantiation(idx, struct_type_args) => StructInstantiation(
+            *idx,
+            struct_type_args
+                .iter()
+                .map(|ty| instantiate(ty, subst))
+                .collect(),
+        ),
+        Reference(ty) => Reference(Box::new(instantiate(ty, subst))),
+        MutableReference(ty) => MutableReference(Box::new(instantiate(ty, subst))),
+        TypeParameter(idx) => {
+            // Assume that the caller has previously parsed and verified the structure of the
+            // file and that this guarantees that type parameter indices are always in bounds.
+            debug_assert!((*idx as usize) < subst.len());
+            subst.0[*idx as usize].clone()
+        }
+    }
+}
+
+fn get_vector_element_type(
+    vector_ref_ty: SignatureToken,
+    mut_ref_only: bool,
+) -> Option<SignatureToken> {
+    use SignatureToken::*;
+    match vector_ref_ty {
+        Reference(referred_type) => {
+            if mut_ref_only {
+                None
+            } else if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        MutableReference(referred_type) => {
+            if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        _ => None,
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-bytecode-verifier/src/verifier.rs b/vendors/move/move-execution/v0/move-bytecode-verifier/src/verifier.rs
new file mode 100644
index 000000000..fd8b92a58
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-bytecode-verifier/src/verifier.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains the public APIs supported by the bytecode verifier.
+use crate::meter::{DummyMeter, Meter};
+use crate::{
+    ability_field_requirements, check_duplication::DuplicationChecker,
+    code_unit_verifier::CodeUnitVerifier, constants, friends,
+    instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
+    limits::LimitsVerifier, script_signature,
+    script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
+    struct_defs::RecursiveStructDefChecker,
+};
+use move_binary_format::{
+    check_bounds::BoundsChecker,
+    errors::{Location, VMResult},
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::time::Instant;
+
+/// Helper for a "canonical" verification of a module.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_module_unmetered(module: &CompiledModule) -> VMResult<()> {
+    verify_module_with_config_unmetered(&VerifierConfig::default(), module)
+}
+
+pub fn verify_module_with_config_for_test(
+    name: &str,
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    const MAX_MODULE_SIZE: usize = 65355;
+    let mut bytes = vec![];
+    module.serialize(&mut bytes).unwrap();
+    let now = Instant::now();
+    let result = verify_module_with_config_metered(config, module, meter);
+    eprintln!(
+        "--> {}: verification time: {:.3}ms, result: {}, size: {}kb",
+        name,
+        (now.elapsed().as_micros() as f64) / 1000.0,
+        if let Err(e) = &result {
+            format!("{:?}", e.major_status())
+        } else {
+            "Ok".to_string()
+        },
+        bytes.len() / 1000
+    );
+    // Also check whether the module actually fits into our payload size
+    assert!(
+        bytes.len() <= MAX_MODULE_SIZE,
+        "test module exceeds size limit {} (given size {})",
+        MAX_MODULE_SIZE,
+        bytes.len()
+    );
+    result
+}
+
+pub fn verify_module_with_config_metered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_module(module).map_err(|e| {
+        // We can't point the error at the module, because if bounds-checking
+        // failed, we cannot safely index into module's handle to itself.
+        e.finish(Location::Undefined)
+    })?;
+    LimitsVerifier::verify_module(config, module)?;
+    DuplicationChecker::verify_module(module)?;
+    SignatureChecker::verify_module(module)?;
+    InstructionConsistency::verify_module(module)?;
+    constants::verify_module(module)?;
+    friends::verify_module(module)?;
+    ability_field_requirements::verify_module(module)?;
+    RecursiveStructDefChecker::verify_module(module)?;
+    InstantiationLoopChecker::verify_module(module)?;
+    CodeUnitVerifier::verify_module(config, module, meter)?;
+
+    script_signature::verify_module(module, no_additional_script_signature_checks)
+}
+
+pub fn verify_module_with_config_unmetered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+) -> VMResult<()> {
+    verify_module_with_config_metered(config, module, &mut DummyMeter)
+}
+
+/// Helper for a "canonical" verification of a script.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_script_unmetered(script: &CompiledScript) -> VMResult<()> {
+    verify_script_with_config_unmetered(&VerifierConfig::default(), script)
+}
+
+pub fn verify_script_with_config_metered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
+    LimitsVerifier::verify_script(config, script)?;
+    DuplicationChecker::verify_script(script)?;
+    SignatureChecker::verify_script(script)?;
+    InstructionConsistency::verify_script(script)?;
+    constants::verify_script(script)?;
+    CodeUnitVerifier::verify_script(config, script, meter)?;
+    script_signature::verify_script(script, no_additional_script_signature_checks)
+}
+
+pub fn verify_script_with_config_unmetered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+) -> VMResult<()> {
+    verify_script_with_config_metered(config, script, &mut DummyMeter)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/Cargo.toml b/vendors/move/move-execution/v0/move-stdlib/Cargo.toml
new file mode 100644
index 000000000..aa1abc4da
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "move-stdlib-v0"
+version = "0.1.1"
+edition = "2021"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem stdlib"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[dependencies]
+move-errmapgen.workspace = true
+move-docgen.workspace = true
+move-command-line-common.workspace = true
+move-prover.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-runtime = { path = "../move-vm/runtime", package = "move-vm-runtime-v0" }
+log.workspace = true
+walkdir.workspace = true
+smallvec.workspace = true
+sha2.workspace = true
+sha3.workspace = true
+anyhow = "1.0.71"
+hex.workspace = true
+
+[dev-dependencies]
+move-unit-test.workspace = true
+tempfile.workspace = true
+dir-diff.workspace = true
+file_diff.workspace = true
+move-cli.workspace = true
+move-package.workspace = true
+
+[features]
+testing = []
diff --git a/vendors/move/move-execution/v0/move-stdlib/Move.toml b/vendors/move/move-execution/v0/move-stdlib/Move.toml
new file mode 100644
index 000000000..2a4fdf0b6
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveStdlib"
+version = "1.5.0"
+
+[addresses]
+std = "_"
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/move-execution/v0/move-stdlib/doc_templates/overview.md b/vendors/move/move-execution/v0/move-stdlib/doc_templates/overview.md
new file mode 100644
index 000000000..74606d23f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/doc_templates/overview.md
@@ -0,0 +1,7 @@
+# Move Stdlib Modules
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/move-execution/v0/move-stdlib/doc_templates/references.md b/vendors/move/move-execution/v0/move-stdlib/doc_templates/references.md
new file mode 100644
index 000000000..7e71c78da
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/doc_templates/references.md
@@ -0,0 +1,2 @@
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/ascii.md b/vendors/move/move-execution/v0/move-stdlib/docs/ascii.md
new file mode 100644
index 000000000..108a9367b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/ascii.md
@@ -0,0 +1,536 @@
+
+<a name="0x1_ascii"></a>
+
+# Module `0x1::ascii`
+
+The <code>ASCII</code> module defines basic string and char newtypes in Move that verify
+that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+
+
+-  [Struct `String`](#0x1_ascii_String)
+-  [Struct `Char`](#0x1_ascii_Char)
+-  [Constants](#@Constants_0)
+-  [Function `char`](#0x1_ascii_char)
+-  [Function `string`](#0x1_ascii_string)
+-  [Function `try_string`](#0x1_ascii_try_string)
+-  [Function `all_characters_printable`](#0x1_ascii_all_characters_printable)
+-  [Function `push_char`](#0x1_ascii_push_char)
+-  [Function `pop_char`](#0x1_ascii_pop_char)
+-  [Function `length`](#0x1_ascii_length)
+-  [Function `as_bytes`](#0x1_ascii_as_bytes)
+-  [Function `into_bytes`](#0x1_ascii_into_bytes)
+-  [Function `byte`](#0x1_ascii_byte)
+-  [Function `is_valid_char`](#0x1_ascii_is_valid_char)
+-  [Function `is_printable_char`](#0x1_ascii_is_printable_char)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a name="0x1_ascii_String"></a>
+
+## Struct `String`
+
+The <code><a href="ascii.md#0x1_ascii_String">String</a></code> struct holds a vector of bytes that all represent
+valid ASCII characters. Note that these ASCII characters may not all
+be printable. To determine if a <code><a href="ascii.md#0x1_ascii_String">String</a></code> contains only "printable"
+characters you should use the <code>all_characters_printable</code> predicate
+defined in this module.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> i in 0..len(bytes): <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_Char"></a>
+
+## Struct `Char`
+
+An ASCII character.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_Char">Char</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>byte: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte);
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_ascii_EINVALID_ASCII_CHARACTER"></a>
+
+An invalid ASCII character was encountered when creating an ASCII string.
+
+
+<pre><code><b>const</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>: u64 = 65536;
+</code></pre>
+
+
+
+<a name="0x1_ascii_char"></a>
+
+## Function `char`
+
+Convert a <code>byte</code> into a <code><a href="ascii.md#0x1_ascii_Char">Char</a></code> that is checked to make sure it is valid ASCII.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <b>assert</b>!(<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte), <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>);
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_string"></a>
+
+## Function `string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Aborts if
+<code>bytes</code> contains non-ASCII characters.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">String</a> {
+   <b>let</b> x = <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes);
+   <b>assert</b>!(
+        <a href="option.md#0x1_option_is_some">option::is_some</a>(&x),
+        <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>
+   );
+   <a href="option.md#0x1_option_destroy_some">option::destroy_some</a>(x)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>exists</b> i in 0..len(bytes): !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_try_string"></a>
+
+## Function `try_string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Returns
+<code>Some(&lt;ascii_string&gt;)</code> if the <code>bytes</code> contains all valid ASCII
+characters. Otherwise returns <code>None</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="ascii.md#0x1_ascii_String">ascii::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ascii.md#0x1_ascii_String">String</a>&gt; {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> possible_byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(possible_byte)) <b>return</b> <a href="option.md#0x1_option_none">option::none</a>();
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+   };
+   <a href="option.md#0x1_option_some">option::some</a>(<a href="ascii.md#0x1_ascii_String">String</a> { bytes })
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_all_characters_printable"></a>
+
+## Function `all_characters_printable`
+
+Returns <code><b>true</b></code> if all characters in <code><a href="string.md#0x1_string">string</a></code> are printable characters
+Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1_ascii_String">String</a></code>s are printable strings.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): bool {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&<a href="string.md#0x1_string">string</a>.bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="string.md#0x1_string">string</a>.bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte)) <b>return</b> <b>false</b>;
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+   };
+   <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> result ==&gt; (<b>forall</b> j in 0..len(<a href="string.md#0x1_string">string</a>.bytes): <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]));
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_push_char"></a>
+
+## Function `push_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>, char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>, char: <a href="ascii.md#0x1_ascii_Char">Char</a>) {
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes, char.byte);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) + 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_pop_char"></a>
+
+## Function `pop_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte: <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) - 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_as_bytes"></a>
+
+## Function `as_bytes`
+
+Get the inner bytes of the <code><a href="string.md#0x1_string">string</a></code> as a reference
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   &<a href="string.md#0x1_string">string</a>.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_into_bytes"></a>
+
+## Function `into_bytes`
+
+Unpack the <code><a href="string.md#0x1_string">string</a></code> to get its backing bytes
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   <b>let</b> <a href="ascii.md#0x1_ascii_String">String</a> { bytes } = <a href="string.md#0x1_string">string</a>;
+   bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_byte"></a>
+
+## Function `byte`
+
+Unpack the <code>char</code> into its underlying byte.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">Char</a>): u8 {
+   <b>let</b> <a href="ascii.md#0x1_ascii_Char">Char</a> { byte } = char;
+   byte
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_valid_char"></a>
+
+## Function `is_valid_char`
+
+Returns <code><b>true</b></code> if <code>b</code> is a valid ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool {
+   b &lt;= 0x7F
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_printable_char"></a>
+
+## Function `is_printable_char`
+
+Returns <code><b>true</b></code> if <code>byte</code> is an printable ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool {
+   byte &gt;= 0x20 && // Disallow metacharacters
+   <a href="ascii.md#0x1_ascii_byte">byte</a> &lt;= 0x7E // Don't allow DEL metacharacter
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/bcs.md b/vendors/move/move-execution/v0/move-stdlib/docs/bcs.md
new file mode 100644
index 000000000..9b235af18
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/bcs.md
@@ -0,0 +1,59 @@
+
+<a name="0x1_bcs"></a>
+
+# Module `0x1::bcs`
+
+Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+Serialization). BCS is the binary encoding for Move resources and other non-module values
+published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+details on BCS.
+
+
+-  [Function `to_bytes`](#0x1_bcs_to_bytes)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bcs_to_bytes"></a>
+
+## Function `to_bytes`
+
+Return the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+
+
+Native function which is defined in the prover's prelude.
+
+
+<a name="0x1_bcs_serialize"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialize">serialize</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/bit_vector.md b/vendors/move/move-execution/v0/move-stdlib/docs/bit_vector.md
new file mode 100644
index 000000000..5916e183d
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/bit_vector.md
@@ -0,0 +1,456 @@
+
+<a name="0x1_bit_vector"></a>
+
+# Module `0x1::bit_vector`
+
+
+
+-  [Struct `BitVector`](#0x1_bit_vector_BitVector)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_bit_vector_new)
+-  [Function `set`](#0x1_bit_vector_set)
+-  [Function `unset`](#0x1_bit_vector_unset)
+-  [Function `shift_left`](#0x1_bit_vector_shift_left)
+-  [Function `is_index_set`](#0x1_bit_vector_is_index_set)
+-  [Function `length`](#0x1_bit_vector_length)
+-  [Function `longest_set_sequence_starting_at`](#0x1_bit_vector_longest_set_sequence_starting_at)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bit_vector_BitVector"></a>
+
+## Struct `BitVector`
+
+
+
+<pre><code><b>struct</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bit_field: <a href="vector.md#0x1_vector">vector</a>&lt;bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_bit_vector_EINDEX"></a>
+
+The provided index is out of bounds
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_ELENGTH"></a>
+
+An invalid length of bitvector was given
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 131073;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_MAX_SIZE"></a>
+
+The maximum allowed bitvector size
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>: u64 = 1024;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_WORD_SIZE"></a>
+
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_WORD_SIZE">WORD_SIZE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_new"></a>
+
+## Function `new`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+    <b>assert</b>!(length &gt; 0, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>assert</b>!(<a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt; <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>let</b> counter = 0;
+    <b>let</b> bit_field = <a href="vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>while</b> ({<b>spec</b> {
+        <b>invariant</b> counter &lt;= length;
+        <b>invariant</b> len(bit_field) == counter;
+    };
+        (counter &lt; length)}) {
+        <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bit_field, <b>false</b>);
+        counter = counter + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> counter == length;
+        <b>assert</b> len(bit_field) == length;
+    };
+
+    <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+        length,
+        bit_field,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a>;
+<b>ensures</b> result.length == length;
+<b>ensures</b> len(result.bit_field) == length;
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_NewAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a> {
+    length: u64;
+    <b>aborts_if</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt;= 0 <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+    <b>aborts_if</b> length &gt;= <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a> <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_set"></a>
+
+## Function `set`
+
+Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a>;
+<b>ensures</b> bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_SetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_unset"></a>
+
+## Function `unset`
+
+Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
+<b>ensures</b> !bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_UnsetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_shift_left"></a>
+
+## Function `shift_left`
+
+Shift the <code>bitvector</code> left by <code>amount</code>. If <code>amount</code> is greater than the
+bitvector's length the bitvector will be zeroed out.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, amount: u64) {
+    <b>if</b> (amount &gt;= bitvector.length) {
+       <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field);
+       <b>let</b> i = 0;
+       <b>while</b> (i &lt; len) {
+           <b>let</b> elem = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, i);
+           *elem = <b>false</b>;
+           i = i + 1;
+       };
+    } <b>else</b> {
+        <b>let</b> i = amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <b>if</b> (<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, i)) <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector, i - amount)
+            <b>else</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i - amount);
+            i = i + 1;
+        };
+
+        i = bitvector.length - amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i);
+            i = i + 1;
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_is_index_set"></a>
+
+## Function `is_index_set`
+
+Return the value of the bit at <code>bit_index</code> in the <code>bitvector</code>. <code><b>true</b></code>
+represents "1" and <code><b>false</b></code> represents a 0
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bitvector.bit_field, bit_index)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a>;
+<b>ensures</b> result == bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_IsIndexSetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_spec_is_index_set"></a>
+
+
+<pre><code><b>fun</b> <a href="bit_vector.md#0x1_bit_vector_spec_is_index_set">spec_is_index_set</a>(bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+   <b>if</b> (bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector)) {
+       <b>false</b>
+   } <b>else</b> {
+       bitvector.bit_field[bit_index]
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_length"></a>
+
+## Function `length`
+
+Return the length (number of usable bits) of this bitvector
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_longest_set_sequence_starting_at"></a>
+
+## Function `longest_set_sequence_starting_at`
+
+Returns the length of the longest sequence of set bits starting at (and
+including) <code>start_index</code> in the <code>bitvector</code>. If there is no such
+sequence, then <code>0</code> is returned.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, start_index: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, start_index: u64): u64 {
+    <b>assert</b>!(start_index &lt; bitvector.length, <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> index = start_index;
+
+    // Find the greatest index in the <a href="vector.md#0x1_vector">vector</a> such that all indices less than it are set.
+    <b>while</b> (index &lt; bitvector.length) {
+        <b>if</b> (!<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, index)) <b>break</b>;
+        index = index + 1;
+    };
+
+    index - start_index
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/error.md b/vendors/move/move-execution/v0/move-stdlib/docs/error.md
new file mode 100644
index 000000000..0cc2487da
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/error.md
@@ -0,0 +1,475 @@
+
+<a name="0x1_error"></a>
+
+# Module `0x1::error`
+
+This module defines a set of canonical error codes which are optional to use by applications for the
+<code><b>abort</b></code> and <code><b>assert</b>!</code> features.
+
+Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+Given an error category <code>0x1</code> and a reason <code>0x3</code>, a canonical abort code looks as <code>0x10003</code>.
+
+A module can use a canonical code with a constant declaration of the following form:
+
+```
+///  An invalid ASCII character was encountered when creating a string.
+const EINVALID_CHARACTER: u64 = 0x010003;
+```
+
+This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+error reason understand by the existing error map tooling, or as a canonical code.
+
+The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+error codes here are a bit richer than HTTP codes.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `canonical`](#0x1_error_canonical)
+-  [Function `invalid_argument`](#0x1_error_invalid_argument)
+-  [Function `out_of_range`](#0x1_error_out_of_range)
+-  [Function `invalid_state`](#0x1_error_invalid_state)
+-  [Function `unauthenticated`](#0x1_error_unauthenticated)
+-  [Function `permission_denied`](#0x1_error_permission_denied)
+-  [Function `not_found`](#0x1_error_not_found)
+-  [Function `aborted`](#0x1_error_aborted)
+-  [Function `already_exists`](#0x1_error_already_exists)
+-  [Function `resource_exhausted`](#0x1_error_resource_exhausted)
+-  [Function `internal`](#0x1_error_internal)
+-  [Function `not_implemented`](#0x1_error_not_implemented)
+-  [Function `unavailable`](#0x1_error_unavailable)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_error_ABORTED"></a>
+
+Concurrency conflict, such as read-modify-write conflict (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ABORTED">ABORTED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a name="0x1_error_ALREADY_EXISTS"></a>
+
+The resource that a client tried to create already exists (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>: u64 = 8;
+</code></pre>
+
+
+
+<a name="0x1_error_CANCELLED"></a>
+
+Request cancelled by the client (http: 499)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_CANCELLED">CANCELLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a name="0x1_error_INTERNAL"></a>
+
+Internal error (http: 500)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INTERNAL">INTERNAL</a>: u64 = 11;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_ARGUMENT"></a>
+
+Caller specified an invalid argument (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_STATE"></a>
+
+The system is not in a state where the operation can be performed (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_FOUND"></a>
+
+A specified resource is not found (http: 404)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_IMPLEMENTED"></a>
+
+Feature not implemented (http: 501)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>: u64 = 12;
+</code></pre>
+
+
+
+<a name="0x1_error_OUT_OF_RANGE"></a>
+
+An input or result of a computation is out of range (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_error_PERMISSION_DENIED"></a>
+
+client does not have sufficient permission (http: 403)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a name="0x1_error_RESOURCE_EXHAUSTED"></a>
+
+Out of gas or other forms of quota (http: 429)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAUTHENTICATED"></a>
+
+Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAVAILABLE"></a>
+
+The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a name="0x1_error_canonical"></a>
+
+## Function `canonical`
+
+Construct a canonical error code from a category and a reason.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64 {
+  (category &lt;&lt; 16) + reason
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+Functions to construct a canonical error code of the given category.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_out_of_range"></a>
+
+## Function `out_of_range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unauthenticated"></a>
+
+## Function `unauthenticated`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_permission_denied"></a>
+
+## Function `permission_denied`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_found"></a>
+
+## Function `not_found`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_aborted"></a>
+
+## Function `aborted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ABORTED">ABORTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_already_exists"></a>
+
+## Function `already_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_resource_exhausted"></a>
+
+## Function `resource_exhausted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INTERNAL">INTERNAL</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_implemented"></a>
+
+## Function `not_implemented`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unavailable"></a>
+
+## Function `unavailable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/fixed_point32.md b/vendors/move/move-execution/v0/move-stdlib/docs/fixed_point32.md
new file mode 100644
index 000000000..55848f5f7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/fixed_point32.md
@@ -0,0 +1,833 @@
+
+<a name="0x1_fixed_point32"></a>
+
+# Module `0x1::fixed_point32`
+
+Defines a fixed-point numeric type with a 32-bit integer part and
+a 32-bit fractional part.
+
+
+-  [Struct `FixedPoint32`](#0x1_fixed_point32_FixedPoint32)
+-  [Constants](#@Constants_0)
+-  [Function `multiply_u64`](#0x1_fixed_point32_multiply_u64)
+-  [Function `divide_u64`](#0x1_fixed_point32_divide_u64)
+-  [Function `create_from_rational`](#0x1_fixed_point32_create_from_rational)
+-  [Function `create_from_raw_value`](#0x1_fixed_point32_create_from_raw_value)
+-  [Function `get_raw_value`](#0x1_fixed_point32_get_raw_value)
+-  [Function `is_zero`](#0x1_fixed_point32_is_zero)
+-  [Function `min`](#0x1_fixed_point32_min)
+-  [Function `max`](#0x1_fixed_point32_max)
+-  [Function `create_from_u64`](#0x1_fixed_point32_create_from_u64)
+-  [Function `floor`](#0x1_fixed_point32_floor)
+-  [Function `ceil`](#0x1_fixed_point32_ceil)
+-  [Function `round`](#0x1_fixed_point32_round)
+-  [Module Specification](#@Module_Specification_1)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_fixed_point32_FixedPoint32"></a>
+
+## Struct `FixedPoint32`
+
+Define a fixed-point numeric type with 32 fractional bits.
+This is just a u64 integer but it is wrapped in a struct to
+make a unique type. This is a binary representation, so decimal
+values may not be exactly representable, but it provides more
+than 9 decimal digits of precision both before and after the
+decimal point (18 digits total). For comparison, double precision
+floating-point has less than 16 decimal digits of precision, so
+be careful about using floating-point to convert these values to
+decimal.
+
+
+<pre><code><b>struct</b> <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_fixed_point32_MAX_U64"></a>
+
+> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDENOMINATOR"></a>
+
+The denominator provided was zero
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION"></a>
+
+The quotient value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION_BY_ZERO"></a>
+
+A division by zero was encountered
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EMULTIPLICATION"></a>
+
+The multiplied value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_ERATIO_OUT_OF_RANGE"></a>
+
+The computed ratio when converting to a <code><a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a></code> would be unrepresentable
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_multiply_u64"></a>
+
+## Function `multiply_u64`
+
+Multiply a u64 integer by a fixed-point number, truncating any
+fractional part of the product. This will abort if the product
+overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // The product of two 64 bit values <b>has</b> 128 bits, so perform the
+    // multiplication <b>with</b> u128 types and keep the full 128 bit product
+    // <b>to</b> avoid losing accuracy.
+    <b>let</b> unscaled_product = (val <b>as</b> u128) * (multiplier.value <b>as</b> u128);
+    // The unscaled product <b>has</b> 32 fractional bits (from the multiplier)
+    // so rescale it by shifting away the low bits.
+    <b>let</b> product = unscaled_product &gt;&gt; 32;
+    // Check whether the value is too large.
+    <b>assert</b>!(product &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>);
+    (product <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_MultiplyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a> {
+    val: num;
+    multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_multiply_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val: num, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val * multiplier.value) &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_divide_u64"></a>
+
+## Function `divide_u64`
+
+Divide a u64 integer by a fixed-point number, truncating any
+fractional part of the quotient. This will abort if the divisor
+is zero or if the quotient overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // Check for division by zero.
+    <b>assert</b>!(divisor.value != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>);
+    // First convert <b>to</b> 128 bits and then shift left <b>to</b>
+    // add 32 fractional zero bits <b>to</b> the dividend.
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_value / (divisor.value <b>as</b> u128);
+    // Check whether the value is too large.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>);
+    // the value may be too large, which will cause the cast <b>to</b> fail
+    // <b>with</b> an arithmetic <a href="error.md#0x1_error">error</a>.
+    (quotient <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_DivideAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a> {
+    val: num;
+    divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> divisor.value == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_divide_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val: num, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val &lt;&lt; 32) / divisor.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_rational"></a>
+
+## Function `create_from_rational`
+
+Create a fixed-point value from a rational number specified by its
+numerator and denominator. Calling this function should be preferred
+for using <code><a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">Self::create_from_raw_value</a></code> which is also available.
+This will abort if the denominator is zero. It will also
+abort if the numerator is nonzero and the ratio is not in the range
+2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+rounding errors: if you round to display N digits after the decimal
+point, you can use a denominator of 10^N to avoid numbers where the
+very small imprecision in the binary representation could change the
+rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    // If the denominator is zero, this will <b>abort</b>.
+    // Scale the numerator <b>to</b> have 64 fractional bits and the denominator
+    // <b>to</b> have 32 fractional bits, so that the quotient will have 32
+    // fractional bits.
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(scaled_denominator != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>);
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>assert</b>!(quotient != 0 || numerator == 0, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    // Return the quotient <b>as</b> a fixed-point number. We first need <b>to</b> check whether the cast
+    // can succeed.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value: (quotient <b>as</b> u64) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator, denominator);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromRationalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
+    numerator: u64;
+    denominator: u64;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>;
+    <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+    <b>aborts_if</b> quotient &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_rational"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator: num, denominator: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (numerator &lt;&lt; 64) / (denominator &lt;&lt; 32)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_raw_value"></a>
+
+## Function `create_from_raw_value`
+
+Create a fixedpoint value from a raw value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.value == value;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_get_raw_value"></a>
+
+## Function `get_raw_value`
+
+Accessor for the raw u64 value. Other less common operations, such as
+adding or subtracting FixedPoint32 values, can be done using the raw
+values directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_is_zero"></a>
+
+## Function `is_zero`
+
+Returns true if the ratio is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): bool {
+    num.value == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_u64"></a>
+
+## Function `create_from_u64`
+
+Create a fixedpoint value from a u64 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>let</b> value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(value &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (value <b>as</b> u64)}
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: val &lt;&lt; 32}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint32 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 32
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u128) + (1 &lt;&lt; 32));
+    (val &gt;&gt; 32 <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint32 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 32) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 32
+    } <b>else</b> {
+        <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> boundary = (1 &lt;&lt; 32) / 2;
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/hash.md b/vendors/move/move-execution/v0/move-stdlib/docs/hash.md
new file mode 100644
index 000000000..c054f33cb
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/hash.md
@@ -0,0 +1,65 @@
+
+<a name="0x1_hash"></a>
+
+# Module `0x1::hash`
+
+Module which defines SHA hashes for byte vectors.
+
+The functions in this module are natively declared both in the Move runtime
+as in the Move prover's prelude.
+
+
+-  [Function `sha2_256`](#0x1_hash_sha2_256)
+-  [Function `sha3_256`](#0x1_hash_sha3_256)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_hash_sha2_256"></a>
+
+## Function `sha2_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_hash_sha3_256"></a>
+
+## Function `sha3_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/option.md b/vendors/move/move-execution/v0/move-stdlib/docs/option.md
new file mode 100644
index 000000000..1006af4b0
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/option.md
@@ -0,0 +1,877 @@
+
+<a name="0x1_option"></a>
+
+# Module `0x1::option`
+
+This module defines the Option type and its methods to represent and handle an optional value.
+
+
+-  [Struct `Option`](#0x1_option_Option)
+-  [Constants](#@Constants_0)
+-  [Function `none`](#0x1_option_none)
+-  [Function `some`](#0x1_option_some)
+-  [Function `is_none`](#0x1_option_is_none)
+-  [Function `is_some`](#0x1_option_is_some)
+-  [Function `contains`](#0x1_option_contains)
+-  [Function `borrow`](#0x1_option_borrow)
+-  [Function `borrow_with_default`](#0x1_option_borrow_with_default)
+-  [Function `get_with_default`](#0x1_option_get_with_default)
+-  [Function `fill`](#0x1_option_fill)
+-  [Function `extract`](#0x1_option_extract)
+-  [Function `borrow_mut`](#0x1_option_borrow_mut)
+-  [Function `swap`](#0x1_option_swap)
+-  [Function `swap_or_fill`](#0x1_option_swap_or_fill)
+-  [Function `destroy_with_default`](#0x1_option_destroy_with_default)
+-  [Function `destroy_some`](#0x1_option_destroy_some)
+-  [Function `destroy_none`](#0x1_option_destroy_none)
+-  [Function `to_vec`](#0x1_option_to_vec)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Schema](#@Helper_Schema_2)
+
+
+<pre><code><b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_option_Option"></a>
+
+## Struct `Option`
+
+Abstraction of a value that may or may not be present. Implemented with a vector of size
+zero or one because Move bytecode does not have ADTs.
+
+
+<pre><code><b>struct</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+The size of vector is always less than equal to 1
+because it's 0 for "none" or 1 for "some".
+
+
+<pre><code><b>invariant</b> len(vec) &lt;= 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_option_EOPTION_IS_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>Some</code> while it should be <code>None</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 262144;
+</code></pre>
+
+
+
+<a name="0x1_option_EOPTION_NOT_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>None</code> while it should be <code>Some</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 262145;
+</code></pre>
+
+
+
+<a name="0x1_option_none"></a>
+
+## Function `none`
+
+Return an empty <code><a href="option.md#0x1_option_Option">Option</a></code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_empty">vector::empty</a>() }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;();
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_none"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_some"></a>
+
+## Function `some`
+
+Return an <code><a href="option.md#0x1_option_Option">Option</a></code> containing <code>e</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_singleton">vector::singleton</a>(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_some">spec_some</a>(e);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_some"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_some">spec_some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_none"></a>
+
+## Function `is_none`
+
+Return true if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_some"></a>
+
+## Function `is_some`
+
+Return true if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    !<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_some">is_some</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_contains"></a>
+
+## Function `contains`
+
+Return true if the value in <code>t</code> is equal to <code>e_ref</code>
+Always returns <code><b>false</b></code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e_ref: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e_ref: &Element): bool {
+    <a href="vector.md#0x1_vector_contains">vector::contains</a>(&t.vec, e_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_contains">spec_contains</a>(t, e_ref);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_contains">spec_contains</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): bool {
+   <a href="option.md#0x1_option_is_some">is_some</a>(t) && <a href="option.md#0x1_option_borrow">borrow</a>(t) == e
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow"></a>
+
+## Function `borrow`
+
+Return an immutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Return a reference to the value inside <code>t</code> if it holds one
+Return <code>default_ref</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default_ref: &Element): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default_ref: &Element): &Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default_ref
+    <b>else</b> <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default_ref);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_get_with_default"></a>
+
+## Function `get_with_default`
+
+Return the value inside <code>t</code> if it holds one
+Return <code>default</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b>, drop&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b> + drop&gt;(
+    t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;,
+    default: Element,
+): Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default
+    <b>else</b> *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_fill"></a>
+
+## Function `fill`
+
+Convert the none option <code>t</code> to a some option by adding <code>e</code>.
+Aborts if <code>t</code> already holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element) {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e)
+    <b>else</b> <b>abort</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_extract"></a>
+
+## Function `extract`
+
+Convert a <code>some</code> option to a <code>none</code> by removing and returning the value stored inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &<b>mut</b> Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap"></a>
+
+## Function `swap`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref);
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap_or_fill"></a>
+
+## Function `swap_or_fill`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value;
+or if there is no old value, fill it with <code>e</code>.
+Different from swap(), swap_or_fill() allows for <code>t</code> not holding a value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="option.md#0x1_option_none">none</a>()
+        <b>else</b> <a href="option.md#0x1_option_some">some</a>(<a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref));
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <b>old</b>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_with_default"></a>
+
+## Function `destroy_with_default`
+
+Destroys <code>t.</code> If <code>t</code> holds a value, return it. Returns <code>default</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default: Element): Element {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&<b>mut</b> vec)) default
+    <b>else</b> <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_some"></a>
+
+## Function `destroy_some`
+
+Unpack <code>t</code> and return its contents
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(&t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>let</b> elem = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec);
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec);
+    elem
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_none"></a>
+
+## Function `destroy_none`
+
+Unpack <code>t</code>
+Aborts if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;) {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_none">is_none</a>(&t), <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_to_vec"></a>
+
+## Function `to_vec`
+
+Convert <code>t</code> into a vector of length 1 if it is <code>Some</code>,
+and an empty vector otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == t.vec;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a name="@Helper_Schema_2"></a>
+
+### Helper Schema
+
+
+
+<a name="0x1_option_AbortsIfNone"></a>
+
+
+<pre><code><b>schema</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt; {
+    t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;;
+    <b>aborts_if</b> <a href="option.md#0x1_option_is_none">is_none</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>;
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/overview.md b/vendors/move/move-execution/v0/move-stdlib/docs/overview.md
new file mode 100644
index 000000000..e8aff3f04
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/overview.md
@@ -0,0 +1,28 @@
+
+<a name="@Move_Stdlib_Modules_0"></a>
+
+# Move Stdlib Modules
+
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+
+<a name="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::ascii`](ascii.md#0x1_ascii)
+-  [`0x1::bcs`](bcs.md#0x1_bcs)
+-  [`0x1::bit_vector`](bit_vector.md#0x1_bit_vector)
+-  [`0x1::error`](error.md#0x1_error)
+-  [`0x1::fixed_point32`](fixed_point32.md#0x1_fixed_point32)
+-  [`0x1::hash`](hash.md#0x1_hash)
+-  [`0x1::option`](option.md#0x1_option)
+-  [`0x1::signer`](signer.md#0x1_signer)
+-  [`0x1::string`](string.md#0x1_string)
+-  [`0x1::type_name`](type_name.md#0x1_type_name)
+-  [`0x1::vector`](vector.md#0x1_vector)
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/signer.md b/vendors/move/move-execution/v0/move-stdlib/docs/signer.md
new file mode 100644
index 000000000..bc4020096
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/signer.md
@@ -0,0 +1,87 @@
+
+<a name="0x1_signer"></a>
+
+# Module `0x1::signer`
+
+
+
+-  [Function `borrow_address`](#0x1_signer_borrow_address)
+-  [Function `address_of`](#0x1_signer_address_of)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_signer_borrow_address"></a>
+
+## Function `borrow_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_signer_address_of"></a>
+
+## Function `address_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b> {
+    *<a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+Return true only if <code>s</code> is a transaction signer. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer">is_txn_signer</a>(s: <a href="signer.md#0x1_signer">signer</a>): bool;
+</code></pre>
+
+
+Return true only if <code>a</code> is a transaction signer address. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer_addr"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer_addr">is_txn_signer_addr</a>(a: <b>address</b>): bool;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/string.md b/vendors/move/move-execution/v0/move-stdlib/docs/string.md
new file mode 100644
index 000000000..e962b56d8
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/string.md
@@ -0,0 +1,446 @@
+
+<a name="0x1_string"></a>
+
+# Module `0x1::string`
+
+The <code><a href="string.md#0x1_string">string</a></code> module defines the <code><a href="string.md#0x1_string_String">String</a></code> type which represents UTF8 encoded strings.
+
+
+-  [Struct `String`](#0x1_string_String)
+-  [Constants](#@Constants_0)
+-  [Function `utf8`](#0x1_string_utf8)
+-  [Function `try_utf8`](#0x1_string_try_utf8)
+-  [Function `bytes`](#0x1_string_bytes)
+-  [Function `is_empty`](#0x1_string_is_empty)
+-  [Function `length`](#0x1_string_length)
+-  [Function `append`](#0x1_string_append)
+-  [Function `append_utf8`](#0x1_string_append_utf8)
+-  [Function `insert`](#0x1_string_insert)
+-  [Function `sub_string`](#0x1_string_sub_string)
+-  [Function `index_of`](#0x1_string_index_of)
+-  [Function `internal_check_utf8`](#0x1_string_internal_check_utf8)
+-  [Function `internal_is_char_boundary`](#0x1_string_internal_is_char_boundary)
+-  [Function `internal_sub_string`](#0x1_string_internal_sub_string)
+-  [Function `internal_index_of`](#0x1_string_internal_index_of)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_string_String"></a>
+
+## Struct `String`
+
+A <code><a href="string.md#0x1_string_String">String</a></code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="string.md#0x1_string_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_string_EINVALID_INDEX"></a>
+
+Index out of range.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_string_EINVALID_UTF8"></a>
+
+An invalid UTF8 encoding.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_string_utf8"></a>
+
+## Function `utf8`
+
+Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+    <b>assert</b>!(<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes), <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>);
+    <a href="string.md#0x1_string_String">String</a>{bytes}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_try_utf8"></a>
+
+## Function `try_utf8`
+
+Tries to create a new string from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="string.md#0x1_string_String">String</a>&gt; {
+    <b>if</b> (<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes)) {
+        <a href="option.md#0x1_option_some">option::some</a>(<a href="string.md#0x1_string_String">String</a>{bytes})
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_bytes"></a>
+
+## Function `bytes`
+
+Returns a reference to the underlying byte vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    &s.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_is_empty"></a>
+
+## Function `is_empty`
+
+Checks whether this string is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">String</a>): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_length"></a>
+
+## Function `length`
+
+Returns the length of this string, in bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append"></a>
+
+## Function `append`
+
+Appends a string.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, r: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, r: <a href="string.md#0x1_string_String">String</a>) {
+    <a href="vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> s.bytes, r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append_utf8"></a>
+
+## Function `append_utf8`
+
+Appends bytes which must be in valid utf8 format.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="string.md#0x1_string_append">append</a>(s, <a href="string.md#0x1_string_utf8">utf8</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_insert"></a>
+
+## Function `insert`
+
+Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+boundary.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, at: u64, o: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, at: u64, o: <a href="string.md#0x1_string_String">String</a>) {
+    <b>let</b> bytes = &s.bytes;
+    <b>assert</b>!(at &lt;= <a href="vector.md#0x1_vector_length">vector::length</a>(bytes) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, at), <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>);
+    <b>let</b> l = <a href="string.md#0x1_string_length">length</a>(s);
+    <b>let</b> front = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, 0, at);
+    <b>let</b> end = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, at, l);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, o);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, end);
+    *s = front;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_sub_string"></a>
+
+## Function `sub_string`
+
+Returns a sub-string using the given byte indices, where <code>i</code> is the first byte position and <code>j</code> is the start
+of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+guaranteeing that the result is valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">String</a> {
+    <b>let</b> bytes = &s.bytes;
+    <b>let</b> l = <a href="vector.md#0x1_vector_length">vector::length</a>(bytes);
+    <b>assert</b>!(
+        j &lt;= l && i &lt;= j && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, i) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, j),
+        <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>
+    );
+    <a href="string.md#0x1_string_String">String</a>{bytes: <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(bytes, i, j)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_index_of"></a>
+
+## Function `index_of`
+
+Computes the index of the first occurrence of a string. Returns <code><a href="string.md#0x1_string_length">length</a>(s)</code> if no occurrence found.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, r: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">String</a>, r: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(&s.bytes, &r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_check_utf8"></a>
+
+## Function `internal_check_utf8`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_is_char_boundary"></a>
+
+## Function `internal_is_char_boundary`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_sub_string"></a>
+
+## Function `internal_sub_string`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_index_of"></a>
+
+## Function `internal_index_of`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/type_name.md b/vendors/move/move-execution/v0/move-stdlib/docs/type_name.md
new file mode 100644
index 000000000..070e0ffd5
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/type_name.md
@@ -0,0 +1,158 @@
+
+<a name="0x1_type_name"></a>
+
+# Module `0x1::type_name`
+
+Functionality for converting Move types into values. Use with care!
+
+
+-  [Struct `TypeName`](#0x1_type_name_TypeName)
+-  [Function `get`](#0x1_type_name_get)
+-  [Function `get_with_original_ids`](#0x1_type_name_get_with_original_ids)
+-  [Function `borrow_string`](#0x1_type_name_borrow_string)
+-  [Function `into_string`](#0x1_type_name_into_string)
+
+
+<pre><code><b>use</b> <a href="ascii.md#0x1_ascii">0x1::ascii</a>;
+</code></pre>
+
+
+
+<a name="0x1_type_name_TypeName"></a>
+
+## Struct `TypeName`
+
+
+
+<pre><code><b>struct</b> <a href="type_name.md#0x1_type_name_TypeName">TypeName</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="ascii.md#0x1_ascii_String">ascii::String</a></code>
+</dt>
+<dd>
+ String representation of the type. All types are represented
+ using their source syntax:
+ "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+ Struct types are represented as fully qualified type names; e.g.
+ <code>00000000000000000000000000000001::string::String</code> or
+ <code>0000000000000000000000000000000a::module_name1::type_name1&lt;0000000000000000000000000000000a::module_name2::type_name2&lt;u64&gt;&gt;</code>
+ Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_type_name_get"></a>
+
+## Function `get`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are defining IDs (the ID of the package in
+storage that first introduced the type).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_get_with_original_ids"></a>
+
+## Function `get_with_original_ids`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are original IDs (the ID of the first version of
+the package, even if the type in question was introduced in a
+later upgrade).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_borrow_string"></a>
+
+## Function `borrow_string`
+
+Get the String representation of <code>self</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): &<a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): &String {
+    &self.name
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_into_string"></a>
+
+## Function `into_string`
+
+Convert <code>self</code> into its inner String
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): String {
+    self.name
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/docs/vector.md b/vendors/move/move-execution/v0/move-stdlib/docs/vector.md
new file mode 100644
index 000000000..dfadab2f5
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/docs/vector.md
@@ -0,0 +1,700 @@
+
+<a name="0x1_vector"></a>
+
+# Module `0x1::vector`
+
+A variable-sized container that can hold any type. Indexing is 0-based, and
+vectors are growable. This module has many native functions.
+Verification of modules that use this one uses model functions that are implemented
+directly in Boogie. The specification language has built-in functions operations such
+as <code>singleton_vector</code>. There are some helper functions defined here for specifications in other
+modules as well.
+
+>Note: We did not verify most of the
+Move functions here because many have loops, requiring loop invariants to prove, and
+the return on investment didn't seem worth it for these simple functions.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_vector_empty)
+-  [Function `length`](#0x1_vector_length)
+-  [Function `borrow`](#0x1_vector_borrow)
+-  [Function `push_back`](#0x1_vector_push_back)
+-  [Function `borrow_mut`](#0x1_vector_borrow_mut)
+-  [Function `pop_back`](#0x1_vector_pop_back)
+-  [Function `destroy_empty`](#0x1_vector_destroy_empty)
+-  [Function `swap`](#0x1_vector_swap)
+-  [Function `singleton`](#0x1_vector_singleton)
+-  [Function `reverse`](#0x1_vector_reverse)
+-  [Function `append`](#0x1_vector_append)
+-  [Function `is_empty`](#0x1_vector_is_empty)
+-  [Function `contains`](#0x1_vector_contains)
+-  [Function `index_of`](#0x1_vector_index_of)
+-  [Function `remove`](#0x1_vector_remove)
+-  [Function `insert`](#0x1_vector_insert)
+-  [Function `swap_remove`](#0x1_vector_swap_remove)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Functions](#@Helper_Functions_2)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+The index into the vector is out of bounds
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_vector_empty"></a>
+
+## Function `empty`
+
+Create an empty vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th element of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_push_back"></a>
+
+## Function `push_back`
+
+Add element <code>e</code> to the end of the vector <code>v</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th element in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an element from the end of vector <code>v</code>.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap"></a>
+
+## Function `swap`
+
+Swaps the elements at the <code>i</code>th and <code>j</code>th indices in the vector <code>v</code>.
+Aborts if <code>i</code> or <code>j</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_singleton"></a>
+
+## Function `singleton`
+
+Return an vector of size one containing element <code>e</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> v = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> v, e);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == vec(e);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverses the order of the elements in the vector <code>v</code> in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>if</b> (len == 0) <b>return</b> ();
+
+    <b>let</b> front_index = 0;
+    <b>let</b> back_index = len -1;
+    <b>while</b> (front_index &lt; back_index) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, front_index, back_index);
+        front_index = front_index + 1;
+        back_index = back_index - 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_append"></a>
+
+## Function `append`
+
+Pushes all of the elements of the <code>other</code> vector into the <code>lhs</code> vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> other);
+    <b>while</b> (!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(&other)) <a href="vector.md#0x1_vector_push_back">push_back</a>(lhs, <a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no elements and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_contains"></a>
+
+## Function `contains`
+
+Return true if <code>e</code> is in the vector <code>v</code>.
+Otherwise, returns false.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> <b>true</b>;
+        i = i + 1;
+    };
+    <b>false</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_index_of"></a>
+
+## Function `index_of`
+
+Return <code>(<b>true</b>, i)</code> if <code>e</code> is in the vector <code>v</code> at index <code>i</code>.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> (<b>true</b>, i);
+        i = i + 1;
+    };
+    (<b>false</b>, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_remove"></a>
+
+## Function `remove`
+
+Remove the <code>i</code>th element of the vector <code>v</code>, shifting all subsequent elements.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i out of bounds; <b>abort</b>
+    <b>if</b> (i &gt;= len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    len = len - 1;
+    <b>while</b> (i &lt; len) <a href="vector.md#0x1_vector_swap">swap</a>(v, i, { i = i + 1; i });
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_insert"></a>
+
+## Function `insert`
+
+Insert <code>e</code> at position <code>i</code> in the vector <code>v</code>.
+If <code>i</code> is in bounds, this shifts the old <code>v[i]</code> and all subsequent elements to the right.
+If <code>i == <a href="vector.md#0x1_vector_length">length</a>(v)</code>, this adds <code>e</code> to the end of the vector.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i &gt; <a href="vector.md#0x1_vector_length">length</a>(v)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i too big <b>abort</b>
+    <b>if</b> (i &gt; len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(v, e);
+    <b>while</b> (i &lt; len) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, i, len);
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th element of the vector <code>v</code> with the last element and then pop the vector.
+This is O(1), but does not preserve ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>assert</b>!(!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(v), <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <b>let</b> last_idx = <a href="vector.md#0x1_vector_length">length</a>(v) - 1;
+    <a href="vector.md#0x1_vector_swap">swap</a>(v, i, last_idx);
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+<a name="@Helper_Functions_2"></a>
+
+### Helper Functions
+
+
+Check if <code>v1</code> is equal to the result of adding <code>e</code> at the end of <code>v2</code>
+
+
+<a name="0x1_vector_eq_push_back"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_push_back">eq_push_back</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element): bool {
+    len(v1) == len(v2) + 1 &&
+    v1[len(v1)-1] == e &&
+    v1[0..len(v1)-1] == v2[0..len(v2)]
+}
+</code></pre>
+
+
+Check if <code>v</code> is equal to the result of concatenating <code>v1</code> and <code>v2</code>
+
+
+<a name="0x1_vector_eq_append"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_append">eq_append</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v) == len(v1) + len(v2) &&
+    v[0..len(v1)] == v1 &&
+    v[len(v1)..len(v)] == v2
+}
+</code></pre>
+
+
+Check <code>v1</code> is equal to the result of removing the first element of <code>v2</code>
+
+
+<a name="0x1_vector_eq_pop_front"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_pop_front">eq_pop_front</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1 == v2[1..len(v2)]
+}
+</code></pre>
+
+
+Check that <code>v1</code> is equal to the result of removing the element at index <code>i</code> from <code>v2</code>.
+
+
+<a name="0x1_vector_eq_remove_elem_at_index"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_remove_elem_at_index">eq_remove_elem_at_index</a>&lt;Element&gt;(i: u64, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1[0..i] == v2[0..i] &&
+    v1[i..len(v1)] == v2[i + 1..len(v2)]
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v0/move-stdlib/error_description.errmap b/vendors/move/move-execution/v0/move-stdlib/error_description.errmap
new file mode 100644
index 000000000..9fa5c3ee6
Binary files /dev/null and b/vendors/move/move-execution/v0/move-stdlib/error_description.errmap differ
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/Move.toml b/vendors/move/move-execution/v0/move-stdlib/nursery/Move.toml
new file mode 100644
index 000000000..c7c3506ca
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveNursery"
+version = "1.5.0"
+
+[dependencies]
+MoveStdlib = { local = ".." }
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/acl.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/acl.md
new file mode 100644
index 000000000..23bef0dd6
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/acl.md
@@ -0,0 +1,205 @@
+
+<a name="0x1_acl"></a>
+
+# Module `0x1::acl`
+
+Access control list (ACL) module. An ACL is a list of account addresses who
+have the access permission to a certain object.
+This module uses a <code><a href="">vector</a></code> to represent the list, but can be refactored to
+use a "set" instead when it's available in the language in the future.
+
+
+-  [Struct `ACL`](#0x1_acl_ACL)
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_acl_empty)
+-  [Function `add`](#0x1_acl_add)
+-  [Function `remove`](#0x1_acl_remove)
+-  [Function `contains`](#0x1_acl_contains)
+-  [Function `assert_contains`](#0x1_acl_assert_contains)
+
+
+<pre><code><b>use</b> <a href="errors.md#0x1_errors">0x1::errors</a>;
+<b>use</b> <a href="">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_acl_ACL"></a>
+
+## Struct `ACL`
+
+
+
+<pre><code><b>struct</b> <a href="acl.md#0x1_acl_ACL">ACL</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>list: <a href="">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_acl_ECONTAIN"></a>
+
+The ACL already contains the address.
+
+
+<pre><code><b>const</b> <a href="acl.md#0x1_acl_ECONTAIN">ECONTAIN</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_acl_ENOT_CONTAIN"></a>
+
+The ACL does not contain the address.
+
+
+<pre><code><b>const</b> <a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_acl_empty"></a>
+
+## Function `empty`
+
+Return an empty ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_empty">empty</a>(): <a href="acl.md#0x1_acl_ACL">acl::ACL</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_empty">empty</a>(): <a href="acl.md#0x1_acl_ACL">ACL</a> {
+    <a href="acl.md#0x1_acl_ACL">ACL</a>{ list: <a href="_empty">vector::empty</a>&lt;<b>address</b>&gt;() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_acl_add"></a>
+
+## Function `add`
+
+Add the address to the ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_add">add</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_add">add</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>assert</b>!(!<a href="_contains">vector::contains</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, &addr), <a href="errors.md#0x1_errors_invalid_argument">errors::invalid_argument</a>(<a href="acl.md#0x1_acl_ECONTAIN">ECONTAIN</a>));
+    <a href="_push_back">vector::push_back</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_acl_remove"></a>
+
+## Function `remove`
+
+Remove the address from the ACL.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_remove">remove</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_remove">remove</a>(<a href="acl.md#0x1_acl">acl</a>: &<b>mut</b> <a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>let</b> (found, index) = <a href="_index_of">vector::index_of</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, &addr);
+    <b>assert</b>!(found, <a href="errors.md#0x1_errors_invalid_argument">errors::invalid_argument</a>(<a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>));
+    <a href="_remove">vector::remove</a>(&<b>mut</b> <a href="acl.md#0x1_acl">acl</a>.list, index);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_acl_contains"></a>
+
+## Function `contains`
+
+Return true iff the ACL contains the address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>): bool {
+    <a href="_contains">vector::contains</a>(&<a href="acl.md#0x1_acl">acl</a>.list, &addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_acl_assert_contains"></a>
+
+## Function `assert_contains`
+
+assert! that the ACL has the address.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_assert_contains">assert_contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">acl::ACL</a>, addr: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="acl.md#0x1_acl_assert_contains">assert_contains</a>(<a href="acl.md#0x1_acl">acl</a>: &<a href="acl.md#0x1_acl_ACL">ACL</a>, addr: <b>address</b>) {
+    <b>assert</b>!(<a href="acl.md#0x1_acl_contains">contains</a>(<a href="acl.md#0x1_acl">acl</a>, addr), <a href="errors.md#0x1_errors_invalid_argument">errors::invalid_argument</a>(<a href="acl.md#0x1_acl_ENOT_CONTAIN">ENOT_CONTAIN</a>));
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/capability.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/capability.md
new file mode 100644
index 000000000..312f5905b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/capability.md
@@ -0,0 +1,566 @@
+
+<a name="0x1_capability"></a>
+
+# Module `0x1::capability`
+
+A module which defines the basic concept of
+[*capabilities*](https://en.wikipedia.org/wiki/Capability-based_security) for managing access control.
+
+EXPERIMENTAL
+
+
+<a name="@Overview_0"></a>
+
+## Overview
+
+
+A capability is a unforgeable token which testifies that a signer has authorized a certain operation.
+The token is valid during the transaction where it is obtained. Since the type <code><a href="capability.md#0x1_capability_Cap">capability::Cap</a></code> has
+no ability to be stored in global memory, capabilities cannot leak out of a transaction. For every function
+called within a transaction which has a capability as a parameter, it is guaranteed that the capability
+has been obtained via a proper signer-based authorization step previously in the transaction's execution.
+
+
+<a name="@Usage_1"></a>
+
+### Usage
+
+
+Initializing and acquiring capabilities is usually encapsulated in a module with a type
+tag which can only be constructed by this module.
+
+```
+module Pkg::Feature {
+use std::capability::Cap;
+
+/// A type tag used in Cap<Feature>. Only this module can create an instance,
+/// and there is no public function other than Self::acquire which returns a value of this type.
+/// This way, this module has full control how Cap<Feature> is given out.
+struct Feature has drop {}
+
+/// Initializes this module.
+public fun initialize(s: &signer) {
+// Create capability. This happens once at module initialization time.
+// One needs to provide a witness for being the owner of Feature
+// in the 2nd parameter.
+<<additional conditions allowing to initialize this capability>>
+capability::create<Feature>(s, &Feature{});
+}
+
+/// Acquires the capability to work with this feature.
+public fun acquire(s: &signer): Cap<Feature> {
+<<additional conditions allowing to acquire this capability>>
+capability::acquire<Feature>(s, &Feature{});
+}
+
+/// Does something related to the feature. The caller must pass a Cap<Feature>.
+public fun do_something(_cap: Cap<Feature>) { ... }
+}
+```
+
+
+<a name="@Delegation_2"></a>
+
+### Delegation
+
+
+Capabilities come with the optional feature of *delegation*. Via <code><a href="capability.md#0x1_capability_delegate">Self::delegate</a></code>, an owner of a capability
+can designate another signer to be also capable of acquiring the capability. Like the original creator,
+the delegate needs to present his signer to obtain the capability in his transactions. Delegation can
+be revoked via <code><a href="capability.md#0x1_capability_revoke">Self::revoke</a></code>, removing this access right from the delegate.
+
+While the basic authorization mechanism for delegates is the same as with core capabilities, the
+target of delegation might be subject of restrictions which need to be specified and verified. This can
+be done via global invariants in the specification language. For example, in order to prevent delegation
+all together for a capability, one can use the following invariant:
+
+```
+invariant forall a: address where capability::spec_has_cap<Feature>(a):
+len(capability::spec_delegates<Feature>(a)) == 0;
+```
+
+Similarly, the following invariant would enforce that delegates, if existent, must satisfy a certain
+predicate:
+
+```
+invariant forall a: address where capability::spec_has_cap<Feature>(a):
+forall d in capability::spec_delegates<Feature>(a):
+is_valid_delegate_for_feature(d);
+```
+
+
+-  [Overview](#@Overview_0)
+    -  [Usage](#@Usage_1)
+    -  [Delegation](#@Delegation_2)
+-  [Struct `Cap`](#0x1_capability_Cap)
+-  [Struct `LinearCap`](#0x1_capability_LinearCap)
+-  [Resource `CapState`](#0x1_capability_CapState)
+-  [Resource `CapDelegateState`](#0x1_capability_CapDelegateState)
+-  [Constants](#@Constants_3)
+-  [Function `create`](#0x1_capability_create)
+-  [Function `acquire`](#0x1_capability_acquire)
+-  [Function `acquire_linear`](#0x1_capability_acquire_linear)
+-  [Function `validate_acquire`](#0x1_capability_validate_acquire)
+-  [Function `root_addr`](#0x1_capability_root_addr)
+-  [Function `linear_root_addr`](#0x1_capability_linear_root_addr)
+-  [Function `delegate`](#0x1_capability_delegate)
+-  [Function `revoke`](#0x1_capability_revoke)
+-  [Function `remove_element`](#0x1_capability_remove_element)
+-  [Function `add_element`](#0x1_capability_add_element)
+-  [Module Specification](#@Module_Specification_4)
+
+
+<pre><code><b>use</b> <a href="">0x1::error</a>;
+<b>use</b> <a href="">0x1::signer</a>;
+<b>use</b> <a href="">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_capability_Cap"></a>
+
+## Struct `Cap`
+
+The token representing an acquired capability. Cannot be stored in memory, but copied and dropped freely.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_capability_LinearCap"></a>
+
+## Struct `LinearCap`
+
+A linear version of a capability token. This can be used if an acquired capability should be enforced
+to be used only once for an authorization.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt; <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_capability_CapState"></a>
+
+## Resource `CapState`
+
+An internal data structure for representing a configured capability.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>delegates: <a href="">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_capability_CapDelegateState"></a>
+
+## Resource `CapDelegateState`
+
+An internal data structure for representing a configured delegated capability.
+
+
+<pre><code><b>struct</b> <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>root: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_3"></a>
+
+## Constants
+
+
+<a name="0x1_capability_ECAP"></a>
+
+
+
+<pre><code><b>const</b> <a href="capability.md#0x1_capability_ECAP">ECAP</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_capability_EDELEGATE"></a>
+
+
+
+<pre><code><b>const</b> <a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_capability_create"></a>
+
+## Function `create`
+
+Creates a new capability class, owned by the passed signer. A caller must pass a witness that
+they own the <code>Feature</code> type parameter.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="">signer</a>, _feature_witness: &Feature)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="">signer</a>, _feature_witness: &Feature) {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
+    <b>move_to</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(owner, <a href="capability.md#0x1_capability_CapState">CapState</a>{ delegates: <a href="_empty">vector::empty</a>() });
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_acquire"></a>
+
+## Function `acquire`
+
+Acquires a capability token. Only the owner of the capability class, or an authorized delegate,
+can succeed with this operation. A caller must pass a witness that they own the <code>Feature</code> type
+parameter.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire">acquire</a>&lt;Feature&gt;(requester: &<a href="">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire">acquire</a>&lt;Feature&gt;(requester: &<a href="">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;{root: <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_acquire_linear"></a>
+
+## Function `acquire_linear`
+
+Acquires a linear capability token. It is up to the module which owns <code>Feature</code> to decide
+whether to expose a linear or non-linear capability.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire_linear">acquire_linear</a>&lt;Feature&gt;(requester: &<a href="">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_LinearCap">capability::LinearCap</a>&lt;Feature&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_acquire_linear">acquire_linear</a>&lt;Feature&gt;(requester: &<a href="">signer</a>, _feature_witness: &Feature): <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt;
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt;{root: <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_validate_acquire"></a>
+
+## Function `validate_acquire`
+
+Helper to validate an acquire. Returns the root address of the capability.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester: &<a href="">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_validate_acquire">validate_acquire</a>&lt;Feature&gt;(requester: &<a href="">signer</a>): <b>address</b>
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(requester);
+    <b>if</b> (<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)) {
+        <b>let</b> root_addr = <b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root;
+        // double check that requester is actually registered <b>as</b> a delegate
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr), <a href="_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+        <b>assert</b>!(<a href="_contains">vector::contains</a>(&<b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr).delegates, &addr),
+               <a href="_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+        root_addr
+    } <b>else</b> {
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
+        addr
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_root_addr"></a>
+
+## Function `root_addr`
+
+Returns the root address associated with the given capability token. Only the owner
+of the feature can do this.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_root_addr">root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_root_addr">root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b> {
+    cap.root
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_linear_root_addr"></a>
+
+## Function `linear_root_addr`
+
+Returns the root address associated with the given linear capability token.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_linear_root_addr">linear_root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_LinearCap">capability::LinearCap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_linear_root_addr">linear_root_addr</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_LinearCap">LinearCap</a>&lt;Feature&gt;, _feature_witness: &Feature): <b>address</b> {
+    cap.root
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_delegate"></a>
+
+## Function `delegate`
+
+Registers a delegation relation. If the relation already exists, this function does
+nothing.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_delegate">delegate</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, <b>to</b>: &<a href="">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_delegate">delegate</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, <b>to</b>: &<a href="">signer</a>)
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(<b>to</b>);
+    <b>if</b> (<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)) <b>return</b>;
+    <b>move_to</b>(<b>to</b>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;{root: cap.root});
+    <a href="capability.md#0x1_capability_add_element">add_element</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(cap.root).delegates, addr);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_revoke"></a>
+
+## Function `revoke`
+
+Revokes a delegation relation. If no relation exists, this function does nothing.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_revoke">revoke</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">capability::Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, from: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_revoke">revoke</a>&lt;Feature&gt;(cap: <a href="capability.md#0x1_capability_Cap">Cap</a>&lt;Feature&gt;, _feature_witness: &Feature, from: <b>address</b>)
+<b>acquires</b> <a href="capability.md#0x1_capability_CapState">CapState</a>, <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>
+{
+    <b>if</b> (!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(from)) <b>return</b>;
+    <b>let</b> <a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>{root: _root} = <b>move_from</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(from);
+    <a href="capability.md#0x1_capability_remove_element">remove_element</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(cap.root).delegates, &from);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_remove_element"></a>
+
+## Function `remove_element`
+
+Helper to remove an element from a vector.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: &E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: &E) {
+    <b>let</b> (found, index) = <a href="_index_of">vector::index_of</a>(v, x);
+    <b>if</b> (found) {
+        <a href="_remove">vector::remove</a>(v, index);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_capability_add_element"></a>
+
+## Function `add_element`
+
+Helper to add an element to a vector.
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: E) {
+    <b>if</b> (!<a href="_contains">vector::contains</a>(v, &x)) {
+        <a href="_push_back">vector::push_back</a>(v, x)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_4"></a>
+
+## Module Specification
+
+Helper specification function to check whether a capability exists at address.
+
+
+<a name="0x1_capability_spec_has_cap"></a>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_spec_has_cap">spec_has_cap</a>&lt;Feature&gt;(addr: <b>address</b>): bool {
+   <b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr)
+}
+</code></pre>
+
+
+Helper specification function to obtain the delegates of a capability.
+
+
+<a name="0x1_capability_spec_delegates"></a>
+
+
+<pre><code><b>fun</b> <a href="capability.md#0x1_capability_spec_delegates">spec_delegates</a>&lt;Feature&gt;(addr: <b>address</b>): <a href="">vector</a>&lt;<b>address</b>&gt; {
+   <b>global</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr).delegates
+}
+</code></pre>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/compare.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/compare.md
new file mode 100644
index 000000000..d00052766
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/compare.md
@@ -0,0 +1,171 @@
+
+<a name="0x1_compare"></a>
+
+# Module `0x1::compare`
+
+Utilities for comparing Move values based on their representation in BCS.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `cmp_bcs_bytes`](#0x1_compare_cmp_bcs_bytes)
+-  [Function `cmp_u8`](#0x1_compare_cmp_u8)
+-  [Function `cmp_u64`](#0x1_compare_cmp_u64)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_compare_EQUAL"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>: u8 = 0;
+</code></pre>
+
+
+
+<a name="0x1_compare_GREATER_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>: u8 = 2;
+</code></pre>
+
+
+
+<a name="0x1_compare_LESS_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>: u8 = 1;
+</code></pre>
+
+
+
+<a name="0x1_compare_cmp_bcs_bytes"></a>
+
+## Function `cmp_bcs_bytes`
+
+compare vectors <code>v1</code> and <code>v2</code> using (1) vector contents from right to left and then
+(2) vector length to break ties.
+Returns either <code><a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> (0u8), <code><a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (1u8), or <code><a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code> (2u8).
+
+This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+(i.e., vectors produced by <code><a href="_to_bytes">bcs::to_bytes</a></code>). A typical client will call
+<code><a href="compare.md#0x1_compare_cmp_bcs_bytes">compare::cmp_bcs_bytes</a>(<a href="_to_bytes">bcs::to_bytes</a>(&t1), <a href="_to_bytes">bcs::to_bytes</a>(&t2))</code>. The comparison provides the
+following guarantees w.r.t the original values t1 and t2:
+- <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(<a href="">bcs</a>(t1), <a href="">bcs</a>(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(t2, t1) == <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code>
+- <code>compare::cmp&lt;T&gt;(t1, t2) == <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 == t2</code> and (similarly)
+<code>compare::cmp&lt;T&gt;(t1, t2) != <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 != t2</code>, where <code>==</code> and <code>!=</code> denote the Move
+bytecode operations for polymorphic equality.
+- for all primitive types <code>T</code> with <code>&lt;</code> and <code>&gt;</code> comparison operators exposed in Move bytecode
+(<code>u8</code>, <code>u16</code>, <code>u32</code>, <code>u64</code>, <code>u128</code>, <code>u256</code>), we have
+<code>compare_bcs_bytes(<a href="">bcs</a>(t1), <a href="">bcs</a>(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &lt; t2</code> and (similarly)
+<code>compare_bcs_bytes(<a href="">bcs</a>(t1), <a href="">bcs</a>(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &gt; t2</code>.
+
+For all other types, the order is whatever the BCS encoding of the type and the comparison
+strategy above gives you. One case where the order might be surprising is the <code><b>address</b></code>
+type.
+CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+to left, byte-by-byte comparison means that (for example)
+<code>compare_bcs_bytes(<a href="">bcs</a>(0x01), <a href="">bcs</a>(0x10)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you'd expect), but
+<code>compare_bcs_bytes(<a href="">bcs</a>(0x100), <a href="">bcs</a>(0x001)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you probably wouldn't expect).
+Keep this in mind when using this function to compare addresses.
+
+> TODO: there is currently no specification for this function, which causes no problem because it is not yet
+> used in the Diem framework. However, should this functionality be needed in specification, a customized
+> native abstraction is needed in the prover framework.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8 {
+    <b>let</b> i1 = <a href="_length">vector::length</a>(v1);
+    <b>let</b> i2 = <a href="_length">vector::length</a>(v2);
+    <b>let</b> len_cmp = <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1, i2);
+
+    // BCS uses little endian encoding for all integer types, so we <b>choose</b> <b>to</b> <a href="compare.md#0x1_compare">compare</a> from left
+    // <b>to</b> right. Going right <b>to</b> left would make the behavior of compare::cmp diverge from the
+    // bytecode operators &lt; and &gt; on integer values (which would be confusing).
+    <b>while</b> (i1 &gt; 0 && i2 &gt; 0) {
+        i1 = i1 - 1;
+        i2 = i2 - 1;
+        <b>let</b> elem_cmp = <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(*<a href="_borrow">vector::borrow</a>(v1, i1), *<a href="_borrow">vector::borrow</a>(v2, i2));
+        <b>if</b> (elem_cmp != 0) <b>return</b> elem_cmp
+        // <b>else</b>, <a href="compare.md#0x1_compare">compare</a> next element
+    };
+    // all compared elements equal; <b>use</b> length comparion <b>to</b> <b>break</b> the tie
+    len_cmp
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u8"></a>
+
+## Function `cmp_u8`
+
+Compare two <code>u8</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u64"></a>
+
+## Function `cmp_u64`
+
+Compare two <code>u64</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/debug.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/debug.md
new file mode 100644
index 000000000..33bd18df1
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/debug.md
@@ -0,0 +1,61 @@
+
+<a name="0x1_debug"></a>
+
+# Module `0x1::debug`
+
+Module providing debug functionality.
+
+
+-  [Function `print`](#0x1_debug_print)
+-  [Function `print_stack_trace`](#0x1_debug_print_stack_trace)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_debug_print"></a>
+
+## Function `print`
+
+Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_debug_print_stack_trace"></a>
+
+## Function `print_stack_trace`
+
+Prints the calling function's stack trace.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>();
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/errors.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/errors.md
new file mode 100644
index 000000000..bd80c4811
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/errors.md
@@ -0,0 +1,548 @@
+
+<a name="0x1_errors"></a>
+
+# Module `0x1::errors`
+
+Module defining error codes used in Move aborts throughout the framework.
+
+A <code>u64</code> error code is constructed from two values:
+
+1. The *error category* which is encoded in the lower 8 bits of the code. Error categories are
+declared in this module and are globally unique across the Diem framework. There is a limited
+fixed set of predefined categories, and the framework is guaranteed to use those consistently.
+
+2. The *error reason* which is encoded in the remaining 56 bits of the code. The reason is a unique
+number relative to the module which raised the error and can be used to obtain more information about
+the error at hand. It is mostly used for diagnosis purposes. Error reasons may change over time as the
+framework evolves.
+
+>TODO: determine what kind of stability guarantees we give about reasons/associated module.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `make`](#0x1_errors_make)
+-  [Function `invalid_state`](#0x1_errors_invalid_state)
+-  [Function `requires_address`](#0x1_errors_requires_address)
+-  [Function `requires_role`](#0x1_errors_requires_role)
+-  [Function `requires_capability`](#0x1_errors_requires_capability)
+-  [Function `not_published`](#0x1_errors_not_published)
+-  [Function `already_published`](#0x1_errors_already_published)
+-  [Function `invalid_argument`](#0x1_errors_invalid_argument)
+-  [Function `limit_exceeded`](#0x1_errors_limit_exceeded)
+-  [Function `internal`](#0x1_errors_internal)
+-  [Function `custom`](#0x1_errors_custom)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_errors_ALREADY_PUBLISHED"></a>
+
+Attempting to publish a resource that is already published. Example: calling an initialization function
+twice.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_ALREADY_PUBLISHED">ALREADY_PUBLISHED</a>: u8 = 6;
+</code></pre>
+
+
+
+<a name="0x1_errors_CUSTOM"></a>
+
+A custom error category for extension points.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_CUSTOM">CUSTOM</a>: u8 = 255;
+</code></pre>
+
+
+
+<a name="0x1_errors_INTERNAL"></a>
+
+An internal error (bug) has occurred.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_INTERNAL">INTERNAL</a>: u8 = 10;
+</code></pre>
+
+
+
+<a name="0x1_errors_INVALID_ARGUMENT"></a>
+
+An argument provided to an operation is invalid. Example: a signing key has the wrong format.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u8 = 7;
+</code></pre>
+
+
+
+<a name="0x1_errors_INVALID_STATE"></a>
+
+The system is in a state where the performed operation is not allowed. Example: call to a function only allowed
+in genesis.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_INVALID_STATE">INVALID_STATE</a>: u8 = 1;
+</code></pre>
+
+
+
+<a name="0x1_errors_LIMIT_EXCEEDED"></a>
+
+A limit on an amount, e.g. a currency, is exceeded. Example: withdrawal of money after account limits window
+is exhausted.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_LIMIT_EXCEEDED">LIMIT_EXCEEDED</a>: u8 = 8;
+</code></pre>
+
+
+
+<a name="0x1_errors_NOT_PUBLISHED"></a>
+
+A resource is required but not published. Example: access to non-existing AccountLimits resource.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_NOT_PUBLISHED">NOT_PUBLISHED</a>: u8 = 5;
+</code></pre>
+
+
+
+<a name="0x1_errors_REQUIRES_ADDRESS"></a>
+
+The signer of a transaction does not have the expected address for this operation. Example: a call to a function
+which publishes a resource under a particular address.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_REQUIRES_ADDRESS">REQUIRES_ADDRESS</a>: u8 = 2;
+</code></pre>
+
+
+
+<a name="0x1_errors_REQUIRES_CAPABILITY"></a>
+
+The signer of a transaction does not have a required capability.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_REQUIRES_CAPABILITY">REQUIRES_CAPABILITY</a>: u8 = 4;
+</code></pre>
+
+
+
+<a name="0x1_errors_REQUIRES_ROLE"></a>
+
+The signer of a transaction does not have the expected  role for this operation. Example: a call to a function
+which requires the signer to have the role of treasury compliance.
+
+
+<pre><code><b>const</b> <a href="errors.md#0x1_errors_REQUIRES_ROLE">REQUIRES_ROLE</a>: u8 = 3;
+</code></pre>
+
+
+
+<a name="0x1_errors_make"></a>
+
+## Function `make`
+
+A function to create an error from from a category and a reason.
+
+
+<pre><code><b>fun</b> <a href="errors.md#0x1_errors_make">make</a>(category: u8, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="errors.md#0x1_errors_make">make</a>(category: u8, reason: u64): u64 {
+    (category <b>as</b> u64) + (reason &lt;&lt; 8)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>ensures</b> [concrete] result == category + (reason &lt;&lt; 8) % (1 &lt;&lt; 64);
+<b>aborts_if</b> [abstract] <b>false</b>;
+<b>ensures</b> [abstract] result == category;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_invalid_state">invalid_state</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_invalid_state">invalid_state</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_INVALID_STATE">INVALID_STATE</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_INVALID_STATE">INVALID_STATE</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_requires_address"></a>
+
+## Function `requires_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_address">requires_address</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_address">requires_address</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_REQUIRES_ADDRESS">REQUIRES_ADDRESS</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_REQUIRES_ADDRESS">REQUIRES_ADDRESS</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_requires_role"></a>
+
+## Function `requires_role`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_role">requires_role</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_role">requires_role</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_REQUIRES_ROLE">REQUIRES_ROLE</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_REQUIRES_ROLE">REQUIRES_ROLE</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_requires_capability"></a>
+
+## Function `requires_capability`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_capability">requires_capability</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_requires_capability">requires_capability</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_REQUIRES_CAPABILITY">REQUIRES_CAPABILITY</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_REQUIRES_CAPABILITY">REQUIRES_CAPABILITY</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_not_published"></a>
+
+## Function `not_published`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_not_published">not_published</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_not_published">not_published</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_NOT_PUBLISHED">NOT_PUBLISHED</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_NOT_PUBLISHED">NOT_PUBLISHED</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_already_published"></a>
+
+## Function `already_published`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_already_published">already_published</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_already_published">already_published</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_ALREADY_PUBLISHED">ALREADY_PUBLISHED</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_ALREADY_PUBLISHED">ALREADY_PUBLISHED</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_invalid_argument">invalid_argument</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_invalid_argument">invalid_argument</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_INVALID_ARGUMENT">INVALID_ARGUMENT</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_limit_exceeded"></a>
+
+## Function `limit_exceeded`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_limit_exceeded">limit_exceeded</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_limit_exceeded">limit_exceeded</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_LIMIT_EXCEEDED">LIMIT_EXCEEDED</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_LIMIT_EXCEEDED">LIMIT_EXCEEDED</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_INTERNAL">INTERNAL</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_INTERNAL">INTERNAL</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_errors_custom"></a>
+
+## Function `custom`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_custom">custom</a>(reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="errors.md#0x1_errors_custom">custom</a>(reason: u64): u64 { <a href="errors.md#0x1_errors_make">make</a>(<a href="errors.md#0x1_errors_CUSTOM">CUSTOM</a>, reason) }
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque = <b>true</b>;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="errors.md#0x1_errors_CUSTOM">CUSTOM</a>;
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/event.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/event.md
new file mode 100644
index 000000000..9b20932b8
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/event.md
@@ -0,0 +1,288 @@
+
+<a name="0x1_event"></a>
+
+# Module `0x1::event`
+
+The Event module defines an <code><a href="event.md#0x1_event_EventHandleGenerator">EventHandleGenerator</a></code> that is used to create
+<code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code>s with unique GUIDs. It contains a counter for the number
+of <code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code>s it generates. An <code><a href="event.md#0x1_event_EventHandle">EventHandle</a></code> is used to count the number of
+events emitted to a handle and emit events to the event store.
+
+
+-  [Struct `GUIDWrapper`](#0x1_event_GUIDWrapper)
+-  [Struct `EventHandle`](#0x1_event_EventHandle)
+-  [Resource `EventHandleGenerator`](#0x1_event_EventHandleGenerator)
+-  [Function `new_event_handle`](#0x1_event_new_event_handle)
+-  [Function `emit_event`](#0x1_event_emit_event)
+-  [Function `guid`](#0x1_event_guid)
+-  [Function `write_to_event_store`](#0x1_event_write_to_event_store)
+-  [Function `destroy_handle`](#0x1_event_destroy_handle)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code><b>use</b> <a href="">0x1::bcs</a>;
+<b>use</b> <a href="guid.md#0x1_guid">0x1::guid</a>;
+</code></pre>
+
+
+
+<a name="0x1_event_GUIDWrapper"></a>
+
+## Struct `GUIDWrapper`
+
+Wrapper for a GUID for layout compatibility with legacy EventHandle id's
+
+
+<pre><code><b>struct</b> <a href="event.md#0x1_event_GUIDWrapper">GUIDWrapper</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>len_bytes: u8</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code><a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_GUID">guid::GUID</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_event_EventHandle"></a>
+
+## Struct `EventHandle`
+
+A handle for an event such that:
+1. Other modules can emit events to this handle.
+2. Storage can use this handle to prove the total number of events that happened in the past.
+
+
+<pre><code><b>struct</b> <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T: drop, store&gt; <b>has</b> store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>counter: u64</code>
+</dt>
+<dd>
+ Total number of events emitted to this event stream.
+</dd>
+<dt>
+<code><a href="guid.md#0x1_guid">guid</a>: <a href="event.md#0x1_event_GUIDWrapper">event::GUIDWrapper</a></code>
+</dt>
+<dd>
+ A globally unique ID for this event stream.
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_event_EventHandleGenerator"></a>
+
+## Resource `EventHandleGenerator`
+
+Deprecated. Only kept around so Diem clients know how to deserialize existing EventHandleGenerator's
+
+
+<pre><code><b>struct</b> <a href="event.md#0x1_event_EventHandleGenerator">EventHandleGenerator</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>counter: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_event_new_event_handle"></a>
+
+## Function `new_event_handle`
+
+Use EventHandleGenerator to generate a unique event handle for <code>sig</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_new_event_handle">new_event_handle</a>&lt;T: drop, store&gt;(account: &<a href="">signer</a>): <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_new_event_handle">new_event_handle</a>&lt;T: drop + store&gt;(account: &<a href="">signer</a>): <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; {
+    // must be 24 for compatibility <b>with</b> legacy Event ID's--see comment on <a href="event.md#0x1_event_GUIDWrapper">GUIDWrapper</a>
+    <b>let</b> len_bytes = 24u8;
+     <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; {
+        counter: 0,
+        <a href="guid.md#0x1_guid">guid</a>: <a href="event.md#0x1_event_GUIDWrapper">GUIDWrapper</a> { len_bytes, <a href="guid.md#0x1_guid">guid</a>: <a href="guid.md#0x1_guid_create">guid::create</a>(account) }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_event_emit_event"></a>
+
+## Function `emit_event`
+
+Emit an event with payload <code>msg</code> by using <code>handle_ref</code>'s key and counter.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit_event">emit_event</a>&lt;T: drop, store&gt;(handle_ref: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;, msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_emit_event">emit_event</a>&lt;T: drop + store&gt;(handle_ref: &<b>mut</b> <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;, msg: T) {
+    <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T&gt;(<a href="_to_bytes">bcs::to_bytes</a>(&handle_ref.<a href="guid.md#0x1_guid">guid</a>.<a href="guid.md#0x1_guid">guid</a>), handle_ref.counter, msg);
+    handle_ref.counter = handle_ref.counter + 1;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_event_guid"></a>
+
+## Function `guid`
+
+Return the GUIID associated with this EventHandle
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid">guid</a>&lt;T: drop, store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;): &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid">guid</a>&lt;T: drop + store&gt;(handle_ref: &<a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;): &GUID {
+    &handle_ref.<a href="guid.md#0x1_guid">guid</a>.<a href="guid.md#0x1_guid">guid</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_event_write_to_event_store"></a>
+
+## Function `write_to_event_store`
+
+Log <code>msg</code> as the <code>count</code>th event associated with the event stream identified by <code><a href="guid.md#0x1_guid">guid</a></code>
+
+
+<pre><code><b>fun</b> <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T: drop, store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="">vector</a>&lt;u8&gt;, count: u64, msg: T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="event.md#0x1_event_write_to_event_store">write_to_event_store</a>&lt;T: drop + store&gt;(<a href="guid.md#0x1_guid">guid</a>: <a href="">vector</a>&lt;u8&gt;, count: u64, msg: T);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_event_destroy_handle"></a>
+
+## Function `destroy_handle`
+
+Destroy a unique handle.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_destroy_handle">destroy_handle</a>&lt;T: drop, store&gt;(handle: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;T&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="event.md#0x1_event_destroy_handle">destroy_handle</a>&lt;T: drop + store&gt;(handle: <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;) {
+    <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt; { counter: _, <a href="guid.md#0x1_guid">guid</a>: _ } = handle;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+
+
+Functions of the event module are mocked out using the intrinsic
+pragma. They are implemented in the prover's prelude.
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+Determines equality between the guids of two event handles. Since fields of intrinsic
+structs cannot be accessed, this function is provided.
+
+
+<a name="0x1_event_spec_guid_eq"></a>
+
+
+<pre><code><b>fun</b> <a href="event.md#0x1_event_spec_guid_eq">spec_guid_eq</a>&lt;T&gt;(h1: <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;, h2: <a href="event.md#0x1_event_EventHandle">EventHandle</a>&lt;T&gt;): bool {
+    // The implementation currently can just <b>use</b> <b>native</b> equality since the mocked prover
+    // representation does not have the `counter` field.
+    h1 == h2
+}
+</code></pre>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/guid.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/guid.md
new file mode 100644
index 000000000..f1a592059
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/guid.md
@@ -0,0 +1,505 @@
+
+<a name="0x1_guid"></a>
+
+# Module `0x1::guid`
+
+A module for generating globally unique identifiers
+
+
+-  [Resource `Generator`](#0x1_guid_Generator)
+-  [Struct `GUID`](#0x1_guid_GUID)
+-  [Struct `ID`](#0x1_guid_ID)
+-  [Resource `CreateCapability`](#0x1_guid_CreateCapability)
+-  [Constants](#@Constants_0)
+-  [Function `gen_create_capability`](#0x1_guid_gen_create_capability)
+-  [Function `create_id`](#0x1_guid_create_id)
+-  [Function `create_with_capability`](#0x1_guid_create_with_capability)
+-  [Function `create`](#0x1_guid_create)
+-  [Function `create_impl`](#0x1_guid_create_impl)
+-  [Function `publish_generator`](#0x1_guid_publish_generator)
+-  [Function `id`](#0x1_guid_id)
+-  [Function `creator_address`](#0x1_guid_creator_address)
+-  [Function `id_creator_address`](#0x1_guid_id_creator_address)
+-  [Function `creation_num`](#0x1_guid_creation_num)
+-  [Function `id_creation_num`](#0x1_guid_id_creation_num)
+-  [Function `eq_id`](#0x1_guid_eq_id)
+-  [Function `get_next_creation_num`](#0x1_guid_get_next_creation_num)
+
+
+<pre><code><b>use</b> <a href="">0x1::signer</a>;
+</code></pre>
+
+
+
+<a name="0x1_guid_Generator"></a>
+
+## Resource `Generator`
+
+A generator for new GUIDs.
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_Generator">Generator</a> <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>counter: u64</code>
+</dt>
+<dd>
+ A monotonically increasing counter
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_guid_GUID"></a>
+
+## Struct `GUID`
+
+A globally unique identifier derived from the sender's address and a counter
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_GUID">GUID</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>id: <a href="guid.md#0x1_guid_ID">guid::ID</a></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_guid_ID"></a>
+
+## Struct `ID`
+
+A non-privileged identifier that can be freely created by anyone. Useful for looking up GUID's.
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_ID">ID</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>creation_num: u64</code>
+</dt>
+<dd>
+ If creation_num is <code>i</code>, this is the <code>i+1</code>th GUID created by <code>addr</code>
+</dd>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+ Address that created the GUID
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_guid_CreateCapability"></a>
+
+## Resource `CreateCapability`
+
+A capability to create a privileged identifier on behalf of the given address
+
+
+<pre><code><b>struct</b> <a href="guid.md#0x1_guid_CreateCapability">CreateCapability</a> <b>has</b> drop, store, key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>addr: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_guid_EGUID_GENERATOR_NOT_PUBLISHED"></a>
+
+GUID generator must be published ahead of first usage of <code>create_with_capability</code> function.
+
+
+<pre><code><b>const</b> <a href="guid.md#0x1_guid_EGUID_GENERATOR_NOT_PUBLISHED">EGUID_GENERATOR_NOT_PUBLISHED</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_guid_gen_create_capability"></a>
+
+## Function `gen_create_capability`
+
+Generates a capability to create the privileged GUID on behalf of the signer
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_gen_create_capability">gen_create_capability</a>(account: &<a href="">signer</a>): <a href="guid.md#0x1_guid_CreateCapability">guid::CreateCapability</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_gen_create_capability">gen_create_capability</a>(account: &<a href="">signer</a>): <a href="guid.md#0x1_guid_CreateCapability">CreateCapability</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(account);
+    <b>if</b> (!<b>exists</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr)) {
+        <b>move_to</b>(account, <a href="guid.md#0x1_guid_Generator">Generator</a> { counter: 0 })
+    };
+    <a href="guid.md#0x1_guid_CreateCapability">CreateCapability</a> { addr }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_create_id"></a>
+
+## Function `create_id`
+
+Create a non-privileged id from <code>addr</code> and <code>creation_num</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_id">create_id</a>(addr: <b>address</b>, creation_num: u64): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_id">create_id</a>(addr: <b>address</b>, creation_num: u64): <a href="guid.md#0x1_guid_ID">ID</a> {
+    <a href="guid.md#0x1_guid_ID">ID</a> { creation_num, addr }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_create_with_capability"></a>
+
+## Function `create_with_capability`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_with_capability">create_with_capability</a>(addr: <b>address</b>, _cap: &<a href="guid.md#0x1_guid_CreateCapability">guid::CreateCapability</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create_with_capability">create_with_capability</a>(addr: <b>address</b>, _cap: &<a href="guid.md#0x1_guid_CreateCapability">CreateCapability</a>): <a href="guid.md#0x1_guid_GUID">GUID</a> <b>acquires</b> <a href="guid.md#0x1_guid_Generator">Generator</a> {
+    <b>assert</b>!(<b>exists</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr), <a href="guid.md#0x1_guid_EGUID_GENERATOR_NOT_PUBLISHED">EGUID_GENERATOR_NOT_PUBLISHED</a>);
+    <a href="guid.md#0x1_guid_create_impl">create_impl</a>(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_create"></a>
+
+## Function `create`
+
+Create and return a new GUID. Creates a <code><a href="guid.md#0x1_guid_Generator">Generator</a></code> under <code>account</code>
+if it does not already have one
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create">create</a>(account: &<a href="">signer</a>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_create">create</a>(account: &<a href="">signer</a>): <a href="guid.md#0x1_guid_GUID">GUID</a> <b>acquires</b> <a href="guid.md#0x1_guid_Generator">Generator</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(account);
+    <b>if</b> (!<b>exists</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr)) {
+        <b>move_to</b>(account, <a href="guid.md#0x1_guid_Generator">Generator</a> { counter: 0 })
+    };
+    <a href="guid.md#0x1_guid_create_impl">create_impl</a>(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_create_impl"></a>
+
+## Function `create_impl`
+
+
+
+<pre><code><b>fun</b> <a href="guid.md#0x1_guid_create_impl">create_impl</a>(addr: <b>address</b>): <a href="guid.md#0x1_guid_GUID">guid::GUID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="guid.md#0x1_guid_create_impl">create_impl</a>(addr: <b>address</b>): <a href="guid.md#0x1_guid_GUID">GUID</a> <b>acquires</b> <a href="guid.md#0x1_guid_Generator">Generator</a> {
+    <b>let</b> generator = <b>borrow_global_mut</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr);
+    <b>let</b> creation_num = generator.counter;
+    generator.counter = creation_num + 1;
+    <a href="guid.md#0x1_guid_GUID">GUID</a> { id: <a href="guid.md#0x1_guid_ID">ID</a> { creation_num, addr } }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_publish_generator"></a>
+
+## Function `publish_generator`
+
+Publish a Generator resource under <code>account</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_publish_generator">publish_generator</a>(account: &<a href="">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_publish_generator">publish_generator</a>(account: &<a href="">signer</a>) {
+    <b>move_to</b>(account, <a href="guid.md#0x1_guid_Generator">Generator</a> { counter: 0 })
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_id"></a>
+
+## Function `id`
+
+Get the non-privileged ID associated with a GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id">id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <a href="guid.md#0x1_guid_ID">guid::ID</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id">id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): <a href="guid.md#0x1_guid_ID">ID</a> {
+    *&<a href="guid.md#0x1_guid">guid</a>.id
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_creator_address"></a>
+
+## Function `creator_address`
+
+Return the account address that created the GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creator_address">creator_address</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creator_address">creator_address</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): <b>address</b> {
+    <a href="guid.md#0x1_guid">guid</a>.id.addr
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_id_creator_address"></a>
+
+## Function `id_creator_address`
+
+Return the account address that created the guid::ID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creator_address">id_creator_address</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creator_address">id_creator_address</a>(id: &<a href="guid.md#0x1_guid_ID">ID</a>): <b>address</b> {
+    id.addr
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_creation_num"></a>
+
+## Function `creation_num`
+
+Return the creation number associated with the GUID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creation_num">creation_num</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_creation_num">creation_num</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>): u64 {
+    <a href="guid.md#0x1_guid">guid</a>.id.creation_num
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_id_creation_num"></a>
+
+## Function `id_creation_num`
+
+Return the creation number associated with the guid::ID
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creation_num">id_creation_num</a>(id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_id_creation_num">id_creation_num</a>(id: &<a href="guid.md#0x1_guid_ID">ID</a>): u64 {
+    id.creation_num
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_eq_id"></a>
+
+## Function `eq_id`
+
+Return true if the GUID's ID is <code>id</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_eq_id">eq_id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">guid::GUID</a>, id: &<a href="guid.md#0x1_guid_ID">guid::ID</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_eq_id">eq_id</a>(<a href="guid.md#0x1_guid">guid</a>: &<a href="guid.md#0x1_guid_GUID">GUID</a>, id: &<a href="guid.md#0x1_guid_ID">ID</a>): bool {
+    &<a href="guid.md#0x1_guid">guid</a>.id == id
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_guid_get_next_creation_num"></a>
+
+## Function `get_next_creation_num`
+
+Return the number of the next GUID to be created by <code>addr</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_get_next_creation_num">get_next_creation_num</a>(addr: <b>address</b>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="guid.md#0x1_guid_get_next_creation_num">get_next_creation_num</a>(addr: <b>address</b>): u64 <b>acquires</b> <a href="guid.md#0x1_guid_Generator">Generator</a> {
+    <b>if</b> (!<b>exists</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr)) {
+        0
+    } <b>else</b> {
+        <b>borrow_global</b>&lt;<a href="guid.md#0x1_guid_Generator">Generator</a>&gt;(addr).counter
+    }
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/offer.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/offer.md
new file mode 100644
index 000000000..59238b544
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/offer.md
@@ -0,0 +1,371 @@
+
+<a name="0x1_offer"></a>
+
+# Module `0x1::offer`
+
+Provides a way to transfer structs from one account to another in two transactions.
+Unlike many languages, Move cannot move data from one account to another with
+single-signer transactions. As of this writing, ordinary transactions can only have
+a single signer, and Move code can only store to an address (via <code><b>move_to</b></code>) if it
+can supply a reference to a signer for the destination address (there are special case
+exceptions in Genesis and DiemAccount where there can temporarily be multiple signers).
+
+Offer solves this problem by providing an <code><a href="offer.md#0x1_offer_Offer">Offer</a></code> resource.  To move a struct <code>T</code> from
+account A to B, account A first publishes an <code><a href="offer.md#0x1_offer_Offer">Offer</a>&lt;T&gt;</code> resource at <code><a href="offer.md#0x1_offer_address_of">address_of</a>(A)</code>,
+using the <code><a href="offer.md#0x1_offer_create">offer::create</a></code> function.
+Then account B, in a separate transaction, can move the struct <code>T</code> from the <code><a href="offer.md#0x1_offer_Offer">Offer</a></code> at
+A's address to the desired destination. B accesses the resource using the <code>redeem</code> function,
+which aborts unless the <code>for</code> field is B's address (preventing other addresses from
+accessing the <code>T</code> that is intended only for B). A can also redeem the <code>T</code> value if B hasn't
+redeemed it.
+
+
+-  [Resource `Offer`](#0x1_offer_Offer)
+-  [Constants](#@Constants_0)
+-  [Function `create`](#0x1_offer_create)
+-  [Function `redeem`](#0x1_offer_redeem)
+-  [Function `exists_at`](#0x1_offer_exists_at)
+-  [Function `address_of`](#0x1_offer_address_of)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Access Control](#@Access_Control_2)
+        -  [Creation of Offers](#@Creation_of_Offers_3)
+        -  [Removal of Offers](#@Removal_of_Offers_4)
+    -  [Helper Functions](#@Helper_Functions_5)
+
+
+<pre><code><b>use</b> <a href="">0x1::error</a>;
+<b>use</b> <a href="">0x1::signer</a>;
+</code></pre>
+
+
+
+<a name="0x1_offer_Offer"></a>
+
+## Resource `Offer`
+
+A wrapper around value <code>offered</code> that can be claimed by the address stored in <code>for</code>.
+
+
+<pre><code><b>struct</b> <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>offered: Offered</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>for: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_offer_EOFFER_ALREADY_CREATED"></a>
+
+Address already has an offer of this type.
+
+
+<pre><code><b>const</b> <a href="offer.md#0x1_offer_EOFFER_ALREADY_CREATED">EOFFER_ALREADY_CREATED</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_offer_EOFFER_DNE_FOR_ACCOUNT"></a>
+
+An offer of the specified type for the account does not exist
+
+
+<pre><code><b>const</b> <a href="offer.md#0x1_offer_EOFFER_DNE_FOR_ACCOUNT">EOFFER_DNE_FOR_ACCOUNT</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_offer_EOFFER_DOES_NOT_EXIST"></a>
+
+Address does not have an offer of this type to redeem.
+
+
+<pre><code><b>const</b> <a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_offer_create"></a>
+
+## Function `create`
+
+Publish a value of type <code>Offered</code> under the sender's account. The value can be claimed by
+either the <code>for</code> address or the transaction sender.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_create">create</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offered: Offered, for: <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_create">create</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offered: Offered, for: <b>address</b>) {
+  <b>assert</b>!(!<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="_already_exists">error::already_exists</a>(<a href="offer.md#0x1_offer_EOFFER_ALREADY_CREATED">EOFFER_ALREADY_CREATED</a>));
+  <b>move_to</b>(account, <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered, for });
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+Offer a struct to the account under address <code>for</code> by
+placing the offer under the signer's address
+
+
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account));
+<b>ensures</b> <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account));
+<b>ensures</b> <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account)) == <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered: offered, for: for };
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_offer_redeem"></a>
+
+## Function `redeem`
+
+Claim the value of type <code>Offered</code> published at <code>offer_address</code>.
+Only succeeds if the sender is the intended recipient stored in <code>for</code> or the original
+publisher <code>offer_address</code>.
+Also fails if there is no <code><a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;</code> published.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_redeem">redeem</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offer_address: <b>address</b>): Offered
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_redeem">redeem</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offer_address: <b>address</b>): Offered <b>acquires</b> <a href="offer.md#0x1_offer_Offer">Offer</a> {
+  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="_not_found">error::not_found</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
+  <b>let</b> <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered, for } = <b>move_from</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+  <b>let</b> sender = <a href="_address_of">signer::address_of</a>(account);
+  <b>assert</b>!(sender == for || sender == offer_address, <a href="_invalid_argument">error::invalid_argument</a>(<a href="offer.md#0x1_offer_EOFFER_DNE_FOR_ACCOUNT">EOFFER_DNE_FOR_ACCOUNT</a>));
+  offered
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+Aborts if there is no offer under <code>offer_address</code> or if the account
+cannot redeem the offer.
+Ensures that the offered struct under <code>offer_address</code> is removed.
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+<b>aborts_if</b> !<a href="offer.md#0x1_offer_is_allowed_recipient">is_allowed_recipient</a>&lt;Offered&gt;(offer_address, <a href="_address_of">signer::address_of</a>(account));
+<b>ensures</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+<b>ensures</b> result == <b>old</b>(<b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).offered);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_offer_exists_at"></a>
+
+## Function `exists_at`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_exists_at">exists_at</a>&lt;Offered: store&gt;(offer_address: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_exists_at">exists_at</a>&lt;Offered: store&gt;(offer_address: <b>address</b>): bool {
+  <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+</code></pre>
+
+
+Returns whether or not an <code><a href="offer.md#0x1_offer_Offer">Offer</a></code> resource is under the given address <code>offer_address</code>.
+
+
+<pre><code><b>ensures</b> result == <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_offer_address_of"></a>
+
+## Function `address_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_address_of">address_of</a>&lt;Offered: store&gt;(offer_address: <b>address</b>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_address_of">address_of</a>&lt;Offered: store&gt;(offer_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="offer.md#0x1_offer_Offer">Offer</a> {
+  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="_not_found">error::not_found</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
+  <b>borrow_global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).for
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+Aborts is there is no offer resource <code><a href="offer.md#0x1_offer_Offer">Offer</a></code> at the <code>offer_address</code>.
+Returns the address of the intended recipient of the Offer
+under the <code>offer_address</code>.
+
+
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+<b>ensures</b> result == <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).for;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+<a name="@Access_Control_2"></a>
+
+### Access Control
+
+
+<a name="@Creation_of_Offers_3"></a>
+
+#### Creation of Offers
+
+
+
+<a name="0x1_offer_NoOfferCreated"></a>
+
+Says no offer is created for any address. Later, it is applied to all functions
+except <code>create</code>
+
+
+<pre><code><b>schema</b> <a href="offer.md#0x1_offer_NoOfferCreated">NoOfferCreated</a>&lt;Offered&gt; {
+    <b>ensures</b> <b>forall</b> addr: <b>address</b> <b>where</b> !<b>old</b>(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr)) : !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr);
+}
+</code></pre>
+
+
+
+Apply OnlyCreateCanCreateOffer to every function except <code>create</code>
+
+
+<pre><code><b>apply</b> <a href="offer.md#0x1_offer_NoOfferCreated">NoOfferCreated</a>&lt;Offered&gt; <b>to</b> *&lt;Offered&gt;, * <b>except</b> create;
+</code></pre>
+
+
+
+<a name="@Removal_of_Offers_4"></a>
+
+#### Removal of Offers
+
+
+
+<a name="0x1_offer_NoOfferRemoved"></a>
+
+Says no offer is removed for any address. Applied below to everything except <code>redeem</code>
+
+
+<pre><code><b>schema</b> <a href="offer.md#0x1_offer_NoOfferRemoved">NoOfferRemoved</a>&lt;Offered&gt; {
+    <b>ensures</b> <b>forall</b> addr: <b>address</b> <b>where</b> <b>old</b>(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr)) :
+              (<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr) && <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr) == <b>old</b>(<b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(addr)));
+}
+</code></pre>
+
+
+
+Only <code>redeem</code> can remove an offer from the global store.
+
+
+<pre><code><b>apply</b> <a href="offer.md#0x1_offer_NoOfferRemoved">NoOfferRemoved</a>&lt;Offered&gt; <b>to</b> *&lt;Offered&gt;, * <b>except</b> redeem;
+</code></pre>
+
+
+
+<a name="@Helper_Functions_5"></a>
+
+### Helper Functions
+
+
+Returns true if the recipient is allowed to redeem <code><a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;</code> at <code>offer_address</code>
+and false otherwise.
+
+
+<a name="0x1_offer_is_allowed_recipient"></a>
+
+
+<pre><code><b>fun</b> <a href="offer.md#0x1_offer_is_allowed_recipient">is_allowed_recipient</a>&lt;Offered&gt;(offer_addr: <b>address</b>, recipient: <b>address</b>): bool {
+  recipient == <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_addr).for || recipient == offer_addr
+}
+</code></pre>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/role.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/role.md
new file mode 100644
index 000000000..e01331891
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/role.md
@@ -0,0 +1,166 @@
+
+<a name="0x1_role"></a>
+
+# Module `0x1::role`
+
+A generic module for role-based access control (RBAC).
+
+
+-  [Resource `Role`](#0x1_role_Role)
+-  [Constants](#@Constants_0)
+-  [Function `assign_role`](#0x1_role_assign_role)
+-  [Function `revoke_role`](#0x1_role_revoke_role)
+-  [Function `has_role`](#0x1_role_has_role)
+-  [Function `assert_has_role`](#0x1_role_assert_has_role)
+
+
+<pre><code><b>use</b> <a href="">0x1::error</a>;
+<b>use</b> <a href="">0x1::signer</a>;
+</code></pre>
+
+
+
+<a name="0x1_role_Role"></a>
+
+## Resource `Role`
+
+
+
+<pre><code><b>struct</b> <a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>dummy_field: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_role_EROLE"></a>
+
+
+
+<pre><code><b>const</b> <a href="role.md#0x1_role_EROLE">EROLE</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_role_assign_role"></a>
+
+## Function `assign_role`
+
+Assign the role to the account. The caller must pass a witness, so is
+expected to be a function of the module that defines <code>Type</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assign_role">assign_role</a>&lt;Type&gt;(<b>to</b>: &<a href="">signer</a>, _witness: &Type)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assign_role">assign_role</a>&lt;Type&gt;(<b>to</b>: &<a href="">signer</a>, _witness: &Type) {
+    <b>assert</b>!(!<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(<b>to</b>)), <a href="_already_exists">error::already_exists</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+    <b>move_to</b>&lt;<a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;&gt;(<b>to</b>, <a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;{});
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_role_revoke_role"></a>
+
+## Function `revoke_role`
+
+Revoke the role from the account. The caller must pass a witness, so is
+expected to be a function of the module that defines <code>Type</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_revoke_role">revoke_role</a>&lt;Type&gt;(from: &<a href="">signer</a>, _witness: &Type)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_revoke_role">revoke_role</a>&lt;Type&gt;(from: &<a href="">signer</a>, _witness: &Type) <b>acquires</b> <a href="role.md#0x1_role_Role">Role</a> {
+    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(from)), <a href="_not_found">error::not_found</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+    <b>let</b> <a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;{} = <b>move_from</b>&lt;<a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;&gt;(<a href="_address_of">signer::address_of</a>(from));
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_role_has_role"></a>
+
+## Function `has_role`
+
+Return true iff the address has the role.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(addr: <b>address</b>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(addr: <b>address</b>): bool {
+    <b>exists</b>&lt;<a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_role_assert_has_role"></a>
+
+## Function `assert_has_role`
+
+assert! that the account has the role.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assert_has_role">assert_has_role</a>&lt;Type&gt;(account: &<a href="">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assert_has_role">assert_has_role</a>&lt;Type&gt;(account: &<a href="">signer</a>) {
+    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="_not_found">error::not_found</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/docs/vault.md b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/vault.md
new file mode 100644
index 000000000..857653989
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/docs/vault.md
@@ -0,0 +1,1559 @@
+
+<a name="0x1_vault"></a>
+
+# Module `0x1::vault`
+
+A module which implements secure memory (called a *vault*) of some content which can only be operated
+on if authorized by a signer. Authorization is managed by
+[*capabilities*](https://en.wikipedia.org/wiki/Capability-based_security). The vault supports delegation
+of capabilities to other signers (including revocation) as well as transfer of ownership.
+
+
+<a name="@Overview_0"></a>
+
+## Overview
+
+
+
+<a name="@Capabilities_1"></a>
+
+### Capabilities
+
+
+Capabilities are unforgeable tokens which represent the right to perform a particular
+operation on the vault. To acquire a capability instance, authentication via a signer is needed.
+This signer must either be the owner of the vault, or someone the capability has been delegated to.
+Once acquired, a capability can be passed to other functions to perform the operation it enables.
+Specifically, those called functions do not need to have access to the original signer. This is a key
+property of capability based security as it prevents granting more rights to code than needed.
+
+Capability instances are unforgeable because they are localized to transactions. They can only be
+created by functions of this module, and as they do not have the Move language <code>store</code> or <code>key</code> abilities,
+they cannot leak out of a transaction.
+
+Example:
+
+```move
+struct Content has store { ssn: u64 }
+...
+// Create new vault
+vault::new(signer, b"My Vault", Content{ ssn: 525659745 });
+...
+// Obtain a read capability
+let read_cap = vault::acquire_read_cap<Content>(signer);
+process(&read_cap)
+...
+fun process(cap: &vault::ReadCap<Content>) {
+let accessor = vault::read_accessor(cap);
+let content = vault::borrow(accessor);
+<< do something with <code>content: &Content</code> >>
+vault::release_read_accessor(accessor);
+}
+```
+
+
+<a name="@Delegation_2"></a>
+
+### Delegation
+
+
+Delegation provides the option to delegate the right to acquire a vault capability to other
+signers than the owner of the vault. Delegates still need to authenticate themselves using their
+signer, similar as the owner does. All security arguments for owners apply also to delegates.
+Delegation can be revoked removing previously granted rights from a delegate.
+
+Delegation can be configured to be transitive by granting the right to acquire a delegation capability
+to delegates, which can then further delegate access rights.
+
+By default, when a vault is created, it does not support delegation. The owner of the vault
+needs to explicitly enable delegation. This allows to create vaults which are not intended for delegation
+and one does not need to worry about its misuse.
+
+Example:
+
+```move
+vault::new(signer, b"My Vault", Content{ ssn: 525659745 });
+// Enable delegation for this vault. Only the owning signer can do this.
+vault::enable_delegation<Content>(signer);
+...
+// Delegate read capability to some other signer.
+let delegate_cap = vault::acquire_delegate_cap<Content>(signer);
+vault::delegate_read_cap(&delegate_cap, other_signer);
+...
+// Other signer can now acquire read cap
+let read_cap = vault::acquire_read_cap<Content>(other_signer);
+...
+// The granted capability can be revoked. There is no need to have the other signer for this.
+vault::revoke_read_cap(&delegate_cap, signer::address_of(other_signer));
+```
+
+
+<a name="@Abilities_3"></a>
+
+### Abilities
+
+
+Currently, we require that the <code>Content</code> type of a vault has the <code>drop</code> ability in order to instantiate
+a capability type like <code><a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content&gt;</code>. Without this, capabilities themselves would need to have an
+explicit release function, which makes little sense as they are pure values. We expect the Move
+language to have 'phantom type parameters' or similar features added, which will allows us to have
+<code><a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content&gt;</code> droppable and copyable without <code>Content</code> needing the same.
+
+
+-  [Overview](#@Overview_0)
+    -  [Capabilities](#@Capabilities_1)
+    -  [Delegation](#@Delegation_2)
+    -  [Abilities](#@Abilities_3)
+-  [Struct `ReadCap`](#0x1_vault_ReadCap)
+-  [Struct `ModifyCap`](#0x1_vault_ModifyCap)
+-  [Struct `DelegateCap`](#0x1_vault_DelegateCap)
+-  [Struct `TransferCap`](#0x1_vault_TransferCap)
+-  [Struct `CapType`](#0x1_vault_CapType)
+-  [Struct `VaultDelegateEvent`](#0x1_vault_VaultDelegateEvent)
+-  [Struct `VaultTransferEvent`](#0x1_vault_VaultTransferEvent)
+-  [Resource `Vault`](#0x1_vault_Vault)
+-  [Resource `VaultDelegates`](#0x1_vault_VaultDelegates)
+-  [Resource `VaultEvents`](#0x1_vault_VaultEvents)
+-  [Resource `VaultDelegate`](#0x1_vault_VaultDelegate)
+-  [Struct `ReadAccessor`](#0x1_vault_ReadAccessor)
+-  [Struct `ModifyAccessor`](#0x1_vault_ModifyAccessor)
+-  [Constants](#@Constants_4)
+-  [Function `read_cap_type`](#0x1_vault_read_cap_type)
+-  [Function `modify_cap_type`](#0x1_vault_modify_cap_type)
+-  [Function `delegate_cap_type`](#0x1_vault_delegate_cap_type)
+-  [Function `transfer_cap_type`](#0x1_vault_transfer_cap_type)
+-  [Function `new`](#0x1_vault_new)
+-  [Function `is_delegation_enabled`](#0x1_vault_is_delegation_enabled)
+-  [Function `enable_delegation`](#0x1_vault_enable_delegation)
+-  [Function `enable_events`](#0x1_vault_enable_events)
+-  [Function `remove_vault`](#0x1_vault_remove_vault)
+-  [Function `acquire_read_cap`](#0x1_vault_acquire_read_cap)
+-  [Function `acquire_modify_cap`](#0x1_vault_acquire_modify_cap)
+-  [Function `acquire_delegate_cap`](#0x1_vault_acquire_delegate_cap)
+-  [Function `acquire_transfer_cap`](#0x1_vault_acquire_transfer_cap)
+-  [Function `validate_cap`](#0x1_vault_validate_cap)
+-  [Function `read_accessor`](#0x1_vault_read_accessor)
+-  [Function `borrow`](#0x1_vault_borrow)
+-  [Function `release_read_accessor`](#0x1_vault_release_read_accessor)
+-  [Function `modify_accessor`](#0x1_vault_modify_accessor)
+-  [Function `borrow_mut`](#0x1_vault_borrow_mut)
+-  [Function `release_modify_accessor`](#0x1_vault_release_modify_accessor)
+-  [Function `delegate`](#0x1_vault_delegate)
+-  [Function `revoke`](#0x1_vault_revoke)
+-  [Function `revoke_all`](#0x1_vault_revoke_all)
+-  [Function `remove_element`](#0x1_vault_remove_element)
+-  [Function `add_element`](#0x1_vault_add_element)
+-  [Function `emit_delegate_event`](#0x1_vault_emit_delegate_event)
+-  [Function `transfer`](#0x1_vault_transfer)
+
+
+<pre><code><b>use</b> <a href="">0x1::error</a>;
+<b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
+<b>use</b> <a href="">0x1::option</a>;
+<b>use</b> <a href="">0x1::signer</a>;
+<b>use</b> <a href="">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_vault_ReadCap"></a>
+
+## Struct `ReadCap`
+
+A capability to read the content of the vault. Notice that the capability cannot be
+stored but can be freely copied and dropped.
+TODO: remove <code>drop</code> on <code>Content</code> here and elsewhere once we have phantom type parameters.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content: drop, store&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_ModifyCap"></a>
+
+## Struct `ModifyCap`
+
+A capability to modify the content of the vault.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_ModifyCap">ModifyCap</a>&lt;Content: drop, store&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_DelegateCap"></a>
+
+## Struct `DelegateCap`
+
+A capability to delegate access to the vault.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content: drop, store&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_TransferCap"></a>
+
+## Struct `TransferCap`
+
+A capability to transfer ownership of the vault.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_TransferCap">TransferCap</a>&lt;Content: drop, store&gt; <b>has</b> <b>copy</b>, drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_CapType"></a>
+
+## Struct `CapType`
+
+A type describing a capability. This is used for functions like <code><a href="vault.md#0x1_vault_delegate">Self::delegate</a></code> where we need to
+specify capability types.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_CapType">CapType</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>code: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_VaultDelegateEvent"></a>
+
+## Struct `VaultDelegateEvent`
+
+An event which we generate on vault access delegation or revocation if event generation is enabled.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_VaultDelegateEvent">VaultDelegateEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>delegate: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>cap: <a href="vault.md#0x1_vault_CapType">vault::CapType</a></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>is_revoked: bool</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_VaultTransferEvent"></a>
+
+## Struct `VaultTransferEvent`
+
+An event which we generate on vault transfer if event generation is enabled.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_VaultTransferEvent">VaultTransferEvent</a> <b>has</b> drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>authority: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>new_vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_Vault"></a>
+
+## Resource `Vault`
+
+Private. The vault representation.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content: store&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>content: <a href="_Option">option::Option</a>&lt;Content&gt;</code>
+</dt>
+<dd>
+ The content. If the option is empty, the content is currently moved into an
+ accessor in order to work with it.
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_VaultDelegates"></a>
+
+## Resource `VaultDelegates`
+
+Private. If the vault supports delegation, information about the delegates.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content: store&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>delegates: <a href="">vector</a>&lt;<b>address</b>&gt;</code>
+</dt>
+<dd>
+ The currently authorized delegates.
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_VaultEvents"></a>
+
+## Resource `VaultEvents`
+
+Private. If event generation is enabled, contains the event generators.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content: store&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>metadata: <a href="">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+ Metadata which identifies this vault. This information is used
+ in events generated by this module.
+</dd>
+<dt>
+<code>delegate_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vault.md#0x1_vault_VaultDelegateEvent">vault::VaultDelegateEvent</a>&gt;</code>
+</dt>
+<dd>
+ Event handle for vault delegation.
+</dd>
+<dt>
+<code>transfer_events: <a href="event.md#0x1_event_EventHandle">event::EventHandle</a>&lt;<a href="vault.md#0x1_vault_VaultTransferEvent">vault::VaultTransferEvent</a>&gt;</code>
+</dt>
+<dd>
+ Event handle for vault transfer.
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_VaultDelegate"></a>
+
+## Resource `VaultDelegate`
+
+Private. A value stored at a delegates address pointing to the owner of the vault. Also
+describes the capabilities granted to this delegate.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content: store&gt; <b>has</b> key
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>granted_caps: <a href="">vector</a>&lt;<a href="vault.md#0x1_vault_CapType">vault::CapType</a>&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_ReadAccessor"></a>
+
+## Struct `ReadAccessor`
+
+A read accessor for the content of the vault.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>&lt;Content: drop, store&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>content: Content</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_vault_ModifyAccessor"></a>
+
+## Struct `ModifyAccessor`
+
+A modify accessor for the content of the vault.
+
+
+<pre><code><b>struct</b> <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>&lt;Content: drop, store&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>content: Content</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>vault_address: <b>address</b></code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_4"></a>
+
+## Constants
+
+
+<a name="0x1_vault_EDELEGATE"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_vault_EACCESSOR_INCONSISTENCY"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>: u64 = 3;
+</code></pre>
+
+
+
+<a name="0x1_vault_EACCESSOR_IN_USE"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_vault_EDELEGATE_TO_SELF"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EDELEGATE_TO_SELF">EDELEGATE_TO_SELF</a>: u64 = 4;
+</code></pre>
+
+
+
+<a name="0x1_vault_EDELEGATION_NOT_ENABLED"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a name="0x1_vault_EEVENT"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EEVENT">EEVENT</a>: u64 = 6;
+</code></pre>
+
+
+
+<a name="0x1_vault_EVAULT"></a>
+
+
+
+<pre><code><b>const</b> <a href="vault.md#0x1_vault_EVAULT">EVAULT</a>: u64 = 0;
+</code></pre>
+
+
+
+<a name="0x1_vault_read_cap_type"></a>
+
+## Function `read_cap_type`
+
+Creates a read capability type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_read_cap_type">read_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">vault::CapType</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_read_cap_type">read_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">CapType</a> { <a href="vault.md#0x1_vault_CapType">CapType</a>{ code : 0 } }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_modify_cap_type"></a>
+
+## Function `modify_cap_type`
+
+Creates a modify  capability type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_modify_cap_type">modify_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">vault::CapType</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_modify_cap_type">modify_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">CapType</a> { <a href="vault.md#0x1_vault_CapType">CapType</a>{ code : 1 } }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_delegate_cap_type"></a>
+
+## Function `delegate_cap_type`
+
+Creates a delegate  capability type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_delegate_cap_type">delegate_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">vault::CapType</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_delegate_cap_type">delegate_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">CapType</a> { <a href="vault.md#0x1_vault_CapType">CapType</a>{ code : 2 } }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_transfer_cap_type"></a>
+
+## Function `transfer_cap_type`
+
+Creates a transfer  capability type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_transfer_cap_type">transfer_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">vault::CapType</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_transfer_cap_type">transfer_cap_type</a>(): <a href="vault.md#0x1_vault_CapType">CapType</a> { <a href="vault.md#0x1_vault_CapType">CapType</a>{ code : 3 } }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_new"></a>
+
+## Function `new`
+
+Creates new vault for the given signer. The vault is populated with the <code>initial_content</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_new">new</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>, initial_content: Content)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_new">new</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>,  initial_content: Content) {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>move_to</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(
+        owner,
+        <a href="vault.md#0x1_vault_Vault">Vault</a>{
+            content: <a href="_some">option::some</a>(initial_content)
+        }
+    )
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_is_delegation_enabled"></a>
+
+## Function `is_delegation_enabled`
+
+Returns <code><b>true</b></code> if the delegation functionality has been enabled.
+Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>): bool {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(addr)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_enable_delegation"></a>
+
+## Function `enable_delegation`
+
+Enables delegation functionality for this vault. By default, vaults to not support delegation.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_delegation">enable_delegation</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_delegation">enable_delegation</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>) {
+    <b>assert</b>!(!<a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content&gt;(owner), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+    <b>move_to</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(owner, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>{delegates: <a href="_empty">vector::empty</a>()})
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_enable_events"></a>
+
+## Function `enable_events`
+
+Enables event generation for this vault. This passed metadata is used to identify
+the vault in events.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_events">enable_events</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>, metadata: <a href="">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_events">enable_events</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>, metadata: <a href="">vector</a>&lt;u8&gt;) {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EEVENT">EEVENT</a>));
+    <b>move_to</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(
+        owner,
+        <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>{
+            metadata,
+            delegate_events: <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>&lt;<a href="vault.md#0x1_vault_VaultDelegateEvent">VaultDelegateEvent</a>&gt;(owner),
+            transfer_events: <a href="event.md#0x1_event_new_event_handle">event::new_event_handle</a>&lt;<a href="vault.md#0x1_vault_VaultTransferEvent">VaultTransferEvent</a>&gt;(owner),
+        }
+    );
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_remove_vault"></a>
+
+## Function `remove_vault`
+
+Removes a vault and all its associated data, returning the current content. In order for
+this to succeed, there must be no active accessor for the vault.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_remove_vault">remove_vault</a>&lt;Content: drop, store&gt;(owner: &<a href="">signer</a>): Content
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_remove_vault">remove_vault</a>&lt;Content: store + drop&gt;(owner: &<a href="">signer</a>): Content
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a>, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>let</b> <a href="vault.md#0x1_vault_Vault">Vault</a>{content} = <b>move_from</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr);
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(&content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(addr)) {
+        <b>let</b> delegate_cap = <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;{vault_address: addr, authority: addr};
+        <a href="vault.md#0x1_vault_revoke_all">revoke_all</a>(&delegate_cap);
+    };
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(addr)) {
+        <b>let</b> <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>{metadata: _metadata, delegate_events, transfer_events} =
+            <b>move_from</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(addr);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(delegate_events);
+        <a href="event.md#0x1_event_destroy_handle">event::destroy_handle</a>(transfer_events);
+    };
+
+    <a href="_extract">option::extract</a>(&<b>mut</b> content)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_acquire_read_cap"></a>
+
+## Function `acquire_read_cap`
+
+Acquires the capability to read the vault. The passed signer must either be the owner
+of the vault or a delegate with appropriate access.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_read_cap">acquire_read_cap</a>&lt;Content: drop, store&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_ReadCap">vault::ReadCap</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_read_cap">acquire_read_cap</a>&lt;Content: store + drop&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> {
+    <b>let</b> (vault_address, authority) = <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content&gt;(requester, <a href="vault.md#0x1_vault_read_cap_type">read_cap_type</a>());
+    <a href="vault.md#0x1_vault_ReadCap">ReadCap</a>{ vault_address, authority }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_acquire_modify_cap"></a>
+
+## Function `acquire_modify_cap`
+
+Acquires the capability to modify the vault. The passed signer must either be the owner
+of the vault or a delegate with appropriate access.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_modify_cap">acquire_modify_cap</a>&lt;Content: drop, store&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_ModifyCap">vault::ModifyCap</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_modify_cap">acquire_modify_cap</a>&lt;Content: store + drop&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_ModifyCap">ModifyCap</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> {
+    <b>let</b> (vault_address, authority) = <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content&gt;(requester, <a href="vault.md#0x1_vault_modify_cap_type">modify_cap_type</a>());
+    <a href="vault.md#0x1_vault_ModifyCap">ModifyCap</a>{ vault_address, authority }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_acquire_delegate_cap"></a>
+
+## Function `acquire_delegate_cap`
+
+Acquires the capability to delegate access to the vault. The passed signer must either be the owner
+of the vault or a delegate with appropriate access.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_delegate_cap">acquire_delegate_cap</a>&lt;Content: drop, store&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_DelegateCap">vault::DelegateCap</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_delegate_cap">acquire_delegate_cap</a>&lt;Content: store + drop&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> {
+    <b>let</b> (vault_address, authority) = <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content&gt;(requester, <a href="vault.md#0x1_vault_delegate_cap_type">delegate_cap_type</a>());
+    <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>{ vault_address, authority }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_acquire_transfer_cap"></a>
+
+## Function `acquire_transfer_cap`
+
+Acquires the capability to transfer the vault. The passed signer must either be the owner
+of the vault or a delegate with appropriate access.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_transfer_cap">acquire_transfer_cap</a>&lt;Content: drop, store&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_TransferCap">vault::TransferCap</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_acquire_transfer_cap">acquire_transfer_cap</a>&lt;Content: store + drop&gt;(requester: &<a href="">signer</a>): <a href="vault.md#0x1_vault_TransferCap">TransferCap</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> {
+    <b>let</b> (vault_address, authority) = <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content&gt;(requester, <a href="vault.md#0x1_vault_transfer_cap_type">transfer_cap_type</a>());
+    <a href="vault.md#0x1_vault_TransferCap">TransferCap</a>{ vault_address, authority }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_validate_cap"></a>
+
+## Function `validate_cap`
+
+Private. Validates whether a capability can be acquired by the given signer. Returns the
+pair of the vault address and the used authority.
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content: drop, store&gt;(requester: &<a href="">signer</a>, cap: <a href="vault.md#0x1_vault_CapType">vault::CapType</a>): (<b>address</b>, <b>address</b>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_validate_cap">validate_cap</a>&lt;Content: store + drop&gt;(requester: &<a href="">signer</a>, cap: <a href="vault.md#0x1_vault_CapType">CapType</a>): (<b>address</b>, <b>address</b>)
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> {
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(requester);
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr)) {
+        // The <a href="">signer</a> is a delegate. Check it's granted capabilities.
+        <b>let</b> delegate = <b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
+        <b>assert</b>!(<a href="_contains">vector::contains</a>(&delegate.granted_caps, &cap), <a href="_permission_denied">error::permission_denied</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+        (delegate.vault_address, addr)
+    } <b>else</b> {
+        // If it is not a delegate, it must be the owner <b>to</b> succeed.
+        <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+        (addr, addr)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_read_accessor"></a>
+
+## Function `read_accessor`
+
+Creates a read accessor for the content in the vault based on a read capability.
+
+Only one accessor (whether read or modify) for the same vault can exist at a time, and this
+function will abort if one is in use. An accessor must be explicitly released using
+<code><a href="vault.md#0x1_vault_release_read_accessor">Self::release_read_accessor</a></code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_read_accessor">read_accessor</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_ReadCap">vault::ReadCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ReadAccessor">vault::ReadAccessor</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_read_accessor">read_accessor</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
+    <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content;
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+    <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>{ vault_address: cap.vault_address, content: <a href="_extract">option::extract</a>(content) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_borrow"></a>
+
+## Function `borrow`
+
+Returns a reference to the content represented by a read accessor.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_borrow">borrow</a>&lt;Content: drop, store&gt;(accessor: &<a href="vault.md#0x1_vault_ReadAccessor">vault::ReadAccessor</a>&lt;Content&gt;): &Content
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_borrow">borrow</a>&lt;Content: store + drop&gt;(accessor: &<a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>&lt;Content&gt;): &Content {
+    &accessor.content
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_release_read_accessor"></a>
+
+## Function `release_read_accessor`
+
+Releases read accessor.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_release_read_accessor">release_read_accessor</a>&lt;Content: drop, store&gt;(accessor: <a href="vault.md#0x1_vault_ReadAccessor">vault::ReadAccessor</a>&lt;Content&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_release_read_accessor">release_read_accessor</a>&lt;Content: store + drop&gt;(accessor: <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>&lt;Content&gt;)
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
+    <b>let</b> <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>{ content: new_content, vault_address } = accessor;
+    <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(vault_address).content;
+    // We (should be/are) able <b>to</b> prove that the below cannot happen, but we leave the assertion
+    // here anyway for double safety.
+    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="_internal">error::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
+    <a href="_fill">option::fill</a>(content, new_content);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_modify_accessor"></a>
+
+## Function `modify_accessor`
+
+Creates a modify accessor for the content in the vault based on a modify capability. This
+is similar like <code><a href="vault.md#0x1_vault_read_accessor">Self::read_accessor</a></code> but the returned accessor will allow to mutate
+the content.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_modify_accessor">modify_accessor</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_ModifyCap">vault::ModifyCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ModifyAccessor">vault::ModifyAccessor</a>&lt;Content&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_modify_accessor">modify_accessor</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_ModifyCap">ModifyCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>&lt;Content&gt;
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
+    <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content;
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+    <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>{ vault_address: cap.vault_address, content: <a href="_extract">option::extract</a>(content) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Returns a mutable reference to the content represented by a modify accessor.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_borrow_mut">borrow_mut</a>&lt;Content: drop, store&gt;(accessor: &<b>mut</b> <a href="vault.md#0x1_vault_ModifyAccessor">vault::ModifyAccessor</a>&lt;Content&gt;): &<b>mut</b> Content
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_borrow_mut">borrow_mut</a>&lt;Content: store + drop&gt;(accessor: &<b>mut</b> <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>&lt;Content&gt;): &<b>mut</b> Content {
+    &<b>mut</b> accessor.content
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_release_modify_accessor"></a>
+
+## Function `release_modify_accessor`
+
+Releases a modify accessor. This will ensure that any modifications are written back
+to the vault.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_release_modify_accessor">release_modify_accessor</a>&lt;Content: drop, store&gt;(accessor: <a href="vault.md#0x1_vault_ModifyAccessor">vault::ModifyAccessor</a>&lt;Content&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_release_modify_accessor">release_modify_accessor</a>&lt;Content: store + drop&gt;(accessor: <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>&lt;Content&gt;)
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
+    <b>let</b> <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>{ content: new_content, vault_address } = accessor;
+    <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(vault_address).content;
+    // We (should be/are) able <b>to</b> prove that the below cannot happen, but we leave the assertion
+    // here anyway for double safety.
+    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="_internal">error::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
+    <a href="_fill">option::fill</a>(content, new_content);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_delegate"></a>
+
+## Function `delegate`
+
+Delegates the right to acquire a capability of the given type. Delegation must have been enabled
+during vault creation for this to succeed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_delegate">delegate</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">vault::DelegateCap</a>&lt;Content&gt;, to_signer: &<a href="">signer</a>, cap_type: <a href="vault.md#0x1_vault_CapType">vault::CapType</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_delegate">delegate</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;, to_signer: &<a href="">signer</a>, cap_type: <a href="vault.md#0x1_vault_CapType">CapType</a>)
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+    );
+
+    <b>let</b> addr = <a href="_address_of">signer::address_of</a>(to_signer);
+    <b>assert</b>!(addr != cap.vault_address, <a href="_invalid_argument">error::invalid_argument</a>(<a href="vault.md#0x1_vault_EDELEGATE_TO_SELF">EDELEGATE_TO_SELF</a>));
+
+    <b>if</b> (!<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr)) {
+        // Create <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> <b>if</b> it is not yet existing.
+        <b>move_to</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(
+            to_signer,
+            <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>{vault_address: cap.vault_address, granted_caps: <a href="_empty">vector::empty</a>()}
+        );
+        // Add the the delegate <b>to</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>.
+        <b>let</b> vault_delegates = <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address);
+        <a href="vault.md#0x1_vault_add_element">add_element</a>(&<b>mut</b> vault_delegates.delegates, addr);
+    };
+
+    // Grant the <a href="capability.md#0x1_capability">capability</a>.
+    <b>let</b> delegate = <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
+    <a href="vault.md#0x1_vault_add_element">add_element</a>(&<b>mut</b> delegate.granted_caps, *&cap_type);
+
+    // Generate <a href="event.md#0x1_event">event</a>
+    <a href="vault.md#0x1_vault_emit_delegate_event">emit_delegate_event</a>(cap, cap_type, addr, <b>false</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_revoke"></a>
+
+## Function `revoke`
+
+Revokes the delegated right to acquire a capability of given type.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_revoke">revoke</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">vault::DelegateCap</a>&lt;Content&gt;, addr: <b>address</b>, cap_type: <a href="vault.md#0x1_vault_CapType">vault::CapType</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_revoke">revoke</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;, addr: <b>address</b>, cap_type: <a href="vault.md#0x1_vault_CapType">CapType</a>)
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+    );
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+
+    <b>let</b> delegate = <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
+    <a href="vault.md#0x1_vault_remove_element">remove_element</a>(&<b>mut</b> delegate.granted_caps, &cap_type);
+
+    // If the granted caps of this delegate drop <b>to</b> zero, remove it.
+    <b>if</b> (<a href="_is_empty">vector::is_empty</a>(&delegate.granted_caps)) {
+        <b>let</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>{ vault_address: _owner, granted_caps: _granted_caps} =
+            <b>move_from</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
+        <b>let</b> vault_delegates = <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address);
+        <a href="vault.md#0x1_vault_remove_element">remove_element</a>(&<b>mut</b> vault_delegates.delegates, &addr);
+    };
+
+    // Generate <a href="event.md#0x1_event">event</a>.
+    <a href="vault.md#0x1_vault_emit_delegate_event">emit_delegate_event</a>(cap, cap_type, addr, <b>true</b>);
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_revoke_all"></a>
+
+## Function `revoke_all`
+
+Revokes all delegate rights for this vault.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_revoke_all">revoke_all</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">vault::DelegateCap</a>&lt;Content&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_revoke_all">revoke_all</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;)
+<b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
+    <b>assert</b>!(
+        <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+    );
+    <b>let</b> delegates = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address).delegates;
+    <b>while</b> (!<a href="_is_empty">vector::is_empty</a>(delegates)) {
+        <b>let</b> addr = <a href="_pop_back">vector::pop_back</a>(delegates);
+        <b>let</b> <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>{ vault_address: _vault_address, granted_caps} =
+            <b>move_from</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(cap.vault_address);
+        <b>while</b> (!<a href="_is_empty">vector::is_empty</a>(&granted_caps)) {
+            <b>let</b> cap_type = <a href="_pop_back">vector::pop_back</a>(&<b>mut</b> granted_caps);
+            <a href="vault.md#0x1_vault_emit_delegate_event">emit_delegate_event</a>(cap, cap_type, addr, <b>true</b>);
+        }
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_remove_element"></a>
+
+## Function `remove_element`
+
+Helper to remove an element from a vector.
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: &E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_remove_element">remove_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: &E) {
+    <b>let</b> (found, index) = <a href="_index_of">vector::index_of</a>(v, x);
+    <b>if</b> (found) {
+        <a href="_remove">vector::remove</a>(v, index);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_add_element"></a>
+
+## Function `add_element`
+
+Helper to add an element to a vector.
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: E)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_add_element">add_element</a>&lt;E: drop&gt;(v: &<b>mut</b> <a href="">vector</a>&lt;E&gt;, x: E) {
+    <b>if</b> (!<a href="_contains">vector::contains</a>(v, &x)) {
+        <a href="_push_back">vector::push_back</a>(v, x)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_emit_delegate_event"></a>
+
+## Function `emit_delegate_event`
+
+Emits a delegation or revocation event if event generation is enabled.
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_emit_delegate_event">emit_delegate_event</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_DelegateCap">vault::DelegateCap</a>&lt;Content&gt;, cap_type: <a href="vault.md#0x1_vault_CapType">vault::CapType</a>, delegate: <b>address</b>, is_revoked: bool)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="vault.md#0x1_vault_emit_delegate_event">emit_delegate_event</a>&lt;Content: store + drop&gt;(
+       cap: &<a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;,
+       cap_type: <a href="vault.md#0x1_vault_CapType">CapType</a>,
+       delegate: <b>address</b>,
+       is_revoked: bool
+) <b>acquires</b> <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address)) {
+        <b>let</b> <a href="event.md#0x1_event">event</a> = <a href="vault.md#0x1_vault_VaultDelegateEvent">VaultDelegateEvent</a>{
+            metadata: *&<b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address).metadata,
+            vault_address: cap.vault_address,
+            authority: cap.authority,
+            delegate,
+            cap: cap_type,
+            is_revoked
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address).delegate_events, <a href="event.md#0x1_event">event</a>);
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vault_transfer"></a>
+
+## Function `transfer`
+
+Transfers ownership of the vault to a new signer. All delegations are revoked before transfer,
+and the new owner must re-create delegates as needed.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_transfer">transfer</a>&lt;Content: drop, store&gt;(cap: &<a href="vault.md#0x1_vault_TransferCap">vault::TransferCap</a>&lt;Content&gt;, to_owner: &<a href="">signer</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_transfer">transfer</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_TransferCap">TransferCap</a>&lt;Content&gt;, to_owner: &<a href="">signer</a>)
+<b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a> {
+    <b>let</b> new_addr = <a href="_address_of">signer::address_of</a>(to_owner);
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(new_addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(
+        <a href="_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content),
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>)
+    );
+
+    // Revoke all delegates.
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address)) {
+        <b>let</b> delegate_cap = <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;{vault_address: cap.vault_address, authority: cap.authority };
+        <a href="vault.md#0x1_vault_revoke_all">revoke_all</a>(&delegate_cap);
+    };
+
+    // Emit <a href="event.md#0x1_event">event</a> <b>if</b> <a href="event.md#0x1_event">event</a> generation is enabled. We emit the <a href="event.md#0x1_event">event</a> on the <b>old</b> <a href="vault.md#0x1_vault">vault</a> not the new one.
+    <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address)) {
+        <b>let</b> <a href="event.md#0x1_event">event</a> = <a href="vault.md#0x1_vault_VaultTransferEvent">VaultTransferEvent</a> {
+            metadata: *&<b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address).metadata,
+            vault_address: cap.vault_address,
+            authority: cap.authority,
+            new_vault_address: new_addr
+        };
+        <a href="event.md#0x1_event_emit_event">event::emit_event</a>(&<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(cap.vault_address).transfer_events, <a href="event.md#0x1_event">event</a>);
+    };
+
+    // Move the <a href="vault.md#0x1_vault">vault</a>.
+    <b>move_to</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(to_owner, <b>move_from</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address));
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/acl.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/acl.move
new file mode 100644
index 000000000..400a6dbf1
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/acl.move
@@ -0,0 +1,46 @@
+/// Access control list (ACL) module. An ACL is a list of account addresses who
+/// have the access permission to a certain object.
+/// This module uses a `vector` to represent the list, but can be refactored to
+/// use a "set" instead when it's available in the language in the future.
+
+module std::acl {
+    use std::vector;
+    use std::errors;
+
+    /// The ACL already contains the address.
+    const ECONTAIN: u64 = 0;
+    /// The ACL does not contain the address.
+    const ENOT_CONTAIN: u64 = 1;
+
+    struct ACL has store, drop, copy {
+        list: vector<address>
+    }
+
+    /// Return an empty ACL.
+    public fun empty(): ACL {
+        ACL{ list: vector::empty<address>() }
+    }
+
+    /// Add the address to the ACL.
+    public fun add(acl: &mut ACL, addr: address) {
+        assert!(!vector::contains(&mut acl.list, &addr), errors::invalid_argument(ECONTAIN));
+        vector::push_back(&mut acl.list, addr);
+    }
+
+    /// Remove the address from the ACL.
+    public fun remove(acl: &mut ACL, addr: address) {
+        let (found, index) = vector::index_of(&mut acl.list, &addr);
+        assert!(found, errors::invalid_argument(ENOT_CONTAIN));
+        vector::remove(&mut acl.list, index);
+    }
+
+    /// Return true iff the ACL contains the address.
+    public fun contains(acl: &ACL, addr: address): bool {
+        vector::contains(&acl.list, &addr)
+    }
+
+    /// assert! that the ACL has the address.
+    public fun assert_contains(acl: &ACL, addr: address) {
+        assert!(contains(acl, addr), errors::invalid_argument(ENOT_CONTAIN));
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/capability.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/capability.move
new file mode 100644
index 000000000..85d048720
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/capability.move
@@ -0,0 +1,199 @@
+/// A module which defines the basic concept of
+/// [*capabilities*](https://en.wikipedia.org/wiki/Capability-based_security) for managing access control.
+///
+/// EXPERIMENTAL
+///
+/// # Overview
+///
+/// A capability is a unforgeable token which testifies that a signer has authorized a certain operation.
+/// The token is valid during the transaction where it is obtained. Since the type `capability::Cap` has
+/// no ability to be stored in global memory, capabilities cannot leak out of a transaction. For every function
+/// called within a transaction which has a capability as a parameter, it is guaranteed that the capability
+/// has been obtained via a proper signer-based authorization step previously in the transaction's execution.
+///
+/// ## Usage
+///
+/// Initializing and acquiring capabilities is usually encapsulated in a module with a type
+/// tag which can only be constructed by this module.
+///
+/// ```
+/// module Pkg::Feature {
+///   use std::capability::Cap;
+///
+///   /// A type tag used in Cap<Feature>. Only this module can create an instance,
+///   /// and there is no public function other than Self::acquire which returns a value of this type.
+///   /// This way, this module has full control how Cap<Feature> is given out.
+///   struct Feature has drop {}
+///
+///   /// Initializes this module.
+///   public fun initialize(s: &signer) {
+///     // Create capability. This happens once at module initialization time.
+///     // One needs to provide a witness for being the owner of Feature
+///     // in the 2nd parameter.
+///     <<additional conditions allowing to initialize this capability>>
+///     capability::create<Feature>(s, &Feature{});
+///   }
+///
+///   /// Acquires the capability to work with this feature.
+///   public fun acquire(s: &signer): Cap<Feature> {
+///     <<additional conditions allowing to acquire this capability>>
+///     capability::acquire<Feature>(s, &Feature{});
+///   }
+///
+///   /// Does something related to the feature. The caller must pass a Cap<Feature>.
+///   public fun do_something(_cap: Cap<Feature>) { ... }
+/// }
+/// ```
+///
+/// ## Delegation
+///
+/// Capabilities come with the optional feature of *delegation*. Via `Self::delegate`, an owner of a capability
+/// can designate another signer to be also capable of acquiring the capability. Like the original creator,
+/// the delegate needs to present his signer to obtain the capability in his transactions. Delegation can
+/// be revoked via `Self::revoke`, removing this access right from the delegate.
+///
+/// While the basic authorization mechanism for delegates is the same as with core capabilities, the
+/// target of delegation might be subject of restrictions which need to be specified and verified. This can
+/// be done via global invariants in the specification language. For example, in order to prevent delegation
+/// all together for a capability, one can use the following invariant:
+///
+/// ```
+///   invariant forall a: address where capability::spec_has_cap<Feature>(a):
+///               len(capability::spec_delegates<Feature>(a)) == 0;
+/// ```
+///
+/// Similarly, the following invariant would enforce that delegates, if existent, must satisfy a certain
+/// predicate:
+///
+/// ```
+///   invariant forall a: address where capability::spec_has_cap<Feature>(a):
+///               forall d in capability::spec_delegates<Feature>(a):
+///                  is_valid_delegate_for_feature(d);
+/// ```
+///
+module std::capability {
+    use std::error;
+    use std::signer;
+    use std::vector;
+
+    const ECAP: u64 = 0;
+    const EDELEGATE: u64 = 1;
+
+    /// The token representing an acquired capability. Cannot be stored in memory, but copied and dropped freely.
+    struct Cap<phantom Feature> has copy, drop {
+        root: address
+    }
+
+    /// A linear version of a capability token. This can be used if an acquired capability should be enforced
+    /// to be used only once for an authorization.
+    struct LinearCap<phantom Feature> has drop {
+        root: address
+    }
+
+    /// An internal data structure for representing a configured capability.
+    struct CapState<phantom Feature> has key {
+        delegates: vector<address>
+    }
+
+    /// An internal data structure for representing a configured delegated capability.
+    struct CapDelegateState<phantom Feature> has key {
+        root: address
+    }
+
+    /// Creates a new capability class, owned by the passed signer. A caller must pass a witness that
+    /// they own the `Feature` type parameter.
+    public fun create<Feature>(owner: &signer, _feature_witness: &Feature) {
+        let addr = signer::address_of(owner);
+        assert!(!exists<CapState<Feature>>(addr), error::already_exists(ECAP));
+        move_to<CapState<Feature>>(owner, CapState{ delegates: vector::empty() });
+    }
+
+    /// Acquires a capability token. Only the owner of the capability class, or an authorized delegate,
+    /// can succeed with this operation. A caller must pass a witness that they own the `Feature` type
+    /// parameter.
+    public fun acquire<Feature>(requester: &signer, _feature_witness: &Feature): Cap<Feature>
+    acquires CapState, CapDelegateState {
+        Cap<Feature>{root: validate_acquire<Feature>(requester)}
+    }
+
+    /// Acquires a linear capability token. It is up to the module which owns `Feature` to decide
+    /// whether to expose a linear or non-linear capability.
+    public fun acquire_linear<Feature>(requester: &signer, _feature_witness: &Feature): LinearCap<Feature>
+    acquires CapState, CapDelegateState {
+        LinearCap<Feature>{root: validate_acquire<Feature>(requester)}
+    }
+
+    /// Helper to validate an acquire. Returns the root address of the capability.
+    fun validate_acquire<Feature>(requester: &signer): address
+    acquires CapState, CapDelegateState {
+        let addr = signer::address_of(requester);
+        if (exists<CapDelegateState<Feature>>(addr)) {
+            let root_addr = borrow_global<CapDelegateState<Feature>>(addr).root;
+            // double check that requester is actually registered as a delegate
+            assert!(exists<CapState<Feature>>(root_addr), error::invalid_state(EDELEGATE));
+            assert!(vector::contains(&borrow_global<CapState<Feature>>(root_addr).delegates, &addr),
+                   error::invalid_state(EDELEGATE));
+            root_addr
+        } else {
+            assert!(exists<CapState<Feature>>(addr), error::not_found(ECAP));
+            addr
+        }
+    }
+
+    /// Returns the root address associated with the given capability token. Only the owner
+    /// of the feature can do this.
+    public fun root_addr<Feature>(cap: Cap<Feature>, _feature_witness: &Feature): address {
+        cap.root
+    }
+
+    /// Returns the root address associated with the given linear capability token.
+    public fun linear_root_addr<Feature>(cap: LinearCap<Feature>, _feature_witness: &Feature): address {
+        cap.root
+    }
+
+    /// Registers a delegation relation. If the relation already exists, this function does
+    /// nothing.
+    // TODO: explore whether this should be idempotent like now or abort
+    public fun delegate<Feature>(cap: Cap<Feature>, _feature_witness: &Feature, to: &signer)
+    acquires CapState {
+        let addr = signer::address_of(to);
+        if (exists<CapDelegateState<Feature>>(addr)) return;
+        move_to(to, CapDelegateState<Feature>{root: cap.root});
+        add_element(&mut borrow_global_mut<CapState<Feature>>(cap.root).delegates, addr);
+    }
+
+    /// Revokes a delegation relation. If no relation exists, this function does nothing.
+    // TODO: explore whether this should be idempotent like now or abort
+    public fun revoke<Feature>(cap: Cap<Feature>, _feature_witness: &Feature, from: address)
+    acquires CapState, CapDelegateState
+    {
+        if (!exists<CapDelegateState<Feature>>(from)) return;
+        let CapDelegateState{root: _root} = move_from<CapDelegateState<Feature>>(from);
+        remove_element(&mut borrow_global_mut<CapState<Feature>>(cap.root).delegates, &from);
+    }
+
+    /// Helper to remove an element from a vector.
+    fun remove_element<E: drop>(v: &mut vector<E>, x: &E) {
+        let (found, index) = vector::index_of(v, x);
+        if (found) {
+            vector::remove(v, index);
+        }
+    }
+
+    /// Helper to add an element to a vector.
+    fun add_element<E: drop>(v: &mut vector<E>, x: E) {
+        if (!vector::contains(v, &x)) {
+            vector::push_back(v, x)
+        }
+    }
+
+    /// Helper specification function to check whether a capability exists at address.
+    spec fun spec_has_cap<Feature>(addr: address): bool {
+        exists<CapState<Feature>>(addr)
+    }
+
+    /// Helper specification function to obtain the delegates of a capability.
+    spec fun spec_delegates<Feature>(addr: address): vector<address> {
+        global<CapState<Feature>>(addr).delegates
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/compare.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/compare.move
new file mode 100644
index 000000000..73793c200
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/compare.move
@@ -0,0 +1,74 @@
+/// Utilities for comparing Move values based on their representation in BCS.
+module std::compare {
+    use std::vector;
+
+    // Move does not have signed integers, so we cannot use the usual 0, -1, 1 convention to
+    // represent EQUAL, LESS_THAN, and GREATER_THAN. Instead, we fun a new convention using u8
+    // constants:
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+    /// compare vectors `v1` and `v2` using (1) vector contents from right to left and then
+    /// (2) vector length to break ties.
+    /// Returns either `EQUAL` (0u8), `LESS_THAN` (1u8), or `GREATER_THAN` (2u8).
+    ///
+    /// This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+    /// (i.e., vectors produced by `bcs::to_bytes`). A typical client will call
+    /// `compare::cmp_bcs_bytes(bcs::to_bytes(&t1), bcs::to_bytes(&t2))`. The comparison provides the
+    /// following guarantees w.r.t the original values t1 and t2:
+    /// - `cmp_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `cmp_bcs_bytes(t2, t1) == GREATER_THAN`
+    /// - `compare::cmp<T>(t1, t2) == EQUAL` iff `t1 == t2` and (similarly)
+    ///   `compare::cmp<T>(t1, t2) != EQUAL` iff `t1 != t2`, where `==` and `!=` denote the Move
+    ///    bytecode operations for polymorphic equality.
+    /// - for all primitive types `T` with `<` and `>` comparison operators exposed in Move bytecode
+    ///   (`u8`, `u16`, `u32`, `u64`, `u128`, `u256`), we have
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 < t2` and (similarly)
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 > t2`.
+    ///
+    /// For all other types, the order is whatever the BCS encoding of the type and the comparison
+    /// strategy above gives you. One case where the order might be surprising is the `address`
+    /// type.
+    /// CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+    /// to left, byte-by-byte comparison means that (for example)
+    /// `compare_bcs_bytes(bcs(0x01), bcs(0x10)) == LESS_THAN` (as you'd expect), but
+    /// `compare_bcs_bytes(bcs(0x100), bcs(0x001)) == LESS_THAN` (as you probably wouldn't expect).
+    /// Keep this in mind when using this function to compare addresses.
+    ///
+    /// > TODO: there is currently no specification for this function, which causes no problem because it is not yet
+    /// > used in the Diem framework. However, should this functionality be needed in specification, a customized
+    /// > native abstraction is needed in the prover framework.
+    public fun cmp_bcs_bytes(v1: &vector<u8>, v2: &vector<u8>): u8 {
+        let i1 = vector::length(v1);
+        let i2 = vector::length(v2);
+        let len_cmp = cmp_u64(i1, i2);
+
+        // BCS uses little endian encoding for all integer types, so we choose to compare from left
+        // to right. Going right to left would make the behavior of compare::cmp diverge from the
+        // bytecode operators < and > on integer values (which would be confusing).
+        while (i1 > 0 && i2 > 0) {
+            i1 = i1 - 1;
+            i2 = i2 - 1;
+            let elem_cmp = cmp_u8(*vector::borrow(v1, i1), *vector::borrow(v2, i2));
+            if (elem_cmp != 0) return elem_cmp
+            // else, compare next element
+        };
+        // all compared elements equal; use length comparion to break the tie
+        len_cmp
+    }
+
+    /// Compare two `u8`'s
+    fun cmp_u8(i1: u8, i2: u8): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+    /// Compare two `u64`'s
+    fun cmp_u64(i1: u64, i2: u64): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/debug.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/debug.move
new file mode 100644
index 000000000..d4a506d10
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/debug.move
@@ -0,0 +1,18 @@
+/// Module providing debug functionality.
+module std::debug {
+
+    /// Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+    native public fun print<T>(x: &T);
+
+    /// Prints the calling function's stack trace.
+    native public fun print_stack_trace();
+
+    #[test_only]
+    use std::string;
+
+    #[test_only]
+    /// Utility function for printing a sequence of UTF8 bytes as a string (e.g., `b"Hello"`).
+    public fun print_string(utf8_bytes: vector<u8>) {
+        print<string::String>(&string::utf8(utf8_bytes));
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/errors.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/errors.move
new file mode 100644
index 000000000..2d5e61918
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/errors.move
@@ -0,0 +1,135 @@
+/// Module defining error codes used in Move aborts throughout the framework.
+///
+/// A `u64` error code is constructed from two values:
+///
+///  1. The *error category* which is encoded in the lower 8 bits of the code. Error categories are
+///     declared in this module and are globally unique across the Diem framework. There is a limited
+///     fixed set of predefined categories, and the framework is guaranteed to use those consistently.
+///
+///  2. The *error reason* which is encoded in the remaining 56 bits of the code. The reason is a unique
+///     number relative to the module which raised the error and can be used to obtain more information about
+///     the error at hand. It is mostly used for diagnosis purposes. Error reasons may change over time as the
+///     framework evolves.
+///
+/// >TODO: determine what kind of stability guarantees we give about reasons/associated module.
+module std::errors {
+    /// A function to create an error from from a category and a reason.
+    fun make(category: u8, reason: u64): u64 {
+        (category as u64) + (reason << 8)
+    }
+    spec make {
+        pragma opaque = true;
+        // The % below is to account for bits that could be shifted off the left end.
+        // For correctness, we would like that never to happen, but I'm cautious about
+        // using assert! in this module (no other uses), and require is just going to
+        // cause verification errors in public calling functions below.
+        ensures [concrete] result == category + (reason << 8) % (1 << 64);
+        aborts_if [abstract] false;
+        ensures [abstract] result == category;
+    }
+
+    /// The system is in a state where the performed operation is not allowed. Example: call to a function only allowed
+    /// in genesis.
+    const INVALID_STATE: u8 = 1;
+
+    /// The signer of a transaction does not have the expected address for this operation. Example: a call to a function
+    /// which publishes a resource under a particular address.
+    const REQUIRES_ADDRESS: u8 = 2;
+
+    /// The signer of a transaction does not have the expected  role for this operation. Example: a call to a function
+    /// which requires the signer to have the role of treasury compliance.
+    const REQUIRES_ROLE: u8 = 3;
+
+    /// The signer of a transaction does not have a required capability.
+    const REQUIRES_CAPABILITY: u8 = 4;
+
+    /// A resource is required but not published. Example: access to non-existing AccountLimits resource.
+    const NOT_PUBLISHED: u8 = 5;
+
+    /// Attempting to publish a resource that is already published. Example: calling an initialization function
+    /// twice.
+    const ALREADY_PUBLISHED: u8 = 6;
+
+    /// An argument provided to an operation is invalid. Example: a signing key has the wrong format.
+    const INVALID_ARGUMENT: u8 = 7;
+
+    /// A limit on an amount, e.g. a currency, is exceeded. Example: withdrawal of money after account limits window
+    /// is exhausted.
+    const LIMIT_EXCEEDED: u8 = 8;
+
+    /// An internal error (bug) has occurred.
+    const INTERNAL: u8 = 10;
+
+    /// A custom error category for extension points.
+    const CUSTOM: u8 = 255;
+
+    public fun invalid_state(reason: u64): u64 { make(INVALID_STATE, reason) }
+    spec invalid_state {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == INVALID_STATE;
+    }
+
+    public fun requires_address(reason: u64): u64 { make(REQUIRES_ADDRESS, reason) }
+    spec requires_address {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == REQUIRES_ADDRESS;
+    }
+
+    public fun requires_role(reason: u64): u64 { make(REQUIRES_ROLE, reason) }
+    spec requires_role {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == REQUIRES_ROLE;
+    }
+
+    public fun requires_capability(reason: u64): u64 { make(REQUIRES_CAPABILITY, reason) }
+    spec requires_capability {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == REQUIRES_CAPABILITY;
+    }
+
+    public fun not_published(reason: u64): u64 { make(NOT_PUBLISHED, reason) }
+    spec not_published {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == NOT_PUBLISHED;
+    }
+
+    public fun already_published(reason: u64): u64 { make(ALREADY_PUBLISHED, reason) }
+    spec already_published {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == ALREADY_PUBLISHED;
+    }
+
+    public fun invalid_argument(reason: u64): u64 { make(INVALID_ARGUMENT, reason) }
+    spec invalid_argument {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == INVALID_ARGUMENT;
+    }
+
+    public fun limit_exceeded(reason: u64): u64 { make(LIMIT_EXCEEDED, reason) }
+    spec limit_exceeded {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == LIMIT_EXCEEDED;
+    }
+
+    public fun internal(reason: u64): u64 { make(INTERNAL, reason) }
+    spec internal {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == INTERNAL;
+    }
+
+    public fun custom(reason: u64): u64 { make(CUSTOM, reason) }
+    spec custom {
+        pragma opaque = true;
+        aborts_if false;
+        ensures result == CUSTOM;
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/event.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/event.move
new file mode 100644
index 000000000..bac2c6445
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/event.move
@@ -0,0 +1,89 @@
+/// The Event module defines an `EventHandleGenerator` that is used to create
+/// `EventHandle`s with unique GUIDs. It contains a counter for the number
+/// of `EventHandle`s it generates. An `EventHandle` is used to count the number of
+/// events emitted to a handle and emit events to the event store.
+module std::event {
+    use std::bcs;
+    use std::guid::{Self, GUID};
+
+    /// Wrapper for a GUID for layout compatibility with legacy EventHandle id's
+    // This is a hack for layout compatibility. The old EventHandle.guid was a 24 byte vector<u8>
+    // created from `append(u64 counter bytes, account address bytes)`. This dummy struct mimics
+    // the BCS layout of the old value.
+    // Note: the reason why this works is somewhat subtle. The BCS encoding for a vector V of
+    // length N is `uleb128_encoded_bytes(N) | contents(V)`
+    // (see https://github.com/diem/bcs#fixed-and-variable-length-sequences).
+    // uleb128_encoded_bytes(24) fits into 1 byte, so using len_bytes: u8 is what we want here
+    struct GUIDWrapper has store, drop { len_bytes: u8, guid: GUID }
+
+    /// A handle for an event such that:
+    /// 1. Other modules can emit events to this handle.
+    /// 2. Storage can use this handle to prove the total number of events that happened in the past.
+    struct EventHandle<phantom T: drop + store> has store {
+        /// Total number of events emitted to this event stream.
+        counter: u64,
+        /// A globally unique ID for this event stream.
+        guid: GUIDWrapper,
+    }
+
+    /// Deprecated. Only kept around so Diem clients know how to deserialize existing EventHandleGenerator's
+    struct EventHandleGenerator has key {
+        // A monotonically increasing counter
+        counter: u64,
+        addr: address,
+    }
+
+    /// Use EventHandleGenerator to generate a unique event handle for `sig`
+    public fun new_event_handle<T: drop + store>(account: &signer): EventHandle<T> {
+        // must be 24 for compatibility with legacy Event ID's--see comment on GUIDWrapper
+        let len_bytes = 24u8;
+         EventHandle<T> {
+            counter: 0,
+            guid: GUIDWrapper { len_bytes, guid: guid::create(account) }
+        }
+    }
+
+    /// Emit an event with payload `msg` by using `handle_ref`'s key and counter.
+    public fun emit_event<T: drop + store>(handle_ref: &mut EventHandle<T>, msg: T) {
+        write_to_event_store<T>(bcs::to_bytes(&handle_ref.guid.guid), handle_ref.counter, msg);
+        handle_ref.counter = handle_ref.counter + 1;
+    }
+
+    /// Return the GUIID associated with this EventHandle
+    public fun guid<T: drop + store>(handle_ref: &EventHandle<T>): &GUID {
+        &handle_ref.guid.guid
+    }
+
+    /// Log `msg` as the `count`th event associated with the event stream identified by `guid`
+    native fun write_to_event_store<T: drop + store>(guid: vector<u8>, count: u64, msg: T);
+
+    /// Destroy a unique handle.
+    public fun destroy_handle<T: drop + store>(handle: EventHandle<T>) {
+        EventHandle<T> { counter: _, guid: _ } = handle;
+    }
+
+    // ****************** TEST-ONLY FUNCTIONS **************
+
+    #[test_only]
+    public fun create_guid_wrapper_for_test<T: drop + store>(s: &signer): GUIDWrapper {
+        let EventHandle<T> { counter: _, guid } = new_event_handle<T>(s);
+        guid
+    }
+
+    // ****************** SPECIFICATIONS *******************
+    spec module {} // switch documentation context to module
+
+    spec module {
+        /// Functions of the event module are mocked out using the intrinsic
+        /// pragma. They are implemented in the prover's prelude.
+        pragma intrinsic = true;
+
+        /// Determines equality between the guids of two event handles. Since fields of intrinsic
+        /// structs cannot be accessed, this function is provided.
+        fun spec_guid_eq<T>(h1: EventHandle<T>, h2: EventHandle<T>): bool {
+            // The implementation currently can just use native equality since the mocked prover
+            // representation does not have the `counter` field.
+            h1 == h2
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/guid.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/guid.move
new file mode 100644
index 000000000..b9a3cd033
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/guid.move
@@ -0,0 +1,112 @@
+/// A module for generating globally unique identifiers
+module std::guid {
+    use std::signer;
+
+    /// A generator for new GUIDs.
+    struct Generator has key {
+        /// A monotonically increasing counter
+        counter: u64,
+    }
+
+    /// A globally unique identifier derived from the sender's address and a counter
+    struct GUID has drop, store {
+        id: ID
+    }
+
+    /// A non-privileged identifier that can be freely created by anyone. Useful for looking up GUID's.
+    struct ID has copy, drop, store {
+        /// If creation_num is `i`, this is the `i+1`th GUID created by `addr`
+        creation_num: u64,
+        /// Address that created the GUID
+        addr: address
+    }
+
+    /// A capability to create a privileged identifier on behalf of the given address
+    struct CreateCapability has key, store, drop {
+        addr: address
+    }
+
+    /// GUID generator must be published ahead of first usage of `create_with_capability` function.
+    const EGUID_GENERATOR_NOT_PUBLISHED: u64 = 0;
+
+    /// Generates a capability to create the privileged GUID on behalf of the signer
+    // (also makes sure that the Generator is published under the signer account)
+    public fun gen_create_capability(account: &signer): CreateCapability {
+        let addr = signer::address_of(account);
+        if (!exists<Generator>(addr)) {
+            move_to(account, Generator { counter: 0 })
+        };
+        CreateCapability { addr }
+    }
+
+    /// Create a non-privileged id from `addr` and `creation_num`
+    public fun create_id(addr: address, creation_num: u64): ID {
+        ID { creation_num, addr }
+    }
+
+    public fun create_with_capability(addr: address, _cap: &CreateCapability): GUID acquires Generator {
+        assert!(exists<Generator>(addr), EGUID_GENERATOR_NOT_PUBLISHED);
+        create_impl(addr)
+    }
+
+    /// Create and return a new GUID. Creates a `Generator` under `account`
+    /// if it does not already have one
+    public fun create(account: &signer): GUID acquires Generator {
+        let addr = signer::address_of(account);
+        if (!exists<Generator>(addr)) {
+            move_to(account, Generator { counter: 0 })
+        };
+        create_impl(addr)
+    }
+
+    fun create_impl(addr: address): GUID acquires Generator {
+        let generator = borrow_global_mut<Generator>(addr);
+        let creation_num = generator.counter;
+        generator.counter = creation_num + 1;
+        GUID { id: ID { creation_num, addr } }
+    }
+
+    /// Publish a Generator resource under `account`
+    public fun publish_generator(account: &signer) {
+        move_to(account, Generator { counter: 0 })
+    }
+
+    /// Get the non-privileged ID associated with a GUID
+    public fun id(guid: &GUID): ID {
+        *&guid.id
+    }
+
+    /// Return the account address that created the GUID
+    public fun creator_address(guid: &GUID): address {
+        guid.id.addr
+    }
+
+    /// Return the account address that created the guid::ID
+    public fun id_creator_address(id: &ID): address {
+        id.addr
+    }
+
+    /// Return the creation number associated with the GUID
+    public fun creation_num(guid: &GUID): u64 {
+        guid.id.creation_num
+    }
+
+    /// Return the creation number associated with the guid::ID
+    public fun id_creation_num(id: &ID): u64 {
+        id.creation_num
+    }
+
+    /// Return true if the GUID's ID is `id`
+    public fun eq_id(guid: &GUID, id: &ID): bool {
+        &guid.id == id
+    }
+
+    /// Return the number of the next GUID to be created by `addr`
+    public fun get_next_creation_num(addr: address): u64 acquires Generator {
+        if (!exists<Generator>(addr)) {
+            0
+        } else {
+            borrow_global<Generator>(addr).counter
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/offer.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/offer.move
new file mode 100644
index 000000000..06366db57
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/offer.move
@@ -0,0 +1,135 @@
+/// Provides a way to transfer structs from one account to another in two transactions.
+/// Unlike many languages, Move cannot move data from one account to another with
+/// single-signer transactions. As of this writing, ordinary transactions can only have
+/// a single signer, and Move code can only store to an address (via `move_to`) if it
+/// can supply a reference to a signer for the destination address (there are special case
+/// exceptions in Genesis and DiemAccount where there can temporarily be multiple signers).
+///
+/// Offer solves this problem by providing an `Offer` resource.  To move a struct `T` from
+/// account A to B, account A first publishes an `Offer<T>` resource at `address_of(A)`,
+/// using the `offer::create` function.
+/// Then account B, in a separate transaction, can move the struct `T` from the `Offer` at
+/// A's address to the desired destination. B accesses the resource using the `redeem` function,
+/// which aborts unless the `for` field is B's address (preventing other addresses from
+/// accessing the `T` that is intended only for B). A can also redeem the `T` value if B hasn't
+/// redeemed it.
+module std::offer {
+  use std::signer;
+  use std::error;
+
+  /// A wrapper around value `offered` that can be claimed by the address stored in `for`.
+  struct Offer<Offered> has key { offered: Offered, for: address }
+
+  /// An offer of the specified type for the account does not exist
+  const EOFFER_DNE_FOR_ACCOUNT: u64 = 0;
+
+  /// Address already has an offer of this type.
+  const EOFFER_ALREADY_CREATED: u64 = 1;
+
+  /// Address does not have an offer of this type to redeem.
+  const EOFFER_DOES_NOT_EXIST: u64 = 2;
+
+  /// Publish a value of type `Offered` under the sender's account. The value can be claimed by
+  /// either the `for` address or the transaction sender.
+  public fun create<Offered: store>(account: &signer, offered: Offered, for: address) {
+    assert!(!exists<Offer<Offered>>(signer::address_of(account)), error::already_exists(EOFFER_ALREADY_CREATED));
+    move_to(account, Offer<Offered> { offered, for });
+  }
+  spec create {
+    /// Offer a struct to the account under address `for` by
+    /// placing the offer under the signer's address
+    aborts_if exists<Offer<Offered>>(signer::address_of(account));
+    ensures exists<Offer<Offered>>(signer::address_of(account));
+    ensures global<Offer<Offered>>(signer::address_of(account)) == Offer<Offered> { offered: offered, for: for };
+  }
+
+  /// Claim the value of type `Offered` published at `offer_address`.
+  /// Only succeeds if the sender is the intended recipient stored in `for` or the original
+  /// publisher `offer_address`.
+  /// Also fails if there is no `Offer<Offered>` published.
+  public fun redeem<Offered: store>(account: &signer, offer_address: address): Offered acquires Offer {
+    assert!(exists<Offer<Offered>>(offer_address), error::not_found(EOFFER_DOES_NOT_EXIST));
+    let Offer<Offered> { offered, for } = move_from<Offer<Offered>>(offer_address);
+    let sender = signer::address_of(account);
+    assert!(sender == for || sender == offer_address, error::invalid_argument(EOFFER_DNE_FOR_ACCOUNT));
+    offered
+  }
+  spec redeem {
+    /// Aborts if there is no offer under `offer_address` or if the account
+    /// cannot redeem the offer.
+    /// Ensures that the offered struct under `offer_address` is removed.
+    aborts_if !exists<Offer<Offered>>(offer_address);
+    aborts_if !is_allowed_recipient<Offered>(offer_address, signer::address_of(account));
+    ensures !exists<Offer<Offered>>(offer_address);
+    ensures result == old(global<Offer<Offered>>(offer_address).offered);
+  }
+
+  // Returns true if an offer of type `Offered` exists at `offer_address`.
+  public fun exists_at<Offered: store>(offer_address: address): bool {
+    exists<Offer<Offered>>(offer_address)
+  }
+  spec exists_at {
+    aborts_if false;
+    /// Returns whether or not an `Offer` resource is under the given address `offer_address`.
+    ensures result == exists<Offer<Offered>>(offer_address);
+  }
+
+
+  // Returns the address of the `Offered` type stored at `offer_address.
+  // Fails if no such `Offer` exists.
+  public fun address_of<Offered: store>(offer_address: address): address acquires Offer {
+    assert!(exists<Offer<Offered>>(offer_address), error::not_found(EOFFER_DOES_NOT_EXIST));
+    borrow_global<Offer<Offered>>(offer_address).for
+  }
+  spec address_of {
+    /// Aborts is there is no offer resource `Offer` at the `offer_address`.
+    /// Returns the address of the intended recipient of the Offer
+    /// under the `offer_address`.
+    aborts_if !exists<Offer<Offered>>(offer_address);
+    ensures result == global<Offer<Offered>>(offer_address).for;
+  }
+
+// =================================================================
+// Module Specification
+
+  spec module {} // switch documentation context back to module level
+
+  /// # Access Control
+
+  /// ## Creation of Offers
+
+  spec schema NoOfferCreated<Offered> {
+    /// Says no offer is created for any address. Later, it is applied to all functions
+    /// except `create`
+    ensures forall addr: address where !old(exists<Offer<Offered>>(addr)) : !exists<Offer<Offered>>(addr);
+  }
+  spec module {
+    /// Apply OnlyCreateCanCreateOffer to every function except `create`
+    apply NoOfferCreated<Offered> to *<Offered>, * except create;
+  }
+
+  /// ## Removal of Offers
+
+  spec schema NoOfferRemoved<Offered> {
+    /// Says no offer is removed for any address. Applied below to everything except `redeem`
+    ensures forall addr: address where old(exists<Offer<Offered>>(addr)) :
+              (exists<Offer<Offered>>(addr) && global<Offer<Offered>>(addr) == old(global<Offer<Offered>>(addr)));
+  }
+  spec module {
+    /// Only `redeem` can remove an offer from the global store.
+    apply NoOfferRemoved<Offered> to *<Offered>, * except redeem;
+  }
+
+  /// # Helper Functions
+
+  spec module {
+    /// Returns true if the recipient is allowed to redeem `Offer<Offered>` at `offer_address`
+    /// and false otherwise.
+    fun is_allowed_recipient<Offered>(offer_addr: address, recipient: address): bool {
+      recipient == global<Offer<Offered>>(offer_addr).for || recipient == offer_addr
+    }
+  }
+
+
+
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/role.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/role.move
new file mode 100644
index 000000000..468a8d7a7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/role.move
@@ -0,0 +1,34 @@
+/// A generic module for role-based access control (RBAC).
+
+module std::role {
+    use std::error;
+    use std::signer;
+
+    const EROLE: u64 = 0;
+
+    struct Role<phantom Type> has key {}
+
+    /// Assign the role to the account. The caller must pass a witness, so is
+    /// expected to be a function of the module that defines `Type`.
+    public fun assign_role<Type>(to: &signer, _witness: &Type) {
+        assert!(!has_role<Type>(signer::address_of(to)), error::already_exists(EROLE));
+        move_to<Role<Type>>(to, Role<Type>{});
+    }
+
+    /// Revoke the role from the account. The caller must pass a witness, so is
+    /// expected to be a function of the module that defines `Type`.
+    public fun revoke_role<Type>(from: &signer, _witness: &Type) acquires Role {
+        assert!(has_role<Type>(signer::address_of(from)), error::not_found(EROLE));
+        let Role<Type>{} = move_from<Role<Type>>(signer::address_of(from));
+    }
+
+    /// Return true iff the address has the role.
+    public fun has_role<Type>(addr: address): bool {
+        exists<Role<Type>>(addr)
+    }
+
+    /// assert! that the account has the role.
+    public fun assert_has_role<Type>(account: &signer) {
+        assert!(has_role<Type>(signer::address_of(account)), error::not_found(EROLE));
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/sources/vault.move b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/vault.move
new file mode 100644
index 000000000..7316a0ec1
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/sources/vault.move
@@ -0,0 +1,543 @@
+/// A module which implements secure memory (called a *vault*) of some content which can only be operated
+/// on if authorized by a signer. Authorization is managed by
+/// [*capabilities*](https://en.wikipedia.org/wiki/Capability-based_security). The vault supports delegation
+/// of capabilities to other signers (including revocation) as well as transfer of ownership.
+///
+/// # Overview
+///
+/// ## Capabilities
+///
+/// Capabilities are unforgeable tokens which represent the right to perform a particular
+/// operation on the vault. To acquire a capability instance, authentication via a signer is needed.
+/// This signer must either be the owner of the vault, or someone the capability has been delegated to.
+////
+/// Once acquired, a capability can be passed to other functions to perform the operation it enables.
+/// Specifically, those called functions do not need to have access to the original signer. This is a key
+/// property of capability based security as it prevents granting more rights to code than needed.
+///
+/// Capability instances are unforgeable because they are localized to transactions. They can only be
+/// created by functions of this module, and as they do not have the Move language `store` or `key` abilities,
+/// they cannot leak out of a transaction.
+///
+/// Example:
+///
+/// ```move
+/// struct Content has store { ssn: u64 }
+/// ...
+/// // Create new vault
+/// vault::new(signer, b"My Vault", Content{ ssn: 525659745 });
+/// ...
+/// // Obtain a read capability
+/// let read_cap = vault::acquire_read_cap<Content>(signer);
+/// process(&read_cap)
+/// ...
+/// fun process(cap: &vault::ReadCap<Content>) {
+///     let accessor = vault::read_accessor(cap);
+///     let content = vault::borrow(accessor);
+///     << do something with `content: &Content` >>
+///     vault::release_read_accessor(accessor);
+/// }
+/// ```
+///
+/// ## Delegation
+///
+/// Delegation provides the option to delegate the right to acquire a vault capability to other
+/// signers than the owner of the vault. Delegates still need to authenticate themselves using their
+/// signer, similar as the owner does. All security arguments for owners apply also to delegates.
+/// Delegation can be revoked removing previously granted rights from a delegate.
+///
+/// Delegation can be configured to be transitive by granting the right to acquire a delegation capability
+/// to delegates, which can then further delegate access rights.
+///
+/// By default, when a vault is created, it does not support delegation. The owner of the vault
+/// needs to explicitly enable delegation. This allows to create vaults which are not intended for delegation
+/// and one does not need to worry about its misuse.
+///
+/// Example:
+///
+/// ```move
+/// vault::new(signer, b"My Vault", Content{ ssn: 525659745 });
+/// // Enable delegation for this vault. Only the owning signer can do this.
+/// vault::enable_delegation<Content>(signer);
+/// ...
+/// // Delegate read capability to some other signer.
+/// let delegate_cap = vault::acquire_delegate_cap<Content>(signer);
+/// vault::delegate_read_cap(&delegate_cap, other_signer);
+/// ...
+/// // Other signer can now acquire read cap
+/// let read_cap = vault::acquire_read_cap<Content>(other_signer);
+/// ...
+/// // The granted capability can be revoked. There is no need to have the other signer for this.
+/// vault::revoke_read_cap(&delegate_cap, signer::address_of(other_signer));
+/// ```
+///
+/// ## Abilities
+///
+/// Currently, we require that the `Content` type of a vault has the `drop` ability in order to instantiate
+/// a capability type like `ReadCap<Content>`. Without this, capabilities themselves would need to have an
+/// explicit release function, which makes little sense as they are pure values. We expect the Move
+/// language to have 'phantom type parameters' or similar features added, which will allows us to have
+/// `ReadCap<Content>` droppable and copyable without `Content` needing the same.
+module std::vault {
+
+    use std::error;
+    use std::event;
+    use std::option;
+    use std::signer;
+    use std::vector;
+
+    // ================================================================================================================
+    // Error reasons
+
+    const EVAULT: u64 = 0;
+    const EDELEGATE: u64 = 1;
+    const EACCESSOR_IN_USE: u64 = 2;
+    const EACCESSOR_INCONSISTENCY: u64 = 3;
+    const EDELEGATE_TO_SELF: u64 = 4;
+    const EDELEGATION_NOT_ENABLED: u64 = 5;
+    const EEVENT: u64 = 6;
+
+
+    // ================================================================================================================
+    // Capabilities
+
+    /// A capability to read the content of the vault. Notice that the capability cannot be
+    /// stored but can be freely copied and dropped.
+    //
+    /// TODO: remove `drop` on `Content` here and elsewhere once we have phantom type parameters.
+    struct ReadCap<phantom Content: store + drop> has copy, drop {
+        vault_address: address,
+        authority: address
+    }
+
+    /// A capability to modify the content of the vault.
+    struct ModifyCap<phantom Content: store + drop> has copy, drop {
+        vault_address: address,
+        authority: address
+    }
+
+    /// A capability to delegate access to the vault.
+    struct DelegateCap<phantom Content: store + drop> has copy, drop {
+        vault_address: address,
+        authority: address
+    }
+
+    /// A capability to transfer ownership of the vault.
+    struct TransferCap<phantom Content: store + drop> has copy, drop {
+        vault_address: address,
+        authority: address
+    }
+
+    /// A type describing a capability. This is used for functions like `Self::delegate` where we need to
+    /// specify capability types.
+    struct CapType has copy, drop, store { code: u8 }
+
+    /// Creates a read capability type.
+    public fun read_cap_type(): CapType { CapType{ code : 0 } }
+
+    /// Creates a modify  capability type.
+    public fun modify_cap_type(): CapType { CapType{ code : 1 } }
+
+    /// Creates a delegate  capability type.
+    public fun delegate_cap_type(): CapType { CapType{ code : 2 } }
+
+    /// Creates a transfer  capability type.
+    public fun transfer_cap_type(): CapType { CapType{ code : 3 } }
+
+    // ================================================================================================================
+    // Events
+
+    /// An event which we generate on vault access delegation or revocation if event generation is enabled.
+    struct VaultDelegateEvent has store, drop {
+        metadata: vector<u8>,
+        vault_address: address,
+        authority: address,
+        delegate: address,
+        cap: CapType,
+        is_revoked: bool,
+    }
+
+    /// An event which we generate on vault transfer if event generation is enabled.
+    struct VaultTransferEvent has store, drop {
+        metadata: vector<u8>,
+        vault_address: address,
+        authority: address,
+        new_vault_address: address,
+    }
+
+    // ================================================================================================================
+    // Representation
+
+    /// Private. The vault representation.
+    struct Vault<Content: store> has key {
+        /// The content. If the option is empty, the content is currently moved into an
+        /// accessor in order to work with it.
+        content: option::Option<Content>,
+    }
+
+    /// Private. If the vault supports delegation, information about the delegates.
+    struct VaultDelegates<phantom Content: store> has key {
+         /// The currently authorized delegates.
+        delegates: vector<address>,
+    }
+
+    /// Private. If event generation is enabled, contains the event generators.
+    struct VaultEvents<phantom Content: store> has key {
+        /// Metadata which identifies this vault. This information is used
+        /// in events generated by this module.
+        metadata: vector<u8>,
+        /// Event handle for vault delegation.
+        delegate_events: event::EventHandle<VaultDelegateEvent>,
+        /// Event handle for vault transfer.
+        transfer_events: event::EventHandle<VaultTransferEvent>,
+    }
+
+    /// Private. A value stored at a delegates address pointing to the owner of the vault. Also
+    /// describes the capabilities granted to this delegate.
+    struct VaultDelegate<phantom Content: store> has key {
+        vault_address: address,
+        granted_caps: vector<CapType>,
+    }
+
+    // ================================================================================================================
+    // Vault Creation and Removal
+
+    /// Creates new vault for the given signer. The vault is populated with the `initial_content`.
+    public fun new<Content: store>(owner: &signer,  initial_content: Content) {
+        let addr = signer::address_of(owner);
+        assert!(!exists<Vault<Content>>(addr), error::already_exists(EVAULT));
+        move_to<Vault<Content>>(
+            owner,
+            Vault{
+                content: option::some(initial_content)
+            }
+        )
+    }
+
+    /// Returns `true` if the delegation functionality has been enabled.
+    /// Returns `false` otherwise.
+    public fun is_delegation_enabled<Content: store>(owner: &signer): bool {
+        let addr = signer::address_of(owner);
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
+        exists<VaultDelegates<Content>>(addr)
+    }
+
+    /// Enables delegation functionality for this vault. By default, vaults to not support delegation.
+    public fun enable_delegation<Content: store>(owner: &signer) {
+        assert!(!is_delegation_enabled<Content>(owner), error::already_exists(EDELEGATE));
+        move_to<VaultDelegates<Content>>(owner, VaultDelegates{delegates: vector::empty()})
+    }
+
+    /// Enables event generation for this vault. This passed metadata is used to identify
+    /// the vault in events.
+    public fun enable_events<Content: store>(owner: &signer, metadata: vector<u8>) {
+        let addr = signer::address_of(owner);
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
+        assert!(!exists<VaultEvents<Content>>(addr), error::already_exists(EEVENT));
+        move_to<VaultEvents<Content>>(
+            owner,
+            VaultEvents{
+                metadata,
+                delegate_events: event::new_event_handle<VaultDelegateEvent>(owner),
+                transfer_events: event::new_event_handle<VaultTransferEvent>(owner),
+            }
+        );
+    }
+
+    /// Removes a vault and all its associated data, returning the current content. In order for
+    /// this to succeed, there must be no active accessor for the vault.
+    public fun remove_vault<Content: store + drop>(owner: &signer): Content
+    acquires Vault, VaultDelegates, VaultDelegate, VaultEvents {
+        let addr = signer::address_of(owner);
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
+        let Vault{content} = move_from<Vault<Content>>(addr);
+        assert!(option::is_some(&content), error::invalid_state(EACCESSOR_IN_USE));
+
+        if (exists<VaultDelegates<Content>>(addr)) {
+            let delegate_cap = DelegateCap<Content>{vault_address: addr, authority: addr};
+            revoke_all(&delegate_cap);
+        };
+        if (exists<VaultEvents<Content>>(addr)) {
+            let VaultEvents{metadata: _metadata, delegate_events, transfer_events} =
+                move_from<VaultEvents<Content>>(addr);
+            event::destroy_handle(delegate_events);
+            event::destroy_handle(transfer_events);
+        };
+
+        option::extract(&mut content)
+    }
+
+    // ================================================================================================================
+    // Acquiring Capabilities
+
+    /// Acquires the capability to read the vault. The passed signer must either be the owner
+    /// of the vault or a delegate with appropriate access.
+    public fun acquire_read_cap<Content: store + drop>(requester: &signer): ReadCap<Content>
+    acquires VaultDelegate {
+        let (vault_address, authority) = validate_cap<Content>(requester, read_cap_type());
+        ReadCap{ vault_address, authority }
+    }
+
+    /// Acquires the capability to modify the vault. The passed signer must either be the owner
+    /// of the vault or a delegate with appropriate access.
+    public fun acquire_modify_cap<Content: store + drop>(requester: &signer): ModifyCap<Content>
+    acquires VaultDelegate {
+        let (vault_address, authority) = validate_cap<Content>(requester, modify_cap_type());
+        ModifyCap{ vault_address, authority }
+    }
+
+    /// Acquires the capability to delegate access to the vault. The passed signer must either be the owner
+    /// of the vault or a delegate with appropriate access.
+    public fun acquire_delegate_cap<Content: store + drop>(requester: &signer): DelegateCap<Content>
+    acquires VaultDelegate {
+        let (vault_address, authority) = validate_cap<Content>(requester, delegate_cap_type());
+        DelegateCap{ vault_address, authority }
+    }
+
+    /// Acquires the capability to transfer the vault. The passed signer must either be the owner
+    /// of the vault or a delegate with appropriate access.
+    public fun acquire_transfer_cap<Content: store + drop>(requester: &signer): TransferCap<Content>
+    acquires VaultDelegate {
+        let (vault_address, authority) = validate_cap<Content>(requester, transfer_cap_type());
+        TransferCap{ vault_address, authority }
+    }
+
+    /// Private. Validates whether a capability can be acquired by the given signer. Returns the
+    /// pair of the vault address and the used authority.
+    fun validate_cap<Content: store + drop>(requester: &signer, cap: CapType): (address, address)
+    acquires VaultDelegate {
+        let addr = signer::address_of(requester);
+        if (exists<VaultDelegate<Content>>(addr)) {
+            // The signer is a delegate. Check it's granted capabilities.
+            let delegate = borrow_global<VaultDelegate<Content>>(addr);
+            assert!(vector::contains(&delegate.granted_caps, &cap), error::permission_denied(EDELEGATE));
+            (delegate.vault_address, addr)
+        } else {
+            // If it is not a delegate, it must be the owner to succeed.
+            assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
+            (addr, addr)
+        }
+    }
+
+
+    // ================================================================================================================
+    // Read Accessor
+
+    /// A read accessor for the content of the vault.
+    struct ReadAccessor<Content: store + drop> {
+        content: Content,
+        vault_address: address,
+    }
+
+    /// Creates a read accessor for the content in the vault based on a read capability.
+    ///
+    /// Only one accessor (whether read or modify) for the same vault can exist at a time, and this
+    /// function will abort if one is in use. An accessor must be explicitly released using
+    /// `Self::release_read_accessor`.
+    public fun read_accessor<Content: store + drop>(cap: &ReadCap<Content>): ReadAccessor<Content>
+    acquires Vault {
+        let content = &mut borrow_global_mut<Vault<Content>>(cap.vault_address).content;
+        assert!(option::is_some(content), error::invalid_state(EACCESSOR_IN_USE));
+        ReadAccessor{ vault_address: cap.vault_address, content: option::extract(content) }
+    }
+
+    /// Returns a reference to the content represented by a read accessor.
+    public fun borrow<Content: store + drop>(accessor: &ReadAccessor<Content>): &Content {
+        &accessor.content
+    }
+
+    /// Releases read accessor.
+    public fun release_read_accessor<Content: store + drop>(accessor: ReadAccessor<Content>)
+    acquires Vault {
+        let ReadAccessor{ content: new_content, vault_address } = accessor;
+        let content = &mut borrow_global_mut<Vault<Content>>(vault_address).content;
+        // We (should be/are) able to prove that the below cannot happen, but we leave the assertion
+        // here anyway for double safety.
+        assert!(option::is_none(content), error::internal(EACCESSOR_INCONSISTENCY));
+        option::fill(content, new_content);
+    }
+
+    // ================================================================================================================
+    // Modify Accessor
+
+    /// A modify accessor for the content of the vault.
+    struct ModifyAccessor<Content: store + drop> {
+        content: Content,
+        vault_address: address,
+    }
+
+    /// Creates a modify accessor for the content in the vault based on a modify capability. This
+    /// is similar like `Self::read_accessor` but the returned accessor will allow to mutate
+    /// the content.
+    public fun modify_accessor<Content: store + drop>(cap: &ModifyCap<Content>): ModifyAccessor<Content>
+    acquires Vault {
+        let content = &mut borrow_global_mut<Vault<Content>>(cap.vault_address).content;
+        assert!(option::is_some(content), error::invalid_state(EACCESSOR_IN_USE));
+        ModifyAccessor{ vault_address: cap.vault_address, content: option::extract(content) }
+    }
+
+    /// Returns a mutable reference to the content represented by a modify accessor.
+    public fun borrow_mut<Content: store + drop>(accessor: &mut ModifyAccessor<Content>): &mut Content {
+        &mut accessor.content
+    }
+
+    /// Releases a modify accessor. This will ensure that any modifications are written back
+    /// to the vault.
+    public fun release_modify_accessor<Content: store + drop>(accessor: ModifyAccessor<Content>)
+    acquires Vault {
+        let ModifyAccessor{ content: new_content, vault_address } = accessor;
+        let content = &mut borrow_global_mut<Vault<Content>>(vault_address).content;
+        // We (should be/are) able to prove that the below cannot happen, but we leave the assertion
+        // here anyway for double safety.
+        assert!(option::is_none(content), error::internal(EACCESSOR_INCONSISTENCY));
+        option::fill(content, new_content);
+    }
+
+
+    // ================================================================================================================
+    // Delegation
+
+    /// Delegates the right to acquire a capability of the given type. Delegation must have been enabled
+    /// during vault creation for this to succeed.
+    public fun delegate<Content: store + drop>(cap: &DelegateCap<Content>, to_signer: &signer, cap_type: CapType)
+    acquires VaultDelegates, VaultDelegate, VaultEvents {
+        assert!(
+            exists<VaultDelegates<Content>>(cap.vault_address),
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
+        );
+
+        let addr = signer::address_of(to_signer);
+        assert!(addr != cap.vault_address, error::invalid_argument(EDELEGATE_TO_SELF));
+
+        if (!exists<VaultDelegate<Content>>(addr)) {
+            // Create VaultDelegate if it is not yet existing.
+            move_to<VaultDelegate<Content>>(
+                to_signer,
+                VaultDelegate{vault_address: cap.vault_address, granted_caps: vector::empty()}
+            );
+            // Add the the delegate to VaultDelegates.
+            let vault_delegates = borrow_global_mut<VaultDelegates<Content>>(cap.vault_address);
+            add_element(&mut vault_delegates.delegates, addr);
+        };
+
+        // Grant the capability.
+        let delegate = borrow_global_mut<VaultDelegate<Content>>(addr);
+        add_element(&mut delegate.granted_caps, *&cap_type);
+
+        // Generate event
+        emit_delegate_event(cap, cap_type, addr, false);
+    }
+
+    /// Revokes the delegated right to acquire a capability of given type.
+    public fun revoke<Content: store + drop>(cap: &DelegateCap<Content>, addr: address, cap_type: CapType)
+    acquires VaultDelegates, VaultDelegate, VaultEvents {
+        assert!(
+            exists<VaultDelegates<Content>>(cap.vault_address),
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
+        );
+        assert!(exists<VaultDelegate<Content>>(addr), error::not_found(EDELEGATE));
+
+        let delegate = borrow_global_mut<VaultDelegate<Content>>(addr);
+        remove_element(&mut delegate.granted_caps, &cap_type);
+
+        // If the granted caps of this delegate drop to zero, remove it.
+        if (vector::is_empty(&delegate.granted_caps)) {
+            let VaultDelegate{ vault_address: _owner, granted_caps: _granted_caps} =
+                move_from<VaultDelegate<Content>>(addr);
+            let vault_delegates = borrow_global_mut<VaultDelegates<Content>>(cap.vault_address);
+            remove_element(&mut vault_delegates.delegates, &addr);
+        };
+
+        // Generate event.
+        emit_delegate_event(cap, cap_type, addr, true);
+    }
+
+    /// Revokes all delegate rights for this vault.
+    public fun revoke_all<Content: store + drop>(cap: &DelegateCap<Content>)
+    acquires VaultDelegates, VaultDelegate, VaultEvents {
+        assert!(
+            exists<VaultDelegates<Content>>(cap.vault_address),
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
+        );
+        let delegates = &mut borrow_global_mut<VaultDelegates<Content>>(cap.vault_address).delegates;
+        while (!vector::is_empty(delegates)) {
+            let addr = vector::pop_back(delegates);
+            let VaultDelegate{ vault_address: _vault_address, granted_caps} =
+                move_from<VaultDelegate<Content>>(cap.vault_address);
+            while (!vector::is_empty(&granted_caps)) {
+                let cap_type = vector::pop_back(&mut granted_caps);
+                emit_delegate_event(cap, cap_type, addr, true);
+            }
+        }
+    }
+
+    /// Helper to remove an element from a vector.
+    fun remove_element<E: drop>(v: &mut vector<E>, x: &E) {
+        let (found, index) = vector::index_of(v, x);
+        if (found) {
+            vector::remove(v, index);
+        }
+    }
+
+    /// Helper to add an element to a vector.
+    fun add_element<E: drop>(v: &mut vector<E>, x: E) {
+        if (!vector::contains(v, &x)) {
+            vector::push_back(v, x)
+        }
+    }
+
+    /// Emits a delegation or revocation event if event generation is enabled.
+    fun emit_delegate_event<Content: store + drop>(
+           cap: &DelegateCap<Content>,
+           cap_type: CapType,
+           delegate: address,
+           is_revoked: bool
+    ) acquires VaultEvents {
+        if (exists<VaultEvents<Content>>(cap.vault_address)) {
+            let event = VaultDelegateEvent{
+                metadata: *&borrow_global<VaultEvents<Content>>(cap.vault_address).metadata,
+                vault_address: cap.vault_address,
+                authority: cap.authority,
+                delegate,
+                cap: cap_type,
+                is_revoked
+            };
+            event::emit_event(&mut borrow_global_mut<VaultEvents<Content>>(cap.vault_address).delegate_events, event);
+        }
+    }
+
+    // ================================================================================================================
+    // Transfer
+
+    /// Transfers ownership of the vault to a new signer. All delegations are revoked before transfer,
+    /// and the new owner must re-create delegates as needed.
+    public fun transfer<Content: store + drop>(cap: &TransferCap<Content>, to_owner: &signer)
+    acquires Vault, VaultEvents, VaultDelegate, VaultDelegates {
+        let new_addr = signer::address_of(to_owner);
+        assert!(!exists<Vault<Content>>(new_addr), error::already_exists(EVAULT));
+        assert!(
+            option::is_some(&borrow_global<Vault<Content>>(cap.vault_address).content),
+            error::invalid_state(EACCESSOR_IN_USE)
+        );
+
+        // Revoke all delegates.
+        if (exists<VaultDelegates<Content>>(cap.vault_address)) {
+            let delegate_cap = DelegateCap<Content>{vault_address: cap.vault_address, authority: cap.authority };
+            revoke_all(&delegate_cap);
+        };
+
+        // Emit event if event generation is enabled. We emit the event on the old vault not the new one.
+        if (exists<VaultEvents<Content>>(cap.vault_address)) {
+            let event = VaultTransferEvent {
+                metadata: *&borrow_global<VaultEvents<Content>>(cap.vault_address).metadata,
+                vault_address: cap.vault_address,
+                authority: cap.authority,
+                new_vault_address: new_addr
+            };
+            event::emit_event(&mut borrow_global_mut<VaultEvents<Content>>(cap.vault_address).transfer_events, event);
+        };
+
+        // Move the vault.
+        move_to<Vault<Content>>(to_owner, move_from<Vault<Content>>(cap.vault_address));
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/acl_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/acl_tests.move
new file mode 100644
index 000000000..848320171
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/acl_tests.move
@@ -0,0 +1,55 @@
+#[test_only]
+module std::aclTests {
+    use std::acl;
+    use std::signer;
+    use std::vector;
+    use std::unit_test;
+
+    struct Data has key {
+        value: u64,
+        write_acl: acl::ACL
+    }
+
+    #[test]
+    fun test_success() acquires Data {
+        let (alice, bob) = create_two_signers();
+        let acl = acl::empty();
+        acl::add(&mut acl, signer::address_of(&alice));
+        move_to(&alice, Data {value: 0, write_acl: acl});
+
+        let alice_data = borrow_global_mut<Data>(signer::address_of(&alice));
+        acl::add(&mut alice_data.write_acl, signer::address_of(&bob));
+        acl::remove(&mut alice_data.write_acl, signer::address_of(&bob));
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 7, location = std::acl)]
+    fun test_add_failure() acquires Data {
+        let (alice, bob) = create_two_signers();
+        let acl = acl::empty();
+        acl::add(&mut acl, signer::address_of(&alice));
+        move_to(&alice, Data {value: 0, write_acl: acl});
+
+        let alice_data = borrow_global_mut<Data>(signer::address_of(&alice));
+        acl::add(&mut alice_data.write_acl, signer::address_of(&bob));
+        acl::add(&mut alice_data.write_acl, signer::address_of(&bob));
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 263, location = std::acl)]
+    fun test_remove_failure() acquires Data {
+        let (alice, bob) = create_two_signers();
+        let acl = acl::empty();
+        acl::add(&mut acl, signer::address_of(&alice));
+        move_to(&alice, Data {value: 0, write_acl: acl});
+
+        let alice_data = borrow_global_mut<Data>(signer::address_of(&alice));
+        acl::remove(&mut alice_data.write_acl, signer::address_of(&bob));
+    }
+
+    #[test_only]
+    fun create_two_signers(): (signer, signer) {
+        let signers = &mut unit_test::create_signers_for_testing(2);
+        (vector::pop_back(signers), vector::pop_back(signers))
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/capability_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/capability_tests.move
new file mode 100644
index 000000000..a62506bed
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/capability_tests.move
@@ -0,0 +1,55 @@
+#[test_only]
+module std::capability_tests {
+    use std::capability;
+    use std::signer;
+    use std::unit_test;
+    use std::vector;
+
+    struct Feature has drop {}
+
+    #[test]
+    fun test_success() {
+        let owner = create_signer();
+        capability::create(&owner, &Feature{});
+        let _cap = capability::acquire(&owner, &Feature{});
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0x60000, location = std::capability)]
+    fun test_failure() {
+        let (owner, other) = create_two_signers();
+        capability::create(&owner, &Feature{});
+        let _cap = capability::acquire(&other, &Feature{});
+    }
+
+    #[test]
+    fun test_delegate_success() {
+        let (owner, delegate) = create_two_signers();
+        capability::create(&owner, &Feature{});
+        let cap = capability::acquire(&owner, &Feature{});
+        capability::delegate(cap, &Feature{}, &delegate);
+        let _delegate_cap = capability::acquire(&delegate, &Feature{});
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0x60000, location = std::capability)]
+    fun test_delegate_failure_after_revoke() {
+        let (owner, delegate) = create_two_signers();
+        capability::create(&owner, &Feature{});
+        let cap = capability::acquire(&owner, &Feature{});
+        capability::delegate(copy cap, &Feature{}, &delegate); // the copy should NOT be needed
+        capability::revoke(cap, &Feature{}, signer::address_of(&delegate));
+        let _delegate_cap = capability::acquire(&delegate, &Feature{});
+    }
+
+    #[test_only]
+    fun create_signer(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    #[test_only]
+    fun create_two_signers(): (signer, signer) {
+        let signers = &mut unit_test::create_signers_for_testing(2);
+        (vector::pop_back(signers), vector::pop_back(signers))
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/compare_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/compare_tests.move
new file mode 100644
index 000000000..4af198639
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/compare_tests.move
@@ -0,0 +1,86 @@
+// Tests for polymorphic comparison in Move
+#[test_only]
+module std::compareTests {
+    use std::compare;
+    use std::bcs;
+
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+
+    #[test]
+    fun equality_of_simple_types() {
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&true)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&1u8)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&1u16)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&1u32)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&1u128)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&1u256)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"01")) == EQUAL, 0);
+    }
+
+    #[test]
+    fun inequality_of_simple_types() {
+        // inequality of simple types
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) != EQUAL, 0);
+    }
+
+    #[test]
+    fun less_than_with_natural_ordering() {
+        // less than for types with a natural ordering exposed via bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&false), &bcs::to_bytes(&true)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u8), &bcs::to_bytes(&1u8)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u16), &bcs::to_bytes(&1u16)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u32), &bcs::to_bytes(&1u32)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0), &bcs::to_bytes(&1)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u128), &bcs::to_bytes(&1u128)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u256), &bcs::to_bytes(&1u256)) == LESS_THAN, 0);
+    }
+
+    #[test]
+    fun less_than_without_natural_ordering() {
+        // less then for types without a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x0), &bcs::to_bytes(&@0x1)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x01), &bcs::to_bytes(&@0x10)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x100), &bcs::to_bytes(&@0x001)) == LESS_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"00"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"10")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0000"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); //
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0100"), &bcs::to_bytes(&x"0001")) == LESS_THAN, 0); // potentially confusing
+    }
+
+    #[test]
+    fun greater_than_with_natural_ordering() {
+        // greater than for types with a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) == GREATER_THAN, 0);
+    }
+
+    #[test]
+    fun greater_than_without_natural_ordering() {
+        // greater than for types without a natural ordering exposed by by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x10), &bcs::to_bytes(&@0x01)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x001), &bcs::to_bytes(&@0x100)) == GREATER_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"10"), &bcs::to_bytes(&x"01")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"0000")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0001"), &bcs::to_bytes(&x"0100")) == GREATER_THAN, 0); // potentially confusing
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/errors_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/errors_tests.move
new file mode 100644
index 000000000..ea887b859
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/errors_tests.move
@@ -0,0 +1,18 @@
+#[test_only]
+module std::errors_tests {
+    use std::errors;
+
+    #[test]
+    fun errors_state() {
+        assert!(errors::invalid_state(0) == 1, 0);
+        assert!(errors::requires_address(0) == 2, 1);
+        assert!(errors::requires_role(0) == 3, 2);
+        assert!(errors::not_published(0) == 5, 4);
+        assert!(errors::already_published(0) == 6, 5);
+        assert!(errors::invalid_argument(0) == 7, 6);
+        assert!(errors::limit_exceeded(0) == 8, 7);
+        assert!(errors::internal(0) == 10, 8);
+        assert!(errors::custom(0) == 255, 9);
+    }
+
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/event_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/event_tests.move
new file mode 100644
index 000000000..3ab19d53c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/event_tests.move
@@ -0,0 +1,108 @@
+#[test_only]
+module std::event_tests {
+    //////////////////
+    // Storage tests
+    //////////////////
+
+    use std::bcs;
+    use std::event::{Self, EventHandle, emit_event, new_event_handle};
+    use std::signer::address_of;
+    use std::vector;
+
+    struct Box<T> has copy, drop, store { x: T }
+    struct Box3<T> has copy, drop, store { x: Box<Box<T>> }
+    struct Box7<T> has copy, drop, store { x: Box3<Box3<T>> }
+    struct Box15<T> has copy, drop, store { x: Box7<Box7<T>> }
+    struct Box31<T> has copy, drop, store { x: Box15<Box15<T>> }
+    struct Box63<T> has copy, drop, store { x: Box31<Box31<T>> }
+    struct Box127<T> has copy, drop, store { x: Box63<Box63<T>> }
+
+    struct MyEvent<phantom T: copy + drop + store> has key {
+        e: EventHandle<T>
+    }
+
+    fun box3<T>(x: T): Box3<T> {
+        Box3 { x: Box { x: Box { x } } }
+    }
+
+    fun box7<T>(x: T): Box7<T> {
+        Box7 { x: box3(box3(x)) }
+    }
+
+    fun box15<T>(x: T): Box15<T> {
+        Box15 { x: box7(box7(x)) }
+    }
+
+    fun box31<T>(x: T): Box31<T> {
+        Box31 { x: box15(box15(x)) }
+    }
+
+    fun box63<T>(x: T): Box63<T> {
+        Box63 { x: box31(box31(x)) }
+    }
+
+    fun box127<T>(x: T): Box127<T> {
+        Box127 { x: box63(box63(x)) }
+    }
+
+    fun maybe_init_event<T: copy + drop + store>(s: &signer) {
+        if (exists<MyEvent<T>>(address_of(s))) return;
+
+        move_to(s, MyEvent { e: new_event_handle<T>(s)})
+    }
+
+    public fun event_128(s: &signer) acquires MyEvent {
+        maybe_init_event<Box127<bool>>(s);
+
+        emit_event(&mut borrow_global_mut<MyEvent<Box127<bool>>>(address_of(s)).e, box127(true))
+    }
+
+    public fun event_129(s: &signer) acquires MyEvent {
+        maybe_init_event<Box<Box127<bool>>>(s);
+
+        // will abort
+        emit_event(
+            &mut borrow_global_mut<MyEvent<Box<Box127<bool>>>>(address_of(s)).e,
+            Box { x: box127(true) }
+        )
+    }
+
+    #[test(s = @0x42)]
+    fun test_event_128(s: signer) acquires MyEvent {
+        event_128(&s);
+    }
+
+    #[test(s = @0x42)]
+    #[expected_failure] // VM_MAX_VALUE_DEPTH_REACHED
+    fun test_event_129(s: signer) acquires MyEvent {
+        event_129(&s);
+    }
+
+    // More detailed version of the above--test BCS compatibility between the old event
+    // format and the new wrapper hack.
+    // this test lives here because it is important for the correctness of GUIDWrapper;
+    // see the comments there for more details
+    #[test(s = @0x42)]
+    fun test_guid_wrapper_backward_compatibility(s: signer) {
+        let sender_bytes = bcs::to_bytes(&address_of(&s));
+        let count_bytes = bcs::to_bytes(&0u64);
+        vector::append(&mut count_bytes, sender_bytes);
+        let old_guid = count_bytes;
+        // should be 16 bytes of address + 8 byte integer
+        assert!(vector::length(&old_guid) == 24, 0);
+        let old_guid_bytes = bcs::to_bytes(&old_guid);
+        // old_guid_bytes should be length prefix (24), followed by content of vector
+        // the length prefix is a ULEB encoded 32-bit value, so for length prefix 24,
+        // this should only occupy 1 byte: https://github.com/diem/bcs#uleb128-encoded-integers
+        // hence, 24 byte contents + 1 byte length prefix = 25 bytes
+        assert!(vector::length(&old_guid_bytes) == 25, 1);
+
+        // now, build a new GUID and check byte-for-byte compatibility
+        let guid_wrapper = event::create_guid_wrapper_for_test<u64>(&s);
+        let guid_wrapper_bytes = bcs::to_bytes(&guid_wrapper);
+
+        // check that the guid grapper bytes are identical to the old guid bytes
+        assert!(vector::length(&guid_wrapper_bytes) == vector::length(&old_guid_bytes), 2);
+        assert!(guid_wrapper_bytes == old_guid_bytes, 3)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/guid_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/guid_tests.move
new file mode 100644
index 000000000..00c1388c7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/guid_tests.move
@@ -0,0 +1,43 @@
+#[test_only]
+module std::guid_tests {
+    use std::guid;
+
+    #[test(s = @0x42)]
+    fun test_basics(s: signer) {
+        let id1 = guid::create(&s);
+        let id2 = guid::create(&s);
+
+        assert!(&id1 != &id2, 0);
+
+        assert!(guid::creator_address(&id1) == @0x42, 1);
+        assert!(guid::creator_address(&id2) == @0x42, 2);
+
+        assert!(guid::creation_num(&id1) == 0, 3);
+        assert!(guid::creation_num(&id2) == 1, 4);
+
+        assert!(guid::get_next_creation_num(@0x42) == 2, 5);
+        assert!(guid::get_next_creation_num(@0x0) == 0, 6);
+    }
+
+    #[test(s = @0x42)]
+    fun test_id(s: signer) {
+        let guid = guid::create(&s);
+        let id1 = guid::id(&guid);
+
+        assert!(guid::id_creator_address(&id1) == guid::creator_address(&guid), 3);
+        assert!(guid::id_creation_num(&id1) == guid::creation_num(&guid), 4);
+        assert!(guid::eq_id(&guid, &id1), 2);
+
+        let id2 = guid::create_id(@0x42, 0);
+        assert!(&id1 == &id2, 0);
+
+        let _ids_are_copyable = copy id1;
+    }
+
+    #[test(s = @0x42)]
+    fun test_delegation(s: signer) {
+        let create_cap = guid::gen_create_capability(&s);
+        let guid = guid::create_with_capability(@0x42, &create_cap);
+        assert!(guid::creator_address(&guid) == @0x42, 1);
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/nursery/tests/role_tests.move b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/role_tests.move
new file mode 100644
index 000000000..cbad4cd7f
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/nursery/tests/role_tests.move
@@ -0,0 +1,48 @@
+#[test_only]
+module std::roleTests {
+    use std::role;
+    use std::vector;
+    use std::unit_test;
+
+    struct Developer has drop {}
+    struct User has drop {}
+    struct Admin has drop {}
+
+    #[test]
+    fun test_success() {
+        let (alice, bob) = create_two_signers();
+        role::assign_role<Developer>(&alice, &Developer{});
+        role::assign_role<User>(&alice, &User{});
+        role::assign_role<Admin>(&bob, &Admin{});
+
+        role::revoke_role<Developer>(&alice, &Developer{});
+        role::revoke_role<User>(&alice, &User{});
+        role::revoke_role<Admin>(&bob, &Admin{});
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0x80000, location = std::role)]
+    fun test_assign_failure() {
+        let alice = create_signer();
+        role::assign_role<Developer>(&alice, &Developer{});
+        role::assign_role<Developer>(&alice, &Developer{});
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 0x60000, location = std::role)]
+    fun test_revoke_failure() {
+        let alice = create_signer();
+        role::revoke_role<Developer>(&alice, &Developer{});
+    }
+
+    #[test_only]
+    fun create_signer(): signer {
+        vector::pop_back(&mut unit_test::create_signers_for_testing(1))
+    }
+
+    #[test_only]
+    fun create_two_signers(): (signer, signer) {
+        let signers = &mut unit_test::create_signers_for_testing(2);
+        (vector::pop_back(signers), vector::pop_back(signers))
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/ascii.move b/vendors/move/move-execution/v0/move-stdlib/sources/ascii.move
new file mode 100644
index 000000000..f3c9daec5
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/ascii.move
@@ -0,0 +1,148 @@
+/// The `ASCII` module defines basic string and char newtypes in Move that verify
+/// that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+module std::ascii {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid ASCII character was encountered when creating an ASCII string.
+    const EINVALID_ASCII_CHARACTER: u64 = 0x10000;
+
+   /// The `String` struct holds a vector of bytes that all represent
+   /// valid ASCII characters. Note that these ASCII characters may not all
+   /// be printable. To determine if a `String` contains only "printable"
+   /// characters you should use the `all_characters_printable` predicate
+   /// defined in this module.
+   struct String has copy, drop, store {
+       bytes: vector<u8>,
+   }
+   spec String {
+       invariant forall i in 0..len(bytes): is_valid_char(bytes[i]);
+   }
+
+   /// An ASCII character.
+   struct Char has copy, drop, store {
+       byte: u8,
+   }
+   spec Char {
+       invariant is_valid_char(byte);
+   }
+
+    /// Convert a `byte` into a `Char` that is checked to make sure it is valid ASCII.
+    public fun char(byte: u8): Char {
+        assert!(is_valid_char(byte), EINVALID_ASCII_CHARACTER);
+        Char { byte }
+    }
+    spec char {
+        aborts_if !is_valid_char(byte) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Aborts if
+    /// `bytes` contains non-ASCII characters.
+    public fun string(bytes: vector<u8>): String {
+       let x = try_string(bytes);
+       assert!(
+            option::is_some(&x),
+            EINVALID_ASCII_CHARACTER
+       );
+       option::destroy_some(x)
+    }
+    spec string {
+        aborts_if exists i in 0..len(bytes): !is_valid_char(bytes[i]) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Returns
+    /// `Some(<ascii_string>)` if the `bytes` contains all valid ASCII
+    /// characters. Otherwise returns `None`.
+    public fun try_string(bytes: vector<u8>): Option<String> {
+       let len = vector::length(&bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_valid_char(bytes[j]);
+           };
+           i < len
+       }) {
+           let possible_byte = *vector::borrow(&bytes, i);
+           if (!is_valid_char(possible_byte)) return option::none();
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_valid_char(bytes[j]);
+       };
+       option::some(String { bytes })
+    }
+
+    /// Returns `true` if all characters in `string` are printable characters
+    /// Returns `false` otherwise. Not all `String`s are printable strings.
+    public fun all_characters_printable(string: &String): bool {
+       let len = vector::length(&string.bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_printable_char(string.bytes[j]);
+           };
+           i < len
+       }) {
+           let byte = *vector::borrow(&string.bytes, i);
+           if (!is_printable_char(byte)) return false;
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_printable_char(string.bytes[j]);
+       };
+       true
+    }
+    spec all_characters_printable {
+        ensures result ==> (forall j in 0..len(string.bytes): is_printable_char(string.bytes[j]));
+    }
+
+    public fun push_char(string: &mut String, char: Char) {
+        vector::push_back(&mut string.bytes, char.byte);
+    }
+    spec push_char {
+        ensures len(string.bytes) == len(old(string.bytes)) + 1;
+    }
+
+    public fun pop_char(string: &mut String): Char {
+        Char { byte: vector::pop_back(&mut string.bytes) }
+    }
+    spec pop_char {
+        ensures len(string.bytes) == len(old(string.bytes)) - 1;
+    }
+
+    public fun length(string: &String): u64 {
+        vector::length(as_bytes(string))
+    }
+
+    /// Get the inner bytes of the `string` as a reference
+    public fun as_bytes(string: &String): &vector<u8> {
+       &string.bytes
+    }
+
+    /// Unpack the `string` to get its backing bytes
+    public fun into_bytes(string: String): vector<u8> {
+       let String { bytes } = string;
+       bytes
+    }
+
+    /// Unpack the `char` into its underlying byte.
+    public fun byte(char: Char): u8 {
+       let Char { byte } = char;
+       byte
+    }
+
+    /// Returns `true` if `b` is a valid ASCII character. Returns `false` otherwise.
+    public fun is_valid_char(b: u8): bool {
+       b <= 0x7F
+    }
+
+    /// Returns `true` if `byte` is an printable ASCII character. Returns `false` otherwise.
+    public fun is_printable_char(byte: u8): bool {
+       byte >= 0x20 && // Disallow metacharacters
+       byte <= 0x7E // Don't allow DEL metacharacter
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/bcs.move b/vendors/move/move-execution/v0/move-stdlib/sources/bcs.move
new file mode 100644
index 000000000..7e47428ca
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/bcs.move
@@ -0,0 +1,17 @@
+/// Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+/// Serialization). BCS is the binary encoding for Move resources and other non-module values
+/// published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+/// details on BCS.
+module std::bcs {
+    /// Return the binary representation of `v` in BCS (Binary Canonical Serialization) format
+    native public fun to_bytes<MoveValue>(v: &MoveValue): vector<u8>;
+
+    // ==============================
+    // Module Specification
+    spec module {} // switch to module documentation context
+
+    spec module {
+        /// Native function which is defined in the prover's prelude.
+        native fun serialize<MoveValue>(v: &MoveValue): vector<u8>;
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/bit_vector.move b/vendors/move/move-execution/v0/move-stdlib/sources/bit_vector.move
new file mode 100644
index 000000000..e89795422
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/bit_vector.move
@@ -0,0 +1,161 @@
+module std::bit_vector {
+    use std::vector;
+
+    /// The provided index is out of bounds
+    const EINDEX: u64 = 0x20000;
+    /// An invalid length of bitvector was given
+    const ELENGTH: u64 = 0x20001;
+
+    const WORD_SIZE: u64 = 1;
+    /// The maximum allowed bitvector size
+    const MAX_SIZE: u64 = 1024;
+
+    struct BitVector has copy, drop, store {
+        length: u64,
+        bit_field: vector<bool>,
+    }
+
+    public fun new(length: u64): BitVector {
+        assert!(length > 0, ELENGTH);
+        assert!(length < MAX_SIZE, ELENGTH);
+        let counter = 0;
+        let bit_field = vector::empty();
+        while ({spec {
+            invariant counter <= length;
+            invariant len(bit_field) == counter;
+        };
+            (counter < length)}) {
+            vector::push_back(&mut bit_field, false);
+            counter = counter + 1;
+        };
+        spec {
+            assert counter == length;
+            assert len(bit_field) == length;
+        };
+
+        BitVector {
+            length,
+            bit_field,
+        }
+    }
+    spec new {
+        include NewAbortsIf;
+        ensures result.length == length;
+        ensures len(result.bit_field) == length;
+    }
+    spec schema NewAbortsIf {
+        length: u64;
+        aborts_if length <= 0 with ELENGTH;
+        aborts_if length >= MAX_SIZE with ELENGTH;
+    }
+
+    /// Set the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun set(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = true;
+    }
+    spec set {
+        include SetAbortsIf;
+        ensures bitvector.bit_field[bit_index];
+    }
+    spec schema SetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Unset the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun unset(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = false;
+    }
+    spec unset {
+        include UnsetAbortsIf;
+        ensures !bitvector.bit_field[bit_index];
+    }
+    spec schema UnsetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Shift the `bitvector` left by `amount`. If `amount` is greater than the
+    /// bitvector's length the bitvector will be zeroed out.
+    public fun shift_left(bitvector: &mut BitVector, amount: u64) {
+        if (amount >= bitvector.length) {
+           let len = vector::length(&bitvector.bit_field);
+           let i = 0;
+           while (i < len) {
+               let elem = vector::borrow_mut(&mut bitvector.bit_field, i);
+               *elem = false;
+               i = i + 1;
+           };
+        } else {
+            let i = amount;
+
+            while (i < bitvector.length) {
+                if (is_index_set(bitvector, i)) set(bitvector, i - amount)
+                else unset(bitvector, i - amount);
+                i = i + 1;
+            };
+
+            i = bitvector.length - amount;
+
+            while (i < bitvector.length) {
+                unset(bitvector, i);
+                i = i + 1;
+            };
+        }
+    }
+
+    /// Return the value of the bit at `bit_index` in the `bitvector`. `true`
+    /// represents "1" and `false` represents a 0
+    public fun is_index_set(bitvector: &BitVector, bit_index: u64): bool {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        *vector::borrow(&bitvector.bit_field, bit_index)
+    }
+    spec is_index_set {
+        include IsIndexSetAbortsIf;
+        ensures result == bitvector.bit_field[bit_index];
+    }
+    spec schema IsIndexSetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+    spec fun spec_is_index_set(bitvector: BitVector, bit_index: u64): bool {
+        if (bit_index >= length(bitvector)) {
+            false
+        } else {
+            bitvector.bit_field[bit_index]
+        }
+    }
+
+    /// Return the length (number of usable bits) of this bitvector
+    public fun length(bitvector: &BitVector): u64 {
+        vector::length(&bitvector.bit_field)
+    }
+
+    /// Returns the length of the longest sequence of set bits starting at (and
+    /// including) `start_index` in the `bitvector`. If there is no such
+    /// sequence, then `0` is returned.
+    public fun longest_set_sequence_starting_at(bitvector: &BitVector, start_index: u64): u64 {
+        assert!(start_index < bitvector.length, EINDEX);
+        let index = start_index;
+
+        // Find the greatest index in the vector such that all indices less than it are set.
+        while (index < bitvector.length) {
+            if (!is_index_set(bitvector, index)) break;
+            index = index + 1;
+        };
+
+        index - start_index
+    }
+
+    #[test_only]
+    public fun word_size(): u64 {
+        WORD_SIZE
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/error.move b/vendors/move/move-execution/v0/move-stdlib/sources/error.move
new file mode 100644
index 000000000..32ba1d616
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/error.move
@@ -0,0 +1,81 @@
+/// This module defines a set of canonical error codes which are optional to use by applications for the
+/// `abort` and `assert!` features.
+///
+/// Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+/// Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+/// Given an error category `0x1` and a reason `0x3`, a canonical abort code looks as `0x10003`.
+///
+/// A module can use a canonical code with a constant declaration of the following form:
+///
+/// ```
+/// ///  An invalid ASCII character was encountered when creating a string.
+/// const EINVALID_CHARACTER: u64 = 0x010003;
+/// ```
+///
+/// This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+/// error reason understand by the existing error map tooling, or as a canonical code.
+///
+/// The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+/// from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+/// associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+/// error codes here are a bit richer than HTTP codes.
+module std::error {
+
+  /// Caller specified an invalid argument (http: 400)
+  const INVALID_ARGUMENT: u64 = 0x1;
+
+  /// An input or result of a computation is out of range (http: 400)
+  const OUT_OF_RANGE: u64 = 0x2;
+
+  /// The system is not in a state where the operation can be performed (http: 400)
+  const INVALID_STATE: u64 = 0x3;
+
+  /// Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+  const UNAUTHENTICATED: u64 = 0x4;
+
+  /// client does not have sufficient permission (http: 403)
+  const PERMISSION_DENIED: u64 = 0x5;
+
+  /// A specified resource is not found (http: 404)
+  const NOT_FOUND: u64 = 0x6;
+
+  /// Concurrency conflict, such as read-modify-write conflict (http: 409)
+  const ABORTED: u64 = 0x7;
+
+  /// The resource that a client tried to create already exists (http: 409)
+  const ALREADY_EXISTS: u64 = 0x8;
+
+  /// Out of gas or other forms of quota (http: 429)
+  const RESOURCE_EXHAUSTED: u64 = 0x9;
+
+  /// Request cancelled by the client (http: 499)
+  const CANCELLED: u64 = 0xA;
+
+  /// Internal error (http: 500)
+  const INTERNAL: u64 = 0xB;
+
+  /// Feature not implemented (http: 501)
+  const NOT_IMPLEMENTED: u64 = 0xC;
+
+  /// The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+  const UNAVAILABLE: u64 = 0xD;
+
+  /// Construct a canonical error code from a category and a reason.
+  public fun canonical(category: u64, reason: u64): u64 {
+    (category << 16) + reason
+  }
+
+  /// Functions to construct a canonical error code of the given category.
+  public fun invalid_argument(r: u64): u64 {  canonical(INVALID_ARGUMENT, r) }
+  public fun out_of_range(r: u64): u64 {  canonical(OUT_OF_RANGE, r) }
+  public fun invalid_state(r: u64): u64 {  canonical(INVALID_STATE, r) }
+  public fun unauthenticated(r: u64): u64 { canonical(UNAUTHENTICATED, r) }
+  public fun permission_denied(r: u64): u64 { canonical(PERMISSION_DENIED, r) }
+  public fun not_found(r: u64): u64 { canonical(NOT_FOUND, r) }
+  public fun aborted(r: u64): u64 { canonical(ABORTED, r) }
+  public fun already_exists(r: u64): u64 { canonical(ALREADY_EXISTS, r) }
+  public fun resource_exhausted(r: u64): u64 {  canonical(RESOURCE_EXHAUSTED, r) }
+  public fun internal(r: u64): u64 {  canonical(INTERNAL, r) }
+  public fun not_implemented(r: u64): u64 {  canonical(NOT_IMPLEMENTED, r) }
+  public fun unavailable(r: u64): u64 { canonical(UNAVAILABLE, r) }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/fixed_point32.move b/vendors/move/move-execution/v0/move-stdlib/sources/fixed_point32.move
new file mode 100644
index 000000000..05f2614fe
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/fixed_point32.move
@@ -0,0 +1,294 @@
+/// Defines a fixed-point numeric type with a 32-bit integer part and
+/// a 32-bit fractional part.
+
+module std::fixed_point32 {
+
+    /// Define a fixed-point numeric type with 32 fractional bits.
+    /// This is just a u64 integer but it is wrapped in a struct to
+    /// make a unique type. This is a binary representation, so decimal
+    /// values may not be exactly representable, but it provides more
+    /// than 9 decimal digits of precision both before and after the
+    /// decimal point (18 digits total). For comparison, double precision
+    /// floating-point has less than 16 decimal digits of precision, so
+    /// be careful about using floating-point to convert these values to
+    /// decimal.
+    struct FixedPoint32 has copy, drop, store { value: u64 }
+
+    ///> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// The denominator provided was zero
+    const EDENOMINATOR: u64 = 0x10001;
+    /// The quotient value would be too large to be held in a `u64`
+    const EDIVISION: u64 = 0x20002;
+    /// The multiplied value would be too large to be held in a `u64`
+    const EMULTIPLICATION: u64 = 0x20003;
+    /// A division by zero was encountered
+    const EDIVISION_BY_ZERO: u64 = 0x10004;
+    /// The computed ratio when converting to a `FixedPoint32` would be unrepresentable
+    const ERATIO_OUT_OF_RANGE: u64 = 0x20005;
+
+    /// Multiply a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the product. This will abort if the product
+    /// overflows.
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64 {
+        // The product of two 64 bit values has 128 bits, so perform the
+        // multiplication with u128 types and keep the full 128 bit product
+        // to avoid losing accuracy.
+        let unscaled_product = (val as u128) * (multiplier.value as u128);
+        // The unscaled product has 32 fractional bits (from the multiplier)
+        // so rescale it by shifting away the low bits.
+        let product = unscaled_product >> 32;
+        // Check whether the value is too large.
+        assert!(product <= MAX_U64, EMULTIPLICATION);
+        (product as u64)
+    }
+    spec multiply_u64 {
+        pragma opaque;
+        include MultiplyAbortsIf;
+        ensures result == spec_multiply_u64(val, multiplier);
+    }
+    spec schema MultiplyAbortsIf {
+        val: num;
+        multiplier: FixedPoint32;
+        aborts_if spec_multiply_u64(val, multiplier) > MAX_U64 with EMULTIPLICATION;
+    }
+    spec fun spec_multiply_u64(val: num, multiplier: FixedPoint32): num {
+        (val * multiplier.value) >> 32
+    }
+
+    /// Divide a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the quotient. This will abort if the divisor
+    /// is zero or if the quotient overflows.
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64 {
+        // Check for division by zero.
+        assert!(divisor.value != 0, EDIVISION_BY_ZERO);
+        // First convert to 128 bits and then shift left to
+        // add 32 fractional zero bits to the dividend.
+        let scaled_value = (val as u128) << 32;
+        let quotient = scaled_value / (divisor.value as u128);
+        // Check whether the value is too large.
+        assert!(quotient <= MAX_U64, EDIVISION);
+        // the value may be too large, which will cause the cast to fail
+        // with an arithmetic error.
+        (quotient as u64)
+    }
+    spec divide_u64 {
+        pragma opaque;
+        include DivideAbortsIf;
+        ensures result == spec_divide_u64(val, divisor);
+    }
+    spec schema DivideAbortsIf {
+        val: num;
+        divisor: FixedPoint32;
+        aborts_if divisor.value == 0 with EDIVISION_BY_ZERO;
+        aborts_if spec_divide_u64(val, divisor) > MAX_U64 with EDIVISION;
+    }
+    spec fun spec_divide_u64(val: num, divisor: FixedPoint32): num {
+        (val << 32) / divisor.value
+    }
+
+    /// Create a fixed-point value from a rational number specified by its
+    /// numerator and denominator. Calling this function should be preferred
+    /// for using `Self::create_from_raw_value` which is also available.
+    /// This will abort if the denominator is zero. It will also
+    /// abort if the numerator is nonzero and the ratio is not in the range
+    /// 2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+    /// rounding errors: if you round to display N digits after the decimal
+    /// point, you can use a denominator of 10^N to avoid numbers where the
+    /// very small imprecision in the binary representation could change the
+    /// rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32 {
+        // If the denominator is zero, this will abort.
+        // Scale the numerator to have 64 fractional bits and the denominator
+        // to have 32 fractional bits, so that the quotient will have 32
+        // fractional bits.
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        assert!(scaled_denominator != 0, EDENOMINATOR);
+        let quotient = scaled_numerator / scaled_denominator;
+        assert!(quotient != 0 || numerator == 0, ERATIO_OUT_OF_RANGE);
+        // Return the quotient as a fixed-point number. We first need to check whether the cast
+        // can succeed.
+        assert!(quotient <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32 { value: (quotient as u64) }
+    }
+    spec create_from_rational {
+        pragma opaque;
+        include CreateFromRationalAbortsIf;
+        ensures result == spec_create_from_rational(numerator, denominator);
+    }
+    spec schema CreateFromRationalAbortsIf {
+        numerator: u64;
+        denominator: u64;
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        let quotient = scaled_numerator / scaled_denominator;
+        aborts_if scaled_denominator == 0 with EDENOMINATOR;
+        aborts_if quotient == 0 && scaled_numerator != 0 with ERATIO_OUT_OF_RANGE;
+        aborts_if quotient > MAX_U64 with ERATIO_OUT_OF_RANGE;
+    }
+    spec fun spec_create_from_rational(numerator: num, denominator: num): FixedPoint32 {
+        FixedPoint32{value: (numerator << 64) / (denominator << 32)}
+    }
+
+    /// Create a fixedpoint value from a raw value.
+    public fun create_from_raw_value(value: u64): FixedPoint32 {
+        FixedPoint32 { value }
+    }
+    spec create_from_raw_value {
+        pragma opaque;
+        aborts_if false;
+        ensures result.value == value;
+    }
+
+    /// Accessor for the raw u64 value. Other less common operations, such as
+    /// adding or subtracting FixedPoint32 values, can be done using the raw
+    /// values directly.
+    public fun get_raw_value(num: FixedPoint32): u64 {
+        num.value
+    }
+
+    /// Returns true if the ratio is zero.
+    public fun is_zero(num: FixedPoint32): bool {
+        num.value == 0
+    }
+
+    /// Returns the smaller of the two FixedPoint32 numbers.
+    public fun min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec min {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_min(num1, num2);
+    }
+    spec fun spec_min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Returns the larger of the two FixedPoint32 numbers.
+    public fun max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec max {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_max(num1, num2);
+    }
+    spec fun spec_max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Create a fixedpoint value from a u64 value.
+    public fun create_from_u64(val: u64): FixedPoint32 {
+        let value = (val as u128) << 32;
+        assert!(value <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32{value: (value as u64)}
+    }
+    spec create_from_u64 {
+        pragma opaque;
+        include CreateFromU64AbortsIf;
+        ensures result == spec_create_from_u64(val);
+    }
+    spec schema CreateFromU64AbortsIf {
+        val: num;
+        let scaled_value = (val as u128) << 32;
+        aborts_if scaled_value > MAX_U64;
+    }
+    spec fun spec_create_from_u64(val: num): FixedPoint32 {
+        FixedPoint32 {value: val << 32}
+    }
+
+    /// Returns the largest integer less than or equal to a given number.
+    public fun floor(num: FixedPoint32): u64 {
+        num.value >> 32
+    }
+    spec floor {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_floor(num);
+    }
+    spec fun spec_floor(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional) >> 32
+        }
+    }
+
+    /// Rounds up the given FixedPoint32 to the next largest integer.
+    public fun ceil(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        if (num.value == floored_num) {
+            return floored_num >> 32
+        };
+        let val = ((floored_num as u128) + (1 << 32));
+        (val >> 32 as u64)
+    }
+    spec ceil {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_ceil(num);
+    }
+    spec fun spec_ceil(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let one = 1 << 32;
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    /// Returns the value of a FixedPoint32 to the nearest integer.
+    public fun round(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        let boundary = floored_num + ((1 << 32) / 2);
+        if (num.value < boundary) {
+            floored_num >> 32
+        } else {
+            ceil(num)
+        }
+    }
+    spec round {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_round(num);
+    }
+    spec fun spec_round(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let boundary = (1 << 32) / 2;
+        let one = 1 << 32;
+        if (fractional < boundary) {
+            (val.value - fractional) >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    // **************** SPECIFICATIONS ****************
+
+    spec module {} // switch documentation context to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/hash.move b/vendors/move/move-execution/v0/move-stdlib/sources/hash.move
new file mode 100644
index 000000000..daadc4e81
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/hash.move
@@ -0,0 +1,8 @@
+/// Module which defines SHA hashes for byte vectors.
+///
+/// The functions in this module are natively declared both in the Move runtime
+/// as in the Move prover's prelude.
+module std::hash {
+    native public fun sha2_256(data: vector<u8>): vector<u8>;
+    native public fun sha3_256(data: vector<u8>): vector<u8>;
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/option.move b/vendors/move/move-execution/v0/move-stdlib/sources/option.move
new file mode 100644
index 000000000..435d7fba7
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/option.move
@@ -0,0 +1,259 @@
+/// This module defines the Option type and its methods to represent and handle an optional value.
+module std::option {
+    use std::vector;
+
+    /// Abstraction of a value that may or may not be present. Implemented with a vector of size
+    /// zero or one because Move bytecode does not have ADTs.
+    struct Option<Element> has copy, drop, store {
+        vec: vector<Element>
+    }
+    spec Option {
+        /// The size of vector is always less than equal to 1
+        /// because it's 0 for "none" or 1 for "some".
+        invariant len(vec) <= 1;
+    }
+
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `Some` while it should be `None`.
+    const EOPTION_IS_SET: u64 = 0x40000;
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `None` while it should be `Some`.
+    const EOPTION_NOT_SET: u64 = 0x40001;
+
+    /// Return an empty `Option`
+    public fun none<Element>(): Option<Element> {
+        Option { vec: vector::empty() }
+    }
+    spec none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_none<Element>();
+    }
+    spec fun spec_none<Element>(): Option<Element> {
+        Option{ vec: vec() }
+    }
+
+    /// Return an `Option` containing `e`
+    public fun some<Element>(e: Element): Option<Element> {
+        Option { vec: vector::singleton(e) }
+    }
+    spec some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_some(e);
+    }
+    spec fun spec_some<Element>(e: Element): Option<Element> {
+        Option{ vec: vec(e) }
+    }
+
+    /// Return true if `t` does not hold a value
+    public fun is_none<Element>(t: &Option<Element>): bool {
+        vector::is_empty(&t.vec)
+    }
+    spec is_none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_none(t);
+    }
+
+    /// Return true if `t` holds a value
+    public fun is_some<Element>(t: &Option<Element>): bool {
+        !vector::is_empty(&t.vec)
+    }
+    spec is_some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_some(t);
+    }
+
+    /// Return true if the value in `t` is equal to `e_ref`
+    /// Always returns `false` if `t` does not hold a value
+    public fun contains<Element>(t: &Option<Element>, e_ref: &Element): bool {
+        vector::contains(&t.vec, e_ref)
+    }
+    spec contains {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_contains(t, e_ref);
+    }
+    spec fun spec_contains<Element>(t: Option<Element>, e: Element): bool {
+        is_some(t) && borrow(t) == e
+    }
+
+    /// Return an immutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow<Element>(t: &Option<Element>): &Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow(&t.vec, 0)
+    }
+    spec borrow {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Return a reference to the value inside `t` if it holds one
+    /// Return `default_ref` if `t` does not hold a value
+    public fun borrow_with_default<Element>(t: &Option<Element>, default_ref: &Element): &Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default_ref
+        else vector::borrow(vec_ref, 0)
+    }
+    spec borrow_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default_ref);
+    }
+
+    /// Return the value inside `t` if it holds one
+    /// Return `default` if `t` does not hold a value
+    public fun get_with_default<Element: copy + drop>(
+        t: &Option<Element>,
+        default: Element,
+    ): Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default
+        else *vector::borrow(vec_ref, 0)
+    }
+    spec get_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Convert the none option `t` to a some option by adding `e`.
+    /// Aborts if `t` already holds a value
+    public fun fill<Element>(t: &mut Option<Element>, e: Element) {
+        let vec_ref = &mut t.vec;
+        if (vector::is_empty(vec_ref)) vector::push_back(vec_ref, e)
+        else abort EOPTION_IS_SET
+    }
+    spec fill {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Convert a `some` option to a `none` by removing and returning the value stored inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun extract<Element>(t: &mut Option<Element>): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::pop_back(&mut t.vec)
+    }
+    spec extract {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_none(t);
+    }
+
+    /// Return a mutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow_mut<Element>(t: &mut Option<Element>): &mut Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow_mut(&mut t.vec, 0)
+    }
+    spec borrow_mut {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value
+    /// Aborts if `t` does not hold a value
+    public fun swap<Element>(t: &mut Option<Element>, e: Element): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        let vec_ref = &mut t.vec;
+        let old_value = vector::pop_back(vec_ref);
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value;
+    /// or if there is no old value, fill it with `e`.
+    /// Different from swap(), swap_or_fill() allows for `t` not holding a value.
+    public fun swap_or_fill<Element>(t: &mut Option<Element>, e: Element): Option<Element> {
+        let vec_ref = &mut t.vec;
+        let old_value = if (vector::is_empty(vec_ref)) none()
+            else some(vector::pop_back(vec_ref));
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap_or_fill {
+        pragma opaque;
+        ensures result == old(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Destroys `t.` If `t` holds a value, return it. Returns `default` otherwise
+    public fun destroy_with_default<Element: drop>(t: Option<Element>, default: Element): Element {
+        let Option { vec } = t;
+        if (vector::is_empty(&mut vec)) default
+        else vector::pop_back(&mut vec)
+    }
+    spec destroy_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Unpack `t` and return its contents
+    /// Aborts if `t` does not hold a value
+    public fun destroy_some<Element>(t: Option<Element>): Element {
+        assert!(is_some(&t), EOPTION_NOT_SET);
+        let Option { vec } = t;
+        let elem = vector::pop_back(&mut vec);
+        vector::destroy_empty(vec);
+        elem
+    }
+    spec destroy_some {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Unpack `t`
+    /// Aborts if `t` holds a value
+    public fun destroy_none<Element>(t: Option<Element>) {
+        assert!(is_none(&t), EOPTION_IS_SET);
+        let Option { vec } = t;
+        vector::destroy_empty(vec)
+    }
+    spec destroy_none {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+    }
+
+    /// Convert `t` into a vector of length 1 if it is `Some`,
+    /// and an empty vector otherwise
+    public fun to_vec<Element>(t: Option<Element>): vector<Element> {
+        let Option { vec } = t;
+        vec
+    }
+    spec to_vec {
+        pragma opaque;
+        aborts_if false;
+        ensures result == t.vec;
+    }
+
+    spec module {} // switch documentation context back to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+
+    /// # Helper Schema
+
+    spec schema AbortsIfNone<Element> {
+        t: Option<Element>;
+        aborts_if is_none(t) with EOPTION_NOT_SET;
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/signer.move b/vendors/move/move-execution/v0/move-stdlib/sources/signer.move
new file mode 100644
index 000000000..1996b4331
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/signer.move
@@ -0,0 +1,21 @@
+module std::signer {
+    // Borrows the address of the signer
+    // Conceptually, you can think of the `signer` as being a struct wrapper arround an
+    // address
+    // ```
+    // struct signer has drop { addr: address }
+    // ```
+    // `borrow_address` borrows this inner field
+    native public fun borrow_address(s: &signer): &address;
+
+    // Copies the address of the signer
+    public fun address_of(s: &signer): address {
+        *borrow_address(s)
+    }
+
+    /// Return true only if `s` is a transaction signer. This is a spec function only available in spec.
+    spec native fun is_txn_signer(s: signer): bool;
+
+    /// Return true only if `a` is a transaction signer address. This is a spec function only available in spec.
+    spec native fun is_txn_signer_addr(a: address): bool;
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/string.move b/vendors/move/move-execution/v0/move-stdlib/sources/string.move
new file mode 100644
index 000000000..fa9f6b61b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/string.move
@@ -0,0 +1,101 @@
+/// The `string` module defines the `String` type which represents UTF8 encoded strings.
+module std::string {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid UTF8 encoding.
+    const EINVALID_UTF8: u64 = 1;
+
+    /// Index out of range.
+    const EINVALID_INDEX: u64 = 2;
+
+    /// A `String` holds a sequence of bytes which is guaranteed to be in utf8 format.
+    struct String has copy, drop, store {
+        bytes: vector<u8>,
+    }
+
+    /// Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+    public fun utf8(bytes: vector<u8>): String {
+        assert!(internal_check_utf8(&bytes), EINVALID_UTF8);
+        String{bytes}
+    }
+
+    /// Tries to create a new string from a sequence of bytes.
+    public fun try_utf8(bytes: vector<u8>): Option<String> {
+        if (internal_check_utf8(&bytes)) {
+            option::some(String{bytes})
+        } else {
+            option::none()
+        }
+    }
+
+    /// Returns a reference to the underlying byte vector.
+    public fun bytes(s: &String): &vector<u8> {
+        &s.bytes
+    }
+
+    /// Checks whether this string is empty.
+    public fun is_empty(s: &String): bool {
+        vector::is_empty(&s.bytes)
+    }
+
+    /// Returns the length of this string, in bytes.
+    public fun length(s: &String): u64 {
+        vector::length(&s.bytes)
+    }
+
+    /// Appends a string.
+    public fun append(s: &mut String, r: String) {
+        vector::append(&mut s.bytes, r.bytes)
+    }
+
+    /// Appends bytes which must be in valid utf8 format.
+    public fun append_utf8(s: &mut String, bytes: vector<u8>) {
+        append(s, utf8(bytes))
+    }
+
+    /// Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+    /// boundary.
+    public fun insert(s: &mut String, at: u64, o: String) {
+        let bytes = &s.bytes;
+        assert!(at <= vector::length(bytes) && internal_is_char_boundary(bytes, at), EINVALID_INDEX);
+        let l = length(s);
+        let front = sub_string(s, 0, at);
+        let end = sub_string(s, at, l);
+        append(&mut front, o);
+        append(&mut front, end);
+        *s = front;
+    }
+
+    /// Returns a sub-string using the given byte indices, where `i` is the first byte position and `j` is the start
+    /// of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+    /// guaranteeing that the result is valid utf8.
+    public fun sub_string(s: &String, i: u64, j: u64): String {
+        let bytes = &s.bytes;
+        let l = vector::length(bytes);
+        assert!(
+            j <= l && i <= j && internal_is_char_boundary(bytes, i) && internal_is_char_boundary(bytes, j),
+            EINVALID_INDEX
+        );
+        String{bytes: internal_sub_string(bytes, i, j)}
+    }
+
+    /// Computes the index of the first occurrence of a string. Returns `length(s)` if no occurrence found.
+    public fun index_of(s: &String, r: &String): u64 {
+        internal_index_of(&s.bytes, &r.bytes)
+    }
+
+
+    // Native API
+    native fun internal_check_utf8(v: &vector<u8>): bool;
+    native fun internal_is_char_boundary(v: &vector<u8>, i: u64): bool;
+    native fun internal_sub_string(v: &vector<u8>, i: u64, j: u64): vector<u8>;
+    native fun internal_index_of(v: &vector<u8>, r: &vector<u8>): u64;
+
+    // Test only API for the native function. Don't return a value so other
+    // tests aren't tempted to use this function.
+    #[test_only]
+    public fun internal_sub_string_for_testing(v: &vector<u8>, i: u64, j: u64) {
+        internal_sub_string(v, i, j);
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/type_name.move b/vendors/move/move-execution/v0/move-stdlib/sources/type_name.move
new file mode 100644
index 000000000..f439a6418
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/type_name.move
@@ -0,0 +1,38 @@
+/// Functionality for converting Move types into values. Use with care!
+module std::type_name {
+    use std::ascii::String;
+
+    struct TypeName has copy, drop, store {
+        /// String representation of the type. All types are represented
+        /// using their source syntax:
+        /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+        /// Struct types are represented as fully qualified type names; e.g.
+        /// `00000000000000000000000000000001::string::String` or
+        /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+        /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+        name: String
+    }
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are defining IDs (the ID of the package in
+    /// storage that first introduced the type).
+    public native fun get<T>(): TypeName;
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are original IDs (the ID of the first version of
+    /// the package, even if the type in question was introduced in a
+    /// later upgrade).
+    public native fun get_with_original_ids<T>(): TypeName;
+
+    /// Get the String representation of `self`
+    public fun borrow_string(self: &TypeName): &String {
+        &self.name
+    }
+
+    /// Convert `self` into its inner String
+    public fun into_string(self: TypeName): String {
+        self.name
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/unit_test.move b/vendors/move/move-execution/v0/move-stdlib/sources/unit_test.move
new file mode 100644
index 000000000..5f8da39e3
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/unit_test.move
@@ -0,0 +1,12 @@
+#[test_only]
+/// Module providing testing functionality. Only included for tests.
+module std::unit_test {
+    /// Return a `num_signers` number of unique signer values. No ordering or
+    /// starting value guarantees are made, only that the order and values of
+    /// the signers in the returned vector is deterministic.
+    ///
+    /// This function is also used to poison modules compiled in `test` mode.
+    /// This will cause a linking failure if an attempt is made to publish a
+    /// test module in a VM that isn't in unit test mode.
+    native public fun create_signers_for_testing(num_signers: u64): vector<signer>;
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/sources/vector.move b/vendors/move/move-execution/v0/move-stdlib/sources/vector.move
new file mode 100644
index 000000000..32d895002
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/sources/vector.move
@@ -0,0 +1,217 @@
+/// A variable-sized container that can hold any type. Indexing is 0-based, and
+/// vectors are growable. This module has many native functions.
+/// Verification of modules that use this one uses model functions that are implemented
+/// directly in Boogie. The specification language has built-in functions operations such
+/// as `singleton_vector`. There are some helper functions defined here for specifications in other
+/// modules as well.
+///
+/// >Note: We did not verify most of the
+/// Move functions here because many have loops, requiring loop invariants to prove, and
+/// the return on investment didn't seem worth it for these simple functions.
+module std::vector {
+
+    /// The index into the vector is out of bounds
+    const EINDEX_OUT_OF_BOUNDS: u64 = 0x20000;
+
+    #[bytecode_instruction]
+    /// Create an empty vector.
+    native public fun empty<Element>(): vector<Element>;
+
+    #[bytecode_instruction]
+    /// Return the length of the vector.
+    native public fun length<Element>(v: &vector<Element>): u64;
+
+    #[bytecode_instruction]
+    /// Acquire an immutable reference to the `i`th element of the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+
+    #[bytecode_instruction]
+    /// Add element `e` to the end of the vector `v`.
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+
+    #[bytecode_instruction]
+    /// Return a mutable reference to the `i`th element in the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+
+    #[bytecode_instruction]
+    /// Pop an element from the end of vector `v`.
+    /// Aborts if `v` is empty.
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+
+    #[bytecode_instruction]
+    /// Destroy the vector `v`.
+    /// Aborts if `v` is not empty.
+    native public fun destroy_empty<Element>(v: vector<Element>);
+
+    #[bytecode_instruction]
+    /// Swaps the elements at the `i`th and `j`th indices in the vector `v`.
+    /// Aborts if `i` or `j` is out of bounds.
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+
+    /// Return an vector of size one containing element `e`.
+    public fun singleton<Element>(e: Element): vector<Element> {
+        let v = empty();
+        push_back(&mut v, e);
+        v
+    }
+    spec singleton {
+        // TODO: when using opaque here, we get verification errors.
+        // pragma opaque;
+        aborts_if false;
+        ensures result == vec(e);
+    }
+
+    /// Reverses the order of the elements in the vector `v` in place.
+    public fun reverse<Element>(v: &mut vector<Element>) {
+        let len = length(v);
+        if (len == 0) return ();
+
+        let front_index = 0;
+        let back_index = len -1;
+        while (front_index < back_index) {
+            swap(v, front_index, back_index);
+            front_index = front_index + 1;
+            back_index = back_index - 1;
+        }
+    }
+    spec reverse {
+        pragma intrinsic = true;
+    }
+
+
+    /// Pushes all of the elements of the `other` vector into the `lhs` vector.
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>) {
+        reverse(&mut other);
+        while (!is_empty(&other)) push_back(lhs, pop_back(&mut other));
+        destroy_empty(other);
+    }
+    spec append {
+        pragma intrinsic = true;
+    }
+    spec is_empty {
+        pragma intrinsic = true;
+    }
+
+
+    /// Return `true` if the vector `v` has no elements and `false` otherwise.
+    public fun is_empty<Element>(v: &vector<Element>): bool {
+        length(v) == 0
+    }
+
+    /// Return true if `e` is in the vector `v`.
+    /// Otherwise, returns false.
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return true;
+            i = i + 1;
+        };
+        false
+    }
+    spec contains {
+        pragma intrinsic = true;
+    }
+
+    /// Return `(true, i)` if `e` is in the vector `v` at index `i`.
+    /// Otherwise, returns `(false, 0)`.
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64) {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return (true, i);
+            i = i + 1;
+        };
+        (false, 0)
+    }
+    spec index_of {
+        pragma intrinsic = true;
+    }
+
+    /// Remove the `i`th element of the vector `v`, shifting all subsequent elements.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        let len = length(v);
+        // i out of bounds; abort
+        if (i >= len) abort EINDEX_OUT_OF_BOUNDS;
+
+        len = len - 1;
+        while (i < len) swap(v, i, { i = i + 1; i });
+        pop_back(v)
+    }
+    spec remove {
+        pragma intrinsic = true;
+    }
+
+    /// Insert `e` at position `i` in the vector `v`.
+    /// If `i` is in bounds, this shifts the old `v[i]` and all subsequent elements to the right.
+    /// If `i == length(v)`, this adds `e` to the end of the vector.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i > length(v)`
+    public fun insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        let len = length(v);
+        // i too big abort
+        if (i > len) abort EINDEX_OUT_OF_BOUNDS;
+
+        push_back(v, e);
+        while (i < len) {
+            swap(v, i, len);
+            i = i + 1
+        }
+    }
+    spec insert {
+        pragma intrinsic = true;
+    }
+
+    /// Swap the `i`th element of the vector `v` with the last element and then pop the vector.
+    /// This is O(1), but does not preserve ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        assert!(!is_empty(v), EINDEX_OUT_OF_BOUNDS);
+        let last_idx = length(v) - 1;
+        swap(v, i, last_idx);
+        pop_back(v)
+    }
+    spec swap_remove {
+        pragma intrinsic = true;
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Helper Functions
+
+    spec module {
+        /// Check if `v1` is equal to the result of adding `e` at the end of `v2`
+        fun eq_push_back<Element>(v1: vector<Element>, v2: vector<Element>, e: Element): bool {
+            len(v1) == len(v2) + 1 &&
+            v1[len(v1)-1] == e &&
+            v1[0..len(v1)-1] == v2[0..len(v2)]
+        }
+
+        /// Check if `v` is equal to the result of concatenating `v1` and `v2`
+        fun eq_append<Element>(v: vector<Element>, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v) == len(v1) + len(v2) &&
+            v[0..len(v1)] == v1 &&
+            v[len(v1)..len(v)] == v2
+        }
+
+        /// Check `v1` is equal to the result of removing the first element of `v2`
+        fun eq_pop_front<Element>(v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1 == v2[1..len(v2)]
+        }
+
+        /// Check that `v1` is equal to the result of removing the element at index `i` from `v2`.
+        fun eq_remove_elem_at_index<Element>(i: u64, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1[0..i] == v2[0..i] &&
+            v1[i..len(v1)] == v2[i + 1..len(v2)]
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/lib.rs b/vendors/move/move-execution/v0/move-stdlib/src/lib.rs
new file mode 100644
index 000000000..a039d4989
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/lib.rs
@@ -0,0 +1,169 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use log::LevelFilter;
+use move_command_line_common::{
+    address::NumericalAddress,
+    files::{extension_equals, find_filenames, MOVE_EXTENSION},
+};
+use move_core_types::account_address::AccountAddress;
+use std::{collections::BTreeMap, path::PathBuf};
+
+#[cfg(test)]
+mod tests;
+pub mod utils;
+
+pub mod natives;
+
+const MODULES_DIR: &str = "sources";
+const NURSERY_DIR: &str = "nursery";
+const DOCS_DIR: &str = "docs";
+const NURSERY_DOCS_DIR: &str = "nursery/docs";
+const ERRMAP_FILE: &str = "error_description.errmap";
+
+const REFERENCES_TEMPLATE: &str = "doc_templates/references.md";
+const OVERVIEW_TEMPLATE: &str = "doc_templates/overview.md";
+
+pub fn unit_testing_files() -> Vec<String> {
+    vec![path_in_crate("sources/UnitTest.move")]
+        .into_iter()
+        .map(|p| p.into_os_string().into_string().unwrap())
+        .collect()
+}
+
+pub fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push(relative.into());
+    path
+}
+
+pub fn move_stdlib_modules_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), MODULES_DIR)
+}
+
+pub fn move_stdlib_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), DOCS_DIR)
+}
+
+pub fn move_nursery_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), NURSERY_DOCS_DIR)
+}
+
+pub fn move_stdlib_errmap_full_path() -> String {
+    let prefix = if AccountAddress::LENGTH == 16 {
+        "".to_string()
+    } else {
+        format!("address{}-", AccountAddress::LENGTH)
+    };
+    format!("{}/{}{}", env!("CARGO_MANIFEST_DIR"), &prefix, ERRMAP_FILE)
+}
+
+pub fn move_stdlib_files() -> Vec<String> {
+    let path = path_in_crate(MODULES_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_nursery_files() -> Vec<String> {
+    let path = path_in_crate(NURSERY_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_stdlib_named_addresses() -> BTreeMap<String, NumericalAddress> {
+    let mapping = [("std", "0x1")];
+    mapping
+        .iter()
+        .map(|(name, addr)| (name.to_string(), NumericalAddress::parse_str(addr).unwrap()))
+        .collect()
+}
+
+pub fn build_doc(
+    output_path: &str,
+    doc_path: &str,
+    templates: Vec<String>,
+    references_file: Option<String>,
+    sources: &[String],
+    dep_paths: Vec<String>,
+    with_diagram: bool,
+    named_addresses: BTreeMap<String, NumericalAddress>,
+) {
+    let options = move_prover::cli::Options {
+        move_sources: sources.to_vec(),
+        move_deps: dep_paths,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(&named_addresses),
+        verbosity_level: LevelFilter::Warn,
+        run_docgen: true,
+        docgen: move_docgen::DocgenOptions {
+            root_doc_templates: templates,
+            references_file,
+            doc_path: vec![doc_path.to_string()],
+            output_directory: output_path.to_string(),
+            include_dep_diagrams: with_diagram,
+            include_call_diagrams: with_diagram,
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+pub fn build_stdlib_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![path_in_crate(OVERVIEW_TEMPLATE)
+            .to_string_lossy()
+            .to_string()],
+        Some(
+            path_in_crate(REFERENCES_TEMPLATE)
+                .to_string_lossy()
+                .to_string(),
+        ),
+        move_stdlib_files().as_slice(),
+        vec![],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_nursery_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![],
+        None,
+        move_nursery_files().as_slice(),
+        vec![move_stdlib_modules_full_path()],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_error_code_map(output_path: &str) {
+    let options = move_prover::cli::Options {
+        move_sources: crate::move_stdlib_files(),
+        move_deps: vec![],
+        verbosity_level: LevelFilter::Warn,
+        run_errmapgen: true,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(
+            &move_stdlib_named_addresses(),
+        ),
+        errmapgen: move_errmapgen::ErrmapOptions {
+            output_file: output_path.to_string(),
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+const ERROR_DESCRIPTIONS: &[u8] = include_bytes!("../error_description.errmap");
+
+pub fn error_descriptions() -> &'static [u8] {
+    ERROR_DESCRIPTIONS
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/bcs.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/bcs.rs
new file mode 100644
index 000000000..b4e0c1392
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/bcs.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    vm_status::sub_status::NFE_BCS_SERIALIZATION_FAILURE,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+/***************************************************************************************************
+ * native fun to_bytes
+ *
+ *   gas cost: size_of(val_type) * input_unit_cost +        | get type layout
+ *             size_of(val) * input_unit_cost +             | serialize value
+ *             max(size_of(output), 1) * output_unit_cost
+ *
+ *             If any of the first two steps fails, a partial cost + an additional failure_cost
+ *             will be charged.
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct ToBytesGasParameters {
+    pub per_byte_serialized: InternalGasPerByte,
+    pub legacy_min_output_size: NumBytes,
+    pub failure: InternalGas,
+}
+
+/// Rust implementation of Move's `native public fun to_bytes<T>(&T): vector<u8>`
+#[inline]
+fn native_to_bytes(
+    gas_params: &ToBytesGasParameters,
+    context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    // pop type and value
+    let ref_to_val = pop_arg!(args, Reference);
+    let arg_type = ty_args.pop().unwrap();
+
+    // get type layout
+    let layout = match context.type_to_type_layout(&arg_type)? {
+        Some(layout) => layout,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    // serialize value
+    let val = ref_to_val.read_ref()?;
+    let serialized_value = match val.simple_serialize(&layout) {
+        Some(serialized_value) => serialized_value,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_serialized
+            * std::cmp::max(
+                NumBytes::new(serialized_value.len() as u64),
+                gas_params.legacy_min_output_size,
+            )
+    );
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(serialized_value)],
+    ))
+}
+
+pub fn make_native_to_bytes(gas_params: ToBytesGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_to_bytes(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub to_bytes: ToBytesGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [("to_bytes", make_native_to_bytes(gas_params.to_bytes))];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/debug.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/debug.rs
new file mode 100644
index 000000000..997623872
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/debug.rs
@@ -0,0 +1,698 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
+#[allow(unused_imports)]
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun print
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_nop(
+    gas_params: &PrintGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[inline]
+fn native_print(
+    gas_params: &PrintGasParameters,
+    _context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+    _move_std_addr: AccountAddress,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    let _val = args.pop_back().unwrap();
+    let _ty = ty_args.pop().unwrap();
+
+    // No-op if the feature flag is not present.
+    #[cfg(feature = "testing")]
+    {
+        let canonical = false;
+        let single_line = false;
+        let include_int_types = false;
+
+        let mut out = "[debug] ".to_string();
+        let val = _val.value_as::<Reference>()?.read_ref()?;
+
+        testing::print_value(
+            _context,
+            &mut out,
+            val,
+            _ty,
+            &_move_std_addr,
+            0,
+            canonical,
+            single_line,
+            include_int_types,
+        )?;
+        println!("{}", out);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print(
+    silent: bool,
+    gas_params: PrintGasParameters,
+    move_std_addr: AccountAddress,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print(&gas_params, context, ty_args, args, move_std_addr)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * native fun print_stack_trace
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintStackTraceGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_stack_trace_nop(
+    gas_params: &PrintStackTraceGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[allow(unused_variables)]
+#[inline]
+fn native_print_stack_trace(
+    gas_params: &PrintStackTraceGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+
+    #[cfg(feature = "testing")]
+    {
+        let mut s = String::new();
+        context.print_stack_trace(&mut s)?;
+        println!("{}", s);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print_stack_trace(
+    silent: bool,
+    gas_params: PrintStackTraceGasParameters,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace(&gas_params, context, ty_args, args)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub print: PrintGasParameters,
+    pub print_stack_trace: PrintStackTraceGasParameters,
+}
+
+pub fn make_all(
+    silent: bool,
+    gas_params: GasParameters,
+    move_std_addr: AccountAddress,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "print",
+            make_native_print(silent, gas_params.print, move_std_addr),
+        ),
+        (
+            "print_stack_trace",
+            make_native_print_stack_trace(silent, gas_params.print_stack_trace),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
+
+#[cfg(feature = "testing")]
+mod testing {
+    use move_binary_format::errors::{PartialVMError, PartialVMResult};
+    use move_core_types::{
+        account_address::AccountAddress,
+        language_storage::TypeTag,
+        value::{MoveStruct, MoveStructLayout, MoveTypeLayout, MoveValue},
+        vm_status::StatusCode,
+    };
+    use move_vm_runtime::native_functions::NativeContext;
+    use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
+    use std::{fmt, fmt::Write};
+
+    const VECTOR_BEGIN: &str = "[";
+
+    const VECTOR_OR_STRUCT_SEP: &str = ",";
+
+    const VECTOR_END: &str = "]";
+
+    const STRUCT_BEGIN: &str = "{";
+
+    const STRUCT_END: &str = "}";
+
+    fn fmt_error_to_partial_vm_error(e: fmt::Error) -> PartialVMError {
+        PartialVMError::new(StatusCode::UNKNOWN_STATUS)
+            .with_message("write! macro failed with: ".to_string() + e.to_string().as_str())
+    }
+
+    fn to_vec_u8_type_err<E>(_e: E) -> PartialVMError {
+        PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+            .with_message("Could not convert Vec<MoveValue> to Vec<u8>: ".to_string())
+    }
+
+    fn get_annotated_struct_layout(
+        context: &NativeContext,
+        ty: &Type,
+    ) -> PartialVMResult<MoveStructLayout> {
+        let annotated_type_layout = context.type_to_fully_annotated_layout(ty)?.unwrap();
+        match annotated_type_layout {
+            MoveTypeLayout::Struct(annotated_struct_layout) => Ok(annotated_struct_layout),
+            _ => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                    "Could not convert Type to fully-annotated MoveTypeLayout via NativeContext"
+                        .to_string(),
+                ),
+            ),
+        }
+    }
+
+    fn get_vector_inner_type(ty: &Type) -> PartialVMResult<&Type> {
+        match ty {
+            Type::Vector(ty) => Ok(ty),
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Could not get the inner Type of a vector's Type".to_string())),
+        }
+    }
+
+    /// Converts a `MoveValue::Vector` of `u8`'s to a `String` by wrapping it in double quotes and
+    /// escaping double quotes and backslashes.
+    ///
+    /// Examples:
+    ///  - 'Hello' returns "Hello"
+    ///  - '"Hello?" What are you saying?' returns "\"Hello?\" What are you saying?"
+    ///  - '\ and " are escaped' returns "\\ and \" are escaped"
+    fn move_value_as_escaped_string(val: MoveValue) -> PartialVMResult<String> {
+        match val {
+            MoveValue::Vector(bytes) => {
+                let buf = MoveValue::vec_to_vec_u8(bytes).map_err(to_vec_u8_type_err)?;
+
+                let str = String::from_utf8(buf).map_err(|e| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "Could not parse UTF8 bytes: ".to_string() + e.to_string().as_str(),
+                    )
+                })?;
+
+                // We need to escape displayed double quotes " as \" and, as a result, also escape
+                // displayed \ as \\.
+                Ok(str.replace('\\', "\\\\").replace('"', "\\\""))
+            }
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Expected a MoveValue::Vector of u8's".to_string())),
+        }
+    }
+
+    fn print_padding_at_depth(out: &mut String, depth: usize) -> PartialVMResult<()> {
+        for _ in 0..depth {
+            // add 2 spaces
+            write!(out, "  ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+
+        Ok(())
+    }
+
+    fn is_non_empty_vector_u8(vec: &Vec<MoveValue>) -> bool {
+        if vec.is_empty() {
+            false
+        } else {
+            matches!(vec.last().unwrap(), MoveValue::U8(_))
+        }
+    }
+
+    fn is_vector_or_struct_move_value(mv: &MoveValue) -> bool {
+        matches!(mv, MoveValue::Vector(_) | MoveValue::Struct(_))
+    }
+
+    /// Prints any `Value` in a user-friendly manner.
+    pub(crate) fn print_value(
+        context: &NativeContext,
+        out: &mut String,
+        val: Value,
+        ty: Type,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        // get type layout in VM format
+        let ty_layout = context.type_to_type_layout(&ty)?.unwrap();
+
+        match &ty_layout {
+            MoveTypeLayout::Vector(_) => {
+                // get the inner type T of a vector<T>
+                let inner_ty = get_vector_inner_type(&ty)?;
+                let inner_tyl = context.type_to_type_layout(inner_ty)?.unwrap();
+
+                match inner_tyl {
+                    // We cannot simply convert a `Value` (of type vector) to a `MoveValue` because
+                    // there might be a struct in the vector that needs to be "decorated" using the
+                    // logic in this function. Instead, we recursively "unpack" the vector until we
+                    // get down to either (1) a primitive type, which we can forward to
+                    // `print_move_value`, or (2) a struct type, which we can decorate and forward
+                    // to `print_move_value`.
+                    MoveTypeLayout::Vector(_) | MoveTypeLayout::Struct(_) => {
+                        // `val` is either a `Vec<Vec<Value>>`, a `Vec<Struct>`,  or a `Vec<signer>`, so we cast `val` as a `Vec<Value>` and call ourselves recursively
+                        let vec = val.value_as::<Vec<Value>>()?;
+
+                        let print_inner_value =
+                            |out: &mut String,
+                             val: Value,
+                             move_std_addr: &AccountAddress,
+                             depth: usize,
+                             canonicalize: bool,
+                             single_line: bool,
+                             include_int_types: bool| {
+                                print_value(
+                                    context,
+                                    out,
+                                    val,
+                                    inner_ty.clone(),
+                                    move_std_addr,
+                                    depth,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )
+                            };
+
+                        print_non_u8_vector(
+                            out,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                            vec,
+                            print_inner_value,
+                            true,
+                        )?;
+                    }
+                    // If the inner type T of this vector<T> is a primitive bool/unsigned integer/address type, we convert the
+                    // vector<T> to a MoveValue and print it.
+                    _ => {
+                        let mv = val.as_move_value(&ty_layout);
+                        print_move_value(
+                            out,
+                            mv,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+                    }
+                };
+            }
+            // For a struct, we convert it to a MoveValue annotated with its field names and types and print it
+            MoveTypeLayout::Struct(_) => {
+                let move_struct = match val.as_move_value(&ty_layout) {
+                    MoveValue::Struct(s) => s,
+                    _ => {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message("Expected MoveValue::MoveStruct".to_string()))
+                    }
+                };
+
+                let annotated_struct_layout = get_annotated_struct_layout(context, &ty)?;
+                let decorated_struct = move_struct.decorate(&annotated_struct_layout);
+
+                print_move_value(
+                    out,
+                    MoveValue::Struct(decorated_struct),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+            // For non-structs and non-vectors, convert them to a MoveValue and print them
+            _ => {
+                print_move_value(
+                    out,
+                    val.as_move_value(&ty_layout),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Prints the MoveValue in `mv`, optionally-printing integer types if `include_int_type` is
+    /// true.
+    fn print_move_value(
+        out: &mut String,
+        mv: MoveValue,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        match mv {
+            MoveValue::U8(u8) => {
+                write!(out, "{}", u8).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u8").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U16(u16) => {
+                write!(out, "{}", u16).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u16").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U32(u32) => {
+                write!(out, "{}", u32).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u32").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U64(u64) => {
+                write!(out, "{}", u64).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u64").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U128(u128) => {
+                write!(out, "{}", u128).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u128").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U256(u256) => {
+                write!(out, "{}", u256).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u256").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::Bool(b) => {
+                // Note that when `include_int_types` is enabled, the boolean `true` and `false`
+                // values unambiguously encode their type, since they are different than any integer
+                // type value, address value, signer value, vector value and struct value.
+                write!(out, "{}", if b { "true" } else { "false" })
+                    .map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Address(a) => {
+                let str = if canonicalize {
+                    a.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    a.to_hex_literal()
+                };
+                write!(out, "@{}", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Signer(s) => {
+                let str = if canonicalize {
+                    s.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    s.to_hex_literal()
+                };
+                write!(out, "signer({})", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Vector(vec) => {
+                // If this is a vector<u8> we print it in hex (as most users would expect us to)
+                if is_non_empty_vector_u8(&vec) {
+                    let bytes = MoveValue::vec_to_vec_u8(vec).map_err(to_vec_u8_type_err)?;
+                    write!(out, "0x{}", hex::encode(&bytes))
+                        .map_err(fmt_error_to_partial_vm_error)?;
+                } else {
+                    let is_complex_inner_type =
+                        vec.last().map_or(false, is_vector_or_struct_move_value);
+                    print_non_u8_vector(
+                        out,
+                        move_std_addr,
+                        depth,
+                        canonicalize,
+                        single_line,
+                        include_int_types,
+                        vec,
+                        print_move_value,
+                        is_complex_inner_type,
+                    )?;
+                }
+            }
+            MoveValue::Struct(move_struct) => match move_struct {
+                MoveStruct::WithTypes { type_, mut fields } => {
+                    let type_tag = TypeTag::from(type_.clone());
+
+                    // Check if struct is an std::string::String
+                    if !canonicalize && type_.is_std_string(move_std_addr) {
+                        if fields.len() != 1 {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::string::String struct to have just one field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let (id, val) = fields.pop().unwrap();
+                        if id.into_string() != "bytes" {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::string::String struct to have a `bytes` field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let str = move_value_as_escaped_string(val)?;
+                        write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                    } else if !canonicalize && type_.is_ascii_string(move_std_addr) {
+                        if fields.len() != 1 {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::ascii::String struct to have just one field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let (id, val) = fields.pop().unwrap();
+                        if id.into_string() != "bytes" {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::ascii::String struct to have a `bytes` field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let str = move_value_as_escaped_string(val)?;
+                        write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                    } else {
+                        write!(out, "{} ", type_tag).map_err(fmt_error_to_partial_vm_error)?;
+                        write!(out, "{}", STRUCT_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+
+                        // For each field, print its name and value (and type)
+                        let mut iter = fields.into_iter();
+                        if let Some((field_name, field_value)) = iter.next() {
+                            // Start an indented new line
+                            if !single_line {
+                                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                print_padding_at_depth(out, depth + 1)?;
+                            }
+
+                            write!(out, "{}: ", field_name.into_string())
+                                .map_err(fmt_error_to_partial_vm_error)?;
+                            print_move_value(
+                                out,
+                                field_value,
+                                move_std_addr,
+                                depth + 1,
+                                canonicalize,
+                                single_line,
+                                include_int_types,
+                            )?;
+
+                            for (field_name, field_value) in iter {
+                                write!(out, "{}", VECTOR_OR_STRUCT_SEP)
+                                    .map_err(fmt_error_to_partial_vm_error)?;
+
+                                if !single_line {
+                                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                    print_padding_at_depth(out, depth + 1)?;
+                                } else {
+                                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                                }
+                                write!(out, "{}: ", field_name.into_string())
+                                    .map_err(fmt_error_to_partial_vm_error)?;
+                                print_move_value(
+                                    out,
+                                    field_value,
+                                    move_std_addr,
+                                    depth + 1,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )?;
+                            }
+                        }
+
+                        // Ends printing the struct with "}", which could be on its own line
+                        if !single_line {
+                            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                            print_padding_at_depth(out, depth)?;
+                        }
+                        write!(out, "{}", STRUCT_END).map_err(fmt_error_to_partial_vm_error)?;
+                    }
+                }
+                _ => {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message("Expected MoveStruct::WithTypes".to_string()))
+                }
+            },
+        }
+
+        Ok(())
+    }
+
+    fn print_non_u8_vector<ValType>(
+        out: &mut String,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+        vec: Vec<ValType>,
+        print_inner_value: impl Fn(
+            &mut String,
+            ValType,
+            &AccountAddress,
+            usize,
+            bool,
+            bool,
+            bool,
+        ) -> PartialVMResult<()>,
+        is_complex_inner_type: bool,
+    ) -> PartialVMResult<()> {
+        write!(out, "{}", VECTOR_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+        let mut iter = vec.into_iter();
+        let mut empty_vec = true;
+
+        if let Some(first_elem) = iter.next() {
+            empty_vec = false;
+
+            // For vectors-of-vectors, and for vectors-of-structs, we start a newline for each element
+            if !single_line && is_complex_inner_type {
+                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                print_padding_at_depth(out, depth + 1)?;
+            } else {
+                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+            }
+
+            print_inner_value(
+                out,
+                first_elem,
+                move_std_addr,
+                depth + 1,
+                canonicalize,
+                single_line,
+                include_int_types,
+            )?;
+
+            for elem in iter {
+                write!(out, "{}", VECTOR_OR_STRUCT_SEP).map_err(fmt_error_to_partial_vm_error)?;
+
+                // For vectors of vectors or vectors of structs, we start a newline for each element
+                if !single_line && is_complex_inner_type {
+                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                    print_padding_at_depth(out, depth + 1)?;
+                } else {
+                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                }
+                print_inner_value(
+                    out,
+                    elem,
+                    move_std_addr,
+                    depth + 1,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        // For vectors of vectors or vectors of structs, we display the closing ] on a newline
+        if !single_line && is_complex_inner_type {
+            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+            print_padding_at_depth(out, depth)?;
+        } else if !empty_vec {
+            write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+        write!(out, "{}", VECTOR_END).map_err(fmt_error_to_partial_vm_error)?;
+
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/event.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/event.rs
new file mode 100644
index 000000000..4641712bd
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/event.rs
@@ -0,0 +1,81 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::InternalGasPerAbstractMemoryUnit;
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+    views::ValueView,
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * [NURSERY-ONLY] native fun write_to_event_store
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct WriteToEventStoreGasParameters {
+    pub unit_cost: InternalGasPerAbstractMemoryUnit,
+}
+
+#[inline]
+fn native_write_to_event_store(
+    gas_params: &WriteToEventStoreGasParameters,
+    context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(arguments.len() == 3);
+
+    let ty = ty_args.pop().unwrap();
+    let msg = arguments.pop_back().unwrap();
+    let seq_num = pop_arg!(arguments, u64);
+    let guid = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.unit_cost * std::cmp::max(msg.legacy_abstract_memory_size(), 1.into());
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    if !context.save_event(guid, seq_num, ty, msg)? {
+        return Ok(NativeResult::err(context.gas_used(), 0));
+    }
+
+    Ok(NativeResult::ok(context.gas_used(), smallvec![]))
+}
+
+pub fn make_native_write_to_event_store(
+    gas_params: WriteToEventStoreGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_write_to_event_store(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub write_to_event_store: WriteToEventStoreGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "write_to_event_store",
+        make_native_write_to_event_store(gas_params.write_to_event_store),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/hash.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/hash.rs
new file mode 100644
index 000000000..8656c640b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/hash.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use sha2::{Digest, Sha256};
+use sha3::Sha3_256;
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun sha2_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha2_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha2_256(
+    gas_params: &Sha2_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha2_256(gas_params: Sha2_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha2_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun sha3_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha3_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha3_256(
+    gas_params: &Sha3_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha3_256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha3_256(gas_params: Sha3_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha3_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub sha2_256: Sha2_256GasParameters,
+    pub sha3_256: Sha3_256GasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("sha2_256", make_native_sha2_256(gas_params.sha2_256)),
+        ("sha3_256", make_native_sha3_256(gas_params.sha3_256)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/helpers.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/helpers.rs
new file mode 100644
index 000000000..1a8b8a88c
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/helpers.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_runtime::native_functions::NativeFunction;
+
+pub fn make_module_natives(
+    natives: impl IntoIterator<Item = (impl Into<String>, NativeFunction)>,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    natives
+        .into_iter()
+        .map(|(func_name, func)| (func_name.into(), func))
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/mod.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/mod.rs
new file mode 100644
index 000000000..5cf16a92b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/mod.rs
@@ -0,0 +1,181 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bcs;
+pub mod debug;
+pub mod event;
+pub mod hash;
+pub mod signer;
+pub mod string;
+pub mod type_name;
+#[cfg(feature = "testing")]
+pub mod unit_test;
+pub mod vector;
+
+mod helpers;
+
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub bcs: bcs::GasParameters,
+    pub hash: hash::GasParameters,
+    pub signer: signer::GasParameters,
+    pub string: string::GasParameters,
+    pub type_name: type_name::GasParameters,
+    pub vector: vector::GasParameters,
+
+    #[cfg(feature = "testing")]
+    pub unit_test: unit_test::GasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            bcs: bcs::GasParameters {
+                to_bytes: bcs::ToBytesGasParameters {
+                    per_byte_serialized: 0.into(),
+                    legacy_min_output_size: 0.into(),
+                    failure: 0.into(),
+                },
+            },
+
+            hash: hash::GasParameters {
+                sha2_256: hash::Sha2_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+                sha3_256: hash::Sha3_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+            },
+            type_name: type_name::GasParameters {
+                get: type_name::GetGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+            },
+            signer: signer::GasParameters {
+                borrow_address: signer::BorrowAddressGasParameters { base: 0.into() },
+            },
+            string: string::GasParameters {
+                check_utf8: string::CheckUtf8GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                is_char_boundary: string::IsCharBoundaryGasParameters { base: 0.into() },
+                sub_string: string::SubStringGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                index_of: string::IndexOfGasParameters {
+                    base: 0.into(),
+                    per_byte_pattern: 0.into(),
+                    per_byte_searched: 0.into(),
+                },
+            },
+            vector: vector::GasParameters {
+                empty: vector::EmptyGasParameters { base: 0.into() },
+                length: vector::LengthGasParameters { base: 0.into() },
+                push_back: vector::PushBackGasParameters {
+                    base: 0.into(),
+                    legacy_per_abstract_memory_unit: 0.into(),
+                },
+                borrow: vector::BorrowGasParameters { base: 0.into() },
+                pop_back: vector::PopBackGasParameters { base: 0.into() },
+                destroy_empty: vector::DestroyEmptyGasParameters { base: 0.into() },
+                swap: vector::SwapGasParameters { base: 0.into() },
+            },
+            #[cfg(feature = "testing")]
+            unit_test: unit_test::GasParameters {
+                create_signers_for_testing: unit_test::CreateSignersForTestingGasParameters {
+                    base_cost: 0.into(),
+                    unit_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn all_natives(
+    move_std_addr: AccountAddress,
+    gas_params: GasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("bcs", bcs::make_all(gas_params.bcs));
+    add_natives!("hash", hash::make_all(gas_params.hash));
+    add_natives!("signer", signer::make_all(gas_params.signer));
+    add_natives!("string", string::make_all(gas_params.string));
+    add_natives!("type_name", type_name::make_all(gas_params.type_name));
+    add_natives!("vector", vector::make_all(gas_params.vector));
+    #[cfg(feature = "testing")]
+    {
+        add_natives!("unit_test", unit_test::make_all(gas_params.unit_test));
+    }
+
+    make_table_from_iter(move_std_addr, natives)
+}
+
+#[derive(Debug, Clone)]
+pub struct NurseryGasParameters {
+    event: event::GasParameters,
+    debug: debug::GasParameters,
+}
+
+impl NurseryGasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            event: event::GasParameters {
+                write_to_event_store: event::WriteToEventStoreGasParameters {
+                    unit_cost: 0.into(),
+                },
+            },
+            debug: debug::GasParameters {
+                print: debug::PrintGasParameters {
+                    base_cost: 0.into(),
+                },
+                print_stack_trace: debug::PrintStackTraceGasParameters {
+                    base_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn nursery_natives(
+    silent: bool,
+    move_std_addr: AccountAddress,
+    gas_params: NurseryGasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("event", event::make_all(gas_params.event));
+    add_natives!(
+        "debug",
+        debug::make_all(silent, gas_params.debug, move_std_addr)
+    );
+
+    make_table_from_iter(move_std_addr, natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/signer.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/signer.rs
new file mode 100644
index 000000000..6aed1bb7a
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/signer.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::InternalGas;
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::SignerRef, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun borrow_address
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowAddressGasParameters {
+    pub base: InternalGas,
+}
+
+#[inline]
+fn native_borrow_address(
+    gas_params: &BorrowAddressGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let signer_reference = pop_arg!(arguments, SignerRef);
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![signer_reference.borrow_signer()?],
+    ))
+}
+
+pub fn make_native_borrow_address(gas_params: BorrowAddressGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_address(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub borrow_address: BorrowAddressGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "borrow_address",
+        make_native_borrow_address(gas_params.borrow_address),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/string.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/string.rs
new file mode 100644
index 000000000..679364fbc
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/string.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implementation of native functions for utf8 strings.
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, VectorRef},
+};
+use std::{collections::VecDeque, sync::Arc};
+
+// The implementation approach delegates all utf8 handling to Rust.
+// This is possible without copying of bytes because (a) we can
+// get a `std::cell::Ref<Vec<u8>>` from a `vector<u8>` and in turn a `&[u8]`
+// from that (b) assuming that `vector<u8>` embedded in a string
+// is already valid utf8, we can use `str::from_utf8_unchecked` to
+// create a `&str` view on the bytes without a copy. Once we have this
+// view, we can call ut8 functions like length, substring, etc.
+
+/***************************************************************************************************
+ * native fun internal_check_utf8
+ *
+ *   gas cost: base_cost + unit_cost * length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct CheckUtf8GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_check_utf8(
+    gas_params: &CheckUtf8GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 1);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new(s_ref.as_slice().len() as u64);
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let ok = std::str::from_utf8(s_ref.as_slice()).is_ok();
+    // TODO: extensible native cost tables
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_check_utf8(gas_params: CheckUtf8GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_check_utf8(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_is_char_boundary
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IsCharBoundaryGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_is_char_boundary(
+    gas_params: &IsCharBoundaryGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let i = pop_arg!(args, u64);
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let ok = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice()).is_char_boundary(i as usize)
+    };
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_is_char_boundary(gas_params: IsCharBoundaryGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_is_char_boundary(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_sub_string
+ *
+ *   gas cost: base_cost + unit_cost * sub_string_length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SubStringGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_sub_string(
+    gas_params: &SubStringGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 3);
+
+    let j = pop_arg!(args, u64) as usize;
+    let i = pop_arg!(args, u64) as usize;
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    if j < i {
+        // TODO: what abort code should we use here?
+        return Ok(NativeResult::err(context.gas_used(), 1));
+    }
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new((j - i) as u64);
+    native_charge_gas_early_exit!(context, cost);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice())
+    };
+    let v = Value::vector_u8(s_str[i..j].as_bytes().iter().cloned());
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(v))
+}
+
+pub fn make_native_sub_string(gas_params: SubStringGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sub_string(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_index_of
+ *
+ *   gas cost: base_cost + unit_cost * bytes_searched
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IndexOfGasParameters {
+    pub base: InternalGas,
+    pub per_byte_pattern: InternalGasPerByte,
+    pub per_byte_searched: InternalGasPerByte,
+}
+
+fn native_index_of(
+    gas_params: &IndexOfGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r_arg = pop_arg!(args, VectorRef);
+    let r_ref = r_arg.as_bytes_ref();
+    let r_str = unsafe { std::str::from_utf8_unchecked(r_ref.as_slice()) };
+    // Charge pattern fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_pattern * NumBytes::new(r_str.len() as u64)
+    );
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe { std::str::from_utf8_unchecked(s_ref.as_slice()) };
+    let pos = match s_str.find(r_str) {
+        Some(size) => size,
+        None => s_str.len(),
+    };
+    // TODO(Gas): What is the algorithm used for the search?
+    //            Ideally it should be something like KMP with O(n) time complexity...
+    // Charge search fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_searched * NumBytes::new(pos as u64)
+    );
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::u64(pos as u64)))
+}
+
+pub fn make_native_index_of(gas_params: IndexOfGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_index_of(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub check_utf8: CheckUtf8GasParameters,
+    pub is_char_boundary: IsCharBoundaryGasParameters,
+    pub sub_string: SubStringGasParameters,
+    pub index_of: IndexOfGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "internal_check_utf8",
+            make_native_check_utf8(gas_params.check_utf8),
+        ),
+        (
+            "internal_is_char_boundary",
+            make_native_is_char_boundary(gas_params.is_char_boundary),
+        ),
+        (
+            "internal_sub_string",
+            make_native_sub_string(gas_params.sub_string),
+        ),
+        (
+            "internal_index_of",
+            make_native_index_of(gas_params.index_of),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/type_name.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/type_name.rs
new file mode 100644
index 000000000..595e4dde6
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/type_name.rs
@@ -0,0 +1,89 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    values::{Struct, Value},
+};
+
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+#[derive(Debug, Clone)]
+pub struct GetGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_get(
+    use_original_id: bool,
+    gas_params: &GetGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert_eq!(ty_args.len(), 1);
+    debug_assert!(arguments.is_empty());
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let type_tag = if use_original_id {
+        context.type_to_runtime_type_tag(&ty_args[0])
+    } else {
+        context.type_to_type_tag(&ty_args[0])
+    }?;
+
+    let type_name = type_tag.to_canonical_string(/* with_prefix */ false);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte * NumBytes::new(type_name.len() as u64)
+    );
+
+    // make a std::string::String
+    let string_val = Value::struct_(Struct::pack(vec![Value::vector_u8(
+        type_name.as_bytes().to_vec(),
+    )]));
+    // make a std::type_name::TypeName
+    let type_name_val = Value::struct_(Struct::pack(vec![string_val]));
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![type_name_val],
+    ))
+}
+
+pub fn make_native_get(use_original_id: bool, gas_params: GetGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| {
+        native_get(use_original_id, &gas_params, context, ty_args, args)
+    })
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub get: GetGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "get",
+            make_native_get(/* use_original_id */ false, gas_params.get.clone()),
+        ),
+        (
+            "get_with_original_ids",
+            make_native_get(/* use_original_id */ true, gas_params.get),
+        ),
+    ];
+
+    crate::natives::helpers::make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/unit_test.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/unit_test.rs
new file mode 100644
index 000000000..610ecefe6
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/unit_test.rs
@@ -0,0 +1,85 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerArg, NumArgs},
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun create_signers_for_testing
+ *
+ *   gas cost: base_cost + unit_cost * num_of_signers
+ *
+ **************************************************************************************************/
+fn to_le_bytes(i: u64) -> [u8; AccountAddress::LENGTH] {
+    let bytes = i.to_le_bytes();
+    let mut result = [0u8; AccountAddress::LENGTH];
+    result[..bytes.len()].clone_from_slice(bytes.as_ref());
+    result
+}
+
+#[derive(Debug, Clone)]
+pub struct CreateSignersForTestingGasParameters {
+    pub base_cost: InternalGas,
+    pub unit_cost: InternalGasPerArg,
+}
+
+fn native_create_signers_for_testing(
+    gas_params: &CreateSignersForTestingGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.len() == 1);
+
+    let num_signers = pop_arg!(args, u64);
+    let signers = Value::vector_for_testing_only(
+        (0..num_signers).map(|i| Value::signer(AccountAddress::new(to_le_bytes(i)))),
+    );
+
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumArgs::new(num_signers);
+    native_charge_gas_early_exit!(context, cost);
+
+    Ok(NativeResult::ok(context.gas_used(), smallvec![signers]))
+}
+
+pub fn make_native_create_signers_for_testing(
+    gas_params: CreateSignersForTestingGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_create_signers_for_testing(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub create_signers_for_testing: CreateSignersForTestingGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "create_signers_for_testing",
+        make_native_create_signers_for_testing(gas_params.create_signers_for_testing),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/natives/vector.rs b/vendors/move/move-execution/v0/move-stdlib/src/natives/vector.rs
new file mode 100644
index 000000000..194777201
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/natives/vector.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerAbstractMemoryUnit},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, Vector, VectorRef},
+    views::ValueView,
+};
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct EmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_empty(
+    gas_params: &EmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.is_empty());
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Vector::empty(&ty_args[0]))
+}
+
+pub fn make_native_empty(gas_params: EmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun length
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct LengthGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_length(
+    gas_params: &LengthGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(context.gas_used(), r.len(&ty_args[0]))
+}
+
+pub fn make_native_length(gas_params: LengthGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_length(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun push_back
+ *
+ *   gas cost: base_cost + legacy_unit_cost * max(1, size_of(val))
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PushBackGasParameters {
+    pub base: InternalGas,
+    pub legacy_per_abstract_memory_unit: InternalGasPerAbstractMemoryUnit,
+}
+
+pub fn native_push_back(
+    gas_params: &PushBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let e = args.pop_back().unwrap();
+    let r = pop_arg!(args, VectorRef);
+
+    if gas_params.legacy_per_abstract_memory_unit != 0.into() {
+        let cost = gas_params.legacy_per_abstract_memory_unit
+            * std::cmp::max(e.legacy_abstract_memory_size(), 1.into());
+        native_charge_gas_early_exit!(context, cost);
+    }
+
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.push_back(
+            e,
+            &ty_args[0],
+            context.runtime_limits_config().vector_len_max,
+        ),
+    )
+}
+
+pub fn make_native_push_back(gas_params: PushBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_push_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun borrow
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_borrow(
+    gas_params: &BorrowGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.borrow_elem(idx, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_borrow(gas_params: BorrowGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun pop
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PopBackGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_pop_back(
+    gas_params: &PopBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.pop(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_pop_back(gas_params: PopBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_pop_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun destroy_empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_destroy_empty(
+    gas_params: &DestroyEmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let v = pop_arg!(args, Vector);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        v.destroy_empty(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_destroy_empty(gas_params: DestroyEmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun swap
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SwapGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_swap(
+    gas_params: &SwapGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 3);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx2 = pop_arg!(args, u64) as usize;
+    let idx1 = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.swap(idx1, idx2, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_swap(gas_params: SwapGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_swap(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+fn native_error_to_abort(err: PartialVMError) -> PartialVMError {
+    let (major_status, sub_status_opt, message_opt, exec_state_opt, indices, offsets) =
+        err.all_data();
+    let new_err = match major_status {
+        StatusCode::VECTOR_OPERATION_ERROR => PartialVMError::new(StatusCode::ABORTED),
+        _ => PartialVMError::new(major_status),
+    };
+    let new_err = match sub_status_opt {
+        None => new_err,
+        Some(code) => new_err.with_sub_status(code),
+    };
+    let new_err = match message_opt {
+        None => new_err,
+        Some(message) => new_err.with_message(message),
+    };
+    let new_err = match exec_state_opt {
+        None => new_err,
+        Some(stacktrace) => new_err.with_exec_state(stacktrace),
+    };
+    new_err.at_indices(indices).at_code_offsets(offsets)
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub empty: EmptyGasParameters,
+    pub length: LengthGasParameters,
+    pub push_back: PushBackGasParameters,
+    pub borrow: BorrowGasParameters,
+    pub pop_back: PopBackGasParameters,
+    pub destroy_empty: DestroyEmptyGasParameters,
+    pub swap: SwapGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("empty", make_native_empty(gas_params.empty)),
+        ("length", make_native_length(gas_params.length)),
+        ("push_back", make_native_push_back(gas_params.push_back)),
+        ("borrow", make_native_borrow(gas_params.borrow.clone())),
+        ("borrow_mut", make_native_borrow(gas_params.borrow)),
+        ("pop_back", make_native_pop_back(gas_params.pop_back)),
+        (
+            "destroy_empty",
+            make_native_destroy_empty(gas_params.destroy_empty),
+        ),
+        ("swap", make_native_swap(gas_params.swap)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/tests.rs b/vendors/move/move-execution/v0/move-stdlib/src/tests.rs
new file mode 100644
index 000000000..c35a75a94
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/tests.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::bail;
+use std::{cmp::Ordering, path::Path};
+use tempfile::tempdir;
+use walkdir::{DirEntry, WalkDir};
+
+#[test]
+fn check_that_docs_are_updated() {
+    let temp_dir = tempdir().unwrap();
+
+    crate::build_stdlib_doc(&temp_dir.path().to_string_lossy());
+
+    let res = check_dirs_not_diff(&temp_dir, &crate::move_stdlib_docs_full_path());
+    assert!(
+        res.is_ok(),
+        "Generated docs differ from the ones checked in. {}",
+        res.unwrap_err()
+    )
+}
+
+#[test]
+fn check_that_the_errmap_is_updated() {
+    let temp_file = tempfile::NamedTempFile::new().unwrap();
+
+    crate::build_error_code_map(&temp_file.path().to_string_lossy());
+
+    assert!(
+        file_diff::diff(
+            &temp_file.path().to_string_lossy(),
+            &crate::move_stdlib_errmap_full_path()
+        ),
+        "Generated errmap differ from the one checked in"
+    );
+}
+
+fn check_dirs_not_diff<A: AsRef<Path>, B: AsRef<Path>>(
+    actual: A,
+    expected: B,
+) -> anyhow::Result<()> {
+    let mut act_walker = sorted_walk_dir(actual)?;
+    let mut exp_walker = sorted_walk_dir(expected)?;
+
+    for (a, b) in (&mut act_walker).zip(&mut exp_walker) {
+        let a = a?;
+        let b = b?;
+
+        if a.depth() != b.depth() {
+            bail!(
+                "Mismatched depth for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type() != b.file_type() {
+            bail!(
+                "Mismatched file type for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_name() != b.file_name() {
+            bail!(
+                "Mismatched file name for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type().is_file() && std::fs::read(a.path())? != std::fs::read(b.path())? {
+            bail!("{} needs to be updated", display_dir_entry(a))
+        }
+    }
+
+    if let Some(a) = act_walker.next() {
+        bail!(
+            "Unexpected dir entry: {}. Not found in expected",
+            display_dir_entry(a?)
+        )
+    }
+    if let Some(b) = exp_walker.next() {
+        bail!(
+            "Expected dir entry: {}. Not found in actual",
+            display_dir_entry(b?)
+        )
+    }
+    Ok(())
+}
+
+fn sorted_walk_dir<P: AsRef<Path>>(path: P) -> Result<walkdir::IntoIter, std::io::Error> {
+    fn compare_by_file_name(a: &DirEntry, b: &DirEntry) -> Ordering {
+        a.file_name().cmp(b.file_name())
+    }
+
+    let mut walkdir = WalkDir::new(path).sort_by(compare_by_file_name).into_iter();
+    match walkdir.next() {
+        Some(Err(e)) => Err(e.into()),
+        _ => Ok(walkdir),
+    }
+}
+
+fn display_dir_entry(d: walkdir::DirEntry) -> String {
+    d.into_path().to_string_lossy().to_string()
+}
diff --git a/vendors/move/move-execution/v0/move-stdlib/src/utils.rs b/vendors/move/move-execution/v0/move-stdlib/src/utils.rs
new file mode 100644
index 000000000..2a762867b
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-stdlib/src/utils.rs
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{io::Write, time::Instant};
+
+pub fn time_it<F, R>(msg: &str, f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    let now = Instant::now();
+    print!("{} ... ", msg);
+    let _ = std::io::stdout().flush();
+    let res = f();
+    println!("(took {:.3}s)", now.elapsed().as_secs_f64());
+    res
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/Cargo.toml b/vendors/move/move-execution/v0/move-vm/runtime/Cargo.toml
new file mode 100644
index 000000000..32fc50f2a
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "move-vm-runtime-v0"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core Move execution logic"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+better_any.workspace = true
+fail.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+sha3.workspace = true
+tracing.workspace = true
+smallvec.workspace = true
+
+move-bytecode-verifier = { path = "../../move-bytecode-verifier", package = "move-bytecode-verifier-v0" }
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-vm-profiler.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+
+[dev-dependencies]
+anyhow = "1.0.71"
+hex.workspace = true
+proptest.workspace = true
+move-ir-compiler.workspace = true
+move-compiler.workspace = true
+
+[features]
+default = []
+fuzzing = ["move-vm-types/fuzzing"]
+failpoints = ["fail/failpoints"]
+# Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds.
+debugging = []
+testing = []
+lazy_natives = []
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/data_cache.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/data_cache.rs
new file mode 100644
index 000000000..898694922
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/data_cache.rs
@@ -0,0 +1,303 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::loader::Loader;
+
+use move_binary_format::errors::*;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Event, Op},
+    gas_algebra::NumBytes,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::Type,
+    values::{GlobalValue, Value},
+};
+use std::collections::btree_map::BTreeMap;
+
+pub struct AccountDataCache {
+    data_map: BTreeMap<Type, (MoveTypeLayout, GlobalValue)>,
+    module_map: BTreeMap<Identifier, Vec<u8>>,
+}
+
+impl AccountDataCache {
+    fn new() -> Self {
+        Self {
+            data_map: BTreeMap::new(),
+            module_map: BTreeMap::new(),
+        }
+    }
+}
+
+/// Transaction data cache. Keep updates within a transaction so they can all be published at
+/// once when the transaction succeeds.
+///
+/// It also provides an implementation for the opcodes that refer to storage and gives the
+/// proper guarantees of reference lifetime.
+///
+/// Dirty objects are serialized and returned in make_write_set.
+///
+/// It is a responsibility of the client to publish changes once the transaction is executed.
+///
+/// The Move VM takes a `DataStore` in input and this is the default and correct implementation
+/// for a data store related to a transaction. Clients should create an instance of this type
+/// and pass it to the Move VM.
+pub(crate) struct TransactionDataCache<'l, S> {
+    remote: S,
+    loader: &'l Loader,
+    account_map: BTreeMap<AccountAddress, AccountDataCache>,
+    event_data: Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)>,
+}
+
+impl<'l, S: MoveResolver> TransactionDataCache<'l, S> {
+    /// Create a `TransactionDataCache` with a `RemoteCache` that provides access to data
+    /// not updated in the transaction.
+    pub(crate) fn new(remote: S, loader: &'l Loader) -> Self {
+        TransactionDataCache {
+            remote,
+            loader,
+            account_map: BTreeMap::new(),
+            event_data: vec![],
+        }
+    }
+
+    /// Make a write set from the updated (dirty, deleted) global resources along with
+    /// published modules.
+    ///
+    /// Gives all proper guarantees on lifetime of global data as well.
+    pub(crate) fn into_effects(mut self) -> (PartialVMResult<(ChangeSet, Vec<Event>)>, S) {
+        (self.impl_into_effects(), self.remote)
+    }
+    fn impl_into_effects(&mut self) -> PartialVMResult<(ChangeSet, Vec<Event>)> {
+        let mut change_set = ChangeSet::new();
+        for (addr, account_data_cache) in std::mem::take(&mut self.account_map).into_iter() {
+            let mut modules = BTreeMap::new();
+            for (module_name, module_blob) in account_data_cache.module_map {
+                modules.insert(module_name, Op::New(module_blob));
+            }
+
+            let mut resources = BTreeMap::new();
+            for (ty, (layout, gv)) in account_data_cache.data_map {
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                let struct_tag = match self.loader.type_to_type_tag(&ty)? {
+                    TypeTag::Struct(struct_tag) => *struct_tag,
+                    _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::New(resource_blob));
+                    }
+                    Op::Modify(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::Modify(resource_blob));
+                    }
+                    Op::Delete => {
+                        resources.insert(struct_tag, Op::Delete);
+                    }
+                }
+            }
+            if !modules.is_empty() || !resources.is_empty() {
+                change_set
+                    .add_account_changeset(
+                        addr,
+                        AccountChangeSet::from_modules_resources(modules, resources),
+                    )
+                    .expect("accounts should be unique");
+            }
+        }
+
+        let mut events = vec![];
+        for (guid, seq_num, ty, ty_layout, val) in std::mem::take(&mut self.event_data) {
+            let ty_tag = self.loader.type_to_type_tag(&ty)?;
+            let blob = val
+                .simple_serialize(&ty_layout)
+                .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+            events.push((guid, seq_num, ty_tag, blob))
+        }
+
+        Ok((change_set, events))
+    }
+
+    pub(crate) fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        // The sender's account will always be mutated.
+        let mut total_mutated_accounts: u64 = 1;
+        for (addr, entry) in self.account_map.iter() {
+            if addr != sender && entry.data_map.values().any(|(_, v)| v.is_mutated()) {
+                total_mutated_accounts += 1;
+            }
+        }
+        total_mutated_accounts
+    }
+
+    pub(crate) fn get_remote_resolver(&self) -> &S {
+        &self.remote
+    }
+
+    pub(crate) fn get_remote_resolver_mut(&mut self) -> &mut S {
+        &mut self.remote
+    }
+}
+
+// `DataStore` implementation for the `TransactionDataCache`
+impl<'l, S: MoveResolver> DataStore for TransactionDataCache<'l, S> {
+    // Retrieve data from the local cache or loads it from the remote cache into the local cache.
+    // All operations on the global data are based on this API and they all load the data
+    // into the cache.
+    fn load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        let account_cache = self
+            .account_map
+            .entry(addr)
+            .or_insert_with(AccountDataCache::new);
+
+        let mut load_res = None;
+        if !account_cache.data_map.contains_key(ty) {
+            let ty_tag = match self.loader.type_to_type_tag(ty)? {
+                TypeTag::Struct(s_tag) => s_tag,
+                _ =>
+                // non-struct top-level value; can't happen
+                {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))
+                }
+            };
+            // TODO(Gas): Shall we charge for this?
+            let ty_layout = self.loader.type_to_type_layout(ty)?;
+
+            let gv = match self.remote.get_resource(&addr, &ty_tag) {
+                Ok(Some(blob)) => {
+                    load_res = Some(Some(NumBytes::new(blob.len() as u64)));
+                    let val = match Value::simple_deserialize(&blob, &ty_layout) {
+                        Some(val) => val,
+                        None => {
+                            let msg =
+                                format!("Failed to deserialize resource {} at {}!", ty_tag, addr);
+                            return Err(PartialVMError::new(
+                                StatusCode::FAILED_TO_DESERIALIZE_RESOURCE,
+                            )
+                            .with_message(msg));
+                        }
+                    };
+
+                    GlobalValue::cached(val)?
+                }
+                Ok(None) => {
+                    load_res = Some(None);
+                    GlobalValue::none()
+                }
+                Err(err) => {
+                    let msg = format!("Unexpected storage error: {:?}", err);
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(msg),
+                    );
+                }
+            };
+
+            account_cache.data_map.insert(ty.clone(), (ty_layout, gv));
+        }
+
+        Ok((
+            account_cache
+                .data_map
+                .get_mut(ty)
+                .map(|(_ty_layout, gv)| gv)
+                .expect("global value must exist"),
+            load_res,
+        ))
+    }
+
+    fn link_context(&self) -> AccountAddress {
+        self.remote.link_context()
+    }
+
+    fn relocate(&self, module_id: &ModuleId) -> PartialVMResult<ModuleId> {
+        self.remote.relocate(module_id).map_err(|err| {
+            PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Error relocating {module_id}: {err:?}"))
+        })
+    }
+
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> PartialVMResult<ModuleId> {
+        self.remote
+            .defining_module(module_id, struct_)
+            .map_err(|err| {
+                PartialVMError::new(StatusCode::LINKER_ERROR).with_message(format!(
+                    "Error finding defining module for {module_id}::{struct_}: {err:?}"
+                ))
+            })
+    }
+
+    fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
+        if let Some(account_cache) = self.account_map.get(module_id.address()) {
+            if let Some(blob) = account_cache.module_map.get(module_id.name()) {
+                return Ok(blob.clone());
+            }
+        }
+        match self.remote.get_module(module_id) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Cannot find {:?} in data cache", module_id))
+                .finish(Location::Undefined)),
+            Err(err) => {
+                let msg = format!("Unexpected storage error: {:?}", err);
+                Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(msg)
+                        .finish(Location::Undefined),
+                )
+            }
+        }
+    }
+
+    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()> {
+        let account_cache = self
+            .account_map
+            .entry(*module_id.address())
+            .or_insert_with(AccountDataCache::new);
+
+        account_cache
+            .module_map
+            .insert(module_id.name().to_owned(), blob);
+
+        Ok(())
+    }
+
+    fn emit_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<()> {
+        let ty_layout = self.loader.type_to_type_layout(&ty)?;
+        Ok(self.event_data.push((guid, seq_num, ty, ty_layout, val)))
+    }
+
+    fn events(&self) -> &Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)> {
+        &self.event_data
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/debug.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/debug.rs
new file mode 100644
index 000000000..9be306b09
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/debug.rs
@@ -0,0 +1,195 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+use move_binary_format::file_format::Bytecode;
+use move_vm_types::values::{self, Locals};
+use std::{
+    collections::BTreeSet,
+    io::{self, Write},
+    str::FromStr,
+};
+
+#[derive(Debug)]
+enum DebugCommand {
+    PrintStack,
+    Step,
+    Continue,
+    Breakpoint(String),
+    DeleteBreakpoint(String),
+    PrintBreakpoints,
+}
+
+impl DebugCommand {
+    pub fn debug_string(&self) -> &str {
+        match self {
+            Self::PrintStack => "stack",
+            Self::Step => "step",
+            Self::Continue => "continue",
+            Self::Breakpoint(_) => "breakpoint ",
+            Self::DeleteBreakpoint(_) => "delete ",
+            Self::PrintBreakpoints => "breakpoints",
+        }
+    }
+
+    pub fn commands() -> Vec<DebugCommand> {
+        vec![
+            Self::PrintStack,
+            Self::Step,
+            Self::Continue,
+            Self::Breakpoint("".to_string()),
+            Self::DeleteBreakpoint("".to_string()),
+            Self::PrintBreakpoints,
+        ]
+    }
+}
+
+impl FromStr for DebugCommand {
+    type Err = String;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use DebugCommand::*;
+        let s = s.trim();
+        if s.starts_with(PrintStack.debug_string()) {
+            return Ok(PrintStack);
+        }
+        if s.starts_with(Step.debug_string()) {
+            return Ok(Step);
+        }
+        if s.starts_with(Continue.debug_string()) {
+            return Ok(Continue);
+        }
+        if let Some(breakpoint) = s.strip_prefix(Breakpoint("".to_owned()).debug_string()) {
+            return Ok(Breakpoint(breakpoint.to_owned()));
+        }
+        if let Some(breakpoint) = s.strip_prefix(DeleteBreakpoint("".to_owned()).debug_string()) {
+            return Ok(DeleteBreakpoint(breakpoint.to_owned()));
+        }
+        if s.starts_with(PrintBreakpoints.debug_string()) {
+            return Ok(PrintBreakpoints);
+        }
+        Err(format!(
+            "Unrecognized command: {}\nAvailable commands: {}",
+            s,
+            Self::commands()
+                .iter()
+                .map(|command| command.debug_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        ))
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct DebugContext {
+    breakpoints: BTreeSet<String>,
+    should_take_input: bool,
+}
+
+impl DebugContext {
+    pub(crate) fn new() -> Self {
+        Self {
+            breakpoints: BTreeSet::new(),
+            should_take_input: true,
+        }
+    }
+
+    pub(crate) fn debug_loop(
+        &mut self,
+        function_desc: &Function,
+        locals: &Locals,
+        pc: u16,
+        instr: &Bytecode,
+        resolver: &Loader,
+        interp: &Interpreter,
+    ) {
+        let instr_string = format!("{:?}", instr);
+        let function_string = function_desc.pretty_string();
+        let breakpoint_hit = self.breakpoints.contains(&function_string)
+            || self
+                .breakpoints
+                .iter()
+                .any(|bp| instr_string[..].starts_with(bp.as_str()));
+
+        if self.should_take_input || breakpoint_hit {
+            self.should_take_input = true;
+            if breakpoint_hit {
+                let bp_match = self
+                    .breakpoints
+                    .iter()
+                    .find(|bp| instr_string.starts_with(bp.as_str()))
+                    .unwrap()
+                    .clone();
+                println!(
+                    "Breakpoint {} hit with instruction {}",
+                    bp_match, instr_string
+                );
+            }
+            println!(
+                "function >> {}\ninstruction >> {:?}\nprogram counter >> {}",
+                function_string, instr, pc
+            );
+            loop {
+                print!("> ");
+                std::io::stdout().flush().unwrap();
+                let mut input = String::new();
+                match io::stdin().read_line(&mut input) {
+                    Ok(_) => match input.parse::<DebugCommand>() {
+                        Err(err) => println!("{}", err),
+                        Ok(command) => match command {
+                            DebugCommand::Step => {
+                                self.should_take_input = true;
+                                break;
+                            }
+                            DebugCommand::Continue => {
+                                self.should_take_input = false;
+                                break;
+                            }
+                            DebugCommand::Breakpoint(breakpoint) => {
+                                self.breakpoints.insert(breakpoint.to_string());
+                            }
+                            DebugCommand::DeleteBreakpoint(breakpoint) => {
+                                self.breakpoints.remove(&breakpoint);
+                            }
+                            DebugCommand::PrintBreakpoints => self
+                                .breakpoints
+                                .iter()
+                                .enumerate()
+                                .for_each(|(i, bp)| println!("[{}] {}", i, bp)),
+                            DebugCommand::PrintStack => {
+                                let mut s = String::new();
+                                interp.debug_print_stack_trace(&mut s, resolver).unwrap();
+                                println!("{}", s);
+                                println!("Current frame: {}\n", function_string);
+                                let code = function_desc.code();
+                                println!("        Code:");
+                                for (i, instr) in code.iter().enumerate() {
+                                    if i as u16 == pc {
+                                        println!("          > [{}] {:?}", pc, instr);
+                                    } else {
+                                        println!("            [{}] {:?}", i, instr);
+                                    }
+                                }
+                                println!("        Locals:");
+                                if function_desc.local_count() > 0 {
+                                    let mut s = String::new();
+                                    values::debug::print_locals(&mut s, locals).unwrap();
+                                    println!("{}", s);
+                                } else {
+                                    println!("            (none)");
+                                }
+                            }
+                        },
+                    },
+                    Err(err) => {
+                        println!("Error reading input: {}", err);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/interpreter.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/interpreter.rs
new file mode 100644
index 000000000..48d3f0839
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/interpreter.rs
@@ -0,0 +1,2514 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::native_extensions::NativeContextExtensions;
+use crate::{
+    loader::{Function, Loader, Resolver},
+    native_functions::NativeContext,
+    trace,
+};
+use fail::fail_point;
+use move_binary_format::{
+    errors::*,
+    file_format::{Ability, AbilitySet, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{NumArgs, NumBytes},
+    language_storage::TypeTag,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_profiler::{
+    profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    gas::{GasMeter, SimpleInstruction},
+    loaded_data::runtime_types::Type,
+    values::{
+        self, GlobalValue, IntegerValue, Locals, Reference, Struct, StructRef, VMValueCast, Value,
+        Vector, VectorRef,
+    },
+    views::TypeView,
+};
+use smallvec::SmallVec;
+use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc};
+use tracing::error;
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! set_err_info {
+    ($frame:ident, $e:expr) => {{
+        $e.at_code_offset($frame.function.index(), $frame.pc)
+            .finish($frame.location())
+    }};
+}
+
+enum InstrRet {
+    Ok,
+    ExitCode(ExitCode),
+    Branch,
+}
+
+/// `Interpreter` instances can execute Move functions.
+///
+/// An `Interpreter` instance is a stand alone execution context for a function.
+/// It mimics execution on a single thread, with an call stack and an operand stack.
+pub(crate) struct Interpreter {
+    /// Operand stack, where Move `Value`s are stored for stack operations.
+    operand_stack: Stack,
+    /// The stack of active functions.
+    call_stack: CallStack,
+    /// Whether to perform a paranoid type safety checks at runtime.
+    paranoid_type_checks: bool,
+    /// Limits imposed at runtime
+    runtime_limits_config: VMRuntimeLimitsConfig,
+}
+
+struct TypeWithLoader<'a, 'b> {
+    ty: &'a Type,
+    loader: &'b Loader,
+}
+
+impl<'a, 'b> TypeView for TypeWithLoader<'a, 'b> {
+    fn to_type_tag(&self) -> TypeTag {
+        self.loader.type_to_type_tag(self.ty).unwrap()
+    }
+}
+
+impl Interpreter {
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        &self.runtime_limits_config
+    }
+    /// Entrypoint into the interpreter. All external calls need to be routed through this
+    /// function.
+    pub(crate) fn entrypoint(
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        loader: &Loader,
+    ) -> VMResult<Vec<Value>> {
+        let mut interpreter = Interpreter {
+            operand_stack: Stack::new(),
+            call_stack: CallStack::new(),
+            paranoid_type_checks: loader.vm_config().paranoid_type_checks,
+            runtime_limits_config: loader.vm_config().runtime_limits_config.clone(),
+        };
+
+        profile_open_frame!(gas_meter, function.pretty_string());
+
+        if function.is_native() {
+            for arg in args {
+                interpreter
+                    .operand_stack
+                    .push(arg)
+                    .map_err(|e| e.finish(Location::Undefined))?;
+            }
+            let link_context = data_store.link_context();
+            let resolver = function.get_resolver(link_context, loader);
+
+            if interpreter.paranoid_type_checks {
+                for ty in function.parameter_types() {
+                    let type_ = if ty_args.is_empty() {
+                        ty.clone()
+                    } else {
+                        resolver
+                            .subst(ty, &ty_args)
+                            .map_err(|e| e.finish(Location::Undefined))?
+                    };
+                    interpreter
+                        .operand_stack
+                        .push_ty(type_)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                }
+            }
+
+            let return_values = interpreter
+                .call_native_return_values(
+                    &resolver,
+                    data_store,
+                    gas_meter,
+                    extensions,
+                    function.clone(),
+                    &ty_args,
+                )
+                .map_err(|e| match function.module_id() {
+                    Some(id) => e
+                        .at_code_offset(function.index(), 0)
+                        .finish(Location::Module(id.clone())),
+                    None => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(
+                            "Unexpected native function not located in a module".to_owned(),
+                        )
+                        .finish(Location::Undefined),
+                })?;
+
+            profile_close_frame!(gas_meter, function.pretty_string());
+
+            Ok(return_values.into_iter().collect())
+        } else {
+            interpreter.execute_main(
+                loader, data_store, gas_meter, extensions, function, ty_args, args,
+            )
+        }
+    }
+
+    /// Main loop for the execution of a function.
+    ///
+    /// This function sets up a `Frame` and calls `execute_code_unit` to execute code of the
+    /// function represented by the frame. Control comes back to this function on return or
+    /// on call. When that happens the frame is changes to a new one (call) or to the one
+    /// at the top of the stack (return). If the call stack is empty execution is completed.
+    fn execute_main(
+        mut self,
+        loader: &Loader,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+    ) -> VMResult<Vec<Value>> {
+        let mut locals = Locals::new(function.local_count());
+        for (i, value) in args.into_iter().enumerate() {
+            locals
+                .store_loc(
+                    i,
+                    value,
+                    loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )
+                .map_err(|e| self.set_location(e))?;
+        }
+
+        let link_context = data_store.link_context();
+        let mut current_frame = self
+            .make_new_frame(link_context, loader, function, ty_args, locals)
+            .map_err(|err| self.set_location(err))?;
+        loop {
+            let resolver = current_frame.resolver(link_context, loader);
+            let exit_code =
+                current_frame //self
+                    .execute_code(&resolver, &mut self, data_store, gas_meter)
+                    .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+            match exit_code {
+                ExitCode::Return => {
+                    let non_ref_vals = current_frame
+                        .locals
+                        .drop_all_values()
+                        .map(|(_idx, val)| val);
+
+                    // TODO: Check if the error location is set correctly.
+                    gas_meter
+                        .charge_drop_frame(non_ref_vals.into_iter())
+                        .map_err(|e| self.set_location(e))?;
+                    profile_close_frame!(gas_meter, current_frame.function.pretty_string());
+
+                    if let Some(frame) = self.call_stack.pop() {
+                        // Note: the caller will find the callee's return values at the top of the shared operand stack
+                        current_frame = frame;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                    } else {
+                        // end of execution. `self` should no longer be used afterward
+                        return Ok(self.operand_stack.value);
+                    }
+                }
+                ExitCode::Call(fh_idx) => {
+                    let func = resolver.function_from_handle(fh_idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call(
+                            module_id,
+                            func.name(),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver,
+                            data_store,
+                            gas_meter,
+                            extensions,
+                            func,
+                            vec![],
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                        profile_close_frame!(gas_meter, func_name);
+
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(link_context, loader, func, vec![])
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    // Note: the caller will find the the callee's return values at the top of the shared operand stack
+                    current_frame = frame;
+                }
+                ExitCode::CallGeneric(idx) => {
+                    // TODO(Gas): We should charge gas as we do type substitution...
+                    let ty_args = resolver
+                        .instantiate_generic_function(idx, current_frame.ty_args())
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    let func = resolver.function_from_instantiation(idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call_generic(
+                            module_id,
+                            func.name(),
+                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver, data_store, gas_meter, extensions, func, ty_args,
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                        profile_close_frame!(gas_meter, func_name);
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(link_context, loader, func, ty_args)
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    current_frame = frame;
+                }
+            }
+        }
+    }
+
+    /// Returns a `Frame` if the call is to a Move function. Calls to native functions are
+    /// "inlined" and this returns `None`.
+    ///
+    /// Native functions do not push a frame at the moment and as such errors from a native
+    /// function are incorrectly attributed to the caller.
+    fn make_call_frame(
+        &mut self,
+        link_context: AccountAddress,
+        loader: &Loader,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<Frame> {
+        let mut locals = Locals::new(func.local_count());
+        let arg_count = func.arg_count();
+        let is_generic = !ty_args.is_empty();
+        for i in 0..arg_count {
+            locals.store_loc(
+                arg_count - i - 1,
+                self.operand_stack.pop()?,
+                loader
+                    .vm_config()
+                    .enable_invariant_violation_check_in_swap_loc,
+            )?;
+
+            if self.paranoid_type_checks {
+                let ty = self.operand_stack.pop_ty()?;
+                let resolver = func.get_resolver(link_context, loader);
+                if is_generic {
+                    ty.check_eq(
+                        &resolver.subst(&func.local_types()[arg_count - i - 1], &ty_args)?,
+                    )?;
+                } else {
+                    // Directly check against the expected type to save a clone here.
+                    ty.check_eq(&func.local_types()[arg_count - i - 1])?;
+                }
+            }
+        }
+        self.make_new_frame(link_context, loader, func, ty_args, locals)
+    }
+
+    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    ///
+    /// The locals must be loaded before calling this.
+    fn make_new_frame(
+        &self,
+        link_context: AccountAddress,
+        loader: &Loader,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        locals: Locals,
+    ) -> PartialVMResult<Frame> {
+        let local_tys = if self.paranoid_type_checks {
+            if ty_args.is_empty() {
+                function.local_types().to_vec()
+            } else {
+                let resolver = function.get_resolver(link_context, loader);
+                function
+                    .local_types()
+                    .iter()
+                    .map(|ty| resolver.subst(ty, &ty_args))
+                    .collect::<PartialVMResult<Vec<_>>>()?
+            }
+        } else {
+            vec![]
+        };
+        Ok(Frame {
+            pc: 0,
+            locals,
+            function,
+            ty_args,
+            local_tys,
+        })
+    }
+
+    /// Call a native functions.
+    fn call_native(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> VMResult<()> {
+        // Note: refactor if native functions push a frame on the stack
+        self.call_native_impl(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            ty_args,
+        )
+        .map_err(|e| match function.module_id() {
+            Some(id) => {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(self.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(function.index(), 0)
+                    .finish(Location::Module(id.clone()))
+            }
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Unexpected native function not located in a module".to_owned());
+                self.set_location(err)
+            }
+        })
+    }
+
+    fn call_native_impl(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<()> {
+        let return_values = self.call_native_return_values(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            &ty_args,
+        )?;
+        // Put return values on the top of the operand stack, where the caller will find them.
+        // This is one of only two times the operand stack is shared across call stack frames; the other is in handling
+        // the Return instruction for normal calls
+        for value in return_values {
+            self.operand_stack.push(value)?;
+        }
+
+        if self.paranoid_type_checks {
+            for ty in function.return_types() {
+                self.operand_stack.push_ty(ty.subst(&ty_args)?)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn call_native_return_values(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: &[Type],
+    ) -> PartialVMResult<SmallVec<[Value; 1]>> {
+        let return_type_count = function.return_type_count();
+        let mut args = VecDeque::new();
+        let expected_args = function.arg_count();
+        for _ in 0..expected_args {
+            args.push_front(self.operand_stack.pop()?);
+        }
+
+        if self.paranoid_type_checks {
+            for i in 0..expected_args {
+                let expected_ty =
+                    resolver.subst(&function.parameter_types()[expected_args - i - 1], ty_args)?;
+                let ty = self.operand_stack.pop_ty()?;
+                ty.check_eq(&expected_ty)?;
+            }
+        }
+
+        let mut native_context = NativeContext::new(
+            self,
+            data_store,
+            resolver,
+            extensions,
+            gas_meter.remaining_gas(),
+        );
+        let native_function = function.get_native()?;
+
+        gas_meter.charge_native_function_before_execution(
+            ty_args.iter().map(|ty| TypeWithLoader {
+                ty,
+                loader: resolver.loader(),
+            }),
+            args.iter(),
+        )?;
+
+        let result = native_function(&mut native_context, ty_args.to_vec(), args)?;
+
+        // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
+        //            here or otherwise it becomes an incompatible change!!!
+        let return_values = match result.result {
+            Ok(vals) => {
+                gas_meter.charge_native_function(result.cost, Some(vals.iter()))?;
+                vals
+            }
+            Err(code) => {
+                gas_meter.charge_native_function(
+                    result.cost,
+                    Option::<std::iter::Empty<&Value>>::None,
+                )?;
+                return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(code));
+            }
+        };
+
+        // Paranoid check to protect us against incorrect native function implementations. A native function that
+        // returns a different number of values than its declared types will trigger this check
+        if return_values.len() != return_type_count {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Arity mismatch: return value count does not match return type count"
+                        .to_string(),
+                ),
+            );
+        }
+        Ok(return_values)
+    }
+
+    /// Make sure only private/friend function can only be invoked by modules under the same address.
+    fn check_friend_or_private_call(
+        &self,
+        caller: &Arc<Function>,
+        callee: &Arc<Function>,
+    ) -> VMResult<()> {
+        if callee.is_friend_or_private() {
+            match (caller.module_id(), callee.module_id()) {
+                (Some(caller_id), Some(callee_id)) => {
+                    if caller_id.address() == callee_id.address() {
+                        Ok(())
+                    } else {
+                        Err(self.set_location(PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message(
+                                    format!("Private/Friend function invokation error, caller: {:?}::{:?}, callee: {:?}::{:?}", caller_id, caller.name(), callee_id, callee.name()),
+                                )))
+                    }
+                }
+                _ => Err(self.set_location(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "Private/Friend function invokation error caller: {:?}, callee {:?}",
+                            caller.name(),
+                            callee.name()
+                        )),
+                )),
+            }
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Perform a binary operation to two values at the top of the stack.
+    fn binop<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<Value>,
+    {
+        let rhs = self.operand_stack.pop_as::<T>()?;
+        let lhs = self.operand_stack.pop_as::<T>()?;
+        let result = f(lhs, rhs)?;
+        self.operand_stack.push(result)
+    }
+
+    /// Perform a binary operation for integer values.
+    fn binop_int<F>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        F: FnOnce(IntegerValue, IntegerValue) -> PartialVMResult<IntegerValue>,
+    {
+        self.binop(|lhs, rhs| {
+            Ok(match f(lhs, rhs)? {
+                IntegerValue::U8(x) => Value::u8(x),
+                IntegerValue::U16(x) => Value::u16(x),
+                IntegerValue::U32(x) => Value::u32(x),
+                IntegerValue::U64(x) => Value::u64(x),
+                IntegerValue::U128(x) => Value::u128(x),
+                IntegerValue::U256(x) => Value::u256(x),
+            })
+        })
+    }
+
+    /// Perform a binary operation for boolean values.
+    fn binop_bool<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<bool>,
+    {
+        self.binop(|lhs, rhs| Ok(Value::bool(f(lhs, rhs)?)))
+    }
+
+    /// Loads a resource from the data store and return the number of bytes read from the storage.
+    fn load_resource<'b>(
+        gas_meter: &mut impl GasMeter,
+        data_store: &'b mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<&'b mut GlobalValue> {
+        match data_store.load_resource(addr, ty) {
+            Ok((gv, load_res)) => {
+                if let Some(loaded) = load_res {
+                    let opt = match loaded {
+                        Some(num_bytes) => {
+                            let view = gv.view().ok_or_else(|| {
+                                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                    .with_message(
+                                        "Failed to create view for global value".to_owned(),
+                                    )
+                            })?;
+
+                            Some((num_bytes, view))
+                        }
+                        None => None,
+                    };
+                    gas_meter.charge_load_resource(opt)?;
+                }
+                Ok(gv)
+            }
+            Err(e) => {
+                error!(
+                    "[VM] error loading resource at ({}, {:?}): {:?} from data store",
+                    addr, ty, e
+                );
+                Err(e)
+            }
+        }
+    }
+
+    /// BorrowGlobal (mutable and not) opcode.
+    fn borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let res = Self::load_resource(gas_meter, data_store, addr, ty)?.borrow_global();
+        gas_meter.charge_borrow_global(
+            is_mut,
+            is_generic,
+            TypeWithLoader { ty, loader },
+            res.is_ok(),
+        )?;
+        self.operand_stack.push(res?)?;
+        Ok(())
+    }
+
+    /// Exists opcode.
+    fn exists(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        let exists = gv.exists()?;
+        gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
+        self.operand_stack.push(Value::bool(exists))?;
+        Ok(())
+    }
+
+    /// MoveFrom opcode.
+    fn move_from(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let resource = match Self::load_resource(gas_meter, data_store, addr, ty)?.move_from() {
+            Ok(resource) => {
+                gas_meter.charge_move_from(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    Some(&resource),
+                )?;
+                resource
+            }
+            Err(err) => {
+                let val: Option<&Value> = None;
+                gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                return Err(err);
+            }
+        };
+        self.operand_stack.push(resource)?;
+        Ok(())
+    }
+
+    /// MoveTo opcode.
+    fn move_to(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+        resource: Value,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
+        //            the move_to operation.
+        match gv.move_to(resource) {
+            Ok(()) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    gv.view().unwrap(),
+                    true,
+                )?;
+                Ok(())
+            }
+            Err((err, resource)) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    &resource,
+                    false,
+                )?;
+                Err(err)
+            }
+        }
+    }
+
+    //
+    // Debugging and logging helpers.
+    //
+
+    /// Given an `VMStatus` generate a core dump if the error is an `InvariantViolation`.
+    fn maybe_core_dump(&self, mut err: VMError, current_frame: &Frame) -> VMError {
+        // a verification error cannot happen at runtime so change it into an invariant violation.
+        if err.status_type() == StatusType::Verification {
+            error!("Verification error during runtime: {:?}", err);
+            let new_err = PartialVMError::new(StatusCode::VERIFICATION_ERROR);
+            let new_err = match err.message() {
+                None => new_err,
+                Some(msg) => new_err.with_message(msg.to_owned()),
+            };
+            err = new_err.finish(err.location().clone())
+        }
+        if err.status_type() == StatusType::InvariantViolation {
+            let state = self.internal_state_str(current_frame);
+
+            error!(
+                "Error: {:?}\nCORE DUMP: >>>>>>>>>>>>\n{}\n<<<<<<<<<<<<\n",
+                err, state,
+            );
+        }
+        err
+    }
+
+    #[allow(dead_code)]
+    fn debug_print_frame<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+        idx: usize,
+        frame: &Frame,
+    ) -> PartialVMResult<()> {
+        // Print out the function name with type arguments.
+        let func = &frame.function;
+
+        debug_write!(buf, "    [{}] ", idx)?;
+        if let Some(module) = func.module_id() {
+            debug_write!(buf, "{}::{}::", module.address(), module.name(),)?;
+        }
+        debug_write!(buf, "{}", func.name())?;
+        let ty_args = frame.ty_args();
+        let mut ty_tags = vec![];
+        for ty in ty_args {
+            ty_tags.push(loader.type_to_type_tag(ty)?);
+        }
+        if !ty_tags.is_empty() {
+            debug_write!(buf, "<")?;
+            let mut it = ty_tags.iter();
+            if let Some(tag) = it.next() {
+                debug_write!(buf, "{}", tag)?;
+                for tag in it {
+                    debug_write!(buf, ", ")?;
+                    debug_write!(buf, "{}", tag)?;
+                }
+            }
+            debug_write!(buf, ">")?;
+        }
+        debug_writeln!(buf)?;
+
+        // Print out the current instruction.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Code:")?;
+        let pc = frame.pc as usize;
+        let code = func.code();
+        let before = if pc > 3 { pc - 3 } else { 0 };
+        let after = min(code.len(), pc + 4);
+        for (idx, instr) in code.iter().enumerate().take(pc).skip(before) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+        debug_writeln!(buf, "          > [{}] {:?}", pc, &code[pc])?;
+        for (idx, instr) in code.iter().enumerate().take(after).skip(pc + 1) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+
+        // Print out the locals.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Locals:")?;
+        if func.local_count() > 0 {
+            values::debug::print_locals(buf, &frame.locals)?;
+            debug_writeln!(buf)?;
+        } else {
+            debug_writeln!(buf, "            (none)")?;
+        }
+
+        debug_writeln!(buf)?;
+        Ok(())
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn debug_print_stack_trace<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+    ) -> PartialVMResult<()> {
+        debug_writeln!(buf, "Call Stack:")?;
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            self.debug_print_frame(buf, loader, i, frame)?;
+        }
+        debug_writeln!(buf, "Operand Stack:")?;
+        for (idx, val) in self.operand_stack.value.iter().enumerate() {
+            // TODO: Currently we do not know the types of the values on the operand stack.
+            // Revisit.
+            debug_write!(buf, "    [{}] ", idx)?;
+            values::debug::print_value(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    /// Generate a string which is the status of the interpreter: call stack, current bytecode
+    /// stream, locals and operand stack.
+    ///
+    /// It is used when generating a core dump but can be used for debugging of the interpreter.
+    /// It will be exposed via a debug module to give developers a way to print the internals
+    /// of an execution.
+    fn internal_state_str(&self, current_frame: &Frame) -> String {
+        let mut internal_state = "Call stack:\n".to_string();
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            internal_state.push_str(
+                format!(
+                    " frame #{}: {} [pc = {}]\n",
+                    i,
+                    frame.function.pretty_string(),
+                    frame.pc,
+                )
+                .as_str(),
+            );
+        }
+        internal_state.push_str(
+            format!(
+                "*frame #{}: {} [pc = {}]:\n",
+                self.call_stack.0.len(),
+                current_frame.function.pretty_string(),
+                current_frame.pc,
+            )
+            .as_str(),
+        );
+        let code = current_frame.function.code();
+        let pc = current_frame.pc as usize;
+        if pc < code.len() {
+            let mut i = 0;
+            for bytecode in &code[..pc] {
+                internal_state.push_str(format!("{}> {:?}\n", i, bytecode).as_str());
+                i += 1;
+            }
+            internal_state.push_str(format!("{}* {:?}\n", i, code[pc]).as_str());
+        }
+        internal_state.push_str(
+            format!(
+                "Locals ({:x}):\n{}\n",
+                current_frame.locals.raw_address(),
+                current_frame.locals
+            )
+            .as_str(),
+        );
+        internal_state.push_str("Operand Stack:\n");
+        for value in &self.operand_stack.value {
+            internal_state.push_str(format!("{}\n", value).as_str());
+        }
+        internal_state
+    }
+
+    fn set_location(&self, err: PartialVMError) -> VMError {
+        err.finish(self.call_stack.current_location())
+    }
+
+    fn get_internal_state(&self) -> ExecutionState {
+        self.get_stack_frames(usize::MAX)
+    }
+
+    /// Get count stack frames starting from the top of the stack.
+    pub(crate) fn get_stack_frames(&self, count: usize) -> ExecutionState {
+        // collect frames in the reverse order as this is what is
+        // normally expected from the stack trace (outermost frame
+        // is the last one)
+        let stack_trace = self
+            .call_stack
+            .0
+            .iter()
+            .rev()
+            .take(count)
+            .map(|frame| {
+                (
+                    frame.function.module_id().cloned(),
+                    frame.function.index(),
+                    frame.pc,
+                )
+            })
+            .collect();
+        ExecutionState::new(stack_trace)
+    }
+}
+
+// TODO Determine stack size limits based on gas limit
+const OPERAND_STACK_SIZE_LIMIT: usize = 1024;
+const CALL_STACK_SIZE_LIMIT: usize = 1024;
+
+/// The operand stack.
+struct Stack {
+    value: Vec<Value>,
+    types: Vec<Type>,
+}
+
+impl Stack {
+    /// Create a new empty operand stack.
+    fn new() -> Self {
+        Stack {
+            value: vec![],
+            types: vec![],
+        }
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push(&mut self, value: Value) -> PartialVMResult<()> {
+        if self.value.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.value.push(value);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop(&mut self) -> PartialVMResult<Value> {
+        self.value
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop a `Value` of a given type off the stack. Abort if the value is not of the given
+    /// type or if the stack is empty.
+    fn pop_as<T>(&mut self) -> PartialVMResult<T>
+    where
+        Value: VMValueCast<T>,
+    {
+        self.pop()?.value_as()
+    }
+
+    /// Pop n values off the stack.
+    fn popn(&mut self, n: u16) -> PartialVMResult<Vec<Value>> {
+        let remaining_stack_size = self
+            .value
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.value.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn last_n(&self, n: usize) -> PartialVMResult<impl ExactSizeIterator<Item = &Value>> {
+        if self.value.len() < n {
+            return Err(PartialVMError::new(StatusCode::EMPTY_VALUE_STACK)
+                .with_message("Failed to get last n arguments on the argument stack".to_string()));
+        }
+        Ok(self.value[(self.value.len() - n)..].iter())
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push_ty(&mut self, ty: Type) -> PartialVMResult<()> {
+        if self.types.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.types.push(ty);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop_ty(&mut self) -> PartialVMResult<Type> {
+        self.types
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop n values off the stack.
+    fn popn_tys(&mut self, n: u16) -> PartialVMResult<Vec<Type>> {
+        let remaining_stack_size = self
+            .types
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.types.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn check_balance(&self) -> PartialVMResult<()> {
+        if self.types.len() != self.value.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Paranoid Mode: Type and value stack need to be balanced".to_string(),
+                ),
+            );
+        }
+        Ok(())
+    }
+}
+
+/// A call stack.
+// #[derive(Debug)]
+struct CallStack(Vec<Frame>);
+
+impl CallStack {
+    /// Create a new empty call stack.
+    fn new() -> Self {
+        CallStack(vec![])
+    }
+
+    /// Push a `Frame` on the call stack.
+    fn push(&mut self, frame: Frame) -> ::std::result::Result<(), Frame> {
+        if self.0.len() < CALL_STACK_SIZE_LIMIT {
+            self.0.push(frame);
+            Ok(())
+        } else {
+            Err(frame)
+        }
+    }
+
+    /// Pop a `Frame` off the call stack.
+    fn pop(&mut self) -> Option<Frame> {
+        self.0.pop()
+    }
+
+    fn current_location(&self) -> Location {
+        let location_opt = self.0.last().map(|frame| frame.location());
+        location_opt.unwrap_or(Location::Undefined)
+    }
+}
+
+/// A `Frame` is the execution context for a function. It holds the locals of the function and
+/// the function itself.
+// #[derive(Debug)]
+struct Frame {
+    pc: u16,
+    locals: Locals,
+    function: Arc<Function>,
+    ty_args: Vec<Type>,
+    local_tys: Vec<Type>,
+}
+
+/// An `ExitCode` from `execute_code_unit`.
+#[derive(Debug)]
+enum ExitCode {
+    Return,
+    Call(FunctionHandleIndex),
+    CallGeneric(FunctionInstantiationIndex),
+}
+
+fn check_ability(has_ability: bool) -> PartialVMResult<()> {
+    if has_ability {
+        Ok(())
+    } else {
+        Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Paranoid Mode: Expected ability mismatch".to_string()),
+        )
+    }
+}
+
+impl Frame {
+    /// Execute a Move function until a return or a call opcode is found.
+    fn execute_code(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<ExitCode> {
+        self.execute_code_impl(resolver, interpreter, data_store, gas_meter)
+            .map_err(|e| {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(interpreter.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(self.function.index(), self.pc)
+                    .finish(self.location())
+            })
+    }
+
+    /// Paranoid type checks to perform before instruction execution.
+    ///
+    /// Note that most of the checks should happen after instruction execution, because gas charging will happen during
+    /// instruction execution and we want to avoid running code without charging proper gas as much as possible.
+    fn pre_execution_type_stack_transition(
+        local_tys: &[Type],
+        locals: &Locals,
+        _ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            // Call instruction will be checked at execute_main.
+            Bytecode::Call(_) | Bytecode::CallGeneric(_) => (),
+            Bytecode::BrFalse(_) | Bytecode::BrTrue(_) => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            Bytecode::Branch(_) => (),
+            Bytecode::Ret => {
+                for (idx, ty) in local_tys.iter().enumerate() {
+                    if !locals.is_invalid(idx)? {
+                        check_ability(resolver.loader().abilities(ty)?.has_drop())?;
+                    }
+                }
+            }
+            Bytecode::Abort => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            // StLoc needs to check before execution as we need to check the drop ability of values.
+            Bytecode::StLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                ty.check_eq(&val_ty)?;
+                if !locals.is_invalid(*idx as usize)? {
+                    check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+                }
+            }
+            // We will check the rest of the instructions after execution phase.
+            Bytecode::Pop
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Lt
+            | Bytecode::Le
+            | Bytecode::Gt
+            | Bytecode::Ge
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::FreezeRef
+            | Bytecode::Nop
+            | Bytecode::Not
+            | Bytecode::VecPack(_, _)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(_, _)
+            | Bytecode::VecSwap(_) => (),
+        };
+        Ok(())
+    }
+
+    /// Paranoid type checks to perform after instruction execution.
+    ///
+    /// This function and `pre_execution_type_stack_transition` should constitute the full type stack transition for the paranoid mode.
+    fn post_execution_type_stack_transition(
+        local_tys: &[Type],
+        ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => (),
+            Bytecode::Branch(_)
+            | Bytecode::Ret
+            | Bytecode::Call(_)
+            | Bytecode::CallGeneric(_)
+            | Bytecode::Abort => {
+                // Invariants hold because all of the instructions above will force VM to break from the interpreter loop and thus not hit this code path.
+                unreachable!("control flow instruction encountered during type check")
+            }
+            Bytecode::Pop => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+            }
+            Bytecode::LdU8(_) => interpreter.operand_stack.push_ty(Type::U8)?,
+            Bytecode::LdU16(_) => interpreter.operand_stack.push_ty(Type::U16)?,
+            Bytecode::LdU32(_) => interpreter.operand_stack.push_ty(Type::U32)?,
+            Bytecode::LdU64(_) => interpreter.operand_stack.push_ty(Type::U64)?,
+            Bytecode::LdU128(_) => interpreter.operand_stack.push_ty(Type::U128)?,
+            Bytecode::LdU256(_) => interpreter.operand_stack.push_ty(Type::U256)?,
+            Bytecode::LdTrue | Bytecode::LdFalse => {
+                interpreter.operand_stack.push_ty(Type::Bool)?
+            }
+            Bytecode::LdConst(i) => {
+                let constant = resolver.constant_at(*i);
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::from_const_signature(&constant.type_)?)?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                check_ability(resolver.loader().abilities(&ty)?.has_copy())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::StLoc(_) => (),
+            Bytecode::MutBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(resolver.get_field_type(*fh_idx)?)))?;
+            }
+            Bytecode::MutBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.get_field_type(*fh_idx)?,
+                    )))?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter.operand_stack.push_ty(Type::Reference(Box::new(
+                    resolver.instantiate_generic_field(*idx, ty_args)?,
+                )))?;
+            }
+            Bytecode::MutBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.instantiate_generic_field(*idx, ty_args)?,
+                    )))?;
+            }
+            Bytecode::Pack(idx) => {
+                let field_count = resolver.field_count(*idx);
+                let args_ty = resolver.get_struct_fields(*idx)?;
+                let output_ty = resolver.get_struct_type(*idx);
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.fields.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.fields.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::PackGeneric(idx) => {
+                let field_count = resolver.field_instantiation_count(*idx);
+                let args_ty = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                let output_ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::Unpack(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.get_struct_type(*idx))?;
+                let struct_decl = resolver.get_struct_fields(*idx)?;
+                for ty in struct_decl.fields.iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+
+                let struct_decl = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                for ty in struct_decl.into_iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::Reference(inner) | Type::MutableReference(inner) => {
+                        check_ability(resolver.loader().abilities(&inner)?.has_copy())?;
+                        interpreter.operand_stack.push_ty(inner.as_ref().clone())?;
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("ReadRef expecting a value of reference type".to_string()))
+                    }
+                }
+            }
+            Bytecode::WriteRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::MutableReference(inner) => {
+                        if *inner == val_ty {
+                            check_ability(resolver.loader().abilities(&inner)?.has_drop())?;
+                        } else {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "WriteRef tried to write references of different types".to_string(),
+                            ));
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message(
+                            "WriteRef expecting a value of mutable reference type".to_string(),
+                        ))
+                    }
+                }
+            }
+            Bytecode::CastU8 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U8)?;
+            }
+            Bytecode::CastU16 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U16)?;
+            }
+            Bytecode::CastU32 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U32)?;
+            }
+            Bytecode::CastU64 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::CastU128 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U128)?;
+            }
+            Bytecode::CastU256 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U256)?;
+            }
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(lhs)?;
+            }
+            Bytecode::Shl | Bytecode::Shr => {
+                interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(rhs)?;
+            }
+            Bytecode::Lt | Bytecode::Le | Bytecode::Gt | Bytecode::Ge => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::Eq | Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                if lhs != rhs {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(
+                                "Integer binary operation expecting values of same type"
+                                    .to_string(),
+                            ),
+                    );
+                }
+                check_ability(resolver.loader().abilities(&lhs)?.has_drop())?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MutBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::Exists(_) | Bytecode::ExistsGeneric(_) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MoveTo(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.get_struct_type(*idx))?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveToGeneric(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveFrom(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveFromGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::FreezeRef => {
+                match interpreter.operand_stack.pop_ty()? {
+                    Type::MutableReference(ty) => {
+                        interpreter.operand_stack.push_ty(Type::Reference(ty))?
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("FreezeRef expects a mutable reference".to_string()))
+                    }
+                };
+            }
+            Bytecode::Nop => (),
+            Bytecode::Not => {
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::Bool)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let elem_tys = interpreter.operand_stack.popn_tys(*num as u16)?;
+                for elem_ty in elem_tys.iter() {
+                    elem_ty.check_eq(&ty)?;
+                }
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Vector(Box::new(ty)))?;
+            }
+            Bytecode::VecLen(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&ty)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter.operand_stack.push_ty(inner_ty)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let vec_ty = interpreter.operand_stack.pop_ty()?;
+                match vec_ty {
+                    Type::Vector(v) => {
+                        v.check_eq(&ty)?;
+                        for _ in 0..*num {
+                            interpreter.operand_stack.push_ty(v.as_ref().clone())?;
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("VecUnpack expect a vector type".to_string()))
+                    }
+                };
+            }
+            Bytecode::VecSwap(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn execute_instruction(
+        pc: &mut u16,
+        locals: &mut Locals,
+        ty_args: &[Type],
+        function: &Arc<Function>,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<InstrRet> {
+        use SimpleInstruction as S;
+
+        macro_rules! make_ty {
+            ($ty: expr) => {
+                TypeWithLoader {
+                    ty: $ty,
+                    loader: resolver.loader(),
+                }
+            };
+        }
+
+        match instruction {
+            Bytecode::Pop => {
+                let popped_val = interpreter.operand_stack.pop()?;
+                gas_meter.charge_pop(popped_val)?;
+            }
+            Bytecode::Ret => {
+                gas_meter.charge_simple_instr(S::Ret)?;
+                return Ok(InstrRet::ExitCode(ExitCode::Return));
+            }
+            Bytecode::BrTrue(offset) => {
+                gas_meter.charge_simple_instr(S::BrTrue)?;
+                if interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::BrFalse(offset) => {
+                gas_meter.charge_simple_instr(S::BrFalse)?;
+                if !interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::Branch(offset) => {
+                gas_meter.charge_simple_instr(S::Branch)?;
+                *pc = *offset;
+                return Ok(InstrRet::Branch);
+            }
+            Bytecode::LdU8(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU8)?;
+                interpreter.operand_stack.push(Value::u8(*int_const))?;
+            }
+            Bytecode::LdU16(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU16)?;
+                interpreter.operand_stack.push(Value::u16(*int_const))?;
+            }
+            Bytecode::LdU32(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU32)?;
+                interpreter.operand_stack.push(Value::u32(*int_const))?;
+            }
+            Bytecode::LdU64(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU64)?;
+                interpreter.operand_stack.push(Value::u64(*int_const))?;
+            }
+            Bytecode::LdU128(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU128)?;
+                interpreter.operand_stack.push(Value::u128(*int_const))?;
+            }
+            Bytecode::LdU256(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU256)?;
+                interpreter.operand_stack.push(Value::u256(*int_const))?;
+            }
+            Bytecode::LdConst(idx) => {
+                let constant = resolver.constant_at(*idx);
+                gas_meter.charge_ld_const(NumBytes::new(constant.data.len() as u64))?;
+
+                let val = Value::deserialize_constant(constant).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                        "Verifier failed to verify the deserialization of constants".to_owned(),
+                    )
+                })?;
+
+                gas_meter.charge_ld_const_after_deserialization(&val)?;
+
+                interpreter.operand_stack.push(val)?
+            }
+            Bytecode::LdTrue => {
+                gas_meter.charge_simple_instr(S::LdTrue)?;
+                interpreter.operand_stack.push(Value::bool(true))?;
+            }
+            Bytecode::LdFalse => {
+                gas_meter.charge_simple_instr(S::LdFalse)?;
+                interpreter.operand_stack.push(Value::bool(false))?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                // TODO(Gas): We should charge gas before copying the value.
+                let local = locals.copy_loc(*idx as usize)?;
+                gas_meter.charge_copy_loc(&local)?;
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let local = locals.move_loc(
+                    *idx as usize,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                gas_meter.charge_move_loc(&local)?;
+
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::StLoc(idx) => {
+                let value_to_store = interpreter.operand_stack.pop()?;
+                gas_meter.charge_store_loc(&value_to_store)?;
+                locals.store_loc(
+                    *idx as usize,
+                    value_to_store,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+            }
+            Bytecode::Call(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::Call(*idx)));
+            }
+            Bytecode::CallGeneric(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::CallGeneric(*idx)));
+            }
+            Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowLoc(_) => S::MutBorrowLoc,
+                    _ => S::ImmBorrowLoc,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+                interpreter
+                    .operand_stack
+                    .push(locals.borrow_loc(*idx as usize)?)?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) | Bytecode::MutBorrowField(fh_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowField,
+                    _ => S::ImmBorrowField,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_offset(*fh_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(fi_idx) | Bytecode::MutBorrowFieldGeneric(fi_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowFieldGeneric,
+                    _ => S::ImmBorrowFieldGeneric,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_instantiation_offset(*fi_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::Pack(sd_idx) => {
+                let field_count = resolver.field_count(*sd_idx);
+                let struct_type = resolver.get_struct_type(*sd_idx);
+                Self::check_depth_of_type(resolver, &struct_type)?;
+                gas_meter.charge_pack(
+                    false,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::PackGeneric(si_idx) => {
+                let field_count = resolver.field_instantiation_count(*si_idx);
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_pack(
+                    true,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::Unpack(_sd_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(false, struct_.field_views())?;
+
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::UnpackGeneric(_si_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(true, struct_.field_views())?;
+
+                // TODO: Whether or not we want this gas metering in the loop is
+                // questionable.  However, if we don't have it in the loop we could wind up
+                // doing a fair bit of work before charging for it.
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                gas_meter.charge_read_ref(reference.value_view())?;
+                let value = reference.read_ref()?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::WriteRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                let value = interpreter.operand_stack.pop()?;
+                gas_meter.charge_write_ref(&value, reference.value_view())?;
+                reference.write_ref(value)?;
+            }
+            Bytecode::CastU8 => {
+                gas_meter.charge_simple_instr(S::CastU8)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u8(integer_value.cast_u8()?))?;
+            }
+            Bytecode::CastU16 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u16(integer_value.cast_u16()?))?;
+            }
+            Bytecode::CastU32 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u32(integer_value.cast_u32()?))?;
+            }
+            Bytecode::CastU64 => {
+                gas_meter.charge_simple_instr(S::CastU64)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u64(integer_value.cast_u64()?))?;
+            }
+            Bytecode::CastU128 => {
+                gas_meter.charge_simple_instr(S::CastU128)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u128(integer_value.cast_u128()?))?;
+            }
+            Bytecode::CastU256 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u256(integer_value.cast_u256()?))?;
+            }
+            // Arithmetic Operations
+            Bytecode::Add => {
+                gas_meter.charge_simple_instr(S::Add)?;
+                interpreter.binop_int(IntegerValue::add_checked)?
+            }
+            Bytecode::Sub => {
+                gas_meter.charge_simple_instr(S::Sub)?;
+                interpreter.binop_int(IntegerValue::sub_checked)?
+            }
+            Bytecode::Mul => {
+                gas_meter.charge_simple_instr(S::Mul)?;
+                interpreter.binop_int(IntegerValue::mul_checked)?
+            }
+            Bytecode::Mod => {
+                gas_meter.charge_simple_instr(S::Mod)?;
+                interpreter.binop_int(IntegerValue::rem_checked)?
+            }
+            Bytecode::Div => {
+                gas_meter.charge_simple_instr(S::Div)?;
+                interpreter.binop_int(IntegerValue::div_checked)?
+            }
+            Bytecode::BitOr => {
+                gas_meter.charge_simple_instr(S::BitOr)?;
+                interpreter.binop_int(IntegerValue::bit_or)?
+            }
+            Bytecode::BitAnd => {
+                gas_meter.charge_simple_instr(S::BitAnd)?;
+                interpreter.binop_int(IntegerValue::bit_and)?
+            }
+            Bytecode::Xor => {
+                gas_meter.charge_simple_instr(S::Xor)?;
+                interpreter.binop_int(IntegerValue::bit_xor)?
+            }
+            Bytecode::Shl => {
+                gas_meter.charge_simple_instr(S::Shl)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shl_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Shr => {
+                gas_meter.charge_simple_instr(S::Shr)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shr_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Or => {
+                gas_meter.charge_simple_instr(S::Or)?;
+                interpreter.binop_bool(|l, r| Ok(l || r))?
+            }
+            Bytecode::And => {
+                gas_meter.charge_simple_instr(S::And)?;
+                interpreter.binop_bool(|l, r| Ok(l && r))?
+            }
+            Bytecode::Lt => {
+                gas_meter.charge_simple_instr(S::Lt)?;
+                interpreter.binop_bool(IntegerValue::lt)?
+            }
+            Bytecode::Gt => {
+                gas_meter.charge_simple_instr(S::Gt)?;
+                interpreter.binop_bool(IntegerValue::gt)?
+            }
+            Bytecode::Le => {
+                gas_meter.charge_simple_instr(S::Le)?;
+                interpreter.binop_bool(IntegerValue::le)?
+            }
+            Bytecode::Ge => {
+                gas_meter.charge_simple_instr(S::Ge)?;
+                interpreter.binop_bool(IntegerValue::ge)?
+            }
+            Bytecode::Abort => {
+                gas_meter.charge_simple_instr(S::Abort)?;
+                let error_code = interpreter.operand_stack.pop_as::<u64>()?;
+                let error = PartialVMError::new(StatusCode::ABORTED)
+                    .with_sub_status(error_code)
+                    .with_message(format!("{} at offset {}", function.pretty_string(), *pc,));
+                return Err(error);
+            }
+            Bytecode::Eq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_eq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(lhs.equals(&rhs)?))?;
+            }
+            Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_neq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(!lhs.equals(&rhs)?))?;
+            }
+            Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.borrow_global(
+                    is_mut,
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(si_idx) | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.borrow_global(
+                    is_mut,
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::Exists(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.exists(false, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::ExistsGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.exists(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveFrom(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.move_from(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MoveFromGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_from(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveTo(sd_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                // REVIEW: Can we simplify Interpreter::move_to?
+                interpreter.move_to(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::MoveToGeneric(si_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_to(
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::FreezeRef => {
+                gas_meter.charge_simple_instr(S::FreezeRef)?;
+                // FreezeRef should just be a null op as we don't distinguish between mut
+                // and immut ref at runtime.
+            }
+            Bytecode::Not => {
+                gas_meter.charge_simple_instr(S::Not)?;
+                let value = !interpreter.operand_stack.pop_as::<bool>()?;
+                interpreter.operand_stack.push(Value::bool(value))?;
+            }
+            Bytecode::Nop => {
+                gas_meter.charge_simple_instr(S::Nop)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_vec_pack(
+                    make_ty!(&ty),
+                    interpreter.operand_stack.last_n(*num as usize)?,
+                )?;
+                let elements = interpreter.operand_stack.popn(*num as u16)?;
+                let value = Vector::pack(&ty, elements)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecLen(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_len(TypeWithLoader {
+                    ty,
+                    loader: resolver.loader(),
+                })?;
+                let value = vec_ref.len(ty)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, &ty);
+                gas_meter.charge_vec_borrow(false, make_ty!(&ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, ty);
+                gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let elem = interpreter.operand_stack.pop()?;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
+                vec_ref.push_back(elem, ty, interpreter.runtime_limits_config().vector_len_max)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.pop(ty);
+                gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_unpack(
+                    make_ty!(ty),
+                    NumArgs::new(*num),
+                    vec_val.elem_views(),
+                )?;
+                let elements = vec_val.unpack(ty, *num)?;
+                for value in elements {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::VecSwap(si) => {
+                let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_swap(make_ty!(ty))?;
+                vec_ref.swap(idx1, idx2, ty)?;
+            }
+        }
+
+        Ok(InstrRet::Ok)
+    }
+    fn execute_code_impl(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> PartialVMResult<ExitCode> {
+        let code = self.function.code();
+        loop {
+            for instruction in &code[self.pc as usize..] {
+                trace!(
+                    &self.function,
+                    &self.locals,
+                    self.pc,
+                    instruction,
+                    resolver,
+                    interpreter
+                );
+
+                fail_point!("move_vm::interpreter_loop", |_| {
+                    Err(
+                        PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                            "Injected move_vm::interpreter verifier failure".to_owned(),
+                        ),
+                    )
+                });
+
+                // Paranoid Mode: Perform the type stack transition check to make sure all type safety requirements has been met.
+                //
+                // We will run the checks for only the control flow instructions and StLoc here. The majority of checks will be
+                // performed after the instruction execution, i.e: the big match block below.
+                //
+                // The reason for this design is we charge gas during instruction execution and we want to perform checks only after
+                // proper gas has been charged for each instruction.
+
+                if interpreter.paranoid_type_checks {
+                    interpreter.operand_stack.check_balance()?;
+                    Self::pre_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.locals,
+                        self.ty_args(),
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+                }
+
+                profile_open_instr!(gas_meter, format!("{:?}", instruction));
+                let r = Self::execute_instruction(
+                    &mut self.pc,
+                    &mut self.locals,
+                    &self.ty_args,
+                    &self.function,
+                    resolver,
+                    interpreter,
+                    data_store,
+                    gas_meter,
+                    instruction,
+                )?;
+                profile_close_instr!(gas_meter, format!("{:?}", instruction));
+
+                match r {
+                    InstrRet::Ok => (),
+                    InstrRet::ExitCode(exit_code) => {
+                        return Ok(exit_code);
+                    }
+                    InstrRet::Branch => break,
+                };
+
+                if interpreter.paranoid_type_checks {
+                    Self::post_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.ty_args,
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+
+                    interpreter.operand_stack.check_balance()?;
+                }
+
+                // invariant: advance to pc +1 is iff instruction at pc executed without aborting
+                self.pc += 1;
+            }
+            // ok we are out, it's a branch, check the pc for good luck
+            // TODO: re-work the logic here. Tests should have a more
+            // natural way to plug in
+            if self.pc as usize >= code.len() {
+                if cfg!(test) {
+                    // In order to test the behavior of an instruction stream, hitting end of the
+                    // code should report no error so that we can check the
+                    // locals.
+                    return Ok(ExitCode::Return);
+                } else {
+                    return Err(PartialVMError::new(StatusCode::PC_OVERFLOW));
+                }
+            }
+        }
+    }
+
+    fn ty_args(&self) -> &[Type] {
+        &self.ty_args
+    }
+
+    fn resolver<'a>(&self, link_context: AccountAddress, loader: &'a Loader) -> Resolver<'a> {
+        self.function.get_resolver(link_context, loader)
+    }
+
+    fn location(&self) -> Location {
+        match self.function.module_id() {
+            None => Location::Script,
+            Some(id) => Location::Module(id.clone()),
+        }
+    }
+
+    fn check_depth_of_type(resolver: &Resolver, ty: &Type) -> PartialVMResult<u64> {
+        let Some(max_depth) = resolver
+            .loader()
+            .vm_config()
+            .runtime_limits_config
+            .max_value_nest_depth
+        else {
+            return Ok(1);
+        };
+        Self::check_depth_of_type_impl(resolver, ty, 0, max_depth)
+    }
+
+    fn check_depth_of_type_impl(
+        resolver: &Resolver,
+        ty: &Type,
+        current_depth: u64,
+        max_depth: u64,
+    ) -> PartialVMResult<u64> {
+        macro_rules! check_depth {
+            ($additional_depth:expr) => {
+                if current_depth.saturating_add($additional_depth) > max_depth {
+                    return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+                } else {
+                    current_depth.saturating_add($additional_depth)
+                }
+            };
+        }
+
+        // Calculate depth of the type itself
+        let ty_depth = match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address
+            | Type::Signer => check_depth!(1),
+            // Even though this is recursive this is OK since the depth of this recursion is
+            // bounded by the depth of the type arguments, which we have already checked.
+            Type::Reference(ty) | Type::MutableReference(ty) | Type::Vector(ty) => {
+                Self::check_depth_of_type_impl(resolver, ty, check_depth!(1), max_depth)?
+            }
+            Type::Struct(si) => {
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&[])?)
+            }
+            Type::StructInstantiation(si, ty_args) => {
+                // Calculate depth of all type arguments, and make sure they themselves are not too deep.
+                let ty_arg_depths = ty_args
+                    .iter()
+                    .map(|ty| {
+                        // Ty args should be fully resolved and not need any type arguments
+                        Self::check_depth_of_type_impl(resolver, ty, check_depth!(0), max_depth)
+                    })
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&ty_arg_depths)?)
+            }
+            // NB: substitution must be performed before calling this function
+            Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Type parameter should be fully resolved".to_string()),
+                )
+            }
+        };
+
+        Ok(ty_depth)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/lib.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/lib.rs
new file mode 100644
index 000000000..207b76752
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/lib.rs
@@ -0,0 +1,30 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! The core Move VM logic.
+//!
+//! It is a design goal for the Move VM to be independent of the Diem blockchain, so that
+//! other blockchains can use it as well. The VM isn't there yet, but hopefully will be there
+//! soon.
+
+pub mod data_cache;
+mod interpreter;
+mod loader;
+pub mod logging;
+pub mod move_vm;
+pub mod native_extensions;
+pub mod native_functions;
+mod runtime;
+pub mod session;
+#[macro_use]
+mod tracing;
+
+// Only include debugging functionality in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+mod debug;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/loader.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/loader.rs
new file mode 100644
index 000000000..d92526ad1
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/loader.rs
@@ -0,0 +1,2856 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    logging::expect_no_verification_errors,
+    native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
+    session::LoadedFunctionInstantiation,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CompiledModule, CompiledScript, Constant, ConstantPoolIndex,
+        FieldHandleIndex, FieldInstantiationIndex, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+        TypeParameterIndex, Visibility,
+    },
+    IndexKind,
+};
+use move_bytecode_verifier::{self, cyclic_dependencies, dependencies};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    metadata::Metadata,
+    runtime_value as R,
+    annotated_value as A,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::{CachedStructIndex, DepthFormula, StructType, Type},
+};
+use parking_lot::RwLock;
+use sha3::{Digest, Sha3_256};
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    fmt::Debug,
+    hash::Hash,
+    sync::Arc,
+};
+use tracing::error;
+
+type ScriptHash = [u8; 32];
+
+// A simple cache that offers both a HashMap and a Vector lookup.
+// Values are forced into a `Arc` so they can be used from multiple thread.
+// Access to this cache is always under a `RwLock`.
+struct BinaryCache<K, V> {
+    id_map: HashMap<K, usize>,
+    binaries: Vec<Arc<V>>,
+}
+
+impl<K, V> BinaryCache<K, V>
+where
+    K: Eq + Hash,
+{
+    fn new() -> Self {
+        Self {
+            id_map: HashMap::new(),
+            binaries: vec![],
+        }
+    }
+
+    fn insert(&mut self, key: K, binary: V) -> PartialVMResult<&Arc<V>> {
+        let idx = self.binaries.len();
+        // Last write wins in the binary cache -- it's up to the callee to not make conflicting
+        // writes.
+        self.id_map.insert(key, idx);
+        self.binaries.push(Arc::new(binary));
+        Ok(&self.binaries[idx])
+    }
+
+    fn get_with_idx(&self, key: &K) -> Option<(usize, &Arc<V>)> {
+        let idx = self.id_map.get(key)?;
+        Some((*idx, self.binaries.get(*idx)?))
+    }
+
+    fn get(&self, key: &K) -> Option<&Arc<V>> {
+        Some(self.get_with_idx(key)?.1)
+    }
+
+    fn contains(&self, key: &K) -> bool {
+        self.id_map.contains_key(key)
+    }
+
+    fn len(&self) -> usize {
+        self.binaries.len()
+    }
+}
+
+// A script cache is a map from the hash value of a script and the `Script` itself.
+// Script are added in the cache once verified and so getting a script out the cache
+// does not require further verification (except for parameters and type parameters)
+struct ScriptCache {
+    scripts: BinaryCache<ScriptHash, LoadedScript>,
+}
+
+impl ScriptCache {
+    fn new() -> Self {
+        Self {
+            scripts: BinaryCache::new(),
+        }
+    }
+
+    fn get(&self, hash: &ScriptHash) -> Option<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        self.scripts.get(hash).map(|script| {
+            (
+                script.entry_point(),
+                script.parameter_tys.clone(),
+                script.return_tys.clone(),
+            )
+        })
+    }
+
+    fn insert(
+        &mut self,
+        hash: ScriptHash,
+        script: LoadedScript,
+    ) -> PartialVMResult<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        match self.get(&hash) {
+            Some(cached) => Ok(cached),
+            None => {
+                let script = self.scripts.insert(hash, script)?;
+                Ok((
+                    script.entry_point(),
+                    script.parameter_tys.clone(),
+                    script.return_tys.clone(),
+                ))
+            }
+        }
+    }
+}
+
+/// The ModuleCache holds all verified modules as well as loaded modules, structs, and functions.
+/// Structs and functions are pushed into a global structure, handles in compiled modules are
+/// replaced with indices into these global structures in loaded modules.  All access to the
+/// ModuleCache via the Loader is under an RWLock.
+pub struct ModuleCache {
+    /// Compiled modules go in this cache once they have been individually verified.
+    compiled_modules: BinaryCache<ModuleId, CompiledModule>,
+    /// Modules whose dependencies have been verified already (during publishing or loading).
+    verified_dependencies: BTreeSet<(AccountAddress, ModuleId)>,
+    /// Loaded modules go in this cache once their compiled modules have been link-checked, and
+    /// structs and functions have populated `structs` and `functions` below.
+    ///
+    /// The `AccountAddress` in the key is the "link context", and the `ModuleId` is the ID of the
+    /// module whose load was requested. A mapping `(ctx, id) => module` means that when `id` was
+    /// requested in context `ctx`, `module` was loaded.
+    loaded_modules: BinaryCache<(AccountAddress, ModuleId), LoadedModule>,
+
+    /// Global cache of loaded structs, shared among all modules.
+    structs: BinaryCache<(ModuleId, Identifier), StructType>,
+    /// Global list of loaded functions, shared among all modules.
+    functions: Vec<Arc<Function>>,
+}
+
+/// Tracks the current end point of the `ModuleCache`'s `struct`s and `function`s, so that we can
+/// roll-back to that point in case of error.
+struct CacheCursor {
+    last_struct: usize,
+    last_function: usize,
+}
+
+impl ModuleCache {
+    fn new() -> Self {
+        Self {
+            compiled_modules: BinaryCache::new(),
+            verified_dependencies: BTreeSet::new(),
+            loaded_modules: BinaryCache::new(),
+            structs: BinaryCache::new(),
+            functions: vec![],
+        }
+    }
+
+    //
+    // Common "get" operations
+    //
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn compiled_module_at(&self, id: &ModuleId) -> Option<Arc<CompiledModule>> {
+        self.compiled_modules.get(id).map(Arc::clone)
+    }
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn loaded_module_at(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> Option<Arc<LoadedModule>> {
+        self.loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .map(Arc::clone)
+    }
+
+    // Retrieve a function by index
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        Arc::clone(&self.functions[idx])
+    }
+
+    // Retrieve a struct by index
+    fn struct_at(&self, idx: CachedStructIndex) -> Arc<StructType> {
+        Arc::clone(&self.structs.binaries[idx.0])
+    }
+
+    //
+    // Insertion is under lock and it's a pretty heavy operation.
+    // The VM is pretty much stopped waiting for this to finish
+    //
+
+    fn insert(
+        &mut self,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> VMResult<Arc<LoadedModule>> {
+        let runtime_id = module.self_id();
+        if let Some(cached) = self.loaded_module_at(data_store.link_context(), &runtime_id) {
+            return Ok(cached);
+        }
+
+        // Make sure the modules of dependencies are in the cache.
+        for runtime_dep in module.immediate_dependencies() {
+            let storage_dep = data_store
+                .relocate(&runtime_dep)
+                .map_err(|e| e.finish(Location::Undefined))?;
+            let compiled_dep = self.compiled_module_at(&storage_dep).ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!(
+                        "Cannot load dependency {runtime_dep} of {storage_id} from {storage_dep}"
+                    ))
+                    .finish(Location::Undefined)
+            })?;
+
+            self.insert(natives, data_store, storage_dep, compiled_dep.as_ref())?;
+        }
+
+        let cursor = self.cursor();
+        match self.add_module(&cursor, natives, data_store, storage_id, module) {
+            Ok(module) => Ok(Arc::clone(module)),
+            Err(err) => {
+                // we need this operation to be transactional, if an error occurs we must
+                // leave a clean state
+                self.reset(cursor);
+                Err(err.finish(Location::Undefined))
+            }
+        }
+    }
+
+    fn add_module(
+        &mut self,
+        cursor: &CacheCursor,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> PartialVMResult<&Arc<LoadedModule>> {
+        let link_context = data_store.link_context();
+        let runtime_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        // Add new structs and collect their field signatures
+        let mut field_signatures = vec![];
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            let name = module.identifier_at(struct_handle.name);
+            let struct_key = (runtime_id.clone(), name.to_owned());
+
+            if self.structs.contains(&struct_key) {
+                continue;
+            }
+
+            let field_names = match &struct_def.field_information {
+                StructFieldInformation::Native => vec![],
+                StructFieldInformation::Declared(field_info) => field_info
+                    .iter()
+                    .map(|f| module.identifier_at(f.name).to_owned())
+                    .collect(),
+            };
+
+            let defining_id = data_store.defining_module(&runtime_id, name)?;
+
+            self.structs.insert(
+                struct_key,
+                StructType {
+                    fields: vec![],
+                    field_names,
+                    abilities: struct_handle.abilities,
+                    type_parameters: struct_handle.type_parameters.clone(),
+                    name: name.to_owned(),
+                    defining_id,
+                    runtime_id: runtime_id.clone(),
+                    struct_def: StructDefinitionIndex(idx as u16),
+                    depth: None,
+                },
+            )?;
+
+            let StructFieldInformation::Declared(fields) = &struct_def.field_information else {
+                unreachable!("native structs have been removed");
+            };
+
+            let signatures: Vec<_> = fields.iter().map(|f| &f.signature.0).collect();
+            field_signatures.push(signatures)
+        }
+
+        // Convert field signatures into types after adding all structs because field types might
+        // refer to structs in the same module.
+        let mut field_types = vec![];
+        for signature in field_signatures {
+            let tys: Vec<_> = signature
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<_>>()?;
+            field_types.push(tys);
+        }
+
+        let field_types_len = field_types.len();
+
+        // Add the field types to the newly added structs, processing them in reverse, to line them
+        // up with the structs we added at the end of the global cache.
+        for (fields, struct_type) in field_types
+            .into_iter()
+            .rev()
+            .zip(self.structs.binaries.iter_mut().rev())
+        {
+            match Arc::get_mut(struct_type) {
+                Some(struct_type) => struct_type.fields = fields,
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we just rewrite the entire `Arc`
+                    // over and log the issue.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                    let mut struct_copy = (**struct_type).clone();
+                    struct_copy.fields = fields;
+                    *struct_type = Arc::new(struct_copy);
+                }
+            }
+        }
+
+        let mut depth_cache = BTreeMap::new();
+        for struct_type in self.structs.binaries.iter().rev().take(field_types_len) {
+            self.calculate_depth_of_struct(&struct_type, &mut depth_cache)?;
+        }
+
+        debug_assert!(depth_cache.len() == field_types_len);
+        for (cache_idx, depth) in depth_cache {
+            match Arc::get_mut(self.structs.binaries.get_mut(cache_idx.0).unwrap()) {
+                Some(struct_type) => struct_type.depth = Some(depth),
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we log the issue and move on leaving the
+                    // structs depth as `None` -- if we try to access it later we will treat this
+                    // as too deep.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                }
+            }
+        }
+
+        for (idx, func) in module.function_defs().iter().enumerate() {
+            let findex = FunctionDefinitionIndex(idx as TableIndex);
+            let mut function = Function::new(natives, findex, func, module);
+            function.return_types = function
+                .return_
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            function.local_types = function
+                .locals
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            function.parameter_types = function
+                .parameters
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            self.functions.push(Arc::new(function));
+        }
+
+        let loaded_module = LoadedModule::new(cursor, link_context, storage_id, module, self)?;
+        self.loaded_modules
+            .insert((link_context, runtime_id), loaded_module)
+    }
+
+    // `make_type` is the entry point to "translate" a `SignatureToken` to a `Type`
+    fn make_type(&self, module: BinaryIndexedView, tok: &SignatureToken) -> PartialVMResult<Type> {
+        let res = match tok {
+            SignatureToken::Bool => Type::Bool,
+            SignatureToken::U8 => Type::U8,
+            SignatureToken::U16 => Type::U16,
+            SignatureToken::U32 => Type::U32,
+            SignatureToken::U64 => Type::U64,
+            SignatureToken::U128 => Type::U128,
+            SignatureToken::U256 => Type::U256,
+            SignatureToken::Address => Type::Address,
+            SignatureToken::Signer => Type::Signer,
+            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx),
+            SignatureToken::Vector(inner_tok) => {
+                Type::Vector(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Reference(inner_tok) => {
+                Type::Reference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::MutableReference(inner_tok) => {
+                Type::MutableReference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Struct(sh_idx) => {
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::Struct(def_idx)
+            }
+            SignatureToken::StructInstantiation(sh_idx, tys) => {
+                let type_parameters: Vec<_> = tys
+                    .iter()
+                    .map(|tok| self.make_type(module, tok))
+                    .collect::<PartialVMResult<_>>()?;
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::StructInstantiation(def_idx, type_parameters)
+            }
+        };
+        Ok(res)
+    }
+
+    fn calculate_depth_of_struct(
+        &self,
+        struct_type: &StructType,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let def_idx = self
+            .resolve_struct_by_name(&struct_type.name, &struct_type.runtime_id)?
+            .0;
+
+        // If we've already computed this structs depth, no more work remains to be done.
+        if let Some(form) = &struct_type.depth {
+            return Ok(form.clone());
+        }
+        if let Some(form) = depth_cache.get(&def_idx) {
+            return Ok(form.clone());
+        }
+
+        let formulas = struct_type
+            .fields
+            .iter()
+            .map(|field_type| self.calculate_depth_of_type(field_type, depth_cache))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let mut formula = DepthFormula::normalize(formulas);
+        // add 1 for the struct itself
+        formula.add(1);
+        let prev = depth_cache.insert(def_idx, formula.clone());
+        if prev.is_some() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Recursive type?".to_owned()),
+            );
+        }
+        Ok(formula)
+    }
+
+    fn calculate_depth_of_type(
+        &self,
+        ty: &Type,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        Ok(match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U64
+            | Type::U128
+            | Type::Address
+            | Type::Signer
+            | Type::U16
+            | Type::U32
+            | Type::U256 => DepthFormula::constant(1),
+            // we should not see the reference here, we could instead give an invariant violation
+            Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                let mut inner = self.calculate_depth_of_type(ty, depth_cache)?;
+                // add 1 for the vector itself
+                inner.add(1);
+                inner
+            }
+            Type::TyParam(ty_idx) => DepthFormula::type_parameter(*ty_idx),
+            Type::Struct(cache_idx) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+                debug_assert!(struct_formula.terms.is_empty());
+                struct_formula
+            }
+            Type::StructInstantiation(cache_idx, ty_args) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let ty_arg_map = ty_args
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, ty)| {
+                        let var = idx as TypeParameterIndex;
+                        Ok((var, self.calculate_depth_of_type(ty, depth_cache)?))
+                    })
+                    .collect::<PartialVMResult<BTreeMap<_, _>>>()?;
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+                let subst_struct_formula = struct_formula.subst(ty_arg_map)?;
+                subst_struct_formula
+            }
+        })
+    }
+
+    // Given a ModuleId::struct_name, retrieve the `StructType` and the index associated.
+    // Return and error if the type has not been loaded
+    fn resolve_struct_by_name(
+        &self,
+        struct_name: &IdentStr,
+        runtime_id: &ModuleId,
+    ) -> PartialVMResult<(CachedStructIndex, Arc<StructType>)> {
+        match self
+            .structs
+            .get_with_idx(&(runtime_id.clone(), struct_name.to_owned()))
+        {
+            Some((idx, struct_)) => Ok((CachedStructIndex(idx), Arc::clone(struct_))),
+            None => Err(PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE)
+                .with_message(format!("Cannot find {runtime_id}::{struct_name} in cache",))),
+        }
+    }
+
+    // Given a ModuleId::func_name, retrieve the `Function` and the index associated.
+    // Return and error if the function has not been loaded
+    fn resolve_function_by_name(
+        &self,
+        func_name: &IdentStr,
+        runtime_id: &ModuleId,
+        link_context: AccountAddress,
+    ) -> PartialVMResult<usize> {
+        match self
+            .loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .and_then(|module| module.function_map.get(func_name))
+        {
+            Some(func_idx) => Ok(*func_idx),
+            None => Err(
+                PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find {:?}::{:?} in cache for context {:?}",
+                    runtime_id, func_name, link_context,
+                )),
+            ),
+        }
+    }
+
+    /// Return the current high watermark of structs and functions in the cache.
+    fn cursor(&self) -> CacheCursor {
+        CacheCursor {
+            last_struct: self.structs.len(),
+            last_function: self.functions.len(),
+        }
+    }
+
+    /// Rollback the cache's structs and functions to the point at which the cache cursor was
+    /// created.
+    fn reset(
+        &mut self,
+        CacheCursor {
+            last_struct,
+            last_function,
+        }: CacheCursor,
+    ) {
+        // Remove entries from `structs.id_map` corresponding to the newly added structs.
+        for (idx, struct_) in self.structs.binaries.iter().enumerate().rev() {
+            if idx < last_struct {
+                break;
+            }
+
+            let key = (struct_.runtime_id.clone(), struct_.name.clone());
+            match self.structs.id_map.remove(&key) {
+                Some(jdx) if jdx == idx => {
+                    continue;
+                }
+                Some(jdx) => unreachable!(
+                    "Expected to find {}::{} at index {idx} but found at {jdx}.",
+                    struct_.defining_id, struct_.name,
+                ),
+                None => unreachable!(
+                    "Expected to find {}::{} at index {idx} but not found.",
+                    struct_.defining_id, struct_.name,
+                ),
+            }
+        }
+
+        self.structs.binaries.truncate(last_struct);
+        self.functions.truncate(last_function);
+    }
+}
+
+//
+// Loader
+//
+
+// A Loader is responsible to load scripts and modules and holds the cache of all loaded
+// entities. Each cache is protected by a `RwLock`. Operation in the Loader must be thread safe
+// (operating on values on the stack) and when cache needs updating the mutex must be taken.
+// The `pub(crate)` API is what a Loader offers to the runtime.
+pub(crate) struct Loader {
+    scripts: RwLock<ScriptCache>,
+    module_cache: RwLock<ModuleCache>,
+    type_cache: RwLock<TypeCache>,
+    natives: NativeFunctions,
+    vm_config: VMConfig,
+}
+
+impl Loader {
+    pub(crate) fn new(natives: NativeFunctions, vm_config: VMConfig) -> Self {
+        Self {
+            scripts: RwLock::new(ScriptCache::new()),
+            module_cache: RwLock::new(ModuleCache::new()),
+            type_cache: RwLock::new(TypeCache::new()),
+            natives,
+            vm_config,
+        }
+    }
+
+    pub(crate) fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    /// Copies metadata out of a modules bytecode if available.
+    pub(crate) fn get_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        let cache = self.module_cache.read();
+        cache
+            .compiled_modules
+            .get(&module)
+            .and_then(|module| module.metadata.iter().find(|md| md.key == key))
+            .cloned()
+    }
+
+    //
+    // Script verification and loading
+    //
+
+    // Scripts are verified and dependencies are loaded.
+    // Effectively that means modules are cached from leaf to root in the dependency DAG.
+    // If a dependency error is found, loading stops and the error is returned.
+    // However all modules cached up to that point stay loaded.
+
+    // Entry point for script execution (`MoveVM::execute_script`).
+    // Verifies the script if it is not in the cache of scripts loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_script(
+        &self,
+        script_blob: &[u8],
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<Function>, LoadedFunctionInstantiation)> {
+        // retrieve or load the script
+        let mut sha3_256 = Sha3_256::new();
+        sha3_256.update(script_blob);
+        let hash_value: [u8; 32] = sha3_256.finalize().into();
+
+        let link_context = data_store.link_context();
+        let mut scripts = self.scripts.write();
+        let (main, parameters, return_) = match scripts.get(&hash_value) {
+            Some(cached) => cached,
+            None => {
+                let ver_script = self.deserialize_and_verify_script(script_blob, data_store)?;
+                let script = LoadedScript::new(
+                    ver_script,
+                    link_context,
+                    &hash_value,
+                    &self.module_cache.read(),
+                )?;
+                scripts
+                    .insert(hash_value, script)
+                    .map_err(|e| e.finish(Location::Script))?
+            }
+        };
+
+        // verify type arguments
+        self.verify_ty_args(main.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Script))?;
+        let instantiation = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((main, instantiation))
+    }
+
+    // The process of deserialization and verification is not and it must not be under lock.
+    // So when publishing modules through the dependency DAG it may happen that a different
+    // thread had loaded the module after this process fetched it from storage.
+    // Caching will take care of that by asking for each dependency module again under lock.
+    fn deserialize_and_verify_script(
+        &self,
+        script: &[u8],
+        data_store: &impl DataStore,
+    ) -> VMResult<CompiledScript> {
+        let script = match CompiledScript::deserialize_with_max_version(
+            script,
+            self.vm_config.max_binary_format_version,
+        ) {
+            Ok(script) => script,
+            Err(err) => {
+                error!("[VM] deserializer for script returned error: {:?}", err,);
+                let msg = format!("Deserialization error: {:?}", err);
+                return Err(PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                    .with_message(msg)
+                    .finish(Location::Script));
+            }
+        };
+
+        match self.verify_script(&script) {
+            Ok(_) => {
+                // verify and load dependencies, fetching the verified compiled module.
+                let deps: VMResult<Vec<_>> = script
+                    .immediate_dependencies()
+                    .into_iter()
+                    .map(|dep| Ok(self.load_module(&dep, data_store)?.0))
+                    .collect();
+
+                // verify script linkage
+                dependencies::verify_script(&script, deps?.iter().map(Arc::as_ref))?;
+
+                Ok(script)
+            }
+            Err(err) => {
+                error!(
+                    "[VM] bytecode verifier returned errors for script: {:?}",
+                    err
+                );
+                Err(err)
+            }
+        }
+    }
+
+    // Script verification steps.
+    // See `verify_module()` for module verification steps.
+    fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
+        move_bytecode_verifier::verify_script_with_config_unmetered(
+            &self.vm_config.verifier,
+            script,
+        )
+    }
+
+    //
+    // Module verification and loading
+    //
+
+    // Entry point for function execution (`MoveVM::execute_function`).
+    // Loading verifies the module if it was never loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_function(
+        &self,
+        runtime_id: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(
+        Arc<CompiledModule>,
+        Arc<LoadedModule>,
+        Arc<Function>,
+        LoadedFunctionInstantiation,
+    )> {
+        let link_context = data_store.link_context();
+        let (compiled, loaded) = self.load_module(runtime_id, data_store)?;
+        let compiled_view = BinaryIndexedView::Module(compiled.as_ref());
+        let idx = self
+            .module_cache
+            .read()
+            .resolve_function_by_name(function_name, runtime_id, link_context)
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let func = self.module_cache.read().function_at(idx);
+
+        let parameters = func
+            .parameters
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_ = func
+            .return_
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        // verify type arguments
+        self.verify_ty_args(func.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Module(runtime_id.clone())))?;
+
+        let inst = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((compiled, loaded, func, inst))
+    }
+
+    // Entry point for module publishing (`MoveVM::publish_module_bundle`).
+    //
+    // All modules in the bundle to be published must be loadable. This function performs all
+    // verification steps to load these modules without actually loading them into the code cache.
+    pub(crate) fn verify_module_bundle_for_publication(
+        &self,
+        modules: &[CompiledModule],
+        data_store: &mut impl DataStore,
+    ) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-1", |_| { Ok(()) });
+
+        let mut bundle_verified = BTreeMap::new();
+        for module in modules {
+            let module_id = module.self_id();
+
+            self.verify_module_for_publication(module, &bundle_verified, data_store)?;
+            bundle_verified.insert(module_id.clone(), module.clone());
+        }
+        Ok(())
+    }
+
+    // A module to be published must be loadable.
+    //
+    // This step performs all verification steps to load the module without loading it.
+    // The module is not added to the code cache. It is simply published to the data cache.
+    // See `verify_script()` for script verification steps.
+    //
+    // If a module `M` is published together with a bundle of modules (i.e., a vector of modules),
+    // the `bundle_verified` argument tracks the modules that have already been verified in the
+    // bundle. Basically, this represents the modules appears before `M` in the bundle vector.
+    fn verify_module_for_publication(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        // Performs all verification steps to load the module without loading it, i.e., the new
+        // module will NOT show up in `module_cache`.
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            module,
+        )?;
+        self.check_natives(module)?;
+
+        let mut visiting = BTreeSet::new();
+        visiting.insert(module.self_id());
+
+        // downward exploration of the module's dependency graph. Since we know nothing about this
+        // target module, we don't know what the module may specify as its dependencies and hence,
+        // we allow the loading of dependencies and the subsequent linking to fail.
+        self.verify_dependencies(
+            module,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            /* allow_dependency_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // make sure there is no cyclic dependency
+        self.verify_module_cyclic_relations(module, bundle_verified, data_store)
+    }
+
+    fn verify_module_cyclic_relations(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        let module_cache = self.module_cache.read();
+        cyclic_dependencies::verify_module(module, |runtime_id| {
+            let module = if let Some(bundled) = bundle_verified.get(runtime_id) {
+                Some(bundled)
+            } else {
+                let storage_id = data_store.relocate(runtime_id)?;
+                module_cache
+                    .compiled_modules
+                    .get(&storage_id)
+                    .map(Arc::as_ref)
+            };
+
+            module
+                .map(|m| m.immediate_dependencies())
+                .ok_or_else(|| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+        })
+    }
+
+    // All native functions must be known to the loader, unless we are compiling with feature
+    // `lazy_natives`.
+    fn check_natives(&self, module: &CompiledModule) -> VMResult<()> {
+        fn check_natives_impl(loader: &Loader, module: &CompiledModule) -> PartialVMResult<()> {
+            if !cfg!(feature = "lazy_natives") {
+                for (idx, native_function) in module
+                    .function_defs()
+                    .iter()
+                    .filter(|fdv| fdv.is_native())
+                    .enumerate()
+                {
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    loader
+                        .natives
+                        .resolve(
+                            module.address_identifier_at(mh.address),
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str(),
+                        )
+                        .ok_or_else(|| {
+                            verification_error(
+                                StatusCode::MISSING_DEPENDENCY,
+                                IndexKind::FunctionHandle,
+                                idx as TableIndex,
+                            )
+                        })?;
+                }
+            }
+            // TODO: fix check and error code if we leave something around for native structs.
+            // For now this generates the only error test cases care about...
+            for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+                if struct_def.field_information == StructFieldInformation::Native {
+                    return Err(verification_error(
+                        StatusCode::MISSING_DEPENDENCY,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            Ok(())
+        }
+        check_natives_impl(self, module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    //
+    // Helpers for loading and verification
+    //
+
+    pub(crate) fn load_struct_by_name(
+        &self,
+        name: &IdentStr,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.load_module(runtime_id, data_store)?;
+        self.module_cache
+            .read()
+            // Should work if the type exists, because module was loaded above.
+            .resolve_struct_by_name(name, runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn load_type(
+        &self,
+        type_tag: &TypeTag,
+        data_store: &impl DataStore,
+    ) -> VMResult<Type> {
+        Ok(match type_tag {
+            TypeTag::Bool => Type::Bool,
+            TypeTag::U8 => Type::U8,
+            TypeTag::U16 => Type::U16,
+            TypeTag::U32 => Type::U32,
+            TypeTag::U64 => Type::U64,
+            TypeTag::U128 => Type::U128,
+            TypeTag::U256 => Type::U256,
+            TypeTag::Address => Type::Address,
+            TypeTag::Signer => Type::Signer,
+            TypeTag::Vector(tt) => Type::Vector(Box::new(self.load_type(tt, data_store)?)),
+            TypeTag::Struct(struct_tag) => {
+                let runtime_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
+                let (idx, struct_type) =
+                    self.load_struct_by_name(&struct_tag.name, &runtime_id, data_store)?;
+                if struct_type.type_parameters.is_empty() && struct_tag.type_params.is_empty() {
+                    Type::Struct(idx)
+                } else {
+                    let mut type_params = vec![];
+                    for ty_param in &struct_tag.type_params {
+                        type_params.push(self.load_type(ty_param, data_store)?);
+                    }
+                    self.verify_ty_args(struct_type.type_param_constraints(), &type_params)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    Type::StructInstantiation(idx, type_params)
+                }
+            }
+        })
+    }
+
+    // The interface for module loading. Aligned with `load_type` and `load_function`, this function
+    // verifies that the module is OK instead of expect it.
+    pub(crate) fn load_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        self.load_module_internal(runtime_id, &BTreeMap::new(), data_store)
+    }
+
+    // Load the transitive closure of the target module first, and then verify that the modules in
+    // the closure do not have cyclic dependencies.
+    fn load_module_internal(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        let link_context = data_store.link_context();
+
+        {
+            let locked_cache = self.module_cache.read();
+            if let Some(loaded) = locked_cache.loaded_module_at(link_context, runtime_id) {
+                let Some(compiled) = locked_cache.compiled_module_at(&loaded.id) else {
+                    unreachable!(
+                        "Loaded module without verified compiled module.\n\
+                         Context:    {link_context}\n\
+                         Runtime ID: {runtime_id}\n\
+                         Loaded module: {loaded:#?}"
+                    );
+                };
+
+                return Ok((compiled, loaded));
+            }
+        }
+
+        // otherwise, load the transitive closure of the target module
+        let mut visiting = BTreeSet::new();
+        let allow_module_loading_failure = true;
+        let dependencies_depth = 0;
+        let (storage_id, compiled) = self.verify_module_and_dependencies(
+            runtime_id,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            allow_module_loading_failure,
+            dependencies_depth,
+        )?;
+
+        // verify that the transitive closure does not have cycles
+        self.verify_module_cyclic_relations(compiled.as_ref(), bundle_verified, data_store)
+            .map_err(expect_no_verification_errors)?;
+
+        // load the compiled module
+        let loaded = self.module_cache.write().insert(
+            &self.natives,
+            data_store,
+            storage_id,
+            compiled.as_ref(),
+        )?;
+
+        Ok((compiled, loaded))
+    }
+
+    /// Read the module that will be referred to at runtime as `runtime_id`, but is found in the
+    /// store at `storage_id`.  Verify it without linking or interacting with caches, and return
+    /// the deserialized module on success.
+    fn read_module_from_store(
+        &self,
+        runtime_id: &ModuleId,
+        storage_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<CompiledModule> {
+        // bytes fetching, allow loading to fail if the flag is set
+        let bytes = match data_store.load_module(storage_id) {
+            Ok(bytes) => bytes,
+            Err(err) if allow_loading_failure => return Err(err),
+            Err(err) => {
+                error!(
+                    "[VM] Error fetching module with id {runtime_id:?} from storage at \
+                     {storage_id:?}",
+                );
+                return Err(expect_no_verification_errors(err));
+            }
+        };
+
+        // for bytes obtained from the data store, they should always deserialize and verify.
+        // It is an invariant violation if they don't.
+        let module = CompiledModule::deserialize_with_config(
+            &bytes,
+            self.vm_config.max_binary_format_version,
+            self.vm_config()
+                .check_no_extraneous_bytes_during_deserialization,
+        )
+        .map_err(|err| {
+            let msg = format!("Deserialization error: {:?}", err);
+            PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                .with_message(msg)
+                .finish(Location::Module(storage_id.clone()))
+        })
+        .map_err(expect_no_verification_errors)?;
+
+        fail::fail_point!("verifier-failpoint-2", |_| { Ok(module.clone()) });
+
+        if self.vm_config.paranoid_type_checks && &module.self_id() != runtime_id {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Module self id mismatch with storage".to_string())
+                    .finish(Location::Module(runtime_id.clone())),
+            );
+        }
+
+        // bytecode verifier checks that can be performed with the module itself
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            &module,
+        )
+        .map_err(expect_no_verification_errors)?;
+        self.check_natives(&module)
+            .map_err(expect_no_verification_errors)?;
+
+        Ok(module)
+    }
+
+    /// Deserialize and check the module with the bytecode verifier, without linking.  Cache the
+    /// `CompiledModule` on success, and return a reference to it.
+    fn verify_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        let storage_id = data_store
+            .relocate(runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        if let Some(cached) = self.module_cache.read().compiled_module_at(&storage_id) {
+            return Ok((storage_id, cached));
+        }
+
+        let module = self.read_module_from_store(
+            runtime_id,
+            &storage_id,
+            data_store,
+            allow_loading_failure,
+        )?;
+
+        let cached = self
+            .module_cache
+            .write()
+            .compiled_modules
+            .insert(storage_id.clone(), module)
+            .map_err(|e| e.finish(Location::Module(storage_id.clone())))?
+            .clone();
+
+        Ok((storage_id, cached))
+    }
+
+    /// Recursively read the module at ID and its transitive dependencies, verify them individually
+    /// and verify that they link together.  Returns the `CompiledModule` for `runtime_id`, written
+    /// to the module cache, on success, as well as the `ModuleId` it was read from, in storage.
+    fn verify_module_and_dependencies(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_module_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        // dependency loading does not permit cycles
+        if !visiting.insert(runtime_id.clone()) {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY)
+                .finish(Location::Undefined));
+        }
+
+        // module self-check
+        let (storage_id, module) =
+            self.verify_module(runtime_id, data_store, allow_module_loading_failure)?;
+
+        // If this module is already in the "verified dependencies" cache, then no need to check it
+        // again -- it has already been verified against its dependencies in this link context.
+        let cache_key = (data_store.link_context(), runtime_id.clone());
+        if !self
+            .module_cache
+            .read()
+            .verified_dependencies
+            .contains(&cache_key)
+        {
+            // downward exploration of the module's dependency graph. For a module that is loaded from
+            // the data_store, we should never allow its dependencies to fail to load.
+            let allow_dependency_loading_failure = false;
+            self.verify_dependencies(
+                module.as_ref(),
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth,
+            )?;
+
+            self.module_cache
+                .write()
+                .verified_dependencies
+                .insert(cache_key);
+        }
+
+        visiting.remove(runtime_id);
+        Ok((storage_id, module))
+    }
+
+    // downward exploration of the module's dependency graph
+    fn verify_dependencies(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_dependency_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+
+        // all immediate dependencies of the module being verified should be in one of the locations
+        // - the verified portion of the bundle (e.g., verified before this module)
+        // - the compiled module cache (i.e., module has been self-checked but not link checked)
+        // - the data store (i.e., not self-checked yet)
+        let mut bundle_deps = vec![];
+        let mut cached_deps = vec![];
+        for runtime_dep in module.immediate_dependencies() {
+            if let Some(cached) = bundle_verified.get(&runtime_dep) {
+                bundle_deps.push(cached);
+                continue;
+            }
+
+            let (_, loaded) = self.verify_module_and_dependencies(
+                &runtime_dep,
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth + 1,
+            )?;
+
+            cached_deps.push(loaded);
+        }
+
+        fail::fail_point!("verifier-failpoint-4", |_| { Ok(()) });
+
+        // once all dependencies are loaded, do the linking check
+        let deps = bundle_deps
+            .into_iter()
+            .chain(cached_deps.iter().map(Arc::as_ref));
+        let result = dependencies::verify_module(module, deps);
+
+        // if dependencies loading is not allowed to fail, the linking should not fail as well
+        if allow_dependency_loading_failure {
+            result
+        } else {
+            result.map_err(expect_no_verification_errors)
+        }?;
+
+        Ok(())
+    }
+
+    // Return an instantiated type given a generic and an instantiation.
+    // Stopgap to avoid a recursion that is either taking too long or using too
+    // much memory
+    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        if let Type::StructInstantiation(_, struct_inst) = ty {
+            let mut sum_nodes = 1u64;
+            for ty in ty_args.iter().chain(struct_inst.iter()) {
+                sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
+                if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                }
+            }
+        }
+        ty.subst(ty_args)
+    }
+
+    // Verify the kind (constraints) of an instantiation.
+    // Both function and script invocation use this function to verify correctness
+    // of type arguments provided
+    fn verify_ty_args<'a, I>(&self, constraints: I, ty_args: &[Type]) -> PartialVMResult<()>
+    where
+        I: IntoIterator<Item = &'a AbilitySet>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let constraints = constraints.into_iter();
+        if constraints.len() != ty_args.len() {
+            return Err(PartialVMError::new(
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+            ));
+        }
+        for (ty, expected_k) in ty_args.iter().zip(constraints) {
+            if !expected_k.is_subset(self.abilities(ty)?) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Internal helpers
+    //
+
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        self.module_cache.read().function_at(idx)
+    }
+
+    fn get_module(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> (Arc<CompiledModule>, Arc<LoadedModule>) {
+        let locked_cache = self.module_cache.read();
+        let loaded = locked_cache
+            .loaded_module_at(link_context, runtime_id)
+            .expect("ModuleId on Function must exist");
+        let compiled = locked_cache
+            .compiled_module_at(&loaded.id)
+            .expect("ModuleId on Function must exist");
+        (compiled, loaded)
+    }
+
+    fn get_script(&self, hash: &ScriptHash) -> Arc<LoadedScript> {
+        Arc::clone(
+            self.scripts
+                .read()
+                .scripts
+                .get(hash)
+                .expect("Script hash on Function must exist"),
+        )
+    }
+
+    pub(crate) fn get_struct_type(&self, idx: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.module_cache
+            .read()
+            .structs
+            .binaries
+            .get(idx.0)
+            .map(Arc::clone)
+    }
+
+    pub(crate) fn abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
+        match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address => Ok(AbilitySet::PRIMITIVES),
+
+            // Technically unreachable but, no point in erroring if we don't have to
+            Type::Reference(_) | Type::MutableReference(_) => Ok(AbilitySet::REFERENCES),
+            Type::Signer => Ok(AbilitySet::SIGNER),
+
+            Type::TyParam(_) => Err(PartialVMError::new(StatusCode::UNREACHABLE).with_message(
+                "Unexpected TyParam type after translating from TypeTag to Type".to_string(),
+            )),
+
+            Type::Vector(ty) => AbilitySet::polymorphic_abilities(
+                AbilitySet::VECTOR,
+                vec![false],
+                vec![self.abilities(ty)?],
+            ),
+            Type::Struct(idx) => Ok(self.module_cache.read().struct_at(*idx).abilities),
+            Type::StructInstantiation(idx, type_args) => {
+                let struct_type = self.module_cache.read().struct_at(*idx);
+                let declared_phantom_parameters = struct_type
+                    .type_parameters
+                    .iter()
+                    .map(|param| param.is_phantom);
+                let type_argument_abilities = type_args
+                    .iter()
+                    .map(|arg| self.abilities(arg))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                AbilitySet::polymorphic_abilities(
+                    struct_type.abilities,
+                    declared_phantom_parameters,
+                    type_argument_abilities,
+                )
+            }
+        }
+    }
+}
+
+//
+// Resolver
+//
+
+// A simple wrapper for a `Module` or a `Script` in the `Resolver`
+enum BinaryType {
+    Module {
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    },
+    Script(Arc<LoadedScript>),
+}
+
+// A Resolver is a simple and small structure allocated on the stack and used by the
+// interpreter. It's the only API known to the interpreter and it's tailored to the interpreter
+// needs.
+pub(crate) struct Resolver<'a> {
+    loader: &'a Loader,
+    binary: BinaryType,
+}
+
+impl<'a> Resolver<'a> {
+    fn for_module(
+        loader: &'a Loader,
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    ) -> Self {
+        let binary = BinaryType::Module { compiled, loaded };
+        Self { loader, binary }
+    }
+
+    fn for_script(loader: &'a Loader, script: Arc<LoadedScript>) -> Self {
+        let binary = BinaryType::Script(script);
+        Self { loader, binary }
+    }
+
+    //
+    // Constant resolution
+    //
+
+    pub(crate) fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        match &self.binary {
+            BinaryType::Module { compiled, .. } => compiled.constant_at(idx),
+            BinaryType::Script(script) => script.script.constant_at(idx),
+        }
+    }
+
+    //
+    // Function resolution
+    //
+
+    pub(crate) fn function_from_handle(&self, idx: FunctionHandleIndex) -> Arc<Function> {
+        let idx = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_at(idx.0),
+            BinaryType::Script(script) => script.function_at(idx.0),
+        };
+        self.loader.function_at(idx)
+    }
+
+    pub(crate) fn function_from_instantiation(
+        &self,
+        idx: FunctionInstantiationIndex,
+    ) -> Arc<Function> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        self.loader.function_at(func_inst.handle)
+    }
+
+    pub(crate) fn instantiate_generic_function(
+        &self,
+        idx: FunctionInstantiationIndex,
+        type_params: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        let mut instantiation = vec![];
+        for ty in &func_inst.instantiation {
+            instantiation.push(self.subst(ty, type_params)?);
+        }
+        // Check if the function instantiation over all generics is larger
+        // than MAX_TYPE_INSTANTIATION_NODES.
+        let mut sum_nodes = 1u64;
+        for ty in type_params.iter().chain(instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(instantiation)
+    }
+
+    #[allow(unused)]
+    pub(crate) fn type_params_count(&self, idx: FunctionInstantiationIndex) -> usize {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        func_inst.instantiation.len()
+    }
+
+    //
+    // Type resolution
+    //
+
+    pub(crate) fn get_struct_type(&self, idx: StructDefinitionIndex) -> Type {
+        let struct_def = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Type::Struct(struct_def)
+    }
+
+    pub(crate) fn instantiate_generic_type(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and larger types via struct instantiation.
+        let mut sum_nodes = 1u64;
+        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+
+        Ok(Type::StructInstantiation(
+            struct_inst.def,
+            struct_inst
+                .instantiation
+                .iter()
+                .map(|ty| self.subst(ty, ty_args))
+                .collect::<PartialVMResult<_>>()?,
+        ))
+    }
+
+    pub(crate) fn get_field_type(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+        let handle = match &self.binary {
+            BinaryType::Module { loaded, .. } => &loaded.field_handles[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Ok(self
+            .loader
+            .get_struct_type(handle.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?
+            .fields[handle.offset]
+            .clone())
+    }
+
+    pub(crate) fn instantiate_generic_field(
+        &self,
+        idx: FieldInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let field_instantiation = match &self.binary {
+            BinaryType::Module { loaded, .. } => &loaded.field_instantiations[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(field_instantiation.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = field_instantiation
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type.fields[field_instantiation.offset].subst(&instantiation_types)
+    }
+
+    pub(crate) fn get_struct_fields(
+        &self,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<Arc<StructType>> {
+        let idx = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        self.loader.get_struct_type(idx).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Struct Definition not resolved".to_string())
+        })
+    }
+
+    pub(crate) fn instantiate_generic_struct_fields(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(struct_inst.def)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = struct_inst
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type
+            .fields
+            .iter()
+            .map(|ty| ty.subst(&instantiation_types))
+            .collect::<PartialVMResult<Vec<_>>>()
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.single_type_at(idx),
+            BinaryType::Script(script) => script.single_type_at(idx),
+        }
+    }
+
+    pub(crate) fn instantiate_single_type(
+        &self,
+        idx: SignatureIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let ty = self.single_type_at(idx);
+        if !ty_args.is_empty() {
+            self.subst(ty, ty_args)
+        } else {
+            Ok(ty.clone())
+        }
+    }
+
+    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.loader.subst(ty, ty_args)
+    }
+
+    //
+    // Fields resolution
+    //
+
+    pub(crate) fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_count(&self, idx: StructDefinitionIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_count(&self, idx: StructDefInstantiationIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> Type {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => {
+                Type::Struct(loaded.field_handles[idx.0 as usize].owner)
+            }
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_to_struct(
+        &self,
+        idx: FieldInstantiationIndex,
+        args: &[Type],
+    ) -> PartialVMResult<Type> {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => Ok(Type::StructInstantiation(
+                loaded.field_instantiations[idx.0 as usize].owner,
+                loaded.field_instantiations[idx.0 as usize]
+                    .instantiation
+                    .iter()
+                    .map(|ty| ty.subst(args))
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            )),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        self.loader.type_to_type_layout(ty)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        self.loader.type_to_fully_annotated_layout(ty)
+    }
+
+    // get the loader
+    pub(crate) fn loader(&self) -> &Loader {
+        self.loader
+    }
+}
+
+// A LoadedModule is very similar to a CompiledModule but data is "transformed" to a representation
+// more appropriate to execution.
+// When code executes indexes in instructions are resolved against those runtime structure
+// so that any data needed for execution is immediately available
+#[derive(Debug)]
+pub(crate) struct LoadedModule {
+    #[allow(dead_code)]
+    id: ModuleId,
+
+    //
+    // types as indexes into the Loader type list
+    //
+
+    // struct references carry the index into the global vector of types.
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of types. No instantiation of generic types is saved into the global table.
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+    structs: Vec<StructDef>,
+    // materialized instantiations, whether partial or not
+    struct_instantiations: Vec<StructInstantiation>,
+
+    // functions as indexes into the Loader function list
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of functions. No instantiation of generic functions is saved into
+    // the global table.
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // fields as a pair of index, first to the type, second to the field position in that type
+    field_handles: Vec<FieldHandle>,
+    // materialized instantiations, whether partial or not
+    field_instantiations: Vec<FieldInstantiation>,
+
+    // function name to index into the Loader function list.
+    // This allows a direct access from function name to `Function`
+    function_map: HashMap<Identifier, usize>,
+
+    // a map of single-token signature indices to type.
+    // Single-token signatures are usually indexed by the `SignatureIndex` in bytecode. For example,
+    // `VecMutBorrow(SignatureIndex)`, the `SignatureIndex` maps to a single `SignatureToken`, and
+    // hence, a single type.
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedModule {
+    fn new(
+        cursor: &CacheCursor,
+        link_context: AccountAddress,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+        cache: &ModuleCache,
+    ) -> Result<Self, PartialVMError> {
+        let self_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        let mut struct_refs = vec![];
+        let mut structs = vec![];
+        let mut struct_instantiations = vec![];
+        let mut function_refs = vec![];
+        let mut function_instantiations = vec![];
+        let mut field_handles = vec![];
+        let mut field_instantiations: Vec<FieldInstantiation> = vec![];
+        let mut function_map = HashMap::new();
+        let mut single_signature_token_map = BTreeMap::new();
+
+        for struct_handle in module.struct_handles() {
+            let struct_name = module.identifier_at(struct_handle.name);
+            let module_handle = module.module_handle_at(struct_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            struct_refs.push(cache.resolve_struct_by_name(struct_name, &runtime_id)?.0);
+        }
+
+        for struct_def in module.struct_defs() {
+            let idx = struct_refs[struct_def.struct_handle.0 as usize];
+            let field_count = cache.structs.binaries[idx.0].fields.len() as u16;
+            structs.push(StructDef { field_count, idx });
+        }
+
+        for struct_inst in module.struct_instantiations() {
+            let def = struct_inst.def.0 as usize;
+            let struct_def = &structs[def];
+            let field_count = struct_def.field_count;
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(struct_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            struct_instantiations.push(StructInstantiation {
+                field_count,
+                def: struct_def.idx,
+                instantiation,
+            });
+        }
+
+        for func_handle in module.function_handles() {
+            let func_name = module.identifier_at(func_handle.name);
+            let module_handle = module.module_handle_at(func_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            if runtime_id == self_id {
+                // module has not been published yet, loop through the functions
+                for (idx, function) in cache.functions.iter().enumerate().rev() {
+                    if idx < cursor.last_function {
+                        return Err(PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE)
+                            .with_message(format!(
+                                "Cannot find {:?}::{:?} in publishing module",
+                                runtime_id, func_name
+                            )));
+                    }
+                    if function.name.as_ident_str() == func_name {
+                        function_refs.push(idx);
+                        break;
+                    }
+                }
+            } else {
+                function_refs.push(cache.resolve_function_by_name(
+                    func_name,
+                    &runtime_id,
+                    link_context,
+                )?);
+            }
+        }
+
+        for func_def in module.function_defs() {
+            let idx = function_refs[func_def.function.0 as usize];
+            let name = module.identifier_at(module.function_handle_at(func_def.function).name);
+            function_map.insert(name.to_owned(), idx);
+
+            if let Some(code_unit) = &func_def.code {
+                for bc in &code_unit.code {
+                    match bc {
+                        Bytecode::VecPack(si, _)
+                        | Bytecode::VecLen(si)
+                        | Bytecode::VecImmBorrow(si)
+                        | Bytecode::VecMutBorrow(si)
+                        | Bytecode::VecPushBack(si)
+                        | Bytecode::VecPopBack(si)
+                        | Bytecode::VecUnpack(si, _)
+                        | Bytecode::VecSwap(si) => {
+                            if !single_signature_token_map.contains_key(si) {
+                                let ty = match module.signature_at(*si).0.get(0) {
+                                    None => {
+                                        return Err(PartialVMError::new(
+                                            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                        )
+                                        .with_message(
+                                            "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                                .to_owned(),
+                                        ));
+                                    }
+                                    Some(sig_token) => sig_token,
+                                };
+                                single_signature_token_map
+                                    .insert(*si, cache.make_type(module_view, ty)?);
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+
+        for func_inst in module.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        for f_handle in module.field_handles() {
+            let def_idx = f_handle.owner;
+            let owner = structs[def_idx.0 as usize].idx;
+            let offset = f_handle.field as usize;
+            field_handles.push(FieldHandle { offset, owner });
+        }
+
+        for f_inst in module.field_instantiations() {
+            let fh_idx = f_inst.handle;
+            let owner = field_handles[fh_idx.0 as usize].owner;
+            let offset = field_handles[fh_idx.0 as usize].offset;
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(f_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            field_instantiations.push(FieldInstantiation {
+                offset,
+                owner,
+                instantiation,
+            });
+        }
+
+        Ok(Self {
+            id: storage_id,
+            struct_refs,
+            structs,
+            struct_instantiations,
+            function_refs,
+            function_instantiations,
+            field_handles,
+            field_instantiations,
+            function_map,
+            single_signature_token_map,
+        })
+    }
+
+    fn struct_at(&self, idx: StructDefinitionIndex) -> CachedStructIndex {
+        self.structs[idx.0 as usize].idx
+    }
+
+    fn struct_instantiation_at(&self, idx: u16) -> &StructInstantiation {
+        &self.struct_instantiations[idx as usize]
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn field_count(&self, idx: u16) -> u16 {
+        self.structs[idx as usize].field_count
+    }
+
+    fn field_instantiation_count(&self, idx: u16) -> u16 {
+        self.struct_instantiations[idx as usize].field_count
+    }
+
+    fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        self.field_handles[idx.0 as usize].offset
+    }
+
+    fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        self.field_instantiations[idx.0 as usize].offset
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+/// A `LoadedScript` is very similar to a `CompiledScript` but data is "transformed" to a
+/// representation more appropriate to execution.
+/// When code executes, indexes in instructions are resolved against runtime structures
+/// (rather then "compiled") to make available data needed for execution
+/// #[derive(Debug)]
+struct LoadedScript {
+    // primitive pools
+    script: CompiledScript,
+
+    // types as indexes into the Loader type list
+    // REVIEW: why is this unused?
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+
+    // functions as indexes into the Loader function list
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // entry point
+    main: Arc<Function>,
+
+    // parameters of main
+    parameter_tys: Vec<Type>,
+
+    // return values
+    return_tys: Vec<Type>,
+
+    // a map of single-token signature indices to type
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedScript {
+    fn new(
+        script: CompiledScript,
+        link_context: AccountAddress,
+        script_hash: &ScriptHash,
+        cache: &ModuleCache,
+    ) -> VMResult<Self> {
+        let script_view = BinaryIndexedView::Script(&script);
+        let mut struct_refs = vec![];
+        for struct_handle in script.struct_handles() {
+            let struct_name = script.identifier_at(struct_handle.name);
+            let module_handle = script.module_handle_at(struct_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            struct_refs.push(
+                cache
+                    .resolve_struct_by_name(struct_name, &module_id)
+                    .map_err(|e| e.finish(Location::Script))?
+                    .0,
+            );
+        }
+
+        let mut function_refs = vec![];
+        for func_handle in script.function_handles().iter() {
+            let func_name = script.identifier_at(func_handle.name);
+            let module_handle = script.module_handle_at(func_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            let ref_idx = cache
+                .resolve_function_by_name(func_name, &module_id, link_context)
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function_refs.push(ref_idx);
+        }
+
+        let mut function_instantiations = vec![];
+        for func_inst in script.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &script.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(
+                    cache
+                        .make_type(script_view, ty)
+                        .map_err(|e| e.finish(Location::Script))?,
+                );
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        let scope = Scope::Script(*script_hash);
+
+        let code: Vec<Bytecode> = script.code.code.clone();
+        let parameters = script.signature_at(script.parameters).clone();
+
+        let parameter_tys = parameters
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let locals = Signature(
+            parameters
+                .0
+                .iter()
+                .chain(script.signature_at(script.code.locals).0.iter())
+                .cloned()
+                .collect(),
+        );
+        let local_tys = locals
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let return_ = Signature(vec![]);
+        let return_tys = return_
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let type_parameters = script.type_parameters.clone();
+        // TODO: main does not have a name. Revisit.
+        let name = Identifier::new("main").unwrap();
+        let (native, def_is_native) = (None, false); // Script entries cannot be native
+        let main: Arc<Function> = Arc::new(Function {
+            file_format_version: script.version(),
+            index: FunctionDefinitionIndex(0),
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private: false,
+            scope,
+            name,
+            return_types: return_tys.clone(),
+            local_types: local_tys,
+            parameter_types: parameter_tys.clone(),
+        });
+
+        let mut single_signature_token_map = BTreeMap::new();
+        for bc in &script.code.code {
+            match bc {
+                Bytecode::VecPack(si, _)
+                | Bytecode::VecLen(si)
+                | Bytecode::VecImmBorrow(si)
+                | Bytecode::VecMutBorrow(si)
+                | Bytecode::VecPushBack(si)
+                | Bytecode::VecPopBack(si)
+                | Bytecode::VecUnpack(si, _)
+                | Bytecode::VecSwap(si) => {
+                    if !single_signature_token_map.contains_key(si) {
+                        let ty = match script.signature_at(*si).0.get(0) {
+                            None => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                )
+                                .with_message(
+                                    "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                        .to_owned(),
+                                )
+                                .finish(Location::Script));
+                            }
+                            Some(sig_token) => sig_token,
+                        };
+                        single_signature_token_map.insert(
+                            *si,
+                            cache
+                                .make_type(script_view, ty)
+                                .map_err(|e| e.finish(Location::Script))?,
+                        );
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        Ok(Self {
+            script,
+            struct_refs,
+            function_refs,
+            function_instantiations,
+            main,
+            parameter_tys,
+            return_tys,
+            single_signature_token_map,
+        })
+    }
+
+    fn entry_point(&self) -> Arc<Function> {
+        self.main.clone()
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+// A simple wrapper for the "owner" of the function (Module or Script)
+#[derive(Debug)]
+enum Scope {
+    Module(ModuleId),
+    Script(ScriptHash),
+}
+
+// A runtime function
+// #[derive(Debug)]
+// https://github.com/rust-lang/rust/issues/70263
+pub(crate) struct Function {
+    #[allow(unused)]
+    file_format_version: u32,
+    index: FunctionDefinitionIndex,
+    code: Vec<Bytecode>,
+    parameters: Signature,
+    return_: Signature,
+    locals: Signature,
+    type_parameters: Vec<AbilitySet>,
+    native: Option<NativeFunction>,
+    def_is_native: bool,
+    def_is_friend_or_private: bool,
+    scope: Scope,
+    name: Identifier,
+    return_types: Vec<Type>,
+    local_types: Vec<Type>,
+    parameter_types: Vec<Type>,
+}
+
+impl Function {
+    fn new(
+        natives: &NativeFunctions,
+        index: FunctionDefinitionIndex,
+        def: &FunctionDefinition,
+        module: &CompiledModule,
+    ) -> Self {
+        let handle = module.function_handle_at(def.function);
+        let name = module.identifier_at(handle.name).to_owned();
+        let module_id = module.self_id();
+        let def_is_friend_or_private = match def.visibility {
+            Visibility::Friend | Visibility::Private => true,
+            Visibility::Public => false,
+        };
+        let (native, def_is_native) = if def.is_native() {
+            (
+                natives.resolve(
+                    module_id.address(),
+                    module_id.name().as_str(),
+                    name.as_str(),
+                ),
+                true,
+            )
+        } else {
+            (None, false)
+        };
+        let scope = Scope::Module(module_id);
+        let parameters = module.signature_at(handle.parameters).clone();
+        // Native functions do not have a code unit
+        let (code, locals) = match &def.code {
+            Some(code) => (
+                code.code.clone(),
+                Signature(
+                    parameters
+                        .0
+                        .iter()
+                        .chain(module.signature_at(code.locals).0.iter())
+                        .cloned()
+                        .collect(),
+                ),
+            ),
+            None => (vec![], Signature(vec![])),
+        };
+        let return_ = module.signature_at(handle.return_).clone();
+        let type_parameters = handle.type_parameters.clone();
+        Self {
+            file_format_version: module.version(),
+            index,
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private,
+            scope,
+            name,
+            local_types: vec![],
+            return_types: vec![],
+            parameter_types: vec![],
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn file_format_version(&self) -> u32 {
+        self.file_format_version
+    }
+
+    pub(crate) fn module_id(&self) -> Option<&ModuleId> {
+        match &self.scope {
+            Scope::Module(module_id) => Some(module_id),
+            Scope::Script(_) => None,
+        }
+    }
+
+    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
+        self.index
+    }
+
+    pub(crate) fn get_resolver<'a>(
+        &self,
+        link_context: AccountAddress,
+        loader: &'a Loader,
+    ) -> Resolver<'a> {
+        match &self.scope {
+            Scope::Module(module_id) => {
+                let (compiled, loaded) = loader.get_module(link_context, module_id);
+                Resolver::for_module(loader, compiled, loaded)
+            }
+            Scope::Script(script_hash) => {
+                let script = loader.get_script(script_hash);
+                Resolver::for_script(loader, script)
+            }
+        }
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn arg_count(&self) -> usize {
+        self.parameters.len()
+    }
+
+    pub(crate) fn return_type_count(&self) -> usize {
+        self.return_.len()
+    }
+
+    pub(crate) fn name(&self) -> &str {
+        self.name.as_str()
+    }
+
+    pub(crate) fn code(&self) -> &[Bytecode] {
+        &self.code
+    }
+
+    pub(crate) fn type_parameters(&self) -> &[AbilitySet] {
+        &self.type_parameters
+    }
+
+    pub(crate) fn local_types(&self) -> &[Type] {
+        &self.local_types
+    }
+
+    pub(crate) fn return_types(&self) -> &[Type] {
+        &self.return_types
+    }
+
+    pub(crate) fn parameter_types(&self) -> &[Type] {
+        &self.parameter_types
+    }
+
+    pub(crate) fn pretty_string(&self) -> String {
+        match &self.scope {
+            Scope::Script(_) => "Script::main".into(),
+            Scope::Module(id) => format!(
+                "0x{}::{}::{}",
+                id.address(),
+                id.name().as_str(),
+                self.name.as_str()
+            ),
+        }
+    }
+
+    pub(crate) fn is_native(&self) -> bool {
+        self.def_is_native
+    }
+
+    pub(crate) fn is_friend_or_private(&self) -> bool {
+        self.def_is_friend_or_private
+    }
+
+    pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        if cfg!(feature = "lazy_natives") {
+            // If lazy_natives is configured, this is a MISSING_DEPENDENCY error, as we skip
+            // checking those at module loading time.
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!("Missing Native Function `{}`", self.name))
+            })
+        } else {
+            // Otherwise this error should not happen, hence UNREACHABLE
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNREACHABLE)
+                    .with_message("Missing Native Function".to_string())
+            })
+        }
+    }
+}
+
+//
+// Internal structures that are saved at the proper index in the proper tables to access
+// execution information (interpreter).
+// The following structs are internal to the loader and never exposed out.
+// The `Loader` will create those struct and the proper table when loading a module.
+// The `Resolver` uses those structs to return information to the `Interpreter`.
+//
+
+// A function instantiation.
+#[derive(Debug)]
+struct FunctionInstantiation {
+    // index to `ModuleCache::functions` global table
+    handle: usize,
+    instantiation: Vec<Type>,
+}
+
+#[derive(Debug)]
+struct StructDef {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index
+    idx: CachedStructIndex,
+}
+
+#[derive(Debug)]
+struct StructInstantiation {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    def: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+// A field handle. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldHandle {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    owner: CachedStructIndex,
+}
+
+// A field instantiation. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldInstantiation {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    #[allow(unused)]
+    owner: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+//
+// Cache for data associated to a Struct, used for de/serialization and more
+//
+
+struct StructInfo {
+    runtime_struct_tag: Option<StructTag>,
+    defining_struct_tag: Option<StructTag>,
+    struct_layout: Option<R::MoveStructLayout>,
+    annotated_struct_layout: Option<A::MoveStructLayout>,
+    node_count: Option<u64>,
+    annotated_node_count: Option<u64>,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+enum StructTagType {
+    Runtime,
+    Defining,
+}
+
+impl StructInfo {
+    fn new() -> Self {
+        Self {
+            runtime_struct_tag: None,
+            defining_struct_tag: None,
+            struct_layout: None,
+            annotated_struct_layout: None,
+            node_count: None,
+            annotated_node_count: None,
+        }
+    }
+}
+
+pub(crate) struct TypeCache {
+    structs: HashMap<CachedStructIndex, HashMap<Vec<Type>, StructInfo>>,
+}
+
+impl TypeCache {
+    fn new() -> Self {
+        Self {
+            structs: HashMap::new(),
+        }
+    }
+}
+
+/// Maximal depth of a value in terms of type depth.
+pub const VALUE_DEPTH_MAX: u64 = 128;
+
+/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// fields for struct types.
+const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
+
+/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
+/// field types of structs.
+const MAX_TYPE_INSTANTIATION_NODES: u64 = 128;
+
+impl Loader {
+    fn read_cached_struct_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> Option<StructTag> {
+        let cache = self.type_cache.read();
+        let map = cache.structs.get(&gidx)?;
+        let info = map.get(ty_args)?;
+
+        match tag_type {
+            StructTagType::Runtime => info.runtime_struct_tag.clone(),
+            StructTagType::Defining => info.defining_struct_tag.clone(),
+        }
+    }
+
+    fn struct_gidx_to_type_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> PartialVMResult<StructTag> {
+        if let Some(cached) = self.read_cached_struct_tag(gidx, ty_args, tag_type) {
+            return Ok(cached);
+        }
+
+        let ty_arg_tags = ty_args
+            .iter()
+            .map(|ty| self.type_to_type_tag_impl(ty, tag_type))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+
+        match tag_type {
+            StructTagType::Runtime => {
+                let tag = StructTag {
+                    address: *struct_type.runtime_id.address(),
+                    module: struct_type.runtime_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.runtime_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+
+            StructTagType::Defining => {
+                let tag = StructTag {
+                    address: *struct_type.defining_id.address(),
+                    module: struct_type.defining_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.defining_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+        }
+    }
+
+    fn type_to_type_tag_impl(
+        &self,
+        ty: &Type,
+        tag_type: StructTagType,
+    ) -> PartialVMResult<TypeTag> {
+        Ok(match ty {
+            Type::Bool => TypeTag::Bool,
+            Type::U8 => TypeTag::U8,
+            Type::U16 => TypeTag::U16,
+            Type::U32 => TypeTag::U32,
+            Type::U64 => TypeTag::U64,
+            Type::U128 => TypeTag::U128,
+            Type::U256 => TypeTag::U256,
+            Type::Address => TypeTag::Address,
+            Type::Signer => TypeTag::Signer,
+            Type::Vector(ty) => {
+                TypeTag::Vector(Box::new(self.type_to_type_tag_impl(ty, tag_type)?))
+            }
+            Type::Struct(gidx) => TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(
+                *gidx,
+                &[],
+                tag_type,
+            )?)),
+            Type::StructInstantiation(gidx, ty_args) => TypeTag::Struct(Box::new(
+                self.struct_gidx_to_type_tag(*gidx, ty_args, tag_type)?,
+            )),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type tag for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn count_type_nodes(&self, ty: &Type) -> u64 {
+        let mut todo = vec![ty];
+        let mut result = 0;
+        while let Some(ty) = todo.pop() {
+            match ty {
+                Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                    result += 1;
+                    todo.push(ty);
+                }
+                Type::StructInstantiation(_, ty_args) => {
+                    result += 1;
+                    todo.extend(ty_args.iter())
+                }
+                _ => {
+                    result += 1;
+                }
+            }
+        }
+        result
+    }
+
+    fn struct_gidx_to_type_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(node_count) = &struct_info.node_count {
+                    *count += *node_count
+                }
+                if let Some(layout) = &struct_info.struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let count_before = *count;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        let field_tys = struct_type
+            .fields
+            .iter()
+            .map(|ty| self.subst(ty, ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_layouts = field_tys
+            .iter()
+            .map(|ty| self.type_to_type_layout_impl(ty, count, depth + 1))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_node_count = *count - count_before;
+
+        let struct_layout = R::MoveStructLayout::new(field_layouts);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.struct_layout = Some(struct_layout.clone());
+        info.node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_type_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => R::MoveTypeLayout::Bool,
+            Type::U8 => R::MoveTypeLayout::U8,
+            Type::U16 => R::MoveTypeLayout::U16,
+            Type::U32 => R::MoveTypeLayout::U32,
+            Type::U64 => R::MoveTypeLayout::U64,
+            Type::U128 => R::MoveTypeLayout::U128,
+            Type::U256 => R::MoveTypeLayout::U256,
+            Type::Address => R::MoveTypeLayout::Address,
+            Type::Signer => R::MoveTypeLayout::Signer,
+            Type::Vector(ty) => R::MoveTypeLayout::Vector(Box::new(self.type_to_type_layout_impl(
+                ty,
+                count,
+                depth + 1,
+            )?)),
+            Type::Struct(gidx) => {
+                R::MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(*gidx, &[], count, depth)?)
+            }
+            Type::StructInstantiation(gidx, ty_args) => R::MoveTypeLayout::Struct(
+                self.struct_gidx_to_type_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn struct_gidx_to_fully_annotated_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(annotated_node_count) = &struct_info.annotated_node_count {
+                    *count += *annotated_node_count
+                }
+                if let Some(layout) = &struct_info.annotated_struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        if struct_type.fields.len() != struct_type.field_names.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Field types did not match the length of field names in loaded struct"
+                        .to_owned(),
+                ),
+            );
+        }
+        let count_before = *count;
+        let struct_tag = self.struct_gidx_to_type_tag(gidx, ty_args, StructTagType::Defining)?;
+        let field_layouts = struct_type
+            .field_names
+            .iter()
+            .zip(&struct_type.fields)
+            .map(|(n, ty)| {
+                let ty = self.subst(ty, ty_args)?;
+                let l = self.type_to_fully_annotated_layout_impl(&ty, count, depth + 1)?;
+                Ok(A::MoveFieldLayout::new(n.clone(), l))
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_layout = A::MoveStructLayout::new(struct_tag, field_layouts);
+        let field_node_count = *count - count_before;
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.annotated_struct_layout = Some(struct_layout.clone());
+        info.annotated_node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_fully_annotated_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => A::MoveTypeLayout::Bool,
+            Type::U8 => A::MoveTypeLayout::U8,
+            Type::U16 => A::MoveTypeLayout::U16,
+            Type::U32 => A::MoveTypeLayout::U32,
+            Type::U64 => A::MoveTypeLayout::U64,
+            Type::U128 => A::MoveTypeLayout::U128,
+            Type::U256 => A::MoveTypeLayout::U256,
+            Type::Address => A::MoveTypeLayout::Address,
+            Type::Signer => A::MoveTypeLayout::Signer,
+            Type::Vector(ty) => A::MoveTypeLayout::Vector(Box::new(
+                self.type_to_fully_annotated_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, &[], count, depth)?,
+            ),
+            Type::StructInstantiation(gidx, ty_args) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    pub(crate) fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Defining)
+    }
+
+    pub(crate) fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Runtime)
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_type_layout_impl(ty, &mut count, 1)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_fully_annotated_layout_impl(ty, &mut count, 1)
+    }
+}
+
+// Public APIs for external uses.
+impl Loader {
+    pub(crate) fn get_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<R::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_type_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<A::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_fully_annotated_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/logging.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/logging.rs
new file mode 100644
index 000000000..0359b7388
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/logging.rs
@@ -0,0 +1,44 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, VMError};
+use move_core_types::vm_status::{StatusCode, StatusType};
+use tracing::error;
+//
+// Utility functions
+//
+
+pub fn expect_no_verification_errors(err: VMError) -> VMError {
+    match err.status_type() {
+        status_type @ StatusType::Deserialization | status_type @ StatusType::Verification => {
+            let message = format!(
+                "Unexpected verifier/deserialization error! This likely means there is code \
+                stored on chain that is unverifiable!\nError: {:?}",
+                &err
+            );
+            let (
+                _old_status,
+                _old_sub_status,
+                _old_message,
+                _stacktrace,
+                location,
+                indices,
+                offsets,
+            ) = err.all_data();
+            let major_status = match status_type {
+                StatusType::Deserialization => StatusCode::UNEXPECTED_DESERIALIZATION_ERROR,
+                StatusType::Verification => StatusCode::UNEXPECTED_VERIFIER_ERROR,
+                _ => unreachable!(),
+            };
+
+            error!("[VM] {}", message);
+            PartialVMError::new(major_status)
+                .with_message(message)
+                .at_indices(indices)
+                .at_code_offsets(offsets)
+                .finish(location)
+        }
+        _ => err,
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/move_vm.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/move_vm.rs
new file mode 100644
index 000000000..5b89d6a06
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/move_vm.rs
@@ -0,0 +1,104 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    native_functions::NativeFunction, runtime::VMRuntime, session::Session,
+};
+use move_binary_format::{
+    errors::{Location, VMResult},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    metadata::Metadata, resolver::MoveResolver,
+};
+use move_vm_config::runtime::VMConfig;
+
+pub struct MoveVM {
+    runtime: VMRuntime,
+}
+
+impl MoveVM {
+    pub fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    ) -> VMResult<Self> {
+        Self::new_with_config(natives, VMConfig::default())
+    }
+
+    pub fn new_with_config(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> VMResult<Self> {
+        Ok(Self {
+            runtime: VMRuntime::new(natives, vm_config)
+                .map_err(|err| err.finish(Location::Undefined))?,
+        })
+    }
+
+    pub fn config(&self) -> &VMConfig {
+        self.runtime.loader().vm_config()
+    }
+
+    /// Create a new Session backed by the given storage.
+    ///
+    /// Right now it is the caller's responsibility to ensure cache coherence of the Move VM Loader
+    ///   - When a module gets published in a Move VM Session, and then gets used by another
+    ///     transaction, it will be loaded into the code cache and stay there even if the resulted
+    ///     effects do not get committed back to the storage when the Session ends.
+    ///   - As a result, if one wants to have multiple sessions at a time, one needs to make sure
+    ///     none of them will try to publish a module. In other words, if there is a module publishing
+    ///     Session it must be the only Session existing.
+    ///   - In general, a new Move VM needs to be created whenever the storage gets modified by an
+    ///     outer envrionment, or otherwise the states may be out of sync. There are a few exceptional
+    ///     cases where this may not be necessary, with the most notable one being the common module
+    ///     publishing flow: you can keep using the same Move VM if you publish some modules in a Session
+    ///     and apply the effects to the storage when the Session ends.
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.runtime.new_session(remote)
+    }
+
+    /// Create a new session, as in `new_session`, but provide native context extensions.
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        self.runtime.new_session_with_extensions(remote, extensions)
+    }
+
+    /// Load a module into VM's code cache
+    pub fn load_module<S: MoveResolver>(
+        &self,
+        module_id: &ModuleId,
+        remote: S,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.runtime
+            .loader()
+            .load_module(
+                module_id,
+                &TransactionDataCache::new(remote, self.runtime.loader()),
+            )
+            .map(|(compiled, _)| compiled)
+    }
+
+    /// Attempts to discover metadata in a given module with given key. Availability
+    /// of this data may depend on multiple aspects. In general, no hard assumptions of
+    /// availability should be made, but typically, one can expect that
+    /// the modules which have been involved in the execution of the last session are available.
+    ///
+    /// This is called by an adapter to extract, for example, debug information out of
+    /// the metadata section of the code for post mortem analysis. Notice that because
+    /// of ownership of the underlying binary representation of modules hidden behind an rwlock,
+    /// this actually has to hand back a copy of the associated metadata, so metadata should
+    /// be organized keeping this in mind.
+    ///
+    /// TODO: in the new loader architecture, as the loader is visible to the adapter, one would
+    ///   call this directly via the loader instead of the VM.
+    pub fn get_module_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        self.runtime.loader().get_metadata(module, key)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/native_extensions.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/native_extensions.rs
new file mode 100644
index 000000000..e75c50c8d
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/native_extensions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use better_any::{Tid, TidAble, TidExt};
+use std::{any::TypeId, collections::HashMap};
+
+/// A data type to represent a heterogeneous collection of extensions which are available to
+/// native functions. A value to this is passed into the session function execution.
+///
+/// The implementation uses the crate `better_any` which implements a version of the `Any`
+/// type, called `Tid<`a>`, which allows for up to one lifetime parameter. This
+/// avoids that extensions need to have `'static` lifetime, which `Any` requires. In order to make a
+/// struct suitable to be a 'Tid', use `#[derive(Tid)]` in the struct declaration. (See also
+/// tests at the end of this module.)
+#[derive(Default)]
+pub struct NativeContextExtensions<'a> {
+    map: HashMap<TypeId, Box<dyn Tid<'a>>>,
+}
+
+impl<'a> NativeContextExtensions<'a> {
+    pub fn add<T: TidAble<'a>>(&mut self, ext: T) {
+        assert!(
+            self.map.insert(T::id(), Box::new(ext)).is_none(),
+            "multiple extensions of the same type not allowed"
+        )
+    }
+
+    pub fn get<T: TidAble<'a>>(&self) -> &T {
+        self.map
+            .get(&T::id())
+            .expect("extension unknown")
+            .as_ref()
+            .downcast_ref::<T>()
+            .unwrap()
+    }
+
+    pub fn get_mut<T: TidAble<'a>>(&mut self) -> &mut T {
+        self.map
+            .get_mut(&T::id())
+            .expect("extension unknown")
+            .as_mut()
+            .downcast_mut::<T>()
+            .unwrap()
+    }
+
+    pub fn remove<T: TidAble<'a>>(&mut self) -> T {
+        // can't use expect below because it requires `T: Debug`.
+        match self
+            .map
+            .remove(&T::id())
+            .expect("extension unknown")
+            .downcast_box::<T>()
+        {
+            Ok(val) => *val,
+            Err(_) => panic!("downcast error"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::native_extensions::NativeContextExtensions;
+    use better_any::{Tid, TidAble};
+
+    #[derive(Tid)]
+    struct Ext<'a> {
+        a: &'a mut u64,
+    }
+
+    #[test]
+    fn non_static_ext() {
+        let mut v: u64 = 23;
+        let e = Ext { a: &mut v };
+        let mut exts = NativeContextExtensions::default();
+        exts.add(e);
+        *exts.get_mut::<Ext>().a += 1;
+        assert_eq!(*exts.get_mut::<Ext>().a, 24);
+        *exts.get_mut::<Ext>().a += 1;
+        let e1 = exts.remove::<Ext>();
+        assert_eq!(*e1.a, 25)
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/native_functions.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/native_functions.rs
new file mode 100644
index 000000000..af0c31923
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/native_functions.rs
@@ -0,0 +1,238 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter, loader::Resolver, native_extensions::NativeContextExtensions,
+};
+use move_binary_format::errors::{ExecutionState, PartialVMError, PartialVMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::InternalGas,
+    identifier::Identifier,
+    language_storage::TypeTag,
+    runtime_value as R,
+    annotated_value as A,
+
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+use move_vm_types::{
+    data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult,
+    values::Value,
+};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, VecDeque},
+    fmt::Write,
+    sync::Arc,
+};
+
+pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>
+    + Send
+    + Sync
+    + 'static;
+
+pub type NativeFunction = Arc<UnboxedNativeFunction>;
+
+pub type NativeFunctionTable = Vec<(AccountAddress, Identifier, Identifier, NativeFunction)>;
+
+pub fn make_table(
+    addr: AccountAddress,
+    elems: &[(&str, &str, NativeFunction)],
+) -> NativeFunctionTable {
+    make_table_from_iter(addr, elems.iter().cloned())
+}
+
+pub fn make_table_from_iter<S: Into<Box<str>>>(
+    addr: AccountAddress,
+    elems: impl IntoIterator<Item = (S, S, NativeFunction)>,
+) -> NativeFunctionTable {
+    elems
+        .into_iter()
+        .map(|(module_name, func_name, func)| {
+            (
+                addr,
+                Identifier::new(module_name).unwrap(),
+                Identifier::new(func_name).unwrap(),
+                func,
+            )
+        })
+        .collect()
+}
+
+pub(crate) struct NativeFunctions(
+    HashMap<AccountAddress, HashMap<String, HashMap<String, NativeFunction>>>,
+);
+
+impl NativeFunctions {
+    pub fn resolve(
+        &self,
+        addr: &AccountAddress,
+        module_name: &str,
+        func_name: &str,
+    ) -> Option<NativeFunction> {
+        self.0.get(addr)?.get(module_name)?.get(func_name).cloned()
+    }
+
+    pub fn new<I>(natives: I) -> PartialVMResult<Self>
+    where
+        I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    {
+        let mut map = HashMap::new();
+        for (addr, module_name, func_name, func) in natives.into_iter() {
+            let modules = map.entry(addr).or_insert_with(HashMap::new);
+            let funcs = modules
+                .entry(module_name.into_string())
+                .or_insert_with(HashMap::new);
+
+            if funcs.insert(func_name.into_string(), func).is_some() {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_NATIVE_FUNCTION));
+            }
+        }
+        Ok(Self(map))
+    }
+}
+
+pub struct NativeContext<'a, 'b> {
+    interpreter: &'a mut Interpreter,
+    data_store: &'a mut dyn DataStore,
+    resolver: &'a Resolver<'a>,
+    extensions: &'a mut NativeContextExtensions<'b>,
+    gas_left: RefCell<InternalGas>,
+    gas_budget: InternalGas,
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub(crate) fn new(
+        interpreter: &'a mut Interpreter,
+        data_store: &'a mut dyn DataStore,
+        resolver: &'a Resolver<'a>,
+        extensions: &'a mut NativeContextExtensions<'b>,
+        gas_budget: InternalGas,
+    ) -> Self {
+        Self {
+            interpreter,
+            data_store,
+            resolver,
+            extensions,
+            gas_left: RefCell::new(gas_budget),
+            gas_budget,
+        }
+    }
+
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        self.interpreter.runtime_limits_config()
+    }
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub fn print_stack_trace<B: Write>(&self, buf: &mut B) -> PartialVMResult<()> {
+        self.interpreter
+            .debug_print_stack_trace(buf, self.resolver.loader())
+    }
+
+    pub fn save_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<bool> {
+        match self.data_store.emit_event(guid, seq_num, ty, val) {
+            Ok(()) => Ok(true),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(false),
+        }
+    }
+
+    pub fn events(&self) -> &Vec<(Vec<u8>, u64, Type, R::MoveTypeLayout, Value)> {
+        self.data_store.events()
+    }
+
+    pub fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_type_tag(ty)
+    }
+
+    pub fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_runtime_type_tag(ty)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<Option<R::MoveTypeLayout>> {
+        match self.resolver.type_to_type_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<Option<A::MoveTypeLayout>> {
+        match self.resolver.type_to_fully_annotated_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn extensions(&self) -> &NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    pub fn extensions_mut(&mut self) -> &mut NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    /// Get count stack frames, including the one of the called native function. This
+    /// allows a native function to reflect about its caller.
+    pub fn stack_frames(&self, count: usize) -> ExecutionState {
+        self.interpreter.get_stack_frames(count)
+    }
+
+    pub fn charge_gas(&self, amount: InternalGas) -> bool {
+        let mut gas_left = self.gas_left.borrow_mut();
+
+        match gas_left.checked_sub(amount) {
+            Some(x) => {
+                *gas_left = x;
+                true
+            }
+            None => false,
+        }
+    }
+
+    pub fn gas_budget(&self) -> InternalGas {
+        self.gas_budget
+    }
+
+    pub fn gas_used(&self) -> InternalGas {
+        self.gas_budget.saturating_sub(*self.gas_left.borrow())
+    }
+}
+
+/// Charge gas during a native call. If the charging fails, return early
+#[macro_export]
+macro_rules! native_charge_gas_early_exit {
+    ($native_context:ident, $cost:expr) => {{
+        use move_core_types::vm_status::sub_status::NFE_OUT_OF_GAS;
+        if !$native_context.charge_gas($cost) {
+            // Exhausted all in budget. terminate early
+            return Ok(NativeResult::err(
+                $native_context.gas_budget(),
+                NFE_OUT_OF_GAS,
+            ));
+        }
+    }};
+}
+
+/// Total cost of a native call so far
+#[macro_export]
+macro_rules! native_gas_total_cost {
+    ($native_context:ident, $gas_left:ident) => {{
+        // Its okay to unwrap because the budget can never be less than the gas left
+        $native_context.gas_budget().checked_sub($gas_left).unwrap()
+    }};
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/runtime.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/runtime.rs
new file mode 100644
index 000000000..41234c6da
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/runtime.rs
@@ -0,0 +1,478 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache,
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+    native_extensions::NativeContextExtensions,
+    native_functions::{NativeFunction, NativeFunctions},
+    session::{LoadedFunctionInstantiation, SerializedReturnValues, Session},
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::LocalIndex,
+    CompiledModule, IndexKind,
+};
+use move_bytecode_verifier::script_signature;
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::ModuleId,
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::Type,
+    values::{Locals, Reference, VMValueCast, Value},
+};
+use std::{borrow::Borrow, collections::BTreeSet, sync::Arc};
+use tracing::warn;
+
+/// An instantiation of the MoveVM.
+pub(crate) struct VMRuntime {
+    loader: Loader,
+}
+
+impl VMRuntime {
+    pub(crate) fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> PartialVMResult<Self> {
+        Ok(VMRuntime {
+            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
+        })
+    }
+
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.new_session_with_extensions(remote, NativeContextExtensions::default())
+    }
+
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        native_extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        Session {
+            runtime: self,
+            data_cache: TransactionDataCache::new(remote, &self.loader),
+            native_extensions,
+        }
+    }
+
+    pub(crate) fn publish_module_bundle(
+        &self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        data_store: &mut impl DataStore,
+        _gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        // deserialize the modules. Perform bounds check. After this indexes can be
+        // used with the `[]` operator
+        let compiled_modules = match modules
+            .iter()
+            .map(|blob| {
+                CompiledModule::deserialize_with_config(
+                    blob,
+                    self.loader.vm_config().max_binary_format_version,
+                    self.loader
+                        .vm_config()
+                        .check_no_extraneous_bytes_during_deserialization,
+                )
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+        {
+            Ok(modules) => modules,
+            Err(err) => {
+                warn!("[VM] module deserialization failed {:?}", err);
+                return Err(err.finish(Location::Undefined));
+            }
+        };
+
+        // Make sure all modules' self addresses matches the transaction sender. The self address is
+        // where the module will actually be published. If we did not check this, the sender could
+        // publish a module under anyone's account.
+        for module in &compiled_modules {
+            if module.address() != &sender {
+                return Err(verification_error(
+                    StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER,
+                    IndexKind::AddressIdentifier,
+                    module.self_handle_idx().0,
+                )
+                .finish(Location::Undefined));
+            }
+        }
+
+        // Collect ids for modules that are published together
+        let mut bundle_unverified = BTreeSet::new();
+        for module in &compiled_modules {
+            if !bundle_unverified.insert(module.self_id()) {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
+                    .finish(Location::Undefined));
+            }
+        }
+
+        // Perform bytecode and loading verification. Modules must be sorted in topological order.
+        self.loader
+            .verify_module_bundle_for_publication(&compiled_modules, data_store)?;
+
+        // NOTE: we want to (informally) argue that all modules pass the linking check before being
+        // published to the data store.
+        //
+        // The linking check consists of two checks actually
+        // - dependencies::verify_module(module, all_imm_deps)
+        // - cyclic_dependencies::verify_module(module, fn_imm_deps, fn_imm_friends)
+        //
+        // [Claim 1]
+        // We show that the `dependencies::verify_module` check is always satisfied whenever a
+        // module M is published or updated and the `all_imm_deps` contains the actual modules
+        // required by M.
+        //
+        // Suppose M depends on D, and we now consider the following scenarios:
+        // 1) D does not appear in the bundle together with M
+        // -- In this case, D must be either in the code cache or in the data store which can be
+        //    loaded into the code cache (and pass all checks on D).
+        //    - If D is missing, the linking will fail and return an error.
+        //    - If D exists, D will be added to the `all_imm_deps` arg when checking M.
+        //
+        // 2) D appears in the bundle *before* M
+        // -- In this case, regardless of whether D is in code cache or not, D will be put into the
+        //    `bundle_verified` argument and modules in `bundle_verified` will be prioritized before
+        //    returning a module in code cache.
+        //
+        // 3) D appears in the bundle *after* M
+        // -- This technically should be discouraged but this is user input so we cannot have this
+        //    assumption here. But nevertheless, we can still make the claim 1 even in this case.
+        //    When M is verified, flow 1) is effectively activated, which means:
+        //    - If the code cache or the data store does not contain a D' which has the same name
+        //      with D, then the linking will fail and return an error.
+        //    - If D' exists, and M links against D', then when verifying D in a later time point,
+        //      a compatibility check will be invoked to ensure that D is compatible with D',
+        //      meaning, whichever module that links against D' will have to link against D as well.
+        //
+        // [Claim 2]
+        // We show that the `cyclic_dependencies::verify_module` check is always satisfied whenever
+        // a module M is published or updated and the dep/friend modules returned by the transitive
+        // dependency closure functions are valid.
+        //
+        // Currently, the code is written in a way that, from the view point of the
+        // `cyclic_dependencies::verify_module` check, modules checked prior to module M in the same
+        // bundle looks as if they have already been published and loaded to the code cache.
+        //
+        // Therefore, if M forms a cyclic dependency with module A in the same bundle that is
+        // checked prior to M, such an error will be detected. However, if M forms a cyclic
+        // dependency with a module X that appears in the same bundle *after* M. The cyclic
+        // dependency can only be caught when X is verified.
+        //
+        // In summary: the code is written in a way that, certain checks are skipped while checking
+        // each individual module in the bundle in order. But if every module in the bundle pass
+        // all the checks, then the whole bundle can be published/upgraded together. Otherwise,
+        // none of the module can be published/updated.
+        for (module, blob) in compiled_modules.into_iter().zip(modules.into_iter()) {
+            let runtime_id = module.self_id();
+            let storage_id = data_store
+                .relocate(&runtime_id)
+                .map_err(|e| e.finish(Location::Module(runtime_id)))?;
+
+            data_store.publish_module(&storage_id, blob)?;
+        }
+
+        Ok(())
+    }
+
+    fn deserialize_value(&self, ty: &Type, arg: impl Borrow<[u8]>) -> PartialVMResult<Value> {
+        let layout = match self.loader.type_to_type_layout(ty) {
+            Ok(layout) => layout,
+            Err(_err) => {
+                warn!("[VM] failed to get layout from type");
+                return Err(PartialVMError::new(
+                    StatusCode::INVALID_PARAM_TYPE_FOR_DESERIALIZATION,
+                ));
+            }
+        };
+
+        match Value::simple_deserialize(arg.borrow(), &layout) {
+            Some(val) => Ok(val),
+            None => {
+                warn!("[VM] failed to deserialize argument");
+                Err(PartialVMError::new(
+                    StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+                ))
+            }
+        }
+    }
+
+    fn deserialize_args(
+        &self,
+        arg_tys: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+    ) -> PartialVMResult<(Locals, Vec<Value>)> {
+        if arg_tys.len() != serialized_args.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "argument length mismatch: expected {} got {}",
+                        arg_tys.len(),
+                        serialized_args.len()
+                    ),
+                ),
+            );
+        }
+
+        // Create a list of dummy locals. Each value stored will be used be borrowed and passed
+        // by reference to the invoked function
+        let mut dummy_locals = Locals::new(arg_tys.len());
+        // Arguments for the invoked function. These can be owned values or references
+        let deserialized_args = arg_tys
+            .into_iter()
+            .zip(serialized_args)
+            .enumerate()
+            .map(|(idx, (arg_ty, arg_bytes))| match &arg_ty {
+                Type::MutableReference(inner_t) | Type::Reference(inner_t) => {
+                    dummy_locals.store_loc(
+                        idx,
+                        self.deserialize_value(inner_t, arg_bytes)?,
+                        self.loader
+                            .vm_config()
+                            .enable_invariant_violation_check_in_swap_loc,
+                    )?;
+                    dummy_locals.borrow_loc(idx)
+                }
+                _ => self.deserialize_value(&arg_ty, arg_bytes),
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        Ok((dummy_locals, deserialized_args))
+    }
+
+    fn serialize_return_value(
+        &self,
+        ty: &Type,
+        value: Value,
+    ) -> PartialVMResult<(Vec<u8>, MoveTypeLayout)> {
+        let (ty, value) = match ty {
+            Type::Reference(inner) | Type::MutableReference(inner) => {
+                let ref_value: Reference = value.cast().map_err(|_err| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "non reference value given for a reference typed return value".to_string(),
+                    )
+                })?;
+                let inner_value = ref_value.read_ref()?;
+                (&**inner, inner_value)
+            }
+            _ => (ty, value),
+        };
+
+        let layout = self.loader.type_to_type_layout(ty).map_err(|_err| {
+            PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
+                "entry point functions cannot have non-serializable return types".to_string(),
+            )
+        })?;
+        let bytes = value.simple_serialize(&layout).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to serialize return values".to_string())
+        })?;
+        Ok((bytes, layout))
+    }
+
+    fn serialize_return_values(
+        &self,
+        return_types: &[Type],
+        return_values: Vec<Value>,
+    ) -> PartialVMResult<Vec<(Vec<u8>, MoveTypeLayout)>> {
+        if return_types.len() != return_values.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "declared {} return types, but got {} return values",
+                        return_types.len(),
+                        return_values.len()
+                    ),
+                ),
+            );
+        }
+
+        return_types
+            .iter()
+            .zip(return_values)
+            .map(|(ty, value)| self.serialize_return_value(ty, value))
+            .collect()
+    }
+
+    fn execute_function_impl(
+        &self,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+        param_types: Vec<Type>,
+        return_types: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        let arg_types = param_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let mut_ref_args = arg_types
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, ty)| match ty {
+                Type::MutableReference(inner) => Some((idx, inner.clone())),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        let (mut dummy_locals, deserialized_args) = self
+            .deserialize_args(arg_types, serialized_args)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let return_types = return_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_values = Interpreter::entrypoint(
+            func,
+            ty_args,
+            deserialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+            &self.loader,
+        )?;
+
+        let serialized_return_values = self
+            .serialize_return_values(&return_types, return_values)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let serialized_mut_ref_outputs = mut_ref_args
+            .into_iter()
+            .map(|(idx, ty)| {
+                // serialize return values first in the case that a value points into this local
+                let local_val = dummy_locals.move_loc(
+                    idx,
+                    self.loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                let (bytes, layout) = self.serialize_return_value(&ty, local_val)?;
+                Ok((idx as LocalIndex, bytes, layout))
+            })
+            .collect::<PartialVMResult<_>>()
+            .map_err(|e| e.finish(Location::Undefined))?;
+
+        // locals should not be dropped until all return values are serialized
+        std::mem::drop(dummy_locals);
+
+        Ok(SerializedReturnValues {
+            mutable_reference_outputs: serialized_mut_ref_outputs,
+            return_values: serialized_return_values,
+        })
+    }
+
+    pub(crate) fn execute_function(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        bypass_declared_entry_check: bool,
+    ) -> VMResult<SerializedReturnValues> {
+        use move_binary_format::{binary_views::BinaryIndexedView, file_format::SignatureIndex};
+        fn check_is_entry(
+            _resolver: &BinaryIndexedView,
+            is_entry: bool,
+            _parameters_idx: SignatureIndex,
+            _return_idx: Option<SignatureIndex>,
+        ) -> PartialVMResult<()> {
+            if is_entry {
+                Ok(())
+            } else {
+                Err(PartialVMError::new(
+                    StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
+                ))
+            }
+        }
+
+        let additional_signature_checks = if bypass_declared_entry_check {
+            move_bytecode_verifier::no_additional_script_signature_checks
+        } else {
+            check_is_entry
+        };
+        // load the function
+        let (
+            compiled,
+            _,
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_function(module, function_name, &type_arguments, data_store)?;
+
+        script_signature::verify_module_function_signature_by_name(
+            compiled.as_ref(),
+            function_name,
+            additional_signature_checks,
+        )?;
+
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    // See Session::execute_script for what contracts to follow.
+    pub(crate) fn execute_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the script, perform verification
+        let (
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_script(script.borrow(), &type_arguments, data_store)?;
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    pub(crate) fn loader(&self) -> &Loader {
+        &self.loader
+    }
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/session.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/session.rs
new file mode 100644
index 000000000..98bbd10e9
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/session.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    runtime::VMRuntime,
+};
+use move_binary_format::{
+    errors::*,
+    file_format::{AbilitySet, LocalIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{ChangeSet, Event},
+    identifier::IdentStr,
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value as R,
+    annotated_value as A
+};
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+};
+use std::{borrow::Borrow, sync::Arc};
+
+pub struct Session<'r, 'l, S> {
+    pub(crate) runtime: &'l VMRuntime,
+    pub(crate) data_cache: TransactionDataCache<'l, S>,
+    pub(crate) native_extensions: NativeContextExtensions<'r>,
+}
+
+/// Serialized return values from function/script execution
+/// Simple struct is designed just to convey meaning behind serialized values
+#[derive(Debug)]
+pub struct SerializedReturnValues {
+    /// The value of any arguments that were mutably borrowed.
+    /// Non-mut borrowed values are not included
+    pub mutable_reference_outputs: Vec<(LocalIndex, Vec<u8>, R::MoveTypeLayout)>,
+    /// The return values from the function
+    pub return_values: Vec<(Vec<u8>, R::MoveTypeLayout)>,
+}
+
+impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
+    /// Execute a Move function with the given arguments. This is mainly designed for an external
+    /// environment to invoke system logic written in Move.
+    ///
+    /// NOTE: There are NO checks on the `args` except that they can deserialize into the provided
+    /// types.
+    /// The ability to deserialize `args` into arbitrary types is *very* powerful, e.g. it can
+    /// used to manufacture `signer`'s or `Coin`'s from raw bytes. It is the responsibility of the
+    /// caller (e.g. adapter) to ensure that this power is used responsibly/securely for its
+    /// use-case.
+    ///
+    /// The caller MUST ensure
+    ///   - All types and modules referred to by the type arguments exist.
+    ///   - The signature is valid for the rules of the adapter
+    ///
+    /// The Move VM MUST return an invariant violation if the caller fails to follow any of the
+    /// rules above.
+    ///
+    /// The VM will check that the function is marked as an 'entry' function.
+    ///
+    /// Currently if any other error occurs during execution, the Move VM will simply propagate that
+    /// error back to the outer environment without handling/translating it. This behavior may be
+    /// revised in the future.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_entry_function(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = false;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Similar to execute_entry_function, but it bypasses visibility checks
+    pub fn execute_function_bypass_visibility(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = true;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Execute a transaction script.
+    ///
+    /// The Move VM MUST return a user error (in other words, an error that's not an invariant
+    /// violation) if
+    ///   - The script fails to deserialize or verify. Not all expressible signatures are valid.
+    ///     See `move_bytecode_verifier::script_signature` for the rules.
+    ///   - Type arguments refer to a non-existent type.
+    ///   - Arguments (senders included) fail to deserialize or fail to match the signature of the
+    ///     script function.
+    ///
+    /// If any other error occurs during execution, the Move VM MUST propagate that error back to
+    /// the caller.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_script(
+        &mut self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        self.runtime.execute_script(
+            script,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+        )
+    }
+
+    /// Publish the given module.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    ///   - The module fails to deserialize or verify.
+    ///   - The sender address does not match that of the module.
+    ///
+    /// The Move VM should not be able to produce other user errors.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module(
+        &mut self,
+        module: Vec<u8>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.publish_module_bundle(vec![module], sender, gas_meter)
+    }
+
+    /// Publish a series of modules.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    /// any module fails to deserialize or verify (see the full list of  failing conditions in the
+    /// `publish_module` API). The publishing of the module series is an all-or-nothing action:
+    /// either all modules are published to the data store or none is.
+    ///
+    /// Similar to the `publish_module` API, the Move VM should not be able to produce other user
+    /// errors. Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module_bundle(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime
+            .publish_module_bundle(modules, sender, &mut self.data_cache, gas_meter)
+    }
+
+    pub fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        self.data_cache.num_mutated_accounts(sender)
+    }
+
+    /// Finish up the session and produce the side effects.
+    ///
+    /// This function should always succeed with no user errors returned, barring invariant violations.
+    ///
+    /// This MUST NOT be called if there is a previous invocation that failed with an invariant violation.
+    pub fn finish(self) -> (VMResult<(ChangeSet, Vec<Event>)>, S) {
+        let (res, remote) = self.data_cache.into_effects();
+        (res.map_err(|e| e.finish(Location::Undefined)), remote)
+    }
+
+    /// Same like `finish`, but also extracts the native context extensions from the session.
+    pub fn finish_with_extensions(
+        self,
+    ) -> (
+        VMResult<(ChangeSet, Vec<Event>, NativeContextExtensions<'r>)>,
+        S,
+    ) {
+        let Session {
+            data_cache,
+            native_extensions,
+            ..
+        } = self;
+        let (res, remote) = data_cache.into_effects();
+        (
+            res.map(|(change_set, events)| (change_set, events, native_extensions))
+                .map_err(|e| e.finish(Location::Undefined)),
+            remote,
+        )
+    }
+
+    /// Load a script and all of its types into cache
+    pub fn load_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        ty_args: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, instantiation) =
+            self.runtime
+                .loader()
+                .load_script(script.borrow(), ty_args, &self.data_cache)?;
+        Ok(instantiation)
+    }
+
+    /// Load a module, a function, and all of its types into cache
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, _, instantiation) = self.runtime.loader().load_function(
+            module_id,
+            function_name,
+            type_arguments,
+            &self.data_cache,
+        )?;
+        Ok(instantiation)
+    }
+
+    /// Load a struct by its name to get the global index that it is referenced by within the
+    /// loader, and the loaded struct information.  This operation also ensures the defining module
+    /// is loaded from the data store and will fail if the type does not exist in that module.
+    pub fn load_struct(
+        &self,
+        module_id: &ModuleId,
+        struct_name: &IdentStr,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.runtime
+            .loader()
+            .load_struct_by_name(struct_name, module_id, &self.data_cache)
+    }
+
+    pub fn load_type(&self, type_tag: &TypeTag) -> VMResult<Type> {
+        self.runtime.loader().load_type(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_layout(&self, type_tag: &TypeTag) -> VMResult<R::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_fully_annotated_type_layout(&self, type_tag: &TypeTag) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_fully_annotated_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> VMResult<R::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_type_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn type_to_fully_annotated_layout(&self, ty: &Type) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_fully_annotated_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.runtime
+            .loader()
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Fetch a struct type from cache, if the index is in bounds
+    /// Helpful when paired with load_type, or any other API that returns 'Type'
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.runtime.loader().get_struct_type(index)
+    }
+
+    /// Gets the abilities for this type, at it's particular instantiation
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.runtime
+            .loader()
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Gets the remote resolver used by the data store
+    pub fn get_resolver(&self) -> &S {
+        self.data_cache.get_remote_resolver()
+    }
+
+    pub fn get_resolver_mut(&mut self) -> &mut S {
+        self.data_cache.get_remote_resolver_mut()
+    }
+
+    /// Gets the underlying data store
+    pub fn get_data_store(&mut self) -> &mut dyn DataStore {
+        &mut self.data_cache
+    }
+
+    /// Gets the underlying native extensions.
+    pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
+        &mut self.native_extensions
+    }
+}
+
+pub struct LoadedFunctionInstantiation {
+    pub parameters: Vec<Type>,
+    pub return_: Vec<Type>,
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/tracing.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/tracing.rs
new file mode 100644
index 000000000..b016879c9
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/tracing.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::debug::DebugContext;
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use ::{
+    move_binary_format::file_format::Bytecode,
+    move_vm_types::values::Locals,
+    once_cell::sync::Lazy,
+    std::{
+        env,
+        fs::{File, OpenOptions},
+        io::Write,
+        process,
+        sync::Mutex,
+        thread,
+    },
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_STEPPING_ENV_VAR_NAME: &str = "MOVE_VM_STEP";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static FILE_PATH: Lazy<String> = Lazy::new(|| {
+    env::var(MOVE_VM_TRACING_ENV_VAR_NAME).unwrap_or_else(|_| "move_vm_trace.trace".to_string())
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static TRACING_ENABLED: Lazy<bool> = Lazy::new(|| env::var(MOVE_VM_TRACING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUGGING_ENABLED: Lazy<bool> =
+    Lazy::new(|| env::var(MOVE_VM_STEPPING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
+    Mutex::new(
+        OpenOptions::new()
+            .write(true)
+            .create(true)
+            .append(true)
+            .open(&*FILE_PATH)
+            .unwrap(),
+    )
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUG_CONTEXT: Lazy<Mutex<DebugContext>> = Lazy::new(|| Mutex::new(DebugContext::new()));
+
+// Only include in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+pub(crate) fn trace(
+    function_desc: &Function,
+    locals: &Locals,
+    pc: u16,
+    instr: &Bytecode,
+    loader: &Loader,
+    interp: &Interpreter,
+) {
+    if *TRACING_ENABLED {
+        let f = &mut *LOGGING_FILE.lock().unwrap();
+        writeln!(
+            f,
+            "{}-{:?},{},{},{:?}",
+            process::id(),
+            thread::current().id(),
+            function_desc.pretty_string(),
+            pc,
+            instr,
+        )
+        .unwrap();
+    }
+    if *DEBUGGING_ENABLED {
+        DEBUG_CONTEXT
+            .lock()
+            .unwrap()
+            .debug_loop(function_desc, locals, pc, instr, loader, interp);
+    }
+}
+
+#[macro_export]
+macro_rules! trace {
+    ($function_desc:expr, $locals:expr, $pc:expr, $instr:tt, $resolver:expr, $interp:expr) => {
+        // Only include this code in debug releases
+        #[cfg(any(debug_assertions, feature = "debugging"))]
+        $crate::tracing::trace(
+            &$function_desc,
+            $locals,
+            $pc,
+            &$instr,
+            $resolver.loader(),
+            $interp,
+        )
+    };
+}
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/mod.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/mod.rs
new file mode 100644
index 000000000..d42522a38
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod vm_arguments_tests;
diff --git a/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs b/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
new file mode 100644
index 000000000..1daed1961
--- /dev/null
+++ b/vendors/move/move-execution/v0/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
@@ -0,0 +1,855 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+
+use crate::move_vm::MoveVM;
+use move_binary_format::{
+    errors::{VMError, VMResult},
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex, Bytecode, CodeUnit, CompiledModule,
+        CompiledScript, FieldDefinition, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+        IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
+        TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+    u256::U256,
+    value::{serialize_values, MoveValue},
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+// make a script with a given signature for main.
+fn make_script(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+// make a script with an external function that has the same signature as
+// the main. That allows us to pass resources and make the verifier happy that
+// they are consumed.
+// Dependencies check happens after main signature check, so we should expect
+// a signature check error.
+fn make_script_with_non_linking_structs(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("one").unwrap(),
+            Identifier::new("two").unwrap(),
+            Identifier::new("three").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+fn make_module_with_function(
+    visibility: Visibility,
+    is_entry: bool,
+    parameters: Signature,
+    return_: Signature,
+    type_parameters: Vec<AbilitySet>,
+) -> (CompiledModule, Identifier) {
+    let function_name = Identifier::new("foo").unwrap();
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let return_idx = match signatures.iter().enumerate().find(|(_, s)| *s == &return_) {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(return_);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let module = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: parameters_idx,
+            return_: return_idx,
+            type_parameters,
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("M").unwrap(),
+            Identifier::new("X").unwrap(),
+            function_name.clone(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(1),
+                signature: TypeSignature(SignatureToken::Bool),
+            }]),
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility,
+            is_entry,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+            }),
+        }],
+    };
+    (module, function_name)
+}
+
+// make a script function with a given signature for main.
+fn make_script_function(signature: Signature) -> (CompiledModule, Identifier) {
+    make_module_with_function(
+        Visibility::Public,
+        true,
+        signature,
+        Signature(vec![]),
+        vec![],
+    )
+}
+
+struct RemoteStore {
+    modules: HashMap<ModuleId, Vec<u8>>,
+}
+
+impl RemoteStore {
+    fn new() -> Self {
+        Self {
+            modules: HashMap::new(),
+        }
+    }
+
+    fn add_module(&mut self, compiled_module: CompiledModule) {
+        let id = compiled_module.self_id();
+        let mut bytes = vec![];
+        compiled_module.serialize(&mut bytes).unwrap();
+        self.modules.insert(id, bytes);
+    }
+}
+
+impl LinkageResolver for RemoteStore {
+    type Error = VMError;
+}
+
+impl ModuleResolver for RemoteStore {
+    type Error = VMError;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(self.modules.get(module_id).cloned())
+    }
+}
+
+impl ResourceResolver for RemoteStore {
+    type Error = VMError;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(None)
+    }
+}
+
+fn combine_signers_and_args(
+    signers: Vec<AccountAddress>,
+    non_signer_args: Vec<Vec<u8>>,
+) -> Vec<Vec<u8>> {
+    signers
+        .into_iter()
+        .map(|s| MoveValue::Signer(s).simple_serialize().unwrap())
+        .chain(non_signer_args)
+        .collect()
+}
+
+fn call_script_with_args_ty_args_signers(
+    script: Vec<u8>,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session
+        .execute_script(
+            script,
+            ty_args,
+            combine_signers_and_args(signers, non_signer_args),
+            &mut UnmeteredGasMeter,
+        )
+        .map(|_| ())
+}
+
+fn call_script(script: Vec<u8>, args: Vec<Vec<u8>>) -> VMResult<()> {
+    call_script_with_args_ty_args_signers(script, args, vec![], vec![])
+}
+
+fn call_script_function_with_args_ty_args_signers(
+    module: CompiledModule,
+    function_name: Identifier,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let id = module.self_id();
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session.execute_function_bypass_visibility(
+        &id,
+        function_name.as_ident_str(),
+        ty_args,
+        combine_signers_and_args(signers, non_signer_args),
+        &mut UnmeteredGasMeter,
+    )?;
+    Ok(())
+}
+
+fn call_script_function(
+    module: CompiledModule,
+    function_name: Identifier,
+    args: Vec<Vec<u8>>,
+) -> VMResult<()> {
+    call_script_function_with_args_ty_args_signers(module, function_name, args, vec![], vec![])
+}
+
+// these signatures used to be bad, but there are no bad signatures for scripts at the VM
+fn deprecated_bad_signatures() -> Vec<Signature> {
+    vec![
+        // struct in signature
+        Signature(vec![SignatureToken::Struct(StructHandleIndex(0))]),
+        // struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Struct(StructHandleIndex(0)),
+            SignatureToken::U64,
+        ]),
+        // reference to struct in signature
+        Signature(vec![
+            SignatureToken::Address,
+            SignatureToken::MutableReference(Box::new(SignatureToken::Struct(StructHandleIndex(
+                0,
+            )))),
+        ]),
+        // vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+            SignatureToken::U64,
+        ]),
+        // vector of vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                SignatureToken::Struct(StructHandleIndex(0)),
+            )))),
+            SignatureToken::U64,
+        ]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+        ))]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U64,
+        ))]),
+        // `&Signer` in signature (not `Signer`)
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // vector of `Signer` in signature
+        Signature(vec![SignatureToken::Vector(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // `Signer` ref not first arg
+        Signature(vec![SignatureToken::Bool, SignatureToken::Signer]),
+    ]
+}
+
+fn good_signatures_and_arguments() -> Vec<(Signature, Vec<MoveValue>)> {
+    vec![
+        // U128 arg
+        (
+            Signature(vec![SignatureToken::U128]),
+            vec![MoveValue::U128(0)],
+        ),
+        // U8 arg
+        (Signature(vec![SignatureToken::U8]), vec![MoveValue::U8(0)]),
+        // U16 arg
+        (
+            Signature(vec![SignatureToken::U16]),
+            vec![MoveValue::U16(0)],
+        ),
+        // U32 arg
+        (
+            Signature(vec![SignatureToken::U32]),
+            vec![MoveValue::U32(0)],
+        ),
+        // U256 arg
+        (
+            Signature(vec![SignatureToken::U256]),
+            vec![MoveValue::U256(U256::zero())],
+        ),
+        // All constants
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(SignatureToken::Bool))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(true),
+            ])],
+        ),
+        // All constants
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+        ),
+        // vector<vector<address>>
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::Address,
+                )))),
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Vector(vec![
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                ]),
+            ],
+        ),
+        //
+        // Vector arguments
+        //
+        // empty vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // one elem vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Address(
+                AccountAddress::random(),
+            )])],
+        ),
+        // multiple elems vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+            ])],
+        ),
+        // empty vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // multiple element vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::vector_u8(vec![2, 3]),
+                MoveValue::vector_u8(vec![4, 5]),
+            ])],
+        ),
+    ]
+}
+
+fn mismatched_cases() -> Vec<(Signature, Vec<MoveValue>, StatusCode)> {
+    vec![
+        // Too few args
+        (
+            Signature(vec![SignatureToken::U64]),
+            vec![],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Too many args
+        (
+            Signature(vec![SignatureToken::Bool]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+            ],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Vec<bool> passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Bool(true)])],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u128 passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::U128(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u8 passed for vector<vector<u8>>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::U8(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+    ]
+}
+
+fn general_cases() -> Vec<(
+    Signature,
+    Vec<MoveValue>,
+    Vec<AccountAddress>,
+    Option<StatusCode>,
+)> {
+    vec![
+        // too few signers (0)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (1)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (3)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![
+                AccountAddress::random(),
+                AccountAddress::random(),
+                AccountAddress::random(),
+            ],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // correct number of signers (2)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random(), AccountAddress::random()],
+            None,
+        ),
+        // too many signers (1) in a script that expects 0 is no longer ok
+        (
+            Signature(vec![SignatureToken::U8]),
+            vec![MoveValue::U8(0)],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // signer
+        (
+            Signature(vec![
+                SignatureToken::Signer,
+                SignatureToken::Bool,
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+            vec![AccountAddress::random()],
+            None,
+        ),
+    ]
+}
+
+#[test]
+fn check_script() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let script = make_script_with_non_linking_structs(signature);
+        let status = call_script(script, serialize_values(&dummy_args))
+            .err()
+            .unwrap()
+            .major_status();
+        assert_eq!(status, StatusCode::LINKER_ERROR);
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let script = make_script(signature);
+        assert_eq!(
+            call_script_with_args_ty_args_signers(script, serialize_values(&args), vec![], signers)
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        );
+    }
+}
+
+#[test]
+fn check_script_function() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let (module, function_name) = make_script_function(signature);
+        let res = call_script_function(module, function_name, serialize_values(&dummy_args))
+            .err()
+            .unwrap();
+        // either the dummy arg matches so abort, or it fails to match
+        // but the important thing is that the signature was accepted
+        assert!(
+            res.major_status() == StatusCode::ABORTED
+                || res.major_status() == StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+        )
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function_with_args_ty_args_signers(
+                module,
+                function_name,
+                serialize_values(&args),
+                vec![],
+                signers
+            )
+            .err()
+            .unwrap()
+            .major_status(),
+            expected_status
+        );
+    }
+
+    //
+    // Non script visible
+    // DEPRECATED this check must now be done by the adapter
+    //
+    // public
+    let (module, function_name) = make_module_with_function(
+        Visibility::Public,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+    // private
+    let (module, function_name) = make_module_with_function(
+        Visibility::Private,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+}
+
+#[test]
+fn call_missing_item() {
+    let module = empty_module();
+    let id = &module.self_id();
+    let function_name = IdentStr::new("foo").unwrap();
+    // mising module
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(error.major_status(), StatusCode::LINKER_ERROR);
+    assert_eq!(error.status_type(), StatusType::Verification);
+    drop(session);
+
+    // missing function
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(
+        error.major_status(),
+        StatusCode::FUNCTION_RESOLUTION_FAILURE
+    );
+    assert_eq!(error.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/Cargo.toml b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/Cargo.toml
new file mode 100644
index 000000000..5f2f42155
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "move-bytecode-verifier-v1"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Move bytecode verifier"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+petgraph.workspace = true
+
+move-borrow-graph.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-abstract-stack.workspace = true
+
+[dev-dependencies]
+hex-literal.workspace = true
+invalid-mutations.workspace = true
+
+[features]
+default = []
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/README.md b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/README.md
new file mode 100644
index 000000000..f6e3fdeae
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/README.md
@@ -0,0 +1,82 @@
+---
+id: bytecode-verifier
+title: Bytecode Verifier
+custom_edit_url: https://github.com/move-language/move/edit/main/language/move-bytecode-verifier/README.md
+---
+
+
+## Overview
+
+The bytecode verifier contains a static analysis tool for rejecting invalid Move bytecode. It checks the safety of stack usage, types, resources, and references.
+
+The body of each function in a compiled module is verified separately while trusting the correctness of function signatures in the module. Checking that each function signature matches its definition is a separate responsibility. The body of a function is a sequence of bytecode instructions. This instruction sequence is checked in several phases described below.
+
+## CFG Construction
+
+A control-flow graph is constructed by decomposing the instruction sequence into a collection of basic blocks. Each basic block contains a contiguous sequence of instructions; the set of all instructions is partitioned among the blocks. Each block ends with a branch or return instruction. The decomposition into blocks guarantees that branch targets land only at the beginning of some block. The decomposition also attempts to ensure that the generated blocks are maximal. However, the soundness of the analysis does not depend on maximality.
+
+## Stack Safety
+
+The execution of a block happens in the context of a stack and an array of local variables. The parameters of the function are a prefix of the array of local variables. Arguments and return values are passed across function calls via the stack. When a function starts executing, its arguments are already loaded into its parameters. Suppose the stack height is *n* when a function starts executing; then valid bytecode must enforce the invariant that when execution lands at the beginning of a basic block, the stack height is *n*. Furthermore, at a return instruction, the stack height must be *n*+*k* where *k*, s.t. *k*>=0 is the number of return values. The first phase of the analysis checks that this invariant is maintained by analyzing each block separately, calculating the effect of each instruction in the block on the stack height, checking that the height does not go below *n*, and that is left either at *n* or *n*+*k* (depending on the final instruction of the block and the return type of the function) at the end of the block.
+
+## Type Safety
+
+The second phase of the analysis checks that each operation, primitive or defined function, is invoked with arguments of appropriate types. The operands of an operation are values located either in a local variable or on the stack. The types of local variables of a function are already provided in the bytecode. However, the types of stack values are inferred. This inference and the type checking of each operation can be done separately for each block. Since the stack height at the beginning of each block is *n* and does not go below *n* during the execution of the block, we only need to model the suffix of the stack starting at *n* for type checking the block instructions. We model this suffix using a stack of types on which types are pushed and popped as the instruction stream in a block is processed. Only the type stack and the statically-known types of local variables are needed to type check each instruction.
+
+## Resource Safety
+
+Resources represent the assets of the blockchain. As such, there are certain restrictions on these types that do not apply to normal values. Intuitively, resource values cannot be copied and must be used by the end of the transaction (this means that they are moved to global storage or destroyed). Concretely, the following restrictions apply:
+
+* `CopyLoc` and `StLoc` require that the type of local is not of resource kind.
+* `WriteRef`, `Eq`, and `Neq` require that the type of the reference is not of resource kind.
+* At the end of a function (when `Ret` is reached), no local whose type is of resource kind must be empty, i.e., the value must have been moved out of the local.
+
+As mentioned above, this last rule around `Ret` implies that the resource *must* have been either:
+
+* Moved to global storage via `MoveTo`.
+* Destroyed via `Unpack`.
+
+Both `MoveTo` and `Unpack` are internal to the module in which the resource is declared.
+
+## Reference Safety
+
+References are first-class in the bytecode language. Fresh references become available to a function in several ways:
+
+* Inputing parameters.
+* Taking the address of the value in a local variable.
+* Taking the address of the globally published value in an address.
+* Taking the address of a field from a reference to the containing struct.
+* Returning value from a function.
+
+The goal of reference safety checking is to ensure that there are no dangling references. Here are some examples of dangling references:
+
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then moved.
+* Local variable `y` contains a reference to the value in a local variable `x`; `x` is then bound to a new value.
+* Reference is taken to a local variable that has not been initialized.
+* Reference to a value in a local variable is returned from a function.
+* Reference `r` is taken to a globally published value `v`; `v` is then unpublished.
+
+References can be either exclusive or shared; the latter allow read-only access. A secondary goal of reference safety checking is to ensure that in the execution context of the bytecode program, including the entire evaluation stack and all function frames, if there are two distinct storage locations containing references `r1` and `r2` such that `r2` extends `r1`, then both of the following conditions hold:
+
+* If `r1` is tagged as exclusive, then it must be inactive, i.e. it is impossible to reach a control location where `r1` is dereferenced or mutated.
+* If `r1` is shared, then `r2` is shared.
+
+The two conditions above establish the property of referential transparency, important for scalable program verification, which looks roughly as follows: consider the piece of code `v1 = *r; S; v2 = *r`, where `S` is an arbitrary computation that does not perform any write through the syntactic reference `r` (and no writes to any `r'` that extends `r`). Then `v1 == v2`.
+
+### Analysis Setup
+
+The reference safety analysis is set up as a flow analysis (or abstract interpretation). An abstract state is defined for abstractly executing the code of a basic block. A map is maintained from basic blocks to abstract states. Given an abstract state *S* at the beginning of a basic block *B*, the abstract execution of *B* results in state *S'*. This state *S'* is propagated to all successors of *B* and recorded in the map. If a state already existed for a block, the freshly propagated state is “joined” with the existing state. If the join fails an error is reported. If the join succeeds but the abstract state remains unchanged, no further propagation is done. Otherwise, the state is updated and propagated again through the block. An error may also be reported when an instruction is processed during the propagation of abstract state through a block.
+
+**Errors.** As mentioned earlier, an error is reported by the checker in one of the following situations:
+
+* An instruction cannot be proven to be safe during the propagation of the abstract state through a block.
+* Join of abstract states propagated via different incoming edges into a block fails.
+
+## How is this module organized?
+
+```text
+*
+├── invalid-mutations  # Library used by proptests
+├── src                # Core bytecode verifier files
+├── tests              # Proptests
+```
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/ability_field_requirements.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/ability_field_requirements.rs
new file mode 100644
index 000000000..4480800c7
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/ability_field_requirements.rs
@@ -0,0 +1,52 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that all of the struct's fields satisfy the
+//! abilities required by the struct's abilities
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{AbilitySet, CompiledModule, StructFieldInformation, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    let view = BinaryIndexedView::Module(module);
+    for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+        let sh = module.struct_handle_at(struct_def.struct_handle);
+        let fields = match &struct_def.field_information {
+            StructFieldInformation::Native => continue,
+            StructFieldInformation::Declared(fields) => fields,
+        };
+        let required_abilities = sh
+            .abilities
+            .into_iter()
+            .map(|a| a.requires())
+            .fold(AbilitySet::EMPTY, |acc, required| acc | required);
+        // Assume type parameters have all abilities, as the struct's abilities will be dependent on
+        // them
+        let type_parameter_abilities = sh
+            .type_parameters
+            .iter()
+            .map(|_| AbilitySet::ALL)
+            .collect::<Vec<_>>();
+        for field in fields {
+            let field_abilities = view.abilities(&field.signature.0, &type_parameter_abilities)?;
+            if !required_abilities.is_subset(field_abilities) {
+                return Err(verification_error(
+                    StatusCode::FIELD_MISSING_TYPE_ABILITY,
+                    IndexKind::StructDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/absint.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/absint.rs
new file mode 100644
index 000000000..6cd169a4b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/absint.rs
@@ -0,0 +1,158 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::meter::{
+    Meter, Scope, ANALYZE_FUNCTION_BASE_COST, EXECUTE_BLOCK_BASE_COST, PER_BACKEDGE_COST,
+    PER_SUCCESSOR_COST,
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::PartialVMResult,
+    file_format::{Bytecode, CodeOffset},
+};
+use std::collections::BTreeMap;
+
+/// Trait for finite-height abstract domains. Infinite height domains would require a more complex
+/// trait with widening and a partial order.
+pub trait AbstractDomain: Clone + Sized {
+    fn join(&mut self, other: &Self, meter: &mut impl Meter) -> PartialVMResult<JoinResult>;
+}
+
+#[derive(Debug)]
+pub enum JoinResult {
+    Changed,
+    Unchanged,
+}
+
+#[allow(dead_code)]
+#[derive(Clone)]
+pub struct BlockInvariant<State> {
+    /// Precondition of the block
+    pre: State,
+}
+
+/// A map from block id's to the pre/post of each block after a fixed point is reached.
+#[allow(dead_code)]
+pub type InvariantMap<State> = BTreeMap<BlockId, BlockInvariant<State>>;
+
+/// Take a pre-state + instruction and mutate it to produce a post-state
+/// Auxiliary data can be stored in self.
+pub trait TransferFunctions {
+    type State: AbstractDomain;
+    type Error;
+
+    /// Execute local@instr found at index local@index in the current basic block from pre-state
+    /// local@pre.
+    /// Should return an AnalysisError if executing the instruction is unsuccessful, and () if
+    /// the effects of successfully executing local@instr have been reflected by mutatating
+    /// local@pre.
+    /// Auxilary data from the analysis that is not part of the abstract state can be collected by
+    /// mutating local@self.
+    /// The last instruction index in the current block is local@last_index. Knowing this
+    /// information allows clients to detect the end of a basic block and special-case appropriately
+    /// (e.g., normalizing the abstract state before a join).
+    fn execute(
+        &mut self,
+        pre: &mut Self::State,
+        instr: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()>;
+}
+
+pub trait AbstractInterpreter: TransferFunctions {
+    /// Analyze procedure local@function_view starting from pre-state local@initial_state.
+    fn analyze_function(
+        &mut self,
+        initial_state: Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ANALYZE_FUNCTION_BASE_COST)?;
+        let mut inv_map = InvariantMap::new();
+        let entry_block_id = function_view.cfg().entry_block_id();
+        let mut next_block = Some(entry_block_id);
+        inv_map.insert(entry_block_id, BlockInvariant { pre: initial_state });
+
+        while let Some(block_id) = next_block {
+            let block_invariant = match inv_map.get_mut(&block_id) {
+                Some(invariant) => invariant,
+                None => {
+                    // This can only happen when all predecessors have errors,
+                    // so skip the block and move on to the next one
+                    next_block = function_view.cfg().next_block(block_id);
+                    continue;
+                }
+            };
+
+            let pre_state = &block_invariant.pre;
+            // Note: this will stop analysis after the first error occurs, to avoid the risk of
+            // subsequent crashes
+            let post_state = self.execute_block(block_id, pre_state, function_view, meter)?;
+
+            let mut next_block_candidate = function_view.cfg().next_block(block_id);
+            // propagate postcondition of this block to successor blocks
+            for successor_block_id in function_view.cfg().successors(block_id) {
+                meter.add(Scope::Function, PER_SUCCESSOR_COST)?;
+                match inv_map.get_mut(successor_block_id) {
+                    Some(next_block_invariant) => {
+                        let join_result = {
+                            let old_pre = &mut next_block_invariant.pre;
+                            old_pre.join(&post_state, meter)
+                        }?;
+                        match join_result {
+                            JoinResult::Unchanged => {
+                                // Pre is the same after join. Reanalyzing this block would produce
+                                // the same post
+                            }
+                            JoinResult::Changed => {
+                                // If the cur->successor is a back edge, jump back to the beginning
+                                // of the loop, instead of the normal next block
+                                if function_view
+                                    .cfg()
+                                    .is_back_edge(block_id, *successor_block_id)
+                                {
+                                    meter.add(Scope::Function, PER_BACKEDGE_COST)?;
+                                    next_block_candidate = Some(*successor_block_id);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    None => {
+                        // Haven't visited the next block yet. Use the post of the current block as
+                        // its pre
+                        inv_map.insert(
+                            *successor_block_id,
+                            BlockInvariant {
+                                pre: post_state.clone(),
+                            },
+                        );
+                    }
+                }
+            }
+            next_block = next_block_candidate;
+        }
+        Ok(())
+    }
+
+    fn execute_block(
+        &mut self,
+        block_id: BlockId,
+        pre_state: &Self::State,
+        function_view: &FunctionView,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Self::State> {
+        meter.add(Scope::Function, EXECUTE_BLOCK_BASE_COST)?;
+        let mut state_acc = pre_state.clone();
+        let block_end = function_view.cfg().block_end(block_id);
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &function_view.code().code[offset as usize];
+            self.execute(&mut state_acc, instr, offset, block_end, meter)?
+        }
+        Ok(state_acc)
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/acquires_list_verifier.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/acquires_list_verifier.rs
new file mode 100644
index 000000000..9bad9e573
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/acquires_list_verifier.rs
@@ -0,0 +1,226 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying properties about the acquires list on function
+//! definitions. Function definitions must annotate the global resources (declared in that module)
+//! accesssed by `BorrowGlobal`, `MoveFrom`, and any transitive function calls
+//! The list of acquired resources (stored in `FunctionDefinition`'s `acquires_global_resources`
+//! field) must have:
+//! - No duplicate resources (checked by `check_duplication`)
+//! - No missing resources (any resource acquired must be present)
+//! - No additional resources (no extraneous resources not actually acquired)
+
+use std::collections::{BTreeSet, HashMap};
+
+use crate::meter::Meter;
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, CompiledModule, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandle, FunctionHandleIndex, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) struct AcquiresVerifier<'a> {
+    module: &'a CompiledModule,
+    current_function: FunctionDefinitionIndex,
+    annotated_acquires: BTreeSet<StructDefinitionIndex>,
+    actual_acquires: BTreeSet<StructDefinitionIndex>,
+    handle_to_def: HashMap<FunctionHandleIndex, &'a FunctionDefinition>,
+}
+
+impl<'a> AcquiresVerifier<'a> {
+    pub(crate) fn verify(
+        module: &'a CompiledModule,
+        index: FunctionDefinitionIndex,
+        function_definition: &'a FunctionDefinition,
+        _meter: &mut impl Meter, // currently unused
+    ) -> PartialVMResult<()> {
+        let annotated_acquires: BTreeSet<_> = function_definition
+            .acquires_global_resources
+            .iter()
+            .cloned()
+            .collect();
+        let mut handle_to_def = HashMap::new();
+        for func_def in module.function_defs() {
+            handle_to_def.insert(func_def.function, func_def);
+        }
+        let mut verifier = Self {
+            module,
+            current_function: index,
+            annotated_acquires,
+            actual_acquires: BTreeSet::new(),
+            handle_to_def,
+        };
+
+        for (offset, instruction) in safe_unwrap!(function_definition.code.as_ref())
+            .code
+            .iter()
+            .enumerate()
+        {
+            verifier.verify_instruction(instruction, offset as CodeOffset)?
+        }
+
+        for annotation in verifier.annotated_acquires {
+            if !verifier.actual_acquires.contains(&annotation) {
+                return Err(PartialVMError::new(
+                    StatusCode::EXTRANEOUS_ACQUIRES_ANNOTATION,
+                ));
+            }
+
+            let struct_def = safe_unwrap!(module.struct_defs().get(annotation.0 as usize));
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            if !struct_handle.abilities.has_key() {
+                return Err(PartialVMError::new(StatusCode::INVALID_ACQUIRES_ANNOTATION));
+            }
+        }
+
+        Ok(())
+    }
+
+    fn verify_instruction(
+        &mut self,
+        instruction: &Bytecode,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::Call(idx) => self.call_acquire(*idx, offset),
+            Bytecode::CallGeneric(idx) => {
+                let fi = self.module.function_instantiation_at(*idx);
+                self.call_acquire(fi.handle, offset)
+            }
+            Bytecode::MoveFrom(idx)
+            | Bytecode::MutBorrowGlobal(idx)
+            | Bytecode::ImmBorrowGlobal(idx) => self.struct_acquire(*idx, offset),
+            Bytecode::MoveFromGeneric(idx)
+            | Bytecode::MutBorrowGlobalGeneric(idx)
+            | Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                let si = self.module.struct_instantiation_at(*idx);
+                self.struct_acquire(si.def, offset)
+            }
+
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::Abort
+            | Bytecode::Branch(_)
+            | Bytecode::Nop
+            | Bytecode::Ret
+            | Bytecode::StLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdConst(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Not
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::VecPack(..)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(..)
+            | Bytecode::VecSwap(_) => Ok(()),
+        }
+    }
+
+    fn call_acquire(
+        &mut self,
+        fh_idx: FunctionHandleIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.module.function_handle_at(fh_idx);
+        let mut function_acquired_resources =
+            self.function_acquired_resources(function_handle, fh_idx);
+        for acquired_resource in &function_acquired_resources {
+            if !self.annotated_acquires.contains(acquired_resource) {
+                return Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset));
+            }
+        }
+        self.actual_acquires
+            .append(&mut function_acquired_resources);
+        Ok(())
+    }
+
+    fn struct_acquire(
+        &mut self,
+        sd_idx: StructDefinitionIndex,
+        offset: CodeOffset,
+    ) -> PartialVMResult<()> {
+        if self.annotated_acquires.contains(&sd_idx) {
+            self.actual_acquires.insert(sd_idx);
+            Ok(())
+        } else {
+            Err(self.error(StatusCode::MISSING_ACQUIRES_ANNOTATION, offset))
+        }
+    }
+
+    fn function_acquired_resources(
+        &self,
+        function_handle: &FunctionHandle,
+        fh_idx: FunctionHandleIndex,
+    ) -> BTreeSet<StructDefinitionIndex> {
+        if function_handle.module != self.module.self_handle_idx() {
+            return BTreeSet::new();
+        }
+        match self.handle_to_def.get(&fh_idx) {
+            Some(func_def) => func_def.acquires_global_resources.iter().cloned().collect(),
+            None => BTreeSet::new(),
+        }
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/check_duplication.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/check_duplication.rs
new file mode 100644
index 000000000..0847657f7
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/check_duplication.rs
@@ -0,0 +1,328 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that each vector in a CompiledModule contains
+//! distinct values. Successful verification implies that an index in vector can be used to
+//! uniquely name the entry at that index. Additionally, the checker also verifies the
+//! following:
+//! - struct and field definitions are consistent
+//! - the handles in struct and function definitions point to the self module index
+//! - all struct and function handles pointing to the self module index have a definition
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, Constant, FunctionHandle, FunctionHandleIndex,
+        FunctionInstantiation, ModuleHandle, Signature, StructFieldInformation, StructHandle,
+        StructHandleIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use std::{collections::HashSet, hash::Hash};
+
+pub struct DuplicationChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> DuplicationChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        Self::check_identifiers(module.identifiers())?;
+        Self::check_address_identifiers(module.address_identifiers())?;
+        Self::check_constants(module.constant_pool())?;
+        Self::check_signatures(module.signatures())?;
+        Self::check_module_handles(module.module_handles())?;
+        Self::check_module_handles(module.friend_decls())?;
+        Self::check_struct_handles(module.struct_handles())?;
+        Self::check_function_handles(module.function_handles())?;
+        Self::check_function_instantiations(module.function_instantiations())?;
+
+        let checker = Self { module };
+        checker.check_field_handles()?;
+        checker.check_field_instantiations()?;
+        checker.check_function_defintions()?;
+        checker.check_struct_definitions()?;
+        checker.check_struct_instantiations()
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        Self::check_identifiers(script.identifiers())?;
+        Self::check_address_identifiers(script.address_identifiers())?;
+        Self::check_constants(script.constant_pool())?;
+        Self::check_signatures(script.signatures())?;
+        Self::check_module_handles(script.module_handles())?;
+        Self::check_struct_handles(script.struct_handles())?;
+        Self::check_function_handles(script.function_handles())?;
+        Self::check_function_instantiations(script.function_instantiations())
+    }
+
+    fn check_identifiers(identifiers: &[Identifier]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Identifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_address_identifiers(address_identifiers: &[AccountAddress]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(address_identifiers) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::AddressIdentifier,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_constants(constant_pool: &[Constant]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(constant_pool) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ConstantPool,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_signatures(signatures: &[Signature]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(signatures) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::Signature,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_module_handles(module_handles: &[ModuleHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(module_handles) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::ModuleHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // StructHandles - module and name define uniqueness
+    fn check_struct_handles(struct_handles: &[StructHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(struct_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_function_instantiations(
+        function_instantiations: &[FunctionInstantiation],
+    ) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_instantiations) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    // FunctionHandles - module and name define uniqueness
+    fn check_function_handles(function_handles: &[FunctionHandle]) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(function_handles.iter().map(|x| (x.module, x.name))) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    //
+    // Module only code
+    //
+
+    fn check_field_handles(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.field_handles()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldHandle,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_struct_instantiations(&self) -> PartialVMResult<()> {
+        match Self::first_duplicate_element(self.module.struct_instantiations()) {
+            Some(idx) => Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefInstantiation,
+                idx,
+            )),
+            None => Ok(()),
+        }
+    }
+
+    fn check_field_instantiations(&self) -> PartialVMResult<()> {
+        if let Some(idx) = Self::first_duplicate_element(self.module.field_instantiations()) {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FieldInstantiation,
+                idx,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_struct_definitions(&self) -> PartialVMResult<()> {
+        // StructDefinition - contained StructHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.struct_defs().iter().map(|x| x.struct_handle))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::StructDefinition,
+                idx,
+            ));
+        }
+        // Field names in structs must be unique
+        for (struct_idx, struct_def) in self.module.struct_defs().iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            if fields.is_empty() {
+                return Err(verification_error(
+                    StatusCode::ZERO_SIZED_STRUCT,
+                    IndexKind::StructDefinition,
+                    struct_idx as TableIndex,
+                ));
+            }
+            if let Some(idx) = Self::first_duplicate_element(fields.iter().map(|x| x.name)) {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ELEMENT,
+                    IndexKind::FieldDefinition,
+                    idx,
+                ));
+            }
+        }
+        // Check that each struct definition is pointing to the self module
+        if let Some(idx) = self.module.struct_defs().iter().position(|x| {
+            self.module.struct_handle_at(x.struct_handle).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::StructDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each struct handle in self module is implemented (has a declaration)
+        let implemented_struct_handles: HashSet<StructHandleIndex> = self
+            .module
+            .struct_defs()
+            .iter()
+            .map(|x| x.struct_handle)
+            .collect();
+        if let Some(idx) = (0..self.module.struct_handles().len()).position(|x| {
+            let y = StructHandleIndex::new(x as u16);
+            self.module.struct_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_struct_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::StructHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn check_function_defintions(&self) -> PartialVMResult<()> {
+        // FunctionDefinition - contained FunctionHandle defines uniqueness
+        if let Some(idx) =
+            Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function))
+        {
+            return Err(verification_error(
+                StatusCode::DUPLICATE_ELEMENT,
+                IndexKind::FunctionDefinition,
+                idx,
+            ));
+        }
+        // Acquires in function declarations contain unique struct definitions
+        for (idx, function_def) in self.module.function_defs().iter().enumerate() {
+            let acquires = function_def.acquires_global_resources.iter();
+            if Self::first_duplicate_element(acquires).is_some() {
+                return Err(verification_error(
+                    StatusCode::DUPLICATE_ACQUIRES_ANNOTATION,
+                    IndexKind::FunctionDefinition,
+                    idx as TableIndex,
+                ));
+            }
+        }
+        // Check that each function definition is pointing to the self module
+        if let Some(idx) = self.module.function_defs().iter().position(|x| {
+            self.module.function_handle_at(x.function).module != self.module.self_handle_idx()
+        }) {
+            return Err(verification_error(
+                StatusCode::INVALID_MODULE_HANDLE,
+                IndexKind::FunctionDefinition,
+                idx as TableIndex,
+            ));
+        }
+        // Check that each function handle in self module is implemented (has a declaration)
+        let implemented_function_handles: HashSet<FunctionHandleIndex> = self
+            .module
+            .function_defs()
+            .iter()
+            .map(|x| x.function)
+            .collect();
+        if let Some(idx) = (0..self.module.function_handles().len()).position(|x| {
+            let y = FunctionHandleIndex::new(x as u16);
+            self.module.function_handle_at(y).module == self.module.self_handle_idx()
+                && !implemented_function_handles.contains(&y)
+        }) {
+            return Err(verification_error(
+                StatusCode::UNIMPLEMENTED_HANDLE,
+                IndexKind::FunctionHandle,
+                idx as TableIndex,
+            ));
+        }
+        Ok(())
+    }
+
+    fn first_duplicate_element<T>(iter: T) -> Option<TableIndex>
+    where
+        T: IntoIterator,
+        T::Item: Eq + Hash,
+    {
+        let mut uniq = HashSet::new();
+        for (i, x) in iter.into_iter().enumerate() {
+            if !uniq.insert(x) {
+                return Some(i as TableIndex);
+            }
+        }
+        None
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/code_unit_verifier.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/code_unit_verifier.rs
new file mode 100644
index 000000000..e313c424b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/code_unit_verifier.rs
@@ -0,0 +1,197 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements the checker for verifying correctness of function bodies.
+//! The overall verification is split between stack_usage_verifier.rs and
+//! abstract_interpreter.rs. CodeUnitVerifier simply orchestrates calls into these two files.
+use crate::{
+    acquires_list_verifier::AcquiresVerifier,
+    control_flow, locals_safety,
+    meter::{Meter, Scope},
+    reference_safety,
+    stack_usage_verifier::StackUsageVerifier,
+    type_safety,
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+        IdentifierIndex, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::HashMap;
+
+pub struct CodeUnitVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+    function_view: FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> CodeUnitVerifier<'a> {
+    pub fn verify_module(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledModule,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_module_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        verifier_config: &VerifierConfig,
+        module: &CompiledModule,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        let mut name_def_map = HashMap::new();
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            let fh = module.function_handle_at(func_def.function);
+            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
+        }
+        let mut total_back_edges = 0;
+        for (idx, function_definition) in module.function_defs().iter().enumerate() {
+            let index = FunctionDefinitionIndex(idx as TableIndex);
+            let num_back_edges = Self::verify_function(
+                verifier_config,
+                index,
+                function_definition,
+                module,
+                &name_def_map,
+                meter,
+            )
+            .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
+            total_back_edges += num_back_edges;
+        }
+        if let Some(limit) = verifier_config.max_back_edges_per_module {
+            if total_back_edges > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> VMResult<()> {
+        Self::verify_script_impl(verifier_config, module, meter)
+            .map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        verifier_config: &VerifierConfig,
+        script: &'a CompiledScript,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_script(verifier_config, script)?;
+        let resolver = BinaryIndexedView::Script(script);
+        let name_def_map = HashMap::new();
+
+        if let Some(limit) = verifier_config.max_basic_blocks_in_script {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS));
+            }
+        }
+
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if function_view.cfg().num_back_edges() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+
+        //verify
+        meter.enter_scope("script", Scope::Function);
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map: &name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)
+    }
+
+    fn verify_function(
+        verifier_config: &VerifierConfig,
+        index: FunctionDefinitionIndex,
+        function_definition: &FunctionDefinition,
+        module: &CompiledModule,
+        name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<usize> {
+        meter.enter_scope(
+            module
+                .identifier_at(module.function_handle_at(function_definition.function).name)
+                .as_str(),
+            Scope::Function,
+        );
+        // nothing to verify for native function
+        let code = match &function_definition.code {
+            Some(code) => code,
+            None => return Ok(0),
+        };
+
+        // create `FunctionView` and `BinaryIndexedView`
+        let function_view = control_flow::verify_function(
+            verifier_config,
+            module,
+            index,
+            function_definition,
+            code,
+            meter,
+        )?;
+
+        if let Some(limit) = verifier_config.max_basic_blocks {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let num_back_edges = function_view.cfg().num_back_edges();
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if num_back_edges > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let resolver = BinaryIndexedView::Module(module);
+        // verify
+        let code_unit_verifier = CodeUnitVerifier {
+            resolver,
+            function_view,
+            name_def_map,
+        };
+        code_unit_verifier.verify_common(verifier_config, meter)?;
+        AcquiresVerifier::verify(module, index, function_definition, meter)?;
+
+        meter.transfer(Scope::Function, Scope::Module, 1.0)?;
+
+        Ok(num_back_edges)
+    }
+
+    fn verify_common(
+        &self,
+        verifier_config: &VerifierConfig,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        StackUsageVerifier::verify(verifier_config, &self.resolver, &self.function_view, meter)?;
+        type_safety::verify(&self.resolver, &self.function_view, meter)?;
+        locals_safety::verify(&self.resolver, &self.function_view, meter)?;
+        reference_safety::verify(
+            &self.resolver,
+            &self.function_view,
+            self.name_def_map,
+            meter,
+        )
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/constants.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/constants.rs
new file mode 100644
index 000000000..15b6afb3c
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/constants.rs
@@ -0,0 +1,64 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that
+//! - a constant's type only refers to primitive types
+//! - a constant's data serializes correctly for that type
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMResult, VMResult},
+    file_format::{CompiledModule, CompiledScript, Constant, SignatureToken, TableIndex},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    for (idx, constant) in module.constant_pool().iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+pub fn verify_script(module: &CompiledScript) -> VMResult<()> {
+    verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+}
+
+fn verify_script_impl(script: &CompiledScript) -> PartialVMResult<()> {
+    for (idx, constant) in script.constant_pool.iter().enumerate() {
+        verify_constant(idx, constant)?
+    }
+    Ok(())
+}
+
+fn verify_constant(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    verify_constant_type(idx, &constant.type_)?;
+    verify_constant_data(idx, constant)
+}
+
+fn verify_constant_type(idx: usize, type_: &SignatureToken) -> PartialVMResult<()> {
+    if type_.is_valid_for_constant() {
+        Ok(())
+    } else {
+        Err(verification_error(
+            StatusCode::INVALID_CONSTANT_TYPE,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        ))
+    }
+}
+
+fn verify_constant_data(idx: usize, constant: &Constant) -> PartialVMResult<()> {
+    match constant.deserialize_constant() {
+        Some(_) => Ok(()),
+        None => Err(verification_error(
+            StatusCode::MALFORMED_CONSTANT_DATA,
+            IndexKind::ConstantPool,
+            idx as TableIndex,
+        )),
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow.rs
new file mode 100644
index 000000000..711c314d8
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow.rs
@@ -0,0 +1,182 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements control flow checks.
+//!
+//! For bytecode versions 6 and up, the following properties are ensured:
+//! - The CFG is not empty and the last block ends in an unconditional jump, so it's not possible to
+//!   fall off the end of a function.
+//! - The CFG is reducible (and optionally max loop depth is bounded), to limit the potential for
+//!   pathologically long abstract interpretation runtimes (through poor choice of loop heads and
+//!   back edges).
+//!
+//! For bytecode versions 5 and below, delegates to `control_flow_v5`.
+use crate::{
+    control_flow_v5,
+    loop_summary::{LoopPartition, LoopSummary},
+    meter::Meter,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, CodeUnit, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+    },
+    CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::collections::BTreeSet;
+
+/// Perform control flow verification on the compiled function, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_function<'a>(
+    verifier_config: &'a VerifierConfig,
+    module: &'a CompiledModule,
+    index: FunctionDefinitionIndex,
+    function_definition: &'a FunctionDefinition,
+    code: &'a CodeUnit,
+    _meter: &mut impl Meter, // TODO: metering
+) -> PartialVMResult<FunctionView<'a>> {
+    let function_handle = module.function_handle_at(function_definition.function);
+
+    if module.version() <= 5 {
+        control_flow_v5::verify(verifier_config, Some(index), code)?;
+        Ok(FunctionView::function(module, index, code, function_handle))
+    } else {
+        verify_fallthrough(Some(index), code)?;
+        let function_view = FunctionView::function(module, index, code, function_handle);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Perform control flow verification on the compiled script, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_script<'a>(
+    verifier_config: &'a VerifierConfig,
+    script: &'a CompiledScript,
+) -> PartialVMResult<FunctionView<'a>> {
+    if script.version() <= 5 {
+        control_flow_v5::verify(verifier_config, None, &script.code)?;
+        Ok(FunctionView::script(script))
+    } else {
+        verify_fallthrough(None, &script.code)?;
+        let function_view = FunctionView::script(script);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Check to make sure that the bytecode vector is non-empty and ends with a branching instruction.
+fn verify_fallthrough(
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+    match code.code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+/// Test that `function_view`'s control-flow graph is reducible using Tarjan's algorithm [1].
+/// Optionally test loop depth bounded by `verifier_config.max_loop_depth`.
+///
+/// A CFG, `G`, with starting block `s` is reducible if and only if [2] any of the following
+/// equivalent properties hold:
+///
+///  1. G has a unique set of back-edges `u -> v` where `v` dominates `u`, that corresponds to the
+///     set of back-edges for any depth-first spanning tree of G.
+///
+///  2. Every loop in G contains a unique node `h` (the "head") which dominates all other nodes in
+///     the loop.
+///
+///  3. G has a unique maximal (in terms of number of edges) acyclic sub-graph.
+///
+///  4. G can be reduced to a CFG containing just `s` through a sequence of the following two
+///     operations:
+///      a. Delete a cyclic edge `v -> v`
+///      b. For an edge `e: u -> v` where `e` is the only incident edge to `v`, collapse `v` into `u`
+///         by deleting `e` and `v` and replacing all `v -> w` edges with `u -> w` edges.
+///
+/// Reducibility means that a control-flow graph can be decomposed into a series of nested loops
+/// (strongly connected subgraphs), which leads to more predictable abstract interpretation
+/// performance.
+///
+/// ## References
+///
+///  1. Tarjan, R.  1974.  Testing Flow Graph Reducibility.
+///  2. Hecht, M. S., Ullman J. D.  1974.  Characterizations of Reducible Flow Graphs.
+fn verify_reducibility<'a>(
+    verifier_config: &VerifierConfig,
+    function_view: &'a FunctionView<'a>,
+) -> PartialVMResult<()> {
+    let current_function = function_view.index().unwrap_or(FunctionDefinitionIndex(0));
+    let err = move |code: StatusCode, offset: CodeOffset| {
+        Err(PartialVMError::new(code).at_code_offset(current_function, offset))
+    };
+
+    let summary = LoopSummary::new(function_view.cfg());
+    let mut partition = LoopPartition::new(&summary);
+
+    // Iterate through nodes in reverse pre-order so more deeply nested loops (which would appear
+    // later in the pre-order) are processed first.
+    for head in summary.preorder().rev() {
+        // If a node has no back edges, it is not a loop head, so doesn't need to be processed.
+        let back = summary.back_edges(head);
+        if back.is_empty() {
+            continue;
+        }
+
+        // Collect the rest of the nodes in `head`'s loop, in `body`.  Start with the nodes that
+        // jump back to the head, and grow `body` by repeatedly following predecessor edges until
+        // `head` is found again.
+
+        let mut body = BTreeSet::new();
+        for node in back {
+            let node = partition.containing_loop(*node);
+
+            if node != head {
+                body.insert(node);
+            }
+        }
+
+        let mut frontier: Vec<_> = body.iter().copied().collect();
+        while let Some(node) = frontier.pop() {
+            for pred in summary.pred_edges(node) {
+                let pred = partition.containing_loop(*pred);
+
+                // `pred` can eventually jump back to `head`, so is part of its body.  If it is not
+                // a descendant of `head`, it implies that `head` does not dominate a node in its
+                // loop, therefore the CFG is not reducible, according to Property 1 (see doc
+                // comment).
+                if !summary.is_descendant(/* ancestor */ head, /* descendant */ pred) {
+                    return err(StatusCode::INVALID_LOOP_SPLIT, summary.block(pred));
+                }
+
+                let body_extended = pred != head && body.insert(pred);
+                if body_extended {
+                    frontier.push(pred);
+                }
+            }
+        }
+
+        // Collapse all the nodes in `body` into `head`, so it appears as one node when processing
+        // outer loops (this performs a sequence of Operation 4(b), followed by a 4(a)).
+        let depth = partition.collapse_loop(head, &body);
+        if let Some(max_depth) = verifier_config.max_loop_depth {
+            if depth as usize > max_depth {
+                return err(StatusCode::LOOP_MAX_DEPTH_REACHED, summary.block(head));
+            }
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs
new file mode 100644
index 000000000..b24d7aeca
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -0,0 +1,283 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker to verify control flow in bytecode version 5 and below. The
+//! following properties are ensured:
+//! - All forward jumps do not enter into the middle of a loop
+//! - All "breaks" (forward, loop-exiting jumps) go to the "end" of the loop
+//! - All "continues" (back jumps in a loop) are only to the current loop
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset, CodeUnit, FunctionDefinitionIndex},
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::{collections::HashSet, convert::TryInto};
+
+pub fn verify(
+    verifier_config: &VerifierConfig,
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+
+    // check fallthrough
+    verify_fallthrough(current_function, &code.code)?;
+
+    // check jumps
+    let context = &ControlFlowVerifier {
+        current_function,
+        code: &code.code,
+    };
+    let labels = instruction_labels(context);
+    check_jumps(verifier_config, context, labels)
+}
+
+fn verify_fallthrough(
+    current_function: FunctionDefinitionIndex,
+    code: &Vec<Bytecode>,
+) -> PartialVMResult<()> {
+    // Check to make sure that the bytecode vector ends with a branching instruction.
+    match code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Label {
+    Loop { last_continue: u16 },
+    Code,
+}
+
+struct ControlFlowVerifier<'a> {
+    current_function: FunctionDefinitionIndex,
+    code: &'a Vec<Bytecode>,
+}
+
+impl<'a> ControlFlowVerifier<'a> {
+    fn code(&self) -> impl Iterator<Item = (CodeOffset, &'a Bytecode)> {
+        self.code
+            .iter()
+            .enumerate()
+            .map(|(idx, instr)| (idx.try_into().unwrap(), instr))
+    }
+
+    fn labeled_code<'b: 'a>(
+        &self,
+        labels: &'b [Label],
+    ) -> impl Iterator<Item = (CodeOffset, &'a Bytecode, &'b Label)> {
+        self.code()
+            .zip(labels)
+            .map(|((i, instr), lbl)| (i, instr, lbl))
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
+
+fn instruction_labels(context: &ControlFlowVerifier) -> Vec<Label> {
+    let mut labels: Vec<Label> = (0..context.code.len()).map(|_| Label::Code).collect();
+    let mut loop_continue = |loop_idx: CodeOffset, last_continue: CodeOffset| {
+        labels[loop_idx as usize] = Label::Loop { last_continue }
+    };
+    for (i, instr) in context.code() {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(prev) | Bytecode::BrTrue(prev) | Bytecode::BrFalse(prev)
+                if is_back_edge(i, *prev) =>
+            {
+                loop_continue(*prev, i)
+            }
+            _ => (),
+        }
+    }
+    labels
+}
+
+// Ensures the invariant:
+//   - All forward jumps do not enter into the middle of a loop
+//   - All "breaks" go to the "end" of the loop
+//   - All back jumps are only to the current loop
+//   - Nested loops do not exceed a given depth
+fn check_jumps(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: Vec<Label>,
+) -> PartialVMResult<()> {
+    // All back jumps are only to the current loop
+    check_continues(context, &labels)?;
+    // All "breaks" go to the "end" of the loop
+    check_breaks(context, &labels)?;
+
+    let loop_depth = count_loop_depth(&labels);
+
+    // All forward jumps do not enter into the middle of a loop
+    check_no_loop_splits(context, &labels, &loop_depth)?;
+    // Nested loops do not exceed a given depth
+    check_loop_depth(verifier_config, context, &labels, &loop_depth)
+}
+
+fn check_code<
+    F: FnMut(&Vec<(CodeOffset, CodeOffset)>, CodeOffset, &Bytecode) -> PartialVMResult<()>,
+>(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    mut check: F,
+) -> PartialVMResult<()> {
+    let mut loop_stack: Vec<(CodeOffset, CodeOffset)> = vec![];
+    for (cur_instr, instr, label) in context.labeled_code(labels) {
+        // Add loop to stack
+        if let Label::Loop { last_continue } = label {
+            loop_stack.push((cur_instr, *last_continue));
+        }
+
+        check(&loop_stack, cur_instr, instr)?;
+
+        // Pop if last continue
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (_cur_loop_head, last_continue) = safe_unwrap!(loop_stack.last());
+                if cur_instr == *last_continue {
+                    loop_stack.pop();
+                }
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
+
+fn is_back_edge(cur_instr: CodeOffset, target_instr: CodeOffset) -> bool {
+    target_instr <= cur_instr
+}
+
+// All back jumps are only to the current loop
+fn check_continues(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (cur_loop_head, _last_continue) = safe_unwrap!(loop_stack.last());
+                if target != cur_loop_head {
+                    // Invalid back jump. Cannot back jump outside of the current loop
+                    Err(context.error(StatusCode::INVALID_LOOP_CONTINUE, cur_instr))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_breaks(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if !is_back_edge(cur_instr, *target) =>
+            {
+                match loop_stack.last() {
+                    Some((_cur_loop_head, last_continue))
+                        if target > last_continue && *target != last_continue + 1 =>
+                    {
+                        // Invalid loop break. Must break immediately to the instruction after
+                        // the last continue
+                        Err(context.error(StatusCode::INVALID_LOOP_BREAK, cur_instr))
+                    }
+                    _ => Ok(()),
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_no_loop_splits(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let is_break = |loop_stack: &Vec<(CodeOffset, CodeOffset)>, jump_target: CodeOffset| -> bool {
+        match loop_stack.last() {
+            None => false,
+            Some((_cur_loop_head, last_continue)) => jump_target > *last_continue,
+        }
+    };
+    check_code(context, labels, |loop_stack, i, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(j) | Bytecode::BrTrue(j) | Bytecode::BrFalse(j)
+                if *j > i && !is_break(loop_stack, *j) =>
+            {
+                let j = *j;
+                let before_depth = loop_depth[i as usize];
+                let after_depth = match &labels[j as usize] {
+                    Label::Loop { .. } => loop_depth[j as usize] - 1,
+                    Label::Code => loop_depth[j as usize],
+                };
+                if before_depth != after_depth {
+                    // Invalid forward jump. Entered the middle of a loop
+                    Err(context.error(StatusCode::INVALID_LOOP_SPLIT, i))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_loop_depth(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let max_depth = match verifier_config.max_loop_depth {
+        Some(depth) => depth,
+        None => return Ok(()),
+    };
+    check_code(context, labels, |_loop_stack, i, _instr| {
+        if loop_depth[i as usize] > max_depth {
+            return Err(context.error(StatusCode::LOOP_MAX_DEPTH_REACHED, i));
+        }
+        Ok(())
+    })
+}
+
+// Only called after continues are verified, so we can assume that loops are well nested
+fn count_loop_depth(labels: &[Label]) -> Vec<usize> {
+    let last_continues: HashSet<CodeOffset> = labels
+        .iter()
+        .filter_map(|label| match label {
+            Label::Loop { last_continue } => Some(*last_continue),
+            Label::Code => None,
+        })
+        .collect();
+    let mut count = 0;
+    let mut counts = vec![];
+    for (idx, label) in labels.iter().enumerate() {
+        if let Label::Loop { .. } = label {
+            count += 1
+        }
+        counts.push(count);
+        if last_continues.contains(&idx.try_into().unwrap()) {
+            count -= 1;
+        }
+    }
+    counts
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/cyclic_dependencies.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/cyclic_dependencies.rs
new file mode 100644
index 000000000..cee7aeb40
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/cyclic_dependencies.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::{language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::BTreeSet;
+
+pub fn verify_module<D>(module: &CompiledModule, imm_deps: D) -> VMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    verify_module_impl(module, imm_deps).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+/// This function performs a depth-first traversal in the module graph, starting at `module` and
+/// recursively exploring immediate dependencies.  During the DFS,
+/// - If `module.self_id()` is encountered (again), a dependency cycle is detected and an error is
+///   returned.
+/// - Otherwise terminates without an error.
+fn verify_module_impl<D>(module: &CompiledModule, imm_deps: D) -> PartialVMResult<()>
+where
+    D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+{
+    fn detect_cycles<D>(
+        target: &ModuleId,
+        cursor: &ModuleId,
+        visited: &mut BTreeSet<ModuleId>,
+        deps: &D,
+    ) -> PartialVMResult<bool>
+    where
+        D: Fn(&ModuleId) -> PartialVMResult<Vec<ModuleId>>,
+    {
+        if cursor == target {
+            return Ok(true);
+        }
+
+        if !visited.insert(cursor.clone()) {
+            for dep in deps(cursor)? {
+                if detect_cycles(target, &dep, visited, deps)? {
+                    return Ok(true);
+                }
+            }
+        }
+
+        Ok(false)
+    }
+
+    let self_id = module.self_id();
+    let mut visited = BTreeSet::new();
+    for dep in module.immediate_dependencies() {
+        if detect_cycles(&self_id, &dep, &mut visited, &imm_deps)? {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY));
+        }
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/dependencies.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/dependencies.rs
new file mode 100644
index 000000000..f24b75487
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/dependencies.rs
@@ -0,0 +1,587 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules and scripts.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, CompiledModule, CompiledScript, FunctionDefinitionIndex,
+        FunctionHandleIndex, ModuleHandleIndex, SignatureToken, StructHandleIndex,
+        StructTypeParameter, TableIndex, Visibility,
+    },
+    file_format_common::VERSION_5,
+    safe_unwrap, IndexKind,
+};
+use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode};
+use std::collections::{BTreeMap, BTreeSet};
+
+struct Context<'a, 'b> {
+    resolver: BinaryIndexedView<'a>,
+    // (Module -> CompiledModule) for (at least) all immediate dependencies
+    dependency_map: BTreeMap<ModuleId, &'b CompiledModule>,
+    // (Module::StructName -> handle) for all types of all dependencies
+    struct_id_to_handle_map: BTreeMap<(ModuleId, Identifier), StructHandleIndex>,
+    // (Module::FunctionName -> handle) for all functions that can ever be called by this
+    // module/script in all dependencies
+    func_id_to_handle_map: BTreeMap<(ModuleId, Identifier), FunctionHandleIndex>,
+    // (handle -> visibility) for all function handles found in the module being checked
+    function_visibilities: BTreeMap<FunctionHandleIndex, Visibility>,
+    // all function handles found in the module being checked that are script functions in <V5
+    // None if the current module/script >= V5
+    script_functions: Option<BTreeSet<FunctionHandleIndex>>,
+}
+
+impl<'a, 'b> Context<'a, 'b> {
+    fn module(
+        module: &'a CompiledModule,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Module(module), dependencies)
+    }
+
+    fn script(
+        script: &'a CompiledScript,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        Self::new(BinaryIndexedView::Script(script), dependencies)
+    }
+
+    fn new(
+        resolver: BinaryIndexedView<'a>,
+        dependencies: impl IntoIterator<Item = &'b CompiledModule>,
+    ) -> Self {
+        let self_module = resolver.self_id();
+        let self_module_idx = resolver.self_handle_idx();
+        let empty_defs = &vec![];
+        let self_function_defs = match &resolver {
+            BinaryIndexedView::Module(m) => m.function_defs(),
+            BinaryIndexedView::Script(_) => empty_defs,
+        };
+        let dependency_map = dependencies
+            .into_iter()
+            .filter(|d| Some(d.self_id()) != self_module)
+            .map(|d| (d.self_id(), d))
+            .collect();
+
+        let script_functions = if resolver.version() < VERSION_5 {
+            Some(BTreeSet::new())
+        } else {
+            None
+        };
+        let mut context = Self {
+            resolver,
+            dependency_map,
+            struct_id_to_handle_map: BTreeMap::new(),
+            func_id_to_handle_map: BTreeMap::new(),
+            function_visibilities: BTreeMap::new(),
+            script_functions,
+        };
+
+        let mut dependency_visibilities = BTreeMap::new();
+        for (module_id, module) in &context.dependency_map {
+            let friend_module_ids: BTreeSet<_> = module.immediate_friends().into_iter().collect();
+
+            // Module::StructName -> def handle idx
+            for struct_def in module.struct_defs() {
+                let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+                let struct_name = module.identifier_at(struct_handle.name);
+                context.struct_id_to_handle_map.insert(
+                    (module_id.clone(), struct_name.to_owned()),
+                    struct_def.struct_handle,
+                );
+            }
+            // Module::FuncName -> def handle idx
+            for func_def in module.function_defs() {
+                let func_handle = module.function_handle_at(func_def.function);
+                let func_name = module.identifier_at(func_handle.name);
+                dependency_visibilities.insert(
+                    (module_id.clone(), func_name.to_owned()),
+                    (func_def.visibility, func_def.is_entry),
+                );
+                let may_be_called = match func_def.visibility {
+                    Visibility::Public => true,
+                    Visibility::Friend => self_module
+                        .as_ref()
+                        .map_or(false, |self_id| friend_module_ids.contains(self_id)),
+                    Visibility::Private => false,
+                };
+                if may_be_called {
+                    context
+                        .func_id_to_handle_map
+                        .insert((module_id.clone(), func_name.to_owned()), func_def.function);
+                }
+            }
+        }
+
+        for function_def in self_function_defs {
+            context
+                .function_visibilities
+                .insert(function_def.function, function_def.visibility);
+            if function_def.is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(function_def.function));
+            }
+        }
+        for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+            if Some(function_handle.module) == self_module_idx {
+                continue;
+            }
+            let dep_module_id = context
+                .resolver
+                .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+            let function_name = context.resolver.identifier_at(function_handle.name);
+            let dep_file_format_version =
+                context.dependency_map.get(&dep_module_id).unwrap().version;
+            let dep_function = (dep_module_id, function_name.to_owned());
+            let (visibility, is_entry) = match dependency_visibilities.get(&dep_function) {
+                // The visibility does not need to be set here. If the function does not
+                // link, it will be reported by verify_imported_functions
+                None => continue,
+                Some(vis_entry) => *vis_entry,
+            };
+            let fhandle_idx = FunctionHandleIndex(idx as TableIndex);
+            context
+                .function_visibilities
+                .insert(fhandle_idx, visibility);
+            if dep_file_format_version < VERSION_5 && is_entry {
+                context
+                    .script_functions
+                    .as_mut()
+                    .map(|s| s.insert(fhandle_idx));
+            }
+        }
+
+        context
+    }
+}
+
+pub fn verify_module<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_module_impl(module, dependencies)
+        .map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl<'a>(
+    module: &CompiledModule,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::module(module, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+pub fn verify_script<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> VMResult<()> {
+    verify_script_impl(script, dependencies).map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_script_impl<'a>(
+    script: &CompiledScript,
+    dependencies: impl IntoIterator<Item = &'a CompiledModule>,
+) -> PartialVMResult<()> {
+    let context = &Context::script(script, dependencies);
+
+    verify_imported_modules(context)?;
+    verify_imported_structs(context)?;
+    verify_imported_functions(context)?;
+    verify_all_script_visibility_usage(context)
+}
+
+fn verify_imported_modules(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, module_handle) in context.resolver.module_handles().iter().enumerate() {
+        let module_id = context.resolver.module_id_for_handle(module_handle);
+        if Some(ModuleHandleIndex(idx as u16)) != self_module
+            && !context.dependency_map.contains_key(&module_id)
+        {
+            return Err(verification_error(
+                StatusCode::MISSING_DEPENDENCY,
+                IndexKind::ModuleHandle,
+                idx as TableIndex,
+            ));
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_structs(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, struct_handle) in context.resolver.struct_handles().iter().enumerate() {
+        if Some(struct_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(struct_handle.module));
+        // TODO: remove unwrap
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        let struct_name = context.resolver.identifier_at(struct_handle.name);
+        match context
+            .struct_id_to_handle_map
+            .get(&(owner_module_id, struct_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.struct_handle_at(*def_idx);
+                if !compatible_struct_abilities(struct_handle.abilities, def_handle.abilities)
+                    || !compatible_struct_type_parameters(
+                        &struct_handle.type_parameters,
+                        &def_handle.type_parameters,
+                    )
+                {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::StructHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::StructHandle,
+                    idx as TableIndex,
+                ))
+            }
+        }
+    }
+    Ok(())
+}
+
+fn verify_imported_functions(context: &Context) -> PartialVMResult<()> {
+    let self_module = context.resolver.self_handle_idx();
+    for (idx, function_handle) in context.resolver.function_handles().iter().enumerate() {
+        if Some(function_handle.module) == self_module {
+            continue;
+        }
+        let owner_module_id = context
+            .resolver
+            .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
+        let function_name = context.resolver.identifier_at(function_handle.name);
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
+        match context
+            .func_id_to_handle_map
+            .get(&(owner_module_id.clone(), function_name.to_owned()))
+        {
+            Some(def_idx) => {
+                let def_handle = owner_module.function_handle_at(*def_idx);
+                // compatible type parameter constraints
+                if !compatible_fun_type_parameters(
+                    &function_handle.type_parameters,
+                    &def_handle.type_parameters,
+                ) {
+                    return Err(verification_error(
+                        StatusCode::TYPE_MISMATCH,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+                // same parameters
+                let handle_params = context.resolver.signature_at(function_handle.parameters);
+                let def_params = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.parameters),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_params.0,
+                    &def_params.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+
+                // same return_
+                let handle_return = context.resolver.signature_at(function_handle.return_);
+                let def_return = match context.dependency_map.get(&owner_module_id) {
+                    Some(module) => module.signature_at(def_handle.return_),
+                    None => {
+                        return Err(verification_error(
+                            StatusCode::LOOKUP_FAILED,
+                            IndexKind::FunctionHandle,
+                            idx as TableIndex,
+                        ))
+                    }
+                };
+
+                compare_cross_module_signatures(
+                    context,
+                    &handle_return.0,
+                    &def_return.0,
+                    owner_module,
+                )
+                .map_err(|e| e.at_index(IndexKind::FunctionHandle, idx as TableIndex))?;
+            }
+            None => {
+                return Err(verification_error(
+                    StatusCode::LOOKUP_FAILED,
+                    IndexKind::FunctionHandle,
+                    idx as TableIndex,
+                ));
+            }
+        }
+    }
+    Ok(())
+}
+
+// The local view must be a subset of (or equal to) the defined set of abilities. Conceptually, the
+// local view can be more constrained than the defined one. Removing abilities locally does nothing
+// but limit the local usage.
+// (Note this works because there are no negative constraints, i.e. you cannot constrain a type
+// parameter with the absence of an ability)
+fn compatible_struct_abilities(
+    local_struct_abilities_declaration: AbilitySet,
+    defined_struct_abilities: AbilitySet,
+) -> bool {
+    local_struct_abilities_declaration.is_subset(defined_struct_abilities)
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`]
+fn compatible_fun_type_parameters(
+    local_type_parameters_declaration: &[AbilitySet],
+    defined_type_parameters: &[AbilitySet],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(
+                    local_type_parameter_constraints_declaration,
+                    defined_type_parameter_constraints,
+                )| {
+                    compatible_type_parameter_constraints(
+                        *local_type_parameter_constraints_declaration,
+                        *defined_type_parameter_constraints,
+                    )
+                },
+            )
+}
+
+// - The number of type parameters must be the same
+// - Each pair of parameters must satisfy [`compatible_type_parameter_constraints`] and [`compatible_type_parameter_phantom_decl`]
+fn compatible_struct_type_parameters(
+    local_type_parameters_declaration: &[StructTypeParameter],
+    defined_type_parameters: &[StructTypeParameter],
+) -> bool {
+    local_type_parameters_declaration.len() == defined_type_parameters.len()
+        && local_type_parameters_declaration
+            .iter()
+            .zip(defined_type_parameters)
+            .all(
+                |(local_type_parameter_declaration, defined_type_parameter)| {
+                    compatible_type_parameter_phantom_decl(
+                        local_type_parameter_declaration,
+                        defined_type_parameter,
+                    ) && compatible_type_parameter_constraints(
+                        local_type_parameter_declaration.constraints,
+                        defined_type_parameter.constraints,
+                    )
+                },
+            )
+}
+
+//  The local view of a type parameter must be a superset of (or equal to) the defined
+//  constraints. Conceptually, the local view can be more constrained than the defined one as the
+//  local context is only limiting usage, and cannot take advantage of the additional constraints.
+fn compatible_type_parameter_constraints(
+    local_type_parameter_constraints_declaration: AbilitySet,
+    defined_type_parameter_constraints: AbilitySet,
+) -> bool {
+    defined_type_parameter_constraints.is_subset(local_type_parameter_constraints_declaration)
+}
+
+// Adding phantom declarations relaxes the requirements for clients, thus, the local view may
+// lack a phantom declaration present in the definition.
+fn compatible_type_parameter_phantom_decl(
+    local_type_parameter_declaration: &StructTypeParameter,
+    defined_type_parameter: &StructTypeParameter,
+) -> bool {
+    // local_type_parameter_declaration.is_phantom => defined_type_parameter.is_phantom
+    !local_type_parameter_declaration.is_phantom || defined_type_parameter.is_phantom
+}
+
+fn compare_cross_module_signatures(
+    context: &Context,
+    handle_sig: &[SignatureToken],
+    def_sig: &[SignatureToken],
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    if handle_sig.len() != def_sig.len() {
+        return Err(PartialVMError::new(StatusCode::TYPE_MISMATCH));
+    }
+    for (handle_type, def_type) in handle_sig.iter().zip(def_sig) {
+        compare_types(context, handle_type, def_type, def_module)?;
+    }
+    Ok(())
+}
+
+fn compare_types(
+    context: &Context,
+    handle_type: &SignatureToken,
+    def_type: &SignatureToken,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    match (handle_type, def_type) {
+        (SignatureToken::Bool, SignatureToken::Bool)
+        | (SignatureToken::U8, SignatureToken::U8)
+        | (SignatureToken::U16, SignatureToken::U16)
+        | (SignatureToken::U32, SignatureToken::U32)
+        | (SignatureToken::U64, SignatureToken::U64)
+        | (SignatureToken::U128, SignatureToken::U128)
+        | (SignatureToken::U256, SignatureToken::U256)
+        | (SignatureToken::Address, SignatureToken::Address)
+        | (SignatureToken::Signer, SignatureToken::Signer) => Ok(()),
+        (SignatureToken::Vector(ty1), SignatureToken::Vector(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::Struct(idx1), SignatureToken::Struct(idx2)) => {
+            compare_structs(context, *idx1, *idx2, def_module)
+        }
+        (
+            SignatureToken::StructInstantiation(idx1, inst1),
+            SignatureToken::StructInstantiation(idx2, inst2),
+        ) => {
+            compare_structs(context, *idx1, *idx2, def_module)?;
+            compare_cross_module_signatures(context, inst1, inst2, def_module)
+        }
+        (SignatureToken::Reference(ty1), SignatureToken::Reference(ty2))
+        | (SignatureToken::MutableReference(ty1), SignatureToken::MutableReference(ty2)) => {
+            compare_types(context, ty1, ty2, def_module)
+        }
+        (SignatureToken::TypeParameter(idx1), SignatureToken::TypeParameter(idx2)) => {
+            if idx1 != idx2 {
+                Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+            } else {
+                Ok(())
+            }
+        }
+        (SignatureToken::Bool, _)
+        | (SignatureToken::U8, _)
+        | (SignatureToken::U64, _)
+        | (SignatureToken::U128, _)
+        | (SignatureToken::Address, _)
+        | (SignatureToken::Signer, _)
+        | (SignatureToken::Vector(_), _)
+        | (SignatureToken::Struct(_), _)
+        | (SignatureToken::StructInstantiation(_, _), _)
+        | (SignatureToken::Reference(_), _)
+        | (SignatureToken::MutableReference(_), _)
+        | (SignatureToken::TypeParameter(_), _)
+        | (SignatureToken::U16, _)
+        | (SignatureToken::U32, _)
+        | (SignatureToken::U256, _) => Err(PartialVMError::new(StatusCode::TYPE_MISMATCH)),
+    }
+}
+
+fn compare_structs(
+    context: &Context,
+    idx1: StructHandleIndex,
+    idx2: StructHandleIndex,
+    def_module: &CompiledModule,
+) -> PartialVMResult<()> {
+    // grab ModuleId and struct name for the module being verified
+    let struct_handle = context.resolver.struct_handle_at(idx1);
+    let module_handle = context.resolver.module_handle_at(struct_handle.module);
+    let module_id = context.resolver.module_id_for_handle(module_handle);
+    let struct_name = context.resolver.identifier_at(struct_handle.name);
+
+    // grab ModuleId and struct name for the definition
+    let def_struct_handle = def_module.struct_handle_at(idx2);
+    let def_module_handle = def_module.module_handle_at(def_struct_handle.module);
+    let def_module_id = def_module.module_id_for_handle(def_module_handle);
+    let def_struct_name = def_module.identifier_at(def_struct_handle.name);
+
+    if module_id != def_module_id || struct_name != def_struct_name {
+        Err(PartialVMError::new(StatusCode::TYPE_MISMATCH))
+    } else {
+        Ok(())
+    }
+}
+
+fn verify_all_script_visibility_usage(context: &Context) -> PartialVMResult<()> {
+    // script visibility deprecated after V5
+    let script_functions = match &context.script_functions {
+        None => return Ok(()),
+        Some(s) => s,
+    };
+    debug_assert!(context.resolver.version() < VERSION_5);
+    match &context.resolver {
+        BinaryIndexedView::Module(m) => {
+            for (idx, fdef) in m.function_defs().iter().enumerate() {
+                let code = match &fdef.code {
+                    None => continue,
+                    Some(code) => &code.code,
+                };
+                verify_script_visibility_usage(
+                    &context.resolver,
+                    script_functions,
+                    fdef.is_entry,
+                    FunctionDefinitionIndex(idx as TableIndex),
+                    code,
+                )?
+            }
+            Ok(())
+        }
+        BinaryIndexedView::Script(s) => verify_script_visibility_usage(
+            &context.resolver,
+            script_functions,
+            true,
+            FunctionDefinitionIndex(0),
+            &s.code().code,
+        ),
+    }
+}
+
+fn verify_script_visibility_usage(
+    resolver: &BinaryIndexedView,
+    script_functions: &BTreeSet<FunctionHandleIndex>,
+    current_is_entry: bool,
+    fdef_idx: FunctionDefinitionIndex,
+    code: &[Bytecode],
+) -> PartialVMResult<()> {
+    for (idx, instr) in code.iter().enumerate() {
+        let idx = idx as CodeOffset;
+        let fhandle_idx = match instr {
+            Bytecode::Call(fhandle_idx) => fhandle_idx,
+            Bytecode::CallGeneric(finst_idx) => {
+                &resolver.function_instantiation_at(*finst_idx).handle
+            }
+            _ => continue,
+        };
+        match (current_is_entry, script_functions.contains(fhandle_idx)) {
+            (true, true) => (),
+            (_, true) => {
+                return Err(PartialVMError::new(
+                    StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE,
+                )
+                .at_code_offset(fdef_idx, idx)
+                .with_message(
+                    "script-visible functions can only be called from scripts or other \
+                    script-visible functions"
+                        .to_string(),
+                ));
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/friends.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/friends.rs
new file mode 100644
index 000000000..7bfd9afec
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/friends.rs
@@ -0,0 +1,48 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains verification of usage of dependencies for modules
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::CompiledModule,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
+    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+}
+
+fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+    // cannot make friends with the module itself
+    let self_handle = module.self_handle();
+    if module.friend_decls().contains(self_handle) {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_SELF,
+        ));
+    }
+
+    // cannot make friends with modules outside of the account address
+    //
+    // NOTE: this constraint is a policy decision rather than a technical requirement. The VM and
+    // other bytecode verifier passes do not rely on the assumption that friend modules must be
+    // declared within the same account address.
+    //
+    // However, lacking a definite use case of friending modules across account boundaries, and also
+    // to minimize the associated changes on the module publishing flow, we temporarily enforce this
+    // constraint and we may consider lifting this limitation in the future.
+    let self_address =
+        module.address_identifier_at(module.module_handle_at(module.self_handle_idx()).address);
+    let has_external_friend = module
+        .friend_decls()
+        .iter()
+        .any(|handle| module.address_identifier_at(handle.address) != self_address);
+    if has_external_friend {
+        return Err(PartialVMError::new(
+            StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS,
+        ));
+    }
+
+    Ok(())
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instantiation_loops.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instantiation_loops.rs
new file mode 100644
index 000000000..9af7dff23
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instantiation_loops.rs
@@ -0,0 +1,295 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This implements an algorithm that detects loops during the instantiation of generics.
+//!
+//! It builds a graph from the given `CompiledModule` and converts the original problem into
+//! finding strongly connected components in the graph with certain properties. Read the
+//! documentation of the types/functions below for details of how it works.
+//!
+//! Note: We're doing generics only up to specialization, and are doing a conservative check of
+//! generic call sites to eliminate those which could lead to an infinite number of specialized
+//! instances. We do reject recursive functions that create a new type upon each call but do
+//! terminate eventually.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CompiledModule, FunctionDefinition, FunctionDefinitionIndex, FunctionHandleIndex,
+        SignatureIndex, SignatureToken, TypeParameterIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{
+    algo::tarjan_scc,
+    graph::{EdgeIndex, NodeIndex},
+    visit::EdgeRef,
+    Graph,
+};
+use std::collections::{hash_map, HashMap, HashSet};
+
+/// Data attached to each node.
+/// Each node corresponds to a type formal of a generic function in the module.
+#[derive(Eq, PartialEq, Hash, Copy, Clone)]
+struct Node(FunctionDefinitionIndex, TypeParameterIndex);
+
+/// Data attached to each edge. Indicating the type of the edge.
+enum Edge<'a> {
+    /// This type of edge from type formal T1 to T2 means the type bound to T1 is used to
+    /// instantiate T2 unmodified, thus the name `Identity`.
+    ///
+    /// Example:
+    /// ```
+    /// //    foo<T>() { bar<T>(); return; }
+    /// //
+    /// //    edge: foo_T --Id--> bar_T
+    /// ```
+    Identity,
+    /// This type of edge from type formal T1 to T2 means T2 is instantiated with a type resulted
+    /// by applying one or more type constructors to T1 (potentially with other types).
+    ///
+    /// This is interesting to us as it creates a new (and bigger) type.
+    ///
+    /// Example:
+    /// ```
+    /// //    struct Baz<T> {}
+    /// //    foo<T>() { bar<Baz<T>>(); return; }
+    /// //
+    /// //    edge: foo_T --TyConApp(Baz<T>)--> bar_T
+    /// ```
+    TyConApp(&'a SignatureToken),
+}
+
+pub struct InstantiationLoopChecker<'a> {
+    module: &'a CompiledModule,
+
+    graph: Graph<Node, Edge<'a>>,
+    node_map: HashMap<Node, NodeIndex>,
+    func_handle_def_map: HashMap<FunctionHandleIndex, FunctionDefinitionIndex>,
+}
+
+impl<'a> InstantiationLoopChecker<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        Self {
+            module,
+            graph: Graph::new(),
+            node_map: HashMap::new(),
+            func_handle_def_map: module
+                .function_defs()
+                .iter()
+                .enumerate()
+                .map(|(def_idx, def)| (def.function, FunctionDefinitionIndex::new(def_idx as u16)))
+                .collect(),
+        }
+    }
+
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let mut checker = Self::new(module);
+        checker.build_graph();
+        let mut components = checker.find_non_trivial_components();
+
+        match components.pop() {
+            None => Ok(()),
+            Some((nodes, edges)) => {
+                let msg_edges = edges
+                    .into_iter()
+                    .filter_map(
+                        |edge_idx| match checker.graph.edge_weight(edge_idx).unwrap() {
+                            Edge::TyConApp(_) => Some(checker.format_edge(edge_idx)),
+                            _ => None,
+                        },
+                    )
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg_nodes = nodes
+                    .into_iter()
+                    .map(|node_idx| checker.format_node(node_idx))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let msg = format!(
+                    "edges with constructors: [{}], nodes: [{}]",
+                    msg_edges, msg_nodes
+                );
+                Err(PartialVMError::new(StatusCode::LOOP_IN_INSTANTIATION_GRAPH).with_message(msg))
+            }
+        }
+    }
+
+    /// Retrieves the node corresponding to the specified type formal.
+    /// If none exists in the graph yet, create one.
+    fn get_or_add_node(&mut self, node: Node) -> NodeIndex {
+        match self.node_map.entry(node) {
+            hash_map::Entry::Occupied(entry) => *entry.get(),
+            hash_map::Entry::Vacant(entry) => {
+                let idx = self.graph.add_node(node);
+                entry.insert(idx);
+                idx
+            }
+        }
+    }
+
+    /// Helper function that extracts type parameters from a given type.
+    /// Duplicated entries are removed.
+    fn extract_type_parameters(&self, ty: &SignatureToken) -> HashSet<TypeParameterIndex> {
+        use SignatureToken::*;
+
+        let mut type_params = HashSet::new();
+
+        fn rec(type_params: &mut HashSet<TypeParameterIndex>, ty: &SignatureToken) {
+            match ty {
+                Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Signer | Struct(_) => (),
+                TypeParameter(idx) => {
+                    type_params.insert(*idx);
+                }
+                Vector(ty) => rec(type_params, ty),
+                Reference(ty) | MutableReference(ty) => rec(type_params, ty),
+                StructInstantiation(_, tys) => {
+                    for ty in tys {
+                        rec(type_params, ty);
+                    }
+                }
+            }
+        }
+
+        rec(&mut type_params, ty);
+        type_params
+    }
+
+    /// Helper function that creates an edge from one given node to the other.
+    /// If a node does not exist, create one.
+    fn add_edge(&mut self, node_from: Node, node_to: Node, edge: Edge<'a>) {
+        let node_from_idx = self.get_or_add_node(node_from);
+        let node_to_idx = self.get_or_add_node(node_to);
+        self.graph.add_edge(node_from_idx, node_to_idx, edge);
+    }
+
+    /// Helper of 'fn build_graph' that inspects a function call. If type parameters of the caller
+    /// appear in the type actuals to the callee, nodes and edges are added to the graph.
+    fn build_graph_call(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        callee_idx: FunctionDefinitionIndex,
+        type_actuals_idx: SignatureIndex,
+    ) {
+        let type_actuals = &self.module.signature_at(type_actuals_idx).0;
+
+        for (formal_idx, ty) in type_actuals.iter().enumerate() {
+            let formal_idx = formal_idx as TypeParameterIndex;
+            match ty {
+                SignatureToken::TypeParameter(actual_idx) => self.add_edge(
+                    Node(caller_idx, *actual_idx),
+                    Node(callee_idx, formal_idx),
+                    Edge::Identity,
+                ),
+                _ => {
+                    for type_param in self.extract_type_parameters(ty) {
+                        self.add_edge(
+                            Node(caller_idx, type_param),
+                            Node(callee_idx, formal_idx),
+                            Edge::TyConApp(ty),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Helper of `fn build_graph` that inspects a function definition for calls between two generic
+    /// functions defined in the current module.
+    fn build_graph_function_def(
+        &mut self,
+        caller_idx: FunctionDefinitionIndex,
+        caller_def: &FunctionDefinition,
+    ) {
+        if let Some(code) = &caller_def.code {
+            for instr in &code.code {
+                if let Bytecode::CallGeneric(callee_inst_idx) = instr {
+                    // Get the id of the definition of the function being called.
+                    // Skip if the function is not defined in the current module, as we do not
+                    // have mutual recursions across module boundaries.
+                    let callee_si = self.module.function_instantiation_at(*callee_inst_idx);
+                    if let Some(callee_idx) = self.func_handle_def_map.get(&callee_si.handle) {
+                        let callee_idx = *callee_idx;
+                        self.build_graph_call(caller_idx, callee_idx, callee_si.type_parameters)
+                    }
+                }
+            }
+        }
+    }
+
+    /// Builds a graph G such that
+    ///   - Each type formal of a generic function is a node in G.
+    ///   - There is an edge from type formal f_T to g_T if f_T is used to instantiate g_T in a
+    ///     call.
+    ///     - Each edge is labeled either `Identity` or `TyConApp`. See `Edge` for details.
+    fn build_graph(&mut self) {
+        for (def_idx, func_def) in self
+            .module
+            .function_defs()
+            .iter()
+            .enumerate()
+            .filter(|(_, def)| !def.is_native())
+        {
+            self.build_graph_function_def(FunctionDefinitionIndex::new(def_idx as u16), func_def)
+        }
+    }
+
+    /// Computes the strongly connected components of the graph built and keep the ones that
+    /// contain at least one `TyConApp` edge. Such components indicate there exists a loop such
+    /// that an input type can get "bigger" infinitely many times along the loop, also creating
+    /// infinitely many types. This is precisely the kind of constructs we want to forbid.
+    fn find_non_trivial_components(&self) -> Vec<(Vec<NodeIndex>, Vec<EdgeIndex>)> {
+        tarjan_scc(&self.graph)
+            .into_iter()
+            .filter_map(move |nodes| {
+                let node_set: HashSet<_> = nodes.iter().cloned().collect();
+
+                let edges: Vec<_> = nodes
+                    .iter()
+                    .flat_map(|node_idx| {
+                        self.graph.edges(*node_idx).filter_map(|edge| {
+                            if node_set.contains(&edge.target()) {
+                                Some(edge.id())
+                            } else {
+                                None
+                            }
+                        })
+                    })
+                    .collect();
+
+                if edges.iter().any(
+                    |edge_idx| match self.graph.edge_weight(*edge_idx).unwrap() {
+                        Edge::Identity => false,
+                        Edge::TyConApp(_) => true,
+                    },
+                ) {
+                    Some((nodes, edges))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    fn format_node(&self, node_idx: NodeIndex) -> String {
+        let Node(def_idx, param_idx) = self.graph.node_weight(node_idx).unwrap();
+        format!("f{}#{}", def_idx, param_idx)
+    }
+
+    fn format_edge(&self, edge_idx: EdgeIndex) -> String {
+        let (node_idx_1, node_idx_2) = self.graph.edge_endpoints(edge_idx).unwrap();
+        let node_1 = self.format_node(node_idx_1);
+        let node_2 = self.format_node(node_idx_2);
+
+        match self.graph.edge_weight(edge_idx).unwrap() {
+            Edge::TyConApp(ty) => format!("{} --{:?}--> {}", node_1, ty, node_2,),
+            Edge::Identity => format!("{} ----> {}", node_1, node_2),
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instruction_consistency.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instruction_consistency.rs
new file mode 100644
index 000000000..52cb7cd00
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/instruction_consistency.rs
@@ -0,0 +1,209 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying consistency of each bytecode
+//! instruction, in particular, for the bytecode instructions that come in both generic and
+//! non-generic flavors. It also checks constraints on instructions like VecPack/VecUnpack.
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, FieldHandleIndex,
+        FunctionDefinitionIndex, FunctionHandleIndex, StructDefinitionIndex, TableIndex,
+    },
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct InstructionConsistency<'a> {
+    resolver: BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+}
+
+impl<'a> InstructionConsistency<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let resolver = BinaryIndexedView::Module(module);
+
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            match &func_def.code {
+                None => (),
+                Some(code) => {
+                    let checker = Self {
+                        resolver,
+                        current_function: Some(FunctionDefinitionIndex(idx as TableIndex)),
+                    };
+                    checker.check_instructions(code)?
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    pub fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let checker = Self {
+            resolver: BinaryIndexedView::Script(script),
+            current_function: None,
+        };
+        checker.check_instructions(&script.code)
+    }
+
+    fn check_instructions(&self, code: &CodeUnit) -> PartialVMResult<()> {
+        for (offset, instr) in code.code.iter().enumerate() {
+            use Bytecode::*;
+
+            match instr {
+                MutBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                MutBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* generic */ true)?;
+                }
+                ImmBorrowField(field_handle_index) => {
+                    self.check_field_op(offset, *field_handle_index, /* generic */ false)?;
+                }
+                ImmBorrowFieldGeneric(field_inst_index) => {
+                    let field_inst = self.resolver.field_instantiation_at(*field_inst_index)?;
+                    self.check_field_op(offset, field_inst.handle, /* non_ */ true)?;
+                }
+                Call(idx) => {
+                    self.check_function_op(offset, *idx, /* generic */ false)?;
+                }
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    self.check_function_op(offset, func_inst.handle, /* generic */ true)?;
+                }
+                Pack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                PackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Unpack(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                UnpackGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MutBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                ImmBorrowGlobal(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ImmBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                Exists(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                ExistsGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveFrom(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveFromGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                MoveTo(idx) => {
+                    self.check_type_op(offset, *idx, /* generic */ false)?;
+                }
+                MoveToGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
+                }
+                VecPack(_, num) | VecUnpack(_, num) => {
+                    if *num > u16::MAX as u64 {
+                        return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                            .at_code_offset(self.current_function(), offset as CodeOffset)
+                            .with_message("VecPack/VecUnpack argument out of range".to_string()));
+                    }
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                FreezeRef | Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_)
+                | LdU32(_) | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16
+                | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | ReadRef
+                | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor | Shl | Shr
+                | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | CopyLoc(_) | MoveLoc(_)
+                | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_) | VecLen(_) | VecImmBorrow(_)
+                | VecMutBorrow(_) | VecPushBack(_) | VecPopBack(_) | VecSwap(_) | Abort | Nop => (),
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Helpers for instructions that come in a generic and non generic form.
+    // Verifies the generic form uses a generic member and the non generic form
+    // a non generic one.
+    //
+
+    fn check_field_op(
+        &self,
+        offset: usize,
+        field_handle_index: FieldHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let field_handle = self.resolver.field_handle_at(field_handle_index)?;
+        self.check_type_op(offset, field_handle.owner, generic)
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+
+    fn check_type_op(
+        &self,
+        offset: usize,
+        struct_def_index: StructDefinitionIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.resolver.struct_def_at(struct_def_index)?;
+        let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+        if struct_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+
+    fn check_function_op(
+        &self,
+        offset: usize,
+        func_handle_index: FunctionHandleIndex,
+        generic: bool,
+    ) -> PartialVMResult<()> {
+        let function_handle = self.resolver.function_handle_at(func_handle_index);
+        if function_handle.type_parameters.is_empty() == generic {
+            return Err(
+                PartialVMError::new(StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH)
+                    .at_code_offset(self.current_function(), offset as CodeOffset),
+            );
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/lib.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/lib.rs
new file mode 100644
index 000000000..c232fa847
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! Verifies bytecode sanity.
+
+// Bounds checks are implemented in the `vm` crate.
+pub mod ability_field_requirements;
+pub mod absint;
+pub mod check_duplication;
+pub mod code_unit_verifier;
+pub mod constants;
+pub mod control_flow;
+pub mod control_flow_v5;
+pub mod cyclic_dependencies;
+pub mod dependencies;
+pub mod friends;
+pub mod instantiation_loops;
+pub mod instruction_consistency;
+pub mod limits;
+pub mod loop_summary;
+pub mod script_signature;
+pub mod signature;
+pub mod struct_defs;
+pub mod verifier;
+
+pub use check_duplication::DuplicationChecker;
+pub use code_unit_verifier::CodeUnitVerifier;
+pub use instruction_consistency::InstructionConsistency;
+pub use script_signature::{
+    legacy_script_signature_checks, no_additional_script_signature_checks, FnCheckScriptSignature,
+};
+pub use signature::SignatureChecker;
+pub use struct_defs::RecursiveStructDefChecker;
+pub use verifier::{
+    verify_module_unmetered, verify_module_with_config_for_test, verify_module_with_config_metered,
+    verify_module_with_config_unmetered, verify_script_unmetered,
+    verify_script_with_config_metered, verify_script_with_config_unmetered,
+};
+
+mod acquires_list_verifier;
+mod locals_safety;
+pub mod meter;
+mod reference_safety;
+mod regression_tests;
+mod stack_usage_verifier;
+mod type_safety;
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/limits.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/limits.rs
new file mode 100644
index 000000000..93fe8440f
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/limits.rs
@@ -0,0 +1,223 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, SignatureToken, StructFieldInformation, TableIndex,
+    },
+    IndexKind,
+};
+use move_core_types::{runtime_value::MoveValue, vm_status::StatusCode};
+use move_vm_config::verifier::VerifierConfig;
+
+pub struct LimitsVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> LimitsVerifier<'a> {
+    pub fn verify_module(config: &VerifierConfig, module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        config: &VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        limit_check.verify_constants(config)?;
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)?;
+        limit_check.verify_identifiers(config)?;
+        limit_check.verify_definitions(config)
+    }
+
+    pub fn verify_script(config: &VerifierConfig, module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(config, module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        config: &VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)
+    }
+
+    fn verify_struct_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(limit) = config.max_generic_instantiation_length {
+            for (idx, struct_handle) in self.resolver.struct_handles().iter().enumerate() {
+                if struct_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::StructHandle, idx as u16));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_function_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, function_handle) in self.resolver.function_handles().iter().enumerate() {
+            if let Some(limit) = config.max_generic_instantiation_length {
+                if function_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+            if let Some(limit) = config.max_function_parameters {
+                if self
+                    .resolver
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .len()
+                    > limit
+                {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+        }
+        Ok(())
+    }
+
+    fn verify_type_nodes(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for sign in self.resolver.signatures() {
+            for ty in &sign.0 {
+                self.verify_type_node(config, ty)?
+            }
+        }
+        for cons in self.resolver.constant_pool() {
+            self.verify_type_node(config, &cons.type_)?
+        }
+        if let Some(sdefs) = self.resolver.struct_defs() {
+            for sdef in sdefs {
+                if let StructFieldInformation::Declared(fdefs) = &sdef.field_information {
+                    for fdef in fdefs {
+                        self.verify_type_node(config, &fdef.signature.0)?
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_type_node(
+        &self,
+        config: &VerifierConfig,
+        ty: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        if let Some(max) = &config.max_type_nodes {
+            // Structs and Parameters can expand to an unknown number of nodes, therefore
+            // we give them a higher size weight here.
+            const STRUCT_SIZE_WEIGHT: usize = 4;
+            const PARAM_SIZE_WEIGHT: usize = 4;
+            let mut size = 0;
+            for t in ty.preorder_traversal() {
+                // Notice that the preorder traversal will iterate all type instantiations, so we
+                // why we can ignore them below.
+                match t {
+                    SignatureToken::Struct(..) | SignatureToken::StructInstantiation(..) => {
+                        size += STRUCT_SIZE_WEIGHT
+                    }
+                    SignatureToken::TypeParameter(..) => size += PARAM_SIZE_WEIGHT,
+                    _ => size += 1,
+                }
+            }
+            if size > *max {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_definitions(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(defs) = self.resolver.function_defs() {
+            if let Some(max_function_definitions) = config.max_function_definitions {
+                if defs.len() > max_function_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+        }
+        if let Some(defs) = self.resolver.struct_defs() {
+            if let Some(max_struct_definitions) = config.max_struct_definitions {
+                if defs.len() > max_struct_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+            if let Some(max_fields_in_struct) = config.max_fields_in_struct {
+                for def in defs {
+                    match &def.field_information {
+                        StructFieldInformation::Native => (),
+                        StructFieldInformation::Declared(fields) => {
+                            if fields.len() > max_fields_in_struct {
+                                return Err(PartialVMError::new(
+                                    StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_constants(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, constant) in self.resolver.constant_pool().iter().enumerate() {
+            if let SignatureToken::Vector(_) = constant.type_ {
+                if let MoveValue::Vector(cons) =
+                    constant.deserialize_constant().ok_or_else(|| {
+                        verification_error(
+                            StatusCode::MALFORMED_CONSTANT_DATA,
+                            IndexKind::ConstantPool,
+                            idx as TableIndex,
+                        )
+                    })?
+                {
+                    if let Some(lim) = config.max_constant_vector_len {
+                        if cons.len() > lim as usize {
+                            return Err(PartialVMError::new(StatusCode::TOO_MANY_VECTOR_ELEMENTS)
+                                .with_message(format!("vector size limit is {}", lim)));
+                        }
+                    }
+                } else {
+                    return Err(verification_error(
+                        StatusCode::INVALID_CONSTANT_TYPE,
+                        IndexKind::ConstantPool,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Verifies the lengths of all identifers are valid
+    fn verify_identifiers(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(max_idenfitier_len) = config.max_idenfitier_len {
+            for (idx, identifier) in self.resolver.identifiers().iter().enumerate() {
+                if identifier.len() > (max_idenfitier_len as usize) {
+                    return Err(verification_error(
+                        StatusCode::IDENTIFIER_TOO_LONG,
+                        IndexKind::Identifier,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
new file mode 100644
index 000000000..099a679ad
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
@@ -0,0 +1,164 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the local safety analysis.
+
+use crate::absint::{AbstractDomain, JoinResult};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{AbilitySet, CodeOffset, FunctionDefinitionIndex, LocalIndex},
+};
+use move_core_types::vm_status::StatusCode;
+
+/// LocalState represents the current assignment state of a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum LocalState {
+    /// The local does not have a value
+    Unavailable,
+    /// The local was assigned a non-drop value in at least one control flow path,
+    // but was `Unavailable` in at least one other path
+    MaybeAvailable,
+    /// The local has a value
+    Available,
+}
+use crate::meter::{Meter, Scope};
+use LocalState::*;
+
+pub(crate) const STEP_BASE_COST: u128 = 15;
+pub(crate) const RET_PER_LOCAL_COST: u128 = 30;
+pub(crate) const JOIN_BASE_COST: u128 = 10;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 5;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    all_local_abilities: Vec<AbilitySet>,
+    local_states: Vec<LocalState>,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(
+        resolver: &BinaryIndexedView,
+        function_view: &FunctionView,
+    ) -> PartialVMResult<Self> {
+        let num_args = function_view.parameters().len();
+        let num_locals = num_args + function_view.locals().len();
+        let local_states = (0..num_locals)
+            .map(|i| if i < num_args { Available } else { Unavailable })
+            .collect();
+
+        let all_local_abilities = function_view
+            .parameters()
+            .0
+            .iter()
+            .chain(function_view.locals().0.iter())
+            .map(|st| resolver.abilities(st, function_view.type_parameters()))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+
+        Ok(Self {
+            current_function: function_view.index(),
+            local_states,
+            all_local_abilities,
+        })
+    }
+
+    pub fn local_abilities(&self, idx: LocalIndex) -> AbilitySet {
+        self.all_local_abilities[idx as usize]
+    }
+
+    pub fn all_local_abilities(&self) -> &Vec<AbilitySet> {
+        &self.all_local_abilities
+    }
+
+    pub fn local_state(&self, idx: LocalIndex) -> LocalState {
+        self.local_states[idx as usize]
+    }
+
+    pub fn local_states(&self) -> &Vec<LocalState> {
+        &self.local_states
+    }
+
+    pub fn set_available(&mut self, idx: LocalIndex) {
+        self.local_states[idx as usize] = Available
+    }
+
+    pub fn set_unavailable(&mut self, idx: LocalIndex) {
+        assert!(self.local_states[idx as usize] == Available);
+        self.local_states[idx as usize] = Unavailable
+    }
+
+    pub fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.all_local_abilities.len() == other.all_local_abilities.len());
+        assert!(self.local_states.len() == other.local_states.len());
+        let current_function = self.current_function;
+        let all_local_abilities = self.all_local_abilities.clone();
+        let local_states = self
+            .local_states
+            .iter()
+            .zip(&other.local_states)
+            .map(|(self_state, other_state)| {
+                use LocalState::*;
+                match (self_state, other_state) {
+                    // Unavailable on both sides, nothing to add
+                    (Unavailable, Unavailable) => Unavailable,
+
+                    (MaybeAvailable, Unavailable)
+                    | (Unavailable, MaybeAvailable)
+                    | (MaybeAvailable, MaybeAvailable)
+                    | (MaybeAvailable, Available)
+                    | (Available, MaybeAvailable)
+                    | (Unavailable, Available)
+                    | (Available, Unavailable) => MaybeAvailable,
+
+                    (Available, Available) => Available,
+                }
+            })
+            .collect();
+
+        Self {
+            current_function,
+            all_local_abilities,
+            local_states,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_LOCAL_COST,
+            state.local_states.len(),
+        )?;
+        let joined = Self::join_(self, state);
+        assert!(self.local_states.len() == joined.local_states.len());
+        let locals_unchanged = self
+            .local_states
+            .iter()
+            .zip(&joined.local_states)
+            .all(|(self_state, other_state)| self_state == other_state);
+        if locals_unchanged {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/mod.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/mod.rs
new file mode 100644
index 000000000..55c80d93e
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -0,0 +1,185 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying local safety of a procedure body.
+//! It is concerned with the assignment state of a local variable at the time of usage, which is
+//! a control flow sensitive check.
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    locals_safety::abstract_state::{RET_PER_LOCAL_COST, STEP_BASE_COST},
+    meter::{Meter, Scope},
+};
+use abstract_state::{AbstractState, LocalState};
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset},
+};
+use move_core_types::vm_status::StatusCode;
+
+pub(crate) fn verify<'a>(
+    resolver: &BinaryIndexedView,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(resolver, function_view)?;
+    LocalsSafetyAnalysis().analyze_function(initial_state, function_view, meter)
+}
+
+fn execute_inner(
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    match bytecode {
+        Bytecode::StLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Available
+                if !state.local_abilities(*idx).has_drop() =>
+            {
+                return Err(state.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            _ => state.set_available(*idx),
+        },
+
+        Bytecode::MoveLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::MOVELOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => state.set_unavailable(*idx),
+        },
+
+        Bytecode::CopyLoc(idx) => match state.local_state(*idx) {
+            LocalState::MaybeAvailable | LocalState::Unavailable => {
+                return Err(state.error(StatusCode::COPYLOC_UNAVAILABLE_ERROR, offset))
+            }
+            LocalState::Available => (),
+        },
+
+        Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+            match state.local_state(*idx) {
+                LocalState::Unavailable | LocalState::MaybeAvailable => {
+                    return Err(state.error(StatusCode::BORROWLOC_UNAVAILABLE_ERROR, offset))
+                }
+                LocalState::Available => (),
+            }
+        }
+
+        Bytecode::Ret => {
+            let local_states = state.local_states();
+            meter.add_items(Scope::Function, RET_PER_LOCAL_COST, local_states.len())?;
+            let all_local_abilities = state.all_local_abilities();
+            assert!(local_states.len() == all_local_abilities.len());
+            for (local_state, local_abilities) in local_states.iter().zip(all_local_abilities) {
+                match local_state {
+                    LocalState::MaybeAvailable | LocalState::Available
+                        if !local_abilities.has_drop() =>
+                    {
+                        return Err(
+                            state.error(StatusCode::UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP, offset)
+                        )
+                    }
+                    _ => (),
+                }
+            }
+        }
+
+        Bytecode::Pop
+        | Bytecode::BrTrue(_)
+        | Bytecode::BrFalse(_)
+        | Bytecode::Abort
+        | Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::FreezeRef
+        | Bytecode::MutBorrowField(_)
+        | Bytecode::MutBorrowFieldGeneric(_)
+        | Bytecode::ImmBorrowField(_)
+        | Bytecode::ImmBorrowFieldGeneric(_)
+        | Bytecode::LdU8(_)
+        | Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
+        | Bytecode::LdU64(_)
+        | Bytecode::LdU128(_)
+        | Bytecode::LdU256(_)
+        | Bytecode::LdConst(_)
+        | Bytecode::LdTrue
+        | Bytecode::LdFalse
+        | Bytecode::Call(_)
+        | Bytecode::CallGeneric(_)
+        | Bytecode::Pack(_)
+        | Bytecode::PackGeneric(_)
+        | Bytecode::Unpack(_)
+        | Bytecode::UnpackGeneric(_)
+        | Bytecode::ReadRef
+        | Bytecode::WriteRef
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Not
+        | Bytecode::Eq
+        | Bytecode::Neq
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge
+        | Bytecode::MutBorrowGlobal(_)
+        | Bytecode::MutBorrowGlobalGeneric(_)
+        | Bytecode::ImmBorrowGlobal(_)
+        | Bytecode::ImmBorrowGlobalGeneric(_)
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_)
+        | Bytecode::MoveFrom(_)
+        | Bytecode::MoveFromGeneric(_)
+        | Bytecode::MoveTo(_)
+        | Bytecode::MoveToGeneric(_)
+        | Bytecode::VecPack(..)
+        | Bytecode::VecLen(_)
+        | Bytecode::VecImmBorrow(_)
+        | Bytecode::VecMutBorrow(_)
+        | Bytecode::VecPushBack(_)
+        | Bytecode::VecPopBack(_)
+        | Bytecode::VecUnpack(..)
+        | Bytecode::VecSwap(_) => (),
+    };
+    Ok(())
+}
+
+struct LocalsSafetyAnalysis();
+
+impl TransferFunctions for LocalsSafetyAnalysis {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        _last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(state, bytecode, index, meter)
+    }
+}
+
+impl AbstractInterpreter for LocalsSafetyAnalysis {}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/loop_summary.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/loop_summary.rs
new file mode 100644
index 000000000..0f56382b8
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/loop_summary.rs
@@ -0,0 +1,280 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
+
+/// Dense index into nodes in the same `LoopSummary`
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId(u16);
+
+/// Alias to treat vectors as `NodeId -> T` maps.
+type NodeMap<T> = Vec<T>;
+
+/// Summarise loop information from a control-flow graph by calculating its depth-first spanning
+/// tree (DFST) and then using that to:
+///
+/// - Distinguish edges in the CFG as:
+///   - tree edges (in the spanning tree)
+///   - back edges (going backward from descendant to ancestor in the spanning tree)
+///   - ... everything else.
+/// - Calculate which node is descendant of which in the DFST
+/// - Mapping nodes in the summary back to the blocks they originate from in the CFG.
+///
+/// This is used to implement Tarjan's Loop Reducibility algorithm (Tarjan 1974).
+pub struct LoopSummary {
+    /// Original block corresponding to this node, useful for recovering code offsets, e.g. for
+    /// error messages.
+    blocks: NodeMap<BlockId>,
+
+    /// Number of transitive descendants for a node, in the depth-first spanning tree.
+    descs: NodeMap<u16>,
+
+    /// The incoming edges for a node are partitioned between `back_edges` which create cycles in
+    /// the DFS tree, and `pred_edges` which are all the rest.
+    backs: NodeMap<Vec<NodeId>>,
+    preds: NodeMap<Vec<NodeId>>,
+}
+
+/// A disjoint-set data structure used when collapsing loops down to single nodes in the summary
+/// graph while remembering their loop nesting depth (how many levels of nesting are contained
+/// within them)
+pub struct LoopPartition {
+    /// The parent relationship in the disjoint-set.  The transitive closure of this type maps a
+    /// node to its representative.
+    parents: NodeMap<NodeId>,
+
+    /// The nesting depth of (collapsed) nodes in the summary graph.  Nodes that are uncollapsed
+    /// (not in any loop) have a depth of 0.  Initially, all nodes are uncollapsed.
+    depths: NodeMap<u16>,
+}
+
+impl LoopSummary {
+    pub fn new(cfg: &VMControlFlowGraph) -> Self {
+        use Exploration::*;
+        use Frontier::*;
+
+        enum Exploration {
+            InProgress(NodeId),
+            Done(NodeId),
+        }
+
+        enum Frontier {
+            Visit {
+                from_node: NodeId,
+                to_block: BlockId,
+            },
+            Finish {
+                block: BlockId,
+                node_id: NodeId,
+                parent: NodeId,
+            },
+        }
+
+        let num_blocks = cfg.num_blocks() as usize;
+
+        // Fields in LoopSummary that are filled via a depth-first traversal of `cfg`.
+        let mut blocks = vec![0; num_blocks];
+        let mut descs = vec![0; num_blocks];
+        let mut backs = vec![vec![]; num_blocks];
+        let mut preds = vec![vec![]; num_blocks];
+
+        let mut next_node = NodeId(0);
+
+        let root_block = cfg.entry_block_id();
+        let root_node = next_node.bump();
+
+        let mut exploration = BTreeMap::new();
+        blocks[usize::from(root_node)] = root_block;
+        exploration.insert(root_block, InProgress(root_node));
+
+        let mut stack: Vec<Frontier> = cfg
+            .successors(root_block)
+            .iter()
+            .map(|succ| Visit {
+                from_node: root_node,
+                to_block: *succ,
+            })
+            .collect();
+
+        while let Some(action) = stack.pop() {
+            match action {
+                Finish {
+                    block,
+                    node_id,
+                    parent,
+                } => {
+                    descs[usize::from(parent)] += 1 + descs[usize::from(node_id)];
+                    *exploration.get_mut(&block).unwrap() = Done(node_id);
+                }
+
+                Visit {
+                    from_node,
+                    to_block,
+                } => match exploration.entry(to_block) {
+                    Entry::Occupied(entry) => match entry.get() {
+                        // Cyclic back edge detected by re-visiting `to` while still processing its
+                        // children.
+                        InProgress(to_node) => backs[usize::from(*to_node)].push(from_node),
+
+                        // Cross edge detected by re-visiting `to` after it and its children have
+                        // been processed.
+                        Done(to_node) => preds[usize::from(*to_node)].push(from_node),
+                    },
+
+                    // Visiting `to` for the first time: `from` must be its parent in the depth-
+                    // -first spanning tree, and we should continue exploring its successors.
+                    Entry::Vacant(entry) => {
+                        let to_node = next_node.bump();
+                        entry.insert(InProgress(to_node));
+                        blocks[usize::from(to_node)] = to_block;
+                        preds[usize::from(to_node)].push(from_node);
+
+                        stack.push(Finish {
+                            block: to_block,
+                            node_id: to_node,
+                            parent: from_node,
+                        });
+
+                        stack.extend(cfg.successors(to_block).iter().map(|succ| Visit {
+                            from_node: to_node,
+                            to_block: *succ,
+                        }));
+                    }
+                },
+            }
+        }
+
+        LoopSummary {
+            blocks,
+            descs,
+            backs,
+            preds,
+        }
+    }
+
+    /// Decides whether `descendant` is a descendant of `ancestor` in the depth-first spanning
+    /// tree.
+    pub fn is_descendant(&self, NodeId(ancestor): NodeId, NodeId(descendant): NodeId) -> bool {
+        // All the descendants of `ancestor` in the DFST will have the IDs immediately following it,
+        // so we can check for descendants with a bounds check on `NodeId`, given `ancestor`'s
+        // transitive descendant count in `self.descs[ancestor]`.
+        ancestor <= descendant && descendant <= ancestor + self.descs[ancestor as usize]
+    }
+
+    /// Returns an iterator over `NodeId`s in this `LoopSummary` in pre-order according to its
+    /// depth-first spanning tree.
+    pub fn preorder(&self) -> impl DoubleEndedIterator<Item = NodeId> {
+        // `LoopSummary::new` assigns `NodeId`s to blocks in preorder, so just return the natural
+        // order.
+        (0..self.blocks.len()).map(|id| NodeId(id as u16))
+    }
+
+    /// Per-node accessors
+    pub fn block(&self, l: NodeId) -> BlockId {
+        self.blocks[usize::from(l)]
+    }
+
+    pub fn back_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.backs[usize::from(l)]
+    }
+
+    pub fn pred_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.preds[usize::from(l)]
+    }
+}
+
+impl LoopPartition {
+    pub fn new(summary: &LoopSummary) -> Self {
+        let num_blocks = summary.blocks.len();
+        LoopPartition {
+            parents: (0..num_blocks).map(|id| NodeId(id as u16)).collect(),
+            depths: vec![0; num_blocks],
+        }
+    }
+
+    /// Find the head of the collapsed node containing loop `id`, use path-compression to speed up
+    /// future accesses.
+    pub fn containing_loop(&mut self, id: NodeId) -> NodeId {
+        let mut child = id;
+        let mut parent = self.parent(child);
+        let mut grandparent = self.parent(parent);
+
+        if child == parent || parent == grandparent {
+            return parent;
+        }
+
+        let mut descendants = vec![];
+        loop {
+            // Invariant: child -> parent -> grandparent
+            //       and  parent != grandparent
+            //       and  forall d in descendants. parent(d) != parent(parent(d))
+            descendants.push(child);
+            (child, parent, grandparent) = (parent, grandparent, self.parent(grandparent));
+            if parent == grandparent {
+                break;
+            }
+        }
+
+        for descendant in descendants {
+            *self.parent_mut(descendant) = parent;
+        }
+
+        parent
+    }
+
+    /// Collapse `body` of a loop down to one node, represented by its `head`.  Calculate the
+    /// nesting depth of the collapsed node and return it.
+    ///
+    /// Assumes that all the nodes involved are the heads of their corresponding sets in the
+    /// partition.
+    ///
+    /// Note that this function can be called with an empty body, meaning `head` is the only
+    /// node in the loop.  Its nesting depth will still be incremented in this case.
+    pub fn collapse_loop(&mut self, head: NodeId, body: &BTreeSet<NodeId>) -> u16 {
+        debug_assert_eq!(head, self.parent(head));
+
+        let mut depth = self.depth(head);
+        for constituent in body {
+            debug_assert_eq!(*constituent, self.parent(*constituent));
+            *self.parent_mut(*constituent) = head;
+            depth = self.depth(*constituent).max(depth);
+        }
+
+        depth += 1;
+        *self.depth_mut(head) = depth;
+        depth
+    }
+
+    /// Per-node accessors
+    fn parent(&self, l: NodeId) -> NodeId {
+        self.parents[usize::from(l)]
+    }
+
+    fn parent_mut(&mut self, l: NodeId) -> &mut NodeId {
+        &mut self.parents[usize::from(l)]
+    }
+
+    fn depth(&self, l: NodeId) -> u16 {
+        self.depths[usize::from(l)]
+    }
+
+    fn depth_mut(&mut self, l: NodeId) -> &mut u16 {
+        &mut self.depths[usize::from(l)]
+    }
+}
+
+impl NodeId {
+    /// Post-increment (e.g. `self++`).
+    fn bump(&mut self) -> NodeId {
+        let ret = *self;
+        self.0 += 1;
+        ret
+    }
+}
+
+impl From<NodeId> for usize {
+    fn from(NodeId(id): NodeId) -> usize {
+        id as usize
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/meter.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/meter.rs
new file mode 100644
index 000000000..7119bd5d0
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/meter.rs
@@ -0,0 +1,168 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+use std::ops::Mul;
+
+/// Scope of meterinng
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Scope {
+    // Metering is for transaction level
+    Transaction,
+    // Metering is for package level
+    Package,
+    // Metering is for module level
+    Module,
+    // Metering is for function level
+    Function,
+}
+
+pub const ANALYZE_FUNCTION_BASE_COST: u128 = 10;
+pub const EXECUTE_BLOCK_BASE_COST: u128 = 10;
+pub const PER_BACKEDGE_COST: u128 = 10;
+pub const PER_SUCCESSOR_COST: u128 = 10;
+
+/// Trait for a metering verification.
+pub trait Meter {
+    /// Indicates the begin of a new scope.
+    fn enter_scope(&mut self, name: &str, scope: Scope);
+
+    /// Transfer the amount of metering from once scope to the next. If the current scope has
+    /// metered N units, the target scope will be charged with N*factor.
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()>;
+
+    /// Add the number of units to the meter, returns an error if a limit is hit.
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()>;
+
+    /// Adds the number of items.
+    fn add_items(
+        &mut self,
+        scope: Scope,
+        units_per_item: u128,
+        items: usize,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        self.add(scope, units_per_item.saturating_mul(items as u128))
+    }
+
+    /// Adds the number of items with growth factor
+    fn add_items_with_growth(
+        &mut self,
+        scope: Scope,
+        mut units_per_item: u128,
+        items: usize,
+        growth_factor: f32,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        for _ in 0..items {
+            self.add(scope, units_per_item)?;
+            units_per_item = growth_factor.mul(units_per_item as f32) as u128;
+        }
+        Ok(())
+    }
+}
+
+pub struct BoundMeter {
+    mod_bounds: Bounds,
+    fun_bounds: Bounds,
+}
+
+struct Bounds {
+    name: String,
+    units: u128,
+    max: Option<u128>,
+}
+
+impl Meter for BoundMeter {
+    fn enter_scope(&mut self, name: &str, scope: Scope) {
+        let bounds = self.get_bounds_mut(scope);
+        bounds.name = name.into();
+        bounds.units = 0;
+    }
+
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()> {
+        let units = (self.get_bounds_mut(from).units as f32 * factor) as u128;
+        self.add(to, units)
+    }
+
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()> {
+        self.get_bounds_mut(scope).add(units)
+    }
+}
+
+impl Bounds {
+    fn add(&mut self, units: u128) -> PartialVMResult<()> {
+        if let Some(max) = self.max {
+            let new_units = self.units.saturating_add(units);
+            if new_units > max {
+                // TODO: change to a new status PROGRAM_TOO_COMPLEX once this is rolled out. For
+                // now we use an existing code to avoid breaking changes on potential rollback.
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "program too complex (in `{}` with `{} current + {} new > {} max`)",
+                        self.name, self.units, units, max
+                    )));
+            }
+            self.units = new_units;
+        }
+        Ok(())
+    }
+}
+
+impl BoundMeter {
+    pub fn new(config: &VerifierConfig) -> Self {
+        Self {
+            mod_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_mod_meter_units,
+            },
+            fun_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_fun_meter_units,
+            },
+        }
+    }
+
+    fn get_bounds_mut(&mut self, scope: Scope) -> &mut Bounds {
+        if scope == Scope::Module {
+            &mut self.mod_bounds
+        } else {
+            &mut self.fun_bounds
+        }
+    }
+
+    fn get_bounds(&self, scope: Scope) -> &Bounds {
+        if scope == Scope::Module {
+            &self.mod_bounds
+        } else {
+            &self.fun_bounds
+        }
+    }
+
+    pub fn get_usage(&self, scope: Scope) -> u128 {
+        self.get_bounds(scope).units
+    }
+
+    pub fn get_limit(&self, scope: Scope) -> Option<u128> {
+        self.get_bounds(scope).max
+    }
+}
+
+pub struct DummyMeter;
+impl Meter for DummyMeter {
+    fn enter_scope(&mut self, _name: &str, _scope: Scope) {}
+    fn transfer(&mut self, _from: Scope, _to: Scope, _factor: f32) -> PartialVMResult<()> {
+        Ok(())
+    }
+    fn add(&mut self, _scope: Scope, _units: u128) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
new file mode 100644
index 000000000..3bbbe2597
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -0,0 +1,745 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the abstract state for the type and memory safety analysis.
+use crate::{
+    absint::{AbstractDomain, JoinResult},
+    meter::{Meter, Scope},
+};
+use move_binary_format::{
+    binary_views::FunctionView,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        CodeOffset, FieldHandleIndex, FunctionDefinitionIndex, LocalIndex, Signature,
+        SignatureToken, StructDefinitionIndex,
+    },
+    safe_unwrap,
+};
+use move_borrow_graph::references::RefID;
+use move_core_types::vm_status::StatusCode;
+use std::collections::{BTreeMap, BTreeSet};
+
+type BorrowGraph = move_borrow_graph::graph::BorrowGraph<(), Label>;
+
+/// AbstractValue represents a reference or a non reference value, both on the stack and stored
+/// in a local
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum AbstractValue {
+    Reference(RefID),
+    NonReference,
+}
+
+impl AbstractValue {
+    /// checks if self is a reference
+    pub fn is_reference(&self) -> bool {
+        match self {
+            AbstractValue::Reference(_) => true,
+            AbstractValue::NonReference => false,
+        }
+    }
+
+    /// checks if self is a value
+    pub fn is_value(&self) -> bool {
+        !self.is_reference()
+    }
+
+    /// possibly extracts id from self
+    pub fn ref_id(&self) -> Option<RefID> {
+        match self {
+            AbstractValue::Reference(id) => Some(*id),
+            AbstractValue::NonReference => None,
+        }
+    }
+}
+
+/// Label is an element of a label on an edge in the borrow graph.
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+enum Label {
+    Local(LocalIndex),
+    Global(StructDefinitionIndex),
+    Field(FieldHandleIndex),
+}
+
+// Needed for debugging with the borrow graph
+impl std::fmt::Display for Label {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Label::Local(i) => write!(f, "local#{}", i),
+            Label::Global(i) => write!(f, "resource@{}", i),
+            Label::Field(i) => write!(f, "field#{}", i),
+        }
+    }
+}
+
+pub(crate) const STEP_BASE_COST: u128 = 10;
+pub(crate) const STEP_PER_LOCAL_COST: u128 = 20;
+pub(crate) const STEP_PER_GRAPH_ITEM_COST: u128 = 50;
+pub(crate) const JOIN_BASE_COST: u128 = 100;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 10;
+pub(crate) const JOIN_PER_GRAPH_ITEM_COST: u128 = 50;
+
+// The cost for an edge from an input reference parameter to output reference.
+pub(crate) const REF_PARAM_EDGE_COST: u128 = 100;
+pub(crate) const REF_PARAM_EDGE_COST_GROWTH: f32 = 1.5;
+
+// The cost of an acquires in a call.
+pub(crate) const CALL_PER_ACQUIRES_COST: u128 = 100;
+
+/// AbstractState is the analysis state over which abstract interpretation is performed.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct AbstractState {
+    current_function: Option<FunctionDefinitionIndex>,
+    locals: Vec<AbstractValue>,
+    borrow_graph: BorrowGraph,
+    next_id: usize,
+}
+
+impl AbstractState {
+    /// create a new abstract state
+    pub fn new(function_view: &FunctionView) -> Self {
+        let num_locals = function_view.parameters().len() + function_view.locals().len();
+        // ids in [0, num_locals) are reserved for constructing canonical state
+        // id at num_locals is reserved for the frame root
+        let next_id = num_locals + 1;
+        let mut state = AbstractState {
+            current_function: function_view.index(),
+            locals: vec![AbstractValue::NonReference; num_locals],
+            borrow_graph: BorrowGraph::new(),
+            next_id,
+        };
+
+        for (param_idx, param_ty) in function_view.parameters().0.iter().enumerate() {
+            if param_ty.is_reference() {
+                let id = RefID::new(param_idx);
+                state
+                    .borrow_graph
+                    .new_ref(id, param_ty.is_mutable_reference());
+                state.locals[param_idx] = AbstractValue::Reference(id)
+            }
+        }
+        state.borrow_graph.new_ref(state.frame_root(), true);
+
+        assert!(state.is_canonical());
+        state
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn graph_size(&self) -> usize {
+        self.borrow_graph.graph_size()
+    }
+
+    /// returns the frame root id
+    fn frame_root(&self) -> RefID {
+        RefID::new(self.locals.len())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.current_function.unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    //**********************************************************************************************
+    // Core API
+    //**********************************************************************************************
+
+    pub fn value_for(&mut self, s: &SignatureToken) -> AbstractValue {
+        match s {
+            SignatureToken::Reference(_) => AbstractValue::Reference(self.new_ref(false)),
+            SignatureToken::MutableReference(_) => AbstractValue::Reference(self.new_ref(true)),
+            _ => AbstractValue::NonReference,
+        }
+    }
+
+    /// adds and returns new id to borrow graph
+    fn new_ref(&mut self, mut_: bool) -> RefID {
+        let id = RefID::new(self.next_id);
+        self.borrow_graph.new_ref(id, mut_);
+        self.next_id += 1;
+        id
+    }
+
+    fn add_copy(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_strong_borrow((), parent, child)
+    }
+
+    fn add_borrow(&mut self, parent: RefID, child: RefID) {
+        self.borrow_graph.add_weak_borrow((), parent, child)
+    }
+
+    fn add_field_borrow(&mut self, parent: RefID, field: FieldHandleIndex, child: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), parent, Label::Field(field), child)
+    }
+
+    fn add_local_borrow(&mut self, local: LocalIndex, id: RefID) {
+        self.borrow_graph
+            .add_strong_field_borrow((), self.frame_root(), Label::Local(local), id)
+    }
+
+    fn add_resource_borrow(&mut self, resource: StructDefinitionIndex, id: RefID) {
+        self.borrow_graph
+            .add_weak_field_borrow((), self.frame_root(), Label::Global(resource), id)
+    }
+
+    /// removes `id` from borrow graph
+    fn release(&mut self, id: RefID) {
+        self.borrow_graph.release(id);
+    }
+
+    //**********************************************************************************************
+    // Core Predicates
+    //**********************************************************************************************
+
+    /// checks if `id` is borrowed, but ignores field borrows
+    fn has_full_borrows(&self, id: RefID) -> bool {
+        let (full_borrows, _field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty()
+    }
+
+    /// Checks if `id` is borrowed
+    /// - All full/epsilon borrows are considered
+    /// - Only field borrows the specified label (or all if one isn't specified) are considered
+    fn has_consistent_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !full_borrows.is_empty() || {
+            match label_opt {
+                None => field_borrows.values().any(|borrows| !borrows.is_empty()),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !borrows.is_empty())
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// Checks if `id` is mutable borrowed
+    /// - All full/epsilon mutable borrows are considered
+    /// - Only field mutable borrows the specified label (or all if one isn't specified) are
+    ///   considered
+    fn has_consistent_mutable_borrows(&self, id: RefID, label_opt: Option<Label>) -> bool {
+        let (full_borrows, field_borrows) = self.borrow_graph.borrowed_by(id);
+        !self.all_immutable(&full_borrows) || {
+            match label_opt {
+                None => field_borrows
+                    .values()
+                    .any(|borrows| !self.all_immutable(borrows)),
+                Some(label) => field_borrows
+                    .get(&label)
+                    .map(|borrows| !self.all_immutable(borrows))
+                    .unwrap_or(false),
+            }
+        }
+    }
+
+    /// checks if `id` is writable
+    /// - Mutable references are writable if there are no consistent borrows
+    /// - Immutable references are not writable by the typing rules
+    fn is_writable(&self, id: RefID) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_borrows(id, None)
+    }
+
+    /// checks if `id` is freezable
+    /// - Mutable references are freezable if there are no consistent mutable borrows
+    /// - Immutable references are not freezable by the typing rules
+    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        assert!(self.borrow_graph.is_mutable(id));
+        !self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::Field))
+    }
+
+    /// checks if `id` is readable
+    /// - Mutable references are readable if they are freezable
+    /// - Immutable references are always readable
+    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+        let is_mutable = self.borrow_graph.is_mutable(id);
+        !is_mutable || self.is_freezable(id, at_field_opt)
+    }
+
+    /// checks if local@idx is borrowed
+    fn is_local_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if local@idx is mutably borrowed
+    fn is_local_mutably_borrowed(&self, idx: LocalIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Local(idx)))
+    }
+
+    /// checks if global@idx is borrowed
+    fn is_global_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if global@idx is mutably borrowed
+    fn is_global_mutably_borrowed(&self, resource: StructDefinitionIndex) -> bool {
+        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Global(resource)))
+    }
+
+    /// checks if the stack frame of the function being analyzed can be safely destroyed.
+    /// safe destruction requires that all references in locals have already been destroyed
+    /// and all values in locals are copyable and unborrowed.
+    fn is_frame_safe_to_destroy(&self) -> bool {
+        !self.has_consistent_borrows(self.frame_root(), None)
+    }
+
+    //**********************************************************************************************
+    // Instruction Entry Points
+    //**********************************************************************************************
+
+    /// destroys local@idx
+    pub fn release_value(&mut self, value: AbstractValue) {
+        match value {
+            AbstractValue::Reference(id) => self.release(id),
+            AbstractValue::NonReference => (),
+        }
+    }
+
+    pub fn copy_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        match safe_unwrap!(self.locals.get(local as usize)) {
+            AbstractValue::Reference(id) => {
+                let id = *id;
+                let new_id = self.new_ref(self.borrow_graph.is_mutable(id));
+                self.add_copy(id, new_id);
+                Ok(AbstractValue::Reference(new_id))
+            }
+            AbstractValue::NonReference if self.is_local_mutably_borrowed(local) => {
+                Err(self.error(StatusCode::COPYLOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn move_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        let old_value = std::mem::replace(
+            safe_unwrap!(self.locals.get_mut(local as usize)),
+            AbstractValue::NonReference,
+        );
+        match old_value {
+            AbstractValue::Reference(id) => Ok(AbstractValue::Reference(id)),
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::MOVELOC_EXISTS_BORROW_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(AbstractValue::NonReference),
+        }
+    }
+
+    pub fn st_loc(
+        &mut self,
+        offset: CodeOffset,
+        local: LocalIndex,
+        new_value: AbstractValue,
+    ) -> PartialVMResult<()> {
+        let old_value =
+            std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value);
+        match old_value {
+            AbstractValue::Reference(id) => {
+                self.release(id);
+                Ok(())
+            }
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+                Err(self.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
+            }
+            AbstractValue::NonReference => Ok(()),
+        }
+    }
+
+    pub fn freeze_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_freezable(id, None) {
+            return Err(self.error(StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let frozen_id = self.new_ref(false);
+        self.add_copy(id, frozen_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(frozen_id))
+    }
+
+    pub fn comparison(
+        &mut self,
+        offset: CodeOffset,
+        v1: AbstractValue,
+        v2: AbstractValue,
+    ) -> PartialVMResult<AbstractValue> {
+        match (v1, v2) {
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2))
+                if !self.is_readable(id1, None) || !self.is_readable(id2, None) =>
+            {
+                // TODO better error code
+                return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+            }
+            (AbstractValue::Reference(id1), AbstractValue::Reference(id2)) => {
+                self.release(id1);
+                self.release(id2)
+            }
+            (v1, v2) => {
+                assert!(v1.is_value());
+                assert!(v2.is_value());
+            }
+        }
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn read_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
+        if !self.is_readable(id, None) {
+            return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(AbstractValue::NonReference)
+    }
+
+    pub fn write_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<()> {
+        if !self.is_writable(id) {
+            return Err(self.error(StatusCode::WRITEREF_EXISTS_BORROW_ERROR, offset));
+        }
+
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn borrow_loc(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        local: LocalIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // nothing to check in case borrow is mutable since the frame cannot have an full borrow/
+        // epsilon outgoing edge
+        if !mut_ && self.is_local_mutably_borrowed(local) {
+            return Err(self.error(StatusCode::BORROWLOC_EXISTS_BORROW_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_local_borrow(local, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn borrow_field(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        id: RefID,
+        field: FieldHandleIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        // Any field borrows will be factored out, so don't check in the mutable case
+        let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
+        // For new immutable borrow, the reference must be readable at that field
+        // This means that there could exist a mutable borrow on some other field
+        let is_imm_borrow_with_mut_borrows = || !mut_ && !self.is_readable(id, Some(field));
+
+        if is_mut_borrow_with_full_borrows() || is_imm_borrow_with_mut_borrows() {
+            // TODO improve error for mutable case
+            return Err(self.error(StatusCode::BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+
+        let field_borrow_id = self.new_ref(mut_);
+        self.add_field_borrow(id, field, field_borrow_id);
+        self.release(id);
+        Ok(AbstractValue::Reference(field_borrow_id))
+    }
+
+    pub fn borrow_global(
+        &mut self,
+        offset: CodeOffset,
+        mut_: bool,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if (mut_ && self.is_global_borrowed(resource)) || self.is_global_mutably_borrowed(resource)
+        {
+            return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+        }
+
+        let new_id = self.new_ref(mut_);
+        self.add_resource_borrow(resource, new_id);
+        Ok(AbstractValue::Reference(new_id))
+    }
+
+    pub fn move_from(
+        &mut self,
+        offset: CodeOffset,
+        resource: StructDefinitionIndex,
+    ) -> PartialVMResult<AbstractValue> {
+        if self.is_global_borrowed(resource) {
+            Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset))
+        } else {
+            Ok(AbstractValue::NonReference)
+        }
+    }
+
+    pub fn vector_op(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<()> {
+        let id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(id) {
+            return Err(self.error(StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR, offset));
+        }
+        self.release(id);
+        Ok(())
+    }
+
+    pub fn vector_element_borrow(
+        &mut self,
+        offset: CodeOffset,
+        vector: AbstractValue,
+        mut_: bool,
+    ) -> PartialVMResult<AbstractValue> {
+        let vec_id = safe_unwrap!(vector.ref_id());
+        if mut_ && !self.is_writable(vec_id) {
+            return Err(self.error(
+                StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
+                offset,
+            ));
+        }
+
+        let elem_id = self.new_ref(mut_);
+        self.add_borrow(vec_id, elem_id);
+
+        self.release(vec_id);
+        Ok(AbstractValue::Reference(elem_id))
+    }
+
+    pub fn call(
+        &mut self,
+        offset: CodeOffset,
+        arguments: Vec<AbstractValue>,
+        acquired_resources: &BTreeSet<StructDefinitionIndex>,
+        return_: &Signature,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Vec<AbstractValue>> {
+        meter.add_items(
+            Scope::Function,
+            CALL_PER_ACQUIRES_COST,
+            acquired_resources.len(),
+        )?;
+        // Check acquires
+        for acquired_resource in acquired_resources {
+            if self.is_global_borrowed(*acquired_resource) {
+                return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
+            }
+        }
+
+        // Check mutable references can be transferred
+        let mut all_references_to_borrow_from = BTreeSet::new();
+        let mut mutable_references_to_borrow_from = BTreeSet::new();
+        for id in arguments.iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) {
+                if !self.is_writable(id) {
+                    return Err(
+                        self.error(StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR, offset)
+                    );
+                }
+                mutable_references_to_borrow_from.insert(id);
+            }
+            all_references_to_borrow_from.insert(id);
+        }
+
+        // Track borrow relationships of return values on inputs
+        let mut returned_refs = 0;
+        let return_values = return_
+            .0
+            .iter()
+            .map(|return_type| match return_type {
+                SignatureToken::MutableReference(_) => {
+                    let id = self.new_ref(true);
+                    for parent in &mutable_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                SignatureToken::Reference(_) => {
+                    let id = self.new_ref(false);
+                    for parent in &all_references_to_borrow_from {
+                        self.add_borrow(*parent, id);
+                    }
+                    returned_refs += 1;
+                    AbstractValue::Reference(id)
+                }
+                _ => AbstractValue::NonReference,
+            })
+            .collect();
+
+        // Meter usage of reference edges
+        meter.add_items_with_growth(
+            Scope::Function,
+            REF_PARAM_EDGE_COST,
+            all_references_to_borrow_from
+                .len()
+                .saturating_mul(returned_refs),
+            REF_PARAM_EDGE_COST_GROWTH,
+        )?;
+
+        // Release input references
+        for id in all_references_to_borrow_from {
+            self.release(id)
+        }
+        Ok(return_values)
+    }
+
+    pub fn ret(&mut self, offset: CodeOffset, values: Vec<AbstractValue>) -> PartialVMResult<()> {
+        // release all local variables
+        let mut released = BTreeSet::new();
+        for stored_value in self.locals.iter() {
+            if let AbstractValue::Reference(id) = stored_value {
+                released.insert(*id);
+            }
+        }
+        released.into_iter().for_each(|id| self.release(id));
+
+        // Check that no local or global is borrowed
+        if !self.is_frame_safe_to_destroy() {
+            return Err(self.error(
+                StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
+                offset,
+            ));
+        }
+
+        // Check mutable references can be transferred
+        for id in values.into_iter().filter_map(|v| v.ref_id()) {
+            if self.borrow_graph.is_mutable(id) && !self.is_writable(id) {
+                return Err(self.error(StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR, offset));
+            }
+        }
+        Ok(())
+    }
+
+    //**********************************************************************************************
+    // Abstract Interpreter Entry Points
+    //**********************************************************************************************
+
+    /// returns the canonical representation of self
+    pub fn construct_canonical_state(&self) -> Self {
+        let mut id_map = BTreeMap::new();
+        id_map.insert(self.frame_root(), self.frame_root());
+        let locals = self
+            .locals
+            .iter()
+            .enumerate()
+            .map(|(local, value)| match value {
+                AbstractValue::Reference(old_id) => {
+                    let new_id = RefID::new(local);
+                    id_map.insert(*old_id, new_id);
+                    AbstractValue::Reference(new_id)
+                }
+                AbstractValue::NonReference => AbstractValue::NonReference,
+            })
+            .collect::<Vec<_>>();
+        assert!(self.locals.len() == locals.len());
+        let mut borrow_graph = self.borrow_graph.clone();
+        borrow_graph.remap_refs(&id_map);
+        let canonical_state = AbstractState {
+            locals,
+            borrow_graph,
+            current_function: self.current_function,
+            next_id: self.locals.len() + 1,
+        };
+        assert!(canonical_state.is_canonical());
+        canonical_state
+    }
+
+    fn all_immutable(&self, borrows: &BTreeMap<RefID, ()>) -> bool {
+        !borrows.keys().any(|x| self.borrow_graph.is_mutable(*x))
+    }
+
+    fn is_canonical(&self) -> bool {
+        self.locals.len() + 1 == self.next_id
+            && self.locals.iter().enumerate().all(|(local, value)| {
+                value
+                    .ref_id()
+                    .map(|id| RefID::new(local) == id)
+                    .unwrap_or(true)
+            })
+    }
+
+    pub fn join_(&self, other: &Self) -> Self {
+        assert!(self.current_function == other.current_function);
+        assert!(self.is_canonical() && other.is_canonical());
+        assert!(self.next_id == other.next_id);
+        assert!(self.locals.len() == other.locals.len());
+        let mut self_graph = self.borrow_graph.clone();
+        let mut other_graph = other.borrow_graph.clone();
+        let locals = self
+            .locals
+            .iter()
+            .zip(&other.locals)
+            .map(|(self_value, other_value)| {
+                match (self_value, other_value) {
+                    (AbstractValue::Reference(id), AbstractValue::NonReference) => {
+                        self_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    (AbstractValue::NonReference, AbstractValue::Reference(id)) => {
+                        other_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    // The local has a value on each side, add it to the state
+                    (v1, v2) => {
+                        assert!(v1 == v2);
+                        *v1
+                    }
+                }
+            })
+            .collect();
+
+        let borrow_graph = self_graph.join(&other_graph);
+        let current_function = self.current_function;
+        let next_id = self.next_id;
+
+        Self {
+            current_function,
+            locals,
+            borrow_graph,
+            next_id,
+        }
+    }
+}
+
+impl AbstractDomain for AbstractState {
+    /// attempts to join state to self and returns the result
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        let joined = Self::join_(self, state);
+        assert!(joined.is_canonical());
+        assert!(self.locals.len() == joined.locals.len());
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(Scope::Function, JOIN_PER_LOCAL_COST, self.locals.len())?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_GRAPH_ITEM_COST,
+            self.borrow_graph.graph_size(),
+        )?;
+        let locals_unchanged = self
+            .locals
+            .iter()
+            .zip(&joined.locals)
+            .all(|(self_value, joined_value)| self_value == joined_value);
+        // locals unchanged and borrow graph covered, return unchanged
+        // else mark as changed and update the state
+        if locals_unchanged && self.borrow_graph.leq(&joined.borrow_graph) {
+            Ok(JoinResult::Unchanged)
+        } else {
+            *self = joined;
+            Ok(JoinResult::Changed)
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/mod.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/mod.rs
new file mode 100644
index 000000000..3d01e0520
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -0,0 +1,458 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying reference safety of a procedure body.
+//! The checks include (but are not limited to)
+//! - verifying that there are no dangling references,
+//! - accesses to mutable references are safe
+//! - accesses to global storage references are safe
+
+mod abstract_state;
+
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    meter::{Meter, Scope},
+    reference_safety::abstract_state::{
+        STEP_BASE_COST, STEP_PER_GRAPH_ITEM_COST, STEP_PER_LOCAL_COST,
+    },
+};
+use abstract_state::{AbstractState, AbstractValue};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, IdentifierIndex,
+        SignatureIndex, SignatureToken, StructDefinition, StructFieldInformation,
+    },
+    safe_assert, safe_unwrap, safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+use std::{
+    collections::{BTreeSet, HashMap},
+    num::NonZeroU64,
+};
+
+struct ReferenceSafetyAnalysis<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    stack: AbstractStack<AbstractValue>,
+}
+
+impl<'a> ReferenceSafetyAnalysis<'a> {
+    fn new(
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView<'a>,
+        name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    ) -> Self {
+        Self {
+            resolver,
+            function_view,
+            name_def_map,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn push(&mut self, v: AbstractValue) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push(v));
+        Ok(())
+    }
+
+    fn push_n(&mut self, v: AbstractValue, n: u64) -> PartialVMResult<()> {
+        safe_unwrap_err!(self.stack.push_n(v, n));
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &FunctionView,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let initial_state = AbstractState::new(function_view);
+
+    let mut verifier = ReferenceSafetyAnalysis::new(resolver, function_view, name_def_map);
+    verifier.analyze_function(initial_state, function_view, meter)
+}
+
+fn call(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    let arguments = parameters
+        .0
+        .iter()
+        .map(|_| verifier.stack.pop().unwrap())
+        .rev()
+        .collect();
+
+    let acquired_resources = match verifier.name_def_map.get(&function_handle.name) {
+        Some(idx) => {
+            let func_def = verifier.resolver.function_def_at(*idx)?;
+            let fh = verifier.resolver.function_handle_at(func_def.function);
+            if function_handle == fh {
+                func_def.acquires_global_resources.iter().cloned().collect()
+            } else {
+                BTreeSet::new()
+            }
+        }
+        None => BTreeSet::new(),
+    };
+    let return_ = verifier.resolver.signature_at(function_handle.return_);
+    let values = state.call(offset, arguments, &acquired_resources, return_, meter)?;
+    for value in values {
+        verifier.push(value)?
+    }
+    Ok(())
+}
+
+fn num_fields(struct_def: &StructDefinition) -> usize {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => 0,
+        StructFieldInformation::Declared(fields) => fields.len(),
+    }
+}
+
+fn pack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    for _ in 0..num_fields(struct_def) {
+        safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value())
+    }
+    // TODO maybe call state.value_for
+    verifier.push(AbstractValue::NonReference)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+    // TODO maybe call state.value_for
+    verifier.push_n(AbstractValue::NonReference, num_fields(struct_def) as u64)?;
+    Ok(())
+}
+
+fn vec_element_type(
+    verifier: &mut ReferenceSafetyAnalysis,
+    idx: SignatureIndex,
+) -> PartialVMResult<SignatureToken> {
+    match verifier.resolver.signature_at(idx).0.get(0) {
+        Some(ty) => Ok(ty.clone()),
+        None => Err(PartialVMError::new(
+            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+        )),
+    }
+}
+
+fn execute_inner(
+    verifier: &mut ReferenceSafetyAnalysis,
+    state: &mut AbstractState,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    meter.add_items(Scope::Function, STEP_PER_LOCAL_COST, state.local_count())?;
+    meter.add_items(
+        Scope::Function,
+        STEP_PER_GRAPH_ITEM_COST,
+        state.graph_size(),
+    )?;
+
+    match bytecode {
+        Bytecode::Pop => state.release_value(safe_unwrap_err!(verifier.stack.pop())),
+
+        Bytecode::CopyLoc(local) => {
+            let value = state.copy_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveLoc(local) => {
+            let value = state.move_loc(offset, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::StLoc(local) => {
+            state.st_loc(offset, *local, safe_unwrap_err!(verifier.stack.pop()))?
+        }
+
+        Bytecode::FreezeRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let frozen = state.freeze_ref(offset, id)?;
+            verifier.push(frozen)?
+        }
+        Bytecode::Eq | Bytecode::Neq => {
+            let v1 = safe_unwrap_err!(verifier.stack.pop());
+            let v2 = safe_unwrap_err!(verifier.stack.pop());
+            let value = state.comparison(offset, v1, v2)?;
+            verifier.push(value)?
+        }
+        Bytecode::ReadRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.read_ref(offset, id)?;
+            verifier.push(value)?
+        }
+        Bytecode::WriteRef => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            safe_assert!(val_operand.is_value());
+            state.write_ref(offset, id)?
+        }
+
+        Bytecode::MutBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, true, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowLoc(local) => {
+            let value = state.borrow_loc(offset, false, *local)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, true, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowField(field_handle_index) => {
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, *field_handle_index)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
+            let value = state.borrow_field(offset, false, id, field_inst.handle)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, true, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, true, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobal(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.borrow_global(offset, false, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.borrow_global(offset, false, struct_inst.def)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFrom(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let value = state.move_from(offset, *idx)?;
+            verifier.push(value)?
+        }
+        Bytecode::MoveFromGeneric(idx) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let value = state.move_from(offset, struct_inst.def)?;
+            verifier.push(value)?
+        }
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let function_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            call(verifier, state, offset, function_handle, meter)?
+        }
+
+        Bytecode::Ret => {
+            let mut return_values = vec![];
+            for _ in 0..verifier.function_view.return_().len() {
+                return_values.push(safe_unwrap_err!(verifier.stack.pop()));
+            }
+            return_values.reverse();
+
+            state.ret(offset, return_values)?
+        }
+
+        Bytecode::Branch(_)
+        | Bytecode::Nop
+        | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU64
+        | Bytecode::CastU128
+        | Bytecode::CastU256
+        | Bytecode::Not
+        | Bytecode::Exists(_)
+        | Bytecode::ExistsGeneric(_) => (),
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) | Bytecode::Abort => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+        }
+        Bytecode::MoveTo(_) | Bytecode::MoveToGeneric(_) => {
+            // resource value
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // signer reference
+            state.release_value(safe_unwrap_err!(verifier.stack.pop()));
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(state.value_for(&SignatureToken::Bool))?
+        }
+        Bytecode::LdU8(_) => verifier.push(state.value_for(&SignatureToken::U8))?,
+        Bytecode::LdU16(_) => verifier.push(state.value_for(&SignatureToken::U16))?,
+        Bytecode::LdU32(_) => verifier.push(state.value_for(&SignatureToken::U32))?,
+        Bytecode::LdU64(_) => verifier.push(state.value_for(&SignatureToken::U64))?,
+        Bytecode::LdU128(_) => verifier.push(state.value_for(&SignatureToken::U128))?,
+        Bytecode::LdU256(_) => verifier.push(state.value_for(&SignatureToken::U256))?,
+        Bytecode::LdConst(idx) => {
+            let signature = &verifier.resolver.constant_at(*idx).type_;
+            verifier.push(state.value_for(signature))?
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor
+        | Bytecode::Shl
+        | Bytecode::Shr
+        | Bytecode::Or
+        | Bytecode::And
+        | Bytecode::Lt
+        | Bytecode::Gt
+        | Bytecode::Le
+        | Bytecode::Ge => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            // TODO maybe call state.value_for
+            verifier.push(AbstractValue::NonReference)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            pack(verifier, struct_def)?
+        }
+        Bytecode::Unpack(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            unpack(verifier, struct_def)?
+        }
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            unpack(verifier, struct_def)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let result = verifier.stack.pop_eq_n(num_to_pop);
+                let abs_value = safe_unwrap_err!(result);
+                safe_assert!(abs_value.is_value());
+            }
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&SignatureToken::Vector(Box::new(element_type))))?
+        }
+
+        Bytecode::VecLen(_) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, false)?;
+            verifier.push(state.value_for(&SignatureToken::U64))?
+        }
+
+        Bytecode::VecImmBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, false)?;
+            verifier.push(elem_ref)?
+        }
+        Bytecode::VecMutBorrow(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, true)?;
+            verifier.push(elem_ref)?
+        }
+
+        Bytecode::VecPushBack(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push(state.value_for(&element_type))?
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+
+            let element_type = vec_element_type(verifier, *idx)?;
+            verifier.push_n(state.value_for(&element_type), *num)?
+        }
+
+        Bytecode::VecSwap(_) => {
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap_err!(verifier.stack.pop());
+            state.vector_op(offset, vec_ref, true)?;
+        }
+    };
+    Ok(())
+}
+
+impl<'a> TransferFunctions for ReferenceSafetyAnalysis<'a> {
+    type State = AbstractState;
+    type Error = PartialVMError;
+
+    fn execute(
+        &mut self,
+        state: &mut Self::State,
+        bytecode: &Bytecode,
+        index: CodeOffset,
+        last_index: CodeOffset,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(self, state, bytecode, index, meter)?;
+        if index == last_index {
+            safe_assert!(self.stack.is_empty());
+            *state = state.construct_canonical_state()
+        }
+        Ok(())
+    }
+}
+
+impl<'a> AbstractInterpreter for ReferenceSafetyAnalysis<'a> {}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs
new file mode 100644
index 000000000..ac18d7a8a
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/bounds_check.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex_literal::hex;
+use move_binary_format::file_format::CompiledScript;
+
+#[test]
+fn script_with_too_many_locals() {
+    let bad_script = hex!("a11ceb0b05000000010500d1018701010101010705050601070101010101070505060107050505050505060107010505050601070101010101070505060107050a0101010101070505060107010101010107050506010705050505050506010701050505060107010101010107010101010c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c050c0c0c0c0c0c0c0c0c0c0c012d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c030602000000070b010c000a20010b000c010500");
+    let _ = CompiledScript::deserialize(&bad_script).unwrap_err();
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/mod.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/mod.rs
new file mode 100644
index 000000000..84a8075de
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+mod bounds_check;
+#[cfg(test)]
+mod reference_analysis;
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
new file mode 100644
index 000000000..9ba65e5da
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
@@ -0,0 +1,323 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex,
+        Bytecode::{self, *},
+        CodeUnit, Constant, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature,
+        SignatureIndex,
+        SignatureToken::{self, *},
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructHandleIndex, TypeSignature, Visibility,
+        Visibility::*,
+    },
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::str::FromStr;
+
+#[test]
+fn unbalanced_stack_crash() {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: vec![
+            LdFalse,
+            BrTrue(13),
+            MoveLoc(3),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(6),
+            Pop,
+            MoveLoc(5),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(0),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            Pop,
+            Pop,
+            Pop,
+            Ret,
+        ],
+        locals: SignatureIndex::new(2),
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    match crate::verify_module_unmetered(&module) {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::GLOBAL_REFERENCE_ERROR),
+    }
+}
+
+#[test]
+fn too_many_locals() {
+    // Create a signature of 128 elements. This will be used both for locals and parameters,
+    // thus the overall size will be 256. If this is not intercepted in bounds checks,
+    // as a result the following iterator in abstract state
+    // would be empty, breaking reference analysis: `0..self.num_locals as LocalIndex`
+    // (since LocalIndex is u8).
+    let sign_128 = (0..128)
+        .map(|_| Reference(Box::new(U64)))
+        .collect::<Vec<_>>();
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![AbilitySet::ALL],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(sign_128)],
+        identifiers: vec![Identifier::new("x").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![CopyLoc(2), StLoc(33), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+
+    match res {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::TOO_MANY_LOCALS),
+    }
+}
+
+#[test]
+fn borrow_graph() {
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![
+            Reference(Box::new(U64)),
+            Reference(Box::new(U64)),
+        ])],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![MoveLoc(0), MoveLoc(1), StLoc(0), StLoc(1), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_unmetered(&module);
+    assert!(res.is_ok());
+}
+
+#[test]
+fn indirect_code() {
+    use Bytecode::*;
+    let v = 0;
+    let v_ref = 1;
+    let x = 2;
+    let x_ref = 3;
+    let vsig = SignatureIndex(2);
+    let next = 16;
+    let mut code = vec![
+        // x = 10; x_ref = &mut x;
+        LdU64(10),
+        StLoc(x),
+        MutBorrowLoc(x),
+        StLoc(x_ref),
+        // v = vector[100, 1000]; v_ref = &mut v
+        LdU64(100),
+        LdU64(1000),
+        VecPack(vsig, 2),
+        StLoc(v),
+        MutBorrowLoc(v),
+        StLoc(v_ref),
+        // if (*x_ref == 0) return;
+        CopyLoc(x_ref),
+        ReadRef,
+        LdU64(0),
+        Eq,
+        BrFalse(next),
+        Ret,
+    ];
+    assert_eq!(code.len(), next as usize);
+    code.extend(vec![
+        // creates dangling reference on second iteration
+        // _ = vec_pop_back(x_ref)
+        CopyLoc(v_ref),
+        VecPopBack(vsig),
+        Pop,
+        // *x_ref = 0
+        LdU64(0),
+        CopyLoc(x_ref),
+        WriteRef,
+        // x_ref = vec_mut_borrow(v_ref, 0);
+        CopyLoc(v_ref),
+        LdU64(0),
+        VecMutBorrow(vsig),
+        StLoc(x_ref),
+    ]);
+    let nops = vec![Nop; (u16::MAX as usize) - code.len() - 1];
+    code.extend(nops);
+    code.push(Branch(10));
+    assert_eq!(code.len(), (u16::MAX as usize));
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                SignatureToken::Vector(Box::new(SignatureToken::U64)),
+                SignatureToken::MutableReference(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::U64,
+                )))),
+                SignatureToken::U64,
+                SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            ]),
+            Signature(vec![SignatureToken::U64]),
+        ],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code,
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_with_config_unmetered(&VerifierConfig::unbounded(), &module)
+        .unwrap_err();
+    assert_eq!(
+        res.major_status(),
+        StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR
+    );
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs
new file mode 100644
index 000000000..85916339f
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs
@@ -0,0 +1,181 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that a script or entry function a valid
+//! signature, which entails
+//! - (DEPRECATED) All signer arguments are occur before non-signer arguments
+//! - (DEPRECATED) All types non-signer arguments have a type that is valid for constants
+//! - (DEPRECATED) Has an empty return type
+//! - All return types are not references
+//! - Satisfies the additional checks provided as an argument via `check_signature`
+//! `check_signature` should be used by adapters to quickly and easily verify custom signature
+//! rules for entrypoints
+
+use move_binary_format::{
+    access::ModuleAccess,
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, CompiledScript, FunctionDefinitionIndex, SignatureIndex, SignatureToken,
+        TableIndex,
+    },
+    file_format_common::{VERSION_1, VERSION_5},
+    IndexKind,
+};
+use move_core_types::{identifier::IdentStr, vm_status::StatusCode};
+
+pub type FnCheckScriptSignature = fn(
+    &BinaryIndexedView,
+    /* is_entry */ bool,
+    SignatureIndex,
+    Option<SignatureIndex>,
+) -> PartialVMResult<()>;
+
+/// This function checks the extra requirements on the signature of the main function of a script.
+pub fn verify_script(
+    script: &CompiledScript,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    if script.version >= VERSION_5 {
+        return Ok(());
+    }
+
+    let resolver = &BinaryIndexedView::Script(script);
+    let parameters = script.parameters;
+    let return_ = None;
+    verify_main_signature_impl(resolver, true, parameters, return_, check_signature)
+        .map_err(|e| e.finish(Location::Script))
+}
+
+pub fn verify_module(
+    module: &CompiledModule,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    // important for not breaking old modules
+    if module.version < VERSION_5 {
+        return Ok(());
+    }
+
+    for (idx, _fdef) in module
+        .function_defs()
+        .iter()
+        .enumerate()
+        .filter(|(_idx, fdef)| fdef.is_entry)
+    {
+        verify_module_function_signature(
+            module,
+            FunctionDefinitionIndex(idx as TableIndex),
+            check_signature,
+        )?
+    }
+    Ok(())
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+pub fn verify_module_function_signature_by_name(
+    module: &CompiledModule,
+    name: &IdentStr,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef_opt = module.function_defs().iter().enumerate().find(|(_, fdef)| {
+        module.identifier_at(module.function_handle_at(fdef.function).name) == name
+    });
+    let (idx, _fdef) = fdef_opt.ok_or_else(|| {
+        PartialVMError::new(StatusCode::VERIFICATION_ERROR)
+            .with_message("function not found in verify_module_script_function".to_string())
+            .finish(Location::Module(module.self_id()))
+    })?;
+    verify_module_function_signature(
+        module,
+        FunctionDefinitionIndex(idx as TableIndex),
+        check_signature,
+    )
+}
+
+/// This function checks the extra requirements on the signature of the script visible function
+/// when it serves as an entry point for script execution
+fn verify_module_function_signature(
+    module: &CompiledModule,
+    idx: FunctionDefinitionIndex,
+    check_signature: FnCheckScriptSignature,
+) -> VMResult<()> {
+    let fdef = module.function_def_at(idx);
+
+    let resolver = &BinaryIndexedView::Module(module);
+    let fhandle = module.function_handle_at(fdef.function);
+    let parameters = fhandle.parameters;
+    let return_ = fhandle.return_;
+    verify_main_signature_impl(
+        resolver,
+        fdef.is_entry,
+        parameters,
+        Some(return_),
+        check_signature,
+    )
+    .map_err(|e| {
+        e.at_index(IndexKind::FunctionDefinition, idx.0)
+            .finish(Location::Module(module.self_id()))
+    })
+}
+
+fn verify_main_signature_impl(
+    resolver: &BinaryIndexedView,
+    is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+    check_signature: FnCheckScriptSignature,
+) -> PartialVMResult<()> {
+    let deprecated_logic = resolver.version() < VERSION_5 && is_entry;
+
+    if deprecated_logic {
+        legacy_script_signature_checks(resolver, is_entry, parameters_idx, return_idx)?;
+    }
+    check_signature(resolver, is_entry, parameters_idx, return_idx)
+}
+
+pub fn no_additional_script_signature_checks(
+    _resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    _parameters: SignatureIndex,
+    _return_type: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    Ok(())
+}
+
+pub fn legacy_script_signature_checks(
+    resolver: &BinaryIndexedView,
+    _is_entry: bool,
+    parameters_idx: SignatureIndex,
+    return_idx: Option<SignatureIndex>,
+) -> PartialVMResult<()> {
+    use SignatureToken as S;
+    let empty_vec = &vec![];
+    let parameters = &resolver.signature_at(parameters_idx).0;
+    let return_types = return_idx
+        .map(|idx| &resolver.signature_at(idx).0)
+        .unwrap_or(empty_vec);
+    // Check that all `signer` arguments occur before non-`signer` arguments
+    // signer is a type that can only be populated by the Move VM. And its value is filled
+    // based on the sender of the transaction
+    let all_args_have_valid_type = if resolver.version() <= VERSION_1 {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Reference(inner) if matches!(&**inner, S::Signer)))
+            .all(|typ| typ.is_valid_for_constant())
+    } else {
+        parameters
+            .iter()
+            .skip_while(|typ| matches!(typ, S::Signer))
+            .all(|typ| typ.is_valid_for_constant())
+    };
+    let has_valid_return_type = return_types.is_empty();
+    if !all_args_have_valid_type || !has_valid_return_type {
+        Err(PartialVMError::new(
+            StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE,
+        ))
+    } else {
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/signature.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/signature.rs
new file mode 100644
index 000000000..3894b4b44
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/signature.rs
@@ -0,0 +1,402 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying signature tokens used in types of function
+//! parameters, locals, and fields of structs are well-formed. References can only occur at the
+//! top-level in all tokens.  Additionally, references cannot occur at all in field types.
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeUnit, CompiledModule, CompiledScript, FunctionDefinition,
+        FunctionHandle, Signature, SignatureIndex, SignatureToken, StructDefinition,
+        StructFieldInformation, StructTypeParameter, TableIndex,
+    },
+    file_format_common::VERSION_6,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct SignatureChecker<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> SignatureChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let sig_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        sig_check.verify_signature_pool(module.signatures())?;
+        sig_check.verify_function_signatures(module.function_handles())?;
+        sig_check.verify_fields(module.struct_defs())?;
+        sig_check.verify_code_units(module.function_defs())
+    }
+
+    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+        let sig_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        sig_check.verify_signature_pool(script.signatures())?;
+        sig_check.verify_function_signatures(script.function_handles())?;
+        sig_check.check_instantiation(script.parameters, &script.type_parameters)?;
+        sig_check.verify_code(script.code(), &script.type_parameters)
+    }
+
+    fn verify_signature_pool(&self, signatures: &[Signature]) -> PartialVMResult<()> {
+        for i in 0..signatures.len() {
+            self.check_signature(SignatureIndex::new(i as TableIndex))?
+        }
+        Ok(())
+    }
+
+    fn verify_function_signatures(
+        &self,
+        function_handles: &[FunctionHandle],
+    ) -> PartialVMResult<()> {
+        let err_handler = |err: PartialVMError, idx| {
+            err.at_index(IndexKind::Signature, idx as TableIndex)
+                .at_index(IndexKind::FunctionHandle, idx as TableIndex)
+        };
+
+        for (idx, fh) in function_handles.iter().enumerate() {
+            self.check_signature(fh.return_)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_instantiation(fh.return_, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_signature(fh.parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            self.check_instantiation(fh.parameters, &fh.type_parameters)
+                .map_err(|err| err_handler(err, idx))?;
+            if !fh.type_parameters.is_empty() {}
+        }
+        Ok(())
+    }
+
+    fn verify_fields(&self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
+        for (struct_def_idx, struct_def) in struct_defs.iter().enumerate() {
+            let fields = match &struct_def.field_information {
+                StructFieldInformation::Native => continue,
+                StructFieldInformation::Declared(fields) => fields,
+            };
+            let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+            let err_handler = |err: PartialVMError, idx| {
+                err.at_index(IndexKind::FieldDefinition, idx as TableIndex)
+                    .at_index(IndexKind::StructDefinition, struct_def_idx as TableIndex)
+            };
+            for (field_offset, field_def) in fields.iter().enumerate() {
+                self.check_signature_token(&field_def.signature.0)
+                    .map_err(|err| err_handler(err, field_offset))?;
+                let type_param_constraints: Vec<_> =
+                    struct_handle.type_param_constraints().collect();
+                self.check_type_instantiation(&field_def.signature.0, &type_param_constraints)
+                    .map_err(|err| err_handler(err, field_offset))?;
+
+                self.check_phantom_params(
+                    &field_def.signature.0,
+                    false,
+                    &struct_handle.type_parameters,
+                )
+                .map_err(|err| err_handler(err, field_offset))?;
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_code_units(&self, function_defs: &[FunctionDefinition]) -> PartialVMResult<()> {
+        for (func_def_idx, func_def) in function_defs.iter().enumerate() {
+            // skip native functions
+            let code = match &func_def.code {
+                Some(code) => code,
+                None => continue,
+            };
+            let func_handle = self.resolver.function_handle_at(func_def.function);
+            self.verify_code(code, &func_handle.type_parameters)
+                .map_err(|err| {
+                    err.at_index(IndexKind::Signature, code.locals.0)
+                        .at_index(IndexKind::FunctionDefinition, func_def_idx as TableIndex)
+                })?
+        }
+        Ok(())
+    }
+
+    fn verify_code(&self, code: &CodeUnit, type_parameters: &[AbilitySet]) -> PartialVMResult<()> {
+        self.check_signature(code.locals)?;
+        self.check_instantiation(code.locals, type_parameters)?;
+
+        // Check if the type actuals in certain bytecode instructions are well defined.
+        use Bytecode::*;
+        for (offset, instr) in code.code.iter().enumerate() {
+            let result = match instr {
+                CallGeneric(idx) => {
+                    let func_inst = self.resolver.function_instantiation_at(*idx);
+                    let func_handle = self.resolver.function_handle_at(func_inst.handle);
+                    let type_arguments = &self.resolver.signature_at(func_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        func_handle.type_parameters.iter().copied(),
+                        type_parameters,
+                    )
+                }
+                PackGeneric(idx)
+                | UnpackGeneric(idx)
+                | ExistsGeneric(idx)
+                | MoveFromGeneric(idx)
+                | MoveToGeneric(idx)
+                | ImmBorrowGlobalGeneric(idx)
+                | MutBorrowGlobalGeneric(idx) => {
+                    let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                    let struct_def = self.resolver.struct_def_at(struct_inst.def)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(struct_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                ImmBorrowFieldGeneric(idx) | MutBorrowFieldGeneric(idx) => {
+                    let field_inst = self.resolver.field_instantiation_at(*idx)?;
+                    let field_handle = self.resolver.field_handle_at(field_inst.handle)?;
+                    let struct_def = self.resolver.struct_def_at(field_handle.owner)?;
+                    let struct_handle = self.resolver.struct_handle_at(struct_def.struct_handle);
+                    let type_arguments = &self.resolver.signature_at(field_inst.type_parameters).0;
+                    self.check_signature_tokens(type_arguments)?;
+                    self.check_generic_instance(
+                        type_arguments,
+                        struct_handle.type_param_constraints(),
+                        type_parameters,
+                    )
+                }
+                VecPack(idx, _)
+                | VecLen(idx)
+                | VecImmBorrow(idx)
+                | VecMutBorrow(idx)
+                | VecPushBack(idx)
+                | VecPopBack(idx)
+                | VecUnpack(idx, _)
+                | VecSwap(idx) => {
+                    let type_arguments = &self.resolver.signature_at(*idx).0;
+                    if type_arguments.len() != 1 {
+                        return Err(PartialVMError::new(
+                            StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+                        )
+                        .with_message(format!(
+                            "expected 1 type token for vector operations, got {}",
+                            type_arguments.len()
+                        )));
+                    }
+                    self.check_signature_tokens(type_arguments)
+                }
+
+                // List out the other options explicitly so there's a compile error if a new
+                // bytecode gets added.
+                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
+                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
+                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
+                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
+                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
+                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
+                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
+                | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => Ok(()),
+            };
+            result.map_err(|err| {
+                err.append_message_with_separator(' ', format!("at offset {} ", offset))
+            })?
+        }
+        Ok(())
+    }
+
+    /// Checks that phantom type parameters are only used in phantom position.
+    fn check_phantom_params(
+        &self,
+        ty: &SignatureToken,
+        is_phantom_pos: bool,
+        type_parameters: &[StructTypeParameter],
+    ) -> PartialVMResult<()> {
+        match ty {
+            SignatureToken::Vector(ty) => self.check_phantom_params(ty, false, type_parameters)?,
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                let sh = self.resolver.struct_handle_at(*idx);
+                for (i, ty) in type_arguments.iter().enumerate() {
+                    self.check_phantom_params(
+                        ty,
+                        sh.type_parameters[i].is_phantom,
+                        type_parameters,
+                    )?;
+                }
+            }
+            SignatureToken::TypeParameter(idx) => {
+                if type_parameters[*idx as usize].is_phantom && !is_phantom_pos {
+                    return Err(PartialVMError::new(
+                        StatusCode::INVALID_PHANTOM_TYPE_PARAM_POSITION,
+                    )
+                    .with_message(
+                        "phantom type parameter cannot be used in non-phantom position".to_string(),
+                    ));
+                }
+            }
+
+            SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => {}
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// References are only permitted at the top level.
+    fn check_signature(&self, idx: SignatureIndex) -> PartialVMResult<()> {
+        for token in &self.resolver.signature_at(idx).0 {
+            match token {
+                SignatureToken::Reference(inner) | SignatureToken::MutableReference(inner) => {
+                    self.check_signature_token(inner)?
+                }
+                _ => self.check_signature_token(token)?,
+            }
+        }
+        Ok(())
+    }
+
+    /// Checks if the given types are well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_tokens(&self, tys: &[SignatureToken]) -> PartialVMResult<()> {
+        for ty in tys {
+            self.check_signature_token(ty)?
+        }
+        Ok(())
+    }
+
+    /// Checks if the given type is well defined in the given context.
+    /// No references are permitted.
+    fn check_signature_token(&self, ty: &SignatureToken) -> PartialVMResult<()> {
+        use SignatureToken::*;
+        match ty {
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => Ok(()),
+            Reference(_) | MutableReference(_) => {
+                // TODO: Prop tests expect us to NOT check the inner types.
+                // Revisit this once we rework prop tests.
+                Err(PartialVMError::new(StatusCode::INVALID_SIGNATURE_TOKEN)
+                    .with_message("reference not allowed".to_string()))
+            }
+            Vector(ty) => self.check_signature_token(ty),
+            StructInstantiation(_, type_arguments) => self.check_signature_tokens(type_arguments),
+        }
+    }
+
+    fn check_instantiation(
+        &self,
+        idx: SignatureIndex,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        for ty in &self.resolver.signature_at(idx).0 {
+            self.check_type_instantiation(ty, type_parameters)?
+        }
+        Ok(())
+    }
+
+    fn check_type_instantiation(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if self.resolver.version() >= VERSION_6 {
+            for ty in s.preorder_traversal() {
+                self.check_type_instantiation_(ty, type_parameters)?
+            }
+            Ok(())
+        } else {
+            // preserve buggy, but harmless old behavior for backward compatibility
+            self.check_type_instantiation_(s, type_parameters)
+        }
+    }
+
+    fn check_type_instantiation_(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        match s {
+            SignatureToken::StructInstantiation(idx, type_arguments) => {
+                // Check that the instantiation satisfies the `idx` struct's constraints
+                // Cannot be checked completely if we do not know the constraints of type parameters
+                // i.e. it cannot be checked unless we are inside some module member. The only case
+                // where that happens is when checking the signature pool itself
+                let sh = self.resolver.struct_handle_at(*idx);
+                self.check_generic_instance(
+                    type_arguments,
+                    sh.type_param_constraints(),
+                    type_parameters,
+                )
+            }
+            SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Vector(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => Ok(()),
+        }
+    }
+
+    // Checks if the given types are well defined and satisfy the constraints in the given context.
+    fn check_generic_instance(
+        &self,
+        type_arguments: &[SignatureToken],
+        constraints: impl ExactSizeIterator<Item = AbilitySet>,
+        global_abilities: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        if type_arguments.len() != constraints.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "expected {} type argument(s), got {}",
+                        constraints.len(),
+                        type_arguments.len()
+                    ),
+                ),
+            );
+        }
+
+        for (constraint, ty) in constraints.into_iter().zip(type_arguments) {
+            let given = self.resolver.abilities(ty, global_abilities)?;
+            if !constraint.is_subset(given) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "expected type with abilities {:?} got type actual {:?} with incompatible \
+                        abilities {:?}",
+                        constraint, ty, given
+                    )));
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/stack_usage_verifier.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/stack_usage_verifier.rs
new file mode 100644
index 000000000..e4c1d5c0b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/stack_usage_verifier.rs
@@ -0,0 +1,273 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker for verifying that basic blocks in the bytecode instruction
+//! sequence of a function use the evaluation stack in a balanced manner. Every basic block,
+//! except those that end in Ret (return to caller) opcode, must leave the stack height the
+//! same as at the beginning of the block. A basic block that ends in Ret opcode must increase
+//! the stack height by the number of values returned by the function as indicated in its
+//! signature. Additionally, the stack height must not dip below that at the beginning of the
+//! block for any basic block.
+use crate::meter::Meter;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeUnit, FunctionDefinitionIndex, Signature, StructFieldInformation},
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_config::verifier::VerifierConfig;
+
+pub(crate) struct StackUsageVerifier<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    current_function: Option<FunctionDefinitionIndex>,
+    code: &'a CodeUnit,
+    return_: &'a Signature,
+}
+
+impl<'a> StackUsageVerifier<'a> {
+    pub(crate) fn verify(
+        config: &VerifierConfig,
+        resolver: &'a BinaryIndexedView<'a>,
+        function_view: &'a FunctionView,
+        _meter: &mut impl Meter, // TODO: metering
+    ) -> PartialVMResult<()> {
+        let verifier = Self {
+            resolver,
+            current_function: function_view.index(),
+            code: function_view.code(),
+            return_: function_view.return_(),
+        };
+
+        for block_id in function_view.cfg().blocks() {
+            verifier.verify_block(config, block_id, function_view.cfg())?
+        }
+        Ok(())
+    }
+
+    fn verify_block(
+        &self,
+        config: &VerifierConfig,
+        block_id: BlockId,
+        cfg: &dyn ControlFlowGraph,
+    ) -> PartialVMResult<()> {
+        let code = &self.code.code;
+        let mut stack_size_increment = 0;
+        let block_start = cfg.block_start(block_id);
+        let mut overall_push = 0;
+        for i in block_start..=cfg.block_end(block_id) {
+            let (num_pops, num_pushes) = self.instruction_effect(&code[i as usize])?;
+            if let Some(new_pushes) = u64::checked_add(overall_push, num_pushes) {
+                overall_push = new_pushes
+            };
+
+            // Check that the accumulated pushes does not exceed a pre-defined max size
+            if let Some(max_push_size) = config.max_push_size {
+                if overall_push > max_push_size as u64 {
+                    return Err(PartialVMError::new(StatusCode::VALUE_STACK_PUSH_OVERFLOW)
+                        .at_code_offset(self.current_function(), block_start));
+                }
+            }
+
+            // Check that the stack height is sufficient to accommodate the number
+            // of pops this instruction does
+            if stack_size_increment < num_pops {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            }
+            if let Some(new_incr) = u64::checked_sub(stack_size_increment, num_pops) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+            if let Some(new_incr) = u64::checked_add(stack_size_increment, num_pushes) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+
+            if stack_size_increment > config.max_value_stack_size as u64 {
+                return Err(PartialVMError::new(StatusCode::VALUE_STACK_OVERFLOW)
+                    .at_code_offset(self.current_function(), block_start));
+            }
+        }
+
+        if stack_size_increment == 0 {
+            Ok(())
+        } else {
+            Err(
+                PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                    .at_code_offset(self.current_function(), block_start),
+            )
+        }
+    }
+
+    /// The effect of an instruction is a tuple where the first element
+    /// is the number of pops it does, and the second element is the number
+    /// of pushes it does
+    fn instruction_effect(&self, instruction: &Bytecode) -> PartialVMResult<(u64, u64)> {
+        Ok(match instruction {
+            // Instructions that pop, but don't push
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::StLoc(_)
+            | Bytecode::Abort => (1, 0),
+
+            // Instructions that push, but don't pop
+            Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_) => (0, 1),
+
+            // Instructions that pop and push once
+            Bytecode::Not
+            | Bytecode::FreezeRef
+            | Bytecode::ReadRef
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::VecLen(_)
+            | Bytecode::VecPopBack(_) => (1, 1),
+
+            // Binary operations (pop twice and push once)
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge => (2, 1),
+
+            // Vector packing and unpacking
+            Bytecode::VecPack(_, num) => (*num, 1),
+            Bytecode::VecUnpack(_, num) => (1, *num),
+
+            // Vector indexing operations (pop twice and push once)
+            Bytecode::VecImmBorrow(_) | Bytecode::VecMutBorrow(_) => (2, 1),
+
+            // MoveTo, WriteRef, and VecPushBack pop twice but do not push
+            Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::WriteRef
+            | Bytecode::VecPushBack(_) => (2, 0),
+
+            // VecSwap pops three times but does not push
+            Bytecode::VecSwap(_) => (3, 0),
+
+            // Branch and Nop neither pops nor pushes
+            Bytecode::Branch(_) | Bytecode::Nop => (0, 0),
+
+            // Return performs `return_count` pops
+            Bytecode::Ret => {
+                let return_count = self.return_.len();
+                (return_count as u64, 0)
+            }
+
+            // Call performs `arg_count` pops and `return_count` pushes
+            Bytecode::Call(idx) => {
+                let function_handle = self.resolver.function_handle_at(*idx);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+            Bytecode::CallGeneric(idx) => {
+                let func_inst = self.resolver.function_instantiation_at(*idx);
+                let function_handle = self.resolver.function_handle_at(func_inst.handle);
+                let arg_count = self.resolver.signature_at(function_handle.parameters).len() as u64;
+                let return_count = self.resolver.signature_at(function_handle.return_).len() as u64;
+                (arg_count, return_count)
+            }
+
+            // Pack performs `num_fields` pops and one push
+            Bytecode::Pack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+            Bytecode::PackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (field_count as u64, 1)
+            }
+
+            // Unpack performs one pop and `num_fields` pushes
+            Bytecode::Unpack(idx) => {
+                let struct_definition = self.resolver.struct_def_at(*idx)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
+                let struct_definition = self.resolver.struct_def_at(struct_inst.def)?;
+                let field_count = match &struct_definition.field_information {
+                    // 'Native' here is an error that will be caught by the bytecode verifier later
+                    StructFieldInformation::Native => 0,
+                    StructFieldInformation::Declared(fields) => fields.len(),
+                };
+                (1, field_count as u64)
+            }
+        })
+    }
+
+    fn current_function(&self) -> FunctionDefinitionIndex {
+        self.current_function.unwrap_or(FunctionDefinitionIndex(0))
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/struct_defs.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/struct_defs.rs
new file mode 100644
index 000000000..711837245
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/struct_defs.rs
@@ -0,0 +1,147 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module provides a checker for verifying that struct definitions in a module are not
+//! recursive. Since the module dependency graph is acylic by construction, applying this checker to
+//! each module in isolation guarantees that there is no structural recursion globally.
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        CompiledModule, SignatureToken, StructDefinitionIndex, StructHandleIndex, TableIndex,
+    },
+    internals::ModuleIndex,
+    views::StructDefinitionView,
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+use petgraph::{algo::toposort, graphmap::DiGraphMap};
+use std::collections::{BTreeMap, BTreeSet};
+
+pub struct RecursiveStructDefChecker<'a> {
+    module: &'a CompiledModule,
+}
+
+impl<'a> RecursiveStructDefChecker<'a> {
+    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+        let checker = Self { module };
+        let graph = StructDefGraphBuilder::new(checker.module).build()?;
+
+        // toposort is iterative while petgraph::algo::is_cyclic_directed is recursive. Prefer
+        // the iterative solution here as this code may be dealing with untrusted data.
+        match toposort(&graph, None) {
+            Ok(_) => Ok(()),
+            Err(cycle) => Err(verification_error(
+                StatusCode::RECURSIVE_STRUCT_DEFINITION,
+                IndexKind::StructDefinition,
+                cycle.node_id().into_index() as TableIndex,
+            )),
+        }
+    }
+}
+
+/// Given a module, build a graph of struct definitions. This is useful when figuring out whether
+/// the struct definitions in module form a cycle.
+struct StructDefGraphBuilder<'a> {
+    module: &'a CompiledModule,
+    /// Used to follow field definitions' signatures' struct handles to their struct definitions.
+    handle_to_def: BTreeMap<StructHandleIndex, StructDefinitionIndex>,
+}
+
+impl<'a> StructDefGraphBuilder<'a> {
+    fn new(module: &'a CompiledModule) -> Self {
+        let mut handle_to_def = BTreeMap::new();
+        // the mapping from struct definitions to struct handles is already checked to be 1-1 by
+        // DuplicationChecker
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let sh_idx = struct_def.struct_handle;
+            handle_to_def.insert(sh_idx, StructDefinitionIndex(idx as TableIndex));
+        }
+
+        Self {
+            module,
+            handle_to_def,
+        }
+    }
+
+    fn build(self) -> PartialVMResult<DiGraphMap<StructDefinitionIndex, ()>> {
+        let mut neighbors = BTreeMap::new();
+        for idx in 0..self.module.struct_defs().len() {
+            let sd_idx = StructDefinitionIndex::new(idx as TableIndex);
+            self.add_struct_defs(&mut neighbors, sd_idx)?
+        }
+
+        let edges = neighbors
+            .into_iter()
+            .flat_map(|(parent, children)| children.into_iter().map(move |child| (parent, child)));
+        Ok(DiGraphMap::from_edges(edges))
+    }
+
+    fn add_struct_defs(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<()> {
+        let struct_def = self.module.struct_def_at(idx);
+        let struct_def = StructDefinitionView::new(self.module, struct_def);
+        // The fields iterator is an option in the case of native structs. Flatten makes an empty
+        // iterator for that case
+        for field in struct_def.fields().into_iter().flatten() {
+            self.add_signature_token(neighbors, idx, field.signature_token())?
+        }
+        Ok(())
+    }
+
+    fn add_signature_token(
+        &self,
+        neighbors: &mut BTreeMap<StructDefinitionIndex, BTreeSet<StructDefinitionIndex>>,
+        cur_idx: StructDefinitionIndex,
+        token: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        use SignatureToken as T;
+        match token {
+            T::Bool
+            | T::U8
+            | T::U16
+            | T::U32
+            | T::U64
+            | T::U128
+            | T::U256
+            | T::Address
+            | T::Signer
+            | T::TypeParameter(_) => (),
+            T::Reference(_) | T::MutableReference(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Reference field when checking recursive structs".to_owned()),
+                )
+            }
+            T::Vector(inner) => self.add_signature_token(neighbors, cur_idx, inner)?,
+            T::Struct(sh_idx) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+            }
+            T::StructInstantiation(sh_idx, inners) => {
+                if let Some(struct_def_idx) = self.handle_to_def.get(sh_idx) {
+                    neighbors
+                        .entry(cur_idx)
+                        .or_default()
+                        .insert(*struct_def_idx);
+                }
+                for t in inners {
+                    self.add_signature_token(neighbors, cur_idx, t)?
+                }
+            }
+        };
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/type_safety.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/type_safety.rs
new file mode 100644
index 000000000..3cbcf4ba2
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/type_safety.rs
@@ -0,0 +1,1012 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module defines the transfer functions for verifying type safety of a procedure body.
+//! It does not utilize control flow, but does check each block independently
+
+use std::num::NonZeroU64;
+
+use crate::meter::{Meter, Scope};
+use move_abstract_stack::AbstractStack;
+use move_binary_format::{
+    binary_views::{BinaryIndexedView, FunctionView},
+    control_flow_graph::ControlFlowGraph,
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        AbilitySet, Bytecode, CodeOffset, FieldHandleIndex, FunctionDefinitionIndex,
+        FunctionHandle, LocalIndex, Signature, SignatureToken, SignatureToken as ST,
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
+    },
+    safe_unwrap_err,
+};
+use move_core_types::vm_status::StatusCode;
+
+struct Locals<'a> {
+    param_count: usize,
+    parameters: &'a Signature,
+    locals: &'a Signature,
+}
+
+const TYPE_NODE_COST: u128 = 30;
+
+impl<'a> Locals<'a> {
+    fn new(parameters: &'a Signature, locals: &'a Signature) -> Self {
+        Self {
+            param_count: parameters.len(),
+            parameters,
+            locals,
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        let idx = i as usize;
+        if idx < self.param_count {
+            &self.parameters.0[idx]
+        } else {
+            &self.locals.0[idx - self.param_count]
+        }
+    }
+}
+
+struct TypeSafetyChecker<'a> {
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    locals: Locals<'a>,
+    stack: AbstractStack<SignatureToken>,
+}
+
+impl<'a> TypeSafetyChecker<'a> {
+    fn new(resolver: &'a BinaryIndexedView<'a>, function_view: &'a FunctionView<'a>) -> Self {
+        let locals = Locals::new(function_view.parameters(), function_view.locals());
+        Self {
+            resolver,
+            function_view,
+            locals,
+            stack: AbstractStack::new(),
+        }
+    }
+
+    fn local_at(&self, i: LocalIndex) -> &SignatureToken {
+        self.locals.local_at(i)
+    }
+
+    fn abilities(&self, t: &SignatureToken) -> PartialVMResult<AbilitySet> {
+        self.resolver
+            .abilities(t, self.function_view.type_parameters())
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(
+            self.function_view
+                .index()
+                .unwrap_or(FunctionDefinitionIndex(0)),
+            offset,
+        )
+    }
+
+    fn push(&mut self, meter: &mut impl Meter, ty: SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push(ty));
+        Ok(())
+    }
+
+    fn push_n(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        safe_unwrap_err!(self.stack.push_n(ty, n));
+        Ok(())
+    }
+
+    fn charge_ty(&mut self, meter: &mut impl Meter, ty: &SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty_(meter, ty, 1)
+    }
+
+    fn charge_ty_(
+        &mut self,
+        meter: &mut impl Meter,
+        ty: &SignatureToken,
+        n: u64,
+    ) -> PartialVMResult<()> {
+        meter.add_items(
+            Scope::Function,
+            TYPE_NODE_COST,
+            ty.preorder_traversal().count() * (n as usize),
+        )
+    }
+
+    fn charge_tys(
+        &mut self,
+        meter: &mut impl Meter,
+        tys: &[SignatureToken],
+    ) -> PartialVMResult<()> {
+        for ty in tys {
+            self.charge_ty(meter, ty)?
+        }
+        Ok(())
+    }
+}
+
+pub(crate) fn verify<'a>(
+    resolver: &'a BinaryIndexedView<'a>,
+    function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    let verifier = &mut TypeSafetyChecker::new(resolver, function_view);
+
+    for block_id in function_view.cfg().blocks() {
+        for offset in function_view.cfg().instr_indexes(block_id) {
+            let instr = &verifier.function_view.code().code[offset as usize];
+            verify_instr(verifier, instr, offset, meter)?
+        }
+    }
+
+    Ok(())
+}
+
+// helper for both `ImmBorrowField` and `MutBorrowField`
+fn borrow_field(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    field_handle_index: FieldHandleIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // load operand and check mutability constraints
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if mut_ && !operand.is_mutable_reference() {
+        return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    // check the reference on the stack is the expected type.
+    // Load the type that owns the field according to the instruction.
+    // For generic fields access, this step materializes that type
+    let field_handle = verifier.resolver.field_handle_at(field_handle_index)?;
+    let struct_def = verifier.resolver.struct_def_at(field_handle.owner)?;
+    let expected_type = materialize_type(struct_def.struct_handle, type_args);
+    match operand {
+        ST::Reference(inner) | ST::MutableReference(inner) if expected_type == *inner => (),
+        _ => return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)),
+    }
+
+    let field_def = match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            return Err(verifier.error(StatusCode::BORROWFIELD_BAD_FIELD_ERROR, offset));
+        }
+        StructFieldInformation::Declared(fields) => {
+            // TODO: review the whole error story here, way too much is left to chances...
+            // definition of a more proper OM for the verifier could work around the problem
+            // (maybe, maybe not..)
+            &fields[field_handle.field as usize]
+        }
+    };
+    let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(field_type)
+        } else {
+            ST::Reference(field_type)
+        },
+    )?;
+    Ok(())
+}
+
+// helper for both `ImmBorrowLoc` and `MutBorrowLoc`
+fn borrow_loc(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: LocalIndex,
+) -> PartialVMResult<()> {
+    let loc_signature = verifier.local_at(idx).clone();
+
+    if loc_signature.is_reference() {
+        return Err(verifier.error(StatusCode::BORROWLOC_REFERENCE_ERROR, offset));
+    }
+
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(loc_signature))
+        } else {
+            ST::Reference(Box::new(loc_signature))
+        },
+    )?;
+    Ok(())
+}
+
+fn borrow_global(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    mut_: bool,
+    idx: StructDefinitionIndex,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    // check and consume top of stack
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let struct_def = verifier.resolver.struct_def_at(idx)?;
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(struct_type))
+        } else {
+            ST::Reference(Box::new(struct_type))
+        },
+    )?;
+    Ok(())
+}
+
+fn call(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    function_handle: &FunctionHandle,
+    type_actuals: &Signature,
+) -> PartialVMResult<()> {
+    let parameters = verifier.resolver.signature_at(function_handle.parameters);
+    for parameter in parameters.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if (type_actuals.is_empty() && &arg != parameter)
+            || (!type_actuals.is_empty() && arg != instantiate(parameter, type_actuals))
+        {
+            return Err(verifier.error(StatusCode::CALL_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+    for return_type in &verifier.resolver.signature_at(function_handle.return_).0 {
+        verifier.push(meter, instantiate(return_type, type_actuals))?
+    }
+    Ok(())
+}
+
+fn type_fields_signature(
+    verifier: &mut TypeSafetyChecker,
+    _meter: &mut impl Meter, // TODO: metering
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<Signature> {
+    match &struct_def.field_information {
+        StructFieldInformation::Native => {
+            // TODO: this is more of "unreachable"
+            Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset))
+        }
+        StructFieldInformation::Declared(fields) => {
+            let mut field_sig = vec![];
+            for field_def in fields.iter() {
+                field_sig.push(instantiate(&field_def.signature.0, type_args));
+            }
+            Ok(Signature(field_sig))
+        }
+    }
+}
+
+fn pack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0.iter().rev() {
+        let arg = safe_unwrap_err!(verifier.stack.pop());
+        if &arg != sig {
+            return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
+        }
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn unpack(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+
+    // Pop an abstract value from the stack and check if its type is equal to the one
+    // declared.
+    let arg = safe_unwrap_err!(verifier.stack.pop());
+    if arg != struct_type {
+        return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
+    for sig in field_sig.0 {
+        verifier.push(meter, sig)?
+    }
+    Ok(())
+}
+
+fn exists(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        // TODO better error here
+        return Err(verifier.error(
+            StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
+            offset,
+        ));
+    }
+
+    verifier.push(meter, ST::Bool)?;
+    Ok(())
+}
+
+fn move_from(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let operand = safe_unwrap_err!(verifier.stack.pop());
+    if operand != ST::Address {
+        return Err(verifier.error(StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR, offset));
+    }
+
+    verifier.push(meter, struct_type)?;
+    Ok(())
+}
+
+fn move_to(
+    verifier: &mut TypeSafetyChecker,
+    offset: CodeOffset,
+    struct_def: &StructDefinition,
+    type_args: &Signature,
+) -> PartialVMResult<()> {
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    if !verifier.abilities(&struct_type)?.has_key() {
+        return Err(verifier.error(StatusCode::MOVETO_WITHOUT_KEY_ABILITY, offset));
+    }
+
+    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let key_struct_operand = safe_unwrap_err!(verifier.stack.pop());
+    let signer_reference_operand = safe_unwrap_err!(verifier.stack.pop());
+    if key_struct_operand != struct_type {
+        return Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset));
+    }
+    match signer_reference_operand {
+        ST::Reference(inner) => match *inner {
+            ST::Signer => Ok(()),
+            _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+        },
+        _ => Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset)),
+    }
+}
+
+fn borrow_vector_element(
+    verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
+    declared_element_type: &SignatureToken,
+    offset: CodeOffset,
+    mut_ref_only: bool,
+) -> PartialVMResult<()> {
+    let operand_idx = safe_unwrap_err!(verifier.stack.pop());
+    let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+
+    // check index
+    if operand_idx != ST::U64 {
+        return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+    }
+
+    // check vector and update stack
+    let element_type = match get_vector_element_type(operand_vec, mut_ref_only) {
+        Some(ty) if &ty == declared_element_type => ty,
+        _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+    };
+    let element_ref_type = if mut_ref_only {
+        ST::MutableReference(Box::new(element_type))
+    } else {
+        ST::Reference(Box::new(element_type))
+    };
+    verifier.push(meter, element_ref_type)?;
+
+    Ok(())
+}
+
+fn verify_instr(
+    verifier: &mut TypeSafetyChecker,
+    bytecode: &Bytecode,
+    offset: CodeOffset,
+    meter: &mut impl Meter,
+) -> PartialVMResult<()> {
+    match bytecode {
+        Bytecode::Pop => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let abilities = verifier
+                .resolver
+                .abilities(&operand, verifier.function_view.type_parameters());
+            if !abilities?.has_drop() {
+                return Err(verifier.error(StatusCode::POP_WITHOUT_DROP_ABILITY, offset));
+            }
+        }
+
+        Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::Bool {
+                return Err(verifier.error(StatusCode::BR_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::StLoc(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if &operand != verifier.local_at(*idx) {
+                return Err(verifier.error(StatusCode::STLOC_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Abort => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand != ST::U64 {
+                return Err(verifier.error(StatusCode::ABORT_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Ret => {
+            let return_ = &verifier.function_view.return_().0;
+            for return_type in return_.iter().rev() {
+                let operand = safe_unwrap_err!(verifier.stack.pop());
+                if &operand != return_type {
+                    return Err(verifier.error(StatusCode::RET_TYPE_MISMATCH_ERROR, offset));
+                }
+            }
+        }
+
+        Bytecode::Branch(_) | Bytecode::Nop => (),
+
+        Bytecode::FreezeRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::MutableReference(inner) => verifier.push(meter, ST::Reference(inner))?,
+                _ => return Err(verifier.error(StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::MutBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            true,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::ImmBorrowField(field_handle_index) => borrow_field(
+            verifier,
+            meter,
+            offset,
+            false,
+            *field_handle_index,
+            &Signature(vec![]),
+        )?,
+
+        Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
+            let field_inst = verifier
+                .resolver
+                .field_instantiation_at(*field_inst_index)?;
+            let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
+        }
+
+        Bytecode::LdU8(_) => {
+            verifier.push(meter, ST::U8)?;
+        }
+
+        Bytecode::LdU16(_) => {
+            verifier.push(meter, ST::U16)?;
+        }
+
+        Bytecode::LdU32(_) => {
+            verifier.push(meter, ST::U32)?;
+        }
+
+        Bytecode::LdU64(_) => {
+            verifier.push(meter, ST::U64)?;
+        }
+
+        Bytecode::LdU128(_) => {
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::LdU256(_) => {
+            verifier.push(meter, ST::U256)?;
+        }
+
+        Bytecode::LdConst(idx) => {
+            let signature = verifier.resolver.constant_at(*idx).type_.clone();
+            verifier.push(meter, signature)?;
+        }
+
+        Bytecode::LdTrue | Bytecode::LdFalse => {
+            verifier.push(meter, ST::Bool)?;
+        }
+
+        Bytecode::CopyLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            if !verifier
+                .resolver
+                .abilities(&local_signature, verifier.function_view.type_parameters())?
+                .has_copy()
+            {
+                return Err(verifier.error(StatusCode::COPYLOC_WITHOUT_COPY_ABILITY, offset));
+            }
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MoveLoc(idx) => {
+            let local_signature = verifier.local_at(*idx).clone();
+            verifier.push(meter, local_signature)?
+        }
+
+        Bytecode::MutBorrowLoc(idx) => borrow_loc(verifier, meter, offset, true, *idx)?,
+
+        Bytecode::ImmBorrowLoc(idx) => borrow_loc(verifier, meter, offset, false, *idx)?,
+
+        Bytecode::Call(idx) => {
+            let function_handle = verifier.resolver.function_handle_at(*idx);
+            call(verifier, meter, offset, function_handle, &Signature(vec![]))?
+        }
+
+        Bytecode::CallGeneric(idx) => {
+            let func_inst = verifier.resolver.function_instantiation_at(*idx);
+            let func_handle = verifier.resolver.function_handle_at(func_inst.handle);
+            let type_args = &verifier.resolver.signature_at(func_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            call(verifier, meter, offset, func_handle, type_args)?
+        }
+
+        Bytecode::Pack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::PackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            pack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::Unpack(idx) => {
+            let struct_definition = verifier.resolver.struct_def_at(*idx)?;
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
+        }
+
+        Bytecode::UnpackGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            unpack(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::ReadRef => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            match operand {
+                ST::Reference(inner) | ST::MutableReference(inner) => {
+                    if !verifier.abilities(&inner)?.has_copy() {
+                        return Err(
+                            verifier.error(StatusCode::READREF_WITHOUT_COPY_ABILITY, offset)
+                        );
+                    }
+                    verifier.push(meter, *inner)?;
+                }
+                _ => return Err(verifier.error(StatusCode::READREF_TYPE_MISMATCH_ERROR, offset)),
+            }
+        }
+
+        Bytecode::WriteRef => {
+            let ref_operand = safe_unwrap_err!(verifier.stack.pop());
+            let val_operand = safe_unwrap_err!(verifier.stack.pop());
+            let ref_inner_signature = match ref_operand {
+                ST::MutableReference(inner) => *inner,
+                _ => {
+                    return Err(
+                        verifier.error(StatusCode::WRITEREF_NO_MUTABLE_REFERENCE_ERROR, offset)
+                    )
+                }
+            };
+            if !verifier.abilities(&ref_inner_signature)?.has_drop() {
+                return Err(verifier.error(StatusCode::WRITEREF_WITHOUT_DROP_ABILITY, offset));
+            }
+
+            if val_operand != ref_inner_signature {
+                return Err(verifier.error(StatusCode::WRITEREF_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::CastU8 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U8)?;
+        }
+        Bytecode::CastU64 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U64)?;
+        }
+        Bytecode::CastU128 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::Add
+        | Bytecode::Sub
+        | Bytecode::Mul
+        | Bytecode::Mod
+        | Bytecode::Div
+        | Bytecode::BitOr
+        | Bytecode::BitAnd
+        | Bytecode::Xor => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, operand1)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Shl | Bytecode::Shr => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand2.is_integer() && operand1 == ST::U8 {
+                verifier.push(meter, operand2)?;
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Or | Bytecode::And => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1 == ST::Bool && operand2 == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Not => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if operand == ST::Bool {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Eq | Bytecode::Neq => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if verifier.abilities(&operand1)?.has_drop() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?;
+            } else {
+                return Err(verifier.error(StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => {
+            let operand1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand2 = safe_unwrap_err!(verifier.stack.pop());
+            if operand1.is_integer() && operand1 == operand2 {
+                verifier.push(meter, ST::Bool)?
+            } else {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+        }
+
+        Bytecode::MutBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, true, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::MutBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, true, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::ImmBorrowGlobal(idx) => {
+            borrow_global(verifier, meter, offset, false, *idx, &Signature(vec![]))?
+        }
+
+        Bytecode::ImmBorrowGlobalGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, false, struct_inst.def, type_inst)?
+        }
+
+        Bytecode::Exists(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            exists(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::ExistsGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            exists(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveFrom(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_from(verifier, meter, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveFromGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_from(verifier, meter, offset, struct_def, type_args)?
+        }
+
+        Bytecode::MoveTo(idx) => {
+            let struct_def = verifier.resolver.struct_def_at(*idx)?;
+            move_to(verifier, offset, struct_def, &Signature(vec![]))?
+        }
+
+        Bytecode::MoveToGeneric(idx) => {
+            let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
+            let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
+            let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_to(verifier, offset, struct_def, type_args)?
+        }
+
+        Bytecode::VecPack(idx, num) => {
+            let element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if let Some(num_to_pop) = NonZeroU64::new(*num) {
+                let is_mismatched = verifier
+                    .stack
+                    .pop_eq_n(num_to_pop)
+                    .map(|t| element_type != &t)
+                    .unwrap_or(true);
+                if is_mismatched {
+                    return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+                }
+            }
+            verifier.push(meter, ST::Vector(Box::new(element_type.clone())))?;
+        }
+
+        Bytecode::VecLen(idx) => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand, false) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, ST::U64)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecImmBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, false)?
+        }
+        Bytecode::VecMutBorrow(idx) => {
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            borrow_vector_element(verifier, meter, declared_element_type, offset, true)?
+        }
+
+        Bytecode::VecPushBack(idx) => {
+            let operand_elem = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if declared_element_type != &operand_elem {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecPopBack(idx) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {
+                    verifier.push(meter, derived_element_type)?;
+                }
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+
+        Bytecode::VecUnpack(idx, num) => {
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            if operand_vec != ST::Vector(Box::new(declared_element_type.clone())) {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            verifier.push_n(meter, declared_element_type.clone(), *num)?;
+        }
+
+        Bytecode::VecSwap(idx) => {
+            let operand_idx2 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_idx1 = safe_unwrap_err!(verifier.stack.pop());
+            let operand_vec = safe_unwrap_err!(verifier.stack.pop());
+            if operand_idx1 != ST::U64 || operand_idx2 != ST::U64 {
+                return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+            }
+            let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
+            match get_vector_element_type(operand_vec, true) {
+                Some(derived_element_type) if &derived_element_type == declared_element_type => {}
+                _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
+            };
+        }
+        Bytecode::CastU16 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U16)?;
+        }
+        Bytecode::CastU32 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U32)?;
+        }
+        Bytecode::CastU256 => {
+            let operand = safe_unwrap_err!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U256)?;
+        }
+    };
+    Ok(())
+}
+
+//
+// Helpers functions for types
+//
+
+fn materialize_type(struct_handle: StructHandleIndex, type_args: &Signature) -> SignatureToken {
+    if type_args.is_empty() {
+        ST::Struct(struct_handle)
+    } else {
+        ST::StructInstantiation(struct_handle, type_args.0.clone())
+    }
+}
+
+fn instantiate(token: &SignatureToken, subst: &Signature) -> SignatureToken {
+    use SignatureToken::*;
+
+    if subst.0.is_empty() {
+        return token.clone();
+    }
+
+    match token {
+        Bool => Bool,
+        U8 => U8,
+        U16 => U16,
+        U32 => U32,
+        U64 => U64,
+        U128 => U128,
+        U256 => U256,
+        Address => Address,
+        Signer => Signer,
+        Vector(ty) => Vector(Box::new(instantiate(ty, subst))),
+        Struct(idx) => Struct(*idx),
+        StructInstantiation(idx, struct_type_args) => StructInstantiation(
+            *idx,
+            struct_type_args
+                .iter()
+                .map(|ty| instantiate(ty, subst))
+                .collect(),
+        ),
+        Reference(ty) => Reference(Box::new(instantiate(ty, subst))),
+        MutableReference(ty) => MutableReference(Box::new(instantiate(ty, subst))),
+        TypeParameter(idx) => {
+            // Assume that the caller has previously parsed and verified the structure of the
+            // file and that this guarantees that type parameter indices are always in bounds.
+            debug_assert!((*idx as usize) < subst.len());
+            subst.0[*idx as usize].clone()
+        }
+    }
+}
+
+fn get_vector_element_type(
+    vector_ref_ty: SignatureToken,
+    mut_ref_only: bool,
+) -> Option<SignatureToken> {
+    use SignatureToken::*;
+    match vector_ref_ty {
+        Reference(referred_type) => {
+            if mut_ref_only {
+                None
+            } else if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        MutableReference(referred_type) => {
+            if let ST::Vector(element_type) = *referred_type {
+                Some(*element_type)
+            } else {
+                None
+            }
+        }
+        _ => None,
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/verifier.rs b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/verifier.rs
new file mode 100644
index 000000000..fd8b92a58
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-bytecode-verifier/src/verifier.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module contains the public APIs supported by the bytecode verifier.
+use crate::meter::{DummyMeter, Meter};
+use crate::{
+    ability_field_requirements, check_duplication::DuplicationChecker,
+    code_unit_verifier::CodeUnitVerifier, constants, friends,
+    instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
+    limits::LimitsVerifier, script_signature,
+    script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
+    struct_defs::RecursiveStructDefChecker,
+};
+use move_binary_format::{
+    check_bounds::BoundsChecker,
+    errors::{Location, VMResult},
+    file_format::{CompiledModule, CompiledScript},
+};
+use move_vm_config::verifier::VerifierConfig;
+use std::time::Instant;
+
+/// Helper for a "canonical" verification of a module.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_module_unmetered(module: &CompiledModule) -> VMResult<()> {
+    verify_module_with_config_unmetered(&VerifierConfig::default(), module)
+}
+
+pub fn verify_module_with_config_for_test(
+    name: &str,
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    const MAX_MODULE_SIZE: usize = 65355;
+    let mut bytes = vec![];
+    module.serialize(&mut bytes).unwrap();
+    let now = Instant::now();
+    let result = verify_module_with_config_metered(config, module, meter);
+    eprintln!(
+        "--> {}: verification time: {:.3}ms, result: {}, size: {}kb",
+        name,
+        (now.elapsed().as_micros() as f64) / 1000.0,
+        if let Err(e) = &result {
+            format!("{:?}", e.major_status())
+        } else {
+            "Ok".to_string()
+        },
+        bytes.len() / 1000
+    );
+    // Also check whether the module actually fits into our payload size
+    assert!(
+        bytes.len() <= MAX_MODULE_SIZE,
+        "test module exceeds size limit {} (given size {})",
+        MAX_MODULE_SIZE,
+        bytes.len()
+    );
+    result
+}
+
+pub fn verify_module_with_config_metered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_module(module).map_err(|e| {
+        // We can't point the error at the module, because if bounds-checking
+        // failed, we cannot safely index into module's handle to itself.
+        e.finish(Location::Undefined)
+    })?;
+    LimitsVerifier::verify_module(config, module)?;
+    DuplicationChecker::verify_module(module)?;
+    SignatureChecker::verify_module(module)?;
+    InstructionConsistency::verify_module(module)?;
+    constants::verify_module(module)?;
+    friends::verify_module(module)?;
+    ability_field_requirements::verify_module(module)?;
+    RecursiveStructDefChecker::verify_module(module)?;
+    InstantiationLoopChecker::verify_module(module)?;
+    CodeUnitVerifier::verify_module(config, module, meter)?;
+
+    script_signature::verify_module(module, no_additional_script_signature_checks)
+}
+
+pub fn verify_module_with_config_unmetered(
+    config: &VerifierConfig,
+    module: &CompiledModule,
+) -> VMResult<()> {
+    verify_module_with_config_metered(config, module, &mut DummyMeter)
+}
+
+/// Helper for a "canonical" verification of a script.
+///
+/// Clients that rely on verification should call the proper passes
+/// internally rather than using this function.
+///
+/// This function is intended to provide a verification path for clients
+/// that do not require full control over verification. It is advised to
+/// call this umbrella function instead of each individual checkers to
+/// minimize the code locations that need to be updated should a new checker
+/// is introduced.
+pub fn verify_script_unmetered(script: &CompiledScript) -> VMResult<()> {
+    verify_script_with_config_unmetered(&VerifierConfig::default(), script)
+}
+
+pub fn verify_script_with_config_metered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+    meter: &mut impl Meter,
+) -> VMResult<()> {
+    BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
+    LimitsVerifier::verify_script(config, script)?;
+    DuplicationChecker::verify_script(script)?;
+    SignatureChecker::verify_script(script)?;
+    InstructionConsistency::verify_script(script)?;
+    constants::verify_script(script)?;
+    CodeUnitVerifier::verify_script(config, script, meter)?;
+    script_signature::verify_script(script, no_additional_script_signature_checks)
+}
+
+pub fn verify_script_with_config_unmetered(
+    config: &VerifierConfig,
+    script: &CompiledScript,
+) -> VMResult<()> {
+    verify_script_with_config_metered(config, script, &mut DummyMeter)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/Cargo.toml b/vendors/move/move-execution/v1/crates/move-stdlib/Cargo.toml
new file mode 100644
index 000000000..09a8303bd
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "move-stdlib-v1"
+version = "0.1.1"
+edition = "2021"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Diem stdlib"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[dependencies]
+move-errmapgen.workspace = true
+move-docgen.workspace = true
+move-command-line-common.workspace = true
+move-prover.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-core-types.workspace = true
+move-vm-runtime = { path = "../move-vm-runtime", package = "move-vm-runtime-v1" }
+log.workspace = true
+walkdir.workspace = true
+smallvec.workspace = true
+sha2.workspace = true
+sha3.workspace = true
+anyhow = "1.0.71"
+hex.workspace = true
+
+[dev-dependencies]
+move-unit-test.workspace = true
+tempfile.workspace = true
+dir-diff.workspace = true
+file_diff.workspace = true
+move-cli.workspace = true
+move-package.workspace = true
+
+[features]
+default = []
+testing = []
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/Move.toml b/vendors/move/move-execution/v1/crates/move-stdlib/Move.toml
new file mode 100644
index 000000000..2a4fdf0b6
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveStdlib"
+version = "1.5.0"
+
+[addresses]
+std = "_"
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/overview.md b/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/overview.md
new file mode 100644
index 000000000..74606d23f
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/overview.md
@@ -0,0 +1,7 @@
+# Move Stdlib Modules
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+## Index
+
+> {{move-index}}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/references.md b/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/references.md
new file mode 100644
index 000000000..7e71c78da
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/doc_templates/references.md
@@ -0,0 +1,2 @@
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/ascii.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/ascii.md
new file mode 100644
index 000000000..5ed684675
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/ascii.md
@@ -0,0 +1,536 @@
+
+<a name="0x1_ascii"></a>
+
+# Module `0x1::ascii`
+
+The <code>ASCII</code> module defines basic string and char newtypes in Move that verify
+that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+
+
+-  [Struct `String`](#0x1_ascii_String)
+-  [Struct `Char`](#0x1_ascii_Char)
+-  [Constants](#@Constants_0)
+-  [Function `char`](#0x1_ascii_char)
+-  [Function `string`](#0x1_ascii_string)
+-  [Function `try_string`](#0x1_ascii_try_string)
+-  [Function `all_characters_printable`](#0x1_ascii_all_characters_printable)
+-  [Function `push_char`](#0x1_ascii_push_char)
+-  [Function `pop_char`](#0x1_ascii_pop_char)
+-  [Function `length`](#0x1_ascii_length)
+-  [Function `as_bytes`](#0x1_ascii_as_bytes)
+-  [Function `into_bytes`](#0x1_ascii_into_bytes)
+-  [Function `byte`](#0x1_ascii_byte)
+-  [Function `is_valid_char`](#0x1_ascii_is_valid_char)
+-  [Function `is_printable_char`](#0x1_ascii_is_printable_char)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+</code></pre>
+
+
+
+<a name="0x1_ascii_String"></a>
+
+## Struct `String`
+
+The <code><a href="ascii.md#0x1_ascii_String">String</a></code> struct holds a vector of bytes that all represent
+valid ASCII characters. Note that these ASCII characters may not all
+be printable. To determine if a <code><a href="ascii.md#0x1_ascii_String">String</a></code> contains only "printable"
+characters you should use the <code>all_characters_printable</code> predicate
+defined in this module.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <b>forall</b> i in 0..len(bytes): <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_Char"></a>
+
+## Struct `Char`
+
+An ASCII character.
+
+
+<pre><code><b>struct</b> <a href="ascii.md#0x1_ascii_Char">Char</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>byte: u8</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>invariant</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte);
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_ascii_EINVALID_ASCII_CHARACTER"></a>
+
+An invalid ASCII character was encountered when creating an ASCII string.
+
+
+<pre><code><b>const</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>: u64 = 65536;
+</code></pre>
+
+
+
+<a name="0x1_ascii_char"></a>
+
+## Function `char`
+
+Convert a <code>byte</code> into a <code><a href="ascii.md#0x1_ascii_Char">Char</a></code> that is checked to make sure it is valid ASCII.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_char">char</a>(byte: u8): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <b>assert</b>!(<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte), <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>);
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(byte) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_string"></a>
+
+## Function `string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Aborts if
+<code>bytes</code> contains non-ASCII characters.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">String</a> {
+   <b>let</b> x = <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes);
+   <b>assert</b>!(
+        <a href="option.md#0x1_option_is_some">option::is_some</a>(&x),
+        <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>
+   );
+   <a href="option.md#0x1_option_destroy_some">option::destroy_some</a>(x)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> exists i in 0..len(bytes): !<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[i]) <b>with</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_try_string"></a>
+
+## Function `try_string`
+
+Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1_ascii_String">String</a></code>. Returns
+<code>Some(&lt;ascii_string&gt;)</code> if the <code>bytes</code> contains all valid ASCII
+characters. Otherwise returns <code>None</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="ascii.md#0x1_ascii_String">ascii::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="ascii.md#0x1_ascii_String">String</a>&gt; {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> possible_byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(possible_byte)) <b>return</b> <a href="option.md#0x1_option_none">option::none</a>();
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(bytes[j]);
+   };
+   <a href="option.md#0x1_option_some">option::some</a>(<a href="ascii.md#0x1_ascii_String">String</a> { bytes })
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_all_characters_printable"></a>
+
+## Function `all_characters_printable`
+
+Returns <code><b>true</b></code> if all characters in <code><a href="string.md#0x1_string">string</a></code> are printable characters
+Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1_ascii_String">String</a></code>s are printable strings.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): bool {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&<a href="string.md#0x1_string">string</a>.bytes);
+   <b>let</b> i = 0;
+   <b>while</b> ({
+       <b>spec</b> {
+           <b>invariant</b> i &lt;= len;
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+       };
+       i &lt; len
+   }) {
+       <b>let</b> byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="string.md#0x1_string">string</a>.bytes, i);
+       <b>if</b> (!<a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte)) <b>return</b> <b>false</b>;
+       i = i + 1;
+   };
+   <b>spec</b> {
+       <b>assert</b> i == len;
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
+   };
+   <b>true</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> result ==&gt; (<b>forall</b> j in 0..len(<a href="string.md#0x1_string">string</a>.bytes): <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]));
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_push_char"></a>
+
+## Function `push_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>, char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>, char: <a href="ascii.md#0x1_ascii_Char">Char</a>) {
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes, char.byte);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) + 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_pop_char"></a>
+
+## Function `pop_char`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte: <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) - 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_length"></a>
+
+## Function `length`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_as_bytes"></a>
+
+## Function `as_bytes`
+
+Get the inner bytes of the <code><a href="string.md#0x1_string">string</a></code> as a reference
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   &<a href="string.md#0x1_string">string</a>.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_into_bytes"></a>
+
+## Function `into_bytes`
+
+Unpack the <code><a href="string.md#0x1_string">string</a></code> to get its backing bytes
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   <b>let</b> <a href="ascii.md#0x1_ascii_String">String</a> { bytes } = <a href="string.md#0x1_string">string</a>;
+   bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_byte"></a>
+
+## Function `byte`
+
+Unpack the <code>char</code> into its underlying byte.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_byte">byte</a>(char: <a href="ascii.md#0x1_ascii_Char">Char</a>): u8 {
+   <b>let</b> <a href="ascii.md#0x1_ascii_Char">Char</a> { byte } = char;
+   byte
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_valid_char"></a>
+
+## Function `is_valid_char`
+
+Returns <code><b>true</b></code> if <code>b</code> is a valid ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_valid_char">is_valid_char</a>(b: u8): bool {
+   b &lt;= 0x7F
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_ascii_is_printable_char"></a>
+
+## Function `is_printable_char`
+
+Returns <code><b>true</b></code> if <code>byte</code> is an printable ASCII character. Returns <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte: u8): bool {
+   byte &gt;= 0x20 && // Disallow metacharacters
+   <a href="ascii.md#0x1_ascii_byte">byte</a> &lt;= 0x7E // Don't allow DEL metacharacter
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/bcs.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/bcs.md
new file mode 100644
index 000000000..9b235af18
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/bcs.md
@@ -0,0 +1,59 @@
+
+<a name="0x1_bcs"></a>
+
+# Module `0x1::bcs`
+
+Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+Serialization). BCS is the binary encoding for Move resources and other non-module values
+published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+details on BCS.
+
+
+-  [Function `to_bytes`](#0x1_bcs_to_bytes)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bcs_to_bytes"></a>
+
+## Function `to_bytes`
+
+Return the binary representation of <code>v</code> in BCS (Binary Canonical Serialization) format
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="bcs.md#0x1_bcs_to_bytes">to_bytes</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+
+
+Native function which is defined in the prover's prelude.
+
+
+<a name="0x1_bcs_serialize"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="bcs.md#0x1_bcs_serialize">serialize</a>&lt;MoveValue&gt;(v: &MoveValue): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/bit_vector.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/bit_vector.md
new file mode 100644
index 000000000..79d5a5c3e
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/bit_vector.md
@@ -0,0 +1,447 @@
+
+<a name="0x1_bit_vector"></a>
+
+# Module `0x1::bit_vector`
+
+
+
+-  [Struct `BitVector`](#0x1_bit_vector_BitVector)
+-  [Constants](#@Constants_0)
+-  [Function `new`](#0x1_bit_vector_new)
+-  [Function `set`](#0x1_bit_vector_set)
+-  [Function `unset`](#0x1_bit_vector_unset)
+-  [Function `shift_left`](#0x1_bit_vector_shift_left)
+-  [Function `is_index_set`](#0x1_bit_vector_is_index_set)
+-  [Function `length`](#0x1_bit_vector_length)
+-  [Function `longest_set_sequence_starting_at`](#0x1_bit_vector_longest_set_sequence_starting_at)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_bit_vector_BitVector"></a>
+
+## Struct `BitVector`
+
+
+
+<pre><code><b>struct</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>length: u64</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>bit_field: <a href="vector.md#0x1_vector">vector</a>&lt;bool&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_bit_vector_EINDEX"></a>
+
+The provided index is out of bounds
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_ELENGTH"></a>
+
+An invalid length of bitvector was given
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 131073;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_MAX_SIZE"></a>
+
+The maximum allowed bitvector size
+
+
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>: u64 = 1024;
+</code></pre>
+
+
+
+<a name="0x1_bit_vector_new"></a>
+
+## Function `new`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_new">new</a>(length: u64): <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+    <b>assert</b>!(length &gt; 0, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>assert</b>!(<a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt; <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a>, <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>);
+    <b>let</b> counter = 0;
+    <b>let</b> bit_field = <a href="vector.md#0x1_vector_empty">vector::empty</a>();
+    <b>while</b> ({<b>spec</b> {
+        <b>invariant</b> counter &lt;= length;
+        <b>invariant</b> len(bit_field) == counter;
+    };
+        (counter &lt; length)}) {
+        <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> bit_field, <b>false</b>);
+        counter = counter + 1;
+    };
+    <b>spec</b> {
+        <b>assert</b> counter == length;
+        <b>assert</b> len(bit_field) == length;
+    };
+
+    <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a> {
+        length,
+        bit_field,
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a>;
+<b>ensures</b> result.length == length;
+<b>ensures</b> len(result.bit_field) == length;
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_NewAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_NewAbortsIf">NewAbortsIf</a> {
+    length: u64;
+    <b>aborts_if</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a> &lt;= 0 <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+    <b>aborts_if</b> length &gt;= <a href="bit_vector.md#0x1_bit_vector_MAX_SIZE">MAX_SIZE</a> <b>with</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_set"></a>
+
+## Function `set`
+
+Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>true</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a>;
+<b>ensures</b> bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_SetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_SetAbortsIf">SetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_unset"></a>
+
+## Function `unset`
+
+Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>false</b>;
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
+<b>ensures</b> !bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_UnsetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_shift_left"></a>
+
+## Function `shift_left`
+
+Shift the <code>bitvector</code> left by <code>amount</code>. If <code>amount</code> is greater than the
+bitvector's length the bitvector will be zeroed out.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, amount: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_shift_left">shift_left</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, amount: u64) {
+    <b>if</b> (amount &gt;= bitvector.length) {
+       <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field);
+       <b>let</b> i = 0;
+       <b>while</b> (i &lt; len) {
+           <b>let</b> elem = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, i);
+           *elem = <b>false</b>;
+           i = i + 1;
+       };
+    } <b>else</b> {
+        <b>let</b> i = amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <b>if</b> (<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, i)) <a href="bit_vector.md#0x1_bit_vector_set">set</a>(bitvector, i - amount)
+            <b>else</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i - amount);
+            i = i + 1;
+        };
+
+        i = bitvector.length - amount;
+
+        <b>while</b> (i &lt; bitvector.length) {
+            <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector, i);
+            i = i + 1;
+        };
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_is_index_set"></a>
+
+## Function `is_index_set`
+
+Return the value of the bit at <code>bit_index</code> in the <code>bitvector</code>. <code><b>true</b></code>
+represents "1" and <code><b>false</b></code> represents a 0
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&bitvector.bit_field, bit_index)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a>;
+<b>ensures</b> result == bitvector.bit_field[bit_index];
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_IsIndexSetAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_IsIndexSetAbortsIf">IsIndexSetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_bit_vector_spec_is_index_set"></a>
+
+
+<pre><code><b>fun</b> <a href="bit_vector.md#0x1_bit_vector_spec_is_index_set">spec_is_index_set</a>(bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64): bool {
+   <b>if</b> (bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector)) {
+       <b>false</b>
+   } <b>else</b> {
+       bitvector.bit_field[bit_index]
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_length"></a>
+
+## Function `length`
+
+Return the length (number of usable bits) of this bitvector
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_bit_vector_longest_set_sequence_starting_at"></a>
+
+## Function `longest_set_sequence_starting_at`
+
+Returns the length of the longest sequence of set bits starting at (and
+including) <code>start_index</code> in the <code>bitvector</code>. If there is no such
+sequence, then <code>0</code> is returned.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, start_index: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_longest_set_sequence_starting_at">longest_set_sequence_starting_at</a>(bitvector: &<a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, start_index: u64): u64 {
+    <b>assert</b>!(start_index &lt; bitvector.length, <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> index = start_index;
+
+    // Find the greatest index in the <a href="vector.md#0x1_vector">vector</a> such that all indices less than it are set.
+    <b>while</b> (index &lt; bitvector.length) {
+        <b>if</b> (!<a href="bit_vector.md#0x1_bit_vector_is_index_set">is_index_set</a>(bitvector, index)) <b>break</b>;
+        index = index + 1;
+    };
+
+    index - start_index
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/error.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/error.md
new file mode 100644
index 000000000..0cc2487da
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/error.md
@@ -0,0 +1,475 @@
+
+<a name="0x1_error"></a>
+
+# Module `0x1::error`
+
+This module defines a set of canonical error codes which are optional to use by applications for the
+<code><b>abort</b></code> and <code><b>assert</b>!</code> features.
+
+Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+Given an error category <code>0x1</code> and a reason <code>0x3</code>, a canonical abort code looks as <code>0x10003</code>.
+
+A module can use a canonical code with a constant declaration of the following form:
+
+```
+///  An invalid ASCII character was encountered when creating a string.
+const EINVALID_CHARACTER: u64 = 0x010003;
+```
+
+This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+error reason understand by the existing error map tooling, or as a canonical code.
+
+The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+error codes here are a bit richer than HTTP codes.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `canonical`](#0x1_error_canonical)
+-  [Function `invalid_argument`](#0x1_error_invalid_argument)
+-  [Function `out_of_range`](#0x1_error_out_of_range)
+-  [Function `invalid_state`](#0x1_error_invalid_state)
+-  [Function `unauthenticated`](#0x1_error_unauthenticated)
+-  [Function `permission_denied`](#0x1_error_permission_denied)
+-  [Function `not_found`](#0x1_error_not_found)
+-  [Function `aborted`](#0x1_error_aborted)
+-  [Function `already_exists`](#0x1_error_already_exists)
+-  [Function `resource_exhausted`](#0x1_error_resource_exhausted)
+-  [Function `internal`](#0x1_error_internal)
+-  [Function `not_implemented`](#0x1_error_not_implemented)
+-  [Function `unavailable`](#0x1_error_unavailable)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_error_ABORTED"></a>
+
+Concurrency conflict, such as read-modify-write conflict (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ABORTED">ABORTED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a name="0x1_error_ALREADY_EXISTS"></a>
+
+The resource that a client tried to create already exists (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>: u64 = 8;
+</code></pre>
+
+
+
+<a name="0x1_error_CANCELLED"></a>
+
+Request cancelled by the client (http: 499)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_CANCELLED">CANCELLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a name="0x1_error_INTERNAL"></a>
+
+Internal error (http: 500)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INTERNAL">INTERNAL</a>: u64 = 11;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_ARGUMENT"></a>
+
+Caller specified an invalid argument (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_STATE"></a>
+
+The system is not in a state where the operation can be performed (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_FOUND"></a>
+
+A specified resource is not found (http: 404)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_IMPLEMENTED"></a>
+
+Feature not implemented (http: 501)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>: u64 = 12;
+</code></pre>
+
+
+
+<a name="0x1_error_OUT_OF_RANGE"></a>
+
+An input or result of a computation is out of range (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_error_PERMISSION_DENIED"></a>
+
+client does not have sufficient permission (http: 403)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a name="0x1_error_RESOURCE_EXHAUSTED"></a>
+
+Out of gas or other forms of quota (http: 429)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAUTHENTICATED"></a>
+
+Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAVAILABLE"></a>
+
+The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a name="0x1_error_canonical"></a>
+
+## Function `canonical`
+
+Construct a canonical error code from a category and a reason.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64 {
+  (category &lt;&lt; 16) + reason
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+Functions to construct a canonical error code of the given category.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_out_of_range"></a>
+
+## Function `out_of_range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unauthenticated"></a>
+
+## Function `unauthenticated`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_permission_denied"></a>
+
+## Function `permission_denied`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_found"></a>
+
+## Function `not_found`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_aborted"></a>
+
+## Function `aborted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ABORTED">ABORTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_already_exists"></a>
+
+## Function `already_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_resource_exhausted"></a>
+
+## Function `resource_exhausted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INTERNAL">INTERNAL</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_implemented"></a>
+
+## Function `not_implemented`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unavailable"></a>
+
+## Function `unavailable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/fixed_point32.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/fixed_point32.md
new file mode 100644
index 000000000..55848f5f7
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/fixed_point32.md
@@ -0,0 +1,833 @@
+
+<a name="0x1_fixed_point32"></a>
+
+# Module `0x1::fixed_point32`
+
+Defines a fixed-point numeric type with a 32-bit integer part and
+a 32-bit fractional part.
+
+
+-  [Struct `FixedPoint32`](#0x1_fixed_point32_FixedPoint32)
+-  [Constants](#@Constants_0)
+-  [Function `multiply_u64`](#0x1_fixed_point32_multiply_u64)
+-  [Function `divide_u64`](#0x1_fixed_point32_divide_u64)
+-  [Function `create_from_rational`](#0x1_fixed_point32_create_from_rational)
+-  [Function `create_from_raw_value`](#0x1_fixed_point32_create_from_raw_value)
+-  [Function `get_raw_value`](#0x1_fixed_point32_get_raw_value)
+-  [Function `is_zero`](#0x1_fixed_point32_is_zero)
+-  [Function `min`](#0x1_fixed_point32_min)
+-  [Function `max`](#0x1_fixed_point32_max)
+-  [Function `create_from_u64`](#0x1_fixed_point32_create_from_u64)
+-  [Function `floor`](#0x1_fixed_point32_floor)
+-  [Function `ceil`](#0x1_fixed_point32_ceil)
+-  [Function `round`](#0x1_fixed_point32_round)
+-  [Module Specification](#@Module_Specification_1)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_fixed_point32_FixedPoint32"></a>
+
+## Struct `FixedPoint32`
+
+Define a fixed-point numeric type with 32 fractional bits.
+This is just a u64 integer but it is wrapped in a struct to
+make a unique type. This is a binary representation, so decimal
+values may not be exactly representable, but it provides more
+than 9 decimal digits of precision both before and after the
+decimal point (18 digits total). For comparison, double precision
+floating-point has less than 16 decimal digits of precision, so
+be careful about using floating-point to convert these values to
+decimal.
+
+
+<pre><code><b>struct</b> <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>value: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_fixed_point32_MAX_U64"></a>
+
+> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>: u128 = 18446744073709551615;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDENOMINATOR"></a>
+
+The denominator provided was zero
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION"></a>
+
+The quotient value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 131074;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EDIVISION_BY_ZERO"></a>
+
+A division by zero was encountered
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_EMULTIPLICATION"></a>
+
+The multiplied value would be too large to be held in a <code>u64</code>
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_ERATIO_OUT_OF_RANGE"></a>
+
+The computed ratio when converting to a <code><a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a></code> would be unrepresentable
+
+
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
+</code></pre>
+
+
+
+<a name="0x1_fixed_point32_multiply_u64"></a>
+
+## Function `multiply_u64`
+
+Multiply a u64 integer by a fixed-point number, truncating any
+fractional part of the product. This will abort if the product
+overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_multiply_u64">multiply_u64</a>(val: u64, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // The product of two 64 bit values <b>has</b> 128 bits, so perform the
+    // multiplication <b>with</b> u128 types and keep the full 128 bit product
+    // <b>to</b> avoid losing accuracy.
+    <b>let</b> unscaled_product = (val <b>as</b> u128) * (multiplier.value <b>as</b> u128);
+    // The unscaled product <b>has</b> 32 fractional bits (from the multiplier)
+    // so rescale it by shifting away the low bits.
+    <b>let</b> product = unscaled_product &gt;&gt; 32;
+    // Check whether the value is too large.
+    <b>assert</b>!(product &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>);
+    (product <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_MultiplyAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_MultiplyAbortsIf">MultiplyAbortsIf</a> {
+    val: num;
+    multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val, multiplier) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_multiply_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_multiply_u64">spec_multiply_u64</a>(val: num, multiplier: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val * multiplier.value) &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_divide_u64"></a>
+
+## Function `divide_u64`
+
+Divide a u64 integer by a fixed-point number, truncating any
+fractional part of the quotient. This will abort if the divisor
+is zero or if the quotient overflows.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_divide_u64">divide_u64</a>(val: u64, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    // Check for division by zero.
+    <b>assert</b>!(divisor.value != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>);
+    // First convert <b>to</b> 128 bits and then shift left <b>to</b>
+    // add 32 fractional zero bits <b>to</b> the dividend.
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_value / (divisor.value <b>as</b> u128);
+    // Check whether the value is too large.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>);
+    // the value may be too large, which will cause the cast <b>to</b> fail
+    // <b>with</b> an arithmetic <a href="error.md#0x1_error">error</a>.
+    (quotient <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_DivideAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_DivideAbortsIf">DivideAbortsIf</a> {
+    val: num;
+    divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>;
+    <b>aborts_if</b> divisor.value == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>;
+    <b>aborts_if</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val, divisor) &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_divide_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_divide_u64">spec_divide_u64</a>(val: num, divisor: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): num {
+   (val &lt;&lt; 32) / divisor.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_rational"></a>
+
+## Function `create_from_rational`
+
+Create a fixed-point value from a rational number specified by its
+numerator and denominator. Calling this function should be preferred
+for using <code><a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">Self::create_from_raw_value</a></code> which is also available.
+This will abort if the denominator is zero. It will also
+abort if the numerator is nonzero and the ratio is not in the range
+2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+rounding errors: if you round to display N digits after the decimal
+point, you can use a denominator of 10^N to avoid numbers where the
+very small imprecision in the binary representation could change the
+rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_rational">create_from_rational</a>(numerator: u64, denominator: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    // If the denominator is zero, this will <b>abort</b>.
+    // Scale the numerator <b>to</b> have 64 fractional bits and the denominator
+    // <b>to</b> have 32 fractional bits, so that the quotient will have 32
+    // fractional bits.
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(scaled_denominator != 0, <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>);
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>assert</b>!(quotient != 0 || numerator == 0, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    // Return the quotient <b>as</b> a fixed-point number. We first need <b>to</b> check whether the cast
+    // can succeed.
+    <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value: (quotient <b>as</b> u64) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator, denominator);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromRationalAbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
+    numerator: u64;
+    denominator: u64;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
+    <b>let</b> quotient = scaled_numerator / scaled_denominator;
+    <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>;
+    <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+    <b>aborts_if</b> quotient &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a> <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_rational"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_rational">spec_create_from_rational</a>(numerator: num, denominator: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (numerator &lt;&lt; 64) / (denominator &lt;&lt; 32)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_raw_value"></a>
+
+## Function `create_from_raw_value`
+
+Create a fixedpoint value from a raw value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_raw_value">create_from_raw_value</a>(value: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> { value }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result.value == value;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_get_raw_value"></a>
+
+## Function `get_raw_value`
+
+Accessor for the raw u64 value. Other less common operations, such as
+adding or subtracting FixedPoint32 values, can be done using the raw
+values directly.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_get_raw_value">get_raw_value</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_is_zero"></a>
+
+## Function `is_zero`
+
+Returns true if the ratio is zero.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_is_zero">is_zero</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): bool {
+    num.value == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_u64"></a>
+
+## Function `create_from_u64`
+
+Create a fixedpoint value from a u64 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>let</b> value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(value &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (value <b>as</b> u64)}
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: val &lt;&lt; 32}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint32 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 32
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u128) + (1 &lt;&lt; 32));
+    (val &gt;&gt; 32 <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint32 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 32) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 32
+    } <b>else</b> {
+        <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> boundary = (1 &lt;&lt; 32) / 2;
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/hash.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/hash.md
new file mode 100644
index 000000000..c054f33cb
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/hash.md
@@ -0,0 +1,65 @@
+
+<a name="0x1_hash"></a>
+
+# Module `0x1::hash`
+
+Module which defines SHA hashes for byte vectors.
+
+The functions in this module are natively declared both in the Move runtime
+as in the Move prover's prelude.
+
+
+-  [Function `sha2_256`](#0x1_hash_sha2_256)
+-  [Function `sha3_256`](#0x1_hash_sha3_256)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_hash_sha2_256"></a>
+
+## Function `sha2_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha2_256">sha2_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_hash_sha3_256"></a>
+
+## Function `sha3_256`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="hash.md#0x1_hash_sha3_256">sha3_256</a>(data: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/option.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/option.md
new file mode 100644
index 000000000..1c9ea0dcf
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/option.md
@@ -0,0 +1,877 @@
+
+<a name="0x1_option"></a>
+
+# Module `0x1::option`
+
+This module defines the Option type and its methods to represent and handle an optional value.
+
+
+-  [Struct `Option`](#0x1_option_Option)
+-  [Constants](#@Constants_0)
+-  [Function `none`](#0x1_option_none)
+-  [Function `some`](#0x1_option_some)
+-  [Function `is_none`](#0x1_option_is_none)
+-  [Function `is_some`](#0x1_option_is_some)
+-  [Function `contains`](#0x1_option_contains)
+-  [Function `borrow`](#0x1_option_borrow)
+-  [Function `borrow_with_default`](#0x1_option_borrow_with_default)
+-  [Function `get_with_default`](#0x1_option_get_with_default)
+-  [Function `fill`](#0x1_option_fill)
+-  [Function `extract`](#0x1_option_extract)
+-  [Function `borrow_mut`](#0x1_option_borrow_mut)
+-  [Function `swap`](#0x1_option_swap)
+-  [Function `swap_or_fill`](#0x1_option_swap_or_fill)
+-  [Function `destroy_with_default`](#0x1_option_destroy_with_default)
+-  [Function `destroy_some`](#0x1_option_destroy_some)
+-  [Function `destroy_none`](#0x1_option_destroy_none)
+-  [Function `to_vec`](#0x1_option_to_vec)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Schema](#@Helper_Schema_2)
+
+
+<pre><code><b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_option_Option"></a>
+
+## Struct `Option`
+
+Abstraction of a value that may or may not be present. Implemented with a vector of size
+zero or one because Move bytecode does not have ADTs.
+
+
+<pre><code><b>struct</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>vec: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+The size of vector is always less than equal to 1
+because it's 0 for "none" or 1 for "some".
+
+
+<pre><code><b>invariant</b> len(vec) &lt;= 1;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_option_EOPTION_IS_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>Some</code> while it should be <code>None</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 262144;
+</code></pre>
+
+
+
+<a name="0x1_option_EOPTION_NOT_SET"></a>
+
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an invalid state for the operation attempted.
+The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>None</code> while it should be <code>Some</code>.
+
+
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 262145;
+</code></pre>
+
+
+
+<a name="0x1_option_none"></a>
+
+## Function `none`
+
+Return an empty <code><a href="option.md#0x1_option_Option">Option</a></code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_none">none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_empty">vector::empty</a>() }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;();
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_none"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_none">spec_none</a>&lt;Element&gt;(): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec() }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_some"></a>
+
+## Function `some`
+
+Return an <code><a href="option.md#0x1_option_Option">Option</a></code> containing <code>e</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_some">some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <a href="option.md#0x1_option_Option">Option</a> { vec: <a href="vector.md#0x1_vector_singleton">vector::singleton</a>(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_some">spec_some</a>(e);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_some"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_some">spec_some</a>&lt;Element&gt;(e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+   <a href="option.md#0x1_option_Option">Option</a>{ vec: vec(e) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_none"></a>
+
+## Function `is_none`
+
+Return true if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_none">is_none</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_is_some"></a>
+
+## Function `is_some`
+
+Return true if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_is_some">is_some</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): bool {
+    !<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_is_some">is_some</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_contains"></a>
+
+## Function `contains`
+
+Return true if the value in <code>t</code> is equal to <code>e_ref</code>
+Always returns <code><b>false</b></code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e_ref: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_contains">contains</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e_ref: &Element): bool {
+    <a href="vector.md#0x1_vector_contains">vector::contains</a>(&t.vec, e_ref)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="option.md#0x1_option_spec_contains">spec_contains</a>(t, e_ref);
+</code></pre>
+
+
+
+
+<a name="0x1_option_spec_contains"></a>
+
+
+<pre><code><b>fun</b> <a href="option.md#0x1_option_spec_contains">spec_contains</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): bool {
+   <a href="option.md#0x1_option_is_some">is_some</a>(t) && <a href="option.md#0x1_option_borrow">borrow</a>(t) == e
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow"></a>
+
+## Function `borrow`
+
+Return an immutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow">borrow</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_with_default"></a>
+
+## Function `borrow_with_default`
+
+Return a reference to the value inside <code>t</code> if it holds one
+Return <code>default_ref</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default_ref: &Element): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_with_default">borrow_with_default</a>&lt;Element&gt;(t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default_ref: &Element): &Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default_ref
+    <b>else</b> <a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default_ref);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_get_with_default"></a>
+
+## Function `get_with_default`
+
+Return the value inside <code>t</code> if it holds one
+Return <code>default</code> if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b>, drop&gt;(t: &<a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_get_with_default">get_with_default</a>&lt;Element: <b>copy</b> + drop&gt;(
+    t: &<a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;,
+    default: Element,
+): Element {
+    <b>let</b> vec_ref = &t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) default
+    <b>else</b> *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(vec_ref, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_fill"></a>
+
+## Function `fill`
+
+Convert the none option <code>t</code> to a some option by adding <code>e</code>.
+Aborts if <code>t</code> already holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_fill">fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element) {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e)
+    <b>else</b> <b>abort</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_extract"></a>
+
+## Function `extract`
+
+Convert a <code>some</code> option to a <code>none</code> by removing and returning the value stored inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_extract">extract</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> t.vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_none">is_none</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the value inside <code>t</code>
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_borrow_mut">borrow_mut</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): &<b>mut</b> Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> t.vec, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap"></a>
+
+## Function `swap`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap">swap</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref);
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(<b>old</b>(t));
+<b>ensures</b> <a href="option.md#0x1_option_is_some">is_some</a>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_swap_or_fill"></a>
+
+## Function `swap_or_fill`
+
+Swap the old value inside <code>t</code> with <code>e</code> and return the old value;
+or if there is no old value, fill it with <code>e</code>.
+Different from swap(), swap_or_fill() allows for <code>t</code> not holding a value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_swap_or_fill">swap_or_fill</a>&lt;Element&gt;(t: &<b>mut</b> <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, e: Element): <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt; {
+    <b>let</b> vec_ref = &<b>mut</b> t.vec;
+    <b>let</b> old_value = <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(vec_ref)) <a href="option.md#0x1_option_none">none</a>()
+        <b>else</b> <a href="option.md#0x1_option_some">some</a>(<a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(vec_ref));
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(vec_ref, e);
+    old_value
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>ensures</b> result == <b>old</b>(t);
+<b>ensures</b> <a href="option.md#0x1_option_borrow">borrow</a>(t) == e;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_with_default"></a>
+
+## Function `destroy_with_default`
+
+Destroys <code>t.</code> If <code>t</code> holds a value, return it. Returns <code>default</code> otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;, default: Element): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_with_default">destroy_with_default</a>&lt;Element: drop&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;, default: Element): Element {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>if</b> (<a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&vec)) default
+    <b>else</b> <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == (<b>if</b> (<a href="option.md#0x1_option_is_some">is_some</a>(t)) <a href="option.md#0x1_option_borrow">borrow</a>(t) <b>else</b> default);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_some"></a>
+
+## Function `destroy_some`
+
+Unpack <code>t</code> and return its contents
+Aborts if <code>t</code> does not hold a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_some">destroy_some</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): Element {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_some">is_some</a>(&t), <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <b>let</b> elem = <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> vec);
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec);
+    elem
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
+<b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_destroy_none"></a>
+
+## Function `destroy_none`
+
+Unpack <code>t</code>
+Aborts if <code>t</code> holds a value
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_destroy_none">destroy_none</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;) {
+    <b>assert</b>!(<a href="option.md#0x1_option_is_none">is_none</a>(&t), <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>);
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    <a href="vector.md#0x1_vector_destroy_empty">vector::destroy_empty</a>(vec)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <a href="option.md#0x1_option_is_some">is_some</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_option_to_vec"></a>
+
+## Function `to_vec`
+
+Convert <code>t</code> into a vector of length 1 if it is <code>Some</code>,
+and an empty vector otherwise
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">option::Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="option.md#0x1_option_to_vec">to_vec</a>&lt;Element&gt;(t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> <a href="option.md#0x1_option_Option">Option</a> { vec } = t;
+    vec
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == t.vec;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+
+<pre><code><b>pragma</b> aborts_if_is_strict;
+</code></pre>
+
+
+
+<a name="@Helper_Schema_2"></a>
+
+### Helper Schema
+
+
+
+<a name="0x1_option_AbortsIfNone"></a>
+
+
+<pre><code><b>schema</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt; {
+    t: <a href="option.md#0x1_option_Option">Option</a>&lt;Element&gt;;
+    <b>aborts_if</b> <a href="option.md#0x1_option_is_none">is_none</a>(t) <b>with</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>;
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/overview.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/overview.md
new file mode 100644
index 000000000..e8aff3f04
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/overview.md
@@ -0,0 +1,28 @@
+
+<a name="@Move_Stdlib_Modules_0"></a>
+
+# Move Stdlib Modules
+
+
+This is the root document for the Move stdlib module documentation. The Move stdlib provides modules that can be used to access or interact with core language features.
+
+
+<a name="@Index_1"></a>
+
+## Index
+
+
+-  [`0x1::ascii`](ascii.md#0x1_ascii)
+-  [`0x1::bcs`](bcs.md#0x1_bcs)
+-  [`0x1::bit_vector`](bit_vector.md#0x1_bit_vector)
+-  [`0x1::error`](error.md#0x1_error)
+-  [`0x1::fixed_point32`](fixed_point32.md#0x1_fixed_point32)
+-  [`0x1::hash`](hash.md#0x1_hash)
+-  [`0x1::option`](option.md#0x1_option)
+-  [`0x1::signer`](signer.md#0x1_signer)
+-  [`0x1::string`](string.md#0x1_string)
+-  [`0x1::type_name`](type_name.md#0x1_type_name)
+-  [`0x1::vector`](vector.md#0x1_vector)
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/signer.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/signer.md
new file mode 100644
index 000000000..bc4020096
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/signer.md
@@ -0,0 +1,87 @@
+
+<a name="0x1_signer"></a>
+
+# Module `0x1::signer`
+
+
+
+-  [Function `borrow_address`](#0x1_signer_borrow_address)
+-  [Function `address_of`](#0x1_signer_address_of)
+-  [Module Specification](#@Module_Specification_0)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_signer_borrow_address"></a>
+
+## Function `borrow_address`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s: &<a href="signer.md#0x1_signer">signer</a>): &<b>address</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_signer_address_of"></a>
+
+## Function `address_of`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="signer.md#0x1_signer_address_of">address_of</a>(s: &<a href="signer.md#0x1_signer">signer</a>): <b>address</b> {
+    *<a href="signer.md#0x1_signer_borrow_address">borrow_address</a>(s)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_0"></a>
+
+## Module Specification
+
+Return true only if <code>s</code> is a transaction signer. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer">is_txn_signer</a>(s: <a href="signer.md#0x1_signer">signer</a>): bool;
+</code></pre>
+
+
+Return true only if <code>a</code> is a transaction signer address. This is a spec function only available in spec.
+
+
+<a name="0x1_signer_is_txn_signer_addr"></a>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="signer.md#0x1_signer_is_txn_signer_addr">is_txn_signer_addr</a>(a: <b>address</b>): bool;
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/string.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/string.md
new file mode 100644
index 000000000..e962b56d8
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/string.md
@@ -0,0 +1,446 @@
+
+<a name="0x1_string"></a>
+
+# Module `0x1::string`
+
+The <code><a href="string.md#0x1_string">string</a></code> module defines the <code><a href="string.md#0x1_string_String">String</a></code> type which represents UTF8 encoded strings.
+
+
+-  [Struct `String`](#0x1_string_String)
+-  [Constants](#@Constants_0)
+-  [Function `utf8`](#0x1_string_utf8)
+-  [Function `try_utf8`](#0x1_string_try_utf8)
+-  [Function `bytes`](#0x1_string_bytes)
+-  [Function `is_empty`](#0x1_string_is_empty)
+-  [Function `length`](#0x1_string_length)
+-  [Function `append`](#0x1_string_append)
+-  [Function `append_utf8`](#0x1_string_append_utf8)
+-  [Function `insert`](#0x1_string_insert)
+-  [Function `sub_string`](#0x1_string_sub_string)
+-  [Function `index_of`](#0x1_string_index_of)
+-  [Function `internal_check_utf8`](#0x1_string_internal_check_utf8)
+-  [Function `internal_is_char_boundary`](#0x1_string_internal_is_char_boundary)
+-  [Function `internal_sub_string`](#0x1_string_internal_sub_string)
+-  [Function `internal_index_of`](#0x1_string_internal_index_of)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_string_String"></a>
+
+## Struct `String`
+
+A <code><a href="string.md#0x1_string_String">String</a></code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="string.md#0x1_string_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_string_EINVALID_INDEX"></a>
+
+Index out of range.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_string_EINVALID_UTF8"></a>
+
+An invalid UTF8 encoding.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_string_utf8"></a>
+
+## Function `utf8`
+
+Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+    <b>assert</b>!(<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes), <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>);
+    <a href="string.md#0x1_string_String">String</a>{bytes}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_try_utf8"></a>
+
+## Function `try_utf8`
+
+Tries to create a new string from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="string.md#0x1_string_String">String</a>&gt; {
+    <b>if</b> (<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes)) {
+        <a href="option.md#0x1_option_some">option::some</a>(<a href="string.md#0x1_string_String">String</a>{bytes})
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_bytes"></a>
+
+## Function `bytes`
+
+Returns a reference to the underlying byte vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    &s.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_is_empty"></a>
+
+## Function `is_empty`
+
+Checks whether this string is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">String</a>): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_length"></a>
+
+## Function `length`
+
+Returns the length of this string, in bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append"></a>
+
+## Function `append`
+
+Appends a string.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, r: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, r: <a href="string.md#0x1_string_String">String</a>) {
+    <a href="vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> s.bytes, r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append_utf8"></a>
+
+## Function `append_utf8`
+
+Appends bytes which must be in valid utf8 format.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="string.md#0x1_string_append">append</a>(s, <a href="string.md#0x1_string_utf8">utf8</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_insert"></a>
+
+## Function `insert`
+
+Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+boundary.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, at: u64, o: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, at: u64, o: <a href="string.md#0x1_string_String">String</a>) {
+    <b>let</b> bytes = &s.bytes;
+    <b>assert</b>!(at &lt;= <a href="vector.md#0x1_vector_length">vector::length</a>(bytes) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, at), <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>);
+    <b>let</b> l = <a href="string.md#0x1_string_length">length</a>(s);
+    <b>let</b> front = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, 0, at);
+    <b>let</b> end = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, at, l);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, o);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, end);
+    *s = front;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_sub_string"></a>
+
+## Function `sub_string`
+
+Returns a sub-string using the given byte indices, where <code>i</code> is the first byte position and <code>j</code> is the start
+of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+guaranteeing that the result is valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">String</a> {
+    <b>let</b> bytes = &s.bytes;
+    <b>let</b> l = <a href="vector.md#0x1_vector_length">vector::length</a>(bytes);
+    <b>assert</b>!(
+        j &lt;= l && i &lt;= j && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, i) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, j),
+        <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>
+    );
+    <a href="string.md#0x1_string_String">String</a>{bytes: <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(bytes, i, j)}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_index_of"></a>
+
+## Function `index_of`
+
+Computes the index of the first occurrence of a string. Returns <code><a href="string.md#0x1_string_length">length</a>(s)</code> if no occurrence found.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, r: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">String</a>, r: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(&s.bytes, &r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_check_utf8"></a>
+
+## Function `internal_check_utf8`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_is_char_boundary"></a>
+
+## Function `internal_is_char_boundary`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_sub_string"></a>
+
+## Function `internal_sub_string`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_index_of"></a>
+
+## Function `internal_index_of`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/type_name.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/type_name.md
new file mode 100644
index 000000000..070e0ffd5
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/type_name.md
@@ -0,0 +1,158 @@
+
+<a name="0x1_type_name"></a>
+
+# Module `0x1::type_name`
+
+Functionality for converting Move types into values. Use with care!
+
+
+-  [Struct `TypeName`](#0x1_type_name_TypeName)
+-  [Function `get`](#0x1_type_name_get)
+-  [Function `get_with_original_ids`](#0x1_type_name_get_with_original_ids)
+-  [Function `borrow_string`](#0x1_type_name_borrow_string)
+-  [Function `into_string`](#0x1_type_name_into_string)
+
+
+<pre><code><b>use</b> <a href="ascii.md#0x1_ascii">0x1::ascii</a>;
+</code></pre>
+
+
+
+<a name="0x1_type_name_TypeName"></a>
+
+## Struct `TypeName`
+
+
+
+<pre><code><b>struct</b> <a href="type_name.md#0x1_type_name_TypeName">TypeName</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="ascii.md#0x1_ascii_String">ascii::String</a></code>
+</dt>
+<dd>
+ String representation of the type. All types are represented
+ using their source syntax:
+ "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+ Struct types are represented as fully qualified type names; e.g.
+ <code>00000000000000000000000000000001::string::String</code> or
+ <code>0000000000000000000000000000000a::module_name1::type_name1&lt;0000000000000000000000000000000a::module_name2::type_name2&lt;u64&gt;&gt;</code>
+ Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_type_name_get"></a>
+
+## Function `get`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are defining IDs (the ID of the package in
+storage that first introduced the type).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_get_with_original_ids"></a>
+
+## Function `get_with_original_ids`
+
+Return a value representation of the type <code>T</code>.  Package IDs
+that appear in fully qualified type names in the output from
+this function are original IDs (the ID of the first version of
+the package, even if the type in question was introduced in a
+later upgrade).
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get_with_original_ids">get_with_original_ids</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_borrow_string"></a>
+
+## Function `borrow_string`
+
+Get the String representation of <code>self</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): &<a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): &String {
+    &self.name
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_into_string"></a>
+
+## Function `into_string`
+
+Convert <code>self</code> into its inner String
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): String {
+    self.name
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/docs/vector.md b/vendors/move/move-execution/v1/crates/move-stdlib/docs/vector.md
new file mode 100644
index 000000000..dfadab2f5
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/docs/vector.md
@@ -0,0 +1,700 @@
+
+<a name="0x1_vector"></a>
+
+# Module `0x1::vector`
+
+A variable-sized container that can hold any type. Indexing is 0-based, and
+vectors are growable. This module has many native functions.
+Verification of modules that use this one uses model functions that are implemented
+directly in Boogie. The specification language has built-in functions operations such
+as <code>singleton_vector</code>. There are some helper functions defined here for specifications in other
+modules as well.
+
+>Note: We did not verify most of the
+Move functions here because many have loops, requiring loop invariants to prove, and
+the return on investment didn't seem worth it for these simple functions.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `empty`](#0x1_vector_empty)
+-  [Function `length`](#0x1_vector_length)
+-  [Function `borrow`](#0x1_vector_borrow)
+-  [Function `push_back`](#0x1_vector_push_back)
+-  [Function `borrow_mut`](#0x1_vector_borrow_mut)
+-  [Function `pop_back`](#0x1_vector_pop_back)
+-  [Function `destroy_empty`](#0x1_vector_destroy_empty)
+-  [Function `swap`](#0x1_vector_swap)
+-  [Function `singleton`](#0x1_vector_singleton)
+-  [Function `reverse`](#0x1_vector_reverse)
+-  [Function `append`](#0x1_vector_append)
+-  [Function `is_empty`](#0x1_vector_is_empty)
+-  [Function `contains`](#0x1_vector_contains)
+-  [Function `index_of`](#0x1_vector_index_of)
+-  [Function `remove`](#0x1_vector_remove)
+-  [Function `insert`](#0x1_vector_insert)
+-  [Function `swap_remove`](#0x1_vector_swap_remove)
+-  [Module Specification](#@Module_Specification_1)
+    -  [Helper Functions](#@Helper_Functions_2)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_vector_EINDEX_OUT_OF_BOUNDS"></a>
+
+The index into the vector is out of bounds
+
+
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 131072;
+</code></pre>
+
+
+
+<a name="0x1_vector_empty"></a>
+
+## Function `empty`
+
+Create an empty vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_empty">empty</a>&lt;Element&gt;(): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_length"></a>
+
+## Function `length`
+
+Return the length of the vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_length">length</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow"></a>
+
+## Function `borrow`
+
+Acquire an immutable reference to the <code>i</code>th element of the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow">borrow</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_push_back"></a>
+
+## Function `push_back`
+
+Add element <code>e</code> to the end of the vector <code>v</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_push_back">push_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_borrow_mut"></a>
+
+## Function `borrow_mut`
+
+Return a mutable reference to the <code>i</code>th element in the vector <code>v</code>.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_borrow_mut">borrow_mut</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): &<b>mut</b> Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_pop_back"></a>
+
+## Function `pop_back`
+
+Pop an element from the end of vector <code>v</code>.
+Aborts if <code>v</code> is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_pop_back">pop_back</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): Element;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_destroy_empty"></a>
+
+## Function `destroy_empty`
+
+Destroy the vector <code>v</code>.
+Aborts if <code>v</code> is not empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap"></a>
+
+## Function `swap`
+
+Swaps the elements at the <code>i</code>th and <code>j</code>th indices in the vector <code>v</code>.
+Aborts if <code>i</code> or <code>j</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap">swap</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64, j: u64);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_singleton"></a>
+
+## Function `singleton`
+
+Return an vector of size one containing element <code>e</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_singleton">singleton</a>&lt;Element&gt;(e: Element): <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt; {
+    <b>let</b> v = <a href="vector.md#0x1_vector_empty">empty</a>();
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(&<b>mut</b> v, e);
+    v
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == vec(e);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_reverse"></a>
+
+## Function `reverse`
+
+Reverses the order of the elements in the vector <code>v</code> in place.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_reverse">reverse</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>if</b> (len == 0) <b>return</b> ();
+
+    <b>let</b> front_index = 0;
+    <b>let</b> back_index = len -1;
+    <b>while</b> (front_index &lt; back_index) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, front_index, back_index);
+        front_index = front_index + 1;
+        back_index = back_index - 1;
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_append"></a>
+
+## Function `append`
+
+Pushes all of the elements of the <code>other</code> vector into the <code>lhs</code> vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_append">append</a>&lt;Element&gt;(lhs: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, other: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;) {
+    <a href="vector.md#0x1_vector_reverse">reverse</a>(&<b>mut</b> other);
+    <b>while</b> (!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(&other)) <a href="vector.md#0x1_vector_push_back">push_back</a>(lhs, <a href="vector.md#0x1_vector_pop_back">pop_back</a>(&<b>mut</b> other));
+    <a href="vector.md#0x1_vector_destroy_empty">destroy_empty</a>(other);
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_is_empty"></a>
+
+## Function `is_empty`
+
+Return <code><b>true</b></code> if the vector <code>v</code> has no elements and <code><b>false</b></code> otherwise.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_is_empty">is_empty</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    <a href="vector.md#0x1_vector_length">length</a>(v) == 0
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_contains"></a>
+
+## Function `contains`
+
+Return true if <code>e</code> is in the vector <code>v</code>.
+Otherwise, returns false.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> <b>true</b>;
+        i = i + 1;
+    };
+    <b>false</b>
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_index_of"></a>
+
+## Function `index_of`
+
+Return <code>(<b>true</b>, i)</code> if <code>e</code> is in the vector <code>v</code> at index <code>i</code>.
+Otherwise, returns <code>(<b>false</b>, 0)</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_index_of">index_of</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): (bool, u64) {
+    <b>let</b> i = 0;
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    <b>while</b> (i &lt; len) {
+        <b>if</b> (<a href="vector.md#0x1_vector_borrow">borrow</a>(v, i) == e) <b>return</b> (<b>true</b>, i);
+        i = i + 1;
+    };
+    (<b>false</b>, 0)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_remove"></a>
+
+## Function `remove`
+
+Remove the <code>i</code>th element of the vector <code>v</code>, shifting all subsequent elements.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_remove">remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i out of bounds; <b>abort</b>
+    <b>if</b> (i &gt;= len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    len = len - 1;
+    <b>while</b> (i &lt; len) <a href="vector.md#0x1_vector_swap">swap</a>(v, i, { i = i + 1; i });
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_insert"></a>
+
+## Function `insert`
+
+Insert <code>e</code> at position <code>i</code> in the vector <code>v</code>.
+If <code>i</code> is in bounds, this shifts the old <code>v[i]</code> and all subsequent elements to the right.
+If <code>i == <a href="vector.md#0x1_vector_length">length</a>(v)</code>, this adds <code>e</code> to the end of the vector.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i &gt; <a href="vector.md#0x1_vector_length">length</a>(v)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i too big <b>abort</b>
+    <b>if</b> (i &gt; len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(v, e);
+    <b>while</b> (i &lt; len) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, i, len);
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_vector_swap_remove"></a>
+
+## Function `swap_remove`
+
+Swap the <code>i</code>th element of the vector <code>v</code> with the last element and then pop the vector.
+This is O(1), but does not preserve ordering of elements in the vector.
+Aborts if <code>i</code> is out of bounds.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_swap_remove">swap_remove</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, i: u64): Element {
+    <b>assert</b>!(!<a href="vector.md#0x1_vector_is_empty">is_empty</a>(v), <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>);
+    <b>let</b> last_idx = <a href="vector.md#0x1_vector_length">length</a>(v) - 1;
+    <a href="vector.md#0x1_vector_swap">swap</a>(v, i, last_idx);
+    <a href="vector.md#0x1_vector_pop_back">pop_back</a>(v)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
+</details>
+
+<a name="@Module_Specification_1"></a>
+
+## Module Specification
+
+
+
+<a name="@Helper_Functions_2"></a>
+
+### Helper Functions
+
+
+Check if <code>v1</code> is equal to the result of adding <code>e</code> at the end of <code>v2</code>
+
+
+<a name="0x1_vector_eq_push_back"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_push_back">eq_push_back</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element): bool {
+    len(v1) == len(v2) + 1 &&
+    v1[len(v1)-1] == e &&
+    v1[0..len(v1)-1] == v2[0..len(v2)]
+}
+</code></pre>
+
+
+Check if <code>v</code> is equal to the result of concatenating <code>v1</code> and <code>v2</code>
+
+
+<a name="0x1_vector_eq_append"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_append">eq_append</a>&lt;Element&gt;(v: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v) == len(v1) + len(v2) &&
+    v[0..len(v1)] == v1 &&
+    v[len(v1)..len(v)] == v2
+}
+</code></pre>
+
+
+Check <code>v1</code> is equal to the result of removing the first element of <code>v2</code>
+
+
+<a name="0x1_vector_eq_pop_front"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_pop_front">eq_pop_front</a>&lt;Element&gt;(v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1 == v2[1..len(v2)]
+}
+</code></pre>
+
+
+Check that <code>v1</code> is equal to the result of removing the element at index <code>i</code> from <code>v2</code>.
+
+
+<a name="0x1_vector_eq_remove_elem_at_index"></a>
+
+
+<pre><code><b>fun</b> <a href="vector.md#0x1_vector_eq_remove_elem_at_index">eq_remove_elem_at_index</a>&lt;Element&gt;(i: u64, v1: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, v2: <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;): bool {
+    len(v1) + 1 == len(v2) &&
+    v1[0..i] == v2[0..i] &&
+    v1[i..len(v1)] == v2[i + 1..len(v2)]
+}
+</code></pre>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/error_description.errmap b/vendors/move/move-execution/v1/crates/move-stdlib/error_description.errmap
new file mode 100644
index 000000000..e27880958
Binary files /dev/null and b/vendors/move/move-execution/v1/crates/move-stdlib/error_description.errmap differ
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/Move.toml b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/Move.toml
new file mode 100644
index 000000000..c7c3506ca
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "MoveNursery"
+version = "1.5.0"
+
+[dependencies]
+MoveStdlib = { local = ".." }
+
+[dev-addresses]
+std = "0x1"
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/compare.md b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/compare.md
new file mode 100644
index 000000000..8d8aa2b74
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/compare.md
@@ -0,0 +1,171 @@
+
+<a name="0x1_compare"></a>
+
+# Module `0x1::compare`
+
+Utilities for comparing Move values based on their representation in BCS.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `cmp_bcs_bytes`](#0x1_compare_cmp_bcs_bytes)
+-  [Function `cmp_u8`](#0x1_compare_cmp_u8)
+-  [Function `cmp_u64`](#0x1_compare_cmp_u64)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_compare_EQUAL"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>: u8 = 0;
+</code></pre>
+
+
+
+<a name="0x1_compare_GREATER_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>: u8 = 2;
+</code></pre>
+
+
+
+<a name="0x1_compare_LESS_THAN"></a>
+
+
+
+<pre><code><b>const</b> <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>: u8 = 1;
+</code></pre>
+
+
+
+<a name="0x1_compare_cmp_bcs_bytes"></a>
+
+## Function `cmp_bcs_bytes`
+
+compare vectors <code>v1</code> and <code>v2</code> using (1) vector contents from right to left and then
+(2) vector length to break ties.
+Returns either <code><a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> (0u8), <code><a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (1u8), or <code><a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code> (2u8).
+
+This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+(i.e., vectors produced by <code>bcs::to_bytes</code>). A typical client will call
+<code><a href="compare.md#0x1_compare_cmp_bcs_bytes">compare::cmp_bcs_bytes</a>(bcs::to_bytes(&t1), bcs::to_bytes(&t2))</code>. The comparison provides the
+following guarantees w.r.t the original values t1 and t2:
+- <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code><a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(t2, t1) == <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a></code>
+- <code>compare::cmp&lt;T&gt;(t1, t2) == <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 == t2</code> and (similarly)
+<code>compare::cmp&lt;T&gt;(t1, t2) != <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 != t2</code>, where <code>==</code> and <code>!=</code> denote the Move
+bytecode operations for polymorphic equality.
+- for all primitive types <code>T</code> with <code>&lt;</code> and <code>&gt;</code> comparison operators exposed in Move bytecode
+(<code>u8</code>, <code>u16</code>, <code>u32</code>, <code>u64</code>, <code>u128</code>, <code>u256</code>), we have
+<code>compare_bcs_bytes(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &lt; t2</code> and (similarly)
+<code>compare_bcs_bytes(bcs(t1), bcs(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &gt; t2</code>.
+
+For all other types, the order is whatever the BCS encoding of the type and the comparison
+strategy above gives you. One case where the order might be surprising is the <code><b>address</b></code>
+type.
+CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+to left, byte-by-byte comparison means that (for example)
+<code>compare_bcs_bytes(bcs(0x01), bcs(0x10)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you'd expect), but
+<code>compare_bcs_bytes(bcs(0x100), bcs(0x001)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> (as you probably wouldn't expect).
+Keep this in mind when using this function to compare addresses.
+
+> TODO: there is currently no specification for this function, which causes no problem because it is not yet
+> used in the Diem framework. However, should this functionality be needed in specification, a customized
+> native abstraction is needed in the prover framework.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="compare.md#0x1_compare_cmp_bcs_bytes">cmp_bcs_bytes</a>(v1: &<a href="">vector</a>&lt;u8&gt;, v2: &<a href="">vector</a>&lt;u8&gt;): u8 {
+    <b>let</b> i1 = <a href="_length">vector::length</a>(v1);
+    <b>let</b> i2 = <a href="_length">vector::length</a>(v2);
+    <b>let</b> len_cmp = <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1, i2);
+
+    // BCS uses little endian encoding for all integer types, so we <b>choose</b> <b>to</b> <a href="compare.md#0x1_compare">compare</a> from left
+    // <b>to</b> right. Going right <b>to</b> left would make the behavior of compare::cmp diverge from the
+    // bytecode operators &lt; and &gt; on integer values (which would be confusing).
+    <b>while</b> (i1 &gt; 0 && i2 &gt; 0) {
+        i1 = i1 - 1;
+        i2 = i2 - 1;
+        <b>let</b> elem_cmp = <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(*<a href="_borrow">vector::borrow</a>(v1, i1), *<a href="_borrow">vector::borrow</a>(v2, i2));
+        <b>if</b> (elem_cmp != 0) <b>return</b> elem_cmp
+        // <b>else</b>, <a href="compare.md#0x1_compare">compare</a> next element
+    };
+    // all compared elements equal; <b>use</b> length comparion <b>to</b> <b>break</b> the tie
+    len_cmp
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u8"></a>
+
+## Function `cmp_u8`
+
+Compare two <code>u8</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u8">cmp_u8</a>(i1: u8, i2: u8): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_compare_cmp_u64"></a>
+
+## Function `cmp_u64`
+
+Compare two <code>u64</code>'s
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="compare.md#0x1_compare_cmp_u64">cmp_u64</a>(i1: u64, i2: u64): u8 {
+    <b>if</b> (i1 == i2) <a href="compare.md#0x1_compare_EQUAL">EQUAL</a>
+    <b>else</b> <b>if</b> (i1 &lt; i2) <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a>
+    <b>else</b> <a href="compare.md#0x1_compare_GREATER_THAN">GREATER_THAN</a>
+}
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/debug.md b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/debug.md
new file mode 100644
index 000000000..33bd18df1
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/docs/debug.md
@@ -0,0 +1,61 @@
+
+<a name="0x1_debug"></a>
+
+# Module `0x1::debug`
+
+Module providing debug functionality.
+
+
+-  [Function `print`](#0x1_debug_print)
+-  [Function `print_stack_trace`](#0x1_debug_print_stack_trace)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x1_debug_print"></a>
+
+## Function `print`
+
+Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T);
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_debug_print_stack_trace"></a>
+
+## Function `print_stack_trace`
+
+Prints the calling function's stack trace.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>();
+</code></pre>
+
+
+
+</details>
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/compare.move b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/compare.move
new file mode 100644
index 000000000..73793c200
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/compare.move
@@ -0,0 +1,74 @@
+/// Utilities for comparing Move values based on their representation in BCS.
+module std::compare {
+    use std::vector;
+
+    // Move does not have signed integers, so we cannot use the usual 0, -1, 1 convention to
+    // represent EQUAL, LESS_THAN, and GREATER_THAN. Instead, we fun a new convention using u8
+    // constants:
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+    /// compare vectors `v1` and `v2` using (1) vector contents from right to left and then
+    /// (2) vector length to break ties.
+    /// Returns either `EQUAL` (0u8), `LESS_THAN` (1u8), or `GREATER_THAN` (2u8).
+    ///
+    /// This function is designed to compare BCS (Binary Canonical Serialization)-encoded values
+    /// (i.e., vectors produced by `bcs::to_bytes`). A typical client will call
+    /// `compare::cmp_bcs_bytes(bcs::to_bytes(&t1), bcs::to_bytes(&t2))`. The comparison provides the
+    /// following guarantees w.r.t the original values t1 and t2:
+    /// - `cmp_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `cmp_bcs_bytes(t2, t1) == GREATER_THAN`
+    /// - `compare::cmp<T>(t1, t2) == EQUAL` iff `t1 == t2` and (similarly)
+    ///   `compare::cmp<T>(t1, t2) != EQUAL` iff `t1 != t2`, where `==` and `!=` denote the Move
+    ///    bytecode operations for polymorphic equality.
+    /// - for all primitive types `T` with `<` and `>` comparison operators exposed in Move bytecode
+    ///   (`u8`, `u16`, `u32`, `u64`, `u128`, `u256`), we have
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 < t2` and (similarly)
+    ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 > t2`.
+    ///
+    /// For all other types, the order is whatever the BCS encoding of the type and the comparison
+    /// strategy above gives you. One case where the order might be surprising is the `address`
+    /// type.
+    /// CoreAddresses are 16 byte hex values that BCS encodes with the identity function. The right
+    /// to left, byte-by-byte comparison means that (for example)
+    /// `compare_bcs_bytes(bcs(0x01), bcs(0x10)) == LESS_THAN` (as you'd expect), but
+    /// `compare_bcs_bytes(bcs(0x100), bcs(0x001)) == LESS_THAN` (as you probably wouldn't expect).
+    /// Keep this in mind when using this function to compare addresses.
+    ///
+    /// > TODO: there is currently no specification for this function, which causes no problem because it is not yet
+    /// > used in the Diem framework. However, should this functionality be needed in specification, a customized
+    /// > native abstraction is needed in the prover framework.
+    public fun cmp_bcs_bytes(v1: &vector<u8>, v2: &vector<u8>): u8 {
+        let i1 = vector::length(v1);
+        let i2 = vector::length(v2);
+        let len_cmp = cmp_u64(i1, i2);
+
+        // BCS uses little endian encoding for all integer types, so we choose to compare from left
+        // to right. Going right to left would make the behavior of compare::cmp diverge from the
+        // bytecode operators < and > on integer values (which would be confusing).
+        while (i1 > 0 && i2 > 0) {
+            i1 = i1 - 1;
+            i2 = i2 - 1;
+            let elem_cmp = cmp_u8(*vector::borrow(v1, i1), *vector::borrow(v2, i2));
+            if (elem_cmp != 0) return elem_cmp
+            // else, compare next element
+        };
+        // all compared elements equal; use length comparion to break the tie
+        len_cmp
+    }
+
+    /// Compare two `u8`'s
+    fun cmp_u8(i1: u8, i2: u8): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+    /// Compare two `u64`'s
+    fun cmp_u64(i1: u64, i2: u64): u8 {
+        if (i1 == i2) EQUAL
+        else if (i1 < i2) LESS_THAN
+        else GREATER_THAN
+    }
+
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/debug.move b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/debug.move
new file mode 100644
index 000000000..d4a506d10
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/sources/debug.move
@@ -0,0 +1,18 @@
+/// Module providing debug functionality.
+module std::debug {
+
+    /// Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
+    native public fun print<T>(x: &T);
+
+    /// Prints the calling function's stack trace.
+    native public fun print_stack_trace();
+
+    #[test_only]
+    use std::string;
+
+    #[test_only]
+    /// Utility function for printing a sequence of UTF8 bytes as a string (e.g., `b"Hello"`).
+    public fun print_string(utf8_bytes: vector<u8>) {
+        print<string::String>(&string::utf8(utf8_bytes));
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/nursery/tests/compare_tests.move b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/tests/compare_tests.move
new file mode 100644
index 000000000..4af198639
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/nursery/tests/compare_tests.move
@@ -0,0 +1,86 @@
+// Tests for polymorphic comparison in Move
+#[test_only]
+module std::compareTests {
+    use std::compare;
+    use std::bcs;
+
+    const EQUAL: u8 = 0;
+    const LESS_THAN: u8 = 1;
+    const GREATER_THAN: u8 = 2;
+
+
+    #[test]
+    fun equality_of_simple_types() {
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&true)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&1u8)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&1u16)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&1u32)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&1u128)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&1u256)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x1)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"01")) == EQUAL, 0);
+    }
+
+    #[test]
+    fun inequality_of_simple_types() {
+        // inequality of simple types
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) != EQUAL, 0);
+    }
+
+    #[test]
+    fun less_than_with_natural_ordering() {
+        // less than for types with a natural ordering exposed via bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&false), &bcs::to_bytes(&true)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u8), &bcs::to_bytes(&1u8)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u16), &bcs::to_bytes(&1u16)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u32), &bcs::to_bytes(&1u32)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0), &bcs::to_bytes(&1)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u128), &bcs::to_bytes(&1u128)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u256), &bcs::to_bytes(&1u256)) == LESS_THAN, 0);
+    }
+
+    #[test]
+    fun less_than_without_natural_ordering() {
+        // less then for types without a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x0), &bcs::to_bytes(&@0x1)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x01), &bcs::to_bytes(&@0x10)) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x100), &bcs::to_bytes(&@0x001)) == LESS_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"00"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"10")) == LESS_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0000"), &bcs::to_bytes(&x"01")) == LESS_THAN, 0); //
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0100"), &bcs::to_bytes(&x"0001")) == LESS_THAN, 0); // potentially confusing
+    }
+
+    #[test]
+    fun greater_than_with_natural_ordering() {
+        // greater than for types with a natural ordering exposed by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) == GREATER_THAN, 0);
+    }
+
+    #[test]
+    fun greater_than_without_natural_ordering() {
+        // greater than for types without a natural ordering exposed by by bytecode operations
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x10), &bcs::to_bytes(&@0x01)) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x001), &bcs::to_bytes(&@0x100)) == GREATER_THAN, 0); // potentially confusing
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"10"), &bcs::to_bytes(&x"01")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"0000")) == GREATER_THAN, 0); // sensible
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"0001"), &bcs::to_bytes(&x"0100")) == GREATER_THAN, 0); // potentially confusing
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/ascii.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/ascii.move
new file mode 100644
index 000000000..f3c9daec5
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/ascii.move
@@ -0,0 +1,148 @@
+/// The `ASCII` module defines basic string and char newtypes in Move that verify
+/// that characters are valid ASCII, and that strings consist of only valid ASCII characters.
+module std::ascii {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid ASCII character was encountered when creating an ASCII string.
+    const EINVALID_ASCII_CHARACTER: u64 = 0x10000;
+
+   /// The `String` struct holds a vector of bytes that all represent
+   /// valid ASCII characters. Note that these ASCII characters may not all
+   /// be printable. To determine if a `String` contains only "printable"
+   /// characters you should use the `all_characters_printable` predicate
+   /// defined in this module.
+   struct String has copy, drop, store {
+       bytes: vector<u8>,
+   }
+   spec String {
+       invariant forall i in 0..len(bytes): is_valid_char(bytes[i]);
+   }
+
+   /// An ASCII character.
+   struct Char has copy, drop, store {
+       byte: u8,
+   }
+   spec Char {
+       invariant is_valid_char(byte);
+   }
+
+    /// Convert a `byte` into a `Char` that is checked to make sure it is valid ASCII.
+    public fun char(byte: u8): Char {
+        assert!(is_valid_char(byte), EINVALID_ASCII_CHARACTER);
+        Char { byte }
+    }
+    spec char {
+        aborts_if !is_valid_char(byte) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Aborts if
+    /// `bytes` contains non-ASCII characters.
+    public fun string(bytes: vector<u8>): String {
+       let x = try_string(bytes);
+       assert!(
+            option::is_some(&x),
+            EINVALID_ASCII_CHARACTER
+       );
+       option::destroy_some(x)
+    }
+    spec string {
+        aborts_if exists i in 0..len(bytes): !is_valid_char(bytes[i]) with EINVALID_ASCII_CHARACTER;
+    }
+
+    /// Convert a vector of bytes `bytes` into an `String`. Returns
+    /// `Some(<ascii_string>)` if the `bytes` contains all valid ASCII
+    /// characters. Otherwise returns `None`.
+    public fun try_string(bytes: vector<u8>): Option<String> {
+       let len = vector::length(&bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_valid_char(bytes[j]);
+           };
+           i < len
+       }) {
+           let possible_byte = *vector::borrow(&bytes, i);
+           if (!is_valid_char(possible_byte)) return option::none();
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_valid_char(bytes[j]);
+       };
+       option::some(String { bytes })
+    }
+
+    /// Returns `true` if all characters in `string` are printable characters
+    /// Returns `false` otherwise. Not all `String`s are printable strings.
+    public fun all_characters_printable(string: &String): bool {
+       let len = vector::length(&string.bytes);
+       let i = 0;
+       while ({
+           spec {
+               invariant i <= len;
+               invariant forall j in 0..i: is_printable_char(string.bytes[j]);
+           };
+           i < len
+       }) {
+           let byte = *vector::borrow(&string.bytes, i);
+           if (!is_printable_char(byte)) return false;
+           i = i + 1;
+       };
+       spec {
+           assert i == len;
+           assert forall j in 0..len: is_printable_char(string.bytes[j]);
+       };
+       true
+    }
+    spec all_characters_printable {
+        ensures result ==> (forall j in 0..len(string.bytes): is_printable_char(string.bytes[j]));
+    }
+
+    public fun push_char(string: &mut String, char: Char) {
+        vector::push_back(&mut string.bytes, char.byte);
+    }
+    spec push_char {
+        ensures len(string.bytes) == len(old(string.bytes)) + 1;
+    }
+
+    public fun pop_char(string: &mut String): Char {
+        Char { byte: vector::pop_back(&mut string.bytes) }
+    }
+    spec pop_char {
+        ensures len(string.bytes) == len(old(string.bytes)) - 1;
+    }
+
+    public fun length(string: &String): u64 {
+        vector::length(as_bytes(string))
+    }
+
+    /// Get the inner bytes of the `string` as a reference
+    public fun as_bytes(string: &String): &vector<u8> {
+       &string.bytes
+    }
+
+    /// Unpack the `string` to get its backing bytes
+    public fun into_bytes(string: String): vector<u8> {
+       let String { bytes } = string;
+       bytes
+    }
+
+    /// Unpack the `char` into its underlying byte.
+    public fun byte(char: Char): u8 {
+       let Char { byte } = char;
+       byte
+    }
+
+    /// Returns `true` if `b` is a valid ASCII character. Returns `false` otherwise.
+    public fun is_valid_char(b: u8): bool {
+       b <= 0x7F
+    }
+
+    /// Returns `true` if `byte` is an printable ASCII character. Returns `false` otherwise.
+    public fun is_printable_char(byte: u8): bool {
+       byte >= 0x20 && // Disallow metacharacters
+       byte <= 0x7E // Don't allow DEL metacharacter
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/bcs.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/bcs.move
new file mode 100644
index 000000000..7e47428ca
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/bcs.move
@@ -0,0 +1,17 @@
+/// Utility for converting a Move value to its binary representation in BCS (Binary Canonical
+/// Serialization). BCS is the binary encoding for Move resources and other non-module values
+/// published on-chain. See https://github.com/diem/bcs#binary-canonical-serialization-bcs for more
+/// details on BCS.
+module std::bcs {
+    /// Return the binary representation of `v` in BCS (Binary Canonical Serialization) format
+    native public fun to_bytes<MoveValue>(v: &MoveValue): vector<u8>;
+
+    // ==============================
+    // Module Specification
+    spec module {} // switch to module documentation context
+
+    spec module {
+        /// Native function which is defined in the prover's prelude.
+        native fun serialize<MoveValue>(v: &MoveValue): vector<u8>;
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/bit_vector.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/bit_vector.move
new file mode 100644
index 000000000..09111f134
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/bit_vector.move
@@ -0,0 +1,162 @@
+module std::bit_vector {
+    use std::vector;
+
+    /// The provided index is out of bounds
+    const EINDEX: u64 = 0x20000;
+    /// An invalid length of bitvector was given
+    const ELENGTH: u64 = 0x20001;
+
+    #[test_only]
+    const WORD_SIZE: u64 = 1;
+    /// The maximum allowed bitvector size
+    const MAX_SIZE: u64 = 1024;
+
+    struct BitVector has copy, drop, store {
+        length: u64,
+        bit_field: vector<bool>,
+    }
+
+    public fun new(length: u64): BitVector {
+        assert!(length > 0, ELENGTH);
+        assert!(length < MAX_SIZE, ELENGTH);
+        let counter = 0;
+        let bit_field = vector::empty();
+        while ({spec {
+            invariant counter <= length;
+            invariant len(bit_field) == counter;
+        };
+            (counter < length)}) {
+            vector::push_back(&mut bit_field, false);
+            counter = counter + 1;
+        };
+        spec {
+            assert counter == length;
+            assert len(bit_field) == length;
+        };
+
+        BitVector {
+            length,
+            bit_field,
+        }
+    }
+    spec new {
+        include NewAbortsIf;
+        ensures result.length == length;
+        ensures len(result.bit_field) == length;
+    }
+    spec schema NewAbortsIf {
+        length: u64;
+        aborts_if length <= 0 with ELENGTH;
+        aborts_if length >= MAX_SIZE with ELENGTH;
+    }
+
+    /// Set the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun set(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = true;
+    }
+    spec set {
+        include SetAbortsIf;
+        ensures bitvector.bit_field[bit_index];
+    }
+    spec schema SetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Unset the bit at `bit_index` in the `bitvector` regardless of its previous state.
+    public fun unset(bitvector: &mut BitVector, bit_index: u64) {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
+        *x = false;
+    }
+    spec unset {
+        include UnsetAbortsIf;
+        ensures !bitvector.bit_field[bit_index];
+    }
+    spec schema UnsetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+
+    /// Shift the `bitvector` left by `amount`. If `amount` is greater than the
+    /// bitvector's length the bitvector will be zeroed out.
+    public fun shift_left(bitvector: &mut BitVector, amount: u64) {
+        if (amount >= bitvector.length) {
+           let len = vector::length(&bitvector.bit_field);
+           let i = 0;
+           while (i < len) {
+               let elem = vector::borrow_mut(&mut bitvector.bit_field, i);
+               *elem = false;
+               i = i + 1;
+           };
+        } else {
+            let i = amount;
+
+            while (i < bitvector.length) {
+                if (is_index_set(bitvector, i)) set(bitvector, i - amount)
+                else unset(bitvector, i - amount);
+                i = i + 1;
+            };
+
+            i = bitvector.length - amount;
+
+            while (i < bitvector.length) {
+                unset(bitvector, i);
+                i = i + 1;
+            };
+        }
+    }
+
+    /// Return the value of the bit at `bit_index` in the `bitvector`. `true`
+    /// represents "1" and `false` represents a 0
+    public fun is_index_set(bitvector: &BitVector, bit_index: u64): bool {
+        assert!(bit_index < vector::length(&bitvector.bit_field), EINDEX);
+        *vector::borrow(&bitvector.bit_field, bit_index)
+    }
+    spec is_index_set {
+        include IsIndexSetAbortsIf;
+        ensures result == bitvector.bit_field[bit_index];
+    }
+    spec schema IsIndexSetAbortsIf {
+        bitvector: BitVector;
+        bit_index: u64;
+        aborts_if bit_index >= length(bitvector) with EINDEX;
+    }
+    spec fun spec_is_index_set(bitvector: BitVector, bit_index: u64): bool {
+        if (bit_index >= length(bitvector)) {
+            false
+        } else {
+            bitvector.bit_field[bit_index]
+        }
+    }
+
+    /// Return the length (number of usable bits) of this bitvector
+    public fun length(bitvector: &BitVector): u64 {
+        vector::length(&bitvector.bit_field)
+    }
+
+    /// Returns the length of the longest sequence of set bits starting at (and
+    /// including) `start_index` in the `bitvector`. If there is no such
+    /// sequence, then `0` is returned.
+    public fun longest_set_sequence_starting_at(bitvector: &BitVector, start_index: u64): u64 {
+        assert!(start_index < bitvector.length, EINDEX);
+        let index = start_index;
+
+        // Find the greatest index in the vector such that all indices less than it are set.
+        while (index < bitvector.length) {
+            if (!is_index_set(bitvector, index)) break;
+            index = index + 1;
+        };
+
+        index - start_index
+    }
+
+    #[test_only]
+    public fun word_size(): u64 {
+        WORD_SIZE
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/error.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/error.move
new file mode 100644
index 000000000..81958a691
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/error.move
@@ -0,0 +1,82 @@
+/// This module defines a set of canonical error codes which are optional to use by applications for the
+/// `abort` and `assert!` features.
+///
+/// Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+/// Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+/// Given an error category `0x1` and a reason `0x3`, a canonical abort code looks as `0x10003`.
+///
+/// A module can use a canonical code with a constant declaration of the following form:
+///
+/// ```
+/// ///  An invalid ASCII character was encountered when creating a string.
+/// const EINVALID_CHARACTER: u64 = 0x010003;
+/// ```
+///
+/// This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+/// error reason understand by the existing error map tooling, or as a canonical code.
+///
+/// The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+/// from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+/// associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+/// error codes here are a bit richer than HTTP codes.
+module std::error {
+
+  /// Caller specified an invalid argument (http: 400)
+  const INVALID_ARGUMENT: u64 = 0x1;
+
+  /// An input or result of a computation is out of range (http: 400)
+  const OUT_OF_RANGE: u64 = 0x2;
+
+  /// The system is not in a state where the operation can be performed (http: 400)
+  const INVALID_STATE: u64 = 0x3;
+
+  /// Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+  const UNAUTHENTICATED: u64 = 0x4;
+
+  /// client does not have sufficient permission (http: 403)
+  const PERMISSION_DENIED: u64 = 0x5;
+
+  /// A specified resource is not found (http: 404)
+  const NOT_FOUND: u64 = 0x6;
+
+  /// Concurrency conflict, such as read-modify-write conflict (http: 409)
+  const ABORTED: u64 = 0x7;
+
+  /// The resource that a client tried to create already exists (http: 409)
+  const ALREADY_EXISTS: u64 = 0x8;
+
+  /// Out of gas or other forms of quota (http: 429)
+  const RESOURCE_EXHAUSTED: u64 = 0x9;
+
+  #[allow(unused_const)]
+  /// Request cancelled by the client (http: 499)
+  const CANCELLED: u64 = 0xA;
+
+  /// Internal error (http: 500)
+  const INTERNAL: u64 = 0xB;
+
+  /// Feature not implemented (http: 501)
+  const NOT_IMPLEMENTED: u64 = 0xC;
+
+  /// The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+  const UNAVAILABLE: u64 = 0xD;
+
+  /// Construct a canonical error code from a category and a reason.
+  public fun canonical(category: u64, reason: u64): u64 {
+    (category << 16) + reason
+  }
+
+  /// Functions to construct a canonical error code of the given category.
+  public fun invalid_argument(r: u64): u64 {  canonical(INVALID_ARGUMENT, r) }
+  public fun out_of_range(r: u64): u64 {  canonical(OUT_OF_RANGE, r) }
+  public fun invalid_state(r: u64): u64 {  canonical(INVALID_STATE, r) }
+  public fun unauthenticated(r: u64): u64 { canonical(UNAUTHENTICATED, r) }
+  public fun permission_denied(r: u64): u64 { canonical(PERMISSION_DENIED, r) }
+  public fun not_found(r: u64): u64 { canonical(NOT_FOUND, r) }
+  public fun aborted(r: u64): u64 { canonical(ABORTED, r) }
+  public fun already_exists(r: u64): u64 { canonical(ALREADY_EXISTS, r) }
+  public fun resource_exhausted(r: u64): u64 {  canonical(RESOURCE_EXHAUSTED, r) }
+  public fun internal(r: u64): u64 {  canonical(INTERNAL, r) }
+  public fun not_implemented(r: u64): u64 {  canonical(NOT_IMPLEMENTED, r) }
+  public fun unavailable(r: u64): u64 { canonical(UNAVAILABLE, r) }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/fixed_point32.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/fixed_point32.move
new file mode 100644
index 000000000..05f2614fe
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/fixed_point32.move
@@ -0,0 +1,294 @@
+/// Defines a fixed-point numeric type with a 32-bit integer part and
+/// a 32-bit fractional part.
+
+module std::fixed_point32 {
+
+    /// Define a fixed-point numeric type with 32 fractional bits.
+    /// This is just a u64 integer but it is wrapped in a struct to
+    /// make a unique type. This is a binary representation, so decimal
+    /// values may not be exactly representable, but it provides more
+    /// than 9 decimal digits of precision both before and after the
+    /// decimal point (18 digits total). For comparison, double precision
+    /// floating-point has less than 16 decimal digits of precision, so
+    /// be careful about using floating-point to convert these values to
+    /// decimal.
+    struct FixedPoint32 has copy, drop, store { value: u64 }
+
+    ///> TODO: This is a basic constant and should be provided somewhere centrally in the framework.
+    const MAX_U64: u128 = 18446744073709551615;
+
+    /// The denominator provided was zero
+    const EDENOMINATOR: u64 = 0x10001;
+    /// The quotient value would be too large to be held in a `u64`
+    const EDIVISION: u64 = 0x20002;
+    /// The multiplied value would be too large to be held in a `u64`
+    const EMULTIPLICATION: u64 = 0x20003;
+    /// A division by zero was encountered
+    const EDIVISION_BY_ZERO: u64 = 0x10004;
+    /// The computed ratio when converting to a `FixedPoint32` would be unrepresentable
+    const ERATIO_OUT_OF_RANGE: u64 = 0x20005;
+
+    /// Multiply a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the product. This will abort if the product
+    /// overflows.
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64 {
+        // The product of two 64 bit values has 128 bits, so perform the
+        // multiplication with u128 types and keep the full 128 bit product
+        // to avoid losing accuracy.
+        let unscaled_product = (val as u128) * (multiplier.value as u128);
+        // The unscaled product has 32 fractional bits (from the multiplier)
+        // so rescale it by shifting away the low bits.
+        let product = unscaled_product >> 32;
+        // Check whether the value is too large.
+        assert!(product <= MAX_U64, EMULTIPLICATION);
+        (product as u64)
+    }
+    spec multiply_u64 {
+        pragma opaque;
+        include MultiplyAbortsIf;
+        ensures result == spec_multiply_u64(val, multiplier);
+    }
+    spec schema MultiplyAbortsIf {
+        val: num;
+        multiplier: FixedPoint32;
+        aborts_if spec_multiply_u64(val, multiplier) > MAX_U64 with EMULTIPLICATION;
+    }
+    spec fun spec_multiply_u64(val: num, multiplier: FixedPoint32): num {
+        (val * multiplier.value) >> 32
+    }
+
+    /// Divide a u64 integer by a fixed-point number, truncating any
+    /// fractional part of the quotient. This will abort if the divisor
+    /// is zero or if the quotient overflows.
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64 {
+        // Check for division by zero.
+        assert!(divisor.value != 0, EDIVISION_BY_ZERO);
+        // First convert to 128 bits and then shift left to
+        // add 32 fractional zero bits to the dividend.
+        let scaled_value = (val as u128) << 32;
+        let quotient = scaled_value / (divisor.value as u128);
+        // Check whether the value is too large.
+        assert!(quotient <= MAX_U64, EDIVISION);
+        // the value may be too large, which will cause the cast to fail
+        // with an arithmetic error.
+        (quotient as u64)
+    }
+    spec divide_u64 {
+        pragma opaque;
+        include DivideAbortsIf;
+        ensures result == spec_divide_u64(val, divisor);
+    }
+    spec schema DivideAbortsIf {
+        val: num;
+        divisor: FixedPoint32;
+        aborts_if divisor.value == 0 with EDIVISION_BY_ZERO;
+        aborts_if spec_divide_u64(val, divisor) > MAX_U64 with EDIVISION;
+    }
+    spec fun spec_divide_u64(val: num, divisor: FixedPoint32): num {
+        (val << 32) / divisor.value
+    }
+
+    /// Create a fixed-point value from a rational number specified by its
+    /// numerator and denominator. Calling this function should be preferred
+    /// for using `Self::create_from_raw_value` which is also available.
+    /// This will abort if the denominator is zero. It will also
+    /// abort if the numerator is nonzero and the ratio is not in the range
+    /// 2^-32 .. 2^32-1. When specifying decimal fractions, be careful about
+    /// rounding errors: if you round to display N digits after the decimal
+    /// point, you can use a denominator of 10^N to avoid numbers where the
+    /// very small imprecision in the binary representation could change the
+    /// rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32 {
+        // If the denominator is zero, this will abort.
+        // Scale the numerator to have 64 fractional bits and the denominator
+        // to have 32 fractional bits, so that the quotient will have 32
+        // fractional bits.
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        assert!(scaled_denominator != 0, EDENOMINATOR);
+        let quotient = scaled_numerator / scaled_denominator;
+        assert!(quotient != 0 || numerator == 0, ERATIO_OUT_OF_RANGE);
+        // Return the quotient as a fixed-point number. We first need to check whether the cast
+        // can succeed.
+        assert!(quotient <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32 { value: (quotient as u64) }
+    }
+    spec create_from_rational {
+        pragma opaque;
+        include CreateFromRationalAbortsIf;
+        ensures result == spec_create_from_rational(numerator, denominator);
+    }
+    spec schema CreateFromRationalAbortsIf {
+        numerator: u64;
+        denominator: u64;
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
+        let quotient = scaled_numerator / scaled_denominator;
+        aborts_if scaled_denominator == 0 with EDENOMINATOR;
+        aborts_if quotient == 0 && scaled_numerator != 0 with ERATIO_OUT_OF_RANGE;
+        aborts_if quotient > MAX_U64 with ERATIO_OUT_OF_RANGE;
+    }
+    spec fun spec_create_from_rational(numerator: num, denominator: num): FixedPoint32 {
+        FixedPoint32{value: (numerator << 64) / (denominator << 32)}
+    }
+
+    /// Create a fixedpoint value from a raw value.
+    public fun create_from_raw_value(value: u64): FixedPoint32 {
+        FixedPoint32 { value }
+    }
+    spec create_from_raw_value {
+        pragma opaque;
+        aborts_if false;
+        ensures result.value == value;
+    }
+
+    /// Accessor for the raw u64 value. Other less common operations, such as
+    /// adding or subtracting FixedPoint32 values, can be done using the raw
+    /// values directly.
+    public fun get_raw_value(num: FixedPoint32): u64 {
+        num.value
+    }
+
+    /// Returns true if the ratio is zero.
+    public fun is_zero(num: FixedPoint32): bool {
+        num.value == 0
+    }
+
+    /// Returns the smaller of the two FixedPoint32 numbers.
+    public fun min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec min {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_min(num1, num2);
+    }
+    spec fun spec_min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Returns the larger of the two FixedPoint32 numbers.
+    public fun max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec max {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_max(num1, num2);
+    }
+    spec fun spec_max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Create a fixedpoint value from a u64 value.
+    public fun create_from_u64(val: u64): FixedPoint32 {
+        let value = (val as u128) << 32;
+        assert!(value <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32{value: (value as u64)}
+    }
+    spec create_from_u64 {
+        pragma opaque;
+        include CreateFromU64AbortsIf;
+        ensures result == spec_create_from_u64(val);
+    }
+    spec schema CreateFromU64AbortsIf {
+        val: num;
+        let scaled_value = (val as u128) << 32;
+        aborts_if scaled_value > MAX_U64;
+    }
+    spec fun spec_create_from_u64(val: num): FixedPoint32 {
+        FixedPoint32 {value: val << 32}
+    }
+
+    /// Returns the largest integer less than or equal to a given number.
+    public fun floor(num: FixedPoint32): u64 {
+        num.value >> 32
+    }
+    spec floor {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_floor(num);
+    }
+    spec fun spec_floor(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional) >> 32
+        }
+    }
+
+    /// Rounds up the given FixedPoint32 to the next largest integer.
+    public fun ceil(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        if (num.value == floored_num) {
+            return floored_num >> 32
+        };
+        let val = ((floored_num as u128) + (1 << 32));
+        (val >> 32 as u64)
+    }
+    spec ceil {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_ceil(num);
+    }
+    spec fun spec_ceil(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let one = 1 << 32;
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    /// Returns the value of a FixedPoint32 to the nearest integer.
+    public fun round(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        let boundary = floored_num + ((1 << 32) / 2);
+        if (num.value < boundary) {
+            floored_num >> 32
+        } else {
+            ceil(num)
+        }
+    }
+    spec round {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_round(num);
+    }
+    spec fun spec_round(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let boundary = (1 << 32) / 2;
+        let one = 1 << 32;
+        if (fractional < boundary) {
+            (val.value - fractional) >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    // **************** SPECIFICATIONS ****************
+
+    spec module {} // switch documentation context to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/hash.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/hash.move
new file mode 100644
index 000000000..daadc4e81
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/hash.move
@@ -0,0 +1,8 @@
+/// Module which defines SHA hashes for byte vectors.
+///
+/// The functions in this module are natively declared both in the Move runtime
+/// as in the Move prover's prelude.
+module std::hash {
+    native public fun sha2_256(data: vector<u8>): vector<u8>;
+    native public fun sha3_256(data: vector<u8>): vector<u8>;
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/option.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/option.move
new file mode 100644
index 000000000..eed419b2d
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/option.move
@@ -0,0 +1,259 @@
+/// This module defines the Option type and its methods to represent and handle an optional value.
+module std::option {
+    use std::vector;
+
+    /// Abstraction of a value that may or may not be present. Implemented with a vector of size
+    /// zero or one because Move bytecode does not have ADTs.
+    struct Option<Element> has copy, drop, store {
+        vec: vector<Element>
+    }
+    spec Option {
+        /// The size of vector is always less than equal to 1
+        /// because it's 0 for "none" or 1 for "some".
+        invariant len(vec) <= 1;
+    }
+
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `Some` while it should be `None`.
+    const EOPTION_IS_SET: u64 = 0x40000;
+    /// The `Option` is in an invalid state for the operation attempted.
+    /// The `Option` is `None` while it should be `Some`.
+    const EOPTION_NOT_SET: u64 = 0x40001;
+
+    /// Return an empty `Option`
+    public fun none<Element>(): Option<Element> {
+        Option { vec: vector::empty() }
+    }
+    spec none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_none<Element>();
+    }
+    spec fun spec_none<Element>(): Option<Element> {
+        Option{ vec: vec() }
+    }
+
+    /// Return an `Option` containing `e`
+    public fun some<Element>(e: Element): Option<Element> {
+        Option { vec: vector::singleton(e) }
+    }
+    spec some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_some(e);
+    }
+    spec fun spec_some<Element>(e: Element): Option<Element> {
+        Option{ vec: vec(e) }
+    }
+
+    /// Return true if `t` does not hold a value
+    public fun is_none<Element>(t: &Option<Element>): bool {
+        vector::is_empty(&t.vec)
+    }
+    spec is_none {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_none(t);
+    }
+
+    /// Return true if `t` holds a value
+    public fun is_some<Element>(t: &Option<Element>): bool {
+        !vector::is_empty(&t.vec)
+    }
+    spec is_some {
+        pragma opaque;
+        aborts_if false;
+        ensures result == is_some(t);
+    }
+
+    /// Return true if the value in `t` is equal to `e_ref`
+    /// Always returns `false` if `t` does not hold a value
+    public fun contains<Element>(t: &Option<Element>, e_ref: &Element): bool {
+        vector::contains(&t.vec, e_ref)
+    }
+    spec contains {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_contains(t, e_ref);
+    }
+    spec fun spec_contains<Element>(t: Option<Element>, e: Element): bool {
+        is_some(t) && borrow(t) == e
+    }
+
+    /// Return an immutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow<Element>(t: &Option<Element>): &Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow(&t.vec, 0)
+    }
+    spec borrow {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Return a reference to the value inside `t` if it holds one
+    /// Return `default_ref` if `t` does not hold a value
+    public fun borrow_with_default<Element>(t: &Option<Element>, default_ref: &Element): &Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default_ref
+        else vector::borrow(vec_ref, 0)
+    }
+    spec borrow_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default_ref);
+    }
+
+    /// Return the value inside `t` if it holds one
+    /// Return `default` if `t` does not hold a value
+    public fun get_with_default<Element: copy + drop>(
+        t: &Option<Element>,
+        default: Element,
+    ): Element {
+        let vec_ref = &t.vec;
+        if (vector::is_empty(vec_ref)) default
+        else *vector::borrow(vec_ref, 0)
+    }
+    spec get_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Convert the none option `t` to a some option by adding `e`.
+    /// Aborts if `t` already holds a value
+    public fun fill<Element>(t: &mut Option<Element>, e: Element) {
+        let vec_ref = &mut t.vec;
+        if (vector::is_empty(vec_ref)) vector::push_back(vec_ref, e)
+        else abort EOPTION_IS_SET
+    }
+    spec fill {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Convert a `some` option to a `none` by removing and returning the value stored inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun extract<Element>(t: &mut Option<Element>): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::pop_back(&mut t.vec)
+    }
+    spec extract {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_none(t);
+    }
+
+    /// Return a mutable reference to the value inside `t`
+    /// Aborts if `t` does not hold a value
+    public fun borrow_mut<Element>(t: &mut Option<Element>): &mut Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        vector::borrow_mut(&mut t.vec, 0)
+    }
+    spec borrow_mut {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value
+    /// Aborts if `t` does not hold a value
+    public fun swap<Element>(t: &mut Option<Element>, e: Element): Element {
+        assert!(is_some(t), EOPTION_NOT_SET);
+        let vec_ref = &mut t.vec;
+        let old_value = vector::pop_back(vec_ref);
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(old(t));
+        ensures is_some(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Swap the old value inside `t` with `e` and return the old value;
+    /// or if there is no old value, fill it with `e`.
+    /// Different from swap(), swap_or_fill() allows for `t` not holding a value.
+    public fun swap_or_fill<Element>(t: &mut Option<Element>, e: Element): Option<Element> {
+        let vec_ref = &mut t.vec;
+        let old_value = if (vector::is_empty(vec_ref)) none()
+            else some(vector::pop_back(vec_ref));
+        vector::push_back(vec_ref, e);
+        old_value
+    }
+    spec swap_or_fill {
+        pragma opaque;
+        ensures result == old(t);
+        ensures borrow(t) == e;
+    }
+
+    /// Destroys `t.` If `t` holds a value, return it. Returns `default` otherwise
+    public fun destroy_with_default<Element: drop>(t: Option<Element>, default: Element): Element {
+        let Option { vec } = t;
+        if (vector::is_empty(&vec)) default
+        else vector::pop_back(&mut vec)
+    }
+    spec destroy_with_default {
+        pragma opaque;
+        aborts_if false;
+        ensures result == (if (is_some(t)) borrow(t) else default);
+    }
+
+    /// Unpack `t` and return its contents
+    /// Aborts if `t` does not hold a value
+    public fun destroy_some<Element>(t: Option<Element>): Element {
+        assert!(is_some(&t), EOPTION_NOT_SET);
+        let Option { vec } = t;
+        let elem = vector::pop_back(&mut vec);
+        vector::destroy_empty(vec);
+        elem
+    }
+    spec destroy_some {
+        pragma opaque;
+        include AbortsIfNone<Element>;
+        ensures result == borrow(t);
+    }
+
+    /// Unpack `t`
+    /// Aborts if `t` holds a value
+    public fun destroy_none<Element>(t: Option<Element>) {
+        assert!(is_none(&t), EOPTION_IS_SET);
+        let Option { vec } = t;
+        vector::destroy_empty(vec)
+    }
+    spec destroy_none {
+        pragma opaque;
+        aborts_if is_some(t) with EOPTION_IS_SET;
+    }
+
+    /// Convert `t` into a vector of length 1 if it is `Some`,
+    /// and an empty vector otherwise
+    public fun to_vec<Element>(t: Option<Element>): vector<Element> {
+        let Option { vec } = t;
+        vec
+    }
+    spec to_vec {
+        pragma opaque;
+        aborts_if false;
+        ensures result == t.vec;
+    }
+
+    spec module {} // switch documentation context back to module level
+
+    spec module {
+        pragma aborts_if_is_strict;
+    }
+
+    /// # Helper Schema
+
+    spec schema AbortsIfNone<Element> {
+        t: Option<Element>;
+        aborts_if is_none(t) with EOPTION_NOT_SET;
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/signer.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/signer.move
new file mode 100644
index 000000000..1996b4331
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/signer.move
@@ -0,0 +1,21 @@
+module std::signer {
+    // Borrows the address of the signer
+    // Conceptually, you can think of the `signer` as being a struct wrapper arround an
+    // address
+    // ```
+    // struct signer has drop { addr: address }
+    // ```
+    // `borrow_address` borrows this inner field
+    native public fun borrow_address(s: &signer): &address;
+
+    // Copies the address of the signer
+    public fun address_of(s: &signer): address {
+        *borrow_address(s)
+    }
+
+    /// Return true only if `s` is a transaction signer. This is a spec function only available in spec.
+    spec native fun is_txn_signer(s: signer): bool;
+
+    /// Return true only if `a` is a transaction signer address. This is a spec function only available in spec.
+    spec native fun is_txn_signer_addr(a: address): bool;
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/string.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/string.move
new file mode 100644
index 000000000..fa9f6b61b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/string.move
@@ -0,0 +1,101 @@
+/// The `string` module defines the `String` type which represents UTF8 encoded strings.
+module std::string {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid UTF8 encoding.
+    const EINVALID_UTF8: u64 = 1;
+
+    /// Index out of range.
+    const EINVALID_INDEX: u64 = 2;
+
+    /// A `String` holds a sequence of bytes which is guaranteed to be in utf8 format.
+    struct String has copy, drop, store {
+        bytes: vector<u8>,
+    }
+
+    /// Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+    public fun utf8(bytes: vector<u8>): String {
+        assert!(internal_check_utf8(&bytes), EINVALID_UTF8);
+        String{bytes}
+    }
+
+    /// Tries to create a new string from a sequence of bytes.
+    public fun try_utf8(bytes: vector<u8>): Option<String> {
+        if (internal_check_utf8(&bytes)) {
+            option::some(String{bytes})
+        } else {
+            option::none()
+        }
+    }
+
+    /// Returns a reference to the underlying byte vector.
+    public fun bytes(s: &String): &vector<u8> {
+        &s.bytes
+    }
+
+    /// Checks whether this string is empty.
+    public fun is_empty(s: &String): bool {
+        vector::is_empty(&s.bytes)
+    }
+
+    /// Returns the length of this string, in bytes.
+    public fun length(s: &String): u64 {
+        vector::length(&s.bytes)
+    }
+
+    /// Appends a string.
+    public fun append(s: &mut String, r: String) {
+        vector::append(&mut s.bytes, r.bytes)
+    }
+
+    /// Appends bytes which must be in valid utf8 format.
+    public fun append_utf8(s: &mut String, bytes: vector<u8>) {
+        append(s, utf8(bytes))
+    }
+
+    /// Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+    /// boundary.
+    public fun insert(s: &mut String, at: u64, o: String) {
+        let bytes = &s.bytes;
+        assert!(at <= vector::length(bytes) && internal_is_char_boundary(bytes, at), EINVALID_INDEX);
+        let l = length(s);
+        let front = sub_string(s, 0, at);
+        let end = sub_string(s, at, l);
+        append(&mut front, o);
+        append(&mut front, end);
+        *s = front;
+    }
+
+    /// Returns a sub-string using the given byte indices, where `i` is the first byte position and `j` is the start
+    /// of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+    /// guaranteeing that the result is valid utf8.
+    public fun sub_string(s: &String, i: u64, j: u64): String {
+        let bytes = &s.bytes;
+        let l = vector::length(bytes);
+        assert!(
+            j <= l && i <= j && internal_is_char_boundary(bytes, i) && internal_is_char_boundary(bytes, j),
+            EINVALID_INDEX
+        );
+        String{bytes: internal_sub_string(bytes, i, j)}
+    }
+
+    /// Computes the index of the first occurrence of a string. Returns `length(s)` if no occurrence found.
+    public fun index_of(s: &String, r: &String): u64 {
+        internal_index_of(&s.bytes, &r.bytes)
+    }
+
+
+    // Native API
+    native fun internal_check_utf8(v: &vector<u8>): bool;
+    native fun internal_is_char_boundary(v: &vector<u8>, i: u64): bool;
+    native fun internal_sub_string(v: &vector<u8>, i: u64, j: u64): vector<u8>;
+    native fun internal_index_of(v: &vector<u8>, r: &vector<u8>): u64;
+
+    // Test only API for the native function. Don't return a value so other
+    // tests aren't tempted to use this function.
+    #[test_only]
+    public fun internal_sub_string_for_testing(v: &vector<u8>, i: u64, j: u64) {
+        internal_sub_string(v, i, j);
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/type_name.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/type_name.move
new file mode 100644
index 000000000..f439a6418
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/type_name.move
@@ -0,0 +1,38 @@
+/// Functionality for converting Move types into values. Use with care!
+module std::type_name {
+    use std::ascii::String;
+
+    struct TypeName has copy, drop, store {
+        /// String representation of the type. All types are represented
+        /// using their source syntax:
+        /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+        /// Struct types are represented as fully qualified type names; e.g.
+        /// `00000000000000000000000000000001::string::String` or
+        /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+        /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+        name: String
+    }
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are defining IDs (the ID of the package in
+    /// storage that first introduced the type).
+    public native fun get<T>(): TypeName;
+
+    /// Return a value representation of the type `T`.  Package IDs
+    /// that appear in fully qualified type names in the output from
+    /// this function are original IDs (the ID of the first version of
+    /// the package, even if the type in question was introduced in a
+    /// later upgrade).
+    public native fun get_with_original_ids<T>(): TypeName;
+
+    /// Get the String representation of `self`
+    public fun borrow_string(self: &TypeName): &String {
+        &self.name
+    }
+
+    /// Convert `self` into its inner String
+    public fun into_string(self: TypeName): String {
+        self.name
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/unit_test.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/unit_test.move
new file mode 100644
index 000000000..5f8da39e3
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/unit_test.move
@@ -0,0 +1,12 @@
+#[test_only]
+/// Module providing testing functionality. Only included for tests.
+module std::unit_test {
+    /// Return a `num_signers` number of unique signer values. No ordering or
+    /// starting value guarantees are made, only that the order and values of
+    /// the signers in the returned vector is deterministic.
+    ///
+    /// This function is also used to poison modules compiled in `test` mode.
+    /// This will cause a linking failure if an attempt is made to publish a
+    /// test module in a VM that isn't in unit test mode.
+    native public fun create_signers_for_testing(num_signers: u64): vector<signer>;
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/sources/vector.move b/vendors/move/move-execution/v1/crates/move-stdlib/sources/vector.move
new file mode 100644
index 000000000..32d895002
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/sources/vector.move
@@ -0,0 +1,217 @@
+/// A variable-sized container that can hold any type. Indexing is 0-based, and
+/// vectors are growable. This module has many native functions.
+/// Verification of modules that use this one uses model functions that are implemented
+/// directly in Boogie. The specification language has built-in functions operations such
+/// as `singleton_vector`. There are some helper functions defined here for specifications in other
+/// modules as well.
+///
+/// >Note: We did not verify most of the
+/// Move functions here because many have loops, requiring loop invariants to prove, and
+/// the return on investment didn't seem worth it for these simple functions.
+module std::vector {
+
+    /// The index into the vector is out of bounds
+    const EINDEX_OUT_OF_BOUNDS: u64 = 0x20000;
+
+    #[bytecode_instruction]
+    /// Create an empty vector.
+    native public fun empty<Element>(): vector<Element>;
+
+    #[bytecode_instruction]
+    /// Return the length of the vector.
+    native public fun length<Element>(v: &vector<Element>): u64;
+
+    #[bytecode_instruction]
+    /// Acquire an immutable reference to the `i`th element of the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+
+    #[bytecode_instruction]
+    /// Add element `e` to the end of the vector `v`.
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+
+    #[bytecode_instruction]
+    /// Return a mutable reference to the `i`th element in the vector `v`.
+    /// Aborts if `i` is out of bounds.
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+
+    #[bytecode_instruction]
+    /// Pop an element from the end of vector `v`.
+    /// Aborts if `v` is empty.
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+
+    #[bytecode_instruction]
+    /// Destroy the vector `v`.
+    /// Aborts if `v` is not empty.
+    native public fun destroy_empty<Element>(v: vector<Element>);
+
+    #[bytecode_instruction]
+    /// Swaps the elements at the `i`th and `j`th indices in the vector `v`.
+    /// Aborts if `i` or `j` is out of bounds.
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+
+    /// Return an vector of size one containing element `e`.
+    public fun singleton<Element>(e: Element): vector<Element> {
+        let v = empty();
+        push_back(&mut v, e);
+        v
+    }
+    spec singleton {
+        // TODO: when using opaque here, we get verification errors.
+        // pragma opaque;
+        aborts_if false;
+        ensures result == vec(e);
+    }
+
+    /// Reverses the order of the elements in the vector `v` in place.
+    public fun reverse<Element>(v: &mut vector<Element>) {
+        let len = length(v);
+        if (len == 0) return ();
+
+        let front_index = 0;
+        let back_index = len -1;
+        while (front_index < back_index) {
+            swap(v, front_index, back_index);
+            front_index = front_index + 1;
+            back_index = back_index - 1;
+        }
+    }
+    spec reverse {
+        pragma intrinsic = true;
+    }
+
+
+    /// Pushes all of the elements of the `other` vector into the `lhs` vector.
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>) {
+        reverse(&mut other);
+        while (!is_empty(&other)) push_back(lhs, pop_back(&mut other));
+        destroy_empty(other);
+    }
+    spec append {
+        pragma intrinsic = true;
+    }
+    spec is_empty {
+        pragma intrinsic = true;
+    }
+
+
+    /// Return `true` if the vector `v` has no elements and `false` otherwise.
+    public fun is_empty<Element>(v: &vector<Element>): bool {
+        length(v) == 0
+    }
+
+    /// Return true if `e` is in the vector `v`.
+    /// Otherwise, returns false.
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return true;
+            i = i + 1;
+        };
+        false
+    }
+    spec contains {
+        pragma intrinsic = true;
+    }
+
+    /// Return `(true, i)` if `e` is in the vector `v` at index `i`.
+    /// Otherwise, returns `(false, 0)`.
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64) {
+        let i = 0;
+        let len = length(v);
+        while (i < len) {
+            if (borrow(v, i) == e) return (true, i);
+            i = i + 1;
+        };
+        (false, 0)
+    }
+    spec index_of {
+        pragma intrinsic = true;
+    }
+
+    /// Remove the `i`th element of the vector `v`, shifting all subsequent elements.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        let len = length(v);
+        // i out of bounds; abort
+        if (i >= len) abort EINDEX_OUT_OF_BOUNDS;
+
+        len = len - 1;
+        while (i < len) swap(v, i, { i = i + 1; i });
+        pop_back(v)
+    }
+    spec remove {
+        pragma intrinsic = true;
+    }
+
+    /// Insert `e` at position `i` in the vector `v`.
+    /// If `i` is in bounds, this shifts the old `v[i]` and all subsequent elements to the right.
+    /// If `i == length(v)`, this adds `e` to the end of the vector.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i > length(v)`
+    public fun insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        let len = length(v);
+        // i too big abort
+        if (i > len) abort EINDEX_OUT_OF_BOUNDS;
+
+        push_back(v, e);
+        while (i < len) {
+            swap(v, i, len);
+            i = i + 1
+        }
+    }
+    spec insert {
+        pragma intrinsic = true;
+    }
+
+    /// Swap the `i`th element of the vector `v` with the last element and then pop the vector.
+    /// This is O(1), but does not preserve ordering of elements in the vector.
+    /// Aborts if `i` is out of bounds.
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element {
+        assert!(!is_empty(v), EINDEX_OUT_OF_BOUNDS);
+        let last_idx = length(v) - 1;
+        swap(v, i, last_idx);
+        pop_back(v)
+    }
+    spec swap_remove {
+        pragma intrinsic = true;
+    }
+
+    // =================================================================
+    // Module Specification
+
+    spec module {} // Switch to module documentation context
+
+    /// # Helper Functions
+
+    spec module {
+        /// Check if `v1` is equal to the result of adding `e` at the end of `v2`
+        fun eq_push_back<Element>(v1: vector<Element>, v2: vector<Element>, e: Element): bool {
+            len(v1) == len(v2) + 1 &&
+            v1[len(v1)-1] == e &&
+            v1[0..len(v1)-1] == v2[0..len(v2)]
+        }
+
+        /// Check if `v` is equal to the result of concatenating `v1` and `v2`
+        fun eq_append<Element>(v: vector<Element>, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v) == len(v1) + len(v2) &&
+            v[0..len(v1)] == v1 &&
+            v[len(v1)..len(v)] == v2
+        }
+
+        /// Check `v1` is equal to the result of removing the first element of `v2`
+        fun eq_pop_front<Element>(v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1 == v2[1..len(v2)]
+        }
+
+        /// Check that `v1` is equal to the result of removing the element at index `i` from `v2`.
+        fun eq_remove_elem_at_index<Element>(i: u64, v1: vector<Element>, v2: vector<Element>): bool {
+            len(v1) + 1 == len(v2) &&
+            v1[0..i] == v2[0..i] &&
+            v1[i..len(v1)] == v2[i + 1..len(v2)]
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/lib.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/lib.rs
new file mode 100644
index 000000000..5561bac4b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/lib.rs
@@ -0,0 +1,163 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use log::LevelFilter;
+use move_command_line_common::{
+    address::NumericalAddress,
+    files::{extension_equals, find_filenames, MOVE_EXTENSION},
+};
+use std::{collections::BTreeMap, path::PathBuf};
+
+#[cfg(test)]
+mod tests;
+pub mod utils;
+
+pub mod natives;
+
+const MODULES_DIR: &str = "sources";
+const NURSERY_DIR: &str = "nursery";
+const DOCS_DIR: &str = "docs";
+const NURSERY_DOCS_DIR: &str = "nursery/docs";
+const ERRMAP_FILE: &str = "error_description.errmap";
+
+const REFERENCES_TEMPLATE: &str = "doc_templates/references.md";
+const OVERVIEW_TEMPLATE: &str = "doc_templates/overview.md";
+
+pub fn unit_testing_files() -> Vec<String> {
+    vec![path_in_crate("sources/UnitTest.move")]
+        .into_iter()
+        .map(|p| p.into_os_string().into_string().unwrap())
+        .collect()
+}
+
+pub fn path_in_crate<S>(relative: S) -> PathBuf
+where
+    S: Into<String>,
+{
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push(relative.into());
+    path
+}
+
+pub fn move_stdlib_modules_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), MODULES_DIR)
+}
+
+pub fn move_stdlib_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), DOCS_DIR)
+}
+
+pub fn move_nursery_docs_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), NURSERY_DOCS_DIR)
+}
+
+pub fn move_stdlib_errmap_full_path() -> String {
+    format!("{}/{}", env!("CARGO_MANIFEST_DIR"), ERRMAP_FILE)
+}
+
+pub fn move_stdlib_files() -> Vec<String> {
+    let path = path_in_crate(MODULES_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_nursery_files() -> Vec<String> {
+    let path = path_in_crate(NURSERY_DIR);
+    find_filenames(&[path], |p| extension_equals(p, MOVE_EXTENSION)).unwrap()
+}
+
+pub fn move_stdlib_named_addresses() -> BTreeMap<String, NumericalAddress> {
+    let mapping = [("std", "0x1")];
+    mapping
+        .iter()
+        .map(|(name, addr)| (name.to_string(), NumericalAddress::parse_str(addr).unwrap()))
+        .collect()
+}
+
+pub fn build_doc(
+    output_path: &str,
+    doc_path: &str,
+    templates: Vec<String>,
+    references_file: Option<String>,
+    sources: &[String],
+    dep_paths: Vec<String>,
+    with_diagram: bool,
+    named_addresses: BTreeMap<String, NumericalAddress>,
+) {
+    let options = move_prover::cli::Options {
+        move_sources: sources.to_vec(),
+        move_deps: dep_paths,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(&named_addresses),
+        verbosity_level: LevelFilter::Warn,
+        run_docgen: true,
+        docgen: move_docgen::DocgenOptions {
+            root_doc_templates: templates,
+            references_file,
+            doc_path: vec![doc_path.to_string()],
+            output_directory: output_path.to_string(),
+            include_dep_diagrams: with_diagram,
+            include_call_diagrams: with_diagram,
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+pub fn build_stdlib_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![path_in_crate(OVERVIEW_TEMPLATE)
+            .to_string_lossy()
+            .to_string()],
+        Some(
+            path_in_crate(REFERENCES_TEMPLATE)
+                .to_string_lossy()
+                .to_string(),
+        ),
+        move_stdlib_files().as_slice(),
+        vec![],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_nursery_doc(output_path: &str) {
+    build_doc(
+        output_path,
+        "",
+        vec![],
+        None,
+        move_nursery_files().as_slice(),
+        vec![move_stdlib_modules_full_path()],
+        false,
+        move_stdlib_named_addresses(),
+    )
+}
+
+pub fn build_error_code_map(output_path: &str) {
+    let options = move_prover::cli::Options {
+        move_sources: crate::move_stdlib_files(),
+        move_deps: vec![],
+        verbosity_level: LevelFilter::Warn,
+        run_errmapgen: true,
+        move_named_address_values: move_prover::cli::named_addresses_for_options(
+            &move_stdlib_named_addresses(),
+        ),
+        errmapgen: move_errmapgen::ErrmapOptions {
+            output_file: output_path.to_string(),
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    options.setup_logging_for_test();
+    move_prover::run_move_prover_errors_to_stderr(options).unwrap();
+}
+
+const ERROR_DESCRIPTIONS: &[u8] = include_bytes!("../error_description.errmap");
+
+pub fn error_descriptions() -> &'static [u8] {
+    ERROR_DESCRIPTIONS
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/bcs.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/bcs.rs
new file mode 100644
index 000000000..b4e0c1392
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/bcs.rs
@@ -0,0 +1,118 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    vm_status::sub_status::NFE_BCS_SERIALIZATION_FAILURE,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+/***************************************************************************************************
+ * native fun to_bytes
+ *
+ *   gas cost: size_of(val_type) * input_unit_cost +        | get type layout
+ *             size_of(val) * input_unit_cost +             | serialize value
+ *             max(size_of(output), 1) * output_unit_cost
+ *
+ *             If any of the first two steps fails, a partial cost + an additional failure_cost
+ *             will be charged.
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct ToBytesGasParameters {
+    pub per_byte_serialized: InternalGasPerByte,
+    pub legacy_min_output_size: NumBytes,
+    pub failure: InternalGas,
+}
+
+/// Rust implementation of Move's `native public fun to_bytes<T>(&T): vector<u8>`
+#[inline]
+fn native_to_bytes(
+    gas_params: &ToBytesGasParameters,
+    context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    // pop type and value
+    let ref_to_val = pop_arg!(args, Reference);
+    let arg_type = ty_args.pop().unwrap();
+
+    // get type layout
+    let layout = match context.type_to_type_layout(&arg_type)? {
+        Some(layout) => layout,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    // serialize value
+    let val = ref_to_val.read_ref()?;
+    let serialized_value = match val.simple_serialize(&layout) {
+        Some(serialized_value) => serialized_value,
+        None => {
+            // If we run out of gas when charging for failure, we don't want the `OUT_OF_GAS` error
+            // to mask the actual error `NFE_BCS_SERIALIZATION_FAILURE`, so we saturate deduction at 0
+            context.charge_gas(gas_params.failure);
+            return Ok(NativeResult::err(
+                context.gas_used(),
+                NFE_BCS_SERIALIZATION_FAILURE,
+            ));
+        }
+    };
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_serialized
+            * std::cmp::max(
+                NumBytes::new(serialized_value.len() as u64),
+                gas_params.legacy_min_output_size,
+            )
+    );
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(serialized_value)],
+    ))
+}
+
+pub fn make_native_to_bytes(gas_params: ToBytesGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_to_bytes(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub to_bytes: ToBytesGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [("to_bytes", make_native_to_bytes(gas_params.to_bytes))];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/debug.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/debug.rs
new file mode 100644
index 000000000..1e0d9d08f
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/debug.rs
@@ -0,0 +1,698 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
+#[allow(unused_imports)]
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Reference, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun print
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_nop(
+    gas_params: &PrintGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[inline]
+fn native_print(
+    gas_params: &PrintGasParameters,
+    _context: &mut NativeContext,
+    mut ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+    _move_std_addr: AccountAddress,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    let _val = args.pop_back().unwrap();
+    let _ty = ty_args.pop().unwrap();
+
+    // No-op if the feature flag is not present.
+    #[cfg(feature = "testing")]
+    {
+        let canonical = false;
+        let single_line = false;
+        let include_int_types = false;
+
+        let mut out = "[debug] ".to_string();
+        let val = _val.value_as::<Reference>()?.read_ref()?;
+
+        testing::print_value(
+            _context,
+            &mut out,
+            val,
+            _ty,
+            &_move_std_addr,
+            0,
+            canonical,
+            single_line,
+            include_int_types,
+        )?;
+        println!("{}", out);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print(
+    silent: bool,
+    gas_params: PrintGasParameters,
+    move_std_addr: AccountAddress,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print(&gas_params, context, ty_args, args, move_std_addr)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * native fun print_stack_trace
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintStackTraceGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print_stack_trace_nop(
+    gas_params: &PrintStackTraceGasParameters,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+#[allow(unused_variables)]
+#[inline]
+fn native_print_stack_trace(
+    gas_params: &PrintStackTraceGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.is_empty());
+
+    #[cfg(feature = "testing")]
+    {
+        let mut s = String::new();
+        context.print_stack_trace(&mut s)?;
+        println!("{}", s);
+    }
+
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print_stack_trace(
+    silent: bool,
+    gas_params: PrintStackTraceGasParameters,
+) -> NativeFunction {
+    if silent {
+        Arc::new(
+            move |_context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace_nop(&gas_params, ty_args, args)
+            },
+        )
+    } else {
+        Arc::new(
+            move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+                native_print_stack_trace(&gas_params, context, ty_args, args)
+            },
+        )
+    }
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub print: PrintGasParameters,
+    pub print_stack_trace: PrintStackTraceGasParameters,
+}
+
+pub fn make_all(
+    silent: bool,
+    gas_params: GasParameters,
+    move_std_addr: AccountAddress,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "print",
+            make_native_print(silent, gas_params.print, move_std_addr),
+        ),
+        (
+            "print_stack_trace",
+            make_native_print_stack_trace(silent, gas_params.print_stack_trace),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
+
+#[cfg(feature = "testing")]
+mod testing {
+    use move_binary_format::errors::{PartialVMError, PartialVMResult};
+    use move_core_types::{
+        account_address::AccountAddress, annotated_value as A, language_storage::TypeTag,
+        runtime_value as R, vm_status::StatusCode,
+    };
+    use move_vm_runtime::native_functions::NativeContext;
+    use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
+    use std::{fmt, fmt::Write};
+
+    const VECTOR_BEGIN: &str = "[";
+
+    const VECTOR_OR_STRUCT_SEP: &str = ",";
+
+    const VECTOR_END: &str = "]";
+
+    const STRUCT_BEGIN: &str = "{";
+
+    const STRUCT_END: &str = "}";
+
+    fn fmt_error_to_partial_vm_error(e: fmt::Error) -> PartialVMError {
+        PartialVMError::new(StatusCode::UNKNOWN_STATUS)
+            .with_message("write! macro failed with: ".to_string() + e.to_string().as_str())
+    }
+
+    fn to_vec_u8_type_err<E>(_e: E) -> PartialVMError {
+        PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+            .with_message("Could not convert Vec<MoveValue> to Vec<u8>: ".to_string())
+    }
+
+    fn get_annotated_struct_layout(
+        context: &NativeContext,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveStructLayout> {
+        let annotated_type_layout = context.type_to_fully_annotated_layout(ty)?.unwrap();
+        match annotated_type_layout {
+            A::MoveTypeLayout::Struct(annotated_struct_layout) => Ok(annotated_struct_layout),
+            _ => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                    "Could not convert Type to fully-annotated MoveTypeLayout via NativeContext"
+                        .to_string(),
+                ),
+            ),
+        }
+    }
+
+    fn get_vector_inner_type(ty: &Type) -> PartialVMResult<&Type> {
+        match ty {
+            Type::Vector(ty) => Ok(ty),
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Could not get the inner Type of a vector's Type".to_string())),
+        }
+    }
+
+    /// Converts a `MoveValue::Vector` of `u8`'s to a `String` by wrapping it in double quotes and
+    /// escaping double quotes and backslashes.
+    ///
+    /// Examples:
+    ///  - 'Hello' returns "Hello"
+    ///  - '"Hello?" What are you saying?' returns "\"Hello?\" What are you saying?"
+    ///  - '\ and " are escaped' returns "\\ and \" are escaped"
+    fn move_value_as_escaped_string(val: A::MoveValue) -> PartialVMResult<String> {
+        match val {
+            A::MoveValue::Vector(bytes) => {
+                let buf = R::MoveValue::vec_to_vec_u8(
+                    bytes.into_iter().map(A::MoveValue::undecorate).collect(),
+                )
+                .map_err(to_vec_u8_type_err)?;
+
+                let str = String::from_utf8(buf).map_err(|e| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "Could not parse UTF8 bytes: ".to_string() + e.to_string().as_str(),
+                    )
+                })?;
+
+                // We need to escape displayed double quotes " as \" and, as a result, also escape
+                // displayed \ as \\.
+                Ok(str.replace('\\', "\\\\").replace('"', "\\\""))
+            }
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Expected a MoveValue::Vector of u8's".to_string())),
+        }
+    }
+
+    fn print_padding_at_depth(out: &mut String, depth: usize) -> PartialVMResult<()> {
+        for _ in 0..depth {
+            // add 2 spaces
+            write!(out, "  ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+
+        Ok(())
+    }
+
+    fn is_non_empty_vector_u8(vec: &Vec<A::MoveValue>) -> bool {
+        if vec.is_empty() {
+            false
+        } else {
+            matches!(vec.last().unwrap(), A::MoveValue::U8(_))
+        }
+    }
+
+    fn is_vector_or_struct_move_value(mv: &A::MoveValue) -> bool {
+        matches!(mv, A::MoveValue::Vector(_) | A::MoveValue::Struct(_))
+    }
+
+    /// Prints any `Value` in a user-friendly manner.
+    pub(crate) fn print_value(
+        context: &NativeContext,
+        out: &mut String,
+        val: Value,
+        ty: Type,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        // get type layout in VM format
+        let ty_layout = context.type_to_type_layout(&ty)?.unwrap();
+
+        match &ty_layout {
+            R::MoveTypeLayout::Vector(_) => {
+                // get the inner type T of a vector<T>
+                let inner_ty = get_vector_inner_type(&ty)?;
+                let inner_tyl = context.type_to_type_layout(inner_ty)?.unwrap();
+
+                match inner_tyl {
+                    // We cannot simply convert a `Value` (of type vector) to a `MoveValue` because
+                    // there might be a struct in the vector that needs to be "decorated" using the
+                    // logic in this function. Instead, we recursively "unpack" the vector until we
+                    // get down to either (1) a primitive type, which we can forward to
+                    // `print_move_value`, or (2) a struct type, which we can decorate and forward
+                    // to `print_move_value`.
+                    R::MoveTypeLayout::Vector(_) | R::MoveTypeLayout::Struct(_) => {
+                        // `val` is either a `Vec<Vec<Value>>`, a `Vec<Struct>`,  or a `Vec<signer>`, so we cast `val` as a `Vec<Value>` and call ourselves recursively
+                        let vec = val.value_as::<Vec<Value>>()?;
+
+                        let print_inner_value =
+                            |out: &mut String,
+                             val: Value,
+                             move_std_addr: &AccountAddress,
+                             depth: usize,
+                             canonicalize: bool,
+                             single_line: bool,
+                             include_int_types: bool| {
+                                print_value(
+                                    context,
+                                    out,
+                                    val,
+                                    inner_ty.clone(),
+                                    move_std_addr,
+                                    depth,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )
+                            };
+
+                        print_non_u8_vector(
+                            out,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                            vec,
+                            print_inner_value,
+                            true,
+                        )?;
+                    }
+                    // If the inner type T of this vector<T> is a primitive bool/unsigned integer/address type, we convert the
+                    // vector<T> to a MoveValue and print it.
+                    _ => {
+                        let ann_ty_layout = context.type_to_fully_annotated_layout(&ty)?.unwrap();
+                        let mv = val.as_move_value(&ty_layout).decorate(&ann_ty_layout);
+                        print_move_value(
+                            out,
+                            mv,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+                    }
+                };
+            }
+            // For a struct, we convert it to a MoveValue annotated with its field names and types and print it
+            R::MoveTypeLayout::Struct(_) => {
+                let move_struct = match val.as_move_value(&ty_layout) {
+                    R::MoveValue::Struct(s) => s,
+                    _ => {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message("Expected MoveValue::MoveStruct".to_string()))
+                    }
+                };
+
+                let annotated_struct_layout = get_annotated_struct_layout(context, &ty)?;
+                let decorated_struct = move_struct.decorate(&annotated_struct_layout);
+
+                print_move_value(
+                    out,
+                    A::MoveValue::Struct(decorated_struct),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+            // For non-structs and non-vectors, convert them to a MoveValue and print them
+            _ => {
+                let ann_ty_layout = context.type_to_fully_annotated_layout(&ty)?.unwrap();
+                print_move_value(
+                    out,
+                    val.as_move_value(&ty_layout).decorate(&ann_ty_layout),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Prints the MoveValue in `mv`, optionally-printing integer types if `include_int_type` is
+    /// true.
+    fn print_move_value(
+        out: &mut String,
+        mv: A::MoveValue,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        match mv {
+            A::MoveValue::U8(u8) => {
+                write!(out, "{}", u8).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u8").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U16(u16) => {
+                write!(out, "{}", u16).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u16").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U32(u32) => {
+                write!(out, "{}", u32).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u32").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U64(u64) => {
+                write!(out, "{}", u64).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u64").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U128(u128) => {
+                write!(out, "{}", u128).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u128").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::U256(u256) => {
+                write!(out, "{}", u256).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u256").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            A::MoveValue::Bool(b) => {
+                // Note that when `include_int_types` is enabled, the boolean `true` and `false`
+                // values unambiguously encode their type, since they are different than any integer
+                // type value, address value, signer value, vector value and struct value.
+                write!(out, "{}", if b { "true" } else { "false" })
+                    .map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Address(a) => {
+                let str = if canonicalize {
+                    a.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    a.to_hex_literal()
+                };
+                write!(out, "@{}", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Signer(s) => {
+                let str = if canonicalize {
+                    s.to_canonical_string(/* with_prefix */ false)
+                } else {
+                    s.to_hex_literal()
+                };
+                write!(out, "signer({})", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            A::MoveValue::Vector(vec) => {
+                // If this is a vector<u8> we print it in hex (as most users would expect us to)
+                if is_non_empty_vector_u8(&vec) {
+                    let bytes = R::MoveValue::vec_to_vec_u8(
+                        vec.into_iter().map(A::MoveValue::undecorate).collect(),
+                    )
+                    .map_err(to_vec_u8_type_err)?;
+                    write!(out, "0x{}", hex::encode(bytes))
+                        .map_err(fmt_error_to_partial_vm_error)?;
+                } else {
+                    let is_complex_inner_type =
+                        vec.last().map_or(false, is_vector_or_struct_move_value);
+                    print_non_u8_vector(
+                        out,
+                        move_std_addr,
+                        depth,
+                        canonicalize,
+                        single_line,
+                        include_int_types,
+                        vec,
+                        print_move_value,
+                        is_complex_inner_type,
+                    )?;
+                }
+            }
+            A::MoveValue::Struct(A::MoveStruct { type_, mut fields }) => {
+                let type_tag = TypeTag::from(type_.clone());
+
+                // Check if struct is an std::string::String
+                if !canonicalize && type_.is_std_string(move_std_addr) {
+                    if fields.len() != 1 {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::string::String struct to have just one field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let (id, val) = fields.pop().unwrap();
+                    if id.into_string() != "bytes" {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::string::String struct to have a `bytes` field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let str = move_value_as_escaped_string(val)?;
+                    write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                } else if !canonicalize && type_.is_ascii_string(move_std_addr) {
+                    if fields.len() != 1 {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::ascii::String struct to have just one field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let (id, val) = fields.pop().unwrap();
+                    if id.into_string() != "bytes" {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message(
+                                "Expected std::ascii::String struct to have a `bytes` field"
+                                    .to_string(),
+                            ));
+                    }
+
+                    let str = move_value_as_escaped_string(val)?;
+                    write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                } else {
+                    write!(out, "{} ", type_tag).map_err(fmt_error_to_partial_vm_error)?;
+                    write!(out, "{}", STRUCT_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+
+                    // For each field, print its name and value (and type)
+                    let mut iter = fields.into_iter();
+                    if let Some((field_name, field_value)) = iter.next() {
+                        // Start an indented new line
+                        if !single_line {
+                            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                            print_padding_at_depth(out, depth + 1)?;
+                        }
+
+                        write!(out, "{}: ", field_name.into_string())
+                            .map_err(fmt_error_to_partial_vm_error)?;
+                        print_move_value(
+                            out,
+                            field_value,
+                            move_std_addr,
+                            depth + 1,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+
+                        for (field_name, field_value) in iter {
+                            write!(out, "{}", VECTOR_OR_STRUCT_SEP)
+                                .map_err(fmt_error_to_partial_vm_error)?;
+
+                            if !single_line {
+                                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                print_padding_at_depth(out, depth + 1)?;
+                            } else {
+                                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                            }
+                            write!(out, "{}: ", field_name.into_string())
+                                .map_err(fmt_error_to_partial_vm_error)?;
+                            print_move_value(
+                                out,
+                                field_value,
+                                move_std_addr,
+                                depth + 1,
+                                canonicalize,
+                                single_line,
+                                include_int_types,
+                            )?;
+                        }
+                    }
+
+                    // Ends printing the struct with "}", which could be on its own line
+                    if !single_line {
+                        writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                        print_padding_at_depth(out, depth)?;
+                    }
+                    write!(out, "{}", STRUCT_END).map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn print_non_u8_vector<ValType>(
+        out: &mut String,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+        vec: Vec<ValType>,
+        print_inner_value: impl Fn(
+            &mut String,
+            ValType,
+            &AccountAddress,
+            usize,
+            bool,
+            bool,
+            bool,
+        ) -> PartialVMResult<()>,
+        is_complex_inner_type: bool,
+    ) -> PartialVMResult<()> {
+        write!(out, "{}", VECTOR_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+        let mut iter = vec.into_iter();
+        let mut empty_vec = true;
+
+        if let Some(first_elem) = iter.next() {
+            empty_vec = false;
+
+            // For vectors-of-vectors, and for vectors-of-structs, we start a newline for each element
+            if !single_line && is_complex_inner_type {
+                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                print_padding_at_depth(out, depth + 1)?;
+            } else {
+                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+            }
+
+            print_inner_value(
+                out,
+                first_elem,
+                move_std_addr,
+                depth + 1,
+                canonicalize,
+                single_line,
+                include_int_types,
+            )?;
+
+            for elem in iter {
+                write!(out, "{}", VECTOR_OR_STRUCT_SEP).map_err(fmt_error_to_partial_vm_error)?;
+
+                // For vectors of vectors or vectors of structs, we start a newline for each element
+                if !single_line && is_complex_inner_type {
+                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                    print_padding_at_depth(out, depth + 1)?;
+                } else {
+                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                }
+                print_inner_value(
+                    out,
+                    elem,
+                    move_std_addr,
+                    depth + 1,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        // For vectors of vectors or vectors of structs, we display the closing ] on a newline
+        if !single_line && is_complex_inner_type {
+            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+            print_padding_at_depth(out, depth)?;
+        } else if !empty_vec {
+            write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+        write!(out, "{}", VECTOR_END).map_err(fmt_error_to_partial_vm_error)?;
+
+        Ok(())
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/hash.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/hash.rs
new file mode 100644
index 000000000..8656c640b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/hash.rs
@@ -0,0 +1,134 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use sha2::{Digest, Sha256};
+use sha3::Sha3_256;
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun sha2_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha2_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha2_256(
+    gas_params: &Sha2_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha2_256(gas_params: Sha2_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha2_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun sha3_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha3_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha3_256(
+    gas_params: &Sha3_256GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    let hash_arg = pop_arg!(arguments, Vec<u8>);
+
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let hash_vec = Sha3_256::digest(hash_arg.as_slice()).to_vec();
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![Value::vector_u8(hash_vec)],
+    ))
+}
+
+pub fn make_native_sha3_256(gas_params: Sha3_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha3_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub sha2_256: Sha2_256GasParameters,
+    pub sha3_256: Sha3_256GasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("sha2_256", make_native_sha2_256(gas_params.sha2_256)),
+        ("sha3_256", make_native_sha3_256(gas_params.sha3_256)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/helpers.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/helpers.rs
new file mode 100644
index 000000000..1a8b8a88c
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/helpers.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_runtime::native_functions::NativeFunction;
+
+pub fn make_module_natives(
+    natives: impl IntoIterator<Item = (impl Into<String>, NativeFunction)>,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    natives
+        .into_iter()
+        .map(|(func_name, func)| (func_name.into(), func))
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/mod.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/mod.rs
new file mode 100644
index 000000000..30c7579ea
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/mod.rs
@@ -0,0 +1,173 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod bcs;
+pub mod debug;
+pub mod hash;
+pub mod signer;
+pub mod string;
+pub mod type_name;
+#[cfg(feature = "testing")]
+pub mod unit_test;
+pub mod vector;
+
+mod helpers;
+
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub bcs: bcs::GasParameters,
+    pub hash: hash::GasParameters,
+    pub signer: signer::GasParameters,
+    pub string: string::GasParameters,
+    pub type_name: type_name::GasParameters,
+    pub vector: vector::GasParameters,
+
+    #[cfg(feature = "testing")]
+    pub unit_test: unit_test::GasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            bcs: bcs::GasParameters {
+                to_bytes: bcs::ToBytesGasParameters {
+                    per_byte_serialized: 0.into(),
+                    legacy_min_output_size: 0.into(),
+                    failure: 0.into(),
+                },
+            },
+
+            hash: hash::GasParameters {
+                sha2_256: hash::Sha2_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+                sha3_256: hash::Sha3_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+            },
+            type_name: type_name::GasParameters {
+                get: type_name::GetGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+            },
+            signer: signer::GasParameters {
+                borrow_address: signer::BorrowAddressGasParameters { base: 0.into() },
+            },
+            string: string::GasParameters {
+                check_utf8: string::CheckUtf8GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                is_char_boundary: string::IsCharBoundaryGasParameters { base: 0.into() },
+                sub_string: string::SubStringGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                index_of: string::IndexOfGasParameters {
+                    base: 0.into(),
+                    per_byte_pattern: 0.into(),
+                    per_byte_searched: 0.into(),
+                },
+            },
+            vector: vector::GasParameters {
+                empty: vector::EmptyGasParameters { base: 0.into() },
+                length: vector::LengthGasParameters { base: 0.into() },
+                push_back: vector::PushBackGasParameters {
+                    base: 0.into(),
+                    legacy_per_abstract_memory_unit: 0.into(),
+                },
+                borrow: vector::BorrowGasParameters { base: 0.into() },
+                pop_back: vector::PopBackGasParameters { base: 0.into() },
+                destroy_empty: vector::DestroyEmptyGasParameters { base: 0.into() },
+                swap: vector::SwapGasParameters { base: 0.into() },
+            },
+            #[cfg(feature = "testing")]
+            unit_test: unit_test::GasParameters {
+                create_signers_for_testing: unit_test::CreateSignersForTestingGasParameters {
+                    base_cost: 0.into(),
+                    unit_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn all_natives(
+    move_std_addr: AccountAddress,
+    gas_params: GasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("bcs", bcs::make_all(gas_params.bcs));
+    add_natives!("hash", hash::make_all(gas_params.hash));
+    add_natives!("signer", signer::make_all(gas_params.signer));
+    add_natives!("string", string::make_all(gas_params.string));
+    add_natives!("type_name", type_name::make_all(gas_params.type_name));
+    add_natives!("vector", vector::make_all(gas_params.vector));
+    #[cfg(feature = "testing")]
+    {
+        add_natives!("unit_test", unit_test::make_all(gas_params.unit_test));
+    }
+
+    make_table_from_iter(move_std_addr, natives)
+}
+
+#[derive(Debug, Clone)]
+pub struct NurseryGasParameters {
+    debug: debug::GasParameters,
+}
+
+impl NurseryGasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            debug: debug::GasParameters {
+                print: debug::PrintGasParameters {
+                    base_cost: 0.into(),
+                },
+                print_stack_trace: debug::PrintStackTraceGasParameters {
+                    base_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn nursery_natives(
+    silent: bool,
+    move_std_addr: AccountAddress,
+    gas_params: NurseryGasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!(
+        "debug",
+        debug::make_all(silent, gas_params.debug, move_std_addr)
+    );
+
+    make_table_from_iter(move_std_addr, natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/signer.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/signer.rs
new file mode 100644
index 000000000..6aed1bb7a
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/signer.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::InternalGas;
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{values_impl::SignerRef, Value},
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun borrow_address
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowAddressGasParameters {
+    pub base: InternalGas,
+}
+
+#[inline]
+fn native_borrow_address(
+    gas_params: &BorrowAddressGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(_ty_args.is_empty());
+    debug_assert!(arguments.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let signer_reference = pop_arg!(arguments, SignerRef);
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![signer_reference.borrow_signer()?],
+    ))
+}
+
+pub fn make_native_borrow_address(gas_params: BorrowAddressGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_address(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub borrow_address: BorrowAddressGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "borrow_address",
+        make_native_borrow_address(gas_params.borrow_address),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/string.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/string.rs
new file mode 100644
index 000000000..679364fbc
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/string.rs
@@ -0,0 +1,250 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implementation of native functions for utf8 strings.
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, VectorRef},
+};
+use std::{collections::VecDeque, sync::Arc};
+
+// The implementation approach delegates all utf8 handling to Rust.
+// This is possible without copying of bytes because (a) we can
+// get a `std::cell::Ref<Vec<u8>>` from a `vector<u8>` and in turn a `&[u8]`
+// from that (b) assuming that `vector<u8>` embedded in a string
+// is already valid utf8, we can use `str::from_utf8_unchecked` to
+// create a `&str` view on the bytes without a copy. Once we have this
+// view, we can call ut8 functions like length, substring, etc.
+
+/***************************************************************************************************
+ * native fun internal_check_utf8
+ *
+ *   gas cost: base_cost + unit_cost * length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct CheckUtf8GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_check_utf8(
+    gas_params: &CheckUtf8GasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 1);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new(s_ref.as_slice().len() as u64);
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, cost);
+
+    let ok = std::str::from_utf8(s_ref.as_slice()).is_ok();
+    // TODO: extensible native cost tables
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_check_utf8(gas_params: CheckUtf8GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_check_utf8(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_is_char_boundary
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IsCharBoundaryGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_is_char_boundary(
+    gas_params: &IsCharBoundaryGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let i = pop_arg!(args, u64);
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let ok = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice()).is_char_boundary(i as usize)
+    };
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::bool(ok)))
+}
+
+pub fn make_native_is_char_boundary(gas_params: IsCharBoundaryGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_is_char_boundary(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_sub_string
+ *
+ *   gas cost: base_cost + unit_cost * sub_string_length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SubStringGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_sub_string(
+    gas_params: &SubStringGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 3);
+
+    let j = pop_arg!(args, u64) as usize;
+    let i = pop_arg!(args, u64) as usize;
+    // Charge before doing work
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    if j < i {
+        // TODO: what abort code should we use here?
+        return Ok(NativeResult::err(context.gas_used(), 1));
+    }
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new((j - i) as u64);
+    native_charge_gas_early_exit!(context, cost);
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice())
+    };
+    let v = Value::vector_u8(s_str[i..j].as_bytes().iter().cloned());
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(v))
+}
+
+pub fn make_native_sub_string(gas_params: SubStringGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sub_string(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_index_of
+ *
+ *   gas cost: base_cost + unit_cost * bytes_searched
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IndexOfGasParameters {
+    pub base: InternalGas,
+    pub per_byte_pattern: InternalGasPerByte,
+    pub per_byte_searched: InternalGasPerByte,
+}
+
+fn native_index_of(
+    gas_params: &IndexOfGasParameters,
+    context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r_arg = pop_arg!(args, VectorRef);
+    let r_ref = r_arg.as_bytes_ref();
+    let r_str = unsafe { std::str::from_utf8_unchecked(r_ref.as_slice()) };
+    // Charge pattern fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_pattern * NumBytes::new(r_str.len() as u64)
+    );
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe { std::str::from_utf8_unchecked(s_ref.as_slice()) };
+    let pos = match s_str.find(r_str) {
+        Some(size) => size,
+        None => s_str.len(),
+    };
+    // TODO(Gas): What is the algorithm used for the search?
+    //            Ideally it should be something like KMP with O(n) time complexity...
+    // Charge search fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte_searched * NumBytes::new(pos as u64)
+    );
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Ok(Value::u64(pos as u64)))
+}
+
+pub fn make_native_index_of(gas_params: IndexOfGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_index_of(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub check_utf8: CheckUtf8GasParameters,
+    pub is_char_boundary: IsCharBoundaryGasParameters,
+    pub sub_string: SubStringGasParameters,
+    pub index_of: IndexOfGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "internal_check_utf8",
+            make_native_check_utf8(gas_params.check_utf8),
+        ),
+        (
+            "internal_is_char_boundary",
+            make_native_is_char_boundary(gas_params.is_char_boundary),
+        ),
+        (
+            "internal_sub_string",
+            make_native_sub_string(gas_params.sub_string),
+        ),
+        (
+            "internal_index_of",
+            make_native_index_of(gas_params.index_of),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/type_name.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/type_name.rs
new file mode 100644
index 000000000..595e4dde6
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/type_name.rs
@@ -0,0 +1,89 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    values::{Struct, Value},
+};
+
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+#[derive(Debug, Clone)]
+pub struct GetGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_get(
+    use_original_id: bool,
+    gas_params: &GetGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert_eq!(ty_args.len(), 1);
+    debug_assert!(arguments.is_empty());
+
+    // Charge base fee
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let type_tag = if use_original_id {
+        context.type_to_runtime_type_tag(&ty_args[0])
+    } else {
+        context.type_to_type_tag(&ty_args[0])
+    }?;
+
+    let type_name = type_tag.to_canonical_string(/* with_prefix */ false);
+
+    // Charge base fee
+    native_charge_gas_early_exit!(
+        context,
+        gas_params.per_byte * NumBytes::new(type_name.len() as u64)
+    );
+
+    // make a std::string::String
+    let string_val = Value::struct_(Struct::pack(vec![Value::vector_u8(
+        type_name.as_bytes().to_vec(),
+    )]));
+    // make a std::type_name::TypeName
+    let type_name_val = Value::struct_(Struct::pack(vec![string_val]));
+
+    Ok(NativeResult::ok(
+        context.gas_used(),
+        smallvec![type_name_val],
+    ))
+}
+
+pub fn make_native_get(use_original_id: bool, gas_params: GetGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| {
+        native_get(use_original_id, &gas_params, context, ty_args, args)
+    })
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub get: GetGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "get",
+            make_native_get(/* use_original_id */ false, gas_params.get.clone()),
+        ),
+        (
+            "get_with_original_ids",
+            make_native_get(/* use_original_id */ true, gas_params.get),
+        ),
+    ];
+
+    crate::natives::helpers::make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/unit_test.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/unit_test.rs
new file mode 100644
index 000000000..610ecefe6
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/unit_test.rs
@@ -0,0 +1,85 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerArg, NumArgs},
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+};
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun create_signers_for_testing
+ *
+ *   gas cost: base_cost + unit_cost * num_of_signers
+ *
+ **************************************************************************************************/
+fn to_le_bytes(i: u64) -> [u8; AccountAddress::LENGTH] {
+    let bytes = i.to_le_bytes();
+    let mut result = [0u8; AccountAddress::LENGTH];
+    result[..bytes.len()].clone_from_slice(bytes.as_ref());
+    result
+}
+
+#[derive(Debug, Clone)]
+pub struct CreateSignersForTestingGasParameters {
+    pub base_cost: InternalGas,
+    pub unit_cost: InternalGasPerArg,
+}
+
+fn native_create_signers_for_testing(
+    gas_params: &CreateSignersForTestingGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.is_empty());
+    debug_assert!(args.len() == 1);
+
+    let num_signers = pop_arg!(args, u64);
+    let signers = Value::vector_for_testing_only(
+        (0..num_signers).map(|i| Value::signer(AccountAddress::new(to_le_bytes(i)))),
+    );
+
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumArgs::new(num_signers);
+    native_charge_gas_early_exit!(context, cost);
+
+    Ok(NativeResult::ok(context.gas_used(), smallvec![signers]))
+}
+
+pub fn make_native_create_signers_for_testing(
+    gas_params: CreateSignersForTestingGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_create_signers_for_testing(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub create_signers_for_testing: CreateSignersForTestingGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "create_signers_for_testing",
+        make_native_create_signers_for_testing(gas_params.create_signers_for_testing),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/vector.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/vector.rs
new file mode 100644
index 000000000..194777201
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/natives/vector.rs
@@ -0,0 +1,340 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerAbstractMemoryUnit},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    native_charge_gas_early_exit,
+    native_functions::{NativeContext, NativeFunction},
+};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, Vector, VectorRef},
+    views::ValueView,
+};
+use std::{collections::VecDeque, sync::Arc};
+
+/***************************************************************************************************
+ * native fun empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct EmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_empty(
+    gas_params: &EmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.is_empty());
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    NativeResult::map_partial_vm_result_one(context.gas_used(), Vector::empty(&ty_args[0]))
+}
+
+pub fn make_native_empty(gas_params: EmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun length
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct LengthGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_length(
+    gas_params: &LengthGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(context.gas_used(), r.len(&ty_args[0]))
+}
+
+pub fn make_native_length(gas_params: LengthGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_length(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun push_back
+ *
+ *   gas cost: base_cost + legacy_unit_cost * max(1, size_of(val))
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PushBackGasParameters {
+    pub base: InternalGas,
+    pub legacy_per_abstract_memory_unit: InternalGasPerAbstractMemoryUnit,
+}
+
+pub fn native_push_back(
+    gas_params: &PushBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let e = args.pop_back().unwrap();
+    let r = pop_arg!(args, VectorRef);
+
+    if gas_params.legacy_per_abstract_memory_unit != 0.into() {
+        let cost = gas_params.legacy_per_abstract_memory_unit
+            * std::cmp::max(e.legacy_abstract_memory_size(), 1.into());
+        native_charge_gas_early_exit!(context, cost);
+    }
+
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.push_back(
+            e,
+            &ty_args[0],
+            context.runtime_limits_config().vector_len_max,
+        ),
+    )
+}
+
+pub fn make_native_push_back(gas_params: PushBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_push_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun borrow
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_borrow(
+    gas_params: &BorrowGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 2);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.borrow_elem(idx, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_borrow(gas_params: BorrowGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun pop
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PopBackGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_pop_back(
+    gas_params: &PopBackGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_one(
+        context.gas_used(),
+        r.pop(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_pop_back(gas_params: PopBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_pop_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun destroy_empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_destroy_empty(
+    gas_params: &DestroyEmptyGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 1);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+
+    let v = pop_arg!(args, Vector);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        v.destroy_empty(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_destroy_empty(gas_params: DestroyEmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun swap
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SwapGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_swap(
+    gas_params: &SwapGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(ty_args.len() == 1);
+    debug_assert!(args.len() == 3);
+
+    native_charge_gas_early_exit!(context, gas_params.base);
+    let idx2 = pop_arg!(args, u64) as usize;
+    let idx1 = pop_arg!(args, u64) as usize;
+    let r = pop_arg!(args, VectorRef);
+    NativeResult::map_partial_vm_result_empty(
+        context.gas_used(),
+        r.swap(idx1, idx2, &ty_args[0])
+            .map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_swap(gas_params: SwapGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_swap(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+fn native_error_to_abort(err: PartialVMError) -> PartialVMError {
+    let (major_status, sub_status_opt, message_opt, exec_state_opt, indices, offsets) =
+        err.all_data();
+    let new_err = match major_status {
+        StatusCode::VECTOR_OPERATION_ERROR => PartialVMError::new(StatusCode::ABORTED),
+        _ => PartialVMError::new(major_status),
+    };
+    let new_err = match sub_status_opt {
+        None => new_err,
+        Some(code) => new_err.with_sub_status(code),
+    };
+    let new_err = match message_opt {
+        None => new_err,
+        Some(message) => new_err.with_message(message),
+    };
+    let new_err = match exec_state_opt {
+        None => new_err,
+        Some(stacktrace) => new_err.with_exec_state(stacktrace),
+    };
+    new_err.at_indices(indices).at_code_offsets(offsets)
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub empty: EmptyGasParameters,
+    pub length: LengthGasParameters,
+    pub push_back: PushBackGasParameters,
+    pub borrow: BorrowGasParameters,
+    pub pop_back: PopBackGasParameters,
+    pub destroy_empty: DestroyEmptyGasParameters,
+    pub swap: SwapGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("empty", make_native_empty(gas_params.empty)),
+        ("length", make_native_length(gas_params.length)),
+        ("push_back", make_native_push_back(gas_params.push_back)),
+        ("borrow", make_native_borrow(gas_params.borrow.clone())),
+        ("borrow_mut", make_native_borrow(gas_params.borrow)),
+        ("pop_back", make_native_pop_back(gas_params.pop_back)),
+        (
+            "destroy_empty",
+            make_native_destroy_empty(gas_params.destroy_empty),
+        ),
+        ("swap", make_native_swap(gas_params.swap)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/tests.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/tests.rs
new file mode 100644
index 000000000..c89e6392e
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/tests.rs
@@ -0,0 +1,105 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::bail;
+use std::{cmp::Ordering, path::Path};
+use tempfile::tempdir;
+use walkdir::{DirEntry, WalkDir};
+
+#[test]
+fn check_that_docs_are_updated() {
+    let temp_dir = tempdir().unwrap();
+
+    crate::build_stdlib_doc(&temp_dir.path().to_string_lossy());
+
+    let res = check_dirs_not_diff(&temp_dir, crate::move_stdlib_docs_full_path());
+    assert!(
+        res.is_ok(),
+        "Generated docs differ from the ones checked in. {}",
+        res.unwrap_err()
+    )
+}
+
+#[test]
+fn check_that_the_errmap_is_updated() {
+    let temp_file = tempfile::NamedTempFile::new().unwrap();
+
+    crate::build_error_code_map(&temp_file.path().to_string_lossy());
+
+    assert!(
+        file_diff::diff(
+            &temp_file.path().to_string_lossy(),
+            &crate::move_stdlib_errmap_full_path()
+        ),
+        "Generated errmap differ from the one checked in"
+    );
+}
+
+fn check_dirs_not_diff<A: AsRef<Path>, B: AsRef<Path>>(
+    actual: A,
+    expected: B,
+) -> anyhow::Result<()> {
+    let mut act_walker = sorted_walk_dir(actual)?;
+    let mut exp_walker = sorted_walk_dir(expected)?;
+
+    for (a, b) in (&mut act_walker).zip(&mut exp_walker) {
+        let a = a?;
+        let b = b?;
+
+        if a.depth() != b.depth() {
+            bail!(
+                "Mismatched depth for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type() != b.file_type() {
+            bail!(
+                "Mismatched file type for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_name() != b.file_name() {
+            bail!(
+                "Mismatched file name for {} and {}",
+                display_dir_entry(a),
+                display_dir_entry(b),
+            )
+        }
+        if a.file_type().is_file() && std::fs::read(a.path())? != std::fs::read(b.path())? {
+            bail!("{} needs to be updated", display_dir_entry(a))
+        }
+    }
+
+    if let Some(a) = act_walker.next() {
+        bail!(
+            "Unexpected dir entry: {}. Not found in expected",
+            display_dir_entry(a?)
+        )
+    }
+    if let Some(b) = exp_walker.next() {
+        bail!(
+            "Expected dir entry: {}. Not found in actual",
+            display_dir_entry(b?)
+        )
+    }
+    Ok(())
+}
+
+fn sorted_walk_dir<P: AsRef<Path>>(path: P) -> Result<walkdir::IntoIter, std::io::Error> {
+    fn compare_by_file_name(a: &DirEntry, b: &DirEntry) -> Ordering {
+        a.file_name().cmp(b.file_name())
+    }
+
+    let mut walkdir = WalkDir::new(path).sort_by(compare_by_file_name).into_iter();
+    match walkdir.next() {
+        Some(Err(e)) => Err(e.into()),
+        _ => Ok(walkdir),
+    }
+}
+
+fn display_dir_entry(d: walkdir::DirEntry) -> String {
+    d.into_path().to_string_lossy().to_string()
+}
diff --git a/vendors/move/move-execution/v1/crates/move-stdlib/src/utils.rs b/vendors/move/move-execution/v1/crates/move-stdlib/src/utils.rs
new file mode 100644
index 000000000..2a762867b
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-stdlib/src/utils.rs
@@ -0,0 +1,17 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{io::Write, time::Instant};
+
+pub fn time_it<F, R>(msg: &str, f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    let now = Instant::now();
+    print!("{} ... ", msg);
+    let _ = std::io::stdout().flush();
+    let res = f();
+    println!("(took {:.3}s)", now.elapsed().as_secs_f64());
+    res
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml b/vendors/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml
new file mode 100644
index 000000000..c7eca3580
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "move-vm-runtime-v1"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+description = "Core Move execution logic"
+repository = "https://github.com/diem/diem"
+homepage = "https://diem.com"
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+better_any.workspace = true
+fail.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+sha3.workspace = true
+tracing.workspace = true
+smallvec.workspace = true
+
+move-bytecode-verifier = { path = "../move-bytecode-verifier", package = "move-bytecode-verifier-v1" }
+move-core-types.workspace = true
+move-vm-config.workspace = true
+move-vm-types.workspace = true
+move-binary-format.workspace = true
+move-vm-profiler.workspace = true
+
+[dev-dependencies]
+anyhow = "1.0.71"
+hex.workspace = true
+proptest.workspace = true
+move-ir-compiler.workspace = true
+move-compiler.workspace = true
+
+[features]
+default = []
+fuzzing = ["move-vm-types/fuzzing"]
+failpoints = ["fail/failpoints"]
+# Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds.
+debugging = []
+testing = []
+lazy_natives = []
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs
new file mode 100644
index 000000000..cd46dd7a6
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs
@@ -0,0 +1,304 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::loader::Loader;
+
+use move_binary_format::errors::*;
+use move_core_types::{
+    account_address::AccountAddress,
+    effects::{AccountChangeSet, ChangeSet, Event, Op},
+    gas_algebra::NumBytes,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::Type,
+    values::{GlobalValue, Value},
+};
+use std::collections::btree_map::BTreeMap;
+
+pub struct AccountDataCache {
+    data_map: BTreeMap<Type, (MoveTypeLayout, GlobalValue)>,
+    module_map: BTreeMap<Identifier, Vec<u8>>,
+}
+
+impl AccountDataCache {
+    fn new() -> Self {
+        Self {
+            data_map: BTreeMap::new(),
+            module_map: BTreeMap::new(),
+        }
+    }
+}
+
+/// Transaction data cache. Keep updates within a transaction so they can all be published at
+/// once when the transaction succeeds.
+///
+/// It also provides an implementation for the opcodes that refer to storage and gives the
+/// proper guarantees of reference lifetime.
+///
+/// Dirty objects are serialized and returned in make_write_set.
+///
+/// It is a responsibility of the client to publish changes once the transaction is executed.
+///
+/// The Move VM takes a `DataStore` in input and this is the default and correct implementation
+/// for a data store related to a transaction. Clients should create an instance of this type
+/// and pass it to the Move VM.
+pub(crate) struct TransactionDataCache<'l, S> {
+    remote: S,
+    loader: &'l Loader,
+    account_map: BTreeMap<AccountAddress, AccountDataCache>,
+    event_data: Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)>,
+}
+
+impl<'l, S: MoveResolver> TransactionDataCache<'l, S> {
+    /// Create a `TransactionDataCache` with a `RemoteCache` that provides access to data
+    /// not updated in the transaction.
+    pub(crate) fn new(remote: S, loader: &'l Loader) -> Self {
+        TransactionDataCache {
+            remote,
+            loader,
+            account_map: BTreeMap::new(),
+            event_data: vec![],
+        }
+    }
+
+    /// Make a write set from the updated (dirty, deleted) global resources along with
+    /// published modules.
+    ///
+    /// Gives all proper guarantees on lifetime of global data as well.
+    pub(crate) fn into_effects(mut self) -> (PartialVMResult<(ChangeSet, Vec<Event>)>, S) {
+        (self.impl_into_effects(), self.remote)
+    }
+    fn impl_into_effects(&mut self) -> PartialVMResult<(ChangeSet, Vec<Event>)> {
+        let mut change_set = ChangeSet::new();
+        for (addr, account_data_cache) in std::mem::take(&mut self.account_map).into_iter() {
+            let mut modules = BTreeMap::new();
+            for (module_name, module_blob) in account_data_cache.module_map {
+                modules.insert(module_name, Op::New(module_blob));
+            }
+
+            let mut resources = BTreeMap::new();
+            for (ty, (layout, gv)) in account_data_cache.data_map {
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                let struct_tag = match self.loader.type_to_type_tag(&ty)? {
+                    TypeTag::Struct(struct_tag) => *struct_tag,
+                    _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::New(resource_blob));
+                    }
+                    Op::Modify(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::Modify(resource_blob));
+                    }
+                    Op::Delete => {
+                        resources.insert(struct_tag, Op::Delete);
+                    }
+                }
+            }
+            if !modules.is_empty() || !resources.is_empty() {
+                change_set
+                    .add_account_changeset(
+                        addr,
+                        AccountChangeSet::from_modules_resources(modules, resources),
+                    )
+                    .expect("accounts should be unique");
+            }
+        }
+
+        let mut events = vec![];
+        for (guid, seq_num, ty, ty_layout, val) in std::mem::take(&mut self.event_data) {
+            let ty_tag = self.loader.type_to_type_tag(&ty)?;
+            let blob = val
+                .simple_serialize(&ty_layout)
+                .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+            events.push((guid, seq_num, ty_tag, blob))
+        }
+
+        Ok((change_set, events))
+    }
+
+    pub(crate) fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        // The sender's account will always be mutated.
+        let mut total_mutated_accounts: u64 = 1;
+        for (addr, entry) in self.account_map.iter() {
+            if addr != sender && entry.data_map.values().any(|(_, v)| v.is_mutated()) {
+                total_mutated_accounts += 1;
+            }
+        }
+        total_mutated_accounts
+    }
+
+    pub(crate) fn get_remote_resolver(&self) -> &S {
+        &self.remote
+    }
+
+    pub(crate) fn get_remote_resolver_mut(&mut self) -> &mut S {
+        &mut self.remote
+    }
+}
+
+// `DataStore` implementation for the `TransactionDataCache`
+impl<'l, S: MoveResolver> DataStore for TransactionDataCache<'l, S> {
+    // Retrieve data from the local cache or loads it from the remote cache into the local cache.
+    // All operations on the global data are based on this API and they all load the data
+    // into the cache.
+    fn load_resource(
+        &mut self,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        let account_cache = self
+            .account_map
+            .entry(addr)
+            .or_insert_with(AccountDataCache::new);
+
+        let mut load_res = None;
+        if !account_cache.data_map.contains_key(ty) {
+            let ty_tag = match self.loader.type_to_type_tag(ty)? {
+                TypeTag::Struct(s_tag) => s_tag,
+                _ =>
+                // non-struct top-level value; can't happen
+                {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))
+                }
+            };
+            // TODO(Gas): Shall we charge for this?
+            let ty_layout = self.loader.type_to_type_layout(ty)?;
+
+            let gv = match self.remote.get_resource(&addr, &ty_tag) {
+                Ok(Some(blob)) => {
+                    load_res = Some(Some(NumBytes::new(blob.len() as u64)));
+                    let val = match Value::simple_deserialize(&blob, &ty_layout) {
+                        Some(val) => val,
+                        None => {
+                            let msg =
+                                format!("Failed to deserialize resource {} at {}!", ty_tag, addr);
+                            return Err(PartialVMError::new(
+                                StatusCode::FAILED_TO_DESERIALIZE_RESOURCE,
+                            )
+                            .with_message(msg));
+                        }
+                    };
+
+                    GlobalValue::cached(val)?
+                }
+                Ok(None) => {
+                    load_res = Some(None);
+                    GlobalValue::none()
+                }
+                Err(err) => {
+                    let msg = format!("Unexpected storage error: {:?}", err);
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(msg),
+                    );
+                }
+            };
+
+            account_cache.data_map.insert(ty.clone(), (ty_layout, gv));
+        }
+
+        Ok((
+            account_cache
+                .data_map
+                .get_mut(ty)
+                .map(|(_ty_layout, gv)| gv)
+                .expect("global value must exist"),
+            load_res,
+        ))
+    }
+
+    fn link_context(&self) -> AccountAddress {
+        self.remote.link_context()
+    }
+
+    fn relocate(&self, module_id: &ModuleId) -> PartialVMResult<ModuleId> {
+        self.remote.relocate(module_id).map_err(|err| {
+            PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Error relocating {module_id}: {err:?}"))
+        })
+    }
+
+    fn defining_module(
+        &self,
+        module_id: &ModuleId,
+        struct_: &IdentStr,
+    ) -> PartialVMResult<ModuleId> {
+        self.remote
+            .defining_module(module_id, struct_)
+            .map_err(|err| {
+                PartialVMError::new(StatusCode::LINKER_ERROR).with_message(format!(
+                    "Error finding defining module for {module_id}::{struct_}: {err:?}"
+                ))
+            })
+    }
+
+    fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
+        if let Some(account_cache) = self.account_map.get(module_id.address()) {
+            if let Some(blob) = account_cache.module_map.get(module_id.name()) {
+                return Ok(blob.clone());
+            }
+        }
+        match self.remote.get_module(module_id) {
+            Ok(Some(bytes)) => Ok(bytes),
+            Ok(None) => Err(PartialVMError::new(StatusCode::LINKER_ERROR)
+                .with_message(format!("Cannot find {:?} in data cache", module_id))
+                .finish(Location::Undefined)),
+            Err(err) => {
+                let msg = format!("Unexpected storage error: {:?}", err);
+                Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(msg)
+                        .finish(Location::Undefined),
+                )
+            }
+        }
+    }
+
+    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()> {
+        let account_cache = self
+            .account_map
+            .entry(*module_id.address())
+            .or_insert_with(AccountDataCache::new);
+
+        account_cache
+            .module_map
+            .insert(module_id.name().to_owned(), blob);
+
+        Ok(())
+    }
+
+    fn emit_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<()> {
+        let ty_layout = self.loader.type_to_type_layout(&ty)?;
+        self.event_data.push((guid, seq_num, ty, ty_layout, val));
+        Ok(())
+    }
+
+    fn events(&self) -> &Vec<(Vec<u8>, u64, Type, MoveTypeLayout, Value)> {
+        &self.event_data
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs
new file mode 100644
index 000000000..9be306b09
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs
@@ -0,0 +1,195 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+use move_binary_format::file_format::Bytecode;
+use move_vm_types::values::{self, Locals};
+use std::{
+    collections::BTreeSet,
+    io::{self, Write},
+    str::FromStr,
+};
+
+#[derive(Debug)]
+enum DebugCommand {
+    PrintStack,
+    Step,
+    Continue,
+    Breakpoint(String),
+    DeleteBreakpoint(String),
+    PrintBreakpoints,
+}
+
+impl DebugCommand {
+    pub fn debug_string(&self) -> &str {
+        match self {
+            Self::PrintStack => "stack",
+            Self::Step => "step",
+            Self::Continue => "continue",
+            Self::Breakpoint(_) => "breakpoint ",
+            Self::DeleteBreakpoint(_) => "delete ",
+            Self::PrintBreakpoints => "breakpoints",
+        }
+    }
+
+    pub fn commands() -> Vec<DebugCommand> {
+        vec![
+            Self::PrintStack,
+            Self::Step,
+            Self::Continue,
+            Self::Breakpoint("".to_string()),
+            Self::DeleteBreakpoint("".to_string()),
+            Self::PrintBreakpoints,
+        ]
+    }
+}
+
+impl FromStr for DebugCommand {
+    type Err = String;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use DebugCommand::*;
+        let s = s.trim();
+        if s.starts_with(PrintStack.debug_string()) {
+            return Ok(PrintStack);
+        }
+        if s.starts_with(Step.debug_string()) {
+            return Ok(Step);
+        }
+        if s.starts_with(Continue.debug_string()) {
+            return Ok(Continue);
+        }
+        if let Some(breakpoint) = s.strip_prefix(Breakpoint("".to_owned()).debug_string()) {
+            return Ok(Breakpoint(breakpoint.to_owned()));
+        }
+        if let Some(breakpoint) = s.strip_prefix(DeleteBreakpoint("".to_owned()).debug_string()) {
+            return Ok(DeleteBreakpoint(breakpoint.to_owned()));
+        }
+        if s.starts_with(PrintBreakpoints.debug_string()) {
+            return Ok(PrintBreakpoints);
+        }
+        Err(format!(
+            "Unrecognized command: {}\nAvailable commands: {}",
+            s,
+            Self::commands()
+                .iter()
+                .map(|command| command.debug_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        ))
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct DebugContext {
+    breakpoints: BTreeSet<String>,
+    should_take_input: bool,
+}
+
+impl DebugContext {
+    pub(crate) fn new() -> Self {
+        Self {
+            breakpoints: BTreeSet::new(),
+            should_take_input: true,
+        }
+    }
+
+    pub(crate) fn debug_loop(
+        &mut self,
+        function_desc: &Function,
+        locals: &Locals,
+        pc: u16,
+        instr: &Bytecode,
+        resolver: &Loader,
+        interp: &Interpreter,
+    ) {
+        let instr_string = format!("{:?}", instr);
+        let function_string = function_desc.pretty_string();
+        let breakpoint_hit = self.breakpoints.contains(&function_string)
+            || self
+                .breakpoints
+                .iter()
+                .any(|bp| instr_string[..].starts_with(bp.as_str()));
+
+        if self.should_take_input || breakpoint_hit {
+            self.should_take_input = true;
+            if breakpoint_hit {
+                let bp_match = self
+                    .breakpoints
+                    .iter()
+                    .find(|bp| instr_string.starts_with(bp.as_str()))
+                    .unwrap()
+                    .clone();
+                println!(
+                    "Breakpoint {} hit with instruction {}",
+                    bp_match, instr_string
+                );
+            }
+            println!(
+                "function >> {}\ninstruction >> {:?}\nprogram counter >> {}",
+                function_string, instr, pc
+            );
+            loop {
+                print!("> ");
+                std::io::stdout().flush().unwrap();
+                let mut input = String::new();
+                match io::stdin().read_line(&mut input) {
+                    Ok(_) => match input.parse::<DebugCommand>() {
+                        Err(err) => println!("{}", err),
+                        Ok(command) => match command {
+                            DebugCommand::Step => {
+                                self.should_take_input = true;
+                                break;
+                            }
+                            DebugCommand::Continue => {
+                                self.should_take_input = false;
+                                break;
+                            }
+                            DebugCommand::Breakpoint(breakpoint) => {
+                                self.breakpoints.insert(breakpoint.to_string());
+                            }
+                            DebugCommand::DeleteBreakpoint(breakpoint) => {
+                                self.breakpoints.remove(&breakpoint);
+                            }
+                            DebugCommand::PrintBreakpoints => self
+                                .breakpoints
+                                .iter()
+                                .enumerate()
+                                .for_each(|(i, bp)| println!("[{}] {}", i, bp)),
+                            DebugCommand::PrintStack => {
+                                let mut s = String::new();
+                                interp.debug_print_stack_trace(&mut s, resolver).unwrap();
+                                println!("{}", s);
+                                println!("Current frame: {}\n", function_string);
+                                let code = function_desc.code();
+                                println!("        Code:");
+                                for (i, instr) in code.iter().enumerate() {
+                                    if i as u16 == pc {
+                                        println!("          > [{}] {:?}", pc, instr);
+                                    } else {
+                                        println!("            [{}] {:?}", i, instr);
+                                    }
+                                }
+                                println!("        Locals:");
+                                if function_desc.local_count() > 0 {
+                                    let mut s = String::new();
+                                    values::debug::print_locals(&mut s, locals).unwrap();
+                                    println!("{}", s);
+                                } else {
+                                    println!("            (none)");
+                                }
+                            }
+                        },
+                    },
+                    Err(err) => {
+                        println!("Error reading input: {}", err);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs
new file mode 100644
index 000000000..b4d5bc805
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs
@@ -0,0 +1,2520 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    loader::{Function, Loader, Resolver},
+    native_functions::NativeContext,
+    trace,
+};
+use fail::fail_point;
+use move_binary_format::{
+    errors::*,
+    file_format::{Ability, AbilitySet, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{NumArgs, NumBytes},
+    language_storage::TypeTag,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_profiler::{
+    profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr,
+};
+use move_vm_types::{
+    data_store::DataStore,
+    gas::{GasMeter, SimpleInstruction},
+    loaded_data::runtime_types::Type,
+    values::{
+        self, GlobalValue, IntegerValue, Locals, Reference, Struct, StructRef, VMValueCast, Value,
+        Vector, VectorRef,
+    },
+    views::TypeView,
+};
+use smallvec::SmallVec;
+
+use crate::native_extensions::NativeContextExtensions;
+use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc};
+use tracing::error;
+
+macro_rules! debug_write {
+    ($($toks: tt)*) => {
+        write!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! debug_writeln {
+    ($($toks: tt)*) => {
+        writeln!($($toks)*).map_err(|_|
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to write to buffer".to_string())
+        )
+    };
+}
+
+macro_rules! set_err_info {
+    ($frame:ident, $e:expr) => {{
+        $e.at_code_offset($frame.function.index(), $frame.pc)
+            .finish($frame.location())
+    }};
+}
+
+enum InstrRet {
+    Ok,
+    ExitCode(ExitCode),
+    Branch,
+}
+
+/// `Interpreter` instances can execute Move functions.
+///
+/// An `Interpreter` instance is a stand alone execution context for a function.
+/// It mimics execution on a single thread, with an call stack and an operand stack.
+pub(crate) struct Interpreter {
+    /// Operand stack, where Move `Value`s are stored for stack operations.
+    operand_stack: Stack,
+    /// The stack of active functions.
+    call_stack: CallStack,
+    /// Whether to perform a paranoid type safety checks at runtime.
+    paranoid_type_checks: bool,
+    /// Limits imposed at runtime
+    runtime_limits_config: VMRuntimeLimitsConfig,
+}
+
+struct TypeWithLoader<'a, 'b> {
+    ty: &'a Type,
+    loader: &'b Loader,
+}
+
+impl<'a, 'b> TypeView for TypeWithLoader<'a, 'b> {
+    fn to_type_tag(&self) -> TypeTag {
+        self.loader.type_to_type_tag(self.ty).unwrap()
+    }
+}
+
+impl Interpreter {
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        &self.runtime_limits_config
+    }
+    /// Entrypoint into the interpreter. All external calls need to be routed through this
+    /// function.
+    pub(crate) fn entrypoint(
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        loader: &Loader,
+    ) -> VMResult<Vec<Value>> {
+        let mut interpreter = Interpreter {
+            operand_stack: Stack::new(),
+            call_stack: CallStack::new(),
+            paranoid_type_checks: loader.vm_config().paranoid_type_checks,
+            runtime_limits_config: loader.vm_config().runtime_limits_config.clone(),
+        };
+
+        profile_open_frame!(gas_meter, function.pretty_string());
+
+        if function.is_native() {
+            for arg in args {
+                interpreter
+                    .operand_stack
+                    .push(arg)
+                    .map_err(|e| e.finish(Location::Undefined))?;
+            }
+            let link_context = data_store.link_context();
+            let resolver = function.get_resolver(link_context, loader);
+
+            if interpreter.paranoid_type_checks {
+                for ty in function.parameter_types() {
+                    let type_ = if ty_args.is_empty() {
+                        ty.clone()
+                    } else {
+                        resolver
+                            .subst(ty, &ty_args)
+                            .map_err(|e| e.finish(Location::Undefined))?
+                    };
+                    interpreter
+                        .operand_stack
+                        .push_ty(type_)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                }
+            }
+
+            let return_values = interpreter
+                .call_native_return_values(
+                    &resolver,
+                    data_store,
+                    gas_meter,
+                    extensions,
+                    function.clone(),
+                    &ty_args,
+                )
+                .map_err(|e| match function.module_id() {
+                    Some(id) => e
+                        .at_code_offset(function.index(), 0)
+                        .finish(Location::Module(id.clone())),
+                    None => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(
+                            "Unexpected native function not located in a module".to_owned(),
+                        )
+                        .finish(Location::Undefined),
+                })?;
+
+            profile_close_frame!(gas_meter, function.pretty_string());
+
+            Ok(return_values.into_iter().collect())
+        } else {
+            interpreter.execute_main(
+                loader, data_store, gas_meter, extensions, function, ty_args, args,
+            )
+        }
+    }
+
+    /// Main loop for the execution of a function.
+    ///
+    /// This function sets up a `Frame` and calls `execute_code_unit` to execute code of the
+    /// function represented by the frame. Control comes back to this function on return or
+    /// on call. When that happens the frame is changes to a new one (call) or to the one
+    /// at the top of the stack (return). If the call stack is empty execution is completed.
+    fn execute_main(
+        mut self,
+        loader: &Loader,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        args: Vec<Value>,
+    ) -> VMResult<Vec<Value>> {
+        let mut locals = Locals::new(function.local_count());
+        for (i, value) in args.into_iter().enumerate() {
+            locals
+                .store_loc(
+                    i,
+                    value,
+                    loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )
+                .map_err(|e| self.set_location(e))?;
+        }
+
+        let link_context = data_store.link_context();
+        let mut current_frame = self
+            .make_new_frame(link_context, loader, function, ty_args, locals)
+            .map_err(|err| self.set_location(err))?;
+        loop {
+            let resolver = current_frame.resolver(link_context, loader);
+            let exit_code =
+                current_frame //self
+                    .execute_code(&resolver, &mut self, data_store, gas_meter)
+                    .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+            match exit_code {
+                ExitCode::Return => {
+                    let non_ref_vals = current_frame
+                        .locals
+                        .drop_all_values()
+                        .map(|(_idx, val)| val);
+
+                    // TODO: Check if the error location is set correctly.
+                    gas_meter
+                        .charge_drop_frame(non_ref_vals.into_iter())
+                        .map_err(|e| self.set_location(e))?;
+
+                    profile_close_frame!(gas_meter, current_frame.function.pretty_string());
+                    if let Some(frame) = self.call_stack.pop() {
+                        // Note: the caller will find the callee's return values at the top of the shared operand stack
+                        current_frame = frame;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+                    } else {
+                        // end of execution. `self` should no longer be used afterward
+                        return Ok(self.operand_stack.value);
+                    }
+                }
+                ExitCode::Call(fh_idx) => {
+                    let func = resolver.function_from_handle(fh_idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call(
+                            module_id,
+                            func.name(),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver,
+                            data_store,
+                            gas_meter,
+                            extensions,
+                            func,
+                            vec![],
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+
+                        profile_close_frame!(gas_meter, func_name);
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(link_context, loader, func, vec![])
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    // Note: the caller will find the the callee's return values at the top of the shared operand stack
+                    current_frame = frame;
+                }
+                ExitCode::CallGeneric(idx) => {
+                    // TODO(Gas): We should charge gas as we do type substitution...
+                    let ty_args = resolver
+                        .instantiate_generic_function(idx, current_frame.ty_args())
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    let func = resolver.function_from_instantiation(idx);
+                    // Compiled out in release mode
+                    #[cfg(debug_assertions)]
+                    let func_name = func.pretty_string();
+                    profile_open_frame!(gas_meter, func_name.clone());
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call_generic(
+                            module_id,
+                            func.name(),
+                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
+                        )
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+
+                    if func.is_native() {
+                        self.call_native(
+                            &resolver, data_store, gas_meter, extensions, func, ty_args,
+                        )?;
+                        current_frame.pc += 1; // advance past the Call instruction in the caller
+
+                        profile_close_frame!(gas_meter, func_name);
+
+                        continue;
+                    }
+                    let frame = self
+                        .make_call_frame(link_context, loader, func, ty_args)
+                        .map_err(|e| self.set_location(e))
+                        .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+                    self.call_stack.push(current_frame).map_err(|frame| {
+                        let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
+                        let err = set_err_info!(frame, err);
+                        self.maybe_core_dump(err, &frame)
+                    })?;
+                    current_frame = frame;
+                }
+            }
+        }
+    }
+
+    /// Returns a `Frame` if the call is to a Move function. Calls to native functions are
+    /// "inlined" and this returns `None`.
+    ///
+    /// Native functions do not push a frame at the moment and as such errors from a native
+    /// function are incorrectly attributed to the caller.
+    fn make_call_frame(
+        &mut self,
+        link_context: AccountAddress,
+        loader: &Loader,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<Frame> {
+        let mut locals = Locals::new(func.local_count());
+        let arg_count = func.arg_count();
+        let is_generic = !ty_args.is_empty();
+        for i in 0..arg_count {
+            locals.store_loc(
+                arg_count - i - 1,
+                self.operand_stack.pop()?,
+                loader
+                    .vm_config()
+                    .enable_invariant_violation_check_in_swap_loc,
+            )?;
+
+            if self.paranoid_type_checks {
+                let ty = self.operand_stack.pop_ty()?;
+                let resolver = func.get_resolver(link_context, loader);
+                if is_generic {
+                    ty.check_eq(
+                        &resolver.subst(&func.local_types()[arg_count - i - 1], &ty_args)?,
+                    )?;
+                } else {
+                    // Directly check against the expected type to save a clone here.
+                    ty.check_eq(&func.local_types()[arg_count - i - 1])?;
+                }
+            }
+        }
+        self.make_new_frame(link_context, loader, func, ty_args, locals)
+    }
+
+    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    ///
+    /// The locals must be loaded before calling this.
+    fn make_new_frame(
+        &self,
+        link_context: AccountAddress,
+        loader: &Loader,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        locals: Locals,
+    ) -> PartialVMResult<Frame> {
+        let local_tys = if self.paranoid_type_checks {
+            if ty_args.is_empty() {
+                function.local_types().to_vec()
+            } else {
+                let resolver = function.get_resolver(link_context, loader);
+                function
+                    .local_types()
+                    .iter()
+                    .map(|ty| resolver.subst(ty, &ty_args))
+                    .collect::<PartialVMResult<Vec<_>>>()?
+            }
+        } else {
+            vec![]
+        };
+        Ok(Frame {
+            pc: 0,
+            locals,
+            function,
+            ty_args,
+            local_tys,
+        })
+    }
+
+    /// Call a native functions.
+    fn call_native(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> VMResult<()> {
+        // Note: refactor if native functions push a frame on the stack
+        self.call_native_impl(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            ty_args,
+        )
+        .map_err(|e| match function.module_id() {
+            Some(id) => {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(self.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(function.index(), 0)
+                    .finish(Location::Module(id.clone()))
+            }
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Unexpected native function not located in a module".to_owned());
+                self.set_location(err)
+            }
+        })
+    }
+
+    fn call_native_impl(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<()> {
+        let return_values = self.call_native_return_values(
+            resolver,
+            data_store,
+            gas_meter,
+            extensions,
+            function.clone(),
+            &ty_args,
+        )?;
+        // Put return values on the top of the operand stack, where the caller will find them.
+        // This is one of only two times the operand stack is shared across call stack frames; the other is in handling
+        // the Return instruction for normal calls
+        for value in return_values {
+            self.operand_stack.push(value)?;
+        }
+
+        if self.paranoid_type_checks {
+            for ty in function.return_types() {
+                self.operand_stack.push_ty(ty.subst(&ty_args)?)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn call_native_return_values(
+        &mut self,
+        resolver: &Resolver,
+        data_store: &mut dyn DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        function: Arc<Function>,
+        ty_args: &[Type],
+    ) -> PartialVMResult<SmallVec<[Value; 1]>> {
+        let return_type_count = function.return_type_count();
+        let mut args = VecDeque::new();
+        let expected_args = function.arg_count();
+        for _ in 0..expected_args {
+            args.push_front(self.operand_stack.pop()?);
+        }
+
+        if self.paranoid_type_checks {
+            for i in 0..expected_args {
+                let expected_ty =
+                    resolver.subst(&function.parameter_types()[expected_args - i - 1], ty_args)?;
+                let ty = self.operand_stack.pop_ty()?;
+                ty.check_eq(&expected_ty)?;
+            }
+        }
+
+        let mut native_context = NativeContext::new(
+            self,
+            data_store,
+            resolver,
+            extensions,
+            gas_meter.remaining_gas(),
+        );
+        let native_function = function.get_native()?;
+
+        gas_meter.charge_native_function_before_execution(
+            ty_args.iter().map(|ty| TypeWithLoader {
+                ty,
+                loader: resolver.loader(),
+            }),
+            args.iter(),
+        )?;
+
+        let result = native_function(&mut native_context, ty_args.to_vec(), args)?;
+
+        // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
+        //            here or otherwise it becomes an incompatible change!!!
+        let return_values = match result.result {
+            Ok(vals) => {
+                gas_meter.charge_native_function(result.cost, Some(vals.iter()))?;
+                vals
+            }
+            Err(code) => {
+                gas_meter.charge_native_function(
+                    result.cost,
+                    Option::<std::iter::Empty<&Value>>::None,
+                )?;
+                return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(code));
+            }
+        };
+
+        // Paranoid check to protect us against incorrect native function implementations. A native function that
+        // returns a different number of values than its declared types will trigger this check
+        if return_values.len() != return_type_count {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Arity mismatch: return value count does not match return type count"
+                        .to_string(),
+                ),
+            );
+        }
+        Ok(return_values)
+    }
+
+    /// Make sure only private/friend function can only be invoked by modules under the same address.
+    fn check_friend_or_private_call(
+        &self,
+        caller: &Arc<Function>,
+        callee: &Arc<Function>,
+    ) -> VMResult<()> {
+        if callee.is_friend_or_private() {
+            match (caller.module_id(), callee.module_id()) {
+                (Some(caller_id), Some(callee_id)) => {
+                    if caller_id.address() == callee_id.address() {
+                        Ok(())
+                    } else {
+                        Err(self.set_location(PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message(
+                                    format!("Private/Friend function invokation error, caller: {:?}::{:?}, callee: {:?}::{:?}", caller_id, caller.name(), callee_id, callee.name()),
+                                )))
+                    }
+                }
+                _ => Err(self.set_location(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "Private/Friend function invokation error caller: {:?}, callee {:?}",
+                            caller.name(),
+                            callee.name()
+                        )),
+                )),
+            }
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Perform a binary operation to two values at the top of the stack.
+    fn binop<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<Value>,
+    {
+        let rhs = self.operand_stack.pop_as::<T>()?;
+        let lhs = self.operand_stack.pop_as::<T>()?;
+        let result = f(lhs, rhs)?;
+        self.operand_stack.push(result)
+    }
+
+    /// Perform a binary operation for integer values.
+    fn binop_int<F>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        F: FnOnce(IntegerValue, IntegerValue) -> PartialVMResult<IntegerValue>,
+    {
+        self.binop(|lhs, rhs| {
+            Ok(match f(lhs, rhs)? {
+                IntegerValue::U8(x) => Value::u8(x),
+                IntegerValue::U16(x) => Value::u16(x),
+                IntegerValue::U32(x) => Value::u32(x),
+                IntegerValue::U64(x) => Value::u64(x),
+                IntegerValue::U128(x) => Value::u128(x),
+                IntegerValue::U256(x) => Value::u256(x),
+            })
+        })
+    }
+
+    /// Perform a binary operation for boolean values.
+    fn binop_bool<F, T>(&mut self, f: F) -> PartialVMResult<()>
+    where
+        Value: VMValueCast<T>,
+        F: FnOnce(T, T) -> PartialVMResult<bool>,
+    {
+        self.binop(|lhs, rhs| Ok(Value::bool(f(lhs, rhs)?)))
+    }
+
+    /// Loads a resource from the data store and return the number of bytes read from the storage.
+    fn load_resource<'b>(
+        gas_meter: &mut impl GasMeter,
+        data_store: &'b mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<&'b mut GlobalValue> {
+        match data_store.load_resource(addr, ty) {
+            Ok((gv, load_res)) => {
+                if let Some(loaded) = load_res {
+                    let opt = match loaded {
+                        Some(num_bytes) => {
+                            let view = gv.view().ok_or_else(|| {
+                                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                    .with_message(
+                                        "Failed to create view for global value".to_owned(),
+                                    )
+                            })?;
+
+                            Some((num_bytes, view))
+                        }
+                        None => None,
+                    };
+                    gas_meter.charge_load_resource(opt)?;
+                }
+                Ok(gv)
+            }
+            Err(e) => {
+                error!(
+                    "[VM] error loading resource at ({}, {:?}): {:?} from data store",
+                    addr, ty, e
+                );
+                Err(e)
+            }
+        }
+    }
+
+    /// BorrowGlobal (mutable and not) opcode.
+    fn borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let res = Self::load_resource(gas_meter, data_store, addr, ty)?.borrow_global();
+        gas_meter.charge_borrow_global(
+            is_mut,
+            is_generic,
+            TypeWithLoader { ty, loader },
+            res.is_ok(),
+        )?;
+        self.operand_stack.push(res?)?;
+        Ok(())
+    }
+
+    /// Exists opcode.
+    fn exists(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        let exists = gv.exists()?;
+        gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
+        self.operand_stack.push(Value::bool(exists))?;
+        Ok(())
+    }
+
+    /// MoveFrom opcode.
+    fn move_from(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+    ) -> PartialVMResult<()> {
+        let resource = match Self::load_resource(gas_meter, data_store, addr, ty)?.move_from() {
+            Ok(resource) => {
+                gas_meter.charge_move_from(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    Some(&resource),
+                )?;
+                resource
+            }
+            Err(err) => {
+                let val: Option<&Value> = None;
+                gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                return Err(err);
+            }
+        };
+        self.operand_stack.push(resource)?;
+        Ok(())
+    }
+
+    /// MoveTo opcode.
+    fn move_to(
+        &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
+        data_store: &mut impl DataStore,
+        addr: AccountAddress,
+        ty: &Type,
+        resource: Value,
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
+        //            the move_to operation.
+        match gv.move_to(resource) {
+            Ok(()) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    gv.view().unwrap(),
+                    true,
+                )?;
+                Ok(())
+            }
+            Err((err, resource)) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    &resource,
+                    false,
+                )?;
+                Err(err)
+            }
+        }
+    }
+
+    //
+    // Debugging and logging helpers.
+    //
+
+    /// Given an `VMStatus` generate a core dump if the error is an `InvariantViolation`.
+    fn maybe_core_dump(&self, mut err: VMError, current_frame: &Frame) -> VMError {
+        // a verification error cannot happen at runtime so change it into an invariant violation.
+        if err.status_type() == StatusType::Verification {
+            error!("Verification error during runtime: {:?}", err);
+            let new_err = PartialVMError::new(StatusCode::VERIFICATION_ERROR);
+            let new_err = match err.message() {
+                None => new_err,
+                Some(msg) => new_err.with_message(msg.to_owned()),
+            };
+            err = new_err.finish(err.location().clone())
+        }
+        if err.status_type() == StatusType::InvariantViolation {
+            let state = self.internal_state_str(current_frame);
+
+            error!(
+                "Error: {:?}\nCORE DUMP: >>>>>>>>>>>>\n{}\n<<<<<<<<<<<<\n",
+                err, state,
+            );
+        }
+        err
+    }
+
+    #[allow(dead_code)]
+    fn debug_print_frame<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+        idx: usize,
+        frame: &Frame,
+    ) -> PartialVMResult<()> {
+        // Print out the function name with type arguments.
+        let func = &frame.function;
+
+        debug_write!(buf, "    [{}] ", idx)?;
+        if let Some(module) = func.module_id() {
+            debug_write!(buf, "{}::{}::", module.address(), module.name(),)?;
+        }
+        debug_write!(buf, "{}", func.name())?;
+        let ty_args = frame.ty_args();
+        let mut ty_tags = vec![];
+        for ty in ty_args {
+            ty_tags.push(loader.type_to_type_tag(ty)?);
+        }
+        if !ty_tags.is_empty() {
+            debug_write!(buf, "<")?;
+            let mut it = ty_tags.iter();
+            if let Some(tag) = it.next() {
+                debug_write!(buf, "{}", tag)?;
+                for tag in it {
+                    debug_write!(buf, ", ")?;
+                    debug_write!(buf, "{}", tag)?;
+                }
+            }
+            debug_write!(buf, ">")?;
+        }
+        debug_writeln!(buf)?;
+
+        // Print out the current instruction.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Code:")?;
+        let pc = frame.pc as usize;
+        let code = func.code();
+        let before = if pc > 3 { pc - 3 } else { 0 };
+        let after = min(code.len(), pc + 4);
+        for (idx, instr) in code.iter().enumerate().take(pc).skip(before) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+        debug_writeln!(buf, "          > [{}] {:?}", pc, &code[pc])?;
+        for (idx, instr) in code.iter().enumerate().take(after).skip(pc + 1) {
+            debug_writeln!(buf, "            [{}] {:?}", idx, instr)?;
+        }
+
+        // Print out the locals.
+        debug_writeln!(buf)?;
+        debug_writeln!(buf, "        Locals:")?;
+        if func.local_count() > 0 {
+            values::debug::print_locals(buf, &frame.locals)?;
+            debug_writeln!(buf)?;
+        } else {
+            debug_writeln!(buf, "            (none)")?;
+        }
+
+        debug_writeln!(buf)?;
+        Ok(())
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn debug_print_stack_trace<B: Write>(
+        &self,
+        buf: &mut B,
+        loader: &Loader,
+    ) -> PartialVMResult<()> {
+        debug_writeln!(buf, "Call Stack:")?;
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            self.debug_print_frame(buf, loader, i, frame)?;
+        }
+        debug_writeln!(buf, "Operand Stack:")?;
+        for (idx, val) in self.operand_stack.value.iter().enumerate() {
+            // TODO: Currently we do not know the types of the values on the operand stack.
+            // Revisit.
+            debug_write!(buf, "    [{}] ", idx)?;
+            values::debug::print_value(buf, val)?;
+            debug_writeln!(buf)?;
+        }
+        Ok(())
+    }
+
+    /// Generate a string which is the status of the interpreter: call stack, current bytecode
+    /// stream, locals and operand stack.
+    ///
+    /// It is used when generating a core dump but can be used for debugging of the interpreter.
+    /// It will be exposed via a debug module to give developers a way to print the internals
+    /// of an execution.
+    fn internal_state_str(&self, current_frame: &Frame) -> String {
+        let mut internal_state = "Call stack:\n".to_string();
+        for (i, frame) in self.call_stack.0.iter().enumerate() {
+            internal_state.push_str(
+                format!(
+                    " frame #{}: {} [pc = {}]\n",
+                    i,
+                    frame.function.pretty_string(),
+                    frame.pc,
+                )
+                .as_str(),
+            );
+        }
+        internal_state.push_str(
+            format!(
+                "*frame #{}: {} [pc = {}]:\n",
+                self.call_stack.0.len(),
+                current_frame.function.pretty_string(),
+                current_frame.pc,
+            )
+            .as_str(),
+        );
+        let code = current_frame.function.code();
+        let pc = current_frame.pc as usize;
+        if pc < code.len() {
+            let mut i = 0;
+            for bytecode in &code[..pc] {
+                internal_state.push_str(format!("{}> {:?}\n", i, bytecode).as_str());
+                i += 1;
+            }
+            internal_state.push_str(format!("{}* {:?}\n", i, code[pc]).as_str());
+        }
+        internal_state.push_str(
+            format!(
+                "Locals ({:x}):\n{}\n",
+                current_frame.locals.raw_address(),
+                current_frame.locals
+            )
+            .as_str(),
+        );
+        internal_state.push_str("Operand Stack:\n");
+        for value in &self.operand_stack.value {
+            internal_state.push_str(format!("{}\n", value).as_str());
+        }
+        internal_state
+    }
+
+    fn set_location(&self, err: PartialVMError) -> VMError {
+        err.finish(self.call_stack.current_location())
+    }
+
+    fn get_internal_state(&self) -> ExecutionState {
+        self.get_stack_frames(usize::MAX)
+    }
+
+    /// Get count stack frames starting from the top of the stack.
+    pub(crate) fn get_stack_frames(&self, count: usize) -> ExecutionState {
+        // collect frames in the reverse order as this is what is
+        // normally expected from the stack trace (outermost frame
+        // is the last one)
+        let stack_trace = self
+            .call_stack
+            .0
+            .iter()
+            .rev()
+            .take(count)
+            .map(|frame| {
+                (
+                    frame.function.module_id().cloned(),
+                    frame.function.index(),
+                    frame.pc,
+                )
+            })
+            .collect();
+        ExecutionState::new(stack_trace)
+    }
+}
+
+// TODO Determine stack size limits based on gas limit
+const OPERAND_STACK_SIZE_LIMIT: usize = 1024;
+const CALL_STACK_SIZE_LIMIT: usize = 1024;
+
+/// The operand stack.
+struct Stack {
+    value: Vec<Value>,
+    types: Vec<Type>,
+}
+
+impl Stack {
+    /// Create a new empty operand stack.
+    fn new() -> Self {
+        Stack {
+            value: vec![],
+            types: vec![],
+        }
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push(&mut self, value: Value) -> PartialVMResult<()> {
+        if self.value.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.value.push(value);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop(&mut self) -> PartialVMResult<Value> {
+        self.value
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop a `Value` of a given type off the stack. Abort if the value is not of the given
+    /// type or if the stack is empty.
+    fn pop_as<T>(&mut self) -> PartialVMResult<T>
+    where
+        Value: VMValueCast<T>,
+    {
+        self.pop()?.value_as()
+    }
+
+    /// Pop n values off the stack.
+    fn popn(&mut self, n: u16) -> PartialVMResult<Vec<Value>> {
+        let remaining_stack_size = self
+            .value
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.value.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn last_n(&self, n: usize) -> PartialVMResult<impl ExactSizeIterator<Item = &Value>> {
+        if self.value.len() < n {
+            return Err(PartialVMError::new(StatusCode::EMPTY_VALUE_STACK)
+                .with_message("Failed to get last n arguments on the argument stack".to_string()));
+        }
+        Ok(self.value[(self.value.len() - n)..].iter())
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push_ty(&mut self, ty: Type) -> PartialVMResult<()> {
+        if self.types.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.types.push(ty);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop_ty(&mut self) -> PartialVMResult<Type> {
+        self.types
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop n values off the stack.
+    fn popn_tys(&mut self, n: u16) -> PartialVMResult<Vec<Type>> {
+        let remaining_stack_size = self
+            .types
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.types.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn check_balance(&self) -> PartialVMResult<()> {
+        if self.types.len() != self.value.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Paranoid Mode: Type and value stack need to be balanced".to_string(),
+                ),
+            );
+        }
+        Ok(())
+    }
+}
+
+/// A call stack.
+// #[derive(Debug)]
+struct CallStack(Vec<Frame>);
+
+impl CallStack {
+    /// Create a new empty call stack.
+    fn new() -> Self {
+        CallStack(vec![])
+    }
+
+    /// Push a `Frame` on the call stack.
+    fn push(&mut self, frame: Frame) -> ::std::result::Result<(), Frame> {
+        if self.0.len() < CALL_STACK_SIZE_LIMIT {
+            self.0.push(frame);
+            Ok(())
+        } else {
+            Err(frame)
+        }
+    }
+
+    /// Pop a `Frame` off the call stack.
+    fn pop(&mut self) -> Option<Frame> {
+        self.0.pop()
+    }
+
+    fn current_location(&self) -> Location {
+        let location_opt = self.0.last().map(|frame| frame.location());
+        location_opt.unwrap_or(Location::Undefined)
+    }
+}
+
+/// A `Frame` is the execution context for a function. It holds the locals of the function and
+/// the function itself.
+// #[derive(Debug)]
+struct Frame {
+    pc: u16,
+    locals: Locals,
+    function: Arc<Function>,
+    ty_args: Vec<Type>,
+    local_tys: Vec<Type>,
+}
+
+/// An `ExitCode` from `execute_code_unit`.
+#[derive(Debug)]
+enum ExitCode {
+    Return,
+    Call(FunctionHandleIndex),
+    CallGeneric(FunctionInstantiationIndex),
+}
+
+fn check_ability(has_ability: bool) -> PartialVMResult<()> {
+    if has_ability {
+        Ok(())
+    } else {
+        Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Paranoid Mode: Expected ability mismatch".to_string()),
+        )
+    }
+}
+
+impl Frame {
+    /// Execute a Move function until a return or a call opcode is found.
+    fn execute_code(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<ExitCode> {
+        self.execute_code_impl(resolver, interpreter, data_store, gas_meter)
+            .map_err(|e| {
+                let e = if resolver.loader().vm_config().error_execution_state {
+                    e.with_exec_state(interpreter.get_internal_state())
+                } else {
+                    e
+                };
+                e.at_code_offset(self.function.index(), self.pc)
+                    .finish(self.location())
+            })
+    }
+
+    /// Paranoid type checks to perform before instruction execution.
+    ///
+    /// Note that most of the checks should happen after instruction execution, because gas charging will happen during
+    /// instruction execution and we want to avoid running code without charging proper gas as much as possible.
+    fn pre_execution_type_stack_transition(
+        local_tys: &[Type],
+        locals: &Locals,
+        _ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            // Call instruction will be checked at execute_main.
+            Bytecode::Call(_) | Bytecode::CallGeneric(_) => (),
+            Bytecode::BrFalse(_) | Bytecode::BrTrue(_) => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            Bytecode::Branch(_) => (),
+            Bytecode::Ret => {
+                for (idx, ty) in local_tys.iter().enumerate() {
+                    if !locals.is_invalid(idx)? {
+                        check_ability(resolver.loader().abilities(ty)?.has_drop())?;
+                    }
+                }
+            }
+            Bytecode::Abort => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            // StLoc needs to check before execution as we need to check the drop ability of values.
+            Bytecode::StLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                ty.check_eq(&val_ty)?;
+                if !locals.is_invalid(*idx as usize)? {
+                    check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+                }
+            }
+            // We will check the rest of the instructions after execution phase.
+            Bytecode::Pop
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Lt
+            | Bytecode::Le
+            | Bytecode::Gt
+            | Bytecode::Ge
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::FreezeRef
+            | Bytecode::Nop
+            | Bytecode::Not
+            | Bytecode::VecPack(_, _)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(_, _)
+            | Bytecode::VecSwap(_) => (),
+        };
+        Ok(())
+    }
+
+    /// Paranoid type checks to perform after instruction execution.
+    ///
+    /// This function and `pre_execution_type_stack_transition` should constitute the full type stack transition for the paranoid mode.
+    fn post_execution_type_stack_transition(
+        local_tys: &[Type],
+        ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => (),
+            Bytecode::Branch(_)
+            | Bytecode::Ret
+            | Bytecode::Call(_)
+            | Bytecode::CallGeneric(_)
+            | Bytecode::Abort => {
+                // Invariants hold because all of the instructions above will force VM to break from the interpreter loop and thus not hit this code path.
+                unreachable!("control flow instruction encountered during type check")
+            }
+            Bytecode::Pop => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+            }
+            Bytecode::LdU8(_) => interpreter.operand_stack.push_ty(Type::U8)?,
+            Bytecode::LdU16(_) => interpreter.operand_stack.push_ty(Type::U16)?,
+            Bytecode::LdU32(_) => interpreter.operand_stack.push_ty(Type::U32)?,
+            Bytecode::LdU64(_) => interpreter.operand_stack.push_ty(Type::U64)?,
+            Bytecode::LdU128(_) => interpreter.operand_stack.push_ty(Type::U128)?,
+            Bytecode::LdU256(_) => interpreter.operand_stack.push_ty(Type::U256)?,
+            Bytecode::LdTrue | Bytecode::LdFalse => {
+                interpreter.operand_stack.push_ty(Type::Bool)?
+            }
+            Bytecode::LdConst(i) => {
+                let constant = resolver.constant_at(*i);
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::from_const_signature(&constant.type_)?)?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                check_ability(resolver.loader().abilities(&ty)?.has_copy())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::StLoc(_) => (),
+            Bytecode::MutBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(resolver.get_field_type(*fh_idx)?)))?;
+            }
+            Bytecode::MutBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.get_field_type(*fh_idx)?,
+                    )))?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter.operand_stack.push_ty(Type::Reference(Box::new(
+                    resolver.instantiate_generic_field(*idx, ty_args)?,
+                )))?;
+            }
+            Bytecode::MutBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.instantiate_generic_field(*idx, ty_args)?,
+                    )))?;
+            }
+            Bytecode::Pack(idx) => {
+                let field_count = resolver.field_count(*idx);
+                let args_ty = resolver.get_struct_fields(*idx)?;
+                let output_ty = resolver.get_struct_type(*idx);
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.fields.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.fields.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::PackGeneric(idx) => {
+                let field_count = resolver.field_instantiation_count(*idx);
+                let args_ty = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                let output_ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::Unpack(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.get_struct_type(*idx))?;
+                let struct_decl = resolver.get_struct_fields(*idx)?;
+                for ty in struct_decl.fields.iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+
+                let struct_decl = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                for ty in struct_decl.into_iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::Reference(inner) | Type::MutableReference(inner) => {
+                        check_ability(resolver.loader().abilities(&inner)?.has_copy())?;
+                        interpreter.operand_stack.push_ty(inner.as_ref().clone())?;
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("ReadRef expecting a value of reference type".to_string()))
+                    }
+                }
+            }
+            Bytecode::WriteRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::MutableReference(inner) => {
+                        if *inner == val_ty {
+                            check_ability(resolver.loader().abilities(&inner)?.has_drop())?;
+                        } else {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "WriteRef tried to write references of different types".to_string(),
+                            ));
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message(
+                            "WriteRef expecting a value of mutable reference type".to_string(),
+                        ))
+                    }
+                }
+            }
+            Bytecode::CastU8 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U8)?;
+            }
+            Bytecode::CastU16 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U16)?;
+            }
+            Bytecode::CastU32 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U32)?;
+            }
+            Bytecode::CastU64 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::CastU128 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U128)?;
+            }
+            Bytecode::CastU256 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U256)?;
+            }
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(lhs)?;
+            }
+            Bytecode::Shl | Bytecode::Shr => {
+                interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(rhs)?;
+            }
+            Bytecode::Lt | Bytecode::Le | Bytecode::Gt | Bytecode::Ge => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::Eq | Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                if lhs != rhs {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(
+                                "Integer binary operation expecting values of same type"
+                                    .to_string(),
+                            ),
+                    );
+                }
+                check_ability(resolver.loader().abilities(&lhs)?.has_drop())?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MutBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::Exists(_) | Bytecode::ExistsGeneric(_) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MoveTo(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.get_struct_type(*idx))?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveToGeneric(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveFrom(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveFromGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::FreezeRef => {
+                match interpreter.operand_stack.pop_ty()? {
+                    Type::MutableReference(ty) => {
+                        interpreter.operand_stack.push_ty(Type::Reference(ty))?
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("FreezeRef expects a mutable reference".to_string()))
+                    }
+                };
+            }
+            Bytecode::Nop => (),
+            Bytecode::Not => {
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::Bool)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let elem_tys = interpreter.operand_stack.popn_tys(*num as u16)?;
+                for elem_ty in elem_tys.iter() {
+                    elem_ty.check_eq(&ty)?;
+                }
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Vector(Box::new(ty)))?;
+            }
+            Bytecode::VecLen(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&ty)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter.operand_stack.push_ty(inner_ty)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let vec_ty = interpreter.operand_stack.pop_ty()?;
+                match vec_ty {
+                    Type::Vector(v) => {
+                        v.check_eq(&ty)?;
+                        for _ in 0..*num {
+                            interpreter.operand_stack.push_ty(v.as_ref().clone())?;
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("VecUnpack expect a vector type".to_string()))
+                    }
+                };
+            }
+            Bytecode::VecSwap(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn execute_instruction(
+        pc: &mut u16,
+        locals: &mut Locals,
+        ty_args: &[Type],
+        function: &Arc<Function>,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<InstrRet> {
+        use SimpleInstruction as S;
+
+        macro_rules! make_ty {
+            ($ty: expr) => {
+                TypeWithLoader {
+                    ty: $ty,
+                    loader: resolver.loader(),
+                }
+            };
+        }
+
+        match instruction {
+            Bytecode::Pop => {
+                let popped_val = interpreter.operand_stack.pop()?;
+                gas_meter.charge_pop(popped_val)?;
+            }
+            Bytecode::Ret => {
+                gas_meter.charge_simple_instr(S::Ret)?;
+                return Ok(InstrRet::ExitCode(ExitCode::Return));
+            }
+            Bytecode::BrTrue(offset) => {
+                gas_meter.charge_simple_instr(S::BrTrue)?;
+                if interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::BrFalse(offset) => {
+                gas_meter.charge_simple_instr(S::BrFalse)?;
+                if !interpreter.operand_stack.pop_as::<bool>()? {
+                    *pc = *offset;
+                    return Ok(InstrRet::Branch);
+                }
+            }
+            Bytecode::Branch(offset) => {
+                gas_meter.charge_simple_instr(S::Branch)?;
+                *pc = *offset;
+                return Ok(InstrRet::Branch);
+            }
+            Bytecode::LdU8(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU8)?;
+                interpreter.operand_stack.push(Value::u8(*int_const))?;
+            }
+            Bytecode::LdU16(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU16)?;
+                interpreter.operand_stack.push(Value::u16(*int_const))?;
+            }
+            Bytecode::LdU32(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU32)?;
+                interpreter.operand_stack.push(Value::u32(*int_const))?;
+            }
+            Bytecode::LdU64(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU64)?;
+                interpreter.operand_stack.push(Value::u64(*int_const))?;
+            }
+            Bytecode::LdU128(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU128)?;
+                interpreter.operand_stack.push(Value::u128(*int_const))?;
+            }
+            Bytecode::LdU256(int_const) => {
+                gas_meter.charge_simple_instr(S::LdU256)?;
+                interpreter.operand_stack.push(Value::u256(*int_const))?;
+            }
+            Bytecode::LdConst(idx) => {
+                let constant = resolver.constant_at(*idx);
+                gas_meter.charge_ld_const(NumBytes::new(constant.data.len() as u64))?;
+
+                let val = Value::deserialize_constant(constant).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                        "Verifier failed to verify the deserialization of constants".to_owned(),
+                    )
+                })?;
+
+                gas_meter.charge_ld_const_after_deserialization(&val)?;
+
+                interpreter.operand_stack.push(val)?
+            }
+            Bytecode::LdTrue => {
+                gas_meter.charge_simple_instr(S::LdTrue)?;
+                interpreter.operand_stack.push(Value::bool(true))?;
+            }
+            Bytecode::LdFalse => {
+                gas_meter.charge_simple_instr(S::LdFalse)?;
+                interpreter.operand_stack.push(Value::bool(false))?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                // TODO(Gas): We should charge gas before copying the value.
+                let local = locals.copy_loc(*idx as usize)?;
+                gas_meter.charge_copy_loc(&local)?;
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let local = locals.move_loc(
+                    *idx as usize,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                gas_meter.charge_move_loc(&local)?;
+
+                interpreter.operand_stack.push(local)?;
+            }
+            Bytecode::StLoc(idx) => {
+                let value_to_store = interpreter.operand_stack.pop()?;
+                gas_meter.charge_store_loc(&value_to_store)?;
+                locals.store_loc(
+                    *idx as usize,
+                    value_to_store,
+                    resolver
+                        .loader()
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+            }
+            Bytecode::Call(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::Call(*idx)));
+            }
+            Bytecode::CallGeneric(idx) => {
+                return Ok(InstrRet::ExitCode(ExitCode::CallGeneric(*idx)));
+            }
+            Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowLoc(_) => S::MutBorrowLoc,
+                    _ => S::ImmBorrowLoc,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+                interpreter
+                    .operand_stack
+                    .push(locals.borrow_loc(*idx as usize)?)?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) | Bytecode::MutBorrowField(fh_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowField,
+                    _ => S::ImmBorrowField,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_offset(*fh_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(fi_idx) | Bytecode::MutBorrowFieldGeneric(fi_idx) => {
+                let instr = match instruction {
+                    Bytecode::MutBorrowField(_) => S::MutBorrowFieldGeneric,
+                    _ => S::ImmBorrowFieldGeneric,
+                };
+                gas_meter.charge_simple_instr(instr)?;
+
+                let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
+                let offset = resolver.field_instantiation_offset(*fi_idx);
+                let field_ref = reference.borrow_field(offset)?;
+                interpreter.operand_stack.push(field_ref)?;
+            }
+            Bytecode::Pack(sd_idx) => {
+                let field_count = resolver.field_count(*sd_idx);
+                let struct_type = resolver.get_struct_type(*sd_idx);
+                Self::check_depth_of_type(resolver, &struct_type)?;
+                gas_meter.charge_pack(
+                    false,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::PackGeneric(si_idx) => {
+                let field_count = resolver.field_instantiation_count(*si_idx);
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_pack(
+                    true,
+                    interpreter.operand_stack.last_n(field_count as usize)?,
+                )?;
+                let args = interpreter.operand_stack.popn(field_count)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::struct_(Struct::pack(args)))?;
+            }
+            Bytecode::Unpack(_sd_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(false, struct_.field_views())?;
+
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::UnpackGeneric(_si_idx) => {
+                let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
+
+                gas_meter.charge_unpack(true, struct_.field_views())?;
+
+                // TODO: Whether or not we want this gas metering in the loop is
+                // questionable.  However, if we don't have it in the loop we could wind up
+                // doing a fair bit of work before charging for it.
+                for value in struct_.unpack()? {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                gas_meter.charge_read_ref(reference.value_view())?;
+                let value = reference.read_ref()?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::WriteRef => {
+                let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                let value = interpreter.operand_stack.pop()?;
+                gas_meter.charge_write_ref(&value, reference.value_view())?;
+                reference.write_ref(value)?;
+            }
+            Bytecode::CastU8 => {
+                gas_meter.charge_simple_instr(S::CastU8)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u8(integer_value.cast_u8()?))?;
+            }
+            Bytecode::CastU16 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u16(integer_value.cast_u16()?))?;
+            }
+            Bytecode::CastU32 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u32(integer_value.cast_u32()?))?;
+            }
+            Bytecode::CastU64 => {
+                gas_meter.charge_simple_instr(S::CastU64)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u64(integer_value.cast_u64()?))?;
+            }
+            Bytecode::CastU128 => {
+                gas_meter.charge_simple_instr(S::CastU128)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u128(integer_value.cast_u128()?))?;
+            }
+            Bytecode::CastU256 => {
+                gas_meter.charge_simple_instr(S::CastU16)?;
+                let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(Value::u256(integer_value.cast_u256()?))?;
+            }
+            // Arithmetic Operations
+            Bytecode::Add => {
+                gas_meter.charge_simple_instr(S::Add)?;
+                interpreter.binop_int(IntegerValue::add_checked)?
+            }
+            Bytecode::Sub => {
+                gas_meter.charge_simple_instr(S::Sub)?;
+                interpreter.binop_int(IntegerValue::sub_checked)?
+            }
+            Bytecode::Mul => {
+                gas_meter.charge_simple_instr(S::Mul)?;
+                interpreter.binop_int(IntegerValue::mul_checked)?
+            }
+            Bytecode::Mod => {
+                gas_meter.charge_simple_instr(S::Mod)?;
+                interpreter.binop_int(IntegerValue::rem_checked)?
+            }
+            Bytecode::Div => {
+                gas_meter.charge_simple_instr(S::Div)?;
+                interpreter.binop_int(IntegerValue::div_checked)?
+            }
+            Bytecode::BitOr => {
+                gas_meter.charge_simple_instr(S::BitOr)?;
+                interpreter.binop_int(IntegerValue::bit_or)?
+            }
+            Bytecode::BitAnd => {
+                gas_meter.charge_simple_instr(S::BitAnd)?;
+                interpreter.binop_int(IntegerValue::bit_and)?
+            }
+            Bytecode::Xor => {
+                gas_meter.charge_simple_instr(S::Xor)?;
+                interpreter.binop_int(IntegerValue::bit_xor)?
+            }
+            Bytecode::Shl => {
+                gas_meter.charge_simple_instr(S::Shl)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shl_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Shr => {
+                gas_meter.charge_simple_instr(S::Shr)?;
+                let rhs = interpreter.operand_stack.pop_as::<u8>()?;
+                let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                interpreter
+                    .operand_stack
+                    .push(lhs.shr_checked(rhs)?.into_value())?;
+            }
+            Bytecode::Or => {
+                gas_meter.charge_simple_instr(S::Or)?;
+                interpreter.binop_bool(|l, r| Ok(l || r))?
+            }
+            Bytecode::And => {
+                gas_meter.charge_simple_instr(S::And)?;
+                interpreter.binop_bool(|l, r| Ok(l && r))?
+            }
+            Bytecode::Lt => {
+                gas_meter.charge_simple_instr(S::Lt)?;
+                interpreter.binop_bool(IntegerValue::lt)?
+            }
+            Bytecode::Gt => {
+                gas_meter.charge_simple_instr(S::Gt)?;
+                interpreter.binop_bool(IntegerValue::gt)?
+            }
+            Bytecode::Le => {
+                gas_meter.charge_simple_instr(S::Le)?;
+                interpreter.binop_bool(IntegerValue::le)?
+            }
+            Bytecode::Ge => {
+                gas_meter.charge_simple_instr(S::Ge)?;
+                interpreter.binop_bool(IntegerValue::ge)?
+            }
+            Bytecode::Abort => {
+                gas_meter.charge_simple_instr(S::Abort)?;
+                let error_code = interpreter.operand_stack.pop_as::<u64>()?;
+                let error = PartialVMError::new(StatusCode::ABORTED)
+                    .with_sub_status(error_code)
+                    .with_message(format!("{} at offset {}", function.pretty_string(), *pc,));
+                return Err(error);
+            }
+            Bytecode::Eq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_eq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(lhs.equals(&rhs)?))?;
+            }
+            Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop()?;
+                let rhs = interpreter.operand_stack.pop()?;
+                gas_meter.charge_neq(&lhs, &rhs)?;
+                interpreter
+                    .operand_stack
+                    .push(Value::bool(!lhs.equals(&rhs)?))?;
+            }
+            Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.borrow_global(
+                    is_mut,
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(si_idx) | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
+                let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.borrow_global(
+                    is_mut,
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::Exists(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.exists(false, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::ExistsGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.exists(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveFrom(sd_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                interpreter.move_from(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                )?;
+            }
+            Bytecode::MoveFromGeneric(si_idx) => {
+                let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_from(true, resolver.loader(), gas_meter, data_store, addr, &ty)?;
+            }
+            Bytecode::MoveTo(sd_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.get_struct_type(*sd_idx);
+                // REVIEW: Can we simplify Interpreter::move_to?
+                interpreter.move_to(
+                    false,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::MoveToGeneric(si_idx) => {
+                let resource = interpreter.operand_stack.pop()?;
+                let signer_reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+                let addr = signer_reference
+                    .borrow_field(0)?
+                    .value_as::<Reference>()?
+                    .read_ref()?
+                    .value_as::<AccountAddress>()?;
+                let ty = resolver.instantiate_generic_type(*si_idx, ty_args)?;
+                interpreter.move_to(
+                    true,
+                    resolver.loader(),
+                    gas_meter,
+                    data_store,
+                    addr,
+                    &ty,
+                    resource,
+                )?;
+            }
+            Bytecode::FreezeRef => {
+                gas_meter.charge_simple_instr(S::FreezeRef)?;
+                // FreezeRef should just be a null op as we don't distinguish between mut
+                // and immut ref at runtime.
+            }
+            Bytecode::Not => {
+                gas_meter.charge_simple_instr(S::Not)?;
+                let value = !interpreter.operand_stack.pop_as::<bool>()?;
+                interpreter.operand_stack.push(Value::bool(value))?;
+            }
+            Bytecode::Nop => {
+                gas_meter.charge_simple_instr(S::Nop)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                Self::check_depth_of_type(resolver, &ty)?;
+                gas_meter.charge_vec_pack(
+                    make_ty!(&ty),
+                    interpreter.operand_stack.last_n(*num as usize)?,
+                )?;
+                let elements = interpreter.operand_stack.popn(*num as u16)?;
+                let value = Vector::pack(&ty, elements)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecLen(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_len(TypeWithLoader {
+                    ty,
+                    loader: resolver.loader(),
+                })?;
+                let value = vec_ref.len(ty)?;
+                interpreter.operand_stack.push(value)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, &ty);
+                gas_meter.charge_vec_borrow(false, make_ty!(&ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.borrow_elem(idx, ty);
+                gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let elem = interpreter.operand_stack.pop()?;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
+                vec_ref.push_back(elem, ty, interpreter.runtime_limits_config().vector_len_max)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                let res = vec_ref.pop(ty);
+                gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
+                interpreter.operand_stack.push(res?)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_unpack(
+                    make_ty!(ty),
+                    NumArgs::new(*num),
+                    vec_val.elem_views(),
+                )?;
+                let elements = vec_val.unpack(ty, *num)?;
+                for value in elements {
+                    interpreter.operand_stack.push(value)?;
+                }
+            }
+            Bytecode::VecSwap(si) => {
+                let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
+                let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
+                let ty = &resolver.instantiate_single_type(*si, ty_args)?;
+                gas_meter.charge_vec_swap(make_ty!(ty))?;
+                vec_ref.swap(idx1, idx2, ty)?;
+            }
+        }
+
+        Ok(InstrRet::Ok)
+    }
+    fn execute_code_impl(
+        &mut self,
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+    ) -> PartialVMResult<ExitCode> {
+        let code = self.function.code();
+        loop {
+            for instruction in &code[self.pc as usize..] {
+                trace!(
+                    &self.function,
+                    &self.locals,
+                    self.pc,
+                    instruction,
+                    resolver,
+                    interpreter
+                );
+
+                fail_point!("move_vm::interpreter_loop", |_| {
+                    Err(
+                        PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                            "Injected move_vm::interpreter verifier failure".to_owned(),
+                        ),
+                    )
+                });
+
+                // Paranoid Mode: Perform the type stack transition check to make sure all type safety requirements has been met.
+                //
+                // We will run the checks for only the control flow instructions and StLoc here. The majority of checks will be
+                // performed after the instruction execution, i.e: the big match block below.
+                //
+                // The reason for this design is we charge gas during instruction execution and we want to perform checks only after
+                // proper gas has been charged for each instruction.
+
+                if interpreter.paranoid_type_checks {
+                    interpreter.operand_stack.check_balance()?;
+                    Self::pre_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.locals,
+                        self.ty_args(),
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+                }
+
+                profile_open_instr!(gas_meter, format!("{:?}", instruction));
+
+                let r = Self::execute_instruction(
+                    &mut self.pc,
+                    &mut self.locals,
+                    &self.ty_args,
+                    &self.function,
+                    resolver,
+                    interpreter,
+                    data_store,
+                    gas_meter,
+                    instruction,
+                )?;
+
+                profile_close_instr!(gas_meter, format!("{:?}", instruction));
+
+                match r {
+                    InstrRet::Ok => (),
+                    InstrRet::ExitCode(exit_code) => {
+                        return Ok(exit_code);
+                    }
+                    InstrRet::Branch => break,
+                };
+
+                if interpreter.paranoid_type_checks {
+                    Self::post_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.ty_args,
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+
+                    interpreter.operand_stack.check_balance()?;
+                }
+
+                // invariant: advance to pc +1 is iff instruction at pc executed without aborting
+                self.pc += 1;
+            }
+            // ok we are out, it's a branch, check the pc for good luck
+            // TODO: re-work the logic here. Tests should have a more
+            // natural way to plug in
+            if self.pc as usize >= code.len() {
+                if cfg!(test) {
+                    // In order to test the behavior of an instruction stream, hitting end of the
+                    // code should report no error so that we can check the
+                    // locals.
+                    return Ok(ExitCode::Return);
+                } else {
+                    return Err(PartialVMError::new(StatusCode::PC_OVERFLOW));
+                }
+            }
+        }
+    }
+
+    fn ty_args(&self) -> &[Type] {
+        &self.ty_args
+    }
+
+    fn resolver<'a>(&self, link_context: AccountAddress, loader: &'a Loader) -> Resolver<'a> {
+        self.function.get_resolver(link_context, loader)
+    }
+
+    fn location(&self) -> Location {
+        match self.function.module_id() {
+            None => Location::Script,
+            Some(id) => Location::Module(id.clone()),
+        }
+    }
+
+    fn check_depth_of_type(resolver: &Resolver, ty: &Type) -> PartialVMResult<u64> {
+        let Some(max_depth) = resolver
+            .loader()
+            .vm_config()
+            .runtime_limits_config
+            .max_value_nest_depth
+        else {
+            return Ok(1);
+        };
+        Self::check_depth_of_type_impl(resolver, ty, 0, max_depth)
+    }
+
+    fn check_depth_of_type_impl(
+        resolver: &Resolver,
+        ty: &Type,
+        current_depth: u64,
+        max_depth: u64,
+    ) -> PartialVMResult<u64> {
+        macro_rules! check_depth {
+            ($additional_depth:expr) => {
+                if current_depth.saturating_add($additional_depth) > max_depth {
+                    return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+                } else {
+                    current_depth.saturating_add($additional_depth)
+                }
+            };
+        }
+
+        // Calculate depth of the type itself
+        let ty_depth = match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address
+            | Type::Signer => check_depth!(1),
+            // Even though this is recursive this is OK since the depth of this recursion is
+            // bounded by the depth of the type arguments, which we have already checked.
+            Type::Reference(ty) | Type::MutableReference(ty) | Type::Vector(ty) => {
+                Self::check_depth_of_type_impl(resolver, ty, check_depth!(1), max_depth)?
+            }
+            Type::Struct(si) => {
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&[])?)
+            }
+            Type::StructInstantiation(si, ty_args) => {
+                // Calculate depth of all type arguments, and make sure they themselves are not too deep.
+                let ty_arg_depths = ty_args
+                    .iter()
+                    .map(|ty| {
+                        // Ty args should be fully resolved and not need any type arguments
+                        Self::check_depth_of_type_impl(resolver, ty, check_depth!(0), max_depth)
+                    })
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Struct Definition not resolved".to_string())
+                })?;
+                check_depth!(struct_type
+                    .depth
+                    .as_ref()
+                    .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                    .solve(&ty_arg_depths)?)
+            }
+            // NB: substitution must be performed before calling this function
+            Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Type parameter should be fully resolved".to_string()),
+                )
+            }
+        };
+
+        Ok(ty_depth)
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/lib.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/lib.rs
new file mode 100644
index 000000000..5aadd80fb
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/lib.rs
@@ -0,0 +1,30 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![forbid(unsafe_code)]
+
+//! The core Move VM logic.
+//!
+//! It is a design goal for the Move VM to be independent of the Diem blockchain, so that
+//! other blockchains can use it as well. The VM isn't there yet, but hopefully will be there
+//! soon.
+
+pub mod data_cache;
+mod interpreter;
+mod loader;
+pub mod logging;
+pub mod move_vm;
+pub mod native_extensions;
+pub mod native_functions;
+pub mod runtime;
+pub mod session;
+#[macro_use]
+mod tracing;
+
+// Only include debugging functionality in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+mod debug;
+
+#[cfg(test)]
+mod unit_tests;
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs
new file mode 100644
index 000000000..f5bda842a
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs
@@ -0,0 +1,2857 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    logging::expect_no_verification_errors,
+    native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
+    session::LoadedFunctionInstantiation,
+};
+use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::BinaryIndexedView,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{
+        AbilitySet, Bytecode, CompiledModule, CompiledScript, Constant, ConstantPoolIndex,
+        FieldHandleIndex, FieldInstantiationIndex, FunctionDefinition, FunctionDefinitionIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
+        StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
+        TypeParameterIndex, Visibility,
+    },
+    IndexKind,
+};
+use move_bytecode_verifier::{self, cyclic_dependencies, dependencies};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    metadata::Metadata,
+    runtime_value as R,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+use move_vm_types::{
+    data_store::DataStore,
+    loaded_data::runtime_types::{CachedStructIndex, DepthFormula, StructType, Type},
+};
+use parking_lot::RwLock;
+use sha3::{Digest, Sha3_256};
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    fmt::Debug,
+    hash::Hash,
+    sync::Arc,
+};
+use tracing::error;
+
+type ScriptHash = [u8; 32];
+
+// A simple cache that offers both a HashMap and a Vector lookup.
+// Values are forced into a `Arc` so they can be used from multiple thread.
+// Access to this cache is always under a `RwLock`.
+struct BinaryCache<K, V> {
+    id_map: HashMap<K, usize>,
+    binaries: Vec<Arc<V>>,
+}
+
+impl<K, V> BinaryCache<K, V>
+where
+    K: Eq + Hash,
+{
+    fn new() -> Self {
+        Self {
+            id_map: HashMap::new(),
+            binaries: vec![],
+        }
+    }
+
+    fn insert(&mut self, key: K, binary: V) -> PartialVMResult<&Arc<V>> {
+        let idx = self.binaries.len();
+        // Last write wins in the binary cache -- it's up to the callee to not make conflicting
+        // writes.
+        self.id_map.insert(key, idx);
+        self.binaries.push(Arc::new(binary));
+        Ok(&self.binaries[idx])
+    }
+
+    fn get_with_idx(&self, key: &K) -> Option<(usize, &Arc<V>)> {
+        let idx = self.id_map.get(key)?;
+        Some((*idx, self.binaries.get(*idx)?))
+    }
+
+    fn get(&self, key: &K) -> Option<&Arc<V>> {
+        Some(self.get_with_idx(key)?.1)
+    }
+
+    fn contains(&self, key: &K) -> bool {
+        self.id_map.contains_key(key)
+    }
+
+    fn len(&self) -> usize {
+        self.binaries.len()
+    }
+}
+
+// A script cache is a map from the hash value of a script and the `Script` itself.
+// Script are added in the cache once verified and so getting a script out the cache
+// does not require further verification (except for parameters and type parameters)
+struct ScriptCache {
+    scripts: BinaryCache<ScriptHash, LoadedScript>,
+}
+
+impl ScriptCache {
+    fn new() -> Self {
+        Self {
+            scripts: BinaryCache::new(),
+        }
+    }
+
+    fn get(&self, hash: &ScriptHash) -> Option<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        self.scripts.get(hash).map(|script| {
+            (
+                script.entry_point(),
+                script.parameter_tys.clone(),
+                script.return_tys.clone(),
+            )
+        })
+    }
+
+    fn insert(
+        &mut self,
+        hash: ScriptHash,
+        script: LoadedScript,
+    ) -> PartialVMResult<(Arc<Function>, Vec<Type>, Vec<Type>)> {
+        match self.get(&hash) {
+            Some(cached) => Ok(cached),
+            None => {
+                let script = self.scripts.insert(hash, script)?;
+                Ok((
+                    script.entry_point(),
+                    script.parameter_tys.clone(),
+                    script.return_tys.clone(),
+                ))
+            }
+        }
+    }
+}
+
+/// The ModuleCache holds all verified modules as well as loaded modules, structs, and functions.
+/// Structs and functions are pushed into a global structure, handles in compiled modules are
+/// replaced with indices into these global structures in loaded modules.  All access to the
+/// ModuleCache via the Loader is under an RWLock.
+pub struct ModuleCache {
+    /// Compiled modules go in this cache once they have been individually verified.
+    compiled_modules: BinaryCache<ModuleId, CompiledModule>,
+    /// Modules whose dependencies have been verified already (during publishing or loading).
+    verified_dependencies: BTreeSet<(AccountAddress, ModuleId)>,
+    /// Loaded modules go in this cache once their compiled modules have been link-checked, and
+    /// structs and functions have populated `structs` and `functions` below.
+    ///
+    /// The `AccountAddress` in the key is the "link context", and the `ModuleId` is the ID of the
+    /// module whose load was requested. A mapping `(ctx, id) => module` means that when `id` was
+    /// requested in context `ctx`, `module` was loaded.
+    loaded_modules: BinaryCache<(AccountAddress, ModuleId), LoadedModule>,
+
+    /// Global cache of loaded structs, shared among all modules.
+    structs: BinaryCache<(ModuleId, Identifier), StructType>,
+    /// Global list of loaded functions, shared among all modules.
+    functions: Vec<Arc<Function>>,
+}
+
+/// Tracks the current end point of the `ModuleCache`'s `struct`s and `function`s, so that we can
+/// roll-back to that point in case of error.
+struct CacheCursor {
+    last_struct: usize,
+    last_function: usize,
+}
+
+impl ModuleCache {
+    fn new() -> Self {
+        Self {
+            compiled_modules: BinaryCache::new(),
+            verified_dependencies: BTreeSet::new(),
+            loaded_modules: BinaryCache::new(),
+            structs: BinaryCache::new(),
+            functions: vec![],
+        }
+    }
+
+    //
+    // Common "get" operations
+    //
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn compiled_module_at(&self, id: &ModuleId) -> Option<Arc<CompiledModule>> {
+        self.compiled_modules.get(id).map(Arc::clone)
+    }
+
+    // Retrieve a module by `ModuleId`. The module may have not been loaded yet in which
+    // case `None` is returned
+    fn loaded_module_at(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> Option<Arc<LoadedModule>> {
+        self.loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .map(Arc::clone)
+    }
+
+    // Retrieve a function by index
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        Arc::clone(&self.functions[idx])
+    }
+
+    // Retrieve a struct by index
+    fn struct_at(&self, idx: CachedStructIndex) -> Arc<StructType> {
+        Arc::clone(&self.structs.binaries[idx.0])
+    }
+
+    //
+    // Insertion is under lock and it's a pretty heavy operation.
+    // The VM is pretty much stopped waiting for this to finish
+    //
+
+    fn insert(
+        &mut self,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> VMResult<Arc<LoadedModule>> {
+        let runtime_id = module.self_id();
+        if let Some(cached) = self.loaded_module_at(data_store.link_context(), &runtime_id) {
+            return Ok(cached);
+        }
+
+        // Make sure the modules of dependencies are in the cache.
+        for runtime_dep in module.immediate_dependencies() {
+            let storage_dep = data_store
+                .relocate(&runtime_dep)
+                .map_err(|e| e.finish(Location::Undefined))?;
+            let compiled_dep = self.compiled_module_at(&storage_dep).ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!(
+                        "Cannot load dependency {runtime_dep} of {storage_id} from {storage_dep}"
+                    ))
+                    .finish(Location::Undefined)
+            })?;
+
+            self.insert(natives, data_store, storage_dep, compiled_dep.as_ref())?;
+        }
+
+        let cursor = self.cursor();
+        match self.add_module(&cursor, natives, data_store, storage_id, module) {
+            Ok(module) => Ok(Arc::clone(module)),
+            Err(err) => {
+                // we need this operation to be transactional, if an error occurs we must
+                // leave a clean state
+                self.reset(cursor);
+                Err(err.finish(Location::Undefined))
+            }
+        }
+    }
+
+    fn add_module(
+        &mut self,
+        cursor: &CacheCursor,
+        natives: &NativeFunctions,
+        data_store: &impl DataStore,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+    ) -> PartialVMResult<&Arc<LoadedModule>> {
+        let link_context = data_store.link_context();
+        let runtime_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        // Add new structs and collect their field signatures
+        let mut field_signatures = vec![];
+        for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+            let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+            let name = module.identifier_at(struct_handle.name);
+            let struct_key = (runtime_id.clone(), name.to_owned());
+
+            if self.structs.contains(&struct_key) {
+                continue;
+            }
+
+            let field_names = match &struct_def.field_information {
+                StructFieldInformation::Native => vec![],
+                StructFieldInformation::Declared(field_info) => field_info
+                    .iter()
+                    .map(|f| module.identifier_at(f.name).to_owned())
+                    .collect(),
+            };
+
+            let defining_id = data_store.defining_module(&runtime_id, name)?;
+
+            self.structs.insert(
+                struct_key,
+                StructType {
+                    fields: vec![],
+                    field_names,
+                    abilities: struct_handle.abilities,
+                    type_parameters: struct_handle.type_parameters.clone(),
+                    name: name.to_owned(),
+                    defining_id,
+                    runtime_id: runtime_id.clone(),
+                    struct_def: StructDefinitionIndex(idx as u16),
+                    depth: None,
+                },
+            )?;
+
+            let StructFieldInformation::Declared(fields) = &struct_def.field_information else {
+                unreachable!("native structs have been removed");
+            };
+
+            let signatures: Vec<_> = fields.iter().map(|f| &f.signature.0).collect();
+            field_signatures.push(signatures)
+        }
+
+        // Convert field signatures into types after adding all structs because field types might
+        // refer to structs in the same module.
+        let mut field_types = vec![];
+        for signature in field_signatures {
+            let tys: Vec<_> = signature
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<_>>()?;
+            field_types.push(tys);
+        }
+
+        let field_types_len = field_types.len();
+
+        // Add the field types to the newly added structs, processing them in reverse, to line them
+        // up with the structs we added at the end of the global cache.
+        for (fields, struct_type) in field_types
+            .into_iter()
+            .rev()
+            .zip(self.structs.binaries.iter_mut().rev())
+        {
+            match Arc::get_mut(struct_type) {
+                Some(struct_type) => struct_type.fields = fields,
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we just rewrite the entire `Arc`
+                    // over and log the issue.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                    let mut struct_copy = (**struct_type).clone();
+                    struct_copy.fields = fields;
+                    *struct_type = Arc::new(struct_copy);
+                }
+            }
+        }
+
+        let mut depth_cache = BTreeMap::new();
+        for struct_type in self.structs.binaries.iter().rev().take(field_types_len) {
+            self.calculate_depth_of_struct(struct_type, &mut depth_cache)?;
+        }
+
+        debug_assert!(depth_cache.len() == field_types_len);
+        for (cache_idx, depth) in depth_cache {
+            match Arc::get_mut(self.structs.binaries.get_mut(cache_idx.0).unwrap()) {
+                Some(struct_type) => struct_type.depth = Some(depth),
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we log the issue and move on leaving the
+                    // structs depth as `None` -- if we try to access it later we will treat this
+                    // as too deep.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                }
+            }
+        }
+
+        for (idx, func) in module.function_defs().iter().enumerate() {
+            let findex = FunctionDefinitionIndex(idx as TableIndex);
+            let mut function = Function::new(natives, findex, func, module);
+            function.return_types = function
+                .return_
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            function.local_types = function
+                .locals
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            function.parameter_types = function
+                .parameters
+                .0
+                .iter()
+                .map(|tok| self.make_type(module_view, tok))
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            self.functions.push(Arc::new(function));
+        }
+
+        let loaded_module = LoadedModule::new(cursor, link_context, storage_id, module, self)?;
+        self.loaded_modules
+            .insert((link_context, runtime_id), loaded_module)
+    }
+
+    // `make_type` is the entry point to "translate" a `SignatureToken` to a `Type`
+    fn make_type(&self, module: BinaryIndexedView, tok: &SignatureToken) -> PartialVMResult<Type> {
+        let res = match tok {
+            SignatureToken::Bool => Type::Bool,
+            SignatureToken::U8 => Type::U8,
+            SignatureToken::U16 => Type::U16,
+            SignatureToken::U32 => Type::U32,
+            SignatureToken::U64 => Type::U64,
+            SignatureToken::U128 => Type::U128,
+            SignatureToken::U256 => Type::U256,
+            SignatureToken::Address => Type::Address,
+            SignatureToken::Signer => Type::Signer,
+            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx),
+            SignatureToken::Vector(inner_tok) => {
+                Type::Vector(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Reference(inner_tok) => {
+                Type::Reference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::MutableReference(inner_tok) => {
+                Type::MutableReference(Box::new(self.make_type(module, inner_tok)?))
+            }
+            SignatureToken::Struct(sh_idx) => {
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::Struct(def_idx)
+            }
+            SignatureToken::StructInstantiation(sh_idx, tys) => {
+                let type_parameters: Vec<_> = tys
+                    .iter()
+                    .map(|tok| self.make_type(module, tok))
+                    .collect::<PartialVMResult<_>>()?;
+                let struct_handle = module.struct_handle_at(*sh_idx);
+                let struct_name = module.identifier_at(struct_handle.name);
+                let module_handle = module.module_handle_at(struct_handle.module);
+                let runtime_id = ModuleId::new(
+                    *module.address_identifier_at(module_handle.address),
+                    module.identifier_at(module_handle.name).to_owned(),
+                );
+                let def_idx = self.resolve_struct_by_name(struct_name, &runtime_id)?.0;
+                Type::StructInstantiation(def_idx, type_parameters)
+            }
+        };
+        Ok(res)
+    }
+
+    fn calculate_depth_of_struct(
+        &self,
+        struct_type: &StructType,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let def_idx = self
+            .resolve_struct_by_name(&struct_type.name, &struct_type.runtime_id)?
+            .0;
+
+        // If we've already computed this structs depth, no more work remains to be done.
+        if let Some(form) = &struct_type.depth {
+            return Ok(form.clone());
+        }
+        if let Some(form) = depth_cache.get(&def_idx) {
+            return Ok(form.clone());
+        }
+
+        let formulas = struct_type
+            .fields
+            .iter()
+            .map(|field_type| self.calculate_depth_of_type(field_type, depth_cache))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let mut formula = DepthFormula::normalize(formulas);
+        // add 1 for the struct itself
+        formula.add(1);
+        let prev = depth_cache.insert(def_idx, formula.clone());
+        if prev.is_some() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Recursive type?".to_owned()),
+            );
+        }
+        Ok(formula)
+    }
+
+    fn calculate_depth_of_type(
+        &self,
+        ty: &Type,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        Ok(match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U64
+            | Type::U128
+            | Type::Address
+            | Type::Signer
+            | Type::U16
+            | Type::U32
+            | Type::U256 => DepthFormula::constant(1),
+            // we should not see the reference here, we could instead give an invariant violation
+            Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                let mut inner = self.calculate_depth_of_type(ty, depth_cache)?;
+                // add 1 for the vector itself
+                inner.add(1);
+                inner
+            }
+            Type::TyParam(ty_idx) => DepthFormula::type_parameter(*ty_idx),
+            Type::Struct(cache_idx) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+                debug_assert!(struct_formula.terms.is_empty());
+                struct_formula
+            }
+            Type::StructInstantiation(cache_idx, ty_args) => {
+                let struct_type = self.struct_at(*cache_idx);
+                let ty_arg_map = ty_args
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, ty)| {
+                        let var = idx as TypeParameterIndex;
+                        Ok((var, self.calculate_depth_of_type(ty, depth_cache)?))
+                    })
+                    .collect::<PartialVMResult<BTreeMap<_, _>>>()?;
+                let struct_formula = self.calculate_depth_of_struct(&struct_type, depth_cache)?;
+
+                struct_formula.subst(ty_arg_map)?
+            }
+        })
+    }
+
+    // Given a ModuleId::struct_name, retrieve the `StructType` and the index associated.
+    // Return and error if the type has not been loaded
+    fn resolve_struct_by_name(
+        &self,
+        struct_name: &IdentStr,
+        runtime_id: &ModuleId,
+    ) -> PartialVMResult<(CachedStructIndex, Arc<StructType>)> {
+        match self
+            .structs
+            .get_with_idx(&(runtime_id.clone(), struct_name.to_owned()))
+        {
+            Some((idx, struct_)) => Ok((CachedStructIndex(idx), Arc::clone(struct_))),
+            None => Err(PartialVMError::new(StatusCode::TYPE_RESOLUTION_FAILURE)
+                .with_message(format!("Cannot find {runtime_id}::{struct_name} in cache",))),
+        }
+    }
+
+    // Given a ModuleId::func_name, retrieve the `Function` and the index associated.
+    // Return and error if the function has not been loaded
+    fn resolve_function_by_name(
+        &self,
+        func_name: &IdentStr,
+        runtime_id: &ModuleId,
+        link_context: AccountAddress,
+    ) -> PartialVMResult<usize> {
+        match self
+            .loaded_modules
+            .get(&(link_context, runtime_id.clone()))
+            .and_then(|module| module.function_map.get(func_name))
+        {
+            Some(func_idx) => Ok(*func_idx),
+            None => Err(
+                PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE).with_message(format!(
+                    "Cannot find {:?}::{:?} in cache for context {:?}",
+                    runtime_id, func_name, link_context,
+                )),
+            ),
+        }
+    }
+
+    /// Return the current high watermark of structs and functions in the cache.
+    fn cursor(&self) -> CacheCursor {
+        CacheCursor {
+            last_struct: self.structs.len(),
+            last_function: self.functions.len(),
+        }
+    }
+
+    /// Rollback the cache's structs and functions to the point at which the cache cursor was
+    /// created.
+    fn reset(
+        &mut self,
+        CacheCursor {
+            last_struct,
+            last_function,
+        }: CacheCursor,
+    ) {
+        // Remove entries from `structs.id_map` corresponding to the newly added structs.
+        for (idx, struct_) in self.structs.binaries.iter().enumerate().rev() {
+            if idx < last_struct {
+                break;
+            }
+
+            let key = (struct_.runtime_id.clone(), struct_.name.clone());
+            match self.structs.id_map.remove(&key) {
+                Some(jdx) if jdx == idx => {
+                    continue;
+                }
+                Some(jdx) => unreachable!(
+                    "Expected to find {}::{} at index {idx} but found at {jdx}.",
+                    struct_.defining_id, struct_.name,
+                ),
+                None => unreachable!(
+                    "Expected to find {}::{} at index {idx} but not found.",
+                    struct_.defining_id, struct_.name,
+                ),
+            }
+        }
+
+        self.structs.binaries.truncate(last_struct);
+        self.functions.truncate(last_function);
+    }
+}
+
+//
+// Loader
+//
+
+// A Loader is responsible to load scripts and modules and holds the cache of all loaded
+// entities. Each cache is protected by a `RwLock`. Operation in the Loader must be thread safe
+// (operating on values on the stack) and when cache needs updating the mutex must be taken.
+// The `pub(crate)` API is what a Loader offers to the runtime.
+pub(crate) struct Loader {
+    scripts: RwLock<ScriptCache>,
+    module_cache: RwLock<ModuleCache>,
+    type_cache: RwLock<TypeCache>,
+    natives: NativeFunctions,
+    vm_config: VMConfig,
+}
+
+impl Loader {
+    pub(crate) fn new(natives: NativeFunctions, vm_config: VMConfig) -> Self {
+        Self {
+            scripts: RwLock::new(ScriptCache::new()),
+            module_cache: RwLock::new(ModuleCache::new()),
+            type_cache: RwLock::new(TypeCache::new()),
+            natives,
+            vm_config,
+        }
+    }
+
+    pub(crate) fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    /// Copies metadata out of a modules bytecode if available.
+    pub(crate) fn get_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        let cache = self.module_cache.read();
+        cache
+            .compiled_modules
+            .get(&module)
+            .and_then(|module| module.metadata.iter().find(|md| md.key == key))
+            .cloned()
+    }
+
+    //
+    // Script verification and loading
+    //
+
+    // Scripts are verified and dependencies are loaded.
+    // Effectively that means modules are cached from leaf to root in the dependency DAG.
+    // If a dependency error is found, loading stops and the error is returned.
+    // However all modules cached up to that point stay loaded.
+
+    // Entry point for script execution (`MoveVM::execute_script`).
+    // Verifies the script if it is not in the cache of scripts loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_script(
+        &self,
+        script_blob: &[u8],
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<Function>, LoadedFunctionInstantiation)> {
+        // retrieve or load the script
+        let mut sha3_256 = Sha3_256::new();
+        sha3_256.update(script_blob);
+        let hash_value: [u8; 32] = sha3_256.finalize().into();
+
+        let link_context = data_store.link_context();
+        let mut scripts = self.scripts.write();
+        let (main, parameters, return_) = match scripts.get(&hash_value) {
+            Some(cached) => cached,
+            None => {
+                let ver_script = self.deserialize_and_verify_script(script_blob, data_store)?;
+                let script = LoadedScript::new(
+                    ver_script,
+                    link_context,
+                    &hash_value,
+                    &self.module_cache.read(),
+                )?;
+                scripts
+                    .insert(hash_value, script)
+                    .map_err(|e| e.finish(Location::Script))?
+            }
+        };
+
+        // verify type arguments
+        self.verify_ty_args(main.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Script))?;
+        let instantiation = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((main, instantiation))
+    }
+
+    // The process of deserialization and verification is not and it must not be under lock.
+    // So when publishing modules through the dependency DAG it may happen that a different
+    // thread had loaded the module after this process fetched it from storage.
+    // Caching will take care of that by asking for each dependency module again under lock.
+    fn deserialize_and_verify_script(
+        &self,
+        script: &[u8],
+        data_store: &impl DataStore,
+    ) -> VMResult<CompiledScript> {
+        let script = match CompiledScript::deserialize_with_max_version(
+            script,
+            self.vm_config.max_binary_format_version,
+        ) {
+            Ok(script) => script,
+            Err(err) => {
+                error!("[VM] deserializer for script returned error: {:?}", err,);
+                let msg = format!("Deserialization error: {:?}", err);
+                return Err(PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                    .with_message(msg)
+                    .finish(Location::Script));
+            }
+        };
+
+        match self.verify_script(&script) {
+            Ok(_) => {
+                // verify and load dependencies, fetching the verified compiled module.
+                let deps: VMResult<Vec<_>> = script
+                    .immediate_dependencies()
+                    .into_iter()
+                    .map(|dep| Ok(self.load_module(&dep, data_store)?.0))
+                    .collect();
+
+                // verify script linkage
+                dependencies::verify_script(&script, deps?.iter().map(Arc::as_ref))?;
+
+                Ok(script)
+            }
+            Err(err) => {
+                error!(
+                    "[VM] bytecode verifier returned errors for script: {:?}",
+                    err
+                );
+                Err(err)
+            }
+        }
+    }
+
+    // Script verification steps.
+    // See `verify_module()` for module verification steps.
+    fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
+        move_bytecode_verifier::verify_script_with_config_unmetered(
+            &self.vm_config.verifier,
+            script,
+        )
+    }
+
+    //
+    // Module verification and loading
+    //
+
+    // Entry point for function execution (`MoveVM::execute_function`).
+    // Loading verifies the module if it was never loaded.
+    // Type parameters are checked as well after every type is loaded.
+    pub(crate) fn load_function(
+        &self,
+        runtime_id: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: &[Type],
+        data_store: &impl DataStore,
+    ) -> VMResult<(
+        Arc<CompiledModule>,
+        Arc<LoadedModule>,
+        Arc<Function>,
+        LoadedFunctionInstantiation,
+    )> {
+        let link_context = data_store.link_context();
+        let (compiled, loaded) = self.load_module(runtime_id, data_store)?;
+        let compiled_view = BinaryIndexedView::Module(compiled.as_ref());
+        let idx = self
+            .module_cache
+            .read()
+            .resolve_function_by_name(function_name, runtime_id, link_context)
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let func = self.module_cache.read().function_at(idx);
+
+        let parameters = func
+            .parameters
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_ = func
+            .return_
+            .0
+            .iter()
+            .map(|tok| self.module_cache.read().make_type(compiled_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        // verify type arguments
+        self.verify_ty_args(func.type_parameters(), ty_args)
+            .map_err(|e| e.finish(Location::Module(runtime_id.clone())))?;
+
+        let inst = LoadedFunctionInstantiation {
+            parameters,
+            return_,
+        };
+        Ok((compiled, loaded, func, inst))
+    }
+
+    // Entry point for module publishing (`MoveVM::publish_module_bundle`).
+    //
+    // All modules in the bundle to be published must be loadable. This function performs all
+    // verification steps to load these modules without actually loading them into the code cache.
+    pub(crate) fn verify_module_bundle_for_publication(
+        &self,
+        modules: &[CompiledModule],
+        data_store: &mut impl DataStore,
+    ) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-1", |_| { Ok(()) });
+
+        let mut bundle_verified = BTreeMap::new();
+        for module in modules {
+            let module_id = module.self_id();
+
+            self.verify_module_for_publication(module, &bundle_verified, data_store)?;
+            bundle_verified.insert(module_id.clone(), module.clone());
+        }
+        Ok(())
+    }
+
+    // A module to be published must be loadable.
+    //
+    // This step performs all verification steps to load the module without loading it.
+    // The module is not added to the code cache. It is simply published to the data cache.
+    // See `verify_script()` for script verification steps.
+    //
+    // If a module `M` is published together with a bundle of modules (i.e., a vector of modules),
+    // the `bundle_verified` argument tracks the modules that have already been verified in the
+    // bundle. Basically, this represents the modules appears before `M` in the bundle vector.
+    fn verify_module_for_publication(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        // Performs all verification steps to load the module without loading it, i.e., the new
+        // module will NOT show up in `module_cache`.
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            module,
+        )?;
+        self.check_natives(module)?;
+
+        let mut visiting = BTreeSet::new();
+        visiting.insert(module.self_id());
+
+        // downward exploration of the module's dependency graph. Since we know nothing about this
+        // target module, we don't know what the module may specify as its dependencies and hence,
+        // we allow the loading of dependencies and the subsequent linking to fail.
+        self.verify_dependencies(
+            module,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            /* allow_dependency_loading_failure */ true,
+            /* dependencies_depth */ 0,
+        )?;
+
+        // make sure there is no cyclic dependency
+        self.verify_module_cyclic_relations(module, bundle_verified, data_store)
+    }
+
+    fn verify_module_cyclic_relations(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<()> {
+        let module_cache = self.module_cache.read();
+        cyclic_dependencies::verify_module(module, |runtime_id| {
+            let module = if let Some(bundled) = bundle_verified.get(runtime_id) {
+                Some(bundled)
+            } else {
+                let storage_id = data_store.relocate(runtime_id)?;
+                module_cache
+                    .compiled_modules
+                    .get(&storage_id)
+                    .map(Arc::as_ref)
+            };
+
+            module
+                .map(|m| m.immediate_dependencies())
+                .ok_or_else(|| PartialVMError::new(StatusCode::MISSING_DEPENDENCY))
+        })
+    }
+
+    // All native functions must be known to the loader, unless we are compiling with feature
+    // `lazy_natives`.
+    fn check_natives(&self, module: &CompiledModule) -> VMResult<()> {
+        fn check_natives_impl(loader: &Loader, module: &CompiledModule) -> PartialVMResult<()> {
+            if !cfg!(feature = "lazy_natives") {
+                for (idx, native_function) in module
+                    .function_defs()
+                    .iter()
+                    .filter(|fdv| fdv.is_native())
+                    .enumerate()
+                {
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    loader
+                        .natives
+                        .resolve(
+                            module.address_identifier_at(mh.address),
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str(),
+                        )
+                        .ok_or_else(|| {
+                            verification_error(
+                                StatusCode::MISSING_DEPENDENCY,
+                                IndexKind::FunctionHandle,
+                                idx as TableIndex,
+                            )
+                        })?;
+                }
+            }
+            // TODO: fix check and error code if we leave something around for native structs.
+            // For now this generates the only error test cases care about...
+            for (idx, struct_def) in module.struct_defs().iter().enumerate() {
+                if struct_def.field_information == StructFieldInformation::Native {
+                    return Err(verification_error(
+                        StatusCode::MISSING_DEPENDENCY,
+                        IndexKind::FunctionHandle,
+                        idx as TableIndex,
+                    ));
+                }
+            }
+            Ok(())
+        }
+        check_natives_impl(self, module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    //
+    // Helpers for loading and verification
+    //
+
+    pub(crate) fn load_struct_by_name(
+        &self,
+        name: &IdentStr,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.load_module(runtime_id, data_store)?;
+        self.module_cache
+            .read()
+            // Should work if the type exists, because module was loaded above.
+            .resolve_struct_by_name(name, runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn load_type(
+        &self,
+        type_tag: &TypeTag,
+        data_store: &impl DataStore,
+    ) -> VMResult<Type> {
+        Ok(match type_tag {
+            TypeTag::Bool => Type::Bool,
+            TypeTag::U8 => Type::U8,
+            TypeTag::U16 => Type::U16,
+            TypeTag::U32 => Type::U32,
+            TypeTag::U64 => Type::U64,
+            TypeTag::U128 => Type::U128,
+            TypeTag::U256 => Type::U256,
+            TypeTag::Address => Type::Address,
+            TypeTag::Signer => Type::Signer,
+            TypeTag::Vector(tt) => Type::Vector(Box::new(self.load_type(tt, data_store)?)),
+            TypeTag::Struct(struct_tag) => {
+                let runtime_id = ModuleId::new(struct_tag.address, struct_tag.module.clone());
+                let (idx, struct_type) =
+                    self.load_struct_by_name(&struct_tag.name, &runtime_id, data_store)?;
+                if struct_type.type_parameters.is_empty() && struct_tag.type_params.is_empty() {
+                    Type::Struct(idx)
+                } else {
+                    let mut type_params = vec![];
+                    for ty_param in &struct_tag.type_params {
+                        type_params.push(self.load_type(ty_param, data_store)?);
+                    }
+                    self.verify_ty_args(struct_type.type_param_constraints(), &type_params)
+                        .map_err(|e| e.finish(Location::Undefined))?;
+                    Type::StructInstantiation(idx, type_params)
+                }
+            }
+        })
+    }
+
+    // The interface for module loading. Aligned with `load_type` and `load_function`, this function
+    // verifies that the module is OK instead of expect it.
+    pub(crate) fn load_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        self.load_module_internal(runtime_id, &BTreeMap::new(), data_store)
+    }
+
+    // Load the transitive closure of the target module first, and then verify that the modules in
+    // the closure do not have cyclic dependencies.
+    fn load_module_internal(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+    ) -> VMResult<(Arc<CompiledModule>, Arc<LoadedModule>)> {
+        let link_context = data_store.link_context();
+
+        {
+            let locked_cache = self.module_cache.read();
+            if let Some(loaded) = locked_cache.loaded_module_at(link_context, runtime_id) {
+                let Some(compiled) = locked_cache.compiled_module_at(&loaded.id) else {
+                    unreachable!(
+                        "Loaded module without verified compiled module.\n\
+                         Context:    {link_context}\n\
+                         Runtime ID: {runtime_id}\n\
+                         Loaded module: {loaded:#?}"
+                    );
+                };
+
+                return Ok((compiled, loaded));
+            }
+        }
+
+        // otherwise, load the transitive closure of the target module
+        let mut visiting = BTreeSet::new();
+        let allow_module_loading_failure = true;
+        let dependencies_depth = 0;
+        let (storage_id, compiled) = self.verify_module_and_dependencies(
+            runtime_id,
+            bundle_verified,
+            data_store,
+            &mut visiting,
+            allow_module_loading_failure,
+            dependencies_depth,
+        )?;
+
+        // verify that the transitive closure does not have cycles
+        self.verify_module_cyclic_relations(compiled.as_ref(), bundle_verified, data_store)
+            .map_err(expect_no_verification_errors)?;
+
+        // load the compiled module
+        let loaded = self.module_cache.write().insert(
+            &self.natives,
+            data_store,
+            storage_id,
+            compiled.as_ref(),
+        )?;
+
+        Ok((compiled, loaded))
+    }
+
+    /// Read the module that will be referred to at runtime as `runtime_id`, but is found in the
+    /// store at `storage_id`.  Verify it without linking or interacting with caches, and return
+    /// the deserialized module on success.
+    fn read_module_from_store(
+        &self,
+        runtime_id: &ModuleId,
+        storage_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<CompiledModule> {
+        // bytes fetching, allow loading to fail if the flag is set
+        let bytes = match data_store.load_module(storage_id) {
+            Ok(bytes) => bytes,
+            Err(err) if allow_loading_failure => return Err(err),
+            Err(err) => {
+                error!(
+                    "[VM] Error fetching module with id {runtime_id:?} from storage at \
+                     {storage_id:?}",
+                );
+                return Err(expect_no_verification_errors(err));
+            }
+        };
+
+        // for bytes obtained from the data store, they should always deserialize and verify.
+        // It is an invariant violation if they don't.
+        let module = CompiledModule::deserialize_with_config(
+            &bytes,
+            self.vm_config.max_binary_format_version,
+            self.vm_config()
+                .check_no_extraneous_bytes_during_deserialization,
+        )
+        .map_err(|err| {
+            let msg = format!("Deserialization error: {:?}", err);
+            PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                .with_message(msg)
+                .finish(Location::Module(storage_id.clone()))
+        })
+        .map_err(expect_no_verification_errors)?;
+
+        fail::fail_point!("verifier-failpoint-2", |_| { Ok(module.clone()) });
+
+        if self.vm_config.paranoid_type_checks && &module.self_id() != runtime_id {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Module self id mismatch with storage".to_string())
+                    .finish(Location::Module(runtime_id.clone())),
+            );
+        }
+
+        // bytecode verifier checks that can be performed with the module itself
+        move_bytecode_verifier::verify_module_with_config_unmetered(
+            &self.vm_config.verifier,
+            &module,
+        )
+        .map_err(expect_no_verification_errors)?;
+        self.check_natives(&module)
+            .map_err(expect_no_verification_errors)?;
+
+        Ok(module)
+    }
+
+    /// Deserialize and check the module with the bytecode verifier, without linking.  Cache the
+    /// `CompiledModule` on success, and return a reference to it.
+    fn verify_module(
+        &self,
+        runtime_id: &ModuleId,
+        data_store: &impl DataStore,
+        allow_loading_failure: bool,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        let storage_id = data_store
+            .relocate(runtime_id)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        if let Some(cached) = self.module_cache.read().compiled_module_at(&storage_id) {
+            return Ok((storage_id, cached));
+        }
+
+        let module = self.read_module_from_store(
+            runtime_id,
+            &storage_id,
+            data_store,
+            allow_loading_failure,
+        )?;
+
+        let cached = self
+            .module_cache
+            .write()
+            .compiled_modules
+            .insert(storage_id.clone(), module)
+            .map_err(|e| e.finish(Location::Module(storage_id.clone())))?
+            .clone();
+
+        Ok((storage_id, cached))
+    }
+
+    /// Recursively read the module at ID and its transitive dependencies, verify them individually
+    /// and verify that they link together.  Returns the `CompiledModule` for `runtime_id`, written
+    /// to the module cache, on success, as well as the `ModuleId` it was read from, in storage.
+    fn verify_module_and_dependencies(
+        &self,
+        runtime_id: &ModuleId,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_module_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<(ModuleId, Arc<CompiledModule>)> {
+        // dependency loading does not permit cycles
+        if !visiting.insert(runtime_id.clone()) {
+            return Err(PartialVMError::new(StatusCode::CYCLIC_MODULE_DEPENDENCY)
+                .finish(Location::Undefined));
+        }
+
+        // module self-check
+        let (storage_id, module) =
+            self.verify_module(runtime_id, data_store, allow_module_loading_failure)?;
+
+        // If this module is already in the "verified dependencies" cache, then no need to check it
+        // again -- it has already been verified against its dependencies in this link context.
+        let cache_key = (data_store.link_context(), runtime_id.clone());
+        if !self
+            .module_cache
+            .read()
+            .verified_dependencies
+            .contains(&cache_key)
+        {
+            // downward exploration of the module's dependency graph. For a module that is loaded from
+            // the data_store, we should never allow its dependencies to fail to load.
+            let allow_dependency_loading_failure = false;
+            self.verify_dependencies(
+                module.as_ref(),
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth,
+            )?;
+
+            self.module_cache
+                .write()
+                .verified_dependencies
+                .insert(cache_key);
+        }
+
+        visiting.remove(runtime_id);
+        Ok((storage_id, module))
+    }
+
+    // downward exploration of the module's dependency graph
+    fn verify_dependencies(
+        &self,
+        module: &CompiledModule,
+        bundle_verified: &BTreeMap<ModuleId, CompiledModule>,
+        data_store: &impl DataStore,
+        visiting: &mut BTreeSet<ModuleId>,
+        allow_dependency_loading_failure: bool,
+        dependencies_depth: usize,
+    ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
+
+        // all immediate dependencies of the module being verified should be in one of the locations
+        // - the verified portion of the bundle (e.g., verified before this module)
+        // - the compiled module cache (i.e., module has been self-checked but not link checked)
+        // - the data store (i.e., not self-checked yet)
+        let mut bundle_deps = vec![];
+        let mut cached_deps = vec![];
+        for runtime_dep in module.immediate_dependencies() {
+            if let Some(cached) = bundle_verified.get(&runtime_dep) {
+                bundle_deps.push(cached);
+                continue;
+            }
+
+            let (_, loaded) = self.verify_module_and_dependencies(
+                &runtime_dep,
+                bundle_verified,
+                data_store,
+                visiting,
+                allow_dependency_loading_failure,
+                dependencies_depth + 1,
+            )?;
+
+            cached_deps.push(loaded);
+        }
+
+        fail::fail_point!("verifier-failpoint-4", |_| { Ok(()) });
+
+        // once all dependencies are loaded, do the linking check
+        let deps = bundle_deps
+            .into_iter()
+            .chain(cached_deps.iter().map(Arc::as_ref));
+        let result = dependencies::verify_module(module, deps);
+
+        // if dependencies loading is not allowed to fail, the linking should not fail as well
+        if allow_dependency_loading_failure {
+            result
+        } else {
+            result.map_err(expect_no_verification_errors)
+        }?;
+
+        Ok(())
+    }
+
+    // Return an instantiated type given a generic and an instantiation.
+    // Stopgap to avoid a recursion that is either taking too long or using too
+    // much memory
+    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        if let Type::StructInstantiation(_, struct_inst) = ty {
+            let mut sum_nodes = 1u64;
+            for ty in ty_args.iter().chain(struct_inst.iter()) {
+                sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
+                if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                }
+            }
+        }
+        ty.subst(ty_args)
+    }
+
+    // Verify the kind (constraints) of an instantiation.
+    // Both function and script invocation use this function to verify correctness
+    // of type arguments provided
+    fn verify_ty_args<'a, I>(&self, constraints: I, ty_args: &[Type]) -> PartialVMResult<()>
+    where
+        I: IntoIterator<Item = &'a AbilitySet>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let constraints = constraints.into_iter();
+        if constraints.len() != ty_args.len() {
+            return Err(PartialVMError::new(
+                StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+            ));
+        }
+        for (ty, expected_k) in ty_args.iter().zip(constraints) {
+            if !expected_k.is_subset(self.abilities(ty)?) {
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED));
+            }
+        }
+        Ok(())
+    }
+
+    //
+    // Internal helpers
+    //
+
+    fn function_at(&self, idx: usize) -> Arc<Function> {
+        self.module_cache.read().function_at(idx)
+    }
+
+    fn get_module(
+        &self,
+        link_context: AccountAddress,
+        runtime_id: &ModuleId,
+    ) -> (Arc<CompiledModule>, Arc<LoadedModule>) {
+        let locked_cache = self.module_cache.read();
+        let loaded = locked_cache
+            .loaded_module_at(link_context, runtime_id)
+            .expect("ModuleId on Function must exist");
+        let compiled = locked_cache
+            .compiled_module_at(&loaded.id)
+            .expect("ModuleId on Function must exist");
+        (compiled, loaded)
+    }
+
+    fn get_script(&self, hash: &ScriptHash) -> Arc<LoadedScript> {
+        Arc::clone(
+            self.scripts
+                .read()
+                .scripts
+                .get(hash)
+                .expect("Script hash on Function must exist"),
+        )
+    }
+
+    pub(crate) fn get_struct_type(&self, idx: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.module_cache
+            .read()
+            .structs
+            .binaries
+            .get(idx.0)
+            .map(Arc::clone)
+    }
+
+    pub(crate) fn abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
+        match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address => Ok(AbilitySet::PRIMITIVES),
+
+            // Technically unreachable but, no point in erroring if we don't have to
+            Type::Reference(_) | Type::MutableReference(_) => Ok(AbilitySet::REFERENCES),
+            Type::Signer => Ok(AbilitySet::SIGNER),
+
+            Type::TyParam(_) => Err(PartialVMError::new(StatusCode::UNREACHABLE).with_message(
+                "Unexpected TyParam type after translating from TypeTag to Type".to_string(),
+            )),
+
+            Type::Vector(ty) => AbilitySet::polymorphic_abilities(
+                AbilitySet::VECTOR,
+                vec![false],
+                vec![self.abilities(ty)?],
+            ),
+            Type::Struct(idx) => Ok(self.module_cache.read().struct_at(*idx).abilities),
+            Type::StructInstantiation(idx, type_args) => {
+                let struct_type = self.module_cache.read().struct_at(*idx);
+                let declared_phantom_parameters = struct_type
+                    .type_parameters
+                    .iter()
+                    .map(|param| param.is_phantom);
+                let type_argument_abilities = type_args
+                    .iter()
+                    .map(|arg| self.abilities(arg))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                AbilitySet::polymorphic_abilities(
+                    struct_type.abilities,
+                    declared_phantom_parameters,
+                    type_argument_abilities,
+                )
+            }
+        }
+    }
+}
+
+//
+// Resolver
+//
+
+// A simple wrapper for a `Module` or a `Script` in the `Resolver`
+enum BinaryType {
+    Module {
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    },
+    Script(Arc<LoadedScript>),
+}
+
+// A Resolver is a simple and small structure allocated on the stack and used by the
+// interpreter. It's the only API known to the interpreter and it's tailored to the interpreter
+// needs.
+pub(crate) struct Resolver<'a> {
+    loader: &'a Loader,
+    binary: BinaryType,
+}
+
+impl<'a> Resolver<'a> {
+    fn for_module(
+        loader: &'a Loader,
+        compiled: Arc<CompiledModule>,
+        loaded: Arc<LoadedModule>,
+    ) -> Self {
+        let binary = BinaryType::Module { compiled, loaded };
+        Self { loader, binary }
+    }
+
+    fn for_script(loader: &'a Loader, script: Arc<LoadedScript>) -> Self {
+        let binary = BinaryType::Script(script);
+        Self { loader, binary }
+    }
+
+    //
+    // Constant resolution
+    //
+
+    pub(crate) fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
+        match &self.binary {
+            BinaryType::Module { compiled, .. } => compiled.constant_at(idx),
+            BinaryType::Script(script) => script.script.constant_at(idx),
+        }
+    }
+
+    //
+    // Function resolution
+    //
+
+    pub(crate) fn function_from_handle(&self, idx: FunctionHandleIndex) -> Arc<Function> {
+        let idx = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_at(idx.0),
+            BinaryType::Script(script) => script.function_at(idx.0),
+        };
+        self.loader.function_at(idx)
+    }
+
+    pub(crate) fn function_from_instantiation(
+        &self,
+        idx: FunctionInstantiationIndex,
+    ) -> Arc<Function> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        self.loader.function_at(func_inst.handle)
+    }
+
+    pub(crate) fn instantiate_generic_function(
+        &self,
+        idx: FunctionInstantiationIndex,
+        type_params: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        let mut instantiation = vec![];
+        for ty in &func_inst.instantiation {
+            instantiation.push(self.subst(ty, type_params)?);
+        }
+        // Check if the function instantiation over all generics is larger
+        // than MAX_TYPE_INSTANTIATION_NODES.
+        let mut sum_nodes = 1u64;
+        for ty in type_params.iter().chain(instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(instantiation)
+    }
+
+    #[allow(unused)]
+    pub(crate) fn type_params_count(&self, idx: FunctionInstantiationIndex) -> usize {
+        let func_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.function_instantiation_at(idx.0),
+            BinaryType::Script(script) => script.function_instantiation_at(idx.0),
+        };
+        func_inst.instantiation.len()
+    }
+
+    //
+    // Type resolution
+    //
+
+    pub(crate) fn get_struct_type(&self, idx: StructDefinitionIndex) -> Type {
+        let struct_def = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Type::Struct(struct_def)
+    }
+
+    pub(crate) fn instantiate_generic_type(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and larger types via struct instantiation.
+        let mut sum_nodes = 1u64;
+        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+
+        Ok(Type::StructInstantiation(
+            struct_inst.def,
+            struct_inst
+                .instantiation
+                .iter()
+                .map(|ty| self.subst(ty, ty_args))
+                .collect::<PartialVMResult<_>>()?,
+        ))
+    }
+
+    pub(crate) fn get_field_type(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+        let handle = match &self.binary {
+            BinaryType::Module { loaded, .. } => &loaded.field_handles[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Ok(self
+            .loader
+            .get_struct_type(handle.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?
+            .fields[handle.offset]
+            .clone())
+    }
+
+    pub(crate) fn instantiate_generic_field(
+        &self,
+        idx: FieldInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let field_instantiation = match &self.binary {
+            BinaryType::Module { loaded, .. } => &loaded.field_instantiations[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(field_instantiation.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = field_instantiation
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type.fields[field_instantiation.offset].subst(&instantiation_types)
+    }
+
+    pub(crate) fn get_struct_fields(
+        &self,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<Arc<StructType>> {
+        let idx = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        self.loader.get_struct_type(idx).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Struct Definition not resolved".to_string())
+        })
+    }
+
+    pub(crate) fn instantiate_generic_struct_fields(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(struct_inst.def)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = struct_inst
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type
+            .fields
+            .iter()
+            .map(|ty| ty.subst(&instantiation_types))
+            .collect::<PartialVMResult<Vec<_>>>()
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.single_type_at(idx),
+            BinaryType::Script(script) => script.single_type_at(idx),
+        }
+    }
+
+    pub(crate) fn instantiate_single_type(
+        &self,
+        idx: SignatureIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let ty = self.single_type_at(idx);
+        if !ty_args.is_empty() {
+            self.subst(ty, ty_args)
+        } else {
+            Ok(ty.clone())
+        }
+    }
+
+    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.loader.subst(ty, ty_args)
+    }
+
+    //
+    // Fields resolution
+    //
+
+    pub(crate) fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_offset(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_count(&self, idx: StructDefinitionIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_count(&self, idx: StructDefInstantiationIndex) -> u16 {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => loaded.field_instantiation_count(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        }
+    }
+
+    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> Type {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => {
+                Type::Struct(loaded.field_handles[idx.0 as usize].owner)
+            }
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_to_struct(
+        &self,
+        idx: FieldInstantiationIndex,
+        args: &[Type],
+    ) -> PartialVMResult<Type> {
+        match &self.binary {
+            BinaryType::Module { loaded, .. } => Ok(Type::StructInstantiation(
+                loaded.field_instantiations[idx.0 as usize].owner,
+                loaded.field_instantiations[idx.0 as usize]
+                    .instantiation
+                    .iter()
+                    .map(|ty| ty.subst(args))
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            )),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        self.loader.type_to_type_layout(ty)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        self.loader.type_to_fully_annotated_layout(ty)
+    }
+
+    // get the loader
+    pub(crate) fn loader(&self) -> &Loader {
+        self.loader
+    }
+}
+
+// A LoadedModule is very similar to a CompiledModule but data is "transformed" to a representation
+// more appropriate to execution.
+// When code executes indexes in instructions are resolved against those runtime structure
+// so that any data needed for execution is immediately available
+#[derive(Debug)]
+pub(crate) struct LoadedModule {
+    #[allow(dead_code)]
+    id: ModuleId,
+
+    //
+    // types as indexes into the Loader type list
+    //
+
+    // struct references carry the index into the global vector of types.
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of types. No instantiation of generic types is saved into the global table.
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+    structs: Vec<StructDef>,
+    // materialized instantiations, whether partial or not
+    struct_instantiations: Vec<StructInstantiation>,
+
+    // functions as indexes into the Loader function list
+    // That is effectively an indirection over the ref table:
+    // the instruction carries an index into this table which contains the index into the
+    // glabal table of functions. No instantiation of generic functions is saved into
+    // the global table.
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // fields as a pair of index, first to the type, second to the field position in that type
+    field_handles: Vec<FieldHandle>,
+    // materialized instantiations, whether partial or not
+    field_instantiations: Vec<FieldInstantiation>,
+
+    // function name to index into the Loader function list.
+    // This allows a direct access from function name to `Function`
+    function_map: HashMap<Identifier, usize>,
+
+    // a map of single-token signature indices to type.
+    // Single-token signatures are usually indexed by the `SignatureIndex` in bytecode. For example,
+    // `VecMutBorrow(SignatureIndex)`, the `SignatureIndex` maps to a single `SignatureToken`, and
+    // hence, a single type.
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedModule {
+    fn new(
+        cursor: &CacheCursor,
+        link_context: AccountAddress,
+        storage_id: ModuleId,
+        module: &CompiledModule,
+        cache: &ModuleCache,
+    ) -> Result<Self, PartialVMError> {
+        let self_id = module.self_id();
+        let module_view = BinaryIndexedView::Module(module);
+
+        let mut struct_refs = vec![];
+        let mut structs = vec![];
+        let mut struct_instantiations = vec![];
+        let mut function_refs = vec![];
+        let mut function_instantiations = vec![];
+        let mut field_handles = vec![];
+        let mut field_instantiations: Vec<FieldInstantiation> = vec![];
+        let mut function_map = HashMap::new();
+        let mut single_signature_token_map = BTreeMap::new();
+
+        for struct_handle in module.struct_handles() {
+            let struct_name = module.identifier_at(struct_handle.name);
+            let module_handle = module.module_handle_at(struct_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            struct_refs.push(cache.resolve_struct_by_name(struct_name, &runtime_id)?.0);
+        }
+
+        for struct_def in module.struct_defs() {
+            let idx = struct_refs[struct_def.struct_handle.0 as usize];
+            let field_count = cache.structs.binaries[idx.0].fields.len() as u16;
+            structs.push(StructDef { field_count, idx });
+        }
+
+        for struct_inst in module.struct_instantiations() {
+            let def = struct_inst.def.0 as usize;
+            let struct_def = &structs[def];
+            let field_count = struct_def.field_count;
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(struct_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            struct_instantiations.push(StructInstantiation {
+                field_count,
+                def: struct_def.idx,
+                instantiation,
+            });
+        }
+
+        for func_handle in module.function_handles() {
+            let func_name = module.identifier_at(func_handle.name);
+            let module_handle = module.module_handle_at(func_handle.module);
+            let runtime_id = module.module_id_for_handle(module_handle);
+            if runtime_id == self_id {
+                // module has not been published yet, loop through the functions
+                for (idx, function) in cache.functions.iter().enumerate().rev() {
+                    if idx < cursor.last_function {
+                        return Err(PartialVMError::new(StatusCode::FUNCTION_RESOLUTION_FAILURE)
+                            .with_message(format!(
+                                "Cannot find {:?}::{:?} in publishing module",
+                                runtime_id, func_name
+                            )));
+                    }
+                    if function.name.as_ident_str() == func_name {
+                        function_refs.push(idx);
+                        break;
+                    }
+                }
+            } else {
+                function_refs.push(cache.resolve_function_by_name(
+                    func_name,
+                    &runtime_id,
+                    link_context,
+                )?);
+            }
+        }
+
+        for func_def in module.function_defs() {
+            let idx = function_refs[func_def.function.0 as usize];
+            let name = module.identifier_at(module.function_handle_at(func_def.function).name);
+            function_map.insert(name.to_owned(), idx);
+
+            if let Some(code_unit) = &func_def.code {
+                for bc in &code_unit.code {
+                    match bc {
+                        Bytecode::VecPack(si, _)
+                        | Bytecode::VecLen(si)
+                        | Bytecode::VecImmBorrow(si)
+                        | Bytecode::VecMutBorrow(si)
+                        | Bytecode::VecPushBack(si)
+                        | Bytecode::VecPopBack(si)
+                        | Bytecode::VecUnpack(si, _)
+                        | Bytecode::VecSwap(si) => {
+                            if !single_signature_token_map.contains_key(si) {
+                                let ty = match module.signature_at(*si).0.get(0) {
+                                    None => {
+                                        return Err(PartialVMError::new(
+                                            StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                        )
+                                        .with_message(
+                                            "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                                .to_owned(),
+                                        ));
+                                    }
+                                    Some(sig_token) => sig_token,
+                                };
+                                single_signature_token_map
+                                    .insert(*si, cache.make_type(module_view, ty)?);
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+
+        for func_inst in module.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        for f_handle in module.field_handles() {
+            let def_idx = f_handle.owner;
+            let owner = structs[def_idx.0 as usize].idx;
+            let offset = f_handle.field as usize;
+            field_handles.push(FieldHandle { offset, owner });
+        }
+
+        for f_inst in module.field_instantiations() {
+            let fh_idx = f_inst.handle;
+            let owner = field_handles[fh_idx.0 as usize].owner;
+            let offset = field_handles[fh_idx.0 as usize].offset;
+            let mut instantiation = vec![];
+            for ty in &module.signature_at(f_inst.type_parameters).0 {
+                instantiation.push(cache.make_type(module_view, ty)?);
+            }
+            field_instantiations.push(FieldInstantiation {
+                offset,
+                owner,
+                instantiation,
+            });
+        }
+
+        Ok(Self {
+            id: storage_id,
+            struct_refs,
+            structs,
+            struct_instantiations,
+            function_refs,
+            function_instantiations,
+            field_handles,
+            field_instantiations,
+            function_map,
+            single_signature_token_map,
+        })
+    }
+
+    fn struct_at(&self, idx: StructDefinitionIndex) -> CachedStructIndex {
+        self.structs[idx.0 as usize].idx
+    }
+
+    fn struct_instantiation_at(&self, idx: u16) -> &StructInstantiation {
+        &self.struct_instantiations[idx as usize]
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn field_count(&self, idx: u16) -> u16 {
+        self.structs[idx as usize].field_count
+    }
+
+    fn field_instantiation_count(&self, idx: u16) -> u16 {
+        self.struct_instantiations[idx as usize].field_count
+    }
+
+    fn field_offset(&self, idx: FieldHandleIndex) -> usize {
+        self.field_handles[idx.0 as usize].offset
+    }
+
+    fn field_instantiation_offset(&self, idx: FieldInstantiationIndex) -> usize {
+        self.field_instantiations[idx.0 as usize].offset
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+/// A `LoadedScript` is very similar to a `CompiledScript` but data is "transformed" to a
+/// representation more appropriate to execution.
+/// When code executes, indexes in instructions are resolved against runtime structures
+/// (rather then "compiled") to make available data needed for execution
+/// #[derive(Debug)]
+struct LoadedScript {
+    // primitive pools
+    script: CompiledScript,
+
+    // types as indexes into the Loader type list
+    // REVIEW: why is this unused?
+    #[allow(dead_code)]
+    struct_refs: Vec<CachedStructIndex>,
+
+    // functions as indexes into the Loader function list
+    function_refs: Vec<usize>,
+    // materialized instantiations, whether partial or not
+    function_instantiations: Vec<FunctionInstantiation>,
+
+    // entry point
+    main: Arc<Function>,
+
+    // parameters of main
+    parameter_tys: Vec<Type>,
+
+    // return values
+    return_tys: Vec<Type>,
+
+    // a map of single-token signature indices to type
+    single_signature_token_map: BTreeMap<SignatureIndex, Type>,
+}
+
+impl LoadedScript {
+    fn new(
+        script: CompiledScript,
+        link_context: AccountAddress,
+        script_hash: &ScriptHash,
+        cache: &ModuleCache,
+    ) -> VMResult<Self> {
+        let script_view = BinaryIndexedView::Script(&script);
+        let mut struct_refs = vec![];
+        for struct_handle in script.struct_handles() {
+            let struct_name = script.identifier_at(struct_handle.name);
+            let module_handle = script.module_handle_at(struct_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            struct_refs.push(
+                cache
+                    .resolve_struct_by_name(struct_name, &module_id)
+                    .map_err(|e| e.finish(Location::Script))?
+                    .0,
+            );
+        }
+
+        let mut function_refs = vec![];
+        for func_handle in script.function_handles().iter() {
+            let func_name = script.identifier_at(func_handle.name);
+            let module_handle = script.module_handle_at(func_handle.module);
+            let module_id = ModuleId::new(
+                *script.address_identifier_at(module_handle.address),
+                script.identifier_at(module_handle.name).to_owned(),
+            );
+            let ref_idx = cache
+                .resolve_function_by_name(func_name, &module_id, link_context)
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function_refs.push(ref_idx);
+        }
+
+        let mut function_instantiations = vec![];
+        for func_inst in script.function_instantiations() {
+            let handle = function_refs[func_inst.handle.0 as usize];
+            let mut instantiation = vec![];
+            for ty in &script.signature_at(func_inst.type_parameters).0 {
+                instantiation.push(
+                    cache
+                        .make_type(script_view, ty)
+                        .map_err(|e| e.finish(Location::Script))?,
+                );
+            }
+            function_instantiations.push(FunctionInstantiation {
+                handle,
+                instantiation,
+            });
+        }
+
+        let scope = Scope::Script(*script_hash);
+
+        let code: Vec<Bytecode> = script.code.code.clone();
+        let parameters = script.signature_at(script.parameters).clone();
+
+        let parameter_tys = parameters
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let locals = Signature(
+            parameters
+                .0
+                .iter()
+                .chain(script.signature_at(script.code.locals).0.iter())
+                .cloned()
+                .collect(),
+        );
+        let local_tys = locals
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let return_ = Signature(vec![]);
+        let return_tys = return_
+            .0
+            .iter()
+            .map(|tok| cache.make_type(script_view, tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let type_parameters = script.type_parameters.clone();
+        // TODO: main does not have a name. Revisit.
+        let name = Identifier::new("main").unwrap();
+        let (native, def_is_native) = (None, false); // Script entries cannot be native
+        let main: Arc<Function> = Arc::new(Function {
+            file_format_version: script.version(),
+            index: FunctionDefinitionIndex(0),
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private: false,
+            scope,
+            name,
+            return_types: return_tys.clone(),
+            local_types: local_tys,
+            parameter_types: parameter_tys.clone(),
+        });
+
+        let mut single_signature_token_map = BTreeMap::new();
+        for bc in &script.code.code {
+            match bc {
+                Bytecode::VecPack(si, _)
+                | Bytecode::VecLen(si)
+                | Bytecode::VecImmBorrow(si)
+                | Bytecode::VecMutBorrow(si)
+                | Bytecode::VecPushBack(si)
+                | Bytecode::VecPopBack(si)
+                | Bytecode::VecUnpack(si, _)
+                | Bytecode::VecSwap(si) => {
+                    if !single_signature_token_map.contains_key(si) {
+                        let ty = match script.signature_at(*si).0.get(0) {
+                            None => {
+                                return Err(PartialVMError::new(
+                                    StatusCode::VERIFIER_INVARIANT_VIOLATION,
+                                )
+                                .with_message(
+                                    "the type argument for vector-related bytecode \
+                                                expects one and only one signature token"
+                                        .to_owned(),
+                                )
+                                .finish(Location::Script));
+                            }
+                            Some(sig_token) => sig_token,
+                        };
+                        single_signature_token_map.insert(
+                            *si,
+                            cache
+                                .make_type(script_view, ty)
+                                .map_err(|e| e.finish(Location::Script))?,
+                        );
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        Ok(Self {
+            script,
+            struct_refs,
+            function_refs,
+            function_instantiations,
+            main,
+            parameter_tys,
+            return_tys,
+            single_signature_token_map,
+        })
+    }
+
+    fn entry_point(&self) -> Arc<Function> {
+        self.main.clone()
+    }
+
+    fn function_at(&self, idx: u16) -> usize {
+        self.function_refs[idx as usize]
+    }
+
+    fn function_instantiation_at(&self, idx: u16) -> &FunctionInstantiation {
+        &self.function_instantiations[idx as usize]
+    }
+
+    fn single_type_at(&self, idx: SignatureIndex) -> &Type {
+        self.single_signature_token_map.get(&idx).unwrap()
+    }
+}
+
+// A simple wrapper for the "owner" of the function (Module or Script)
+#[derive(Debug)]
+enum Scope {
+    Module(ModuleId),
+    Script(ScriptHash),
+}
+
+// A runtime function
+// #[derive(Debug)]
+// https://github.com/rust-lang/rust/issues/70263
+pub(crate) struct Function {
+    #[allow(unused)]
+    file_format_version: u32,
+    index: FunctionDefinitionIndex,
+    code: Vec<Bytecode>,
+    parameters: Signature,
+    return_: Signature,
+    locals: Signature,
+    type_parameters: Vec<AbilitySet>,
+    native: Option<NativeFunction>,
+    def_is_native: bool,
+    def_is_friend_or_private: bool,
+    scope: Scope,
+    name: Identifier,
+    return_types: Vec<Type>,
+    local_types: Vec<Type>,
+    parameter_types: Vec<Type>,
+}
+
+impl Function {
+    fn new(
+        natives: &NativeFunctions,
+        index: FunctionDefinitionIndex,
+        def: &FunctionDefinition,
+        module: &CompiledModule,
+    ) -> Self {
+        let handle = module.function_handle_at(def.function);
+        let name = module.identifier_at(handle.name).to_owned();
+        let module_id = module.self_id();
+        let def_is_friend_or_private = match def.visibility {
+            Visibility::Friend | Visibility::Private => true,
+            Visibility::Public => false,
+        };
+        let (native, def_is_native) = if def.is_native() {
+            (
+                natives.resolve(
+                    module_id.address(),
+                    module_id.name().as_str(),
+                    name.as_str(),
+                ),
+                true,
+            )
+        } else {
+            (None, false)
+        };
+        let scope = Scope::Module(module_id);
+        let parameters = module.signature_at(handle.parameters).clone();
+        // Native functions do not have a code unit
+        let (code, locals) = match &def.code {
+            Some(code) => (
+                code.code.clone(),
+                Signature(
+                    parameters
+                        .0
+                        .iter()
+                        .chain(module.signature_at(code.locals).0.iter())
+                        .cloned()
+                        .collect(),
+                ),
+            ),
+            None => (vec![], Signature(vec![])),
+        };
+        let return_ = module.signature_at(handle.return_).clone();
+        let type_parameters = handle.type_parameters.clone();
+        Self {
+            file_format_version: module.version(),
+            index,
+            code,
+            parameters,
+            return_,
+            locals,
+            type_parameters,
+            native,
+            def_is_native,
+            def_is_friend_or_private,
+            scope,
+            name,
+            local_types: vec![],
+            return_types: vec![],
+            parameter_types: vec![],
+        }
+    }
+
+    #[allow(unused)]
+    pub(crate) fn file_format_version(&self) -> u32 {
+        self.file_format_version
+    }
+
+    pub(crate) fn module_id(&self) -> Option<&ModuleId> {
+        match &self.scope {
+            Scope::Module(module_id) => Some(module_id),
+            Scope::Script(_) => None,
+        }
+    }
+
+    pub(crate) fn index(&self) -> FunctionDefinitionIndex {
+        self.index
+    }
+
+    pub(crate) fn get_resolver<'a>(
+        &self,
+        link_context: AccountAddress,
+        loader: &'a Loader,
+    ) -> Resolver<'a> {
+        match &self.scope {
+            Scope::Module(module_id) => {
+                let (compiled, loaded) = loader.get_module(link_context, module_id);
+                Resolver::for_module(loader, compiled, loaded)
+            }
+            Scope::Script(script_hash) => {
+                let script = loader.get_script(script_hash);
+                Resolver::for_script(loader, script)
+            }
+        }
+    }
+
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn arg_count(&self) -> usize {
+        self.parameters.len()
+    }
+
+    pub(crate) fn return_type_count(&self) -> usize {
+        self.return_.len()
+    }
+
+    pub(crate) fn name(&self) -> &str {
+        self.name.as_str()
+    }
+
+    pub(crate) fn code(&self) -> &[Bytecode] {
+        &self.code
+    }
+
+    pub(crate) fn type_parameters(&self) -> &[AbilitySet] {
+        &self.type_parameters
+    }
+
+    pub(crate) fn local_types(&self) -> &[Type] {
+        &self.local_types
+    }
+
+    pub(crate) fn return_types(&self) -> &[Type] {
+        &self.return_types
+    }
+
+    pub(crate) fn parameter_types(&self) -> &[Type] {
+        &self.parameter_types
+    }
+
+    pub(crate) fn pretty_string(&self) -> String {
+        match &self.scope {
+            Scope::Script(_) => "Script::main".into(),
+            Scope::Module(id) => format!(
+                "0x{}::{}::{}",
+                id.address(),
+                id.name().as_str(),
+                self.name.as_str()
+            ),
+        }
+    }
+
+    pub(crate) fn is_native(&self) -> bool {
+        self.def_is_native
+    }
+
+    pub(crate) fn is_friend_or_private(&self) -> bool {
+        self.def_is_friend_or_private
+    }
+
+    pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        if cfg!(feature = "lazy_natives") {
+            // If lazy_natives is configured, this is a MISSING_DEPENDENCY error, as we skip
+            // checking those at module loading time.
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!("Missing Native Function `{}`", self.name))
+            })
+        } else {
+            // Otherwise this error should not happen, hence UNREACHABLE
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNREACHABLE)
+                    .with_message("Missing Native Function".to_string())
+            })
+        }
+    }
+}
+
+//
+// Internal structures that are saved at the proper index in the proper tables to access
+// execution information (interpreter).
+// The following structs are internal to the loader and never exposed out.
+// The `Loader` will create those struct and the proper table when loading a module.
+// The `Resolver` uses those structs to return information to the `Interpreter`.
+//
+
+// A function instantiation.
+#[derive(Debug)]
+struct FunctionInstantiation {
+    // index to `ModuleCache::functions` global table
+    handle: usize,
+    instantiation: Vec<Type>,
+}
+
+#[derive(Debug)]
+struct StructDef {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index
+    idx: CachedStructIndex,
+}
+
+#[derive(Debug)]
+struct StructInstantiation {
+    // struct field count
+    field_count: u16,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    def: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+// A field handle. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldHandle {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    owner: CachedStructIndex,
+}
+
+// A field instantiation. The offset is the only used information when operating on a field
+#[derive(Debug)]
+struct FieldInstantiation {
+    offset: usize,
+    // `ModuelCache::structs` global table index. It is the generic type.
+    #[allow(unused)]
+    owner: CachedStructIndex,
+    instantiation: Vec<Type>,
+}
+
+//
+// Cache for data associated to a Struct, used for de/serialization and more
+//
+
+struct StructInfo {
+    runtime_struct_tag: Option<StructTag>,
+    defining_struct_tag: Option<StructTag>,
+    struct_layout: Option<R::MoveStructLayout>,
+    annotated_struct_layout: Option<A::MoveStructLayout>,
+    node_count: Option<u64>,
+    annotated_node_count: Option<u64>,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq)]
+enum StructTagType {
+    Runtime,
+    Defining,
+}
+
+impl StructInfo {
+    fn new() -> Self {
+        Self {
+            runtime_struct_tag: None,
+            defining_struct_tag: None,
+            struct_layout: None,
+            annotated_struct_layout: None,
+            node_count: None,
+            annotated_node_count: None,
+        }
+    }
+}
+
+pub(crate) struct TypeCache {
+    structs: HashMap<CachedStructIndex, HashMap<Vec<Type>, StructInfo>>,
+}
+
+impl TypeCache {
+    fn new() -> Self {
+        Self {
+            structs: HashMap::new(),
+        }
+    }
+}
+
+/// Maximal depth of a value in terms of type depth.
+pub const VALUE_DEPTH_MAX: u64 = 128;
+
+/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// fields for struct types.
+const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
+
+/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
+/// field types of structs.
+const MAX_TYPE_INSTANTIATION_NODES: u64 = 128;
+
+impl Loader {
+    fn read_cached_struct_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> Option<StructTag> {
+        let cache = self.type_cache.read();
+        let map = cache.structs.get(&gidx)?;
+        let info = map.get(ty_args)?;
+
+        match tag_type {
+            StructTagType::Runtime => info.runtime_struct_tag.clone(),
+            StructTagType::Defining => info.defining_struct_tag.clone(),
+        }
+    }
+
+    fn struct_gidx_to_type_tag(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        tag_type: StructTagType,
+    ) -> PartialVMResult<StructTag> {
+        if let Some(cached) = self.read_cached_struct_tag(gidx, ty_args, tag_type) {
+            return Ok(cached);
+        }
+
+        let ty_arg_tags = ty_args
+            .iter()
+            .map(|ty| self.type_to_type_tag_impl(ty, tag_type))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+
+        match tag_type {
+            StructTagType::Runtime => {
+                let tag = StructTag {
+                    address: *struct_type.runtime_id.address(),
+                    module: struct_type.runtime_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.runtime_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+
+            StructTagType::Defining => {
+                let tag = StructTag {
+                    address: *struct_type.defining_id.address(),
+                    module: struct_type.defining_id.name().to_owned(),
+                    name: struct_type.name.clone(),
+                    type_params: ty_arg_tags,
+                };
+
+                info.defining_struct_tag = Some(tag.clone());
+                Ok(tag)
+            }
+        }
+    }
+
+    fn type_to_type_tag_impl(
+        &self,
+        ty: &Type,
+        tag_type: StructTagType,
+    ) -> PartialVMResult<TypeTag> {
+        Ok(match ty {
+            Type::Bool => TypeTag::Bool,
+            Type::U8 => TypeTag::U8,
+            Type::U16 => TypeTag::U16,
+            Type::U32 => TypeTag::U32,
+            Type::U64 => TypeTag::U64,
+            Type::U128 => TypeTag::U128,
+            Type::U256 => TypeTag::U256,
+            Type::Address => TypeTag::Address,
+            Type::Signer => TypeTag::Signer,
+            Type::Vector(ty) => {
+                TypeTag::Vector(Box::new(self.type_to_type_tag_impl(ty, tag_type)?))
+            }
+            Type::Struct(gidx) => TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(
+                *gidx,
+                &[],
+                tag_type,
+            )?)),
+            Type::StructInstantiation(gidx, ty_args) => TypeTag::Struct(Box::new(
+                self.struct_gidx_to_type_tag(*gidx, ty_args, tag_type)?,
+            )),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type tag for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn count_type_nodes(&self, ty: &Type) -> u64 {
+        let mut todo = vec![ty];
+        let mut result = 0;
+        while let Some(ty) = todo.pop() {
+            match ty {
+                Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                    result += 1;
+                    todo.push(ty);
+                }
+                Type::StructInstantiation(_, ty_args) => {
+                    result += 1;
+                    todo.extend(ty_args.iter())
+                }
+                _ => {
+                    result += 1;
+                }
+            }
+        }
+        result
+    }
+
+    fn struct_gidx_to_type_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(node_count) = &struct_info.node_count {
+                    *count += *node_count
+                }
+                if let Some(layout) = &struct_info.struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let count_before = *count;
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        let field_tys = struct_type
+            .fields
+            .iter()
+            .map(|ty| self.subst(ty, ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_layouts = field_tys
+            .iter()
+            .map(|ty| self.type_to_type_layout_impl(ty, count, depth + 1))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_node_count = *count - count_before;
+
+        let struct_layout = R::MoveStructLayout::new(field_layouts);
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.struct_layout = Some(struct_layout.clone());
+        info.node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_type_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<R::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => R::MoveTypeLayout::Bool,
+            Type::U8 => R::MoveTypeLayout::U8,
+            Type::U16 => R::MoveTypeLayout::U16,
+            Type::U32 => R::MoveTypeLayout::U32,
+            Type::U64 => R::MoveTypeLayout::U64,
+            Type::U128 => R::MoveTypeLayout::U128,
+            Type::U256 => R::MoveTypeLayout::U256,
+            Type::Address => R::MoveTypeLayout::Address,
+            Type::Signer => R::MoveTypeLayout::Signer,
+            Type::Vector(ty) => R::MoveTypeLayout::Vector(Box::new(
+                self.type_to_type_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => R::MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(
+                *gidx,
+                &[],
+                count,
+                depth,
+            )?),
+            Type::StructInstantiation(gidx, ty_args) => R::MoveTypeLayout::Struct(
+                self.struct_gidx_to_type_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    fn struct_gidx_to_fully_annotated_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(annotated_node_count) = &struct_info.annotated_node_count {
+                    *count += *annotated_node_count
+                }
+                if let Some(layout) = &struct_info.annotated_struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        if struct_type.fields.len() != struct_type.field_names.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Field types did not match the length of field names in loaded struct"
+                        .to_owned(),
+                ),
+            );
+        }
+        let count_before = *count;
+        let struct_tag = self.struct_gidx_to_type_tag(gidx, ty_args, StructTagType::Defining)?;
+        let field_layouts = struct_type
+            .field_names
+            .iter()
+            .zip(&struct_type.fields)
+            .map(|(n, ty)| {
+                let ty = self.subst(ty, ty_args)?;
+                let l = self.type_to_fully_annotated_layout_impl(&ty, count, depth + 1)?;
+                Ok(A::MoveFieldLayout::new(n.clone(), l))
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_layout = A::MoveStructLayout::new(struct_tag, field_layouts);
+        let field_node_count = *count - count_before;
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_default()
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.annotated_struct_layout = Some(struct_layout.clone());
+        info.annotated_node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_fully_annotated_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        *count += 1;
+        Ok(match ty {
+            Type::Bool => A::MoveTypeLayout::Bool,
+            Type::U8 => A::MoveTypeLayout::U8,
+            Type::U16 => A::MoveTypeLayout::U16,
+            Type::U32 => A::MoveTypeLayout::U32,
+            Type::U64 => A::MoveTypeLayout::U64,
+            Type::U128 => A::MoveTypeLayout::U128,
+            Type::U256 => A::MoveTypeLayout::U256,
+            Type::Address => A::MoveTypeLayout::Address,
+            Type::Signer => A::MoveTypeLayout::Signer,
+            Type::Vector(ty) => A::MoveTypeLayout::Vector(Box::new(
+                self.type_to_fully_annotated_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, &[], count, depth)?,
+            ),
+            Type::StructInstantiation(gidx, ty_args) => A::MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
+            }
+        })
+    }
+
+    pub(crate) fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Defining)
+    }
+
+    pub(crate) fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.type_to_type_tag_impl(ty, StructTagType::Runtime)
+    }
+
+    pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<R::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_type_layout_impl(ty, &mut count, 1)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<A::MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_fully_annotated_layout_impl(ty, &mut count, 1)
+    }
+}
+
+// Public APIs for external uses.
+impl Loader {
+    pub(crate) fn get_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<R::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_type_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub(crate) fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<A::MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_fully_annotated_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/logging.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/logging.rs
new file mode 100644
index 000000000..0359b7388
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/logging.rs
@@ -0,0 +1,44 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::{PartialVMError, VMError};
+use move_core_types::vm_status::{StatusCode, StatusType};
+use tracing::error;
+//
+// Utility functions
+//
+
+pub fn expect_no_verification_errors(err: VMError) -> VMError {
+    match err.status_type() {
+        status_type @ StatusType::Deserialization | status_type @ StatusType::Verification => {
+            let message = format!(
+                "Unexpected verifier/deserialization error! This likely means there is code \
+                stored on chain that is unverifiable!\nError: {:?}",
+                &err
+            );
+            let (
+                _old_status,
+                _old_sub_status,
+                _old_message,
+                _stacktrace,
+                location,
+                indices,
+                offsets,
+            ) = err.all_data();
+            let major_status = match status_type {
+                StatusType::Deserialization => StatusCode::UNEXPECTED_DESERIALIZATION_ERROR,
+                StatusType::Verification => StatusCode::UNEXPECTED_VERIFIER_ERROR,
+                _ => unreachable!(),
+            };
+
+            error!("[VM] {}", message);
+            PartialVMError::new(major_status)
+                .with_message(message)
+                .at_indices(indices)
+                .at_code_offsets(offsets)
+                .finish(location)
+        }
+        _ => err,
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs
new file mode 100644
index 000000000..1fb027bc2
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs
@@ -0,0 +1,108 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    native_functions::NativeFunction, runtime::VMRuntime, session::Session,
+};
+use move_binary_format::{
+    errors::{Location, VMResult},
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
+    metadata::Metadata, resolver::MoveResolver,
+};
+use move_vm_config::runtime::VMConfig;
+
+pub struct MoveVM {
+    runtime: VMRuntime,
+}
+
+impl MoveVM {
+    pub fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    ) -> VMResult<Self> {
+        Self::new_with_config(natives, VMConfig::default())
+    }
+
+    pub fn new_with_config(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> VMResult<Self> {
+        Ok(Self {
+            runtime: VMRuntime::new(natives, vm_config)
+                .map_err(|err| err.finish(Location::Undefined))?,
+        })
+    }
+
+    pub fn config(&self) -> &VMConfig {
+        self.runtime.loader().vm_config()
+    }
+
+    /// Create a new Session backed by the given storage.
+    ///
+    /// Right now it is the caller's responsibility to ensure cache coherence of the Move VM Loader
+    ///   - When a module gets published in a Move VM Session, and then gets used by another
+    ///     transaction, it will be loaded into the code cache and stay there even if the resulted
+    ///     effects do not get committed back to the storage when the Session ends.
+    ///   - As a result, if one wants to have multiple sessions at a time, one needs to make sure
+    ///     none of them will try to publish a module. In other words, if there is a module publishing
+    ///     Session it must be the only Session existing.
+    ///   - In general, a new Move VM needs to be created whenever the storage gets modified by an
+    ///     outer envrionment, or otherwise the states may be out of sync. There are a few exceptional
+    ///     cases where this may not be necessary, with the most notable one being the common module
+    ///     publishing flow: you can keep using the same Move VM if you publish some modules in a Session
+    ///     and apply the effects to the storage when the Session ends.
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.runtime.new_session(remote)
+    }
+
+    /// Create a new session, as in `new_session`, but provide native context extensions.
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        self.runtime.new_session_with_extensions(remote, extensions)
+    }
+
+    /// Load a module into VM's code cache
+    pub fn load_module<S: MoveResolver>(
+        &self,
+        module_id: &ModuleId,
+        remote: S,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.runtime
+            .loader()
+            .load_module(
+                module_id,
+                &TransactionDataCache::new(remote, self.runtime.loader()),
+            )
+            .map(|(compiled, _)| compiled)
+    }
+
+    /// Attempts to discover metadata in a given module with given key. Availability
+    /// of this data may depend on multiple aspects. In general, no hard assumptions of
+    /// availability should be made, but typically, one can expect that
+    /// the modules which have been involved in the execution of the last session are available.
+    ///
+    /// This is called by an adapter to extract, for example, debug information out of
+    /// the metadata section of the code for post mortem analysis. Notice that because
+    /// of ownership of the underlying binary representation of modules hidden behind an rwlock,
+    /// this actually has to hand back a copy of the associated metadata, so metadata should
+    /// be organized keeping this in mind.
+    ///
+    /// TODO: in the new loader architecture, as the loader is visible to the adapter, one would
+    ///   call this directly via the loader instead of the VM.
+    pub fn get_module_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        self.runtime.loader().get_metadata(module, key)
+    }
+
+    pub fn get_runtime(&self) -> &VMRuntime {
+        &self.runtime
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_extensions.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_extensions.rs
new file mode 100644
index 000000000..e75c50c8d
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_extensions.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use better_any::{Tid, TidAble, TidExt};
+use std::{any::TypeId, collections::HashMap};
+
+/// A data type to represent a heterogeneous collection of extensions which are available to
+/// native functions. A value to this is passed into the session function execution.
+///
+/// The implementation uses the crate `better_any` which implements a version of the `Any`
+/// type, called `Tid<`a>`, which allows for up to one lifetime parameter. This
+/// avoids that extensions need to have `'static` lifetime, which `Any` requires. In order to make a
+/// struct suitable to be a 'Tid', use `#[derive(Tid)]` in the struct declaration. (See also
+/// tests at the end of this module.)
+#[derive(Default)]
+pub struct NativeContextExtensions<'a> {
+    map: HashMap<TypeId, Box<dyn Tid<'a>>>,
+}
+
+impl<'a> NativeContextExtensions<'a> {
+    pub fn add<T: TidAble<'a>>(&mut self, ext: T) {
+        assert!(
+            self.map.insert(T::id(), Box::new(ext)).is_none(),
+            "multiple extensions of the same type not allowed"
+        )
+    }
+
+    pub fn get<T: TidAble<'a>>(&self) -> &T {
+        self.map
+            .get(&T::id())
+            .expect("extension unknown")
+            .as_ref()
+            .downcast_ref::<T>()
+            .unwrap()
+    }
+
+    pub fn get_mut<T: TidAble<'a>>(&mut self) -> &mut T {
+        self.map
+            .get_mut(&T::id())
+            .expect("extension unknown")
+            .as_mut()
+            .downcast_mut::<T>()
+            .unwrap()
+    }
+
+    pub fn remove<T: TidAble<'a>>(&mut self) -> T {
+        // can't use expect below because it requires `T: Debug`.
+        match self
+            .map
+            .remove(&T::id())
+            .expect("extension unknown")
+            .downcast_box::<T>()
+        {
+            Ok(val) => *val,
+            Err(_) => panic!("downcast error"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::native_extensions::NativeContextExtensions;
+    use better_any::{Tid, TidAble};
+
+    #[derive(Tid)]
+    struct Ext<'a> {
+        a: &'a mut u64,
+    }
+
+    #[test]
+    fn non_static_ext() {
+        let mut v: u64 = 23;
+        let e = Ext { a: &mut v };
+        let mut exts = NativeContextExtensions::default();
+        exts.add(e);
+        *exts.get_mut::<Ext>().a += 1;
+        assert_eq!(*exts.get_mut::<Ext>().a, 24);
+        *exts.get_mut::<Ext>().a += 1;
+        let e1 = exts.remove::<Ext>();
+        assert_eq!(*e1.a, 25)
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs
new file mode 100644
index 000000000..c6406ae04
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs
@@ -0,0 +1,237 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    interpreter::Interpreter, loader::Resolver, native_extensions::NativeContextExtensions,
+};
+use move_binary_format::errors::{ExecutionState, PartialVMError, PartialVMResult};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    gas_algebra::InternalGas,
+    identifier::Identifier,
+    language_storage::TypeTag,
+    runtime_value as R,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_config::runtime::VMRuntimeLimitsConfig;
+use move_vm_types::{
+    data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult,
+    values::Value,
+};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, VecDeque},
+    fmt::Write,
+    sync::Arc,
+};
+
+pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>
+    + Send
+    + Sync
+    + 'static;
+
+pub type NativeFunction = Arc<UnboxedNativeFunction>;
+
+pub type NativeFunctionTable = Vec<(AccountAddress, Identifier, Identifier, NativeFunction)>;
+
+pub fn make_table(
+    addr: AccountAddress,
+    elems: &[(&str, &str, NativeFunction)],
+) -> NativeFunctionTable {
+    make_table_from_iter(addr, elems.iter().cloned())
+}
+
+pub fn make_table_from_iter<S: Into<Box<str>>>(
+    addr: AccountAddress,
+    elems: impl IntoIterator<Item = (S, S, NativeFunction)>,
+) -> NativeFunctionTable {
+    elems
+        .into_iter()
+        .map(|(module_name, func_name, func)| {
+            (
+                addr,
+                Identifier::new(module_name).unwrap(),
+                Identifier::new(func_name).unwrap(),
+                func,
+            )
+        })
+        .collect()
+}
+
+pub(crate) struct NativeFunctions(
+    HashMap<AccountAddress, HashMap<String, HashMap<String, NativeFunction>>>,
+);
+
+impl NativeFunctions {
+    pub fn resolve(
+        &self,
+        addr: &AccountAddress,
+        module_name: &str,
+        func_name: &str,
+    ) -> Option<NativeFunction> {
+        self.0.get(addr)?.get(module_name)?.get(func_name).cloned()
+    }
+
+    pub fn new<I>(natives: I) -> PartialVMResult<Self>
+    where
+        I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    {
+        let mut map = HashMap::new();
+        for (addr, module_name, func_name, func) in natives.into_iter() {
+            let modules = map.entry(addr).or_insert_with(HashMap::new);
+            let funcs = modules
+                .entry(module_name.into_string())
+                .or_insert_with(HashMap::new);
+
+            if funcs.insert(func_name.into_string(), func).is_some() {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_NATIVE_FUNCTION));
+            }
+        }
+        Ok(Self(map))
+    }
+}
+
+pub struct NativeContext<'a, 'b> {
+    interpreter: &'a mut Interpreter,
+    data_store: &'a mut dyn DataStore,
+    resolver: &'a Resolver<'a>,
+    extensions: &'a mut NativeContextExtensions<'b>,
+    gas_left: RefCell<InternalGas>,
+    gas_budget: InternalGas,
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub(crate) fn new(
+        interpreter: &'a mut Interpreter,
+        data_store: &'a mut dyn DataStore,
+        resolver: &'a Resolver<'a>,
+        extensions: &'a mut NativeContextExtensions<'b>,
+        gas_budget: InternalGas,
+    ) -> Self {
+        Self {
+            interpreter,
+            data_store,
+            resolver,
+            extensions,
+            gas_left: RefCell::new(gas_budget),
+            gas_budget,
+        }
+    }
+
+    /// Limits imposed at runtime
+    pub fn runtime_limits_config(&self) -> &VMRuntimeLimitsConfig {
+        self.interpreter.runtime_limits_config()
+    }
+}
+
+impl<'a, 'b> NativeContext<'a, 'b> {
+    pub fn print_stack_trace<B: Write>(&self, buf: &mut B) -> PartialVMResult<()> {
+        self.interpreter
+            .debug_print_stack_trace(buf, self.resolver.loader())
+    }
+
+    pub fn save_event(
+        &mut self,
+        guid: Vec<u8>,
+        seq_num: u64,
+        ty: Type,
+        val: Value,
+    ) -> PartialVMResult<bool> {
+        match self.data_store.emit_event(guid, seq_num, ty, val) {
+            Ok(()) => Ok(true),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(false),
+        }
+    }
+
+    pub fn events(&self) -> &Vec<(Vec<u8>, u64, Type, R::MoveTypeLayout, Value)> {
+        self.data_store.events()
+    }
+
+    pub fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_type_tag(ty)
+    }
+
+    pub fn type_to_runtime_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
+        self.resolver.loader().type_to_runtime_type_tag(ty)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<Option<R::MoveTypeLayout>> {
+        match self.resolver.type_to_type_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<Option<A::MoveTypeLayout>> {
+        match self.resolver.type_to_fully_annotated_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
+    pub fn extensions(&self) -> &NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    pub fn extensions_mut(&mut self) -> &mut NativeContextExtensions<'b> {
+        self.extensions
+    }
+
+    /// Get count stack frames, including the one of the called native function. This
+    /// allows a native function to reflect about its caller.
+    pub fn stack_frames(&self, count: usize) -> ExecutionState {
+        self.interpreter.get_stack_frames(count)
+    }
+
+    pub fn charge_gas(&self, amount: InternalGas) -> bool {
+        let mut gas_left = self.gas_left.borrow_mut();
+
+        match gas_left.checked_sub(amount) {
+            Some(x) => {
+                *gas_left = x;
+                true
+            }
+            None => false,
+        }
+    }
+
+    pub fn gas_budget(&self) -> InternalGas {
+        self.gas_budget
+    }
+
+    pub fn gas_used(&self) -> InternalGas {
+        self.gas_budget.saturating_sub(*self.gas_left.borrow())
+    }
+}
+
+/// Charge gas during a native call. If the charging fails, return early
+#[macro_export]
+macro_rules! native_charge_gas_early_exit {
+    ($native_context:ident, $cost:expr) => {{
+        use move_core_types::vm_status::sub_status::NFE_OUT_OF_GAS;
+        if !$native_context.charge_gas($cost) {
+            // Exhausted all in budget. terminate early
+            return Ok(NativeResult::err(
+                $native_context.gas_budget(),
+                NFE_OUT_OF_GAS,
+            ));
+        }
+    }};
+}
+
+/// Total cost of a native call so far
+#[macro_export]
+macro_rules! native_gas_total_cost {
+    ($native_context:ident, $gas_left:ident) => {{
+        // Its okay to unwrap because the budget can never be less than the gas left
+        $native_context.gas_budget().checked_sub($gas_left).unwrap()
+    }};
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs
new file mode 100644
index 000000000..5fb3d3445
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs
@@ -0,0 +1,580 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache,
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+    native_extensions::NativeContextExtensions,
+    native_functions::{NativeFunction, NativeFunctions},
+    session::{LoadedFunctionInstantiation, SerializedReturnValues, Session},
+};
+use move_binary_format::{
+    access::ModuleAccess,
+    errors::{verification_error, Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{AbilitySet, LocalIndex},
+    CompiledModule, IndexKind,
+};
+use move_bytecode_verifier::script_signature;
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+    vm_status::StatusCode,
+};
+use move_vm_config::runtime::VMConfig;
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+    values::{Locals, Reference, VMValueCast, Value},
+};
+use std::{borrow::Borrow, collections::BTreeSet, sync::Arc};
+use tracing::warn;
+
+/// An instantiation of the MoveVM.
+pub struct VMRuntime {
+    loader: Loader,
+}
+
+impl VMRuntime {
+    pub(crate) fn new(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
+    ) -> PartialVMResult<Self> {
+        Ok(VMRuntime {
+            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
+        })
+    }
+
+    pub fn new_session<'r, S: MoveResolver>(&self, remote: S) -> Session<'r, '_, S> {
+        self.new_session_with_extensions(remote, NativeContextExtensions::default())
+    }
+
+    pub fn new_session_with_extensions<'r, S: MoveResolver>(
+        &self,
+        remote: S,
+        native_extensions: NativeContextExtensions<'r>,
+    ) -> Session<'r, '_, S> {
+        Session {
+            runtime: self,
+            data_cache: TransactionDataCache::new(remote, &self.loader),
+            native_extensions,
+        }
+    }
+
+    pub fn publish_module_bundle(
+        &self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        data_store: &mut impl DataStore,
+        _gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        // deserialize the modules. Perform bounds check. After this indexes can be
+        // used with the `[]` operator
+        let compiled_modules = match modules
+            .iter()
+            .map(|blob| {
+                CompiledModule::deserialize_with_config(
+                    blob,
+                    self.loader.vm_config().max_binary_format_version,
+                    self.loader
+                        .vm_config()
+                        .check_no_extraneous_bytes_during_deserialization,
+                )
+            })
+            .collect::<PartialVMResult<Vec<_>>>()
+        {
+            Ok(modules) => modules,
+            Err(err) => {
+                warn!("[VM] module deserialization failed {:?}", err);
+                return Err(err.finish(Location::Undefined));
+            }
+        };
+
+        // Make sure all modules' self addresses matches the transaction sender. The self address is
+        // where the module will actually be published. If we did not check this, the sender could
+        // publish a module under anyone's account.
+        for module in &compiled_modules {
+            if module.address() != &sender {
+                return Err(verification_error(
+                    StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER,
+                    IndexKind::AddressIdentifier,
+                    module.self_handle_idx().0,
+                )
+                .finish(Location::Undefined));
+            }
+        }
+
+        // Collect ids for modules that are published together
+        let mut bundle_unverified = BTreeSet::new();
+        for module in &compiled_modules {
+            if !bundle_unverified.insert(module.self_id()) {
+                return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
+                    .finish(Location::Undefined));
+            }
+        }
+
+        // Perform bytecode and loading verification. Modules must be sorted in topological order.
+        self.loader
+            .verify_module_bundle_for_publication(&compiled_modules, data_store)?;
+
+        // NOTE: we want to (informally) argue that all modules pass the linking check before being
+        // published to the data store.
+        //
+        // The linking check consists of two checks actually
+        // - dependencies::verify_module(module, all_imm_deps)
+        // - cyclic_dependencies::verify_module(module, fn_imm_deps, fn_imm_friends)
+        //
+        // [Claim 1]
+        // We show that the `dependencies::verify_module` check is always satisfied whenever a
+        // module M is published or updated and the `all_imm_deps` contains the actual modules
+        // required by M.
+        //
+        // Suppose M depends on D, and we now consider the following scenarios:
+        // 1) D does not appear in the bundle together with M
+        // -- In this case, D must be either in the code cache or in the data store which can be
+        //    loaded into the code cache (and pass all checks on D).
+        //    - If D is missing, the linking will fail and return an error.
+        //    - If D exists, D will be added to the `all_imm_deps` arg when checking M.
+        //
+        // 2) D appears in the bundle *before* M
+        // -- In this case, regardless of whether D is in code cache or not, D will be put into the
+        //    `bundle_verified` argument and modules in `bundle_verified` will be prioritized before
+        //    returning a module in code cache.
+        //
+        // 3) D appears in the bundle *after* M
+        // -- This technically should be discouraged but this is user input so we cannot have this
+        //    assumption here. But nevertheless, we can still make the claim 1 even in this case.
+        //    When M is verified, flow 1) is effectively activated, which means:
+        //    - If the code cache or the data store does not contain a D' which has the same name
+        //      with D, then the linking will fail and return an error.
+        //    - If D' exists, and M links against D', then when verifying D in a later time point,
+        //      a compatibility check will be invoked to ensure that D is compatible with D',
+        //      meaning, whichever module that links against D' will have to link against D as well.
+        //
+        // [Claim 2]
+        // We show that the `cyclic_dependencies::verify_module` check is always satisfied whenever
+        // a module M is published or updated and the dep/friend modules returned by the transitive
+        // dependency closure functions are valid.
+        //
+        // Currently, the code is written in a way that, from the view point of the
+        // `cyclic_dependencies::verify_module` check, modules checked prior to module M in the same
+        // bundle looks as if they have already been published and loaded to the code cache.
+        //
+        // Therefore, if M forms a cyclic dependency with module A in the same bundle that is
+        // checked prior to M, such an error will be detected. However, if M forms a cyclic
+        // dependency with a module X that appears in the same bundle *after* M. The cyclic
+        // dependency can only be caught when X is verified.
+        //
+        // In summary: the code is written in a way that, certain checks are skipped while checking
+        // each individual module in the bundle in order. But if every module in the bundle pass
+        // all the checks, then the whole bundle can be published/upgraded together. Otherwise,
+        // none of the module can be published/updated.
+        for (module, blob) in compiled_modules.into_iter().zip(modules.into_iter()) {
+            let runtime_id = module.self_id();
+            let storage_id = data_store
+                .relocate(&runtime_id)
+                .map_err(|e| e.finish(Location::Module(runtime_id)))?;
+
+            data_store.publish_module(&storage_id, blob)?;
+        }
+
+        Ok(())
+    }
+
+    fn deserialize_value(&self, ty: &Type, arg: impl Borrow<[u8]>) -> PartialVMResult<Value> {
+        let layout = match self.loader.type_to_type_layout(ty) {
+            Ok(layout) => layout,
+            Err(_err) => {
+                warn!("[VM] failed to get layout from type");
+                return Err(PartialVMError::new(
+                    StatusCode::INVALID_PARAM_TYPE_FOR_DESERIALIZATION,
+                ));
+            }
+        };
+
+        match Value::simple_deserialize(arg.borrow(), &layout) {
+            Some(val) => Ok(val),
+            None => {
+                warn!("[VM] failed to deserialize argument");
+                Err(PartialVMError::new(
+                    StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+                ))
+            }
+        }
+    }
+
+    fn deserialize_args(
+        &self,
+        arg_tys: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+    ) -> PartialVMResult<(Locals, Vec<Value>)> {
+        if arg_tys.len() != serialized_args.len() {
+            return Err(
+                PartialVMError::new(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH).with_message(
+                    format!(
+                        "argument length mismatch: expected {} got {}",
+                        arg_tys.len(),
+                        serialized_args.len()
+                    ),
+                ),
+            );
+        }
+
+        // Create a list of dummy locals. Each value stored will be used be borrowed and passed
+        // by reference to the invoked function
+        let mut dummy_locals = Locals::new(arg_tys.len());
+        // Arguments for the invoked function. These can be owned values or references
+        let deserialized_args = arg_tys
+            .into_iter()
+            .zip(serialized_args)
+            .enumerate()
+            .map(|(idx, (arg_ty, arg_bytes))| match &arg_ty {
+                Type::MutableReference(inner_t) | Type::Reference(inner_t) => {
+                    dummy_locals.store_loc(
+                        idx,
+                        self.deserialize_value(inner_t, arg_bytes)?,
+                        self.loader
+                            .vm_config()
+                            .enable_invariant_violation_check_in_swap_loc,
+                    )?;
+                    dummy_locals.borrow_loc(idx)
+                }
+                _ => self.deserialize_value(&arg_ty, arg_bytes),
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        Ok((dummy_locals, deserialized_args))
+    }
+
+    fn serialize_return_value(
+        &self,
+        ty: &Type,
+        value: Value,
+    ) -> PartialVMResult<(Vec<u8>, MoveTypeLayout)> {
+        let (ty, value) = match ty {
+            Type::Reference(inner) | Type::MutableReference(inner) => {
+                let ref_value: Reference = value.cast().map_err(|_err| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "non reference value given for a reference typed return value".to_string(),
+                    )
+                })?;
+                let inner_value = ref_value.read_ref()?;
+                (&**inner, inner_value)
+            }
+            _ => (ty, value),
+        };
+
+        let layout = self.loader.type_to_type_layout(ty).map_err(|_err| {
+            PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
+                "entry point functions cannot have non-serializable return types".to_string(),
+            )
+        })?;
+        let bytes = value.simple_serialize(&layout).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("failed to serialize return values".to_string())
+        })?;
+        Ok((bytes, layout))
+    }
+
+    fn serialize_return_values(
+        &self,
+        return_types: &[Type],
+        return_values: Vec<Value>,
+    ) -> PartialVMResult<Vec<(Vec<u8>, MoveTypeLayout)>> {
+        if return_types.len() != return_values.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!(
+                        "declared {} return types, but got {} return values",
+                        return_types.len(),
+                        return_values.len()
+                    ),
+                ),
+            );
+        }
+
+        return_types
+            .iter()
+            .zip(return_values)
+            .map(|(ty, value)| self.serialize_return_value(ty, value))
+            .collect()
+    }
+
+    fn execute_function_impl(
+        &self,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+        param_types: Vec<Type>,
+        return_types: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        let arg_types = param_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+        let mut_ref_args = arg_types
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, ty)| match ty {
+                Type::MutableReference(inner) => Some((idx, inner.clone())),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        let (mut dummy_locals, deserialized_args) = self
+            .deserialize_args(arg_types, serialized_args)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let return_types = return_types
+            .into_iter()
+            .map(|ty| ty.subst(&ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
+
+        let return_values = Interpreter::entrypoint(
+            func,
+            ty_args,
+            deserialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+            &self.loader,
+        )?;
+
+        let serialized_return_values = self
+            .serialize_return_values(&return_types, return_values)
+            .map_err(|e| e.finish(Location::Undefined))?;
+        let serialized_mut_ref_outputs = mut_ref_args
+            .into_iter()
+            .map(|(idx, ty)| {
+                // serialize return values first in the case that a value points into this local
+                let local_val = dummy_locals.move_loc(
+                    idx,
+                    self.loader
+                        .vm_config()
+                        .enable_invariant_violation_check_in_swap_loc,
+                )?;
+                let (bytes, layout) = self.serialize_return_value(&ty, local_val)?;
+                Ok((idx as LocalIndex, bytes, layout))
+            })
+            .collect::<PartialVMResult<_>>()
+            .map_err(|e| e.finish(Location::Undefined))?;
+
+        // locals should not be dropped until all return values are serialized
+        std::mem::drop(dummy_locals);
+
+        Ok(SerializedReturnValues {
+            mutable_reference_outputs: serialized_mut_ref_outputs,
+            return_values: serialized_return_values,
+        })
+    }
+
+    pub(crate) fn execute_function(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+        bypass_declared_entry_check: bool,
+    ) -> VMResult<SerializedReturnValues> {
+        use move_binary_format::{binary_views::BinaryIndexedView, file_format::SignatureIndex};
+        fn check_is_entry(
+            _resolver: &BinaryIndexedView,
+            is_entry: bool,
+            _parameters_idx: SignatureIndex,
+            _return_idx: Option<SignatureIndex>,
+        ) -> PartialVMResult<()> {
+            if is_entry {
+                Ok(())
+            } else {
+                Err(PartialVMError::new(
+                    StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION,
+                ))
+            }
+        }
+
+        let additional_signature_checks = if bypass_declared_entry_check {
+            move_bytecode_verifier::no_additional_script_signature_checks
+        } else {
+            check_is_entry
+        };
+        // load the function
+        let (
+            compiled,
+            _,
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_function(module, function_name, &type_arguments, data_store)?;
+
+        script_signature::verify_module_function_signature_by_name(
+            compiled.as_ref(),
+            function_name,
+            additional_signature_checks,
+        )?;
+
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    // See Session::execute_script for what contracts to follow.
+    pub(crate) fn execute_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        type_arguments: Vec<Type>,
+        serialized_args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        // load the script, perform verification
+        let (
+            func,
+            LoadedFunctionInstantiation {
+                parameters,
+                return_,
+            },
+        ) = self
+            .loader
+            .load_script(script.borrow(), &type_arguments, data_store)?;
+        #[cfg(debug_assertions)]
+        {
+            let rem = gas_meter.remaining_gas().into();
+            gas_meter.set_profiler(GasProfiler::init_default_cfg(func.pretty_string(), rem));
+        }
+        // execute the function
+        self.execute_function_impl(
+            func,
+            type_arguments,
+            parameters,
+            return_,
+            serialized_args,
+            data_store,
+            gas_meter,
+            extensions,
+        )
+    }
+
+    pub(crate) fn loader(&self) -> &Loader {
+        &self.loader
+    }
+
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.loader
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.loader
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.loader.get_struct_type(index)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> VMResult<MoveTypeLayout> {
+        self.loader
+            .type_to_type_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn load_struct(
+        &self,
+        module_id: &ModuleId,
+        struct_name: &IdentStr,
+        data_store: &impl DataStore,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.loader
+            .load_struct_by_name(struct_name, module_id, data_store)
+    }
+
+    pub fn execute_function_bypass_visibility(
+        &self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        data_store: &mut impl DataStore,
+        gas_meter: &mut impl GasMeter,
+        extensions: &mut NativeContextExtensions,
+    ) -> VMResult<SerializedReturnValues> {
+        #[cfg(debug_assertions)]
+        {
+            if gas_meter.get_profiler_mut().is_none() {
+                gas_meter.set_profiler(GasProfiler::init_default_cfg(
+                    function_name.to_string(),
+                    gas_meter.remaining_gas().into(),
+                ));
+            }
+        }
+
+        let bypass_declared_entry_check = true;
+        self.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            data_store,
+            gas_meter,
+            extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    pub fn type_to_fully_annotated_layout(&self, ty: &Type) -> VMResult<A::MoveTypeLayout> {
+        self.loader
+            .type_to_fully_annotated_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[Type],
+        data_store: &mut impl DataStore,
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, _, instantiation) =
+            self.loader
+                .load_function(module_id, function_name, type_arguments, data_store)?;
+        Ok(instantiation)
+    }
+
+    pub fn load_module(
+        &self,
+        module_id: &ModuleId,
+        data_store: &impl DataStore,
+    ) -> VMResult<Arc<CompiledModule>> {
+        self.loader
+            .load_module(module_id, data_store)
+            .map(|(compiled, _)| compiled)
+    }
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/session.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/session.rs
new file mode 100644
index 000000000..5a8f513e5
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/session.rs
@@ -0,0 +1,359 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    runtime::VMRuntime,
+};
+use move_binary_format::{
+    errors::*,
+    file_format::{AbilitySet, LocalIndex},
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    annotated_value as A,
+    effects::{ChangeSet, Event},
+    identifier::IdentStr,
+    language_storage::{ModuleId, TypeTag},
+    resolver::MoveResolver,
+    runtime_value::MoveTypeLayout,
+};
+#[cfg(debug_assertions)]
+use move_vm_profiler::GasProfiler;
+use move_vm_types::{
+    data_store::DataStore,
+    gas::GasMeter,
+    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+};
+use std::{borrow::Borrow, sync::Arc};
+
+pub struct Session<'r, 'l, S> {
+    pub(crate) runtime: &'l VMRuntime,
+    pub(crate) data_cache: TransactionDataCache<'l, S>,
+    pub(crate) native_extensions: NativeContextExtensions<'r>,
+}
+
+/// Serialized return values from function/script execution
+/// Simple struct is designed just to convey meaning behind serialized values
+#[derive(Debug)]
+pub struct SerializedReturnValues {
+    /// The value of any arguments that were mutably borrowed.
+    /// Non-mut borrowed values are not included
+    pub mutable_reference_outputs: Vec<(LocalIndex, Vec<u8>, MoveTypeLayout)>,
+    /// The return values from the function
+    pub return_values: Vec<(Vec<u8>, MoveTypeLayout)>,
+}
+
+impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
+    /// Execute a Move function with the given arguments. This is mainly designed for an external
+    /// environment to invoke system logic written in Move.
+    ///
+    /// NOTE: There are NO checks on the `args` except that they can deserialize into the provided
+    /// types.
+    /// The ability to deserialize `args` into arbitrary types is *very* powerful, e.g. it can
+    /// used to manufacture `signer`'s or `Coin`'s from raw bytes. It is the responsibility of the
+    /// caller (e.g. adapter) to ensure that this power is used responsibly/securely for its
+    /// use-case.
+    ///
+    /// The caller MUST ensure
+    ///   - All types and modules referred to by the type arguments exist.
+    ///   - The signature is valid for the rules of the adapter
+    ///
+    /// The Move VM MUST return an invariant violation if the caller fails to follow any of the
+    /// rules above.
+    ///
+    /// The VM will check that the function is marked as an 'entry' function.
+    ///
+    /// Currently if any other error occurs during execution, the Move VM will simply propagate that
+    /// error back to the outer environment without handling/translating it. This behavior may be
+    /// revised in the future.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_entry_function(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        let bypass_declared_entry_check = false;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Similar to execute_entry_function, but it bypasses visibility checks
+    pub fn execute_function_bypass_visibility(
+        &mut self,
+        module: &ModuleId,
+        function_name: &IdentStr,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        #[cfg(debug_assertions)]
+        {
+            if gas_meter.get_profiler_mut().is_none() {
+                gas_meter.set_profiler(GasProfiler::init_default_cfg(
+                    function_name.to_string(),
+                    gas_meter.remaining_gas().into(),
+                ));
+            }
+        }
+
+        let bypass_declared_entry_check = true;
+        self.runtime.execute_function(
+            module,
+            function_name,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+            bypass_declared_entry_check,
+        )
+    }
+
+    /// Execute a transaction script.
+    ///
+    /// The Move VM MUST return a user error (in other words, an error that's not an invariant
+    /// violation) if
+    ///   - The script fails to deserialize or verify. Not all expressible signatures are valid.
+    ///     See `move_bytecode_verifier::script_signature` for the rules.
+    ///   - Type arguments refer to a non-existent type.
+    ///   - Arguments (senders included) fail to deserialize or fail to match the signature of the
+    ///     script function.
+    ///
+    /// If any other error occurs during execution, the Move VM MUST propagate that error back to
+    /// the caller.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn execute_script(
+        &mut self,
+        script: impl Borrow<[u8]>,
+        ty_args: Vec<Type>,
+        args: Vec<impl Borrow<[u8]>>,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<SerializedReturnValues> {
+        self.runtime.execute_script(
+            script,
+            ty_args,
+            args,
+            &mut self.data_cache,
+            gas_meter,
+            &mut self.native_extensions,
+        )
+    }
+
+    /// Publish the given module.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    ///   - The module fails to deserialize or verify.
+    ///   - The sender address does not match that of the module.
+    ///
+    /// The Move VM should not be able to produce other user errors.
+    /// Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module(
+        &mut self,
+        module: Vec<u8>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.publish_module_bundle(vec![module], sender, gas_meter)
+    }
+
+    /// Publish a series of modules.
+    ///
+    /// The Move VM MUST return a user error, i.e., an error that's not an invariant violation, if
+    /// any module fails to deserialize or verify (see the full list of  failing conditions in the
+    /// `publish_module` API). The publishing of the module series is an all-or-nothing action:
+    /// either all modules are published to the data store or none is.
+    ///
+    /// Similar to the `publish_module` API, the Move VM should not be able to produce other user
+    /// errors. Besides, no user input should cause the Move VM to return an invariant violation.
+    ///
+    /// In case an invariant violation occurs, the whole Session should be considered corrupted and
+    /// one shall not proceed with effect generation.
+    pub fn publish_module_bundle(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime
+            .publish_module_bundle(modules, sender, &mut self.data_cache, gas_meter)
+    }
+
+    pub fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
+        self.data_cache.num_mutated_accounts(sender)
+    }
+
+    /// Finish up the session and produce the side effects.
+    ///
+    /// This function should always succeed with no user errors returned, barring invariant violations.
+    ///
+    /// This MUST NOT be called if there is a previous invocation that failed with an invariant violation.
+    pub fn finish(self) -> (VMResult<(ChangeSet, Vec<Event>)>, S) {
+        let (res, remote) = self.data_cache.into_effects();
+        (res.map_err(|e| e.finish(Location::Undefined)), remote)
+    }
+
+    pub fn vm_config(&self) -> &move_vm_config::runtime::VMConfig {
+        self.runtime.loader().vm_config()
+    }
+
+    /// Same like `finish`, but also extracts the native context extensions from the session.
+    pub fn finish_with_extensions(
+        self,
+    ) -> (
+        VMResult<(ChangeSet, Vec<Event>, NativeContextExtensions<'r>)>,
+        S,
+    ) {
+        let Session {
+            data_cache,
+            native_extensions,
+            ..
+        } = self;
+        let (res, remote) = data_cache.into_effects();
+        (
+            res.map(|(change_set, events)| (change_set, events, native_extensions))
+                .map_err(|e| e.finish(Location::Undefined)),
+            remote,
+        )
+    }
+
+    /// Load a script and all of its types into cache
+    pub fn load_script(
+        &self,
+        script: impl Borrow<[u8]>,
+        ty_args: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, instantiation) =
+            self.runtime
+                .loader()
+                .load_script(script.borrow(), ty_args, &self.data_cache)?;
+        Ok(instantiation)
+    }
+
+    /// Load a module, a function, and all of its types into cache
+    pub fn load_function(
+        &self,
+        module_id: &ModuleId,
+        function_name: &IdentStr,
+        type_arguments: &[Type],
+    ) -> VMResult<LoadedFunctionInstantiation> {
+        let (_, _, _, instantiation) = self.runtime.loader().load_function(
+            module_id,
+            function_name,
+            type_arguments,
+            &self.data_cache,
+        )?;
+        Ok(instantiation)
+    }
+
+    /// Load a struct by its name to get the global index that it is referenced by within the
+    /// loader, and the loaded struct information.  This operation also ensures the defining module
+    /// is loaded from the data store and will fail if the type does not exist in that module.
+    pub fn load_struct(
+        &self,
+        module_id: &ModuleId,
+        struct_name: &IdentStr,
+    ) -> VMResult<(CachedStructIndex, Arc<StructType>)> {
+        self.runtime
+            .loader()
+            .load_struct_by_name(struct_name, module_id, &self.data_cache)
+    }
+
+    pub fn load_type(&self, type_tag: &TypeTag) -> VMResult<Type> {
+        self.runtime.loader().load_type(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_layout(&self, type_tag: &TypeTag) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+    ) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_fully_annotated_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn type_to_type_layout(&self, ty: &Type) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_type_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn type_to_fully_annotated_layout(&self, ty: &Type) -> VMResult<A::MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .type_to_fully_annotated_layout(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.runtime
+            .loader()
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Fetch a struct type from cache, if the index is in bounds
+    /// Helpful when paired with load_type, or any other API that returns 'Type'
+    pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
+        self.runtime.loader().get_struct_type(index)
+    }
+
+    /// Gets the abilities for this type, at it's particular instantiation
+    pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
+        self.runtime
+            .loader()
+            .abilities(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
+    /// Gets the remote resolver used by the data store
+    pub fn get_resolver(&self) -> &S {
+        self.data_cache.get_remote_resolver()
+    }
+
+    pub fn get_resolver_mut(&mut self) -> &mut S {
+        self.data_cache.get_remote_resolver_mut()
+    }
+
+    /// Gets the underlying data store
+    pub fn get_data_store(&mut self) -> &mut dyn DataStore {
+        &mut self.data_cache
+    }
+
+    /// Gets the underlying native extensions.
+    pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
+        &mut self.native_extensions
+    }
+}
+
+pub struct LoadedFunctionInstantiation {
+    pub parameters: Vec<Type>,
+    pub return_: Vec<Type>,
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs
new file mode 100644
index 000000000..b016879c9
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs
@@ -0,0 +1,107 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::debug::DebugContext;
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use ::{
+    move_binary_format::file_format::Bytecode,
+    move_vm_types::values::Locals,
+    once_cell::sync::Lazy,
+    std::{
+        env,
+        fs::{File, OpenOptions},
+        io::Write,
+        process,
+        sync::Mutex,
+        thread,
+    },
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+use crate::{
+    interpreter::Interpreter,
+    loader::{Function, Loader},
+};
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_TRACING_ENV_VAR_NAME: &str = "MOVE_VM_TRACE";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+const MOVE_VM_STEPPING_ENV_VAR_NAME: &str = "MOVE_VM_STEP";
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static FILE_PATH: Lazy<String> = Lazy::new(|| {
+    env::var(MOVE_VM_TRACING_ENV_VAR_NAME).unwrap_or_else(|_| "move_vm_trace.trace".to_string())
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static TRACING_ENABLED: Lazy<bool> = Lazy::new(|| env::var(MOVE_VM_TRACING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUGGING_ENABLED: Lazy<bool> =
+    Lazy::new(|| env::var(MOVE_VM_STEPPING_ENV_VAR_NAME).is_ok());
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
+    Mutex::new(
+        OpenOptions::new()
+            .write(true)
+            .create(true)
+            .append(true)
+            .open(&*FILE_PATH)
+            .unwrap(),
+    )
+});
+
+#[cfg(any(debug_assertions, feature = "debugging"))]
+static DEBUG_CONTEXT: Lazy<Mutex<DebugContext>> = Lazy::new(|| Mutex::new(DebugContext::new()));
+
+// Only include in debug builds
+#[cfg(any(debug_assertions, feature = "debugging"))]
+pub(crate) fn trace(
+    function_desc: &Function,
+    locals: &Locals,
+    pc: u16,
+    instr: &Bytecode,
+    loader: &Loader,
+    interp: &Interpreter,
+) {
+    if *TRACING_ENABLED {
+        let f = &mut *LOGGING_FILE.lock().unwrap();
+        writeln!(
+            f,
+            "{}-{:?},{},{},{:?}",
+            process::id(),
+            thread::current().id(),
+            function_desc.pretty_string(),
+            pc,
+            instr,
+        )
+        .unwrap();
+    }
+    if *DEBUGGING_ENABLED {
+        DEBUG_CONTEXT
+            .lock()
+            .unwrap()
+            .debug_loop(function_desc, locals, pc, instr, loader, interp);
+    }
+}
+
+#[macro_export]
+macro_rules! trace {
+    ($function_desc:expr, $locals:expr, $pc:expr, $instr:tt, $resolver:expr, $interp:expr) => {
+        // Only include this code in debug releases
+        #[cfg(any(debug_assertions, feature = "debugging"))]
+        $crate::tracing::trace(
+            &$function_desc,
+            $locals,
+            $pc,
+            &$instr,
+            $resolver.loader(),
+            $interp,
+        )
+    };
+}
diff --git a/vendors/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs
new file mode 100644
index 000000000..72a1e68dd
--- /dev/null
+++ b/vendors/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs
@@ -0,0 +1,855 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+
+use crate::move_vm::MoveVM;
+use move_binary_format::{
+    errors::{VMError, VMResult},
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex, Bytecode, CodeUnit, CompiledModule,
+        CompiledScript, FieldDefinition, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+        IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex,
+        TableIndex, TypeSignature, Visibility,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::{IdentStr, Identifier},
+    language_storage::{ModuleId, StructTag, TypeTag},
+    resolver::{LinkageResolver, ModuleResolver, ResourceResolver},
+    runtime_value::{serialize_values, MoveValue},
+    u256::U256,
+    vm_status::{StatusCode, StatusType},
+};
+use move_vm_types::gas::UnmeteredGasMeter;
+
+// make a script with a given signature for main.
+fn make_script(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+// make a script with an external function that has the same signature as
+// the main. That allows us to pass resources and make the verifier happy that
+// they are consumed.
+// Dependencies check happens after main signature check, so we should expect
+// a signature check error.
+fn make_script_with_non_linking_structs(parameters: Signature) -> Vec<u8> {
+    let mut blob = vec![];
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    CompiledScript {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+
+        function_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("one").unwrap(),
+            Identifier::new("two").unwrap(),
+            Identifier::new("three").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        type_parameters: vec![],
+        parameters: parameters_idx,
+        code: CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+        },
+    }
+    .serialize(&mut blob)
+    .expect("script must serialize");
+    blob
+}
+
+fn make_module_with_function(
+    visibility: Visibility,
+    is_entry: bool,
+    parameters: Signature,
+    return_: Signature,
+    type_parameters: Vec<AbilitySet>,
+) -> (CompiledModule, Identifier) {
+    let function_name = Identifier::new("foo").unwrap();
+    let mut signatures = vec![Signature(vec![])];
+    let parameters_idx = match signatures
+        .iter()
+        .enumerate()
+        .find(|(_, s)| *s == &parameters)
+    {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(parameters);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let return_idx = match signatures.iter().enumerate().find(|(_, s)| *s == &return_) {
+        Some((idx, _)) => SignatureIndex(idx as TableIndex),
+        None => {
+            signatures.push(return_);
+            SignatureIndex((signatures.len() - 1) as TableIndex)
+        }
+    };
+    let module = CompiledModule {
+        version: move_binary_format::file_format_common::VERSION_MAX,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(2),
+            parameters: parameters_idx,
+            return_: return_idx,
+            type_parameters,
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+
+        signatures,
+
+        identifiers: vec![
+            Identifier::new("M").unwrap(),
+            Identifier::new("X").unwrap(),
+            function_name.clone(),
+        ],
+        address_identifiers: vec![AccountAddress::random()],
+        constant_pool: vec![],
+        metadata: vec![],
+
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(1),
+                signature: TypeSignature(SignatureToken::Bool),
+            }]),
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility,
+            is_entry,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![Bytecode::LdU64(0), Bytecode::Abort],
+            }),
+        }],
+    };
+    (module, function_name)
+}
+
+// make a script function with a given signature for main.
+fn make_script_function(signature: Signature) -> (CompiledModule, Identifier) {
+    make_module_with_function(
+        Visibility::Public,
+        true,
+        signature,
+        Signature(vec![]),
+        vec![],
+    )
+}
+
+struct RemoteStore {
+    modules: HashMap<ModuleId, Vec<u8>>,
+}
+
+impl RemoteStore {
+    fn new() -> Self {
+        Self {
+            modules: HashMap::new(),
+        }
+    }
+
+    fn add_module(&mut self, compiled_module: CompiledModule) {
+        let id = compiled_module.self_id();
+        let mut bytes = vec![];
+        compiled_module.serialize(&mut bytes).unwrap();
+        self.modules.insert(id, bytes);
+    }
+}
+
+impl LinkageResolver for RemoteStore {
+    type Error = VMError;
+}
+
+impl ModuleResolver for RemoteStore {
+    type Error = VMError;
+    fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(self.modules.get(module_id).cloned())
+    }
+}
+
+impl ResourceResolver for RemoteStore {
+    type Error = VMError;
+
+    fn get_resource(
+        &self,
+        _address: &AccountAddress,
+        _tag: &StructTag,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(None)
+    }
+}
+
+fn combine_signers_and_args(
+    signers: Vec<AccountAddress>,
+    non_signer_args: Vec<Vec<u8>>,
+) -> Vec<Vec<u8>> {
+    signers
+        .into_iter()
+        .map(|s| MoveValue::Signer(s).simple_serialize().unwrap())
+        .chain(non_signer_args)
+        .collect()
+}
+
+fn call_script_with_args_ty_args_signers(
+    script: Vec<u8>,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session
+        .execute_script(
+            script,
+            ty_args,
+            combine_signers_and_args(signers, non_signer_args),
+            &mut UnmeteredGasMeter,
+        )
+        .map(|_| ())
+}
+
+fn call_script(script: Vec<u8>, args: Vec<Vec<u8>>) -> VMResult<()> {
+    call_script_with_args_ty_args_signers(script, args, vec![], vec![])
+}
+
+fn call_script_function_with_args_ty_args_signers(
+    module: CompiledModule,
+    function_name: Identifier,
+    non_signer_args: Vec<Vec<u8>>,
+    ty_arg_tags: Vec<TypeTag>,
+    signers: Vec<AccountAddress>,
+) -> VMResult<()> {
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let id = module.self_id();
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+
+    let ty_args = ty_arg_tags
+        .into_iter()
+        .map(|tag| session.load_type(&tag))
+        .collect::<VMResult<_>>()?;
+
+    session.execute_function_bypass_visibility(
+        &id,
+        function_name.as_ident_str(),
+        ty_args,
+        combine_signers_and_args(signers, non_signer_args),
+        &mut UnmeteredGasMeter,
+    )?;
+    Ok(())
+}
+
+fn call_script_function(
+    module: CompiledModule,
+    function_name: Identifier,
+    args: Vec<Vec<u8>>,
+) -> VMResult<()> {
+    call_script_function_with_args_ty_args_signers(module, function_name, args, vec![], vec![])
+}
+
+// these signatures used to be bad, but there are no bad signatures for scripts at the VM
+fn deprecated_bad_signatures() -> Vec<Signature> {
+    vec![
+        // struct in signature
+        Signature(vec![SignatureToken::Struct(StructHandleIndex(0))]),
+        // struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Struct(StructHandleIndex(0)),
+            SignatureToken::U64,
+        ]),
+        // reference to struct in signature
+        Signature(vec![
+            SignatureToken::Address,
+            SignatureToken::MutableReference(Box::new(SignatureToken::Struct(StructHandleIndex(
+                0,
+            )))),
+        ]),
+        // vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+            SignatureToken::U64,
+        ]),
+        // vector of vector of struct in signature
+        Signature(vec![
+            SignatureToken::Bool,
+            SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                SignatureToken::Struct(StructHandleIndex(0)),
+            )))),
+            SignatureToken::U64,
+        ]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::Struct(StructHandleIndex(0)))),
+        ))]),
+        // reference to vector in signature
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U64,
+        ))]),
+        // `&Signer` in signature (not `Signer`)
+        Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // vector of `Signer` in signature
+        Signature(vec![SignatureToken::Vector(Box::new(
+            SignatureToken::Signer,
+        ))]),
+        // `Signer` ref not first arg
+        Signature(vec![SignatureToken::Bool, SignatureToken::Signer]),
+    ]
+}
+
+fn good_signatures_and_arguments() -> Vec<(Signature, Vec<MoveValue>)> {
+    vec![
+        // U128 arg
+        (
+            Signature(vec![SignatureToken::U128]),
+            vec![MoveValue::U128(0)],
+        ),
+        // U8 arg
+        (Signature(vec![SignatureToken::U8]), vec![MoveValue::U8(0)]),
+        // U16 arg
+        (
+            Signature(vec![SignatureToken::U16]),
+            vec![MoveValue::U16(0)],
+        ),
+        // U32 arg
+        (
+            Signature(vec![SignatureToken::U32]),
+            vec![MoveValue::U32(0)],
+        ),
+        // U256 arg
+        (
+            Signature(vec![SignatureToken::U256]),
+            vec![MoveValue::U256(U256::zero())],
+        ),
+        // All constants
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(SignatureToken::Bool))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(true),
+            ])],
+        ),
+        // All constants
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+        ),
+        // vector<vector<address>>
+        (
+            Signature(vec![
+                SignatureToken::Bool,
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+                SignatureToken::Vector(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::Address,
+                )))),
+            ]),
+            vec![
+                MoveValue::Bool(true),
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::Vector(vec![
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                    MoveValue::Vector(vec![
+                        MoveValue::Address(AccountAddress::random()),
+                        MoveValue::Address(AccountAddress::random()),
+                    ]),
+                ]),
+            ],
+        ),
+        //
+        // Vector arguments
+        //
+        // empty vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // one elem vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Address(
+                AccountAddress::random(),
+            )])],
+        ),
+        // multiple elems vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+                MoveValue::Address(AccountAddress::random()),
+            ])],
+        ),
+        // empty vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![])],
+        ),
+        // multiple element vector of vector
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::Vector(vec![
+                MoveValue::vector_u8(vec![0, 1]),
+                MoveValue::vector_u8(vec![2, 3]),
+                MoveValue::vector_u8(vec![4, 5]),
+            ])],
+        ),
+    ]
+}
+
+fn mismatched_cases() -> Vec<(Signature, Vec<MoveValue>, StatusCode)> {
+    vec![
+        // Too few args
+        (
+            Signature(vec![SignatureToken::U64]),
+            vec![],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Too many args
+        (
+            Signature(vec![SignatureToken::Bool]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+                MoveValue::Bool(false),
+            ],
+            StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH,
+        ),
+        // Vec<bool> passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::Vector(vec![MoveValue::Bool(true)])],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u128 passed for vec<address>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Address,
+            ))]),
+            vec![MoveValue::U128(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+        // u8 passed for vector<vector<u8>>
+        (
+            Signature(vec![SignatureToken::Vector(Box::new(
+                SignatureToken::Vector(Box::new(SignatureToken::U8)),
+            ))]),
+            vec![MoveValue::U8(12)],
+            StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT,
+        ),
+    ]
+}
+
+fn general_cases() -> Vec<(
+    Signature,
+    Vec<MoveValue>,
+    Vec<AccountAddress>,
+    Option<StatusCode>,
+)> {
+    vec![
+        // too few signers (0)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (1)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // too few signers (3)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![
+                AccountAddress::random(),
+                AccountAddress::random(),
+                AccountAddress::random(),
+            ],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // correct number of signers (2)
+        (
+            Signature(vec![SignatureToken::Signer, SignatureToken::Signer]),
+            vec![],
+            vec![AccountAddress::random(), AccountAddress::random()],
+            None,
+        ),
+        // too many signers (1) in a script that expects 0 is no longer ok
+        (
+            Signature(vec![SignatureToken::U8]),
+            vec![MoveValue::U8(0)],
+            vec![AccountAddress::random()],
+            Some(StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH),
+        ),
+        // signer
+        (
+            Signature(vec![
+                SignatureToken::Signer,
+                SignatureToken::Bool,
+                SignatureToken::Address,
+            ]),
+            vec![
+                MoveValue::Bool(false),
+                MoveValue::Address(AccountAddress::random()),
+            ],
+            vec![AccountAddress::random()],
+            None,
+        ),
+    ]
+}
+
+#[test]
+fn check_script() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let script = make_script_with_non_linking_structs(signature);
+        let status = call_script(script, serialize_values(&dummy_args))
+            .err()
+            .unwrap()
+            .major_status();
+        assert_eq!(status, StatusCode::LINKER_ERROR);
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let script = make_script(signature);
+        assert_eq!(
+            call_script(script, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let script = make_script(signature);
+        assert_eq!(
+            call_script_with_args_ty_args_signers(script, serialize_values(&args), vec![], signers)
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        );
+    }
+}
+
+#[test]
+fn check_script_function() {
+    //
+    // Bad signatures
+    //
+    for signature in deprecated_bad_signatures() {
+        let num_args = signature.0.len();
+        let dummy_args = vec![MoveValue::Bool(false); num_args];
+        let (module, function_name) = make_script_function(signature);
+        let res = call_script_function(module, function_name, serialize_values(&dummy_args))
+            .err()
+            .unwrap();
+        // either the dummy arg matches so abort, or it fails to match
+        // but the important thing is that the signature was accepted
+        assert!(
+            res.major_status() == StatusCode::ABORTED
+                || res.major_status() == StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT
+        )
+    }
+
+    //
+    // Good signatures
+    //
+    for (signature, args) in good_signatures_and_arguments() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = StatusCode::ABORTED;
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            expected_status
+        )
+    }
+
+    //
+    // Mismatched Cases
+    //
+    for (signature, args, error) in mismatched_cases() {
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function(module, function_name, serialize_values(&args))
+                .err()
+                .unwrap()
+                .major_status(),
+            error
+        );
+    }
+
+    for (signature, args, signers, expected_status_opt) in general_cases() {
+        // Body of the script is just an abort, so `ABORTED` means the script was accepted and ran
+        let expected_status = expected_status_opt.unwrap_or(StatusCode::ABORTED);
+        let (module, function_name) = make_script_function(signature);
+        assert_eq!(
+            call_script_function_with_args_ty_args_signers(
+                module,
+                function_name,
+                serialize_values(&args),
+                vec![],
+                signers
+            )
+            .err()
+            .unwrap()
+            .major_status(),
+            expected_status
+        );
+    }
+
+    //
+    // Non script visible
+    // DEPRECATED this check must now be done by the adapter
+    //
+    // public
+    let (module, function_name) = make_module_with_function(
+        Visibility::Public,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+    // private
+    let (module, function_name) = make_module_with_function(
+        Visibility::Private,
+        false,
+        Signature(vec![]),
+        Signature(vec![]),
+        vec![],
+    );
+    assert_eq!(
+        call_script_function_with_args_ty_args_signers(
+            module,
+            function_name,
+            vec![],
+            vec![],
+            vec![],
+        )
+        .err()
+        .unwrap()
+        .major_status(),
+        StatusCode::ABORTED,
+    );
+}
+
+#[test]
+fn call_missing_item() {
+    let module = empty_module();
+    let id = &module.self_id();
+    let function_name = IdentStr::new("foo").unwrap();
+    // mising module
+    let move_vm = MoveVM::new(vec![]).unwrap();
+    let mut remote_view = RemoteStore::new();
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(error.major_status(), StatusCode::LINKER_ERROR);
+    assert_eq!(error.status_type(), StatusType::Verification);
+    drop(session);
+
+    // missing function
+    remote_view.add_module(module);
+    let mut session = move_vm.new_session(&remote_view);
+    let error = session
+        .execute_function_bypass_visibility(
+            id,
+            function_name,
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut UnmeteredGasMeter,
+        )
+        .err()
+        .unwrap();
+    assert_eq!(
+        error.major_status(),
+        StatusCode::FUNCTION_RESOLUTION_FAILURE
+    );
+    assert_eq!(error.status_type(), StatusType::Verification);
+}
diff --git a/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/Move.toml b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/Move.toml
new file mode 100644
index 000000000..9a0f2311c
--- /dev/null
+++ b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Test"
+version = "0.0.0"
+
+[dev-addresses]
+std = "0x1"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/args.exp b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/args.exp
new file mode 100644
index 000000000..ca36c02d3
--- /dev/null
+++ b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/args.exp
@@ -0,0 +1,40 @@
+Command `test`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Test
+Running Move unit tests
+[ PASS    ] 0x42::m::explicit_abort_expect_failure
+[ PASS    ] 0x42::m::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+Command `test --silence-warnings`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Test
+Running Move unit tests
+[ PASS    ] 0x42::m::explicit_abort_expect_failure
+[ PASS    ] 0x42::m::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+Command `test --silence-warnings --warnings-are-errors`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Test
+Running Move unit tests
+[ PASS    ] 0x42::m::explicit_abort_expect_failure
+[ PASS    ] 0x42::m::nop
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+Command `test --warnings-are-errors`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Test
+error[E09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+  │
+  = This warning can be suppressed with '#[allow(unused_variable)]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/modules/m.move b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/modules/m.move
new file mode 100644
index 000000000..c892ad41e
--- /dev/null
+++ b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/modules/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/sources/m.move b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/sources/m.move
new file mode 100644
index 000000000..edcd097ba
--- /dev/null
+++ b/vendors/move/tools/move-cli/tests/move_unit_tests/test_with_warnings/sources/m.move
@@ -0,0 +1,14 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+
+#[test]
+fun nop() {}
+
+#[test]
+#[expected_failure]
+fun explicit_abort_expect_failure() {
+    abort 42
+}
+}
diff --git a/vendors/sui b/vendors/sui
new file mode 160000
index 000000000..5f6756294
--- /dev/null
+++ b/vendors/sui
@@ -0,0 +1 @@
+Subproject commit 5f67562946d4d797a5a7e177f733abcc43d261e9
diff --git a/third-party/x25519-dalek b/vendors/x25519-dalek
similarity index 100%
rename from third-party/x25519-dalek
rename to vendors/x25519-dalek